diff --git a/build.xml b/build.xml
index b6a1307..23e2ef2 100644
--- a/build.xml
+++ b/build.xml
@@ -40,7 +40,7 @@
 
     <description>The Apache POI project Ant build.</description>
 
-    <property name="version.id" value="3.16-beta2"/>
+    <property name="version.id" value="3.16-beta1"/>
     <property name="release.rc" value="RC1"/>
 
     <property environment="env"/>
diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 5a04f8d..ea53c05 100644
--- a/sonar/examples/pom.xml
+++ b/sonar/examples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-examples</artifactId>
     <packaging>jar</packaging>
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 3aaf8eae3..a7b9408 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-excelant</artifactId>
     <packaging>jar</packaging>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 7a9da5a..36422a8 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-main</artifactId>
     <packaging>jar</packaging>
diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml
index e21fce2..cbb2eff 100644
--- a/sonar/ooxml-schema-encryption/pom.xml
+++ b/sonar/ooxml-schema-encryption/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-encryption</artifactId>
diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml
index 542ea9e..a822c73 100644
--- a/sonar/ooxml-schema-security/pom.xml
+++ b/sonar/ooxml-schema-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-security</artifactId>
diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index 66ad1cb..5e2b9fe 100644
--- a/sonar/ooxml-schema/pom.xml
+++ b/sonar/ooxml-schema/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema</artifactId>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index e7ffcc2..27636cd 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-ooxml</artifactId>
     <packaging>jar</packaging>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 738c3ec..8e2a9fc 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>org.apache.poi</groupId>
 	<artifactId>poi-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.16-beta2-SNAPSHOT</version>
+	<version>3.16-beta1-SNAPSHOT</version>
 	<name>Apache POI - the Java API for Microsoft Documents</name>
 	<description>Maven build of Apache POI for Sonar checks</description>
 	<url>http://poi.apache.org/</url>
diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index 2645cdc..6760762 100644
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta2-SNAPSHOT</version>
+        <version>3.16-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-scratchpad</artifactId>
     <packaging>jar</packaging>
diff --git a/trunk/.classpath b/trunk/.classpath
deleted file mode 100644
index 3238145..0000000
--- a/trunk/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="src/testcases"/>
-	<classpathentry kind="src" path="src/resources/main"/>
-	<classpathentry kind="src" path="src/ooxml/java"/>
-	<classpathentry kind="src" path="src/ooxml/testcases"/>
-	<classpathentry kind="src" path="src/resources/ooxml"/>
-	<classpathentry kind="src" path="src/scratchpad/src"/>
-	<classpathentry kind="src" path="src/scratchpad/testcases"/>
-	<classpathentry kind="src" path="src/resources/scratchpad"/>
-	<classpathentry kind="src" path="src/contrib/poi-ruby/java"/>
-	<classpathentry kind="src" path="src/examples/src"/>
-	<classpathentry kind="src" path="src/excelant/java"/>
-	<classpathentry kind="src" path="src/excelant/testcases"/>
-	<classpathentry kind="src" path="src/excelant/resources"/>
-	<classpathentry kind="src" path="src/integrationtest"/>
-	<classpathentry kind="lib" path="lib/ant-1.9.4.jar"/>
-	<classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
-	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
-	<classpathentry kind="lib" path="ooxml-lib/curvesapi-1.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="ooxml-lib/ooxml-schemas-1.3.jar" sourcepath="ooxml-lib/ooxml-schemas-1.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="ooxml-lib/ooxml-security-1.1.jar" sourcepath="ooxml-lib/ooxml-security-1.1-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.12.jar"/>
-	<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.54.jar"/>
-	<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.54.jar"/>
-	<classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
-	<classpathentry kind="output" path="build/eclipse"/>
-</classpath>
diff --git a/trunk/.project b/trunk/.project
deleted file mode 100644
index 274051f..0000000
--- a/trunk/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ApachePOI</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.sonar.ide.eclipse.core.sonarNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/trunk/.settings/org.eclipse.core.resources.prefs b/trunk/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b80..0000000
--- a/trunk/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/trunk/.settings/org.eclipse.jdt.core.prefs b/trunk/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2b245ec..0000000
--- a/trunk/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,395 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/trunk/.settings/org.eclipse.jdt.ui.prefs b/trunk/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5227bd2..0000000
--- a/trunk/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,131 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Apache POI
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
-formatter_profile=_Apache POI
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=20
-org.eclipse.jdt.ui.overrideannotation=false
-org.eclipse.jdt.ui.staticondemandthreshold=10
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/* \=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\n   Licensed to the Apache Software Foundation (ASF) under one or more\n   contributor license agreements.  See the NOTICE file distributed with\n   this work for additional information regarding copyright ownership.\n   The ASF licenses this file to You under the Apache License, Version 2.0\n   (the "License"); you may not use this file except in compliance with\n   the License.  You may obtain a copy of the License at\n\n       http\://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an "AS IS" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\=\= */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=false
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_type_arguments=false
diff --git a/trunk/.settings/org.moreunit.core.prefs b/trunk/.settings/org.moreunit.core.prefs
deleted file mode 100644
index efd9d77..0000000
--- a/trunk/.settings/org.moreunit.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.moreunit.core.anyLanguage.srcFolderPathTemplate=${srcProject}
-org.moreunit.core.anyLanguage.testFileNameTemplate=${srcFile}Test
-org.moreunit.core.anyLanguage.testFolderPathTemplate=${srcProject}
diff --git a/trunk/.settings/org.moreunit.prefs b/trunk/.settings/org.moreunit.prefs
deleted file mode 100644
index 659afaf..0000000
--- a/trunk/.settings/org.moreunit.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.moreunit.preferences.version=2
-org.moreunit.unitsourcefolder=ApachePOI\:src/java\:ApachePOI\:src/testcases\#ApachePOI\:src/java\:ApachePOI\:src/ooxml/testcases\#ApachePOI\:src/java\:ApachePOI\:src/scratchpad/testcases\#ApachePOI\:src/java\:ApachePOI\:src/excelant/testcases\#ApachePOI\:src/java\:ApachePOI\:src/integrationtest
-org.moreunit.useprojectsettings=true
diff --git a/trunk/KEYS b/trunk/KEYS
deleted file mode 100644
index 5926e7c..0000000
--- a/trunk/KEYS
+++ /dev/null
@@ -1,2495 +0,0 @@
-This file contains the PGP keys of various developers.
-
-Users: pgp < KEYS
-       gpg --import KEYS
-Developers: 
-        gpg --list-key <your email> and append it to this file.
-        gpg -a --export <your email> and append it to this file.
-
-        (gpg --list-key <your email>
-             && gpg --armor --export <your email>) >> this file.
-
-Since the KEYS may be needed to check signatures for archived
-releases, it is important that all keys that have ever been used
-to sign releases are retained in the file. Entries should only
-be added, not removed.
-To keep the KEYS file manageable, it's recommended to only add
-the keys of committers who have signed releases.
-https://www.apache.org/dev/release-signing#keys-policy
-https://people.apache.org/keys/
-
-
-pub  1024D/12DAE9BE 2004-01-25 Glen Stampoultzis <glens@apache.org>
-sig 3       12DAE9BE 2004-01-25   Glen Stampoultzis <glens@apache.org>
-sub  1024g/2BBB28EA 2004-01-25
-sig         12DAE9BE 2004-01-25   Glen Stampoultzis <glens@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.2 (Cygwin)
-
-mQGiBEATU6gRBACo3iUkfku4/G2q8ldWFiiCekHK5oqx0U1N6fyO+Xgs+6V6btEZ
-drF2DUCyto6ig4FJT81L34HUQ6l9bPnpa4nNsl2EMBknY42LjmC55x7Q5rsQbiRj
-+2JkoQJk2Jc3hneuh4Wsv49stOCDQMOV5BtjZs31t7rr+wuKPMkIw/Nf1wCgngI9
-ZWFyLxspoi9bL1/xBID18jsD/RxGBep4F8HwXEdHTeHnmjEuJSlYhmAKQ6Fd7bdb
-ex16a54Gsg7fVD0rIIsytzVUACQMi7V6tmE4Wf/XaY7+ma5w4gCsxUCIeujU4Y7i
-WUDwtlTkr2IudmoxSIDDpS12NPZqCP7PbU2RK+KwnnITjs80a+QlHYaO9te7HVcL
-F6YIA/9YZkYp5TpoMO1ISnlv0gXMcIaznbNMoRgeXZHvYyEvy014jArHmG41LVBj
-6TnBHFLQi4xA7Ql98oIgfszaRr/9GshvoL6Iu1x1SoV7dMrqFBC6e2JD9N/IgBtZ
-EGg7US3nIJnlCjJSIkXKfPJL4FyYWwt6IEZcF6Mi/USsyLA6wrQkR2xlbiBTdGFt
-cG91bHR6aXMgPGdsZW5zQGFwYWNoZS5vcmc+iFsEExECABsFAkATU6gGCwkIBwMC
-AxUCAwMWAgECHgECF4AACgkQONrI4hLa6b48RgCaAqQg0wtiOQ8jqX6S7tZi1OMg
-CQAAn2Ty1d/UdGLqlGkCPMkaB6otTMhZuQENBEATU6kQBADUbn5pT2D8vi64RU5E
-SeTn/rNzLglJ4nzoOfeIcHm7p3hppjT0Q1YbHvdOSaigYApzxoiSf+0Mt8NSCfDf
-B/wjfndHlrcdPkiJi4fBkQHihcuJtEgOkAwXfSJ+MUXG+fEgEuGdYm7tNV3n/eOY
-gn9Vzs/LofrQ7nY3+WkNOUia/wADBwQAnqZ4wPm0VY/fjCWJ34wvSfPk6Qg8m502
-MfHIGY/UZ+BY5DK3iQR8hrIu6FU0tn0qoF7PCNehOtd2cR9kA7I2gyfaVR8JY2Ek
-F18jungrNRrNuNx3rJeUD6ViQjC44K4vf6y8CkxmkHTmB9ZC2+uGdMeOdDvbck/u
-JA+XB2tykJWIRgQYEQIABgUCQBNTqQAKCRA42sjiEtrpvpy3AJ4trdVLGCzJwB2R
-Z/zxD3xBnTdY5QCeNUdw2VcsrzAF541sawFRxOmL3eY=
-=la1N
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   1024D/4CEED75F 2004-03-24 [expires: 2010-01-01]
-uid                  Nick Burch <nick@gagravarr.org>
-uid                  Nick Burch <nick@apache.org>
-sub   1024g/5E0E1748 2004-03-24
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQGiBEBhnKkRBACOPYQoULwS4a37UsNiinwqJ+2XVMal5FQyMOc6hNneyvdau4cO
-oSNgdEkNtAN9fecSh06wke9mFBR9iVD4QpCqiRk8s20lr4QAFw4urxbe6iOf/Ytr
-q7I0t3/zpzx4MuzwvN7ffPaE5EzE6F3ryQDkSulMeLzDbdRSZIezocDyQwCgpKTA
-UtpUwP38GH81VCtbEWfEJpMD/jraHQdr4KXnv7iIvGtOLbODrmgfGfZYPsGoJlHl
-+IIFdTfRCbUNc1Mh9/vcP45bnX62Crsp2JuDxZo8Dq4buE77pZ/Yw1aaIzhHBGcP
-YlIvLz/S2WCZxKyNrIE86WK/DlMAXoHAJigErD+X1UYLNVb0+u5MeHN+FF0yLMS4
-9Cp4A/wJznIOc7sO+L6psNNUWSu1G9TAPo6QRu/6CTaYHMy8uMzovjrlYF9bjZFe
-9TVJUkHYMv2tsthZ7eWG0jAyHabvn1XgCDRjJcs10FZ6obIU5BDaJLjaxMU+u91k
-F/AiO1zStA9wuasITcurU3BF4f/ZywJXwVDFvpYUh0xV1pK0qrQfTmljayBCdXJj
-aCA8bmlja0BnYWdyYXZhcnIub3JnPohlBBMRAgAdBQJAYZypBQkJZgGABQsHCgME
-AxUDAgMWAgECF4AAEgkQ9cJgFkzu118HZUdQRwABASjeAKCXv83+hBN7PMqx9Ate
-13EN+mCsNQCfSWj1wVXl3vKBZizH3yQzDDl6yuGIRgQQEQIABgUCQGGc+wAKCRDI
-h7WuwLlVejPLAKDoFiCmPsApgl99/Sgbi5+GD6pXXACeLQyS8rg+rz7zOagcMJ+T
-XdY87wKIRgQQEQIABgUCQGGeNwAKCRB4Ma11Ja7RdocaAKDVs5beITXLa/9rW5r8
-Qptyhzp1dwCfVxgAMgL00Muh6gSnk7MI23xUgpmJAJUDBRBAYf1wIBRZzICIOAEB
-AcEcA/9fO1E2pj1QSOZiX53ngKxF+Vxo8XfuBxbplXQaN2/acUsOGZVp8r5oo+3w
-0qzn7YLXpStlnFz40UAjAWJBPtYTnzGR3twpChZRDTRrmaGVAssG+DuJwHBdsC4D
-W5QisDTRFg+lyZ5d7bI/H+ckbXma+7BRwPtG0rRXK67O1p3lo4hGBBARAgAGBQJA
-YfNUAAoJEEPSiApOm1UCnSIAnjg0phq4MhuzTnBoHoHIbqO7Jj5+AKCQ9HC/d/gO
-Hitfw2bcjHMKSwgDeIhMBBARAgAMBQJEEDtmBYMFt2LDAAoJEGao+or0Qx8mutAA
-nR8OikkgQDLxBxdaFtFHtsc09lR+AJ48A1Nkex+ZNl0VAEgWLqqoFVkWDIhiBBMR
-AgAaBQsHCgMEAxUDAgMWAgECF4ACGQEFAkaCzIEAEgdlR1BHAAEBCRD1wmAWTO7X
-X4ExAJ91jwqu1pGuK21TBKNtW+ennH9ppACdGrI/+kN/rkWMAsNgU+uJbjDE7YeI
-cwQQEQIAMwUCRBBGKQWDAeEzgCYaaHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4
-LnBocD9pZD0xMAAKCRDSuw0BZdD9WK2kAJ9QCMJBHbpzbL+Fh503iw+o1ByNnwCf
-f+UFND1piZvaF5XybwKoQ5Wu/NuIRgQTEQIABgUCREvNBQAKCRBghaOGQ6aJantc
-AJ9QGBq5kkoI5vMhXi9LKx6b3HdETgCfXVqP43fiL+uQ7VsByLpVLDjFlFOIRgQQ
-EQIABgUCRKP0UwAKCRA39o/1AVr8iho4AKDZ1rVmNXD2KAHHJZshHvwGpRz3VwCg
-5Z7hpclWyw3OkKaz/G4T08lIhxaIRgQQEQIABgUCRKfNKwAKCRDVM051sTE94iuk
-AJ4h3TVd62OH3GpfbNku1tT3XJcvVgCgtSV/04an+u0VSRADSRq/5uBNDeGIRgQQ
-EQIABgUCRKkt2wAKCRAyyeTONkLLS6iUAJ97ELvsa6Wlmg5UCsa4AAephiEDFwCg
-n0YHqUwx2bVWL1elR53bTWaqEqKIRgQQEQIABgUCRKquQwAKCRA1i6ozUPlhFmyZ
-AJ0ajTr1w6VG+Rp8j9MwbziOKQIVrgCeID7Mg0N3mDFE414J21I6As5ad4uIRgQQ
-EQIABgUCRKrPUQAKCRD7N9pAMy5jzVa+AJ44NFxehfXUyS5Fwkx5g58Qznv1zACf
-arUp2KPdpN0vu5ppqNsFs3F1IfOIRgQQEQIABgUCRQ+CKwAKCRCyvrxAFSkkr6Fg
-AJ9RvBUJ4WpvI5sY50PPCQQDrOW0CQCbB9HoxMfs6zZFF0Rm0h8IZ9ONzZyITAQQ
-EQIADAUCRKMCVQWDBSSb1AAKCRCUUEP1NcEA8Hd1AJ4sVLyTaUk7hNmxCMO0KmAI
-IAJQ5ACdEyi6yNEOsuQrmZ8fvtl8CYp+E/OITAQQEQIADAUCRKON0QWDBSQQWAAK
-CRAtIatlZUYbeVBwAJ0YCGDcAhRSdD7iHbqONN4ZJsEeqACcCus5Mck12rdUNuH3
-INWTm5MmX0eITAQQEQIADAUCRKRJ+AWDBSNUMQAKCRArfoLnQ+8hHytfAJ0busES
-2PyWxOkyRidcllRSX0rLsQCeKcKHsQjCn6fd/nV7VN/9pwAJRfKITAQREQIADAUC
-RKMbGAWDBSSDEQAKCRBWDQhh7n3HTviwAJwKn/we6Khznqlq3svyYn6Z/6FZsQCg
-3acpog5M5TXkneKEoml3q9TjmC6ITAQREQIADAUCRKMbKAWDBSSDAQAKCRDKcp1i
-YD1PVH7JAJ9M7kVdEF8mLbkjpe9YwHiytkn/HACfa9YGteCB615GB2umE8N5FrIF
-uSyITAQTEQIADAUCRKOpaQWDBSP0wAAKCRDdumS6LDEtL8KaAJ91mvnnKJ1sP/tW
-8V5ZH9pmVXLy0QCgiZnT7s9rsdAAO7wY/gqctT9rDrGITAQTEQIADAUCRKOpdwWD
-BSP0sgAKCRBQjq7FMC2laILDAJsH0OlzaG31pD6ciEJdzzyn8R6kDQCgqY0Wp4Cz
-qVRVeZDacRKj13J3fMSITAQTEQIADAUCRKYBJgWDBSGdAwAKCRBMBCgYMRo95cNi
-AKC7fFzLCq2StE07S6rzg6qlF2tS8gCcCvoT7YvhqabHSuph+hbrF2KmabWInAQQ
-AQIABgUCRKkt6gAKCRA34/Rf7mXjIWs5A/9xV456Fiy+QelbGJ79sHIPl5Kn8VEK
-MuWvR+dknShRg88XdrGshMFrX+t2enDxr2upL3R8CA+eVDC/0yRj8SLbvn6nfEOJ
-qS8eYKkggdDtWU5nbb4BZvBKAXlddAOsZSFD/h6qw6Rl3ZiDTHOJKjq9Tip/Y9uH
-MpdxkKBNS1bqJ4iiBBMBAgAMBQJEo6lgBYMFI/TJAAoJEJrNPMCpn3XdHO0D/jpi
-VLkyBXm9pyAaVk+pwEswGiGSheHuJWlkBZDOrMFjM1JKJVb5AQ/VNwxNCmvayrWx
-jQEUXCR7eCT3Cp83Xh5YbbdEw9SHkgL7wEtGsK5zYbvtbWt7691P7hf0nuOwCOHM
-0oYTtRvwtEPvhwyfh/sSaMrCB40dHcER3Ah8pQBmiEYEEBECAAYFAkY44mwACgkQ
-FUWz/uIi3k9ExACePdDgJJIIbFmHOlKsujJWTC/qrA4An0uHorCRVAz8+kKQZgIx
-5NqYTsZYiEYEEBECAAYFAkY451cACgkQY9CtrpESA+RUtQCePtNKg8jbrN3ueYjS
-trawh3G5lDIAnAnQ/v9Ma/qv5wr9XMDqy1J0HmSfiEYEEBECAAYFAkY8i3YACgkQ
-mHDv8/EvYHJ7FwCdEWzRg49FioAHJYyA4aGaBq+E6qAAn1EJYuOIapCkdTNtgSdO
-VED8qNk9iEYEExECAAYFAkY9n+AACgkQLrlGgoiBdALMyQCgnKtTU45W/5/onEQw
-vmelpzjD3kQAoLbovb7PYL17191lNkhqXQwPfhx4iEYEEBECAAYFAkY99HEACgkQ
-oHLU0ENYxYSPdgCeL76rvCWZZS54TQdBEdmUjVTRSLQAoIxh3bzlylWpbwcoX7cF
-vXWH7H0OiEYEEBECAAYFAkY+A8sACgkQAqWmBQt+bPrESACfa1xOCw7mLohF9UT8
-LPrwfLiBoUcAoJ5wZPWEgX48CYqq1AgvCU/sno/AiEYEExECAAYFAkY9sPQACgkQ
-4eHysJkO1KoEBACfWIcYHg2ATN2RHfro75oc3UUjGU8An108ccnwGPCSlBy/hMD/
-/5FNUMpCiEYEEBECAAYFAkY+FSQACgkQVCINLMh0FVwjQgCff9ekxXn5ThZg1Jh8
-6BI6ijHxqTMAnjNNj/bANMs8/qMqNIMaXt+U+4zViEYEEBECAAYFAkY+FTcACgkQ
-Pipvwl8piCQrNwCfUmbCJLjfK96uCHgFoCyRwxj/F2wAoLwy5kBVlUE5lRZeIHt0
-WkMi3TYuiHEEEBECADEFAkZIxWEqHEhlbm5pbmcgU2NobWllZGVoYXVzZW4gPGhw
-c0BpbnRlcm1ldGEuZGU+AAoJEDKGTkGchSIrm6oAn2N1GZofPwqJQR/Q3UeE90Lt
-/Vf0AJ0QjqyO+yEKrIGxCnwBgXSy+6AjJYhGBBARAgAGBQJGOPRmAAoJEHPdjBYB
-UwI1Km0AoIa21wJevepbT/5TPll7QJECGD7kAKCdCWkWAzDVYslcO5Ph4dzwScxD
-T4hGBBARAgAGBQJGQPXcAAoJEA9FCiZiEL/A1PwAn3LhRkQs08VQQlFARFK34dt+
-R6l1AJ9rYqkIQ8HyRW4hNkoqBGrEBhf+SYhGBBARAgAGBQJGRhEFAAoJEKIRWuFf
-a4tymwAAoNT4GmHKozQ6hH9VS+4LSLwYJTeIAKDgpVB3iBZ3YfLsP3dSUFXS59A1
-zohGBBARAgAGBQJEow8CAAoJEMuuvjmkbEyhuz4AoJP5fyaw7b51/Rxj2T3ErVFi
-L63EAJ4zUAt6oDiAYcGM8aIPpdTbHj4gZ4hGBBARAgAGBQJGTENCAAoJEB8hI8Nr
-2HKg3BsAoLG2CWQCFOdb7dp+CEm3F1srkOUxAJ4wxo52iD70bLDz1Ic+zxWYNwwL
-oYhGBBARAgAGBQJGUm0/AAoJEDLB1u8PFDvByzoAoLey7JpjuwxQEbJcsf30OR4+
-DUCQAJ96lZ1+sFa5/uS86DqtEzYZXfxqY4hoBBMRAgAgBQkJZgGABQsHCgMEAxUD
-AgMWAgECF4AFAkQQQhkCGQEAEgdlR1BHAAEBCRD1wmAWTO7XX5UOAJsHKnihLRiV
-svMt6Iwss6k9ZkqAmwCeMz7aSaQp088fLrL6c/5cdEsM/haIRgQQEQIABgUCRl7U
-3wAKCRCahtfM0arqYE0OAKCcCVPPi6ffL/SlJaVRYL6k3xhinACglATLwd4moxdf
-ZMJABjncPlX4P9qIRgQQEQIABgUCRqVKAQAKCRA5vlGhCEyRE0svAJ9pJVwmNOqp
-ltECGy6d65RrZGnSeQCeNQ/r+SK4BWuC+a9LunFXLXg4KZuIRgQQEQIABgUCRq3L
-OwAKCRAzzWczr17EUo37AKDDROCi7WMPHymORd8X1I87WSRlrwCeJtcghuuOz9rZ
-hQe5ByqdzSuCRy+IYgQTEQIAGgULBwoDBAMVAwIDFgIBAheAAhkBBQJHYW1qABIH
-ZUdQRwABAQkQ9cJgFkzu11+WUACeIhfw6jEXCkbuMfGSdCsodaPnWYkAoJw+G8jG
-If3bd0jQg/QW/AqrlVjPiEYEEhECAAYFAkf9LD4ACgkQi5YpQ/wkPzw7tQCfdDjJ
-ZTmP0ZAzsMmTHSQEHiiu0tQAniAq3s1bshQPtH3TPfJGIuxkrmgaiGsEExECACsF
-Akf9JskkGmh0dHBzOi8vd3d3LmNhY2VydC5vcmcvY3BzLnBocCNwNS4yAAoJEH9Y
-T55N2dHEV3EAninabeLlvGJ3Wt98u4g8kaKBcnGyAKC2wa4tnUZmkIXtpNoOZuoo
-1nac+4hGBBARAgAGBQJH/UV2AAoJEJA4TZo1x+lCZ2gAoK8UmpEcOcsdzAJdabmC
-ZB4IqOAyAKDXFVEr6z/OE7H/WDExzjhdLWzatYhGBBARAgAGBQJH/cTeAAoJEBg4
-H9dLG+aY4d4AoMts+aAWK7LfgBsTvqqqPogrAv2sAJ0fSkPBoE1EFWiHrH16eSVa
-wqnfXYhGBBARAgAGBQJH/k7HAAoJEP1viMYh0KcbFO8AoKLGi3vvTxj7BwDrAxiw
-AcCLIqQtAKCjuo95uLA2prqo3ka5tGp4ffQgTohGBBMRAgAGBQJH/guEAAoJEIEv
-IIXC1Qv79jgAoITINhmKDZneFsQl6VlZTHpNEAjZAJ0dwAKhbQARulL+l94nzkgW
-23uAJoicBBABAgAGBQJH/k1hAAoJEDGmPZbsFAuBNcUD/36NVaC/kXiu24JZKq7n
-ZWEk7qLa212rRIRxJwAZJKta0ov68dyO1CPgm9e9zgValGLcN52JPCA4kcA6dMar
-MPqk9wWB6Pb6UfAM940Sk92AU/W29lRwaWhyMh1fC1twHELqW6VpNy5mNnhR4dXv
-tvaNMkMjq32sQCCFidLAtTgHiEYEEBECAAYFAkUPgjEACgkQsr68QBUpJK+5zACg
-oAz0aq1OrUoq/dnzhr7Z3XUanvAAoJrqRNBuE+n38oXZTi1oJ+k6qDbsiEYEEBEC
-AAYFAkY44nIACgkQFUWz/uIi3k+VgwCfV+TKT3qn1PBzfALIPO3DMNpeMFkAnjsn
-B4L1Tgl/LCRcYEH/fGkDW6JRiEYEEBECAAYFAkY451wACgkQY9CtrpESA+SZ5wCZ
-AdCisYSpjSXFMlrhHDUeW7/BhCgAnjehPdZrqLC3DvP5gDpqdBPT3pS0iEYEEBEC
-AAYFAkf/TFUACgkQPJpCBAwIhbSGwQCePTdVbRJtPyhsAAEKYzSu2pUOKEAAnRKO
-vEhP5ZOWQLM85ZfRNVdlmNmGiEYEEBECAAYFAkgFPukACgkQjqOwaEx2V/ERfACe
-MUKrZm8MAyt21NIdwCjDMigcXFwAoLp14Kws4vz+LprDCcJtjBv9O3gZiEYEEBEC
-AAYFAkgPSo8ACgkQGGHDIsVgFLLczACeLNnpzZRTHXiIV2V0bM2nFI5ZELIAoNG7
-VqZlLd8CQZ46kRabdF/Wo1lMiEYEEBEIAAYFAkoEAQwACgkQwOq+CPYjp6vPtQCc
-DCOVFKt7nwos4X8xQ7mIKtISPxIAnRZ1O2ohl/Yf8vjkaQBDOCYGQROwiEYEExEC
-AAYFAkgJ8B4ACgkQ3oDmVhn5KRhdZgCgjmpf2g5P/76QN0uQ6AoCRB+g3sEAn1rb
-byYCJYZTVm7UBTDmx8lvYFxSiEkEEBECAAkFAkicZZICBwAACgkQpHjEe8toN4bP
-igCgw07F8KB86KuNxDSUeNi7ofke50UAnRGaC7wlGB+J084g5xpebaCu4h4piF4E
-ExECAB4CGyMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkaCzIUACgkQ9cJgFkzu11+k
-QgCfb/FwMf0C2WOU/feUvPG8x1mqDJkAn2e/lNVAcx0c+iyuo59vBJ2zAbtQiG8E
-ExECACcCF4ACGQEFCwkIBwMFFQoJCAsFFgIDAQACHgEFAksVNmcFCQrceCYAEgdl
-R1BHAAEBCRD1wmAWTO7XX4LkAJ4/1h41iGzV1TC9yA2fKqgarsIOJQCfWNllqdJJ
-VcS2DKwoxnrO19Cq/j2IcgQQEQIAMgUCSAtk1yscQmVybmQgRm9uZGVybWFubiAo
-QVNGKSA8YmVybmRmQGFwYWNoZS5vcmc+AAoJELOX3RpTbavtE7IAn30QKKf3CDm/
-zE+wuKMPv9GywgyOAJ0Xc07ZuVYHWy+zUmyalUUTgMjFYoiiBBMBAgAMBQJEo6lg
-BYMFI/TJAAoJEJrNPMCpn3XdHO0D/jpiVLkyBXm9pyAaVk+pwEswGiGSheHuJWlk
-BZDOrMFjM1JKJVb/////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-////////iMoEEBECAIoFAkgDeRkfHEppbSBKYWdpZWxza2kgPGppbUBhcGFjaGUu
-b3JnPiAcSmltIEphZ2llbHNraSA8amltQGphZ3VORVQuY29tPh8cSmltIEphZ2ll
-bHNraSA8amltQGppbWphZy5jb20+IhxKaW0gSmFnaWVsc2tpIDxqaW1qQGNvdmFs
-ZW50Lm5ldD4ACgkQizpgHwjJdeUxJACfa18wFcsXHhn+iqVupgy4TL5xuHsAn3bi
-2H5OV7TTP0LqaEkZ53Bv/4/KiQEcBBABAgAGBQJICJ7zAAoJEBllhVDDEQYR4rsI
-ANYOyVHLcQ+e/DVhYu7cDwM7sCFQxuXD45QgljCOA1B5VBCHD8D6J5LmjD+jYLTC
-mwypEH4OPzCtYzlepdq2tr3aMloLRpCbbmkv6g7Ap3bc9ocmjic4TKDJSHogZ5GL
-7KvMKNvGfB5STxkau0V/RY72dZFTymKWhy+7ovee7sRwQ9FZty4vdlMwy7IwE45C
-HACblt4Sr4yhkHJQzI9qSLDXJ/z1Aclz+B+r+eFLijUNzGzDi4GfrFEsZNJmvP8Q
-y870RY/IW1/6ESvhEiBhRAsSkOUg/MCetXc4rXmCYl6z4raHmFc7KCJiR0Jpuik/
-iPIvlI/xuvP7EPIaNRU7eaGJAhwEEAECAAYFAkhEBG8ACgkQGT8YCrVdmXdOLhAA
-tnh567oUERY1k0xSh/eZu1ZnTCelRxZRBQox8x+4yqUYCVhkme+qclxNxEgSArCT
-9w1cZgSvs7nxG4xzyK+O0kyrRfpYipHtDar9M4zbYiRs69pe2dS4ZaMvzozH9XrB
-2tSwlrO7AHSyLurCPeHLhrU/EQ43B/ICm78ZIOrpMi4MFQjJhDjA52NVpG5ksusY
-GAl14zWg4iX/srpEpwP41JTTI9MhSSS/81+UBihr6cprvP51BjysYCrwQjRjpo1B
-EYiUa4O3Bcjeuye3YcJ3wv2lC7Xl8g/8y7BBo4npOrstVLNRXakWIuMCpi+tndYm
-qrVKBqWBjkuKkzrw8dUYfs7xf2Pg4NfQNg8IjYgtocAHp9gv8Gjv6Bwspd8I96Lz
-06hxLuPgzJ3vWRYr5HeolLOdbibkGxc+G7MBXSDyc0l3jmeoIYWjZpH4/ofLI1Gs
-XwNr7Tyx+vVo3uwSarxo8s0Jny+WsBcGIstfnRqlf7hwhXxOINKid1aNpOy75QbD
-bZ1PT8QTxzL2ydSxVlO/FduB9I9eWEp8/u65axQyjb2WcsmNW5B/PkPp9Qa6tg5T
-TtUH2h1FGMPsD4ac8R46EyXwBFz7/5i4kb7vV3Egf0sa9COrGE3Q07cUdguh0Ku3
-GF3mrffy8/NUzMxG2IrYmK1vSBARk9slREmc0fvOsGS0HE5pY2sgQnVyY2ggPG5p
-Y2tAYXBhY2hlLm9yZz6IXgQTEQIAHgIbIwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUC
-RoLMhQAKCRD1wmAWTO7XX6RCAJ9v8XAx/QLZY5T995S88bzHWaoMmQCfZ7+U1UBz
-HRz6LK6jn28EnbMBu1CITAQQEQIADAUCRBA7ZgWDBbdiwwAKCRBmqPqK9EMfJjr6
-AJ9FwtGlQgcpWEduud3+AZG2sbtutwCeLvVMa/2tK4aFNaPF4NQWhxQQLrOIcwQQ
-EQIAMwUCRBBGKQWDAeEzgCYaaHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBo
-cD9pZD0xMAAKCRDSuw0BZdD9WLC4AKCHTJJJ8aK6ozLNbGzaF2jumWx9zwCbBTaW
-tC+3EHcOAQCQDxJvyWyNOtCIRgQTEQIABgUCREvNDQAKCRBghaOGQ6aJauc/AKCk
-Tym6ExTuynqqgyjUGf64SvSCRgCgiM9BjXX1llh/GplOrLsX9pR7F7mIRgQQEQIA
-BgUCRKP0UwAKCRA39o/1AVr8iho4AKDZ1rVmNXD2KAHHJZshHvwGpRz3VwCg5Z7h
-pclWyw3OkKaz/G4T08lIhxaIRgQQEQIABgUCRKP0VAAKCRA39o/1AVr8iv7vAKDm
-8vafCQje4clfIK8zMM9p49iXZgCgs0yNw4/TKBiLOivD9EYbg/2AdRaIRgQQEQIA
-BgUCRKfNMgAKCRDVM051sTE94gSBAKCuLDG2Y+1QIc3laYplWyMHXyhsjACgju2+
-lpq9xGv1M+b5PYdAhDFm0vyIRgQQEQIABgUCRKkt2wAKCRAyyeTONkLLS6iUAJ97
-ELvsa6Wlmg5UCsa4AAephiEDFwCgn0YHqUwx2bVWL1elR53bTWaqEqKIRgQQEQIA
-BgUCRKkt3AAKCRAyyeTONkLLS8u0AKCVHlUT9Z1DNo0a4e4Kd0dF1w9D/QCfdD4p
-fO7Q7Mj85WYli/d8Hj8fHeSIRgQQEQIABgUCRKquQwAKCRA1i6ozUPlhFmyZAJ0a
-jTr1w6VG+Rp8j9MwbziOKQIVrgCeID7Mg0N3mDFE414J21I6As5ad4uIRgQQEQIA
-BgUCRKquRwAKCRA1i6ozUPlhFuGVAJ9tFzH7Ps/aLNuIZDKyYEu86ZHDNQCePZ/6
-g83Q7/umflsLEDmjwJWGVc6IRgQQEQIABgUCRKrPUQAKCRD7N9pAMy5jzVa+AJ44
-NFxehfXUyS5Fwkx5g58Qznv1zACfarUp2KPdpN0vu5ppqNsFs3F1IfOIRgQQEQIA
-BgUCRKrPVQAKCRD7N9pAMy5jzVG3AJ9ijwFqX09n3y1DRB5oTYaKrnbpEQCfW6Pe
-rlHB+pr/LOsVFXBBjazXFWyIRgQQEQIABgUCRQ+CMQAKCRCyvrxAFSkkr7nMAKCg
-DPRqrU6tSir92fOGvtnddRqe8ACgmupE0G4T6ffyhdlOLWgn6TqoNuyITAQQEQIA
-DAUCRKMCVQWDBSSb1AAKCRCUUEP1NcEA8PHWAKDTxu78kl7H4II+e7zf+J3elYsh
-9QCfV2hd9pGysjeTnQvGd9d+sHdWlSiITAQQEQIADAUCRKON0QWDBSQQWAAKCRAt
-IatlZUYbeaNPAKCBhlOXXBp70dXL1rK0EQKXbBAW3gCeLI2XEHubbA+0QsuW5Txc
-imxGOuuITAQQEQIADAUCRKRJ+AWDBSNUMQAKCRArfoLnQ+8hH+HCAJ99jqLaljMH
-/0r+xQwPStGcdFi10wCfcGFifDf1/kNoeRGhrqLV2gxIVgGITAQREQIADAUCRKMb
-GAWDBSSDEQAKCRBWDQhh7n3HThrjAJ9TRkel0blwKVBdskNlFU9UfkwkSgCfanH+
-p7oU6n/ZSYI5IGiC47crml2ITAQREQIADAUCRKMbGAWDBSSDEQAKCRBWDQhh7n3H
-TviwAJwKn/we6Khznqlq3svyYn6Z/6FZsQCg3acpog5M5TXkneKEoml3q9TjmC6I
-TAQREQIADAUCRKMbKAWDBSSDAQAKCRDKcp1iYD1PVH7JAJ9M7kVdEF8mLbkjpe9Y
-wHiytkn/HACfa9YGteCB615GB2umE8N5FrIFuSyITAQREQIADAUCRKMbKAWDBSSD
-AQAKCRDKcp1iYD1PVN3rAJ9N1tyJKWm1F9vL8ZL5XNGNepUToQCgs5VQVYaWpUD/
-yMYfZJGVo9iMb1+ITAQTEQIADAUCRKOpaQWDBSP0wAAKCRDdumS6LDEtLxzJAKD7
-xSTQm2ISTPu81XyR0FKCzW6KEwCfQqQmq1WwHfpPbCiQH1rm2Nx9/bCITAQTEQIA
-DAUCRKOpdwWDBSP0sgAKCRBQjq7FMC2laGkcAJ9RpqozM8POhvOxFelODFK23OIE
-sQCgm4nREEmun8CuTh4wwnSOigN+oVSITAQTEQIADAUCRKYBJgWDBSGdAwAKCRBM
-BCgYMRo95cNiAKC7fFzLCq2StE07S6rzg6qlF2tS8gCcCvoT7YvhqabHSuph+hbr
-F2KmabWITAQTEQIADAUCRKYBJgWDBSGdAwAKCRBMBCgYMRo95dDjAKCe1C9PugyI
-om1OSp1h8NexosdYKQCfdrvNdRnQQAOwUKynG2FNT+uvnNeIYAQTEQIAIAUJCWYB
-gAULBwoDBAMVAwIDFgIBAheABQJEEEIZAhkBAAoJEPXCYBZM7tdflQ4AmwcqeKEt
-GJWy8y3ojCyzqT1mSoCbAJ4zPtpJpCnTzx8usvpz/lx0Swz+FoicBBABAgAGBQJE
-qS3qAAoJEDfj9F/uZeMhazkD/3FXjnoWLL5B6VsYnv2wcg+XkqfxUQoy5a9H52Sd
-KFGDzxd2sayEwWtf63Z6cPGva6kvdHwID55UML/TJGPxItu+fqd8Q4mpLx5gqSCB
-0O1ZTmdtvgFm8EoBeV10A6xlIUP+HqrDpGXdmINMc4kqOr1OKn9j24cyl3GQoE1L
-VuoniJwEEAECAAYFAkSpLeoACgkQN+P0X+5l4yHqQgQApwmwLY1GIuEUdhjFdSNL
-itGjmhScR2WtVcc9B8ycqiHwdp1slM2JpiI8ywPZQvGiSlrZjpydYUm2ZuMrfm0f
-3HVqDdGU/PBouKdomQvH18RSlj/IGGh+Vawo+RZdAYwT1Uz1uE/Ufr/p0hwiJw9/
-m22NxkzXhT/a5ffYHnlWy5uIogQTAQIADAUCRKOpYAWDBSP0yQAKCRCazTzAqZ91
-3XTiA/4ghbGL8OrQXctihIJr+7TZL4WnBVeWNvkkQQn/6nlKj+ESN2jwSw1mKLBT
-jJldAbvRYfrmmgjys55Qu5UajovVO7nM2AZgPIFQi1M84m0zuaKZ08oIZchXjSfL
-tFU18FsubAqvyEP0ZzIkQq4Ei6NDC1VxIDUFECRZxl2L1R69qIhGBBARAgAGBQJG
-OOJsAAoJEBVFs/7iIt5PRMQAnj3Q4CSSCGxZhzpSrLoyVkwv6qwOAJ9Lh6KwkVQM
-/PpCkGYCMeTamE7GWIhGBBARAgAGBQJGOOJyAAoJEBVFs/7iIt5PlYMAn1fkyk96
-p9Twc3wCyDztwzDaXjBZAJ47JweC9U4JfywkXGBB/3xpA1uiUYhGBBARAgAGBQJG
-OOdXAAoJEGPQra6REgPkVLUAnj7TSoPI26zd7nmI0ra2sIdxuZQyAJwJ0P7/TGv6
-r+cK/VzA6stSdB5kn4hGBBARAgAGBQJGOOdcAAoJEGPQra6REgPkmecAmQHQorGE
-qY0lxTJa4Rw1Hlu/wYQoAJ43oT3Wa6iwtw7z+YA6anQT096UtIhGBBARAgAGBQJG
-PIt2AAoJEJhw7/PxL2ByFlMAn0ObZB//ygm5IRIrBEedKao+1fHLAJ0SE2jSlD2d
-QrM9ZOTjhk69d1zLu4hGBBMRAgAGBQJGPZ/gAAoJEC65RoKIgXQCbh8An2T3UfcJ
-aOBD2PxeO1jB02rsZO7YAKCfxHO8P9bgiQ1PiTYkJG7mv3Ve1IhGBBARAgAGBQJG
-PfRxAAoJEKBy1NBDWMWEj3YAni++q7wlmWUueE0HQRHZlI1U0Ui0AKCMYd285cpV
-qW8HKF+3Bb11h+x9DohGBBARAgAGBQJGPfRzAAoJEKBy1NBDWMWE+ggAoIQn9ssN
-M+ielErvMV86t7NzFjF6AJ40Qvweaacehp2LDVPRqwI45CC6rIhGBBARAgAGBQJG
-PgPLAAoJEAKlpgULfmz6CbAAoJj7TA2PSbwAV6mIxDJ5S2szAU6IAJ9ZvPJF4Xbo
-RyamzXJuBmqvAzNUrIhGBBARAgAGBQJGPgPLAAoJEAKlpgULfmz6xEgAn2tcTgsO
-5i6IRfVE/Cz68Hy4gaFHAKCecGT1hIF+PAmKqtQILwlP7J6PwIhGBBMRAgAGBQJG
-PbD0AAoJEOHh8rCZDtSqBAQAn1iHGB4NgEzdkR366O+aHN1FIxlPAJ9dPHHJ8Bjw
-kpQcv4TA//+RTVDKQohGBBMRAgAGBQJGPbD7AAoJEOHh8rCZDtSqE/EAn2eZe8Bm
-9tEOD3TVq9uUFI6jWPekAJ9WBbUrwzBgcwPLkqwBkbB+5F2J74hFBBARAgAGBQJG
-PhUtAAoJEFQiDSzIdBVc264AmOfhnlKk+Ln1yGp5KH/2jao0/E8AoKdc2kxlZ3AS
-b3ev8mkt07CTmbxhiHEEEBECADEFAkZIxWEqHEhlbm5pbmcgU2NobWllZGVoYXVz
-ZW4gPGhwc0BpbnRlcm1ldGEuZGU+AAoJEDKGTkGchSIrm6oAn2N1GZofPwqJQR/Q
-3UeE90Lt/Vf0AJ0QjqyO+yEKrIGxCnwBgXSy+6AjJYhGBBARAgAGBQJGQPXcAAoJ
-EA9FCiZiEL/AQakAnAnGA4d9aoF9ULf/XXv+DL6D1x88AJ44p8T/4+a7KdXmRHSF
-oKlO+flPO4hGBBARAgAGBQJGQPXcAAoJEA9FCiZiEL/A1PwAn3LhRkQs08VQQlFA
-RFK34dt+R6l1AJ9rYqkIQ8HyRW4hNkoqBGrEBhf+SYhGBBARAgAGBQJGRhEMAAoJ
-EKIRWuFfa4ty1j0AoN4A23s1qAmCu6prVzPxgwTQEwDWAJ0Yu+TVfAK4yd7+Bt5O
-iLl2CefS+ohGBBMRAgAGBQJGPZ/gAAoJEC65RoKIgXQCzMkAoJyrU1OOVv+f6JxE
-ML5npac4w95EAKC26L2+z2C9e9fdZTZIal0MD34ceIhGBBARAgAGBQJEow8FAAoJ
-EMuuvjmkbEyhJBYAoMrzBmjYbeIUnFGs4fWrefAS8IMcAJ9oDOjlH7YiCY8JVq1z
-6jPcw4nDCIhGBBARAgAGBQJGTENCAAoJEB8hI8Nr2HKgpGMAnjSWEkAVSXLFQ+dR
-D6iptacCBEN9AKCvoFa15NhmreLXEXFVVF297ZcL2IhGBBARAgAGBQJGTENCAAoJ
-EB8hI8Nr2HKg3BsAoLG2CWQCFOdb7dp+CEm3F1srkOUxAJ4wxo52iD70bLDz1Ic+
-zxWYNwwLoYhGBBARAgAGBQJGUm0/AAoJEDLB1u8PFDvBVdgAnApoExYfK52LGHDP
-BVFnVICqOxsVAKCiOZg2IETKtbaNJMq8s6VIxuU41YhkBBMRAgAkBQJEDXF+Ahsj
-BQkJZgGABgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEPXCYBZM7tdfe9YAniX3VLEq
-LKdM+LUFpmTEAcx0TYt1AKCAKSb/vNAIQB9V53ir6lh0GepeXIhGBBARAgAGBQJG
-XtTfAAoJEJqG18zRqupgB9gAn2pvBZD96AHWbRO1LglVVoImpYDTAJ9/PnueQo3f
-ANGfjL6Ky3YhPc90vYhGBBARAgAGBQJGXtTfAAoJEJqG18zRqupgTQ4AoJwJU8+L
-p98v9KUlpVFgvqTfGGKcAKCUBMvB3iajF19kwkAGOdw+Vfg/2ohGBBARAgAGBQJG
-pUoDAAoJEDm+UaEITJETPccAn1toaclGPSaJ4Lyxiarj66eh/simAKC7kxmfF9pi
-2YPPHUF9h7AFYE6lH4hGBBARAgAGBQJGrcs/AAoJEDPNZzOvXsRSXF0AoM3+o0ta
-CMlQsPVNrWR3Q1oCdQNZAKCSDcyBFTomrWQjr3qU8Njz5cBr3YheBBMRAgAeAhsj
-BgsJCAcDAgMVAgMDFgIBAh4BAheABQJHYW1tAAoJEPXCYBZM7tdf84MAoIf/NewT
-tz5S1FV/I4PLOE9Uu95RAJ9iJFOqoGqFnClrlj0BnOOtEyK0AYhGBBIRAgAGBQJH
-/SxCAAoJEIuWKUP8JD88O7YAn0RrApjTMPoApGlA2K8asendTgDVAJ0exP17HNvi
-RetossL2IoT3RFDp9ohrBBMRAgArBQJH/SbLJBpodHRwczovL3d3dy5jYWNlcnQu
-b3JnL2Nwcy5waHAjcDUuMgAKCRB/WE+eTdnRxFivAJsHddxj4My03ph50YCpYou1
-rV5CgQCbBI1k1KOhStMeAatumKxHl6uBGvaIRgQQEQIABgUCR/1FdgAKCRCQOE2a
-NcfpQmdoAKCvFJqRHDnLHcwCXWm5gmQeCKjgMgCg1xVRK+s/zhOx/1gxMc44XS1s
-2rWIRgQQEQIABgUCR/1FdgAKCRCQOE2aNcfpQvxRAJ450WRlG9019v/H7Z8NUDA2
-iPWuGgCeO8drcUcRvka4Nf+rBx54f0vPxROIRgQQEQIABgUCR/29+wAKCRBz3YwW
-AVMCNQonAKCD5WyYnjhCbYoiH1kECtaZ+SwDWwCeJceq6Cx/ezn3guilX54oPv6q
-zGOIRgQQEQIABgUCR/3E4wAKCRAYOB/XSxvmmBSiAKCt+n9yBVnsWcYz1/pxDgNB
-sqMTSwCdEWY2/bqHvX4pnNmz5NJgjsaywqeIRgQQEQIABgUCR/5OxwAKCRD9b4jG
-IdCnG3KAAKCnX6lv3Lp2seZjIpTfNBvm7ot69QCg6gdaH92+hllrNo1I4aYoEnAu
-qcOIRgQTEQIABgUCR/4LhwAKCRCBLyCFwtUL+9hlAJ4sUdJVdkc5Bo52Qvl61mMj
-RQ2LgwCaArN7TVN/mpHlK1B+sZ07WOAWMvGInAQQAQIABgUCR/5NYQAKCRAxpj2W
-7BQLgWl6A/9Ir/CmmvJ5OIgsALH2hdoLieerdOvd0IUv6Ymu6Hd2UFJQRxcvuKlp
-dbxuW9Rd82LIHxhQ/2qwdMrENF21vwDqp0tB6pyeqU9E1DM0/ON07BGYYmFvOqK5
-LaN4chgt0QmnTWit49WdivDd+ry3K2efE3VWD+YoDlS1EKUWbc0EUohGBBARAgAG
-BQJH/0xVAAoJEDyaQgQMCIW0I7oAn24xvOl5noE/TQby/Kr5XxDf2GWBAJ49Ti4Q
-o3iB+2j5JCeaMYYa0CHC9YhGBBARAgAGBQJIBT7pAAoJEI6jsGhMdlfxEXwAnjFC
-q2ZvDAMrdtTSHcAowzIoHFxcAKC6deCsLOL8/i6awwnCbYwb/Tt4GYhGBBARAgAG
-BQJIBT7pAAoJEI6jsGhMdlfxk5AAn0lc4Rfm9HIFB0iWqRzehNsNcrDSAJ9Teb/0
-V5Zn15NtvtEPb2Oy353ZvYhGBBARAgAGBQJID0rtAAoJEBhhwyLFYBSyASIAn2uq
-5Nb+RDXubzlSM/RT2zKyrg6EAJ9OyRlc/Fzax3pOyX1CFKFLoTnhpohGBBARCAAG
-BQJKBAEMAAoJEMDqvgj2I6erNW4An2cy0Lld/cf75SPfDLO92LFZt2wKAJwIR6xX
-JUBgvWBbGBQZKGhXh7It/ohGBBMRAgAGBQJICfAfAAoJEN6A5lYZ+SkYw4QAn3Y2
-5DbJ/qb/xnXQHgdWtVXpez89AKCoAO3juvgHNvk7TjQjsDH2dMXS1ohMBBARAgAM
-BQJEowJVBYMFJJvUAAoJEJRQQ/U1wQDwd3UAnixUvJNpSTuE2bEIw7QqYAggAlDk
-AJ0TKLrI0Q6y5CuZnx++2XwJin4T84hMBBARAgAMBQJEo43RBYMFJBBYAAoJEC0h
-q2VlRht5UHAAnRgIYNwCFFJ0PuIduo403hkmwR6oAJwK6zkxyTXat1Q24fcg1ZOb
-kyZfR4hMBBMRAgAMBQJEo6lpBYMFI/TAAAoJEN26ZLosMS0vwpoAn3Wa+econWw/
-+1bxXlkf2mZVcvLRAKCJmdPuz2ux0AA7vBj+Cpy1P2sOsYhMBBMRAgAMBQJEo6l3
-BYMFI/SyAAoJEFCOrsUwLaVogsMAmwfQ6XNobfWkPpyIQl3PPKfxHqQNAKCpjRan
-gLOpVFV5kNpxEqPXcnd8xIhnBBMRAgAnAhsjAh4BAheABQsJCAcDBRUKCQgLBRYC
-AwEABQJLFTZqBQkK3HgmAAoJEPXCYBZM7tdfuJoAnRtou2khXTC6XAJ28xvsR4Ji
-1h/QAJ48KdVtZKn2j4gUN9Anm+EckLctvohyBBARAgAyBQJIC2TXKxxCZXJuZCBG
-b25kZXJtYW5uIChBU0YpIDxiZXJuZGZAYXBhY2hlLm9yZz4ACgkQs5fdGlNtq+0T
-sgCffRAop/cIOb/MT7C4ow+/0bLCDI4AnRdzTtm5VgdbL7NSbJqVRROAyMViiKIE
-EwECAAwFAkSjqWAFgwUj9MkACgkQms08wKmfdd0c7QP+OmJUuTIFeb2nIBpWT6nA
-SzAaIZKF4e4laWQFkM6swWMzUkolVvkBD9U3DE0Ka9rKtbGNARRcJHt4JPcKnzde
-Hlhtt0TD1IeSAvvAS0awrnNhu+1ta3vr3U/uF/Se47AI4czShhO1G/C0Q++HDJ+H
-+xJoysIHjR0dwRHcCHylAGaIygQQEQIAigUCSAN5GR8cSmltIEphZ2llbHNraSA8
-amltQGFwYWNoZS5vcmc+IBxKaW0gSmFnaWVsc2tpIDxqaW1AamFndU5FVC5jb20+
-HxxKaW0gSmFnaWVsc2tpIDxqaW1AamltamFnLmNvbT4iHEppbSBKYWdpZWxza2kg
-PGppbWpAY292YWxlbnQubmV0PgAKCRCLOmAfCMl15TEkAJ9rXzAVyxceGf6KpW6m
-DLhMvnG4ewCfduLYfk5XtNM/QupoSRnncG//j8qJARwEEAECAAYFAkgInvMACgkQ
-GWWFUMMRBhHAhggAu4x4MuU3QKtLUUhaIYMl58gIfvODPYLZRlOXvm6mIgI9zEYW
-mwJ9wugIzSNlufKOahoqwOoTCFL5sdR7ExzZamNZFAwR80hQYKibGIadp0jFhne0
-MgMVMxm69bnVt6mmJjHroHVuPyjNEJvKHqxD0dvzdBjT7jqzCEsaduK0RV7fRy9M
-9d6uFRoCOrjLWhdNvCH3+D3GSVJPP88M2ghOd5L/DBij77rFF6ZeXe89D8vfyq0W
-lQZYh5/gkMIE3ZL1FfxYmCCgOeYSa3I1Qa6grwM4S+JBymd9+3JtzpLoAgNBxM+P
-BG71Ss12xVxATwPw9SueYyFkEeSVnFAWAW2oeYkCHAQQAQIABgUCSEQEbwAKCRAZ
-PxgKtV2ZdyvuEADIaZ/6lr5QL+aYDA+hqojD6fm7jQqobeAGq9e5n41EbcggEcYf
-VSaHh6KUJ/nWwM61FSiA3q4Juo/JWLAU6KF4rsSfB6fHTar5N8h0kSJGGENEIqM1
-rNHwaVwqenhI9OUbJxBaKUXb/m+zIY3O4cgTtEy85uUxgDcZe+ATNT7AQOhJkWgm
-GnEafJ/VCYCIsuV+aHbFqtGd1IN7NYFKKpcyVNloeXjz7n2hKe8T6Bp4RhSbGjLA
-fDySukHNQDEaf4cgQr9XKaCIti15AFs+3p7beQMusMXgjKiBWaFgC6ptLsGqDgo7
-36NIyPzSsb/C/XZbebuFsyKyzxWEArlo0wzc8BZsjAfbbXvcOHqcJKi3qwFK2q/T
-m9N0Fv08h0fTh/kLIuZcCY5vr57SKZxzndZSCxsm6GJMYEaX0IfzgbA1JllDWgMV
-GTmAahO+pCnScYFswiftRdW5BY3+aH2+61HgLZmQwhpbnYvU4bWy/Y5xjUQoLZ9N
-2QBgYH/z4FPg/jlLYQHlMTollG9EbteNLjACCuYXnKXHUsgFSJKSo09KK17wqlDp
-BljARzdsF3XEfgMPfOsLQzG8gkK3OuY0NCw3uK57oiwInJL9DYJomQR71Bua+Opl
-BqLn3HG4NyaLuosUeLw4x54ixFDkLD25GcUGsdseJhGh6kq+/0zf0BSesrkBDQRA
-YZyuEAQAjlaXJffYOFtdSmqYmxHHSAxAnWxEtT7JQP+eYvmITOJJVLZiNCP6/smn
-WBvmUduWVkyND0Yg4/L8tcQF7ZHtOg+Xz9tOM/9ojBs9K7C5Iiyt385hbzyO14jZ
-DMa3/IJO4nsRq0aXuAIYw8g6f3yuYkG3xR8kb1RtSB4HBZxBF4MAAwUD/0GMHXYP
-nrmwdoRGP+qLLypqTchAQWxc7JTMVpFLC9O6NAxtkuYiLB5EE7eMcfO9lYWEEOKH
-TOqNYSTZwe3+N3v5+P1oRLT08ge9Ue2vF3FQfzs/4rSDvWhQIrgXypHRGGkd6rhc
-yIf2Lh+Czc9UCdm3oQptczMGTXNRqAHa2YbkiFQEGBECAAwFAkBhnK4FCQlmAYAA
-EgkQ9cJgFkzu118HZUdQRwABASqQAKCJnWqgmo4RHeb55WKcuvatypqlawCgiAop
-7VhXP77oefACKJXYKwyHiCSITgQYEQIABgUCR2FtmQASB2VHUEcAAQEJEPXCYBZM
-7tdfP7oAn23vRtAJ0vDIniIXqfsRPnpsO62YAKCEyvgx95NgRj2n1WMrKw2RPO2W
-Mw==
-=8rmt
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   8192R/D84E41AE 2009-05-08
-uid                  Nick Burch <nick@apache.org>
-uid                  Nick Burch <nick@gagravarr.org>
-sub   8192R/18C4CB00 2009-05-08
-sub   8192R/7092622C 2009-05-08
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQQNBEoELHkBIAC0A5jg65W9e4W/w2lAO/vG6OkbXwOaMRF+frCgqDPIkkVU7AeF
-O30xmuPpRR3ZSfbvOvOdEm4RygyxHRHgl6WUKGF6aRk3U9gxD6xfTl3n+va2U16q
-Qf3lDpB1/H3QfZST3wGTtn2yIRYcbFzqz/e3GfIEKDmPHEQDhgHNDjXBU1sBnWk7
-GugPUrYbfikHzfjfVhEXNr6WdzKFpPKt9tW1oDhspGFxg3A6cgWtJhlGutb7QBTO
-gQ+KeQvhNEfEAMo74rhC/6Lj1evshoJf42AOk00IlI1c12JIQY9ZEAwjbrn/592g
-CrbSlQkzmh/bMeKX5qJHHE+RiknzzpOXLIicqD2uJxN+uY1WT+js2AytoF67U4k6
-+kJJiftkKgOZDml/BlgWNLAFio7D6kjl9DppcsmbYUmNF1gH/prpvA7w3uzmluso
-XzyMA9LGPTg3UBN1x85D2KUAc9O1plbBi+RgBL+v7ON9oxNHS4orwcxdR7LHDxEO
-oW+a4TGgN1mCvK7hgSZ9OtKMu/VoLuXSh565b9IF8QY80rESqyThSuaC+s73wjJT
-0MADvmhgWsq9q5GdVxvG3m3B56wbq2Xb0Vmn7wxUVl5ASSgiHGPyAu0PP4JVSGJJ
-mv0HLnAyVBWYn2Wo1+O2ac39exwkBQXWdT7hv7pnuVvqix7lKkPqxbOF5w/HBqaG
-arOUQM+I+Z9XhdK1htZ92rgz0uI9BEjg0hHm+XDlLGwHHFC23HEjKrqVd7OEbE7g
-b8qGse/PIjTOeDHa4xjHD5PfBMfvOIdNxvtu1Wc+GWrtJm2BllPJwN/YxtQp5nu1
-ZV8+cHGJAZ2DYfihNzZrtzoEcSBG+nCErkqQS97B9cQHh8Iu2OkNVY3ABPjEghKt
-gs5H+B4foohiD6X/6hNSCzgLJ4VTxGBojUAFsL2TqX/gVgnhcvZHXwv66QBf7Tyc
-zyDgEj0soqsc5kkZq2Fn4voXDVzUmviXjZCXQYmoRTsZFhe2bnlpW9i7tMIM04TU
-soM/FB5LV3Em7b2olt0j9ctaLRTEnJu3hGMPFpcmKYv4R2gBM/kT2JBDAZIhyljl
-iI+VpqFT8YHnHKD8gkhXL8pRHKhbFpi8RgGKV0uRZjJllJy7F5YQQrptgOb7obhR
-R56H8+avh91Qyj8Lj4pG5479m5ltRW6AeYbCX1J+GcG0ekmVVmXRzc7UOZ7oP8Xs
-oa1EzEFS9pCLxWBSb9sMm4uqeAPDOK+gnyhPBOk9OIsESpTxda9Jw2sBRmy+hIRI
-N1maGfHXGoEotxRmZ4wLMlBzWjOoZCfpbZgJhawNkwNvJVnwpPkdFS3KxMrBFa6u
-2GSSFEl+08OEFGVvLU5wiiEck3L0s7y8BBEfABEBAAG0HE5pY2sgQnVyY2ggPG5p
-Y2tAYXBhY2hlLm9yZz6JBDYEEwEIACAFAkoELa0CGwMGCwkIBwMCBBUCCAMEFgID
-AQIeAQIXgAAKCRCKr4jW2E5Brq5FH/4ryVlBMELqMG+FbVWQa5S0WMRaZ7iZ4jyO
-rwbmYeXwg68WaiuoN5DVt0JaA8qD07q0YDFtKcZ3UxJDJ7NHhOTQyTiXUSjFyLWH
-6Qtv6whBHnJxOIxEdFArxutIQsgOw0iRvGmOR3qov8+NWhmZstwcX1ERRa9f47YQ
-aV8lILrDuc5IMaOkVYGngwI+k6MQ26HbzD6H8YNJOFYUxRK0mdM2O1vbqboQNK7+
-ltoEk8EwSdfTRiWmUoSmGJAE/yoqIYG+DVOCwew8xaCiaQltcHU9nldyyJvLl/GC
-pRY/hoZymti+b9oXqH9ZQZ+K8374Ehn7dHa6A6GXt9W6G+LsqyP+tvNLOa1wf4uZ
-ag1YauH7riXkkIX0jAwiikvM31egFUbWHRS7dHqiMyBbTowHrdEvDD+wMo9eJJ2b
-Ce2Xn4pwjXgppnzUBjj+t7zm9wvAw9FsK9lZ5M20x9qjWPx0L921Tj3DWBRnEr13
-Z3gdpv/d1ByZfPA2WGh+zKr8yxOAA3Qml+cdZltEQNMrKEoPcTOaI57WEHZw8wjV
-FNQEIUQit97kAeXKYE9gQAuk3ew7saabsBCjfXi3yIRwHqoPdcI1iBub6QA5jxrl
-/fEPcAJv+pV7uCTtXv7HjFoo4/mQSLxYB5tg2YsBXMGXCGHaI4E2Bj4c9Ai2A7tu
-UGoIE4+WfeN7yH6SjcfH54Im1QSh4MHTrcI8D7MEUNEwpJ2fjG6+5Wa+yx88vnNY
-Pq31UMB6UGGF/5W6RO47OjsdGSVgHB3POwEuPDCPORALZTXh1GspraGAfwbhHyIs
-j2CkQ9sR7A23OYJSgGR4lte7Ve5SsC2a0R8kn/AHS7F1bPq3WVnY2Sw2d5XBBupw
-2zWQJANi0ie61pbqa5T1ySG+tzIJmkqwEt6E4i9Mku9hZrs1KAGC8mgRrZlhVK1B
-ee3JKL3acpHe/vIq0CWRZeBV0jD4rP1s7vf3CsUdYoBkycSTOaHG42yDmER6jG+v
-FYAD3Mf7z+6Xp3GXmBYhEkFo7llc3kyQ/lRAqzhYwj6lbYO+SanTAOe8GLzPoxRC
-snIvkzEZFAEdEa/mDnRm+jtCgBnpVi5wVmj5RqnUE2mdMuyEwaV33lgEum1EHeXg
-IkyrPsqETjGh8YntN0pyesl4Q4MubTn6Av4jbSXt9Of66viw3BP4Lthxv7b1Rh58
-HkSUrxSwyRojXlVGiWqgc/cGs0YBaTpsZSIgqYQnEUpQZKQZWSGtbSeXlDqZCRiN
-3Hx5eMLysc1Kl7EPt4nseZRdt/uqgvn+CuZym6VWg1MlAdoJ5Rnc4mkQhFM1v+bV
-knAc40CddFCY/YZ4nSbGwoUGdTCgy/OKeLUdL5Qs9TP4vgRZYyRciEYEEBEIAAYF
-AkoEMPsACgkQ9cJgFkzu11+QpwCfTnrrGd8BVgF9t08+W9aL++BoBVcAoKGNMzwr
-BNipD6R9dSck/fwSrckLiEYEEBECAAYFAkoERU4ACgkQ1TNOdbExPeJyXQCfdZg0
-oS8dfOiE2WAhAGT6lwz6rg4AnjY9DDcwDgq2OQ6+v2c3BfClTb/riEYEEBECAAYF
-AkqhhAoACgkQYzuFKFF44qXqNACdHXtNK+o2I8IBn5jJTyBKYGgW4REAoMH+wJBJ
-/t4s1WWRY5/a64x7r/SOiEYEEBECAAYFAkr7BScACgkQEy5J1OQe3H5R4ACePe6O
-kKfKNZ6Ldq0ivre+1pWfbjMAoI6XDzq6JRlOENrK4LtutGYELNv5iEYEEBECAAYF
-Akr8hPcACgkQyceSTlEEfWZVYgCgkZp3OkShIFxOm3mreN2v2T2UUtAAn2CuwqHK
-6jITsLhbN0ej8uuFa9UxiEYEEBEKAAYFAkrzvA8ACgkQmx/anzwGIjESHwCfdjfj
-xeExb4avvsl2g+uWfUaDt2AAnAvUTw4mA5qrQG7QFukF3WuzzefoiQIcBBABCAAG
-BQJK814HAAoJEIWPxMT0OFajVtgP+QFkTX5/+15HJd6EEfKf6L4+Fox11JCgc8sI
-E9uizJYBUikjwM5PYQ3WYiRoAUmbY8vu+c9iRNKrCYQ3Xzd+JE5CYR3lrR3XqxdB
-icdMoQsr7IfV2dAUgp+AkMmMNSlhtsRyXwSamfW+LoXjXT21N+SawNhICEiWMfEy
-8poNdKuB87kFZdQjnbB7C2Rs0cEMFJVqKXtwBNPaE8vGL2+m4BTLlZrg4T0TrC4L
-iPaizxAy4X/TmEuWWqXjEmdgIzULZSQJ//gnBDlJ9ldoO2ZdaALPJJGPTx7XsiSW
-ptbmbl6M0NczjqgWh402a/g4A+2Uty1NkOjKdS4kH7zkkkAIV3p8166u2Tr8YGsV
-4ktqXWNt6KV0pVi9d1VE6kwiy9cNGAMLfCcsyo7sGK7JNXaUzjvo7M/orZdetGuA
-ipmJc3JygB2LmTcASPYp6pMMLZJIhIFGx3CZ6qp5SINzX5uEw+NSpnibXWhk+8YV
-wgd10yVqAXqZBFaQr5cTKzioqqHWqJnhaDuEs594EKaUo8TC7AsJJyIl2OWOqO08
-YaTjaOc58Ahyu1UrRIrL1dGrifF0THSqxMx1TkKq792Srtq2U+OvfjSmg3rs1v62
-TXNORwXNVFqcoExK3JH+YJyc2in4b+55qsndrRl5U3NA+v9ZDE9e1+NOPbz5io5/
-bd2N4E5xiQIcBBABCgAGBQJK8zm4AAoJEDF8bfg8dwXPh1gQAJ4tALW+m9CAyzin
-VhNQI9grw+N6e5QkbDTPFM6/AKcZcytUZ7wlh7qaTWUC8eQXi7Wt2oEHvOMy/Qp4
-yw8awWaIANzKS4yU8hW/iwfTsWLHU/685IpJJrP70BMDCTbbyOUuDE20/DSRqIeT
-YVjq+h2zgdHivJXaJAJLUoEGR28RefSyOlzK9rGGyYL8PYkQQuJkfb63uUscwdDI
-kjUeqKpwWMUEX33SC4AahNfy5BrzbAK4L8IdrVCtgSHi3s3z9aWxzYyDcIdL7wkY
-/47LXbdnAWpxtIvgGTvyiWDnGDCbKDY3UlwM7yAid3jF/RiIme7FksHlK7/UtbI4
-/a8get3xETX8r6ZMBZOuRs3iczK/VZI8OLIWHw+7VfUshd4y1BJDb78QP3b9hZWY
-UhGBHa0kcz1pCfvswzT02xupc28X5/Ye6CinbXwFW2wh8GKkqkdN2Ni3b/inIFDj
-jSuELFX+NVV3UhTlu4XGftyVwOD7m+CeTRtjLPzMdXxt7jrtillWu2cUOpvxu9pa
-zk/UgfBYZS3ZKksaOK13krRXGCpBp4vR17Z2WQycXAPEJiAF6t1Ip30l9cU3bZsm
-rQhpP8+nxrqekhH30aVSdv1zLlOyPA8X+foTnRTn/A5+P+JEEpLuGLdyT9Tm1Orb
-Z3TW1GbcR/qLEEKHdRw42Qk5GOXOiQIcBBABCgAGBQJK82DJAAoJEJmgMCnd+hme
-RiYP/3+oOsn2JiNvF5yq2Q+5XWg/B333XY6Ab/dSUg85c21M0RDGk0r2/ZvlS/Ie
-Z/ijcm0LUQv+bYgP5DjnKX2QEm1GJYEhOvRfOw1vY+mZfC+bj2WV/nTRo2wnc7Ig
-5XZdr/rqLoTlEdealwQdv6fjoocJ3d0r9vDfZl4YC3ueNW1WATmTPJqLrbm6L3it
-v3xeW6rARr6zUhWkYRE/3h1/Io6LbU6VIqASsIXwtNn5Cxxkf7fjfvkzPpTU5V7g
-JPhC9e0+/U5qXRi9bsLGqhC2Twf9SwdtX3pRtc1CZIl1ux72YZNoEnF3bGBCr1ZA
-yvJJR43SobEgIqZkx4ykOJA7LHgNuz7Q8lehhtpyocYPuTFbZSKUnuBIO64qjiYt
-OMp7C2GraFuVO9z9gxLPcCQKjDiDS7f2HuAv4YGQW7GDssO4V9/NnxM8WbtMjO+N
-xuVcb7YFrQPJBlCINvk1ThJgsbrXPVa8IP9NWUCn9tQj4whno+/Mqmenlw+iiX+L
-LeOs2NnJ+FI+9TUQuf4/aX5uTRM2yV6wl9tj6Wny+bejJxUaZOXvs7YBN6G0UW/Q
-cMFV0GXQlhfEG2LXA62mVRgXC9LcpOtJDeXrR/tzUA12VFEqnhpqx06NGzWIj+bg
-K3WH3PUA1jMJZqhScMT6xJqR733G74ufXC6IjzSJkY5CJ4UhiQIcBBABCgAGBQJK
-87rxAAoJECBchnPcdCx8HroQAMuKTK6tUNzN8a2TQ+LBI+pF2adOkY4kqO6cyJb4
-2VqYapTCmbaDBxw+10MW3pZxAh0WJKXrMJZMA48cKTowwsa7kDBuzDllQQO+DH5n
-4OFvNnmtqvnnHBJuWEN9mWaSLf5KcpWFp5dnqqkVRYn1SFQqX1QSI7yUZUQ19Kfx
-ocGiPy3EZM+xyxlTxzBjIAST7ywsrSP8/VPsYSehwOv/XL9qXeJk5fRsWezm4CF6
-Nqv+vcOjXVqsRB8KflEDuUk/1lfGcBrnClqoJXxLK04YujxgFTzPQy/CbtIIqsbM
-q/qr2H8RyBuwhT3rA8guNBmZmS/DHA26wH9ieefQKX/zJclO+GGUoJSlsiKRLV2W
-Ultw11MWwLMzvPm9fjk+btx7v/eUcIH9MldOo1ovIuQhtPXCpdbOUdIh/0drGf6T
-86KhjRD2l6UKbiJ8WZKtBg+eDNf8CmLpENxBN9V1wf+MLHbmjg6oudq+yNbjrOYF
-AIDs4lbn/2oUJjiyxMnOCh7MitRq4arSZDr1d/SzavchCMueaowh5hCUG08J3ZQz
-ZYFppQ9MbD9ctnBzFeBbHobIQeSHERhwrdE1GeioM1AItodVKHphASIPBJHI1O8w
-INXsh6xSYPdnDwwy1RvUiFjIcEpO5eEjjsAhuOpgnxer99b0WK5totjE48NIXWow
-JZXjiQIcBBABCgAGBQJK+J4mAAoJEBDAHFovYFnnA7kP/2IyYgAF6n/RehprPXAX
-dPPPG3yP4/xksAOl2IQR+6HEt9pwU9AZu2Ha8vumnXnohX6CAxbT96JhObBMCQny
-O4EPFOZ/9dCGJRz6hFtac2es91r31vIPapYcN/Lkq3XC8kOQOalJwT3MG+7gnIPe
-gk0H+bfG10wQ89Pm/jm6U9jNvG81ZMeRkolQx46piS+xletRVagNN6f+jaUQZeyL
-hkq1F4WUgrFWBNqJkvjIgtyyU6e0/Q9FnbxFL8pz8qayP+DnABoeC5ZpjfPqRzhb
-4XPWK0bRRg0KJ1JcVGlTq+TslSsdyinvbWqQjLhAAcIQztIFzvw9KTPAkUNigKV6
-ubec4gFMVwtC4SN6LuWIedy9iQvutALhbZ9VkwF5LGWc9DTPOKB23DLHR5vBaEPo
-rEaQDXWZ3UwZS7LJrlPcNy5+7/PhGwz3Ws9P0efdT8Bd+z6J3VeMgpZnifV5T+ZB
-CtbQ0vbFf63+rD9kDE/hE8yO5UoLfvNZF3xXf16tHsGr2IMFfDaaEEcQx8mSZkuJ
-kGirf0KqfQcg/KM5bHOnx4XlgrcQEX+WK2zrIdFA/G68aFv+lBMIuEkuH6dEg4xC
-RC47xNCFBL0POGGYd3504EHRmQMRloom3kapkb1YOS5pdVoOq+H5WiRb+qvq4aMt
-/wiK0FYCXZsxy/OSuuqieJvviQIcBBABCgAGBQJK+J44AAoJEDGBeFpSfIEki88P
-/1JuTI2vnOwNzphUVZ5kIueHy7uTJEji+FqtoK//eDy/49JWxSJZ42bgN6oFBhGF
-GY/cGxRzB/iqgudJ0FQ+uJJxNp3fMnFBSsriquNy1/TNaquuTRme5e9UQ6yDF4pD
-NjI0Cr5i88nD5RhWqCldpJ6cEBxzchx2FwtA0jGXNb32YXLSTYReAkOvS9ogaqsm
-+FYYL7Yy+6cVn4JHRCtjY7Zw9LsMfsVKwXVAvlxvVY/aDEHUMemQC4XCHDKonemV
-SyeUpdWhdL9UlltecscoYvyNKAnrgiCND1Mpl460XH3q9RKrfl0N2aLBk1+b5x1b
-+BrK/u4KMklXRbi5S6pZQak4gWplQ2C532DY4xDiVzRMvobEaJxVF2rUA+KT5EHw
-r6xyVxj/GAWFuMxIOLbgndLt0i0hbeVBXtf56BZvRSC4O8C+MHSNT986O+nUjCGn
-OxKDGoK/c+0DIgVEuLUGsRjTdvS7Vrvi8vs5f1gAcZeuDvaLoLMnen1CHJagYMFL
-7xNgJRy2Jtr1fKyA+7aRYkNidV4ozKjp40pyOuboIKUPgAnJfnXscmo3htoSI8I+
-Ygu9AfGQmROuZbT2FOQEo5BCydmUlnbfZWBUtf2c6gTqJ4pizypCk/FT76u6OdWh
-zkglEXAMvyS+nBFmm8eGJKfRkhHi4b59GbmM6tM3AnX8iQIcBBABCgAGBQJK+zWG
-AAoJEDWVOV6z2OG6DFsP/j4ntteVJIovS5/ZSKf9hvYkxqxJteXIfilqqe+y+lkR
-AJZVtT8L8GrVJYIBPadvBBI6ok5PuwTB82blWyobOh5Qwzj1ZMNbgKtXnWVBm7oz
-ZQE6Qm9gvlnwLy1qjCSsNMRa9w6qkALAQL/0g1j5Y1i4G50bqUy5Urbq2P/UhzDq
-lsOP1/0GjvdPgiy1WhuMmZvpwuOXPQT/33WjiKfRtiQoU2B9nhsm4rxEuvD3hgxm
-/aHwShjJMB7saXFjYOQM+8wcHFR9NV27pn9df+rdaZivm44dU/TieqFYVBw7/bLw
-p2wj76xc1/QKK29r+6WYtZbVLE61JCTT6sjlxmGa3a3UWj9V+uhUANvpUrtXa708
-ZQ9xowaJ9rxeif2KeiO/F07jS5BMRIMHu4JXSKwSmwF6xpfL4DPJKD8oQGUtpK6j
-UuijLZjZzGA5Csy/OC7IzFq47PeDBuXekWTiCQrwUBQRfU+KJi0+xOKVyfZECCH2
-6kIsau3Z2DJbaRbWNEHqUXrpiQiiJVRuiRitrm9ZReBvNK5ApVs8CoHGqZCJV1vW
-WE5WJgoeGeTl3iq+vdpCmAYEmeFuTCGN0ByNJ4m+GzEm9SKnkVPfy6OHnX6QOUEk
-K48z9+RAlQ6LF0kNL3lfDHbJoQvJ2meQUNbUvXPHsoQkQ5WGyo/EXTlo5zhbtQ4T
-iQJ+BBABAgBoBQJLDN5oIBxTYW5kZXIgVGVtbWUgPHNhbmRlckB0ZW1tZS5uZXQ+
-IhxTYW5kZXIgVGVtbWUgPHNjdGVtbWVAYXBhY2hlLm9yZz4dHFNhbmRlciBUZW1t
-ZSA8c2FuZGVyQG1lLmNvbT4ACgkQm7hjsPUbuIpmcg//cupmIq7H7z1n3ttnshpT
-U6h1RD7vZvsRwW1ei/g06xog8h6OQXFVmMDuQqFp8cxHFlCGF1C8vklYv2a3b+fZ
-AC8SPh91VpHu1pvMQx+hXRtmZM1KasxSv+uYWGOiJooKYj6upP3B8Oz1GAqFsJyO
-toBKn2FcnI17faU5ATPp3ZR4KMWHDvh6Q+NlaVkhBzJz7bVe4qR1TvHBP3l+gRnp
-UV4BnsginWv71kz+msMXWlEWoCd2LuI02xOaTIRWxkVMmTdsWSh7G7iYjGp141AD
-fbYRN8fvntg3JW3L26OXyHQdZHx9zB2PiBrqhBsCln0lfi9lxjN8HY39PcZsLDZJ
-7PH6QYxBr6wfpipzdO3kvmdDWxO2OKJRwF1PN/YhyIl3NW3o57XZbzdqY46eOoxg
-J4LYkemXs7405ePfPvHYPqihyO7iyE3qmG2JeSbupHAkR5t2GjtahTuI1p3h1eXm
-M9+fRP2qJwmxrVb8clhIzotSXbx+P/W7JaQDOnyPfIQvfdTIqlxk2YqOyKWt3RMG
-2Cl5YR5gYM8vNAcFAb0upi51kd9aP0FkThUNEbdiAqCjA6cplV7HcmMnqpdjXusK
-6ekTQ53C0Zvgx+/oJoKQNtPQSobnIqlE/5wC+iRkfeMKFZ0QQYTExnxboSsIHr66
-iPo6N99MkDsAkwRdabCO/WyJBDcEEwEIACECGwMCHgECF4AFAkoEQTQFCwkIBwMF
-FQoJCAsFFgIDAQAACgkQiq+I1thOQa4Ghh//bW7IOcCGkShncJIvG+B3WM5/o/24
-h4cJtAKr+L5l/SXpf7ImMSpcI1PGxHk76KZjIaeCDtDNvUr79Lj/aC4oGzCbdGJe
-weX5Q6/xJZ/EFwzp1g9g5Bu6BuL5oJeKDFIRgJPyUkvndYoONyzwucbHCmdEhfuZ
-V8Ekipq+XWP2LsAtR7vlBDLFdLHjqrrHokaGySaAavIJwLp5WhHRZHs2AUwt5Qp9
-QyREdQhVzNJyfLkm/BfHqSbJbot2l5FrJ0EGwG9ZDA3+vkiAQk1O5FmGSScI+kYl
-dE5amDWRptG9jWZWGgG00gfZo2dZxhmJ9Gj7oqKTN+mZfIGk4P27lwIEG4K+p5xL
-L2mT36cMrx/8LD+wi7sGoNkMlF+qo1AGNIyHXaQKviy0KO11CTV4tcX+ZfOSe2yU
-0b0KqFOyMd6MA8pdv1kqkPBhkZTVvLmcZapXrSAYTgZ2urQIKJ7Gyw+Tb1VjQtbY
-4zJbis3AKcCs4pIcoNzU7pXBO18/ATMtIlpLWq/HXeVyibX24peUdjbJPZb0wtE5
-fPecNjM8vykztlZTDtkWn9xE0x9lJdGopY+GK0pE9aG9DDzsr/IHAajf05MgpGEv
-3+usLoxQ9mdg3Ud9BDkeftyA1vYTKaPb+E7Yj9WZynBlYnTSP/DWC2SoncGQTPim
-4TRJsaH3ygt/Xc5gJ16Q9Uc2reRV0veX1/7pdqQqM7eqj/+7hCmnZ17qBvYFhwN7
-XVUft2V9INMWHDw5Is3NiA3PbQpLeDZbD7HFakKwH71idb+NB+/nNTM9ERK0YRPK
-In6Ac0FuCG+CVEfDGl3Tvnejlnw28XpKAEjyOC4ouXZBkZ60RAnRGYNXpW2etWnU
-ErSmJ68+k6okHpi+6OMF3B/PH9864vzjOW5LcHsY+ntvITABKnhX85Dl5Nbi6lU9
-QL3bjMPU5WkNqPVNYPMpvdK7R3cyU94KvCwdzNKscE+5S0CU0kcZtmUye2jjSD0w
-UbDkVt7R77E4Am+6QlNwDTgYqIYViIXLNDOZK5ISYagJ+ZlKtGbLhcI+HpcbLjsQ
-Hxbi/gW/JCM8id/Fh6F4cbtpCz1mWsxRpEslwMpl6XhZC87mqBPI/8KMa/NyjGjX
-8zKJW5TOZ+/VJA+E5+Fwh24oPyNJOtjEYW2tXv/FnVZ7y/lX/xhkYCM9BYZyP516
-p+2xqU+ieU4Z6VLdeil69lVDi1NgigYXF8D4TXnYxXhxab6u+WCCCeC/M2fxYn9n
-aZ0xSh+LSjXaQ8MK6KBv60Sqeh+rxASAouRteH0YcrQ2fTQWt0KaaEMTwkp7uBQg
-12rYIDnZ6kf0FjH2dyHpkBBbPE+qOvj/Oi9cJRgnYN5jSCgj1dZ7GmZEm7QfTmlj
-ayBCdXJjaCA8bmlja0BnYWdyYXZhcnIub3JnPokENgQTAQgAIAUCSgQseQIbAwYL
-CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEIqviNbYTkGu3Vsf/RLJj2GzT2OpJLje
-UFRY27aGbQSqJOYhKz8yHwSWNtdZNSURjSlV3icitj1PVEyptdstrgYyKeZpdUzH
-L+CmfKr9yhqFsfv3JY2DM4nnhbmDb+PRq04MtlbTeCMRLXmsu5z/I4qd4EIJzrG3
-kmOBCbO1Q+BkaShwP/zQPaThICOrHNS/5FyoTdDyVZWUgCG90MD0hA9Hd3L+BsRh
-ka1wRAR0xN1Qn4aLDRYhh2sZb4LrMvh2V1YOOKsUuvlv2ABtS4F+i4kua/TbDp9t
-5m8tOJkZfTWbtMSiVcL/uYSgFEq7a3ck7Xi2kbe/guQlGqJcVK+RCj1/3qyW64Iv
-liPwDmjArtzFaPiEGjH8POScrimyalNbx4WyLOtU/Jic9rFymt3hHE5WtPX4OF2l
-ielpkyPgtCLiLJMrXcUW/GwreWvDOiCLUhXQ9clXTh6duKfJq6TxYvtdIbEIex9k
-Oxd4NayBqoP4YEkLlybyzDWZi+q4HE44gx3S3FqX+VJThk9G7W0eyN04kM2Z/Yd8
-yPYx8evv9mwN4+YfRLjWmCcg+XzekW1Q0c9/BD3Is1axqRy4+e1Z12rrcg8QiXE7
-sy/a1PlHTAfwNnNolRpzRflpLIseZ/7kOGIQm5BCmh+8Saoq8cjMIVadDu2r5W69
-dJVDna3lK8vEd+Vax/luywSYSnhiB5kOv5Oq7jgvXi9c70PH9X+x6mxtACD8KoAN
-Ccffi8X/ABbyil8U3k6opUEcX5aF/csmvI2vMsR0u41YFwLZN4+M3Ww4FYen2i6z
-mLvCuNt346GrXMno0MX8ZH13cKb/bY/wgcFQTxBoaIypkxzzWjx0GEHtletnBNwV
-pjAtrOMQk7/NvUXOoVEG2uQO05IErogspv8fW5+o5KK7x+tOZaNC5FnFJHx7hb/c
-vgz9fJxv/hbFmAcF3rN1HnmpmklCfvniaB7xeD6Ddcf7ATXI6CQasqaiwjhN8/0r
-pcsB52h9T07BPLLsj1vyIAueNKjsGfL2Yb6zO092hGV3WQ4+PoKOW9gr1tyeS4id
-3bBHBWfHnFtW3+mWMZFArryuBm3cNEV/4nApZrFyhoQH8o5SEqLFgsMjg6ASO3kr
-jtwHAVUqDOUVC/CoAM3nQFrExvoeuYrv7cII4q4MATnJPtwcrvbuikjqtCNddaaI
-c3YtmyLjEaaP9oiFGFCy0ZMm30CMflpm09i6R+1pbqoeUx1lJjnvLV5cy4WDqH1S
-4Uz2E+oVbnmQKxYqy+ZKJC6nUj2ZxRzD1vrKnN0RNQlOXcA0oomwpt8M8YlHACKj
-fenxMiJ/x1Ih8h6pRkPuNHghgM+lZlGbGijaeueWYkK7Xr45R2RaSj6mxC6nJvyl
-JqX/DDyIRgQQEQgABgUCSgQw+wAKCRD1wmAWTO7XX0+QAJsEWE4s0i3hIk6z2iTr
-3+aGT3rNVwCcCgXLmSRklbh9kfiHvBesBsZsSHiIRgQQEQIABgUCSgRFRAAKCRDV
-M051sTE94nTfAJ9jCZrnvqVJo0tA/7PdmvLcNFwiOQCfQ9zvp5X2V1DlsIwWiOKC
-Sh/CvPaIRgQQEQIABgUCSqGECgAKCRBjO4UoUXjipTLVAKDenG1e5ezGLHhyGLYp
-UumBmW8bDACeLk2jnCExhcXc8DvA59mQUV+F33CIRgQQEQIABgUCSvsFJwAKCRAT
-LknU5B7cfrndAJ0aaFg2t0tU8CGSEToroSUVLgrXywCgjUiXCowy3s3xdtEhl3wg
-4zqEijmIRgQQEQIABgUCSvyE9wAKCRDJx5JOUQR9ZniWAJ420lKnPDZmdDFU9qdn
-EGfBT0yK9QCfQiP5mzqfGo1KhgmZc2PStbVfMlWIRgQQEQoABgUCSvO8DwAKCRCb
-H9qfPAYiMdz1AKDbRUifshBTo9sSZxzd5Lvlfq6nkACfcnWjGlZd+EstKn5SM8ph
-xTafHquJAhwEEAEIAAYFAkrzXgcACgkQhY/ExPQ4VqN4EA//YzVYinjJyD2sh1fe
-3kv2I8f7XgcDYgN5k3LIEKAmwUzk89z7dMwtykqICS9Jj/bVI14Jnmc43YueHFmZ
-XklLr5923B/CbrLakd00Y0AQX4X6z/JPL+mYwdgxuHZSc2udbR2r8cPf603k3+xy
-xlJ6PJIk2nzweYB9H/yMKcpfJ5UhZqX+oQd4t3KKmq7Kx0h0ezagFtdT4cZaTG/j
-XXJ5pkYXfX+rQtOMvOEmMNvlkiMYemygbKefhW9gLAiLr4gKuL7ViqqQSi+FCm6Q
-3o87Xp874qQXxWRIdmw/0Pm75Q0vZSm4t5gsW2G4ha2zx+wmqPtNEam8qlx4pe+i
-QoIRreCv1DnNvzXyEzObEQ7HldxHECFFWMSAoVWFZ+If8dJ3fkKEcTDKlCcq+TAh
-mYqLm5Mc+bgNhbXh/4Ptapi7aM0R6OLHexc5Ik542e/42aj0xpsJTcggxR+erJoI
-tF1ZBVWIBwFKC5Ec5pwMgc0AAIU09+IgAOwtaAsRloAXZXx6oB6nqJA5JS1435gQ
-aj3ROCULyM+pjggp4XqccDsxWCt1yituhxHCpcCNQD8V73235+D71EgSoX7UKJS4
-xxkxnL4+jaYB8PIh7DZ5pmBvN/bb3RhHk2VOCdcz5J+HEP/FrvNdvwik3OnXxzFQ
-be2mkMFZC7FHjlJ88ir8x4JIVfqJAhwEEAEKAAYFAkrzOb4ACgkQMXxt+Dx3Bc/T
-Qw/9Gv4v7Y87zOzYoJzmKvmK012AE05MkxC8bjTDvzV5XH/Tr2mHE+5blOQgPvJp
-BeZI7qRYMC98+BOg8yPfweaiOADsCO+CV6obNcTRbmBNiGeFplrWSSR4GB0ZB0Yy
-74QJLrI8zig267oxrpO+b3KSV+Q3Juz/Qx6Rhpm7EyB4JuVjGG75oYi1l3yAPTfU
-NTTTA6i9gbPTGiMd5wQcsgRUN9nv37JSNhP8xz4GUtUmxDKdaSVo6JiR0HvbgecT
-hzN42t+9P351SMDiMOsAV/o5Cr0WMRqXOJi36bUyLeY61AwTQuohkzjLKHm/MQuv
-0R/9rZ8fnIk/F27OSjkFM0w4vrraST0yOJB6xdSK2WB21TNp8JRncp1c4UsUjLIj
-Knu9Rq15FDJ0/dvCbv/B+Gy+x735rvhy8jLTurthndC3vwpBhlEThXhGah6TkkRL
-Y3exXZM2Dew3f4cbEKNVS6/4CAf9WsstGAFLcQyR4gDBTeRQF2UDyFnHxOnq9HgW
-G4MwlScv94vd7hE+zuX+76n3Dyqlc5roHQPFFkRncTP+FTCclNph5eh2ssNyqwtl
-AoGKpqv5zJU/lebs2nH/x7GpLIqSNp4cJwDHpAkBMpaBQV27DbpXF+WfI2lxTxIE
-2IYGMZmRDAlKDmbBMs9Oqk3ChLQETEVEDT8viZD0NFvjWMmJAhwEEAEKAAYFAkrz
-YMgACgkQmaAwKd36GZ60ZRAApqsfylg4CRZsFqaql9nWJU0QVud+L56F2PaUwxWi
-3MrqroocXxeM37so2Vg/LDm/pRFQWZ9kWkPOZcEvvO50ztz7n7T76Q/y221B9pb7
-54BKAWr7xVCuHQgMNKQaiblbgLtgQvJ2BNInCw2tkJrEzoTMpkGShdPlBpUrYsuO
-Wn4499LcDzS0p6B2NXRgALlKjoWKZu4vbCLAbf/oeXH0MAHvpbsOZzvpSon5YoXM
-mM/Wcrrrlw2rsKJZ+9baojcn6tyKtnDCJEmm2xuOxO3cOvQFqrhXIZfO7gaI0j+G
-yH+eyrsoLJJI2fLT6CVqlSgmR4gx7d55ccHQMobwD18YrQDXczlazoBzinrV9uBr
-G9uO29zD8KSrTZfM54o6JATwu9UASThob1ovhUy8GqDE1d8gcZy2iwep3i86ptfU
-sqq+9mgar1J/3o8iV+mxxhmcQpPTnA5qPiSoIsnvfsUf5XkccxByiEM/CWP52IOG
-hErgTb7LJOcrCwcU5Wm174r04m0D7B5YyTYWa/znL7siCrn9wQ+DrE6S4vBwsNP+
-NiNxCjFMG8NT3+UPblp7oryrSW0XNyHVWpRy79Z6k7aAllgW+n3d0j7+TzRAnrrS
-gAt4o1eGwCsSIjWWS5jcHELfPLWn0nugTqruXTOAx8anHkdzghgSWn1TXRFeP454
-y8qJAhwEEAEKAAYFAkrzuvEACgkQIFyGc9x0LHzx6BAA53K7EaCVX0X9l2Jh7ys6
-28otsX+gWZjVAAzM4fJu4NxcQB77geV0HR1w8+9thE4FZG4v0TM7Ye+7OurxRASl
-dUVv29qC4JuSL+YnknjD8/UJdVfhqu/VSTESIOsoEUYHBJquy1NHK+FI2Un7NQFF
-Ebf4KyY+N7XQpVsROko+iHB0p6tOR8//8UpgtnQ29wgrXdOCCyTVDDNwAkL81q6q
-qXKvI9UJvPuKyjkWcxPW+NYK/n7ubp/rfk5LqUOJi6dn+XIkAWI0PHXcsRj26Rqe
-FMTP2zFoV+sSpUksloJG/EZaQ+UHSJxs1ZKiiixuf0n7H8WFNERFtjs00leo/ha6
-0KdwqeiLIRhavtVNQSfWYIkjLEAIgl0XGp3Wem8HK6yxM+20mdIHwS3gIvAxB6xj
-cbNBjHLmJL52SbEOxuQZPpGZ9+nQXY+KUAN1z4cAEAbbQu6yP/EOFutuJdl0W9ct
-9+DtHYOWEQvGuZMirSzU5ApF3JT2Svezq0FcF9JmAROu3kQ1AI1wS1FrvmFTEFDC
-16Hl7IyVA088QA+UgnTmC6QDd4XbPo4k2pSuL1XP5+mMlmuKEHjZQv5vUfm5nTBS
-GiPMAqcS6ggoMQV3LTLQxx1AwYHZwIR+mRKx3uMAvm0xqd7qnLEbyda1vM5hX8G6
-brbmRk+973k8XOl7aSlaEAOJAhwEEAEKAAYFAkr4niYACgkQEMAcWi9gWec4fQ//
-QUMBiunb/qCNoON7b+jdb2GfRFivs0zRFkOKxUMJAzwkcjj8D8ruoaseL+QzUpxa
-thWkmoXBmSGc4cBxxB2pFgyITtYvGmQxEmwMBYRx0SEoprEUCfC0lUVdq6JRXb3D
-MJ91y8HwKkkKjqOtXeSKMJBGxe4k6qb3FP/ddqvyt+fN7axxANgqeY/JhhAXT4Ph
-ivbgAdiqU6ToW90qJxyVlLlj1H8AkSeis0vjJo0sIzis813ftVLgjvYOlXZSLcpW
-xsXTYr+Nv1+T9dOF9FoMS4LQzZvf056lEwE58+5O+xbPGniD7o5FyJu8KyV6ptj3
-5ldLx/GK/ervKR8nUr/L8Al5jhnsr3XDgdSUMLsBJ79KHMI5lwAVblQ7Ol0GLmyy
-3t2rsMxDDxJEACPrNm0/0HxZUkGL6uX9lXm+Q7TuJ9RmXyU/DTHuDmhsOusw+g+x
-XJWXZuIgcdoDo2PJTwq9pV9QDo9GgM4c8HB9kgqlstWsqbtcrZ3d9UXBYUpbZEks
-5HcLd4RuWZO57iutSNWwNkbsGtPrmvfiVndzx1BNDv3AIUl1HVUTCtZICluYdQuM
-a2mJgNR35ylA7kFRvbGu0beD9PfWxFyFusEWhnuNiDfB6NMSu/VszIWR6hutM6QI
-x80bSDVyDhBp5v+OAQeE1n/uV9Kjft2cuDf55lKH3FOJAhwEEAEKAAYFAkr4njgA
-CgkQMYF4WlJ8gSTBQQ/+Lbvk4+gH0I1FmZhvgipVy2qMRCivTsRhsRtXU3AlZYyX
-Y2mCtx+DvrL7z6EYAuguXEJUIrihcJPmJ3hiKMjUDovLzZ6rLojqkMR1NN7k2nVw
-7YEvCRyq9MMH8Cy5jGiQvH5q2oqY8xM6L4+ZEpvl4KCI4W9JBsNmF2ynJ1K+m90Q
-TZnyDSUkMqKk4KofyjfCBRNTrOylM5aT+EavEFfE6W1k5nQOnNO1MuvxHrHxC4Sm
-cqWVdVMrSGZN5Xx5/j/0WiHGtCv/4r3l9N/nfqW7hVmDuSoPGV2ZoCKuHKFYUetI
-3+vv3teOOsiG/weyD6/T0ysM/PkFNAEaOU917DUGKbLB+T5qrA7Ijrf7FwIiJW0N
-7SW08ihADqEXmgILW6zE1SdMZEBYDZHSZOJzQARKOg/RYkiaov3khNm3cu3BlysT
-zx7XW05sTshtSSFkjvXBcNlEVsijTiv3aSFEOWEJiGlE4231e6nwqyyt1rwF8w0V
-AoVp01tylK9B6S2mzR4u+3bdte34ugh77PYAd0nqrNToKMgoDwLOR5JvFTH5jYGL
-YMOnN647EAoLEHjWpqpsbO5M8nhlPRkzb6XfZcSutWgbNKNhlAsDyBvggAAPI1Bz
-FnGjDiFIDxxT4f5NDgvfkAq3dqydLSpqLWbWcmkHFLpq73yy0vQM3iyeYME8Os6J
-AhwEEAEKAAYFAkr7NYYACgkQNZU5XrPY4brIeBAAvCmtrm/GQq76lEcN926ZgC0z
-gSFUlYJeslyuPJv3rBqRKVvlO9O3npbmpBWTjZH6RdNU9SSUyszToOb/Q59fGL/h
-ADeAJWP2pdvmvAGu2MvLxQmOqQTxABFa9iFcwLSztyC8BW7Sj8AaqeCB/6iclkpn
-cBDB8nZeY3RPOJVT66WFMaEhCL6/SpM7ix02wcDlTPyUNUMCOL9grPsMqVkSjWPT
-tOqrE3a/n9MDzrWuWsw9tQsD+vVp3SVjZ7W5yLroQbmrGBKhcK4boDwtUHJCqVYC
-Ivn8ExoZ9x056MEb67LSiFn5S4tBRtjpc3H9d9MTjuzDdP2WgL+CUHPuGJ8bbNyu
-4LpTWfiCQu8DcFFxHzsuIjYCST696STXiePxKqMVWqst8BQIISUpdj7y0dRKY6No
-l9KDtyQ/YiB83+A8PLqnet1z5Kvs3R1jOd3NRhfskHWIBfwzK6lI6iJmGH1UwXHX
-GUJfD5b/ocaJpR8GWGNVp4REqUKbRJSEXBhXAwF/nWZXwtVYVoakNk5TrgPnBQwE
-i2usNehJDXyaRr4lWHnmLO9dLDx5ou9JsuZeTj7Ct1jRHKSOrP5iSPhSFpaoKuhw
-sS+cOwpNifgbYVVSy6hCHZx5dG6Xbc1A0/nSl531BMAFUrAjs5z2rbpcJJyO4sTu
-nG0YTZwh2gw3a8foShmJAn4EEAECAGgFAksM3mggHFNhbmRlciBUZW1tZSA8c2Fu
-ZGVyQHRlbW1lLm5ldD4iHFNhbmRlciBUZW1tZSA8c2N0ZW1tZUBhcGFjaGUub3Jn
-Ph0cU2FuZGVyIFRlbW1lIDxzYW5kZXJAbWUuY29tPgAKCRCbuGOw9Ru4imZyD/9y
-6mYirsfvPWfe22eyGlNTqHVEPu9m+xHBbV6L+DTrGiDyHo5BcVWYwO5CoWnxzEcW
-UIYXULy+SVi/Zrdv59kALxI+H3VWke7Wm8xDH6FdG2ZkzUpqzFK/65hYY6Imigpi
-Pq6k/cHw7PUYCoWwnI62gEqfYVycjXt9pTkBM+ndlHgoxYcO+HpD42VpWSEHMnPt
-tV7ipHVO8cE/eX6BGelRXgGeyCKda/vWTP6awxdaURagJ3Yu4jTbE5pMhFbGRUyZ
-N2xZKHsbuJiManXjUAN9thE3x++e2Dclbcvbo5fIdB1kfH3MHY+IGuqEGwKWfSV+
-L2XGM3wdjf09xmwsNkns8fpBjEGvrB+mKnN07eS+Z0NbE7Y4olHAXU839iHIiXc1
-bejntdlvN2pjjp46jGAngtiR6ZezvjTl498+8dg+qKHI7uLITeqYbYl5Ju6kcCRH
-m3YaO1qFO4jWneHV5eYz359E/aonCbGtVvxyWEjOi1JdvH4/9bslpAM6fI98hC99
-1MiqXGTZio7Ipa3dEwbYKXlhHmBgzy80BwUBvS6mLnWR31o/QWROFQ0Rt2ICoKMD
-pymVXsdyYyeql2Ne6wrp6RNDncLRm+DH7+gmgpA209BKhuciqUT/nAL6JGR94woV
-nRBBhMTGfFuhKwgevrqI+jo330yQOwCTBF1psI79bIkEOgQTAQgAJAIbAwIeAQIX
-gAULCQgHAwUVCgkICwUWAgMBAAUCSgRBcwIZAQAKCRCKr4jW2E5BruD9H/0Tm++Q
-wXxDbUCVU2jPGcrWhUlb0MH/hShduYc9Pw7TkR4KidPdssSMEeGDfUdgSpLjMiYD
-Dj1DQAgBuJUyvpdR42176BypRfCPSmCgTMyeVErA+9nBp5UcVLT0XlZyDa5nU8XB
-fXrZizmfrSlsz/CtjulNI9YvICvn7E+xeTXDM9WC1I/A1l48I7QMo6mtzn3cbnzV
-rwE8/ap69P4z6NVTcrhkukoEJJ7uDRFtio3O4Sw7zAO+rseNLBa4uAbh6n1m6nyX
-4nGiP4D5cPAUHPZt6ROgjh/od6qFOHGOa3G7UMhoiNzK+e3ce8rn1cpFbxEdoEpM
-atsOej7hnsH7xFD1mqu8KcUohskgFKY1QHG+Auz9TRp8ThuDpGRvDZXHt6mONlo1
-WdTdA9vNNzzkr+yVMibxPyXMZBXBoJiK1MRCvsVwhKy6hhAGKBtBfNeLkbgSwGXO
-mlFp4r5sWjfNmWnqSIFtvI0u6GhsmiveCiLbcSiiSKVGEkih3108yy2CD5wUjPoE
-S62R+6CSiA9XCw+eucabhft8DSi3qXUJF5qswSPcqA4tKjOGlBUYwf1MfukdXAh1
-YnA7TEOLw+iRC5akkWXtn6uwOFmexP/4N6dvzlIuRYMgTG6hNwuoorF1cROv7BkH
-VcLEqIwZN3aUnaLWz969wYY6SVMzh/6G8fuynAsSWWwHXFdRj9k1VNjPiN3dVYLB
-fuUI5OOt8EsiSDgGmGJoWpnD3uHkoYfLAjnwwx0ilQHi9X79sCIZdyjgAYftsED0
-cPvi4b7fOhlWjPbL4ycSsaXmHvYTVpt1I7oKt9IJRdMEaivFxjWp+h2JK2JJ7fNJ
-V/41GP3v/dmUt3zz/ai89h6cD0L0eXvcb7g39WU9Z+lTRv1Zbr/aZKRM2twl7iBJ
-8dMygXwmSJNIkt9MVmklr3pxzcgtMBf3MzFJJbgaWmKg6ZQM4o37xlesijVrEX0s
-jbyvrR81f18GyB9SXsMjEV5zkuE86UbxoUqtmxYKefVzbCpugo/PYkhaPgk04Tox
-JH+zZLYYNH3yqt4RmwN4F6KHhh2BrQIFhKNHPrd7Hd9WEZ58fZOFcqKzWEtUZ4DX
-46jJvcSyO1EsD6xLpVMzZU9J+H23IkLqmnAokijjyC0LYZzuVlxdEHRM1iTOF2mL
-b6iMr8wLAqoyrmHI0Vu/Sd3amreBj4aRRTcOxriTSBUbE0EeQ+E/6MvkjF1qO4vR
-DaSfrl25Mry4y917V/lDExkVVZkAz4wnpTlFYOKDxDtDs00ZaC4N/1buJRDwQoa6
-p0f/oW5f1obEqsDA6KEazSC9aikIE67++guj75vhryPgFo1XR8JNaApFiwshtZzx
-mjXHrlG7i1Lt5FtwuQQNBEoELeEBIADZVO2q6wIlvBr+TTW8jfqO0cZuqo4Prk5y
-4q1oMrXI3yl84VJ1s1+gTY7g9OEcb3SJPX9T7DRWj83p7GyVGVxr7flnQD2jCtTo
-lejmuhvp5l+oDES8rIFfc039+HesBX9mjR3aBqYubWLefawnkxi7q7gdqFoFJNSv
-w5MfHw9tLMUzF54NxsLaUHc4IQtginqchM7e6C+38BjEYhpK6wiRvfbkp2k9z+w2
-AwNY9vjw2MbOtjYxXNNL3cK+IUPBEXqxvsXsm8dLwJhU/AGYSvUgZIUAjyqpDure
-hPYSmCmVeloZvlYBdzMJUEtMtmPgOuB/nkFjKQALFvxbt5IeQmQyc48UWmcgCza/
-LJn4/cqA6DjEnN9fM9LCT9Y8d9NwIeE5N94vQkvQjGYuaWL/URv1wp0UC40sDCo7
-PfwcKl8v/+O6mbq1u+qNjMCvU9AT5g7y+AEf+yv/SWlihe81v5H4vcO3H6Oi/l1n
-yCMEcvktX56WgAITgNZs2GQyL2+GEfYx9BATz4X0IfA6WFStrLJrAc92MZv89i6Y
-seOsBwVhg/aCuIHb8D0Ukmu35x0usSarP4522u0j+Lqt0eqPOfhEnpGpha+NtuaD
-XjvwBKJ0Pe+9ZsdH/7AIX8CIXwpS7u8M24Ibqaro7AFPZWLLL6P65jXKe98AtZfX
-h3xoGx7SbiC6EDRrQmRpVsGX/tCo6sQGKhWpaiCecpeDOHoOa0po3ABx8jipzBTT
-qS+B6P+TAUOSuMvQWp271PwX0mFNG51sF2Xe7XnxtQCZPK3S9ML7LiwmF9cN4tBw
-8zmvC0vGYsp1ajHbq7brmGzXFOZ48ISGGzSHYEj1Uff2DRXsvxUktDY9ba/7319K
-nactywtzuZqbjpqFO9+SU0v9btDr7ap9jfuYIepy1bNHs5Z1v/Ig3ZlDwjD7NwYh
-/xr6Pe8oT/mw9iEIlPH4bXqNAExw6JjKn6B/R2h/LOHP/liu552sBr48ynLnoIH7
-jORoPcNPJGASRpGgM9F6ZqOo8qizLFLniP3VQztMamMFj791o4qvgjp/oxhTRuYo
-3p7HwfLZ6N6cpjtL3rMtQEstartLwGsVpxYqvDkQaMYcbwphnnmuYXQCUIDPoYNK
-LTi+0rcgIYaGT6czPo2fbN93TovkCMxXHScwor1wGfkDCsd+PrvdyoyNOlUYP8dM
-kM3iGmUTA8h49rA6E9a7Hp1+F75XrfgyDeGX02WlXl/wByByxdNAszlLfXuWzHKm
-mWSRLDEEFUyDG/ub9WKXO9kOm4aYjn6RmU9jUx5ypIg43DVlUrnh2RdHyYDy3kwU
-UBcZbdLp++y1J34THRZ+53+uEcvE8+kV614+LI2zMyWLDr0vyWvXABEBAAGJCD4E
-GAEIAAkFAkoELeECGwIEKQkQiq+I1thOQa7DXSAEGQEIAAYFAkoELeEACgkQ72am
-4xjEywDFFR//WNNReLoLcWc4xZxas533Hfk8gHm88bXes/cJ3sF9Vwq212rDpK6A
-NrMcU27TfSl6F4aH49DZt0WwLysPJysKcL9ssgcn8PeVUW2U59apa3X/xtm03Gqz
-suwqgRwWapfulFF/gl55+ZZCl/mvHgiQ9bdhnT99xiuYV3b/D6iGg+MKjEsYOkNd
-9PirbwwXbvC48tnPA+XezMIQsggsk1852I3cLfRi/X8qNDkZ/DzzVoD+qTpccCR1
-Iw09iADo95TdCUjubu27WW3Zhesly9/J/AzbcSB85pvX3EhlV7EoN7xHvgJMiAHi
-KYBD2myUOv/+XuA0zB9Z/mp1yiSH+jQntd8UMSH2gK8ykBtWM+R0mbuBZ6nTovZD
-K92Mh3DgpB7YeU6iuubtXrbNlXJOVziUl4J+4I9QVyjQeLUDJXKnJ+j3QlW1kN5g
-9tGbo/I6stYGJZ4DP8yzy6lD6sww51YYwI+hB2QKjf8NWupphim5whrVW58UWrIs
-lVpKJOMzXmlHKlKRaLUXzkkRlKB7I4BS440MErIVBlkOtGXB1gVbfNgQAPtypN+D
-EFfZHvwt4THIPsBFptbcIw3VQQf3cbzLxjkqDdSz8uc0cGBMc+lb2/BeJoGKtUhB
-6jt8rxE1tDhjOL1pTPi2300pSHnLUtjZsXyMvUrTkNA2AqwIBFmWBU92Zid5TDWs
-1uebs7GoW4qdeHGkCHTDlcqy44/9XJHe0fxXx0bau+cx73hI93VV62KyHP2WyhON
-We+jWkB6XS4/Vt26RyvsQUUggf/PyKu3zSz4O+vpdy6kW56KbglCWWSyjDlng012
-TP0TRXpjRh5/B2anIi4DWwvYGd+5bCd6Cn2YD19wVKmG6wfUcMW49l6mgLUPQO11
-TCbaT94Pn9+0qREkUJZ9gDaFKBj5ssXxvVLZDWe28v5pM52Fz4E4IUlpc11RfAKg
-x8AUc7fNuz14AFwkzIrXinBPcRT4c+etMc2bNAbU1mf219tG5Ag8fDLS/IGuNaHy
-UodaqzthLV+sg6W9XacC9TQSGslLOOwAMy7N34JQ7iapzdCN62pFeWP9B7jF27pM
-WKuYwvBewC4tOBw5OH7QyrPSNEwIRHL8QxZ3j+ySBEQ8KVs3GfJsATRuvQckf76M
-8GaOFfBD3usFHq8WQ8vhAotUgYvRyxrUuQJ7nQX0ivHOly9NIRpdl7S9rVOsuhR2
-yUL0TPuQw/Wn4+rA79HyFNxBuEg753GbHJMCPlYwnK3lnquLLJhQyOtX/1TIT7hS
-C+koXMpfBskft85vl4DejSZSYmWxfxU4ctVyvZwtEvOewUzfSAgNSwIrTHYooyAe
-uE+W37vUg2en8yKlZZLkel/4lWV98sQrPDVAIACgKu7YqUeumQTpDTlgGrWk2fls
-G25Qcnu0T7sywY7CKPjU3O4ZsZ1mu+fdIxlcmutIrRqra4FyRaSRBxplE1HCUjI2
-J5B57zGKYP77B0EeO3ThJHsT4D/E+wyi3wJ2Wp68cgvooj9hXvaDIHOj5Eu7TdTp
-ksFtmxVa3stc06EiGc+9ZIH5mk+pO7heybOeXEXttFvs/8NEQwffhyz48W92jOGt
-53+iS4+2faH+xio9hYHQLOgLJ7GMBGrSQ0sYBvRGvQZOlijjbMNsi9Fo1ffZB4Ks
-XdtKRufvfq6Dhw0/1ZkIAdFLxMVZ3DXsGOHQi+SU9c2Px1zvRTAyLTpT7LaB43Ti
-MWLDKmRXLFbFQJpzm23HuFONPbfRYJYk/J/QaEWT1tSSpI48KYao0vz7tfkxsQkh
-k9lM0g/rq6YrtPZDZxVvZRncAyjMB3gaNHw8Pf/f78eTWsBKsuDWlbOsT+NpQZ+C
-qN5r/zj3FpPXbdlu/3/u4fZKJCGF3IrqqJmGnDyx8lUCqwzfLIZ0xesKHJ2IxsyA
-C1RGp5cWSTIEHarvqKbIHJI3c02gA94IqxerwzH+5A+RLCX7encDbyGyRLP7mrva
-C3zxNJfFIjojB1W+MkH5mjQZY/h5G71dsWIOZlvm33paB17XjcUsAJ2ER/+rqlb5
-V/fw8xoB2HxuN7hFNgvkABww6HTRlM0Oq7I+ZtN0bnw0k1OmYgN6w9DPFGx4PZa+
-LmBpTgVudfHLe8jFF8Prw1/Nhc16B8EEaUkaXfdiahlx9By8Zh+fRvYKvP3ZD1S+
-8PaNgLQQ2I/l0GhbLnwFT0dd/D4jz2SrF/OLxwjSWeKFHdmuDkk5Ky5aPMKoFTdB
-z66t1HpU6AqmNjClN+0TRTXZe4iCOcwsgMu68BDIeUElLr36qt/Hl66Abp0sY+fp
-/YOSME0SQZ11Hvs7gAdkGINKV9xpXxNPtNEeINQg8w7IC7tFqPv67zVZ87+/xrCn
-1PsVCfvfdh1SF594+FviqaTolL8HGR2KAPVGsUt122CQRuXu5gRNrAGxwKHtb88m
-9iWPNLba7FDZUZARL0HRThpeF/T8hKABG68aIpZ761QgX/7MptCZAxuvz3h02OT6
-b0B4atxy1QdK/7AHYKsyLP7U8GGT5OL2O7kokcsiDaJa+k2FQ8HIlZ3l8CAJgYTd
-DC+QxhyRn01pR+eTK6alymfMcCHT1/bsXPSW8ca112/z3zUg8eDkkImR/vIFaG6o
-KBZB0iag+L2veU3uIXqHC/CW8ox2jOJyjTjApsAp5VU6XTQza/fRgPZzgWlhnxja
-ospUWdghpt/4LWZfwUrsgCQJsWVN/KR+7tmR3u1rPm46qf+0QAe80v47QEJEuQQN
-BEoELp8BIAC9Xd6Jo/GoT8pa+DzdcgNRr9rIU6u/VhObpc3eIz3uenXlGz9/91Vg
-HbuxSY3nqIllxvuNWboC6RPnTrDvieOUIik22J06DYiXklbc9rlEKy4nB2Gu6njK
-hrrNtD7V2YqL988xtfGh2SzuTP5LTaAZFS2CpJthdT/QbxiE2QJmjAfjPEdpkgDC
-0rcpB2nISDpJn2LmZVDYhuKLBDyG95SdwhBapL1puFnQMQ1P9mUMpIDtYadz/X37
-wgORHa+a2k1es2qXTRo5LRlUs/N7cqfjgCwCSvZLZIcQ8r2ik+KCOHqYYrRu8G7f
-qn9ipJcM8u1M3G2zkrUorzHBpn2jP0e+ChulkacIIv9Cd7Pdl56V3/y4t9dkpdGL
-E+9HWSRxn4nPVCNI2j2bGyT6cSZtEnfeiHj2pmsBIfg9w7n4oSPQwtNLkDwxp+Fv
-UYrbehD3gB1M4Mx6b0+7ZyZptk1PY2I9eRbOpTiqSTLY/dQhe2L5aYZ6vDPl0I6j
-tkcWDuVnxcFIREWBEw7tqpHn/IhQy9xNMQu3GvrFlCyP6XiXtZZATDl6EPgY52C7
-0689jEnky2mpvViza3h253vJOEuGb26BKQ/Qov+Pukdp4q8NMOby8VVGcjKrhTtM
-QBRCuKruOzMBtdcNP5uKUPsnykVpG7Uvqy9vFps1Ff6LW7Sj07y/7MVlv8wDKdZW
-SSiqyGM9YiWL/lIfFUqHw967j3LlKjtMgYWqtE915GWOYWbkXPE6M0YdyzwUyTi2
-oWYbPMjTJmOe1FGGpW5rNhAISSn1a8xngjmt+eKCbJJCzReLzGeuA3A1Vh0G51jy
-ge9Tr3KM7mSJ5kcNQVaxwLEIZTn+nef7wnvfWEmDKHtjmtzwja5BlZzss3I1l+Zf
-akjBLcqM31mWjjiBjtzU49/91Ubwf5tHvV0yWcvRO4nCgB5rxitrCtOqB7PfS8SV
-jMs9ItpT6ZGW034tfWoinz6LiaSQq+dsmW764gxcprjMI9z7K3ikP+n8B//oFShm
-rR5jLYy1nUWq2KfLwFKO481KjUcF72bDzSpqYcrniyzqFkUGItTJ/Y8LneCBZSSA
-uMjaVJNujNhDHJJlJ1nDXysDBPnwsIZnPUVvpJvEfKmoxvpVol4FHm7Uuuy+ZjuS
-qsbzKXhsfM/5ai/fSvo1Rr1kHPwm7Iyhlem/CXGKzsSc47SNWLrnnnEbuuXprbfL
-fxZ1NfFQPAgkOuk+v6TbJFXb/94SiO+qEh8yuYVBweQ8bWY6BgydZXwsznHh9+aJ
-I9jPbBaLMoC01bBgCDid57ljKIxWYm0Vv9fKAD8hoEQG6caAQxcQqHEpxeAMFwW8
-fAc4I/obmkpMLL2krOkfzstRcv6aJD5jABEBAAGJBB8EGAEIAAkFAkoELp8CGwwA
-CgkQiq+I1thOQa44JiAAnrvDJCUU8Yj6m67hYYEiS0bjcpagMnt42isVuSCmHU4B
-aSJQtAEC+gqw+kbNuOITJSk7ONZf8TI3BSAEq9EloqdloOV3+/xlT9zPz9vy0u0K
-2nbQN8SWNk5mjo4QPtmd44eqeYFShx3A5iLXT327oOwaU1ocDk36dE+0n/ia8SzB
-eRSDm9aCB+boY+Nf1Ze4f3E7fLQEw6/Do69/fQWvOgXZQ0r9vnO43rQFY/Rukcrg
-FX46fuiiNvTKI8V/uwtwd29xFl1pDpFfYgggIfdK43AxxazQkrxIRf1/X94w4T6q
-7GMJ6RWSiPcQJRJ1Ci7EoJqXbK7d6g6JDX70aTL6ZBLH+TxOYGWAmZjgftNH/DkA
-S2KhPdK350qZERlG+h/nw8q66Q09K5quGRIZ9zcKz0vBrIv8tTlcpux22midjcvm
-edvr63qgoySJDB4t5+iVBQfaicpR7jVaJDD+XYeMc4EMf59izjGLc9UCiyH2Btb6
-N8P/3wJ/JjIqZ6f+vpJ0H5t8HDq/566MYN2Wg0il7SgrlimbXfCLqLAgaLkVlDqy
-6lJvNHhWW+gjzl9IGawOlC/v4ciX+/poixulXiJIKPcIDb4SwQ4DT21TuX7fF2uK
-tWFcMTgDBpQGF36kP9ViY7WjZTUGlsmeKBV9ugeaf4MhhaqxT6WgALTOrLuC2GwP
-8O7L0Wq/269HzwUDxiFGyUywB5Cwiig4b6lgLoArnPYHJyAq+MwTgw25homK+Mnr
-jjA02YbjronTTJ78orHxw8hx3VtQbSsMu25PdOqvpomamlTlq9ex5jHkUKL8B4Q2
-JFD7sL1cTHYISZn1DL1djlv4FIR5c4HdGWDBLCqI/n4wv4cWfnfkElbOatyTpWDY
-IeWWqBeE/wqjB+HsYR6p+ImpDvSHk0F1ilytTZ6pgWKVkFj34fNu5yQ+fVxx3ERm
-dxJDbMMzmqtnB9tRWJBs0If0o17JktN3iba6Jcpk//isPaBiP92+TLX3EImaDQRr
-ZmgdL1Q/0JIXvi0mGV7Lfb7SBrEFdYGWF9kI3EREGyLj9Hl6CGwMwbnPBsuAmZwX
-phgoJj9UwTM/VNYLremXwrCCGWwzC1l7v17klCVWVjDmZsAZz10szf07WhNuS/Eg
-C6wFTnl6s5/Fr9JcNK3n0raGjcFPPmt/YNJYlrfWDmBzXACkTFY1POdyHGTjCQP+
-qJWKuYRVfKjosiSGDrSMA6QsHXOCfvzlT8jWACu0qEbcXJCEyCXnenJJSIw5VO4E
-paQ/2mXqEbMbgUlwODFRp0ly0zRQiRlLU4Du+ZMTmiJy2Clvh81BNGZaZf2uV5fS
-BRp49fNc4LZVJoOM5B8Z5hQ5U4iMkljJcdToI5W/QA==
-=p2JK
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   1024D/84B5A42E 2003-01-02
-uid                  Rainer Klute <rainer.klute@gmx.de>
-uid                  Rainer Klute <rainer.klute@arcor.de>
-uid                  Rainer Klute <klute@apache.org>
-uid                  Rainer Klute <klute@rainer-klute.de>
-sub   1024g/F1090E28 2003-01-02
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-mQGiBD4T++ERBADHIT28sBr2bmkqNoZBj2jOaTG4GKS/4cMxI0Jr6kkuO2PYuOQc
-PoK0X7D6u48SMJX01d2oMVoEAeysmvuwkux3bw5rtcHZqQFfRtFV20n37RN/tkKY
-SvkHYB6ifhGfghcAvRFYXaIxolexdblUhJlGQc2ZTDLKqtTaQsc5axRvdwCg9DPw
-Sr06VUMVWXerGfLJUzE8i+ED+wWgT7/0ypt0rhZTf5wgMWjyXJ5QelaeROiWoVqR
-6GWZiN65kFDG1e8y+pEfvp1JUxz0f+RVhREomdfw001CuI19cRaN1mHbY0nMLEzf
-PMJgpJ3by8A3n0/fpsW72LVXRdGL94bYbY6XcHWYZDcT02zb4yap2GneEHry/Jgp
-sZS9A/93qOeNZD87uQKOXZi/a32VETr4aNQclsRhRUtzkUIJNklPxjwNbYLY2CdS
-N5gO3rR7e/dgdvq6ivd/xkQXyqqIe+i+OFIoV5Ur8b3+WQha5mednLryh6UbTIk5
-1hQUQDiKRtWA31rRlyKHMJBMZLPjpQOLqxxMpZNut/fNKTo7+rQkUmFpbmVyIEts
-dXRlIDxyYWluZXIua2x1dGVAYXJjb3IuZGU+iF4EExECAB4FAkR8IpMCGyMGCwkI
-BwMCAxUCAwMWAgECHgECF4AACgkQU0NGFYS1pC44cQCfTjPeJm8+4pDss9jrP86F
-A4iE8BkAoLuEAaDOfQvBeT3u2QpMpVRT50wliEYEExECAAYFAkUHCvkACgkQY/UP
-uSC5JsIYjgCgj2Y4MTf6IjxyJIentadTAxGSTRMAoJ1BvGa3LSy+rliiktyn+94w
-MOcKiEYEEBECAAYFAkURkHUACgkQlM+NQ5LdW0tnewCggA77IG1Ns1ISxlCaorGv
-+bgslV8AoLq9HtGgsiuxxdc0r8+3LRYhrf0utB9SYWluZXIgS2x1dGUgPGtsdXRl
-QGFwYWNoZS5vcmc+iF4EExECAB4FAkL4/hgCGyMGCwkIBwMCAxUCAwMWAgECHgEC
-F4AACgkQU0NGFYS1pC4cYQCcDTDDS7uRbXnvez+uZhGrEZlXUJwAoNX/GgTq1vZW
-gxMWf2vPEO6IDhhUiEYEExECAAYFAkL9kd4ACgkQyFGoreGTVbonBACfepLmeRA1
-jslInl1sCByn8/cO51IAnjCnyfMFY0kTLZWK9bi2kVJJCogbiEYEExECAAYFAkUH
-CvkACgkQY/UPuSC5JsKw9wCg3ahE1gb0Jxf3NMcYYi9ww6TKMcAAn2Js4AoO/Ss7
-8XOV+09ZaYvO2km4iEYEEBECAAYFAkURkHsACgkQlM+NQ5LdW0sE9gCgoabl0JSe
-X3aXkkO9Ud6UOHaDWaYAn0ZQqf7t/fb5GMVmlDMnT8omAsQVtCJSYWluZXIgS2x1
-dGUgPHJhaW5lci5rbHV0ZUBnbXguZGU+iGEEExECACECGyMGCwkIBwMCAxUCAwMW
-AgECHgECF4AFAkV3u4gCGQEACgkQU0NGFYS1pC5xrgCfQjByS4KWDDSpZ19ueCjg
-dQr1uUEAoL8U+/gRJtG6Doh615dcO0QslINfiEYEExECAAYFAkL9keUACgkQyFGo
-reGTVbodnACfdsIKmkq80XuOT3i1keFCaRIlXzcAoL13+rjtfhm92Q1IKB3m9cih
-DHN+iEYEExECAAYFAkUHCvkACgkQY/UPuSC5JsI5ZgCeJTPavF1zdAfMGlmvkKcs
-ePjlVpoAoMlRD6SeOF9O7m/xfeSxiI9OoreQiEYEEBECAAYFAkURkHsACgkQlM+N
-Q5LdW0saYQCffjiXMP8G10ds7N2HNStVb++PTx4AniuSrYMcn+jA9pKlWaBBBAn7
-9mL5tCRSYWluZXIgS2x1dGUgPGtsdXRlQHJhaW5lci1rbHV0ZS5kZT6IVwQTEQIA
-FwUCPhP74QULBwoDBAMVAwIDFgIBAheAAAoJEFNDRhWEtaQuju4An36nIBKzMpzA
-rH2FQvFp2oWnhV6gAKCyVnUiRGz0VwsLkrEVxxgpqg8o/YhGBBMRAgAGBQJC/ZHl
-AAoJEMhRqK3hk1W6dLEAoJyrrxDfMBbVLqo/os4wz/WOHmNSAKDEa6hOmBnfKk2X
-5rA0F7ArAa8ggYhGBBARAgAGBQJC+Q75AAoJEO+sVzojurMr87YAoIZp9qeer38f
-47KVVYFMAwO1TLkSAJ94LbmF8B98/ih2Z1BJaGBQtmBqBohGBBMRAgAGBQJFBwr5
-AAoJEGP1D7kguSbCXRcAoLaeuDGAbIkPf/PZJv0Uxf9CJxA+AJ0TbAOoaPwk4HKo
-rOw6+mgH+ekRWYhGBBARAgAGBQJFEZB7AAoJEJTPjUOS3VtL3ZcAnjCFahSecBBS
-kFnk6bhnkRCRHNrhAKCbMAJqK4O00zdRyaqbbI5XAFDHYrkBDQQ+E/vjEAQAhzT8
-TzjRECMxye0XlxeRn96HLlr9omOp4iagwDieoKePhKHU0OGaTYo/k0HISy32nTdS
-ZyFg6inlz4UB6odhLp1vj5GtMXbpH5MAz7WyIWcfm2uXujRpZzg7cb6NHSPYDamf
-09QxybFXcc19UBLkawrJDPszwY5kgB5A70CVOZsAAwUD/R41zgJToLPexypUNz01
-97/2Do1dQuySyuyUCmriv9O6sa2Vi3XIbwZImnHIqvIwu5Q/lEVBrZk4X6BRu+hq
-Flm6R0z9n4WtMyFlSxUJan11xPy5rFHxu2Zpk8ciwSLrT5Dl1EqNwLvBFgZZ/L+r
-/PLM0if+zVI5dbZQdmzsFpaxiEYEGBECAAYFAj4T++MACgkQU0NGFYS1pC5ExACe
-PsnsMnIHlxboIe4iFG7JOxG7GwUAniGlU9WWfXiPl2deXWnB9kY35Bu5
-=JOCc
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   1024D/F5BB52CD 2007-06-18
-uid                  Yegor Kozlov <yegor@apache.org>
-uid                  Yegor Kozlov <yegor.kozlov@gmail.com>
-uid                  Yegor Kozlov <yegor@dinom.ru>
-sub   4096g/7B45A98A 2007-06-18
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQGiBEZ2p+oRBACNjPpUsJ6ZXK72LZCEnd+eWLBtsAbf9Gm7+NSxvxCZCdIcJZIR
-OVji/IHKa9BfsI3F3nZ2381k0Ri2qK6ZDVRZFLCFxmUjwC/oVReDNiOFVHVNZkR8
-GBhc0QLxIQ/Gq6UUOu7hj6IAcaGS+oFKP5fPuSZi7qvVd7I1UXaqqJP8ewCgokfw
-xMgkbnchyx8qqfWQyQ8SSIMD/32VLN5n0juPyrQ9X1N1Vw6qka4avF/9HG3EN9pc
-MQi4uA90RnQPJ4LJ1cg5a0nsUcctqi+kHsa58/Fd555ZTf8sWGVhsdHeBv2YcwpM
-kqw96Wka2C1CUrsGNsAVYmTvCWyAgPJWv+Ytsn2idzIWLhyqgAVqr7bqEjiv+tr6
-aTyKA/40RzPaZNmCfWrEZUMcN02P99sm5pP0M+1w59Uvj4HssjCfM4yffp7CNMhO
-1UuXdoZMAvv2G1L8OcwPoxBqN1reo1VgjAf5LZalas8EzyOZpWWerkzpeCld9V62
-WwpTEDgcVq14jjtYFYmrtlb/WJVCqoj/oq16BbeAleNBVL6hLLQfWWVnb3IgS296
-bG92IDx5ZWdvckBhcGFjaGUub3JnPohgBBMRAgAgAhsDBgsJCAcDAgQVAggDBBYC
-AwECHgECF4AFAlCzcM8ACgkQaTQKAvW7Us1kDACfRKl+wh0gYan5rCwGIYAjOzm9
-tmsAn1QOozU3kRgrub7EDmhksis5n7MsiEUEEBECAAYFAkc7x+4ACgkQW5aAEOBP
-mol+QQCcDkcA+ygeInykabJt3OPNjLBTZKMAlRLRUjiw+fn+EfbdEFyW63TfXB6I
-RgQQEQIABgUCRz0HjQAKCRAAvma0h4AibqjJAJ4sKQhpZkutP88QtqFWWRrNnDSv
-fACgp31ekx2zqtzY3Tq6yKP+v2xuEwqIRgQQEQIABgUCRz0V8AAKCRAs1qgDIEbQ
-9boCAKCkVGjldjCwV0YW+dgE+yCgL+28hwCgn01O53q/6MkCfs9nCtYVgbW8VJOI
-RgQQEQIABgUCRz0o6AAKCRARiOjcOrhZi+uuAKCqwy43KpAnxC4jU0yIbGnpNTN8
-sgCfcQ+Y0SlvcxqUCIyB+LPZonfRl++IRgQQEQIABgUCRz9hcwAKCRA5Nfoub9Be
-SaJgAJ9sT7R+x3QhNmsYlKAGtX3c2AOr7QCfSmicLEpwn/f92NrNwAAVqnHU6DqI
-RgQQEQIABgUCR0CEpgAKCRDW3fAx61H7unL8AKClE3l8U6VhHVvdunLLhV/o8zYF
-CwCdHpdz/WddsQt823V70tEeidwQ5HWIcQQQEQIAMQUCRzzQpSocSGVubmluZyBT
-Y2htaWVkZWhhdXNlbiA8aHBzQGludGVybWV0YS5kZT4ACgkQMoZOQZyFIisNbwCd
-EsXeA27pCnLPTRZpyi2Hp9zAA1cAn0mTL9QX9Uo2ppraETrCw3Xet9sIiQEcBBAB
-AgAGBQJHPLrfAAoJEBllhVDDEQYR5LYIAI7ae+p5SDF6aybdOEKbzMiPCe/bpGO4
-QTfHq+lCGctkOIvcvwIFFheqm97LEqFjzgASGaJYSLqUwtQl0zFbYh2HxcaTiK9X
-UrVL4cTBn+v5ae3I4zYXipKHOEM1B3yiFrObwLze6lAN3bKti9iXBaGrD/H5aFk1
-zaU0XhNpBFpDYcdMsmVjhumL5nCGA4Qd3jjvnotMj6LE0NFTm6x4QB+fHqPzjaaj
-Rq2rjrTfBxBatOpb6MyZf0+cxxO/cBmslay+0b921cJ6UsuXGkzRzgIg9Va2smc6
-bgDDs/NhOjJG0NmKVZ1+ZTE5GjlyLknN1PHLtwR2A1aZz9yurDUQCDOIRgQQEQIA
-BgUCR0CUbgAKCRA39o/1AVr8iuVFAJ4+m5BfqHq7LDAdQom/8gLTApNsOgCg0w0H
-exbhIr7AjBfMYPnPDXtLJj2IRgQQEQIABgUCR0MbcAAKCRDtTu+wac7rG0RdAJ4s
-BbRjTnDMDbvzbjs1+b2QA5UK0ACdHuQBnVCBDbaTuIG+XzQa3hUHalKIRgQQEQIA
-BgUCR1arcwAKCRATLknU5B7cfr+wAKCHUgF99Y0sf1To4026XDo1GUw+fgCfQdtq
-KughaQa7Yo0SQwUiE5fgCqCIRgQQEQIABgUCR2echwAKCRBAwqscHOF+3CE+AKCF
-KpSGvHMUK0K41YfosMS/weK+dACfeYMblBKZ68lu6WdR2r4IKGRjx0SIRgQQEQIA
-BgUCSAilXwAKCRChYGPsuM4wbtPsAJ9WSWjYZmDFkRRuA+ltNmG+kVvIVACdHf4G
-74oalm4osHwCpMCkDfeMqXaIRgQQEQIABgUCSBOggAAKCRAPRQomYhC/wDS0AKCO
-AzYQsUZ+10RZb1k+fxRguQ8TWgCfalShzaPGRwdb7Ocyvql7lt0WFu+IRgQQEQIA
-BgUCSvyGtgAKCRDJx5JOUQR9ZhxbAJ0R4Qvl/Fv7CzcyamdZYCTDttYEFwCeIvSX
-l/wkFYbdBsboh9Z6TnccEpCIRgQTEQIABgUCR0E9xwAKCRDtsQWJb5Ui2IMBAJ4h
-Skr1sOJkaSqbgT8w3TEF8QNlKwCeMcBfh7GzdPh7sPEcyomSCfxcft6IZQQTEQIA
-JgUCRnan6gIbAwUJCWYBgAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGk0CgL1
-u1LNshsAn2jXy5dYyq9PyYGlQJOqgmml/uQDAJjQQ+lRwxOxIrpQjWZtqGQe9TOG
-iKkEEBECAGkFAkdDlCggHFNhbmRlciBUZW1tZSA8c2FuZGVyQHRlbW1lLm5ldD4i
-HFNhbmRlciBUZW1tZSA8c2N0ZW1tZUBhcGFjaGUub3JnPh4cU2FuZGVyIFRlbW1l
-IDxzYW5kZXJAbWFjLmNvbT4ACgkQsr68QBUpJK8WCACg2n+RmlCWI8XD1gdOb+Qb
-6KRLe9EAoPq6F2PJ4XDmi2Fklu0pawNYsfMpiQIcBBABCAAGBQJK82JzAAoJEIWP
-xMT0OFaj8UEP/jO9SpC9Na0wzL3lV2AUm+CBq1gXhpAr6ThSystevEQzmLIVanNd
-EH2MsaUCbmvp/3NCrljeekyUdras8aqLyT1RcIuf1bo6r4UcwecA9DrukBO+zmD1
-kPl8gOR9s8PLe4+I0KLQPDY2i/4A6vq1ayYwBVhKUmXqCZW03cpTcgObuMfHyaUd
-fQ82A8Qx2e94ckTnWrX5yFGt1yy8s34JvDv2GQT1Ski8ghG37vOlNGZI0H2MjBY6
-kZYJNf8ZNGMz/oWzHB7YtEEJYO/eSiOASK6Pd0ENWrYWbtg/84XaHmpJsjMPjbA0
-Zr5s8UjHLcXIFjwXGYbx/Pe+DkYxKsld7AwAmnYezUouSL2yQ9tZmO+UCEwjmANs
-wN5UgEopykF9rqIBWWkFkMpLPA8JYlHhPjuim710crHusD1dYXF3KbcGl6SMVM2U
-cqVvZiop2hTIjqpfISPMZtp9hRkcswz00TuPUmAx/D2PhQuUvA+Vw8gPviDJHkUk
-79K9qcniu/nf9VCTaYosJ+IR6XVAEOUydLPzlcMNPctcwL17nExVXCu5GDnXZJz3
-TwIPeSIW0XswY7MakX2dxULTmv0NkO3ogdu4vzK0DtQdTJD4VFllXq0x2gMK9k2H
-AVmRznU7WEDbRumePWS+dtr8hm+Du9FEDyZ7G3Jd47VAn3ANV/skWjACiQIcBBAB
-CgAGBQJK+zeMAAoJEDWVOV6z2OG6688QALtQBTR5TbYHyJflc8lzwue6vqnwoOpE
-xoicT3jANlMVctg2sTgXBNCFIf+7qi89YSdpQWJUPxdALJDoj9fy/hWbTbde4bQZ
-fDbCfDelcAVXryBr9gE4WxxcBx29XdODAAlQGup/no5UvsMsL21KSdQgp9LpKxMW
-Srhz40LyGJQNC0vyMzzNrJTAJMJ1ewRt8cTu/8xxNvCjg5ALPUOZqy+ZD5V4DLNT
-jBLi7uVEU6KKht0KKCd2GE0QwJD716QllokpDcS2FAHul/DkocgLc1nwgkgZbPIB
-wAeW/Rmx+g9ayCwAx3kjlrgdUy9NDXQloK6TlscyqfK3zf3pvv+vG/6dJuTclxaN
-d5ISp36jZamg3t9hinFoZUEm2Cyc6kWlVojhy8Mu0DoOcfhH6uBYjPwdoP6wZZTZ
-6NVLPKzEYCPYNZ7Y8ELCujl6xFWRjzzqk+sNOKOCugZHqS1AVNZJsg4dkqXq44AN
-Kil8feC6Mu3JONTf6DbwqsLcgVHQ5WDczzdj09SWOO9hVAOOI3AOwyXLS3VPrylx
-rbSWeXzsBlHM3YfjNe791RbmpRU3lW3/4dRF6p6HdL6pPKIpmZ0FDrrzOUtXRdQu
-W/vDk0cRSD/ZZyzMqytTZx9tBUPMlN/unb8LQq9t/w/2oAivCu/1XmXVX8GpXIcZ
-Da/YciQe+alPiQIcBBABCgAGBQJLJTVyAAoJEDF8bfg8dwXPoowQAKvQoxgs7kGR
-R1AlxdLUlg+CwyEP2fXUnEdNKTeFUCMVB13jcPQfcHZfUDKwd/wBZFqA5IpyIyoE
-GO9o6jnVy080qWTE1Y3bDTRVZYUumt2ZO0l7gPruZ9bu8TuZtXx1H6y9uJ8fIU82
-ha4OseEzduB43AweQkBkUkPmXfbTF0yzU0kEVABH93hn4zFq+E4PTpqF2KAH6+X+
-CuWzNwpE0whflgmir79OqVUpFHXJ94tOK1/Fiepvq3PmUdJdf0o1fiH0rb0EobkH
-fe61/DlvUgAqYfenDfsRAbv2SpcVoPSMMLPA47byyZRT76+VKtlsgSFfKelAvB4Y
-n29HvxOPC85mdKhSlkQCpYXsLJBJqItXND1g2MhSvRjTsxoWZzi9wQOtWMbaefOU
-ZiLblz1diPL86hdf3Yyb2kuRpbVq3U8XKmUJ+F85e0yQ9/qlLKVd2Pfm2oLL+tOu
-6W88IFhumcrT9R86AOCS1B7Biz7H5/KpyLEdYpuOeQQqLhVgy82YLc8g5C9SfJhQ
-raoraSOuto6HdTxMemSd1MUqDQhMKQixNWKQ+hEs0BB1o7BjFO6KF7KPud6TN3t8
-cUyfrna1OhbpJPnrlNrzdXSPKWh1gCuRI2EaokOeSCviL36nnFkTPeTtrASDAraV
-pZ9abN4OYL4JHwK5QpIDW6kQed4GMvHOiQJ+BBABAgBoBQJLDN5oIBxTYW5kZXIg
-VGVtbWUgPHNhbmRlckB0ZW1tZS5uZXQ+IhxTYW5kZXIgVGVtbWUgPHNjdGVtbWVA
-YXBhY2hlLm9yZz4dHFNhbmRlciBUZW1tZSA8c2FuZGVyQG1lLmNvbT4ACgkQm7hj
-sPUbuIrJ+A//XYCi43ISP+krVXnOFbXO61jTloIilYeg1nMMtSZwAJtP6kaBeZVl
-DeFiYJFUOiZfJIy4Ull3eMI29EVsi46Porc3/o6lpMvOFcs+zSpqcmoxEPmQtbmR
-yLZawC6xmCPO+Hs41MeqPhEq16M4rMZn7KejUu16Ujs54W1Us0H7CXGHI8Ic7/9m
-PZB7jHD+iCirYOB/CeZp4xubR9rJYUn/IhdRlMmK59VOh10www7CSSMcW0/7FaZ1
-60D1jS9/Ad5pGT7I8V8KdUVDtXNeEfxlloCuxmt+3lDFL3Ee02mhy656qTxV6B32
-/qYYeg+OU0zP9IKD1SVITzRx6rahzX/vVVFIma8YlkCjvsVZlTZKJ/xz1cuHJeKE
-72r1HVoi6ywsCItxVjwrJD4QQJdNPGIjh97gDwkrOBCkYiTia2xNyH1Wchpj64Kh
-+fBRoRGxcdoF2ZhyOUzGMdtmtzy7OwrckPtWJeZ5nnM32EzAIakugQq7rSmXBS+J
-0/E/KrouejsOWzMMQrHjVS1keuowF6+PJtWyZgzH0fbi8SZ2Ym/yabv5zVb5OTOL
-siUCdPA2zAU1jBkE9htIHqIakFYDnfUNbEAmWMYnEtxY8wr4fDgOTIZ84qZN8A+g
-qnvkzoc9kN3kVq0WCZw/KNxtKMcJMFij1kg0ISMwmbcmKfH/b9jXgAeJBBwEEAEI
-AAYFAkr+G9cACgkQiq+I1thOQa6GvB/8D29GySol2rtkm1MFd4UoJl0h/WV0cVkv
-UhH8G5rcwntyjK48nf//hiNKjEY/Uchi1Ai7GJU8klvEYzDm4SVauBEERTxaDQhP
-FvKQeKqpAGVaeID3C8puaTHwlOUB+e+yFXVeCxRZswbs+fEP5YvT4JmMuSpu0RDO
-oC8Q9cONssqgfTM1uedCVuN2NGnLHRUKAkAH0q+fQTyN4oBZiVuMRTQ2Py0uVOt1
-WV1mtOudmivJ1CxJ+34CokcmUbvnxPnGLxi7HZN1sQgxQqNHFR2N7SjLn4O5NBSj
-m+AID5dKOIAnW/Urv8Ek4j+kM3oaxES9+OWZbZWxeoKTIsNtT7Q58XOpuRnD/DtH
-P/q9FsOlm4u6NhKyKF7EPeEu4z/WTemoXDF6LHN/8QCDV4cZ7wfC95eIyuh5PT7g
-4vsZD7J9tq2jWCZvwWOxGmuX8E9HIqXZgEzcEq+2rOJpCZYtHS1MilzXuhp9ak4L
-VmhSAL49d1t/IHwyDvBByB/F3FItiKYf+SAiKNq68cTgwvY/m5hcOJJEfnyr5ho2
-EV5rdwu3HLISnykNUXUizylrBhuql6Hnj42UKd1UdMyAe/uTe0NPYZKwRl3xWxpT
-g7yB72jO/mT+rlAsOu8R/EIC9iF2OaGkUY6BV99xEoW7m2KBuAauAmh1Z5H3ZY9/
-D9ubL21XEGyFb0I8IUor+gu5HVk4/LqcI2Fj1DO+83vbTicYsTJrPY4Bb1zhRrje
-vwNmZHBshQYoWFUJA3C89OHG+biTn2uKnleKMhvv4ZIr/WoENkyGimfSos9ZTQ3g
-/1kKxOCY5yGW61SMmD00JjHIMg7gZjjuI/KKzbGr6kjsA1zMGB9rxIcy434wdauu
-VnaD8Ld8kLcuk5myWh8cgjE6XsVG4H2lIBp8FXwHNZv9RWhglV1B1VooYyErxthe
-FPMTmSGd0y+cou6tm46H0qclNg6Lg2qshXggkf4ONamE1vmGh/8XI8vX6Y1NQbwL
-yFElQx3caaN+04Yxzws/Gh+JpaLNsqR2an7DgwOWmbKuguSkcjNyI77tOsCXmc2j
-v3aHJH40enUmRZlcMKL7bI4w6vEOXWULiHEbO0/XBhi0lqtqoMfwh6FkTthEMxhY
-6cfZPIb9uO1V5pdHGz3F6p5rRHmNuRgbOik5xDHJ91cavEKZue/1WMaZmGGtz2l7
-eCdFxDqmhW5apOA90JRR+b/8ga+JI9bnynpOrs8tgalsLmXUJRfqQTTAoghEReVS
-P8iA3SoL0ovKhD8aeaVoy80IyQZkzMzd4rMNmXhaxBJycrPyT/sWOE23QBqKBZW0
-xZjKrFuLGOf88hD9Wvgj9rNs5lmBZ1dDUjWtGAVdvdN5+NOtBlCi2rQlWWVnb3Ig
-S296bG92IDx5ZWdvci5rb3psb3ZAZ21haWwuY29tPohgBBMRAgAgAhsDBgsJCAcD
-AgQVAggDBBYCAwECHgECF4AFAlCzcMcACgkQaTQKAvW7Us0kWgCfe3LGW7t+o2Pg
-mB4XjmQuhdVMIjMAn0ugRyWGr+J48hkZWoH15r5qBDCGiEYEEBECAAYFAkc7x+kA
-CgkQW5aAEOBPmok4+wCggbJpCeaTzQ8cORgx3nvaF52hrmoAn2WJluH7qjuvJ68y
-t9kaLuPm/wa2iEYEEBECAAYFAkc81RkACgkQr9WcwWXV45qWYACeN1qluJ4cGMN+
-1vLRSMjmWCGzFKYAnRO/7iuMiM/3CJPQ85mEdlNZJ6MiiEYEEBECAAYFAkc9B40A
-CgkQAL5mtIeAIm677gCgnFp8wUVuMss0cgb86rttjL5vbHMAn1kEGh+sANT9Kd+m
-ofcGpryQPyFCiEYEEBECAAYFAkc9Cx8ACgkQwT0w2KecbhhHPgCgtQXQrZ7Tbq3w
-cDTQWnVIZSIluPkAnAvzwLC4JL7y/5QyhoUoGCT31XYviEYEEBECAAYFAkc9FfAA
-CgkQLNaoAyBG0PX0bwCfWGjRnBwSDVTaJzCjBcVXA3KOKdgAnjeg2zn/QpGP8akq
-rIYYg727GBQUiEYEEBECAAYFAkc/YXMACgkQOTX6Lm/QXkmLoQCdHkNDnW3yQCSE
-m/7AZsq5KAKp5GwAniCHiB/ZXHDpWJw9dlKhUxoh0o1oiEYEEBECAAYFAkdAhJwA
-CgkQ1t3wMetR+7qRCACcDpGP2wZcL2DPIDR5LZbEpJZBTz0AnAjTjRjWOtXgsHty
-eY7UP2m6ybGNiHEEEBECADEFAkc80KUqHEhlbm5pbmcgU2NobWllZGVoYXVzZW4g
-PGhwc0BpbnRlcm1ldGEuZGU+AAoJEDKGTkGchSIrDW8AnRLF3gNu6Qpyz00Wacot
-h6fcwANXAJ9Jky/UF/VKNqaa2hE6wsN13rfbCIkBHAQQAQIABgUCRzy63wAKCRAZ
-ZYVQwxEGEXrwCACrKhlffitTUkp+mk7XCdZPMBeiGbhd/Xj0V5L/MdhErUE1XI2P
-k9JAS8h/I6CjmfAzS71I2eLxUzb7yYb9vn+5ZRTXreQoqYMmPxENbkgi+1C6L1Wx
-PgCxI4uZHY3WmAZDyES5rKNaAYT+zAgiH0b/5PUToybBZsKRUo5lADiS6pGOJBXN
-BaboQQot5uV3ZDq84A4/okRa/+wt4gxzhUR6E0b5SiUzTkZyfBGV1N7QyLC0Ws35
-UyPo57D7JJYuhkwL3Wal/kUdLcOuul5Eq2EZ6m4FwngOvtMaXvJ8A8FyI0T1ttW6
-n9D9vBRbLINsTI7RrD4Nv7Sdah51VxxshljpiEYEEBECAAYFAkdAlGsACgkQN/aP
-9QFa/IpMIQCgyLBVj9zl4fth6W7rTwSKpb6UvxUAoLq0SiiARb1R7GtgnR7eoQx2
-zEgBiEYEEBECAAYFAkdDBRcACgkQsOAY/LO02Ytt5wCfcvC5zL6PYmwzEhZA9NkL
-RDx73B8AoI+U7IGaCZ6DdcGuKI+rqBIe5JVPiEYEEBECAAYFAkdDG3AACgkQ7U7v
-sGnO6xtUEQCeKDMqBM34QGCzvPnyrNZxYbB8md8An0r1hU0ldenY8AtuRXvGdPGt
-TDENiEYEEBECAAYFAkdWq3MACgkQEy5J1OQe3H5NjwCfW8JyfNbz/Chm3wcjCljG
-Hy2IsTcAoJXof3FdnHhYVh39HHAltAe6s014iEYEEBECAAYFAkdnnIcACgkQQMKr
-HBzhftx7cQCcCqNzs1uy7ph9bzjm9CluyoqTjlwAoJPUbx7MGjJSc1U/97S0cRmY
-ODcqiEYEEBECAAYFAkgIpV8ACgkQoWBj7LjOMG5enACeLvCCM639HjYKCXtK9Qjm
-PBZgebEAn3Dx6np/KjXT/uMMYa31Y6l8cezNiEYEEBECAAYFAkgToIAACgkQD0UK
-JmIQv8BTHgCeK7P55Hu/64pwXyirPRs06lGh6UQAoMF3ulXYzJ/PNqFGSHm7YTz8
-q58uiEYEEBECAAYFAkr8hrYACgkQyceSTlEEfWaXsACglYTSo8g5908jpIw36+e8
-8pYitsYAn2pUJR+lGXzWRDYYlmYUupU1zJtJiEYEExECAAYFAkdBPccACgkQ7bEF
-iW+VIti5hQCffUJo0Y8mHOunsflJVIW3gJAYd7wAoIX/ypbPbFvfRrgy47b3h6FO
-cvj2iGYEExECACYFAkcc6X8CGwMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
-gAAKCRBpNAoC9btSzRUVAJsGGkGTv9wasU3v1KSCnKoGDq21wQCdEfFFDsI5Phz2
-bUYFaKsO5owE+kGIqQQQEQIAaQUCR0OUKCAcU2FuZGVyIFRlbW1lIDxzYW5kZXJA
-dGVtbWUubmV0PiIcU2FuZGVyIFRlbW1lIDxzY3RlbW1lQGFwYWNoZS5vcmc+HhxT
-YW5kZXIgVGVtbWUgPHNhbmRlckBtYWMuY29tPgAKCRCyvrxAFSkkrxYIAKDaf5Ga
-UJYjxcPWB05v5BvopEt70QCg+roXY8nhcOaLYWSW7SlrA1ix8ymJAhwEEAEIAAYF
-AkrzYnIACgkQhY/ExPQ4VqOg5g//VGrYeZ5+2y/V0G1Pk8Zwxbp1uquEHYitgHWb
-zHSP54kFiD5QnQCui8p7P3j6oW1JVEMOfWaT1QZ3KSRbqh1RLirB7nNmKfq3ybro
-7/0c3Rw9lDR6aHAgkdduReV8LSy6zae9Cz3ykYdPEuWF5hCtkc70t2fVSVRC6w1R
-pUq30g9L5wUF+2PUW5j3FljBqf+7STOqTDFkLLlnVhlsN5q6K+WPrY8MTZxeapfE
-mzGSyN+/T6BXL+WdPkZY/F+Pya48RFLbcjIuznLs2wdkylIi/oQZpUATRE6w0sHy
-fZ5pQuuFNRPNmC7WH+wmKGcb9kF2D/QMdYO1cuvkh+uJzzlDtBe86BrNBLM6wnRF
-7dffECwzkNFXRp7WLrH25ummxXtHtSe9YZ06fbQeC5jFjE4yMZUzLy5QNUse2/4e
-m3MNa3S2LkvdmcpDvoAj0F0vjHYauG5QscE9jCyS9hkYOW/83yoS4/E3/mVQW5Tq
-J4C82K+mKpoFwYnsIxdtGduF1fOuQPuxiIbBkj9xE8V/vYR1VkYTOzTkQ+YT/+hU
-hF7NBgUo4eqMEoYRk4Sh8UgwZKis/ibpOIjt8XA4R2sM7AsOXmdT5UxMBXnOP9yB
-d98e9H/e7VOSnCTSvwMoPktYsDEVqqkpAS6hc9vtT7acxft8GxPwiSn/3PgR2YwL
-D1G1zFyJAhwEEAEKAAYFAkr7N4oACgkQNZU5XrPY4boSVA//b2WBz+m9OOPknvkz
-laphU9lWkafA0zfBwazviHp+HIKoi2UjuAfkVG7vbt0AMX2RLLS9EHIb/WwBJwYO
-wleld7tf58ykMAqdNTyWaP5crHiMTTw9dcK1Q1uujP+i5wgvI0Br424apW62R2mM
-1INJ9WNtzrb1Ze5hONsaP2NYop7keRimbpumt1EpH9lIU7wNdwjbVoSrF43FXlvf
-Rw/itT0sYSwSIAKuhs8NpmUlRpz+hGr5bqy9GZu6JkTcZH81dz3LcQDBGV5UM+zc
-AKLRLoxsu/hkioGCdNy3xAbkE8RpZPwyiwBvzh7awvfAvziHSKPzahxRaKepaPod
-dTrz6A38VbwAY7RXoB+fOiCVLpxm5zHUCbDsi248vSfFJg+IHvfVbWDgborU5bHw
-8wJC2gkiMEOUryO/Cfqw5Ezxr9Wl0Izw27p6J7LP+T7f6UTBwU1FZeF8WU0WolGi
-E77PCVKD+b6hkOtzAYLyLkz+EBhynYg3Ny2aDWLeiwNGhjExFBOl+D1/2rRfshUz
-Y+nkviOVsLV80pC3T1MiDk+1WB2/F2cah6XSXtswVPAXMYpiEt2VBH/a0M7bEi+y
-n9yNLbuBxfgoRVTZe+OaqncYjuadPR3xUB3Oega8HJju7DaCZHAKzjfGrybt2fMi
-tQRp1Ctp24Gcy49HHJDM8pj3JzqJAhwEEAEKAAYFAkslNWMACgkQMXxt+Dx3Bc/g
-OhAAoJT6RrqPfSUiY1p/rsR+aBXfTQjp2kxAz4YsWpFZQpcloBO7vAUhcuRYUiA4
-t65KCMC9XpMfaYNRfWBSsg+F0B3xfP6bXUPdLl/xK8rjv627jdFKLMVn/DUPaLj0
-1YFhuUXkYAuNyWNMBD3ZrmQv97DR0jG/VNqgP6PxtRujUM8lON7KthYKLrerESCK
-ll0MFPBrL+Fn8COOURx0QVtQPQF1Ho87Y/go2MJ4afuDlXqojr3/Ipkaol2Cbf+L
-6rbqZsK4L1tYHygTVorXi2U1oHQpRYP7Id91aZ7svUBm9RC/RagiYf4uR0T4iILR
-/mPAELEq0FR4BZLRK/e4J1qdAG4CtxG+nvgZDgh7YBzi5udYeVJnsOkWZcyxkRLm
-fchNV4Y9Az4PxfXSFOi2BMyf+wui0pkEmJeaYY9SWkj8x3g2xmttPW86/LWI3i+T
-0MffEVH4d0tMZNiDlqSWaGN9uOMEYKYxG8pd97SEdAwub7JQnnod+Qg7YoCMB8gE
-X5xuBqcT+A4f+ic3cqTTm41iks6qcDq8eoFeCTuhfEra4xInRJJnCMC4XNvdn/Mj
-aTV9bVjR/ansjO3T2Nkkg3Hx0SiB6bFoTx5N+cMnj34mZ/YVeufQ8c35CRT+WOX8
-hB4NFK8ynJgrYUerwdl3B3RxtpIp2RMhzYCJb8kh/1Kez2GJAn4EEAECAGgFAksM
-3mggHFNhbmRlciBUZW1tZSA8c2FuZGVyQHRlbW1lLm5ldD4iHFNhbmRlciBUZW1t
-ZSA8c2N0ZW1tZUBhcGFjaGUub3JnPh0cU2FuZGVyIFRlbW1lIDxzYW5kZXJAbWUu
-Y29tPgAKCRCbuGOw9Ru4isn4D/9dgKLjchI/6StVec4Vtc7rWNOWgiKVh6DWcwy1
-JnAAm0/qRoF5lWUN4WJgkVQ6Jl8kjLhSWXd4wjb0RWyLjo+itzf+jqWky84Vyz7N
-KmpyajEQ+ZC1uZHItlrALrGYI874ezjUx6o+ESrXozisxmfsp6NS7XpSOznhbVSz
-QfsJcYcjwhzv/2Y9kHuMcP6IKKtg4H8J5mnjG5tH2slhSf8iF1GUyYrn1U6HXTDD
-DsJJIxxbT/sVpnXrQPWNL38B3mkZPsjxXwp1RUO1c14R/GWWgK7Ga37eUMUvcR7T
-aaHLrnqpPFXoHfb+phh6D45TTM/0goPVJUhPNHHqtqHNf+9VUUiZrxiWQKO+xVmV
-Nkon/HPVy4cl4oTvavUdWiLrLCwIi3FWPCskPhBAl008YiOH3uAPCSs4EKRiJOJr
-bE3IfVZyGmPrgqH58FGhEbFx2gXZmHI5TMYx22a3PLs7CtyQ+1Yl5nmeczfYTMAh
-qS6BCrutKZcFL4nT8T8qui56Ow5bMwxCseNVLWR66jAXr48m1bJmDMfR9uLxJnZi
-b/Jpu/nNVvk5M4uyJQJ08DbMBTWMGQT2G0geohqQVgOd9Q1sQCZYxicS3FjzCvh8
-OA5Mhnzipk3wD6Cqe+TOhz2Q3eRWrRYJnD8o3G0oxwkwWKPWSDQhIzCZtyYp8f9v
-2NeAB4kEHAQQAQgABgUCSv4b1wAKCRCKr4jW2E5BrsSWH/9oDkhCGlWC+d6crrXK
-cM9KpjdCHeoanuuouISDjXoYGivNVocFeBtGEjihBP6dlL4BUukxmmIsG6RnYlzb
-xIXTyvJ3AZqsLnG+NIPEpMev/4x8JziEvbk0XQG9R5gksyJCoR1V7B7wXd+PLszn
-Gl6pFXCp6IzXlRRWUPfqWhY9JCi1WXbU++jHX+VlYelJFU00bzMJKqB40fS2HICm
-3DxZjuyLJrF00BZNslhzNRqdqAPrHbzQwdQfCAi2QWFYiU6Xe8V4YtcYC/H+d9lz
-VePWbdvhkrNX4LA2WNYZ0vFeaENL4N2q+kkc7bnk9iTes4rnjZxPQeENuM4YK3fO
-Ra0GAsAuXsNtmkRoc0Q/5FxsbXtibwX7alj7a/CFXpNrQqf4IT1bQBfhOv61dbe6
-Ior1IMpqibvTdyDlNxqy/3mw6rsKFhCvu6YcY6i4W/+sNBdpN8ndtDlQ6MMoE7UL
-Swjtg3WtdLrFkdUBuJ8mwXwqsggJR3vu4ayVqRP05VNlG0+DECIafsrpBuolNZ6j
-s6Nn1g1gCayunFiFjIpL4Tu4c8Ba5n6jtKHWGwGBbD1oCP9rrQdlIHnp4Q2aj5Td
-5K3QA4tGeeE+s2H7WQSrwKFYezFF87eC5P1rwcqDeyMx913ncDEhUGb2H7NS2XIK
-8Qn7djV8xQe/l74DQjdkQYB88IXdFEbSszROtv/hcc/mIjWXYBWdQKcraJ+vZEoE
-hRJYDwii5xUVWz7vVUKuOEIv32il/CXITLZNn676/GxctBIAwcLQsNeVwPvan34Z
-I0HaCX/Bn8saaNw+7o0tZfzahiq8C+QV2GAeVyB+W95Smrj82DimNGqpdBth8wKd
-9ALr2PkoWdIVOkZGfCSlB/1dX3xGyZ1DYhwgpHlzXH+ZLSIt2z5HiKlX3lhKGxGD
-bce4yEMRkvkx9LdVieB6SNWTSkfQafFBbvBeOCdHOa9I3/s+WnWxBqTHGAEUxEzF
-SIKlmC5AhhuuthgSbStGU+2O2P3ONZoCPlNrRYom6/v3Bzxa9UBQ6d6qnui2aBGM
-HCEiGe2q0vcKQUXm9L8vzCf9iuzsz45KzBzNUtW6xHW0Ky1LjDtT2oH2LiEUKW35
-/iHAkdv5Yyn2skukMjqymLf0tfAsHNIiLqtAhZIVrNOACb7IvTUbiOcjAyDXiCAW
-VQX42ld5j8etsHJXck0AzF+/dKIHlVildIkemoCD67wcLo/7GCZZgtRMrTVXFNsy
-rW3Tw3zopcmN4Sm+rInyAAsRXuwtF2NbxQnn4m+u6dhsFVCblkSqkA+VGsz+T4kR
-hsEsaRUrjInTU9DxKGC6hF7/TesmD9A7Rxulr2oHtoBfKfq9cXX0EnYBK0+lSAUe
-WaSktB1ZZWdvciBLb3psb3YgPHllZ29yQGRpbm9tLnJ1PohgBBMRAgAgAhsDBgsJ
-CAcDAgQVAggDBBYCAwECHgECF4AFAlCzcM8ACgkQaTQKAvW7Us1/igCfRzTQRiqs
-5fpVO1jFXvQpzT9pmi0AnRlrGgPoOIdqM5EKPXkyzkWSzcgIiEYEEBECAAYFAkc7
-x+4ACgkQW5aAEOBPmonL8wCfS5rtAC749vL6FpC+YUBfLJIQeJgAoIYMe7gjxF3i
-+zmJJdhnC4bSf20biEYEEBECAAYFAkc9B40ACgkQAL5mtIeAIm6QrACfYUNdfqrs
-63mko5/lIlriZyyUgEEAoITeW+CQ0anB1wPDZu4MfH+AOSTriEYEEBECAAYFAkc9
-FfAACgkQLNaoAyBG0PW7pwCdGao21jiEoKBoEYup9X8HayPo9w4AoIpFQuabehJx
-aeySgrig5TCglgsDiEYEEBECAAYFAkc9KOgACgkQEYjo3Dq4WYsKqQCggoh1CiIT
-Zw14pFY/5GFkgGxJd6MAnA9KmCnJi5MUo1OSzEGlVkSyr0rIiEYEEBECAAYFAkc/
-YXMACgkQOTX6Lm/QXknhFACfdtlRhfz92Z696fqwCiq43966eKkAnR5qnQLxRETQ
-LaEzjoQvlV5WPcLeiEYEEBECAAYFAkdAhKYACgkQ1t3wMetR+7q/aQCfd8Js41Xt
-YOMSsiDMSbRGeejhawEAnjwMLdiIhV3z88/iEYg0NPtIwb4xiHEEEBECADEFAkc8
-0KUqHEhlbm5pbmcgU2NobWllZGVoYXVzZW4gPGhwc0BpbnRlcm1ldGEuZGU+AAoJ
-EDKGTkGchSIrDW8AnRLF3gNu6Qpyz00Wacoth6fcwANXAJ9Jky/UF/VKNqaa2hE6
-wsN13rfbCIkBHAQQAQIABgUCRzy63wAKCRAZZYVQwxEGEf13CACgbMOUvzMV0LWr
-9L8dL5+TJrWzukGzn1u0QkiS1pivR9xE0+cQPdSawZ9FkSoYXGm7fLs2z8BNP4Q7
-vT3ZsTpunyEnzY9GRu9850RstY6sN8VorAyWhiyJu9JUe9zEdL5DGbCm2udAajV2
-Asg0hR211CkAf9mkw46YN4KvS+P/oAUseU5bO0u9NrnKHp0WTGfntMhzgl2TMhEi
-ijZWWGOOMnzdyFaPve2vuIB3p0mQmdS6eG1O2lf+fVnwhI1tnZi3FMhr6TV17fb1
-r7ya9kdWOpL5s/Uj7E57+dUjixorCX41QDi31cPMLNGisy3eGqFJKS4yySMYSDU6
-afpC2cNaiEYEEBECAAYFAkdAlG4ACgkQN/aP9QFa/IpoEgCg0wCejp7xt8XTqmUd
-uqTAgR8mOo0AnR/bKM0/tEoBALIJkkdm3GYijGDciEYEEBECAAYFAkdDG3AACgkQ
-7U7vsGnO6xs/cACgnAi8cqIhJtE00J4g9srhXDFUVJQAnjC/kDy2g36oLOtwzzEO
-FjTCDjwSiEYEEBECAAYFAkdWq3MACgkQEy5J1OQe3H6SZQCdHoUxaiAD9VxJtZ1j
-9Y34L/8+Wm8An1046xZYFH3N7rVYY9zaL5PRjf3diEYEEBECAAYFAkdnnIcACgkQ
-QMKrHBzhftwYbgCfbQPf3QIxDwiYjo+QgQid929TDlgAn3P54V1Xgg93mt7TvVzu
-YHY6G9ZZiEYEEBECAAYFAkgIpV8ACgkQoWBj7LjOMG4bdwCeJp6pEj/RQqchTKMG
-d8YIPYbGvYIAn26PiUKXScFxB4D0BlyQ9LG2rYcriEYEEBECAAYFAkgToIAACgkQ
-D0UKJmIQv8BTHgCeK7P55Hu/64pwXyirPRs06lGh6UQAoMF3ulXYzJ/PNqFGSHm7
-YTz8q58uiEYEEBECAAYFAkgToIAACgkQD0UKJmIQv8BXPwCcDLNCzMocXBb63gGA
-q81RiUuVuUcAoLRoqK7+ofE8wHExNGdV56tlsgkqiEYEEBECAAYFAkr8hrYACgkQ
-yceSTlEEfWbEQgCfdmT1g9iwAP71zMvCl8JV0ZHP55AAnj99S2pvBgAF9Iay0Ac7
-1k422flWiEYEExECAAYFAkdBPccACgkQ7bEFiW+VIth9NwCbBUIhpl1FQue+LThR
-KyZfr8LjL0wAoLTW6rcst1NQit4HapOqvjypxaqJiGYEExECACYFAkah6OYCGwMF
-CQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBpNAoC9btSzYtHAJ45cKwY
-tOEtQLDggb5bfNMu1gB8OACfUAofp3+GRcPD7GMJIBfbdzM+7pKIqQQQEQIAaQUC
-R0OUKCAcU2FuZGVyIFRlbW1lIDxzYW5kZXJAdGVtbWUubmV0PiIcU2FuZGVyIFRl
-bW1lIDxzY3RlbW1lQGFwYWNoZS5vcmc+HhxTYW5kZXIgVGVtbWUgPHNhbmRlckBt
-YWMuY29tPgAKCRCyvrxAFSkkrxYIAKDaf5GaUJYjxcPWB05v5BvopEt70QCg+roX
-Y8nhcOaLYWSW7SlrA1ix8ymJAhwEEAEIAAYFAkrzYnIACgkQhY/ExPQ4VqOMUw/9
-EG0BVSF44bFzG5PEFSVThr8ZtGCnuUNirRBHgrB6SVL0bRrlB/sk55kYKe9bCgmG
-tjcj5/F1nmboZ8ZGISM8Kzl6Yxghsnk8xH6SEhMFtRutKlxtWac8txgVuiWpJpC2
-87i5/SlCFaGxS9U273pqNurlXMTYPzNsYvBLKuNds86Woe5mN51WnfrOSJcHJOpz
-74FIkyT28I10yxpa5iAFSanTbup4SyNQlFUdAw4tkKl40Lz8ijzAnWYeaZHgBTnI
-nEynYgBU7abXws4j03MB4m7ZbpbPOqjZhmXRtUXNDuykFlnQV3o0jsOzT45OuCh4
-GOjI/s4GW7ot1rb9+mSB8bwqsAgw0tGdyrcRmXqgThKoDjR3h3YRED2QHUHfT66p
-pHj8cPN26FlJSUlCiLaUfo8a94SUOP3Xqy2EyB7337AL+51JG699M0zpTMX2Ym4m
-1dp0XdbhST8xGLTN+Acy1LThUx7dP0MlWoy2DIbQjANQx2sc6FvyipL0xax5qE/n
-TDUiYeQdfIn+kVtEERUwhiS9/M582h4Zsvde/Cb363ggMoF8sUdD4LSVBjKjRpu2
-zHpuuVCp4hfGAhhfB3FhzRSWRgx7eYAVHGJh9Hba60LlyB+MJ7blsQeXnsEuElBH
-agvrH9VyhPLIzDapOrJu9VGhORBV+sdrNCAx1LpIgzaJAhwEEAEKAAYFAkr7N4sA
-CgkQNZU5XrPY4bprYw//bf8ZeGLXZBCCxyeQxC7u8CT0BrOOWmHTtxJoH/MHk4tj
-Dr5QS9d7UstAcXZ1WKh+K9f/9G8xBYdLPXOOWwLHvsr5UoG8HSccyGjti2XUz/8+
-dU0XfgjfyVEE0+/3qMtilIH8wI/GO+oJoWt4v8pQpRDGLrXFVOUrdYx3JT9UQxRK
-sFye5uHzM4C7yjOPEohz2bIxRNZfshyq0QTbCw4StFhziWDQgsKkuCZWJlbAg9pG
-YXwiPaZKR7tuNhdavVtJMYqru8cl7tc7G9TAVEggM2gGFtdwTTIBLa8wKQzlfVgf
-RHEaDfW9nuRZl2ci39P4ld5z69vN63V5qB76dR+w47G6w8+owuLqeL4RzMl/zI3Z
-LCTTjDG6sksxMgQzYiojO8JKvK1IrHyNKJP9n+aEP3g/mMX8X+gRfpprfpjNKzd6
-ILfYqYm3q9h3rLBX9r49c0Ovdh4hjb8nr6BLYAmTqeb8uO2ZowpRafzYo4Ql+SDJ
-VaXI3CRqKDTQ/zfbJtj7XvMcwwRa1j+PwsmpMUVLNEY6IXe7inXTxM5UuzIxtBq2
-kEjDgrcZLW/UY+vIN8+cVBdpThqQDaJOvs/RWDRKR9BVZkm1Zwtnhe9MouzQNFaw
-Tb99vcdiPPwJbB17YK/ZXNnCgOAd9/I4tG8BCBmqE1iphKAOOgOSN3gBe84mC6+J
-AhwEEAEKAAYFAkslNXEACgkQMXxt+Dx3Bc/kWxAAgb/nsHB5FtsJeVbBTdf9ggsb
-d5nj4kzUfsesRlfEVluelP4/y6SWOoWZd27jmXLI+7oy7IFZzbM81Xy5E39mWWHu
-mVd5k3h/BtHnh3kBoFpdCKJGTGaLTAG12oSd+FUb3BWWPg6cn1L7ZBcYe9aqucge
-Y3fXqH4JUsOPP+v96MnjSVDinjirVJmXRPB2Uh0rMYSpq8YFT1VKagx1maiabi6X
-4pv5hWN1+YvOtsbAhwd/CGJUo8sgM3B00GhaS+39WeWXkAMXX0maxEqC8wRYIhOV
-/8yEwQ4T7MqhTa1SHqoAD4uJjOpfAtChxv7HJNIuXiI/yW5uUOUrxabV7VUM9WYB
-cxthJOkqdG1Bu9bDihacJDY8QRugfp5O+eBLKngbTZ/b8UNJ2PmvjinvYT2Eu9rO
-wEtm/Y4EtYffa8JyBlwdPc1TDKZUZ9iYCYtcOKJZxkxYpasl0dz29KWbR9RCyiZ6
-XLXcDfcqAIFxCH099t5vtTYIpPRJAY0qcP/NTIgZFXwcwCXndexZVAY3EfxcZijF
-VSlZklgx0lcxnCRTyQRw5uMLMA0Tzn32VgwelT5GsYtoO+tgJFjClF4XD1uvTl71
-bI13adZCqDGjtoQTYFWgpP1c4qwMG8LfpfMReGwgBgkLJ/yYYVkzXK5T/aRPV5ec
-N07rylZZYSUNlgUw9zKJAn4EEAECAGgFAksM3mggHFNhbmRlciBUZW1tZSA8c2Fu
-ZGVyQHRlbW1lLm5ldD4iHFNhbmRlciBUZW1tZSA8c2N0ZW1tZUBhcGFjaGUub3Jn
-Ph0cU2FuZGVyIFRlbW1lIDxzYW5kZXJAbWUuY29tPgAKCRCbuGOw9Ru4isn4D/9d
-gKLjchI/6StVec4Vtc7rWNOWgiKVh6DWcwy1JnAAm0/qRoF5lWUN4WJgkVQ6Jl8k
-jLhSWXd4wjb0RWyLjo+itzf+jqWky84Vyz7NKmpyajEQ+ZC1uZHItlrALrGYI874
-ezjUx6o+ESrXozisxmfsp6NS7XpSOznhbVSzQfsJcYcjwhzv/2Y9kHuMcP6IKKtg
-4H8J5mnjG5tH2slhSf8iF1GUyYrn1U6HXTDDDsJJIxxbT/sVpnXrQPWNL38B3mkZ
-PsjxXwp1RUO1c14R/GWWgK7Ga37eUMUvcR7TaaHLrnqpPFXoHfb+phh6D45TTM/0
-goPVJUhPNHHqtqHNf+9VUUiZrxiWQKO+xVmVNkon/HPVy4cl4oTvavUdWiLrLCwI
-i3FWPCskPhBAl008YiOH3uAPCSs4EKRiJOJrbE3IfVZyGmPrgqH58FGhEbFx2gXZ
-mHI5TMYx22a3PLs7CtyQ+1Yl5nmeczfYTMAhqS6BCrutKZcFL4nT8T8qui56Ow5b
-MwxCseNVLWR66jAXr48m1bJmDMfR9uLxJnZib/Jpu/nNVvk5M4uyJQJ08DbMBTWM
-GQT2G0geohqQVgOd9Q1sQCZYxicS3FjzCvh8OA5Mhnzipk3wD6Cqe+TOhz2Q3eRW
-rRYJnD8o3G0oxwkwWKPWSDQhIzCZtyYp8f9v2NeAB4kEHAQQAQgABgUCSv4b1wAK
-CRCKr4jW2E5BrmKCH/4q0o88i+g59u+Fj6dg83l8PBdRqTepFhQveT9XxINcWpTb
-bQB7R0GdrdJukuyehz4yU/pPSRizzHBWGneDLEx2dMVzDOCGyfacpwT0FB+Je9Xj
-E+hfyytvwWF+Gz7hrQ1Rkr4d1RGoLOnBJb+EIsty88XjCO7rBpE344DQEDIb4dIo
-0+EGf3131JXyIJLSKuVD58X6vFiF6bfr4KXAfL2z5vzm/UMhBf9jKHgKgqbNrqYG
-O4Natw2hTRRovHKI/7AxRvXE8JoqQK0kldrxTlp1ht6hg/DrIwznc6FHIh/yzEo5
-4ulm19PNLwfwVnfB2mT+TcPDX6/ISNaPQIzXRY29G/oGzm0X3Y9R5u3LF1kf0nte
-OOeMnlEx7zJvBT1lIRLKJBs1lUMwgMhCUGYLbEgxd6xj0Coo+Qizko5xzHewpjeB
-Hh7Swrq2Nw6wkP4RIfiRVILtSlZ79x7JF9x3ioBcdBalY5H91sRD6PUtu1N86FjK
-7ZbkB/fW+5rUnM5ZrUXaRByCMUunYMTM6e0jNkaub3DLg80mYN/2uSbIVLrqclpv
-fDoUvwO5ePUsevg/FANtNjr6tO85PXl1XfastF9FlLe8niOIzQ6unPvCecuONPN7
-lvUv7ZdvloUzAxBNeDBSVCbFiAmZVq8+2z5/gO6AWD6Mor53IT9W1T4gOpu0n4U7
-8Ih/Op/HP42ctjhw80505VjiMesIVolrRF201aqrnQdp5nxaUNhWN6LtMUoanPbZ
-0YPBHO3wpmI1eV3JME0szThMpvTQtsVQ6je8g9JtICrk2Tr7QDc9CvZojTpWQfXz
-+c2K4nudmAsytWg1RSUOzrL/EJiyeh8JzuPMMnHSRX5jjR0zBvuy12RuWjXZmllb
-hqzCyRYAn+R+v7noF0teKc/72yJtMNX5qVlmHd5TtfWBUdiEdxKR5avuJEvesaIp
-L7h4AC9THnVY8NVp/QAvCbK5llHes86e/hDVSIuWyAVHFpfeU0zRT7IqZFlbFFo3
-+gSh6zQZ7ZyoYF1bndQtRDEapmpOIvjfaDjJJVyiH0HuCKuzMOpeXlcNLP2A/uUO
-AETMyQzkaR02JwraPPbwpLz/5sR32+wztGBr0WBHy8DfZnQ1Kr8s5DcvIrcMmBXZ
-94f59sTZIIHGUiA3+aKL/gtS3tV7GrbAbLq9BmaXC0wJ3SBaGYMlvC+7151Vp7YD
-5t+JNyzjrAzIOd+LhFd3Qj0lOdSXyWR++vradOBAfjWbnUqgbA2QFYp+ftqeiVT/
-Zd7+C/Y8ZU4h3CYs5DZOML+Jz7K4uKmFjZ+M6MAvSqHrnv7SomHLQraP2asnG3lE
-MQ3J1n2MFYmzbGi36SADsU+Xxqbld5EX5yLD6WHvuQQNBEZ2qJYQEAColB8p5fyU
-wbsCLeaX6uSDxG2ShSXxtsKlb77PfNYz//9V0zyrybOLRfZ5DEiFcdyuFUAp8swX
-Qm0+62bWws6dpcs1dYkOxYt9JIchxIyLuK3z5Qobsm9F0eBdBoVch73bzmVHF5lG
-h0u/9YegTqakSor8jkr0Je65tqxBL/jTBGSTT7T+7OSnMqoT9AP9XDiELqqBhuwK
-2W/BLxLIhmhmpD6E1qIwUNzogADMrvLi6N8ol+6M/8OQYp5ZQpimlkl8i2tATD52
-bpy/37RR4hhTNKTpU4J/MeEEggsmmpQdfW1Gl/8u0QoW3p6kpSEwDaPbwjwhMjVD
-8FOCSfc4GI9vFq307QosudNVmoElZ0OluKiv+oHfYM7FdAKpwOA1K4By2nP8Sd49
-lzRtCyghN1nNErsxuMncZ7cDX+YT4qfhfd998GO+teZQ98iM8tLpCozsh2JifA6H
-USWCi2L6iiq6+Pz5z/D4l/eA+PES9cirUX3bpZ0rMcOxTdqYcizlYgjOYT9gUJow
-EXwrN79by2teQTqgkdmXFEyglm9KWX09JR7F6sEq8UzbHpBJaxA3PUx+sP2qFu3A
-CsltcnvY/KSUImE/YLYxR0wFspftC6UeqqRgByTZUxHHS/uO/DV5Oxu8aaNtxURE
-bxuDJozgHbYd6B4dXCtOzUM1/onjDtFObwADBQ/7BUDDXIh8RRFDguozqFR29VAl
-ncXNp1fWW48jPa7baj/FJayKt4J3CkgjYoQ/ddo6qccRzpTs/ws0vGPNDGFa5GQN
-5/0GqWmd46e9vJ/HJQLuc49HQ0ooMGkg0uKMu3BKNo4PJ4mUwKD8uQEh4pXicblJ
-pEOYAeUPQhiNkrdFhHrwXMFiMiasmYVeIGZZ2NENfJ1sq8f/0DMryMHpjs5kav6U
-CC3I1lkMOxFdvWPe6UoAOZy0PESdyqXOn39j+BFRreRDQhLWO7QECaDH6zj/0f4z
-y/yaCBPcdm5ynisi91JV8wNmxAMq9cj16h3YXRlDMvWDBAqv0b7M1ev43aOmdSwf
-pxBolLEv+WxNigV768g/m/7RijVH9kjai5zI892M3DcEngLbaVGGBOMTLFtQn3aJ
-AjIie6fUVT+fILbzX6j7AquadatTZHHTzT3GnlU+TYgxdTrvcHJQiB3sTxBVeJ21
-hzd2kqiBuUjkB59NYx30zbKx60wAK6ZLnKPSDrVa844s+LXKj5elnEQOFj5BV1Y1
-0Fg8bam2Lcx4EDyk2k3QzuuMqsFfNgJGIc5HiWww5jHw4eiNtxOowWNY0D8ZxnH/
-uiI/7++rWqwb0RNGauvteHtB1LWcWU16QWKefX2ft65pXzVXr2QGWeVHUUd8wEL+
-r9PuSL9rSjXlKBfuis2ISQQYEQIACQIbDAUCULNzJAAKCRBpNAoC9btSzY9XAKCA
-0b+mUJ4D7fOjxuCCKhZXFLLfqACgh2XP1ylDq9w/Bdn0/KSV7Nkqq0E=
-=x7FB
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   4096R/3C7705CF 2009-11-05
-uid                  David Fisher <dave2wave@comcast.net>
-uid                  David Fisher <dfisher@jmlafferty.com>
-uid                  David Fisher <wave@apache.org>
-sub   4096R/CB372680 2009-11-05
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG/MacGPG2 v2.0.12 (Darwin)
-
-mQINBErzNZ0BEADBZhY4T2tcnILY+OaZMfy5AOPx+c81qyhe/fN1ym0kgCD/iCQ2
-ORLE12YY2JWFR16Q9THmQzBX+oqBpDRMlXpGm6X5DuZ21ZCQ2A06QwhpMA9zILpo
-z2m4QQ/boiOWgj1ztUFjwd1c+VMvqSF9OLP3rrDiOTaKElLwDWV5DhW2nhronjnO
-84EbM/5JB3TeFOhLcoMPMMeUZipSiJdMowAqGIha/q5xW1DrE9u8d7gZ9QzjndEP
-EutUszt53NaG0L3mi0CQK+bu6ddWwiUCXBijRLq2TA8rlJptDgTHIQZF2Zbo9001
-ZD+1EvRrRyc9lghnJBmluAT/cyM/2HQUejHkR7hhIon3wp82OgM6sleSIyBLdt7h
-tnFR0N+vSUacMnr62m7skZ/MjyW838Otel7IgJpq3eNCm+m+eegRMQDLe28lk/8/
-8flIaQl1LexcSAr3jSRYD67+RdmN9UsE/y+OcOgTclJTBRFV1/ptBXuZeC8HgJJ4
-BuluwmZ7S3jP5wqvqm3cOIhlbkJic3Os6weAcYGLpruDLUhPn2hZfPiOX7B0Y9aC
-3X/0EiFGXR+GLx6xgAx0xV17S5SSk/lfsT2e5lAt0/jxd0b3x8E2/MRB9pD2nFx/
-pSpfPkivRkDpo7ioqZdGZa0YNVk6i67jFaehnpq/+PBzdetmJwcHHcr+AwARAQAB
-tCVEYXZpZCBGaXNoZXIgPGRmaXNoZXJAam1sYWZmZXJ0eS5jb20+iQI3BBMBCgAh
-BQJK8zaGAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEDF8bfg8dwXPWEwP
-/19bXw6m5QzXjS74vdRcYQ2lB3zH+r8zdPSA4P0Kr/Mou9PeXAWzNP7IQvi8nU1N
-zIEyQgErj26ARsaNdk9FTevr4e/vU/JsbEit48YKSOIrAxINCohAJ9lwUC4FqqLS
-ShvZycXyRpyDDlhbENQg2MFLvZhau33iEVCtPJm6yyGJ8IZnQBb17gI8SkPKHT7b
-Syvp6NVxFP+/ML1mvdJA+B307X0x8ZeXGWMphT3zPkPsoFZDU+zvMwPJA63295qQ
-oxiUvgJuOQGUhdtdyjPflremYrD2nIx9tHUi5vDSydOIO9O+fsodwWYaNXNaXQUq
-XzwkhZhE2ihbzyqA92hNAGy5N25xB6jXmMOwVnei8BdtsRZQIyCqZ9BBqluabnCZ
-I7559eKjJtHDrgzMZXZdcu8xjqECslYeFB3wAFH7t2I29X0D8l/fxMGIl1d45w+7
-nJIiz0uCb1H6X5C1ZhWMwWgDCPN2Ij8aGBoY92DgB4LVQeUd7mQquExP3a122BAa
-xX5gyKLErO++2VdNrX2XXLi6d0DZoaDZKE8qUdtIcxpGIypvnhaqLcb/PadjWN7r
-vvyAXVmNH0JviRRyIzc1HJAcKv2m+2BTz4w7MixpZMjdJWbd+jrEdornnqZkrUwQ
-UCVc30XcenaU2DGA7LDX38YAvQ8deha9F+eiCDZLDcl3iQQcBBABCAAGBQJK8zjw
-AAoJEIqviNbYTkGuN1If+wT97beyUm5emTdpGt3Ae21wVwA/bXvi0YSDRkKM+Sbz
-NspqLQZ9JM9WZb8+hQv2blIJ2v7+P7FwB8cXwWbrDWA8ESBKw0PYSxTkaibuiN7D
-8Ys+qNkcWRvCgJBrSkUU9b8t6dqKCDdZjwQxzfjn/Xu7927rJC9O0rpCmMRT78m5
-kLH9ae7OSE6vzILGz1u6jzfw86e8TJHVxMO66XVlZyEcytCBdc11dVlWEFZEDN2T
-QSZG1QQlckBKwEKaYSvGYNoQEOPeZADLxSDdi/LuuY2Ag7SHfWkOVZvhURt8iNKD
-o4OsKEfVHRxZaMqMFZaX7Jf9b4ACyz6245CdISGFs/xAlst+c9T91DDL7gAUZjpr
-Zy9ZMWIECZs+ti9NEskOZmcZWMscCGg7oZkzGCYECPRxttatAZsBQLg6e0kMIQ8s
-5sBH7YxlW/TgYDphNmsem2hQkbGeI61BiSjWsVycXNOSZdguWISs7fTzZAA1VhTx
-a5yz3TNzxKapykA1i21YZJuSstKzHmW2T3jLTDDG6/O7Zt/yWtZNSV6FfpbYVXC3
-B6GyCQEbLugVMDoRpF+BmbeUVui/KoNaiBgmkNWFVXajQr+36D3friy9jRLWKlX7
-OcKl3uro/fubya07jfwQWMb0ZNBorsOIDsPttLLbRcufNq6uqnmBZMrZ/LhRZ7Xc
-sh4DfnYOefWpW9Moc7tKU+RfIzudpUxZnk4oHGWggXwHp75s1rRoI2EyAakiQYz+
-Z6pfKvlXYlGqX3b07+L9MxqFUcChCID6WOenYt2Uqq7dtn1CvybFAgE/ANZE1O7w
-ruiJd5RATgY/FfA9NXvKAim1DlUL0FitIo1KiuZyePXjXvvFuK4TTQupRqmKmXxe
-c0iiora7Dbn59EQvJ1yHrG6qYZQJiHbv8bXNdGPA+q4Kz3ggDEKovdhW8jL1utdo
-URptx/TDmui5CF8sIUxPsOJvhDF0BwSA4Mv5IlTj3vZboHeEORANY6JCdIMZkWDT
-GneIdApO08bmfMaakZ2BdUcjWqzlUuiFQUdk92eHwCMVqgR/7yFZKXCpR2eXv9FR
-KjoIDNFaahu9EjgXKXz/LamLE2YjuLqdz3At/eQiZLCMyow4DJu4XLveRxqw5MmF
-dYEleXk+hfAnEcoAaaU9XaFbQezR9xg3wQgTas2O3WDSAhOYSWC7rQ9V75hujWN+
-Dn5RW5S7PWYfn0oM+TAOBO+W3EZSoqep5EiptX7PcjLd8FpAgn+hoy/urQbLoslH
-VjdrXZNzJXEIRDPPPp6s5bMCMO76l1E0nJlabVLHzkbC052fDg0M7MP9iBK3tidi
-hd/w+Nj/GOMi6gkRXuthzv8OZQOIsXdf1XZ2w/NBEEO0HkRhdmlkIEZpc2hlciA8
-d2F2ZUBhcGFjaGUub3JnPokCNwQTAQoAIQUCSvM1nQIbAwULCQgHAwUVCgkICwUW
-AgMBAAIeAQIXgAAKCRAxfG34PHcFz7mgEACo73C7eGcOpo5dcqacym+Bb/yGOiF8
-cT1pgxeSCw5s21jkhrScqCwRko+j6T40zQa7m8j+BZ2LSawHa+fw8GeUtgReWcyK
-B+x5J4iGHBpIMxcDRCCNDlAhg+WhLFCfCEQOrInU0KR1CdUQCfw7q6aycDooCg4j
-44z7FuirPzam+lOPicvGozFFaJZaUYO2xtgZu14r2bnd7cbq/mv8TeHMTCSX5O0O
-ohehkze6CP8jVP0h1N7zADuOqgj+EXh2Wp13CxYbc31jpsCBMA8XIgF3uN6zL8BM
-POaqs2dLOWaJsKFq22AOy1PuWhPMZ35fIBydhs3H3m3lEvI+oLcYheqI6QgChIzS
-+NKeOX6VelbWjbFI5kBrJuoRVk/Sf2CZJY8qq9dCAOcSfmxUvr+1udH9cn4JuwjE
-XrtVTNdI/mtRdAnQ60fhPUgw09z292oeNcgYnmwBJdNIi+Dj/lDX8i+4eaP+gA7w
-3wBbSKwgb2VBQ8Gwpb9QsoWUYQxrpi2Z2XwIkDQeIA91j8sLsj6/RZlPsYgM306k
-adkO0t46aq7Vh1hUdgQQI2cEMhn4dN+Nc6J60AbquSVMq5PngP5uxrLbfCwcIC47
-zfTVN8K2XfzzpPC3dCWiMp6mdV1M7w7s7IBxH9r742kBX9NyjrB7eEkIUz5HGt4n
-0UD5ZIzRonkRiYkEHAQQAQgABgUCSvM48AAKCRCKr4jW2E5BrhT0H/9w8sW1WLpB
-jR0MKbY4zeHP5pATxXog0GtANzV4UWaVA5N8jE1f3GTJzpXfc1mSckKSFXtu7ldS
-bud66asoZAwOFr1x9gnynGpSlP5jNqIa7VVEvI3XUH16qPWM0a9lDCUSTPV0pN4L
-89eThd8HVVs1ff+HEbpn+SQSch9b/bwGfgfZrzs/uX6FYfkEzkiiFge7jkrhKJpg
-Cs5ZzgtYT1BmvXcJWeSJUpu/+wOjNEArWPxtvULBcMi2Miaq3Uw3r+TgpC5xFEhS
-s03BczA1E4D0HfESk0z+TOLQHyxhOSscjxnzIBjgGCTpqZ6v+bsZID03bIuI7PJY
-C2+EwHjokY46WJm9/DHOZ2nb5f7vWjr2NDHhC+Qfl8/3B+1YBxTmv0dsOaI+OZRY
-v1te4QKc0ebWc9yWMuX4BkI0gitxd6VNWVTaXU89p8hSUEEKYzkXZ3VKxBfmr3Sg
-c84kQEAtpzmvFuCdFky7SB8Ju859wfUvuP+IkYBmY2bJdDuDryO391xebduGeib7
-YCe4Q+yei6fWWHRDh/PWZ0+WazRmfirvaiD+RU5rFUrXzpiVz2Ir9E6azkFAaISi
-DxGOKBge+0CTFK8wxyMMytZLLdGAntw7yHbyd0ziWzbdIoWwclCsOeW+eqFtN/fk
-LcIjLS+e9Pm2RJUsCKv/0Cwf7F7GH93nDUhKTN19j3gq7BfDnHV1pPh4gJKPa14Z
-f1dwSpZj4gN53derP4JKZLmUkFA2kEVmjQhWsTZ+5uup6I8o+x6tmhEdlhk+2IVL
-rNUdLnHmeFZzzNogvMK0rcaIdEYCAXES0bu+tY/ib01bvqgQyzMk5Go0HKtFwpNt
-mQ2mrrGUqe/QAhWVVfE+JJxPcC57HiwuaREN53/vccndHi8CfsB6tqlfjsCImvIC
-0aaE7ThXLJTiBrvoidgpc23sCeC1KjQj1qFyzEmsfAmtyTsxei7mprfY754o6c0l
-PXs59ZfiJ/jOzEzP8abNmq9JYQ4P7f/vwKAtbvxS4Zodi4OW/ZatUXzOUm8hWHml
-Yo+sOr5F9Bfrqp+tTqRxMGgh6C9vwTW2bqI6RnQ6KaDMxkknyPODZ/oZRc2awswC
-DKkHt0fpfijN+s9w+ppGPebGtol69RW88rT1XcKh7uDigZuMaaoXohnMrIB1lHp8
-1/RMog+6whzWN4rZLn9Jbj7rulX0eS9S/xW/3Ug3OLafdVaNpQIbgm43/qDPgC9v
-2n+Vt3BLtMzxw/KEWiIi1bew84sh/5RSJXI3lapZfVz2uUIRnuuDrr3sYJvmw16o
-wq9Og5mnZNPzyOwvbgj5v0eZhmQFC4493FF7B/FRMi2u8adZN3PxqIuaPjQO3bJv
-kfwh4c6oX/ustCREYXZpZCBGaXNoZXIgPGRhdmUyd2F2ZUBjb21jYXN0Lm5ldD6J
-AjcEEwEKACEFAkrzNsECGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQMXxt
-+Dx3Bc+IPA/+K4Wu2chy+544orDFxfb50Yej8u3fCGHG/Di3fltpxWpN/QRbBwzH
-wkRhhp5yH7p3cVMeJnhWPfP5ZROOU8TYdCF2M9vApF8cNoOCeLt941O7dj0rE9gI
-hqDOVEXZ0rfG/AM7s3MHNFoTMWoeBJdneH8W06NOkP89ABwf/Rf41khpgsDBw+9s
-3v0/CW1c1ZdY5WKbjIoUBFq4V1JQfwyTArdMsOsGwONmIYGLcA6h1FEi93bCpRnD
-crDG2aFN9OHguHWMUb7ru4bpKERjUzpLhX8fPE9xEXjIegM9c2t9dkTcWgQg7EcK
-kaFjn7FqNah/26b6PnHOAQi9TdLPlrPVxoTpCrS2bGAtL6AtsSTqEtc5eDHA+gHo
-Mdtut9Yw8FW0rVyDllXM1EyWNGBfPCpFFNDCW2QTrmS0dXTN+S7N5ZsZI5lpqQ2Q
-4DHNyVQt614RPPuC3Z3xtZdu9i5+npHGstXRYc70zVwxOR+oqzeTlmOsq6C8OdIp
-qXHxKjZgYXFcnhdzEolzwWQUAVPw7pCXQ0zAnpY84XTJ0/QYLuJdji6FNpzUlTmG
-Uf1lIRzC4TKU2HIAZN+YJszG7qjAbVmJVWB3ZvvcfoxDqGiY9oCsJ5H9K7GOhXGU
-HKrHyJQAbLuo0HABWnZ/3t04gUyXjAYEF3RVwimw/TNDAy5IkjUQhVmJBBwEEAEI
-AAYFAkrzOPAACgkQiq+I1thOQa5kiyAAs9bnjt2z0pAW0id16P5XyiJURSRYqeuA
-4ayI2Ohib8/hP+7ukefiMba29VNMAUzjDqdVklBlxyJoDGRg5WYrSc5VQpZbloSo
-IzaGYeuEijRcyOD7f5M3bZuquoYDG3dViPp808w7fc74zIVKAFKsOh3zgv0UKcuJ
-KwycZL7WZY87e454++P4A7s2sfhrWQk/NFsHxDGpIk7vX2KHkcGiNsVj7W0DCdHg
-WZtJfcQqJwOlQEHJqKQ/m7qayFzX7VFNi5UTs0fFfBTx5ydbOfATt1Kqvc1qmHlF
-VGoRFmg7wqa+ERBuwis9LnwckHsejx1pYmywLT3hjoXCtl9EaT/CEiLIatv9Q/op
-23ZJ1nlqY4WEYW7eWA1pgrtaKCbHp5b421ig73oOZcyyfFCMsNN30OSlyXG6tmiz
-XZB2A/U99Ev8+Sgb6yh0CyO2VslZtdMUmsOoJEiKu+H9PyoYLv+1VHFSDn38qNQL
-tQOna+I1CKEBtfopw7niHMlKophmHoVYFHoQ1RYhA4RLR+3tdAFszVM6/sJejW20
-41s0am8Ssddl8lnHbXxldnPNO7XMKQWP+8NIxoGfLcNjBQlkQVm141z9YsQmMG5Q
-Bg3C4R3IhXGZ3R0PmsGqCpWrZCaFdmRzfRbisB8HbSU2RX2W7I2Dx2DAjDs1nzQ3
-RYQlnTMneJhwERBs13zbTvu1stCrUl5AvoPiH1B/t7JQukV1aTj/7+EXoipCAYYj
-BvvJqczVKIuIqH/HW7vZvml+4mefkXwrRqG6fshE1vp1eK99cW0edUjND72ftLnn
-wnu8Hs8ps/G8krDa9yjHEcWTuaZE3SZjoBuFjlD8q8VdSqSwMRXjaYQoVJOE06UL
-tMXfy5AG9mQnZzzeHXP+h/RHGgldyFQ6uzHzfs85rqubk0ZMo7PK6iQbEXmpqkLa
-xpLrc8C+UTt1R9MsLY5SLX/fcvq+AfMIqCE4VYCtmEfQcCm6u2oAhRfzJzXISv7z
-cZbUJuP6CjQlICqEyj1RmUFbg7SkUrW6Kszy+/MZ11pw3yQkfL2su+5Z/UcRDrKS
-n2gXZa4tv7ygiA4JPpZWyhroReWySb6sSPIbq2EpyLhb63ukFPGxTBKSg3sv3w3V
-EYG82Ss054MNf4D9S1MtSjHWL6RTGId0Ln90woj/N504h9oCIUMM0vVlIj/c+TaB
-mTg1at96NTYpC5oCGnI9J/G0DEYPrKipH4alJ+F8CosVdLscMSpRHnjOXMs7Rcpo
-tdxQR8csDzhdPQlfM/JlMp/PVEgGoTv0El8QQWIUp7dGC33i9U6PUUiyDXq9Gm+Z
-0/nH2/tz58JTIscdAEF1VlikrgLT4AuP0vJlWzRKKmR+zpHgCeFon7kCDQRK8zWd
-ARAAn/mG90gdj8EjngWqmBu0/hYfL5kdTkFHeeY3OKReQkaOxhxpdxrDP2kepVkp
-B57QQ3ul2CNu/Zv6hy1MCU0ML0Qh1av/VSWlEbRfPBTgbTwu32WXDnewNloEoTvy
-Oz5ZShhgFyo97ULOeh9HpjVPSqRh6nX8DWlSiVDgpPlOmU3nNBck0UD0AEj/pf57
-ANtvDO0EEB7Bp4CmSbR6YNSaTOm5AvlpR7pBjYmBBbtAn5ovpN868vGWoquOIhMy
-9z9CW5LPDKbn6Ci5mHXGgmlJV7OEQIeqJ6hkh2zsqqxVRzo5Nc6YShcW/pqX80Kx
-5mLOOstIxjx15YUc088roBtnSNnDu8/oynJv9W85HBzBG+P7zuma+WthGN2i2LyV
-VZaA9VUEQcFLtYiv65GSMUIMj5H9HsjOJJ6kw+x19MFWbHVBSSSroZ9iZduhRXTE
-fmnNu1rtYPOrZub9Eh5SOm18h88k/9uPmnj/8kDsPTCouuNLHWl4yFWcV5D5u3Vy
-lQg0A6wXxDazahvQu40B9z52pQXq33m4OZQ18F7Z8l7stw8zRKVakPp1BrngghsC
-iR7HCAkh1FA7IWSGvDD6/YOOgIBfMOQC2DnG9WhTpR0m0XpfQdDwqN9n/lx2tj3Z
-grT1fJ2pK8VUwWNPvjGbtCou3baVZiIUKVE1ciQSucHTst0AEQEAAYkCHwQYAQoA
-CQUCSvM1nQIbDAAKCRAxfG34PHcFz3e2D/47+jDJ8OW4WH+wIzs4c1SKJTrcOcgy
-MlTbOu+FV9iOuxpnTXaVgzRRhBg2JkZxpkg1aDAzJEqf6XIzCEeanNmYzUJ+cCc+
-YItpQvgAmlGH929XBSJ9g1ErS20sTbExDzJQuxtdjoVPa2ocECVsEhAuW7n/JUfZ
-FRuQtx8San37CEze+nySB5uAfFt5AQ7ZxK3W/57xE/DMRLxvyjwVgMPOPpkZ7P3Z
-KphNZ9VjPJjtgZE73fIOJ9D2VZzVlmyCeMASXp46UHIzjLcHSXvpXY/9CcP4wAy4
-fBHcw4liNzf9KP4sX7VhlAxs/7rTMN8uOBTmf3rpnMQ67m3hL//4rrPIUQUreVXq
-iAgH3V0ZkkhgYUdyrv1G1qfrnlMnRB3xIJQLo4fAoy1+fjSV8Rl+pLjB4iB01eLB
-4su8sdC1obzy5wxjwNOKwYAOiAn9BuO3HzB4X4Cou7Lb2mCu7WF9pei5f+rpn69P
-cqdkk1qkXTmmZJU3VFS8+ZPthLIKvhiAJWKoOd7iidNgw9kfzkWKDID34qCz3gZ5
-1u4N0B1/a89+tinnZd6JarDjK2F2yILxeafPHZ4iEhAGpjhJ+krBtmmD9RsPgmPq
-jtjkQxGn9HwWZPKxNPu8wwpL/ewSamc3No3lW8qoauaoc/aH+3SJ9W2Q2go+2ZYg
-ThwM1UqUgNRjNg==
-=nttW
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   1024D/D1F99590 2006-09-08
-uid                  Josh Micich (Software engineer) <josh@gildedtree.com>
-uid                  Josh Micich (POI Contributor) <josh@apache.org>
-uid                  Josh Micich (Australian software engineer) <josh.micich@gmail.com>
-uid                  Josh Micich (Australian software engineer) <josh_micich@yahoo.com>
-sub   2048g/5979F244 2006-09-08
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQGiBEUB+2cRBACXiwHbncLW3UfHBiKXjisziEeDOxEqNAe7JWkuaN6YEsI6MWrc
-iCov5fegHMD51wmSukjty/ic9c0c6bZudaRRarIMQ618vRYrjAIO0RUPawA6nGfw
-x/oLnuRaClgFL56YexkynC7qLZWGlgttbOuNIKkg4y0nDpC7mAw4lYKS/wCg1o7U
-R7MEk3Rkk6cDaSAFpCt/i0sD/Ayf7LG5sj8TkXDm5sQNclNOBkJ2KFXzv1zFZ+mb
-a5769Vd6nu+cj0UjRsYtq1hI0uXWiz+0twJ7XjAmAVNU4KEbmKixQkTwoN5PlDa1
-GXVfbQisCGzfx5vA4VRVGYt6zoCWWzOxxWBD3S+Z4itQrY+jgMvgqa89qhpHo0qw
-CxrtA/42JoEK/zXb5qgbsrg3OebuT2NK2lDBmFRbbuHF73VhLSnTy253/ppsgvCY
-eNBwC9QuoRYOWTQV3q+oI8w/enEKegN6QritBDZXw7aKb+QFt0+OZ292tLGqxkBu
-rppVqYdcUHLiOI6PWZMkMwqwIiODlI36+T8c+yf7gRkseHLZH7QvSm9zaCBNaWNp
-Y2ggKFBPSSBDb250cmlidXRvcikgPGpvc2hAYXBhY2hlLm9yZz6IYAQTEQIAIAUC
-SBYNwAIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEIYLvubR+ZWQaWgAnRSN
-H8v5hqExDJ9pGzAcxu2g2xtPAJ9JlcazJqcWKvlPt2iP5VT4Ht8hookCfgQQAQIA
-aAUCSwzeZyAcU2FuZGVyIFRlbW1lIDxzYW5kZXJAdGVtbWUubmV0PiIcU2FuZGVy
-IFRlbW1lIDxzY3RlbW1lQGFwYWNoZS5vcmc+HRxTYW5kZXIgVGVtbWUgPHNhbmRl
-ckBtZS5jb20+AAoJEJu4Y7D1G7iKnSsQAKhxZFxWXRjGRIrQBL1lxPiMJkE2IsYr
-Z84CvdhzP/SyJTUpjvk4tdruxFtGxgiO7VITFnHR0KMi70ErUxcvIqYBYtOHDabp
-Iic501Ix/Q9MOg0BmPpco2i2m8ZzUXa+KGC6NLht3m5r6bG6qKlfvodzZnbOr7nV
-V6G5tVHaZQGEfOvMgUQf2z2q/5+XkiDDmJiaatfYrrA5H21tSs74GOCEwxHCZVqp
-Y6w61APYWG7t0cMpfcXSJjsn/VCjviXV3DIVkQZU8uf+U6wiJNCMgaVPSm0gIHZM
-qNndzGMYycfzUQp1/wPZxFQLylx39XsNC6HHUdgwtl6OZz0klLtp40tJyBgKz6Q0
-ij28NNuX5fLturfCDk+GB9kT4PNzNixgEW0aHF2pfhfW5KPlOYAn787t80MorXxA
-8nEi8fty66HFaRwwAuNPJjxMMOwgfpZMh3IkoFtCLzX81A4/8ISYftPGvA+ka15T
-h/KpuX2vpUKR1EsKHy/nAaUFRG2aDd0AjkwmC817Oma4urirYme1UchG50A/WKRT
-BEm9YpFxoEvfc0fecy8KT2zkHFH5+mvGPyk6goOqgoqyVjuNhka+sco5yDKyNLDo
-HaIKLyaGMlYFmLTN7fmBSBj4WTWcHtQBPcuQNLuszqu/Ib49+bAdJK0Ac6y7osYF
-veclSVx9rj01iQQcBBABCAAGBQJLFDYfAAoJEIqviNbYTkGuD6If/3Zin5nJwrf6
-EbYJfJiGaLZPBxDaBIriiR0Xa8qy7bsNAoOlLmyhX6SK3i/ZNcr1qvQvArPnul5+
-AtdWTH/eRq2je13qNHQzy006pUkvdQ4t4MhnS1faUUvBlwHTyNYu1uiKcGOGX7Y6
-XfsZIpH7ReMLRc7jasVsOJysNBToXasIpTz8Rg0/vKMfe7RinvsOFgyvk7eoM5LV
-s6D/z1gKTmTrs5t/j0EEYYLbCeAT7eHYGCtjM9SVQG9cVCXybqpQSs/mgUopXGFk
-qhfFvIstvIh8FmXQJ/riWmWt8jh5xSkAH86SM/SmWbJ/8rmiOhTB8xwT74g+CJAl
-8kqSgoWu2QcQ7Dmm5+fRvbbf5Tkk2fcyrBChMO+MWFBvVaaZZRefB38d+ilP5cTE
-xxlmDN7s0EKIaObo5RLtlmX+DG8WUNNty228R4dMuQ6IyXf9GFjujr7o2Hi/kqBH
-8CLH1dFt4fpUe92hMlvv48mqolIu+s0LOEf1u2likatd9x6IDIaR6SJFINTb5tzF
-QR4Hm6/smvsY9u3ArJUEPG46giA0lOB4KUif1zsrRDGTl3AZALlXcUOY9Zxk/LVe
-PIFjrly9VhnXJd9kQRp9QRY+4Ogwe2XGLwVqkgmr0udCUpV7AAKrwSajGbMMNLZW
-+j/7fYwedrxubO4Cd24EaP5qZGfhYJmzIVjbR6z3UpH7k9CUjiCQdbRKHMoFr+Yr
-xBf2sRUwtdhR3/hR5CaVYIWT9/cEGtQI2WUeOLJelPYUPNq1JOrlTXsUvy6Zu+Z5
-onokpqizBJK9QQVSjpuN7TYBlOPeFVd/lJMWgEOqiPDJQLqX0IkOpqQAEWcVINwE
-Ng4cqaCaXmt5398glk8j2waJuJcfzSJUFmZ7E0ItKrKprnw6QoX1OmU5s4nYsqoc
-3d29SEqiGkgwY7TLB3kZGvPF1LGAqe51keSixxY2MrQw/pzlU36wdpVJXe7qpgNn
-bbqv6Tw/SEa2ixWsQFUYpt+U48RPdHpdkpUmPu8yimZOOKZ/ghUmmo5HVtSPQiRm
-Ry54khdi66ZWXz7rJ5GQmJWimigKiV5ix2wQNNeoclcO7jhI8mzLlGC4pVrME4F2
-azEbkL85lubNJvFWVIt+K+ngBeQmjfO8IYmENowtAZT0HsUdjot60Y2EhH/U7GoD
-IEhysjNIXQSTsGk9/Gk8wiAnTfO6hBu2qM9snvvODI9fOZxGCxmQ5tODDdB/LiQI
-cUBHaOcQs+dp70sh/E6v5pWH2FGAoPwx8fG2QctVn6fsT6yg2sqJ2dzNCTsJUSnt
-fpfcqD7Tiq6frec6Nmj/zV+YUFOoIp7ppWMM7PRA1HvcY8g/B0KJsyfb412/UC74
-NDido3J0t560NUpvc2ggTWljaWNoIChTb2Z0d2FyZSBlbmdpbmVlcikgPGpvc2hA
-Z2lsZGVkdHJlZS5jb20+iGAEExECACAFAkgWDtMCGwMGCwkIBwMCBBUCCAMEFgID
-AQIeAQIXgAAKCRCGC77m0fmVkHvRAJwPCMlYxFQUTXFNR21qRQnBu/c7zQCfTtLK
-FpwL2KCgeO/3J1UWZZx+1CqJAn4EEAECAGgFAksM3mcgHFNhbmRlciBUZW1tZSA8
-c2FuZGVyQHRlbW1lLm5ldD4iHFNhbmRlciBUZW1tZSA8c2N0ZW1tZUBhcGFjaGUu
-b3JnPh0cU2FuZGVyIFRlbW1lIDxzYW5kZXJAbWUuY29tPgAKCRCbuGOw9Ru4ip0r
-EACocWRcVl0YxkSK0AS9ZcT4jCZBNiLGK2fOAr3Ycz/0siU1KY75OLXa7sRbRsYI
-ju1SExZx0dCjIu9BK1MXLyKmAWLThw2m6SInOdNSMf0PTDoNAZj6XKNotpvGc1F2
-vihgujS4bd5ua+mxuqipX76Hc2Z2zq+51VehubVR2mUBhHzrzIFEH9s9qv+fl5Ig
-w5iYmmrX2K6wOR9tbUrO+BjghMMRwmVaqWOsOtQD2Fhu7dHDKX3F0iY7J/1Qo74l
-1dwyFZEGVPLn/lOsIiTQjIGlT0ptICB2TKjZ3cxjGMnH81EKdf8D2cRUC8pcd/V7
-DQuhx1HYMLZejmc9JJS7aeNLScgYCs+kNIo9vDTbl+Xy7bq3wg5PhgfZE+DzczYs
-YBFtGhxdqX4X1uSj5TmAJ+/O7fNDKK18QPJxIvH7cuuhxWkcMALjTyY8TDDsIH6W
-TIdyJKBbQi81/NQOP/CEmH7TxrwPpGteU4fyqbl9r6VCkdRLCh8v5wGlBURtmg3d
-AI5MJgvNezpmuLq4q2JntVHIRudAP1ikUwRJvWKRcaBL33NH3nMvCk9s5BxR+fpr
-xj8pOoKDqoKKslY7jYZGvrHKOcgysjSw6B2iCi8mhjJWBZi0ze35gUgY+Fk1nB7U
-AT3LkDS7rM6rvyG+PfmwHSStAHOsu6LGBb3nJUlcfa49NYkEHAQQAQgABgUCSxQ2
-HwAKCRCKr4jW2E5BrnZbH/9WDwkyzVozA6uCQpqY8a3oqibtLnJgYQYetviHx7YS
-+2rWfXrBP4opLIGcI8twdtuvCanxdoH5eyFzlirYmXAglgB7DTJlweSnUJEQpXIc
-VAcrRqg5yY01qxPOfMA/1oR4dEPHg1rk6dHWjMgXXWRZ8v3lzuvKXxdSWD3ktQp2
-BYV/RYdcsLM+Y9mR8d50di41HwucoV+RY6LcaeddLIzMrcLoxLNqbS6DTlQL5m2z
-LSJvok9W1wtt2qSxWAFgHZjGwm68MukPumwEm7+XafQLDka9/EihirLn9trcqDj1
-KlLqzxkj/ptTxZowEpBpOdpdWyK7Zk4RNhPdqbdXECkWpGqvddQXTCGs/65JdmiB
-3dotYr9n6gHotxh3GUi2pHNdw44nCwlmpyRYYgOTpyyD2lSP5Zak0NiPahmhPf4p
-mmtXIrhAHi+tlM8yp6mbo5mhcbK3+1RQZ/t47IOCpFRkZoZCYeFB6CJRnpoR8QNt
-fl0VoL0+gAbl1orvLf/d0C/5EqAFdT+7ZyIb/hAM2epKRgV2GaJcIMO3DC3acJfK
-9+jMtWZ0+5bZ7Ld2Cr6vlfaHrew6L7GKHVZBwsqbOeMFfKU+RuAw6KNIHyALzPDx
-cmSWRDcjNmsnEBP03JYT+/P5Cl3oG7i/GIiBKJkqApyaKAkclCKXCRnIc9/9E84j
-EpNcqVb18O+irr+NTUmgd2vIBk9xhxcPrys0d7DAoVKkJHq7YQxfthwA23cfEZSw
-w8bZIoTcqE9wjWlZDH0J8OBtsXHKD+vnbFSm4015XxqfUlFyq5hBPMGP9EwyjM/9
-LepHzOT8UStDtY6oaSqU/P9+GZq3l/sza9IRcSZmzBYY0ixEZ5sCPMBsZjiQltBn
-k0NzY4k1uZfg1v0WpS/tpSlFtgB6bSCtUyU31f7Chy+jjXM0GmMfvnRX6d1yqA2I
-PKsvLVBMBLbZ49lXLt12cUgmej9QALMRWRbcIO+MS3LBf4FjhE3KfVNMFdW4Ltp4
-yqsBWPLPVwqixuH5GckYe2O7Ewk59BeplrXiavgsyK4I2BAB1O7Vt1JrChjYQRVd
-YGtP3BCkCT2A0WmyHjNBGhyjD/aCOpGqfq8Ain0z4pTF0Sm6RBIrBd0n1xal7nFH
-LfFKfDRkV+qLCoQ7kueJYwNv1TPIeCRd2IGd2UfJPjoO0uJBPRA7l+jCZrS6OXkd
-VOWJ/cX89Au4E+VSuQOkTz2dnEzmz5Y1RgzkW69DaxF85Id5aBVLZtwpW5ZAPApd
-ZOzUkubFWl0V8hRzvCueG31KhQX4x2mXY/Hvb0ep7o7purDpBtAhU1ECLz/EYS3Q
-4952rUy7rDBV9H7qVvGgu/6xWFmUiUnysGUSZ4jTib0jtEJKb3NoIE1pY2ljaCAo
-QXVzdHJhbGlhbiBzb2Z0d2FyZSBlbmdpbmVlcikgPGpvc2gubWljaWNoQGdtYWls
-LmNvbT6IYAQTEQIAIAUCSBYFAgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJ
-EIYLvubR+ZWQedYAn1TlCzBv16k6YxFD6UPjKfG9p1qBAKDN7OCk8bZvxamBpfPF
-htCxBn5NgokCfgQQAQIAaAUCSwzeZyAcU2FuZGVyIFRlbW1lIDxzYW5kZXJAdGVt
-bWUubmV0PiIcU2FuZGVyIFRlbW1lIDxzY3RlbW1lQGFwYWNoZS5vcmc+HRxTYW5k
-ZXIgVGVtbWUgPHNhbmRlckBtZS5jb20+AAoJEJu4Y7D1G7iKnSsQAKhxZFxWXRjG
-RIrQBL1lxPiMJkE2IsYrZ84CvdhzP/SyJTUpjvk4tdruxFtGxgiO7VITFnHR0KMi
-70ErUxcvIqYBYtOHDabpIic501Ix/Q9MOg0BmPpco2i2m8ZzUXa+KGC6NLht3m5r
-6bG6qKlfvodzZnbOr7nVV6G5tVHaZQGEfOvMgUQf2z2q/5+XkiDDmJiaatfYrrA5
-H21tSs74GOCEwxHCZVqpY6w61APYWG7t0cMpfcXSJjsn/VCjviXV3DIVkQZU8uf+
-U6wiJNCMgaVPSm0gIHZMqNndzGMYycfzUQp1/wPZxFQLylx39XsNC6HHUdgwtl6O
-Zz0klLtp40tJyBgKz6Q0ij28NNuX5fLturfCDk+GB9kT4PNzNixgEW0aHF2pfhfW
-5KPlOYAn787t80MorXxA8nEi8fty66HFaRwwAuNPJjxMMOwgfpZMh3IkoFtCLzX8
-1A4/8ISYftPGvA+ka15Th/KpuX2vpUKR1EsKHy/nAaUFRG2aDd0AjkwmC817Oma4
-urirYme1UchG50A/WKRTBEm9YpFxoEvfc0fecy8KT2zkHFH5+mvGPyk6goOqgoqy
-VjuNhka+sco5yDKyNLDoHaIKLyaGMlYFmLTN7fmBSBj4WTWcHtQBPcuQNLuszqu/
-Ib49+bAdJK0Ac6y7osYFveclSVx9rj01iQQcBBABCAAGBQJLFDYfAAoJEIqviNbY
-TkGuB9UgAJKvaMoAGjiHObVeIXnsohpQIjKfs0nMVj+uItqVQqdPKdeko6xA9NSN
-O47PuiCDOP99b2Sinzd0l7T2SF6O52uymVNJbYOqdYkTaqAMXY98Koq8EKJhThXz
-naHrAZP1vgtSWUIsAaiHe6yOhdyNNkwzjneYLRgnICvSBEpJiXPg5FYujIKXKrxM
-i1meQ7UbXxR0COj5LHVxJlI5ZqcVlAGdAkzr7TXEnDsWa5ToHz+X60Yt92GtwhBl
-gcgbX5QpgX15hHuIMrTJbrrvBuphMI3xdu4FRxJKJsNDkc4VTrroDGA7aqlCAsOa
-4bCpWBUy5TEZg0iGy86bg6lAkV9hvMZjqEU2V4OXuGnmwOQcAunpQw60Fkk1uJEu
-+IYyZdkPC2pcHoHa0NONeKbCvgLvjHVgUj7KxXYhE9+pehfg0x09uQ3nPXhY7QJ8
-z2Ru2iVwssHwhKiLUlRcgyv0HTZaPKF7kMcWf48dN8vz+wFxcd2AMxEwuVYtcgeK
-nMimTG5KL6fboyT327ylFr1aiJd8fBjbO+lSUqVJN+WHZ+FpeMW7sRSlw0BG5jFc
-t0wkAkDjKBwWUQ4YnjgIZGSbD7JRqG7GRz6LrBOqHLmXsb1HTUAEkL2KlFm0ImnN
-9C33EseYd8v5QW/iXLtcawC3fAVqQcnqRZEmbua6C/I7hcGD42/Cb1NLmiMdnJ3H
-nN7N+eglK7VWsrsnoLUVYIj+8NeStPkP8f0tUbsLVGyT4Lz6I5oUvQpanhYAVrg2
-76poqtPRAHdQt5WA0hyZoibeMHeriZGo6gGkspnQrjYTqyCK07vZH2QwVOxVppLp
-N7duWkUTFqWovmRTnL7XMKTkdl5ssZ0whXPcmRLkB1PQz2PVU/c9vcIPsLehGMl+
-6RWldzTb4hMUhx07fScNx7iBAuW14oBXMpuXRKtG+nw+HJmQCRrqHgAVgO10ekTP
-qYt72lhPhhMHfWjVU/oO9FflDkMrHEiVHX3MC9z47Es4Junu+EQ7LWA+rHthn0Io
-wllvXTX2BcuxRu9y1zlEwPSiS97Jw55ieAKcVz/RpAoDD1eAzQp9+t6W6BIFmrMD
-mMToDqMr8hDGXDlL2GNjTXqqyApvEXBZNywg2HknIN65wvUnxDBx0k847xTPpp7e
-t/mMJucYQK/ZDCb+DEfukuq+4OA/Sem64Qq7xfGXNJiWheN3mKXrhXeSDLWs0zya
-d9yZ9JAVGXvnuWFMPEV0zU/xWbQlwxuo0Bs6ycH+BqeHvicig/VaMbaRAIwWfHNV
-8vRHyzDQpRlCBinQUc8gGeWPRyAqQh+uUNGf3D5lVK5QhAE/hzzNB5J2u75doEqJ
-mfnFchXQBUcH5QaA11FWLIjEtbsACcW0Qkpvc2ggTWljaWNoIChBdXN0cmFsaWFu
-IHNvZnR3YXJlIGVuZ2luZWVyKSA8am9zaF9taWNpY2hAeWFob28uY29tPohgBBMR
-AgAgBQJFAftnAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQhgu+5tH5lZAS
-bACgzdpXuT9bzU+ogdc1FfUPGo5PgMgAn04+PeVIXHjJNGwMnwcmAqhoQnYaiQJ+
-BBABAgBoBQJLDN5nIBxTYW5kZXIgVGVtbWUgPHNhbmRlckB0ZW1tZS5uZXQ+IhxT
-YW5kZXIgVGVtbWUgPHNjdGVtbWVAYXBhY2hlLm9yZz4dHFNhbmRlciBUZW1tZSA8
-c2FuZGVyQG1lLmNvbT4ACgkQm7hjsPUbuIqdKxAAqHFkXFZdGMZEitAEvWXE+Iwm
-QTYixitnzgK92HM/9LIlNSmO+Ti12u7EW0bGCI7tUhMWcdHQoyLvQStTFy8ipgFi
-04cNpukiJznTUjH9D0w6DQGY+lyjaLabxnNRdr4oYLo0uG3ebmvpsbqoqV++h3Nm
-ds6vudVXobm1UdplAYR868yBRB/bPar/n5eSIMOYmJpq19iusDkfbW1KzvgY4ITD
-EcJlWqljrDrUA9hYbu3Rwyl9xdImOyf9UKO+JdXcMhWRBlTy5/5TrCIk0IyBpU9K
-bSAgdkyo2d3MYxjJx/NRCnX/A9nEVAvKXHf1ew0LocdR2DC2Xo5nPSSUu2njS0nI
-GArPpDSKPbw025fl8u26t8IOT4YH2RPg83M2LGARbRocXal+F9bko+U5gCfvzu3z
-QyitfEDycSLx+3LrocVpHDAC408mPEww7CB+lkyHciSgW0IvNfzUDj/whJh+08a8
-D6RrXlOH8qm5fa+lQpHUSwofL+cBpQVEbZoN3QCOTCYLzXs6Zri6uKtiZ7VRyEbn
-QD9YpFMESb1ikXGgS99zR95zLwpPbOQcUfn6a8Y/KTqCg6qCirJWO42GRr6xyjnI
-MrI0sOgdogovJoYyVgWYtM3t+YFIGPhZNZwe1AE9y5A0u6zOq78hvj35sB0krQBz
-rLuixgW95yVJXH2uPTWJBBwEEAEIAAYFAksUNh8ACgkQiq+I1thOQa4ivCAAj2Ai
-cKuzJ1jZFY8uGBdw6FKripnfdpA49M9avUpw9kcnf3pQueN91CZdkmYFjlvdpNjj
-+HtWzY3KvmMuhNF4Bm5LyGGXOSBq0hH0Mv1Ce5Fwbo4do7JgaAIUFflKOksd2Ff5
-RHHpFts2X8NfLxHpTsUp00ni3VH3EcEFX+8HtKslR+izCrOZ6wvzDWw13Wv58skV
-NfuFP/YmeA0ra+GNPT00DQa/GK37ykP3ayPUoMyzAEqlReiJxeMXQOZt/UvMFHyY
-DV0De/aR14VNRB6KWxyRAcmyRbct2t56Pk7KO8guxF5zSmX6AJfTIUGTRJ8OUIBo
-2pvysT82wNbcq/77dTfGz/trZ/DJNKQP0Q7P2mtmwvVtEbcy6NrqK4X+AD+ZsVYA
-X9TdTb3XLE5nd+Pp0DudOdtuJQIv73hWoKbInbL/6FAx1d1uSjwbQeqDdDvUM5mT
-QatnYuzHKSQkdVsA2SljaOnTeAnD15bFqF5Ebu8YZharywtK50QWDv+pUFF2KWn6
-pYbHRYdLrpaI7+mP9wolaBMNtbc5e2q4DgIm1ITrihDV70jT2cS10U43rkr9zMWv
-ESIUXMS4/aUyFitmFW30b+YRe6JbCxmCqdRhCodqLPn4BWH+cK0G718wN8n/vHPF
-Yt0JoR+k4+xuiVUpk9zTGkFzItWobrVAftfZCh0X/Z46Z4aZGwzY0ZH+9W1ZmJij
-ipwVsNlXIPowiBboh3VfihcR0pBVeU5+D8xcitHAO3HIYF3/57KucuSRnFwsLFD/
-x2tlSwtBoVj2fE+WEcCwgU/hXr5DkMT+QIV29o+cbgmnbdeVWmxphWXBRBcxU+5V
-fV/2yEKn7JcybOH6C3T1mZkg1pDgzKvfzm9LvlIqojjFXrRh4EgCCom0MpMNB73F
-a4R7Cf5XOzkGJi70RtzvfBjNXUxfEU5KNZ0Eg3mvCg2gJovZvquiJB1t8MBVbZEg
-RCS5IEvYTZxPmmP+fgdFNah1ebJELyTeB0roOvL977dixpp1nnhXEvzaIdelR7xa
-DPTBx7G9To8Phqte2FnRAHQOWGpaU6N423BUtNCqOlgfkjk50QLQYuUz2/D5KXMV
-XcPTPUM3EwSQPwdyW+TN5x9jjn4ZBh/f0OI/IP8Fm5xTxTcIGDSu/cBxBTzyuAIj
-9xQwTsIyeXio2lhAFS+N7zlc96SNmIKUKSwFoI+l+JzSR+5594TCouKg1rccsP8R
-d9p7qbHbaUB4Pa4TUizwqfZRbOJtbmJIc2Mm0TDq7J7vblHXeudY10gvsNWffn2P
-dGkzSq8rEYJ3whePF1j/f/SrGK/TPnMlHkkvbSw/dGcg9ItSI6gE7wNqR4K/m5Tn
-LXVgiE0Htl4QPo4MOrkCDQRFAft+EAgAmPNAsOAG7MLnz0cLQJHJDlWZIzavFZyd
-DrzueYsBja8XC0rkaM5mljUVb37deH8NR884sWQuzRN2Xfr9FIK+Qz5oZAeWv7Bv
-xCAJ4JAe+/6UmdfvVuVUhJ/HFWgRu0U2gA0uEx1+9u8OsJ1LkKuYoZIVdtiqqlge
-B5UY77tlmcMPsMBTwIB3ER3DOm0ayzegXIlqkPnKGeU9VdmwimkAqrqxyFmqVPNj
-PZTTJH8vzTxCQGLQn/g7LKQiFAJwW7Oc6iP4jQCt+HRcH/5moeXvj0jMkZNGYwJ+
-iHdaC8ZZemDc6fxkkQVn79AqZBfmJ/g7QwMYqUcd6S6387/ARV/arwADBQf+LQ8q
-7xqICLqTVaaJvgvs/JsTVNysl/79jfjiiozggJ+WamxY/zf/Nzivtf990ZQBnS/4
-2V/Nhv/LNJuUwhqx4Huw6kEVClWI6c6Upt3vZ3rTBIzvIhNgqXcHCrMX2oiCVPcj
-MFQkUZf9XOmM6iPhQkVztXcyjB2lJQDhDdfrRISC8PfHF9pZk8/mdkx4QNs9IpX4
-EMxRXaR9NIinxg+bvV+xxfsfFr5n8T8rL9GaaZtOYHeGr+guZ/fTtqdCwjPDYgJO
-PdXSV5JqYEYLigXpTEEd/ZUJl12nSOAOKYrRnsqXqfD+TlxcwqlNs4otlz0CQjDQ
-gSbPwyNwr1ivwMe63ohJBBgRAgAJBQJFAft+AhsMAAoJEIYLvubR+ZWQWrsAni4F
-oW69heOcb/0dIMNOOo3dVYe9AKCnMWg/qUv18zXtCMDq4UQzAEGZyA==
-=1wCP
------END PGP PUBLIC KEY BLOCK-----
-pub   3072R/97EDDE66 2013-07-29
-uid                  tallison (apache_distro_keys) <tallison@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGNBFH2rQ0BDAC2DQ5+8uTR+mG26y+M3jl01EXQOtGCIZIqRYnQgz8cC/4/SQhK
-Nn8SwEMQXElgPMs7GAhXBGnCQJWAcatO1dd3/r4bMWiLJ+5vQumujgFJlavUqN+v
-PAAsRWncoVUwZGZFVCz+tnIzA5dDk7tVXJcfgkcvATb+XcsPX3x5R7uq8f9AkTE1
-KmRGA9UrvS0gG/GpHw40eUgrv0KY6uFBSJDRCRv0UXVJ7+P/cU3qTDCZ9BteXI1L
-udLbfz98x8l16DBehffLM+Cf4HvBuRnzeTpEWLvuSZb71Vht0nJ4oLw1zgeKCFZI
-dhioIXrF+F8gL6W5FNmAAd2sgi9gfPr5A56dbLFYILyoY4q25txX6W9UQ0fXqjxv
-CDpaOGrc4N5TZrI0qbMz6xWfE66F1eavBl0/Z5IFFQ5EXKUidn9Rbch3cKGGs4YT
-dPcz7vHks0ZmOWnl0e3gzDP/WedQyVNDOhGmB704FZ/wrz9M1gWqKOtPPLscys6n
-MAL+pKXbiST86JsAEQEAAbQzdGFsbGlzb24gKGFwYWNoZV9kaXN0cm9fa2V5cykg
-PHRhbGxpc29uQGFwYWNoZS5vcmc+iQG5BBMBAgAjBQJR9q0NAhsPBwsJCAcDAgEG
-FQgCCQoLBBYCAwECHgECF4AACgkQfLHiapft3mZwTAv/U0B6bjC/LwTcDo2UWkgJ
-nC1H9AZvEhe/JElqE1gN53N6VZedPu93YZAWDwaoU4HQrfPCghpKLGxJsjoz85ON
-8D2fmbzjgSjfpTBp8rxYi941A7TxvI+ogrLWJ5W7ZDi8v7e1xOeQiewblr2ELaZg
-bxDFA8snbau3RdCixWgFBpPgYcttgOhAcaDSyIsG0U5rquAae0/IqJxZrV13WK84
-yqtNaMMN8F3Kk/RVYg7aOlzB+LMuWrcaz/sXjDfKyz94eTr5liI/g8FazdiJ4lQK
-QdyyMrB5wzP1zujy54Zfhv1Wad/9THX0YvQNd5SvuIHstL4dwI9jQMGifUC09Y0l
-jCEo8mdDGZXOqtq97+2mdxcPNFaDjw+T3yCNuvgTqYhEqht9AeVeYDhjI9QJTjcP
-ZwsmQlmiAOZwPUv6ML9YghnXsmUFAFalq94DaRvPhCZRwt2ZcC8b36J/37HRu5Pq
-v1vqRTcvl7xy7+ZRS9mEiq77/GrxbB8WPx22F5YufHra
-=zVcc
------END PGP PUBLIC KEY BLOCK-----
-pub   4096R/E1EE085F 2009-11-05
-      Key fingerprint = 0186 F8B2 4C5B C02C 94A0  E0E4 86F7 5E83 E1EE 085F
-uid                  Uwe Schindler (CODE SIGNING KEY) <uschindler@apache.org>
-sub   4096R/39B38462 2013-07-22
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.19 (FreeBSD)
-
-mQINBErzSRABEADXae0zl0Bgh82XTF5ioznJM9uctS2op/+/uilHKcmGsILQ66GI
-+cy4MH2tKNULp5wah0mXE8k16EkaKPIunXggFto015L4Y/7vsY24LhmzI6jiweEy
-lsq1P5bi7RQyJmmr0JDQ70uD2i3zIHMjqLKgvOMmhXnOnstCEQR0xPauEkkcHyY9
-fSZkpoD+c/i+1NvElX8/pgf3Gx9gs2jSgVJ4eREuvTm3j4ro+D6oYRbdSFHn7+RH
-1GF3Dm4pgB9b/QQVgOSOQGrn0OGyn6zGDbc06JyOQ6EdzLQv1bzl0agLO0/wVGwt
-r63HSf9C1Fy5PmcLqP3A7e9vMJ6NYCYhfj/kXdg2YyiW9MrkD30aHg97Gpqy3/jI
-emSmu0tqVqeFADS4iNXyxnpPO7pNorGmyYvAN8ONHbSyX2zL9RusEIvAbgPWZ2sd
-5UpwSg5iw1tBNjpbprPgcRzNgdOnlKYvHcfETvVM3a0g9pf5/2buMCKijrWi6nTk
-tJ9F1xXuVKCzY++AyQaZIDnk6m+bOPxUWvcIPdqxrm3IGzUcHAU26bD8nvWAKStD
-sIlf/9C/+Wa4wQW6R7Q6NGZBa09K8MRAuesNbannvczSoCKS0npTLfAJX7KjNh0+
-ycagnocbhln1I8RuRmvSMbTD4npX7rdUmDFGyTQvT7WmOUbn99NC5arpfwARAQAB
-tDhVd2UgU2NoaW5kbGVyIChDT0RFIFNJR05JTkcgS0VZKSA8dXNjaGluZGxlckBh
-cGFjaGUub3JnPohGBBARAgAGBQJK86kyAAoJEDyaQgQMCIW0RmcAnRKLDze5E2VN
-4votoLcv0C9vLHf4AKCunu6IrkDzqdKh5ToeR8xK4qcjB4kCHAQQAQIABgUCSvOp
-EAAKCRCZKv7uwJ+1RsenD/9nw6J+Y6t2CYbDXFupqtsx6A940HLOAP53KmMM5La8
-x9e8dsF3ABByX5vhPMMJqR6QD6S1ZiADNtQcHxx5AXd19tnW49fDofHvn6Qzeeno
-MAJjzUvfsubsbpk2B53jZ8M7mBx6xaVoLoBsap9gw17FdnYYIAr52bk2MGd9lS9Q
-yQC5P1v8erNCuOxnC7vcYv6LpbpB8N96eFS9qNa6dn3jjbHxcrzmVmaCQZqsi+H+
-SNekZYCynmlbjRa/c6+yAO9avnYwtFWCLGTgKILNdzeBI/9c1NnSreRqKKVb6dDm
-jTELUEp8jXD6CzpaRPfwkNq92pimwujD38720Tu51CMn98ilqI5K8kI/dxF/XKnq
-KvrZLjOYEEyTZG8ksQVBziMyawzKl1RPPH1Gxf/rrYo1QCyLvLskJaryPIBzGX2S
-TEcF3oOKv5oSBafMnnRMBhOn8EQsW6HYBTzuNzKGCAtyS5jpfl5ISwjXyraCH7f0
-EbjkFuAUYvwEr8vMYnX0zfZKdS4I6ScyfmJM58D2sLCWdB17bgZULpL0zE6dcUCY
-bWp8Y0RBjm6pPzFalo3ChvEZkZQtAGA30H92L6ykhVd8Jf9VcVkOcvB1T7V7Jdnz
-QQlTm72c25z0hrADDjEZ1C4/c45qjC5sFXYeKR/5czeAne5Uj2598wP8cSorzvmw
-gYkCHAQQAQoABgUCSvNYmwAKCRCBeuHdMi1+ypZAD/9O/oQeeSVSXst9rvEStYq/
-oohtlkfS1qhBMmlw6dUHL4szh13IpWNzLVEQr2qphNAzfYhlddKN7acWzhpEGf/z
-wi3lX5jmwG+Jxk7BzR+t1Lsm6dEJ7IxMZPMuEFX+29oDb+LGON7nviYY6Uw1/F61
-CBfrzaqqyqwk/TauYMePpiuPc7EhMC3NfxFfvB2TgGQD75MfqBUah/n9C94sZ1+O
-ijf5owaGX/0YSN+wkCZ3xd79JSWZLf6jvzudpxOCMc60tDfWrMGvlaax0n+ThhOe
-h5NtvLwjHW5STMHklx5nZSaqilXGm5A9AgBNmd6LOJlgXvg2A8XiZ/aWRM04AEgm
-mBwsrCWCWsHqtZ9w1PIKOH08P8DfQ3lg+m9VDCIfutGEhlrblLNFLErBTJrI3jjl
-srt0umxoDawc2cT+3mc6PnNLCbk4HmKLGIN93aR5sesfMtrIXSf/2T4SwGFolZn3
-8H4zn5dcMb6hYw7jlsHsvJeAirXYe8YFuenT5nMF7XEzp1otnmafZYdFdlu8Lt51
-+IHHNGoK3OwG1ySGLw+LmE1p0EF4Dbvs5xpABx+iKBPW4HDxOFAJZiSS7PkaTxAM
-AVv/dFeUVtfwn5GCugT1tI1/+jz034Z1BhGigRr6LdtGuTynDGjwrSdFLxmy1jPK
-6DFL/Ojvfp3tsOHgfFiCYokCHAQQAQoABgUCSvNYwAAKCRCKincf/gRZZkbbD/0e
-SunGQr7t2o9ZLnRGHPRTTmV1uNKTjni5OsL56QEmeyIzbh0/rPstl47ei1vNPFK9
-SdsSu/Rte+kTdn/DbPI8jOG2gLaFYY767LRCVlL5cV/GGVWI2Wjk48mjvhhP2sqA
-sUXqit/xe8MiWiuTm/GQ7x4/hCyLbbDmBmSqe3kvjtvcrprjTOliJnVLy5FcPtO4
-n8d0l8hS3Hrmy9a4BELrDsh9dE7Fh1gykZpycNzp0Gy0UVDoOfcA4yVYerqDxHFj
-QkTaGDK/Div6+aMn0//dT5QBwX2YPYE3eI24fsYNd0sLeKGwsE+EH6hyX2XKqh3c
-ObwZTq2ADsr2Nb0U2uxfHDYECtL/ztu9BERmFFSGsVGbDnrEcCik3zrbg7MS7QWd
-yacdQ/RSp5EPtbbJEiZ/iVteHpPMlEHW5X6shae7hUKUsqKIZ0QMSQKWBRfPk7F5
-WQgGpVAbn1efFo7NJWtr6yC+B90fNgXiV71XAYTLYpX3mhHZoJl0Mkz1EjQvsaXV
-TF11S9T5SmIXWKlf/u0qtP30n6uCraOl32K8MxZ9feJSotSzUvAUhiopNH9yb+m7
-PZi/zWS9BJDMEl2oER001VqsUE6WIUqUhStQERnILHauVJd/aMzEPJiQu3/xMvuS
-xF8fvS6KLDRFiUUXX3XUKeXrJzzREdk9sGjoVqQlvIkCHAQQAQoABgUCSvRlvwAK
-CRCI4nyiDtdjP4V5D/0YfBumC822QRdVRfqGq3YP5Fujep/papNfilAX3Dz3gM6F
-VEBDjR4qaUgv+5Ek3mdkmgK/BiTOFm5picYqWATjlRXInOjItSglztDkdG6+N6eq
-Se+nj61oZ1CVexiFmnOfOtqMd1YOprUlrWTQdnnlvX0RxhqXazWubPzK2i+VjUst
-Nk6Youl8j2fbSjbfEsN0Lyygcta7kUK9PR8TsLcJ9yhueIxsEHbXM74rOaEMlTqf
-qGNHdwsi+bSrYDhaRq4WhkhgmBOIDyGtpxUwuhT88vm2G1rPZDUMgLU9w/b+drYg
-hmRL0krWq1bQNPQE5RpQamJh7HOpnhtmOLOMnk4lOUl0N65MR1blGqwjn7WcDIxu
-UjQoe+5QYQoYC+jJiv2EpZXGz7Qim25qbmQ4fYvw03I2YEXH3SNfLBCAk04CIkG2
-OBAdS+eZVTjaeQh1U0fM/eh59weZyUftslmEgL9MLqg3ha++Na/KH0jE5nEDKkSI
-lpiCj0ntNbVmlzgRdb9p3nGlMFWz4in7wnP17+GUWASVM9yXGT+izTFdNIhO70Wy
-NN6ZN1ac83V2AegiQPll6Gj0K2aEi/tcVT4eJE4bjDCYQmVZQdfNic0GZMVb6bhE
-OuBmDb0NYnBtnDwuzUPnQYD+UAAY6UqrC/M57SJmFHKDcpG0eXknK8spAQObt4kC
-HAQQAQoABgUCSvRqAwAKCRCI0z2G2EVkLRZhEACWKu1hOXz3PBbgQLWG1RR0NDhG
-o8ACnGAGIXN+NIGRwAm16QDlBEEqP7jYiYQfOD/QEXa1LThRzb88ij4bpvFIRhtL
-ERmDJ4/QNmClLJBdPvlmP1lIkQIimX3yktk6XMHmAFr2/132xtC7qd3Ft7OGYWqg
-G13/83JgREO2XuLItaYIPhNpvmI+5j8YhJpQ/fdRnsS7VILU0PVftQR+Pix9vnjt
-dvAjw/TvubWLf0CtpavId8Z48fev1ar0SALA5lqIcwoyqWytfrFgt8uSbW+tqeKy
-coKH/VXaOOl6VlMHPHPAQ1GIfwWkAiGM8dFolt5A9gjSI2f15SucRYg+tw/Mkepm
-vT9wqmg2Eb4zXSX+WtYnKTw+j0w8VJO9YJt9yZBPWPxyCeF6dHeHjmS7EbuxxRLE
-OcZe/h+Br6YJMyd0V75jKB71R4NUsORgUdYaQaIG+amjm5RNDb1lNcJvmdm+aMd+
-B4G7OZq8k+RZdwOHMl9W+BIC+mVUTRCyISMmn1UWCmvCCkJlzDVOHXDlBY7B7Zq7
-/APzoTPfPUFBuO7VGVeUlAVw3OTepFuFccXcFSi6fca7YHHP3KcHRDSC5jpZ8fTJ
-MS0JQUY5I0Gkr6t7UgFfT5JadfMASyJdmmQwURQCdS3acCpbwwBIxHPbW7d1rLRf
-KwG2itgmoV9Y+bhXsIkCNwQTAQoAIQUCSvNJEAIbAwULCQgHAwUVCgkICwUWAgMB
-AAIeAQIXgAAKCRCG916D4e4IX+kwD/wKF4tKQHOhUEjMt8jQBrUoyXX5eDLDAA9B
-CAAvCVRAejV8aLqJHNnHRhY48Zt4pfIVo0j74Tr0kwLl0xR1kgnVUG3a6nZUsK48
-iQg6jNJxMKXq217gKZdM4S3u84DRXiZKj4tAtAviaEVz6AXcg7xfsEoOn4DpArB0
-KzBM0Y/3D2tOSyFflFcPlefn0F+Uxx3SstXVhkBUkKOym6eRnLmgFBXW+d6bYkXw
-O5f+dkLHsIB1PRwJVraXQwGCooSyUM5cidXg+QCJLHR9Q2WHReKEKAM8Ujm7976E
-pOV+Pr18NYF7TF/UUNE9ZpLkiLoe7lqnwnLBkVQ0YsLNfqMrK6ReFlKvofzC1raK
-usFwxKuTXXeI2yMH7/ywsEF3Kwz7SdMZOkmKyM0coRntf8spgof6pf6Hwwv/8RBo
-AJofZrXbwgrHyWSVXJiDxNQ+QCLvVRhQOTb+J3lwhzEFdAXeJLHOvbXMlE2g/8JH
-HaQzyA3pQkGMJ9I2r5OKcM6VGZH+jDFD2jjiuznbNCDLp99E657yixtJQOTC/VJs
-xeLlMwQh53U6yxR0GxdPdfxiQX+ZrwgvXN+95WZWXmOPIrmkMv9Sx0wU6pTjcNF1
-6/rNw5lr1Fr90TGpStiuYio1hfLL7UpiQ7Uu2ehxp8eofGy/72XTFS9XqNp1Bz9u
-XVjPr6D+vIkCHAQQAQoABgUCUe3BigAKCRAyN1o534K0v6nKD/wKv6VdlCtBjOP8
-W8h6y/xPEbyln8I1CLOfHSSXm1Gj4ARqi5aQdKBHjEY9JTR6zQ2EZ7dX2j6dHcEs
-iXKURfYje7pg6ux21tKvb/oE/J6xskwMtSrYvIQaBdh5zv0m9QG7NSAbhyWXWgSu
-jN/nzbGmKZlECkUtxazMKTaHltZm4ButAqR3Cy+XfTSUiynFKi/uqeuT6sf5SF5C
-tdCdMKO3TF7TbYdWQDmETz5y5fOaZvWTrbbn6uCeofvT9/Hfr77fKMnvunaHoKfr
-l4vka/6phLkuX5nmAFHGRH5jIpSXEk7kYJY6hGm4eWkBo2U8QHOhiygkmKuk0w1B
-KChUSlRo2W9AfWbMIbzVZPyeSEsXC+fSM3UjqVeUrdv/uMAYpftL/FxL49w8Bmm8
-eozYkhmfmpTQe2envIipK8BKuiWnkBufjN1+WHcVxPDNGI/OWhyQJJ5+juHEz+UW
-TDzHbtQDXGaLEa2ZlJbEIpFID2y+9cv3f4IBIPgZzAGQc3v5RcH5KevemLNWkV4B
-1roEguYwNaWJsrX/PSaTdtRdk2iy2ipJKpkzemLuoguULiyoIe9WvRafyNqcs9ll
-76XE525oMCz7XKjLEWNHsFerCNulUOz6fyYQSCN6d0OZh+wnd96oLpvKiiyepsQt
-4uXoscdHwVD+DvdJufHBPeCo34UZQIkCHwQwAQoACQUCUe3XFgIdAAAKCRAyN1o5
-34K0v7EpEACJvrQdkaRsthUlCTgNHub7jL0G+lmK0vNt/DsaH26B4tpciCkRPmFl
-fd/+MSyU4eRESzRKcWnX5LklKfaWjDNvhLXc84yedVJsqtJxKTgOfwU/gHt8+OvM
-IHsZu95jY1wCXXDYojZPgg1/3HG4G6qdAhydwLLytiZnqaYgYdvUXH5WTr1EzjZQ
-KakQwkhjTDIiz2zvbaWqZj5TWmTO4jHlCEkyO/kfv7Op0jeqmqZyRj1PItami6hH
-g1kL2aFsuSqxZL3rn9v/KeAnMu0bcw/25Tji/IWObAWG2mOOYVx1LUIqk+jwep1k
-1wlFLXM7S42JWG2sIOvOH7XtOB1k/jmxoP5qFBErdMyHmLAK0Wl3ksYDYo7dqW1d
-DDpFtWr/F4v9HFNzDGiOPna0I0vOGhfWXumaLLgMHsdY+Uhr8WxBs0tSYBZQ4YFp
-YK/MxCFP63w34BISQOjXWkggFH28vdJ66FSh/m+iVg4gmcgOQggZxgPoQYMGlUkQ
-mmFupLKS/h3SLTfx54SOvlS9Hs5zhv6rX+gnklYmWuFyO7b/rx3VUzH6SgXYalNt
-ajtMUcp2W5LB5ZS7DONhC5RjREQvdYYEIzYHPzfkmiUB7Zp2QR+VuvAcscvhedX/
-j0P10CmrT71PwZl1yJWRuvHMbzliP/xwIS5o+59Vci/ekZq7pdOG9oheBBMRCAAG
-BQJTHd1BAAoJEHZPGRZQ1jTc9YcA/RbKPFmF1rZMEvIOWHeYWLiBB4IfwY13ZmG9
-0vlyIcG1AP9ciUtklPZjy9fGcQ06r+pEai61QCXvSUJBU+4dcopOfokBnAQTAQIA
-BgUCUx3dGgAKCRCDZaeFsBQ/ToVEC/sHiBUIqFZREJprBZdHIKqc2WfxAOuD78qZ
-OpxFE9/3eEm4ROH5XdRXdkl4P2SRoToCCAPkr9IVZaZhulwpub2yLkzzOnhfi9LZ
-p6PSporQP1Nf9+OUq52BqRmLn2/mocaJ1WDrjSj6RbySysv8zAW69aMO2Y4wRCSX
-lTI2U9dd8+VDRdWYKtufxdlDmt/ioSIfKNJUZYBZ1CFTMg6BwvrmTG5ZHQLGd3HN
-cT4c4OglfGx1AgWyeURgOtgJ7csc4ykO9DVOZ88KkE+ysjfCiNra6RzrLjrABLOI
-MRhCVqDZwR8FqcIETaZf/0Sr+sno8kls13iljiZOP3nDmkycu8e9pTweRQ5YV5ps
-rf3/9SDeTtPqHGhlb6wdy+lO2HYpZtx39lzd0NLt7+rdLYJNgEmVixnJUcVK8t2l
-GU9CMp3STJvWgzmudWSulDOL/eKq0b2LJUPtSmyS9QUIGx8seu3kQ8hqqL61CL3T
-vb/LPctXeYgr/7/XUCEd5IaQyBv+uC25Ag0EUe3DZwEQAKOsnsKa0kMxTfm0hE4M
-Zj3N7cA6KmE//9c45+uLQ8DEvQ0m0jEriuyUFkjY+RInGGX18YQnuATOaw6ZpVlK
-U3YZC8dePDsbRIos0z1RRNzqVm9UMR1QpL1qzJwezyOKxOuoURaPzpoLYC6cux6E
-Fdk085FDmT1qpB9CpPyVnK4DcfbKlxIearbnafahrx/5ittD1rkM53JJln/tO7Je
-FCoIgHS7SD1vxs7XXM/3LrFzbdZuLtZttJHbjXr++xfc2bKV7ySpkyefi9cgku2x
-JhSBVNEy6JU6fPzGQ1Iz0xqiwDk7CHBr3hnI/WKsL1QfKcrqhW6fwKGEmYLO5vWw
-6pzngID5egm9gnzQSFCme9Kh4uCqAlFV9V1twC2CvW9th+hx4nmWpKzpNV4SbFD2
-IEwYDFJbrJTaacmiMFjq3OZir1mMI1K85EwY7pmlyZkn+QaFqE3+HKi70CoLroZ0
-1/nlD47BbzRsZeCFDw3C2U2vlwu2/kdH/NBfTrP+h+JSYBtzg8Dm4NfQJEh7bLo8
-r1wgGBTlhUmJAZPTIiZ3r3cne4yVf/VhxadcdtIPfcJn7HLDItf++ZTFQyoLw4Vn
-sZJVQrjBUtzs6amJ7KT9Ai2oU5nXhE5Cs5w5cD6p5gql+RQ8pRqEM7TufN1GnV5s
-R3cDU9a3yJK+i02wcT7Fvt5LABEBAAGJAh8EGAEKAAkFAlHtw2cCGwwACgkQhvde
-g+HuCF8KgQ/7BzKiS+bZ9L8OEl4KJZbO3R600D82QIk0f2MGdEymavX6QpzX3/mX
-v2E2xetQUjrA+tYMIXwKO8Z6u8derrouhkZmJSOrMlSxsYgndIkLmeAtKKDUYnuv
-X6R5YuzTPxOE1IGMDpt0EsE00/O6i39ZW3FRWCmea4NQ2pwntJi1OVh+jZnFXIN2
-NdZydNqGvOVH0Oc4D7JRtMImpLSIyElccPywUR2/zOyjWLeELtJnch5YF/hH6m6p
-nDMyhOpq2KuDg4axLeTBDY0LQ+2dxgIqoJJN/gRv9Tfaxjpkl9et4Jw4L2J+UoZn
-jkkwoRvYOtZc8/qxjVEEPe8HMkV9JPZ08DZhcOxeSmrStcJ4hY+MT28yEW4rqa5L
-pRj98A4Be7kRMRH1za94cUa4TPR1KaquR087gKI4qtgUAG1gWtG2VVto+tl1naaR
-a0sfHTE+9BMBMtuJtFRVsLqEZUBokOKH1Wzi1oYCa3LO4LoZjGW29XbQhowIjBXx
-OJIYr3ZP42ZYO2HEHttemIOmRpM3To8QeooPRW5h1wCZhV440DtXnvbqHqKcYwTp
-W45jdvBkYoPdQtS+8Vy+q0997zobctz8i5hfXzxg51/IuSU4uNtgr26XapsoLDur
-7PoqJGZ6UdBVwyb0qZqs6KLGQkEyJ8358ivjJsjxUR8diK027wWnW/s=
-=/Vu1
------END PGP PUBLIC KEY BLOCK-----
-
-pub   rsa2048/26062CE3 2014-08-17 [expires: 2018-08-21]
-uid       [ultimate] Andreas Beeker <kiwiwings@apache.org>
-uid       [ultimate] Andreas Beeker (kiwiwings) <andreas.beeker@gmx.de>
-sub   rsa2048/EE864ED6 2014-08-17 [expires: 2018-08-21]
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-mQENBFPwtjQBCADWg7jYCGq+QFGfB8nLLQs/WEw4XJiAY9q65qWX1clNuVgTF9Nn
-ABBOy4KiSDR9XWmARZlC2trKfdoFEnNJ6EnFkLhOjzZKiy4jkyxCctKfbV+sMzCm
-ODjjNQtn+nYmOu7a8Xg3g3vTnikkuHZqWvK0O0VYouW/p1NHelUejQbOPuUKukD1
-omzskuYgteTZ9Jn8efJMIymg9dGubuvN4HvUdEO0/u6K2MCZjIqNEPeqWIuZXeMb
-+4nGv2r0jSQAU94g3hueooqbUf+Mk2+H5O1d/h2Cii9qVvi6gELdVw9H+5Ir9AFc
-ynsmvxrPIxraBMPgrXmvPFOTlqlizyFv2O7pABEBAAG0JUFuZHJlYXMgQmVla2Vy
-IDxraXdpd2luZ3NAYXBhY2hlLm9yZz6JAUEEEwECACsCGwMGCwkIBwMCBhUIAgkK
-CwQWAgMBAh4BAheAAhkBBQJXuYpTBQkHizsfAAoJEKk+HEsmBizjNa0H/AjJPguQ
-WIn9AV/jstRN4OPM6eY7VUMG1DYoABRQSVsksPki5jZii0bI9VB3AUFgfXj0y6qk
-CwQyKCJwZjcP3JuciJ5brQr/7D12hoTkYSCzCaECIpMoB7HWCpdoFusrgU2PUUwJ
-i8xBTC+sLxIn3h5abTU68tnynCYhlA0mJ8zZ8CTvQJyEjidY1UgSohXClG2k/mo7
-z/IyW16x4dlpdkNfiBhL2v/5Ol7Vuz9g1lXvWvMdNQZ2PVK6w5dmCziCkih/qRgK
-SUzn65ASEKiCN7afzUkCTdzrI71r3rOkJtlT1NWn2RAv6xT6AuhCPZzH2I3ImuFI
-mkUKYhKzRN6AdmCJAT4EEwECACgFAlPxECkCGwMFCQPCZwAGCwkIBwMCBhUIAgkK
-CwQWAgMBAh4BAheAAAoJEKk+HEsmBizjvfYIALS1vlaqN/f7/YzpnOwlH2Wo4jpI
-jBrG7SqcdVQk3NGsXTXzzq5p7uTTzpEJW8ReZLGeYaTzqh1vH97uAPR6wL3GjHMZ
-F2jkC0wSHXxvh9Gyrdx3LA8NSO+BAG9ZfD6OGklsl7tFFEplLpfR1EsAKfbi0bAY
-86SfVwTmCQfFStoSTzg8qLr3OcJQtqw85XVfjrFTaPjY36/RcLcXVmAVN6y8E+E7
-019qP30afGkvw+ZbIq8qbxJItObMuhn5xdI0YaMm2yudCfm2aGYSCnkrgNfuWzH6
-WZ8n1fv45TGBUd2R6zPr13eH73AG1WXpapoD45yf/TFavRfnknU6xb7U3ZK0MkFu
-ZHJlYXMgQmVla2VyIChraXdpd2luZ3MpIDxhbmRyZWFzLmJlZWtlckBnbXguZGU+
-iQE+BBMBAgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCV7mKXAUJB4s7
-HwAKCRCpPhxLJgYs4zheCACgc3m2FH5kmXtYO44BdYYwdV2dyLMCxvVl7GUWqJF8
-wKmDWlUxBwrpzDBQXpmHyb+rqX/kvfEkH2wb9TZwginLecbZbMKubNUWUqGJBHQo
-CaV8o6L/iEUJa5NXzY2OJCp32CHsmpefYkU+WgAnmTVe8Se7JEmJeu+2OfStV5m6
-zVK5xzlciYSc29LpA3dsv5hxE6YZ8kJBJaFyv2AvVzaouSR7nPNrdw3/jXaOz+Hb
-VpP/CEf5IdvF/o37sv8o7WWcH1AjvMdGQNp6Zr5Te2E35V8PmpqLH4Z8W0/PXij2
-67i565JZc1Kmpqxm59jg1vs2X7rHNn0k+r9BFiCQC1LKiQIcBBABCgAGBQJV5hIJ
-AAoJEOGWdUUnufY1qh8P/03uvjuU1V9UZY9t/4J/K0wbU8Re9c/HfgmJrCn+wvDI
-OtxpOg3m07ZoIrosYEA2CIm+kLCYuNbzGSz6ZPZlpoq5FvxzO9OAYMO76r3ktxUw
-Snbxd9TCkjCCQ8RMxT/JGDBU77nAJPyhCUZF2/SyrXnexloNP9TR/IDQZNOXzlxR
-gu+zIrpl/ihfqxozqXYFIlhlP+k3GhiQt6e5yw+bLRiJZPR+NLzS4vfTeYEvWT2d
-tQJ8FFyJF2HypiVcFFF0AwskiVRR9xxkdbONeJ0DnOHfRmnStfl14EDXUNDZ34Qn
-IgMkw8vydc1GeQQE44BZYlN1d4J/h6eSji5Ftex1nbRuTeesXg5AzAHi/zWn8dRU
-KCdKxjjn+t7k1SQEK1+h6Ja+CwBTZpHWpHPEbFzVSTXcoC0qU+QULD9eq1Av4OTi
-Bnrf1/qYGZas6K0KYL84ZTH7JAZtgkXrn1sDiOMEMB8Hdqpw57wPaSt/6mbtmkCd
-bCTWigBIWSY9FGfSTZdRk/KoIIK+VqxCPkS++RQ5ltwwq7Y6rcEsMFdUwMWc3hCD
-Qu9C+djVRZrsSo6nLUGKGjoKYb1xmcqr03VquVVH36XNRmy3TC/8RqSstP/Q4dtx
-a0bgqi+iu9vwLVUWtgLSQJr2OxTcU640DlVCJdvqTfS4SUP5Zht1HOkVzh3l3KiM
-uQENBFPwtjQBCACln6mHC8Js3T3KJgNydimOCAFhLmS4e0ur03Y1nckB9zB/pMTL
-ulDgtZwWSin3Kd40VZDyKi6mqOp5ldz6AsZ2CSx1GfI9iVhfuFqOaiBLqpNpdvf9
-nGL9OVoy1SdwTXgnboiIFtbTG3sVwD4x4qTRbmT22Ln/mIAICR2wxFBkzpbIQ7Mf
-R/zEgRh2VlRUUrWUsnYdOh0xfxuYgsnPCjpTY8hvEno3H6kzXKmj2GQJtawMVs5b
-Ro/GCM9lBBR/PAhB65ACzLmUUSsxjlmjZw0tCcOufg1RyAF/l6YVw1UOJaqXBfSP
-eZkLQBj9p8VNpasX/acIfpEaZLE8QhoO11ajABEBAAGJASUEGAECAA8CGwwFAle5
-inIFCQeLOz4ACgkQqT4cSyYGLOMvsAf+J2EyV9+GNqT8UmEU6OFnw/sdR1oE+vZ9
-fe4mifAfjQ+SKYf+MS0lU3lTuwcQKwFklePoYsvJEO7jNEgjTQ+zKiDSlV5yufSn
-Idy8+sCYygPn5fSjGdRaMpCCfs5xrljLUPK5U8+vjeteRJW0o2/wmsYdHRz6A74B
-kRq8kYu1M8VgZ6JD1YI/mp0mHTTB+H69/DNo6cA+7W/CibeTrffbJ35+OXGsJxqJ
-b/QH/4lqsceNJtJThkHPQeM18R7/4t7Vhb5htOk2eB7coKzdYRKpHMzkm7elm8bI
-uwsky9+6hIUMKD5hhc8G7g9lWOLSXCeNRUdqWTOfZaU5KOK70kKUeQ==
-=PCbZ
------END PGP PUBLIC KEY BLOCK-----
-
-pub   4096R/B4812553 2014-02-26 [expires: 2019-02-25]
-uid                  David North <david@dnorth.net>
-uid                  David North (Oxford CompSoc) <north@ox.compsoc.net>
-uid                  David North (ASF Committer ID) <dnorth@apache.org>
-
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFMOLVsBEADW2N1bQ6GFDDSbC+IKggdS/lwhaEo5Av4Z5B2es83A43boyJZ1
-bn9xfd5TriHubI6VBgjbuB0peoCZye3PzEz9cfZYXsPiAqZngWk95or0N+vwrGoI
-9gJM6aBYjE06fxHZRTAi4ADPLW5sV0bT230/u1xpqg1lcko5eGV5sAjI9HaVdfvR
-68gQdNVK6TciOeM2EQcTHlRd8D9D2/XTp9aCFynNaFoKmBTOsc+VlczmIgd+1jzW
-qWcaGTkEtZKzAxUfxlWgO0xHjs3H4CGqtWWCqj8W1alkwIVHBeXIwHDoHlbmkXok
-65jfeQd9tWzTHGXETU7bBbxksbwRlrJrutgolLW+/v9F1je2aG/BKMwOLjF7dk8+
-gvSKlu4PwoItGN0qraWsqAGDR4/bWLihqPluW+pUL544li702DUeZiVxFEb22yDb
-p2oWdFafEFhQz4FxRCam/4bfVt6bGLGE8GEd1jeahgmpkIAcbAoI9UOFAVaoSWFv
-AqYphVfONeZz7MMIcNlyHth5VAvQQF7/uBWCsNtlvBtVirR+nis+eEwoNRDwYx3N
-OKu1GTFPMMHUauB0ORD2ywsFQkIjDbnQMNhwQoC49bs46vCusBb42qmOpjP0viVs
-qGI3Ae78F4KEBpa5AVbYRbbicOPeV/tRrHFWMyXmH312898j29qO57e+awARAQAB
-tB5EYXZpZCBOb3J0aCA8ZGF2aWRAZG5vcnRoLm5ldD6JAkAEEwEIACoCGwMFCQlm
-AYAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlMOL4ECGQEACgkQ+bj6w7SBJVML
-Mg//To6EADRjfp11ZGu3cARitfx67276xAkt017sxw76LBzHoF60RtPjcRBBRCYk
-0P1URdip6nC2M7Ol151YdTUIfKNWDRzAUVgpWrGfUIRPUgClyO2boTijblS3heZS
-gCKz9x3WwRn5elR3Qf6u/wZGIuHBjmh9Jwoa/c6G6ikIoLjoUvXBWR53FlLIpHIF
-/q6mzwhXdCwohDsfDI7ckSuSv5yMJsYLZRpEKB3zLgWo4CQP6edaewBd0bVb/Uzy
-/5aeolwEfwoNSJ2J4+tQ39U1vxPr1NLEALNl4qW4Gn2fSACnWyEjDHrLltDvolU/
-iLXjgb//9ge93vZUfZmH6vPkrt4TzOfar4wLHTgiEX8nKaOwiMU72wgSL1DLJgry
-udf0zSIYDldm/Wy4ggywd/mSyp4oWR3pJFI926CyiQrnA4fSxKrE3yI4Pm5kZNBM
-5fhDwtPEtp4F/7kLxGK6MCxyeL94x9QnZdp4FHyRcO3XCCMhfAKT3qLiuHpTiNOt
-mOu3Ea1DsEVbSOw+gJzqEZN2ruB8z9DsOxNxlLsdW+sSQRSNgErnLlBLlkXpSawB
-imhbwfOHKqZ6eoEqz9ufbrJjIkOEDbIbW93hpyG7zdKSkKsXLR9HbOZ7kgMgzPVi
-KNAhc7axmvps55Jx7aXP7G+8c9d8iWhuwD9MemqvhRKyzeeJAj0EEwEIACcFAlMO
-LVsCGwMFCQlmAYAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQ+bj6w7SBJVPR
-6A/9Gk3J6BV0IPuybnmxrkKUicPsIoXgRnzU9LF2TIC6mYJBjb3Tllw0kahsTwLa
-vfXEEk971zushOUH/z/wLLgrQ8rzJq3RfbvWRMz9BurIJYGWCnkkINr+lURV0Od1
-IzilZlLuCWCh+WS8w4sJuoziF71Ick3Pf0DCpPIte6PMqBWerrbmXlRfYZgP+vrH
-JZ6ZHUEkOVawuY91QRW5HKsM/8RDwgLP7zvXtt7BaVey0XW9pRVQM0fzYzW9wufc
-B9DMQeampdXv2R3iXVDQRo86zCRo+7UrqEpBGNXBNhWozucw5eidJo28U+76fWng
-7rpDrOPSOUWcg/IfWDrm+zrPyjX/9sFuyjP2w+/dsxmerYk4yXYOQaVHJYaBgAO4
-O11WsjhZZ0bvYgxqJjHs9WGfg7ZfuobzIK2Pl1ZwU0lAcePwuHTBTBFlI6wUxmhG
-KM2V8vZUMopxUSw3AE4lWZV756ST8Tc9cVVllBg9eRGHdFN2NKullRzTvLMuUwLc
-IGkL6h7VrPmQUhgjyHO4mWgE0or4bm7pHRjP+1D+dxTlr/OZUAiCMgxaBo749Mas
-zgvDqcxJOtH/9J3dUeTzN8C1RoKPQPv1znmJ3OgpOKs0cNz1qNIQGQkYasl4awq3
-nPz7QUqcKeZgy/6KIInOPJ8ys2+R54hFhOj/NUBBZID8EX+IRgQQEQIABgUCUw4x
-bwAKCRA7Ok8Kx55balZeAJ99U3htpjHcxLxLS9lkGT2+YiBIdgCbBLVVwOBCU7qt
-mdHezw/Xp2oxxNKIRgQQEQgABgUCUxNB9AAKCRCgJ0huCLbaUCjLAJ9Iht8ctGWu
-SiDFxodDIHmyJ2z8wACbBDGyGhDA5TVJphdJm9Qo1LYKgc2JBBwEEAEKAAYFAlMT
-McUACgkQsAucyC163ywE0CAAtVzeWwkCwf5ISyWjXosLnbxohXvmq7uh6bdTVoxW
-d1V882pi1UAxU/UZFhb7NSvLaz/hr6+WK0wldl27BF74d6j5rE/3r47KVeOEUuAw
-g/J/tLEfzhWtficG13qnLWyf/iTyP6fCIaFRNHL5PK6Br8xZHS0YF9zRHaCutwTm
-MHV5KinKktgA6Su7YmGwB3f1lirXxUa+RiGAkvg8tIs8Hn+V2x+FDD22QgW4FDh4
-CFYrzz8NsUiIkYawlIHQdnCkQqiFii7MZOG+EsJ86P0lfYbfJfxEY+4nI737YfXH
-SCiWjDTiZG0Hkvrx3qbt0L+Ixydn3oGkrfP+ZngPBj6n7QkALAUFBA34+cylobOD
-jb1nKGM32iqPx50GpaS3KH3WmqqXaR2+6SbUUdZvmwac6vQvtRRfEhVtWB9irXUS
-wn218Ki2EgprAHwrsvLeMJYoR1U9v1UvSrFj5qtiagJYecxDhsM6ozHmcB2PKdE1
-VkIv2vPRzVsfuWeEFnPOSOODsV1Zu00AfceotvAEZd+VdXNkJ3MfWEy7VT52FnG7
-FntzqDXxGkYZLxK6zn0Qh6udvRz65Q3G0nd+USkAmhEBMTr1/La1LfMAibyUyiyL
-0bTRHkjXQc8SpibduFzpcWyrMELVqt1PXgaqtujcjVoHwo00NgJIedBosHVuGBXW
-PpUQx2DkTnIUn5Qkncf8SpgCCGFs6Z3qwcqrc6Pb1Sg6XQ6GpMTYMZO0yaLdSSrS
-vl6wdiJAzvlP1haafInnNFAo6qgaGNgdiSr1r+SpYycFHORCdqimLax5ggOxh1Y+
-V5uZxDDvOSJQUNKO8bDfREke6gIsNRCj7hRutz9F2K566pu5Tn9UAiv1ZfqYxBub
-+mkjkctRw61DlqHepJkY1KQTLBphVM9CAADzWPKGRVZtjeYyLNPBap2GbciBQgzr
-/2UCCWAGraxpniCizgkFRPRFaOSp4p0p8DozR3/7xftLPXNgudUbRjxNlRX+uPj4
-0jSEJT1Yrc1/hKgOWvmP13WTbT9/8F2tT+Gd8DTLHa2pXMePOX/dPmF7g7IiEUo9
-Pmci3gFMd0MU1+tgjGZlFs771MZUBnq9rrsX6K5PcikE+UV354mTuF/GdL5Qvwbn
-7DQ0Z88FQ4jTatPucEghTLnO9ahB+5ZlE9ri5hWTKRMZNkX0KlCcgcNpPTJ9Ya3e
-vWUnuhPHmxq7jD0Fc8VLjiKMWSMMiqTrxdgit41ocZinCH54JKtYb41lsH55rx9q
-8crmWdsIKC/Dru7h0MXQW0iU92eMOxiCbXuwNqnzYxWkhjjydhUXmOcufgzfh9Ry
-S8zBC/rw5AkhmuMEZK9Ksskt7SvDPqdd0209JrHt+SA8G4kCHAQQAQIABgUCUxDx
-+gAKCRC9U3Jvvaau2NoJEACzaTZ8rR1F8+pIy+JdUfQxmZ80CI2CMCjUt+WieiRz
-3ZH2sgKqwx4T0c53n8938cwXmwdh5xG17sGWDS8VpXUQ3eq8nHPbc12zJFOWM+Ix
-fUIT6zapz18m9x4BjfP78QovU5OyqeE0KtvfwXNvp0OjdoEs70WCaGdmAAcpOd1N
-Einz71DOtDcvRdS7A6jqUwfohemu2iPGj7gvUoykb5gg3Nql4K1zQg+Ymo9RH8Bu
-MA+ebOvwaRaozi9q1Gjg5erXsN+H9TivoMwRiAHdlfeETuGWTFJl0EhtXMHiUjpz
-fA6UsR8LgRMehar8rcsWRY2x8oH6L7Wf2JLc+XnZhAe6wKij5BlbJrJBZc7FcoMJ
-KqxGlgLnMDXL5nmHfaIxiJUU6qe9DSRvGyMB1rr9xxeHp3s9DVR8G6Zaub6ufa7k
-8lfCKbJBru5UD/FrWPMNztiG8fgRg9krmU41ZgvhT5ksZmH5rcFgK7IOowiN9Bxg
-tAclbURX6uNc8CYmWVkR1f+zFS2ChPEebyK+R/VZm0WH3Rz6tacWUtzxr1GryLUU
-wTmxGnyXflD9ySAkjEO60NdwUpofeX9qMzza/sJPpxZsGmy3PHByS/AhK7wnPSlH
-52o9BTVqwY9b6B+oOnswjccgoNyQmtQu84CnGlUKG0y40ho3F1DCHH/l4jrYaxsY
-J4kCHAQQAQIABgUCUxHKygAKCRDABX5xTWlPsl7XEADlAVK6EiOs88azKcH6h/uY
-luxi8F97MOEcyjKrfliRxc5Wt2Ry417ngVelhrIzZPoUi4iT8znazQ+GQWBHS1SY
-51AEqPN0wrbLpMnhM7cHOZ+Yh8za/G8mIpXCInrsFoDsGTm6jBuwhsmD80HJ8ctq
-7DTxrxEfklPuKmQ0ZgbH4wwEmTeU8pzzLlBe9yiDOYVXscG6xffPp6Jml+H2buAb
-B7zZKD/yXuNKgs7AonMLrA6d297wslMAZd9lZ67jmLvWLUhd7LGaA2xVNO2+5yNx
-gMXrdL0wY6NdUY+yy/48b8izD4Hxc0+7wfnZgeND2tgg3av+hbX0sRbIoP7uZgrl
-JKuYuHpgmzQ0Y4eoMklWiWl1o7A8d/vVPuGSOztXUhlQF4nKfEAyn9pFyu4UXjfu
-NueBTQl8Hqii/wN2nMk9vZz2xFN2bnsqvIhjnMA2yoQl5bs576yj8Rbji9eK4ZUg
-WMAkuOkB675DX5rYrXUnDNo3aBS96NQG4CbG/jaM5i0a+ClVg9tVboGksBJZRzUs
-lUQxo8AXS+h74iipJrokigsrq20jO2t/WdxRdxduXu5IOs+hB6ae81JjjHjTFNDu
-uteDnnLNG1dBfebw/RkH3cjp+lsvnAks/mINStMoPEH7/Obvzuku32UvAxglkY47
-QSCJfS4QpkD4G/NUvNFhVokCHAQTAQIABgUCUx5jgwAKCRCtltamwB49Z5zGD/9G
-Is/hfe5iQrSP9NFNChQjaeafjprCMfi30glYsaXM3y2rrXZJh7zKAvOhYcZwbWK2
-+9meRzuMX2P2iG3WZ7iyaoPALb1WpPlSQef34g3SJRV1UDVKwYpkJSZCsqIX1bhB
-sr4qjY7pN46B7GX7RrGl79qDy/CUzLciJ1bX/BiB4L3+ls4qrrfomO3+r10ngqzT
-MMmn5hjVWE1BDcuViKYwhW0u/HcTulIVkIp3+Vs6nX54d7nG45YHdmBeLPA5fEFv
-Xe3Q3Q0YwK4r/bZwEqlg2GVg5npYIB7SB7MbU1znuHJvyUpTeO0z8lNWjYjKFedb
-YmO/tQSoJ82GQt9HMaENKxKP4Tk8Wr3SV3y177nD8+6jFWJQZ8lqsQ/GxZukFWPV
-0Eo9dRsQx5v+B5h2213hK4YcOhJaiVtBggUodIKiGz8sW89V2L8EATMb3lAJsvPu
-FiQkuQDOhDlbqAj0yQfyBxKmKCHOfAJ2Q3aYBhvFFXho+DBnPjS9r3QfL1z3UYNc
-Y8tCT9Um+MX6h/2iAodpxtu4xqHd2PavOxLsOA0IFKIcSNOp731VaMPdptgCOoCk
-r7JL7PrH+7QwBPQzCr74rQhiTfuDd1vbmgJGm/D/MuPX5+KemVqOiE+o6xotCb6Y
-KqAWu9CqW2m2L8QuD4hNR9NV+StJWmmNaCoOOXZQXIkCHAQTAQIABgUCUx5k3gAK
-CRAObqOOk0fwLFbMEACNkB4OlOW32GFzalq6uf2vmG9H99+/pBiKyGKvc50obLwK
-x4g8RM/dH6zduHUZ/uJJ08Qvx5h53JVYPOdxk7cXvWVnFJXRQNqgRotOLj9r8Hpa
-Rijh4GrTDXeVrNY1rw+Okw7v2iyNwWQDVOkAzrg/fZ5cZRp9e2Ti0cN4COcGJVQJ
-lHYfa13GuiSUSdc2OisYiQZWXdT8SnjHLb5cL6GRgmDDhOC/FISiu1L+LFIsyXoZ
-9pzFY/43sGTmZJjFnudoxEQHuXmbQZ4Z6o0yAncU2bow0QEQQ/949z4GHNcbXduz
-eXBWXO0kA6z4Lu8YLBk9ihrka3kw1Y4VtvIuWQDuLV7DR/k3/YHZzUUvzGH3c8Vn
-+DTK5f/dp2TrK63Py+x4/7E62V9uk/VB+TVy0E6vic0Tk3+KMGUHsVWGZiYXYnso
-ZpVw7/2vMmiPxai35RMe/yi8r7pAYrQc6su9o/WMS1Hxhp3VPa/g4S/mBfk8jse3
-tHof6ZTYAG7t3FhxVGXgHRYa0nnmHf9bLtNOHrAJ4M07z1VB5wMkFJ491nf05oVr
-cyBA3swvliwAilskCfJFFy1yttnOlYY1hLVq7fUAoMfjux9BZglXlmCPp5HlaT2t
-rF6VThREOAI8/Es/zrYAgntLuPFLJcYvjqPEChttT8I0H5KlzoSMfHZybsyW04hG
-BBMRAgAGBQJTHmQGAAoJECKBkcFWfiwXbtEAoNyetrXS29ORsTlasGUPwumYgHaa
-AKCv7Ky87jcPLoQHLp5ugFOyMAXKc4kCHAQTAQIABgUCUx5kQwAKCRAo9QGWxDgC
-6wDkEADFhTXNCEedftkHSLl6GxWCGEi1qI418U+cn01hRCtIY0nVjzGYJaxHamtD
-2cepVSDDdIeXj9C4mcy3na0/mME7+H/tLuZiOv5d5rFIIK6gODmE/69LrCGSLJL/
-1ULCQMqQ8IcKDEkZTmStEKJZPvE/lPmfjn1XGf5gC8zbTg59hN6op/bRuQpQHsIi
-LNn7jEW4X65Ygig/HcRK0Xj6iTEjPc0ITMthLPG5XHUjMeRt+syc65Hl+Q18zwsX
-i6bjp/DKLgDUdLvmXdBSxmsDZgZjJtfE5C/C0Yom/VpVesXCWCZqe++GT/K95dSq
-pZbu0DSVKtrSTqglRJf3gPeVwQUFixjj/tynZHiO/7cZq0pazRrX2qM2ZZB1hkhZ
-VkISzBMUFC8YPkbVDKVYisyUJLdUEKdSB18RcX/ZxLUOsYTo3CsUIwoTH6aL4yQB
-C8rB0OkbJeaZbU/3dlHnycAas4ze6hzvEdiYyb2jrg37qbJwg0CPDevsNkLu/Ie/
-6BqqXcLszWS52aNcyLMPTpjvQIC2gV1f450chsiw9yeMUtsgVFXADO6+8zM1io9B
-1dtEjRXvaiI3jD/jqV+g8TV1i411NHw5sW9c/Jx0UuXDa7gmb6+6VvavIHCF0pLL
-FKUCMmoFePtp0dvdqN1Ysv1RBn7GKl4GGImE0dh5T8pPlXc57IhGBBMRAgAGBQJT
-HmRrAAoJEFk2rKVTkFoB0E0Aniydu8kZjiaob6/OT9hYtOkLaQRqAKCD+l2caV7i
-J/SkLCBgY2relojE2YkCGwQQAQIABgUCVGuZsAAKCRAXscp9ZAiVKMxYD/iZPK6P
-qwHxzEuQjquo8f9f0q1RkX4AZa1j5hvXcqAddUa3HpihHDFnW0UDpptlyonryxUE
-imhD9a22/eIsCz4sF8gAgrp9b1gRBJmJMvtRgVHaFn1u02/5IEvRj7JsWgVXzWFU
-yh9zLaiQtcpfvfFzmdZKtZ3hl0TGl8NFMLxUsownR2tx0iuc8r+NpzzKpxQeXlYS
-98DrDLjE3AKVSZcc8DUBTlwhCZLiXEaQjAKXW+Mxfg8C2E4hQIAsqLWhj8PRQEpG
-w9F0Wdrh9w4ePsKKnzsIaprkRve3vzEuDLvmHV+9DQd/sh+C5W1LjL4h+vC0eXhd
-42lIWrfgOhai2rrwgfSNEFnMAsB1zdWcwMgVSP97sSVfyrqMlDJWXuW8v2KR36ws
-zZnqVPsgQk0Uy53mItUnWblgabSb/udVa+ZI6NeOv1bMGMgKaFqXCn6aHD1X1/E3
-0XtCy2dE6reTAU0zNaRc9ZJOLvxJj8ymP+pUqzkvxLMWAuqpCKsM6YNFlCFkzdfO
-LHxhqGp68jKPUfuG7z6yRkgDZF84k55SUK7td8lHmJpbeiL1+N8Sm9CujQ+TEAbA
-ZFAQjonwnzXWxzI4N+1TWM8BbhLmFpG814JNxyswYdmps6pdKCWHi8zC60dYZ6Mw
-IQZfNWpkeLh7W44NuSJ7pIXuSfEaFCKXX+RwiQIcBBABAgAGBQJV1VPTAAoJEB7i
-/Oc/14DWS60P/j/c9/0Fi9O2WsDjCqHge7pAt55/CNiP/ZpVY5VFJKTuWOA90+zM
-cLz4By5jUDMz3W/CQFA85Bv6sEwID7ClhahLg4UMM3kn5YyLPIpXjT4i02rsLqFU
-tFb40vOlJ1LU1UdpSNVJP3nDNrrg46Ialadycmc1jB5EnoloFC3Qu6QkxcFyxJoR
-hDkrU/QJnaWc/6ln8UmLPkVspfXX8PPoy7YcWzS0e6DXc18dBWCigef9tJe1p3B9
-hD1Xyjnd/oSJSkDJFcdD+8A+zdRFqaLNQx1AZJW7UGBNSbaQN9LU+0DSuJVeblU9
-Oo7y9YbemAXLMeemwdkf+EaOmhrtAmfoVMXKyQpE80wQxGIRQC1qYwGgzwwPodsW
-yb+v/nfntWEXP+XJFJlcHKYaWClsyd2sGl0WASBTv0VesElYa08lkS3/JEyiDhZx
-U2N1Mzngp56P4P7hTGCsKHQ2wKhL1t+ba6pc5wqdNNJEICZmodxgJuVVLq40pjGB
-qs+93NZiVTaKIMBZyhrQ6R1e9KoHOSCkh0izCPgsBaiDUno7zU3JTBRI2wB9yQDa
-9Hg6flkLWsX9dVn/DPz5ZreplOSjjNc7Q/mGjCW5EdJ+VmfQWSyqBhymINdNYAhU
-q/1cZKR6qFd/khYwUvUikXh/xjj9f1653o48R07S6VKy+RLRPjlaI3xYiQQcBBAB
-CAAGBQJWDon4AAoJEIqviNbYTkGu1uEf/3scwbutNTY3Q+8vAAEt8z0l4Cbtodbt
-m8FjgpYGTod0ZaoUGCylGs9/TGO5bs/yC1w0el8NGlSnr3r2NgYlXXTTyRI4HPtm
-vwnYRrC3IEnHWFcyjdgoNwhR83M3n3Pit7OybAlXcm4FrdLZXvjVxrbbzMqjOW+W
-yO3cBhVxBhZvIVNeQcSxbZJVJJTj51+NFfTUewkXxZf2Rk0iuGj1I+qcf5x9u0Zd
-j8dY4s/BTJ05Nam5RMx6buKUqWa7ob0rmRDoNSs8AWEYQ6bYK4OXa5jba6DnNHwu
-CuwwGDeE5bUXqqr41GHk+ACjvFN12uO0O82gIKHTffJYVK6iJC7G5mHSteB9B3rS
-6/IRpfRw1w5RX7sDCkhFNWCkHeEurect0YjVBwANuT0nWgGlNEwgrUxRBODe4mwC
-c7M+Db9OQGBpeLivGVa+UXBUf84sBGw61zmqKJJ/tdp0XlunEsNr8btcRHKg3t/C
-v84XjxG8MDmWdizTVN1qF4NCrISrb4N3rW+CbSfEtLhUAN4r/1a5J5DfVAAEDArt
-S17B1zJl9umiQV3nH2r4RImvHzWRnfH0rPTM28XxeE5lDglxD5GHWtNF8iwPboSi
-Y0CTIocH7Y4SAJqYm3c/gUGyUBlddsJK17SBzO6CWt2bguSQoNvf9O7Mm+/V0n8F
-BKyWgNidyOq7q16RGv7GV4peZxLgIg3e3THLtKgV1FqnaHdLuQ6vudTEzfz0s3tF
-GsVwVhUSQLW5k6dDFvE+zdygULUgRlWGeWteITTLiU0jHlRTadPvU63zf5kkl5sQ
-/xLpLHAWoHiPpSd/DdlLMNJrKFE2CuXGzttV81+/Cd+jY38czD6yHy5nho6awHCP
-NhWKCrRIRVKJ/Z3mhcwRRQ85ro1yzD4G4QBN+lEU0Rm8uqvCX7gywa0i6zMRw1L1
-r4/VMS1PKe5p3kJnJgZ1jMa1jd1Aqg/5WwO9by0SF85pL/2AZs5ldn5XyqsbNxXg
-VEh4XDJqecD07gRPtSCoM/uTR8Ns6lMkgstNNHJCnv+BCKN9A0ACwTvLrfGXPW0c
-RTDDBz/KDL/BPU/E52Z90hr0qUDgI+CZF429+y+DFcdnxVkth804pgVpP1x/DnGL
-bC/teg8HBmGTI1QL3e7j5DrLHvLfm+VV3K5+FDsAN5bf2VoGHsCOsoLWXdnFJAiU
-SVVsKRippiiv18Or+taPY4pV9IkwDnktXvllcpZr7LAsCnltK8L3flh8/NVt7eGQ
-APFz+Iw6tt+zaN7cH32ntfBZCZGYJTKZYGoYesRYVSf/tDqOW2w98OPtVxyq+h/L
-pSldmvWRxS5IELCc+FND6TxGPG0VI5/5sooEimZKu9EVXwhXDnj8TnW0ikRhdmlk
-IE5vcnRoIChPeGZvcmQgQ29tcFNvYykgKEkgZG9uJ3QgdXNlIHRoaXMgYWRkcmVz
-cyBtdWNoLCBhbmQgaXQgcm91dGVzIHRvIHRoZSBzYW1lIG1haWxib3ggYXMgbXkg
-bWFpbiB1c2VyIElELikgPG5vcnRoQG94LmNvbXBzb2MubmV0PokCPQQTAQgAJwUC
-Uw4uPgIbAwUJCWYBgAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRD5uPrDtIEl
-UxNfD/4+qee7EHu8GmT+tJ66cSZn6qGzCcCqNrMMt7uAEA9lcph7p8h0G7Rxmk9z
-V2qUpRjuzs4BQH96AXqcdkjsix7d+rU8mCHVkpce0m/m0N0gdnsfrwf7V/4nE4EM
-MAh2FuvayiCgFGR5jG+oTgfihm3Y22njvhOFThEdSMdohUzy46j1/bG/LSEJQZQc
-+z2UzyXb3cvAC3BMwyq6dTPBdBOddxm/7gB98GJHjfy7UUWLNErGJWwVlqcBZ3Nb
-gSzldKl5Jliyqh9HreKVi6SNhhFRiOq0A6oKHfiEd1QKnZ50Q0bRqVKMd1535PUf
-xa0UBFOKHJvsN3mgw/XADqkjOGEpeX15IxeqmYW89usWIPR2U56z+C5jqybL7PRL
-cGV1R76+oXXyGEgekgI0+s9zfnhWDSGCezHegcphwPu4wBL+8ms5R8lX7EVKPJId
-p29f1TXQGW/2XXyy7ZsBPuzuCjTh4SV4pcnBo9VphlRVpYWZ31ZhrLQag2DxoqOR
-7sWPxy8+GaGfmAeVuPr0EGi3t41wcsQBi+GOI7mQEFhGfSyQQ9G+DFqnB10b71WS
-lhaLfghfuQLZzXJpAC4ZAKKjrjWiuJsH08PBTaCa+vkvvRd7GTF9PomHwvdC6vSB
-ycooNG6qr0scAB6fXfUOkv4G/aqZi5RvbVzLUlhUEOlufuPYCohGBBARAgAGBQJT
-DjFvAAoJEDs6TwrHnltqa2UAoLdEl0H8Kx3D6CdsiaNahUaz4TzJAKCl4wN6tADv
-Y/LhKLqqCkMRYWE6EIhGBBARCAAGBQJTE0H0AAoJEKAnSG4IttpQlc4AnjHzmN6G
-1BWIlXZaa15G49Cb1orpAJ4sDg2ZYQtajVf5h7J/mJU8feOn7okEHAQQAQoABgUC
-UxMxxQAKCRCwC5zILXrfLDzkH/9LUrAoIgoCWmpE/jH/zXlu1mUMwWvW97hWQWhK
-IICJBO2t5iUqq3ohryygCkeC9IWYIWjVLSrbbWiEiVbYC3gFUpRVaqTCYTMY/64i
-YjwnON9FaR9m6TJfBi0BsNpoqfqcfWY/yAixpXdjmMzuZx9wtlWmJcT/5RW+50aO
-LGic3fsGyAdX72Wn8AUgyzSsf5iXS1EWlh8BYIHA/dlU7PI9u03WBUpzctcyE84F
-80b7uScXMjVvR6iv8T7S89dnilkSSdG26WWL/3kwTRaTMVu/PR/HwBUBhaQnK2oM
-X+AiyOIKrkU0BhYD/sJPTk2n/eDkhtNJx4f5vLAcD8EfU8Z/7Nvx50hGHMqLsZu1
-webSQdKJFOcYSEOrLkVEPLxY4jjcozDWANXYSFLrs2zigxraDXRFmLNMMUiFB6Jr
-LEziKtjPPQyZa+vhIwL6NT4fXjQzHMP5V5kJuk9MGAWgwBlXlE7hsboGI8Vnhsoa
-Rdoq15ZxHZnrGTIutyatXU5DDq0oOyWpQmciBuvh5DLw+aApn5ZmLuLfRhlTrac7
-PMrwVGAFzFQtsXhAXcv9PbzasEzpgDnyl1sFNBnxFCbmCyXfOG0gLktU8xgcC2ab
-11ClmCuutGEljMk4K15Im4iHXW9srRvpMctfePPJuaB561wHMjTWBdICGdzNDAmc
-SO/FEDzhuWTXMAVtnIiPmH35cacIsaa6lhfnIqgn4hDK88mfrI7VxzWAxPfSMIrj
-JGkZyr2ykMRPEH2T+gK1he7h1vQu+qEiyJViEHOFrnHjhbHA7KycwJVxJZKj1evg
-eTJxvGy3C9lWtpP2jHL0AiMknplLye0I0ZSh/F5I92iPLPoH4tdeuA4/GHnIdUfq
-8N8VDOANMhJM87go1YG84zDYheFxI0pnOaTxRAE4dMJD8/K7nZJv0wM/x3yc8J9X
-FmOI77Y+m4metov7OB4GUg6bWYsxl6VglfIoXtuQTzJ5oG2YJHpuCqlGwgC7D3XD
-FNcbT8HeiKJVbdZeL07rXXJwXhi+OUHlugAL23tzFLYxcUUTvlmHxrPUu4SSCr7+
-kkEJ/i/4hfGsLeTHEuY4+C7WI9W4OKC+JZt+10B4tD1uxBJC/SNH7+MZDPJCWXEe
-rlqvjMpQGHFGWR7iMcYpQ5LJjOddDAIaUKC8pYtpjZYyOs+6Hm8BZsMpG85GW2j0
-mCv6lwPsfwezXfzR4TR6UFxi2Uc7SYxJfrrJyeOE1EsrMxQdkzD5Q7aaFRXT719C
-Z8ZHm7j33r66yK7SQvb3HbTuAE3tEoNnT9dW5TNdoe5LytjR+G5KPYLVYhRwLLyx
-O9H21bOewIbnwaw/31/KWu8G0qDe9MuOzIGhkWx8PNWaO9W4iQIcBBABAgAGBQJT
-EPH6AAoJEL1Tcm+9pq7Yfw8P/j6DiZUpyUcohyuOMq+YHhjuKo5w14j82fkcHynl
-XPX0B6RgNYFslf4rE9jHum62jl80BKXsswAVs23Y9WY0nbAE7cO51rTB4eigiIQq
-bxosY1bDYGNBiTBMkqes7sTQjUWRfE4HJlB0AyyEgu2F9FRn6Mna43IeAKBTbxM2
-g9JReCl8Dl7kqdAXcsXRi4UUdKY4WwICYw7nD9VtXBnG+yP/QIxbiasgGMG9xHvM
-SEMj9x5+HNdxTQkLqU5q7Jxrs25izbK2paoHzfA1dDTMFkjxf6UHeay0qfWR0Lpq
-NF0zhU+fb0eThvGqJFb0iMv6maeboFaJMlXcbeCK+ny2xu0jvuWst8T9FSKcQ7Xp
-AkKzShRyBjbWfRoVpajdzxUDtOGsC8g2LAfCJL/kLkV+l8jNQFw4lcxqqZF29Anp
-SvGPpH8/3amPh1lFiDiIkWXsEnxV4bZ5wdoT93lUH2vnZJEK0IByR4sNSYPr3EXi
-TaRinCp/0WDA/k3oP73NmQvx6qi2sigR+tzh3klrc/n0ajdPDo/vXnIhLJOs36q8
-dIKcfD5yJgQM3px9V6iaL3epTnbTZlggYMWpbNihj0A7uuTYIhiS6XXiN6rk2b7w
-RmO2CGD7UAOpLTSiOiot/EgyY0oOhDH4xvY9FSIlhsDozOxfkkIOTv43mBHXNuuq
-qDWBiQIcBBABAgAGBQJTEcrKAAoJEMAFfnFNaU+yhjcP/2wNF5GVUYGJnoVCSFFW
-O/lW/XqZ6/T2hEeKcrUcMrqB18471Ra+xU2iLupOKWVjt2ynhsCcW+67T8UbnxwP
-QsOoniDMU7plGqVS09VPXjlJq1Ri6Fe/XH/6kAruYihWd0y+mVwSM/6YmXZHYb+k
-ZUN0lEn4BLwwYto75JHkhNTC8OWWDauvsdOfHC9PiYzMqjMVaUzT1wUxTUtjKyiH
-tgmXAwxzISvs9zsP4byvopJAkDY81Vx4IgKIS80534GwFC4S4BDeqcF9DYevobJO
-2QYpu73pvwKNX5TZyF8EV72Xa6VWG03Zf5HAtW5gcUGKmD2g6EtnZweNNI9X3r46
-Jp35RimVO59CmG6aMdrUV4fozWWAHtwA3EF0ZtjxkVzTC1tiQIWCxSNIWVhLgBtV
-xOt2VC8QrfpaxA4/W5Wz+luwIOAf50q1EA99TNKt7yCyXKP2ga7KqdOwjIKlq9Js
-vT1Q88HFARSwB2W84KynwqldPj/gNFwm+8xV4G1gcesTInWgh1Yl3nybhGWzvUK5
-zo4IlBiQsmpaRsW16ACuqhVgRc+NcI/TMGQZuWxkormjmv2bq0MNvOpqZKDQB9CA
-OFu9Ya2M9cuPjRUH1wgnye0FjK4UA7riWUrWpZLwGUJKKyZbHsRxWlcive6YI8Yj
-9prj9L2GV+sWo4aZnL7X4/WxiQIcBBMBAgAGBQJTHmOFAAoJEK2W1qbAHj1n8o0P
-/iRTZ+tlSSXYZcX8M7nCPzCT72czzOSGoLoEw7yq4m+I1bQGGXg5jiPBWOJqxjBw
-+mkPJlZb1YACmsQIIju3z2Zu9EL8HooiX2fnDqMKCD+MAhNn5hqMEyZnF0P6bwFz
-jucOneJC5uxYzOW8D4454lZzQWeVy/j07OlpTeAAPnZ69lPKumNEnbOSCAvElWak
-5BWaod2D8YaJwkdWRKhh8PI7UgCgBCTM3U5lEHH3zXFriEIsgXwM64ELpF75KB6V
-Vw4Nh7Z0xCcNC6GB96gNM7pFp/ZQN19hxXW1sRnA7n5RXWw9tGF/K7Y9ilNhahx4
-M+7xLEpNEVtIalfxnHbQ8yQuw9ivz6JjhVyIs4nbwIrCihTqsab8s0ZO0pHKZ3uh
-qUeIzgMn/+9URxnc/lfrrrJNuBnyfxSL3koREZKZJBuv9VuxOK9Rp4vTQ6fYjEvz
-uP7fWCMAL/zMb+K3/l/wxGjPIOXZHaTTnA9m2Dy/jxC5qspstHh/Mjl+VX0mqZzK
-fpMdJeZQl+19j5wYcyT9LEK3OkvjD+/tPuecrMPs+5Y9V3soYnQDvTXbcDmZvDUq
-9pB8Qmi3BbxibV8FoW/bUD6LPsquYaRarwjzIWmIi6+NMXnp4kunoAzpd74rubG8
-ImefzTodPWp7yIVGvJsZ5oaguPUri9smfEWhTXC6bkmYiQIcBBMBAgAGBQJTHmTf
-AAoJEA5uo46TR/As0JMP/2K8PauF88ChDkpKRpd0A8e6DWN1iRkJTIrxcmXuEzXI
-UrBEMSOlhk5vkgBKjYO5K8HmjKzWV9ZpiYzQuBIvY42G+l2ysrbXL3R0fmj4MzzW
-GFVLEpDK9c6aDbgbxcmtyj7LTfWIMd2yM18kfkf85YhNOoq4MqZ5xCzdnjzNMP1W
-vdKSZWVa3Km2VzX0nOEzkUtggfdnOjWqYPIW0xbuH4fVGSSBYf4QhC7Sgt48Q5OQ
-o1xmbx7X6qdyBOZx0fQtCv2WidZ1HW1vR0HTQ5RrmmbMVpWqYAdgj8aZQ7IQga6I
-ABvg3klhMrERkDHEQuRpNtWEabOHz2aq3224UjCMPNj2+CHnQQz7tdA+qTp3CbZG
-5/FTdv+54RQ1DJaKPc+gkIFlgTuoKwsvybGT4osxKayaCUkHvtMmbVcTsLjcIGlN
-cy/sxWeMiJtWnopV+wQy0vsD+YYhJkdbG4SAbxXgLAz15dTeOdV2DrJe9i7Uk3/v
-6p5s1EPlIb1rvWddBThsSw21iwL4VwXYGELgmVYwTfY7uRG54GsbbQ7tSVsKKk89
-0DAQBBbioc+U7s9CJzcCpSa+nmi/IDHMzBeSQxgM12jnx6H5KuyLS44Uxc/jxsFA
-twb9vX88EpdpU2UERk/LHOjySnsOHf6BUew0nTwdxJJ/n8TEmDXXXBOpUj2BESN7
-iEYEExECAAYFAlMeZAgACgkQIoGRwVZ+LBfDXwCcCE1Pw66YHItX96ADCWi+7jHo
-H14AoMNRBrelaNwfVEMFCBjnqexGY/d8iQIcBBMBAgAGBQJTHmREAAoJECj1AZbE
-OALrr1gP+wb8XGlTavHxqOENZGi7tLpWRw5z0uqg2OaCSWoIN1XNilvQzJN5hAHq
-2SSsKsfRKJU8CJXTnzZTUBLmK6OjEESh6pQshA4I6O0OxQWlRKJYEo3vlvhIhAZ1
-SNlFKVbZakSLOc4h7D3MWhYWdSC7Y5rqYIcRfxEmvmGernjXGbBJqGfCgsLs7ZnN
-mO2yehLQYLcjY9hbdFlLlVvaqEYy6vbd4YzJyrG53o8BUv2wet21oWmRd3FFNNzF
-2Jwcxhxrvzdleb4iTKBBN8DznR7O3YR4XwNxhP+vdDR6pMHGBMRok5TIOh4MBtpl
-S1LDR0QBw4TnPB8/bbZZh1dNp4YmPofJnLJbf8Euf1Knx3OxzQzEjONJNaKEToPc
-qT0Vcr4BkSXic/NqHkaggDtBLIQhCxBY6OFxTpDjLLUAKez7aeVk/YhaxuiUgyB8
-9cKkZPRJbSUXtsYi9HJmd12e8igo+Lm6+2j3Cirpr7oIPqsXuR2DyPbqaPFVzKxf
-RP4CNvYNYIQCNgVEG/AjTgctlPijClVAsswTR/wYg64jp9iAZHidctv2huu+NTZZ
-7f/pKGq+YPI1If/EnTmoiwZ6a6GKwCTtFGtk8ymEHA/0GHG82WOPO6QhZ3pySQRB
-7rUOLGPJgVxwPtvgLjNOFF9uq3Avr1+ZQ9v/DOzht+o/BTZVq/rJiEYEExECAAYF
-AlMeZGwACgkQWTaspVOQWgF41QCdFHvQARQXT30+2UboMa2BmersAksAoLx085Xb
-vOExlzwn4qqB2jsf4cTNiQIcBBABAgAGBQJUa5mwAAoJEBexyn1kCJUoCS0P/iEN
-xgmgMxAxurVoClx+XcYMOiFJ2qmq4CKAY1dnUOONVwh7T2acRH7bR9k4JgzB6bNx
-zOqMyPs4H3rVsrJkbhkNpDre8E9YhrhnWXy7SeZCnVsDGXkFgacV6C4AiByfltAY
-3wQbeC4QQ6rPci0Mb5E5fpVSK1GMlBwBz8xVi+TcXt+WdG31aUA6WwExb/EAVpdq
-aUAEAfb4g9h8J5l9YSWl0OXjTG4f8wHljOxoGpE57NqQOH1HXvZKd5sWCJt6oEa0
-jBpnUq+e8ptY+4Jlln8O7JMySCEAqCntTbya1HbFnS0yxPmyNeBlMwOhydHfOSAx
-4PDw0AKlgPdDkYRLlnZMiZdfM1uJGWaRxlTBIQSFoPawbafmjbw4eJ2dSr0utGN9
-PuofXLgKFtO+kXzddTns63KpcQNq/xE5EDiAw4qjIt5B/k8RzhCGlI5s4phP5pxo
-mWlzwjsEqCPL+a6o7+ZaR0pEyQ3CaUAQ+kjXrWATYttF93hSq1qKRVR1DMW4SO3S
-w5+rbrvqT8Obm5szHVc+4X51L17qTA9R8uz1tysjJkeuEdbHSdbsSaD8ZWy4xvNp
-ZhLEFazk9+gyRH9+X9uDgg3OgYqJaXdbpMBB2BjCXPOU5LLjsRNeOyTR5EAjNvA3
-wThKP4UdSpYEBWr21TUY7JxZo/73ma7FnJBJNYoJiQIcBBABAgAGBQJV1VPTAAoJ
-EB7i/Oc/14DWHpoP/1YA1rfaNWSDN8E3sc7oPSwhA2cd3dwgot7by3igrU06JS6N
-ejpwVQ4KJxHYbzK9qZ49paJsj+fKt09Vc+Zzf5anHi3my32W/8i2fI5qdcTaFk8r
-nmvaBBHMDmxfvOm8cb2qAH84sAGSuku4GbbQ0x5ye0dSjL7odViOunAk5kD9d2rg
-ZuEYYDQB5JypWpCRf7CQ8sT4cooed7kN7WlI42U7rKXmUkunNuvuPZVy6Q+W1ZiT
-xWGI9y2m0hpJKhANxukoqEcZuXWFGx6uDKjpc51YDAe4hMORFP92sWslL9+YMkor
-RYxJLa8NZ03f/Arlzi0zinUJBbmr1PFgJLWnqIOBnhTBpvLr0mHurQnUzmCl8LdH
-cGVDGQrT8fUr4WqMhQ+55RxiCFJ6cp7A726l8TDD4V7PzfwVx27lTxShJe6jd5Vm
-vpxGQVoyXESox1kZRXU1WKnARHbs0dGA3Y5WcvkfiMgL93+gUfyiX7J7eafr/fFv
-NpXyVbnG53zR+lnH+6MPX9Br9Mhw/PjTAQZxwdlHuie8m/DB7Eec6CKdpWDuMTNw
-a/7z3kMGc0Sj2HAyKLkjrswB0N92OMgiJyNFmZtWUZdkefGQGkbY3XWoaIVYuG67
-I8apAUi+HZMLx8OgrGA2JkslalTVY/ZKEaIh6SVeib4BbxHoxvFENdDzHxUStDJE
-YXZpZCBOb3J0aCAoQVNGIENvbW1pdHRlciBJRCkgPGRub3J0aEBhcGFjaGUub3Jn
-PokCPQQTAQgAJwUCVW77SQIbAwUJCWYBgAULCQgHAwUVCgkICwUWAgMBAAIeAQIX
-gAAKCRD5uPrDtIElU902D/wKqTNBOGlLH9tYR517p6z4Na9XOmk2LDAz/LRfbgRs
-5tABEY5zrQGqHQZycY7+gCPwOvlCjO61SYXVmIRFf8FIFN1C98YO1aPgjiN/utu6
-wWiq6UXwQIBaOIXnzEuDrns2lW15XFuZEpO0uAMfsFFNoKzGCqO3/aONZ/cuE71C
-qiwNgFnqLXT1pKA19KtDBgdGLSpADnRinS0ukiju51yvcY1llLvUyEFLB+ybA/S0
-QGEjlZwOSBFjQhfVUamBqk7p/BGoHY054EjndqnjJmrhGFzZD6RlLS/ZSqD/jYl8
-pqysrOGQvY9Aj7R3usVq2Cwjrne+Khuj1j/cvTwmr67qy3SG00ujdcfEozC9XoJd
-UFYDqfKU4aMufMD+xGSmQrGFInXGS3O0+ufTHt421xdKrq1lNb64eZ2Nd8vICuWq
-AhU7Gi0ulE+MjUkBxifCS/TQpa1WrOkwYqbDKg7VA6d4cTnbFuHH/J88Eru5kdde
-0xvjgd7cJ9kzQl+HuBnBW77qTlZlO4TKwEFO40vzrDFtIHA1EHIjFUvrgWLpSx29
-vMTtQmYWiHKB6j2bJlGAosRiOdZ6WWxqgSSAnU+zVFzPI48ltV5TQ9A9Zaf6lWqq
-OBDETrNpG74l9W4zIdAzdKeajK5l9yIJWsl3gQeH5Ctyrh+vO8UWaQHux3HT/8mn
-u4hKBBARAgAKBQJVcC7lAwUBeAAKCRA7Ok8Kx55bahHvAKCToUw7xgzwWERRuQ/S
-odkGNYKeIQCcDeeCw5UgRXOZm60QKU/C5j7xGvCJAhwEEAECAAYFAlXVU9MACgkQ
-HuL85z/XgNYPcQ/9HBjF1ChWaubKJkS/pfo+I22aPEClEqyG8lJXxQUq1V78VS+i
-ZFFztyRH0w4RezwD/5j1/mYw9RjTdw1me8y+NgAIKfKYzAR57V68vjTzAdN4jrl4
-XixWUCsgMyOxKURtaMdDqzpugBsN1RhV2Mo0tEGiQF35vn6dY/qAOkR7+jyGZDv/
-tLX7qg/+5XaRydbvhuR18xO8mmbZizVSUZLQeZ+wi+65uvFRnyJ61lkR3UPl7Ch4
-cFOIZ08Ll1NKhnZ7d0/GUrByouiwGK+N7+QaKZOCU10XIsHOOV8T+1xDzJ/oXGnK
-Hr8tKPO2aSvURsG3RM291gQZqMjlp/fYvYg21+CeP4AydSMkYz1SPH5QSrax1Df0
-hJ4MkephCD2dg3IEcyh0aBkvpYYzEvoqHmLje5aAtsI+xponjrlkWG3Af+QbR1DK
-j6AbquNSvOeJPRjS5wB/W0rc9e+tVWK0nxdUSmcl/jqnghnIxcKkgK52MZkIBysd
-ykhLjsSZs2lJ1fxCNB/i8dOn10rMO+YVbYQa+hARSnpNcwLL4rCHk+JwMJ4+Ol4Z
-ssfMiYPyTrPKBIRXoJKVI8s7DxgbnUiKotfQnnAAY/CG7OTEEBfgL3WboIV8oKMm
-dKtStYjSf4IEVMPXo6O1mrXnMBWQeZTCNA7ZBG1ehKMHLQQYV05NoEBuYGqJBBwE
-EAEIAAYFAlYOifgACgkQiq+I1thOQa7rcCAAsUZ1X2imVX98slb5xJ0ep6+HfzLF
-K5zj6nEmoFMBm8LeCW+eQyeyH0rHIt2LDs5Pj1Ne+W8C+fwGgT+PzAy2iCEZgTPO
-2UJfpy9nmV93mPn7MLK8c7u+FvqHrE2sGcTvOQNwujGyQ/YPU+fnneYKRbAcUz8k
-bX3w6T2SYAAp3OWfRP3c+FUVPOxdsN99xDifdAzYmwrXbYr1GPGai3MQLvGE00UB
-xoqCb0fCtAHpiWW3U/c/BvzM8WHRhFseHP9Do3tt5q3O9h5reRNIq7d+OXpkDRZU
-GJ9dviZSVeS6+s46VXOr0liZkqWhdFy+ZJsXoIxt+yyHejI1y7KQUu4dJo4NoFyE
-vgtRa15wjsOEfFRacCVeaMJ989eFQ+F1kb5LeI6xwm4CShV1SBy2pEoz+EpU7ezj
-xi96PAm6kCgoaZMIgIdaWuN1uJmQsmvYK6tlr9M49YqkaFzSHFNVKc9sCw7BBT14
-jEQLKdcHZDCis42+1FnBMIVn6rTp906EkiumrHwC9YIKCUHPW83Rne6NXuT6/wmw
-ho3Qiy6ob2wFFBjIlbspsZepDmBWSTX4Ej7OVzcJ5r4PXlus+wbbDob37eCzZ2ms
-sASGac6d26/zRMVzMNUDmmMmpIn2qCuzqJBYOc9h5RfKfJ7pP4Erda7NIN0PTat4
-HnXFeluIjDQT9YlTVgzznq9R0el50hW35dVrRRlK+bBTV8YLgzOimDSCk4G7hgCA
-XWnAQWRU4CTEoJCo6PwnrVxc6NKQIVuNTeIxPCqFrP0lWvCnW+nE5fTQk1MdpRlm
-JPRk0q2QxXRgBv7piJSdDBCtxmGlI8w1hhwg5SGDj2KCGNo9nQt1Ouf43Bwla0VI
-Fi13lLHrXjUC0/HJZub73zGi4Esjj6aOAllufbMTPquAH1YR1gbQuHLq+cmbzoKc
-Kjitifzo/9e0WZmn7ki4SYZsjFZg7OIyNNx1N/qe/ph38VeEqNvOoM0qsvxjMusK
-V+qclVqQxGHx9i3nmuXXBDjj8HkbDfBYAwXr6SbfarEYwmqs/Nv9YxnlPO5xvVFU
-Fb5GTbUKhneTfnHHUDppjv6A48vRNt9AT1b3vuB24zqN0khpxVUqPsV1J8yyGMvk
-umRUnNd7vPgBVsLaX9Bxwdva66OdP2rhk8YKHWHg4kVvNSFv5+Qc8T5uUXS1MMSr
-d4uUT/9TvCQRrD+olffOjQ65NPbgi/GIo1XdqviyztdswaBtN8l7gP4GPBVkBLYm
-KFXldmmze14EWRZZQ/gP9a9fvakKoZT4/b/r4NbKtyRcYiuucZMHd/BKTyEiy/mT
-LOG5VZbg5WcWG5ZY08ibnQikfXMdQeZuA0+SjvzA3TrLY260wAkCrjZQl7kCDQRT
-Di1bARAAw5bYX8BELxBpyjb1OcK9m3OrqzMyBagynF3W986L6LoSJ8UBwcMR3IEh
-rYJb9AyH3OlFBqY7zaIg4L3AGZw3iK4GLhkffCXEAB+4QxLB2yY9V9lAKA4NmuWQ
-Iav/huAedflUYWLCXNlRQN6Z8jOV4ih3sXMdnbMg/FRBsyY+uJL9zFSvLrfl9nRj
-lhGWCr0AnOJ/SE2fHs+dmKbFXHSFUEA4mYNxzj+y3djAq8KoS4qBokMk0TzZYTlr
-0qV2A+1B3KSbLFooyd6G31vxK3iVmQFJ3P3QmFKPUY+wM2Xzy6L4G4huAZahsBhV
-b2BjaH+U/3kwzVg210EB1zKMZ7hGEDpP4kPl7OeKQjkQg7JvTMf0KJUM7QJlUfu2
-4a0nAFVpFINO1R015HiTrFzMWNYGZGvef16f4kP8utg83lvo/kJ/9ILliFUPqxxo
-Ip1AU4E4KUQrFrZ2vl67/smCzIkJrIB1mGwe+mHSsxWdtIrkN6mJECMlGvJeIm8U
-4Pg9tEDKhoDblxJFuNhU31Mt0yEKcFk2iXnP8DFPpkfYToKZy+UV9UTpSG9kV+YX
-vMdMXG9T95PiR133EllxjUj7L7lvObcu4oh7lb3gOk8npp5vIFfauvk5esreMguO
-yT5mh/SfGTdI44pyssGGzR21sDyC/sBghblz2IqOX1fyLcKJKNUAEQEAAYkCJQQY
-AQgADwUCUw4tWwIbDAUJCWYBgAAKCRD5uPrDtIElU17gEADGZKidcCE3GiFymVMp
-mlm/OrNTT73Y8YiPoPXuskPLXw3UMjrttTVcOMixHk4L8mScrae4kqKaEjKYMlm/
-5vZUsoRkX4tbgfM9Ox0R0czLNbtaywC5AZKceYQtqCRSdcuTXbNtyJ66By03zLYf
-15+5Mve2X0BGRH82zgyFWDM/7ZdyU5ZXTh9rwYtb10LQwbNlAm8yTabOz/a9Xv+/
-W97chFmp4sOamSZlI1Ol0He1SYUBEqpJ268ic582o8hxGF5XPZPCGCFGfCTMkegn
-0GT6sJOFTpAspm/yjht/pgo8yRjnP6XpL1Bd/fe82rAhQOfmrFrJPyRHPv8ZIKEn
-23BdVV+VvlVNM/kVU1Q2MNjEK4cE+UJSKw6WseOT+Nh/yVff4kWJQxk34zvBkhqQ
-d7hLJGMwQdZQKcL6I5sw/Qon4OhAkrXQeqFqH0j6IlmTyfZaRiniS3pBLAWL6DhB
-otDpvJVsF5gDkk9OKRAmWltWAqsqvQItqh0fLCuWhoDqVb575YyXH1Pa3XezVdA3
-EzdaedFhgyH+cRyC1zDuZlEvqHnl6tI099dxW9ujRv6KKeD8es62MrjFTSXKkaVC
-Vdx9BwyvRFo0Ay/gTGAjNCPfyMzM1rD1rnYEwrNkXzTn2xAXhV+shW3Z5lnJFRrz
-hAj1He6be0CGjU5FRo60TI4mfw==
-=yNIU
------END PGP PUBLIC KEY BLOCK-----
-pub   4096R/27B9F635 2015-06-22
-uid                  Dominik Stadler <centic@apache.org>
-sub   4096R/EF9D5EA6 2015-06-22
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFWIY8gBEACj8cTCDwLduEQpiO2M1qL+/aMtct7IN9l0BIV9bL1oILyRBdi3
-3DHzP07GWLlr0LaRu/uUQuNVKy5ZIF237qn5BJoQnMQuZ2oQPDbaWdg8XkTJJ8pH
-kBQfsV5CmConjBJmV1rPCSbNbwYl+3fstIRybqgIjt9AK1xPxss4BUtbwSRzP4R2
-OblNfJ2WiD2/BLD/cw5GiBIMnH6LYc4tSoEdnZEv07RJUcTXs547wfCGMfOZLjps
-TRLpCQsTnpWV0X7Y7P9m62OUPEs6XIYJptY/Kv7LaEm8A5SSdTOfe0/SusIa2AR0
-ASb9zAwmuPLLNWhPiHKvXeWmxOgr//tpftvtRGlYYkXq6VbvLyhcjRSPiv1Rqx+W
-byvduNzRgJfSXIwfOIuAo8w/aNebZw6v2JDQYsx+P8KIxWO+MEY3XnzRIKEbK5mW
-vxIIhZhzXi+CkAYV3gSvHISDiYmw3/wJBerTO5Fs4cBIqMWfszTXJOYsPhyTF8Kl
-gOawyq7+kpyil0xRAZ9c0Zq+dwrny/q8Jw22MtWxt0gP1Q2bYoLdNhLQ4NzMGAvQ
-2eo0loXwR88cB1LsBHhBfUYnRbw9MXPMaBH0oHdqb+Zm1XvVJMv2xpBM7jt8LxA0
-rWkAg65tv70jTa5NM2eSda2qRMpVCY5VIvCcoEmGvnnZUA4l81um2Y+MdwARAQAB
-tCNEb21pbmlrIFN0YWRsZXIgPGNlbnRpY0BhcGFjaGUub3JnPokCNwQTAQoAIQUC
-VYhjyAIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRDhlnVFJ7n2Na4PD/9H
-GZuGda4QN1IOFc67RSVoLj1fPgKcEiu6zzarzMGChKsdxoo0ZhmyKaAh5/JZn9nh
-YlHDi1zpIjbDLEwEqr6qXjaJz2fw50BGX7yamM7pFvtNglu1KfyDLogYFDIDktaa
-nHtRUgsTXDL116YfoiJlucRqv/7sTCQC2bsuDaS8jmq5Q+9tVELrivxvHfDqnb9f
-+yH9HoFW6lQAPyVHVfpB0nDvmWx3twXjatrNiU+Xp+sGsfHtxD2YUjyft0diw1H+
-1U03FJGG344dUS5ZY9L/IBvIaZU+ovMSjpXshlZRZURzlN1FJljB1YkQgHEdjWHz
-9Ur0boQyyMZb3pYc4hINfLChoQoOlENM05LZE1G+x6aug4EGEWnKQsBfVqu4AwgB
-zQkaStHnNrmtIlEWzQtz/CZeiWpC0zXwi4gdiu/Vk+XOZE0YPxjLsFVIpK+m4B/I
-9VmlXodgUkOcmU99EkmXbR6G74OPYphtlRXRnZVcLSlTKfQitZH96/XBHoQ+k+e7
-uODYS9Zyfq5bFzbCmXLieOTQZUAKL9xv5CH9x4aOcCNeSr6JIlIo8UA4QvP9QkBz
-At4H4F2a80TUZtB54MwydKRInKlCdneZRJgEw2aHNuzuc8CeNxBxQ0sXtPRRjs4+
-bKHc89iggbhQCrJBijlV62jrXlVLqDTaNjOkQn20lrkCDQRViGPIARAAnDyvkbv9
-45FwvG4qU2haI3K5DG4KBUgtnuioaK0aF+GrExkIO/kjR574VTcCyTr8PBbYImOx
-YNaxn9QVG9tLlISworLscur79XVcayxkI3OWFzmAkjtlgrGiymTDmIofIXIh6O6H
-NkwOCkfYV2KcTO+UAf5O+DOPi+YH+Wr83GlbxRSqM6XMIXSkva3wPFWXaAmwCi1/
-JeUyEMdLWkEUfNPA53+1cq7SQEMSzdwEfazovOd4MUzQBoIDYbRdio/UBvTw/sQM
-BpKkjrDqa/Z7am0+TjgmyzJVLtfivgKP8/oluwwNa4OJQNNp4kSqmB64I7YXd9dj
-3FjdaVXB6E8BqOxubN9MDBGy59YOkQW6eeYYWH8zRz8BlaynieslPxZjBeEgQOS8
-ow7RRzyALU4BWrD2WBYu8Po9qr26r0NhzwNtSGt8zeB2rK+FMoKIR/EEJUqKgdWR
-e/8ase0Uy70NQPqTwcZRDYaDvdvfK5YafIVODwUu1ojHqkRdPuRH5UpNdaCBk3kU
-0P8yTb8/qTBee3kLvkxspaMH1kgmUSWwsR7vip7Mra/fTCLZJPhJdpuPxHgd3MtO
-CgTNROlubFhHcrhjOkVTWNfoNbi1zaYZI70mzMasA4cqxMCkzhHDt61ChQa0u7Jf
-kIcGBZe11QeTMmQkUoK+Z+/RR185fPtbb6EAEQEAAYkCHwQYAQoACQUCVYhjyAIb
-DAAKCRDhlnVFJ7n2NV6jD/9qaa+oFiMEZ6QPdk0dc9cwTkVth267i05AxGoIu5IG
-nLlxTWfKLudSaOlmlvj/ToOHCGxtqMkiOQ/r2zNOvm5A/SSzoxF5tW33kq9qTXvO
-HC7OAGIlEWqUN38iiooOwX94LqTDQnQhJSAQgvLOnETY7L/G2RwWTNBNAVmSZQlo
-ZHyB+eidQ2K1xPmqs7jygbI2Evgu+fy0HUkHP/pSR18E9Ed4NAn69F8T/FNBu1tx
-Jiiq2L6T4cY34NWJSVTkzNeN1bKihkiw8xli7GsMAx/M13vXHVslmAf+t7Qmf5wU
-EGiSxO/v9KrkJ0J70TxJ8aSuw2WpmeFD/Yvxg5RmAyvOksKd4qhPUDc1S4a1mIYw
-UnpC3ToqTaFhQrC+C4V7aDD2Z2WSe1sUWEWxebTzpx7jO8Ewk6Wrc8GR/EkLEkxy
-wB572tirOBouppxcUK/y2HyRfMMye550Ky8XSXnEf8BBEQCHSE8qRFNewY/ilZse
-VpGw5vPPmG9LUEuFjNS+cjSacaT0/42O6V/31LKuKPmXw6rH1jo0QJbXRorX+9nD
-LeC3Q0DhbExabeoz+Y20AlxvkVhOL6DlTqKPZA5iyBXBvFB/u5Bm//82FKJHiPjj
-sFK2ZjwJ3yfYEsRZQYi45odzWfHA0Ca2NMsdjmRTk/N7AeaknX5KOFIvFqdZndOE
-kg==
-=rPGm
------END PGP PUBLIC KEY BLOCK-----
-pub   4096R/5350373C 2015-11-29 [expires: 2020-11-27]
-uid                  David North <david@dnorth.net>
-uid                  David North (ASF) <dnorth@apache.org>
-uid                  David North (OU CompSoc) <north@ox.compsoc.net>
-sub   4096R/FA3ADDC2 2015-11-29 [expires: 2020-11-27]
-sub   4096R/03DB0978 2015-11-29 [expires: 2020-11-27]
-sub   4096R/F8F92E4A 2015-11-29 [expires: 2020-11-27]
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFZbMhABEADSUrZOMTO1k4M12D0GzbLpvaVpXKGn6ulGt6TirGDCGrtvVZmQ
-mxbe97TxGN0AqGJHZMOjvEUiUKaCHUQU1dS/qyIA5F3Oxui4IrEAj8R9gBhBvpVE
-2oEHQZVYo6YrJTLJIjnVsb0RTWiL4hDGpHjcXrwBimbBT03+62UJGaxmT/pIDgxZ
-i1aamnIJIEV3/2H/8BOxVIIsp5qQT5XL65nve1+5D2P9PJYtEVtVUYFnqOBqIKz2
-T7/1TbyINqMTsqtEpqjBB/RWwiX0jSIsAPcGBMRO/xDfaU9TILwcjNc0tCSpn8xr
-Mn0fawkJZPj2hAwAifoX+Ryp50bYlgLiOJQE7iS6dp5RMj0au/qOuZDKLfCDXbpn
-Ob0pMFyI8j7pYx8SDUfcXwTgdVK8aAgZPGwhhJQmHkaCCPcx4PxXt+7V/8u8xmoB
-1bTpNPw3KiIS4AyP+m0XaZvPnDawxYWO2Ap7YowcAIjNBTvIf1J1jaoUR+RNPI5t
-IZlPG+wz7adSubPyF2WTvQJriekBBo+a98e3MpZsqpJfcv3pJQVe8BTTqOOQBKHI
-n97MSzBZQ/MznBiaqdm1NKFt/d+fQAE/C/Cqe1WJtgDhPigUoRQxooYIaae6rB99
-pTe+T2NXXGPL7oX47+K6EZ36AhpGMUMXtYCIP3cTneHI6c0BnmKC/mTvfwARAQAB
-tB5EYXZpZCBOb3J0aCA8ZGF2aWRAZG5vcnRoLm5ldD6JAkIEEwEIACwCGwMFCQlm
-AYAHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAUCVlsyWAIZAQAKCRDn6itTU1A3
-POhtEACA8tbeARBnYsUWH08HMQksEGsiysA7JOk1RlwchcYcKUPnuFA6N3bJxWv8
-LtPkP5jaEil6H59CrkXvzbU3fZAlfqdsOlTKZJl4hDht06bdB8dbGknEh2qKGoO4
-QdblIPuPhyqZwn+pM0CuzP8hhh8BdLqqJHb7aVL9Pv6nH/ZDMd4RlEuVJonQ9UIk
-HD44oLx5ivdrwPOE1Y9Bwn44/AqBsDCGY5REkq5OHS5eohY1eGNBBejmf8g4gEHo
-FWwnGyBmlnwfGiMdw45WAc+PXezjuanUIuDSCDz4GiTvVwja5QT/eWEmwAReKT2X
-Vs3Dp+DBsG1TsSF+5hE/WIxFZs22kfQJBhShPK3+T//8i0IfEORMfnp2PNR3hZ6W
-ED33cu9IkuVjsbVRWunuFp1hLRq3GiVeGpYFezqtJ+YdEgy0CQh39QcDi3UAyChI
-6z+MMAO0cNAeBQD1bw+kJdccoDD87YI0R+w/dEoybxHQWlBIzwtkuG++Jvdx3miu
-BBSv8bXTHg247BQKAbRbb0XxyDp6pxREP9aIgXsbjpWKNU9I/GoefmjTBwdqv22h
-zp3lZpxZcJstyplIcRq/IkOj3Qt7Yb1yfztIHfRpYySlhOVMcreay9V+PC50yEHu
-lioo3fzAWyNcxt2Vb+DHUEC0axNR8giuTSCzDhqqWG9lHtFMVYhGBBARAgAGBQJW
-XZNKAAoJEDs6TwrHnltqQyAAoNE1UYWq3t5c+nucIwE7piAvUZk4AJ0bJaTV7QU0
-k3sd96ihjYn0oPiA07QlRGF2aWQgTm9ydGggKEFTRikgPGRub3J0aEBhcGFjaGUu
-b3JnPokCPgQTAQIAKAUCVlsyNwIbAwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYCAwEC
-HgECF4AACgkQ5+orU1NQNzx5sRAApoRGzIxnykyf6rgS63ONFweFj4oD2/b/9Qwx
-u8/UN9xoeUtfiuNE3n+4XDdDGjrwtKSL5qXF2tCn2wZgk7ptPcwyuJPGeytQrYpK
-oqQP5VQjtfXvXyO2T9oKIxAeYFEw8ZXqCGn+hrdFAQJjGW/Eb4QQRv5rWKFAqptS
-eA2IE0lkK2ador5U/bo7gPgiJu132af9VCotyo5Eamg+y0S4aNPnDMxADhljnq7U
-0TFzQbzhcwmFruJxklF2nl1GbDfE+NVKzxlMBNMRUa8lLoxlWYeGGqPSAIt2ux53
-2nYkD2GL2twH62w84qIZuQ0+nsV+xoEwpXUMOOJHI+sOoD1ZrbEKNvfToS+uBSIv
-0d7INXBROfhhXN2fNCK7e7Pkcn8bxuCDSNPzQQVUPnMFobnGYRiP98QErNG7pwyS
-JjA8Y92MlFOg0SCr5Iy0GhOwPYKkBlqA4W0WhztS3+OeVmOGl/gXt8PZOV3XH0zG
-qIjz9cuAxVaaBKz7/ZrghT2QKj0nu+msjPf1f0TzVdMP8osPKNTiL2JaDQCF/mfA
-Q9B7MB9sI0YH46ifOPFFo6PrzaOvXGY8ObEuKpmiQB0BqOsuBhMLFQiH+OcXfcq6
-xwYxw4otXyF1iKhPPlp6YkTy+ICm6MoWSR1XMh+qLU6UuggtK5LK00QZq4kuD37v
-Uxe5MR+IRgQQEQIABgUCVl2TSgAKCRA7Ok8Kx55bakvPAKCpbM3av9KV+7OCprWp
-mTvMX4JTxgCgiRG4rXVGfcgwJ/1q79I9OA0MS1K0L0RhdmlkIE5vcnRoIChPVSBD
-b21wU29jKSA8bm9ydGhAb3guY29tcHNvYy5uZXQ+iQI+BBMBAgAoBQJWWzJNAhsD
-BQkJZgGABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDn6itTU1A3PBdRD/sF
-QC4xH7qPv2cnPOry/qXSeVUW9iFsXDfKgiLDtryqxVw878E9Q0HLZfDUO97a+s4r
-hH3hh6S9N4OVvJcoYX146Z1UQyV6KJBHLNcp0kXkEL/oOB0oEZDVw9StWdmuIx0w
-0Ki/y/0jOKJaIfTWQy5T8AFIW32R8tQIdIwUr+N52mv4WiI/CibQ1xKo+oyvB4HM
-Q2xNbSklSZOdnU9m81lotl6n9Ce6Phz7JoIE1NBjC8j14lZ41tbG6OYtr5UysOnH
-dhGlM5DYDS6mOdXgeIXGxk6CbphYCapAiXOS/bhKmxBknJcoLcsgBhcmpM0FciNo
-eyj7Rr+Viy0XGr4PU73IxbHx5auqqjvfHR/w+C5m1T/nS+5YpsMr1DtEy44Pctay
-8oriMAgMcFz4PPqjpuYjubPAnpFM73QjzVLhKzHL9xodiUe6ycdV6zdUiWOOt9go
-ZFVU5FpdvjrPWL3e4CTk1keOwFHP5w5LJ1PeZrKxdxMZQgoJIcH7pRNk/gAmpdDL
-pF5diLp/ooAONOJMhVu0nfO8tErPwQgi6RuPjX23UtuTnAJlNTFTpP5LdTYRR4n+
-zCkb8C6ER2AkCA4VukscPjqEyv4+BmIqh2JZsnXZulTLKgqyxKP3leXxcfU6R8qZ
-rTUIl+KG7805t/DPstAjn4QWQNQ74JKWYXtc7dPo/YhGBBARAgAGBQJWXZNKAAoJ
-EDs6TwrHnltqn9MAoID72eIkZsu6YLQ8tyydTAa7GfuSAKDUu9QLb07OfvsbPqLM
-DFbLxR74/LkCDQRWWzL0ARAA19834eY8CDheNnTu9G5l+CPLDMNV84akh0uxxuis
-s7z7cgAeGkqeQnwMExqgam4J3ss1JAGfJZlVh/Aow6OYFIApWvszsieQXiYw9pi5
-/wC0Z+zgiciUMInhcvNTeWBS/xhnuYnVjN5TIyvxz2VJVK8iQiS9GBe/wR1MDqPq
-REP61rb+xhdaHBhYr74roVRpNUOPB9I+4/AFUG5XMFs4YjjIb8kgCszTBFri6Hay
-Ol2qtvD/ATth0lg229mPLzvZJmg7xkNGhtxiFaLZjbzni9pIMrsUlSAIhj7jyY+7
-RYrJzXwGOPdoo/BUdZETivXXxv5ZQzyJw5nqIJQmWBstGa7i3IonSTmJZSpCE6K5
-EkAHwksFxEvGCDnBdgDkXvCdiVA3guy6jQ+8D8H1R/6EoC7vUWk9wWwx6PLACFql
-RSQzegap8iDhQ9o8feXMXkS585tPQN4j1CWWvzCahheaXrifM+9yza2l8nWyIDQx
-V02AQYDEb65Twqrk/7LbJQvJ8oq24ScgRL8EFZunyEDvlFpBzGsZTahBhenIpME5
-jSff9OVt4kTuYYke+Q14+Ob/WzlgJtF3e2UyV1Xm+FUGsL5TDS8VgfPYJZeUSnEn
-bhhv9bMlFFR+4HB/bWqJ58VVNUUoIc+D6ZuNT56YnJJ6DLXi1Es8qpx50gC1mM4s
-1wUAEQEAAYkERAQYAQgADwUCVlsy9AIbAgUJCWYBgAIpCRDn6itTU1A3PMFdIAQZ
-AQgABgUCVlsy9AAKCRBSfrgz+jrdwpaBD/9FjGA7RESbwpUAimzfhrRi7hBpUoiz
-MCrrDKsjTByP/InXlR1O8127PkZQQaO3j3PL1ww1NWWr+qkct6N91DaooIjLKTR2
-7zcEKEQtv6k632uJSY53GiUi/UFXcVPKj6B+XyNiUytbCkfAyVPrY6H0kK8YNVzG
-M9i0AB7RZ3gH2xaEZuOCYHNe7K3HLy023OcXSuiuU+mxYgBMOphq73uvlCL7TwHA
-ym7BTagartTMGNFoLpUbYCbbHBHAkXTqF2ppWqfu/StmXN6kmzwOhYwdpcSJNrsv
-V8Prf5rKVXJtpvq5t1Ux559NBX+CtrwwyshQbjR/BZhiyUZqvbQbBEorLU1mLvKM
-VmT03h+Ha0K8GKDygJr15uwx1X/9wdsZr6do+OD2tM/dQzBJf/TPi28mLZ1HiR1h
-LaYM1Ipn9ah6xPGdT8cpL7EM7st0fsDsmO1rU+/Jvfhdee7q/vfdQZkp/9e0YHRY
-cygITVCurNGERUibjEtpjyjrztUDkVgDkc73OYOFtrR3ScrbleBSguWkx+wzUxnK
-HaLCy+nDv2qVu9A4sSrJrOITDZih8mdl6Xzp3+iX9I1+Qg2pwKG1wKbgtLWFqvZs
-IpOzP172I3G79zXV3Ka0jzQQjNnl/+W5AmBt2/Jw4M7V7xxVfXibrQS6tmrEWhcX
-P5pMNwhRf1bvB1eQEACWYe3gIyEFT4KBrAhsfQI69X52Ex+CyeKzrUZRPisxrdEr
-hnUHgBUm2XHvhS8xODlMj/EnNEg9aH/dXVvzFcSz0D+dGVDNWCN+bia2G7UVWyd/
-XG8DzRrmXvMQLkhfSl2ZL/d85PVL4HlYV0rJrqjquP/VndsRPjG5zTIfU7Gly7V5
-YpA8eUz5u8BQsGLsIMVg/0tzBJfSJU+RTQ2TL5B4sbStBzl9YzsmjQqdhQY1VX9+
-RmDtc/Nrqv7c8T4k1NzHUrb4qS6E9angSXOP3ZcDLsRPvAj1APyxEUV2RtXFngU0
-2ew9M/Ie9fEx5hU6T6HMjTFgcfnpF6NN466Aed/OuU5yaezqWfNr+an/Plg+6xUK
-WoSKqq7x6o3Q3hk6fRu9sgPMgtmZYmBXvt93b14Hgzmhha81uKr5cURTYTiXERtX
-SfJxarMfkZGyf4E2ABMHiI4zSJHF75rlHJEkNbGXiULXzzDBn6QK5iWiBRpVa6ID
-YY2io6mDz0Ajcm2j+bcUMcIuqhqgPIUqNaxrCvOY4YKkqbmMpKMTxF/mOPoevg56
-3quK2yTATv/lbTvO/RFEos4ZQEG+4bsQ8gkzFlp1WUTisANCdYEWe4I3vkCmCCJx
-lqhZJ01CVgzszeNTFKZkdYNsWx086pw6O1fCKrnhtoUK45dww/5lSH77qdple7kC
-DQRWWzMOARAA51G7/MV+tpBeOMN+q/CRbGvEq105U1VVx0EoAFPi/Supa8PTA9o7
-cE+gdQX3OAkKpWV8d/evDtv7E6zERqEkf0D1KaPVPCJKIU1ffvfnRxe5Za0wPbAT
-MMczgwSlLocoY8vEt1OwCp2yECNovRVigwAVdr4jfHQDaR1uAD1tGJgTTqr+vDA5
-xOtaF04LHqbZHV/bcWxBwK2STqtFn6RbZCfTDulcv9JNESr3Adxi426S68+qtPbC
-5RUzERyGSaFmo5NelvV1Lbx8bYMs2By1VHed7YXtZbEK2djVNP6S8VlnzW43kkvr
-1F5pNcFdOE5AD3YWMHdDdRXN8bDMhwwbKU6eeDzKnHr6hoAMEtiEE+ZP3mpkE6Sn
-n3SnhIgrS7rlPZxrWpJ9Q9Eohy2XSdOZD/KImohJ7Afk6ni6MaqxfIZdAFu+f9C/
-8WgTXLT4mtd5sghro++KnH+PDIVDezQ26JJTadYcOzKaTyadoiZCttWnTZLmeYNw
-m+RXRUm8hyQa58ZGPwGmdUTJyPJgHUxyjeSU/QG4mAGEXfeQzAAo56la2Hb3Kjg9
-jMjvtMD9XwqtWHJd63ih6VtXaIcyhHXFyA23YDDeodSA/2yT3Kg8tB1zNGU6xOYK
-4s7wAo+mNJpCGr2nAIXj+oIFrKIGyM5qykGt23kEumLLqQd9l956ResAEQEAAYkC
-JQQYAQgADwUCVlszDgIbDAUJCWYBgAAKCRDn6itTU1A3PK5qEACm21RTMohM+bnD
-RyYmKz7g0Pjz+vmFtEW3YC4GoZBNSFyDP9B3WoxV37FGj6sUWkfCEXpby9OivSXA
-upYxq4BYWJ7tIEb4wBsEbHaUxh81xyf4/bFu2RBSHofx/vEapvsBPqa3fTcS/mR4
-HPNez7PugSiwO9F9BUezP5G/TmrevOQI2XWSJwK7UoAyHzkqvN5inpjX6YOuiC0w
-fZBy6vAcGoV+lQpRHh3cAX4bJ+BoB/hT4ZwGkA6YCaLv5MrhPLU3EqSfn5bnt6Fr
-nLNYyCrsocGP6NfIMIxhbszayr+5Wt4xX/+wg0GA8xNy8ULHDoJJFjk+4BPrnvnX
-/DJN4XM1o7L44SySOtSqHEHZJccQMXcaBFWHlI1HdI4C0DYASRq2a7hFVJuGFKuk
-cGAjq2zKdBlFGQS5ZJkdzUDsAqgrlR/zRWACdPIo/0O+ZBkpI3K3tb35xksPa4Ch
-WEaFEHHNp7X2TYIguxCSlQajtw3UggXUNj3NzQP3CkHxCHeuD0/3Ng/yBUhSlLqH
-86BTd4NVNsMuc7+Od/o6Etatf+08fcKrWySLbJ6gyIxIRRiBlIMhYG5EhEs9izot
-xmXPEC99X5upAYcl8wepXmAT6uS//HEeq1gLWhJ84t1m72XCgzsH8izR9EYsPuTB
-XXtguDEwNLGck2RdUfmzGUpNOddyLLkCDQRWWzMoARAAthdLiAzdoDfFjS3PpbQu
-aJYsPt2Lv8UyCPBx2QVl0I6ynY5U4RDnygRKtvOGupkqKwR8W3fzreFKPsJNlZ7c
-Z1dKLImKXzw+DPvr+L7kKnW/F5i8hFtHgdMvqNRvty0COGtuvnU/oJ2mHi0hukvm
-Y7jEZbx5M/t5dY2THtg88fn0+VppvL+LKzdNSpmiBX7EyrjIpBrS3MDts2ikhMF8
-ME2yDk1JVRdvWAMHW6Rgn4uhymrF7wbR3Gtgw3INqp1f2pBBNE2L4PbQchgqHEl7
-ikypcahU6ehsMmuGR2ueLoNF44j6qWJfCnSP5asaJ6sZJRpI2HYS0mtg60SsT52P
-0iut++OOxi85sJtTwvGNFlU8/oLDRMTriHSreHV0ufw0qifO3McHQjSZ9Wx1ka+l
-d+ewnPFvPpxxjXIpMxw9OGOL++pyztf3G7or85ewzogR47rtFZJ5g73AHKnMHcL1
-X12LXOVvpPfLuEFDJ7q4aLwvxehiTzHGq1ARYRQHrOJnyUE2KYerD/Aqa2imX/gE
-dEgw01uZkhgP9H4DaM2h0RLCWJ4LaFamce9cdWZsYibeJwr+alRP29Q3klwx9CIw
-FawUftThv3j59ZJQi0bnkIN9/NDXBkwxQGvbyWv0x6yLmtIzRNXdCHzNUnTbCh5V
-Vyt9C6owqCf464+L69vOJYMAEQEAAYkCJQQYAQgADwUCVlszKAIbIAUJCWYBgAAK
-CRDn6itTU1A3PJEEEAC5bvKxKzkw85IDvMGDKVviQ0V+JGriEouslFB1A1voVS+D
-ulhXdpvmVGSKWB7B38fO2lcyImnqV+TDEA4pa2MX2hYRN6SeFtSs2aS51Iziqhve
-3uCs96t2zAr/pKl72yTcK/qA8Zz6Why17pksDWMlwkWncFGWQNPp9Zn0Vz6DF2RS
-JawZtdccHy0VfA2yx2XtvIoQMIGYT8LHu+uUFzbI3kWofUwSxNUeAaAuCWgYXJrT
-D3WpZ7xcGN8MH3laxq8UQlYuBGtqmZwc4eSddY2bayP2+cT+5pihekvhPO9hrQfP
-Db/Xg4A+gRsek1gkCjWGT8peoPm5TWahdEMLEYAyWirfFa2fFHkq199sTjOWAolI
-D0vVW7l2M0I6dFiZwoYyQL0feUcvFKEe3i1k/684hhYQcWWaVnW+GbwsWIQ7Nrb+
-uoJ8D7JTt7K2VM8y3LFiSzWCl5aFMFQKc+H1youb47GnzlU9R9OjKVt7g7japSB4
-UmbnPdwhYsr8QYOq2KxKo/Wl1A2k+pL85qdJdnS+lXzl7nS3MlDNLRzk/1Hg+IKo
-cCRRHYCeAZDU5UMxi0nonfT+060i2rLPSd7o0bstG7gb1pD99rKxL57M7uy+WBnk
-YobtRLhWHvHyWS4dKqiteeTwAqG2ZFOq98KCu1LXMKj42HqwOtB3L23HlhqVyA==
-=8e4G
------END PGP PUBLIC KEY BLOCK-----
-pub   4096R/8BABDD6C 2015-10-10 [expires: 2017-10-09]
-uid                  Javen O'Neal <javenoneal@gmail.com>
-uid                  Javen O'Neal <onealj@apache.org>
-sub   4096R/309424B4 2015-10-10 [expires: 2017-10-09]
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-mQINBFYZkgYBEAC28IT8XHE4bm5iXgL7COy7hmh8FS67hwfnEV08rm3f8tflYxe+
-tYdRUI8y5UIFJyX2138GsV7sjV+pBiEq02xEU5pl2/AfXF+GmtW7ErS2Tk4iQ0id
-SEcnyvim5LtaFYyMjYC1mzr0MaiJqWHjw6Lxjjep3s40coAkauRIcnJQ0s1YQIqk
-BPlAl0rDILE8Lix+IVokUxTizh9popwDW0T/z6gzdKDeE5FPeKYWPvs34bKwe2vm
-KqL2qmBh3Tk7MbtKYD79pGzYkNSyVmfWIDTjc++lNmDWYt0QN6YlaXoV4ZCAbLk+
-raHU+5aKduZNnP25FnwTyt/Xm4Pl8RdROBzsmese2UuYrfsPaZrZkhhekE7Ttjk1
-EqTob/LmgR7KSwWGT6Y9PAyROIs50yw5T7wMjdz0+C9SUZHK5lhPnFawyamWM1de
-Y/f5vEvbI2Xap614bg6EPObPSQh/1r6J+7EmrbSqRE0W8FlSK2cWmB8l724lBG9f
-Y5bma/F5g8eL4xcOGkaw2VCBu3i/IRUoHBP1ndkAQfIHmlGlWFc9u6PtmFyZHJJ7
-Boks8g8M9aOcUvO+K/+gBWzGXO8n/NG10iItX9ubSFbvXCKJgK7cFXDdC8F/uHXO
-vfDSTrwBffm7Czyxx8AgDHxGMysNCe5Pet7bU6bZL4ANnCPfMhgN7pp5bQARAQAB
-tCBKYXZlbiBPJ05lYWwgPG9uZWFsakBhcGFjaGUub3JnPokCPwQTAQIAKQUCV+cS
-OwIbAwUJA8GMagcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOZnesaLq91s
-DN4P/36DX8zeM8PK9x9lb3DogipXefiMyWOZb+p64Ah6iFIxDoTNP+meG3eiQP11
-T02TeI8tZKG6kuFM6fQb3GE6g/2TgHeWnrhek2KfHbOh6/nWvrAnsaEiu+vIBIFL
-kiO0ydtu1DdNjWB0PR3bcnxF1GOX38cx37SjMR3n/eaIFnHqENzHNZgZ0sv38pYt
-c0FDeoqpO89aAiCi+IWuLAhYFzU+GFdHxteFMtYGYDe5iI4EHjciIO4/Mq9MyQce
-rYS/ADCJV0SWS+mPk3czKRdpklZiRoOqSiZcyTUJ7H2NFcdQuYjpLlmNvt0c95bR
-fxaOhFWSSvZzkcZXr4u82VDc0rSvXW1q2vFZpbYJq7uDQZpBlkLBwlZ9gDaXHa6Y
-5JB7RGWMmA+mfwSmfKxfCR0HdTldNsSic20bUlJjVjKkZR+Mco5SmAW0nb1OkpD7
-lDCx6x8aunuFbf2SGnIZxtGxm31rXE7bTib4wE5X9EECLfg9hTJxPdDqvKfRBVBQ
-ZVtPdq3jzyh6CxM/bygfmUjqdP91hS+wfXYq1W7d4e8EphkCiqdMXgclFEbdGp8e
-+8BDvbCIchLzZ5wOxL4Ntwo4bL2Zn0IJ/K6K1WoOnMzq+6xWZOGRJ28v8go2VqO/
-o0zWgSm6zEz2kAE9s9Y1by0xL40byg0AdJzG4h1cRPOsYeB0tCNKYXZlbiBPJ05l
-YWwgPGphdmVub25lYWxAZ21haWwuY29tPokCQQQTAQIAKwIbAwUJA8GMagYLCQgH
-AwIGFQgCCQoLBBYCAwECHgECF4AFAlfnEmUCGQEACgkQ5md6xour3WzZxBAAjLkr
-z4Roxig47WGax6ppGqIGLTNEPPvNluIgtwZYfTW6MrzQIquju4o0QEIb8mOW9uke
-LnR284t/5CU36EuVan0wWYwrwIJWtbZGz14GgtHsRyErllmYWKa0aYJ3kgY8JuNT
-bK40g9RlrdLsYntwFlWQB9rL4nBPoWVWRllWOMcbhdF6/p9r2EmKO/CsTYdfolEh
-dKdEtSgshQgvZxfgalanqb69/zc81RLpUQ0q1uiedrN0ghNd1+XCXeopKeeAoW9Y
-LOIlQ3ALz9t+A3w4Ft5h3RZBHPwSPAgRv4fDv3y016rnPSna6wC5atlW9b1jxcnS
-myP3kNcAXJDWwpQmMwYG8NJGCANwYRUNGcXlMvYbMpmuYHqc7kf+AbkG3H8Z1ktJ
-jfwK8aw2ZX/AlINIQZ7fVJLDOkMapbjApUNOc7UoXx9Z8qXiVDizisRCJxy2Kj9h
-pR+XMIwgPwCTgmQ+W+hQ50h7S4H9VVSfEe+H/+k6kHhRxEAZq5NGIzC7Mh8xvyHa
-EII5tAS8fQwfnJ75URITUp2Vrdry5aDEZ90AIlYiQVuhUwFeNimjKOr8i9Zse7JC
-MucIcmBsvwThVn22e6x14cNfc4KwqcWSQvxMuzqejHq4WTMf9Ln15G7nVMulyUTZ
-hfJ4Spr45BEr+4UDMNqwIRQdIMXHa+JZGs3Nj7SJAhwEEwEKAAYFAlYaCkgACgkQ
-ykkN1QqzdQMHbBAAm6Y0PaDBlhiYd+nCaxpNJGG0h2F/2nPLXNaGdTQSICD8B97i
-J1Hvio0mEHnkbbm6e2s0rvxervgy4BuxgwzWgguaLQsALgyGpY2pHzsQAVQVVq6H
-PQdwSOy731oO7R7CeJB/UIT02ne5WnLxxUN1e4qYLHp0+QFXOd4TPuTwPEG/Gewr
-EVJN4C2k373eSsWwvXCBYe5UDLqPHrVTYnyU8uFmi4yOMbmIyyb1x7At6adc8FWQ
-DQQt/0YElDe3m4Xmco4OMBem8i7QFchinhLIZPwNCR4aGrhbQYuq7C8JOWjEGFg8
-k322fOwAEopr3+dHemToGde5j2u7JnatAeu7CwNVMY4Z9s/wUChP7gXlNenKIgeD
-hUsG9RroqpXTLKmjz+2fSCGT5o2rBgwRnwpTcDaFWZlVzb1r/KQxTRsEkvDfSU1Y
-jixoqFJYBj/2fhl1EPF7gb5WK8tBZ8PqhPaJwXAynzSGEG6QLbYwxCoKfVvl8PZj
-SGg4Dmca6QpUskYwuiMMZhJJDNxKn5t2NZFEilZVaITRtNxtyRm2xvbcPXsSjAdo
-VXCqKX777rfPryPW4Yjw55a7uaQQe3M6d4ndgVP491tGBMfBTHa7hKei/R1S106C
-2R+rrE3o42WnhM3AarlWRqaHzuJQuofAjtRv19Ibk6ahK/qFuZBBFAWnUiSJARwE
-EAECAAYFAldOVSMACgkQ28vfLzZwP7I7OQgAnDlCoagIdBNHxGAPieZt5bJTj8Mv
-DtoxOAJtUjbJPTu5iw23pi2b83xmYCNQQkJ86IiSX56kILr9SP1uscChjM8aqwBK
-H5vMWAzHxdbTNFrjmCm/NAF+6ArFi5snlWf3phLPUIdhNhGA4jhklWMuy6rflujy
-BCgtZSh0VbaU/02ir3/QXBc331VN+qbXoCxD8lFagj0rg4GLCWFFCPJUeAr/SmIp
-v28UIVNDUI9lyCB4G3utjBhDpo0LHv+X+AXkD5V9kwZBE5NzahL/3AWjm9B9Vqb1
-JO1PVYv7sXqG25+xRMJssnsoGQYH75LSwoau3Yo1l8J35LOLYPUQfO9NYokCPgQT
-AQIAKAUCVhmSBgIbAwUJA8GMagYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
-5md6xour3WxiVxAAkN6x14p905j7NUB0Ky/p3da9KeIp5uAyTR/CcE9pLvvdSMyd
-xH8nE35EyHT84l7/yQHQ0wXxAFilBSGBt3C6Sth8J+11zxesUeDmJ1dX2Z0xRFz+
-qO7MBJ2ccU9pK20niPgaKuBBZsDoye9wKtli2UxOCid26CeLs5Y1gAcPuY9Hmzh3
-FnGhzrI5dP0HcE9lQXKA04vqviT1hxd+LlleCij1ItQR0ZYhV7z4SZp66vEfnh/R
-mtaC5L0ZFfoAartLSVX6a16dQDqbLy/ukecQeQ2qWo+IkNQe+p23GR1FihBZeHxC
-G+L9igu/cFgRLubMqHelwVCwL12Uazb2tG2zAnaTi5WgU0urvLqMRCuyQ40KlQ4h
-ly6oOEKWcwGBhfTD+baBsHLfrVdikz4IiV8+7oQsb/xyuQEz66FYLptDpX3obgRR
-ls0xjJ1YlZsmFg/NCJaAoPILBnS8wpbQp+T8yf9YcfczsMs9wALtM2rkLZqS6dn0
-yBekDL3ZsuiS7Ot6WM351nKCvDtpe1hF4CAkE2xhCLdRyvDHmbq4vBf0nyAvzTCI
-hUzgQeUKDDjxcmH1yxGNXswlfllqK6QkI9HnV/AuTI6nEjlBRNmtLg7SijHmuAZd
-+X8Sy/CibqCgY0J51FlylH+Cx8qQUaUB81KKimCohTejzrfUm3xUOvautFG5Ag0E
-VhmSBgEQAOQbxM1ZydIHIlnKx6LEmQdujX7Ns60NxrGdhLLHoJusuTutjTEt50Ex
-MHhn/PjYVeK1JU/gTh0fPM7il9xwj+cUBbOtBQ+E2sVXXMSBMj93+6ivLBVesq27
-R3ls63EMKHGcyYsIqHafBG9EvBwHBj+UNG3qKyEZv/NaX6UUoEYrvI4yx+z+ahew
-K5RMAZ1qNUqtZfsDlKW3SF3rgRBBmVWowim1G6tB0HVor4YRA/iHwH6WIu04QqzG
-A0uQpvptVJ0i1Hd9SoXisJUsovXSRTqj7+eFbILGywbvM2NYwF52lW9jbz3gu/Hb
-O3uPY0xdshW/8F92FZRXzuMMv3O6I5SaVRRJE2oJVJHtteEpyrbkCqhaLzkSiNxf
-sqzOw03gYICnxSDY3fqKBRKq84DMbiXbv4DwqeXWZXR2Yhs85Rn5cgoNqg5oyNwy
-PlQOfqZzoiDle3SWs41pCM2po1tGgZXkeRqNedRI9V+c8ZacOrTPnjRL0Ae475n4
-EFP3Ajur7UaXRe57AiSn4B30E5/D0HC0SeeRWacFeAHJ8WGvf6wXNGoAmtJL+TRJ
-iSqNVjZ1EhuwYJpjUgPEfesXyCc5U6qkHMHcn0rXVteG4mrn0/191CPtfamxpDM9
-hhTZ0WEbwFRwC41QQnRCO6EQfkPwZLC9BtSSuRVCI30617HiOFwDABEBAAGJAiUE
-GAECAA8FAlYZkgYCGwwFCQPBjGoACgkQ5md6xour3WwC1Q//QnYoOLfPiSI/NVI6
-agjCECNdtpUfdiGy7sEH3FYpNQGu8LDahcmTsxxcp2LeXjZIhuJt/dRPAMC/teQq
-ihZvdz5iuYwqg8I7ZtZh+qxqxvjwOwtKnELpoMpZyK81v4C2oLQAzNdMC18QTBt+
-L3RSMDdnPJ92GsCoYSGdLT0Jy16l/ShUQZ85EFUEjzFEDVnlLKpfZoqVCIULe0nj
-NCyNY6txc6X4uChCB5ZtsLaHgUTm0I+wb+AX0wbEDELyldzkbfVPTxbCMQgkPx0E
-W7ufcM3wx9sGT9I3FNOqZKHa8xq08be7z6OJZlsuw1NfeWG+UF9f6KZjH/zxIdtY
-IDoVReAU5g/LfOQTHXpg+7eArlf/hVh57uFjPJxdh8wqKfFzIVSoksCwv3w3Hrca
-7eh7Po46U6Tt6icWInBUthvOja0CgDojw+mm3GKvGMif/9YZXY/RHcc3t2CQDp/c
-Shzcaly9QYj0eDujTQj7XFd/AAwdj8YWA4Ha2Peh4/oK4ugt7pKwt51MvYzSYDel
-NFTn1hbTXTcj21i2/C9I6oqIhKt8c+St6Tge7PkGjq5BRqvY2L/IJmS5TmSerciL
-bpjAhwE2YmGQ7oB+3V798HtAmceRNf8AY0GWrZswJlg7xUn+WJNwQ9uIHI1fxYHx
-2Nr+AmDDs6ZOEI5zhwxioePw/Cg=
-=9lKb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/trunk/build.gradle b/trunk/build.gradle
deleted file mode 100644
index 6368c16..0000000
--- a/trunk/build.gradle
+++ /dev/null
@@ -1,294 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-buildscript {
-	repositories {
-		maven { url "https://plugins.gradle.org/m2/" }
-	}
-
-	dependencies {
-		classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.2'
-	}
-}
-
-// For help converting an Ant build to a Gradle build, see
-// https://docs.gradle.org/current/userguide/ant.html
-
-ant.importBuild 'build.xml'
-
-/**
-
-Define properties for all projects, including this one 
-
-*/
-allprojects {
-	apply plugin: 'eclipse'
-
-	task wrapper(type: Wrapper) {
-	    gradleVersion = '2.14.1'
-	}
-	
-	task adjustWrapperPropertiesFile << {
-		ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) {
-			fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties')
-		}
-		new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') }
-		ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf')
-	}
-	wrapper.finalizedBy adjustWrapperPropertiesFile
-}
-
-/**
-
-Define things that are only necessary in sub-projects, but not in the master-project itself
-
-*/
-subprojects {
-    //Put instructions for each sub project, but not the master
-    apply plugin: 'java'
-    apply plugin: 'jacoco'
-
-    // See https://github.com/melix/japicmp-gradle-plugin 
-	apply plugin: 'me.champeau.gradle.japicmp'
-        
-	version = '3.16-beta1'
-	ext {
-		japicmpversion = '3.15'
-	}
-
-	tasks.withType(JavaCompile) {
-	    options.encoding = 'UTF-8'
-	}
-
-    sourceCompatibility = 1.6
-
-    repositories {
-        mavenCentral()
-    }
-
-	jar {
-		manifest {
-			attributes 'Implementation-Title': 'Apache POI', 'Implementation-Version': version
-		}
-	}
-
-    test {
-		// Exclude some tests that are not actually tests or do not run cleanly on purpose
-		exclude '**/BaseTestBorderStyle.class'
-		exclude '**/BaseTestCellUtil.class'
-		exclude '**/TestUnfixedBugs.class'
-		exclude '**/TestOneFile.class'
-
-        systemProperties = System.properties
-    
-        // set heap size for the test JVM(s)
-        minHeapSize = "128m"
-        maxHeapSize = "768m"
-  
-        // show standard out and standard error of the test JVM(s) on the console
-        //testLogging.showStandardStreams = true
-
-        // http://forums.gradle.org/gradle/topics/jacoco_related_failure_in_multiproject_build
-        systemProperties['user.dir'] = workingDir
-        
-        systemProperties['POI.testdata.path'] = '../../test-data'
-        //systemProperties['user.language'] = 'en'
-        //systemProperties['user.country'] = 'US'
-    }
-
-	test.beforeSuite { TestDescriptor suite ->
-	   System.setProperty('user.language', 'en')
-	   System.setProperty('user.country', 'US')
-	}
-
-    jacoco {
-        toolVersion = '0.7.7.201606060606'
-    }
-    
-    // ensure the build-dir exists
-    projectDir.mkdirs()
-}
-
-project('main') {
-	sourceSets.main.java.srcDirs = ['../../src/java']
-	sourceSets.main.resources.srcDirs = ['../../src/resources/main']
-	sourceSets.test.java.srcDirs = ['../../src/testcases']
-	
-	dependencies {
-		compile 'commons-codec:commons-codec:1.10'
-		compile 'commons-logging:commons-logging:1.2'
-		
-		testCompile 'junit:junit:4.12'
-	}
-	
-	// Create a separate jar for test-code to depend on it in other projects
-	// See http://stackoverflow.com/questions/5144325/gradle-test-dependency
-	task testJar(type: Jar, dependsOn: testClasses) {
-		baseName = "test-${project.archivesBaseName}"
-		from sourceSets.test.output
-	}
-
-	configurations {
-		tests
-	}
-
-	artifacts {
-		tests testJar
-	}
-
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
-}
-
-project('ooxml') {
-	sourceSets.main.java.srcDirs = ['../../src/ooxml/java']
-	sourceSets.main.resources.srcDirs = ['../../src/ooxml/resources', '../../src/resources/ooxml']
-	sourceSets.test.java.srcDirs = ['../../src/ooxml/testcases']
-
-    // for now import the ant-task for building the jars from build.xml
-    // we need to rename the tasks as e.g. task "jar" conflicts with :ooxml:jar
-	ant.importBuild('../../build.xml') { antTargetName ->
-		'ant-' + antTargetName
-	}
-	compileJava.dependsOn 'ant-compile-ooxml-xsds'
-	
-	dependencies {
-		compile 'org.apache.xmlbeans:xmlbeans:2.6.0'
-		compile 'org.apache.commons:commons-collections4:4.1'
-		compile 'org.apache.santuario:xmlsec:2.0.6'
-		compile 'org.bouncycastle:bcpkix-jdk15on:1.54'
-		compile 'com.github.virtuald:curvesapi:1.04'
-		
-		// for ooxml-lite, should we move this somewhere else?
-		compile 'junit:junit:4.12'
-
-		compile project(':main')
-		compile project(':scratchpad')		// TODO: get rid of this dependency!
-		compile files('../../ooxml-lib/ooxml-schemas-1.3.jar')
-		compile files('../../ooxml-lib/ooxml-security-1.1.jar')
-		
-		testCompile 'junit:junit:4.12'
-		testCompile project(path: ':main', configuration: 'tests')
-	}
-
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi-ooxml:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
-}
-
-project('examples') {
-	sourceSets.main.java.srcDirs = ['../../src/examples/src']
-	
-	dependencies {
-		compile project(':main')
-		compile project(':ooxml')
-	}
-}
-
-
-project('excelant') {
-	sourceSets.main.java.srcDirs = ['../../src/excelant/java']
-	sourceSets.main.resources.srcDirs = ['../../src/excelant/resources']
-	sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
-	
-	dependencies {
-		compile 'org.apache.ant:ant:1.9.4'
-
-		compile project(':main')
-		compile project(':ooxml')
-
-		testCompile project(path: ':main', configuration: 'tests')
-	}
-
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi-excelant:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
-}
-
-project('integrationtest') {
-	sourceSets.test.java.srcDirs = ['../../src/integrationtest']
-	
-	dependencies {
-		compile 'org.apache.ant:ant:1.9.4'
-
-		compile project(':main')
-		compile project(':ooxml')
-		compile project(':scratchpad')
-		compile project(':examples')
-		
-		testCompile 'junit:junit:4.12'
-	}
-
-    test {
-		// exclude these from the normal test-run
-		exclude '**/TestAllFiles.class'
-		exclude '**/*FileHandler.class'
-		exclude '**/RecordsStresser.class'
-	}
-	
-	task integrationTest(type: Test) {
-		// these are just tests used during development of more test-code
-		exclude '**/*FileHandler.class'
-		exclude '**/RecordStresser.class'
-	}
-}
-
-project('scratchpad') {
-	sourceSets.main.java.srcDirs = ['../../src/scratchpad/src']
-	sourceSets.main.resources.srcDirs = ['../../src/resources/scratchpad']
-	sourceSets.test.java.srcDirs = ['../../src/scratchpad/testcases']
-	
-	dependencies {
-		compile project(':main')
-		// cyclic-dependency here: compile project(':ooxml')
-		
-		testCompile 'junit:junit:4.12'
-		testCompile project(path: ':main', configuration: 'tests')
-	}
-
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi-scratchpad:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
-}
diff --git a/trunk/build.xml b/trunk/build.xml
deleted file mode 100644
index 23e2ef2..0000000
--- a/trunk/build.xml
+++ /dev/null
@@ -1,2671 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!--
-    This build was tested with ant 1.9.4 although it will probably work with
-    other versions, however at least 1.8.0 is required.
-
-    To build the documentation you will need to install forrest and set
-    the FORREST_HOME environment variable.  Forrest 0.5.1 required.
-
-    Since POI 3.11 you will need JDK 1.6 or newer to build POI.
-
-    Some people may find the tests hang when run through Ant. If this
-    happens to you, try giving Ant some more memory when you run it, eg:
-          ANT_OPTS="-Xmx1024m -XX:MaxPermSize=256m" ant test
-
- -->
-<project name="POI Build" default="help" basedir="."
-    xmlns:mvn="antlib:org.apache.maven.artifact.ant"
-    xmlns:openpgp="antlib:org.apache.commons.openpgp.ant"
-    xmlns:staging="antlib:org.sonatype.nexus.ant.staging"
-    xmlns:if="ant:if"
-    xmlns:unless="ant:unless">
-
-    <description>The Apache POI project Ant build.</description>
-
-    <property name="version.id" value="3.16-beta1"/>
-    <property name="release.rc" value="RC1"/>
-
-    <property environment="env"/>
-    <!-- the repository to download jars from -->
-    <property name="repository.m2" value="https://repo1.maven.org"/>
-    <property name="repository.pentaho" value="http://repo.pentaho.org/"/>
-
-    <property name="main.lib" location="lib"/>
-    <property name="ooxml.lib" location="ooxml-lib"/>
-    <property name="compile.lib" location="compile-lib"/>
-    <property name="forrest.home" value="${env.FORREST_HOME}"/>
-
-    <!-- compiler options options -->
-    <property name="jdk.version.source" value="1.6" description="JDK version of source code"/>
-    <property name="jdk.version.class" value="1.6" description="JDK version of generated class files"/>
-    <property name="compile.debug" value="true"/>
-
-    <!--
-        Logging is suppressed by default.
-        To redirect log output to console, run ant with -Dorg.apache.poi.util.POILogger=org.apache.poi.util.SystemOutLogger
-    -->
-    <property name="org.apache.poi.util.POILogger" value="org.apache.poi.util.NullLogger"/>
-
-    <!-- issue warnings if source code contains unmappable characters for encoding ASCII  -->
-    <property name="java.source.encoding" value="ASCII"/>
-
-    <scriptdef name="propertyreset" language="javascript"
-        description="Allows to assign @{property} new value">
-        <attribute name="name"/>
-        <attribute name="value"/>
-            project.setProperty(attributes.get("name"), attributes.get("value"));
-    </scriptdef>
-
-    <!--
-      JVM system properties for running tests,
-      user.language and user.country are required as we have locale-sensitive formatters
-    -->
-    <property name="testpattern" value="Test*"/> <!--note: this excludes BaseTest* -->
-    <property name="POI.testdata.path" value="test-data"/>
-    <property name="java.awt.headless" value="true"/>
-    <property name="additionaljar" value=""/>
-    <propertyreset name="user.language" value="en"/>
-    <propertyreset name="user.country" value="US"/>
-    <condition property="http_proxy" value="${env.http_proxy}" else="">
-        <isset property="env.http_proxy"/>
-    </condition>
-    <!-- Fix for strange woodstox references in gump build -->
-    <property name="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
-	<!-- need to override POILogger property before commons logging works -->
-    <property name="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.Log4JLogger"/>
-
-
-    <!-- Main: -->
-    <property name="main.resource1.dir" value="src/resources/main"/>
-    <property name="main.src" location="src/java"/>
-    <property name="main.src.test" location="src/testcases"/>
-    <property name="main.documentation" value="src/documentation"/>
-    <property name="main.output.dir" location="build/classes"/>
-    <property name="main.output.test.dir" location="build/test-classes"/>
-    <property name="main.reports.test" location="build/test-results"/>
-    <property name="main.testokfile" location="build/main-testokfile.txt"/>
-
-    <!-- HSSF subset of Main: -->
-    <property name="main.hssf.testokfile" location="build/main-hssf-testokfile.txt"/>
-
-    <!-- Scratchpad: -->
-    <property name="scratchpad.resource1.dir" value="src/resources/scratchpad"/>
-    <property name="scratchpad.src" location="src/scratchpad/src"/>
-    <property name="scratchpad.src.test" location="src/scratchpad/testcases"/>
-    <property name="scratchpad.reports.test" location="build/scratchpad-test-results"/>
-    <property name="scratchpad.output.dir" location="build/scratchpad-classes"/>
-    <property name="scratchpad.output.test.dir" location="build/scratchpad-test-classes"/>
-    <property name="scratchpad.testokfile" location="build/scratchpad-testokfile.txt"/>
-
-    <!-- Scratchpad/Geometry -->
-    <property name="geometry.pkg" value="org.apache.poi.sl.draw.binding"/>
-    <property name="geometry.output.tmpdir" value="build/geometry-java"/>
-
-    <!-- Examples: -->
-    <property name="examples.src" location="src/examples/src"/>
-    <property name="examples.output.dir" location="build/examples-classes"/>
-
-    <!-- OOXML support: -->
-    <property name="ooxml.src" location="src/ooxml/java"/>
-    <property name="ooxml.resource1.dir" value="src/resources/ooxml"/>
-    <property name="ooxml.src.test" location="src/ooxml/testcases"/>
-    <property name="ooxml.reports.test" location="build/ooxml-test-results"/>
-    <property name="ooxml.output.dir" location="build/ooxml-classes"/>
-    <property name="ooxml.output.test.dir" location="build/ooxml-test-classes"/>
-    <property name="ooxml.testokfile" location="build/ooxml-testokfile.txt"/>
-    <property name="ooxml.lite.output.dir" location="build/ooxml-lite-classes"/>
-    <property name="ooxml.lite.testokfile" location="build/ooxml-lite-testokfile.txt"/>
-
-    <!-- XSSF/SXSSF subset of OOXML: -->
-    <property name="ooxml.ss.testokfile" location="build/ooxml-ss-testokfile.txt"/>
-
-    <!-- Integration testing: -->
-    <property name="integration.src.test" location="src/integrationtest"/>
-    <property name="integration.reports.test" location="build/integration-test-results"/>
-    <property name="integration.output.test.dir" location="build/integration-test-classes"/>
-    <property name="integration.testokfile" location="build/integration-testokfile.txt"/>
-
-    <!-- Excelant: -->
-    <property name="excelant.resource.dir" value="src/excelant/resources"/>
-    <property name="excelant.src" location="src/excelant/java"/>
-    <property name="excelant.src.test" location="src/excelant/testcases"/>
-    <property name="excelant.reports.test" location="build/excelant-test-results"/>
-    <property name="excelant.output.dir" location="build/excelant-classes"/>
-    <property name="excelant.output.test.dir" location="build/excelant-test-classes"/>
-    <property name="excelant.testokfile" location="build/excelant-testokfile.txt"/>
-
-    <!-- jars in the /lib directory, see the fetch-jars target-->
-    <property name="main.commons-logging.jar" location="${main.lib}/commons-logging-1.2.jar"/>
-    <property name="main.commons-logging.url"
-              value="${repository.m2}/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <property name="main.commons-codec.jar" location="${main.lib}/commons-codec-1.10.jar"/>
-    <property name="main.commons-codec.url"
-              value="${repository.m2}/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"/>
-    <property name="main.log4j.jar" location="${main.lib}/log4j-1.2.17.jar"/>
-    <property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
-    <property name="main.junit.jar" location="${main.lib}/junit-4.12.jar"/>
-    <property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/4.12/junit-4.12.jar"/>
-    <property name="main.hamcrest.jar" location="${main.lib}/hamcrest-core-1.3.jar"/>
-    <property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <property name="main.ant.jar" location="${main.lib}/ant-1.9.4.jar"/>
-    <property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.9.4/ant-1.9.4.jar"/>
-    <property name="main.antlauncher.jar" location="${main.lib}/ant-launcher-1.9.4.jar"/>
-    <property name="main.antlauncher.url" value="${repository.m2}/maven2/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.jar"/>
-    <property name="main.commons-collections4.jar" location="${main.lib}/commons-collections4-4.1.jar"/>
-    <property name="main.commons-collections4.url"
-              value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar"/>
-
-    <!-- xml signature libs -->
-    <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.0.6.jar"/>
-    <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.0.6/xmlsec-2.0.6.jar"/>
-    <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.54.jar"/>
-    <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.54/bcprov-ext-jdk15on-1.54.jar"/>
-    <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.54.jar"/>
-    <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.54/bcpkix-jdk15on-1.54.jar"/>
-    <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.12.jar"/>
-    <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar"/>
-
-    <!-- jars in the lib-ooxml directory, see the fetch-ooxml-jars target-->
-    <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.04.jar"/>
-    <property name="ooxml.curvesapi.url"
-              value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar"/>
-    <property name="ooxml.xmlbeans23.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
-    <property name="ooxml.xmlbeans23.url"
-              value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
-    <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.0.jar"/>
-    <property name="ooxml.xmlbeans26.url"
-              value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/>
-
-    <!-- coverage libs -->
-    <property name="jacoco.zip" location="${main.lib}/jacoco-0.7.7.201606060606.zip"/>
-    <property name="jacoco.url" value="${repository.m2}/maven2/org/jacoco/jacoco/0.7.7.201606060606/jacoco-0.7.7.201606060606.zip"/>
-    <property name="asm.jar" location="${main.lib}/asm-all-5.0.3.jar"/>
-    <property name="asm.url" value="${repository.m2}/maven2/org/ow2/asm/asm-all/5.0.3/asm-all-5.0.3.jar"/>
-
-    <!-- license and api checks -->
-    <property name="rat.jar" location="${main.lib}/apache-rat-0.12.jar"/>
-    <property name="rat.url" value="${repository.m2}/maven2/org/apache/rat/apache-rat/0.12/apache-rat-0.12.jar"/>
-    <property name="forbidden.jar" location="${main.lib}/forbiddenapis-2.1.jar"/>
-    <property name="forbidden.url" value="${repository.m2}/maven2/de/thetaphi/forbiddenapis/2.1/forbiddenapis-2.1.jar"/>
-
-    <!-- See http://www.ecma-international.org/publications/standards/Ecma-376.htm -->
-    <!-- "Copy these file(s), free of charge" -->
-    <property name="ooxml.xsds.ozip.1" value="OfficeOpenXML-Part4.zip"/>
-    <property name="ooxml.xsds.izip.1" value="OfficeOpenXML-XMLSchema.zip"/>
-    <property name="ooxml.xsds.url.1"
-              value="http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip"/>
-    <property name="ooxml.xsds.src.dir" location="build/ooxml-xsds-src"/>
-    <property name="ooxml.xsds.src.jar" location="${ooxml.lib}/ooxml-schemas-1.3-sources.jar"/>
-    <property name="ooxml.xsds.jar" location="${ooxml.lib}/ooxml-schemas-1.3.jar"/>
-
-    <!-- additional schemas are packed into the poi schemas jar, -->
-    <!-- so we don't have to care about a seperate versioning of the original ooxml schemas -->
-    <property name="ooxml.xsds.dsig.1" value="https://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
-    <property name="ooxml.xsds.dsig.2" value="http://uri.etsi.org/01903/v1.3.2/XAdES.xsd"/>
-    <property name="ooxml.xsds.dsig.3" value="http://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd"/>
-    <property name="ooxml.xsds.ozip.2" value="OfficeOpenXML-Part2.zip"/>
-    <property name="ooxml.xsds.izip.2" value="OpenPackagingConventions-XMLSchema.zip"/>
-    <property name="ooxml.xsds.url.2"
-              value="http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%202%20(PDF).zip"/>
-    <property name="ooxml.security.src.dir" location="build/ooxml-security-src"/>
-    <property name="ooxml.security.src.jar" location="${ooxml.lib}/ooxml-security-1.1-sources.jar"/>
-    <property name="ooxml.security.jar" location="${ooxml.lib}/ooxml-security-1.1.jar"/>
-    <property name="ooxml.security.xsd.dir" location="src/ooxml/resources/org/apache/poi/poifs/crypt"/>
-    <property name="ooxml.visio.xsd.dir" location="src/ooxml/resources/org/apache/poi/xdgf"/>
-    <property name="ooxml.schema.xsdconfig.dir" location="src/ooxml/resources/org/apache/poi/schemas"/>
-
-
-    <property name="maven.ooxml.xsds.version.id" value="1.3"/>
-    <property name="maven.ooxml.xsds.jar" value="ooxml-schemas-${maven.ooxml.xsds.version.id}.jar"/>
-
-    <!-- Coverage -->
-    <property name="coverage.dir" value="build/coverage"/>
-    <!-- Exclude some uninteresting classes from coverage-instrumentation as we do not want to measure coverage in those packages anyway -->
-    <property name="coverage.excludes" value="org.openxmlformats.*:com.*:org.junit.*:junit.*:org.etsi.*:org.w3.*"/>
-
-    <!-- Apache RAT license check properties -->
-    <property name="rat.reportdir" value="build/rat"/>
-    <property name="rat.report" value="${rat.reportdir}/report.txt"/>
-
-    <!-- build and distro settings -->
-    <property name="jar.name" value="poi"/>
-    <property name="build.site" location="build/tmp/site/build/site"/>
-    <property name="build.site.src" location="build/tmp/site"/>
-    <property name="apidocs.report.dir" location="${build.site}/apidocs"/>
-    <property name="dist.dir" location="build/dist"/>
-    <property name="halt.on.test.failure" value="true"/>
-
-    <!-- helper jars for pgp signing, building and nexus staging -->
-    <property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.51.jar"/>
-    <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.51/bcprov-ext-jdk15on-1.51.jar"/>
-    <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.51.jar"/>
-    <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.51/bcpg-jdk15on-1.51.jar"/>
-    <property name="dist.commons-openpgp.jar" location="${compile.lib}/commons-openpgp-1.0-SNAPSHOT.jar"/>
-    <property name="dist.commons-openpgp.url" value="https://repository.apache.org/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20140717.171036-11.jar"/>
-    <property name="dist.nexus-staging.jar" location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
-    <property name="dist.nexus-staging.url" value="${repository.m2}/maven2/org/sonatype/nexus/ant/nexus-staging-ant-tasks/1.6.3/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
-
-    <property name="dist.svnant.zip" location="${compile.lib}/svnant/svnant-1.3.1.zip"/>
-    <property name="dist.svnant.url" value="http://subclipse.tigris.org/files/documents/906/49042/svnant-1.3.1.zip"/>
-    <property name="dist.svnclient.jar" location="${compile.lib}/svnant/svnClientAdapter-1.3.0.jar"/>
-    <property name="dist.svnclient.url" value="${repository.pentaho}/content/groups/omni/tigris/svnClientAdapter/svnant-1.3.0/svnClientAdapter-svnant-1.3.0.jar"/>
-    <property name="dist.svnkit.jar" location="${compile.lib}/svnant/svnkit-1.8.11.jar"/>
-    <property name="dist.svnkit.url" value="${repository.m2}/maven2/org/tmatesoft/svnkit/svnkit/1.8.11/svnkit-1.8.11.jar"/>
-    <property name="dist.svnkit-javahl16.jar" location="${compile.lib}/svnant/svnkit-javahl16-1.8.11.jar"/>
-    <property name="dist.svnkit-javahl16.url" value="${repository.m2}/maven2/org/tmatesoft/svnkit/svnkit-javahl16/1.8.11/svnkit-javahl16-1.8.11.jar"/>
-    <property name="dist.sqljet.jar" location="${compile.lib}/svnant/sqljet-1.1.10.jar"/>
-    <property name="dist.sqljet.url" value="${repository.m2}/maven2/org/tmatesoft/sqljet/sqljet/1.1.10/sqljet-1.1.10.jar"/>
-    <property name="dist.antlr.jar" location="${compile.lib}/svnant/antlr-runtime-3.5.2.jar"/>
-    <property name="dist.antlr.url" value="${repository.m2}/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar"/>
-    <property name="dist.sequence-library.jar" location="${compile.lib}/svnant/sequence-library-1.0.3.jar"/>
-    <property name="dist.sequence-library.url" value="${repository.m2}/maven2/de/regnis/q/sequence/sequence-library/1.0.3/sequence-library-1.0.3.jar"/>
-
-
-    <!-- ===========================================================================================================
-         NOTE: we did not update to 3.x yet because it requires Java 7, but we are still supporting Java 6 currently
-         ===========================================================================================================
-    -->
-    <condition property="findbugs.version" value="2.0.3" else="3.0.1">
-        <contains string="${java.version}" substring="1.6"/>
-    </condition>
-    <property name="findbugs.url" value="http://prdownloads.sourceforge.net/findbugs/findbugs-noUpdateChecks-${findbugs.version}.zip?download"/>
-	<property name="findbugs.jar" location="${main.lib}/findbugs-noUpdateChecks-${findbugs.version}.zip"/>
-
-    <propertyset id="junit.properties">
-        <propertyref name="POI.testdata.path"/>
-        <propertyref name="java.awt.headless"/>
-        <propertyref name="org.apache.poi.util.POILogger"/>
-        <propertyref name="http_proxy"/>
-        <propertyref name="additionaljar"/>
-        <propertyref name="user.language"/>
-        <propertyref name="user.country"/>
-        <propertyref name="javax.xml.stream.XMLInputFactory"/>
-    	<propertyref name="org.apache.commons.logging.Log"/>
-        <propertyref name="java.locale.providers"/>		<!-- required for Java 9 compilation -->
-        <propertyref name="version.id"/>    <!-- to detect if we are running on slow Gump VM -->
-    </propertyset>
-
-    <!-- this can be overwriten to empty when running with Java 9 -->
-    <property name="maxpermsize" value="-XX:MaxPermSize=256m"/>
-    <property name="java9addmods" value="-Dthis.is.a.dummy=true"/>
-    <property name="java9addmodsvalue" value="-Dthis.is.a.dummy=true"/>
-
-    <path id="main.classpath">
-        <pathelement location="${main.commons-logging.jar}"/>
-        <pathelement location="${main.commons-codec.jar}"/>
-        <pathelement location="${main.log4j.jar}"/>
-        <pathelement location="${main.junit.jar}"/>
-        <pathelement location="${main.hamcrest.jar}"/>
-        <pathelement location="${main.commons-collections4.jar}"/>
-    </path>
-
-    <path id="scratchpad.classpath">
-        <path refid="main.classpath"/>
-        <pathelement location="${main.output.dir}"/>
-    </path>
-
-    <path id="ooxml.xmlsec.classpath">
-        <pathelement location="${dsig.xmlsec.jar}"/>
-        <pathelement location="${dsig.bouncycastle-prov.jar}"/>
-        <pathelement location="${dsig.bouncycastle-pkix.jar}"/>
-        <pathelement location="${dsig.sl4j-api.jar}"/>
-    </path>
-
-    <path id="ooxml.classpath">
-        <pathelement location="${ooxml.curvesapi.jar}"/>
-        <pathelement location="${ooxml.xmlbeans26.jar}"/>
-        <pathelement location="${ooxml.xsds.jar}"/>
-        <path refid="main.classpath"/>
-        <pathelement location="${main.output.dir}"/>
-        <pathelement location="${ooxml.security.jar}"/>
-        <!-- classes are omitted on test cases outside the xml-dsign area to avoid classpath poisioning -->
-        <!--path refid="ooxml.xmlsec.classpath"/-->
-        <!-- Used only for ExtractorFactory, see #57963 -->
-        <pathelement location="${scratchpad.output.dir}"/>
-    </path>
-
-    <path id="test.classpath">
-        <path refid="main.classpath"/>
-        <pathelement location="${main.output.dir}"/>
-        <pathelement location="${main.output.test.dir}"/>
-        <pathelement location="${additionaljar}"/>
-    </path>
-
-    <path id="test.scratchpad.classpath">
-        <path refid="scratchpad.classpath"/>
-        <pathelement location="${main.output.test.dir}"/>
-        <pathelement location="${scratchpad.output.dir}"/>
-        <pathelement location="${scratchpad.output.test.dir}"/>
-        <pathelement location="${additionaljar}"/>
-    </path>
-
-    <path id="test.ooxml.classpath">
-        <path refid="ooxml.classpath"/>
-        <pathelement location="${ooxml.output.dir}"/>
-        <pathelement location="${ooxml.output.test.dir}"/>
-        <pathelement location="${main.output.test.dir}"/>
-        <pathelement location="${additionaljar}"/>
-    </path>
-
-    <path id="test.integration.classpath">
-        <pathelement location="${integration.src.test}"/>
-        <path refid="scratchpad.classpath"/>
-        <path refid="ooxml.classpath"/>
-        <pathelement location="${main.output.test.dir}"/>
-        <pathelement location="${ooxml.output.dir}"/>
-        <pathelement location="${integration.output.test.dir}"/>
-        <pathelement location="${examples.output.dir}"/>
-    </path>
-
-    <path id="ooxml-lite.classpath">
-        <pathelement location="${ooxml.curvesapi.jar}"/>
-        <pathelement location="${ooxml.xmlbeans26.jar}"/>
-        <pathelement location="${ooxml.lite.output.dir}"/> <!-- instead of ooxml-xsds.jar use the filtered classes-->
-        <path refid="main.classpath"/>
-        <pathelement location="${main.output.dir}"/>
-        <pathelement location="${scratchpad.output.dir}"/>
-        <!--path refid="ooxml.classpath"/-->
-        <pathelement location="${ooxml.output.dir}"/>
-        <pathelement location="${ooxml.output.test.dir}"/>
-        <pathelement location="${main.output.test.dir}"/>
-        <pathelement location="${ooxml.security.jar}"/>
-    </path>
-
-
-    <path id="examples.classpath">
-        <path refid="main.classpath"/>
-        <pathelement location="${main.output.dir}"/>
-        <pathelement location="${scratchpad.output.dir}"/>
-    </path>
-
-    <path id="excelant.classpath">
-        <path refid="ooxml.classpath"/>
-        <pathelement location="${main.ant.jar}"/>
-        <pathelement location="${ooxml.output.dir}"/>
-    </path>
-
-    <path id="test.excelant.classpath">
-        <path refid="ooxml.classpath"/>
-        <pathelement location="${ooxml.output.dir}"/>
-        <pathelement location="${excelant.output.dir}"/>
-        <pathelement location="${excelant.output.test.dir}"/>
-        <pathelement location="${main.output.test.dir}"/>
-        <pathelement location="${additionaljar}"/>
-    </path>
-
-    <path id="javadoc.classpath">
-        <path refid="main.classpath"/>
-        <path refid="scratchpad.classpath"/>
-        <path refid="ooxml.classpath"/>
-        <path refid="ooxml.xmlsec.classpath"/>
-        <path path="${env.CLASSPATH}"/>
-    </path>
-
-    <path id="forbiddenapis.classpath">
-        <path refid="main.classpath"/>
-        <path refid="scratchpad.classpath"/>
-        <path refid="ooxml.classpath"/>
-        <path refid="ooxml.xmlsec.classpath"/>
-        <path refid="excelant.classpath"/>
-        <path path="${env.CLASSPATH}"/>
-    </path>
-
-    <path id="lib.jacoco">
-        <fileset dir="lib">
-            <include name="org.jacoco*.jar" />
-            <include name="asm-all-*.jar" />
-        </fileset>
-    </path>
-
-    <!-- Prints POI's Ant usage help -->
-    <target name="help" description="Prints Apache POI's Ant usage help">
-      <echo>
-  This is POI ${version.id}
-  Java Version ${ant.java.version}/${java.version}
-  Timestamp ${DSTAMP}
-  The main targets of interest are:
-    - clean       Erase all build work products (ie. everything in the build directory)
-    - compile     Compile all files from main, ooxml and scratchpad
-    - test        Run all unit tests from main, ooxml and scratchpad
-    - jar         Produce jar files
-    - jar-src     Produce source-jar files
-    - assemble    Produce the zipped distribution files
-    - site        Generate all documentation (Requires Apache Forrest)
-    - dist        Create a distribution (Requires Apache Forrest)
-        </echo>
-    </target>
-
-    <tstamp>
-        <format property="tstamp.year" pattern="yyyy"/>
-    </tstamp>
-
-    <target name="init" depends="fetch-jars,fetch-ooxml-jars" description="Initialization run before other targets.">
-        <mkdir dir="build"/>
-        <mkdir dir="${main.output.dir}"/>
-        <mkdir dir="${main.output.test.dir}"/>
-        <mkdir dir="${main.reports.test}"/>
-        <mkdir dir="${scratchpad.output.dir}"/>
-        <mkdir dir="${scratchpad.output.test.dir}"/>
-        <mkdir dir="${scratchpad.reports.test}"/>
-        <mkdir dir="${geometry.output.tmpdir}"/>
-        <mkdir dir="${ooxml.output.dir}"/>
-        <mkdir dir="${ooxml.output.test.dir}"/>
-        <mkdir dir="${ooxml.reports.test}"/>
-        <mkdir dir="${excelant.output.dir}"/>
-        <mkdir dir="${excelant.output.test.dir}"/>
-        <mkdir dir="${excelant.reports.test}"/>
-        <mkdir dir="${examples.output.dir}"/>
-        <mkdir dir="${integration.output.test.dir}"/>
-        <mkdir dir="${integration.reports.test}"/>
-        <mkdir dir="${dist.dir}"/>
-        <mkdir dir="${build.site}"/>
-
-        <echo message="Using Ant: ${ant.version} from ${ant.home}, Ant detected Java ${ant.java.version} (may be different than actual Java sometimes...)" />
-        <echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
-        <echo message="Using Findbugs: ${findbugs.version} for Java ${java.version}"/>
-
-        <scriptdef name="release_tag" language="javascript">
-            var rel = ("REL_"+project.getProperty("version.id")).toUpperCase().replace(/\W/g,"_");
-            if (rel.search(/BETA/) == -1) rel += "_FINAL";
-            project.setProperty("RELEASE_TAG", rel);
-        </scriptdef>
-        <release_tag/>
-    </target>
-
-    <target name="clean" description="Remove generated artefacts">
-        <delete dir="build"/>
-        <delete includeemptydirs="true">
-            <fileset dir="sonar">
-                <include name="*/target/**"/>
-                <include name="*/build/**"/>
-                <include name="*/src/**"/>
-            </fileset>
-        </delete>
-    </target>
-
-    <macrodef name="downloadfile">
-        <attribute name="src"/>
-        <attribute name="dest"/>
-        <sequential>
-            <!--fail
-                message="Java version might be uncapable to download https URLs - see https://stackoverflow.com/questions/6851461/java-why-does-ssl-handshake-give-could-not-generate-dh-keypair-exception">
-                <condition>
-                    <and>
-                        <equals arg1="${ant.java.version}" arg2="1.6"/>
-                        <contains string="@{src}" substring="https"/>
-                    </and>
-                </condition>
-            </fail-->
-            <get src="@{src}" dest="@{dest}" skipexisting="true"/>
-        </sequential>
-    </macrodef>
-
-    <target name="check-jars">
-        <!-- remove previous versions of third-party jars to prevent them from lingering around,
-            we often had hard-to-find build/CI-problems because of these! -->
-        <mkdir dir="${main.lib}"/>
-        <mkdir dir="${compile.lib}"/>
-        <mkdir dir="${ooxml.lib}"/>
-        <delete verbose="true">
-            <fileset dir="${main.lib}">
-                <include name="ant-1.8*"/>
-                <include name="asm-all-4*"/>
-                <include name="commons-codec-1.5*"/>
-                <include name="commons-codec-1.9*"/>
-                <include name="commons-logging-1.1*.jar"/>
-                <include name="jacoco-0.6*"/>
-                <include name="jacoco-0.7.1*"/>
-                <include name="jacoco-0.7.2*"/>
-                <include name="jacoco-0.7.3*"/>
-                <include name="jacoco-0.7.4*"/>
-                <include name="jacoco-0.7.6*"/>
-                <include name="log4j-1.2.13*"/>
-                <include name="org.jacoco.*-0.6.*"/>
-                <include name="org.jacoco.*-0.7.1*"/>
-                <include name="org.jacoco.*-0.7.2*"/>
-                <include name="org.jacoco.*-0.7.3*"/>
-                <include name="org.jacoco.*-0.7.4*"/>
-                <include name="org.jacoco.*-0.7.6*"/>
-                <include name="dom4j*"/>
-                <include name="apache-rat-0.10*"/>
-                <include name="xercesImpl-*.jar"/>
-                <include name="junit-3*"/>
-                <include name="junit-4.11*"/>
-                <include name="forbiddenapis-1.*.jar"/>
-                <include name="forbiddenapis-2.0.jar"/>
-                <include name="apache-rat-0.11.jar"/>
-            </fileset>
-            <fileset dir="${ooxml.lib}">
-                <!-- remove jars from previous versions, but not the current version -->
-                <include name="ooxml-schemas-src-1.1.jar"/>
-                <include name="ooxml-schemas-1.1-sources.jar"/>
-                <include name="ooxml-schemas-1.1.jar"/>
-                <include name="ooxml-schemas-1.2-sources.jar"/>
-                <include name="ooxml-schemas-1.2.jar"/>
-                <include name="ooxml-security-1.0-sources.jar"/>
-                <include name="ooxml-security-1.0.jar"/>
-                <include name="curvesapi-1.03.jar"/>
-            </fileset>
-         <fileset dir="${compile.lib}">
-            <include name="xercesImpl-*.jar"/>
-            <include name="xmlsec-2.0.1.jar"/>
-            <include name="xmlsec-2.0.5.jar"/>
-            <include name="bcprov-ext-jdk15on-1.51.jar"/>
-            <include name="bcprov-ext-jdk15on-1.53.jar"/>
-            <include name="bcpkix-jdk15on-1.51.jar"/>
-            <include name="bcpkix-jdk15on-1.53.jar"/>
-            <include name="slf4j-api-1.7.7.jar"/>
-         </fileset>
-        </delete>
-
-        <condition property="jars.present">
-            <or>
-                <and>
-                    <available file="${main.commons-logging.jar}"/>
-                    <available file="${main.commons-codec.jar}"/>
-                    <available file="${main.log4j.jar}"/>
-                    <available file="${main.junit.jar}"/>
-                    <available file="${main.hamcrest.jar}"/>
-                    <available file="${main.ant.jar}"/>
-                    <available file="${main.antlauncher.jar}"/>
-                    <available file="${asm.jar}"/>
-                    <available file="${jacoco.zip}"/>
-                    <available file="${rat.jar}"/>
-                    <available file="${forbidden.jar}"/>
-                    <available file="${dsig.bouncycastle-prov.jar}"/>
-                    <available file="${dsig.bouncycastle-pkix.jar}"/>
-                    <available file="${dsig.xmlsec.jar}"/>
-                    <available file="${dsig.sl4j-api.jar}"/>
-                    <available file="${main.commons-collections4.jar}"/>
-                </and>
-                <isset property="disconnected"/>
-            </or>
-        </condition>
-    </target>
-
-    <target name="fetch-jars" depends="check-jars" unless="jars.present"
-            description="Fetches needed JAR files from the Internet">
-        <mkdir dir="${main.lib}"/>
-        <downloadfile src="${main.commons-logging.url}" dest="${main.commons-logging.jar}"/>
-        <downloadfile src="${main.commons-codec.url}" dest="${main.commons-codec.jar}"/>
-        <downloadfile src="${main.log4j.url}" dest="${main.log4j.jar}"/>
-        <downloadfile src="${main.junit.url}" dest="${main.junit.jar}"/>
-        <downloadfile src="${main.hamcrest.url}" dest="${main.hamcrest.jar}"/>
-        <downloadfile src="${main.ant.url}" dest="${main.ant.jar}"/>
-        <downloadfile src="${main.antlauncher.url}" dest="${main.antlauncher.jar}"/>
-        <downloadfile src="${asm.url}" dest="${asm.jar}"/>
-        <downloadfile src="${jacoco.url}" dest="${jacoco.zip}"/>
-        <downloadfile src="${main.commons-collections4.url}" dest="${main.commons-collections4.jar}"/>
-        <unzip src="${jacoco.zip}" dest=".">
-            <patternset>
-                <include name="lib/*.jar"/>
-            </patternset>
-        </unzip>
-        <downloadfile src="${rat.url}" dest="${rat.jar}"/>
-        <downloadfile src="${forbidden.url}" dest="${forbidden.jar}"/>
-        <downloadfile src="${dsig.bouncycastle-prov.url}" dest="${dsig.bouncycastle-prov.jar}"/>
-        <downloadfile src="${dsig.bouncycastle-pkix.url}" dest="${dsig.bouncycastle-pkix.jar}"/>
-        <downloadfile src="${dsig.xmlsec.url}" dest="${dsig.xmlsec.jar}"/>
-        <downloadfile src="${dsig.sl4j-api.url}" dest="${dsig.sl4j-api.jar}"/>
-    </target>
-
-    <target name="check-ooxml-jars">
-        <condition property="ooxml.jars.present">
-            <or>
-                <and>
-                    <available file="${ooxml.curvesapi.jar}"/>
-                    <available file="${ooxml.xmlbeans23.jar}"/>
-                    <available file="${ooxml.xmlbeans26.jar}"/>
-                </and>
-                <isset property="disconnected"/>
-            </or>
-        </condition>
-    </target>
-    <target name="fetch-ooxml-jars" depends="check-ooxml-jars" unless="ooxml.jars.present">
-        <mkdir dir="${ooxml.lib}"/>
-        <downloadfile src="${ooxml.curvesapi.url}" dest="${ooxml.curvesapi.jar}"/>
-        <downloadfile src="${ooxml.xmlbeans23.url}" dest="${ooxml.xmlbeans23.jar}.orig"/>
-        <downloadfile src="${ooxml.xmlbeans26.url}" dest="${ooxml.xmlbeans26.jar}.orig"/>
-        <!-- remove piccolo parser, so we don't use unsafe calls to it instead of using jaxp -->
-        <zip destfile="${ooxml.xmlbeans23.jar}">
-            <zipfileset src="${ooxml.xmlbeans23.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
-        </zip>
-        <zip destfile="${ooxml.xmlbeans26.jar}">
-            <zipfileset src="${ooxml.xmlbeans26.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
-        </zip>
-    </target>
-    <target name="check-svn-jars">
-        <condition property="svn.jars.present">
-            <or>
-                <and>
-                    <available file="${dist.svnant.zip}"/>
-                    <available file="${dist.svnclient.jar}"/>
-                    <available file="${dist.svnkit.jar}"/>
-                    <available file="${dist.svnkit-javahl16.jar}"/>
-                    <available file="${dist.sqljet.jar}"/>
-                    <available file="${dist.antlr.jar}"/>
-                    <available file="${dist.sequence-library.jar}"/>
-                </and>
-                <isset property="disconnected"/>
-            </or>
-        </condition>
-    </target>
-    <target name="fetch-svn-jars" depends="check-svn-jars" unless="svn.jars.present">
-        <mkdir dir="${compile.lib}/svnant"/>
-        <downloadfile src="${dist.svnant.url}" dest="${dist.svnant.zip}"/>
-        <unzip src="${dist.svnant.zip}" dest="${compile.lib}/svnant">
-            <patternset>
-                <include name="lib/svnant.jar"/>
-            </patternset>
-            <mapper>
-                <chainedmapper>
-                    <flattenmapper/>
-                    <globmapper from="svnant.jar" to="svnant-1.3.1.jar"/>
-                </chainedmapper>
-            </mapper>
-        </unzip>
-        <downloadfile src="${dist.svnclient.url}" dest="${dist.svnclient.jar}"/>
-        <downloadfile src="${dist.svnkit.url}" dest="${dist.svnkit.jar}"/>
-        <downloadfile src="${dist.svnkit-javahl16.url}" dest="${dist.svnkit-javahl16.jar}"/>
-        <downloadfile src="${dist.sqljet.url}" dest="${dist.sqljet.jar}"/>
-        <downloadfile src="${dist.antlr.url}" dest="${dist.antlr.jar}"/>
-        <downloadfile src="${dist.sequence-library.url}" dest="${dist.sequence-library.jar}"/>
-    </target>
-
-    <target name="check-ooxml-xsds">
-        <condition property="ooxml-xsds.present">
-            <or>
-                <and>
-                    <available file="${ooxml.lib}/${ooxml.xsds.izip.1}"/>
-                    <available file="${ooxml.lib}/${ooxml.xsds.izip.2}"/>
-                </and>
-                <isset property="disconnected"/>
-            </or>
-        </condition>
-    </target>
-    <target name="fetch-ooxml-xsds" unless="ooxml-xsds.present"
-        depends="check-ooxml-xsds"
-            description="Fetches needed OOXML xsd files from the Internet">
-        <get dest="${ooxml.lib}" skipexisting="true">
-            <url url="${ooxml.xsds.url.1}"/>
-            <url url="${ooxml.xsds.url.2}"/>
-            <url url="${ooxml.xsds.dsig.1}"/>
-            <url url="${ooxml.xsds.dsig.2}"/>
-            <url url="${ooxml.xsds.dsig.3}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <firstmatchmapper>
-                    <globmapper from="Office%20Open%20XML%201st%20edition%20Part%20*%20(PDF).zip" to="OfficeOpenXML-Part*.zip"/>
-                    <identitymapper/>
-                </firstmatchmapper>
-            </chainedmapper>
-        </get>
-        <unzip src="${ooxml.lib}/${ooxml.xsds.ozip.1}" dest="${ooxml.lib}">
-            <fileset dir="${ooxml.lib}" includes="OfficeOpenXML-Part*.zip"/>
-            <patternset>
-                <include name="${ooxml.xsds.izip.1}"/>
-                <include name="${ooxml.xsds.izip.2}"/>
-            </patternset>
-        </unzip>
-    </target>
-    <target name="check-compiled-ooxml-xsds" depends="fetch-ooxml-xsds">
-        <condition property="ooxml-compiled-xsds.present">
-            <or>
-                <and>
-                    <available file="${ooxml.xsds.jar}"/>
-                    <available file="${ooxml.security.jar}"/>
-                    <available file="${ooxml.xsds.src.jar}"/>
-                    <available file="${ooxml.security.src.jar}"/>
-                </and>
-                <isset property="disconnected"/>
-            </or>
-        </condition>
-    </target>
-
-    <macrodef name="compile-ooxml-xmlbean">
-        <attribute name="classes-jar"/>
-        <attribute name="sources-jar"/>
-        <attribute name="noupa" default="false"/>
-        <attribute name="nopvr" default="false"/>
-        <element name="xsds"/>
-        <sequential>
-            <!-- We need a fair amount of memory to compile the xml schema, -->
-            <!-- but limit it in case it goes wrong! -->
-            <!-- Pick the right amount based on 32 vs 64 bit jvm -->
-            <condition property="ooxml.memory" value="768m" else="512m">
-               <equals arg1="${sun.arch.data.model}" arg2="64" />
-            </condition>
-
-            <taskdef name="xmlbean"
-                     classname="org.apache.xmlbeans.impl.tool.XMLBean"
-                     classpath="${ooxml.xmlbeans23.jar}.orig"/>
-
-            <property name="xmlbean.xsds.dir" location="build/xmlbean-xsds"/>
-            <property name="xmlbean.sources.dir" location="build/xmlbean-sources"/>
-            <property name="xmlbean.classes.dir" location="build/xmlbean-classes"/>
-            <delete dir="${xmlbean.xsds.dir}"/>
-            <mkdir dir="${xmlbean.xsds.dir}"/>
-            <delete dir="${xmlbean.sources.dir}"/>
-            <mkdir dir="${xmlbean.sources.dir}"/>
-            <delete dir="${xmlbean.classes.dir}"/>
-            <mkdir dir="${xmlbean.classes.dir}"/>
-
-            <copy todir="${xmlbean.xsds.dir}">
-                <xsds/>
-            </copy>
-
-            <!-- javasource > 1.5 will not generate all array accessor -->
-            <xmlbean
-                    schema="${xmlbean.xsds.dir}"
-                    srcgendir="${xmlbean.sources.dir}"
-                    classgendir="${xmlbean.classes.dir}"
-                    destfile="${xmlbean.xsds.dir}.jar"
-                    srconly="true"
-                    javasource="1.5"
-                    failonerror="true"
-                    fork="true"
-                    memoryMaximumSize="${ooxml.memory}"
-                    noupa="@{noupa}"
-                    nopvr="@{nopvr}"
-                    >
-                <classpath>
-                    <path location="${ooxml.xmlbeans23.jar}.orig"/>
-                </classpath>
-            </xmlbean>
-
-            <replace dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**">
-                <replacetoken>org.apache.xmlbeans.XmlBeans.getContextTypeLoader()</replacetoken>
-                <replacevalue>org.apache.poi.POIXMLTypeLoader</replacevalue>
-            </replace>
-
-            <!-- remove deprecated warnings, as we prefer the array methods - see #56854 -->
-            <replace dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**">
-                <replacetoken><![CDATA[     * @deprecated
-]]></replacetoken>
-            </replace>
-
-            <copy todir="${xmlbean.sources.dir}">
-                <fileset dir="${ooxml.src}">
-                    <include name="org/apache/poi/POIXMLTypeLoader.java"/>
-                    <include name="org/apache/poi/util/DocumentHelper.java"/>
-                    <include name="org/apache/poi/util/SAXHelper.java"/>
-                </fileset>
-                <fileset dir="${main.src}">
-                    <include name="org/apache/poi/util/POILogFactory.java"/>
-                    <include name="org/apache/poi/util/POILogger.java"/>
-                    <include name="org/apache/poi/util/NullLogger.java"/>
-                    <include name="org/apache/poi/util/Internal.java"/>
-                </fileset>
-            </copy>
-
-            <javac target="${jdk.version.class}"
-                   source="${jdk.version.source}"
-                   srcdir="${xmlbean.sources.dir}"
-                   destdir="${xmlbean.classes.dir}"
-                   encoding="${java.source.encoding}"
-                   fork="yes"
-                   optimize="true"
-                   memoryMaximumSize="${ooxml.memory}"
-                   includeantruntime="false">
-                   <!-- debug="${compile.debug}" -->
-                <classpath refid="ooxml.classpath"/>
-            </javac>
-
-            <jar basedir="${xmlbean.classes.dir}" destfile="@{classes-jar}" excludes="org/apache/**" level="9" />
-            <jar basedir="${xmlbean.sources.dir}" destfile="@{sources-jar}" excludes="org/apache/**" level="9" />
-
-            <delete file="${xmlbean.xsds.dir}.jar"/>
-            <delete dir="${xmlbean.xsds.dir}"/>
-            <delete dir="${xmlbean.sources.dir}"/>
-            <delete dir="${xmlbean.classes.dir}"/>
-        </sequential>
-    </macrodef>
-
-    <target name="compile-ooxml-xsds" unless="ooxml-compiled-xsds.present"
-        depends="init,check-compiled-ooxml-xsds"
-        description="Unpacks the OOXML xsd files, and compiles them into XmlBeans">
-        <compile-ooxml-xmlbean classes-jar="${ooxml.xsds.jar}" sources-jar="${ooxml.xsds.src.jar}">
-            <xsds>
-                <zipfileset src="${ooxml.lib}/${ooxml.xsds.izip.1}"/>
-                <fileset dir="${ooxml.visio.xsd.dir}"/>
-                <fileset dir="${ooxml.schema.xsdconfig.dir}"/>
-            </xsds>
-        </compile-ooxml-xmlbean>
-        <!-- Now do the same for the security schemas -->
-        <compile-ooxml-xmlbean classes-jar="${ooxml.security.jar}" sources-jar="${ooxml.security.src.jar}">
-            <xsds>
-                <zipfileset src="${ooxml.lib}/${ooxml.xsds.izip.2}" includes="opc-digSig.xsd,opc-relationships.xsd"/>
-                <fileset dir="${ooxml.lib}" includes="xmldsig*.xsd,XAdES*.xsd"/>
-                <fileset dir="${ooxml.security.xsd.dir}"/>
-            </xsds>
-        </compile-ooxml-xmlbean>
-    </target>
-
-    <target name="compile" depends="init, compile-main,
-            compile-scratchpad, compile-examples, compile-excelant"
-            description="Compiles the POI main classes, scratchpad and examples"/>
-
-    <target name="compile-all" depends="compile,compile-ooxml-lite"/>
-
-    <target name="compile-main" depends="init">
-        <!-- compile the sources -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${main.output.dir}"
-               srcdir="${main.src}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath refid="main.classpath"/>
-        </javac>
-        <!-- compile the tests -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${main.output.test.dir}"
-               srcdir="${main.src.test}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="main.classpath"/>
-                <pathelement path="${main.output.dir}"/>
-            </classpath>
-        </javac>
-        <copy todir="${main.output.dir}">
-            <fileset dir="${main.resource1.dir}"/>
-        </copy>
-    </target>
-
-    <target name="generate-geometry" depends="fetch-ooxml-xsds" if="ignoreme">
-        <delete dir="${geometry.output.tmpdir}"/>
-        <!-- taskdef xjc -->
-        <!-- "D:\Program Files\Java\jdk1.6.0_45\bin\xjc" -p org.apache.poi.sl.model.geom.binding -readOnly -Xlocator -mark-generated ooxml-schemas\dml-shapeGeometry.xsd -->
-        <unzip src="${ooxml.lib}/${ooxml.xsds.izip.1}" dest="${geometry.output.tmpdir}"/>
-        <exec executable="${env.JAVA_HOME}/bin/xjc">
-            <arg value="-p"/>
-            <arg value="${geometry.pkg}"/>
-            <arg value="-b"/>
-            <arg file="src/types/definitions/dml-shapeGeometry.xjb"/>
-            <arg value="-readOnly"/>
-            <arg value="-npa"/>
-            <arg value="-no-header"/>
-            <!--arg value="-mark-generated"/ -->
-            <!--arg value="-Xlocator"/ -->
-            <arg file="${geometry.output.tmpdir}/dml-shapeGeometry.xsd"/>
-            <arg value="-d"/>
-            <arg file="${geometry.output.tmpdir}"/>
-        </exec>
-        <copy file="src/java/org/apache/poi/POIDocument.java" tofile="${geometry.output.tmpdir}/apache-license.txt">
-            <filterchain>
-            <headfilter lines="16"/>
-            </filterchain>
-        </copy>
-        <copy todir="${main.src}">
-            <fileset dir="${geometry.output.tmpdir}" includes="**/*.java"/>
-             <filterchain>
-                 <concatfilter prepend="${geometry.output.tmpdir}/apache-license.txt"/>
-             </filterchain>
-        </copy>
-    </target>
-
-    <target name="compile-scratchpad" depends="compile-main,generate-geometry">
-        <!-- compile the sources -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${scratchpad.output.dir}"
-               srcdir="${scratchpad.src}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath refid="scratchpad.classpath"/>
-        </javac>
-        <!-- compile the tests -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${scratchpad.output.test.dir}"
-               srcdir="${scratchpad.src.test}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="scratchpad.classpath"/>
-                <pathelement location="${scratchpad.output.dir}"/>
-                <pathelement location="${main.output.test.dir}"/>
-            </classpath>
-        </javac>
-        <copy todir="${scratchpad.output.dir}">
-            <fileset dir="${scratchpad.resource1.dir}"/>
-        </copy>
-    </target>
-
-    <target name="compile-examples" depends="compile-main,compile-scratchpad,compile-ooxml">
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${examples.output.dir}"
-               srcdir="${examples.src}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="ooxml.classpath"/>
-                <pathelement path="${ooxml.output.dir}"/>
-            </classpath>
-        </javac>
-        <copy todir="${examples.output.dir}">
-          <fileset dir="${examples.src}">
-            <include name="**/*.css"/>
-          </fileset>
-        </copy>
-    </target>
-
-    <target name="compile-ooxml" depends="compile-main,compile-scratchpad,compile-ooxml-xsds">
-        <!-- compile the sources -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${ooxml.output.dir}"
-               srcdir="${ooxml.src}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="ooxml.classpath"/>
-                <path refid="ooxml.xmlsec.classpath"/>
-            </classpath>
-        </javac>
-        <!-- compile the tests -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${ooxml.output.test.dir}"
-               srcdir="${ooxml.src.test}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="ooxml.classpath"/>
-                <path refid="ooxml.xmlsec.classpath"/>
-                <path refid="test.ooxml.classpath"/>
-                <pathelement path="${ooxml.output.dir}"/>
-                <pathelement path="${main.output.test.dir}"/>
-            </classpath>
-        </javac>
-        <copy todir="${ooxml.output.dir}">
-            <fileset dir="${ooxml.resource1.dir}"/>
-        </copy>
-    </target>
-
-    <target name="compile-ooxml-ss" depends="compile-main,compile-scratchpad,compile-ooxml-xsds">
-        <!-- depends: compile-scratchpad needed for extractor -->
-        <!-- compile the sources -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${ooxml.output.dir}"
-               srcdir="${ooxml.src}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="ooxml.classpath"/>
-                <path refid="ooxml.xmlsec.classpath"/>
-            </classpath>
-            <include name="org/apache/poi/ss/**/*.java"/>
-            <include name="org/apache/poi/xssf/**/*.java"/>
-            <include name="org/apache/poi/extractor/**/*.java"/>
-        </javac>
-        <!-- compile the tests -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${ooxml.output.test.dir}"
-               srcdir="${ooxml.src.test}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="ooxml.classpath"/>
-                <path refid="ooxml.xmlsec.classpath"/>
-                <path refid="test.ooxml.classpath"/>
-                <pathelement path="${ooxml.output.dir}"/>
-                <pathelement path="${main.output.test.dir}"/>
-            </classpath>
-            <include name="org/apache/poi/ss/**/*.java"/>
-            <include name="org/apache/poi/xssf/**/*.java"/>
-        </javac>
-        <copy todir="${ooxml.output.dir}">
-            <fileset dir="${ooxml.resource1.dir}"/>
-        </copy>
-    </target>
-
-    <target name="compile-excelant" depends="compile-main,compile-ooxml">
-        <!-- compile the sources -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${excelant.output.dir}"
-               srcdir="${excelant.src}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath refid="excelant.classpath"/>
-        </javac>
-        <!-- compile the tests -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${excelant.output.test.dir}"
-               srcdir="${excelant.src.test}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="excelant.classpath"/>
-                <pathelement location="${excelant.output.dir}"/>
-                <pathelement path="${main.output.test.dir}"/>
-            </classpath>
-        </javac>
-        <copy todir="${excelant.output.dir}">
-            <fileset dir="${excelant.resource.dir}"/>
-        </copy>
-    </target>
-
-    <target name="compile-integration" depends="compile-scratchpad, compile-main, compile-ooxml, compile-examples">
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${integration.output.test.dir}"
-               srcdir="${integration.src.test}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="scratchpad.classpath"/>
-                <path refid="ooxml.classpath"/>
-                <pathelement location="${ooxml.output.dir}"/>
-                <pathelement location="${main.output.test.dir}"/>
-                <pathelement location="${examples.output.dir}"/>
-                <pathelement location="${main.ant.jar}"/>
-            </classpath>
-        </javac>
-        <!--copy todir="${integration.output.dir}">
-            <fileset dir="${integration.resource1.dir}"/>
-        </copy-->
-    </target>
-
-    <target name="compile-version" depends="init"
-            description="Compiles the version class">
-        <!-- Generate the .java file -->
-        <property name="version.java" value="${main.output.dir}/org/apache/poi/Version.java"/>
-        <delete file="${version.java}"/>
-        <copy
-                file="src/resources/version/Version.java.template"
-                tofile="${version.java}">
-            <filterset>
-                <filter token="VERSION" value="${version.id}"/>
-                <filter token="DSTAMP" value="${DSTAMP}"/>
-            </filterset>
-        </copy>
-
-        <!-- Compile -->
-        <javac target="${jdk.version.class}" source="${jdk.version.source}"
-               failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
-               srcdir="${main.output.dir}"
-               encoding="${java.source.encoding}" includeantruntime="false">
-        </javac>
-        <!-- Tidy up -->
-        <delete file="${version.java}"/>
-    </target>
-
-    <target name="jacocotask" depends="">
-        <echo message="Coverage reporting: ${coverage.enabled}"/>
-        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
-            <classpath refid="lib.jacoco"/>
-        </taskdef>
-    </target>
-
-    <!-- Section: test (execute junit tests on test suites) -->
-    <target name="test" depends="compile,jacocotask,test-main,test-scratchpad,test-ooxml,test-excelant"
-            description="Tests main, scratchpad and ooxml"/>
-    <target name="test-all" depends="test,test-ooxml-lite,testcoveragereport"
-            description="Tests main, scratchpad, ooxml, ooxml-lite, and coveragereport"/>
-    <target name="test-ss" depends="test-hssf, test-ooxml-ss"
-            description="Test POI Spreadsheet classes (SS, HSSF, XSSF, SXSSF)"/>
-
-    <target name="testcoveragereport" depends="jacocotask" description="create test-report" xmlns:jacoco="antlib:org.jacoco.ant" if="coverage.enabled">
-        <delete dir="${coverage.dir}"/>
-        <mkdir dir="${coverage.dir}"/>
-
-        <jacoco:report>
-            <executiondata>
-                <fileset dir="build">
-                    <include name="*.exec"/>
-                </fileset>
-            </executiondata>
-
-            <structure name="Apache POI">
-                <group name="Main">
-                    <classfiles>
-                        <fileset dir="${main.output.dir}">
-                            <!-- exclude some generated classes -->
-                            <exclude name="org/apache/poi/sl/draw/binding/*.class"/>
-                            <!-- exclude large test-class -->
-                            <exclude name="org/apache/poi/hssf/usermodel/DummyGraphics2d.class"/>
-                        </fileset>
-                    </classfiles>
-                    <sourcefiles encoding="UTF-8">
-                        <fileset dir="${main.src}"/>
-                    </sourcefiles>
-                </group>
-                <group name="Scratchpad">
-                    <classfiles>
-                        <fileset dir="${scratchpad.output.dir}">
-                            <!-- exclude some generated classes -->
-                            <exclude name="org/apache/poi/hwpf/model/types/*.class"/>
-                            <exclude name="org/apache/poi/hdf/model/hdftypes/definitions/*.class"/>
-                        </fileset>
-                    </classfiles>
-                    <sourcefiles encoding="UTF-8">
-                        <fileset dir="${scratchpad.src}"/>
-                    </sourcefiles>
-                </group>
-                <group name="OOXML">
-                    <classfiles>
-                        <fileset dir="${ooxml.output.dir}"/>
-                        <!-- there are no actual POI classes in build/ooxml-lite-classes, only generated code...
-                        fileset dir="${ooxml.lite.output.dir}">
-                            <exclude name="org/openxmlformats/**"/>
-                            <exclude name="schema*/**"/>
-                            <exclude name="org/etsi/**"/>
-                            <exclude name="org/w3/**"/>
-                            <exclude name="com/**"/>
-                        </fileset-->
-                    </classfiles>
-                    <sourcefiles encoding="UTF-8">
-                        <fileset dir="${ooxml.src}"/>
-                        <!--fileset dir="${ooxml.lite.src}"/-->
-                    </sourcefiles>
-                </group>
-                <group name="Excelant">
-                    <classfiles>
-                        <fileset dir="${excelant.output.dir}"/>
-                    </classfiles>
-                    <sourcefiles encoding="UTF-8">
-                        <fileset dir="${excelant.src}"/>
-                    </sourcefiles>
-                </group>
-                <!--group name="Examples">
-                    <classfiles>
-                        <fileset dir="${examples.output.dir}"/>
-                    </classfiles>
-                    <sourcefiles encoding="UTF-8">
-                        <fileset dir="${examples.src}"/>
-                    </sourcefiles>
-                </group-->
-            </structure>
-
-            <html destdir="${coverage.dir}"/>
-            <xml destfile="${coverage.dir}/coverage.xml"/>
-        </jacoco:report>
-
-        <echo message="Coverage results are available at ${coverage.dir}/index.html, ${coverage.dir}/coverage.xml" />
-    </target>
-
-    <!-- Section: test-main -->
-    <target name="-test-main-check">
-        <uptodate property="main.test.notRequired" targetfile="${main.testokfile}">
-            <srcfiles dir="${main.src}"/>
-            <srcfiles dir="${main.src.test}"/>
-        </uptodate>
-    </target>
-
-    <target name="test-main" unless="main.test.notRequired"
-            depends="compile-main, -test-main-check,jacocotask" xmlns:jacoco="antlib:org.jacoco.ant"
-            description="tests POI classes that deal with the Microsoft Office binary (BIFF8) file formats (excludes OOXML)">
-        <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-main.exec">
-            <junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
-                   failureproperty="main.test.failed" showoutput="true">
-                <classpath refid="test.classpath"/>
-                <syspropertyset refid="junit.properties"/>
-                <jvmarg value="-ea"/>
-                <jvmarg value="-Xmx256m"/>
-                <!-- jvmarg value="-Duser.timezone=UTC"/ -->
-                <jvmarg value="${java9addmods}" />
-                <jvmarg value="${java9addmodsvalue}" />
-                <formatter type="plain"/>
-                <formatter type="xml"/>
-                <batchtest todir="${main.reports.test}">
-                    <fileset dir="${main.src.test}">
-                        <include name="**/${testpattern}.java"/>
-                        <exclude name="**/All*Tests.java"/>
-                        <exclude name="**/TestUnfixedBugs.java"/>
-                        <exclude name="**/TestcaseRecordInputStream.java"/>
-                        <exclude name="**/${testexcludepattern}.java"/>
-                    </fileset>
-                </batchtest>
-            </junit>
-        </jacoco:coverage>
-        <delete file="${main.testokfile}"/>
-        <antcall target="-test-main-write-testfile"/>
-    </target>
-
-	<target name="test-report" depends="init">
-		<mkdir dir="build/report"/>
-		<junitreport todir="build/report">
-		  <fileset dir="build">
-			<include name="*results/**/TEST-*.xml"/>
-		  </fileset>
-		  <report format="frames" todir="build/report"/>
-		</junitreport>
-	</target>
-
-    <target name="-test-property-check" unless="testcase">
-        <echo message="Please use -Dtestcase=org.your.testcase to run a single test"/>
-        <fail/>
-    </target>
-
-    <target name="-test-main-write-testfile" unless="main.test.failed">
-        <echo file="${main.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <!-- Section: test-hssf -->
-    <target name="-test-main-hssf-check">
-        <uptodate property="main.hssf.test.notRequired" targetfile="${main.hssf.testokfile}">
-            <srcfiles dir="${main.src}"/>
-            <srcfiles dir="${main.src.test}"/>
-        </uptodate>
-    </target>
-
-    <!-- HSSF subset of test-main
-    Purpose: quicker HSSF testing cycles. Skips some tests for speed reasons. This target is not sufficient for committing changes. -->
-    <target name="test-hssf" unless="main.hssf.test.notRequired"
-            depends="compile-main, -test-main-hssf-check,jacocotask" xmlns:jacoco="antlib:org.jacoco.ant"
-            description="test HSSF classes only">
-        <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-main.exec">
-            <junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
-                   failureproperty="main.hssf.test.failed" showoutput="true">
-                <classpath refid="test.classpath"/>
-                <syspropertyset refid="junit.properties"/>
-                <jvmarg value="-ea"/>
-                <jvmarg value="-Xmx256m"/>
-                <!-- jvmarg value="-Duser.timezone=UTC"/ -->
-                <jvmarg value="${java9addmods}" />
-                <jvmarg value="${java9addmodsvalue}" />
-                <formatter type="plain"/>
-                <formatter type="xml"/>
-                <batchtest todir="${main.reports.test}">
-                    <fileset dir="${main.src.test}">
-                        <include name="org/apache/poi/ss/**/${testpattern}.java"/>
-                        <include name="org/apache/poi/hssf/**/${testpattern}.java"/>
-                        <!-- skip slow dev tests, especially TestBiffViewer and TestReSave -->
-                        <exclude name="org/apache/poi/hssf/dev/**/${testpattern}.java"/>
-                        <exclude name="**/All*Tests.java"/>
-                        <exclude name="**/TestUnfixedBugs.java"/>
-                        <exclude name="**/TestcaseRecordInputStream.java"/>
-                        <exclude name="**/${testexcludepattern}.java"/>
-                    </fileset>
-                </batchtest>
-            </junit>
-        </jacoco:coverage>
-        <delete file="${main.hssf.testokfile}"/>
-        <antcall target="-test-main-hssf-write-testfile"/>
-    </target>
-
-    <target name="-test-main-hssf-write-testfile" unless="main.hssf.test.failed">
-        <echo file="${main.hssf.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <!-- Section: test-scratchpad -->
-    <target name="-test-scratchpad-check">
-        <uptodate property="scratchpad.test.notRequired" targetfile="${scratchpad.testokfile}">
-            <srcfiles dir="${scratchpad.src}"/>
-            <srcfiles dir="${scratchpad.src.test}"/>
-        </uptodate>
-    </target>
-
-    <target name="test-scratchpad" depends="compile-main,compile-scratchpad,-test-scratchpad-check,jacocotask,test-scratchpad-download-resources"
-            unless="scratchpad.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant"
-            description="test non-OOXML scratchpad classes">
-        <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-scratchpad.exec">
-            <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
-                   failureproperty="scratchpad.test.failed">
-                <classpath refid="test.scratchpad.classpath"/>
-                <syspropertyset refid="junit.properties"/>
-                <jvmarg value="-ea"/>
-                <!-- jvmarg value="-Duser.timezone=UTC"/ -->
-                <!--
-                  YK: ensure that JUnit has enough memory to run tests.
-                  Without the line below tests fail on Mac OS X with jdk-1.6.26
-                  and on Windows with jdk-1.5.22
-                -->
-                <jvmarg value="-Xmx256M"/>
-                <jvmarg value="${java9addmods}" />
-                <jvmarg value="${java9addmodsvalue}" />
-                <formatter type="plain"/>
-                <formatter type="xml"/>
-                <batchtest todir="${scratchpad.reports.test}">
-                    <fileset dir="${scratchpad.src.test}">
-                        <include name="**/${testpattern}.java"/>
-                        <exclude name="**/AllTests.java"/>
-                        <exclude name="**/${testexcludepattern}.java"/>
-                    </fileset>
-                </batchtest>
-            </junit>
-        </jacoco:coverage>
-        <delete file="${scratchpad.testokfile}"/>
-        <antcall target="-test-scratchpad-write-testfile"/>
-    </target>
-
-    <target name="-test-scratchpad-write-testfile" unless="scratchpad.test.failed">
-        <echo file="${scratchpad.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <!-- Section: test-ooxml -->
-    <target name="-test-ooxml-check">
-        <uptodate property="ooxml.test.notRequired" targetfile="${ooxml.testokfile}">
-            <srcfiles dir="${ooxml.src}"/>
-            <srcfiles dir="${ooxml.src.test}"/>
-        </uptodate>
-    </target>
-
-    <macrodef name="ooxml-test-runner" xmlns:jacoco="antlib:org.jacoco.ant">
-        <attribute name="classpath"/>
-        <attribute name="type"/>
-        <sequential>
-            <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-@{type}.exec">
-              <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
-                     failureproperty="ooxml.test.failed">
-                  <classpath refid="@{classpath}"/>
-                  <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="${maxpermsize}"/>
-                    <jvmarg value="-Xmx768M"/>
-                  <jvmarg value="-ea"/>
-                  <jvmarg value="${java9addmods}" />
-                  <jvmarg value="${java9addmodsvalue}" />
-                    <!-- jvmarg value="-Duser.timezone=UTC"/ -->
-                  <formatter type="plain"/>
-                  <formatter type="xml"/>
-                  <batchtest todir="${ooxml.reports.test}">
-                      <fileset dir="${ooxml.src.test}">
-                          <include name="**/${testpattern}.java"/>
-                          <exclude name="**/TestUnfixedBugs.java"/>
-                          <exclude name="**/All*Tests.java"/>
-                          <exclude name="**/TestSignatureInfo.java"/>
-                          <exclude name="**/${testexcludepattern}.java"/>
-                      </fileset>
-                  </batchtest>
-              </junit>
-            </jacoco:coverage>
-            <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-@{type}-xmlsec.exec">
-              <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
-                     failureproperty="ooxml.xmlsec.test.failed">
-                  <classpath>
-                      <path refid="@{classpath}"/>
-                      <path refid="ooxml.xmlsec.classpath"/>
-                  </classpath>
-                  <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="-Xmx768M"/>
-                  <jvmarg value="-ea"/>
-                  <jvmarg value="${java9addmods}" />
-                  <jvmarg value="${java9addmodsvalue}" />
-                  <formatter type="plain"/>
-                  <formatter type="xml"/>
-                  <batchtest todir="${ooxml.reports.test}">
-                      <fileset dir="${ooxml.src.test}">
-                            <include name="**/TestSignatureInfo.java"/>
-                      </fileset>
-                  </batchtest>
-              </junit>
-            </jacoco:coverage>
-        </sequential>
-    </macrodef>
-
-    <target name="test-ooxml" depends="compile-main,compile-ooxml,-test-ooxml-check,jacocotask" unless="ooxml.test.notRequired"
-            description="test OOXML classes">
-        <ooxml-test-runner classpath="test.ooxml.classpath" type="ooxml"/>
-        <delete file="${ooxml.testokfile}"/>
-        <antcall target="-test-ooxml-write-testfile"/>
-    </target>
-
-    <target name="-test-ooxml-write-testfile" unless="ooxml.test.failed">
-        <echo file="${ooxml.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <!-- Section: test-ooxml-ss -->
-    <target name="-test-ooxml-ss-check">
-        <uptodate property="ooxml.ss.test.notRequired" targetfile="${ooxml.ss.testokfile}">
-            <srcfiles dir="${ooxml.src}"/>
-            <srcfiles dir="${ooxml.src.test}"/>
-        </uptodate>
-    </target>
-
-    <macrodef name="ooxml-ss-test-runner" xmlns:jacoco="antlib:org.jacoco.ant">
-        <attribute name="classpath"/>
-        <attribute name="type"/>
-        <sequential>
-            <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-@{type}.exec">
-              <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
-                     failureproperty="ooxml.ss.test.failed">
-                  <classpath refid="@{classpath}"/>
-                  <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="${maxpermsize}"/>
-                    <jvmarg value="-Xmx768M"/>
-                  <jvmarg value="-ea"/>
-                  <jvmarg value="${java9addmods}" />
-                  <jvmarg value="${java9addmodsvalue}" />
-                    <!-- jvmarg value="-Duser.timezone=UTC"/ -->
-                  <formatter type="plain"/>
-                  <formatter type="xml"/>
-                  <batchtest todir="${ooxml.reports.test}">
-                      <fileset dir="${ooxml.src.test}">
-                          <include name="**/org/apache/poi/ss/**/${testpattern}.java"/>
-                          <include name="**/org/apache/poi/xssf/**/${testpattern}.java"/>
-                          <exclude name="**/TestUnfixedBugs.java"/>
-                          <exclude name="**/All*Tests.java"/>
-                          <exclude name="**/${testexcludepattern}.java"/>
-                      </fileset>
-                  </batchtest>
-              </junit>
-            </jacoco:coverage>
-        </sequential>
-    </macrodef>
-
-    <!-- XSSF and SXSSF subset of test-ooxml -->
-    <target name="test-ooxml-ss" depends="compile-main,compile-ooxml-ss,-test-ooxml-ss-check,jacocotask" unless="ooxml.ss.test.notRequired"
-            description="test XSSF and SXSSF classes">
-        <ooxml-ss-test-runner classpath="test.ooxml.classpath" type="ooxml"/>
-        <delete file="${ooxml.ss.testokfile}"/>
-        <antcall target="-test-ooxml-ss-write-testfile"/>
-    </target>
-
-    <target name="-test-ooxml-ss-write-testfile" unless="ooxml.ss.test.failed">
-        <echo file="${ooxml.ss.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <!-- Section: test-integration -->
-    <target name="-test-integration-check">
-        <uptodate property="integration.test.notRequired" targetfile="${integration.testokfile}">
-            <srcfiles dir="${integration.src.test}"/>
-        </uptodate>
-    </target>
-
-    <target name="test-integration" depends="compile-integration,-test-integration-check,jacocotask"
-            unless="integration.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
-    	<propertyreset name="org.apache.poi.util.POILogger" value="org.apache.poi.util.CommonsLogger"/>
-    	<delete dir="build" includes="test-integration.log*"/>
-        <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-integration.exec">
-            <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
-                   failureproperty="integration.test.failed" showoutput="true">
-                <classpath refid="test.integration.classpath"/>
-                <syspropertyset refid="junit.properties"/>
-                <jvmarg value="-ea"/>
-                <jvmarg value="-Xmx1512M"/>
-                <jvmarg value="${java9addmods}" />
-                <jvmarg value="${java9addmodsvalue}" />
-                <formatter type="plain"/>
-                <formatter type="xml"/>
-                <batchtest todir="${integration.reports.test}">
-                    <fileset dir="${integration.src.test}">
-                        <include name="**/${testpattern}.java"/>
-                        <exclude name="**/${testexcludepattern}.java"/>
-                    </fileset>
-                </batchtest>
-            </junit>
-        </jacoco:coverage>
-        <delete file="${integration.testokfile}"/>
-        <antcall target="-test-integration-write-testfile"/>
-    </target>
-
-    <target name="-test-integration-write-testfile" unless="integration.test.failed">
-        <echo file="${integration.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <!-- Section: test-ooxml-lite -->
-    <target name="-compile-ooxml-lite-check">
-        <uptodate property="ooxml.lite.test.notRequired" targetfile="${ooxml.lite.testokfile}">
-            <srcfiles dir="${ooxml.src}"/>
-            <srcfiles dir="${ooxml.src.test}"/>
-            <srcfiles file="${ooxml.xsds.jar}"/>
-            <srcfiles file="${ooxml.security.jar}"/>
-        </uptodate>
-    </target>
-
-    <target name="compile-ooxml-lite" depends="-compile-ooxml-lite-check,compile-ooxml"
-            unless="ooxml.lite.test.notRequired">
-        <delete file="${ooxml.lite.testokfile}"/>
-        <echo message="Running ooxml-lite generator"/>
-
-        <property name="ooxml.lite-merged.dir" location="build/ooxml-lite-merged"/>
-        <mkdir dir="${ooxml.lite-merged.dir}"/>
-
-        <jar destfile="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar">
-            <zipfileset includes="**/*" src="${ooxml.xsds.jar}"/>
-            <zipfileset includes="**/*" src="${ooxml.security.jar}"/>
-        </jar>
-
-        <java classname="org.apache.poi.util.OOXMLLite" fork="yes"
-            failonerror="true">
-            <classpath>
-                <pathelement path="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
-            </classpath>
-            <classpath refid="test.ooxml.classpath"/>
-            <classpath refid="ooxml.xmlsec.classpath"/>
-            <syspropertyset refid="junit.properties"/>
-            <jvmarg value="${maxpermsize}"/>
-            <jvmarg value="-Xmx512m"/>
-			<jvmarg value="${java9addmods}" />
-			<jvmarg value="${java9addmodsvalue}" />
-            <arg value="-ooxml"/>
-            <arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
-            <arg value="-test"/>
-            <arg value="${ooxml.output.test.dir}"/>
-            <arg value="-dest"/>
-            <arg value="${ooxml.lite.output.dir}"/>
-        </java>
-
-        <echo file="${ooxml.lite.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <target name="test-ooxml-lite" depends="jacocotask,compile-ooxml-xsds,compile-ooxml-lite">
-        <delete file="${ooxml.testokfile}"/>
-        <echo message="Running ooxml tests against 'poi-ooxml-schemas'"/>
-        <ooxml-test-runner classpath="ooxml-lite.classpath" type="ooxml-lite"/>
-    </target>
-
-    <!-- Section: test-excelant -->
-    <target name="-test-excelant-check">
-        <uptodate property="excelant.test.notRequired" targetfile="${excelant.testokfile}">
-            <srcfiles dir="${excelant.src}"/>
-            <srcfiles dir="${excelant.src.test}"/>
-        </uptodate>
-    </target>
-
-    <target name="-test-excelant-write-testfile" unless="excelant.test.failed">
-        <echo file="${excelant.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <target name="test-excelant" depends="compile-excelant,-test-excelant-check,jacocotask"
-            unless="excelant.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
-        <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-excelant.exec">
-            <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
-                   failureproperty="excelant.test.failed">
-                <classpath refid="test.excelant.classpath"/>
-                <syspropertyset refid="junit.properties"/>
-                <jvmarg value="-ea"/>
-                <jvmarg value="${java9addmods}" />
-                <jvmarg value="${java9addmodsvalue}" />
-                <formatter type="plain"/>
-                <formatter type="xml"/>
-                <batchtest todir="${excelant.reports.test}">
-                    <fileset dir="${excelant.src.test}">
-                        <include name="**/${testpattern}.java"/>
-                        <exclude name="**/${testexcludepattern}.java"/>
-                    </fileset>
-                </batchtest>
-            </junit>
-        </jacoco:coverage>
-        <delete file="${excelant.testokfile}"/>
-        <antcall target="-test-excelant-write-testfile"/>
-    </target>
-
-    <!-- GENERATE DOCUMENTATION -->
-
-    <!-- Section: docs -->
-    <target name="-check-docs">
-        <echo message="Checking if documentation recreation is necessary, i.e. if any file at ${main.documentation} is newer than ${build.site}/index.html"/>
-        <uptodate property="main.docs.notRequired" targetfile="${build.site}/index.html">
-            <srcfiles dir="${main.documentation}" />
-        </uptodate>
-    </target>
-
-    <target name="-check-forrest-installed" unless="env.FORREST_HOME">
-        <echo>Please install Apache Forrest (see
-            &lt;https://forrest.apache.org/index.html&gt;) and set the
-            FORREST_HOME environment variable!
-        </echo>
-        <fail message="Apache Forrest is not installed."/>
-    </target>
-
-    <target name="docs" depends="init, -check-forrest-installed, -check-docs"
-            unless="main.docs.notRequired" description="Builds the POI website">
-
-        <mkdir dir="${build.site.src}/${main.documentation}"/>
-        <copy todir="${build.site.src}/${main.documentation}">
-            <fileset dir="${main.documentation}"/>
-        </copy>
-        <copy file="forrest.properties" tofile="${build.site.src}/forrest.properties"/>
-
-        <move
-                file="${build.site.src}/src/documentation/content/xdocs/status.xml"
-                tofile="${build.site.src}/status.xml"/>
-
-        <ant antfile="${env.FORREST_HOME}/forrest.antproxy.xml" target="site">
-            <property name="project.home" location="${build.site.src}"/>
-        </ant>
-
-        <echo>Broken links:</echo>
-        <echo file="${build.site}/../tmp/brokenlinks.txt"/>
-
-        <fixcrlf srcdir="${build.site}" includes="**/*.html,**/*.css" eol="unix" eof="remove" />
-
-        <touch>
-            <fileset dir="${build.site}"/>
-        </touch>
-    </target>
-
-    <!-- Generates the API documentation. -->
-    <target name="javadocs"
-            description="Generates the API documentation">
-        <javadoc verbose="false" author="true" destdir="${apidocs.report.dir}"
-                 windowtitle="POI API Documentation" use="true" version="true"
-                 maxmemory="384M" additionalparam="-notimestamp" locale="en_US"
-                 classpathref="javadoc.classpath">
-            <packageset dir="${main.src}" defaultexcludes="yes">
-                <include name="org/apache/poi/**"/>
-            </packageset>
-            <packageset dir="${scratchpad.src}" defaultexcludes="yes">
-                <include name="org/apache/poi/**"/>
-                <exclude name="org/apache/poi/hdf/**"/>
-            </packageset>
-            <packageset dir="${ooxml.src}" defaultexcludes="yes">
-                <include name="org/apache/poi/**"/>
-            </packageset>
-
-            <doctitle><![CDATA[<h1>POI API Documentation</h1>]]></doctitle>
-            <bottom>
-                <![CDATA[<i>Copyright ${tstamp.year} The Apache Software Foundation or
-        its licensors, as applicable.</i>]]>
-            </bottom>
-            <group>
-                <title>DDF - Dreadful Drawing Format</title>
-                <package name="org.apache.poi.ddf*"/>
-            </group>
-            <group>
-                <title>HPSF - Horrible Property Set Format</title>
-                <package name="org.apache.poi.hpsf*"/>
-            </group>
-
-            <group>
-                <title>SS - Common Spreadsheet Format</title>
-                <package name="org.apache.poi.ss*"/>
-            </group>
-            <group>
-                <title>HSSF - Horrible Spreadsheet Format</title>
-                <package name="org.apache.poi.hssf*"/>
-            </group>
-            <group>
-                <title>XSSF - Open Office XML Spreadsheet Format</title>
-                <package name="org.apache.poi.xssf*"/>
-            </group>
-
-            <group>
-                <title>SL - Common Slideshow Format</title>
-                <package name="org.apache.poi.sl*"/>
-            </group>
-            <group>
-                <title>HSLF - Horrible Slideshow Format</title>
-                <package name="org.apache.poi.hslf*"/>
-            </group>
-            <group>
-                <title>XSLF - Open Office XML Slideshow Format</title>
-                <package name="org.apache.poi.xslf*"/>
-            </group>
-
-            <group>
-                <title>HWPF - Horrible Word Processor Format</title>
-                <package name="org.apache.poi.hwpf*"/>
-            </group>
-            <group>
-                <title>XWPF - Open Office XML Word Processor Format</title>
-                <package name="org.apache.poi.xwpf*"/>
-            </group>
-
-            <group>
-                <title>HDGF - Horrible Diagram Format</title>
-                <package name="org.apache.poi.hdgf*"/>
-            </group>
-            <group>
-                <title>XDGF - Open Office XML Diagram Format</title>
-                <package name="org.apache.poi.xdgf*"/>
-            </group>
-
-            <group>
-                <title>POIFS - POI File System</title>
-                <package name="org.apache.poi.poifs*"/>
-            </group>
-            <group>
-                <title>Utilities</title>
-                <package name="org.apache.poi.util*"/>
-            </group>
-            <group>
-                <title>Examples</title>
-                <package name="org.apache.poi.hpsf.examples*"/>
-                <package name="org.apache.poi.hssf.usermodel.examples*"/>
-            </group>
-        </javadoc>
-    </target>
-
-
-    <!-- Generates documentation and reports -->
-    <target name="site" depends="docs,javadocs"
-            description="Generates POI's website's contents"/>
-
-
-    <target name="maven-poms"
-            description="Builds the POM files for a maven distribution, and copies these and the jars to the appropriate locations">
-
-        <!-- Build the org.apache.poi poms -->
-        <copy todir="${dist.dir}/maven">
-            <fileset dir="maven" includes="poi*.pom"/>
-            <chainedmapper>
-                <firstmatchmapper>
-                    <regexpmapper from="^(.*).pom$$" to="\1/\1.pom"/>
-                    <globmapper from="poi.pom" to="poi/poi.pom"/>
-                </firstmatchmapper>
-                <globmapper from="*.pom" to="*-${version.id}.pom"/>
-            </chainedmapper>
-            <filterchain>
-                <replacetokens>
-                    <token key="VERSION" value="${version.id}"/>
-                </replacetokens>
-            </filterchain>
-        </copy>
-        <echo>Maven POMs are located in ${dist.dir}</echo>
-        <echo>Use ant dist-nexus to deploy the artifacts in the remote repository</echo>
-    </target>
-
-    <target name="-manifest">
-        <manifest file="build/poi-manifest.mf">
-            <attribute name="Built-By" value="${user.name}"/>
-            <attribute name="Specification-Title" value="Apache POI"/>
-            <attribute name="Specification-Version" value="${version.id}"/>
-            <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-            <attribute name="Implementation-Title" value="Apache POI"/>
-            <attribute name="Implementation-Version" value="${version.id}"/>
-            <attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
-            <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-        </manifest>
-    </target>
-
-    <macrodef name="maven-jar">
-        <attribute name="dir"/>
-        <sequential>
-            <local name="destfile"/>
-            <pathconvert property="destfile" targetos="unix">
-                <path><pathelement path="@{dir}"/></path>
-                <mapper>
-                    <chainedmapper>
-                        <filtermapper>
-                            <replaceregex pattern="ooxml-lite" replace="ooxml-schemas" flags="g"/>
-                            <replaceregex pattern="(.java|.src)$$" replace="-sources"/>
-                            <replaceregex pattern=".*(?:build|src).?(.*)?" replace="\1"/>
-                            <replaceregex pattern="(.*)(-classes|-sources)" replace="poi-\1/poi-\1-${version.id}\2"/>
-                            <replaceregex pattern="^(classes|sources)$$" replace="poi/poi-${version.id}-\1"/>
-                            <replaceregex pattern="-classes" replace=""/>
-                        </filtermapper>
-                    </chainedmapper>
-                </mapper>
-            </pathconvert>
-            <jar destfile="build/dist/maven/${destfile}.jar"
-                 manifest="build/poi-manifest.mf">
-                <fileset dir="@{dir}"/>
-                <metainf dir="legal/"/>
-            </jar>
-        </sequential>
-    </macrodef>
-
-    <target name="jar" depends="compile-all, compile-version, -manifest" description="Creates jar files for distribution">
-        <maven-jar dir="${main.output.dir}"/>
-        <maven-jar dir="${scratchpad.output.dir}"/>
-        <maven-jar dir="${ooxml.output.dir}"/>
-        <maven-jar dir="${examples.output.dir}"/>
-        <maven-jar dir="${excelant.output.dir}"/>
-        <maven-jar dir="${ooxml.lite.output.dir}"/>
-    </target>
-
-    <target name="jar-src" depends="compile-all, compile-version, -manifest" description="Sources for Maven">
-        <maven-jar dir="${main.src}"/>
-        <maven-jar dir="${scratchpad.src}"/>
-        <maven-jar dir="${ooxml.src}"/>
-        <maven-jar dir="${examples.src}"/>
-        <maven-jar dir="${excelant.src}"/>
-    </target>
-
-
-    <target name="-do-jar-check-javadocs-package-list">
-        <condition property="javadocs.package-list.present">
-            <available file="build/tmp/site/build/site/apidocs/package-list"/>
-        </condition>
-    </target>
-
-    <target name="-do-jar-create-javadocs-package-list"
-        depends="-do-jar-check-javadocs-package-list"
-        unless="javadocs.package-list.present">
-        <antcall target="javadocs"/>
-    </target>
-
-    <target name="jar-javadocs" description="JavaDocs for Maven" depends="compile,-manifest,-do-jar-create-javadocs-package-list">
-        <property name="build.maven.javadocs" location="build/tmp/maven-javadocs"/>
-
-        <!-- Build and package the main javadocs -->
-        <maven-javadocs src="${main.src}" dest="${jar.name}"/>
-        <!-- Build and package the scratchpad javadocs -->
-        <maven-javadocs src="${scratchpad.src}" dest="${jar.name}-scratchpad"/>
-        <!-- Build and package the ooxml javadocs -->
-        <maven-javadocs src="${ooxml.src}" dest="${jar.name}-ooxml"/>
-    </target>
-
-    <macrodef name="maven-javadocs">
-        <attribute name="src"/>
-        <attribute name="dest"/>
-        <sequential>
-            <echo message="Building @{dest} javadocs from @{src}" />
-            <local name="build.maven.javadocs"/>
-            <property name="build.maven.javadocs" location="build/tmp/maven-javadocs"/>
-            <delete dir="${build.maven.javadocs}"/>
-            <mkdir dir="${build.maven.javadocs}"/>
-            <javadoc verbose="false" author="false" destdir="${build.maven.javadocs}"
-                     windowtitle="POI API Documentation" use="false" version="false"
-                     maxmemory="384M" additionalparam="-notimestamp -quiet" locale="en_US"
-                     classpathref="javadoc.classpath">
-                <packageset dir="@{src}" defaultexcludes="yes">
-                    <include name="org/apache/poi/**"/>
-                </packageset>
-                <link offline="true" href="https://poi.apache.org/apidocs" packagelistLoc="build/tmp/site/build/site/apidocs"/>
-            </javadoc>
-            <jar destfile="${dist.dir}/maven/@{dest}/@{dest}-${version.id}-javadoc.jar"
-                 manifest="build/poi-manifest.mf">
-                <fileset dir="${build.maven.javadocs}"/>
-                <metainf dir="legal/"/>
-            </jar>
-        </sequential>
-    </macrodef>
-
-    <target name="release-notes" depends="init">
-        <copy file="src/documentation/RELEASE-NOTES.txt" todir="build/dist/" overwrite="true">
-            <filterset>
-                <filter token="VERSION" value="${version.id}"/>
-                <filter token="DSTAMP"  value="${DSTAMP}"/>
-                <filter token="RELEASE_TAG" value="${RELEASE_TAG}"/>
-            </filterset>
-        </copy>
-    </target>
-
-    <target name="assemble" depends="jar,jar-src,jar-javadocs">
-        <property name="zipdir" value="${jar.name}-${version.id}"/>
-
-        <mappedresources id="legal-files" cache="true">
-            <fileset dir="legal"/>
-            <globmapper from="*" to="${zipdir}/*"/>
-        </mappedresources>
-
-        <!-- jars to include in binary assemblies -->
-        <union id="bin-files" cache="true">
-            <mappedresources refid="legal-files"/>
-            <mappedresources cache="true">
-                <fileset dir="${main.lib}">
-                    <include name="commons-codec-*.jar"/>
-                    <include name="commons-logging-*.jar"/>
-                    <include name="commons-collections4-*.jar"/>
-                    <include name="junit-*.jar"/>
-                    <include name="log4j-*.jar"/>
-                </fileset>
-                <globmapper from="*" to="${zipdir}/lib/*"/>
-            </mappedresources>
-            <mappedresources cache="true">
-                <fileset dir="${ooxml.lib}" includes="xmlbeans-2.6.0.jar.orig,curvesapi-*.jar"/>
-                <regexpmapper from="^(.*\.jar)(\.orig)?$$" to="${zipdir}/ooxml-lib/\1"/>
-            </mappedresources>
-            <mappedresources cache="true">
-                <fileset dir="${dist.dir}/maven" includes="**/*.jar" excludes="**/*-javadoc.jar,**/*-sources.jar"/>
-                <chainedmapper>
-                    <flattenmapper/>
-                    <globmapper from="*" to="${zipdir}/*"/>
-                </chainedmapper>
-            </mappedresources>
-            <mappedresources cache="true">
-                <fileset dir="${build.site}"/>
-                <globmapper from="*" to="${zipdir}/docs/*"/>
-            </mappedresources>
-        </union>
-
-        <!-- patterns to exclude from source assemblies -->
-        <union id="src-files" cache="true">
-            <mappedresources refid="legal-files"/>
-            <mappedresources cache="true">
-                <fileset dir="." excludes="build/**,
-                      dist*/**,
-                      maven/**,
-                      lib/**,
-                      compile-lib/**,
-                      ooxml-lib/**,
-                      scripts/**,
-                      TEST*,
-                      *.ipr,
-                      *.iml,
-                      *.iws,
-                      *.lnk,
-                      *.rdf,
-                      *.swp,
-                      .settings/**,
-                      .classpath,
-                      .settings/**,
-                      .project"/>
-                <globmapper from="*" to="${zipdir}/*"/>
-            </mappedresources>
-        </union>
-
-        <zip destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.zip">
-            <union refid="bin-files"/>
-        </zip>
-
-        <tar destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.tar.gz" longfile="gnu" compression="gzip">
-            <union refid="bin-files"/>
-        </tar>
-
-        <zip destfile="${dist.dir}/${jar.name}-src-${version.id}-${DSTAMP}.zip">
-            <union refid="src-files"/>
-        </zip>
-
-        <tar destfile="${dist.dir}/${jar.name}-src-${version.id}-${DSTAMP}.tar.gz" longfile="gnu" compression="gzip">
-            <union refid="src-files"/>
-        </tar>
-
-        <echo>Creating Maven POMs</echo>
-        <antcall target="maven-poms"/>
-
-        <echo>Distribution located in ${dist.dir}</echo>
-        <echo>Use "ant dist-checksum" to create md5/sha1 checksums and GPG signatures</echo>
-    </target>
-
-    <target name="osgi" depends="mvn-install">
-       <echo message="Building OSGi bundle via Maven" />
-       <mvn:mvn pom="osgi/pom.xml">
-          <arg value="-Dpoi.version=${version.id}" />
-          <arg value="install" />
-       </mvn:mvn>
-    </target>
-
-    <target name="dist" depends="clean, compile-all, test-all, rat-check, forbidden-apis-check, site, jar, release-notes, assemble"
-            description="Creates the entire distribution into build/dist, from scratch">
-    </target>
-
-    <!-- continuous integration targets -->
-    <target name="gump" depends="compile-all, test-all, jar"
-        description="Target for running with Apache Gump continuous integration. Builds and tests POI and generates jar artifacts." />
-    <target name="jenkins" depends="compile-all, test-all, test-integration, jar, javadocs, assemble, findbugs, release-notes, rat-check, forbidden-apis-check"
-        description="Target run by Jenkins on a continuous basis. Builds and tests POI, generates artifacts and documentation, and searches for problems."/>
-
-    <available property="maven.ant.tasks.present" classname="org.apache.maven.artifact.ant.Pom"/>
-    <target name="maven.ant.tasks-check">
-      <fail unless="maven.ant.tasks.present">
-      Maven ant tasks not found.
-      Please make sure the maven-ant-tasks jar is in ANT_HOME/lib, or made
-      available to Ant using other mechanisms like -lib or CLASSPATH.
-
-      You can download the Maven Ant Tasks from https://maven.apache.org/ant-tasks/download.html
-      </fail>
-    </target>
-
-    <macrodef name="m2-install">
-      <attribute name="artifactId"/>
-
-      <sequential>
-        <mvn:install file="${dist.dir}/maven/@{artifactId}/@{artifactId}-${version.id}.jar">
-          <pom file="${dist.dir}/maven/@{artifactId}/@{artifactId}-${version.id}.pom"/>
-        </mvn:install>
-      </sequential>
-    </macrodef>
-
-    <target name="mvn-install" depends="maven.ant.tasks-check,jar,maven-poms" description="Install POI artifacts into the local repository. Equivalent of 'mvn install'">
-      <m2-install artifactId="poi"/>
-      <m2-install artifactId="poi-scratchpad"/>
-      <m2-install artifactId="poi-ooxml"/>
-      <m2-install artifactId="poi-examples"/>
-      <m2-install artifactId="poi-ooxml-schemas"/>
-      <m2-install artifactId="poi-excelant"/>
-    </target>
-
-    <target name="rat-check" depends="init" description="Runs the Apache Creadur Rat check against the source code, to spot any files which are missing the correct license headers">
-       <mkdir dir="${rat.reportdir}" />
-
-       <typedef resource="org/apache/rat/anttasks/antlib.xml"
-             uri="antlib:org.apache.rat.anttasks"
-             classpath="${rat.jar}" />
-       <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
-           <fileset dir="src/">
-              <exclude name="documentation/*.txt" />
-              <exclude name="documentation/content/xdocs/dtd/" />
-              <exclude name="documentation/content/xdocs/entity/" />
-              <exclude name="scratchpad/testcases/dummy.txt" />
-              <exclude name="contrib/testcases/dummy.txt" />
-              <exclude name="examples/lib/dummy.txt" />
-              <exclude name="resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml" />
-              <exclude name="resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx" />
-              <exclude name="resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml" />
-              <exclude name="ooxml/resources/org/apache/poi/xdgf/visio.xsd" />
-              <exclude name="examples/src/org/apache/poi/xslf/usermodel/pie-chart-data.txt" />
-              <exclude name="**/*.iml" />
-           </fileset>
-       </rat:report>
-
-       <!-- remove clutter to compact build output -->
-       <!-- replaceregexp doesn't work within loadfile ... -->
-       <replaceregexp file="${rat.report}" match="\s+Printing headers for files without AL header.++" replace="" flags="s"/>
-
-       <loadfile property="rat.reportcontent" srcFile="${rat.report}">
-            <filterchain>
-                <linecontainsregexp negate="true">
-                    <regexp pattern="^\s+(AL|B|N)\s+"/>
-                </linecontainsregexp>
-            </filterchain>
-       </loadfile>
-       <echo>${rat.reportcontent}</echo>
-
-       <!-- fail the build if at least one note is in the report -->
-       <fail><condition><matches pattern="[1-9][0-9]* Unknown Licens" string="${rat.reportcontent}"/></condition></fail>
-    </target>
-
-    <!-- Runs the Forbiddens APIs checker against the source code, to -->
-    <!--  spot any cases where we've accidently used methods we shouldn't -->
-    <!-- See https://github.com/policeman-tools/forbidden-apis for details -->
-    <!--  of the checks that this can do -->
-    <target name="forbidden-apis-check" depends="init, compile">
-        <taskdef name="forbiddenapis"
-                 classname="de.thetaphi.forbiddenapis.ant.AntTask"
-                 classpath="${forbidden.jar}"/>
-
-        <!-- first check rules that apply to all the source code -->
-        <forbiddenapis
-                 classpathref="forbiddenapis.classpath"
-                 suppressAnnotation="org.apache.poi.util.SuppressForbidden"
-                 targetVersion="${jdk.version.source}"
-            >
-            <bundledsignatures name="jdk-unsafe"/>
-            <bundledsignatures name="jdk-deprecated"/>
-            <bundledsignatures name="jdk-internal"/>
-            <bundledsignatures name="jdk-non-portable"/>
-            <bundledsignatures name="jdk-reflection"/>
-            <!--
-            <bundledsignatures name="jdk-system-out"/>
-            -->
-            <signaturesFileset file="src/resources/devtools/forbidden-signatures.txt"/>
-            <!-- sources -->
-            <fileset dir="${main.output.dir}"/>
-            <fileset dir="${ooxml.output.dir}"/>
-            <fileset dir="${scratchpad.output.dir}"/>
-            <fileset dir="${excelant.output.dir}"/>
-            <!--
-            <fileset dir="${examples.output.dir}"/>
-            -->
-            <!-- test-sources -->
-            <fileset dir="${main.output.test.dir}"/>
-            <fileset dir="${ooxml.output.test.dir}"/>
-            <!--
-            <fileset dir="${scratchpad.output.test.dir}"/>
-            <fileset dir="${excelant.output.test.dir}"/>
-            -->
-        </forbiddenapis>
-
-        <!-- then check some advanced rules which we only apply to the core code and not tests or examples -->
-        <forbiddenapis
-                 classpathref="forbiddenapis.classpath"
-                 suppressAnnotation="org.apache.poi.util.SuppressForbidden"
-                 targetVersion="${jdk.version.source}"
-            >
-            <signaturesFileset file="src/resources/devtools/forbidden-signatures-prod.txt"/>
-            <!-- sources -->
-            <fileset dir="${main.output.dir}"/>
-            <fileset dir="${ooxml.output.dir}"/>
-            <fileset dir="${scratchpad.output.dir}"/>
-            <fileset dir="${excelant.output.dir}"/>
-        </forbiddenapis>
-    </target>
-
-    <target name="findbugs" depends="jar">
-        <downloadfile src="${findbugs.url}" dest="${findbugs.jar}"/>
-
-        <property name="findbugs.home" value="build/findbugs" />
-    	<delete dir="${findbugs.home}"/>
-        <unzip src="${findbugs.jar}" dest="${findbugs.home}">
-        	<patternset includes="findbugs*/lib/**,findbugs*/plugin/**"/>
-        	<cutdirsmapper dirs="1"/>
-        </unzip>
-
-        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
-            <classpath>
-                <fileset dir="${findbugs.home}/lib" includes="*.jar"/>
-            </classpath>
-        </taskdef>
-
-    	<findbugs home="${findbugs.home}"
-    	   output="xml:withMessages"
-    	   outputFile="build/findbugs.xml"
-    	   effort="max"
-           failOnError="true"
-           excludeFilter="src/resources/devtools/findbugs-filters.xml">
-            <fileset dir="${dist.dir}/maven">
-                <include name="poi/poi-${version.id}.jar"/>
-                <include name="poi-scratchpad/poi-scratchpad-${version.id}.jar"/>
-                <include name="poi-ooxml/poi-ooxml-${version.id}.jar"/>
-                <include name="poi-excelant/poi-excelant-${version.id}.jar"/>
-            </fileset>
-            <auxClasspath path="${dsig.bouncycastle-pkix.jar}" />
-            <auxClasspath path="${dsig.bouncycastle-prov.jar}" />
-            <auxClasspath path="${dsig.sl4j-api.jar}" />
-            <auxClasspath path="${dsig.xmlsec.jar}" />
-            <auxClasspath path="${ooxml.xsds.jar}" />
-            <auxClasspath path="${ooxml.security.jar}" />
-            <auxClasspath path="${ooxml.curvesapi.jar}" />
-            <auxClasspath path="${ooxml.xmlbeans26.jar}" />
-            <auxClasspath path="${main.commons-collections4.jar}" />
-            <auxClasspath path="${main.commons-codec.jar}" />
-            <auxClasspath path="${main.commons-logging.jar}" />
-            <auxClasspath path="${main.junit.jar}" />
-            <auxClasspath path="${main.ant.jar}" />
-            <sourcePath path="src/java" />
-            <sourcePath path="src/ooxml/java" />
-            <sourcePath path="src/scratchpad/src" />
-        </findbugs>
-
-    	<!-- instead of calling findbugs again, we simply transform the xml -->
-    	<makeurl file="${findbugs.home}/lib/findbugs.jar" property="findbugs.jarurl"/>
-        <!-- although there's a findbugs history task too, it doesn't make much sense to provide it, -->
-        <!-- as the build directory (i.e. the old findbugs.xml) is deleted regularly -->
-    	<xslt basedir="build" destdir="build" includes="findbugs.xml" force="true">
-    	    <style>
-    	    	<!-- fancy-hist is a bit less bugged than fancy ... -->
-    	        <url url="jar:${findbugs.jarurl}!/fancy-hist.xsl"/>
-    	    </style>
-		</xslt>
-    </target>
-
-    <target name="test-scratchpad-download-resources">
-        <!-- disable font downloading until TestFontRendering works on all plattforms -->
-        <!-- ... eventually copy the files into the resource dirs ... -->
-        <!--
-        <mkdir dir="build/scratchpad-test-resources"/>
-
-        <antcall target="downloadfile">
-            <param name="sourcefile" value="https://sourceforge.net/projects/monafont/files/monafont/monafont-2.90/monafont-ttf-2.90.zip/download"/>
-            <param name="destfile" value="build/scratchpad-test-resources/monafont-ttf-2.90.zip"/>
-        </antcall>
-
-        <unzip src="build/scratchpad-test-resources/monafont-ttf-2.90.zip"
-               dest="build/scratchpad-test-resources">
-            <patternset>
-                <include name="mona.ttf"/>
-            </patternset>
-        </unzip>
-
-        <antcall target="downloadfile">
-            <param name="sourcefile" value="https://googlefontdirectory.googlecode.com/hg-history/c5955de4df3e40f6ab705bbccbd1f5ad93998287/cabin/Cabin-Regular.ttf"/>
-            <param name="destfile" value="build/scratchpad-test-resources/Cabin-Regular.ttf"/>
-        </antcall>
-        -->
-    </target>
-
-    <target name="dist-checksum" depends="load-maven-server-settings">
-        <fileset id="dist-archives" dir="${dist.dir}" includes="**/*.jar,**/*.pom,**/*.zip,**/*.tar.gz"/>
-
-        <checksum algorithm="sha1" format="MD5SUM">
-            <fileset refid="dist-archives"/>
-        </checksum>
-        <checksum algorithm="md5" format="MD5SUM">
-            <fileset refid="dist-archives"/>
-        </checksum>
-
-        <fixcrlf srcDir="${dist.dir}" includes="**/*.md5,**/*.sha1" eol="unix"/>
-
-        <downloadfile src="${dist.bouncycastle-prov.url}" dest="${dist.bouncycastle-prov.jar}"/>
-        <downloadfile src="${dist.bouncycastle-bcpg.url}" dest="${dist.bouncycastle-bcpg.jar}"/>
-        <downloadfile src="${dist.commons-openpgp.url}" dest="${dist.commons-openpgp.jar}"/>
-
-        <taskdef resource="org/apache/commons/openpgp/ant/antlib.xml" uri="antlib:org.apache.commons.openpgp.ant">
-            <classpath>
-                <pathelement path="${dist.commons-openpgp.jar}"/>
-                <pathelement path="${dist.bouncycastle-prov.jar}"/>
-                <pathelement path="${dist.bouncycastle-bcpg.jar}"/>
-            </classpath>
-        </taskdef>
-
-        <openpgp:signer secring="${settings.poi-signing.privateKey}"
-            pubring="${settings.poi-signing.publicKey}"
-            password="${settings.poi-signing.passphrase}" keyid="${settings.poi-signing.username}"
-            asciiarmor="true">
-            <fileset refid="dist-archives"/>
-        </openpgp:signer>
-    </target>
-
-    <target name="dist-nexus" depends="load-maven-server-settings,dist-checksum"
-            description="upload build artifacts to nexus">
-        <delete dir="build/repo"/>
-        <delete dir="build/nexus-stage"/>
-        <nexus-upload artifactId="poi"/>
-        <nexus-upload artifactId="poi-examples"/>
-        <nexus-upload artifactId="poi-excelant"/>
-        <nexus-upload artifactId="poi-ooxml"/>
-        <nexus-upload artifactId="poi-ooxml-schemas"/>
-        <nexus-upload artifactId="poi-scratchpad"/>
-    </target>
-
-    <macrodef name="nexus-upload">
-        <attribute name="artifactId"/>
-        <sequential>
-            <local name="repo"/>
-            <property name="repo" location="build/repo/@{artifactId}"/>
-
-            <copy todir="${repo}">
-                <mappedresources>
-                    <fileset dir="build/dist/maven" includes="@{artifactId}/**"/>
-                    <regexpmapper from="^([^/]+)/(.*)$$" to="org/apache/poi/\1/${version.id}/\2" handledirsep="true"/>
-                </mappedresources>
-            </copy>
-
-            <local name="lastUpdated"/>
-            <tstamp>
-                <format property="lastUpdated" pattern="yyyyMMddHHmmss" timezone="UTC"/>
-            </tstamp>
-
-            <local name="metadir"/>
-            <property name="metadir" location="${repo}/org/apache/poi/@{artifactId}"/>
-
-            <echo file="${metadir}/maven-metadata.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.apache.poi</groupId>
-  <artifactId>@{artifactId}</artifactId>
-  <versioning>
-    <latest>${version.id}</latest>
-    <release>${version.id}</release>
-    <versions>
-      <version>${version.id}</version>
-    </versions>
-    <lastUpdated>${lastUpdated}</lastUpdated>
-  </versioning>
-</metadata>]]></echo>
-            <fixcrlf srcdir="${metadir}" includes="maven-metadata.xml" eol="unix" eof="remove" />
-            <checksum algorithm="sha1" format="MD5SUM">
-                <fileset dir="${metadir}" includes="maven-metadata.xml"/>
-            </checksum>
-            <checksum algorithm="md5" format="MD5SUM">
-                <fileset dir="${metadir}" includes="maven-metadata.xml"/>
-            </checksum>
-
-            <fixcrlf srcDir="${metadir}" includes="*.md5,*.sha1" eol="unix"/>
-
-            <downloadfile src="${dist.nexus-staging.url}" dest="${dist.nexus-staging.jar}"/>
-            <taskdef uri="antlib:org.sonatype.nexus.ant.staging" resource="org/sonatype/nexus/ant/staging/antlib.xml">
-                <classpath><pathelement path="${dist.nexus-staging.jar}"/></classpath>
-            </taskdef>
-
-            <staging:stageLocally description="@{artifactId} ${version.id}">
-                <staging:nexusStagingInfo stagingDirectory="build/nexus-stage/@{artifactId}"/>
-                <fileset dir="${repo}" />
-            </staging:stageLocally>
-
-            <!-- if this throws a "... dh keypair ..." exception, use Java 7+ for executing the task -->
-            <staging:stageRemotely description="@{artifactId} ${version.id}">
-                <staging:nexusStagingInfo stagingDirectory="build/nexus-stage/@{artifactId}">
-                    <staging:projectInfo groupId="org.apache.poi" artifactId="@{artifactId}" version="${version.id}" />
-                    <staging:connectionInfo baseUrl="https://repository.apache.org/">
-                        <staging:authentication username="${settings.apache-id.username}" password="${settings.apache-id.password}" />
-                    </staging:connectionInfo>
-                </staging:nexusStagingInfo>
-            </staging:stageRemotely>
-        </sequential>
-    </macrodef>
-
-    <target name="-init-svn" depends="init,fetch-svn-jars,load-maven-server-settings">
-        <!-- JAVA_HOME needs to point to a JRE/JDK7+, otherwise the svn/https connection throws a "Could not generate DH keypair"-->
-        <fail message="Environment needs to point to a java 7+">
-            <condition>
-                <or>
-                    <equals arg1="${ant.java.version}" arg2="1.6"/>
-                    <equals arg1="${ant.java.version}" arg2="1.5"/>
-                </or>
-            </condition>
-        </fail>
-
-        <path id="path.svnant">
-            <fileset dir="${compile.lib}/svnant" includes="*.jar"/>
-        </path>
-        <taskdef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="path.svnant"/>
-
-        <svnSetting
-            svnkit="true"
-            javahl="false"
-            username="${settings.apache-id.username}"
-            password="${settings.apache-id.password}"
-            id="svn.settings"
-        />
-    </target>
-
-    <!-- experimental release preparation ... tbd. ... -->
-    <target name="release-prep1" depends="-init-svn" description="update the documentation and create the svn tag - needs Java7+">
-        <local name="tstamp_rel"/>
-        <local name="tstamp_next"/>
-        <local name="rel_next"/>
-        <tstamp>
-            <format property="tstamp_rel" pattern="yyyy-MM-dd" offset="7" unit="day"/>
-            <format property="tstamp_next" pattern="yyyy-MM" offset="3" unit="month"/>
-        </tstamp>
-
-        <scriptdef name="getnextrel" language="javascript">
-            var relCurr = new String(project.getProperty("version.id"));
-            var relNext = relCurr.replace(/[0-9]+$/, function(lastNum){ return new String(new Number(lastNum)+1); });
-            if (relNext.search(/beta/i) == -1) relNext += "-beta1";
-            project.setProperty("rel_next", relNext);
-        </scriptdef>
-        <getnextrel/>
-
-        <antcall target="-update-build.xml">
-            <param name="version_id" value="${version.id}"/>
-        </antcall>
-
-        <replaceregexp byline="true">
-            <regexp pattern="&lt;release.*date=&quot;.*\?\?&quot;&gt;"/>
-            <substitution expression="&lt;!-- release version=&quot;${rel_next}&quot; date=&quot;${tstamp_next}-??&quot;&gt;&#10;    &lt;/release --&gt;&#10;&#10;    &lt;release version=&quot;${version.id}&quot; date=&quot;${tstamp_rel}&quot;&gt;"/>
-            <fileset dir="src/documentation/content/xdocs">
-              <include name="status.xml"/>
-            </fileset>
-        </replaceregexp>
-
-        <fixcrlf srcdir="." includes="src/documentation/content/xdocs/status.xml" eol="unix" eof="remove" />
-
-        <!-- can't combine updating and pinning of the documentation ... so we need two commits -->
-        <!-- (revision)properties can't be set and read within one svn block -->
-        <echo message="updating build.xml and status.xml"/>
-        <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'release prepare for ${version.id} - updating build.xml and status.xml' build.xml src/documentation/content/xdocs/status.xml"/>
-        <svn refid="svn.settings">
-            <!--<commit message="release prepare for ${version.id} - updating build.xml and status.xml" recurse="false">
-                <fileset dir="." includes="build.xml,src/documentation/content/xdocs/status.xml"/>
-            </commit>-->
-            <update dir="." recurse="true"/>
-            <status path="." revisionProperty="svn_version1"/>
-        </svn>
-        <echo message="pin documentation - release ${svn_version1}"/>
-        <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'release prepare for ${version.id} - pin documentation' src"/>
-        <svn refid="svn.settings">
-            <propset path="src" name="svn:externals" value="documentation -r${svn_version1} https://svn.apache.org/repos/asf/poi/site/src/documentation"/>
-<!--            <commit message="release prepare for ${version.id} - pin documentation" dir="src" recurse="false"/>-->
-            <update dir="." recurse="true"/>
-            <status path="." revisionProperty="svn_version2"/>
-        </svn>
-        <echo message="create release tag"/>
-        <svn refid="svn.settings">
-            <copy
-                srcUrl="https://svn.apache.org/repos/asf/poi/trunk"
-                destUrl="https://svn.apache.org/repos/asf/poi/tags/${RELEASE_TAG}"
-                message="tag r${svn_version2} as ${version.id}"/>
-        </svn>
-
-        <!-- update build.xml to the next beta version -->
-        <antcall target="-update-build.xml">
-            <param name="version_id" value="${rel_next}"/>
-        </antcall>
-
-        <!-- update sonar pom.xmls -->
-        <replaceregexp byline="true">
-            <regexp pattern="&lt;version&gt;.*-SNAPSHOT&lt;/version&gt;"/>
-            <substitution expression="&lt;version&gt;${rel_next}-SNAPSHOT&lt;/version&gt;"/>
-            <fileset dir="sonar">
-              <include name="**/pom.xml"/>
-            </fileset>
-        </replaceregexp>
-
-        <!-- unpin documentation and commit next beta version -->
-        <svn refid="svn.settings">
-            <update dir="." recurse="true"/>
-            <propset path="src" name="svn:externals" value="documentation https://svn.apache.org/repos/asf/poi/site/src/documentation"/>
-            <!--<commit message="prepare for ${rel_next}" recurse="false">
-                <fileset dir="." includes="build.xml"/>
-                <fileset dir="sonar" includes="**/pom.xml"/>
-                <dirset dir="src"/>
-            </commit>-->
-        </svn>
-        <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'prepare for ${rel_next}' build.xml sonar src"/>
-
-        <mkdir dir="build/release"/>
-
-        <svn refid="svn.settings">
-            <checkout url="https://svn.apache.org/repos/asf/poi/tags/${RELEASE_TAG}" destPath="build/release"/>
-        </svn>
-    </target>
-
-    <target name="release-prep2" depends="init" description="compile the freshly checked out svn tag and upload it to the nexus - needs a JDK6">
-        <!-- JAVA_HOME needs to point to a JDK6, otherwise the ant invocation is failing on a missing javac -->
-        <fail message="Environment needs to point to a java 6 jdk">
-            <condition>
-                <not><equals arg1="${ant.java.version}" arg2="1.6"/></not>
-            </condition>
-        </fail>
-
-        <local name="DSTAMP"/>
-        <tstamp>
-            <format property="DSTAMP" pattern="yyyyMMdd" offset="7" unit="day"/>
-        </tstamp>
-
-        <ant dir="build/release" inheritAll="false" inheritRefs="false" useNativeBasedir="true">
-            <property name="DSTAMP" value="${DSTAMP}"/>
-            <target name="dist" />
-        </ant>
-    </target>
-
-    <target name="release-prep3" depends="-init-svn" description="write the dist to the release candidate repo - needs Java7+">
-        <ant dir="build/release" inheritAll="false" inheritRefs="false" useNativeBasedir="true">
-            <target name="dist-nexus" />
-        </ant>
-
-    	<svn refid="svn.settings">
-            <import path="build/release/build/dist"
-                url="https://dist.apache.org/repos/dist/dev/poi"
-                newEntry="${version.id}-${release.rc}"
-                message="release candidate POI ${version.id}"/>
-        </svn>
-    </target>
-
-    <target name="-update-build.xml">
-        <replaceregexp byline="true">
-            <regexp pattern="(&lt;property name=&quot;version.id&quot; value=&quot;)[^&quot;]+(&quot;/>)"/>
-            <substitution expression="\1${version_id}\2"/>
-            <fileset dir=".">
-                <include name="build.xml"/>
-            </fileset>
-        </replaceregexp>
-        <fixcrlf srcdir="." includes="build.xml" eol="unix" eof="remove" />
-    </target>
-
-    <!--
-        Configure gpg settings in local maven settings.xml
-        see release-guide.txt for more details
-    -->
-    <target name="load-maven-server-settings">
-        <xslt in="${user.home}/.m2/settings.xml" out="build/tmp/signing.properties">
-            <style>
-                <string><![CDATA[
-                    <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:mvn="http://maven.apache.org/SETTINGS/1.0.0">
-                        <xsl:output method="text" version="1.0" encoding="ISO-8859-1"/>
-                        <xsl:template match="@*|text()"/>
-                        <xsl:template match="//mvn:server[contains('poi-signing|apache-id',mvn:id/text())]/*[name(.)!='id']">
-                            <xsl:value-of select="concat('settings.',../mvn:id,'.',name(.),'=',translate(text(),'\','/'),'&#010;')"/>
-                        </xsl:template>
-                    </xsl:stylesheet>
-                ]]></string>
-            </style>
-        </xslt>
-
-        <loadproperties srcFile="build/tmp/signing.properties"/>
-        <pathconvert property="settings.poi-signing.publicKey">
-            <path><pathelement path="${settings.poi-signing.privateKey}"/></path>
-            <mapper><filtermapper><replacestring from="secring" to="pubring"/></filtermapper></mapper>
-        </pathconvert>
-    </target>
-
-	<macrodef name="loadChecksum">
-		<attribute name="url"/>
-		<attribute name="property"/>
-		<sequential>
-	        <loadresource property="@{property}">
-	            <url url="@{url}"/>
-	            <filterchain>
-	            	<striplinebreaks/>
-	                <replaceregex pattern=" .*" replace=""/>
-	            </filterchain>
-	        </loadresource>			
-		</sequential>
-	</macrodef>
-
-    <scriptdef name="bytes2mega" language="javascript"
-        description="Convert size in bytes to megabytes">
-        <attribute name="property"/>
-        <attribute name="bytes"/>
-    	var bytes = Number(attributes.get("bytes"));
-    	var mega = String((bytes/(1024.0*1024.0)).toFixed(2));
-        project.setProperty(attributes.get("property"), mega);
-    </scriptdef>
-	
-    <macrodef name="loadFilesize">
-        <attribute name="url"/>
-        <attribute name="property"/>
-        <sequential>
-        	<local name="entityProperty"/>
-        	<delete file="build/loadFilesize.txt"/>
-        	<record name="build/loadFilesize.txt" action="start" loglevel="verbose" append="false"/>
-        	<http entityProperty="entityProperty" url="@{url}" method="HEAD" expected="200" printrequestheaders="false" printresponseheaders="false"/>
-        	<record name="build/loadFilesize.txt" action="stop"/>
-        	<local name="fileSize"/>
-        	<loadfile property="fileSize" srcFile="build/loadFilesize.txt">
-        		<filterchain>
-        			<tokenfilter>
-        			    <containsstring contains="Content-Length"/>
-        				<replaceregex pattern=".* ([0-9]+)$" replace="\1" flags="gi"/>
-			    	</tokenfilter>
-        		</filterchain>
-    		</loadfile>
-    		<bytes2mega property="@{property}" bytes="${fileSize}"/>
-        </sequential>
-    </macrodef>
-
-	<!-- TODO: currently this only saves a copy and paste snipplet to a file ...
-	     would be nice if it really changes status.xml and download.xml --> 
-	<target name="update-download">
-        <downloadfile src="http://missing-link.googlecode.com/files/ml-ant-http-1.1.3.zip" dest="${compile.lib}/ml-ant-http-1.1.3.zip"/>
-        <unzip src="${compile.lib}/ml-ant-http-1.1.3.zip" dest="${compile.lib}">
-            <patternset>
-                <include name="ml-ant-http-1.1.3.jar"/>
-            </patternset>
-    	</unzip>
-        <taskdef name="http" classname="org.missinglink.ant.task.http.HttpClientTask">
-            <classpath>
-                <path location="${compile.lib}/ml-ant-http-1.1.3.jar"/>
-            </classpath>
-        </taskdef>
-		
-		<tstamp>
-			<format property="rel_date" pattern="dd MMMM yyyy" locale="US"/>
-			<format property="file_date" pattern="yyyyMMdd" locale="US"/>
-		</tstamp>
-        <!-- TODO: change reltype (dev/release), depending on BETA / FINAL -->
-		<property name="reltype" value="dev"/>
-		<property name="baseurl" value="http://www.apache.org/dist/poi/${reltype}"/>
-
-        <loadChecksum property="bin-tar-md5" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.md5"/>
-        <loadChecksum property="bin-tar-sha1" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha1"/>
-        <loadChecksum property="bin-zip-md5" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip.md5"/>
-        <loadChecksum property="bin-zip-sha1" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip.sha1"/>
-        <loadChecksum property="src-tar-md5" url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz.md5"/>
-        <loadChecksum property="src-tar-sha1" url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz.sha1"/>
-        <loadChecksum property="src-zip-md5" url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip.md5"/>
-        <loadChecksum property="src-zip-sha1" url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip.sha1"/>
-
-		<loadFilesize property="bin-tar-size" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz"/>
-        <loadFilesize property="bin-zip-size" url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip"/>
-        <loadFilesize property="src-tar-size" url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz"/>
-        <loadFilesize property="src-zip-size" url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip"/>
-
-		<echo file="download-snipplet.xml"><![CDATA[
-    <section id="POI-${version.id}"><title>${rel_date} - POI ${version.id} available</title>
-      <p>The Apache POI team is pleased to announce the release of ${version.id}.
-         Featured are a handful of new areas of functionality and numerous bug fixes.</p>
-      <p>A summary of changes is available in the
-        <link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/RELEASE-NOTES.txt">Release Notes</link>.
-        A full list of changes is available in the <link href="changes.html">change log</link>.
-        People interested should also follow the <link href="mailinglists.html">dev list</link>
-        to track progress.</p>
-      <p>
-        The POI source release as well as the pre-built binary deployment packages are listed below.
-        Pre-built versions of all <link href="index.html#components">POI components</link>
-        are available in the central Maven repository under Group ID "org.apache.poi" and Version
-        "${version.id}".
-      </p>
-      <section><title>Binary Distribution</title>
-      <ul>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz">poi-bin-${version.id}-${file_date}.tar.gz</link>
-          (${bin-tar-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.asc">signature (.asc)</link>)
-          <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.md5">
-          ${bin-tar-md5}</link>
-          <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha1">
-          ${bin-tar-sha1}</link>
-        </li>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip">poi-bin-${version.id}-${file_date}.zip</link>
-          (${bin-zip-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.asc">signature (.asc)</link>)
-          <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.md5">
-	      ${bin-zip-md5}</link>
-          <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/bin/poi-bin-${version.id}-${file_date}.zip.sha1">
-	      ${bin-zip-sha1}</link>
-        </li>
-      </ul>
-      </section>
-      <section><title>Source Distribution</title>
-      <ul>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz">poi-src-${version.id}-${file_date}.tar.gz</link>
-          (${src-tar-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.asc">signature (.asc)</link>)
-          <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.md5">
-          ${src-tar-md5}</link>
-          <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.tar.gz.sha1">
-	      ${src-tar-sha1}</link>
-        </li>
-        <li><link href="http://www.apache.org/dyn/closer.lua/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip">poi-src-${version.id}-${file_date}.zip</link>
-          (${src-zip-size} MB, <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.asc">signature (.asc)</link>)
-          <br/>
-          MD5 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.md5">
-	      ${src-zip-md5}</link>
-          <br/>
-          SHA1 checksum: <link href="http://www.apache.org/dist/poi/${reltype}/src/poi-src-${version.id}-${file_date}.zip.sha1">
-	      ${src-zip-sha1}</link>
-        </li>
-      </ul>
-      </section>
-    </section>
-]]></echo>
-	</target>
-</project>
diff --git a/trunk/doap_POI.rdf b/trunk/doap_POI.rdf
deleted file mode 100644
index 08106f4..0000000
--- a/trunk/doap_POI.rdf
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl"?>
-<rdf:RDF xml:lang="en"
-         xmlns="http://usefulinc.com/ns/doap#" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:asfext="http://projects.apache.org/ns/asfext#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/">
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-         http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-  <Project rdf:about="http://poi.apache.org">
-    <created>2006-01-26</created>
-    <license rdf:resource="http://spdx.org/licenses/Apache-2.0" />
-    <name>Apache POI</name>
-    <homepage rdf:resource="http://poi.apache.org" />
-    <asfext:pmc rdf:resource="http://poi.apache.org" />
-    <shortdesc>Java API To Access Microsoft Document File Formats</shortdesc>
-    <description>APIs for manipulating various file formats based upon Open Office XML (ECMA-376) and Microsoft's OLE 2 Compound Document formats using pure Java. Apache POI is your Java Excel, Word and PowerPoint solution. We have a complete API for porting other OOXML and OLE 2 Compound Document formats and welcome others to participate.</description>
-    <bug-database rdf:resource="http://issues.apache.org/bugzilla/buglist.cgi?product=POI" />
-    <mailing-list rdf:resource="http://poi.apache.org/mailinglists.html" />
-    <download-page rdf:resource="http://www.apache.org/dyn/closer.lua/poi/" />
-    <programming-language>Java</programming-language>
-    <category rdf:resource="http://projects.apache.org/category/content" />
-    <category rdf:resource="http://projects.apache.org/category/library" />
-    <release>
-      <Version>
-        <name>Apache POI 3.15</name>
-        <created>2016-09-21</created>
-        <revision>3.15</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.14</name>
-        <created>2016-03-05</created>
-        <revision>3.14</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.13</name>
-        <created>2015-09-29</created>
-        <revision>3.13</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.12</name>
-        <created>2015-05-11</created>
-        <revision>3.12</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.11</name>
-        <created>2014-12-21</created>
-        <revision>3.11</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.10.1</name>
-        <created>2014-08-18</created>
-        <revision>3.10.1</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.10</name>
-        <created>2014-02-08</created>
-        <revision>3.10</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.9</name>
-        <created>2012-12-03</created>
-        <revision>3.9</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.8</name>
-        <created>2012-03-26</created>
-        <revision>3.8</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.7</name>
-        <created>2010-10-29</created>
-        <revision>3.7</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.6</name>
-        <created>2009-12-14</created>
-        <revision>3.6</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.5</name>
-        <created>2009-09-28</created>
-        <revision>3.5</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 3.2</name>
-        <created>2008-10-19</created>
-        <revision>3.2</revision>
-      </Version>
-    </release>
-    <repository>
-      <SVNRepository>
-        <location rdf:resource="http://svn.apache.org/repos/asf/poi/"/>
-        <browse rdf:resource="http://svn.apache.org/viewvc/poi/"/>
-      </SVNRepository>
-    </repository>
-   <maintainer>
-      <foaf:Person>
-        <foaf:name>POI Committers</foaf:name>
-          <foaf:mbox rdf:resource="mailto:dev@poi.apache.org"/>
-      </foaf:Person>
-    </maintainer>
-  </Project>
-</rdf:RDF>
diff --git a/trunk/legal/LICENSE b/trunk/legal/LICENSE
deleted file mode 100644
index 19246db..0000000
--- a/trunk/legal/LICENSE
+++ /dev/null
@@ -1,513 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-APACHE POI SUBCOMPONENTS:
-
-Apache POI includes subcomponents with separate copyright notices and
-license terms. Your use of these subcomponents is subject to the terms
-and conditions of the following licenses:
-
-
-Office Open XML schemas (ooxml-schemas-1.*.jar)
-
-    The Office Open XML schema definitions used by Apache POI are
-    a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
-    As defined in section 9.4 of the ECMA bylaws [2], this specification
-    is available to all interested parties without restriction:
-
-        9.4 All documents when approved shall be made available to
-            all interested parties without restriction.
-
-    Furthermore, both Microsoft and Adobe have granted patent licenses
-    to this work [3,4,5].
-
-    [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
-    [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
-    [3] http://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx
-    [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
-        Patent%20statements%20ok/ECMA-376%20Edition%202%20Microsoft%20Patent%20Declaration.pdf
-    [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
-        Patent%20statements%20ok/ECMA-376%20Adobe%20Patent%20Declaration.pdf
-
-
-Bouncy Castle library (bcprov-*.jar, bcpg-*.jar, bcpkix-*.jar)
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-
-JUnit test library (junit-4.*.jar) & JaCoCo (*jacoco*)
-
-    Eclipse Public License - v 1.0
-
-    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-    LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-    CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and documentation
-       distributed under this Agreement, and
-    b) in the case of each subsequent Contributor:
-    i) changes to the Program, and
-    ii) additions to the Program;
-    where such changes and/or additions to the Program originate from and are 
-    distributed by that particular Contributor. A Contribution 'originates' from
-    a Contributor if it was added to the Program by such Contributor itself or
-    anyone acting on such Contributor's behalf. Contributions do not include
-    additions to the Program which: (i) are separate modules of software
-    distributed in conjunction with the Program under their own license agreement,
-    and (ii) are not derivative works of the Program.
-
-    "Contributor" means any person or entity that distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which are
-    necessarily infringed by the use or sale of its Contribution alone or when
-    combined with the Program.
-
-    "Program" means the Contributions distributed in accordance with this Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement,
-    including all Contributors.
-
-    2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-       Recipient a non-exclusive, worldwide, royalty-free copyright license to
-       reproduce, prepare derivative works of, publicly display, publicly
-       perform, distribute and sublicense the Contribution of such Contributor,
-       if any, and such derivative works, in source code and object code form.
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-       Recipient a non-exclusive, worldwide, royalty-free patent license under
-       Licensed Patents to make, use, sell, offer to sell, import and otherwise
-       transfer the Contribution of such Contributor, if any, in source code
-       and object code form. This patent license shall apply to the combination
-       of the Contribution and the Program if, at the time the Contribution is
-       added by the Contributor, such addition of the Contribution causes such
-       combination to be covered by the Licensed Patents. The patent license
-       shall not apply to any other combinations which include the Contribution.
-       No hardware per se is licensed hereunder.
-    c) Recipient understands that although each Contributor grants the licenses
-       to its Contributions set forth herein, no assurances are provided by any
-       Contributor that the Program does not infringe the patent or other
-       intellectual property rights of any other entity. Each Contributor
-       disclaims any liability to Recipient for claims brought by any other
-       entity based on infringement of intellectual property rights or
-       otherwise. As a condition to exercising the rights and licenses granted
-       hereunder, each Recipient hereby assumes sole responsibility to secure
-       any other intellectual property rights needed, if any. For example, if
-       a third party patent license is required to allow Recipient to distribute
-       the Program, it is Recipient's responsibility to acquire that license
-       before distributing the Program.
-    d) Each Contributor represents that to its knowledge it has sufficient
-       copyright rights in its Contribution, if any, to grant the copyright
-       license set forth in this Agreement.
-
-    3. REQUIREMENTS
-
-    A Contributor may choose to distribute the Program in object code form under
-    its own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-    b) its license agreement:
-    i) effectively disclaims on behalf of all Contributors all warranties and
-       conditions, express and implied, including warranties or conditions of
-       title and non-infringement, and implied warranties or conditions of
-       merchantability and fitness for a particular purpose;
-    ii) effectively excludes on behalf of all Contributors all liability for
-       damages, including direct, indirect, special, incidental and
-       consequential damages, such as lost profits;
-    iii) states that any provisions which differ from this Agreement are
-       offered by that Contributor alone and not by any other party; and
-    iv) states that source code for the Program is available from such
-       Contributor, and informs licensees how to obtain it in a reasonable
-       manner on or through a medium customarily used for software exchange.
-
-    When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-    b) a copy of this Agreement must be included with each copy of the Program.
-       Contributors may not remove or alter any copyright notices contained
-       within the Program.
-
-    Each Contributor must identify itself as the originator of its Contribution,
-    if any, in a manner that reasonably allows subsequent Recipients to identify
-    the originator of the Contribution.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities with
-    respect to end users, business partners and the like. While this license is
-    intended to facilitate the commercial use of the Program, the Contributor
-    who includes the Program in a commercial product offering should do so in a
-    manner which does not create potential liability for other Contributors.
-    Therefore, if a Contributor includes the Program in a commercial product
-    offering, such Contributor ("Commercial Contributor") hereby agrees to
-    defend and indemnify every other Contributor ("Indemnified Contributor")
-    against any losses, damages and costs (collectively "Losses") arising from
-    claims, lawsuits and other legal actions brought by a third party against
-    the Indemnified Contributor to the extent caused by the acts or omissions
-    of such Commercial Contributor in connection with its distribution of the
-    Program in a commercial product offering. The obligations in this section
-    do not apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in writing
-    of such claim, and b) allow the Commercial Contributor to control, and
-    cooperate with the Commercial Contributor in, the defense and any related
-    settlement negotiations. The Indemnified Contributor may participate in any
-    such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial product
-    offering, Product X. That Contributor is then a Commercial Contributor. If
-    that Commercial Contributor then makes performance claims, or offers
-    warranties related to Product X, those performance claims and warranties are
-    such Commercial Contributor's responsibility alone. Under this section, the
-    Commercial Contributor would have to defend claims against the other
-    Contributors related to those performance claims and warranties, and if a
-    court requires any other Contributor to pay any damages as a result, the
-    Commercial Contributor must pay those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
-    AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
-    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
-    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
-    PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all risks
-    associated with its exercise of rights under this Agreement , including but
-    not limited to the risks and costs of program errors, compliance with
-    applicable laws, damage to or loss of data, programs or equipment, and
-    unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-    CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-    LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-    OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of the
-    remainder of the terms of this Agreement, and without further action by the
-    parties hereto, such provision shall be reformed to the minimum extent
-    necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-    (excluding combinations of the Program with other software or hardware)
-    infringes such Recipient's patent(s), then such Recipient's rights granted
-    under Section 2(b) shall terminate as of the date such litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it fails to
-    comply with any of the material terms or conditions of this Agreement and
-    does not cure such failure in a reasonable period of time after becoming
-    aware of such noncompliance. If all Recipient's rights under this Agreement
-    terminate, Recipient agrees to cease use and distribution of the Program as
-    soon as reasonably practicable. However, Recipient's obligations under this
-    Agreement and any licenses granted by Recipient relating to the Program
-    shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement, but
-    in order to avoid inconsistency the Agreement is copyrighted and may only
-    be modified in the following manner. The Agreement Steward reserves the
-    right to publish new versions (including revisions) of this Agreement from
-    time to time. No one other than the Agreement Steward has the right to
-    modify this Agreement. The Eclipse Foundation is the initial Agreement
-    Steward. The Eclipse Foundation may assign the responsibility to serve as
-    the Agreement Steward to a suitable separate entity. Each new version of
-    the Agreement will be given a distinguishing version number. The Program
-    (including Contributions) may always be distributed subject to the version
-    of the Agreement under which it was received. In addition, after a new
-    version of the Agreement is published, Contributor may elect to distribute
-    the Program (including its Contributions) under the new version. Except as
-    expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-    rights or licenses to the intellectual property of any Contributor under
-    this Agreement, whether expressly, by implication, estoppel or otherwise.
-    All rights in the Program not expressly granted under this Agreement are
-    reserved.
-
-    This Agreement is governed by the laws of the State of New York and the
-    intellectual property laws of the United States of America. No party to this
-    Agreement will bring a legal action under this Agreement more than one year
-    after the cause of action arose. Each party waives its rights to a jury
-    trial in any resulting litigation.
-
-Hamcrest library (hamcrest-*.jar) & CuvesAPI / Curve API
-
-    BSD License
-
-    Copyright (c) 2000-2006, www.hamcrest.org
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer. 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.
-
-    Neither the name of Hamcrest nor the names of its contributors may be used
-    to endorse or promote products derived from this software without specific
-    prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
-
-SLF4J library (slf4j-api-*.jar)
-
-    Copyright (c) 2004-2013 QOS.ch
-    All rights reserved. 
-
-    Permission is hereby granted, free  of charge, to any person obtaining
-    a  copy  of this  software  and  associated  documentation files  (the
-    "Software"), to  deal in  the Software without  restriction, including
-    without limitation  the rights to  use, copy, modify,  merge, publish,
-    distribute,  sublicense, and/or sell  copies of  the Software,  and to
-    permit persons to whom the Software  is furnished to do so, subject to
-    the following conditions:
-
-    The  above  copyright  notice  and  this permission  notice  shall  be
-    included in all copies or substantial portions of the Software.
-
-    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/trunk/legal/NOTICE b/trunk/legal/NOTICE
deleted file mode 100644
index 43d9b3b..0000000
--- a/trunk/legal/NOTICE
+++ /dev/null
@@ -1,23 +0,0 @@
-Apache POI
-Copyright 2003-2016 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (https://www.apache.org/).
-
-This product contains parts that were originally based on software from BEA.
-Copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-This product contains W3C XML Schema documents. Copyright 2001-2003 (c)
-World Wide Web Consortium (Massachusetts Institute of Technology, European
-Research Consortium for Informatics and Mathematics, Keio University)
-
-This product contains the Piccolo XML Parser for Java
-(http://piccolo.sourceforge.net/). Copyright 2002 Yuval Oren.
-
-This product contains the chunks_parse_cmds.tbl file from the vsdump program.
-Copyright (C) 2006-2007 Valek Filippov (frob@df.ru)
-
-This product contains parts of the eID Applet project 
-(http://eid-applet.googlecode.com). Copyright (c) 2009-2014
-FedICT (federal ICT department of Belgium), e-Contract.be BVBA (https://www.e-contract.be),
-Bart Hanssens from FedICT
diff --git a/trunk/maven/multisign.sh b/trunk/maven/multisign.sh
deleted file mode 100755
index 1ba8c91..0000000
--- a/trunk/maven/multisign.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements.  See the NOTICE file distributed with
-#   this work for additional information regarding copyright ownership.
-#   The ASF licenses this file to You under the Apache License, Version 2.0
-#   (the "License"); you may not use this file except in compliance with
-#   the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-#   create md5 checksums and gpg signatures 
-
-echo "If you use gpg2 you need to set GPG_BIN accordingly"
-
-GPG_BIN=gpg
-
-stty -echo
-echo "enter your GPG passphrase"
-read passphrase
-stty echo
-
-# Do we have md5sum and sha1sum?
-# (We can use openssl if not, but the files it produces aren't as nice)
-which md5sum > /dev/null
-LACKING_MD5SUM=$?
-which sha1sum > /dev/null
-LACKING_SHA1SUM=$?
-
-for i in *; do
-    echo ""
-    echo Signing $i
-    echo $passphrase | $GPG_BIN --passphrase-fd 0 --output $i.asc --detach-sig --armor $i
-    $GPG_BIN --verify $i.asc $i
-    echo Hashing $i
-
-    if [ "$LACKING_MD5SUM" = "1" ]; then
-       openssl md5 < $i > $i.md5
-    else
-       md5sum $i > $i.md5
-    fi
-
-    if [ "$LACKING_SHA1SUM" = "1" ]; then
-       openssl sha1 < $i > $i.sha1
-    else
-       sha1sum $i > $i.sha1
-    fi
-done
diff --git a/trunk/maven/mvn-deploy.sh b/trunk/maven/mvn-deploy.sh
deleted file mode 100755
index a66936a..0000000
--- a/trunk/maven/mvn-deploy.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements.  See the NOTICE file distributed with
-#   this work for additional information regarding copyright ownership.
-#   The ASF licenses this file to You under the Apache License, Version 2.0
-#   (the "License"); you may not use this file except in compliance with
-#   the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# Shell script to deploy POI artifacts in a maven repository.
-#
-#  Note, You should configure your settings.xml and add a server with id=apache-releases:
-#
-#    <server>
-#      <id>apache-releases</id>
-#      <username>apacheId</username>
-#      <password>mySecurePassw0rd</password>
-#    </server>
-#
-#   <profiles>
-#      <profile>
-#      <id>apache-releases</id>
-#      <properties>
-#        <gpg.passphrase><!-- Your GPG passphrase --></gpg.passphrase>
-#      </properties>
-#    </profile>
-#  </profiles>
-#
-#  Usage:
-#   1. ant dist
-#   2. cd build/dist
-#   3. ./mvn-deploy.sh 
-
-M2_REPOSITORY=https://repository.apache.org/service/local/staging/deploy/maven2
-
-VERSION=@VERSION@
-DSTAMP=@DSTAMP@
-
-for artifactId in poi poi-scratchpad poi-ooxml poi-examples poi-ooxml-schemas poi-excelant
-do
-  SENDS="-Dfile=$artifactId-$VERSION-$DSTAMP.jar"
-  SENDS="$SENDS -DpomFile=$artifactId-$VERSION.pom"
-  if [ -r $artifactId-$VERSION-sources-$DSTAMP.jar ]; then
-     SENDS="$SENDS -Dsources=$artifactId-$VERSION-sources-$DSTAMP.jar"
-  fi
-  if [ -r $artifactId-$VERSION-javadocs-$DSTAMP.jar ]; then
-     SENDS="$SENDS -Djavadoc=$artifactId-$VERSION-javadocs-$DSTAMP.jar"
-  fi
-
-  mvn gpg:sign-and-deploy-file \
-    -DrepositoryId=apache-releases -P apache-releases \
-    -Durl=$M2_REPOSITORY \
-    $SENDS
-done
diff --git a/trunk/maven/ooxml-schemas.pom b/trunk/maven/ooxml-schemas.pom
deleted file mode 100644
index da49544..0000000
--- a/trunk/maven/ooxml-schemas.pom
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.poi</groupId>
-  <artifactId>ooxml-schemas</artifactId>
-  <version>@VERSION@</version>
-  <packaging>jar</packaging>
-  <name>OOXML schemas</name>
-  <description>XmlBeans generated from the Ecma supplied xsds: 
-    http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%20Part%204%20(DOCX).zip</description>
-  <url>http://poi.apache.org/</url>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
-      <artifactId>xmlbeans</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/trunk/maven/ooxml-security.pom b/trunk/maven/ooxml-security.pom
deleted file mode 100644
index de9112e..0000000
--- a/trunk/maven/ooxml-security.pom
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.poi</groupId>
-  <artifactId>ooxml-security</artifactId>
-  <version>@VERSION@</version>
-  <packaging>jar</packaging>
-  <name>OOXML security</name>
-  <description>
-    XmlBeans generated from various supplied xsds for encryption and signing:
-    http://msdn.microsoft.com/en-us/library/dd925810(v=office.12).aspx
-    http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%202%20(PDF).zip 
-    http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd
-    http://uri.etsi.org/01903/v1.3.2/XAdES.xsd
-    http://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd
-    http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd
-    http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd
-    http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcmitype.xsd
-  </description>
-  <url>http://poi.apache.org/</url>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
-      <artifactId>xmlbeans</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/trunk/maven/poi-examples.pom b/trunk/maven/poi-examples.pom
deleted file mode 100644
index 249f250..0000000
--- a/trunk/maven/poi-examples.pom
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi-examples</artifactId>
-	<version>@VERSION@</version>
-	<packaging>jar</packaging>
-	<name>Apache POI</name>
-	<url>http://poi.apache.org/</url>
-	<description>Apache POI Examples</description>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-       <groupId>org.apache.poi</groupId>
-       <artifactId>poi</artifactId>
-       <version>@VERSION@</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-scratchpad</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-ooxml</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/trunk/maven/poi-excelant.pom b/trunk/maven/poi-excelant.pom
deleted file mode 100644
index 6b23e4a..0000000
--- a/trunk/maven/poi-excelant.pom
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi-excelant</artifactId>
-	<version>@VERSION@</version>
-	<packaging>jar</packaging>
-	<name>Apache POI</name>
-	<url>http://poi.apache.org/</url>
-	<description>Apache POI Excel Ant Tasks</description>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-       <groupId>org.apache.poi</groupId>
-       <artifactId>poi</artifactId>
-       <version>@VERSION@</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-ooxml</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-    <dependency>
-     	<groupId>org.apache.ant</groupId>
-     	<artifactId>ant</artifactId>
-     	<version>1.8.2</version>
-   	</dependency> 
-  </dependencies>
-</project>
diff --git a/trunk/maven/poi-ooxml-schemas.pom b/trunk/maven/poi-ooxml-schemas.pom
deleted file mode 100644
index baf531d..0000000
--- a/trunk/maven/poi-ooxml-schemas.pom
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi-ooxml-schemas</artifactId>
-	<version>@VERSION@</version>
-	<packaging>jar</packaging>
-	<name>Apache POI</name>
-	<url>http://poi.apache.org/</url>
-	<description>Apache POI - Java API To Access Microsoft Format Files</description>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
-      <artifactId>xmlbeans</artifactId>
-      <version>2.6.0</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/trunk/maven/poi-ooxml.pom b/trunk/maven/poi-ooxml.pom
deleted file mode 100644
index 0f3cdb1..0000000
--- a/trunk/maven/poi-ooxml.pom
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi-ooxml</artifactId>
-	<version>@VERSION@</version>
-	<packaging>jar</packaging>
-	<name>Apache POI</name>
-	<url>http://poi.apache.org/</url>
-	<description>Apache POI - Java API To Access Microsoft Format Files</description>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-       <groupId>org.apache.poi</groupId>
-       <artifactId>poi</artifactId>
-       <version>@VERSION@</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-ooxml-schemas</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-    <dependency>
-    	<groupId>com.github.virtuald</groupId>
-    	<artifactId>curvesapi</artifactId>
-    	<version>1.04</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/trunk/maven/poi-scratchpad.pom b/trunk/maven/poi-scratchpad.pom
deleted file mode 100644
index d1b4392..0000000
--- a/trunk/maven/poi-scratchpad.pom
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi-scratchpad</artifactId>
-	<version>@VERSION@</version>
-	<packaging>jar</packaging>
-	<name>Apache POI</name>
-	<url>http://poi.apache.org/</url>
-	<description>Apache POI - Java API To Access Microsoft Format Files</description>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-       <groupId>org.apache.poi</groupId>
-       <artifactId>poi</artifactId>
-       <version>@VERSION@</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/trunk/maven/poi.pom b/trunk/maven/poi.pom
deleted file mode 100644
index efd24cf..0000000
--- a/trunk/maven/poi.pom
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi</artifactId>
-	<version>@VERSION@</version>
-	<packaging>jar</packaging>
-	<name>Apache POI</name>
-	<url>http://poi.apache.org/</url>
-	<description>Apache POI - Java API To Access Microsoft Format Files</description>
-
-  <mailingLists>
-    <mailingList>
-      <name>POI Users List</name>
-      <subscribe>user-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>POI Developer List</name>
-      <subscribe>dev-subscribe@poi.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.2</version>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-      <version>4.12</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.1</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/trunk/osgi/build.xml b/trunk/osgi/build.xml
deleted file mode 100644
index 35dd87b..0000000
--- a/trunk/osgi/build.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- POI OSGi Bundle System -->
-<project name="POI OSGi Bundle" default="bundle" basedir=".." xmlns:mvn="antlib:org.apache.maven.artifact.ant">
-    <description>The Apache POI OSGi Bundle System.</description>
-
-    <property name="bundle.lib" location="osgi/lib"/>
-
-    <!-- TODO Import these from the parent build file -->
-    <property name="repository.m2" value="http://repo1.maven.org"/>
-    <property name="version.id" value="3.11-beta1"/>
-    <property name="dist.dir" value="build/dist"/>
-
-    <!-- jars in the /lib directory, see the fetch-bundle-jars target-->
-    <property name="bundle.bnd.jar" location="${bundle.lib}/bnd-1.50.0.jar"/>
-    <property name="bundle.bnd.url" value="${repository.m2}/maven2/biz/aQute/bnd/1.50.0/bnd-1.50.0.jar"/>
-    <import file="../build.xml"/>
-
-    <target name="check-bundle-jars">
-       <condition property="jars.bundle.present">
-           <available file="${bundle.bnd.jar}"/>
-       </condition>
-    </target>
-
-    <target name="fetch-bundle-jars" unless="jars.bundle.present">
-        <mkdir dir="${bundle.lib}"/>
-        <antcall target="downloadfile">
-            <param name="sourcefile" value="${bundle.bnd.url}"/>
-            <param name="destfile" value="${bundle.bnd.jar}"/>
-        </antcall>
-    </target>
-
-<!--
-    <target name="bundle" depends="init, check-bundle-jars, fetch-bundle-jars, jar">
--->
-    <target name="bundle" depends="init, check-bundle-jars, fetch-bundle-jars">
-        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${bundle.bnd.jar}"/>
-        <mkdir dir="build/osgi"/>
-        <bnd 
-           classpath="${dist.dir}/poi-${version.id}-${DSTAMP}.jar,${dist.dir}/poi-scratchpad-${version.id}-${DSTAMP}.jar,${dist.dir}/poi-ooxml-${version.id}-${DSTAMP}.jar"
-           eclipse="false" 
-           failok="false" 
-           exceptions="true" 
-           output="build/osgi"
-           files="test.bnd"/> 
-        <!-- TODO Include the settings from http://svn.apache.org/repos/asf/servicemix/smx4/bundles/trunk/poi-3.9/pom.xml -->
-        <!-- TODO Make this actually spit out an OSGi Jar -->
-    </target>
-</project>
diff --git a/trunk/osgi/bundle.info b/trunk/osgi/bundle.info
deleted file mode 100644
index 1886a0a..0000000
--- a/trunk/osgi/bundle.info
+++ /dev/null
@@ -1,38 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URLs:
-        \u001B[33mmvn:${pkgGroupId}/poi/${pkgVersion}\u001B[0m
-        \u001B[33mmvn:${pkgGroupId}/poi-ooxml/${pkgVersion}\u001B[0m
-        \u001B[33mmvn:${pkgGroupId}/poi-scratchpad/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    The Apache POI Project's mission is to create and maintain Java APIs for manipulating various file formats based
-    upon the Office Open XML standards (OOXML) and Microsoft's OLE 2 Compound Document format (OLE2). In short, you can
-    read and write MS Excel files using Java. In addition, you can read and write MS Word and MS PowerPoint files using
-    Java. Apache POI is your Java Excel solution (for Excel 97-2008). We have a complete API for porting other OOXML and
-    OLE2 formats and welcome others to participate.
-
-    OLE2 files include most Microsoft Office files such as XLS, DOC, and PPT as well as MFC serialization API based file
-    formats. The project provides APIs for the OLE2 Filesystem (POIFS) and OLE2 Document Properties (HPSF).
-
-    Office OpenXML Format is the new standards based XML file format found in Microsoft Office 2007 and 2008. This
-    includes XLSX, DOCX and PPTX. The project provides a low level API to support the Open Packaging Conventions using
-    openxml4j.
-
-    For each MS Office application there exists a component module that attempts to provide a common high level Java api
-    to both OLE2 and OOXML document formats. This is most developed for Excel workbooks (SS=HSSF+XSSF). Work is
-    progressing for Word documents (HWPF+XWPF) and PowerPoint presentations (HSLF+XSLF).
-
-    The project has recently added support for Outlook (HSMF). Microsoft opened the specifications to this format in
-    October 2007. We would welcome contributions.
-
-    There are also projects for Visio (HDGF), TNEF (HMEF), and Publisher (HPBF).
-
-    As a general policy we collaborate as much as possible with other projects to provide this functionality.
-    Examples include: Cocoon for which there are serializers for HSSF; Open Office.org with whom we collaborate in
-    documenting the XLS format; and Tika / Lucene, for which we provide format interpretors.
-    When practical, we donate components directly to those projects for POI-enabling them.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://poi.apache.org/\u001B[0m
diff --git a/trunk/osgi/pom.xml b/trunk/osgi/pom.xml
deleted file mode 100644
index 2849467..0000000
--- a/trunk/osgi/pom.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>10</version>
-    <relativePath />
-  </parent>
-
-  <groupId>org.apache.poi</groupId>
-  <artifactId>poi-bundle</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache POI OSGi bundle</name>
-  <description>
-    OSGi bundle that contains Apache POI, and the dependencies.
-  </description>
-  <url>http://poi.apache.org/</url>
-  <version>${poi.version}</version>
-<!--
-  <version>3.12-beta2</version>
-  <version>@VERSION@</version>
--->
-
-  <properties>
-    <maven.compiler.source>1.6</maven.compiler.source>
-    <maven.compiler.target>1.6</maven.compiler.target>
-    <pax.exam.version>4.4.0</pax.exam.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>poi</artifactId>
-      <version>${poi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>poi-scratchpad</artifactId>
-      <version>${poi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>poi-ooxml</artifactId>
-      <version>${poi.version}</version>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-junit4</artifactId>
-      <version>${pax.exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-native</artifactId>
-      <version>${pax.exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>4.6.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-link-assembly</artifactId>
-      <version>${pax.exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.url</groupId>
-      <artifactId>pax-url-aether</artifactId>
-      <version>2.3.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>5.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Activator>
-              org.apache.poi.osgi.Activator
-            </Bundle-Activator>
-            <Embed-Dependency>
-              poi;inline=true,
-              poi-scratchpad;inline=true,
-              poi-ooxml;inline=true,
-              poi-ooxml-schemas,
-              xmlbeans
-            </Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-            <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Export-Package>
-              org.apache.poi.*
-            </Export-Package>
-            <Import-Package>
-              !org.junit,
-              *,
-              org.apache.xmlbeans.impl.xpath.saxon;resolution:=optional,
-              org.apache.xmlbeans.impl.xquery.saxon;resolution:=optional,
-              org.bouncycastle.cert;resolution:=optional,
-              org.bouncycastle.cert.ocsp;resolution:=optional,
-              org.bouncycastle.cms.bc;resolution:=optional,
-              org.bouncycastle.cert.jcajce;resolution:=optional,
-              org.bouncycastle.operator;resolution:=optional,
-              org.bouncycastle.operator.bc;resolution:=optional,
-              org.bouncycastle.tsp;resolution:=optional,
-              org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=optional,
-              org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:=optional,
-              schemasMicrosoftComOfficePowerpoint;resolution:=optional,
-              schemasMicrosoftComOfficeWord;resolution:=optional,
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-         <artifactId>maven-compiler-plugin</artifactId>
-         <version>3.2</version>
-         <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
-         </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>java6</id>
-      <activation>
-        <jdk>[1.6,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptor>test-bundles.xml</descriptor>
-                  <finalName>test</finalName>
-                  <attach>false</attach>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.10</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <systemPropertyVariables>
-                <org.ops4j.pax.logging.DefaultServiceLog.level>
-                  WARN
-                </org.ops4j.pax.logging.DefaultServiceLog.level>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <organization>
-    <name>The Apache Software Founation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-  <scm>
-    <url>http://svn.apache.org/viewvc/poi/trunk/osgi</url>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/poi/trunk/osgi</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/poi/trunk/osgi</developerConnection>
-  </scm>
-</project>
diff --git a/trunk/osgi/src/main/java/org/apache/poi/osgi/Activator.java b/trunk/osgi/src/main/java/org/apache/poi/osgi/Activator.java
deleted file mode 100644
index 2f0212b..0000000
--- a/trunk/osgi/src/main/java/org/apache/poi/osgi/Activator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.osgi;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-    public void start(BundleContext context) throws Exception {
-    }
-    public void stop(BundleContext context) throws Exception {
-    }
-}
diff --git a/trunk/osgi/src/test/java/org/apache/poi/osgi/TestOSGiBundle.java b/trunk/osgi/src/test/java/org/apache/poi/osgi/TestOSGiBundle.java
deleted file mode 100644
index 738d96b..0000000
--- a/trunk/osgi/src/test/java/org/apache/poi/osgi/TestOSGiBundle.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.osgi;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.bundle;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.options;
-
-import javax.inject.Inject;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- * Test to ensure that all our main formats can create, write
- *  and read back in, when running under OSGi
- */
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class TestOSGiBundle {
-
-    private final File TARGET = new File("target");
-
-    @Inject
-    private BundleContext bc;
-
-    @Configuration
-    public Option[] configuration() throws IOException, URISyntaxException {
-        File base = new File(TARGET, "test-bundles");
-        return options(
-                junitBundles(),
-                bundle(new File(base, "poi-bundle.jar").toURI().toURL().toString()));
-    }
-
-    @Test
-    public void testHSSF() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet("OSGi");
-        s.createRow(0).createCell(0).setCellValue("With OSGi");
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        wb.write(baos);
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-        wb = new HSSFWorkbook(bais);
-        assertEquals(1, wb.getNumberOfSheets());
-
-        s = wb.getSheet("OSGi");
-        assertEquals("With OSGi", s.getRow(0).getCell(0).toString());
-    }
-}
diff --git a/trunk/osgi/test-bundles.xml b/trunk/osgi/test-bundles.xml
deleted file mode 100644
index 1150276..0000000
--- a/trunk/osgi/test-bundles.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>bundles</id>
-  <formats>
-    <format>dir</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory/>
-      <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
-      <includes>
-        <include>org.apache.poi:poi-bundle</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/trunk/patch.xml b/trunk/patch.xml
deleted file mode 100644
index ed52a91..0000000
--- a/trunk/patch.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<!--
-  =======================================================================
-   Use Apache Ant to generate a patch file.
-  =======================================================================
--->
-<project name="create-patch" default="patchpackage" basedir=".">
-    <property environment="env"/>
-    <property name="patch.package" value="patch.tar.gz"/>
-    <property name="patch.file" value="patch.txt"/>
-
-    <condition property="svn.found">
-        <or>
-            <available file="svn" filepath="${env.PATH}"/>
-            <available file="svn.exe" filepath="${env.PATH}"/>
-            <available file="svn.exe" filepath="${env.Path}"/>
-        </or>
-    </condition>
-
-    <target name="createpatch">
-        <fail unless="svn.found" message="You need a version of svn to create the patch"/>
-        <exec executable="svn" output="${patch.file}">
-            <arg value="diff"/>
-        </exec>
-    </target>
-
-    <target name="newfiles">
-        <exec executable="svn" output="${patch.file}.tmp">
-            <arg value="status"/>
-        </exec>
-
-       <!-- prepare the list of files to include in patch.tar.gz --> 
-       <loadfile srcfile="${patch.file}.tmp" property="tar.file.list">  
-         <filterchain>  
-            <!-- capture any new files -->
-            <linecontainsregexp>
-                <regexp pattern="^(\?|A)......"/>
-            </linecontainsregexp>
-            <!-- filter out the first six characters -->
-            <tokenfilter>
-              <replaceregex pattern="^(.......)" replace=""/>
-            </tokenfilter>
-            <!--remove line breaks -->
-            <striplinebreaks/>
-          </filterchain> 
-       </loadfile>  
-    </target>
-
-    <target name="patchpackage" depends="createpatch,newfiles">
-       <delete file="${patch.package}"/> 
-       <tar includes="${tar.file.list}"
-            destfile="${patch.package}"   
-            basedir="." 
-            compression="gzip" >          
-       </tar>  
-       <delete file="${patch.file}.tmp"/>
-    </target>
-    
-    <target name="apply"
-        description="apply patch.tar.gz files generated by patchpackage">
-
-            <!--
-            extract patch.tar.gz to svn working copy
-            $ tar xvzf patch.tar.gz
-            -->
-            <echo message="extracting ${patch.file} to working copy"/>
-            <untar src="${patch.package}"
-                dest="."
-                failOnEmptyArchive="true"
-                compression="gzip">
-            </untar>
-
-            <!--
-            Apply the changes from patch.txt
-            $ svn patch patch.txt
-            -->
-            <echo message="svn patch ${patch.file}"/>
-            <fail unless="svn.found" message="You need a version of svn to create the patch"/>
-            <exec executable="svn">
-                <arg value="patch"/>
-                <arg value="${patch.file}"/>
-            </exec>
-            <delete file="${patch.file}"/>
-            
-            <!--
-            get a list of all new files in patch.tar.gz and store in tar.file.list filelist
-            $ tar tf patch.tar.gz | grep -v patch\.txt | xargs svn add
-            -->
-            <echo message="Getting ${patch.file} file list"/>
-            <delete dir="${patch.package}.tmp" quiet="false" failonerror="false" />
-            <untar src="${patch.package}"
-                dest="${patch.package}.tmp"
-                failOnEmptyArchive="true"
-                compression="gzip">
-            </untar>
-            <fileset dir="${patch.package}.tmp"
-                id="tar.file.list"
-                excludes="${patch.file}"/>
-            
-            <!-- add new files -->
-            <echo message="Adding new files to svn working copy"/>
-            <apply executable="svn"
-                relative="true">
-                <arg value="add"/>
-                <fileset refid="tar.file.list"/>
-            </apply>
-            
-            <delete dir="${patch.package}.tmp"/>
-
-        </target>
-
-</project>
diff --git a/trunk/settings.gradle b/trunk/settings.gradle
deleted file mode 100644
index de9c7e7..0000000
--- a/trunk/settings.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-rootProject.name = 'poi'
-
-include 'main', 'ooxml', 'excelant', 'examples', 'scratchpad', 'integrationtest'
-
-project(':main').projectDir = new File(settingsDir, 'build/main')
-project(':ooxml').projectDir = new File(settingsDir, 'build/ooxml')
-project(':excelant').projectDir = new File(settingsDir, 'build/excelant')
-project(':examples').projectDir = new File(settingsDir, 'build/examples')
-project(':scratchpad').projectDir = new File(settingsDir, 'build/scratchpad')
-project(':integrationtest').projectDir = new File(settingsDir, 'build/integrationtest')
diff --git a/trunk/sonar/examples/pom.xml b/trunk/sonar/examples/pom.xml
deleted file mode 100644
index ea53c05..0000000
--- a/trunk/sonar/examples/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-    </parent>
-    <artifactId>poi-examples</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI Examples package</name>
-    
-    <build>
-		<plugins>
-			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven.plugin.resources.version}</version>
-				<executions>
-					<execution>
-						<id>copy-sources</id>
-						<!-- here the phase you need -->
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/examples/src</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-				</executions>
-			</plugin>
-			<!-- clean copied sources afterwards -->
-			<plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>${maven.plugin.clean.version}</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>src</directory>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>			
-		</plugins>
-    </build>
-
-    <dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
-        </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!-- non-test dependency for UpdateEmbeddedDoc -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/trunk/sonar/excelant/pom.xml b/trunk/sonar/excelant/pom.xml
deleted file mode 100644
index a7b9408..0000000
--- a/trunk/sonar/excelant/pom.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-    </parent>
-    <artifactId>poi-excelant</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI ExcelAnt package</name>
-
-    <build>
-		<plugins>
-			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven.plugin.resources.version}</version>
-				<executions>
-					<execution>
-						<id>copy-sources</id>
-						<!-- here the phase you need -->
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/excelant/java</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-resources</id>
-						<!-- here the phase you need -->
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/resources</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/excelant/resources</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-tests</id>
-						<!-- here the phase you need -->
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/test/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/excelant/testcases</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-				</executions>
-			</plugin>
-			<!-- clean copied sources afterwards -->
-			<plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>${maven.plugin.clean.version}</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>src</directory>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>			
-		</plugins>
-    </build>
-
-    <dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
-        </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>1.8.2</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/trunk/sonar/main/pom.xml b/trunk/sonar/main/pom.xml
deleted file mode 100644
index 36422a8..0000000
--- a/trunk/sonar/main/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-    </parent>
-    <artifactId>poi-main</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI Main package</name>
-
-    <build>
-		<plugins>
-			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven.plugin.resources.version}</version>
-				<executions>
-					<execution>
-						<id>copy-sources</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/java</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-resources</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/resources</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/resources/main</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-tests</id>
-						<!-- here the phase you need -->
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/test/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/testcases</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- clean copied sources afterwards -->
-			<plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>${maven.plugin.clean.version}</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>src</directory>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>			
-      			
-			<!-- provide the test-jar for other modules -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven.plugin.jar.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-            <!-- set jvm parameters for surefire plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.plugin.surefire.version}</version>
-                <configuration>
-                    <argLine>-Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
-                </configuration>
-            </plugin>
-		</plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/trunk/sonar/ooxml-schema-encryption/pom.xml b/trunk/sonar/ooxml-schema-encryption/pom.xml
deleted file mode 100644
index cbb2eff..0000000
--- a/trunk/sonar/ooxml-schema-encryption/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>poi-ooxml-schema-encryption</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI - Openxmlformats Encryption Schema package</name>
-
-	<properties>
-		<!-- see http://docs.codehaus.org/display/SONAR/Narrowing+the+Focus for details of this property -->
-		<sonar.exclusions>target/generated-sources/*</sonar.exclusions>
-	</properties>
-  
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>${maven.plugin.antrun.version}</version>
-				<executions>
-					<execution>
-						<id>unzip-schema</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<copy todir="target/schemas">
-									<fileset dir="../../src/ooxml/resources/org/apache/poi/poifs/crypt" includes="encryption*.*"/>
-								</copy>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.xmlbeans</groupId>
-			<artifactId>xmlbeans</artifactId>
-			<version>${xmlbeans.version}</version>
-		</dependency>
-    </dependencies>
-</project>
diff --git a/trunk/sonar/ooxml-schema-encryption/xmlbeans.marker b/trunk/sonar/ooxml-schema-encryption/xmlbeans.marker
deleted file mode 100644
index 2744493..0000000
--- a/trunk/sonar/ooxml-schema-encryption/xmlbeans.marker
+++ /dev/null
@@ -1 +0,0 @@
-This purpose of this marker file is solely to activate the xmlbeans maven profile.
\ No newline at end of file
diff --git a/trunk/sonar/ooxml-schema-security/pom.xml b/trunk/sonar/ooxml-schema-security/pom.xml
deleted file mode 100644
index a822c73..0000000
--- a/trunk/sonar/ooxml-schema-security/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>poi-ooxml-schema-security</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI - Openxmlformats Security-Schema package</name>
-
-	<properties>
-		<!-- see http://docs.codehaus.org/display/SONAR/Narrowing+the+Focus for details of this property -->
-		<sonar.exclusions>target/generated-sources/*</sonar.exclusions>
-		<maven.compiler.fork>true</maven.compiler.fork>
-		<xmlbeans.noUpa>true</xmlbeans.noUpa>
-		<xmlbeans.noPvr>true</xmlbeans.noPvr>
-	</properties>
-    <build>
-		<plugins>
-			<!-- Download and unpack the OfficeOpenXML Schema and use xmlbeans to create classes from the XSDs -->
-			<!-- use maven plugin instead of ant tasks get because of caching feature ... -->
-			<plugin>
-				<groupId>com.googlecode.maven-download-plugin</groupId>
-				<artifactId>maven-download-plugin</artifactId>
-				<version>${maven.plugin.download.version}</version>
-				<executions>
-					<execution>
-						<id>install-xsds-part-1</id>
-						<phase>generate-sources</phase>
-						<goals><goal>wget</goal></goals>
-						<configuration>
-							<url>http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%202%20(PDF).zip</url>
-							<unpack>true</unpack>
-							<md5>c8f0eac388691d5be0d1647146400a10</md5>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-xsds-part-2</id>
-						<phase>generate-sources</phase>
-						<goals><goal>wget</goal></goals>
-						<configuration>
-							<outputDirectory>target/schemas</outputDirectory>
-							<url>http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd</url>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-xsds-part-3</id>
-						<phase>generate-sources</phase>
-						<goals><goal>wget</goal></goals>
-						<configuration>
-							<outputDirectory>target/schemas</outputDirectory>
-							<url>http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd</url>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-xsds-part-4</id>
-						<phase>generate-sources</phase>
-						<goals><goal>wget</goal></goals>
-						<configuration>
-							<outputDirectory>target/schemas</outputDirectory>
-							<url>http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcmitype.xsd</url>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-xsds-part-5</id>
-						<phase>generate-sources</phase>
-						<goals><goal>wget</goal></goals>
-						<configuration>
-							<outputDirectory>target/schemas</outputDirectory>
-							<url>http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd</url>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-xsds-part-6</id>
-						<phase>generate-sources</phase>
-						<goals><goal>wget</goal></goals>
-						<configuration>
-							<outputDirectory>target/schemas</outputDirectory>
-							<url>http://uri.etsi.org/01903/v1.3.2/XAdES.xsd</url>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-xsds-part-7</id>
-						<phase>generate-sources</phase>
-						<goals><goal>wget</goal></goals>
-						<configuration>
-							<outputDirectory>target/schemas</outputDirectory>
-							<url>http://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd</url>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>${maven.plugin.antrun.version}</version>
-				<executions>
-					<execution>
-						<id>unzip-schema</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<echo message="unzip schemas" />
-								<unzip src="target/OpenPackagingConventions-XMLSchema.zip" dest="target/schemas/" />
-								<copy file="../../src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd"
-									todir="target/schemas"/>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-		</plugins>
-    </build>
-
-    <dependencies>
-		<dependency>
-			<groupId>org.apache.xmlbeans</groupId>
-			<artifactId>xmlbeans</artifactId>
-			<version>${xmlbeans.version}</version>
-		</dependency>    	
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-main</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-scratchpad</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/trunk/sonar/ooxml-schema-security/xmlbeans.marker b/trunk/sonar/ooxml-schema-security/xmlbeans.marker
deleted file mode 100644
index 2744493..0000000
--- a/trunk/sonar/ooxml-schema-security/xmlbeans.marker
+++ /dev/null
@@ -1 +0,0 @@
-This purpose of this marker file is solely to activate the xmlbeans maven profile.
\ No newline at end of file
diff --git a/trunk/sonar/ooxml-schema/pom.xml b/trunk/sonar/ooxml-schema/pom.xml
deleted file mode 100644
index 5e2b9fe..0000000
--- a/trunk/sonar/ooxml-schema/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>poi-ooxml-schema</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI - Openxmlformats Schema package</name>
-
-	<properties>
-		<!-- see http://docs.codehaus.org/display/SONAR/Narrowing+the+Focus for details of this property -->
-		<sonar.exclusions>target/generated-sources/*</sonar.exclusions>
-		<maven.compiler.fork>true</maven.compiler.fork>
-		<xmlbeans.xsdconfig>${basedir}/../../src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig</xmlbeans.xsdconfig>
-	</properties>
-
-    <build>
-		<plugins>
-			<!-- Download and unpack the OfficeOpenXML Schema and use xmlbeans to create classes from the XSDs -->
-			<plugin>
-				<groupId>com.googlecode.maven-download-plugin</groupId>
-				<artifactId>maven-download-plugin</artifactId>
-				<version>${maven.plugin.download.version}</version>
-				<executions>
-					<execution>
-						<id>download-xsds</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>wget</goal>
-						</goals>
-						<configuration>
-							<url>http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip</url>
-							<unpack>true</unpack>
-							<md5>abe6bb6e7799e854934b3c634e8bcf7b</md5>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>${maven.plugin.antrun.version}</version>
-				<executions>
-					<execution>
-						<id>unzip-schema</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<target>
-								<echo message="unzip schemas" />
-								<unzip src="target/OfficeOpenXML-XMLSchema.zip" dest="target/schemas" />
-								<copy file="../../src/ooxml/resources/org/apache/poi/xdgf/visio.xsd"
-									todir="target/schemas"/>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-main</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-scratchpad</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.xmlbeans</groupId>
-          <artifactId>xmlbeans</artifactId>
-          <version>${xmlbeans.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/trunk/sonar/ooxml-schema/xmlbeans.marker b/trunk/sonar/ooxml-schema/xmlbeans.marker
deleted file mode 100644
index 2744493..0000000
--- a/trunk/sonar/ooxml-schema/xmlbeans.marker
+++ /dev/null
@@ -1 +0,0 @@
-This purpose of this marker file is solely to activate the xmlbeans maven profile.
\ No newline at end of file
diff --git a/trunk/sonar/ooxml/pom.xml b/trunk/sonar/ooxml/pom.xml
deleted file mode 100644
index 27636cd..0000000
--- a/trunk/sonar/ooxml/pom.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-    </parent>
-    <artifactId>poi-ooxml</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI OOXML package</name>
-	
-    <build>
-		<plugins>
-			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven.plugin.resources.version}</version>
-				<executions>
-					<execution>
-						<id>copy-sources</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/ooxml/java</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-resources</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/resources</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/resources/ooxml</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-tests</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/test/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/ooxml/testcases</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- clean copied sources afterwards -->
-			<plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>${maven.plugin.clean.version}</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>src</directory>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                        <fileset>
-                            <directory>build</directory>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>			
-
-
-            <!-- set jvm parameters for surefire plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.plugin.surefire.version}</version>
-                <configuration>
-                    <argLine>-Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
-                </configuration>
-            </plugin>
-		</plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-			<groupId>${project.groupId}</groupId>
-            <artifactId>poi-ooxml-schema</artifactId>
-			<version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-ooxml-schema-encryption</artifactId>
-			<version>${project.version}</version>
-        </dependency>
-        <dependency>
-			<groupId>${project.groupId}</groupId>
-            <artifactId>poi-ooxml-schema-security</artifactId>
-			<version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
-        </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-		</dependency>
-
-		<dependency>
-		  <groupId>org.apache.xmlbeans</groupId>
-		  <artifactId>xmlbeans</artifactId>
-		  <version>${xmlbeans.version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>1.54</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.54</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.santuario</groupId>
-			<artifactId>xmlsec</artifactId>
-			<version>2.0.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.github.virtuald</groupId>
-			<artifactId>curvesapi</artifactId>
-			<version>1.04</version>
-		</dependency>
-  
-		<!-- non-test dependency for OOXMLLite -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/trunk/sonar/pom.xml b/trunk/sonar/pom.xml
deleted file mode 100644
index 8e2a9fc..0000000
--- a/trunk/sonar/pom.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi-parent</artifactId>
-	<packaging>pom</packaging>
-	<version>3.16-beta1-SNAPSHOT</version>
-	<name>Apache POI - the Java API for Microsoft Documents</name>
-	<description>Maven build of Apache POI for Sonar checks</description>
-	<url>http://poi.apache.org/</url>
-	
-	<mailingLists>
-		<mailingList>
-			<name>POI Users List</name>
-			<subscribe>user-subscribe@poi.apache.org</subscribe>
-			<unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-		</mailingList>
-		<mailingList>
-			<name>POI Developer List</name>
-			<subscribe>dev-subscribe@poi.apache.org</subscribe>
-			<unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-		</mailingList>
-	</mailingLists>
-	
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-	
-	<organization>
-		<name>Apache Software Foundation</name>
-		<url>http://www.apache.org/</url>
-	</organization>
-	
-	<issueManagement>
-		<system>bugzilla</system>
-		<url>https://issues.apache.org/bugzilla/</url>
-	</issueManagement>
-	
-	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/poi/trunk</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/poi/trunk</developerConnection>
-		<url>http://svn.apache.org/viewvc/poi</url>
-	</scm>
-	
-	<modules>
-		<module>main</module>
-		<module>ooxml-schema</module>
-		<module>ooxml-schema-encryption</module>
-		<module>ooxml-schema-security</module>
-		<module>ooxml</module>
-		<module>scratchpad</module>
-		<module>excelant</module>
-		<module>examples</module>
-	</modules>
-	
-	<properties>
-		<project.build.sourceEncoding>ASCII</project.build.sourceEncoding>
-		<!-- Try to disable running SVN blame as it causes errors here because the source is copied from the actual SVN location here! -->
-		<sonar.scm.disabled>true</sonar.scm.disabled>
-
-		<!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
-		<xmlbeans.version>2.6.0</xmlbeans.version>
-		<junit.version>4.12</junit.version>
-		<maven.plugin.resources.version>3.0.1</maven.plugin.resources.version>
-		<maven.plugin.jar.version>3.0.1</maven.plugin.jar.version>
-		<maven.plugin.clean.version>3.0.0</maven.plugin.clean.version>
-		<maven.plugin.download.version>1.1.0</maven.plugin.download.version>
-		<maven.plugin.antrun.version>1.8</maven.plugin.antrun.version>
-		<maven.plugin.surefire.version>2.19.1</maven.plugin.surefire.version>
-	</properties>
-	
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.5.1</version>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven.plugin.surefire.version}</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-junit47</artifactId>
-						<version>${maven.plugin.surefire.version}</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<systemPropertyVariables>
-						<POI.testdata.path>../../test-data</POI.testdata.path>
-						<java.awt.headless>true</java.awt.headless>
-						<org.apache.poi.util.POILogger>org.apache.poi.util.NullLogger</org.apache.poi.util.POILogger>
-					</systemPropertyVariables>
-					<!-- use to following to analyze OOM issues:	-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -->
-					<argLine>-Duser.language=en -Duser.country=US -Xmx1024m</argLine>
-					<excludes>
-						<exclude>**/All*Tests.java</exclude>
-						<exclude>**/TestUnfixedBugs.java</exclude>
-						<exclude>**/TestcaseRecordInputStream.java</exclude>
-						<exclude>**/POITestCase.java</exclude>
-						<!-- TODO: error about no public construct, seems to run with JUnit 3.8... -->
-						<exclude>**/TestWordToConverterSuite*.java</exclude>
-						<exclude>**/TestExcelConverterSuite*.java</exclude>
-					</excludes>
-					<!--test>TestPPTX2PNG</test-->
-					<!--parallel>both</parallel>
-				<threadCount>10</threadCount-->
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<profiles>
-		<!-- We need a fair amount of memory to compile the xml schema, -->
-		<!-- but limit it in case it goes wrong!                        -->
-		<!-- Pick the right amount based on 32 vs 64 bit jvm            -->
-        <!-- ********************************************************** -->
-        <!-- If you are using IntelliJ, you might want to check         -->
-        <!-- http://stackoverflow.com/questions/24115142                -->
-        <!-- ********************************************************** -->
-		<profile>
-			<id>32bitstuff</id>
-			<activation>
-				<property>
-					<name>sun.arch.data.model</name>
-					<value>32</value>
-				</property>
-			</activation>
-			<properties>
-				<maven.compiler.maxmem>512m</maven.compiler.maxmem>
-                <argLine>-Xmx768m -XX:MaxPermSize=128m @{argLine}</argLine>
-			</properties>
-		</profile>
-		
-		<profile>
-			<id>64bitstuff</id>
-			<activation>
-				<property>
-					<name>sun.arch.data.model</name>
-					<value>64</value>
-				</property>
-			</activation>
-			<properties>
-				<maven.compiler.maxmem>768m</maven.compiler.maxmem>
-                <argLine>-Xmx1024m -XX:MaxPermSize=256m @{argLine}</argLine>
-			</properties>
-		</profile>
-
-		<profile>
-			<id>xmlbean</id>
-      <activation>
-        <file><exists>xmlbeans.marker</exists></file>
-      </activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>xmlbeans-maven-plugin</artifactId>
-						<version>2.3.3</version>
-						<executions>
-							<execution>
-								<phase>process-sources</phase>
-								<goals>
-									<goal>xmlbeans</goal>
-								</goals>
-                <configuration>
-                  <schemaDirectory>${basedir}/target/schemas</schemaDirectory>
-                  <javaSource>1.5</javaSource>
-                  <noJavac>true</noJavac>
-                  <noUpa>${xmlbeans.noUpa}</noUpa>
-                  <noPvr>${xmlbeans.noPvr}</noPvr>
-                  <xmlConfigs>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig</xmlConfig>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig</xmlConfig>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig</xmlConfig>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig</xmlConfig>
-                  </xmlConfigs>
-                </configuration>
-							</execution>
-						</executions>
-					</plugin>
-
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>${maven.plugin.antrun.version}</version>
-            <executions>
-              <execution>
-                <id>copy-xmltype-and-xsdconfig</id>
-                <phase>generate-sources</phase>
-                <goals><goal>run</goal></goals>                   
-                <configuration>
-                  <target>
-                    <copy todir="${basedir}/target/generated-sources/xmlbeans">
-                      <fileset dir="${basedir}/../../src/ooxml/java">
-                        <include name="org/apache/poi/POIXMLTypeLoader.java"/>
-                        <include name="org/apache/poi/util/DocumentHelper.java"/>
-                        <include name="org/apache/poi/util/SAXHelper.java"/>
-                      </fileset>
-                      <fileset dir="${basedir}/../../src/java">
-                        <include name="org/apache/poi/util/POILogFactory.java"/>
-                        <include name="org/apache/poi/util/POILogger.java"/>
-                        <include name="org/apache/poi/util/NullLogger.java"/>
-                        <include name="org/apache/poi/util/Internal.java"/>
-                      </fileset>
-                    </copy>
-                    <copy todir="${basedir}/target/schemas">
-                      <fileset dir="${basedir}/../../src/ooxml/resources/org/apache/poi/schemas"/>
-                    </copy>
-                  </target>
-                </configuration>
-              </execution>
-              <execution>
-                <id>replace-xmltypeloader</id>
-                <phase>process-sources</phase>
-                <goals><goal>run</goal></goals>                   
-                <configuration>
-                  <target>
-                    <replace dir="${basedir}/target/generated-sources/xmlbeans" includes="**/*.java" excludes="**/impl/**">
-                        <replacetoken>org.apache.xmlbeans.XmlBeans.getContextTypeLoader()</replacetoken>
-                        <replacevalue>org.apache.poi.POIXMLTypeLoader</replacevalue>
-                    </replace>                    
-                  </target>
-                </configuration>
-              </execution>
-              <execution>
-                <id>remove-xmltypeloader-from-schema-jar</id>
-                <phase>prepare-package</phase>
-                <goals><goal>run</goal></goals>                   
-                <configuration>
-                  <target>
-                    <touch file="${basedir}/target/generated-sources/xmlbeans/.staleFlag"/>
-                    <delete dir="${basedir}/target/classes/org/apache"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-				</plugins>
-			</build>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.xmlbeans</groupId>
-          <artifactId>xmlbeans</artifactId>
-          <version>${xmlbeans.version}</version>
-        </dependency>
-      </dependencies>
-		</profile>
-	</profiles>
-</project>
diff --git a/trunk/sonar/scratchpad/pom.xml b/trunk/sonar/scratchpad/pom.xml
deleted file mode 100644
index 6760762..0000000
--- a/trunk/sonar/scratchpad/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-parent</artifactId>
-        <version>3.16-beta1-SNAPSHOT</version>
-    </parent>
-    <artifactId>poi-scratchpad</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache POI Scratchpad package</name>
-
-	<properties>
-		<!-- Exclude some generated code from Sonar analysis -->
-		<sonar.exclusions>src/main/java/org/apache/poi/hwpf/model/types/*,src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/*</sonar.exclusions>
-	</properties>
- 
-
-    <build>
-		<plugins>
-			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven.plugin.resources.version}</version>
-				<executions>
-					<execution>
-						<id>copy-sources</id>
-						<!-- here the phase you need -->
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/scratchpad/src</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-resources</id>
-						<!-- here the phase you need -->
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/resources</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/resources/scratchpad</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-tests</id>
-						<!-- here the phase you need -->
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/test/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/scratchpad/testcases</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-				</executions>
-			</plugin>
-			<!-- clean copied sources afterwards -->
-			<plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>${maven.plugin.clean.version}</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>src</directory>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>			
-		</plugins>
-    </build>
-
-    <dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
-        </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-		</dependency>
-    </dependencies>
-</project>
diff --git a/trunk/src/contrib/poi-ruby/Makefile b/trunk/src/contrib/poi-ruby/Makefile
deleted file mode 100644
index a298da3..0000000
--- a/trunk/src/contrib/poi-ruby/Makefile
+++ /dev/null
@@ -1,332 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-# Makefile for building Poi4R
-#
-# Supported operating systems: Linux, Mac OS X and Windows.
-# See INSTALL file for requirements.
-# 
-# Steps to build
-#   1. Edit the sections below as documented
-#   2. make all
-#   3. make install
-#
-# The install target installs the Poi4R python extension in python's
-# site-packages directory. On Mac OS X, it also installs the gcj runtime
-# libraries into $(PREFIX)/lib.
-#
-# To successfully import the Poi4R extension into Ruby, all required
-# libraries need to be found. If the locations you chose are non-standard,
-# the relevant DYLD_LIBRARY_PATH (Mac OS X), LD_LIBRARY_PATH (Linux), or 
-# PATH (Windows) need to be set accordingly.
-# 
-
-
-VERSION=0.1.0
-POI_VER=$(shell grep '<property name="version.id"' ../../../build.xml | awk -F'"' '{print $$4}')
-RUBY_VER=1.8
-
-POI4R:=$(shell pwd)
-POI=$(POI4R)/poi-$(POI_VER)
-#DEBUG=1
-
-# 
-# You need to uncomment and edit the variables below in the section
-# corresponding to your operating system.
-#
-# PREFIX: where programs are normally installed on your system (Unix).
-# PREFIX_RUBY: where your version of python is installed.
-# GCJ_HOME: where GCC/GCJ is installed.
-# Windows drive-absolute paths need to be expressed cygwin style.
-#
-
-# Mac OS X (Darwin)
-#PREFIX=/usr/local
-#PREFIX_RUBY=/Library/Frameworks/Ruby.framework/Versions/$(RUBY_VER)
-#SWIG=$(PREFIX)/bin/swig
-#GCJ_HOME=/usr/local/gcc-3.4.1
-#DB=$(POI4R)/db-$(DB_VER)
-#PREFIX_DB=/usr/local/BerkeleyDB.$(DB_LIB_VER)
-
-# Linux
-PREFIX=/usr
-PREFIX_RUBY=$(PREFIX)
-SWIG=$(PREFIX)/bin/swig
-GCJ_HOME=/usr
-#DB=$(POI4R)/db-$(DB_VER)
-#PREFIX_DB=$(PREFIX)/BerkeleyDB.$(DB_LIB_VER)
-
-# Windows
-#PREFIX_RUBY=/cygdrive/o/Python-2.3.2
-#SWIG=/cygdrive/c/utils/bin/swig.exe
-#GCJ_HOME=/cygdrive/o/mingw-3.1
-#DB=/cygdrive/o/db-$(DB_VER)
-#PREFIX_DB=$(DB)
-
-#
-# No edits required below
-#
-
-OS=$(shell uname)
-ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
-OS=Cygwin
-endif
-ifeq ($(findstring WINNT,$(OS)),WINNT)
-OS=Cygwin
-endif
-
-ifeq ($(DEBUG),1)
-COMP_OPT=DEBUG=1
-SUFFIX=d
-_SUFFIX=_d
-BINDIR=debug
-else
-COMP_OPT=
-SUFFIX=
-_SUFFIX=
-BINDIR=release
-endif
-
-SWIG_OPT=-DSWIG_COBJECT_TYPES -DPOI4R_VER="'$(VERSION)'" -DPOI_VER="'$(POI_VER)'"
-
-JCCFLAGS=--encoding=UTF-8
-#JCCFLAGS=--encoding=UTF-8 -findirect-dispatch
-
-ifeq ($(OS),Darwin)
-RUBY_SITE=$(PREFIX_RUBY)/lib/ruby$(RUBY_VER)/site-packages
-RUBY_INC=$(PREFIX_RUBY)/lib/ruby$(RUBY_VER)
-POI4R=$(BINDIR)/poi4r.so
-ifeq ($(DEBUG),1)
-CCFLAGS=-O0 -g
-LDFLAGS=-g
-else
-CCFLAGS=-O2
-LDFLAGS=
-endif
-else
-
-ifeq ($(OS),Linux)
-RUBY_SITE=$(PREFIX_RUBY)/lib/ruby/site-ruby/$(RUBY_VER)/
-RUBY_INC=$(PREFIX_RUBY)/lib/ruby/$(RUBY_VER)/i686-linux
-POI4R_LIB=$(BINDIR)/poi4r.so
-ifeq ($(DEBUG),1)
-CCFLAGS=-O0 -g -fPIC
-LDFLAGS=-g
-else
-CCFLAGS=-O2 -fPIC
-LDFLAGS=
-endif
-else
-
-ifeq ($(OS),Cygwin)
-RUBY_SITE=`cygpath -aw $(PREFIX_RUBY)/Lib/site-packages`
-RUBY_INC=`cygpath -aw $(PREFIX_RUBY)/Include`
-RUBY_PC=`cygpath -aw $(PREFIX_RUBY)/PC`
-POI4R_LIB=$(BINDIR)/poi4r$(_SUFFIX).so
-ifeq ($(DEBUG),1)
-CCFLAGS=-O -g 
-LDFLAGS=-g
-else
-CCFLAGS=-O2
-LDFLAGS=
-endif
-else
-
-RUBY=unknown
-RUBY_SITE=unknown
-endif
-endif
-endif
-
-CLASSES=$(BINDIR)/classes
-JAR_CLASSES=$(CLASSES)/jar
-
-CC=$(GCJ_HOME)/bin/gcc
-CXX=$(GCJ_HOME)/bin/g++
-JCC=$(GCJ_HOME)/bin/gcj
-JCCH=$(GCJ_HOME)/bin/gcjh
-JAR=$(GCJ_HOME)/bin/jar
-POI_ZIP=poi-$(POI_VER).jar
-POI_JAR=poi-$(POI_VER).jar
-POI_JAR_WC=poi-$(POI_VER)-*.jar
-
-POI4R_CP:=$(BINDIR)/$(POI_JAR):$(CLASSES)
-
-OBJS=$(BINDIR)/poi.o  $(BINDIR)/io.java.o $(BINDIR)/io.cpp.o
-
-LIBS=$(POI4R_LIB)
-
-default: all
-
-patches:
-
-
-env:
-ifndef PREFIX_RUBY
-	@echo Operating system is $(OS)
-	@echo You need to edit that section of the Makefile
-	@false
-else
-	@true
-endif
-
-
-$(BINDIR):
-	mkdir -p $(BINDIR)/classes/jar
-
-
-DISTRIB=Poi-$(VERSION)
-
-ifeq ($(OS),Cygwin)
-POI4R_CP:=`cygpath -awp $(POI4R_CP)`
-endif
-
-
-ifeq ($(OS),Cygwin)
-_poi=`cygpath -aw $(POI)`
-else
-_poi=$(POI)
-endif
-
-$(BINDIR)/$(POI_JAR): 
-	cp ../../../build/dist/$(POI_JAR_WC) $(BINDIR)/$(POI_JAR)
-	cd $(JAR_CLASSES); $(JAR) -xf ../../$(POI_JAR)
-
-$(BINDIR)/io.java.o: java/org/apache/poi/RubyOutputStream.java
-	$(JCC) $(JCCFLAGS) -C -d $(CLASSES) java/org/apache/poi/RubyOutputStream.java
-	$(JCC) $(JCCFLAGS) $(CCFLAGS) -I$(GCJ_HOME)/include -c -o $@ java/org/apache/poi/RubyOutputStream.java
-
-$(CLASSES)/org/apache/poi/RubyOutputStream.h: $(BINDIR)/io.java.o Makefile
-	mkdir -p $(CLASSES)/org/apache/poi/hssf/usermodel
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFWorkbook
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFSheet
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFRow
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFCell
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFHeader
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFFooter
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFFont
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFDataFormat
-	$(JCCH) -d $(CLASSES) --classpath=$(JAR_CLASSES) org.apache.poi.hssf.usermodel.HSSFCellStyle
-	$(JCCH) -d $(CLASSES) --classpath=$(CLASSES) org.apache.poi.RubyOutputStream
-
-
-$(BINDIR)/io.cpp.o: $(CLASSES)/org/apache/poi/RubyOutputStream.h cpp/RubyIO.cpp $(BINDIR)/io.java.o
-	$(JCC) -I$(RUBY_INC) -I$(GCJ_HOME)/include -I$(CLASSES) $(CCFLAGS) -c -o $@ cpp/RubyIO.cpp
-
-$(BINDIR)/poi.o: $(BINDIR)/$(POI_JAR)
-	$(JCC) $(JCCFLAGS) $(CCFLAGS) -c -o $@ $(BINDIR)/$(POI_JAR)
-
-Poi4R_wrap.cxx: $(BINDIR)/io.cpp.o Poi4R.i 
-ifdef SWIG
-	$(SWIG) $(SWIG_OPT) -I$(CLASSES) -c++ -ruby Poi4R.i
-endif
-
-
-ifeq ($(OS),Darwin)
-$(POI4R_LIB): $(OBJS) Poi4R_wrap.cxx
-	$(CXX) -shared -bundle -o $@ $(CCFLAGS) $(SWIG_OPT) $(DB_INC) -I$(GCJ_HOME)/include -I$(CLASSES) -I$(RUBY_INC) Poi4R_wrap.cxx $(OBJS) -L$(GCJ_HOME)/lib -lgcj -liconv -undefined suppress -flat_namespace -multiply_defined suppress
-else
-
-ifeq ($(OS),Linux)
-$(POI4R_LIB): $(OBJS) Poi4R_wrap.cxx
-	$(CXX) -shared -o $@ $(CCFLAGS) $(SWIG_OPT) $(DB_INC) -I$(CLASSES) -I$(RUBY_INC) Poi4R_wrap.cxx $(OBJS) -lgcj
-else
-
-ifeq ($(OS),Cygwin)
-$(POI4R_LIB): $(OBJS) Poi4R_wrap.cxx
-	$(CXX) -c $(CCFLAGS) $(PYDBG) -D_NO_OLDNAMES -D_off_t=off_t $(SWIG_OPT) $(DB_INC) -I$(CLASSES) -I$(RUBY_PC) -I$(RUBY_INC) -o $(BINDIR)/Poi4R_wrap.o Poi4R_wrap.cxx
-	$(CXX) -shared $(LDFLAGS) -o $@ $(OBJS) `cygpath -aw $(PREFIX_RUBY)/python23$(_SUFFIX).dll` $(BINDIR)/Poi4R_wrap.o -lgcj -lwin32k -lws2_32
-endif
-endif
-endif
-
-
-all: env  $(BINDIR) $(LIBS)
-	@echo build of $(POI4R_LIB) complete
-
-install:: all
-	install Poi4R.rb $(RUBY_SITE)
-	install $(POI4R_LIB) $(RUBY_SITE)
-
-ifeq ($(OS),Darwin)
-install::
-	install $(GCJ_HOME)/lib/libgcj.5.dylib $(PREFIX)/lib
-	install $(GCJ_HOME)/lib/libstdc++.6.dylib $(PREFIX)/lib
-	install $(GCJ_HOME)/lib/libgcc_s.1.0.dylib $(PREFIX)/lib
-else
-
-ifeq ($(OS),Linux)
-install::
-
-else
-
-ifeq ($(OS),Cygwin)
-install::
-
-endif
-endif
-endif
-
-
-clean:
-	rm -rf $(BINDIR) Poi4R.rb* Poi4R_wrap.cxx
-
-realclean: clean
-	rm -rf $(POI) $(STORE) $(DISTRIB)
-
-distrib::
-	mkdir -p $(DISTRIB)/python
-	install Poi4R.rb $(DISTRIB)/python
-	install $(POI4R_LIB) $(DISTRIB)/python
-	install README $(DISTRIB)
-
-ifeq ($(OS),Darwin)
-distrib::
-ifdef DB
-	mkdir -p $(DISTRIB)/db
-	install $(LIBDB_JAVA_LIB) $(DISTRIB)/db
-	install libdb_java-$(DB_LIB_VER).la.osx $(DISTRIB)/db
-endif
-	mkdir -p $(DISTRIB)/gcj
-	install $(GCJ_HOME)/lib/libgcj.5.dylib $(DISTRIB)/gcj
-	install $(GCJ_HOME)/lib/libstdc++.6.dylib $(DISTRIB)/gcj
-	install $(GCJ_HOME)/lib/libgcc_s.1.0.dylib $(DISTRIB)/gcj
-else
-
-ifeq ($(OS),Linux)
-distrib::
-ifdef DB
-	mkdir -p $(DISTRIB)/db
-	install $(LIBDB_JAVA_LIB) $(DISTRIB)/db
-endif
-	mkdir -p $(DISTRIB)/gcj
-	install $(GCJ_HOME)/lib/libgcj.so.5 $(DISTRIB)/gcj
-	install $(GCJ_HOME)/lib/libstdc++.so.6 $(DISTRIB)/gcj
-	install $(GCJ_HOME)/lib/libgcc_s.so.1 $(DISTRIB)/gcj
-else
-
-ifeq ($(OS),Cygwin)
-distrib::
-ifdef DB
-	mkdir -p $(DISTRIB)/db
-	install $(LIBDB_JAVA_LIB) $(DISTRIB)/db
-endif
-endif
-endif
-endif
-
diff --git a/trunk/src/contrib/poi-ruby/Poi4R.i b/trunk/src/contrib/poi-ruby/Poi4R.i
deleted file mode 100644
index 2f72ce9..0000000
--- a/trunk/src/contrib/poi-ruby/Poi4R.i
+++ /dev/null
@@ -1,614 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-%module poi4r
-
-
-%{
-
-#include <gcj/cni.h>
-#include <java/lang/Object.h>
-#include <java/lang/Thread.h>
-#include <java/lang/ThreadGroup.h>
-#include <java/lang/Runnable.h>
-#include <java/lang/String.h>
-#include <java/lang/Throwable.h>
-#include <java/lang/Comparable.h>
-#include <java/lang/Integer.h>
-#include <java/lang/Long.h>
-#include <java/lang/Float.h>
-#include <java/lang/Double.h>
-#include <java/io/StringWriter.h>
-#include <java/io/PrintWriter.h>
-#include <java/util/HashMap.h>
-#include <java/util/Date.h>
-#include <java/util/Calendar.h>
-#include <java/lang/System.h>
-
-#include "org/apache/poi/hssf/usermodel/HSSFWorkbook.h"
-#include "org/apache/poi/hssf/usermodel/HSSFSheet.h"
-#include "org/apache/poi/hssf/usermodel/HSSFRow.h"
-#include "org/apache/poi/hssf/usermodel/HSSFCell.h"
-#include "org/apache/poi/hssf/usermodel/HSSFFont.h"
-#include "org/apache/poi/hssf/usermodel/HSSFCellStyle.h"
-#include "org/apache/poi/hssf/usermodel/HSSFDataFormat.h"
-#include "org/apache/poi/hssf/usermodel/HSSFHeader.h"
-#include "org/apache/poi/hssf/usermodel/HSSFFooter.h"
-#include "org/apache/poi/RubyOutputStream.h"
-
-
-typedef ::org::apache::poi::hssf::usermodel::HSSFWorkbook *jhworkbook;
-typedef ::org::apache::poi::hssf::usermodel::HSSFSheet *jhsheet;
-typedef ::org::apache::poi::hssf::usermodel::HSSFRow *jhrow;
-typedef ::org::apache::poi::hssf::usermodel::HSSFCell *jhcell;
-typedef ::org::apache::poi::hssf::usermodel::HSSFCellStyle *jhcellstyle;
-typedef ::org::apache::poi::hssf::usermodel::HSSFFont *jhfont;
-typedef ::org::apache::poi::hssf::usermodel::HSSFFooter *jhfooter;
-typedef ::org::apache::poi::hssf::usermodel::HSSFHeader *jhheader;
-typedef ::org::apache::poi::hssf::usermodel::HSSFDataFormat *jhdataformat;
-
-typedef ::java::util::Date *jdate;
-typedef ::java::util::Calendar *jcalendar;
-typedef ::java::io::OutputStream *joutputstream;
-typedef ::java::io::InputStream *jinputstream;
-typedef ::java::util::Collection *jstringCollection;
-typedef ::java::util::Collection *jtermCollection;
-typedef ::java::util::Locale *jlocale;
-typedef ::java::lang::Comparable *jcomparable;
-typedef JArray<jobject> *jobjectArray;
-typedef JArray<jstring> *jstringArray;
-
-
-static java::lang::Thread *nextThread;
-static java::util::HashMap *objects;
-
-
-static void store_reference(jobject object) {
-	java::lang::Integer *ji =new java::lang::Integer(java::lang::System::identityHashCode(object));
-	jobject jo = objects->get(ji);
-	if (!jo) {
-	//	printf("put object in hash\n");
-		objects->put(ji,object);
-	}
-}
-static VALUE jo2rv(jobject object, swig_type_info *descriptor)
-{
-    if (object == NULL)
-    {
-        return Qnil;
-    }
-    else
-    {
-        return SWIG_NewPointerObj((void *) object, descriptor, 0);
-    }
-}
-static int cvtptr(VALUE value, void **jo, swig_type_info *info)
-{
-    if (SWIG_ConvertPtr(value, jo, info, 0) == 0)
-        return 0;
-    else
-    {
-        return -1;
-    }
-}
-
-static int rv2jo(VALUE rv, jobject *jo, swig_type_info *descriptor)
-{
-    if (NIL_P(rv))
-        *jo = NULL;
-    else
-    {
-        java::lang::Object *javaObj;
-
-        if (cvtptr(rv, (void **) &javaObj, descriptor) == -1)
-            return 0;
-
-        *jo = javaObj;
-    }
-
-    return 1;
-}
-
-
-static jstring r2j(VALUE object)
-{
-    if (NIL_P(object)){
-        return NULL;
-    }
-    else {
-    	char *ps =  STR2CSTR(object);
-        jstring js = JvNewStringLatin1(ps);
-
-        if (!js)
-        {
-    		rb_raise(rb_eRuntimeError, "ruby str cannot be converted to java: %s",ps);
-        }
-
-        return js;
-    }
-}
-
-VALUE j2r(jstring js)
-{
-    if (!js)
-    {
-        return Qnil;
-    }
-    else
-    {
-        jint len = JvGetStringUTFLength(js);
-        char buf[len + 1];
-
-        JvGetStringUTFRegion(js, 0, len, buf);
-        buf[len] = '\0';
-       
-        return rb_str_new2(buf);
-    }
-}
-
-static void free_java_obj(void* arg1) {
-	jobject object =(jobject) arg1;
-	java::lang::Integer *ji =new java::lang::Integer(java::lang::System::identityHashCode(object));
-        jobject jo = objects->get(ji);
-        if (jo) {
-        //        printf("removed object from hash\n");
-                objects->remove(ji);
-        }
-}
-
-static void raise_ruby_error(java::lang::Throwable *e) {
-	java::io::StringWriter *buffer = new java::io::StringWriter();
-    java::io::PrintWriter *writer = new java::io::PrintWriter(buffer);
-    e->printStackTrace(writer);
-    writer->close();
-    jstring message = buffer->toString();
-    jint len = JvGetStringUTFLength(message);
-    char buf[len + 1];
-    JvGetStringUTFRegion(message, 0, len, buf);
-    buf[len] = '\0';
-	rb_raise(rb_eRuntimeError, "error calling poi \n %s", buf);
-}
-
-%}
-
-typedef long jint;
-typedef long long jlong;
-typedef char jbyte;
-typedef float jfloat;
-typedef float jdouble;
-typedef int jshort;
-typedef bool jboolean;
-
-%typemap(in) SWIGTYPE * {
-
-    if (!rv2jo($input, (jobject *) &$1, $1_descriptor))
-        rb_raise(rb_eRuntimeError, "Unrecoverable error in SWIG typemapping");
-}
-%typemap(out) SWIGTYPE * {
-
-    $result = jo2rv($1, $1_descriptor);
-}
-
-%typemap(in) org::apache::poi::hssf::usermodel::HSSFWorkbook{
-
-    if (!rv2jo($input, (jobject *) &$1,
-               $descriptor(org::apache::poi::hssf::usermodel::HSSFWorkbook *)))
-        SWIG_fail;
-}
-%typemap(out) org::apache::poi::hssf::usermodel::HSSFWorkbook {
-    $result = jo2rv($1, $descriptor(org::apache::poi::hssf::usermodel::HSSFWorkbook *));
-}
-
-%typemap(in) jhsheet{
-
-    if (!rv2jo($input, (jobject *) &$1,
-               $descriptor(org::apache::poi::hssf::usermodel::HSSFSheet *)))
-        SWIG_fail;
-}
-%typemap(out) jhsheet {
-
-    $result = jo2rv($1, $descriptor(org::apache::poi::hssf::usermodel::HSSFSheet *));
-}
-%typemap(in) jhrow{
-
-    if (!rv2jo($input, (jobject *) &$1,
-               $descriptor(org::apache::poi::hssf::usermodel::HSSFRow *)))
-        SWIG_fail;
-}
-%typemap(out) jhrow {
-
-    $result = jo2rv($1, $descriptor(org::apache::poi::hssf::usermodel::HSSFRow *));
-}
-%typemap(in) jhcell{
-
-    if (!rv2jo($input, (jobject *) &$1,
-               $descriptor(org::apache::poi::hssf::usermodel::HSSFCell *)))
-        SWIG_fail;
-}
-%typemap(out) jhcell {
-
-    $result = jo2rv($1, $descriptor(org::apache::poi::hssf::usermodel::HSSFCell *));
-}
-%typemap(in) jhfont{
-
-    if (!rv2jo($input, (jobject *) &$1,
-                $descriptor(org::apache::poi::hssf::usermodel::HSSFFont *)))
-         rb_raise(rb_eRuntimeError, "Unrecoverable error in SWIG typemapping of HSSFFont");
-}
-
-%typemap(out) jhfont {
-
-    $result = jo2rv($1, $descriptor(org::apache::poi::hssf::usermodel::HSSFFont *));
-}
-
-%typemap(in) jhcellstyle{
-
-    if (!rv2jo($input, (jobject *) &$1,
-               $descriptor(org::apache::poi::hssf::usermodel::HSSFCellStyle *)))
-		rb_raise(rb_eRuntimeError, "Unrecoverable error in SWIG typemapping of HSSFCellStyle");
-}
-%typemap(out) jhcellstyle {
-
-    $result = jo2rv($1, $descriptor(org::apache::poi::hssf::usermodel::HSSFCellStyle *));
-}
-%typemap(in) jhdataformat{
-
-    if (!rv2jo($input, (jobject *) &$1,
-               $descriptor(org::apache::poi::hssf::usermodel::HSSFDataFormat *)))
-	rb_raise(rb_eRuntimeError, "Unrecoverable error in SWIG typemapping of HSSFDataFormat");
-}
-%typemap(out) jhdataformat {
-
-    $result = jo2rv($1, $descriptor(org::apache::poi::hssf::usermodel::HSSFDataFormat *));
-}
-
-
-%typemap(in) jstring {
-    $1 = r2j($input);
-}
-%typemap(out) jstring {
-    $result = j2r($1);
-}
-%typecheck(SWIG_TYPECHECK_STRING) jstring {
-    $1 = ( NIL_P($input) || TYPE($input)==T_STRING );
-}
-
-%typemap(in) joutputstream {
-
-        jlong ptr;
-		if (!rb_respond_to($input, rb_intern("putc"))) rb_raise(rb_eTypeError,"Expected IO");
-        *(VALUE *) &ptr = (VALUE) $input;
-        $1 = new org::apache::poi::RubyOutputStream(ptr);
-}
-%typemap(in) jcalendar {
-	$1 = java::util::Calendar::getInstance();
-	//$1->setTimeInMillis((long long) NUM2DBL(rb_funcall($input,rb_intern("to_i"),0,NULL))*1000.0);
-	$1->set(FIX2INT(rb_funcall($input,rb_intern("year"),0,NULL)),
-		FIX2INT(rb_funcall($input,rb_intern("mon"),0,NULL))-1,
-		FIX2INT(rb_funcall($input,rb_intern("day"),0,NULL)),
-		FIX2INT(rb_funcall($input,rb_intern("hour"),0,NULL)),
-		FIX2INT(rb_funcall($input,rb_intern("min"),0,NULL)),
-		FIX2INT(rb_funcall($input,rb_intern("sec"),0,NULL))
-		);	
-}
-
-%typecheck(SWIG_TYPECHECK_POINTER) jcalendar {
-    $1 = rb_respond_to($input, rb_intern("asctime"));
-}
-
-%typemap(out) jdate {
-	jlong t = ((jdate) $1)->getTime();
-	//TODO: separate seconds and microsecs
-	int ts=t/1000;
-	$result=rb_time_new((time_t) ts, 0 );
-}
-
-
-%freefunc org::apache::poi::hssf::usermodel::HSSFWorkbook "free_java_obj";
-
-%exception {
-    try {
-        $action
-    } catch (java::lang::Throwable *e) {
-    	raise_ruby_error(e);
-    }
-}
-%exception org::apache::poi::hssf::usermodel::HSSFWorkbook::HSSFWorkbook {
-    try {
-        $action
-		store_reference(result);
-    } catch (java::lang::Throwable *e) {
-        raise_ruby_error(e);
-    }
-}
-
-
-
-
-namespace java {
-    namespace lang {
-        class Object {
-            jstring toString();
-        };
-%nodefault;
-	class System : public Object {
-        public:
-            static jstring getProperty(jstring);
-            static jstring getProperty(jstring, jstring);
-            static void load(jstring);
-            static void loadLibrary(jstring);
-            static void mapLibraryName(jstring);
-            static void runFinalization();
-            static void setProperty(jstring, jstring);
-        };
-%makedefault;
-    }
-    namespace io {
-%nodefault;
-        class InputStream : public ::java::lang::Object {
-        };
-        class OutputStream : public ::java::lang::Object {
-        };
-        
-%makedefault;
-    }
-    namespace util {
-        class Date : public ::java::lang::Object {
-        public:
-            Date();
-            Date(jlong);
-            void setTime(jlong);
-            jstring toString();
-        };
-    }
-}
-
-
-namespace org {
-    namespace apache {
-        namespace poi {
-            namespace hssf {
-            	namespace usermodel {
-%nodefault; 
-	                class HSSFWorkbook : public ::java::lang::Object {
-	                public:
-                		HSSFWorkbook();
-	                    jstring getSheetName(jint);
-	                    jint getNumberOfSheets();
-	                    void setSheetOrder(jstring,jint);
-	                    void setSheetName(jint,jstring);
-	                    void setSheetName(jint,jstring,jshort);
-	                    jint getSheetIndex(jstring);
-	                    jhsheet createSheet();
-	                    jhsheet cloneSheet(jint);
-	                    jhsheet createSheet(jstring);
-	                    jhsheet getSheetAt(jint);
-	                    jhsheet getSheet(jstring);
-	                    void removeSheetAt(jint);
-	                    jhcellstyle createCellStyle();
-			    jhfont createFont();
-			    jhdataformat createDataFormat(); 
-	                    void write(joutputstream);
-	                    
-	                };
-
-	                class HSSFSheet : public ::java::lang::Object {
-	                public:
-	                	jhrow createRow(jint);
-	                	jhrow getRow(jint);
-	                	jhfooter getFooter();
-	                	jhheader getHeader();
-	                };
-	                class HSSFRow : public ::java::lang::Object {
-	                public:
-	                	jhcell createCell(jshort);
-	                	jhcell getCell(jshort);
-	                	//jboolean getProtect(); //only in 2.5
-	                	
-	                };
-	                class HSSFCell : public ::java::lang::Object {
-	                public:
-	                	void setCellValue(jdouble);
-	                	void setCellValue(jstring);
-	                	void setCellValue(jboolean);
-	                	void setCellValue(jcalendar);
-	                	void setCellFormula(jstring);
-	                	jstring getStringCellValue();
-	                	jdouble getNumericCellValue();
-	                	jdate getDateCellValue();
-	                	jstring getCellFormula();
-	                	jboolean getBooleanCellValue();
-	                	jint getCellType();
-	                	jshort getEncoding();
-	                	void setAsActiveCell();
-	                	
-	                	void setCellStyle(jhcellstyle);
-	                	void setEncoding(jshort encoding);
-	                	
-	                	static const jint CELL_TYPE_BLANK;
-	                	static const jint CELL_TYPE_BOOLEAN;
-	                	static const jint CELL_TYPE_ERROR;
-	                	static const jint CELL_TYPE_FORMULA;
-	                	static const jint CELL_TYPE_NUMERIC;
-	                	static const jint CELL_TYPE_STRING;
-	                	
-	                	static const jshort ENCODING_COMPRESSED_UNICODE;
-	                	static const jshort ENCODING_UTF_16;
-	                };
-					class HSSFCellStyle : public ::java::lang::Object {
-					public:
-						static const jshort ALIGN_CENTER;
-						static const jshort ALIGN_CENTER_SELECTION;
-						static const jshort ALIGN_FILL;
-						static const jshort ALIGN_GENERAL;
-						static const jshort ALIGN_JUSTIFY;
-						static const jshort ALIGN_LEFT;
-						static const jshort ALIGN_RIGHT;
-						static const jshort ALT_BARS;
-						static const jshort BIG_SPOTS;
-						static const jshort BORDER_DASH_DOT;
-						static const jshort BORDER_DASH_DOT_DOT;
-						static const jshort BORDER_DASHED;
-						static const jshort BORDER_DOTTED;
-						static const jshort BORDER_DOUBLE;
-						static const jshort BORDER_HAIR;
-						static const jshort BORDER_MEDIUM;
-						static const jshort BORDER_MEDIUM_DASH_DOT;
-						static const jshort BORDER_MEDIUM_DASH_DOT_DOT;
-						static const jshort BORDER_MEDIUM_DASHED;
-						static const jshort BORDER_NONE;
-						static const jshort BORDER_SLANTED_DASH_DOT;
-						static const jshort BORDER_THICK;
-						static const jshort BORDER_THIN;
-						static const jshort BRICKS;
-						static const jshort DIAMONDS;
-						static const jshort FINE_DOTS;
-						static const jshort NO_FILL;
-						static const jshort SOLID_FOREGROUND;
-						static const jshort SPARSE_DOTS;
-						static const jshort SQUARES;
-						static const jshort THICK_BACKWARD_DIAG;
-						static const jshort THICK_FORWARD_DIAG;
-						static const jshort THICK_HORZ_BANDS;
-						static const jshort THICK_VERT_BANDS;
-						static const jshort THIN_BACKWARD_DIAG;
-						static const jshort THIN_FORWARD_DIAG;
-						static const jshort THIN_HORZ_BANDS;
-						static const jshort THIN_VERT_BANDS;
-						static const jshort VERTICAL_BOTTOM;
-						static const jshort VERTICAL_CENTER;
-						static const jshort VERTICAL_JUSTIFY;
-						static const jshort VERTICAL_TOP;
-						
-						jshort getAlignment();
-						jshort getBorderBottom();
-						jshort getBorderLeft();
-						jshort getBorderRight();
-						jshort getBorderTop();
-						jshort getBottomBorderColor();
-						jshort getDataFormat();
-						jshort getFillBackgroundColor();
-						jshort getFillForegroundColor();
-						jshort getFillPattern();
-						jshort getFontIndex();
-						jboolean getHidden();
-						jshort getIndention();
-						jshort getIndex();
-						jshort getLeftBorderColor();
-						jboolean getLocked();
-						jshort getRightBorderColor();
-						jshort getRotation();
-						jshort getTopBorderColor();
-						jshort getVerticalAlignment();
-						jboolean getWrapText();
-						void setAlignment(jshort) ;
-						void setBorderBottom(jshort );
-						void setBorderLeft(jshort );
-						void setBorderRight(jshort );
-						void setBorderTop(jshort );
-						void setBottomBorderColor(jshort );
-						void setDataFormat(jshort );
-						void setFillBackgroundColor(jshort );
-						void setFillForegroundColor(jshort );
-						void setFillPattern(jshort );
-						void setFont(jhfont );
-						void setHidden(jboolean );
-						void setIndention(jshort );
-						void setLeftBorderColor(jshort );
-						void setLocked(jboolean );
-						void setRightBorderColor(jshort );
-						void setRotation(jshort );
-						void setTopBorderColor(jshort );
-						void setVerticalAlignment(jshort );
-						void setWrapText(jboolean );
-					};
-					class HSSFDataFormat : public ::java::lang::Object {
-					public:
-						static jstring getBuiltinFormat(jshort);
-						static jshort getBuiltinFormat(jstring);
-						jstring getFormat(jshort);
-						jshort getFormat(jstring);
-						static jint getNumberOfBuiltinBuiltinFormats();
-						//TODO static jlist getBuiltinFormats(); 
-		
-					};
-					class HSSFFont : public ::java::lang::Object {
-					public:
-						static const jshort 	BOLDWEIGHT_BOLD;
-static const jshort 	BOLDWEIGHT_NORMAL;
-static const jshort 	COLOR_NORMAL;
-static const jshort 	COLOR_RED;
-static const jstring 	FONT_ARIAL;
-static const jshort 	SS_NONE;
-static const jshort 	SS_SUB;
-static const jshort 	SS_SUPER;
-static const jshort 	U_DOUBLE;
-static const jshort 	U_DOUBLE_ACCOUNTING;
-static const jshort 	U_NONE;
-static const jshort 	U_SINGLE;
-static const jshort 	U_SINGLE_ACCOUNTING;
- 
- jshort 	getBoldweight();
- jshort 	getColor();
- jshort 	getFontHeight();
- jshort 	getFontHeightInPoints();
- jstring 	getFontName();
- jshort 	getIndex();
- jboolean 	getItalic();
- jboolean 	getStrikeout();
- jshort 	getTypeOffset();
- jshort 	getUnderline();
- void 	setBoldweight(jshort );
- void 	setColor(jshort );
- void 	setFontHeight(jshort );
- void 	setFontHeightInPoints(jshort );
- void 	setFontName(jstring );
- void 	setItalic(jboolean );
- void 	setStrikeout(jboolean );
- void 	setTypeOffset(jshort );
- void 	setUnderline(jshort );
-};
-%makedefault;
-	            }
-            }
-        }
-    }
-}
-
-
-
-
-
-%init %{
-
-    JvCreateJavaVM(NULL);
-    JvAttachCurrentThread(NULL, NULL);
-
-    nextThread = new java::lang::Thread();
-    objects = new java::util::HashMap();
-
-    java::util::HashMap *props = (java::util::HashMap *)
-        java::lang::System::getProperties();
-    props->put(JvNewStringUTF("inRuby"), objects);
-
-    JvInitClass(&org::apache::poi::hssf::usermodel::HSSFFont::class$);
-    JvInitClass(&org::apache::poi::hssf::usermodel::HSSFCell::class$);
-    JvInitClass(&org::apache::poi::hssf::usermodel::HSSFSheet::class$);
-    JvInitClass(&org::apache::poi::hssf::usermodel::HSSFCellStyle::class$);
-
-%}
-
diff --git a/trunk/src/contrib/poi-ruby/cpp/RubyIO.cpp b/trunk/src/contrib/poi-ruby/cpp/RubyIO.cpp
deleted file mode 100644
index d4a4638..0000000
--- a/trunk/src/contrib/poi-ruby/cpp/RubyIO.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-#include <gcj/cni.h>
-
-#include "ruby.h"
-#include "org/apache/poi/RubyOutputStream.h"
-
-
-/**
- * The native functions declared in org.apache.poi.RubyoutputStream
- *
- * @author aviks
- */
-
- namespace org {
-    namespace apache {
-        namespace poi {
-
-            void RubyOutputStream::close(void)
-            {
-            	rb_funcall3((VALUE ) rubyIO, rb_intern("close"), 0, NULL);
-            }
-            
-            void RubyOutputStream::write(jint toWrite)
-            {
-               rb_funcall((VALUE ) rubyIO, rb_intern("putc"),1,INT2FIX(toWrite));
-            }
-        }
-    }
-}
diff --git a/trunk/src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java b/trunk/src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java
deleted file mode 100644
index e23a0a7..0000000
--- a/trunk/src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi;
-
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * @author aviks
- * Wrap a java.io.OutputStream around a Ruby IO object
- */
-
-public class RubyOutputStream extends OutputStream {
-
-	//pointer to native ruby VALUE
-    protected long rubyIO;
-
-    public RubyOutputStream (long rubyIO)
-    {
-        this.rubyIO = rubyIO;
-//        incRef();
-    }
-
-    @Override
-	protected void finalize()
-        throws Throwable
-    {
-//        decRef();
-    }
-
-//    protected native void incRef();
-//    protected native void decRef();
-
-    @Override
-	public native void close()
-        throws IOException;
-
-
-	/* (non-Javadoc)
-	 * @see java.io.OutputStream#write(int)
-	 */
-	@Override
-	public native void write(int arg0) throws IOException;
-}
-
diff --git a/trunk/src/contrib/poi-ruby/tests/tc_base_tests.rb b/trunk/src/contrib/poi-ruby/tests/tc_base_tests.rb
deleted file mode 100644
index 33492c7..0000000
--- a/trunk/src/contrib/poi-ruby/tests/tc_base_tests.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-#  ====================================================================
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ====================================================================
-
-require 'test/unit'
-require 'release/poi4r'
-
-class TC_base_tests < Test::Unit::TestCase
-
-    def setup()
-    end
-
-	def test_get_constant
-		h=Poi4r::HSSFWorkbook.new
-		s=h.createSheet("Sheet1")
-		r=s.createRow(0)
-		c=r.createCell(0)
-		assert_equal(3,Poi4r::HSSFCell.CELL_TYPE_BLANK,"Constant  CELL_TYPE_BLANK")
-	end
-	
-	def test_base
-	    	system("rm test.xls")
-		h=Poi4r::HSSFWorkbook.new
-		
-		#Test Sheet Creation
-		s=h.createSheet("Sheet1")
-		s=h.createSheet("Sheet2")
-		assert_equal(2,h.getNumberOfSheets(),"Number of sheets is 2")
-		
-		#Test setting cell values
-		s=h.getSheetAt(0)
-		r=s.createRow(0)
-		c=r.createCell(0)
-		c.setCellValue(1.5)
-		assert_equal(c.getNumericCellValue(),1.5,"Numeric Cell Value")
-		c=r.createCell(1)
-		c.setCellValue("Ruby")
-		assert_equal(c.getStringCellValue(),"Ruby","String Cell Value")
-		#Test error handling
-		assert_raise (RuntimeError) {c.getNumericCellValue()}
-		
-		#Test styles
-		st = h.createCellStyle()
-		c=r.createCell(2)
-		st.setAlignment(Poi4r::HSSFCellStyle.ALIGN_CENTER)
-		c.setCellStyle(st)
-		c.setCellValue("centr'd")
-		
-		#Date handling
-		c=r.createCell(3)
-		t1=Time.now
-		c.setCellValue(Time.now)
-		t2= c.getDateCellValue().gmtime
-		assert_equal(t1.year,t2.year,"year")
-		assert_equal(t1.mon,t2.mon,"month")
-		assert_equal(t1.day,t2.day,"day")
-		assert_equal(t1.hour,t2.hour,"hour")
-		assert_equal(t1.min,t2.min,"min")
-		assert_equal(t1.sec,t2.sec,"sec")
-		st=h.createCellStyle();
-		st.setDataFormat(Poi4r::HSSFDataFormat.getBuiltinFormat("m/d/yy h:mm"))
-		c.setCellStyle(st)
-
-		#Fonts
-		c=r.createCell(4)
-		font = h.createFont();
-		font.setFontHeightInPoints(24);
-		font.setFontName("Courier New");
-		font.setItalic(true);
-		font.setStrikeout(true);
-	        style = h.createCellStyle();
-		style.setFont(font);
-		c.setCellValue("This is a test of fonts");
-		c.setCellStyle(style);
-
-		#Formulas
-		c=r.createCell(5)
-		c.setCellFormula("A1*2")
-		assert_equal("A1*2",c.getCellFormula,"formula")
-
-		#Test writing
-		h.write(File.new("test.xls","w"))
-		assert_nothing_raised {File.new("test.xls","r")}
-		#h.write(0.1)
-	end
-	
-end
diff --git a/trunk/src/contrib/poi-ruby/tests/tc_gc.rb b/trunk/src/contrib/poi-ruby/tests/tc_gc.rb
deleted file mode 100644
index 82c3c2b..0000000
--- a/trunk/src/contrib/poi-ruby/tests/tc_gc.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#  ====================================================================
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ====================================================================
-
-require 'test/unit'
-require 'release/poi4r'
-
-class TC_gc < Test::Unit::TestCase
-	def test_premature_collection
-		h=Poi4r::HSSFWorkbook.new
-		h.createSheet("Sheet1");
-		5000.times do
-			hh=Poi4r::HSSFWorkbook.new
-			GC.start()
-		end
-		assert_equal(1,h.getNumberOfSheets(),"Number of sheets")
-	end
-end
-
diff --git a/trunk/src/contrib/poi-ruby/tests/ts_all.rb b/trunk/src/contrib/poi-ruby/tests/ts_all.rb
deleted file mode 100644
index ef50ad5..0000000
--- a/trunk/src/contrib/poi-ruby/tests/ts_all.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#  ====================================================================
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ====================================================================
-
-require 'test/unit'
-require 'tests/tc_base_tests'
-require 'tests/tc_gc'
diff --git a/trunk/src/contrib/testcases/dummy.txt b/trunk/src/contrib/testcases/dummy.txt
deleted file mode 100644
index e69de29..0000000
--- a/trunk/src/contrib/testcases/dummy.txt
+++ /dev/null
diff --git a/trunk/src/examples/jsp/HSSFExample.jsp b/trunk/src/examples/jsp/HSSFExample.jsp
deleted file mode 100644
index b641846..0000000
--- a/trunk/src/examples/jsp/HSSFExample.jsp
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<%@page contentType="text/html" 
-import="java.io.*,org.apache.poi.poifs.filesystem.POIFSFileSystem,org.apache.poi
-.hssf.record.*,org.apache.poi.hssf.model.*,org.apache.poi.hssf.usermodel.*,org.a
-pache.poi.hssf.util.*" %>
-<html>
-<head><title>Read Excel file </title>
-</head>
-<body>
-An example of using Jakarta POI's HSSF package to read an excel spreadsheet: 
-
-
-<form name="form1" method="get" action="">
-Select an Excel file to read. 
-  <input type="file" name="xls_filename" onChange="form1.submit()">
-</form>
-
-<%
-	String filename = request.getParameter("xls_filename"); 
-	if (filename != null && !filename.equals("")) {
-%>	
-	<br>You chose the file <%= filename %>. 
-	<br><br>It's contents are: 	
-<%	
-            try
-            {
-
-                // create a poi workbook from the excel spreadsheet file
-                POIFSFileSystem fs =
-                    new POIFSFileSystem(new FileInputStream(filename));
-                HSSFWorkbook wb = new HSSFWorkbook(fs);
-
-                for (int k = 0; k < wb.getNumberOfSheets(); k++)
-                {
-%>				
-                    <br><br>Sheet  <%= k %> <br>
-<%					
-					
-                    HSSFSheet sheet = wb.getSheetAt(k);
-                    int       rows  = sheet.getPhysicalNumberOfRows();
-
-                    for (int r = 0; r < rows; r++)
-                    {
-                        HSSFRow row   = sheet.getRow(r);
-                        if (row != null) { 
-                            int     cells = row.getPhysicalNumberOfCells();
-%>
-							<br><b>ROW  <%= 
-row.getRowNum() %> </b>
-<%
-                            for (short c = 0; c < cells; c++) 
-                            { 
-                                HSSFCell cell  = row.getCell(c);
-                                if (cell != null) { 
-                                    String   value = null;
-
-                                    switch (cell.getCellType())
-                                    {
-
-                                        case HSSFCell.CELL_TYPE_FORMULA :
-                                            value = "FORMULA ";
-                                            break;
-
-                                        case HSSFCell.CELL_TYPE_NUMERIC :
-                                            value = "NUMERIC value="
-                                                    + cell.getNumericCellValue
-();
-                                            break;
-
-                                        case HSSFCell.CELL_TYPE_STRING :
-                                            value = "STRING value="
-                                                    + cell.getStringCellValue();
-                                            break;
-
-                                        default :
-                                    }
-%>									
-                                    <%= "CELL col=" 
-									
-	+ cell.getColumnIndex()
-                                        + " VALUE=" + value %>
-<%
-                                } 
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-%>
-	Error occurred:  <%= e.getMessage() %>
-<%			
-                e.printStackTrace();
-            }
-
-	} 
-%> 
-</body>
-</html>
-
diff --git a/trunk/src/examples/lib/dummy.txt b/trunk/src/examples/lib/dummy.txt
deleted file mode 100644
index ee37f45..0000000
--- a/trunk/src/examples/lib/dummy.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file so this directory is not deleted by CVS.  It's required for the build.
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/crypt/examples/EncryptionUtils.java b/trunk/src/examples/src/org/apache/poi/crypt/examples/EncryptionUtils.java
deleted file mode 100644
index c2b795c..0000000
--- a/trunk/src/examples/src/org/apache/poi/crypt/examples/EncryptionUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.crypt.examples;
-
-import java.io.InputStream;
-
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-
-public class EncryptionUtils {
-    private EncryptionUtils() {
-    }
-    
-    public static InputStream decrypt(final InputStream inputStream, final String pwd) throws Exception {
-        try {
-            POIFSFileSystem fs = new POIFSFileSystem(inputStream);
-            EncryptionInfo info = new EncryptionInfo(fs);
-            Decryptor d = Decryptor.getInstance(info);
-            if (!d.verifyPassword(pwd)) {
-                throw new RuntimeException("incorrect password");
-            }
-            return d.getDataStream(fs);
-        } finally {
-            IOUtils.closeQuietly(inputStream);
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/examples/util/TempFileUtils.java b/trunk/src/examples/src/org/apache/poi/examples/util/TempFileUtils.java
deleted file mode 100644
index 5d4f7ab..0000000
--- a/trunk/src/examples/src/org/apache/poi/examples/util/TempFileUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.examples.util;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.poi.util.TempFile;
-
-public class TempFileUtils {
-    private TempFileUtils() {
-    }
-    
-    public static void checkTempFiles() throws IOException {
-        String tmpDir = System.getProperty(TempFile.JAVA_IO_TMPDIR) + "/poifiles";
-        File tempDir = new File(tmpDir);
-        if(tempDir.exists()) {
-            String[] tempFiles = tempDir.list();
-            if(tempFiles != null && tempFiles.length > 0) {
-                System.out.println("found files in poi temp dir " + tempDir.getAbsolutePath());
-                for(String filename : tempFiles) {
-                    System.out.println("file: " + filename);
-                }
-            }
-        } else {
-            System.out.println("unable to find poi temp dir");
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java b/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
deleted file mode 100644
index 43ea2e9..0000000
--- a/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.examples;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.hpsf.HPSFRuntimeException;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.MutablePropertySet;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.Util;
-import org.apache.poi.hpsf.WritingNotSupportedException;
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.TempFile;
-
-/**
- * <p>This class copies a POI file system to a new file and compares the copy
- * with the original.</p>
- * 
- * <p>Property set streams are copied logically, i.e. the application
- * establishes a {@link org.apache.poi.hpsf.PropertySet} of an original property
- * set, creates a {@link org.apache.poi.hpsf.MutablePropertySet} from the
- * {@link org.apache.poi.hpsf.PropertySet} and writes the
- * {@link org.apache.poi.hpsf.MutablePropertySet} to the destination POI file
- * system. - Streams which are no property set streams are copied bit by
- * bit.</p>
- * 
- * <p>The comparison of the POI file systems is done logically. That means that
- * the two disk files containing the POI file systems do not need to be
- * exactly identical. However, both POI file systems must contain the same
- * files, and most of these files must be bitwise identical. Property set
- * streams, however, are compared logically: they must have the same sections
- * with the same attributs, and the sections must contain the same properties.
- * Details like the ordering of the properties do not matter.</p>
- */
-public class CopyCompare
-{
-    /**
-     * <p>Runs the example program. The application expects one or two
-     * arguments:</p>
-     * 
-     * <ol>
-     * 
-     * <li><p>The first argument is the disk file name of the POI filesystem to
-     * copy.</p></li>
-     * 
-     * <li><p>The second argument is optional. If it is given, it is the name of
-     * a disk file the copy of the POI filesystem will be written to. If it is
-     * not given, the copy will be written to a temporary file which will be
-     * deleted at the end of the program.</p></li>
-     * 
-     * </ol>
-     *
-     * @param args Command-line arguments.
-     * @exception MarkUnsupportedException if a POI document stream does not
-     * support the mark() operation.
-     * @exception NoPropertySetStreamException if the application tries to
-     * create a property set from a POI document stream that is not a property
-     * set stream.
-     * @exception IOException if any I/O exception occurs.
-     * @exception UnsupportedEncodingException if a character encoding is not
-     * supported.
-     */
-    public static void main(final String[] args)
-    throws NoPropertySetStreamException, MarkUnsupportedException,
-           UnsupportedEncodingException, IOException
-    {
-        String originalFileName = null;
-        String copyFileName = null;
-
-        /* Check the command-line arguments. */
-        if (args.length == 1) {
-            originalFileName = args[0];
-            File f = TempFile.createTempFile("CopyOfPOIFileSystem-", ".ole2");
-            f.deleteOnExit();
-            copyFileName = f.getAbsolutePath();
-        } else if (args.length == 2) {
-            originalFileName = args[0];
-            copyFileName = args[1];
-        } else {
-            System.err.println("Usage: " + CopyCompare.class.getName() +
-                               "originPOIFS [copyPOIFS]");
-            System.exit(1);
-        }
-
-        /* Read the origin POIFS using the eventing API. The real work is done
-         * in the class CopyFile which is registered here as a POIFSReader. */
-        final POIFSReader r = new POIFSReader();
-        final CopyFile cf = new CopyFile(copyFileName);
-        r.registerListener(cf);
-        FileInputStream fis = new FileInputStream(originalFileName);
-        r.read(fis);
-        fis.close();
-        
-        /* Write the new POIFS to disk. */
-        cf.close();
-
-        /* Read all documents from the original POI file system and compare them
-         * with the equivalent document from the copy. */
-        final POIFSFileSystem opfs = new POIFSFileSystem(new File(originalFileName));
-        final POIFSFileSystem cpfs = new POIFSFileSystem(new File(copyFileName));
-
-        final DirectoryEntry oRoot = opfs.getRoot();
-        final DirectoryEntry cRoot = cpfs.getRoot();
-        final StringBuffer messages = new StringBuffer();
-        if (equal(oRoot, cRoot, messages)) {
-            System.out.println("Equal");
-        } else {
-            System.out.println("Not equal: " + messages.toString());
-        }
-        cpfs.close();
-        opfs.close();
-    }
-
-
-
-    /**
-     * <p>Compares two {@link DirectoryEntry} instances of a POI file system.
-     * The directories must contain the same streams with the same names and
-     * contents.</p>
-     *
-     * @param d1 The first directory.
-     * @param d2 The second directory.
-     * @param msg The method may append human-readable comparison messages to
-     * this string buffer. 
-     * @return <code>true</code> if the directories are equal, else
-     * <code>false</code>.
-     * @exception MarkUnsupportedException if a POI document stream does not
-     * support the mark() operation.
-     * @exception NoPropertySetStreamException if the application tries to
-     * create a property set from a POI document stream that is not a property
-     * set stream.
-     * @throws UnsupportedEncodingException 
-     * @exception IOException if any I/O exception occurs.
-     */
-    private static boolean equal(final DirectoryEntry d1,
-                                 final DirectoryEntry d2,
-                                 final StringBuffer msg)
-    throws NoPropertySetStreamException, MarkUnsupportedException,
-           UnsupportedEncodingException, IOException
-    {
-        boolean equal = true;
-        /* Iterate over d1 and compare each entry with its counterpart in d2. */
-        for (final Entry e1 : d1) {
-            final String n1 = e1.getName();
-            Entry e2 = null;
-            try {
-                e2 = d2.getEntry(n1);
-            } catch (FileNotFoundException ex) {
-                msg.append("Document \"" + e1 + "\" exists, document \"" +
-                           e2 + "\" does not.\n");
-                equal = false;
-                break;
-            }
-
-            if (e1.isDirectoryEntry() && e2.isDirectoryEntry()) {
-                equal = equal((DirectoryEntry) e1, (DirectoryEntry) e2, msg);
-            } else if (e1.isDocumentEntry() && e2.isDocumentEntry()) {
-                equal = equal((DocumentEntry) e1, (DocumentEntry) e2, msg);
-            } else {
-                msg.append("One of \"" + e1 + "\" and \"" + e2 + "\" is a " +
-                           "document while the other one is a directory.\n");
-                equal = false;
-            }
-        }
-
-        /* Iterate over d2 just to make sure that there are no entries in d2
-         * that are not in d1. */
-        for (final Entry e2 : d2) {
-            final String n2 = e2.getName();
-            Entry e1 = null;
-            try {
-                e1 = d1.getEntry(n2);
-            } catch (FileNotFoundException ex) {
-                msg.append("Document \"" + e2 + "\" exitsts, document \"" +
-                           e1 + "\" does not.\n");
-                equal = false;
-                break;
-            }
-        }
-        return equal;
-    }
-
-
-
-    /**
-     * <p>Compares two {@link DocumentEntry} instances of a POI file system.
-     * Documents that are not property set streams must be bitwise identical.
-     * Property set streams must be logically equal.</p>
-     *
-     * @param d1 The first document.
-     * @param d2 The second document.
-     * @param msg The method may append human-readable comparison messages to
-     * this string buffer. 
-     * @return <code>true</code> if the documents are equal, else
-     * <code>false</code>.
-     * @exception MarkUnsupportedException if a POI document stream does not
-     * support the mark() operation.
-     * @exception NoPropertySetStreamException if the application tries to
-     * create a property set from a POI document stream that is not a property
-     * set stream.
-     * @throws UnsupportedEncodingException 
-     * @exception IOException if any I/O exception occurs.
-     */
-    private static boolean equal(final DocumentEntry d1, final DocumentEntry d2,
-                                 final StringBuffer msg)
-    throws NoPropertySetStreamException, MarkUnsupportedException,
-           UnsupportedEncodingException, IOException
-    {
-        boolean equal = true;
-        final DocumentInputStream dis1 = new DocumentInputStream(d1);
-        final DocumentInputStream dis2 = new DocumentInputStream(d2);
-        try {
-            if (PropertySet.isPropertySetStream(dis1) &&
-                PropertySet.isPropertySetStream(dis2)) {
-                final PropertySet ps1 = PropertySetFactory.create(dis1);
-                final PropertySet ps2 = PropertySetFactory.create(dis2);
-                equal = ps1.equals(ps2);
-                if (!equal) {
-                    msg.append("Property sets are not equal.\n");
-                    return equal;
-                }
-            } else {
-                int i1;
-                int i2;
-                do {
-                    i1 = dis1.read();
-                    i2 = dis2.read();
-                    if (i1 != i2) {
-                        equal = false;
-                        msg.append("Documents are not equal.\n");
-                        break;
-                    }
-                } while (equal && i1 == -1);
-            }
-        } finally {
-            dis2.close();
-            dis1.close();
-        }
-        return true;
-    }
-
-
-
-    /**
-     * <p>This class does all the work. Its method {@link
-     * #processPOIFSReaderEvent(POIFSReaderEvent)} is called for each file in
-     * the original POI file system. Except for property set streams it copies
-     * everything unmodified to the destination POI filesystem. Property set
-     * streams are copied by creating a new {@link PropertySet} from the
-     * original property set by using the {@link
-     * MutablePropertySet#MutablePropertySet(PropertySet)} constructor.</p>
-     */
-    static class CopyFile implements POIFSReaderListener {
-        String dstName;
-        OutputStream out;
-        POIFSFileSystem poiFs;
-
-
-        /**
-         * <p>The constructor of a {@link CopyFile} instance creates the target
-         * POIFS. It also stores the name of the file the POIFS will be written
-         * to once it is complete.</p>
-         * 
-         * @param dstName The name of the disk file the destination POIFS is to
-         * be written to.
-         */
-        public CopyFile(final String dstName) {
-            this.dstName = dstName;
-            poiFs = new POIFSFileSystem();
-        }
-
-
-        /**
-         * <p>The method is called by POI's eventing API for each file in the
-         * origin POIFS.</p>
-         */
-        @Override
-        public void processPOIFSReaderEvent(final POIFSReaderEvent event) {
-            /* The following declarations are shortcuts for accessing the
-             * "event" object. */
-            final POIFSDocumentPath path = event.getPath();
-            final String name = event.getName();
-            final DocumentInputStream stream = event.getStream();
-
-            Throwable t = null;
-
-            try {
-                /* Find out whether the current document is a property set
-                 * stream or not. */
-                if (PropertySet.isPropertySetStream(stream)) {
-                    /* Yes, the current document is a property set stream.
-                     * Let's create a PropertySet instance from it. */
-                    PropertySet ps = null;
-                    try {
-                        ps = PropertySetFactory.create(stream);
-                    } catch (NoPropertySetStreamException ex) {
-                        /* This exception will not be thrown because we already
-                         * checked above. */
-                    }
-
-                    /* Copy the property set to the destination POI file
-                     * system. */
-                    copy(poiFs, path, name, ps);
-                } else {
-                    /* No, the current document is not a property set stream. We
-                     * copy it unmodified to the destination POIFS. */
-                    copy(poiFs, event.getPath(), event.getName(), stream);
-                }
-            } catch (MarkUnsupportedException ex) {
-                t = ex;
-            } catch (IOException ex) {
-                t = ex;
-            } catch (WritingNotSupportedException ex) {
-                t = ex;
-            }
-
-            /* According to the definition of the processPOIFSReaderEvent method
-             * we cannot pass checked exceptions to the caller. The following
-             * lines check whether a checked exception occured and throws an
-             * unchecked exception. The message of that exception is that of
-             * the underlying checked exception. */
-            if (t != null) {
-                throw new HPSFRuntimeException
-                    ("Could not read file \"" + path + "/" + name +
-                     "\". Reason: " + Util.toString(t));
-            }
-        }
-
-
-
-        /**
-         * <p>Writes a {@link PropertySet} to a POI filesystem.</p>
-         *
-         * @param poiFs The POI filesystem to write to.
-         * @param path The file's path in the POI filesystem.
-         * @param name The file's name in the POI filesystem.
-         * @param ps The property set to write.
-         * @throws WritingNotSupportedException 
-         * @throws IOException 
-         */
-        public void copy(final POIFSFileSystem poiFs,
-                         final POIFSDocumentPath path,
-                         final String name,
-                         final PropertySet ps)
-        throws WritingNotSupportedException, IOException {
-            final DirectoryEntry de = getPath(poiFs, path);
-            final MutablePropertySet mps = new MutablePropertySet(ps);
-            de.createDocument(name, mps.toInputStream());
-        }
-
-
-
-        /**
-         * <p>Copies the bytes from a {@link DocumentInputStream} to a new
-         * stream in a POI filesystem.</p>
-         *
-         * @param poiFs The POI filesystem to write to.
-         * @param path The source document's path.
-         * @param name The source document's name.
-         * @param stream The stream containing the source document.
-         * @throws IOException 
-         */
-        public void copy(final POIFSFileSystem poiFs,
-                         final POIFSDocumentPath path,
-                         final String name,
-                         final DocumentInputStream stream)
-        throws IOException {
-            final DirectoryEntry de = getPath(poiFs, path);
-            final ByteArrayOutputStream out = new ByteArrayOutputStream();
-            int c;
-            while ((c = stream.read()) != -1) {
-                out.write(c);
-            }
-            stream.close();
-            out.close();
-            final InputStream in =
-                new ByteArrayInputStream(out.toByteArray());
-            de.createDocument(name, in);
-        }
-
-
-        /**
-         * <p>Writes the POI file system to a disk file.</p>
-         *
-         * @throws FileNotFoundException
-         * @throws IOException
-         */
-        public void close() throws FileNotFoundException, IOException {
-            out = new FileOutputStream(dstName);
-            poiFs.writeFilesystem(out);
-            out.close();
-        }
-
-
-
-        /** Contains the directory paths that have already been created in the
-         * output POI filesystem and maps them to their corresponding
-         * {@link org.apache.poi.poifs.filesystem.DirectoryNode}s. */
-        private final Map<String,DirectoryEntry> paths = new HashMap<String,DirectoryEntry>();
-
-
-
-        /**
-         * <p>Ensures that the directory hierarchy for a document in a POI
-         * fileystem is in place. When a document is to be created somewhere in
-         * a POI filesystem its directory must be created first. This method
-         * creates all directories between the POI filesystem root and the
-         * directory the document should belong to which do not yet exist.</p>
-         * 
-         * <p>Unfortunately POI does not offer a simple method to interrogate
-         * the POIFS whether a certain child node (file or directory) exists in
-         * a directory. However, since we always start with an empty POIFS which
-         * contains the root directory only and since each directory in the
-         * POIFS is created by this method we can maintain the POIFS's directory
-         * hierarchy ourselves: The {@link DirectoryEntry} of each directory
-         * created is stored in a {@link Map}. The directories' path names map
-         * to the corresponding {@link DirectoryEntry} instances.</p>
-         *
-         * @param poiFs The POI filesystem the directory hierarchy is created
-         * in, if needed.
-         * @param path The document's path. This method creates those directory
-         * components of this hierarchy which do not yet exist.
-         * @return The directory entry of the document path's parent. The caller
-         * should use this {@link DirectoryEntry} to create documents in it.
-         */
-        public DirectoryEntry getPath(final POIFSFileSystem poiFs,
-                                      final POIFSDocumentPath path) {
-            try {
-                /* Check whether this directory has already been created. */
-                final String s = path.toString();
-                DirectoryEntry de = paths.get(s);
-                if (de != null)
-                    /* Yes: return the corresponding DirectoryEntry. */
-                    return de;
-
-                /* No: We have to create the directory - or return the root's
-                 * DirectoryEntry. */
-                int l = path.length();
-                if (l == 0) {
-                    /* Get the root directory. It does not have to be created
-                     * since it always exists in a POIFS. */
-                    de = poiFs.getRoot();
-                } else {
-                    /* Create a subordinate directory. The first step is to
-                     * ensure that the parent directory exists: */
-                    de = getPath(poiFs, path.getParent());
-                    /* Now create the target directory: */
-                    de = de.createDirectory(path.getComponent
-                                            (path.length() - 1));
-                }
-                paths.put(s, de);
-                return de;
-            } catch (IOException ex) {
-                /* This exception will be thrown if the directory already
-                 * exists. However, since we have full control about directory
-                 * creation we can ensure that this will never happen. */
-                ex.printStackTrace(System.err);
-                throw new RuntimeException(ex.toString());
-                /* FIXME (2): Replace the previous line by the following once we
-                 * no longer need JDK 1.3 compatibility. */
-                // throw new RuntimeException(ex);
-            }
-        }
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java b/trunk/src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java
deleted file mode 100644
index 81a9594..0000000
--- a/trunk/src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.examples;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Date;
-
-import org.apache.poi.hpsf.CustomProperties;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.UnexpectedPropertySetTypeException;
-import org.apache.poi.hpsf.WritingNotSupportedException;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-/**
- * <p>This is a sample application showing how to easily modify properties in
- * the summary information and in the document summary information. The
- * application reads the name of a POI filesystem from the command line and
- * performs the following actions:</p>
- *
- * <ul>
- *
- * <li><p>Open the POI filesystem.</p></li>
- *
- * <li><p>Read the summary information.</p></li>
- *
- * <li><p>Read and print the "author" property.</p></li>
- *
- * <li><p>Change the author to "Rainer Klute".</p></li>
- *
- * <li><p>Read the document summary information.</p></li>
- *
- * <li><p>Read and print the "category" property.</p></li>
- *
- * <li><p>Change the category to "POI example".</p></li>
- *
- * <li><p>Read the custom properties (if available).</p></li>
- *
- * <li><p>Insert a new custom property.</p></li>
- *
- * <li><p>Write the custom properties back to the document summary
- * information.</p></li>
- *
- * <li><p>Write the summary information to the POI filesystem.</p></li>
- *
- * <li><p>Write the document summary information to the POI filesystem.</p></li>
- *
- * <li><p>Write the POI filesystem back to the original file.</p></li>
- *
- * </ol>
- */
-public class ModifyDocumentSummaryInformation {
-
-    /**
-     * <p>Main method - see class description.</p>
-     *
-     * @param args The command-line parameters.
-     * @throws IOException
-     * @throws MarkUnsupportedException
-     * @throws NoPropertySetStreamException
-     * @throws UnexpectedPropertySetTypeException
-     * @throws WritingNotSupportedException
-     */
-    public static void main(final String[] args) throws IOException,
-            NoPropertySetStreamException, MarkUnsupportedException,
-            UnexpectedPropertySetTypeException, WritingNotSupportedException
-    {
-        /* Read the name of the POI filesystem to modify from the command line.
-         * For brevity to boundary check is performed on the command-line
-         * arguments. */
-        File summaryFile = new File(args[0]);
-
-        /* Open the POI filesystem. */
-        NPOIFSFileSystem poifs = new NPOIFSFileSystem(summaryFile, false);
-
-        /* Read the summary information. */
-        DirectoryEntry dir = poifs.getRoot();
-        SummaryInformation si;
-        try
-        {
-            si = (SummaryInformation)PropertySetFactory.create(
-                    dir, SummaryInformation.DEFAULT_STREAM_NAME);
-        }
-        catch (FileNotFoundException ex)
-        {
-            // There is no summary information yet. We have to create a new one
-            si = PropertySetFactory.newSummaryInformation();
-        }
-
-        /* Change the author to "Rainer Klute". Any former author value will
-         * be lost. If there has been no author yet, it will be created. */
-        si.setAuthor("Rainer Klute");
-        System.out.println("Author changed to " + si.getAuthor() + ".");
-
-
-        /* Handling the document summary information is analogous to handling
-         * the summary information. An additional feature, however, are the
-         * custom properties. */
-
-        /* Read the document summary information. */
-        DocumentSummaryInformation dsi;
-        try
-        {
-            dsi = (DocumentSummaryInformation)PropertySetFactory.create(
-                    dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        }
-        catch (FileNotFoundException ex)
-        {
-            /* There is no document summary information yet. We have to create a
-             * new one. */
-            dsi = PropertySetFactory.newDocumentSummaryInformation();
-        }
-
-        /* Change the category to "POI example". Any former category value will
-         * be lost. If there has been no category yet, it will be created. */
-        dsi.setCategory("POI example");
-        System.out.println("Category changed to " + dsi.getCategory() + ".");
-
-        /* Read the custom properties. If there are no custom properties yet,
-         * the application has to create a new CustomProperties object. It will
-         * serve as a container for custom properties. */
-        CustomProperties customProperties = dsi.getCustomProperties();
-        if (customProperties == null)
-            customProperties = new CustomProperties();
-
-        /* Insert some custom properties into the container. */
-        customProperties.put("Key 1", "Value 1");
-        customProperties.put("Schl\u00fcssel 2", "Wert 2");
-        customProperties.put("Sample Number", new Integer(12345));
-        customProperties.put("Sample Boolean", Boolean.TRUE);
-        customProperties.put("Sample Date", new Date());
-
-        /* Read a custom property. */
-        Object value = customProperties.get("Sample Number");
-        System.out.println("Custom Sample Number is now " + value);
-
-        /* Write the custom properties back to the document summary
-         * information. */
-        dsi.setCustomProperties(customProperties);
-
-        /* Write the summary information and the document summary information
-         * to the POI filesystem. */
-        si.write(dir, SummaryInformation.DEFAULT_STREAM_NAME);
-        dsi.write(dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-
-        /* Write the POI filesystem back to the original file. Please note that
-         * in production code you should take care when write directly to the 
-         * origin, to make sure you don't loose things on error */
-        poifs.writeFilesystem();
-        poifs.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hpsf/examples/ReadCustomPropertySets.java b/trunk/src/examples/src/org/apache/poi/hpsf/examples/ReadCustomPropertySets.java
deleted file mode 100644
index 9649842..0000000
--- a/trunk/src/examples/src/org/apache/poi/hpsf/examples/ReadCustomPropertySets.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.examples;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.Property;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.Section;
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-import org.apache.poi.util.HexDump;
-
-/**
- * <p>Sample application showing how to read a document's custom property set.
- * Call it with the document's file name as command-line parameter.</p>
- *
- * <p>Explanations can be found in the HPSF HOW-TO.</p>
- */
-public class ReadCustomPropertySets
-{
-
-    /**
-     * <p>Runs the example program.</p>
-     *
-     * @param args Command-line arguments (unused).
-     * @throws IOException if any I/O exception occurs.
-     */
-    public static void main(final String[] args)
-        throws IOException
-    {
-        final String filename = args[0];
-        POIFSReader r = new POIFSReader();
-
-        /* Register a listener for *all* documents. */
-        r.registerListener(new MyPOIFSReaderListener());
-        r.read(new FileInputStream(filename));
-    }
-
-
-    static class MyPOIFSReaderListener implements POIFSReaderListener
-    {
-        @Override
-        public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-        {
-            PropertySet ps = null;
-            try
-            {
-                ps = PropertySetFactory.create(event.getStream());
-            }
-            catch (NoPropertySetStreamException ex)
-            {
-                out("No property set stream: \"" + event.getPath() +
-                    event.getName() + "\"");
-                return;
-            }
-            catch (Exception ex)
-            {
-                throw new RuntimeException
-                    ("Property set stream \"" +
-                     event.getPath() + event.getName() + "\": " + ex);
-            }
-
-            /* Print the name of the property set stream: */
-            out("Property set stream \"" + event.getPath() +
-                event.getName() + "\":");
-
-            /* Print the number of sections: */
-            final long sectionCount = ps.getSectionCount();
-            out("   No. of sections: " + sectionCount);
-
-            /* Print the list of sections: */
-            List<Section> sections = ps.getSections();
-            int nr = 0;
-            for (Iterator<Section> i = sections.iterator(); i.hasNext();)
-            {
-                /* Print a single section: */
-                Section sec = i.next();
-                out("   Section " + nr++ + ":");
-                String s = hex(sec.getFormatID().getBytes());
-                s = s.substring(0, s.length() - 1);
-                out("      Format ID: " + s);
-
-                /* Print the number of properties in this section. */
-                int propertyCount = sec.getPropertyCount();
-                out("      No. of properties: " + propertyCount);
-
-                /* Print the properties: */
-                Property[] properties = sec.getProperties();
-                for (int i2 = 0; i2 < properties.length; i2++)
-                {
-                    /* Print a single property: */
-                    Property p = properties[i2];
-                    long id = p.getID();
-                    long type = p.getType();
-                    Object value = p.getValue();
-                    out("      Property ID: " + id + ", type: " + type +
-                        ", value: " + value);
-                }
-            }
-        }
-    }
-
-    static void out(final String msg)
-    {
-        System.out.println(msg);
-    }
-
-    static String hex(final byte[] bytes)
-    {
-        return HexDump.dump(bytes, 0L, 0);
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hpsf/examples/ReadTitle.java b/trunk/src/examples/src/org/apache/poi/hpsf/examples/ReadTitle.java
deleted file mode 100644
index 1805444..0000000
--- a/trunk/src/examples/src/org/apache/poi/hpsf/examples/ReadTitle.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.examples;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-
-/**
- * <p>Sample application showing how to read a OLE 2 document's
- * title. Call it with the document's file name as command line
- * parameter.</p>
- *
- * <p>Explanations can be found in the HPSF HOW-TO.</p>
- */
-public class ReadTitle
-{
-    /**
-     * <p>Runs the example program.</p>
-     *
-     * @param args Command-line arguments. The first command-line argument must
-     * be the name of a POI filesystem to read.
-     * @throws IOException if any I/O exception occurs.
-     */
-    public static void main(final String[] args) throws IOException
-    {
-        final String filename = args[0];
-        POIFSReader r = new POIFSReader();
-        r.registerListener(new MyPOIFSReaderListener(),
-                           "\005SummaryInformation");
-        r.read(new FileInputStream(filename));
-    }
-
-
-    static class MyPOIFSReaderListener implements POIFSReaderListener
-    {
-        @Override
-        public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-        {
-            SummaryInformation si = null;
-            try
-            {
-                si = (SummaryInformation)
-                    PropertySetFactory.create(event.getStream());
-            }
-            catch (Exception ex)
-            {
-                throw new RuntimeException
-                    ("Property set stream \"" +
-                     event.getPath() + event.getName() + "\": " + ex);
-            }
-            final String title = si.getTitle();
-            if (title != null)
-                System.out.println("Title: \"" + title + "\"");
-            else
-                System.out.println("Document has no title.");
-        }
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hpsf/examples/WriteAuthorAndTitle.java b/trunk/src/examples/src/org/apache/poi/hpsf/examples/WriteAuthorAndTitle.java
deleted file mode 100644
index d08d778..0000000
--- a/trunk/src/examples/src/org/apache/poi/hpsf/examples/WriteAuthorAndTitle.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.examples;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.hpsf.HPSFRuntimeException;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.MutablePropertySet;
-import org.apache.poi.hpsf.MutableSection;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.Util;
-import org.apache.poi.hpsf.Variant;
-import org.apache.poi.hpsf.WritingNotSupportedException;
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * <p>This class is a sample application which shows how to write or modify the
- * author and title property of an OLE 2 document. This could be done in two
- * different ways:</p>
- * 
- * <ul>
- * 
- * <li><p>The first approach is to open the OLE 2 file as a POI filesystem
- * (see class {@link POIFSFileSystem}), read the summary information property
- * set (see classes {@link SummaryInformation} and {@link PropertySet}), write
- * the author and title properties into it and write the property set back into
- * the POI filesystem.</p></li>
- * 
- * <li><p>The second approach does not modify the original POI filesystem, but
- * instead creates a new one. All documents from the original POIFS are copied
- * to the destination POIFS, except for the summary information stream. The
- * latter is modified by setting the author and title property before writing
- * it to the destination POIFS. It there are several summary information streams
- * in the original POIFS - e.g. in subordinate directories - they are modified
- * just the same.</p></li>
- * 
- * </ul>
- * 
- * <p>This sample application takes the second approach. It expects the name of
- * the existing POI filesystem's name as its first command-line parameter and
- * the name of the output POIFS as the second command-line argument. The
- * program then works as described above: It copies nearly all documents
- * unmodified from the input POI filesystem to the output POI filesystem. If it
- * encounters a summary information stream it reads its properties. Then it sets
- * the "author" and "title" properties to new values and writes the modified
- * summary information stream into the output file.</p>
- * 
- * <p>Further explanations can be found in the HPSF HOW-TO.</p>
- */
-public class WriteAuthorAndTitle
-{
-    /**
-     * <p>Runs the example program.</p>
-     *
-     * @param args Command-line arguments. The first command-line argument must
-     * be the name of a POI filesystem to read.
-     * @throws IOException if any I/O exception occurs.
-     */
-    public static void main(final String[] args) throws IOException
-    {
-        /* Check whether we have exactly two command-line arguments. */
-        if (args.length != 2)
-        {
-            System.err.println("Usage: " + WriteAuthorAndTitle.class.getName() +
-                               " originPOIFS destinationPOIFS");
-            System.exit(1);
-        }
-        
-        /* Read the names of the origin and destination POI filesystems. */
-        final String srcName = args[0];
-        final String dstName = args[1];
-
-        /* Read the origin POIFS using the eventing API. The real work is done
-         * in the class ModifySICopyTheRest which is registered here as a
-         * POIFSReader. */
-        final POIFSReader r = new POIFSReader();
-        final ModifySICopyTheRest msrl = new ModifySICopyTheRest(dstName);
-        r.registerListener(msrl);
-        FileInputStream fis = new FileInputStream(srcName);
-        r.read(fis);
-        fis.close();
-        
-        /* Write the new POIFS to disk. */
-        msrl.close();
-    }
-
-
-
-    /**
-     * <p>This class does all the work. As its name implies it modifies a
-     * summary information property set and copies everything else unmodified
-     * to the destination POI filesystem. Since an instance of it is registered
-     * as a {@link POIFSReader} its method {@link 
-     * #processPOIFSReaderEvent(POIFSReaderEvent)} is called for each document
-     * in the origin POIFS.</p>
-     */
-    static class ModifySICopyTheRest implements POIFSReaderListener
-    {
-        String dstName;
-        OutputStream out;
-        POIFSFileSystem poiFs;
-
-
-        /**
-         * <p>The constructor of a {@link ModifySICopyTheRest} instance creates
-         * the target POIFS. It also stores the name of the file the POIFS will
-         * be written to once it is complete.</p>
-         * 
-         * @param dstName The name of the disk file the destination POIFS is to
-         * be written to.
-         */
-        public ModifySICopyTheRest(final String dstName)
-        {
-            this.dstName = dstName;
-            poiFs = new POIFSFileSystem();
-        }
-
-
-        /**
-         * <p>The method is called by POI's eventing API for each file in the
-         * origin POIFS.</p>
-         */
-        @Override
-        public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-        {
-            /* The following declarations are shortcuts for accessing the
-             * "event" object. */
-            final POIFSDocumentPath path = event.getPath();
-            final String name = event.getName();
-            final DocumentInputStream stream = event.getStream();
-
-            Throwable t = null;
-
-            try
-            {
-                /* Find out whether the current document is a property set
-                 * stream or not. */
-                if (PropertySet.isPropertySetStream(stream))
-                {
-                    /* Yes, the current document is a property set stream.
-                     * Let's create a PropertySet instance from it. */
-                    PropertySet ps = null;
-                    try
-                    {
-                        ps = PropertySetFactory.create(stream);
-                    }
-                    catch (NoPropertySetStreamException ex)
-                    {
-                        /* This exception will not be thrown because we already
-                         * checked above. */
-                    }
-
-                    /* Now we know that we really have a property set. The next
-                     * step is to find out whether it is a summary information
-                     * or not. */
-                    if (ps.isSummaryInformation())
-                        /* Yes, it is a summary information. We will modify it
-                         * and write the result to the destination POIFS. */
-                        editSI(poiFs, path, name, ps);
-                    else
-                        /* No, it is not a summary information. We don't care
-                         * about its internals and copy it unmodified to the
-                         * destination POIFS. */
-                        copy(poiFs, path, name, ps);
-                }
-                else
-                    /* No, the current document is not a property set stream. We
-                     * copy it unmodified to the destination POIFS. */
-                    copy(poiFs, event.getPath(), event.getName(), stream);
-            }
-            catch (MarkUnsupportedException ex)
-            {
-                t = ex;
-            }
-            catch (IOException ex)
-            {
-                t = ex;
-            }
-            catch (WritingNotSupportedException ex)
-            {
-                t = ex;
-            }
-
-            /* According to the definition of the processPOIFSReaderEvent method
-             * we cannot pass checked exceptions to the caller. The following
-             * lines check whether a checked exception occured and throws an
-             * unchecked exception. The message of that exception is that of
-             * the underlying checked exception. */
-            if (t != null)
-            {
-                throw new HPSFRuntimeException
-                    ("Could not read file \"" + path + "/" + name +
-                     "\". Reason: " + Util.toString(t));
-            }
-        }
-
-
-        /**
-         * <p>Receives a summary information property set modifies (or creates)
-         * its "author" and "title" properties and writes the result under the
-         * same path and name as the origin to a destination POI filesystem.</p>
-         *
-         * @param poiFs The POI filesystem to write to.
-         * @param path The original (and destination) stream's path.
-         * @param name The original (and destination) stream's name.
-         * @param si The property set. It should be a summary information
-         * property set.
-         * @throws IOException 
-         * @throws WritingNotSupportedException 
-         */
-        public void editSI(final POIFSFileSystem poiFs,
-                           final POIFSDocumentPath path,
-                           final String name,
-                           final PropertySet si)
-        throws WritingNotSupportedException, IOException
-            
-        {
-            /* Get the directory entry for the target stream. */
-            final DirectoryEntry de = getPath(poiFs, path);
-
-            /* Create a mutable property set as a copy of the original read-only
-             * property set. */
-            final MutablePropertySet mps = new MutablePropertySet(si);
-            
-            /* Retrieve the section containing the properties to modify. A
-             * summary information property set contains exactly one section. */
-            final MutableSection s =
-                (MutableSection) mps.getSections().get(0);
-
-            /* Set the properties. */
-            s.setProperty(PropertyIDMap.PID_AUTHOR, Variant.VT_LPSTR,
-                          "Rainer Klute");
-            s.setProperty(PropertyIDMap.PID_TITLE, Variant.VT_LPWSTR,
-                          "Test");
-
-            /* Create an input stream containing the bytes the property set
-             * stream consists of. */
-            final InputStream pss = mps.toInputStream();
-
-            /* Write the property set stream to the POIFS. */
-            de.createDocument(name, pss);
-        }
-
-
-        /**
-         * <p>Writes a {@link PropertySet} to a POI filesystem. This method is
-         * simpler than {@link #editSI} because the origin property set has just
-         * to be copied.</p>
-         *
-         * @param poiFs The POI filesystem to write to.
-         * @param path The file's path in the POI filesystem.
-         * @param name The file's name in the POI filesystem.
-         * @param ps The property set to write.
-         * @throws WritingNotSupportedException 
-         * @throws IOException 
-         */
-        public void copy(final POIFSFileSystem poiFs,
-                         final POIFSDocumentPath path,
-                         final String name,
-                         final PropertySet ps)
-            throws WritingNotSupportedException, IOException
-        {
-            final DirectoryEntry de = getPath(poiFs, path);
-            final MutablePropertySet mps = new MutablePropertySet(ps);
-            de.createDocument(name, mps.toInputStream());
-        }
-
-
-
-        /**
-         * <p>Copies the bytes from a {@link DocumentInputStream} to a new
-         * stream in a POI filesystem.</p>
-         *
-         * @param poiFs The POI filesystem to write to.
-         * @param path The source document's path.
-         * @param name The source document's name.
-         * @param stream The stream containing the source document.
-         * @throws IOException 
-         */
-        public void copy(final POIFSFileSystem poiFs,
-                         final POIFSDocumentPath path,
-                         final String name,
-                         final DocumentInputStream stream) throws IOException
-        {
-            final DirectoryEntry de = getPath(poiFs, path);
-            final ByteArrayOutputStream out = new ByteArrayOutputStream();
-            int c;
-            while ((c = stream.read()) != -1)
-                out.write(c);
-            stream.close();
-            out.close();
-            final InputStream in =
-                new ByteArrayInputStream(out.toByteArray());
-            de.createDocument(name, in);
-        }
-
-
-        /**
-         * <p>Writes the POI file system to a disk file.</p>
-         *
-         * @throws FileNotFoundException
-         * @throws IOException
-         */
-        public void close() throws FileNotFoundException, IOException
-        {
-            out = new FileOutputStream(dstName);
-            poiFs.writeFilesystem(out);
-            out.close();
-        }
-
-
-
-        /** Contains the directory paths that have already been created in the
-         * output POI filesystem and maps them to their corresponding
-         * {@link org.apache.poi.poifs.filesystem.DirectoryNode}s. */
-        private final Map<String, DirectoryEntry> paths = new HashMap<String, DirectoryEntry>();
-
-
-
-        /**
-         * <p>Ensures that the directory hierarchy for a document in a POI
-         * fileystem is in place. When a document is to be created somewhere in
-         * a POI filesystem its directory must be created first. This method
-         * creates all directories between the POI filesystem root and the
-         * directory the document should belong to which do not yet exist.</p>
-         * 
-         * <p>Unfortunately POI does not offer a simple method to interrogate
-         * the POIFS whether a certain child node (file or directory) exists in
-         * a directory. However, since we always start with an empty POIFS which
-         * contains the root directory only and since each directory in the
-         * POIFS is created by this method we can maintain the POIFS's directory
-         * hierarchy ourselves: The {@link DirectoryEntry} of each directory
-         * created is stored in a {@link Map}. The directories' path names map
-         * to the corresponding {@link DirectoryEntry} instances.</p>
-         *
-         * @param poiFs The POI filesystem the directory hierarchy is created
-         * in, if needed.
-         * @param path The document's path. This method creates those directory
-         * components of this hierarchy which do not yet exist.
-         * @return The directory entry of the document path's parent. The caller
-         * should use this {@link DirectoryEntry} to create documents in it.
-         */
-        public DirectoryEntry getPath(final POIFSFileSystem poiFs,
-                                      final POIFSDocumentPath path)
-        {
-            try
-            {
-                /* Check whether this directory has already been created. */
-                final String s = path.toString();
-                DirectoryEntry de = paths.get(s);
-                if (de != null)
-                    /* Yes: return the corresponding DirectoryEntry. */
-                    return de;
-
-                /* No: We have to create the directory - or return the root's
-                 * DirectoryEntry. */
-                int l = path.length();
-                if (l == 0)
-                    /* Get the root directory. It does not have to be created
-                     * since it always exists in a POIFS. */
-                    de = poiFs.getRoot();
-                else
-                {
-                    /* Create a subordinate directory. The first step is to
-                     * ensure that the parent directory exists: */
-                    de = getPath(poiFs, path.getParent());
-                    /* Now create the target directory: */
-                    de = de.createDirectory(path.getComponent
-                                            (path.length() - 1));
-                }
-                paths.put(s, de);
-                return de;
-            }
-            catch (IOException ex)
-            {
-                /* This exception will be thrown if the directory already
-                 * exists. However, since we have full control about directory
-                 * creation we can ensure that this will never happen. */
-                ex.printStackTrace(System.err);
-                throw new RuntimeException(ex);
-            }
-        }
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hpsf/examples/WriteTitle.java b/trunk/src/examples/src/org/apache/poi/hpsf/examples/WriteTitle.java
deleted file mode 100644
index e57ef17..0000000
--- a/trunk/src/examples/src/org/apache/poi/hpsf/examples/WriteTitle.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hpsf.MutableProperty;
-import org.apache.poi.hpsf.MutablePropertySet;
-import org.apache.poi.hpsf.MutableSection;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.Variant;
-import org.apache.poi.hpsf.WritingNotSupportedException;
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * <p>This class is a simple sample application showing how to create a property
- * set and write it to disk.</p>
- */
-public class WriteTitle
-{
-    /**
-     * <p>Runs the example program.</p>
-     *
-     * @param args Command-line arguments. The first and only command-line 
-     * argument is the name of the POI file system to create.
-     * @throws IOException if any I/O exception occurs.
-     * @throws WritingNotSupportedException if HPSF does not (yet) support 
-     * writing a certain property type.
-     */
-    public static void main(final String[] args)
-    throws WritingNotSupportedException, IOException
-    {
-        /* Check whether we have exactly one command-line argument. */
-        if (args.length != 1)
-        {
-            System.err.println("Usage: " + WriteTitle.class.getName() +
-                               "destinationPOIFS");
-            System.exit(1);
-        }
-
-        final String fileName = args[0];
-
-        /* Create a mutable property set. Initially it contains a single section
-         * with no properties. */
-        final MutablePropertySet mps = new MutablePropertySet();
-
-        /* Retrieve the section the property set already contains. */
-        final MutableSection ms = (MutableSection) mps.getSections().get(0);
-
-        /* Turn the property set into a summary information property. This is
-         * done by setting the format ID of its first section to
-         * SectionIDMap.SUMMARY_INFORMATION_ID. */
-        ms.setFormatID(SectionIDMap.SUMMARY_INFORMATION_ID);
-
-        /* Create an empty property. */    
-        final MutableProperty p = new MutableProperty();
-
-        /* Fill the property with appropriate settings so that it specifies the
-         * document's title. */
-        p.setID(PropertyIDMap.PID_TITLE);
-        p.setType(Variant.VT_LPWSTR);
-        p.setValue("Sample title");
-
-        /* Place the property into the section. */
-        ms.setProperty(p);
-
-        /* Create the POI file system the property set is to be written to. */
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-
-        /* For writing the property set into a POI file system it has to be
-         * handed over to the POIFS.createDocument() method as an input stream
-         * which produces the bytes making out the property set stream. */
-        final InputStream is = mps.toInputStream();
-
-        /* Create the summary information property set in the POI file
-         * system. It is given the default name most (if not all) summary
-         * information property sets have. */
-        poiFs.createDocument(is, SummaryInformation.DEFAULT_STREAM_NAME);
-
-        /* Write the whole POI file system to a disk file. */
-        poiFs.writeFilesystem(new FileOutputStream(fileName));
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
deleted file mode 100644
index 578c3a6..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.sl.draw.DrawTableShape;
-import org.apache.poi.sl.draw.SLGraphics;
-import org.apache.poi.sl.usermodel.AutoShape;
-import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.TableCell;
-import org.apache.poi.sl.usermodel.TableShape;
-import org.apache.poi.sl.usermodel.TextBox;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.sl.usermodel.TextShape.TextPlaceholder;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-
-/**
- * Presentation for Fast Feather Track on ApacheconEU 2008
- *
- * @author Yegor Kozlov
- */
-public final class ApacheconEU08 {
-
-    public static void main(String[] args) throws IOException {
-        SlideShow<?,?> ppt = new HSLFSlideShow();
-        // SlideShow<?,?> ppt = new XMLSlideShow();
-        ppt.setPageSize(new Dimension(720, 540));
-
-        slide1(ppt);
-        slide2(ppt);
-        slide3(ppt);
-        slide4(ppt);
-        slide5(ppt);
-        slide6(ppt);
-        slide7(ppt);
-        slide8(ppt);
-        slide9(ppt);
-        slide10(ppt);
-        slide11(ppt);
-        slide12(ppt);
-
-        String ext = ppt.getClass().getName().contains("HSLF") ? "ppt" : "pptx";
-        FileOutputStream out = new FileOutputStream("apachecon_eu_08."+ext);
-        ppt.write(out);
-        out.close();
-        ppt.close();
-    }
-
-    public static void slide1(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.CENTER_TITLE);
-        box1.setText("POI-HSLF");
-        box1.setAnchor(new Rectangle(54, 78, 612, 115));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setTextPlaceholder(TextPlaceholder.CENTER_BODY);
-        box2.setText("Java API To Access Microsoft PowerPoint Format Files");
-        box2.setAnchor(new Rectangle(108, 204, 504, 138));
-
-        TextBox<?,?> box3 = slide.createTextBox();
-        box3.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(32d);
-        box3.setText(
-                "Yegor Kozlov\r" +
-                "yegor - apache - org");
-        box3.setHorizontalCentered(true);
-        box3.setAnchor(new Rectangle(206, 348, 310, 84));
-    }
-
-    public static void slide2(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.TITLE);
-        box1.setText("What is HSLF?");
-        box1.setAnchor(new Rectangle(36, 21, 648, 90));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setTextPlaceholder(TextPlaceholder.BODY);
-        box2.setText("HorribleSLideshowFormat is the POI Project's pure Java implementation " +
-                "of the Powerpoint binary file format. \r" +
-                "POI sub-project since 2005\r" +
-                "Started by Nick Burch, Yegor Kozlov joined soon after");
-        box2.setAnchor(new Rectangle(36, 126, 648, 356));
-    }
-
-    public static void slide3(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.TITLE);
-        box1.setText("HSLF in a Nutshell");
-        box1.setAnchor(new Rectangle(36, 15, 648, 65));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setTextPlaceholder(TextPlaceholder.BODY);
-        box2.setText(
-            "HSLF provides a way to read, create and modify MS PowerPoint presentations\r" +
-            "Pure Java API - you don't need PowerPoint to read and write *.ppt files\r" +
-            "Comprehensive support of PowerPoint objects\r" +
-                "Rich text\r" +
-                "Tables\r" +
-                "Shapes\r" +
-                "Pictures\r" +
-                "Master slides\r" +
-            "Access to low level data structures"
-        );
-
-        List<? extends TextParagraph<?,?,?>> tp = box2.getTextParagraphs();
-        for (int i : new byte[]{0,1,2,8}) {
-            tp.get(i).getTextRuns().get(0).setFontSize(28d);
-        }
-        for (int i : new byte[]{3,4,5,6,7}) {
-            tp.get(i).getTextRuns().get(0).setFontSize(24d);
-            tp.get(i).setIndentLevel(1);
-        }
-        box2.setAnchor(new Rectangle(36, 80, 648, 400));
-    }
-
-    public static void slide4(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        String[][] txt1 = {
-            {"Note"},
-            {"This presentation was created programmatically using POI HSLF"}
-        };
-        TableShape<?,?> table1 = slide.createTable(2, 1);
-        for (int i = 0; i < txt1.length; i++) {
-            for (int j = 0; j < txt1[i].length; j++) {
-                TableCell<?,?> cell = table1.getCell(i, j);
-                cell.setText(txt1[i][j]);
-                TextRun rt = cell.getTextParagraphs().get(0).getTextRuns().get(0);
-                rt.setFontSize(10d);
-                rt.setFontFamily("Arial");
-                rt.setBold(true);
-                if(i == 0){
-                    rt.setFontSize(32d);
-                    rt.setFontColor(Color.white);
-                    cell.setFillColor(new Color(0, 153, 204));
-                } else {
-                    rt.setFontSize(28d);
-                    cell.setFillColor(new Color(235, 239, 241));
-                }
-                cell.setVerticalAlignment(VerticalAlignment.MIDDLE);
-            }
-        }
-
-        DrawTableShape dts = new DrawTableShape(table1);
-        dts.setAllBorders(1.0, Color.black);
-        dts.setOutsideBorders(4.0);
-
-        table1.setColumnWidth(0, 450);
-        table1.setRowHeight(0, 50);
-        table1.setRowHeight(1, 80);
-
-        Dimension dim = ppt.getPageSize();
-        Rectangle2D oldAnchor = table1.getAnchor();
-        table1.setAnchor(new Rectangle2D.Double((dim.width-450)/2d, 100, oldAnchor.getWidth(), oldAnchor.getHeight()));
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setHorizontalCentered(true);
-        box1.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(24d);
-        box1.setText("The source code is available at\r" +
-                "http://people.apache.org/~yegor/apachecon_eu08/");
-        box1.setAnchor(new Rectangle(80, 356, 553, 65));
-    }
-
-    public static void slide5(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.TITLE);
-        box1.setText("HSLF in Action - 1\rData Extraction");
-        box1.setAnchor(new Rectangle(36, 21, 648, 100));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setTextPlaceholder(TextPlaceholder.BODY);
-        box2.setText(
-                "Text from slides and notes\r" +
-                "Images\r" +
-                "Shapes and their properties (type, position in the slide, color, font, etc.)");
-        box2.setAnchor(new Rectangle(36, 150, 648, 300));
-    }
-
-    public static void slide6(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.TITLE);
-        box1.setText("HSLF in Action - 2");
-        box1.setAnchor(new Rectangle(36, 20, 648, 90));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(18d);
-        box2.setText("Creating a simple presentation from scratch");
-        box2.setAnchor(new Rectangle(170, 100, 364, 30));
-
-        TextBox<?,?> box3 = slide.createTextBox();
-        TextRun rt3 = box3.getTextParagraphs().get(0).getTextRuns().get(0);
-        rt3.setFontFamily("Courier New");
-        rt3.setFontSize(8d);
-        box3.setText(
-                "SlideShow ppt = new SlideShow();\u000b" +
-                "Slide slide = ppt.createSlide();\u000b" +
-                "\u000b" +
-                "TextBox box2 = new TextBox();\u000b" +
-                "box2.setHorizontalAlignment(TextBox.AlignCenter);\u000b" +
-                "box2.setVerticalAlignment(TextBox.AnchorMiddle);\u000b" +
-                "box2.getTextRun().setText(\"Java Code\");\u000b" +
-                "box2.getFill().setForegroundColor(new Color(187, 224, 227));\u000b" +
-                "box2.setLineColor(Color.black);\u000b" +
-                "box2.setLineWidth(0.75);\u000b" +
-                "box2.setAnchor(new Rectangle(66, 243, 170, 170));\u000b" +
-                "slide.addShape(box2);\u000b" +
-                "\u000b" +
-                "TextBox box3 = new TextBox();\u000b" +
-                "box3.setHorizontalAlignment(TextBox.AlignCenter);\u000b" +
-                "box3.setVerticalAlignment(TextBox.AnchorMiddle);\u000b" +
-                "box3.getTextRun().setText(\"*.ppt file\");\u000b" +
-                "box3.setLineWidth(0.75);\u000b" +
-                "box3.setLineColor(Color.black);\u000b" +
-                "box3.getFill().setForegroundColor(new Color(187, 224, 227));\u000b" +
-                "box3.setAnchor(new Rectangle(473, 243, 170, 170));\u000b" +
-                "slide.addShape(box3);\u000b" +
-                "\u000b" +
-                "AutoShape box4 = new AutoShape(ShapeTypes.Arrow);\u000b" +
-                "box4.getFill().setForegroundColor(new Color(187, 224, 227));\u000b" +
-                "box4.setLineWidth(0.75);\u000b" +
-                "box4.setLineColor(Color.black);\u000b" +
-                "box4.setAnchor(new Rectangle(253, 288, 198, 85));\u000b" +
-                "slide.addShape(box4);\u000b" +
-                "\u000b" +
-                "FileOutputStream out = new FileOutputStream(\"hslf-demo.ppt\");\u000b" +
-                "ppt.write(out);\u000b" +
-                "out.close();");
-        box3.setAnchor(new Rectangle(30, 150, 618, 411));
-        box3.setHorizontalCentered(true);
-    }
-
-    public static void slide7(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setHorizontalCentered(true);
-        box2.setVerticalAlignment(VerticalAlignment.MIDDLE);
-        box2.setText("Java Code");
-        box2.setFillColor(new Color(187, 224, 227));
-        box2.setStrokeStyle(0.75, Color.black);
-        box2.setAnchor(new Rectangle(66, 243, 170, 170));
-
-        TextBox<?,?> box3 = slide.createTextBox();
-        box3.setHorizontalCentered(true);
-        box3.setVerticalAlignment(VerticalAlignment.MIDDLE);
-        box3.setText("*.ppt file");
-        box3.setFillColor(new Color(187, 224, 227));
-        box3.setStrokeStyle(0.75, Color.black);
-        box3.setAnchor(new Rectangle(473, 243, 170, 170));
-
-        AutoShape<?,?> box4 = slide.createAutoShape();
-        box4.setShapeType(ShapeType.RIGHT_ARROW);
-        box4.setFillColor(new Color(187, 224, 227));
-        box4.setStrokeStyle(0.75, Color.black);
-        box4.setAnchor(new Rectangle(253, 288, 198, 85));
-    }
-
-    public static void slide8(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.TITLE);
-        box1.setText("Wait, there is more!");
-        box1.setAnchor(new Rectangle(36, 21, 648, 90));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setTextPlaceholder(TextPlaceholder.BODY);
-        box2.setText(
-                "Rich text\r" +
-                "Tables\r" +
-                "Pictures (JPEG, PNG, BMP, WMF, PICT)\r" +
-                "Comprehensive formatting features");
-        box2.setAnchor(new Rectangle(36, 126, 648, 356));
-    }
-
-    public static void slide9(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.TITLE);
-        box1.setText("HSLF in Action - 3");
-        box1.setAnchor(new Rectangle(36, 20, 648, 50));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(18d);
-        box2.setText("PPGraphics2D: PowerPoint Graphics2D driver");
-        box2.setAnchor(new Rectangle(178, 70, 387, 30));
-
-        TextBox<?,?> box3 = slide.createTextBox();
-        TextRun rt3 = box3.getTextParagraphs().get(0).getTextRuns().get(0);
-        rt3.setFontFamily("Courier New");
-        rt3.setFontSize(8d);
-        box3.setText(
-                "//bar chart data. The first value is the bar color, the second is the width\u000b" +
-                "Object[] def = new Object[]{\u000b" +
-                "    Color.yellow, new Integer(100),\u000b" +
-                "    Color.green, new Integer(150),\u000b" +
-                "    Color.gray, new Integer(75),\u000b" +
-                "    Color.red, new Integer(200),\u000b" +
-                "};\u000b" +
-                "\u000b" +
-                "SlideShow ppt = new SlideShow();\u000b" +
-                "Slide slide = ppt.createSlide();\u000b" +
-                "\u000b" +
-                "ShapeGroup group = new ShapeGroup();\u000b" +
-                "//define position of the drawing in the slide\u000b" +
-                "Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);\u000b" +
-                "group.setAnchor(bounds);\u000b" +
-                "slide.addShape(group);\u000b" +
-                "Graphics2D graphics = new PPGraphics2D(group);\u000b" +
-                "\u000b" +
-                "//draw a simple bar graph\u000b" +
-                "int x = bounds.x + 50, y = bounds.y + 50;\u000b" +
-                "graphics.setFont(new Font(\"Arial\", Font.BOLD, 10));\u000b" +
-                "for (int i = 0, idx = 1; i < def.length; i+=2, idx++) {\u000b" +
-                "    graphics.setColor(Color.black);\u000b" +
-                "    int width = ((Integer)def[i+1]).intValue();\u000b" +
-                "    graphics.drawString(\"Q\" + idx, x-20, y+20);\u000b" +
-                "    graphics.drawString(width + \"%\", x + width + 10, y + 20);\u000b" +
-                "    graphics.setColor((Color)def[i]);\u000b" +
-                "    graphics.fill(new Rectangle(x, y, width, 30));\u000b" +
-                "    y += 40;\u000b" +
-                "}\u000b" +
-                "graphics.setColor(Color.black);\u000b" +
-                "graphics.setFont(new Font(\"Arial\", Font.BOLD, 14));\u000b" +
-                "graphics.draw(bounds);\u000b" +
-                "graphics.drawString(\"Performance\", x + 70, y + 40);\u000b" +
-                "\u000b" +
-                "FileOutputStream out = new FileOutputStream(\"hslf-demo.ppt\");\u000b" +
-                "ppt.write(out);\u000b" +
-                "out.close();");
-        box3.setAnchor(new Rectangle(96, 110, 499, 378));
-        box3.setHorizontalCentered(true);
-    }
-
-    public static void slide10(SlideShow<?,?> ppt) throws IOException {
-        //bar chart data. The first value is the bar color, the second is the width
-        Object[] def = new Object[]{
-            Color.yellow, 100,
-            Color.green, 150,
-            Color.gray, 75,
-            Color.red, 200,
-        };
-
-        Slide<?,?> slide = ppt.createSlide();
-
-        GroupShape<?,?> group = slide.createGroup();
-        //define position of the drawing in the slide
-        Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);
-        group.setAnchor(bounds);
-        Graphics2D graphics = new SLGraphics(group);
-
-        //draw a simple bar graph
-        int x = bounds.x + 50, y = bounds.y + 50;
-        graphics.setFont(new Font("Arial", Font.BOLD, 10));
-        for (int i = 0, idx = 1; i < def.length; i+=2, idx++) {
-            graphics.setColor(Color.black);
-            int width = ((Integer)def[i+1]).intValue();
-            graphics.drawString("Q" + idx, x-20, y+20);
-            graphics.drawString(width + "%", x + width + 10, y + 20);
-            graphics.setColor((Color)def[i]);
-            graphics.fill(new Rectangle(x, y, width, 30));
-            y += 40;
-        }
-        graphics.setColor(Color.black);
-        graphics.setFont(new Font("Arial", Font.BOLD, 14));
-        graphics.draw(bounds);
-        graphics.drawString("Performance", x + 70, y + 40);
-
-    }
-
-    public static void slide11(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.TITLE);
-        box1.setText("HSLF Development Plans");
-        box1.setAnchor(new Rectangle(36, 21, 648, 90));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setTextPlaceholder(TextPlaceholder.BODY);
-        box2.setText(
-            "Support for more PowerPoint functionality\r" +
-            "Rendering slides into java.awt.Graphics2D\r" +
-                "A way to export slides into images or other formats\r" +
-            "Integration with Apache FOP - Formatting Objects Processor\r" +
-                "Transformation of XSL-FO into PPT\r" +
-                "PPT2PDF transcoder"
-        );
-
-        List<? extends TextParagraph<?,?,?>> tp = box2.getTextParagraphs();
-        for (int i : new byte[]{0,1,3}) {
-            tp.get(i).getTextRuns().get(0).setFontSize(28d);
-        }
-        for (int i : new byte[]{2,4,5}) {
-            tp.get(i).getTextRuns().get(0).setFontSize(24d);
-            tp.get(i).setIndentLevel(1);
-        }
-        
-        box2.setAnchor(new Rectangle(36, 126, 648, 400));
-    }
-
-    public static void slide12(SlideShow<?,?> ppt) throws IOException {
-        Slide<?,?> slide = ppt.createSlide();
-
-        TextBox<?,?> box1 = slide.createTextBox();
-        box1.setTextPlaceholder(TextPlaceholder.CENTER_TITLE);
-        box1.setText("Questions?");
-        box1.setAnchor(new Rectangle(54, 167, 612, 115));
-
-        TextBox<?,?> box2 = slide.createTextBox();
-        box2.setTextPlaceholder(TextPlaceholder.CENTER_BODY);
-        box2.setText(
-                "http://poi.apache.org/hslf/\r" +
-                "http://people.apache.org/~yegor");
-        box2.setAnchor(new Rectangle(108, 306, 504, 138));
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java
deleted file mode 100644
index 3c706e3..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextBox;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-
-/**
- * How to create a single-level bulleted list
- * and change some of the bullet attributes
- *
- * @author Yegor Kozlov
- */
-public final class BulletsDemo {
-
-    public static void main(String[] args) throws Exception {
-
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-
-        HSLFTextBox shape = new HSLFTextBox();
-        HSLFTextParagraph rt = shape.getTextParagraphs().get(0);
-        rt.getTextRuns().get(0).setFontSize(42d);
-        rt.setBullet(true);
-        rt.setIndent(0d);  //bullet offset
-        rt.setLeftMargin(50d);   //text offset (should be greater than bullet offset)
-        rt.setBulletChar('\u263A'); //bullet character
-        shape.setText(
-                "January\r" +
-                "February\r" +
-                "March\r" +
-                "April");
-        slide.addShape(shape);
-
-        shape.setAnchor(new java.awt.Rectangle(50, 50, 500, 300));  //position of the text box in the slide
-        slide.addShape(shape);
-
-        FileOutputStream out = new FileOutputStream("bullets.ppt");
-        ppt.write(out);
-        out.close();
-   }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
deleted file mode 100644
index fc25afa..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.awt.Rectangle;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hslf.usermodel.HSLFHyperlink;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextBox;
-
-/**
- * Demonstrates how to create hyperlinks in PowerPoint presentations
- */
-public abstract class CreateHyperlink {
-    
-    public static void main(String[] args) throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slideA = ppt.createSlide();
-        ppt.createSlide();
-        HSLFSlide slideC = ppt.createSlide();
-
-        // link to a URL
-        HSLFTextBox textBox1 = slideA.createTextBox();
-        textBox1.setText("Apache POI");
-        textBox1.setAnchor(new Rectangle(100, 100, 200, 50));
-
-        HSLFHyperlink link1 = textBox1.getTextParagraphs().get(0).getTextRuns().get(0).createHyperlink();
-        link1.linkToUrl("http://www.apache.org");
-        link1.setLabel(textBox1.getText());
-
-        // link to another slide
-        HSLFTextBox textBox2 = slideA.createTextBox();
-        textBox2.setText("Go to slide #3");
-        textBox2.setAnchor(new Rectangle(100, 300, 200, 50));
-
-        HSLFHyperlink link2 = textBox2.getTextParagraphs().get(0).getTextRuns().get(0).createHyperlink();
-        link2.linkToSlide(slideC);
-
-        FileOutputStream out = new FileOutputStream("hyperlink.ppt");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
-   }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java
deleted file mode 100644
index 514c01b..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hslf.model.OLEShape;
-import org.apache.poi.hslf.usermodel.HSLFObjectData;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFPictureShape;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSoundData;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Range;
-
-/**
- * Demonstrates how you can extract misc embedded data from a ppt file
- *
- * @author Yegor Kozlov
- */
-public final class DataExtraction {
-
-    public static void main(String args[]) throws Exception {
-
-        if (args.length == 0) {
-            usage();
-            return;
-        }
-
-        FileInputStream is = new FileInputStream(args[0]);
-        HSLFSlideShow ppt = new HSLFSlideShow(is);
-        is.close();
-
-        //extract all sound files embedded in this presentation
-        HSLFSoundData[] sound = ppt.getSoundData();
-        for (int i = 0; i < sound.length; i++) {
-            String type = sound[i].getSoundType();  //*.wav
-            String name = sound[i].getSoundName();  //typically file name
-            byte[] data = sound[i].getData();       //raw bytes
-
-            //save the sound  on disk
-            FileOutputStream out = new FileOutputStream(name + type);
-            out.write(data);
-            out.close();
-        }
-
-        int oleIdx=-1, picIdx=-1;
-        for (HSLFSlide slide : ppt.getSlides()) {
-            //extract embedded OLE documents
-            for (HSLFShape shape : slide.getShapes()) {
-                if (shape instanceof OLEShape) {
-                    oleIdx++;
-                    OLEShape ole = (OLEShape) shape;
-                    HSLFObjectData data = ole.getObjectData();
-                    String name = ole.getInstanceName();
-                    if ("Worksheet".equals(name)) {
-
-                        //read xls
-                        @SuppressWarnings({ "unused", "resource" })
-                        HSSFWorkbook wb = new HSSFWorkbook(data.getData());
-
-                    } else if ("Document".equals(name)) {
-                        HWPFDocument doc = new HWPFDocument(data.getData());
-                        //read the word document
-                        Range r = doc.getRange();
-                        for(int k = 0; k < r.numParagraphs(); k++) {
-                            Paragraph p = r.getParagraph(k);
-                            System.out.println(p.text());
-                         }
-
-                        //save on disk
-                        FileOutputStream out = new FileOutputStream(name + "-("+(oleIdx)+").doc");
-                        doc.write(out);
-                        out.close();
-                     }  else {
-                        FileOutputStream out = new FileOutputStream(ole.getProgID() + "-"+(oleIdx+1)+".dat");
-                        InputStream dis = data.getData();
-                        byte[] chunk = new byte[2048];
-                        int count;
-                        while ((count = dis.read(chunk)) >= 0) {
-                          out.write(chunk,0,count);
-                        }
-                        is.close();
-                        out.close();
-                    }
-                }
-                
-                //Pictures
-                else if (shape instanceof HSLFPictureShape) {
-                    picIdx++;
-                    HSLFPictureShape p = (HSLFPictureShape) shape;
-                    HSLFPictureData data = p.getPictureData();
-                    String ext = data.getType().extension;
-                    FileOutputStream out = new FileOutputStream("pict-" + picIdx + ext);
-                    out.write(data.getData());
-                    out.close();
-                }
-            }
-
-        }
-    }
-
-    private static void usage(){
-        System.out.println("Usage: DataExtraction  ppt");
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
deleted file mode 100644
index 53cd53e..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.io.FileOutputStream;
-
-import org.apache.poi.hslf.model.PPGraphics2D;
-import org.apache.poi.hslf.usermodel.HSLFGroupShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-
-/**
- * Demonstrates how to draw into a slide using the HSLF Graphics2D driver.
- *
- * @author Yegor Kozlov
- */
-public final class Graphics2DDemo {
-
-    /**
-     * A simple bar chart demo
-     */
-    public static void main(String[] args) throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        //bar chart data. The first value is the bar color, the second is the width
-        Object[] def = new Object[]{
-            Color.yellow, 40,
-            Color.green, 60,
-            Color.gray, 30,
-            Color.red, 80,
-        };
-
-        HSLFSlide slide = ppt.createSlide();
-
-        HSLFGroupShape group = new HSLFGroupShape();
-        //define position of the drawing in the slide
-        Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);
-        group.setAnchor(bounds);
-        group.setInteriorAnchor(new java.awt.Rectangle(0, 0, 100, 100));
-        slide.addShape(group);
-        Graphics2D graphics = new PPGraphics2D(group);
-
-        //draw a simple bar graph
-        int x = 10, y = 10;
-        graphics.setFont(new Font("Arial", Font.BOLD, 10));
-        for (int i = 0, idx = 1; i < def.length; i+=2, idx++) {
-            graphics.setColor(Color.black);
-            int width = ((Integer)def[i+1]).intValue();
-            graphics.drawString("Q" + idx, x-5, y+10);
-            graphics.drawString(width + "%", x + width+3, y + 10);
-            graphics.setColor((Color)def[i]);
-            graphics.fill(new Rectangle(x, y, width, 10));
-            y += 15;
-        }
-        graphics.setColor(Color.black);
-        graphics.setFont(new Font("Arial", Font.BOLD, 14));
-        graphics.draw(group.getInteriorAnchor());
-        graphics.drawString("Performance", x + 30, y + 10);
-
-        FileOutputStream out = new FileOutputStream("hslf-graphics.ppt");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
deleted file mode 100644
index b37aed2..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hslf.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-
-/**
- * Demonstrates how to set headers / footers
- */
-public abstract class HeadersFootersDemo {
-    public static void main(String[] args) throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        
-        HeadersFooters slideHeaders = ppt.getSlideHeadersFooters();
-        slideHeaders.setFootersText("Created by POI-HSLF");
-        slideHeaders.setSlideNumberVisible(true);
-        slideHeaders.setDateTimeText("custom date time");
-
-        HeadersFooters notesHeaders = ppt.getNotesHeadersFooters();
-        notesHeaders.setFootersText("My notes footers");
-        notesHeaders.setHeaderText("My notes header");
-
-        ppt.createSlide();
-
-        FileOutputStream out = new FileOutputStream("headers_footers.ppt");
-        ppt.write(out);
-        out.close();
-
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java
deleted file mode 100644
index 8124292..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.io.FileInputStream;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.hslf.usermodel.HSLFHyperlink;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSimpleShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-
-/**
- * Demonstrates how to read hyperlinks from  a presentation
- *
- * @author Yegor Kozlov
- */
-public final class Hyperlinks {
-
-    public static void main(String[] args) throws Exception {
-        for (int i = 0; i < args.length; i++) {
-            FileInputStream is = new FileInputStream(args[i]);
-            HSLFSlideShow ppt = new HSLFSlideShow(is);
-            is.close();
-
-            for (HSLFSlide slide : ppt.getSlides()) {
-                System.out.println("\nslide " + slide.getSlideNumber());
-
-                // read hyperlinks from the slide's text runs
-                System.out.println("- reading hyperlinks from the text runs");
-                for (List<HSLFTextParagraph> paras : slide.getTextParagraphs()) {
-                    for (HSLFTextParagraph para : paras) {
-                        for (HSLFTextRun run : para) {
-                            HSLFHyperlink link = run.getHyperlink();
-                            if (link != null) {
-                                System.out.println(toStr(link, run.getRawText()));
-                            }
-                        }
-                    }
-                }
-
-                // in PowerPoint you can assign a hyperlink to a shape without text,
-                // for example to a Line object. The code below demonstrates how to
-                // read such hyperlinks
-                System.out.println("- reading hyperlinks from the slide's shapes");
-                for (HSLFShape sh : slide.getShapes()) {
-                    if (sh instanceof HSLFSimpleShape) {
-                        HSLFHyperlink link = ((HSLFSimpleShape)sh).getHyperlink();
-                        if (link != null) {
-                            System.out.println(toStr(link, null));
-                        }
-                    }
-                }
-            }
-            ppt.close();
-        }
-   }
-
-    static String toStr(HSLFHyperlink link, String rawText) {
-        //in ppt end index is inclusive
-        String formatStr = "title: %1$s, address: %2$s" + (rawText == null ? "" : ", start: %3$s, end: %4$s, substring: %5$s");
-        return String.format(Locale.ROOT, formatStr, link.getLabel(), link.getAddress(), link.getStartIndex(), link.getEndIndex(), rawText);
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
deleted file mode 100644
index d8fe8f4..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-
-/**
- * Demonstrates how you can use HSLF to convert each slide into a PNG image
- *
- * @author Yegor Kozlov
- */
-public final class PPT2PNG {
-
-    public static void main(String args[]) throws Exception {
-
-        if (args.length == 0) {
-            usage();
-            return;
-        }
-
-        int slidenum = -1;
-        float scale = 1;
-        String file = null;
-
-        for (int i = 0; i < args.length; i++) {
-            if (args[i].startsWith("-")) {
-                if ("-scale".equals(args[i])){
-                    scale = Float.parseFloat(args[++i]);
-                } else if ("-slide".equals(args[i])) {
-                    slidenum = Integer.parseInt(args[++i]);
-                }
-            } else {
-                file = args[i];
-            }
-        }
-        if(file == null){
-            usage();
-            return;
-        }
-
-        FileInputStream is = new FileInputStream(file);
-        HSLFSlideShow ppt = new HSLFSlideShow(is);
-        is.close();
-
-        Dimension pgsize = ppt.getPageSize();
-        int width = (int)(pgsize.width*scale);
-        int height = (int)(pgsize.height*scale);
-
-        for (HSLFSlide slide : ppt.getSlides()) {
-            if (slidenum != -1 && slidenum != slide.getSlideNumber()) continue;
-
-            String title = slide.getTitle();
-            System.out.println("Rendering slide "+slide.getSlideNumber() + (title == null ? "" : ": " + title));
-
-            BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-            Graphics2D graphics = img.createGraphics();
-            graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-            graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-            graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-
-            graphics.setPaint(Color.white);
-            graphics.fill(new Rectangle2D.Float(0, 0, width, height));
-
-            graphics.scale((double)width/pgsize.width, (double)height/pgsize.height);
-
-            slide.draw(graphics);
-
-            String fname = file.replaceAll("\\.ppt", "-" + slide.getSlideNumber() + ".png");
-            FileOutputStream out = new FileOutputStream(fname);
-            ImageIO.write(img, "png", out);
-            out.close();
-        }
-    }
-
-    private static void usage(){
-        System.out.println("Usage: PPT2PNG [-scale <scale> -slide <num>] ppt");
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java
deleted file mode 100644
index ec0cec8..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hslf.examples;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.poi.hslf.record.InteractiveInfoAtom;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSoundData;
-
-/**
- * For each slide iterate over shapes and found associated sound data.
- */
-public class SoundFinder {
-    public static void main(String[] args) throws IOException {
-        FileInputStream fis = new FileInputStream(args[0]);
-        HSLFSlideShow ppt = new HSLFSlideShow(fis);
-        HSLFSoundData[] sounds = ppt.getSoundData();
-
-        for (HSLFSlide slide : ppt.getSlides()) {
-            for (HSLFShape shape : slide.getShapes()) {
-                int soundRef = getSoundReference(shape);
-                if(soundRef == -1) continue;
-
-                
-                System.out.println("Slide["+slide.getSlideNumber()+"], shape["+shape.getShapeId()+"], soundRef: "+soundRef);
-                System.out.println("  " + sounds[soundRef].getSoundName());
-                System.out.println("  " + sounds[soundRef].getSoundType());
-            }
-        }
-        ppt.close();
-        fis.close();
-    }
-
-    /**
-     * Check if a given shape is associated with a sound.
-     * @return 0-based reference to a sound in the sound collection
-     * or -1 if the shape is not associated with a sound
-     */
-    protected static int getSoundReference(HSLFShape shape){
-        int soundRef = -1;
-        //dive into the shape container and search for InteractiveInfoAtom
-        InteractiveInfoAtom info = shape.getClientDataRecord(RecordTypes.InteractiveInfo.typeID);
-        if (info != null && info.getAction() == InteractiveInfoAtom.ACTION_MEDIA) {
-            soundRef = info.getSoundRef();
-        }
-        return soundRef;
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java b/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java
deleted file mode 100644
index e4ad98d..0000000
--- a/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.examples;
-
-import java.awt.Color;
-import java.io.FileOutputStream;
-
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTable;
-import org.apache.poi.hslf.usermodel.HSLFTableCell;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-import org.apache.poi.sl.draw.DrawTableShape;
-import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-
-/**
- * Demonstrates how to create tables
- *
- * @author Yegor Kozlov
- */
-public final class TableDemo {
-
-    public static void main(String[] args) throws Exception {
-
-        //test data for the first taable
-        String[][] txt1 = {
-            {"INPUT FILE", "NUMBER OF RECORDS"},
-            {"Item File", "11,559"},
-            {"Vendor File", "502"},
-            {"Purchase History File - # of PO\u2019s\r(12/01/04 - 05/31/06)", "12,852"},
-            {"Purchase History File - # of PO Lines\r(12/01/04 - 05/31/06)", "53,523" },
-            {"Total PO History Spend", "$10,172,038"}
-        };
-
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-
-        //six rows, two columns
-        HSLFTable table1 = slide.createTable(6, 2);
-        for (int i = 0; i < txt1.length; i++) {
-            for (int j = 0; j < txt1[i].length; j++) {
-                HSLFTableCell cell = table1.getCell(i, j);
-                HSLFTextRun rt = cell.getTextParagraphs().get(0).getTextRuns().get(0);
-                rt.setFontFamily("Arial");
-                rt.setFontSize(10d);
-                if(i == 0){
-                    cell.getFill().setForegroundColor(new Color(227, 227, 227));
-                } else {
-                    rt.setBold(true);
-                }
-                cell.setVerticalAlignment(VerticalAlignment.MIDDLE);
-                cell.setHorizontalCentered(true);
-                cell.setText(txt1[i][j]);
-            }
-        }
-
-        DrawTableShape dts1 = new DrawTableShape(table1);
-        dts1.setAllBorders(1.0, Color.black);
-
-        table1.setColumnWidth(0, 300);
-        table1.setColumnWidth(1, 150);
-
-        int pgWidth = ppt.getPageSize().width;
-        table1.moveTo((pgWidth - table1.getAnchor().getWidth())/2., 100.);
-
-        //test data for the second taable
-        String[][] txt2 = {
-            {"Data Source"},
-            {"CAS Internal Metrics - Item Master Summary\r" +
-             "CAS Internal Metrics - Vendor Summary\r" +
-             "CAS Internal Metrics - PO History Summary"}
-        };
-
-        //two rows, one column
-        HSLFTable table2 = slide.createTable(2, 1);
-        for (int i = 0; i < txt2.length; i++) {
-            for (int j = 0; j < txt2[i].length; j++) {
-                HSLFTableCell cell = table2.getCell(i, j);
-                HSLFTextRun rt = cell.getTextParagraphs().get(0).getTextRuns().get(0);
-                rt.setFontSize(10d);
-                rt.setFontFamily("Arial");
-                if(i == 0){
-                    cell.getFill().setForegroundColor(new Color(0, 51, 102));
-                    rt.setFontColor(Color.white);
-                    rt.setBold(true);
-                    rt.setFontSize(14d);
-                    cell.setHorizontalCentered(true);
-                } else {
-                    rt.getTextParagraph().setBullet(true);
-                    rt.setFontSize(12d);
-                    rt.getTextParagraph().setTextAlign(TextAlign.LEFT);
-                    cell.setHorizontalCentered(false);
-                }
-                cell.setVerticalAlignment(VerticalAlignment.MIDDLE);
-                cell.setText(txt2[i][j]);
-            }
-        }
-        table2.setColumnWidth(0, 300);
-        table2.setRowHeight(0, 30);
-        table2.setRowHeight(1, 70);
-
-        DrawTableShape dts2 = new DrawTableShape(table2);
-        dts2.setOutsideBorders(Color.black, 1.0);
-
-        table2.moveTo(200, 400);
-
-        FileOutputStream out = new FileOutputStream("hslf-table.ppt");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hsmf/examples/Msg2txt.java b/trunk/src/examples/src/org/apache/poi/hsmf/examples/Msg2txt.java
deleted file mode 100644
index bf018a3..0000000
--- a/trunk/src/examples/src/org/apache/poi/hsmf/examples/Msg2txt.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.examples;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-
-/**
- * Reads one or several Outlook MSG files and for each of them creates
- * a text file from available chunks and a directory that contains
- * attachments.
- * 
- * @author Bruno Girin
- */
-public class Msg2txt {
-	
-	/**
-	 * The stem used to create file names for the text file and the directory
-	 * that contains the attachments.
-	 */
-	private String fileNameStem;
-	
-	/**
-	 * The Outlook MSG file being processed.
-	 */
-	private MAPIMessage msg;
-	
-	public Msg2txt(String fileName) throws IOException {
-		fileNameStem = fileName;
-		if(fileNameStem.endsWith(".msg") || fileNameStem.endsWith(".MSG")) {
-			fileNameStem = fileNameStem.substring(0, fileNameStem.length() - 4);
-		}
-		msg = new MAPIMessage(fileName);
-	}
-	
-	/**
-	 * Processes the message.
-	 * 
-	 * @throws IOException if an exception occurs while writing the message out
-	 */
-	public void processMessage() throws IOException {
-		String txtFileName = fileNameStem + ".txt";
-		String attDirName = fileNameStem + "-att";
-		PrintWriter txtOut = null;
-		try {
-			txtOut = new PrintWriter(txtFileName);
-			try {
-				String displayFrom = msg.getDisplayFrom();
-				txtOut.println("From: "+displayFrom);
-			} catch (ChunkNotFoundException e) {
-				// ignore
-			}
-			try {
-				String displayTo = msg.getDisplayTo();
-				txtOut.println("To: "+displayTo);
-			} catch (ChunkNotFoundException e) {
-				// ignore
-			}
-			try {
-				String displayCC = msg.getDisplayCC();
-				txtOut.println("CC: "+displayCC);
-			} catch (ChunkNotFoundException e) {
-				// ignore
-			}
-			try {
-				String displayBCC = msg.getDisplayBCC();
-				txtOut.println("BCC: "+displayBCC);
-			} catch (ChunkNotFoundException e) {
-				// ignore
-			}
-			try {
-				String subject = msg.getSubject();
-				txtOut.println("Subject: "+subject);
-			} catch (ChunkNotFoundException e) {
-				// ignore
-			}
-			try {
-				String body = msg.getTextBody();
-				txtOut.println(body);
-			} catch (ChunkNotFoundException e) {
-				System.err.println("No message body");
-			}
-			
-			AttachmentChunks[] attachments = msg.getAttachmentFiles();
-			if(attachments.length > 0) {
-				File d = new File(attDirName);
-				if(d.mkdir()) {
-					for(AttachmentChunks attachment : attachments) {
-						processAttachment(attachment, d);
-					}
-				} else {
-					System.err.println("Can't create directory "+attDirName);
-				}
-			}
-		} finally {
-			if(txtOut != null) {
-				txtOut.close();
-			}
-		}
-	}
-	
-	/**
-	 * Processes a single attachment: reads it from the Outlook MSG file and
-	 * writes it to disk as an individual file.
-	 *
-	 * @param attachment the chunk group describing the attachment
-	 * @param dir the directory in which to write the attachment file
-	 * @throws IOException when any of the file operations fails
-	 */
-	public void processAttachment(AttachmentChunks attachment, 
-	      File dir) throws IOException {
-	   String fileName = attachment.attachFileName.toString();
-	   if(attachment.attachLongFileName != null) {
-	      fileName = attachment.attachLongFileName.toString();
-	   }
-	   
-		File f = new File(dir, fileName);
-		OutputStream fileOut = null;
-		try {
-			fileOut = new FileOutputStream(f);
-			fileOut.write(attachment.attachData.getValue());
-		} finally {
-			if(fileOut != null) {
-				fileOut.close();
-			}
-		}
-	}
-	
-	/**
-	 * Processes the list of arguments as a list of names of Outlook MSG files.
-	 * 
-	 * @param args the list of MSG files to process
-	 */
-	public static void main(String[] args) {
-		if(args.length <= 0) {
-			System.err.println("No files names provided");
-		} else {
-			for(int i = 0; i < args.length; i++) {
-				try {
-					Msg2txt processor = new Msg2txt(args[i]);
-					processor.processMessage();
-				} catch (IOException e) {
-					System.err.println("Could not process "+args[i]+": "+e);
-				}
-			}
-		}
-	}
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java b/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java
deleted file mode 100644
index 610d961..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel.examples;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
-import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
-import org.apache.poi.hssf.eventusermodel.HSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFRequest;
-import org.apache.poi.hssf.eventusermodel.MissingRecordAwareHSSFListener;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.BoolErrRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.LabelRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.RKRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * A XLS -> CSV processor, that uses the MissingRecordAware
- *  EventModel code to ensure it outputs all columns and rows.
- * @author Nick Burch
- */
-public class XLS2CSVmra implements HSSFListener {
-	private int minColumns;
-	private POIFSFileSystem fs;
-	private PrintStream output;
-
-	private int lastRowNumber;
-	private int lastColumnNumber;
-
-	/** Should we output the formula, or the value it has? */
-	private boolean outputFormulaValues = true;
-
-	/** For parsing Formulas */
-	private SheetRecordCollectingListener workbookBuildingListener;
-	private HSSFWorkbook stubWorkbook;
-
-	// Records we pick up as we process
-	private SSTRecord sstRecord;
-	private FormatTrackingHSSFListener formatListener;
-	
-	/** So we known which sheet we're on */
-	private int sheetIndex = -1;
-	private BoundSheetRecord[] orderedBSRs;
-	private List<BoundSheetRecord> boundSheetRecords = new ArrayList<BoundSheetRecord>();
-
-	// For handling formulas with string results
-	private int nextRow;
-	private int nextColumn;
-	private boolean outputNextStringRecord;
-
-	/**
-	 * Creates a new XLS -> CSV converter
-	 * @param fs The POIFSFileSystem to process
-	 * @param output The PrintStream to output the CSV to
-	 * @param minColumns The minimum number of columns to output, or -1 for no minimum
-	 */
-	public XLS2CSVmra(POIFSFileSystem fs, PrintStream output, int minColumns) {
-		this.fs = fs;
-		this.output = output;
-		this.minColumns = minColumns;
-	}
-
-	/**
-	 * Creates a new XLS -> CSV converter
-	 * @param filename The file to process
-	 * @param minColumns The minimum number of columns to output, or -1 for no minimum
-	 * @throws IOException
-	 * @throws FileNotFoundException
-	 */
-	public XLS2CSVmra(String filename, int minColumns) throws IOException, FileNotFoundException {
-		this(
-				new POIFSFileSystem(new FileInputStream(filename)),
-				System.out, minColumns
-		);
-	}
-
-	/**
-	 * Initiates the processing of the XLS file to CSV
-	 */
-	public void process() throws IOException {
-		MissingRecordAwareHSSFListener listener = new MissingRecordAwareHSSFListener(this);
-		formatListener = new FormatTrackingHSSFListener(listener);
-
-		HSSFEventFactory factory = new HSSFEventFactory();
-		HSSFRequest request = new HSSFRequest();
-
-		if(outputFormulaValues) {
-			request.addListenerForAllRecords(formatListener);
-		} else {
-			workbookBuildingListener = new SheetRecordCollectingListener(formatListener);
-			request.addListenerForAllRecords(workbookBuildingListener);
-		}
-
-		factory.processWorkbookEvents(request, fs);
-	}
-
-	/**
-	 * Main HSSFListener method, processes events, and outputs the
-	 *  CSV as the file is processed.
-	 */
-	@Override
-    public void processRecord(Record record) {
-		int thisRow = -1;
-		int thisColumn = -1;
-		String thisStr = null;
-
-		switch (record.getSid())
-		{
-		case BoundSheetRecord.sid:
-			boundSheetRecords.add((BoundSheetRecord)record);
-			break;
-		case BOFRecord.sid:
-			BOFRecord br = (BOFRecord)record;
-			if(br.getType() == BOFRecord.TYPE_WORKSHEET) {
-				// Create sub workbook if required
-				if(workbookBuildingListener != null && stubWorkbook == null) {
-					stubWorkbook = workbookBuildingListener.getStubHSSFWorkbook();
-				}
-				
-				// Output the worksheet name
-				// Works by ordering the BSRs by the location of
-				//  their BOFRecords, and then knowing that we
-				//  process BOFRecords in byte offset order
-				sheetIndex++;
-				if(orderedBSRs == null) {
-					orderedBSRs = BoundSheetRecord.orderByBofPosition(boundSheetRecords);
-				}
-				output.println();
-				output.println( 
-						orderedBSRs[sheetIndex].getSheetname() +
-						" [" + (sheetIndex+1) + "]:"
-				);
-			}
-			break;
-
-		case SSTRecord.sid:
-			sstRecord = (SSTRecord) record;
-			break;
-
-		case BlankRecord.sid:
-			BlankRecord brec = (BlankRecord) record;
-
-			thisRow = brec.getRow();
-			thisColumn = brec.getColumn();
-			thisStr = "";
-			break;
-		case BoolErrRecord.sid:
-			BoolErrRecord berec = (BoolErrRecord) record;
-
-			thisRow = berec.getRow();
-			thisColumn = berec.getColumn();
-			thisStr = "";
-			break;
-
-		case FormulaRecord.sid:
-			FormulaRecord frec = (FormulaRecord) record;
-
-			thisRow = frec.getRow();
-			thisColumn = frec.getColumn();
-
-			if(outputFormulaValues) {
-				if(Double.isNaN( frec.getValue() )) {
-					// Formula result is a string
-					// This is stored in the next record
-					outputNextStringRecord = true;
-					nextRow = frec.getRow();
-					nextColumn = frec.getColumn();
-				} else {
-					thisStr = formatListener.formatNumberDateCell(frec);
-				}
-			} else {
-				thisStr = '"' +
-					HSSFFormulaParser.toFormulaString(stubWorkbook, frec.getParsedExpression()) + '"';
-			}
-			break;
-		case StringRecord.sid:
-			if(outputNextStringRecord) {
-				// String for formula
-				StringRecord srec = (StringRecord)record;
-				thisStr = srec.getString();
-				thisRow = nextRow;
-				thisColumn = nextColumn;
-				outputNextStringRecord = false;
-			}
-			break;
-
-		case LabelRecord.sid:
-			LabelRecord lrec = (LabelRecord) record;
-
-			thisRow = lrec.getRow();
-			thisColumn = lrec.getColumn();
-			thisStr = '"' + lrec.getValue() + '"';
-			break;
-		case LabelSSTRecord.sid:
-			LabelSSTRecord lsrec = (LabelSSTRecord) record;
-
-			thisRow = lsrec.getRow();
-			thisColumn = lsrec.getColumn();
-			if(sstRecord == null) {
-				thisStr = '"' + "(No SST Record, can't identify string)" + '"';
-			} else {
-				thisStr = '"' + sstRecord.getString(lsrec.getSSTIndex()).toString() + '"';
-			}
-			break;
-		case NoteRecord.sid:
-			NoteRecord nrec = (NoteRecord) record;
-
-			thisRow = nrec.getRow();
-			thisColumn = nrec.getColumn();
-			// TODO: Find object to match nrec.getShapeId()
-			thisStr = '"' + "(TODO)" + '"';
-			break;
-		case NumberRecord.sid:
-			NumberRecord numrec = (NumberRecord) record;
-
-			thisRow = numrec.getRow();
-			thisColumn = numrec.getColumn();
-
-			// Format
-			thisStr = formatListener.formatNumberDateCell(numrec);
-			break;
-		case RKRecord.sid:
-			RKRecord rkrec = (RKRecord) record;
-
-			thisRow = rkrec.getRow();
-			thisColumn = rkrec.getColumn();
-			thisStr = '"' + "(TODO)" + '"';
-			break;
-		default:
-			break;
-		}
-
-		// Handle new row
-		if(thisRow != -1 && thisRow != lastRowNumber) {
-			lastColumnNumber = -1;
-		}
-
-		// Handle missing column
-		if(record instanceof MissingCellDummyRecord) {
-			MissingCellDummyRecord mc = (MissingCellDummyRecord)record;
-			thisRow = mc.getRow();
-			thisColumn = mc.getColumn();
-			thisStr = "";
-		}
-
-		// If we got something to print out, do so
-		if(thisStr != null) {
-			if(thisColumn > 0) {
-				output.print(',');
-			}
-			output.print(thisStr);
-		}
-
-		// Update column and row count
-		if(thisRow > -1)
-			lastRowNumber = thisRow;
-		if(thisColumn > -1)
-			lastColumnNumber = thisColumn;
-
-		// Handle end of row
-		if(record instanceof LastCellOfRowDummyRecord) {
-			// Print out any missing commas if needed
-			if(minColumns > 0) {
-				// Columns are 0 based
-				if(lastColumnNumber == -1) { lastColumnNumber = 0; }
-				for(int i=lastColumnNumber; i<(minColumns); i++) {
-					output.print(',');
-				}
-			}
-
-			// We're onto a new row
-			lastColumnNumber = -1;
-
-			// End the row
-			output.println();
-		}
-	}
-
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Use:");
-			System.err.println("  XLS2CSVmra <xls file> [min columns]");
-			System.exit(1);
-		}
-
-		int minColumns = -1;
-		if(args.length >= 2) {
-			minColumns = Integer.parseInt(args[1]);
-		}
-
-		XLS2CSVmra xls2csv = new XLS2CSVmra(args[0], minColumns);
-		xls2csv.process();
-	}
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java
deleted file mode 100644
index 9b86cf7..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java
+++ /dev/null
@@ -1,944 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFPatriarch;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-
-
-/**
- * Demonstrates how to add an image to a worksheet and set that image's size
- * to a specific number of milimetres irrespective of the width of the columns
- * or height of the rows. Overridden methods are provided so that the location
- * of the image - the cells row and column co-ordinates that define the top
- * left hand corners of the image - can be identified either in the familiar
- * Excel manner - A1 for instance - or using POI's methodolody of a column and
- * row index where 0, 0 would indicate cell A1.
- *
- * The best way to make use of these techniques is to delay adding the image to
- * the sheet until all other work has been completed. That way, the sizes of
- * all rows and columns will have been adjusted - assuming that step was
- * necessary. Even though the anchors type is set to prevent the image moving
- * or re-sizing, this setting does not have any effect until the sheet is being
- * viewed using the Excel application.
- *
- * The key to the process is the HSSFClientAnchor class. It accepts eight
- * parameters that define, in order;
- *
- *      * How far - in terms of co-ordinate position - the image should be inset
- *      from the left hand border of a cell.
- *      * How far - in terms of co-ordinate positions - the image should be inset
- *      from the from the top of the cell.
- *      * How far - in terms of co-ordinate positions - the right hand edge of
- *      the image should protrude into a cell (measured from the cell's left hand
- *      edge to the image's right hand edge).
- *      * How far - in terms of co-ordinate positions - the bottm edge of the
- *      image should protrude into a row (measured from the cell's top edge to
- *      the image's bottom edge).
- *      * The index of the column that contains the cell whose top left hand
- *      corner should be aligned with the top left hand corner of the image.
- *      * The index of the row that contains the cell whose top left hand corner
- *      should be aligned with the image's top left hand corner.
- *      * The index of the column that contains the cell whose top left hand
- *      corner should be aligned with the image's bottom right hand corner
- *      * The index number of the row that contains the cell whose top left
- *      hand corner should be aligned with the images bottom right hand corner.
- *
- * It can be used to add an image into cell A1, for example, in the following
- * manner;
- *
- *      HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0,
- *          (short)0, 0, (short)1, 1);
- *
- * The final four parameters determine that the top left hand corner should be
- * aligned with the top left hand corner of cell A1 and it's bottom right
- * hand corner with the top left hand corner of cell B2. Think of the image as
- * being stretched so that it's top left hand corner is aligned with the top
- * left hand corner of cell A1 and it's bottom right hand corner is aligned with
- * the top left hand corner of cell B1. Interestingly, this would also produce
- * the same results;
- *
- *       anchor = new HSSFClientAnchor(0, 0, 1023, 255,
- *          (short)0, 0, (short)0, 0);
- *
- * Note that the final four parameters all contain the same value and seem to
- * indicate that the images top left hand corner is aligned with the top left
- * hand corner of cell A1 and that it's bottom right hand corner is also
- * aligned with the top left hand corner of cell A1. Yet, running this code
- * would see the image fully occupying cell A1. That is the result of the
- * values passed to parameters three and four; these I have referred to as
- * determing the images co-ordinates within the cell. They indicate that the
- * image should occupy - in order - the full width of the column and the full
- * height of the row.
- *
- * The co-ordinate values shown are the maxima; and they are independent of
- * row height/column width and of the font used. Passing 255 will always result
- * in the image occupying the full height of the row and passing 1023 will
- * always result in the image occupying the full width of the column. They help
- * in situations where an image is larger than a column/row and must overlap
- * into the next column/row. Using them does mean, however, that it is often
- * necessary to perform conversions between Excel's characters units, points,
- * pixels and millimetres in order to establish how many rows/columns an image
- * should occupy and just what the varous insets ought to be.
- *
- * Note that the first two parameters of the HSSFClientAchor classes constructor
- * are not made use of in the code that follows. It would be fairly trivial
- * however to extend these example further and provide methods that would centre
- * an image within a cell or allow the user to specify that a plain border a
- * fixed number of millimetres wide should wrap around the image. Those first
- * two parameters would make this sort of functionality perfectly possible.
- *
- * Owing to the various conversions used, the actual size of the image may vary
- * from that required; testing has so far found this to be in the region of
- * plus or minus two millimetres. Most likely by modifying the way the
- * calculations are performed - possibly using double(s) throughout and
- * rounding the values at the correct point - it is likely that these errors
- * could be reduced or removed.
- *
- * A note concerning Excels' image resizing behaviour. The HSSFClientAnchor
- * class contains a method called setAnchorType(int) which can be used to
- * determine how Excel will resize an image in reponse to the user increasing
- * or decreasing the dimensions of the cell containing the image. There are 
- * three values that can be passed to this method; 0 = To move and size the 
- * image with the cell, 2 = To move but don't size the image with the cell,
- * 3 = To prevent the image from moving or being resized along with the cell. If
- * an image is inserted using this class and placed into a single cell then if
- * the setAnchorType(int) method is called and a value of either 0 or 2 passed
- * to it, the resultant resizing behaviour may be a surprise. The image will not
- * grow in size of the column is made wider or the row higher but it will shrink
- * if the columns width or rows height are reduced.
- *
- * @author Mark Beardsley [msb at apache.org]
- * @version 1.00 5th August 2009.
- */
-public class AddDimensionedImage {
-
-    // Four constants that determine how - and indeed whether - the rows
-    // and columns an image may overlie should be expanded to accomodate that
-    // image.
-    // Passing EXPAND_ROW will result in the height of a row being increased
-    // to accomodate the image if it is not already larger. The image will
-    // be layed across one or more columns.
-    // Passing EXPAND_COLUMN will result in the width of the column being
-    // increased to accomodate the image if it is not already larger. The image
-    // will be layed across one or many rows.
-    // Passing EXPAND_ROW_AND_COLUMN will result in the height of the row
-    // bing increased along with the width of the column to accomdate the
-    // image if either is not already larger.
-    // Passing OVERLAY_ROW_AND_COLUMN will result in the image being layed
-    // over one or more rows and columns. No row or column will be resized,
-    // instead, code will determine how many rows and columns the image should
-    // overlie.
-    public static final int EXPAND_ROW = 1;
-    public static final int EXPAND_COLUMN = 2;
-    public static final int EXPAND_ROW_AND_COLUMN = 3;
-    public static final int OVERLAY_ROW_AND_COLUMN = 7;
-
-    /**
-     * Add an image to a worksheet.
-     *
-     * @param cellNumber A String that contains the location of the cell whose
-     *                   top left hand corner should be aligned with the top
-     *                   left hand corner of the image; for example "A1", "A2"
-     *                   etc. This is to support the familiar Excel syntax.
-     *                   Whilst images are are not actually inserted into cells
-     *                   this provides a convenient method of indicating where
-     *                   the image should be positioned on the sheet.
-     * @param sheet A reference to the sheet that contains the cell referenced
-     *              above.
-     * @param imageFile A String that encapsulates the name of and path to
-     *                  the image that is to be 'inserted into' the sheet.
-     * @param reqImageWidthMM A primitive double that contains the required
-     *                        width of the image in millimetres.
-     * @param reqImageHeightMM A primitive double that contains the required
-     *                         height of the image in millimetres.
-     * @param resizeBehaviour A primitive int whose value will determine how
-     *                        the code should react if the image is larger than
-     *                        the cell referenced by the cellNumber parameter.
-     *                        Four constants are provided to determine what
-     *                        should happen;
-     *                          AddDimensionedImage.EXPAND_ROW
-     *                          AddDimensionedImage.EXPAND_COLUMN
-     *                          AddDimensionedImage.EXPAND_ROW_AND_COLUMN
-     *                          AddDimensionedImage.OVERLAY_ROW_AND_COLUMN
-     * @throws java.io.FileNotFoundException If the file containing the image
-     *                                       cannot be located.
-     * @throws java.io.IOException If a problem occurs whilst reading the file
-     *                             of image data.
-     * @throws java.lang.IllegalArgumentException If an invalid value is passed
-     *                                            to the resizeBehaviour
-     *                                            parameter.
-     */
-    public void addImageToSheet(String cellNumber, HSSFSheet sheet,
-            String imageFile, double reqImageWidthMM, double reqImageHeightMM,
-            int resizeBehaviour) throws IOException, IllegalArgumentException {
-        // Convert the String into column and row indices then chain the
-        // call to the overridden addImageToSheet() method.
-        CellReference cellRef = new CellReference(cellNumber);
-        this.addImageToSheet(cellRef.getCol(), cellRef.getRow(), sheet,
-                imageFile, reqImageWidthMM, reqImageHeightMM,resizeBehaviour);
-    }
-
-    /**
-     * Add an image to a worksheet.
-     *
-     * @param colNumber A primitive int that contains the index number of a
-     *                  column on the worksheet; POI column indices are zero
-     *                  based. Together with the rowNumber parameter's value,
-     *                  this parameter identifies a cell on the worksheet. The
-     *                  image's top left hand corner will be aligned with the
-     *                  top left hand corner of this cell.
-     * @param rowNumber A primtive int that contains the index number of a row
-     *                  on the worksheet; POI row indices are zero based.
-     *                  Together with the rowNumber parameter's value, this
-     *                  parameter identifies a cell on the worksheet. The
-     *                  image's top left hand corner will be aligned with the
-     *                  top left hand corner of this cell.
-     * @param sheet A reference to the sheet that contains the cell identified
-     *              by the two parameters above.
-     * @param imageFile A String that encapsulates the name of and path to
-     *                  the image that is to be 'inserted into' the sheet.
-     * @param reqImageWidthMM A primitive double that contains the required
-     *                        width of the image in millimetres.
-     * @param reqImageHeightMM A primitive double that contains the required
-     *                         height of the image in millimetres.
-     * @param resizeBehaviour A primitive int whose value will determine how
-     *                        the code should react if the image is larger than
-     *                        the cell referenced by the colNumber and
-     *                        rowNumber parameters. Four constants are provided
-     *                        to determine what should happen;
-     *                          AddDimensionedImage.EXPAND_ROW
-     *                          AddDimensionedImage.EXPAND_COLUMN
-     *                          AddDimensionedImage.EXPAND_ROW_AND_COLUMN
-     *                          AddDimensionedImage.OVERLAY_ROW_AND_COLUMN
-     * @throws java.io.FileNotFoundException If the file containing the image
-     *                                       cannot be located.
-     * @throws java.io.IOException If a problem occurs whilst reading the file
-     *                             of image data.
-     * @throws java.lang.IllegalArgumentException If an invalid value is passed
-     *                                            to the resizeBehaviour
-     *                                            parameter.
-     */
-    private void addImageToSheet(int colNumber, int rowNumber, HSSFSheet sheet,
-            String imageFile, double reqImageWidthMM, double reqImageHeightMM,
-            int resizeBehaviour) throws FileNotFoundException, IOException,
-                                                     IllegalArgumentException  {
-        HSSFClientAnchor anchor = null;
-        HSSFPatriarch patriarch = null;
-        ClientAnchorDetail rowClientAnchorDetail = null;
-        ClientAnchorDetail colClientAnchorDetail = null;
-
-        // Validate the resizeBehaviour parameter.
-        if((resizeBehaviour != AddDimensionedImage.EXPAND_COLUMN) &&
-           (resizeBehaviour != AddDimensionedImage.EXPAND_ROW) &&
-           (resizeBehaviour != AddDimensionedImage.EXPAND_ROW_AND_COLUMN) &&
-           (resizeBehaviour != AddDimensionedImage.OVERLAY_ROW_AND_COLUMN)) {
-            throw new IllegalArgumentException("Invalid value passed to the " +
-                    "resizeBehaviour parameter of AddDimensionedImage.addImageToSheet()");
-        }
-
-        // Call methods to calculate how the image and sheet should be
-        // manipulated to accomodate the image; columns and then rows.
-        colClientAnchorDetail = this.fitImageToColumns(sheet, colNumber,
-                reqImageWidthMM, resizeBehaviour);
-        rowClientAnchorDetail = this.fitImageToRows(sheet, rowNumber,
-                reqImageHeightMM, resizeBehaviour);
-
-        // Having determined if and how to resize the rows, columns and/or the
-        // image, create the HSSFClientAnchor object to position the image on
-        // the worksheet. Note how the two ClientAnchorDetail records are
-        // interrogated to recover the row/column co-ordinates and any insets.
-        // The first two parameters are not used currently but could be if the
-        // need arose to extend the functionality of this code by adding the
-        // ability to specify that a clear 'border' be placed around the image.
-        anchor = new HSSFClientAnchor(0,
-                                      0,
-                                      colClientAnchorDetail.getInset(),
-                                      rowClientAnchorDetail.getInset(),
-                                      (short)colClientAnchorDetail.getFromIndex(),
-                                      rowClientAnchorDetail.getFromIndex(),
-                                      (short)colClientAnchorDetail.getToIndex(),
-                                      rowClientAnchorDetail.getToIndex());
-
-        // For now, set the anchor type to do not move or resize the
-        // image as the size of the row/column is adjusted. This could easilly
-        // become another parameter passed to the method.
-        //anchor.setAnchorType(HSSFClientAnchor.DONT_MOVE_AND_RESIZE);
-        anchor.setAnchorType(AnchorType.MOVE_AND_RESIZE);
-        
-        // Now, add the picture to the workbook. Note that the type is assumed
-        // to be a JPEG/JPG, this could easily (and should) be parameterised
-        // however.
-        //int index = sheet.getWorkbook().addPicture(this.imageToBytes(imageFile),
-        //            HSSFWorkbook.PICTURE_TYPE_JPEG);
-        int index = sheet.getWorkbook().addPicture(this.imageToBytes(imageFile), HSSFWorkbook.PICTURE_TYPE_PNG);
-
-        // Get the drawing patriarch and create the picture.
-        patriarch = sheet.createDrawingPatriarch();
-        patriarch.createPicture(anchor, index);
-    }
-
-    /**
-     * Determines whether the sheets columns should be re-sized to accomodate
-     * the image, adjusts the columns width if necessary and creates then
-     * returns a ClientAnchorDetail object that facilitates construction of
-     * an HSSFClientAnchor that will fix the image on the sheet and establish
-     * it's size.
-     *
-     * @param sheet A reference to the sheet that will 'contain' the image.
-     * @param colNumber A primtive int that contains the index number of a
-     *                  column on the sheet.
-     * @param reqImageWidthMM A primtive double that contains the required
-     *                        width of the image in millimetres
-     * @param resizeBehaviour A primitve int whose value will indicate how the
-     *                        width of the column should be adjusted if the
-     *                        required width of the image is greater than the
-     *                        width of the column.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the column containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number column containing the cell whose top
-     *         left hand corner also defines the bottom right hand corner of
-     *         the image and an inset that determines how far the right hand
-     *         edge of the image can protrude into the next column - expressed
-     *         as a specific number of co-ordinate positions.
-     */
-    private ClientAnchorDetail fitImageToColumns(HSSFSheet sheet, int colNumber,
-            double reqImageWidthMM, int resizeBehaviour) {
-
-        double colWidthMM = 0.0D;
-        double colCoordinatesPerMM = 0.0D;
-        int pictureWidthCoordinates = 0;
-        ClientAnchorDetail colClientAnchorDetail = null;
-
-        // Get the colum's width in millimetres
-        colWidthMM = ConvertImageUnits.widthUnits2Millimetres(
-                (short)sheet.getColumnWidth(colNumber));
-
-        // Check that the column's width will accomodate the image at the
-        // required dimension. If the width of the column is LESS than the
-        // required width of the image, decide how the application should
-        // respond - resize the column or overlay the image across one or more
-        // columns.
-        if(colWidthMM < reqImageWidthMM) {
-
-            // Should the column's width simply be expanded?
-            if((resizeBehaviour == AddDimensionedImage.EXPAND_COLUMN) ||
-               (resizeBehaviour == AddDimensionedImage.EXPAND_ROW_AND_COLUMN)) {
-                // Set the width of the column by converting the required image
-                // width from millimetres into Excel's column width units.
-                sheet.setColumnWidth(colNumber,
-                        ConvertImageUnits.millimetres2WidthUnits(reqImageWidthMM));
-                // To make the image occupy the full width of the column, convert
-                // the required width of the image into co-ordinates. This value
-                // will become the inset for the ClientAnchorDetail class that
-                // is then instantiated.
-                colWidthMM = reqImageWidthMM;
-                colCoordinatesPerMM = ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS /
-                    colWidthMM;
-                pictureWidthCoordinates = (int)(reqImageWidthMM * colCoordinatesPerMM);
-                colClientAnchorDetail = new ClientAnchorDetail(colNumber,
-                        colNumber, pictureWidthCoordinates);
-            }
-            // If the user has chosen to overlay both rows and columns or just
-            // to expand ONLY the size of the rows, then calculate how to lay
-            // the image out across one or more columns.
-            else if ((resizeBehaviour == AddDimensionedImage.OVERLAY_ROW_AND_COLUMN) ||
-                     (resizeBehaviour == AddDimensionedImage.EXPAND_ROW)) {
-                colClientAnchorDetail = this.calculateColumnLocation(sheet,
-                        colNumber, reqImageWidthMM);
-            }
-        }
-        // If the column is wider than the image.
-        else {
-            // Mow many co-ordinate positions are there per millimetre?
-            colCoordinatesPerMM = ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS /
-                    colWidthMM;
-            // Given the width of the image, what should be it's co-ordinate?
-            pictureWidthCoordinates = (int)(reqImageWidthMM * colCoordinatesPerMM);
-            colClientAnchorDetail = new ClientAnchorDetail(colNumber,
-                    colNumber, pictureWidthCoordinates);
-        }
-        return(colClientAnchorDetail);
-    }
-
-    /**
-     * Determines whether the sheet's row should be re-sized to accomodate
-     * the image, adjusts the rows height if necessary and creates then
-     * returns a ClientAnchorDetail object that facilitates construction of
-     * an HSSFClientAnchor that will fix the image on the sheet and establish
-     * it's size.
-     *
-     * @param sheet A reference to the sheet that will 'contain' the image.
-     * @param rowNumber A primtive int that contains the index number of a
-     *                  row on the sheet.
-     * @param reqImageHeightMM A primtive double that contains the required
-     *                         height of the image in millimetres
-     * @param resizeBehaviour A primitve int whose value will indicate how the
-     *                        height of the row should be adjusted if the
-     *                        required height of the image is greater than the
-     *                        height of the row.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the row containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number of the row containing the cell whose
-     *         top left hand corner also defines the bottom right hand
-     *         corner of the image and an inset that determines how far the
-     *         bottom edge of the image can protrude into the next (lower)
-     *         row - expressed as a specific number of co-ordinate positions.
-     */
-    private ClientAnchorDetail fitImageToRows(HSSFSheet sheet, int rowNumber,
-            double reqImageHeightMM, int resizeBehaviour) {
-        HSSFRow row = null;
-        double rowHeightMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
-        int pictureHeightCoordinates = 0;
-        ClientAnchorDetail rowClientAnchorDetail = null;
-
-        // Get the row and it's height
-        row = sheet.getRow(rowNumber);
-        if(row == null) {
-            // Create row if it does not exist.
-            row = sheet.createRow(rowNumber);
-        }
-
-        // Get the row's height in millimetres
-        rowHeightMM = row.getHeightInPoints() / ConvertImageUnits.POINTS_PER_MILLIMETRE;
-
-        // Check that the row's height will accomodate the image at the required
-        // dimensions. If the height of the row is LESS than the required height
-        // of the image, decide how the application should respond - resize the
-        // row or overlay the image across a series of rows.
-        if(rowHeightMM < reqImageHeightMM) {
-            if((resizeBehaviour == AddDimensionedImage.EXPAND_ROW) ||
-               (resizeBehaviour == AddDimensionedImage.EXPAND_ROW_AND_COLUMN)) {
-                row.setHeightInPoints((float)(reqImageHeightMM *
-                        ConvertImageUnits.POINTS_PER_MILLIMETRE));
-                rowHeightMM = reqImageHeightMM;
-                rowCoordinatesPerMM = ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS /
-                    rowHeightMM;
-                pictureHeightCoordinates = (int)(reqImageHeightMM * rowCoordinatesPerMM);
-                rowClientAnchorDetail = new ClientAnchorDetail(rowNumber,
-                        rowNumber, pictureHeightCoordinates);
-            }
-            // If the user has chosen to overlay both rows and columns or just
-            // to expand ONLY the size of the columns, then calculate how to lay
-            // the image out ver one or more rows.
-            else if((resizeBehaviour == AddDimensionedImage.OVERLAY_ROW_AND_COLUMN) ||
-                    (resizeBehaviour == AddDimensionedImage.EXPAND_COLUMN)) {
-                rowClientAnchorDetail = this.calculateRowLocation(sheet,
-                        rowNumber, reqImageHeightMM);
-            }
-        }
-        // Else, if the image is smaller than the space available
-        else {
-            rowCoordinatesPerMM = ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS /
-                    rowHeightMM;
-            pictureHeightCoordinates = (int)(reqImageHeightMM * rowCoordinatesPerMM);
-            rowClientAnchorDetail = new ClientAnchorDetail(rowNumber,
-                        rowNumber, pictureHeightCoordinates);
-        }
-        return(rowClientAnchorDetail);
-    }
-
-    /**
-     * If the image is to overlie more than one column, calculations need to be
-     * performed to determine how many columns and whether the image will
-     * overlie just a part of one column in order to be presented at the
-     * required size.
-     *
-     * @param sheet The sheet that will 'contain' the image.
-     * @param startingColumn A primitive int whose value is the index of the
-     *                       column that contains the cell whose top left hand
-     *                       corner should be aligned with the top left hand
-     *                       corner of the image.
-     * @param reqImageWidthMM A primitive double whose value will indicate the
-     *                        required width of the image in millimetres.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the column containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number column containing the cell whose top
-     *         left hand corner also defines the bottom right hand corner of
-     *         the image and an inset that determines how far the right hand
-     *         edge of the image can protrude into the next column - expressed
-     *         as a specific number of co-ordinate positions.
-     */
-    private ClientAnchorDetail calculateColumnLocation(HSSFSheet sheet,
-                                                       int startingColumn,
-                                                       double reqImageWidthMM) {
-        ClientAnchorDetail anchorDetail = null;
-        double totalWidthMM = 0.0D;
-        double colWidthMM = 0.0D;
-        double overlapMM = 0.0D;
-        double coordinatePositionsPerMM = 0.0D;
-        int toColumn = startingColumn;
-        int inset = 0;
-
-        // Calculate how many columns the image will have to
-        // span in order to be presented at the required size.
-        while(totalWidthMM < reqImageWidthMM) {
-            colWidthMM = ConvertImageUnits.widthUnits2Millimetres(
-                    (short)(sheet.getColumnWidth(toColumn)));
-            // Note use of the cell border width constant. Testing with an image
-            // declared to fit exactly into one column demonstrated that it's
-            // width was greater than the width of the column the POI returned.
-            // Further, this difference was a constant value that I am assuming
-            // related to the cell's borders. Either way, that difference needs
-            // to be allowed for in this calculation.
-            totalWidthMM += (colWidthMM + ConvertImageUnits.CELL_BORDER_WIDTH_MILLIMETRES);
-            toColumn++;
-        }
-        // De-crement by one the last column value.
-        toColumn--;
-        // Highly unlikely that this will be true but, if the width of a series
-        // of columns is exactly equal to the required width of the image, then
-        // simply build a ClientAnchorDetail object with an inset equal to the
-        // total number of co-ordinate positions available in a column, a
-        // from column co-ordinate (top left hand corner) equal to the value
-        // of the startingColumn parameter and a to column co-ordinate equal
-        // to the toColumn variable.
-        //
-        // Convert both values to ints to perform the test.
-        if((int)totalWidthMM == (int)reqImageWidthMM) {
-            // A problem could occur if the image is sized to fit into one or
-            // more columns. If that occurs, the value in the toColumn variable
-            // will be in error. To overcome this, there are two options, to
-            // ibcrement the toColumn variable's value by one or to pass the
-            // total number of co-ordinate positions to the third paramater
-            // of the ClientAnchorDetail constructor. For no sepcific reason,
-            // the latter option is used below.
-            anchorDetail = new ClientAnchorDetail(startingColumn, 
-                    toColumn, ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS);
-        }
-        // In this case, the image will overlap part of another column and it is
-        // necessary to calculate just how much - this will become the inset
-        // for the ClientAnchorDetail object.
-        else {
-            // Firstly, claculate how much of the image should overlap into
-            // the next column.
-            overlapMM = reqImageWidthMM - (totalWidthMM - colWidthMM);
-
-            // When the required size is very close indded to the column size,
-            // the calcaulation above can produce a negative value. To prevent
-            // problems occuring in later caculations, this is simply removed
-            // be setting the overlapMM value to zero.
-            if(overlapMM < 0) {
-                overlapMM = 0.0D;
-            }
-
-            // Next, from the columns width, calculate how many co-ordinate
-            // positons there are per millimetre
-            coordinatePositionsPerMM = ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS /
-                    colWidthMM;
-            // From this figure, determine how many co-ordinat positions to
-            // inset the left hand or bottom edge of the image.
-            inset = (int)(coordinatePositionsPerMM * overlapMM);
-
-            // Now create the ClientAnchorDetail object, setting the from and to
-            // columns and the inset.
-            anchorDetail = new ClientAnchorDetail(startingColumn, toColumn, inset);
-        }
-        return(anchorDetail);
-    }
-
-    /**
-     * If the image is to overlie more than one rows, calculations need to be
-     * performed to determine how many rows and whether the image will
-     * overlie just a part of one row in order to be presented at the
-     * required size.
-     *
-     * @param sheet The sheet that will 'contain' the image.
-     * @param startingRow A primitive int whose value is the index of the row
-     *                    that contains the cell whose top left hand corner
-     *                    should be aligned with the top left hand corner of
-     *                    the image.
-     * @param reqImageHeightMM A primitive double whose value will indicate the
-     *                         required height of the image in millimetres.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the row containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number of the row containing the cell whose top
-     *         left hand corner also defines the bottom right hand corner of
-     *         the image and an inset that determines how far the bottom edge
-     *         can protrude into the next (lower) row - expressed as a specific
-     *         number of co-ordinate positions.
-     */
-    private ClientAnchorDetail calculateRowLocation(HSSFSheet sheet,
-            int startingRow, double reqImageHeightMM) {
-        ClientAnchorDetail clientAnchorDetail = null;
-        HSSFRow row = null;
-        double rowHeightMM = 0.0D;
-        double totalRowHeightMM = 0.0D;
-        double overlapMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
-        int toRow = startingRow;
-        int inset = 0;
-
-        // Step through the rows in the sheet and accumulate a total of their
-        // heights.
-        while(totalRowHeightMM < reqImageHeightMM) {
-            row = sheet.getRow(toRow);
-            // Note, if the row does not already exist on the sheet then create
-            // it here.
-            if(row == null) {
-                row = sheet.createRow(toRow);
-            }
-            // Get the row's height in millimetres and add to the running total.
-            rowHeightMM = row.getHeightInPoints() /
-                    ConvertImageUnits.POINTS_PER_MILLIMETRE;
-            totalRowHeightMM += rowHeightMM;
-            toRow++;
-        }
-        // Owing to the way the loop above works, the rowNumber will have been
-        // incremented one row too far. Undo that here.
-        toRow--;
-        // Check to see whether the image should occupy an exact number of
-        // rows. If so, build the ClientAnchorDetail record to point
-        // to those rows and with an inset of the total number of co-ordinate
-        // position in the row.
-        //
-        // To overcome problems that can occur with comparing double values for
-        // equality, cast both to int(s) to truncate the value; VERY crude and
-        // I do not really like it!!
-        if((int)totalRowHeightMM == (int)reqImageHeightMM) {
-            clientAnchorDetail = new ClientAnchorDetail(startingRow, toRow,
-                    ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS);
-        }
-        else {
-            // Calculate how far the image will project into the next row. Note
-            // that the height of the last row assessed is subtracted from the
-            // total height of all rows assessed so far.
-            overlapMM = reqImageHeightMM - (totalRowHeightMM - rowHeightMM);
-
-            // To prevent an exception being thrown when the required width of
-            // the image is very close indeed to the column size.
-            if(overlapMM < 0) {
-                overlapMM = 0.0D;
-            }
-
-            rowCoordinatesPerMM = ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS /
-                    rowHeightMM;
-            inset = (int)(overlapMM * rowCoordinatesPerMM);
-            clientAnchorDetail = new ClientAnchorDetail(startingRow,
-                        toRow, inset);
-        }
-        return(clientAnchorDetail);
-    }
-
-    /**
-     * Loads - reads in and converts into an array of byte(s) - an image from
-     * a named file.
-     *
-     * Note: this method should be modified so that the type of the image may
-     * also be passed to it. Currently, it assumes that all images are
-     * JPG/JPEG(s).
-     *
-     * @param imageFilename A String that encapsulates the path to and name
-     *                      of the file that contains the image which is to be
-     *                      'loaded'.
-     * @return An array of type byte that contains the raw data of the named
-     *         image.
-     * @throws java.io.FileNotFoundException Thrown if it was not possible to
-     *                                       open the specified file.
-     * @throws java.io.IOException Thrown if reading the file failed or was
-     *                             interrupted.
-     */
-    private byte[] imageToBytes(String imageFilename) throws IOException {
-        File imageFile = null;
-        FileInputStream fis = null;
-        ByteArrayOutputStream bos = null;
-        int read = 0;
-        try {
-            imageFile = new File(imageFilename);
-            fis = new FileInputStream(imageFile);
-            bos = new ByteArrayOutputStream();
-            while((read = fis.read()) != -1) {
-                bos.write(read);
-            }
-            return(bos.toByteArray());
-        }
-        finally {
-            if(fis != null) {
-                try {
-                    fis.close();
-                    fis = null;
-                }
-                catch(IOException ioEx) {
-                    // Nothing to do here
-                }
-            }
-        }
-    }
-
-    /**
-     * The main entry point to the program. It contains code that demonstrates
-     * one way to use the program.
-     *
-     * Note, the code is not restricted to use on new workbooks only. If an
-     * image is to be inserted into an existing workbook. just open that
-     * workbook, gat a reference to a sheet and pass that;
-     *
-     *      AddDimensionedImage addImage = new AddDimensionedImage();
-     *
-     *      File file = new File("....... Existing Workbook .......");
-     *      FileInputStream fis = new FileInputStream(file);
-     *      HSSFWorkbook workbook = new HSSFWorkbook(fis);
-     *      HSSFSheet sheet = workbook.getSheetAt(0);
-     *      addImage.addImageToSheet("C3", sheet, "image.jpg", 30, 20,
-     *          AddDimensionedImage.EXPAND.ROW);
-     *
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-        String imageFile = null;
-        String outputFile = null;
-        FileOutputStream fos = null;
-        HSSFSheet sheet = null;
-        try {
-            if(args.length < 2){
-                System.err.println("Usage: AddDimensionedImage imageFile outputFile");
-                return;
-            }
-            imageFile = args[0];
-            outputFile = args[1];
-
-            HSSFWorkbook workbook = new HSSFWorkbook();
-            sheet = workbook.createSheet("Picture Test");
-            new AddDimensionedImage().addImageToSheet("A1", sheet,
-                    imageFile, 125, 125,
-                    AddDimensionedImage.EXPAND_ROW_AND_COLUMN);
-            fos = new FileOutputStream(outputFile);
-            workbook.write(fos);
-            workbook.close();
-        }
-        catch(FileNotFoundException fnfEx) {
-            System.out.println("Caught an: " + fnfEx.getClass().getName());
-            System.out.println("Message: " + fnfEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            fnfEx.printStackTrace(System.out);
-        }
-        catch(IOException ioEx) {
-            System.out.println("Caught an: " + ioEx.getClass().getName());
-            System.out.println("Message: " + ioEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            ioEx.printStackTrace(System.out);
-        }
-        finally {
-            try {
-                if(fos != null) {
-                    fos.close();
-                    fos = null;
-                }
-            } catch(IOException ioEx) {
-                // I G N O R E
-            }
-        }
-    }
-
-    /**
-     * The HSSFClientAnchor class accepts eight parameters. In order, these are;
-     *
-     *      * How far the left hand edge of the image is inset from the left hand
-     *      edge of the cell
-     *      * How far the top edge of the image is inset from the top of the cell
-     *      * How far the right hand edge of the image is inset from the left
-     *      hand edge of the cell
-     *      * How far the bottom edge of the image is inset from the top of the
-     *      cell.
-     *      * Together, parameters five and six determine the column and row
-     *      co-ordinates of the cell whose top left hand corner will be aligned
-     *      with the image's top left hand corner.
-     *      * Together, parameter seven and eight determine the column and row
-     *      co-ordinates of the cell whose top left hand corner will be aligned
-     *      with the images bottom right hand corner.
-     * 
-     * An instance of the ClientAnchorDetail class provides three of the eight
-     * parameters, one of the co-ordinates for the images top left hand corner,
-     * one of the co-ordinates for the images bottom right hand corner and 
-     * either how far the image should be inset from the top or the left hand
-     * edge of the cell.
-     * 
-     * @author Mark Beardsley [mas at apache.org]
-     * @version 1.00 5th August 2009.
-     */
-    public class ClientAnchorDetail {
-
-        public int fromIndex = 0;
-        public int toIndex = 0;
-        public int inset = 0;
-
-        /**
-         * Create a new instance of the ClientAnchorDetail class using the
-         * following parameters.
-         *
-         * @param fromIndex A primitive int that contains one of the
-         *                  co-ordinates (row or column index) for the top left
-         *                  hand corner of the image.
-         * @param toIndex A primitive int that contains one of the
-         *                co-ordinates (row or column index) for the bottom
-         *                right hand corner of the image.
-         * @param inset A primitive int that contains a value which indicates
-         *              how far the image should be inset from the top or the
-         *              left hand edge of a cell.
-         */
-        public ClientAnchorDetail(int fromIndex, int toIndex, int inset) {
-            this.fromIndex = fromIndex;
-            this.toIndex = toIndex;
-            this.inset = inset;
-        }
-
-        /**
-         * Get one of the number of the column or row that contains the cell
-         * whose top left hand corner will be aligned with the top left hand
-         * corner of the image.
-         *
-         * @return The value - row or column index - for one of the co-ordinates
-         *         of the top left hand corner of the image.
-         */
-        public int getFromIndex() {
-            return(this.fromIndex);
-        }
-
-        /**
-         * Get one of the number of the column or row that contains the cell
-         * whose top left hand corner will be aligned with the bottom righ hand
-         * corner of the image.
-         *
-         * @return The value - row or column index - for one of the co-ordinates
-         *         of the bottom right hand corner of the image.
-         */
-        public int getToIndex() {
-            return(this.toIndex);
-        }
-
-        /**
-         * Get the image's offset from the edge of a cell.
-         *
-         * @return How far either the right hand or bottom edge of the image is
-         *         inset from the left hand or top edge of a cell.
-         */
-        public int getInset() {
-            return(this.inset);
-        }
-    }
-
-    /**
-     * Utility methods used to convert Excel's character based column and row
-     * size measurements into pixels and/or millimetres. The class also contains
-     * various constants that are required in other calculations.
-     *
-     * @author xio[darjino@hotmail.com]
-     * @version 1.01 30th July 2009.
-     *      Added by Mark Beardsley [msb at apache.org].
-     *          Additional constants.
-     *          widthUnits2Millimetres() and millimetres2Units() methods.
-     */
-    public static class ConvertImageUnits {
-
-        // Each cell conatins a fixed number of co-ordinate points; this number
-        // does not vary with row height or column width or with font. These two
-        // constants are defined below.
-        public static final int TOTAL_COLUMN_COORDINATE_POSITIONS = 1023; // MB
-        public static final int TOTAL_ROW_COORDINATE_POSITIONS = 255;     // MB
-        // The resoultion of an image can be expressed as a specific number
-        // of pixels per inch. Displays and printers differ but 96 pixels per
-        // inch is an acceptable standard to beging with.
-        public static final int PIXELS_PER_INCH = 96;                     // MB
-        // Cnstants that defines how many pixels and points there are in a
-        // millimetre. These values are required for the conversion algorithm.
-        public static final double PIXELS_PER_MILLIMETRES = 3.78;         // MB
-        public static final double POINTS_PER_MILLIMETRE = 2.83;          // MB
-        // The column width returned by HSSF and the width of a picture when
-        // positioned to exactly cover one cell are different by almost exactly
-        // 2mm - give or take rounding errors. This constant allows that
-        // additional amount to be accounted for when calculating how many
-        // celles the image ought to overlie.
-        public static final double CELL_BORDER_WIDTH_MILLIMETRES = 2.0D;  // MB
-        public static final short EXCEL_COLUMN_WIDTH_FACTOR = 256;
-        public static final int UNIT_OFFSET_LENGTH = 7;
-        public static final int[] UNIT_OFFSET_MAP = new int[]
-            { 0, 36, 73, 109, 146, 182, 219 };
-
-        /**
-        * pixel units to excel width units(units of 1/256th of a character width)
-        * @param pxs
-        * @return
-        */
-        public static short pixel2WidthUnits(int pxs) {
-            short widthUnits = (short) (EXCEL_COLUMN_WIDTH_FACTOR *
-                    (pxs / UNIT_OFFSET_LENGTH));
-            widthUnits += UNIT_OFFSET_MAP[(pxs % UNIT_OFFSET_LENGTH)];
-            return widthUnits;
-        }
-
-        /**
-         * excel width units(units of 1/256th of a character width) to pixel
-         * units.
-         *
-         * @param widthUnits
-         * @return
-         */
-        public static int widthUnits2Pixel(short widthUnits) {
-            int pixels = (widthUnits / EXCEL_COLUMN_WIDTH_FACTOR)
-                    * UNIT_OFFSET_LENGTH;
-            int offsetWidthUnits = widthUnits % EXCEL_COLUMN_WIDTH_FACTOR;
-            pixels += Math.round(offsetWidthUnits /
-                    ((float) EXCEL_COLUMN_WIDTH_FACTOR / UNIT_OFFSET_LENGTH));
-            return pixels;
-        }
-
-        /**
-         * Convert Excel's width units into millimetres.
-         *
-         * @param widthUnits The width of the column or the height of the
-         *                   row in Excel's units.
-         * @return A primitive double that contains the columns width or rows
-         *         height in millimetres.
-         */
-        public static double widthUnits2Millimetres(short widthUnits) {
-            return(ConvertImageUnits.widthUnits2Pixel(widthUnits) /
-                   ConvertImageUnits.PIXELS_PER_MILLIMETRES);
-        }
-
-        /**
-         * Convert into millimetres Excel's width units..
-         *
-         * @param millimetres A primitive double that contains the columns
-         *                    width or rows height in millimetres.
-         * @return A primitive int that contains the columns width or rows
-         *         height in Excel's units.
-         */
-        public static int millimetres2WidthUnits(double millimetres) {
-            return(ConvertImageUnits.pixel2WidthUnits((int)(millimetres *
-                    ConvertImageUnits.PIXELS_PER_MILLIMETRES)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Alignment.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Alignment.java
deleted file mode 100644
index 43fb75d..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Alignment.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-
-/**
- * Shows how various alignment options work.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class Alignment {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        HSSFRow row = sheet.createRow(2);
-        createCell(wb, row, 0, HorizontalAlignment.CENTER);
-        createCell(wb, row, 1, HorizontalAlignment.CENTER_SELECTION);
-        createCell(wb, row, 2, HorizontalAlignment.FILL);
-        createCell(wb, row, 3, HorizontalAlignment.GENERAL);
-        createCell(wb, row, 4, HorizontalAlignment.JUSTIFY);
-        createCell(wb, row, 5, HorizontalAlignment.LEFT);
-        createCell(wb, row, 6, HorizontalAlignment.RIGHT);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
-    }
-
-    /**
-     * Creates a cell and aligns it a certain way.
-     *
-     * @param wb        the workbook
-     * @param row       the row to create the cell in
-     * @param column    the column number to create the cell in
-     * @param align     the alignment for the cell.
-     */
-    private static void createCell(HSSFWorkbook wb, HSSFRow row, int column, HorizontalAlignment align) {
-        HSSFCell cell = row.createCell(column);
-        cell.setCellValue("Align It");
-        HSSFCellStyle cellStyle = wb.createCellStyle();
-        cellStyle.setAlignment(align);
-        cell.setCellStyle(cellStyle);
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java
deleted file mode 100644
index cf37752..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Demonstrates many features of the user API at once.  Used in the HOW-TO guide.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Andrew Oliver (acoliver at apache.org)
- */
-public class BigExample {
-    public static void main(String[] args) throws IOException {
-        int rownum;
-
-        // create a new file
-        FileOutputStream out = new FileOutputStream("workbook.xls");
-        // create a new workbook
-        HSSFWorkbook wb = new HSSFWorkbook();
-        // create a new sheet
-        HSSFSheet s = wb.createSheet();
-        // declare a row object reference
-        HSSFRow r = null;
-        // declare a cell object reference
-        HSSFCell c = null;
-        // create 3 cell styles
-        HSSFCellStyle cs = wb.createCellStyle();
-        HSSFCellStyle cs2 = wb.createCellStyle();
-        HSSFCellStyle cs3 = wb.createCellStyle();
-        // create 2 fonts objects
-        HSSFFont f = wb.createFont();
-        HSSFFont f2 = wb.createFont();
-
-        //set font 1 to 12 point type
-        f.setFontHeightInPoints((short) 12);
-        //make it red
-        f.setColor(HSSFColor.RED.index);
-        // make it bold
-        //arial is the default font
-        f.setBoldweight(Font.BOLDWEIGHT_BOLD);
-
-        //set font 2 to 10 point type
-        f2.setFontHeightInPoints((short) 10);
-        //make it the color at palette index 0xf (white)
-        f2.setColor(HSSFColor.WHITE.index);
-        //make it bold
-        f2.setBoldweight(Font.BOLDWEIGHT_BOLD);
-
-        //set cell stlye
-        cs.setFont(f);
-        //set the cell format see HSSFDataFromat for a full list
-        cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("($#,##0_);[Red]($#,##0)"));
-
-        //set a thin border
-        cs2.setBorderBottom(CellStyle.BORDER_THIN);
-        //fill w fg fill color
-        cs2.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
-        // set foreground fill to red
-        cs2.setFillForegroundColor(HSSFColor.RED.index);
-
-        // set the font
-        cs2.setFont(f2);
-
-        // set the sheet name to HSSF Test
-        wb.setSheetName(0, "HSSF Test");
-        // create a sheet with 300 rows (0-299)
-        for (rownum = 0; rownum < 300; rownum++)
-        {
-            // create a row
-            r = s.createRow(rownum);
-            // on every other row
-            if ((rownum % 2) == 0)
-            {
-                // make the row height bigger  (in twips - 1/20 of a point)
-                r.setHeight((short) 0x249);
-            }
-
-            //r.setRowNum(( short ) rownum);
-            // create 50 cells (0-49) (the += 2 becomes apparent later
-            for (int cellnum = 0; cellnum < 50; cellnum += 2)
-            {
-                // create a numeric cell
-                c = r.createCell(cellnum);
-                // do some goofy math to demonstrate decimals
-                c.setCellValue(rownum * 10000 + cellnum
-                        + (((double) rownum / 1000)
-                        + ((double) cellnum / 10000)));
-
-                // on every other row
-                if ((rownum % 2) == 0)
-                {
-                    // set this cell to the first cell style we defined
-                    c.setCellStyle(cs);
-                }
-
-                // create a string cell (see why += 2 in the
-                c = r.createCell(cellnum + 1);
-
-                // set the cell's string value to "TEST"
-                c.setCellValue("TEST");
-                // make this column a bit wider
-                s.setColumnWidth(cellnum + 1, (int)((50 * 8) / ((double) 1 / 20)));
-
-                // on every other row
-                if ((rownum % 2) == 0)
-                {
-                    // set this to the white on red cell style
-                    // we defined above
-                    c.setCellStyle(cs2);
-                }
-
-            }
-        }
-
-        //draw a thick black border on the row at the bottom using BLANKS
-        // advance 2 rows
-        rownum++;
-        rownum++;
-
-        r = s.createRow(rownum);
-
-        // define the third style to be the default
-        // except with a thick black border at the bottom
-        cs3.setBorderBottom(CellStyle.BORDER_THICK);
-
-        //create 50 cells
-        for (int cellnum =0; cellnum < 50; cellnum++) {
-            //create a blank type cell (no value)
-            c = r.createCell(cellnum);
-            // set it to the thick black border style
-            c.setCellStyle(cs3);
-        }
-
-        //end draw thick black border
-
-
-        // demonstrate adding/naming and deleting a sheet
-        // create a sheet, set its title then delete it
-        wb.createSheet();
-        wb.setSheetName(1, "DeletedSheet");
-        wb.removeSheetAt(1);
-        //end deleted sheet
-
-        // write the workbook to the output stream
-        // close our file (don't blow out our file handles
-        wb.write(out);
-        out.close();
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java
deleted file mode 100644
index d296350..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.HSSFColor;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Demonstrates how to create borders around cells.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class Borders {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(1);
-
-        // Create a cell and put a value in it.
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue(4);
-
-        // Style the cell with borders all around.
-        HSSFCellStyle style = wb.createCellStyle();
-        style.setBorderBottom(HSSFCellStyle.BORDER_THIN);
-        style.setBottomBorderColor(HSSFColor.BLACK.index);
-        style.setBorderLeft(HSSFCellStyle.BORDER_THIN);
-        style.setLeftBorderColor(HSSFColor.GREEN.index);
-        style.setBorderRight(HSSFCellStyle.BORDER_THIN);
-        style.setRightBorderColor(HSSFColor.BLUE.index);
-        style.setBorderTop(HSSFCellStyle.BORDER_MEDIUM_DASHED);
-        style.setTopBorderColor(HSSFColor.ORANGE.index);
-        cell.setCellStyle(style);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java
deleted file mode 100644
index c3a213d..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.HSSFColor;
-
-import java.io.*;
-
-/**
- * Demonstrates how to work with excel cell comments.
- *
- * <p>
- * Excel comment is a kind of a text shape,
- * so inserting a comment is very similar to placing a text box in a worksheet
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class CellComments {
-
-    public static void main(String[] args) throws IOException  {
-
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Cell comments in POI HSSF");
-
-        // Create the drawing patriarch. This is the top level container for all shapes including cell comments.
-        HSSFPatriarch patr = sheet.createDrawingPatriarch();
-
-        //create a cell in row 3
-        HSSFCell cell1 = sheet.createRow(3).createCell(1);
-        cell1.setCellValue(new HSSFRichTextString("Hello, World"));
-
-        //anchor defines size and position of the comment in worksheet
-        HSSFComment comment1 = patr.createComment(new HSSFClientAnchor(0, 0, 0, 0, (short)4, 2, (short) 6, 5));
-
-         // set text in the comment
-        comment1.setString(new HSSFRichTextString("We can set comments in POI"));
-
-        //set comment author.
-        //you can see it in the status bar when moving mouse over the commented cell
-        comment1.setAuthor("Apache Software Foundation");
-
-        // The first way to assign comment to a cell is via HSSFCell.setCellComment method
-        cell1.setCellComment(comment1);
-
-        //create another cell in row 6
-        HSSFCell cell2 = sheet.createRow(6).createCell(1);
-        cell2.setCellValue(36.6);
-
-
-        HSSFComment comment2 = patr.createComment(new HSSFClientAnchor(0, 0, 0, 0, (short)4, 8, (short) 6, 11));
-        //modify background color of the comment
-        comment2.setFillColor(204, 236, 255);
-
-        HSSFRichTextString string = new HSSFRichTextString("Normal body temperature");
-
-        //apply custom font to the text in the comment
-        HSSFFont font = wb.createFont();
-        font.setFontName("Arial");
-        font.setFontHeightInPoints((short)10);
-        font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-        font.setColor(HSSFColor.RED.index);
-        string.applyFont(font);
-
-        comment2.setString(string);
-        comment2.setVisible(true); //by default comments are hidden. This one is always visible.
-
-        comment2.setAuthor("Bill Gates");
-
-        /**
-         * The second way to assign comment to a cell is to implicitly specify its row and column.
-         * Note, it is possible to set row and column of a non-existing cell.
-         * It works, the comment is visible.
-         */
-        comment2.setRow(6);
-        comment2.setColumn(1);
-
-        FileOutputStream out = new FileOutputStream("poi_comment.xls");
-        wb.write(out);
-        out.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellTypes.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellTypes.java
deleted file mode 100644
index 3e31d11..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellTypes.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-
-public class CellTypes {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        HSSFRow row = sheet.createRow(2);
-        row.createCell(0).setCellValue(1.1);
-        row.createCell(1).setCellValue(new Date());
-        row.createCell(2).setCellValue("a string");
-        row.createCell(3).setCellValue(true);
-        row.createCell(4).setCellType(CellType.ERROR);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java
deleted file mode 100644
index d2141b0..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Illustrates how to create cell values.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class CreateCells {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(0);
-        // Create a cell and put a value in it.
-        HSSFCell cell = row.createCell(0);
-        cell.setCellValue(1);
-
-        // Or do it on one line.
-        row.createCell(1).setCellValue(1.2);
-        row.createCell(2).setCellValue("This is a string");
-        row.createCell(3).setCellValue(true);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
deleted file mode 100644
index 746fd53..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-
-/**
- * An example on how to cells with dates.  The important thing to note
- * about dates is that they are really normal numeric cells that are
- * formatted specially.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class CreateDateCells {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(0);
-
-        // Create a cell and put a date value in it.  The first cell is not styled as a date.
-        HSSFCell cell = row.createCell(0);
-        cell.setCellValue(new Date());
-
-        // we style the second cell as a date (and time).  It is important to create a new cell style from the workbook
-        // otherwise you can end up modifying the built in style and effecting not only this cell but other cells.
-        HSSFCellStyle cellStyle = wb.createCellStyle();
-        cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy h:mm"));
-        cell = row.createCell(1);
-        cell.setCellValue(new Date());
-        cell.setCellStyle(cellStyle);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
deleted file mode 100644
index 9af4106..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileInputStream;
-import java.util.Iterator;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.hssf.usermodel.HSSFObjectData;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Demonstrates how you can extract embedded data from a .xls file
- */
-public class EmeddedObjects {
-    @SuppressWarnings("unused")
-    public static void main(String[] args) throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(args[0]));
-        HSSFWorkbook workbook = new HSSFWorkbook(fs);
-        for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) {
-            //the OLE2 Class Name of the object
-            String oleName = obj.getOLE2ClassName();
-            if (oleName.equals("Worksheet")) {
-                DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-                HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(dn, fs, false);
-                //System.out.println(entry.getName() + ": " + embeddedWorkbook.getNumberOfSheets());
-                embeddedWorkbook.close();
-            } else if (oleName.equals("Document")) {
-                DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-                HWPFDocument embeddedWordDocument = new HWPFDocument(dn);
-                //System.out.println(entry.getName() + ": " + embeddedWordDocument.getRange().text());
-            }  else if (oleName.equals("Presentation")) {
-                DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-                HSLFSlideShow embeddedPowerPointDocument = new HSLFSlideShow(new HSLFSlideShowImpl(dn));
-                //System.out.println(entry.getName() + ": " + embeddedPowerPointDocument.getSlides().length);
-            } else {
-                if(obj.hasDirectoryEntry()){
-                    // The DirectoryEntry is a DocumentNode. Examine its entries to find out what it is
-                    DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-                    for (Iterator<Entry> entries = dn.getEntries(); entries.hasNext();) {
-                        Entry entry = entries.next();
-                        //System.out.println(oleName + "." + entry.getName());
-                    }
-                } else {
-                    // There is no DirectoryEntry
-                    // Recover the object's data from the HSSFObjectData instance.
-                    byte[] objectData = obj.getObjectData();
-                }
-            }
-        }
-        workbook.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EventExample.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EventExample.java
deleted file mode 100644
index a324b3a..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EventExample.java
+++ /dev/null
@@ -1,119 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
-import org.apache.poi.hssf.eventusermodel.HSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFRequest;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * This example shows how to use the event API for reading a file.
- */
-public class EventExample
-        implements HSSFListener
-{
-    private SSTRecord sstrec;
-
-    /**
-     * This method listens for incoming records and handles them as required.
-     * @param record    The record that was found while reading.
-     */
-    @Override
-    public void processRecord(Record record)
-    {
-        switch (record.getSid())
-        {
-            // the BOFRecord can represent either the beginning of a sheet or the workbook
-            case BOFRecord.sid:
-                BOFRecord bof = (BOFRecord) record;
-                if (bof.getType() == BOFRecord.TYPE_WORKBOOK)
-                {
-                    System.out.println("Encountered workbook");
-                    // assigned to the class level member
-                } else if (bof.getType() == BOFRecord.TYPE_WORKSHEET)
-                {
-                    System.out.println("Encountered sheet reference");
-                }
-                break;
-            case BoundSheetRecord.sid:
-                BoundSheetRecord bsr = (BoundSheetRecord) record;
-                System.out.println("New sheet named: " + bsr.getSheetname());
-                break;
-            case RowRecord.sid:
-                RowRecord rowrec = (RowRecord) record;
-                System.out.println("Row found, first column at "
-                        + rowrec.getFirstCol() + " last column at " + rowrec.getLastCol());
-                break;
-            case NumberRecord.sid:
-                NumberRecord numrec = (NumberRecord) record;
-                System.out.println("Cell found with value " + numrec.getValue()
-                        + " at row " + numrec.getRow() + " and column " + numrec.getColumn());
-                break;
-                // SSTRecords store a array of unique strings used in Excel.
-            case SSTRecord.sid:
-                sstrec = (SSTRecord) record;
-                for (int k = 0; k < sstrec.getNumUniqueStrings(); k++)
-                {
-                    System.out.println("String table value " + k + " = " + sstrec.getString(k));
-                }
-                break;
-            case LabelSSTRecord.sid:
-                LabelSSTRecord lrec = (LabelSSTRecord) record;
-                System.out.println("String cell found with value "
-                        + sstrec.getString(lrec.getSSTIndex()));
-                break;
-        }
-    }
-
-    /**
-     * Read an excel file and spit out what we find.
-     *
-     * @param args      Expect one argument that is the file to read.
-     * @throws IOException  When there is an error processing the file.
-     */
-    public static void main(String[] args) throws IOException
-    {
-        // create a new file input stream with the input file specified
-        // at the command line
-        FileInputStream fin = new FileInputStream(args[0]);
-        // create a new org.apache.poi.poifs.filesystem.Filesystem
-        POIFSFileSystem poifs = new POIFSFileSystem(fin);
-        // get the Workbook (excel part) stream in a InputStream
-        InputStream din = poifs.createDocumentInputStream("Workbook");
-        // construct out HSSFRequest object
-        HSSFRequest req = new HSSFRequest();
-        // lazy listen for ALL records with the listener shown above
-        req.addListenerForAllRecords(new EventExample());
-        // create our event factory
-        HSSFEventFactory factory = new HSSFEventFactory();
-        // process our events based on the document input stream
-        factory.processEvents(req, din);
-        // once all the events are processed close our file input stream
-        fin.close();
-        // and our document input stream (don't want to leak these!)
-        din.close();
-        System.out.println("done.");
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/FrillsAndFills.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/FrillsAndFills.java
deleted file mode 100644
index 02b7cb3..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/FrillsAndFills.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.HSSFColor;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Shows how to use various fills.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class FrillsAndFills {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(1);
-
-        // Aqua background
-        HSSFCellStyle style = wb.createCellStyle();
-        style.setFillBackgroundColor(HSSFColor.AQUA.index);
-        style.setFillPattern(HSSFCellStyle.BIG_SPOTS);
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue("X");
-        cell.setCellStyle(style);
-
-        // Orange "foreground", foreground being the fill foreground not the font color.
-        style = wb.createCellStyle();
-        style.setFillForegroundColor(HSSFColor.ORANGE.index);
-        style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
-        cell = row.createCell(2);
-        cell.setCellValue("X");
-        cell.setCellStyle(style);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java
deleted file mode 100644
index 2f67f7f..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Locale;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataFormat;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * File for HSSF testing/examples
- *
- * THIS IS NOT THE MAIN HSSF FILE!! This is a utility for testing functionality.
- * It does contain sample API usage that may be educational to regular API
- * users.
- */
-public final class HSSFReadWrite {
-
-	/**
-	 * creates an {@link HSSFWorkbook} the specified OS filename.
-	 */
-	private static HSSFWorkbook readFile(String filename) throws IOException {
-	    FileInputStream fis = new FileInputStream(filename);
-	    try {
-	        return new HSSFWorkbook(fis);
-	    } finally {
-	        fis.close();
-	    }
-	}
-
-	/**
-	 * given a filename this outputs a sample sheet with just a set of
-	 * rows/cells.
-	 */
-	private static void testCreateSampleSheet(String outputFilename) throws IOException {
-		int rownum;
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet s = wb.createSheet();
-		HSSFCellStyle cs = wb.createCellStyle();
-		HSSFCellStyle cs2 = wb.createCellStyle();
-		HSSFCellStyle cs3 = wb.createCellStyle();
-		HSSFFont f = wb.createFont();
-		HSSFFont f2 = wb.createFont();
-
-		f.setFontHeightInPoints((short) 12);
-		f.setColor((short) 0xA);
-		f.setBold(true);
-		f2.setFontHeightInPoints((short) 10);
-		f2.setColor((short) 0xf);
-		f2.setBold(true);
-		cs.setFont(f);
-		cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("($#,##0_);[Red]($#,##0)"));
-		cs2.setBorderBottom(BorderStyle.THIN);
-		cs2.setFillPattern((short) 1); // fill w fg
-		cs2.setFillForegroundColor((short) 0xA);
-		cs2.setFont(f2);
-		wb.setSheetName(0, "HSSF Test");
-		for (rownum = 0; rownum < 300; rownum++) {
-			HSSFRow r = s.createRow(rownum);
-			if ((rownum % 2) == 0) {
-				r.setHeight((short) 0x249);
-			}
-
-			for (int cellnum = 0; cellnum < 50; cellnum += 2) {
-				HSSFCell c = r.createCell(cellnum);
-				c.setCellValue(rownum * 10000 + cellnum
-						+ (((double) rownum / 1000) + ((double) cellnum / 10000)));
-				if ((rownum % 2) == 0) {
-					c.setCellStyle(cs);
-				}
-				c = r.createCell(cellnum + 1);
-				c.setCellValue(new HSSFRichTextString("TEST"));
-				// 50 characters divided by 1/20th of a point
-				s.setColumnWidth(cellnum + 1, (int) (50 * 8 / 0.05));
-				if ((rownum % 2) == 0) {
-					c.setCellStyle(cs2);
-				}
-			}
-		}
-
-		// draw a thick black border on the row at the bottom using BLANKS
-		rownum++;
-		rownum++;
-		HSSFRow r = s.createRow(rownum);
-		cs3.setBorderBottom(BorderStyle.THICK);
-		for (int cellnum = 0; cellnum < 50; cellnum++) {
-			HSSFCell c = r.createCell(cellnum);
-			c.setCellStyle(cs3);
-		}
-		s.addMergedRegion(new CellRangeAddress(0, 3, 0, 3));
-		s.addMergedRegion(new CellRangeAddress(100, 110, 100, 110));
-
-		// end draw thick black border
-		// create a sheet, set its title then delete it
-		wb.createSheet();
-		wb.setSheetName(1, "DeletedSheet");
-		wb.removeSheetAt(1);
-
-		// end deleted sheet
-		FileOutputStream out = new FileOutputStream(outputFilename);
-		try {
-		    wb.write(out);
-		} finally {
-		    out.close();
-		}
-		
-		wb.close();
-	}
-
-	/**
-     * Method main
-     *
-     * Given 1 argument takes that as the filename, inputs it and dumps the
-     * cell values/types out to sys.out.<br/>
-     *
-     * given 2 arguments where the second argument is the word "write" and the
-     * first is the filename - writes out a sample (test) spreadsheet
-     * see {@link HSSFReadWrite#testCreateSampleSheet(String)}.<br/>
-     *
-     * given 2 arguments where the first is an input filename and the second
-     * an output filename (not write), attempts to fully read in the
-     * spreadsheet and fully write it out.<br/>
-     *
-     * given 3 arguments where the first is an input filename and the second an
-     * output filename (not write) and the third is "modify1", attempts to read in the
-     * spreadsheet, deletes rows 0-24, 74-99.  Changes cell at row 39, col 3 to
-     * "MODIFIED CELL" then writes it out.  Hence this is "modify test 1".  If you
-     * take the output from the write test, you'll have a valid scenario.
-     */
-	public static void main(String[] args) {
-		if (args.length < 1) {
-			System.err.println("At least one argument expected");
-			return;
-		}
-
-		String fileName = args[0];
-		try {
-			if (args.length < 2) {
-
-				HSSFWorkbook wb = HSSFReadWrite.readFile(fileName);
-
-				System.out.println("Data dump:\n");
-
-				for (int k = 0; k < wb.getNumberOfSheets(); k++) {
-					HSSFSheet sheet = wb.getSheetAt(k);
-					int rows = sheet.getPhysicalNumberOfRows();
-					System.out.println("Sheet " + k + " \"" + wb.getSheetName(k) + "\" has " + rows
-							+ " row(s).");
-					for (int r = 0; r < rows; r++) {
-						HSSFRow row = sheet.getRow(r);
-						if (row == null) {
-							continue;
-						}
-
-						int cells = row.getPhysicalNumberOfCells();
-						System.out.println("\nROW " + row.getRowNum() + " has " + cells
-								+ " cell(s).");
-						for (int c = 0; c < cells; c++) {
-							HSSFCell cell = row.getCell(c);
-							String value = null;
-
-							switch (cell.getCellTypeEnum()) {
-
-								case FORMULA:
-									value = "FORMULA value=" + cell.getCellFormula();
-									break;
-
-								case NUMERIC:
-									value = "NUMERIC value=" + cell.getNumericCellValue();
-									break;
-
-								case STRING:
-									value = "STRING value=" + cell.getStringCellValue();
-									break;
-
-								default:
-							}
-							System.out.println("CELL col=" + cell.getColumnIndex() + " VALUE="
-									+ value);
-						}
-					}
-				}
-				wb.close();
-			} else if (args.length == 2) {
-				if (args[1].toLowerCase(Locale.ROOT).equals("write")) {
-					System.out.println("Write mode");
-					long time = System.currentTimeMillis();
-					HSSFReadWrite.testCreateSampleSheet(fileName);
-
-					System.out.println("" + (System.currentTimeMillis() - time)
-							+ " ms generation time");
-				} else {
-					System.out.println("readwrite test");
-					HSSFWorkbook wb = HSSFReadWrite.readFile(fileName);
-					FileOutputStream stream = new FileOutputStream(args[1]);
-
-					wb.write(stream);
-					stream.close();
-					wb.close();
-				}
-			} else if (args.length == 3 && args[2].toLowerCase(Locale.ROOT).equals("modify1")) {
-				// delete row 0-24, row 74 - 99 && change cell 3 on row 39 to string "MODIFIED CELL!!"
-
-				HSSFWorkbook wb = HSSFReadWrite.readFile(fileName);
-				FileOutputStream stream = new FileOutputStream(args[1]);
-				HSSFSheet sheet = wb.getSheetAt(0);
-
-				for (int k = 0; k < 25; k++) {
-					HSSFRow row = sheet.getRow(k);
-
-					sheet.removeRow(row);
-				}
-				for (int k = 74; k < 100; k++) {
-					HSSFRow row = sheet.getRow(k);
-
-					sheet.removeRow(row);
-				}
-				HSSFRow row = sheet.getRow(39);
-				HSSFCell cell = row.getCell(3);
-				cell.setCellValue("MODIFIED CELL!!!!!");
-
-				wb.write(stream);
-				stream.close();
-				wb.close();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/HyperlinkFormula.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/HyperlinkFormula.java
deleted file mode 100644
index 148b2a5..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/HyperlinkFormula.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-
-/**
- * Test if hyperlink formula, with url that got more than 127 characters, works
- *
- * @author Bernard Chesnoy
- */
-public class HyperlinkFormula {
-    public static void main(String[] args) throws IOException {
-    	HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        HSSFRow row = sheet.createRow(0);
-
-        HSSFCell cell = row.createCell(0);
-        cell.setCellType(CellType.FORMULA);
-        cell.setCellFormula("HYPERLINK(\"http://127.0.0.1:8080/toto/truc/index.html?test=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"test\")");
-
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Hyperlinks.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Hyperlinks.java
deleted file mode 100644
index c1ccad9..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Hyperlinks.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFCreationHelper;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFHyperlink;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-
-/**
- * Demonstrates how to create hyperlinks.
- *
- * @author Yegor Kozlov (yegor at apach.org)
- */
-public class Hyperlinks {
-
-    public static void main(String[] args) throws IOException  {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFCreationHelper helper = wb.getCreationHelper();
-
-        //cell style for hyperlinks
-        //by default hyperlinks are blue and underlined
-        HSSFCellStyle hlink_style = wb.createCellStyle();
-        HSSFFont hlink_font = wb.createFont();
-        hlink_font.setUnderline(HSSFFont.U_SINGLE);
-        hlink_font.setColor(HSSFColor.BLUE.index);
-        hlink_style.setFont(hlink_font);
-
-        HSSFCell cell;
-        HSSFSheet sheet = wb.createSheet("Hyperlinks");
-
-        //URL
-        cell = sheet.createRow(0).createCell(0);
-        cell.setCellValue("URL Link");
-        HSSFHyperlink link = helper.createHyperlink(HyperlinkType.URL);
-        link.setAddress("http://poi.apache.org/");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
-
-        //link to a file in the current directory
-        cell = sheet.createRow(1).createCell(0);
-        cell.setCellValue("File Link");
-        link = helper.createHyperlink(HyperlinkType.FILE);
-        link.setAddress("link1.xls");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
-
-        //e-mail link
-        cell = sheet.createRow(2).createCell(0);
-        cell.setCellValue("Email Link");
-        link = helper.createHyperlink(HyperlinkType.EMAIL);
-        //note, if subject contains white spaces, make sure they are url-encoded
-        link.setAddress("mailto:poi@apache.org?subject=Hyperlinks");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
-
-        //link to a place in this workbook
-
-        //create a target sheet and cell
-        HSSFSheet sheet2 = wb.createSheet("Target Sheet");
-        sheet2.createRow(0).createCell(0).setCellValue("Target Cell");
-
-        cell = sheet.createRow(3).createCell(0);
-        cell.setCellValue("Worksheet Link");
-        link = helper.createHyperlink(HyperlinkType.DOCUMENT);
-        link.setAddress("'Target Sheet'!A1");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
-
-        FileOutputStream out = new FileOutputStream("hssf-links.xls");
-        wb.write(out);
-        out.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/InCellLists.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/InCellLists.java
deleted file mode 100644
index e1d4cbc..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/InCellLists.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataFormat;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-
-/**
- * This class contains code that demonstrates how to insert plain, numbered
- * and bulleted lists into an Excel spreadsheet cell.
- *
- * Look at the code contained in the demonstrateMethodCalls() method. It calls
- * other methods that create plain, numbered and bulleted single and
- * multi-level lists. The demonstrateMethodCalls() method appears at the top
- * of the class definition.
- *
- * Though different methods are provided to construct single and multi-level
- * plain, numbered and bulleted lists, close examination will reveal that they
- * are not strictly necessary. If the inputs to the listInCell() and
- * multilLevelListInCell() methods are constructed to include the bullet
- * character or the item numbers then these methods alone may be sufficient.
- *
- * @author Mark Beardsley [msb at apache.org]
- */
-public class InCellLists {
-
-    // This character looks like a solid, black, loser case letter 'o'
-    // positioned up from the base line of the text.
-    private static final char BULLET_CHARACTER = '\u2022';
-
-    // The tab character - \t - cannot be used to create a tab space
-    // within a cell as it is rendered as a square. Therefore, four
-    // spaces are used to simulate that character.
-    private static final String TAB = "    ";
-
-    /**
-     * Call each of the list creation methods.
-     *
-     * @param outputFilename A String that encapsulates the name of and path to
-     *                       the Excel spreadsheet file this code will create.
-     */
-    public void demonstrateMethodCalls(String outputFilename) throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        try {
-            HSSFSheet sheet = workbook.createSheet("In Cell Lists");
-            HSSFRow row = sheet.createRow(0);
-
-            // Create a cell at A1 and insert a single, bulleted, item into
-            // that cell.
-            HSSFCell cell = row.createCell(0);
-            this.bulletedItemInCell(workbook, "List Item", cell);
-
-            // Create a cell at A2 and insert a plain list - that is one
-            // whose items are neither bulleted or numbered - into that cell.
-            row = sheet.createRow(1);
-            cell = row.createCell(0);
-            ArrayList<String> listItems = new ArrayList<String>();
-            listItems.add("List Item One.");
-            listItems.add("List Item Two.");
-            listItems.add("List Item Three.");
-            listItems.add("List Item Four.");
-            this.listInCell(workbook, listItems, cell);
-            // The row height and cell width are set here to ensure that the
-            // list may be seen.
-            row.setHeight((short)1100);
-            sheet.setColumnWidth(0, 9500);
-
-            // Create a cell at A3 and insert a numbered list into that cell.
-            // Note that a couple of items have been added to the listItems
-            // ArrayList
-            row = sheet.createRow(2);
-            cell = row.createCell(0);
-            listItems.add("List Item Five.");
-            listItems.add("List Item Six.");
-            this.numberedListInCell(workbook, listItems, cell, 1, 2);
-            row.setHeight((short)1550);
-
-            // Create a cell at A4 and insert a numbered list into that cell.
-            // Note that a couple of items have been added to the listItems
-            // ArrayList
-            row = sheet.createRow(3);
-            cell = row.createCell(0);
-            listItems.add("List Item Seven.");
-            listItems.add("List Item Eight.");
-            listItems.add("List Item Nine.");
-            listItems.add("List Item Ten.");
-            this.bulletedListInCell(workbook, listItems, cell);
-            row.setHeight((short)2550);
-
-            // Insert a plain, multi-level list into cell A5. Note that
-            // the major difference here is that the list items are passed as
-            // an ArrayList of MultiLevelListItems. Note that an ArrayList
-            // of instances of an inner class was used here in preference to
-            // a Hashtable or HashMap as the ArrayList will preserve the
-            // ordering of the items added to it; the first item added will
-            // be the first item recovered and the last item added, the last
-            // item recovered. Alternatively, a LinkedHashMap could be used
-            // to preserve order.
-            row = sheet.createRow(4);
-            cell = row.createCell(0);
-            ArrayList<MultiLevelListItem> multiLevelListItems = new ArrayList<MultiLevelListItem>();
-            listItems = new ArrayList<String>();
-            listItems.add("ML List Item One - Sub Item One.");
-            listItems.add("ML List Item One - Sub Item Two.");
-            listItems.add("ML List Item One - Sub Item Three.");
-            listItems.add("ML List Item One - Sub Item Four.");
-            multiLevelListItems.add(new MultiLevelListItem("List Item One.", listItems));
-            // Passing either null or an empty ArrayList will signal that
-            // there are no lower level items associated with the top level
-            // item
-            multiLevelListItems.add(new MultiLevelListItem("List Item Two.", null));
-            multiLevelListItems.add(new MultiLevelListItem("List Item Three.", null));
-            listItems = new ArrayList<String>();
-            listItems.add("ML List Item Four - Sub Item One.");
-            listItems.add("ML List Item Four - Sub Item Two.");
-            listItems.add("ML List Item Four - Sub Item Three.");
-            multiLevelListItems.add(new MultiLevelListItem("List Item Four.", listItems));
-            this.multiLevelListInCell(workbook, multiLevelListItems, cell);
-            row.setHeight((short)2800);
-
-            // Insert a numbered multi-level list into cell A6. Note that the
-            // same ArrayList as constructed for the above plain multi-level
-            // list example will be re-used
-            row = sheet.createRow(5);
-            cell = row.createCell(0);
-            this.multiLevelNumberedListInCell(workbook, multiLevelListItems,
-                                              cell, 1, 1, 1, 2);
-            row.setHeight((short)2800);
-
-            // Insert a numbered multi-level list into cell A7. Note that the
-            // same ArrayList as constructed for the plain multi-level list
-            // example will be re-used
-            row = sheet.createRow(6);
-            cell = row.createCell(0);
-            this.multiLevelBulletedListInCell(workbook, multiLevelListItems, cell);
-            row.setHeight((short)2800);
-
-            // Save the completed workbook
-            FileOutputStream fos = new FileOutputStream(new File(outputFilename));
-            try {
-                workbook.write(fos);
-            } finally {
-                fos.close();
-            }
-        }
-        catch(FileNotFoundException fnfEx) {
-            System.out.println("Caught a: " + fnfEx.getClass().getName());
-            System.out.println("Message: " + fnfEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            fnfEx.printStackTrace(System.out);
-        }
-        catch(IOException ioEx) {
-            System.out.println("Caught a: " + ioEx.getClass().getName());
-            System.out.println("Message: " + ioEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            ioEx.printStackTrace(System.out);
-        }
-        finally {
-            workbook.close();
-        }
-    }
-
-    /**
-     * Inserts a single bulleted item into a cell.
-     *
-     * @param workbook A reference to the HSSFWorkbook that 'contains' the
-     *                 cell.
-     * @param listItem An instance of the String class encapsulating the
-     *                 items text.
-     * @param cell An instance of the HSSFCell class that encapsulates a
-     *             reference to the spreadsheet cell into which the list item
-     *             will be written.
-     */
-    public void bulletedItemInCell(HSSFWorkbook workbook, String listItem, HSSFCell cell) {
-        // A format String must be built to ensure that the contents of the
-        // cell appear as a bulleted item.
-        HSSFDataFormat format = workbook.createDataFormat();
-        String formatString = InCellLists.BULLET_CHARACTER + " @";
-        int formatIndex = format.getFormat(formatString);
-
-        // Construct an HSSFCellStyle and set it's data formt to use the
-        // object created above.
-        HSSFCellStyle bulletStyle = workbook.createCellStyle();
-        bulletStyle.setDataFormat((short)formatIndex);
-
-        // Set the cells contents and style.
-        cell.setCellValue(new HSSFRichTextString(listItem));
-        cell.setCellStyle(bulletStyle);
-    }
-
-    /**
-     * Inserts a list of plain items - that is items that are neither
-     * numbered or bulleted - into a single cell.
-     *
-     * @param workbook A reference to the HSSFWorkbook that 'contains' the
-     *                 cell.
-     * @param listItems An ArrayList whose elements encapsulate the text for
-     *                  the list's items.
-     * @param cell An instance of the HSSFCell class that encapsulates a
-     *             reference to the spreadsheet cell into which the list
-     *             will be written.
-     */
-    public void listInCell(HSSFWorkbook workbook, ArrayList<String> listItems, HSSFCell cell) {
-        StringBuilder buffer = new StringBuilder();
-        HSSFCellStyle wrapStyle = workbook.createCellStyle();
-        wrapStyle.setWrapText(true);
-        for(String listItem : listItems) {
-            buffer.append(listItem);
-            buffer.append("\n");
-        }
-        // The StringBuffer's contents are the source for the contents
-        // of the cell.
-        cell.setCellValue(new HSSFRichTextString(buffer.toString().trim()));
-        cell.setCellStyle(wrapStyle);
-    }
-
-    /**
-     * Inserts a numbered list into a single cell.
-     *
-     * @param workbook A reference to the HSSFWorkbook that 'contains' the
-     *                 cell.
-     * @param listItems An ArrayList whose elements encapsulate the text for
-     *                  the lists items.
-     * @param cell An instance of the HSSFCell class that encapsulates a
-     *             reference to the spreadsheet cell into which the list
-     *             will be written.
-     * @param startingValue A primitive int containing the number for the first
-     *                      item in the list.
-     * @param increment A primitive int containing the value that should be used
-     *                  to calculate subsequent item numbers.
-     */
-    public void numberedListInCell(HSSFWorkbook workbook,
-                                   ArrayList<String> listItems,
-                                   HSSFCell cell,
-                                   int startingValue,
-                                   int increment) {
-        StringBuilder buffer = new StringBuilder();
-        int itemNumber = startingValue;
-        // Note that again, an HSSFCellStye object is required and that
-        // it's wrap text property should be set to 'true'
-        HSSFCellStyle wrapStyle = workbook.createCellStyle();
-        wrapStyle.setWrapText(true);
-        // Note that the basic method is identical to the listInCell() method
-        // with one difference; a number prefixed to the items text.
-        for(String listItem : listItems) {
-            buffer.append(itemNumber).append(". ");
-            buffer.append(listItem);
-            buffer.append("\n");
-            itemNumber += increment;
-        }
-        // The StringBuffer's contents are the source for the contents
-        // of the cell.
-        cell.setCellValue(new HSSFRichTextString(buffer.toString().trim()));
-        cell.setCellStyle(wrapStyle);
-    }
-
-    /**
-     * Insert a bulleted list into a cell.
-     *
-     * @param workbook A reference to the HSSFWorkbook that 'contains' the
-     *                 cell.
-     * @param listItems An ArrayList whose elements encapsulate the text for
-     *                  the lists items.
-     * @param cell An instance of the HSSFCell class that encapsulates a
-     *             reference to the spreadsheet cell into which the list
-     *             will be written.
-     */
-    public void bulletedListInCell(HSSFWorkbook workbook,
-                                   ArrayList<String> listItems,
-                                   HSSFCell cell) {
-        StringBuilder buffer = new StringBuilder();
-        // Note that again, an HSSFCellStye object is required and that
-        // it's wrap text property should be set to 'true'
-        HSSFCellStyle wrapStyle = workbook.createCellStyle();
-        wrapStyle.setWrapText(true);
-        // Note that the basic method is identical to the listInCell() method
-        // with one difference; the bullet character prefixed to the items text.
-        for(String listItem : listItems) {
-            buffer.append(InCellLists.BULLET_CHARACTER + " ");
-            buffer.append(listItem);
-            buffer.append("\n");
-        }
-        // The StringBuffer's contents are the source for the contents
-        // of the cell.
-        cell.setCellValue(new HSSFRichTextString(buffer.toString().trim()));
-        cell.setCellStyle(wrapStyle);
-    }
-
-    /**
-     * Insert a multi-level list into a cell.
-     *
-     * @param workbook A reference to the HSSFWorkbook that 'contains' the
-     *                 cell.
-     * @param multiLevelListItems An ArrayList whose elements contain instances
-     *                            of the MultiLevelListItem class. Each element
-     *                            encapsulates the text for the high level item
-     *                            along with an ArrayList. Each element of this
-     *                            ArrayList encapsulates the text for a lower
-     *                            level item.
-     * @param cell An instance of the HSSFCell class that encapsulates a
-     *             reference to the spreadsheet cell into which the list
-     *             will be written.
-     */
-    public void multiLevelListInCell(HSSFWorkbook workbook,
-                                     ArrayList<MultiLevelListItem> multiLevelListItems,
-                                     HSSFCell cell) {
-        StringBuilder buffer = new StringBuilder();
-        // Note that again, an HSSFCellStye object is required and that
-        // it's wrap text property should be set to 'true'
-        HSSFCellStyle wrapStyle = workbook.createCellStyle();
-        wrapStyle.setWrapText(true);
-        // Step through the ArrayList of MultilLevelListItem instances.
-        for(MultiLevelListItem multiLevelListItem : multiLevelListItems) {
-            // For each element in the ArrayList, get the text for the high
-            // level list item......
-            buffer.append(multiLevelListItem.getItemText());
-            buffer.append("\n");
-            // and then an ArrayList whose elements encapsulate the text
-            // for the lower level list items.
-            ArrayList<String> lowerLevelItems = multiLevelListItem.getLowerLevelItems();
-            if(!(lowerLevelItems == null) && !(lowerLevelItems.isEmpty())) {
-                for(String item : lowerLevelItems) {
-                    buffer.append(InCellLists.TAB);
-                    buffer.append(item);
-                    buffer.append("\n");
-                }
-            }
-        }
-        // The StringBuffer's contents are the source for the contents
-        // of the cell.
-        cell.setCellValue(new HSSFRichTextString(buffer.toString().trim()));
-        cell.setCellStyle(wrapStyle);
-    }
-
-    /**
-     * Insert a multi-level list into a cell.
-     *
-     * @param workbook A reference to the HSSFWorkbook that 'contains' the
-     *                 cell.
-     * @param multiLevelListItems An ArrayList whose elements contain instances
-     *                            of the MultiLevelListItem class. Each element
-     *                            encapsulates the text for the high level item
-     *                            along with an ArrayList. Each element of this
-     *                            ArrayList encapsulates the text for a lower
-     *                            level item.
-     * @param cell An instance of the HSSFCell class that encapsulates a
-     *             reference to the spreadsheet cell into which the list
-     *             will be written.
-     * @param highLevelStartingValue A primitive int containing the number
-     *                               for the first high level item in the list.
-     * @param highLevelIncrement A primitive int containing the value that
-     *                           should be used to calculate the number of
-     *                           subsequent high level item.
-     * @param lowLevelStartingValue A primitive int will containing the number
-     *                              for the first low level item associated
-     *                              with a high level item.
-     * @param lowLevelIncrement A primitive int containing the value that
-     *                          should be used to calculate the number of
-     *                          subsequent low level item.
-     */
-    public void multiLevelNumberedListInCell(HSSFWorkbook workbook,
-                                             ArrayList<MultiLevelListItem> multiLevelListItems,
-                                             HSSFCell cell,
-                                             int highLevelStartingValue,
-                                             int highLevelIncrement,
-                                             int lowLevelStartingValue,
-                                             int lowLevelIncrement) {
-        StringBuilder buffer = new StringBuilder();
-        int highLevelItemNumber = highLevelStartingValue;
-        // Note that again, an HSSFCellStye object is required and that
-        // it's wrap text property should be set to 'true'
-        HSSFCellStyle wrapStyle = workbook.createCellStyle();
-        wrapStyle.setWrapText(true);
-        // Step through the ArrayList of MultilLevelListItem instances.
-        for(MultiLevelListItem multiLevelListItem : multiLevelListItems) {
-            // For each element in the ArrayList, get the text for the high
-            // level list item......
-            buffer.append(highLevelItemNumber);
-            buffer.append(". ");
-            buffer.append(multiLevelListItem.getItemText());
-            buffer.append("\n");
-            // and then an ArrayList whose elements encapsulate the text
-            // for the lower level list items.
-            ArrayList<String> lowerLevelItems = multiLevelListItem.getLowerLevelItems();
-            if(!(lowerLevelItems == null) && !(lowerLevelItems.isEmpty())) {
-                int lowLevelItemNumber = lowLevelStartingValue;
-                for(String item : lowerLevelItems) {
-                    buffer.append(InCellLists.TAB);
-                    buffer.append(highLevelItemNumber);
-                    buffer.append(".");
-                    buffer.append(lowLevelItemNumber);
-                    buffer.append(" ");
-                    buffer.append(item);
-                    buffer.append("\n");
-                    lowLevelItemNumber += lowLevelIncrement;
-                }
-            }
-            highLevelItemNumber += highLevelIncrement;
-        }
-        // The StringBuffer's contents are the source for the contents
-        // of the cell.
-        cell.setCellValue(new HSSFRichTextString(buffer.toString().trim()));
-        cell.setCellStyle(wrapStyle);
-    }
-
-    /**
-     * Insert a bulleted multi-level list into a cell.
-     *
-     * @param workbook A reference to the HSSFWorkbook that 'contains' the
-     *                 cell.
-     * @param multiLevelListItems An ArrayList whose elements contain instances
-     *                            of the MultiLevelListItem class. Each element
-     *                            encapsulates the text for the high level item
-     *                            along with an ArrayList. Each element of this
-     *                            ArrayList encapsulates the text for a lower
-     *                            level item.
-     * @param cell An instance of the HSSFCell class that encapsulates a
-     *             reference to the spreadsheet cell into which the list
-     *             will be written.
-     */
-    public void multiLevelBulletedListInCell(HSSFWorkbook workbook,
-                                             ArrayList<MultiLevelListItem> multiLevelListItems,
-                                             HSSFCell cell) {
-        StringBuilder buffer = new StringBuilder();
-        // Note that again, an HSSFCellStye object is required and that
-        // it's wrap text property should be set to 'true'
-        HSSFCellStyle wrapStyle = workbook.createCellStyle();
-        wrapStyle.setWrapText(true);
-        // Step through the ArrayList of MultilLevelListItem instances.
-        for(MultiLevelListItem multiLevelListItem : multiLevelListItems) {
-            // For each element in the ArrayList, get the text for the high
-            // level list item......
-            buffer.append(InCellLists.BULLET_CHARACTER);
-            buffer.append(" ");
-            buffer.append(multiLevelListItem.getItemText());
-            buffer.append("\n");
-            // and then an ArrayList whose elements encapsulate the text
-            // for the lower level list items.
-            ArrayList<String> lowerLevelItems = multiLevelListItem.getLowerLevelItems();
-            if(!(lowerLevelItems == null) && !(lowerLevelItems.isEmpty())) {
-                for(String item : lowerLevelItems) {
-                    buffer.append(InCellLists.TAB);
-                    buffer.append(InCellLists.BULLET_CHARACTER);
-                    buffer.append(" ");
-                    buffer.append(item);
-                    buffer.append("\n");
-                }
-            }
-        }
-        // The StringBuffer's contents are the source for the contents
-        // of the cell.
-        cell.setCellValue(new HSSFRichTextString(buffer.toString().trim()));
-        cell.setCellStyle(wrapStyle);
-    }
-
-    /**
-     * The main entry point to the program. Demonstrates how to call the method
-     * that will create an Excel workbook containing many different sorts of
-     * lists.
-     *
-     * @param args the command line arguments.
-     */
-    public static void main(String[] args) throws IOException {
-        new InCellLists().demonstrateMethodCalls("Latest In Cell List.xls");
-    }
-
-    /**
-     * An instance of this inner class models an item or element in a
-     * multi-level list. Each multi-level list item consists of the text for the
-     * high level items and an ArrayList containing the text for each of the
-     * associated lower level items. When written into a cell, each multi-level
-     * list item will have this general appearance.
-     *
-     *     Item One
-     *         Sub Item One.
-     *         Sub Item Two.
-     *     Item Two
-     *         Sub Item One.
-     *         Sub Item Two.
-     *     etc.
-     *
-     * It would be quite possible to modify this class to model much more
-     * complex list structures descending through two, three or even more
-     * levels.
-     */
-    public final class MultiLevelListItem {
-
-        private String itemText = null;
-        private ArrayList<String> lowerLevelItems = null;
-
-        /**
-         * Create a new instance of the MultiLevelListItem class using the
-         * following parameters.
-         *
-         * @param itemText A String that encapsulates the text for the high
-         *                 level list item.
-         * @param lowerLevelItems An ArrayList whose elements encapsulate the
-         *                        text for the associated lower level list
-         *                        items.
-         */
-        public MultiLevelListItem(String itemText, ArrayList<String> lowerLevelItems) {
-            this.itemText = itemText;
-            this.lowerLevelItems = lowerLevelItems;
-        }
-
-        /**
-         * Get the text for the high level list item.
-         *
-         * @return A String that encapsulates the text for the high level list
-         *         item.
-         */
-        public String getItemText() {
-            return(this.itemText);
-        }
-
-        /**
-         * Get the text for the associated lower level list items.
-         *
-         * @return An ArrayList whose elements each encapsulate the text for a
-         *         single associated lower level list item.
-         */
-        public ArrayList<String> getLowerLevelItems() {
-            return(this.lowerLevelItems);
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/MergedCells.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/MergedCells.java
deleted file mode 100644
index 31e5215..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/MergedCells.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-import java.io.IOException;
-import java.io.FileOutputStream;
-
-/**
- * An example of how to merge regions of cells.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class MergedCells {
-   public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-
-        HSSFRow row = sheet.createRow(1);
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue("This is a test of merging");
-
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 1, 2));
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java
deleted file mode 100644
index 018556f..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.CellType;
-
-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 f2 = wb.createFont();
-
-		cs = wb.createCellStyle();
-
-		cs.setFont(f2);
-		// Word Wrap MUST be turned on
-		cs.setWrapText(true);
-
-		r = s.createRow(2);
-		r.setHeight((short) 0x349);
-		c = r.createCell(2);
-		c.setCellType(CellType.STRING);
-		c.setCellValue("Use \n with word wrap on to create a new line");
-		c.setCellStyle(cs);
-		s.setColumnWidth(2, (int) ((50 * 8) / ((double) 1 / 20)));
-
-		FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-		wb.write(fileOut);
-		fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
deleted file mode 100644
index 495543e..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.WorkbookUtil;
-
-/**
- * Creates a new workbook with a sheet that's been explicitly defined.
- */
-public abstract class NewSheet {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("new sheet");
-        // create with default name
-        wb.createSheet();
-        final String name = "second sheet";
-        // setting sheet name later
-        wb.setSheetName(1, WorkbookUtil.createSafeSheetName(name));
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
deleted file mode 100644
index c1614e6..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * This example creates a new blank workbook.  This workbook will contain a single blank sheet.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class NewWorkbook
-{
-    public static void main(String[] args)
-        throws IOException
-    {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawing.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawing.java
deleted file mode 100644
index 68aafbc..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawing.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-
-import java.io.*;
-
-/**
- * Demonstrates how to use the office drawing capabilities of POI.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class OfficeDrawing {
-    public static void main(String[] args) throws IOException {
-        // Create the workbook and sheets.
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("new sheet");
-        HSSFSheet sheet2 = wb.createSheet("second sheet");
-        HSSFSheet sheet3 = wb.createSheet("third sheet");
-        HSSFSheet sheet4 = wb.createSheet("fourth sheet");
-        HSSFSheet sheet5 = wb.createSheet("fifth sheet");
-
-        // Draw stuff in them
-        drawSheet1( sheet1 );
-        drawSheet2( sheet2 );
-        drawSheet3( sheet3 );
-        drawSheet4( sheet4, wb );
-        drawSheet5( sheet5, wb );
-
-        // Write the file out.
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-
-    private static void drawSheet1( HSSFSheet sheet1 )
-    {
-        // Create a row and size one of the cells reasonably large.
-        HSSFRow row = sheet1.createRow(2);
-        row.setHeight((short) 2800);
-        row.createCell(1);
-        sheet1.setColumnWidth(2, 9000);
-
-        // Create the drawing patriarch.  This is the top level container for
-        // all shapes.
-        HSSFPatriarch patriarch = sheet1.createDrawingPatriarch();
-
-        // Draw some lines and an oval.
-        drawLinesToCenter( patriarch );
-        drawManyLines( patriarch );
-        drawOval( patriarch );
-        drawPolygon( patriarch );
-
-        // Draw a rectangle.
-        HSSFSimpleShape rect = patriarch.createSimpleShape( new HSSFClientAnchor(100, 100, 900, 200, (short)0, 0, (short)0, 0) );
-        rect.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-    }
-
-    private static void drawSheet2( HSSFSheet sheet2 )
-    {
-        // Create a row and size one of the cells reasonably large.
-        HSSFRow row = sheet2.createRow(2);
-        row.createCell(1);
-        row.setHeightInPoints(240);
-        sheet2.setColumnWidth(2, 9000);
-
-        // Create the drawing patriarch.  This is the top level container for
-        // all shapes. This will clear out any existing shapes for that sheet.
-        HSSFPatriarch patriarch = sheet2.createDrawingPatriarch();
-
-        // Draw a grid in one of the cells.
-        drawGrid( patriarch );
-    }
-
-    private static void drawSheet3( HSSFSheet sheet3 )
-    {
-        // Create a row and size one of the cells reasonably large
-        HSSFRow row = sheet3.createRow(2);
-        row.setHeightInPoints(140);
-        row.createCell(1);
-        sheet3.setColumnWidth(2, 9000);
-
-        // Create the drawing patriarch.  This is the top level container for
-        // all shapes. This will clear out any existing shapes for that sheet.
-        HSSFPatriarch patriarch = sheet3.createDrawingPatriarch();
-
-        // Create a shape group.
-        HSSFShapeGroup group = patriarch.createGroup(
-                new HSSFClientAnchor(0,0,900,200,(short)2,2,(short)2,2));
-
-        // Create a couple of lines in the group.
-        HSSFSimpleShape shape1 = group.createShape(new HSSFChildAnchor(3,3,500,500));
-        shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-        ( (HSSFChildAnchor) shape1.getAnchor() ).setAnchor((short)3,3,500,500);
-        HSSFSimpleShape shape2 = group.createShape(new HSSFChildAnchor((short)1,200,400,600));
-        shape2.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-
-    }
-
-    private static void drawSheet4( HSSFSheet sheet4, HSSFWorkbook wb )
-    {
-        // Create the drawing patriarch.  This is the top level container for
-        // all shapes. This will clear out any existing shapes for that sheet.
-        HSSFPatriarch patriarch = sheet4.createDrawingPatriarch();
-
-        // Create a couple of textboxes
-        HSSFTextbox textbox1 = patriarch.createTextbox(
-                new HSSFClientAnchor(0,0,0,0,(short)1,1,(short)2,2));
-        textbox1.setString(new HSSFRichTextString("This is a test") );
-        HSSFTextbox textbox2 = patriarch.createTextbox(
-                new HSSFClientAnchor(0,0,900,100,(short)3,3,(short)3,4));
-        textbox2.setString(new HSSFRichTextString("Woo") );
-        textbox2.setFillColor(200,0,0);
-        textbox2.setLineStyle(HSSFSimpleShape.LINESTYLE_DOTGEL);
-
-        // Create third one with some fancy font styling.
-        HSSFTextbox textbox3 = patriarch.createTextbox(
-                new HSSFClientAnchor(0,0,900,100,(short)4,4,(short)5,4+1));
-        HSSFFont font = wb.createFont();
-        font.setItalic(true);
-        font.setUnderline(HSSFFont.U_DOUBLE);
-        HSSFRichTextString string = new HSSFRichTextString("Woo!!!");
-        string.applyFont(2,5,font);
-        textbox3.setString(string );
-        textbox3.setFillColor(0x08000030);
-        textbox3.setLineStyle(HSSFSimpleShape.LINESTYLE_NONE);  // no line around the textbox.
-        textbox3.setNoFill(true);    // make it transparent
-    }
-
-    private static void drawSheet5( HSSFSheet sheet5, HSSFWorkbook wb ) throws IOException
-    {
-
-        // Create the drawing patriarch.  This is the top level container for
-        // all shapes. This will clear out any existing shapes for that sheet.
-        HSSFPatriarch patriarch = sheet5.createDrawingPatriarch();
-
-        HSSFClientAnchor anchor;
-        anchor = new HSSFClientAnchor(0,0,0,255,(short)2,2,(short)4,7);
-        anchor.setAnchorType( AnchorType.MOVE_DONT_RESIZE );
-        patriarch.createPicture(anchor, loadPicture( "src/resources/logos/logoKarmokar4.png", wb ));
-
-        anchor = new HSSFClientAnchor(0,0,0,255,(short)4,2,(short)5,7);
-        anchor.setAnchorType( AnchorType.MOVE_DONT_RESIZE );
-        patriarch.createPicture(anchor, loadPicture( "src/resources/logos/logoKarmokar4edited.png", wb ));
-
-        anchor = new HSSFClientAnchor(0,0,1023,255,(short)6,2,(short)8,7);
-        anchor.setAnchorType( AnchorType.MOVE_DONT_RESIZE );
-        HSSFPicture picture = patriarch.createPicture(anchor, loadPicture( "src/resources/logos/logoKarmokar4s.png", wb ));
-        //Reset the image to the original size.
-        picture.resize();
-        picture.setLineStyle( HSSFShape.LINESTYLE_DASHDOTGEL );
-
-    }
-
-    private static int loadPicture( String path, HSSFWorkbook wb ) throws IOException
-    {
-        int pictureIndex;
-        FileInputStream fis = null;
-        ByteArrayOutputStream bos = null;
-        try
-        {
-            fis = new FileInputStream( path);
-            bos = new ByteArrayOutputStream( );
-            int c;
-            while ( (c = fis.read()) != -1)
-                bos.write( c );
-            pictureIndex = wb.addPicture( bos.toByteArray(), HSSFWorkbook.PICTURE_TYPE_PNG );
-        }
-        finally
-        {
-            if (fis != null)
-                fis.close();
-            if (bos != null)
-                bos.close();
-        }
-        return pictureIndex;
-    }
-
-    private static void drawOval( HSSFPatriarch patriarch )
-    {
-        // Create an oval and style to taste.
-        HSSFClientAnchor a = new HSSFClientAnchor();
-        a.setAnchor((short)2, 2, 20, 20, (short) 2, 2, 190, 80);
-        HSSFSimpleShape s = patriarch.createSimpleShape(a);
-        s.setShapeType(HSSFSimpleShape.OBJECT_TYPE_OVAL);
-        s.setLineStyleColor(10,10,10);
-        s.setFillColor(90,10,200);
-        s.setLineWidth(HSSFShape.LINEWIDTH_ONE_PT * 3);
-        s.setLineStyle(HSSFShape.LINESTYLE_DOTSYS);
-    }
-
-    private static void drawPolygon( HSSFPatriarch patriarch )
-    {
-        //        HSSFClientAnchor a = new HSSFClientAnchor( 0, 0, 1023, 255, (short) 2, 2, (short) 3, 3 );
-        //        HSSFPolygon p = patriarch.createPolygon(a);
-        //        p.setPolygonDrawArea(100,100);
-        //        p.setPoints( new int[]{30, 90, 50}, new int[]{88, 5, 44} );
-
-
-        HSSFClientAnchor a = new HSSFClientAnchor();
-        a.setAnchor( (short) 2, 2, 0, 0, (short) 3, 3, 1023, 255 );
-        HSSFShapeGroup g = patriarch.createGroup( a );
-        g.setCoordinates(0,0,200,200);
-        HSSFPolygon p1 = g.createPolygon( new HSSFChildAnchor( 0, 0, 200, 200 ) );
-        p1.setPolygonDrawArea( 100, 100 );
-        p1.setPoints( new int[]{0, 90, 50}, new int[]{5, 5, 44} );
-        p1.setFillColor( 0, 255, 0 );
-        HSSFPolygon p2 = g.createPolygon( new HSSFChildAnchor( 20, 20, 200, 200 ) );
-        p2.setPolygonDrawArea( 200, 200 );
-        p2.setPoints( new int[]{120, 20, 150}, new int[]{105, 30, 195} );
-        p2.setFillColor( 255, 0, 0 );
-    }
-
-    private static void drawManyLines( HSSFPatriarch patriarch )
-    {
-        // Draw bunch of lines
-        int x1 = 100;
-        int y1 = 100;
-        int x2 = 800;
-        int y2 = 200;
-        int color = 0;
-        for (int i = 0; i < 10; i++)
-        {
-            HSSFClientAnchor a2 = new HSSFClientAnchor();
-            a2.setAnchor((short) 2, 2, x1, y1, (short) 2, 2, x2, y2);
-            HSSFSimpleShape shape2 = patriarch.createSimpleShape(a2);
-            shape2.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-            shape2.setLineStyleColor(color);
-            y1 -= 10;
-            y2 -= 10;
-            color += 30;
-        }
-    }
-
-    private static void drawGrid( HSSFPatriarch patriarch )
-    {
-        // This draws a grid of lines.  Since the coordinates space fixed at
-        // 1024 by 256 we use a ratio to get a reasonably square grids.
-
-        double xRatio = 3.22;
-        double yRatio = 0.6711;
-
-        int x1 = 000;
-        int y1 = 000;
-        int x2 = 000;
-        int y2 = 200;
-        for (int i = 0; i < 20; i++)
-        {
-            HSSFClientAnchor a2 = new HSSFClientAnchor();
-            a2.setAnchor((short) 2, 2, (int) ( x1 * xRatio ), (int) ( y1 * yRatio ),
-                    (short) 2, 2, (int) ( x2 * xRatio ), (int) ( y2 * yRatio ));
-            HSSFSimpleShape shape2 = patriarch.createSimpleShape(a2);
-            shape2.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-
-            x1 += 10;
-            x2 += 10;
-        }
-
-        x1 = 000;
-        y1 = 000;
-        x2 = 200;
-        y2 = 000;
-        for (int i = 0; i < 20; i++)
-        {
-            HSSFClientAnchor a2 = new HSSFClientAnchor();
-            a2.setAnchor((short) 2, 2, (int) ( x1 * xRatio ), (int) ( y1 * yRatio ),
-                    (short) 2, 2, (int) ( x2 * xRatio ), (int) ( y2 * yRatio ));
-            HSSFSimpleShape shape2 = patriarch.createSimpleShape(a2);
-            shape2.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-
-            y1 += 10;
-            y2 += 10;
-        }
-    }
-
-    private static void drawLinesToCenter( HSSFPatriarch patriarch )
-    {
-        // Draw some lines from and to the corners
-        {
-            HSSFClientAnchor a1 = new HSSFClientAnchor();
-            a1.setAnchor( (short)2, 2, 0, 0, (short) 2, 2, 512, 128);
-            HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-            shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-        }
-        {
-            HSSFClientAnchor a1 = new HSSFClientAnchor();
-            a1.setAnchor( (short)2, 2, 512, 128, (short) 2, 2, 1024, 0);
-            HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-            shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-        }
-        {
-            HSSFClientAnchor a1 = new HSSFClientAnchor();
-            a1.setAnchor( (short)1, 1, 0, 0, (short) 1, 1, 512, 100);
-            HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-            shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-        }
-        {
-            HSSFClientAnchor a1 = new HSSFClientAnchor();
-            a1.setAnchor( (short)1, 1, 512, 100, (short) 1, 1, 1024, 0);
-            HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-            shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-        }
-
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawingWithGraphics.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawingWithGraphics.java
deleted file mode 100644
index 4de1207..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawingWithGraphics.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-
-import java.awt.*;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Demonstrates the use of the EscherGraphics2d library.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class OfficeDrawingWithGraphics {
-    public static void main( String[] args ) throws IOException {
-        // Create a workbook with one sheet and size the first three somewhat
-        // larger so we can fit the chemical structure diagram in.
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet( "my drawing" );
-        sheet.setColumnWidth(1, 256 * 27);
-        HSSFRow row1 = sheet.createRow(0);
-        row1.setHeightInPoints(10 * 15);
-        HSSFRow row2 = sheet.createRow(1);
-        row2.setHeightInPoints(5 * 15);
-        HSSFRow row3 = sheet.createRow(2);
-        row3.setHeightInPoints(10 * 15);
-
-        // Add some cells so we can test that the anchoring works when we
-        // sort them.
-        row1.createCell(0).setCellValue("C");
-        row2.createCell(0).setCellValue("A");
-        row3.createCell(0).setCellValue("B");
-
-        // Create the top level drawing patriarch.
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFClientAnchor a;
-        HSSFShapeGroup group;
-        EscherGraphics g;
-        EscherGraphics2d g2d;
-        // Anchor entirely within one cell.
-        a = new HSSFClientAnchor( 0, 0, 1023, 255, (short) 1, 0, (short) 1, 0 );
-        group = patriarch.createGroup( a );
-        group.setCoordinates( 0, 0, 320, 276 );
-        float verticalPointsPerPixel = a.getAnchorHeightInPoints(sheet) / Math.abs(group.getY2() - group.getY1());
-        g = new EscherGraphics( group, wb, Color.black, verticalPointsPerPixel );
-        g2d = new EscherGraphics2d( g );
-        drawStar( g2d );
-
-        a = new HSSFClientAnchor( 0, 0, 1023, 255, (short) 1, 1, (short) 1, 1 );
-        group = patriarch.createGroup( a );
-        group.setCoordinates( 0, 0, 640, 276 );
-        verticalPointsPerPixel = a.getAnchorHeightInPoints(sheet) / Math.abs(group.getY2() - group.getY1());
-//        verticalPixelsPerPoint = (float)Math.abs(group.getY2() - group.getY1()) / a.getAnchorHeightInPoints(sheet);
-        g = new EscherGraphics( group, wb, Color.black, verticalPointsPerPixel );
-        g2d = new EscherGraphics2d( g );
-        drawStar( g2d );
-
-        FileOutputStream out = new FileOutputStream("workbook.xls");
-        wb.write(out);
-        out.close();
-
-    }
-
-    private static void drawStar( EscherGraphics2d g2d )
-    {
-        g2d.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
-        for (double i = 0; i < Math.PI; i += 0.1)
-        {
-            g2d.setColor( new Color((int)(i * 5343062d) ) );
-            int x1 = (int) ( Math.cos(i) * 160.0 ) + 160;
-            int y1 = (int) ( Math.sin(i) * 138.0 ) + 138;
-            int x2 = (int) ( -Math.cos(i) * 160.0 ) + 160;
-            int y2 = (int) ( -Math.sin(i) * 138.0 ) + 138;
-            g2d.setStroke(new BasicStroke(2));
-            g2d.drawLine(x1,y1,x2,y2);
-        }
-        g2d.setFont(new Font("SansSerif",Font.BOLD | Font.ITALIC, 20));
-        g2d.drawString("EscherGraphics2d",70,100);
-        g2d.setColor(Color.yellow);
-        g2d.fillOval( 160-20,138-20,40,40);
-        g2d.setColor(Color.black);
-        g2d.fillPolygon(new int[] {-10+160,0+160,10+160,0+160}, new int[] {0+138,10+138,0+138,-10+138}, 4);
-        g2d.drawPolygon(new int[] {-160+160,0+160,160+160,0+160}, new int[] {0+138,138+138,0+138,-138+138}, 4);
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Outlines.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Outlines.java
deleted file mode 100644
index ad93f5e..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/Outlines.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.Closeable;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Creates outlines.
- */
-public class Outlines implements Closeable {
-    public static void main(String[] args)
-    throws IOException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-        POILogger LOGGER = POILogFactory.getLogger(Outlines.class);
-        for (int i=1; i<=13; i++) {
-            Outlines o = new Outlines();
-            try {
-                String log = (String)Outlines.class.getDeclaredMethod("test"+i).invoke(o);
-                String filename = "outline"+i+".xls";
-                o.writeOut(filename);
-                LOGGER.log(POILogger.INFO, filename+" written. "+log);
-            } finally {
-                o.close();
-            }
-        }
-    }
-
-    private final HSSFWorkbook wb = new HSSFWorkbook();
-    private final HSSFSheet sheet1 = wb.createSheet("new sheet");
-
-    public void writeOut(String filename) throws IOException {
-        FileOutputStream fileOut = new FileOutputStream(filename);
-        try {
-            wb.write(fileOut);
-        } finally {
-            fileOut.close();
-        }
-    }
-    
-    @Override
-    public void close() throws IOException {
-        wb.close();
-    }
-
-    public String test1() {
-        sheet1.groupColumn(4, 7);
-
-        for (int row = 0; row < 200; row++) {
-            HSSFRow r = sheet1.createRow(row);
-            for (int column = 0; column < 200; column++) {
-                HSSFCell c = r.createCell(column);
-                c.setCellValue(column);
-            }
-        }
-        return "Two expanded groups.";
-    }
-
-    public String test2() {
-        sheet1.groupColumn(2, 10);
-        sheet1.groupColumn(4, 7);
-        sheet1.setColumnGroupCollapsed(4, true);
-        return "Two groups.  Inner group collapsed.";
-    }
-
-    public String test3() {
-        sheet1.groupColumn(2, 10);
-        sheet1.groupColumn(4, 7);
-        sheet1.setColumnGroupCollapsed(4, true);
-        sheet1.setColumnGroupCollapsed(2, true);
-        return "Two groups.  Both collapsed.";
-    }
-
-    public String test4() {
-        sheet1.groupColumn(2, 10);
-        sheet1.groupColumn(4, 7);
-        sheet1.setColumnGroupCollapsed(4, true);
-        sheet1.setColumnGroupCollapsed(2, true);
-
-        sheet1.setColumnGroupCollapsed(4, false);
-        return "Two groups.  Collapsed then inner group expanded.";
-    }
-
-    public String test5() {
-        sheet1.groupColumn(2, 10);
-        sheet1.groupColumn(4, 7);
-        sheet1.setColumnGroupCollapsed(4, true);
-        sheet1.setColumnGroupCollapsed(2, true);
-
-        sheet1.setColumnGroupCollapsed(4, false);
-        sheet1.setColumnGroupCollapsed(3, false);
-        return "Two groups.  Collapsed then reexpanded.";
-    }
-
-    public String test6() {
-        sheet1.groupColumn(2, 10);
-        sheet1.groupColumn(4, 10);
-        sheet1.setColumnGroupCollapsed(4, true);
-        sheet1.setColumnGroupCollapsed(2, true);
-
-        sheet1.setColumnGroupCollapsed(3, false);
-        return "Two groups with matching end points.  Second group collapsed.";
-    }
-
-    public String test7() {
-        sheet1.groupRow(5, 14);
-        sheet1.groupRow(7, 10);
-        return "Row outlines.";
-    }
-
-    public String test8() {
-        sheet1.groupRow(5, 14);
-        sheet1.groupRow(7, 10);
-        sheet1.setRowGroupCollapsed(7, true);
-        return "Row outlines.  Inner group collapsed.";
-    }
-
-    public String test9() {
-        sheet1.groupRow(5, 14);
-        sheet1.groupRow(7, 10);
-        sheet1.setRowGroupCollapsed(7, true);
-        sheet1.setRowGroupCollapsed(5, true);
-        return "Row outlines.  Both collapsed.";
-    }
-
-    public String test10() {
-        sheet1.groupRow(5, 14);
-        sheet1.groupRow(7, 10);
-        sheet1.setRowGroupCollapsed(7, true);
-        sheet1.setRowGroupCollapsed(5, true);
-        sheet1.setRowGroupCollapsed(8, false);
-        return "Row outlines.  Collapsed then inner group expanded.";
-    }
-
-    public String test11() {
-        sheet1.groupRow(5, 14);
-        sheet1.groupRow(7, 10);
-        sheet1.setRowGroupCollapsed(7, true);
-        sheet1.setRowGroupCollapsed(5, true);
-        sheet1.setRowGroupCollapsed(8, false);
-        sheet1.setRowGroupCollapsed(14, false);
-        return "Row outlines.  Collapsed then expanded.";
-    }
-
-    public String test12() {
-        sheet1.groupRow(5, 14);
-        sheet1.groupRow(7, 14);
-        sheet1.setRowGroupCollapsed(7, true);
-        sheet1.setRowGroupCollapsed(5, true);
-        sheet1.setRowGroupCollapsed(6, false);
-        return "Row outlines.  Two row groups with matching end points.  Second group collapsed.";
-    }
-
-    public String test13() {
-        sheet1.groupRow(5, 14);
-        sheet1.groupRow(7, 14);
-        sheet1.groupRow(16, 19);
-
-        sheet1.groupColumn(4, 7);
-        sheet1.groupColumn(9, 12);
-        sheet1.groupColumn(10, 11);
-        return "Mixed bag.";
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ReadWriteWorkbook.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ReadWriteWorkbook.java
deleted file mode 100644
index 2b3553f..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ReadWriteWorkbook.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.usermodel.CellType;
-
-/**
- * This example demonstrates opening a workbook, modifying it and writing
- * the results back out.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class ReadWriteWorkbook {
-    public static void main(String[] args) throws IOException {
-        FileInputStream fileIn = null;
-        FileOutputStream fileOut = null;
-
-        try
-        {
-            fileIn = new FileInputStream("workbook.xls");
-            POIFSFileSystem fs = new POIFSFileSystem(fileIn);
-            HSSFWorkbook wb = new HSSFWorkbook(fs);
-            HSSFSheet sheet = wb.getSheetAt(0);
-            HSSFRow row = sheet.getRow(2);
-            if (row == null)
-                row = sheet.createRow(2);
-            HSSFCell cell = row.getCell(3);
-            if (cell == null)
-                cell = row.createCell(3);
-            cell.setCellType(CellType.STRING);
-            cell.setCellValue("a test");
-
-            // Write the output to a file
-            fileOut = new FileOutputStream("workbookout.xls");
-            wb.write(fileOut);
-        } finally {
-            if (fileOut != null)
-                fileOut.close();
-            if (fileIn != null)
-                fileIn.close();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/RepeatingRowsAndColumns.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/RepeatingRowsAndColumns.java
deleted file mode 100644
index 6ceee7c..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/RepeatingRowsAndColumns.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-public class RepeatingRowsAndColumns {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("first sheet");
-        HSSFSheet sheet2 = wb.createSheet("second sheet");
-        HSSFSheet sheet3 = wb.createSheet("third sheet");
-
-        HSSFFont boldFont = wb.createFont();
-        boldFont.setFontHeightInPoints((short)22);
-        boldFont.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-
-        HSSFCellStyle boldStyle = wb.createCellStyle();
-        boldStyle.setFont(boldFont);
-
-        HSSFRow row = sheet1.createRow(1);
-        HSSFCell cell = row.createCell(0);
-        cell.setCellValue("This quick brown fox");
-        cell.setCellStyle(boldStyle);
-
-        // Set the columns to repeat from column 0 to 2 on the first sheet
-        sheet1.setRepeatingColumns(CellRangeAddress.valueOf("A:C"));
-        // Set the rows to repeat from row 0 to 2 on the second sheet.
-        sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:3"));
-        // Set the the repeating rows and columns on the third sheet.
-        CellRangeAddress cra = CellRangeAddress.valueOf("D1:E2"); 
-        sheet3.setRepeatingColumns(cra);
-        sheet3.setRepeatingRows(cra);
-
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/SplitAndFreezePanes.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/SplitAndFreezePanes.java
deleted file mode 100644
index 6e93a31..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/SplitAndFreezePanes.java
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-
-import java.io.IOException;
-import java.io.FileOutputStream;
-
-/**
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class SplitAndFreezePanes
-{
-    public static void main(String[] args)
-        throws IOException
-    {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("new sheet");
-        HSSFSheet sheet2 = wb.createSheet("second sheet");
-        HSSFSheet sheet3 = wb.createSheet("third sheet");
-        HSSFSheet sheet4 = wb.createSheet("fourth sheet");
-
-        // Freeze just one row
-        sheet1.createFreezePane( 0, 1, 0, 1 );
-        // Freeze just one column
-        sheet2.createFreezePane( 1, 0, 1, 0 );
-        // Freeze the columns and rows (forget about scrolling position of the lower right quadrant).
-        sheet3.createFreezePane( 2, 2 );
-        // Create a split with the lower left side being the active quadrant
-        sheet4.createSplitPane( 2000, 2000, 0, 0, HSSFSheet.PANE_LOWER_LEFT );
-
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/WorkingWithFonts.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/WorkingWithFonts.java
deleted file mode 100644
index 6cb1594..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/WorkingWithFonts.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Demonstrates how to create and use fonts.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class WorkingWithFonts {
-    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(1);
-
-        // Create a new font and alter it.
-        HSSFFont font = wb.createFont();
-        font.setFontHeightInPoints((short)24);
-        font.setFontName("Courier New");
-        font.setItalic(true);
-        font.setStrikeout(true);
-
-        // Fonts are set into a style so create a new one to use.
-        HSSFCellStyle style = wb.createCellStyle();
-        style.setFont(font);
-
-        // Create a cell and put a value in it.
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue("This is a test of fonts");
-        cell.setCellStyle(style);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ZoomSheet.java b/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ZoomSheet.java
deleted file mode 100644
index f83b590..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ZoomSheet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.usermodel.examples;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-
-import java.io.IOException;
-import java.io.FileOutputStream;
-
-/**
- * Sets the zoom magnication for a sheet.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class ZoomSheet
-{
-    public static void main(String[] args)
-        throws IOException
-    {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("new sheet");
-        sheet1.setZoom(75);   // 75 percent magnification
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVBorder.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVBorder.java
deleted file mode 100644
index 273ed07..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVBorder.java
+++ /dev/null
@@ -1,553 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.hssf.view;
-
-import java.awt.*;
-
-import javax.swing.border.AbstractBorder;
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-
-/**
- * This is an attempt to implement Excel style borders for the SheetViewer.
- * Mostly just overrides stuff so the javadoc won't appear here but will 
- * appear in the generated stuff.
- * 
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height
- */
-public class SVBorder extends AbstractBorder {
-  private Color northColor = null;
-  private Color eastColor = null;
-  private Color southColor = null;
-  private Color westColor = null;
-  private BorderStyle northBorderType = BorderStyle.NONE;
-  private BorderStyle eastBorderType = BorderStyle.NONE;
-  private BorderStyle southBorderType = BorderStyle.NONE;
-  private BorderStyle westBorderType = BorderStyle.NONE;
-  private boolean northBorder=false;
-  private boolean eastBorder=false;
-  private boolean southBorder=false;
-  private boolean westBorder=false;
-  private boolean selected = false;
-
-   public void setBorder(Color northColor, Color eastColor,
-                         Color southColor, Color westColor,
-                         BorderStyle northBorderType, BorderStyle eastBorderType,
-                         BorderStyle southBorderType, BorderStyle westBorderType,
-                         boolean selected) {
-     this.eastColor = eastColor;
-     this.southColor = southColor;
-     this.westColor = westColor;
-     this.northBorderType = northBorderType;
-     this.eastBorderType = eastBorderType;
-     this.southBorderType = southBorderType;
-     this.westBorderType = westBorderType;
-     this.northBorder=northBorderType != BorderStyle.NONE;
-     this.eastBorder=eastBorderType != BorderStyle.NONE;
-     this.southBorder=southBorderType != BorderStyle.NONE;
-     this.westBorder=westBorderType != BorderStyle.NONE;
-     this.selected = selected;
-   }
-
-   @Override
-public void paintBorder(Component c, Graphics g, int x, int y, int width,
-                           int height) {
-      Color oldColor = g.getColor();
-
-
-     paintSelectedBorder(g, x, y, width, height);
-     paintNormalBorders(g, x, y, width, height);
-     paintDottedBorders(g, x, y, width, height);
-     paintDashedBorders(g, x, y, width, height);
-     paintDoubleBorders(g, x, y, width, height);
-     paintDashDotDotBorders(g, x, y, width, height);
-
-
-     g.setColor(oldColor);
-   }
-
-   /**
-    * Called by paintBorder to paint the border of a selected cell.
-    * The paramaters are the Graphics object, location and dimensions of the 
-    * cell.
-    */
-   private void paintSelectedBorder(Graphics g, int x, int y, int width,
-                                  int height) {
-     if (selected) {
-       //Need to setup thickness of 2
-       g.setColor(Color.black);
-       //paint the border
-       g.drawRect(x,y,width-1,height-1);
-
-       //paint the filled rectangle at the bottom left hand position
-       g.fillRect(x+width-5, y+height-5, 5, 5);
-     }
-   }
-
-
-   /**
-    * Called by paintBorder to paint the various versions of normal line
-    * borders for a cell.  
-    */
-   private void paintNormalBorders(Graphics g, int x, int y, int width,
-                                  int height) {
-
-      if (northBorder &&
-             ((northBorderType == BorderStyle.THIN) ||
-              (northBorderType == BorderStyle.MEDIUM) ||
-              (northBorderType == BorderStyle.THICK)
-             )
-         ) {
-
-        int thickness = getThickness(northBorderType);
-
-      	g.setColor(northColor);
-
-        for (int k=0; k < thickness; k++) {
-           g.drawLine(x,y+k,width,y+k);
-        }
-      }
-
-      if (eastBorder &&
-             ((eastBorderType == BorderStyle.THIN) ||
-              (eastBorderType == BorderStyle.MEDIUM) ||
-              (eastBorderType == BorderStyle.THICK)
-             )
-         ) {
-
-        int thickness = getThickness(eastBorderType);
-
-      	g.setColor(eastColor);
-
-        for (int k=0; k < thickness; k++) {
-           g.drawLine(width-k,y,width-k,height);
-        }
-      }
-
-      if (southBorder &&
-              ((southBorderType == BorderStyle.THIN) ||
-               (southBorderType == BorderStyle.MEDIUM) ||
-               (southBorderType == BorderStyle.THICK)
-              )
-         ) {
-
-        int thickness = getThickness(southBorderType);
-
-      	g.setColor(southColor);
-        for (int k=0; k < thickness; k++) {
-           g.drawLine(x,height - k,width,height - k);
-        }
-      }
-
-      if (westBorder &&
-             ((westBorderType == BorderStyle.THIN) ||
-              (westBorderType == BorderStyle.MEDIUM) ||
-              (westBorderType == BorderStyle.THICK)
-             )
-         ) {
-
-        int thickness = getThickness(westBorderType);
-
-      	g.setColor(westColor);
-
-        for (int k=0; k < thickness; k++) {
-           g.drawLine(x+k,y,x+k,height);
-        }
-      }
-   }
-
-   /**
-    * Called by paintBorder to paint the dotted line
-    * borders for a cell.  
-    */
-   private void paintDottedBorders(Graphics g, int x, int y, int width,
-                                  int height) {
-      if (northBorder &&
-             northBorderType == BorderStyle.DOTTED) {
-        int thickness = getThickness(northBorderType);
-
-      	g.setColor(northColor);
-
-        for (int k=0; k < thickness; k++) {
-           for (int xc = x; xc < width; xc=xc+2) {
-             g.drawLine(xc,y+k,xc,y+k);
-           }
-        }
-      }
-
-      if (eastBorder &&
-              eastBorderType == BorderStyle.DOTTED
-         ) {
-
-        int thickness = getThickness(eastBorderType);
-        thickness++; //need for dotted borders to show up east
-
-      	g.setColor(eastColor);
-
-        for (int k=0; k < thickness; k++) {
-           for (int yc=y;yc < height; yc=yc+2) {
-                g.drawLine(width-k,yc,width-k,yc);
-           }
-        }
-      }
-
-      if (southBorder &&
-              southBorderType == BorderStyle.DOTTED
-         ) {
-
-        int thickness = getThickness(southBorderType);
-        thickness++;
-      	g.setColor(southColor);
-        for (int k=0; k < thickness; k++) {
-           for (int xc = x; xc < width; xc=xc+2) {
-             g.drawLine(xc,height-k,xc,height-k);
-           }
-        }
-      }
-
-      if (westBorder &&
-            westBorderType == BorderStyle.DOTTED
-         ) {
-
-        int thickness = getThickness(westBorderType);
-//        thickness++;
-
-      	g.setColor(westColor);
-
-        for (int k=0; k < thickness; k++) {
-           for (int yc=y;yc < height; yc=yc+2) {
-                g.drawLine(x+k,yc,x+k,yc);
-           }
-        }
-      }
-   }
-
-   /**
-    * Called by paintBorder to paint the various versions of dotted line
-    * borders for a cell.  
-    */
-   private void paintDashedBorders(Graphics g, int x, int y, int width,
-                                  int height) {
-      if (northBorder &&
-             ((northBorderType == BorderStyle.DASHED) ||
-              (northBorderType == BorderStyle.HAIR))
-         ) {
-        int thickness = getThickness(northBorderType);
-
-        int dashlength = 1;
-
-        if (northBorderType == BorderStyle.DASHED)
-           dashlength = 2;
-
-      	g.setColor(northColor);
-
-        for (int k=0; k < thickness; k++) {
-           for (int xc = x; xc < width; xc=xc+5) {
-             g.drawLine(xc,y+k,xc+dashlength,y+k);
-           }
-        }
-      }
-
-      if (eastBorder &&
-              ((eastBorderType == BorderStyle.DASHED) ||
-               (eastBorderType == BorderStyle.HAIR))
-         ) {
-
-        int thickness = getThickness(eastBorderType);
-        thickness++; //need for dotted borders to show up east
-
-
-        int dashlength = 1;
-
-        if (eastBorderType == BorderStyle.DASHED)
-           dashlength = 2;
-
-      	g.setColor(eastColor);
-
-        for (int k=0; k < thickness; k++) {
-           for (int yc=y;yc < height; yc=yc+5) {
-                g.drawLine(width-k,yc,width-k,yc+dashlength);
-           }
-        }
-      }
-
-      if (southBorder &&
-              ((southBorderType == BorderStyle.DASHED) ||
-               (southBorderType == BorderStyle.HAIR))
-         ) {
-
-        int thickness = getThickness(southBorderType);
-        thickness++;
-
-        int dashlength = 1;
-
-        if (southBorderType == BorderStyle.DASHED)
-           dashlength = 2;
-
-      	g.setColor(southColor);
-        for (int k=0; k < thickness; k++) {
-           for (int xc = x; xc < width; xc=xc+5) {
-             g.drawLine(xc,height-k,xc+dashlength,height-k);
-           }
-        }
-      }
-
-      if (westBorder &&
-            ((westBorderType == BorderStyle.DASHED) ||
-             (westBorderType == BorderStyle.HAIR))
-         ) {
-
-        int thickness = getThickness(westBorderType);
-//        thickness++;
-
-        int dashlength = 1;
-
-        if (westBorderType == BorderStyle.DASHED)
-           dashlength = 2;
-
-      	g.setColor(westColor);
-
-        for (int k=0; k < thickness; k++) {
-           for (int yc=y;yc < height; yc=yc+5) {
-                g.drawLine(x+k,yc,x+k,yc+dashlength);
-           }
-        }
-      }
-   }
-
-   /**
-    * Called by paintBorder to paint the double line
-    * borders for a cell.  
-    */
-   private void paintDoubleBorders(Graphics g, int x, int y, int width,
-                                  int height) {
-      if (northBorder &&
-             northBorderType == BorderStyle.DOUBLE) {
-
-      	g.setColor(northColor);
-
-        int leftx=x;
-        int rightx=width;
-
-                // if there are borders on the west or east then
-                // the second line shouldn't cross them
-        if (westBorder)
-           leftx = x+3;
-
-        if (eastBorder)
-           rightx = width-3;
-
-           g.drawLine(x,y,width,y);
-           g.drawLine(leftx,y+2,rightx,y+2);
-      }
-
-      if (eastBorder &&
-              eastBorderType == BorderStyle.DOUBLE
-         ) {
-
-        int thickness = getThickness(eastBorderType);
-        thickness++; //need for dotted borders to show up east
-
-      	g.setColor(eastColor);
-
-        int topy=y;
-        int bottomy=height;
-
-        if (northBorder)
-          topy=y+3;
-
-        if (southBorder)
-            bottomy=height-3;
-
-        g.drawLine(width-1,y,width-1,height);
-        g.drawLine(width-3,topy,width-3,bottomy);
-      }
-
-      if (southBorder &&
-              southBorderType == BorderStyle.DOUBLE
-         ) {
-
-      	g.setColor(southColor);
-
-        int leftx=y;
-        int rightx=width;
-
-        if (westBorder)
-           leftx=x+3;
-
-        if (eastBorder)
-           rightx=width-3;
-
-
-        g.drawLine(x,height - 1,width,height - 1);
-        g.drawLine(leftx,height - 3,rightx,height - 3);
-      }
-
-      if (westBorder &&
-            westBorderType == BorderStyle.DOUBLE
-         ) {
-
-        int thickness = getThickness(westBorderType);
-//        thickness++;
-
-      	g.setColor(westColor);
-
-        int topy=y;
-        int bottomy=height-3;
-
-        if (northBorder)
-           topy=y+2;
-
-        if (southBorder)
-           bottomy=height-3;
-
-        g.drawLine(x,y,x,height);
-        g.drawLine(x+2,topy,x+2,bottomy);
-      }
-   }
-
-   /**
-    * Called by paintBorder to paint the various versions of dash dot dot line
-    * borders for a cell.  
-    */
-   private void paintDashDotDotBorders(Graphics g, int x, int y, int width,
-                                  int height) {
-      if (northBorder &&
-             ((northBorderType == BorderStyle.DASH_DOT_DOT) ||
-              (northBorderType == BorderStyle.MEDIUM_DASH_DOT_DOT))
-         ) {
-        int thickness = getThickness(northBorderType);
-
-      	g.setColor(northColor);
-        for (int l=x; l < width;) {
-          l=l+drawDashDotDot(g, l, y, thickness, true, true);
-        }
-
-      }
-
-      if (eastBorder &&
-              ((eastBorderType == BorderStyle.DASH_DOT_DOT) ||
-               (eastBorderType == BorderStyle.MEDIUM_DASH_DOT_DOT))
-         ) {
-
-        int thickness = getThickness(eastBorderType);
-
-      	g.setColor(eastColor);
-
-        for (int l=y;l < height;) {
-          //System.err.println("drawing east");
-          l=l+drawDashDotDot(g,width-1,l,thickness,false,false);
-        }
-      }
-
-      if (southBorder &&
-              ((southBorderType == BorderStyle.DASH_DOT_DOT) ||
-               (southBorderType == BorderStyle.MEDIUM_DASH_DOT_DOT))
-         ) {
-
-        int thickness = getThickness(southBorderType);
-
-      	g.setColor(southColor);
-
-        for (int l=x; l < width;) {
-          //System.err.println("drawing south");
-          l=l+drawDashDotDot(g, l, height-1, thickness, true, false);
-        }
-      }
-
-      if (westBorder &&
-            ((westBorderType == BorderStyle.DASH_DOT_DOT) ||
-             (westBorderType == BorderStyle.MEDIUM_DASH_DOT_DOT))
-         ) {
-
-        int thickness = getThickness(westBorderType);
-
-      	g.setColor(westColor);
-
-        for (int l=y;l < height;) {
-          //System.err.println("drawing west");
-          l=l+drawDashDotDot(g,x,l,thickness,false,true);
-        }
-
-      }
-   }
-
-   /**
-    *  Draws one dash dot dot horizontally or vertically with thickness drawn
-    *  incrementally to either the right or left.
-    *
-    *  @param g graphics object for drawing with
-    *  @param x the x origin of the line
-    *  @param y the y origin of the line
-    *  @param thickness the thickness of the line
-    *  @param horizontal or vertical (true for horizontal)
-    *  @param right/bottom or left/top thickness (true for right or top),
-    *         if true then the x or y origin will be incremented to provide
-    *         thickness, if false, they'll be decremented.  For vertical
-    *         borders, x is incremented or decremented, for horizontal its y.
-    *         Just set to true for north and west, and false for east and
-    *         south.
-    *  @returns length - returns the length of the line.
-    */
-   private int drawDashDotDot(Graphics g,int x, int y, int thickness,
-                              boolean horizontal,
-                              boolean rightBottom) {
-
-      for (int t=0; t < thickness; t++) {
-         if (!rightBottom) {
-            t = 0 - t; //add negative thickness so we go the other way
-                       //then we'll decrement instead of increment.
-         }
-         if (horizontal) {
-            g.drawLine(x,y+t,x+5,y+t);
-            g.drawLine(x+8,y+t,x+10,y+t);
-            g.drawLine(x+13,y+t,x+15,y+t);
-         } else {
-            g.drawLine(x+t,y,x+t,y+5);
-            g.drawLine(x+t,y+8,x+t,y+10);
-            g.drawLine(x+t,y+13,x+t,y+15);
-         }
-      }
-      return 18;
-   }
-
-   /**
-    * @returns the line thickness for a border based on border type
-    */
-   private int getThickness(BorderStyle thickness) {
-       switch (thickness) {
-           case DASH_DOT_DOT:
-           case DASHED:
-           case HAIR:
-             return 1;
-           case THIN:
-             return 2;
-           case MEDIUM:
-           case MEDIUM_DASH_DOT_DOT:
-             return 3;
-           case THICK:
-             return 4;
-           default:
-             return 1;
-       }
-   }
-
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVFractionalFormat.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVFractionalFormat.java
deleted file mode 100644
index 4884195..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVFractionalFormat.java
+++ /dev/null
@@ -1,224 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.view;
-
-import java.text.*;
-
-/**
- * This class is used to format cells into their fractional format.
- *
- * I cant be 100% sure that the same fractional value will be displayed as in
- * excel but then again it is a lossy formating mode anyway
- *
- * @author     Jason Height
- * @since      15 July 2002
- */
-public class SVFractionalFormat extends Format {
-  private short ONE_DIGIT = 1;
-  private short TWO_DIGIT = 2;
-  private short THREE_DIGIT = 3;
-  private short UNITS = 4;
-  private int units = 1;
-  private short mode = -1;
-
-  /** Constructs a new FractionalFormatter
-   *
-   *  The formatStr defines how the number will be formatted
-   *  # ?/? Up to one digit
-   *  # ??/?? Up to two digits
-   *  # ???/??? Up to three digits
-   *  # ?/2 In halves
-   *  # ?/4 In quarters
-   *  # ?/8 In eighths
-   *  # ?/16 In sixteenths
-   *  # ?/10 In tenths
-   *  # ?/100 In hundredths
-   */
-  public SVFractionalFormat(String formatStr) {
-    if ("# ?/?".equals(formatStr))
-      mode = ONE_DIGIT;
-    else if ("# ??/??".equals(formatStr))
-      mode = TWO_DIGIT;
-    else if ("# ???/???".equals(formatStr))
-      mode = THREE_DIGIT;
-    else if ("# ?/2".equals(formatStr)) {
-      mode = UNITS;
-      units = 2;
-    } else if ("# ?/4".equals(formatStr)) {
-      mode = UNITS;
-      units = 4;
-    } else if ("# ?/8".equals(formatStr)) {
-      mode = UNITS;
-      units = 8;
-    } else if ("# ?/16".equals(formatStr)) {
-      mode = UNITS;
-      units = 16;
-    } else if ("# ?/10".equals(formatStr)) {
-      mode = UNITS;
-      units = 10;
-    } else if ("# ?/100".equals(formatStr)) {
-      mode = UNITS;
-      units = 100;
-    }
-  }
-
-  /**
-   *  Returns a fractional string representation of a double to a maximum denominator size
-   *
-   * This code has been translated to java from the following web page.
-   * http://www.codeproject.com/cpp/fraction.asp
-   * Originally coded in c++ By Dean Wyant  dwyant@mindspring.com
-   * The code on the web page is freely available.
-   *
-   * @param  f       Description of the Parameter
-   * @param  MaxDen  Description of the Parameter
-   * @return         Description of the Return Value
-   */
-  private String format(final double f, final int MaxDen) {
-    long Whole = (long)f;
-    int sign = 1;
-    if (f < 0) {
-      sign = -1;
-    }
-    double Precision = 0.00001;
-    double AllowedError = Precision;
-    double d = Math.abs(f);
-    d -= Whole;
-    double Frac = d;
-    double Diff = Frac;
-    long Num = 1;
-    long Den = 0;
-    long A = 0;
-    long B = 0;
-    long i = 0;
-    if (Frac > Precision) {
-      while (true) {
-        d = 1.0 / d;
-        i = (long) (d + Precision);
-        d -= i;
-        if (A > 0) {
-          Num = i * Num + B;
-        }
-        Den = (long) (Num / Frac + 0.5);
-        Diff = Math.abs((double) Num / Den - Frac);
-        if (Den > MaxDen) {
-          if (A > 0) {
-            Num = A;
-            Den = (long) (Num / Frac + 0.5);
-            Diff = Math.abs((double) Num / Den - Frac);
-          } else {
-            Den = MaxDen;
-            Num = 1;
-            Diff = Math.abs((double) Num / Den - Frac);
-            if (Diff > Frac) {
-              Num = 0;
-              Den = 1;
-              // Keeps final check below from adding 1 and keeps Den from being 0
-              Diff = Frac;
-            }
-          }
-          break;
-        }
-        if ((Diff <= AllowedError) || (d < Precision)) {
-          break;
-        }
-        Precision = AllowedError / Diff;
-        // This calcualtion of Precision does not always provide results within
-        // Allowed Error. It compensates for loss of significant digits that occurs.
-        // It helps to round the inprecise reciprocal values to i.
-        B = A;
-        A = Num;
-      }
-    }
-    if (Num == Den) {
-      Whole++;
-      Num = 0;
-      Den = 0;
-    } else if (Den == 0) {
-      Num = 0;
-    }
-    if (sign < 0) {
-      if (Whole == 0) {
-        Num = -Num;
-      } else {
-        Whole = -Whole;
-      }
-    }
-    return new StringBuffer().append(Whole).append(" ").append(Num).append("/").append(Den).toString();
-  }
-
-  /** This method formats the double in the units specified.
-   *  The usints could be any number but in this current implementation it is
-   *  halves (2), quaters (4), eigths (8) etc
-   */
-  private String formatUnit(double f, int units) {
-    long Whole = (long)f;
-    f -= Whole;
-    long Num = Math.round(f * units);
-
-    return new StringBuffer().append(Whole).append(" ").append(Num).append("/").append(units).toString();
-  }
-
-  public final String format(double val) {
-    if (mode == ONE_DIGIT) {
-      return format(val, 9);
-    } else if (mode == TWO_DIGIT) {
-      return format(val, 99);
-    } else if (mode == THREE_DIGIT) {
-      return format(val, 999);
-    } else if (mode == UNITS) {
-      return formatUnit(val , units);
-    }
-    throw new RuntimeException("Unexpected Case");
-  }
-
-  @Override
-public StringBuffer format(Object obj,
-                                      StringBuffer toAppendTo,
-                                      FieldPosition pos) {
-    if (obj instanceof Number) {
-      toAppendTo.append(format(((Number)obj).doubleValue()));
-      return toAppendTo;
-    }
-    throw new IllegalArgumentException("Can only handle Numbers");
-  }
-
-  @Override
-public Object parseObject(String source,
-                                   ParsePosition status) {
-    //JMH TBD
-    return null;
-  }
-
-  @Override
-public Object parseObject(String source)
-                   throws ParseException {
-    //JMH TBD
-    return null;
-  }
-
-  @Override
-public Object clone() {
-    //JMH TBD
-    return null;
-  }
-
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVRowHeader.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVRowHeader.java
deleted file mode 100644
index 622f506..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVRowHeader.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-
-package org.apache.poi.hssf.view;
-
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.table.*;
-
-import org.apache.poi.hssf.usermodel.*;
-
-/**
- * This class presents the row header to the table.
- *
- *
- * @author Jason Height
- */
-public class SVRowHeader extends JList {
-  /** This model simply returns an integer number up to the number of rows
-   *  that are present in the sheet.
-   *
-   */
-  private class SVRowHeaderModel extends AbstractListModel {
-    private HSSFSheet sheet;
-
-    public SVRowHeaderModel(HSSFSheet sheet) {
-      this.sheet = sheet;
-    }
-
-    @Override
-    public int getSize() {
-    	return sheet.getLastRowNum() + 1;
-    }
-    @Override
-    public Object getElementAt(int index) {
-      return Integer.toString(index+1);
-    }
-  }
-
-  /** Renderes the row number*/
-  private class RowHeaderRenderer extends JLabel implements ListCellRenderer {
-    private HSSFSheet sheet;
-    private int extraHeight;
-
-    RowHeaderRenderer(HSSFSheet sheet, JTable table, int extraHeight) {
-      this.sheet = sheet;
-      this.extraHeight = extraHeight;
-      JTableHeader header = table.getTableHeader();
-      setOpaque(true);
-      setBorder(UIManager.getBorder("TableHeader.cellBorder"));
-      setHorizontalAlignment(CENTER);
-      setForeground(header.getForeground());
-      setBackground(header.getBackground());
-      setFont(header.getFont());
-    }
-
-    @Override
-    public Component getListCellRendererComponent( JList list,
-           Object value, int index, boolean isSelected, boolean cellHasFocus) {
-      Dimension d = getPreferredSize();
-      HSSFRow row = sheet.getRow(index);
-      int rowHeight;
-      if(row == null) {
-    	  rowHeight = (int)sheet.getDefaultRowHeightInPoints();
-      } else {
-    	  rowHeight = (int)row.getHeightInPoints();
-      }
-      d.height = rowHeight+extraHeight;
-      setPreferredSize(d);
-      setText((value == null) ? "" : value.toString());
-      return this;
-    }
-  }
-
-  public SVRowHeader(HSSFSheet sheet, JTable table, int extraHeight) {
-    ListModel lm = new SVRowHeaderModel(sheet);
-    this.setModel(lm);
-
-    setFixedCellWidth(50);
-    setCellRenderer(new RowHeaderRenderer(sheet, table, extraHeight));
-  }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java
deleted file mode 100644
index c9e2090..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.view;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.Toolkit;
-import java.awt.event.HierarchyEvent;
-import java.awt.event.HierarchyListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JViewport;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.JTableHeader;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
-import javax.swing.text.JTextComponent;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.view.brush.PendingPaintings;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-
-/**
- * This class is a table that represents the values in a single worksheet.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class SVSheetTable extends JTable {
-  private final HSSFSheet sheet;
-  private final PendingPaintings pendingPaintings;
-  private FormulaDisplayListener formulaListener;
-  private JScrollPane scroll;
-
-  private static final Color HEADER_BACKGROUND = new Color(235, 235, 235);
-
-  /**
-   * This field is the magic number to convert from a Character width to a java
-   * pixel width.
-   * <p/>
-   * When the "normal" font size in a workbook changes, this effects all of the
-   * heights and widths. Unfortunately there is no way to retrieve this
-   * information, hence the MAGIC number.
-   * <p/>
-   * This number may only work for the normal style font size of Arial size 10.
-   */
-  private static final int magicCharFactor = 7;
-
-  private class HeaderCell extends JLabel {
-    private final int row;
-
-    public HeaderCell(Object value, int row) {
-      super(value.toString(), CENTER);
-      this.row = row;
-      setBackground(HEADER_BACKGROUND);
-      setOpaque(true);
-      setBorder(BorderFactory.createLineBorder(Color.LIGHT_GRAY));
-      setRowSelectionAllowed(false);
-    }
-
-    @Override
-    public Dimension getPreferredSize() {
-      Dimension d = super.getPreferredSize();
-      if (row >= 0) {
-        d.height = getRowHeight(row);
-      }
-      return d;
-    }
-
-    @Override
-    public Dimension getMaximumSize() {
-      Dimension d = super.getMaximumSize();
-      if (row >= 0) {
-        d.height = getRowHeight(row);
-      }
-      return d;
-    }
-
-    @Override
-    public Dimension getMinimumSize() {
-      Dimension d = super.getMinimumSize();
-      if (row >= 0) {
-        d.height = getRowHeight(row);
-      }
-      return d;
-    }
-  }
-
-  private class HeaderCellRenderer implements TableCellRenderer {
-    @Override
-    public Component getTableCellRendererComponent(JTable table, Object value,
-        boolean isSelected, boolean hasFocus, int row, int column) {
-
-      return new HeaderCell(value, row);
-    }
-  }
-
-  private class FormulaDisplayListener implements ListSelectionListener {
-    private final JTextComponent formulaDisplay;
-
-    public FormulaDisplayListener(JTextComponent formulaDisplay) {
-      this.formulaDisplay = formulaDisplay;
-    }
-
-    @Override
-    public void valueChanged(ListSelectionEvent e) {
-      int row = getSelectedRow();
-      int col = getSelectedColumn();
-      if (row < 0 || col < 0) {
-        return;
-      }
-
-      if (e.getValueIsAdjusting()) {
-        return;
-      }
-
-      HSSFCell cell = (HSSFCell) getValueAt(row, col);
-      String formula = "";
-      if (cell != null) {
-        if (cell.getCellTypeEnum() == CellType.FORMULA) {
-          formula = cell.getCellFormula();
-        } else {
-          formula = cell.toString();
-        }
-        if (formula == null)
-          formula = "";
-      }
-      formulaDisplay.setText(formula);
-    }
-  }
-
-  public SVSheetTable(HSSFSheet sheet) {
-    super(new SVTableModel(sheet));
-    this.sheet = sheet;
-
-    setIntercellSpacing(new Dimension(0, 0));
-    setAutoResizeMode(AUTO_RESIZE_OFF);
-    JTableHeader header = getTableHeader();
-    header.setDefaultRenderer(new HeaderCellRenderer());
-    pendingPaintings = new PendingPaintings(this);
-
-    //Set the columns the correct size
-    TableColumnModel columns = getColumnModel();
-    for (int i = 0; i < columns.getColumnCount(); i++) {
-      TableColumn column = columns.getColumn(i);
-      int width = sheet.getColumnWidth(i);
-      //256 is because the width is in 256ths of a character
-      column.setPreferredWidth(width / 256 * magicCharFactor);
-    }
-
-    Toolkit t = getToolkit();
-    int res = t.getScreenResolution();
-    TableModel model = getModel();
-    for (int i = 0; i < model.getRowCount(); i++) {
-      Row row = sheet.getRow(i - sheet.getFirstRowNum());
-      if (row != null) {
-        short h = row.getHeight();
-        int height = (int)Math.round(Math.max(1., h / (res / 70. * 20.) + 3.));
-        System.out.printf("%d: %d (%d @ %d)%n", i, height, h, res);
-        setRowHeight(i, height);
-      }
-    }
-
-    addHierarchyListener(new HierarchyListener() {
-      @Override
-    public void hierarchyChanged(HierarchyEvent e) {
-        if ((e.getChangeFlags() & HierarchyEvent.PARENT_CHANGED) != 0) {
-          Container changedParent = e.getChangedParent();
-          if (changedParent instanceof JViewport) {
-            Container grandparent = changedParent.getParent();
-            if (grandparent instanceof JScrollPane) {
-              JScrollPane jScrollPane = (JScrollPane) grandparent;
-              setupScroll(jScrollPane);
-            }
-          }
-        }
-      }
-    });
-  }
-
-  public void setupScroll(JScrollPane scroll) {
-    if (scroll == this.scroll)
-      return;
-
-    this.scroll = scroll;
-    if (scroll == null)
-      return;
-
-    SVRowHeader rowHeader = new SVRowHeader(sheet, this, 0);
-    scroll.setRowHeaderView(rowHeader);
-    scroll.setCorner(JScrollPane.UPPER_LEADING_CORNER, headerCell("?"));
-  }
-
-  public void setFormulaDisplay(JTextComponent formulaDisplay) {
-    ListSelectionModel rowSelMod = getSelectionModel();
-    ListSelectionModel colSelMod = getColumnModel().getSelectionModel();
-
-    if (formulaDisplay == null) {
-      rowSelMod.removeListSelectionListener(formulaListener);
-      colSelMod.removeListSelectionListener(formulaListener);
-      formulaListener = null;
-    }
-
-    if (formulaDisplay != null) {
-      formulaListener = new FormulaDisplayListener(formulaDisplay);
-      rowSelMod.addListSelectionListener(formulaListener);
-      colSelMod.addListSelectionListener(formulaListener);
-    }
-  }
-
-  public JTextComponent getFormulaDisplay() {
-    if (formulaListener == null)
-      return null;
-    else
-      return formulaListener.formulaDisplay;
-  }
-
-  public Component headerCell(String text) {
-    return new HeaderCell(text, -1);
-  }
-
-  @Override
-  public void paintComponent(Graphics g1) {
-    Graphics2D g = (Graphics2D) g1;
-
-    pendingPaintings.clear();
-
-    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-        RenderingHints.VALUE_ANTIALIAS_ON);
-    super.paintComponent(g);
-
-    pendingPaintings.paint(g);
-  }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java
deleted file mode 100644
index 3c58d53..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java
+++ /dev/null
@@ -1,219 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.view;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.util.EventObject;
-import java.util.Map;
-
-import javax.swing.AbstractCellEditor;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-import javax.swing.table.TableCellEditor;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.FillPatternType;
-
-/**
- * Sheet Viewer Table Cell Editor -- not commented via javadoc as it
- * nearly completely consists of overridden methods.
- *
- * @author     Jason Height
- */
-public class SVTableCellEditor extends AbstractCellEditor implements TableCellEditor, ActionListener {
-  private static final Color black = getAWTColor(new HSSFColor.BLACK());
-  private static final Color white = getAWTColor(new HSSFColor.WHITE());
-  private Map<Integer,HSSFColor> colors = HSSFColor.getIndexHash();
-
-
-  private HSSFWorkbook wb;
-  private JTextField editor;
-
-  public SVTableCellEditor(HSSFWorkbook wb) {
-    this.wb = wb;
-    this.editor = new JTextField();
-  }
-
-
-  /**
-   *  Gets the cellEditable attribute of the SVTableCellEditor object
-   *
-   * @return    The cellEditable value
-   */
-  @Override
-public boolean isCellEditable(java.util.EventObject e) {
-    if (e instanceof MouseEvent) {
-      return ((MouseEvent) e).getClickCount() >= 2;
-    }
-    return false;
-  }
-
-
-  @Override
-public boolean shouldSelectCell(EventObject anEvent) {
-    return true;
-  }
-
-
-  public boolean startCellEditing(EventObject anEvent) {
-    System.out.println("Start Cell Editing");
-    return true;
-  }
-
-
-  @Override
-public boolean stopCellEditing() {
-    System.out.println("Stop Cell Editing");
-    fireEditingStopped();
-    return true;
-  }
-
-
-  @Override
-public void cancelCellEditing() {
-    System.out.println("Cancel Cell Editing");
-    fireEditingCanceled();
-  }
-
-
-  @Override
-public void actionPerformed(ActionEvent e) {
-    System.out.println("Action performed");
-    stopCellEditing();
-  }
-
-
-  /**
-   *  Gets the cellEditorValue attribute of the SVTableCellEditor object
-   *
-   * @return    The cellEditorValue value
-   */
-  @Override
-public Object getCellEditorValue() {
-    System.out.println("GetCellEditorValue");
-    //JMH Look at when this method is called. Should it return a HSSFCell?
-    return editor.getText();
-  }
-
-
-  /**
-   *  Gets the tableCellEditorComponent attribute of the SVTableCellEditor object
-   *
-   * @return             The tableCellEditorComponent value
-   */
-  @Override
-public Component getTableCellEditorComponent(JTable table, Object value,
-      boolean isSelected,
-      int row,
-      int column) {
-    System.out.println("GetTableCellEditorComponent");
-    HSSFCell cell = (HSSFCell) value;
-    if (cell != null) {
-          HSSFCellStyle style = cell.getCellStyle();
-          HSSFFont f = wb.getFontAt(style.getFontIndex());
-          boolean isbold = f.getBold();
-          boolean isitalics = f.getItalic();
-
-          int fontstyle = Font.PLAIN;
-
-          if (isbold) fontstyle = Font.BOLD;
-          if (isitalics) fontstyle = fontstyle | Font.ITALIC;
-
-          int fontheight = f.getFontHeightInPoints();
-          if (fontheight == 9) fontheight = 10; //fix for stupid ol Windows
-
-          Font font = new Font(f.getFontName(),fontstyle,fontheight);
-          editor.setFont(font);
-
-          if (style.getFillPatternEnum() == FillPatternType.SOLID_FOREGROUND) {
-            editor.setBackground(getAWTColor(style.getFillForegroundColor(), white));
-          } else editor.setBackground(white);
-
-          editor.setForeground(getAWTColor(f.getColor(), black));
-
-
-      //Set the value that is rendered for the cell
-      switch (cell.getCellTypeEnum()) {
-        case BLANK:
-          editor.setText("");
-          break;
-        case BOOLEAN:
-          if (cell.getBooleanCellValue()) {
-            editor.setText("true");
-          } else {
-            editor.setText("false");
-          }
-          break;
-        case NUMERIC:
-          editor.setText(Double.toString(cell.getNumericCellValue()));
-          break;
-        case STRING:
-          editor.setText(cell.getRichStringCellValue().getString());
-          break;
-        case FORMULA:
-        default:
-          editor.setText("?");
-      }
-      switch (style.getAlignmentEnum()) {
-        case LEFT:
-        case JUSTIFY:
-        case FILL:
-          editor.setHorizontalAlignment(SwingConstants.LEFT);
-          break;
-        case CENTER:
-        case CENTER_SELECTION:
-          editor.setHorizontalAlignment(SwingConstants.CENTER);
-          break;
-        case GENERAL:
-        case RIGHT:
-          editor.setHorizontalAlignment(SwingConstants.RIGHT);
-          break;
-        default:
-          editor.setHorizontalAlignment(SwingConstants.LEFT);
-          break;
-      }
-
-    }
-    return editor;
-  }
-
-    /** This method retrieves the AWT Color representation from the colour hash table
-     *
-     */
-    private final Color getAWTColor(int index, Color deflt) {
-      HSSFColor clr = colors.get(index);
-      if (clr == null) return deflt;
-      return getAWTColor(clr);
-    }
-
-    private static final Color getAWTColor(HSSFColor clr) {
-      short[] rgb = clr.getTriplet();
-      return new Color(rgb[0],rgb[1],rgb[2]);
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java
deleted file mode 100644
index 1448c53..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java
+++ /dev/null
@@ -1,283 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.view;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Rectangle;
-import java.io.Serializable;
-import java.text.DecimalFormat;
-import java.text.Format;
-import java.text.SimpleDateFormat;
-
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-import javax.swing.table.TableCellRenderer;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-
-
-/**
- * Sheet Viewer Table Cell Render -- not commented via javadoc as it
- * nearly completely consists of overridden methods.
- *
- * @author Andrew C. Oliver
- */
-public class SVTableCellRenderer extends JLabel
-    implements TableCellRenderer, Serializable
-{
-    protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
-    protected SVBorder cellBorder = new SVBorder();
-
-
-    private HSSFWorkbook wb = null;
-
-    /** This class holds the references to the predefined cell formats.
-     */
-    private class CellFormatter {
-      private Format[] textFormatter;
-
-      private DecimalFormat generalNumberFormat = new DecimalFormat("0");
-
-      public CellFormatter() {
-        textFormatter = new Format[0x31];
-
-        textFormatter[0x01] = new DecimalFormat("0");
-        textFormatter[0x02] = new DecimalFormat("0.00");
-        textFormatter[0x03] = new DecimalFormat("#,##0");
-        textFormatter[0x04] = new DecimalFormat("#,##0.00");
-        textFormatter[0x05] = new DecimalFormat("$#,##0;$#,##0");
-        textFormatter[0x06] = new DecimalFormat("$#,##0;$#,##0");
-        textFormatter[0x07] = new DecimalFormat("$#,##0.00;$#,##0.00");
-        textFormatter[0x08] = new DecimalFormat("$#,##0.00;$#,##0.00");
-        textFormatter[0x09] = new DecimalFormat("0%");
-        textFormatter[0x0A] = new DecimalFormat("0.00%");
-        textFormatter[0x0B] = new DecimalFormat("0.00E0");
-        textFormatter[0x0C] = new SVFractionalFormat("# ?/?");
-        textFormatter[0x0D] = new SVFractionalFormat("# ??/??");
-        textFormatter[0x0E] = new SimpleDateFormat("M/d/yy");
-        textFormatter[0x0F] = new SimpleDateFormat("d-MMM-yy");
-        textFormatter[0x10] = new SimpleDateFormat("d-MMM");
-        textFormatter[0x11] = new SimpleDateFormat("MMM-yy");
-        textFormatter[0x12] = new SimpleDateFormat("h:mm a");
-        textFormatter[0x13] = new SimpleDateFormat("h:mm:ss a");
-        textFormatter[0x14] = new SimpleDateFormat("h:mm");
-        textFormatter[0x15] = new SimpleDateFormat("h:mm:ss");
-        textFormatter[0x16] = new SimpleDateFormat("M/d/yy h:mm");
-        // 0x17 - 0x24 reserved for international and undocumented 0x25, "(#,##0_);(#,##0)"
-        //start at 0x26
-        //jmh need to do colour
-        //"(#,##0_);[Red](#,##0)"
-        textFormatter[0x26] = new DecimalFormat("#,##0;#,##0");
-        //jmh need to do colour
-        //(#,##0.00_);(#,##0.00)
-        textFormatter[0x27] = new DecimalFormat("#,##0.00;#,##0.00");
-        textFormatter[0x28] = new DecimalFormat("#,##0.00;#,##0.00");
-//??        textFormatter[0x29] = new DecimalFormat("_(*#,##0_);_(*(#,##0);_(* \"-\"_);_(@_)");
-//??        textFormatter[0x2A] = new DecimalFormat("_($*#,##0_);_($*(#,##0);_($* \"-\"_);_(@_)");
-//??        textFormatter[0x2B] = new DecimalFormat("_(*#,##0.00_);_(*(#,##0.00);_(*\"-\"??_);_(@_)");
-//??        textFormatter[0x2C] = new DecimalFormat("_($*#,##0.00_);_($*(#,##0.00);_($*\"-\"??_);_(@_)");
-        textFormatter[0x2D] = new SimpleDateFormat("mm:ss");
-//??        textFormatter[0x2E] = new SimpleDateFormat("[h]:mm:ss");
-        textFormatter[0x2F] = new SimpleDateFormat("mm:ss.0");
-        textFormatter[0x30] = new DecimalFormat("##0.0E0");
-      }
-
-      public String format(short index, double value) {
-        if ( index <= 0 )
-          return generalNumberFormat.format(value);
-        if (textFormatter[index] == null)
-          throw new RuntimeException("Sorry. I cant handle the format code :"+Integer.toHexString(index));
-        if (textFormatter[index] instanceof DecimalFormat) {
-          return ((DecimalFormat)textFormatter[index]).format(value);
-        }
-        if (textFormatter[index] instanceof SVFractionalFormat) {
-          return ((SVFractionalFormat)textFormatter[index]).format(value);
-        }
-        throw new RuntimeException("Sorry. I cant handle a non decimal formatter for a decimal value :"+Integer.toHexString(index));
-      }
-
-      public boolean useRedColor(short index, double value) {
-        return (((index == 0x06)||(index == 0x08)||(index == 0x26) || (index == 0x27)) && (value < 0));
-      }
-    }
-
-    private final CellFormatter cellFormatter = new CellFormatter();
-
-    public SVTableCellRenderer(HSSFWorkbook wb) {
-	super();
-	setOpaque(true);
-        setBorder(noFocusBorder);
-        this.wb = wb;
-    }
-
-    @Override
-    public Component getTableCellRendererComponent(JTable table, Object value,
-                          boolean isSelected, boolean hasFocus, int row, int column) {
-	boolean isBorderSet = false;
-
-        //If the JTables default cell renderer has been setup correctly the
-        //value will be the HSSFCell that we are trying to render
-        HSSFCell c = (HSSFCell)value;
-
-        if (c != null) {
-          HSSFCellStyle s = c.getCellStyle();
-          HSSFFont f = wb.getFontAt(s.getFontIndex());
-          setFont(SVTableUtils.makeFont(f));
-
-          if (s.getFillPatternEnum() == FillPatternType.SOLID_FOREGROUND) {
-            setBackground(SVTableUtils.getAWTColor(s.getFillForegroundColor(), SVTableUtils.white));
-          } else setBackground(SVTableUtils.white);
-
-          setForeground(SVTableUtils.getAWTColor(f.getColor(), SVTableUtils.black));
-
-          cellBorder.setBorder(SVTableUtils.getAWTColor(s.getTopBorderColor(), SVTableUtils.black),
-                               SVTableUtils.getAWTColor(s.getRightBorderColor(), SVTableUtils.black),
-                               SVTableUtils.getAWTColor(s.getBottomBorderColor(), SVTableUtils.black),
-                               SVTableUtils.getAWTColor(s.getLeftBorderColor(), SVTableUtils.black),
-                               s.getBorderTopEnum(), s.getBorderRightEnum(),
-                               s.getBorderBottomEnum(), s.getBorderLeftEnum(),
-                               hasFocus);
-            setBorder(cellBorder);
-            isBorderSet=true;
-
-            //Set the value that is rendered for the cell
-            switch (c.getCellTypeEnum()) {
-              case BLANK:
-                setValue("");
-              break;
-              case BOOLEAN:
-                if (c.getBooleanCellValue()) {
-                  setValue("true");
-                } else {
-                  setValue("false");
-                }
-              break;
-              case NUMERIC:
-                short format = s.getDataFormat();
-                double numericValue = c.getNumericCellValue();
-                if (cellFormatter.useRedColor(format, numericValue))
-                  setForeground(Color.red);
-                else setForeground(null);
-                setValue(cellFormatter.format(format, c.getNumericCellValue()));
-              break;
-              case STRING:
-                setValue(c.getRichStringCellValue().getString());
-              break;
-              case FORMULA:
-              default:
-                setValue("?");
-            }
-            //Set the text alignment of the cell
-            switch (s.getAlignmentEnum()) {
-              case LEFT:
-              case JUSTIFY:
-              case FILL:
-                setHorizontalAlignment(SwingConstants.LEFT);
-                break;
-              case CENTER:
-              case CENTER_SELECTION:
-                setHorizontalAlignment(SwingConstants.CENTER);
-                break;
-              case GENERAL:
-              case RIGHT:
-                setHorizontalAlignment(SwingConstants.RIGHT);
-                break;
-              default:
-                setHorizontalAlignment(SwingConstants.LEFT);
-                break;
-            }
-        } else {
-          setValue("");
-          setBackground(SVTableUtils.white);
-        }
-
-
-	if (hasFocus) {
-            if (!isBorderSet) {
-              //This is the border to paint when there is no border
-              //and the cell has focus
-              cellBorder.setBorder(SVTableUtils.black,
-                                   SVTableUtils.black,
-                                   SVTableUtils.black,
-                                   SVTableUtils.black,
-                                   BorderStyle.NONE,
-                                   BorderStyle.NONE,
-                                   BorderStyle.NONE,
-                                   BorderStyle.NONE,
-                                   isSelected);
-              setBorder(cellBorder);
-            }
-	    if (table.isCellEditable(row, column)) {
-	        setForeground( UIManager.getColor("Table.focusCellForeground") );
-	        setBackground( UIManager.getColor("Table.focusCellBackground") );
-	    }
-	} else if (!isBorderSet) {
-	    setBorder(noFocusBorder);
-	}
-
-	// ---- begin optimization to avoid painting background ----
-	Color back = getBackground();
-	boolean colorMatch = (back != null) && ( back.equals(table.getBackground()) ) && table.isOpaque();
-        setOpaque(!colorMatch);
-	// ---- end optimization to aviod painting background ----
-	return this;
-    }
-
-    @Override
-    public void validate() {}
-
-    @Override
-    public void revalidate() {}
-
-    @Override
-    public void repaint(long tm, int x, int y, int width, int height) {}
-
-    @Override
-    public void repaint(Rectangle r) { }
-
-    @Override
-    protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
-	// Strings get interned...
-	if (propertyName=="text") {
-	    super.firePropertyChange(propertyName, oldValue, newValue);
-	}
-    }
-
-    @Override
-    public void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) { }
-
-    /**
-     * Sets the string to either the value or "" if the value is null.
-     *
-     */
-    protected void setValue(Object value) {
-	setText((value == null) ? "" : value.toString());
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableModel.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableModel.java
deleted file mode 100644
index 25ac83f..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableModel.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-
-package org.apache.poi.hssf.view;
-
-import java.util.Iterator;
-import javax.swing.table.*;
-
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-
-/**
- * Sheet Viewer Table Model - The model for the Sheet Viewer just overrides things.
- * @author Andrew C. Oliver
- */
-
-public class SVTableModel extends AbstractTableModel {
-  private HSSFSheet st = null;
-  int maxcol = 0;
-
-  public SVTableModel(HSSFSheet st, int maxcol) {
-    this.st = st;
-    this.maxcol=maxcol;
-  }
-
-  public SVTableModel(HSSFSheet st) {
-    this.st = st;
-    Iterator<Row> i = st.rowIterator();
-
-    while (i.hasNext()) {
-      HSSFRow row = (HSSFRow)i.next();
-      if (maxcol < (row.getLastCellNum()+1)) {
-         this.maxcol = row.getLastCellNum();
-      }
-    }
-  }
-
-
-  @Override
-public int getColumnCount() {
-    return this.maxcol+1;
-  }
-  @Override
-public Object getValueAt(int row, int col) {
-    HSSFRow r = st.getRow(row);
-    HSSFCell c = null;
-    if (r != null) {
-      c = r.getCell(col);
-    }
-    return c;
-  }
-  @Override
-public int getRowCount() {
-    return st.getLastRowNum() + 1;
-  }
-
-  @Override
-public Class<?> getColumnClass(int c) {
-	return HSSFCell.class;
-  }
-
-  @Override
-public boolean isCellEditable(int rowIndex, int columnIndex) {
-    return true;
-  }
-
-  @Override
-public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-    if (aValue != null)
-      System.out.println("SVTableModel.setValueAt. value type = "+aValue.getClass().getName());
-    else System.out.println("SVTableModel.setValueAt. value type = null");
-  }
-
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java
deleted file mode 100644
index 395f1cd..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.view;
-
-import java.util.*;
-import java.awt.*;
-import javax.swing.border.*;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.*;
-
-/**
- * SVTableCell Editor and Renderer helper functions.
- *
- * @author     Jason Height
- */
-public class SVTableUtils {
-  private final static Map<Integer,HSSFColor> colors = HSSFColor.getIndexHash();
-  /**  Description of the Field */
-  public final static Color black = getAWTColor(new HSSFColor.BLACK());
-  /**  Description of the Field */
-  public final static Color white = getAWTColor(new HSSFColor.WHITE());
-  /**  Description of the Field */
-  public static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
-
-
-  /**
-   *  Creates a new font for a specific cell style
-   */
-  public static Font makeFont(HSSFFont font) {
-    boolean isbold = font.getBoldweight() > HSSFFont.BOLDWEIGHT_NORMAL;
-    boolean isitalics = font.getItalic();
-    int fontstyle = Font.PLAIN;
-    if (isbold) {
-      fontstyle = Font.BOLD;
-    }
-    if (isitalics) {
-      fontstyle = fontstyle | Font.ITALIC;
-    }
-
-    int fontheight = font.getFontHeightInPoints();
-    if (fontheight == 9) {
-      //fix for stupid ol Windows
-      fontheight = 10;
-    }
-
-    return new Font(font.getFontName(), fontstyle, fontheight);
-  }
-
-
-  /**
-   * This method retrieves the AWT Color representation from the colour hash table
-   *
-   * @param  index  Description of the Parameter
-   * @param  deflt  Description of the Parameter
-   * @return        The aWTColor value
-   */
-  public final static Color getAWTColor(int index, Color deflt) {
-    HSSFColor clr = colors.get(index);
-    if (clr == null) {
-      return deflt;
-    }
-    return getAWTColor(clr);
-  }
-
-
-  /**
-   *  Gets the aWTColor attribute of the SVTableUtils class
-   *
-   * @param  clr  Description of the Parameter
-   * @return      The aWTColor value
-   */
-  public final static Color getAWTColor(HSSFColor clr) {
-    short[] rgb = clr.getTriplet();
-    return new Color(rgb[0], rgb[1], rgb[2]);
-  }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java
deleted file mode 100644
index a323992..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-
-package org.apache.poi.hssf.view;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.net.*;
-import java.io.*;
-import javax.swing.*;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Sheet Viewer - Views XLS files via HSSF.  Can be used as an applet with
- * filename="" or as a applications (pass the filename as the first parameter).
- * Or you can pass it a URL in a "url" parameter when run as an applet or just
- * that first parameter must start with http:// and it will guess its a url. I
- * only tested it as an applet though, so it probably won't work...you fix it.
- *
- * @author Andrew C. Oliver
- * @author Jason Height
- */
-public class SViewer extends JApplet {
-  private SViewerPanel panel;
-  boolean isStandalone = false;
-  String filename = null;
-
-  /**Get a parameter value*/
-  public String getParameter(String key, String def) {
-    return isStandalone ? System.getProperty(key, def) :
-      (getParameter(key) != null ? getParameter(key) : def);
-  }
-
-  /**Construct the applet*/
-  public SViewer() {
-  }
-
-  /**Initialize the applet*/
-  @Override
-public void init() {
-    try {
-      jbInit();
-    }
-    catch(Exception e) {
-      e.printStackTrace();
-      System.exit(1);
-    }
-  }
-
-  /**Component initialization*/
-  private void jbInit() throws Exception {
-    InputStream i = null;
-    boolean isurl = false;
-    if (filename == null) filename = getParameter("filename");
-
-    if (filename == null || filename.substring(0,7).equals("http://")) {
-      isurl = true;
-      if (filename == null) filename = getParameter("url");
-      i = getXLSFromURL(filename);
-    }
-
-    HSSFWorkbook wb = null;
-    if (isurl) {
-      wb = constructWorkbook(i);
-    } else {
-      wb = constructWorkbook(filename);
-    }
-    panel = new SViewerPanel(wb, false);
-    getContentPane().setLayout(new BorderLayout());
-    getContentPane().add(panel, BorderLayout.CENTER);
-  }
-
-  private HSSFWorkbook constructWorkbook(String filename) throws FileNotFoundException, IOException {
-    HSSFWorkbook wb = null;
-      FileInputStream in = new FileInputStream(filename);
-      wb = new HSSFWorkbook(in);
-      in.close();
-    return wb;
-  }
-
-  private HSSFWorkbook constructWorkbook(InputStream in) throws IOException {
-    HSSFWorkbook wb = null;
-
-      wb = new HSSFWorkbook(in);
-      in.close();
-    return wb;
-  }
-
-  /**Start the applet*/
-  @Override
-public void start() {
-  }
-  /**Stop the applet*/
-  @Override
-public void stop() {
-  }
-  /**Destroy the applet*/
-  @Override
-public void destroy() {
-  }
-  /**Get Applet information*/
-  @Override
-public String getAppletInfo() {
-    return "Applet Information";
-  }
-  /**Get parameter info*/
-  @Override
-public String[][] getParameterInfo() {
-    return null;
-  }
-
-  /**
-   * opens a url and returns an inputstream
-   *
-   */
-  private InputStream getXLSFromURL(String urlstring) throws MalformedURLException, IOException {
-    URL url = new URL(urlstring);
-    URLConnection uc = url.openConnection();
-    String field = uc.getHeaderField(0);
-    for (int i=0;field != null; i++) {
-      System.out.println(field);
-      field = uc.getHeaderField(i);
-  }
-    BufferedInputStream is = new BufferedInputStream(uc.getInputStream());
-    return is;
-  }
-
-
-  /**Main method*/
-  public static void main(String[] args) {
-    if(args.length < 1) {
-      throw new IllegalArgumentException("A filename to view must be supplied as the first argument, but none was given");
-    }
-
-    SViewer applet = new SViewer();
-    applet.isStandalone = true;
-    applet.filename = args[0];
-    Frame frame;
-    frame = new Frame() {
-      @Override
-    protected void processWindowEvent(WindowEvent e) {
-        super.processWindowEvent(e);
-        if (e.getID() == WindowEvent.WINDOW_CLOSING) {
-          System.exit(0);
-        }
-      }
-      @Override
-    public synchronized void setTitle(String title) {
-        super.setTitle(title);
-        enableEvents(AWTEvent.WINDOW_EVENT_MASK);
-      }
-    };
-    frame.setTitle("Applet Frame");
-    frame.add(applet, BorderLayout.CENTER);
-    applet.init();
-    applet.start();
-    frame.setSize(400,320);
-    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-    frame.setLocation((d.width - frame.getSize().width) / 2, (d.height - frame.getSize().height) / 2);
-    frame.setVisible(true);
-  }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/SViewerPanel.java b/trunk/src/examples/src/org/apache/poi/hssf/view/SViewerPanel.java
deleted file mode 100644
index bf1ba4a..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/SViewerPanel.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.view;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
-import javax.swing.table.*;
-
-import org.apache.poi.hssf.usermodel.*;
-
-/**
- * This class presents the sheets to the user.
- *
- *
- * @author Andrew C. Oliver
- * @author Jason Height
- */
-public class SViewerPanel extends JPanel {
-  /** This field is the magic number to convert from a Character width to a
-   *  java pixel width.
-   *
-   * When the "normal" font size in a workbook changes, this effects all
-   * of the heights and widths. Unfortunately there is no way to retrieve this
-   * information, hence the MAGIC number.
-   *
-   * This number may only work for the normal style font size of Arial size 10.
-   *
-   */
-  private static final int magicCharFactor = 7;
-  /** Reference to the wookbook that is being displayed*/
-  /* package */ HSSFWorkbook wb;
-  /** Reference to the tabs component*/
-  /* package */ JTabbedPane sheetPane;
-  /** Reference to the cell renderer that is used to render all cells*/
-  private SVTableCellRenderer cellRenderer;
-  /** Reference to the cell editor that is used to edit all cells.
-   *  Only constructed if editing is allowed
-   */
-  private SVTableCellEditor cellEditor;
-  /** Flag indicating if editing is allowed. Otherwise the viewer is in
-   *  view only mode.
-   */
-  private boolean allowEdits;
-
-  /**Construct the representation of the workbook*/
-  public SViewerPanel(HSSFWorkbook wb, boolean allowEdits) {
-    this.wb = wb;
-    this.allowEdits = allowEdits;
-
-    initialiseGui();
-  }
-
-  private void initialiseGui() {
-    cellRenderer = new SVTableCellRenderer(this.wb);
-    if (allowEdits)
-      cellEditor = new SVTableCellEditor(this.wb);
-
-    //Initialise the Panel
-    sheetPane = new JTabbedPane(JTabbedPane.BOTTOM);
-
-    if (allowEdits)
-      sheetPane.addMouseListener(createTabListener());
-    int sheetCount = wb.getNumberOfSheets();
-    for (int i=0; i<sheetCount;i++) {
-      String sheetName = wb.getSheetName(i);
-      //Add the new sheet to the tabbed pane
-      sheetPane.addTab(sheetName, makeSheetView(wb.getSheetAt(i)));
-    }
-    setLayout(new BorderLayout());
-    add(sheetPane, BorderLayout.CENTER);
-  }
-
-  protected JComponent makeSheetView(HSSFSheet sheet) {
-    JTable sheetView = new JTable(new SVTableModel(sheet));
-    sheetView.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-    sheetView.setDefaultRenderer(HSSFCell.class, cellRenderer);
-    if (allowEdits)
-      sheetView.setDefaultEditor(HSSFCell.class, cellEditor);
-    JTableHeader header = sheetView.getTableHeader();
-    //Dont allow column reordering
-    header.setReorderingAllowed(false);
-    //Only allow column resizing if editing is allowed
-    header.setResizingAllowed(allowEdits);
-
-    //Set the columns the correct size
-    TableColumnModel columns = sheetView.getColumnModel();
-    for (int i=0; i< columns.getColumnCount(); i++) {
-      TableColumn column = columns.getColumn(i);
-      int width = sheet.getColumnWidth(i);
-      //256 is because the width is in 256ths of a character
-      column.setPreferredWidth(width/256*magicCharFactor);
-    }
-
-    //Set the rows to the correct size
-    int rows = sheet.getPhysicalNumberOfRows();
-    Insets insets = cellRenderer.getInsets();
-    //Need to include the insets in the calculation of the row height to use.
-    int extraHeight = insets.bottom+insets.top;
-    for (int i=0; i< rows; i++) {
-      HSSFRow row = sheet.getRow(i);
-      if (row == null) {
-        sheetView.setRowHeight(i, (int)sheet.getDefaultRowHeightInPoints()+extraHeight);
-      } else {
-        sheetView.setRowHeight(i, (int)row.getHeightInPoints()+extraHeight);
-      }
-    }
-
-    //Add the row header to the sheet
-    SVRowHeader rowHeader = new SVRowHeader(sheet, sheetView, extraHeight);
-    JScrollPane scroll = new JScrollPane( sheetView );
-    scroll.setRowHeaderView(rowHeader);
-    return scroll;
-  }
-
-  @Override
-public void paint(Graphics g) {
-    //JMH I am only overriding this to get a picture of the time taken to paint
-    long start = System.currentTimeMillis();
-    super.paint(g);
-    long elapsed = System.currentTimeMillis()-start;
-    System.out.println("Paint time = "+elapsed);
-  }
-
-  protected MouseListener createTabListener() {
-    return new TabListener();
-  }
-
-  /** This class defines the default MouseListener that listens to
-   *  mouse events in the tabbed pane
-   *
-   *  The default is to popup a menu when the event occurs over a tab
-   */
-  private class TabListener implements MouseListener {
-    public JPopupMenu popup;
-    public TabListener() {
-      popup = new JPopupMenu("Sheet");
-      popup.add(createInsertSheetAction());
-      popup.add(createDeleteSheetAction());
-      popup.add(createRenameSheetAction());
-    }
-
-    protected Action createInsertSheetAction() {
-      return new InsertSheetAction();
-    }
-
-    protected Action createDeleteSheetAction() {
-      return new DeleteSheetAction();
-    }
-
-    protected Action createRenameSheetAction() {
-      return new RenameSheetAction();
-    }
-
-
-    /** This method will display the popup if the mouseevent is a popup event
-     *  and the event occurred over a tab
-     */
-    protected void checkPopup(MouseEvent e) {
-      if (e.isPopupTrigger()) {
-        int tab = sheetPane.getUI().tabForCoordinate(sheetPane, e.getX(), e.getY());
-        if (tab != -1) {
-          popup.show(sheetPane, e.getX(), e.getY());
-        }
-      }
-    }
-
-    @Override
-    public void mouseClicked(MouseEvent e) {
-      checkPopup(e);
-    }
-
-    @Override
-    public void mousePressed(MouseEvent e) {
-      checkPopup(e);
-    }
-
-    @Override
-    public void mouseReleased(MouseEvent e) {
-      checkPopup(e);
-    }
-
-    @Override
-    public void mouseEntered(MouseEvent e) {}
-    @Override
-    public void mouseExited(MouseEvent e) {}
-  }
-
-  /** This class defines the action that is performed when the sheet is renamed*/
-  private class RenameSheetAction extends AbstractAction {
-    public RenameSheetAction() {
-      super("Rename");
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-      int tabIndex = sheetPane.getSelectedIndex();
-      if (tabIndex != -1) {
-        String newSheetName = JOptionPane.showInputDialog(sheetPane, "Enter a new Sheetname", "Rename Sheet", JOptionPane.QUESTION_MESSAGE);
-        if (newSheetName != null) {
-          wb.setSheetName(tabIndex, newSheetName);
-          sheetPane.setTitleAt(tabIndex, newSheetName);
-        }
-      }
-    }
-  }
-
-  /** This class defines the action that is performed when a sheet is inserted*/
-  private class InsertSheetAction extends AbstractAction {
-    public InsertSheetAction() {
-      super("Insert");
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-      //Create a new sheet then search for the sheet and make sure that the
-      //sheetPane shows it.
-      HSSFSheet newSheet = wb.createSheet();
-      for (int i=0; i<wb.getNumberOfSheets();i++) {
-        HSSFSheet sheet = wb.getSheetAt(i);
-        if (newSheet == sheet) {
-          sheetPane.insertTab(wb.getSheetName(i), null, makeSheetView(sheet), null, i);
-        }
-      }
-    }
-  }
-
-  /** This class defines the action that is performed when the sheet is deleted*/
-  private class DeleteSheetAction extends AbstractAction {
-    public DeleteSheetAction() {
-      super("Delete");
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-      int tabIndex = sheetPane.getSelectedIndex();
-      if (tabIndex != -1) {
-        if (JOptionPane.showConfirmDialog(sheetPane, "Are you sure that you want to delete the selected sheet", "Delete Sheet?", JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
-          wb.removeSheetAt(tabIndex);
-          sheetPane.remove(tabIndex);
-        }
-      }
-    }
-  }
-
-  public boolean isEditable() {
-    return allowEdits;
-  }
-
-  /**Main method*/
-  public static void main(String[] args) {
-    if(args.length < 1) {
-      throw new IllegalArgumentException("A filename to view must be supplied as the first argument, but none was given");
-    }
-    try {
-      FileInputStream in = new FileInputStream(args[0]);
-      HSSFWorkbook wb = new HSSFWorkbook(in);
-      in.close();
-
-      SViewerPanel p = new SViewerPanel(wb, true);
-      JFrame frame;
-      frame = new JFrame() {
-        @Override
-        protected void processWindowEvent(WindowEvent e) {
-          super.processWindowEvent(e);
-          if (e.getID() == WindowEvent.WINDOW_CLOSING) {
-            System.exit(0);
-          }
-        }
-        @Override
-        public synchronized void setTitle(String title) {
-          super.setTitle(title);
-          enableEvents(AWTEvent.WINDOW_EVENT_MASK);
-        }
-      };
-      frame.setTitle("Viewer Frame");
-      frame.getContentPane().add(p, BorderLayout.CENTER);
-      frame.setSize(800,640);
-      Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-      frame.setLocation((d.width - frame.getSize().width) / 2, (d.height - frame.getSize().height) / 2);
-      frame.setVisible(true);
-    } catch (IOException ex) {
-      ex.printStackTrace();
-      System.exit(1);
-    }
-  }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/BasicBrush.java b/trunk/src/examples/src/org/apache/poi/hssf/view/brush/BasicBrush.java
deleted file mode 100644
index db36b83..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/BasicBrush.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.view.brush;
-
-import java.awt.*;
-
-/**
- * This is a basic brush that just draws the line with the given parameters.
- * This is a {@link BasicStroke} object that can be used as a {@link Brush}.
- *
- * @author Ken Arnold, Industrious Media LLC
- * @see BasicStroke
- */
-public class BasicBrush extends BasicStroke implements Brush {
-    /**
-     * Creates a new basic brush with the given width. Invokes {@link
-     * BasicStroke#BasicStroke(float)}
-     *
-     * @param width The brush width.
-     *
-     * @see BasicStroke#BasicStroke(float)
-     */
-    public BasicBrush(float width) {
-        super(width);
-    }
-
-    /**
-     * Creates a new basic brush with the given width, cap, and join.  Invokes
-     * {@link BasicStroke#BasicStroke(float,int,int)}
-     *
-     * @param width The brush width.
-     * @param cap   The capping style.
-     * @param join  The join style.
-     *
-     * @see BasicStroke#BasicStroke(float, int, int)
-     */
-    public BasicBrush(float width, int cap, int join) {
-        super(width, cap, join);
-    }
-
-    /**
-     * Creates a new basic brush with the given parameters.  Invokes {@link
-     * BasicStroke#BasicStroke(float,int,int,float,float[],float)} with a miter
-     * limit of 11 (the normal default value).
-     *
-     * @param width   The brush width.
-     * @param cap     The capping style.
-     * @param join    The join style.
-     * @param dashes  The dash intervals.
-     * @param dashPos The intial dash position in the dash intervals.
-     *
-     * @see BasicStroke#BasicStroke(float, int, int, float, float[], float)
-     */
-    public BasicBrush(float width, int cap, int join, float[] dashes,
-            int dashPos) {
-        super(width, cap, join, 11.0f, dashes, dashPos);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/Brush.java b/trunk/src/examples/src/org/apache/poi/hssf/view/brush/Brush.java
deleted file mode 100644
index 2a8964a..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/Brush.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.view.brush;
-
-import java.awt.*;
-
-/**
- * This is the type you must implement to create a brush that will be used for a
- * spreadsheet border.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public interface Brush extends Stroke {
-    /** Returns the width of the brush. */
-    float getLineWidth();
-}
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/DoubleStroke.java b/trunk/src/examples/src/org/apache/poi/hssf/view/brush/DoubleStroke.java
deleted file mode 100644
index 01b17ef..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/DoubleStroke.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.view.brush;
-
-import java.awt.*;
-
-/**
- * This Stroke implementation applies a BasicStroke to a shape twice. If you
- * draw with this Stroke, then instead of outlining the shape, you're outlining
- * the outline of the shape.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class DoubleStroke implements Brush {
-    BasicStroke stroke1, stroke2; // the two strokes to use
-
-    /**
-     * Creates a new double-stroke brush.  This surrounds a cell with a two
-     * lines separated by white space between.
-     *
-     * @param width1 The width of the blank space in the middle
-     * @param width2 The width of the each of the two drawn strokes.
-     */
-    public DoubleStroke(float width1, float width2) {
-        stroke1 = new BasicStroke(width1); // Constructor arguments specify
-        stroke2 = new BasicStroke(width2); // the line widths for the strokes
-    }
-
-    /**
-     * Stroke the outline.
-     *
-     * @param s The shape in which to stroke.
-     *
-     * @return The created stroke as a new shape.
-     */
-    @Override
-    public Shape createStrokedShape(Shape s) {
-        // Use the first stroke to create an outline of the shape
-        Shape outline = stroke1.createStrokedShape(s);
-        // Use the second stroke to create an outline of that outline.
-        // It is this outline of the outline that will be filled in
-        return stroke2.createStrokedShape(outline);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public float getLineWidth() {
-        return stroke1.getLineWidth() + 2 * stroke2.getLineWidth();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/PendingPaintings.java b/trunk/src/examples/src/org/apache/poi/hssf/view/brush/PendingPaintings.java
deleted file mode 100644
index 3b95c05..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/PendingPaintings.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.view.brush;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class is used to hold pending brush paintings.  The model is that some
- * border drawing requires drawing strokes after all the cells have been
- * painted. The list of pending paintings can be put in this object during the
- * initial paint of the component, and then executed at the appropriate time,
- * such as at the end of the containing object's {@link
- * JComponent#paintChildren(Graphics)} method.
- * <p/>
- * It is up to the parent component to invoke the {@link #paint(Graphics2D)}
- * method of this objet at that appropriate time.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class PendingPaintings {
-    /**
-     * The name of the client property that holds this object in the parent
-     * component.
-     */
-    public static final String PENDING_PAINTINGS =
-            PendingPaintings.class.getSimpleName();
-
-    private final List<Painting> paintings;
-
-    /** A single painting description. */
-    public static class Painting {
-        final Stroke stroke;
-        final Color color;
-        final Shape shape;
-        final AffineTransform transform;
-
-        /**
-         * Creates a new painting description.
-         *
-         * @param stroke    The stroke to paint.
-         * @param color     The color of the stroke.
-         * @param shape     The shape of the stroke.
-         * @param transform The transformation matrix to use.
-         */
-        public Painting(Stroke stroke, Color color, Shape shape,
-                AffineTransform transform) {
-
-            this.color = color;
-            this.shape = shape;
-            this.stroke = stroke;
-            this.transform = transform;
-        }
-
-        /**
-         * Draw the painting.
-         *
-         * @param g The graphics object to use to draw with.
-         */
-        public void draw(Graphics2D g) {
-            g.setTransform(transform);
-            g.setStroke(stroke);
-            g.setColor(color);
-            g.draw(shape);
-        }
-    }
-
-    /**
-     * Creates a new object on the given parent.  The created object will be
-     * stored as a client property.
-     *
-     * @param parent
-     */
-    public PendingPaintings(JComponent parent) {
-        paintings = new ArrayList<Painting>();
-        parent.putClientProperty(PENDING_PAINTINGS, this);
-    }
-
-    /** Drops all pending paintings. */
-    public void clear() {
-        paintings.clear();
-    }
-
-    /**
-     * Paints all pending paintings.  Once they have been painted they are
-     * removed from the list of pending paintings (they aren't pending anymore,
-     * after all).
-     *
-     * @param g The graphics object to draw with.
-     */
-    public void paint(Graphics2D g) {
-        g.setBackground(Color.CYAN);
-        AffineTransform origTransform = g.getTransform();
-        for (Painting c : paintings) {
-            c.draw(g);
-        }
-        g.setTransform(origTransform);
-
-        clear();
-    }
-
-    /**
-     * Adds a new pending painting to the list on the given component.  This
-     * will find the first ancestor that has a {@link PendingPaintings} client
-     * property, starting with the component itself.
-     *
-     * @param c      The component for which the painting is being added.
-     * @param g      The graphics object to draw with.
-     * @param stroke The stroke to draw.
-     * @param color  The color to draw with.
-     * @param shape  The shape to stroke.
-     */
-    public static void add(JComponent c, Graphics2D g, Stroke stroke,
-            Color color, Shape shape) {
-
-        add(c, new Painting(stroke, color, shape, g.getTransform()));
-    }
-
-    /**
-     * Adds a new pending painting to the list on the given component.  This
-     * will find the first ancestor that has a {@link PendingPaintings} client
-     * property, starting with the component itself.
-     *
-     * @param c           The component for which the painting is being added.
-     * @param newPainting The new painting.
-     */
-    public static void add(JComponent c, Painting newPainting) {
-        PendingPaintings pending = pendingPaintingsFor(c);
-        if (pending != null) {
-            pending.paintings.add(newPainting);
-        }
-    }
-
-    /**
-     * Returns the pending painting object for the given component, if any. This
-     * is retrieved from the first object found that has a {@link
-     * #PENDING_PAINTINGS} client property, starting with this component and
-     * looking up its ancestors (parent, parent's parent, etc.)
-     * <p/>
-     * This allows any descendant of a component that has a {@link
-     * PendingPaintings} property to add its own pending paintings.
-     *
-     * @param c The component for which the painting is being added.
-     *
-     * @return The pending painting object for that component, or <tt>null</tt>
-     *         if there is none.
-     */
-    public static PendingPaintings pendingPaintingsFor(JComponent c) {
-        for (Component parent = c;
-             parent != null;
-             parent = parent.getParent()) {
-            if (parent instanceof JComponent) {
-                JComponent jc = (JComponent) parent;
-                Object pd = jc.getClientProperty(PENDING_PAINTINGS);
-                if (pd != null)
-                    return (PendingPaintings) pd;
-            }
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/package.html b/trunk/src/examples/src/org/apache/poi/hssf/view/brush/package.html
deleted file mode 100644
index d9819fb..0000000
--- a/trunk/src/examples/src/org/apache/poi/hssf/view/brush/package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-
-<body>
-This package contains some brushes that are used when drawing borders for Excel
-cells.
-</body>
-</html>
diff --git a/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java b/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java
deleted file mode 100644
index 3516b88..0000000
--- a/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-
-import org.apache.poi.hwpf.model.StyleDescription;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Range;
-
-public final class Word2Forrest
-{
-  Writer _out;
-  HWPFDocument _doc;
-
-  @SuppressWarnings("unused")
-  public Word2Forrest(HWPFDocument doc, OutputStream stream) throws IOException
-  {
-    OutputStreamWriter out = new OutputStreamWriter (stream, Charset.forName("UTF-8"));
-    _out = out;
-    _doc = doc;
-
-    init ();
-    openDocument ();
-    openBody ();
-
-    Range r = doc.getRange ();
-    StyleSheet styleSheet = doc.getStyleSheet ();
-
-    int sectionLevel = 0;
-    int lenParagraph = r.numParagraphs ();
-    boolean inCode = false;
-    for (int x = 0; x < lenParagraph; x++)
-    {
-      Paragraph p = r.getParagraph (x);
-      String text = p.text ();
-      if (text.trim ().length () == 0)
-      {
-        continue;
-      }
-      StyleDescription paragraphStyle = styleSheet.getStyleDescription (p.
-        getStyleIndex ());
-      String styleName = paragraphStyle.getName();
-      if (styleName.startsWith ("Heading"))
-      {
-        if (inCode)
-        {
-          closeSource();
-          inCode = false;
-        }
-
-        int headerLevel = Integer.parseInt (styleName.substring (8));
-        if (headerLevel > sectionLevel)
-        {
-          openSection ();
-        }
-        else
-        {
-          for (int y = 0; y < (sectionLevel - headerLevel) + 1; y++)
-          {
-            closeSection ();
-          }
-          openSection ();
-        }
-        sectionLevel = headerLevel;
-        openTitle ();
-        writePlainText (text);
-        closeTitle ();
-      }
-      else
-      {
-        int cruns = p.numCharacterRuns ();
-        CharacterRun run = p.getCharacterRun (0);
-        String fontName = run.getFontName();
-        if (fontName.startsWith ("Courier"))
-        {
-          if (!inCode)
-          {
-            openSource ();
-            inCode = true;
-          }
-          writePlainText (p.text());
-        }
-        else
-        {
-          if (inCode)
-          {
-            inCode = false;
-            closeSource();
-          }
-          openParagraph();
-          writePlainText(p.text());
-          closeParagraph();
-        }
-      }
-    }
-    for (int x = 0; x < sectionLevel; x++)
-    {
-      closeSection();
-    }
-    closeBody();
-    closeDocument();
-    _out.flush();
-
-  }
-
-    public void init ()
-      throws IOException
-    {
-      _out.write ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
-      _out.write ("<!DOCTYPE document PUBLIC \"-//APACHE//DTD Documentation V1.1//EN\" \"./dtd/document-v11.dtd\">\r\n");
-    }
-
-    public void openDocument ()
-      throws IOException
-    {
-      _out.write ("<document>\r\n");
-    }
-    public void closeDocument ()
-      throws IOException
-    {
-      _out.write ("</document>\r\n");
-    }
-
-
-    public void openBody ()
-      throws IOException
-    {
-      _out.write ("<body>\r\n");
-    }
-
-    public void closeBody ()
-      throws IOException
-    {
-      _out.write ("</body>\r\n");
-    }
-
-
-    public void openSection ()
-      throws IOException
-    {
-      _out.write ("<section>");
-
-    }
-
-    public void closeSection ()
-      throws IOException
-    {
-      _out.write ("</section>");
-
-    }
-
-    public void openTitle ()
-      throws IOException
-    {
-      _out.write ("<title>");
-    }
-
-    public void closeTitle ()
-      throws IOException
-    {
-      _out.write ("</title>");
-    }
-
-    public void writePlainText (String text)
-      throws IOException
-    {
-      _out.write (text);
-    }
-
-    public void openParagraph ()
-      throws IOException
-    {
-      _out.write ("<p>");
-    }
-
-    public void closeParagraph ()
-      throws IOException
-    {
-      _out.write ("</p>");
-    }
-
-    public void openSource ()
-      throws IOException
-    {
-      _out.write ("<source><![CDATA[");
-    }
-    public void closeSource ()
-      throws IOException
-    {
-      _out.write ("]]></source>");
-    }
-
-
-    public static void main(String[] args) throws IOException {
-        InputStream is = new FileInputStream(args[0]);
-        OutputStream out = new FileOutputStream("test.xml");
-        try {
-            new Word2Forrest(new HWPFDocument(is), out);
-        } finally {
-            out.close();
-            is.close();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
deleted file mode 100644
index 247684d..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.io.*;
-import org.apache.poi.poifs.filesystem.*;
-
-/**
- * <p>Describes the most important (whatever that is) features of a
- * {@link POIFSDocument}.</p>
- */
-public class DocumentDescriptor
-{
-    String name;
-    POIFSDocumentPath path;
-    DocumentInputStream stream;
-
-    int size;
-    byte[] bytes;
-
-
-    /**
-     * <p>Creates a {@link DocumentDescriptor}.</p>
-     *
-     * @param name The stream's name.
-     *
-     * @param path The stream's path in the POI filesystem hierarchy.
-     *
-     * @param stream The stream.
-     *
-     * @param nrOfBytes The maximum number of bytes to display in a
-     * dump starting at the beginning of the stream.
-     */
-    public DocumentDescriptor(final String name,
-                              final POIFSDocumentPath path,
-                              final DocumentInputStream stream,
-                              final int nrOfBytes)
-    {
-        this.name = name;
-        this.path = path;
-        this.stream = stream;
-        try
-        {
-            size = stream.available();
-            if (stream.markSupported())
-            {
-                stream.mark(nrOfBytes);
-                final byte[] b = new byte[nrOfBytes];
-                final int read = stream.read(b, 0, Math.min(size, b.length));
-                bytes = new byte[read];
-                System.arraycopy(b, 0, bytes, 0, read);
-                stream.reset();
-            }
-        }
-        catch (IOException ex)
-        {
-            System.out.println(ex);
-        }
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
deleted file mode 100644
index de1204e..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.tree.*;
-
-import org.apache.poi.util.HexDump;
-
-/**
- * <p>{@link TreeCellRenderer} for a {@link DocumentDescriptor}. The
- * renderer is extremly rudimentary since displays only the document's
- * name, its size and its fist few bytes.</p>
- */
-public class DocumentDescriptorRenderer extends DefaultTreeCellRenderer
-{
-
-    @Override
-    public Component getTreeCellRendererComponent(final JTree tree,
-                                                  final Object value,
-                                                  final boolean selectedCell,
-                                                  final boolean expanded,
-                                                  final boolean leaf,
-                                                  final int row,
-                                                  final boolean hasCellFocus)
-    {
-        final DocumentDescriptor d = (DocumentDescriptor)
-            ((DefaultMutableTreeNode) value).getUserObject();
-        final JPanel p = new JPanel();
-        final JTextArea text = new JTextArea();
-        text.append(renderAsString(d));
-        text.setFont(new Font("Monospaced", Font.PLAIN, 10));
-        p.add(text);
-        if (selectedCell) {
-            Util.invert(text);
-        }
-        return p;
-    }
-
-
-    /**
-     * <p>Renders {@link DocumentDescriptor} as a string.</p>
-     */
-    protected String renderAsString(final DocumentDescriptor d)
-    {
-        final StringBuilder b = new StringBuilder();
-        b.append("Name: ");
-        b.append(d.name);
-        b.append(" ");
-        b.append(HexDump.toHex(d.name));
-        b.append("\n");
-
-        b.append("Size: ");
-        b.append(d.size);
-        b.append(" bytes\n");
-
-        b.append("First bytes: ");
-        b.append(HexDump.toHex(d.bytes));
-
-        return b.toString();
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
deleted file mode 100644
index dbb759c..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.tree.*;
-import java.util.*;
-
-/**
- * <p>This is a {@link TreeCellRenderer} implementation which is able
- * to render arbitrary objects. The {@link ExtendableTreeCellRenderer}
- * does not do the rendering itself but instead dispatches to
- * class-specific renderers. A class/renderer pair must be registered
- * using the {@link #register} method. If a class has no registered
- * renderer, the renderer of its closest superclass is used. Since the
- * {@link ExtendableTreeCellRenderer} always has a default renderer
- * for the {@link Object} class, rendering is always possible. The
- * default {@link Object} renderer can be replaced by another renderer
- * but it cannot be unregistered.</p>
- */
-public class ExtendableTreeCellRenderer implements TreeCellRenderer
-{
-
-    /**
-     * <p>Maps classes to renderers.</p>
-     */
-    protected Map<Class<?>,TreeCellRenderer> renderers;
-
-
-
-    public ExtendableTreeCellRenderer()
-    {
-        renderers = new HashMap<Class<?>,TreeCellRenderer>();
-        register(Object.class, new DefaultTreeCellRenderer()
-            {
-                @Override
-                public Component getTreeCellRendererComponent
-                    (JTree tree, Object value, boolean selectedCell,
-                     boolean expanded, boolean leaf, int row, boolean hasCellFocus)
-                {
-                    final String s = value.toString();
-                    final JLabel l = new JLabel(s + "  ");
-                    if (selected)
-                    {
-                        Util.invert(l);
-                        l.setOpaque(true);
-                    }
-                    return l;
-                }
-            });
-    }
-
-
-
-    /**
-     * <p>Registers a renderer for a class.</p>
-     **/
-    public void register(final Class<?> c, final TreeCellRenderer renderer)
-    {
-        renderers.put(c, renderer);
-    }
-
-
-
-    /**
-     * <p>Unregisters a renderer for a class. The renderer for the
-     * {@link Object} class cannot be unregistered.</p>
-     */
-    public void unregister(final Class<?> c)
-    {
-        if (c == Object.class)
-            throw new IllegalArgumentException
-                ("Renderer for Object cannot be unregistered.");
-        renderers.put(c, null);
-    }
-
-
-
-    /**
-     * <p>Renders an object in a tree cell depending of the object's
-     * class.</p>
-     *
-     * @see TreeCellRenderer#getTreeCellRendererComponent
-     */
-    @Override
-    public Component getTreeCellRendererComponent
-        (final JTree tree, final Object value, final boolean selected,
-         final boolean expanded, final boolean leaf, final int row,
-         final boolean hasFocus)
-    {
-        final String NULL = "null";
-        TreeCellRenderer r;
-        Object userObject;
-        if (value == null)
-            userObject = NULL;
-        else
-        {
-            userObject = ((DefaultMutableTreeNode) value).getUserObject();
-            if (userObject == null)
-                userObject = NULL;
-        }
-        r = findRenderer(userObject.getClass());
-        return r.getTreeCellRendererComponent
-            (tree, value, selected, expanded, leaf, row,
-             hasFocus);
-    }
-
-
-
-    /**
-     * <p>Find the renderer for the specified class.</p>
-     */
-    protected TreeCellRenderer findRenderer(final Class<?> c)
-    {
-        final TreeCellRenderer r = renderers.get(c);
-        if (r != null)
-            /* The class has a renderer. */
-            return r;
-
-        /* The class has no renderer, try the superclass, if any. */
-        final Class<?> superclass = c.getSuperclass();
-        if (superclass != null) {
-            return findRenderer(superclass);
-        }
-        return null;
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
deleted file mode 100644
index ec84847..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
-
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-
-/**
- * <p>The main class of the POI Browser. It shows the structure of POI
- * filesystems (Microsoft Office documents) in a {@link
- * JTree}. Specify their filenames on the command line!</p>
- *
- * @see POIFSReader
- */
-@SuppressWarnings("serial")
-public class POIBrowser extends JFrame
-{
-
-    /**
-     * <p>The tree's root node must be visible to all methods.</p>
-     */
-    protected MutableTreeNode rootNode;
-
-
-
-    /**
-     * <p>Takes a bunch of file names as command line parameters,
-     * opens each of them as a POI filesystem and displays their
-     * internal structures in a {@link JTree}.</p>
-     */
-    public static void main(String[] args)
-    {
-        new POIBrowser().run(args);
-    }
-
-
-
-    protected void run(String[] args)
-    {
-        addWindowListener(new WindowAdapter()
-            {
-                @Override
-                public void windowClosing(WindowEvent e)
-                {
-                        System.exit(0);
-                }
-            });
-
-        /* Create the tree model with a root node. The latter is
-         * invisible but it must be present because a tree model
-         * always needs a root. */
-        rootNode = new DefaultMutableTreeNode("POI Filesystems");
-        DefaultTreeModel treeModel = new DefaultTreeModel(rootNode);
-
-        /* Create the tree UI element. */
-        final JTree treeUI = new JTree(treeModel);
-        getContentPane().add(new JScrollPane(treeUI));
-
-        /* Add the POI filesystems to the tree. */
-        int displayedFiles = 0;
-        for (int i = 0; i < args.length; i++)
-        {
-            final String filename = args[i];
-            try {
-                FileInputStream fis = new FileInputStream(filename);
-                POIFSReader r = new POIFSReader();
-                r.registerListener(new TreeReaderListener(filename, rootNode));
-                r.read(fis);
-                fis.close();
-                displayedFiles++;
-            } catch (IOException ex) {
-                System.err.println(filename + ": " + ex);
-            } catch (Exception t) {
-                System.err.println("Unexpected exception while reading \"" +
-                                   filename + "\":");
-                t.printStackTrace(System.err);
-            }
-        }
-
-        /* Exit if there is no file to display (none specified or only
-         * files with problems). */
-        if (displayedFiles == 0)
-        {
-            System.out.println("No POI filesystem(s) to display.");
-            System.exit(0);
-        }
-
-        /* Make the tree UI element visible. */
-        treeUI.setRootVisible(true);
-        treeUI.setShowsRootHandles(true);
-        ExtendableTreeCellRenderer etcr = new ExtendableTreeCellRenderer();
-        etcr.register(DocumentDescriptor.class,
-                      new DocumentDescriptorRenderer());
-        etcr.register(PropertySetDescriptor.class,
-                      new PropertySetDescriptorRenderer());
-        treeUI.setCellRenderer(etcr);
-        setSize(600, 450);
-        setTitle("POI Browser 0.09");
-        setVisible(true);
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
deleted file mode 100644
index f9658ae..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-
-/**
- * <p>Describes the most important (whatever that is) features of a
- * stream containing a {@link PropertySet}.</p>
- */
-public class PropertySetDescriptor extends DocumentDescriptor
-{
-
-    protected PropertySet propertySet;
-
-    /**
-     * <p>Returns this {@link PropertySetDescriptor}'s {@link
-     * PropertySet}.</p>
-     */
-    public PropertySet getPropertySet()
-    {
-        return propertySet;
-    }
-
-
-
-    /**
-     * <p>Creates a {@link PropertySetDescriptor} by reading a {@link
-     * PropertySet} from a {@link DocumentInputStream}.</p>
-     *
-     * @param name The stream's name.
-     *
-     * @param path The stream's path in the POI filesystem hierarchy.
-     *
-     * @param stream The stream.
-     *
-     * @param nrOfBytesToDump The maximum number of bytes to display in a
-     * dump starting at the beginning of the stream.
-     */
-    public PropertySetDescriptor(final String name,
-                                 final POIFSDocumentPath path,
-                                 final DocumentInputStream stream,
-                                 final int nrOfBytesToDump)
-        throws NoPropertySetStreamException,
-               MarkUnsupportedException, UnsupportedEncodingException,
-               IOException
-    {
-        super(name, path, stream, nrOfBytesToDump);
-        propertySet = PropertySetFactory.create(stream);
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
deleted file mode 100644
index 8ce336f..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JPanel;
-import javax.swing.JTextArea;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import org.apache.poi.hpsf.Property;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.Section;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.util.HexDump;
-
-/**
- * <p>Renders a {@link PropertySetDescriptor} by more or less dumping
- * the stuff into a {@link JTextArea}.</p>
- */
-public class PropertySetDescriptorRenderer extends DocumentDescriptorRenderer
-{
-
-    @Override
-    public Component getTreeCellRendererComponent(final JTree tree,
-                                                  final Object value,
-                                                  final boolean selectedCell,
-                                                  final boolean expanded,
-                                                  final boolean leaf,
-                                                  final int row,
-                                                  final boolean hasCellFocus)
-    {
-        final PropertySetDescriptor d = (PropertySetDescriptor)
-            ((DefaultMutableTreeNode) value).getUserObject();
-        final PropertySet ps = d.getPropertySet();
-        final JPanel p = new JPanel();
-        final JTextArea text = new JTextArea();
-        text.setBackground(new Color(200, 255, 200));
-        text.setFont(new Font("Monospaced", Font.PLAIN, 10));
-        text.append(renderAsString(d));
-        text.append("\nByte order: ");
-        text.append(HexDump.toHex((short) ps.getByteOrder()));
-        text.append("\nFormat: ");
-        text.append(HexDump.toHex((short) ps.getFormat()));
-        text.append("\nOS version: ");
-        text.append(HexDump.toHex(ps.getOSVersion()));
-        text.append("\nClass ID: ");
-        text.append(HexDump.toHex(ps.getClassID().getBytes()));
-        text.append("\nSection count: " + ps.getSectionCount());
-        text.append(sectionsToString(ps.getSections()));
-        p.add(text);
-
-        if (ps instanceof SummaryInformation)
-        {
-            /* Use the convenience methods. */
-            final SummaryInformation si = (SummaryInformation) ps;
-            text.append("\n");
-            text.append("\nTitle:               " + si.getTitle());
-            text.append("\nSubject:             " + si.getSubject());
-            text.append("\nAuthor:              " + si.getAuthor());
-            text.append("\nKeywords:            " + si.getKeywords());
-            text.append("\nComments:            " + si.getComments());
-            text.append("\nTemplate:            " + si.getTemplate());
-            text.append("\nLast Author:         " + si.getLastAuthor());
-            text.append("\nRev. Number:         " + si.getRevNumber());
-            text.append("\nEdit Time:           " + si.getEditTime());
-            text.append("\nLast Printed:        " + si.getLastPrinted());
-            text.append("\nCreate Date/Time:    " + si.getCreateDateTime());
-            text.append("\nLast Save Date/Time: " + si.getLastSaveDateTime());
-            text.append("\nPage Count:          " + si.getPageCount());
-            text.append("\nWord Count:          " + si.getWordCount());
-            text.append("\nChar Count:          " + si.getCharCount());
-            // text.append("\nThumbnail:           " + si.getThumbnail());
-            text.append("\nApplication Name:    " + si.getApplicationName());
-            text.append("\nSecurity:            " + si.getSecurity());
-        }
-
-        if (selectedCell)
-            Util.invert(text);
-        return p;
-    }
-
-
-
-    /**
-     * <p>Returns a string representation of a list of {@link
-     * Section}s.</p>
-     */
-    protected String sectionsToString(final List<Section> sections)
-    {
-        final StringBuffer b = new StringBuffer();
-        int count = 1;
-        for (Iterator<Section>  i = sections.iterator(); i.hasNext();)
-        {
-            Section s = i.next();
-            String d = toString(s, "Section " + count++);
-            b.append(d);
-        }
-        return b.toString();
-    }
-
-
-
-    /**
-     * <p>Returns a string representation of a {@link Section}.</p>
-     * @param s the section
-     * @param name the section's name
-     * @return a string representation of the {@link Section}
-     */
-    protected String toString(final Section s, final String name)
-    {
-        final StringBuffer b = new StringBuffer();
-        b.append("\n" + name + " Format ID: ");
-        b.append(HexDump.toHex(s.getFormatID().getBytes()));
-        b.append("\n" + name + " Offset: " + s.getOffset());
-        b.append("\n" + name + " Section size: " + s.getSize());
-        b.append("\n" + name + " Property count: " + s.getPropertyCount());
-
-        final Property[] properties = s.getProperties();
-        for (int i = 0; i < properties.length; i++)
-        {
-            final Property p = properties[i];
-            final long id = p.getID();
-            final long type = p.getType();
-            final Object value = p.getValue();
-            b.append('\n');
-            b.append(name);
-            b.append(", Name: ");
-            b.append(id);
-            b.append(" (");
-            b.append(s.getPIDString(id));
-            b.append("), Type: ");
-            b.append(type);
-            b.append(", Value: ");
-            if (value instanceof byte[]) {
-                byte[] buf = new byte[4];
-                System.arraycopy(value, 0, buf, 0, 4);
-                b.append(HexDump.toHex(buf));
-                b.append(' ');
-                System.arraycopy(value, ((byte[])value).length - 4, buf, 0, 4);
-            } else if (value != null) {
-                b.append(value.toString());
-            } else {
-                b.append("null");
-            }
-        }
-        return b.toString();
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
deleted file mode 100644
index d2427ce..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
-
-import org.apache.poi.hpsf.HPSFException;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-
-/**
- * <p>Organizes document information in a tree model in order to be
- * e.g. displayed in a Swing {@link javax.swing.JTree}. An instance of this
- * class is created with a root tree node ({@link MutableTreeNode}) and
- * registered as a {@link POIFSReaderListener} with a {@link
- * org.apache.poi.poifs.eventfilesystem.POIFSReader}. While the latter processes
- * a POI filesystem it calls this class' {@link #processPOIFSReaderEvent} for
- * each document it has been registered for. This method appends the document it
- * processes at the appropriate position into the tree rooted at the
- * above mentioned root tree node.</p>
- *
- * <p>The root tree node should be the root tree node of a {@link
- * javax.swing.tree.TreeModel}.</p>
- *
- * <p>A top-level element in the tree model, i.e. an immediate child
- * node of the root node, describes a POI filesystem as such. It is
- * suggested to use the file's name (as seen by the operating system)
- * but it could be any other string.</p>
- *
- * <p>The value of a tree node is a {@link DocumentDescriptor}. Unlike
- * a {@link org.apache.poi.poifs.filesystem.POIFSDocument} which may be as heavy
- * as many megabytes, an instance of {@link DocumentDescriptor} is a
- * light-weight object and contains only some meta-information about a
- * document.</p>
- */
-public class TreeReaderListener implements POIFSReaderListener
-{
-
-    /**
-     * <p>The tree's root node. POI filesystems get attached to this
-     * node as children.</p>
-     */
-    protected MutableTreeNode rootNode;
-
-    /**
-     * <p>Maps filenames and POI document paths to their associated
-     * tree nodes.</p>
-     */
-    protected Map<Object,MutableTreeNode> pathToNode;
-
-    /**
-     * <p>The name of the file this {@link TreeReaderListener}
-     * processes. It is used to identify a top-level element in the
-     * tree. Alternatively any other string can be used. It is just a
-     * label which should identify a POI filesystem.</p>
-     */
-    protected String filename;
-
-
-
-    /**
-     * <p>Creates a {@link TreeReaderListener} which should then be
-     * registered with a
-     * {@link org.apache.poi.poifs.eventfilesystem.POIFSReader}.</p>
-     *
-     * @param filename The name of the POI filesystem, i.e. the name
-     * of the file the POI filesystem resides in. Alternatively any
-     * other string can be used.
-     *
-     * @param rootNode All document information will be attached as
-     * descendands to this tree node.
-     */
-    public TreeReaderListener(final String filename,
-                              final MutableTreeNode rootNode)
-    {
-        this.filename = filename;
-        this.rootNode = rootNode;
-        pathToNode = new HashMap<Object,MutableTreeNode>(15); // Should be a reasonable guess.
-    }
-
-
-
-    /** <p>The number of bytes to dump.</p> */
-    private int nrOfBytes = 50;
-
-    public void setNrOfBytes(final int nrOfBytes)
-    {
-        this.nrOfBytes = nrOfBytes;
-    }
-
-    public int getNrOfBytes()
-    {
-        return nrOfBytes;
-    }
-
-
-
-    /**
-     * <p>A document in the POI filesystem has been opened for
-     * reading. This method retrieves properties of the document and
-     * adds them to a tree model.</p>
-     */
-    @Override
-    public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-    {
-        DocumentDescriptor d;
-        final DocumentInputStream is = event.getStream();
-        if (!is.markSupported())
-            throw new UnsupportedOperationException(is.getClass().getName() +
-                " does not support mark().");
-
-        /* Try do handle this document as a property set. We receive
-         * an exception if is no property set and handle it as a
-         * document of some other format. We are not concerned about
-         * that document's details. */
-        try
-        {
-            d = new PropertySetDescriptor(event.getName(), event.getPath(),
-                                          is, nrOfBytes);
-        }
-        catch (HPSFException ex)
-        {
-            d = new DocumentDescriptor(event.getName(), event.getPath(),
-                                       is, nrOfBytes);
-        }
-        catch (Exception t)
-        {
-            System.err.println
-                ("Unexpected exception while processing " +
-                event.getName() + " in " + event.getPath().toString());
-            t.printStackTrace(System.err);
-            throw new RuntimeException(t.getMessage());
-        }
-
-        is.close();
-
-        final MutableTreeNode parentNode = getNode(d.path, filename, rootNode);
-        final MutableTreeNode nameNode = new DefaultMutableTreeNode(d.name);
-        parentNode.insert(nameNode, 0);
-        final MutableTreeNode dNode = new DefaultMutableTreeNode(d);
-        nameNode.insert(dNode, 0);
-    }
-
-
-
-    /**
-     * <p>Locates the parent node for a document entry in the tree
-     * model. If the parent node does not yet exist it will be
-     * created, too. This is done recursively, if needed.</p>
-     *
-     * @param path The tree node for this path is located.
-     *
-     * @param fsName The name of the POI filesystem. This is just a
-     * string which is displayed in the tree at the top lovel.
-     *
-     * @param root The root node.
-     */
-    private MutableTreeNode getNode(final POIFSDocumentPath path,
-                                    final String fsName,
-                                    final MutableTreeNode root)
-    {
-        MutableTreeNode n = pathToNode.get(path);
-        if (n != null)
-            /* Node found in map, just return it. */
-            return n;
-        if (path.length() == 0)
-        {
-            /* This is the root path of the POI filesystem. Its tree
-             * node is resp. must be located below the tree node of
-             * the POI filesystem itself. This is a tree node with the
-             * POI filesystem's name (this the operating system file's
-             * name) as its key it the path-to-node map. */
-            n = pathToNode.get(fsName);
-            if (n == null)
-            {
-                /* A tree node for the POI filesystem does not yet
-                 * exist. */
-                n = new DefaultMutableTreeNode(fsName);
-                pathToNode.put(fsName, n);
-                root.insert(n, 0);
-            }
-            return n;
-        }
-        /* else - The path is somewhere down in the POI filesystem's
-         * hierarchy. We need the tree node of this path's parent
-         * and attach our new node to it. */
-        final String name = path.getComponent(path.length() - 1);
-        final POIFSDocumentPath parentPath = path.getParent();
-        final MutableTreeNode parentNode =
-            getNode(parentPath, fsName, root);
-        n = new DefaultMutableTreeNode(name);
-        pathToNode.put(path, n);
-        parentNode.insert(n, 0);
-        return n;
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java b/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
deleted file mode 100644
index 8e86b18..0000000
--- a/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.poibrowser;
-
-import java.awt.*;
-import javax.swing.*;
-
-/**
- * <p>Contains various (well, just one at the moment) static utility
- * methods.</p>
- */
-public class Util {
-
-    /**
-     * <p>Makes a Swing component inverted by swapping its foreground
-     * and background colors. Hint: Depending on your needs it might
-     * also be a good idea to call <tt>c.setOpaque(true)</tt>.</p>
-     */
-    public static void invert(JComponent c) {
-        Color invBackground = c.getForeground();
-        Color invForeground = c.getBackground();
-        c.setBackground(invBackground);
-        c.setForeground(invForeground);
-    }
-}
-
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/AddDimensionedImage.java b/trunk/src/examples/src/org/apache/poi/ss/examples/AddDimensionedImage.java
deleted file mode 100644
index 5eb10c2..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/AddDimensionedImage.java
+++ /dev/null
@@ -1,1048 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.ss.examples;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Locale;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.IOUtils;
-
-
-/**
- * Demonstrates how to add an image to a worksheet and set that images size
- * to a specific number of millimetres irrespective of the width of the columns
- * or height of the rows. Overridden methods are provided so that the location
- * of the image - the cells row and column coordinates that define the top
- * left hand corners of the image - can be identified either in the familiar
- * Excel manner - A1 for instance - or using POI's methodology of a column and
- * row index where 0, 0 would indicate cell A1.
- *
- * The best way to make use of these techniques is to delay adding the image to
- * the sheet until all other work has been completed. That way, the sizes of
- * all rows and columns will have been adjusted - assuming that step was
- * necessary. Even though the anchors type is set to prevent the image moving
- * or re-sizing, this setting does not have any effect until the sheet is being
- * viewed using the Excel application.
- *
- * The key to the process is the ClientAnchor class. It defines methods that allow
- * us to define the location of an image by specifying the following;
- *
- *      * How far - in terms of coordinate positions - the image should be inset
- *      from the left hand border of a cell.
- *      * How far - in terms of coordinate positions - the image should be inset
- *      from the from the top of the cell.
- *      * How far - in terms of coordinate positions - the right hand edge of
- *      the image should protrude into a cell (measured from the cells left hand
- *      edge to the images right hand edge).
- *      * How far - in terms of coordinate positions - the bottom edge of the
- *      image should protrude into a row (measured from the cells top edge to
- *      the images bottom edge).
- *      * The index of the column that contains the cell whose top left hand
- *      corner should be aligned with the top left hand corner of the image.
- *      * The index of the row that contains the cell whose top left hand corner
- *      should be aligned with the images top left hand corner.
- *      * The index of the column that contains the cell whose top left hand
- *      corner should be aligned with the images bottom right hand corner
- *      * The index number of the row that contains the cell whose top left
- *      hand corner should be aligned with the images bottom right hand corner.
- *
- * It can be used to add an image into cell A1, for example, in the following
- * manner;
- *
- *      ClientAnchor anchor = sheet.getWorkbook().getCreationHelper().createClientAnchor();
- *
- *      anchor.setDx1(0);
- *      anchor.setDy1(0);
- *      anchor.setDx2(0);
- *      anchor.setDy2(0);
- *      anchor.setCol1(0);
- *      anchor.setRow1(0);
- *      anchor.setCol2(1);
- *      anchor.setRow2(1);
- *
- * Taken together, the first four methods define the locations of the top left
- * and bottom right hand corners of the image if you imagine that the image is
- * represented by a simple rectangle. The setDx1() and setDy1() methods locate
- * the top left hand corner of the image while setDx2() and and Dy2() locate the
- * bottom right hand corner of the image. An individual image can be inserted
- * into a single cell or is can lie across many cells and the latter four methods
- * are used to define just where the image should be positioned. They do this by
- * again by identifying where the top left and bottom right hand corners of the
- * image should be located but this time in terms of the indexes of the cells
- * in which those corners should be located. The setCol1() and setRow1() methods
- * together identify the cell that should contain the top left hand corner of
- * the image while setCol2() and setRow2() do the same for the images bottom
- * right hand corner. 
- *
- * Knowing that, it is possible to look again at the example above and to see
- * that the top left hand corner of the image will be located in cell A1 (0, 0)
- * and it will be aligned with the very top left hand corner of the cell. Likewise,
- * the bottom right hand corner of the image will be located in cell B2 (1, 1) and
- * it will again be aligned with the top left hand corner of the cell. This has the
- * effect of making the image seem to occupy the whole of cell A1. Interestingly, it
- * also has an effect on the images resizing behaviour because testing has 
- * demonstrated that if the image is wholly contained within one cell and is not
- * 'attached' for want of a better word, to a neighbouring cell, then that image
- * will not increase in size in response to the user dragging the column wider
- * or the cell higher.
- *
- * The following example demonstrates a slightly different way to insert an
- * image into cell A1 and to ensure that it occupies the whole of the cell. This
- * is accomplished by specifying the the images bottom right hand corner should be
- * aligned with the bottom right hand corner of the cell. It is also a case
- * where the image will not increase in size if the user increases the size of
- * the enclosing cell - irrespective of the anchors type - but it will reduce in
- * size if the cell is made smaller.
- *
- *      ClientAnchor anchor = sheet.getWorkbook().getCreationHelper().createClientAnchor();
- *
- *      anchor.setDx1(0);
- *      anchor.setDy1(0);
- *      anchor.setDx2(1023);
- *      anchor.setDy2(255);
- *      anchor.setCol1(0);
- *      anchor.setRow1(0);
- *      anchor.setCol2(0);
- *      anchor.setRow2(0);
- *
- * Note that the final four method calls all pass the same value and seem to
- * indicate that the images top left hand corner is aligned with the top left
- * hand corner of cell A1 and that it's bottom right hand corner is also
- * aligned with the top left hand corner of cell A1. Yet, running this code
- * would see the image fully occupying cell A1. That is the result of the
- * values passed to parameters three and four; these I have referred to as
- * determining the images coordinates within the cell. They indicate that the
- * image should occupy - in order - the full width of the column and the full
- * height of the row.
- *
- * The co-ordinate values shown are the maxima; and they are independent of
- * row height/column width and of the font used. Passing 255 will always result
- * in the image occupying the full height of the row and passing 1023 will
- * always result in the image occupying the full width of the column. They help
- * in situations where an image is larger than a column/row and must overlap
- * into the next column/row. Using them does mean, however, that it is often
- * necessary to perform conversions between Excels characters units, points,
- * pixels and millimetres in order to establish how many rows/columns an image
- * should occupy and just what the various insets ought to be.
- *
- * Note that the setDx1(int) and setDy1(int) methods of the ClientAchor class
- * are not made use of in the code that follows. It would be fairly trivial
- * however to extend this example further and provide methods that would centre
- * an image within a cell or allow the user to specify that a plain border a
- * fixed number of millimetres wide should wrap around the image. Those first
- * two parameters would make this sort of functionality perfectly possible.
- *
- * Owing to the various conversions used, the actual size of the image may vary
- * from that required; testing has so far found this to be in the region of
- * plus or minus two millimetres. Most likely by modifying the way the
- * calculations are performed - possibly using double(s) throughout and
- * rounding the values at the correct point - it is likely that these errors
- * could be reduced or removed.
- *
- * A note concerning Excels image resizing behaviour. The ClientAnchor
- * class contains a method called setAnchorType(int) which can be used to
- * determine how Excel will resize an image in response to the user increasing
- * or decreasing the dimensions of the cell containing the image. There are 
- * three values that can be passed to this method; 0 = To move and size the 
- * image with the cell, 2 = To move but don't size the image with the cell,
- * 3 = To prevent the image from moving or being resized along with the cell. If
- * an image is inserted using this class and placed into a single cell then if
- * the setAnchorType(int) method is called and a value of either 0 or 2 passed
- * to it, the resultant resizing behaviour may be a surprise. The image will not
- * grow in size of the column is made wider or the row higher but it will shrink
- * if the columns width or rows height are reduced.
- *
- * @author Mark Beardsley [msb at apache.org] and Mark Southern [southern at scripps.edu]
- * @version 1.00 5th August 2009.
- *          2.00 26th February 2010.
- *               Ported to make use of the the SS usermodel classes.
- *               Ability to reuse the Drawing Patriarch so that multiple images
- *               can be inserted without unintentionally erasing earlier images.
- *               Check on image type added; i.e. jpg, jpeg or png.
- *               The String used to contain the files name is now converted
- *               into a URL.
- *          2.10 17th May 2012
- *               Corrected gross error that occurred when using the code with
- *               XSSF or SXSSF workbooks. In short, the code did not correctly
- *               calculate the size of the image(s) owing to the use of EMUs
- *               within the OOXML file format. That problem has largely been
- *               corrected although it should be mentioned that images are not
- *               sized with the same level of accuracy. Discrepancies of up to
- *               2mm have been noted in testing. Further investigation will
- *               continue to rectify this issue.
- */
-public class AddDimensionedImage {
-
-    // Four constants that determine how - and indeed whether - the rows
-    // and columns an image may overlie should be expanded to accomodate that
-    // image.
-    // Passing EXPAND_ROW will result in the height of a row being increased
-    // to accomodate the image if it is not already larger. The image will
-    // be layed across one or more columns.
-    // Passing EXPAND_COLUMN will result in the width of the column being
-    // increased to accomodate the image if it is not already larger. The image
-    // will be layed across one or many rows.
-    // Passing EXPAND_ROW_AND_COLUMN will result in the height of the row
-    // bing increased along with the width of the column to accomdate the
-    // image if either is not already larger.
-    // Passing OVERLAY_ROW_AND_COLUMN will result in the image being layed
-    // over one or more rows and columns. No row or column will be resized,
-    // instead, code will determine how many rows and columns the image should
-    // overlie.
-    public static final int EXPAND_ROW = 1;
-    public static final int EXPAND_COLUMN = 2;
-    public static final int EXPAND_ROW_AND_COLUMN = 3;
-    public static final int OVERLAY_ROW_AND_COLUMN = 7;
-    
-    // Modified to support EMU - English Metric Units - used within the OOXML
-    // workbooks, this multoplier is used to convert between measurements in
-    // millimetres and in EMUs
-    private static final int EMU_PER_MM = 36000;
-    
-    /**
-     * Add an image to a worksheet.
-     *
-     * @param cellNumber A String that contains the location of the cell whose
-     *                   top left hand corner should be aligned with the top
-     *                   left hand corner of the image; for example "A1", "A2"
-     *                   etc. This is to support the familiar Excel syntax.
-     *                   Whilst images are are not actually inserted into cells
-     *                   this provides a convenient method of indicating where
-     *                   the image should be positioned on the sheet.
-     * @param sheet A reference to the sheet that contains the cell referenced
-     *              above.
-     * @param drawing An instance of the DrawingPatriarch class. This is now
-     *                passed into the method where it was, previously, recovered
-     *                from the sheet in order to allow multiple pictures be
-     *                inserted. If the patriarch was not 'cached in this manner
-     *                each time it was created any previously positioned images
-     *                would be simply over-written.
-     * @param imageFile An instance of the URL class that encapsulates the name
-     *                  of and path to the image that is to be 'inserted into'
-     *                  the sheet.
-     * @param reqImageWidthMM A primitive double that contains the required
-     *                        width of the image in millimetres.
-     * @param reqImageHeightMM A primitive double that contains the required
-     *                         height of the image in millimetres.
-     * @param resizeBehaviour A primitive int whose value will determine how
-     *                        the code should react if the image is larger than
-     *                        the cell referenced by the cellNumber parameter.
-     *                        Four constants are provided to determine what
-     *                        should happen;
-     *                          AddDimensionedImage.EXPAND_ROW
-     *                          AddDimensionedImage.EXPAND_COLUMN
-     *                          AddDimensionedImage.EXPAND_ROW_AND_COLUMN
-     *                          AddDimensionedImage.OVERLAY_ROW_AND_COLUMN
-     * @throws java.io.FileNotFoundException If the file containing the image
-     *                                       cannot be located.
-     * @throws java.io.IOException If a problem occurs whilst reading the file
-     *                             of image data.
-     * @throws java.lang.IllegalArgumentException If an invalid value is passed
-     *                                            to the resizeBehaviour
-     *                                            parameter.
-     */
-    public void addImageToSheet(String cellNumber, Sheet sheet, Drawing drawing,
-            URL imageFile, double reqImageWidthMM, double reqImageHeightMM,
-            int resizeBehaviour) throws IOException, IllegalArgumentException {
-        // Convert the String into column and row indices then chain the
-        // call to the overridden addImageToSheet() method.
-        CellReference cellRef = new CellReference(cellNumber);
-        this.addImageToSheet(cellRef.getCol(), cellRef.getRow(), sheet, drawing,
-                imageFile, reqImageWidthMM, reqImageHeightMM,resizeBehaviour);
-    }
-
-    /**
-     * Add an image to a worksheet.
-     *
-     * @param colNumber A primitive int that contains the index number of a
-     *                  column on the worksheet; POI column indices are zero
-     *                  based. Together with the rowNumber parameter's value,
-     *                  this parameter identifies a cell on the worksheet. The
-     *                  images top left hand corner will be aligned with the
-     *                  top left hand corner of this cell.
-     * @param rowNumber A primitive int that contains the index number of a row
-     *                  on the worksheet; POI row indices are zero based.
-     *                  Together with the rowNumber parameter's value, this
-     *                  parameter identifies a cell on the worksheet. The
-     *                  images top left hand corner will be aligned with the
-     *                  top left hand corner of this cell.
-     * @param sheet A reference to the sheet that contains the cell identified
-     *              by the two parameters above.
-     * @param drawing An instance of the DrawingPatriarch class. This is now
-     *                passed into the method where it was, previously, recovered
-     *                from the sheet in order to allow multiple pictures be
-     *                inserted. If the patriarch was not 'cached in this manner
-     *                each time it was created any previously positioned images
-     *                would be simply over-written.
-     * @param imageFile An instance of the URL class that encapsulates the name
-     *                  of and path to the image that is to be 'inserted into'
-     *                  the sheet.
-     * @param reqImageWidthMM A primitive double that contains the required
-     *                        width of the image in millimetres.
-     * @param reqImageHeightMM A primitive double that contains the required
-     *                         height of the image in millimetres.
-     * @param resizeBehaviour A primitive int whose value will determine how
-     *                        the code should react if the image is larger than
-     *                        the cell referenced by the colNumber and
-     *                        rowNumber parameters. Four constants are provided
-     *                        to determine what should happen;
-     *                          AddDimensionedImage.EXPAND_ROW
-     *                          AddDimensionedImage.EXPAND_COLUMN
-     *                          AddDimensionedImage.EXPAND_ROW_AND_COLUMN
-     *                          AddDimensionedImage.OVERLAY_ROW_AND_COLUMN
-     * @throws java.io.FileNotFoundException If the file containing the image
-     *                                       cannot be located.
-     * @throws java.io.IOException If a problem occurs whilst reading the file
-     *                             of image data.
-     * @throws java.lang.IllegalArgumentException If an invalid value is passed
-     *                                            to the resizeBehaviour
-     *                                            parameter or if the extension
-     *                                            of the image file indicates that
-     *                                            it is of a type that cannot
-     *                                            currently be added to the worksheet.
-     */
-    public void addImageToSheet(int colNumber, int rowNumber, Sheet sheet, Drawing drawing,
-            URL imageFile, double reqImageWidthMM, double reqImageHeightMM,
-            int resizeBehaviour) throws IOException,
-                                                     IllegalArgumentException {
-        ClientAnchor anchor = null;
-        ClientAnchorDetail rowClientAnchorDetail = null;
-        ClientAnchorDetail colClientAnchorDetail = null;
-        int imageType = 0;
-
-        // Validate the resizeBehaviour parameter.
-        if((resizeBehaviour != AddDimensionedImage.EXPAND_COLUMN) &&
-           (resizeBehaviour != AddDimensionedImage.EXPAND_ROW) &&
-           (resizeBehaviour != AddDimensionedImage.EXPAND_ROW_AND_COLUMN) &&
-           (resizeBehaviour != AddDimensionedImage.OVERLAY_ROW_AND_COLUMN)) {
-            throw new IllegalArgumentException("Invalid value passed to the " +
-                    "resizeBehaviour parameter of AddDimensionedImage.addImageToSheet()");
-        }
-
-        // Call methods to calculate how the image and sheet should be
-        // manipulated to accomodate the image; columns and then rows.
-        colClientAnchorDetail = this.fitImageToColumns(sheet, colNumber,
-                reqImageWidthMM, resizeBehaviour);
-        rowClientAnchorDetail = this.fitImageToRows(sheet, rowNumber,
-                reqImageHeightMM, resizeBehaviour);
-
-        // Having determined if and how to resize the rows, columns and/or the
-        // image, create the ClientAnchor object to position the image on
-        // the worksheet. Note how the two ClientAnchorDetail records are
-        // interrogated to recover the row/column co-ordinates and any insets.
-        // The first two parameters are not used currently but could be if the
-        // need arose to extend the functionality of this code by adding the
-        // ability to specify that a clear 'border' be placed around the image.
-        anchor = sheet.getWorkbook().getCreationHelper().createClientAnchor();
-
-        anchor.setDx1(0);
-        anchor.setDy1(0);
-        anchor.setDx2(colClientAnchorDetail.getInset());
-        anchor.setDy2(rowClientAnchorDetail.getInset());
-        anchor.setCol1(colClientAnchorDetail.getFromIndex());
-        anchor.setRow1(rowClientAnchorDetail.getFromIndex());
-        anchor.setCol2(colClientAnchorDetail.getToIndex());
-        anchor.setRow2(rowClientAnchorDetail.getToIndex());
-
-        // For now, set the anchor type to do not move or resize the
-        // image as the size of the row/column is adjusted. This could easily
-        // become another parameter passed to the method. Please read the note
-        // above regarding the behaviour of image resizing.
-        anchor.setAnchorType(AnchorType.MOVE_AND_RESIZE);
-
-        // Now, add the picture to the workbook. Note that unlike the similar
-        // method in the HSSF Examples section, the image type is checked. First,
-        // the image files location is identified by interrogating the URL passed
-        // to the method, the images type is identified before it is added to the
-        // sheet.
-        String sURL = imageFile.toString().toLowerCase(Locale.ROOT);
-	if( sURL.endsWith(".png") ) {
-            imageType = Workbook.PICTURE_TYPE_PNG;
-	}
-	else if( sURL.endsWith("jpg") || sURL.endsWith(".jpeg") ) {
-            imageType = Workbook.PICTURE_TYPE_JPEG;
-	}
-	else  {
-            throw new IllegalArgumentException("Invalid Image file : " +
-                sURL);
-	}
-        int index = sheet.getWorkbook().addPicture(
-            IOUtils.toByteArray(imageFile.openStream()), imageType);
-        drawing.createPicture(anchor, index);
-    }
-
-    /**
-     * Determines whether the sheets columns should be re-sized to accommodate
-     * the image, adjusts the columns width if necessary and creates then
-     * returns a ClientAnchorDetail object that facilitates construction of
-     * an ClientAnchor that will fix the image on the sheet and establish
-     * it's size.
-     *
-     * @param sheet A reference to the sheet that will 'contain' the image.
-     * @param colNumber A primitive int that contains the index number of a
-     *                  column on the sheet.
-     * @param reqImageWidthMM A primitive double that contains the required
-     *                        width of the image in millimetres
-     * @param resizeBehaviour A primitive int whose value will indicate how the
-     *                        width of the column should be adjusted if the
-     *                        required width of the image is greater than the
-     *                        width of the column.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the column containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number column containing the cell whose top
-     *         left hand corner also defines the bottom right hand corner of
-     *         the image and an inset that determines how far the right hand
-     *         edge of the image can protrude into the next column - expressed
-     *         as a specific number of coordinate positions.
-     */
-    private ClientAnchorDetail fitImageToColumns(Sheet sheet, int colNumber,
-            double reqImageWidthMM, int resizeBehaviour) {
-
-        double colWidthMM = 0.0D;
-        double colCoordinatesPerMM = 0.0D;
-        int pictureWidthCoordinates = 0;
-        ClientAnchorDetail colClientAnchorDetail = null;
-
-        // Get the colum's width in millimetres
-        colWidthMM = ConvertImageUnits.widthUnits2Millimetres(
-                (short)sheet.getColumnWidth(colNumber));
-
-        // Check that the column's width will accomodate the image at the
-        // required dimension. If the width of the column is LESS than the
-        // required width of the image, decide how the application should
-        // respond - resize the column or overlay the image across one or more
-        // columns.
-        if(colWidthMM < reqImageWidthMM) {
-
-            // Should the column's width simply be expanded?
-            if((resizeBehaviour == AddDimensionedImage.EXPAND_COLUMN) ||
-               (resizeBehaviour == AddDimensionedImage.EXPAND_ROW_AND_COLUMN)) {
-                // Set the width of the column by converting the required image
-                // width from millimetres into Excel's column width units.
-                sheet.setColumnWidth(colNumber,
-                        ConvertImageUnits.millimetres2WidthUnits(reqImageWidthMM));
-                // To make the image occupy the full width of the column, convert
-                // the required width of the image into co-ordinates. This value
-                // will become the inset for the ClientAnchorDetail class that
-                // is then instantiated.
-                if(sheet instanceof HSSFSheet) {
-                    colWidthMM = reqImageWidthMM;
-                    colCoordinatesPerMM = ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS /
-                        colWidthMM;
-                    pictureWidthCoordinates = (int)(reqImageWidthMM * colCoordinatesPerMM);
-
-                }
-                else {
-                    pictureWidthCoordinates = (int)reqImageWidthMM * AddDimensionedImage.EMU_PER_MM;
-                }
-                colClientAnchorDetail = new ClientAnchorDetail(colNumber,
-                        colNumber, pictureWidthCoordinates);
-            }
-            // If the user has chosen to overlay both rows and columns or just
-            // to expand ONLY the size of the rows, then calculate how to lay
-            // the image out across one or more columns.
-            else if ((resizeBehaviour == AddDimensionedImage.OVERLAY_ROW_AND_COLUMN) ||
-                     (resizeBehaviour == AddDimensionedImage.EXPAND_ROW)) {
-                colClientAnchorDetail = this.calculateColumnLocation(sheet,
-                        colNumber, reqImageWidthMM);
-            }
-        }
-        // If the column is wider than the image.
-        else {
-            if(sheet instanceof HSSFSheet) {
-                // Mow many co-ordinate positions are there per millimetre?
-                colCoordinatesPerMM = ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS /
-                    colWidthMM;
-                // Given the width of the image, what should be it's co-ordinate?
-                pictureWidthCoordinates = (int)(reqImageWidthMM * colCoordinatesPerMM);
-            }
-            else {
-                pictureWidthCoordinates = (int)reqImageWidthMM *
-                        AddDimensionedImage.EMU_PER_MM;
-            }
-            colClientAnchorDetail = new ClientAnchorDetail(colNumber,
-                    colNumber, pictureWidthCoordinates);
-        }
-        return(colClientAnchorDetail);
-    }
-
-    /**
-     * Determines whether the sheets row should be re-sized to accomodate
-     * the image, adjusts the rows height if necessary and creates then
-     * returns a ClientAnchorDetail object that facilitates construction of
-     * a ClientAnchor that will fix the image on the sheet and establish
-     * it's size.
-     *
-     * @param sheet A reference to the sheet that will 'contain' the image.
-     * @param rowNumber A primitive int that contains the index number of a
-     *                  row on the sheet.
-     * @param reqImageHeightMM A primitive double that contains the required
-     *                         height of the image in millimetres
-     * @param resizeBehaviour A primitive int whose value will indicate how the
-     *                        height of the row should be adjusted if the
-     *                        required height of the image is greater than the
-     *                        height of the row.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the row containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number of the row containing the cell whose
-     *         top left hand corner also defines the bottom right hand
-     *         corner of the image and an inset that determines how far the
-     *         bottom edge of the image can protrude into the next (lower)
-     *         row - expressed as a specific number of coordinate positions.
-     */
-    private ClientAnchorDetail fitImageToRows(Sheet sheet, int rowNumber,
-            double reqImageHeightMM, int resizeBehaviour) {
-        Row row = null;
-        double rowHeightMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
-        int pictureHeightCoordinates = 0;
-        ClientAnchorDetail rowClientAnchorDetail = null;
-
-        // Get the row and it's height
-        row = sheet.getRow(rowNumber);
-        if(row == null) {
-            // Create row if it does not exist.
-            row = sheet.createRow(rowNumber);
-        }
-
-        // Get the row's height in millimetres
-        rowHeightMM = row.getHeightInPoints() / ConvertImageUnits.POINTS_PER_MILLIMETRE;
-
-        // Check that the row's height will accomodate the image at the required
-        // dimensions. If the height of the row is LESS than the required height
-        // of the image, decide how the application should respond - resize the
-        // row or overlay the image across a series of rows.
-        if(rowHeightMM < reqImageHeightMM) {
-            if((resizeBehaviour == AddDimensionedImage.EXPAND_ROW) ||
-               (resizeBehaviour == AddDimensionedImage.EXPAND_ROW_AND_COLUMN)) {
-                row.setHeightInPoints((float)(reqImageHeightMM *
-                        ConvertImageUnits.POINTS_PER_MILLIMETRE));
-                if(sheet instanceof HSSFSheet) {                    
-                    rowHeightMM = reqImageHeightMM;
-                    rowCoordinatesPerMM = ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS /
-                        rowHeightMM;
-                    pictureHeightCoordinates = (int)(reqImageHeightMM *
-                            rowCoordinatesPerMM);
-                }
-                else {
-                    pictureHeightCoordinates = (int)(reqImageHeightMM *
-                            AddDimensionedImage.EMU_PER_MM);
-                }
-                rowClientAnchorDetail = new ClientAnchorDetail(rowNumber,
-                        rowNumber, pictureHeightCoordinates);
-            }
-            // If the user has chosen to overlay both rows and columns or just
-            // to expand ONLY the size of the columns, then calculate how to lay
-            // the image out ver one or more rows.
-            else if((resizeBehaviour == AddDimensionedImage.OVERLAY_ROW_AND_COLUMN) ||
-                    (resizeBehaviour == AddDimensionedImage.EXPAND_COLUMN)) {
-                rowClientAnchorDetail = this.calculateRowLocation(sheet,
-                        rowNumber, reqImageHeightMM);
-            }
-        }
-        // Else, if the image is smaller than the space available
-        else {
-            if(sheet instanceof HSSFSheet) {
-                rowCoordinatesPerMM = ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS /
-                    rowHeightMM;
-                pictureHeightCoordinates = (int)(reqImageHeightMM * rowCoordinatesPerMM);
-            }
-            else {
-                pictureHeightCoordinates = (int)(reqImageHeightMM *
-                        AddDimensionedImage.EMU_PER_MM);
-            }
-            rowClientAnchorDetail = new ClientAnchorDetail(rowNumber,
-                        rowNumber, pictureHeightCoordinates);
-        }
-        return(rowClientAnchorDetail);
-    }
-
-    /**
-     * If the image is to overlie more than one column, calculations need to be
-     * performed to determine how many columns and whether the image will
-     * overlie just a part of one column in order to be presented at the
-     * required size.
-     *
-     * @param sheet The sheet that will 'contain' the image.
-     * @param startingColumn A primitive int whose value is the index of the
-     *                       column that contains the cell whose top left hand
-     *                       corner should be aligned with the top left hand
-     *                       corner of the image.
-     * @param reqImageWidthMM A primitive double whose value will indicate the
-     *                        required width of the image in millimetres.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the column containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number column containing the cell whose top
-     *         left hand corner also defines the bottom right hand corner of
-     *         the image and an inset that determines how far the right hand
-     *         edge of the image can protrude into the next column - expressed
-     *         as a specific number of coordinate positions.
-     */
-    private ClientAnchorDetail calculateColumnLocation(Sheet sheet,
-                                                       int startingColumn,
-                                                       double reqImageWidthMM) {
-        ClientAnchorDetail anchorDetail = null;
-        double totalWidthMM = 0.0D;
-        double colWidthMM = 0.0D;
-        double overlapMM = 0.0D;
-        double coordinatePositionsPerMM = 0.0D;
-        int toColumn = startingColumn;
-        int inset = 0;
-
-        // Calculate how many columns the image will have to
-        // span in order to be presented at the required size.
-        while(totalWidthMM < reqImageWidthMM) {
-            colWidthMM = ConvertImageUnits.widthUnits2Millimetres(
-                    (short)(sheet.getColumnWidth(toColumn)));
-            // Note use of the cell border width constant. Testing with an image
-            // declared to fit exactly into one column demonstrated that it's
-            // width was greater than the width of the column the POI returned.
-            // Further, this difference was a constant value that I am assuming
-            // related to the cell's borders. Either way, that difference needs
-            // to be allowed for in this calculation.
-            totalWidthMM += (colWidthMM + ConvertImageUnits.CELL_BORDER_WIDTH_MILLIMETRES);
-            toColumn++;
-        }
-        // De-crement by one the last column value.
-        toColumn--;
-        // Highly unlikely that this will be true but, if the width of a series
-        // of columns is exactly equal to the required width of the image, then
-        // simply build a ClientAnchorDetail object with an inset equal to the
-        // total number of co-ordinate positions available in a column, a
-        // from column co-ordinate (top left hand corner) equal to the value
-        // of the startingColumn parameter and a to column co-ordinate equal
-        // to the toColumn variable.
-        //
-        // Convert both values to ints to perform the test.
-        if((int)totalWidthMM == (int)reqImageWidthMM) {
-            // A problem could occur if the image is sized to fit into one or
-            // more columns. If that occurs, the value in the toColumn variable
-            // will be in error. To overcome this, there are two options, to
-            // ibcrement the toColumn variable's value by one or to pass the
-            // total number of co-ordinate positions to the third paramater
-            // of the ClientAnchorDetail constructor. For no sepcific reason,
-            // the latter option is used below.
-            if(sheet instanceof HSSFSheet) {
-                anchorDetail = new ClientAnchorDetail(startingColumn,
-                    toColumn, ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS);
-            }
-            else {
-                anchorDetail = new ClientAnchorDetail(startingColumn,
-                    toColumn, (int)reqImageWidthMM * AddDimensionedImage.EMU_PER_MM);
-            }
-        }
-        // In this case, the image will overlap part of another column and it is
-        // necessary to calculate just how much - this will become the inset
-        // for the ClientAnchorDetail object.
-        else {
-            // Firstly, claculate how much of the image should overlap into
-            // the next column.
-            overlapMM = reqImageWidthMM - (totalWidthMM - colWidthMM);
-
-            // When the required size is very close indded to the column size,
-            // the calcaulation above can produce a negative value. To prevent
-            // problems occuring in later caculations, this is simply removed
-            // be setting the overlapMM value to zero.
-            if(overlapMM < 0) {
-                overlapMM = 0.0D;
-            }
-
-            if(sheet instanceof HSSFSheet) {
-                // Next, from the columns width, calculate how many co-ordinate
-                // positons there are per millimetre
-                coordinatePositionsPerMM = ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS /
-                    colWidthMM;
-                // From this figure, determine how many co-ordinat positions to
-                // inset the left hand or bottom edge of the image.
-                inset = (int)(coordinatePositionsPerMM * overlapMM);
-            }
-            else {
-                inset = (int)overlapMM * AddDimensionedImage.EMU_PER_MM;
-            }
-
-            // Now create the ClientAnchorDetail object, setting the from and to
-            // columns and the inset.
-            anchorDetail = new ClientAnchorDetail(startingColumn, toColumn, inset);
-        }
-        return(anchorDetail);
-    }
-
-    /**
-     * If the image is to overlie more than one rows, calculations need to be
-     * performed to determine how many rows and whether the image will
-     * overlie just a part of one row in order to be presented at the
-     * required size.
-     *
-     * @param sheet The sheet that will 'contain' the image.
-     * @param startingRow A primitive int whose value is the index of the row
-     *                    that contains the cell whose top left hand corner
-     *                    should be aligned with the top left hand corner of
-     *                    the image.
-     * @param reqImageHeightMM A primitive double whose value will indicate the
-     *                         required height of the image in millimetres.
-     * @return An instance of the ClientAnchorDetail class that will contain
-     *         the index number of the row containing the cell whose top
-     *         left hand corner also defines the top left hand corner of the
-     *         image, the index number of the row containing the cell whose top
-     *         left hand corner also defines the bottom right hand corner of
-     *         the image and an inset that determines how far the bottom edge
-     *         can protrude into the next (lower) row - expressed as a specific
-     *         number of co-ordinate positions.
-     */
-    private ClientAnchorDetail calculateRowLocation(Sheet sheet,
-            int startingRow, double reqImageHeightMM) {
-        ClientAnchorDetail clientAnchorDetail = null;
-        Row row = null;
-        double rowHeightMM = 0.0D;
-        double totalRowHeightMM = 0.0D;
-        double overlapMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
-        int toRow = startingRow;
-        int inset = 0;
-
-        // Step through the rows in the sheet and accumulate a total of their
-        // heights.
-        while(totalRowHeightMM < reqImageHeightMM) {
-            row = sheet.getRow(toRow);
-            // Note, if the row does not already exist on the sheet then create
-            // it here.
-            if(row == null) {
-                row = sheet.createRow(toRow);
-            }
-            // Get the row's height in millimetres and add to the running total.
-            rowHeightMM = row.getHeightInPoints() /
-                    ConvertImageUnits.POINTS_PER_MILLIMETRE;
-            totalRowHeightMM += rowHeightMM;
-            toRow++;
-        }
-        // Owing to the way the loop above works, the rowNumber will have been
-        // incremented one row too far. Undo that here.
-        toRow--;
-        // Check to see whether the image should occupy an exact number of
-        // rows. If so, build the ClientAnchorDetail record to point
-        // to those rows and with an inset of the total number of co-ordinate
-        // position in the row.
-        //
-        // To overcome problems that can occur with comparing double values for
-        // equality, cast both to int(s) to truncate the value; VERY crude and
-        // I do not really like it!!
-        if((int)totalRowHeightMM == (int)reqImageHeightMM) {
-            if(sheet instanceof HSSFSheet) {
-                clientAnchorDetail = new ClientAnchorDetail(startingRow, toRow,
-                    ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS);
-            }
-            else {
-                clientAnchorDetail = new ClientAnchorDetail(startingRow, toRow,
-                    (int)reqImageHeightMM * AddDimensionedImage.EMU_PER_MM);
-            }
-        }
-        else {
-            // Calculate how far the image will project into the next row. Note
-            // that the height of the last row assessed is subtracted from the
-            // total height of all rows assessed so far.
-            overlapMM = reqImageHeightMM - (totalRowHeightMM - rowHeightMM);
-
-            // To prevent an exception being thrown when the required width of
-            // the image is very close indeed to the column size.
-            if(overlapMM < 0) {
-                overlapMM = 0.0D;
-            }
-
-            if(sheet instanceof HSSFSheet) {
-                rowCoordinatesPerMM = ConvertImageUnits.TOTAL_ROW_COORDINATE_POSITIONS /
-                    rowHeightMM;
-                inset = (int)(overlapMM * rowCoordinatesPerMM);
-            }
-            else {
-                inset = (int)overlapMM * AddDimensionedImage.EMU_PER_MM;
-            }
-            clientAnchorDetail = new ClientAnchorDetail(startingRow,
-                        toRow, inset);
-        }
-        return(clientAnchorDetail);
-    }
-
-    /**
-     * The main entry point to the program. It contains code that demonstrates
-     * one way to use the program.
-     *
-     * Note, the code is not restricted to use on new workbooks only. If an
-     * image is to be inserted into an existing workbook. just open that
-     * workbook, gat a reference to a sheet and pass that;
-     *
-     *      AddDimensionedImage addImage = new AddDimensionedImage();
-     *
-     *      File file = new File("....... Existing Workbook .......");
-     *      FileInputStream fis = new FileInputStream(file);
-     *      Workbook workbook = new HSSFWorkbook(fis);
-     *      HSSFSheet sheet = workbook.getSheetAt(0);
-     *      addImage.addImageToSheet("C3", sheet, "image.jpg", 30, 20,
-     *          AddDimensionedImage.EXPAND.ROW);
-     *
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-    	String imageFile = null;
-    	String outputFile = null;
-        FileOutputStream fos = null;
-        Workbook workbook = null;
-        Sheet sheet = null;
-        try {
-        	if(args.length < 2){
-        		System.err.println("Usage: AddDimensionedImage imageFile outputFile");
-        		return;
-        	}
-        	workbook = new HSSFWorkbook();   // OR XSSFWorkbook
-        	sheet = workbook.createSheet("Picture Test");
-               	imageFile = args[0];
-        	outputFile = args[1];
-        	new AddDimensionedImage().addImageToSheet("B5", sheet, sheet.createDrawingPatriarch(),
-        		new File(imageFile).toURI().toURL(), 100, 40,
-        		AddDimensionedImage.EXPAND_ROW_AND_COLUMN);
-      		fos = new FileOutputStream(outputFile);
-            workbook.write(fos);
-        }
-        catch(FileNotFoundException fnfEx) {
-            System.out.println("Caught an: " + fnfEx.getClass().getName());
-            System.out.println("Message: " + fnfEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            fnfEx.printStackTrace(System.out);
-        }
-        catch(IOException ioEx) {
-            System.out.println("Caught an: " + ioEx.getClass().getName());
-            System.out.println("Message: " + ioEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            ioEx.printStackTrace(System.out);
-        }
-        finally {
-            if(fos != null) {
-                try {
-                    fos.close();
-                    fos = null;
-                }
-                catch(IOException ioEx) {
-                    // I G N O R E
-                }
-            }
-        }
-    }
-
-    /**
-     * The HSSFClientAnchor class accepts eight arguments. In order, these are;
-     *
-     *      * How far the left hand edge of the image is inset from the left hand
-     *      edge of the cell
-     *      * How far the top edge of the image is inset from the top of the cell
-     *      * How far the right hand edge of the image is inset from the left
-     *      hand edge of the cell
-     *      * How far the bottom edge of the image is inset from the top of the
-     *      cell.
-     *      * Together, arguments five and six determine the column and row
-     *      coordinates of the cell whose top left hand corner will be aligned
-     *      with the images top left hand corner.
-     *      * Together, arguments seven and eight determine the column and row
-     *      coordinates of the cell whose top left hand corner will be aligned
-     *      with the images bottom right hand corner.
-     *
-     * An instance of the ClientAnchorDetail class provides three of the eight
-     * parameters, one of the coordinates for the images top left hand corner,
-     * one of the coordinates for the images bottom right hand corner and
-     * either how far the image should be inset from the top or the left hand
-     * edge of the cell.
-     *
-     * @author Mark Beardsley [msb at apache.org]
-     * @version 1.00 5th August 2009.
-     */
-    public class ClientAnchorDetail {
-
-        public int fromIndex = 0;
-        public int toIndex = 0;
-        public int inset = 0;
-
-        /**
-         * Create a new instance of the ClientAnchorDetail class using the
-         * following parameters.
-         *
-         * @param fromIndex A primitive int that contains one of the
-         *                  coordinates (row or column index) for the top left
-         *                  hand corner of the image.
-         * @param toIndex A primitive int that contains one of the
-         *                coordinates (row or column index) for the bottom
-         *                right hand corner of the image.
-         * @param inset A primitive int that contains a value which indicates
-         *              how far the image should be inset from the top or the
-         *              left hand edge of a cell.
-         */
-        public ClientAnchorDetail(int fromIndex, int toIndex, int inset) {
-            this.fromIndex = fromIndex;
-            this.toIndex = toIndex;
-            this.inset = inset;
-        }
-
-        /**
-         * Get one of the number of the column or row that contains the cell
-         * whose top left hand corner will be aligned with the top left hand
-         * corner of the image.
-         *
-         * @return The value - row or column index - for one of the coordinates
-         *         of the top left hand corner of the image.
-         */
-        public int getFromIndex() {
-            return(this.fromIndex);
-        }
-
-        /**
-         * Get one of the number of the column or row that contains the cell
-         * whose top left hand corner will be aligned with the bottom right hand
-         * corner of the image.
-         *
-         * @return The value - row or column index - for one of the coordinates
-         *         of the bottom right hand corner of the image.
-         */
-        public int getToIndex() {
-            return(this.toIndex);
-        }
-
-        /**
-         * Get the images offset from the edge of a cell.
-         *
-         * @return How far either the right hand or bottom edge of the image is
-         *         inset from the left hand or top edge of a cell.
-         */
-        public int getInset() {
-            return(this.inset);
-        }
-    }
-
-    /**
-     * Utility methods used to convert Excels character based column and row
-     * size measurements into pixels and/or millimetres. The class also contains
-     * various constants that are required in other calculations.
-     *
-     * @author xio[darjino@hotmail.com]
-     * @version 1.01 30th July 2009.
-     *      Added by Mark Beardsley [msb at apache.org].
-     *          Additional constants.
-     *          widthUnits2Millimetres() and millimetres2Units() methods.
-     */
-    public static class ConvertImageUnits {
-
-        // Each cell conatins a fixed number of co-ordinate points; this number
-        // does not vary with row height or column width or with font. These two
-        // constants are defined below.
-        public static final int TOTAL_COLUMN_COORDINATE_POSITIONS = 1023; // MB
-        public static final int TOTAL_ROW_COORDINATE_POSITIONS = 255;     // MB
-        // The resoultion of an image can be expressed as a specific number
-        // of pixels per inch. Displays and printers differ but 96 pixels per
-        // inch is an acceptable standard to beging with.
-        public static final int PIXELS_PER_INCH = 96;                     // MB
-        // Cnstants that defines how many pixels and points there are in a
-        // millimetre. These values are required for the conversion algorithm.
-        public static final double PIXELS_PER_MILLIMETRES = 3.78;         // MB
-        public static final double POINTS_PER_MILLIMETRE = 2.83;          // MB
-        // The column width returned by HSSF and the width of a picture when
-        // positioned to exactly cover one cell are different by almost exactly
-        // 2mm - give or take rounding errors. This constant allows that
-        // additional amount to be accounted for when calculating how many
-        // celles the image ought to overlie.
-        public static final double CELL_BORDER_WIDTH_MILLIMETRES = 2.0D;  // MB
-        public static final short EXCEL_COLUMN_WIDTH_FACTOR = 256;
-        public static final int UNIT_OFFSET_LENGTH = 7;
-        public static final int[] UNIT_OFFSET_MAP = new int[]
-            { 0, 36, 73, 109, 146, 182, 219 };
-
-        /**
-        * pixel units to excel width units(units of 1/256th of a character width)
-        * @param pxs
-        * @return
-        */
-        public static short pixel2WidthUnits(int pxs) {
-            short widthUnits = (short) (EXCEL_COLUMN_WIDTH_FACTOR *
-                    (pxs / UNIT_OFFSET_LENGTH));
-            widthUnits += UNIT_OFFSET_MAP[(pxs % UNIT_OFFSET_LENGTH)];
-            return widthUnits;
-        }
-
-        /**
-         * excel width units(units of 1/256th of a character width) to pixel
-         * units.
-         *
-         * @param widthUnits
-         * @return
-         */
-        public static int widthUnits2Pixel(short widthUnits) {
-            int pixels = (widthUnits / EXCEL_COLUMN_WIDTH_FACTOR)
-                    * UNIT_OFFSET_LENGTH;
-            int offsetWidthUnits = widthUnits % EXCEL_COLUMN_WIDTH_FACTOR;
-            pixels += Math.round(offsetWidthUnits /
-                    ((float) EXCEL_COLUMN_WIDTH_FACTOR / UNIT_OFFSET_LENGTH));
-            return pixels;
-        }
-
-        /**
-         * Convert Excels width units into millimetres.
-         *
-         * @param widthUnits The width of the column or the height of the
-         *                   row in Excels units.
-         * @return A primitive double that contains the columns width or rows
-         *         height in millimetres.
-         */
-        public static double widthUnits2Millimetres(short widthUnits) {
-            return(ConvertImageUnits.widthUnits2Pixel(widthUnits) /
-                   ConvertImageUnits.PIXELS_PER_MILLIMETRES);
-        }
-
-        /**
-         * Convert into millimetres Excels width units..
-         *
-         * @param millimetres A primitive double that contains the columns
-         *                    width or rows height in millimetres.
-         * @return A primitive int that contains the columns width or rows
-         *         height in Excels units.
-         */
-        public static int millimetres2WidthUnits(double millimetres) {
-            return(ConvertImageUnits.pixel2WidthUnits((int)(millimetres *
-                    ConvertImageUnits.PIXELS_PER_MILLIMETRES)));
-        }
-        
-        public static int pointsToPixels(double points) {
-    		return (int) Math.round(points / 72D * PIXELS_PER_INCH);
-    	}
-        
-        public static double pointsToMillimeters(double points) {
-        	return points / 72D * 25.4;
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/AligningCells.java b/trunk/src/examples/src/org/apache/poi/ss/examples/AligningCells.java
deleted file mode 100644
index 8ee6440..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/AligningCells.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Shows how various alignment options work.
- */
-public class AligningCells {
-
-    public static void main(String[] args) throws IOException {
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(2);
-        row.setHeightInPoints(30);
-        for (int i = 0; i < 8; i++) {
-            //column width is set in units of 1/256th of a character width
-            sheet.setColumnWidth(i, 256 * 15);
-        }
-
-        createCell(wb, row, 0, HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM);
-        createCell(wb, row, 1, HorizontalAlignment.CENTER_SELECTION, VerticalAlignment.BOTTOM);
-        createCell(wb, row, 2, HorizontalAlignment.FILL, VerticalAlignment.CENTER);
-        createCell(wb, row, 3, HorizontalAlignment.GENERAL, VerticalAlignment.CENTER);
-        createCell(wb, row, 4, HorizontalAlignment.JUSTIFY, VerticalAlignment.JUSTIFY);
-        createCell(wb, row, 5, HorizontalAlignment.LEFT, VerticalAlignment.TOP);
-        createCell(wb, row, 6, HorizontalAlignment.RIGHT, VerticalAlignment.TOP);
-
-        // Write the output to a file
-        OutputStream fileOut = new FileOutputStream("ss-example-align.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-
-        wb.close();
-    }
-
-    /**
-     * Creates a cell and aligns it a certain way.
-     *
-     * @param wb     the workbook
-     * @param row    the row to create the cell in
-     * @param column the column number to create the cell in
-     * @param halign the horizontal alignment for the cell.
-     */
-    private static void createCell(Workbook wb, Row row, int column, HorizontalAlignment halign, VerticalAlignment valign) {
-        CreationHelper ch = wb.getCreationHelper();
-        Cell cell = row.createCell(column);
-        cell.setCellValue(ch.createRichTextString("Align It"));
-        CellStyle cellStyle = wb.createCellStyle();
-        cellStyle.setAlignment(halign);
-        cellStyle.setVerticalAlignment(valign);
-        cell.setCellStyle(cellStyle);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/BusinessPlan.java b/trunk/src/examples/src/org/apache/poi/ss/examples/BusinessPlan.java
deleted file mode 100644
index d263494..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/BusinessPlan.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Calendar;
-import java.io.FileOutputStream;
-import java.text.SimpleDateFormat;
-
-/**
- * A business plan demo
- * Usage:
- *  BusinessPlan -xls|xlsx
- *
- * @author Yegor Kozlov
- */
-public class BusinessPlan {
-
-    private static SimpleDateFormat fmt = new SimpleDateFormat("dd-MMM");
-
-    private static final String[] titles = {
-            "ID", "Project Name", "Owner", "Days", "Start", "End"};
-
-    //sample data to fill the sheet.
-    private static final String[][] data = {
-            {"1.0", "Marketing Research Tactical Plan", "J. Dow", "70", "9-Jul", null,
-                "x", "x", "x", "x", "x", "x", "x", "x", "x", "x", "x"},
-            null,
-            {"1.1", "Scope Definition Phase", "J. Dow", "10", "9-Jul", null,
-                "x", "x", null, null,  null, null, null, null, null, null, null},
-            {"1.1.1", "Define research objectives", "J. Dow", "3", "9-Jul", null,
-                    "x", null, null, null,  null, null, null, null, null, null, null},
-            {"1.1.2", "Define research requirements", "S. Jones", "7", "10-Jul", null,
-                "x", "x", null, null,  null, null, null, null, null, null, null},
-            {"1.1.3", "Determine in-house resource or hire vendor", "J. Dow", "2", "15-Jul", null,
-                "x", "x", null, null,  null, null, null, null, null, null, null},
-            null,
-            {"1.2", "Vendor Selection Phase", "J. Dow", "19", "19-Jul", null,
-                null, "x", "x", "x",  "x", null, null, null, null, null, null},
-            {"1.2.1", "Define vendor selection criteria", "J. Dow", "3", "19-Jul", null,
-                null, "x", null, null,  null, null, null, null, null, null, null},
-            {"1.2.2", "Develop vendor selection questionnaire", "S. Jones, T. Wates", "2", "22-Jul", null,
-                null, "x", "x", null,  null, null, null, null, null, null, null},
-            {"1.2.3", "Develop Statement of Work", "S. Jones", "4", "26-Jul", null,
-                null, null, "x", "x",  null, null, null, null, null, null, null},
-            {"1.2.4", "Evaluate proposal", "J. Dow, S. Jones", "4", "2-Aug", null,
-                null, null, null, "x",  "x", null, null, null, null, null, null},
-            {"1.2.5", "Select vendor", "J. Dow", "1", "6-Aug", null,
-                null, null, null, null,  "x", null, null, null, null, null, null},
-            null,
-            {"1.3", "Research Phase", "G. Lee", "47", "9-Aug", null,
-                null, null, null, null,  "x", "x", "x", "x", "x", "x", "x"},
-            {"1.3.1", "Develop market research information needs questionnaire", "G. Lee", "2", "9-Aug", null,
-                null, null, null, null,  "x", null, null, null, null, null, null},
-            {"1.3.2", "Interview marketing group for market research needs", "G. Lee", "2", "11-Aug", null,
-                null, null, null, null,  "x", "x", null, null, null, null, null},
-            {"1.3.3", "Document information needs", "G. Lee, S. Jones", "1", "13-Aug", null,
-                null, null, null, null,  null, "x", null, null, null, null, null},
-    };
-
-    public static void main(String[] args) throws Exception {
-        Workbook wb;
-
-        if(args.length > 0 && args[0].equals("-xls")) wb = new HSSFWorkbook();
-        else wb = new XSSFWorkbook();
-
-        Map<String, CellStyle> styles = createStyles(wb);
-
-        Sheet sheet = wb.createSheet("Business Plan");
-
-        //turn off gridlines
-        sheet.setDisplayGridlines(false);
-        sheet.setPrintGridlines(false);
-        sheet.setFitToPage(true);
-        sheet.setHorizontallyCenter(true);
-        PrintSetup printSetup = sheet.getPrintSetup();
-        printSetup.setLandscape(true);
-
-        //the following three statements are required only for HSSF
-        sheet.setAutobreaks(true);
-        printSetup.setFitHeight((short)1);
-        printSetup.setFitWidth((short)1);
-
-        //the header row: centered text in 48pt font
-        Row headerRow = sheet.createRow(0);
-        headerRow.setHeightInPoints(12.75f);
-        for (int i = 0; i < titles.length; i++) {
-            Cell cell = headerRow.createCell(i);
-            cell.setCellValue(titles[i]);
-            cell.setCellStyle(styles.get("header"));
-        }
-        //columns for 11 weeks starting from 9-Jul
-        Calendar calendar = Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-
-        calendar.setTime(fmt.parse("9-Jul"));
-        calendar.set(Calendar.YEAR, year);
-        for (int i = 0; i < 11; i++) {
-            Cell cell = headerRow.createCell(titles.length + i);
-            cell.setCellValue(calendar);
-            cell.setCellStyle(styles.get("header_date"));
-            calendar.roll(Calendar.WEEK_OF_YEAR, true);
-        }
-        //freeze the first row
-        sheet.createFreezePane(0, 1);
-
-        Row row;
-        Cell cell;
-        int rownum = 1;
-        for (int i = 0; i < data.length; i++, rownum++) {
-            row = sheet.createRow(rownum);
-            if(data[i] == null) continue;
-
-            for (int j = 0; j < data[i].length; j++) {
-                cell = row.createCell(j);
-                String styleName;
-                boolean isHeader = i == 0 || data[i-1] == null;
-                switch(j){
-                    case 0:
-                        if(isHeader) {
-                            styleName = "cell_b";
-                            cell.setCellValue(Double.parseDouble(data[i][j]));
-                        } else {
-                            styleName = "cell_normal";
-                            cell.setCellValue(data[i][j]);
-                        }
-                        break;
-                    case 1:
-                        if(isHeader) {
-                            styleName = i == 0 ? "cell_h" : "cell_bb";
-                        } else {
-                            styleName = "cell_indented";
-                        }
-                        cell.setCellValue(data[i][j]);
-                        break;
-                    case 2:
-                        styleName = isHeader ? "cell_b" : "cell_normal";
-                        cell.setCellValue(data[i][j]);
-                        break;
-                    case 3:
-                        styleName = isHeader ? "cell_b_centered" : "cell_normal_centered";
-                        cell.setCellValue(Integer.parseInt(data[i][j]));
-                        break;
-                    case 4: {
-                        calendar.setTime(fmt.parse(data[i][j]));
-                        calendar.set(Calendar.YEAR, year);
-                        cell.setCellValue(calendar);
-                        styleName = isHeader ? "cell_b_date" : "cell_normal_date";
-                        break;
-                    }
-                    case 5: {
-                        int r = rownum + 1;
-                        String fmla = "IF(AND(D"+r+",E"+r+"),E"+r+"+D"+r+",\"\")";
-                        cell.setCellFormula(fmla);
-                        styleName = isHeader ? "cell_bg" : "cell_g";
-                        break;
-                    }
-                    default:
-                        styleName = data[i][j] != null ? "cell_blue" : "cell_normal";
-                }
-
-                cell.setCellStyle(styles.get(styleName));
-            }
-        }
-
-        //group rows for each phase, row numbers are 0-based
-        sheet.groupRow(4, 6);
-        sheet.groupRow(9, 13);
-        sheet.groupRow(16, 18);
-
-        //set column widths, the width is measured in units of 1/256th of a character width
-        sheet.setColumnWidth(0, 256*6);
-        sheet.setColumnWidth(1, 256*33);
-        sheet.setColumnWidth(2, 256*20);
-        sheet.setZoom(75); //75% scale
-
-
-        // Write the output to a file
-        String file = "businessplan.xls";
-        if(wb instanceof XSSFWorkbook) file += "x";
-        FileOutputStream out = new FileOutputStream(file);
-        wb.write(out);
-        out.close();
-        
-        wb.close();
-    }
-
-    /**
-     * create a library of cell styles
-     */
-    private static Map<String, CellStyle> createStyles(Workbook wb){
-        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
-        DataFormat df = wb.createDataFormat();
-
-        CellStyle style;
-        Font headerFont = wb.createFont();
-        headerFont.setBold(true);
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.LIGHT_CORNFLOWER_BLUE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setFont(headerFont);
-        styles.put("header", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.LIGHT_CORNFLOWER_BLUE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setFont(headerFont);
-        style.setDataFormat(df.getFormat("d-mmm"));
-        styles.put("header_date", style);
-
-        Font font1 = wb.createFont();
-        font1.setBold(true);
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setFont(font1);
-        styles.put("cell_b", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setFont(font1);
-        styles.put("cell_b_centered", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(font1);
-        style.setDataFormat(df.getFormat("d-mmm"));
-        styles.put("cell_b_date", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(font1);
-        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setDataFormat(df.getFormat("d-mmm"));
-        styles.put("cell_g", style);
-
-        Font font2 = wb.createFont();
-        font2.setColor(IndexedColors.BLUE.getIndex());
-        font2.setBold(true);
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setFont(font2);
-        styles.put("cell_bb", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(font1);
-        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setDataFormat(df.getFormat("d-mmm"));
-        styles.put("cell_bg", style);
-
-        Font font3 = wb.createFont();
-        font3.setFontHeightInPoints((short)14);
-        font3.setColor(IndexedColors.DARK_BLUE.getIndex());
-        font3.setBold(true);
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setFont(font3);
-        style.setWrapText(true);
-        styles.put("cell_h", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setWrapText(true);
-        styles.put("cell_normal", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setWrapText(true);
-        styles.put("cell_normal_centered", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setWrapText(true);
-        style.setDataFormat(df.getFormat("d-mmm"));
-        styles.put("cell_normal_date", style);
-
-        style = createBorderedStyle(wb);
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setIndention((short)1);
-        style.setWrapText(true);
-        styles.put("cell_indented", style);
-
-        style = createBorderedStyle(wb);
-        style.setFillForegroundColor(IndexedColors.BLUE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        styles.put("cell_blue", style);
-
-        return styles;
-    }
-
-    private static CellStyle createBorderedStyle(Workbook wb){
-        BorderStyle thin = BorderStyle.THIN;
-        short black = IndexedColors.BLACK.getIndex();
-        
-        CellStyle style = wb.createCellStyle();
-        style.setBorderRight(thin);
-        style.setRightBorderColor(black);
-        style.setBorderBottom(thin);
-        style.setBottomBorderColor(black);
-        style.setBorderLeft(thin);
-        style.setLeftBorderColor(black);
-        style.setBorderTop(thin);
-        style.setTopBorderColor(black);
-        return style;
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/CalendarDemo.java b/trunk/src/examples/src/org/apache/poi/ss/examples/CalendarDemo.java
deleted file mode 100644
index 4438f22..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/CalendarDemo.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.io.FileOutputStream;
-import java.util.Calendar;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * A  monthly calendar created using Apache POI. Each month is on a separate sheet.
- * <pre>
- * Usage:
- * CalendarDemo -xls|xlsx <year>
- * </pre>
- *
- * @author Yegor Kozlov
- */
-public class CalendarDemo {
-
-    private static final String[] days = {
-            "Sunday", "Monday", "Tuesday",
-            "Wednesday", "Thursday", "Friday", "Saturday"};
-
-    private static final String[]  months = {
-            "January", "February", "March","April", "May", "June","July", "August",
-            "September","October", "November", "December"};
-
-    public static void main(String[] args) throws Exception {
-
-        Calendar calendar = Calendar.getInstance();
-        boolean xlsx = true;
-        for (int i = 0; i < args.length; i++) {
-            if(args[i].charAt(0) == '-'){
-                xlsx = args[i].equals("-xlsx");
-            } else {
-              calendar.set(Calendar.YEAR, Integer.parseInt(args[i]));
-            }
-        }
-        int year = calendar.get(Calendar.YEAR);
-
-        Workbook wb = xlsx ? new XSSFWorkbook() : new HSSFWorkbook();
-
-        Map<String, CellStyle> styles = createStyles(wb);
-
-        for (int month = 0; month < 12; month++) {
-            calendar.set(Calendar.MONTH, month);
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            //create a sheet for each month
-            Sheet sheet = wb.createSheet(months[month]);
-
-            //turn off gridlines
-            sheet.setDisplayGridlines(false);
-            sheet.setPrintGridlines(false);
-            sheet.setFitToPage(true);
-            sheet.setHorizontallyCenter(true);
-            PrintSetup printSetup = sheet.getPrintSetup();
-            printSetup.setLandscape(true);
-
-            //the following three statements are required only for HSSF
-            sheet.setAutobreaks(true);
-            printSetup.setFitHeight((short)1);
-            printSetup.setFitWidth((short)1);
-
-            //the header row: centered text in 48pt font
-            Row headerRow = sheet.createRow(0);
-            headerRow.setHeightInPoints(80);
-            Cell titleCell = headerRow.createCell(0);
-            titleCell.setCellValue(months[month] + " " + year);
-            titleCell.setCellStyle(styles.get("title"));
-            sheet.addMergedRegion(CellRangeAddress.valueOf("$A$1:$N$1"));
-
-            //header with month titles
-            Row monthRow = sheet.createRow(1);
-            for (int i = 0; i < days.length; i++) {
-                //set column widths, the width is measured in units of 1/256th of a character width
-                sheet.setColumnWidth(i*2, 5*256); //the column is 5 characters wide
-                sheet.setColumnWidth(i*2 + 1, 13*256); //the column is 13 characters wide
-                sheet.addMergedRegion(new CellRangeAddress(1, 1, i*2, i*2+1));
-                Cell monthCell = monthRow.createCell(i*2);
-                monthCell.setCellValue(days[i]);
-                monthCell.setCellStyle(styles.get("month"));
-            }
-
-            int cnt = 1, day=1;
-            int rownum = 2;
-            for (int j = 0; j < 6; j++) {
-                Row row = sheet.createRow(rownum++);
-                row.setHeightInPoints(100);
-                for (int i = 0; i < days.length; i++) {
-                    Cell dayCell_1 = row.createCell(i*2);
-                    Cell dayCell_2 = row.createCell(i*2 + 1);
-
-                    int day_of_week = calendar.get(Calendar.DAY_OF_WEEK);
-                    if(cnt >= day_of_week && calendar.get(Calendar.MONTH) == month) {
-                        dayCell_1.setCellValue(day);
-                        calendar.set(Calendar.DAY_OF_MONTH, ++day);
-
-                        if(i == 0 || i == days.length-1) {
-                            dayCell_1.setCellStyle(styles.get("weekend_left"));
-                            dayCell_2.setCellStyle(styles.get("weekend_right"));
-                        } else {
-                            dayCell_1.setCellStyle(styles.get("workday_left"));
-                            dayCell_2.setCellStyle(styles.get("workday_right"));
-                        }
-                    } else {
-                        dayCell_1.setCellStyle(styles.get("grey_left"));
-                        dayCell_2.setCellStyle(styles.get("grey_right"));
-                    }
-                    cnt++;
-                }
-                if(calendar.get(Calendar.MONTH) > month) break;
-            }
-        }
-
-        // Write the output to a file
-        String file = "calendar.xls";
-        if(wb instanceof XSSFWorkbook) file += "x";
-        FileOutputStream out = new FileOutputStream(file);
-        wb.write(out);
-        out.close();
-        
-        wb.close();
-    }
-
-    /**
-     * cell styles used for formatting calendar sheets
-     */
-    private static Map<String, CellStyle> createStyles(Workbook wb){
-        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
-
-        short borderColor = IndexedColors.GREY_50_PERCENT.getIndex();
-
-        CellStyle style;
-        Font titleFont = wb.createFont();
-        titleFont.setFontHeightInPoints((short)48);
-        titleFont.setColor(IndexedColors.DARK_BLUE.getIndex());
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFont(titleFont);
-        styles.put("title", style);
-
-        Font monthFont = wb.createFont();
-        monthFont.setFontHeightInPoints((short)12);
-        monthFont.setColor(IndexedColors.WHITE.getIndex());
-        monthFont.setBold(true);
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.DARK_BLUE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setFont(monthFont);
-        styles.put("month", style);
-
-        Font dayFont = wb.createFont();
-        dayFont.setFontHeightInPoints((short)14);
-        dayFont.setBold(true);
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setFillForegroundColor(IndexedColors.LIGHT_CORNFLOWER_BLUE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setLeftBorderColor(borderColor);
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(borderColor);
-        style.setFont(dayFont);
-        styles.put("weekend_left", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setFillForegroundColor(IndexedColors.LIGHT_CORNFLOWER_BLUE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(borderColor);
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(borderColor);
-        styles.put("weekend_right", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setFillForegroundColor(IndexedColors.WHITE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setLeftBorderColor(borderColor);
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(borderColor);
-        style.setFont(dayFont);
-        styles.put("workday_left", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setFillForegroundColor(IndexedColors.WHITE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(borderColor);
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(borderColor);
-        styles.put("workday_right", style);
-
-        style = wb.createCellStyle();
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(borderColor);
-        styles.put("grey_left", style);
-
-        style = wb.createCellStyle();
-        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(borderColor);
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(borderColor);
-        styles.put("grey_right", style);
-
-        return styles;
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/CellStyleDetails.java b/trunk/src/examples/src/org/apache/poi/ss/examples/CellStyleDetails.java
deleted file mode 100644
index 7bf8c55..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/CellStyleDetails.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples;
-
-import java.io.File;
-
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-
-/**
- * Demonstrates how to read excel styles for cells
- */
-public class CellStyleDetails {
-    public static void main(String[] args) throws Exception {
-        if(args.length == 0) {
-           throw new IllegalArgumentException("Filename must be given");
-        }
-        
-        Workbook wb = WorkbookFactory.create(new File(args[0]));
-        DataFormatter formatter = new DataFormatter();
-       
-        for(int sn=0; sn<wb.getNumberOfSheets(); sn++) {
-           Sheet sheet = wb.getSheetAt(sn);
-           System.out.println("Sheet #" + sn + " : " + sheet.getSheetName());
-           
-           for(Row row : sheet) {
-              System.out.println("  Row " + row.getRowNum());
-              
-              for(Cell cell : row) {
-                 CellReference ref = new CellReference(cell);
-                 System.out.print("    " + ref.formatAsString());
-                 System.out.print(" (" + cell.getColumnIndex() + ") ");
-                 
-                 CellStyle style = cell.getCellStyle();
-                 System.out.print("Format=" + style.getDataFormatString() + " ");
-                 System.out.print("FG=" + renderColor(style.getFillForegroundColorColor()) + " ");
-                 System.out.print("BG=" + renderColor(style.getFillBackgroundColorColor()) + " ");
-                 
-                 Font font = wb.getFontAt( style.getFontIndex() );
-                 System.out.print("Font=" + font.getFontName() + " ");
-                 System.out.print("FontColor=");
-                 if(font instanceof HSSFFont) {
-                    System.out.print( renderColor( ((HSSFFont)font).getHSSFColor((HSSFWorkbook)wb)) );
-                 }
-                 if(font instanceof XSSFFont) {
-                    System.out.print( renderColor( ((XSSFFont)font).getXSSFColor()) );
-                 }
-                 
-                 System.out.println();
-                 System.out.println("        " + formatter.formatCellValue(cell));
-              }
-           }
-           
-           System.out.println();
-        }
-        
-        wb.close();
-    }
-    
-    private static String renderColor(Color color) {
-       if(color instanceof HSSFColor) {
-          return ((HSSFColor)color).getHexString();
-       } else if(color instanceof XSSFColor) {
-          return ((XSSFColor)color).getARGBHex();
-       } else {
-          return "(none)";
-       }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/ConditionalFormats.java b/trunk/src/examples/src/org/apache/poi/ss/examples/ConditionalFormats.java
deleted file mode 100644
index 7358edf..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/ConditionalFormats.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.examples;
-
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Excel Conditional Formatting -- Examples
- *
- * <p>
- *   Partly based on the code snippets from 
- *   http://www.contextures.com/xlcondformat03.html
- * </p>
- */
-public class ConditionalFormats {
-
-    public static void main(String[] args) throws IOException {
-        Workbook wb;
-
-        if(args.length > 0 && args[0].equals("-xls")) wb = new HSSFWorkbook();
-        else wb = new XSSFWorkbook();
-
-        sameCell(wb.createSheet("Same Cell"));
-        multiCell(wb.createSheet("MultiCell"));
-        overlapping(wb.createSheet("Overlapping"));
-        errors(wb.createSheet("Errors"));
-        hideDupplicates(wb.createSheet("Hide Dups"));
-        formatDuplicates(wb.createSheet("Duplicates"));
-        inList(wb.createSheet("In List"));
-        expiry(wb.createSheet("Expiry"));
-        shadeAlt(wb.createSheet("Shade Alt"));
-        shadeBands(wb.createSheet("Shade Bands"));
-        iconSets(wb.createSheet("Icon Sets"));
-        colourScales(wb.createSheet("Colour Scales"));
-        dataBars(wb.createSheet("Data Bars"));
-
-        // Write the output to a file
-        String file = "cf-poi.xls";
-        if(wb instanceof XSSFWorkbook) file += "x";
-        FileOutputStream out = new FileOutputStream(file);
-        wb.write(out);
-        out.close();
-        System.out.println("Generated: " + file);
-    }
-
-    /**
-     * Highlight cells based on their values
-     */
-    static void sameCell(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue(84);
-        sheet.createRow(1).createCell(0).setCellValue(74);
-        sheet.createRow(2).createCell(0).setCellValue(50);
-        sheet.createRow(3).createCell(0).setCellValue(51);
-        sheet.createRow(4).createCell(0).setCellValue(49);
-        sheet.createRow(5).createCell(0).setCellValue(41);
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Cell Value Is   greater than  70   (Blue Fill)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(ComparisonOperator.GT, "70");
-        PatternFormatting fill1 = rule1.createPatternFormatting();
-        fill1.setFillBackgroundColor(IndexedColors.BLUE.index);
-        fill1.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-
-        // Condition 2: Cell Value Is  less than      50   (Green Fill)
-        ConditionalFormattingRule rule2 = sheetCF.createConditionalFormattingRule(ComparisonOperator.LT, "50");
-        PatternFormatting fill2 = rule2.createPatternFormatting();
-        fill2.setFillBackgroundColor(IndexedColors.GREEN.index);
-        fill2.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A1:A6")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1, rule2);
-
-        sheet.getRow(0).createCell(2).setCellValue("<== Condition 1: Cell Value Is greater than 70 (Blue Fill)");
-        sheet.getRow(4).createCell(2).setCellValue("<== Condition 2: Cell Value Is less than 50 (Green Fill)");
-    }
-
-    /**
-     * Highlight multiple cells based on a formula
-     */
-    static void multiCell(Sheet sheet) {
-        // header row
-        Row row0 = sheet.createRow(0);
-        row0.createCell(0).setCellValue("Units");
-        row0.createCell(1).setCellValue("Cost");
-        row0.createCell(2).setCellValue("Total");
-
-        Row row1 = sheet.createRow(1);
-        row1.createCell(0).setCellValue(71);
-        row1.createCell(1).setCellValue(29);
-        row1.createCell(2).setCellValue(2059);
-
-        Row row2 = sheet.createRow(2);
-        row2.createCell(0).setCellValue(85);
-        row2.createCell(1).setCellValue(29);
-        row2.createCell(2).setCellValue(2059);
-
-        Row row3 = sheet.createRow(3);
-        row3.createCell(0).setCellValue(71);
-        row3.createCell(1).setCellValue(29);
-        row3.createCell(2).setCellValue(2059);
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Formula Is   =$B2>75   (Blue Fill)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("$A2>75");
-        PatternFormatting fill1 = rule1.createPatternFormatting();
-        fill1.setFillBackgroundColor(IndexedColors.BLUE.index);
-        fill1.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A2:C4")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.getRow(2).createCell(4).setCellValue("<== Condition 1: Formula Is =$B2>75   (Blue Fill)");
-    }
-    
-    /**
-     * Multiple conditional formatting rules can apply to
-     *  one cell, some combining, some beating others.
-     * Done in order of the rules added to the 
-     *  SheetConditionalFormatting object
-     */
-    static void overlapping(Sheet sheet) {
-        for (int i=0; i<40; i++) {
-            int rn = i+1;
-            Row r = sheet.createRow(i);
-            r.createCell(0).setCellValue("This is row " + rn + " (" + i + ")");
-            String str = "";
-            if (rn%2 == 0) str = str + "even ";
-            if (rn%3 == 0) str = str + "x3 ";
-            if (rn%5 == 0) str = str + "x5 ";
-            if (rn%10 == 0) str = str + "x10 ";
-            if (str.length() == 0) str = "nothing special...";
-            r.createCell(1).setCellValue("It is " + str);
-        }
-        sheet.autoSizeColumn(0);
-        sheet.autoSizeColumn(1);
-        
-        sheet.getRow(1).createCell(3).setCellValue("Even rows are blue");
-        sheet.getRow(2).createCell(3).setCellValue("Multiples of 3 have a grey background");
-        sheet.getRow(4).createCell(3).setCellValue("Multiples of 5 are bold");
-        sheet.getRow(9).createCell(3).setCellValue("Multiples of 10 are red (beats even)");
-        
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-        
-        // Condition 1: Row divides by 10, red (will beat #1)
-        ConditionalFormattingRule rule1 = 
-                sheetCF.createConditionalFormattingRule("MOD(ROW(),10)=0");
-        FontFormatting font1 = rule1.createFontFormatting();
-        font1.setFontColorIndex(IndexedColors.RED.index);
-        
-        // Condition 2: Row is even, blue
-        ConditionalFormattingRule rule2 = 
-                sheetCF.createConditionalFormattingRule("MOD(ROW(),2)=0");
-        FontFormatting font2 = rule2.createFontFormatting();
-        font2.setFontColorIndex(IndexedColors.BLUE.index);
-        
-        // Condition 3: Row divides by 5, bold
-        ConditionalFormattingRule rule3 = 
-                sheetCF.createConditionalFormattingRule("MOD(ROW(),5)=0");
-        FontFormatting font3 = rule3.createFontFormatting();
-        font3.setFontStyle(false, true);
-        
-        // Condition 4: Row divides by 3, grey background
-        ConditionalFormattingRule rule4 = 
-                sheetCF.createConditionalFormattingRule("MOD(ROW(),3)=0");
-        PatternFormatting fill4 = rule4.createPatternFormatting();
-        fill4.setFillBackgroundColor(IndexedColors.GREY_25_PERCENT.index);
-        fill4.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-        
-        // Apply
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A1:F41")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-        sheetCF.addConditionalFormatting(regions, rule2);
-        sheetCF.addConditionalFormatting(regions, rule3);
-        sheetCF.addConditionalFormatting(regions, rule4);
-    }
-
-    /**
-     *  Use Excel conditional formatting to check for errors,
-     *  and change the font colour to match the cell colour.
-     *  In this example, if formula result is  #DIV/0! then it will have white font colour.
-     */
-    static void errors(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue(84);
-        sheet.createRow(1).createCell(0).setCellValue(0);
-        sheet.createRow(2).createCell(0).setCellFormula("ROUND(A1/A2,0)");
-        sheet.createRow(3).createCell(0).setCellValue(0);
-        sheet.createRow(4).createCell(0).setCellFormula("ROUND(A6/A4,0)");
-        sheet.createRow(5).createCell(0).setCellValue(41);
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Formula Is   =ISERROR(C2)   (White Font)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("ISERROR(A1)");
-        FontFormatting font = rule1.createFontFormatting();
-        font.setFontColorIndex(IndexedColors.WHITE.index);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A1:A6")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.getRow(2).createCell(1).setCellValue("<== The error in this cell is hidden. Condition: Formula Is   =ISERROR(C2)   (White Font)");
-        sheet.getRow(4).createCell(1).setCellValue("<== The error in this cell is hidden. Condition: Formula Is   =ISERROR(C2)   (White Font)");
-    }
-
-    /**
-     * Use Excel conditional formatting to hide the duplicate values,
-     * and make the list easier to read. In this example, when the table is sorted by Region,
-     * the second (and subsequent) occurences of each region name will have white font colour.
-     */
-    static void hideDupplicates(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue("City");
-        sheet.createRow(1).createCell(0).setCellValue("Boston");
-        sheet.createRow(2).createCell(0).setCellValue("Boston");
-        sheet.createRow(3).createCell(0).setCellValue("Chicago");
-        sheet.createRow(4).createCell(0).setCellValue("Chicago");
-        sheet.createRow(5).createCell(0).setCellValue("New York");
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Formula Is   =A2=A1   (White Font)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("A2=A1");
-        FontFormatting font = rule1.createFontFormatting();
-        font.setFontColorIndex(IndexedColors.WHITE.index);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A2:A6")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.getRow(1).createCell(1).setCellValue("<== the second (and subsequent) " +
-                "occurences of each region name will have white font colour.  " +
-                "Condition: Formula Is   =A2=A1   (White Font)");
-    }
-
-    /**
-     * Use Excel conditional formatting to highlight duplicate entries in a column.
-     */
-    static void formatDuplicates(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue("Code");
-        sheet.createRow(1).createCell(0).setCellValue(4);
-        sheet.createRow(2).createCell(0).setCellValue(3);
-        sheet.createRow(3).createCell(0).setCellValue(6);
-        sheet.createRow(4).createCell(0).setCellValue(3);
-        sheet.createRow(5).createCell(0).setCellValue(5);
-        sheet.createRow(6).createCell(0).setCellValue(8);
-        sheet.createRow(7).createCell(0).setCellValue(0);
-        sheet.createRow(8).createCell(0).setCellValue(2);
-        sheet.createRow(9).createCell(0).setCellValue(8);
-        sheet.createRow(10).createCell(0).setCellValue(6);
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Formula Is   =A2=A1   (White Font)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("COUNTIF($A$2:$A$11,A2)>1");
-        FontFormatting font = rule1.createFontFormatting();
-        font.setFontStyle(false, true);
-        font.setFontColorIndex(IndexedColors.BLUE.index);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A2:A11")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.getRow(2).createCell(1).setCellValue("<== Duplicates numbers in the column are highlighted.  " +
-                "Condition: Formula Is =COUNTIF($A$2:$A$11,A2)>1   (Blue Font)");
-    }
-
-    /**
-     * Use Excel conditional formatting to highlight items that are in a list on the worksheet.
-     */
-    static void inList(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue("Codes");
-        sheet.createRow(1).createCell(0).setCellValue("AA");
-        sheet.createRow(2).createCell(0).setCellValue("BB");
-        sheet.createRow(3).createCell(0).setCellValue("GG");
-        sheet.createRow(4).createCell(0).setCellValue("AA");
-        sheet.createRow(5).createCell(0).setCellValue("FF");
-        sheet.createRow(6).createCell(0).setCellValue("XX");
-        sheet.createRow(7).createCell(0).setCellValue("CC");
-
-        sheet.getRow(0).createCell(2).setCellValue("Valid");
-        sheet.getRow(1).createCell(2).setCellValue("AA");
-        sheet.getRow(2).createCell(2).setCellValue("BB");
-        sheet.getRow(3).createCell(2).setCellValue("CC");
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Formula Is   =A2=A1   (White Font)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("COUNTIF($C$2:$C$4,A2)");
-        PatternFormatting fill1 = rule1.createPatternFormatting();
-        fill1.setFillBackgroundColor(IndexedColors.LIGHT_BLUE.index);
-        fill1.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A2:A8")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.getRow(2).createCell(3).setCellValue("<== Use Excel conditional formatting to highlight items that are in a list on the worksheet");
-    }
-
-    /**
-     *  Use Excel conditional formatting to highlight payments that are due in the next thirty days.
-     *  In this example, Due dates are entered in cells A2:A4.
-     */
-    static void expiry(Sheet sheet) {
-        CellStyle style = sheet.getWorkbook().createCellStyle();
-        style.setDataFormat((short)BuiltinFormats.getBuiltinFormat("d-mmm"));
-
-        sheet.createRow(0).createCell(0).setCellValue("Date");
-        sheet.createRow(1).createCell(0).setCellFormula("TODAY()+29");
-        sheet.createRow(2).createCell(0).setCellFormula("A2+1");
-        sheet.createRow(3).createCell(0).setCellFormula("A3+1");
-
-        for(int rownum = 1; rownum <= 3; rownum++) sheet.getRow(rownum).getCell(0).setCellStyle(style);
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Formula Is   =A2=A1   (White Font)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("AND(A2-TODAY()>=0,A2-TODAY()<=30)");
-        FontFormatting font = rule1.createFontFormatting();
-        font.setFontStyle(false, true);
-        font.setFontColorIndex(IndexedColors.BLUE.index);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A2:A4")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.getRow(0).createCell(1).setCellValue("Dates within the next 30 days are highlighted");
-    }
-
-    /**
-     * Use Excel conditional formatting to shade alternating rows on the worksheet
-     */
-    static void shadeAlt(Sheet sheet) {
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        // Condition 1: Formula Is   =A2=A1   (White Font)
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("MOD(ROW(),2)");
-        PatternFormatting fill1 = rule1.createPatternFormatting();
-        fill1.setFillBackgroundColor(IndexedColors.LIGHT_GREEN.index);
-        fill1.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A1:Z100")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.createRow(0).createCell(1).setCellValue("Shade Alternating Rows");
-        sheet.createRow(1).createCell(1).setCellValue("Condition: Formula Is  =MOD(ROW(),2)   (Light Green Fill)");
-    }
-
-    /**
-     * You can use Excel conditional formatting to shade bands of rows on the worksheet. 
-     * In this example, 3 rows are shaded light grey, and 3 are left with no shading.
-     * In the MOD function, the total number of rows in the set of banded rows (6) is entered.
-     */
-    static void shadeBands(Sheet sheet) {
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("MOD(ROW(),6)<3");
-        PatternFormatting fill1 = rule1.createPatternFormatting();
-        fill1.setFillBackgroundColor(IndexedColors.GREY_25_PERCENT.index);
-        fill1.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-
-        CellRangeAddress[] regions = {
-                CellRangeAddress.valueOf("A1:Z100")
-        };
-
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        sheet.createRow(0).createCell(1).setCellValue("Shade Bands of Rows");
-        sheet.createRow(1).createCell(1).setCellValue("Condition: Formula Is  =MOD(ROW(),6)<2   (Light Grey Fill)");
-    }
-    
-    /**
-     * Icon Sets / Multi-States allow you to have icons shown which vary
-     *  based on the values, eg Red traffic light / Yellow traffic light /
-     *  Green traffic light
-     */
-    static void iconSets(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue("Icon Sets");
-        Row r = sheet.createRow(1);
-        r.createCell(0).setCellValue("Reds");
-        r.createCell(1).setCellValue(0);
-        r.createCell(2).setCellValue(0);
-        r.createCell(3).setCellValue(0);
-        r = sheet.createRow(2);
-        r.createCell(0).setCellValue("Yellows");
-        r.createCell(1).setCellValue(5);
-        r.createCell(2).setCellValue(5);
-        r.createCell(3).setCellValue(5);
-        r = sheet.createRow(3);
-        r.createCell(0).setCellValue("Greens");
-        r.createCell(1).setCellValue(10);
-        r.createCell(2).setCellValue(10);
-        r.createCell(3).setCellValue(10);
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-        
-        CellRangeAddress[] regions = { CellRangeAddress.valueOf("B1:B4") };
-        ConditionalFormattingRule rule1 =
-                sheetCF.createConditionalFormattingRule(IconSet.GYR_3_TRAFFIC_LIGHTS);
-        IconMultiStateFormatting im1 = rule1.getMultiStateFormatting();
-        im1.getThresholds()[0].setRangeType(RangeType.MIN);
-        im1.getThresholds()[1].setRangeType(RangeType.PERCENT);
-        im1.getThresholds()[1].setValue(33d);
-        im1.getThresholds()[2].setRangeType(RangeType.MAX);
-        sheetCF.addConditionalFormatting(regions, rule1);
-        
-        regions = new CellRangeAddress[] { CellRangeAddress.valueOf("C1:C4") };
-        ConditionalFormattingRule rule2 =
-                sheetCF.createConditionalFormattingRule(IconSet.GYR_3_FLAGS);
-        IconMultiStateFormatting im2 = rule1.getMultiStateFormatting();
-        im2.getThresholds()[0].setRangeType(RangeType.PERCENT);
-        im2.getThresholds()[0].setValue(0d);
-        im2.getThresholds()[1].setRangeType(RangeType.PERCENT);
-        im2.getThresholds()[1].setValue(33d);
-        im2.getThresholds()[2].setRangeType(RangeType.PERCENT);
-        im2.getThresholds()[2].setValue(67d);
-        sheetCF.addConditionalFormatting(regions, rule2);
-        
-        regions = new CellRangeAddress[] { CellRangeAddress.valueOf("D1:D4") };
-        ConditionalFormattingRule rule3 =
-                sheetCF.createConditionalFormattingRule(IconSet.GYR_3_SYMBOLS_CIRCLE);
-        IconMultiStateFormatting im3 = rule1.getMultiStateFormatting();
-        im3.setIconOnly(true);
-        im3.getThresholds()[0].setRangeType(RangeType.MIN);
-        im3.getThresholds()[1].setRangeType(RangeType.NUMBER);
-        im3.getThresholds()[1].setValue(3d);
-        im3.getThresholds()[2].setRangeType(RangeType.NUMBER);
-        im3.getThresholds()[2].setValue(7d);
-        sheetCF.addConditionalFormatting(regions, rule3);
-    }
-    
-    /**
-     * Color Scales / Colour Scales / Colour Gradients allow you shade the
-     *  background colour of the cell based on the values, eg from Red to
-     *  Yellow to Green.
-     */
-    static void colourScales(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue("Colour Scales");
-        Row r = sheet.createRow(1);
-        r.createCell(0).setCellValue("Red-Yellow-Green");
-        for (int i=1; i<=7; i++) {
-            r.createCell(i).setCellValue((i-1)*5);
-        }
-        r = sheet.createRow(2);
-        r.createCell(0).setCellValue("Red-White-Blue");
-        for (int i=1; i<=9; i++) {
-            r.createCell(i).setCellValue((i-1)*5);
-        }
-        r = sheet.createRow(3);
-        r.createCell(0).setCellValue("Blue-Green");
-        for (int i=1; i<=16; i++) {
-            r.createCell(i).setCellValue((i-1));
-        }
-        sheet.setColumnWidth(0, 5000);
-        
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-        
-        CellRangeAddress[] regions = { CellRangeAddress.valueOf("B2:H2") };
-        ConditionalFormattingRule rule1 =
-                sheetCF.createConditionalFormattingColorScaleRule();
-        ColorScaleFormatting cs1 = rule1.getColorScaleFormatting();
-        cs1.getThresholds()[0].setRangeType(RangeType.MIN);
-        cs1.getThresholds()[1].setRangeType(RangeType.PERCENTILE);
-        cs1.getThresholds()[1].setValue(50d);
-        cs1.getThresholds()[2].setRangeType(RangeType.MAX);
-        ((ExtendedColor)cs1.getColors()[0]).setARGBHex("FFF8696B");
-        ((ExtendedColor)cs1.getColors()[1]).setARGBHex("FFFFEB84");
-        ((ExtendedColor)cs1.getColors()[2]).setARGBHex("FF63BE7B");
-        sheetCF.addConditionalFormatting(regions, rule1);
-        
-        regions = new CellRangeAddress[] { CellRangeAddress.valueOf("B3:J3") };
-        ConditionalFormattingRule rule2 =
-                sheetCF.createConditionalFormattingColorScaleRule();
-        ColorScaleFormatting cs2 = rule2.getColorScaleFormatting();
-        cs2.getThresholds()[0].setRangeType(RangeType.MIN);
-        cs2.getThresholds()[1].setRangeType(RangeType.PERCENTILE);
-        cs2.getThresholds()[1].setValue(50d);
-        cs2.getThresholds()[2].setRangeType(RangeType.MAX);
-        ((ExtendedColor)cs2.getColors()[0]).setARGBHex("FFF8696B");
-        ((ExtendedColor)cs2.getColors()[1]).setARGBHex("FFFCFCFF");
-        ((ExtendedColor)cs2.getColors()[2]).setARGBHex("FF5A8AC6");
-        sheetCF.addConditionalFormatting(regions, rule2);
-        
-        regions = new CellRangeAddress[] { CellRangeAddress.valueOf("B4:Q4") };
-        ConditionalFormattingRule rule3=
-                sheetCF.createConditionalFormattingColorScaleRule();
-        ColorScaleFormatting cs3 = rule3.getColorScaleFormatting();
-        cs3.setNumControlPoints(2);
-        cs3.getThresholds()[0].setRangeType(RangeType.MIN);
-        cs3.getThresholds()[1].setRangeType(RangeType.MAX);
-        ((ExtendedColor)cs3.getColors()[0]).setARGBHex("FF5A8AC6");
-        ((ExtendedColor)cs3.getColors()[1]).setARGBHex("FF63BE7B");
-        sheetCF.addConditionalFormatting(regions, rule3);
-    }
-    
-    /**
-     * DataBars / Data-Bars allow you to have bars shown vary
-     *  based on the values, from full to empty
-     */
-    static void dataBars(Sheet sheet) {
-        sheet.createRow(0).createCell(0).setCellValue("Data Bars");
-        Row r = sheet.createRow(1);
-        r.createCell(1).setCellValue("Green Positive");
-        r.createCell(2).setCellValue("Blue Mix");
-        r.createCell(3).setCellValue("Red Negative");
-        r = sheet.createRow(2);
-        r.createCell(1).setCellValue(0);
-        r.createCell(2).setCellValue(0);
-        r.createCell(3).setCellValue(0);
-        r = sheet.createRow(3);
-        r.createCell(1).setCellValue(5);
-        r.createCell(2).setCellValue(-5);
-        r.createCell(3).setCellValue(-5);
-        r = sheet.createRow(4);
-        r.createCell(1).setCellValue(10);
-        r.createCell(2).setCellValue(10);
-        r.createCell(3).setCellValue(-10);
-        r = sheet.createRow(5);
-        r.createCell(1).setCellValue(5);
-        r.createCell(2).setCellValue(5);
-        r.createCell(3).setCellValue(-5);
-        r = sheet.createRow(6);
-        r.createCell(1).setCellValue(20);
-        r.createCell(2).setCellValue(-10);
-        r.createCell(3).setCellValue(-20);
-        sheet.setColumnWidth(0, 3000);
-        sheet.setColumnWidth(1, 5000);
-        sheet.setColumnWidth(2, 5000);
-        sheet.setColumnWidth(3, 5000);
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-        
-        ExtendedColor color = sheet.getWorkbook().getCreationHelper().createExtendedColor();
-        color.setARGBHex("FF63BE7B");
-        CellRangeAddress[] regions = { CellRangeAddress.valueOf("B2:B7") };
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(color);
-        DataBarFormatting db1 = rule1.getDataBarFormatting();
-        db1.getMinThreshold().setRangeType(RangeType.MIN);
-        db1.getMaxThreshold().setRangeType(RangeType.MAX);
-        sheetCF.addConditionalFormatting(regions, rule1);
-        
-        color = sheet.getWorkbook().getCreationHelper().createExtendedColor();
-        color.setARGBHex("FF5A8AC6");
-        regions = new CellRangeAddress[] { CellRangeAddress.valueOf("C2:C7") };
-        ConditionalFormattingRule rule2 = sheetCF.createConditionalFormattingRule(color);
-        DataBarFormatting db2 = rule2.getDataBarFormatting();
-        db2.getMinThreshold().setRangeType(RangeType.MIN);
-        db2.getMaxThreshold().setRangeType(RangeType.MAX);
-        sheetCF.addConditionalFormatting(regions, rule2);
-        
-        color = sheet.getWorkbook().getCreationHelper().createExtendedColor();
-        color.setARGBHex("FFF8696B");
-        regions = new CellRangeAddress[] { CellRangeAddress.valueOf("D2:D7") };
-        ConditionalFormattingRule rule3 = sheetCF.createConditionalFormattingRule(color);
-        DataBarFormatting db3 = rule3.getDataBarFormatting();
-        db3.getMinThreshold().setRangeType(RangeType.MIN);
-        db3.getMaxThreshold().setRangeType(RangeType.MAX);
-        sheetCF.addConditionalFormatting(regions, rule3);
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/DrawingBorders.java b/trunk/src/examples/src/org/apache/poi/ss/examples/DrawingBorders.java
deleted file mode 100644
index 105e73d..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/DrawingBorders.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.BorderExtent;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.PropertyTemplate;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Excel Border Drawing - examples
- * 
- * <p>
- * Partly based on the code snippets from
- * org.apache.poi.ss.examples.ConditionalFormats
- * </p>
- */
-public class DrawingBorders {
-
-    public static void main(String[] args) throws IOException {
-        Workbook wb;
-
-        if (args.length > 0 && args[0].equals("-xls")) {
-            wb = new HSSFWorkbook();
-        } else {
-            wb = new XSSFWorkbook();
-        }
-
-        // add a sheet, and put some values into it
-        Sheet sh1 = wb.createSheet("Sheet1");
-        Row r = sh1.createRow(0);
-        Cell c = r.createCell(1);
-        c.setCellValue("All Borders Medium Width");
-        r = sh1.createRow(4);
-        c = r.createCell(1);
-        c.setCellValue("Medium Outside / Thin Inside Borders");
-        r = sh1.createRow(8);
-        c = r.createCell(1);
-        c.setCellValue("Colored Borders");
-
-        // draw borders (three 3x3 grids)
-        PropertyTemplate pt = new PropertyTemplate();
-        // #1) these borders will all be medium in default color
-        pt.drawBorders(new CellRangeAddress(1, 3, 1, 3),
-                BorderStyle.MEDIUM, BorderExtent.ALL);
-        // #2) these cells will have medium outside borders and thin inside borders
-        pt.drawBorders(new CellRangeAddress(5, 7, 1, 3),
-                BorderStyle.MEDIUM, BorderExtent.OUTSIDE);
-        pt.drawBorders(new CellRangeAddress(5, 7, 1, 3), BorderStyle.THIN,
-                BorderExtent.INSIDE);
-        // #3) these cells will all be medium weight with different colors for the
-        //     outside, inside horizontal, and inside vertical borders. The center
-        //     cell will have no borders.
-        pt.drawBorders(new CellRangeAddress(9, 11, 1, 3),
-                BorderStyle.MEDIUM, IndexedColors.RED.getIndex(),
-                BorderExtent.OUTSIDE);
-        pt.drawBorders(new CellRangeAddress(9, 11, 1, 3),
-                BorderStyle.MEDIUM, IndexedColors.BLUE.getIndex(),
-                BorderExtent.INSIDE_VERTICAL);
-        pt.drawBorders(new CellRangeAddress(9, 11, 1, 3),
-                BorderStyle.MEDIUM, IndexedColors.GREEN.getIndex(),
-                BorderExtent.INSIDE_HORIZONTAL);
-        pt.drawBorders(new CellRangeAddress(10, 10, 2, 2),
-                BorderStyle.NONE, 
-                BorderExtent.ALL);
-
-        // apply borders to sheet
-        pt.applyBorders(sh1);
-        
-        // add another sheet and apply the borders to it
-        Sheet sh2 = wb.createSheet("Sheet2");
-        pt.applyBorders(sh2);
-
-        // Write the output to a file
-        String file = "db-poi.xls";
-        if (wb instanceof XSSFWorkbook)
-            file += "x";
-        FileOutputStream out = new FileOutputStream(file);
-        wb.write(out);
-        out.close();
-        wb.close();
-        System.out.println("Generated: " + file);
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java b/trunk/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java
deleted file mode 100644
index 5ed404e..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java
+++ /dev/null
@@ -1,614 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-
-/**
- * Utility to compare Excel File Contents cell by cell for all sheets.
- *
- * <p>This utility will be used to compare Excel File Contents cell by cell for all sheets programmatically.</p>
- *
- * <p>Below are the list of Attribute comparison supported in this version.</p>
- *
- * <ul>
- * <li>Cell Alignment</li>
- * <li>Cell Border Attributes</li>
- * <li>Cell Data</li>
- * <li>Cell Data-Type</li>
- * <li>Cell Fill Color</li>
- * <li>Cell Fill pattern</li>
- * <li>Cell Font Attributes</li>
- * <li>Cell Font Family</li>
- * <li>Cell Font Size</li>
- * <li>Cell Protection</li>
- * <li>Name of the sheets</li>
- * <li>Number of Columns</li>
- * <li>Number of Rows</li>
- * <li>Number of Sheet</li>
- * </ul>
- *
- * <p>(Some of the above attribute comparison only work for *.xlsx format currently. In future it can be enhanced.)</p>
- *
- * <p><b>Usage:</b></p>
- *
- * <pre>
- * {@code
- *  Workbook wb1 = WorkbookFactory.create(new File("workBook1.xls"));
- *  Workbook wb2 = WorkbookFactory.create(new File("workBook2.xls"));
- *  List<String> listOfDifferences = ExcelComparator.compare(wb1, wb2);
- *  for (String differences : listOfDifferences)
- *      System.out.println(differences);
- *  System.out.println("DifferenceFound = "+ excelFileDifference.isDifferenceFound);
- *  }
- * </pre>
- */
-public class ExcelComparator {
-    
-    private static final String CELL_DATA_DOES_NOT_MATCH = "Cell Data does not Match ::";
-    private static final String CELL_FONT_ATTRIBUTES_DOES_NOT_MATCH = "Cell Font Attributes does not Match ::";
-
-    private static class Locator {
-        Workbook workbook;
-        Sheet sheet;
-        Row row;
-        Cell cell;
-    }
-    
-    List<String> listOfDifferences = new ArrayList<String>();
-
-    public static void main(String args[]) throws Exception {
-        if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
-            System.err.println("java -cp <classpath> "+ExcelComparator.class.getCanonicalName()+" <workbook1.xls/x> <workbook2.xls/x");
-            System.exit(-1);
-        }
-        Workbook wb1 = WorkbookFactory.create(new File(args[0]));
-        Workbook wb2 = WorkbookFactory.create(new File(args[1]));
-        
-        for (String d : ExcelComparator.compare(wb1, wb2)) {
-            System.out.println(d);
-        }
-        
-        wb2.close();
-        wb1.close();
-    }
-    
-    /**
-     * Utility to compare Excel File Contents cell by cell for all sheets.
-     *
-     * @param workbook1 the workbook1
-     * @param workbook2 the workbook2
-     * @return the Excel file difference containing a flag and a list of differences
-     * @throws ExcelCompareException the excel compare exception
-     */
-    public static List<String> compare(Workbook wb1, Workbook wb2) {
-        Locator loc1 = new Locator();
-        Locator loc2 = new Locator();
-        loc1.workbook = wb1;
-        loc2.workbook = wb2;
-
-        ExcelComparator excelComparator = new ExcelComparator();
-        excelComparator.compareNumberOfSheets(loc1, loc2 );
-        excelComparator.compareSheetNames(loc1, loc2);
-        excelComparator.compareSheetData(loc1, loc2);
-
-        return excelComparator.listOfDifferences;
-    }
-
-    /**
-     * Compare data in all sheets.
-     *
-     * @param workbook1 the workbook1
-     * @param workbook2 the workbook2
-     * @param listOfDifferences the list of differences
-     * @throws ExcelCompareException the excel compare exception
-     */
-    private void compareDataInAllSheets(Locator loc1, Locator loc2) {
-        for (int i = 0; i < loc1.workbook.getNumberOfSheets(); i++) {
-            if (loc2.workbook.getNumberOfSheets() <= i) return;
-
-            loc1.sheet = loc1.workbook.getSheetAt(i);
-            loc2.sheet = loc2.workbook.getSheetAt(i);
-
-            compareDataInSheet(loc1, loc2);
-        }
-    }
-
-    private void compareDataInSheet(Locator loc1, Locator loc2) {
-        for (int j = 0; j < loc1.sheet.getPhysicalNumberOfRows(); j++) {
-            if (loc2.sheet.getPhysicalNumberOfRows() <= j) return;
-
-            loc1.row = loc1.sheet.getRow(j);
-            loc2.row = loc2.sheet.getRow(j);
-
-            if ((loc1.row == null) || (loc2.row == null)) {
-                continue;
-            }
-
-            compareDataInRow(loc1, loc2);
-        }
-    }
-
-    private void compareDataInRow(Locator loc1, Locator loc2) {
-        for (int k = 0; k < loc1.row.getLastCellNum(); k++) {
-            if (loc2.row.getPhysicalNumberOfCells() <= k) return;
-
-            loc1.cell = loc1.row.getCell(k);
-            loc2.cell = loc2.row.getCell(k);
-
-            if ((loc1.cell == null) || (loc2.cell == null)) {
-                continue;
-            }
-
-            compareDataInCell(loc1, loc2);
-        }
-    }
-
-    private void compareDataInCell(Locator loc1, Locator loc2) {
-        if (isCellTypeMatches(loc1, loc2)) {
-            final CellType loc1cellType = loc1.cell.getCellTypeEnum();
-            switch(loc1cellType) {
-                case BLANK:
-                case STRING:
-                case ERROR:
-                    isCellContentMatches(loc1,loc2);
-                    break;
-                case BOOLEAN:
-                    isCellContentMatchesForBoolean(loc1,loc2);
-                    break;
-                case FORMULA:
-                    isCellContentMatchesForFormula(loc1,loc2);
-                    break;
-                case NUMERIC:
-                    if (DateUtil.isCellDateFormatted(loc1.cell)) {
-                        isCellContentMatchesForDate(loc1,loc2);
-                    } else {
-                        isCellContentMatchesForNumeric(loc1,loc2);
-                    }
-                    break;
-                default:
-                    throw new IllegalStateException("Unexpected cell type: " + loc1cellType);
-            }
-        }
-
-        isCellFillPatternMatches(loc1,loc2);
-        isCellAlignmentMatches(loc1,loc2);
-        isCellHiddenMatches(loc1,loc2);
-        isCellLockedMatches(loc1,loc2);
-        isCellFontFamilyMatches(loc1,loc2);
-        isCellFontSizeMatches(loc1,loc2);
-        isCellFontBoldMatches(loc1,loc2);
-        isCellUnderLineMatches(loc1,loc2);
-        isCellFontItalicsMatches(loc1,loc2);
-        isCellBorderMatches(loc1,loc2,'t');
-        isCellBorderMatches(loc1,loc2,'l');
-        isCellBorderMatches(loc1,loc2,'b');
-        isCellBorderMatches(loc1,loc2,'r');
-        isCellFillBackGroundMatches(loc1,loc2);
-    }
-
-    /**
-     * Compare number of columns in sheets.
-     */
-    private void compareNumberOfColumnsInSheets(Locator loc1, Locator loc2) {
-        for (int i = 0; i < loc1.workbook.getNumberOfSheets(); i++) {
-            if (loc2.workbook.getNumberOfSheets() <= i) return;
-            
-            loc1.sheet = loc1.workbook.getSheetAt(i);
-            loc2.sheet = loc2.workbook.getSheetAt(i);
-
-            Iterator<Row> ri1 = loc1.sheet.rowIterator();
-            Iterator<Row> ri2 = loc2.sheet.rowIterator();
-            
-            int num1 = (ri1.hasNext()) ? ri1.next().getPhysicalNumberOfCells() : 0;
-            int num2 = (ri2.hasNext()) ? ri2.next().getPhysicalNumberOfCells() : 0;
-            
-            if (num1 != num2) {
-                String str = String.format(Locale.ROOT, "%s\nworkbook1 -> %s [%d] != workbook2 -> %s [%d]",
-                    "Number Of Columns does not Match ::",
-                    loc1.sheet.getSheetName(), num1,
-                    loc2.sheet.getSheetName(), num2
-                );
-                listOfDifferences.add(str);
-            }
-        }
-    }
-
-    /**
-     * Compare number of rows in sheets.
-     */
-    private void compareNumberOfRowsInSheets(Locator loc1, Locator loc2) {
-        for (int i = 0; i < loc1.workbook.getNumberOfSheets(); i++) {
-            if (loc2.workbook.getNumberOfSheets() <= i) return;
-
-            loc1.sheet = loc1.workbook.getSheetAt(i);
-            loc2.sheet = loc2.workbook.getSheetAt(i);
-            
-            int num1 = loc1.sheet.getPhysicalNumberOfRows();
-            int num2 = loc2.sheet.getPhysicalNumberOfRows();
-
-            if (num1 != num2) {
-                String str = String.format(Locale.ROOT, "%s\nworkbook1 -> %s [%d] != workbook2 -> %s [%d]",
-                    "Number Of Rows does not Match ::",
-                    loc1.sheet.getSheetName(), num1,
-                    loc2.sheet.getSheetName(), num2
-                );
-                listOfDifferences.add(str);
-            }
-        }
-
-    }
-
-    /**
-     * Compare number of sheets.
-     */
-    private void compareNumberOfSheets(Locator loc1, Locator loc2) {
-        int num1 = loc1.workbook.getNumberOfSheets();
-        int num2 = loc2.workbook.getNumberOfSheets();
-        if (num1 != num2) {
-            String str = String.format(Locale.ROOT, "%s\nworkbook1 [%d] != workbook2 [%d]",
-                "Number of Sheets do not match ::",
-                num1, num2
-            );
-
-            listOfDifferences.add(str);
-            
-        }
-    }
-
-    /**
-     * Compare sheet data.
-     *
-     * @param workbook1
-     *            the workbook1
-     * @param workbook2
-     *            the workbook2
-     * @param listOfDifferences
-     *
-     * @throws ExcelCompareException
-     *             the excel compare exception
-     */
-    private void compareSheetData(Locator loc1, Locator loc2) {
-        compareNumberOfRowsInSheets(loc1, loc2);
-        compareNumberOfColumnsInSheets(loc1, loc2);
-        compareDataInAllSheets(loc1, loc2);
-
-    }
-
-    /**
-     * Compare sheet names.
-     */
-    private void compareSheetNames(Locator loc1, Locator loc2) {
-        for (int i = 0; i < loc1.workbook.getNumberOfSheets(); i++) {
-            String name1 = loc1.workbook.getSheetName(i);
-            String name2 = (loc2.workbook.getNumberOfSheets() > i) ? loc2.workbook.getSheetName(i) : "";
-            
-            if (!name1.equals(name2)) {
-                String str = String.format(Locale.ROOT, "%s\nworkbook1 -> %s [%d] != workbook2 -> %s [%d]",
-                    "Name of the sheets do not match ::", name1, i+1, name2, i+1
-                );
-                listOfDifferences.add(str);
-            }
-        }
-    }
-
-    /**
-     * Formats the message.
-     */
-    private void addMessage(Locator loc1, Locator loc2, String messageStart, String value1, String value2) {
-        String str =
-            String.format(Locale.ROOT, "%s\nworkbook1 -> %s -> %s [%s] != workbook2 -> %s -> %s [%s]",
-                messageStart,
-                loc1.sheet.getSheetName(), new CellReference(loc1.cell).formatAsString(), value1,
-                loc2.sheet.getSheetName(), new CellReference(loc2.cell).formatAsString(), value2
-            );
-        listOfDifferences.add(str);
-    }
-
-    /**
-     * Checks if cell alignment matches.
-     */
-    private void isCellAlignmentMatches(Locator loc1, Locator loc2) {
-        // TODO: check for NPE
-        short align1 = loc1.cell.getCellStyle().getAlignment();
-        short align2 = loc2.cell.getCellStyle().getAlignment();
-        if (align1 != align2) {
-            addMessage(loc1, loc2,
-                "Cell Alignment does not Match ::",
-                Short.toString(align1),
-                Short.toString(align2)
-            );
-        }
-    }
-
-    /**
-     * Checks if cell border bottom matches.
-     */
-    private void isCellBorderMatches(Locator loc1, Locator loc2, char borderSide) {
-        if (!(loc1.cell instanceof XSSFCell)) return;
-        XSSFCellStyle style1 = ((XSSFCell)loc1.cell).getCellStyle();
-        XSSFCellStyle style2 = ((XSSFCell)loc2.cell).getCellStyle();
-        boolean b1, b2;
-        String borderName;
-        switch (borderSide) {
-            case 't': default:
-                b1 = style1.getBorderTopEnum() == BorderStyle.THIN;
-                b2 = style2.getBorderTopEnum() == BorderStyle.THIN;
-                borderName = "TOP";
-                break;
-            case 'b':
-                b1 = style1.getBorderBottomEnum() == BorderStyle.THIN;
-                b2 = style2.getBorderBottomEnum() == BorderStyle.THIN;
-                borderName = "BOTTOM";
-                break;
-            case 'l':
-                b1 = style1.getBorderLeftEnum() == BorderStyle.THIN;
-                b2 = style2.getBorderLeftEnum() == BorderStyle.THIN;
-                borderName = "LEFT";
-                break;
-            case 'r':
-                b1 = style1.getBorderRightEnum() == BorderStyle.THIN;
-                b2 = style2.getBorderRightEnum() == BorderStyle.THIN;
-                borderName = "RIGHT";
-                break;
-        }
-        if (b1 != b2) {
-            addMessage(loc1, loc2,
-                "Cell Border Attributes does not Match ::",
-                (b1 ? "" : "NOT ")+borderName+" BORDER",
-                (b2 ? "" : "NOT ")+borderName+" BORDER"
-            );
-        }
-    }
-
-    /**
-     * Checks if cell content matches.
-     */
-    private void isCellContentMatches(Locator loc1, Locator loc2) {
-        // TODO: check for null and non-rich-text cells
-        String str1 = loc1.cell.getRichStringCellValue().getString();
-        String str2 = loc2.cell.getRichStringCellValue().getString();
-        if (!str1.equals(str2)) {
-            addMessage(loc1,loc2,CELL_DATA_DOES_NOT_MATCH,str1,str2);
-        }
-    }
-
-    /**
-     * Checks if cell content matches for boolean.
-     */
-    private void isCellContentMatchesForBoolean(Locator loc1, Locator loc2) {
-        boolean b1 = loc1.cell.getBooleanCellValue();
-        boolean b2 = loc2.cell.getBooleanCellValue();
-        if (b1 != b2) {
-            addMessage(loc1,loc2,CELL_DATA_DOES_NOT_MATCH,Boolean.toString(b1),Boolean.toString(b2));
-        }
-    }
-
-    /**
-     * Checks if cell content matches for date.
-     */
-    private void isCellContentMatchesForDate(Locator loc1, Locator loc2) {
-        Date date1 = loc1.cell.getDateCellValue();
-        Date date2 = loc2.cell.getDateCellValue();
-        if (!date1.equals(date2)) {
-            addMessage(loc1, loc2, CELL_DATA_DOES_NOT_MATCH, date1.toGMTString(), date2.toGMTString());
-        }
-    }
-
-
-    /**
-     * Checks if cell content matches for formula.
-     */
-    private void isCellContentMatchesForFormula(Locator loc1, Locator loc2) {
-        // TODO: actually evaluate the formula / NPE checks
-        String form1 = loc1.cell.getCellFormula();
-        String form2 = loc2.cell.getCellFormula();
-        if (!form1.equals(form2)) {
-            addMessage(loc1, loc2, CELL_DATA_DOES_NOT_MATCH, form1, form2);
-        }
-    }
-
-    /**
-     * Checks if cell content matches for numeric.
-     */
-    private void isCellContentMatchesForNumeric(Locator loc1, Locator loc2) {
-        // TODO: Check for NaN
-        double num1 = loc1.cell.getNumericCellValue();
-        double num2 = loc2.cell.getNumericCellValue();
-        if (num1 != num2) {
-            addMessage(loc1, loc2, CELL_DATA_DOES_NOT_MATCH, Double.toString(num1), Double.toString(num2));
-        }
-    }
-
-    private String getCellFillBackground(Locator loc) {
-        Color col = loc.cell.getCellStyle().getFillForegroundColorColor();
-        return (col instanceof XSSFColor) ? ((XSSFColor)col).getARGBHex() : "NO COLOR";
-    }
-    
-    /**
-     * Checks if cell file back ground matches.
-     */
-    private void isCellFillBackGroundMatches(Locator loc1, Locator loc2) {
-        String col1 = getCellFillBackground(loc1);
-        String col2 = getCellFillBackground(loc2);
-        if (!col1.equals(col2)) {
-            addMessage(loc1, loc2, "Cell Fill Color does not Match ::", col1, col2);
-        }
-    }
-    /**
-     * Checks if cell fill pattern matches.
-     */
-    private void isCellFillPatternMatches(Locator loc1, Locator loc2) {
-        // TOOO: Check for NPE
-        short fill1 = loc1.cell.getCellStyle().getFillPattern();
-        short fill2 = loc2.cell.getCellStyle().getFillPattern();
-        if (fill1 != fill2) {
-            addMessage(loc1, loc2,
-                "Cell Fill pattern does not Match ::",
-                Short.toString(fill1),
-                Short.toString(fill2)
-            );
-        }
-    }
-
-    /**
-     * Checks if cell font bold matches.
-     */
-    private void isCellFontBoldMatches(Locator loc1, Locator loc2) {
-        if (!(loc1.cell instanceof XSSFCell)) return;
-        boolean b1 = ((XSSFCell)loc1.cell).getCellStyle().getFont().getBold();
-        boolean b2 = ((XSSFCell)loc2.cell).getCellStyle().getFont().getBold();
-        if (b1 != b2) {
-            addMessage(loc1, loc2,
-                CELL_FONT_ATTRIBUTES_DOES_NOT_MATCH,
-                (b1 ? "" : "NOT ")+"BOLD",
-                (b2 ? "" : "NOT ")+"BOLD"
-            );
-        }
-    }
-
-    /**
-     * Checks if cell font family matches.
-     */
-    private void isCellFontFamilyMatches(Locator loc1, Locator loc2) {
-        // TODO: Check for NPEs
-        if (!(loc1.cell instanceof XSSFCell)) return;
-        String family1 = ((XSSFCell)loc1.cell).getCellStyle().getFont().getFontName();
-        String family2 = ((XSSFCell)loc2.cell).getCellStyle().getFont().getFontName();
-        if (!family1.equals(family2)) {
-            addMessage(loc1, loc2, "Cell Font Family does not Match ::", family1, family2);
-        }
-    }
-
-    /**
-     * Checks if cell font italics matches.
-     */
-    private void isCellFontItalicsMatches(Locator loc1, Locator loc2) {
-        if (!(loc1.cell instanceof XSSFCell)) return;
-        boolean b1 = ((XSSFCell)loc1.cell).getCellStyle().getFont().getItalic();
-        boolean b2 = ((XSSFCell)loc2.cell).getCellStyle().getFont().getItalic();
-        if (b1 != b2) {
-            addMessage(loc1, loc2,
-                CELL_FONT_ATTRIBUTES_DOES_NOT_MATCH,
-                (b1 ? "" : "NOT ")+"ITALICS",
-                (b2 ? "" : "NOT ")+"ITALICS"
-            );
-        }
-    }
-
-    /**
-     * Checks if cell font size matches.
-     */
-    private void isCellFontSizeMatches(Locator loc1, Locator loc2) {
-        if (!(loc1.cell instanceof XSSFCell)) return;
-        short size1 = ((XSSFCell)loc1.cell).getCellStyle().getFont().getFontHeightInPoints();
-        short size2 = ((XSSFCell)loc2.cell).getCellStyle().getFont().getFontHeightInPoints();
-        if (size1 != size2) {
-            addMessage(loc1, loc2,
-                "Cell Font Size does not Match ::",
-                Short.toString(size1),
-                Short.toString(size2)
-            );
-        }
-    }
-
-    /**
-     * Checks if cell hidden matches.
-     */
-    private void isCellHiddenMatches(Locator loc1, Locator loc2) {
-        boolean b1 = loc1.cell.getCellStyle().getHidden();
-        boolean b2 = loc1.cell.getCellStyle().getHidden();
-        if (b1 != b2) {
-            addMessage(loc1, loc2,
-                "Cell Visibility does not Match ::",
-                (b1 ? "" : "NOT ")+"HIDDEN",
-                (b2 ? "" : "NOT ")+"HIDDEN"
-            );
-        }
-    }
-
-    /**
-     * Checks if cell locked matches.
-     */
-    private void isCellLockedMatches(Locator loc1, Locator loc2) {
-        boolean b1 = loc1.cell.getCellStyle().getLocked();
-        boolean b2 = loc1.cell.getCellStyle().getLocked();
-        if (b1 != b2) {
-            addMessage(loc1, loc2,
-                    "Cell Protection does not Match ::",
-                (b1 ? "" : "NOT ")+"LOCKED",
-                (b2 ? "" : "NOT ")+"LOCKED"
-            );
-        }
-    }
-
-    /**
-     * Checks if cell type matches.
-     */
-    private boolean isCellTypeMatches(Locator loc1, Locator loc2) {
-        CellType type1 = loc1.cell.getCellTypeEnum();
-        CellType type2 = loc2.cell.getCellTypeEnum();
-        if (type1 == type2) return true;
-        addMessage(loc1, loc2,
-            "Cell Data-Type does not Match in :: ",
-            type1.name(), type2.name()
-        );
-        return false;
-    }
-
-    /**
-     * Checks if cell under line matches.
-     *
-     * @param cellWorkBook1
-     *            the cell work book1
-     * @param cellWorkBook2
-     *            the cell work book2
-     * @return true, if cell under line matches
-     */
-    private void isCellUnderLineMatches(Locator loc1, Locator loc2) {
-        // TOOO: distinguish underline type
-        if (!(loc1.cell instanceof XSSFCell)) return;
-        byte b1 = ((XSSFCell)loc1.cell).getCellStyle().getFont().getUnderline();
-        byte b2 = ((XSSFCell)loc2.cell).getCellStyle().getFont().getUnderline();
-        if (b1 != b2) {
-            addMessage(loc1, loc2,
-                CELL_FONT_ATTRIBUTES_DOES_NOT_MATCH,
-                (b1 == 1 ? "" : "NOT ")+"UNDERLINE",
-                (b2 == 1 ? "" : "NOT ")+"UNDERLINE"
-            );
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/LinkedDropDownLists.java b/trunk/src/examples/src/org/apache/poi/ss/examples/LinkedDropDownLists.java
deleted file mode 100644
index b0efc4f..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/LinkedDropDownLists.java
+++ /dev/null
@@ -1,228 +0,0 @@
-   /* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.examples;
-import java.io.*;
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddressList;
-
-/**
- * Demonstrates one technique that may be used to create linked or dependent
- * drop down lists. This refers to a situation in which the selection made
- * in one drop down list affects the options that are displayed in the second
- * or subsequent drop down list(s). In this example, the value the user selects
- * from the down list in cell A1 will affect the values displayed in the linked
- * drop down list in cell B1. For the sake of simplicity, the data for the drop
- * down lists is included on the same worksheet but this does not have to be the
- * case; the data could appear on a separate sheet. If this were done, then the
- * names for the regions would have to be different, they would have to include
- * the name of the sheet.
- * 
- * There are two keys to this technique. The first is the use of named area or 
- * regions of cells to hold the data for the drop down lists and the second is
- * making use of the INDIRECT() function to convert a name into the addresses
- * of the cells it refers to.
- * 
- * Note that whilst this class builds just two linked drop down lists, there is
- * nothing to prevent more being created. Quite simply, use the value selected
- * by the user in one drop down list to determine what is shown in another and the
- * value selected in that drop down list to determine what is shown in a third,
- * and so on. Also, note that the data for the drop down lists is contained on
- * contained on the same sheet as the validations themselves. This is done simply
- * for simplicity and there is nothing to prevent a separate sheet being created
- * and used to hold the data. If this is done then problems may be encountered
- * if the sheet is opened with OpenOffice Calc. To prevent these problems, it is
- * better to include the name of the sheet when calling the setRefersToFormula()
- * method.
- *
- * @author Mark Beardsley [msb at apache.org]
- * @version 1.00 30th March 2012
- */
-public class LinkedDropDownLists {
-
-    LinkedDropDownLists(String workbookName) {
-        File file = null;
-        FileOutputStream fos = null;
-        Workbook workbook = null;
-        Sheet sheet = null;
-        DataValidationHelper dvHelper = null;
-        DataValidationConstraint dvConstraint = null;
-        DataValidation validation = null;
-        CellRangeAddressList addressList = null;
-        try {
-
-            // Using the ss.usermodel allows this class to support both binary
-            // and xml based workbooks. The choice of which one to create is
-            // made by checking the file extension.
-            if (workbookName.endsWith(".xlsx")) {
-                workbook = new XSSFWorkbook();
-            } else {
-                workbook = new HSSFWorkbook();
-            }
-            
-            // Build the sheet that will hold the data for the validations. This
-            // must be done first as it will create names that are referenced 
-            // later.
-            sheet = workbook.createSheet("Linked Validations");
-            LinkedDropDownLists.buildDataSheet(sheet);
-
-            // Build the first data validation to occupy cell A1. Note
-            // that it retrieves it's data from the named area or region called
-            // CHOICES. Further information about this can be found in the
-            // static buildDataSheet() method below.
-            addressList = new CellRangeAddressList(0, 0, 0, 0);
-            dvHelper = sheet.getDataValidationHelper();
-            dvConstraint = dvHelper.createFormulaListConstraint("CHOICES");
-            validation = dvHelper.createValidation(dvConstraint, addressList);
-            sheet.addValidationData(validation);
-            
-            // Now, build the linked or dependent drop down list that will
-            // occupy cell B1. The key to the whole process is the use of the
-            // INDIRECT() function. In the buildDataSheet(0 method, a series of
-            // named regions are created and the names of three of them mirror
-            // the options available to the user in the first drop down list
-            // (in cell A1). Using the INDIRECT() function makes it possible
-            // to convert the selection the user makes in that first drop down
-            // into the addresses of a named region of cells and then to use
-            // those cells to populate the second drop down list.
-            addressList = new CellRangeAddressList(0, 0, 1, 1);
-            dvConstraint = dvHelper.createFormulaListConstraint(
-                    "INDIRECT(UPPER($A$1))");
-            validation = dvHelper.createValidation(dvConstraint, addressList);
-            sheet.addValidationData(validation);
-            
-            file = new File(workbookName);
-            fos = new FileOutputStream(file);
-            workbook.write(fos);
-        } catch (IOException ioEx) {
-            System.out.println("Caught a: " + ioEx.getClass().getName());
-            System.out.println("Message: " + ioEx.getMessage());
-            System.out.println("Stacktrace follws:.....");
-            ioEx.printStackTrace(System.out);
-        } finally {
-            try {
-                if (fos != null) {
-                    fos.close();
-                    fos = null;
-                }
-            } catch (IOException ioEx) {
-                System.out.println("Caught a: " + ioEx.getClass().getName());
-                System.out.println("Message: " + ioEx.getMessage());
-                System.out.println("Stacktrace follws:.....");
-                ioEx.printStackTrace(System.out);
-            }
-        }
-    }
-
-    /**
-     * Called to populate the named areas/regions. The contents of the cells on
-     * row one will be used to populate the first drop down list. The contents of
-     * the cells on rows two, three and four will be used to populate the second
-     * drop down list, just which row will be determined by the choice the user
-     * makes in the first drop down list.
-     * 
-     * In all cases, the approach is to create a row, create and populate cells
-     * with data and then specify a name that identifies those cells. With the
-     * exception of the first range, the names that are chosen for each range
-     * of cells are quite important. In short, each of the options the user 
-     * could select in the first drop down list is used as the name for another
-     * range of cells. Thus, in this example, the user can select either 
-     * 'Animal', 'Vegetable' or 'Mineral' in the first drop down and so the
-     * sheet contains ranges named 'ANIMAL', 'VEGETABLE' and 'MINERAL'.
-     * 
-     * @param dataSheet An instance of a class that implements the Sheet Sheet
-     *        interface (HSSFSheet or XSSFSheet).
-     */
-    private static final void buildDataSheet(Sheet dataSheet) {
-        Row row = null;
-        Cell cell = null;
-        Name name = null;
-
-        // The first row will hold the data for the first validation.
-        row = dataSheet.createRow(10);
-        cell = row.createCell(0);
-        cell.setCellValue("Animal");
-        cell = row.createCell(1);
-        cell.setCellValue("Vegetable");
-        cell = row.createCell(2);
-        cell.setCellValue("Mineral");
-        name = dataSheet.getWorkbook().createName();
-        name.setRefersToFormula("$A$11:$C$11");
-        name.setNameName("CHOICES");
-
-        // The next three rows will hold the data that will be used to
-        // populate the second, or linked, drop down list.
-        row = dataSheet.createRow(11);
-        cell = row.createCell(0);
-        cell.setCellValue("Lion");
-        cell = row.createCell(1);
-        cell.setCellValue("Tiger");
-        cell = row.createCell(2);
-        cell.setCellValue("Leopard");
-        cell = row.createCell(3);
-        cell.setCellValue("Elephant");
-        cell = row.createCell(4);
-        cell.setCellValue("Eagle");
-        cell = row.createCell(5);
-        cell.setCellValue("Horse");
-        cell = row.createCell(6);
-        cell.setCellValue("Zebra");
-        name = dataSheet.getWorkbook().createName();
-        name.setRefersToFormula("$A$12:$G$12");
-        name.setNameName("ANIMAL");
-
-        row = dataSheet.createRow(12);
-        cell = row.createCell(0);
-        cell.setCellValue("Cabbage");
-        cell = row.createCell(1);
-        cell.setCellValue("Cauliflower");
-        cell = row.createCell(2);
-        cell.setCellValue("Potato");
-        cell = row.createCell(3);
-        cell.setCellValue("Onion");
-        cell = row.createCell(4);
-        cell.setCellValue("Beetroot");
-        cell = row.createCell(5);
-        cell.setCellValue("Asparagus");
-        cell = row.createCell(6);
-        cell.setCellValue("Spinach");
-        cell = row.createCell(7);
-        cell.setCellValue("Chard");
-        name = dataSheet.getWorkbook().createName();
-        name.setRefersToFormula("$A$13:$H$13");
-        name.setNameName("VEGETABLE");
-
-        row = dataSheet.createRow(13);
-        cell = row.createCell(0);
-        cell.setCellValue("Bauxite");
-        cell = row.createCell(1);
-        cell.setCellValue("Quartz");
-        cell = row.createCell(2);
-        cell.setCellValue("Feldspar");
-        cell = row.createCell(3);
-        cell.setCellValue("Shist");
-        cell = row.createCell(4);
-        cell.setCellValue("Shale");
-        cell = row.createCell(5);
-        cell.setCellValue("Mica");
-        name = dataSheet.getWorkbook().createName();
-        name.setRefersToFormula("$A$14:$F$14");
-        name.setNameName("MINERAL");
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/LoadEmbedded.java b/trunk/src/examples/src/org/apache/poi/ss/examples/LoadEmbedded.java
deleted file mode 100644
index 66ca8ba..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/LoadEmbedded.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.examples;
-
-import java.io.File;
-import java.io.InputStream;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hssf.usermodel.HSSFObjectData;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-/**
- * Loads embedded resources from Workbooks. Code taken from the website:
- *  https://poi.apache.org/spreadsheet/quick-guide.html#Embedded
- */
-public class LoadEmbedded {
-   public static void main(String[] args) throws Exception {
-       Workbook wb = WorkbookFactory.create(new File(args[0]));
-       loadEmbedded(wb);
-   }
-   
-   public static void loadEmbedded(Workbook wb) throws Exception {
-       if (wb instanceof HSSFWorkbook) {
-           loadEmbedded((HSSFWorkbook)wb);
-       }
-       else if (wb instanceof XSSFWorkbook) {
-           loadEmbedded((XSSFWorkbook)wb);
-       }
-       else {
-           throw new IllegalArgumentException(wb.getClass().getName());
-       }
-   }
-   
-   public static void loadEmbedded(HSSFWorkbook workbook) throws Exception {
-       for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) {
-           //the OLE2 Class Name of the object
-           String oleName = obj.getOLE2ClassName();
-           if (oleName.equals("Worksheet")) {
-               DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-               HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(dn, false);
-               //System.out.println(entry.getName() + ": " + embeddedWorkbook.getNumberOfSheets());
-           } else if (oleName.equals("Document")) {
-               DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-               HWPFDocument embeddedWordDocument = new HWPFDocument(dn);
-               //System.out.println(entry.getName() + ": " + embeddedWordDocument.getRange().text());
-           }  else if (oleName.equals("Presentation")) {
-               DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-               SlideShow<?,?> embeddedPowerPointDocument = new HSLFSlideShow(dn);
-               //System.out.println(entry.getName() + ": " + embeddedPowerPointDocument.getSlides().length);
-           } else {
-               if(obj.hasDirectoryEntry()){
-                   // The DirectoryEntry is a DocumentNode. Examine its entries to find out what it is
-                   DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-                   for (Entry entry : dn) {
-                       //System.out.println(oleName + "." + entry.getName());
-                   }
-               } else {
-                   // There is no DirectoryEntry
-                   // Recover the object's data from the HSSFObjectData instance.
-                   byte[] objectData = obj.getObjectData();
-               }
-           }
-       }
-   }
-   
-   public static void loadEmbedded(XSSFWorkbook workbook) throws Exception {
-       for (PackagePart pPart : workbook.getAllEmbedds()) {
-           String contentType = pPart.getContentType();
-           // Excel Workbook - either binary or OpenXML
-           if (contentType.equals("application/vnd.ms-excel")) {
-               HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(pPart.getInputStream());
-           }
-           // Excel Workbook - OpenXML file format
-           else if (contentType.equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
-               OPCPackage docPackage = OPCPackage.open(pPart.getInputStream());
-               XSSFWorkbook embeddedWorkbook = new XSSFWorkbook(docPackage);
-           }
-           // Word Document - binary (OLE2CDF) file format
-           else if (contentType.equals("application/msword")) {
-               HWPFDocument document = new HWPFDocument(pPart.getInputStream());
-           }
-           // Word Document - OpenXML file format
-           else if (contentType.equals("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) {
-               OPCPackage docPackage = OPCPackage.open(pPart.getInputStream());
-               XWPFDocument document = new XWPFDocument(docPackage);
-           }
-           // PowerPoint Document - binary file format
-           else if (contentType.equals("application/vnd.ms-powerpoint")) {
-               HSLFSlideShow slideShow = new HSLFSlideShow(pPart.getInputStream());
-           }
-           // PowerPoint Document - OpenXML file format
-           else if (contentType.equals("application/vnd.openxmlformats-officedocument.presentationml.presentation")) {
-               OPCPackage docPackage = OPCPackage.open(pPart.getInputStream());
-               XSLFSlideShow slideShow = new XSLFSlideShow(docPackage);
-           }
-           // Any other type of embedded object.
-           else {
-               System.out.println("Unknown Embedded Document: " + contentType);
-               InputStream inputStream = pPart.getInputStream();
-           }
-       }
-   }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/LoanCalculator.java b/trunk/src/examples/src/org/apache/poi/ss/examples/LoanCalculator.java
deleted file mode 100644
index d6375dc..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/LoanCalculator.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.io.FileOutputStream;
-
-/**
- * Simple Loan Calculator. Demonstrates advance usage of cell formulas and named ranges.
- *
- * Usage:
- *   LoanCalculator -xls|xlsx
- *
- * @author Yegor Kozlov
- */
-public class LoanCalculator {
-
-    public static void main(String[] args) throws Exception {
-        Workbook wb;
-
-        if(args.length > 0 && args[0].equals("-xls")) wb = new HSSFWorkbook();
-        else wb = new XSSFWorkbook();
-
-        Map<String, CellStyle> styles = createStyles(wb);
-        Sheet sheet = wb.createSheet("Loan Calculator");
-        sheet.setPrintGridlines(false);
-        sheet.setDisplayGridlines(false);
-
-        PrintSetup printSetup = sheet.getPrintSetup();
-        printSetup.setLandscape(true);
-        sheet.setFitToPage(true);
-        sheet.setHorizontallyCenter(true);
-
-        sheet.setColumnWidth(0, 3*256);
-        sheet.setColumnWidth(1, 3*256);
-        sheet.setColumnWidth(2, 11*256);
-        sheet.setColumnWidth(3, 14*256);
-        sheet.setColumnWidth(4, 14*256);
-        sheet.setColumnWidth(5, 14*256);
-        sheet.setColumnWidth(6, 14*256);
-
-        createNames(wb);
-
-        Row titleRow = sheet.createRow(0);
-        titleRow.setHeightInPoints(35);
-        for (int i = 1; i <= 7; i++) {
-            titleRow.createCell(i).setCellStyle(styles.get("title"));
-        }
-        Cell titleCell = titleRow.getCell(2);
-        titleCell.setCellValue("Simple Loan Calculator");
-        sheet.addMergedRegion(CellRangeAddress.valueOf("$C$1:$H$1"));
-
-        Row row = sheet.createRow(2);
-        Cell cell = row.createCell(4);
-        cell.setCellValue("Enter values");
-        cell.setCellStyle(styles.get("item_right"));
-
-        row = sheet.createRow(3);
-        cell = row.createCell(2);
-        cell.setCellValue("Loan amount");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellStyle(styles.get("input_$"));
-        cell.setAsActiveCell();
-
-        row = sheet.createRow(4);
-        cell = row.createCell(2);
-        cell.setCellValue("Annual interest rate");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellStyle(styles.get("input_%"));
-
-        row = sheet.createRow(5);
-        cell = row.createCell(2);
-        cell.setCellValue("Loan period in years");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellStyle(styles.get("input_i"));
-
-        row = sheet.createRow(6);
-        cell = row.createCell(2);
-        cell.setCellValue("Start date of loan");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellStyle(styles.get("input_d"));
-
-        row = sheet.createRow(8);
-        cell = row.createCell(2);
-        cell.setCellValue("Monthly payment");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellFormula("IF(Values_Entered,Monthly_Payment,\"\")");
-        cell.setCellStyle(styles.get("formula_$"));
-
-        row = sheet.createRow(9);
-        cell = row.createCell(2);
-        cell.setCellValue("Number of payments");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellFormula("IF(Values_Entered,Loan_Years*12,\"\")");
-        cell.setCellStyle(styles.get("formula_i"));
-
-        row = sheet.createRow(10);
-        cell = row.createCell(2);
-        cell.setCellValue("Total interest");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellFormula("IF(Values_Entered,Total_Cost-Loan_Amount,\"\")");
-        cell.setCellStyle(styles.get("formula_$"));
-
-        row = sheet.createRow(11);
-        cell = row.createCell(2);
-        cell.setCellValue("Total cost of loan");
-        cell.setCellStyle(styles.get("item_left"));
-        cell = row.createCell(4);
-        cell.setCellFormula("IF(Values_Entered,Monthly_Payment*Number_of_Payments,\"\")");
-        cell.setCellStyle(styles.get("formula_$"));
-
-
-        // Write the output to a file
-        String file = "loan-calculator.xls";
-        if(wb instanceof XSSFWorkbook) file += "x";
-        FileOutputStream out = new FileOutputStream(file);
-        wb.write(out);
-        out.close();
-    }
-
-    /**
-     * cell styles used for formatting calendar sheets
-     */
-    private static Map<String, CellStyle> createStyles(Workbook wb){
-        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
-
-        CellStyle style;
-        Font titleFont = wb.createFont();
-        titleFont.setFontHeightInPoints((short)14);
-        titleFont.setFontName("Trebuchet MS");
-        style = wb.createCellStyle();
-        style.setFont(titleFont);
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        styles.put("title", style);
-
-        Font itemFont = wb.createFont();
-        itemFont.setFontHeightInPoints((short)9);
-        itemFont.setFontName("Trebuchet MS");
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setFont(itemFont);
-        styles.put("item_left", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(itemFont);
-        styles.put("item_right", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(itemFont);
-        style.setBorderRight(BorderStyle.DOTTED);
-        style.setRightBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderLeft(BorderStyle.DOTTED);
-        style.setLeftBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderTop(BorderStyle.DOTTED);
-        style.setTopBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setDataFormat(wb.createDataFormat().getFormat("_($* #,##0.00_);_($* (#,##0.00);_($* \"-\"??_);_(@_)"));
-        styles.put("input_$", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(itemFont);
-        style.setBorderRight(BorderStyle.DOTTED);
-        style.setRightBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderLeft(BorderStyle.DOTTED);
-        style.setLeftBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderTop(BorderStyle.DOTTED);
-        style.setTopBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setDataFormat(wb.createDataFormat().getFormat("0.000%"));
-        styles.put("input_%", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(itemFont);
-        style.setBorderRight(BorderStyle.DOTTED);
-        style.setRightBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderLeft(BorderStyle.DOTTED);
-        style.setLeftBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderTop(BorderStyle.DOTTED);
-        style.setTopBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setDataFormat(wb.createDataFormat().getFormat("0"));
-        styles.put("input_i", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setFont(itemFont);
-        style.setDataFormat(wb.createDataFormat().getFormat("m/d/yy"));
-        styles.put("input_d", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(itemFont);
-        style.setBorderRight(BorderStyle.DOTTED);
-        style.setRightBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderLeft(BorderStyle.DOTTED);
-        style.setLeftBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderTop(BorderStyle.DOTTED);
-        style.setTopBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setDataFormat(wb.createDataFormat().getFormat("$##,##0.00"));
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        styles.put("formula_$", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        style.setFont(itemFont);
-        style.setBorderRight(BorderStyle.DOTTED);
-        style.setRightBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderLeft(BorderStyle.DOTTED);
-        style.setLeftBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setBorderTop(BorderStyle.DOTTED);
-        style.setTopBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setDataFormat(wb.createDataFormat().getFormat("0"));
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setBottomBorderColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        styles.put("formula_i", style);
-
-        return styles;
-    }
-
-    //define named ranges for the inputs and formulas
-    public static void createNames(Workbook wb){
-        Name name;
-
-        name = wb.createName();
-        name.setNameName("Interest_Rate");
-        name.setRefersToFormula("'Loan Calculator'!$E$5");
-
-        name = wb.createName();
-        name.setNameName("Loan_Amount");
-        name.setRefersToFormula("'Loan Calculator'!$E$4");
-
-        name = wb.createName();
-        name.setNameName("Loan_Start");
-        name.setRefersToFormula("'Loan Calculator'!$E$7");
-
-        name = wb.createName();
-        name.setNameName("Loan_Years");
-        name.setRefersToFormula("'Loan Calculator'!$E$6");
-
-        name = wb.createName();
-        name.setNameName("Number_of_Payments");
-        name.setRefersToFormula("'Loan Calculator'!$E$10");
-
-        name = wb.createName();
-        name.setNameName("Monthly_Payment");
-        name.setRefersToFormula("-PMT(Interest_Rate/12,Number_of_Payments,Loan_Amount)");
-
-        name = wb.createName();
-        name.setNameName("Total_Cost");
-        name.setRefersToFormula("'Loan Calculator'!$E$12");
-
-        name = wb.createName();
-        name.setNameName("Total_Interest");
-        name.setRefersToFormula("'Loan Calculator'!$E$11");
-
-        name = wb.createName();
-        name.setNameName("Values_Entered");
-        name.setRefersToFormula("IF(Loan_Amount*Interest_Rate*Loan_Years*Loan_Start>0,1,0)");
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/SSPerformanceTest.java b/trunk/src/examples/src/org/apache/poi/ss/examples/SSPerformanceTest.java
deleted file mode 100644
index 10c3a4a..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/SSPerformanceTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.ss.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public class SSPerformanceTest {
-    public static void main(String[] args) throws IOException {
-        if (args.length != 4) usage("need four command arguments");
-
-        String type = args[0];
-        long timeStarted = System.currentTimeMillis();
-        Workbook workBook = createWorkbook(type);
-        boolean isHType = workBook instanceof HSSFWorkbook;
-
-        int rows = parseInt(args[1], "Failed to parse rows value as integer");
-        int cols = parseInt(args[2], "Failed to parse cols value as integer");
-        boolean saveFile = parseInt(args[3], "Failed to parse saveFile value as integer") != 0;
-
-        addContent(workBook, isHType, rows, cols);
-
-        if (saveFile) {
-            String fileName = type + "_" + rows + "_" + cols + "." + getFileSuffix(args[0]);
-            saveFile(workBook, fileName);
-        }
-        long timeFinished = System.currentTimeMillis();
-        System.out.println("Elapsed " + (timeFinished-timeStarted)/1000 + " seconds");
-        
-        workBook.close();
-    }
-
-    private static void addContent(Workbook workBook, boolean isHType, int rows, int cols) {
-        Map<String, CellStyle> styles = createStyles(workBook);
-
-        Sheet sheet = workBook.createSheet("Main Sheet");
-
-        Cell headerCell = sheet.createRow(0).createCell(0);
-        headerCell.setCellValue("Header text is spanned across multiple cells");
-        headerCell.setCellStyle(styles.get("header"));
-        sheet.addMergedRegion(CellRangeAddress.valueOf("$A$1:$F$1"));
-
-        int sheetNo = 0;
-        int rowIndexInSheet = 1;
-        double value = 0;
-        Calendar calendar = Calendar.getInstance();
-        for (int rowIndex = 0; rowIndex < rows; rowIndex++) {
-            if (isHType && sheetNo != rowIndex / 0x10000) {
-                sheet = workBook.createSheet("Spillover from sheet " + (++sheetNo));
-                headerCell.setCellValue("Header text is spanned across multiple cells");
-                headerCell.setCellStyle(styles.get("header"));
-                sheet.addMergedRegion(CellRangeAddress.valueOf("$A$1:$F$1"));
-                rowIndexInSheet = 1;
-            }
-
-            Row row = sheet.createRow(rowIndexInSheet);
-            for (int colIndex = 0; colIndex < cols; colIndex++) {
-                value = populateCell(styles, value, calendar, rowIndex, row, colIndex);
-            }
-            rowIndexInSheet++;
-        }
-    }
-
-    private static double populateCell(Map<String, CellStyle> styles, double value, Calendar calendar, int rowIndex, Row row, int colIndex) {
-        Cell cell = row.createCell(colIndex);
-        String address = new CellReference(cell).formatAsString();
-        switch (colIndex){
-            case 0:
-                // column A: default number format
-                cell.setCellValue(value++);
-                break;
-            case 1:
-                // column B: #,##0
-                cell.setCellValue(value++);
-                cell.setCellStyle(styles.get("#,##0.00"));
-                break;
-            case 2:
-                // column C: $#,##0.00
-                cell.setCellValue(value++);
-                cell.setCellStyle(styles.get("$#,##0.00"));
-                break;
-            case 3:
-                // column D: red bold text on yellow background
-                cell.setCellValue(address);
-                cell.setCellStyle(styles.get("red-bold"));
-                break;
-            case 4:
-                // column E: boolean
-                // TODO booleans are shown as 1/0 instead of TRUE/FALSE
-                cell.setCellValue(rowIndex % 2 == 0);
-                break;
-            case 5:
-                // column F:  date / time
-                cell.setCellValue(calendar);
-                cell.setCellStyle(styles.get("m/d/yyyy"));
-                calendar.roll(Calendar.DAY_OF_YEAR, -1);
-                break;
-            case 6:
-                // column F: formula
-                // TODO formulas are not yet supported  in SXSSF
-                //cell.setCellFormula("SUM(A" + (rowIndex+1) + ":E" + (rowIndex+1)+ ")");
-                //break;
-            default:
-                cell.setCellValue(value++);
-                break;
-        }
-        return value;
-    }
-
-    private static void saveFile(Workbook workBook, String fileName) {
-        try {
-            FileOutputStream out = new FileOutputStream(fileName);
-            workBook.write(out);
-            out.close();
-        } catch (IOException ioe) {
-            System.err.println("Error: failed to write to file \"" + fileName + "\", reason=" + ioe.getMessage());
-        }
-    }
-
-    static Map<String, CellStyle> createStyles(Workbook wb) {
-        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
-        CellStyle style;
-
-        Font headerFont = wb.createFont();
-        headerFont.setFontHeightInPoints((short) 14);
-        headerFont.setBold(true);
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFont(headerFont);
-        style.setFillForegroundColor(IndexedColors.LIGHT_CORNFLOWER_BLUE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        styles.put("header", style);
-
-        Font monthFont = wb.createFont();
-        monthFont.setFontHeightInPoints((short)12);
-        monthFont.setColor(IndexedColors.RED.getIndex());
-        monthFont.setBold(true);
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setFont(monthFont);
-        styles.put("red-bold", style);
-
-        String[] nfmt = {"#,##0.00", "$#,##0.00", "m/d/yyyy"};
-        for(String fmt : nfmt){
-            style = wb.createCellStyle();
-            style.setDataFormat(wb.createDataFormat().getFormat(fmt));
-            styles.put(fmt, style);
-        }
-
-        return styles;
-    }
-
-
-    static void usage(String message) {
-        System.err.println(message);
-        System.err.println("usage: java SSPerformanceTest HSSF|XSSF|SXSSF rows cols saveFile (0|1)? ");
-        System.exit(1);
-    }
-
-    static Workbook createWorkbook(String type) {
-        if ("HSSF".equals(type))
-            return new HSSFWorkbook();
-        else if ("XSSF".equals(type))
-            return new XSSFWorkbook();
-        else if ("SXSSF".equals(type))
-            return new SXSSFWorkbook();
-        else
-            usage("Unknown type \"" + type + "\"");
-        return null;
-    }
-
-    static String getFileSuffix(String type) {
-        if ("HSSF".equals(type))
-            return "xls";
-        else if ("XSSF".equals(type))
-            return "xlsx";
-        else if ("SXSSF".equals(type))
-            return "xlsx";
-        return null;
-    }
-
-    static int parseInt(String value, String msg) {
-        try {
-            return Integer.parseInt(value);
-        } catch (NumberFormatException e) {
-            usage(msg);
-        }
-        return 0;
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/TimesheetDemo.java b/trunk/src/examples/src/org/apache/poi/ss/examples/TimesheetDemo.java
deleted file mode 100644
index 8ef20fe..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/TimesheetDemo.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.io.FileOutputStream;
-
-/**
- * A weekly timesheet created using Apache POI.
- * Usage:
- *  TimesheetDemo -xls|xlsx
- *
- * @author Yegor Kozlov
- */
-public class TimesheetDemo {
-    private static final String[] titles = {
-            "Person",	"ID", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun",
-            "Total\nHrs", "Overtime\nHrs", "Regular\nHrs"
-    };
-
-    private static Object[][] sample_data = {
-            {"Yegor Kozlov", "YK", 5.0, 8.0, 10.0, 5.0, 5.0, 7.0, 6.0},
-            {"Gisella Bronzetti", "GB", 4.0, 3.0, 1.0, 3.5, null, null, 4.0},
-    };
-
-    public static void main(String[] args) throws Exception {
-        Workbook wb;
-
-        if(args.length > 0 && args[0].equals("-xls")) wb = new HSSFWorkbook();
-        else wb = new XSSFWorkbook();
-
-        Map<String, CellStyle> styles = createStyles(wb);
-
-        Sheet sheet = wb.createSheet("Timesheet");
-        PrintSetup printSetup = sheet.getPrintSetup();
-        printSetup.setLandscape(true);
-        sheet.setFitToPage(true);
-        sheet.setHorizontallyCenter(true);
-
-        //title row
-        Row titleRow = sheet.createRow(0);
-        titleRow.setHeightInPoints(45);
-        Cell titleCell = titleRow.createCell(0);
-        titleCell.setCellValue("Weekly Timesheet");
-        titleCell.setCellStyle(styles.get("title"));
-        sheet.addMergedRegion(CellRangeAddress.valueOf("$A$1:$L$1"));
-
-        //header row
-        Row headerRow = sheet.createRow(1);
-        headerRow.setHeightInPoints(40);
-        Cell headerCell;
-        for (int i = 0; i < titles.length; i++) {
-            headerCell = headerRow.createCell(i);
-            headerCell.setCellValue(titles[i]);
-            headerCell.setCellStyle(styles.get("header"));
-        }
-
-        int rownum = 2;
-        for (int i = 0; i < 10; i++) {
-            Row row = sheet.createRow(rownum++);
-            for (int j = 0; j < titles.length; j++) {
-                Cell cell = row.createCell(j);
-                if(j == 9){
-                    //the 10th cell contains sum over week days, e.g. SUM(C3:I3)
-                    String ref = "C" +rownum+ ":I" + rownum;
-                    cell.setCellFormula("SUM("+ref+")");
-                    cell.setCellStyle(styles.get("formula"));
-                } else if (j == 11){
-                    cell.setCellFormula("J" +rownum+ "-K" + rownum);
-                    cell.setCellStyle(styles.get("formula"));
-                } else {
-                    cell.setCellStyle(styles.get("cell"));
-                }
-            }
-        }
-
-        //row with totals below
-        Row sumRow = sheet.createRow(rownum++);
-        sumRow.setHeightInPoints(35);
-        Cell cell;
-        cell = sumRow.createCell(0);
-        cell.setCellStyle(styles.get("formula"));
-        cell = sumRow.createCell(1);
-        cell.setCellValue("Total Hrs:");
-        cell.setCellStyle(styles.get("formula"));
-
-        for (int j = 2; j < 12; j++) {
-            cell = sumRow.createCell(j);
-            String ref = (char)('A' + j) + "3:" + (char)('A' + j) + "12";
-            cell.setCellFormula("SUM(" + ref + ")");
-            if(j >= 9) cell.setCellStyle(styles.get("formula_2"));
-            else cell.setCellStyle(styles.get("formula"));
-        }
-        rownum++;
-        sumRow = sheet.createRow(rownum++);
-        sumRow.setHeightInPoints(25);
-        cell = sumRow.createCell(0);
-        cell.setCellValue("Total Regular Hours");
-        cell.setCellStyle(styles.get("formula"));
-        cell = sumRow.createCell(1);
-        cell.setCellFormula("L13");
-        cell.setCellStyle(styles.get("formula_2"));
-        sumRow = sheet.createRow(rownum++);
-        sumRow.setHeightInPoints(25);
-        cell = sumRow.createCell(0);
-        cell.setCellValue("Total Overtime Hours");
-        cell.setCellStyle(styles.get("formula"));
-        cell = sumRow.createCell(1);
-        cell.setCellFormula("K13");
-        cell.setCellStyle(styles.get("formula_2"));
-
-        //set sample data
-        for (int i = 0; i < sample_data.length; i++) {
-            Row row = sheet.getRow(2 + i);
-            for (int j = 0; j < sample_data[i].length; j++) {
-                if(sample_data[i][j] == null) continue;
-
-                if(sample_data[i][j] instanceof String) {
-                    row.getCell(j).setCellValue((String)sample_data[i][j]);
-                } else {
-                    row.getCell(j).setCellValue((Double)sample_data[i][j]);
-                }
-            }
-        }
-
-        //finally set column widths, the width is measured in units of 1/256th of a character width
-        sheet.setColumnWidth(0, 30*256); //30 characters wide
-        for (int i = 2; i < 9; i++) {
-            sheet.setColumnWidth(i, 6*256);  //6 characters wide
-        }
-        sheet.setColumnWidth(10, 10*256); //10 characters wide
-
-        // Write the output to a file
-        String file = "timesheet.xls";
-        if(wb instanceof XSSFWorkbook) file += "x";
-        FileOutputStream out = new FileOutputStream(file);
-        wb.write(out);
-        out.close();
-    }
-
-    /**
-     * Create a library of cell styles
-     */
-    private static Map<String, CellStyle> createStyles(Workbook wb){
-        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
-        CellStyle style;
-        Font titleFont = wb.createFont();
-        titleFont.setFontHeightInPoints((short)18);
-        titleFont.setBold(true);
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFont(titleFont);
-        styles.put("title", style);
-
-        Font monthFont = wb.createFont();
-        monthFont.setFontHeightInPoints((short)11);
-        monthFont.setColor(IndexedColors.WHITE.getIndex());
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setFont(monthFont);
-        style.setWrapText(true);
-        styles.put("header", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setWrapText(true);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(IndexedColors.BLACK.getIndex());
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setLeftBorderColor(IndexedColors.BLACK.getIndex());
-        style.setBorderTop(BorderStyle.THIN);
-        style.setTopBorderColor(IndexedColors.BLACK.getIndex());
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(IndexedColors.BLACK.getIndex());
-        styles.put("cell", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setDataFormat(wb.createDataFormat().getFormat("0.00"));
-        styles.put("formula", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.GREY_40_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setDataFormat(wb.createDataFormat().getFormat("0.00"));
-        styles.put("formula_2", style);
-
-        return styles;
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java b/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java
deleted file mode 100644
index b6c5ea9..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java
+++ /dev/null
@@ -1,774 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.examples;
-
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-
-/**
- * Demonstrates <em>one</em> way to convert an Excel spreadsheet into a CSV
- * file. This class makes the following assumptions;
- * <list>
- * <li>1. Where the Excel workbook contains more that one worksheet, then a single
- *    CSV file will contain the data from all of the worksheets.</li>
- * <li>2. The data matrix contained in the CSV file will be square. This means that
- *    the number of fields in each record of the CSV file will match the number
- *    of cells in the longest row found in the Excel workbook. Any short records
- *    will be 'padded' with empty fields - an empty field is represented in the
- *    the CSV file in this way - ,,.</li>
- * <li>3. Empty fields will represent missing cells.</li>
- * <li>4. A record consisting of empty fields will be used to represent an empty row
- *    in the Excel workbook.</li>
- * </list>
- * Therefore, if the worksheet looked like this;
- *
- * <pre>
- *  ___________________________________________
- *     |       |       |       |       |       |
- *     |   A   |   B   |   C   |   D   |   E   |
- *  ___|_______|_______|_______|_______|_______|
- *     |       |       |       |       |       |
- *   1 |   1   |   2   |   3   |   4   |   5   |
- *  ___|_______|_______|_______|_______|_______|
- *     |       |       |       |       |       |
- *   2 |       |       |       |       |       |
- *  ___|_______|_______|_______|_______|_______|
- *     |       |       |       |       |       |
- *   3 |       |   A   |       |   B   |       |
- *  ___|_______|_______|_______|_______|_______|
- *     |       |       |       |       |       |
- *   4 |       |       |       |       |   Z   |
- *  ___|_______|_______|_______|_______|_______|
- *     |       |       |       |       |       |
- *   5 | 1,400 |       |  250  |       |       |
- *  ___|_______|_______|_______|_______|_______|
- *
- * </pre>
- *
- * Then, the resulting CSV file will contain the following lines (records);
- * <pre>
- * 1,2,3,4,5
- * ,,,,
- * ,A,,B,
- * ,,,,Z
- * "1,400",,250,,
- * </pre><p>
- * Typically, the comma is used to separate each of the fields that, together,
- * constitute a single record or line within the CSV file. This is not however
- * a hard and fast rule and so this class allows the user to determine which
- * character is used as the field separator and assumes the comma if none other
- * is specified.
- * </p><p>
- * If a field contains the separator then it will be escaped. If the file should
- * obey Excel's CSV formatting rules, then the field will be surrounded with
- * speech marks whilst if it should obey UNIX conventions, each occurrence of
- * the separator will be preceded by the backslash character.
- * </p><p>
- * If a field contains an end of line (EOL) character then it too will be
- * escaped. If the file should obey Excel's CSV formatting rules then the field
- * will again be surrounded by speech marks. On the other hand, if the file
- * should follow UNIX conventions then a single backslash will precede the
- * EOL character. There is no single applicable standard for UNIX and some
- * appications replace the CR with \r and the LF with \n but this class will
- * not do so.
- * </p><p>
- * If the field contains double quotes then that character will be escaped. It
- * seems as though UNIX does not define a standard for this whilst Excel does.
- * Should the CSV file have to obey Excel's formmating rules then the speech
- * mark character will be escaped with a second set of speech marks. Finally, an
- * enclosing set of speah marks will also surround the entire field. Thus, if
- * the following line of text appeared in a cell - "Hello" he said - it would
- * look like this when converted into a field within a CSV file - """Hello"" he
- * said".
- * </p><p>
- * Finally, it is worth noting that talk of CSV 'standards' is really slightly
- * missleading as there is no such thing. It may well be that the code in this
- * class has to be modified to produce files to suit a specific application
- * or requirement.
- * </p>
- * @author Mark B
- * @version 1.00 9th April 2010
- *          1.10 13th April 2010 - Added support for processing all Excel
- *                                 workbooks in a folder along with the ability
- *                                 to specify a field separator character.
- *          2.00 14th April 2010 - Added support for embedded characters; the
- *                                 field separator, EOL and double quotes or
- *                                 speech marks. In addition, gave the client
- *                                 the ability to select how these are handled,
- *                                 either obeying Excel's or UNIX formatting
- *                                 conventions.
- */
-public class ToCSV {
-
-    private Workbook workbook = null;
-    private ArrayList<ArrayList<String>> csvData = null;
-    private int maxRowWidth = 0;
-    private int formattingConvention = 0;
-    private DataFormatter formatter = null;
-    private FormulaEvaluator evaluator = null;
-    private String separator = null;
-
-    private static final String CSV_FILE_EXTENSION = ".csv";
-    private static final String DEFAULT_SEPARATOR = ",";
-
-    /**
-     * Identifies that the CSV file should obey Excel's formatting conventions
-     * with regard to escaping certain embedded characters - the field separator,
-     * speech mark and end of line (EOL) character
-     */
-    public static final int EXCEL_STYLE_ESCAPING = 0;
-
-    /**
-     * Identifies that the CSV file should obey UNIX formatting conventions
-     * with regard to escaping certain embedded characters - the field separator
-     * and end of line (EOL) character
-     */
-    public static final int UNIX_STYLE_ESCAPING = 1;
-
-    /**
-     * Process the contents of a folder, convert the contents of each Excel
-     * workbook into CSV format and save the resulting file to the specified
-     * folder using the same name as the original workbook with the .xls or
-     * .xlsx extension replaced by .csv. This method will ensure that the
-     * CSV file created contains the comma field separator and that embedded
-     * characters such as the field separator, the EOL and double quotes are
-     * escaped in accordance with Excel's convention.
-     *
-     * @param strSource An instance of the String class that encapsulates the
-     *        name of and path to either a folder containing those Excel
-     *        workbook(s) or the name of and path to an individual Excel workbook
-     *        that is/are to be converted.
-     * @param strDestination An instance of the String class encapsulating the
-     *        name of and path to a folder that will contain the resulting CSV
-     *        files.
-     * @throws java.io.FileNotFoundException Thrown if any file cannot be located
-     *         on the filesystem during processing.
-     * @throws java.io.IOException Thrown if the filesystem encounters any
-     *         problems during processing.
-     * @throws java.lang.IllegalArgumentException Thrown if the values passed
-     *         to the strSource parameter refers to a file or folder that does not
-     *         exist or if the value passed to the strDestination paramater refers
-     *         to a folder that does not exist or simply does not refer to a
-     *         folder.
-     * @throws org.apache.poi.openxml4j.exceptions.InvalidFormatException Thrown
-     *         if the xml markup encountered whilst parsing a SpreadsheetML
-     *         file (.xlsx) is invalid.
-     */
-    public void convertExcelToCSV(String strSource, String strDestination)
-                       throws FileNotFoundException, IOException,
-                              IllegalArgumentException, InvalidFormatException {
-
-        // Simply chain the call to the overloaded convertExcelToCSV(String,
-        // String, String, int) method, pass the default separator and ensure
-        // that certain embedded characters are escaped in accordance with
-        // Excel's formatting conventions
-        this.convertExcelToCSV(strSource, strDestination,
-                ToCSV.DEFAULT_SEPARATOR, ToCSV.EXCEL_STYLE_ESCAPING);
-    }
-
-    /**
-     * Process the contents of a folder, convert the contents of each Excel
-     * workbook into CSV format and save the resulting file to the specified
-     * folder using the same name as the original workbook with the .xls or
-     * .xlsx extension replaced by .csv. This method allows the client to
-     * define the field separator but will ensure that embedded characters such
-     * as the field separator, the EOL and double quotes are escaped in
-     * accordance with Excel's convention.
-     *
-     * @param strSource An instance of the String class that encapsulates the
-     *        name of and path to either a folder containing those Excel
-     *        workbook(s) or the name of and path to an individual Excel workbook
-     *        that is/are to be converted.
-     * @param strDestination An instance of the String class encapsulating the
-     *        name of and path to a folder that will contain the resulting CSV
-     *        files.
-     * @param separator An instance of the String class that encapsulates the
-     *        character or characters the client wishes to use as the field
-     *        separator.
-     * @throws java.io.FileNotFoundException Thrown if any file cannot be located
-     *         on the filesystem during processing.
-     * @throws java.io.IOException Thrown if the filesystem encounters any
-     *         problems during processing.
-     * @throws java.lang.IllegalArgumentException Thrown if the values passed
-     *         to the strSource parameter refers to a file or folder that does not
-     *         exist or if the value passed to the strDestination paramater refers
-     *         to a folder that does not exist or simply does not refer to a
-     *         folder.
-     * @throws org.apache.poi.openxml4j.exceptions.InvalidFormatException Thrown
-     *         if the xml markup encounetered whilst parsing a SpreadsheetML
-     *         file (.xlsx) is invalid.
-     */
-    public void convertExcelToCSV(String strSource, String strDestination,
-                                  String separator)
-                       throws FileNotFoundException, IOException,
-                              IllegalArgumentException, InvalidFormatException {
-
-        // Simply chain the call to the overloaded convertExcelToCSV(String,
-        // String, String, int) method and ensure that certain embedded
-        // characters are escaped in accordance with Excel's formatting
-        // conventions
-        this.convertExcelToCSV(strSource, strDestination,
-                separator, ToCSV.EXCEL_STYLE_ESCAPING);
-    }
-
-    /**
-     * Process the contents of a folder, convert the contents of each Excel
-     * workbook into CSV format and save the resulting file to the specified
-     * folder using the same name as the original workbook with the .xls or
-     * .xlsx extension replaced by .csv
-     *
-     * @param strSource An instance of the String class that encapsulates the
-     *        name of and path to either a folder containing those Excel
-     *        workbook(s) or the name of and path to an individual Excel workbook
-     *        that is/are to be converted.
-     * @param strDestination An instance of the String class encapsulating the name
-     *        of and path to a folder that will contain the resulting CSV files.
-     * @param formattingConvention A primitive int whose value will determine
-     *        whether certain embedded characters should be escaped in accordance
-     *        with Excel's or UNIX formatting conventions. Two constants are
-     *        defined to support this option; ToCSV.EXCEL_STYLE_ESCAPING and
-     *        ToCSV.UNIX_STYLE_ESCAPING
-     * @param separator An instance of the String class encapsulating the
-     *        characters or characters that should be used to separate items
-     *        on a line within the CSV file.
-     * @throws java.io.FileNotFoundException Thrown if any file cannot be located
-     *         on the filesystem during processing.
-     * @throws java.io.IOException Thrown if the filesystem encounters any
-     *         problems during processing.
-     * @throws java.lang.IllegalArgumentException Thrown if the values passed
-     *         to the strSource parameter refers to a file or folder that does not
-     *         exist, if the value passed to the strDestination paramater refers
-     *         to a folder that does not exist,  if the value passed to the
-     *         strDestination parameter does not refer to a folder or if the
-     *         value passed to the formattingConvention parameter is other than
-     *         one of the values defined by the constants ToCSV.EXCEL_STYLE_ESCAPING
-     *         and ToCSV.UNIX_STYLE_ESCAPING.
-     * @throws org.apache.poi.openxml4j.exceptions.InvalidFormatException Thrown
-     *         if the xml markup encounetered whilst parsing a SpreadsheetML
-     *         file (.xlsx) is invalid.
-     */
-    public void convertExcelToCSV(String strSource, String strDestination,
-                                  String separator, int formattingConvention)
-                       throws FileNotFoundException, IOException,
-                              IllegalArgumentException, InvalidFormatException {
-        File source = new File(strSource);
-        File destination = new File(strDestination);
-        File[] filesList = null;
-        String destinationFilename = null;
-
-        // Check that the source file/folder exists.
-        if(!source.exists()) {
-            throw new IllegalArgumentException("The source for the Excel " +
-                    "file(s) cannot be found.");
-        }
-
-        // Ensure thaat the folder the user has chosen to save the CSV files
-        // away into firstly exists and secondly is a folder rather than, for
-        // instance, a data file.
-        if(!destination.exists()) {
-            throw new IllegalArgumentException("The folder/directory for the " +
-                    "converted CSV file(s) does not exist.");
-        }
-        if(!destination.isDirectory()) {
-            throw new IllegalArgumentException("The destination for the CSV " +
-                    "file(s) is not a directory/folder.");
-        }
-
-        // Ensure the value passed to the formattingConvention parameter is
-        // within range.
-        if(formattingConvention != ToCSV.EXCEL_STYLE_ESCAPING &&
-           formattingConvention != ToCSV.UNIX_STYLE_ESCAPING) {
-            throw new IllegalArgumentException("The value passed to the " +
-                    "formattingConvention parameter is out of range.");
-        }
-
-        // Copy the spearator character and formatting convention into local
-        // variables for use in other methods.
-        this.separator = separator;
-        this.formattingConvention = formattingConvention;
-
-        // Check to see if the sourceFolder variable holds a reference to
-        // a file or a folder full of files.
-        if(source.isDirectory()) {
-            // Get a list of all of the Excel spreadsheet files (workbooks) in
-            // the source folder/directory
-            filesList = source.listFiles(new ExcelFilenameFilter());
-        }
-        else {
-            // Assume that it must be a file handle - although there are other
-            // options the code should perhaps check - and store the reference
-            // into the filesList variable.
-            filesList = new File[]{source};
-        }
-
-        // Step through each of the files in the source folder and for each
-        // open the workbook, convert it's contents to CSV format and then
-        // save the resulting file away into the folder specified by the
-        // contents of the destination variable. Note that the name of the
-        // csv file will be created by taking the name of the Excel file,
-        // removing the extension and replacing it with .csv. Note that there
-        // is one drawback with this approach; if the folder holding the files
-        // contains two workbooks whose names match but one is a binary file
-        // (.xls) and the other a SpreadsheetML file (.xlsx), then the names
-        // for both CSV files will be identical and one CSV file will,
-        // therefore, over-write the other.
-        if (filesList != null) {
-            for(File excelFile : filesList) {
-                // Open the workbook
-                this.openWorkbook(excelFile);
-    
-                // Convert it's contents into a CSV file
-                this.convertToCSV();
-    
-                // Build the name of the csv folder from that of the Excel workbook.
-                // Simply replace the .xls or .xlsx file extension with .csv
-                destinationFilename = excelFile.getName();
-                destinationFilename = destinationFilename.substring(
-                        0, destinationFilename.lastIndexOf(".")) +
-                        ToCSV.CSV_FILE_EXTENSION;
-    
-                // Save the CSV file away using the newly constricted file name
-                // and to the specified directory.
-                this.saveCSVFile(new File(destination, destinationFilename));
-            }
-        }
-    }
-
-    /**
-     * Open an Excel workbook ready for conversion.
-     *
-     * @param file An instance of the File class that encapsulates a handle
-     *        to a valid Excel workbook. Note that the workbook can be in
-     *        either binary (.xls) or SpreadsheetML (.xlsx) format.
-     * @throws java.io.FileNotFoundException Thrown if the file cannot be located.
-     * @throws java.io.IOException Thrown if a problem occurs in the file system.
-     * @throws org.apache.poi.openxml4j.exceptions.InvalidFormatException Thrown
-     *         if invalid xml is found whilst parsing an input SpreadsheetML
-     *         file.
-     */
-    private void openWorkbook(File file) throws FileNotFoundException,
-                                           IOException, InvalidFormatException {
-        FileInputStream fis = null;
-        try {
-            System.out.println("Opening workbook [" + file.getName() + "]");
-
-            fis = new FileInputStream(file);
-
-            // Open the workbook and then create the FormulaEvaluator and
-            // DataFormatter instances that will be needed to, respectively,
-            // force evaluation of forumlae found in cells and create a
-            // formatted String encapsulating the cells contents.
-            this.workbook = WorkbookFactory.create(fis);
-            this.evaluator = this.workbook.getCreationHelper().createFormulaEvaluator();
-            this.formatter = new DataFormatter(true);
-        }
-        finally {
-            if(fis != null) {
-                fis.close();
-            }
-        }
-    }
-
-    /**
-     * Called to convert the contents of the currently opened workbook into
-     * a CSV file.
-     */
-    private void convertToCSV() {
-        Sheet sheet = null;
-        Row row = null;
-        int lastRowNum = 0;
-        this.csvData = new ArrayList<ArrayList<String>>();
-
-        System.out.println("Converting files contents to CSV format.");
-
-        // Discover how many sheets there are in the workbook....
-        int numSheets = this.workbook.getNumberOfSheets();
-
-        // and then iterate through them.
-        for(int i = 0; i < numSheets; i++) {
-
-            // Get a reference to a sheet and check to see if it contains
-            // any rows.
-            sheet = this.workbook.getSheetAt(i);
-            if(sheet.getPhysicalNumberOfRows() > 0) {
-
-                // Note down the index number of the bottom-most row and
-                // then iterate through all of the rows on the sheet starting
-                // from the very first row - number 1 - even if it is missing.
-                // Recover a reference to the row and then call another method
-                // which will strip the data from the cells and build lines
-                // for inclusion in the resylting CSV file.
-                lastRowNum = sheet.getLastRowNum();
-                for(int j = 0; j <= lastRowNum; j++) {
-                    row = sheet.getRow(j);
-                    this.rowToCSV(row);
-                }
-            }
-        }
-    }
-
-    /**
-     * Called to actually save the data recovered from the Excel workbook
-     * as a CSV file.
-     *
-     * @param file An instance of the File class that encapsulates a handle
-     *             referring to the CSV file.
-     * @throws java.io.FileNotFoundException Thrown if the file cannot be found.
-     * @throws java.io.IOException Thrown to indicate and error occurred in the
-     *                             underylying file system.
-     */
-    private void saveCSVFile(File file)
-                                     throws FileNotFoundException, IOException {
-        FileWriter fw = null;
-        BufferedWriter bw = null;
-        ArrayList<String> line = null;
-        StringBuffer buffer = null;
-        String csvLineElement = null;
-        try {
-
-            System.out.println("Saving the CSV file [" + file.getName() + "]");
-
-            // Open a writer onto the CSV file.
-            fw = new FileWriter(file);
-            bw = new BufferedWriter(fw);
-
-            // Step through the elements of the ArrayList that was used to hold
-            // all of the data recovered from the Excel workbooks' sheets, rows
-            // and cells.
-            for(int i = 0; i < this.csvData.size(); i++) {
-                buffer = new StringBuffer();
-
-                // Get an element from the ArrayList that contains the data for
-                // the workbook. This element will itself be an ArrayList
-                // containing Strings and each String will hold the data recovered
-                // from a single cell. The for() loop is used to recover elements
-                // from this 'row' ArrayList one at a time and to write the Strings
-                // away to a StringBuffer thus assembling a single line for inclusion
-                // in the CSV file. If a row was empty or if it was short, then
-                // the ArrayList that contains it's data will also be shorter than
-                // some of the others. Therefore, it is necessary to check within
-                // the for loop to ensure that the ArrayList contains data to be
-                // processed. If it does, then an element will be recovered and
-                // appended to the StringBuffer.
-                line = this.csvData.get(i);
-                for(int j = 0; j < this.maxRowWidth; j++) {
-                    if(line.size() > j) {
-                        csvLineElement = line.get(j);
-                        if(csvLineElement != null) {
-                            buffer.append(this.escapeEmbeddedCharacters(
-                                    csvLineElement));
-                        }
-                    }
-                    if(j < (this.maxRowWidth - 1)) {
-                        buffer.append(this.separator);
-                    }
-                }
-
-                // Once the line is built, write it away to the CSV file.
-                bw.write(buffer.toString().trim());
-
-                // Condition the inclusion of new line characters so as to
-                // avoid an additional, superfluous, new line at the end of
-                // the file.
-                if(i < (this.csvData.size() - 1)) {
-                    bw.newLine();
-                }
-            }
-        }
-        finally {
-            if(bw != null) {
-                bw.flush();
-                bw.close();
-            }
-        }
-    }
-
-    /**
-     * Called to convert a row of cells into a line of data that can later be
-     * output to the CSV file.
-     *
-     * @param row An instance of either the HSSFRow or XSSFRow classes that
-     *            encapsulates information about a row of cells recovered from
-     *            an Excel workbook.
-     */
-    private void rowToCSV(Row row) {
-        Cell cell = null;
-        int lastCellNum = 0;
-        ArrayList<String> csvLine = new ArrayList<String>();
-
-        // Check to ensure that a row was recovered from the sheet as it is
-        // possible that one or more rows between other populated rows could be
-        // missing - blank. If the row does contain cells then...
-        if(row != null) {
-
-            // Get the index for the right most cell on the row and then
-            // step along the row from left to right recovering the contents
-            // of each cell, converting that into a formatted String and
-            // then storing the String into the csvLine ArrayList.
-            lastCellNum = row.getLastCellNum();
-            for(int i = 0; i <= lastCellNum; i++) {
-                cell = row.getCell(i);
-                if(cell == null) {
-                    csvLine.add("");
-                }
-                else {
-                    if(cell.getCellTypeEnum() != CellType.FORMULA) {
-                        csvLine.add(this.formatter.formatCellValue(cell));
-                    }
-                    else {
-                        csvLine.add(this.formatter.formatCellValue(cell, this.evaluator));
-                    }
-                }
-            }
-            // Make a note of the index number of the right most cell. This value
-            // will later be used to ensure that the matrix of data in the CSV file
-            // is square.
-            if(lastCellNum > this.maxRowWidth) {
-                this.maxRowWidth = lastCellNum;
-            }
-        }
-        this.csvData.add(csvLine);
-    }
-
-    /**
-     * Checks to see whether the field - which consists of the formatted
-     * contents of an Excel worksheet cell encapsulated within a String - contains
-     * any embedded characters that must be escaped. The method is able to
-     * comply with either Excel's or UNIX formatting conventions in the
-     * following manner;
-     *
-     * With regard to UNIX conventions, if the field contains any embedded
-     * field separator or EOL characters they will each be escaped by prefixing
-     * a leading backspace character. These are the only changes that have yet
-     * emerged following some research as being required.
-     *
-     * Excel has other embedded character escaping requirements, some that emerged
-     * from empirical testing, other through research. Firstly, with regards to
-     * any embedded speech marks ("), each occurrence should be escaped with
-     * another speech mark and the whole field then surrounded with speech marks.
-     * Thus if a field holds <em>"Hello" he said</em> then it should be modified
-     * to appear as <em>"""Hello"" he said"</em>. Furthermore, if the field
-     * contains either embedded separator or EOL characters, it should also
-     * be surrounded with speech marks. As a result <em>1,400</em> would become
-     * <em>"1,400"</em> assuming that the comma is the required field separator.
-     * This has one consequence in, if a field contains embedded speech marks
-     * and embedded separator characters, checks for both are not required as the
-     * additional set of speech marks that should be placed around ay field
-     * containing embedded speech marks will also account for the embedded
-     * separator.
-     *
-     * It is worth making one further note with regard to embedded EOL
-     * characters. If the data in a worksheet is exported as a CSV file using
-     * Excel itself, then the field will be surounded with speech marks. If the
-     * resulting CSV file is then re-imports into another worksheet, the EOL
-     * character will result in the original simgle field occupying more than
-     * one cell. This same 'feature' is replicated in this classes behaviour.
-     *
-     * @param field An instance of the String class encapsulating the formatted
-     *        contents of a cell on an Excel worksheet.
-     * @return A String that encapsulates the formatted contents of that
-     *         Excel worksheet cell but with any embedded separator, EOL or
-     *         speech mark characters correctly escaped.
-     */
-    private String escapeEmbeddedCharacters(String field) {
-        StringBuffer buffer = null;
-
-        // If the fields contents should be formatted to confrom with Excel's
-        // convention....
-        if(this.formattingConvention == ToCSV.EXCEL_STYLE_ESCAPING) {
-
-            // Firstly, check if there are any speech marks (") in the field;
-            // each occurrence must be escaped with another set of spech marks
-            // and then the entire field should be enclosed within another
-            // set of speech marks. Thus, "Yes" he said would become
-            // """Yes"" he said"
-            if(field.contains("\"")) {
-                buffer = new StringBuffer(field.replaceAll("\"", "\\\"\\\""));
-                buffer.insert(0, "\"");
-                buffer.append("\"");
-            }
-            else {
-                // If the field contains either embedded separator or EOL
-                // characters, then escape the whole field by surrounding it
-                // with speech marks.
-                buffer = new StringBuffer(field);
-                if((buffer.indexOf(this.separator)) > -1 ||
-                         (buffer.indexOf("\n")) > -1) {
-                    buffer.insert(0, "\"");
-                    buffer.append("\"");
-                }
-            }
-            return(buffer.toString().trim());
-        }
-        // The only other formatting convention this class obeys is the UNIX one
-        // where any occurrence of the field separator or EOL character will
-        // be escaped by preceding it with a backslash.
-        else {
-            if(field.contains(this.separator)) {
-                field = field.replaceAll(this.separator, ("\\\\" + this.separator));
-            }
-            if(field.contains("\n")) {
-                field = field.replaceAll("\n", "\\\\\n");
-            }
-            return(field);
-        }
-    }
-
-    /**
-     * The main() method contains code that demonstrates how to use the class.
-     *
-     * @param args An array containing zero, one or more elements all of type
-     *        String. Each element will encapsulate an argument specified by the
-     *        user when running the program from the command prompt.
-     */
-    public static void main(String[] args) {
-        // Check the number of arguments passed to the main method. There
-        // must be two, three or four; the name of and path to either the folder
-        // containing the Excel files or an individual Excel workbook that is/are
-        // to be converted, the name of and path to the folder to which the CSV
-        // files should be written, - optionally - the separator character
-        // that should be used to separate individual items (fields) on the
-        // lines (records) of the CSV file and - again optionally - an integer
-        // that idicates whether the CSV file ought to obey Excel's or UNIX
-        // convnetions with regard to formatting fields that contain embedded
-        // separator, Speech mark or EOL character(s).
-        //
-        // Note that the names of the CSV files will be derived from those
-        // of the Excel file(s). Put simply the .xls or .xlsx extension will be
-        // replaced with .csv. Therefore, if the source folder contains files
-        // with matching names but different extensions - Test.xls and Test.xlsx
-        // for example - then the CSV file generated from one will overwrite
-        // that generated from the other.
-        ToCSV converter = null;
-        boolean converted = true;
-        long startTime = System.currentTimeMillis();
-        try {
-            converter = new ToCSV();
-            if(args.length == 2) {
-                // Just the Source File/Folder and Destination Folder were
-                // passed to the main method.
-                converter.convertExcelToCSV(args[0], args[1]);
-            }
-            else if(args.length == 3){
-                // The Source File/Folder, Destination Folder and Separator
-                // were passed to the main method.
-                converter.convertExcelToCSV(args[0], args[1], args[2]);
-            }
-            else if(args.length == 4) {
-                // The Source File/Folder, Destination Folder, Separator and
-                // Formatting Convnetion were passed to the main method.
-                converter.convertExcelToCSV(args[0], args[1],
-                                            args[2], Integer.parseInt(args[3]));
-            }
-            else {
-                // None or more than four parameters were passed so display
-                //a Usage message.
-                System.out.println("Usage: java ToCSV [Source File/Folder] " +
-                    "[Destination Folder] [Separator] [Formatting Convention]\n" +
-                    "\tSource File/Folder\tThis argument should contain the name of and\n" +
-                    "\t\t\t\tpath to either a single Excel workbook or a\n" +
-                    "\t\t\t\tfolder containing one or more Excel workbooks.\n" +
-                    "\tDestination Folder\tThe name of and path to the folder that the\n" +
-                    "\t\t\t\tCSV files should be written out into. The\n" +
-                    "\t\t\t\tfolder must exist before running the ToCSV\n" +
-                    "\t\t\t\tcode as it will not check for or create it.\n" +
-                    "\tSeparator\t\tOptional. The character or characters that\n" +
-                    "\t\t\t\tshould be used to separate fields in the CSV\n" +
-                    "\t\t\t\trecord. If no value is passed then the comma\n" +
-                    "\t\t\t\twill be assumed.\n" +
-                    "\tFormatting Convention\tOptional. This argument can take one of two\n" +
-                    "\t\t\t\tvalues. Passing 0 (zero) will result in a CSV\n" +
-                    "\t\t\t\tfile that obeys Excel's formatting conventions\n" +
-                    "\t\t\t\twhilst passing 1 (one) will result in a file\n" +
-                    "\t\t\t\tthat obeys UNIX formatting conventions. If no\n" +
-                    "\t\t\t\tvalue is passed, then the CSV file produced\n" +
-                    "\t\t\t\twill obey Excel's formatting conventions.");
-                converted = false;
-            }
-        }
-        // It is not wise to have such a wide catch clause - Exception is very
-        // close to being at the top of the inheritance hierarchy - though it
-        // will suffice for this example as it is really not possible to recover
-        // easilly from an exceptional set of circumstances at this point in the
-        // program. It should however, ideally be replaced with one or more
-        // catch clauses optimised to handle more specific problems.
-        catch(Exception ex) {
-            System.out.println("Caught an: " + ex.getClass().getName());
-            System.out.println("Message: " + ex.getMessage());
-            System.out.println("Stacktrace follows:.....");
-            ex.printStackTrace(System.out);
-            converted = false;
-        }
-        
-        if (converted) {
-            System.out.println("Conversion took " + 
-                  (int)((System.currentTimeMillis() - startTime)/1000) + " seconds");
-        }
-    }
-
-    /**
-     * An instance of this class can be used to control the files returned
-     * be a call to the listFiles() method when made on an instance of the
-     * File class and that object refers to a folder/directory
-     */
-    class ExcelFilenameFilter implements FilenameFilter {
-
-        /**
-         * Determine those files that will be returned by a call to the
-         * listFiles() method. In this case, the name of the file must end with
-         * either of the following two extension; '.xls' or '.xlsx'. For the
-         * future, it is very possible to parameterise this and allow the
-         * containing class to pass, for example, an array of Strings to this
-         * class on instantiation. Each element in that array could encapsulate
-         * a valid file extension - '.xls', '.xlsx', '.xlt', '.xlst', etc. These
-         * could then be used to control which files were returned by the call
-         * to the listFiles() method.
-         *
-         * @param file An instance of the File class that encapsulates a handle
-         *             referring to the folder/directory that contains the file.
-         * @param name An instance of the String class that encapsulates the
-         *             name of the file.
-         * @return A boolean value that indicates whether the file should be
-         *         included in the array retirned by the call to the listFiles()
-         *         method. In this case true will be returned if the name of the
-         *         file ends with either '.xls' or '.xlsx' and false will be
-         *         returned in all other instances.
-         */
-        @Override
-        public boolean accept(File file, String name) {
-            return(name.endsWith(".xls") || name.endsWith(".xlsx"));
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java b/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java
deleted file mode 100644
index 3d6b442..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.formula;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext ;
-import org.apache.poi.ss.formula.eval.ErrorEval ;
-import org.apache.poi.ss.formula.eval.EvaluationException ;
-import org.apache.poi.ss.formula.eval.NumberEval ;
-import org.apache.poi.ss.formula.eval.OperandResolver ;
-import org.apache.poi.ss.formula.eval.ValueEval ;
-import org.apache.poi.ss.formula.functions.FreeRefFunction ;
-
-/**
- * A simple user-defined function to calculate principal and interest.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public class CalculateMortgage implements FreeRefFunction {
-
-    @Override
-    public ValueEval evaluate( ValueEval[] args, OperationEvaluationContext ec ) {
-        
-        // verify that we have enough data
-        if (args.length != 3) {  
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        // declare doubles for values
-        double principal, rate, years,  result;
-        try {
-            // extract values as ValueEval
-            ValueEval v1 = OperandResolver.getSingleValue( args[0], 
-                                                           ec.getRowIndex(), 
-                                                           ec.getColumnIndex() ) ;
-            ValueEval v2 = OperandResolver.getSingleValue( args[1], 
-                                                           ec.getRowIndex(), 
-                                                           ec.getColumnIndex() ) ;
-            ValueEval v3 = OperandResolver.getSingleValue( args[2], 
-                                                           ec.getRowIndex(), 
-                                                           ec.getColumnIndex() ) ;
-
-            // get data as doubles
-            principal  = OperandResolver.coerceValueToDouble( v1 ) ; 
-            rate  = OperandResolver.coerceValueToDouble( v2 ) ;
-            years = OperandResolver.coerceValueToDouble( v3 ) ;
-            
-            result = calculateMortgagePayment( principal, rate, years ) ;
-            System.out.println( "Result = " + result ) ;
-
-            checkValue(result);
-            
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-
-        return new NumberEval( result ) ;
-    }
-    
-    public double calculateMortgagePayment( double p, double r, double y ) {
-        double i = r / 12 ;
-        double n = y * 12 ;
-        
-        double principalAndInterest = 
-             p * (( i * Math.pow((1 + i),n ) ) / ( Math.pow((1 + i),n) - 1))  ;
-        
-        return principalAndInterest ;
-    }
-    /**
-     * Excel does not support infinities and NaNs, rather, it gives a #NUM! error in these cases
-     *
-     * @throws EvaluationException (#NUM!) if <tt>result</tt> is <tt>NaN</> or <tt>Infinity</tt>
-     */
-     private void checkValue(double result) throws EvaluationException {
-         if (Double.isNaN(result) || Double.isInfinite(result)) {
-             throw new EvaluationException(ErrorEval.NUM_ERROR);
-         }
-     }    
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java b/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java
deleted file mode 100644
index cf6c176..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.formula;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.ss.formula.eval.NotImplementedFunctionException;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Attempts to re-evaluate all the formulas in the workbook, and
- *  reports what (if any) formula functions used are not (currently)
- *  supported by Apache POI.
- *
- * <p>This provides examples of how to evaluate formulas in excel
- *  files using Apache POI, along with how to handle errors whilst
- *  doing so.
- */
-public class CheckFunctionsSupported {
-    public static void main(String[] args) throws Exception {
-        if (args.length < 1) {
-            System.err.println("Use:");
-            System.err.println("  CheckFunctionsSupported <filename>");
-            return;
-        }
-        
-        Workbook wb = WorkbookFactory.create(new File(args[0]));
-        CheckFunctionsSupported check = new CheckFunctionsSupported(wb);
-        
-        // Fetch all the problems
-        List<FormulaEvaluationProblems> problems = new ArrayList<CheckFunctionsSupported.FormulaEvaluationProblems>();
-        for (int sn=0; sn<wb.getNumberOfSheets(); sn++) {
-            problems.add(check.getEvaluationProblems(sn));
-        }
-        
-        // Produce an overall summary
-        Set<String> unsupportedFunctions = new TreeSet<String>();
-        for (FormulaEvaluationProblems p : problems) {
-            unsupportedFunctions.addAll(p.unsupportedFunctions);
-        }
-        if (unsupportedFunctions.isEmpty()) {
-            System.out.println("There are no unsupported formula functions used");
-        } else {
-            System.out.println("Unsupported formula functions:");
-            for (String function : unsupportedFunctions) {
-                System.out.println("  " + function);
-            }
-            System.out.println("Total unsupported functions = " + unsupportedFunctions.size());
-        }
-        
-        // Report sheet by sheet
-        for (int sn=0; sn<wb.getNumberOfSheets(); sn++) {
-            String sheetName = wb.getSheetName(sn);
-            FormulaEvaluationProblems probs = problems.get(sn);
-            
-            System.out.println();
-            System.out.println("Sheet = " + sheetName);
-            
-            if (probs.unevaluatableCells.isEmpty()) {
-                System.out.println(" All cells evaluated without error");
-            } else {
-                for (CellReference cr : probs.unevaluatableCells.keySet()) {
-                    System.out.println(" " + cr.formatAsString() + " - " + 
-                                       probs.unevaluatableCells.get(cr).toString());
-                }
-            }
-        }
-    }
-    
-    private Workbook workbook;
-    private FormulaEvaluator evaluator;
-    public CheckFunctionsSupported(Workbook workbook) {
-        this.workbook = workbook;
-        this.evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-    }
-    
-    public Set<String> getUnsupportedFunctions(String sheetName) {
-        return getUnsupportedFunctions(workbook.getSheet(sheetName));
-    }
-    public Set<String> getUnsupportedFunctions(int sheetIndex) {
-        return getUnsupportedFunctions(workbook.getSheetAt(sheetIndex));
-    }
-    public Set<String> getUnsupportedFunctions(Sheet sheet) {
-        FormulaEvaluationProblems problems = getEvaluationProblems(sheet);
-        return problems.unsupportedFunctions;
-    }
-    
-    public FormulaEvaluationProblems getEvaluationProblems(String sheetName) {
-        return getEvaluationProblems(workbook.getSheet(sheetName));
-    }
-    public FormulaEvaluationProblems getEvaluationProblems(int sheetIndex) {
-        return getEvaluationProblems(workbook.getSheetAt(sheetIndex));
-    }
-    public FormulaEvaluationProblems getEvaluationProblems(Sheet sheet) {
-        Set<String> unsupportedFunctions = new HashSet<String>();
-        Map<CellReference,Exception> unevaluatableCells = new HashMap<CellReference, Exception>();
-        
-        for (Row r : sheet) {
-            for (Cell c : r) {
-                try {
-                    evaluator.evaluate(c);
-                } catch (Exception e) {
-                    if (e instanceof NotImplementedException && e.getCause() != null) {
-                        // Has been wrapped with cell details, but we know those
-                        e = (Exception)e.getCause();
-                    }
-                    
-                    if (e instanceof NotImplementedFunctionException) {
-                        NotImplementedFunctionException nie = (NotImplementedFunctionException)e;
-                        unsupportedFunctions.add(nie.getFunctionName());
-                    }
-                    unevaluatableCells.put(new CellReference(c), e);
-                }
-            }
-        }
-        
-        return new FormulaEvaluationProblems(unsupportedFunctions, unevaluatableCells);
-    }
-    
-    public static class FormulaEvaluationProblems {
-        /** Which used functions are unsupported by POI at this time */
-        public Set<String> unsupportedFunctions;
-        /** Which cells had unevaluatable formulas, and why? */
-        public Map<CellReference,Exception> unevaluatableCells;
-        
-        protected FormulaEvaluationProblems(Set<String> unsupportedFunctions,
-                             Map<CellReference, Exception> unevaluatableCells) {
-            this.unsupportedFunctions = Collections.unmodifiableSet(unsupportedFunctions);
-            this.unevaluatableCells = Collections.unmodifiableMap(unevaluatableCells);
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/SettingExternalFunction.java b/trunk/src/examples/src/org/apache/poi/ss/examples/formula/SettingExternalFunction.java
deleted file mode 100644
index bf4018f..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/SettingExternalFunction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.examples.formula;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Demonstrates how to use functions provided by third-party add-ins, e.g. Bloomberg Excel Add-in.
- *
- * There can be situations when you are not interested in formula evaluation,
- * you just need to set the formula  and the workbook will be evaluation by the client.
- *
- * @author Yegor Kozlov
- */
-public class SettingExternalFunction {
-
-    /**
-     * wrap external functions in a plugin
-     */
-    public static class BloombergAddIn implements UDFFinder {
-        private final Map<String, FreeRefFunction> _functionsByName;
-
-        public BloombergAddIn() {
-            // dummy function that returns NA
-            // don't care about the implementation, we are not interested in evaluation
-            // and this method will never be called
-            FreeRefFunction NA = new FreeRefFunction() {
-                @Override
-                public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-                    return ErrorEval.NA;
-                }
-            };
-            _functionsByName = new HashMap<String, FreeRefFunction>();
-            _functionsByName.put("BDP", NA);
-            _functionsByName.put("BDH", NA);
-            _functionsByName.put("BDS", NA);
-        }
-
-        @Override
-        public FreeRefFunction findFunction(String name) {
-            return _functionsByName.get(name.toUpperCase(Locale.ROOT));
-        }
-
-    }
-
-    public static void main( String[] args ) throws IOException {
-
-        Workbook wb = new XSSFWorkbook();  // or new HSSFWorkbook()
-
-        // register the add-in
-        wb.addToolPack(new BloombergAddIn());
-
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        row.createCell(0).setCellFormula("BDP(\"GOOG Equity\",\"CHG_PCT_YTD\")/100");
-        row.createCell(1).setCellFormula("BDH(\"goog us equity\",\"EBIT\",\"1/1/2005\",\"12/31/2009\",\"per=cy\",\"curr=USD\") ");
-        row.createCell(2).setCellFormula("BDS(\"goog us equity\",\"top_20_holders_public_filings\") ");
-
-        FileOutputStream out = new FileOutputStream("bloomberg-demo.xlsx");
-        wb.write(out);
-        out.close();
-
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/UserDefinedFunctionExample.java b/trunk/src/examples/src/org/apache/poi/ss/examples/formula/UserDefinedFunctionExample.java
deleted file mode 100644
index 74dca7d..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/UserDefinedFunctionExample.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.formula;
-
-import java.io.File ;
-import java.io.FileInputStream ;
-import java.io.FileNotFoundException ;
-import java.io.IOException ;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException ;
-import org.apache.poi.ss.formula.functions.FreeRefFunction ;
-import org.apache.poi.ss.formula.udf.DefaultUDFFinder ;
-import org.apache.poi.ss.formula.udf.UDFFinder ;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellReference ;
-
-
-/**
- * An example class of how to invoke a User Defined Function for a given
- * XLS instance using POI's UDFFinder implementation.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- * 
- */
-public class UserDefinedFunctionExample {
-
-    public static void main( String[] args ) {
-        
-        if(  args.length != 2 ) {
-            System.out.println( "usage: UserDefinedFunctionExample fileName cellId" ) ;
-            return;
-        }
-        
-        System.out.println( "fileName: " + args[0] ) ;
-        System.out.println( "cell: " + args[1] ) ;
-        
-        File workbookFile = new File( args[0] ) ;
-        
-        try {
-            FileInputStream fis = new FileInputStream(workbookFile);
-            Workbook workbook = WorkbookFactory.create(fis);
-            fis.close();
-
-            String[] functionNames = { "calculatePayment" } ;
-            FreeRefFunction[] functionImpls = { new CalculateMortgage() } ;
-            
-            UDFFinder udfToolpack = new DefaultUDFFinder( functionNames, functionImpls ) ;
-
-            // register the user-defined function in the workbook
-            workbook.addToolPack(udfToolpack);
-
-            FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-
-            CellReference cr = new CellReference( args[1] ) ;
-            String sheetName = cr.getSheetName() ;
-            Sheet sheet = workbook.getSheet( sheetName ) ;
-            int rowIdx = cr.getRow() ;
-            int colIdx = cr.getCol() ;
-            Row row = sheet.getRow( rowIdx ) ;
-            Cell cell = row.getCell( colIdx ) ;
-            
-            CellValue value = evaluator.evaluate( cell ) ;
-            
-            System.out.println("returns value: " +  value ) ;
-
-        } catch( FileNotFoundException e ) {
-            e.printStackTrace();
-        } catch( InvalidFormatException e ) {
-            e.printStackTrace();
-        } catch( IOException e ) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/mortgage-calculation.xls b/trunk/src/examples/src/org/apache/poi/ss/examples/formula/mortgage-calculation.xls
deleted file mode 100644
index 4e71ba8..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/formula/mortgage-calculation.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/html/HSSFHtmlHelper.java b/trunk/src/examples/src/org/apache/poi/ss/examples/html/HSSFHtmlHelper.java
deleted file mode 100644
index 677a38a..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/html/HSSFHtmlHelper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.html;
-
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFPalette;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.CellStyle;
-
-import java.util.Formatter;
-
-/**
- * Implementation of {@link HtmlHelper} for HSSF files.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class HSSFHtmlHelper implements HtmlHelper {
-    private final HSSFWorkbook wb;
-    private final HSSFPalette colors;
-
-    private static final HSSFColor HSSF_AUTO = new HSSFColor.AUTOMATIC();
-
-    public HSSFHtmlHelper(HSSFWorkbook wb) {
-        this.wb = wb;
-        // If there is no custom palette, then this creates a new one that is
-        // a copy of the default
-        colors = wb.getCustomPalette();
-    }
-
-    @Override
-    public void colorStyles(CellStyle style, Formatter out) {
-        HSSFCellStyle cs = (HSSFCellStyle) style;
-        out.format("  /* fill pattern = %d */%n", cs.getFillPattern());
-        styleColor(out, "background-color", cs.getFillForegroundColor());
-        styleColor(out, "color", cs.getFont(wb).getColor());
-        styleColor(out, "border-left-color", cs.getLeftBorderColor());
-        styleColor(out, "border-right-color", cs.getRightBorderColor());
-        styleColor(out, "border-top-color", cs.getTopBorderColor());
-        styleColor(out, "border-bottom-color", cs.getBottomBorderColor());
-    }
-
-    private void styleColor(Formatter out, String attr, short index) {
-        HSSFColor color = colors.getColor(index);
-        if (index == HSSF_AUTO.getIndex() || color == null) {
-            out.format("  /* %s: index = %d */%n", attr, index);
-        } else {
-            short[] rgb = color.getTriplet();
-            out.format("  %s: #%02x%02x%02x; /* index = %d */%n", attr, rgb[0],
-                    rgb[1], rgb[2], index);
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/html/HtmlHelper.java b/trunk/src/examples/src/org/apache/poi/ss/examples/html/HtmlHelper.java
deleted file mode 100644
index 2cb1a91..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/html/HtmlHelper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.examples.html;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-
-import java.util.Formatter;
-
-/**
- * This interface is used where code wants to be independent of the workbook
- * formats.  If you are writing such code, you can add a method to this
- * interface, and then implement it for both HSSF and XSSF workbooks, letting
- * the driving code stay independent of format.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public interface HtmlHelper {
-    /**
-     * Outputs the appropriate CSS style for the given cell style.
-     *
-     * @param style The cell style.
-     * @param out   The place to write the output.
-     */
-    void colorStyles(CellStyle style, Formatter out);
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java b/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
deleted file mode 100644
index f5d2ecb..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.html;
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.util.Formatter;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.format.CellFormat;
-import org.apache.poi.ss.format.CellFormatResult;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * This example shows how to display a spreadsheet in HTML using the classes for
- * spreadsheet display.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class ToHtml {
-    private final Workbook wb;
-    private final Appendable output;
-    private boolean completeHTML;
-    private Formatter out;
-    private boolean gotBounds;
-    private int firstColumn;
-    private int endColumn;
-    private HtmlHelper helper;
-
-    private static final String DEFAULTS_CLASS = "excelDefaults";
-    private static final String COL_HEAD_CLASS = "colHeader";
-    private static final String ROW_HEAD_CLASS = "rowHeader";
-
-    private static final Map<HorizontalAlignment, String> HALIGN = mapFor(
-            HorizontalAlignment.LEFT, "left",
-            HorizontalAlignment.CENTER, "center",
-            HorizontalAlignment.RIGHT, "right",
-            HorizontalAlignment.FILL, "left",
-            HorizontalAlignment.JUSTIFY, "left",
-            HorizontalAlignment.CENTER_SELECTION, "center");
-
-    private static final Map<VerticalAlignment, String> VALIGN = mapFor(
-            VerticalAlignment.BOTTOM, "bottom",
-            VerticalAlignment.CENTER, "middle",
-            VerticalAlignment.TOP, "top");
-
-    private static final Map<BorderStyle, String> BORDER = mapFor(
-            BorderStyle.DASH_DOT, "dashed 1pt",
-            BorderStyle.DASH_DOT_DOT, "dashed 1pt",
-            BorderStyle.DASHED, "dashed 1pt",
-            BorderStyle.DOTTED, "dotted 1pt",
-            BorderStyle.DOUBLE, "double 3pt",
-            BorderStyle.HAIR, "solid 1px",
-            BorderStyle.MEDIUM, "solid 2pt",
-            BorderStyle.MEDIUM_DASH_DOT, "dashed 2pt",
-            BorderStyle.MEDIUM_DASH_DOT_DOT, "dashed 2pt",
-            BorderStyle.MEDIUM_DASHED, "dashed 2pt",
-            BorderStyle.NONE, "none",
-            BorderStyle.SLANTED_DASH_DOT, "dashed 2pt",
-            BorderStyle.THICK, "solid 3pt",
-            BorderStyle.THIN, "dashed 1pt");
-
-    @SuppressWarnings({"unchecked"})
-    private static <K, V> Map<K, V> mapFor(Object... mapping) {
-        Map<K, V> map = new HashMap<K, V>();
-        for (int i = 0; i < mapping.length; i += 2) {
-            map.put((K) mapping[i], (V) mapping[i + 1]);
-        }
-        return map;
-    }
-
-    /**
-     * Creates a new converter to HTML for the given workbook.
-     *
-     * @param wb     The workbook.
-     * @param output Where the HTML output will be written.
-     *
-     * @return An object for converting the workbook to HTML.
-     */
-    public static ToHtml create(Workbook wb, Appendable output) {
-        return new ToHtml(wb, output);
-    }
-
-    /**
-     * Creates a new converter to HTML for the given workbook.  If the path ends
-     * with "<tt>.xlsx</tt>" an {@link XSSFWorkbook} will be used; otherwise
-     * this will use an {@link HSSFWorkbook}.
-     *
-     * @param path   The file that has the workbook.
-     * @param output Where the HTML output will be written.
-     *
-     * @return An object for converting the workbook to HTML.
-     */
-    public static ToHtml create(String path, Appendable output)
-            throws IOException {
-        return create(new FileInputStream(path), output);
-    }
-
-    /**
-     * Creates a new converter to HTML for the given workbook.  This attempts to
-     * detect whether the input is XML (so it should create an {@link
-     * XSSFWorkbook} or not (so it should create an {@link HSSFWorkbook}).
-     *
-     * @param in     The input stream that has the workbook.
-     * @param output Where the HTML output will be written.
-     *
-     * @return An object for converting the workbook to HTML.
-     */
-    public static ToHtml create(InputStream in, Appendable output)
-            throws IOException {
-        try {
-            Workbook wb = WorkbookFactory.create(in);
-            return create(wb, output);
-        } catch (InvalidFormatException e){
-            throw new IllegalArgumentException("Cannot create workbook from stream", e);
-        }
-    }
-
-    private ToHtml(Workbook wb, Appendable output) {
-        if (wb == null)
-            throw new NullPointerException("wb");
-        if (output == null)
-            throw new NullPointerException("output");
-        this.wb = wb;
-        this.output = output;
-        setupColorMap();
-    }
-
-    private void setupColorMap() {
-        if (wb instanceof HSSFWorkbook)
-            helper = new HSSFHtmlHelper((HSSFWorkbook) wb);
-        else if (wb instanceof XSSFWorkbook)
-            helper = new XSSFHtmlHelper();
-        else
-            throw new IllegalArgumentException(
-                    "unknown workbook type: " + wb.getClass().getSimpleName());
-    }
-
-    /**
-     * Run this class as a program
-     *
-     * @param args The command line arguments.
-     *
-     * @throws Exception Exception we don't recover from.
-     */
-    public static void main(String[] args) throws Exception {
-        if(args.length < 2){
-            System.err.println("usage: ToHtml inputWorkbook outputHtmlFile");
-            return;
-        }
-
-        ToHtml toHtml = create(args[0], new PrintWriter(new FileWriter(args[1])));
-        toHtml.setCompleteHTML(true);
-        toHtml.printPage();
-    }
-
-    public void setCompleteHTML(boolean completeHTML) {
-        this.completeHTML = completeHTML;
-    }
-
-    public void printPage() throws IOException {
-        try {
-            ensureOut();
-            if (completeHTML) {
-                out.format(
-                        "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>%n");
-                out.format("<html>%n");
-                out.format("<head>%n");
-                out.format("</head>%n");
-                out.format("<body>%n");
-            }
-
-            print();
-
-            if (completeHTML) {
-                out.format("</body>%n");
-                out.format("</html>%n");
-            }
-        } finally {
-            if (out != null)
-                out.close();
-            if (output instanceof Closeable) {
-                Closeable closeable = (Closeable) output;
-                closeable.close();
-            }
-        }
-    }
-
-    public void print() {
-        printInlineStyle();
-        printSheets();
-    }
-
-    private void printInlineStyle() {
-        //out.format("<link href=\"excelStyle.css\" rel=\"stylesheet\" type=\"text/css\">%n");
-        out.format("<style type=\"text/css\">%n");
-        printStyles();
-        out.format("</style>%n");
-    }
-
-    private void ensureOut() {
-        if (out == null)
-            out = new Formatter(output);
-    }
-
-    public void printStyles() {
-        ensureOut();
-
-        // First, copy the base css
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new InputStreamReader(
-                    getClass().getResourceAsStream("excelStyle.css")));
-            String line;
-            while ((line = in.readLine()) != null) {
-                out.format("%s%n", line);
-            }
-        } catch (IOException e) {
-            throw new IllegalStateException("Reading standard css", e);
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    //noinspection ThrowFromFinallyBlock
-                    throw new IllegalStateException("Reading standard css", e);
-                }
-            }
-        }
-
-        // now add css for each used style
-        Set<CellStyle> seen = new HashSet<CellStyle>();
-        for (int i = 0; i < wb.getNumberOfSheets(); i++) {
-            Sheet sheet = wb.getSheetAt(i);
-            Iterator<Row> rows = sheet.rowIterator();
-            while (rows.hasNext()) {
-                Row row = rows.next();
-                for (Cell cell : row) {
-                    CellStyle style = cell.getCellStyle();
-                    if (!seen.contains(style)) {
-                        printStyle(style);
-                        seen.add(style);
-                    }
-                }
-            }
-        }
-    }
-
-    private void printStyle(CellStyle style) {
-        out.format(".%s .%s {%n", DEFAULTS_CLASS, styleName(style));
-        styleContents(style);
-        out.format("}%n");
-    }
-
-    private void styleContents(CellStyle style) {
-        styleOut("text-align", style.getAlignmentEnum(), HALIGN);
-        styleOut("vertical-align", style.getVerticalAlignmentEnum(), VALIGN);
-        fontStyle(style);
-        borderStyles(style);
-        helper.colorStyles(style, out);
-    }
-
-    private void borderStyles(CellStyle style) {
-        styleOut("border-left", style.getBorderLeftEnum(), BORDER);
-        styleOut("border-right", style.getBorderRightEnum(), BORDER);
-        styleOut("border-top", style.getBorderTopEnum(), BORDER);
-        styleOut("border-bottom", style.getBorderBottomEnum(), BORDER);
-    }
-
-    private void fontStyle(CellStyle style) {
-        Font font = wb.getFontAt(style.getFontIndex());
-
-        if (font.getBold())
-            out.format("  font-weight: bold;%n");
-        if (font.getItalic())
-            out.format("  font-style: italic;%n");
-
-        int fontheight = font.getFontHeightInPoints();
-        if (fontheight == 9) {
-            //fix for stupid ol Windows
-            fontheight = 10;
-        }
-        out.format("  font-size: %dpt;%n", fontheight);
-
-        // Font color is handled with the other colors
-    }
-
-    private String styleName(CellStyle style) {
-        if (style == null)
-            style = wb.getCellStyleAt((short) 0);
-        StringBuilder sb = new StringBuilder();
-        Formatter fmt = new Formatter(sb);
-        try {
-            fmt.format("style_%02x", style.getIndex());
-            return fmt.toString();
-        } finally {
-            fmt.close();
-        }
-    }
-
-    private <K> void styleOut(String attr, K key, Map<K, String> mapping) {
-        String value = mapping.get(key);
-        if (value != null) {
-            out.format("  %s: %s;%n", attr, value);
-        }
-    }
-
-    private static CellType ultimateCellType(Cell c) {
-        CellType type = c.getCellTypeEnum();
-        if (type == CellType.FORMULA)
-            type = c.getCachedFormulaResultTypeEnum();
-        return type;
-    }
-
-    private void printSheets() {
-        ensureOut();
-        Sheet sheet = wb.getSheetAt(0);
-        printSheet(sheet);
-    }
-
-    public void printSheet(Sheet sheet) {
-        ensureOut();
-        out.format("<table class=%s>%n", DEFAULTS_CLASS);
-        printCols(sheet);
-        printSheetContent(sheet);
-        out.format("</table>%n");
-    }
-
-    private void printCols(Sheet sheet) {
-        out.format("<col/>%n");
-        ensureColumnBounds(sheet);
-        for (int i = firstColumn; i < endColumn; i++) {
-            out.format("<col/>%n");
-        }
-    }
-
-    private void ensureColumnBounds(Sheet sheet) {
-        if (gotBounds)
-            return;
-
-        Iterator<Row> iter = sheet.rowIterator();
-        firstColumn = (iter.hasNext() ? Integer.MAX_VALUE : 0);
-        endColumn = 0;
-        while (iter.hasNext()) {
-            Row row = iter.next();
-            short firstCell = row.getFirstCellNum();
-            if (firstCell >= 0) {
-                firstColumn = Math.min(firstColumn, firstCell);
-                endColumn = Math.max(endColumn, row.getLastCellNum());
-            }
-        }
-        gotBounds = true;
-    }
-
-    private void printColumnHeads() {
-        out.format("<thead>%n");
-        out.format("  <tr class=%s>%n", COL_HEAD_CLASS);
-        out.format("    <th class=%s>&#x25CA;</th>%n", COL_HEAD_CLASS);
-        //noinspection UnusedDeclaration
-        StringBuilder colName = new StringBuilder();
-        for (int i = firstColumn; i < endColumn; i++) {
-            colName.setLength(0);
-            int cnum = i;
-            do {
-                colName.insert(0, (char) ('A' + cnum % 26));
-                cnum /= 26;
-            } while (cnum > 0);
-            out.format("    <th class=%s>%s</th>%n", COL_HEAD_CLASS, colName);
-        }
-        out.format("  </tr>%n");
-        out.format("</thead>%n");
-    }
-
-    private void printSheetContent(Sheet sheet) {
-        printColumnHeads();
-
-        out.format("<tbody>%n");
-        Iterator<Row> rows = sheet.rowIterator();
-        while (rows.hasNext()) {
-            Row row = rows.next();
-
-            out.format("  <tr>%n");
-            out.format("    <td class=%s>%d</td>%n", ROW_HEAD_CLASS,
-                    row.getRowNum() + 1);
-            for (int i = firstColumn; i < endColumn; i++) {
-                String content = "&nbsp;";
-                String attrs = "";
-                CellStyle style = null;
-                if (i >= row.getFirstCellNum() && i < row.getLastCellNum()) {
-                    Cell cell = row.getCell(i);
-                    if (cell != null) {
-                        style = cell.getCellStyle();
-                        attrs = tagStyle(cell, style);
-                        //Set the value that is rendered for the cell
-                        //also applies the format
-                        CellFormat cf = CellFormat.getInstance(
-                                style.getDataFormatString());
-                        CellFormatResult result = cf.apply(cell);
-                        content = result.text;
-                        if (content.equals(""))
-                            content = "&nbsp;";
-                    }
-                }
-                out.format("    <td class=%s %s>%s</td>%n", styleName(style),
-                        attrs, content);
-            }
-            out.format("  </tr>%n");
-        }
-        out.format("</tbody>%n");
-    }
-
-    private String tagStyle(Cell cell, CellStyle style) {
-        if (style.getAlignmentEnum() == HorizontalAlignment.GENERAL) {
-            switch (ultimateCellType(cell)) {
-            case STRING:
-                return "style=\"text-align: left;\"";
-            case BOOLEAN:
-            case ERROR:
-                return "style=\"text-align: center;\"";
-            case NUMERIC:
-            default:
-                // "right" is the default
-                break;
-            }
-        }
-        return "";
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/html/XSSFHtmlHelper.java b/trunk/src/examples/src/org/apache/poi/ss/examples/html/XSSFHtmlHelper.java
deleted file mode 100644
index 20a30ed..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/html/XSSFHtmlHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.html;
-
-import java.util.Formatter;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-
-/**
- * Implementation of {@link HtmlHelper} for XSSF files.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class XSSFHtmlHelper implements HtmlHelper {
-    @Override
-    public void colorStyles(CellStyle style, Formatter out) {
-        XSSFCellStyle cs = (XSSFCellStyle) style;
-        styleColor(out, "background-color", cs.getFillForegroundXSSFColor());
-        styleColor(out, "text-color", cs.getFont().getXSSFColor());
-    }
-
-    private void styleColor(Formatter out, String attr, XSSFColor color) {
-        if (color == null || color.isAuto()) {
-            return;
-        }
-
-        byte[] rgb = color.getRGB();
-        if (rgb == null) {
-            return;
-        }
-
-        // This is done twice -- rgba is new with CSS 3, and browser that don't
-        // support it will ignore the rgba specification and stick with the
-        // solid color, which is declared first
-        out.format("  %s: #%02x%02x%02x;%n", attr, rgb[0], rgb[1], rgb[2]);
-        byte[] argb = color.getARGB();
-        if (argb == null) {
-            return;
-        }
-        out.format("  %s: rgba(0x%02x, 0x%02x, 0x%02x, 0x%02x);%n", attr,
-                argb[3], argb[0], argb[1], argb[2]);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/html/excelStyle.css b/trunk/src/examples/src/org/apache/poi/ss/examples/html/excelStyle.css
deleted file mode 100644
index 1083b63..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/html/excelStyle.css
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
- */
-/*
- * This is the default style sheet for html generated by ToHtml
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-.excelDefaults {
-	background-color: white;
-	color: black;
-	text-decoration: none;
-	direction: ltr;
-	text-transform: none;
-	text-indent: 0;
-	letter-spacing: 0;
-	word-spacing: 0;
-	white-space: normal;
-	unicode-bidi: normal;
-	vertical-align: 0;
-	background-image: none;
-	text-shadow: none;
-	list-style-image: none;
-	list-style-type: none;
-	padding: 0;
-	margin: 0;
-	border-collapse: collapse;
-	white-space: pre;
-	vertical-align: bottom;
-	font-style: normal;
-	font-family: sans-serif;
-	font-variant: normal;
-	font-weight: normal;
-	font-size: 10pt;
-	text-align: right;
-}
-
-.excelDefaults td {
-	padding: 1px 5px;
-	border: 1px solid silver;
-}
-
-.excelDefaults .colHeader {
-	background-color: silver;
-	font-weight: bold;
-	border: 1px solid black;
-	text-align: center;
-	padding: 1px 5px;
-}
-
-.excelDefaults .rowHeader {
-	background-color: silver;
-	font-weight: bold;
-	border: 1px solid black;
-	text-align: right;
-	padding: 1px 5px;
-}
diff --git a/trunk/src/examples/src/org/apache/poi/ss/examples/html/package.html b/trunk/src/examples/src/org/apache/poi/ss/examples/html/package.html
deleted file mode 100644
index 1c8e6af..0000000
--- a/trunk/src/examples/src/org/apache/poi/ss/examples/html/package.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body>
-This package contains an example that uses POI to convert a workbook into
-an HTML representation of the data.  It can use both XSSF and HSSF workbooks.
-</body>
-</html>
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/AddVideoToPptx.java.txt b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/AddVideoToPptx.java.txt
deleted file mode 100644
index 2d32c4d..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/AddVideoToPptx.java.txt
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Rectangle;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.text.DecimalFormat;
-
-import javax.imageio.ImageIO;
-import javax.xml.namespace.QName;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.xmlbeans.XmlCursor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTHyperlink;
-import org.openxmlformats.schemas.officeDocument.x2006.relationships.STRelationshipId;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTExtension;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlide;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTTLCommonMediaNodeData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTTLCommonTimeNodeData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTTimeNodeList;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeIndefinite;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeFillType;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeRestartType;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeType;
-
-import com.xuggle.mediatool.IMediaReader;
-import com.xuggle.mediatool.MediaListenerAdapter;
-import com.xuggle.mediatool.ToolFactory;
-import com.xuggle.mediatool.event.IVideoPictureEvent;
-import com.xuggle.xuggler.Global;
-import com.xuggle.xuggler.IContainer;
-import com.xuggle.xuggler.io.InputOutputStreamHandler;
-
-/**
- * Adding multiple videos to a slide
- * 
- * need the Xuggler 5.4 jars:
- *  &lt;repositories&gt;
- *  &lt;repository&gt;
- *  &lt;id&gt;xuggle repo&lt;/id&gt;
- *  &lt;url&gt;http://xuggle.googlecode.com/svn/trunk/repo/share/java/&lt;/url&gt;
- *  &lt;/repository&gt;
- *  &lt;/repositories&gt;
- *  ...
- *  &lt;dependency&gt;
- *  &lt;groupId&gt;xuggle&lt;/groupId&gt;
- *  &lt;artifactId&gt;xuggle-xuggler&lt;/artifactId&gt;
- *  &lt;version&gt;5.4&lt;/version&gt;
- *  &lt;/dependency&gt;
- * 
- * @see <a href="http://stackoverflow.com/questions/15197300/apache-poi-xslf-adding-movie-to-the-slide">Apache POI XSLF Adding movie to the slide</a>
- * @see <a href="http://apache-poi.1045710.n5.nabble.com/Question-about-embedded-video-in-PPTX-files-tt5718461.html">Question about embedded video in PPTX files</a>
- */
-public class AddVideoToPptx {
-    static DecimalFormat df_time = new DecimalFormat("0.####");
-
-    public static void main(String[] args) throws Exception {
-        URL video = new URL("http://archive.org/download/test-mpeg/test-mpeg.mpg");
-        // URL video = new URL("file:test-mpeg.mpg");
-
-        XMLSlideShow pptx = new XMLSlideShow();
-
-        // add video file
-        String videoFileName = video.getPath().substring(video.getPath().lastIndexOf('/')+1);
-        PackagePartName partName = PackagingURIHelper.createPartName("/ppt/media/"+videoFileName);
-        PackagePart part = pptx.getPackage().createPart(partName, "video/mpeg");
-        OutputStream partOs = part.getOutputStream();
-        InputStream fis = video.openStream();
-        byte buf[] = new byte[1024];
-        for (int readBytes; (readBytes = fis.read(buf)) != -1; partOs.write(buf, 0, readBytes));
-        fis.close();
-        partOs.close();
-
-        XSLFSlide slide1 = pptx.createSlide();
-        XSLFPictureShape pv1 = addPreview(pptx, slide1, part, 5, 50, 50);
-        addVideo(pptx, slide1, part, pv1, 5);
-        addTimingInfo(slide1, pv1);
-        XSLFPictureShape pv2 = addPreview(pptx, slide1, part, 9, 50, 250);
-        addVideo(pptx, slide1, part, pv2, 9);
-        addTimingInfo(slide1, pv2);
-
-        FileOutputStream fos = new FileOutputStream("pptx-with-video.pptx");
-        pptx.write(fos);
-        fos.close();
-        
-        pptx.close();
-    }
-
-    static XSLFPictureShape addPreview(XMLSlideShow pptx, XSLFSlide slide1, PackagePart videoPart, double seconds, int x, int y) throws IOException {
-        // get preview after 5 sec.
-        IContainer ic = IContainer.make();
-        InputOutputStreamHandler iosh = new InputOutputStreamHandler(videoPart.getInputStream());
-        if (ic.open(iosh, IContainer.Type.READ, null) < 0) return null;
-
-        IMediaReader mediaReader = ToolFactory.makeReader(ic);
-
-        // stipulate that we want BufferedImages created in BGR 24bit color space
-        mediaReader.setBufferedImageTypeToGenerate(BufferedImage.TYPE_3BYTE_BGR);
-
-        ImageSnapListener isl = new ImageSnapListener(seconds);
-        mediaReader.addListener(isl);
-
-        // read out the contents of the media file and
-        // dispatch events to the attached listener
-        while (!isl.hasFired && mediaReader.readPacket() == null) ;
-
-        mediaReader.close();
-        ic.close();
-
-        // add snapshot
-        BufferedImage image1 = isl.image;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ImageIO.write(image1, "jpeg", bos);
-        XSLFPictureData snap = pptx.addPicture(bos.toByteArray(), PictureType.JPEG);
-        XSLFPictureShape pic1 = slide1.createPicture(snap);
-        pic1.setAnchor(new Rectangle(x, y, image1.getWidth(), image1.getHeight()));
-        return pic1;
-    }
-
-    static void addVideo(XMLSlideShow pptx, XSLFSlide slide1, PackagePart videoPart, XSLFPictureShape pic1, double seconds) throws IOException {
-
-        // add video shape
-        PackagePartName partName = videoPart.getPartName();
-        PackageRelationship prsEmbed1 = slide1.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, "http://schemas.microsoft.com/office/2007/relationships/media");
-        PackageRelationship prsExec1 = slide1.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video");
-        CTPicture xpic1 = (CTPicture)pic1.getXmlObject();
-        CTHyperlink link1 = xpic1.getNvPicPr().getCNvPr().addNewHlinkClick();
-        link1.setId("");
-        link1.setAction("ppaction://media");
-
-        // add video relation
-        CTApplicationNonVisualDrawingProps nvPr = xpic1.getNvPicPr().getNvPr();
-        nvPr.addNewVideoFile().setLink(prsExec1.getId());
-        CTExtension ext = nvPr.addNewExtLst().addNewExt();
-        // see http://msdn.microsoft.com/en-us/library/dd950140(v=office.12).aspx
-        ext.setUri("{DAA4B4D4-6D71-4841-9C94-3DE7FCFB9230}");
-        String p14Ns = "http://schemas.microsoft.com/office/powerpoint/2010/main";
-        XmlCursor cur = ext.newCursor();
-        cur.toEndToken();
-        cur.beginElement(new QName(p14Ns, "media", "p14"));
-        cur.insertNamespace("p14", p14Ns);
-        cur.insertAttributeWithValue(new QName(STRelationshipId.type.getName().getNamespaceURI(), "embed"), prsEmbed1.getId());
-        cur.beginElement(new QName(p14Ns, "trim", "p14"));
-        cur.insertAttributeWithValue("st", df_time.format(seconds*1000.0));
-        cur.dispose();
-
-    }
-
-    static void addTimingInfo(XSLFSlide slide1, XSLFPictureShape pic1) {
-        // add slide timing information, so video can be controlled
-        CTSlide xslide = slide1.getXmlObject();
-        CTTimeNodeList ctnl;
-        if (!xslide.isSetTiming()) {
-            CTTLCommonTimeNodeData ctn = xslide.addNewTiming().addNewTnLst().addNewPar().addNewCTn();
-            ctn.setDur(STTLTimeIndefinite.INDEFINITE);
-            ctn.setRestart(STTLTimeNodeRestartType.NEVER);
-            ctn.setNodeType(STTLTimeNodeType.TM_ROOT);
-            ctnl = ctn.addNewChildTnLst();
-        } else {
-            ctnl = xslide.getTiming().getTnLst().getParArray(0).getCTn().getChildTnLst();
-        }
-
-        CTTLCommonMediaNodeData cmedia = ctnl.addNewVideo().addNewCMediaNode();
-        cmedia.setVol(80000);
-        CTTLCommonTimeNodeData ctn = cmedia.addNewCTn();
-        ctn.setFill(STTLTimeNodeFillType.HOLD);
-        ctn.setDisplay(false);
-        ctn.addNewStCondLst().addNewCond().setDelay(STTLTimeIndefinite.INDEFINITE);
-        cmedia.addNewTgtEl().addNewSpTgt().setSpid(""+pic1.getShapeId());
-    }
-
-
-    static class ImageSnapListener extends MediaListenerAdapter {
-        final double SECONDS_BETWEEN_FRAMES;
-        final long MICRO_SECONDS_BETWEEN_FRAMES;
-        boolean hasFired = false;
-        BufferedImage image = null;
-
-        // The video stream index, used to ensure we display frames from one and
-        // only one video stream from the media container.
-        int mVideoStreamIndex = -1;
-
-        // Time of last frame write
-        long mLastPtsWrite = Global.NO_PTS;
-
-        public ImageSnapListener(double seconds) {
-            SECONDS_BETWEEN_FRAMES = seconds;
-            MICRO_SECONDS_BETWEEN_FRAMES =
-                    (long)(Global.DEFAULT_PTS_PER_SECOND * SECONDS_BETWEEN_FRAMES);
-        }
-
-
-        @Override
-        public void onVideoPicture(IVideoPictureEvent event) {
-
-            if (event.getStreamIndex() != mVideoStreamIndex) {
-                // if the selected video stream id is not yet set, go ahead an
-                // select this lucky video stream
-                if (mVideoStreamIndex != -1) return;
-                mVideoStreamIndex = event.getStreamIndex();
-            }
-
-            long evtTS = event.getTimeStamp();
-
-            // if uninitialized, back date mLastPtsWrite to get the very first frame
-            if (mLastPtsWrite == Global.NO_PTS)
-                mLastPtsWrite = Math.max(0, evtTS - MICRO_SECONDS_BETWEEN_FRAMES);
-
-            // if it's time to write the next frame
-            if (evtTS - mLastPtsWrite >= MICRO_SECONDS_BETWEEN_FRAMES) {
-                if (!hasFired) {
-                    image = event.getImage();
-                    hasFired = true;
-                }
-                // update last write time
-                mLastPtsWrite += MICRO_SECONDS_BETWEEN_FRAMES;
-            }
-        }
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
deleted file mode 100644
index 3358406..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Dimension;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-
-/**
- * Demonstrates how you can extract data from a .pptx file
- */
-public final class DataExtraction {
-
-    public static void main(String args[]) throws IOException, OpenXML4JException {
-
-        PrintStream out = System.out;
-
-        if (args.length == 0) {
-           out.println("Input file is required");
-           return;
-        }
-        
-        FileInputStream is = new FileInputStream(args[0]);
-        XMLSlideShow ppt = new XMLSlideShow(is);
-        is.close();
-
-        // Get the document's embedded files.
-        for (PackagePart p : ppt.getAllEmbedds()) {
-            String type = p.getContentType();
-            // typically file name
-            String name = p.getPartName().getName();  
-            out.println("Embedded file ("+type+"): "+name);
-            
-            InputStream pIs = p.getInputStream();
-            // make sense of the part data
-            pIs.close();
-            
-        }
-
-        // Get the document's embedded files.
-        for (XSLFPictureData data : ppt.getPictureData()) {
-            String type = data.getContentType();
-            String name = data.getFileName();
-            out.println("Picture ("+type+"): "+name);
-
-            InputStream pIs = data.getInputStream();
-            // make sense of the image data
-            pIs.close();
-        }
-
-        // size of the canvas in points
-        Dimension pageSize = ppt.getPageSize();
-        out.println("Pagesize: "+pageSize);
-        
-        for(XSLFSlide slide : ppt.getSlides()) {
-            for(XSLFShape shape : slide){
-                if(shape instanceof XSLFTextShape) {
-                    XSLFTextShape txShape = (XSLFTextShape)shape;
-                    out.println(txShape.getText());
-                } else if (shape instanceof XSLFPictureShape){
-                    XSLFPictureShape pShape = (XSLFPictureShape)shape;
-                    XSLFPictureData pData = pShape.getPictureData();
-                    out.println(pData.getFileName());
-                } else {
-                    out.println("Process me: " + shape.getClass());
-                }
-            }
-        }
-        
-        ppt.close();
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/MergePresentations.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/MergePresentations.java
deleted file mode 100644
index 38e9285..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/MergePresentations.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-/**
- * Merge multiple pptx presentations together
- *
- * @author Yegor Kozlov
- */
-public final class MergePresentations {
-
-    public static void main(String args[]) throws Exception {
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        for(String arg : args){
-            FileInputStream is = new FileInputStream(arg);
-            XMLSlideShow src = new XMLSlideShow(is);
-            is.close();
-
-            for(XSLFSlide srcSlide : src.getSlides()){
-                ppt.createSlide().importContent(srcSlide);
-            }
-            
-            src.close();
-        }
-
-        FileOutputStream out = new FileOutputStream("merged.pptx");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/PPTX2SVG.txt b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/PPTX2SVG.txt
deleted file mode 100644
index dbe089a..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/PPTX2SVG.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.batik.transcoder.wmf.tosvg.WMFPainter;
-import org.apache.batik.transcoder.wmf.tosvg.WMFRecordStore;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-
-import javax.imageio.ImageIO;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.DataInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-/**
- * Convert each slide of a .pptx presentation into SVG
- *
- * @author Yegor Kozlov
- */
-public class PPTX2SVG {
-
-    static void usage() {
-        System.out.println("Usage: PPTX2SVG  <pptx file>");
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0) {
-            usage();
-            return;
-        }
-
-        String file = args[0];
-
-        System.out.println("Processing " + file);
-
-        // read the .pptx file
-        XMLSlideShow ppt = new XMLSlideShow(OPCPackage.open(file));
-
-        Dimension pgsize = ppt.getPageSize();
-
-        // convert each slide into a .svg file
-        XSLFSlide[] slide = ppt.getSlides();
-        for (int i = 0; i < slide.length; i++) {
-            // Create initial SVG DOM
-            DOMImplementation domImpl = SVGDOMImplementation.getDOMImplementation();
-            Document doc = domImpl.createDocument("http://www.w3.org/2000/svg", "svg", null);
-            //Use Batik SVG Graphics2D driver
-            SVGGraphics2D graphics = new SVGGraphics2D(doc);
-            graphics.setRenderingHint(XSLFRenderingHint.IMAGE_RENDERER, new WMFImageRender());
-            graphics.setSVGCanvasSize(pgsize);
-
-            String title = slide[i].getTitle();
-            System.out.println("Rendering slide " + (i + 1) + (title == null ? "" : ": " + title));
-
-            // draw stuff. All the heavy-lifting happens here
-            slide[i].draw(graphics);
-
-            // save the result.
-            int sep = file.lastIndexOf(".");
-            String fname = file.substring(0, sep == -1 ? file.length() : sep) + "-" + (i + 1) + ".svg";
-            OutputStreamWriter out =
-                    new OutputStreamWriter(new FileOutputStream(fname), "UTF-8");
-            DOMSource domSource = new DOMSource(graphics.getRoot());
-            StreamResult streamResult = new StreamResult(out);
-            TransformerFactory tf = TransformerFactory.newInstance();
-            Transformer serializer = tf.newTransformer();
-            serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-            serializer.transform(domSource, streamResult);
-            out.flush();
-            out.close();
-        }
-        System.out.println("Done");
-    }
-
-    /**
-     * Image renderer with support for .wmf images
-     */
-    static class WMFImageRender extends XSLFImageRendener {
-
-        /**
-         * Use Apache Batik to render WMF,
-         * delegate all other types of images to the javax.imageio framework
-       */
-        @Override
-        public boolean drawImage(Graphics2D graphics, XSLFPictureData data,
-                                 Rectangle2D anchor) {
-            try {
-                // see what type of image we are
-                PackagePart part = data.getPackagePart();
-                String contentType = part.getContentType();
-                if (contentType.equals("image/x-wmf")) {
-                    WMFRecordStore currentStore = new WMFRecordStore();
-                    currentStore.read(new DataInputStream(part.getInputStream()));
-                    int wmfwidth = currentStore.getWidthPixels();
-                    float conv = (float) anchor.getWidth() / wmfwidth;
-
-                    // Build a painter for the RecordStore
-                    WMFPainter painter = new WMFPainter(currentStore,
-                            (int) anchor.getX(), (int) anchor.getY(), conv);
-                    painter.paint(graphics);
-                } else {
-                    BufferedImage img = ImageIO.read(data.getPackagePart().getInputStream());
-                    graphics.drawImage(img,
-                            (int) anchor.getX(), (int) anchor.getY(),
-                            (int) anchor.getWidth(), (int) anchor.getHeight(), null);
-                }
-            } catch (Exception e) {
-                return false;
-            }
-            return true;
-        }
-
-        /**
-         * Convert data form the supplied package part into a BufferedImage.
-         * This method is used to create texture paint.
-         */
-        @Override
-        public BufferedImage readImage(PackagePart packagePart) throws IOException {
-            String contentType = packagePart.getContentType();
-            if (contentType.equals("image/x-wmf")) {
-                try {
-                    WMFRecordStore currentStore = new WMFRecordStore();
-                    currentStore.read(new DataInputStream(packagePart.getInputStream()));
-                    int wmfwidth = currentStore.getWidthPixels();
-                    int wmfheight = currentStore.getHeightPixels();
-
-                    BufferedImage img = new BufferedImage(wmfwidth, wmfheight, BufferedImage.TYPE_INT_RGB);
-                    Graphics2D graphics = img.createGraphics();
-
-                    // Build a painter for the RecordStore
-                    WMFPainter painter = new WMFPainter(currentStore, 0, 0, 1.0f);
-                    painter.paint(graphics);
-
-                    return img;
-                } catch (IOException e) {
-                    return null;
-                }
-            } else {
-                return ImageIO.read(packagePart.getInputStream());
-            }
-        }
-
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/PieChartDemo.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/PieChartDemo.java
deleted file mode 100644
index df98b92..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/PieChartDemo.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTAxDataSource;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTNumData;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTNumDataSource;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTNumVal;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPieChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPieSer;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPlotArea;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTSerTx;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTStrData;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTStrVal;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.OutputStream;
-
-/**
- * Build a pie chart from a template pptx
- *
- * @author Yegor Kozlov
- */
-public class PieChartDemo {
-    private static void usage(){
-        System.out.println("Usage: PieChartDemo <pie-chart-template.pptx> <pie-chart-data.txt>");
-        System.out.println("    pie-chart-template.pptx     template with a pie chart");
-        System.out.println("    pie-chart-data.txt          the model to set. First line is chart title, " +
-                "then go pairs {axis-label value}");
-    }
-
-    public static void main(String[] args) throws Exception {
-        if(args.length < 2) {
-            usage();
-            return;
-        }
-
-        BufferedReader modelReader = new BufferedReader(new FileReader(args[1]));
-        XMLSlideShow pptx = null;
-        try {
-            String chartTitle = modelReader.readLine();  // first line is chart title
-    
-            pptx = new XMLSlideShow(new FileInputStream(args[0]));
-            XSLFSlide slide = pptx.getSlides().get(0);
-    
-            // find chart in the slide
-            XSLFChart chart = null;
-            for(POIXMLDocumentPart part : slide.getRelations()){
-                if(part instanceof XSLFChart){
-                    chart = (XSLFChart) part;
-                    break;
-                }
-            }
-    
-            if(chart == null) throw new IllegalStateException("chart not found in the template");
-    
-            // embedded Excel workbook that holds the chart data
-            POIXMLDocumentPart xlsPart = chart.getRelations().get(0);
-            XSSFWorkbook wb = new XSSFWorkbook();
-            try {
-                XSSFSheet sheet = wb.createSheet();
-        
-                CTChart ctChart = chart.getCTChart();
-                CTPlotArea plotArea = ctChart.getPlotArea();
-        
-                CTPieChart pieChart = plotArea.getPieChartArray(0);
-                //Pie Chart Series
-                CTPieSer ser = pieChart.getSerArray(0);
-        
-                // Series Text
-                CTSerTx tx = ser.getTx();
-                tx.getStrRef().getStrCache().getPtArray(0).setV(chartTitle);
-                sheet.createRow(0).createCell(1).setCellValue(chartTitle);
-                String titleRef = new CellReference(sheet.getSheetName(), 0, 1, true, true).formatAsString();
-                tx.getStrRef().setF(titleRef);
-        
-                // Category Axis Data
-                CTAxDataSource cat = ser.getCat();
-                CTStrData strData = cat.getStrRef().getStrCache();
-        
-                // Values
-                CTNumDataSource val = ser.getVal();
-                CTNumData numData = val.getNumRef().getNumCache();
-        
-                strData.setPtArray(null);  // unset old axis text
-                numData.setPtArray(null);  // unset old values
-        
-                // set model
-                int idx = 0;
-                int rownum = 1;
-                String ln;
-                while((ln = modelReader.readLine()) != null){
-                    String[] vals = ln.split("\\s+");
-                    CTNumVal numVal = numData.addNewPt();
-                    numVal.setIdx(idx);
-                    numVal.setV(vals[1]);
-        
-                    CTStrVal sVal = strData.addNewPt();
-                    sVal.setIdx(idx);
-                    sVal.setV(vals[0]);
-        
-                    idx++;
-                    XSSFRow row = sheet.createRow(rownum++);
-                    row.createCell(0).setCellValue(vals[0]);
-                    row.createCell(1).setCellValue(Double.valueOf(vals[1]));
-                }
-                numData.getPtCount().setVal(idx);
-                strData.getPtCount().setVal(idx);
-        
-                String numDataRange = new CellRangeAddress(1, rownum-1, 1, 1).formatAsString(sheet.getSheetName(), true);
-                val.getNumRef().setF(numDataRange);
-                String axisDataRange = new CellRangeAddress(1, rownum-1, 0, 0).formatAsString(sheet.getSheetName(), true);
-                cat.getStrRef().setF(axisDataRange);
-        
-                // updated the embedded workbook with the data
-                OutputStream xlsOut = xlsPart.getPackagePart().getOutputStream();
-                try {
-                    wb.write(xlsOut);
-                } finally {
-                    xlsOut.close();
-                }
-        
-                // save the result
-                OutputStream out = new FileOutputStream("pie-chart-demo-output.pptx");
-                try {
-                    pptx.write(out);
-                } finally {
-                    out.close();
-                }
-            } finally {
-                wb.close();
-            }
-        } finally {
-            if (pptx != null) pptx.close();
-            modelReader.close();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java
deleted file mode 100644
index 60f5d71..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Demonstrates how to create slides with predefined layout
- * and fill the placeholder shapes
- *
- * @author Yegor Kozlov
- */
-public class Tutorial1 {
-
-    public static void main(String[] args) throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        // XSLFSlide#createSlide() with no arguments creates a blank slide
-        /*XSLFSlide blankSlide =*/ ppt.createSlide();
-
-        
-        XSLFSlideMaster master = ppt.getSlideMasters().get(0);
-
-        XSLFSlideLayout layout1 = master.getLayout(SlideLayout.TITLE);
-        XSLFSlide slide1 = ppt.createSlide(layout1) ;
-        XSLFTextShape[] ph1 = slide1.getPlaceholders();
-        XSLFTextShape titlePlaceholder1 = ph1[0];
-        titlePlaceholder1.setText("This is a title");
-        XSLFTextShape subtitlePlaceholder1 = ph1[1];
-        subtitlePlaceholder1.setText("this is a subtitle");
-
-        XSLFSlideLayout layout2 = master.getLayout(SlideLayout.TITLE_AND_CONTENT);
-        XSLFSlide slide2 = ppt.createSlide(layout2) ;
-        XSLFTextShape[] ph2 = slide2.getPlaceholders();
-        XSLFTextShape titlePlaceholder2 = ph2[0];
-        titlePlaceholder2.setText("This is a title");
-        XSLFTextShape bodyPlaceholder = ph2[1];
-        // we are going to add text by paragraphs. Clear the default placehoder text before that
-        bodyPlaceholder.clearText();
-        XSLFTextParagraph p1 = bodyPlaceholder.addNewTextParagraph();
-        p1.setIndentLevel(0);
-        p1.addNewTextRun().setText("Level1 text");
-        XSLFTextParagraph p2 = bodyPlaceholder.addNewTextParagraph();
-        p2.setIndentLevel(1);
-        p2.addNewTextRun().setText("Level2 text");
-        XSLFTextParagraph p3 = bodyPlaceholder.addNewTextParagraph();
-        p3.setIndentLevel(2);
-        p3.addNewTextRun().setText("Level3 text");
-
-        FileOutputStream out = new FileOutputStream("slides.pptx");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java
deleted file mode 100644
index af05962..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.Rectangle;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Basic paragraph and text formatting
- *
- * @author Yegor Kozlov
- */
-public class Tutorial2 {
-
-    public static void main(String[] args) throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XSLFSlide slide1 = ppt.createSlide();
-        XSLFTextBox shape1 = slide1.createTextBox();
-        // initial height of the text box is 100 pt but
-        Rectangle anchor = new Rectangle(10, 100, 300, 100);
-        shape1.setAnchor(anchor);
-
-        XSLFTextParagraph p1 = shape1.addNewTextParagraph();
-        XSLFTextRun r1 = p1.addNewTextRun();
-        r1.setText("Paragraph Formatting");
-        r1.setFontSize(24d);
-        r1.setFontColor(new Color(85, 142, 213));
-
-        XSLFTextParagraph p2 = shape1.addNewTextParagraph();
-        // If spaceBefore >= 0, then space is a percentage of normal line height.
-        // If spaceBefore < 0, the absolute value of linespacing is the spacing in points
-        p2.setSpaceBefore(-20d); // 20 pt from the previous paragraph
-        p2.setSpaceAfter(300d); // 3 lines after the paragraph
-        XSLFTextRun r2 = p2.addNewTextRun();
-        r2.setText("Paragraph  properties apply to all text residing within the corresponding paragraph.");
-        r2.setFontSize(16d);
-
-        XSLFTextParagraph p3 = shape1.addNewTextParagraph();
-
-        XSLFTextRun r3 = p3.addNewTextRun();
-        r3.setText("Run Formatting");
-        r3.setFontSize(24d);
-        r3.setFontColor(new Color(85, 142, 213));
-
-        XSLFTextParagraph p4 = shape1.addNewTextParagraph();
-        p4.setSpaceBefore(-20d); // 20 pt from the previous paragraph
-        p4.setSpaceAfter(300d); // 3 lines after the paragraph
-        XSLFTextRun r4 = p4.addNewTextRun();
-        r4.setFontSize(16d);
-        r4.setText(
-                "Run level formatting is the most granular property level and allows " +
-                "for the specifying of all low level text properties. The text run is " +
-                "what all paragraphs are derived from and thus specifying various " +
-                "properties per run will allow for a diversely formatted text paragraph.");
-
-        // resize the shape to fit text
-        shape1.resizeToFitText();
-
-        FileOutputStream out = new FileOutputStream("text.pptx");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial3.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial3.java
deleted file mode 100644
index 4433605..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial3.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Rectangle;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.Placeholder;
-
-/**
- * How to set slide title
- *
- * @author Yegor Kozlov
- */
-public class Tutorial3 {
-
-    public static void main(String[] args) throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFTextShape titleShape = slide.createTextBox();
-        titleShape.setPlaceholder(Placeholder.TITLE);
-        titleShape.setText("This is a slide title");
-        titleShape.setAnchor(new Rectangle(50, 50, 400, 100));
-
-        FileOutputStream out = new FileOutputStream("title.pptx");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java
deleted file mode 100644
index 94082a2..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.Rectangle;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.TableCell.BorderEdge;
-import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
-
-/**
- * PPTX Tables
- *
- * @author Yegor Kozlov
- */
-public class Tutorial4 {
-
-    public static void main(String[] args) throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        // XSLFSlide#createSlide() with no arguments creates a blank slide
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFTable tbl = slide.createTable();
-        tbl.setAnchor(new Rectangle(50, 50, 450, 300));
-
-        int numColumns = 3;
-        int numRows = 5;
-        XSLFTableRow headerRow = tbl.addRow();
-        headerRow.setHeight(50);
-        // header
-        for(int i = 0; i < numColumns; i++) {
-            XSLFTableCell th = headerRow.addCell();
-            XSLFTextParagraph p = th.addNewTextParagraph();
-            p.setTextAlign(TextAlign.CENTER);
-            XSLFTextRun r = p.addNewTextRun();
-            r.setText("Header " + (i+1));
-            r.setBold(true);
-            r.setFontColor(Color.white);
-            th.setFillColor(new Color(79, 129, 189));
-            th.setBorderWidth(BorderEdge.bottom, 2.0);
-            th.setBorderColor(BorderEdge.bottom, Color.white);
-
-            tbl.setColumnWidth(i, 150);  // all columns are equally sized
-        }
-        
-        // rows
-        
-        for(int rownum = 0; rownum < numRows; rownum ++){
-            XSLFTableRow tr = tbl.addRow();
-            tr.setHeight(50);
-            // header
-            for(int i = 0; i < numColumns; i++) {
-                XSLFTableCell cell = tr.addCell();
-                XSLFTextParagraph p = cell.addNewTextParagraph();
-                XSLFTextRun r = p.addNewTextRun();
-
-                r.setText("Cell " + (i+1));
-                if(rownum % 2 == 0)
-                    cell.setFillColor(new Color(208, 216, 232));
-                else
-                    cell.setFillColor(new Color(233, 247, 244));
-
-            }
-            
-        }
-
-
-        FileOutputStream out = new FileOutputStream("table.pptx");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial5.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial5.java
deleted file mode 100644
index 06542af..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial5.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-
-/**
- * Images
- *
- * @author Yegor Kozlov
- */
-public class Tutorial5 {
-
-    public static void main(String[] args) throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XSLFSlide slide = ppt.createSlide();
-
-        File img = new File(System.getProperty("POI.testdata.path", "test-data"), "slideshow/clock.jpg");
-        XSLFPictureData pictureData = ppt.addPicture(img, PictureType.PNG);
-
-        /*XSLFPictureShape shape =*/ slide.createPicture(pictureData);
-
-        FileOutputStream out = new FileOutputStream("images.pptx");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial6.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial6.java
deleted file mode 100644
index 73a59d0..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial6.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Rectangle;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Hyperlinks
- *
- * @author Yegor Kozlov
- */
-public class Tutorial6 {
-
-    public static void main(String[] args) throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XSLFSlide slide1 = ppt.createSlide();
-        XSLFSlide slide2 = ppt.createSlide();
-
-        XSLFTextBox shape1 = slide1.createTextBox();
-        shape1.setAnchor(new Rectangle(50, 50, 200, 50));
-        XSLFTextRun r1 = shape1.addNewTextParagraph().addNewTextRun();
-        XSLFHyperlink link1 = r1.createHyperlink();
-        r1.setText("http://poi.apache.org"); // visible text
-        link1.setAddress("http://poi.apache.org");  // link address
-
-        XSLFTextBox shape2 = slide1.createTextBox();
-        shape2.setAnchor(new Rectangle(300, 50, 200, 50));
-        XSLFTextRun r2 = shape2.addNewTextParagraph().addNewTextRun();
-        XSLFHyperlink link2 = r2.createHyperlink();
-        r2.setText("Go to the second slide"); // visible text
-        link2.linkToSlide(slide2);  // link address
-
-
-
-        FileOutputStream out = new FileOutputStream("hyperlinks.pptx");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java
deleted file mode 100644
index 26f822d..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.Rectangle;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-
-/**
- * Bullets and numbering
- *
- * @author Yegor Kozlov
- */
-public class Tutorial7 {
-
-    public static void main(String[] args) throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XSLFSlide slide = ppt.createSlide();
-        XSLFTextBox shape = slide.createTextBox();
-        shape.setAnchor(new Rectangle(50, 50, 400, 200));
-
-        XSLFTextParagraph p1 = shape.addNewTextParagraph();
-        p1.setIndentLevel(0);
-        p1.setBullet(true);
-        XSLFTextRun r1 = p1.addNewTextRun();
-        r1.setText("Bullet1");
-
-        XSLFTextParagraph p2 = shape.addNewTextParagraph();
-        // indentation before text
-        p2.setLeftMargin(60d);
-        // the bullet is set 40 pt before the text
-        p2.setIndent(-40d);
-        p2.setBullet(true);
-        // customize bullets
-        p2.setBulletFontColor(Color.red);
-        p2.setBulletFont("Wingdings");
-        p2.setBulletCharacter("\u0075");
-        p2.setIndentLevel(1);
-        XSLFTextRun r2 = p2.addNewTextRun();
-        r2.setText("Bullet2");
-
-        // the next three paragraphs form an auto-numbered list
-        XSLFTextParagraph p3 = shape.addNewTextParagraph();
-        p3.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 1);
-        p3.setIndentLevel(2);
-        XSLFTextRun r3 = p3.addNewTextRun();
-        r3.setText("Numbered List Item - 1");
-
-        XSLFTextParagraph p4 = shape.addNewTextParagraph();
-        p4.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 2);
-        p4.setIndentLevel(2);
-        XSLFTextRun r4 = p4.addNewTextRun();
-        r4.setText("Numbered List Item - 2");
-
-        XSLFTextParagraph p5 = shape.addNewTextParagraph();
-        p5.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 3);
-        p5.setIndentLevel(2);
-        XSLFTextRun r5 = p5.addNewTextRun();
-        r5.setText("Numbered List Item - 3");
-
-        shape.resizeToFitText();
-
-        FileOutputStream out = new FileOutputStream("list.pptx");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/pie-chart-data.txt b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/pie-chart-data.txt
deleted file mode 100644
index 40b6959..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/pie-chart-data.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-My Chart
-First 1.0
-Second 3.0
-Third 4.0
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/pie-chart-template.pptx b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/pie-chart-template.pptx
deleted file mode 100644
index 33d28e1..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/pie-chart-template.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java
deleted file mode 100644
index 41c6cc2..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel.tutorial;
-
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFShape;
-import org.apache.poi.xslf.usermodel.XSLFSlide;
-import org.apache.poi.xslf.usermodel.XSLFTextParagraph;
-import org.apache.poi.xslf.usermodel.XSLFTextRun;
-import org.apache.poi.xslf.usermodel.XSLFTextShape;
-
-import java.io.FileInputStream;
-
-/**
- * Reading a .pptx presentation and printing basic shape properties
- *
- * @author Yegor Kozlov
- */
-public class Step1 {
-
-    public static void main(String[] args) throws Exception {
-        if(args.length == 0)  {
-            System.out.println("Input file is required");
-            return;
-        }
-
-        XMLSlideShow ppt = new XMLSlideShow(new FileInputStream(args[0]));
-
-        for(XSLFSlide slide : ppt.getSlides()){
-            System.out.println("Title: " + slide.getTitle());
-
-            for(XSLFShape shape : slide.getShapes()){
-                if(shape instanceof XSLFTextShape) {
-                    XSLFTextShape tsh = (XSLFTextShape)shape;
-                    for(XSLFTextParagraph p : tsh){
-                        System.out.println("Paragraph level: " + p.getIndentLevel());
-                        for(XSLFTextRun r : p){
-                            System.out.println(r.getRawText());
-                            System.out.println("  bold: " + r.isBold());
-                            System.out.println("  italic: " + r.isItalic());
-                            System.out.println("  underline: " + r.isUnderlined());
-                            System.out.println("  font.family: " + r.getFontFamily());
-                            System.out.println("  font.size: " + r.getFontSize());
-                            System.out.println("  font.color: " + r.getFontColor());
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step2.java b/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step2.java
deleted file mode 100644
index cd01d60c8..0000000
--- a/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step2.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel.tutorial;
-
-import org.apache.poi.xslf.usermodel.SlideLayout;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFSlide;
-import org.apache.poi.xslf.usermodel.XSLFSlideLayout;
-import org.apache.poi.xslf.usermodel.XSLFSlideMaster;
-import org.apache.poi.xslf.usermodel.XSLFTextShape;
-
-import java.io.FileOutputStream;
-
-/**
- * Create slides from pre-defined slide layouts
- *
- * @author Yegor Kozlov
- */
-public class Step2 {
-    public static void main(String[] args) throws Exception{
-        XMLSlideShow ppt = new XMLSlideShow();
-
-
-        // first see what slide layouts are available by default
-        System.out.println("Available slide layouts:");
-        for(XSLFSlideMaster master : ppt.getSlideMasters()){
-            for(XSLFSlideLayout layout : master.getSlideLayouts()){
-                System.out.println(layout.getType());
-            }
-        }
-
-        // blank slide
-        /*XSLFSlide blankSlide =*/ ppt.createSlide();
-
-        XSLFSlideMaster defaultMaster = ppt.getSlideMasters().get(0);
-
-        // title slide
-        XSLFSlideLayout titleLayout = defaultMaster.getLayout(SlideLayout.TITLE);
-        XSLFSlide slide1 = ppt.createSlide(titleLayout);
-        XSLFTextShape title1 = slide1.getPlaceholder(0);
-        title1.setText("First Title");
-
-        // title and content
-        XSLFSlideLayout titleBodyLayout = defaultMaster.getLayout(SlideLayout.TITLE_AND_CONTENT);
-        XSLFSlide slide2 = ppt.createSlide(titleBodyLayout);
-
-        XSLFTextShape title2 = slide2.getPlaceholder(0);
-        title2.setText("Second Title");
-
-        XSLFTextShape body2 = slide2.getPlaceholder(1);
-        body2.clearText(); // unset any existing text
-        body2.addNewTextParagraph().addNewTextRun().setText("First paragraph");
-        body2.addNewTextParagraph().addNewTextRun().setText("Second paragraph");
-        body2.addNewTextParagraph().addNewTextRun().setText("Third paragraph");
-
-
-
-        FileOutputStream out = new FileOutputStream("step2.pptx");
-        ppt.write(out);
-        out.close();
-
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java b/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java
deleted file mode 100644
index 0f84ce9..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.eventusermodel;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.SAXHelper;
-import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler.SheetContentsHandler;
-import org.apache.poi.xssf.extractor.XSSFEventBasedExcelExtractor;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-/**
- * A rudimentary XLSX -> CSV processor modeled on the
- * POI sample program XLS2CSVmra from the package
- * org.apache.poi.hssf.eventusermodel.examples.
- * As with the HSSF version, this tries to spot missing
- *  rows and cells, and output empty entries for them.
- * <p/>
- * Data sheets are read using a SAX parser to keep the
- * memory footprint relatively small, so this should be
- * able to read enormous workbooks.  The styles table and
- * the shared-string table must be kept in memory.  The
- * standard POI styles table class is used, but a custom
- * (read-only) class is used for the shared string table
- * because the standard POI SharedStringsTable grows very
- * quickly with the number of unique strings.
- * <p/>
- * For a more advanced implementation of SAX event parsing
- * of XLSX files, see {@link XSSFEventBasedExcelExtractor}
- * and {@link XSSFSheetXMLHandler}. Note that for many cases,
- * it may be possible to simply use those with a custom 
- * {@link SheetContentsHandler} and no SAX code needed of
- * your own!
- */
-public class XLSX2CSV {
-    /**
-     * Uses the XSSF Event SAX helpers to do most of the work
-     *  of parsing the Sheet XML, and outputs the contents
-     *  as a (basic) CSV.
-     */
-    private class SheetToCSV implements SheetContentsHandler {
-        private boolean firstCellOfRow = false;
-        private int currentRow = -1;
-        private int currentCol = -1;
-        
-        private void outputMissingRows(int number) {
-            for (int i=0; i<number; i++) {
-                for (int j=0; j<minColumns; j++) {
-                    output.append(',');
-                }
-                output.append('\n');
-            }
-        }
-
-        @Override
-        public void startRow(int rowNum) {
-            // If there were gaps, output the missing rows
-            outputMissingRows(rowNum-currentRow-1);
-            // Prepare for this row
-            firstCellOfRow = true;
-            currentRow = rowNum;
-            currentCol = -1;
-        }
-
-        @Override
-        public void endRow(int rowNum) {
-            // Ensure the minimum number of columns
-            for (int i=currentCol; i<minColumns; i++) {
-                output.append(',');
-            }
-            output.append('\n');
-        }
-
-        @Override
-        public void cell(String cellReference, String formattedValue,
-                XSSFComment comment) {
-            if (firstCellOfRow) {
-                firstCellOfRow = false;
-            } else {
-                output.append(',');
-            }
-
-            // gracefully handle missing CellRef here in a similar way as XSSFCell does
-            if(cellReference == null) {
-                cellReference = new CellAddress(currentRow, currentCol).formatAsString();
-            }
-
-            // Did we miss any cells?
-            int thisCol = (new CellReference(cellReference)).getCol();
-            int missedCols = thisCol - currentCol - 1;
-            for (int i=0; i<missedCols; i++) {
-                output.append(',');
-            }
-            currentCol = thisCol;
-            
-            // Number or string?
-            try {
-                Double.parseDouble(formattedValue);
-                output.append(formattedValue);
-            } catch (NumberFormatException e) {
-                output.append('"');
-                output.append(formattedValue);
-                output.append('"');
-            }
-        }
-
-        @Override
-        public void headerFooter(String text, boolean isHeader, String tagName) {
-            // Skip, no headers or footers in CSV
-        }
-    }
-
-
-    ///////////////////////////////////////
-
-    private final OPCPackage xlsxPackage;
-
-    /**
-     * Number of columns to read starting with leftmost
-     */
-    private final int minColumns;
-
-    /**
-     * Destination for data
-     */
-    private final PrintStream output;
-
-    /**
-     * Creates a new XLSX -> CSV converter
-     *
-     * @param pkg        The XLSX package to process
-     * @param output     The PrintStream to output the CSV to
-     * @param minColumns The minimum number of columns to output, or -1 for no minimum
-     */
-    public XLSX2CSV(OPCPackage pkg, PrintStream output, int minColumns) {
-        this.xlsxPackage = pkg;
-        this.output = output;
-        this.minColumns = minColumns;
-    }
-
-    /**
-     * Parses and shows the content of one sheet
-     * using the specified styles and shared-strings tables.
-     *
-     * @param styles
-     * @param strings
-     * @param sheetInputStream
-     */
-    public void processSheet(
-            StylesTable styles,
-            ReadOnlySharedStringsTable strings,
-            SheetContentsHandler sheetHandler, 
-            InputStream sheetInputStream)
-            throws IOException, ParserConfigurationException, SAXException {
-        DataFormatter formatter = new DataFormatter();
-        InputSource sheetSource = new InputSource(sheetInputStream);
-        try {
-            XMLReader sheetParser = SAXHelper.newXMLReader();
-            ContentHandler handler = new XSSFSheetXMLHandler(
-                  styles, null, strings, sheetHandler, formatter, false);
-            sheetParser.setContentHandler(handler);
-            sheetParser.parse(sheetSource);
-         } catch(ParserConfigurationException e) {
-            throw new RuntimeException("SAX parser appears to be broken - " + e.getMessage());
-         }
-    }
-
-    /**
-     * Initiates the processing of the XLS workbook file to CSV.
-     *
-     * @throws IOException
-     * @throws OpenXML4JException
-     * @throws ParserConfigurationException
-     * @throws SAXException
-     */
-    public void process()
-            throws IOException, OpenXML4JException, ParserConfigurationException, SAXException {
-        ReadOnlySharedStringsTable strings = new ReadOnlySharedStringsTable(this.xlsxPackage);
-        XSSFReader xssfReader = new XSSFReader(this.xlsxPackage);
-        StylesTable styles = xssfReader.getStylesTable();
-        XSSFReader.SheetIterator iter = (XSSFReader.SheetIterator) xssfReader.getSheetsData();
-        int index = 0;
-        while (iter.hasNext()) {
-            InputStream stream = iter.next();
-            String sheetName = iter.getSheetName();
-            this.output.println();
-            this.output.println(sheetName + " [index=" + index + "]:");
-            processSheet(styles, strings, new SheetToCSV(), stream);
-            stream.close();
-            ++index;
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 1) {
-            System.err.println("Use:");
-            System.err.println("  XLSX2CSV <xlsx file> [min columns]");
-            return;
-        }
-
-        File xlsxFile = new File(args[0]);
-        if (!xlsxFile.exists()) {
-            System.err.println("Not found or not a file: " + xlsxFile.getPath());
-            return;
-        }
-
-        int minColumns = -1;
-        if (args.length >= 2)
-            minColumns = Integer.parseInt(args[1]);
-
-        // The package open is instantaneous, as it should be.
-        OPCPackage p = OPCPackage.open(xlsxFile.getPath(), PackageAccess.READ);
-		XLSX2CSV xlsx2csv = new XLSX2CSV(p, System.out, minColumns);
-		xlsx2csv.process();
-		p.close();
-	}
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/FromHowTo.java b/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/FromHowTo.java
deleted file mode 100644
index 6e35e8c..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/FromHowTo.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.eventusermodel.examples;
-
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.xssf.eventusermodel.XLSX2CSV;
-import org.apache.poi.xssf.eventusermodel.XSSFReader;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * XSSF and SAX (Event API) basic example.
- * See {@link XLSX2CSV} for a fuller example of doing
- *  XSLX processing with the XSSF Event code.
- */
-public class FromHowTo {
-	public void processFirstSheet(String filename) throws Exception {
-		OPCPackage pkg = OPCPackage.open(filename, PackageAccess.READ);
-		try {
-			XSSFReader r = new XSSFReader(pkg);
-			SharedStringsTable sst = r.getSharedStringsTable();
-
-			XMLReader parser = fetchSheetParser(sst);
-
-			// process the first sheet
-			InputStream sheet2 = r.getSheetsData().next();
-			InputSource sheetSource = new InputSource(sheet2);
-			parser.parse(sheetSource);
-			sheet2.close();
-		} finally {
-			pkg.close();
-		}
-	}
-
-	public void processAllSheets(String filename) throws Exception {
-		OPCPackage pkg = OPCPackage.open(filename, PackageAccess.READ);
-		try {
-			XSSFReader r = new XSSFReader(pkg);
-			SharedStringsTable sst = r.getSharedStringsTable();
-
-			XMLReader parser = fetchSheetParser(sst);
-
-			Iterator<InputStream> sheets = r.getSheetsData();
-			while (sheets.hasNext()) {
-				System.out.println("Processing new sheet:\n");
-				InputStream sheet = sheets.next();
-				InputSource sheetSource = new InputSource(sheet);
-				parser.parse(sheetSource);
-				sheet.close();
-				System.out.println("");
-			}
-		} finally {
-			pkg.close();
-		}
-	}
-
-	public XMLReader fetchSheetParser(SharedStringsTable sst) throws SAXException {
-		XMLReader parser = XMLReaderFactory.createXMLReader();
-		ContentHandler handler = new SheetHandler(sst);
-		parser.setContentHandler(handler);
-		return parser;
-	}
-
-	/**
-	 * See org.xml.sax.helpers.DefaultHandler javadocs
-	 */
-	private static class SheetHandler extends DefaultHandler {
-		private final SharedStringsTable sst;
-		private String lastContents;
-		private boolean nextIsString;
-		private boolean inlineStr;
-		private final LruCache<Integer,String> lruCache = new LruCache<Integer,String>(50);
-
-		private static class LruCache<A,B> extends LinkedHashMap<A, B> {
-		    private final int maxEntries;
-
-		    public LruCache(final int maxEntries) {
-		        super(maxEntries + 1, 1.0f, true);
-		        this.maxEntries = maxEntries;
-		    }
-
-		    @Override
-		    protected boolean removeEldestEntry(final Map.Entry<A, B> eldest) {
-		        return super.size() > maxEntries;
-		    }
-		}
-		
-		private SheetHandler(SharedStringsTable sst) {
-			this.sst = sst;
-		}
-
-		@Override
-        public void startElement(String uri, String localName, String name,
-								 Attributes attributes) throws SAXException {
-			// c => cell
-			if(name.equals("c")) {
-				// Print the cell reference
-				System.out.print(attributes.getValue("r") + " - ");
-				// Figure out if the value is an index in the SST
-				String cellType = attributes.getValue("t");
-				nextIsString = cellType != null && cellType.equals("s");
-				inlineStr = cellType != null && cellType.equals("inlineStr");
-			}
-			// Clear contents cache
-			lastContents = "";
-		}
-
-		@Override
-        public void endElement(String uri, String localName, String name)
-				throws SAXException {
-			// Process the last contents as required.
-			// Do now, as characters() may be called more than once
-			if(nextIsString) {
-				Integer idx = Integer.valueOf(lastContents);
-				lastContents = lruCache.get(idx);
-				if (lastContents == null && !lruCache.containsKey(idx)) {
-				    lastContents = new XSSFRichTextString(sst.getEntryAt(idx)).toString();
-				    lruCache.put(idx, lastContents);
-				}
-				nextIsString = false;
-			}
-
-			// v => contents of a cell
-			// Output after we've seen the string contents
-			if(name.equals("v") || (inlineStr && name.equals("c"))) {
-				System.out.println(lastContents);
-			}
-		}
-
-		@Override
-        public void characters(char[] ch, int start, int length) throws SAXException { // NOSONAR
-			lastContents += new String(ch, start, length);
-		}
-	}
-
-	public static void main(String[] args) throws Exception {
-		FromHowTo howto = new FromHowTo();
-		howto.processFirstSheet(args[0]);
-		howto.processAllSheets(args[0]);
-	}
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/LoadPasswordProtectedXlsxStreaming.java b/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/LoadPasswordProtectedXlsxStreaming.java
deleted file mode 100644
index 80e4c73..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/examples/LoadPasswordProtectedXlsxStreaming.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.eventusermodel.examples;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.crypt.examples.EncryptionUtils;
-import org.apache.poi.examples.util.TempFileUtils;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.crypt.temp.AesZipFileZipEntrySource;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.eventusermodel.XSSFReader;
-import org.apache.poi.xssf.eventusermodel.XSSFReader.SheetIterator;
-
-/**
- * An example that loads a password protected workbook and counts the sheets.
- * The example highlights how to do this in streaming way.
- * <p><ul>
- * <li>The example demonstrates that all temp files are removed.
- * <li><code>AesZipFileZipEntrySource</code> is used to ensure that temp files are encrypted.
- * </ul><p>
- */
-public class LoadPasswordProtectedXlsxStreaming {
-
-    public static void main(String[] args) throws Exception {
-        if(args.length != 2) {
-            throw new IllegalArgumentException("Expected 2 params: filename and password");
-        }
-        TempFileUtils.checkTempFiles();
-        String filename = args[0];
-        String password = args[1];
-        FileInputStream fis = new FileInputStream(filename);
-        try {
-            InputStream unencryptedStream = EncryptionUtils.decrypt(fis, password);
-            try {
-                printSheetCount(unencryptedStream);
-            } finally {
-                IOUtils.closeQuietly(unencryptedStream);
-            }
-        } finally {
-            IOUtils.closeQuietly(fis);
-        }
-        TempFileUtils.checkTempFiles();
-    }
-
-    public static void printSheetCount(final InputStream inputStream) throws Exception {
-        AesZipFileZipEntrySource source = AesZipFileZipEntrySource.createZipEntrySource(inputStream);
-        try {
-            OPCPackage pkg = OPCPackage.open(source);
-            try {
-                XSSFReader reader = new XSSFReader(pkg);
-                SheetIterator iter = (SheetIterator)reader.getSheetsData();
-                int count = 0;
-                while(iter.hasNext()) {
-                    iter.next();
-                    count++;
-                }
-                System.out.println("sheet count: " + count);
-            } finally {
-                IOUtils.closeQuietly(pkg);
-            }
-        } finally {
-            IOUtils.closeQuietly(source);
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java b/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java
deleted file mode 100644
index 31b5e85..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/HybridStreaming.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.streaming.examples;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.xssf.eventusermodel.ReadOnlySharedStringsTable;
-import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler;
-import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler.SheetContentsHandler;
-import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheet;
-import org.xml.sax.SAXException;
-
-/**
- * This demonstrates how a hybrid approach to workbook read can be taken, using 
- * a mix of traditional XSSF and streaming one particular worksheet (perhaps one
- * which is too big for the ordinary DOM parse).
- */
-public class HybridStreaming {
-    
-    private static final String SHEET_TO_STREAM = "large sheet";
-
-    public static void main(String[] args) throws IOException, SAXException {
-        InputStream sourceBytes = new FileInputStream("workbook.xlsx");
-        XSSFWorkbook workbook = new XSSFWorkbook(sourceBytes) {
-            /** Avoid DOM parse of large sheet */
-            @Override
-            public void parseSheet(java.util.Map<String,XSSFSheet> shIdMap, CTSheet ctSheet) {
-                if (!SHEET_TO_STREAM.equals(ctSheet.getName())) {
-                    super.parseSheet(shIdMap, ctSheet);
-                }
-            }
-        };
-        
-        // Having avoided a DOM-based parse of the sheet, we can stream it instead.
-        ReadOnlySharedStringsTable strings = new ReadOnlySharedStringsTable(workbook.getPackage());
-        new XSSFSheetXMLHandler(workbook.getStylesSource(), strings, createSheetContentsHandler(), false);
-        workbook.close();
-        sourceBytes.close();
-    }
-
-    private static SheetContentsHandler createSheetContentsHandler() {
-        return new SheetContentsHandler() {
-            
-            @Override
-            public void startRow(int rowNum) {
-            }
-            
-            @Override
-            public void headerFooter(String text, boolean isHeader, String tagName) {
-            }
-            
-            @Override
-            public void endRow(int rowNum) {
-            }
-            
-            @Override
-            public void cell(String cellReference, String formattedValue, XSSFComment comment) {
-            }
-        };
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/Outlining.java b/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/Outlining.java
deleted file mode 100644
index 4c0b35c..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/Outlining.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-
-public class Outlining {
-
-	public static void main(String[] args) throws IOException {
-		Outlining o = new Outlining();
-		o.collapseRow();
-	}
-
-	private void collapseRow() throws IOException {
-		SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
-		SXSSFSheet sheet2 = wb2.createSheet("new sheet");
-
-		int rowCount = 20;
-		for (int i = 0; i < rowCount; i++) {
-			sheet2.createRow(i);
-		}
-
-		sheet2.groupRow(4, 9);
-		sheet2.groupRow(11, 19);
-
-		sheet2.setRowGroupCollapsed(4, true);
-
-		FileOutputStream fileOut = new FileOutputStream("outlining_collapsed.xlsx");
-		try {
-		    wb2.write(fileOut);
-		} finally {
-    		fileOut.close();
-    		wb2.dispose();
-    		wb2.close();
-		}
-	}
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/SavePasswordProtectedXlsx.java b/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/SavePasswordProtectedXlsx.java
deleted file mode 100644
index 9aaa8bf..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/streaming/examples/SavePasswordProtectedXlsx.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-
-import org.apache.poi.examples.util.TempFileUtils;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.crypt.temp.EncryptedTempData;
-import org.apache.poi.poifs.crypt.temp.SXSSFWorkbookWithCustomZipEntrySource;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFCell;
-import org.apache.poi.xssf.streaming.SXSSFRow;
-import org.apache.poi.xssf.streaming.SXSSFSheet;
-
-/**
- * An example that outputs a simple generated workbook that is password protected.
- * The example highlights how to do this in streaming way.
- * <p><ul>
- * <li>The example demonstrates that all temp files are removed.
- * <li><code>SXSSFWorkbookWithCustomZipEntrySource</code> extends SXSSFWorkbook to ensure temp files are encrypted.
- * </ul><p>
- */
-public class SavePasswordProtectedXlsx {
-
-    public static void main(String[] args) throws Exception {
-        if(args.length != 2) {
-            throw new IllegalArgumentException("Expected 2 params: filename and password");
-        }
-        TempFileUtils.checkTempFiles();
-        String filename = args[0];
-        String password = args[1];
-        SXSSFWorkbookWithCustomZipEntrySource wb = new SXSSFWorkbookWithCustomZipEntrySource();
-        try {
-            for(int i = 0; i < 10; i++) {
-                SXSSFSheet sheet = wb.createSheet("Sheet" + i);
-                for(int r = 0; r < 1000; r++) {
-                    SXSSFRow row = sheet.createRow(r);
-                    for(int c = 0; c < 100; c++) {
-                        SXSSFCell cell = row.createCell(c);
-                        cell.setCellValue("abcd");
-                    }
-                }
-            }
-            EncryptedTempData tempData = new EncryptedTempData();
-            try {
-                wb.write(tempData.getOutputStream());
-                save(tempData.getInputStream(), filename, password);
-                System.out.println("Saved " + filename);
-            } finally {
-                tempData.dispose();
-            }
-        } finally {
-            wb.close();
-            wb.dispose();
-        }
-        TempFileUtils.checkTempFiles();
-    }
-    
-    public static void save(final InputStream inputStream, final String filename, final String pwd)
-            throws InvalidFormatException, IOException, GeneralSecurityException {
-        try {
-            POIFSFileSystem fs = new POIFSFileSystem();
-            EncryptionInfo info = new EncryptionInfo(EncryptionMode.agile);
-            Encryptor enc = Encryptor.getInstance(info);
-            enc.confirmPassword(pwd);
-            OPCPackage opc = OPCPackage.open(inputStream);
-            try {
-                FileOutputStream fos = new FileOutputStream(filename);
-                try {
-                    opc.save(enc.getDataStream(fs));
-                    fs.writeFilesystem(fos);
-                } finally {
-                    IOUtils.closeQuietly(fos);
-                }
-            } finally {
-                IOUtils.closeQuietly(opc);
-            }
-        } finally {
-            IOUtils.closeQuietly(inputStream);
-        }
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/AligningCells.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/AligningCells.java
deleted file mode 100644
index 0bb002f..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/AligningCells.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ====================================================================
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTRowImpl;
-
-/**
- * Shows how various alignment options work.
- *
- * Modified by Cristian Petrula, Romania on May 26, 2010
- * New method was added centerAcrossSelection to center a column content over 
- * one selection using {@link HorizontalAlignment#CENTER_SELECTION}
- * To create this method example was change for XSSF only and the previous
- * AligningCells.java example has been moved into the SS examples folder.
- */
-public class AligningCells {
-
-    public static void main(String[] args) throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-
-        XSSFSheet sheet = wb.createSheet();
-        XSSFRow row = sheet.createRow(2);
-        row.setHeightInPoints(30);
-        for (int i = 0; i < 8; i++) {
-            //column width is set in units of 1/256th of a character width
-            sheet.setColumnWidth(i, 256 * 15);
-        }
-
-        createCell(wb, row, 0, HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM);
-        createCell(wb, row, 1, HorizontalAlignment.CENTER_SELECTION, VerticalAlignment.BOTTOM);
-        createCell(wb, row, 2, HorizontalAlignment.FILL, VerticalAlignment.CENTER);
-        createCell(wb, row, 3, HorizontalAlignment.GENERAL, VerticalAlignment.CENTER);
-        createCell(wb, row, 4, HorizontalAlignment.JUSTIFY, VerticalAlignment.JUSTIFY);
-        createCell(wb, row, 5, HorizontalAlignment.LEFT, VerticalAlignment.TOP);
-        createCell(wb, row, 6, HorizontalAlignment.RIGHT, VerticalAlignment.TOP);
-
-        //center text over B4, C4, D4
-        row = sheet.createRow(3);
-        centerAcrossSelection(wb, row, 1, 3, VerticalAlignment.CENTER);
-
-        // Write the output to a file
-        OutputStream fileOut = new FileOutputStream("xssf-align.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
-    }
-
-    /**
-     * Creates a cell and aligns it a certain way.
-     *
-     * @param wb     the workbook
-     * @param row    the row to create the cell in
-     * @param column the column number to create the cell in
-     * @param halign the horizontal alignment for the cell.
-     */
-    private static void createCell(XSSFWorkbook wb, XSSFRow row, int column,
-                                   HorizontalAlignment halign, VerticalAlignment valign) {
-        CreationHelper ch = wb.getCreationHelper();
-        XSSFCell cell = row.createCell(column);
-        cell.setCellValue(ch.createRichTextString("Align It"));
-        CellStyle cellStyle = wb.createCellStyle();
-        cellStyle.setAlignment(halign);
-        cellStyle.setVerticalAlignment(valign);
-        cell.setCellStyle(cellStyle);
-    }
-
-    /**
-     * Center a text over multiple columns using ALIGN_CENTER_SELECTION
-     *
-     * @param wb the workbook
-     * @param row the row to create the cell in
-     * @param start_column  the column number to create the cell in and where the selection starts
-     * @param end_column    the column number where the selection ends
-     * @param valign the horizontal alignment for the cell.
-     */
-    private static void centerAcrossSelection(XSSFWorkbook wb, XSSFRow row,
-            int start_column, int end_column, VerticalAlignment valign) {
-        CreationHelper ch = wb.getCreationHelper();
-
-        // Create cell style with ALIGN_CENTER_SELECTION
-        XSSFCellStyle cellStyle = wb.createCellStyle();
-        cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);
-        cellStyle.setVerticalAlignment(valign);
-
-        // Create cells over the selected area
-        for (int i = start_column; i <= end_column; i++) {
-            XSSFCell cell = row.createCell(i);
-            cell.setCellStyle(cellStyle);
-        }
-
-        // Set value to the first cell
-        XSSFCell cell = row.getCell(start_column);
-        cell.setCellValue(ch.createRichTextString("Align It"));
-
-        // Make the selection
-        CTRowImpl ctRow = (CTRowImpl) row.getCTRow();
-
-        // Add object with format start_coll:end_coll. For example 1:3 will span from
-        // cell 1 to cell 3, where the column index starts with 0
-        //
-        // You can add multiple spans for one row
-        Object span = start_column + ":" + end_column;
-
-        List<Object> spanList = new ArrayList<Object>();
-        spanList.add(span);
-
-        //add spns to the row
-        ctRow.setSpans(spanList);
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java
deleted file mode 100644
index 66bb597..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Calendar;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFDataFormat;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Demonstrates a workaround you can use to generate large workbooks and avoid OutOfMemory exception.
- *
- * Note - You probably <em>don't want to use this approach any more</em>! POI
- *  now includes the SXSSF which handles all of this for you, you should
- *  be using that instead! This code remains mostly for historical interest.
- * <p>
- * See <a "http://poi.apache.org/spreadsheet/how-to.html#sxssf">
- *     http://poi.apache.org/spreadsheet/how-to.html#sxssf</a>.
- * <p>
- * If you really want to use this approach, which is also the one that SXSSF
- * does for you, it works as follows:
- * 
- * 1. create a template workbook, create sheets and global objects such as cell styles, number formats, etc.
- * 2. create an application that streams data in a text file
- * 3. Substitute the sheet in the template with the generated data
- *
- * <p>
- *  Since 3.8 POI provides a low-memory footprint SXSSF API, which implements 
- *  ths "BigGridDemo" strategy. SXSSF is an API-compatible streaming extension
- *  of XSSF to be used when very large spreadsheets have to be produced, and 
- *  heap space is limited. SXSSF achieves its low memory footprint by limiting 
- *  access to the rows that are within a sliding window, while XSSF gives access 
- *  to all rows in the document. Older rows that are no longer in the window 
- *  become inaccessible, as they are written to the disk.
- * </p>
- * See <a "http://poi.apache.org/spreadsheet/how-to.html#sxssf">
- *     http://poi.apache.org/spreadsheet/how-to.html#sxssf</a>.
-
- *
- * @author Yegor Kozlov
- */
-public class BigGridDemo {
-    private static final String XML_ENCODING = "UTF-8";
-    
-    public static void main(String[] args) throws Exception {
-
-        // Step 1. Create a template file. Setup sheets and workbook-level objects such as
-        // cell styles, number formats, etc.
-
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet("Big Grid");
-
-        Map<String, XSSFCellStyle> styles = createStyles(wb);
-        //name of the zip entry holding sheet data, e.g. /xl/worksheets/sheet1.xml
-        String sheetRef = sheet.getPackagePart().getPartName().getName();
-
-        //save the template
-        FileOutputStream os = new FileOutputStream("template.xlsx");
-        wb.write(os);
-        os.close();
-
-        //Step 2. Generate XML file.
-        File tmp = File.createTempFile("sheet", ".xml");
-        Writer fw = new OutputStreamWriter(new FileOutputStream(tmp), XML_ENCODING);
-        generate(fw, styles);
-        fw.close();
-
-        //Step 3. Substitute the template entry with the generated data
-        FileOutputStream out = new FileOutputStream("big-grid.xlsx");
-        substitute(new File("template.xlsx"), tmp, sheetRef.substring(1), out);
-        out.close();
-        
-        wb.close();
-    }
-
-    /**
-     * Create a library of cell styles.
-     */
-    private static Map<String, XSSFCellStyle> createStyles(XSSFWorkbook wb){
-        Map<String, XSSFCellStyle> styles = new HashMap<String, XSSFCellStyle>();
-        XSSFDataFormat fmt = wb.createDataFormat();
-
-        XSSFCellStyle style1 = wb.createCellStyle();
-        style1.setAlignment(HorizontalAlignment.RIGHT);
-        style1.setDataFormat(fmt.getFormat("0.0%"));
-        styles.put("percent", style1);
-
-        XSSFCellStyle style2 = wb.createCellStyle();
-        style2.setAlignment(HorizontalAlignment.CENTER);
-        style2.setDataFormat(fmt.getFormat("0.0X"));
-        styles.put("coeff", style2);
-
-        XSSFCellStyle style3 = wb.createCellStyle();
-        style3.setAlignment(HorizontalAlignment.RIGHT);
-        style3.setDataFormat(fmt.getFormat("$#,##0.00"));
-        styles.put("currency", style3);
-
-        XSSFCellStyle style4 = wb.createCellStyle();
-        style4.setAlignment(HorizontalAlignment.RIGHT);
-        style4.setDataFormat(fmt.getFormat("mmm dd"));
-        styles.put("date", style4);
-
-        XSSFCellStyle style5 = wb.createCellStyle();
-        XSSFFont headerFont = wb.createFont();
-        headerFont.setBold(true);
-        style5.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        style5.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style5.setFont(headerFont);
-        styles.put("header", style5);
-
-        return styles;
-    }
-
-    private static void generate(Writer out, Map<String, XSSFCellStyle> styles) throws Exception {
-
-        Random rnd = new Random();
-        Calendar calendar = Calendar.getInstance();
-
-        SpreadsheetWriter sw = new SpreadsheetWriter(out);
-        sw.beginSheet();
-
-        //insert header row
-        sw.insertRow(0);
-        int styleIndex = styles.get("header").getIndex();
-        sw.createCell(0, "Title", styleIndex);
-        sw.createCell(1, "% Change", styleIndex);
-        sw.createCell(2, "Ratio", styleIndex);
-        sw.createCell(3, "Expenses", styleIndex);
-        sw.createCell(4, "Date", styleIndex);
-
-        sw.endRow();
-
-        //write data rows
-        for (int rownum = 1; rownum < 100000; rownum++) {
-            sw.insertRow(rownum);
-
-            sw.createCell(0, "Hello, " + rownum + "!");
-            sw.createCell(1, (double)rnd.nextInt(100)/100, styles.get("percent").getIndex());
-            sw.createCell(2, (double)rnd.nextInt(10)/10, styles.get("coeff").getIndex());
-            sw.createCell(3, rnd.nextInt(10000), styles.get("currency").getIndex());
-            sw.createCell(4, calendar, styles.get("date").getIndex());
-
-            sw.endRow();
-
-            calendar.roll(Calendar.DAY_OF_YEAR, 1);
-        }
-        sw.endSheet();
-    }
-
-    /**
-     *
-     * @param zipfile the template file
-     * @param tmpfile the XML file with the sheet data
-     * @param entry the name of the sheet entry to substitute, e.g. xl/worksheets/sheet1.xml
-     * @param out the stream to write the result to
-     */
-    private static void substitute(File zipfile, File tmpfile, String entry, OutputStream out) throws IOException {
-        ZipFile zip = ZipHelper.openZipFile(zipfile);
-        try {
-            ZipOutputStream zos = new ZipOutputStream(out);
-    
-            Enumeration<? extends ZipEntry> en = zip.entries();
-            while (en.hasMoreElements()) {
-                ZipEntry ze = en.nextElement();
-                if(!ze.getName().equals(entry)){
-                    zos.putNextEntry(new ZipEntry(ze.getName()));
-                    InputStream is = zip.getInputStream(ze);
-                    copyStream(is, zos);
-                    is.close();
-                }
-            }
-            zos.putNextEntry(new ZipEntry(entry));
-            InputStream is = new FileInputStream(tmpfile);
-            copyStream(is, zos);
-            is.close();
-    
-            zos.close();
-        } finally {
-            zip.close();
-        }
-    }
-
-    private static void copyStream(InputStream in, OutputStream out) throws IOException {
-        byte[] chunk = new byte[1024];
-        int count;
-        while ((count = in.read(chunk)) >=0 ) {
-          out.write(chunk,0,count);
-        }
-    }
-
-    /**
-     * Writes spreadsheet data in a Writer.
-     * (YK: in future it may evolve in a full-featured API for streaming data in Excel)
-     */
-    public static class SpreadsheetWriter {
-        private final Writer _out;
-        private int _rownum;
-
-        public SpreadsheetWriter(Writer out){
-            _out = out;
-        }
-
-        public void beginSheet() throws IOException {
-            _out.write("<?xml version=\"1.0\" encoding=\""+XML_ENCODING+"\"?>" +
-                    "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">" );
-            _out.write("<sheetData>\n");
-        }
-
-        public void endSheet() throws IOException {
-            _out.write("</sheetData>");
-            _out.write("</worksheet>");
-        }
-
-        /**
-         * Insert a new row
-         *
-         * @param rownum 0-based row number
-         */
-        public void insertRow(int rownum) throws IOException {
-            _out.write("<row r=\""+(rownum+1)+"\">\n");
-            this._rownum = rownum;
-        }
-
-        /**
-         * Insert row end marker
-         */
-        public void endRow() throws IOException {
-            _out.write("</row>\n");
-        }
-
-        public void createCell(int columnIndex, String value, int styleIndex) throws IOException {
-            String ref = new CellReference(_rownum, columnIndex).formatAsString();
-            _out.write("<c r=\""+ref+"\" t=\"inlineStr\"");
-            if(styleIndex != -1) _out.write(" s=\""+styleIndex+"\"");
-            _out.write(">");
-            _out.write("<is><t>"+value+"</t></is>");
-            _out.write("</c>");
-        }
-
-        public void createCell(int columnIndex, String value) throws IOException {
-            createCell(columnIndex, value, -1);
-        }
-
-        public void createCell(int columnIndex, double value, int styleIndex) throws IOException {
-            String ref = new CellReference(_rownum, columnIndex).formatAsString();
-            _out.write("<c r=\""+ref+"\" t=\"n\"");
-            if(styleIndex != -1) _out.write(" s=\""+styleIndex+"\"");
-            _out.write(">");
-            _out.write("<v>"+value+"</v>");
-            _out.write("</c>");
-        }
-
-        public void createCell(int columnIndex, double value) throws IOException {
-            createCell(columnIndex, value, -1);
-        }
-
-        public void createCell(int columnIndex, Calendar value, int styleIndex) throws IOException {
-            createCell(columnIndex, DateUtil.getExcelDate(value, false), styleIndex);
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CalendarDemo.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CalendarDemo.java
deleted file mode 100644
index 48e3fd1..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CalendarDemo.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.usermodel.*;
-
-import java.io.FileOutputStream;
-import java.util.Calendar;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * A  monthly calendar created using Apache POI. Each month is on a separate sheet.
- * This is a version of org.apache.poi.ss.examples.CalendarDemo that demonstrates
- * some XSSF features not avaiable when using common HSSF-XSSF interfaces.
- *
- * <pre>
- * Usage:
- * CalendarDemo <year>
- * </pre>
- *
- * @author Yegor Kozlov
- */
-public class CalendarDemo {
-
-    private static final String[] days = {
-            "Sunday", "Monday", "Tuesday",
-            "Wednesday", "Thursday", "Friday", "Saturday"};
-
-    private static final String[]  months = {
-            "January", "February", "March","April", "May", "June","July", "August",
-            "September","October", "November", "December"};
-
-    public static void main(String[] args) throws Exception {
-
-        Calendar calendar = Calendar.getInstance();
-        if(args.length > 0) calendar.set(Calendar.YEAR, Integer.parseInt(args[0]));
-
-        int year = calendar.get(Calendar.YEAR);
-
-        XSSFWorkbook wb = new XSSFWorkbook();
-        Map<String, XSSFCellStyle> styles = createStyles(wb);
-
-        for (int month = 0; month < 12; month++) {
-            calendar.set(Calendar.MONTH, month);
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            //create a sheet for each month
-            XSSFSheet sheet = wb.createSheet(months[month]);
-
-            //turn off gridlines
-            sheet.setDisplayGridlines(false);
-            sheet.setPrintGridlines(false);
-            XSSFPrintSetup printSetup = sheet.getPrintSetup();
-            printSetup.setOrientation(PrintOrientation.LANDSCAPE);
-            sheet.setFitToPage(true);
-            sheet.setHorizontallyCenter(true);
-
-            //the header row: centered text in 48pt font
-            XSSFRow headerRow = sheet.createRow(0);
-            headerRow.setHeightInPoints(80);
-            XSSFCell titleCell = headerRow.createCell(0);
-            titleCell.setCellValue(months[month] + " " + year);
-            titleCell.setCellStyle(styles.get("title"));
-            sheet.addMergedRegion(CellRangeAddress.valueOf("$A$1:$N$1"));
-
-            //header with month titles
-            XSSFRow monthRow = sheet.createRow(1);
-            for (int i = 0; i < days.length; i++) {
-                //for compatibility with HSSF we have to set column width in units of 1/256th of a character width
-                sheet.setColumnWidth(i*2, 5*256); //the column is 5 characters wide
-                sheet.setColumnWidth(i*2 + 1, 13*256); //the column is 13 characters wide
-                sheet.addMergedRegion(new CellRangeAddress(1, 1, i*2, i*2+1));
-                XSSFCell monthCell = monthRow.createCell(i*2);
-                monthCell.setCellValue(days[i]);
-                monthCell.setCellStyle(styles.get("month"));
-            }
-
-            int cnt = 1, day=1;
-            int rownum = 2;
-            for (int j = 0; j < 6; j++) {
-                XSSFRow row = sheet.createRow(rownum++);
-                row.setHeightInPoints(100);
-                for (int i = 0; i < days.length; i++) {
-                    XSSFCell dayCell_1 = row.createCell(i*2);
-                    XSSFCell dayCell_2 = row.createCell(i*2 + 1);
-
-                    int day_of_week = calendar.get(Calendar.DAY_OF_WEEK);
-                    if(cnt >= day_of_week && calendar.get(Calendar.MONTH) == month) {
-                        dayCell_1.setCellValue(day);
-                        calendar.set(Calendar.DAY_OF_MONTH, ++day);
-
-                        if(i == 0 || i == days.length-1) {
-                            dayCell_1.setCellStyle(styles.get("weekend_left"));
-                            dayCell_2.setCellStyle(styles.get("weekend_right"));
-                        } else {
-                            dayCell_1.setCellStyle(styles.get("workday_left"));
-                            dayCell_2.setCellStyle(styles.get("workday_right"));
-                        }
-                    } else {
-                        dayCell_1.setCellStyle(styles.get("grey_left"));
-                        dayCell_2.setCellStyle(styles.get("grey_right"));
-                    }
-                    cnt++;
-                }
-                if(calendar.get(Calendar.MONTH) > month) break;
-            }
-        }
-
-        // Write the output to a file
-        FileOutputStream out = new FileOutputStream("calendar-"+year+".xlsx");
-        wb.write(out);
-        out.close();
-        
-        wb.close();
-    }
-
-    /**
-     * cell styles used for formatting calendar sheets
-     */
-    private static Map<String, XSSFCellStyle> createStyles(XSSFWorkbook wb){
-        Map<String, XSSFCellStyle> styles = new HashMap<String, XSSFCellStyle>();
-
-        XSSFCellStyle style;
-        XSSFFont titleFont = wb.createFont();
-        titleFont.setFontHeightInPoints((short)48);
-        titleFont.setColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFont(titleFont);
-        styles.put("title", style);
-
-        XSSFFont monthFont = wb.createFont();
-        monthFont.setFontHeightInPoints((short)12);
-        monthFont.setColor(new XSSFColor(new java.awt.Color(255, 255, 255)));
-        monthFont.setBold(true);
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setFont(monthFont);
-        styles.put("month", style);
-
-        XSSFFont dayFont = wb.createFont();
-        dayFont.setFontHeightInPoints((short)14);
-        dayFont.setBold(true);
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setFillForegroundColor(new XSSFColor(new java.awt.Color(228, 232, 243)));
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setLeftBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setFont(dayFont);
-        styles.put("weekend_left", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setFillForegroundColor(new XSSFColor(new java.awt.Color(228, 232, 243)));
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        styles.put("weekend_right", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.LEFT);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 255, 255)));
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setLeftBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setFont(dayFont);
-        styles.put("workday_left", style);
-
-        style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.TOP);
-        style.setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 255, 255)));
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        styles.put("workday_right", style);
-
-        style = wb.createCellStyle();
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setFillForegroundColor(new XSSFColor(new java.awt.Color(234, 234, 234)));
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        styles.put("grey_left", style);
-
-        style = wb.createCellStyle();
-        style.setFillForegroundColor(new XSSFColor(new java.awt.Color(234, 234, 234)));
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89)));
-        styles.put("grey_right", style);
-
-        return styles;
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CellComments.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CellComments.java
deleted file mode 100644
index a94e58a..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CellComments.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.IOException;
-import java.io.FileOutputStream;
-
-/**
- * Demonstrates how to work with excel cell comments.
- *
- * <p>
- * Excel comment is a kind of a text shape,
- * so inserting a comment is very similar to placing a text box in a worksheet
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class CellComments {
-    public static void main(String[] args) throws IOException {
-        Workbook wb = new XSSFWorkbook();
-
-        CreationHelper factory = wb.getCreationHelper();
-
-        Sheet sheet = wb.createSheet();
-
-        Cell cell1 = sheet.createRow(3).createCell(5);
-        cell1.setCellValue("F4");
-
-        Drawing drawing = sheet.createDrawingPatriarch();
-
-        ClientAnchor anchor = factory.createClientAnchor();
-
-        Comment comment1 = drawing.createCellComment(anchor);
-        RichTextString str1 = factory.createRichTextString("Hello, World!");
-        comment1.setString(str1);
-        comment1.setAuthor("Apache POI");
-        cell1.setCellComment(comment1);
-
-        Cell cell2 = sheet.createRow(2).createCell(2);
-        cell2.setCellValue("C3");
-
-        Comment comment2 = drawing.createCellComment(anchor);
-        RichTextString str2 = factory.createRichTextString("XSSF can set cell comments");
-        //apply custom font to the text in the comment
-        Font font = wb.createFont();
-        font.setFontName("Arial");
-        font.setFontHeightInPoints((short)14);
-        font.setBoldweight(Font.BOLDWEIGHT_BOLD);
-        font.setColor(IndexedColors.RED.getIndex());
-        str2.applyFont(font);
-
-        comment2.setString(str2);
-        comment2.setAuthor("Apache POI");
-        comment2.setAddress(new CellAddress("C3"));
-
-        String fname = "comments.xlsx";
-        FileOutputStream out = new FileOutputStream(fname);
-        wb.write(out);
-        out.close();
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateCell.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateCell.java
deleted file mode 100644
index 3e67360..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateCell.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.util.Date;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Illustrates how to create cell and set values of different types.
- */
-public class CreateCell {
-
-
-	public static void main(String[]args) throws Exception {
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        CreationHelper creationHelper = wb.getCreationHelper();
-        Sheet sheet = wb.createSheet("new sheet");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        Row row = sheet.createRow((short)0);
-        // Create a cell and put a value in it.
-        Cell cell = row.createCell((short)0);
-        cell.setCellValue(1);
-
-        //numeric value
-        row.createCell(1).setCellValue(1.2);
-
-        //plain string value
-        row.createCell(2).setCellValue("This is a string cell");
-
-        //rich text string
-        RichTextString str = creationHelper.createRichTextString("Apache");
-        Font font = wb.createFont();
-        font.setItalic(true);
-        font.setUnderline(Font.U_SINGLE);
-        str.applyFont(font);
-        row.createCell(3).setCellValue(str);
-
-        //boolean value
-        row.createCell(4).setCellValue(true);
-
-        //formula
-        row.createCell(5).setCellFormula("SUM(A1:B1)");
-
-        //date
-        CellStyle style = wb.createCellStyle();
-        style.setDataFormat(creationHelper.createDataFormat().getFormat("m/d/yy h:mm"));
-        cell = row.createCell(6);
-        cell.setCellValue(new Date());
-        cell.setCellStyle(style);
-
-        //hyperlink
-        row.createCell(7).setCellFormula("SUM(A1:B1)");
-        cell.setCellFormula("HYPERLINK(\"http://google.com\",\"Google\")");
-
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("ooxml-cell.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-	}
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java
deleted file mode 100644
index a855fee..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreatePivotTable.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- ==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.DataConsolidateFunction;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFPivotTable;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public class CreatePivotTable {
-
-    public static void main(String[] args) throws FileNotFoundException, IOException, InvalidFormatException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-
-        //Create some data to build the pivot table on
-        setCellData(sheet);
-
-        AreaReference source = new AreaReference("A1:D4", SpreadsheetVersion.EXCEL2007);
-        CellReference position = new CellReference("H5");
-        // Create a pivot table on this sheet, with H5 as the top-left cell..
-        // The pivot table's data source is on the same sheet in A1:D4
-        XSSFPivotTable pivotTable = sheet.createPivotTable(source, position);
-        //Configure the pivot table
-        //Use first column as row label
-        pivotTable.addRowLabel(0);
-        //Sum up the second column
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, 1);
-        //Set the third column as filter
-        pivotTable.addColumnLabel(DataConsolidateFunction.AVERAGE, 2);
-        //Add filter on forth column
-        pivotTable.addReportFilter(3);
-
-        FileOutputStream fileOut = new FileOutputStream("ooxml-pivottable.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
-    }
-
-    public static void setCellData(XSSFSheet sheet){
-        Row row1 = sheet.createRow(0);
-        // Create a cell and put a value in it.
-        Cell cell11 = row1.createCell(0);
-        cell11.setCellValue("Names");
-        Cell cell12 = row1.createCell(1);
-        cell12.setCellValue("#");
-        Cell cell13 = row1.createCell(2);
-        cell13.setCellValue("%");
-        Cell cell14 = row1.createCell(3);
-        cell14.setCellValue("Human");
-
-        Row row2 = sheet.createRow(1);
-        Cell cell21 = row2.createCell(0);
-        cell21.setCellValue("Jane");
-        Cell cell22 = row2.createCell(1);
-        cell22.setCellValue(10);
-        Cell cell23 = row2.createCell(2);
-        cell23.setCellValue(100);
-        Cell cell24 = row2.createCell(3);
-        cell24.setCellValue("Yes");
-
-        Row row3 = sheet.createRow(2);
-        Cell cell31 = row3.createCell(0);
-        cell31.setCellValue("Tarzan");
-        Cell cell32 = row3.createCell(1);
-        cell32.setCellValue(5);
-        Cell cell33 = row3.createCell(2);
-        cell33.setCellValue(90);
-        Cell cell34 = row3.createCell(3);
-        cell34.setCellValue("Yes");
-
-        Row row4 = sheet.createRow(3);
-        Cell cell41 = row4.createCell(0);
-        cell41.setCellValue("Terk");
-        Cell cell42 = row4.createCell(1);
-        cell42.setCellValue(10);
-        Cell cell43 = row4.createCell(2);
-        cell43.setCellValue(90);
-        Cell cell44 = row4.createCell(3);
-        cell44.setCellValue("No");
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateTable.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateTable.java
deleted file mode 100644
index c26ff06..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateTable.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFTable;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumns;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableStyleInfo;
-
-/**
- * Demonstrates how to create a simple table using Apache POI.
- */
-public class CreateTable {
-        
-    public static void main(String[] args) throws FileNotFoundException, 
-            IOException {
-        
-        Workbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = (XSSFSheet) wb.createSheet();
-        
-        //Create 
-        XSSFTable table = sheet.createTable();
-        table.setDisplayName("Test");       
-        CTTable cttable = table.getCTTable();
-        
-        //Style configurations
-        CTTableStyleInfo style = cttable.addNewTableStyleInfo();
-        style.setName("TableStyleMedium2");
-        style.setShowColumnStripes(false);
-        style.setShowRowStripes(true);
-        
-        //Set which area the table should be placed in
-        AreaReference reference = new AreaReference(new CellReference(0, 0), 
-                new CellReference(2,2));
-        cttable.setRef(reference.formatAsString());
-        cttable.setId(1);
-        cttable.setName("Test");
-        cttable.setTotalsRowCount(1);
-        
-        CTTableColumns columns = cttable.addNewTableColumns();
-        columns.setCount(3);
-        CTTableColumn column;
-        XSSFRow row;
-        XSSFCell cell;
-        for(int i=0; i<3; i++) {
-            //Create column
-            column = columns.addNewTableColumn();
-            column.setName("Column");
-            column.setId(i+1);
-            //Create row
-            row = sheet.createRow(i);
-            for(int j=0; j<3; j++) {
-                //Create cell
-                cell = row.createCell(j);
-                if(i == 0) {
-                    cell.setCellValue("Column"+j);
-                } else {
-                    cell.setCellValue("0");
-                }
-            }
-        }
-        
-        FileOutputStream fileOut = new FileOutputStream("ooxml-table.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateUserDefinedDataFormats.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateUserDefinedDataFormats.java
deleted file mode 100644
index 4ebaa46..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CreateUserDefinedDataFormats.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * How to set user-defined date formats
- */
-public class CreateUserDefinedDataFormats {
-
-
-    public static void main(String[]args) throws IOException {
-        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("format sheet");
-        CellStyle style;
-        DataFormat format = wb.createDataFormat();
-        Row row;
-        Cell cell;
-        short rowNum = 0;
-        short colNum = 0;
-
-        row = sheet.createRow(rowNum);
-        cell = row.createCell(colNum);
-        cell.setCellValue(11111.25);
-        style = wb.createCellStyle();
-        style.setDataFormat(format.getFormat("0.0"));
-        cell.setCellStyle(style);
-
-        row = sheet.createRow(++rowNum);
-        cell = row.createCell(colNum);
-        cell.setCellValue(11111.25);
-        style = wb.createCellStyle();
-        style.setDataFormat(format.getFormat("#,##0.0000"));
-        cell.setCellStyle(style);
-
-        FileOutputStream fileOut = new FileOutputStream("ooxml_dataFormat.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CustomXMLMapping.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CustomXMLMapping.java
deleted file mode 100644
index 1add0d2..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/CustomXMLMapping.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xssf.extractor.XSSFExportToXml;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * Print all custom XML mappings registered in the given workbook
- */
-public class CustomXMLMapping {
-
-    public static void main(String[] args) throws Exception {
-        OPCPackage pkg = OPCPackage.open(args[0]);
-        XSSFWorkbook wb = new XSSFWorkbook(pkg);
-
-        for (XSSFMap map : wb.getCustomXMLMappings()) {
-            XSSFExportToXml exporter = new XSSFExportToXml(map);
-
-            ByteArrayOutputStream os = new ByteArrayOutputStream();
-            exporter.exportToXML(os, true);
-            String xml = os.toString("UTF-8");
-            System.out.println(xml);
-        }
-        pkg.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java
deleted file mode 100644
index 3f044c8..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.io.InputStream;
-
-/**
- * Demonstrates how you can extract embedded data from a .xlsx file
- */
-public class EmbeddedObjects {
-    public static void main(String[] args) throws Exception {
-        OPCPackage pkg = OPCPackage.open(args[0]);
-        XSSFWorkbook workbook = new XSSFWorkbook(pkg);
-        for (PackagePart pPart : workbook.getAllEmbedds()) {
-            String contentType = pPart.getContentType();
-            // Excel Workbook - either binary or OpenXML
-            if (contentType.equals("application/vnd.ms-excel")) {
-                HSSFWorkbook embeddedWorkbook = new HSSFWorkbook(pPart.getInputStream());
-            }
-            // Excel Workbook - OpenXML file format
-            else if (contentType.equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
-                XSSFWorkbook embeddedWorkbook = new XSSFWorkbook(pPart.getInputStream());
-            }
-            // Word Document - binary (OLE2CDF) file format
-            else if (contentType.equals("application/msword")) {
-                HWPFDocument document = new HWPFDocument(pPart.getInputStream());
-            }
-            // Word Document - OpenXML file format
-            else if (contentType.equals("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) {
-                XWPFDocument document = new XWPFDocument(pPart.getInputStream());
-            }
-            // PowerPoint Document - binary file format
-            else if (contentType.equals("application/vnd.ms-powerpoint")) {
-                HSLFSlideShowImpl slideShow = new HSLFSlideShowImpl(pPart.getInputStream());
-            }
-            // PowerPoint Document - OpenXML file format
-            else if (contentType.equals("application/vnd.openxmlformats-officedocument.presentationml.presentation")) {
-                OPCPackage docPackage = OPCPackage.open(pPart.getInputStream());
-                XSLFSlideShow slideShow = new XSLFSlideShow(docPackage);
-            }
-            // Any other type of embedded object.
-            else {
-                System.out.println("Unknown Embedded Document: " + contentType);
-                InputStream inputStream = pPart.getInputStream();
-            }
-        }
-        pkg.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/FillsAndColors.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/FillsAndColors.java
deleted file mode 100644
index f5edd4a..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/FillsAndColors.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Fills and Colors
- */
-public class FillsAndColors {
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("new sheet");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        Row row = sheet.createRow(1);
-
-        // Aqua background
-        CellStyle style = wb.createCellStyle();
-        style.setFillBackgroundColor(IndexedColors.AQUA.getIndex());
-        style.setFillPattern(CellStyle.BIG_SPOTS);
-        Cell cell = row.createCell(1);
-        cell.setCellValue(new XSSFRichTextString("X"));
-        cell.setCellStyle(style);
-
-        // Orange "foreground", foreground being the fill foreground not the font color.
-        style = wb.createCellStyle();
-        style.setFillForegroundColor(IndexedColors.ORANGE.getIndex());
-        style.setFillPattern(CellStyle.SOLID_FOREGROUND);
-        cell = row.createCell(2);
-        cell.setCellValue(new XSSFRichTextString("X"));
-        cell.setCellStyle(style);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("fill_colors.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/FitSheetToOnePage.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/FitSheetToOnePage.java
deleted file mode 100644
index a781688..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/FitSheetToOnePage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.ss.usermodel.PrintSetup;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public class FitSheetToOnePage {
-
-
-    public static void main(String[]args) throws Exception {
-        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("format sheet");
-        PrintSetup ps = sheet.getPrintSetup();
-
-        sheet.setAutobreaks(true);
-
-        ps.setFitHeight((short) 1);
-        ps.setFitWidth((short) 1);
-
-        // Create various cells and rows for spreadsheet.
-
-        FileOutputStream fileOut = new FileOutputStream("fitSheetToOnePage.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/HeadersAndFooters.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/HeadersAndFooters.java
deleted file mode 100644
index 8b95fe6..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/HeadersAndFooters.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.ss.usermodel.Footer;
-import org.apache.poi.ss.usermodel.Header;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public class HeadersAndFooters {
-
-
-    public static void main(String[]args) throws Exception {
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("first-header - format sheet");
-        sheet.createRow(0).createCell(0).setCellValue(123);
-
-        //set page numbers in the footer
-        Footer footer = sheet.getFooter();
-        //&P == current page number
-        //&N == page numbers
-        footer.setRight("Page &P of &N");
-
-        
-        Header firstHeader=((XSSFSheet)sheet).getFirstHeader();
-        //&F == workbook file name
-        firstHeader.setLeft("&F ......... first header");
-        
-        for(int i=0;i<100;i=i+10){
-            sheet.createRow(i).createCell(0).setCellValue(123);
-        }
-        
-        
-        XSSFSheet sheet2 = (XSSFSheet)wb.createSheet("odd header-even footer");
-        Header oddHeader=sheet2.getOddHeader();
-        //&B == bold
-        //&E == double underline
-        //&D == date
-        oddHeader.setCenter("&B &E oddHeader     &D ");
-        
-        Footer evenFooter=sheet2.getEvenFooter();
-        evenFooter.setRight("even footer &P");
-        sheet2.createRow(10).createCell(0).setCellValue("Second sheet with an oddHeader and an evenFooter");
-
-        for(int i=0;i<200;i=i+10){
-            sheet2.createRow(i).createCell(0).setCellValue(123);
-        }
-        
-        XSSFSheet sheet3 = (XSSFSheet)wb.createSheet("odd header- odd footer");
-        sheet3.createRow(10).createCell(0).setCellValue("Third sheet with oddHeader and oddFooter");
-        Header oddH=sheet3.getOddHeader();
-        //&C == centered
-        oddH.setCenter("centered oddHeader");
-        oddH.setLeft("left ");
-        oddH.setRight("right ");
-        
-        Footer oddF=sheet3.getOddFooter();
-        oddF.setLeft("Page &P");
-        oddF.setRight("Pages &N ");
-        
-        FileOutputStream fileOut = new FileOutputStream("headerFooter.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/HyperlinkExample.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/HyperlinkExample.java
deleted file mode 100644
index a84d32a..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/HyperlinkExample.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Demonstrates how to create hyperlinks.
- */
-public class HyperlinkExample {
-
-
-    public static void main(String[]args) throws IOException {
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        CreationHelper createHelper = wb.getCreationHelper();
-
-        //cell style for hyperlinks
-        //by default hyperlinks are blue and underlined
-        CellStyle hlink_style = wb.createCellStyle();
-        Font hlink_font = wb.createFont();
-        hlink_font.setUnderline(Font.U_SINGLE);
-        hlink_font.setColor(IndexedColors.BLUE.getIndex());
-        hlink_style.setFont(hlink_font);
-
-        Cell cell;
-        Sheet sheet = wb.createSheet("Hyperlinks");
-        //URL
-        cell = sheet.createRow(0).createCell(0);
-        cell.setCellValue("URL Link");
-
-        Hyperlink link = createHelper.createHyperlink(HyperlinkType.URL);
-        link.setAddress("http://poi.apache.org/");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
-
-        //link to a file in the current directory
-        cell = sheet.createRow(1).createCell(0);
-        cell.setCellValue("File Link");
-        link = createHelper.createHyperlink(HyperlinkType.FILE);
-        link.setAddress("link1.xls");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
-
-        //e-mail link
-        cell = sheet.createRow(2).createCell(0);
-        cell.setCellValue("Email Link");
-        link = createHelper.createHyperlink(HyperlinkType.EMAIL);
-        //note, if subject contains white spaces, make sure they are url-encoded
-        link.setAddress("mailto:poi@apache.org?subject=Hyperlinks");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
-
-        //link to a place in this workbook
-
-        //create a target sheet and cell
-        Sheet sheet2 = wb.createSheet("Target Sheet");
-        sheet2.createRow(0).createCell(0).setCellValue("Target Cell");
-
-        cell = sheet.createRow(3).createCell(0);
-        cell.setCellValue("Worksheet Link");
-        Hyperlink link2 = createHelper.createHyperlink(HyperlinkType.DOCUMENT);
-        link2.setAddress("'Target Sheet'!A1");
-        cell.setHyperlink(link2);
-        cell.setCellStyle(hlink_style);
-
-        FileOutputStream out = new FileOutputStream("hyperinks.xlsx");
-        wb.write(out);
-        out.close();
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java
deleted file mode 100644
index 99d1cac..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-
-import java.io.FileInputStream;
-
-/**
- *  Iterate over rows and cells
- */
-public class IterateCells {
-
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook(new FileInputStream(args[0]));
-        for (int i = 0; i < wb.getNumberOfSheets(); i++) {
-            Sheet sheet = wb.getSheetAt(i);
-            System.out.println(wb.getSheetName(i));
-            for (Row row : sheet) {
-                System.out.println("rownum: " + row.getRowNum());
-                for (Cell cell : row) {
-                    System.out.println(cell.toString());
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/LineChart.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/LineChart.java
deleted file mode 100644
index d8564c5..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/LineChart.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.charts.AxisCrosses;
-import org.apache.poi.ss.usermodel.charts.AxisPosition;
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ChartDataSource;
-import org.apache.poi.ss.usermodel.charts.ChartLegend;
-import org.apache.poi.ss.usermodel.charts.DataSources;
-import org.apache.poi.ss.usermodel.charts.LegendPosition;
-import org.apache.poi.ss.usermodel.charts.LineChartData;
-import org.apache.poi.ss.usermodel.charts.ValueAxis;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Line chart example.
- */
-public class LineChart {
-
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("linechart");
-        final int NUM_OF_ROWS = 3;
-        final int NUM_OF_COLUMNS = 10;
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        Row row;
-        Cell cell;
-        for (int rowIndex = 0; rowIndex < NUM_OF_ROWS; rowIndex++) {
-            row = sheet.createRow((short) rowIndex);
-            for (int colIndex = 0; colIndex < NUM_OF_COLUMNS; colIndex++) {
-                cell = row.createCell((short) colIndex);
-                cell.setCellValue(colIndex * (rowIndex + 1));
-            }
-        }
-
-        Drawing drawing = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 0, 5, 10, 15);
-
-        Chart chart = drawing.createChart(anchor);
-        ChartLegend legend = chart.getOrCreateLegend();
-        legend.setPosition(LegendPosition.TOP_RIGHT);
-
-        LineChartData data = chart.getChartDataFactory().createLineChartData();
-
-        // Use a category axis for the bottom axis.
-        ChartAxis bottomAxis = chart.getChartAxisFactory().createCategoryAxis(AxisPosition.BOTTOM);
-        ValueAxis leftAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.LEFT);
-        leftAxis.setCrosses(AxisCrosses.AUTO_ZERO);
-
-        ChartDataSource<Number> xs = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(0, 0, 0, NUM_OF_COLUMNS - 1));
-        ChartDataSource<Number> ys1 = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(1, 1, 0, NUM_OF_COLUMNS - 1));
-        ChartDataSource<Number> ys2 = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(2, 2, 0, NUM_OF_COLUMNS - 1));
-
-
-        data.addSeries(xs, ys1);
-        data.addSeries(xs, ys2);
-
-        chart.plot(data, bottomAxis, leftAxis);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("ooxml-line-chart.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/LoadPasswordProtectedXlsx.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/LoadPasswordProtectedXlsx.java
deleted file mode 100644
index da6032f..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/LoadPasswordProtectedXlsx.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.crypt.examples.EncryptionUtils;
-import org.apache.poi.examples.util.TempFileUtils;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.crypt.temp.AesZipFileZipEntrySource;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * An example that loads a password protected workbook and counts the sheets.
- * <p><ul>
- * <li>The example demonstrates that all temp files are removed.
- * <li><code>AesZipFileZipEntrySource</code> is used to ensure that temp files are encrypted.
- * </ul><p>
- */
-public class LoadPasswordProtectedXlsx {
-    
-    public static void main(String[] args) throws Exception {
-        if(args.length != 2) {
-            throw new IllegalArgumentException("Expected 2 params: filename and password");
-        }
-        TempFileUtils.checkTempFiles();
-        String filename = args[0];
-        String password = args[1];
-        FileInputStream fis = new FileInputStream(filename);
-        try {
-            InputStream unencryptedStream = EncryptionUtils.decrypt(fis, password);
-            try {
-                printSheetCount(unencryptedStream);
-            } finally {
-                IOUtils.closeQuietly(unencryptedStream);
-            }
-        } finally {
-            IOUtils.closeQuietly(fis);
-        }
-        TempFileUtils.checkTempFiles();
-    }
-    
-    public static void printSheetCount(final InputStream inputStream) throws Exception {
-        AesZipFileZipEntrySource source = AesZipFileZipEntrySource.createZipEntrySource(inputStream);
-        try {
-            OPCPackage pkg = OPCPackage.open(source);
-            try {
-                XSSFWorkbook workbook = new XSSFWorkbook(pkg);
-                try {
-                    System.out.println("sheet count: " + workbook.getNumberOfSheets());
-                } finally {
-                    IOUtils.closeQuietly(workbook);
-                }
-            } finally {
-                IOUtils.closeQuietly(pkg);
-            }
-        } finally {
-            IOUtils.closeQuietly(source);
-        }
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/MergingCells.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/MergingCells.java
deleted file mode 100644
index 9d63268..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/MergingCells.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-
-import java.io.FileOutputStream;
-
-/**
- * An example of how to merge regions of cells.
- */
-public class MergingCells {
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("new sheet");
-
-        Row row = sheet.createRow((short) 1);
-        Cell cell = row.createCell((short) 1);
-        cell.setCellValue(new XSSFRichTextString("This is a test of merging"));
-
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 1, 2));
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("merging_cells.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/NewLinesInCells.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/NewLinesInCells.java
deleted file mode 100644
index eb17935..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/NewLinesInCells.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * How to use newlines in cells
- */
-public class NewLinesInCells {
-
-    public static void main(String[]args) throws Exception {
-        Workbook wb = new XSSFWorkbook();   //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        Row row = sheet.createRow(2);
-        Cell cell = row.createCell(2);
-        cell.setCellValue("Use \n with word wrap on to create a new line");
-
-        //to enable newlines you need set a cell styles with wrap=true
-        CellStyle cs = wb.createCellStyle();
-        cs.setWrapText(true);
-        cell.setCellStyle(cs);
-
-        //increase row height to accomodate two lines of text
-        row.setHeightInPoints((2*sheet.getDefaultRowHeightInPoints()));
-
-        //adjust column width to fit the content
-        sheet.autoSizeColumn(2);
-
-        FileOutputStream fileOut = new FileOutputStream("ooxml-newlines.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/Outlining.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/Outlining.java
deleted file mode 100644
index 869316f..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/Outlining.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public class Outlining {
-
-    public static void main(String[] args) throws Exception {
-        Outlining o=new Outlining();
-        o.groupRowColumn();
-        o.collapseExpandRowColumn();
-    }
-
-
-    private void groupRowColumn() throws Exception {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet1 = wb.createSheet("new sheet");
-
-        sheet1.groupRow( 5, 14 );
-        sheet1.groupRow( 7, 14 );
-        sheet1.groupRow( 16, 19 );
-
-        sheet1.groupColumn( (short)4, (short)7 );
-        sheet1.groupColumn( (short)9, (short)12 );
-        sheet1.groupColumn( (short)10, (short)11 );
-
-        OutputStream fileOut = new FileOutputStream("outlining.xlsx");
-        try {
-            wb.write(fileOut);
-        } finally {
-            fileOut.close();
-        }
-    }
-
-    private void collapseExpandRowColumn() throws Exception {
-        Workbook wb2 = new XSSFWorkbook();
-        Sheet sheet2 = wb2.createSheet("new sheet");
-        sheet2.groupRow( 5, 14 );
-        sheet2.groupRow( 7, 14 );
-        sheet2.groupRow( 16, 19 );
-
-        sheet2.groupColumn( (short)4, (short)7 );
-        sheet2.groupColumn( (short)9, (short)12 );
-        sheet2.groupColumn( (short)10, (short)11 );
-
-
-        sheet2.setRowGroupCollapsed( 7, true );
-        //sheet1.setRowGroupCollapsed(7,false);
-
-        sheet2.setColumnGroupCollapsed( (short)4, true );
-        sheet2.setColumnGroupCollapsed( (short)4, false );
-
-        OutputStream fileOut = new FileOutputStream("outlining_collapsed.xlsx");
-        try {
-            wb2.write(fileOut);
-        } finally {
-            fileOut.close();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/ScatterChart.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/ScatterChart.java
deleted file mode 100644
index f0a9477..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/ScatterChart.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.*;
-import org.apache.poi.ss.usermodel.charts.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Illustrates how to create a simple scatter chart.
- *
- * @author Roman Kashitsyn
- */
-public class ScatterChart {
-
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("Sheet 1");
-        final int NUM_OF_ROWS = 3;
-        final int NUM_OF_COLUMNS = 10;
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        Row row;
-        Cell cell;
-        for (int rowIndex = 0; rowIndex < NUM_OF_ROWS; rowIndex++) {
-            row = sheet.createRow((short) rowIndex);
-            for (int colIndex = 0; colIndex < NUM_OF_COLUMNS; colIndex++) {
-                cell = row.createCell((short) colIndex);
-                cell.setCellValue(colIndex * (rowIndex + 1));
-            }
-        }
-
-        Drawing drawing = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 0, 5, 10, 15);
-
-        Chart chart = drawing.createChart(anchor);
-        ChartLegend legend = chart.getOrCreateLegend();
-        legend.setPosition(LegendPosition.TOP_RIGHT);
-
-        ScatterChartData data = chart.getChartDataFactory().createScatterChartData();
-
-        ValueAxis bottomAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.BOTTOM);
-        ValueAxis leftAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.LEFT);
-        leftAxis.setCrosses(AxisCrosses.AUTO_ZERO);
-
-        ChartDataSource<Number> xs = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(0, 0, 0, NUM_OF_COLUMNS - 1));
-        ChartDataSource<Number> ys1 = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(1, 1, 0, NUM_OF_COLUMNS - 1));
-        ChartDataSource<Number> ys2 = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(2, 2, 0, NUM_OF_COLUMNS - 1));
-
-
-        data.addSerie(xs, ys1);
-        data.addSerie(xs, ys2);
-
-        chart.plot(data, bottomAxis, leftAxis);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("ooxml-scatter-chart.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/SelectedSheet.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/SelectedSheet.java
deleted file mode 100644
index 43a6b48..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/SelectedSheet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public abstract class SelectedSheet {
-    
-    public static void main(String[]args) throws IOException {
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-
-        wb.createSheet("row sheet");
-        wb.createSheet("another sheet");
-        Sheet sheet3 = wb.createSheet(" sheet 3 ");
-        sheet3.setSelected(true);
-        wb.setActiveSheet(2);
-
-        // Create various cells and rows for spreadsheet.
-
-        FileOutputStream fileOut = new FileOutputStream("selectedSheet.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
-    }
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/ShiftRows.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/ShiftRows.java
deleted file mode 100644
index ec4bb21..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/ShiftRows.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * How to shift rows up or down 
- */
-public class ShiftRows {
-
-    public static void main(String[]args) throws Exception {
-        Workbook wb = new XSSFWorkbook();   //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-
-        Row row1 = sheet.createRow(1);
-        row1.createCell(0).setCellValue(1);
-
-        Row row2 = sheet.createRow(4);
-        row2.createCell(1).setCellValue(2);
-
-        Row row3 = sheet.createRow(5);
-        row3.createCell(2).setCellValue(3);
-
-        Row row4 = sheet.createRow(6);
-        row4.createCell(3).setCellValue(4);
-
-        Row row5 = sheet.createRow(9);
-        row5.createCell(4).setCellValue(5);
-
-        // Shift rows 6 - 11 on the spreadsheet to the top (rows 0 - 5)
-        sheet.shiftRows(5, 10, -4);
-
-        FileOutputStream fileOut = new FileOutputStream("shiftRows.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-
-    }
-
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/SplitAndFreezePanes.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/SplitAndFreezePanes.java
deleted file mode 100644
index 937086b..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/SplitAndFreezePanes.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.FileOutputStream;
-
-/**
- * How to set spklit and freeze panes
- */
-public class SplitAndFreezePanes {
-    public static void main(String[]args) throws Exception {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet1 = wb.createSheet("new sheet");
-        Sheet sheet2 = wb.createSheet("second sheet");
-        Sheet sheet3 = wb.createSheet("third sheet");
-        Sheet sheet4 = wb.createSheet("fourth sheet");
-
-        // Freeze just one row
-        sheet1.createFreezePane(0, 1, 0, 1);
-        // Freeze just one column
-        sheet2.createFreezePane(1, 0, 1, 0);
-        // Freeze the columns and rows (forget about scrolling position of the lower right quadrant).
-        sheet3.createFreezePane(2, 2);
-        // Create a split with the lower left side being the active quadrant
-        sheet4.createSplitPane(2000, 2000, 0, 0, Sheet.PANE_LOWER_LEFT);
-
-        FileOutputStream fileOut = new FileOutputStream("splitFreezePane.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkbookProperties.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkbookProperties.java
deleted file mode 100644
index 3a8fd56..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkbookProperties.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.POIXMLProperties;
-
-/**
- *  How to set extended and custom properties
- *
- * @author Yegor Kozlov
- */
-public class WorkbookProperties {
-
-    public static void main(String[]args) throws Exception {
-
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        workbook.createSheet("Workbook Properties");
-
-        POIXMLProperties props = workbook.getProperties();
-
-        /**
-         * Extended properties are a predefined set of metadata properties
-         * that are specifically applicable to Office Open XML documents.
-         * Extended properties consist of 24 simple properties and 3 complex properties stored in the
-         *  part targeted by the relationship of type
-         */
-        POIXMLProperties.ExtendedProperties ext =  props.getExtendedProperties();
-        ext.getUnderlyingProperties().setCompany("Apache Software Foundation");
-        ext.getUnderlyingProperties().setTemplate("XSSF");
-
-        /**
-         * Custom properties enable users to define custom metadata properties.
-         */
-        
-        POIXMLProperties.CustomProperties cust =  props.getCustomProperties();
-        cust.addProperty("Author", "John Smith");
-        cust.addProperty("Year", 2009);
-        cust.addProperty("Price", 45.50);
-        cust.addProperty("Available", true);
-
-        FileOutputStream out = new FileOutputStream("workbook.xlsx");
-        workbook.write(out);
-        out.close();
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithBorders.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithBorders.java
deleted file mode 100644
index 6e12fff..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithBorders.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.*;
-
-import java.io.FileOutputStream;
-
-/**
- * Working with borders
- */
-public class WorkingWithBorders {
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("borders");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        Row row = sheet.createRow((short) 1);
-
-        // Create a cell and put a value in it.
-        Cell cell = row.createCell((short) 1);
-        cell.setCellValue(4);
-
-        // Style the cell with borders all around.
-        CellStyle style = wb.createCellStyle();
-        style.setBorderBottom(CellStyle.BORDER_THIN);
-        style.setBottomBorderColor(IndexedColors.BLACK.getIndex());
-        style.setBorderLeft(CellStyle.BORDER_THIN);
-        style.setLeftBorderColor(IndexedColors.GREEN.getIndex());
-        style.setBorderRight(CellStyle.BORDER_THIN);
-        style.setRightBorderColor(IndexedColors.BLUE.getIndex());
-        style.setBorderTop(CellStyle.BORDER_MEDIUM_DASHED);
-        style.setTopBorderColor(IndexedColors.BLACK.getIndex());
-        cell.setCellStyle(style);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("xssf-borders.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithFonts.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithFonts.java
deleted file mode 100644
index 3d4393b..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithFonts.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.ss.usermodel.IndexedColors;
-
-import java.io.FileOutputStream;
-
-/**
- * Working with Fonts
- */
-public class WorkingWithFonts {
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("Fonts");
-
-        Font font0 = wb.createFont();
-        font0.setColor(IndexedColors.BROWN.getIndex());
-        CellStyle style0 = wb.createCellStyle();
-        style0.setFont(font0);
-
-        Font font1 = wb.createFont();
-        font1.setFontHeightInPoints((short)14);
-        font1.setFontName("Courier New");
-        font1.setColor(IndexedColors.RED.getIndex());
-        CellStyle style1 = wb.createCellStyle();
-        style1.setFont(font1);
-
-        Font font2 = wb.createFont();
-        font2.setFontHeightInPoints((short)16);
-        font2.setFontName("Arial");
-        font2.setColor(IndexedColors.GREEN.getIndex());
-        CellStyle style2 = wb.createCellStyle();
-        style2.setFont(font2);
-
-        Font font3 = wb.createFont();
-        font3.setFontHeightInPoints((short)18);
-        font3.setFontName("Times New Roman");
-        font3.setColor(IndexedColors.LAVENDER.getIndex());
-        CellStyle style3 = wb.createCellStyle();
-        style3.setFont(font3);
-
-        Font font4 = wb.createFont();
-        font4.setFontHeightInPoints((short)18);
-        font4.setFontName("Wingdings");
-        font4.setColor(IndexedColors.GOLD.getIndex());
-        CellStyle style4 = wb.createCellStyle();
-        style4.setFont(font4);
-
-        Font font5 = wb.createFont();
-        font5.setFontName("Symbol");
-        CellStyle style5 = wb.createCellStyle();
-        style5.setFont(font5);
-
-        Cell cell0 = sheet.createRow(0).createCell(1);
-        cell0.setCellValue("Default");
-        cell0.setCellStyle(style0);
-
-        Cell cell1 = sheet.createRow(1).createCell(1);
-        cell1.setCellValue("Courier");
-        cell1.setCellStyle(style1);
-
-        Cell cell2 = sheet.createRow(2).createCell(1);
-        cell2.setCellValue("Arial");
-        cell2.setCellStyle(style2);
-
-        Cell cell3 = sheet.createRow(3).createCell(1);
-        cell3.setCellValue("Times New Roman");
-        cell3.setCellStyle(style3);
-
-        Cell cell4 = sheet.createRow(4).createCell(1);
-        cell4.setCellValue("Wingdings");
-        cell4.setCellStyle(style4);
-
-        Cell cell5 = sheet.createRow(5).createCell(1);
-        cell5.setCellValue("Symbol");
-        cell5.setCellStyle(style5);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("xssf-fonts.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPageSetup.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPageSetup.java
deleted file mode 100644
index 25f994f..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPageSetup.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Demonstrates various settings avaiable in the Page Setup dialog
- */
-public class WorkingWithPageSetup {
-
-    public static void main(String[]args) throws Exception {
-        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
-
-        /**
-         * It's possible to set up repeating rows and columns in your printouts by using the setRepeatingRowsAndColumns() function in the Workbook object.
-         *
-         * This function Contains 5 parameters:
-         * The first parameter is the index to the sheet (0 = first sheet).
-         * The second and third parameters specify the range for the columns to repreat.
-         * To stop the columns from repeating pass in -1 as the start and end column.
-         * The fourth and fifth parameters specify the range for the rows to repeat.
-         * To stop the columns from repeating pass in -1 as the start and end rows.
-         */
-        Sheet sheet1 = wb.createSheet("new sheet");
-        Sheet sheet2 = wb.createSheet("second sheet");
-
-        // Set the columns to repeat from column 0 to 2 on the first sheet
-        Row row1 = sheet1.createRow(0);
-        row1.createCell(0).setCellValue(1);
-        row1.createCell(1).setCellValue(2);
-        row1.createCell(2).setCellValue(3);
-        Row row2 = sheet1.createRow(1);
-        row2.createCell(1).setCellValue(4);
-        row2.createCell(2).setCellValue(5);
-
-
-        Row row3 = sheet2.createRow(1);
-        row3.createCell(0).setCellValue(2.1);
-        row3.createCell(4).setCellValue(2.2);
-        row3.createCell(5).setCellValue(2.3);
-        Row row4 = sheet2.createRow(2);
-        row4.createCell(4).setCellValue(2.4);
-        row4.createCell(5).setCellValue(2.5);
-
-        // Set the columns to repeat from column 0 to 2 on the first sheet
-        sheet1.setRepeatingColumns(CellRangeAddress.valueOf("A:C"));
-        // Set the the repeating rows and columns on the second sheet.
-        CellRangeAddress cra = CellRangeAddress.valueOf("E2:F3");
-        sheet2.setRepeatingColumns(cra);
-        sheet2.setRepeatingRows(cra);
-
-        //set the print area for the first sheet
-        wb.setPrintArea(0, 1, 2, 0, 3);
-
-
-        FileOutputStream fileOut = new FileOutputStream("xssf-printsetup.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPictures.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPictures.java
deleted file mode 100644
index e7aeaaa..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPictures.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.util.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-/**
- * Demonstrates how to insert pictures in a SpreadsheetML document
- *
- * @author Yegor Kozlov
- */
-public class WorkingWithPictures {
-    public static void main(String[] args) throws IOException {
-
-        //create a new workbook
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        try {
-            CreationHelper helper = wb.getCreationHelper();
-    
-            //add a picture in this workbook.
-            InputStream is = new FileInputStream(args[0]);
-            byte[] bytes = IOUtils.toByteArray(is);
-            is.close();
-            int pictureIdx = wb.addPicture(bytes, Workbook.PICTURE_TYPE_JPEG);
-    
-            //create sheet
-            Sheet sheet = wb.createSheet();
-    
-            //create drawing
-            Drawing drawing = sheet.createDrawingPatriarch();
-    
-            //add a picture shape
-            ClientAnchor anchor = helper.createClientAnchor();
-            anchor.setCol1(1);
-            anchor.setRow1(1);
-            Picture pict = drawing.createPicture(anchor, pictureIdx);
-    
-            //auto-size picture
-            pict.resize(2);
-    
-            //save workbook
-            String file = "picture.xls";
-            if(wb instanceof XSSFWorkbook) file += "x"; // NOSONAR
-            OutputStream fileOut = new FileOutputStream(file);
-            try {
-                wb.write(fileOut);
-            } finally {
-                fileOut.close();
-            }
-        } finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java b/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java
deleted file mode 100644
index 09def94..0000000
--- a/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-/**
- * Demonstrates how to work with rich text
- */
-public class WorkingWithRichText {
-
-    public static void main(String[] args) throws Exception {
-
-        XSSFWorkbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-            XSSFRow row = sheet.createRow((short) 2);
-    
-            XSSFCell cell = row.createCell(1);
-            XSSFRichTextString rt = new XSSFRichTextString("The quick brown fox");
-    
-            XSSFFont font1 = wb.createFont();
-            font1.setBold(true);
-            font1.setColor(new XSSFColor(new java.awt.Color(255, 0, 0)));
-            rt.applyFont(0, 10, font1);
-    
-            XSSFFont font2 = wb.createFont();
-            font2.setItalic(true);
-            font2.setUnderline(XSSFFont.U_DOUBLE);
-            font2.setColor(new XSSFColor(new java.awt.Color(0, 255, 0)));
-            rt.applyFont(10, 19, font2);
-    
-            XSSFFont font3 = wb.createFont();
-            font3.setColor(new XSSFColor(new java.awt.Color(0, 0, 255)));
-            rt.append(" Jumped over the lazy dog", font3);
-    
-            cell.setCellValue(rt);
-    
-            // Write the output to a file
-            OutputStream fileOut = new FileOutputStream("xssf-richtext.xlsx");
-            try {
-                wb.write(fileOut);
-            } finally {
-                fileOut.close();
-            }
-        } finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/BetterHeaderFooterExample.java b/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/BetterHeaderFooterExample.java
deleted file mode 100644
index fe5f5ad..0000000
--- a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/BetterHeaderFooterExample.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel.examples;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.wp.usermodel.HeaderFooterType;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFFooter;
-import org.apache.poi.xwpf.usermodel.XWPFHeader;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-
-public class BetterHeaderFooterExample {
-
-    public static void main(String[] args) {
-        XWPFDocument doc = new XWPFDocument();
-
-        XWPFParagraph p = doc.createParagraph();
-
-        XWPFRun r = p.createRun();
-        r.setText("Some Text");
-        r.setBold(true);
-        r = p.createRun();
-        r.setText("Goodbye");
-
-        // create header/footer functions insert an empty paragraph
-        XWPFHeader head = doc.createHeader(HeaderFooterType.DEFAULT);
-        head.createParagraph().createRun().setText("header");
-        
-        XWPFFooter foot = doc.createFooter(HeaderFooterType.DEFAULT);
-        foot.createParagraph().createRun().setText("footer");
-        
-        try {
-            OutputStream os = new FileOutputStream(new File("header2.docx"));
-            doc.write(os);
-            doc.close();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/HeaderFooterTable.java b/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/HeaderFooterTable.java
deleted file mode 100644
index a2b9103..0000000
--- a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/HeaderFooterTable.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel.examples;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-
-import org.apache.poi.wp.usermodel.HeaderFooterType;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFFooter;
-import org.apache.poi.xwpf.usermodel.XWPFHeader;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblGrid;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblGridCol;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblLayoutType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblLayoutType;
-
-public class HeaderFooterTable {
-
-    public static void main(String[] args) throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        
-        // Create a header with a 1 row, 3 column table
-        // changes made for issue 57366 allow a new header or footer
-        // to be created empty. This is a change. You will have to add
-        // either a paragraph or a table to the header or footer for
-        // the document to be considered valid.
-        XWPFHeader hdr = doc.createHeader(HeaderFooterType.DEFAULT);
-        XWPFTable tbl = hdr.createTable(1, 3);
-        
-        // Set the padding around text in the cells to 1/10th of an inch
-        int pad = (int) (.1 * 1440);
-        tbl.setCellMargins(pad, pad, pad, pad);
-
-        // Set table width to 6.5 inches in 1440ths of a point
-        tbl.setWidth((int)(6.5 * 1440));
-        // Can not yet set table or cell width properly, tables default to
-        // autofit layout, and this requires fixed layout
-        CTTbl ctTbl = tbl.getCTTbl();
-        CTTblPr ctTblPr = ctTbl.addNewTblPr();
-        CTTblLayoutType layoutType = ctTblPr.addNewTblLayout();
-        layoutType.setType(STTblLayoutType.FIXED);
-
-        // Now set up a grid for the table, cells will fit into the grid
-        // Each cell width is 3120 in 1440ths of an inch, or 1/3rd of 6.5"
-        BigInteger w = new BigInteger("3120");
-        CTTblGrid grid = ctTbl.addNewTblGrid();
-        for (int i = 0; i < 3; i++) {
-            CTTblGridCol gridCol = grid.addNewGridCol();
-            gridCol.setW(w);
-        }
-        
-        // Add paragraphs to the cells
-        XWPFTableRow row = tbl.getRow(0);
-        XWPFTableCell cell = row.getCell(0);
-        XWPFParagraph p = cell.getParagraphArray(0);
-        XWPFRun r = p.createRun();
-        r.setText("header left cell");
-
-        cell = row.getCell(1);
-        p = cell.getParagraphArray(0);
-        r = p.createRun();
-        r.setText("header center cell");
-
-        cell = row.getCell(2);
-        p = cell.getParagraphArray(0);
-        r = p.createRun();
-        r.setText("header right cell");
-
-        // Create a footer with a Paragraph
-        XWPFFooter ftr = doc.createFooter(HeaderFooterType.DEFAULT);
-        p = ftr.createParagraph();
-
-        r = p.createRun();
-        r.setText("footer text");
-
-        OutputStream os = new FileOutputStream(new File("headertable.docx"));
-        doc.write(os);
-        doc.close();
-	}
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleDocument.java b/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleDocument.java
deleted file mode 100644
index 1553321..0000000
--- a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleDocument.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel.examples;
-
-import java.io.FileOutputStream;
-
-import org.apache.poi.xwpf.usermodel.Borders;
-import org.apache.poi.xwpf.usermodel.BreakClear;
-import org.apache.poi.xwpf.usermodel.BreakType;
-import org.apache.poi.xwpf.usermodel.LineSpacingRule;
-import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
-import org.apache.poi.xwpf.usermodel.TextAlignment;
-import org.apache.poi.xwpf.usermodel.UnderlinePatterns;
-import org.apache.poi.xwpf.usermodel.VerticalAlign;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-
-/**
- * A simple WOrdprocessingML document created by POI XWPF API
- *
- * @author Yegor Kozlov
- */
-public class SimpleDocument {
-
-    public static void main(String[] args) throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-
-        XWPFParagraph p1 = doc.createParagraph();
-        p1.setAlignment(ParagraphAlignment.CENTER);
-        p1.setBorderBottom(Borders.DOUBLE);
-        p1.setBorderTop(Borders.DOUBLE);
-
-        p1.setBorderRight(Borders.DOUBLE);
-        p1.setBorderLeft(Borders.DOUBLE);
-        p1.setBorderBetween(Borders.SINGLE);
-
-        p1.setVerticalAlignment(TextAlignment.TOP);
-
-        XWPFRun r1 = p1.createRun();
-        r1.setBold(true);
-        r1.setText("The quick brown fox");
-        r1.setBold(true);
-        r1.setFontFamily("Courier");
-        r1.setUnderline(UnderlinePatterns.DOT_DOT_DASH);
-        r1.setTextPosition(100);
-
-        XWPFParagraph p2 = doc.createParagraph();
-        p2.setAlignment(ParagraphAlignment.RIGHT);
-
-        //BORDERS
-        p2.setBorderBottom(Borders.DOUBLE);
-        p2.setBorderTop(Borders.DOUBLE);
-        p2.setBorderRight(Borders.DOUBLE);
-        p2.setBorderLeft(Borders.DOUBLE);
-        p2.setBorderBetween(Borders.SINGLE);
-
-        XWPFRun r2 = p2.createRun();
-        r2.setText("jumped over the lazy dog");
-        r2.setStrike(true);
-        r2.setFontSize(20);
-
-        XWPFRun r3 = p2.createRun();
-        r3.setText("and went away");
-        r3.setStrike(true);
-        r3.setFontSize(20);
-        r3.setSubscript(VerticalAlign.SUPERSCRIPT);
-
-
-        XWPFParagraph p3 = doc.createParagraph();
-        p3.setWordWrap(true);
-        p3.setPageBreak(true);
-                
-        //p3.setAlignment(ParagraphAlignment.DISTRIBUTE);
-        p3.setAlignment(ParagraphAlignment.BOTH);
-        p3.setSpacingLineRule(LineSpacingRule.EXACT);
-
-        p3.setIndentationFirstLine(600);
-        
-
-        XWPFRun r4 = p3.createRun();
-        r4.setTextPosition(20);
-        r4.setText("To be, or not to be: that is the question: "
-                + "Whether 'tis nobler in the mind to suffer "
-                + "The slings and arrows of outrageous fortune, "
-                + "Or to take arms against a sea of troubles, "
-                + "And by opposing end them? To die: to sleep; ");
-        r4.addBreak(BreakType.PAGE);
-        r4.setText("No more; and by a sleep to say we end "
-                + "The heart-ache and the thousand natural shocks "
-                + "That flesh is heir to, 'tis a consummation "
-                + "Devoutly to be wish'd. To die, to sleep; "
-                + "To sleep: perchance to dream: ay, there's the rub; "
-                + ".......");
-        r4.setItalic(true);
-//This would imply that this break shall be treated as a simple line break, and break the line after that word:
-
-        XWPFRun r5 = p3.createRun();
-        r5.setTextPosition(-10);
-        r5.setText("For in that sleep of death what dreams may come");
-        r5.addCarriageReturn();
-        r5.setText("When we have shuffled off this mortal coil,"
-                + "Must give us pause: there's the respect"
-                + "That makes calamity of so long life;");
-        r5.addBreak();
-        r5.setText("For who would bear the whips and scorns of time,"
-                + "The oppressor's wrong, the proud man's contumely,");
-        
-        r5.addBreak(BreakClear.ALL);
-        r5.setText("The pangs of despised love, the law's delay,"
-                + "The insolence of office and the spurns" + ".......");
-
-        FileOutputStream out = new FileOutputStream("simple.docx");
-        doc.write(out);
-        out.close();
-
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleDocumentWithHeader.java b/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleDocumentWithHeader.java
deleted file mode 100644
index a798ebd..0000000
--- a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleDocumentWithHeader.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel.examples;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
-
-/**
- * 
- * @author Richard Ngo
- *
- */
-public class SimpleDocumentWithHeader {
-
-	private static XWPFParagraph[] pars;
-
-	public static void main(String[] args) {
-		XWPFDocument doc = new XWPFDocument();
-
-		XWPFParagraph p = doc.createParagraph();
-
-		XWPFRun r = p.createRun();
-		r.setText("Some Text");
-		r.setBold(true);
-		r = p.createRun();
-		r.setText("Goodbye");
-
-		CTP ctP = CTP.Factory.newInstance();
-		CTText t = ctP.addNewR().addNewT();
-		t.setStringValue("header");
-		pars = new XWPFParagraph[1];
-		p = new XWPFParagraph(ctP, doc);
-		pars[0] = p;
-
-		XWPFHeaderFooterPolicy hfPolicy = doc.createHeaderFooterPolicy();
-		hfPolicy.createHeader(XWPFHeaderFooterPolicy.DEFAULT, pars);
-		
-		ctP = CTP.Factory.newInstance();
-		t = ctP.addNewR().addNewT();
-		t.setStringValue("My Footer");
-		pars[0] = new XWPFParagraph(ctP, doc);
-		hfPolicy.createFooter(XWPFHeaderFooterPolicy.DEFAULT, pars);
-		
-		try {
-			OutputStream os = new FileOutputStream(new File("header.docx"));
-			doc.write(os);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleImages.java b/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleImages.java
deleted file mode 100644
index 7e95c7a..0000000
--- a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleImages.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xwpf.usermodel.examples;
-
-import org.apache.poi.util.Units;
-import org.apache.poi.xwpf.usermodel.BreakType;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-/**
- * Demonstrates how to add pictures in a .docx document
- *
- * @author Yegor Kozlov
- */
-public class SimpleImages {
-
-    public static void main(String[] args) throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        XWPFRun r = p.createRun();
-
-        for(String imgFile : args) {
-            int format;
-
-            if(imgFile.endsWith(".emf")) format = XWPFDocument.PICTURE_TYPE_EMF;
-            else if(imgFile.endsWith(".wmf")) format = XWPFDocument.PICTURE_TYPE_WMF;
-            else if(imgFile.endsWith(".pict")) format = XWPFDocument.PICTURE_TYPE_PICT;
-            else if(imgFile.endsWith(".jpeg") || imgFile.endsWith(".jpg")) format = XWPFDocument.PICTURE_TYPE_JPEG;
-            else if(imgFile.endsWith(".png")) format = XWPFDocument.PICTURE_TYPE_PNG;
-            else if(imgFile.endsWith(".dib")) format = XWPFDocument.PICTURE_TYPE_DIB;
-            else if(imgFile.endsWith(".gif")) format = XWPFDocument.PICTURE_TYPE_GIF;
-            else if(imgFile.endsWith(".tiff")) format = XWPFDocument.PICTURE_TYPE_TIFF;
-            else if(imgFile.endsWith(".eps")) format = XWPFDocument.PICTURE_TYPE_EPS;
-            else if(imgFile.endsWith(".bmp")) format = XWPFDocument.PICTURE_TYPE_BMP;
-            else if(imgFile.endsWith(".wpg")) format = XWPFDocument.PICTURE_TYPE_WPG;
-            else {
-                System.err.println("Unsupported picture: " + imgFile +
-                        ". Expected emf|wmf|pict|jpeg|png|dib|gif|tiff|eps|bmp|wpg");
-                continue;
-            }
-
-            r.setText(imgFile);
-            r.addBreak();
-            r.addPicture(new FileInputStream(imgFile), format, imgFile, Units.toEMU(200), Units.toEMU(200)); // 200x200 pixels
-            r.addBreak(BreakType.PAGE);
-        }
-
-        FileOutputStream out = new FileOutputStream("images.docx");
-        doc.write(out);
-        out.close();
-    }
-
-
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleTable.java b/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleTable.java
deleted file mode 100644
index a3857ff..0000000
--- a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/SimpleTable.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel.examples;
-
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.List;
-
-import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
-import org.apache.poi.xwpf.usermodel.UnderlinePatterns;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHeight;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShd;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTrPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVerticalJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STShd;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc;
-
-/**
- * This program creates a simple WordprocessingML table using POI XWPF API, and
- * a more complex, styled table using both XWPF and ooxml-schema. It's possible
- * that not all referenced wordprocessingml classes are defined in
- * poi-ooxml-schemas-3.8-beta4. If this is the case, you'll need to use the full
- * ooxml-schemas.jar library.
- *
- * @author gisella bronzetti (original)
- * @author Gregg Morris (styled table)
- */
-public class SimpleTable {
-
-    public static void main(String[] args) throws Exception {
-    	try {
-    		createSimpleTable();
-    	}
-    	catch(Exception e) {
-    		System.out.println("Error trying to create simple table.");
-    		throw(e);
-    	}
-    	try {
-    		createStyledTable();
-    	}
-    	catch(Exception e) {
-    		System.out.println("Error trying to create styled table.");
-    		throw(e);
-    	}
-    }
-
-    public static void createSimpleTable() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-
-        try {
-            XWPFTable table = doc.createTable(3, 3);
-
-            table.getRow(1).getCell(1).setText("EXAMPLE OF TABLE");
-
-            // table cells have a list of paragraphs; there is an initial
-            // paragraph created when the cell is created. If you create a
-            // paragraph in the document to put in the cell, it will also
-            // appear in the document following the table, which is probably
-            // not the desired result.
-            XWPFParagraph p1 = table.getRow(0).getCell(0).getParagraphs().get(0);
-
-            XWPFRun r1 = p1.createRun();
-            r1.setBold(true);
-            r1.setText("The quick brown fox");
-            r1.setItalic(true);
-            r1.setFontFamily("Courier");
-            r1.setUnderline(UnderlinePatterns.DOT_DOT_DASH);
-            r1.setTextPosition(100);
-
-            table.getRow(2).getCell(2).setText("only text");
-
-            OutputStream out = new FileOutputStream("simpleTable.docx");
-            try {
-                doc.write(out);
-            } finally {
-                out.close();
-            }
-        } finally {
-            doc.close();
-        }
-    }
-
-    /**
-     * Create a table with some row and column styling. I "manually" add the
-     * style name to the table, but don't check to see if the style actually
-     * exists in the document. Since I'm creating it from scratch, it obviously
-     * won't exist. When opened in MS Word, the table style becomes "Normal".
-     * I manually set alternating row colors. This could be done using Themes,
-     * but that's left as an exercise for the reader. The cells in the last
-     * column of the table have 10pt. "Courier" font.
-     * I make no claims that this is the "right" way to do it, but it worked
-     * for me. Given the scarcity of XWPF examples, I thought this may prove
-     * instructive and give you ideas for your own solutions.
-
-     * @throws Exception
-     */
-    public static void createStyledTable() throws Exception {
-    	// Create a new document from scratch
-        XWPFDocument doc = new XWPFDocument();
-
-        try {
-            // -- OR --
-            // open an existing empty document with styles already defined
-            //XWPFDocument doc = new XWPFDocument(new FileInputStream("base_document.docx"));
-
-            // Create a new table with 6 rows and 3 columns
-            int nRows = 6;
-            int nCols = 3;
-            XWPFTable table = doc.createTable(nRows, nCols);
-
-            // Set the table style. If the style is not defined, the table style
-            // will become "Normal".
-            CTTblPr tblPr = table.getCTTbl().getTblPr();
-            CTString styleStr = tblPr.addNewTblStyle();
-            styleStr.setVal("StyledTable");
-
-            // Get a list of the rows in the table
-            List<XWPFTableRow> rows = table.getRows();
-            int rowCt = 0;
-            int colCt = 0;
-            for (XWPFTableRow row : rows) {
-                // get table row properties (trPr)
-                CTTrPr trPr = row.getCtRow().addNewTrPr();
-                // set row height; units = twentieth of a point, 360 = 0.25"
-                CTHeight ht = trPr.addNewTrHeight();
-                ht.setVal(BigInteger.valueOf(360));
-
-                // get the cells in this row
-                List<XWPFTableCell> cells = row.getTableCells();
-                // add content to each cell
-                for (XWPFTableCell cell : cells) {
-                    // get a table cell properties element (tcPr)
-                    CTTcPr tcpr = cell.getCTTc().addNewTcPr();
-                    // set vertical alignment to "center"
-                    CTVerticalJc va = tcpr.addNewVAlign();
-                    va.setVal(STVerticalJc.CENTER);
-
-                    // create cell color element
-                    CTShd ctshd = tcpr.addNewShd();
-                    ctshd.setColor("auto");
-                    ctshd.setVal(STShd.CLEAR);
-                    if (rowCt == 0) {
-                        // header row
-                        ctshd.setFill("A7BFDE");
-                    } else if (rowCt % 2 == 0) {
-                        // even row
-                        ctshd.setFill("D3DFEE");
-                    } else {
-                        // odd row
-                        ctshd.setFill("EDF2F8");
-                    }
-
-                    // get 1st paragraph in cell's paragraph list
-                    XWPFParagraph para = cell.getParagraphs().get(0);
-                    // create a run to contain the content
-                    XWPFRun rh = para.createRun();
-                    // style cell as desired
-                    if (colCt == nCols - 1) {
-                        // last column is 10pt Courier
-                        rh.setFontSize(10);
-                        rh.setFontFamily("Courier");
-                    }
-                    if (rowCt == 0) {
-                        // header row
-                        rh.setText("header row, col " + colCt);
-                        rh.setBold(true);
-                        para.setAlignment(ParagraphAlignment.CENTER);
-                    } else {
-                        // other rows
-                        rh.setText("row " + rowCt + ", col " + colCt);
-                        para.setAlignment(ParagraphAlignment.LEFT);
-                    }
-                    colCt++;
-                } // for cell
-                colCt = 0;
-                rowCt++;
-            } // for row
-
-            // write the file
-            OutputStream out = new FileOutputStream("styledTable.docx");
-            try {
-                doc.write(out);
-            } finally {
-                out.close();
-            }
-        } finally {
-            doc.close();
-        }
-    }
-}
diff --git a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/UpdateEmbeddedDoc.java b/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/UpdateEmbeddedDoc.java
deleted file mode 100644
index 410f3c6..0000000
--- a/trunk/src/examples/src/org/apache/poi/xwpf/usermodel/examples/UpdateEmbeddedDoc.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xwpf.usermodel.examples;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Iterator;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Cell;
-
-/**
- * Tests whether it is possible to successfully update an Excel workbook that is
- * embedded into a WordprocessingML document. Note that the test has currently
- * only been conducted with a binary Excel workbook and NOT yet with a
- * SpreadsheetML workbook embedded into the document.
- *
- * <p>
- *     This code was successfully tested with the following file from the POI test collection:
- *     http://svn.apache.org/repos/asf/poi/trunk/test-data/document/EmbeddedDocument.docx
- * </p>
- *
- * @author Mark B
- */
-public class UpdateEmbeddedDoc {
-
-    private XWPFDocument doc = null;
-    private File docFile = null;
-
-    private static final int SHEET_NUM = 0;
-    private static final int ROW_NUM = 0;
-    private static final int CELL_NUM = 0;
-    private static final double NEW_VALUE = 100.98D;
-    private static final String BINARY_EXTENSION = "xls";
-    private static final String OPENXML_EXTENSION = "xlsx";
-
-    /**
-     * Create a new instance of the UpdateEmbeddedDoc class using the following
-     * parameters;
-     *
-     * @param filename An instance of the String class that encapsulates the name
-     *                 of and path to a WordprocessingML Word document that contains an
-     *                 embedded binary Excel workbook.
-     * @throws java.io.FileNotFoundException Thrown if the file cannot be found
-     *                                       on the underlying file system.
-     * @throws java.io.IOException           Thrown if a problem occurs in the underlying
-     *                                       file system.
-     */
-    public UpdateEmbeddedDoc(String filename) throws FileNotFoundException, IOException {
-        this.docFile = new File(filename);
-        FileInputStream fis = null;
-        if (!this.docFile.exists()) {
-            throw new FileNotFoundException("The Word dcoument " +
-                    filename +
-                    " does not exist.");
-        }
-        try {
-
-            // Open the Word document file and instantiate the XWPFDocument
-            // class.
-            fis = new FileInputStream(this.docFile);
-            this.doc = new XWPFDocument(fis);
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                    fis = null;
-                } catch (IOException ioEx) {
-                    System.out.println("IOException caught trying to close " +
-                            "FileInputStream in the constructor of " +
-                            "UpdateEmbeddedDoc.");
-                }
-            }
-        }
-    }
-
-    /**
-     * Called to update the embedded Excel workbook. As the format and structire
-     * of the workbook are known in advance, all this code attempts to do is
-     * write a new value into the first cell on the first row of the first
-     * worksheet. Prior to executing this method, that cell will contain the
-     * value 1.
-     *
-     * @throws org.apache.poi.openxml4j.exceptions.OpenXML4JException
-     *                             Rather
-     *                             than use the specific classes (HSSF/XSSF) to handle the embedded
-     *                             workbook this method uses those defeined in the SS stream. As
-     *                             a result, it might be the case that a SpreadsheetML file is
-     *                             opened for processing, throwing this exception if that file is
-     *                             invalid.
-     * @throws java.io.IOException Thrown if a problem occurs in the underlying
-     *                             file system.
-     */
-    public void updateEmbeddedDoc() throws OpenXML4JException, IOException {
-        Workbook workbook = null;
-        Sheet sheet = null;
-        Row row = null;
-        Cell cell = null;
-        PackagePart pPart = null;
-        Iterator<PackagePart> pIter = null;
-        List<PackagePart> embeddedDocs = this.doc.getAllEmbedds();
-        if (embeddedDocs != null && !embeddedDocs.isEmpty()) {
-            pIter = embeddedDocs.iterator();
-            while (pIter.hasNext()) {
-                pPart = pIter.next();
-                if (pPart.getPartName().getExtension().equals(BINARY_EXTENSION) ||
-                        pPart.getPartName().getExtension().equals(OPENXML_EXTENSION)) {
-
-                    // Get an InputStream from the pacage part and pass that
-                    // to the create method of the WorkbookFactory class. Update
-                    // the resulting Workbook and then stream that out again
-                    // using an OutputStream obtained from the same PackagePart.
-                    workbook = WorkbookFactory.create(pPart.getInputStream());
-                    sheet = workbook.getSheetAt(SHEET_NUM);
-                    row = sheet.getRow(ROW_NUM);
-                    cell = row.getCell(CELL_NUM);
-                    cell.setCellValue(NEW_VALUE);
-                    workbook.write(pPart.getOutputStream());
-                }
-            }
-
-            // Finally, write the newly modified Word document out to file.
-            this.doc.write(new FileOutputStream(this.docFile));
-        }
-    }
-
-    /**
-     * Called to test whether or not the embedded workbook was correctly
-     * updated. This method simply recovers the first cell from the first row
-     * of the first workbook and tests the value it contains.
-     * <p/>
-     * Note that execution will not continue up to the assertion as the
-     * embedded workbook is now corrupted and causes an IllegalArgumentException
-     * with the following message
-     * <p/>
-     * <em>java.lang.IllegalArgumentException: Your InputStream was neither an
-     * OLE2 stream, nor an OOXML stream</em>
-     * <p/>
-     * to be thrown when the WorkbookFactory.createWorkbook(InputStream) method
-     * is executed.
-     *
-     * @throws org.apache.poi.openxml4j.exceptions.OpenXML4JException
-     *                             Rather
-     *                             than use the specific classes (HSSF/XSSF) to handle the embedded
-     *                             workbook this method uses those defeined in the SS stream. As
-     *                             a result, it might be the case that a SpreadsheetML file is
-     *                             opened for processing, throwing this exception if that file is
-     *                             invalid.
-     * @throws java.io.IOException Thrown if a problem occurs in the underlying
-     *                             file system.
-     */
-    public void checkUpdatedDoc() throws OpenXML4JException, IOException {
-        Workbook workbook = null;
-        Sheet sheet = null;
-        Row row = null;
-        Cell cell = null;
-        PackagePart pPart = null;
-        Iterator<PackagePart> pIter = null;
-        List<PackagePart> embeddedDocs = this.doc.getAllEmbedds();
-        if (embeddedDocs != null && !embeddedDocs.isEmpty()) {
-            pIter = embeddedDocs.iterator();
-            while (pIter.hasNext()) {
-                pPart = pIter.next();
-                if (pPart.getPartName().getExtension().equals(BINARY_EXTENSION) ||
-                        pPart.getPartName().getExtension().equals(OPENXML_EXTENSION)) {
-                    workbook = WorkbookFactory.create(pPart.getInputStream());
-                    sheet = workbook.getSheetAt(SHEET_NUM);
-                    row = sheet.getRow(ROW_NUM);
-                    cell = row.getCell(CELL_NUM);
-                    assertEquals(cell.getNumericCellValue(), NEW_VALUE, 0.0001);
-                }
-            }
-        }
-    }
-
-    /**
-     * Code to test updating of the embedded Excel workbook.
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        try {
-            UpdateEmbeddedDoc ued = new UpdateEmbeddedDoc(args[0]);
-            ued.updateEmbeddedDoc();
-            ued.checkUpdatedDoc();
-        } catch (Exception ex) {
-            System.out.println(ex.getClass().getName());
-            System.out.println(ex.getMessage());
-            ex.printStackTrace(System.out);
-        }
-    }
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
deleted file mode 100644
index bf13348..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.poi.ss.excelant.util.ExcelAntEvaluationResult;
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
-/**
- * Instances of this class are used to evaluate a single cell.  This is usually
- * after some values have been set.  The evaluation is actually performed
- * by a WorkbookUtil instance.  The evaluate() method of the WorkbookUtil
- * class returns an EvaluationResult which encapsulates the results and 
- * information from the evaluation.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
-
- *
- */
-public class ExcelAntEvaluateCell extends Task {
-
-	private String cell ;
-	private double expectedValue ;
-	private double precision ;
-	private double precisionToUse ;
-	private double globalPrecision ;
-	private boolean requiredToPass = false ;
-	
-	
-	private ExcelAntEvaluationResult result  ;
-	
-	private ExcelAntWorkbookUtil wbUtil ;
-	
-	private boolean showDelta = false ;
-	
-	
-	public ExcelAntEvaluateCell() {}
-
-	protected void setWorkbookUtil( ExcelAntWorkbookUtil wb ) {
-		wbUtil = wb ;
-	}
-	
-	public void setShowDelta( boolean value ) {
-		showDelta = value ;
-	}
-	
-	protected boolean showDelta() {
-		return showDelta ;
-	}
-	
-	public void setCell(String cell) {
-		this.cell = cell;
-	}
-	
-	public void setRequiredToPass( boolean val ) {
-	    requiredToPass = val ;
-	}
-	
-	protected boolean requiredToPass() {
-	    return requiredToPass ;
-	}
-
-	public void setExpectedValue(double expectedValue) {
-		this.expectedValue = expectedValue;
-	}
-
-	public void setPrecision(double precision) {
-		this.precision = precision;
-	}
-	
-	protected void setGlobalPrecision( double prec ) {
-		globalPrecision = prec ;
-	}
-
-	protected String getCell() {
-		return cell;
-	}
-
-	protected double getExpectedValue() {
-		return expectedValue;
-	}
-
-	protected double getPrecision() {
-		return precisionToUse;
-	}
-	
-	@Override
-    public void execute() throws BuildException {
-		
-		precisionToUse = 0 ;
-		
-		// if there is a globalPrecision we will use it unless there is also
-		// precision set at the evaluate level, then we use that.  If there
-		// is not a globalPrecision, we will use the local precision.
-		log( "test precision = " + precision + "\tglobal precision = " + globalPrecision, Project.MSG_VERBOSE ) ;
-		if( globalPrecision > 0 ) {
-			if( precision > 0 ) {
-				precisionToUse = precision ;
-				log( "Using evaluate precision of " + precision + " over the " +
-						  "global precision of " + globalPrecision, Project.MSG_VERBOSE ) ;
-			} else {
-				precisionToUse = globalPrecision ;
-				log( "Using global precision of " + globalPrecision, Project.MSG_VERBOSE ) ;
-			}
-		} else {
-			precisionToUse = precision ;
-			log( "Using evaluate precision of " + precision, Project.MSG_VERBOSE ) ;
-		}
-		result = wbUtil.evaluateCell(cell, expectedValue, precisionToUse ) ;
-		
-		StringBuilder sb = new StringBuilder() ;
-		sb.append( "evaluation of cell " ) ;
-		sb.append( cell ) ; 
-		sb.append( " resulted in " ) ;
-		sb.append( result.getReturnValue() ) ;
-		if(showDelta) {
-			sb.append(" with a delta of ").append(result.getDelta());
-		}
-		
-		log( sb.toString(), Project.MSG_DEBUG) ;
-
-	}
-	
-	public ExcelAntEvaluationResult getResult() {
-		return result ;
-	}
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
deleted file mode 100644
index 35f5420..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
-/**
- * This is the class that backs the <handler> tag in the Ant task.
- * <p>
- * Its purpose is to provide a way to manipulate a workbook in the course
- * of an ExcelAnt task.  The idea being to model a way for test writers to
- * simulate the behaviors of the workbook. 
- * <p>
- * Suppose, for example, you have a workbook that has a worksheet that
- * reacts to values entered or selected by the user.  It's possible in
- * Excel to change other cells based on this but this isn't easily possible
- * in POI.  In ExcelAnt we handle this using the Handler, which is a Java
- * class you write to manipulate the workbook. 
- * <p>
- * In order to use this tag you must write a class that implements the 
- * <code>IExcelAntWorkbookHandler</code> interface.  After writing the
- * class you should package it and it's dependencies into a jar file to 
- * add as library in your Ant build file.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public class ExcelAntHandlerTask extends Task {
-    
-    private String className ;
-    
-    private ExcelAntWorkbookUtil wbUtil ;
-
-    public void setClassName( String cName ) {
-        className = cName ;
-    }
-    
-    protected void setEAWorkbookUtil( ExcelAntWorkbookUtil wkbkUtil ) {
-        wbUtil = wkbkUtil ;
-    }
-    
-    @Override
-    public void execute() throws BuildException {
-        log( "handling the workbook with class " + className, Project.MSG_INFO ) ;
-        try {
-            Class<?> clazz = Class.forName( className ) ;
-            Object handlerObj = clazz.newInstance() ;
-            if( handlerObj instanceof IExcelAntWorkbookHandler ) {
-                IExcelAntWorkbookHandler iHandler = (IExcelAntWorkbookHandler)handlerObj ;
-                iHandler.setWorkbook( wbUtil.getWorkbook() ) ;
-                iHandler.execute() ;
-             }
-        } catch( Exception e ) {
-            throw new BuildException( e.getMessage(), e ) ;
-        }
-    }
- }
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
deleted file mode 100644
index 0739ef5..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.tools.ant.taskdefs.Typedef;
-
-/**
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- * 
- */
-public class ExcelAntPrecision extends Typedef {
-	
-	private double value ;
-	
-	public void setValue( double precision ) {
-		value = precision ;
-	}
-	
-	public double getValue() {
-		return value ;
-	}
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSet.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSet.java
deleted file mode 100644
index 974b1b9..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSet.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
-import org.apache.tools.ant.Task;
-
-/**
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- * 
- */
-public abstract class ExcelAntSet extends Task {
-    
-    protected String cellStr ;
-    
-    protected ExcelAntWorkbookUtil wbUtil ;
-    
-    public void setCell( String cellName ) {
-        cellStr = cellName ;
-    }
-    
-    public String getCell() {
-        return cellStr ;
-    }
-    
-    
-    public void setWorkbookUtil( ExcelAntWorkbookUtil wb ) {
-        wbUtil = wb ;
-    }
-
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
deleted file mode 100644
index 2451a61..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-/**
- * Class for use in an Ant build script that sets the value of an Excel
- * sheet cell using the cell id ('Sheet Name'!cellId).
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- * 
- */
-public class ExcelAntSetDoubleCell extends ExcelAntSet {
-	private double cellValue;
-	
-	public ExcelAntSetDoubleCell() {}
-	
-	/**
-	 * Set the value of the specified cell as the double passed in.
-	 * @param value The double-value that should be set when this task is executed.
-	 */
-	public void setValue( double value ) {
-		cellValue = value ;
-	}
-
-	/**
-	 * Return the cell value as a double.
-	 * @return The double-value of the cell as populated via setValue(), null
-	 * 		if the value was not set yet.
-	 */
-	public double getCellValue() {
-		return cellValue;
-	}
-	
-	@Override
-    public void execute() throws BuildException {
-		wbUtil.setDoubleValue(cellStr, cellValue ) ;
-		
-		log( "set cell " + cellStr + " to value " + cellValue + " as double.", Project.MSG_DEBUG ) ;
-	}
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
deleted file mode 100644
index 8dc599b..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-/**
- * Class for use in an Ant build script that sets the formula of an Excel
- * sheet cell using the cell id ('Sheet Name'!cellId).
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public class ExcelAntSetFormulaCell extends ExcelAntSet {
-	
-	
-	private String cellValue ;
-	
-	public ExcelAntSetFormulaCell() {}
-	
-	public void setValue( String value ) {
-		cellValue = value ;
-	}
-
-	protected String getCellValue() {
-		return cellValue;
-	}
-	
-	@Override
-    public void execute() throws BuildException {
-		
-		wbUtil.setFormulaValue( cellStr, cellValue ) ;
-		
-		log( "set cell " + cellStr + " to formula " + cellValue, Project.MSG_DEBUG ) ;
-	}
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
deleted file mode 100644
index e1ab047..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-/**
- * Class for use in an Ant build script that sets the value of an Excel
- * sheet cell using the cell id ('Sheet Name'!cellId).
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public class ExcelAntSetStringCell extends ExcelAntSet {
-	private String stringValue ;
-
-	public ExcelAntSetStringCell() {}
-
-	/**
-	 * Set the value of the cell to the String passed in.
-	 * @param value The string-value that should be set when this task is executed.
-	 */
-	public void setValue(String value ) {
-		stringValue = value ;
-	}
-
-	/**
-	 * Return the value that will be set into the cell.
-	 * @return The string-value of the cell as populated via setValue(), null
-	 * 		if the value was not set yet.
-	 */
-	public String getCellValue() {
-		return stringValue;
-	}
-	
-	@Override
-    public void execute() throws BuildException {
-		wbUtil.setStringValue(cellStr, stringValue ) ;
-		
-		log( "set cell " + cellStr + " to value " + stringValue + " as String.", Project.MSG_DEBUG ) ;
-	}
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
deleted file mode 100644
index e9bb072..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.Locale;
-
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtilFactory;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
-/**
- * Ant task class for testing Excel workbook cells.
- */
-public class ExcelAntTask extends Task {
-    
-    public static final String VERSION = "0.5.0" ;
-	
-	private String excelFileName ;
-	
-	private boolean failOnError = false  ;
-	
-	private ExcelAntWorkbookUtil workbookUtil ;
-	
-	private ExcelAntPrecision precision ;
-	
-	private LinkedList<ExcelAntTest> tests ;
-	private LinkedList<ExcelAntUserDefinedFunction> functions ;
-	
-	public ExcelAntTask() {
-		tests = new LinkedList<ExcelAntTest>() ;
-		functions = new LinkedList<ExcelAntUserDefinedFunction>() ;
-	}
-
-	public void addPrecision( ExcelAntPrecision prec ) {
-		precision = prec ;
-	}
-	
-	public void setFailOnError( boolean value ) {
-		failOnError = value ;
-	}
-	public void setFileName( String fileName ) {
-		excelFileName = fileName ;
-	}
-	
-	public void addTest( ExcelAntTest testElement ) {
-		tests.add( testElement ) ;
-	}
-	
-	public void addUdf( ExcelAntUserDefinedFunction def ) {
-		functions.add( def ) ;
-	}
-	
-	@Override
-    public void execute() throws BuildException {
-        checkClassPath();
-
-		int totalCount = 0 ;
-		int successCount = 0 ;
-		
-		StringBuilder versionBffr = new StringBuilder() ;
-		versionBffr.append(  "ExcelAnt version " ) ;
-		versionBffr.append( VERSION ) ;
-		versionBffr.append( " Copyright 2011" ) ;
-		SimpleDateFormat sdf = new SimpleDateFormat( "yyyy", Locale.ROOT ) ;
-		double currYear = Double.parseDouble( sdf.format( new Date() ) );
-		if( currYear > 2011 ) {
-		    versionBffr.append( "-" ) ;
-		    versionBffr.append( currYear ) ;
-		}
-		log( versionBffr.toString(), Project.MSG_INFO ) ;
-		
-		log( "Using input file: " + excelFileName, Project.MSG_INFO ) ;
-
-        workbookUtil = ExcelAntWorkbookUtilFactory.getInstance(excelFileName);
-		
-		for (ExcelAntTest test : tests) {
-			log("executing test: " + test.getName(), Project.MSG_DEBUG);
-
-			if (workbookUtil == null) {
-			    workbookUtil = ExcelAntWorkbookUtilFactory.getInstance(excelFileName);
-			}
-
-			for (ExcelAntUserDefinedFunction eaUdf : functions) {
-				try {
-					workbookUtil.addFunction(eaUdf.getFunctionAlias(), eaUdf.getClassName());
-				} catch (Exception e) {
-					throw new BuildException(e.getMessage(), e);
-				}
-			}
-			test.setWorkbookUtil(workbookUtil);
-
-			if (precision != null && precision.getValue() > 0) {
-				log("setting precision for the test " + test.getName(), Project.MSG_VERBOSE);
-				test.setPrecision(precision.getValue());
-			}
-
-			test.execute();
-
-			if (test.didTestPass()) {
-				successCount++;
-			} else {
-				if (failOnError) {
-					throw new BuildException("Test " + test.getName() + " failed.");
-				}
-			}
-			totalCount++;
-
-			workbookUtil = null;
-		}
-
-		if( !tests.isEmpty() ) {
-		    log( successCount + "/" + totalCount + " tests passed.", Project.MSG_INFO );
-		}
-        workbookUtil = null;
-	}
-	
-
-    /**
-     * ExcelAnt depends on external libraries not included in the Ant distribution.
-     * Give user a sensible message if any if the required jars are missing.
-     */
-    private void checkClassPath(){
-        try {
-            Class.forName("org.apache.poi.hssf.usermodel.HSSFWorkbook");
-            Class.forName("org.apache.poi.ss.usermodel.WorkbookFactory");
-        } catch (Exception e) {
-            throw new BuildException(
-                    "The <classpath> for <excelant> must include poi.jar and poi-ooxml.jar " +
-                    "if not in Ant's own classpath. Processing .xlsx spreadsheets requires " +
-                    "additional poi-ooxml-schemas.jar, xmlbeans.jar" ,
-                    e, getLocation());
-        }
-
-    }
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java
deleted file mode 100644
index fd8f930..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.apache.poi.ss.excelant.util.ExcelAntEvaluationResult;
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
-/**
- * This class represents a single test.  In order for the test any and all
- * ExcelAntEvaluateCell evaluations must pass.  Therefore it is recommended
- * that you use only 1 evaluator but you can use more if you choose.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public class ExcelAntTest extends Task{
-	private LinkedList<ExcelAntEvaluateCell> evaluators;
-	
-	private LinkedList<Task> testTasks;
-	
-	private String name;
-	
-	private double globalPrecision;
-	
-	private boolean showSuccessDetails = false;
-	
-	private boolean showFailureDetail = false;
-	LinkedList<String> failureMessages;
-	
-
-	private ExcelAntWorkbookUtil workbookUtil;
-	
-	private boolean passed = true;
-
-	
-	public ExcelAntTest() {
-		evaluators = new LinkedList<ExcelAntEvaluateCell>();
-		failureMessages = new LinkedList<String>();
-		testTasks = new LinkedList<Task>();
-	}
-	
-	public void setPrecision( double precision ) {
-		globalPrecision = precision;
-	}
-	
-	public void setWorkbookUtil( ExcelAntWorkbookUtil wbUtil ) {
-		workbookUtil = wbUtil;
-	}
-	
-	
-	public void setShowFailureDetail( boolean value ) {
-		showFailureDetail = value;
-	}
-	
-	public void setName( String nm ) {
-		name = nm;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public void setShowSuccessDetails( boolean details ) {
-	    showSuccessDetails = details;
-	}
-	
-	public boolean showSuccessDetails() {
-	    return showSuccessDetails;
-	}
-	
-	public void addSetDouble( ExcelAntSetDoubleCell setter ) {
-	    addSetter( setter );
-	}
-	
-	public void addSetString( ExcelAntSetStringCell setter ){
-	    addSetter( setter );
-	}
-	
-	public void addSetFormula( ExcelAntSetFormulaCell setter ) {
-	    addSetter( setter );
-	}
-	
-	public void addHandler( ExcelAntHandlerTask handler ) {
-	    testTasks.add( handler );
-	}
-	
-	private void addSetter( ExcelAntSet setter ) {
-//		setters.add( setter );
-		testTasks.add( setter );
-	}
-	
-	public void addEvaluate( ExcelAntEvaluateCell evaluator ) {
-//		evaluators.add( evaluator );
-		testTasks.add( evaluator );
-	}
-	
-//	public LinkedList<ExcelAntSet> getSetters() {
-//		return setters;
-//	}
-
-	protected LinkedList<ExcelAntEvaluateCell> getEvaluators() {
-		return evaluators;
-	}
-	
-	@Override
-    public void execute() throws BuildException {
-	    
-	    Iterator<Task> taskIt = testTasks.iterator();
-
-	    int testCount = evaluators.size();
-	    int failureCount = 0;
-	        
-	    // roll over all sub task elements in one loop.  This allows the
-	    // ordering of the sub elements to be considered. 
-	    while( taskIt.hasNext() ) {
-	        Task task = taskIt.next();
-	        
-	       // log( task.getClass().getName(), Project.MSG_INFO );
-	        
-	        if( task instanceof ExcelAntSet ) {
-	            ExcelAntSet set = (ExcelAntSet) task;
-	            set.setWorkbookUtil(workbookUtil);
-	            set.execute();
-	        }
-	        
-	        if( task instanceof ExcelAntHandlerTask ) {
-	            ExcelAntHandlerTask handler = (ExcelAntHandlerTask)task;
-	            handler.setEAWorkbookUtil(workbookUtil );
-	            handler.execute();
-	        }
-	        
-	        if (task instanceof ExcelAntEvaluateCell ) {
-	            ExcelAntEvaluateCell eval = (ExcelAntEvaluateCell)task;
-	            eval.setWorkbookUtil( workbookUtil );
-	            
-	            if( globalPrecision > 0 ) {
-	                log( "setting globalPrecision to " + globalPrecision + " in the evaluator", Project.MSG_VERBOSE );
-	                eval.setGlobalPrecision( globalPrecision );
-	            }
-
-	            try {
-	                eval.execute();
-	                ExcelAntEvaluationResult result = eval.getResult();
-	                if( result.didTestPass() &&
-							!result.evaluationCompleteWithError()) {
-	                    if(showSuccessDetails) {
-	                        log("Succeeded when evaluating " + 
-	                         result.getCellName() + ".  It evaluated to " + 
-                             result.getReturnValue() + " when the value of " + 
-                             eval.getExpectedValue() + " with precision of " + 
-                             eval.getPrecision(), Project.MSG_INFO );
-	                    }
-	                } else {
-	                    if(showFailureDetail) {
-	                        failureMessages.add( "\tFailed to evaluate cell " + 
-	                         result.getCellName() + ".  It evaluated to " + 
-	                         result.getReturnValue() + " when the value of " + 
-	                         eval.getExpectedValue() + " with precision of " + 
-	                         eval.getPrecision() + " was expected." );
-
-	                    }
-	                    passed = false;
-	                    failureCount++;
-	                    
-	                    if(eval.requiredToPass()) {
-	                        throw new BuildException( "\tFailed to evaluate cell " + 
-	                                result.getCellName() + ".  It evaluated to " + 
-	                                result.getReturnValue() + " when the value of " + 
-	                                eval.getExpectedValue() + " with precision of " + 
-	                                eval.getPrecision() + " was expected." );
-	                    }
-	                }
-	            } catch( NullPointerException npe ) {
-	                // this means the cell reference in the test is bad.
-	                log( "Cell assignment " + eval.getCell() + " in test " + getName() + 
-	                      " appears to point to an empy cell.  Please check the " +
-	                      " reference in the ant script.", Project.MSG_ERR );
-	            }
-	        }
-	    }
- 
-		if(!passed) {
-			log( "Test named " + name + " failed because " + failureCount + 
-					 " of " + testCount + " evaluations failed to " + 
-					 "evaluate correctly.", 
-					 Project.MSG_ERR );
-			if(showFailureDetail && failureMessages.size() > 0 ) {
-				for (String failureMessage : failureMessages) {
-					log(failureMessage, Project.MSG_ERR);
-				}
-			}
-		}
-	}
-
-	public boolean didTestPass() {
-		
-		return passed;
-	}
- }
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
deleted file mode 100644
index 5c19912..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.tools.ant.taskdefs.Typedef;
-
-/**
- * This class encapsulates the Strings necessary to create the User Defined
- * Function instances that will be passed to POI's Evaluator instance.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public class ExcelAntUserDefinedFunction extends Typedef {
-
-	
-	public String functionAlias ;
-	
-	public String className ;
-
-	
-	public ExcelAntUserDefinedFunction() {}
-
-	protected String getFunctionAlias() {
-		return functionAlias;
-	}
-
-	public void setFunctionAlias(String functionAlias) {
-		this.functionAlias = functionAlias;
-	}
-
-	protected String getClassName() {
-	    // workaround for IBM JDK assigning the classname to the lowercase instance provided by Definer!?!
-	    // I could not find out why that happens, the wrong assignment seems to be done somewhere deep inside Ant itself
-	    // or even in IBM JDK as Oracle JDK does not have this problem.
-	    if(className == null) {
-	        return getClassname();
-	    }
-
-		return className;
-	}
-
-	public void setClassName(String className) {
-		this.className = className;
-	}
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
deleted file mode 100644
index 139e34c..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant;
-
-import org.apache.poi.ss.usermodel.Workbook;
-
-
-/**
- * In Excel there are many ways to handle manipulating a workbook based 
- * on some arbitrary user action (onChange, etc).  You use this interface
- * to create classes that will handle the workbook in whatever manner is needed
- * that cannot be handled by POI.
- * <p>
- * For example, suppose that in Excel when you update a cell the workbook
- * does some calculations and updates other cells based on that change.  In
- * ExcelAnt you would set the value of the cell then write your own handler
- * then call that from your Ant task after the set task.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public interface IExcelAntWorkbookHandler {
-    public void setWorkbook( Workbook workbook ) ;
-    
-    public void execute() ;
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
deleted file mode 100644
index 4eecd4f..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant.util;
-
-/**
- * A simple class that encapsulates information about a cell evaluation
- * from POI.
- * 
- * @author Jon Svede (jon [at] loquatic [dot] com)
- * @author Brian Bush (brian [dot] bush [at] nrel [dot] gov)
- *
- */
-public class ExcelAntEvaluationResult {
-	
-	/**
-	 * This boolean flag is used to determine if the evaluation completed
-	 * without error.  This alone doesn't ensure that the evaluation was 
-	 * successful.
-	 */
-	private boolean evaluationCompletedWithError ;
-	
-	/**
-	 * This boolean flag is used to determine if the result was within
-	 * the specified precision.
-	 */
-	private boolean didPass ;
-	
-	/**
-	 * This is the actual value returned from the evaluation.
-	 */
-	private double returnValue ;
-	
-	/**
-	 * Any error message String values that need to be returned.
-	 */
-	private String errorMessage ;
-	
-	/**
-	 * Stores the absolute value of the delta for this evaluation.
-	 */
-	private double actualDelta ;
-	
-	/**
-	 * This stores the fully qualified cell name (sheetName!cellId).
-	 */
-	private String cellName ;
-	
-	
-
-	public ExcelAntEvaluationResult(boolean completedWithError,
-			                 boolean passed, 
-			                 double retValue, 
-			                 String errMessage, 
-			                 double delta,
-			                 String cellId) {
-
-		evaluationCompletedWithError = completedWithError;
-		didPass = passed;
-		returnValue = retValue;
-		errorMessage = errMessage;
-		actualDelta = delta ;
-		cellName = cellId ;
-	}
-
-	public double getReturnValue() {
-		return returnValue;
-	}
-
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-	
-	public boolean didTestPass() {
-		return didPass ;
-	}
-	
-	public boolean evaluationCompleteWithError() {
-		return evaluationCompletedWithError ;
-	}
-	
-	public double getDelta() {
-		return actualDelta ;
-	}
-	
-	public String getCellName() {
-		return cellName ;
-	}
-
-	@Override
-	public String toString() {
-		return "ExcelAntEvaluationResult [evaluationCompletedWithError="
-				+ evaluationCompletedWithError + ", didPass=" + didPass
-				+ ", returnValue=" + returnValue + ", errorMessage="
-				+ errorMessage + ", actualDelta=" + actualDelta + ", cellName="
-				+ cellName + "]";
-	}	
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
deleted file mode 100644
index dcb30a8..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
-import org.apache.poi.ss.formula.udf.DefaultUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Typedef;
-
-/**
- * A general utility class that abstracts the POI details of loading the
- * workbook, accessing and updating cells.
- *
- * @author Jon Svede (jon [at] loquatic [dot] com)
- * @author Brian Bush (brian [dot] bush [at] nrel [dot] gov)
- *
- */
-public class ExcelAntWorkbookUtil extends Typedef {
-
-    private String excelFileName;
-
-    private Workbook workbook;
-
-    private final Map<String, FreeRefFunction> xlsMacroList = new HashMap<String, FreeRefFunction>();
-
-    /**
-     * Constructs an instance using a String that contains the fully qualified
-     * path of the Excel file. This constructor initializes a Workbook instance
-     * based on that file name.
-     *
-     * @param fName The fully qualified path of the Excel file.
-     * @throws BuildException If the workbook cannot be loaded.
-     */
-    protected ExcelAntWorkbookUtil(String fName) {
-        excelFileName = fName;
-        loadWorkbook();
-
-    }
-
-    /**
-     * Constructs an instance based on a Workbook instance.
-     *
-     * @param wb The Workbook to use for this instance.
-     */
-    protected ExcelAntWorkbookUtil(Workbook wb) {
-        workbook = wb;
-    }
-
-    /**
-     * Loads the member variable workbook based on the fileName variable.
-     * @return The opened Workbook-instance
-     * @throws BuildException If the workbook cannot be loaded.
-     */
-    private Workbook loadWorkbook() {
-        if (excelFileName == null) {
-            throw new BuildException("fileName attribute must be set!", getLocation());
-        }
-
-        try {
-            FileInputStream fis = new FileInputStream(excelFileName);
-            try {
-            	workbook = WorkbookFactory.create(fis);
-            } finally {
-            	fis.close();
-            }
-        } catch(Exception e) {
-            throw new BuildException("Cannot load file " + excelFileName
-                    + ". Make sure the path and file permissions are correct.", e);
-        }
-
-        return workbook;
-    }
-
-    /**
-     * Used to add a UDF to the evaluator.
-     * @param name
-     * @param clazzName
-     * @throws ClassNotFoundException
-     * @throws InstantiationException
-     * @throws IllegalAccessException
-     */
-    public void addFunction(String name, String clazzName) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-        Class<?> clazzInst = Class.forName(clazzName);
-        Object newInst = clazzInst.newInstance();
-        if(newInst instanceof FreeRefFunction) {
-            addFunction(name, (FreeRefFunction)newInst);
-        }
-
-    }
-
-    /**
-     * Updates the internal HashMap of functions with instance and alias passed
-     * in.
-     *
-     * @param name
-     * @param func
-     */
-    protected void addFunction(String name, FreeRefFunction func) {
-        xlsMacroList.put(name, func);
-    }
-
-    /**
-     * returns a UDFFinder that contains all of the functions added.
-     *
-     * @return
-     */
-    protected UDFFinder getFunctions() {
-
-        String[] names = new String[xlsMacroList.size()];
-        FreeRefFunction[] functions = new FreeRefFunction[xlsMacroList.size()];
-
-        int x = 0;
-        for(Map.Entry<String, FreeRefFunction> entry : xlsMacroList.entrySet()) {
-            names[x] = entry.getKey();
-            functions[x] = entry.getValue();
-        }
-
-        UDFFinder udff1 = new DefaultUDFFinder(names, functions);
-        UDFFinder udff = new AggregatingUDFFinder(udff1);
-
-        return udff;
-
-    }
-
-    /**
-     * Returns a formula evaluator that is loaded with the functions that
-     * have been supplied.
-     *
-     * @param fileName
-     * @return
-     */
-    protected FormulaEvaluator getEvaluator(String fileName) {
-        FormulaEvaluator evaluator;
-        if (fileName.endsWith(".xlsx")) {
-            if(xlsMacroList.size() > 0) {
-                evaluator = XSSFFormulaEvaluator.create((XSSFWorkbook) workbook,
-                                                         null,
-                                                         getFunctions());
-            }
-            evaluator = new XSSFFormulaEvaluator((XSSFWorkbook) workbook);
-        } else {
-            if(xlsMacroList.size() > 0) {
-                evaluator = HSSFFormulaEvaluator.create((HSSFWorkbook)workbook,
-                                                         null,
-                                                         getFunctions());
-            }
-
-            evaluator = new HSSFFormulaEvaluator((HSSFWorkbook) workbook);
-        }
-
-        return evaluator;
-
-    }
-
-    /**
-     * Returns the Workbook instance associated with this WorkbookUtil.
-     *
-     * @return
-     */
-    public Workbook getWorkbook() {
-        return workbook;
-    }
-
-    /**
-     * Returns the fileName that was used to initialize this instance. May
-     * return null if the instance was constructed from a Workbook object.
-     *
-     * @return
-     */
-    public String getFileName() {
-        return excelFileName;
-    }
-
-    /**
-     * Returns the list of sheet names.
-     *
-     * @return
-     */
-    public List<String> getSheets() {
-    	ArrayList<String> sheets = new ArrayList<String>();
-
-    	int sheetCount = workbook.getNumberOfSheets();
-
-    	for(int x=0; x<sheetCount; x++) {
-    		sheets.add(workbook.getSheetName(x));
-    	}
-
-    	return sheets;
-    }
-
-    /**
-     * This method uses a String in standard Excel format (SheetName!CellId) to
-     * locate the cell and set it to the value of the double in value.
-     *
-     * @param cellName
-     * @param value
-     */
-    public void setDoubleValue(String cellName, double value) {
-        log("starting setCellValue()", Project.MSG_DEBUG);
-        Cell cell = getCell(cellName);
-        log("working on cell: " + cell, Project.MSG_DEBUG);
-        cell.setCellValue(value);
-        log("after cell.setCellValue()", Project.MSG_DEBUG);
-
-        log("set cell " + cellName + " to value " + value, Project.MSG_DEBUG);
-    }
-
-    /**
-     * Utility method for setting the value of a Cell with a String.
-     *
-     * @param cellName
-     * @param value
-     */
-    public void setStringValue(String cellName, String value) {
-        Cell cell = getCell(cellName);
-        cell.setCellValue(value);
-    }
-
-    /**
-     * Utility method for setting the value of a Cell with a Formula.
-     *
-     * @param cellName
-     * @param formula
-     */
-    public void setFormulaValue(String cellName, String formula) {
-        Cell cell = getCell(cellName);
-        cell.setCellFormula(formula);
-    }
-
-    /**
-     * Utility method for setting the value of a Cell with a Date.
-     * @param cellName
-     * @param date
-     */
-    public void setDateValue(String cellName, Date date) {
-        Cell cell = getCell(cellName);
-        cell.setCellValue(date);
-    }
-    /**
-     * Uses a String in standard Excel format (SheetName!CellId) to locate a
-     * cell and evaluate it.
-     *
-     * @param cellName
-     * @param expectedValue
-     * @param precision
-     */
-    public ExcelAntEvaluationResult evaluateCell(String cellName, double expectedValue,
-            double precision) {
-
-        ExcelAntEvaluationResult evalResults = null;
-
-        Cell cell = getCell(cellName);
-
-        FormulaEvaluator evaluator = getEvaluator(excelFileName);
-
-
-        CellValue resultOfEval = evaluator.evaluate(cell);
-
-        if (resultOfEval.getErrorValue() == 0) {
-            // the evaluation did not encounter errors
-            double result = resultOfEval.getNumberValue();
-            double delta = Math.abs(result - expectedValue);
-            if (delta > precision) {
-                evalResults = new ExcelAntEvaluationResult(false, false,
-                        resultOfEval.getNumberValue(),
-                        "Results was out of range based on precision " + " of "
-                                + precision + ".  Delta was actually " + delta, delta, cellName);
-            } else {
-                evalResults = new ExcelAntEvaluationResult(false, true,
-                        resultOfEval.getNumberValue(),
-                        "Evaluation passed without error within in range.", delta, cellName);
-            }
-        } else {
-            String errorMeaning = null;
-            try {
-                errorMeaning = FormulaError.forInt(resultOfEval.getErrorValue()).getString();
-            } catch(IllegalArgumentException iae) {
-                errorMeaning =  "unknown error code: " +
-                                Byte.toString(resultOfEval.getErrorValue());
-            }
-
-            evalResults = new ExcelAntEvaluationResult(true, false,
-                    resultOfEval.getNumberValue(),
-                    "Evaluation failed due to an evaluation error of "
-                            + resultOfEval.getErrorValue()
-                            + " which is "
-                            + errorMeaning, 0, cellName);
-        }
-
-        return evalResults;
-    }
-
-    /**
-     * Returns a Cell as a String value.
-     *
-     * @param cellName
-     * @return
-     */
-    public String getCellAsString(String cellName) {
-    	Cell cell = getCell(cellName);
-		return cell.getStringCellValue();
-    }
-
-
-    /**
-     * Returns the value of the Cell as a double.
-     *
-     * @param cellName
-     * @return
-     */
-    public double getCellAsDouble(String cellName) {
-    	Cell cell = getCell(cellName);
-		return cell.getNumericCellValue();
-    }
-    /**
-     * Returns a cell reference based on a String in standard Excel format
-     * (SheetName!CellId).  This method will create a new cell if the
-     * requested cell isn't initialized yet.
-     *
-     * @param cellName
-     * @return
-     */
-    private Cell getCell(String cellName) {
-        CellReference cellRef = new CellReference(cellName);
-        String sheetName = cellRef.getSheetName();
-        Sheet sheet = workbook.getSheet(sheetName);
-        if(sheet == null) {
-            throw new BuildException("Sheet not found: " + sheetName);
-        }
-
-        int rowIdx = cellRef.getRow();
-        int colIdx = cellRef.getCol();
-        Row row = sheet.getRow(rowIdx);
-
-        if(row == null) {
-        	row = sheet.createRow(rowIdx);
-        }
-
-        Cell cell = row.getCell(colIdx);
-
-        if(cell == null) {
-        	cell = row.createCell(colIdx);
-        }
-
-        return cell;
-    }
-}
diff --git a/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java b/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java
deleted file mode 100644
index 08e7fb3..0000000
--- a/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.excelant.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * This is a factory class maps file names to WorkbookUtil instances.  This
- * helps ExcelAnt be more efficient when being run many times in an Ant build.
- *
- * @author Jon Svede (jon [at] loquatic [dot] com)
- * @author Brian Bush (brian [dot] bush [at] nrel [dot] gov)
- *
- */
-public final class ExcelAntWorkbookUtilFactory {
-
-    private static Map<String, ExcelAntWorkbookUtil> workbookUtilMap;
-
-    private ExcelAntWorkbookUtilFactory() {
-    }
-
-    /**
-     * Using the fileName, check the internal map to see if an instance
-     * of the WorkbookUtil exists.  If not, then add an instance to the map.
-     *
-     * @param fileName The filename to use as key to look for the ExcelAntWorkbookUtil.
-     * @return An instance of ExcelAntWorkbookUtil associated with the filename or
-     *          a freshly instantiated one if none did exist before.
-     */
-    public static ExcelAntWorkbookUtil getInstance(String fileName) {
-        if(workbookUtilMap == null) {
-            workbookUtilMap = new HashMap<String, ExcelAntWorkbookUtil>();
-        }
-
-        if(workbookUtilMap.containsKey(fileName)) {
-            return workbookUtilMap.get(fileName);
-        }
-
-        ExcelAntWorkbookUtil wbu = new ExcelAntWorkbookUtil(fileName);
-        workbookUtilMap.put(fileName, wbu);
-        return wbu;
-    }
-}
diff --git a/trunk/src/excelant/resources/org/apache/poi/ss/excelant/antlib.xml b/trunk/src/excelant/resources/org/apache/poi/ss/excelant/antlib.xml
deleted file mode 100644
index af13cc6..0000000
--- a/trunk/src/excelant/resources/org/apache/poi/ss/excelant/antlib.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<antlib>
-
-    <typedef name="excelant" classname="org.apache.poi.ss.excelant.ExcelAntTask" />
-    <typedef name="test" classname="org.apache.poi.ss.excelant.ExcelAntTest"/>
-    <typedef name="setDouble" classname="org.apache.poi.ss.excelant.ExcelAntSetDoubleCell"/>
-    <typedef name="setString" classname="org.apache.poi.ss.excelant.ExcelAntSetStringCell"/>
-    <typedef name="setFormula" classname="org.apache.poi.ss.excelant.ExcelAntSetFormulaCell"/>
-    <typedef name="evaluate" classname="org.apache.poi.ss.excelant.ExcelAntEvaluateCell"/>
-    <typedef name="udf" classname="org.apache.poi.ss.excelant.ExcelAntUserDefinedFunction"/>
-    <typedef name="handler" classname="org.apache.poi.ss.excelant.ExcelAntHandlerTask"/>
-
-</antlib>
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java b/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java
deleted file mode 100644
index f1c526b..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.formula;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext ;
-import org.apache.poi.ss.formula.eval.ErrorEval ;
-import org.apache.poi.ss.formula.eval.EvaluationException ;
-import org.apache.poi.ss.formula.eval.NumberEval ;
-import org.apache.poi.ss.formula.eval.OperandResolver ;
-import org.apache.poi.ss.formula.eval.ValueEval ;
-import org.apache.poi.ss.formula.functions.FreeRefFunction ;
-
-/**
- * A simple user-defined function to calculate principal and interest.
- *
- * Used by {@link org.apache.poi.ss.excelant.util.TestExcelAntWorkbookUtil}.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
- */
-public class CalculateMortgageFunction implements FreeRefFunction {
-
-    @Override
-    public ValueEval evaluate( ValueEval[] args, OperationEvaluationContext ec ) {
-        
-        // verify that we have enough data
-        if (args.length != 3) {  
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        // declare doubles for values
-        double principal, rate, years,  result;
-        try {
-            // extract values as ValueEval
-            ValueEval v1 = OperandResolver.getSingleValue( args[0], 
-                                                           ec.getRowIndex(), 
-                                                           ec.getColumnIndex() ) ;
-            ValueEval v2 = OperandResolver.getSingleValue( args[1], 
-                                                           ec.getRowIndex(), 
-                                                           ec.getColumnIndex() ) ;
-            ValueEval v3 = OperandResolver.getSingleValue( args[2], 
-                                                           ec.getRowIndex(), 
-                                                           ec.getColumnIndex() ) ;
-
-            // get data as doubles
-            principal  = OperandResolver.coerceValueToDouble( v1 ) ; 
-            rate  = OperandResolver.coerceValueToDouble( v2 ) ;
-            years = OperandResolver.coerceValueToDouble( v3 ) ;
-            
-            result = calculateMortgagePayment( principal, rate, years ) ;
-            System.out.println( "Result = " + result ) ;
-
-            checkValue(result);
-            
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-
-        return new NumberEval( result ) ;
-    }
-    
-    public double calculateMortgagePayment( double p, double r, double y ) {
-        double i = r / 12 ;
-        double n = y * 12 ;
-        
-        double principalAndInterest = 
-             p * (( i * Math.pow((1 + i),n ) ) / ( Math.pow((1 + i),n) - 1))  ;
-        
-        return principalAndInterest ;
-    }
-    /**
-     * Excel does not support infinities and NaNs, rather, it gives a #NUM! error in these cases
-     *
-     * @throws EvaluationException (#NUM!) if <tt>result</tt> is <tt>NaN</> or <tt>Infinity</tt>
-     */
-     private void checkValue(double result) throws EvaluationException {
-         if (Double.isNaN(result) || Double.isInfinite(result)) {
-             throw new EvaluationException(ErrorEval.NUM_ERROR);
-         }
-     }    
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/ExcelAntUserDefinedFunctionTestHelper.java b/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/ExcelAntUserDefinedFunctionTestHelper.java
deleted file mode 100644
index 68e4b69..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/ExcelAntUserDefinedFunctionTestHelper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.formula;
-
-import org.apache.poi.ss.excelant.ExcelAntUserDefinedFunction;
-
-public class ExcelAntUserDefinedFunctionTestHelper extends
-		ExcelAntUserDefinedFunction {
-
-	@Override
-	protected String getFunctionAlias() {
-		// TODO Auto-generated method stub
-		return super.getFunctionAlias();
-	}
-
-	@Override
-	protected String getClassName() {
-		// TODO Auto-generated method stub
-		return super.getClassName();
-	}
-
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/TestExcelAntUserDefinedFunction.java b/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/TestExcelAntUserDefinedFunction.java
deleted file mode 100644
index ad9851a..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/TestExcelAntUserDefinedFunction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.examples.formula;
-
-import junit.framework.TestCase;
-
-public class TestExcelAntUserDefinedFunction extends TestCase {
-	
-	private ExcelAntUserDefinedFunctionTestHelper fixture ;
-	
-	@Override
-	public void setUp() {
-		fixture = new ExcelAntUserDefinedFunctionTestHelper() ;
-	}
-	
-	public void testSetClassName() {
-		String className = "simple.class.name" ;
-		
-		fixture.setClassName( className ) ;
-		String value = fixture.getClassName() ;
-		
-		assertNotNull( value ) ;
-		assertEquals( className, value ) ;
-	}
-	
-	public void testSetFunction() {
-		String functionAlias = "alias" ;
-		
-		fixture.setFunctionAlias( functionAlias ) ;
-		
-		String alias = fixture.getFunctionAlias() ;
-		
-		assertNotNull( alias ) ;
-		assertEquals( functionAlias, alias ) ;
-	}
-	
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/BuildFileTest.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/BuildFileTest.java
deleted file mode 100644
index 55ea777..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/BuildFileTest.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.poi.ss.excelant;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-
-/**
- * A BuildFileTest is a TestCase which executes targets from an Ant buildfile
- * for testing.
- * <p/>
- * This class provides a number of utility methods for particular build file
- * tests which extend this class.
- *
- * @see <a href="http://svn.apache.org/repos/asf/ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java">
- *  http://svn.apache.org/repos/asf/ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java</a>
- */
-public abstract class BuildFileTest extends TestCase {
-
-    protected Project project;
-
-    private StringBuffer logBuffer;
-    private StringBuffer fullLogBuffer;
-    private StringBuffer outBuffer;
-    private StringBuffer errBuffer;
-    private BuildException buildException;
-
-    /**
-     * Default constructor for the BuildFileTest object.
-     */
-    public BuildFileTest() {
-        super();
-    }
-
-    /**
-     * Constructor for the BuildFileTest object.
-     *
-     * @param name string to pass up to TestCase constructor
-     */
-    public BuildFileTest(String name) {
-        super(name);
-    }
-
-    /**
-     * Automatically calls the target called "tearDown"
-     * from the build file tested if it exits.
-     * <p/>
-     * This allows to use Ant tasks directly in the build file
-     * to clean up after each test. Note that no "setUp" target
-     * is automatically called, since it's trivial to have a
-     * test target depend on it.
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        if (project == null) {
-            /*
-             * Maybe the BuildFileTest was subclassed and there is
-             * no initialized project. So we could avoid getting a
-             * NPE.
-             * If there is an initialized project getTargets() does
-             * not return null as it is initialized by an empty
-             * HashSet.
-             */
-            return;
-        }
-        final String tearDown = "tearDown";
-        if (project.getTargets().containsKey(tearDown)) {
-            project.executeTarget(tearDown);
-        }
-    }
-
-    /**
-     * run a target, expect for any build exception
-     *
-     * @param target target to run
-     * @param cause  information string to reader of report
-     */
-    public void expectBuildException(String target, String cause) {
-        expectSpecificBuildException(target, cause, null);
-    }
-
-    /**
-     * Assert that only the given message has been logged with a
-     * priority &lt;= INFO when running the given target.
-     */
-    public void expectLog(String target, String log) {
-        executeTarget(target);
-        String realLog = getLog();
-        assertEquals(log, realLog);
-    }
-
-    /**
-     * Assert that the given substring is in the log messages.
-     */
-    public void assertLogContaining(String substring) {
-        String realLog = getLog();
-        assertTrue("expecting log to contain \"" + substring + "\" log was \""
-                + realLog + "\"",
-                realLog.indexOf(substring) >= 0);
-    }
-
-    /**
-     * Assert that the given substring is not in the log messages.
-     */
-    public void assertLogNotContaining(String substring) {
-        String realLog = getLog();
-        assertFalse("didn't expect log to contain \"" + substring + "\" log was \""
-                + realLog + "\"",
-                realLog.indexOf(substring) >= 0);
-    }
-
-    /**
-     * Assert that the given substring is in the output messages.
-     *
-     * @since Ant1.7
-     */
-    public void assertOutputContaining(String substring) {
-        assertOutputContaining(null, substring);
-    }
-
-    /**
-     * Assert that the given substring is in the output messages.
-     *
-     * @param message Print this message if the test fails. Defaults to
-     *                a meaningful text if <tt>null</tt> is passed.
-     * @since Ant1.7
-     */
-    public void assertOutputContaining(String message, String substring) {
-        String realOutput = getOutput();
-        String realMessage = (message != null)
-                ? message
-                : "expecting output to contain \"" + substring + "\" output was \"" + realOutput + "\"";
-        assertTrue(realMessage, realOutput.indexOf(substring) >= 0);
-    }
-
-    /**
-     * Assert that the given substring is not in the output messages.
-     *
-     * @param message Print this message if the test fails. Defaults to
-     *                a meaningful text if <tt>null</tt> is passed.
-     * @since Ant1.7
-     */
-    public void assertOutputNotContaining(String message, String substring) {
-        String realOutput = getOutput();
-        String realMessage = (message != null)
-                ? message
-                : "expecting output to not contain \"" + substring + "\" output was \"" + realOutput + "\"";
-        assertFalse(realMessage, realOutput.indexOf(substring) >= 0);
-    }
-
-    /**
-     * Assert that the given message has been logged with a priority &lt;= INFO when running the
-     * given target.
-     */
-    public void expectLogContaining(String target, String log) {
-        executeTarget(target);
-        assertLogContaining(log);
-    }
-
-    /**
-     * Assert that the given message has not been logged with a
-     * priority &lt;= INFO when running the given target.
-     */
-    public void expectLogNotContaining(String target, String log) {
-        executeTarget(target);
-        assertLogNotContaining(log);
-    }
-
-    /**
-     * Gets the log the BuildFileTest object.
-     * Only valid if configureProject() has been called.
-     *
-     * @return The log value
-     * @pre logBuffer!=null
-     */
-    public String getLog() {
-        return logBuffer.toString();
-    }
-
-    /**
-     * Assert that the given message has been logged with a priority
-     * &gt;= VERBOSE when running the given target.
-     */
-    public void expectDebuglog(String target, String log) {
-        executeTarget(target);
-        String realLog = getFullLog();
-        assertEquals(log, realLog);
-    }
-
-    /**
-     * Assert that the given substring is in the log messages.
-     */
-    public void assertDebuglogContaining(String substring) {
-        String realLog = getFullLog();
-        assertTrue("expecting debug log to contain \"" + substring
-                + "\" log was \""
-                + realLog + "\"",
-                realLog.indexOf(substring) >= 0);
-    }
-
-    /**
-     * Gets the log the BuildFileTest object.
-     * <p/>
-     * Only valid if configureProject() has been called.
-     *
-     * @return The log value
-     * @pre fullLogBuffer!=null
-     */
-    public String getFullLog() {
-        return fullLogBuffer.toString();
-    }
-
-    /**
-     * execute the target, verify output matches expectations
-     *
-     * @param target target to execute
-     * @param output output to look for
-     */
-    public void expectOutput(String target, String output) {
-        executeTarget(target);
-        String realOutput = getOutput();
-        assertEquals(output, realOutput.trim());
-    }
-
-    /**
-     * Executes the target, verify output matches expectations
-     * and that we got the named error at the end
-     *
-     * @param target target to execute
-     * @param output output to look for
-     * @param error  Description of Parameter
-     */
-    public void expectOutputAndError(String target, String output, String error) {
-        executeTarget(target);
-        String realOutput = getOutput();
-        assertEquals(output, realOutput);
-        String realError = getError();
-        assertEquals(error, realError);
-    }
-
-    public String getOutput() {
-        return cleanBuffer(outBuffer);
-    }
-
-    public String getError() {
-        return cleanBuffer(errBuffer);
-    }
-
-    public BuildException getBuildException() {
-        return buildException;
-    }
-
-    private String cleanBuffer(StringBuffer buffer) {
-        StringBuffer cleanedBuffer = new StringBuffer();
-        for (int i = 0; i < buffer.length(); i++) {
-            char ch = buffer.charAt(i);
-            if (ch != '\r') {
-                cleanedBuffer.append(ch);
-            }
-        }
-        return cleanedBuffer.toString();
-    }
-
-    /**
-     * Sets up to run the named project
-     *
-     * @param filename name of project file to run
-     */
-    public void configureProject(String filename) throws BuildException {
-        configureProject(filename, Project.MSG_DEBUG);
-    }
-
-    /**
-     * Sets up to run the named project
-     *
-     * @param filename name of project file to run
-     */
-    public void configureProject(String filename, int logLevel)
-            throws BuildException {
-        logBuffer = new StringBuffer();
-        fullLogBuffer = new StringBuffer();
-        project = new Project();
-        project.init();
-        project.setNewProperty("data.dir.name", getDataDir());
-        File antFile = new File(System.getProperty("root"), filename);
-        project.setUserProperty("ant.file", antFile.getAbsolutePath());
-        project.addBuildListener(new AntTestListener(logLevel));
-        ProjectHelper.configureProject(project, antFile);
-    }
-
-    /**
-     * Executes a target we have set up
-     *
-     * @param targetName target to run
-     * @pre configureProject has been called
-     */
-    public void executeTarget(String targetName) {
-        PrintStream sysOut = System.out;
-        PrintStream sysErr = System.err;
-        try {
-            sysOut.flush();
-            sysErr.flush();
-            outBuffer = new StringBuffer();
-            PrintStream out = new PrintStream(new AntOutputStream(outBuffer));
-            System.setOut(out);
-            errBuffer = new StringBuffer();
-            PrintStream err = new PrintStream(new AntOutputStream(errBuffer));
-            System.setErr(err);
-            logBuffer = new StringBuffer();
-            fullLogBuffer = new StringBuffer();
-            buildException = null;
-            project.executeTarget(targetName);
-        } finally {
-            System.setOut(sysOut);
-            System.setErr(sysErr);
-        }
-
-    }
-
-    /**
-     * Get the project which has been configured for a test.
-     *
-     * @return the Project instance for this test.
-     */
-    public Project getProject() {
-        return project;
-    }
-
-    /**
-     * Gets the directory of the project.
-     *
-     * @return the base dir of the project
-     */
-    public File getProjectDir() {
-        return project.getBaseDir();
-    }
-
-    /**
-     * Runs a target, wait for a build exception.
-     *
-     * @param target target to run
-     * @param cause  information string to reader of report
-     * @param msg    the message value of the build exception we are waiting
-     *               for set to null for any build exception to be valid
-     */
-    public void expectSpecificBuildException(String target, String cause, String msg) {
-        try {
-            executeTarget(target);
-        } catch (org.apache.tools.ant.BuildException ex) {
-            buildException = ex;
-            if ((null != msg) && (!ex.getMessage().equals(msg))) {
-                fail("Should throw BuildException because '" + cause
-                        + "' with message '" + msg
-                        + "' (actual message '" + ex.getMessage() + "' instead)");
-            }
-            return;
-        }
-        fail("Should throw BuildException because: " + cause);
-    }
-
-    /**
-     * run a target, expect an exception string
-     * containing the substring we look for (case sensitive match)
-     *
-     * @param target   target to run
-     * @param cause    information string to reader of report
-     * @param contains substring of the build exception to look for
-     */
-    public void expectBuildExceptionContaining(String target, String cause, String contains) {
-        try {
-            executeTarget(target);
-        } catch (org.apache.tools.ant.BuildException ex) {
-            buildException = ex;
-            if ((null != contains) && (ex.getMessage().indexOf(contains) == -1)) {
-                fail("Should throw BuildException because '" + cause + "' with message containing '" + contains + "' (actual message '" + ex.getMessage() + "' instead)");
-            }
-            return;
-        }
-        fail("Should throw BuildException because: " + cause);
-    }
-
-    /**
-     * call a target, verify property is as expected
-     *
-     * @param target   build file target
-     * @param property property name
-     * @param value    expected value
-     */
-    public void expectPropertySet(String target, String property, String value) {
-        executeTarget(target);
-        assertPropertyEquals(property, value);
-    }
-
-    /**
-     * assert that a property equals a value; comparison is case sensitive.
-     *
-     * @param property property name
-     * @param value    expected value
-     */
-    public void assertPropertyEquals(String property, String value) {
-        String result = project.getProperty(property);
-        assertEquals("property " + property, value, result);
-    }
-
-    /**
-     * assert that a property equals "true".
-     *
-     * @param property property name
-     */
-    public void assertPropertySet(String property) {
-        assertPropertyEquals(property, "true");
-    }
-
-    /**
-     * assert that a property is null.
-     *
-     * @param property property name
-     */
-    public void assertPropertyUnset(String property) {
-        String result = project.getProperty(property);
-        if (result != null) {
-            fail("Expected property " + property
-                    + " to be unset, but it is set to the value: " + result);
-        }
-    }
-
-    /**
-     * call a target, verify named property is "true".
-     *
-     * @param target   build file target
-     * @param property property name
-     */
-    public void expectPropertySet(String target, String property) {
-        expectPropertySet(target, property, "true");
-    }
-
-    /**
-     * Call a target, verify property is null.
-     *
-     * @param target   build file target
-     * @param property property name
-     */
-    public void expectPropertyUnset(String target, String property) {
-        expectPropertySet(target, property, null);
-    }
-
-    /**
-     * Retrieve a resource from the caller classloader to avoid
-     * assuming a vm working directory. The resource path must be
-     * relative to the package name or absolute from the root path.
-     *
-     * @param resource the resource to retrieve its url.
-     * @throws junit.framework.AssertionFailedError
-     *          if the resource is not found.
-     */
-    public URL getResource(String resource) {
-        URL url = getClass().getResource(resource);
-        assertNotNull("Could not find resource :" + resource, url);
-        return url;
-    }
-    
-    public static String getDataDir() {
-        String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY);
-        return dataDirName == null ? "test-data" : dataDirName;
-    }
-
-    /**
-     * an output stream which saves stuff to our buffer.
-     */
-    protected static class AntOutputStream extends java.io.OutputStream {
-        private StringBuffer buffer;
-
-        public AntOutputStream(StringBuffer buffer) {
-            this.buffer = buffer;
-        }
-
-        @Override
-        public void write(int b) {
-            buffer.append((char) b);
-        }
-    }
-
-    /**
-     * Our own personal build listener.
-     */
-    private class AntTestListener implements BuildListener {
-        private int logLevel;
-
-        /**
-         * Constructs a test listener which will ignore log events
-         * above the given level.
-         */
-        public AntTestListener(int logLevel) {
-            this.logLevel = logLevel;
-        }
-
-        /**
-         * Fired before any targets are started.
-         */
-        @Override
-        public void buildStarted(BuildEvent event) {
-        }
-
-        /**
-         * Fired after the last target has finished. This event
-         * will still be thrown if an error occurred during the build.
-         *
-         * @see BuildEvent#getException()
-         */
-        @Override
-        public void buildFinished(BuildEvent event) {
-        }
-
-        /**
-         * Fired when a target is started.
-         *
-         * @see BuildEvent#getTarget()
-         */
-        @Override
-        public void targetStarted(BuildEvent event) {
-            //System.out.println("targetStarted " + event.getTarget().getName());
-        }
-
-        /**
-         * Fired when a target has finished. This event will
-         * still be thrown if an error occurred during the build.
-         *
-         * @see BuildEvent#getException()
-         */
-        @Override
-        public void targetFinished(BuildEvent event) {
-            //System.out.println("targetFinished " + event.getTarget().getName());
-        }
-
-        /**
-         * Fired when a task is started.
-         *
-         * @see BuildEvent#getTask()
-         */
-        @Override
-        public void taskStarted(BuildEvent event) {
-            //System.out.println("taskStarted " + event.getTask().getTaskName());
-        }
-
-        /**
-         * Fired when a task has finished. This event will still
-         * be throw if an error occurred during the build.
-         *
-         * @see BuildEvent#getException()
-         */
-        @Override
-        public void taskFinished(BuildEvent event) {
-            //System.out.println("taskFinished " + event.getTask().getTaskName());
-        }
-
-        /**
-         * Fired whenever a message is logged.
-         *
-         * @see BuildEvent#getMessage()
-         * @see BuildEvent#getPriority()
-         */
-        @Override
-        public void messageLogged(BuildEvent event) {
-            if (event.getPriority() > logLevel) {
-                // ignore event
-                return;
-            }
-
-            if (event.getPriority() == Project.MSG_INFO ||
-                    event.getPriority() == Project.MSG_WARN ||
-                    event.getPriority() == Project.MSG_ERR) {
-                logBuffer.append(event.getMessage());
-            }
-            fullLogBuffer.append(event.getMessage());
-        }
-    }
-
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
deleted file mode 100644
index 6e52e1d..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package org.apache.poi.ss.excelant;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.poi.ss.usermodel.Workbook;
-
-public class MockExcelAntWorkbookHandler implements IExcelAntWorkbookHandler {
-    public static boolean executed = false;
-    public static Workbook workbook = null;
-    
-    
-    @Override
-    public void setWorkbook(Workbook workbook) {
-        MockExcelAntWorkbookHandler.workbook = workbook;
-    }
-
-    @Override
-    public void execute() {
-        executed = true;
-        assertNotNull(workbook);
-    }
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java
deleted file mode 100644
index df1993b..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package org.apache.poi.ss.excelant;
-
-
-/**
- *  JUnit test for the ExcelAnt tasks.
- *  Leverages Ant's test framework.
- *
- * @see <a href="http://svn.apache.org/repos/asf/ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java">
- *  http://svn.apache.org/repos/asf/ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java</a>
- */
-public class TestBuildFile extends BuildFileTest {
-
-    @Override
-    public void setUp() {
-        configureProject(BuildFileTest.getDataDir() + "/../src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml");
-    }
-
-    public void testMissingFilename() {
-        expectSpecificBuildException("test-nofile", "required argument not specified",
-                "fileName attribute must be set!");
-     }
-
-    public void testFileNotFound() {
-        expectSpecificBuildException("test-filenotfound", "required argument not specified",
-                "Cannot load file invalid.xls. Make sure the path and file permissions are correct.");
-     }
-
-    public void testEvaluate() {
-        executeTarget("test-evaluate");
-        assertLogContaining("Using input file: " + BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls");
-        assertLogContaining("Succeeded when evaluating 'MortgageCalculator'!$B$4.");
-    }
-
-    public void testEvaluateNoDetails() {
-        executeTarget("test-evaluate-nodetails");
-        assertLogContaining("Using input file: " + BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls");
-        assertLogNotContaining("Succeeded when evaluating 'MortgageCalculator'!$B$4.");
-    }
-
-    public void testPrecision() {
-        executeTarget("test-precision");
-
-        assertLogContaining("Using input file: " + BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls");
-        assertLogContaining("Succeeded when evaluating 'MortgageCalculator'!$B$4.  " +
-                "It evaluated to 2285.5761494145563 when the value of 2285.576149 with precision of 1.0E-4");
-        assertLogContaining("Succeeded when evaluating 'MortgageCalculator'!$B$4.  " +
-                "It evaluated to 2285.5761494145563 when the value of 2285.576149 with precision of 1.0E-5");
-        assertLogContaining("Failed to evaluate cell 'MortgageCalculator'!$B$4.  " +
-                "It evaluated to 2285.5761494145563 when the value of 2285.576149 with precision of 1.0E-10 was expected.");
-        assertLogContaining("2/3 tests passed");
-    }
-
-    public void testPrecisionFail() {
-        expectSpecificBuildException("test-precision-fails", "precision not matched",
-                "\tFailed to evaluate cell 'MortgageCalculator'!$B$4.  It evaluated to 2285.5761494145563 when the value of 2285.576149 with precision of 1.0E-10 was expected.");
-    }
-
-    public void testPassOnError() {
-        executeTarget("test-passonerror");
-    }
-
-    public void testFailOnError() {
-        expectBuildException("test-failonerror", "fail on error");
-        assertLogContaining("Using input file: " + BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls");
-        assertLogNotContaining("failed because 1 of 0 evaluations failed to evaluate correctly. Failed to evaluate cell 'MortageCalculatorFunction'!$D$3");
-    }
-
-    public void testFailOnErrorNoDetails() {
-        expectBuildException("test-failonerror-nodetails", "fail on error");
-        assertLogNotContaining("Using input file: " + BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls");
-        assertLogNotContaining("failed because 1 of 0 evaluations failed to evaluate correctly. Failed to evaluate cell 'MortageCalculatorFunction'!$D$3");
-    }
-
-    public void testUdf() {
-        executeTarget("test-udf");
-        assertLogContaining("1/1 tests passed");
-    }
-    
-    public void testSetText() {
-        executeTarget("test-settext");
-        assertLogContaining("1/1 tests passed");
-    }
-    
-    public void testAddHandler() {
-        executeTarget("test-addhandler");
-        assertLogContaining("Using input file: " + BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls");
-        assertLogContaining("Succeeded when evaluating 'MortgageCalculator'!$B$4.");
-        
-        assertNotNull("The workbook should have been passed to the handler", MockExcelAntWorkbookHandler.workbook);
-        assertTrue("The handler should have been executed", MockExcelAntWorkbookHandler.executed);
-    }
-    
-    public void testAddHandlerWrongClass() {
-        executeTarget("test-addhandler-wrongclass");
-        assertLogContaining("Using input file: " + BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls");
-        assertLogContaining("Succeeded when evaluating 'MortgageCalculator'!$B$4.");
-    }
-    
-    public void testAddHandlerFails() {
-        expectSpecificBuildException("test-addhandler-fails", "NullPointException", null);
-    }
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
deleted file mode 100644
index 0c6f9cb..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.excelant;
-
-import junit.framework.TestCase;
-
-public class TestExcelAntPrecision extends TestCase {
-	
-	private ExcelAntPrecision fixture ;
-
-    @Override
-	public void setUp() {
-		fixture = new ExcelAntPrecision() ;
-	}
-	
-    @Override
-	public void tearDown() {
-		fixture = null ;
-	}
-	
-	public void testVerifyPrecision() {
-		
-		double value = 1.0E-1 ;
-		
-		fixture.setValue( value ) ;
-		
-		double result = fixture.getValue() ;
-		
-		assertTrue( result > 0 ) ;
-		
-		assertEquals( value, result, 0.0 ) ;
-	}
-
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java
deleted file mode 100644
index b59c886..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.excelant;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtilFactory;
-
-public class TestExcelAntSet extends TestCase {
-
-	
-	// This is abstract in nature, so we'll use a 
-	// concrete instance to test the set methods.
-	private ExcelAntSet fixture ;
-	
-    private static final String mortgageCalculatorFileName =
-        BuildFileTest.getDataDir() + "/spreadsheet/mortgage-calculation.xls" ;
-    
-    @Override
-	public void setUp() {
-		fixture = new ExcelAntSetDoubleCell() ;
-	}
-	
-    @Override
-	public void tearDown() {
-		fixture = null ;
-	}
-	
-	public void testSetter() {
-		String cell = "simpleCellRef!$F$1" ;
-		
-		fixture.setCell( cell ) ;
-		
-		String cellStr = fixture.getCell() ;
-		
-		assertNotNull( cellStr ) ;
-		assertEquals( cell, cellStr ) ;
-	}
-	
-	public void testSetWorkbookUtil() {
-		ExcelAntWorkbookUtil util = ExcelAntWorkbookUtilFactory.getInstance(
-				                                 mortgageCalculatorFileName ) ;
-		
-		assertNotNull( util ) ;
-		
-		fixture.setWorkbookUtil( util ) ;
-	}
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
deleted file mode 100644
index 3d5b11e..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.excelant;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
-import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtilFactory;
-
-public class TestExcelAntSetDoubleCell extends TestCase {
-	
-	private ExcelAntSetDoubleCell fixture ;
-	
-	private ExcelAntWorkbookUtil util ;
-
-    private static final String mortgageCalculatorFileName =
-        BuildFileTest.getDataDir() + "/spreadsheet/mortgage-calculation.xls" ;
-
-    @Override
-	public void setUp() {
-		fixture = new ExcelAntSetDoubleCell() ;
-		util = ExcelAntWorkbookUtilFactory.getInstance(
-				                                  mortgageCalculatorFileName ) ;
-		fixture.setWorkbookUtil( util ) ;
-	}
-	
-    @Override
-	public void tearDown() {
-		fixture = null ;
-	}
-	
-	public void testSetDouble() {
-		String cellId = "'Sheet3'!$A$1" ;
-		double testValue = 1.1 ;
-		
-		fixture.setCell( cellId ) ;
-		fixture.setValue( testValue ) ;
-		
-		double value = fixture.getCellValue() ;
-		
-		assertTrue( value > 0 ) ;
-		assertEquals( testValue, value, 0.0 ) ;
-		
-		fixture.execute() ;
-		
-		double setValue = util.getCellAsDouble( cellId ) ;
-		
-		assertEquals( setValue, testValue, 0.0 ) ;
-	}
-	
-
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml
deleted file mode 100644
index d387aab..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project name="excelant-tests" basedir="." xmlns:poi="antlib:org.apache.poi.ss.excelant">
-
-    <path id="excelant.classpath">
-        <pathelement location="build/classes"/>
-        <pathelement location="build/ooxml-classes"/>
-        <pathelement location="build/excelant-classes"/>
-        <pathelement location="build/excelant-test-classes"/> <!-- test udf is in the test classes -->
-    </path>
-
-    <typedef resource="org/apache/poi/ss/excelant/antlib.xml"
-             classpathref="excelant.classpath"
-             uri="antlib:org.apache.poi.ss.excelant"/>
-
-    <!-- Should fail because the fileName attribute is missing -->
-    <target name="test-nofile">
-        <poi:excelant>
-
-        </poi:excelant>
-    </target>
-
-    <!-- Should fail because the specified file is invalid -->
-    <target name="test-filenotfound">
-        <poi:excelant fileName="invalid.xls">
-
-        </poi:excelant>
-    </target>
-
-    <!-- basic evaluation test -->
-    <target name="test-evaluate">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:test showSuccessDetails="true">
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-4" />
-            </poi:test>
-         </poi:excelant>
-      </target>
-
-    <target name="test-evaluate-nodetails">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:test showSuccessDetails="false">
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-4" />
-            </poi:test>
-         </poi:excelant>
-      </target>
-
-    <target name="test-precision">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:precision value="1.0E-4"/>
-
-            <poi:test name="global-precision" showFailureDetail="true" showSuccessDetails="true">
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149"/>
-            </poi:test>
-
-            <poi:test name="custom-precision" showFailureDetail="true" showSuccessDetails="true">
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-5"/>
-            </poi:test>
-
-            <poi:test name="tiny-precision" showFailureDetail="true" showSuccessDetails="true">
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-10"/>
-            </poi:test>
-
-          </poi:excelant>
-        </target>
-
-    <target name="test-precision-fails">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:precision value="1.0E-4"/>
-
-            <poi:test name="tiny-precision" showFailureDetail="true" showSuccessDetails="true">
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-10" requiredToPass="true"/>
-            </poi:test>
-
-          </poi:excelant>
-      </target>
-
-    <!--
-        By default ExcelAnt does not terminate execution if an error occurs
-     -->
-    <target name="test-passonerror">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-
-            <poi:test name="failonerror" showFailureDetail="true" showSuccessDetails="true">
-                <poi:setDouble cell="'MortageCalculatorFunction'!$D$1" value="1"/>
-                <poi:setDouble cell="'MortageCalculatorFunction'!$D$2" value="2"/>
-                <poi:setFormula cell="'MortageCalculatorFunction'!$D$3" value ="SUM(D1:D2)"/>
-                <poi:evaluate showDelta="true" cell="'MortageCalculatorFunction'!$D$3" expectedValue="2"/>
-            </poi:test>
-
-         </poi:excelant>
-    </target>
-
-    <!--
-        failOnError="true" forces ExcelAnt tot terminate execution if an error occurs
-     -->
-    <target name="test-failonerror">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls" failOnError="true">
-
-            <poi:test name="failonerror" showFailureDetail="true" showSuccessDetails="true">
-                <poi:setDouble cell="'MortageCalculatorFunction'!$D$1" value="1"/>
-                <poi:setDouble cell="'MortageCalculatorFunction'!$D$2" value="2"/>
-                <poi:setFormula cell="'MortageCalculatorFunction'!$D$3" value ="SUM(D1:D2)"/>
-                <poi:evaluate showDelta="true" cell="'MortageCalculatorFunction'!$D$3" expectedValue="2"/>
-            </poi:test>
-
-         </poi:excelant>
-    </target>
-
-    <target name="test-failonerror-notdetails">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls" failOnError="true">
-
-            <poi:test name="failonerror" showFailureDetail="false" showSuccessDetails="false">
-                <poi:setDouble cell="'MortageCalculatorFunction'!$D$1" value="1"/>
-                <poi:setDouble cell="'MortageCalculatorFunction'!$D$2" value="2"/>
-                <poi:setFormula cell="'MortageCalculatorFunction'!$D$3" value ="SUM(D1:D2)"/>
-                <poi:evaluate showDelta="true" cell="'MortageCalculatorFunction'!$D$3" expectedValue="2"/>
-            </poi:test>
-
-         </poi:excelant>
-    </target>
-
-    <!-- Evaluation of user-defined functions -->
-    <target name="test-udf">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:udf functionAlias="calculatePayment"
-                     className="org.apache.poi.ss.examples.formula.CalculateMortgageFunction"/>
-            <poi:test>
-                <poi:setDouble cell="'MortageCalculatorFunction'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortageCalculatorFunction'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortageCalculatorFunction'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortageCalculatorFunction'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-4" />
-            </poi:test>
-         </poi:excelant>
-      </target>
-
-    <!-- basic evaluation test -->
-    <target name="test-settext">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:test showSuccessDetails="true">
-                <poi:setString cell="'MortgageCalculator'!$B$1" value="sometext"/>
-            	<!-- How can we evaluate text? -->
-            </poi:test>
-         </poi:excelant>
-      </target>
-
-      <target name="test-addhandler">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:test showSuccessDetails="true">
-            	<poi:handler className="org.apache.poi.ss.excelant.MockExcelAntWorkbookHandler"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-4" />
-            </poi:test>
-         </poi:excelant>
-      </target>
-
-      <target name="test-addhandler-wrongclass">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-          <poi:test showSuccessDetails="true">
-              <poi:handler className="java.lang.String"/>
-              <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-              <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-              <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-              <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                            expectedValue="2285.576149" precision="1.0E-4" />
-          </poi:test>
-        </poi:excelant>
-      </target>
-
-	  <target name="test-addhandler-fails">
-        <poi:excelant fileName="${data.dir.name}/spreadsheet/excelant.xls">
-            <poi:test showSuccessDetails="true">
-                <poi:handler/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
-                <poi:setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-                <poi:evaluate showDelta="true" cell="'MortgageCalculator'!$B$4"
-                              expectedValue="2285.576149" precision="1.0E-4" />
-            </poi:test>
-         </poi:excelant>
-      </target>
-</project>
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
deleted file mode 100644
index 16189f1..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.excelant.util;
-
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * A helper class to allow testing of protected methods and constructors.
- * 
- * @author jsvede
- *
- */
-public class ExcelAntWorkbookUtilTestHelper extends ExcelAntWorkbookUtil {
-
-	public ExcelAntWorkbookUtilTestHelper(String fName) {
-		super(fName);
-	}
-
-	public ExcelAntWorkbookUtilTestHelper(Workbook wb) {
-		super(wb);
-	}
-
-	@Override
-	public UDFFinder getFunctions() {
-		return super.getFunctions();
-	}
-
-	@Override
-	public FormulaEvaluator getEvaluator(String excelFileName) {
-		return super.getEvaluator(excelFileName);
-	}
-
-	
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
deleted file mode 100644
index 9c9213e..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.excelant.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestExcelAntEvaluationResult {
-	private ExcelAntEvaluationResult fixture;
-	
-	private boolean completedWithError = false;
-    private boolean passed = false;
-    private double retValue  = 1.1; 
-    private String errMessage = "error message";  
-    private double delta = 2.2; 
-    private String cellId = "testCell!$F$1";
-    
-    @Before
-	public void setUp() {
-		fixture = new ExcelAntEvaluationResult(completedWithError,
-				                                passed, 
-				                                retValue,
-				                                errMessage, 
-				                                delta,
-				                                cellId);
-	}
-	
-    @After
-	public void tearDown() {
-		fixture = null;
-	}
-	
-    @Test
-	public void testCompletedWithErrorMessage() {
-		String errMsg = fixture.getErrorMessage();
- 		assertNotNull(errMsg);
- 		assertEquals(errMsg, errMessage);
-	}
-	
-    @Test
-	public void testPassed() {
-		boolean passedValue = fixture.didTestPass();
-		assertEquals(passedValue, passed);
-	}
-	
-    @Test
-	public void testDelta() {
-		double deltaValue = fixture.getDelta();
-		assertEquals(deltaValue, delta, 0.0);
-	}
-	
-    @Test
-	public void testCellId() {
-		String cellIdValue = fixture.getCellName();
-		assertNotNull(cellIdValue);
-		assertEquals(cellIdValue, cellId);
-	}
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
deleted file mode 100644
index bf68c24..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.excelant.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.examples.formula.CalculateMortgageFunction;
-import org.apache.poi.ss.excelant.BuildFileTest;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.tools.ant.BuildException;
-
-import junit.framework.TestCase;
-
-public class TestExcelAntWorkbookUtil extends TestCase {
-	
-    private static final String mortgageCalculatorFileName =
-        BuildFileTest.getDataDir() + "/spreadsheet/excelant.xls" ;
-
-	private ExcelAntWorkbookUtilTestHelper fixture ;
-		
-	
-	@Override
-	public void tearDown() {
-		fixture = null ;
-	}
-
-	public void testStringConstructor() {
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-				                                  mortgageCalculatorFileName);
-		
-		assertNotNull(fixture);
-	}
-
-	public void testLoadNotExistingFile() {
-		try {
-			assertNotNull(new ExcelAntWorkbookUtilTestHelper(
-				                                  "notexistingFile" ));
-			fail("Should catch exception here");
-		} catch (BuildException e) {
-			assertTrue(e.getMessage().contains("notexistingFile"));			
-		}
-	}
-	
-	public void testWorkbookConstructor() throws InvalidFormatException, IOException {
-        File workbookFile = new File(mortgageCalculatorFileName);
-        FileInputStream fis = new FileInputStream(workbookFile);
-        Workbook workbook = WorkbookFactory.create(fis);
-
-		fixture = new ExcelAntWorkbookUtilTestHelper(workbook);
-		
-		assertNotNull(fixture);
-	}
-	
-	public void testAddFunction() {
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-
-		assertNotNull(fixture);
-		
-		fixture.addFunction("h2_ZFactor", new CalculateMortgageFunction());
-		
-		UDFFinder functions = fixture.getFunctions();
-		
-		assertNotNull(functions);
-		assertNotNull(functions.findFunction("h2_ZFactor"));
-	}
-
-    public void testAddFunctionClassName() throws Exception {
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-
-        assertNotNull(fixture);
-        
-        fixture.addFunction("h2_ZFactor", CalculateMortgageFunction.class.getName());
-        
-        UDFFinder functions = fixture.getFunctions();
-        
-        assertNotNull(functions);
-        assertNotNull(functions.findFunction("h2_ZFactor"));
-    }
-
-    public void testAddFunctionInvalidClassName() throws Exception {
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-
-        assertNotNull(fixture);
-        
-        fixture.addFunction("h2_ZFactor", String.class.getName());
-        
-        UDFFinder functions = fixture.getFunctions();
-        
-        assertNotNull(functions);
-        assertNull(functions.findFunction("h2_ZFactor"));
-    }
-
-	public void testGetWorkbook() {
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		assertNotNull(fixture);
-		
-		Workbook workbook = fixture.getWorkbook();
-		
-		assertNotNull(workbook);
-	}
-	
-	public void testFileName() {
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		assertNotNull(fixture);
-
-		String fileName = fixture.getFileName();
-		
-		assertNotNull(fileName);
-		
-		assertEquals(mortgageCalculatorFileName, fileName);
-		
-	}
-	
-	public void testGetEvaluator() {
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		FormulaEvaluator evaluator = fixture.getEvaluator(
-				                                  mortgageCalculatorFileName);
-		
-		assertNotNull(evaluator);
- 	}
-
-    public void testGetEvaluatorWithUDF() {
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-
-        fixture.addFunction("h2_ZFactor", new CalculateMortgageFunction());
-        
-        FormulaEvaluator evaluator = fixture.getEvaluator(
-                                                  mortgageCalculatorFileName);
-        
-        assertNotNull(evaluator);
-    }
-	
-	public void testGetEvaluatorXLSX() {
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                BuildFileTest.getDataDir() + "/spreadsheet/sample.xlsx");
-		
-		FormulaEvaluator evaluator = fixture.getEvaluator(
-				BuildFileTest.getDataDir() + "/spreadsheet/sample.xlsx");
-		
-		assertNotNull(evaluator);
- 	}
-
-    public void testGetEvaluatorXLSXWithFunction() {
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                BuildFileTest.getDataDir() + "/spreadsheet/sample.xlsx");
-        
-        fixture.addFunction("h2_ZFactor", new CalculateMortgageFunction());
-        
-        FormulaEvaluator evaluator = fixture.getEvaluator(
-                BuildFileTest.getDataDir() + "/spreadsheet/sample.xlsx");
-        
-        assertNotNull(evaluator);
-    }
-
-	public void testEvaluateCell() {
-		String cell = "'MortgageCalculator'!B4" ;
-		double expectedValue = 790.79 ;
-		double precision = 0.1 ;
-
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-
-		ExcelAntEvaluationResult result = fixture.evaluateCell(cell, 
-				                                                expectedValue, 
-				                                                precision);
-
-		//System.out.println(result);
-		assertTrue("Had:" + result.toString(), result.toString().contains("evaluationCompletedWithError=false"));
-		assertTrue("Had:" + result.toString(), result.toString().contains("returnValue=790.79"));
-		assertTrue("Had:" + result.toString(), result.toString().contains("cellName='MortgageCalculator'!B4"));
-        assertFalse(result.toString().contains("#N/A"));
-
-		assertFalse(result.evaluationCompleteWithError());
-		assertTrue(result.didTestPass());
-	}
-	
-    public void testEvaluateCellFailedPrecision() {
-        String cell = "'MortgageCalculator'!B4" ;
-        double expectedValue = 790.79 ;
-        double precision = 0.0000000000001 ;
-
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-
-        ExcelAntEvaluationResult result = fixture.evaluateCell(cell, 
-                                                                expectedValue, 
-                                                                precision);
-
-        //System.out.println(result);
-        assertTrue("Had:" + result.toString(), result.toString().contains("evaluationCompletedWithError=false"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("returnValue=790.79"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("cellName='MortgageCalculator'!B4"));
-        assertFalse("Should not see an error, but had:" + result.toString(), result.toString().contains("#"));
-
-        assertFalse(result.evaluationCompleteWithError());
-        assertFalse(result.didTestPass());
-    }
-    
-    public void testEvaluateCellWithError() {
-        String cell = "'ErrorCell'!A1" ;
-        double expectedValue = 790.79 ;
-        double precision = 0.1 ;
-
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-
-        ExcelAntEvaluationResult result = fixture.evaluateCell(cell, 
-                                                                expectedValue, 
-                                                                precision);
-
-        System.out.println(result);
-        assertTrue("Had:" + result.toString(), result.toString().contains("evaluationCompletedWithError=true"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("returnValue=0.0"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("cellName='ErrorCell'!A1"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("#N/A"));
-
-        assertTrue(result.evaluationCompleteWithError());
-        assertFalse(result.didTestPass());
-    }
-    
-	public void testGetSheets() {
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		List<String> sheets = fixture.getSheets();
-		
-		assertNotNull(sheets);
-		assertEquals(sheets.size(), 3); 
-	}
-	
-	public void testSetString() {
-		String cell = "'MortgageCalculator'!C14" ;
-		String cellValue = "testString" ;
-		
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		fixture.setStringValue(cell, cellValue);
-		
-		String value = fixture.getCellAsString(cell);
-		
-		assertNotNull(value);
-		assertEquals(cellValue, value);
-	}
-	
-    public void testSetNotExistingSheet() {
-        String cell = "'NotexistingSheet'!C14" ;
-        
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-        try {
-            fixture.setStringValue(cell, "some");
-            fail("Should catch exception here");
-        } catch (BuildException e) {
-            assertTrue(e.getMessage().contains("NotexistingSheet"));
-        }
-    }
-
-    public void testSetFormula() {
-        String cell = "'MortgageCalculator'!C14" ;
-        String cellValue = "SUM(B14:B18)" ;
-        
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-        
-        fixture.setFormulaValue(cell, cellValue);
-        
-        double value = fixture.getCellAsDouble(cell);
-        
-        assertNotNull(value);
-        assertEquals(0.0, value);
-    }
-    
-    public void testSetDoubleValue() {
-        String cell = "'MortgageCalculator'!C14" ;
-        double cellValue = 1.2;
-        
-        fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-        
-        fixture.setDoubleValue(cell, cellValue);
-        
-        Double value = fixture.getCellAsDouble(cell);
-        
-        assertNotNull(value);
-        assertEquals(cellValue, value);
-    }
-    
-	public void testSetDate() {
-		String cell = "'MortgageCalculator'!C14" ;
-		Date cellValue = new Date();
-		
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		fixture.setDateValue(cell, cellValue);
-		
-		double value = fixture.getCellAsDouble(cell);
-		
-		assertNotNull(value);
-		assertEquals(DateUtil.getExcelDate(cellValue, false), value);
-	}
-
-	public void testGetNonexistingString() {
-		String cell = "'MortgageCalculator'!C33" ;
-		
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		String value = fixture.getCellAsString(cell);
-		
-		assertEquals("", value);
-	}
-
-	public void testGetNonexistingDouble() {
-		String cell = "'MortgageCalculator'!C33" ;
-		
-		fixture = new ExcelAntWorkbookUtilTestHelper(
-                mortgageCalculatorFileName);
-		
-		double value = fixture.getCellAsDouble(cell);
-		
-		assertEquals(0.0, value);
-	}
-}
diff --git a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java b/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
deleted file mode 100644
index b69449a..0000000
--- a/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.excelant.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.poi.ss.excelant.BuildFileTest;
-import org.junit.Test;
-
-
-/**
- * Tests for the ExcelAntWorbookUtilFactory.
- * 
- * @author Jon Svede (jon [at] loquatic [dot] com)
- * @author Brian Bush (brian [dot] bush [at] nrel [dot] gov)
- *
- */
-public class TestExcelAntWorkbookUtilFactory {
-
-    private static final String mortgageCalculatorWorkbookFile =
-        BuildFileTest.getDataDir() + "/spreadsheet/mortgage-calculation.xls" ;
-	
-	
-	/**
-	 * Simple test to determine if the factory properly returns an non-null
-	 * instance of the ExcelAntWorkbookUtil class.
-	 */
-    @Test
-	public void testGetNewWorkbookUtilInstance() {
-		ExcelAntWorkbookUtil util = ExcelAntWorkbookUtilFactory.getInstance(
-				                              mortgageCalculatorWorkbookFile) ;
-		
-		assertNotNull(util) ;
-	}
-	
-	
-	/**
-	 * Test whether or not the factory will properly return the same reference
-	 * to an ExcelAnt WorkbookUtil when two different Strings, that point to
-	 * the same resource, are passed in. 
-	 */
-    @Test
-	public void testVerifyEquivalence() {
-		String sameFileName = BuildFileTest.getDataDir() + "/spreadsheet/mortgage-calculation.xls" ;
-		
-		ExcelAntWorkbookUtil util = ExcelAntWorkbookUtilFactory.getInstance(
-                mortgageCalculatorWorkbookFile) ;
-
-		ExcelAntWorkbookUtil util2 = ExcelAntWorkbookUtilFactory.getInstance(
-				                       sameFileName) ;
-		
-		assertNotNull(util) ;
-		assertNotNull(util2) ;
-		
-		assertEquals(util, util2) ;
-	}
-}
diff --git a/trunk/src/integrationtest/build.xml b/trunk/src/integrationtest/build.xml
deleted file mode 100644
index 8409e53..0000000
--- a/trunk/src/integrationtest/build.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project name="POI Testbuild" default="run" basedir=".">
-
-    <description>Test-Ant file which verifies that the Apache POI distribution build sources can be compiled successfully.
-	
-Before running this, you should execute the "assemble" target in the main build.xml to have the packaged files created correctly.
-    </description>
-
-    <property name="dist" value="../../build/dist"/>
-    <property name="build" value="../../build/distsourcebuild"/>
-
-    <target name="init" depends="">
-    </target>
-
-    <target name="run" depends="init,runSourceBuild,runCompileTest"/>
-
-    <target name="runSourceBuild" depends="init">
-        <!-- clean out old stuff in build-dir -->
-        <delete dir="${build}"/>
-        <mkdir dir="${build}"/>
-
-        <!-- select latest built source zip -->
-        <pathconvert property="srcpackage">
-            <last>
-                <sort>
-                    <date xmlns="antlib:org.apache.tools.ant.types.resources.comparators"/>
-                    <resources>
-                        <fileset dir="${dist}">
-                            <include name="poi-src-*.zip"/>
-                        </fileset>
-                    </resources>
-                </sort>
-            </last>
-        </pathconvert>
-
-        <echo message="Found source package at ${srcpackage}"/>
-        <unzip src="${srcpackage}" dest="${build}" failOnEmptyArchive="true"/>
-
-        <!-- look for name of sub-dir, do this dynamically as it changes with every (beta|rc)-release -->
-        <pathconvert property="dirversion">
-            <dirset dir="${build}">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-
-        <!-- copy over required libs to avoid re-downloading them always -->
-        <mkdir dir="${dirversion}/lib"/>
-        <mkdir dir="${dirversion}/ooxml-lib"/>
-        <mkdir dir="${dirversion}/compile-lib"/>
-        <copy todir="${dirversion}/lib">
-            <fileset dir="../../lib"/>
-        </copy>
-        <copy todir="${dirversion}/ooxml-lib">
-            <fileset dir="../../ooxml-lib"/>
-        </copy>
-        <copy todir="${dirversion}/compile-lib">
-            <fileset dir="../../compile-lib"/>
-        </copy>
-
-        <!-- finally call Ant on the extracted source to check if we can build the packages -->
-        <echo message="Building in temporary dir ${dirversion}/"/>
-        <ant dir="${dirversion}" target="jar" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
-    </target>
-
-    <target name="runCompileTest" depends="init" description="Verify that we can compile most examples without including excelant or scratchpad jars">
-        <!-- clean out old stuff in build-dir -->
-        <delete dir="${build}"/>
-        <mkdir dir="${build}"/>
-
-        <!-- select latest built jar files without scratchpad.jar -->
-        <pathconvert property="jarpackage">
-            <sort>
-                <resources>
-                    <fileset dir="${dist}">
-                        <include name="**/poi-3.*.jar"/>
-                        <include name="**/poi-ooxml-3.*.jar"/>
-                        <include name="**/poi-ooxml-schemas-3.*.jar"/>
-                        <exclude name="**/*-javadoc*"/>
-                        <exclude name="**/*-sources*"/>
-                    </fileset>
-                </resources>
-            </sort>
-        </pathconvert>
-
-        <fail message="Did not find jar packages looking in directory ${dist}">
-            <condition>
-                <or>
-                    <equals arg1="${jarpackage}" arg2=""/>
-                    <not>
-                        <isset property="jarpackage"/>
-                    </not>
-                </or>
-            </condition>
-        </fail>
-
-        <echo message="Found jar packages at ${jarpackage}, dist: ${dist}"/>
-        <path id="libs">
-            <fileset dir="../../lib">
-                <include name="junit*.jar"/>
-            </fileset>
-            <fileset dir="../../ooxml-lib">
-                <include name="ooxml-schemas-*.jar"/>
-                <include name="xmlbeans-*.jar"/>
-                <exclude name="xmlbeans-2.3.*.jar"/>
-            </fileset>
-        </path>
-
-        <echo message="Compiling examples without linking to scratchpad.jar to ensure that only some specific ones require this jar"/>
-        <javac srcdir="../examples/src" destdir="${build}" 
-               target="1.6" source="1.6" debug="true" 
-               encoding="ASCII" fork="yes" includeantruntime="false" 
-               excludes="org/apache/poi/hslf/**,org/apache/poi/hsmf/**,**/EmbeddedObjects.java,**/EmeddedObjects.java,**/LoadEmbedded.java,**/Word2Forrest.java"
-               classpath="${jarpackage}" classpathref="libs">
-        </javac>
-
-        <!-- select latest built jar files with additionally scratchpad.jar -->
-        <pathconvert property="jarpackagescratchpad">
-            <sort>
-                <resources>
-                    <fileset dir="${dist}">
-                        <include name="**/poi-3.*.jar"/>
-                        <include name="**/poi-ooxml-3.*.jar"/>
-                        <include name="**/poi-ooxml-schemas-3.*.jar"/>
-                        <include name="**/poi-scratchpad-3.*.jar"/>
-                        <exclude name="**/*-javadoc*"/>
-                        <exclude name="**/*-sources*"/>
-                    </fileset>
-                </resources>
-            </sort>
-        </pathconvert>
-
-        <echo message="Compiling all examples with the additional scratchpad.jar"/>
-        <javac srcdir="../examples/src" destdir="${build}" 
-               target="1.6" source="1.6" debug="true" 
-               encoding="ASCII" fork="yes" includeantruntime="false" 
-               classpath="${jarpackagescratchpad}" classpathref="libs">
-        </javac>
-    </target>
-</project>
diff --git a/trunk/src/integrationtest/commons-logging.properties b/trunk/src/integrationtest/commons-logging.properties
deleted file mode 100644
index 45db0a7..0000000
--- a/trunk/src/integrationtest/commons-logging.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-log4j.configuration=log4j.properties
\ No newline at end of file
diff --git a/trunk/src/integrationtest/log4j.properties b/trunk/src/integrationtest/log4j.properties
deleted file mode 100644
index f2aea68..0000000
--- a/trunk/src/integrationtest/log4j.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-log4j.rootLogger=info, R
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=build/test-integration.log
-
-log4j.appender.R.MaxFileSize=1000KB
-# Keep one backup file
-log4j.appender.R.MaxBackupIndex=5
-
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-log4j.logger.org.apache.poi.poifs.nio.FileBackedDataSource=ERROR
-log4j.logger.org.apache.poi.hdgf.chunks.Chunk=FATAL
-log4j.logger.org.apache.poi.hpsf.CodePageString=ERROR
-log4j.logger.org.apache.poi.hdgf.chunks.ChunkFactory=ERROR
-log4j.logger.org.apache.poi.hslf.model.textproperties.BitMaskTextProp=ERROR
-log4j.logger.org.apache.poi.util.JvmBugs=ERROR
-log4j.logger.org.apache.poi.hslf.usermodel.HSLFTextParagraph=ERROR
-log4j.logger.org.apache.poi.openxml4j.opc.ZipPackage=ERROR
-log4j.logger.org.apache.poi.POIDocument=WARN
-log4j.logger.org.apache.poi.openxml4j.opc.OPCPackage=ERROR
-log4j.logger.org.apache.poi.xssf.usermodel.XSSFWorkbook=ERROR
-log4j.logger.org.apache.poi.hslf.usermodel.HSLFGroupShape=WARN
-log4j.logger.org.apache.poi.hslf.record.Record=ERROR
\ No newline at end of file
diff --git a/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java b/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java
deleted file mode 100644
index 3974c06..0000000
--- a/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-
-import org.apache.poi.stress.*;
-import org.apache.tools.ant.DirectoryScanner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.*;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-/**
- *  This is an integration test which performs various actions on all stored test-files and tries
- *  to reveal problems which are introduced, but not covered (yet) by unit tests. 
- * 
- *  This test looks for any file under the test-data directory and tries to do some useful 
- *  processing with it based on it's type.
- * 
- *  The test is implemented as a junit {@link Parameterized} test, which leads
- *  to one test-method call for each file (currently around 950 files are handled). 
- * 
- *  There is a a mapping of extension to implementations of the interface 
- *  {@link FileHandler} which defines how the file is loaded and which actions are 
- *  tried with the file. 
- *  
- *  The test can be expanded by adding more actions to the FileHandlers, this automatically
- *  applies the action to any such file in our test-data repository.
- *  
- *  There is also a list of files that should actually fail.
- *    
- *  Note: It is also a test-failure if a file that is expected to fail now actually works, 
- *  i.e. if a bug was fixed in POI itself, the file should be removed from the expected-failures 
- *  here as well! This is to ensure that files that should not work really do not work, e.g.  
- *  that we do not remove expected sanity checks.
- */
-@RunWith(Parameterized.class)
-public class TestAllFiles {
-    private static final File ROOT_DIR = new File("test-data");
-
-    static final String[] SCAN_EXCLUDES = new String[] { "**/.svn/**", "lost+found" };
-    
-    // map file extensions to the actual mappers
-    static final Map<String, FileHandler> HANDLERS = new HashMap<String, FileHandler>();
-    static {
-        // Excel
-        HANDLERS.put(".xls", new HSSFFileHandler());
-        HANDLERS.put(".xlsx", new XSSFFileHandler());
-        HANDLERS.put(".xlsm", new XSSFFileHandler());
-        HANDLERS.put(".xltx", new XSSFFileHandler());
-        HANDLERS.put(".xlsb", new XSSFFileHandler());
-
-        // Word
-        HANDLERS.put(".doc", new HWPFFileHandler());
-        HANDLERS.put(".docx", new XWPFFileHandler());
-        HANDLERS.put(".dotx", new XWPFFileHandler());
-        HANDLERS.put(".docm", new XWPFFileHandler());
-
-        // OpenXML4J files
-        HANDLERS.put(".ooxml", new OPCFileHandler());		// OPCPackage
-        HANDLERS.put(".zip", new OPCFileHandler());      // OPCPackage
-
-        // Powerpoint
-        HANDLERS.put(".ppt", new HSLFFileHandler());
-        HANDLERS.put(".pptx", new XSLFFileHandler());
-        HANDLERS.put(".pptm", new XSLFFileHandler());
-        HANDLERS.put(".ppsm", new XSLFFileHandler());
-        HANDLERS.put(".ppsx", new XSLFFileHandler());
-        HANDLERS.put(".thmx", new XSLFFileHandler());
-        HANDLERS.put(".potx", new XSLFFileHandler());
-
-        // Outlook
-        HANDLERS.put(".msg", new HSMFFileHandler());
-
-        // Publisher
-        HANDLERS.put(".pub", new HPBFFileHandler());
-
-        // Visio - binary
-        HANDLERS.put(".vsd", new HDGFFileHandler());
-        
-        // Visio - ooxml
-        HANDLERS.put(".vsdm", new XDGFFileHandler());
-        HANDLERS.put(".vsdx", new XDGFFileHandler());
-        HANDLERS.put(".vssm", new XDGFFileHandler());
-        HANDLERS.put(".vssx", new XDGFFileHandler());
-        HANDLERS.put(".vstm", new XDGFFileHandler());
-        HANDLERS.put(".vstx", new XDGFFileHandler());
-
-        // Visio - not handled yet
-        HANDLERS.put(".vst", new NullFileHandler());
-        HANDLERS.put(".vss", new NullFileHandler());
-
-        // POIFS
-        HANDLERS.put(".ole2", new POIFSFileHandler());
-
-        // Microsoft Admin Template?
-        HANDLERS.put(".adm", new HPSFFileHandler());
-
-        // Microsoft TNEF
-        HANDLERS.put(".dat", new HMEFFileHandler());
-
-        // TODO: are these readable by some of the formats?
-        HANDLERS.put(".shw", new NullFileHandler());
-        HANDLERS.put(".zvi", new NullFileHandler());
-        HANDLERS.put(".mpp", new NullFileHandler());
-        HANDLERS.put(".qwp", new NullFileHandler());
-        HANDLERS.put(".wps", new NullFileHandler());
-        HANDLERS.put(".bin", new NullFileHandler());
-        HANDLERS.put(".xps", new NullFileHandler());
-        HANDLERS.put(".sldprt", new NullFileHandler());
-        HANDLERS.put(".mdb", new NullFileHandler());
-        HANDLERS.put(".vml", new NullFileHandler());
-
-        // ignore some file types, images, other formats, ...
-        HANDLERS.put(".txt", new NullFileHandler());
-        HANDLERS.put(".pdf", new NullFileHandler());
-        HANDLERS.put(".rtf", new NullFileHandler());
-        HANDLERS.put(".gif", new NullFileHandler());
-        HANDLERS.put(".html", new NullFileHandler());
-        HANDLERS.put(".png", new NullFileHandler());
-        HANDLERS.put(".wmf", new NullFileHandler());
-        HANDLERS.put(".emf", new NullFileHandler());
-        HANDLERS.put(".dib", new NullFileHandler());
-        HANDLERS.put(".svg", new NullFileHandler());
-        HANDLERS.put(".pict", new NullFileHandler());
-        HANDLERS.put(".jpg", new NullFileHandler());
-        HANDLERS.put(".jpeg", new NullFileHandler());
-        HANDLERS.put(".tif", new NullFileHandler());
-        HANDLERS.put(".tiff", new NullFileHandler());
-        HANDLERS.put(".wav", new NullFileHandler());
-        HANDLERS.put(".pfx", new NullFileHandler());
-        HANDLERS.put(".xml", new NullFileHandler());
-        HANDLERS.put(".csv", new NullFileHandler());
-        HANDLERS.put(".ods", new NullFileHandler());
-        // VBA source files
-        HANDLERS.put(".vba", new NullFileHandler());
-        HANDLERS.put(".bas", new NullFileHandler());
-        HANDLERS.put(".frm", new NullFileHandler());
-        HANDLERS.put(".frx", new NullFileHandler()); //binary
-        HANDLERS.put(".cls", new NullFileHandler());
-
-        // map some files without extension
-        HANDLERS.put("spreadsheet/BigSSTRecord", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2CR1", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2CR2", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2CR3", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2CR4", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2CR5", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2CR6", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecord2CR7", new NullFileHandler());
-        HANDLERS.put("spreadsheet/BigSSTRecordCR", new NullFileHandler());
-        HANDLERS.put("spreadsheet/test_properties1", new NullFileHandler());
-    }
-
-    // Old Word Documents where we can at least extract some text
-    private static final Set<String> OLD_FILES = new HashSet<String>();
-    static {
-        OLD_FILES.add("document/Bug49933.doc");
-        OLD_FILES.add("document/Bug51944.doc");
-        OLD_FILES.add("document/Word6.doc");
-        OLD_FILES.add("document/Word6_sections.doc");
-        OLD_FILES.add("document/Word6_sections2.doc");
-        OLD_FILES.add("document/Word95.doc");
-        OLD_FILES.add("document/word95err.doc");
-        OLD_FILES.add("hpsf/TestMickey.doc");
-        OLD_FILES.add("document/52117.doc");
-    }
-
-    private static final Set<String> EXPECTED_FAILURES = new HashSet<String>();
-    static {
-        // password protected files
-        EXPECTED_FAILURES.add("spreadsheet/password.xls");
-        EXPECTED_FAILURES.add("spreadsheet/protected_passtika.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/51832.xls");
-        EXPECTED_FAILURES.add("document/PasswordProtected.doc");
-        EXPECTED_FAILURES.add("slideshow/Password_Protected-hello.ppt");
-        EXPECTED_FAILURES.add("slideshow/Password_Protected-56-hello.ppt");
-        EXPECTED_FAILURES.add("slideshow/Password_Protected-np-hello.ppt");
-        EXPECTED_FAILURES.add("slideshow/cryptoapi-proc2356.ppt");
-        //EXPECTED_FAILURES.add("document/bug53475-password-is-pass.docx");
-        //EXPECTED_FAILURES.add("document/bug53475-password-is-solrcell.docx");
-        EXPECTED_FAILURES.add("spreadsheet/xor-encryption-abc.xls");
-        EXPECTED_FAILURES.add("spreadsheet/35897-type4.xls");
-        //EXPECTED_FAILURES.add("poifs/protect.xlsx");
-        //EXPECTED_FAILURES.add("poifs/protected_sha512.xlsx");
-        //EXPECTED_FAILURES.add("poifs/extenxls_pwd123.xlsx");
-        //EXPECTED_FAILURES.add("poifs/protected_agile.docx");
-        EXPECTED_FAILURES.add("spreadsheet/58616.xlsx");
-        EXPECTED_FAILURES.add("poifs/60320-protected.xlsx");
-
-        // TODO: fails XMLExportTest, is this ok?
-        EXPECTED_FAILURES.add("spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/55864.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/57890.xlsx");
-
-        // TODO: these fail now with some NPE/file read error because we now try to compute every value via Cell.toString()!
-        EXPECTED_FAILURES.add("spreadsheet/44958.xls");
-        EXPECTED_FAILURES.add("spreadsheet/44958_1.xls");
-        EXPECTED_FAILURES.add("spreadsheet/testArraysAndTables.xls");
-
-        // TODO: good to ignore?
-        EXPECTED_FAILURES.add("spreadsheet/sample-beta.xlsx");
-
-        // This is actually a spreadsheet!
-        EXPECTED_FAILURES.add("hpsf/TestRobert_Flaherty.doc");
-
-        // some files that are broken, eg Word 95, ...
-        EXPECTED_FAILURES.add("spreadsheet/43493.xls");
-        EXPECTED_FAILURES.add("spreadsheet/46904.xls");
-        EXPECTED_FAILURES.add("document/Bug50955.doc");
-        EXPECTED_FAILURES.add("document/57843.doc");
-        EXPECTED_FAILURES.add("slideshow/PPT95.ppt");
-        EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx");
-        EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx");
-        EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx");
-        EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx");
-        EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx");
-        EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx");
-        EXPECTED_FAILURES.add("openxml4j/OPCCompliance_DerivedPartNameFAIL.docx");
-        EXPECTED_FAILURES.add("openxml4j/invalid.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/54764-2.xlsx");   // see TestXSSFBugs.bug54764()
-        EXPECTED_FAILURES.add("spreadsheet/54764.xlsx");     // see TestXSSFBugs.bug54764()
-        EXPECTED_FAILURES.add("spreadsheet/Simple.xlsb");
-        EXPECTED_FAILURES.add("poifs/unknown_properties.msg"); // POIFS properties corrupted
-        EXPECTED_FAILURES.add("poifs/only-zero-byte-streams.ole2"); // No actual contents
-        EXPECTED_FAILURES.add("spreadsheet/poc-xmlbomb.xlsx");  // contains xml-entity-expansion
-        EXPECTED_FAILURES.add("spreadsheet/poc-shared-strings.xlsx");  // contains shared-string-entity-expansion
-        EXPECTED_FAILURES.add("spreadsheet/60255_extra_drawingparts.xlsx"); // Non-drawing drawing
-        
-        // old Excel files, which we only support simple text extraction of
-        EXPECTED_FAILURES.add("spreadsheet/testEXCEL_2.xls");
-        EXPECTED_FAILURES.add("spreadsheet/testEXCEL_3.xls");
-        EXPECTED_FAILURES.add("spreadsheet/testEXCEL_4.xls");
-        EXPECTED_FAILURES.add("spreadsheet/testEXCEL_5.xls");
-        EXPECTED_FAILURES.add("spreadsheet/testEXCEL_95.xls");
-        EXPECTED_FAILURES.add("spreadsheet/59074.xls");
-        EXPECTED_FAILURES.add("spreadsheet/60284.xls");
-        
-        // OOXML Strict is not yet supported, see bug #57699
-        EXPECTED_FAILURES.add("spreadsheet/SampleSS.strict.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/SimpleStrict.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/sample.strict.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/57914.xlsx");
-
-        // non-TNEF files
-        EXPECTED_FAILURES.add("ddf/Container.dat");
-        EXPECTED_FAILURES.add("ddf/47143.dat");
-
-        // sheet cloning errors
-        EXPECTED_FAILURES.add("spreadsheet/47813.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/56450.xls");
-        EXPECTED_FAILURES.add("spreadsheet/57231_MixedGasReport.xls");
-        EXPECTED_FAILURES.add("spreadsheet/OddStyleRecord.xls");
-        EXPECTED_FAILURES.add("spreadsheet/WithChartSheet.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/chart_sheet.xlsx");
-        EXPECTED_FAILURES.add("spreadsheet/SimpleScatterChart.xlsx");
-    }
-
-    private static final Set<String> IGNORED = new HashSet<String>();
-    static {
-        // need JDK8+ - https://bugs.openjdk.java.net/browse/JDK-8038081
-        IGNORED.add("slideshow/42474-2.ppt");
-        // OPC handler works / XSSF handler fails
-        IGNORED.add("spreadsheet/57181.xlsm");
-    }
-    
-    @Parameters(name="{index}: {0} using {1}")
-    public static Iterable<Object[]> files() {
-        DirectoryScanner scanner = new DirectoryScanner();
-        scanner.setBasedir(ROOT_DIR);
-        scanner.setExcludes(SCAN_EXCLUDES);
-
-        scanner.scan();
-
-        System.out.println("Handling " + scanner.getIncludedFiles().length + " files");
-
-        List<Object[]> files = new ArrayList<Object[]>();
-        for(String file : scanner.getIncludedFiles()) {
-            file = file.replace('\\', '/'); // ... failures/handlers lookup doesn't work on windows otherwise
-            if (IGNORED.contains(file)) {
-                System.out.println("Ignoring " + file);
-                continue;
-            }
-            FileHandler handler = HANDLERS.get(getExtension(file));
-            files.add(new Object[] { file, handler });
-            
-            // for some file-types also run OPCFileHandler
-            if(handler instanceof XSSFFileHandler ||
-                handler instanceof XWPFFileHandler ||
-                handler instanceof XSLFFileHandler ||
-                handler instanceof XDGFFileHandler) {
-                files.add(new Object[] { file, HANDLERS.get(".ooxml") });
-            }
-        }
-
-        return files;
-    }
-
-    @SuppressWarnings("DefaultAnnotationParam")
-    @Parameter(value=0)
-    public String file;
-
-    @Parameter(value=1)
-    public FileHandler handler;
-
-    @Test
-    public void testAllFiles() throws Exception {
-        System.out.println("Reading " + file + " with " + handler.getClass());
-        assertNotNull("Unknown file extension for file: " + file + ": " + getExtension(file), handler);
-        File inputFile = new File(ROOT_DIR, file);
-
-        try {
-            InputStream stream = new BufferedInputStream(new FileInputStream(inputFile), 64*1024);
-            try {
-                handler.handleFile(stream);
-
-                assertFalse("Expected to fail for file " + file + " and handler " + handler + ", but did not fail!", 
-                        OLD_FILES.contains(file));
-            } finally {
-                stream.close();
-            }
-
-            handler.handleExtracting(inputFile);
-
-            // special cases where docx-handling breaks, but OPCPackage handling works
-            boolean ignoredOPC = (file.endsWith(".docx") || file.endsWith(".xlsx") ||
-                        file.endsWith(".xlsb") || file.endsWith(".pptx")) &&
-                    handler instanceof OPCFileHandler;
-
-            assertFalse("Expected to fail for file " + file + " and handler " + handler + ", but did not fail!", 
-                EXPECTED_FAILURES.contains(file) && !ignoredOPC);
-        } catch (OldFileFormatException e) {
-            // for old word files we should still support extracting text
-            if(OLD_FILES.contains(file)) {
-                handler.handleExtracting(inputFile);
-            } else {
-                // check if we expect failure for this file
-                if(!EXPECTED_FAILURES.contains(file) && !AbstractFileHandler.EXPECTED_EXTRACTOR_FAILURES.contains(file)) {
-                    System.out.println("Failed: " + file);
-                    throw new Exception("While handling " + file, e);
-                }
-            }
-        } catch (Exception e) {
-            // check if we expect failure for this file
-            if(!EXPECTED_FAILURES.contains(file) && !AbstractFileHandler.EXPECTED_EXTRACTOR_FAILURES.contains(file)) {
-                System.out.println("Failed: " + file);
-                throw new Exception("While handling " + file, e);
-            }
-        }
-
-        // let some file handlers do additional stuff
-        handler.handleAdditional(inputFile);
-    }
-
-    static String getExtension(String file) {
-        int pos = file.lastIndexOf('.');
-        if(pos == -1 || pos == file.length()-1) {
-            return file;
-        }
-
-        return file.substring(pos).toLowerCase(Locale.ROOT);
-    }
-
-    private static class NullFileHandler implements FileHandler {
-        @Override
-        public void handleFile(InputStream stream) throws Exception {
-        }
-
-        @Override
-        public void handleExtracting(File file) throws Exception {
-        }
-
-        @Override
-        public void handleAdditional(File file) throws Exception {
-        }
-    }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java b/trunk/src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java
deleted file mode 100644
index 1b712f7..0000000
--- a/trunk/src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.hssf.record.Record;
-import org.junit.Test;
-
-/**
- * Needs to be implemented in this package to have access to 
- * HSSFWorkbook.getWorkbook()
- */
-public class RecordsStresser {
-    public static void handleWorkbook(HSSFWorkbook wb) {
-        List<Record> records = wb.getWorkbook().getRecords();
-        for(Record record : records) {
-            // some Records do not implement clone ?! 
-            // equals instead of instanceof is on purpose here to only skip exactly this class and not any derived ones
-//            if(record.getClass().equals(InterfaceHdrRecord.class) ||
-//                    record.getClass().equals(MMSRecord.class) ||
-//                    record.getClass().equals(InterfaceEndRecord.class) ||
-//                    record.getClass().equals(WriteAccessRecord.class) ||
-//                    record.getClass().equals(CodepageRecord.class) ||
-//                    record.getClass().equals(DSFRecord.class)) {
-//                continue;
-//            }
-            try {
-                Record newRecord = (Record) record.clone();
-                
-                assertEquals("Expecting the same class back from clone(), but had Record of type " + record.getClass() + " and got back a " + newRecord.getClass() + " from clone()", 
-                        record.getClass(), newRecord.getClass()); 
-                
-                byte[] origBytes = record.serialize();
-                byte[] newBytes = newRecord.serialize();
-                
-                assertArrayEquals("Record of type " + record.getClass() + " should return the same byte array via the clone() method, but did return a different array", 
-                        origBytes, newBytes);
-            } catch (CloneNotSupportedException e) {
-                throw new RuntimeException(e);
-            } catch (RuntimeException e) {
-                // some Records do not implement clone, ignore those for now
-                assertTrue(e.getMessage().contains("needs to define a clone method"));
-            }
-        }
-    }
-
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void test() throws Exception {
-        InputStream stream = new FileInputStream("test-data/spreadsheet/15556.xls");
-        try {
-            HSSFWorkbook wb = new HSSFWorkbook(stream);
-            handleWorkbook(wb);
-            wb.close();
-        } finally {
-            stream.close();
-        }
-    }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java
deleted file mode 100644
index 6bfeee2..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.hpsf.extractor.HPSFPropertiesExtractor;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.xmlbeans.XmlException;
-
-public abstract class AbstractFileHandler implements FileHandler {
-    public static final Set<String> EXPECTED_EXTRACTOR_FAILURES = new HashSet<String>();
-    static {
-        // password protected files
-        EXPECTED_EXTRACTOR_FAILURES.add("document/bug53475-password-is-pass.docx");
-        EXPECTED_EXTRACTOR_FAILURES.add("poifs/extenxls_pwd123.xlsx");
-        EXPECTED_EXTRACTOR_FAILURES.add("poifs/protect.xlsx");
-        EXPECTED_EXTRACTOR_FAILURES.add("poifs/protected_agile.docx");
-        EXPECTED_EXTRACTOR_FAILURES.add("poifs/protected_sha512.xlsx");
-        
-        // unsupported file-types, no supported OLE2 parts
-        EXPECTED_EXTRACTOR_FAILURES.add("hmef/quick-winmail.dat");
-        EXPECTED_EXTRACTOR_FAILURES.add("hmef/winmail-sample1.dat");
-        EXPECTED_EXTRACTOR_FAILURES.add("hmef/bug52400-winmail-simple.dat");
-        EXPECTED_EXTRACTOR_FAILURES.add("hmef/bug52400-winmail-with-attachments.dat");
-        EXPECTED_EXTRACTOR_FAILURES.add("hpsf/Test0313rur.adm");
-        EXPECTED_EXTRACTOR_FAILURES.add("poifs/Notes.ole2");
-    }
-
-    @Override
-    public void handleExtracting(File file) throws Exception {
-        boolean before = ExtractorFactory.getThreadPrefersEventExtractors();
-        try {
-            ExtractorFactory.setThreadPrefersEventExtractors(true);
-            handleExtractingInternal(file);
-
-            ExtractorFactory.setThreadPrefersEventExtractors(false);
-            handleExtractingInternal(file);
-        } finally {
-            ExtractorFactory.setThreadPrefersEventExtractors(before);
-        }
-        
-        /* Did fail for some documents with special XML contents...
-        try {
-            OOXMLPrettyPrint.main(new String[] { file.getAbsolutePath(), 
-            		"/tmp/pretty-" + file.getName() });
-        } catch (ZipException e) {
-        	// ignore, not a Zip/OOXML file
-        }*/
-    }
-
-    private void handleExtractingInternal(File file) throws Exception {
-        long length = file.length();
-        long modified = file.lastModified();
-        
-        POITextExtractor extractor = ExtractorFactory.createExtractor(file);
-        try  {
-            assertNotNull(extractor);
-
-            assertNotNull(extractor.getText());
-            
-            // also try metadata
-            @SuppressWarnings("resource")
-            POITextExtractor metadataExtractor = extractor.getMetadataTextExtractor();
-            assertNotNull(metadataExtractor.getText());
-
-            assertFalse("Expected Extraction to fail for file " + file + " and handler " + this + ", but did not fail!", 
-                    EXPECTED_EXTRACTOR_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName()));
-            
-            assertEquals("File should not be modified by extractor", length, file.length());
-            assertEquals("File should not be modified by extractor", modified, file.lastModified());
-            
-            handleExtractingAsStream(file);
-            
-            if(extractor instanceof POIOLE2TextExtractor) {
-            	HPSFPropertiesExtractor hpsfExtractor = new HPSFPropertiesExtractor((POIOLE2TextExtractor)extractor);
-            	try {
-                	assertNotNull(hpsfExtractor.getDocumentSummaryInformationText());
-                	assertNotNull(hpsfExtractor.getSummaryInformationText());
-                	String text = hpsfExtractor.getText();
-                	//System.out.println(text);
-                	assertNotNull(text);
-            	} finally {
-            		hpsfExtractor.close();
-            	}
-            }
-        } catch (IllegalArgumentException e) {
-            if(!EXPECTED_EXTRACTOR_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-                throw e;
-            }
-        } finally {
-            extractor.close();
-        }
-    }
-
-    private void handleExtractingAsStream(File file) throws IOException, OpenXML4JException, XmlException {
-        InputStream stream = new FileInputStream(file);
-        try {
-            POITextExtractor streamExtractor = ExtractorFactory.createExtractor(stream);
-            try {
-                assertNotNull(streamExtractor);
-   
-                assertNotNull(streamExtractor.getText());
-            } finally {
-                streamExtractor.close();
-            }
-        } finally {
-            stream.close();
-        }
-    }
-
-    @Override
-    public void handleAdditional(File file) throws Exception {
-        // by default we do nothing here
-    }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/FileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/FileHandler.java
deleted file mode 100644
index 8b65cfa..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/FileHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import java.io.File;
-import java.io.InputStream;
-
-/**
- * Base interface for the various file types that are 
- * used in the stress testing.
- */
-public interface FileHandler {
-	/**
-	 * The FileHandler receives a stream ready for reading the
-	 * file and should handle the content that is provided and
-	 * try to read and interpret the data.
-	 * 
-	 * Closing is handled by the framework outside this call.
-	 *
-	 * @param stream
-	 * @throws Exception
-	 */
-	void handleFile(InputStream stream) throws Exception;
-	
-	/**
-	 * Ensures that extracting text from the given file
-	 * is returning some text. 
-	 */
-	void handleExtracting(File file) throws Exception;
-
-	/**
-	 * Allows to perform some additional work, e.g. run
-	 * some of the example applications
-	 */
-	void handleAdditional(File file) throws Exception;
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java
deleted file mode 100644
index eb0e1b6..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hdgf.HDGFDiagram;
-import org.apache.poi.hdgf.extractor.VisioTextExtractor;
-import org.apache.poi.hdgf.streams.Stream;
-import org.apache.poi.hdgf.streams.TrailerStream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-
-public class HDGFFileHandler extends POIFSFileHandler {
-	@Override
-	public void handleFile(InputStream stream) throws Exception {
-	    POIFSFileSystem poifs = new POIFSFileSystem(stream);
-		HDGFDiagram diagram = new HDGFDiagram(poifs);
-		Stream[] topLevelStreams = diagram.getTopLevelStreams();
-		assertNotNull(topLevelStreams);
-		for(Stream str : topLevelStreams) {
-			assertTrue(str.getPointer().getLength() >= 0);
-		}
-		
-		TrailerStream trailerStream = diagram.getTrailerStream();
-		assertNotNull(trailerStream);
-		assertTrue(trailerStream.getPointer().getLength() >= 0);
-		
-		poifs.close();
-		
-		// writing is not yet implemented... handlePOIDocument(diagram);
-	}
-	
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Override
-    @Test
-	public void test() throws Exception {
-		File file = new File("test-data/diagram/44501.vsd");
-
-		InputStream stream = new FileInputStream(file);
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-		
-		handleExtracting(file);
-		
-		stream = new FileInputStream(file);
-		try {
-			VisioTextExtractor extractor = new VisioTextExtractor(stream);
-			try {
-				assertNotNull(extractor.getText());
-			} finally {
-				extractor.close();
-			}
-		} finally {
-			stream.close();
-		}
-	}
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
deleted file mode 100644
index 9f492bf..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.MAPIStringAttribute;
-import org.junit.Test;
-
-public class HMEFFileHandler extends AbstractFileHandler {
-
-	@Override
-    public void handleFile(InputStream stream) throws Exception {
-		HMEFMessage msg = new HMEFMessage(stream);
-		
-		// list all properties
-		StringBuilder props = new StringBuilder();
-		for(MAPIAttribute att : msg.getMessageMAPIAttributes()) {
-			props.append(att.getType()).append(": ").append(MAPIStringAttribute.getAsString( att)).append("\n");
-		}
-		
-		// there are two test-files that have no body...
-		if(!msg.getSubject().equals("Testing TNEF Message") && !msg.getSubject().equals("TNEF test message with attachments")) {
-    		assertNotNull("Had: " + msg.getBody() + ", " + msg.getSubject() + ", " + msg.getAttachments() + ": " + props.toString(), 
-    				msg.getBody());
-		}
-		assertNotNull("Had: " + msg.getBody() + ", " + msg.getSubject() + ", " + msg.getAttachments() + ": " + props.toString(), 
-				msg.getSubject());
-	}
-	
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Test
-	public void test() throws Exception {
-		InputStream stream = new FileInputStream("test-data/hmef/quick-winmail.dat");
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-	}
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java
deleted file mode 100644
index 093ef02..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hpbf.HPBFDocument;
-import org.apache.poi.hpbf.extractor.PublisherTextExtractor;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-
-public class HPBFFileHandler extends POIFSFileHandler {
-	@Override
-	public void handleFile(InputStream stream) throws Exception {
-		HPBFDocument pub = new HPBFDocument(new POIFSFileSystem(stream));
-		assertNotNull(pub.getEscherDelayStm());
-		assertNotNull(pub.getMainContents());
-		assertNotNull(pub.getQuillContents());
-		
-		// writing is not yet implemented... handlePOIDocument(pub);
-	}
-	
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Override
-    @Test
-	public void test() throws Exception {
-		File file = new File("test-data/publisher/SampleBrochure.pub");
-
-		InputStream stream = new FileInputStream(file);
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-		
-		handleExtracting(file);
-		
-		stream = new FileInputStream(file);
-		try {
-			PublisherTextExtractor extractor = new PublisherTextExtractor(stream);
-			try {
-				assertNotNull(extractor.getText());
-			} finally {
-				extractor.close();
-			}
-		} finally {
-			stream.close();
-		}
-	}
-	
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java
deleted file mode 100644
index 1f3dc69..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hpsf.HPSFPropertiesOnlyDocument;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-
-public class HPSFFileHandler extends POIFSFileHandler {
-	@Override
-    public void handleFile(InputStream stream) throws Exception {
-		HPSFPropertiesOnlyDocument hpsf = new HPSFPropertiesOnlyDocument(new POIFSFileSystem(stream));
-		assertNotNull(hpsf.getDocumentSummaryInformation());
-		assertNotNull(hpsf.getSummaryInformation());
-		
-		handlePOIDocument(hpsf);
-	}
-	
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Override
-    @Test
-	public void test() throws Exception {
-		InputStream stream = new FileInputStream("test-data/hpsf/Test0313rur.adm");
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-	}
-
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void testExtractor() throws Exception {
-        handleExtracting(new File("test-data/hpsf/TestBug44375.xls"));
-    }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java
deleted file mode 100644
index db9548c..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.junit.Test;
-
-public class HSLFFileHandler extends SlideShowHandler {
-	@Override
-	public void handleFile(InputStream stream) throws Exception {
-		HSLFSlideShowImpl slide = new HSLFSlideShowImpl(stream);
-		assertNotNull(slide.getCurrentUserAtom());
-		assertNotNull(slide.getEmbeddedObjects());
-		assertNotNull(slide.getUnderlyingBytes());
-		assertNotNull(slide.getPictureData());
-		Record[] records = slide.getRecords();
-		assertNotNull(records);
-		for(Record record : records) {
-			assertTrue(record.getRecordType() >= 0);
-		}
-		
-		handlePOIDocument(slide);
-		
-		HSLFSlideShow ss = new HSLFSlideShow(slide);
-		handleSlideShow(ss);
-	}
-	
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Override
-    @Test
-	public void test() throws Exception {
-		InputStream stream = new FileInputStream("test-data/hpsf/Test_Humor-Generation.ppt");
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-	}
-
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void testExtractor() throws Exception {
-        handleExtracting(new File("test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx"));
-   }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java
deleted file mode 100644
index c22edf2..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.datatypes.DirectoryChunk;
-import org.junit.Test;
-
-public class HSMFFileHandler extends POIFSFileHandler {
-	@Override
-	public void handleFile(InputStream stream) throws Exception {
-		MAPIMessage mapi = new MAPIMessage(stream);
-		assertNotNull(mapi.getAttachmentFiles());
-		assertNotNull(mapi.getDisplayBCC());
-		assertNotNull(mapi.getMessageDate());
-
-		AttachmentChunks[] attachments = mapi.getAttachmentFiles();
-
-		for(AttachmentChunks attachment : attachments) {
-
-		   DirectoryChunk chunkDirectory = attachment.attachmentDirectory;
-		   if(chunkDirectory != null) {
-			   MAPIMessage attachmentMSG = chunkDirectory.getAsEmbededMessage();
-			   assertNotNull(attachmentMSG);
-			   String body = attachmentMSG.getTextBody();
-			   assertNotNull(body);
-		   }
-		}
-
-		/* => Writing isn't yet supported...
-		// write out the file
-		File file = TempFile.createTempFile("StressTest", ".msg");
-		writeToFile(mapi, file);
-		
-		MAPIMessage read = new MAPIMessage(file.getAbsolutePath());
-		assertNotNull(read.getAttachmentFiles());
-		assertNotNull(read.getDisplayBCC());
-		assertNotNull(read.getMessageDate());
-		*/
-		
-		// writing is not yet supported... handlePOIDocument(mapi);
-	}
-	
-//	private void writeToFile(MAPIMessage mapi, File file)
-//			throws FileNotFoundException, IOException {
-//		OutputStream stream = new FileOutputStream(file);
-//		try {
-//			mapi.write(stream);
-//		} finally {
-//			stream.close();
-//		}
-//	}
-
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Override
-    @Test
-	public void test() throws Exception {
-		InputStream stream = new FileInputStream("test-data/hsmf/example_received_regular.msg");
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java
deleted file mode 100644
index fcea580..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.dev.BiffViewer;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.RecordFormatException;
-import org.junit.Test;
-
-import java.io.*;
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertFalse;
-
-public class HSSFFileHandler extends SpreadsheetHandler {
-	private final POIFSFileHandler delegate = new POIFSFileHandler();
-	@Override
-    public void handleFile(InputStream stream) throws Exception {
-		HSSFWorkbook wb = new HSSFWorkbook(stream);
-		handleWorkbook(wb);
-		
-		// TODO: some documents fail currently...
-        //HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb);
-        //evaluator.evaluateAll();
-        
-		delegate.handlePOIDocument(wb);
-
-		// also try to see if some of the Records behave incorrectly
-		// TODO: still fails on some records... RecordsStresser.handleWorkbook(wb);
-	}
-
-	private static final Set<String> EXPECTED_ADDITIONAL_FAILURES = new HashSet<String>();
-	static {
-		// encrypted
-		EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/35897-type4.xls");
-		EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/xor-encryption-abc.xls");
-		EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/password.xls");
-		// broken files
-		EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/43493.xls");
-		// TODO: ok to ignore?
-		EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/50833.xls");
-		EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/51832.xls");
-		EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/XRefCalc.xls");
-	}
-
-	@Override
-	public void handleAdditional(File file) throws Exception {
-		// redirect stdout as the examples often write lots of text
-		PrintStream oldOut = System.out;
-		try {
-			System.setOut(new PrintStream(new OutputStream() {
-				@Override
-				public void write(int b) throws IOException {
-				}
-			}));
-
-			BiffViewer.main(new String[]{file.getAbsolutePath()});
-
-			assertFalse("Expected Extraction to fail for file " + file + " and handler " + this + ", but did not fail!",
-					EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName()));
-		} catch (OldExcelFormatException e) {
-			// old excel formats are not supported here
-		} catch (EncryptedDocumentException e) {
-			if(!EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-				throw e;
-			}
-		} catch (RecordFormatException e) {
-			if(!EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-				throw e;
-			}
-		} catch (RuntimeException e) {
-			if(!EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-				throw e;
-			}
-		} finally {
-			System.setOut(oldOut);
-		}
-	}
-
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Test
-	public void test() throws Exception {
-		InputStream stream = new FileInputStream("test-data/spreadsheet/49219.xls");
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-	}
-
-	// a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void testExtractor() throws Exception {
-        handleExtracting(new File("test-data/spreadsheet/BOOK_in_capitals.xls"));
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
deleted file mode 100644
index d762598..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.junit.Test;
-
-public class HWPFFileHandler extends POIFSFileHandler {
-	@Override
-	public void handleFile(InputStream stream) throws Exception {
-		HWPFDocument doc = new HWPFDocument(stream);
-		assertNotNull(doc.getBookmarks());
-		assertNotNull(doc.getCharacterTable());
-		assertNotNull(doc.getEndnotes());
-		
-		handlePOIDocument(doc);
-	}
-
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Override
-    @Test
-	public void test() throws Exception {
-		File file = new File("test-data/document/52117.doc");
-
-		InputStream stream = new FileInputStream(file);
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-		
-		handleExtracting(file);
-		
-		stream = new FileInputStream(file);
-		try {
-			WordExtractor extractor = new WordExtractor(stream);
-			try {
-				assertNotNull(extractor.getText());
-			} finally {
-				extractor.close();
-			}
-		} finally {
-			stream.close();
-		}
-	}
-
-	@Test
-	public void testExtractingOld() throws Exception {
-		File file = new File("test-data/document/52117.doc");
-		handleExtracting(file);
-	}
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/OPCFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/OPCFileHandler.java
deleted file mode 100644
index 12493e2..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/OPCFileHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-import org.junit.Test;
-
-public class OPCFileHandler extends AbstractFileHandler {
-	@Override
-    public void handleFile(InputStream stream) throws Exception {
-        // ignore password protected files
-        if (POIXMLDocumentHandler.isEncrypted(stream)) return;
-
-        OPCPackage p = OPCPackage.open(stream);
-
-        for (PackagePart part : p.getParts()) {
-            if (part.getPartName().toString().equals("/docProps/core.xml")) {
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, part.getContentType());
-            }
-            if (part.getPartName().toString().equals("/word/document.xml")) {
-                assertTrue("Expected one of " + XWPFRelation.MACRO_DOCUMENT + ", " + XWPFRelation.DOCUMENT + ", " + XWPFRelation.TEMPLATE + 
-                        ", but had " + part.getContentType(),
-                        XWPFRelation.DOCUMENT.getContentType().equals(part.getContentType()) ||
-                        XWPFRelation.MACRO_DOCUMENT.getContentType().equals(part.getContentType()) ||
-                        XWPFRelation.TEMPLATE.getContentType().equals(part.getContentType()));
-            }
-            if (part.getPartName().toString().equals("/word/theme/theme1.xml")) {
-                assertEquals(XWPFRelation.THEME.getContentType(), part.getContentType());
-            }
-        }
-    }
-	
-    @Override
-    public void handleExtracting(File file) throws Exception {
-        // text-extraction is not possible currenlty for these types of files
-    }
-
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Test
-	public void test() throws Exception {
-		File file = new File("test-data/diagram/test.vsdx");
-
-		InputStream stream = new PushbackInputStream(new FileInputStream(file), 100000);
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-		
-		handleExtracting(file);
-	}
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java
deleted file mode 100644
index 56be0d9..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDocument;
-import org.apache.poi.hpsf.extractor.HPSFPropertiesExtractor;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-
-public class POIFSFileHandler extends AbstractFileHandler {
-
-	@Override
-    public void handleFile(InputStream stream) throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(stream);
-		try {
-		    handlePOIFSFileSystem(fs);
-		    handleHPSFProperties(fs);
-		} finally {
-		    fs.close();
-		}
-	}
-
-	private void handleHPSFProperties(POIFSFileSystem fs) throws IOException {
-        HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
-        try {
-            // can be null
-            ext.getDocSummaryInformation();
-            ext.getSummaryInformation();
-            
-            assertNotNull(ext.getDocumentSummaryInformationText());
-            assertNotNull(ext.getSummaryInformationText());
-            assertNotNull(ext.getText());
-        } finally {
-            ext.close();
-        }
-    }
-
-    private void handlePOIFSFileSystem(POIFSFileSystem fs) {
-		assertNotNull(fs);
-		assertNotNull(fs.getRoot());
-	}
-	
-	protected void handlePOIDocument(POIDocument doc) throws Exception {
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		doc.write(out);
-		
-		ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-		POIFSFileSystem fs = new POIFSFileSystem(in);
-		handlePOIFSFileSystem(fs);
-		fs.close();
-	}
-	
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void test() throws Exception {
-        File file = new File("test-data/poifs/Notes.ole2");
-
-        InputStream stream = new FileInputStream(file);
-        try {
-            handleFile(stream);
-        } finally {
-            stream.close();
-        }
-        
-        //handleExtracting(file);
-    }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/POIXMLDocumentHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/POIXMLDocumentHandler.java
deleted file mode 100644
index 1a8cbf6..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/POIXMLDocumentHandler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-public final class POIXMLDocumentHandler {
-	protected void handlePOIXMLDocument(POIXMLDocument doc) throws Exception {
-		assertNotNull(doc.getAllEmbedds());
-		assertNotNull(doc.getPackage());
-		assertNotNull(doc.getPackagePart());
-		assertNotNull(doc.getProperties());
-		assertNotNull(doc.getRelations());
-	}
-
-    protected static boolean isEncrypted(InputStream stream) throws IOException {
-        if (POIFSFileSystem.hasPOIFSHeader(stream)) {
-            POIFSFileSystem poifs = new POIFSFileSystem(stream);
-            try {
-                if (poifs.getRoot().hasEntry(Decryptor.DEFAULT_POIFS_ENTRY)) {
-                    return true;
-                }
-            } finally {
-                poifs.close();
-            }
-            throw new IOException("wrong file format or file extension for OO XML file");
-        }
-        return false;
-    }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java
deleted file mode 100644
index e798b35..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.sl.usermodel.TextShape;
-
-public abstract class SlideShowHandler extends POIFSFileHandler {
-    public void handleSlideShow(SlideShow<?,?> ss) throws IOException {
-        renderSlides(ss);
-
-        readContent(ss);
-        readPictures(ss);
-
-        // write out the file
-        ByteArrayOutputStream out = writeToArray(ss);
-        
-        readContent(ss);
-
-        // read in the writen file
-        SlideShow<?,?> read = SlideShowFactory.create(new ByteArrayInputStream(out.toByteArray()));
-        try {
-            assertNotNull(read);
-            readContent(read);
-        } finally {
-            read.close();
-        }
-    }
-
-    private ByteArrayOutputStream writeToArray(SlideShow<?,?> ss) throws IOException {
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        try {
-            ss.write(stream);
-        } finally {
-            stream.close();
-        }
-        
-        return stream;
-    }
-
-    
-    private void readContent(SlideShow<?,?> ss) {
-        for (Slide<?,?> s : ss.getSlides()) {
-            s.getTitle();
-            readText(s);
-            readText(s.getNotes());
-            readText(s.getMasterSheet());
-        }
-    }
-    
-    private void readText(ShapeContainer<?,?> sc) {
-        if (sc == null) return;
-        for (Shape<?,?> s : sc) {
-            if (s instanceof TextShape) {
-                for (TextParagraph<?,?,?> tp : (TextShape<?,?>)s) {
-                    for (TextRun tr : tp) {
-                        tr.getRawText();
-                    }
-                }
-            }
-        }
-    }
-    
-    private void readPictures(SlideShow<?,?> ss) {
-        for (PictureData pd : ss.getPictureData()) {
-            Dimension dim = pd.getImageDimension();
-            assertTrue(dim.getHeight() >= 0);
-            assertTrue(dim.getWidth() >= 0);
-        }
-    }
-    
-    private void renderSlides(SlideShow<?,?> ss) {
-        Dimension pgsize = ss.getPageSize();
-
-        for (Slide<?,?> s : ss.getSlides()) {
-            BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D graphics = img.createGraphics();
-            DrawFactory.getInstance(graphics).fixFonts(graphics);
-
-            // default rendering options
-            graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-            graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-            graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-    
-            // draw stuff
-            s.draw(graphics);
-            
-            graphics.dispose();
-            img.flush();
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java
deleted file mode 100644
index 123bfa7..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.util.RecordFormatException;
-
-public abstract class SpreadsheetHandler extends AbstractFileHandler {
-	public void handleWorkbook(Workbook wb) throws IOException {
-		// try to access some of the content
-		readContent(wb);
-		
-		// write out the file
-		writeToArray(wb);
-		
-		// access some more content (we had cases where writing corrupts the data in memory)
-		readContent(wb);
-
-		// write once more
-		ByteArrayOutputStream out = writeToArray(wb);
-
-		// read in the written file
-		Workbook read;
-		try {
-			read = WorkbookFactory.create(new ByteArrayInputStream(out.toByteArray()));
-		} catch (InvalidFormatException e) {
-			throw new IllegalStateException(e);
-		}
-		assertNotNull(read);
-		
-		readContent(read);
-		
-		modifyContent(read);
-
-		read.close();
-	}
-
-	private ByteArrayOutputStream writeToArray(Workbook wb) throws IOException {
-		ByteArrayOutputStream stream = new ByteArrayOutputStream();
-		try {
-			wb.write(stream);
-		} finally {
-			stream.close();
-		}
-		
-		return stream;
-	}
-
-	private void readContent(Workbook wb) {
-	    for(int i = 0;i < wb.getNumberOfSheets();i++) {
-			Sheet sheet = wb.getSheetAt(i);
-			assertNotNull(wb.getSheet(sheet.getSheetName()));
-			sheet.groupColumn((short) 4, (short) 5);
-			sheet.setColumnGroupCollapsed(4, true);
-			sheet.setColumnGroupCollapsed(4, false);
-
-			// don't do this for very large sheets as it will take a long time
-			if(sheet.getPhysicalNumberOfRows() > 1000) {
-			    continue;
-			}
-			
-			for(Row row : sheet) {
-			    for(Cell cell : row) {
-			        assertNotNull(cell.toString());
-			    }
-			}
-		}
-	}
-	
-	private void modifyContent(Workbook wb) {
-		/* a number of file fail because of various things: udf, unimplemented functions, ...
-		we would need quite a list of excludes and the large regression tests would probably
-		take a lot longer to run...
-		try {
-			// try to re-compute all formulas to find cases where parsing fails
-			wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-		} catch (RuntimeException e) {
-			// only allow a specific exception which indicates that an external
-			// reference was not found
-			if(!e.getMessage().contains("Could not resolve external workbook name")) {
-				throw e;
-			}
-
-		}*/
-
-	    for (int i=wb.getNumberOfSheets()-1; i>=0; i--) {
-	        try {
-	            wb.cloneSheet(i);
-	        } catch (RecordFormatException e) {
-	            if (e.getCause() instanceof CloneNotSupportedException) {
-	                // ignore me
-	                continue;
-	            }
-	            throw e;
-	        } catch (RuntimeException e) {
-	            if ("Could not find 'internal references' EXTERNALBOOK".equals(e.getMessage()) ||
-	                    "CountryRecord not found".equals(e.getMessage()) ||
-	                    "Cannot add more than 65535 shapes".equals(e.getMessage()) ) {
-	                // ignore these here for now
-	                continue;
-                }
-	            throw e;
-	        }
-	    }
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/XDGFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/XDGFFileHandler.java
deleted file mode 100644
index 9b7d03f..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/XDGFFileHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import java.io.InputStream;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.xdgf.usermodel.XmlVisioDocument;
-import org.junit.Test;
-
-public class XDGFFileHandler extends AbstractFileHandler {
-    @Override
-    public void handleFile(InputStream stream) throws Exception {
-        // ignore password protected files
-        if (POIXMLDocumentHandler.isEncrypted(stream)) return;
-
-        XmlVisioDocument doc = new XmlVisioDocument(stream);
-        new POIXMLDocumentHandler().handlePOIXMLDocument(doc);
-    }
-    
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void test() throws Exception {
-        OPCPackage pkg = OPCPackage.open("test-data/diagram/test.vsdx", PackageAccess.READ);
-        try {
-            XmlVisioDocument doc = new XmlVisioDocument(pkg);
-            new POIXMLDocumentHandler().handlePOIXMLDocument(doc);
-        } finally {
-            pkg.close();
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java
deleted file mode 100644
index 421f842..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.junit.Test;
-
-public class XSLFFileHandler extends SlideShowHandler {
-	@Override
-    public void handleFile(InputStream stream) throws Exception {
-	    XMLSlideShow slide = new XMLSlideShow(stream);
-	    XSLFSlideShow slideInner = new XSLFSlideShow(slide.getPackage());
-		assertNotNull(slideInner.getPresentation());
-		assertNotNull(slideInner.getSlideMasterReferences());
-		assertNotNull(slideInner.getSlideReferences());
-		
-		new POIXMLDocumentHandler().handlePOIXMLDocument(slide);
-
-		handleSlideShow(slide);
-		
-		slideInner.close();
-		slide.close();
-	}
-
-	@Override
-    public void handleExtracting(File file) throws Exception {
-        super.handleExtracting(file);
-        
-        
-        // additionally try the other getText() methods
-        
-        XSLFPowerPointExtractor extractor = (XSLFPowerPointExtractor) ExtractorFactory.createExtractor(file);
-        try  {
-            assertNotNull(extractor);
-
-            assertNotNull(extractor.getText(true, true, true));
-            assertEquals("With all options disabled we should not get text", 
-                    "", extractor.getText(false, false, false));
-        } finally {
-            extractor.close();
-        }
-    }
-
-    // a test-case to test this locally without executing the full TestAllFiles
-	@Override
-    @Test
-	public void test() throws Exception {
-		InputStream stream = new FileInputStream("test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx");
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-	}
-
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void testExtractor() throws Exception {
-        handleExtracting(new File("test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx"));
-   }
-}
\ No newline at end of file
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java
deleted file mode 100644
index bfa31c7..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.*;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.OLE2NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.eventusermodel.XLSX2CSV;
-import org.apache.poi.xssf.eventusermodel.XSSFReader;
-import org.apache.poi.xssf.eventusermodel.examples.FromHowTo;
-import org.apache.poi.xssf.extractor.XSSFExportToXml;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-public class XSSFFileHandler extends SpreadsheetHandler {
-    @Override
-    public void handleFile(InputStream stream) throws Exception {
-        // ignore password protected files
-        if (POIXMLDocumentHandler.isEncrypted(stream)) return;
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IOUtils.copy(stream, out);
-
-        final byte[] bytes = out.toByteArray();
-        final XSSFWorkbook wb;
-        wb = new XSSFWorkbook(new ByteArrayInputStream(bytes));
-
-        // use the combined handler for HSSF/XSSF
-        handleWorkbook(wb);
-        
-        // TODO: some documents fail currently...
-        //XSSFFormulaEvaluator evaluator = new XSSFFormulaEvaluator(wb);
-        //evaluator.evaluateAll();
-
-        // also verify general POIFS-stuff
-        new POIXMLDocumentHandler().handlePOIXMLDocument(wb);
-        
-        // and finally ensure that exporting to XML works
-        exportToXML(wb);
-
-        checkXSSFReader(OPCPackage.open(new ByteArrayInputStream(bytes)));
-        
-        wb.close();
-    }
-
-
-    private void checkXSSFReader(OPCPackage p) throws IOException, OpenXML4JException {
-        XSSFReader reader = new XSSFReader(p);
-        
-        // these can be null...
-        InputStream sharedStringsData = reader.getSharedStringsData();
-        if(sharedStringsData != null) {
-            sharedStringsData.close();
-        }
-        reader.getSharedStringsTable();
-
-        InputStream stylesData = reader.getStylesData();
-        if(stylesData != null) {
-            stylesData.close();
-        }
-        reader.getStylesTable();
-        
-        InputStream themesData = reader.getThemesData();
-        if(themesData != null) {
-            themesData.close();
-        }
-
-        assertNotNull(reader.getWorkbookData());
-        
-        Iterator<InputStream> sheetsData = reader.getSheetsData();
-        while(sheetsData.hasNext()) {
-            InputStream str = sheetsData.next();
-            str.close();
-        }
-    }
-    
-    private void exportToXML(XSSFWorkbook wb) throws SAXException,
-            ParserConfigurationException, TransformerException {
-        for (XSSFMap map : wb.getCustomXMLMappings()) {
-            XSSFExportToXml exporter = new XSSFExportToXml(map);
-
-            ByteArrayOutputStream os = new ByteArrayOutputStream();
-            exporter.exportToXML(os, true);
-        }
-    }
-
-    private static final Set<String> EXPECTED_ADDITIONAL_FAILURES = new HashSet<String>();
-    static {
-        // expected sheet-id not found
-        // EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/52348.xlsx");
-        // EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/59021.xlsx");
-        // zip-bomb
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/54764.xlsx");
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/54764-2.xlsx");
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/54764.xlsx");
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/poc-xmlbomb.xlsx");
-        // strict OOXML
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/57914.xlsx");
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/SampleSS.strict.xlsx");
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/SimpleStrict.xlsx");
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/sample.strict.xlsx");
-        // binary format
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/Simple.xlsb");
-        // TODO: good to ignore?
-        EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/sample-beta.xlsx");
-        
-        // corrupt/invalid
-        EXPECTED_ADDITIONAL_FAILURES.add("openxml4j/invalid.xlsx");
-    }
-
-    @SuppressWarnings("resource")
-    @Override
-    public void handleAdditional(File file) throws Exception {
-        // redirect stdout as the examples often write lots of text
-        PrintStream oldOut = System.out;
-        try {
-            System.setOut(new NullPrintStream());
-            FromHowTo.main(new String[]{file.getAbsolutePath()});
-            XLSX2CSV.main(new String[]{file.getAbsolutePath()});
-
-            assertFalse("Expected Extraction to fail for file " + file + " and handler " + this + ", but did not fail!",
-                    EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName()));
-
-        } catch (OLE2NotOfficeXmlFileException e) {
-            // we have some files that are not actually OOXML and thus cannot be tested here
-        } catch (IllegalArgumentException e) {
-            if(!EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-                throw e;
-            }
-        } catch (InvalidFormatException e) {
-            if(!EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-                throw e;
-            }
-        } catch (IOException e) {
-            if(!EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-                throw e;
-            }
-        } catch (POIXMLException e) {
-            if(!EXPECTED_ADDITIONAL_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
-                throw e;
-            }
-        } finally {
-            System.setOut(oldOut);
-        }
-    }
-
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void test() throws Exception {
-        InputStream stream = new BufferedInputStream(new FileInputStream("test-data/spreadsheet/ref-56737.xlsx"));
-        try {
-            handleFile(stream);
-        } finally {
-            stream.close();
-        }
-    }
-
-    // a test-case to test this locally without executing the full TestAllFiles
-    @Test
-    public void testExtractor() throws Exception {
-        handleExtracting(new File("test-data/spreadsheet/ref-56737.xlsx"));
-    }
-
-    @Test
-    public void testAdditional() throws Exception {
-        handleAdditional(new File("test-data/spreadsheet/poc-xmlbomb.xlsx"));
-    }
-    
-    // need to override all methods to omit calls to UTF-handling methods 
-    static class NullPrintStream extends PrintStream {
-        @SuppressWarnings("resource")
-        NullPrintStream() {
-            super(new OutputStream() {
-                @Override
-                public void write(int b) {}
-                @Override
-                public void write(byte[] b) {}
-                @Override
-                public void write(byte[] b, int off, int len) {}
-            });
-        }
-        @Override
-        public void write(int b) {}
-        @Override
-        public void write(byte[] buf, int off, int len) {}
-        @Override
-        public void print(boolean b) {}
-        @Override
-        public void print(char c) {}
-        @Override
-        public void print(int i) {}
-        @Override
-        public void print(long l) {}
-        @Override
-        public void print(float f) {}
-        @Override
-        public void print(double d) {}
-        @Override
-        public void print(char[] s) {}
-        @Override
-        public void print(String s) {}
-        @Override
-        public void print(Object obj) {}
-        @Override
-        public void println() {}
-        @Override
-        public void println(boolean x) {}
-        @Override
-        public void println(char x) {}
-        @Override
-        public void println(int x) {}
-        @Override
-        public void println(long x) {}
-        @Override
-        public void println(float x) {}
-        @Override
-        public void println(double x) {}
-        @Override
-        public void println(char[] x) {}
-        @Override
-        public void println(String x) {}
-        @Override
-        public void println(Object x) {}
-        @Override
-        public PrintStream printf(String format, Object... args) { return this; }
-        @Override
-        public PrintStream printf(Locale l, String format, Object... args) { return this; }
-        @Override
-        public PrintStream format(String format, Object... args) { return this; }
-        @Override
-        public PrintStream format(Locale l, String format, Object... args) { return this; }
-        @Override
-        public PrintStream append(CharSequence csq) { return this; }
-        @Override
-        public PrintStream append(CharSequence csq, int start, int end) { return this; }
-        @Override
-        public PrintStream append(char c) { return this; }
-        @Override
-        public void write(byte[] b) {}
-    }
-}
diff --git a/trunk/src/integrationtest/org/apache/poi/stress/XWPFFileHandler.java b/trunk/src/integrationtest/org/apache/poi/stress/XWPFFileHandler.java
deleted file mode 100644
index c097dc9..0000000
--- a/trunk/src/integrationtest/org/apache/poi/stress/XWPFFileHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.Test;
-
-public class XWPFFileHandler extends AbstractFileHandler {
-	@Override
-    public void handleFile(InputStream stream) throws Exception {
-        // ignore password protected files
-        if (POIXMLDocumentHandler.isEncrypted(stream)) return;
-
-        XWPFDocument doc = new XWPFDocument(stream);
-		
-		new POIXMLDocumentHandler().handlePOIXMLDocument(doc);
-	}
-
-	// a test-case to test this locally without executing the full TestAllFiles
-	@Test
-	public void test() throws Exception {
-		File file = new File("test-data/document/51921-Word-Crash067.docx");
-
-		InputStream stream = new PushbackInputStream(new FileInputStream(file), 100000);
-		try {
-			handleFile(stream);
-		} finally {
-			stream.close();
-		}
-		
-		handleExtracting(file);
-	}
-	
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/EmptyFileException.java b/trunk/src/java/org/apache/poi/EmptyFileException.java
deleted file mode 100644
index ddbd142..0000000
--- a/trunk/src/java/org/apache/poi/EmptyFileException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-/**
- * Exception thrown if an Empty (zero byte) file is supplied
- */
-public class EmptyFileException extends IllegalArgumentException {
-    private static final long serialVersionUID = 1536449292174360166L;
-
-    public EmptyFileException() {
-		super("The supplied file was empty (zero bytes long)");
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/EncryptedDocumentException.java b/trunk/src/java/org/apache/poi/EncryptedDocumentException.java
deleted file mode 100644
index 4ac6123..0000000
--- a/trunk/src/java/org/apache/poi/EncryptedDocumentException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-public class EncryptedDocumentException extends IllegalStateException
-{
-    private static final long serialVersionUID = 7276950444540469193L;
-    
-	public EncryptedDocumentException(String s) {
-		super(s);
-	}
-
-    public EncryptedDocumentException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public EncryptedDocumentException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/OldFileFormatException.java b/trunk/src/java/org/apache/poi/OldFileFormatException.java
deleted file mode 100644
index 3c01f54..0000000
--- a/trunk/src/java/org/apache/poi/OldFileFormatException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-/**
- * Base class of all the exceptions that POI throws in the event
- * that it's given a file that's older than currently supported.
- */
-public abstract class OldFileFormatException extends UnsupportedFileFormatException {
-    private static final long serialVersionUID = 7849681804154571175L;
-
-    public OldFileFormatException(String s) {
-		super(s);
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/POIDocument.java b/trunk/src/java/org/apache/poi/POIDocument.java
deleted file mode 100644
index d742c55..0000000
--- a/trunk/src/java/org/apache/poi/POIDocument.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.MutablePropertySet;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIDecryptor;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This holds the common functionality for all POI
- *  Document classes.
- * Currently, this relates to Document Information Properties 
- */
-public abstract class POIDocument implements Closeable {
-    /** Holds metadata on our document */
-    private SummaryInformation sInf;
-    /** Holds further metadata on our document */
-    private DocumentSummaryInformation dsInf;
-    /**	The directory that our document lives in */
-    protected DirectoryNode directory;
-
-    /** For our own logging use */
-    private static final POILogger logger = POILogFactory.getLogger(POIDocument.class);
-
-    /* Have the property streams been read yet? (Only done on-demand) */
-    private boolean initialized = false;
-
-    private static final String[] encryptedStreamNames = { "EncryptedSummary" };
-    
-    /**
-     * Constructs a POIDocument with the given directory node.
-     *
-     * @param dir The {@link DirectoryNode} where information is read from.
-     */
-    protected POIDocument(DirectoryNode dir) {
-    	this.directory = dir;
-    }
-
-    /**
-     * Constructs from an old-style OPOIFS
-     * 
-     * @param fs the filesystem the document is read from
-     */
-    protected POIDocument(OPOIFSFileSystem fs) {
-       this(fs.getRoot());
-    }
-    /**
-     * Constructs from an old-style OPOIFS
-     * 
-     * @param fs the filesystem the document is read from
-     */
-    protected POIDocument(NPOIFSFileSystem fs) {
-       this(fs.getRoot());
-    }
-    /**
-     * Constructs from the default POIFS
-     * 
-     * @param fs the filesystem the document is read from
-     */
-    protected POIDocument(POIFSFileSystem fs) {
-        this(fs.getRoot());
-     }
-
-    /**
-     * Fetch the Document Summary Information of the document
-     * 
-     * @return The Document Summary Information or null 
-     *      if it could not be read for this document.
-     */
-    public DocumentSummaryInformation getDocumentSummaryInformation() {
-        if(!initialized) readProperties();
-        return dsInf;
-    }
-
-    /** 
-     * Fetch the Summary Information of the document
-     * 
-     * @return The Summary information for the document or null
-     *      if it could not be read for this document.
-     */
-    public SummaryInformation getSummaryInformation() {
-        if(!initialized) readProperties();
-        return sInf;
-    }
-	
-    /**
-     * Will create whichever of SummaryInformation
-     *  and DocumentSummaryInformation (HPSF) properties
-     *  are not already part of your document.
-     * This is normally useful when creating a new
-     *  document from scratch.
-     * If the information properties are already there,
-     *  then nothing will happen.
-     */
-    public void createInformationProperties() {
-        if (!initialized) readProperties();
-        if (sInf == null) {
-            sInf = PropertySetFactory.newSummaryInformation();
-        }
-        if (dsInf == null) {
-            dsInf = PropertySetFactory.newDocumentSummaryInformation();
-        }
-    }
-
-    /**
-     * Find, and create objects for, the standard
-     *  Document Information Properties (HPSF).
-     * If a given property set is missing or corrupt,
-     *  it will remain null;
-     */
-    protected void readProperties() {
-        PropertySet ps;
-
-        // DocumentSummaryInformation
-        ps = getPropertySet(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        if (ps instanceof DocumentSummaryInformation) {
-            dsInf = (DocumentSummaryInformation)ps;
-        } else if (ps != null) {
-            logger.log(POILogger.WARN, "DocumentSummaryInformation property set came back with wrong class - ", ps.getClass());
-        } else {
-            logger.log(POILogger.WARN, "DocumentSummaryInformation property set came back as null");
-        }
-
-        // SummaryInformation
-        ps = getPropertySet(SummaryInformation.DEFAULT_STREAM_NAME);
-        if (ps instanceof SummaryInformation) {
-            sInf = (SummaryInformation)ps;
-        } else if (ps != null) {
-            logger.log(POILogger.WARN, "SummaryInformation property set came back with wrong class - ", ps.getClass());
-        } else {
-            logger.log(POILogger.WARN, "SummaryInformation property set came back as null");
-        }
-
-        // Mark the fact that we've now loaded up the properties
-        initialized = true;
-    }
-
-    /** 
-     * For a given named property entry, either return it or null if
-     *  if it wasn't found
-     *  
-     *  @param setName The property to read
-     *  @return The value of the given property or null if it wasn't found.
-     */
-    protected PropertySet getPropertySet(String setName) {
-        return getPropertySet(setName, null);
-    }
-    
-    /** 
-     * For a given named property entry, either return it or null if
-     *  if it wasn't found
-     *  
-     *  @param setName The property to read
-     *  @param encryptionInfo the encryption descriptor in case of cryptoAPI encryption
-     *  @return The value of the given property or null if it wasn't found.
-     */
-    protected PropertySet getPropertySet(String setName, EncryptionInfo encryptionInfo) {
-        DirectoryNode dirNode = directory;
-        
-        NPOIFSFileSystem encPoifs = null;
-        String step = "getting";
-        try {
-            if (encryptionInfo != null) {
-                step = "getting encrypted";
-                String encryptedStream = null;
-                for (String s : encryptedStreamNames) {
-                    if (dirNode.hasEntry(s)) {
-                        encryptedStream = s;
-                    }
-                }
-                if (encryptedStream == null) {
-                    throw new EncryptedDocumentException("can't find matching encrypted property stream");
-                }
-                CryptoAPIDecryptor dec = (CryptoAPIDecryptor)encryptionInfo.getDecryptor();
-                encPoifs = dec.getSummaryEntries(dirNode, encryptedStream);
-                dirNode = encPoifs.getRoot();
-            }
-            
-            //directory can be null when creating new documents
-            if (dirNode == null || !dirNode.hasEntry(setName)) {
-                return null;
-            }
-    
-            // Find the entry, and get an input stream for it
-            step = "getting";
-            DocumentInputStream dis = dirNode.createDocumentInputStream( dirNode.getEntry(setName) );
-            try {
-                // Create the Property Set
-                step = "creating";
-                return PropertySetFactory.create(dis);
-            } finally {
-                dis.close();
-            }
-        } catch (Exception e) {
-            logger.log(POILogger.WARN, "Error "+step+" property set with name " + setName, e);
-            return null;
-        } finally {
-            if (encPoifs != null) {
-                try {
-                    encPoifs.close();
-                } catch(IOException e) {
-                    logger.log(POILogger.WARN, "Error closing encrypted property poifs", e);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Writes out the updated standard Document Information Properties (HPSF)
-     *  into the currently open NPOIFSFileSystem
-     * 
-     * @throws IOException if an error when writing to the open
-     *      {@link NPOIFSFileSystem} occurs
-     */
-    protected void writeProperties() throws IOException {
-        validateInPlaceWritePossible();
-        writeProperties(directory.getFileSystem(), null);
-    }
-
-    /**
-     * Writes out the standard Document Information Properties (HPSF)
-     * @param outFS the POIFSFileSystem to write the properties into
-     * 
-     * @throws IOException if an error when writing to the 
-     *      {@link NPOIFSFileSystem} occurs
-     */
-    protected void writeProperties(NPOIFSFileSystem outFS) throws IOException {
-        writeProperties(outFS, null);
-    }
-    /**
-     * Writes out the standard Document Information Properties (HPSF)
-     * @param outFS the NPOIFSFileSystem to write the properties into
-     * @param writtenEntries a list of POIFS entries to add the property names too
-     * 
-     * @throws IOException if an error when writing to the 
-     *      {@link NPOIFSFileSystem} occurs
-     */
-    protected void writeProperties(NPOIFSFileSystem outFS, List<String> writtenEntries) throws IOException {
-        SummaryInformation si = getSummaryInformation();
-        if (si != null) {
-            writePropertySet(SummaryInformation.DEFAULT_STREAM_NAME, si, outFS);
-            if(writtenEntries != null) {
-                writtenEntries.add(SummaryInformation.DEFAULT_STREAM_NAME);
-            }
-        }
-        DocumentSummaryInformation dsi = getDocumentSummaryInformation();
-        if (dsi != null) {
-            writePropertySet(DocumentSummaryInformation.DEFAULT_STREAM_NAME, dsi, outFS);
-            if(writtenEntries != null) {
-                writtenEntries.add(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-            }
-        }
-    }
-	
-    /**
-     * Writes out a given ProperySet
-     * @param name the (POIFS Level) name of the property to write
-     * @param set the PropertySet to write out 
-     * @param outFS the NPOIFSFileSystem to write the property into
-     * 
-     * @throws IOException if an error when writing to the 
-     *      {@link NPOIFSFileSystem} occurs
-     */
-    protected void writePropertySet(String name, PropertySet set, NPOIFSFileSystem outFS) throws IOException {
-        try {
-            MutablePropertySet mSet = new MutablePropertySet(set);
-            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-            mSet.write(bOut);
-            byte[] data = bOut.toByteArray();
-            ByteArrayInputStream bIn = new ByteArrayInputStream(data);
-
-            // Create or Update the Property Set stream in the POIFS
-            outFS.createOrUpdateDocument(bIn, name);
-
-            logger.log(POILogger.INFO, "Wrote property set " + name + " of size " + data.length);
-        } catch(org.apache.poi.hpsf.WritingNotSupportedException wnse) {
-            logger.log( POILogger.ERROR, "Couldn't write property set with name " + name + " as not supported by HPSF yet");
-        }
-    }
-
-    /**
-     * Called during a {@link #write()} to ensure that the Document (and
-     *  associated {@link POIFSFileSystem}) was opened in a way compatible
-     *  with an in-place write.
-     * 
-     * @throws IllegalStateException if the document was opened suitably
-     */
-    protected void validateInPlaceWritePossible() throws IllegalStateException {
-        if (directory == null) {
-            throw new IllegalStateException("Newly created Document, cannot save in-place");
-        }
-        if (directory.getParent() != null) {
-            throw new IllegalStateException("This is not the root Document, cannot save embedded resource in-place");
-        }
-        if (directory.getFileSystem() == null ||
-            !directory.getFileSystem().isInPlaceWriteable()) {
-            throw new IllegalStateException("Opened read-only or via an InputStream, a Writeable File is required");
-        }
-    }
-    
-    /**
-     * Writes the document out to the currently open {@link File}, via the
-     *  writeable {@link POIFSFileSystem} it was opened from.
-     *  
-     * <p>This will fail (with an {@link IllegalStateException} if the
-     *  document was opened read-only, opened from an {@link InputStream}
-     *   instead of a File, or if this is not the root document. For those cases, 
-     *   you must use {@link #write(OutputStream)} or {@link #write(File)} to 
-     *   write to a brand new document.
-     *   
-     * @since POI 3.15 beta 3
-     * 
-     * @throws IOException thrown on errors writing to the file
-     * @throws IllegalStateException if this isn't from a writable File
-     */
-    public abstract void write() throws IOException;
-
-    /**
-     * Writes the document out to the specified new {@link File}. If the file 
-     * exists, it will be replaced, otherwise a new one will be created
-     *
-     * @since POI 3.15 beta 3
-     * 
-     * @param newFile The new File to write to.
-     * 
-     * @throws IOException thrown on errors writing to the file
-     */
-    public abstract void write(File newFile) throws IOException;
-
-    /**
-     * Writes the document out to the specified output stream. The
-     * stream is not closed as part of this operation.
-     * 
-     * Note - if the Document was opened from a {@link File} rather
-     *  than an {@link InputStream}, you <b>must</b> write out using
-     *  {@link #write()} or to a different File. Overwriting the currently
-     *  open file via an OutputStream isn't possible.
-     *  
-     * If {@code stream} is a {@link java.io.FileOutputStream} on a networked drive
-     * or has a high cost/latency associated with each written byte,
-     * consider wrapping the OutputStream in a {@link java.io.BufferedOutputStream}
-     * to improve write performance, or use {@link #write()} / {@link #write(File)}
-     * if possible.
-     * 
-     * @param out The stream to write to.
-     * 
-     * @throws IOException thrown on errors writing to the stream
-     */
-    public abstract void write(OutputStream out) throws IOException;
-
-    /**
-     * Closes the underlying {@link NPOIFSFileSystem} from which
-     *  the document was read, if any. Has no effect on documents
-     *  opened from an InputStream, or newly created ones.
-     * <p>Once {@link #close()} has been called, no further operations
-     *  should be called on the document.
-     */
-    public void close() throws IOException {
-        if (directory != null) {
-            if (directory.getNFileSystem() != null) {
-                directory.getNFileSystem().close();
-                directory = null;
-            }
-        }
-    }
-
-    @Internal
-    public DirectoryNode getDirectory() {
-        return directory;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/POIOLE2TextExtractor.java b/trunk/src/java/org/apache/poi/POIOLE2TextExtractor.java
deleted file mode 100644
index 24bbb9a..0000000
--- a/trunk/src/java/org/apache/poi/POIOLE2TextExtractor.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.extractor.HPSFPropertiesExtractor;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-
-/**
- * Common Parent for OLE2 based Text Extractors
- *  of POI Documents, such as .doc, .xls
- * You will typically find the implementation of
- *  a given format's text extractor under
- *  org.apache.poi.[format].extractor .
- *  
- * @see org.apache.poi.hssf.extractor.ExcelExtractor
- * @see org.apache.poi.hslf.extractor.PowerPointExtractor
- * @see org.apache.poi.hdgf.extractor.VisioTextExtractor
- * @see org.apache.poi.hwpf.extractor.WordExtractor
- */
-public abstract class POIOLE2TextExtractor extends POITextExtractor {
-	/** The POIDocument that's open */
-	protected POIDocument document;
-
-	/**
-	 * Creates a new text extractor for the given document
-	 * 
-	 * @param document The POIDocument to use in this extractor.
-	 */
-	public POIOLE2TextExtractor(POIDocument document) {
-		this.document = document;
-		
-		// Ensure any underlying resources, such as open files,
-		//  will get cleaned up if the user calls #close()
-		setFilesystem(document);
-	}
-
-	/**
-	 * Creates a new text extractor, using the same
-	 *  document as another text extractor. Normally
-	 *  only used by properties extractors.
-	 * 
-	 * @param otherExtractor the extractor which document to be used
-	 */
-	protected POIOLE2TextExtractor(POIOLE2TextExtractor otherExtractor) {
-		this.document = otherExtractor.document;
-	}
-	
-	/**
-	 * Returns the document information metadata for the document
-	 * 
-     * @return The Document Summary Information or null 
-     *      if it could not be read for this document.
-	 */
-	public DocumentSummaryInformation getDocSummaryInformation() {
-		return document.getDocumentSummaryInformation();
-	}
-	/**
-	 * Returns the summary information metadata for the document.
-	 * 
-     * @return The Summary information for the document or null
-     *      if it could not be read for this document.
-	 */
-	public SummaryInformation getSummaryInformation() {
-		return document.getSummaryInformation();
-	}
-
-	/**
-	 * Returns an HPSF powered text extractor for the
-	 *  document properties metadata, such as title and author.
-	 *  
-	 * @return an instance of POIExtractor that can extract meta-data.
-	 */
-	@Override
-    public POITextExtractor getMetadataTextExtractor() {
-		return new HPSFPropertiesExtractor(this);
-	}
-
-	/**
-	 * Return the underlying DirectoryEntry of this document.
-	 *
-	 * @return the DirectoryEntry that is associated with the POIDocument of this extractor.
-	 */
-    public DirectoryEntry getRoot()
-    {
-        return document.directory;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/POITextExtractor.java b/trunk/src/java/org/apache/poi/POITextExtractor.java
deleted file mode 100644
index 83e26be..0000000
--- a/trunk/src/java/org/apache/poi/POITextExtractor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * Common Parent for Text Extractors
- *  of POI Documents. 
- * You will typically find the implementation of
- *  a given format's text extractor under
- *  org.apache.poi.[format].extractor .
- *  
- * @see org.apache.poi.hssf.extractor.ExcelExtractor
- * @see org.apache.poi.hslf.extractor.PowerPointExtractor
- * @see org.apache.poi.hdgf.extractor.VisioTextExtractor
- * @see org.apache.poi.hwpf.extractor.WordExtractor
- */
-public abstract class POITextExtractor implements Closeable {
-    private Closeable fsToClose = null;
-    
-	/**
-	 * Retrieves all the text from the document.
-	 * How cells, paragraphs etc are separated in the text
-	 *  is implementation specific - see the javadocs for
-	 *  a specific project for details.
-	 * @return All the text from the document
-	 */
-	public abstract String getText();
-	
-	/**
-	 * Returns another text extractor, which is able to
-	 *  output the textual content of the document
-	 *  metadata / properties, such as author and title.
-	 * 
-	 * @return the metadata and text extractor
-	 */
-	public abstract POITextExtractor getMetadataTextExtractor();
-
-	/**
-	 * Used to ensure file handle cleanup.
-	 * 
-	 * @param fs filesystem to close
-	 */
-	public void setFilesystem(Closeable fs) {
-	    fsToClose = fs;
-	}
-	
-	/**
-	 * Allows to free resources of the Extractor as soon as
-	 * it is not needed any more. This may include closing
-	 * open file handles and freeing memory.
-	 * 
-	 * The Extractor cannot be used after close has been called.
-	 */
-	@Override
-    public void close() throws IOException {
-		if(fsToClose != null) {
-		    fsToClose.close();
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/UnsupportedFileFormatException.java b/trunk/src/java/org/apache/poi/UnsupportedFileFormatException.java
deleted file mode 100644
index a8caebb..0000000
--- a/trunk/src/java/org/apache/poi/UnsupportedFileFormatException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-/**
- * Base class of all the exceptions that POI throws in the event
- * that it's given a file that isn't supported
- */
-public abstract class UnsupportedFileFormatException extends IllegalArgumentException {
-    private static final long serialVersionUID = -8281969197282030046L;
-
-    public UnsupportedFileFormatException(String s) {
-		super(s);
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java b/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java
deleted file mode 100644
index abcdd11..0000000
--- a/trunk/src/java/org/apache/poi/common/usermodel/Hyperlink.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.common.usermodel;
-
-import org.apache.poi.util.Removal;
-
-/**
- * Represents a hyperlink.
- */
-public interface Hyperlink {
-    /**
-     * Link to an existing file or web page
-     * 
-     * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#URL} instead.
-     */
-    @Removal(version="3.17")
-    public static final int LINK_URL = 1; // HyperlinkType.URL.getCode()
-
-    /**
-     * Link to a place in this document
-     * 
-     * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#DOCUMENT} instead.
-     */
-    @Removal(version="3.17")
-    public static final int LINK_DOCUMENT = 2; // HyperlinkType.DOCUMENT.getCode()
-
-    /**
-     * Link to an E-mail address
-     * 
-     * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#EMAIL} instead.
-     */
-    @Removal(version="3.17")
-    public static final int LINK_EMAIL = 3; // HyperlinkType.EMAIL.getCode()
-
-    /**
-     * Link to an file
-     * 
-     * @deprecated POI 3.15 beta 3. Use {@link HyperlinkType#FILE} instead.
-     */
-    @Removal(version="3.17")
-    public static final int LINK_FILE = 4; // HyperlinkType.FILE.getCode()
-
-    
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file, etc.
-     *
-     * @return  the address of this hyperlink
-     */
-    public String getAddress();
-
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file, etc.
-     *
-     * @param address  the address of this hyperlink
-     */
-    public void setAddress(String address);
-
-    /**
-     * Return text label for this hyperlink
-     *
-     * @return  text to display
-     */
-    public String getLabel();
-
-    /**
-     * Sets text label for this hyperlink
-     *
-     * @param label text label for this hyperlink
-     */
-    public void setLabel(String label);
-
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     * @see HyperlinkType#forInt(int)
-     * @deprecated POI 3.15 beta 3. Use {@link #getTypeEnum()}
-     * getType will return a HyperlinkType enum in the future.
-     */
-    public int getType();
-    
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     * @since POI 3.15 beta 3
-     */
-    public HyperlinkType getTypeEnum();
-}
diff --git a/trunk/src/java/org/apache/poi/common/usermodel/HyperlinkType.java b/trunk/src/java/org/apache/poi/common/usermodel/HyperlinkType.java
deleted file mode 100644
index 41de800..0000000
--- a/trunk/src/java/org/apache/poi/common/usermodel/HyperlinkType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.common.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.util.Internal;
-
-/**
- * @since POI 3.15 beta 3
- */
-public enum HyperlinkType {
-    /** Not a hyperlink */
-    @Internal
-    NONE(-1),
-    
-    /**
-     * Link to an existing file or web page
-     */
-    URL(1),
-
-    /**
-     * Link to a place in this document
-     */
-    DOCUMENT(2),
-
-    /**
-     * Link to an E-mail address
-     */
-    EMAIL(3),
-
-    /**
-     * Link to a file
-     */
-    FILE(4);
-    
-    
-    /** @deprecated POI 3.15 beta 3 */
-    @Internal(since="3.15 beta 3")
-    @Deprecated
-    private final int code;
-    
-    /**
-     * The codes don't have any real meaning.
-     * They are bytes that are read in and written out from HSSF, HSLF, XSSF, and XSLF are different
-     * that the codes here.
-     * These codes only exist to assist in transitioning from using ints to enums.
-     *
-     * @param code The unique number for this type.
-     * @deprecated POI 3.15 beta 3
-     */
-    @Internal(since="3.15 beta 3")
-    @Deprecated
-    HyperlinkType(int code) {
-        this.code = code;
-    }
-    
-    private static final Map<Integer, HyperlinkType> map = new HashMap<Integer, HyperlinkType>();
-    static {
-        for (HyperlinkType type : values()) {
-            map.put(type.getCode(), type);
-        }
-    }
-    
-    /**
-     * @deprecated POI 3.15 beta 3
-     *
-     * @return the old integer code for a HyperlinkType enum
-     */
-    @Internal(since="3.15 beta 3")
-    @Deprecated
-    public int getCode() {
-        return code;
-    }
-    
-    /**
-     * @deprecated POI 3.15 beta 3
-     *
-     * @param code the old integer code
-     * @return the corresponding HyperlinkEnum, if it exists
-     * @throws IllegalArgumentException if {@code code} is not a valid HyperlinkType.
-     */
-    @Internal(since="3.15 beta 3")
-    @Deprecated
-    public static HyperlinkType forInt(int code) {
-        HyperlinkType type = map.get(code);
-        if (type == null) {
-            throw new IllegalArgumentException("Invalid type: " + code);
-        }
-        return type;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java b/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
deleted file mode 100644
index c8d2c95..0000000
--- a/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ddf;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Common abstract class for {@link EscherOptRecord} and
- * {@link EscherTertiaryOptRecord}
- */
-public abstract class AbstractEscherOptRecord extends EscherRecord
-{
-    protected List<EscherProperty> properties = new ArrayList<EscherProperty>();
-
-    /**
-     * Add a property to this record.
-     * 
-     * @param prop the escher property to add
-     */
-    public void addEscherProperty( EscherProperty prop )
-    {
-        properties.add( prop );
-    }
-
-    @Override
-    public int fillFields( byte[] data, int offset,
-            EscherRecordFactory recordFactory )
-    {
-        int bytesRemaining = readHeader( data, offset );
-        short propertiesCount = readInstance( data, offset );
-        int pos = offset + 8;
-
-        EscherPropertyFactory f = new EscherPropertyFactory();
-        properties = f.createProperties( data, pos, propertiesCount );
-        return bytesRemaining + 8;
-    }
-
-    /**
-     * The list of properties stored by this record.
-     * 
-     * @return the list of properties
-     */
-    public List<EscherProperty> getEscherProperties()
-    {
-        return properties;
-    }
-
-    /**
-     * The list of properties stored by this record.
-     * 
-     * @param index the ordinal index of the property
-     * @return the escher property
-     */
-    public EscherProperty getEscherProperty( int index )
-    {
-        return properties.get( index );
-    }
-
-    
-    private int getPropertiesSize()
-    {
-        int totalSize = 0;
-        for ( EscherProperty property : properties )
-        {
-            totalSize += property.getPropertySize();
-        }
-
-        return totalSize;
-    }
-
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + getPropertiesSize();
-    }
-
-    public <T extends EscherProperty> T lookup( int propId )
-    {
-        for ( EscherProperty prop : properties )
-        {
-            if ( prop.getPropertyNumber() == propId )
-            {
-                @SuppressWarnings( "unchecked" )
-                final T result = (T) prop;
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data,
-            EscherSerializationListener listener )
-    {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        LittleEndian.putInt( data, offset + 4, getPropertiesSize() );
-        int pos = offset + 8;
-        for ( EscherProperty property : properties )
-        {
-            pos += property.serializeSimplePart( data, pos );
-        }
-        for ( EscherProperty property : properties )
-        {
-            pos += property.serializeComplexPart( data, pos );
-        }
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        return pos - offset;
-    }
-
-    /**
-     * Records should be sorted by property number before being stored.
-     */
-    public void sortProperties()
-    {
-        Collections.sort( properties, new Comparator<EscherProperty>()
-        {
-            @Override
-            public int compare( EscherProperty p1, EscherProperty p2 )
-            {
-                short s1 = p1.getPropertyNumber();
-                short s2 = p2.getPropertyNumber();
-                return s1 < s2 ? -1 : s1 == s2 ? 0 : 1;
-            }
-        } );
-    }
-
-    /**
-     * Set an escher property. If a property with given propId already
-     exists it is replaced.
-     *
-     * @param value the property to set.
-     */
-    public void setEscherProperty(EscherProperty value){
-        for ( Iterator<EscherProperty> iterator =
-                      properties.iterator(); iterator.hasNext(); ) {
-            EscherProperty prop = iterator.next();
-            if (prop.getId() == value.getId()){
-                iterator.remove();
-            }
-        }
-        properties.add( value );
-        sortProperties();
-    }
-
-    public void removeEscherProperty(int num){
-        for ( Iterator<EscherProperty> iterator = getEscherProperties().iterator(); iterator.hasNext(); ) {
-            EscherProperty prop = iterator.next();
-            if (prop.getPropertyNumber() == num){
-                iterator.remove();
-            }
-        }
-    }
-
-    /**
-     * Retrieve the string representation of this record.
-     */
-    @Override
-    public String toString()
-    {
-        String nl = System.getProperty( "line.separator" );
-
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append( getClass().getName() );
-        stringBuilder.append( ":" );
-        stringBuilder.append( nl );
-        stringBuilder.append( "  isContainer: " );
-        stringBuilder.append( isContainerRecord() );
-        stringBuilder.append( nl );
-        stringBuilder.append( "  version: 0x" );
-        stringBuilder.append( HexDump.toHex( getVersion() ) );
-        stringBuilder.append( nl );
-        stringBuilder.append( "  instance: 0x" );
-        stringBuilder.append( HexDump.toHex( getInstance() ) );
-        stringBuilder.append( nl );
-        stringBuilder.append( "  recordId: 0x" );
-        stringBuilder.append( HexDump.toHex( getRecordId() ) );
-        stringBuilder.append( nl );
-        stringBuilder.append( "  numchildren: " );
-        stringBuilder.append( getChildRecords().size() );
-        stringBuilder.append( nl );
-        stringBuilder.append( "  properties:" );
-        stringBuilder.append( nl );
-
-        for ( EscherProperty property : properties )
-        {
-            stringBuilder.append("    ").append(property.toString()).append(nl);
-        }
-
-        return stringBuilder.toString();
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(),
-                HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())));
-        for (EscherProperty property: getEscherProperties()){
-            builder.append(property.toXml(tab+"\t"));
-        }
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java b/trunk/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
deleted file mode 100644
index 4342708..0000000
--- a/trunk/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Generates escher records when provided the byte array containing those records.
- *
- * @see EscherRecordFactory
- */
-public class DefaultEscherRecordFactory implements EscherRecordFactory {
-    private static Class<?>[] escherRecordClasses = { EscherBSERecord.class,
-            EscherOptRecord.class, EscherTertiaryOptRecord.class,
-            EscherClientAnchorRecord.class, EscherDgRecord.class,
-            EscherSpgrRecord.class, EscherSpRecord.class,
-            EscherClientDataRecord.class, EscherDggRecord.class,
-            EscherSplitMenuColorsRecord.class, EscherChildAnchorRecord.class,
-            EscherTextboxRecord.class };
-    private static Map<Short, Constructor<? extends EscherRecord>> recordsMap = recordsToMap( escherRecordClasses );
-
-    /**
-     * Creates an instance of the escher record factory
-     */
-    public DefaultEscherRecordFactory() {
-        // no instance initialisation
-    }
-
-    @Override
-    public EscherRecord createRecord(byte[] data, int offset) {
-        short options = LittleEndian.getShort( data, offset );
-        short recordId = LittleEndian.getShort( data, offset + 2 );
-        // int remainingBytes = LittleEndian.getInt( data, offset + 4 );
-
-        // Options of 0x000F means container record
-        // However, EscherTextboxRecord are containers of records for the
-        //  host application, not of other Escher records, so treat them
-        //  differently
-        if (isContainer(options, recordId)) {
-            EscherContainerRecord r = new EscherContainerRecord();
-            r.setRecordId( recordId );
-            r.setOptions( options );
-            return r;
-        }
-
-        if (recordId >= EscherBlipRecord.RECORD_ID_START
-                && recordId <= EscherBlipRecord.RECORD_ID_END) {
-            EscherBlipRecord r;
-            if (recordId == EscherBitmapBlip.RECORD_ID_DIB ||
-                    recordId == EscherBitmapBlip.RECORD_ID_JPEG ||
-                    recordId == EscherBitmapBlip.RECORD_ID_PNG)
-            {
-                r = new EscherBitmapBlip();
-            }
-            else if (recordId == EscherMetafileBlip.RECORD_ID_EMF ||
-                    recordId == EscherMetafileBlip.RECORD_ID_WMF ||
-                    recordId == EscherMetafileBlip.RECORD_ID_PICT)
-            {
-                r = new EscherMetafileBlip();
-            } else {
-                r = new EscherBlipRecord();
-            }
-            r.setRecordId( recordId );
-            r.setOptions( options );
-            return r;
-        }
-
-        Constructor<? extends EscherRecord> recordConstructor = recordsMap.get(Short.valueOf(recordId));
-        final EscherRecord escherRecord;
-        if (recordConstructor == null) {
-            return new UnknownEscherRecord();
-        }
-        try {
-            escherRecord = recordConstructor.newInstance();
-        } catch (Exception e) {
-            return new UnknownEscherRecord();
-        }
-        escherRecord.setRecordId(recordId);
-        escherRecord.setOptions(options);
-        return escherRecord;
-    }
-
-    /**
-     * Converts from a list of classes into a map that contains the record id as the key and
-     * the Constructor in the value part of the map.  It does this by using reflection to look up
-     * the RECORD_ID field then using reflection again to find a reference to the constructor.
-     *
-     * @param recClasses The records to convert
-     * @return The map containing the id/constructor pairs.
-     */
-    protected static Map<Short, Constructor<? extends EscherRecord>> recordsToMap(Class<?>[] recClasses) {
-        Map<Short, Constructor<? extends EscherRecord>> result = new HashMap<Short, Constructor<? extends EscherRecord>>();
-        final Class<?>[] EMPTY_CLASS_ARRAY = new Class[0];
-
-        for (Class<?> recClass : recClasses) {
-            @SuppressWarnings("unchecked")
-            Class<? extends EscherRecord> recCls = (Class<? extends EscherRecord>) recClass;
-            short sid;
-            try {
-                sid = recCls.getField("RECORD_ID").getShort(null);
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            } catch (NoSuchFieldException e) {
-                throw new RuntimeException(e);
-            }
-            Constructor<? extends EscherRecord> constructor;
-            try {
-                constructor = recCls.getConstructor(EMPTY_CLASS_ARRAY);
-            } catch (NoSuchMethodException e) {
-                throw new RuntimeException(e);
-            }
-            result.put(Short.valueOf(sid), constructor);
-        }
-        return result;
-    }
-
-    public static boolean isContainer(short options, short recordId){
-        if(recordId >= EscherContainerRecord.DGG_CONTAINER &&  recordId
-                <= EscherContainerRecord.SOLVER_CONTAINER){
-            return true;
-        } else {
-            if (recordId == EscherTextboxRecord.RECORD_ID) {
-                return false;
-            } else {
-                return ( options & (short) 0x000F ) == (short) 0x000F;
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java b/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
deleted file mode 100644
index bf7211d..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Escher array properties are the most wierd construction ever invented
- * with all sorts of special cases.  I'm hopeful I've got them all.
- */
-public final class EscherArrayProperty extends EscherComplexProperty implements Iterable<byte[]> {
-    /**
-     * The size of the header that goes at the
-     *  start of the array, before the data
-     */
-    private static final int FIXED_SIZE = 3 * 2;
-    /**
-     * Normally, the size recorded in the simple data (for the complex
-     *  data) includes the size of the header.
-     * There are a few cases when it doesn't though...
-     */
-    private boolean sizeIncludesHeaderSize = true;
-
-    /**
-     * When reading a property from data stream remember if the complex part is empty and set this flag.
-     */
-    private boolean emptyComplexPart = false;
-
-    public EscherArrayProperty(short id, byte[] complexData) {
-        super(id, checkComplexData(complexData));
-        emptyComplexPart = complexData.length == 0;
-    }
-
-    public EscherArrayProperty(short propertyNumber, boolean isBlipId, byte[] complexData) {
-        super(propertyNumber, isBlipId, checkComplexData(complexData));
-    }
-
-    private static byte[] checkComplexData(byte[] complexData) {
-        if (complexData == null || complexData.length == 0) {
-            return new byte[6];
-        }
-
-        return complexData;
-    }
-
-    public int getNumberOfElementsInArray() {
-        return (emptyComplexPart) ? 0 : LittleEndian.getUShort(_complexData, 0);
-    }
-
-    public void setNumberOfElementsInArray(int numberOfElements) {
-        int expectedArraySize = numberOfElements * getActualSizeOfElements(getSizeOfElements()) + FIXED_SIZE;
-        if (expectedArraySize != _complexData.length) {
-            byte[] newArray = new byte[expectedArraySize];
-            System.arraycopy(_complexData, 0, newArray, 0, _complexData.length);
-            _complexData = newArray;
-        }
-        LittleEndian.putShort(_complexData, 0, (short) numberOfElements);
-    }
-
-    public int getNumberOfElementsInMemory() {
-        return (emptyComplexPart) ? 0 : LittleEndian.getUShort(_complexData, 2);
-    }
-
-    public void setNumberOfElementsInMemory(int numberOfElements) {
-        int expectedArraySize = numberOfElements * getActualSizeOfElements(getSizeOfElements()) + FIXED_SIZE;
-        if (expectedArraySize != _complexData.length) {
-            byte[] newArray = new byte[expectedArraySize];
-            System.arraycopy(_complexData, 0, newArray, 0, expectedArraySize);
-            _complexData = newArray;
-        }
-        LittleEndian.putShort(_complexData, 2, (short) numberOfElements);
-    }
-
-    public short getSizeOfElements() {
-        return (emptyComplexPart) ? 0 : LittleEndian.getShort( _complexData, 4 );
-    }
-
-    public void setSizeOfElements(int sizeOfElements) {
-        LittleEndian.putShort( _complexData, 4, (short) sizeOfElements );
-
-        int expectedArraySize = getNumberOfElementsInArray() * getActualSizeOfElements(getSizeOfElements()) + FIXED_SIZE;
-        if (expectedArraySize != _complexData.length) {
-            // Keep just the first 6 bytes.  The rest is no good to us anyway.
-            byte[] newArray = new byte[expectedArraySize];
-            System.arraycopy( _complexData, 0, newArray, 0, 6 );
-            _complexData = newArray;
-        }
-    }
-
-    public byte[] getElement(int index) {
-        int actualSize = getActualSizeOfElements(getSizeOfElements());
-        byte[] result = new byte[actualSize];
-        System.arraycopy(_complexData, FIXED_SIZE + index * actualSize, result, 0, result.length );
-        return result;
-    }
-
-    public void setElement(int index, byte[] element) {
-        int actualSize = getActualSizeOfElements(getSizeOfElements());
-        System.arraycopy( element, 0, _complexData, FIXED_SIZE + index * actualSize, actualSize);
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer results = new StringBuffer();
-        results.append("    {EscherArrayProperty:" + '\n');
-        results.append("     Num Elements: " + getNumberOfElementsInArray() + '\n');
-        results.append("     Num Elements In Memory: " + getNumberOfElementsInMemory() + '\n');
-        results.append("     Size of elements: " + getSizeOfElements() + '\n');
-        for (int i = 0; i < getNumberOfElementsInArray(); i++) {
-            results.append("     Element " + i + ": " + HexDump.toHex(getElement(i)) + '\n');
-        }
-        results.append("}" + '\n');
-
-        return "propNum: " + getPropertyNumber()
-                + ", propName: " + EscherProperties.getPropertyName( getPropertyNumber() )
-                + ", complex: " + isComplex()
-                + ", blipId: " + isBlipId()
-                + ", data: " + '\n' + results.toString();
-    }
-
-    @Override
-    public String toXml(String tab){
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append("<").append(getClass().getSimpleName()).append(" id=\"0x").append(HexDump.toHex(getId()))
-                .append("\" name=\"").append(getName()).append("\" blipId=\"")
-                .append(isBlipId()).append("\">\n");
-        for (int i = 0; i < getNumberOfElementsInArray(); i++) {
-            builder.append("\t").append(tab).append("<Element>").append(HexDump.toHex(getElement(i))).append("</Element>\n");
-        }
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * We have this method because the way in which arrays in escher works
-     * is screwed for seemly arbitary reasons.  While most properties are
-     * fairly consistent and have a predictable array size, escher arrays
-     * have special cases.
-     *
-     * @param data      The data array containing the escher array information
-     * @param offset    The offset into the array to start reading from.
-     * @return  the number of bytes used by this complex property.
-     */
-    public int setArrayData(byte[] data, int offset) {
-        if (emptyComplexPart){
-            _complexData = new byte[0];
-        } else {
-            short numElements = LittleEndian.getShort(data, offset);
-            // LittleEndian.getShort(data, offset + 2); // numReserved
-            short sizeOfElements = LittleEndian.getShort(data, offset + 4);
-
-            int arraySize = getActualSizeOfElements(sizeOfElements) * numElements;
-            if (arraySize == _complexData.length) {
-                // The stored data size in the simple block excludes the header size
-                _complexData = new byte[arraySize + 6];
-                sizeIncludesHeaderSize = false;
-            }
-            System.arraycopy(data, offset, _complexData, 0, _complexData.length );
-        }
-        return _complexData.length;
-    }
-
-    /**
-     * Serializes the simple part of this property.  ie the first 6 bytes.
-     *
-     * Needs special code to handle the case when the size doesn't
-     *  include the size of the header block
-     */
-    @Override
-    public int serializeSimplePart(byte[] data, int pos) {
-        LittleEndian.putShort(data, pos, getId());
-        int recordSize = _complexData.length;
-        if(!sizeIncludesHeaderSize) {
-            recordSize -= 6;
-        }
-        LittleEndian.putInt(data, pos + 2, recordSize);
-        return 6;
-    }
-
-    /**
-     * Sometimes the element size is stored as a negative number.  We
-     * negate it and shift it to get the real value.
-     */
-    private static int getActualSizeOfElements(short sizeOfElements) {
-        if (sizeOfElements < 0) {
-            return (short) ( ( -sizeOfElements ) >> 2 );
-        }
-        return sizeOfElements;
-    }
-
-    @Override
-    public Iterator<byte[]> iterator() {
-        return new Iterator<byte[]>(){
-            int idx = 0;
-            @Override
-            public boolean hasNext() {
-                return (idx < getNumberOfElementsInArray());
-            }
-            
-            @Override
-            public byte[] next() {
-                if (!hasNext()) throw new NoSuchElementException();
-                return getElement(idx++);
-            }
-            
-            @Override
-            public void remove() {
-                throw new UnsupportedOperationException("not yet implemented");
-            }
-        };
-    }
-    
-    
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java b/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java
deleted file mode 100644
index 7768810..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The BSE record is related closely to the <code>EscherBlipRecord</code> and stores
- * extra information about the blip.  A blip record is actually stored inside
- * the BSE record even though the BSE record isn't actually a container record.
- *
- * @see EscherBlipRecord
- */
-public final class EscherBSERecord extends EscherRecord {
-    public static final short RECORD_ID = (short) 0xF007;
-    public static final String RECORD_DESCRIPTION = "MsofbtBSE";
-
-    public static final byte BT_ERROR = 0;
-    public static final byte BT_UNKNOWN = 1;
-    public static final byte BT_EMF = 2;
-    public static final byte BT_WMF = 3;
-    public static final byte BT_PICT = 4;
-    public static final byte BT_JPEG = 5;
-    public static final byte BT_PNG = 6;
-    public static final byte BT_DIB = 7;
-
-    private byte field_1_blipTypeWin32;
-    private byte field_2_blipTypeMacOS;
-    private final byte[] field_3_uid = new byte[16];
-    private short field_4_tag;
-    private int field_5_size;
-    private int field_6_ref;
-    private int field_7_offset;
-    private byte field_8_usage;
-    private byte field_9_name;
-    private byte field_10_unused2;
-    private byte field_11_unused3;
-    private EscherBlipRecord field_12_blipRecord;
-
-    private byte[] _remainingData = new byte[0];
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        int pos = offset + 8;
-        field_1_blipTypeWin32 = data[pos];
-        field_2_blipTypeMacOS = data[pos + 1];
-        System.arraycopy( data, pos + 2, field_3_uid, 0, 16 );
-        field_4_tag = LittleEndian.getShort( data, pos + 18 );
-        field_5_size = LittleEndian.getInt( data, pos + 20 );
-        field_6_ref = LittleEndian.getInt( data, pos + 24 );
-        field_7_offset = LittleEndian.getInt( data, pos + 28 );
-        field_8_usage = data[pos + 32];
-        field_9_name = data[pos + 33];
-        field_10_unused2 = data[pos + 34];
-        field_11_unused3 = data[pos + 35];
-        bytesRemaining -= 36;
-
-        int bytesRead = 0;
-        if (bytesRemaining > 0) {
-            // Some older escher formats skip this last record
-            field_12_blipRecord = (EscherBlipRecord) recordFactory.createRecord( data, pos + 36 );
-            bytesRead = field_12_blipRecord.fillFields( data, pos + 36, recordFactory );
-        }
-        pos += 36 + bytesRead;
-        bytesRemaining -= bytesRead;
-
-        _remainingData = new byte[bytesRemaining];
-        System.arraycopy( data, pos, _remainingData, 0, bytesRemaining );
-        return bytesRemaining + 8 + 36 + (field_12_blipRecord == null ? 0 : field_12_blipRecord.getRecordSize()) ;
-
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        if (_remainingData == null) {
-            _remainingData = new byte[0];
-        }
-
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        int blipSize = field_12_blipRecord == null ? 0 : field_12_blipRecord.getRecordSize();
-        int remainingBytes = _remainingData.length + 36 + blipSize;
-        LittleEndian.putInt( data, offset + 4, remainingBytes );
-
-        data[offset + 8] = field_1_blipTypeWin32;
-        data[offset + 9] = field_2_blipTypeMacOS;
-        for ( int i = 0; i < 16; i++ )
-            data[offset + 10 + i] = field_3_uid[i];
-        LittleEndian.putShort( data, offset + 26, field_4_tag );
-        LittleEndian.putInt( data, offset + 28, field_5_size );
-        LittleEndian.putInt( data, offset + 32, field_6_ref );
-        LittleEndian.putInt( data, offset + 36, field_7_offset );
-        data[offset + 40] = field_8_usage;
-        data[offset + 41] = field_9_name;
-        data[offset + 42] = field_10_unused2;
-        data[offset + 43] = field_11_unused3;
-        int bytesWritten = 0;
-        if (field_12_blipRecord != null)
-        {
-            bytesWritten = field_12_blipRecord.serialize( offset + 44, data, new NullEscherSerializationListener() );
-        }
-        System.arraycopy( _remainingData, 0, data, offset + 44 + bytesWritten, _remainingData.length );
-        int pos = offset + 8 + 36 + _remainingData.length + bytesWritten;
-
-        listener.afterRecordSerialize(pos, getRecordId(), pos - offset, this);
-        return pos - offset;
-    }
-
-    @Override
-    public int getRecordSize() {
-        int field_12_size = 0;
-        if(field_12_blipRecord != null) {
-            field_12_size = field_12_blipRecord.getRecordSize();
-        }
-        int remaining_size = 0;
-        if(_remainingData != null) {
-            remaining_size = _remainingData.length;
-        }
-        return 8 + 1 + 1 + 16 + 2 + 4 + 4 + 4 + 1 + 1 +
-            1 + 1 + field_12_size + remaining_size;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "BSE";
-    }
-
-    /**
-     * The expected blip type under windows (failure to match this blip type will result in
-     * Excel converting to this format).
-     * 
-     * @return win32 blip type
-     */
-    public byte getBlipTypeWin32() {
-        return field_1_blipTypeWin32;
-    }
-
-    /**
-     * Set the expected win32 blip type
-     * 
-     * @param blipTypeWin32 win32 blip type
-     */
-    public void setBlipTypeWin32(byte blipTypeWin32) {
-        field_1_blipTypeWin32 = blipTypeWin32;
-    }
-
-    /**
-     * The expected blip type under MacOS (failure to match this blip type will result in
-     * Excel converting to this format).
-     * 
-     * @return MacOS blip type
-     */
-    public byte getBlipTypeMacOS() {
-        return field_2_blipTypeMacOS;
-    }
-
-    /**
-     * Set the expected MacOS blip type
-     * 
-     * @param blipTypeMacOS MacOS blip type
-     */
-    public void setBlipTypeMacOS(byte blipTypeMacOS) {
-        field_2_blipTypeMacOS = blipTypeMacOS;
-    }
-
-    /**
-     * 16 byte MD4 checksum.
-     * 
-     * @return 16 byte MD4 checksum
-     */
-    public byte[] getUid() {
-        return field_3_uid;
-    }
-
-    /**
-     * 16 byte MD4 checksum.
-     * 
-     * @param uid 16 byte MD4 checksum
-     */
-    public void setUid(byte[] uid) {
-        if (uid == null || uid.length != 16) {
-            throw new IllegalArgumentException("uid must be byte[16]");
-        }
-        System.arraycopy(uid, 0, field_3_uid, 0, field_3_uid.length);
-    }
-
-    /**
-     * unused
-     * 
-     * @return an unknown tag
-     */
-    public short getTag() {
-        return field_4_tag;
-    }
-
-    /**
-     * unused
-     * 
-     * @param tag unknown tag
-     */
-    public void setTag(short tag) {
-        field_4_tag = tag;
-    }
-
-    /**
-     * Blip size in stream.
-     * 
-     * @return the blip size
-     */
-    public int getSize() {
-        return field_5_size;
-    }
-
-    /**
-     * Blip size in stream.
-     * 
-     * @param size blip size
-     */
-    public void setSize(int size) {
-        field_5_size = size;
-    }
-
-    /**
-     * The reference count of this blip.
-     * 
-     * @return the reference count
-     */
-    public int getRef() {
-        return field_6_ref;
-    }
-
-    /**
-     * The reference count of this blip.
-     * 
-     * @param ref the reference count
-     */
-    public void setRef(int ref) {
-        field_6_ref = ref;
-    }
-
-    /**
-     * File offset in the delay stream.
-     * 
-     * @return the file offset
-     */
-    public int getOffset() {
-        return field_7_offset;
-    }
-
-    /**
-     * File offset in the delay stream.
-     * 
-     * @param offset the file offset
-     */
-    public void setOffset(int offset) {
-        field_7_offset = offset;
-    }
-
-    /**
-     * Defines the way this blip is used.
-     * 
-     * @return the blip usage
-     */
-    public byte getUsage() {
-        return field_8_usage;
-    }
-
-    /**
-     * Defines the way this blip is used.
-     * 
-     * @param usage the blip usae
-     */
-    public void setUsage(byte usage) {
-        field_8_usage = usage;
-    }
-
-    /**
-     * The length in characters of the blip name.
-     * 
-     * @return the blip name length
-     */
-    public byte getName() {
-        return field_9_name;
-    }
-
-    /**
-     * The length in characters of the blip name.
-     * 
-     * @param name the blip name length
-     */
-    public void setName(byte name) {
-        field_9_name = name;
-    }
-
-    public byte getUnused2() {
-        return field_10_unused2;
-    }
-
-    public void setUnused2(byte unused2) {
-        field_10_unused2 = unused2;
-    }
-
-    public byte getUnused3() {
-        return field_11_unused3;
-    }
-
-    public void setUnused3(byte unused3) {
-        field_11_unused3 = unused3;
-    }
-
-    public EscherBlipRecord getBlipRecord() {
-        return field_12_blipRecord;
-    }
-
-    public void setBlipRecord(EscherBlipRecord blipRecord) {
-        field_12_blipRecord = blipRecord;
-    }
-
-    /**
-     * Any remaining data in this record.
-     * 
-     * @return the remaining bytes
-     */
-    public byte[] getRemainingData() {
-        return _remainingData;
-    }
-
-    /**
-     * Any remaining data in this record.
-     * 
-     * @param remainingData the remaining bytes
-     */
-    public void setRemainingData(byte[] remainingData) {
-        if (remainingData == null) {
-            _remainingData = new byte[0];
-        } else {
-            _remainingData = remainingData.clone();
-        }
-    }
-
-    @Override
-    public String toString() {
-        String extraData = _remainingData == null ? null : HexDump.toHex(_remainingData, 32);
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex( RECORD_ID ) + '\n' +
-                "  Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
-                "  Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
-                "  BlipTypeWin32: " + field_1_blipTypeWin32 + '\n' +
-                "  BlipTypeMacOS: " + field_2_blipTypeMacOS + '\n' +
-                "  SUID: " + (field_3_uid == null ? "" : HexDump.toHex(field_3_uid)) + '\n' +
-                "  Tag: " + field_4_tag + '\n' +
-                "  Size: " + field_5_size + '\n' +
-                "  Ref: " + field_6_ref + '\n' +
-                "  Offset: " + field_7_offset + '\n' +
-                "  Usage: " + field_8_usage + '\n' +
-                "  Name: " + field_9_name + '\n' +
-                "  Unused2: " + field_10_unused2 + '\n' +
-                "  Unused3: " + field_11_unused3 + '\n' +
-                "  blipRecord: " + field_12_blipRecord + '\n' +
-                "  Extra Data:" + '\n' + extraData;
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<BlipTypeWin32>").append(field_1_blipTypeWin32).append("</BlipTypeWin32>\n")
-                .append(tab).append("\t").append("<BlipTypeMacOS>").append(field_2_blipTypeMacOS).append("</BlipTypeMacOS>\n")
-                .append(tab).append("\t").append("<SUID>").append(field_3_uid == null ? "" : HexDump.toHex(field_3_uid)).append("</SUID>\n")
-                .append(tab).append("\t").append("<Tag>").append(field_4_tag).append("</Tag>\n")
-                .append(tab).append("\t").append("<Size>").append(field_5_size).append("</Size>\n")
-                .append(tab).append("\t").append("<Ref>").append(field_6_ref).append("</Ref>\n")
-                .append(tab).append("\t").append("<Offset>").append(field_7_offset).append("</Offset>\n")
-                .append(tab).append("\t").append("<Usage>").append(field_8_usage).append("</Usage>\n")
-                .append(tab).append("\t").append("<Name>").append(field_9_name).append("</Name>\n")
-                .append(tab).append("\t").append("<Unused2>").append(field_10_unused2).append("</Unused2>\n")
-                .append(tab).append("\t").append("<Unused3>").append(field_11_unused3).append("</Unused3>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * Retrieve the string representation given a blip id.
-     * 
-     * @param b the blip type byte-encoded
-     * 
-     * @return the blip type as string
-     */
-    public static String getBlipType(byte b) {
-        switch (b) {
-            case BT_ERROR:   return " ERROR";
-            case BT_UNKNOWN: return " UNKNOWN";
-            case BT_EMF:     return " EMF";
-            case BT_WMF:     return " WMF";
-            case BT_PICT:    return " PICT";
-            case BT_JPEG:    return " JPEG";
-            case BT_PNG:     return " PNG";
-            case BT_DIB:     return " DIB";
-        }
-        if ( b < 32 ) {
-            return " NotKnown";
-        }
-        return " Client";
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java b/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java
deleted file mode 100644
index cb2eba8..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-public class EscherBitmapBlip extends EscherBlipRecord {
-    public static final short RECORD_ID_JPEG = (short) 0xF018 + 5;
-    public static final short RECORD_ID_PNG = (short) 0xF018 + 6;
-    public static final short RECORD_ID_DIB = (short) 0xF018 + 7;
-
-    private static final int HEADER_SIZE = 8;
-
-    private final byte[] field_1_UID = new byte[16];
-    private byte field_2_marker = (byte) 0xFF;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesAfterHeader = readHeader( data, offset );
-        int pos = offset + HEADER_SIZE;
-
-        System.arraycopy( data, pos, field_1_UID, 0, 16 ); pos += 16;
-        field_2_marker = data[pos]; pos++;
-
-        field_pictureData = new byte[bytesAfterHeader - 17];
-        System.arraycopy( data, pos, field_pictureData, 0, field_pictureData.length );
-
-        return bytesAfterHeader + HEADER_SIZE;
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener ) {
-        listener.beforeRecordSerialize(offset, getRecordId(), this);
-
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        LittleEndian.putInt( data, offset + 4, getRecordSize() - HEADER_SIZE );
-        int pos = offset + HEADER_SIZE;
-
-        System.arraycopy( field_1_UID, 0, data, pos, 16 );
-        data[pos + 16] = field_2_marker;
-        System.arraycopy( field_pictureData, 0, data, pos + 17, field_pictureData.length );
-
-        listener.afterRecordSerialize(offset + getRecordSize(), getRecordId(), getRecordSize(), this);
-        return HEADER_SIZE + 16 + 1 + field_pictureData.length;
-    }
-
-    @Override
-    public int getRecordSize() {
-        return 8 + 16 + 1 + field_pictureData.length;
-    }
-
-    /**
-     * Gets the first MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @return the first MD4
-     */
-    public byte[] getUID() {
-        return field_1_UID;
-    }
-
-    /**
-     * Sets the first MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @param field_1_UID the first MD4
-     */
-    public void setUID( byte[] field_1_UID ) {
-        if (field_1_UID == null || field_1_UID.length != 16) {
-            throw new IllegalArgumentException("field_1_UID must be byte[16]");
-        }
-        System.arraycopy(field_1_UID, 0, this.field_1_UID , 0, 16);
-    }
-
-    /**
-     * Gets an unsigned integer that specifies an application-defined internal
-     * resource tag. This value MUST be 0xFF for external files.
-     *
-     * @return the marker
-     */
-    public byte getMarker() {
-        return field_2_marker;
-    }
-
-    /**
-     * Sets an unsigned integer that specifies an application-defined internal
-     * resource tag. This value MUST be 0xFF for external files.
-     *
-     * @param field_2_marker the marker
-     */
-    public void setMarker( byte field_2_marker ) {
-        this.field_2_marker = field_2_marker;
-    }
-
-    @Override
-    public String toString() {
-        String nl = System.getProperty( "line.separator" );
-
-        String extraData = HexDump.dump(this.field_pictureData, 0, 0);
-
-        return getClass().getName() + ":" + nl +
-            "  RecordId: 0x" + HexDump.toHex( getRecordId() ) + nl +
-            "  Version: 0x" + HexDump.toHex( getVersion() ) + nl +
-            "  Instance: 0x" + HexDump.toHex( getInstance() ) + nl +
-            "  UID: 0x" + HexDump.toHex( field_1_UID ) + nl +
-            "  Marker: 0x" + HexDump.toHex( field_2_marker ) + nl +
-            "  Extra Data:" + nl + extraData;
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String extraData = HexDump.dump(this.field_pictureData, 0, 0);
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-            .append(tab).append("\t").append("<UID>0x").append(HexDump.toHex(field_1_UID)).append("</UID>\n")
-            .append(tab).append("\t").append("<Marker>0x").append(HexDump.toHex(field_2_marker)).append("</Marker>\n")
-            .append(tab).append("\t").append("<ExtraData>").append(extraData).append("</ExtraData>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java
deleted file mode 100644
index 0ea8930..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.HexDump;
-
-public class EscherBlipRecord extends EscherRecord {
-    public static final short  RECORD_ID_START    = (short) 0xF018;
-    public static final short  RECORD_ID_END      = (short) 0xF117;
-    public static final String RECORD_DESCRIPTION = "msofbtBlip";
-
-    private static final int   HEADER_SIZE               = 8;
-
-    protected              byte[] field_pictureData;
-
-    public EscherBlipRecord() {
-    }
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesAfterHeader = readHeader( data, offset );
-        int pos              = offset + HEADER_SIZE;
-
-        field_pictureData = new byte[bytesAfterHeader];
-        System.arraycopy(data, pos, field_pictureData, 0, bytesAfterHeader);
-
-        return bytesAfterHeader + 8;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize(offset, getRecordId(), this);
-
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-
-        System.arraycopy( field_pictureData, 0, data, offset + 4, field_pictureData.length );
-
-        listener.afterRecordSerialize(offset + 4 + field_pictureData.length, getRecordId(), field_pictureData.length + 4, this);
-        return field_pictureData.length + 4;
-    }
-
-    @Override
-    public int getRecordSize() {
-        return field_pictureData.length + HEADER_SIZE;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "Blip";
-    }
-
-    /**
-     * Gets the picture data bytes
-     *
-     * @return the picture data
-     */
-    public byte[] getPicturedata() {
-        return field_pictureData;
-    }
-
-    /**
-     * Sets the picture data bytes
-     *
-     * @param pictureData the picture data
-     */
-    public void setPictureData(byte[] pictureData) {
-        if (pictureData == null) {
-            throw new IllegalArgumentException("picture data can't be null");
-        }
-        field_pictureData = pictureData.clone();
-    }
-
-    @Override
-    public String toString() {
-        String extraData = HexDump.toHex(field_pictureData, 32);
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
-                "  Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
-                "  Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
-                "  Extra Data:" + '\n' + extraData;
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String extraData = HexDump.toHex(field_pictureData, 32);
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<ExtraData>").append(extraData).append("</ExtraData>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherBoolProperty.java b/trunk/src/java/org/apache/poi/ddf/EscherBoolProperty.java
deleted file mode 100644
index 1f44e23..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherBoolProperty.java
+++ /dev/null
@@ -1,83 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-
-/**
- * Represents a boolean property.  The actual utility of this property is in doubt because many
- * of the properties marked as boolean seem to actually contain special values.  In other words
- * they're not true booleans.
- *
- * @see EscherSimpleProperty
- * @see EscherProperty
- */
-public class EscherBoolProperty
-        extends EscherSimpleProperty
-{
-    /**
-     * Create an instance of an escher boolean property.
-     *
-     * @param propertyNumber The property number (or id)
-     * @param value      The 32 bit value of this bool property
-     */
-    public EscherBoolProperty( short propertyNumber, int value )
-    {
-        super(propertyNumber, value);
-    }
-
-    /**
-     * Whether this boolean property is true
-     * 
-     * @return the boolean property value
-     */
-    public boolean isTrue()
-    {
-        return propertyValue != 0;
-    }
-
-    /**
-     * Whether this boolean property is false
-     * 
-     * @return true, if this boolean property is false
-     * 
-     * @deprecated use !isTrue() instead, planed to be removed in POI 3.17
-     */
-    public boolean isFalse()
-    {
-        return propertyValue == 0;
-    }
-
-//    public String toString()
-//    {
-//        return "propNum: " + getPropertyNumber()
-//                + ", complex: " + isComplex()
-//                + ", blipId: " + isBlipId()
-//                + ", value: " + (getValue() != 0);
-//    }
-
-    @Override
-    public String toXml(String tab){
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append("<").append(getClass().getSimpleName()).append(" id=\"0x").append(HexDump.toHex(getId()))
-                .append("\" name=\"").append(getName()).append("\" simpleValue=\"").append(getPropertyValue()).append("\" blipId=\"")
-                .append(isBlipId()).append("\" value=\"").append(isTrue()).append("\"").append("/>\n");
-        return builder.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
deleted file mode 100644
index 1fb1644..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
+++ /dev/null
@@ -1,210 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The escher child achor record is used to specify the position of a shape under an
- * existing group.  The first level of shape records use a EscherClientAnchor record instead.
- *
- * @see EscherChildAnchorRecord
- */
-public class EscherChildAnchorRecord
-        extends EscherRecord
-{
-    public static final short RECORD_ID = (short) 0xF00F;
-    public static final String RECORD_DESCRIPTION = "MsofbtChildAnchor";
-
-    private int field_1_dx1;
-    private int field_2_dy1;
-    private int field_3_dx2;
-    private int field_4_dy2;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        int pos            = offset + 8;
-        int size           = 0;
-        switch (bytesRemaining) {
-        case 16: // RectStruct
-            field_1_dx1 =  LittleEndian.getInt( data, pos + size );size+=4;
-            field_2_dy1 =  LittleEndian.getInt( data, pos + size );size+=4;
-            field_3_dx2 =  LittleEndian.getInt( data, pos + size );size+=4;
-            field_4_dy2 =  LittleEndian.getInt( data, pos + size );size+=4;
-            break;
-        case 8: // SmallRectStruct
-            field_1_dx1 =  LittleEndian.getShort( data, pos + size );size+=2;
-            field_2_dy1 =  LittleEndian.getShort( data, pos + size );size+=2;
-            field_3_dx2 =  LittleEndian.getShort( data, pos + size );size+=2;
-            field_4_dy2 =  LittleEndian.getShort( data, pos + size );size+=2;
-            break;
-        default:
-            throw new RuntimeException("Invalid EscherChildAnchorRecord - neither 8 nor 16 bytes.");
-        }
-            
-        return 8 + size;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-        int pos = offset;
-        LittleEndian.putShort( data, pos, getOptions() );          pos += 2;
-        LittleEndian.putShort( data, pos, getRecordId() );         pos += 2;
-        LittleEndian.putInt( data, pos, getRecordSize()-8 );       pos += 4;
-        LittleEndian.putInt( data, pos, field_1_dx1 );             pos += 4;
-        LittleEndian.putInt( data, pos, field_2_dy1 );             pos += 4;
-        LittleEndian.putInt( data, pos, field_3_dx2 );             pos += 4;
-        LittleEndian.putInt( data, pos, field_4_dy2 );             pos += 4;
-
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        return pos - offset;
-    }
-
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + 4 * 4;
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "ChildAnchor";
-    }
-
-
-    /**
-     * The string representation of this record
-     */
-    @Override
-    public String toString()
-    {
-        String nl = System.getProperty("line.separator");
-
-        return getClass().getName() + ":" + nl +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + nl +
-                "  Instance: 0x" + HexDump.toHex(getInstance()) + nl +
-                "  X1: " + field_1_dx1 + nl +
-                "  Y1: " + field_2_dy1 + nl +
-                "  X2: " + field_3_dx2 + nl +
-                "  Y2: " + field_4_dy2 + nl ;
-
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<X1>").append(field_1_dx1).append("</X1>\n")
-                .append(tab).append("\t").append("<Y1>").append(field_2_dy1).append("</Y1>\n")
-                .append(tab).append("\t").append("<X2>").append(field_3_dx2).append("</X2>\n")
-                .append(tab).append("\t").append("<Y2>").append(field_4_dy2).append("</Y2>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * Retrieves offset within the parent coordinate space for the top left point.
-     * 
-     * @return the x offset of the top left point
-     */
-    public int getDx1()
-    {
-        return field_1_dx1;
-    }
-
-    /**
-     * Sets offset within the parent coordinate space for the top left point.
-     * 
-     * @param field_1_dx1 the x offset of the top left point
-     */
-    public void setDx1( int field_1_dx1 )
-    {
-        this.field_1_dx1 = field_1_dx1;
-    }
-
-    /**
-     * Gets offset within the parent coordinate space for the top left point.
-     * 
-     * @return the y offset of the top left point
-     */
-    public int getDy1()
-    {
-        return field_2_dy1;
-    }
-
-    /**
-     * Sets offset within the parent coordinate space for the top left point.
-     * 
-     * @param field_2_dy1 the y offset of the top left point 
-     */
-    public void setDy1( int field_2_dy1 )
-    {
-        this.field_2_dy1 = field_2_dy1;
-    }
-
-    /**
-     * Retrieves offset within the parent coordinate space for the bottom right point.
-     * 
-     * @return the x offset of the bottom right point
-     */
-    public int getDx2()
-    {
-        return field_3_dx2;
-    }
-
-    /**
-     * Sets offset within the parent coordinate space for the bottom right point.
-     * 
-     * @param field_3_dx2 the x offset of the bottom right point
-     */
-    public void setDx2( int field_3_dx2 )
-    {
-        this.field_3_dx2 = field_3_dx2;
-    }
-
-    /**
-     * Gets the offset within the parent coordinate space for the bottom right point.
-     * 
-     * @return the y offset of the bottom right point
-     */
-    public int getDy2()
-    {
-        return field_4_dy2;
-    }
-
-    /**
-     * Sets the offset within the parent coordinate space for the bottom right point.
-     * 
-     * @param field_4_dy2 the y offset of the bottom right point
-     */
-    public void setDy2( int field_4_dy2 )
-    {
-        this.field_4_dy2 = field_4_dy2;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
deleted file mode 100644
index bb1cf66..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The escher client anchor specifies which rows and cells the shape is bound to as well as
- * the offsets within those cells.  Each cell is 1024 units wide by 256 units long regardless
- * of the actual size of the cell.  The EscherClientAnchorRecord only applies to the top-most
- * shapes.  Shapes contained in groups are bound using the EscherChildAnchorRecords.
- *
- * @see EscherChildAnchorRecord
- */
-public class EscherClientAnchorRecord
-        extends EscherRecord
-{
-    public static final short RECORD_ID = (short) 0xF010;
-    public static final String RECORD_DESCRIPTION = "MsofbtClientAnchor";
-
-    /**
-     * bit[0] -  fMove (1 bit): A bit that specifies whether the shape will be kept intact when the cells are moved.
-     * bit[1] - fSize (1 bit): A bit that specifies whether the shape will be kept intact when the cells are resized. If fMove is 1, the value MUST be 1.
-     * bit[2-4] - reserved, MUST be 0 and MUST be ignored
-     * bit[5-15]- Undefined and MUST be ignored.
-     *
-     * it can take values: 0, 2, 3
-     */
-    private short field_1_flag;
-    private short field_2_col1;
-    private short field_3_dx1;
-    private short field_4_row1;
-    private short field_5_dy1;
-    private short field_6_col2;
-    private short field_7_dx2;
-    private short field_8_row2;
-    private short field_9_dy2;
-    private byte[] remainingData = new byte[0];
-    private boolean shortRecord = false;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        int pos            = offset + 8;
-        int size           = 0;
-
-        // Always find 4 two byte entries. Sometimes find 9
-        /*if (bytesRemaining == 4) // Word format only 4 bytes
-        {
-            // Not sure exactly what the format is quite yet, likely a reference to a PLC
-        }
-        else */
-        if (bytesRemaining != 4) // Word format only 4 bytes
-        {
-            field_1_flag   =  LittleEndian.getShort( data, pos + size );     size += 2;
-            field_2_col1   =  LittleEndian.getShort( data, pos + size );     size += 2;
-            field_3_dx1    =  LittleEndian.getShort( data, pos + size );     size += 2;
-            field_4_row1   =  LittleEndian.getShort( data, pos + size );     size += 2;
-            if(bytesRemaining >= 18) {
-                field_5_dy1    =  LittleEndian.getShort( data, pos + size );     size += 2;
-                field_6_col2   =  LittleEndian.getShort( data, pos + size );     size += 2;
-                field_7_dx2    =  LittleEndian.getShort( data, pos + size );     size += 2;
-                field_8_row2   =  LittleEndian.getShort( data, pos + size );     size += 2;
-                field_9_dy2    =  LittleEndian.getShort( data, pos + size );     size += 2;
-                shortRecord = false;
-            } else {
-                shortRecord = true;
-            }
-        }
-        bytesRemaining -= size;
-        remainingData  =  new byte[bytesRemaining];
-        System.arraycopy( data, pos + size, remainingData, 0, bytesRemaining );
-        return 8 + size + bytesRemaining;
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener )
-    {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        if (remainingData == null) remainingData = new byte[0];
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        int remainingBytes = remainingData.length + (shortRecord ? 8 : 18);
-        LittleEndian.putInt( data, offset + 4, remainingBytes );
-        LittleEndian.putShort( data, offset + 8, field_1_flag );
-        LittleEndian.putShort( data, offset + 10, field_2_col1 );
-        LittleEndian.putShort( data, offset + 12, field_3_dx1 );
-        LittleEndian.putShort( data, offset + 14, field_4_row1 );
-        if(!shortRecord) {
-            LittleEndian.putShort( data, offset + 16, field_5_dy1 );
-            LittleEndian.putShort( data, offset + 18, field_6_col2 );
-            LittleEndian.putShort( data, offset + 20, field_7_dx2 );
-            LittleEndian.putShort( data, offset + 22, field_8_row2 );
-            LittleEndian.putShort( data, offset + 24, field_9_dy2 );
-        }
-        System.arraycopy( remainingData, 0, data, offset + (shortRecord ? 16 : 26), remainingData.length );
-        int pos = offset + 8 + (shortRecord ? 8 : 18) + remainingData.length;
-
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        return pos - offset;
-    }
-
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + (shortRecord ? 8 : 18) + (remainingData == null ? 0 : remainingData.length);
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "ClientAnchor";
-    }
-
-    /**
-     * Returns the string representation for this record.
-     *
-     * @return A string
-     */
-    @Override
-    public String toString()
-    {
-        String nl = System.getProperty("line.separator");
-        String extraData = HexDump.dump(this.remainingData, 0, 0);
-        return getClass().getName() + ":" + nl +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + nl +
-                "  Instance: 0x" + HexDump.toHex(getInstance()) + nl +
-                "  Flag: " + field_1_flag + nl +
-                "  Col1: " + field_2_col1 + nl +
-                "  DX1: " + field_3_dx1 + nl +
-                "  Row1: " + field_4_row1 + nl +
-                "  DY1: " + field_5_dy1 + nl +
-                "  Col2: " + field_6_col2 + nl +
-                "  DX2: " + field_7_dx2 + nl +
-                "  Row2: " + field_8_row2 + nl +
-                "  DY2: " + field_9_dy2 + nl +
-                "  Extra Data:" + nl + extraData;
-
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String extraData = HexDump.dump(this.remainingData, 0, 0).trim();
-        return tab + formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())) +
-                tab + "\t" + "<Flag>" + field_1_flag + "</Flag>\n" +
-                tab + "\t" + "<Col1>" + field_2_col1 + "</Col1>\n" +
-                tab + "\t" + "<DX1>" + field_3_dx1 + "</DX1>\n" +
-                tab + "\t" + "<Row1>" + field_4_row1 + "</Row1>\n" +
-                tab + "\t" + "<DY1>" + field_5_dy1 + "</DY1>\n" +
-                tab + "\t" + "<Col2>" + field_6_col2 + "</Col2>\n" +
-                tab + "\t" + "<DX2>" + field_7_dx2 + "</DX2>\n" +
-                tab + "\t" + "<Row2>" + field_8_row2 + "</Row2>\n" +
-                tab + "\t" + "<DY2>" + field_9_dy2 + "</DY2>\n" +
-                tab + "\t" + "<ExtraData>" + extraData + "</ExtraData>\n" +
-                tab + "</" + getClass().getSimpleName() + ">\n";
-    }
-
-    /**
-     * 0 = Move and size with Cells, 2 = Move but don't size with cells, 3 = Don't move or size with cells.
-     * 
-     * @return the move/size flag
-     */
-    public short getFlag()
-    {
-        return field_1_flag;
-    }
-
-    /**
-     * 0 = Move and size with Cells, 2 = Move but don't size with cells, 3 = Don't move or size with cells.
-     * 
-     * @param field_1_flag the move/size flag
-     */
-    public void setFlag( short field_1_flag )
-    {
-        this.field_1_flag = field_1_flag;
-    }
-
-    /**
-     * The column number for the top-left position.  0 based.
-     * 
-     * @return the column number of the top-left corner
-     */
-    public short getCol1()
-    {
-        return field_2_col1;
-    }
-
-    /**
-     * The column number for the top-left position.  0 based.
-     * 
-     * @param field_2_col1 the column number of the top-left corner
-     */
-    public void setCol1( short field_2_col1 )
-    {
-        this.field_2_col1 = field_2_col1;
-    }
-
-    /**
-     * The x offset within the top-left cell.  Range is from 0 to 1023.
-     * 
-     * @return the x offset of the top-left corner
-     */
-    public short getDx1()
-    {
-        return field_3_dx1;
-    }
-
-    /**
-     * The x offset within the top-left cell.  Range is from 0 to 1023.
-     * 
-     * @param field_3_dx1 the x offset of the top-left corner
-     */
-    public void setDx1( short field_3_dx1 )
-    {
-        this.field_3_dx1 = field_3_dx1;
-    }
-
-    /**
-     * The row number for the top-left corner of the shape.
-     * 
-     * @return the row number of the top-left corner
-     */
-    public short getRow1()
-    {
-        return field_4_row1;
-    }
-
-    /**
-     * The row number of the top-left corner of the shape.
-     * 
-     * @param field_4_row1 the row number of the top-left corner
-     */
-    public void setRow1( short field_4_row1 )
-    {
-        this.field_4_row1 = field_4_row1;
-    }
-
-    /**
-     * The y offset within the top-left corner of the current shape.
-     * 
-     * @return the y offset of the top-left corner
-     */
-    public short getDy1()
-    {
-        return field_5_dy1;
-    }
-
-    /**
-     * The y offset within the top-left corner of the current shape.
-     * 
-     * @param field_5_dy1 the y offset of the top-left corner
-     */
-    public void setDy1( short field_5_dy1 )
-    {
-        shortRecord = false;
-        this.field_5_dy1 = field_5_dy1;
-    }
-
-    /**
-     * The column of the bottom right corner of this shape.
-     * 
-     * @return the column of the bottom right corner
-     */
-    public short getCol2()
-    {
-        return field_6_col2;
-    }
-
-    /**
-     * The column of the bottom right corner of this shape.
-     * 
-     * @param field_6_col2 the column of the bottom right corner
-     */
-    public void setCol2( short field_6_col2 )
-    {
-        shortRecord = false;
-        this.field_6_col2 = field_6_col2;
-    }
-
-    /**
-     * The x offset withing the cell for the bottom-right corner of this shape.
-     * 
-     * @return the x offset of the bottom-right corner
-     */
-    public short getDx2()
-    {
-        return field_7_dx2;
-    }
-
-    /**
-     * The x offset withing the cell for the bottom-right corner of this shape.
-     * 
-     * @param field_7_dx2 the x offset of the bottom-right corner
-     */
-    public void setDx2( short field_7_dx2 )
-    {
-        shortRecord = false;
-        this.field_7_dx2 = field_7_dx2;
-    }
-
-    /**
-     * The row number for the bottom-right corner of the current shape.
-     * 
-     * @return the row number for the bottom-right corner
-     */
-    public short getRow2()
-    {
-        return field_8_row2;
-    }
-
-    /**
-     * The row number for the bottom-right corner of the current shape.
-     * 
-     * @param field_8_row2 the row number for the bottom-right corner
-     */
-    public void setRow2( short field_8_row2 )
-    {
-        shortRecord = false;
-        this.field_8_row2 = field_8_row2;
-    }
-
-    /**
-     * The y offset withing the cell for the bottom-right corner of this shape.
-     * 
-     * @return the y offset of the bottom-right corner
-     */
-    public short getDy2()
-    {
-        return field_9_dy2;
-    }
-
-    /**
-     * The y offset withing the cell for the bottom-right corner of this shape.
-     * 
-     * @param field_9_dy2 the y offset of the bottom-right corner
-     */
-    public void setDy2( short field_9_dy2 )
-    {
-        shortRecord = false;
-        this.field_9_dy2 = field_9_dy2;
-    }
-
-    /**
-     * Any remaining data in the record
-     * 
-     * @return the remaining bytes
-     */
-    public byte[] getRemainingData()
-    {
-        return remainingData;
-    }
-
-    /**
-     * Any remaining data in the record
-     * 
-     * @param remainingData the remaining bytes
-     */
-    public void setRemainingData( byte[] remainingData ) {
-        if (remainingData == null) {
-            this.remainingData = new byte[0];
-        } else {
-            this.remainingData = remainingData.clone();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java
deleted file mode 100644
index 749007c..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The EscherClientDataRecord is used to store client specific data about the position of a
- * shape within a container.
- */
-public class EscherClientDataRecord
-    extends EscherRecord
-{
-    public static final short RECORD_ID = (short) 0xF011;
-    public static final String RECORD_DESCRIPTION = "MsofbtClientData";
-
-    private byte[] remainingData;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        int pos            = offset + 8;
-        remainingData  =  new byte[bytesRemaining];
-        System.arraycopy( data, pos, remainingData, 0, bytesRemaining );
-        return 8 + bytesRemaining;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        if (remainingData == null) remainingData = new byte[0];
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        LittleEndian.putInt( data, offset + 4, remainingData.length );
-        System.arraycopy( remainingData, 0, data, offset + 8, remainingData.length );
-        int pos = offset + 8 + remainingData.length;
-
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        return pos - offset;
-    }
-
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + (remainingData == null ? 0 : remainingData.length);
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "ClientData";
-    }
-
-    /**
-     * Returns the string representation of this record.
-     */
-    @Override
-    public String toString()
-    {
-        String nl = System.getProperty("line.separator");
-        String extraData = HexDump.dump(getRemainingData(), 0, 0);
-        return getClass().getName() + ":" + nl +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + nl +
-                "  Instance: 0x" + HexDump.toHex(getInstance()) + nl +
-                "  Extra Data:" + nl +
-                extraData;
-
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String extraData = HexDump.dump(getRemainingData(), 0, 0).trim();
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()),
-                HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<ExtraData>").append(extraData).append("</ExtraData>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * Any data recording this record.
-     * 
-     * @return the remaining bytes
-     */
-    public byte[] getRemainingData()
-    {
-        return remainingData;
-    }
-
-    /**
-     * Any data recording this record.
-     * 
-     * @param remainingData the remaining bytes
-     */
-    public void setRemainingData( byte[] remainingData ) {
-        this.remainingData = (remainingData == null)
-            ? new byte[0]
-            : remainingData.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java b/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java
deleted file mode 100644
index 84f9430..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An OfficeArtCOLORREF structure entry which also handles color extension opid data
- */
-public class EscherColorRef {
-    int opid = -1;
-    int colorRef = 0;
-
-    public enum SysIndexSource {
-        /** Use the fill color of the shape. */
-        FILL_COLOR(0xF0),
-        /** If the shape contains a line, use the line color of the shape. Otherwise, use the fill color. */
-        LINE_OR_FILL_COLOR(0xF1),
-        /** Use the line color of the shape. */
-        LINE_COLOR(0xF2),
-        /** Use the shadow color of the shape. */
-        SHADOW_COLOR(0xF3),
-        /** Use the current, or last-used, color. */
-        CURRENT_OR_LAST_COLOR(0xF4),
-        /** Use the fill background color of the shape. */
-        FILL_BACKGROUND_COLOR(0xF5),
-        /** Use the line background color of the shape. */
-        LINE_BACKGROUND_COLOR(0xF6),
-        /** If the shape contains a fill, use the fill color of the shape. Otherwise, use the line color. */
-        FILL_OR_LINE_COLOR(0xF7)
-        ;
-        int value;
-        SysIndexSource(int value) { this.value = value; }
-    }
-
-    /**
-     * The following enum specifies values that indicate special procedural properties that
-     * are used to modify the color components of another color. These values are combined with
-     * those of the {@link SysIndexSource} enum or with a user-specified color.
-     * The first six values are mutually exclusive.
-     */
-    public enum SysIndexProcedure {
-        /**
-         * Darken the color by the value that is specified in the blue field.
-         * A blue value of 0xFF specifies that the color is to be left unchanged,
-         * whereas a blue value of 0x00 specifies that the color is to be completely darkened.
-         */
-        DARKEN_COLOR(0x01),
-        /**
-         * Lighten the color by the value that is specified in the blue field.
-         * A blue value of 0xFF specifies that the color is to be left unchanged,
-         * whereas a blue value of 0x00 specifies that the color is to be completely lightened.
-         */
-        LIGHTEN_COLOR(0x02),
-        /**
-         * Add a gray level RGB value. The blue field contains the gray level to add:
-         * NewColor = SourceColor + gray
-         */
-        ADD_GRAY_LEVEL(0x03),
-        /**
-         * Subtract a gray level RGB value. The blue field contains the gray level to subtract:
-         * NewColor = SourceColor - gray
-         */
-        SUB_GRAY_LEVEL(0x04),
-        /**
-         * Reverse-subtract a gray level RGB value. The blue field contains the gray level from
-         * which to subtract:
-         * NewColor = gray - SourceColor
-         */
-        REVERSE_GRAY_LEVEL(0x05),
-        /**
-         * If the color component being modified is less than the parameter contained in the blue
-         * field, set it to the minimum intensity. If the color component being modified is greater
-         * than or equal to the parameter, set it to the maximum intensity.
-         */
-        THRESHOLD(0x06),
-        /**
-         * After making other modifications, invert the color.
-         * This enum value is only for documentation and won't be directly returned.
-         */
-        INVERT_AFTER(0x20),
-        /**
-         * After making other modifications, invert the color by toggling just the high bit of each
-         * color channel.
-         * This enum value is only for documentation and won't be directly returned.
-         */
-        INVERT_HIGHBIT_AFTER(0x40)
-        ;
-        BitField mask;
-        SysIndexProcedure(int mask) {
-            this.mask = new BitField(mask);
-        }
-    }
-    
-    /**
-     * A bit that specifies whether the system color scheme will be used to determine the color. 
-     * A value of 0x1 specifies that green and red will be treated as an unsigned 16-bit index
-     * into the system color table. Values less than 0x00F0 map directly to system colors.
-     */
-    private static final BitField FLAG_SYS_INDEX     = new BitField(0x10000000);
-
-    /**
-     * A bit that specifies whether the current application-defined color scheme will be used
-     * to determine the color. A value of 0x1 specifies that red will be treated as an index
-     * into the current color scheme table. If this value is 0x1, green and blue MUST be 0x00.
-     */
-    private static final BitField FLAG_SCHEME_INDEX  = new BitField(0x08000000);
-    
-    /**
-     * A bit that specifies whether the color is a standard RGB color.
-     * 0x0 : The RGB color MAY use halftone dithering to display.
-     * 0x1 : The color MUST be a solid color.
-     */
-    private static final BitField FLAG_SYSTEM_RGB    = new BitField(0x04000000);
-    
-    /**
-     * A bit that specifies whether the current palette will be used to determine the color.
-     * A value of 0x1 specifies that red, green, and blue contain an RGB value that will be
-     * matched in the current color palette. This color MUST be solid.
-     */
-    private static final BitField FLAG_PALETTE_RGB   = new BitField(0x02000000);
-
-    /**
-     * A bit that specifies whether the current palette will be used to determine the color.
-     * A value of 0x1 specifies that green and red will be treated as an unsigned 16-bit index into 
-     * the current color palette. This color MAY be dithered. If this value is 0x1, blue MUST be 0x00.
-     */
-    private static final BitField FLAG_PALETTE_INDEX = new BitField(0x01000000);
-    
-    /**
-     * An unsigned integer that specifies the intensity of the blue color channel. A value
-     * of 0x00 has the minimum blue intensity. A value of 0xFF has the maximum blue intensity.
-     */
-    private static final BitField FLAG_BLUE          = new BitField(0x00FF0000);
-    
-    /**
-     * An unsigned integer that specifies the intensity of the green color channel. A value
-     * of 0x00 has the minimum green intensity. A value of 0xFF has the maximum green intensity.
-     */
-    private static final BitField FLAG_GREEN         = new BitField(0x0000FF00);
-    
-    /**
-     * An unsigned integer that specifies the intensity of the red color channel. A value
-     * of 0x00 has the minimum red intensity. A value of 0xFF has the maximum red intensity.
-     */
-    private static final BitField FLAG_RED           = new BitField(0x000000FF);
-    
-    public EscherColorRef(int colorRef) {
-        this.colorRef = colorRef;
-    }
-    
-    public EscherColorRef(byte[] source, int start, int len) {
-        assert(len == 4 || len == 6);
-        
-        int offset = start;
-        if (len == 6) {
-            opid = LittleEndian.getUShort(source, offset);
-            offset += 2;
-        }
-        colorRef = LittleEndian.getInt(source, offset);
-    }
-    
-    public boolean hasSysIndexFlag() {
-        return FLAG_SYS_INDEX.isSet(colorRef);
-    }
-    
-    public void setSysIndexFlag(boolean flag) {
-        colorRef = FLAG_SYS_INDEX.setBoolean(colorRef, flag);
-    }
-    
-    public boolean hasSchemeIndexFlag() {
-        return FLAG_SCHEME_INDEX.isSet(colorRef);
-    }
-    
-    public void setSchemeIndexFlag(boolean flag) {
-        colorRef = FLAG_SCHEME_INDEX.setBoolean(colorRef, flag);
-    }
-    
-    public boolean hasSystemRGBFlag() {
-        return FLAG_SYSTEM_RGB.isSet(colorRef);
-    }
-    
-    public void setSystemRGBFlag(boolean flag) {
-        colorRef = FLAG_SYSTEM_RGB.setBoolean(colorRef, flag);
-    }
-    
-    public boolean hasPaletteRGBFlag() {
-        return FLAG_PALETTE_RGB.isSet(colorRef);
-    }
-    
-    public void setPaletteRGBFlag(boolean flag) {
-        colorRef = FLAG_PALETTE_RGB.setBoolean(colorRef, flag);
-    }
-    
-    public boolean hasPaletteIndexFlag() {
-        return FLAG_PALETTE_INDEX.isSet(colorRef);
-    }
-    
-    public void setPaletteIndexFlag(boolean flag) {
-        colorRef = FLAG_PALETTE_INDEX.setBoolean(colorRef, flag);
-    }
-
-    public int[] getRGB() {
-        int rgb[] = {
-            FLAG_RED.getValue(colorRef),
-            FLAG_GREEN.getValue(colorRef),
-            FLAG_BLUE.getValue(colorRef)
-        };
-        return rgb;
-    }
-    
-    /**
-     * @return {@link SysIndexSource} if {@link #hasSysIndexFlag()} is {@code true}, otherwise null
-     */
-    public SysIndexSource getSysIndexSource() {
-        if (!hasSysIndexFlag()) return null;
-        int val = FLAG_RED.getValue(colorRef);
-        for (SysIndexSource sis : SysIndexSource.values()) {
-            if (sis.value == val) return sis;
-        }
-        return null;
-    }
-    
-    /**
-     * Return the {@link SysIndexProcedure} - for invert flag use {@link #getSysIndexInvert()}
-     * @return {@link SysIndexProcedure} if {@link #hasSysIndexFlag()} is {@code true}, otherwise null
-     */
-    public SysIndexProcedure getSysIndexProcedure() {
-        if (!hasSysIndexFlag()) return null;
-        int val = FLAG_GREEN.getValue(colorRef);
-        for (SysIndexProcedure sip : SysIndexProcedure.values()) {
-            if (sip == SysIndexProcedure.INVERT_AFTER || sip == SysIndexProcedure.INVERT_HIGHBIT_AFTER) continue;
-            if (sip.mask.isSet(val)) return sip;
-        }
-        return null;
-    }
-    
-    /**
-     * @return 0 for no invert flag, 1 for {@link SysIndexProcedure#INVERT_AFTER} and
-     * 2 for {@link SysIndexProcedure#INVERT_HIGHBIT_AFTER} 
-     */
-    public int getSysIndexInvert() {
-        if (!hasSysIndexFlag()) return 0;
-        int val = FLAG_GREEN.getValue(colorRef);
-        if ((SysIndexProcedure.INVERT_AFTER.mask.isSet(val))) return 1;
-        if ((SysIndexProcedure.INVERT_HIGHBIT_AFTER.mask.isSet(val))) return 2;
-        return 0;
-    }
-    
-    /**
-     * @return index of the scheme color or -1 if {@link #hasSchemeIndexFlag()} is {@code false}
-     * 
-     * @see org.apache.poi.hslf.record.ColorSchemeAtom#getColor(int)
-     */
-    public int getSchemeIndex() {
-        if (!hasSchemeIndexFlag()) return -1;
-        return FLAG_RED.getValue(colorRef);
-    }
-    
-    /**
-     * @return index of current palette (color) or -1 if {@link #hasPaletteIndexFlag()} is {@code false}
-     */
-    public int getPaletteIndex() {
-        return (hasPaletteIndexFlag()) ? getIndex() : -1;
-    }
-
-    /**
-     * @return index of system color table or -1 if {@link #hasSysIndexFlag()} is {@code false}
-     * 
-     * @see org.apache.poi.sl.usermodel.PresetColor
-     */
-    public int getSysIndex() {
-        return (hasSysIndexFlag()) ? getIndex() : -1;
-    }
-    
-    private int getIndex() {
-        return (FLAG_GREEN.getValue(colorRef) << 8) | FLAG_RED.getValue(colorRef);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java b/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java
deleted file mode 100644
index 9a84e10..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A complex property differs from a simple property in that the data can not fit inside a 32 bit
- * integer.  See the specification for more detailed information regarding exactly what is
- * stored here.
- */
-public class EscherComplexProperty extends EscherProperty {
-    // TODO - make private and final
-    protected byte[] _complexData;
-
-    /**
-     * Create a complex property using the property id and a byte array containing the complex
-     * data value.
-     *
-     * @param id          The id consists of the property number, a flag indicating whether this is a blip id and a flag
-     *                    indicating that this is a complex property.
-     * @param complexData The value of this property.
-     */
-    public EscherComplexProperty(short id, byte[] complexData) {
-        super(id);
-        if (complexData == null) {
-            throw new IllegalArgumentException("complexData can't be null");
-        }
-        _complexData = complexData.clone();
-    }
-
-    /**
-     * Create a complex property using the property number, a flag to indicate whether this is a
-     * blip reference and the complex property data.
-     *
-     * @param propertyNumber The property number
-     * @param isBlipId       Whether this is a blip id.  Should be false.
-     * @param complexData    The value of this complex property.
-     */
-    public EscherComplexProperty(short propertyNumber, boolean isBlipId, byte[] complexData) {
-        super(propertyNumber, true, isBlipId);
-        if (complexData == null) {
-            throw new IllegalArgumentException("complexData can't be null");
-        }
-        _complexData = complexData.clone();
-    }
-
-    /**
-     * Serializes the simple part of this property.  i.e. the first 6 bytes.
-     */
-    @Override
-    public int serializeSimplePart(byte[] data, int pos) {
-        LittleEndian.putShort(data, pos, getId());
-        LittleEndian.putInt(data, pos + 2, _complexData.length);
-        return 6;
-    }
-
-    /**
-     * Serializes the complex part of this property
-     *
-     * @param data The data array to serialize to
-     * @param pos  The offset within data to start serializing to.
-     * @return The number of bytes serialized.
-     */
-    @Override
-    public int serializeComplexPart(byte[] data, int pos) {
-        System.arraycopy(_complexData, 0, data, pos, _complexData.length);
-        return _complexData.length;
-    }
-
-    /**
-     * Get the complex data value.
-     * 
-     * @return the complex bytes
-     */
-    public byte[] getComplexData() {
-        return _complexData;
-    }
-
-    /**
-     * Determine whether this property is equal to another property.
-     *
-     * @param o The object to compare to.
-     * @return True if the objects are equal.
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || !(o instanceof EscherComplexProperty)) {
-            return false;
-        }
-
-        EscherComplexProperty escherComplexProperty = (EscherComplexProperty) o;
-
-        return Arrays.equals(_complexData, escherComplexProperty._complexData);
-
-    }
-
-    /**
-     * Calculates the number of bytes required to serialize this property.
-     *
-     * @return Number of bytes
-     */
-    @Override
-    public int getPropertySize() {
-        return 6 + _complexData.length;
-    }
-
-    @Override
-    public int hashCode() {
-        return getId() * 11;
-    }
-
-    /**
-     * Retrieves the string representation for this property.
-     */
-    @Override
-    public String toString() {
-        String dataStr = HexDump.toHex( _complexData, 32);
-
-        return "propNum: " + getPropertyNumber()
-                + ", propName: " + EscherProperties.getPropertyName( getPropertyNumber() )
-                + ", complex: " + isComplex()
-                + ", blipId: " + isBlipId()
-                + ", data: " + System.getProperty("line.separator") + dataStr;
-    }
-
-    @Override
-    public String toXml(String tab){
-        return tab + "<" + getClass().getSimpleName() + " id=\"0x" + HexDump.toHex(getId()) +
-                "\" name=\"" + getName() + "\" blipId=\"" +
-                isBlipId() + "\">\n" +
-                tab + "</" + getClass().getSimpleName() + ">\n";
-        //builder.append("\t").append(tab).append(dataStr);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
deleted file mode 100644
index 3b26d42..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.io.PrintWriter;
-import java.util.*;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Escher container records store other escher records as children.
- * The container records themselves never store any information beyond
- * the standard header used by all escher records.  This one record is
- * used to represent many different types of records.
- */
-public final class EscherContainerRecord extends EscherRecord {
-    public static final short DGG_CONTAINER    = (short)0xF000;
-    public static final short BSTORE_CONTAINER = (short)0xF001;
-    public static final short DG_CONTAINER     = (short)0xF002;
-    public static final short SPGR_CONTAINER   = (short)0xF003;
-    public static final short SP_CONTAINER     = (short)0xF004;
-    public static final short SOLVER_CONTAINER = (short)0xF005;
-
-    private static final POILogger log = POILogFactory.getLogger(EscherContainerRecord.class);
-
-    /**
-     * in case if document contains any charts we have such document structure:
-     * BOF
-     * ...
-     * DrawingRecord
-     * ...
-     * ObjRecord|TxtObjRecord
-     * ...
-     * EOF
-     * ...
-     * BOF(Chart begin)
-     * ...
-     * DrawingRecord
-     * ...
-     * ObjRecord|TxtObjRecord
-     * ...
-     * EOF
-     * So, when we call EscherAggregate.createAggregate() we have not all needed data.
-     * When we got warning "WARNING: " + bytesRemaining + " bytes remaining but no space left"
-     * we should save value of bytesRemaining
-     * and add it to container size when we serialize it
-     */
-    private int _remainingLength;
-
-    private final List<EscherRecord> _childRecords = new ArrayList<EscherRecord>();
-
-    @Override
-    public int fillFields(byte[] data, int pOffset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader(data, pOffset);
-        int bytesWritten = 8;
-        int offset = pOffset + 8;
-        while (bytesRemaining > 0 && offset < data.length) {
-            EscherRecord child = recordFactory.createRecord(data, offset);
-            int childBytesWritten = child.fillFields(data, offset, recordFactory);
-            bytesWritten += childBytesWritten;
-            offset += childBytesWritten;
-            bytesRemaining -= childBytesWritten;
-            addChildRecord(child);
-            if (offset >= data.length && bytesRemaining > 0) {
-                _remainingLength = bytesRemaining;
-                if (log.check(POILogger.WARN)) {
-                    log.log(POILogger.WARN, "Not enough Escher data: " + bytesRemaining + " bytes remaining but no space left");
-                }
-            }
-        }
-        return bytesWritten;
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener )
-    {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        LittleEndian.putShort(data, offset, getOptions());
-        LittleEndian.putShort(data, offset+2, getRecordId());
-        int remainingBytes = 0;
-        Iterator<EscherRecord> iterator = _childRecords.iterator();
-        while (iterator.hasNext()) {
-            EscherRecord r = iterator.next();
-            remainingBytes += r.getRecordSize();
-        }
-        remainingBytes += _remainingLength;
-        LittleEndian.putInt(data, offset+4, remainingBytes);
-        int pos = offset+8;
-        iterator = _childRecords.iterator();
-        while (iterator.hasNext()) {
-            EscherRecord r = iterator.next();
-            pos += r.serialize(pos, data, listener );
-        }
-
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        return pos - offset;
-    }
-
-    @Override
-    public int getRecordSize() {
-        int childRecordsSize = 0;
-        Iterator<EscherRecord> iterator = _childRecords.iterator();
-        while (iterator.hasNext()) {
-            EscherRecord r = iterator.next();
-            childRecordsSize += r.getRecordSize();
-        }
-        return 8 + childRecordsSize;
-    }
-
-    /**
-     * Do any of our (top level) children have the given recordId?
-     * 
-     * @param recordId the recordId of the child
-     * 
-     * @return true, if any child has the given recordId
-     */
-    public boolean hasChildOfType(short recordId) {
-        Iterator<EscherRecord> iterator = _childRecords.iterator();
-        while (iterator.hasNext()) {
-            EscherRecord r = iterator.next();
-            if(r.getRecordId() == recordId) {
-                return true;
-            }
-        }
-        return false;
-    }
-    @Override
-    public EscherRecord getChild( int index ) {
-        return _childRecords.get(index);
-    }
-
-    /**
-     * @return a copy of the list of all the child records of the container.
-     */
-    @Override
-    public List<EscherRecord> getChildRecords() {
-        return new ArrayList<EscherRecord>(_childRecords);
-    }
-
-    /**
-     * @return an iterator over the child records
-     */
-    public Iterator<EscherRecord> getChildIterator() {
-        return Collections.unmodifiableList(_childRecords).iterator();
-    }
-
-    /**
-     * replaces the internal child list with the contents of the supplied <tt>childRecords</tt>
-     */
-    @Override
-    public void setChildRecords(List<EscherRecord> childRecords) {
-        if (childRecords == _childRecords) {
-            throw new IllegalStateException("Child records private data member has escaped");
-        }
-        _childRecords.clear();
-        _childRecords.addAll(childRecords);
-    }
-
-    /**
-     * Removes the given escher record from the child list
-     *
-     * @param toBeRemoved the escher record to be removed
-     * @return true, if the record was found and removed
-     */
-    public boolean removeChildRecord(EscherRecord toBeRemoved) {
-        return _childRecords.remove(toBeRemoved);
-    }
-
-
-
-    /**
-     * Returns all of our children which are also
-     * EscherContainers (may be 0, 1, or vary rarely 2 or 3)
-     * 
-     * @return EscherContainer children
-     */
-    public List<EscherContainerRecord> getChildContainers() {
-        List<EscherContainerRecord> containers = new ArrayList<EscherContainerRecord>();
-        Iterator<EscherRecord> iterator = _childRecords.iterator();
-        while (iterator.hasNext()) {
-            EscherRecord r = iterator.next();
-            if(r instanceof EscherContainerRecord) {
-                containers.add((EscherContainerRecord) r);
-            }
-        }
-        return containers;
-    }
-
-    @Override
-    public String getRecordName() {
-        switch (getRecordId()) {
-            case DGG_CONTAINER:
-                return "DggContainer";
-            case BSTORE_CONTAINER:
-                return "BStoreContainer";
-            case DG_CONTAINER:
-                return "DgContainer";
-            case SPGR_CONTAINER:
-                return "SpgrContainer";
-            case SP_CONTAINER:
-                return "SpContainer";
-            case SOLVER_CONTAINER:
-                return "SolverContainer";
-            default:
-                return "Container 0x" + HexDump.toHex(getRecordId());
-        }
-    }
-
-    @Override
-    public void display(PrintWriter w, int indent) {
-        super.display(w, indent);
-        for (Iterator<EscherRecord> iterator = _childRecords.iterator(); iterator.hasNext();)
-        {
-            EscherRecord escherRecord = iterator.next();
-            escherRecord.display(w, indent + 1);
-        }
-    }
-
-    /**
-     * Append a child record
-     *
-     * @param record the record to be added
-     */
-    public void addChildRecord(EscherRecord record) {
-        _childRecords.add(record);
-    }
-
-    /**
-     * Add a child record before the record with given recordId
-     *
-     * @param record the record to be added
-     * @param insertBeforeRecordId the recordId of the next sibling
-     */
-    public void addChildBefore(EscherRecord record, int insertBeforeRecordId) {
-        int idx = 0;
-        for (EscherRecord rec : _childRecords) {
-            if(rec.getRecordId() == (short)insertBeforeRecordId) break;
-            // TODO - keep looping? Do we expect multiple matches?
-            idx++;
-        }
-        _childRecords.add(idx, record);
-    }
-
-    @Override
-    public String toString()
-    {
-        String nl = System.getProperty( "line.separator" );
-
-        StringBuffer children = new StringBuffer();
-        if ( _childRecords.size() > 0 )
-        {
-            children.append( "  children: " + nl );
-
-            int count = 0;
-            for ( Iterator<EscherRecord> iterator = _childRecords.iterator(); iterator
-                    .hasNext(); )
-            {
-                EscherRecord record = iterator.next();
-                children.append( "   Child " + count + ":" + nl );
-                String childResult = String.valueOf( record );
-                childResult = childResult.replaceAll( "\n", "\n    " );
-                children.append( "    " );
-                children.append( childResult );
-                children.append( nl );
-                count++;
-            }
-        }
-
-        return getClass().getName() + " (" + getRecordName() + "):" + nl
-                + "  isContainer: " + isContainerRecord() + nl
-                + "  version: 0x" + HexDump.toHex( getVersion() ) + nl
-                + "  instance: 0x" + HexDump.toHex( getInstance() ) + nl
-                + "  recordId: 0x" + HexDump.toHex( getRecordId() ) + nl
-                + "  numchildren: " + _childRecords.size() + nl
-                + children.toString();
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getRecordName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())));
-        for ( Iterator<EscherRecord> iterator = _childRecords.iterator(); iterator
-                .hasNext(); )
-        {
-            EscherRecord record = iterator.next();
-            builder.append(record.toXml(tab+"\t"));
-        }
-        builder.append(tab).append("</").append(getRecordName()).append(">\n");
-        return builder.toString();
-    }
-
-    public <T extends EscherRecord> T getChildById( short recordId )
-    {
-        for ( EscherRecord childRecord : _childRecords )
-        {
-            if ( childRecord.getRecordId() == recordId )
-            {
-                @SuppressWarnings( "unchecked" )
-                final T result = (T) childRecord;
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Recursively find records with the specified record ID
-     *
-     * @param recordId the recordId to be searched for
-     * @param out - list to store found records
-     */
-    public void getRecordsById(short recordId, List<EscherRecord> out){
-        Iterator<EscherRecord> iterator = _childRecords.iterator();
-        while (iterator.hasNext()) {
-            EscherRecord r = iterator.next();
-            if(r instanceof EscherContainerRecord) {
-                EscherContainerRecord c = (EscherContainerRecord)r;
-                c.getRecordsById(recordId, out );
-            } else if (r.getRecordId() == recordId){
-                out.add(r);
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java
deleted file mode 100644
index 7de76e2..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java
+++ /dev/null
@@ -1,169 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This record simply holds the number of shapes in the drawing group and the
- * last shape id used for this drawing group.
- */
-public class EscherDgRecord
-    extends EscherRecord
-{
-    public static final short RECORD_ID = (short) 0xF008;
-    public static final String RECORD_DESCRIPTION = "MsofbtDg";
-
-    private int field_1_numShapes;
-    private int field_2_lastMSOSPID;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        /*int bytesRemaining =*/ readHeader( data, offset );
-        int pos            = offset + 8;
-        int size           = 0;
-        field_1_numShapes   =  LittleEndian.getInt( data, pos + size );     size += 4;
-        field_2_lastMSOSPID =  LittleEndian.getInt( data, pos + size );     size += 4;
-//        bytesRemaining -= size;
-//        remainingData  =  new byte[bytesRemaining];
-//        System.arraycopy( data, pos + size, remainingData, 0, bytesRemaining );
-        return getRecordSize();
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener )
-    {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        LittleEndian.putInt( data, offset + 4, 8 );
-        LittleEndian.putInt( data, offset + 8, field_1_numShapes );
-        LittleEndian.putInt( data, offset + 12, field_2_lastMSOSPID );
-//        System.arraycopy( remainingData, 0, data, offset + 26, remainingData.length );
-//        int pos = offset + 8 + 18 + remainingData.length;
-
-        listener.afterRecordSerialize( offset + 16, getRecordId(), getRecordSize(), this );
-        return getRecordSize();
-    }
-
-    /**
-     * Returns the number of bytes that are required to serialize this record.
-     *
-     * @return Number of bytes
-     */
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + 8;
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "Dg";
-    }
-
-    /**
-     * Returns the string representation of this record.
-     */
-    @Override
-    public String toString() {
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
-                "  Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
-                "  NumShapes: " + field_1_numShapes + '\n' +
-                "  LastMSOSPID: " + field_2_lastMSOSPID + '\n';
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<NumShapes>").append(field_1_numShapes).append("</NumShapes>\n")
-                .append(tab).append("\t").append("<LastMSOSPID>").append(field_2_lastMSOSPID).append("</LastMSOSPID>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * The number of shapes in this drawing group.
-     * 
-     * @return the number of shapes
-     */
-    public int getNumShapes()
-    {
-        return field_1_numShapes;
-    }
-
-    /**
-     * The number of shapes in this drawing group.
-     * 
-     * @param field_1_numShapes the number of shapes
-     */
-    public void setNumShapes( int field_1_numShapes )
-    {
-        this.field_1_numShapes = field_1_numShapes;
-    }
-
-    /**
-     * The last shape id used in this drawing group.
-     * 
-     * @return the last shape id
-     */
-    public int getLastMSOSPID()
-    {
-        return field_2_lastMSOSPID;
-    }
-
-    /**
-     * The last shape id used in this drawing group.
-     * 
-     * @param field_2_lastMSOSPID the last shape id
-     */
-    public void setLastMSOSPID( int field_2_lastMSOSPID )
-    {
-        this.field_2_lastMSOSPID = field_2_lastMSOSPID;
-    }
-
-    /**
-     * Gets the drawing group id for this record.  This is encoded in the
-     * instance part of the option record.
-     *
-     * @return  a drawing group id.
-     */
-    public short getDrawingGroupId()
-    {
-        return (short) ( getOptions() >> 4 );
-    }
-
-    /**
-     * Increments the number of shapes
-     */
-    public void incrementShapeCount()
-    {
-        this.field_1_numShapes++;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java
deleted file mode 100644
index 5b1b8b7..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.RecordFormatException;
-
-import java.util.*;
-
-/**
- * This record defines the drawing groups used for a particular sheet.
- */
-public final class EscherDggRecord extends EscherRecord {
-    public static final short RECORD_ID = (short) 0xF006;
-    public static final String RECORD_DESCRIPTION = "MsofbtDgg";
-
-    private int field_1_shapeIdMax;
-//    private int field_2_numIdClusters;      // for some reason the number of clusters is actually the real number + 1
-    private int field_3_numShapesSaved;
-    private int field_4_drawingsSaved;
-    private FileIdCluster[] field_5_fileIdClusters;
-    private int maxDgId;
-
-    public static class FileIdCluster
-    {
-        public FileIdCluster( int drawingGroupId, int numShapeIdsUsed )
-        {
-            this.field_1_drawingGroupId = drawingGroupId;
-            this.field_2_numShapeIdsUsed = numShapeIdsUsed;
-        }
-
-        private int field_1_drawingGroupId;
-        private int field_2_numShapeIdsUsed;
-
-        public int getDrawingGroupId()
-        {
-            return field_1_drawingGroupId;
-        }
-
-        public int getNumShapeIdsUsed()
-        {
-            return field_2_numShapeIdsUsed;
-        }
-
-        public void incrementShapeId( )
-        {
-            this.field_2_numShapeIdsUsed++;
-        }
-    }
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        int pos            = offset + 8;
-        int size           = 0;
-        field_1_shapeIdMax     =  LittleEndian.getInt( data, pos + size );size+=4;
-        // field_2_numIdClusters = LittleEndian.getInt( data, pos + size );
-        size+=4; 
-        field_3_numShapesSaved =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_4_drawingsSaved  =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_5_fileIdClusters = new FileIdCluster[(bytesRemaining-size) / 8];  // Can't rely on field_2_numIdClusters
-        for (int i = 0; i < field_5_fileIdClusters.length; i++)
-        {
-            field_5_fileIdClusters[i] = new FileIdCluster(LittleEndian.getInt( data, pos + size ), LittleEndian.getInt( data, pos + size + 4 ));
-            maxDgId = Math.max(maxDgId, field_5_fileIdClusters[i].getDrawingGroupId());
-            size += 8;
-        }
-        bytesRemaining         -= size;
-        if (bytesRemaining != 0)
-            throw new RecordFormatException("Expecting no remaining data but got " + bytesRemaining + " byte(s).");
-        return 8 + size + bytesRemaining;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        int pos = offset;
-        LittleEndian.putShort( data, pos, getOptions() );     pos += 2;
-        LittleEndian.putShort( data, pos, getRecordId() );    pos += 2;
-        int remainingBytes = getRecordSize() - 8;
-        LittleEndian.putInt( data, pos, remainingBytes );              pos += 4;
-
-        LittleEndian.putInt( data, pos, field_1_shapeIdMax );          pos += 4;
-        LittleEndian.putInt( data, pos, getNumIdClusters() );          pos += 4;
-        LittleEndian.putInt( data, pos, field_3_numShapesSaved );      pos += 4;
-        LittleEndian.putInt( data, pos, field_4_drawingsSaved );       pos += 4;
-        for (int i = 0; i < field_5_fileIdClusters.length; i++) {
-            LittleEndian.putInt( data, pos, field_5_fileIdClusters[i].field_1_drawingGroupId );   pos += 4;
-            LittleEndian.putInt( data, pos, field_5_fileIdClusters[i].field_2_numShapeIdsUsed );  pos += 4;
-        }
-
-        listener.afterRecordSerialize( pos, getRecordId(), getRecordSize(), this );
-        return getRecordSize();
-    }
-
-    @Override
-    public int getRecordSize() {
-        return 8 + 16 + (8 * field_5_fileIdClusters.length);
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "Dgg";
-    }
-
-    @Override
-    public String toString() {
-
-        StringBuilder field_5_string = new StringBuilder();
-        if(field_5_fileIdClusters != null) for (int i = 0; i < field_5_fileIdClusters.length; i++) {
-            field_5_string.append("  DrawingGroupId").append(i+1).append(": ");
-            field_5_string.append(field_5_fileIdClusters[i].field_1_drawingGroupId);
-            field_5_string.append('\n');
-            field_5_string.append("  NumShapeIdsUsed").append(i+1).append(": ");
-            field_5_string.append(field_5_fileIdClusters[i].field_2_numShapeIdsUsed);
-            field_5_string.append('\n');
-        }
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
-                "  Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
-                "  ShapeIdMax: " + field_1_shapeIdMax + '\n' +
-                "  NumIdClusters: " + getNumIdClusters() + '\n' +
-                "  NumShapesSaved: " + field_3_numShapesSaved + '\n' +
-                "  DrawingsSaved: " + field_4_drawingsSaved + '\n' +
-                "" + field_5_string.toString();
-
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<ShapeIdMax>").append(field_1_shapeIdMax).append("</ShapeIdMax>\n")
-                .append(tab).append("\t").append("<NumIdClusters>").append(getNumIdClusters()).append("</NumIdClusters>\n")
-                .append(tab).append("\t").append("<NumShapesSaved>").append(field_3_numShapesSaved).append("</NumShapesSaved>\n")
-                .append(tab).append("\t").append("<DrawingsSaved>").append(field_4_drawingsSaved).append("</DrawingsSaved>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * Gets the next available shape id
-     *
-     * @return the next available shape id
-     */
-    public int getShapeIdMax() {
-        return field_1_shapeIdMax;
-    }
-
-    /**
-     * The maximum is actually the next available shape id.
-     * 
-     * @param shapeIdMax the next available shape id
-     */
-    public void setShapeIdMax(int shapeIdMax) {
-        this.field_1_shapeIdMax = shapeIdMax;
-    }
-
-    /**
-     * Number of id clusters + 1
-     * 
-     * @return the number of id clusters + 1
-     */
-    public int getNumIdClusters() {
-        return (field_5_fileIdClusters == null ? 0 : (field_5_fileIdClusters.length + 1));
-    }
-
-    /**
-     * Gets the number of shapes saved
-     *
-     * @return the number of shapes saved
-     */
-    public int getNumShapesSaved() {
-        return field_3_numShapesSaved;
-    }
-
-    /**
-     * Sets the number of shapes saved
-     * 
-     * @param numShapesSaved the number of shapes saved
-     */
-    public void setNumShapesSaved(int numShapesSaved) {
-        this.field_3_numShapesSaved = numShapesSaved;
-    }
-
-    /**
-     * Gets the number of drawings saved
-     *
-     * @return the number of drawings saved
-     */
-    public int getDrawingsSaved() {
-        return field_4_drawingsSaved;
-    }
-
-    /**
-     * Sets the number of drawings saved
-     *
-     * @param drawingsSaved the number of drawings saved
-     */
-    public void setDrawingsSaved(int drawingsSaved) {
-        this.field_4_drawingsSaved = drawingsSaved;
-    }
-
-    /**
-     * Gets the maximum drawing group ID
-     * 
-     * @return The maximum drawing group ID
-     */
-    public int getMaxDrawingGroupId() {
-        return maxDgId;
-    }
-
-    /**
-     * Sets the maximum drawing group ID
-     * 
-     * @param id the maximum drawing group ID
-     */
-    public void setMaxDrawingGroupId(int id) {
-        maxDgId = id;
-    }
-
-    /**
-     * @return the file id clusters
-     */
-    public FileIdCluster[] getFileIdClusters() {
-        return field_5_fileIdClusters;
-    }
-
-    /**
-     * Sets the file id clusters
-     *
-     * @param fileIdClusters the file id clusters
-     */
-    public void setFileIdClusters(FileIdCluster[] fileIdClusters) {
-        this.field_5_fileIdClusters = fileIdClusters.clone();
-    }
-
-    
-    /**
-     * Add a new cluster
-     *
-     * @param dgId  id of the drawing group (stored in the record options)
-     * @param numShapedUsed initial value of the numShapedUsed field
-     */
-    public void addCluster(int dgId, int numShapedUsed) {
-        addCluster(dgId, numShapedUsed, true);
-    }
-
-    /**
-     * Add a new cluster
-     *
-     * @param dgId  id of the drawing group (stored in the record options)
-     * @param numShapedUsed initial value of the numShapedUsed field
-     * @param sort if true then sort clusters by drawing group id.(
-     *  In Excel the clusters are sorted but in PPT they are not)
-     */
-    public void addCluster( int dgId, int numShapedUsed, boolean sort ) {
-        List<FileIdCluster> clusters = new ArrayList<FileIdCluster>(Arrays.asList(field_5_fileIdClusters));
-        clusters.add(new FileIdCluster(dgId, numShapedUsed));
-        if(sort) Collections.sort(clusters, MY_COMP );
-        maxDgId = Math.min(maxDgId, dgId);
-        field_5_fileIdClusters = clusters.toArray( new FileIdCluster[clusters.size()] );
-    }
-
-    private static final Comparator<FileIdCluster> MY_COMP = new Comparator<FileIdCluster>() {
-        @Override
-        public int compare(FileIdCluster f1, FileIdCluster f2) {
-            if (f1.getDrawingGroupId() == f2.getDrawingGroupId()) {
-                return 0;
-            }
-            if (f1.getDrawingGroupId() < f2.getDrawingGroupId()) {
-                return -1;
-            }
-            return +1;
-        }
-    };
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherDump.java b/trunk/src/java/org/apache/poi/ddf/EscherDump.java
deleted file mode 100644
index 45905c9..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherDump.java
+++ /dev/null
@@ -1,924 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndian;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.zip.InflaterInputStream;
-
-/**
- * Used to dump the contents of escher records to a PrintStream.
- */
-public final class EscherDump {
-
-    public EscherDump() {
-        //
-    }
-
-    /**
-     * Decodes the escher stream from a byte array and dumps the results to
-     * a print stream.
-     *
-     * @param data      The data array containing the escher records.
-     * @param offset    The starting offset within the data array.
-     * @param size      The number of bytes to read.
-     * @param out       The output stream to write the results to.
-     *
-     */
-    public void dump(byte[] data, int offset, int size, PrintStream out) {
-        EscherRecordFactory recordFactory = new DefaultEscherRecordFactory();
-        int pos = offset;
-        while ( pos < offset + size )
-        {
-            EscherRecord r = recordFactory.createRecord(data, pos);
-            int bytesRead = r.fillFields(data, pos, recordFactory );
-            out.println( r.toString() );
-            pos += bytesRead;
-        }
-    }
-
-    /**
-     * This version of dump is a translation from the open office escher dump routine.
-     *
-     * @param maxLength The number of bytes to read
-     * @param in        An input stream to read from.
-     * @param out       An output stream to write to.
-     * 
-     * @throws IOException if the data can't be read or written 
-     * @throws LittleEndian.BufferUnderrunException if an buffer underrun occurs  
-     */
-    public void dumpOld(long maxLength, InputStream in, PrintStream out)
-            throws IOException, LittleEndian.BufferUnderrunException {
-        long remainingBytes = maxLength;
-        short options;      // 4 bits for the version and 12 bits for the instance
-        short recordId;
-        int recordBytesRemaining;       // including enclosing records
-        short nDumpSize;
-        String recordName;
-
-        boolean atEOF = false;
-
-        while (!atEOF && (remainingBytes > 0)) {
-            options = LittleEndian.readShort( in );
-            recordId = LittleEndian.readShort( in );
-            recordBytesRemaining = LittleEndian.readInt( in );
-
-            remainingBytes -= 2 + 2 + 4;
-
-            switch ( recordId )
-            {
-                case (short) 0xF000:
-                    recordName = "MsofbtDggContainer";
-                    break;
-                case (short) 0xF006:
-                    recordName = "MsofbtDgg";
-                    break;
-                case (short) 0xF016:
-                    recordName = "MsofbtCLSID";
-                    break;
-                case (short) 0xF00B:
-                    recordName = "MsofbtOPT";
-                    break;
-                case (short) 0xF11A:
-                    recordName = "MsofbtColorMRU";
-                    break;
-                case (short) 0xF11E:
-                    recordName = "MsofbtSplitMenuColors";
-                    break;
-                case (short) 0xF001:
-                    recordName = "MsofbtBstoreContainer";
-                    break;
-                case (short) 0xF007:
-                    recordName = "MsofbtBSE";
-                    break;
-                case (short) 0xF002:
-                    recordName = "MsofbtDgContainer";
-                    break;
-                case (short) 0xF008:
-                    recordName = "MsofbtDg";
-                    break;
-                case (short) 0xF118:
-                    recordName = "MsofbtRegroupItem";
-                    break;
-                case (short) 0xF120:
-                    recordName = "MsofbtColorScheme";
-                    break;
-                case (short) 0xF003:
-                    recordName = "MsofbtSpgrContainer";
-                    break;
-                case (short) 0xF004:
-                    recordName = "MsofbtSpContainer";
-                    break;
-                case (short) 0xF009:
-                    recordName = "MsofbtSpgr";
-                    break;
-                case (short) 0xF00A:
-                    recordName = "MsofbtSp";
-                    break;
-                case (short) 0xF00C:
-                    recordName = "MsofbtTextbox";
-                    break;
-                case (short) 0xF00D:
-                    recordName = "MsofbtClientTextbox";
-                    break;
-                case (short) 0xF00E:
-                    recordName = "MsofbtAnchor";
-                    break;
-                case (short) 0xF00F:
-                    recordName = "MsofbtChildAnchor";
-                    break;
-                case (short) 0xF010:
-                    recordName = "MsofbtClientAnchor";
-                    break;
-                case (short) 0xF011:
-                    recordName = "MsofbtClientData";
-                    break;
-                case (short) 0xF11F:
-                    recordName = "MsofbtOleObject";
-                    break;
-                case (short) 0xF11D:
-                    recordName = "MsofbtDeletedPspl";
-                    break;
-                case (short) 0xF005:
-                    recordName = "MsofbtSolverContainer";
-                    break;
-                case (short) 0xF012:
-                    recordName = "MsofbtConnectorRule";
-                    break;
-                case (short) 0xF013:
-                    recordName = "MsofbtAlignRule";
-                    break;
-                case (short) 0xF014:
-                    recordName = "MsofbtArcRule";
-                    break;
-                case (short) 0xF015:
-                    recordName = "MsofbtClientRule";
-                    break;
-                case (short) 0xF017:
-                    recordName = "MsofbtCalloutRule";
-                    break;
-                case (short) 0xF119:
-                    recordName = "MsofbtSelection";
-                    break;
-                case (short) 0xF122:
-                    recordName = "MsofbtUDefProp";
-                    break;
-                default:
-                    if ( recordId >= (short) 0xF018 && recordId <= (short) 0xF117 )
-                        recordName = "MsofbtBLIP";
-                    else if ( ( options & (short) 0x000F ) == (short) 0x000F )
-                        recordName = "UNKNOWN container";
-                    else
-                        recordName = "UNKNOWN ID";
-            }
-
-            StringBuilder stringBuf = new StringBuilder();
-            stringBuf.append( "  " );
-            stringBuf.append( HexDump.toHex( recordId ) );
-            stringBuf.append( "  " ).append( recordName ).append( " [" );
-            stringBuf.append( HexDump.toHex( options ) );
-            stringBuf.append( ',' );
-            stringBuf.append( HexDump.toHex( recordBytesRemaining ) );
-            stringBuf.append( "]  instance: " );
-            stringBuf.append( HexDump.toHex( ( (short) ( options >> 4 ) ) ) );
-            out.println( stringBuf.toString() );
-            stringBuf.setLength(0);
-
-
-            if ( recordId == (short) 0xF007 && 36 <= remainingBytes && 36 <= recordBytesRemaining )
-            {	// BSE, FBSE
-                //                ULONG nP = pIn->GetRecPos();
-
-                byte n8;
-                //                short n16;
-                //                int n32;
-
-                stringBuf = stringBuf.append( "    btWin32: " );
-                n8 = (byte) in.read();
-                stringBuf.append( HexDump.toHex( n8 ) );
-                stringBuf.append( getBlipType( n8 ) );
-                stringBuf.append( "  btMacOS: " );
-                n8 = (byte) in.read();
-                stringBuf.append( HexDump.toHex( n8 ) );
-                stringBuf.append( getBlipType( n8 ) );
-                out.println( stringBuf.toString() );
-
-                out.println( "    rgbUid:" );
-                HexDump.dump( in, out, 0, 16 );
-
-                out.print( "    tag: " );
-                outHex( 2, in, out );
-                out.println();
-                out.print( "    size: " );
-                outHex( 4, in, out );
-                out.println();
-                out.print( "    cRef: " );
-                outHex( 4, in, out );
-                out.println();
-                out.print( "    offs: " );
-                outHex( 4, in, out );
-                out.println();
-                out.print( "    usage: " );
-                outHex( 1, in, out );
-                out.println();
-                out.print( "    cbName: " );
-                outHex( 1, in, out );
-                out.println();
-                out.print( "    unused2: " );
-                outHex( 1, in, out );
-                out.println();
-                out.print( "    unused3: " );
-                outHex( 1, in, out );
-                out.println();
-
-                // subtract the number of bytes we've read
-                remainingBytes -= 36;
-                //n -= pIn->GetRecPos() - nP;
-                recordBytesRemaining = 0;		// loop to MsofbtBLIP
-            }
-            else if ( recordId == (short) 0xF010 && 0x12 <= remainingBytes && 0x12 <= recordBytesRemaining )
-            {	// ClientAnchor
-                //ULONG nP = pIn->GetRecPos();
-                //                short n16;
-
-                out.print( "    Flag: " );
-                outHex( 2, in, out );
-                out.println();
-                out.print( "    Col1: " );
-                outHex( 2, in, out );
-                out.print( "    dX1: " );
-                outHex( 2, in, out );
-                out.print( "    Row1: " );
-                outHex( 2, in, out );
-                out.print( "    dY1: " );
-                outHex( 2, in, out );
-                out.println();
-                out.print( "    Col2: " );
-                outHex( 2, in, out );
-                out.print( "    dX2: " );
-                outHex( 2, in, out );
-                out.print( "    Row2: " );
-                outHex( 2, in, out );
-                out.print( "    dY2: " );
-                outHex( 2, in, out );
-                out.println();
-
-                remainingBytes -= 18;
-                recordBytesRemaining -= 18;
-
-            }
-            else if ( recordId == (short) 0xF00B || recordId == (short) 0xF122 )
-            {	// OPT
-                int nComplex = 0;
-                out.println( "    PROPID        VALUE" );
-                while ( recordBytesRemaining >= 6 + nComplex && remainingBytes >= 6 + nComplex )
-                {
-                    short n16;
-                    int n32;
-                    n16 = LittleEndian.readShort( in );
-                    n32 = LittleEndian.readInt( in );
-
-                    recordBytesRemaining -= 6;
-                    remainingBytes -= 6;
-                    out.print( "    " );
-                    out.print( HexDump.toHex( n16 ) );
-                    out.print( " (" );
-                    int propertyId = n16 & (short) 0x3FFF;
-                    out.print( " " + propertyId  );
-                    if ( ( n16 & (short) 0x8000 ) == 0 )
-                    {
-                        if ( ( n16 & (short) 0x4000 ) != 0 )
-                            out.print( ", fBlipID" );
-                        out.print( ")  " );
-
-                        out.print( HexDump.toHex( n32 ) );
-
-                        if ( ( n16 & (short) 0x4000 ) == 0 )
-                        {
-                            out.print( " (" );
-                            out.print( dec1616( n32 ) );
-                            out.print( ')' );
-                            out.print( " {" + propName( (short)propertyId ) + "}" );
-                        }
-                        out.println();
-                    }
-                    else
-                    {
-                        out.print( ", fComplex)  " );
-                        out.print( HexDump.toHex( n32 ) );
-                        out.print( " - Complex prop len" );
-                        out.println( " {" + propName( (short)propertyId ) + "}" );
-
-                        nComplex += n32;
-                    }
-
-                }
-                // complex property data
-                while ( ( nComplex & remainingBytes ) > 0 )
-                {
-                    nDumpSize = ( nComplex > (int) remainingBytes ) ? (short) remainingBytes : (short) nComplex;
-                    HexDump.dump( in, out, 0, nDumpSize );
-                    nComplex -= nDumpSize;
-                    recordBytesRemaining -= nDumpSize;
-                    remainingBytes -= nDumpSize;
-                }
-            }
-            else if ( recordId == (short) 0xF012 )
-            {
-                out.print( "    Connector rule: " );
-                out.print( LittleEndian.readInt( in ) );
-                out.print( "    ShapeID A: " );
-                out.print( LittleEndian.readInt( in ) );
-                out.print( "   ShapeID B: " );
-                out.print( LittleEndian.readInt( in ) );
-                out.print( "    ShapeID connector: " );
-                out.print( LittleEndian.readInt( in ) );
-                out.print( "   Connect pt A: " );
-                out.print( LittleEndian.readInt( in ) );
-                out.print( "   Connect pt B: " );
-                out.println( LittleEndian.readInt( in ) );
-
-                recordBytesRemaining -= 24;
-                remainingBytes -= 24;
-            }
-            else if ( recordId >= (short) 0xF018 && recordId < (short) 0xF117 )
-            {
-                out.println( "    Secondary UID: " );
-                HexDump.dump( in, out, 0, 16 );
-                out.println( "    Cache of size: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    Boundary top: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    Boundary left: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    Boundary width: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    Boundary height: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    X: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    Y: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    Cache of saved size: " + HexDump.toHex( LittleEndian.readInt( in ) ) );
-                out.println( "    Compression Flag: " + HexDump.toHex( (byte) in.read() ) );
-                out.println( "    Filter: " + HexDump.toHex( (byte) in.read() ) );
-                out.println( "    Data (after decompression): " );
-
-                recordBytesRemaining -= 34 + 16;
-                remainingBytes -= 34 + 16;
-
-                nDumpSize = ( recordBytesRemaining > (int) remainingBytes ) ? (short) remainingBytes : (short) recordBytesRemaining;
-
-
-                byte[] buf = new byte[nDumpSize];
-                int read = in.read( buf );
-                while ( read != -1 && read < nDumpSize )
-                    read += in.read( buf, read, buf.length );
-                ByteArrayInputStream bin = new ByteArrayInputStream( buf );
-
-                InputStream in1 = new InflaterInputStream( bin );
-                int bytesToDump = -1;
-                HexDump.dump( in1, out, 0, bytesToDump );
-
-                recordBytesRemaining -= nDumpSize;
-                remainingBytes -= nDumpSize;
-
-            }
-
-            boolean isContainer = ( options & (short) 0x000F ) == (short) 0x000F;
-            if ( isContainer && remainingBytes >= 0 )
-            {	// Container
-                if ( recordBytesRemaining <= (int) remainingBytes )
-                    out.println( "            completed within" );
-                else
-                    out.println( "            continued elsewhere" );
-            }
-            else if ( remainingBytes >= 0 )
-            // -> 0x0000 ... 0x0FFF
-            {
-                nDumpSize = ( recordBytesRemaining > (int) remainingBytes ) ? (short) remainingBytes : (short) recordBytesRemaining;
-
-                if ( nDumpSize != 0 )
-                {
-                    HexDump.dump( in, out, 0, nDumpSize );
-                    remainingBytes -= nDumpSize;
-                }
-            }
-            else
-                out.println( " >> OVERRUN <<" );
-        }
-
-    }
-
-    /**
-     * Returns a property name given a property id.  This is used only by the
-     * old escher dump routine.
-     *
-     * @param propertyId    The property number for the name
-     * @return  A descriptive name.
-     */
-    private String propName(short propertyId) {
-        final class PropName {
-            final int _id;
-            final String _name;
-            public PropName(int id, String name) {
-                _id = id;
-                _name = name;
-            }
-        }
-
-        final PropName[] props = new PropName[] {
-            new PropName(4, "transform.rotation"),
-            new PropName(119, "protection.lockrotation"),
-            new PropName(120, "protection.lockaspectratio"),
-            new PropName(121, "protection.lockposition"),
-            new PropName(122, "protection.lockagainstselect"),
-            new PropName(123, "protection.lockcropping"),
-            new PropName(124, "protection.lockvertices"),
-            new PropName(125, "protection.locktext"),
-            new PropName(126, "protection.lockadjusthandles"),
-            new PropName(127, "protection.lockagainstgrouping"),
-            new PropName(128, "text.textid"),
-            new PropName(129, "text.textleft"),
-            new PropName(130, "text.texttop"),
-            new PropName(131, "text.textright"),
-            new PropName(132, "text.textbottom"),
-            new PropName(133, "text.wraptext"),
-            new PropName(134, "text.scaletext"),
-            new PropName(135, "text.anchortext"),
-            new PropName(136, "text.textflow"),
-            new PropName(137, "text.fontrotation"),
-            new PropName(138, "text.idofnextshape"),
-            new PropName(139, "text.bidir"),
-            new PropName(187, "text.singleclickselects"),
-            new PropName(188, "text.usehostmargins"),
-            new PropName(189, "text.rotatetextwithshape"),
-            new PropName(190, "text.sizeshapetofittext"),
-            new PropName(191, "text.sizetexttofitshape"),
-            new PropName(192, "geotext.unicode"),
-            new PropName(193, "geotext.rtftext"),
-            new PropName(194, "geotext.alignmentoncurve"),
-            new PropName(195, "geotext.defaultpointsize"),
-            new PropName(196, "geotext.textspacing"),
-            new PropName(197, "geotext.fontfamilyname"),
-            new PropName(240, "geotext.reverseroworder"),
-            new PropName(241, "geotext.hastexteffect"),
-            new PropName(242, "geotext.rotatecharacters"),
-            new PropName(243, "geotext.kerncharacters"),
-            new PropName(244, "geotext.tightortrack"),
-            new PropName(245, "geotext.stretchtofitshape"),
-            new PropName(246, "geotext.charboundingbox"),
-            new PropName(247, "geotext.scaletextonpath"),
-            new PropName(248, "geotext.stretchcharheight"),
-            new PropName(249, "geotext.nomeasurealongpath"),
-            new PropName(250, "geotext.boldfont"),
-            new PropName(251, "geotext.italicfont"),
-            new PropName(252, "geotext.underlinefont"),
-            new PropName(253, "geotext.shadowfont"),
-            new PropName(254, "geotext.smallcapsfont"),
-            new PropName(255, "geotext.strikethroughfont"),
-            new PropName(256, "blip.cropfromtop"),
-            new PropName(257, "blip.cropfrombottom"),
-            new PropName(258, "blip.cropfromleft"),
-            new PropName(259, "blip.cropfromright"),
-            new PropName(260, "blip.bliptodisplay"),
-            new PropName(261, "blip.blipfilename"),
-            new PropName(262, "blip.blipflags"),
-            new PropName(263, "blip.transparentcolor"),
-            new PropName(264, "blip.contrastsetting"),
-            new PropName(265, "blip.brightnesssetting"),
-            new PropName(266, "blip.gamma"),
-            new PropName(267, "blip.pictureid"),
-            new PropName(268, "blip.doublemod"),
-            new PropName(269, "blip.picturefillmod"),
-            new PropName(270, "blip.pictureline"),
-            new PropName(271, "blip.printblip"),
-            new PropName(272, "blip.printblipfilename"),
-            new PropName(273, "blip.printflags"),
-            new PropName(316, "blip.nohittestpicture"),
-            new PropName(317, "blip.picturegray"),
-            new PropName(318, "blip.picturebilevel"),
-            new PropName(319, "blip.pictureactive"),
-            new PropName(320, "geometry.left"),
-            new PropName(321, "geometry.top"),
-            new PropName(322, "geometry.right"),
-            new PropName(323, "geometry.bottom"),
-            new PropName(324, "geometry.shapepath"),
-            new PropName(325, "geometry.vertices"),
-            new PropName(326, "geometry.segmentinfo"),
-            new PropName(327, "geometry.adjustvalue"),
-            new PropName(328, "geometry.adjust2value"),
-            new PropName(329, "geometry.adjust3value"),
-            new PropName(330, "geometry.adjust4value"),
-            new PropName(331, "geometry.adjust5value"),
-            new PropName(332, "geometry.adjust6value"),
-            new PropName(333, "geometry.adjust7value"),
-            new PropName(334, "geometry.adjust8value"),
-            new PropName(335, "geometry.adjust9value"),
-            new PropName(336, "geometry.adjust10value"),
-            new PropName(378, "geometry.shadowOK"),
-            new PropName(379, "geometry.3dok"),
-            new PropName(380, "geometry.lineok"),
-            new PropName(381, "geometry.geotextok"),
-            new PropName(382, "geometry.fillshadeshapeok"),
-            new PropName(383, "geometry.fillok"),
-            new PropName(384, "fill.filltype"),
-            new PropName(385, "fill.fillcolor"),
-            new PropName(386, "fill.fillopacity"),
-            new PropName(387, "fill.fillbackcolor"),
-            new PropName(388, "fill.backopacity"),
-            new PropName(389, "fill.crmod"),
-            new PropName(390, "fill.patterntexture"),
-            new PropName(391, "fill.blipfilename"),
-            new PropName(392, "fill.blipflags"),
-            new PropName(393, "fill.width"),
-            new PropName(394, "fill.height"),
-            new PropName(395, "fill.angle"),
-            new PropName(396, "fill.focus"),
-            new PropName(397, "fill.toleft"),
-            new PropName(398, "fill.totop"),
-            new PropName(399, "fill.toright"),
-            new PropName(400, "fill.tobottom"),
-            new PropName(401, "fill.rectleft"),
-            new PropName(402, "fill.recttop"),
-            new PropName(403, "fill.rectright"),
-            new PropName(404, "fill.rectbottom"),
-            new PropName(405, "fill.dztype"),
-            new PropName(406, "fill.shadepreset"),
-            new PropName(407, "fill.shadecolors"),
-            new PropName(408, "fill.originx"),
-            new PropName(409, "fill.originy"),
-            new PropName(410, "fill.shapeoriginx"),
-            new PropName(411, "fill.shapeoriginy"),
-            new PropName(412, "fill.shadetype"),
-            new PropName(443, "fill.filled"),
-            new PropName(444, "fill.hittestfill"),
-            new PropName(445, "fill.shape"),
-            new PropName(446, "fill.userect"),
-            new PropName(447, "fill.nofillhittest"),
-            new PropName(448, "linestyle.color"),
-            new PropName(449, "linestyle.opacity"),
-            new PropName(450, "linestyle.backcolor"),
-            new PropName(451, "linestyle.crmod"),
-            new PropName(452, "linestyle.linetype"),
-            new PropName(453, "linestyle.fillblip"),
-            new PropName(454, "linestyle.fillblipname"),
-            new PropName(455, "linestyle.fillblipflags"),
-            new PropName(456, "linestyle.fillwidth"),
-            new PropName(457, "linestyle.fillheight"),
-            new PropName(458, "linestyle.filldztype"),
-            new PropName(459, "linestyle.linewidth"),
-            new PropName(460, "linestyle.linemiterlimit"),
-            new PropName(461, "linestyle.linestyle"),
-            new PropName(462, "linestyle.linedashing"),
-            new PropName(463, "linestyle.linedashstyle"),
-            new PropName(464, "linestyle.linestartarrowhead"),
-            new PropName(465, "linestyle.lineendarrowhead"),
-            new PropName(466, "linestyle.linestartarrowwidth"),
-            new PropName(467, "linestyle.lineestartarrowlength"),
-            new PropName(468, "linestyle.lineendarrowwidth"),
-            new PropName(469, "linestyle.lineendarrowlength"),
-            new PropName(470, "linestyle.linejoinstyle"),
-            new PropName(471, "linestyle.lineendcapstyle"),
-            new PropName(507, "linestyle.arrowheadsok"),
-            new PropName(508, "linestyle.anyline"),
-            new PropName(509, "linestyle.hitlinetest"),
-            new PropName(510, "linestyle.linefillshape"),
-            new PropName(511, "linestyle.nolinedrawdash"),
-            new PropName(512, "shadowstyle.type"),
-            new PropName(513, "shadowstyle.color"),
-            new PropName(514, "shadowstyle.highlight"),
-            new PropName(515, "shadowstyle.crmod"),
-            new PropName(516, "shadowstyle.opacity"),
-            new PropName(517, "shadowstyle.offsetx"),
-            new PropName(518, "shadowstyle.offsety"),
-            new PropName(519, "shadowstyle.secondoffsetx"),
-            new PropName(520, "shadowstyle.secondoffsety"),
-            new PropName(521, "shadowstyle.scalextox"),
-            new PropName(522, "shadowstyle.scaleytox"),
-            new PropName(523, "shadowstyle.scalextoy"),
-            new PropName(524, "shadowstyle.scaleytoy"),
-            new PropName(525, "shadowstyle.perspectivex"),
-            new PropName(526, "shadowstyle.perspectivey"),
-            new PropName(527, "shadowstyle.weight"),
-            new PropName(528, "shadowstyle.originx"),
-            new PropName(529, "shadowstyle.originy"),
-            new PropName(574, "shadowstyle.shadow"),
-            new PropName(575, "shadowstyle.shadowobsured"),
-            new PropName(576, "perspective.type"),
-            new PropName(577, "perspective.offsetx"),
-            new PropName(578, "perspective.offsety"),
-            new PropName(579, "perspective.scalextox"),
-            new PropName(580, "perspective.scaleytox"),
-            new PropName(581, "perspective.scalextoy"),
-            new PropName(582, "perspective.scaleytox"),
-            new PropName(583, "perspective.perspectivex"),
-            new PropName(584, "perspective.perspectivey"),
-            new PropName(585, "perspective.weight"),
-            new PropName(586, "perspective.originx"),
-            new PropName(587, "perspective.originy"),
-            new PropName(639, "perspective.perspectiveon"),
-            new PropName(640, "3d.specularamount"),
-            new PropName(661, "3d.diffuseamount"),
-            new PropName(662, "3d.shininess"),
-            new PropName(663, "3d.edgethickness"),
-            new PropName(664, "3d.extrudeforward"),
-            new PropName(665, "3d.extrudebackward"),
-            new PropName(666, "3d.extrudeplane"),
-            new PropName(667, "3d.extrusioncolor"),
-            new PropName(648, "3d.crmod"),
-            new PropName(700, "3d.3deffect"),
-            new PropName(701, "3d.metallic"),
-            new PropName(702, "3d.useextrusioncolor"),
-            new PropName(703, "3d.lightface"),
-            new PropName(704, "3dstyle.yrotationangle"),
-            new PropName(705, "3dstyle.xrotationangle"),
-            new PropName(706, "3dstyle.rotationaxisx"),
-            new PropName(707, "3dstyle.rotationaxisy"),
-            new PropName(708, "3dstyle.rotationaxisz"),
-            new PropName(709, "3dstyle.rotationangle"),
-            new PropName(710, "3dstyle.rotationcenterx"),
-            new PropName(711, "3dstyle.rotationcentery"),
-            new PropName(712, "3dstyle.rotationcenterz"),
-            new PropName(713, "3dstyle.rendermode"),
-            new PropName(714, "3dstyle.tolerance"),
-            new PropName(715, "3dstyle.xviewpoint"),
-            new PropName(716, "3dstyle.yviewpoint"),
-            new PropName(717, "3dstyle.zviewpoint"),
-            new PropName(718, "3dstyle.originx"),
-            new PropName(719, "3dstyle.originy"),
-            new PropName(720, "3dstyle.skewangle"),
-            new PropName(721, "3dstyle.skewamount"),
-            new PropName(722, "3dstyle.ambientintensity"),
-            new PropName(723, "3dstyle.keyx"),
-            new PropName(724, "3dstyle.keyy"),
-            new PropName(725, "3dstyle.keyz"),
-            new PropName(726, "3dstyle.keyintensity"),
-            new PropName(727, "3dstyle.fillx"),
-            new PropName(728, "3dstyle.filly"),
-            new PropName(729, "3dstyle.fillz"),
-            new PropName(730, "3dstyle.fillintensity"),
-            new PropName(763, "3dstyle.constrainrotation"),
-            new PropName(764, "3dstyle.rotationcenterauto"),
-            new PropName(765, "3dstyle.parallel"),
-            new PropName(766, "3dstyle.keyharsh"),
-            new PropName(767, "3dstyle.fillharsh"),
-            new PropName(769, "shape.master"),
-            new PropName(771, "shape.connectorstyle"),
-            new PropName(772, "shape.blackandwhitesettings"),
-            new PropName(773, "shape.wmodepurebw"),
-            new PropName(774, "shape.wmodebw"),
-            new PropName(826, "shape.oleicon"),
-            new PropName(827, "shape.preferrelativeresize"),
-            new PropName(828, "shape.lockshapetype"),
-            new PropName(830, "shape.deleteattachedobject"),
-            new PropName(831, "shape.backgroundshape"),
-            new PropName(832, "callout.callouttype"),
-            new PropName(833, "callout.xycalloutgap"),
-            new PropName(834, "callout.calloutangle"),
-            new PropName(835, "callout.calloutdroptype"),
-            new PropName(836, "callout.calloutdropspecified"),
-            new PropName(837, "callout.calloutlengthspecified"),
-            new PropName(889, "callout.iscallout"),
-            new PropName(890, "callout.calloutaccentbar"),
-            new PropName(891, "callout.callouttextborder"),
-            new PropName(892, "callout.calloutminusx"),
-            new PropName(893, "callout.calloutminusy"),
-            new PropName(894, "callout.dropauto"),
-            new PropName(895, "callout.lengthspecified"),
-            new PropName(896, "groupshape.shapename"),
-            new PropName(897, "groupshape.description"),
-            new PropName(898, "groupshape.hyperlink"),
-            new PropName(899, "groupshape.wrappolygonvertices"),
-            new PropName(900, "groupshape.wrapdistleft"),
-            new PropName(901, "groupshape.wrapdisttop"),
-            new PropName(902, "groupshape.wrapdistright"),
-            new PropName(903, "groupshape.wrapdistbottom"),
-            new PropName(904, "groupshape.regroupid"),
-            new PropName(953, "groupshape.editedwrap"),
-            new PropName(954, "groupshape.behinddocument"),
-            new PropName(955, "groupshape.ondblclicknotify"),
-            new PropName(956, "groupshape.isbutton"),
-            new PropName(957, "groupshape.1dadjustment"),
-            new PropName(958, "groupshape.hidden"),
-            new PropName(959, "groupshape.print"),
-        };
-
-        for (int i = 0; i < props.length; i++) {
-            if (props[i]._id == propertyId) {
-                return props[i]._name;
-            }
-        }
-
-        return "unknown property";
-    }
-
-    /**
-     * Returns the blip description given a blip id.
-     *
-     * @param   b   blip id
-     * @return  A description.
-     */
-    private static String getBlipType(byte b) {
-        return EscherBSERecord.getBlipType(b);
-    }
-
-    /**
-     * Straight conversion from OO.  Converts a type of float.
-     */
-    private String dec1616( int n32 )
-    {
-        String result = "";
-        result += (short) ( n32 >> 16 );
-        result += '.';
-        result += (short) ( n32 & 0xFFFF );
-        return result;
-    }
-
-    /**
-     * Dumps out a hex value by reading from a input stream.
-     *
-     * @param bytes     How many bytes this hex value consists of.
-     * @param in        The stream to read the hex value from.
-     * @param out       The stream to write the nicely formatted hex value to.
-     */
-    private void outHex( int bytes, InputStream in, PrintStream out ) throws IOException, LittleEndian.BufferUnderrunException
-    {
-        switch ( bytes )
-        {
-            case 1:
-                out.print( HexDump.toHex( (byte) in.read() ) );
-                break;
-            case 2:
-                out.print( HexDump.toHex( LittleEndian.readShort( in ) ) );
-                break;
-            case 4:
-                out.print( HexDump.toHex( LittleEndian.readInt( in ) ) );
-                break;
-            default:
-                throw new IOException( "Unable to output variable of that width" );
-        }
-    }
-
-    /**
-     * A simple test stub.
-     * 
-     * @param args the args
-     */
-    public static void main( String[] args ) {
-        main(args, System.out);
-    }
-    
-    public static void main( String[] args, PrintStream out ) {
-        String dump =
-                "0F 00 00 F0 89 07 00 00 00 00 06 F0 18 00 00 00 " +
-                "05 04 00 00 02 00 00 00 05 00 00 00 01 00 00 00 " +
-                "01 00 00 00 05 00 00 00 4F 00 01 F0 2F 07 00 00 " +
-                "42 00 07 F0 B7 01 00 00 03 04 3F 14 AE 6B 0F 65 " +
-                "B0 48 BF 5E 94 63 80 E8 91 73 FF 00 93 01 00 00 " +
-                "01 00 00 00 00 00 00 00 00 00 FF FF 20 54 1C F0 " +
-                "8B 01 00 00 3F 14 AE 6B 0F 65 B0 48 BF 5E 94 63 " +
-                "80 E8 91 73 92 0E 00 00 00 00 00 00 00 00 00 00 " +
-                "D1 07 00 00 DD 05 00 00 4A AD 6F 00 8A C5 53 00 " +
-                "59 01 00 00 00 FE 78 9C E3 9B C4 00 04 AC 77 D9 " +
-                "2F 32 08 32 FD E7 61 F8 FF 0F C8 FD 05 C5 30 19 " +
-                "10 90 63 90 FA 0F 06 0C 8C 0C 5C 70 19 43 30 EB " +
-                "0E FB 05 86 85 0C DB 18 58 80 72 8C 70 16 0B 83 " +
-                "05 56 51 29 88 C9 60 D9 69 0C 6C 20 26 23 03 C8 " +
-                "74 B0 A8 0E 03 07 FB 45 56 C7 A2 CC C4 1C 06 66 " +
-                "A0 0D 2C 40 39 5E 86 4C 06 3D A0 4E 10 D0 60 D9 " +
-                "C8 58 CC E8 CF B0 80 61 3A 8A 7E 0D C6 23 AC 4F " +
-                "E0 E2 98 B6 12 2B 06 73 9D 12 E3 52 56 59 F6 08 " +
-                "8A CC 52 66 A3 50 FF 96 2B 94 E9 DF 4C A1 FE 2D " +
-                "3A 03 AB 9F 81 C2 F0 A3 54 BF 0F 85 EE A7 54 FF " +
-                "40 FB 7F A0 E3 9F D2 F4 4F 71 FE 19 58 FF 2B 31 " +
-                "7F 67 36 3B 25 4F 99 1B 4E 53 A6 5F 89 25 95 E9 " +
-                "C4 00 C7 83 12 F3 1F 26 35 4A D3 D2 47 0E 0A C3 " +
-                "41 8E C9 8A 52 37 DC 15 A1 D0 0D BC 4C 06 0C 2B " +
-                "28 2C 13 28 D4 EF 43 61 5A A0 58 3F 85 71 E0 4B " +
-                "69 9E 64 65 FE 39 C0 E5 22 30 1D 30 27 0E 74 3A " +
-                "18 60 FD 4A CC B1 2C 13 7D 07 36 2D 2A 31 85 B2 " +
-                "6A 0D 74 1D 1D 22 4D 99 FE 60 0A F5 9B EC 1C 58 " +
-                "FD 67 06 56 3F 38 0D 84 3C A5 30 0E 28 D3 AF C4 " +
-                "A4 CA FA 44 7A 0D 65 6E 60 7F 4D A1 1B 24 58 F7 " +
-                "49 AF A5 CC 0D CC DF 19 FE 03 00 F0 B1 25 4D 42 " +
-                "00 07 F0 E1 01 00 00 03 04 39 50 BE 98 B0 6F 57 " +
-                "24 31 70 5D 23 2F 9F 10 66 FF 00 BD 01 00 00 01 " +
-                "00 00 00 00 00 00 00 00 00 FF FF 20 54 1C F0 B5 " +
-                "01 00 00 39 50 BE 98 B0 6F 57 24 31 70 5D 23 2F " +
-                "9F 10 66 DA 03 00 00 00 00 00 00 00 00 00 00 D1 " +
-                "07 00 00 DD 05 00 00 4A AD 6F 00 8A C5 53 00 83 " +
-                "01 00 00 00 FE 78 9C A5 52 BF 4B 42 51 14 3E F7 " +
-                "DC 77 7A 16 45 48 8B 3C 48 A8 16 15 0D 6C 88 D0 " +
-                "04 C3 40 A3 32 1C 84 96 08 21 04 A1 C5 5C A2 35 " +
-                "82 C0 35 6A AB 1C 6A 6B A8 24 5A 83 68 08 84 84 " +
-                "96 A2 86 A0 7F C2 86 5E E7 5E F5 41 E4 10 BC 03 " +
-                "1F E7 FB F1 CE B9 F7 F1 9E 7C 05 2E 7A 37 9B E0 " +
-                "45 7B 10 EC 6F 96 5F 1D 74 13 55 7E B0 6C 5D 20 " +
-                "60 C0 49 A2 9A BD 99 4F 50 83 1B 30 38 13 0E 33 " +
-                "60 A6 A7 6B B5 37 EB F4 10 FA 14 15 A0 B6 6B 37 " +
-                "0C 1E B3 49 73 5B A5 C2 26 48 3E C1 E0 6C 08 4A " +
-                "30 C9 93 AA 02 B8 20 13 62 05 4E E1 E8 D7 7C C0 " +
-                "B8 14 95 5E BE B8 A7 CF 1E BE 55 2C 56 B9 78 DF " +
-                "08 7E 88 4C 27 FF 7B DB FF 7A DD B7 1A 17 67 34 " +
-                "6A AE BA DA 35 D1 E7 72 BE FE EC 6E FE DA E5 7C " +
-                "3D EC 7A DE 03 FD 50 06 0B 23 F2 0E F3 B2 A5 11 " +
-                "91 0D 4C B5 B5 F3 BF 94 C1 8F 24 F7 D9 6F 60 94 " +
-                "3B C9 9A F3 1C 6B E7 BB F0 2E 49 B2 25 2B C6 B1 " +
-                "EE 69 EE 15 63 4F 71 7D CE 85 CC C8 35 B9 C3 28 " +
-                "28 CE D0 5C 67 79 F2 4A A2 14 23 A4 38 43 73 9D " +
-                "2D 69 2F C1 08 31 9F C5 5C 9B EB 7B C5 69 19 B3 " +
-                "B4 81 F3 DC E3 B4 8E 8B CC B3 94 53 5A E7 41 2A " +
-                "63 9A AA 38 C5 3D 48 BB EC 57 59 6F 2B AD 73 1F " +
-                "1D 60 92 AE 70 8C BB 8F CE 31 C1 3C 49 27 4A EB " +
-                "DC A4 5B 8C D1 0B 0E 73 37 E9 11 A7 99 C7 E8 41 " +
-                "69 B0 7F 00 96 F2 A7 E8 42 00 07 F0 B4 01 00 00 " +
-                "03 04 1A BA F9 D6 A9 B9 3A 03 08 61 E9 90 FF 7B " +
-                "9E E6 FF 00 90 01 00 00 01 00 00 00 00 00 00 00 " +
-                "00 00 FF FF 20 54 1C F0 88 01 00 00 1A BA F9 D6 " +
-                "A9 B9 3A 03 08 61 E9 90 FF 7B 9E E6 12 0E 00 00 " +
-                "00 00 00 00 00 00 00 00 D1 07 00 00 DD 05 00 00 " +
-                "4A AD 6F 00 8A C5 53 00 56 01 00 00 00 FE 78 9C " +
-                "E3 13 62 00 02 D6 BB EC 17 19 04 99 FE F3 30 FC " +
-                "FF 07 E4 FE 82 62 98 0C 08 C8 31 48 FD 07 03 06 " +
-                "46 06 2E B8 8C 21 98 75 87 FD 02 C3 42 86 6D 0C " +
-                "2C 40 39 46 38 8B 85 C1 02 AB A8 14 C4 64 B0 EC " +
-                "34 06 36 10 93 91 01 64 3A 58 54 87 81 83 FD 22 " +
-                "AB 63 51 66 62 0E 03 33 D0 06 16 A0 1C 2F 43 26 " +
-                "83 1E 50 27 08 68 B0 6C 64 2C 66 F4 67 58 C0 30 " +
-                "1D 45 BF 06 E3 11 D6 27 70 71 4C 5B 89 15 83 B9 " +
-                "4E 89 71 29 AB 2C 7B 04 45 66 29 B3 51 A8 7F CB " +
-                "15 CA F4 6F A6 50 FF 16 9D 81 D5 CF 40 61 F8 51 " +
-                "AA DF 87 42 F7 53 AA 7F A0 FD 3F D0 F1 4F 69 FA " +
-                "A7 38 FF 0C AC FF 95 98 BF 33 9B 9D 92 A7 CC 0D " +
-                "A7 29 D3 AF C4 92 CA 74 62 80 E3 41 89 F9 0F 93 " +
-                "1A A5 69 E9 23 07 85 E1 20 C7 64 45 A9 1B EE 8A " +
-                "50 E8 06 5E 26 03 86 15 14 96 09 14 EA F7 A1 30 " +
-                "2D 50 AC 9F C2 38 F0 A5 34 4F B2 32 FF 1C E0 72 " +
-                "11 98 0E 98 13 07 38 1D 28 31 C7 B2 4C F4 1D D8 " +
-                "B4 A0 C4 14 CA AA 35 D0 75 64 88 34 65 FA 83 29 " +
-                "D4 6F B2 73 60 F5 9F A1 54 FF 0E CA D3 40 C8 53 " +
-                "0A E3 E0 09 85 6E 50 65 7D 22 BD 86 32 37 B0 BF " +
-                "A6 D0 0D 12 AC FB A4 D7 52 E6 06 E6 EF 0C FF 01 " +
-                "97 1D 12 C7 42 00 07 F0 C3 01 00 00 03 04 BA 4C " +
-                "B6 23 BA 8B 27 BE C8 55 59 86 24 9F 89 D4 FF 00 " +
-                "9F 01 00 00 01 00 00 00 00 00 00 00 00 00 FF FF " +
-                "20 54 1C F0 97 01 00 00 BA 4C B6 23 BA 8B 27 BE " +
-                "C8 55 59 86 24 9F 89 D4 AE 0E 00 00 00 00 00 00 " +
-                "00 00 00 00 D1 07 00 00 DD 05 00 00 4A AD 6F 00 " +
-                "8A C5 53 00 65 01 00 00 00 FE 78 9C E3 5B C7 00 " +
-                "04 AC 77 D9 2F 32 08 32 FD E7 61 F8 FF 0F C8 FD " +
-                "05 C5 30 19 10 90 63 90 FA 0F 06 0C 8C 0C 5C 70 " +
-                "19 43 30 EB 0E FB 05 86 85 0C DB 18 58 80 72 8C " +
-                "70 16 0B 83 05 56 51 29 88 C9 60 D9 69 0C 6C 20 " +
-                "26 23 03 C8 74 B0 A8 0E 03 07 FB 45 56 C7 A2 CC " +
-                "C4 1C 06 66 A0 0D 2C 40 39 5E 86 4C 06 3D A0 4E " +
-                "10 D0 60 99 C6 B8 98 D1 9F 61 01 C3 74 14 FD 1A " +
-                "8C 2B D8 84 B1 88 4B A5 A5 75 03 01 50 DF 59 46 " +
-                "77 46 0F A8 3C A6 AB 88 15 83 B9 5E 89 B1 8B D5 " +
-                "97 2D 82 22 B3 94 29 D5 BF E5 CA C0 EA DF AC 43 " +
-                "A1 FD 14 EA 67 A0 30 FC 28 D5 EF 43 A1 FB 7D 87 " +
-                "B8 FF 07 3A FE 07 3A FD 53 EA 7E 0A C3 4F 89 F9 " +
-                "0E 73 EA 69 79 CA DC 70 8A 32 FD 4A 2C 5E 4C DF " +
-                "87 7A 3C BC E0 A5 30 1E 3E 31 C5 33 AC A0 30 2F " +
-                "52 A8 DF 87 C2 30 A4 54 3F A5 65 19 85 65 A9 12 " +
-                "D3 2B 16 0D 8A CB 13 4A F3 E3 27 E6 09 03 9D 0E " +
-                "06 58 BF 12 B3 13 CB C1 01 4E 8B 4A 4C 56 AC 91 " +
-                "03 5D 37 86 48 53 A6 3F 98 42 FD 26 3B 07 56 FF " +
-                "99 1D 14 EA A7 CC 7E 70 1A 08 79 42 61 1C 3C A5 " +
-                "D0 0D 9C 6C C2 32 6B 29 73 03 DB 6B CA DC C0 F8 " +
-                "97 F5 AD CC 1A CA DC C0 F4 83 32 37 B0 A4 30 CE " +
-                "FC C7 48 99 1B FE 33 32 FC 07 00 6C CC 2E 23 33 " +
-                "00 0B F0 12 00 00 00 BF 00 08 00 08 00 81 01 09 " +
-                "00 00 08 C0 01 40 00 00 08 40 00 1E F1 10 00 00 " +
-                "00 0D 00 00 08 0C 00 00 08 17 00 00 08 F7 00 00 " +
-                "10                                              ";
-
-        // Decode the stream to bytes
-        byte[] bytes = HexRead.readFromString(dump);
-        // Create a new instance of the escher dumper
-        EscherDump dumper = new EscherDump();
-        // Dump the contents of scher to screen.
-//        dumper.dumpOld( bytes.length, new ByteArrayInputStream( bytes ), System.out );
-        dumper.dump(bytes, 0, bytes.length, out);
-
-    }
-
-    public void dump( int recordSize, byte[] data, PrintStream out ) {
-        dump( data, 0, recordSize, out );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java b/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java
deleted file mode 100644
index 740df26..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.hssf.usermodel.HSSFPictureData;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.zip.InflaterInputStream;
-import java.util.zip.DeflaterOutputStream;
-
-public final class EscherMetafileBlip extends EscherBlipRecord {
-    private static final POILogger log = POILogFactory.getLogger(EscherMetafileBlip.class);
-
-    public static final short RECORD_ID_EMF = (short) 0xF018 + 2;
-    public static final short RECORD_ID_WMF = (short) 0xF018 + 3;
-    public static final short RECORD_ID_PICT = (short) 0xF018 + 4;
-
-    private static final int HEADER_SIZE = 8;
-
-    private final byte[] field_1_UID = new byte[16];
-    /**
-     * The primary UID is only saved to disk if (blip_instance ^ blip_signature == 1)
-     */
-    private final byte[] field_2_UID = new byte[16];
-    private int field_2_cb;
-    private int field_3_rcBounds_x1;
-    private int field_3_rcBounds_y1;
-    private int field_3_rcBounds_x2;
-    private int field_3_rcBounds_y2;
-    private int field_4_ptSize_w;
-    private int field_4_ptSize_h;
-    private int field_5_cbSave;
-    private byte field_6_fCompression;
-    private byte field_7_fFilter;
-
-    private byte[] raw_pictureData;
-    private byte[] remainingData;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesAfterHeader = readHeader( data, offset );
-        int pos = offset + HEADER_SIZE;
-        System.arraycopy( data, pos, field_1_UID, 0, 16 ); pos += 16;
-
-        if((getOptions() ^ getSignature()) == 0x10){
-            System.arraycopy( data, pos, field_2_UID, 0, 16 ); pos += 16;
-        }
-
-        field_2_cb = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_x1 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_y1 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_x2 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_y2 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_4_ptSize_w = LittleEndian.getInt( data, pos ); pos += 4;
-        field_4_ptSize_h = LittleEndian.getInt( data, pos ); pos += 4;
-        field_5_cbSave = LittleEndian.getInt( data, pos ); pos += 4;
-        field_6_fCompression = data[pos]; pos++;
-        field_7_fFilter = data[pos]; pos++;
-
-        raw_pictureData = new byte[field_5_cbSave];
-        System.arraycopy( data, pos, raw_pictureData, 0, field_5_cbSave );
-        pos += field_5_cbSave;
-
-        // 0 means DEFLATE compression
-        // 0xFE means no compression
-        if (field_6_fCompression == 0) {
-            field_pictureData = inflatePictureData(raw_pictureData);
-        } else {
-            field_pictureData = raw_pictureData;
-        }
-
-        int remaining = bytesAfterHeader - pos + offset + HEADER_SIZE;
-        if(remaining > 0) {
-            remainingData = new byte[remaining];
-            System.arraycopy( data, pos, remainingData, 0, remaining );
-        }
-        return bytesAfterHeader + HEADER_SIZE;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize(offset, getRecordId(), this);
-
-        int pos = offset;
-        LittleEndian.putShort( data, pos, getOptions() ); pos += 2;
-        LittleEndian.putShort( data, pos, getRecordId() ); pos += 2;
-        LittleEndian.putInt( data, pos, getRecordSize() - HEADER_SIZE ); pos += 4;
-
-        System.arraycopy( field_1_UID, 0, data, pos, field_1_UID.length ); pos += field_1_UID.length;
-        if ((getOptions() ^ getSignature()) == 0x10) {
-            System.arraycopy( field_2_UID, 0, data, pos, field_2_UID.length ); pos += field_2_UID.length;
-        }
-        LittleEndian.putInt( data, pos, field_2_cb ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_x1 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_y1 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_x2 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_y2 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_4_ptSize_w ); pos += 4;
-        LittleEndian.putInt( data, pos, field_4_ptSize_h ); pos += 4;
-        LittleEndian.putInt( data, pos, field_5_cbSave ); pos += 4;
-        data[pos] = field_6_fCompression; pos++;
-        data[pos] = field_7_fFilter; pos++;
-
-        System.arraycopy( raw_pictureData, 0, data, pos, raw_pictureData.length ); pos += raw_pictureData.length;
-        if(remainingData != null) {
-            System.arraycopy( remainingData, 0, data, pos, remainingData.length ); pos += remainingData.length;
-        }
-
-        listener.afterRecordSerialize(offset + getRecordSize(), getRecordId(), getRecordSize(), this);
-        return getRecordSize();
-    }
-
-    /**
-     * Decompresses the provided data, returning the inflated result.
-     *
-     * @param data the deflated picture data.
-     * @return the inflated picture data.
-     */
-    private static byte[] inflatePictureData(byte[] data) {
-        try {
-            InflaterInputStream in = new InflaterInputStream(
-                new ByteArrayInputStream( data ) );
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            byte[] buf = new byte[4096];
-            int readBytes;
-            while ((readBytes = in.read(buf)) > 0) {
-                out.write(buf, 0, readBytes);
-            }
-            return out.toByteArray();
-        } catch (IOException e) {
-            log.log(POILogger.WARN, "Possibly corrupt compression or non-compressed data", e);
-            return data;
-        }
-    }
-
-    @Override
-    public int getRecordSize() {
-        int size = 8 + 50 + raw_pictureData.length;
-        if(remainingData != null) size += remainingData.length;
-        if((getOptions() ^ getSignature()) == 0x10){
-            size += field_2_UID.length;
-        }
-        return size;
-    }
-
-    /**
-     * Gets the first MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @return the first MD4
-     */
-    public byte[] getUID() {
-        return field_1_UID;
-    }
-
-    /**
-     * Sets the first MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @param uid the first MD4
-     */
-    public void setUID(byte[] uid) {
-        if (uid == null || uid.length != 16) {
-            throw new IllegalArgumentException("uid must be byte[16]");
-        }
-        System.arraycopy(uid, 0, field_1_UID, 0, field_1_UID.length);
-    }
-
-    /**
-     * Gets the second MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @return the second MD4
-     */
-    public byte[] getPrimaryUID() {
-        return field_2_UID;
-    }
-
-    /**
-     * Sets the second MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @param primaryUID the second MD4
-     */
-    public void setPrimaryUID(byte[] primaryUID) {
-        if (primaryUID == null || primaryUID.length != 16) {
-            throw new IllegalArgumentException("primaryUID must be byte[16]");
-        }
-        System.arraycopy(primaryUID, 0, field_2_UID, 0, field_2_UID.length);
-    }
-
-    /**
-     * Gets the uncompressed size (in bytes)
-     *
-     * @return the uncompressed size
-     */
-    public int getUncompressedSize() {
-        return field_2_cb;
-    }
-
-    /**
-     * Sets the uncompressed size (in bytes)
-     *
-     * @param uncompressedSize the uncompressed size
-     */
-    public void setUncompressedSize(int uncompressedSize) {
-        field_2_cb = uncompressedSize;
-    }
-
-    /**
-     * Get the clipping region of the metafile
-     *
-     * @return the clipping region
-     */
-    public Rectangle getBounds() {
-        return new Rectangle(field_3_rcBounds_x1,
-                             field_3_rcBounds_y1,
-                             field_3_rcBounds_x2 - field_3_rcBounds_x1,
-                             field_3_rcBounds_y2 - field_3_rcBounds_y1);
-    }
-
-    /**
-     * Sets the clipping region
-     *
-     * @param bounds the clipping region
-     */
-    public void setBounds(Rectangle bounds) {
-        field_3_rcBounds_x1 = bounds.x;
-        field_3_rcBounds_y1 = bounds.y;
-        field_3_rcBounds_x2 = bounds.x + bounds.width;
-        field_3_rcBounds_y2 = bounds.y + bounds.height;
-    }
-
-    /**
-     * Gets the dimensions of the metafile 
-     *
-     * @return the dimensions of the metafile
-     */
-    public Dimension getSizeEMU() {
-        return new Dimension(field_4_ptSize_w, field_4_ptSize_h);
-    }
-
-    /**
-     * Gets the dimensions of the metafile
-     *
-     * @param sizeEMU the dimensions of the metafile
-     */
-    public void setSizeEMU(Dimension sizeEMU) {
-        field_4_ptSize_w = sizeEMU.width;
-        field_4_ptSize_h = sizeEMU.height;
-    }
-
-    /**
-     * Gets the compressed size of the metafile (in bytes)
-     * 
-     * @return the compressed size
-     */
-    public int getCompressedSize() {
-        return field_5_cbSave;
-    }
-
-    /**
-     * Sets the compressed size of the metafile (in bytes)
-     *
-     * @param compressedSize the compressed size
-     */
-    public void setCompressedSize(int compressedSize) {
-        field_5_cbSave = compressedSize;
-    }
-
-    /**
-     * Gets the compression of the metafile
-     *
-     * @return true, if the metafile is compressed
-     */
-    public boolean isCompressed() {
-        return (field_6_fCompression == 0);
-    }
-
-    /**
-     * Sets the compression of the metafile
-     *
-     * @param compressed the compression state, true if it's compressed
-     */
-    public void setCompressed(boolean compressed) {
-        field_6_fCompression = compressed ? 0 : (byte)0xFE;
-    }
-
-    /**
-     * Returns any remaining bytes
-     *
-     * @return any remaining bytes
-     */
-    public byte[] getRemainingData() {
-        return remainingData;
-    }
-
-    // filtering is always 254 according to available docs, so no point giving it a setter method.
-
-    @Override
-    public String toString() {
-        String extraData = "";//HexDump.toHex(field_pictureData, 32);
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
-                "  Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
-                "  Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
-                "  UID: 0x" + HexDump.toHex( field_1_UID ) + '\n' +
-                (field_2_UID == null ? "" : ("  UID2: 0x" + HexDump.toHex( field_2_UID ) + '\n')) +
-                "  Uncompressed Size: " + HexDump.toHex( field_2_cb ) + '\n' +
-                "  Bounds: " + getBounds() + '\n' +
-                "  Size in EMU: " + getSizeEMU() + '\n' +
-                "  Compressed Size: " + HexDump.toHex( field_5_cbSave ) + '\n' +
-                "  Compression: " + HexDump.toHex( field_6_fCompression ) + '\n' +
-                "  Filter: " + HexDump.toHex( field_7_fFilter ) + '\n' +
-                "  Extra Data:" + '\n' + extraData +
-                (remainingData == null ? null : ("\n" +
-                 " Remaining Data: " + HexDump.toHex(remainingData, 32)));
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String extraData = "";
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<UID>0x").append(HexDump.toHex( field_1_UID ) + '\n' +
-                                (field_2_UID == null ? "" : ("  UID2: 0x" + HexDump.toHex( field_2_UID ) + '\n'))).append("</UID>\n")
-                .append(tab).append("\t").append("<UncompressedSize>0x").append(HexDump.toHex( field_2_cb )).append("</UncompressedSize>\n")
-                .append(tab).append("\t").append("<Bounds>").append(getBounds()).append("</Bounds>\n")
-                .append(tab).append("\t").append("<SizeInEMU>").append(getSizeEMU()).append("</SizeInEMU>\n")
-                .append(tab).append("\t").append("<CompressedSize>0x").append(HexDump.toHex( field_5_cbSave )).append("</CompressedSize>\n")
-                .append(tab).append("\t").append("<Compression>0x").append(HexDump.toHex( field_6_fCompression )).append("</Compression>\n")
-                .append(tab).append("\t").append("<Filter>0x").append(HexDump.toHex( field_7_fFilter )).append("</Filter>\n")
-                .append(tab).append("\t").append("<ExtraData>").append(extraData).append("</ExtraData>\n")
-                .append(tab).append("\t").append("<RemainingData>0x").append(HexDump.toHex(remainingData, 32)).append("</RemainingData>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * Return the blip signature
-     *
-     * @return the blip signature
-     */
-    public short getSignature() {
-        switch (getRecordId()) {
-            case RECORD_ID_EMF:  return HSSFPictureData.MSOBI_EMF;
-            case RECORD_ID_WMF:  return HSSFPictureData.MSOBI_WMF;
-            case RECORD_ID_PICT: return HSSFPictureData.MSOBI_PICT;
-        }
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Unknown metafile: " + getRecordId());
-        }
-        return 0;
-    }
-
-    @Override
-    public void setPictureData(byte[] pictureData) {
-    	super.setPictureData(pictureData);
-        setUncompressedSize(pictureData.length);
-
-        // info of chicago project:
-        // "... LZ compression algorithm in the format used by GNU Zip deflate/inflate with a 32k window ..."
-        // not sure what to do, when lookup tables exceed 32k ...
-
-        try {
-	        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-	        DeflaterOutputStream dos = new DeflaterOutputStream(bos);
-	        dos.write(pictureData);
-	        dos.close();
-	        raw_pictureData = bos.toByteArray();
-        } catch (IOException e) {
-        	throw new RuntimeException("Can't compress metafile picture data", e);
-        }
-        
-        setCompressedSize(raw_pictureData.length);
-        setCompressed(true);
-    }
-
-    /**
-     * Sets the filter byte - usually this is 0xFE
-     *
-     * @param filter the filter byte
-     */
-    public void setFilter(byte filter) {
-    	field_7_fFilter = filter;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherOptRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherOptRecord.java
deleted file mode 100644
index cb6c7ad..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherOptRecord.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.Internal;
-
-/**
- * The opt record is used to store property values for a shape. It is the key to
- * determining the attributes of a shape. Properties can be of two types: simple
- * or complex. Simple types are fixed length. Complex properties are variable
- * length.
- */
-public class EscherOptRecord extends AbstractEscherOptRecord
-{
-    public static final String RECORD_DESCRIPTION = "msofbtOPT";
-    public static final short RECORD_ID = (short) 0xF00B;
-
-    @Override
-    public short getInstance()
-    {
-        setInstance( (short) properties.size() );
-        return super.getInstance();
-    }
-
-    /**
-     * Automatically recalculate the correct option
-     */
-    @Override
-    @Internal
-    public short getOptions()
-    {
-        // update values
-        getInstance();
-        getVersion();
-        return super.getOptions();
-    }
-
-    @Override
-    public String getRecordName()
-    {
-        return "Opt";
-    }
-
-    @Override
-    public short getVersion()
-    {
-        setVersion( (short) 0x3 );
-        return super.getVersion();
-    }
-
-    @Override
-    public void setVersion( short value )
-    {
-        if ( value != 0x3 )
-            throw new IllegalArgumentException( RECORD_DESCRIPTION
-                    + " can have only '0x3' version" );
-
-        super.setVersion( value );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java b/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java
deleted file mode 100644
index 7c2acd9..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.zip.InflaterInputStream;
-
-public final class EscherPictBlip extends EscherBlipRecord {
-    private static final POILogger log = POILogFactory.getLogger(EscherPictBlip.class);
-
-    public static final short RECORD_ID_EMF = (short) 0xF018 + 2;
-    public static final short RECORD_ID_WMF = (short) 0xF018 + 3;
-    public static final short RECORD_ID_PICT = (short) 0xF018 + 4;
-
-    private static final int HEADER_SIZE = 8;
-
-    private final byte[] field_1_UID = new byte[16];
-    private int field_2_cb;
-    private int field_3_rcBounds_x1;
-    private int field_3_rcBounds_y1;
-    private int field_3_rcBounds_x2;
-    private int field_3_rcBounds_y2;
-    private int field_4_ptSize_w;
-    private int field_4_ptSize_h;
-    private int field_5_cbSave;
-    private byte field_6_fCompression;
-    private byte field_7_fFilter;
-
-    private byte[] raw_pictureData;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesAfterHeader = readHeader(data, offset);
-        int pos = offset + HEADER_SIZE;
-
-        System.arraycopy( data, pos, field_1_UID, 0, 16 ); pos += 16;
-        field_2_cb = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_x1 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_y1 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_x2 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_3_rcBounds_y2 = LittleEndian.getInt( data, pos ); pos += 4;
-        field_4_ptSize_w = LittleEndian.getInt( data, pos ); pos += 4;
-        field_4_ptSize_h = LittleEndian.getInt( data, pos ); pos += 4;
-        field_5_cbSave = LittleEndian.getInt( data, pos ); pos += 4;
-        field_6_fCompression = data[pos]; pos++;
-        field_7_fFilter = data[pos]; pos++;
-
-        raw_pictureData = new byte[field_5_cbSave];
-        System.arraycopy( data, pos, raw_pictureData, 0, field_5_cbSave );
-
-        // 0 means DEFLATE compression
-        // 0xFE means no compression
-        if (field_6_fCompression == 0)
-        {
-            field_pictureData = inflatePictureData(raw_pictureData);
-        }
-        else
-        {
-            field_pictureData = raw_pictureData;
-        }
-
-        return bytesAfterHeader + HEADER_SIZE;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize(offset, getRecordId(), this);
-
-        int pos = offset;
-        LittleEndian.putShort( data, pos, getOptions() ); pos += 2;
-        LittleEndian.putShort( data, pos, getRecordId() ); pos += 2;
-        LittleEndian.putInt( data, 0, getRecordSize() - HEADER_SIZE ); pos += 4;
-
-        System.arraycopy( field_1_UID, 0, data, pos, 16 ); pos += 16;
-        LittleEndian.putInt( data, pos, field_2_cb ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_x1 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_y1 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_x2 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_3_rcBounds_y2 ); pos += 4;
-        LittleEndian.putInt( data, pos, field_4_ptSize_w ); pos += 4;
-        LittleEndian.putInt( data, pos, field_4_ptSize_h ); pos += 4;
-        LittleEndian.putInt( data, pos, field_5_cbSave ); pos += 4;
-        data[pos] = field_6_fCompression; pos++;
-        data[pos] = field_7_fFilter; pos++;
-
-        System.arraycopy( raw_pictureData, 0, data, pos, raw_pictureData.length );
-
-        listener.afterRecordSerialize(offset + getRecordSize(), getRecordId(), getRecordSize(), this);
-        return HEADER_SIZE + 16 + 1 + raw_pictureData.length;
-    }
-
-    /**
-     * Decompresses the provided data, returning the inflated result.
-     *
-     * @param data the deflated picture data.
-     * @return the inflated picture data.
-     */
-    private static byte[] inflatePictureData(byte[] data) {
-        try {
-            InflaterInputStream in = new InflaterInputStream(new ByteArrayInputStream(data));
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            byte[] buf = new byte[4096];
-            int readBytes;
-            while ((readBytes = in.read(buf)) > 0) {
-                out.write(buf, 0, readBytes);
-            }
-            return out.toByteArray();
-        } catch (IOException e) {
-            log.log(POILogger.INFO, "Possibly corrupt compression or non-compressed data", e);
-            return data;
-        }
-    }
-
-    @Override
-    public int getRecordSize() {
-        return 8 + 50 + raw_pictureData.length;
-    }
-
-    /**
-     * Gets the first MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @return the first MD4
-     */
-    public byte[] getUID() {
-        return field_1_UID;
-    }
-
-    /**
-     * Sets the first MD4, that specifies the unique identifier of the
-     * uncompressed blip data
-     *
-     * @param uid the first MD4
-     */
-    public void setUID(byte[] uid) {
-        if (uid == null || uid.length != 16) {
-            throw new IllegalArgumentException("uid must be byte[16]");
-        }
-        System.arraycopy(uid, 0, field_1_UID, 0, field_1_UID.length);
-    }
-
-    /**
-     * Gets the uncompressed size (in bytes)
-     *
-     * @return the uncompressed size
-     */
-    public int getUncompressedSize() {
-        return field_2_cb;
-    }
-
-    /**
-     * Sets the uncompressed size (in bytes)
-     *
-     * @param uncompressedSize the uncompressed size
-     */
-    public void setUncompressedSize(int uncompressedSize) {
-        field_2_cb = uncompressedSize;
-    }
-
-    /**
-     * Get the clipping region of the pict file
-     *
-     * @return the clipping region
-     */
-    public Rectangle getBounds() {
-        return new Rectangle(field_3_rcBounds_x1,
-                             field_3_rcBounds_y1,
-                             field_3_rcBounds_x2 - field_3_rcBounds_x1,
-                             field_3_rcBounds_y2 - field_3_rcBounds_y1);
-    }
-
-    /**
-     * Sets the clipping region
-     *
-     * @param bounds the clipping region
-     */
-    public void setBounds(Rectangle bounds) {
-        field_3_rcBounds_x1 = bounds.x;
-        field_3_rcBounds_y1 = bounds.y;
-        field_3_rcBounds_x2 = bounds.x + bounds.width;
-        field_3_rcBounds_y2 = bounds.y + bounds.height;
-    }
-
-    /**
-     * Gets the dimensions of the metafile 
-     *
-     * @return the dimensions of the metafile
-     */
-    public Dimension getSizeEMU() {
-        return new Dimension(field_4_ptSize_w, field_4_ptSize_h);
-    }
-
-    /**
-     * Gets the dimensions of the metafile
-     *
-     * @param sizeEMU the dimensions of the metafile
-     */
-    public void setSizeEMU(Dimension sizeEMU) {
-        field_4_ptSize_w = sizeEMU.width;
-        field_4_ptSize_h = sizeEMU.height;
-    }
-
-    /**
-     * Gets the compressed size of the metafile (in bytes)
-     * 
-     * @return the compressed size
-     */
-    public int getCompressedSize() {
-        return field_5_cbSave;
-    }
-
-    /**
-     * Sets the compressed size of the metafile (in bytes)
-     *
-     * @param compressedSize the compressed size
-     */
-    public void setCompressedSize(int compressedSize) {
-        field_5_cbSave = compressedSize;
-    }
-
-    /**
-     * Gets the compression of the metafile
-     *
-     * @return true, if the metafile is compressed
-     */
-    public boolean isCompressed() {
-        return (field_6_fCompression == 0);
-    }
-
-    /**
-     * Sets the compression of the metafile
-     *
-     * @param compressed the compression state, true if it's compressed
-     */
-    public void setCompressed(boolean compressed) {
-        field_6_fCompression = compressed ? 0 : (byte)0xFE;
-    }
-
-    // filtering is always 254 according to available docs, so no point giving it a setter method.
-
-    @Override
-    public String toString() {
-        String extraData = HexDump.toHex(field_pictureData, 32);
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
-                "  Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
-                "  Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
-                "  UID: 0x" + HexDump.toHex( field_1_UID ) + '\n' +
-                "  Uncompressed Size: " + HexDump.toHex( field_2_cb ) + '\n' +
-                "  Bounds: " + getBounds() + '\n' +
-                "  Size in EMU: " + getSizeEMU() + '\n' +
-                "  Compressed Size: " + HexDump.toHex( field_5_cbSave ) + '\n' +
-                "  Compression: " + HexDump.toHex( field_6_fCompression ) + '\n' +
-                "  Filter: " + HexDump.toHex( field_7_fFilter ) + '\n' +
-                "  Extra Data:" + '\n' + extraData;
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String extraData = "";
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<UID>0x").append(HexDump.toHex( field_1_UID )).append("</UID>\n")
-                .append(tab).append("\t").append("<UncompressedSize>0x").append(HexDump.toHex( field_2_cb )).append("</UncompressedSize>\n")
-                .append(tab).append("\t").append("<Bounds>").append(getBounds()).append("</Bounds>\n")
-                .append(tab).append("\t").append("<SizeInEMU>").append(getSizeEMU()).append("</SizeInEMU>\n")
-                .append(tab).append("\t").append("<CompressedSize>0x").append(HexDump.toHex( field_5_cbSave )).append("</CompressedSize>\n")
-                .append(tab).append("\t").append("<Compression>0x").append(HexDump.toHex( field_6_fCompression )).append("</Compression>\n")
-                .append(tab).append("\t").append("<Filter>0x").append(HexDump.toHex( field_7_fFilter )).append("</Filter>\n")
-                .append(tab).append("\t").append("<ExtraData>").append(extraData).append("</ExtraData>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherProperties.java b/trunk/src/java/org/apache/poi/ddf/EscherProperties.java
deleted file mode 100644
index 096a20c..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherProperties.java
+++ /dev/null
@@ -1,660 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- ==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Provides a list of all known escher properties including the description and
- * type.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class EscherProperties {
-
-	// Property constants
-	public static final short TRANSFORM__ROTATION = 4;
-	public static final short PROTECTION__LOCKROTATION = 119;
-	public static final short PROTECTION__LOCKASPECTRATIO = 120;
-	public static final short PROTECTION__LOCKPOSITION = 121;
-	public static final short PROTECTION__LOCKAGAINSTSELECT = 122;
-	public static final short PROTECTION__LOCKCROPPING = 123;
-	public static final short PROTECTION__LOCKVERTICES = 124;
-	public static final short PROTECTION__LOCKTEXT = 125;
-	public static final short PROTECTION__LOCKADJUSTHANDLES = 126;
-	public static final short PROTECTION__LOCKAGAINSTGROUPING = 127;
-	public static final short TEXT__TEXTID = 128;
-	public static final short TEXT__TEXTLEFT = 129;
-	public static final short TEXT__TEXTTOP = 130;
-	public static final short TEXT__TEXTRIGHT = 131;
-	public static final short TEXT__TEXTBOTTOM = 132;
-	public static final short TEXT__WRAPTEXT = 133;
-	public static final short TEXT__SCALETEXT = 134;
-	public static final short TEXT__ANCHORTEXT = 135;
-	public static final short TEXT__TEXTFLOW = 136;
-	public static final short TEXT__FONTROTATION = 137;
-	public static final short TEXT__IDOFNEXTSHAPE = 138;
-	public static final short TEXT__BIDIR = 139;
-	public static final short TEXT__SINGLECLICKSELECTS = 187;
-	public static final short TEXT__USEHOSTMARGINS = 188;
-	public static final short TEXT__ROTATETEXTWITHSHAPE = 189;
-	public static final short TEXT__SIZESHAPETOFITTEXT = 190;
-	public static final short TEXT__SIZE_TEXT_TO_FIT_SHAPE = 191;
-	public static final short GEOTEXT__UNICODE = 192;
-	public static final short GEOTEXT__RTFTEXT = 193;
-	public static final short GEOTEXT__ALIGNMENTONCURVE = 194;
-	public static final short GEOTEXT__DEFAULTPOINTSIZE = 195;
-	public static final short GEOTEXT__TEXTSPACING = 196;
-	public static final short GEOTEXT__FONTFAMILYNAME = 197;
-	public static final short GEOTEXT__REVERSEROWORDER = 240;
-	public static final short GEOTEXT__HASTEXTEFFECT = 241;
-	public static final short GEOTEXT__ROTATECHARACTERS = 242;
-	public static final short GEOTEXT__KERNCHARACTERS = 243;
-	public static final short GEOTEXT__TIGHTORTRACK = 244;
-	public static final short GEOTEXT__STRETCHTOFITSHAPE = 245;
-	public static final short GEOTEXT__CHARBOUNDINGBOX = 246;
-	public static final short GEOTEXT__SCALETEXTONPATH = 247;
-	public static final short GEOTEXT__STRETCHCHARHEIGHT = 248;
-	public static final short GEOTEXT__NOMEASUREALONGPATH = 249;
-	public static final short GEOTEXT__BOLDFONT = 250;
-	public static final short GEOTEXT__ITALICFONT = 251;
-	public static final short GEOTEXT__UNDERLINEFONT = 252;
-	public static final short GEOTEXT__SHADOWFONT = 253;
-	public static final short GEOTEXT__SMALLCAPSFONT = 254;
-	public static final short GEOTEXT__STRIKETHROUGHFONT = 255;
-	public static final short BLIP__CROPFROMTOP = 256;
-	public static final short BLIP__CROPFROMBOTTOM = 257;
-	public static final short BLIP__CROPFROMLEFT = 258;
-	public static final short BLIP__CROPFROMRIGHT = 259;
-	public static final short BLIP__BLIPTODISPLAY = 260;
-	public static final short BLIP__BLIPFILENAME = 261;
-	public static final short BLIP__BLIPFLAGS = 262;
-	public static final short BLIP__TRANSPARENTCOLOR = 263;
-	public static final short BLIP__CONTRASTSETTING = 264;
-	public static final short BLIP__BRIGHTNESSSETTING = 265;
-	public static final short BLIP__GAMMA = 266;
-	public static final short BLIP__PICTUREID = 267;
-	public static final short BLIP__DOUBLEMOD = 268;
-	public static final short BLIP__PICTUREFILLMOD = 269;
-	public static final short BLIP__PICTURELINE = 270;
-	public static final short BLIP__PRINTBLIP = 271;
-	public static final short BLIP__PRINTBLIPFILENAME = 272;
-	public static final short BLIP__PRINTFLAGS = 273;
-	public static final short BLIP__NOHITTESTPICTURE = 316;
-	public static final short BLIP__PICTUREGRAY = 317;
-	public static final short BLIP__PICTUREBILEVEL = 318;
-	public static final short BLIP__PICTUREACTIVE = 319;
-	public static final short GEOMETRY__LEFT = 320;
-	public static final short GEOMETRY__TOP = 321;
-	public static final short GEOMETRY__RIGHT = 322;
-	public static final short GEOMETRY__BOTTOM = 323;
-	public static final short GEOMETRY__SHAPEPATH = 324;
-	public static final short GEOMETRY__VERTICES = 325;
-	public static final short GEOMETRY__SEGMENTINFO = 326;
-	public static final short GEOMETRY__ADJUSTVALUE = 327;
-	public static final short GEOMETRY__ADJUST2VALUE = 328;
-	public static final short GEOMETRY__ADJUST3VALUE = 329;
-	public static final short GEOMETRY__ADJUST4VALUE = 330;
-	public static final short GEOMETRY__ADJUST5VALUE = 331;
-	public static final short GEOMETRY__ADJUST6VALUE = 332;
-	public static final short GEOMETRY__ADJUST7VALUE = 333;
-	public static final short GEOMETRY__ADJUST8VALUE = 334;
-	public static final short GEOMETRY__ADJUST9VALUE = 335;
-	public static final short GEOMETRY__ADJUST10VALUE = 336;
-	public static final short GEOMETRY__SHADOWok = 378;
-	public static final short GEOMETRY__3DOK = 379;
-	public static final short GEOMETRY__LINEOK = 380;
-	public static final short GEOMETRY__GEOTEXTOK = 381;
-	public static final short GEOMETRY__FILLSHADESHAPEOK = 382;
-	public static final short GEOMETRY__FILLOK = 383;
-	public static final short FILL__FILLTYPE = 384;
-	public static final short FILL__FILLCOLOR = 385;
-	public static final short FILL__FILLOPACITY = 386;
-	public static final short FILL__FILLBACKCOLOR = 387;
-	public static final short FILL__BACKOPACITY = 388;
-	public static final short FILL__CRMOD = 389;
-	public static final short FILL__PATTERNTEXTURE = 390;
-	public static final short FILL__BLIPFILENAME = 391;
-	public static final short FILL__BLIPFLAGS = 392;
-	public static final short FILL__WIDTH = 393;
-	public static final short FILL__HEIGHT = 394;
-	public static final short FILL__ANGLE = 395;
-	public static final short FILL__FOCUS = 396;
-	public static final short FILL__TOLEFT = 397;
-	public static final short FILL__TOTOP = 398;
-	public static final short FILL__TORIGHT = 399;
-	public static final short FILL__TOBOTTOM = 400;
-	public static final short FILL__RECTLEFT = 401;
-	public static final short FILL__RECTTOP = 402;
-	public static final short FILL__RECTRIGHT = 403;
-	public static final short FILL__RECTBOTTOM = 404;
-	public static final short FILL__DZTYPE = 405;
-	public static final short FILL__SHADEPRESET = 406;
-	public static final short FILL__SHADECOLORS = 407;
-	public static final short FILL__ORIGINX = 408;
-	public static final short FILL__ORIGINY = 409;
-	public static final short FILL__SHAPEORIGINX = 410;
-	public static final short FILL__SHAPEORIGINY = 411;
-	public static final short FILL__SHADETYPE = 412;
-	public static final short FILL__FILLED = 443;
-	public static final short FILL__HITTESTFILL = 444;
-	public static final short FILL__SHAPE = 445;
-	public static final short FILL__USERECT = 446;
-	public static final short FILL__NOFILLHITTEST = 447;
-	public static final short LINESTYLE__COLOR = 448;
-	public static final short LINESTYLE__OPACITY = 449;
-	public static final short LINESTYLE__BACKCOLOR = 450;
-	public static final short LINESTYLE__CRMOD = 451;
-	public static final short LINESTYLE__LINETYPE = 452;
-	public static final short LINESTYLE__FILLBLIP = 453;
-	public static final short LINESTYLE__FILLBLIPNAME = 454;
-	public static final short LINESTYLE__FILLBLIPFLAGS = 455;
-	public static final short LINESTYLE__FILLWIDTH = 456;
-	public static final short LINESTYLE__FILLHEIGHT = 457;
-	public static final short LINESTYLE__FILLDZTYPE = 458;
-	public static final short LINESTYLE__LINEWIDTH = 459;
-	public static final short LINESTYLE__LINEMITERLIMIT = 460;
-	public static final short LINESTYLE__LINESTYLE = 461;
-	public static final short LINESTYLE__LINEDASHING = 462;
-	public static final short LINESTYLE__LINEDASHSTYLE = 463;
-	public static final short LINESTYLE__LINESTARTARROWHEAD = 464;
-	public static final short LINESTYLE__LINEENDARROWHEAD = 465;
-	public static final short LINESTYLE__LINESTARTARROWWIDTH = 466;
-	public static final short LINESTYLE__LINESTARTARROWLENGTH = 467;
-	public static final short LINESTYLE__LINEENDARROWWIDTH = 468;
-	public static final short LINESTYLE__LINEENDARROWLENGTH = 469;
-	public static final short LINESTYLE__LINEJOINSTYLE = 470;
-	public static final short LINESTYLE__LINEENDCAPSTYLE = 471;
-	public static final short LINESTYLE__ARROWHEADSOK = 507;
-	public static final short LINESTYLE__ANYLINE = 508;
-	public static final short LINESTYLE__HITLINETEST = 509;
-	public static final short LINESTYLE__LINEFILLSHAPE = 510;
-	public static final short LINESTYLE__NOLINEDRAWDASH = 511;
-	public static final short LINESTYLE__NOLINEDRAWDASH_LEFT = 0x057F;
-	public static final short LINESTYLE__NOLINEDRAWDASH_TOP = 0x05BF;
-	public static final short LINESTYLE__NOLINEDRAWDASH_BOTTOM = 0x063F;
-	public static final short LINESTYLE__NOLINEDRAWDASH_RIGHT = 0x05FF;
-	public static final short SHADOWSTYLE__TYPE = 512;
-	public static final short SHADOWSTYLE__COLOR = 513;
-	public static final short SHADOWSTYLE__HIGHLIGHT = 514;
-	public static final short SHADOWSTYLE__CRMOD = 515;
-	public static final short SHADOWSTYLE__OPACITY = 516;
-	public static final short SHADOWSTYLE__OFFSETX = 517;
-	public static final short SHADOWSTYLE__OFFSETY = 518;
-	public static final short SHADOWSTYLE__SECONDOFFSETX = 519;
-	public static final short SHADOWSTYLE__SECONDOFFSETY = 520;
-	public static final short SHADOWSTYLE__SCALEXTOX = 521;
-	public static final short SHADOWSTYLE__SCALEYTOX = 522;
-	public static final short SHADOWSTYLE__SCALEXTOY = 523;
-	public static final short SHADOWSTYLE__SCALEYTOY = 524;
-	public static final short SHADOWSTYLE__PERSPECTIVEX = 525;
-	public static final short SHADOWSTYLE__PERSPECTIVEY = 526;
-	public static final short SHADOWSTYLE__WEIGHT = 527;
-	public static final short SHADOWSTYLE__ORIGINX = 528;
-	public static final short SHADOWSTYLE__ORIGINY = 529;
-	public static final short SHADOWSTYLE__SHADOW = 574;
-	public static final short SHADOWSTYLE__SHADOWOBSURED = 575;
-	public static final short PERSPECTIVE__TYPE = 576;
-	public static final short PERSPECTIVE__OFFSETX = 577;
-	public static final short PERSPECTIVE__OFFSETY = 578;
-	public static final short PERSPECTIVE__SCALEXTOX = 579;
-	public static final short PERSPECTIVE__SCALEYTOX = 580;
-	public static final short PERSPECTIVE__SCALEXTOY = 581;
-	public static final short PERSPECTIVE__SCALEYTOY = 582;
-	public static final short PERSPECTIVE__PERSPECTIVEX = 583;
-	public static final short PERSPECTIVE__PERSPECTIVEY = 584;
-	public static final short PERSPECTIVE__WEIGHT = 585;
-	public static final short PERSPECTIVE__ORIGINX = 586;
-	public static final short PERSPECTIVE__ORIGINY = 587;
-	public static final short PERSPECTIVE__PERSPECTIVEON = 639;
-	public static final short THREED__SPECULARAMOUNT = 640;
-	public static final short THREED__DIFFUSEAMOUNT = 661;
-	public static final short THREED__SHININESS = 662;
-	public static final short THREED__EDGETHICKNESS = 663;
-	public static final short THREED__EXTRUDEFORWARD = 664;
-	public static final short THREED__EXTRUDEBACKWARD = 665;
-	public static final short THREED__EXTRUDEPLANE = 666;
-	public static final short THREED__EXTRUSIONCOLOR = 667;
-	public static final short THREED__CRMOD = 648;
-	public static final short THREED__3DEFFECT = 700;
-	public static final short THREED__METALLIC = 701;
-	public static final short THREED__USEEXTRUSIONCOLOR = 702;
-	public static final short THREED__LIGHTFACE = 703;
-	public static final short THREEDSTYLE__YROTATIONANGLE = 704;
-	public static final short THREEDSTYLE__XROTATIONANGLE = 705;
-	public static final short THREEDSTYLE__ROTATIONAXISX = 706;
-	public static final short THREEDSTYLE__ROTATIONAXISY = 707;
-	public static final short THREEDSTYLE__ROTATIONAXISZ = 708;
-	public static final short THREEDSTYLE__ROTATIONANGLE = 709;
-	public static final short THREEDSTYLE__ROTATIONCENTERX = 710;
-	public static final short THREEDSTYLE__ROTATIONCENTERY = 711;
-	public static final short THREEDSTYLE__ROTATIONCENTERZ = 712;
-	public static final short THREEDSTYLE__RENDERMODE = 713;
-	public static final short THREEDSTYLE__TOLERANCE = 714;
-	public static final short THREEDSTYLE__XVIEWPOINT = 715;
-	public static final short THREEDSTYLE__YVIEWPOINT = 716;
-	public static final short THREEDSTYLE__ZVIEWPOINT = 717;
-	public static final short THREEDSTYLE__ORIGINX = 718;
-	public static final short THREEDSTYLE__ORIGINY = 719;
-	public static final short THREEDSTYLE__SKEWANGLE = 720;
-	public static final short THREEDSTYLE__SKEWAMOUNT = 721;
-	public static final short THREEDSTYLE__AMBIENTINTENSITY = 722;
-	public static final short THREEDSTYLE__KEYX = 723;
-	public static final short THREEDSTYLE__KEYY = 724;
-	public static final short THREEDSTYLE__KEYZ = 725;
-	public static final short THREEDSTYLE__KEYINTENSITY = 726;
-	public static final short THREEDSTYLE__FILLX = 727;
-	public static final short THREEDSTYLE__FILLY = 728;
-	public static final short THREEDSTYLE__FILLZ = 729;
-	public static final short THREEDSTYLE__FILLINTENSITY = 730;
-	public static final short THREEDSTYLE__CONSTRAINROTATION = 763;
-	public static final short THREEDSTYLE__ROTATIONCENTERAUTO = 764;
-	public static final short THREEDSTYLE__PARALLEL = 765;
-	public static final short THREEDSTYLE__KEYHARSH = 766;
-	public static final short THREEDSTYLE__FILLHARSH = 767;
-	public static final short SHAPE__MASTER = 769;
-	public static final short SHAPE__CONNECTORSTYLE = 771;
-	public static final short SHAPE__BLACKANDWHITESETTINGS = 772;
-	public static final short SHAPE__WMODEPUREBW = 773;
-	public static final short SHAPE__WMODEBW = 774;
-	public static final short SHAPE__OLEICON = 826;
-	public static final short SHAPE__PREFERRELATIVERESIZE = 827;
-	public static final short SHAPE__LOCKSHAPETYPE = 828;
-	public static final short SHAPE__DELETEATTACHEDOBJECT = 830;
-	public static final short SHAPE__BACKGROUNDSHAPE = 831;
-	public static final short CALLOUT__CALLOUTTYPE = 832;
-	public static final short CALLOUT__XYCALLOUTGAP = 833;
-	public static final short CALLOUT__CALLOUTANGLE = 834;
-	public static final short CALLOUT__CALLOUTDROPTYPE = 835;
-	public static final short CALLOUT__CALLOUTDROPSPECIFIED = 836;
-	public static final short CALLOUT__CALLOUTLENGTHSPECIFIED = 837;
-	public static final short CALLOUT__ISCALLOUT = 889;
-	public static final short CALLOUT__CALLOUTACCENTBAR = 890;
-	public static final short CALLOUT__CALLOUTTEXTBORDER = 891;
-	public static final short CALLOUT__CALLOUTMINUSX = 892;
-	public static final short CALLOUT__CALLOUTMINUSY = 893;
-	public static final short CALLOUT__DROPAUTO = 894;
-	public static final short CALLOUT__LENGTHSPECIFIED = 895;
-	public static final short GROUPSHAPE__SHAPENAME = 0x0380;
-	public static final short GROUPSHAPE__DESCRIPTION = 0x0381;
-    public static final short GROUPSHAPE__HYPERLINK = 0x0382;
-	public static final short GROUPSHAPE__WRAPPOLYGONVERTICES = 0x0383;
-	public static final short GROUPSHAPE__WRAPDISTLEFT = 0x0384;
-	public static final short GROUPSHAPE__WRAPDISTTOP = 0x0385;
-	public static final short GROUPSHAPE__WRAPDISTRIGHT = 0x0386;
-	public static final short GROUPSHAPE__WRAPDISTBOTTOM = 0x0387;
-    public static final short GROUPSHAPE__REGROUPID = 0x0388;
-    public static final short GROUPSHAPE__UNUSED906 = 0x038A;
-    public static final short GROUPSHAPE__TOOLTIP = 0x038D;
-    public static final short GROUPSHAPE__SCRIPT = 0x038E;
-    public static final short GROUPSHAPE__POSH = 0x038F;
-    public static final short GROUPSHAPE__POSRELH = 0x0390;
-    public static final short GROUPSHAPE__POSV = 0x0391;
-    public static final short GROUPSHAPE__POSRELV = 0x0392;
-    public static final short GROUPSHAPE__HR_PCT = 0x0393;
-    public static final short GROUPSHAPE__HR_ALIGN = 0x0394;
-    public static final short GROUPSHAPE__HR_HEIGHT = 0x0395;
-    public static final short GROUPSHAPE__HR_WIDTH = 0x0396;
-    public static final short GROUPSHAPE__SCRIPTEXT = 0x0397;
-    public static final short GROUPSHAPE__SCRIPTLANG = 0x0398;
-    public static final short GROUPSHAPE__BORDERTOPCOLOR = 0x039B;
-    public static final short GROUPSHAPE__BORDERLEFTCOLOR = 0x039C;
-    public static final short GROUPSHAPE__BORDERBOTTOMCOLOR = 0x039D;
-    public static final short GROUPSHAPE__BORDERRIGHTCOLOR = 0x039E;
-    public static final short GROUPSHAPE__TABLEPROPERTIES = 0x039F;
-    public static final short GROUPSHAPE__TABLEROWPROPERTIES = 0x03A0;
-    public static final short GROUPSHAPE__WEBBOT = 0x03A5;
-    public static final short GROUPSHAPE__METROBLOB = 0x03A9;
-    public static final short GROUPSHAPE__ZORDER = 0x03AA;
-    public static final short GROUPSHAPE__FLAGS = 0x03BF;
-	public static final short GROUPSHAPE__EDITEDWRAP = 953;
-	public static final short GROUPSHAPE__BEHINDDOCUMENT = 954;
-	public static final short GROUPSHAPE__ONDBLCLICKNOTIFY = 955;
-	public static final short GROUPSHAPE__ISBUTTON = 956;
-	public static final short GROUPSHAPE__1DADJUSTMENT = 957;
-	public static final short GROUPSHAPE__HIDDEN = 958;
-	public static final short GROUPSHAPE__PRINT = 959;
-
-	private static final Map<Short, EscherPropertyMetaData> properties = initProps();
-
-	private static Map<Short, EscherPropertyMetaData> initProps() {
-		Map<Short, EscherPropertyMetaData> m = new HashMap<Short, EscherPropertyMetaData>();
-		addProp(m, TRANSFORM__ROTATION, "transform.rotation");
-		addProp(m, PROTECTION__LOCKROTATION, "protection.lockrotation");
-		addProp(m, PROTECTION__LOCKASPECTRATIO, "protection.lockaspectratio");
-		addProp(m, PROTECTION__LOCKPOSITION, "protection.lockposition");
-		addProp(m, PROTECTION__LOCKAGAINSTSELECT, "protection.lockagainstselect");
-		addProp(m, PROTECTION__LOCKCROPPING, "protection.lockcropping");
-		addProp(m, PROTECTION__LOCKVERTICES, "protection.lockvertices");
-		addProp(m, PROTECTION__LOCKTEXT, "protection.locktext");
-		addProp(m, PROTECTION__LOCKADJUSTHANDLES, "protection.lockadjusthandles");
-		addProp(m, PROTECTION__LOCKAGAINSTGROUPING, "protection.lockagainstgrouping", EscherPropertyMetaData.TYPE_BOOLEAN);
-		addProp(m, TEXT__TEXTID, "text.textid");
-		addProp(m, TEXT__TEXTLEFT, "text.textleft");
-		addProp(m, TEXT__TEXTTOP, "text.texttop");
-		addProp(m, TEXT__TEXTRIGHT, "text.textright");
-		addProp(m, TEXT__TEXTBOTTOM, "text.textbottom");
-		addProp(m, TEXT__WRAPTEXT, "text.wraptext");
-		addProp(m, TEXT__SCALETEXT, "text.scaletext");
-		addProp(m, TEXT__ANCHORTEXT, "text.anchortext");
-		addProp(m, TEXT__TEXTFLOW, "text.textflow");
-		addProp(m, TEXT__FONTROTATION, "text.fontrotation");
-		addProp(m, TEXT__IDOFNEXTSHAPE, "text.idofnextshape");
-		addProp(m, TEXT__BIDIR, "text.bidir");
-		addProp(m, TEXT__SINGLECLICKSELECTS, "text.singleclickselects");
-		addProp(m, TEXT__USEHOSTMARGINS, "text.usehostmargins");
-		addProp(m, TEXT__ROTATETEXTWITHSHAPE, "text.rotatetextwithshape");
-		addProp(m, TEXT__SIZESHAPETOFITTEXT, "text.sizeshapetofittext");
-		addProp(m, TEXT__SIZE_TEXT_TO_FIT_SHAPE, "text.sizetexttofitshape", EscherPropertyMetaData.TYPE_BOOLEAN);
-		addProp(m, GEOTEXT__UNICODE, "geotext.unicode");
-		addProp(m, GEOTEXT__RTFTEXT, "geotext.rtftext");
-		addProp(m, GEOTEXT__ALIGNMENTONCURVE, "geotext.alignmentoncurve");
-		addProp(m, GEOTEXT__DEFAULTPOINTSIZE, "geotext.defaultpointsize");
-		addProp(m, GEOTEXT__TEXTSPACING, "geotext.textspacing");
-		addProp(m, GEOTEXT__FONTFAMILYNAME, "geotext.fontfamilyname");
-		addProp(m, GEOTEXT__REVERSEROWORDER, "geotext.reverseroworder");
-		addProp(m, GEOTEXT__HASTEXTEFFECT, "geotext.hastexteffect");
-		addProp(m, GEOTEXT__ROTATECHARACTERS, "geotext.rotatecharacters");
-		addProp(m, GEOTEXT__KERNCHARACTERS, "geotext.kerncharacters");
-		addProp(m, GEOTEXT__TIGHTORTRACK, "geotext.tightortrack");
-		addProp(m, GEOTEXT__STRETCHTOFITSHAPE, "geotext.stretchtofitshape");
-		addProp(m, GEOTEXT__CHARBOUNDINGBOX, "geotext.charboundingbox");
-		addProp(m, GEOTEXT__SCALETEXTONPATH, "geotext.scaletextonpath");
-		addProp(m, GEOTEXT__STRETCHCHARHEIGHT, "geotext.stretchcharheight");
-		addProp(m, GEOTEXT__NOMEASUREALONGPATH, "geotext.nomeasurealongpath");
-		addProp(m, GEOTEXT__BOLDFONT, "geotext.boldfont");
-		addProp(m, GEOTEXT__ITALICFONT, "geotext.italicfont");
-		addProp(m, GEOTEXT__UNDERLINEFONT, "geotext.underlinefont");
-		addProp(m, GEOTEXT__SHADOWFONT, "geotext.shadowfont");
-		addProp(m, GEOTEXT__SMALLCAPSFONT, "geotext.smallcapsfont");
-		addProp(m, GEOTEXT__STRIKETHROUGHFONT, "geotext.strikethroughfont");
-		addProp(m, BLIP__CROPFROMTOP, "blip.cropfromtop");
-		addProp(m, BLIP__CROPFROMBOTTOM, "blip.cropfrombottom");
-		addProp(m, BLIP__CROPFROMLEFT, "blip.cropfromleft");
-		addProp(m, BLIP__CROPFROMRIGHT, "blip.cropfromright");
-		addProp(m, BLIP__BLIPTODISPLAY, "blip.bliptodisplay");
-		addProp(m, BLIP__BLIPFILENAME, "blip.blipfilename");
-		addProp(m, BLIP__BLIPFLAGS, "blip.blipflags");
-		addProp(m, BLIP__TRANSPARENTCOLOR, "blip.transparentcolor");
-		addProp(m, BLIP__CONTRASTSETTING, "blip.contrastsetting");
-		addProp(m, BLIP__BRIGHTNESSSETTING, "blip.brightnesssetting");
-		addProp(m, BLIP__GAMMA, "blip.gamma");
-		addProp(m, BLIP__PICTUREID, "blip.pictureid");
-		addProp(m, BLIP__DOUBLEMOD, "blip.doublemod");
-		addProp(m, BLIP__PICTUREFILLMOD, "blip.picturefillmod");
-		addProp(m, BLIP__PICTURELINE, "blip.pictureline");
-		addProp(m, BLIP__PRINTBLIP, "blip.printblip");
-		addProp(m, BLIP__PRINTBLIPFILENAME, "blip.printblipfilename");
-		addProp(m, BLIP__PRINTFLAGS, "blip.printflags");
-		addProp(m, BLIP__NOHITTESTPICTURE, "blip.nohittestpicture");
-		addProp(m, BLIP__PICTUREGRAY, "blip.picturegray");
-		addProp(m, BLIP__PICTUREBILEVEL, "blip.picturebilevel");
-		addProp(m, BLIP__PICTUREACTIVE, "blip.pictureactive");
-		addProp(m, GEOMETRY__LEFT, "geometry.left");
-		addProp(m, GEOMETRY__TOP, "geometry.top");
-		addProp(m, GEOMETRY__RIGHT, "geometry.right");
-		addProp(m, GEOMETRY__BOTTOM, "geometry.bottom");
-		addProp(m, GEOMETRY__SHAPEPATH, "geometry.shapepath", EscherPropertyMetaData.TYPE_SHAPEPATH);
-		addProp(m, GEOMETRY__VERTICES, "geometry.vertices", EscherPropertyMetaData.TYPE_ARRAY);
-		addProp(m, GEOMETRY__SEGMENTINFO, "geometry.segmentinfo", EscherPropertyMetaData.TYPE_ARRAY);
-		addProp(m, GEOMETRY__ADJUSTVALUE, "geometry.adjustvalue");
-		addProp(m, GEOMETRY__ADJUST2VALUE, "geometry.adjust2value");
-		addProp(m, GEOMETRY__ADJUST3VALUE, "geometry.adjust3value");
-		addProp(m, GEOMETRY__ADJUST4VALUE, "geometry.adjust4value");
-		addProp(m, GEOMETRY__ADJUST5VALUE, "geometry.adjust5value");
-		addProp(m, GEOMETRY__ADJUST6VALUE, "geometry.adjust6value");
-		addProp(m, GEOMETRY__ADJUST7VALUE, "geometry.adjust7value");
-		addProp(m, GEOMETRY__ADJUST8VALUE, "geometry.adjust8value");
-		addProp(m, GEOMETRY__ADJUST9VALUE, "geometry.adjust9value");
-		addProp(m, GEOMETRY__ADJUST10VALUE, "geometry.adjust10value");
-		addProp(m, GEOMETRY__SHADOWok, "geometry.shadowOK");
-		addProp(m, GEOMETRY__3DOK, "geometry.3dok");
-		addProp(m, GEOMETRY__LINEOK, "geometry.lineok");
-		addProp(m, GEOMETRY__GEOTEXTOK, "geometry.geotextok");
-		addProp(m, GEOMETRY__FILLSHADESHAPEOK, "geometry.fillshadeshapeok");
-		addProp(m, GEOMETRY__FILLOK, "geometry.fillok", EscherPropertyMetaData.TYPE_BOOLEAN);
-		addProp(m, FILL__FILLTYPE, "fill.filltype");
-		addProp(m, FILL__FILLCOLOR, "fill.fillcolor", EscherPropertyMetaData.TYPE_RGB);
-		addProp(m, FILL__FILLOPACITY, "fill.fillopacity");
-		addProp(m, FILL__FILLBACKCOLOR, "fill.fillbackcolor", EscherPropertyMetaData.TYPE_RGB);
-		addProp(m, FILL__BACKOPACITY, "fill.backopacity");
-		addProp(m, FILL__CRMOD, "fill.crmod");
-		addProp(m, FILL__PATTERNTEXTURE, "fill.patterntexture");
-		addProp(m, FILL__BLIPFILENAME, "fill.blipfilename");
-		addProp(m, FILL__BLIPFLAGS, "fill.blipflags");
-		addProp(m, FILL__WIDTH, "fill.width");
-		addProp(m, FILL__HEIGHT, "fill.height");
-		addProp(m, FILL__ANGLE, "fill.angle");
-		addProp(m, FILL__FOCUS, "fill.focus");
-		addProp(m, FILL__TOLEFT, "fill.toleft");
-		addProp(m, FILL__TOTOP, "fill.totop");
-		addProp(m, FILL__TORIGHT, "fill.toright");
-		addProp(m, FILL__TOBOTTOM, "fill.tobottom");
-		addProp(m, FILL__RECTLEFT, "fill.rectleft");
-		addProp(m, FILL__RECTTOP, "fill.recttop");
-		addProp(m, FILL__RECTRIGHT, "fill.rectright");
-		addProp(m, FILL__RECTBOTTOM, "fill.rectbottom");
-		addProp(m, FILL__DZTYPE, "fill.dztype");
-		addProp(m, FILL__SHADEPRESET, "fill.shadepreset");
-		addProp(m, FILL__SHADECOLORS, "fill.shadecolors", EscherPropertyMetaData.TYPE_ARRAY);
-		addProp(m, FILL__ORIGINX, "fill.originx");
-		addProp(m, FILL__ORIGINY, "fill.originy");
-		addProp(m, FILL__SHAPEORIGINX, "fill.shapeoriginx");
-		addProp(m, FILL__SHAPEORIGINY, "fill.shapeoriginy");
-		addProp(m, FILL__SHADETYPE, "fill.shadetype");
-		addProp(m, FILL__FILLED, "fill.filled");
-		addProp(m, FILL__HITTESTFILL, "fill.hittestfill");
-		addProp(m, FILL__SHAPE, "fill.shape");
-		addProp(m, FILL__USERECT, "fill.userect");
-		addProp(m, FILL__NOFILLHITTEST, "fill.nofillhittest", EscherPropertyMetaData.TYPE_BOOLEAN);
-		addProp(m, LINESTYLE__COLOR, "linestyle.color", EscherPropertyMetaData.TYPE_RGB);
-		addProp(m, LINESTYLE__OPACITY, "linestyle.opacity");
-		addProp(m, LINESTYLE__BACKCOLOR, "linestyle.backcolor", EscherPropertyMetaData.TYPE_RGB);
-		addProp(m, LINESTYLE__CRMOD, "linestyle.crmod");
-		addProp(m, LINESTYLE__LINETYPE, "linestyle.linetype");
-		addProp(m, LINESTYLE__FILLBLIP, "linestyle.fillblip");
-		addProp(m, LINESTYLE__FILLBLIPNAME, "linestyle.fillblipname");
-		addProp(m, LINESTYLE__FILLBLIPFLAGS, "linestyle.fillblipflags");
-		addProp(m, LINESTYLE__FILLWIDTH, "linestyle.fillwidth");
-		addProp(m, LINESTYLE__FILLHEIGHT, "linestyle.fillheight");
-		addProp(m, LINESTYLE__FILLDZTYPE, "linestyle.filldztype");
-		addProp(m, LINESTYLE__LINEWIDTH, "linestyle.linewidth");
-		addProp(m, LINESTYLE__LINEMITERLIMIT, "linestyle.linemiterlimit");
-		addProp(m, LINESTYLE__LINESTYLE, "linestyle.linestyle");
-		addProp(m, LINESTYLE__LINEDASHING, "linestyle.linedashing");
-		addProp(m, LINESTYLE__LINEDASHSTYLE, "linestyle.linedashstyle", EscherPropertyMetaData.TYPE_ARRAY);
-		addProp(m, LINESTYLE__LINESTARTARROWHEAD, "linestyle.linestartarrowhead");
-		addProp(m, LINESTYLE__LINEENDARROWHEAD, "linestyle.lineendarrowhead");
-		addProp(m, LINESTYLE__LINESTARTARROWWIDTH, "linestyle.linestartarrowwidth");
-		addProp(m, LINESTYLE__LINESTARTARROWLENGTH, "linestyle.linestartarrowlength");
-		addProp(m, LINESTYLE__LINEENDARROWWIDTH, "linestyle.lineendarrowwidth");
-		addProp(m, LINESTYLE__LINEENDARROWLENGTH, "linestyle.lineendarrowlength");
-		addProp(m, LINESTYLE__LINEJOINSTYLE, "linestyle.linejoinstyle");
-		addProp(m, LINESTYLE__LINEENDCAPSTYLE, "linestyle.lineendcapstyle");
-		addProp(m, LINESTYLE__ARROWHEADSOK, "linestyle.arrowheadsok");
-		addProp(m, LINESTYLE__ANYLINE, "linestyle.anyline");
-		addProp(m, LINESTYLE__HITLINETEST, "linestyle.hitlinetest");
-		addProp(m, LINESTYLE__LINEFILLSHAPE, "linestyle.linefillshape");
-		addProp(m, LINESTYLE__NOLINEDRAWDASH, "linestyle.nolinedrawdash", EscherPropertyMetaData.TYPE_BOOLEAN);
-        addProp(m, LINESTYLE__NOLINEDRAWDASH_LEFT, "linestyle.nolinedrawdash.left", EscherPropertyMetaData.TYPE_BOOLEAN);
-        addProp(m, LINESTYLE__NOLINEDRAWDASH_TOP, "linestyle.nolinedrawdash.top", EscherPropertyMetaData.TYPE_BOOLEAN);
-        addProp(m, LINESTYLE__NOLINEDRAWDASH_BOTTOM, "linestyle.nolinedrawdash.bottom", EscherPropertyMetaData.TYPE_BOOLEAN);
-        addProp(m, LINESTYLE__NOLINEDRAWDASH_RIGHT, "linestyle.nolinedrawdash.right", EscherPropertyMetaData.TYPE_BOOLEAN);
-		addProp(m, SHADOWSTYLE__TYPE, "shadowstyle.type");
-		addProp(m, SHADOWSTYLE__COLOR, "shadowstyle.color", EscherPropertyMetaData.TYPE_RGB);
-		addProp(m, SHADOWSTYLE__HIGHLIGHT, "shadowstyle.highlight");
-		addProp(m, SHADOWSTYLE__CRMOD, "shadowstyle.crmod");
-		addProp(m, SHADOWSTYLE__OPACITY, "shadowstyle.opacity");
-		addProp(m, SHADOWSTYLE__OFFSETX, "shadowstyle.offsetx");
-		addProp(m, SHADOWSTYLE__OFFSETY, "shadowstyle.offsety");
-		addProp(m, SHADOWSTYLE__SECONDOFFSETX, "shadowstyle.secondoffsetx");
-		addProp(m, SHADOWSTYLE__SECONDOFFSETY, "shadowstyle.secondoffsety");
-		addProp(m, SHADOWSTYLE__SCALEXTOX, "shadowstyle.scalextox");
-		addProp(m, SHADOWSTYLE__SCALEYTOX, "shadowstyle.scaleytox");
-		addProp(m, SHADOWSTYLE__SCALEXTOY, "shadowstyle.scalextoy");
-		addProp(m, SHADOWSTYLE__SCALEYTOY, "shadowstyle.scaleytoy");
-		addProp(m, SHADOWSTYLE__PERSPECTIVEX, "shadowstyle.perspectivex");
-		addProp(m, SHADOWSTYLE__PERSPECTIVEY, "shadowstyle.perspectivey");
-		addProp(m, SHADOWSTYLE__WEIGHT, "shadowstyle.weight");
-		addProp(m, SHADOWSTYLE__ORIGINX, "shadowstyle.originx");
-		addProp(m, SHADOWSTYLE__ORIGINY, "shadowstyle.originy");
-		addProp(m, SHADOWSTYLE__SHADOW, "shadowstyle.shadow");
-		addProp(m, SHADOWSTYLE__SHADOWOBSURED, "shadowstyle.shadowobscured");
-		addProp(m, PERSPECTIVE__TYPE, "perspective.type");
-		addProp(m, PERSPECTIVE__OFFSETX, "perspective.offsetx");
-		addProp(m, PERSPECTIVE__OFFSETY, "perspective.offsety");
-		addProp(m, PERSPECTIVE__SCALEXTOX, "perspective.scalextox");
-		addProp(m, PERSPECTIVE__SCALEYTOX, "perspective.scaleytox");
-		addProp(m, PERSPECTIVE__SCALEXTOY, "perspective.scalextoy");
-		addProp(m, PERSPECTIVE__SCALEYTOY, "perspective.scaleytoy");
-		addProp(m, PERSPECTIVE__PERSPECTIVEX, "perspective.perspectivex");
-		addProp(m, PERSPECTIVE__PERSPECTIVEY, "perspective.perspectivey");
-		addProp(m, PERSPECTIVE__WEIGHT, "perspective.weight");
-		addProp(m, PERSPECTIVE__ORIGINX, "perspective.originx");
-		addProp(m, PERSPECTIVE__ORIGINY, "perspective.originy");
-		addProp(m, PERSPECTIVE__PERSPECTIVEON, "perspective.perspectiveon");
-		addProp(m, THREED__SPECULARAMOUNT, "3d.specularamount");
-		addProp(m, THREED__DIFFUSEAMOUNT, "3d.diffuseamount");
-		addProp(m, THREED__SHININESS, "3d.shininess");
-		addProp(m, THREED__EDGETHICKNESS, "3d.edgethickness");
-		addProp(m, THREED__EXTRUDEFORWARD, "3d.extrudeforward");
-		addProp(m, THREED__EXTRUDEBACKWARD, "3d.extrudebackward");
-		addProp(m, THREED__EXTRUDEPLANE, "3d.extrudeplane");
-		addProp(m, THREED__EXTRUSIONCOLOR, "3d.extrusioncolor", EscherPropertyMetaData.TYPE_RGB);
-		addProp(m, THREED__CRMOD, "3d.crmod");
-		addProp(m, THREED__3DEFFECT, "3d.3deffect");
-		addProp(m, THREED__METALLIC, "3d.metallic");
-		addProp(m, THREED__USEEXTRUSIONCOLOR, "3d.useextrusioncolor", EscherPropertyMetaData.TYPE_RGB);
-		addProp(m, THREED__LIGHTFACE, "3d.lightface");
-		addProp(m, THREEDSTYLE__YROTATIONANGLE, "3dstyle.yrotationangle");
-		addProp(m, THREEDSTYLE__XROTATIONANGLE, "3dstyle.xrotationangle");
-		addProp(m, THREEDSTYLE__ROTATIONAXISX, "3dstyle.rotationaxisx");
-		addProp(m, THREEDSTYLE__ROTATIONAXISY, "3dstyle.rotationaxisy");
-		addProp(m, THREEDSTYLE__ROTATIONAXISZ, "3dstyle.rotationaxisz");
-		addProp(m, THREEDSTYLE__ROTATIONANGLE, "3dstyle.rotationangle");
-		addProp(m, THREEDSTYLE__ROTATIONCENTERX, "3dstyle.rotationcenterx");
-		addProp(m, THREEDSTYLE__ROTATIONCENTERY, "3dstyle.rotationcentery");
-		addProp(m, THREEDSTYLE__ROTATIONCENTERZ, "3dstyle.rotationcenterz");
-		addProp(m, THREEDSTYLE__RENDERMODE, "3dstyle.rendermode");
-		addProp(m, THREEDSTYLE__TOLERANCE, "3dstyle.tolerance");
-		addProp(m, THREEDSTYLE__XVIEWPOINT, "3dstyle.xviewpoint");
-		addProp(m, THREEDSTYLE__YVIEWPOINT, "3dstyle.yviewpoint");
-		addProp(m, THREEDSTYLE__ZVIEWPOINT, "3dstyle.zviewpoint");
-		addProp(m, THREEDSTYLE__ORIGINX, "3dstyle.originx");
-		addProp(m, THREEDSTYLE__ORIGINY, "3dstyle.originy");
-		addProp(m, THREEDSTYLE__SKEWANGLE, "3dstyle.skewangle");
-		addProp(m, THREEDSTYLE__SKEWAMOUNT, "3dstyle.skewamount");
-		addProp(m, THREEDSTYLE__AMBIENTINTENSITY, "3dstyle.ambientintensity");
-		addProp(m, THREEDSTYLE__KEYX, "3dstyle.keyx");
-		addProp(m, THREEDSTYLE__KEYY, "3dstyle.keyy");
-		addProp(m, THREEDSTYLE__KEYZ, "3dstyle.keyz");
-		addProp(m, THREEDSTYLE__KEYINTENSITY, "3dstyle.keyintensity");
-		addProp(m, THREEDSTYLE__FILLX, "3dstyle.fillx");
-		addProp(m, THREEDSTYLE__FILLY, "3dstyle.filly");
-		addProp(m, THREEDSTYLE__FILLZ, "3dstyle.fillz");
-		addProp(m, THREEDSTYLE__FILLINTENSITY, "3dstyle.fillintensity");
-		addProp(m, THREEDSTYLE__CONSTRAINROTATION, "3dstyle.constrainrotation");
-		addProp(m, THREEDSTYLE__ROTATIONCENTERAUTO, "3dstyle.rotationcenterauto");
-		addProp(m, THREEDSTYLE__PARALLEL, "3dstyle.parallel");
-		addProp(m, THREEDSTYLE__KEYHARSH, "3dstyle.keyharsh");
-		addProp(m, THREEDSTYLE__FILLHARSH, "3dstyle.fillharsh");
-		addProp(m, SHAPE__MASTER, "shape.master");
-		addProp(m, SHAPE__CONNECTORSTYLE, "shape.connectorstyle");
-		addProp(m, SHAPE__BLACKANDWHITESETTINGS, "shape.blackandwhitesettings");
-		addProp(m, SHAPE__WMODEPUREBW, "shape.wmodepurebw");
-		addProp(m, SHAPE__WMODEBW, "shape.wmodebw");
-		addProp(m, SHAPE__OLEICON, "shape.oleicon");
-		addProp(m, SHAPE__PREFERRELATIVERESIZE, "shape.preferrelativeresize");
-		addProp(m, SHAPE__LOCKSHAPETYPE, "shape.lockshapetype");
-		addProp(m, SHAPE__DELETEATTACHEDOBJECT, "shape.deleteattachedobject");
-		addProp(m, SHAPE__BACKGROUNDSHAPE, "shape.backgroundshape");
-		addProp(m, CALLOUT__CALLOUTTYPE, "callout.callouttype");
-		addProp(m, CALLOUT__XYCALLOUTGAP, "callout.xycalloutgap");
-		addProp(m, CALLOUT__CALLOUTANGLE, "callout.calloutangle");
-		addProp(m, CALLOUT__CALLOUTDROPTYPE, "callout.calloutdroptype");
-		addProp(m, CALLOUT__CALLOUTDROPSPECIFIED, "callout.calloutdropspecified");
-		addProp(m, CALLOUT__CALLOUTLENGTHSPECIFIED, "callout.calloutlengthspecified");
-		addProp(m, CALLOUT__ISCALLOUT, "callout.iscallout");
-		addProp(m, CALLOUT__CALLOUTACCENTBAR, "callout.calloutaccentbar");
-		addProp(m, CALLOUT__CALLOUTTEXTBORDER, "callout.callouttextborder");
-		addProp(m, CALLOUT__CALLOUTMINUSX, "callout.calloutminusx");
-		addProp(m, CALLOUT__CALLOUTMINUSY, "callout.calloutminusy");
-		addProp(m, CALLOUT__DROPAUTO, "callout.dropauto");
-		addProp(m, CALLOUT__LENGTHSPECIFIED, "callout.lengthspecified");
-		addProp(m, GROUPSHAPE__SHAPENAME, "groupshape.shapename");
-		addProp(m, GROUPSHAPE__DESCRIPTION, "groupshape.description");
-		addProp(m, GROUPSHAPE__HYPERLINK, "groupshape.hyperlink");
-		addProp(m, GROUPSHAPE__WRAPPOLYGONVERTICES, "groupshape.wrappolygonvertices", EscherPropertyMetaData.TYPE_ARRAY);
-		addProp(m, GROUPSHAPE__WRAPDISTLEFT, "groupshape.wrapdistleft");
-		addProp(m, GROUPSHAPE__WRAPDISTTOP, "groupshape.wrapdisttop");
-		addProp(m, GROUPSHAPE__WRAPDISTRIGHT, "groupshape.wrapdistright");
-		addProp(m, GROUPSHAPE__WRAPDISTBOTTOM, "groupshape.wrapdistbottom");
-		addProp(m, GROUPSHAPE__REGROUPID, "groupshape.regroupid");
-        addProp( m, GROUPSHAPE__UNUSED906, "unused906" ); // 0x038A;
-        addProp( m, GROUPSHAPE__TOOLTIP, "groupshape.wzTooltip" ); // 0x038D;
-        addProp( m, GROUPSHAPE__SCRIPT, "groupshape.wzScript" ); // 0x038E;
-        addProp( m, GROUPSHAPE__POSH, "groupshape.posh" ); // 0x038F;
-        addProp( m, GROUPSHAPE__POSRELH, "groupshape.posrelh" ); // 0x0390;
-        addProp( m, GROUPSHAPE__POSV, "groupshape.posv" ); // 0x0391;
-        addProp( m, GROUPSHAPE__POSRELV, "groupshape.posrelv" ); // 0x0392;
-        addProp( m, GROUPSHAPE__HR_PCT, "groupshape.pctHR" ); // 0x0393;
-        addProp( m, GROUPSHAPE__HR_ALIGN, "groupshape.alignHR" ); // 0x0394;
-        addProp( m, GROUPSHAPE__HR_HEIGHT, "groupshape.dxHeightHR" ); // 0x0395;
-        addProp( m, GROUPSHAPE__HR_WIDTH, "groupshape.dxWidthHR" ); // 0x0396;
-        addProp( m, GROUPSHAPE__SCRIPTEXT, "groupshape.wzScriptExtAttr" ); // 0x0397;
-        addProp( m, GROUPSHAPE__SCRIPTLANG, "groupshape.scriptLang" ); // 0x0398;
-        addProp( m, GROUPSHAPE__BORDERTOPCOLOR, "groupshape.borderTopColor" ); // 0x039B;
-        addProp( m, GROUPSHAPE__BORDERLEFTCOLOR, "groupshape.borderLeftColor" ); // 0x039C;
-        addProp( m, GROUPSHAPE__BORDERBOTTOMCOLOR, "groupshape.borderBottomColor" ); // 0x039D;
-        addProp( m, GROUPSHAPE__BORDERRIGHTCOLOR, "groupshape.borderRightColor" ); // 0x039E;
-        addProp( m, GROUPSHAPE__TABLEPROPERTIES, "groupshape.tableProperties" ); // 0x039F;
-        addProp( m, GROUPSHAPE__TABLEROWPROPERTIES, "groupshape.tableRowProperties" ); // 0x03A0;
-        addProp( m, GROUPSHAPE__WEBBOT, "groupshape.wzWebBot" ); // 0x03A5;
-        addProp( m, GROUPSHAPE__METROBLOB, "groupshape.metroBlob" ); // 0x03A9;
-        addProp( m, GROUPSHAPE__ZORDER, "groupshape.dhgt" ); // 0x03AA;
-        addProp( m, GROUPSHAPE__FLAGS, "groupshape.GroupShapeBooleanProperties" ); // 0x03BF;
-
-		addProp(m, GROUPSHAPE__EDITEDWRAP, "groupshape.editedwrap");
-		addProp(m, GROUPSHAPE__BEHINDDOCUMENT, "groupshape.behinddocument");
-		addProp(m, GROUPSHAPE__ONDBLCLICKNOTIFY, "groupshape.ondblclicknotify");
-		addProp(m, GROUPSHAPE__ISBUTTON, "groupshape.isbutton");
-		addProp(m, GROUPSHAPE__1DADJUSTMENT, "groupshape.1dadjustment");
-		addProp(m, GROUPSHAPE__HIDDEN, "groupshape.hidden");
-		addProp(m, GROUPSHAPE__PRINT, "groupshape.print", EscherPropertyMetaData.TYPE_BOOLEAN);
-		return m;
-	}
-
-	private static void addProp(Map<Short, EscherPropertyMetaData> m, int s, String propName) {
-		m.put(Short.valueOf((short) s), new EscherPropertyMetaData(propName));
-	}
-
-	private static void addProp(Map<Short, EscherPropertyMetaData> m, int s, String propName, byte type) {
-		m.put(Short.valueOf((short) s), new EscherPropertyMetaData(propName, type));
-	}
-
-	public static String getPropertyName(short propertyId) {
-		EscherPropertyMetaData o = properties.get(Short.valueOf(propertyId));
-		return o == null ? "unknown" : o.getDescription();
-	}
-
-	public static byte getPropertyType(short propertyId) {
-		EscherPropertyMetaData escherPropertyMetaData = properties.get(Short.valueOf(propertyId));
-		return escherPropertyMetaData == null ? 0 : escherPropertyMetaData.getType();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherProperty.java b/trunk/src/java/org/apache/poi/ddf/EscherProperty.java
deleted file mode 100644
index d883fe0..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherProperty.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-/**
- * This is the abstract base class for all escher properties.
- *
- * @see EscherOptRecord
- */
-public abstract class EscherProperty {
-    private short  _id;
-
-    /**
-     * The id is distinct from the actual property number.  The id includes the property number the blip id
-     * flag and an indicator whether the property is complex or not.
-     * 
-     * @param id the combined id
-     */
-    public EscherProperty(short id) {
-        _id   = id;
-    }
-
-    /**
-     * Constructs a new escher property.  The three parameters are combined to form a property
-     * id.
-     * 
-     * @param propertyNumber the property number
-     * @param isComplex true, if this is a complex property
-     * @param isBlipId true, if this property is a blip id
-     */
-    public EscherProperty(short propertyNumber, boolean isComplex, boolean isBlipId) {
-        _id   = (short)(propertyNumber +
-                (isComplex ? 0x8000 : 0x0) +
-                (isBlipId ? 0x4000 : 0x0));
-    }
-
-    public short getId() {
-        return _id;
-    }
-
-    public short getPropertyNumber() {
-        return (short) (_id & (short) 0x3FFF);
-    }
-
-    public boolean isComplex() {
-        return (_id & (short) 0x8000) != 0;
-    }
-
-    public boolean isBlipId() {
-        return (_id & (short) 0x4000) != 0;
-    }
-
-    public String getName() {
-        return EscherProperties.getPropertyName(getPropertyNumber());
-    }
-
-    /**
-     * Most properties are just 6 bytes in length.  Override this if we're
-     * dealing with complex properties.
-     * 
-     * @return size of this property (in bytes)
-     */
-    public int getPropertySize() {
-        return 6;
-    }
-    
-    public String toXml(String tab){
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append("<").append(getClass().getSimpleName()).append(" id=\"").append(getId()).append("\" name=\"").append(getName()).append("\" blipId=\"")
-                .append(isBlipId()).append("\"/>\n");
-        return builder.toString();
-    }
-
-    /**
-     * Escher properties consist of a simple fixed length part and a complex variable length part.
-     * The fixed length part is serialized first.
-     * 
-     * @param data the buffer to write to
-     * @param pos the starting position
-     * 
-     * @return the length of the part
-     */
-    abstract public int serializeSimplePart( byte[] data, int pos );
-    
-    /**
-     * Escher properties consist of a simple fixed length part and a complex variable length part.
-     * The fixed length part is serialized first.
-     * 
-     * @param data the buffer to write to
-     * @param pos the starting position
-     * 
-     * @return the length of the part
-     */
-    abstract public int serializeComplexPart( byte[] data, int pos );
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherPropertyFactory.java b/trunk/src/java/org/apache/poi/ddf/EscherPropertyFactory.java
deleted file mode 100644
index 059e29b..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherPropertyFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Generates a property given a reference into the byte array storing that property.
- */
-public final class EscherPropertyFactory {
-    /**
-     * Create new properties from a byte array.
-     *
-     * @param data              The byte array containing the property
-     * @param offset            The starting offset into the byte array
-     * @param numProperties     The number of properties to be read
-     * @return                  The new properties
-     */
-    public List<EscherProperty> createProperties(byte[] data, int offset, short numProperties) {
-        List<EscherProperty> results = new ArrayList<EscherProperty>();
-
-        int pos = offset;
-
-        for (int i = 0; i < numProperties; i++) {
-            short propId;
-            int propData;
-            propId = LittleEndian.getShort( data, pos );
-            propData = LittleEndian.getInt( data, pos + 2 );
-            short propNumber = (short) ( propId & (short) 0x3FFF );
-            boolean isComplex = ( propId & (short) 0x8000 ) != 0;
-            // boolean isBlipId = ( propId & (short) 0x4000 ) != 0;
-
-            byte propertyType = EscherProperties.getPropertyType(propNumber);
-            if ( propertyType == EscherPropertyMetaData.TYPE_BOOLEAN )
-                results.add( new EscherBoolProperty( propId, propData ) );
-            else if ( propertyType == EscherPropertyMetaData.TYPE_RGB )
-                results.add( new EscherRGBProperty( propId, propData ) );
-            else if ( propertyType == EscherPropertyMetaData.TYPE_SHAPEPATH )
-                results.add( new EscherShapePathProperty( propId, propData ) );
-            else
-            {
-                if ( !isComplex )
-                    results.add( new EscherSimpleProperty( propId, propData ) );
-                else
-                {
-                    if ( propertyType == EscherPropertyMetaData.TYPE_ARRAY)
-                        results.add( new EscherArrayProperty( propId, new byte[propData]) );
-                    else
-                        results.add( new EscherComplexProperty( propId, new byte[propData]) );
-                }
-            }
-            pos += 6;
-        }
-
-        // Get complex data
-        for (EscherProperty p : results) {
-            if (p instanceof EscherComplexProperty) {
-                if (p instanceof EscherArrayProperty) {
-                    pos += ((EscherArrayProperty)p).setArrayData(data, pos);
-                } else {
-                    byte[] complexData = ((EscherComplexProperty)p).getComplexData();
-
-                    int leftover = data.length - pos;
-                    if (leftover < complexData.length) {
-                        throw new IllegalStateException("Could not read complex escher property, lenght was " + complexData.length + ", but had only " +
-                                leftover + " bytes left");
-                    }
-
-                    System.arraycopy(data, pos, complexData, 0, complexData.length);
-                    pos += complexData.length;
-                }
-            }
-        }
-        return results;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java b/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java
deleted file mode 100644
index b38e52d..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-/**
- * This class stores the type and description of an escher property.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class EscherPropertyMetaData
-{
-    // Escher property types.
-    public final static byte TYPE_UNKNOWN = (byte) 0;
-    public final static byte TYPE_BOOLEAN = (byte) 1;
-    public final static byte TYPE_RGB = (byte) 2;
-    public final static byte TYPE_SHAPEPATH = (byte) 3;
-    public final static byte TYPE_SIMPLE = (byte)4;
-    public final static byte TYPE_ARRAY = (byte)5;
-
-    private String description;
-    private byte type;
-
-
-    /**
-     * @param description The description of the escher property.
-     */
-    public EscherPropertyMetaData( String description )
-    {
-        this.description = description;
-    }
-
-    /**
-     *
-     * @param description   The description of the escher property.
-     * @param type          The type of the property.
-     */
-    public EscherPropertyMetaData( String description, byte type )
-    {
-        this.description = description;
-        this.type = type;
-    }
-
-    public String getDescription()
-    {
-        return description;
-    }
-
-    public byte getType()
-    {
-        return type;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherRGBProperty.java b/trunk/src/java/org/apache/poi/ddf/EscherRGBProperty.java
deleted file mode 100644
index 155db7f..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherRGBProperty.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-
-/**
- * A color property.
- */
-public class EscherRGBProperty
-        extends EscherSimpleProperty
-{
-
-    public EscherRGBProperty( short propertyNumber, int rgbColor )
-    {
-        super( propertyNumber, rgbColor );
-    }
-
-    /**
-     * @return the rgb color as int value
-     */
-    public int getRgbColor()
-    {
-        return propertyValue;
-    }
-
-    /**
-     * @return the red part
-     */
-    public byte getRed()
-    {
-        return (byte) ( propertyValue & 0xFF );
-    }
-
-    /**
-     * @return the green part
-     */
-    public byte getGreen()
-    {
-        return (byte) ( (propertyValue >> 8) & 0xFF );
-    }
-
-    /**
-     * @return the blue part
-     */
-    public byte getBlue()
-    {
-        return (byte) ( (propertyValue >> 16) & 0xFF );
-    }
-
-    @Override
-    public String toXml(String tab){
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append("<").append(getClass().getSimpleName()).append(" id=\"0x").append(HexDump.toHex(getId()))
-                .append("\" name=\"").append(getName()).append("\" blipId=\"")
-                .append(isBlipId()).append("\" value=\"0x").append(HexDump.toHex(propertyValue)).append("\"/>\n");
-        return builder.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherRecord.java
deleted file mode 100644
index 65926a8..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherRecord.java
+++ /dev/null
@@ -1,328 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The base abstract record from which all escher records are defined.  Subclasses will need
- * to define methods for serialization/deserialization and for determining the record size.
- */
-public abstract class EscherRecord implements Cloneable {
-    private static final BitField fInstance = BitFieldFactory.getInstance(0xfff0);
-    private static final BitField fVersion = BitFieldFactory.getInstance(0x000f);
-
-    private short _options;
-    private short _recordId;
-
-    /**
-     * Create a new instance
-     */
-    public EscherRecord() {
-        // fields uninitialised
-    }
-
-    /**
-     * Delegates to fillFields(byte[], int, EscherRecordFactory)
-     * 
-     * @param data they bytes to serialize from
-     * @param f the escher record factory
-     * @return The number of bytes written.
-     * 
-     * @see #fillFields(byte[], int, org.apache.poi.ddf.EscherRecordFactory)
-     */
-    protected int fillFields( byte[] data, EscherRecordFactory f )
-    {
-        return fillFields( data, 0, f );
-    }
-
-    /**
-     * The contract of this method is to deserialize an escher record including
-     * it's children.
-     *
-     * @param data      The byte array containing the serialized escher
-     *                  records.
-     * @param offset    The offset into the byte array.
-     * @param recordFactory     A factory for creating new escher records.
-     * @return          The number of bytes written.
-     */
-    public abstract int fillFields( byte[] data, int offset, EscherRecordFactory recordFactory );
-
-    /**
-     * Reads the 8 byte header information and populates the <code>options</code>
-     * and <code>recordId</code> records.
-     *
-     * @param data      the byte array to read from
-     * @param offset    the offset to start reading from
-     * @return          the number of bytes remaining in this record.  This
-     *                  may include the children if this is a container.
-     */
-    protected int readHeader( byte[] data, int offset ) {
-        _options = LittleEndian.getShort( data, offset );
-        _recordId = LittleEndian.getShort( data, offset + 2 );
-        return LittleEndian.getInt( data, offset + 4 );
-    }
-
-    /**
-     * Read the options field from header and return instance part of it.
-     * @param data      the byte array to read from
-     * @param offset    the offset to start reading from
-     * @return          value of instance part of options field
-     */
-    protected static short readInstance( byte data[], int offset ) {
-        final short options = LittleEndian.getShort( data, offset );
-        return fInstance.getShortValue( options );
-    }
-
-    /**
-     * Determine whether this is a container record by inspecting the option field.
-     * 
-     * @return  true is this is a container field.
-     */
-    public boolean isContainerRecord() {
-        return getVersion() == (short)0x000f;
-    }
-
-    /**
-     * Note that <code>options</code> is an internal field.
-     * Use {@link #setInstance(short)} ()} and {@link #setVersion(short)} ()} to set the actual fields.
-     * 
-     * @return The options field for this record. All records have one.
-     */
-    @Internal
-    public short getOptions()
-    {
-        return _options;
-    }
-
-    /**
-     * Set the options this this record. Container records should have the
-     * last nibble set to 0xF.<p>
-     * 
-     * Note that {@code options} is an internal field.
-     * Use {@link #getInstance()} and {@link #getVersion()} to access actual fields.
-     * 
-     * @param options the record options
-     */
-    @Internal
-    public void setOptions( short options ) {
-        // call to handle correct/incorrect values
-        setVersion( fVersion.getShortValue( options ) );
-        setInstance( fInstance.getShortValue( options ) );
-        _options = options;
-    }
-
-    /**
-     * Serializes to a new byte array.  This is done by delegating to
-     * serialize(int, byte[]);
-     *
-     * @return  the serialized record.
-     * @see #serialize(int, byte[])
-     */
-    public byte[] serialize()
-    {
-        byte[] retval = new byte[getRecordSize()];
-
-        serialize( 0, retval );
-        return retval;
-    }
-
-    /**
-     * Serializes to an existing byte array without serialization listener.
-     * This is done by delegating to serialize(int, byte[], EscherSerializationListener).
-     *
-     * @param offset    the offset within the data byte array.
-     * @param data      the data array to serialize to.
-     * @return          The number of bytes written.
-     *
-     * @see #serialize(int, byte[], org.apache.poi.ddf.EscherSerializationListener)
-     */
-    public int serialize( int offset, byte[] data)
-    {
-        return serialize( offset, data, new NullEscherSerializationListener() );
-    }
-
-    /**
-     * Serializes the record to an existing byte array.
-     *
-     * @param offset    the offset within the byte array
-     * @param data      the data array to serialize to
-     * @param listener  a listener for begin and end serialization events.  This
-     *                  is useful because the serialization is
-     *                  hierarchical/recursive and sometimes you need to be able
-     *                  break into that.
-     * @return the number of bytes written.
-     */
-    public abstract int serialize( int offset, byte[] data, EscherSerializationListener listener );
-
-    /**
-     * Subclasses should effeciently return the number of bytes required to
-     * serialize the record.
-     *
-     * @return  number of bytes
-     */
-    abstract public int getRecordSize();
-
-    /**
-     * Return the current record id.
-     *
-     * @return  The 16 bit record id.
-     */
-    public short getRecordId() {
-        return _recordId;
-    }
-
-    /**
-     * Sets the record id for this record.
-     * 
-     * @param recordId the record id
-     */
-    public void setRecordId( short recordId ) {
-        _recordId = recordId;
-    }
-
-    /**
-     * @return  Returns the children of this record.  By default this will
-     *          be an empty list.  EscherCotainerRecord is the only record
-     *          that may contain children.
-     *
-     * @see EscherContainerRecord
-     */
-    public List<EscherRecord> getChildRecords() { return Collections.emptyList(); }
-
-    /**
-     * Sets the child records for this record.  By default this will throw
-     * an exception as only EscherContainerRecords may have children.
-     *
-     * @param childRecords  Not used in base implementation.
-     */
-    public void setChildRecords(List<EscherRecord> childRecords) {
-        throw new UnsupportedOperationException("This record does not support child records.");
-    }
-
-    /**
-     * Escher records may need to be clonable in the future.
-     * 
-     * @return the cloned object
-     * 
-     * @throws CloneNotSupportedException if the subclass hasn't implemented {@link Cloneable}
-     */
-    @Override
-    public EscherRecord clone() throws CloneNotSupportedException {
-        return (EscherRecord)super.clone();
-    }
-
-    /**
-     * Returns the indexed child record.
-     * 
-     * @param index the index of the child within the child records
-     * @return the indexed child record
-     */
-    public EscherRecord getChild( int index ) {
-        return getChildRecords().get(index);
-    }
-
-    /**
-     * The display methods allows escher variables to print the record names
-     * according to their hierarchy.
-     *
-     * @param w         The print writer to output to.
-     * @param indent    The current indent level.
-     */
-    public void display(PrintWriter w, int indent)
-    {
-        for (int i = 0; i < indent * 4; i++) w.print(' ');
-        w.println(getRecordName());
-    }
-
-    /**
-     * Subclasses should return the short name for this escher record.
-     * 
-     * @return the short name for this escher record
-     */
-    public abstract String getRecordName();
-
-    /**
-     * Returns the instance part of the option record.
-     * 
-     * @return The instance part of the record
-     */
-    public short getInstance()
-    {
-        return fInstance.getShortValue( _options );
-    }
-
-    /**
-     * Sets the instance part of record
-     * 
-     * @param value instance part value
-     */
-    public void setInstance( short value )
-    {
-        _options = fInstance.setShortValue( _options, value );
-    }
-
-    /**
-     * Returns the version part of the option record.
-     * 
-     * @return The version part of the option record
-     */
-    public short getVersion()
-    {
-        return fVersion.getShortValue( _options );
-    }
-
-    /**
-     * Sets the version part of record
-     * 
-     * @param value version part value
-     */
-    public void setVersion( short value )
-    {
-        _options = fVersion.setShortValue( _options, value );
-    }
-
-    /**
-     * @param tab - each children must be a right of his parent
-     * @return xml representation of this record
-     */
-    public String toXml(String tab){
-        return tab + "<" + getClass().getSimpleName() + ">\n" +
-                tab + "\t" + "<RecordId>0x" + HexDump.toHex(_recordId) + "</RecordId>\n" +
-                tab + "\t" + "<Options>" + _options + "</Options>\n" +
-                tab + "</" + getClass().getSimpleName() + ">\n";
-    }
-    
-    protected String formatXmlRecordHeader(String className, String recordId, String version, String instance){
-        return "<" + className + " recordId=\"0x" + recordId + "\" version=\"0x" +
-                version + "\" instance=\"0x" + instance + "\" size=\"" + getRecordSize() + "\">\n";
-    }
-    
-    public String toXml(){
-        return toXml("");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherRecordFactory.java b/trunk/src/java/org/apache/poi/ddf/EscherRecordFactory.java
deleted file mode 100644
index 401bbd0..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherRecordFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-/**
- * The escher record factory interface allows for the creation of escher
- * records from a pointer into a data array.
- */
-public interface EscherRecordFactory {
-    /**
-     * Generates an escher record including any children contained under that record.
-     * An exception is thrown if the record could not be generated.
-     * 
-     * @param data   The byte array containing the records
-     * @param offset The starting offset into the byte array
-     * @return The generated escher record
-     */
-    EscherRecord createRecord( byte[] data, int offset );
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherSerializationListener.java b/trunk/src/java/org/apache/poi/ddf/EscherSerializationListener.java
deleted file mode 100644
index dcc5eee..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherSerializationListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-/**
- * Interface for listening to escher serialization events.
- */
-public interface EscherSerializationListener
-{
-    /**
-     * Fired before a given escher record is serialized.
-     *
-     * @param offset    The position in the data array at which the record will be serialized.
-     * @param recordId  The id of the record about to be serialized.
-     * @param record    The record to be serialized
-     */
-    void beforeRecordSerialize(int offset, short recordId, EscherRecord record);
-
-    /**
-     * Fired after a record has been serialized.
-     *
-     * @param offset    The position of the end of the serialized record + 1
-     * @param recordId  The id of the record about to be serialized
-     * @param size      The number of bytes written for this record.  If it is a container
-     *                  record then this will include the size of any included records.
-     * @param record    The record which was serialized
-     */
-    void afterRecordSerialize(int offset, short recordId, int size, EscherRecord record);
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherShapePathProperty.java b/trunk/src/java/org/apache/poi/ddf/EscherShapePathProperty.java
deleted file mode 100644
index f495f26..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherShapePathProperty.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-/**
- * Defines the constants for the various possible shape paths.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public class EscherShapePathProperty extends EscherSimpleProperty {
-
-    public static final int LINE_OF_STRAIGHT_SEGMENTS = 0;
-    public static final int CLOSED_POLYGON = 1;
-    public static final int CURVES = 2;
-    public static final int CLOSED_CURVES = 3;
-    public static final int COMPLEX = 4;
-
-    public EscherShapePathProperty( short propertyNumber, int shapePath )
-    {
-        super( propertyNumber, false, false, shapePath );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherSimpleProperty.java b/trunk/src/java/org/apache/poi/ddf/EscherSimpleProperty.java
deleted file mode 100644
index 3872aa9..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherSimpleProperty.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.HexDump;
-
-/**
- * A simple property is of fixed length and as a property number in addition
- * to a 32-bit value.  Properties that can't be stored in only 32-bits are
- * stored as EscherComplexProperty objects.
- */
-public class EscherSimpleProperty extends EscherProperty
-{
-    protected int propertyValue;
-
-    /**
-     * The id is distinct from the actual property number.  The id includes the property number the blip id
-     * flag and an indicator whether the property is complex or not.
-     * 
-     * @param id the property id
-     * @param propertyValue the property value
-     */
-    public EscherSimpleProperty( short id, int propertyValue )
-    {
-        super( id );
-        this.propertyValue = propertyValue;
-    }
-
-    /**
-     * Constructs a new escher property.  The three parameters are combined to form a property id.
-     * 
-     * @param propertyNumber the property number
-     * @param isComplex true, if its a complex property
-     * @param isBlipId true, if its a blip
-     * @param propertyValue the property value
-     */
-    public EscherSimpleProperty( short propertyNumber, boolean isComplex, boolean isBlipId, int propertyValue )
-    {
-        super( propertyNumber, isComplex, isBlipId );
-        this.propertyValue = propertyValue;
-    }
-
-    /**
-     * Serialize the simple part of the escher record.
-     *
-     * @return the number of bytes serialized.
-     */
-    @Override
-    public int serializeSimplePart( byte[] data, int offset )
-    {
-        LittleEndian.putShort(data, offset, getId());
-        LittleEndian.putInt(data, offset + 2, propertyValue);
-        return 6;
-    }
-
-    /**
-     * Escher properties consist of a simple fixed length part and a complex variable length part.
-     * The fixed length part is serialized first.
-     */
-    @Override
-    public int serializeComplexPart( byte[] data, int pos )
-    {
-        return 0;
-    }
-
-    /**
-     * @return  Return the 32 bit value of this property.
-     */
-    public int getPropertyValue()
-    {
-        return propertyValue;
-    }
-
-    /**
-     * Returns true if one escher property is equal to another.
-     */
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o ) return true;
-        if ( !( o instanceof EscherSimpleProperty ) ) return false;
-
-        final EscherSimpleProperty escherSimpleProperty = (EscherSimpleProperty) o;
-
-        if ( propertyValue != escherSimpleProperty.propertyValue ) return false;
-        if ( getId() != escherSimpleProperty.getId() ) return false;
-
-        return true;
-    }
-
-    /**
-     * Returns a hashcode so that this object can be stored in collections that
-     * require the use of such things.
-     */
-    @Override
-    public int hashCode()
-    {
-        return propertyValue;
-    }
-
-    /**
-     * @return the string representation of this property.
-     */
-    @Override
-    public String toString()
-    {
-        return "propNum: " + getPropertyNumber()
-                + ", RAW: 0x" + HexDump.toHex( getId() )
-                + ", propName: " + EscherProperties.getPropertyName( getPropertyNumber() )
-                + ", complex: " + isComplex()
-                + ", blipId: " + isBlipId()
-                + ", value: " + propertyValue + " (0x" + HexDump.toHex(propertyValue) + ")";
-    }
-
-    @Override
-    public String toXml(String tab){
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append("<").append(getClass().getSimpleName()).append(" id=\"0x").append(HexDump.toHex(getId()))
-                .append("\" name=\"").append(getName()).append("\" blipId=\"")
-                .append(isBlipId()).append("\" complex=\"").append(isComplex()).append("\" value=\"").append("0x")
-                .append(HexDump.toHex(propertyValue)).append("\"/>\n");
-        return builder.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java
deleted file mode 100644
index 3fec761..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Together the the EscherOptRecord this record defines some of the basic
- * properties of a shape.
- */
-public class EscherSpRecord
-    extends EscherRecord
-{
-    public static final short RECORD_ID = (short) 0xF00A;
-    public static final String RECORD_DESCRIPTION = "MsofbtSp";
-
-    public static final int FLAG_GROUP = 0x0001;
-    public static final int FLAG_CHILD = 0x0002;
-    public static final int FLAG_PATRIARCH = 0x0004;
-    public static final int FLAG_DELETED = 0x0008;
-    public static final int FLAG_OLESHAPE = 0x0010;
-    public static final int FLAG_HAVEMASTER = 0x0020;
-    public static final int FLAG_FLIPHORIZ = 0x0040;
-    public static final int FLAG_FLIPVERT = 0x0080;
-    public static final int FLAG_CONNECTOR = 0x0100;
-    public static final int FLAG_HAVEANCHOR = 0x0200;
-    public static final int FLAG_BACKGROUND = 0x0400;
-    public static final int FLAG_HASSHAPETYPE = 0x0800;
-
-    private int field_1_shapeId;
-    private int field_2_flags;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        /*int bytesRemaining =*/ readHeader( data, offset );
-        int pos            = offset + 8;
-        int size           = 0;
-        field_1_shapeId    =  LittleEndian.getInt( data, pos + size );     size += 4;
-        field_2_flags      =  LittleEndian.getInt( data, pos + size );     size += 4;
-//        bytesRemaining -= size;
-//        remainingData  =  new byte[bytesRemaining];
-//        System.arraycopy( data, pos + size, remainingData, 0, bytesRemaining );
-        return getRecordSize();
-    }
-
-    /**
-     * This method serializes this escher record into a byte array.
-     *
-     * @param offset   The offset into <code>data</code> to start writing the record data to.
-     * @param data     The byte array to serialize to.
-     * @param listener A listener to retrieve start and end callbacks.  Use a <code>NullEscherSerailizationListener</code> to ignore these events.
-     * @return The number of bytes written.
-     *
-     * @see NullEscherSerializationListener
-     */
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener )
-    {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        int remainingBytes = 8;
-        LittleEndian.putInt( data, offset + 4, remainingBytes );
-        LittleEndian.putInt( data, offset + 8, field_1_shapeId );
-        LittleEndian.putInt( data, offset + 12, field_2_flags );
-//        System.arraycopy( remainingData, 0, data, offset + 26, remainingData.length );
-//        int pos = offset + 8 + 18 + remainingData.length;
-        listener.afterRecordSerialize( offset + getRecordSize(), getRecordId(), getRecordSize(), this );
-        return 8 + 8;
-    }
-
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + 8;
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "Sp";
-    }
-
-
-    /**
-     * @return  the string representing this shape.
-     */
-    @Override
-    public String toString()
-    {
-        String nl = System.getProperty("line.separator");
-
-        return getClass().getName() + ":" + nl +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + nl +
-                "  ShapeType: 0x" + HexDump.toHex(getShapeType()) + nl +
-                "  ShapeId: " + field_1_shapeId + nl +
-                "  Flags: " + decodeFlags(field_2_flags) + " (0x" + HexDump.toHex(field_2_flags) + ")" + nl;
-
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<ShapeType>0x").append(HexDump.toHex(getShapeType())).append("</ShapeType>\n")
-                .append(tab).append("\t").append("<ShapeId>").append(field_1_shapeId).append("</ShapeId>\n")
-                .append(tab).append("\t").append("<Flags>").append(decodeFlags(field_2_flags) + " (0x" + HexDump.toHex(field_2_flags) + ")").append("</Flags>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * Converts the shape flags into a more descriptive name.
-     */
-    private String decodeFlags( int flags )
-    {
-        StringBuffer result = new StringBuffer();
-        result.append( ( flags & FLAG_GROUP ) != 0 ? "|GROUP" : "" );
-        result.append( ( flags & FLAG_CHILD ) != 0 ? "|CHILD" : "" );
-        result.append( ( flags & FLAG_PATRIARCH ) != 0 ? "|PATRIARCH" : "" );
-        result.append( ( flags & FLAG_DELETED ) != 0 ? "|DELETED" : "" );
-        result.append( ( flags & FLAG_OLESHAPE ) != 0 ? "|OLESHAPE" : "" );
-        result.append( ( flags & FLAG_HAVEMASTER ) != 0 ? "|HAVEMASTER" : "" );
-        result.append( ( flags & FLAG_FLIPHORIZ ) != 0 ? "|FLIPHORIZ" : "" );
-        result.append( ( flags & FLAG_FLIPVERT ) != 0 ? "|FLIPVERT" : "" );
-        result.append( ( flags & FLAG_CONNECTOR ) != 0 ? "|CONNECTOR" : "" );
-        result.append( ( flags & FLAG_HAVEANCHOR ) != 0 ? "|HAVEANCHOR" : "" );
-        result.append( ( flags & FLAG_BACKGROUND ) != 0 ? "|BACKGROUND" : "" );
-        result.append( ( flags & FLAG_HASSHAPETYPE ) != 0 ? "|HASSHAPETYPE" : "" );
-
-        //need to check, else blows up on some records - bug 34435
-        if(result.length() > 0) {
-            result.deleteCharAt(0);
-        }
-        return result.toString();
-    }
-
-    /**
-     * @return  A number that identifies this shape
-     */
-    public int getShapeId()
-    {
-        return field_1_shapeId;
-    }
-
-    /**
-     * Sets a number that identifies this shape.
-     * 
-     * @param field_1_shapeId the shape id
-     */
-    public void setShapeId( int field_1_shapeId )
-    {
-        this.field_1_shapeId = field_1_shapeId;
-    }
-
-    /**
-     * The flags that apply to this shape.
-     * 
-     * @return the flags
-     *
-     * @see #FLAG_GROUP
-     * @see #FLAG_CHILD
-     * @see #FLAG_PATRIARCH
-     * @see #FLAG_DELETED
-     * @see #FLAG_OLESHAPE
-     * @see #FLAG_HAVEMASTER
-     * @see #FLAG_FLIPHORIZ
-     * @see #FLAG_FLIPVERT
-     * @see #FLAG_CONNECTOR
-     * @see #FLAG_HAVEANCHOR
-     * @see #FLAG_BACKGROUND
-     * @see #FLAG_HASSHAPETYPE
-     */
-    public int getFlags()
-    {
-        return field_2_flags;
-    }
-
-    /**
-     * The flags that apply to this shape.
-     * 
-     * @param field_2_flags the flags
-     *
-     * @see #FLAG_GROUP
-     * @see #FLAG_CHILD
-     * @see #FLAG_PATRIARCH
-     * @see #FLAG_DELETED
-     * @see #FLAG_OLESHAPE
-     * @see #FLAG_HAVEMASTER
-     * @see #FLAG_FLIPHORIZ
-     * @see #FLAG_FLIPVERT
-     * @see #FLAG_CONNECTOR
-     * @see #FLAG_HAVEANCHOR
-     * @see #FLAG_BACKGROUND
-     * @see #FLAG_HASSHAPETYPE
-     */
-    public void setFlags( int field_2_flags )
-    {
-        this.field_2_flags = field_2_flags;
-    }
-
-    /**
-     * Returns shape type. Must be one of MSOSPT values (see [MS-ODRAW] for
-     * details).
-     * 
-     * @return shape type
-     */
-    public short getShapeType()
-    {
-        return getInstance();
-    }
-
-    /**
-     * Sets shape type. Must be one of MSOSPT values (see [MS-ODRAW] for
-     * details).
-     * 
-     * @param value
-     *            new shape type
-     */
-    public void setShapeType( short value )
-    {
-        setInstance( value );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java
deleted file mode 100644
index a4d30b3..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.RecordFormatException;
-
-/**
- * The spgr record defines information about a shape group.  Groups in escher
- * are simply another form of shape that you can't physically see.
- */
-public class EscherSpgrRecord
-    extends EscherRecord
-{
-    public static final short RECORD_ID = (short) 0xF009;
-    public static final String RECORD_DESCRIPTION = "MsofbtSpgr";
-
-    private int field_1_rectX1;
-    private int field_2_rectY1;
-    private int field_3_rectX2;
-    private int field_4_rectY2;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        int pos            = offset + 8;
-        int size           = 0;
-        field_1_rectX1 =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_2_rectY1 =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_3_rectX2 =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_4_rectY2 =  LittleEndian.getInt( data, pos + size );size+=4;
-        bytesRemaining -= size;
-        if (bytesRemaining != 0) throw new RecordFormatException("Expected no remaining bytes but got " + bytesRemaining);
-//        remainingData  =  new byte[bytesRemaining];
-//        System.arraycopy( data, pos + size, remainingData, 0, bytesRemaining );
-        return 8 + size + bytesRemaining;
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener )
-    {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-        LittleEndian.putShort( data, offset, getOptions() );
-        LittleEndian.putShort( data, offset + 2, getRecordId() );
-        int remainingBytes = 16;
-        LittleEndian.putInt( data, offset + 4, remainingBytes );
-        LittleEndian.putInt( data, offset + 8, field_1_rectX1 );
-        LittleEndian.putInt( data, offset + 12, field_2_rectY1 );
-        LittleEndian.putInt( data, offset + 16, field_3_rectX2 );
-        LittleEndian.putInt( data, offset + 20, field_4_rectY2 );
-//        System.arraycopy( remainingData, 0, data, offset + 26, remainingData.length );
-//        int pos = offset + 8 + 18 + remainingData.length;
-        listener.afterRecordSerialize( offset + getRecordSize(), getRecordId(), offset + getRecordSize(), this );
-        return 8 + 16;
-    }
-
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + 16;
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "Spgr";
-    }
-
-    /**
-     * @return  the string representation of this record.
-     */
-    @Override
-    public String toString() {
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
-                "  Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
-                "  RectX: " + field_1_rectX1 + '\n' +
-                "  RectY: " + field_2_rectY1 + '\n' +
-                "  RectWidth: " + field_3_rectX2 + '\n' +
-                "  RectHeight: " + field_4_rectY2 + '\n';
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<RectX>").append(field_1_rectX1).append("</RectX>\n")
-                .append(tab).append("\t").append("<RectY>").append(field_2_rectY1).append("</RectY>\n")
-                .append(tab).append("\t").append("<RectWidth>").append(field_3_rectX2).append("</RectWidth>\n")
-                .append(tab).append("\t").append("<RectHeight>").append(field_4_rectY2).append("</RectHeight>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * The starting top-left coordinate of child records.
-     * 
-     * @return the top-left x coordinate
-     */
-    public int getRectX1()
-    {
-        return field_1_rectX1;
-    }
-
-    /**
-     * The top-left coordinate of child records.
-     * 
-     * @param x1 the top-left x coordinate
-     */
-    public void setRectX1( int x1 )
-    {
-        this.field_1_rectX1 = x1;
-    }
-
-    /**
-     * The top-left coordinate of child records.
-     * 
-     * @return the top-left y coordinate
-     */
-    public int getRectY1()
-    {
-        return field_2_rectY1;
-    }
-
-    /**
-     * The top-left y coordinate of child records.
-     * 
-     * @param y1 the top-left y coordinate
-     */
-    public void setRectY1( int y1 )
-    {
-        this.field_2_rectY1 = y1;
-    }
-
-    /**
-     * The bottom-right x coordinate of child records.
-     * 
-     * @return the bottom-right x coordinate
-     */
-    public int getRectX2()
-    {
-        return field_3_rectX2;
-    }
-
-    /**
-     * The bottom-right x coordinate of child records.
-     * 
-     * @param x2 the bottom-right x coordinate
-     */
-    public void setRectX2( int x2 )
-    {
-        this.field_3_rectX2 = x2;
-    }
-
-    /**
-     * The bottom-right y coordinate of child records.
-     * 
-     * @return the bottom-right y coordinate
-     */
-    public int getRectY2()
-    {
-        return field_4_rectY2;
-    }
-
-    /**
-     * The bottom-right y coordinate of child records.
-     * 
-     * @param rectY2 the bottom-right y coordinate
-     */
-    public void setRectY2(int rectY2) {
-        this.field_4_rectY2 = rectY2;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
deleted file mode 100644
index 3467d0a..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.RecordFormatException;
-
-/**
- * A list of the most recently used colours for the drawings contained in
- * this document.
- */
-public class EscherSplitMenuColorsRecord
-    extends EscherRecord
-{
-    public static final short RECORD_ID = (short) 0xF11E;
-    public static final String RECORD_DESCRIPTION = "MsofbtSplitMenuColors";
-
-    private int field_1_color1;
-    private int field_2_color2;
-    private int field_3_color3;
-    private int field_4_color4;
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        int pos            = offset + 8;
-        int size           = 0;
-        field_1_color1 =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_2_color2 =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_3_color3 =  LittleEndian.getInt( data, pos + size );size+=4;
-        field_4_color4 =  LittleEndian.getInt( data, pos + size );size+=4;
-        bytesRemaining -= size;
-        if (bytesRemaining != 0)
-            throw new RecordFormatException("Expecting no remaining data but got " + bytesRemaining + " byte(s).");
-        return 8 + size + bytesRemaining;
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener ) {
-//        int field_2_numIdClusters = field_5_fileIdClusters.length + 1;
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        int pos = offset;
-        LittleEndian.putShort( data, pos, getOptions() );     pos += 2;
-        LittleEndian.putShort( data, pos, getRecordId() );    pos += 2;
-        int remainingBytes =  getRecordSize() - 8;
-
-        LittleEndian.putInt( data, pos, remainingBytes );          pos += 4;
-        LittleEndian.putInt( data, pos, field_1_color1 );          pos += 4;
-        LittleEndian.putInt( data, pos, field_2_color2 );          pos += 4;
-        LittleEndian.putInt( data, pos, field_3_color3 );          pos += 4;
-        LittleEndian.putInt( data, pos, field_4_color4 );          pos += 4;
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        return getRecordSize();
-    }
-
-    @Override
-    public int getRecordSize() {
-        return 8 + 4 * 4;
-    }
-
-    @Override
-    public short getRecordId() {
-        return RECORD_ID;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "SplitMenuColors";
-    }
-
-    /**
-     * @return  a string representation of this record.
-     */
-    @Override
-    public String toString() {
-        return getClass().getName() + ":" + '\n' +
-                "  RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
-                "  Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
-                "  Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
-                "  Color1: 0x" + HexDump.toHex(field_1_color1) + '\n' +
-                "  Color2: 0x" + HexDump.toHex(field_2_color2) + '\n' +
-                "  Color3: 0x" + HexDump.toHex(field_3_color3) + '\n' +
-                "  Color4: 0x" + HexDump.toHex(field_4_color4) + '\n' +
-                "";
-    }
-
-    @Override
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<Color1>0x").append(HexDump.toHex(field_1_color1)).append("</Color1>\n")
-                .append(tab).append("\t").append("<Color2>0x").append(HexDump.toHex(field_2_color2)).append("</Color2>\n")
-                .append(tab).append("\t").append("<Color3>0x").append(HexDump.toHex(field_3_color3)).append("</Color3>\n")
-                .append(tab).append("\t").append("<Color4>0x").append(HexDump.toHex(field_4_color4)).append("</Color4>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * Gets the fill color 
-     *
-     * @return the fill color
-     */
-    public int getColor1() {
-        return field_1_color1;
-    }
-
-    /**
-     * Sets the fill color
-     *
-     * @param field_1_color1 the fill color
-     */
-    public void setColor1( int field_1_color1 ) {
-        this.field_1_color1 = field_1_color1;
-    }
-
-    /**
-     * Gets the line color
-     *
-     * @return the line color
-     */
-    public int getColor2() {
-        return field_2_color2;
-    }
-
-    /**
-     * Sets the line color
-     *
-     * @param field_2_color2 the line color
-     */
-    public void setColor2( int field_2_color2 ) {
-        this.field_2_color2 = field_2_color2;
-    }
-
-    /**
-     * Gets the shadow color
-     *
-     * @return the shadow color
-     */
-    public int getColor3() {
-        return field_3_color3;
-    }
-
-    /**
-     * Sets the shadow color
-     *
-     * @param field_3_color3 the shadow color
-     */
-    public void setColor3( int field_3_color3 ) {
-        this.field_3_color3 = field_3_color3;
-    }
-
-    /**
-     * Gets the 3-D color
-     *
-     * @return the 3-D color
-     */
-    public int getColor4() {
-        return field_4_color4;
-    }
-
-    /**
-     * Sets the 3-D color
-     *
-     * @param field_4_color4 the 3-D color
-     */
-    public void setColor4( int field_4_color4 ) {
-        this.field_4_color4 = field_4_color4;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
deleted file mode 100644
index 6182942..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ddf;
-
-/**
- * "The OfficeArtTertiaryFOPT record specifies a table of OfficeArtRGFOPTE properties, as defined in section 2.3.1."
- * -- [MS-ODRAW] -- v20110608; Office Drawing Binary File Format
- */
-public class EscherTertiaryOptRecord extends AbstractEscherOptRecord
-{
-    public static final short RECORD_ID = (short) 0xF122;
-
-    @Override
-    public String getRecordName()
-    {
-        return "TertiaryOpt";
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java b/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
deleted file mode 100644
index 7798080..0000000
--- a/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.RecordFormatException;
-
-/**
- * Holds data from the parent application. Most commonly used to store
- *  text in the format of the parent application, rather than in
- *  Escher format. We don't attempt to understand the contents, since
- *  they will be in the parent's format, not Escher format.
- */
-public final class EscherTextboxRecord extends EscherRecord implements Cloneable {
-    public static final short RECORD_ID = (short)0xF00D;
-    public static final String RECORD_DESCRIPTION = "msofbtClientTextbox";
-
-    private static final byte[] NO_BYTES = new byte[0];
-
-    /** The data for this record not including the the 8 byte header */
-    private byte[] thedata = NO_BYTES;
-
-    public EscherTextboxRecord()
-    {
-    }
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-
-        // Save the data, ready for the calling code to do something
-        //  useful with it
-        thedata = new byte[bytesRemaining];
-        System.arraycopy( data, offset + 8, thedata, 0, bytesRemaining );
-        return bytesRemaining + 8;
-    }
-
-    @Override
-    public int serialize( int offset, byte[] data, EscherSerializationListener listener )
-    {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        LittleEndian.putShort(data, offset, getOptions());
-        LittleEndian.putShort(data, offset+2, getRecordId());
-        int remainingBytes = thedata.length;
-        LittleEndian.putInt(data, offset+4, remainingBytes);
-        System.arraycopy(thedata, 0, data, offset+8, thedata.length);
-        int pos = offset+8+thedata.length;
-
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        int size = pos - offset;
-        if (size != getRecordSize())
-            throw new RecordFormatException(size + " bytes written but getRecordSize() reports " + getRecordSize());
-        return size;
-    }
-
-    /**
-     * Returns any extra data associated with this record.  In practice excel
-     * does not seem to put anything here, but with PowerPoint this will
-     * contain the bytes that make up a TextHeaderAtom followed by a
-     * TextBytesAtom/TextCharsAtom
-     * 
-     * @return the extra data
-     */
-    public byte[] getData()
-    {
-        return thedata;
-    }
-
-    /**
-     * Sets the extra data (in the parent application's format) to be
-     * contained by the record. Used when the parent application changes
-     * the contents.
-     * 
-     * @param b the buffer which contains the data
-     * @param start the start position in the buffer
-     * @param length the length of the block
-     */
-    public void setData(byte[] b, int start, int length)
-    {
-        thedata = new byte[length];
-        System.arraycopy(b,start,thedata,0,length);
-    }
-    
-    /**
-     * Sets the extra data (in the parent application's format) to be
-     * contained by the record. Used when the parent application changes
-     * the contents.
-     * 
-     * @param b the data
-     */
-    public void setData(byte[] b) {
-        setData(b,0,b.length);
-    }
-
-    @Override
-    public int getRecordSize()
-    {
-        return 8 + thedata.length;
-    }
-
-    @Override
-    public EscherTextboxRecord clone() {
-        EscherTextboxRecord etr = new EscherTextboxRecord();
-        etr.setOptions(this.getOptions());
-        etr.setRecordId(this.getRecordId());
-        etr.thedata = this.thedata.clone();
-        return etr;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "ClientTextbox";
-    }
-
-    @Override
-    public String toString()
-    {
-        String nl = System.getProperty( "line.separator" );
-
-        String theDumpHex = "";
-        try
-        {
-            if (thedata.length != 0)
-            {
-                theDumpHex = "  Extra Data:" + nl;
-                theDumpHex += HexDump.dump(thedata, 0, 0);
-            }
-        }
-        catch ( Exception e )
-        {
-            theDumpHex = "Error!!";
-        }
-
-        return getClass().getName() + ":" + nl +
-                "  isContainer: " + isContainerRecord() + nl +
-                "  version: 0x" + HexDump.toHex( getVersion() ) + nl +
-                "  instance: 0x" + HexDump.toHex( getInstance() ) + nl +
-                "  recordId: 0x" + HexDump.toHex( getRecordId() ) + nl +
-                "  numchildren: " + getChildRecords().size() + nl +
-                theDumpHex;
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String theDumpHex = "";
-        try
-        {
-            if (thedata.length != 0)
-            {
-                theDumpHex += HexDump.dump(thedata, 0, 0);
-            }
-        }
-        catch ( Exception e )
-        {
-            theDumpHex = "Error!!";
-        }
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<ExtraData>").append(theDumpHex).append("</ExtraData>\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-}
-
-
-
diff --git a/trunk/src/java/org/apache/poi/ddf/NullEscherSerializationListener.java b/trunk/src/java/org/apache/poi/ddf/NullEscherSerializationListener.java
deleted file mode 100644
index 28a8c94..0000000
--- a/trunk/src/java/org/apache/poi/ddf/NullEscherSerializationListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-/**
- * Ignores all serialization events.
- */
-public class NullEscherSerializationListener implements EscherSerializationListener {
-    @Override
-    public void beforeRecordSerialize(int offset, short recordId, EscherRecord record) {
-        // do nothing
-    }
-
-    @Override
-    public void afterRecordSerialize(int offset, short recordId, int size, EscherRecord record) {
-        // do nothing
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java b/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java
deleted file mode 100644
index 6f87152..0000000
--- a/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This record is used whenever a escher record is encountered that
- * we do not explicitly support.
- */
-public final class UnknownEscherRecord extends EscherRecord implements Cloneable {
-    private static final byte[] NO_BYTES = new byte[0];
-
-    /** The data for this record not including the the 8 byte header */
-    private byte[] thedata = NO_BYTES;
-    private List<EscherRecord> _childRecords;
-
-    public UnknownEscherRecord() {
-        _childRecords = new ArrayList<EscherRecord>();
-    }
-
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-		/*
-		 * Have a check between avaliable bytes and bytesRemaining, 
-		 * take the avaliable length if the bytesRemaining out of range.
-		 */
-		int avaliable = data.length - (offset + 8);
-		if (bytesRemaining > avaliable) {
-			bytesRemaining = avaliable;
-		}
-
-        if (isContainerRecord()) {
-            int bytesWritten = 0;
-            thedata = new byte[0];
-            offset += 8;
-            bytesWritten += 8;
-            while ( bytesRemaining > 0 )
-            {
-                EscherRecord child = recordFactory.createRecord( data, offset );
-                int childBytesWritten = child.fillFields( data, offset, recordFactory );
-                bytesWritten += childBytesWritten;
-                offset += childBytesWritten;
-                bytesRemaining -= childBytesWritten;
-                getChildRecords().add( child );
-            }
-            return bytesWritten;
-        }
-
-        thedata = new byte[bytesRemaining];
-        System.arraycopy( data, offset + 8, thedata, 0, bytesRemaining );
-        return bytesRemaining + 8;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-
-        LittleEndian.putShort(data, offset, getOptions());
-        LittleEndian.putShort(data, offset+2, getRecordId());
-        int remainingBytes = thedata.length;
-        for (EscherRecord r : _childRecords) {
-            remainingBytes += r.getRecordSize();
-        }
-        LittleEndian.putInt(data, offset+4, remainingBytes);
-        System.arraycopy(thedata, 0, data, offset+8, thedata.length);
-        int pos = offset+8+thedata.length;
-        for (EscherRecord r : _childRecords) {
-            pos += r.serialize(pos, data, listener );
-        }
-
-        listener.afterRecordSerialize( pos, getRecordId(), pos - offset, this );
-        return pos - offset;
-    }
-
-    /**
-     * @return the data which makes up this record
-     */
-    public byte[] getData() {
-        return thedata;
-    }
-
-    @Override
-    public int getRecordSize() {
-        return 8 + thedata.length;
-    }
-
-    @Override
-    public List<EscherRecord> getChildRecords() {
-        return _childRecords;
-    }
-
-    @Override
-    public void setChildRecords(List<EscherRecord> childRecords) {
-        _childRecords = childRecords;
-    }
-
-    @Override
-    public UnknownEscherRecord clone() {
-        UnknownEscherRecord uer = new UnknownEscherRecord();
-        uer.thedata = this.thedata.clone();
-        uer.setOptions(this.getOptions());
-        uer.setRecordId(this.getRecordId());
-        return uer;
-    }
-
-    @Override
-    public String getRecordName() {
-        return "Unknown 0x" + HexDump.toHex(getRecordId());
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer children = new StringBuffer();
-        if (getChildRecords().size() > 0) {
-            children.append( "  children: " + '\n' );
-            for (EscherRecord record : _childRecords) {
-                children.append( record.toString() );
-                children.append( '\n' );
-            }
-        }
-
-        String theDumpHex = HexDump.toHex(thedata, 32);
-
-        return getClass().getName() + ":" + '\n' +
-                "  isContainer: " + isContainerRecord() + '\n' +
-                "  version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
-                "  instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
-                "  recordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
-                "  numchildren: " + getChildRecords().size() + '\n' +
-                theDumpHex +
-                children.toString();
-    }
-
-    @Override
-    public String toXml(String tab) {
-        String theDumpHex = HexDump.toHex(thedata, 32);
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append(formatXmlRecordHeader(getClass().getSimpleName(), HexDump.toHex(getRecordId()), HexDump.toHex(getVersion()), HexDump.toHex(getInstance())))
-                .append(tab).append("\t").append("<IsContainer>").append(isContainerRecord()).append("</IsContainer>\n")
-                .append(tab).append("\t").append("<Numchildren>").append(HexDump.toHex(_childRecords.size())).append("</Numchildren>\n");
-        for ( Iterator<EscherRecord> iterator = _childRecords.iterator(); iterator
-                .hasNext(); )
-        {
-            EscherRecord record = iterator.next();
-            builder.append(record.toXml(tab+"\t"));
-        }
-        builder.append(theDumpHex).append("\n");
-        builder.append(tab).append("</").append(getClass().getSimpleName()).append(">\n");
-        return builder.toString();
-    }
-
-    public void addChildRecord(EscherRecord childRecord) {
-        getChildRecords().add( childRecord );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ddf/package.html b/trunk/src/java/org/apache/poi/ddf/package.html
deleted file mode 100644
index 6a3393d..0000000
--- a/trunk/src/java/org/apache/poi/ddf/package.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<body>
-
-    <p>This package contains classes for decoding the Microsoft Office
-       Drawing format otherwise known as escher henceforth known in POI
-       as the Dreadful Drawing Format.
-    </p>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/dev/RecordGenerator.java b/trunk/src/java/org/apache/poi/dev/RecordGenerator.java
deleted file mode 100644
index 585003c..0000000
--- a/trunk/src/java/org/apache/poi/dev/RecordGenerator.java
+++ /dev/null
@@ -1,160 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.dev;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.poi.util.XMLHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- *  Description of the Class
- *
- *@author     andy
- *@since      May 10, 2002
- */
-public class RecordGenerator {
-    /**
-     *  The main program for the RecordGenerator class
-     *
-     *@param  args           The command line arguments
-     *@exception  Exception  Description of the Exception
-     */
-    public static void main(String[] args)
-             throws Exception {
-        // Force load so that we don't start generating records and realise this hasn't compiled yet.
-        Class.forName("org.apache.poi.generator.FieldIterator");
-
-        if (args.length != 4) {
-            System.out.println("Usage:");
-            System.out.println("  java org.apache.poi.hssf.util.RecordGenerator RECORD_DEFINTIONS RECORD_STYLES DEST_SRC_PATH TEST_SRC_PATH");
-        } else {
-            generateRecords(args[0], args[1], args[2], args[3]);
-        }
-    }
-
-
-    private static void generateRecords(String defintionsDir, String recordStyleDir, String destSrcPathDir, String testSrcPathDir)
-             throws Exception {
-        File definitionsFiles[] = new File(defintionsDir).listFiles();
-        if (definitionsFiles == null) {
-            System.err.println(defintionsDir+" is not a directory.");
-            return;
-        }
-
-        for (File file : definitionsFiles) {
-            if (file.isFile() &&
-                    (file.getName().endsWith("_record.xml") ||
-                    file.getName().endsWith("_type.xml")
-                    )
-                    ) {
-                // Get record name and package
-                DocumentBuilderFactory factory = XMLHelper.getDocumentBuilderFactory();
-                DocumentBuilder builder = factory.newDocumentBuilder();
-                Document document = builder.parse(file);
-                Element record = document.getDocumentElement();
-                String extendstg = record.getElementsByTagName("extends").item(0).getFirstChild().getNodeValue();
-                String suffix = record.getElementsByTagName("suffix").item(0).getFirstChild().getNodeValue();
-                String recordName = record.getAttributes().getNamedItem("name").getNodeValue();
-                String packageName = record.getAttributes().getNamedItem("package").getNodeValue();
-                packageName = packageName.replace('.', '/');
-
-                // Generate record
-                String destinationPath = destSrcPathDir + "/" + packageName;
-                File destinationPathFile = new File(destinationPath);
-                if(!destinationPathFile.mkdirs()) {
-                    throw new IOException("Could not create directory " + destinationPathFile);
-                } else {
-					System.out.println("Created destination directory: " + destinationPath);
-                }
-                String destinationFilepath = destinationPath + "/" + recordName + suffix + ".java";
-                transform(file, new File(destinationFilepath), 
-                          new File(recordStyleDir + "/" + extendstg.toLowerCase(Locale.ROOT) + ".xsl"));
-                System.out.println("Generated " + suffix + ": " + destinationFilepath);
-
-                // Generate test (if not already generated)
-                destinationPath = testSrcPathDir + "/" + packageName;
-                destinationPathFile = new File(destinationPath);
-                if(!destinationPathFile.mkdirs()) {
-                    throw new IOException("Could not create directory " + destinationPathFile);
-                } else {
-                    System.out.println("Created destination directory: " + destinationPath);
-                }
-                destinationFilepath = destinationPath + "/Test" + recordName + suffix + ".java";
-                if (!new File(destinationFilepath).exists()) {
-                    String temp = (recordStyleDir + "/" + extendstg.toLowerCase(Locale.ROOT) + "_test.xsl");
-                    transform(file, new File(destinationFilepath), new File(temp));
-                    System.out.println("Generated test: " + destinationFilepath);
-                } else {
-                    System.out.println("Skipped test generation: " + destinationFilepath);
-                }
-            }
-        }
-    }
-
-    
-    
-    /**
-     * <p>Executes an XSL transformation. This process transforms an XML input
-     * file into a text output file controlled by an XSLT specification.</p>
-     * 
-     * @param in the XML input file
-     * @param out the text output file
-     * @param xslt the XSLT specification, i.e. an XSL style sheet
-     * @throws FileNotFoundException 
-     * @throws TransformerException 
-     */
-    private static void transform(final File in, final File out, final File xslt)
-    throws FileNotFoundException, TransformerException
-    {
-        final StreamSource ss = new StreamSource(xslt);
-        final TransformerFactory tf = TransformerFactory.newInstance();
-        final Transformer t;
-        try
-        {
-            t = tf.newTransformer(ss);
-        }
-        catch (TransformerException ex)
-        {
-            System.err.println("Error compiling XSL style sheet " + xslt);
-            throw ex;
-        }
-        final Properties p = new Properties();
-        p.setProperty(OutputKeys.METHOD, "text");
-        t.setOutputProperties(p);
-        final Result result = new StreamResult(out);
-        t.transform(new StreamSource(in), result);        
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/extractor/OLE2ExtractorFactory.java b/trunk/src/java/org/apache/poi/extractor/OLE2ExtractorFactory.java
deleted file mode 100644
index 737e9e3..0000000
--- a/trunk/src/java/org/apache/poi/extractor/OLE2ExtractorFactory.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.extractor;
-
-import static org.apache.poi.hssf.model.InternalWorkbook.OLD_WORKBOOK_DIR_ENTRY_NAME;
-import static org.apache.poi.hssf.model.InternalWorkbook.WORKBOOK_DIR_ENTRY_NAMES;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.extractor.EventBasedExcelExtractor;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Figures out the correct POIOLE2TextExtractor for your supplied
- *  document, and returns it.
- *  
- * <p>Note 1 - will fail for many file formats if the POI Scratchpad jar is
- *  not present on the runtime classpath</p>
- * <p>Note 2 - for text extractor creation across all formats, use
- *  {@link org.apache.poi.extractor.ExtractorFactory} contained within
- *  the OOXML jar.</p>
- * <p>Note 3 - rather than using this, for most cases you would be better
- *  off switching to <a href="http://tika.apache.org">Apache Tika</a> instead!</p>
- */
-@SuppressWarnings("WeakerAccess")
-public class OLE2ExtractorFactory {
-    private static final POILogger LOGGER = POILogFactory.getLogger(OLE2ExtractorFactory.class); 
-    
-    /** Should this thread prefer event based over usermodel based extractors? */
-    private static final ThreadLocal<Boolean> threadPreferEventExtractors = new ThreadLocal<Boolean>() {
-        @Override
-        protected Boolean initialValue() { return Boolean.FALSE; }
-    };
-
-    /** Should all threads prefer event based over usermodel based extractors? */
-    private static Boolean allPreferEventExtractors;
-
-    /**
-     * Should this thread prefer event based over usermodel based extractors?
-     * (usermodel extractors tend to be more accurate, but use more memory)
-     * Default is false.
-     */
-    public static boolean getThreadPrefersEventExtractors() {
-        return threadPreferEventExtractors.get();
-    }
-
-    /**
-     * Should all threads prefer event based over usermodel based extractors?
-     * (usermodel extractors tend to be more accurate, but use more memory)
-     * Default is to use the thread level setting, which defaults to false.
-     */
-    public static Boolean getAllThreadsPreferEventExtractors() {
-        return allPreferEventExtractors;
-    }
-
-    /**
-     * Should this thread prefer event based over usermodel based extractors?
-     * Will only be used if the All Threads setting is null.
-     */
-    public static void setThreadPrefersEventExtractors(boolean preferEventExtractors) {
-        threadPreferEventExtractors.set(preferEventExtractors);
-    }
-
-    /**
-     * Should all threads prefer event based over usermodel based extractors?
-     * If set, will take preference over the Thread level setting.
-     */
-    public static void setAllThreadsPreferEventExtractors(Boolean preferEventExtractors) {
-        allPreferEventExtractors = preferEventExtractors;
-    }
-
-    /**
-     * Should this thread use event based extractors is available?
-     * Checks the all-threads one first, then thread specific.
-     */
-    protected static boolean getPreferEventExtractor() {
-        if(allPreferEventExtractors != null) {
-            return allPreferEventExtractors;
-        }
-        return threadPreferEventExtractors.get();
-    }
-
-    public static POIOLE2TextExtractor createExtractor(POIFSFileSystem fs) throws IOException {
-        // Only ever an OLE2 one from the root of the FS
-        return (POIOLE2TextExtractor)createExtractor(fs.getRoot());
-    }
-    public static POIOLE2TextExtractor createExtractor(NPOIFSFileSystem fs) throws IOException {
-        // Only ever an OLE2 one from the root of the FS
-        return (POIOLE2TextExtractor)createExtractor(fs.getRoot());
-    }
-    public static POIOLE2TextExtractor createExtractor(OPOIFSFileSystem fs) throws IOException {
-        // Only ever an OLE2 one from the root of the FS
-        return (POIOLE2TextExtractor)createExtractor(fs.getRoot());
-    }
-
-    public static POITextExtractor createExtractor(InputStream input) throws IOException {
-        Class<?> cls = getOOXMLClass();
-        if (cls != null) {
-            // Use Reflection to get us the full OOXML-enabled version
-            try {
-                Method m = cls.getDeclaredMethod("createExtractor", InputStream.class);
-                return (POITextExtractor)m.invoke(null, input);
-            } catch (IllegalArgumentException iae) {
-                throw iae;
-            } catch (Exception e) {
-                throw new IllegalArgumentException("Error creating Extractor for InputStream", e);
-            }
-        } else {
-            // Best hope it's OLE2....
-            return createExtractor(new NPOIFSFileSystem(input));
-        }
-    }
-
-    private static Class<?> getOOXMLClass() {
-        try {
-            return OLE2ExtractorFactory.class.getClassLoader().loadClass(
-                    "org.apache.poi.extractor.ExtractorFactory"
-            );
-        } catch (ClassNotFoundException e) {
-            LOGGER.log(POILogger.WARN, "POI OOXML jar missing");
-            return null;
-        }
-    }
-    private static Class<?> getScratchpadClass() {
-        try {
-            return OLE2ExtractorFactory.class.getClassLoader().loadClass(
-                    "org.apache.poi.extractor.OLE2ScratchpadExtractorFactory"
-            );
-        } catch (ClassNotFoundException e) {
-            LOGGER.log(POILogger.ERROR, "POI Scratchpad jar missing");
-            throw new IllegalStateException("POI Scratchpad jar missing, required for ExtractorFactory");
-        }
-    }
-    
-    /**
-     * Create the Extractor, if possible. Generally needs the Scratchpad jar.
-     * Note that this won't check for embedded OOXML resources either, use
-     *  {@link org.apache.poi.extractor.ExtractorFactory} for that.
-     */
-    public static POITextExtractor createExtractor(DirectoryNode poifsDir)
-            throws IOException
-    {
-        // Look for certain entries in the stream, to figure it
-        // out from
-        for (String workbookName : WORKBOOK_DIR_ENTRY_NAMES) {
-            if (poifsDir.hasEntry(workbookName)) {
-                if (getPreferEventExtractor()) {
-                    return new EventBasedExcelExtractor(poifsDir);
-                }
-                return new ExcelExtractor(poifsDir);
-            }
-        }
-        if (poifsDir.hasEntry(OLD_WORKBOOK_DIR_ENTRY_NAME)) {
-            throw new OldExcelFormatException("Old Excel Spreadsheet format (1-95) "
-                    + "found. Please call OldExcelExtractor directly for basic text extraction");
-        }
-        
-        // Ask Scratchpad, or fail trying
-        Class<?> cls = getScratchpadClass();
-        try {
-            Method m = cls.getDeclaredMethod("createExtractor", DirectoryNode.class);
-            POITextExtractor ext = (POITextExtractor)m.invoke(null, poifsDir);
-            if (ext != null) return ext;
-        } catch (IllegalArgumentException iae) {
-            throw iae;
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Error creating Scratchpad Extractor", e);
-        }
-
-        throw new IllegalArgumentException("No supported documents found in the OLE2 stream");
-    }
-
-    /**
-     * Returns an array of text extractors, one for each of
-     *  the embedded documents in the file (if there are any).
-     * If there are no embedded documents, you'll get back an
-     *  empty array. Otherwise, you'll get one open
-     *  {@link POITextExtractor} for each embedded file.
-     */
-    public static POITextExtractor[] getEmbededDocsTextExtractors(POIOLE2TextExtractor ext)
-            throws IOException
-    {
-        // All the embedded directories we spotted
-        List<Entry> dirs = new ArrayList<Entry>();
-        // For anything else not directly held in as a POIFS directory
-        List<InputStream> nonPOIFS = new ArrayList<InputStream>();
-
-        // Find all the embedded directories
-        DirectoryEntry root = ext.getRoot();
-        if(root == null) {
-            throw new IllegalStateException("The extractor didn't know which POIFS it came from!");
-        }
-
-        if(ext instanceof ExcelExtractor) {
-            // These are in MBD... under the root
-            Iterator<Entry> it = root.getEntries();
-            while(it.hasNext()) {
-                Entry entry = it.next();
-                if(entry.getName().startsWith("MBD")) {
-                    dirs.add(entry);
-                }
-            }
-        } else {
-            // Ask Scratchpad, or fail trying
-            Class<?> cls = getScratchpadClass();
-            try {
-                Method m = cls.getDeclaredMethod(
-                        "identifyEmbeddedResources", POIOLE2TextExtractor.class, List.class, List.class);
-                m.invoke(null, ext, dirs, nonPOIFS);
-            } catch (Exception e) {
-                throw new IllegalArgumentException("Error checking for Scratchpad embedded resources", e);
-            }
-        }
-
-        // Create the extractors
-        if(dirs.size() == 0 && nonPOIFS.size() == 0){
-            return new POITextExtractor[0];
-        }
-
-        ArrayList<POITextExtractor> e = new ArrayList<POITextExtractor>();
-        for (Entry dir : dirs) {
-            e.add(createExtractor(
-                    (DirectoryNode) dir
-            ));
-        }
-        for (InputStream nonPOIF : nonPOIFS) {
-            try {
-                e.add(createExtractor(nonPOIF));
-            } catch (IllegalArgumentException ie) {
-                // Ignore, just means it didn't contain
-                //  a format we support as yet
-                LOGGER.log(POILogger.WARN, ie);
-            } catch (Exception xe) {
-                // Ignore, invalid format
-                LOGGER.log(POILogger.WARN, xe);
-            }
-        }
-        return e.toArray(new POITextExtractor[e.size()]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Array.java b/trunk/src/java/org/apache/poi/hpsf/Array.java
deleted file mode 100644
index 8850ab9..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Array.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-class Array
-{
-    static class ArrayDimension
-    {
-        static final int SIZE = 8;
-
-        private int _indexOffset;
-        private long _size;
-
-        ArrayDimension( byte[] data, int offset )
-        {
-            _size = LittleEndian.getUInt( data, offset );
-            _indexOffset = LittleEndian.getInt( data, offset
-                    + LittleEndian.INT_SIZE );
-        }
-    }
-
-    static class ArrayHeader
-    {
-        private ArrayDimension[] _dimensions;
-        private int _type;
-
-        ArrayHeader( byte[] data, int startOffset )
-        {
-            int offset = startOffset;
-
-            _type = LittleEndian.getInt( data, offset );
-            offset += LittleEndian.INT_SIZE;
-
-            long numDimensionsUnsigned = LittleEndian.getUInt( data, offset );
-            offset += LittleEndian.INT_SIZE;
-
-            if ( !( 1 <= numDimensionsUnsigned && numDimensionsUnsigned <= 31 ) )
-                throw new IllegalPropertySetDataException(
-                        "Array dimension number " + numDimensionsUnsigned
-                                + " is not in [1; 31] range" );
-            int numDimensions = (int) numDimensionsUnsigned;
-
-            _dimensions = new ArrayDimension[numDimensions];
-            for ( int i = 0; i < numDimensions; i++ )
-            {
-                _dimensions[i] = new ArrayDimension( data, offset );
-                offset += ArrayDimension.SIZE;
-            }
-        }
-
-        long getNumberOfScalarValues()
-        {
-            long result = 1;
-            for ( ArrayDimension dimension : _dimensions )
-                result *= dimension._size;
-            return result;
-        }
-
-        int getSize()
-        {
-            return LittleEndian.INT_SIZE * 2 + _dimensions.length
-                    * ArrayDimension.SIZE;
-        }
-
-        int getType()
-        {
-            return _type;
-        }
-    }
-
-    private ArrayHeader _header;
-    private TypedPropertyValue[] _values;
-
-    Array()
-    {
-    }
-
-    Array( final byte[] data, final int offset )
-    {
-        read( data, offset );
-    }
-
-    int read( final byte[] data, final int startOffset )
-    {
-        int offset = startOffset;
-
-        _header = new ArrayHeader( data, offset );
-        offset += _header.getSize();
-
-        long numberOfScalarsLong = _header.getNumberOfScalarValues();
-        if ( numberOfScalarsLong > Integer.MAX_VALUE )
-            throw new UnsupportedOperationException(
-                    "Sorry, but POI can't store array of properties with size of "
-                            + numberOfScalarsLong + " in memory" );
-        int numberOfScalars = (int) numberOfScalarsLong;
-
-        _values = new TypedPropertyValue[numberOfScalars];
-        final int type = _header._type;
-        if ( type == Variant.VT_VARIANT )
-        {
-            for ( int i = 0; i < numberOfScalars; i++ )
-            {
-                TypedPropertyValue typedPropertyValue = new TypedPropertyValue();
-                offset += typedPropertyValue.read( data, offset );
-            }
-        }
-        else
-        {
-            for ( int i = 0; i < numberOfScalars; i++ )
-            {
-                TypedPropertyValue typedPropertyValue = new TypedPropertyValue(
-                        type, null );
-                offset += typedPropertyValue.readValuePadded( data, offset );
-            }
-        }
-
-        return offset - startOffset;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Blob.java b/trunk/src/java/org/apache/poi/hpsf/Blob.java
deleted file mode 100644
index 547e239..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Blob.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-class Blob
-{
-    private byte[] _value;
-
-    Blob( byte[] data, int offset )
-    {
-        int size = LittleEndian.getInt( data, offset );
-
-        if ( size == 0 )
-        {
-            _value = new byte[0];
-            return;
-        }
-
-        _value = LittleEndian.getByteArray( data, offset
-                + LittleEndian.INT_SIZE, size );
-    }
-
-    int getSize()
-    {
-        return LittleEndian.INT_SIZE + _value.length;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/ClassID.java b/trunk/src/java/org/apache/poi/hpsf/ClassID.java
deleted file mode 100644
index 1c06db0..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/ClassID.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.StringUtil;
-
-/**
- *  <p>Represents a class ID (16 bytes). Unlike other little-endian
- *  type the {@link ClassID} is not just 16 bytes stored in the wrong
- *  order. Instead, it is a double word (4 bytes) followed by two
- *  words (2 bytes each) followed by 8 bytes.</p>
- */
-public class ClassID
-{
-    public static final ClassID OLE10_PACKAGE = new ClassID("{0003000C-0000-0000-C000-000000000046}");
-    public static final ClassID PPT_SHOW      = new ClassID("{64818D10-4F9B-11CF-86EA-00AA00B929E8}");
-    public static final ClassID XLS_WORKBOOK  = new ClassID("{00020841-0000-0000-C000-000000000046}");
-    public static final ClassID TXT_ONLY      = new ClassID("{5e941d80-bf96-11cd-b579-08002b30bfeb}");
-    public static final ClassID EXCEL97       = new ClassID("{00020820-0000-0000-C000-000000000046}");
-    public static final ClassID EXCEL95       = new ClassID("{00020810-0000-0000-C000-000000000046}");
-    public static final ClassID WORD97        = new ClassID("{00020906-0000-0000-C000-000000000046}");
-    public static final ClassID WORD95        = new ClassID("{00020900-0000-0000-C000-000000000046}");
-    public static final ClassID POWERPOINT97  = new ClassID("{64818D10-4F9B-11CF-86EA-00AA00B929E8}");
-    public static final ClassID POWERPOINT95  = new ClassID("{EA7BAE70-FB3B-11CD-A903-00AA00510EA3}");
-    public static final ClassID EQUATION30    = new ClassID("{0002CE02-0000-0000-C000-000000000046}");
-	
-	
-    /**
-     * <p>The bytes making out the class ID in correct order,
-     * i.e. big-endian.</p>
-     */
-    protected byte[] bytes;
-
-
-
-    /**
-     *  <p>Creates a {@link ClassID} and reads its value from a byte
-     *  array.</p>
-     *
-     * @param src The byte array to read from.
-     * @param offset The offset of the first byte to read.
-     */
-    public ClassID(final byte[] src, final int offset)
-    {
-        read(src, offset);
-    }
-
-
-    /**
-     *  <p>Creates a {@link ClassID} and initializes its value with
-     *  0x00 bytes.</p>
-     */
-    public ClassID()
-    {
-        bytes = new byte[LENGTH];
-        for (int i = 0; i < LENGTH; i++)
-            bytes[i] = 0x00;
-    }
-
-
-    /**
-     * <p>Creates a {@link ClassID} from a human-readable representation of the Class ID in standard 
-     * format <code>"{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}"</code>.</p>
-     * 
-     * @param externalForm representation of the Class ID represented by this object.
-     */
-    public ClassID(String externalForm) {
-    	bytes = new byte[LENGTH];
-        String clsStr = externalForm.replaceAll("[{}-]", "");
-        for (int i=0; i<clsStr.length(); i+=2) {
-        	bytes[i/2] = (byte)Integer.parseInt(clsStr.substring(i, i+2), 16);
-        }
-    }
-    
-
-    /** <p>The number of bytes occupied by this object in the byte
-     * stream.</p> */
-    public static final int LENGTH = 16;
-
-    /**
-     * @return The number of bytes occupied by this object in the byte
-     * stream.
-     */
-    public int length()
-    {
-        return LENGTH;
-    }
-
-
-
-    /**
-     * <p>Gets the bytes making out the class ID. They are returned in
-     * correct order, i.e. big-endian.</p>
-     *
-     * @return the bytes making out the class ID.
-     */
-    public byte[] getBytes()
-    {
-        return bytes;
-    }
-
-
-
-    /**
-     * <p>Sets the bytes making out the class ID.</p>
-     *
-     * @param bytes The bytes making out the class ID in big-endian format. They
-     * are copied without their order being changed.
-     */
-    public void setBytes(final byte[] bytes)
-    {
-        for (int i = 0; i < this.bytes.length; i++)
-            this.bytes[i] = bytes[i];
-    }
-
-
-
-    /**
-     * <p>Reads the class ID's value from a byte array by turning
-     * little-endian into big-endian.</p>
-     *
-     * @param src The byte array to read from
-     *
-     * @param offset The offset within the <var>src</var> byte array
-     *
-     * @return A byte array containing the class ID.
-     */
-    public byte[] read(final byte[] src, final int offset)
-    {
-        bytes = new byte[16];
-
-        /* Read double word. */
-        bytes[0] = src[3 + offset];
-        bytes[1] = src[2 + offset];
-        bytes[2] = src[1 + offset];
-        bytes[3] = src[0 + offset];
-
-        /* Read first word. */
-        bytes[4] = src[5 + offset];
-        bytes[5] = src[4 + offset];
-
-        /* Read second word. */
-        bytes[6] = src[7 + offset];
-        bytes[7] = src[6 + offset];
-
-        /* Read 8 bytes. */
-        for (int i = 8; i < 16; i++)
-            bytes[i] = src[i + offset];
-
-        return bytes;
-    }
-
-
-
-    /**
-     * <p>Writes the class ID to a byte array in the
-     * little-endian format.</p>
-     *
-     * @param dst The byte array to write to.
-     *
-     * @param offset The offset within the <var>dst</var> byte array.
-     *
-     * @exception ArrayStoreException if there is not enough room for the class
-     * ID 16 bytes in the byte array after the <var>offset</var> position.
-     */
-    public void write(final byte[] dst, final int offset)
-    throws ArrayStoreException
-    {
-        /* Check array size: */
-        if (dst.length < 16)
-            throw new ArrayStoreException
-                ("Destination byte[] must have room for at least 16 bytes, " +
-                 "but has a length of only " + dst.length + ".");
-        /* Write double word. */
-        dst[0 + offset] = bytes[3];
-        dst[1 + offset] = bytes[2];
-        dst[2 + offset] = bytes[1];
-        dst[3 + offset] = bytes[0];
-
-        /* Write first word. */
-        dst[4 + offset] = bytes[5];
-        dst[5 + offset] = bytes[4];
-
-        /* Write second word. */
-        dst[6 + offset] = bytes[7];
-        dst[7 + offset] = bytes[6];
-
-        /* Write 8 bytes. */
-        for (int i = 8; i < 16; i++)
-            dst[i + offset] = bytes[i];
-    }
-
-
-
-    /**
-     * <p>Checks whether this <code>ClassID</code> is equal to another
-     * object.</p>
-     *
-     * @param o the object to compare this <code>PropertySet</code> with
-     * @return <code>true</code> if the objects are equal, else
-     * <code>false</code>.
-     */
-    @Override
-    public boolean equals(final Object o)
-    {
-        if (o == null || !(o instanceof ClassID))
-            return false;
-        final ClassID cid = (ClassID) o;
-        if (bytes.length != cid.bytes.length)
-            return false;
-        for (int i = 0; i < bytes.length; i++)
-            if (bytes[i] != cid.bytes[i])
-                return false;
-        return true;
-    }
-
-
-
-    /**
-     * @see Object#hashCode()
-     */
-    @Override
-    public int hashCode()
-    {
-        return new String(bytes, StringUtil.UTF8).hashCode();
-    }
-
-    /**
-     * <p>Returns a human-readable representation of the Class ID in standard 
-     * format <code>"{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}"</code>.</p>
-     * 
-     * @return String representation of the Class ID represented by this object.
-     */
-    @Override
-    public String toString()
-    {
-        StringBuffer sbClassId = new StringBuffer(38);
-        sbClassId.append('{');
-        for (int i = 0; i < 16; i++)
-        {
-            sbClassId.append(HexDump.toHex(bytes[i]));
-            if (i == 3 || i == 5 || i == 7 || i == 9)
-                sbClassId.append('-');
-        }
-        sbClassId.append('}');
-        return sbClassId.toString();
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/ClipboardData.java b/trunk/src/java/org/apache/poi/hpsf/ClipboardData.java
deleted file mode 100644
index 42ce724..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/ClipboardData.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-class ClipboardData
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( ClipboardData.class );
-
-    private int _format;
-    private byte[] _value;
-
-    ClipboardData( byte[] data, int offset )
-    {
-        int size = LittleEndian.getInt( data, offset );
-
-        if ( size < 4 )
-        {
-            logger.log( POILogger.WARN, "ClipboardData at offset ",
-                    Integer.valueOf( offset ), " size less than 4 bytes "
-                            + "(doesn't even have format field!). "
-                            + "Setting to format == 0 and hope for the best" );
-            _format = 0;
-            _value = new byte[0];
-            return;
-        }
-
-        _format = LittleEndian.getInt( data, offset + LittleEndian.INT_SIZE );
-        _value = LittleEndian.getByteArray( data, offset
-                + LittleEndian.INT_SIZE * 2, size - LittleEndian.INT_SIZE );
-    }
-
-    int getSize()
-    {
-        return LittleEndian.INT_SIZE * 2 + _value.length;
-    }
-
-    byte[] getValue()
-    {
-        return _value;
-    }
-
-    byte[] toByteArray()
-    {
-        byte[] result = new byte[getSize()];
-        LittleEndian.putInt( result, 0 * LittleEndian.INT_SIZE,
-                LittleEndian.INT_SIZE + _value.length );
-        LittleEndian.putInt( result, 1 * LittleEndian.INT_SIZE, _format );
-        System.arraycopy( _value, 0, result, LittleEndian.INT_SIZE
-                + LittleEndian.INT_SIZE, _value.length );
-        return result;
-    }
-
-    int write( OutputStream out ) throws IOException
-    {
-        LittleEndian.putInt( LittleEndian.INT_SIZE + _value.length, out );
-        LittleEndian.putInt( _format, out );
-        out.write( _value );
-        return 2 * LittleEndian.INT_SIZE + _value.length;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/CodePageString.java b/trunk/src/java/org/apache/poi/hpsf/CodePageString.java
deleted file mode 100644
index 8eb8987..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/CodePageString.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-@Internal
-class CodePageString
-{
-    private final static POILogger logger = POILogFactory
-            .getLogger( CodePageString.class );
-
-    private byte[] _value;
-
-    CodePageString( final byte[] data, final int startOffset )
-    {
-        int offset = startOffset;
-
-        int size = LittleEndian.getInt( data, offset );
-        offset += LittleEndian.INT_SIZE;
-
-        _value = LittleEndian.getByteArray( data, offset, size );
-        if ( size != 0 && _value[size - 1] != 0 ) {
-            // TODO Some files, such as TestVisioWithCodepage.vsd, are currently
-            //  triggering this for values that don't look like codepages
-            // See Bug #52258 for details
-            logger.log(POILogger.WARN, "CodePageString started at offset #" + offset
-                        + " is not NULL-terminated" );
-//            throw new IllegalPropertySetDataException(
-//                    "CodePageString started at offset #" + offset
-//                            + " is not NULL-terminated" );
-        }
-    }
-
-    CodePageString( String string, int codepage )
-            throws UnsupportedEncodingException
-    {
-        setJavaValue( string, codepage );
-    }
-
-    String getJavaValue( int codepage ) throws UnsupportedEncodingException
-    {
-        String result;
-        if ( codepage == -1 )
-            result = new String( _value, StringUtil.UTF8 );
-        else
-            result = CodePageUtil.getStringFromCodePage(_value, codepage);
-        final int terminator = result.indexOf( '\0' );
-        if ( terminator == -1 )
-        {
-            logger.log(
-                    POILogger.WARN,
-                    "String terminator (\\0) for CodePageString property value not found."
-                            + "Continue without trimming and hope for the best." );
-            return result;
-        }
-        if ( terminator != result.length() - 1 )
-        {
-            logger.log(
-                    POILogger.WARN,
-                    "String terminator (\\0) for CodePageString property value occured before the end of string. "
-                            + "Trimming and hope for the best." );
-        }
-        return result.substring( 0, terminator );
-    }
-
-    int getSize()
-    {
-        return LittleEndian.INT_SIZE + _value.length;
-    }
-
-    void setJavaValue( String string, int codepage )
-            throws UnsupportedEncodingException
-    {
-        String stringNT = string + "\0";
-        if ( codepage == -1 )
-            _value = stringNT.getBytes(StringUtil.UTF8);
-        else
-            _value = CodePageUtil.getBytesInCodePage(stringNT, codepage);
-    }
-
-    int write( OutputStream out ) throws IOException
-    {
-        LittleEndian.putInt( _value.length, out );
-        out.write( _value );
-        return LittleEndian.INT_SIZE + _value.length;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Currency.java b/trunk/src/java/org/apache/poi/hpsf/Currency.java
deleted file mode 100644
index 8928a56..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Currency.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-class Currency
-{
-    static final int SIZE = 8;
-
-    private byte[] _value;
-
-    Currency( byte[] data, int offset )
-    {
-        _value = LittleEndian.getByteArray( data, offset, SIZE );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/CustomProperties.java b/trunk/src/java/org/apache/poi/hpsf/CustomProperties.java
deleted file mode 100644
index f305836..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/CustomProperties.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-
-/**
- * <p>Maintains the instances of {@link CustomProperty} that belong to a
- * {@link DocumentSummaryInformation}. The class maintains the names of the
- * custom properties in a dictionary. It implements the {@link Map} interface
- * and by this provides a simplified view on custom properties: A property's
- * name is the key that maps to a typed value. This implementation hides
- * property IDs from the developer and regards the property names as keys to
- * typed values.</p>
- *
- * <p>While this class provides a simple API to custom properties, it ignores
- * the fact that not names, but IDs are the real keys to properties. Under the
- * hood this class maintains a 1:1 relationship between IDs and names. Therefore
- * you should not use this class to process property sets with several IDs
- * mapping to the same name or with properties without a name: the result will
- * contain only a subset of the original properties. If you really need to deal
- * such property sets, use HPSF's low-level access methods.</p>
- *
- * <p>An application can call the {@link #isPure} method to check whether a
- * property set parsed by {@link CustomProperties} is still pure (i.e.
- * unmodified) or whether one or more properties have been dropped.</p>
- *
- * <p>This class is not thread-safe; concurrent access to instances of this
- * class must be synchronized.</p>
- *
- * <p>While this class is roughly HashMap&lt;Long,CustomProperty&gt;, that's the
- *  internal representation. To external calls, it should appear as
- *  HashMap&lt;String,Object&gt; mapping between Names and Custom Property Values.</p>
- */
-@SuppressWarnings("serial")
-public class CustomProperties extends HashMap<Object,CustomProperty>
-{
-
-    /**
-     * <p>Maps property IDs to property names.</p>
-     */
-    private final Map<Long,String> dictionaryIDToName = new HashMap<Long,String>();
-
-    /**
-     * <p>Maps property names to property IDs.</p>
-     */
-    private final Map<String,Long> dictionaryNameToID = new HashMap<String,Long>();
-
-    /**
-     * <p>Tells whether this object is pure or not.</p>
-     */
-    private boolean isPure = true;
-
-
-    /**
-     * <p>Puts a {@link CustomProperty} into this map. It is assumed that the
-     * {@link CustomProperty} already has a valid ID. Otherwise use
-     * {@link #put(CustomProperty)}.</p>
-     * 
-     * @param name the property name
-     * @param cp the property
-     * 
-     * @return the previous property stored under this name
-     */
-    public CustomProperty put(final String name, final CustomProperty cp)
-    {
-        if (name == null)
-        {
-            /* Ignoring a property without a name. */
-            isPure = false;
-            return null;
-        }
-        if (!(name.equals(cp.getName())))
-            throw new IllegalArgumentException("Parameter \"name\" (" + name +
-                    ") and custom property's name (" + cp.getName() +
-                    ") do not match.");
-
-        /* Register name and ID in the dictionary. Mapping in both directions is possible. If there is already a  */
-        final Long idKey = Long.valueOf(cp.getID());
-        final Long oldID = dictionaryNameToID.get(name);
-        dictionaryIDToName.remove(oldID);
-        dictionaryNameToID.put(name, idKey);
-        dictionaryIDToName.put(idKey, name);
-
-        /* Put the custom property into this map. */
-        final CustomProperty oldCp = super.remove(oldID);
-        super.put(idKey, cp);
-        return oldCp;
-    }
-
-
-
-    /**
-     * <p>Puts a {@link CustomProperty} that has not yet a valid ID into this
-     * map. The method will allocate a suitable ID for the custom property:</p>
-     *
-     * <ul>
-     *
-     * <li><p>If there is already a property with the same name, take the ID
-     * of that property.</p></li>
-     *
-     * <li><p>Otherwise find the highest ID and use its value plus one.</p></li>
-     *
-     * </ul>
-     *
-     * @param customProperty
-     * @return If the was already a property with the same name, the
-     * @throws ClassCastException
-     */
-    private Object put(final CustomProperty customProperty) throws ClassCastException
-    {
-        final String name = customProperty.getName();
-
-        /* Check whether a property with this name is in the map already. */
-        final Long oldId = dictionaryNameToID.get(name);
-        if (oldId != null)
-            customProperty.setID(oldId.longValue());
-        else
-        {
-            long max = 1;
-            for (Long long1 : dictionaryIDToName.keySet()) {
-                final long id = long1.longValue();
-                if (id > max)
-                    max = id;
-            }
-            customProperty.setID(max + 1);
-        }
-        return this.put(name, customProperty);
-    }
-
-
-
-    /**
-     * <p>Removes a custom property.</p>
-     * @param name The name of the custom property to remove
-     * @return The removed property or <code>null</code> if the specified property was not found.
-     *
-     * @see java.util.HashSet#remove(java.lang.Object)
-     */
-    public Object remove(final String name)
-    {
-        final Long id = dictionaryNameToID.get(name);
-        if (id == null)
-            return null;
-        dictionaryIDToName.remove(id);
-        dictionaryNameToID.remove(name);
-        return super.remove(id);
-    }
-
-    /**
-     * <p>Adds a named string property.</p>
-     *
-     * @param name The property's name.
-     * @param value The property's value.
-     * @return the property that was stored under the specified name before, or
-     *         <code>null</code> if there was no such property before.
-     */
-    public Object put(final String name, final String value)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(-1);
-        p.setType(Variant.VT_LPWSTR);
-        p.setValue(value);
-        final CustomProperty cp = new CustomProperty(p, name);
-        return put(cp);
-    }
-
-    /**
-     * <p>Adds a named long property.</p>
-     *
-     * @param name The property's name.
-     * @param value The property's value.
-     * @return the property that was stored under the specified name before, or
-     *         <code>null</code> if there was no such property before.
-     */
-    public Object put(final String name, final Long value)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(-1);
-        p.setType(Variant.VT_I8);
-        p.setValue(value);
-        final CustomProperty cp = new CustomProperty(p, name);
-        return put(cp);
-    }
-
-    /**
-     * <p>Adds a named double property.</p>
-     *
-     * @param name The property's name.
-     * @param value The property's value.
-     * @return the property that was stored under the specified name before, or
-     *         <code>null</code> if there was no such property before.
-     */
-    public Object put(final String name, final Double value)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(-1);
-        p.setType(Variant.VT_R8);
-        p.setValue(value);
-        final CustomProperty cp = new CustomProperty(p, name);
-        return put(cp);
-    }
-
-    /**
-     * <p>Adds a named integer property.</p>
-     *
-     * @param name The property's name.
-     * @param value The property's value.
-     * @return the property that was stored under the specified name before, or
-     *         <code>null</code> if there was no such property before.
-     */
-    public Object put(final String name, final Integer value)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(-1);
-        p.setType(Variant.VT_I4);
-        p.setValue(value);
-        final CustomProperty cp = new CustomProperty(p, name);
-        return put(cp);
-    }
-
-    /**
-     * <p>Adds a named boolean property.</p>
-     *
-     * @param name The property's name.
-     * @param value The property's value.
-     * @return the property that was stored under the specified name before, or
-     *         <code>null</code> if there was no such property before.
-     */
-    public Object put(final String name, final Boolean value)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(-1);
-        p.setType(Variant.VT_BOOL);
-        p.setValue(value);
-        final CustomProperty cp = new CustomProperty(p, name);
-        return put(cp);
-    }
-
-
-    /**
-     * <p>Gets a named value from the custom properties.</p>
-     *
-     * @param name the name of the value to get
-     * @return the value or <code>null</code> if a value with the specified
-     *         name is not found in the custom properties.
-     */
-    public Object get(final String name)
-    {
-        final Long id = dictionaryNameToID.get(name);
-        final CustomProperty cp = super.get(id);
-        return cp != null ? cp.getValue() : null;
-    }
-
-
-
-    /**
-     * <p>Adds a named date property.</p>
-     *
-     * @param name The property's name.
-     * @param value The property's value.
-     * @return the property that was stored under the specified name before, or
-     *         <code>null</code> if there was no such property before.
-     */
-    public Object put(final String name, final Date value)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(-1);
-        p.setType(Variant.VT_FILETIME);
-        p.setValue(value);
-        final CustomProperty cp = new CustomProperty(p, name);
-        return put(cp);
-    }
-
-    /**
-     * Returns a set of all the names of our custom properties.
-     * Equivalent to {@link #nameSet()}
-     * 
-     * @return a set of all the names of our custom properties
-     */
-    @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public Set keySet() {
-        return dictionaryNameToID.keySet();
-    }
-
-    /**
-     * Returns a set of all the names of our custom properties
-     * 
-     * @return a set of all the names of our custom properties
-     */
-    public Set<String> nameSet() {
-        return dictionaryNameToID.keySet();
-    }
-
-    /**
-     * Returns a set of all the IDs of our custom properties
-     * 
-     * @return a set of all the IDs of our custom properties
-     */
-    public Set<String> idSet() {
-        return dictionaryNameToID.keySet();
-    }
-
-
-    /**
-     * <p>Sets the codepage.</p>
-     *
-     * @param codepage the codepage
-     */
-    public void setCodepage(final int codepage)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(PropertyIDMap.PID_CODEPAGE);
-        p.setType(Variant.VT_I2);
-        p.setValue(Integer.valueOf(codepage));
-        put(new CustomProperty(p));
-    }
-
-
-
-    /**
-     * <p>Gets the dictionary which contains IDs and names of the named custom
-     * properties.
-     *
-     * @return the dictionary.
-     */
-    Map<Long,String> getDictionary()
-    {
-        return dictionaryIDToName;
-    }
-
-
-    /**
-     * Checks against both String Name and Long ID
-     */
-   @Override
-   public boolean containsKey(Object key) {
-      if(key instanceof Long) {
-         return super.containsKey(key);
-      }
-      if(key instanceof String) {
-         return super.containsKey(dictionaryNameToID.get(key));
-      }
-      return false;
-   }
-
-   /**
-    * Checks against both the property, and its values. 
-    */
-   @Override
-   public boolean containsValue(Object value) {
-      if(value instanceof CustomProperty) {
-         return super.containsValue(value);
-      } else {
-         for(CustomProperty cp : super.values()) {
-            if(cp.getValue() == value) {
-               return true;
-            }
-         }
-      }
-      return false;
-   }
-
-
-
-   /**
-     * <p>Gets the codepage.</p>
-     *
-     * @return the codepage or -1 if the codepage is undefined.
-     */
-    public int getCodepage()
-    {
-        int codepage = -1;
-        for (final Iterator<CustomProperty> i = this.values().iterator(); codepage == -1 && i.hasNext();)
-        {
-            final CustomProperty cp = i.next();
-            if (cp.getID() == PropertyIDMap.PID_CODEPAGE)
-                codepage = ((Integer) cp.getValue()).intValue();
-        }
-        return codepage;
-    }
-
-
-
-    /**
-     * <p>Tells whether this {@link CustomProperties} instance is pure or one or
-     * more properties of the underlying low-level property set has been
-     * dropped.</p>
-     *
-     * @return <code>true</code> if the {@link CustomProperties} is pure, else
-     *         <code>false</code>.
-     */
-    public boolean isPure()
-    {
-        return isPure;
-    }
-
-    /**
-     * <p>Sets the purity of the custom property set.</p>
-     *
-     * @param isPure the purity
-     */
-    public void setPure(final boolean isPure)
-    {
-        this.isPure = isPure;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/CustomProperty.java b/trunk/src/java/org/apache/poi/hpsf/CustomProperty.java
deleted file mode 100644
index a256d94..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/CustomProperty.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This class represents custom properties in the document summary
- * information stream. The difference to normal properties is that custom
- * properties have an optional name. If the name is not <code>null</code> it
- * will be maintained in the section's dictionary.</p>
- */
-public class CustomProperty extends MutableProperty
-{
-
-    private String name;
-
-    /**
-     * <p>Creates an empty {@link CustomProperty}. The set methods must be
-     * called to make it usable.</p>
-     */
-    public CustomProperty()
-    {
-        this.name = null;
-    }
-
-    /**
-     * <p>Creates a {@link CustomProperty} without a name by copying the
-     * underlying {@link Property}' attributes.</p>
-     * 
-     * @param property the property to copy
-     */
-    public CustomProperty(final Property property)
-    {
-        this(property, null);
-    }
-
-    /**
-     * <p>Creates a {@link CustomProperty} with a name.</p>
-     * 
-     * @param property This property's attributes are copied to the new custom
-     *        property.
-     * @param name The new custom property's name.
-     */
-    public CustomProperty(final Property property, final String name)
-    {
-        super(property);
-        this.name = name;
-    }
-
-    /**
-     * <p>Gets the property's name.</p>
-     *
-     * @return the property's name.
-     */
-    public String getName()
-    {
-        return name;
-    }
-
-    /**
-     * <p>Sets the property's name.</p>
-     *
-     * @param name The name to set.
-     */
-    public void setName(final String name)
-    {
-        this.name = name;
-    }
-
-
-    /**
-     * <p>Compares two custom properties for equality. The method returns
-     * <code>true</code> if all attributes of the two custom properties are
-     * equal.</p>
-     * 
-     * @param o The custom property to compare with.
-     * @return <code>true</code> if both custom properties are equal, else
-     *         <code>false</code>.
-     * 
-     * @see java.util.AbstractSet#equals(java.lang.Object)
-     */
-    public boolean equalsContents(final Object o)
-    {
-        final CustomProperty c = (CustomProperty) o;
-        final String name1 = c.getName();
-        final String name2 = this.getName();
-        boolean equalNames = true;
-        if (name1 == null)
-            equalNames = name2 == null;
-        else
-            equalNames = name1.equals(name2);
-        return equalNames && c.getID() == this.getID()
-                && c.getType() == this.getType()
-                && c.getValue().equals(this.getValue());
-    }
-
-    /**
-     * @see java.util.AbstractSet#hashCode()
-     */
-    @Override
-    public int hashCode()
-    {
-        return (int) this.getID();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return (o instanceof CustomProperty) ? equalsContents(o) : false;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Date.java b/trunk/src/java/org/apache/poi/hpsf/Date.java
deleted file mode 100644
index 237420f..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Date.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-class Date
-{
-    static final int SIZE = 8;
-
-    private byte[] _value;
-
-    Date( byte[] data, int offset )
-    {
-        _value = LittleEndian.getByteArray( data, offset, SIZE );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Decimal.java b/trunk/src/java/org/apache/poi/hpsf/Decimal.java
deleted file mode 100644
index d8c404c..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Decimal.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-class Decimal
-{
-    static final int SIZE = 16;
-
-    /**
-     * Findbugs: UNR_UNREAD_FIELD
-     */
-    private short field_1_wReserved;
-    private byte field_2_scale;
-    private byte field_3_sign;
-    private int field_4_hi32;
-    private long field_5_lo64;
-
-    Decimal( final byte[] data, final int startOffset )
-    {
-        int offset = startOffset;
-
-        field_1_wReserved = LittleEndian.getShort( data, offset );
-        offset += LittleEndian.SHORT_SIZE;
-
-        field_2_scale = data[offset];
-        offset += LittleEndian.BYTE_SIZE;
-
-        field_3_sign = data[offset];
-        offset += LittleEndian.BYTE_SIZE;
-
-        field_4_hi32 = LittleEndian.getInt( data, offset );
-        offset += LittleEndian.INT_SIZE;
-
-        field_5_lo64 = LittleEndian.getLong( data, offset );
-        offset += LittleEndian.LONG_SIZE;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java b/trunk/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
deleted file mode 100644
index 0f8c629..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
+++ /dev/null
@@ -1,928 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.apache.poi.util.CodePageUtil;
-
-/**
- * <p>Convenience class representing a DocumentSummary Information stream in a
- * Microsoft Office document.</p>
- *
- * @see SummaryInformation
- */
-public class DocumentSummaryInformation extends SpecialPropertySet
-{
-    /**
-     * <p>The document name a document summary information stream
-     * usually has in a POIFS filesystem.</p>
-     */
-    public static final String DEFAULT_STREAM_NAME =
-        "\005DocumentSummaryInformation";
-
-    @Override
-    public PropertyIDMap getPropertySetIDMap() {
-    	return PropertyIDMap.getDocumentSummaryInformationProperties();
-    }
-
-
-    /**
-     * <p>Creates a {@link DocumentSummaryInformation} from a given
-     * {@link PropertySet}.</p>
-     *
-     * @param ps A property set which should be created from a
-     * document summary information stream.
-     * @throws UnexpectedPropertySetTypeException if <var>ps</var>
-     * does not contain a document summary information stream.
-     */
-    public DocumentSummaryInformation(final PropertySet ps)
-        throws UnexpectedPropertySetTypeException
-    {
-        super(ps);
-        if (!isDocumentSummaryInformation())
-            throw new UnexpectedPropertySetTypeException
-                ("Not a " + getClass().getName());
-    }
-
-    
-    /**
-     * <p>Returns the category (or {@code null}).</p>
-     *
-     * @return The category value
-     */
-    public String getCategory()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_CATEGORY);
-    }
-
-    /**
-     * <p>Sets the category.</p>
-     *
-     * @param category The category to set.
-     */
-    public void setCategory(final String category)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_CATEGORY, category);
-    }
-
-    /**
-     * <p>Removes the category.</p>
-     */
-    public void removeCategory()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_CATEGORY);
-    }
-
-
-
-    /**
-     * <p>Returns the presentation format (or
-     * {@code null}).</p>
-     *
-     * @return The presentation format value
-     */
-    public String getPresentationFormat()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_PRESFORMAT);
-    }
-
-    /**
-     * <p>Sets the presentation format.</p>
-     *
-     * @param presentationFormat The presentation format to set.
-     */
-    public void setPresentationFormat(final String presentationFormat)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_PRESFORMAT, presentationFormat);
-    }
-
-    /**
-     * <p>Removes the presentation format.</p>
-     */
-    public void removePresentationFormat()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_PRESFORMAT);
-    }
-
-
-
-    /**
-     * <p>Returns the byte count or 0 if the {@link
-     * DocumentSummaryInformation} does not contain a byte count.</p>
-     *
-     * @return The byteCount value
-     */
-    public int getByteCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_BYTECOUNT);
-    }
-
-    /**
-     * <p>Sets the byte count.</p>
-     *
-     * @param byteCount The byte count to set.
-     */
-    public void setByteCount(final int byteCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_BYTECOUNT, byteCount);
-    }
-
-    /**
-     * <p>Removes the byte count.</p>
-     */
-    public void removeByteCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_BYTECOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the line count or 0 if the {@link
-     * DocumentSummaryInformation} does not contain a line count.</p>
-     *
-     * @return The line count value
-     */
-    public int getLineCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_LINECOUNT);
-    }
-
-    /**
-     * <p>Sets the line count.</p>
-     *
-     * @param lineCount The line count to set.
-     */
-    public void setLineCount(final int lineCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_LINECOUNT, lineCount);
-    }
-
-    /**
-     * <p>Removes the line count.</p>
-     */
-    public void removeLineCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_LINECOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the par count or 0 if the {@link
-     * DocumentSummaryInformation} does not contain a par count.</p>
-     *
-     * @return The par count value
-     */
-    public int getParCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_PARCOUNT);
-    }
-
-    /**
-     * <p>Sets the par count.</p>
-     *
-     * @param parCount The par count to set.
-     */
-    public void setParCount(final int parCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_PARCOUNT, parCount);
-    }
-
-    /**
-     * <p>Removes the par count.</p>
-     */
-    public void removeParCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_PARCOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the slide count or 0 if the {@link
-     * DocumentSummaryInformation} does not contain a slide count.</p>
-     *
-     * @return The slide count value
-     */
-    public int getSlideCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_SLIDECOUNT);
-    }
-
-    /**
-     * <p>Sets the slideCount.</p>
-     *
-     * @param slideCount The slide count to set.
-     */
-    public void setSlideCount(final int slideCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_SLIDECOUNT, slideCount);
-    }
-
-    /**
-     * <p>Removes the slide count.</p>
-     */
-    public void removeSlideCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_SLIDECOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the note count or 0 if the {@link
-     * DocumentSummaryInformation} does not contain a note count.</p>
-     *
-     * @return The note count value
-     */
-    public int getNoteCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_NOTECOUNT);
-    }
-
-    /**
-     * <p>Sets the note count.</p>
-     *
-     * @param noteCount The note count to set.
-     */
-    public void setNoteCount(final int noteCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_NOTECOUNT, noteCount);
-    }
-
-    /**
-     * <p>Removes the noteCount.</p>
-     */
-    public void removeNoteCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_NOTECOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the hidden count or 0 if the {@link
-     * DocumentSummaryInformation} does not contain a hidden
-     * count.</p>
-     *
-     * @return The hidden count value
-     */
-    public int getHiddenCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_HIDDENCOUNT);
-    }
-
-    /**
-     * <p>Sets the hidden count.</p>
-     *
-     * @param hiddenCount The hidden count to set.
-     */
-    public void setHiddenCount(final int hiddenCount)
-    {
-        final MutableSection s = (MutableSection) getSections().get(0);
-        s.setProperty(PropertyIDMap.PID_HIDDENCOUNT, hiddenCount);
-    }
-
-    /**
-     * <p>Removes the hidden count.</p>
-     */
-    public void removeHiddenCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_HIDDENCOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the mmclip count or 0 if the {@link
-     * DocumentSummaryInformation} does not contain a mmclip
-     * count.</p>
-     *
-     * @return The mmclip count value
-     */
-    public int getMMClipCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_MMCLIPCOUNT);
-    }
-
-    /**
-     * <p>Sets the mmclip count.</p>
-     *
-     * @param mmClipCount The mmclip count to set.
-     */
-    public void setMMClipCount(final int mmClipCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_MMCLIPCOUNT, mmClipCount);
-    }
-
-    /**
-     * <p>Removes the mmclip count.</p>
-     */
-    public void removeMMClipCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_MMCLIPCOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns <code>true</code> when scaling of the thumbnail is
-     * desired, <code>false</code> if cropping is desired.</p>
-     *
-     * @return The scale value
-     */
-    public boolean getScale()
-    {
-        return getPropertyBooleanValue(PropertyIDMap.PID_SCALE);
-    }
-
-    /**
-     * <p>Sets the scale.</p>
-     *
-     * @param scale The scale to set.
-     */
-    public void setScale(final boolean scale)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_SCALE, scale);
-    }
-
-    /**
-     * <p>Removes the scale.</p>
-     */
-    public void removeScale()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_SCALE);
-    }
-
-
-
-    /**
-     * <p>Returns the heading pair (or {@code null})
-     * <strong>when this method is implemented. Please note that the
-     * return type is likely to change!</strong>
-     *
-     * @return The heading pair value
-     */
-    public byte[] getHeadingPair()
-    {
-        notYetImplemented("Reading byte arrays ");
-        return (byte[]) getProperty(PropertyIDMap.PID_HEADINGPAIR);
-    }
-
-    /**
-     * <p>Sets the heading pair.</p>
-     *
-     * @param headingPair The heading pair to set.
-     */
-    public void setHeadingPair(final byte[] headingPair)
-    {
-        notYetImplemented("Writing byte arrays ");
-    }
-
-    /**
-     * <p>Removes the heading pair.</p>
-     */
-    public void removeHeadingPair()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_HEADINGPAIR);
-    }
-
-
-
-    /**
-     * <p>Returns the doc parts (or {@code null})
-     * <strong>when this method is implemented. Please note that the
-     * return type is likely to change!</strong>
-     *
-     * @return The doc parts value
-     */
-    public byte[] getDocparts()
-    {
-        notYetImplemented("Reading byte arrays");
-        return (byte[]) getProperty(PropertyIDMap.PID_DOCPARTS);
-    }
-
-
-
-    /**
-     * <p>Sets the doc parts.</p>
-     *
-     * @param docparts The doc parts to set.
-     */
-    public void setDocparts(final byte[] docparts)
-    {
-        notYetImplemented("Writing byte arrays");
-    }
-
-    /**
-     * <p>Removes the doc parts.</p>
-     */
-    public void removeDocparts()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_DOCPARTS);
-    }
-
-
-
-    /**
-     * <p>Returns the manager (or {@code null}).</p>
-     *
-     * @return The manager value
-     */
-    public String getManager()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_MANAGER);
-    }
-
-    /**
-     * <p>Sets the manager.</p>
-     *
-     * @param manager The manager to set.
-     */
-    public void setManager(final String manager)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_MANAGER, manager);
-    }
-
-    /**
-     * <p>Removes the manager.</p>
-     */
-    public void removeManager()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_MANAGER);
-    }
-
-
-
-    /**
-     * <p>Returns the company (or {@code null}).</p>
-     *
-     * @return The company value
-     */
-    public String getCompany()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_COMPANY);
-    }
-
-    /**
-     * <p>Sets the company.</p>
-     *
-     * @param company The company to set.
-     */
-    public void setCompany(final String company)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_COMPANY, company);
-    }
-
-    /**
-     * <p>Removes the company.</p>
-     */
-    public void removeCompany()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_COMPANY);
-    }
-
-
-    /**
-     * <p>Returns <code>true</code> if the custom links are dirty.</p> <p>
-     *
-     * @return The links dirty value
-     */
-    public boolean getLinksDirty()
-    {
-        return getPropertyBooleanValue(PropertyIDMap.PID_LINKSDIRTY);
-    }
-
-    /**
-     * <p>Sets the linksDirty.</p>
-     *
-     * @param linksDirty The links dirty value to set.
-     */
-    public void setLinksDirty(final boolean linksDirty)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_LINKSDIRTY, linksDirty);
-    }
-
-    /**
-     * <p>Removes the links dirty.</p>
-     */
-    public void removeLinksDirty()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_LINKSDIRTY);
-    }
-    
-    
-    /**
-     * <p>Returns the character count including whitespace, or 0 if the 
-     *  {@link DocumentSummaryInformation} does not contain this char count.</p>
-     * <p>This is the whitespace-including version of {@link SummaryInformation#getCharCount()}
-     *
-     * @return The character count or {@code null}
-     */
-    public int getCharCountWithSpaces()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_CCHWITHSPACES);
-    }
-
-    /**
-     * Sets the character count including whitespace
-     * 
-     * @param count The character count to set.
-     */
-    public void setCharCountWithSpaces(int count)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_CCHWITHSPACES, count);
-    }
-    
-    /**
-     * Removes the character count
-     */
-    public void removeCharCountWithSpaces()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_CCHWITHSPACES);
-    }
-    
-    
-    /**
-     * Get if the User Defined Property Set has been updated outside of the 
-     * Application.<p>
-     * If it has (true), the hyperlinks should be updated on document load.
-     * 
-     * @return true, if the hyperlinks should be updated on document load
-     */
-    public boolean getHyperlinksChanged()
-    {
-        return getPropertyBooleanValue(PropertyIDMap.PID_HYPERLINKSCHANGED);
-    }
-    
-    /**
-     * Set the flag for if the User Defined Property Set has been updated outside 
-     *  of the Application.
-     *  
-     * @param changed true, if the User Defined Property Set has been updated
-     */
-    public void setHyperlinksChanged(boolean changed)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_HYPERLINKSCHANGED, changed);
-    }
-    
-    /**
-     * Removes the flag for if the User Defined Property Set has been updated
-     *  outside of the Application.
-     */
-    public void removeHyperlinksChanged()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_HYPERLINKSCHANGED);
-    }
-
-    
-    /**
-     * Gets the version of the Application which wrote the
-     *  Property set, stored with the two high order bytes having the major
-     *  version number, and the two low order bytes the minor version number.<p>
-     * This will be 0 if no version is set.
-     * 
-     * @return the Application version
-     */
-    public int getApplicationVersion()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_VERSION);
-    }
-    
-    /**
-     * Sets the Application version, which must be a 4 byte int with
-     *  the  two high order bytes having the major version number, and the 
-     *  two low order bytes the minor version number.
-     *  
-     * @param version the Application version
-     */
-    public void setApplicationVersion(int version)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_VERSION, version);
-    }
-    
-    /**
-     * Removes the Application Version
-     */
-    public void removeApplicationVersion()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_VERSION);
-    }
-
-    
-    /**
-     * Returns the VBA digital signature for the VBA project 
-     * embedded in the document (or {@code null}).
-     * 
-     * @return the VBA digital signature
-     */
-    public byte[] getVBADigitalSignature()
-    {
-        Object value = getProperty(PropertyIDMap.PID_DIGSIG);
-        if (value != null && value instanceof byte[]) {
-            return (byte[])value;
-        }
-        return null;
-    }
-    
-    /**
-     * <p>Sets the VBA digital signature for the VBA project 
-     *  embedded in the document.</p>
-     *  
-     * @param signature VBA Digital Signature for the project
-     */
-    public void setVBADigitalSignature(byte[] signature)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_DIGSIG, signature);
-    }
-    
-    /**
-     * Removes the VBA Digital Signature
-     */
-    public void removeVBADigitalSignature()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_DIGSIG);
-    }
-
-    
-    /**
-     * Gets the content type of the file (or {@code null}).
-     * 
-     * @return the content type of the file
-     */
-    public String getContentType()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_CONTENTTYPE);
-    }
-    
-    /**
-     * Sets the content type of the file
-     * 
-     * @param type the content type of the file
-     */
-    public void setContentType(String type)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_CONTENTTYPE, type);
-    }
-    
-    /**
-     * Removes the content type of the file
-     */
-    public void removeContentType()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_CONTENTTYPE);
-    }
-
-    
-    /**
-     * Gets the content status of the file (or {@code null}).
-     * 
-     * @return the content status of the file
-     */
-    public String getContentStatus()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_CONTENTSTATUS);
-    }
-    
-    /**
-     * Sets the content status of the file
-     * 
-     * @param status the content status of the file
-     */
-    public void setContentStatus(String status)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_CONTENTSTATUS, status);
-    }
-    
-    /**
-     * Removes the content status of the file
-     */
-    public void removeContentStatus()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_CONTENTSTATUS);
-    }
-
-    
-    /**
-     * Gets the document language, which is normally unset and empty (or {@code null}).
-     * 
-     * @return the document language
-     */
-    public String getLanguage()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_LANGUAGE);
-    }
-    
-    /**
-     * Set the document language
-     * 
-     * @param language the document language
-     */
-    public void setLanguage(String language)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_LANGUAGE, language);
-    }
-    
-    /**
-     * Removes the document language
-     */
-    public void removeLanguage()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_LANGUAGE);
-    }
-
-    
-    /**
-     * <p>Gets the document version as a string, which is normally unset and empty
-     *  (or {@code null}).</p>
-     *  
-     *  @return the document verion
-     */
-    public String getDocumentVersion()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_DOCVERSION);
-    }
-    
-    /**
-     * Sets the document version string
-     * 
-     * @param version the document version string
-     */
-    public void setDocumentVersion(String version)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_DOCVERSION, version);
-    }
-    
-    /**
-     * Removes the document version string
-     */
-    public void removeDocumentVersion()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_DOCVERSION);
-    }
-
-    
-    /**
-     * <p>Gets the custom properties.</p>
-     *
-     * @return The custom properties.
-     */
-    public CustomProperties getCustomProperties()
-    {
-        CustomProperties cps = null;
-        if (getSectionCount() >= 2)
-        {
-            cps = new CustomProperties();
-            final Section section = getSections().get(1);
-            final Map<Long,String> dictionary = section.getDictionary();
-            final Property[] properties = section.getProperties();
-            int propertyCount = 0;
-            for (int i = 0; i < properties.length; i++)
-            {
-                final Property p = properties[i];
-                final long id = p.getID();
-                if (id != 0 && id != 1)
-                {
-                    propertyCount++;
-                    final CustomProperty cp = new CustomProperty(p,
-                            dictionary.get(Long.valueOf(id)));
-                    cps.put(cp.getName(), cp);
-                }
-            }
-            if (cps.size() != propertyCount)
-                cps.setPure(false);
-        }
-        return cps;
-    }
-
-    /**
-     * <p>Sets the custom properties.</p>
-     *
-     * @param customProperties The custom properties
-     */
-    public void setCustomProperties(final CustomProperties customProperties)
-    {
-        ensureSection2();
-        final MutableSection section = (MutableSection) getSections().get(1);
-        final Map<Long,String> dictionary = customProperties.getDictionary();
-        section.clear();
-
-        /* Set the codepage. If both custom properties and section have a
-         * codepage, the codepage from the custom properties wins, else take the
-         * one that is defined. If none is defined, take Unicode. */
-        int cpCodepage = customProperties.getCodepage();
-        if (cpCodepage < 0)
-            cpCodepage = section.getCodepage();
-        if (cpCodepage < 0)
-            cpCodepage = CodePageUtil.CP_UNICODE;
-        customProperties.setCodepage(cpCodepage);
-        section.setCodepage(cpCodepage);
-        section.setDictionary(dictionary);
-        for (final Iterator<CustomProperty> i = customProperties.values().iterator(); i.hasNext();)
-        {
-            final Property p = i.next();
-            section.setProperty(p);
-        }
-    }
-
-    /**
-     * <p>Creates section 2 if it is not already present.</p>
-     *
-     */
-    private void ensureSection2()
-    {
-        if (getSectionCount() < 2)
-        {
-            MutableSection s2 = new MutableSection();
-            s2.setFormatID(SectionIDMap.DOCUMENT_SUMMARY_INFORMATION_ID[1]);
-            addSection(s2);
-        }
-    }
-
-    /**
-     * <p>Removes the custom properties.</p>
-     */
-    public void removeCustomProperties()
-    {
-        if (getSectionCount() >= 2)
-            getSections().remove(1);
-        else
-            throw new HPSFRuntimeException("Illegal internal format of Document SummaryInformation stream: second section is missing.");
-    }
-
-
-    /**
-     * <p>Throws an {@link UnsupportedOperationException} with a message text
-     * telling which functionality is not yet implemented.</p>
-     *
-     * @param msg text telling was leaves to be implemented, e.g.
-     * "Reading byte arrays".
-     */
-    private void notYetImplemented(final String msg)
-    {
-        throw new UnsupportedOperationException(msg + " is not yet implemented.");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Filetime.java b/trunk/src/java/org/apache/poi/hpsf/Filetime.java
deleted file mode 100644
index 84a58bb..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Filetime.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-class Filetime
-{
-    static final int SIZE = LittleEndian.INT_SIZE * 2;
-
-    private int _dwHighDateTime;
-    private int _dwLowDateTime;
-
-    Filetime( byte[] data, int offset )
-    {
-        _dwLowDateTime = LittleEndian.getInt( data, offset + 0
-                * LittleEndian.INT_SIZE );
-        _dwHighDateTime = LittleEndian.getInt( data, offset + 1
-                * LittleEndian.INT_SIZE );
-    }
-
-    Filetime( int low, int high )
-    {
-        _dwLowDateTime = low;
-        _dwHighDateTime = high;
-    }
-
-    long getHigh()
-    {
-        return _dwHighDateTime;
-    }
-
-    long getLow()
-    {
-        return _dwLowDateTime;
-    }
-
-    byte[] toByteArray()
-    {
-        byte[] result = new byte[SIZE];
-        LittleEndian.putInt( result, 0 * LittleEndian.INT_SIZE, _dwLowDateTime );
-        LittleEndian
-                .putInt( result, 1 * LittleEndian.INT_SIZE, _dwHighDateTime );
-        return result;
-    }
-
-    int write( OutputStream out ) throws IOException
-    {
-        LittleEndian.putInt( _dwLowDateTime, out );
-        LittleEndian.putInt( _dwHighDateTime, out );
-        return SIZE;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/GUID.java b/trunk/src/java/org/apache/poi/hpsf/GUID.java
deleted file mode 100644
index 4bbd7f3..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/GUID.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-class GUID
-{
-    static final int SIZE = 16;
-
-    private int _data1;
-    private short _data2;
-    private short _data3;
-    private long _data4;
-
-    GUID( byte[] data, int offset )
-    {
-        _data1 = LittleEndian.getInt( data, offset + 0 );
-        _data2 = LittleEndian.getShort( data, offset + 4 );
-        _data3 = LittleEndian.getShort( data, offset + 6 );
-        _data4 = LittleEndian.getLong( data, offset + 8 );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/HPSFException.java b/trunk/src/java/org/apache/poi/hpsf/HPSFException.java
deleted file mode 100644
index abc3b8d..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/HPSFException.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is the superclass of all other checked exceptions thrown
- * in this package. It supports a nested "reason" throwable, i.e. an exception
- * that caused this one to be thrown.</p>
- */
-public class HPSFException extends Exception
-{
-
-    /**
-     * <p>The underlying reason for this exception - may be
-     * <code>null</code>.</p>
-     * */
-    private Throwable reason;
-
-
-
-    /**
-     * <p>Creates an {@link HPSFException}.</p>
-     */
-    public HPSFException()
-    {
-        super();
-    }
-
-
-
-    /**
-     * <p>Creates an {@link HPSFException} with a message string.</p>
-     *
-     * @param msg The message string.
-     */
-    public HPSFException(final String msg)
-    {
-        super(msg);
-    }
-
-
-
-    /**
-     * <p>Creates a new {@link HPSFException} with a reason.</p>
-     *
-     * @param reason The reason, i.e. a throwable that indirectly
-     * caused this exception.
-     */
-    public HPSFException(final Throwable reason)
-    {
-        super();
-        this.reason = reason;
-    }
-
-
-
-    /**
-     * <p>Creates an {@link HPSFException} with a message string and a
-     * reason.</p>
-     *
-     * @param msg The message string.
-     * @param reason The reason, i.e. a throwable that indirectly
-     * caused this exception.
-     */
-    public HPSFException(final String msg, final Throwable reason)
-    {
-        super(msg);
-        this.reason = reason;
-    }
-
-
-
-    /**
-     * <p>Returns the {@link Throwable} that caused this exception to
-     * be thrown or <code>null</code> if there was no such {@link
-     * Throwable}.</p>
-     *
-     * @return The reason
-     */
-    public Throwable getReason()
-    {
-        return reason;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java b/trunk/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
deleted file mode 100644
index 79a91a4..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIDocument;
-import org.apache.poi.poifs.filesystem.EntryUtils;
-import org.apache.poi.poifs.filesystem.FilteringDirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * A version of {@link POIDocument} which allows access to the
- *  HPSF Properties, but no other document contents.
- * Normally used when you want to read or alter the Document Properties,
- *  without affecting the rest of the file
- */
-public class HPSFPropertiesOnlyDocument extends POIDocument {
-    public HPSFPropertiesOnlyDocument(NPOIFSFileSystem fs) {
-        super(fs.getRoot());
-    }
-    public HPSFPropertiesOnlyDocument(OPOIFSFileSystem fs) {
-        super(fs);
-    }
-    public HPSFPropertiesOnlyDocument(POIFSFileSystem fs) {
-        super(fs);
-    }
-
-    /**
-     * Write out to the currently open file the properties changes, but nothing else
-     */
-    public void write() throws IOException {
-        NPOIFSFileSystem fs = directory.getFileSystem();
-        
-        validateInPlaceWritePossible();        
-        writeProperties(fs, null);
-        fs.writeFilesystem();
-    }
-    /**
-     * Write out, with any properties changes, but nothing else
-     */
-    public void write(File newFile) throws IOException {
-        POIFSFileSystem fs = POIFSFileSystem.create(newFile);
-        try {
-            write(fs);
-            fs.writeFilesystem();
-        } finally {
-            fs.close();
-        }
-    }
-    /**
-     * Write out, with any properties changes, but nothing else
-     */
-    public void write(OutputStream out) throws IOException {
-        NPOIFSFileSystem fs = new NPOIFSFileSystem();
-        try {
-            write(fs);
-            fs.writeFilesystem(out);
-        } finally {
-            fs.close();
-        }
-    }
-    
-    private void write(NPOIFSFileSystem fs) throws IOException {
-        // For tracking what we've written out, so far
-        List<String> excepts = new ArrayList<String>(2);
-
-        // Write out our HPFS properties, with any changes
-        writeProperties(fs, excepts);
-        
-        // Copy over everything else unchanged
-        FilteringDirectoryNode src = new FilteringDirectoryNode(directory, excepts);
-        FilteringDirectoryNode dest = new FilteringDirectoryNode(fs.getRoot(), excepts);
-        EntryUtils.copyNodes(src, dest);
-        
-        // Caller will save the resultant POIFSFileSystem to the stream/file
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java b/trunk/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
deleted file mode 100644
index 984a316..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-
-/**
- * <p>This exception is the superclass of all other unchecked
- * exceptions thrown in this package. It supports a nested "reason"
- * throwable, i.e. an exception that caused this one to be thrown.</p>
- */
-public class HPSFRuntimeException extends RuntimeException
-{
-	private static final long serialVersionUID = -7804271670232727159L;
-	/** <p>The underlying reason for this exception - may be
-     * <code>null</code>.</p> */
-    private Throwable reason;
-
-
-
-    /**
-     * <p>Creates a new {@link HPSFRuntimeException}.</p>
-     */
-    public HPSFRuntimeException()
-    {
-        super();
-    }
-
-
-
-    /**
-     * <p>Creates a new {@link HPSFRuntimeException} with a message
-     * string.</p>
-     *
-     * @param msg The message string.
-     */
-    public HPSFRuntimeException(final String msg)
-    {
-        super(msg);
-    }
-
-
-
-    /**
-     * <p>Creates a new {@link HPSFRuntimeException} with a
-     * reason.</p>
-     *
-     * @param reason The reason, i.e. a throwable that indirectly
-     * caused this exception.
-     */
-    public HPSFRuntimeException(final Throwable reason)
-    {
-        super();
-        this.reason = reason;
-    }
-
-
-
-    /**
-     * <p>Creates a new {@link HPSFRuntimeException} with a message
-     * string and a reason.</p>
-     *
-     * @param msg The message string.
-     * @param reason The reason, i.e. a throwable that indirectly
-     * caused this exception.
-     */
-    public HPSFRuntimeException(final String msg, final Throwable reason)
-    {
-        super(msg);
-        this.reason = reason;
-    }
-
-
-
-    /**
-     * <p>Returns the {@link Throwable} that caused this exception to
-     * be thrown or <code>null</code> if there was no such {@link
-     * Throwable}.</p>
-     *
-     * @return The reason
-     */
-    public Throwable getReason()
-    {
-        return reason;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java b/trunk/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
deleted file mode 100644
index 3217af9..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown when there is an illegal value set in a
- * {@link PropertySet}. For example, a {@link Variant#VT_BOOL} must
- * have a value of <code>-1 (true)</code> or <code>0 (false)</code>.
- * Any other value would trigger this exception. It supports a nested
- * "reason" throwable, i.e. an exception that caused this one to be
- * thrown.</p>
- *
- * @author Drew Varner(Drew.Varner atDomain sc.edu)
- */
-public class IllegalPropertySetDataException extends HPSFRuntimeException
-{
-
-    /**
-     * <p>Constructor</p>
-     */
-    public IllegalPropertySetDataException()
-    {
-        super();
-    }
-
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     */
-    public IllegalPropertySetDataException(final String msg)
-    {
-        super(msg);
-    }
-
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param reason This exception's underlying reason
-     */
-    public IllegalPropertySetDataException(final Throwable reason)
-    {
-        super(reason);
-    }
-
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     * @param reason This exception's underlying reason
-     */
-    public IllegalPropertySetDataException(final String msg,
-                                           final Throwable reason)
-    {
-        super(msg, reason);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java b/trunk/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
deleted file mode 100644
index b71ff47..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.HexDump;
-
-/**
- * <p>This exception is thrown if HPSF encounters a variant type that is illegal
- * in the current context.</p>
- */
-public class IllegalVariantTypeException extends VariantTypeException
-{
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param variantType The unsupported variant type
-     * @param value The value
-     * @param msg A message string
-     */
-    public IllegalVariantTypeException(final long variantType,
-                                       final Object value, final String msg)
-    {
-        super(variantType, value, msg);
-    }
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param variantType The unsupported variant type
-     * @param value The value
-     */
-    public IllegalVariantTypeException(final long variantType,
-                                       final Object value)
-    {
-        this(variantType, value, "The variant type " + variantType + " (" +
-             Variant.getVariantName(variantType) + ", " + 
-             HexDump.toHex(variantType) + ") is illegal in this context.");
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/IndirectPropertyName.java b/trunk/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
deleted file mode 100644
index fc09ca6..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-class IndirectPropertyName
-{
-    private CodePageString _value;
-
-    IndirectPropertyName( byte[] data, int offset ) //NOSONAR
-    {
-        _value = new CodePageString( data, offset );
-    }
-
-    int getSize()
-    {
-        return _value.getSize();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java b/trunk/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java
deleted file mode 100644
index 450c892..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown if an {@link java.io.InputStream} does
- * not support the {@link java.io.InputStream#mark} operation.</p>
- */
-public class MarkUnsupportedException extends HPSFException
-{
-
-    /**
-     * <p>Constructor</p>
-     */
-    public MarkUnsupportedException()
-    {
-        super();
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     *
-     * @param msg The exception's message string
-     */
-    public MarkUnsupportedException(final String msg)
-    {
-        super(msg);
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     *
-     * @param reason This exception's underlying reason
-     */
-    public MarkUnsupportedException(final Throwable reason)
-    {
-        super(reason);
-    }
-
-
-   /**
-    * <p>Constructor</p>
-    *
-    * @param msg The exception's message string
-    * @param reason This exception's underlying reason
-    */
-    public MarkUnsupportedException(final String msg, final Throwable reason)
-    {
-        super(msg, reason);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/MissingSectionException.java b/trunk/src/java/org/apache/poi/hpsf/MissingSectionException.java
deleted file mode 100644
index f3e81ca..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/MissingSectionException.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown if one of the {@link PropertySet}'s
- * convenience methods does not find a required {@link Section}.</p>
- *
- * <p>The constructors of this class are analogous to those of its
- * superclass and documented there.</p>
- */
-public class MissingSectionException extends HPSFRuntimeException
-{
-
-    /**
-     * <p>Constructor</p>
-     */
-    public MissingSectionException()
-    {
-        super();
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     */
-    public MissingSectionException(final String msg)
-    {
-        super(msg);
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param reason This exception's underlying reason
-     */
-    public MissingSectionException(final Throwable reason)
-    {
-        super(reason);
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     * @param reason This exception's underlying reason
-     */
-    public MissingSectionException(final String msg, final Throwable reason)
-    {
-        super(msg, reason);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/MutableProperty.java b/trunk/src/java/org/apache/poi/hpsf/MutableProperty.java
deleted file mode 100644
index 9d77c0d..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/MutableProperty.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.CodePageUtil;
-
-/**
- * <p>Adds writing capability to the {@link Property} class.</p>
- *
- * <p>Please be aware that this class' functionality will be merged into the
- * {@link Property} class at a later time, so the API will change.</p>
- */
-public class MutableProperty extends Property
-{
-
-    /**
-     * <p>Creates an empty property. It must be filled using the set method to
-     * be usable.</p>
-     */
-    public MutableProperty()
-    { }
-
-
-
-    /**
-     * <p>Creates a <code>MutableProperty</code> as a copy of an existing
-     * <code>Property</code>.</p>
-     *
-     * @param p The property to copy.
-     */
-    public MutableProperty(final Property p)
-    {
-        setID(p.getID());
-        setType(p.getType());
-        setValue(p.getValue());
-    }
-
-
-    /**
-     * <p>Sets the property's ID.</p>
-     *
-     * @param id the ID
-     */
-    public void setID(final long id)
-    {
-        this.id = id;
-    }
-
-
-
-    /**
-     * <p>Sets the property's type.</p>
-     *
-     * @param type the property's type
-     */
-    public void setType(final long type)
-    {
-        this.type = type;
-    }
-
-
-
-    /**
-     * <p>Sets the property's value.</p>
-     *
-     * @param value the property's value
-     */
-    public void setValue(final Object value)
-    {
-        this.value = value;
-    }
-
-
-
-    /**
-     * <p>Writes the property to an output stream.</p>
-     *
-     * @param out The output stream to write to.
-     * @param codepage The codepage to use for writing non-wide strings
-     * @return the number of bytes written to the stream
-     *
-     * @exception IOException if an I/O error occurs
-     * @exception WritingNotSupportedException if a variant type is to be
-     * written that is not yet supported
-     */
-    public int write(final OutputStream out, final int codepage)
-        throws IOException, WritingNotSupportedException
-    {
-        int length = 0;
-        long variantType = getType();
-
-        /* Ensure that wide strings are written if the codepage is Unicode. */
-        if (codepage == CodePageUtil.CP_UNICODE && variantType == Variant.VT_LPSTR)
-            variantType = Variant.VT_LPWSTR;
-
-        length += TypeWriter.writeUIntToStream(out, variantType);
-        length += VariantSupport.write(out, variantType, getValue(), codepage);
-        return length;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/MutablePropertySet.java b/trunk/src/java/org/apache/poi/hpsf/MutablePropertySet.java
deleted file mode 100644
index 5c7d386..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/MutablePropertySet.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.LinkedList;
-
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * <p>Adds writing support to the {@link PropertySet} class.</p>
- *
- * <p>Please be aware that this class' functionality will be merged into the
- * {@link PropertySet} class at a later time, so the API will change.</p>
- */
-public class MutablePropertySet extends PropertySet
-{
-
-    /**
-     * <p>Constructs a <code>MutablePropertySet</code> instance. Its
-     * primary task is to initialize the immutable field with their proper
-     * values. It also sets fields that might change to reasonable defaults.</p>
-     */
-    public MutablePropertySet()
-    {
-        /* Initialize the "byteOrder" field. */
-        byteOrder = LittleEndian.getUShort(BYTE_ORDER_ASSERTION);
-
-        /* Initialize the "format" field. */
-        format = LittleEndian.getUShort(FORMAT_ASSERTION);
-
-        /* Initialize "osVersion" field as if the property has been created on
-         * a Win32 platform, whether this is the case or not. */
-        osVersion = (OS_WIN32 << 16) | 0x0A04;
-
-        /* Initailize the "classID" field. */
-        classID = new ClassID();
-
-        /* Initialize the sections. Since property set must have at least
-         * one section it is added right here. */
-        sections = new LinkedList<Section>();
-        sections.add(new MutableSection());
-    }
-
-
-
-    /**
-     * <p>Constructs a <code>MutablePropertySet</code> by doing a deep copy of
-     * an existing <code>PropertySet</code>. All nested elements, i.e.
-     * <code>Section</code>s and <code>Property</code> instances, will be their
-     * mutable counterparts in the new <code>MutablePropertySet</code>.</p>
-     *
-     * @param ps The property set to copy
-     */
-    public MutablePropertySet(final PropertySet ps)
-    {
-        byteOrder = ps.getByteOrder();
-        format = ps.getFormat();
-        osVersion = ps.getOSVersion();
-        setClassID(ps.getClassID());
-        clearSections();
-        if (sections == null)
-            sections = new LinkedList<Section>();
-        for (final Section section : ps.getSections())
-        {
-            final MutableSection s = new MutableSection(section);
-            addSection(s);
-        }
-    }
-
-
-
-    /**
-     * <p>The length of the property set stream header.</p>
-     */
-    private final static int OFFSET_HEADER =
-        BYTE_ORDER_ASSERTION.length + /* Byte order    */
-        FORMAT_ASSERTION.length +     /* Format        */
-        LittleEndianConsts.INT_SIZE + /* OS version    */
-        ClassID.LENGTH +              /* Class ID      */
-        LittleEndianConsts.INT_SIZE;  /* Section count */
-
-
-
-    /**
-     * <p>Sets the "byteOrder" property.</p>
-     *
-     * @param byteOrder the byteOrder value to set
-     */
-    public void setByteOrder(final int byteOrder)
-    {
-        this.byteOrder = byteOrder;
-    }
-
-
-
-    /**
-     * <p>Sets the "format" property.</p>
-     *
-     * @param format the format value to set
-     */
-    public void setFormat(final int format)
-    {
-        this.format = format;
-    }
-
-
-
-    /**
-     * <p>Sets the "osVersion" property.</p>
-     *
-     * @param osVersion the osVersion value to set
-     */
-    public void setOSVersion(final int osVersion)
-    {
-        this.osVersion = osVersion;
-    }
-
-
-
-    /**
-     * <p>Sets the property set stream's low-level "class ID"
-     * field.</p>
-     *
-     * @param classID The property set stream's low-level "class ID" field.
-     *
-     * @see PropertySet#getClassID()
-     */
-    public void setClassID(final ClassID classID)
-    {
-        this.classID = classID;
-    }
-
-
-
-    /**
-     * <p>Removes all sections from this property set.</p>
-     */
-    public void clearSections()
-    {
-        sections = null;
-    }
-
-
-
-    /**
-     * <p>Adds a section to this property set.</p>
-     *
-     * @param section The {@link Section} to add. It will be appended
-     * after any sections that are already present in the property set
-     * and thus become the last section.
-     */
-    public void addSection(final Section section)
-    {
-        if (sections == null)
-            sections = new LinkedList<Section>();
-        sections.add(section);
-    }
-
-
-
-    /**
-     * <p>Writes the property set to an output stream.</p>
-     *
-     * @param out the output stream to write the section to
-     * @exception IOException if an error when writing to the output stream
-     * occurs
-     * @exception WritingNotSupportedException if HPSF does not yet support
-     * writing a property's variant type.
-     */
-    public void write(final OutputStream out)
-        throws WritingNotSupportedException, IOException
-    {
-        /* Write the number of sections in this property set stream. */
-        final int nrSections = sections.size();
-
-        /* Write the property set's header. */
-        TypeWriter.writeToStream(out, (short) getByteOrder());
-        TypeWriter.writeToStream(out, (short) getFormat());
-        TypeWriter.writeToStream(out, getOSVersion());
-        TypeWriter.writeToStream(out, getClassID());
-        TypeWriter.writeToStream(out, nrSections);
-        int offset = OFFSET_HEADER;
-
-        /* Write the section list, i.e. the references to the sections. Each
-         * entry in the section list consist of the section's class ID and the
-         * section's offset relative to the beginning of the stream. */
-        offset += nrSections * (ClassID.LENGTH + LittleEndianConsts.INT_SIZE);
-        final int sectionsBegin = offset;
-        for (final Section section : sections)
-        {
-            final MutableSection s = (MutableSection)section;
-            final ClassID formatID = s.getFormatID();
-            if (formatID == null)
-                throw new NoFormatIDException();
-            TypeWriter.writeToStream(out, s.getFormatID());
-            TypeWriter.writeUIntToStream(out, offset);
-            try
-            {
-                offset += s.getSize();
-            }
-            catch (HPSFRuntimeException ex)
-            {
-                final Throwable cause = ex.getReason();
-                if (cause instanceof UnsupportedEncodingException) {
-                    throw new IllegalPropertySetDataException(cause);
-                }
-                throw ex;
-            }
-        }
-
-        /* Write the sections themselves. */
-        offset = sectionsBegin;
-        for (final Section section : sections)
-        {
-            final MutableSection s = (MutableSection)section;
-            offset += s.write(out);
-        }
-        
-        /* Indicate that we're done */
-        out.close();
-    }
-
-
-
-    /**
-     * <p>Returns the contents of this property set stream as an input stream.
-     * The latter can be used for example to write the property set into a POIFS
-     * document. The input stream represents a snapshot of the property set.
-     * If the latter is modified while the input stream is still being
-     * read, the modifications will not be reflected in the input stream but in
-     * the {@link MutablePropertySet} only.</p>
-     *
-     * @return the contents of this property set stream
-     *
-     * @throws WritingNotSupportedException if HPSF does not yet support writing
-     * of a property's variant type.
-     * @throws IOException if an I/O exception occurs.
-     */
-    public InputStream toInputStream()
-        throws IOException, WritingNotSupportedException
-    {
-        final ByteArrayOutputStream psStream = new ByteArrayOutputStream();
-        try {
-            write(psStream);
-        } finally {
-            psStream.close();
-        }
-        final byte[] streamData = psStream.toByteArray();
-        return new ByteArrayInputStream(streamData);
-    }
-
-    /**
-     * <p>Writes a property set to a document in a POI filesystem directory.</p>
-     *
-     * @param dir The directory in the POI filesystem to write the document to.
-     * @param name The document's name. If there is already a document with the
-     * same name in the directory the latter will be overwritten.
-     *
-     * @throws WritingNotSupportedException if the filesystem doesn't support writing
-     * @throws IOException if the old entry can't be deleted or the new entry be written
-     */
-    public void write(final DirectoryEntry dir, final String name)
-    throws WritingNotSupportedException, IOException
-    {
-        /* If there is already an entry with the same name, remove it. */
-        try
-        {
-            final Entry e = dir.getEntry(name);
-            e.delete();
-        }
-        catch (FileNotFoundException ex)
-        {
-            /* Entry not found, no need to remove it. */
-        }
-        /* Create the new entry. */
-        dir.createDocument(name, toInputStream());
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/MutableSection.java b/trunk/src/java/org/apache/poi/hpsf/MutableSection.java
deleted file mode 100644
index b0d71ac..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/MutableSection.java
+++ /dev/null
@@ -1,699 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * <p>Adds writing capability to the {@link Section} class.</p>
- *
- * <p>Please be aware that this class' functionality will be merged into the
- * {@link Section} class at a later time, so the API will change.</p>
- */
-public class MutableSection extends Section
-{
-    /**
-     * <p>If the "dirty" flag is true, the section's size must be
-     * (re-)calculated before the section is written.</p>
-     */
-    private boolean dirty = true;
-
-
-
-    /**
-     * <p>List to assemble the properties. Unfortunately a wrong
-     * decision has been taken when specifying the "properties" field
-     * as an Property[]. It should have been a {@link java.util.List}.</p>
-     */
-    private List<Property> preprops;
-
-
-
-    /**
-     * <p>Contains the bytes making out the section. This byte array is
-     * established when the section's size is calculated and can be reused
-     * later. It is valid only if the "dirty" flag is false.</p>
-     */
-    private byte[] sectionBytes;
-
-
-
-    /**
-     * <p>Creates an empty mutable section.</p>
-     */
-    public MutableSection()
-    {
-        dirty = true;
-        formatID = null;
-        offset = -1;
-        preprops = new LinkedList<Property>();
-    }
-
-
-
-    /**
-     * <p>Constructs a <code>MutableSection</code> by doing a deep copy of an
-     * existing <code>Section</code>. All nested <code>Property</code>
-     * instances, will be their mutable counterparts in the new
-     * <code>MutableSection</code>.</p>
-     *
-     * @param s The section set to copy
-     */
-    public MutableSection(final Section s)
-    {
-        setFormatID(s.getFormatID());
-        final Property[] pa = s.getProperties();
-        final MutableProperty[] mpa = new MutableProperty[pa.length];
-        for (int i = 0; i < pa.length; i++)
-            mpa[i] = new MutableProperty(pa[i]);
-        setProperties(mpa);
-        setDictionary(s.getDictionary());
-    }
-
-
-
-    /**
-     * <p>Sets the section's format ID.</p>
-     *
-     * @param formatID The section's format ID
-     *
-     * @see #setFormatID(byte[])
-     * @see Section#getFormatID
-     */
-    public void setFormatID(final ClassID formatID)
-    {
-        this.formatID = formatID;
-    }
-
-
-
-    /**
-     * <p>Sets the section's format ID.</p>
-     *
-     * @param formatID The section's format ID as a byte array. It components
-     * are in big-endian format.
-     *
-     * @see #setFormatID(ClassID)
-     * @see Section#getFormatID
-     */
-    public void setFormatID(final byte[] formatID)
-    {
-        ClassID fid = getFormatID();
-        if (fid == null)
-        {
-            fid = new ClassID();
-            setFormatID(fid);
-        }
-        fid.setBytes(formatID);
-    }
-
-
-
-    /**
-     * <p>Sets this section's properties. Any former values are overwritten.</p>
-     *
-     * @param properties This section's new properties.
-     */
-    public void setProperties(final Property[] properties)
-    {
-        this.properties = properties;
-        preprops = new LinkedList<Property>();
-        for (int i = 0; i < properties.length; i++)
-            preprops.add(properties[i]);
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Sets the string value of the property with the specified ID.</p>
-     *
-     * @param id The property's ID
-     * @param value The property's value. It will be written as a Unicode
-     * string.
-     *
-     * @see #setProperty(int, long, Object)
-     * @see #getProperty
-     */
-    public void setProperty(final int id, final String value)
-    {
-        setProperty(id, Variant.VT_LPWSTR, value);
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Sets the int value of the property with the specified ID.</p>
-     *
-     * @param id The property's ID
-     * @param value The property's value.
-     *
-     * @see #setProperty(int, long, Object)
-     * @see #getProperty
-     */
-    public void setProperty(final int id, final int value)
-    {
-        setProperty(id, Variant.VT_I4, Integer.valueOf(value));
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Sets the long value of the property with the specified ID.</p>
-     *
-     * @param id The property's ID
-     * @param value The property's value.
-     *
-     * @see #setProperty(int, long, Object)
-     * @see #getProperty
-     */
-    public void setProperty(final int id, final long value)
-    {
-        setProperty(id, Variant.VT_I8, Long.valueOf(value));
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Sets the boolean value of the property with the specified ID.</p>
-     *
-     * @param id The property's ID
-     * @param value The property's value.
-     *
-     * @see #setProperty(int, long, Object)
-     * @see #getProperty
-     */
-    public void setProperty(final int id, final boolean value)
-    {
-        setProperty(id, Variant.VT_BOOL, Boolean.valueOf(value));
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Sets the value and the variant type of the property with the
-     * specified ID. If a property with this ID is not yet present in
-     * the section, it will be added. An already present property with
-     * the specified ID will be overwritten. A default mapping will be
-     * used to choose the property's type.</p>
-     *
-     * @param id The property's ID.
-     * @param variantType The property's variant type.
-     * @param value The property's value.
-     *
-     * @see #setProperty(int, String)
-     * @see #getProperty
-     * @see Variant
-     */
-    public void setProperty(final int id, final long variantType,
-                            final Object value)
-    {
-        final MutableProperty p = new MutableProperty();
-        p.setID(id);
-        p.setType(variantType);
-        p.setValue(value);
-        setProperty(p);
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Sets a property.</p>
-     *
-     * @param p The property to be set.
-     *
-     * @see #setProperty(int, long, Object)
-     * @see #getProperty
-     * @see Variant
-     */
-    public void setProperty(final Property p)
-    {
-        final long id = p.getID();
-        removeProperty(id);
-        preprops.add(p);
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Removes a property.</p>
-     *
-     * @param id The ID of the property to be removed
-     */
-    public void removeProperty(final long id)
-    {
-        for (final Iterator<Property> i = preprops.iterator(); i.hasNext();)
-            if (i.next().getID() == id)
-            {
-                i.remove();
-                break;
-            }
-        dirty = true;
-    }
-
-
-
-    /**
-     * <p>Sets the value of the boolean property with the specified
-     * ID.</p>
-     *
-     * @param id The property's ID
-     * @param value The property's value
-     *
-     * @see #setProperty(int, long, Object)
-     * @see #getProperty
-     * @see Variant
-     */
-    protected void setPropertyBooleanValue(final int id, final boolean value)
-    {
-        setProperty(id, Variant.VT_BOOL, Boolean.valueOf(value));
-    }
-
-
-
-    /**
-     * <p>Returns the section's size.</p>
-     *
-     * @return the section's size.
-     */
-    public int getSize()
-    {
-        if (dirty)
-        {
-            try
-            {
-                size = calcSize();
-                dirty = false;
-            }
-            catch (HPSFRuntimeException ex)
-            {
-                throw ex;
-            }
-            catch (Exception ex)
-            {
-                throw new HPSFRuntimeException(ex);
-            }
-        }
-        return size;
-    }
-
-
-
-    /**
-     * <p>Calculates the section's size. It is the sum of the lengths of the
-     * section's header (8), the properties list (16 times the number of
-     * properties) and the properties themselves.</p>
-     *
-     * @return the section's length in bytes.
-     * @throws WritingNotSupportedException
-     * @throws IOException
-     */
-    private int calcSize() throws WritingNotSupportedException, IOException
-    {
-        final ByteArrayOutputStream out = new ByteArrayOutputStream();
-        write(out);
-        out.close();
-        /* Pad to multiple of 4 bytes so that even the Windows shell (explorer)
-         * shows custom properties. */
-        sectionBytes = Util.pad4(out.toByteArray());
-        return sectionBytes.length;
-    }
-
-
-
-    /**
-     * <p>Writes this section into an output stream.</p>
-     *
-     * <p>Internally this is done by writing into three byte array output
-     * streams: one for the properties, one for the property list and one for
-     * the section as such. The two former are appended to the latter when they
-     * have received all their data.</p>
-     *
-     * @param out The stream to write into.
-     *
-     * @return The number of bytes written, i.e. the section's size.
-     * @exception IOException if an I/O error occurs
-     * @exception WritingNotSupportedException if HPSF does not yet support
-     * writing a property's variant type.
-     */
-    public int write(final OutputStream out)
-        throws WritingNotSupportedException, IOException
-    {
-        /* Check whether we have already generated the bytes making out the
-         * section. */
-        if (!dirty && sectionBytes != null)
-        {
-            out.write(sectionBytes);
-            return sectionBytes.length;
-        }
-
-        /* The properties are written to this stream. */
-        final ByteArrayOutputStream propertyStream =
-            new ByteArrayOutputStream();
-
-        /* The property list is established here. After each property that has
-         * been written to "propertyStream", a property list entry is written to
-         * "propertyListStream". */
-        final ByteArrayOutputStream propertyListStream =
-            new ByteArrayOutputStream();
-
-        /* Maintain the current position in the list. */
-        int position = 0;
-
-        /* Increase the position variable by the size of the property list so
-         * that it points behind the property list and to the beginning of the
-         * properties themselves. */
-        position += 2 * LittleEndian.INT_SIZE +
-                    getPropertyCount() * 2 * LittleEndian.INT_SIZE;
-
-        /* Writing the section's dictionary it tricky. If there is a dictionary
-         * (property 0) the codepage property (property 1) must be set, too. */
-        int codepage = -1;
-        if (getProperty(PropertyIDMap.PID_DICTIONARY) != null)
-        {
-            final Object p1 = getProperty(PropertyIDMap.PID_CODEPAGE);
-            if (p1 != null)
-            {
-                if (!(p1 instanceof Integer))
-                    throw new IllegalPropertySetDataException
-                        ("The codepage property (ID = 1) must be an " +
-                         "Integer object.");
-            }
-            else
-                /* Warning: The codepage property is not set although a
-                 * dictionary is present. In order to cope with this problem we
-                 * add the codepage property and set it to Unicode. */
-                setProperty(PropertyIDMap.PID_CODEPAGE, Variant.VT_I2,
-                            Integer.valueOf(CodePageUtil.CP_UNICODE));
-            codepage = getCodepage();
-        }
-
-        /* Sort the property list by their property IDs: */
-        Collections.sort(preprops, new Comparator<Property>()
-            {
-                public int compare(final Property p1, final Property p2)
-                {
-                    if (p1.getID() < p2.getID())
-                        return -1;
-                    else if (p1.getID() == p2.getID())
-                        return 0;
-                    else
-                        return 1;
-                }
-            });
-
-        /* Write the properties and the property list into their respective
-         * streams: */
-        for (final ListIterator<Property> i = preprops.listIterator(); i.hasNext();)
-        {
-            final MutableProperty p = (MutableProperty) i.next();
-            final long id = p.getID();
-
-            /* Write the property list entry. */
-            TypeWriter.writeUIntToStream(propertyListStream, p.getID());
-            TypeWriter.writeUIntToStream(propertyListStream, position);
-
-            /* If the property ID is not equal 0 we write the property and all
-             * is fine. However, if it equals 0 we have to write the section's
-             * dictionary which has an implicit type only and an explicit
-             * value. */
-            if (id != 0)
-                /* Write the property and update the position to the next
-                 * property. */
-                position += p.write(propertyStream, getCodepage());
-            else
-            {
-                if (codepage == -1)
-                    throw new IllegalPropertySetDataException
-                        ("Codepage (property 1) is undefined.");
-                position += writeDictionary(propertyStream, dictionary,
-                                            codepage);
-            }
-        }
-        propertyStream.close();
-        propertyListStream.close();
-
-        /* Write the section: */
-        byte[] pb1 = propertyListStream.toByteArray();
-        byte[] pb2 = propertyStream.toByteArray();
-
-        /* Write the section's length: */
-        TypeWriter.writeToStream(out, LittleEndian.INT_SIZE * 2 +
-                                      pb1.length + pb2.length);
-
-        /* Write the section's number of properties: */
-        TypeWriter.writeToStream(out, getPropertyCount());
-
-        /* Write the property list: */
-        out.write(pb1);
-
-        /* Write the properties: */
-        out.write(pb2);
-
-        int streamLength = LittleEndian.INT_SIZE * 2 + pb1.length + pb2.length;
-        return streamLength;
-    }
-
-
-
-    /**
-     * <p>Writes the section's dictionary.</p>
-     *
-     * @param out The output stream to write to.
-     * @param dictionary The dictionary.
-     * @param codepage The codepage to be used to write the dictionary items.
-     * @return The number of bytes written
-     * @exception IOException if an I/O exception occurs.
-     */
-    private static int writeDictionary(final OutputStream out,
-                                       final Map<Long,String> dictionary, final int codepage)
-        throws IOException
-    {
-        int length = TypeWriter.writeUIntToStream(out, dictionary.size());
-        for (Map.Entry<Long,String> ls : dictionary.entrySet()) {
-            final Long key = ls.getKey();
-            final String value = ls.getValue();
-
-            if (codepage == CodePageUtil.CP_UNICODE)
-            {
-                /* Write the dictionary item in Unicode. */
-                int sLength = value.length() + 1;
-                if ((sLength & 1) == 1) {
-                    sLength++;
-                }
-                length += TypeWriter.writeUIntToStream(out, key.longValue());
-                length += TypeWriter.writeUIntToStream(out, sLength);
-                final byte[] ca = CodePageUtil.getBytesInCodePage(value, codepage);
-                for (int j = 2; j < ca.length; j += 2)
-                {
-                    out.write(ca[j+1]);
-                    out.write(ca[j]);
-                    length += 2;
-                }
-                sLength -= value.length();
-                while (sLength > 0)
-                {
-                    out.write(0x00);
-                    out.write(0x00);
-                    length += 2;
-                    sLength--;
-                }
-            }
-            else
-            {
-                /* Write the dictionary item in another codepage than
-                 * Unicode. */
-                length += TypeWriter.writeUIntToStream(out, key.longValue());
-                length += TypeWriter.writeUIntToStream(out, value.length() + 1);
-                final byte[] ba = CodePageUtil.getBytesInCodePage(value, codepage);
-                for (int j = 0; j < ba.length; j++)
-                {
-                    out.write(ba[j]);
-                    length++;
-                }
-                out.write(0x00);
-                length++;
-            }
-        }
-        return length;
-    }
-
-
-
-    /**
-     * <p>Overwrites the super class' method to cope with a redundancy:
-     * the property count is maintained in a separate member variable, but
-     * shouldn't.</p>
-     *
-     * @return The number of properties in this section
-     */
-    public int getPropertyCount()
-    {
-        return preprops.size();
-    }
-
-
-
-    /**
-     * <p>Gets this section's properties.</p>
-     *
-     * @return this section's properties.
-     */
-    public Property[] getProperties()
-    {
-        properties = preprops.toArray(new Property[0]);
-        return properties;
-    }
-
-
-
-    /**
-     * <p>Gets a property.</p>
-     *
-     * @param id The ID of the property to get
-     * @return The property or <code>null</code> if there is no such property
-     */
-    public Object getProperty(final long id)
-    {
-        /* Calling getProperties() ensures that properties and preprops are in
-         * sync.</p> */
-        getProperties();
-        return super.getProperty(id);
-    }
-
-
-
-    /**
-     * <p>Sets the section's dictionary. All keys in the dictionary must be
-     * {@link java.lang.Long} instances, all values must be
-     * {@link java.lang.String}s. This method overwrites the properties with IDs
-     * 0 and 1 since they are reserved for the dictionary and the dictionary's
-     * codepage. Setting these properties explicitly might have surprising
-     * effects. An application should never do this but always use this
-     * method.</p>
-     *
-     * @param dictionary The dictionary
-     *
-     * @exception IllegalPropertySetDataException if the dictionary's key and
-     * value types are not correct.
-     *
-     * @see Section#getDictionary()
-     */
-    public void setDictionary(final Map<Long,String> dictionary)
-        throws IllegalPropertySetDataException
-    {
-        if (dictionary != null)
-        {
-            this.dictionary = dictionary;
-
-            /* Set the dictionary property (ID 0). Please note that the second
-             * parameter in the method call below is unused because dictionaries
-             * don't have a type. */
-            setProperty(PropertyIDMap.PID_DICTIONARY, -1, dictionary);
-
-            /* If the codepage property (ID 1) for the strings (keys and
-             * values) used in the dictionary is not yet defined, set it to
-             * Unicode. */
-            final Integer codepage =
-                (Integer) getProperty(PropertyIDMap.PID_CODEPAGE);
-            if (codepage == null)
-                setProperty(PropertyIDMap.PID_CODEPAGE, Variant.VT_I2,
-                            Integer.valueOf(CodePageUtil.CP_UNICODE));
-        }
-        else
-            /* Setting the dictionary to null means to remove property 0.
-             * However, it does not mean to remove property 1 (codepage). */
-            removeProperty(PropertyIDMap.PID_DICTIONARY);
-    }
-
-
-
-    /**
-     * <p>Sets a property.</p>
-     *
-     * @param id The property ID.
-     * @param value The property's value. The value's class must be one of those
-     *        supported by HPSF.
-     */
-    public void setProperty(final int id, final Object value)
-    {
-        if (value instanceof String)
-            setProperty(id, (String) value);
-        else if (value instanceof Long)
-            setProperty(id, ((Long) value).longValue());
-        else if (value instanceof Integer)
-            setProperty(id, ((Integer) value).intValue());
-        else if (value instanceof Short)
-            setProperty(id, ((Short) value).intValue());
-        else if (value instanceof Boolean)
-            setProperty(id, ((Boolean) value).booleanValue());
-        else if (value instanceof Date)
-            setProperty(id, Variant.VT_FILETIME, value);
-        else
-            throw new HPSFRuntimeException(
-                    "HPSF does not support properties of type " +
-                    value.getClass().getName() + ".");
-    }
-
-
-
-    /**
-     * <p>Removes all properties from the section including 0 (dictionary) and
-     * 1 (codepage).</p>
-     */
-    public void clear()
-    {
-        final Property[] properties = getProperties();
-        for (int i = 0; i < properties.length; i++)
-        {
-            final Property p = properties[i];
-            removeProperty(p.getID());
-        }
-    }
-
-    /**
-     * <p>Sets the codepage.</p>
-     *
-     * @param codepage the codepage
-     */
-    public void setCodepage(final int codepage)
-    {
-        setProperty(PropertyIDMap.PID_CODEPAGE, Variant.VT_I2,
-                Integer.valueOf(codepage));
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/NoFormatIDException.java b/trunk/src/java/org/apache/poi/hpsf/NoFormatIDException.java
deleted file mode 100644
index f1a0943..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/NoFormatIDException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown if a {@link MutablePropertySet} is to be written
- * but does not have a formatID set (see {@link
- * MutableSection#setFormatID(ClassID)} or
- * {@link org.apache.poi.hpsf.MutableSection#setFormatID(byte[])}. 
- */
-public class NoFormatIDException extends HPSFRuntimeException
-{
-
-    /**
-     * <p>Constructor</p>
-     */
-    public NoFormatIDException()
-    {
-        super();
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     */
-    public NoFormatIDException(final String msg)
-    {
-        super(msg);
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param reason This exception's underlying reason
-     */
-    public NoFormatIDException(final Throwable reason)
-    {
-        super(reason);
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     * @param reason This exception's underlying reason
-     */
-    public NoFormatIDException(final String msg, final Throwable reason)
-    {
-        super(msg, reason);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java b/trunk/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
deleted file mode 100644
index 62738d4..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown if a format error in a property set stream is
- * detected or when the input data do not constitute a property set stream.</p>
- * 
- * <p>The constructors of this class are analogous to those of its superclass
- * and are documented there.</p>
- */
-public class NoPropertySetStreamException extends HPSFException
-{
-
-    /**
-     * <p>Constructor</p>
-     */
-    public NoPropertySetStreamException()
-    {
-        super();
-    }
-
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     */
-    public NoPropertySetStreamException(final String msg)
-    {
-        super(msg);
-    }
-
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param reason This exception's underlying reason
-     */
-    public NoPropertySetStreamException(final Throwable reason)
-    {
-        super(reason);
-    }
-
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     * @param reason This exception's underlying reason
-     */
-    public NoPropertySetStreamException(final String msg,
-                                        final Throwable reason)
-    {
-        super(msg, reason);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/NoSingleSectionException.java b/trunk/src/java/org/apache/poi/hpsf/NoSingleSectionException.java
deleted file mode 100644
index 2309fe5..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/NoSingleSectionException.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown if one of the {@link PropertySet}'s
- * convenience methods that require a single {@link Section} is called
- * and the {@link PropertySet} does not contain exactly one {@link
- * Section}.</p>
- *
- * <p>The constructors of this class are analogous to those of its
- * superclass and documented there.</p>
- */
-public class NoSingleSectionException extends HPSFRuntimeException
-{
-
-    /**
-     * <p>Constructor</p>
-     */
-    public NoSingleSectionException()
-    {
-        super();
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     */
-    public NoSingleSectionException(final String msg)
-    {
-        super(msg);
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param reason This exception's underlying reason
-     */
-    public NoSingleSectionException(final Throwable reason)
-    {
-        super(reason);
-    }
-
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param msg The exception's message string
-     * @param reason This exception's underlying reason
-     */
-    public NoSingleSectionException(final String msg, final Throwable reason)
-    {
-        super(msg, reason);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Property.java b/trunk/src/java/org/apache/poi/hpsf/Property.java
deleted file mode 100644
index 14dbee0..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Property.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * <p>A property in a {@link Section} of a {@link PropertySet}.</p>
- *
- * <p>The property's <strong>ID</strong> gives the property a meaning
- * in the context of its {@link Section}. Each {@link Section} spans
- * its own name space of property IDs.</p>
- *
- * <p>The property's <strong>type</strong> determines how its
- * <strong>value </strong> is interpreted. For example, if the type is
- * {@link Variant#VT_LPSTR} (byte string), the value consists of a
- * DWord telling how many bytes the string contains. The bytes follow
- * immediately, including any null bytes that terminate the
- * string. The type {@link Variant#VT_I4} denotes a four-byte integer
- * value, {@link Variant#VT_FILETIME} some date and time (of a
- * file).</p>
- *
- * <p>Please note that not all {@link Variant} types yet. This might change
- * over time but largely depends on your feedback so that the POI team knows
- * which variant types are really needed. So please feel free to submit error
- * reports or patches for the types you need.</p>
- *
- * <p>Microsoft documentation: <a
- * href="http://msdn.microsoft.com/library/en-us/stg/stg/property_set_display_name_dictionary.asp?frame=true">
- * Property Set Display Name Dictionary</a>.
- *
- * @see Section
- * @see Variant
- */
-public class Property
-{
-
-    /** <p>The property's ID.</p> */
-    protected long id;
-
-
-    /**
-     * <p>Returns the property's ID.</p>
-     *
-     * @return The ID value
-     */
-    public long getID()
-    {
-        return id;
-    }
-
-
-
-    /** <p>The property's type.</p> */
-    protected long type;
-
-
-    /**
-     * <p>Returns the property's type.</p>
-     *
-     * @return The type value
-     */
-    public long getType()
-    {
-        return type;
-    }
-
-
-
-    /** <p>The property's value.</p> */
-    protected Object value;
-
-
-    /**
-     * <p>Returns the property's value.</p>
-     *
-     * @return The property's value
-     */
-    public Object getValue()
-    {
-        return value;
-    }
-
-
-
-    /**
-     * <p>Creates a property.</p>
-     *
-     * @param id the property's ID.
-     * @param type the property's type, see {@link Variant}.
-     * @param value the property's value. Only certain types are allowed, see
-     *        {@link Variant}.
-     */
-    public Property(final long id, final long type, final Object value)
-    {
-        this.id = id;
-        this.type = type;
-        this.value = value;
-    }
-
-
-
-    /**
-     * <p>Creates a {@link Property} instance by reading its bytes
-     * from the property set stream.</p>
-     *
-     * @param id The property's ID.
-     * @param src The bytes the property set stream consists of.
-     * @param offset The property's type/value pair's offset in the
-     * section.
-     * @param length The property's type/value pair's length in bytes.
-     * @param codepage The section's and thus the property's
-     * codepage. It is needed only when reading string values.
-     * @exception UnsupportedEncodingException if the specified codepage is not
-     * supported.
-     */
-    public Property(final long id, final byte[] src, final long offset,
-                    final int length, final int codepage)
-    throws UnsupportedEncodingException
-    {
-        this.id = id;
-
-        /*
-         * ID 0 is a special case since it specifies a dictionary of
-         * property IDs and property names.
-         */
-        if (id == 0)
-        {
-            value = readDictionary(src, offset, length, codepage);
-            return;
-        }
-
-        int o = (int) offset;
-        type = LittleEndian.getUInt(src, o);
-        o += LittleEndian.INT_SIZE;
-
-        try
-        {
-            value = VariantSupport.read(src, o, length, (int) type, codepage);
-        }
-        catch (UnsupportedVariantTypeException ex)
-        {
-            VariantSupport.writeUnsupportedTypeMessage(ex);
-            value = ex.getValue();
-        }
-    }
-
-
-
-    /**
-     * <p>Creates an empty property. It must be filled using the set method to
-     * be usable.</p>
-     */
-    protected Property()
-    { }
-
-
-
-    /**
-     * <p>Reads a dictionary.</p>
-     *
-     * @param src The byte array containing the bytes making out the dictionary.
-     * @param offset At this offset within <var>src </var> the dictionary
-     *        starts.
-     * @param length The dictionary contains at most this many bytes.
-     * @param codepage The codepage of the string values.
-     * @return The dictonary
-     * @throws UnsupportedEncodingException if the dictionary's codepage is not
-     *         (yet) supported.
-     */
-    protected Map<?, ?> readDictionary(final byte[] src, final long offset,
-                                 final int length, final int codepage)
-    throws UnsupportedEncodingException
-    {
-        /* Check whether "offset" points into the "src" array". */
-        if (offset < 0 || offset > src.length)
-            throw new HPSFRuntimeException
-                ("Illegal offset " + offset + " while HPSF stream contains " +
-                 length + " bytes.");
-        int o = (int) offset;
-
-        /*
-         * Read the number of dictionary entries.
-         */
-        final long nrEntries = LittleEndian.getUInt(src, o);
-        o += LittleEndian.INT_SIZE;
-
-        final Map<Object, Object> m = new LinkedHashMap<Object, Object>(
-                (int) nrEntries, (float) 1.0 );
-
-        try
-        {
-            for (int i = 0; i < nrEntries; i++)
-            {
-                /* The key. */
-                final Long id = Long.valueOf(LittleEndian.getUInt(src, o));
-                o += LittleEndian.INT_SIZE;
-
-                /* The value (a string). The length is the either the
-                 * number of (two-byte) characters if the character set is Unicode
-                 * or the number of bytes if the character set is not Unicode.
-                 * The length includes terminating 0x00 bytes which we have to strip
-                 * off to create a Java string. */
-                long sLength = LittleEndian.getUInt(src, o);
-                o += LittleEndian.INT_SIZE;
-
-                /* Read the string. */
-                final StringBuffer b = new StringBuffer();
-                switch (codepage)
-                {
-                    case -1:
-                    {
-                        /* Without a codepage the length is equal to the number of
-                         * bytes. */
-                        b.append(new String(src, o, (int) sLength, Charset.forName("ASCII")));
-                        break;
-                    }
-                    case CodePageUtil.CP_UNICODE:
-                    {
-                        /* The length is the number of characters, i.e. the number
-                         * of bytes is twice the number of the characters. */
-                        final int nrBytes = (int) (sLength * 2);
-                        final byte[] h = new byte[nrBytes];
-                        for (int i2 = 0; i2 < nrBytes; i2 += 2)
-                        {
-                            h[i2] = src[o + i2 + 1];
-                            h[i2 + 1] = src[o + i2];
-                        }
-                        b.append(new String(h, 0, nrBytes,
-                                CodePageUtil.codepageToEncoding(codepage)));
-                        break;
-                    }
-                    default:
-                    {
-                        /* For encodings other than Unicode the length is the number
-                         * of bytes. */
-                        b.append(new String(src, o, (int) sLength,
-                                 VariantSupport.codepageToEncoding(codepage)));
-                        break;
-                    }
-                }
-
-                /* Strip 0x00 characters from the end of the string: */
-                while (b.length() > 0 && b.charAt(b.length() - 1) == 0x00)
-                    b.setLength(b.length() - 1);
-                if (codepage == CodePageUtil.CP_UNICODE)
-                {
-                    if (sLength % 2 == 1)
-                        sLength++;
-                    o += (sLength + sLength);
-                }
-                else
-                    o += sLength;
-                m.put(id, b.toString());
-            }
-        }
-        catch (RuntimeException ex)
-        {
-            final POILogger l = POILogFactory.getLogger(getClass());
-            l.log(POILogger.WARN,
-                    "The property set's dictionary contains bogus data. "
-                    + "All dictionary entries starting with the one with ID "
-                    + id + " will be ignored.", ex);
-        }
-        return m;
-    }
-
-
-
-    /**
-     * <p>Returns the property's size in bytes. This is always a multiple of
-     * 4.</p>
-     *
-     * @return the property's size in bytes
-     *
-     * @exception WritingNotSupportedException if HPSF does not yet support the
-     * property's variant type.
-     */
-    protected int getSize() throws WritingNotSupportedException
-    {
-        int length = VariantSupport.getVariantLength(type);
-        if (length >= 0)
-            return length; /* Fixed length */
-        if (length == -2)
-            /* Unknown length */
-            throw new WritingNotSupportedException(type, null);
-
-        /* Variable length: */
-        final int PADDING = 4; /* Pad to multiples of 4. */
-        switch ((int) type)
-        {
-            case Variant.VT_LPSTR:
-            {
-                int l = ((String) value).length() + 1;
-                int r = l % PADDING;
-                if (r > 0)
-                    l += PADDING - r;
-                length += l;
-                break;
-            }
-            case Variant.VT_EMPTY:
-                break;
-            default:
-                throw new WritingNotSupportedException(type, value);
-        }
-        return length;
-    }
-
-
-
-    /**
-     * <p>Compares two properties.</p> <p>Please beware that a property with
-     * ID == 0 is a special case: It does not have a type, and its value is the
-     * section's dictionary. Another special case are strings: Two properties
-     * may have the different types Variant.VT_LPSTR and Variant.VT_LPWSTR;</p>
-     *
-     * @see Object#equals(java.lang.Object)
-     */
-    public boolean equals(final Object o)
-    {
-        if (!(o instanceof Property)) {
-            return false;
-        }
-        final Property p = (Property) o;
-        final Object pValue = p.getValue();
-        final long pId = p.getID();
-        if (id != pId || (id != 0 && !typesAreEqual(type, p.getType())))
-            return false;
-        if (value == null && pValue == null)
-            return true;
-        if (value == null || pValue == null)
-            return false;
-
-        /* It's clear now that both values are non-null. */
-        final Class<?> valueClass = value.getClass();
-        final Class<?> pValueClass = pValue.getClass();
-        if (!(valueClass.isAssignableFrom(pValueClass)) &&
-            !(pValueClass.isAssignableFrom(valueClass)))
-            return false;
-
-        if (value instanceof byte[])
-            return Util.equal((byte[]) value, (byte[]) pValue);
-
-        return value.equals(pValue);
-    }
-
-
-
-    private boolean typesAreEqual(final long t1, final long t2)
-    {
-        if (t1 == t2 ||
-            (t1 == Variant.VT_LPSTR && t2 == Variant.VT_LPWSTR) ||
-            (t2 == Variant.VT_LPSTR && t1 == Variant.VT_LPWSTR)) {
-            return true;
-        }
-        return false;
-    }
-
-
-
-    /**
-     * @see Object#hashCode()
-     */
-    public int hashCode()
-    {
-        long hashCode = 0;
-        hashCode += id;
-        hashCode += type;
-        if (value != null)
-            hashCode += value.hashCode();
-        final int returnHashCode = (int) (hashCode & 0x0ffffffffL );
-        return returnHashCode;
-
-    }
-
-
-
-    /**
-     * @see Object#toString()
-     */
-    public String toString()
-    {
-        final StringBuffer b = new StringBuffer();
-        b.append(getClass().getName());
-        b.append('[');
-        b.append("id: ");
-        b.append(getID());
-        b.append(", type: ");
-        b.append(getType());
-        final Object value = getValue();
-        b.append(", value: ");
-        if (value instanceof String)
-        {
-            b.append(value.toString());
-            final String s = (String) value;
-            final int l = s.length();
-            final byte[] bytes = new byte[l * 2];
-            for (int i = 0; i < l; i++)
-            {
-                final char c = s.charAt(i);
-                final byte high = (byte) ((c & 0x00ff00) >> 8);
-                final byte low  = (byte) ((c & 0x0000ff) >> 0);
-                bytes[i * 2]     = high;
-                bytes[i * 2 + 1] = low;
-            }
-            b.append(" [");
-            if(bytes.length > 0) {
-                final String hex = HexDump.dump(bytes, 0L, 0);
-                b.append(hex);
-            }
-            b.append("]");
-        }
-        else if (value instanceof byte[])
-        {
-            byte[] bytes = (byte[])value;
-            if(bytes.length > 0) {
-                String hex = HexDump.dump(bytes, 0L, 0);
-                b.append(hex);
-            }
-        }
-        else
-        {
-            b.append(value.toString());
-        }
-        b.append(']');
-        return b.toString();
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/PropertySet.java b/trunk/src/java/org/apache/poi/hpsf/PropertySet.java
deleted file mode 100644
index 9c9b187..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/PropertySet.java
+++ /dev/null
@@ -1,696 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * <p>Represents a property set in the Horrible Property Set Format
- * (HPSF). These are usually metadata of a Microsoft Office
- * document.</p>
- *
- * <p>An application that wants to access these metadata should create
- * an instance of this class or one of its subclasses by calling the
- * factory method {@link PropertySetFactory#create} and then retrieve
- * the information its needs by calling appropriate methods.</p>
- *
- * <p>{@link PropertySetFactory#create} does its work by calling one
- * of the constructors {@link PropertySet#PropertySet(InputStream)} or
- * {@link PropertySet#PropertySet(byte[])}. If the constructor's
- * argument is not in the Horrible Property Set Format, i.e. not a
- * property set stream, or if any other error occurs, an appropriate
- * exception is thrown.</p>
- *
- * <p>A {@link PropertySet} has a list of {@link Section}s, and each
- * {@link Section} has a {@link Property} array. Use {@link
- * #getSections} to retrieve the {@link Section}s, then call {@link
- * Section#getProperties} for each {@link Section} to get hold of the
- * {@link Property} arrays.</p> Since the vast majority of {@link
- * PropertySet}s contains only a single {@link Section}, the
- * convenience method {@link #getProperties} returns the properties of
- * a {@link PropertySet}'s {@link Section} (throwing a {@link
- * NoSingleSectionException} if the {@link PropertySet} contains more
- * (or less) than exactly one {@link Section}).
- */
-public class PropertySet
-{
-
-    /**
-     * <p>The "byteOrder" field must equal this value.</p>
-     */
-    static final byte[] BYTE_ORDER_ASSERTION =
-            {(byte) 0xFE, (byte) 0xFF};
-
-    /**
-     * <p>Specifies this {@link PropertySet}'s byte order. See the
-     * HPFS documentation for details!</p>
-     */
-    protected int byteOrder;
-
-    /**
-     * <p>Returns the property set stream's low-level "byte order"
-     * field. It is always <tt>0xFFFE</tt> .</p>
-     *
-     * @return The property set stream's low-level "byte order" field.
-     */
-    public int getByteOrder()
-    {
-        return byteOrder;
-    }
-
-
-
-    /**
-     * <p>The "format" field must equal this value.</p>
-     */
-    static final byte[] FORMAT_ASSERTION =
-            {(byte) 0x00, (byte) 0x00};
-
-    /**
-     * <p>Specifies this {@link PropertySet}'s format. See the HPFS
-     * documentation for details!</p>
-     */
-    protected int format;
-
-    /**
-     * <p>Returns the property set stream's low-level "format"
-     * field. It is always <tt>0x0000</tt> .</p>
-     *
-     * @return The property set stream's low-level "format" field.
-     */
-    public int getFormat()
-    {
-        return format;
-    }
-
-
- 
-    /**
-     * <p>Specifies the version of the operating system that created
-     * this {@link PropertySet}. See the HPFS documentation for
-     * details!</p>
-     */
-    protected int osVersion;
-
-
-    /**
-     * <p>If the OS version field holds this value the property set stream was
-     * created on a 16-bit Windows system.</p>
-     */
-    public static final int OS_WIN16     = 0x0000;
-
-    /**
-     * <p>If the OS version field holds this value the property set stream was
-     * created on a Macintosh system.</p>
-     */
-    public static final int OS_MACINTOSH = 0x0001;
-
-    /**
-     * <p>If the OS version field holds this value the property set stream was
-     * created on a 32-bit Windows system.</p>
-     */
-    public static final int OS_WIN32     = 0x0002;
-
-    /**
-     * <p>Returns the property set stream's low-level "OS version"
-     * field.</p>
-     *
-     * @return The property set stream's low-level "OS version" field.
-     */
-    public int getOSVersion()
-    {
-        return osVersion;
-    }
-
-
-
-    /**
-     * <p>Specifies this {@link PropertySet}'s "classID" field. See
-     * the HPFS documentation for details!</p>
-     */
-    protected ClassID classID;
-
-    /**
-     * <p>Returns the property set stream's low-level "class ID"
-     * field.</p>
-     *
-     * @return The property set stream's low-level "class ID" field.
-     */
-    public ClassID getClassID()
-    {
-        return classID;
-    }
-
-
-
-    /**
-     * <p>Returns the number of {@link Section}s in the property
-     * set.</p>
-     *
-     * @return The number of {@link Section}s in the property set.
-     */
-    public int getSectionCount()
-    {
-        return sections.size();
-    }
-
-
-
-    /**
-     * <p>The sections in this {@link PropertySet}.</p>
-     */
-    protected List<Section> sections;
-
-    /**
-     * <p>Returns the {@link Section}s in the property set.</p>
-     *
-     * @return The {@link Section}s in the property set.
-     */
-    public List<Section> getSections()
-    {
-        return sections;
-    }
-
-
-
-    /**
-     * <p>Creates an empty (uninitialized) {@link PropertySet}.</p>
-     *
-     * <p><strong>Please note:</strong> For the time being this
-     * constructor is protected since it is used for internal purposes
-     * only, but expect it to become public once the property set's
-     * writing functionality is implemented.</p>
-     */
-    protected PropertySet()
-    { }
-
-
-
-    /**
-     * <p>Creates a {@link PropertySet} instance from an {@link
-     * InputStream} in the Horrible Property Set Format.</p>
-     *
-     * <p>The constructor reads the first few bytes from the stream
-     * and determines whether it is really a property set stream. If
-     * it is, it parses the rest of the stream. If it is not, it
-     * resets the stream to its beginning in order to let other
-     * components mess around with the data and throws an
-     * exception.</p>
-     *
-     * @param stream Holds the data making out the property set
-     * stream.
-     * @throws MarkUnsupportedException if the stream does not support
-     * the {@link InputStream#markSupported} method.
-     * @throws IOException if the {@link InputStream} cannot be
-     * accessed as needed.
-     * @exception NoPropertySetStreamException if the input stream does not
-     * contain a property set.
-     * @exception UnsupportedEncodingException if a character encoding is not
-     * supported.
-     */
-    public PropertySet(final InputStream stream)
-        throws NoPropertySetStreamException, MarkUnsupportedException,
-               IOException, UnsupportedEncodingException
-    {
-        if (isPropertySetStream(stream))
-        {
-            final int avail = stream.available();
-            final byte[] buffer = new byte[avail];
-            IOUtils.readFully(stream, buffer);
-            init(buffer, 0, buffer.length);
-        }
-        else
-            throw new NoPropertySetStreamException();
-    }
-
-
-
-    /**
-     * <p>Creates a {@link PropertySet} instance from a byte array
-     * that represents a stream in the Horrible Property Set
-     * Format.</p>
-     *
-     * @param stream The byte array holding the stream data.
-     * @param offset The offset in <var>stream</var> where the stream
-     * data begin. If the stream data begin with the first byte in the
-     * array, the <var>offset</var> is 0.
-     * @param length The length of the stream data.
-     * @throws NoPropertySetStreamException if the byte array is not a
-     * property set stream.
-     * 
-     * @exception UnsupportedEncodingException if the codepage is not supported.
-     */
-    public PropertySet(final byte[] stream, final int offset, final int length)
-        throws NoPropertySetStreamException, UnsupportedEncodingException
-    {
-        if (isPropertySetStream(stream, offset, length))
-            init(stream, offset, length);
-        else
-            throw new NoPropertySetStreamException();
-    }
-
-
-
-    /**
-     * <p>Creates a {@link PropertySet} instance from a byte array
-     * that represents a stream in the Horrible Property Set
-     * Format.</p>
-     *
-     * @param stream The byte array holding the stream data. The
-     * complete byte array contents is the stream data.
-     * @throws NoPropertySetStreamException if the byte array is not a
-     * property set stream.
-     * 
-     * @exception UnsupportedEncodingException if the codepage is not supported.
-     */
-    public PropertySet(final byte[] stream)
-    throws NoPropertySetStreamException, UnsupportedEncodingException
-    {
-        this(stream, 0, stream.length);
-    }
-
-
-
-    /**
-     * <p>Checks whether an {@link InputStream} is in the Horrible
-     * Property Set Format.</p>
-     *
-     * @param stream The {@link InputStream} to check. In order to
-     * perform the check, the method reads the first bytes from the
-     * stream. After reading, the stream is reset to the position it
-     * had before reading. The {@link InputStream} must support the
-     * {@link InputStream#mark} method.
-     * @return <code>true</code> if the stream is a property set
-     * stream, else <code>false</code>.
-     * @throws MarkUnsupportedException if the {@link InputStream}
-     * does not support the {@link InputStream#mark} method.
-     * @exception IOException if an I/O error occurs
-     */
-    public static boolean isPropertySetStream(final InputStream stream)
-        throws MarkUnsupportedException, IOException
-    {
-        /*
-         * Read at most this many bytes.
-         */
-        final int BUFFER_SIZE = 50;
-
-        /*
-         * Mark the current position in the stream so that we can
-         * reset to this position if the stream does not contain a
-         * property set.
-         */
-        if (!stream.markSupported())
-            throw new MarkUnsupportedException(stream.getClass().getName());
-        stream.mark(BUFFER_SIZE);
-
-        /*
-         * Read a couple of bytes from the stream.
-         */
-        final byte[] buffer = new byte[BUFFER_SIZE];
-        final int bytes =
-            stream.read(buffer, 0,
-                        Math.min(buffer.length, stream.available()));
-        final boolean isPropertySetStream =
-            isPropertySetStream(buffer, 0, bytes);
-        stream.reset();
-        return isPropertySetStream;
-    }
-
-
-
-    /**
-     * <p>Checks whether a byte array is in the Horrible Property Set
-     * Format.</p>
-     *
-     * @param src The byte array to check.
-     * @param offset The offset in the byte array.
-     * @param length The significant number of bytes in the byte
-     * array. Only this number of bytes will be checked.
-     * @return <code>true</code> if the byte array is a property set
-     * stream, <code>false</code> if not.
-     */
-    public static boolean isPropertySetStream(final byte[] src,
-                                              final int offset,
-                                              final int length)
-    {
-        /* FIXME (3): Ensure that at most "length" bytes are read. */
-
-        /*
-         * Read the header fields of the stream. They must always be
-         * there.
-         */
-        int o = offset;
-        final int byteOrder = LittleEndian.getUShort(src, o);
-        o += LittleEndian.SHORT_SIZE;
-        byte[] temp = new byte[LittleEndian.SHORT_SIZE];
-        LittleEndian.putShort(temp, 0, (short) byteOrder);
-        if (!Util.equal(temp, BYTE_ORDER_ASSERTION))
-            return false;
-        final int format = LittleEndian.getUShort(src, o);
-        o += LittleEndian.SHORT_SIZE;
-        temp = new byte[LittleEndian.SHORT_SIZE];
-        LittleEndian.putShort(temp, 0, (short) format);
-        if (!Util.equal(temp, FORMAT_ASSERTION))
-            return false;
-        // final long osVersion = LittleEndian.getUInt(src, offset);
-        o += LittleEndian.INT_SIZE;
-        // final ClassID classID = new ClassID(src, offset);
-        o += ClassID.LENGTH;
-        final long sectionCount = LittleEndian.getUInt(src, o);
-        o += LittleEndian.INT_SIZE;
-        if (sectionCount < 0)
-            return false;
-        return true;
-    }
-
-
-
-    /**
-     * <p>Initializes this {@link PropertySet} instance from a byte
-     * array. The method assumes that it has been checked already that
-     * the byte array indeed represents a property set stream. It does
-     * no more checks on its own.</p>
-     *
-     * @param src Byte array containing the property set stream
-     * @param offset The property set stream starts at this offset
-     * from the beginning of <var>src</var>
-     * @param length Length of the property set stream.
-     * @throws UnsupportedEncodingException if HPSF does not (yet) support the
-     * property set's character encoding.
-     */
-    private void init(final byte[] src, final int offset, final int length)
-    throws UnsupportedEncodingException
-    {
-        /* FIXME (3): Ensure that at most "length" bytes are read. */
-        
-        /*
-         * Read the stream's header fields.
-         */
-        int o = offset;
-        byteOrder = LittleEndian.getUShort(src, o);
-        o += LittleEndian.SHORT_SIZE;
-        format = LittleEndian.getUShort(src, o);
-        o += LittleEndian.SHORT_SIZE;
-        osVersion = (int) LittleEndian.getUInt(src, o);
-        o += LittleEndian.INT_SIZE;
-        classID = new ClassID(src, o);
-        o += ClassID.LENGTH;
-        final int sectionCount = LittleEndian.getInt(src, o);
-        o += LittleEndian.INT_SIZE;
-        if (sectionCount < 0)
-            throw new HPSFRuntimeException("Section count " + sectionCount +
-                                           " is negative.");
-
-        /*
-         * Read the sections, which are following the header. They
-         * start with an array of section descriptions. Each one
-         * consists of a format ID telling what the section contains
-         * and an offset telling how many bytes from the start of the
-         * stream the section begins.
-         */
-        /*
-         * Most property sets have only one section. The Document
-         * Summary Information stream has 2. Everything else is a rare
-         * exception and is no longer fostered by Microsoft.
-         */
-        sections = new ArrayList<Section>( sectionCount );
-
-        /*
-         * Loop over the section descriptor array. Each descriptor
-         * consists of a ClassID and a DWord, and we have to increment
-         * "offset" accordingly.
-         */
-        for (int i = 0; i < sectionCount; i++)
-        {
-            final Section s = new Section(src, o);
-            o += ClassID.LENGTH + LittleEndian.INT_SIZE;
-            sections.add(s);
-        }
-    }
-
-
-
-    /**
-     * <p>Checks whether this {@link PropertySet} represents a Summary
-     * Information.</p>
-     *
-     * @return <code>true</code> if this {@link PropertySet}
-     * represents a Summary Information, else <code>false</code>.
-     */
-    public boolean isSummaryInformation()
-    {
-        if (sections.size() <= 0)
-            return false;
-        return Util.equal(sections.get(0).getFormatID().getBytes(),
-                          SectionIDMap.SUMMARY_INFORMATION_ID);
-    }
-
-
-
-    /**
-     * <p>Checks whether this {@link PropertySet} is a Document
-     * Summary Information.</p>
-     *
-     * @return <code>true</code> if this {@link PropertySet}
-     * represents a Document Summary Information, else <code>false</code>.
-     */
-    public boolean isDocumentSummaryInformation()
-    {
-        if (sections.size() <= 0)
-            return false;
-        return Util.equal(sections.get(0).getFormatID().getBytes(),
-                          SectionIDMap.DOCUMENT_SUMMARY_INFORMATION_ID[0]);
-    }
-
-
-
-    /**
-     * <p>Convenience method returning the {@link Property} array
-     * contained in this property set. It is a shortcut for getting
-     * the {@link PropertySet}'s {@link Section}s list and then
-     * getting the {@link Property} array from the first {@link
-     * Section}.</p>
-     *
-     * @return The properties of the only {@link Section} of this
-     * {@link PropertySet}.
-     * @throws NoSingleSectionException if the {@link PropertySet} has
-     * more or less than one {@link Section}.
-     */
-    public Property[] getProperties()
-        throws NoSingleSectionException
-    {
-        return getFirstSection().getProperties();
-    }
-
-
-
-    /**
-     * <p>Convenience method returning the value of the property with
-     * the specified ID. If the property is not available,
-     * <code>null</code> is returned and a subsequent call to {@link
-     * #wasNull} will return <code>true</code> .</p>
-     *
-     * @param id The property ID
-     * @return The property value
-     * @throws NoSingleSectionException if the {@link PropertySet} has
-     * more or less than one {@link Section}.
-     */
-    protected Object getProperty(final int id) throws NoSingleSectionException
-    {
-        return getFirstSection().getProperty(id);
-    }
-
-
-
-    /**
-     * <p>Convenience method returning the value of a boolean property
-     * with the specified ID. If the property is not available,
-     * <code>false</code> is returned. A subsequent call to {@link
-     * #wasNull} will return <code>true</code> to let the caller
-     * distinguish that case from a real property value of
-     * <code>false</code>.</p>
-     *
-     * @param id The property ID
-     * @return The property value
-     * @throws NoSingleSectionException if the {@link PropertySet} has
-     * more or less than one {@link Section}.
-     */
-    protected boolean getPropertyBooleanValue(final int id)
-        throws NoSingleSectionException
-    {
-        return getFirstSection().getPropertyBooleanValue(id);
-    }
-
-
-
-    /**
-     * <p>Convenience method returning the value of the numeric
-     * property with the specified ID. If the property is not
-     * available, 0 is returned. A subsequent call to {@link #wasNull}
-     * will return <code>true</code> to let the caller distinguish
-     * that case from a real property value of 0.</p>
-     *
-     * @param id The property ID
-     * @return The propertyIntValue value
-     * @throws NoSingleSectionException if the {@link PropertySet} has
-     * more or less than one {@link Section}.
-     */
-    protected int getPropertyIntValue(final int id)
-        throws NoSingleSectionException
-    {
-        return getFirstSection().getPropertyIntValue(id);
-    }
-
-
-
-    /**
-     * <p>Checks whether the property which the last call to {@link
-     * #getPropertyIntValue} or {@link #getProperty} tried to access
-     * was available or not. This information might be important for
-     * callers of {@link #getPropertyIntValue} since the latter
-     * returns 0 if the property does not exist. Using {@link
-     * #wasNull}, the caller can distiguish this case from a
-     * property's real value of 0.</p>
-     *
-     * @return <code>true</code> if the last call to {@link
-     * #getPropertyIntValue} or {@link #getProperty} tried to access a
-     * property that was not available, else <code>false</code>.
-     * @throws NoSingleSectionException if the {@link PropertySet} has
-     * more than one {@link Section}.
-     */
-    public boolean wasNull() throws NoSingleSectionException
-    {
-        return getFirstSection().wasNull();
-    }
-
-
-
-    /**
-     * <p>Gets the {@link PropertySet}'s first section.</p>
-     *
-     * @return The {@link PropertySet}'s first section.
-     */
-    public Section getFirstSection()
-    {
-        if (getSectionCount() < 1)
-            throw new MissingSectionException("Property set does not contain any sections.");
-        return sections.get(0);
-    }
-
-
-
-    /**
-     * <p>If the {@link PropertySet} has only a single section this
-     * method returns it.</p>
-     *
-     * @return The singleSection value
-     */
-    public Section getSingleSection()
-    {
-        final int sectionCount = getSectionCount();
-        if (sectionCount != 1)
-            throw new NoSingleSectionException
-                ("Property set contains " + sectionCount + " sections.");
-        return sections.get(0);
-    }
-
-
-
-    /**
-     * <p>Returns <code>true</code> if the <code>PropertySet</code> is equal
-     * to the specified parameter, else <code>false</code>.</p>
-     *
-     * @param o the object to compare this <code>PropertySet</code> with
-     * 
-     * @return <code>true</code> if the objects are equal, <code>false</code>
-     * if not
-     */
-    @Override
-    public boolean equals(final Object o)
-    {
-        if (o == null || !(o instanceof PropertySet))
-            return false;
-        final PropertySet ps = (PropertySet) o;
-        int byteOrder1 = ps.getByteOrder();
-        int byteOrder2 = getByteOrder();
-        ClassID classID1 = ps.getClassID();
-        ClassID classID2 = getClassID();
-        int format1 = ps.getFormat();
-        int format2 = getFormat();
-        int osVersion1 = ps.getOSVersion();
-        int osVersion2 = getOSVersion();
-        int sectionCount1 = ps.getSectionCount();
-        int sectionCount2 = getSectionCount();
-        if (byteOrder1 != byteOrder2      ||
-            !classID1.equals(classID2)    ||
-            format1 != format2            ||
-            osVersion1 != osVersion2      ||
-            sectionCount1 != sectionCount2)
-            return false;
-
-        /* Compare the sections: */
-        return Util.equals(getSections(), ps.getSections());
-    }
-
-
-
-    /**
-     * @see Object#hashCode()
-     */
-    public int hashCode()
-    {
-        throw new UnsupportedOperationException("FIXME: Not yet implemented.");
-    }
-
-
-
-    /**
-     * @see Object#toString()
-     */
-    public String toString()
-    {
-        final StringBuilder b = new StringBuilder();
-        final int sectionCount = getSectionCount();
-        b.append(getClass().getName());
-        b.append('[');
-        b.append("byteOrder: ");
-        b.append(getByteOrder());
-        b.append(", classID: ");
-        b.append(getClassID());
-        b.append(", format: ");
-        b.append(getFormat());
-        b.append(", OSVersion: ");
-        b.append(getOSVersion());
-        b.append(", sectionCount: ");
-        b.append(sectionCount);
-        b.append(", sections: [\n");
-        for (Section section: getSections())
-            b.append(section);
-        b.append(']');
-        b.append(']');
-        return b.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/PropertySetFactory.java b/trunk/src/java/org/apache/poi/hpsf/PropertySetFactory.java
deleted file mode 100644
index 4d4b4e6..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/PropertySetFactory.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-
-/**
- * <p>Factory class to create instances of {@link SummaryInformation},
- * {@link DocumentSummaryInformation} and {@link PropertySet}.</p>
- */
-public class PropertySetFactory
-{
-    /**
-     * <p>Creates the most specific {@link PropertySet} from an entry
-     *  in the specified POIFS Directory. This is preferrably a {@link
-     * DocumentSummaryInformation} or a {@link SummaryInformation}. If
-     * the specified entry does not contain a property set stream, an 
-     * exception is thrown. If no entry is found with the given name,
-     * an exception is thrown.</p>
-     *
-     * @param dir The directory to find the PropertySet in
-     * @param name The name of the entry containing the PropertySet
-     * @return The created {@link PropertySet}.
-     * @throws FileNotFoundException if there is no entry with that name
-     * @throws NoPropertySetStreamException if the stream does not
-     * contain a property set.
-     * @throws IOException if some I/O problem occurs.
-     * @exception UnsupportedEncodingException if the specified codepage is not
-     * supported.
-     */
-    public static PropertySet create(final DirectoryEntry dir, final String name)
-        throws FileNotFoundException, NoPropertySetStreamException,
-               IOException, UnsupportedEncodingException
-    {
-        InputStream inp = null;
-        try {
-            DocumentEntry entry = (DocumentEntry)dir.getEntry(name);
-            inp = new DocumentInputStream(entry);
-            try {
-                return create(inp);
-            } catch (MarkUnsupportedException e) { return null; }
-        } finally {
-            if (inp != null) inp.close();
-        }
-    }
-
-    /**
-     * <p>Creates the most specific {@link PropertySet} from an {@link
-     * InputStream}. This is preferrably a {@link
-     * DocumentSummaryInformation} or a {@link SummaryInformation}. If
-     * the specified {@link InputStream} does not contain a property
-     * set stream, an exception is thrown and the {@link InputStream}
-     * is repositioned at its beginning.</p>
-     *
-     * @param stream Contains the property set stream's data.
-     * @return The created {@link PropertySet}.
-     * @throws NoPropertySetStreamException if the stream does not
-     * contain a property set.
-     * @throws MarkUnsupportedException if the stream does not support
-     * the <code>mark</code> operation.
-     * @throws IOException if some I/O problem occurs.
-     * @exception UnsupportedEncodingException if the specified codepage is not
-     * supported.
-     */
-    public static PropertySet create(final InputStream stream)
-        throws NoPropertySetStreamException, MarkUnsupportedException,
-               UnsupportedEncodingException, IOException
-    {
-        final PropertySet ps = new PropertySet(stream);
-        try
-        {
-            if (ps.isSummaryInformation())
-                return new SummaryInformation(ps);
-            else if (ps.isDocumentSummaryInformation())
-                return new DocumentSummaryInformation(ps);
-            else
-                return ps;
-        }
-        catch (UnexpectedPropertySetTypeException ex)
-        {
-            /* This exception will never be throws because we already checked
-             * explicitly for this case above. */
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    /**
-     * <p>Creates a new summary information.</p>
-     *
-     * @return the new summary information.
-     */
-    public static SummaryInformation newSummaryInformation()
-    {
-        final MutablePropertySet ps = new MutablePropertySet();
-        final MutableSection s = (MutableSection) ps.getFirstSection();
-        s.setFormatID(SectionIDMap.SUMMARY_INFORMATION_ID);
-        try
-        {
-            return new SummaryInformation(ps);
-        }
-        catch (UnexpectedPropertySetTypeException ex)
-        {
-            /* This should never happen. */
-            throw new HPSFRuntimeException(ex);
-        }
-    }
-
-    /**
-     * <p>Creates a new document summary information.</p>
-     *
-     * @return the new document summary information.
-     */
-    public static DocumentSummaryInformation newDocumentSummaryInformation()
-    {
-        final MutablePropertySet ps = new MutablePropertySet();
-        final MutableSection s = (MutableSection) ps.getFirstSection();
-        s.setFormatID(SectionIDMap.DOCUMENT_SUMMARY_INFORMATION_ID[0]);
-        try
-        {
-            return new DocumentSummaryInformation(ps);
-        }
-        catch (UnexpectedPropertySetTypeException ex)
-        {
-            /* This should never happen. */
-            throw new HPSFRuntimeException(ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java b/trunk/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
deleted file mode 100644
index cb16058..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown when HPSF tries to read a (yet) unsupported
- * variant type.</p>
- * 
- * @see WritingNotSupportedException
- * @see UnsupportedVariantTypeException
- */
-public class ReadingNotSupportedException
-    extends UnsupportedVariantTypeException
-{
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param variantType The unsupported variant type.
-     * @param value The value.
-     */
-    public ReadingNotSupportedException(final long variantType,
-                                        final Object value)
-    {
-        super(variantType, value);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Section.java b/trunk/src/java/org/apache/poi/hpsf/Section.java
deleted file mode 100644
index c54fe51..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Section.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * <p>Represents a section in a {@link PropertySet}.</p>
- */
-public class Section
-{
-
-    /**
-     * <p>Maps property IDs to section-private PID strings. These
-     * strings can be found in the property with ID 0.</p>
-     */
-    protected Map<Long,String> dictionary;
-
-    /**
-     * <p>The section's format ID, {@link #getFormatID}.</p>
-     */
-    protected ClassID formatID;
-
-
-    /**
-     * <p>Returns the format ID. The format ID is the "type" of the
-     * section. For example, if the format ID of the first {@link
-     * Section} contains the bytes specified by
-     * <code>org.apache.poi.hpsf.wellknown.SectionIDMap.SUMMARY_INFORMATION_ID</code>
-     * the section (and thus the property set) is a SummaryInformation.</p>
-     *
-     * @return The format ID
-     */
-    public ClassID getFormatID()
-    {
-        return formatID;
-    }
-
-
-
-    /**
-     * @see #getOffset
-     */
-    protected long offset;
-
-
-    /**
-     * <p>Returns the offset of the section in the stream.</p>
-     *
-     * @return The offset of the section in the stream.
-     */
-    public long getOffset()
-    {
-        return offset;
-    }
-
-
-
-    /**
-     * @see #getSize
-     */
-    protected int size;
-
-
-    /**
-     * <p>Returns the section's size in bytes.</p>
-     *
-     * @return The section's size in bytes.
-     */
-    public int getSize()
-    {
-        return size;
-    }
-
-
-
-    /**
-     * <p>Returns the number of properties in this section.</p>
-     *
-     * @return The number of properties in this section.
-     */
-    public int getPropertyCount()
-    {
-        return properties.length;
-    }
-
-
-
-    /**
-     * @see #getProperties
-     */
-    protected Property[] properties;
-
-
-    /**
-     * <p>Returns this section's properties.</p>
-     *
-     * @return This section's properties.
-     */
-    public Property[] getProperties()
-    {
-        return properties;
-    }
-
-
-
-    /**
-     * <p>Creates an empty and uninitialized {@link Section}.
-     */
-    protected Section()
-    { }
-
-
-
-    /**
-     * <p>Creates a {@link Section} instance from a byte array.</p>
-     *
-     * @param src Contains the complete property set stream.
-     * @param offset The position in the stream that points to the
-     * section's format ID.
-     *
-     * @exception UnsupportedEncodingException if the section's codepage is not
-     * supported.
-     */
-    @SuppressWarnings("unchecked")
-    public Section(final byte[] src, final int offset)
-    throws UnsupportedEncodingException
-    {
-        int o1 = offset;
-
-        /*
-         * Read the format ID.
-         */
-        formatID = new ClassID(src, o1);
-        o1 += ClassID.LENGTH;
-
-        /*
-         * Read the offset from the stream's start and positions to
-         * the section header.
-         */
-        this.offset = LittleEndian.getUInt(src, o1);
-        o1 = (int) this.offset;
-
-        /*
-         * Read the section length.
-         */
-        size = (int) LittleEndian.getUInt(src, o1);
-        o1 += LittleEndian.INT_SIZE;
-
-        /*
-         * Read the number of properties.
-         */
-        final int propertyCount = (int) LittleEndian.getUInt(src, o1);
-        o1 += LittleEndian.INT_SIZE;
-
-        /*
-         * Read the properties. The offset is positioned at the first
-         * entry of the property list. There are two problems:
-         *
-         * 1. For each property we have to find out its length. In the
-         *    property list we find each property's ID and its offset relative
-         *    to the section's beginning. Unfortunately the properties in the
-         *    property list need not to be in ascending order, so it is not
-         *    possible to calculate the length as
-         *    (offset of property(i+1) - offset of property(i)). Before we can
-         *    that we first have to sort the property list by ascending offsets.
-         *
-         * 2. We have to read the property with ID 1 before we read other
-         *    properties, at least before other properties containing strings.
-         *    The reason is that property 1 specifies the codepage. If it is
-         *    1200, all strings are in Unicode. In other words: Before we can
-         *    read any strings we have to know whether they are in Unicode or
-         *    not. Unfortunately property 1 is not guaranteed to be the first in
-         *    a section.
-         *
-         *    The algorithm below reads the properties in two passes: The first
-         *    one looks for property ID 1 and extracts the codepage number. The
-         *    seconds pass reads the other properties.
-         */
-        properties = new Property[propertyCount];
-
-        /* Pass 1: Read the property list. */
-        int pass1Offset = o1;
-        final List<PropertyListEntry> propertyList = new ArrayList<PropertyListEntry>(propertyCount);
-        PropertyListEntry ple;
-        for (int i = 0; i < properties.length; i++)
-        {
-            ple = new PropertyListEntry();
-
-            /* Read the property ID. */
-            ple.id = (int) LittleEndian.getUInt(src, pass1Offset);
-            pass1Offset += LittleEndian.INT_SIZE;
-
-            /* Offset from the section's start. */
-            ple.offset = (int) LittleEndian.getUInt(src, pass1Offset);
-            pass1Offset += LittleEndian.INT_SIZE;
-
-            /* Add the entry to the property list. */
-            propertyList.add(ple);
-        }
-
-        /* Sort the property list by ascending offsets: */
-        Collections.sort(propertyList);
-
-        /* Calculate the properties' lengths. */
-        for (int i = 0; i < propertyCount - 1; i++)
-        {
-            PropertyListEntry ple1 = propertyList.get(i);
-            PropertyListEntry ple2 = propertyList.get(i + 1);
-            ple1.length = ple2.offset - ple1.offset;
-        }
-        if (propertyCount > 0)
-        {
-            ple = propertyList.get(propertyCount - 1);
-            ple.length = size - ple.offset;
-        }
-
-        /* Look for the codepage. */
-        int codepage = -1;
-        for (final Iterator<PropertyListEntry> i = propertyList.iterator();
-             codepage == -1 && i.hasNext();)
-        {
-            ple = i.next();
-
-            /* Read the codepage if the property ID is 1. */
-            if (ple.id == PropertyIDMap.PID_CODEPAGE)
-            {
-                /* Read the property's value type. It must be
-                 * VT_I2. */
-                int o = (int) (this.offset + ple.offset);
-                final long type = LittleEndian.getUInt(src, o);
-                o += LittleEndian.INT_SIZE;
-
-                if (type != Variant.VT_I2)
-                    throw new HPSFRuntimeException
-                        ("Value type of property ID 1 is not VT_I2 but " +
-                         type + ".");
-
-                /* Read the codepage number. */
-                codepage = LittleEndian.getUShort(src, o);
-            }
-        }
-
-        /* Pass 2: Read all properties - including the codepage property,
-         * if available. */
-        int i1 = 0;
-        for (final Iterator<PropertyListEntry> i = propertyList.iterator(); i.hasNext();)
-        {
-            ple = i.next();
-            Property p = new Property(ple.id, src,
-                    this.offset + ple.offset,
-                    ple.length, codepage);
-            if (p.getID() == PropertyIDMap.PID_CODEPAGE)
-                p = new Property(p.getID(), p.getType(), Integer.valueOf(codepage));
-            properties[i1++] = p;
-        }
-
-        /*
-         * Extract the dictionary (if available).
-         */
-        dictionary = (Map<Long,String>) getProperty(0);
-    }
-
-
-
-    /**
-     * <p>Represents an entry in the property list and holds a property's ID and
-     * its offset from the section's beginning.</p>
-     */
-    static class PropertyListEntry implements Comparable<PropertyListEntry>
-    {
-        int id;
-        int offset;
-        int length;
-
-        /**
-         * <p>Compares this {@link PropertyListEntry} with another one by their
-         * offsets. A {@link PropertyListEntry} is "smaller" than another one if
-         * its offset from the section's begin is smaller.</p>
-         *
-         * @see Comparable#compareTo(java.lang.Object)
-         */
-        public int compareTo(final PropertyListEntry o)
-        {
-            final int otherOffset = o.offset;
-            if (offset < otherOffset)
-                return -1;
-            else if (offset == otherOffset)
-                return 0;
-            else
-                return 1;
-        }
-
-        
-        
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + id;
-            result = prime * result + length;
-            result = prime * result + offset;
-            return result;
-        }
-
-
-
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            PropertyListEntry other = (PropertyListEntry) obj;
-            if (id != other.id) {
-                return false;
-            }
-            if (length != other.length) {
-                return false;
-            }
-            if (offset != other.offset) {
-                return false;
-            }
-            return true;
-        }
-
-
-
-        public String toString()
-        {
-            final StringBuffer b = new StringBuffer();
-            b.append(getClass().getName());
-            b.append("[id=");
-            b.append(id);
-            b.append(", offset=");
-            b.append(offset);
-            b.append(", length=");
-            b.append(length);
-            b.append(']');
-            return b.toString();
-        }
-    }
-
-
-
-    /**
-     * <p>Returns the value of the property with the specified ID. If
-     * the property is not available, <code>null</code> is returned
-     * and a subsequent call to {@link #wasNull} will return
-     * <code>true</code>.</p>
-     *
-     * @param id The property's ID
-     *
-     * @return The property's value
-     */
-    public Object getProperty(final long id)
-    {
-        wasNull = false;
-        for (int i = 0; i < properties.length; i++)
-            if (id == properties[i].getID())
-                return properties[i].getValue();
-        wasNull = true;
-        return null;
-    }
-
-
-
-    /**
-     * <p>Returns the value of the numeric property with the specified
-     * ID. If the property is not available, 0 is returned. A
-     * subsequent call to {@link #wasNull} will return
-     * <code>true</code> to let the caller distinguish that case from
-     * a real property value of 0.</p>
-     *
-     * @param id The property's ID
-     *
-     * @return The property's value
-     */
-    protected int getPropertyIntValue(final long id)
-    {
-        final Number i;
-        final Object o = getProperty(id);
-        if (o == null)
-            return 0;
-        if (!(o instanceof Long || o instanceof Integer))
-            throw new HPSFRuntimeException
-                ("This property is not an integer type, but " +
-                 o.getClass().getName() + ".");
-        i = (Number) o;
-        return i.intValue();
-    }
-
-
-
-    /**
-     * <p>Returns the value of the boolean property with the specified
-     * ID. If the property is not available, <code>false</code> is
-     * returned. A subsequent call to {@link #wasNull} will return
-     * <code>true</code> to let the caller distinguish that case from
-     * a real property value of <code>false</code>.</p>
-     *
-     * @param id The property's ID
-     *
-     * @return The property's value
-     */
-    protected boolean getPropertyBooleanValue(final int id)
-    {
-        final Boolean b = (Boolean) getProperty(id);
-        if (b == null) {
-            return false;
-        }
-        return b.booleanValue();
-        }
-
-
-
-    /**
-     * <p>This member is <code>true</code> if the last call to {@link
-     * #getPropertyIntValue} or {@link #getProperty} tried to access a
-     * property that was not available, else <code>false</code>.</p>
-     */
-    private boolean wasNull;
-
-
-    /**
-     * <p>Checks whether the property which the last call to {@link
-     * #getPropertyIntValue} or {@link #getProperty} tried to access
-     * was available or not. This information might be important for
-     * callers of {@link #getPropertyIntValue} since the latter
-     * returns 0 if the property does not exist. Using {@link
-     * #wasNull} the caller can distiguish this case from a property's
-     * real value of 0.</p>
-     *
-     * @return <code>true</code> if the last call to {@link
-     * #getPropertyIntValue} or {@link #getProperty} tried to access a
-     * property that was not available, else <code>false</code>.
-     */
-    public boolean wasNull()
-    {
-        return wasNull;
-    }
-
-
-
-    /**
-     * <p>Returns the PID string associated with a property ID. The ID
-     * is first looked up in the {@link Section}'s private
-     * dictionary. If it is not found there, the method calls {@link
-     * SectionIDMap#getPIDString}.</p>
-     *
-     * @param pid The property ID
-     *
-     * @return The property ID's string value
-     */
-    public String getPIDString(final long pid)
-    {
-        String s = null;
-        if (dictionary != null) {
-            s = dictionary.get(Long.valueOf(pid));
-        }
-        if (s == null) {
-            s = SectionIDMap.getPIDString(getFormatID().getBytes(), pid);
-        }
-        return s;
-    }
-
-
-
-    /**
-     * <p>Checks whether this section is equal to another object. The result is
-     * <code>false</code> if one of the the following conditions holds:</p>
-     *
-     * <ul>
-     *
-     * <li><p>The other object is not a {@link Section}.</p></li>
-     *
-     * <li><p>The format IDs of the two sections are not equal.</p></li>
-     *
-     * <li><p>The sections have a different number of properties. However,
-     * properties with ID 1 (codepage) are not counted.</p></li>
-     *
-     * <li><p>The other object is not a {@link Section}.</p></li>
-     *
-     * <li><p>The properties have different values. The order of the properties
-     * is irrelevant.</p></li>
-     *
-     * </ul>
-     *
-     * @param o The object to compare this section with
-     * @return <code>true</code> if the objects are equal, <code>false</code> if
-     * not
-     */
-    public boolean equals(final Object o)
-    {
-        if (o == null || !(o instanceof Section))
-            return false;
-        final Section s = (Section) o;
-        if (!s.getFormatID().equals(getFormatID()))
-            return false;
-
-        /* Compare all properties except 0 and 1 as they must be handled
-         * specially. */
-        Property[] pa1 = new Property[getProperties().length];
-        Property[] pa2 = new Property[s.getProperties().length];
-        System.arraycopy(getProperties(), 0, pa1, 0, pa1.length);
-        System.arraycopy(s.getProperties(), 0, pa2, 0, pa2.length);
-
-        /* Extract properties 0 and 1 and remove them from the copy of the
-         * arrays. */
-        Property p10 = null;
-        Property p20 = null;
-        for (int i = 0; i < pa1.length; i++)
-        {
-            final long id = pa1[i].getID();
-            if (id == 0)
-            {
-                p10 = pa1[i];
-                pa1 = remove(pa1, i);
-                i--;
-            }
-            if (id == 1)
-            {
-                // p11 = pa1[i];
-                pa1 = remove(pa1, i);
-                i--;
-            }
-        }
-        for (int i = 0; i < pa2.length; i++)
-        {
-            final long id = pa2[i].getID();
-            if (id == 0)
-            {
-                p20 = pa2[i];
-                pa2 = remove(pa2, i);
-                i--;
-            }
-            if (id == 1)
-            {
-                // p21 = pa2[i];
-                pa2 = remove(pa2, i);
-                i--;
-            }
-        }
-
-        /* If the number of properties (not counting property 1) is unequal the
-         * sections are unequal. */
-        if (pa1.length != pa2.length)
-            return false;
-
-        /* If the dictionaries are unequal the sections are unequal. */
-        boolean dictionaryEqual = true;
-        if (p10 != null && p20 != null)
-            dictionaryEqual = p10.getValue().equals(p20.getValue());
-        else if (p10 != null || p20 != null)
-            dictionaryEqual = false;
-        if (dictionaryEqual) {
-            return Util.equals(pa1, pa2);
-        }
-        return false;
-    }
-
-
-
-    /**
-     * <p>Removes a field from a property array. The resulting array is
-     * compactified and returned.</p>
-     *
-     * @param pa The property array.
-     * @param i The index of the field to be removed.
-     * @return the compactified array.
-     */
-    private Property[] remove(final Property[] pa, final int i)
-    {
-        final Property[] h = new Property[pa.length - 1];
-        if (i > 0)
-            System.arraycopy(pa, 0, h, 0, i);
-        System.arraycopy(pa, i + 1, h, i, h.length - i);
-        return h;
-    }
-
-
-
-    /**
-     * @see Object#hashCode()
-     */
-    public int hashCode()
-    {
-        long hashCode = 0;
-        hashCode += getFormatID().hashCode();
-        final Property[] pa = getProperties();
-        for (int i = 0; i < pa.length; i++)
-            hashCode += pa[i].hashCode();
-        final int returnHashCode = (int) (hashCode & 0x0ffffffffL);
-        return returnHashCode;
-    }
-
-
-
-    /**
-     * @see Object#toString()
-     */
-    public String toString()
-    {
-        final StringBuffer b = new StringBuffer();
-        final Property[] pa = getProperties();
-        b.append(getClass().getName());
-        b.append('[');
-        b.append("formatID: ");
-        b.append(getFormatID());
-        b.append(", offset: ");
-        b.append(getOffset());
-        b.append(", propertyCount: ");
-        b.append(getPropertyCount());
-        b.append(", size: ");
-        b.append(getSize());
-        b.append(", properties: [\n");
-        for (int i = 0; i < pa.length; i++)
-        {
-            b.append(pa[i].toString());
-            b.append(",\n");
-        }
-        b.append(']');
-        b.append(']');
-        return b.toString();
-    }
-
-
-
-    /**
-     * <p>Gets the section's dictionary. A dictionary allows an application to
-     * use human-readable property names instead of numeric property IDs. It
-     * contains mappings from property IDs to their associated string
-     * values. The dictionary is stored as the property with ID 0. The codepage
-     * for the strings in the dictionary is defined by property with ID 1.</p>
-     *
-     * @return the dictionary or <code>null</code> if the section does not have
-     * a dictionary.
-     */
-    public Map<Long,String> getDictionary()
-    {
-        return dictionary;
-    }
-
-
-
-    /**
-     * <p>Gets the section's codepage, if any.</p>
-     *
-     * @return The section's codepage if one is defined, else -1.
-     */
-    public int getCodepage()
-    {
-        final Integer codepage =
-            (Integer) getProperty(PropertyIDMap.PID_CODEPAGE);
-        if (codepage == null)
-            return -1;
-        int cp = codepage.intValue();
-        return cp;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/SpecialPropertySet.java b/trunk/src/java/org/apache/poi/hpsf/SpecialPropertySet.java
deleted file mode 100644
index aa8f805..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/SpecialPropertySet.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.List;
-
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * <p>Abstract superclass for the convenience classes {@link
- * SummaryInformation} and {@link DocumentSummaryInformation}.</p>
- *
- * <p>The motivation behind this class is quite nasty if you look
- * behind the scenes, but it serves the application programmer well by
- * providing him with the easy-to-use {@link SummaryInformation} and
- * {@link DocumentSummaryInformation} classes. When parsing the data a
- * property set stream consists of (possibly coming from an {@link
- * java.io.InputStream}) we want to read and process each byte only
- * once. Since we don't know in advance which kind of property set we
- * have, we can expect only the most general {@link
- * PropertySet}. Creating a special subclass should be as easy as
- * calling the special subclass' constructor and pass the general
- * {@link PropertySet} in. To make things easy internally, the special
- * class just holds a reference to the general {@link PropertySet} and
- * delegates all method calls to it.</p>
- *
- * <p>A cleaner implementation would have been like this: The {@link
- * PropertySetFactory} parses the stream data into some internal
- * object first.  Then it finds out whether the stream is a {@link
- * SummaryInformation}, a {@link DocumentSummaryInformation} or a
- * general {@link PropertySet}.  However, the current implementation
- * went the other way round historically: the convenience classes came
- * only late to my mind.</p>
- */
-public abstract class SpecialPropertySet extends MutablePropertySet
-{
-    /**
-     * The id to name mapping of the properties in this set.
-     * 
-     * @return the id to name mapping of the properties in this set
-     */
-    public abstract PropertyIDMap getPropertySetIDMap();
-
-    /**
-     * <p>The "real" property set <code>SpecialPropertySet</code>
-     * delegates to.</p>
-     */
-    private final MutablePropertySet delegate;
-
-
-
-    /**
-     * <p>Creates a <code>SpecialPropertySet</code>.
-     *
-     * @param ps The property set to be encapsulated by the
-     * <code>SpecialPropertySet</code>
-     */
-    public SpecialPropertySet(final PropertySet ps)
-    {
-        delegate = new MutablePropertySet(ps);
-    }
-
-
-
-    /**
-     * <p>Creates a <code>SpecialPropertySet</code>.
-     *
-     * @param ps The mutable property set to be encapsulated by the
-     * <code>SpecialPropertySet</code>
-     */
-    public SpecialPropertySet(final MutablePropertySet ps)
-    {
-        delegate = ps;
-    }
-
-
-
-    /**
-     * @see PropertySet#getByteOrder
-     */
-    @Override
-    public int getByteOrder()
-    {
-        return delegate.getByteOrder();
-    }
-
-
-
-    /**
-     * @see PropertySet#getFormat
-     */
-    @Override
-    public int getFormat()
-    {
-        return delegate.getFormat();
-    }
-
-
-
-    /**
-     * @see PropertySet#getOSVersion
-     */
-    @Override
-    public int getOSVersion()
-    {
-        return delegate.getOSVersion();
-    }
-
-
-
-    /**
-     * @see PropertySet#getClassID
-     */
-    @Override
-    public ClassID getClassID()
-    {
-        return delegate.getClassID();
-    }
-
-
-
-    /**
-     * @see PropertySet#getSectionCount
-     */
-    @Override
-    public int getSectionCount()
-    {
-        return delegate.getSectionCount();
-    }
-
-
-
-    /**
-     * @see PropertySet#getSections
-     */
-    @Override
-    public List<Section> getSections()
-    {
-        return delegate.getSections();
-    }
-
-
-
-    /**
-     * @see PropertySet#isSummaryInformation
-     */
-    @Override
-    public boolean isSummaryInformation()
-    {
-        return delegate.isSummaryInformation();
-    }
-
-
-
-    /**
-     * @see PropertySet#isDocumentSummaryInformation
-     */
-    @Override
-    public boolean isDocumentSummaryInformation()
-    {
-        return delegate.isDocumentSummaryInformation();
-    }
-
-
-
-    /**
-     * @see PropertySet#getSingleSection
-     */
-    @Override
-    public Section getFirstSection()
-    {
-        return delegate.getFirstSection();
-    }
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#addSection(org.apache.poi.hpsf.Section)
-     */
-    @Override
-    public void addSection(final Section section)
-    {
-        delegate.addSection(section);
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#clearSections()
-     */
-    @Override
-    public void clearSections()
-    {
-        delegate.clearSections();
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#setByteOrder(int)
-     */
-    @Override
-    public void setByteOrder(final int byteOrder)
-    {
-        delegate.setByteOrder(byteOrder);
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#setClassID(org.apache.poi.hpsf.ClassID)
-     */
-    @Override
-    public void setClassID(final ClassID classID)
-    {
-        delegate.setClassID(classID);
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#setFormat(int)
-     */
-    @Override
-    public void setFormat(final int format)
-    {
-        delegate.setFormat(format);
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#setOSVersion(int)
-     */
-    @Override
-    public void setOSVersion(final int osVersion)
-    {
-        delegate.setOSVersion(osVersion);
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#toInputStream()
-     */
-    @Override
-    public InputStream toInputStream() throws IOException, WritingNotSupportedException
-    {
-        return delegate.toInputStream();
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#write(org.apache.poi.poifs.filesystem.DirectoryEntry, java.lang.String)
-     */
-    @Override
-    public void write(final DirectoryEntry dir, final String name) throws WritingNotSupportedException, IOException
-    {
-        delegate.write(dir, name);
-    }
-
-    /**
-     * @see org.apache.poi.hpsf.MutablePropertySet#write(java.io.OutputStream)
-     */
-    @Override
-    public void write(final OutputStream out) throws WritingNotSupportedException, IOException
-    {
-        delegate.write(out);
-    }
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object o)
-    {
-        return delegate.equals(o);
-    }
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#getProperties()
-     */
-    @Override
-    public Property[] getProperties() throws NoSingleSectionException
-    {
-        return delegate.getProperties();
-    }
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#getProperty(int)
-     */
-    @Override
-    protected Object getProperty(final int id) throws NoSingleSectionException
-    {
-        return delegate.getProperty(id);
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#getPropertyBooleanValue(int)
-     */
-    @Override
-    protected boolean getPropertyBooleanValue(final int id) throws NoSingleSectionException
-    {
-        return delegate.getPropertyBooleanValue(id);
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#getPropertyIntValue(int)
-     */
-    @Override
-    protected int getPropertyIntValue(final int id) throws NoSingleSectionException
-    {
-        return delegate.getPropertyIntValue(id);
-    }
-
-
-    
-    /**
-     * Fetches the property with the given ID, then does its
-     *  best to return it as a String
-     * 
-     * @param propertyId the property id
-     *  
-     * @return The property as a String, or null if unavailable
-     */
-    protected String getPropertyStringValue(final int propertyId) {
-        Object propertyValue = getProperty(propertyId);
-        return getPropertyStringValue(propertyValue);
-    }
-    protected static String getPropertyStringValue(final Object propertyValue) {
-        // Normal cases
-        if (propertyValue == null) return null;
-        if (propertyValue instanceof String) return (String)propertyValue;
-        
-        // Do our best with some edge cases
-        if (propertyValue instanceof byte[]) {
-            byte[] b = (byte[])propertyValue;
-            if (b.length == 0) {
-                return "";
-            }
-            if (b.length == 1) {
-                return Byte.toString(b[0]);
-            }
-            if (b.length == 2) {
-                return Integer.toString( LittleEndian.getUShort(b) );
-            }
-            if (b.length == 4) {
-                return Long.toString( LittleEndian.getUInt(b) );
-            }
-            // Maybe it's a string? who knows!
-            return new String(b, Charset.forName("ASCII"));
-        }
-        return propertyValue.toString();
-    }
-
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#hashCode()
-     */
-    @Override
-    public int hashCode()
-    {
-        return delegate.hashCode();
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#toString()
-     */
-    @Override
-    public String toString()
-    {
-        return delegate.toString();
-    }
-
-
-
-    /**
-     * @see org.apache.poi.hpsf.PropertySet#wasNull()
-     */
-    @Override
-    public boolean wasNull() throws NoSingleSectionException
-    {
-        return delegate.wasNull();
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/SummaryInformation.java b/trunk/src/java/org/apache/poi/hpsf/SummaryInformation.java
deleted file mode 100644
index 5c26018..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/SummaryInformation.java
+++ /dev/null
@@ -1,762 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.util.Date;
-
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-
-/**
- * <p>Convenience class representing a Summary Information stream in a
- * Microsoft Office document.</p>
- *
- * @see DocumentSummaryInformation
- */
-public final class SummaryInformation extends SpecialPropertySet {
-
-    /**
-     * <p>The document name a summary information stream usually has in a POIFS
-     * filesystem.</p>
-     */
-    public static final String DEFAULT_STREAM_NAME = "\005SummaryInformation";
-
-    public PropertyIDMap getPropertySetIDMap() {
-    	return PropertyIDMap.getSummaryInformationProperties();
-    }
-
-
-    /**
-     * <p>Creates a {@link SummaryInformation} from a given {@link
-     * PropertySet}.</p>
-     *
-     * @param ps A property set which should be created from a summary
-     *        information stream.
-     * @throws UnexpectedPropertySetTypeException if <var>ps</var> does not
-     *         contain a summary information stream.
-     */
-    public SummaryInformation(final PropertySet ps)
-            throws UnexpectedPropertySetTypeException
-    {
-        super(ps);
-        if (!isSummaryInformation())
-            throw new UnexpectedPropertySetTypeException("Not a "
-                    + getClass().getName());
-    }
-
-
-
-    /**
-     * <p>Returns the title (or <code>null</code>).</p>
-     *
-     * @return The title or <code>null</code>
-     */
-    public String getTitle()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_TITLE);
-    }
-
-
-
-    /**
-     * <p>Sets the title.</p>
-     *
-     * @param title The title to set.
-     */
-    public void setTitle(final String title)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_TITLE, title);
-    }
-
-
-
-    /**
-     * <p>Removes the title.</p>
-     */
-    public void removeTitle()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_TITLE);
-    }
-
-
-
-    /**
-     * <p>Returns the subject (or <code>null</code>).</p>
-     *
-     * @return The subject or <code>null</code>
-     */
-    public String getSubject()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_SUBJECT);
-    }
-
-
-
-    /**
-     * <p>Sets the subject.</p>
-     *
-     * @param subject The subject to set.
-     */
-    public void setSubject(final String subject)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_SUBJECT, subject);
-    }
-
-
-
-    /**
-     * <p>Removes the subject.</p>
-     */
-    public void removeSubject()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_SUBJECT);
-    }
-
-
-
-    /**
-     * <p>Returns the author (or <code>null</code>).</p>
-     *
-     * @return The author or <code>null</code>
-     */
-    public String getAuthor()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_AUTHOR);
-    }
-
-
-
-    /**
-     * <p>Sets the author.</p>
-     *
-     * @param author The author to set.
-     */
-    public void setAuthor(final String author)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_AUTHOR, author);
-    }
-
-
-
-    /**
-     * <p>Removes the author.</p>
-     */
-    public void removeAuthor()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_AUTHOR);
-    }
-
-
-
-    /**
-     * <p>Returns the keywords (or <code>null</code>).</p>
-     *
-     * @return The keywords or <code>null</code>
-     */
-    public String getKeywords()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_KEYWORDS);
-    }
-
-
-
-    /**
-     * <p>Sets the keywords.</p>
-     *
-     * @param keywords The keywords to set.
-     */
-    public void setKeywords(final String keywords)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_KEYWORDS, keywords);
-    }
-
-
-
-    /**
-     * <p>Removes the keywords.</p>
-     */
-    public void removeKeywords()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_KEYWORDS);
-    }
-
-
-
-    /**
-     * <p>Returns the comments (or <code>null</code>).</p>
-     *
-     * @return The comments or <code>null</code>
-     */
-    public String getComments()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_COMMENTS);
-    }
-
-
-
-    /**
-     * <p>Sets the comments.</p>
-     *
-     * @param comments The comments to set.
-     */
-    public void setComments(final String comments)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_COMMENTS, comments);
-    }
-
-
-
-    /**
-     * <p>Removes the comments.</p>
-     */
-    public void removeComments()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_COMMENTS);
-    }
-
-
-
-    /**
-     * <p>Returns the template (or <code>null</code>).</p>
-     *
-     * @return The template or <code>null</code>
-     */
-    public String getTemplate()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_TEMPLATE);
-    }
-
-
-
-    /**
-     * <p>Sets the template.</p>
-     *
-     * @param template The template to set.
-     */
-    public void setTemplate(final String template)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_TEMPLATE, template);
-    }
-
-
-
-    /**
-     * <p>Removes the template.</p>
-     */
-    public void removeTemplate()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_TEMPLATE);
-    }
-
-
-
-    /**
-     * <p>Returns the last author (or <code>null</code>).</p>
-     *
-     * @return The last author or <code>null</code>
-     */
-    public String getLastAuthor()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_LASTAUTHOR);
-    }
-
-
-
-    /**
-     * <p>Sets the last author.</p>
-     *
-     * @param lastAuthor The last author to set.
-     */
-    public void setLastAuthor(final String lastAuthor)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_LASTAUTHOR, lastAuthor);
-    }
-
-
-
-    /**
-     * <p>Removes the last author.</p>
-     */
-    public void removeLastAuthor()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_LASTAUTHOR);
-    }
-
-
-
-    /**
-     * <p>Returns the revision number (or <code>null</code>). </p>
-     *
-     * @return The revision number or <code>null</code>
-     */
-    public String getRevNumber()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_REVNUMBER);
-    }
-
-
-
-    /**
-     * <p>Sets the revision number.</p>
-     *
-     * @param revNumber The revision number to set.
-     */
-    public void setRevNumber(final String revNumber)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_REVNUMBER, revNumber);
-    }
-
-
-
-    /**
-     * <p>Removes the revision number.</p>
-     */
-    public void removeRevNumber()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_REVNUMBER);
-    }
-
-
-
-    /**
-     * <p>Returns the total time spent in editing the document (or
-     * <code>0</code>).</p>
-     *
-     * @return The total time spent in editing the document or 0 if the {@link
-     *         SummaryInformation} does not contain this information.
-     */
-    public long getEditTime()
-    {
-        final Date d = (Date) getProperty(PropertyIDMap.PID_EDITTIME);
-        if (d == null) {
-            return 0;
-        }
-        return Util.dateToFileTime(d);
-    }
-
-
-
-    /**
-     * <p>Sets the total time spent in editing the document.</p>
-     *
-     * @param time The time to set.
-     */
-    public void setEditTime(final long time)
-    {
-        final Date d = Util.filetimeToDate(time);
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_EDITTIME, Variant.VT_FILETIME, d);
-    }
-
-
-
-    /**
-     * <p>Remove the total time spent in editing the document.</p>
-     */
-    public void removeEditTime()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_EDITTIME);
-    }
-
-
-
-    /**
-     * <p>Returns the last printed time (or <code>null</code>).</p>
-     *
-     * @return The last printed time or <code>null</code>
-     */
-    public Date getLastPrinted()
-    {
-        return (Date) getProperty(PropertyIDMap.PID_LASTPRINTED);
-    }
-
-
-
-    /**
-     * <p>Sets the lastPrinted.</p>
-     *
-     * @param lastPrinted The lastPrinted to set.
-     */
-    public void setLastPrinted(final Date lastPrinted)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_LASTPRINTED, Variant.VT_FILETIME,
-                lastPrinted);
-    }
-
-
-
-    /**
-     * <p>Removes the lastPrinted.</p>
-     */
-    public void removeLastPrinted()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_LASTPRINTED);
-    }
-
-
-
-    /**
-     * <p>Returns the creation time (or <code>null</code>).</p>
-     *
-     * @return The creation time or <code>null</code>
-     */
-    public Date getCreateDateTime()
-    {
-        return (Date) getProperty(PropertyIDMap.PID_CREATE_DTM);
-    }
-
-
-
-    /**
-     * <p>Sets the creation time.</p>
-     *
-     * @param createDateTime The creation time to set.
-     */
-    public void setCreateDateTime(final Date createDateTime)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_CREATE_DTM, Variant.VT_FILETIME,
-                createDateTime);
-    }
-
-
-
-    /**
-     * <p>Removes the creation time.</p>
-     */
-    public void removeCreateDateTime()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_CREATE_DTM);
-    }
-
-
-
-    /**
-     * <p>Returns the last save time (or <code>null</code>).</p>
-     *
-     * @return The last save time or <code>null</code>
-     */
-    public Date getLastSaveDateTime()
-    {
-        return (Date) getProperty(PropertyIDMap.PID_LASTSAVE_DTM);
-    }
-
-
-
-    /**
-     * <p>Sets the total time spent in editing the document.</p>
-     *
-     * @param time The time to set.
-     */
-    public void setLastSaveDateTime(final Date time)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s
-                .setProperty(PropertyIDMap.PID_LASTSAVE_DTM,
-                        Variant.VT_FILETIME, time);
-    }
-
-
-
-    /**
-     * <p>Remove the total time spent in editing the document.</p>
-     */
-    public void removeLastSaveDateTime()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_LASTSAVE_DTM);
-    }
-
-
-
-    /**
-     * <p>Returns the page count or 0 if the {@link SummaryInformation} does
-     * not contain a page count.</p>
-     *
-     * @return The page count or 0 if the {@link SummaryInformation} does not
-     *         contain a page count.
-     */
-    public int getPageCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_PAGECOUNT);
-    }
-
-
-
-    /**
-     * <p>Sets the page count.</p>
-     *
-     * @param pageCount The page count to set.
-     */
-    public void setPageCount(final int pageCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_PAGECOUNT, pageCount);
-    }
-
-
-
-    /**
-     * <p>Removes the page count.</p>
-     */
-    public void removePageCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_PAGECOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the word count or 0 if the {@link SummaryInformation} does
-     * not contain a word count.</p>
-     *
-     * @return The word count or <code>null</code>
-     */
-    public int getWordCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_WORDCOUNT);
-    }
-
-
-
-    /**
-     * <p>Sets the word count.</p>
-     *
-     * @param wordCount The word count to set.
-     */
-    public void setWordCount(final int wordCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_WORDCOUNT, wordCount);
-    }
-
-
-
-    /**
-     * <p>Removes the word count.</p>
-     */
-    public void removeWordCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_WORDCOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the character count or 0 if the {@link SummaryInformation}
-     * does not contain a char count.</p>
-     *
-     * @return The character count or <code>null</code>
-     */
-    public int getCharCount()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_CHARCOUNT);
-    }
-
-
-
-    /**
-     * <p>Sets the character count.</p>
-     *
-     * @param charCount The character count to set.
-     */
-    public void setCharCount(final int charCount)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_CHARCOUNT, charCount);
-    }
-
-
-
-    /**
-     * <p>Removes the character count.</p>
-     */
-    public void removeCharCount()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_CHARCOUNT);
-    }
-
-
-
-    /**
-     * <p>Returns the thumbnail (or <code>null</code>) <strong>when this
-     * method is implemented. Please note that the return type is likely to
-     * change!</strong></p>
-     *
-     * <p>To process this data, you may wish to make use of the
-     *  {@link Thumbnail} class. The raw data is generally 
-     *  an image in WMF or Clipboard (BMP?) format</p>
-     *
-     * @return The thumbnail or <code>null</code>
-     */
-    public byte[] getThumbnail()
-    {
-        return (byte[]) getProperty(PropertyIDMap.PID_THUMBNAIL);
-    }
-
-    /**
-     * <p>Returns the thumbnail (or <code>null</code>), processed
-     *  as an object which is (largely) able to unpack the thumbnail
-     *  image data.</p>
-     *
-     * @return The thumbnail or <code>null</code>
-     */
-    public Thumbnail getThumbnailThumbnail()
-    {
-        byte[] data = getThumbnail();
-        if (data == null) return null;
-        return new Thumbnail(data);
-    }
-
-
-
-    /**
-     * <p>Sets the thumbnail.</p>
-     *
-     * @param thumbnail The thumbnail to set.
-     */
-    public void setThumbnail(final byte[] thumbnail)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_THUMBNAIL, /* FIXME: */
-                Variant.VT_LPSTR, thumbnail);
-    }
-
-
-
-    /**
-     * <p>Removes the thumbnail.</p>
-     */
-    public void removeThumbnail()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_THUMBNAIL);
-    }
-
-
-
-    /**
-     * <p>Returns the application name (or <code>null</code>).</p>
-     *
-     * @return The application name or <code>null</code>
-     */
-    public String getApplicationName()
-    {
-        return getPropertyStringValue(PropertyIDMap.PID_APPNAME);
-    }
-
-
-
-    /**
-     * <p>Sets the application name.</p>
-     *
-     * @param applicationName The application name to set.
-     */
-    public void setApplicationName(final String applicationName)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_APPNAME, applicationName);
-    }
-
-
-
-    /**
-     * <p>Removes the application name.</p>
-     */
-    public void removeApplicationName()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_APPNAME);
-    }
-
-
-
-    /**
-     * <p>Returns a security code which is one of the following values:</p>
-     *
-     * <ul>
-     *
-     * <li><p>0 if the {@link SummaryInformation} does not contain a
-     * security field or if there is no security on the document. Use
-     * {@link PropertySet#wasNull()} to distinguish between the two
-     * cases!</p></li>
-     *
-     * <li><p>1 if the document is password protected</p></li>
-     *
-     * <li><p>2 if the document is read-only recommended</p></li>
-     *
-     * <li><p>4 if the document is read-only enforced</p></li>
-     *
-     * <li><p>8 if the document is locked for annotations</p></li>
-     *
-     * </ul>
-     *
-     * @return The security code or <code>null</code>
-     */
-    public int getSecurity()
-    {
-        return getPropertyIntValue(PropertyIDMap.PID_SECURITY);
-    }
-
-
-
-    /**
-     * <p>Sets the security code.</p>
-     *
-     * @param security The security code to set.
-     */
-    public void setSecurity(final int security)
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.setProperty(PropertyIDMap.PID_SECURITY, security);
-    }
-
-
-
-    /**
-     * <p>Removes the security code.</p>
-     */
-    public void removeSecurity()
-    {
-        final MutableSection s = (MutableSection) getFirstSection();
-        s.removeProperty(PropertyIDMap.PID_SECURITY);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java b/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java
deleted file mode 100644
index a1faf3d..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.LittleEndian;
-/**
- * <p>Class to manipulate data in the Clipboard Variant ({@link
- * Variant#VT_CF VT_CF}) format.</p>
- *
- * @see SummaryInformation#getThumbnail()
- * @see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms649014(v=vs.85).aspx">Clipboard Operations</a>
- */
-public final class Thumbnail {
-
-    /**
-     * <p>Offset in bytes where the Clipboard Format Tag starts in the
-     * <code>byte[]</code> returned by {@link
-     * SummaryInformation#getThumbnail()}</p>
-     */
-    public static final int OFFSET_CFTAG = 4;
-
-    /**
-     * <p>Offset in bytes where the Clipboard Format starts in the
-     * <code>byte[]</code> returned by {@link
-     * SummaryInformation#getThumbnail()}</p>
-     *
-     * <p>This is only valid if the Clipboard Format Tag is {@link
-     * #CFTAG_WINDOWS}</p>
-     */
-    public static final int OFFSET_CF = 8;
-
-    /**
-     * <p>Offset in bytes where the Windows Metafile (WMF) image data
-     * starts in the <code>byte[]</code> returned by {@link
-     * SummaryInformation#getThumbnail()}</p>
-     *
-     * <p>There is only WMF data at this point in the
-     * <code>byte[]</code> if the Clipboard Format Tag is {@link
-     * #CFTAG_WINDOWS} and the Clipboard Format is {@link
-     * #CF_METAFILEPICT}.</p>
-     *
-     * <p>Note: The <code>byte[]</code> that starts at
-     * <code>OFFSET_WMFDATA</code> and ends at
-     * <code>getThumbnail().length - 1</code> forms a complete WMF
-     * image. It can be saved to disk with a <code>.wmf</code> file
-     * type and read using a WMF-capable image viewer.</p>
-     */
-    public static final int OFFSET_WMFDATA = 20;
-
-    /**
-     * <p>Clipboard Format Tag - Windows clipboard format</p>
-     *
-     * <p>A <code>DWORD</code> indicating a built-in Windows clipboard
-     * format value</p>
-     */
-    public static final int CFTAG_WINDOWS = -1;
-
-    /**
-     * <p>Clipboard Format Tag - Macintosh clipboard format</p>
-     *
-     * <p>A <code>DWORD</code> indicating a Macintosh clipboard format
-     * value</p>
-     */
-    public static final int CFTAG_MACINTOSH = -2;
-
-    /**
-     * <p>Clipboard Format Tag - Format ID</p>
-     *
-     * <p>A GUID containing a format identifier (FMTID). This is
-     * rarely used.</p>
-     */
-    public static final int CFTAG_FMTID = -3;
-
-    /**
-     * <p>Clipboard Format Tag - No Data</p>
-     *
-     * <p>A <code>DWORD</code> indicating No data. This is rarely
-     * used.</p>
-     */
-    public static final int CFTAG_NODATA = 0;
-
-    /**
-     * <p>Clipboard Format - Windows metafile format. This is the
-     * recommended way to store thumbnails in Property Streams.</p>
-     *
-     * <p><strong>Note:</strong> This is not the same format used in
-     * regular WMF images. The clipboard version of this format has an
-     * extra clipboard-specific header.</p>
-     */
-    public static final int CF_METAFILEPICT = 3;
-
-    /**
-     * <p>Clipboard Format - Device Independent Bitmap</p>
-     */
-    public static final int CF_DIB = 8;
-
-    /**
-     * <p>Clipboard Format - Enhanced Windows metafile format</p>
-     */
-    public static final int CF_ENHMETAFILE = 14;
-
-    /**
-     * <p>Clipboard Format - Bitmap</p>
-     */
-    public static final int CF_BITMAP = 2;
-
-    /**
-     * <p>A <code>byte[]</code> to hold a thumbnail image in ({@link
-     * Variant#VT_CF VT_CF}) format.</p>
-     */
-    private byte[] _thumbnailData = null;
-
-
-
-    /**
-     * <p>Default Constructor. If you use it then one you'll have to add
-     * the thumbnail <code>byte[]</code> from {@link
-     * SummaryInformation#getThumbnail()} to do any useful
-     * manipulations, otherwise you'll get a
-     * <code>NullPointerException</code>.</p>
-     */
-    public Thumbnail()
-    {
-        super();
-    }
-
-
-
-    /**
-     * <p>Creates a <code>Thumbnail</code> instance and initializes
-     * with the specified image bytes.</p>
-     *
-     * @param thumbnailData The thumbnail data
-     */
-    public Thumbnail(final byte[] thumbnailData)
-    {
-        this._thumbnailData = thumbnailData;
-    }
-
-
-
-    /**
-     * <p>Returns the thumbnail as a <code>byte[]</code> in {@link
-     * Variant#VT_CF VT_CF} format.</p>
-     *
-     * @return The thumbnail value
-     * @see SummaryInformation#getThumbnail()
-     */
-    public byte[] getThumbnail()
-    {
-        return _thumbnailData;
-    }
-
-
-
-    /**
-     * <p>Sets the Thumbnail's underlying <code>byte[]</code> in
-     * {@link Variant#VT_CF VT_CF} format.</p>
-     *
-     * @param thumbnail The new thumbnail value
-     * @see SummaryInformation#getThumbnail()
-     */
-    public void setThumbnail(final byte[] thumbnail)
-    {
-        this._thumbnailData = thumbnail;
-    }
-
-
-
-    /**
-     * <p>Returns an <code>int</code> representing the Clipboard
-     * Format Tag</p>
-     *
-     * <p>Possible return values are:</p>
-     * <ul>
-     *  <li>{@link #CFTAG_WINDOWS CFTAG_WINDOWS}</li>
-     *  <li>{@link #CFTAG_MACINTOSH CFTAG_MACINTOSH}</li>
-     *  <li>{@link #CFTAG_FMTID CFTAG_FMTID}</li>
-     *  <li>{@link #CFTAG_NODATA CFTAG_NODATA}</li>
-     * </ul>
-     *
-     * @return A flag indicating the Clipboard Format Tag
-     */
-    public long getClipboardFormatTag()
-    {
-        long clipboardFormatTag = LittleEndian.getInt(getThumbnail(),
-                                                       OFFSET_CFTAG);
-        return clipboardFormatTag;
-    }
-
-
-
-    /**
-     * <p>Returns an <code>int</code> representing the Clipboard
-     * Format</p>
-     *
-     * <p>Will throw an exception if the Thumbnail's Clipboard Format
-     * Tag is not {@link Thumbnail#CFTAG_WINDOWS CFTAG_WINDOWS}.</p>
-     *
-     * <p>Possible return values are:</p>
-     *
-     * <ul>
-     *  <li>{@link #CF_METAFILEPICT CF_METAFILEPICT}</li>
-     *  <li>{@link #CF_DIB CF_DIB}</li>
-     *  <li>{@link #CF_ENHMETAFILE CF_ENHMETAFILE}</li>
-     *  <li>{@link #CF_BITMAP CF_BITMAP}</li>
-     * </ul>
-     *
-     * @return a flag indicating the Clipboard Format
-     * @throws HPSFException if the Thumbnail isn't CFTAG_WINDOWS
-     */
-    public long getClipboardFormat() throws HPSFException
-    {
-        if (!(getClipboardFormatTag() == CFTAG_WINDOWS))
-            throw new HPSFException("Clipboard Format Tag of Thumbnail must " +
-                                    "be CFTAG_WINDOWS.");
-
-        return LittleEndian.getInt(getThumbnail(), OFFSET_CF);
-    }
-
-
-
-    /**
-     * <p>Returns the Thumbnail as a <code>byte[]</code> of WMF data
-     * if the Thumbnail's Clipboard Format Tag is {@link
-     * #CFTAG_WINDOWS CFTAG_WINDOWS} and its Clipboard Format is
-     * {@link #CF_METAFILEPICT CF_METAFILEPICT}</p> <p>This
-     * <code>byte[]</code> is in the traditional WMF file, not the
-     * clipboard-specific version with special headers.</p>
-     *
-     * <p>See <a href="http://www.wvware.com/caolan/ora-wmf.html"
-     * target="_blank">http://www.wvware.com/caolan/ora-wmf.html</a>
-     * for more information on the WMF image format.</p>
-     *
-     * @return A WMF image of the Thumbnail
-     * @throws HPSFException if the Thumbnail isn't CFTAG_WINDOWS and
-     * CF_METAFILEPICT
-     */
-    public byte[] getThumbnailAsWMF() throws HPSFException
-    {
-        if (!(getClipboardFormatTag() == CFTAG_WINDOWS))
-            throw new HPSFException("Clipboard Format Tag of Thumbnail must " +
-                                    "be CFTAG_WINDOWS.");
-        if (!(getClipboardFormat() == CF_METAFILEPICT)) {
-            throw new HPSFException("Clipboard Format of Thumbnail must " +
-                                    "be CF_METAFILEPICT.");
-        }
-        byte[] thumbnail = getThumbnail();
-        int wmfImageLength = thumbnail.length - OFFSET_WMFDATA;
-        byte[] wmfImage = new byte[wmfImageLength];
-        System.arraycopy(thumbnail,
-                         OFFSET_WMFDATA,
-                         wmfImage,
-                         0,
-                         wmfImageLength);
-        return wmfImage;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/TypeWriter.java b/trunk/src/java/org/apache/poi/hpsf/TypeWriter.java
deleted file mode 100644
index 16270eb..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/TypeWriter.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * <p>Class for writing little-endian data and more.</p>
- */
-public class TypeWriter
-{
-
-    /**
-     * <p>Writes a two-byte value (short) to an output stream.</p>
-     *
-     * @param out The stream to write to.
-     * @param n The value to write.
-     * @return The number of bytes that have been written.
-     * @exception IOException if an I/O error occurs
-     */
-    public static int writeToStream( final OutputStream out, final short n )
-            throws IOException
-    {
-        LittleEndian.putShort( out, n ); // FIXME: unsigned
-        return LittleEndian.SHORT_SIZE;
-    }
-
-    /**
-     * <p>Writes a four-byte value to an output stream.</p>
-     *
-     * @param out The stream to write to.
-     * @param n The value to write.
-     * @exception IOException if an I/O error occurs
-     * @return The number of bytes written to the output stream. 
-     */
-    public static int writeToStream( final OutputStream out, final int n )
-            throws IOException
-    {
-        LittleEndian.putInt( n, out );
-        return LittleEndian.INT_SIZE;
-    }
-
-    /**
-     * <p>Writes a eight-byte value to an output stream.</p>
-     *
-     * @param out The stream to write to.
-     * @param n The value to write.
-     * @exception IOException if an I/O error occurs
-     * @return The number of bytes written to the output stream.
-     */
-    public static int writeToStream( final OutputStream out, final long n )
-            throws IOException
-    {
-        LittleEndian.putLong( n, out );
-        return LittleEndian.LONG_SIZE;
-    }
-
-    /**
-     * <p>Writes an unsigned two-byte value to an output stream.</p>
-     *
-     * @param out The stream to write to
-     * @param n The value to write
-     * @exception IOException if an I/O error occurs
-     */
-    public static void writeUShortToStream( final OutputStream out, final int n )
-            throws IOException
-    {
-        int high = n & 0xFFFF0000;
-        if ( high != 0 )
-            throw new IllegalPropertySetDataException( "Value " + n
-                    + " cannot be represented by 2 bytes." );
-        LittleEndian.putUShort( n, out );
-    }
-
-    /**
-     * <p>Writes an unsigned four-byte value to an output stream.</p>
-     *
-     * @param out The stream to write to.
-     * @param n The value to write.
-     * @return The number of bytes that have been written to the output stream.
-     * @exception IOException if an I/O error occurs
-     */
-    public static int writeUIntToStream( final OutputStream out, final long n )
-            throws IOException
-    {
-        long high = n & 0xFFFFFFFF00000000L;
-        if ( high != 0 && high != 0xFFFFFFFF00000000L )
-            throw new IllegalPropertySetDataException( "Value " + n
-                    + " cannot be represented by 4 bytes." );
-        LittleEndian.putUInt( n, out );
-        return LittleEndian.INT_SIZE;
-    }
-
-    /**
-     * <p>Writes a 16-byte {@link ClassID} to an output stream.</p>
-     *
-     * @param out The stream to write to
-     * @param n The value to write
-     * @return The number of bytes written
-     * @exception IOException if an I/O error occurs
-     */
-    public static int writeToStream(final OutputStream out, final ClassID n)
-        throws IOException
-    {
-        byte[] b = new byte[16];
-        n.write(b, 0);
-        out.write(b, 0, b.length);
-        return b.length;
-    }
-
-
-
-    /**
-     * <p>Writes an array of {@link Property} instances to an output stream
-     * according to the Horrible Property Stream Format.</p>
-     * 
-     * @param out The stream to write to
-     * @param properties The array to write to the stream
-     * @param codepage The codepage number to use for writing strings
-     * @exception IOException if an I/O error occurs
-     * @throws UnsupportedVariantTypeException if HPSF does not support some
-     *         variant type.
-     */
-    public static void writeToStream(final OutputStream out,
-                                     final Property[] properties,
-                                     final int codepage)
-        throws IOException, UnsupportedVariantTypeException
-    {
-        /* If there are no properties don't write anything. */
-        if (properties == null)
-            return;
-
-        /* Write the property list. This is a list containing pairs of property
-         * ID and offset into the stream. */
-        for (int i = 0; i < properties.length; i++)
-        {
-            final Property p = properties[i];
-            writeUIntToStream(out, p.getID());
-            writeUIntToStream(out, p.getSize());
-        }
-
-        /* Write the properties themselves. */
-        for (int i = 0; i < properties.length; i++)
-        {
-            final Property p = properties[i];
-            long type = p.getType();
-            writeUIntToStream(out, type);
-            VariantSupport.write(out, (int) type, p.getValue(), codepage);
-        }
-    }
-
-
-
-    /**
-     * <p>Writes a double value value to an output stream.</p>
-     *
-     * @param out The stream to write to.
-     * @param n The value to write.
-     * @exception IOException if an I/O error occurs
-     * @return The number of bytes written to the output stream. 
-     */
-    public static int writeToStream( final OutputStream out, final double n )
-            throws IOException
-    {
-        LittleEndian.putDouble( n, out );
-        return LittleEndian.DOUBLE_SIZE;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/TypedPropertyValue.java b/trunk/src/java/org/apache/poi/hpsf/TypedPropertyValue.java
deleted file mode 100644
index 3093a10..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/TypedPropertyValue.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-class TypedPropertyValue
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( TypedPropertyValue.class );
-
-    private int _type;
-
-    private Object _value;
-
-    TypedPropertyValue()
-    {
-    }
-
-    TypedPropertyValue( byte[] data, int startOffset )
-    {
-        read( data, startOffset );
-    }
-
-    TypedPropertyValue( int type, Object value )
-    {
-        _type = type;
-        _value = value;
-    }
-
-    Object getValue()
-    {
-        return _value;
-    }
-
-    int read( byte[] data, int startOffset )
-    {
-        int offset = startOffset;
-
-        _type = LittleEndian.getShort( data, offset );
-        offset += LittleEndian.SHORT_SIZE;
-
-        short padding = LittleEndian.getShort( data, offset );
-        offset += LittleEndian.SHORT_SIZE;
-        if ( padding != 0 )
-        {
-            logger.log( POILogger.WARN, "TypedPropertyValue padding at offset "
-                    + offset + " MUST be 0, but it's value is " + padding );
-        }
-
-        offset += readValue( data, offset );
-
-        return offset - startOffset;
-    }
-
-    int readValue( byte[] data, int offset ) // NOSONAR
-    {
-        switch ( _type )
-        {
-        case Variant.VT_EMPTY:
-        case Variant.VT_NULL:
-            _value = null;
-            return 0;
-
-        case Variant.VT_R4:
-        case Variant.VT_I2:
-            _value = Short.valueOf( LittleEndian.getShort( data, offset ) );
-            return 4;
-
-        case Variant.VT_INT:
-        case Variant.VT_I4:
-            _value = Integer.valueOf( LittleEndian.getInt( data, offset ) );
-            return 4;
-
-        case Variant.VT_R8:
-            _value = Double.valueOf( LittleEndian.getDouble( data, offset ) );
-            return 8;
-
-        case Variant.VT_CY:
-            _value = new Currency( data, offset );
-            return Currency.SIZE;
-
-        case Variant.VT_DATE:
-            _value = new Date( data, offset );
-            return Date.SIZE;
-
-        case Variant.VT_BSTR:
-            _value = new CodePageString( data, offset );
-            return ( (CodePageString) _value ).getSize();
-
-        case Variant.VT_BOOL:
-            _value = new VariantBool( data, offset );
-            return VariantBool.SIZE;
-
-        case Variant.VT_DECIMAL:
-            _value = new Decimal( data, offset );
-            return Decimal.SIZE;
-
-        case Variant.VT_I1:
-            _value = Byte.valueOf( data[offset] );
-            return 1;
-
-        case Variant.VT_UI1:
-            _value = Short.valueOf( LittleEndian.getUByte( data, offset ) );
-            return 2;
-
-        case Variant.VT_UI2:
-            _value = Integer.valueOf( LittleEndian.getUShort( data, offset ) );
-            return 4;
-
-        case Variant.VT_UINT:
-        case Variant.VT_UI4:
-        case Variant.VT_ERROR:
-            _value = Long.valueOf( LittleEndian.getUInt( data, offset ) );
-            return 4;
-
-        case Variant.VT_I8:
-            _value = Long.valueOf( LittleEndian.getLong( data, offset ) );
-            return 8;
-
-        case Variant.VT_UI8:
-            _value = LittleEndian.getByteArray( data, offset, 8 );
-            return 8;
-
-        case Variant.VT_LPSTR:
-            _value = new CodePageString( data, offset );
-            return ( (CodePageString) _value ).getSize();
-
-        case Variant.VT_LPWSTR:
-            _value = new UnicodeString( data, offset );
-            return ( (UnicodeString) _value ).getSize();
-
-        case Variant.VT_FILETIME:
-            _value = new Filetime( data, offset );
-            return Filetime.SIZE;
-
-        case Variant.VT_BLOB:
-            _value = new Blob( data, offset );
-            return ( (Blob) _value ).getSize();
-
-        case Variant.VT_STREAM:
-        case Variant.VT_STORAGE:
-        case Variant.VT_STREAMED_OBJECT:
-        case Variant.VT_STORED_OBJECT:
-            _value = new IndirectPropertyName( data, offset );
-            return ( (IndirectPropertyName) _value ).getSize();
-
-        case Variant.VT_BLOB_OBJECT:
-            _value = new Blob( data, offset );
-            return ( (Blob) _value ).getSize();
-
-        case Variant.VT_CF:
-            _value = new ClipboardData( data, offset );
-            return ( (ClipboardData) _value ).getSize();
-
-        case Variant.VT_CLSID:
-            _value = new GUID( data, offset );
-            return GUID.SIZE;
-
-        case Variant.VT_VERSIONED_STREAM:
-            _value = new VersionedStream( data, offset );
-            return ( (VersionedStream) _value ).getSize();
-
-        case Variant.VT_VECTOR | Variant.VT_I2:
-        case Variant.VT_VECTOR | Variant.VT_I4:
-        case Variant.VT_VECTOR | Variant.VT_R4:
-        case Variant.VT_VECTOR | Variant.VT_R8:
-        case Variant.VT_VECTOR | Variant.VT_CY:
-        case Variant.VT_VECTOR | Variant.VT_DATE:
-        case Variant.VT_VECTOR | Variant.VT_BSTR:
-        case Variant.VT_VECTOR | Variant.VT_ERROR:
-        case Variant.VT_VECTOR | Variant.VT_BOOL:
-        case Variant.VT_VECTOR | Variant.VT_VARIANT:
-        case Variant.VT_VECTOR | Variant.VT_I1:
-        case Variant.VT_VECTOR | Variant.VT_UI1:
-        case Variant.VT_VECTOR | Variant.VT_UI2:
-        case Variant.VT_VECTOR | Variant.VT_UI4:
-        case Variant.VT_VECTOR | Variant.VT_I8:
-        case Variant.VT_VECTOR | Variant.VT_UI8:
-        case Variant.VT_VECTOR | Variant.VT_LPSTR:
-        case Variant.VT_VECTOR | Variant.VT_LPWSTR:
-        case Variant.VT_VECTOR | Variant.VT_FILETIME:
-        case Variant.VT_VECTOR | Variant.VT_CF:
-        case Variant.VT_VECTOR | Variant.VT_CLSID:
-            _value = new Vector( (short) ( _type & 0x0FFF ) );
-            return ( (Vector) _value ).read( data, offset );
-
-        case Variant.VT_ARRAY | Variant.VT_I2:
-        case Variant.VT_ARRAY | Variant.VT_I4:
-        case Variant.VT_ARRAY | Variant.VT_R4:
-        case Variant.VT_ARRAY | Variant.VT_R8:
-        case Variant.VT_ARRAY | Variant.VT_CY:
-        case Variant.VT_ARRAY | Variant.VT_DATE:
-        case Variant.VT_ARRAY | Variant.VT_BSTR:
-        case Variant.VT_ARRAY | Variant.VT_ERROR:
-        case Variant.VT_ARRAY | Variant.VT_BOOL:
-        case Variant.VT_ARRAY | Variant.VT_VARIANT:
-        case Variant.VT_ARRAY | Variant.VT_DECIMAL:
-        case Variant.VT_ARRAY | Variant.VT_I1:
-        case Variant.VT_ARRAY | Variant.VT_UI1:
-        case Variant.VT_ARRAY | Variant.VT_UI2:
-        case Variant.VT_ARRAY | Variant.VT_UI4:
-        case Variant.VT_ARRAY | Variant.VT_INT:
-        case Variant.VT_ARRAY | Variant.VT_UINT:
-            _value = new Array();
-            return ( (Array) _value ).read( data, offset );
-
-        default:
-            throw new UnsupportedOperationException(
-                    "Unknown (possibly, incorrect) TypedPropertyValue type: "
-                            + _type );
-        }
-    }
-
-    int readValuePadded( byte[] data, int offset )
-    {
-        int nonPadded = readValue( data, offset );
-        return ( nonPadded & 0x03 ) == 0 ? nonPadded : nonPadded
-                + ( 4 - ( nonPadded & 0x03 ) );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java b/trunk/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
deleted file mode 100644
index 54efe0f..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown if a certain type of property set is
- * expected (e.g. a Document Summary Information) but the provided
- * property set is not of that type.</p>
- *
- * <p>The constructors of this class are analogous to those of its
- * superclass and documented there.</p>
- */
-public class UnexpectedPropertySetTypeException extends HPSFException
-{
-
-    /**
-     * <p>Creates an {@link UnexpectedPropertySetTypeException}.</p>
-     */
-    public UnexpectedPropertySetTypeException()
-    {
-        super();
-    }
-
-
-    /**
-     * <p>Creates an {@link UnexpectedPropertySetTypeException} with a message
-     * string.</p>
-     *
-     * @param msg The message string.
-     */
-    public UnexpectedPropertySetTypeException(final String msg)
-    {
-        super(msg);
-    }
-
-
-    /**
-     * <p>Creates a new {@link UnexpectedPropertySetTypeException} with a
-     * reason.</p>
-     *
-     * @param reason The reason, i.e. a throwable that indirectly
-     * caused this exception.
-     */
-    public UnexpectedPropertySetTypeException(final Throwable reason)
-    {
-        super(reason);
-    }
-
-
-    /**
-     * <p>Creates an {@link UnexpectedPropertySetTypeException} with a message
-     * string and a reason.</p>
-     *
-     * @param msg The message string.
-     * @param reason The reason, i.e. a throwable that indirectly
-     * caused this exception.
-     */
-    public UnexpectedPropertySetTypeException(final String msg,
-                                              final Throwable reason)
-    {
-        super(msg, reason);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/UnicodeString.java b/trunk/src/java/org/apache/poi/hpsf/UnicodeString.java
deleted file mode 100644
index 0d3cdbf..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/UnicodeString.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-@Internal
-class UnicodeString {
-    private final static POILogger logger = 
-            POILogFactory.getLogger( UnicodeString.class );
-
-    private byte[] _value;
-
-    UnicodeString(byte[] data, int offset) {
-        int length = LittleEndian.getInt( data, offset );
-        int dataOffset = offset + LittleEndian.INT_SIZE;
-        
-        if (! validLength(length, data, dataOffset)) {
-            // If the length looks wrong, this might be because the offset is sometimes expected 
-            // to be on a 4 byte boundary. Try checking with that if so, rather than blowing up with
-            // and  ArrayIndexOutOfBoundsException below
-            boolean valid = false;
-            int past4byte = offset % 4;
-            if (past4byte != 0) {
-                offset = offset + past4byte;
-                length = LittleEndian.getInt( data, offset );
-                dataOffset = offset + LittleEndian.INT_SIZE;
-                
-                valid = validLength(length, data, dataOffset);
-            }
-            
-            if (!valid) {
-                throw new IllegalPropertySetDataException(
-                        "UnicodeString started at offset #" + offset +
-                        " is not NULL-terminated" );
-            }
-        }
-
-        if ( length == 0 )
-        {
-            _value = new byte[0];
-            return;
-        }
-
-        _value = LittleEndian.getByteArray( data, dataOffset, length * 2 );
-    }
-    
-    /**
-     * Checks to see if the specified length seems valid,
-     *  given the amount of data available still to read,
-     *  and the requirement that the string be NULL-terminated
-     */
-    boolean validLength(int length, byte[] data, int offset) {
-        if (length == 0) {
-            return true;
-        }
-
-        int endOffset = offset + (length * 2);
-        if (endOffset <= data.length) {
-            // Data Length is OK, ensure it's null terminated too
-            if (data[endOffset-1] == 0 && data[endOffset-2] == 0) {
-                // Length looks plausible
-                return true;
-            }
-        }
-
-        // Something's up/invalid with that length for the given data+offset
-        return false;
-    }
-
-    int getSize()
-    {
-        return LittleEndian.INT_SIZE + _value.length;
-    }
-
-    byte[] getValue()
-    {
-        return _value;
-    }
-
-    String toJavaString()
-    {
-        if ( _value.length == 0 )
-            return null;
-
-        String result = StringUtil.getFromUnicodeLE( _value, 0,
-                _value.length >> 1 );
-
-        final int terminator = result.indexOf( '\0' );
-        if ( terminator == -1 )
-        {
-            logger.log(
-                    POILogger.WARN,
-                    "String terminator (\\0) for UnicodeString property value not found."
-                            + "Continue without trimming and hope for the best." );
-            return result;
-        }
-        if ( terminator != result.length() - 1 )
-        {
-            logger.log(
-                    POILogger.WARN,
-                    "String terminator (\\0) for UnicodeString property value occured before the end of string. "
-                            + "Trimming and hope for the best." );
-        }
-        return result.substring( 0, terminator );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java b/trunk/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
deleted file mode 100644
index 12afdcb..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.HexDump;
-
-/**
- * <p>This exception is thrown if HPSF encounters a variant type that isn't
- * supported yet. Although a variant type is unsupported the value can still be
- * retrieved using the {@link VariantTypeException#getValue} method.</p>
- * 
- * <p>Obviously this class should disappear some day.</p>
- */
-public abstract class UnsupportedVariantTypeException
-extends VariantTypeException
-{
-
-    /**
-     * <p>Constructor.</p>
-     * 
-     * @param variantType The unsupported variant type
-     * @param value The value who's variant type is not yet supported
-     */
-    public UnsupportedVariantTypeException(final long variantType,
-                                           final Object value)
-    {
-        super(variantType, value,
-              "HPSF does not yet support the variant type " + variantType + 
-              " (" + Variant.getVariantName(variantType) + ", " +
-              HexDump.toHex(variantType) + "). If you want support for " +
-              "this variant type in one of the next POI releases please " +
-              "submit a request for enhancement (RFE) to " +
-              "<http://issues.apache.org/bugzilla/>! Thank you!");
-    }
-
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Util.java b/trunk/src/java/org/apache/poi/hpsf/Util.java
deleted file mode 100644
index 5d75cb9..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Util.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Date;
-
-import org.apache.poi.util.SuppressForbidden;
-
-/**
- * <p>Provides various static utility methods.</p>
- */
-public class Util
-{
-
-    /**
-     * <p>Checks whether two byte arrays <var>a</var> and <var>b</var>
-     * are equal. They are equal</p>
-     *
-     * <ul>
-     *
-     *  <li><p>if they have the same length and</p></li>
-     *
-     *  <li><p>if for each <var>i</var> with
-     *  <var>i</var>&nbsp;&gt;=&nbsp;0 and
-     *  <var>i</var>&nbsp;&lt;&nbsp;<var>a.length</var> holds
-     *  <var>a</var>[<var>i</var>]&nbsp;== <var>b</var>[<var>i</var>].</p></li>
-     *
-     * </ul>
-     *
-     * @param a The first byte array
-     * @param b The first byte array
-     * @return <code>true</code> if the byte arrays are equal, else
-     * <code>false</code>
-     */
-    public static boolean equal(final byte[] a, final byte[] b)
-    {
-        if (a.length != b.length)
-            return false;
-        for (int i = 0; i < a.length; i++)
-            if (a[i] != b[i])
-                return false;
-        return true;
-    }
-
-
-
-    /**
-     * <p>Copies a part of a byte array into another byte array.</p>
-     *
-     * @param src The source byte array.
-     * @param srcOffset Offset in the source byte array.
-     * @param length The number of bytes to copy.
-     * @param dst The destination byte array.
-     * @param dstOffset Offset in the destination byte array.
-     */
-    public static void copy(final byte[] src, final int srcOffset,
-                            final int length, final byte[] dst,
-                            final int dstOffset)
-    {
-        for (int i = 0; i < length; i++)
-            dst[dstOffset + i] = src[srcOffset + i];
-    }
-
-
-
-    /**
-     * <p>Concatenates the contents of several byte arrays into a
-     * single one.</p>
-     *
-     * @param byteArrays The byte arrays to be concatened.
-     * @return A new byte array containing the concatenated byte
-     * arrays.
-     */
-    public static byte[] cat(final byte[][] byteArrays)
-    {
-        int capacity = 0;
-        for (int i = 0; i < byteArrays.length; i++)
-            capacity += byteArrays[i].length;
-        final byte[] result = new byte[capacity];
-        int r = 0;
-        for (int i = 0; i < byteArrays.length; i++)
-            for (int j = 0; j < byteArrays[i].length; j++)
-                result[r++] = byteArrays[i][j];
-        return result;
-    }
-
-
-
-    /**
-     * <p>Copies bytes from a source byte array into a new byte
-     * array.</p>
-     *
-     * @param src Copy from this byte array.
-     * @param offset Start copying here.
-     * @param length Copy this many bytes.
-     * @return The new byte array. Its length is number of copied bytes.
-     */
-    public static byte[] copy(final byte[] src, final int offset,
-                              final int length)
-    {
-        final byte[] result = new byte[length];
-        copy(src, offset, length, result, 0);
-        return result;
-    }
-
-
-
-    /**
-     * <p>The difference between the Windows epoch (1601-01-01
-     * 00:00:00) and the Unix epoch (1970-01-01 00:00:00) in
-     * milliseconds: 11644473600000L. (Use your favorite spreadsheet
-     * program to verify the correctness of this value. By the way,
-     * did you notice that you can tell from the epochs which
-     * operating system is the modern one? :-))</p>
-     */
-    public static final long EPOCH_DIFF = 11644473600000L;
-
-
-    /**
-     * <p>Converts a Windows FILETIME into a {@link Date}. The Windows
-     * FILETIME structure holds a date and time associated with a
-     * file. The structure identifies a 64-bit integer specifying the
-     * number of 100-nanosecond intervals which have passed since
-     * January 1, 1601. This 64-bit value is split into the two double
-     * words stored in the structure.</p>
-     *
-     * @param high The higher double word of the FILETIME structure.
-     * @param low The lower double word of the FILETIME structure.
-     * @return The Windows FILETIME as a {@link Date}.
-     */
-    public static Date filetimeToDate(final int high, final int low)
-    {
-        final long filetime = ((long) high) << 32 | (low & 0xffffffffL);
-        return filetimeToDate(filetime);
-    }
-
-    /**
-     * <p>Converts a Windows FILETIME into a {@link Date}. The Windows
-     * FILETIME structure holds a date and time associated with a
-     * file. The structure identifies a 64-bit integer specifying the
-     * number of 100-nanosecond intervals which have passed since
-     * January 1, 1601.</p>
-     *
-     * @param filetime The filetime to convert.
-     * @return The Windows FILETIME as a {@link Date}.
-     */
-    public static Date filetimeToDate(final long filetime)
-    {
-        final long ms_since_16010101 = filetime / (1000 * 10);
-        final long ms_since_19700101 = ms_since_16010101 - EPOCH_DIFF;
-        return new Date(ms_since_19700101);
-    }
-
-
-
-    /**
-     * <p>Converts a {@link Date} into a filetime.</p>
-     *
-     * @param date The date to be converted
-     * @return The filetime
-     *
-     * @see #filetimeToDate(long)
-     * @see #filetimeToDate(int, int)
-     */
-    public static long dateToFileTime(final Date date)
-    {
-        long ms_since_19700101 = date.getTime();
-        long ms_since_16010101 = ms_since_19700101 + EPOCH_DIFF;
-        return ms_since_16010101 * (1000 * 10);
-    }
-
-
-    /**
-     * <p>Checks whether two collections are equal. Two collections
-     * C<sub>1</sub> and C<sub>2</sub> are equal, if the following conditions
-     * are true:</p>
-     *
-     * <ul>
-     *
-     * <li><p>For each c<sub>1<em>i</em></sub> (element of C<sub>1</sub>) there
-     * is a c<sub>2<em>j</em></sub> (element of C<sub>2</sub>), and
-     * c<sub>1<em>i</em></sub> equals c<sub>2<em>j</em></sub>.</p></li>
-     *
-     * <li><p>For each c<sub>2<em>i</em></sub> (element of C<sub>2</sub>) there
-     * is a c<sub>1<em>j</em></sub> (element of C<sub>1</sub>) and
-     * c<sub>2<em>i</em></sub> equals c<sub>1<em>j</em></sub>.</p></li>
-     *
-     * </ul>
-     *
-     * @param c1 the first collection
-     * @param c2 the second collection
-     * @return <code>true</code> if the collections are equal, else
-     * <code>false</code>.
-     */
-    public static boolean equals(Collection<?> c1, Collection<?> c2)
-    {
-        Object[] o1 = c1.toArray();
-        Object[] o2 = c2.toArray();
-        return internalEquals(o1, o2);
-    }
-
-
-
-    /**
-     * <p>Compares to object arrays with regarding the objects' order. For
-     * example, [1, 2, 3] and [2, 1, 3] are equal.</p>
-     *
-     * @param c1 The first object array.
-     * @param c2 The second object array.
-     * @return <code>true</code> if the object arrays are equal,
-     * <code>false</code> if they are not.
-     */
-    public static boolean equals(Object[] c1, Object[] c2)
-    {
-        final Object[] o1 = c1.clone();
-        final Object[] o2 = c2.clone();
-        return internalEquals(o1, o2);
-    }
-
-    private static boolean internalEquals(Object[] o1, Object[] o2)
-    {
-        for (int i1 = 0; i1 < o1.length; i1++)
-        {
-            final Object obj1 = o1[i1];
-            boolean matchFound = false;
-            for (int i2 = 0; !matchFound && i2 < o1.length; i2++)
-            {
-                final Object obj2 = o2[i2];
-                if (obj1.equals(obj2))
-                {
-                    matchFound = true;
-                    o2[i2] = null;
-                }
-            }
-            if (!matchFound)
-                return false;
-        }
-        return true;
-    }
-
-
-
-    /**
-     * <p>Pads a byte array with 0x00 bytes so that its length is a multiple of
-     * 4.</p>
-     *
-     * @param ba The byte array to pad.
-     * @return The padded byte array.
-     */
-    public static byte[] pad4(final byte[] ba)
-    {
-        final int PAD = 4;
-        final byte[] result;
-        int l = ba.length % PAD;
-        if (l == 0)
-            result = ba;
-        else
-        {
-            l = PAD - l;
-            result = new byte[ba.length + l];
-            System.arraycopy(ba, 0, result, 0, ba.length);
-        }
-        return result;
-    }
-
-
-
-    /**
-     * <p>Pads a character array with 0x0000 characters so that its length is a
-     * multiple of 4.</p>
-     *
-     * @param ca The character array to pad.
-     * @return The padded character array.
-     */
-    public static char[] pad4(final char[] ca)
-    {
-        final int PAD = 4;
-        final char[] result;
-        int l = ca.length % PAD;
-        if (l == 0)
-            result = ca;
-        else
-        {
-            l = PAD - l;
-            result = new char[ca.length + l];
-            System.arraycopy(ca, 0, result, 0, ca.length);
-        }
-        return result;
-    }
-
-
-
-    /**
-     * <p>Pads a string with 0x0000 characters so that its length is a
-     * multiple of 4.</p>
-     *
-     * @param s The string to pad.
-     * @return The padded string as a character array.
-     */
-    public static char[] pad4(final String s)
-    {
-        return pad4(s.toCharArray());
-    }
-
-
-
-    /**
-     * <p>Returns a textual representation of a {@link Throwable}, including a
-     * stacktrace.</p>
-     *
-     * @param t The {@link Throwable}
-     *
-     * @return a string containing the output of a call to
-     * <code>t.printStacktrace()</code>.
-     */
-    @SuppressForbidden("uses printStackTrace")
-    public static String toString(final Throwable t)
-    {
-        final StringWriter sw = new StringWriter();
-        final PrintWriter pw = new PrintWriter(sw);
-        t.printStackTrace(pw);
-        pw.close();
-        try
-        {
-            sw.close();
-            return sw.toString();
-        }
-        catch (IOException e)
-        {
-            final StringBuffer b = new StringBuffer(t.getMessage());
-            b.append("\n");
-            b.append("Could not create a stacktrace. Reason: ");
-            b.append(e.getMessage());
-            return b.toString();
-        }
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Variant.java b/trunk/src/java/org/apache/poi/hpsf/Variant.java
deleted file mode 100644
index 3f60604..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Variant.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>The <em>Variant</em> types as defined by Microsoft's COM. I
- * found this information in <a
- * href="http://www.marin.clara.net/COM/variant_type_definitions.htm">
- * http://www.marin.clara.net/COM/variant_type_definitions.htm</a>.</p>
- *
- * <p>In the variant types descriptions the following shortcuts are
- * used: <strong> [V]</strong> - may appear in a VARIANT,
- * <strong>[T]</strong> - may appear in a TYPEDESC,
- * <strong>[P]</strong> - may appear in an OLE property set,
- * <strong>[S]</strong> - may appear in a Safe Array.</p>
- */
-public class Variant
-{
-
-    /**
-     * <p>[V][P] Nothing, i.e. not a single byte of data.</p>
-     */
-    public static final int VT_EMPTY = 0;
-
-    /**
-     * <p>[V][P] SQL style Null.</p>
-     */
-    public static final int VT_NULL = 1;
-
-    /**
-     * <p>[V][T][P][S] 2 byte signed int.</p>
-     */
-    public static final int VT_I2 = 2;
-
-    /**
-     * <p>[V][T][P][S] 4 byte signed int.</p>
-     */
-    public static final int VT_I4 = 3;
-
-    /**
-     * <p>[V][T][P][S] 4 byte real.</p>
-     */
-    public static final int VT_R4 = 4;
-
-    /**
-     * <p>[V][T][P][S] 8 byte real.</p>
-     */
-    public static final int VT_R8 = 5;
-
-    /**
-     * <p>[V][T][P][S] currency. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_CY = 6;
-
-    /**
-     * <p>[V][T][P][S] date. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_DATE = 7;
-
-    /**
-     * <p>[V][T][P][S] OLE Automation string. <span
-     * style="background-color: #ffff00">How long is this? How is it
-     * to be interpreted?</span></p>
-     */
-    public static final int VT_BSTR = 8;
-
-    /**
-     * <p>[V][T][P][S] IDispatch *. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_DISPATCH = 9;
-
-    /**
-     * <p>[V][T][S] SCODE. <span style="background-color: #ffff00">How
-     * long is this? How is it to be interpreted?</span></p>
-     */
-    public static final int VT_ERROR = 10;
-
-    /**
-     * <p>[V][T][P][S] True=-1, False=0.</p>
-     */
-    public static final int VT_BOOL = 11;
-
-    /**
-     * <p>[V][T][P][S] VARIANT *. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_VARIANT = 12;
-
-    /**
-     * <p>[V][T][S] IUnknown *. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_UNKNOWN = 13;
-
-    /**
-     * <p>[V][T][S] 16 byte fixed point.</p>
-     */
-    public static final int VT_DECIMAL = 14;
-
-    /**
-     * <p>[T] signed char.</p>
-     */
-    public static final int VT_I1 = 16;
-
-    /**
-     * <p>[V][T][P][S] unsigned char.</p>
-     */
-    public static final int VT_UI1 = 17;
-
-    /**
-     * <p>[T][P] unsigned short.</p>
-     */
-    public static final int VT_UI2 = 18;
-
-    /**
-     * <p>[T][P] unsigned int.</p>
-     */
-    public static final int VT_UI4 = 19;
-
-    /**
-     * <p>[T][P] signed 64-bit int.</p>
-     */
-    public static final int VT_I8 = 20;
-
-    /**
-     * <p>[T][P] unsigned 64-bit int.</p>
-     */
-    public static final int VT_UI8 = 21;
-
-    /**
-     * <p>[T] signed machine int.</p>
-     */
-    public static final int VT_INT = 22;
-
-    /**
-     * <p>[T] unsigned machine int.</p>
-     */
-    public static final int VT_UINT = 23;
-
-    /**
-     * <p>[T] C style void.</p>
-     */
-    public static final int VT_VOID = 24;
-
-    /**
-     * <p>[T] Standard return type. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_HRESULT = 25;
-
-    /**
-     * <p>[T] pointer type. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_PTR = 26;
-
-    /**
-     * <p>[T] (use VT_ARRAY in VARIANT).</p>
-     */
-    public static final int VT_SAFEARRAY = 27;
-
-    /**
-     * <p>[T] C style array. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_CARRAY = 28;
-
-    /**
-     * <p>[T] user defined type. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_USERDEFINED = 29;
-
-    /**
-     * <p>[T][P] null terminated string.</p>
-     */
-    public static final int VT_LPSTR = 30;
-
-    /**
-     * <p>[T][P] wide (Unicode) null terminated string.</p>
-     */
-    public static final int VT_LPWSTR = 31;
-
-    /**
-     * <p>[P] FILETIME. The FILETIME structure holds a date and time
-     * associated with a file. The structure identifies a 64-bit
-     * integer specifying the number of 100-nanosecond intervals which
-     * have passed since January 1, 1601. This 64-bit value is split
-     * into the two dwords stored in the structure.</p>
-     */
-    public static final int VT_FILETIME = 64;
-
-    /**
-     * <p>[P] Length prefixed bytes.</p>
-     */
-    public static final int VT_BLOB = 65;
-
-    /**
-     * <p>[P] Name of the stream follows.</p>
-     */
-    public static final int VT_STREAM = 66;
-
-    /**
-     * <p>[P] Name of the storage follows.</p>
-     */
-    public static final int VT_STORAGE = 67;
-
-    /**
-     * <p>[P] Stream contains an object. <span
-     * style="background-color: #ffff00"> How long is this? How is it
-     * to be interpreted?</span></p>
-     */
-    public static final int VT_STREAMED_OBJECT = 68;
-
-    /**
-     * <p>[P] Storage contains an object. <span
-     * style="background-color: #ffff00"> How long is this? How is it
-     * to be interpreted?</span></p>
-     */
-    public static final int VT_STORED_OBJECT = 69;
-
-    /**
-     * <p>[P] Blob contains an object. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_BLOB_OBJECT = 70;
-
-    /**
-     * <p>[P] Clipboard format. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_CF = 71;
-
-    /**
-     * <p>[P] A Class ID.</p>
-     *
-     * <p>It consists of a 32 bit unsigned integer indicating the size
-     * of the structure, a 32 bit signed integer indicating (Clipboard
-     * Format Tag) indicating the type of data that it contains, and
-     * then a byte array containing the data.</p>
-     *
-     * <p>The valid Clipboard Format Tags are:</p>
-     *
-     * <ul>
-     *  <li>{@link Thumbnail#CFTAG_WINDOWS}</li>
-     *  <li>{@link Thumbnail#CFTAG_MACINTOSH}</li>
-     *  <li>{@link Thumbnail#CFTAG_NODATA}</li>
-     *  <li>{@link Thumbnail#CFTAG_FMTID}</li>
-     * </ul>
-     *
-     * <pre>typedef struct tagCLIPDATA {
-     * // cbSize is the size of the buffer pointed to
-     * // by pClipData, plus sizeof(ulClipFmt)
-     * ULONG              cbSize;
-     * long               ulClipFmt;
-     * BYTE*              pClipData;
-     * } CLIPDATA;</pre>
-     *
-     * <p>See <a
-     * href="msdn.microsoft.com/library/en-us/com/stgrstrc_0uwk.asp"
-     * target="_blank">
-     * msdn.microsoft.com/library/en-us/com/stgrstrc_0uwk.asp</a>.</p>
-     */
-    public static final int VT_CLSID = 72;
-
-    /**
-     * "MUST be a VersionedStream. The storage representing the (non-simple)
-     * property set MUST have a stream element with the name in the StreamName
-     * field." -- [MS-OLEPS] -- v20110920; Object Linking and Embedding (OLE)
-     * Property Set Data Structures; page 24 / 63
-     */
-    public static final int VT_VERSIONED_STREAM = 0x0049;
-
-    /**
-     * <p>[P] simple counted array. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_VECTOR = 0x1000;
-
-    /**
-     * <p>[V] SAFEARRAY*. <span style="background-color: #ffff00">How
-     * long is this? How is it to be interpreted?</span></p>
-     */
-    public static final int VT_ARRAY = 0x2000;
-
-    /**
-     * <p>[V] void* for local use. <span style="background-color:
-     * #ffff00">How long is this? How is it to be
-     * interpreted?</span></p>
-     */
-    public static final int VT_BYREF = 0x4000;
-
-    /**
-     * <p>FIXME (3): Document this!</p>
-     */
-    public static final int VT_RESERVED = 0x8000;
-
-    /**
-     * <p>FIXME (3): Document this!</p>
-     */
-    public static final int VT_ILLEGAL = 0xFFFF;
-
-    /**
-     * <p>FIXME (3): Document this!</p>
-     */
-    public static final int VT_ILLEGALMASKED = 0xFFF;
-
-    /**
-     * <p>FIXME (3): Document this!</p>
-     */
-    public static final int VT_TYPEMASK = 0xFFF;
-
-
-
-    /**
-     * <p>Maps the numbers denoting the variant types to their corresponding
-     * variant type names.</p>
-     */
-    private static Map<Long,String> numberToName;
-
-    private static Map<Long,Integer> numberToLength;
-
-    /**
-     * <p>Denotes a variant type with a length that is unknown to HPSF yet.</p>
-     */
-    public static final Integer LENGTH_UNKNOWN = Integer.valueOf(-2);
-
-    /**
-     * <p>Denotes a variant type with a variable length.</p>
-     */
-    public static final Integer LENGTH_VARIABLE = Integer.valueOf(-1);
-
-    /**
-     * <p>Denotes a variant type with a length of 0 bytes.</p>
-     */
-    public static final Integer LENGTH_0 = Integer.valueOf(0);
-
-    /**
-     * <p>Denotes a variant type with a length of 2 bytes.</p>
-     */
-    public static final Integer LENGTH_2 = Integer.valueOf(2);
-
-    /**
-     * <p>Denotes a variant type with a length of 4 bytes.</p>
-     */
-    public static final Integer LENGTH_4 = Integer.valueOf(4);
-
-    /**
-     * <p>Denotes a variant type with a length of 8 bytes.</p>
-     */
-    public static final Integer LENGTH_8 = Integer.valueOf(8);
-
-
-
-    static
-    {
-        /* Initialize the number-to-name map: */
-        Map<Long,String> tm1 = new HashMap<Long,String>();
-        tm1.put(Long.valueOf(0), "VT_EMPTY");
-        tm1.put(Long.valueOf(1), "VT_NULL");
-        tm1.put(Long.valueOf(2), "VT_I2");
-        tm1.put(Long.valueOf(3), "VT_I4");
-        tm1.put(Long.valueOf(4), "VT_R4");
-        tm1.put(Long.valueOf(5), "VT_R8");
-        tm1.put(Long.valueOf(6), "VT_CY");
-        tm1.put(Long.valueOf(7), "VT_DATE");
-        tm1.put(Long.valueOf(8), "VT_BSTR");
-        tm1.put(Long.valueOf(9), "VT_DISPATCH");
-        tm1.put(Long.valueOf(10), "VT_ERROR");
-        tm1.put(Long.valueOf(11), "VT_BOOL");
-        tm1.put(Long.valueOf(12), "VT_VARIANT");
-        tm1.put(Long.valueOf(13), "VT_UNKNOWN");
-        tm1.put(Long.valueOf(14), "VT_DECIMAL");
-        tm1.put(Long.valueOf(16), "VT_I1");
-        tm1.put(Long.valueOf(17), "VT_UI1");
-        tm1.put(Long.valueOf(18), "VT_UI2");
-        tm1.put(Long.valueOf(19), "VT_UI4");
-        tm1.put(Long.valueOf(20), "VT_I8");
-        tm1.put(Long.valueOf(21), "VT_UI8");
-        tm1.put(Long.valueOf(22), "VT_INT");
-        tm1.put(Long.valueOf(23), "VT_UINT");
-        tm1.put(Long.valueOf(24), "VT_VOID");
-        tm1.put(Long.valueOf(25), "VT_HRESULT");
-        tm1.put(Long.valueOf(26), "VT_PTR");
-        tm1.put(Long.valueOf(27), "VT_SAFEARRAY");
-        tm1.put(Long.valueOf(28), "VT_CARRAY");
-        tm1.put(Long.valueOf(29), "VT_USERDEFINED");
-        tm1.put(Long.valueOf(30), "VT_LPSTR");
-        tm1.put(Long.valueOf(31), "VT_LPWSTR");
-        tm1.put(Long.valueOf(64), "VT_FILETIME");
-        tm1.put(Long.valueOf(65), "VT_BLOB");
-        tm1.put(Long.valueOf(66), "VT_STREAM");
-        tm1.put(Long.valueOf(67), "VT_STORAGE");
-        tm1.put(Long.valueOf(68), "VT_STREAMED_OBJECT");
-        tm1.put(Long.valueOf(69), "VT_STORED_OBJECT");
-        tm1.put(Long.valueOf(70), "VT_BLOB_OBJECT");
-        tm1.put(Long.valueOf(71), "VT_CF");
-        tm1.put(Long.valueOf(72), "VT_CLSID");
-        Map<Long,String> tm2 = new HashMap<Long,String>(tm1.size(), 1.0F);
-        tm2.putAll(tm1);
-        numberToName = Collections.unmodifiableMap(tm2);
-
-        /* Initialize the number-to-length map: */
-        Map<Long,Integer> tm3 = new HashMap<Long,Integer>();
-        tm3.put(Long.valueOf(0), LENGTH_0);
-        tm3.put(Long.valueOf(1), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(2), LENGTH_2);
-        tm3.put(Long.valueOf(3), LENGTH_4);
-        tm3.put(Long.valueOf(4), LENGTH_4);
-        tm3.put(Long.valueOf(5), LENGTH_8);
-        tm3.put(Long.valueOf(6), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(7), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(8), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(9), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(10), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(11), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(12), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(13), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(14), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(16), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(17), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(18), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(19), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(20), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(21), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(22), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(23), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(24), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(25), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(26), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(27), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(28), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(29), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(30), LENGTH_VARIABLE);
-        tm3.put(Long.valueOf(31), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(64), LENGTH_8);
-        tm3.put(Long.valueOf(65), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(66), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(67), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(68), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(69), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(70), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(71), LENGTH_UNKNOWN);
-        tm3.put(Long.valueOf(72), LENGTH_UNKNOWN);
-        Map<Long,Integer> tm4 = new HashMap<Long,Integer>(tm1.size(), 1.0F);
-        tm4.putAll(tm3);
-        numberToLength = Collections.unmodifiableMap(tm4);
-    }
-
-
-
-    /**
-     * <p>Returns the variant type name associated with a variant type
-     * number.</p>
-     *
-     * @param variantType The variant type number
-     * @return The variant type name or the string "unknown variant type"
-     */
-    public static String getVariantName(final long variantType)
-    {
-        final String name = numberToName.get(Long.valueOf(variantType));
-        return name != null ? name : "unknown variant type";
-    }
-
-    /**
-     * <p>Returns a variant type's length.</p>
-     *
-     * @param variantType The variant type number
-     * @return The length of the variant type's data in bytes. If the length is
-     * variable, i.e. the length of a string, -1 is returned. If HPSF does not
-     * know the length, -2 is returned. The latter usually indicates an
-     * unsupported variant type.
-     */
-    public static int getVariantLength(final long variantType)
-    {
-        final Long key = Long.valueOf((int) variantType);
-        final Integer length = numberToLength.get(key);
-        if (length == null)
-            return -2;
-        return length.intValue();
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/VariantBool.java b/trunk/src/java/org/apache/poi/hpsf/VariantBool.java
deleted file mode 100644
index 962674d..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/VariantBool.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-class VariantBool {
-    private final static POILogger logger = POILogFactory.getLogger( VariantBool.class );
-
-    static final int SIZE = 2;
-
-    private boolean _value;
-
-    VariantBool( byte[] data, int offset ) {
-        short value = LittleEndian.getShort( data, offset );
-        switch (value) {
-            case 0:
-                _value = false;
-                break;
-            case -1:
-                _value = true;
-                break;
-            default:
-                logger.log( POILogger.WARN, "VARIANT_BOOL value '"+value+"' is incorrect" );
-                _value = true;
-                break;
-        }
-    }
-
-    boolean getValue() {
-        return _value;
-    }
-
-    void setValue( boolean value ) {
-        this._value = value;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java b/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
deleted file mode 100644
index b4816eb..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * <p>Supports reading and writing of variant data.</p>
- *
- * <p><strong>FIXME (3):</strong> Reading and writing should be made more
- * uniform than it is now. The following items should be resolved:
- *
- * <ul>
- *
- * <li><p>Reading requires a length parameter that is 4 byte greater than the
- * actual data, because the variant type field is included. </p></li>
- *
- * <li><p>Reading reads from a byte array while writing writes to an byte array
- * output stream.</p></li>
- *
- * </ul>
- */
-public class VariantSupport extends Variant
-{
-	private static final POILogger logger = POILogFactory.getLogger(VariantSupport.class);
-    private static boolean logUnsupportedTypes = false;
-
-    /**
-     * <p>Specifies whether warnings about unsupported variant types are to be
-     * written to <code>System.err</code> or not.</p>
-     *
-     * @param logUnsupportedTypes If <code>true</code> warnings will be written,
-     * if <code>false</code> they won't.
-     */
-    public static void setLogUnsupportedTypes(final boolean logUnsupportedTypes)
-    {
-        VariantSupport.logUnsupportedTypes = logUnsupportedTypes;
-    }
-
-    /**
-     * <p>Checks whether logging of unsupported variant types warning is turned
-     * on or off.</p>
-     *
-     * @return <code>true</code> if logging is turned on, else
-     * <code>false</code>.
-     */
-    public static boolean isLogUnsupportedTypes()
-    {
-        return logUnsupportedTypes;
-    }
-
-
-
-    /**
-     * <p>Keeps a list of the variant types an "unsupported" message has already
-     * been issued for.</p>
-     */
-    protected static List<Long> unsupportedMessage;
-
-    /**
-     * <p>Writes a warning to <code>System.err</code> that a variant type is
-     * unsupported by HPSF. Such a warning is written only once for each variant
-     * type. Log messages can be turned on or off by </p>
-     *
-     * @param ex The exception to log
-     */
-    protected static void writeUnsupportedTypeMessage
-        (final UnsupportedVariantTypeException ex)
-    {
-        if (isLogUnsupportedTypes())
-        {
-            if (unsupportedMessage == null)
-                unsupportedMessage = new LinkedList<Long>();
-            Long vt = Long.valueOf(ex.getVariantType());
-            if (!unsupportedMessage.contains(vt))
-            {
-            	logger.log( POILogger.ERROR, ex.getMessage());
-                unsupportedMessage.add(vt);
-            }
-        }
-    }
-
-
-    /**
-     * <p>HPSF is able to read these {@link Variant} types.</p>
-     */
-    final static public int[] SUPPORTED_TYPES = { Variant.VT_EMPTY,
-            Variant.VT_I2, Variant.VT_I4, Variant.VT_I8, Variant.VT_R8,
-            Variant.VT_FILETIME, Variant.VT_LPSTR, Variant.VT_LPWSTR,
-            Variant.VT_CF, Variant.VT_BOOL };
-
-
-
-    /**
-     * <p>Checks whether HPSF supports the specified variant type. Unsupported
-     * types should be implemented included in the {@link #SUPPORTED_TYPES}
-     * array.</p>
-     *
-     * @see Variant
-     * @param variantType the variant type to check
-     * @return <code>true</code> if HPFS supports this type, else
-     *         <code>false</code>
-     */
-    public boolean isSupportedType(final int variantType)
-    {
-        for (int i = 0; i < SUPPORTED_TYPES.length; i++)
-            if (variantType == SUPPORTED_TYPES[i])
-                return true;
-        return false;
-    }
-
-
-
-    /**
-     * <p>Reads a variant type from a byte array.</p>
-     *
-     * @param src The byte array
-     * @param offset The offset in the byte array where the variant starts
-     * @param length The length of the variant including the variant type field
-     * @param type The variant type to read
-     * @param codepage The codepage to use for non-wide strings
-     * @return A Java object that corresponds best to the variant field. For
-     *         example, a VT_I4 is returned as a {@link Long}, a VT_LPSTR as a
-     *         {@link String}.
-     * @exception ReadingNotSupportedException if a property is to be written
-     *            who's variant type HPSF does not yet support
-     * @exception UnsupportedEncodingException if the specified codepage is not
-     *            supported.
-     * @see Variant
-     */
-    public static Object read( final byte[] src, final int offset,
-            final int length, final long type, final int codepage )
-            throws ReadingNotSupportedException, UnsupportedEncodingException
-    {
-        TypedPropertyValue typedPropertyValue = new TypedPropertyValue(
-                (int) type, null );
-        int unpadded;
-        try
-        {
-            unpadded = typedPropertyValue.readValue( src, offset );
-        }
-        catch ( UnsupportedOperationException exc )
-        {
-            int propLength = Math.min( length, src.length - offset );
-            final byte[] v = new byte[propLength];
-            System.arraycopy( src, offset, v, 0, propLength );
-            throw new ReadingNotSupportedException( type, v );
-        }
-
-        switch ( (int) type )
-        {
-        case Variant.VT_EMPTY:
-        case Variant.VT_I4:
-        case Variant.VT_I8:
-        case Variant.VT_R8:
-            /*
-             * we have more property types that can be converted into Java
-             * objects, but current API need to be preserved, and it returns
-             * other types as byte arrays. In future major versions it shall be
-             * changed -- sergey
-             */
-            return typedPropertyValue.getValue();
-
-        case Variant.VT_I2:
-        {
-            /*
-             * also for backward-compatibility with prev. versions of POI
-             * --sergey
-             */
-            return Integer.valueOf( ( (Short) typedPropertyValue.getValue() )
-                    .intValue() );
-        }
-        case Variant.VT_FILETIME:
-        {
-            Filetime filetime = (Filetime) typedPropertyValue.getValue();
-            return Util.filetimeToDate( (int) filetime.getHigh(),
-                    (int) filetime.getLow() );
-        }
-        case Variant.VT_LPSTR:
-        {
-            CodePageString string = (CodePageString) typedPropertyValue
-                    .getValue();
-            return string.getJavaValue( codepage );
-        }
-        case Variant.VT_LPWSTR:
-        {
-            UnicodeString string = (UnicodeString) typedPropertyValue
-                    .getValue();
-            return string.toJavaString();
-        }
-        case Variant.VT_CF:
-        {
-            // if(l1 < 0) {
-            /**
-             * YK: reading the ClipboardData packet (VT_CF) is not quite
-             * correct. The size of the data is determined by the first four
-             * bytes of the packet while the current implementation calculates
-             * it in the Section constructor. Test files in Bugzilla 42726 and
-             * 45583 clearly show that this approach does not always work. The
-             * workaround below attempts to gracefully handle such cases instead
-             * of throwing exceptions.
-             * 
-             * August 20, 2009
-             */
-            // l1 = LittleEndian.getInt(src, o1); o1 += LittleEndian.INT_SIZE;
-            // }
-            // final byte[] v = new byte[l1];
-            // System.arraycopy(src, o1, v, 0, v.length);
-            // value = v;
-            // break;
-            ClipboardData clipboardData = (ClipboardData) typedPropertyValue
-                    .getValue();
-            return clipboardData.toByteArray();
-        }
-
-        case Variant.VT_BOOL:
-        {
-            VariantBool bool = (VariantBool) typedPropertyValue.getValue();
-            return Boolean.valueOf( bool.getValue() );
-        }
-
-        default:
-        {
-            /*
-             * it is not very good, but what can do without breaking current
-             * API? --sergey
-             */
-            final byte[] v = new byte[unpadded];
-            System.arraycopy( src, offset, v, 0, unpadded );
-            throw new ReadingNotSupportedException( type, v );
-        }
-        }
-    }
-
-    /**
-     * <p>Turns a codepage number into the equivalent character encoding's
-     * name.</p>
-     *
-     * @param codepage The codepage number
-     *
-     * @return The character encoding's name. If the codepage number is 65001,
-     * the encoding name is "UTF-8". All other positive numbers are mapped to
-     * "cp" followed by the number, e.g. if the codepage number is 1252 the
-     * returned character encoding name will be "cp1252".
-     *
-     * @exception UnsupportedEncodingException if the specified codepage is
-     * less than zero.
-     */
-    public static String codepageToEncoding(final int codepage)
-    throws UnsupportedEncodingException
-    {
-        return CodePageUtil.codepageToEncoding(codepage);
-    }
-
-
-    /**
-     * <p>Writes a variant value to an output stream. This method ensures that
-     * always a multiple of 4 bytes is written.</p>
-     *
-     * <p>If the codepage is UTF-16, which is encouraged, strings
-     * <strong>must</strong> always be written as {@link Variant#VT_LPWSTR}
-     * strings, not as {@link Variant#VT_LPSTR} strings. This method ensure this
-     * by converting strings appropriately, if needed.</p>
-     *
-     * @param out The stream to write the value to.
-     * @param type The variant's type.
-     * @param value The variant's value.
-     * @param codepage The codepage to use to write non-wide strings
-     * @return The number of entities that have been written. In many cases an
-     * "entity" is a byte but this is not always the case.
-     * @exception IOException if an I/O exceptions occurs
-     * @exception WritingNotSupportedException if a property is to be written
-     * who's variant type HPSF does not yet support
-     */
-    public static int write(final OutputStream out, final long type,
-                            final Object value, final int codepage)
-        throws IOException, WritingNotSupportedException
-    {
-        int length = 0;
-        switch ((int) type)
-        {
-            case Variant.VT_BOOL:
-            {
-                if ( ( (Boolean) value ).booleanValue() )
-                {
-                    out.write( 0xff );
-                    out.write( 0xff );
-                }
-                else
-                {
-                    out.write( 0x00 );
-                    out.write( 0x00 );
-                }
-                length += 2;
-                break;
-            }
-            case Variant.VT_LPSTR:
-            {
-                CodePageString codePageString = new CodePageString( (String) value,
-                        codepage );
-                length += codePageString.write( out );
-                break;
-            }
-            case Variant.VT_LPWSTR:
-            {
-                final int nrOfChars = ( (String) value ).length() + 1;
-                length += TypeWriter.writeUIntToStream( out, nrOfChars );
-                char[] s = ( (String) value ).toCharArray();
-                for ( int i = 0; i < s.length; i++ )
-                {
-                    final int high = ( ( s[i] & 0x0000ff00 ) >> 8 );
-                    final int low = ( s[i] & 0x000000ff );
-                    final byte highb = (byte) high;
-                    final byte lowb = (byte) low;
-                    out.write( lowb );
-                    out.write( highb );
-                    length += 2;
-                }
-                // NullTerminator
-                out.write( 0x00 );
-                out.write( 0x00 );
-                length += 2;
-                break;
-            }
-            case Variant.VT_CF:
-            {
-                final byte[] b = (byte[]) value;
-                out.write(b);
-                length = b.length;
-                break;
-            }
-            case Variant.VT_EMPTY:
-            {
-                length += TypeWriter.writeUIntToStream( out, Variant.VT_EMPTY );
-                break;
-            }
-            case Variant.VT_I2:
-            {
-                length += TypeWriter.writeToStream( out,
-                        ( (Integer) value ).shortValue() );
-                break;
-            }
-            case Variant.VT_I4:
-            {
-                if (!(value instanceof Integer))
-                {
-                    throw new ClassCastException("Could not cast an object to "
-                            + Integer.class.toString() + ": "
-                            + value.getClass().toString() + ", "
-                            + value.toString());
-                }
-                length += TypeWriter.writeToStream(out,
-                          ((Integer) value).intValue());
-                break;
-            }
-            case Variant.VT_I8:
-            {
-                length += TypeWriter.writeToStream(out, ((Long) value).longValue());
-                break;
-            }
-            case Variant.VT_R8:
-            {
-                length += TypeWriter.writeToStream(out,
-                          ((Double) value).doubleValue());
-                break;
-            }
-            case Variant.VT_FILETIME:
-            {
-                long filetime = Util.dateToFileTime((Date) value);
-                int high = (int) ((filetime >> 32) & 0x00000000FFFFFFFFL);
-                int low = (int) (filetime & 0x00000000FFFFFFFFL);
-                Filetime filetimeValue = new Filetime( low, high);
-                length += filetimeValue.write( out );
-                break;
-            }
-            default:
-            {
-                /* The variant type is not supported yet. However, if the value
-                 * is a byte array we can write it nevertheless. */
-                if (value instanceof byte[])
-                {
-                    final byte[] b = (byte[]) value;
-                    out.write(b);
-                    length = b.length;
-                    writeUnsupportedTypeMessage
-                        (new WritingNotSupportedException(type, value));
-                }
-                else
-                    throw new WritingNotSupportedException(type, value);
-                break;
-            }
-        }
-
-        /* pad values to 4-bytes */
-        while ( ( length & 0x3 ) != 0 )
-        {
-            out.write( 0x00 );
-            length++;
-        }
-
-        return length;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/VariantTypeException.java b/trunk/src/java/org/apache/poi/hpsf/VariantTypeException.java
deleted file mode 100644
index c2d2e8f..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/VariantTypeException.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown if HPSF encounters a problem with a variant type.
- * Concrete subclasses specifiy the problem further.</p>
- */
-public abstract class VariantTypeException extends HPSFException
-{
-
-    private Object value;
-
-    private long variantType;
-
-
-
-    /**
-     * <p>Constructor.</p>
-     *
-     * @param variantType The variant type causing the problem
-     * @param value The value who's variant type causes the problem
-     * @param msg A message text describing the problem
-     */
-    public VariantTypeException(final long variantType, final Object value,
-                                final String msg)
-    {
-        super(msg);
-        this.variantType = variantType;
-        this.value = value;
-    }
-
-
-
-    /**
-     * <p>Returns the offending variant type.</p>
-     *
-     * @return the offending variant type.
-     */
-    public long getVariantType()
-    {
-        return variantType;
-    }
-
-
-
-    /**
-     * <p>Returns the value who's variant type caused the problem.</p>
-     *
-     * @return the value who's variant type caused the problem
-     */
-    public Object getValue()
-    {
-        return value;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/Vector.java b/trunk/src/java/org/apache/poi/hpsf/Vector.java
deleted file mode 100644
index a1ddb08..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/Vector.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Holder for vector-type properties
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-class Vector
-{
-    private final short _type;
-
-    private TypedPropertyValue[] _values;
-
-    Vector( byte[] data, int startOffset, short type )
-    {
-        this._type = type;
-        read( data, startOffset );
-    }
-
-    Vector( short type )
-    {
-        this._type = type;
-    }
-
-    int read( byte[] data, int startOffset )
-    {
-        int offset = startOffset;
-
-        final long longLength = LittleEndian.getUInt( data, offset );
-        offset += LittleEndian.INT_SIZE;
-
-        if ( longLength > Integer.MAX_VALUE )
-            throw new UnsupportedOperationException( "Vector is too long -- "
-                    + longLength );
-        final int length = (int) longLength;
-
-        _values = new TypedPropertyValue[length];
-
-        if ( _type == Variant.VT_VARIANT )
-        {
-            for ( int i = 0; i < length; i++ )
-            {
-                TypedPropertyValue value = new TypedPropertyValue();
-                offset += value.read( data, offset );
-                _values[i] = value;
-            }
-        }
-        else
-        {
-            for ( int i = 0; i < length; i++ )
-            {
-                TypedPropertyValue value = new TypedPropertyValue( _type, null );
-                // be aware: not padded here
-                offset += value.readValue( data, offset );
-                _values[i] = value;
-            }
-        }
-        return offset - startOffset;
-    }
-
-    TypedPropertyValue[] getValues(){
-        return _values;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/VersionedStream.java b/trunk/src/java/org/apache/poi/hpsf/VersionedStream.java
deleted file mode 100644
index c3c066e..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/VersionedStream.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-class VersionedStream
-{
-    private GUID _versionGuid;
-    private IndirectPropertyName _streamName;
-
-    VersionedStream( byte[] data, int offset )
-    {
-        _versionGuid = new GUID( data, offset );
-        _streamName = new IndirectPropertyName( data, offset + GUID.SIZE );
-    }
-
-    int getSize()
-    {
-        return GUID.SIZE + _streamName.getSize();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java b/trunk/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java
deleted file mode 100644
index d409999..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf;
-
-/**
- * <p>This exception is thrown when trying to write a (yet) unsupported variant
- * type.</p>
- * 
- * @see ReadingNotSupportedException
- * @see UnsupportedVariantTypeException
- */
-public class WritingNotSupportedException
-    extends UnsupportedVariantTypeException
-{
-
-    /**
-     * <p>Constructor</p>
-     * 
-     * @param variantType The unsupported variant type.
-     * @param value The value.
-     */
-    public WritingNotSupportedException(final long variantType,
-                                        final Object value)
-    {
-        super(variantType, value);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java b/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
deleted file mode 100644
index fc526ee..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.extractor;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.poi.POIDocument;
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.hpsf.CustomProperties;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.HPSFPropertiesOnlyDocument;
-import org.apache.poi.hpsf.Property;
-import org.apache.poi.hpsf.SpecialPropertySet;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Extracts all of the HPSF properties, both
- *  build in and custom, returning them in
- *  textual form.
- */
-public class HPSFPropertiesExtractor extends POIOLE2TextExtractor {
-    public HPSFPropertiesExtractor(POIOLE2TextExtractor mainExtractor) {
-        super(mainExtractor);
-    }
-    public HPSFPropertiesExtractor(POIDocument doc) {
-        super(doc);
-    }
-    public HPSFPropertiesExtractor(POIFSFileSystem fs) {
-        super(new HPSFPropertiesOnlyDocument(fs));
-    }
-    public HPSFPropertiesExtractor(NPOIFSFileSystem fs) {
-        super(new HPSFPropertiesOnlyDocument(fs));
-    }
-
-    public String getDocumentSummaryInformationText() {
-        if(document == null) {  // event based extractor does not have a document
-            return "";
-        }
-
-        DocumentSummaryInformation dsi = document.getDocumentSummaryInformation();
-        StringBuilder text = new StringBuilder();
-
-        // Normal properties
-        text.append( getPropertiesText(dsi) );
-
-        // Now custom ones
-        CustomProperties cps = dsi == null ? null : dsi.getCustomProperties();
-        if (cps != null) {
-            for (String key : cps.nameSet()) {
-                String val = HelperPropertySet.getPropertyValueText(cps.get(key));
-                text.append(key).append(" = ").append(val).append("\n");
-            }
-        }
-
-        // All done
-        return text.toString();
-    }
-    public String getSummaryInformationText() {
-        if(document == null) {  // event based extractor does not have a document
-            return "";
-        }
-
-        SummaryInformation si = document.getSummaryInformation();
-
-        // Just normal properties
-        return getPropertiesText(si);
-    }
-
-    private static String getPropertiesText(SpecialPropertySet ps) {
-        if (ps == null) {
-            // Not defined, oh well
-            return "";
-        }
-
-        StringBuilder text = new StringBuilder();
-
-        PropertyIDMap idMap = ps.getPropertySetIDMap();
-        Property[] props = ps.getProperties();
-        for (Property prop : props) {
-            String type = Long.toString(prop.getID());
-            Object typeObj = idMap.get(prop.getID());
-            if (typeObj != null) {
-                type = typeObj.toString();
-            }
-
-            String val = HelperPropertySet.getPropertyValueText(prop.getValue());
-            text.append(type).append(" = ").append(val).append("\n");
-        }
-
-        return text.toString();
-    }
-
-    /**
-     * @return the text of all the properties defined in
-     *  the document.
-     */
-    public String getText() {
-        return getSummaryInformationText() + getDocumentSummaryInformationText();
-    }
-
-    /**
-     * Prevent recursion!
-     */
-    public POITextExtractor getMetadataTextExtractor() {
-        throw new IllegalStateException("You already have the Metadata Text Extractor, not recursing!");
-    }
-
-    private static abstract class HelperPropertySet extends SpecialPropertySet {
-        public HelperPropertySet() {
-            super(null);
-        }
-        public static String getPropertyValueText(Object val) {
-            if (val == null) {
-                return "(not set)";
-            }
-            return SpecialPropertySet.getPropertyStringValue(val);
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
-    public static void main(String[] args) throws IOException {
-        for (String file : args) {
-            HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(
-                    new NPOIFSFileSystem(new File(file)));
-            try {
-                System.out.println(ext.getText());
-            } finally {
-                ext.close();
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/package.html b/trunk/src/java/org/apache/poi/hpsf/package.html
deleted file mode 100644
index f5cfe43..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/package.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0//EN//">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
- <head>
-  <title>HPSF</title>
- </head>
-
- <body>
-  <div>
-   <p>Processes streams in the Horrible Property Set Format (HPSF) in POI
-    filesystems. Microsoft Office documents, i.e. POI filesystems, usually
-    contain meta data like author, title, last saving time etc. These items
-    are called <strong>properties</strong> and stored in
-    <strong>property set streams</strong> along with the document itself. These
-    streams are commonly named <tt>\005SummaryInformation</tt> and
-    <tt>\005DocumentSummaryInformation</tt>. However, a POI filesystem may
-    contain further property sets of other names or types.</p>
-
-   <p>In order to extract the properties from a POI filesystem, a property set
-    stream's contents must be parsed into a {@link
-    org.apache.poi.hpsf.PropertySet} instance.  Its subclasses {@link
-    org.apache.poi.hpsf.SummaryInformation} and {@link
-    org.apache.poi.hpsf.DocumentSummaryInformation} deal with the well-known
-    property set streams <tt>\005SummaryInformation</tt> and
-    <tt>\005DocumentSummaryInformation</tt>. (However, the streams' names are
-    irrelevant. What counts is the property set's first section's format ID -
-    see below.)</p>
-
-   <p>The factory method {@link org.apache.poi.hpsf.PropertySetFactory#create}
-    creates a {@link org.apache.poi.hpsf.PropertySet} instance. This method
-    always returns the <strong>most specific property set</strong>: If it
-    identifies the stream data as a Summary Information or as a Document
-    Summary Information it returns an instance of the corresponding class, else
-    the general {@link org.apache.poi.hpsf.PropertySet}.</p>
-
-   <p>A {@link org.apache.poi.hpsf.PropertySet} contains a list of {@link
-    org.apache.poi.hpsf.Section}s which can be retrieved  with {@link
-    org.apache.poi.hpsf.PropertySet#getSections}. Each {@link
-    org.apache.poi.hpsf.Section} contains a {@link
-    org.apache.poi.hpsf.Property} array which can be retrieved with {@link
-    org.apache.poi.hpsf.Section#getProperties}. Since the vast majority of
-    {@link org.apache.poi.hpsf.PropertySet}s contains only a single {@link
-    org.apache.poi.hpsf.Section}, the convenience method {@link
-    org.apache.poi.hpsf.PropertySet#getProperties} returns the properties of a
-    {@link org.apache.poi.hpsf.PropertySet}'s  {@link
-    org.apache.poi.hpsf.Section} (throwing a {@link
-    org.apache.poi.hpsf.NoSingleSectionException} if the {@link
-    org.apache.poi.hpsf.PropertySet} contains more (or less) than exactly one
-    {@link org.apache.poi.hpsf.Section}).</p>
-
-   <p>Each {@link org.apache.poi.hpsf.Property} has an <strong>ID</strong>, a
-    <strong>type</strong>, and a <strong>value</strong> which can be retrieved
-    with {@link org.apache.poi.hpsf.Property#getID}, {@link
-    org.apache.poi.hpsf.Property#getType}, and {@link
-    org.apache.poi.hpsf.Property#getValue}, respectively. The value's class
-    depends on the property's type. <!-- FIXME: --> The current implementation
-    does not yet support all property types and restricts the values' classes
-    to {@link java.lang.String}, {@link java.lang.Integer} and {@link
-    java.util.Date}. A value of a yet unknown type is returned as a byte array
-    containing the value's origin bytes from the property set stream.</p>
-
-   <p>To retrieve the value of a specific {@link org.apache.poi.hpsf.Property},
-    use {@link org.apache.poi.hpsf.Section#getProperty} or {@link
-    org.apache.poi.hpsf.Section#getPropertyIntValue}.</p>
-
-   <p>The {@link org.apache.poi.hpsf.SummaryInformation} and {@link
-    org.apache.poi.hpsf.DocumentSummaryInformation} classes provide convenience
-    methods for retrieving well-known properties. For example, an application
-    that wants to retrieve a document's title string just calls {@link
-    org.apache.poi.hpsf.SummaryInformation#getTitle} instead of going through
-    the hassle of first finding out what the title's property ID is and then
-    using this ID to get the property's value.</p>
-
-   <p>Writing properties can be done with the classes
-    {@link org.apache.poi.hpsf.MutablePropertySet}, {@link
-    org.apache.poi.hpsf.MutableSection}, and {@link
-    org.apache.poi.hpsf.MutableProperty}.</p>
-
-   <p>Public documentation from Microsoft can be found in the  <a 
-    href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/stg/stg/properties_and_property_sets.asp"
-    target="_blank">appropriate section of the MSDN Library</a>.</p>
-
-   <div>
-    <h2>History</h2>
-
-    <dl>
-     <dt>2003-09-11:</dt>
-
-     <dd>
-      <p>{@link org.apache.poi.hpsf.PropertySetFactory#create(InputStream)} no
-       longer throws an
-       {@link org.apache.poi.hpsf.UnexpectedPropertySetTypeException}.</p></dd>
-    </dl>
-   </div>
-
-
-   <div>
-    <h2>To Do</h2>
-
-    <p>The following is still left to be implemented. Sponsering could foster
-     these issues considerably.</p>
-
-    <ul>
-
-     <li>
-      <p>Convenience methods for setting summary information and document
-       summary information properties</p>
-     </li>
-
-     <li>
-      <p>Better codepage support</p>
-     </li>
-
-     <li>
-      <p>Support for more property (variant) types</p>
-     </li>
-
-    </ul>
-
-   </div>
-
-   <p>
-    @author Rainer Klute (klute@rainer-klute.de)
-   </p>
-  </div>
-
- </body>
-</html>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-sgml-default-dtd-file:"HTML_4.0_Strict.ced"
-mode: html
-sgml-omittag:t
-sgml-shorttag:nil
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java b/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
deleted file mode 100644
index 20e6d9f..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.wellknown;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>This is a dictionary which maps property ID values to property
- * ID strings.</p>
- *
- * <p>The methods {@link #getSummaryInformationProperties} and {@link
- * #getDocumentSummaryInformationProperties} return singleton {@link
- * PropertyIDMap}s. An application that wants to extend these maps
- * should treat them as unmodifiable, copy them and modifiy the
- * copies.</p>
- */
-public class PropertyIDMap extends HashMap<Long,String> {
-
-    /*
-     * The following definitions are for property IDs in the first
-     * (and only) section of the Summary Information property set.
-     */
-
-    /** <p>ID of the property that denotes the document's title</p> */
-    public static final int PID_TITLE = 2;
-
-    /** <p>ID of the property that denotes the document's subject</p> */
-    public static final int PID_SUBJECT = 3;
-
-    /** <p>ID of the property that denotes the document's author</p> */
-    public static final int PID_AUTHOR = 4;
-
-    /** <p>ID of the property that denotes the document's keywords</p> */
-    public static final int PID_KEYWORDS = 5;
-
-    /** <p>ID of the property that denotes the document's comments</p> */
-    public static final int PID_COMMENTS = 6;
-
-    /** <p>ID of the property that denotes the document's template</p> */
-    public static final int PID_TEMPLATE = 7;
-
-    /** <p>ID of the property that denotes the document's last author</p> */
-    public static final int PID_LASTAUTHOR = 8;
-
-    /** <p>ID of the property that denotes the document's revision number</p> */
-    public static final int PID_REVNUMBER = 9;
-
-    /** <p>ID of the property that denotes the document's edit time</p> */
-    public static final int PID_EDITTIME = 10;
-
-    /** <p>ID of the property that denotes the date and time the document was
-     * last printed</p> */
-    public static final int PID_LASTPRINTED = 11;
-
-    /** <p>ID of the property that denotes the date and time the document was
-     * created.</p> */
-    public static final int PID_CREATE_DTM = 12;
-
-    /** <p>ID of the property that denotes the date and time the document was
-     * saved</p> */
-    public static final int PID_LASTSAVE_DTM = 13;
-
-    /** <p>ID of the property that denotes the number of pages in the
-     * document</p> */
-    public static final int PID_PAGECOUNT = 14;
-
-    /** <p>ID of the property that denotes the number of words in the
-     * document</p> */
-    public static final int PID_WORDCOUNT = 15;
-
-    /** <p>ID of the property that denotes the number of characters in the
-     * document</p> */
-    public static final int PID_CHARCOUNT = 16;
-
-    /** <p>ID of the property that denotes the document's thumbnail</p> */
-    public static final int PID_THUMBNAIL = 17;
-
-    /** <p>ID of the property that denotes the application that created the
-     * document</p> */
-    public static final int PID_APPNAME = 18;
-
-    /** <p>ID of the property that denotes whether read/write access to the
-     * document is allowed or whether is should be opened as read-only. It can
-     * have the following values:</p>
-     *
-     * <table summary="">
-     *  <tbody>
-     *   <tr>
-     *    <th><p>Value</p></th>
-     *    <th><p>Description</p></th>
-     *   </tr>
-     *   <tr>
-     *    <th><p>0</p></th>
-     *    <th><p>No restriction</p></th>
-     *   </tr>
-     *   <tr>
-     *    <th><p>2</p></th>
-     *    <th><p>Read-only recommended</p></th>
-     *   </tr>
-     *   <tr>
-     *    <th><p>4</p></th>
-     *    <th><p>Read-only enforced</p></th>
-     *   </tr>
-     *  </tbody>
-     * </table>
-     */
-    public static final int PID_SECURITY = 19;
-
-
-
-    /*
-     * The following definitions are for property IDs in the first
-     * section of the Document Summary Information property set.
-     */
-
-    /**
-     * <p>The entry is a dictionary.</p>
-     */
-    public static final int PID_DICTIONARY = 0;
-
-    /**
-     * <p>The entry denotes a code page.</p>
-     */
-    public static final int PID_CODEPAGE = 1;
-
-    /**
-     * <p>The entry is a string denoting the category the file belongs
-     * to, e.g. review, memo, etc. This is useful to find documents of
-     * same type.</p>
-     */
-    public static final int PID_CATEGORY = 2;
-
-    /**
-     * <p>Target format for power point presentation, e.g. 35mm,
-     * printer, video etc.</p>
-     */
-    public static final int PID_PRESFORMAT = 3;
-
-    /**
-     * <p>Number of bytes.</p>
-     */
-    public static final int PID_BYTECOUNT = 4;
-
-    /**
-     * <p>Number of lines.</p>
-     */
-    public static final int PID_LINECOUNT = 5;
-
-    /**
-     * <p>Number of paragraphs.</p>
-     */
-    public static final int PID_PARCOUNT = 6;
-
-    /**
-     * <p>Number of slides in a power point presentation.</p>
-     */
-    public static final int PID_SLIDECOUNT = 7;
-
-    /**
-     * <p>Number of slides with notes.</p>
-     */
-    public static final int PID_NOTECOUNT = 8;
-
-    /**
-     * <p>Number of hidden slides.</p>
-     */
-    public static final int PID_HIDDENCOUNT = 9;
-
-    /**
-     * <p>Number of multimedia clips, e.g. sound or video.</p>
-     */
-    public static final int PID_MMCLIPCOUNT = 10;
-
-    /**
-     * <p>This entry is set to -1 when scaling of the thumbnail is
-     * desired. Otherwise the thumbnail should be cropped.</p>
-     */
-    public static final int PID_SCALE = 11;
-
-    /**
-     * <p>This entry denotes an internally used property. It is a
-     * vector of variants consisting of pairs of a string (VT_LPSTR)
-     * and a number (VT_I4). The string is a heading name, and the
-     * number tells how many document parts are under that
-     * heading.</p>
-     */
-    public static final int PID_HEADINGPAIR = 12;
-
-    /**
-     * <p>This entry contains the names of document parts (word: names
-     * of the documents in the master document, excel: sheet names,
-     * power point: slide titles, binder: document names).</p>
-     */
-    public static final int PID_DOCPARTS = 13;
-
-    /**
-     * <p>This entry contains the name of the project manager.</p>
-     */
-    public static final int PID_MANAGER = 14;
-
-    /**
-     * <p>This entry contains the company name.</p>
-     */
-    public static final int PID_COMPANY = 15;
-
-    /**
-     * <p>If this entry is -1 the links are dirty and should be
-     * re-evaluated.</p>
-     */
-    public static final int PID_LINKSDIRTY = 0x10;
-    
-    /**
-     * <p>The entry specifies an estimate of the number of characters 
-     *  in the document, including whitespace, as an integer
-     */
-    public static final int PID_CCHWITHSPACES = 0x11;
-    
-    // 0x12 Unused
-    // 0x13 GKPIDDSI_SHAREDDOC - Must be False
-    // 0x14 GKPIDDSI_LINKBASE - Must not be written
-    // 0x15 GKPIDDSI_HLINKS - Must not be written
-
-    /**
-     * <p>This entry contains a boolean which marks if the User Defined
-     *  Property Set has been updated outside of the Application, if so the
-     *  hyperlinks should be updated on document load.
-     */
-    public static final int PID_HYPERLINKSCHANGED = 0x16;
-    
-    /**
-     * <p>This entry contains the version of the Application which wrote the
-     *  Property set, stored with the two high order bytes having the major
-     *  version number, and the two low order bytes the minor version number.
-     */
-    public static final int PID_VERSION = 0x17;
-    
-    /**
-     * <p>This entry contains the VBA digital signature for the VBA project 
-     *  embedded in the document.
-     */
-    public static final int PID_DIGSIG = 0x18;
-    
-    // 0x19 Unused
-    
-    /**
-     * <p>This entry contains a string of the content type of the file.
-     */
-    public static final int PID_CONTENTTYPE = 0x1A;
-    
-    /**
-     * <p>This entry contains a string of the document status.
-     */
-    public static final int PID_CONTENTSTATUS = 0x1B;
-    
-    /**
-     * <p>This entry contains a string of the document language, but
-     *  normally should be empty.
-     */
-    public static final int PID_LANGUAGE = 0x1C;
-    
-    /**
-     * <p>This entry contains a string of the document version, but
-     *  normally should be empty
-     */
-    public static final int PID_DOCVERSION = 0x1D;
-    
-    /**
-     * <p>The highest well-known property ID. Applications are free to use 
-     *  higher values for custom purposes. (This value is based on Office 12,
-     *  earlier versions of Office had lower values)</p>
-     */
-    public static final int PID_MAX = 0x1F;
-
-
-
-    /**
-     * <p>Contains the summary information property ID values and
-     * associated strings. See the overall HPSF documentation for
-     * details!</p>
-     */
-    private static PropertyIDMap summaryInformationProperties;
-
-    /**
-     * <p>Contains the summary information property ID values and
-     * associated strings. See the overall HPSF documentation for
-     * details!</p>
-     */
-    private static PropertyIDMap documentSummaryInformationProperties;
-
-
-
-    /**
-     * <p>Creates a {@link PropertyIDMap}.</p>
-     *
-     * @param initialCapacity The initial capacity as defined for
-     * {@link HashMap}
-     * @param loadFactor The load factor as defined for {@link HashMap}
-     */
-    public PropertyIDMap(final int initialCapacity, final float loadFactor)
-    {
-        super(initialCapacity, loadFactor);
-    }
-
-
-
-    /**
-     * <p>Creates a {@link PropertyIDMap} backed by another map.</p>
-     *
-     * @param map The instance to be created is backed by this map.
-     */
-    public PropertyIDMap(final Map<Long,String> map)
-    {
-        super(map);
-    }
-
-
-
-    /**
-     * <p>Puts a ID string for an ID into the {@link
-     * PropertyIDMap}.</p>
-     *
-     * @param id The ID.
-     * @param idString The ID string.
-     * @return As specified by the {@link java.util.Map} interface, this method
-     * returns the previous value associated with the specified
-     * <var>id</var>, or <code>null</code> if there was no mapping for
-     * key.
-     */
-    public Object put(final long id, final String idString)
-    {
-        return put(Long.valueOf(id), idString);
-    }
-
-
-
-    /**
-     * <p>Gets the ID string for an ID from the {@link
-     * PropertyIDMap}.</p>
-     *
-     * @param id The ID.
-     * @return The ID string associated with <var>id</var>.
-     */
-    public Object get(final long id)
-    {
-        return get(Long.valueOf(id));
-    }
-
-
-
-    /**
-     * @return the Summary Information properties singleton
-     */
-    public static PropertyIDMap getSummaryInformationProperties()
-    {
-        if (summaryInformationProperties == null)
-        {
-            PropertyIDMap m = new PropertyIDMap(18, (float) 1.0);
-            m.put(PID_TITLE, "PID_TITLE");
-            m.put(PID_SUBJECT, "PID_SUBJECT");
-            m.put(PID_AUTHOR, "PID_AUTHOR");
-            m.put(PID_KEYWORDS, "PID_KEYWORDS");
-            m.put(PID_COMMENTS, "PID_COMMENTS");
-            m.put(PID_TEMPLATE, "PID_TEMPLATE");
-            m.put(PID_LASTAUTHOR, "PID_LASTAUTHOR");
-            m.put(PID_REVNUMBER, "PID_REVNUMBER");
-            m.put(PID_EDITTIME, "PID_EDITTIME");
-            m.put(PID_LASTPRINTED, "PID_LASTPRINTED");
-            m.put(PID_CREATE_DTM, "PID_CREATE_DTM");
-            m.put(PID_LASTSAVE_DTM, "PID_LASTSAVE_DTM");
-            m.put(PID_PAGECOUNT, "PID_PAGECOUNT");
-            m.put(PID_WORDCOUNT, "PID_WORDCOUNT");
-            m.put(PID_CHARCOUNT, "PID_CHARCOUNT");
-            m.put(PID_THUMBNAIL, "PID_THUMBNAIL");
-            m.put(PID_APPNAME, "PID_APPNAME");
-            m.put(PID_SECURITY, "PID_SECURITY");
-            summaryInformationProperties =
-                new PropertyIDMap(Collections.unmodifiableMap(m));
-        }
-        return summaryInformationProperties;
-    }
-
-
-
-    /**
-     * <p>Returns the Document Summary Information properties
-     * singleton.</p>
-     *
-     * @return The Document Summary Information properties singleton.
-     */
-    public static PropertyIDMap getDocumentSummaryInformationProperties()
-    {
-        if (documentSummaryInformationProperties == null)
-        {
-            PropertyIDMap m = new PropertyIDMap(17, (float) 1.0);
-            m.put(PID_DICTIONARY, "PID_DICTIONARY");
-            m.put(PID_CODEPAGE, "PID_CODEPAGE");
-            m.put(PID_CATEGORY, "PID_CATEGORY");
-            m.put(PID_PRESFORMAT, "PID_PRESFORMAT");
-            m.put(PID_BYTECOUNT, "PID_BYTECOUNT");
-            m.put(PID_LINECOUNT, "PID_LINECOUNT");
-            m.put(PID_PARCOUNT, "PID_PARCOUNT");
-            m.put(PID_SLIDECOUNT, "PID_SLIDECOUNT");
-            m.put(PID_NOTECOUNT, "PID_NOTECOUNT");
-            m.put(PID_HIDDENCOUNT, "PID_HIDDENCOUNT");
-            m.put(PID_MMCLIPCOUNT, "PID_MMCLIPCOUNT");
-            m.put(PID_SCALE, "PID_SCALE");
-            m.put(PID_HEADINGPAIR, "PID_HEADINGPAIR");
-            m.put(PID_DOCPARTS, "PID_DOCPARTS");
-            m.put(PID_MANAGER, "PID_MANAGER");
-            m.put(PID_COMPANY, "PID_COMPANY");
-            m.put(PID_LINKSDIRTY, "PID_LINKSDIRTY");
-            documentSummaryInformationProperties =
-                new PropertyIDMap(Collections.unmodifiableMap(m));
-        }
-        return documentSummaryInformationProperties;
-    }
-
-
-
-    /**
-     * <p>For the most basic testing.</p>
-     *
-     * @param args The command-line arguments
-     */
-    public static void main(final String[] args)
-    {
-        PropertyIDMap s1 = getSummaryInformationProperties();
-        PropertyIDMap s2 = getDocumentSummaryInformationProperties();
-        System.out.println("s1: " + s1);
-        System.out.println("s2: " + s2);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java b/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
deleted file mode 100644
index 1f5760d..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.wellknown;
-
-import java.util.HashMap;
-
-import org.apache.poi.util.StringUtil;
-
-/**
- * <p>Maps section format IDs to {@link PropertyIDMap}s. It is
- * initialized with two well-known section format IDs: those of the
- * <tt>\005SummaryInformation</tt> stream and the
- * <tt>\005DocumentSummaryInformation</tt> stream.</p>
- *
- * <p>If you have a section format ID you can use it as a key to query
- * this map.  If you get a {@link PropertyIDMap} returned your section
- * is well-known and you can query the {@link PropertyIDMap} for PID
- * strings. If you get back <code>null</code> you are on your own.</p>
- *
- * <p>This {@link java.util.Map} expects the byte arrays of section format IDs
- * as keys. A key maps to a {@link PropertyIDMap} describing the
- * property IDs in sections with the specified section format ID.</p>
- */
-@SuppressWarnings({"rawtypes","unchecked"}) // Java Generics have issues on this style of class...
-public class SectionIDMap extends HashMap {
-    /**
-     * <p>The SummaryInformation's section's format ID.</p>
-     */
-    public static final byte[] SUMMARY_INFORMATION_ID = new byte[]
-    {
-        (byte) 0xF2, (byte) 0x9F, (byte) 0x85, (byte) 0xE0,
-        (byte) 0x4F, (byte) 0xF9, (byte) 0x10, (byte) 0x68,
-        (byte) 0xAB, (byte) 0x91, (byte) 0x08, (byte) 0x00,
-        (byte) 0x2B, (byte) 0x27, (byte) 0xB3, (byte) 0xD9
-    };
-
-    /**
-     * <p>The DocumentSummaryInformation's first and second sections' format
-     * ID.</p>
-     */
-    public static final byte[][] DOCUMENT_SUMMARY_INFORMATION_ID = new byte[][]
-    {
-        {
-            (byte) 0xD5, (byte) 0xCD, (byte) 0xD5, (byte) 0x02,
-            (byte) 0x2E, (byte) 0x9C, (byte) 0x10, (byte) 0x1B,
-            (byte) 0x93, (byte) 0x97, (byte) 0x08, (byte) 0x00,
-            (byte) 0x2B, (byte) 0x2C, (byte) 0xF9, (byte) 0xAE
-        },
-        {
-            (byte) 0xD5, (byte) 0xCD, (byte) 0xD5, (byte) 0x05,
-            (byte) 0x2E, (byte) 0x9C, (byte) 0x10, (byte) 0x1B,
-            (byte) 0x93, (byte) 0x97, (byte) 0x08, (byte) 0x00,
-            (byte) 0x2B, (byte) 0x2C, (byte) 0xF9, (byte) 0xAE
-        }
-    };
-
-    /**
-     * <p>A property without a known name is described by this string.</p>
-     */
-    public static final String UNDEFINED = "[undefined]";
-
-    /**
-     * <p>The default section ID map. It maps section format IDs to
-     * {@link PropertyIDMap}s.</p>
-     */
-    private static SectionIDMap defaultMap;
-
-
-
-    /**
-     * <p>Returns the singleton instance of the default {@link
-     * SectionIDMap}.</p>
-     *
-     * @return The instance value
-     */
-    public static SectionIDMap getInstance()
-    {
-        if (defaultMap == null)
-        {
-            final SectionIDMap m = new SectionIDMap();
-            m.put(SUMMARY_INFORMATION_ID,
-                  PropertyIDMap.getSummaryInformationProperties());
-            m.put(DOCUMENT_SUMMARY_INFORMATION_ID[0],
-                  PropertyIDMap.getDocumentSummaryInformationProperties());
-            defaultMap = m;
-        }
-        return defaultMap;
-    }
-
-
-
-    /**
-     * <p>Returns the property ID string that is associated with a
-     * given property ID in a section format ID's namespace.</p>
-     *
-     * @param sectionFormatID Each section format ID has its own name
-     * space of property ID strings and thus must be specified.
-     * @param  pid The property ID
-     * @return The well-known property ID string associated with the
-     * property ID <var>pid</var> in the name space spanned by <var>
-     * sectionFormatID</var> . If the <var>pid</var>
-     * /<var>sectionFormatID </var> combination is not well-known, the
-     * string "[undefined]" is returned.
-     */
-    public static String getPIDString(final byte[] sectionFormatID,
-                                      final long pid)
-    {
-        final PropertyIDMap m = getInstance().get(sectionFormatID);
-        if (m == null) {
-            return UNDEFINED;
-        }
-        final String s = (String) m.get(pid);
-        if (s == null)
-            return UNDEFINED;
-        return s;
-    }
-
-
-
-    /**
-     * <p>Returns the {@link PropertyIDMap} for a given section format
-     * ID.</p>
-     *
-     * @param sectionFormatID the section format ID
-     * @return the property ID map
-     */
-    public PropertyIDMap get(final byte[] sectionFormatID)
-    {
-        return (PropertyIDMap)super.get(new String(sectionFormatID, StringUtil.UTF8));
-    }
-
-    /**
-     * <p>Associates a section format ID with a {@link
-     * PropertyIDMap}.</p>
-     *
-     * @param sectionFormatID the section format ID
-     * @param propertyIDMap the property ID map
-     * @return as defined by {@link java.util.Map#put}
-     */
-    public PropertyIDMap put(final byte[] sectionFormatID,
-                             final PropertyIDMap propertyIDMap)
-    {
-        return (PropertyIDMap)super.put(new String(sectionFormatID, StringUtil.UTF8), propertyIDMap);
-    }
-
-    /**
-     * Associates the string representation of a section
-     *  format ID with a {@link PropertyIDMap}
-     * 
-     * @param key the key of the PropertyIDMap
-     * @param value the PropertyIDMap itself
-     * 
-     * @return the previous PropertyIDMap stored under this key, or {@code null} if there wasn't one
-     */
-    protected PropertyIDMap put(String key, PropertyIDMap value) {
-        return (PropertyIDMap)super.put(key, value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hpsf/wellknown/package.html b/trunk/src/java/org/apache/poi/hpsf/wellknown/package.html
deleted file mode 100644
index 05b4ffb..0000000
--- a/trunk/src/java/org/apache/poi/hpsf/wellknown/package.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0//EN//">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
- <head>
-  <title></title>
- </head>
-
- <body>
-  <div>
-   Specific support for DocumentSummaryInformation, SummaryInformation types.
-   <p>Support classes for "well-known" section format IDs and property IDs. The
-    streams <tt>\005DocumentSummaryInformation</tt> and
-    <tt>\005SummaryInformation</tt> (or any streams with the same section
-    format IDs as the aforementioned) are considered well-known. So are most
-    property IDs in these streams.</p>
-
-   <p>
-    @author Rainer Klute (klute@rainer-klute.de)
-   </p>
-  </div>
-
- </body>
-</html>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-sgml-default-dtd-file:"HTML_4.0_Strict.ced"
-mode: html
-sgml-omittag:t
-sgml-shorttag:nil
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/trunk/src/java/org/apache/poi/hssf/OldExcelFormatException.java b/trunk/src/java/org/apache/poi/hssf/OldExcelFormatException.java
deleted file mode 100644
index beb8c02..0000000
--- a/trunk/src/java/org/apache/poi/hssf/OldExcelFormatException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf;
-
-import org.apache.poi.OldFileFormatException;
-import org.apache.poi.util.Removal;
-
-/**
- * @deprecated POI 3.16 beta 1. Use {@link org.apache.poi.OldFileFormatException}
- */
-@Removal(version="3.18")
-public class OldExcelFormatException extends OldFileFormatException {
-	public OldExcelFormatException(String s) {
-		super(s);
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java b/trunk/src/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
deleted file mode 100644
index 256d023..0000000
--- a/trunk/src/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hssf.dev;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.DrawingGroupRecord;
-import org.apache.poi.hssf.usermodel.HSSFPatriarch;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Utility for representing drawings contained in a binary Excel file as a XML tree
- */
-public class BiffDrawingToXml {
-    private static final String SHEET_NAME_PARAM = "-sheet-name";
-    private static final String SHEET_INDEXES_PARAM = "-sheet-indexes";
-    private static final String EXCLUDE_WORKBOOK_RECORDS = "-exclude-workbook";
-
-    private static int getAttributeIndex(String attribute, String[] params) {
-        for (int i = 0; i < params.length; i++) {
-            String param = params[i];
-            if (attribute.equals(param)) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    private static boolean isExcludeWorkbookRecords(String[] params) {
-        return -1 != getAttributeIndex(EXCLUDE_WORKBOOK_RECORDS, params);
-    }
-
-    private static List<Integer> getIndexesByName(String[] params, HSSFWorkbook workbook) {
-        List<Integer> list = new ArrayList<Integer>();
-        int pos = getAttributeIndex(SHEET_NAME_PARAM, params);
-        if (-1 != pos) {
-            if (pos >= params.length) {
-                throw new IllegalArgumentException("sheet name param value was not specified");
-            }
-            String sheetName = params[pos + 1];
-            int sheetPos = workbook.getSheetIndex(sheetName);
-            if (-1 == sheetPos){
-                throw new IllegalArgumentException("specified sheet name has not been found in xls file");
-            }
-            list.add(sheetPos);
-        }
-        return list;
-    }
-
-    private static List<Integer> getIndexesByIdArray(String[] params) {
-        List<Integer> list = new ArrayList<Integer>();
-        int pos = getAttributeIndex(SHEET_INDEXES_PARAM, params);
-        if (-1 != pos) {
-            if (pos >= params.length) {
-                throw new IllegalArgumentException("sheet list value was not specified");
-            }
-            String sheetParam = params[pos + 1];
-            String[] sheets = sheetParam.split(",");
-            for (String sheet : sheets) {
-                list.add(Integer.parseInt(sheet));
-            }
-        }
-        return list;
-    }
-
-    private static List<Integer> getSheetsIndexes(String[] params, HSSFWorkbook workbook) {
-        List<Integer> list = new ArrayList<Integer>();
-        list.addAll(getIndexesByIdArray(params));
-        list.addAll(getIndexesByName(params, workbook));
-        if (0 == list.size()) {
-            int size = workbook.getNumberOfSheets();
-            for (int i = 0; i < size; i++) {
-                list.add(i);
-            }
-        }
-        return list;
-    }
-
-    private static String getInputFileName(String[] params) {
-        return params[params.length - 1];
-    }
-
-    private static String getOutputFileName(String input) {
-        if (input.contains("xls")) {
-            return input.replace(".xls", ".xml");
-        }
-        return input + ".xml";
-    }
-
-    public static void main(String[] params) throws IOException {
-        if (0 == params.length) {
-            System.out.println("Usage: BiffDrawingToXml [options] inputWorkbook");
-            System.out.println("Options:");
-            System.out.println("  -exclude-workbook            exclude workbook-level records");
-            System.out.println("  -sheet-indexes   <indexes>   output sheets with specified indexes");
-            System.out.println("  -sheet-namek  <names>        output sheets with specified name");
-            return;
-        }
-        String input = getInputFileName(params);
-        FileInputStream inp = new FileInputStream(input);
-        String output = getOutputFileName(input);
-        FileOutputStream outputStream = new FileOutputStream(output);
-        writeToFile(outputStream, inp, isExcludeWorkbookRecords(params), params);
-        inp.close();
-        outputStream.close();
-    }
-
-    public static void writeToFile(OutputStream fos, InputStream xlsWorkbook, boolean excludeWorkbookRecords, String[] params) throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook(xlsWorkbook);
-        InternalWorkbook internalWorkbook = workbook.getInternalWorkbook();
-        DrawingGroupRecord r = (DrawingGroupRecord) internalWorkbook.findFirstRecordBySid(DrawingGroupRecord.sid);
-
-        StringBuilder builder = new StringBuilder();
-        builder.append("<workbook>\n");
-        String tab = "\t";
-        if (!excludeWorkbookRecords && r != null) {
-            r.decode();
-            List<EscherRecord> escherRecords = r.getEscherRecords();
-            for (EscherRecord record : escherRecords) {
-                builder.append(record.toXml(tab));
-            }
-        }
-        List<Integer> sheets = getSheetsIndexes(params, workbook);
-        for (Integer i : sheets) {
-            HSSFPatriarch p = workbook.getSheetAt(i).getDrawingPatriarch();
-            if(p != null ) {
-                builder.append(tab).append("<sheet").append(i).append(">\n");
-                builder.append(p.getBoundAggregate().toXml(tab + "\t"));
-                builder.append(tab).append("</sheet").append(i).append(">\n");
-            }
-        }
-        builder.append("</workbook>\n");
-        fos.write(builder.toString().getBytes(StringUtil.UTF8));
-        fos.close();
-        workbook.close();
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
deleted file mode 100644
index 5465f0f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
+++ /dev/null
@@ -1,880 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.dev;
-
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.record.ArrayRecord;
-import org.apache.poi.hssf.record.AutoFilterInfoRecord;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BackupRecord;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.BookBoolRecord;
-import org.apache.poi.hssf.record.BoolErrRecord;
-import org.apache.poi.hssf.record.BottomMarginRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.CFHeader12Record;
-import org.apache.poi.hssf.record.CFHeaderRecord;
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.CFRuleRecord;
-import org.apache.poi.hssf.record.CalcCountRecord;
-import org.apache.poi.hssf.record.CalcModeRecord;
-import org.apache.poi.hssf.record.CodepageRecord;
-import org.apache.poi.hssf.record.ColumnInfoRecord;
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.DBCellRecord;
-import org.apache.poi.hssf.record.DConRefRecord;
-import org.apache.poi.hssf.record.DSFRecord;
-import org.apache.poi.hssf.record.DVALRecord;
-import org.apache.poi.hssf.record.DVRecord;
-import org.apache.poi.hssf.record.DateWindow1904Record;
-import org.apache.poi.hssf.record.DefaultColWidthRecord;
-import org.apache.poi.hssf.record.DefaultRowHeightRecord;
-import org.apache.poi.hssf.record.DeltaRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.DrawingGroupRecord;
-import org.apache.poi.hssf.record.DrawingRecordForBiffViewer;
-import org.apache.poi.hssf.record.DrawingSelectionRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.ExtSSTRecord;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.ExternalNameRecord;
-import org.apache.poi.hssf.record.FeatHdrRecord;
-import org.apache.poi.hssf.record.FeatRecord;
-import org.apache.poi.hssf.record.FilePassRecord;
-import org.apache.poi.hssf.record.FileSharingRecord;
-import org.apache.poi.hssf.record.FnGroupCountRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.FooterRecord;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.GutsRecord;
-import org.apache.poi.hssf.record.HCenterRecord;
-import org.apache.poi.hssf.record.HeaderRecord;
-import org.apache.poi.hssf.record.HideObjRecord;
-import org.apache.poi.hssf.record.HorizontalPageBreakRecord;
-import org.apache.poi.hssf.record.HyperlinkRecord;
-import org.apache.poi.hssf.record.IndexRecord;
-import org.apache.poi.hssf.record.InterfaceEndRecord;
-import org.apache.poi.hssf.record.InterfaceHdrRecord;
-import org.apache.poi.hssf.record.IterationRecord;
-import org.apache.poi.hssf.record.LabelRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.LeftMarginRecord;
-import org.apache.poi.hssf.record.MMSRecord;
-import org.apache.poi.hssf.record.MergeCellsRecord;
-import org.apache.poi.hssf.record.MulBlankRecord;
-import org.apache.poi.hssf.record.MulRKRecord;
-import org.apache.poi.hssf.record.NameCommentRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.PaletteRecord;
-import org.apache.poi.hssf.record.PaneRecord;
-import org.apache.poi.hssf.record.PasswordRecord;
-import org.apache.poi.hssf.record.PasswordRev4Record;
-import org.apache.poi.hssf.record.PrecisionRecord;
-import org.apache.poi.hssf.record.PrintGridlinesRecord;
-import org.apache.poi.hssf.record.PrintHeadersRecord;
-import org.apache.poi.hssf.record.PrintSetupRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.ProtectionRev4Record;
-import org.apache.poi.hssf.record.RKRecord;
-import org.apache.poi.hssf.record.RecalcIdRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.RecordInputStream.LeftoverDataException;
-import org.apache.poi.hssf.record.RefModeRecord;
-import org.apache.poi.hssf.record.RefreshAllRecord;
-import org.apache.poi.hssf.record.RightMarginRecord;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.SaveRecalcRecord;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.record.StyleRecord;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.hssf.record.TabIdRecord;
-import org.apache.poi.hssf.record.TableRecord;
-import org.apache.poi.hssf.record.TableStylesRecord;
-import org.apache.poi.hssf.record.TextObjectRecord;
-import org.apache.poi.hssf.record.TopMarginRecord;
-import org.apache.poi.hssf.record.UncalcedRecord;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.hssf.record.UseSelFSRecord;
-import org.apache.poi.hssf.record.VCenterRecord;
-import org.apache.poi.hssf.record.VerticalPageBreakRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowOneRecord;
-import org.apache.poi.hssf.record.WindowProtectRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.WriteAccessRecord;
-import org.apache.poi.hssf.record.WriteProtectRecord;
-import org.apache.poi.hssf.record.chart.AreaFormatRecord;
-import org.apache.poi.hssf.record.chart.AreaRecord;
-import org.apache.poi.hssf.record.chart.AxisLineFormatRecord;
-import org.apache.poi.hssf.record.chart.AxisOptionsRecord;
-import org.apache.poi.hssf.record.chart.AxisParentRecord;
-import org.apache.poi.hssf.record.chart.AxisRecord;
-import org.apache.poi.hssf.record.chart.AxisUsedRecord;
-import org.apache.poi.hssf.record.chart.BarRecord;
-import org.apache.poi.hssf.record.chart.BeginRecord;
-import org.apache.poi.hssf.record.chart.CatLabRecord;
-import org.apache.poi.hssf.record.chart.CategorySeriesAxisRecord;
-import org.apache.poi.hssf.record.chart.ChartEndBlockRecord;
-import org.apache.poi.hssf.record.chart.ChartEndObjectRecord;
-import org.apache.poi.hssf.record.chart.ChartFRTInfoRecord;
-import org.apache.poi.hssf.record.chart.ChartFormatRecord;
-import org.apache.poi.hssf.record.chart.ChartRecord;
-import org.apache.poi.hssf.record.chart.ChartStartBlockRecord;
-import org.apache.poi.hssf.record.chart.ChartStartObjectRecord;
-import org.apache.poi.hssf.record.chart.DatRecord;
-import org.apache.poi.hssf.record.chart.DataFormatRecord;
-import org.apache.poi.hssf.record.chart.DefaultDataLabelTextPropertiesRecord;
-import org.apache.poi.hssf.record.chart.EndRecord;
-import org.apache.poi.hssf.record.chart.FontBasisRecord;
-import org.apache.poi.hssf.record.chart.FontIndexRecord;
-import org.apache.poi.hssf.record.chart.FrameRecord;
-import org.apache.poi.hssf.record.chart.LegendRecord;
-import org.apache.poi.hssf.record.chart.LineFormatRecord;
-import org.apache.poi.hssf.record.chart.LinkedDataRecord;
-import org.apache.poi.hssf.record.chart.ObjectLinkRecord;
-import org.apache.poi.hssf.record.chart.PlotAreaRecord;
-import org.apache.poi.hssf.record.chart.PlotGrowthRecord;
-import org.apache.poi.hssf.record.chart.SeriesIndexRecord;
-import org.apache.poi.hssf.record.chart.SeriesListRecord;
-import org.apache.poi.hssf.record.chart.SeriesRecord;
-import org.apache.poi.hssf.record.chart.SeriesTextRecord;
-import org.apache.poi.hssf.record.chart.SeriesToChartGroupRecord;
-import org.apache.poi.hssf.record.chart.SheetPropertiesRecord;
-import org.apache.poi.hssf.record.chart.TextRecord;
-import org.apache.poi.hssf.record.chart.TickRecord;
-import org.apache.poi.hssf.record.chart.UnitsRecord;
-import org.apache.poi.hssf.record.chart.ValueRangeRecord;
-import org.apache.poi.hssf.record.pivottable.DataItemRecord;
-import org.apache.poi.hssf.record.pivottable.ExtendedPivotTableViewFieldsRecord;
-import org.apache.poi.hssf.record.pivottable.PageItemRecord;
-import org.apache.poi.hssf.record.pivottable.StreamIDRecord;
-import org.apache.poi.hssf.record.pivottable.ViewDefinitionRecord;
-import org.apache.poi.hssf.record.pivottable.ViewFieldsRecord;
-import org.apache.poi.hssf.record.pivottable.ViewSourceRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- *  Utility for reading in BIFF8 records and displaying data from them.
- * @see        #main
- */
-public final class BiffViewer {
-    private static final char[] NEW_LINE_CHARS = System.getProperty("line.separator").toCharArray();
-    private static final POILogger logger = POILogFactory.getLogger(BiffViewer.class);
-
-    private BiffViewer() {
-        // no instances of this class
-    }
-
-    /**
-     *  Create an array of records from an input stream
-     *
-     * @param is the InputStream from which the records will be obtained
-     * @param ps the PrintWriter to output the record data
-     * @param recListener the record listener to notify about read records
-     * @param dumpInterpretedRecords if {@code true}, the read records will be written to the PrintWriter
-     *
-     * @return an array of Records created from the InputStream
-     * @exception  org.apache.poi.util.RecordFormatException  on error processing the InputStream
-     */
-    public static Record[] createRecords(InputStream is, PrintWriter ps, BiffRecordListener recListener, boolean dumpInterpretedRecords)
-            throws org.apache.poi.util.RecordFormatException {
-        List<Record> temp = new ArrayList<Record>();
-
-        RecordInputStream recStream = new RecordInputStream(is);
-        while (true) {
-            boolean hasNext;
-            try {
-                hasNext = recStream.hasNextRecord();
-            } catch (LeftoverDataException e) {
-                logger.log(POILogger.ERROR, "Discarding " + recStream.remaining() + " bytes and continuing", e);
-                recStream.readRemainder();
-                hasNext = recStream.hasNextRecord();
-            }
-            if (!hasNext) {
-                break;
-            }
-            recStream.nextRecord();
-            if (recStream.getSid() == 0) {
-                continue;
-            }
-            Record record;
-            if (dumpInterpretedRecords) {
-                record = createRecord (recStream);
-                if (record.getSid() == ContinueRecord.sid) {
-                    continue;
-                }
-                temp.add(record);
-
-                if (dumpInterpretedRecords) {
-                    for (String header : recListener.getRecentHeaders()) {
-                        ps.println(header);
-                    }
-                    ps.print(record.toString());
-                }
-            } else {
-                recStream.readRemainder();
-            }
-            ps.println();
-        }
-        Record[] result = new Record[temp.size()];
-        temp.toArray(result);
-        return result;
-    }
-
-
-    /**
-     *  Essentially a duplicate of RecordFactory. Kept separate as not to screw
-     *  up non-debug operations.
-     *
-     */
-    private static Record createRecord(RecordInputStream in) {
-        switch (in.getSid()) {
-            case AreaFormatRecord.sid:        return new AreaFormatRecord(in);
-            case AreaRecord.sid:              return new AreaRecord(in);
-            case ArrayRecord.sid:             return new ArrayRecord(in);
-            case AxisLineFormatRecord.sid:    return new AxisLineFormatRecord(in);
-            case AxisOptionsRecord.sid:       return new AxisOptionsRecord(in);
-            case AxisParentRecord.sid:        return new AxisParentRecord(in);
-            case AxisRecord.sid:              return new AxisRecord(in);
-            case AxisUsedRecord.sid:          return new AxisUsedRecord(in);
-            case AutoFilterInfoRecord.sid:    return new AutoFilterInfoRecord(in);
-            case BOFRecord.sid:               return new BOFRecord(in);
-            case BackupRecord.sid:            return new BackupRecord(in);
-            case BarRecord.sid:               return new BarRecord(in);
-            case BeginRecord.sid:             return new BeginRecord(in);
-            case BlankRecord.sid:             return new BlankRecord(in);
-            case BookBoolRecord.sid:          return new BookBoolRecord(in);
-            case BoolErrRecord.sid:           return new BoolErrRecord(in);
-            case BottomMarginRecord.sid:      return new BottomMarginRecord(in);
-            case BoundSheetRecord.sid:        return new BoundSheetRecord(in);
-            case CFHeaderRecord.sid:          return new CFHeaderRecord(in);
-            case CFHeader12Record.sid:        return new CFHeader12Record(in);
-            case CFRuleRecord.sid:            return new CFRuleRecord(in);
-            case CFRule12Record.sid:          return new CFRule12Record(in);
-            // TODO Add CF Ex, and remove from UnknownRecord 
-            case CalcCountRecord.sid:         return new CalcCountRecord(in);
-            case CalcModeRecord.sid:          return new CalcModeRecord(in);
-            case CategorySeriesAxisRecord.sid:return new CategorySeriesAxisRecord(in);
-            case ChartFormatRecord.sid:       return new ChartFormatRecord(in);
-            case ChartRecord.sid:             return new ChartRecord(in);
-            case CodepageRecord.sid:          return new CodepageRecord(in);
-            case ColumnInfoRecord.sid:        return new ColumnInfoRecord(in);
-            case ContinueRecord.sid:          return new ContinueRecord(in);
-            case CountryRecord.sid:           return new CountryRecord(in);
-            case DBCellRecord.sid:            return new DBCellRecord(in);
-            case DSFRecord.sid:               return new DSFRecord(in);
-            case DatRecord.sid:               return new DatRecord(in);
-            case DataFormatRecord.sid:        return new DataFormatRecord(in);
-            case DateWindow1904Record.sid:    return new DateWindow1904Record(in);
-            case DConRefRecord.sid:           return new DConRefRecord(in);
-            case DefaultColWidthRecord.sid:   return new DefaultColWidthRecord(in);
-            case DefaultDataLabelTextPropertiesRecord.sid: return new DefaultDataLabelTextPropertiesRecord(in);
-            case DefaultRowHeightRecord.sid:  return new DefaultRowHeightRecord(in);
-            case DeltaRecord.sid:             return new DeltaRecord(in);
-            case DimensionsRecord.sid:        return new DimensionsRecord(in);
-            case DrawingGroupRecord.sid:      return new DrawingGroupRecord(in);
-            case DrawingRecordForBiffViewer.sid: return new DrawingRecordForBiffViewer(in);
-            case DrawingSelectionRecord.sid:  return new DrawingSelectionRecord(in);
-            case DVRecord.sid:                return new DVRecord(in);
-            case DVALRecord.sid:              return new DVALRecord(in);
-            case EOFRecord.sid:               return new EOFRecord(in);
-            case EndRecord.sid:               return new EndRecord(in);
-            case ExtSSTRecord.sid:            return new ExtSSTRecord(in);
-            case ExtendedFormatRecord.sid:    return new ExtendedFormatRecord(in);
-            case ExternSheetRecord.sid:       return new ExternSheetRecord(in);
-            case ExternalNameRecord.sid:      return new ExternalNameRecord(in);
-            case FeatRecord.sid:              return new FeatRecord(in);
-            case FeatHdrRecord.sid:           return new FeatHdrRecord(in);
-            case FilePassRecord.sid:          return new FilePassRecord(in);
-            case FileSharingRecord.sid:       return new FileSharingRecord(in);
-            case FnGroupCountRecord.sid:      return new FnGroupCountRecord(in);
-            case FontBasisRecord.sid:         return new FontBasisRecord(in);
-            case FontIndexRecord.sid:         return new FontIndexRecord(in);
-            case FontRecord.sid:              return new FontRecord(in);
-            case FooterRecord.sid:            return new FooterRecord(in);
-            case FormatRecord.sid:            return new FormatRecord(in);
-            case FormulaRecord.sid:           return new FormulaRecord(in);
-            case FrameRecord.sid:             return new FrameRecord(in);
-            case GridsetRecord.sid:           return new GridsetRecord(in);
-            case GutsRecord.sid:              return new GutsRecord(in);
-            case HCenterRecord.sid:           return new HCenterRecord(in);
-            case HeaderRecord.sid:            return new HeaderRecord(in);
-            case HideObjRecord.sid:           return new HideObjRecord(in);
-            case HorizontalPageBreakRecord.sid: return new HorizontalPageBreakRecord(in);
-            case HyperlinkRecord.sid:         return new HyperlinkRecord(in);
-            case IndexRecord.sid:             return new IndexRecord(in);
-            case InterfaceEndRecord.sid:      return InterfaceEndRecord.create(in);
-            case InterfaceHdrRecord.sid:      return new InterfaceHdrRecord(in);
-            case IterationRecord.sid:         return new IterationRecord(in);
-            case LabelRecord.sid:             return new LabelRecord(in);
-            case LabelSSTRecord.sid:          return new LabelSSTRecord(in);
-            case LeftMarginRecord.sid:        return new LeftMarginRecord(in);
-            case LegendRecord.sid:            return new LegendRecord(in);
-            case LineFormatRecord.sid:        return new LineFormatRecord(in);
-            case LinkedDataRecord.sid:        return new LinkedDataRecord(in);
-            case MMSRecord.sid:               return new MMSRecord(in);
-            case MergeCellsRecord.sid:        return new MergeCellsRecord(in);
-            case MulBlankRecord.sid:          return new MulBlankRecord(in);
-            case MulRKRecord.sid:             return new MulRKRecord(in);
-            case NameRecord.sid:              return new NameRecord(in);
-            case NameCommentRecord.sid:       return new NameCommentRecord(in);
-            case NoteRecord.sid:              return new NoteRecord(in);
-            case NumberRecord.sid:            return new NumberRecord(in);
-            case ObjRecord.sid:               return new ObjRecord(in);
-            case ObjectLinkRecord.sid:        return new ObjectLinkRecord(in);
-            case PaletteRecord.sid:           return new PaletteRecord(in);
-            case PaneRecord.sid:              return new PaneRecord(in);
-            case PasswordRecord.sid:          return new PasswordRecord(in);
-            case PasswordRev4Record.sid:      return new PasswordRev4Record(in);
-            case PlotAreaRecord.sid:          return new PlotAreaRecord(in);
-            case PlotGrowthRecord.sid:        return new PlotGrowthRecord(in);
-            case PrecisionRecord.sid:         return new PrecisionRecord(in);
-            case PrintGridlinesRecord.sid:    return new PrintGridlinesRecord(in);
-            case PrintHeadersRecord.sid:      return new PrintHeadersRecord(in);
-            case PrintSetupRecord.sid:        return new PrintSetupRecord(in);
-            case ProtectRecord.sid:           return new ProtectRecord(in);
-            case ProtectionRev4Record.sid:    return new ProtectionRev4Record(in);
-            case RKRecord.sid:                return new RKRecord(in);
-            case RecalcIdRecord.sid:          return new RecalcIdRecord(in);
-            case RefModeRecord.sid:           return new RefModeRecord(in);
-            case RefreshAllRecord.sid:        return new RefreshAllRecord(in);
-            case RightMarginRecord.sid:       return new RightMarginRecord(in);
-            case RowRecord.sid:               return new RowRecord(in);
-            case SCLRecord.sid:               return new SCLRecord(in);
-            case SSTRecord.sid:               return new SSTRecord(in);
-            case SaveRecalcRecord.sid:        return new SaveRecalcRecord(in);
-            case SelectionRecord.sid:         return new SelectionRecord(in);
-            case SeriesIndexRecord.sid:       return new SeriesIndexRecord(in);
-            case SeriesListRecord.sid:        return new SeriesListRecord(in);
-            case SeriesRecord.sid:            return new SeriesRecord(in);
-            case SeriesTextRecord.sid:        return new SeriesTextRecord(in);
-            case SeriesToChartGroupRecord.sid:return new SeriesToChartGroupRecord(in);
-            case SharedFormulaRecord.sid:     return new SharedFormulaRecord(in);
-            case SheetPropertiesRecord.sid:   return new SheetPropertiesRecord(in);
-            case StringRecord.sid:            return new StringRecord(in);
-            case StyleRecord.sid:             return new StyleRecord(in);
-            case SupBookRecord.sid:           return new SupBookRecord(in);
-            case TabIdRecord.sid:             return new TabIdRecord(in);
-            case TableStylesRecord.sid:       return new TableStylesRecord(in);
-            case TableRecord.sid:             return new TableRecord(in);
-            case TextObjectRecord.sid:        return new TextObjectRecord(in);
-            case TextRecord.sid:              return new TextRecord(in);
-            case TickRecord.sid:              return new TickRecord(in);
-            case TopMarginRecord.sid:         return new TopMarginRecord(in);
-            case UncalcedRecord.sid:          return new UncalcedRecord(in);
-            case UnitsRecord.sid:             return new UnitsRecord(in);
-            case UseSelFSRecord.sid:          return new UseSelFSRecord(in);
-            case VCenterRecord.sid:           return new VCenterRecord(in);
-            case ValueRangeRecord.sid:        return new ValueRangeRecord(in);
-            case VerticalPageBreakRecord.sid: return new VerticalPageBreakRecord(in);
-            case WSBoolRecord.sid:            return new WSBoolRecord(in);
-            case WindowOneRecord.sid:         return new WindowOneRecord(in);
-            case WindowProtectRecord.sid:     return new WindowProtectRecord(in);
-            case WindowTwoRecord.sid:         return new WindowTwoRecord(in);
-            case WriteAccessRecord.sid:       return new WriteAccessRecord(in);
-            case WriteProtectRecord.sid:      return new WriteProtectRecord(in);
-
-            // chart
-            case CatLabRecord.sid:            return new CatLabRecord(in);
-            case ChartEndBlockRecord.sid:     return new ChartEndBlockRecord(in);
-            case ChartEndObjectRecord.sid:    return new ChartEndObjectRecord(in);
-            case ChartFRTInfoRecord.sid:      return new ChartFRTInfoRecord(in);
-            case ChartStartBlockRecord.sid:   return new ChartStartBlockRecord(in);
-            case ChartStartObjectRecord.sid:  return new ChartStartObjectRecord(in);
-
-            // pivot table
-            case StreamIDRecord.sid:           return new StreamIDRecord(in);
-            case ViewSourceRecord.sid:         return new ViewSourceRecord(in);
-            case PageItemRecord.sid:           return new PageItemRecord(in);
-            case ViewDefinitionRecord.sid:     return new ViewDefinitionRecord(in);
-            case ViewFieldsRecord.sid:         return new ViewFieldsRecord(in);
-            case DataItemRecord.sid:           return new DataItemRecord(in);
-            case ExtendedPivotTableViewFieldsRecord.sid: return new ExtendedPivotTableViewFieldsRecord(in);
-        }
-        return new UnknownRecord(in);
-    }
-
-    private static final class CommandArgs {
-
-        private final boolean _biffhex;
-        private final boolean _noint;
-        private final boolean _out;
-        private final boolean _rawhex;
-        private final boolean _noHeader;
-        private final File _file;
-
-        private CommandArgs(boolean biffhex, boolean noint, boolean out, boolean rawhex, boolean noHeader, File file) {
-            _biffhex = biffhex;
-            _noint = noint;
-            _out = out;
-            _rawhex = rawhex;
-            _file = file;
-            _noHeader = noHeader;
-        }
-
-        public static CommandArgs parse(String[] args) throws CommandParseException {
-            int nArgs = args.length;
-            boolean biffhex = false;
-            boolean noint = false;
-            boolean out = false;
-            boolean rawhex = false;
-            boolean noheader = false;
-            File file = null;
-            for (int i=0; i<nArgs; i++) {
-                String arg = args[i];
-                if (arg.startsWith("--")) {
-                    if ("--biffhex".equals(arg)) {
-                        biffhex = true;
-                    } else if ("--noint".equals(arg)) {
-                        noint = true;
-                    } else if ("--out".equals(arg)) {
-                        out = true;
-                    } else if ("--escher".equals(arg)) {
-                        System.setProperty("poi.deserialize.escher", "true");
-                    } else if ("--rawhex".equals(arg)) {
-                        rawhex = true;
-                    } else if ("--noheader".equals(arg)) {
-                        noheader = true;
-                    } else {
-                        throw new CommandParseException("Unexpected option '" + arg + "'");
-                    }
-                    continue;
-                }
-                file = new File(arg);
-                if (!file.exists()) {
-                    throw new CommandParseException("Specified file '" + arg + "' does not exist");
-                }
-                if (i+1<nArgs) {
-                    throw new CommandParseException("File name must be the last arg");
-                }
-            }
-            if (file == null) {
-                throw new CommandParseException("Biff viewer needs a filename");
-            }
-            return new CommandArgs(biffhex, noint, out, rawhex, noheader, file);
-        }
-        public boolean shouldDumpBiffHex() {
-            return _biffhex;
-        }
-        public boolean shouldDumpRecordInterpretations() {
-            return !_noint;
-        }
-        public boolean shouldOutputToFile() {
-            return _out;
-        }
-        public boolean shouldOutputRawHexOnly() {
-            return _rawhex;
-        }
-        public boolean suppressHeader() {
-            return _noHeader;
-        }
-        public File getFile() {
-            return _file;
-        }
-    }
-    private static final class CommandParseException extends Exception {
-        public CommandParseException(String msg) {
-            super(msg);
-        }
-    }
-
-	/**
-	 * Method main with 1 argument just run straight biffview against given
-	 * file<p>
-	 *
-	 * <b>Usage</b>:<p>
-	 *
-	 * BiffViewer [--biffhex] [--noint] [--noescher] [--out] &lt;fileName&gt;<p>
-	 * BiffViewer --rawhex  [--out] &lt;fileName&gt;
-	 *
-	 * <table summary="BiffViewer options">
-	 * <tr><td>--biffhex</td><td>show hex dump of each BIFF record</td></tr>
-	 * <tr><td>--noint</td><td>do not output interpretation of BIFF records</td></tr>
-	 * <tr><td>--out</td><td>send output to &lt;fileName&gt;.out</td></tr>
-	 * <tr><td>--rawhex</td><td>output raw hex dump of whole workbook stream</td></tr>
-	 * <tr><td>--escher</td><td>turn on deserialization of escher records (default is off)</td></tr>
-	 * <tr><td>--noheader</td><td>do not print record header (default is on)</td></tr>
-	 * </table>
-	 * 
-	 * @param args the command line arguments 
-	 *
-	 * @throws IOException if the file doesn't exist or contained errors
-	 * @throws CommandParseException if the command line contained errors
-	 */
-	public static void main(String[] args) throws IOException, CommandParseException {
-		// args = new String[] { "--out", "", };
-		CommandArgs cmdArgs = CommandArgs.parse(args);
-
-		PrintWriter pw;
-		if (cmdArgs.shouldOutputToFile()) {
-			OutputStream os = new FileOutputStream(cmdArgs.getFile().getAbsolutePath() + ".out");
-			pw = new PrintWriter(new OutputStreamWriter(os, StringUtil.UTF8));
-		} else {
-		    // Use the system default encoding when sending to System Out
-			pw = new PrintWriter(new OutputStreamWriter(System.out, Charset.defaultCharset()));
-		}
-
-        try {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(cmdArgs.getFile(), true);
-            try {
-                InputStream is = getPOIFSInputStream(fs);
-
-                try {
-                    if (cmdArgs.shouldOutputRawHexOnly()) {
-                        int size = is.available();
-                        byte[] data = new byte[size];
-
-                        is.read(data);
-                        HexDump.dump(data, 0, System.out, 0);
-                    } else {
-                        boolean dumpInterpretedRecords = cmdArgs.shouldDumpRecordInterpretations();
-                        boolean dumpHex = cmdArgs.shouldDumpBiffHex();
-                        boolean zeroAlignHexDump = dumpInterpretedRecords;  // TODO - fix non-zeroAlign
-                        runBiffViewer(pw, is, dumpInterpretedRecords, dumpHex, zeroAlignHexDump,
-                                cmdArgs.suppressHeader());
-                    }
-                } finally {
-                    is.close();
-                }
-            } finally {
-                fs.close();
-            }
-        } finally {
-            pw.close();
-        }
-	}
-
-	protected static InputStream getPOIFSInputStream(NPOIFSFileSystem fs)
-			throws IOException, FileNotFoundException {
-		String workbookName = HSSFWorkbook.getWorkbookDirEntryName(fs.getRoot());
-		return fs.createDocumentInputStream(workbookName);
-	}
-
-	protected static void runBiffViewer(PrintWriter pw, InputStream is,
-			boolean dumpInterpretedRecords, boolean dumpHex, boolean zeroAlignHexDump,
-			boolean suppressHeader) {
-		BiffRecordListener recListener = new BiffRecordListener(dumpHex ? pw : null, zeroAlignHexDump, suppressHeader);
-		is = new BiffDumpingStream(is, recListener);
-		createRecords(is, pw, recListener, dumpInterpretedRecords);
-	}
-
-	private static final class BiffRecordListener implements IBiffRecordListener {
-		private final Writer _hexDumpWriter;
-		private List<String> _headers;
-		private final boolean _zeroAlignEachRecord;
-		private final boolean _noHeader;
-		public BiffRecordListener(Writer hexDumpWriter, boolean zeroAlignEachRecord, boolean noHeader) {
-			_hexDumpWriter = hexDumpWriter;
-			_zeroAlignEachRecord = zeroAlignEachRecord;
-			_noHeader = noHeader;
-			_headers = new ArrayList<String>();
-		}
-
-		@Override
-        public void processRecord(int globalOffset, int recordCounter, int sid, int dataSize,
-				byte[] data) {
-			String header = formatRecordDetails(globalOffset, sid, dataSize, recordCounter);
-			if(!_noHeader) _headers.add(header);
-			Writer w = _hexDumpWriter;
-			if (w != null) {
-				try {
-					w.write(header);
-					w.write(NEW_LINE_CHARS);
-					hexDumpAligned(w, data, dataSize+4, globalOffset, _zeroAlignEachRecord);
-					w.flush();
-				} catch (IOException e) {
-					throw new RuntimeException(e);
-				}
-			}
-		}
-		public List<String> getRecentHeaders() {
-		    List<String> result = _headers;
-		    _headers = new ArrayList<String>();
-		    return result;
-		}
-		private static String formatRecordDetails(int globalOffset, int sid, int size, int recordCounter) {
-			StringBuilder sb = new StringBuilder(64);
-			sb.append("Offset=").append(HexDump.intToHex(globalOffset)).append("(").append(globalOffset).append(")");
-			sb.append(" recno=").append(recordCounter);
-			sb.append(  " sid=").append(HexDump.shortToHex(sid));
-			sb.append( " size=").append(HexDump.shortToHex(size)).append("(").append(size).append(")");
-			return sb.toString();
-		}
-	}
-
-	private interface IBiffRecordListener {
-
-		void processRecord(int globalOffset, int recordCounter, int sid, int dataSize, byte[] data);
-
-	}
-
-	/**
-	 * Wraps a plain {@link InputStream} and allows BIFF record information to be tapped off
-	 *
-	 */
-	private static final class BiffDumpingStream extends InputStream {
-		private final DataInputStream _is;
-		private final IBiffRecordListener _listener;
-		private final byte[] _data;
-		private int _recordCounter;
-		private int _overallStreamPos;
-		private int _currentPos;
-		private int _currentSize;
-		private boolean _innerHasReachedEOF;
-
-		public BiffDumpingStream(InputStream is, IBiffRecordListener listener) {
-			_is = new DataInputStream(is);
-			_listener = listener;
-			_data = new byte[RecordInputStream.MAX_RECORD_DATA_SIZE + 4];
-			_recordCounter = 0;
-			_overallStreamPos = 0;
-			_currentSize = 0;
-			_currentPos = 0;
-		}
-
-		@Override
-		public int read() throws IOException {
-			if (_currentPos >= _currentSize) {
-				fillNextBuffer();
-			}
-			if (_currentPos >= _currentSize) {
-				return -1;
-			}
-			int result = _data[_currentPos] & 0x00FF;
-			_currentPos ++;
-			_overallStreamPos ++;
-			formatBufferIfAtEndOfRec();
-			return result;
-		}
-		@Override
-		public int read(byte[] b, int off, int len) throws IOException {
-			if (_currentPos >= _currentSize) {
-				fillNextBuffer();
-			}
-			if (_currentPos >= _currentSize) {
-				return -1;
-			}
-			int availSize = _currentSize - _currentPos;
-			int result;
-			if (len > availSize) {
-				System.err.println("Unexpected request to read past end of current biff record");
-				result = availSize;
-			} else {
-				result = len;
-			}
-			System.arraycopy(_data, _currentPos, b, off, result);
-			_currentPos += result;
-			_overallStreamPos += result;
-			formatBufferIfAtEndOfRec();
-			return result;
-		}
-
-		@Override
-		public int available() throws IOException {
-			return _currentSize - _currentPos + _is.available();
-		}
-		private void fillNextBuffer() throws IOException {
-			if (_innerHasReachedEOF) {
-				return;
-			}
-			int b0 = _is.read();
-			if (b0 == -1) {
-				_innerHasReachedEOF = true;
-				return;
-			}
-			_data[0] = (byte) b0;
-			_is.readFully(_data, 1, 3);
-			int len = LittleEndian.getShort(_data, 2);
-			_is.readFully(_data, 4, len);
-			_currentPos = 0;
-			_currentSize = len + 4;
-			_recordCounter++;
-		}
-		private void formatBufferIfAtEndOfRec() {
-			if (_currentPos != _currentSize) {
-				return;
-			}
-			int dataSize = _currentSize-4;
-			int sid = LittleEndian.getShort(_data, 0);
-			int globalOffset = _overallStreamPos-_currentSize;
-			_listener.processRecord(globalOffset, _recordCounter, sid, dataSize, _data);
-		}
-		@Override
-		public void close() throws IOException {
-			_is.close();
-		}
-	}
-
-	private static final int DUMP_LINE_LEN = 16;
-	private static final char[] COLUMN_SEPARATOR = " | ".toCharArray();
-	/**
-	 * Hex-dumps a portion of a byte array in typical format, also preserving dump-line alignment
-	 * @param globalOffset (somewhat arbitrary) used to calculate the addresses printed at the
-	 * start of each line
-	 */
-	static void hexDumpAligned(Writer w, byte[] data, int dumpLen, int globalOffset,
-			boolean zeroAlignEachRecord) {
-		int baseDataOffset = 0;
-
-		// perhaps this code should be moved to HexDump
-		int globalStart = globalOffset + baseDataOffset;
-		int globalEnd = globalOffset + baseDataOffset + dumpLen;
-		int startDelta = globalStart % DUMP_LINE_LEN;
-		int endDelta = globalEnd % DUMP_LINE_LEN;
-		if (zeroAlignEachRecord) {
-			endDelta -= startDelta;
-			if (endDelta < 0) {
-				endDelta += DUMP_LINE_LEN;
-			}
-			startDelta = 0;
-		}
-		int startLineAddr;
-		int endLineAddr;
-		if (zeroAlignEachRecord) {
-			endLineAddr = globalEnd - endDelta - (globalStart - startDelta);
-			startLineAddr = 0;
-		} else {
-			startLineAddr = globalStart - startDelta;
-			endLineAddr = globalEnd - endDelta;
-		}
-
-		int lineDataOffset = baseDataOffset - startDelta;
-		int lineAddr = startLineAddr;
-
-		// output (possibly incomplete) first line
-		if (startLineAddr == endLineAddr) {
-			hexDumpLine(w, data, lineAddr, lineDataOffset, startDelta, endDelta);
-			return;
-		}
-		hexDumpLine(w, data, lineAddr, lineDataOffset, startDelta, DUMP_LINE_LEN);
-
-		// output all full lines in the middle
-		while (true) {
-			lineAddr += DUMP_LINE_LEN;
-			lineDataOffset += DUMP_LINE_LEN;
-			if (lineAddr >= endLineAddr) {
-				break;
-			}
-			hexDumpLine(w, data, lineAddr, lineDataOffset, 0, DUMP_LINE_LEN);
-		}
-
-
-		// output (possibly incomplete) last line
-		if (endDelta != 0) {
-			hexDumpLine(w, data, lineAddr, lineDataOffset, 0, endDelta);
-		}
-	}
-
-	private static void hexDumpLine(Writer w, byte[] data, int lineStartAddress, int lineDataOffset, int startDelta, int endDelta) {
-	    final char[] buf = new char[8+2*COLUMN_SEPARATOR.length+DUMP_LINE_LEN*3-1+DUMP_LINE_LEN+NEW_LINE_CHARS.length];
-
-	    if (startDelta >= endDelta) {
-			throw new IllegalArgumentException("Bad start/end delta");
-		}
-	    int idx=0;
-		try {
-			writeHex(buf, idx, lineStartAddress, 8);
-			idx = arraycopy(COLUMN_SEPARATOR, buf, idx+8);
-			// raw hex data
-			for (int i=0; i< DUMP_LINE_LEN; i++) {
-				if (i>0) {
-				    buf[idx++] = ' ';
-				}
-				if (i >= startDelta && i < endDelta) {
-					writeHex(buf, idx, data[lineDataOffset+i], 2);
-				} else {
-				    buf[idx] = ' ';
-				    buf[idx+1] = ' ';
-				}
-				idx += 2;
-			}
-			idx = arraycopy(COLUMN_SEPARATOR, buf, idx);
-
-			// interpreted ascii
-			for (int i=0; i< DUMP_LINE_LEN; i++) {
-			    char ch = ' ';
-				if (i >= startDelta && i < endDelta) {
-				    ch = getPrintableChar(data[lineDataOffset+i]);
-				}
-				buf[idx++] = ch;
-			}
-
-			idx = arraycopy(NEW_LINE_CHARS, buf, idx);
-			
-			w.write(buf, 0, idx);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private static int arraycopy(char[] in, char[] out, int pos) {
-	    int idx = pos;
-	    for (char c : in) {
-	        out[idx++] = c;
-	    }
-	    return idx;
-	}
-	
-	private static char getPrintableChar(byte b) {
-		char ib = (char) (b & 0x00FF);
-		if (ib < 32 || ib > 126) {
-			return '.';
-		}
-		return ib;
-	}
-
-	private static void writeHex(char buf[], int startInBuf, int value, int nDigits) throws IOException {
-		int acc = value;
-		for(int i=nDigits-1; i>=0; i--) {
-			int digit = acc & 0x0F;
-			buf[startInBuf+i] = (char) (digit < 10 ? ('0' + digit) : ('A' + digit - 10));
-			acc >>>= 4;
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java b/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
deleted file mode 100644
index b136e4c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
-import org.apache.poi.hssf.eventusermodel.HSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFRequest;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-/**
- *
- * @author  andy
- */
-
-public class EFBiffViewer
-{
-    String file;
-
-    /** Creates a new instance of EFBiffViewer */
-
-    public EFBiffViewer()
-    {
-    }
-
-    public void run() throws IOException {
-        NPOIFSFileSystem fs   = new NPOIFSFileSystem(new File(file), true);
-        try {
-            InputStream     din   = BiffViewer.getPOIFSInputStream(fs);
-            try {
-                HSSFRequest     req   = new HSSFRequest();
-        
-                req.addListenerForAllRecords(new HSSFListener()
-                {
-                    public void processRecord(Record rec)
-                    {
-                        System.out.println(rec.toString());
-                    }
-                });
-                HSSFEventFactory factory = new HSSFEventFactory();
-        
-                factory.processEvents(req, din);
-            } finally {
-                din.close();
-            }
-        } finally {
-            fs.close();
-        }
-    }
-
-    public void setFile(String file)
-    {
-        this.file = file;
-    }
-
-    public static void main(String [] args) throws IOException
-    {
-        if ((args.length == 1) && !args[ 0 ].equals("--help"))
-        {
-            EFBiffViewer viewer = new EFBiffViewer();
-
-            viewer.setFile(args[ 0 ]);
-            viewer.run();
-        }
-        else
-        {
-            System.out.println("EFBiffViewer");
-            System.out.println(
-                "Outputs biffview of records based on HSSFEventFactory");
-            System.out
-                .println("usage: java org.apache.poi.hssf.dev.EBBiffViewer "
-                         + "filename");
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java b/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
deleted file mode 100644
index 3426d4a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFactory;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.ss.formula.ptg.ExpPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-
-/**
- * FormulaViewer - finds formulas in a BIFF8 file and attempts to read them/display
- * data from them. Only works if Formulas are enabled in "RecordFactory"
- * @author  andy
- * @author Avik
- */
-
-public class FormulaViewer
-{
-    private String file;
-    private boolean list=false;
-
-    /** Creates new FormulaViewer */
-
-    public FormulaViewer()
-    {
-    }
-
-    /**
-     * Method run
-     * 
-     * @throws IOException if the file contained errors 
-     */
-    public void run() throws IOException {
-        NPOIFSFileSystem fs  = new NPOIFSFileSystem(new File(file), true);
-        try {
-            InputStream is = BiffViewer.getPOIFSInputStream(fs);
-            try {
-                List<Record> records = RecordFactory.createRecords(is);
-
-                for (Record record : records) {
-                    if (record.getSid() == FormulaRecord.sid) {
-                        if (list) {
-                            listFormula((FormulaRecord) record);
-                        } else {
-                            parseFormulaRecord((FormulaRecord) record);
-                        }
-                    }
-                }
-            } finally {
-                is.close();
-            }
-        } finally {
-            fs.close();
-        }
-    }
-    
-    private void listFormula(FormulaRecord record) {
-        String sep="~";
-        Ptg[] tokens= record.getParsedExpression();
-        Ptg token;
-        int numptgs = tokens.length;
-        String numArg;
-            token = tokens[numptgs-1];
-            if (token instanceof FuncPtg) {
-                numArg = String.valueOf(numptgs-1);
-            } else { 
-            	numArg = String.valueOf(-1);
-            }
-            
-            StringBuilder buf = new StringBuilder();
-            
-            if (token instanceof ExpPtg) return;
-            buf.append(token.toFormulaString());
-            buf.append(sep);
-            switch (token.getPtgClass()) {
-                case Ptg.CLASS_REF :
-                    buf.append("REF");
-                    break;
-                case Ptg.CLASS_VALUE :
-                    buf.append("VALUE");
-                    break;
-                case Ptg.CLASS_ARRAY :
-                    buf.append("ARRAY");
-                    break;
-                default:
-                    throwInvalidRVAToken(token);
-            }
-            
-            buf.append(sep);
-            if (numptgs>1) {
-                token = tokens[numptgs-2];
-                switch (token.getPtgClass()) {
-                    case Ptg.CLASS_REF :
-                        buf.append("REF");
-                        break;
-                    case Ptg.CLASS_VALUE :
-                        buf.append("VALUE");
-                        break;
-                    case Ptg.CLASS_ARRAY :
-                        buf.append("ARRAY");
-                        break;
-                    default:
-                        throwInvalidRVAToken(token);
-                }
-            }else {
-                buf.append("VALUE");
-            }
-            buf.append(sep);
-            buf.append(numArg);
-            System.out.println(buf.toString());
-    }
-
-    /**
-     * Method parseFormulaRecord
-     *
-     * @param record the record to be parsed
-     */
-    public void parseFormulaRecord(FormulaRecord record)
-    {
-        System.out.println("==============================");
-        System.out.print("row = " + record.getRow());
-        System.out.println(", col = " + record.getColumn());
-        System.out.println("value = " + record.getValue());
-        System.out.print("xf = " + record.getXFIndex());
-        System.out.print(", number of ptgs = "
-                           + record.getParsedExpression().length);
-        System.out.println(", options = " + record.getOptions());
-        System.out.println("RPN List = "+formulaString(record));
-        System.out.println("Formula text = "+ composeFormula(record));
-    }
-
-    private String formulaString(FormulaRecord record) {
-
-        StringBuilder buf = new StringBuilder();
-		Ptg[] tokens = record.getParsedExpression();
-		for (Ptg token : tokens) {
-			buf.append( token.toFormulaString());
-            switch (token.getPtgClass()) {
-                case Ptg.CLASS_REF :
-                    buf.append("(R)");
-                    break;
-                case Ptg.CLASS_VALUE :
-                    buf.append("(V)");
-                    break;
-                case Ptg.CLASS_ARRAY :
-                    buf.append("(A)");
-                    break;
-                default:
-                    throwInvalidRVAToken(token);
-            }
-            buf.append(' ');
-        } 
-        return buf.toString();
-    }
-    
-    private static void throwInvalidRVAToken(Ptg token) {
-        throw new IllegalStateException("Invalid RVA type (" + token.getPtgClass() + "). This should never happen.");
-    }
-    
-    
-    private static String composeFormula(FormulaRecord record)
-    {
-       return  HSSFFormulaParser.toFormulaString((HSSFWorkbook)null, record.getParsedExpression());
-    }
-
-    /**
-     * Method setFile
-     *
-     * @param file the file to process
-     */
-
-    public void setFile(String file)
-    {
-        this.file = file;
-    }
-    
-    public void setList(boolean list) {
-        this.list=list;
-    }
-
-    /**
-     * Method main
-     *
-     * pass me a filename and I'll try and parse the formulas from it
-     *
-     * @param args pass one argument with the filename or --help
-     * @throws IOException if the file can't be read or contained errors
-     */
-    public static void main(String args[]) throws IOException
-    {
-        if ((args == null) || (args.length >2 )
-                || args[ 0 ].equals("--help"))
-        {
-            System.out.println(
-                "FormulaViewer .8 proof that the devil lies in the details (or just in BIFF8 files in general)");
-            System.out.println("usage: Give me a big fat file name");
-        } else if (args[0].equals("--listFunctions")) { // undocumented attribute to research functions!~
-            FormulaViewer viewer = new FormulaViewer();
-            viewer.setFile(args[1]);
-            viewer.setList(true);
-            viewer.run();
-        }
-        else
-        {
-            FormulaViewer viewer = new FormulaViewer();
-
-            viewer.setFile(args[ 0 ]);
-            viewer.run();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/dev/ReSave.java b/trunk/src/java/org/apache/poi/hssf/dev/ReSave.java
deleted file mode 100644
index 7f19888..0000000
--- a/trunk/src/java/org/apache/poi/hssf/dev/ReSave.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package org.apache.poi.hssf.dev;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- *  Utility to test that POI produces readable output
- *  after re-saving xls files.
- *
- *  Usage: ReSave [-dg] input.xls
- *    -dg    initialize drawings, causes to re-build escher aggregates in all sheets
- *    -bos   only write to memory instead of a file
- */
-public class ReSave {
-    public static void main(String[] args) throws Exception {
-        boolean initDrawing = false;
-        boolean saveToMemory = false;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        for(String filename : args) {
-            if(filename.equals("-dg")) {
-                initDrawing = true;
-            } else if(filename.equals("-bos")) {
-                saveToMemory = true;
-            } else {
-                System.out.print("reading " + filename + "...");
-                FileInputStream is = new FileInputStream(filename);
-                HSSFWorkbook wb = new HSSFWorkbook(is);
-                try {
-                    System.out.println("done");
-    
-                    for(int i = 0; i < wb.getNumberOfSheets(); i++){
-                        HSSFSheet sheet = wb.getSheetAt(i);
-                        if(initDrawing) {
-                            /*HSSFPatriarch dg =*/ sheet.getDrawingPatriarch();
-                        }
-                    }
-
-                    OutputStream os;
-                    if (saveToMemory) {
-                        bos.reset();
-                        os = bos;
-                    } else {
-                        String outputFile = filename.replace(".xls", "-saved.xls");
-                        System.out.print("saving to " + outputFile + "...");
-                        os = new FileOutputStream(outputFile);
-                    }
-                    
-                    try {
-                        wb.write(os);
-                    } finally {
-                        os.close();
-                    }
-                    System.out.println("done");
-                } finally {
-                    wb.close();
-                    is.close();
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java b/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java
deleted file mode 100644
index 8cb71e5..0000000
--- a/trunk/src/java/org/apache/poi/hssf/dev/RecordLister.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFactory;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-/**
- * This is a low-level debugging class, which simply prints
- *  out what records come in what order.
- * Most people will want to use {@link BiffViewer} or
- *  {@link EFBiffViewer}, but this can be handy when
- *  trying to make sense of {@link ContinueRecord}
- *  special cases.
- * 
- * Output is of the form:
- *  SID - Length - Type (if known)
- *    byte0 byte1 byte2 byte3 .... byte(n-4) byte(n-3) byte(n-2) byte(n-1)
- */
-public class RecordLister
-{
-    String file;
-
-    public RecordLister()
-    {
-    }
-
-    public void run()
-        throws IOException
-    {
-        NPOIFSFileSystem  fs    = new NPOIFSFileSystem(new File(file), true);
-        try {
-            InputStream       din   = BiffViewer.getPOIFSInputStream(fs);
-            try {
-                RecordInputStream rinp  = new RecordInputStream(din);
-        
-                while(rinp.hasNextRecord()) {
-                   int sid  = rinp.getNextSid();
-                   rinp.nextRecord();
-                   
-                   int size = rinp.available();
-                   Class<? extends Record> clz = RecordFactory.getRecordClass(sid);
-                   
-                   System.out.print(
-                         formatSID(sid) +
-                         " - " +
-                         formatSize(size) +
-                         " bytes"
-                   );
-                   if(clz != null) {
-                      System.out.print("  \t");
-                      System.out.print(clz.getName().replace("org.apache.poi.hssf.record.", ""));
-                   }
-                   System.out.println();
-                   
-                   byte[] data = rinp.readRemainder();
-                   if(data.length > 0) {
-                      System.out.print("   ");
-                      System.out.println( formatData(data) );
-                   }
-                }
-            } finally {
-                din.close();
-            }
-        } finally {
-            fs.close();
-        }
-    }
-    
-    private static String formatSID(int sid) {
-       String hex = Integer.toHexString(sid);
-       String dec = Integer.toString(sid);
-       
-       StringBuffer s = new StringBuffer();
-       s.append("0x");
-       for(int i=hex.length(); i<4; i++) {
-          s.append('0');
-       }
-       s.append(hex);
-       
-       s.append(" (");
-       for(int i=dec.length(); i<4; i++) {
-          s.append('0');
-       }
-       s.append(dec);
-       s.append(")");
-       
-       return s.toString();
-    }
-    private static String formatSize(int size) {
-       String hex = Integer.toHexString(size);
-       String dec = Integer.toString(size);
-       
-       StringBuffer s = new StringBuffer();
-       for(int i=hex.length(); i<3; i++) {
-          s.append('0');
-       }
-       s.append(hex);
-       
-       s.append(" (");
-       for(int i=dec.length(); i<3; i++) {
-          s.append('0');
-       }
-       s.append(dec);
-       s.append(")");
-       
-       return s.toString();
-    }
-    private static String formatData(byte[] data) {
-       if(data == null || data.length == 0)
-          return "";
-       
-       // If possible, do first 4 and last 4 bytes
-       StringBuffer s = new StringBuffer();
-       if(data.length > 9) {
-          s.append(byteToHex(data[0]));
-          s.append(' ');
-          s.append(byteToHex(data[1]));
-          s.append(' ');
-          s.append(byteToHex(data[2]));
-          s.append(' ');
-          s.append(byteToHex(data[3]));
-          s.append(' ');
-          
-          s.append(" .... ");
-          
-          s.append(' ');
-          s.append(byteToHex(data[data.length-4]));
-          s.append(' ');
-          s.append(byteToHex(data[data.length-3]));
-          s.append(' ');
-          s.append(byteToHex(data[data.length-2]));
-          s.append(' ');
-          s.append(byteToHex(data[data.length-1]));
-       } else {
-          for(int i=0; i<data.length; i++) {
-             s.append(byteToHex(data[i]));
-             s.append(' ');
-          }
-       }
-       
-       return s.toString();
-    }
-    private static String byteToHex(byte b) {
-       int i = b;
-       if(i<0) {
-          i += 256;
-       }
-       String s = Integer.toHexString(i);
-       if(i < 16) {
-          return "0" + s; 
-       }
-       return s;
-    }
-
-    public void setFile(String file)
-    {
-        this.file = file;
-    }
-
-    public static void main(String [] args) throws IOException
-    {
-        if ((args.length == 1) && !args[ 0 ].equals("--help"))
-        {
-            RecordLister viewer = new RecordLister();
-
-            viewer.setFile(args[ 0 ]);
-            viewer.run();
-        }
-        else
-        {
-            System.out.println("RecordLister");
-            System.out.println(
-                "Outputs the summary of the records in file order");
-            System.out
-                .println("usage: java org.apache.poi.hssf.dev.RecordLister "
-                         + "filename");
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/dev/package.html b/trunk/src/java/org/apache/poi/hssf/dev/package.html
deleted file mode 100644
index 4d6187b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/dev/package.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-DEV package serves two purposes.  1. Examples for how to use HSSF and 2. tools for developing
-and validating HSSF.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/hssf/eventmodel/ERFListener.java b/trunk/src/java/org/apache/poi/hssf/eventmodel/ERFListener.java
deleted file mode 100644
index 9127649..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventmodel/ERFListener.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventmodel;
-
-import org.apache.poi.hssf.record.Record;
-
-/**
- * An ERFListener is registered with the EventRecordFactory.
- * An ERFListener listens for Records coming from the stream
- * via the EventRecordFactory
- * 
- * @see EventRecordFactory
- */
-public interface ERFListener
-{
-    /**
-     * Process a Record.  This method is called by the 
-     * EventRecordFactory when a record is returned.
-     * 
-     * @param rec the record to be processed
-     * 
-     * @return boolean specifying whether the effort was a success.
-     */
-    public boolean processRecord(Record rec);
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java b/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
deleted file mode 100644
index 519d4bb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventmodel;
-
-import java.io.InputStream;
-import java.util.Arrays;
-
-import org.apache.poi.hssf.record.*;
-
-/**
- * Event-based record factory.  As opposed to RecordFactory
- * this version sends {@link ERFListener#processRecord(Record) } messages to
- * the supplied listener.  Record notifications are sent one record behind
- * to ensure that {@link ContinueRecord}s are processed first.
- */
-public final class EventRecordFactory {
-
-	private final ERFListener _listener;
-	private final short[] _sids;
-
-	/**
-	 * Create an EventRecordFactory
-	 *
-	 * @param listener the listener to be informed about events
-	 * @param sids an array of Record.sid values identifying the records
-	 * the listener will work with.  Alternatively if this is "null" then
-	 * all records are passed. For all 'known' record types use {@link RecordFactory#getAllKnownRecordSIDs()}
-	 */
-	public EventRecordFactory(ERFListener listener, short[] sids) {
-		_listener = listener;
-		if (sids == null) {
-			_sids = null;
-		} else {
-			_sids = sids.clone();
-			Arrays.sort(_sids); // for faster binary search
-		}
-	}
-	private boolean isSidIncluded(short sid) {
-		if (_sids == null) {
-			return true;
-		}
-		return Arrays.binarySearch(_sids, sid) >= 0;
-	}
-
-
-	/**
-	 * sends the record event to all registered listeners.
-	 * @param record the record to be thrown.
-	 * @return <code>false</code> to abort.  This aborts
-	 * out of the event loop should the listener return false
-	 */
-	private boolean processRecord(Record record) {
-		if (!isSidIncluded(record.getSid())) {
-			return true;
-		}
-		return _listener.processRecord(record);
-	}
-
-	/**
-	 * Create an array of records from an input stream
-	 *
-	 * @param in the InputStream from which the records will be
-	 *		   obtained
-	 *
-	 * @exception RecordFormatException on error processing the
-	 *			InputStream
-	 */
-	public void processRecords(InputStream in) throws RecordFormatException {
-		Record last_record = null;
-
-		RecordInputStream recStream = new RecordInputStream(in);
-
-		while (recStream.hasNextRecord()) {
-			recStream.nextRecord();
-			Record[] recs = RecordFactory.createRecord(recStream);   // handle MulRK records
-			if (recs.length > 1) {
-				for (Record rec : recs) {
-					if ( last_record != null ) {
-						if (!processRecord(last_record)) {
-							return;
-						}
-					}
-					last_record = rec; // do to keep the algorithm homogeneous...you can't
-				}							// actually continue a number record anyhow.
-			} else {
-				Record record = recs[ 0 ];
-
-				if (record != null) {
-					if (last_record != null) {
-						if (!processRecord(last_record)) {
-							return;
-						}
-					}
-					 last_record = record;
-				}
-			}
-		}
-
-		if (last_record != null) {
-			processRecord(last_record);
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
deleted file mode 100644
index 9000a74..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.eventusermodel;
-
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.eventusermodel.HSSFUserException;
-
-/**
- * Abstract class for use with the HSSFRequest and HSSFEventFactory, which
- *  allows for the halting of processing. 
- * Users should create subclass of this (which implements the usual
- *  HSSFListener), and then override the #abortableProcessRecord(Record)
- *  method to do their processing.
- * This should then be registered with the HSSFRequest (associating
- * it with Record SID's) as usual.
- *
- * @see org.apache.poi.hssf.eventusermodel.HSSFEventFactory
- * @see org.apache.poi.hssf.eventusermodel.HSSFRequest
- * @see org.apache.poi.hssf.eventusermodel.HSSFUserException
- */
-
-public abstract class AbortableHSSFListener implements HSSFListener
-{
-    /**
-     * This method, inherited from HSSFListener is implemented as a stub.
-     * It is never called by HSSFEventFactory or HSSFRequest.
-     * You should implement #abortableProcessRecord instead
-     */
-	@Override
-    public void processRecord(Record record)
-	{
-	}
-
-   /**
-	 * Process an HSSF Record. Called when a record occurs in an HSSF file. 
-	 * Provides two options for halting the processing of the HSSF file.
-	 *
-	 * The return value provides a means of non-error termination with a 
-	 * user-defined result code. A value of zero must be returned to 
-	 * continue processing, any other value will halt processing by
-	 * <code>HSSFEventFactory</code> with the code being passed back by 
-	 * its abortable process events methods.
-	 * 
-	 * Error termination can be done by throwing the HSSFUserException.
-	 *
-	 * Note that HSSFEventFactory will not call the inherited process 
-	 *
-	 * @param record the record to be processed
-	 *
-     * @return result code of zero for continued processing.
-     *
-	 * @throws HSSFUserException User code can throw this to abort 
-	 * file processing by HSSFEventFactory and return diagnostic information.
-     */
-    public abstract short abortableProcessRecord(Record record) throws HSSFUserException;
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
deleted file mode 100644
index eb65517..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.eventusermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * When working with the EventUserModel, if you want to
- *  process formulas, you need an instance of
- *  {@link InternalWorkbook} to pass to a {@link HSSFWorkbook},
- *  to finally give to {@link HSSFFormulaParser},
- *  and this will build you stub ones.
- * Since you're working with the EventUserModel, you
- *  wouldn't want to get a full {@link InternalWorkbook} and
- *  {@link HSSFWorkbook}, as they would eat too much memory.
- *  Instead, you should collect a few key records as they
- *  go past, then call this once you have them to build a
- *  stub {@link InternalWorkbook}, and from that a stub
- *  {@link HSSFWorkbook}, to use with the {@link HSSFFormulaParser}.
- *
- * The records you should collect are:
- *  * {@link ExternSheetRecord}
- *  * {@link BoundSheetRecord}
- * You should probably also collect {@link SSTRecord},
- *  but it's not required to pass this in.
- *
- * To help, this class includes a HSSFListener wrapper
- *  that will do the collecting for you.
- */
-public class EventWorkbookBuilder {
-
-
-	/**
-	 * Creates a stub Workbook from the supplied records,
-	 *  suitable for use with the {@link HSSFFormulaParser}
-	 * @param externs The ExternSheetRecords in your file
-	 * @param bounds The BoundSheetRecords in your file
-	 * @param sst The SSTRecord in your file.
-	 * @return A stub Workbook suitable for use with {@link HSSFFormulaParser}
-	 */
-	public static InternalWorkbook createStubWorkbook(ExternSheetRecord[] externs,
-			BoundSheetRecord[] bounds, SSTRecord sst) {
-		List<Record> wbRecords = new ArrayList<Record>();
-
-		// Core Workbook records go first
-		if(bounds != null) {
-			for (BoundSheetRecord bound : bounds) {
-				wbRecords.add(bound);
-			}
-		}
-		if(sst != null) {
-			wbRecords.add(sst);
-		}
-
-		// Now we can have the ExternSheetRecords,
-		//  preceded by a SupBookRecord
-		if(externs != null) {
-			wbRecords.add(SupBookRecord.createInternalReferences(
-					(short)externs.length));
-			for (ExternSheetRecord extern : externs) {
-				wbRecords.add(extern);
-			}
-		}
-
-		// Finally we need an EoF record
-		wbRecords.add(EOFRecord.instance);
-
-		return InternalWorkbook.createWorkbook(wbRecords);
-	}
-
-	/**
-	 * Creates a stub workbook from the supplied records,
-	 *  suitable for use with the {@link HSSFFormulaParser}
-	 * @param externs The ExternSheetRecords in your file
-	 * @param bounds The BoundSheetRecords in your file
-	 * @return A stub Workbook suitable for use with {@link HSSFFormulaParser}
-	 */
-	public static InternalWorkbook createStubWorkbook(ExternSheetRecord[] externs,
-			BoundSheetRecord[] bounds) {
-		return createStubWorkbook(externs, bounds, null);
-	}
-
-
-	/**
-	 * A wrapping HSSFListener which will collect
-	 *  {@link BoundSheetRecord}s and {@link ExternSheetRecord}s as
-	 *  they go past, so you can create a Stub {@link InternalWorkbook} from
-	 *  them once required.
-	 */
-	public static class SheetRecordCollectingListener implements HSSFListener {
-		private final HSSFListener childListener;
-		private final List<BoundSheetRecord> boundSheetRecords = new ArrayList<BoundSheetRecord>();
-		private final List<ExternSheetRecord> externSheetRecords = new ArrayList<ExternSheetRecord>();
-		private SSTRecord sstRecord = null;
-
-		public SheetRecordCollectingListener(HSSFListener childListener) {
-			this.childListener = childListener;
-		}
-
-
-		public BoundSheetRecord[] getBoundSheetRecords() {
-			return boundSheetRecords.toArray(
-					new BoundSheetRecord[boundSheetRecords.size()]
-			);
-		}
-		public ExternSheetRecord[] getExternSheetRecords() {
-			return externSheetRecords.toArray(
-					new ExternSheetRecord[externSheetRecords.size()]
-			);
-		}
-		public SSTRecord getSSTRecord() {
-			return sstRecord;
-		}
-
-		public HSSFWorkbook getStubHSSFWorkbook() {
-		    // Create a base workbook
-		    HSSFWorkbook wb = HSSFWorkbook.create(getStubWorkbook());
-		    // Stub the sheets, so sheet name lookups work
-		    for (BoundSheetRecord bsr : boundSheetRecords) {
-		        wb.createSheet(bsr.getSheetname());
-		    }
-		    // Ready for Formula use!
-		    return wb;
-		}
-		public InternalWorkbook getStubWorkbook() {
-			return createStubWorkbook(
-					getExternSheetRecords(), getBoundSheetRecords(),
-					getSSTRecord()
-			);
-		}
-
-
-		/**
-		 * Process this record ourselves, and then
-		 *  pass it on to our child listener
-		 */
-		@Override
-        public void processRecord(Record record) {
-			// Handle it ourselves
-			processRecordInternally(record);
-
-			// Now pass on to our child
-			childListener.processRecord(record);
-		}
-
-		/**
-		 * Process the record ourselves, but do not
-		 *  pass it on to the child Listener.
-		 *  
-		 * @param record the record to be processed
-		 */
-		public void processRecordInternally(Record record) {
-			if(record instanceof BoundSheetRecord) {
-				boundSheetRecords.add((BoundSheetRecord)record);
-			}
-			else if(record instanceof ExternSheetRecord) {
-				externSheetRecords.add((ExternSheetRecord)record);
-			}
-			else if(record instanceof SSTRecord) {
-				sstRecord = (SSTRecord)record;
-			}
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
deleted file mode 100644
index 4a78696..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.eventusermodel;
-
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.usermodel.HSSFDataFormat;
-import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * A proxy HSSFListener that keeps track of the document formatting records, and
- * provides an easy way to look up the format strings used by cells from their
- * ids.
- */
-public class FormatTrackingHSSFListener implements HSSFListener {
-	private static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class);
-	private final HSSFListener _childListener;
-	private final HSSFDataFormatter _formatter;
-	private final NumberFormat _defaultFormat;
-	private final Map<Integer, FormatRecord> _customFormatRecords = new HashMap<Integer, FormatRecord>();
-	private final List<ExtendedFormatRecord> _xfRecords = new ArrayList<ExtendedFormatRecord>();
-
-	/**
-	 * Creates a format tracking wrapper around the given listener, using
-	 * the {@link Locale#getDefault() default locale} for the formats.
-	 * 
-	 * @param childListener the listener to be wrapped
-	 */
-	public FormatTrackingHSSFListener(HSSFListener childListener) {
-		this(childListener, LocaleUtil.getUserLocale());
-	}
-
-	/**
-	 * Creates a format tracking wrapper around the given listener, using
-	 * the given locale for the formats.
-     * 
-     * @param childListener the listener to be wrapped
-     * @param locale the locale for the formats
-	 */
-	public FormatTrackingHSSFListener(
-			HSSFListener childListener, Locale locale) {
-		_childListener = childListener;
-		_formatter = new HSSFDataFormatter(locale);
-		_defaultFormat = NumberFormat.getInstance(locale);
-	}
-
-	protected int getNumberOfCustomFormats() {
-		return _customFormatRecords.size();
-	}
-
-	protected int getNumberOfExtendedFormats() {
-		return _xfRecords.size();
-	}
-
-	/**
-	 * Process this record ourselves, and then pass it on to our child listener
-	 */
-	@Override
-    public void processRecord(Record record) {
-		// Handle it ourselves
-		processRecordInternally(record);
-
-		// Now pass on to our child
-		_childListener.processRecord(record);
-	}
-
-	/**
-	 * Process the record ourselves, but do not pass it on to the child
-	 * Listener.
-	 *
-	 * @param record the record to be processed
-	 */
-	public void processRecordInternally(Record record) {
-		if (record instanceof FormatRecord) {
-			FormatRecord fr = (FormatRecord) record;
-			_customFormatRecords.put(Integer.valueOf(fr.getIndexCode()), fr);
-		}
-		if (record instanceof ExtendedFormatRecord) {
-			ExtendedFormatRecord xr = (ExtendedFormatRecord) record;
-			_xfRecords.add(xr);
-		}
-	}
-
-	/**
-	 * Formats the given numeric of date cells contents as a String, in as
-	 * close as we can to the way that Excel would do so. Uses the various
-	 * format records to manage this.
-	 *
-	 * TODO - move this to a central class in such a way that hssf.usermodel can
-	 * make use of it too
-	 * 
-	 * @param cell the cell
-	 * 
-	 * @return the given numeric of date cells contents as a String
-	 */
-	public String formatNumberDateCell(CellValueRecordInterface cell) {
-		double value;
-		if (cell instanceof NumberRecord) {
-			value = ((NumberRecord) cell).getValue();
-		} else if (cell instanceof FormulaRecord) {
-			value = ((FormulaRecord) cell).getValue();
-		} else {
-			throw new IllegalArgumentException("Unsupported CellValue Record passed in " + cell);
-		}
-
-		// Get the built in format, if there is one
-		int formatIndex = getFormatIndex(cell);
-		String formatString = getFormatString(cell);
-
-		if (formatString == null) {
-			return _defaultFormat.format(value);
-		}
-		// Format, using the nice new
-		// HSSFDataFormatter to do the work for us
-		return _formatter.formatRawCellContents(value, formatIndex, formatString);
-	}
-
-	/**
-	 * Returns the format string, eg $##.##, for the given number format index.
-	 * 
-	 * @param formatIndex the format index
-	 * 
-	 * @return the format string
-	 */
-	public String getFormatString(int formatIndex) {
-		String format = null;
-		if (formatIndex >= HSSFDataFormat.getNumberOfBuiltinBuiltinFormats()) {
-			FormatRecord tfr = _customFormatRecords.get(Integer.valueOf(formatIndex));
-			if (tfr == null) {
-				logger.log( POILogger.ERROR, "Requested format at index " + formatIndex
-						+ ", but it wasn't found");
-			} else {
-				format = tfr.getFormatString();
-			}
-		} else {
-			format = HSSFDataFormat.getBuiltinFormat((short) formatIndex);
-		}
-		return format;
-	}
-
-	/**
-	 * Returns the format string, eg $##.##, used by your cell
-	 * 
-	 * @param cell the cell
-	 * 
-	 * @return the format string
-	 */
-	public String getFormatString(CellValueRecordInterface cell) {
-		int formatIndex = getFormatIndex(cell);
-		if (formatIndex == -1) {
-			// Not found
-			return null;
-		}
-		return getFormatString(formatIndex);
-	}
-
-	/**
-	 * Returns the index of the format string, used by your cell, or -1 if none found
-	 * 
-	 * @param cell the cell
-	 * 
-	 * @return the index of the format string
-	 */
-	public int getFormatIndex(CellValueRecordInterface cell) {
-		ExtendedFormatRecord xfr = _xfRecords.get(cell.getXFIndex());
-		if (xfr == null) {
-			logger.log( POILogger.ERROR, "Cell " + cell.getRow() + "," + cell.getColumn()
-					+ " uses XF with index " + cell.getXFIndex() + ", but we don't have that");
-			return -1;
-		}
-		return xfr.getFormatIndex();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
deleted file mode 100644
index 929ec6c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Set;
-
-import org.apache.poi.hssf.eventusermodel.HSSFUserException;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import static org.apache.poi.hssf.model.InternalWorkbook.WORKBOOK_DIR_ENTRY_NAMES;
-
-/**
- * Low level event based HSSF reader.  Pass either a DocumentInputStream to
- * process events along with a request object or pass a POIFS POIFSFileSystem to
- * processWorkbookEvents along with a request.
- *
- * This will cause your file to be processed a record at a time.  Each record with
- * a static id matching one that you have registered in your HSSFRequest will be passed
- * to your associated HSSFListener.
- */
-public class HSSFEventFactory {
-	/** Creates a new instance of HSSFEventFactory */
-	public HSSFEventFactory() {
-		// no instance fields
-	}
-
-	/**
-	 * Processes a file into essentially record events.
-	 *
-	 * @param req an Instance of HSSFRequest which has your registered listeners
-	 * @param fs  a POIFS filesystem containing your workbook
-     * 
-     * @throws IOException if the workbook contained errors 
-	 */
-	public void processWorkbookEvents(HSSFRequest req, POIFSFileSystem fs) throws IOException {
-	   processWorkbookEvents(req, fs.getRoot());
-	}
-
-   /**
-    * Processes a file into essentially record events.
-    *
-    * @param req an Instance of HSSFRequest which has your registered listeners
-    * @param dir  a DirectoryNode containing your workbook
-    * 
-    * @throws IOException if the workbook contained errors 
-    */
-    public void processWorkbookEvents(HSSFRequest req, DirectoryNode dir) throws IOException {
-        // some old documents have "WORKBOOK" or "BOOK"
-        String name = null;
-        Set<String> entryNames = dir.getEntryNames();
-        for (String potentialName : WORKBOOK_DIR_ENTRY_NAMES) {
-            if (entryNames.contains(potentialName)) {
-                name = potentialName;
-                break;
-            }
-        }
-        // If in doubt, go for the default
-        if (name == null) {
-            name = WORKBOOK_DIR_ENTRY_NAMES[0];
-        }
-
-        InputStream in = dir.createDocumentInputStream(name);
-        try {
-            processEvents(req, in);
-        } finally {
-            in.close();
-        }
-    }
-
-   /**
-    * Processes a file into essentially record events.
-    *
-    * @param req an Instance of HSSFRequest which has your registered listeners
-    * @param fs  a POIFS filesystem containing your workbook
-    * @return    numeric user-specified result code.
-    * 
-    * @throws HSSFUserException if the processing should be aborted
-    * @throws IOException if the workbook contained errors 
-    */
-   public short abortableProcessWorkbookEvents(HSSFRequest req, POIFSFileSystem fs)
-      throws IOException, HSSFUserException {
-      return abortableProcessWorkbookEvents(req, fs.getRoot());
-   }
-
-	/**
-	 * Processes a file into essentially record events.
-	 *
-	 * @param req an Instance of HSSFRequest which has your registered listeners
-	 * @param dir  a DirectoryNode containing your workbook
-	 * @return    numeric user-specified result code.
-	 * 
-	 * @throws HSSFUserException if the processing should be aborted
-	 * @throws IOException if the workbook contained errors 
-	 */
-	public short abortableProcessWorkbookEvents(HSSFRequest req, DirectoryNode dir)
-		throws IOException, HSSFUserException {
-		InputStream in = dir.createDocumentInputStream("Workbook");
-		try {
-		    return abortableProcessEvents(req, in);
-		} finally {
-		    in.close();
-		}
-	}
-
-	/**
-	 * Processes a DocumentInputStream into essentially Record events.
-	 *
-	 * If an <code>AbortableHSSFListener</code> causes a halt to processing during this call
-	 * the method will return just as with <code>abortableProcessEvents</code>, but no
-	 * user code or <code>HSSFUserException</code> will be passed back.
-	 *
-	 * @see org.apache.poi.poifs.filesystem.POIFSFileSystem#createDocumentInputStream(String)
-	 * @param req an Instance of HSSFRequest which has your registered listeners
-	 * @param in  a DocumentInputStream obtained from POIFS's POIFSFileSystem object
-	 */
-	public void processEvents(HSSFRequest req, InputStream in) {
-		try {
-			genericProcessEvents(req, in);
-		} catch (HSSFUserException hue) {
-			/*If an HSSFUserException user exception is thrown, ignore it.*/
-		}
-	}
-
-
-	/**
-	 * Processes a DocumentInputStream into essentially Record events.
-	 *
-	 * @see org.apache.poi.poifs.filesystem.POIFSFileSystem#createDocumentInputStream(String)
-	 * @param req an Instance of HSSFRequest which has your registered listeners
-	 * @param in  a DocumentInputStream obtained from POIFS's POIFSFileSystem object
-	 * @return    numeric user-specified result code.
-	 * 
-	 * @throws HSSFUserException if the processing should be aborted 
-	 */
-	public short abortableProcessEvents(HSSFRequest req, InputStream in)
-		throws HSSFUserException {
-		return genericProcessEvents(req, in);
-	}
-
-	/**
-	 * Processes a DocumentInputStream into essentially Record events.
-	 *
-	 * @see org.apache.poi.poifs.filesystem.POIFSFileSystem#createDocumentInputStream(String)
-	 * @param req an Instance of HSSFRequest which has your registered listeners
-	 * @param in  a DocumentInputStream obtained from POIFS's POIFSFileSystem object
-	 * @return    numeric user-specified result code.
-	 */
-	private short genericProcessEvents(HSSFRequest req, InputStream in)
-		throws HSSFUserException {
-		short userCode = 0;
-
-		// Create a new RecordStream and use that
-		RecordFactoryInputStream recordStream = new RecordFactoryInputStream(in, false);
-
-		// Process each record as they come in
-		while(true) {
-			Record r = recordStream.nextRecord();
-			if(r == null) {
-				break;
-			}
-			userCode = req.processRecord(r);
-			if (userCode != 0) {
-				break;
-			}
-		}
-
-		// All done, return our last code
-		return userCode;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
deleted file mode 100644
index 8932b10..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-
-import org.apache.poi.hssf.record.Record;
-
-/**
- * Interface for use with the HSSFRequest and HSSFEventFactory.  Users should create
- * a listener supporting this interface and register it with the HSSFRequest (associating
- * it with Record SID's).
- *
- * @see org.apache.poi.hssf.eventusermodel.HSSFEventFactory
- * @see org.apache.poi.hssf.eventusermodel.HSSFRequest
- */
-
-public interface HSSFListener
-{
-
-    /**
-     * process an HSSF Record. Called when a record occurs in an HSSF file.
-     * 
-     * @param record the record to be processed
-     */
-    public void processRecord(Record record);
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
deleted file mode 100644
index 64c11aa..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFactory;
-
-/**
- * An HSSFRequest object should be constructed registering an instance or multiple
- * instances of HSSFListener with each Record.sid you wish to listen for.
- *
- * @see org.apache.poi.hssf.eventusermodel.HSSFEventFactory
- * @see org.apache.poi.hssf.eventusermodel.HSSFListener
- * @see org.apache.poi.hssf.eventusermodel.HSSFUserException
- */
-public class HSSFRequest {
-	private final Map<Short, List<HSSFListener>> _records;
-
-	/** Creates a new instance of HSSFRequest */
-	public HSSFRequest() {
-		_records = new HashMap<Short, List<HSSFListener>>(50); // most folks won't listen for too many of these
-	}
-
-	/**
-	 * add an event listener for a particular record type.  The trick is you have to know
-	 * what the records are for or just start with our examples and build on them.  Alternatively,
-	 * you CAN call addListenerForAllRecords and you'll receive ALL record events in one listener,
-	 * but if you like to squeeze every last byte of efficiency out of life you my not like this.
-	 * (its sure as heck what I plan to do)
-	 *
-	 * @see #addListenerForAllRecords(HSSFListener)
-	 *
-	 * @param lsnr for the event
-	 * @param sid identifier for the record type this is the .sid static member on the individual records
-	 *        for example req.addListener(myListener, BOFRecord.sid)
-	 */
-	public void addListener(HSSFListener lsnr, short sid) {
-		List<HSSFListener> list = _records.get(Short.valueOf(sid));
-
-		if (list == null) {
-			list = new ArrayList<HSSFListener>(1); // probably most people will use one listener
-			_records.put(Short.valueOf(sid), list);
-		}
-		list.add(lsnr);
-	}
-
-	/**
-	 * This is the equivalent of calling addListener(myListener, sid) for EVERY
-	 * record in the org.apache.poi.hssf.record package. This is for lazy
-	 * people like me. You can call this more than once with more than one listener, but
-	 * that seems like a bad thing to do from a practice-perspective unless you have a
-	 * compelling reason to do so (like maybe you send the event two places or log it or
-	 * something?).
-	 *
-	 * @param lsnr a single listener to associate with ALL records
-	 */
-	public void addListenerForAllRecords(HSSFListener lsnr) {
-		short[] rectypes = RecordFactory.getAllKnownRecordSIDs();
-
-		for (short rectype : rectypes) {
-			addListener(lsnr, rectype);
-		}
-	}
-
-	/**
-	 * Called by HSSFEventFactory, passes the Record to each listener associated with
-	 * a record.sid.
-	 * 
-	 * @param rec the record to be processed
-	 *
-	 * @return numeric user-specified result code. If zero continue processing.
-	 * @throws HSSFUserException User exception condition
-	 */
-	protected short processRecord(Record rec) throws HSSFUserException {
-		List<HSSFListener> listeners = _records.get(Short.valueOf(rec.getSid()));
-		short userCode = 0;
-
-		if (listeners != null) {
-
-			for (int k = 0; k < listeners.size(); k++) {
-				Object listenObj = listeners.get(k);
-				if (listenObj instanceof AbortableHSSFListener) {
-					AbortableHSSFListener listener = (AbortableHSSFListener) listenObj;
-					userCode = listener.abortableProcessRecord(rec);
-					if (userCode != 0)
-						break;
-				} else {
-					HSSFListener listener = (HSSFListener) listenObj;
-					listener.processRecord(rec);
-				}
-			}
-		}
-		return userCode;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
deleted file mode 100644
index a104c25..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.eventusermodel;
-
-/**
- * <p>This exception is provided as a way for API users to throw 
- * exceptions from their event handling code. By doing so they
- * abort file processing by the HSSFEventFactory and by
- * catching it from outside the HSSFEventFactory.processEvents 
- * method they can diagnose the cause for the abort.</p>
- *
- * <p>The HSSFUserException supports a nested "reason"
- * throwable, i.e. an exception that caused this one to be thrown.</p>
- *
- * <p>The HSSF package does not itself throw any of these 
- * exceptions.</p>
- *
- * @version HSSFUserException.java,v 1.0
- * @since 2002-04-19
- */
-public class HSSFUserException extends Exception
-{
-
-    private Throwable reason;
-
-
-
-    /**
-     * <p>Creates a new {@link HSSFUserException}.</p>
-     */
-    public HSSFUserException()
-    {
-        super();
-    }
-
-
-
-    /**
-     * <p>Creates a new {@link HSSFUserException} with a message
-     * string.</p>
-     * 
-     * @param msg the error message
-     */
-    public HSSFUserException(final String msg)
-    {
-        super(msg);
-    }
-
-
-
-    /**
-     * <p>Creates a new {@link HSSFUserException} with a reason.</p>
-     * 
-     * @param reason the causing exception
-     */
-    public HSSFUserException(final Throwable reason)
-    {
-        super();
-        this.reason = reason;
-    }
-
-
-
-    /**
-     * <p>Creates a new {@link HSSFUserException} with a message string
-     * and a reason.</p>
-     * 
-     * @param msg the error message
-     * @param reason the causing exception
-     */
-    public HSSFUserException(final String msg, final Throwable reason)
-    {
-        super(msg);
-        this.reason = reason;
-    }
-
-
-
-    /**
-     * <p>Returns the {@link Throwable} that caused this exception to
-     * be thrown or <code>null</code> if there was no such {@link
-     * Throwable}.</p>
-     * 
-     * @return the reason
-     */
-    public Throwable getReason()
-    {
-        return reason;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
deleted file mode 100644
index ea9b70d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-
-import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingRowDummyRecord;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.MulBlankRecord;
-import org.apache.poi.hssf.record.MulRKRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFactory;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.StringRecord;
-
-/**
- * <p>A HSSFListener which tracks rows and columns, and will
- *  trigger your HSSFListener for all rows and cells,
- *  even the ones that aren't actually stored in the file.</p>
- * <p>This allows your code to have a more "Excel" like
- *  view of the data in the file, and not have to worry
- *  (as much) about if a particular row/cell is in the
- *  file, or was skipped from being written as it was
- *  blank.
- */
-public final class MissingRecordAwareHSSFListener implements HSSFListener {
-	private HSSFListener childListener;
-
-	// Need to have different counters for cell rows and
-	//  row rows, as you sometimes get a RowRecord in the
-	//  middle of some cells, and that'd break everything
-	private int lastRowRow;
-
-	private int lastCellRow;
-	private int lastCellColumn;
-
-	/**
-	 * Constructs a new MissingRecordAwareHSSFListener, which
-	 *  will fire processRecord on the supplied child
-	 *  HSSFListener for all Records, and missing records.
-	 * @param listener The HSSFListener to pass records on to
-	 */
-	public MissingRecordAwareHSSFListener(HSSFListener listener) {
-		resetCounts();
-		childListener = listener;
-	}
-
-	public void processRecord(Record record) {
-		int thisRow;
-		int thisColumn;
-		CellValueRecordInterface[] expandedRecords = null;
-
-		if (record instanceof CellValueRecordInterface) {
-			CellValueRecordInterface valueRec = (CellValueRecordInterface) record;
-			thisRow = valueRec.getRow();
-			thisColumn = valueRec.getColumn();
-		} else {
-            if (record instanceof StringRecord){
-                //it contains only cashed result of the previous FormulaRecord evaluation
-                childListener.processRecord(record);
-                return;
-            }
-			thisRow = -1;
-			thisColumn = -1;
-
-			switch (record.getSid()) {
-				// the BOFRecord can represent either the beginning of a sheet or
-				// the workbook
-				case BOFRecord.sid:
-					BOFRecord bof = (BOFRecord) record;
-					if (bof.getType() == BOFRecord.TYPE_WORKBOOK || 
-					        bof.getType() == BOFRecord.TYPE_WORKSHEET) {
-						// Reset the row and column counts - new workbook / worksheet
-						resetCounts();
-					}
-					break;
-				case RowRecord.sid:
-					RowRecord rowrec = (RowRecord) record;
-					//System.out.println("Row " + rowrec.getRowNumber() + " found, first column at "
-					//        + rowrec.getFirstCol() + " last column at " + rowrec.getLastCol());
-
-					// If there's a jump in rows, fire off missing row records
-					if (lastRowRow + 1 < rowrec.getRowNumber()) {
-						for (int i = (lastRowRow + 1); i < rowrec.getRowNumber(); i++) {
-							MissingRowDummyRecord dr = new MissingRowDummyRecord(i);
-							childListener.processRecord(dr);
-						}
-					}
-
-					// Record this as the last row we saw
-					lastRowRow = rowrec.getRowNumber();
-					lastCellColumn = -1;
-					break;
-
-				case SharedFormulaRecord.sid:
-					// SharedFormulaRecord occurs after the first FormulaRecord of the cell range.
-					// There are probably (but not always) more cell records after this
-					// - so don't fire off the LastCellOfRowDummyRecord yet
-					childListener.processRecord(record);
-					return;
-				case MulBlankRecord.sid:
-					// These appear in the middle of the cell records, to
-					//  specify that the next bunch are empty but styled
-					// Expand this out into multiple blank cells
-					MulBlankRecord mbr = (MulBlankRecord)record;
-					expandedRecords = RecordFactory.convertBlankRecords(mbr);
-					break;
-				case MulRKRecord.sid:
-					// This is multiple consecutive number cells in one record
-					// Exand this out into multiple regular number cells
-					MulRKRecord mrk = (MulRKRecord)record;
-					expandedRecords = RecordFactory.convertRKRecords(mrk);
-					break;
-				case NoteRecord.sid:
-					NoteRecord nrec = (NoteRecord) record;
-					thisRow = nrec.getRow();
-					thisColumn = nrec.getColumn();
-					break;
-				default:
-					break;
-			}
-		}
-
-		// First part of expanded record handling
-		if(expandedRecords != null && expandedRecords.length > 0) {
-			thisRow = expandedRecords[0].getRow();
-			thisColumn = expandedRecords[0].getColumn();
-		}
-
-		// If we're on cells, and this cell isn't in the same
-		//  row as the last one, then fire the
-		//  dummy end-of-row records
-		if(thisRow != lastCellRow && thisRow > 0) {
-		    if (lastCellRow == -1) lastCellRow = 0;
-			for(int i=lastCellRow; i<thisRow; i++) {
-				int cols = -1;
-				if(i == lastCellRow) {
-					cols = lastCellColumn;
-				}
-				childListener.processRecord(new LastCellOfRowDummyRecord(i, cols));
-			}
-		}
-
-		// If we've just finished with the cells, then fire the
-		// final dummy end-of-row record
-		if(lastCellRow != -1 && lastCellColumn != -1 && thisRow == -1) {
-			childListener.processRecord(new LastCellOfRowDummyRecord(lastCellRow, lastCellColumn));
-
-			lastCellRow = -1;
-			lastCellColumn = -1;
-		}
-
-		// If we've moved onto a new row, the ensure we re-set
-		//  the column counter
-		if(thisRow != lastCellRow) {
-			lastCellColumn = -1;
-		}
-
-		// If there's a gap in the cells, then fire
-		//  the dummy cell records
-		if(lastCellColumn != thisColumn-1) {
-			for(int i=lastCellColumn+1; i<thisColumn; i++) {
-				childListener.processRecord(new MissingCellDummyRecord(thisRow, i));
-			}
-		}
-
-		// Next part of expanded record handling
-		if(expandedRecords != null && expandedRecords.length > 0) {
-			thisColumn = expandedRecords[expandedRecords.length-1].getColumn();
-		}
-
-
-		// Update cell and row counts as needed
-		if(thisColumn != -1) {
-			lastCellColumn = thisColumn;
-			lastCellRow = thisRow;
-		}
-
-		// Pass along the record(s)
-		if(expandedRecords != null && expandedRecords.length > 0) {
-			for(CellValueRecordInterface r : expandedRecords) {
-				childListener.processRecord((Record)r);
-			}
-		} else {
-			childListener.processRecord(record);
-		}
-	}
-
-	private void resetCounts() {
-		lastRowRow = -1;
-		lastCellRow = -1;
-		lastCellColumn = -1;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
deleted file mode 100644
index ebb0c03..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel.dummyrecord;
-
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFormatException;
-
-/**
- */
-abstract class DummyRecordBase extends Record {
-	
-	protected DummyRecordBase() {
-		//
-	}
-	
-	public final short getSid() {
-		return -1;
-	}
-	public int serialize(int offset, byte[] data) {
-		throw new RecordFormatException("Cannot serialize a dummy record");
-	}
-	public final int getRecordSize() {
-		throw new RecordFormatException("Cannot serialize a dummy record");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
deleted file mode 100644
index bd4afe8..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel.dummyrecord;
-
-
-/**
- * A dummy record to indicate that we've now had the last
- *  cell record for this row.
- */
-public final class LastCellOfRowDummyRecord extends DummyRecordBase {
-	private final int row;
-	private final int lastColumnNumber;
-	
-	public LastCellOfRowDummyRecord(int row, int lastColumnNumber) {
-		this.row = row;
-		this.lastColumnNumber = lastColumnNumber;
-	}
-	
-	/**
-	 * Returns the (0 based) number of the row we are
-	 *  currently working on.
-	 *  
-	 * @return the (0 based) number of the row
-	 */
-	public int getRow() {
-	    return row;
-    }
-	
-	/**
-	 * Returns the (0 based) number of the last column
-	 *  seen for this row. You should have already been
-	 *  called with that record.
-	 * This is -1 in the case of there being no columns
-	 *  for the row.
-	 *  
-	 * @return the (0 based) number of the last column
-	 */
-	public int getLastColumnNumber() {
-	    return lastColumnNumber;
-    }
-	
-	@Override
-	public String toString() {
-	    return "End-of-Row for Row=" + row + " at Column=" + lastColumnNumber;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
deleted file mode 100644
index 393e21f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel.dummyrecord;
-
-
-/**
- * A dummy record for when we're missing a cell in a row,
- *  but still want to trigger something
- */
-public final class MissingCellDummyRecord extends DummyRecordBase {
-	private int row;
-	private int column;
-	
-	public MissingCellDummyRecord(int row, int column) {
-		this.row = row;
-		this.column = column;
-	}
-	public int getRow() { return row; }
-	public int getColumn() { return column; }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java b/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
deleted file mode 100644
index 4c128bd..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel.dummyrecord;
-
-
-/**
- * A dummy record for when we're missing a row, but still
- *  want to trigger something
- */
-public final class MissingRowDummyRecord extends DummyRecordBase {
-	private int rowNumber;
-	
-	public MissingRowDummyRecord(int rowNumber) {
-		this.rowNumber = rowNumber;
-	}
-	public int getRowNumber() {
-		return rowNumber;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/eventusermodel/package.html b/trunk/src/java/org/apache/poi/hssf/eventusermodel/package.html
deleted file mode 100644
index 0a3b111..0000000
--- a/trunk/src/java/org/apache/poi/hssf/eventusermodel/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-HSSF eventmodel Package provides an event-based API for reading HSSF files.
-
-<h2>Related Documentation</h2>
-The event model can reald XLS files with a very small memory footprint.  For 
-writing you still have to use the usermodel.  The eventmodel is to the usermodel
-what SAX is to DOM.
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.hssf.usermodel
-@see org.apache.poi.hssf.record
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java b/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
deleted file mode 100644
index 107602d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.extractor;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIDocument;
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
-import org.apache.poi.hssf.eventusermodel.HSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFRequest;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.LabelRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * A text extractor for Excel files, that is based
- *  on the HSSF EventUserModel API.
- * It will typically use less memory than
- *  {@link ExcelExtractor}, but may not provide
- *  the same richness of formatting.
- * Returns the textual content of the file, suitable for
- *  indexing by something like Lucene, but not really
- *  intended for display to the user.
- * <p>
- * To turn an excel file into a CSV or similar, then see
- *  the XLS2CSVmra example
- * </p>
- * 
- * @see <a href="http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
- */
-public class EventBasedExcelExtractor extends POIOLE2TextExtractor implements org.apache.poi.ss.extractor.ExcelExtractor {
-    private DirectoryNode _dir;
-    boolean _includeSheetNames = true;
-    boolean _formulasNotResults = false;
-
-    public EventBasedExcelExtractor( DirectoryNode dir )
-    {
-        super( (POIDocument)null );
-        _dir = dir;
-    }
-
-   public EventBasedExcelExtractor(POIFSFileSystem fs) {
-      this(fs.getRoot());
-      super.setFilesystem(fs);
-   }
-
-   /**
-    * Would return the document information metadata for the document,
-    *  if we supported it
-    */
-   public DocumentSummaryInformation getDocSummaryInformation() {
-       throw new IllegalStateException("Metadata extraction not supported in streaming mode, please use ExcelExtractor");
-   }
-   /**
-    * Would return the summary information metadata for the document,
-    *  if we supported it
-    */
-   public SummaryInformation getSummaryInformation() {
-       throw new IllegalStateException("Metadata extraction not supported in streaming mode, please use ExcelExtractor");
-   }
-
-
-   /**
-    * Would control the inclusion of cell comments from the document,
-    *  if we supported it
-    */
-   public void setIncludeCellComments(boolean includeComments) {
-       throw new IllegalStateException("Comment extraction not supported in streaming mode, please use ExcelExtractor");
-   }
-
-   /**
-    * Would control the inclusion of headers and footers from the document,
-    *  if we supported it
-    */
-   public void setIncludeHeadersFooters(boolean includeHeadersFooters) {
-       throw new IllegalStateException("Header/Footer extraction not supported in streaming mode, please use ExcelExtractor");
-   }
-
-
-   /**
-    * Should sheet names be included? Default is true
-    */
-   public void setIncludeSheetNames(boolean includeSheetNames) {
-       _includeSheetNames = includeSheetNames;
-   }
-   /**
-    * Should we return the formula itself, and not
-    *  the result it produces? Default is false
-    */
-   public void setFormulasNotResults(boolean formulasNotResults) {
-       _formulasNotResults = formulasNotResults;
-   }
-
-
-   /**
-    * Retreives the text contents of the file
-    */
-   public String getText() {
-       String text = null;
-       try {
-           TextListener tl = triggerExtraction();
-
-           text = tl._text.toString();
-           if(! text.endsWith("\n")) {
-               text = text + "\n";
-           }
-       } catch(IOException e) {
-           throw new RuntimeException(e);
-       }
-
-       return text;
-   }
-
-   private TextListener triggerExtraction() throws IOException {
-       TextListener tl = new TextListener();
-       FormatTrackingHSSFListener ft = new FormatTrackingHSSFListener(tl);
-       tl._ft = ft;
-
-       // Register and process
-       HSSFEventFactory factory = new HSSFEventFactory();
-       HSSFRequest request = new HSSFRequest();
-       request.addListenerForAllRecords(ft);
-
-       factory.processWorkbookEvents(request, _dir);
-
-       return tl;
-   }
-
-   private class TextListener implements HSSFListener {
-       FormatTrackingHSSFListener _ft;
-       private SSTRecord sstRecord;
-
-       private final List<String> sheetNames;
-       final StringBuffer _text = new StringBuffer();
-       private int sheetNum = -1;
-       private int rowNum;
-
-       private boolean outputNextStringValue = false;
-       private int nextRow = -1;
-
-       public TextListener() {
-           sheetNames = new ArrayList<String>();
-       }
-       public void processRecord(Record record) {
-           String thisText = null;
-           int thisRow = -1;
-
-           switch(record.getSid()) {
-           case BoundSheetRecord.sid:
-               BoundSheetRecord sr = (BoundSheetRecord)record;
-               sheetNames.add(sr.getSheetname());
-               break;
-           case BOFRecord.sid:
-               BOFRecord bof = (BOFRecord)record;
-               if(bof.getType() == BOFRecord.TYPE_WORKSHEET) {
-                   sheetNum++;
-                   rowNum = -1;
-
-                   if(_includeSheetNames) {
-                       if(_text.length() > 0) _text.append("\n");
-                       _text.append(sheetNames.get(sheetNum));
-                   }
-               }
-               break;
-           case SSTRecord.sid:
-               sstRecord = (SSTRecord)record;
-               break;
-
-           case FormulaRecord.sid:
-               FormulaRecord frec = (FormulaRecord) record;
-               thisRow = frec.getRow();
-
-               if(_formulasNotResults) {
-                   thisText = HSSFFormulaParser.toFormulaString((HSSFWorkbook)null, frec.getParsedExpression());
-               } else {
-                   if(frec.hasCachedResultString()) {
-                       // Formula result is a string
-                       // This is stored in the next record
-                       outputNextStringValue = true;
-                       nextRow = frec.getRow();
-                   } else {
-                       thisText = _ft.formatNumberDateCell(frec);
-                   }
-               }
-               break;
-           case StringRecord.sid:
-               if(outputNextStringValue) {
-                   // String for formula
-                   StringRecord srec = (StringRecord)record;
-                   thisText = srec.getString();
-                   thisRow = nextRow;
-                   outputNextStringValue = false;
-               }
-               break;
-           case LabelRecord.sid:
-               LabelRecord lrec = (LabelRecord) record;
-               thisRow = lrec.getRow();
-               thisText = lrec.getValue();
-               break;
-           case LabelSSTRecord.sid:
-               LabelSSTRecord lsrec = (LabelSSTRecord) record;
-               thisRow = lsrec.getRow();
-               if(sstRecord == null) {
-                   throw new IllegalStateException("No SST record found");
-               }
-               thisText = sstRecord.getString(lsrec.getSSTIndex()).toString();
-               break;
-           case NoteRecord.sid:
-               NoteRecord nrec = (NoteRecord) record;
-               thisRow = nrec.getRow();
-               // TODO: Find object to match nrec.getShapeId()
-               break;
-           case NumberRecord.sid:
-               NumberRecord numrec = (NumberRecord) record;
-               thisRow = numrec.getRow();
-               thisText = _ft.formatNumberDateCell(numrec);
-               break;
-           default:
-               break;
-           }
-
-           if(thisText != null) {
-               if(thisRow != rowNum) {
-                   rowNum = thisRow;
-                   if(_text.length() > 0)
-                       _text.append("\n");
-               } else {
-                   _text.append("\t");
-               }
-               _text.append(thisText);
-           }
-       }
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java b/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
deleted file mode 100644
index c4eb047..0000000
--- a/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.extractor;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.Locale;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFComment;
-import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.HeaderFooter;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-
-/**
- * A text extractor for Excel files.
- * <p>
- * Returns the textual content of the file, suitable for
- *  indexing by something like Lucene, but not really
- *  intended for display to the user.
- * </p>
- * <p>
- * To turn an excel file into a CSV or similar, then see
- *  the XLS2CSVmra example
- * </p>
- * 
- * @see <a href="http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
- */
-public class ExcelExtractor extends POIOLE2TextExtractor implements org.apache.poi.ss.extractor.ExcelExtractor {
-	private final HSSFWorkbook _wb;
-	private final HSSFDataFormatter _formatter;
-	private boolean _includeSheetNames = true;
-	private boolean _shouldEvaluateFormulas = true;
-	private boolean _includeCellComments = false;
-	private boolean _includeBlankCells = false;
-	private boolean _includeHeadersFooters = true;
-
-	public ExcelExtractor(HSSFWorkbook wb) {
-		super(wb);
-		_wb = wb;
-		_formatter = new HSSFDataFormatter();
-	}
-	public ExcelExtractor(POIFSFileSystem fs) throws IOException {
-		this(fs.getRoot());
-	}
-	public ExcelExtractor(DirectoryNode dir) throws IOException {
-		this(new HSSFWorkbook(dir, true));
-	}
-
-	private static final class CommandParseException extends Exception {
-		public CommandParseException(String msg) {
-			super(msg);
-		}
-	}
-	private static final class CommandArgs {
-		private final boolean _requestHelp;
-		private final File _inputFile;
-		private final boolean _showSheetNames;
-		private final boolean _evaluateFormulas;
-		private final boolean _showCellComments;
-		private final boolean _showBlankCells;
-		private final boolean _headersFooters;
-		public CommandArgs(String[] args) throws CommandParseException {
-			int nArgs = args.length;
-			File inputFile = null;
-			boolean requestHelp = false;
-			boolean showSheetNames = true;
-			boolean evaluateFormulas = true;
-			boolean showCellComments = false;
-			boolean showBlankCells = false;
-			boolean headersFooters = true;
-			for (int i=0; i<nArgs; i++) {
-				String arg = args[i];
-				if ("-help".equalsIgnoreCase(arg)) {
-					requestHelp = true;
-					break;
-				}
-				if ("-i".equals(arg)) {
-					 // step to next arg
-					if (++i >= nArgs) {
-						throw new CommandParseException("Expected filename after '-i'");
-					}
-					arg = args[i];
-					if (inputFile != null) {
-						throw new CommandParseException("Only one input file can be supplied");
-					}
-					inputFile = new File(arg);
-					if (!inputFile.exists()) {
-						throw new CommandParseException("Specified input file '" + arg + "' does not exist");
-					}
-					if (inputFile.isDirectory()) {
-						throw new CommandParseException("Specified input file '" + arg + "' is a directory");
-					}
-					continue;
-				}
-				if ("--show-sheet-names".equals(arg)) {
-					showSheetNames = parseBoolArg(args, ++i);
-					continue;
-				}
-				if ("--evaluate-formulas".equals(arg)) {
-					evaluateFormulas = parseBoolArg(args, ++i);
-					continue;
-				}
-				if ("--show-comments".equals(arg)) {
-					showCellComments = parseBoolArg(args, ++i);
-					continue;
-				}
-				if ("--show-blanks".equals(arg)) {
-					showBlankCells = parseBoolArg(args, ++i);
-					continue;
-				}
-				if ("--headers-footers".equals(arg)) {
-					headersFooters = parseBoolArg(args, ++i);
-					continue;
-				}
-				throw new CommandParseException("Invalid argument '" + arg + "'");
-			}
-			_requestHelp = requestHelp;
-			_inputFile = inputFile;
-			_showSheetNames = showSheetNames;
-			_evaluateFormulas = evaluateFormulas;
-			_showCellComments = showCellComments;
-			_showBlankCells = showBlankCells;
-			_headersFooters = headersFooters;
-		}
-		private static boolean parseBoolArg(String[] args, int i) throws CommandParseException {
-			if (i >= args.length) {
-				throw new CommandParseException("Expected value after '" + args[i-1] + "'");
-			}
-			String value = args[i].toUpperCase(Locale.ROOT);
-			if ("Y".equals(value) || "YES".equals(value) || "ON".equals(value) || "TRUE".equals(value)) {
-				return true;
-			}
-			if ("N".equals(value) || "NO".equals(value) || "OFF".equals(value) || "FALSE".equals(value)) {
-				return false;
-			}
-			throw new CommandParseException("Invalid value '" + args[i] + "' for '" + args[i-1] + "'. Expected 'Y' or 'N'");
-		}
-		public boolean isRequestHelp() {
-			return _requestHelp;
-		}
-		public File getInputFile() {
-			return _inputFile;
-		}
-		public boolean shouldShowSheetNames() {
-			return _showSheetNames;
-		}
-		public boolean shouldEvaluateFormulas() {
-			return _evaluateFormulas;
-		}
-		public boolean shouldShowCellComments() {
-			return _showCellComments;
-		}
-		public boolean shouldShowBlankCells() {
-			return _showBlankCells;
-		}
-		public boolean shouldIncludeHeadersFooters() {
-			return _headersFooters;
-		}
-	}
-
-	private static void printUsageMessage(PrintStream ps) {
-		ps.println("Use:");
-		ps.println("    " + ExcelExtractor.class.getName() + " [<flag> <value> [<flag> <value> [...]]] [-i <filename.xls>]");
-		ps.println("       -i <filename.xls> specifies input file (default is to use stdin)");
-		ps.println("       Flags can be set on or off by using the values 'Y' or 'N'.");
-		ps.println("       Following are available flags and their default values:");
-		ps.println("       --show-sheet-names  Y");
-		ps.println("       --evaluate-formulas Y");
-		ps.println("       --show-comments     N");
-		ps.println("       --show-blanks       Y");
-		ps.println("       --headers-footers   Y");
-	}
-
-	/**
-	 * Command line extractor.
-	 * 
-	 * @param args the command line parameters
-	 * 
-	 * @throws IOException if the file can't be read or contains errors
-	 */
-	public static void main(String[] args) throws IOException {
-
-		CommandArgs cmdArgs;
-		try {
-			cmdArgs = new CommandArgs(args);
-		} catch (CommandParseException e) {
-			System.err.println(e.getMessage());
-			printUsageMessage(System.err);
-			System.exit(1);
-			return; // suppress compiler error
-		}
-
-		if (cmdArgs.isRequestHelp()) {
-			printUsageMessage(System.out);
-			return;
-		}
-
-		InputStream is;
-		if(cmdArgs.getInputFile() == null) {
-			is = System.in;
-		} else {
-			is = new FileInputStream(cmdArgs.getInputFile());
-		}
-		HSSFWorkbook wb = new HSSFWorkbook(is);
-		is.close();
-
-		ExcelExtractor extractor = new ExcelExtractor(wb);
-		extractor.setIncludeSheetNames(cmdArgs.shouldShowSheetNames());
-		extractor.setFormulasNotResults(!cmdArgs.shouldEvaluateFormulas());
-		extractor.setIncludeCellComments(cmdArgs.shouldShowCellComments());
-		extractor.setIncludeBlankCells(cmdArgs.shouldShowBlankCells());
-		extractor.setIncludeHeadersFooters(cmdArgs.shouldIncludeHeadersFooters());
-		System.out.println(extractor.getText());
-		extractor.close();
-		wb.close();
-	}
-
-	@Override
-    public void setIncludeSheetNames(boolean includeSheetNames) {
-		_includeSheetNames = includeSheetNames;
-	}
-
-	@Override
-    public void setFormulasNotResults(boolean formulasNotResults) {
-		_shouldEvaluateFormulas = !formulasNotResults;
-	}
-
-	@Override
-    public void setIncludeCellComments(boolean includeCellComments) {
-		_includeCellComments = includeCellComments;
-	}
-
-	/**
-	 * Should blank cells be output? Default is to only
-	 *  output cells that are present in the file and are
-	 *  non-blank.
-	 * 
-	 * @param includeBlankCells {@code true} if blank cells should be included
-	 */
-	public void setIncludeBlankCells(boolean includeBlankCells) {
-		_includeBlankCells = includeBlankCells;
-	}
-
-	@Override
-    public void setIncludeHeadersFooters(boolean includeHeadersFooters) {
-		_includeHeadersFooters = includeHeadersFooters;
-	}
-
-	@Override
-    public String getText() {
-		StringBuffer text = new StringBuffer();
-
-		// We don't care about the difference between
-		//  null (missing) and blank cells
-		_wb.setMissingCellPolicy(MissingCellPolicy.RETURN_BLANK_AS_NULL);
-
-		// Process each sheet in turn
-		for(int i=0;i<_wb.getNumberOfSheets();i++) {
-			HSSFSheet sheet = _wb.getSheetAt(i);
-			if(sheet == null) { continue; }
-
-			if(_includeSheetNames) {
-				String name = _wb.getSheetName(i);
-				if(name != null) {
-					text.append(name);
-					text.append("\n");
-				}
-			}
-
-			// Header text, if there is any
-			if(_includeHeadersFooters) {
-				text.append(_extractHeaderFooter(sheet.getHeader()));
-			}
-
-			int firstRow = sheet.getFirstRowNum();
-			int lastRow = sheet.getLastRowNum();
-			for(int j=firstRow;j<=lastRow;j++) {
-				HSSFRow row = sheet.getRow(j);
-				if(row == null) { continue; }
-
-				// Check each cell in turn
-				int firstCell = row.getFirstCellNum();
-				int lastCell = row.getLastCellNum();
-				if(_includeBlankCells) {
-					firstCell = 0;
-				}
-
-				for(int k=firstCell;k<lastCell;k++) {
-					HSSFCell cell = row.getCell(k);
-					boolean outputContents = true;
-
-					if(cell == null) {
-						// Only output if requested
-						outputContents = _includeBlankCells;
-					} else {
-						switch(cell.getCellTypeEnum()) {
-							case STRING:
-								text.append(cell.getRichStringCellValue().getString());
-								break;
-							case NUMERIC:
-								text.append(_formatter.formatCellValue(cell));
-								break;
-							case BOOLEAN:
-								text.append(cell.getBooleanCellValue());
-								break;
-							case ERROR:
-								text.append(ErrorEval.getText(cell.getErrorCellValue()));
-								break;
-							case FORMULA:
-								if(!_shouldEvaluateFormulas) {
-									text.append(cell.getCellFormula());
-								} else {
-									switch(cell.getCachedFormulaResultTypeEnum()) {
-										case STRING:
-											HSSFRichTextString str = cell.getRichStringCellValue();
-											if(str != null && str.length() > 0) {
-												text.append(str.toString());
-											}
-											break;
-										case NUMERIC:
-											HSSFCellStyle style = cell.getCellStyle();
-											double nVal = cell.getNumericCellValue();
-											short df = style.getDataFormat();
-											String dfs = style.getDataFormatString();
-											text.append(_formatter.formatRawCellContents(nVal, df, dfs));
-											break;
-										case BOOLEAN:
-											text.append(cell.getBooleanCellValue());
-											break;
-										case ERROR:
-											text.append(ErrorEval.getText(cell.getErrorCellValue()));
-											break;
-										default:
-											throw new IllegalStateException("Unexpected cell cached formula result type: " + cell.getCachedFormulaResultTypeEnum());
-
-									}
-								}
-								break;
-							default:
-								throw new RuntimeException("Unexpected cell type (" + cell.getCellTypeEnum() + ")");
-						}
-
-						// Output the comment, if requested and exists
-						HSSFComment comment = cell.getCellComment();
-						if(_includeCellComments && comment != null) {
-							// Replace any newlines with spaces, otherwise it
-							//  breaks the output
-							String commentText = comment.getString().getString().replace('\n', ' ');
-							text.append(" Comment by "+comment.getAuthor()+": "+commentText);
-						}
-					}
-
-					// Output a tab if we're not on the last cell
-					if(outputContents && k < (lastCell-1)) {
-						text.append("\t");
-					}
-				}
-
-				// Finish off the row
-				text.append("\n");
-			}
-
-			// Finally Footer text, if there is any
-			if(_includeHeadersFooters) {
-				text.append(_extractHeaderFooter(sheet.getFooter()));
-			}
-		}
-
-		return text.toString();
-	}
-
-	public static String _extractHeaderFooter(HeaderFooter hf) {
-		StringBuffer text = new StringBuffer();
-
-		if(hf.getLeft() != null) {
-			text.append(hf.getLeft());
-		}
-		if(hf.getCenter() != null) {
-			if(text.length() > 0)
-				text.append("\t");
-			text.append(hf.getCenter());
-		}
-		if(hf.getRight() != null) {
-			if(text.length() > 0)
-				text.append("\t");
-			text.append(hf.getRight());
-		}
-		if(text.length() > 0)
-			text.append("\n");
-
-		return text.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java b/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
deleted file mode 100644
index c62a3c2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.extractor;
-
-import static org.apache.poi.hssf.model.InternalWorkbook.OLD_WORKBOOK_DIR_ENTRY_NAME;
-import static org.apache.poi.hssf.model.InternalWorkbook.WORKBOOK_DIR_ENTRY_NAMES;
-
-import java.io.BufferedInputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.CodepageRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.OldFormulaRecord;
-import org.apache.poi.hssf.record.OldLabelRecord;
-import org.apache.poi.hssf.record.OldSheetRecord;
-import org.apache.poi.hssf.record.OldStringRecord;
-import org.apache.poi.hssf.record.RKRecord;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.NotOLE2FileException;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.util.IOUtils;
-
-/**
- * A text extractor for old Excel files, which are too old for
- *  HSSFWorkbook to handle. This includes Excel 95, and very old 
- *  (pre-OLE2) Excel files, such as Excel 4 files.
- * <p>
- * Returns much (but not all) of the textual content of the file, 
- *  suitable for indexing by something like Apache Lucene, or used
- *  by Apache Tika, but not really intended for display to the user.
- * </p>
- */
-public class OldExcelExtractor implements Closeable {
-
-    private final static int FILE_PASS_RECORD_SID = 0x2f;
-
-    private RecordInputStream ris;
-
-    // sometimes we hold the stream here and thus need to ensure it is closed at some point
-    private Closeable toClose;
-
-    private int biffVersion;
-    private int fileType;
-
-    public OldExcelExtractor(InputStream input) throws IOException {
-        open(input);
-    }
-
-    public OldExcelExtractor(File f) throws IOException {
-        NPOIFSFileSystem poifs = null;
-        try {
-            poifs = new NPOIFSFileSystem(f);
-            open(poifs);
-            toClose = poifs;
-            return;
-        } catch (OldExcelFormatException e) {
-            // will be handled by workaround below
-            if (poifs != null) {
-                poifs.close();
-            }
-        } catch (NotOLE2FileException e) {
-            // will be handled by workaround below
-            if (poifs != null) {
-                poifs.close();
-            }
-        }
-        
-        @SuppressWarnings("resource")
-        FileInputStream biffStream = new FileInputStream(f); // NOSONAR
-        try {
-            open(biffStream);
-        } catch (IOException e)  {
-            // ensure that the stream is properly closed here if an Exception
-            // is thrown while opening
-            biffStream.close();
-            throw e;
-        } catch (RuntimeException e)  {
-            // ensure that the stream is properly closed here if an Exception
-            // is thrown while opening
-            biffStream.close();
-            throw e;
-        }
-    }
-
-    public OldExcelExtractor(NPOIFSFileSystem fs) throws IOException {
-        open(fs);
-    }
-
-    public OldExcelExtractor(DirectoryNode directory) throws IOException {
-        open(directory);
-    }
-
-    private void open(InputStream biffStream) throws IOException {
-        BufferedInputStream bis = (biffStream instanceof BufferedInputStream) 
-            ? (BufferedInputStream)biffStream
-            : new BufferedInputStream(biffStream, 8);
-
-        if (NPOIFSFileSystem.hasPOIFSHeader(bis)) {
-            NPOIFSFileSystem poifs = new NPOIFSFileSystem(bis);
-            try {
-                open(poifs);
-            } finally {
-                poifs.close();
-            }
-        } else {
-            ris = new RecordInputStream(bis);
-            toClose = bis;
-            prepare();
-        }
-    }
-
-    private void open(NPOIFSFileSystem fs) throws IOException {
-        open(fs.getRoot());
-    }
-
-    private void open(DirectoryNode directory) throws IOException {
-        DocumentNode book;
-        try {
-            book = (DocumentNode)directory.getEntry(OLD_WORKBOOK_DIR_ENTRY_NAME);
-        } catch (FileNotFoundException e) {
-            // some files have "Workbook" instead
-            book = (DocumentNode)directory.getEntry(WORKBOOK_DIR_ENTRY_NAMES[0]);
-        }
-
-        if (book == null) {
-            throw new IOException("No Excel 5/95 Book stream found");
-        }
-        
-        ris = new RecordInputStream(directory.createDocumentInputStream(book));
-        prepare();
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 1) {
-            System.err.println("Use:");
-            System.err.println("   OldExcelExtractor <filename>");
-            System.exit(1);
-        }
-        OldExcelExtractor extractor = new OldExcelExtractor(new File(args[0]));
-        System.out.println(extractor.getText());
-        extractor.close();
-    }
-    
-    private void prepare() {
-        if (! ris.hasNextRecord())
-            throw new IllegalArgumentException("File contains no records!"); 
-        ris.nextRecord();
-        
-        // Work out what version we're dealing with
-        int bofSid = ris.getSid();
-        switch (bofSid) {
-            case BOFRecord.biff2_sid:
-                biffVersion = 2;
-                break;
-            case BOFRecord.biff3_sid:
-                biffVersion = 3;
-                break;
-            case BOFRecord.biff4_sid:
-                biffVersion = 4;
-                break;
-            case BOFRecord.biff5_sid:
-                biffVersion = 5;
-                break;
-            default:
-                throw new IllegalArgumentException("File does not begin with a BOF, found sid of " + bofSid); 
-        }
-        
-        // Get the type
-        BOFRecord bof = new BOFRecord(ris);
-        fileType = bof.getType();
-    }
-
-    /**
-     * The Biff version, largely corresponding to the Excel version
-     * 
-     * @return the Biff version
-     */
-    public int getBiffVersion() {
-        return biffVersion;
-    }
-    
-    /**
-     * The kind of the file, one of {@link BOFRecord#TYPE_WORKSHEET},
-     *  {@link BOFRecord#TYPE_CHART}, {@link BOFRecord#TYPE_EXCEL_4_MACRO}
-     *  or {@link BOFRecord#TYPE_WORKSPACE_FILE}
-     * 
-     * @return the file type
-     */
-    public int getFileType() {
-        return fileType;
-    }
-
-    /**
-     * Retrieves the text contents of the file, as best we can
-     *  for these old file formats
-     * 
-     * @return the text contents of the file
-     */
-    public String getText() {
-        StringBuffer text = new StringBuffer();
-        
-        // To track formats and encodings
-        CodepageRecord codepage = null;
-        // TODO track the XFs and Format Strings
-
-        // Process each record in turn, looking for interesting ones
-        while (ris.hasNextRecord()) {
-            int sid = ris.getNextSid();
-            ris.nextRecord();
-
-            switch (sid) {
-                case  FILE_PASS_RECORD_SID:
-                    throw new EncryptedDocumentException("Encryption not supported for Old Excel files");
-
-                case OldSheetRecord.sid:
-                    OldSheetRecord shr = new OldSheetRecord(ris);
-                    shr.setCodePage(codepage);
-                    text.append("Sheet: ");
-                    text.append(shr.getSheetname());
-                    text.append('\n');
-                    break;
-            
-                case OldLabelRecord.biff2_sid:
-                case OldLabelRecord.biff345_sid:
-                    OldLabelRecord lr = new OldLabelRecord(ris);
-                    lr.setCodePage(codepage);
-                    text.append(lr.getValue());
-                    text.append('\n');
-                    break;
-                case OldStringRecord.biff2_sid:
-                case OldStringRecord.biff345_sid:
-                    OldStringRecord sr = new OldStringRecord(ris);
-                    sr.setCodePage(codepage);
-                    text.append(sr.getString());
-                    text.append('\n');
-                    break;
-                    
-                case NumberRecord.sid:
-                    NumberRecord nr = new NumberRecord(ris);
-                    handleNumericCell(text, nr.getValue());
-                    break;
-                case OldFormulaRecord.biff2_sid:
-                case OldFormulaRecord.biff3_sid:
-                case OldFormulaRecord.biff4_sid:
-                    // Biff 2 and 5+ share the same SID, due to a bug...
-                    if (biffVersion == 5) {
-                        FormulaRecord fr = new FormulaRecord(ris);
-                        if (fr.getCachedResultType() == CellType.NUMERIC.getCode()) {
-                            handleNumericCell(text, fr.getValue());
-                        }
-                    } else {
-                        OldFormulaRecord fr = new OldFormulaRecord(ris);
-                        if (fr.getCachedResultType() == CellType.NUMERIC.getCode()) {
-                            handleNumericCell(text, fr.getValue());
-                        }
-                    }
-                    break;
-                case RKRecord.sid:
-                    RKRecord rr = new RKRecord(ris);
-                    handleNumericCell(text, rr.getRKNumber());
-                    break;
-                    
-                case CodepageRecord.sid:
-                    codepage = new CodepageRecord(ris);
-                    break;
-                    
-                default:
-                    ris.readFully(new byte[ris.remaining()]);
-            }
-        }
-
-        close();
-        ris = null;
-
-        return text.toString();
-    }
-
-    @Override
-    public void close() {
-        // some cases require this close here
-        if(toClose != null) {
-            IOUtils.closeQuietly(toClose);
-            toClose = null;
-        }
-    }
-
-    protected void handleNumericCell(StringBuffer text, double value) {
-        // TODO Need to fetch / use format strings
-        text.append(value);
-        text.append('\n');
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/ConvertAnchor.java b/trunk/src/java/org/apache/poi/hssf/model/ConvertAnchor.java
deleted file mode 100644
index 60808e7..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/ConvertAnchor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.ddf.EscherChildAnchorRecord;
-import org.apache.poi.hssf.usermodel.HSSFAnchor;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFChildAnchor;
-
-/**
- *
- */
-public class ConvertAnchor
-{
-    public static EscherRecord createAnchor( HSSFAnchor userAnchor )
-    {
-        if (userAnchor instanceof HSSFClientAnchor)
-        {
-            HSSFClientAnchor a = (HSSFClientAnchor) userAnchor;
-
-            EscherClientAnchorRecord anchor = new EscherClientAnchorRecord();
-            anchor.setRecordId( EscherClientAnchorRecord.RECORD_ID );
-            anchor.setOptions( (short) 0x0000 );
-            anchor.setFlag( a.getAnchorType().value );
-            anchor.setCol1( (short) Math.min(a.getCol1(), a.getCol2()) );
-            anchor.setDx1( (short) a.getDx1() );
-            anchor.setRow1( (short) Math.min(a.getRow1(), a.getRow2()) );
-            anchor.setDy1( (short) a.getDy1() );
-
-            anchor.setCol2( (short) Math.max(a.getCol1(), a.getCol2()) );
-            anchor.setDx2( (short) a.getDx2() );
-            anchor.setRow2( (short) Math.max(a.getRow1(), a.getRow2()) );
-            anchor.setDy2( (short) a.getDy2() );
-            return anchor;
-        }
-        HSSFChildAnchor a = (HSSFChildAnchor) userAnchor;
-        EscherChildAnchorRecord anchor = new EscherChildAnchorRecord();
-        anchor.setRecordId( EscherChildAnchorRecord.RECORD_ID );
-        anchor.setOptions( (short) 0x0000 );
-        anchor.setDx1( (short) Math.min(a.getDx1(), a.getDx2()) );
-        anchor.setDy1( (short) Math.min(a.getDy1(), a.getDy2()) );
-        anchor.setDx2( (short) Math.max(a.getDx2(), a.getDx1()) );
-        anchor.setDy2( (short) Math.max(a.getDy2(), a.getDy1()) );
-        return anchor;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java b/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java
deleted file mode 100644
index 468f6b4..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/DrawingManager.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * Provides utilities to manage drawing groups.
- * 
- * @deprecated in POI 3.15-beta2, scheduled for removal in 3.17, use DrawingManager2 instead
- */
-@Deprecated
-public class DrawingManager
-{
-    EscherDggRecord dgg;
-    Map<Short, EscherDgRecord> dgMap = new HashMap<Short, EscherDgRecord>(); // key = Short(drawingId), value=EscherDgRecord
-
-    public DrawingManager( EscherDggRecord dgg )
-    {
-        this.dgg = dgg;
-    }
-
-    public EscherDgRecord createDgRecord()
-    {
-        EscherDgRecord dg = new EscherDgRecord();
-        dg.setRecordId( EscherDgRecord.RECORD_ID );
-        short dgId = findNewDrawingGroupId();
-        dg.setOptions( (short) ( dgId << 4 ) );
-        dg.setNumShapes( 0 );
-        dg.setLastMSOSPID( -1 );
-        dgg.addCluster( dgId, 0 );
-        dgg.setDrawingsSaved( dgg.getDrawingsSaved() + 1 );
-        dgMap.put( dgId, dg );
-        return dg;
-    }
-
-    /**
-     * Allocates new shape id for the new drawing group id.
-     *
-     * @param drawingGroupId The drawing group id
-     * @return a new shape id.
-     */
-    public int allocateShapeId(short drawingGroupId)
-    {
-        // Get the last shape id for this drawing group.
-        EscherDgRecord dg = dgMap.get(drawingGroupId);
-        int lastShapeId = dg.getLastMSOSPID();
-
-
-        // Have we run out of shapes for this cluster?
-        int newShapeId = 0;
-        if (lastShapeId % 1024 == 1023)
-        {
-            // Yes:
-                // Find the starting shape id of the next free cluster
-            newShapeId = findFreeSPIDBlock();
-                // Create a new cluster in the dgg record.
-            dgg.addCluster(drawingGroupId, 1);
-        }
-        else
-        {
-            // No:
-                // Find the cluster for this drawing group with free space.
-            for (int i = 0; i < dgg.getFileIdClusters().length; i++)
-            {
-                EscherDggRecord.FileIdCluster c = dgg.getFileIdClusters()[i];
-                if (c.getDrawingGroupId() == drawingGroupId)
-                {
-                    if (c.getNumShapeIdsUsed() != 1024)
-                    {
-                        // Increment the number of shapes used for this cluster.
-                        c.incrementShapeId();
-                    }
-                }
-                // If the last shape id = -1 then we know to find a free block;
-                if (dg.getLastMSOSPID() == -1)
-                {
-                    newShapeId = findFreeSPIDBlock();
-                }
-                else
-                {
-                    // The new shape id to be the last shapeid of this cluster + 1
-                    newShapeId = dg.getLastMSOSPID() + 1;
-                }
-            }
-        }
-        // Increment the total number of shapes used in the dgg.
-        dgg.setNumShapesSaved(dgg.getNumShapesSaved() + 1);
-        // Is the new shape id >= max shape id for dgg?
-        if (newShapeId >= dgg.getShapeIdMax())
-        {
-            // Yes:
-                // Set the max shape id = new shape id + 1
-            dgg.setShapeIdMax(newShapeId + 1);
-        }
-        // Set last shape id for this drawing group.
-        dg.setLastMSOSPID(newShapeId);
-        // Increased the number of shapes used for this drawing group.
-        dg.incrementShapeCount();
-
-
-        return newShapeId;
-    }
-
-    ////////////  Non-public methods /////////////
-    short findNewDrawingGroupId()
-    {
-        short dgId = 1;
-        while ( drawingGroupExists( dgId ) )
-            dgId++;
-        return dgId;
-    }
-
-    boolean drawingGroupExists( short dgId )
-    {
-        for ( int i = 0; i < dgg.getFileIdClusters().length; i++ )
-        {
-            if ( dgg.getFileIdClusters()[i].getDrawingGroupId() == dgId )
-                return true;
-        }
-        return false;
-    }
-
-    int findFreeSPIDBlock()
-    {
-        int max = dgg.getShapeIdMax();
-        int next = ( ( max / 1024 ) + 1 ) * 1024;
-        return next;
-    }
-
-    public EscherDggRecord getDgg()
-    {
-        return dgg;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/DrawingManager2.java b/trunk/src/java/org/apache/poi/hssf/model/DrawingManager2.java
deleted file mode 100644
index e5deeb0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/DrawingManager2.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-
-import java.util.List;
-import java.util.ArrayList;
-
-
-/**
- * Provides utilities to manage drawing groups.
- */
-public class DrawingManager2
-{
-    EscherDggRecord dgg;
-    List<EscherDgRecord> drawingGroups = new ArrayList<EscherDgRecord>();
-
-
-    public DrawingManager2( EscherDggRecord dgg )
-    {
-        this.dgg = dgg;
-    }
-    
-    /**
-     * Clears the cached list of drawing groups
-     */
-    public void clearDrawingGroups() {
-    	drawingGroups.clear(); 
-    }
-
-    /**
-     * Creates a new drawing group 
-     *
-     * @return a new drawing group
-     */
-    public EscherDgRecord createDgRecord()
-    {
-        EscherDgRecord dg = new EscherDgRecord();
-        dg.setRecordId( EscherDgRecord.RECORD_ID );
-        short dgId = findNewDrawingGroupId();
-        dg.setOptions( (short) ( dgId << 4 ) );
-        dg.setNumShapes( 0 );
-        dg.setLastMSOSPID( -1 );
-        drawingGroups.add(dg);
-        dgg.addCluster( dgId, 0 );
-        dgg.setDrawingsSaved( dgg.getDrawingsSaved() + 1 );
-        return dg;
-    }
-
-    /**
-     * Allocates new shape id for the drawing group id.
-     * 
-     * @param drawingGroupId the drawing group id
-     * 
-     * @return a new shape id
-     */
-    public int allocateShapeId(short drawingGroupId)
-    {
-        EscherDgRecord dg = getDrawingGroup(drawingGroupId);
-        return allocateShapeId(drawingGroupId, dg);
-    }
-
-    /**
-     * Allocates new shape id for the drawing group
-     *
-     * @param drawingGroupId the drawing group id
-     * @param dg the EscherDgRecord which receives the new shape
-     *
-     * @return a new shape id.
-     */
-    public int allocateShapeId(short drawingGroupId, EscherDgRecord dg)
-    {
-        dgg.setNumShapesSaved( dgg.getNumShapesSaved() + 1 );
-
-        // Add to existing cluster if space available
-        for (int i = 0; i < dgg.getFileIdClusters().length; i++)
-        {
-            EscherDggRecord.FileIdCluster c = dgg.getFileIdClusters()[i];
-            if (c.getDrawingGroupId() == drawingGroupId && c.getNumShapeIdsUsed() != 1024)
-            {
-                int result = c.getNumShapeIdsUsed() + (1024 * (i+1));
-                c.incrementShapeId();
-                dg.setNumShapes( dg.getNumShapes() + 1 );
-                dg.setLastMSOSPID( result );
-                if (result >= dgg.getShapeIdMax())
-                    dgg.setShapeIdMax( result + 1 );
-                return result;
-            }
-        }
-
-        // Create new cluster
-        dgg.addCluster( drawingGroupId, 0 );
-        dgg.getFileIdClusters()[dgg.getFileIdClusters().length-1].incrementShapeId();
-        dg.setNumShapes( dg.getNumShapes() + 1 );
-        int result = (1024 * dgg.getFileIdClusters().length);
-        dg.setLastMSOSPID( result );
-        if (result >= dgg.getShapeIdMax())
-            dgg.setShapeIdMax( result + 1 );
-        return result;
-    }
-    ////////////  Non-public methods /////////////
-    
-    /**
-     * Finds the next available (1 based) drawing group id
-     * 
-     * @return the next available drawing group id
-     */
-    public short findNewDrawingGroupId()
-    {
-        short dgId = 1; 
-        while ( drawingGroupExists( dgId ) )
-            dgId++;
-        return dgId;
-    }
-
-    EscherDgRecord getDrawingGroup(int drawingGroupId)
-    {
-        return drawingGroups.get(drawingGroupId-1);
-    }
-
-    boolean drawingGroupExists( short dgId )
-    {
-        for ( int i = 0; i < dgg.getFileIdClusters().length; i++ )
-        {
-            if ( dgg.getFileIdClusters()[i].getDrawingGroupId() == dgId )
-                return true;
-        }
-        return false;
-    }
-
-    int findFreeSPIDBlock()
-    {
-        int max = dgg.getShapeIdMax();
-        int next = ( ( max / 1024 ) + 1 ) * 1024;
-        return next;
-    }
-
-    /**
-     * Returns the drawing group container record
-     *
-     * @return the drawing group container record
-     */
-    public EscherDggRecord getDgg()
-    {
-        return dgg;
-    }
-
-    /**
-     * Increment the drawing counter
-     */
-    public void incrementDrawingsSaved(){
-        dgg.setDrawingsSaved(dgg.getDrawingsSaved()+1);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java b/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
deleted file mode 100644
index 774eb78..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaParsingWorkbook;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-
-/**
- * HSSF wrapper for the {@link FormulaParser} and {@link FormulaRenderer}
- */
-@Internal
-public final class HSSFFormulaParser {
-
-    private static FormulaParsingWorkbook createParsingWorkbook(HSSFWorkbook book) {
-        return HSSFEvaluationWorkbook.create(book);
-    }
-
-    private HSSFFormulaParser() {
-        // no instances of this class
-    }
-
-    /**
-     * Convenience method for parsing cell formulas. see {@link #parse(String, HSSFWorkbook, FormulaType, int)}
-     * @param formula   The formula to parse, excluding the leading equals sign
-     * @param workbook  The parent workbook
-     * @return the parsed formula tokens
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     */
-    public static Ptg[] parse(String formula, HSSFWorkbook workbook) throws FormulaParseException {
-        return parse(formula, workbook, FormulaType.CELL);
-    }
-
-    /**
-     * @param formula The formula to parse, excluding the leading equals sign
-     * @param workbook The parent workbook
-     * @param formulaType a constant from {@link FormulaType}
-     * @return the parsed formula tokens
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     * 
-     * @deprecated POI 3.15 beta 3. Use {@link #parse(String, HSSFWorkbook, FormulaType)} instead.
-     */
-    @Removal(version="3.17")
-    public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType) throws FormulaParseException {
-        return parse(formula, workbook, FormulaType.forInt(formulaType));
-    }
-    /**
-     * @param formula     The formula to parse, excluding the leading equals sign
-     * @param workbook    The parent workbook
-     * @param formulaType The type of formula
-     * @return The parsed formula tokens
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     */
-    public static Ptg[] parse(String formula, HSSFWorkbook workbook, FormulaType formulaType) throws FormulaParseException {
-        return parse(formula, workbook, formulaType, -1);
-    }
-
-    /**
-     * @param formula     the formula to parse
-     * @param workbook    the parent workbook
-     * @param formulaType a constant from {@link FormulaType}
-     * @param sheetIndex  the 0-based index of the sheet this formula belongs to.
-     * The sheet index is required to resolve sheet-level names. <code>-1</code> means that
-     * the scope of the name will be ignored and  the parser will match named ranges only by name
-     *
-     * @return the parsed formula tokens
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     * @deprecated POI 3.15 beta 3. Use {@link #parse(String, HSSFWorkbook, FormulaType, int)} instead.
-     */
-    @Removal(version="3.17")
-    public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType, int sheetIndex) throws FormulaParseException {
-        return parse(formula, workbook, FormulaType.forInt(formulaType), sheetIndex);
-    }
-    /**
-     * @param formula     The formula to parse
-     * @param workbook    The parent workbook
-     * @param formulaType The type of formula
-     * @param sheetIndex  The 0-based index of the sheet this formula belongs to.
-     * The sheet index is required to resolve sheet-level names. <code>-1</code> means that
-     * the scope of the name will be ignored and  the parser will match named ranges only by name
-     *
-     * @return the parsed formula tokens
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     */
-    public static Ptg[] parse(String formula, HSSFWorkbook workbook, FormulaType formulaType, int sheetIndex) throws FormulaParseException {
-        return FormulaParser.parse(formula, createParsingWorkbook(workbook), formulaType, sheetIndex);
-    }
-
-    /**
-     * Static method to convert an array of {@link Ptg}s in RPN order
-     * to a human readable string format in infix mode.
-     * @param book  used for defined names and 3D references
-     * @param ptgs  must not be <code>null</code>
-     * @return a human readable String
-     */
-    public static String toFormulaString(HSSFWorkbook book, Ptg[] ptgs) {
-        return FormulaRenderer.toFormulaString(HSSFEvaluationWorkbook.create(book), ptgs);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java b/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java
deleted file mode 100644
index ab07b7c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/InternalSheet.java
+++ /dev/null
@@ -1,1718 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.CFHeader12Record;
-import org.apache.poi.hssf.record.CFHeaderRecord;
-import org.apache.poi.hssf.record.CalcCountRecord;
-import org.apache.poi.hssf.record.CalcModeRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.ColumnInfoRecord;
-import org.apache.poi.hssf.record.DVALRecord;
-import org.apache.poi.hssf.record.DefaultColWidthRecord;
-import org.apache.poi.hssf.record.DefaultRowHeightRecord;
-import org.apache.poi.hssf.record.DeltaRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.DrawingRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.FeatHdrRecord;
-import org.apache.poi.hssf.record.FeatRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.GutsRecord;
-import org.apache.poi.hssf.record.IndexRecord;
-import org.apache.poi.hssf.record.IterationRecord;
-import org.apache.poi.hssf.record.MergeCellsRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.PaneRecord;
-import org.apache.poi.hssf.record.PrintGridlinesRecord;
-import org.apache.poi.hssf.record.PrintHeadersRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.RefModeRecord;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.SaveRecalcRecord;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.hssf.record.UncalcedRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.aggregates.ChartSubstreamRecordAggregate;
-import org.apache.poi.hssf.record.aggregates.ColumnInfoRecordsAggregate;
-import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable;
-import org.apache.poi.hssf.record.aggregates.CustomViewSettingsRecordAggregate;
-import org.apache.poi.hssf.record.aggregates.DataValidityTable;
-import org.apache.poi.hssf.record.aggregates.MergedCellsTable;
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.PositionTrackingVisitor;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.hssf.record.aggregates.RowRecordsAggregate;
-import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.PaneInformation;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Low level model implementation of a Sheet (one workbook contains many sheets)
- * This file contains the low level binary records starting at the sheets BOF and
- * ending with the sheets EOF.  Use HSSFSheet for a high level representation.
- * <P>
- * The structures of the highlevel API use references to this to perform most of their
- * operations.  Its probably unwise to use these low level structures directly unless you
- * really know what you're doing.  I recommend you read the Microsoft Excel 97 Developer's
- * Kit (Microsoft Press) and the documentation at http://sc.openoffice.org/excelfileformat.pdf
- * before even attempting to use this.
- *
- * @see org.apache.poi.hssf.model.InternalWorkbook
- * @see org.apache.poi.hssf.usermodel.HSSFSheet
- */
-@Internal
-public final class InternalSheet {
-    public static final short   LeftMargin = 0;
-    public static final short   RightMargin = 1;
-    public static final short   TopMargin = 2;
-    public static final short   BottomMargin = 3;
-
-    private static POILogger            log              = POILogFactory.getLogger(InternalSheet.class);
-
-    private List<RecordBase>             _records;
-    protected PrintGridlinesRecord       printGridlines    =     null;
-    protected PrintHeadersRecord         printHeaders      =     null;
-    protected GridsetRecord              gridset           =     null;
-    private   GutsRecord                 _gutsRecord;
-    protected DefaultColWidthRecord      defaultcolwidth   =     new DefaultColWidthRecord();
-    protected DefaultRowHeightRecord     defaultrowheight  =     new DefaultRowHeightRecord();
-    private PageSettingsBlock _psBlock;
-
-    /**
-     * 'Worksheet Protection Block'<br/>
-     *  Aggregate object is always present, but possibly empty.
-     */
-    private final WorksheetProtectionBlock _protectionBlock = new WorksheetProtectionBlock();
-
-    protected WindowTwoRecord            windowTwo         =     null;
-    protected SelectionRecord            _selection         =     null;
-    /** java object always present, but if empty no BIFF records are written */
-    private final MergedCellsTable       _mergedCellsTable;
-    /** always present in this POI object, not always written to Excel file */
-    /*package*/ColumnInfoRecordsAggregate _columnInfos;
-    /** the DimensionsRecord is always present */
-    private DimensionsRecord             _dimensions;
-    /** always present */
-    protected final RowRecordsAggregate  _rowsAggregate;
-    private   DataValidityTable          _dataValidityTable=     null;
-    private   ConditionalFormattingTable condFormatting;
-
-    private   Iterator<RowRecord>        rowRecIterator    =     null;
-
-    /** Add an UncalcedRecord if not true indicating formulas have not been calculated */
-    protected boolean _isUncalced = false;
-
-    public static final byte PANE_LOWER_RIGHT = (byte)0;
-    public static final byte PANE_UPPER_RIGHT = (byte)1;
-    public static final byte PANE_LOWER_LEFT = (byte)2;
-    public static final byte PANE_UPPER_LEFT = (byte)3;
-
-    /**
-     * read support  (offset used as starting point for search) for low level
-     * API.  Pass in an array of Record objects, the sheet number (0 based) and
-     * a record offset (should be the location of the sheets BOF record).  A Sheet
-     * object is constructed and passed back with all of its initialization set
-     * to the passed in records and references to those records held. This function
-     * is normally called via Workbook.
-     *
-     * @param rs the stream to read records from
-     *
-     * @return Sheet object with all values set to those read from the file
-     *
-     * @see org.apache.poi.hssf.model.InternalWorkbook
-     * @see org.apache.poi.hssf.record.Record
-     */
-    public static InternalSheet createSheet(RecordStream rs) {
-        return new InternalSheet(rs);
-    }
-    private InternalSheet(RecordStream rs) {
-        _mergedCellsTable = new MergedCellsTable();
-        RowRecordsAggregate rra = null;
-
-        List<RecordBase> records = new ArrayList<RecordBase>(128);
-        _records = records; // needed here due to calls to findFirstRecordLocBySid before we're done
-        int dimsloc = -1;
-
-        if (rs.peekNextSid() != BOFRecord.sid) {
-            throw new RecordFormatException("BOF record expected");
-        }
-        
-        BOFRecord bof = (BOFRecord) rs.getNext();
-        if (bof.getType() == BOFRecord.TYPE_WORKSHEET) {
-            // Good, well supported
-        } else if (bof.getType() == BOFRecord.TYPE_CHART ||
-                   bof.getType() == BOFRecord.TYPE_EXCEL_4_MACRO) {
-            // These aren't really typical sheets... Let it go though,
-            //  we can handle them roughly well enough as a "normal" one
-        } else {
-            // Not a supported type
-            // Skip onto the EOF, then complain
-            while (rs.hasNext()) {
-                Record rec = rs.getNext();
-                if (rec instanceof EOFRecord) {
-                    break;
-                }
-            }
-            throw new UnsupportedBOFType(bof.getType());
-        }
-        records.add(bof);
-        
-        while (rs.hasNext()) {
-            int recSid = rs.peekNextSid();
-
-            if ( recSid == CFHeaderRecord.sid || recSid == CFHeader12Record.sid ) {
-                condFormatting = new ConditionalFormattingTable(rs);
-                records.add(condFormatting);
-                continue;
-            }
-
-            if (recSid == ColumnInfoRecord.sid) {
-                _columnInfos = new ColumnInfoRecordsAggregate(rs);
-                records.add(_columnInfos);
-                continue;
-            }
-            if ( recSid == DVALRecord.sid) {
-                _dataValidityTable = new DataValidityTable(rs);
-                records.add(_dataValidityTable);
-                continue;
-            }
-
-            if (RecordOrderer.isRowBlockRecord(recSid)) {
-                //only add the aggregate once
-                if (rra != null) {
-                    throw new RecordFormatException("row/cell records found in the wrong place");
-                }
-                RowBlocksReader rbr = new RowBlocksReader(rs);
-                _mergedCellsTable.addRecords(rbr.getLooseMergedCells());
-                rra = new RowRecordsAggregate(rbr.getPlainRecordStream(), rbr.getSharedFormulaManager());
-                records.add(rra); //only add the aggregate once
-                continue;
-            }
-
-            if (CustomViewSettingsRecordAggregate.isBeginRecord(recSid)) {
-                // This happens three times in test sample file "29982.xls"
-                // Also several times in bugzilla samples 46840-23373 and 46840-23374
-                records.add(new CustomViewSettingsRecordAggregate(rs));
-                continue;
-            }
-
-            if (PageSettingsBlock.isComponentRecord(recSid)) {
-                if (_psBlock == null) {
-                    // first PSB record encountered - read all of them:
-                    _psBlock = new PageSettingsBlock(rs);
-                    records.add(_psBlock);
-                } else {
-                    // one or more PSB records found after some intervening non-PSB records
-                    _psBlock.addLateRecords(rs);
-                }
-                // YK: in some cases records can be moved to the preceding
-                // CustomViewSettingsRecordAggregate blocks
-                _psBlock.positionRecords(records);
-                continue;
-            }
-
-            if (WorksheetProtectionBlock.isComponentRecord(recSid)) {
-                _protectionBlock.addRecords(rs);
-                continue;
-            }
-
-            if (recSid == MergeCellsRecord.sid) {
-                // when the MergedCellsTable is found in the right place, we expect those records to be contiguous
-                _mergedCellsTable.read(rs);
-                continue;
-            }
-
-            if (recSid == BOFRecord.sid) {
-                ChartSubstreamRecordAggregate chartAgg = new ChartSubstreamRecordAggregate(rs);
-//                if (false) {
-//                    // TODO - would like to keep the chart aggregate packed, but one unit test needs attention
-//                    records.add(chartAgg);
-//                } else {
-                    spillAggregate(chartAgg, records);
-//                }
-                continue;
-            }
-
-            Record rec = rs.getNext();
-            if ( recSid == IndexRecord.sid ) {
-                // ignore INDEX record because it is only needed by Excel,
-                // and POI always re-calculates its contents
-                continue;
-            }
-
-
-            if (recSid == UncalcedRecord.sid) {
-                // don't add UncalcedRecord to the list
-                _isUncalced = true; // this flag is enough
-                continue;
-            }
-
-            if (recSid == FeatRecord.sid ||
-            		recSid == FeatHdrRecord.sid) {
-                records.add(rec);
-                continue;
-            }
-
-            if (recSid == EOFRecord.sid) {
-                records.add(rec);
-                break;
-            }
-
-            if (recSid == DimensionsRecord.sid)
-            {
-                // Make a columns aggregate if one hasn't ready been created.
-                if (_columnInfos == null)
-                {
-                    _columnInfos = new ColumnInfoRecordsAggregate();
-                    records.add(_columnInfos);
-                }
-
-                _dimensions    = ( DimensionsRecord ) rec;
-                dimsloc = records.size();
-            }
-            else if (recSid == DefaultColWidthRecord.sid)
-            {
-                defaultcolwidth = ( DefaultColWidthRecord ) rec;
-            }
-            else if (recSid == DefaultRowHeightRecord.sid)
-            {
-                defaultrowheight = ( DefaultRowHeightRecord ) rec;
-            }
-            else if ( recSid == PrintGridlinesRecord.sid )
-            {
-                printGridlines = (PrintGridlinesRecord) rec;
-            }
-            else if ( recSid == PrintHeadersRecord.sid )
-            {
-                printHeaders = (PrintHeadersRecord) rec;
-            }
-            else if ( recSid == GridsetRecord.sid )
-            {
-                gridset = (GridsetRecord) rec;
-            }
-            else if ( recSid == SelectionRecord.sid )
-            {
-                _selection = (SelectionRecord) rec;
-            }
-            else if ( recSid == WindowTwoRecord.sid )
-            {
-                windowTwo = (WindowTwoRecord) rec;
-            }
-            else if ( recSid == GutsRecord.sid )
-            {
-                _gutsRecord = (GutsRecord) rec;
-            }
-
-            records.add(rec);
-        }
-        if (windowTwo == null) {
-            throw new RecordFormatException("WINDOW2 was not found");
-        }
-        if (_dimensions == null) {
-            // Excel seems to always write the DIMENSION record, but tolerates when it is not present
-            // in all cases Excel (2007) adds the missing DIMENSION record
-            if (rra == null) {
-                // bug 46206 alludes to files which skip the DIMENSION record
-                // when there are no row/cell records.
-                // Not clear which application wrote these files.
-                rra = new RowRecordsAggregate();
-            } else {
-                if (log.check(POILogger.WARN)) {
-                    log.log(POILogger.WARN, "DIMENSION record not found even though row/cells present");
-                }
-                // Not sure if any tools write files like this, but Excel reads them OK
-            }
-            dimsloc = findFirstRecordLocBySid(WindowTwoRecord.sid);
-            _dimensions = rra.createDimensions();
-            records.add(dimsloc, _dimensions);
-        }
-        if (rra == null) {
-            rra = new RowRecordsAggregate();
-            records.add(dimsloc + 1, rra);
-        }
-        _rowsAggregate = rra;
-        // put merged cells table in the right place (regardless of where the first MergedCellsRecord was found */
-        RecordOrderer.addNewSheetRecord(records, _mergedCellsTable);
-        RecordOrderer.addNewSheetRecord(records, _protectionBlock);
-        if (log.check( POILogger.DEBUG ))
-            log.log(POILogger.DEBUG, "sheet createSheet (existing file) exited");
-    }
-    private static void spillAggregate(RecordAggregate ra, final List<RecordBase> recs) {
-        ra.visitContainedRecords(new RecordVisitor() {
-            public void visitRecord(Record r) {
-                recs.add(r);
-            }});
-    }
-    
-    public static class UnsupportedBOFType extends RecordFormatException {
-        private final int type;
-        protected UnsupportedBOFType(int type) {
-            super("BOF not of a supported type, found " + type);
-            this.type = type;
-        }
-        
-        public int getType() {
-            return type;
-        }
-    }
-
-    private static final class RecordCloner implements RecordVisitor {
-
-        private final List<Record> _destList;
-
-        public RecordCloner(List<Record> destList) {
-            _destList = destList;
-        }
-        public void visitRecord(Record r) {
-            try {
-                _destList.add((Record)r.clone());
-            } catch (CloneNotSupportedException e) {
-                throw new RecordFormatException(e);
-            }
-        }
-    }
-
-    /**
-     * Clones the low level records of this sheet and returns the new sheet instance.
-     * This method is implemented by adding methods for deep cloning to all records that
-     * can be added to a sheet. The <b>Record</b> object does not implement cloneable.
-     * When adding a new record, implement a public clone method if and only if the record
-     * belongs to a sheet.
-     * 
-     * @return the cloned sheet
-     */
-    public InternalSheet cloneSheet() {
-        List<Record> clonedRecords = new ArrayList<Record>(_records.size());
-        for (int i = 0; i < _records.size(); i++) {
-            RecordBase rb = _records.get(i);
-            if (rb instanceof RecordAggregate) {
-                ((RecordAggregate) rb).visitContainedRecords(new RecordCloner(clonedRecords));
-                continue;
-            }
-            if (rb instanceof EscherAggregate){
-                /**
-                 * this record will be removed after reading actual data from EscherAggregate
-                 */
-                rb = new DrawingRecord();
-            }
-            try {
-                Record rec = (Record) ((Record) rb).clone();
-                clonedRecords.add(rec);
-            } catch (CloneNotSupportedException e) {
-                throw new RecordFormatException(e);
-            }
-        }
-        return createSheet(new RecordStream(clonedRecords, 0));
-    }
-
-    /**
-     * Creates a sheet with all the usual records minus values and the "index"
-     * record (not required).  Sets the location pointer to where the first value
-     * records should go.  Use this to create a sheet from "scratch".
-     *
-     * @return Sheet object with all values set to defaults
-     */
-    public static InternalSheet createSheet() {
-        return new InternalSheet();
-    }
-    private InternalSheet() {
-        _mergedCellsTable = new MergedCellsTable();
-        List<RecordBase> records = new ArrayList<RecordBase>(32);
-
-        if (log.check( POILogger.DEBUG ))
-            log.log(POILogger.DEBUG, "Sheet createsheet from scratch called");
-
-        records.add(createBOF());
-
-        records.add(createCalcMode());
-        records.add(createCalcCount() );
-        records.add(createRefMode() );
-        records.add(createIteration() );
-        records.add(createDelta() );
-        records.add(createSaveRecalc() );
-        printHeaders = createPrintHeaders();
-        records.add(printHeaders);
-        printGridlines = createPrintGridlines();
-        records.add( printGridlines );
-        gridset = createGridset();
-        records.add( gridset );
-        _gutsRecord = createGuts();
-        records.add( _gutsRecord );
-        defaultrowheight = createDefaultRowHeight();
-        records.add( defaultrowheight );
-        records.add( createWSBool() );
-
-        // 'Page Settings Block'
-        _psBlock = new PageSettingsBlock();
-        records.add(_psBlock);
-
-        // 'Worksheet Protection Block' (after 'Page Settings Block' and before DEFCOLWIDTH)
-        records.add(_protectionBlock); // initially empty
-
-        defaultcolwidth = createDefaultColWidth();
-        records.add( defaultcolwidth);
-        ColumnInfoRecordsAggregate columns = new ColumnInfoRecordsAggregate();
-        records.add( columns );
-        _columnInfos = columns;
-        _dimensions = createDimensions();
-        records.add(_dimensions);
-        _rowsAggregate = new RowRecordsAggregate();
-        records.add(_rowsAggregate);
-        // 'Sheet View Settings'
-        records.add(windowTwo = createWindowTwo());
-        _selection = createSelection();
-        records.add(_selection);
-
-        records.add(_mergedCellsTable); // MCT comes after 'Sheet View Settings'
-        records.add(EOFRecord.instance);
-
-        _records = records;
-        if (log.check( POILogger.DEBUG ))
-            log.log(POILogger.DEBUG, "Sheet createsheet from scratch exit");
-    }
-
-    public RowRecordsAggregate getRowsAggregate() {
-        return _rowsAggregate;
-    }
-
-    private MergedCellsTable getMergedRecords() {
-        // always present
-        return _mergedCellsTable;
-    }
-
-    /**
-     * Updates formulas in cells and conditional formats due to moving of cells
-     * 
-     * @param shifter the formular shifter
-     * @param externSheetIndex the externSheet index of this sheet
-     */
-    public void updateFormulasAfterCellShift(FormulaShifter shifter, int externSheetIndex) {
-        getRowsAggregate().updateFormulasAfterRowShift(shifter, externSheetIndex);
-        if (condFormatting != null) {
-            getConditionalFormattingTable().updateFormulasAfterCellShift(shifter, externSheetIndex);
-        }
-        // TODO - adjust data validations
-    }
-
-    public int addMergedRegion(int rowFrom, int colFrom, int rowTo, int colTo) {
-        // Validate input
-        if (rowTo < rowFrom) {
-            throw new IllegalArgumentException("The 'to' row (" + rowTo
-                    + ") must not be less than the 'from' row (" + rowFrom + ")");
-        }
-        if (colTo < colFrom) {
-            throw new IllegalArgumentException("The 'to' col (" + colTo
-                    + ") must not be less than the 'from' col (" + colFrom + ")");
-        }
-
-        MergedCellsTable mrt = getMergedRecords();
-        mrt.addArea(rowFrom, colFrom, rowTo, colTo);
-        return mrt.getNumberOfMergedRegions()-1;
-    }
-
-    public void removeMergedRegion(int index) {
-        //safety checks
-        MergedCellsTable mrt = getMergedRecords();
-        if (index >= mrt.getNumberOfMergedRegions()) {
-            return;
-        }
-        mrt.remove(index);
-    }
-
-    public CellRangeAddress getMergedRegionAt(int index) {
-        //safety checks
-        MergedCellsTable mrt = getMergedRecords();
-        if (index >=  mrt.getNumberOfMergedRegions()) {
-            return null;
-        }
-        return mrt.get(index);
-    }
-
-    public int getNumMergedRegions() {
-        return getMergedRecords().getNumberOfMergedRegions();
-    }
-    public ConditionalFormattingTable getConditionalFormattingTable() {
-        if (condFormatting == null) {
-            condFormatting = new ConditionalFormattingTable();
-            RecordOrderer.addNewSheetRecord(_records, condFormatting);
-        }
-        return condFormatting;
-    }
-
-    /**
-     * Per an earlier reported bug in working with Andy Khan's excel read library.  This
-     * sets the values in the sheet's DimensionsRecord object to be correct.  Excel doesn't
-     * really care, but we want to play nice with other libraries.
-     *
-     * @param firstrow the first row index
-     * @param firstcol the first column index
-     * @param lastrow the last row index
-     * @param lastcol the last column index
-     *
-     * @see org.apache.poi.hssf.record.DimensionsRecord
-     */
-    public void setDimensions(int firstrow, short firstcol, int lastrow, short lastcol)
-    {
-        if (log.check( POILogger.DEBUG ))
-        {
-            log.log(POILogger.DEBUG, "Sheet.setDimensions");
-            log.log(POILogger.DEBUG,
-                    (new StringBuffer("firstrow")).append(firstrow)
-                        .append("firstcol").append(firstcol).append("lastrow")
-                        .append(lastrow).append("lastcol").append(lastcol)
-                        .toString());
-        }
-        _dimensions.setFirstCol(firstcol);
-        _dimensions.setFirstRow(firstrow);
-        _dimensions.setLastCol(lastcol);
-        _dimensions.setLastRow(lastrow);
-        if (log.check( POILogger.DEBUG ))
-            log.log(POILogger.DEBUG, "Sheet.setDimensions exiting");
-    }
-
-    public void visitContainedRecords(RecordVisitor rv, int offset) {
-
-        PositionTrackingVisitor ptv = new PositionTrackingVisitor(rv, offset);
-
-        boolean haveSerializedIndex = false;
-
-        for (int k = 0; k < _records.size(); k++) {
-            RecordBase record = _records.get(k);
-
-            if (record instanceof RecordAggregate) {
-                RecordAggregate agg = (RecordAggregate) record;
-                agg.visitContainedRecords(ptv);
-            } else {
-                ptv.visitRecord((Record) record);
-            }
-
-            // If the BOF record was just serialized then add the IndexRecord
-            if (record instanceof BOFRecord) {
-              if (!haveSerializedIndex) {
-                haveSerializedIndex = true;
-                // Add an optional UncalcedRecord. However, we should add
-                //  it in only the once, after the sheet's own BOFRecord.
-                // If there are diagrams, they have their own BOFRecords,
-                //  and one shouldn't go in after that!
-                if (_isUncalced) {
-                    ptv.visitRecord(new UncalcedRecord());
-                }
-                //Can there be more than one BOF for a sheet? If not then we can
-                //remove this guard. So be safe it is left here.
-                if (_rowsAggregate != null) {
-                    // find forward distance to first RowRecord
-                    int initRecsSize = getSizeOfInitialSheetRecords(k);
-                    int currentPos = ptv.getPosition();
-                    ptv.visitRecord(_rowsAggregate.createIndexRecord(currentPos, initRecsSize));
-                }
-              }
-            }
-        }
-    }
-    /**
-     * 'initial sheet records' are between INDEX and the 'Row Blocks'
-     * @param bofRecordIndex index of record after which INDEX record is to be placed
-     * @return count of bytes from end of INDEX record to first ROW record.
-     */
-    private int getSizeOfInitialSheetRecords(int bofRecordIndex) {
-
-        int result = 0;
-        // start just after BOF record (INDEX is not present in this list)
-        for (int j = bofRecordIndex + 1; j < _records.size(); j++) {
-            RecordBase tmpRec = _records.get(j);
-            if (tmpRec instanceof RowRecordsAggregate) {
-                break;
-            }
-            result += tmpRec.getRecordSize();
-        }
-        if (_isUncalced) {
-            result += UncalcedRecord.getStaticRecordSize();
-        }
-        return result;
-    }
-
-    /**
-     * Adds a value record to the sheet's contained binary records
-     * (i.e. LabelSSTRecord or NumberRecord).
-     * <P>
-     * This method is "loc" sensitive.  Meaning you need to set LOC to where you
-     * want it to start searching.  If you don't know do this: setLoc(getDimsLoc).
-     * When adding several rows you can just start at the last one by leaving loc
-     * at what this sets it to.
-     *
-     * @param row the row to add the cell value to
-     * @param col the cell value record itself.
-     */
-    public void addValueRecord(int row, CellValueRecordInterface col) {
-
-        if(log.check(POILogger.DEBUG)) {
-          log.log(POILogger.DEBUG, "add value record  row" + row);
-        }
-        DimensionsRecord d = _dimensions;
-
-        if (col.getColumn() >= d.getLastCol()) {
-            d.setLastCol(( short ) (col.getColumn() + 1));
-        }
-        if (col.getColumn() < d.getFirstCol()) {
-            d.setFirstCol(col.getColumn());
-        }
-        _rowsAggregate.insertCell(col);
-    }
-
-    /**
-     * remove a value record from the records array.
-     *
-     * This method is not loc sensitive, it resets loc to = dimsloc so no worries.
-     *
-     * @param row - the row of the value record you wish to remove
-     * @param col - a record supporting the CellValueRecordInterface.
-     * @see org.apache.poi.hssf.record.CellValueRecordInterface
-     */
-    public void removeValueRecord(int row, CellValueRecordInterface col) {
-
-        log.log(POILogger.DEBUG, "remove value record row "+row);
-        _rowsAggregate.removeCell(col);
-    }
-
-    /**
-     * replace a value record from the records array.
-     *
-     * This method is not loc sensitive, it resets loc to = dimsloc so no worries.
-     *
-     * @param newval - a record supporting the CellValueRecordInterface.  this will replace
-     *                the cell value with the same row and column.  If there isn't one, one will
-     *                be added.
-     */
-
-    public void replaceValueRecord(CellValueRecordInterface newval) {
-
-        if (log.check( POILogger.DEBUG ))
-            log.log(POILogger.DEBUG, "replaceValueRecord ");
-        //The ValueRecordsAggregate use a tree map underneath.
-        //The tree Map uses the CellValueRecordInterface as both the
-        //key and the value, if we dont do a remove, then
-        //the previous instance of the key is retained, effectively using
-        //double the memory
-        _rowsAggregate.removeCell(newval);
-        _rowsAggregate.insertCell(newval);
-    }
-
-    /**
-     * Adds a row record to the sheet
-     *
-     * <P>
-     * This method is "loc" sensitive.  Meaning you need to set LOC to where you
-     * want it to start searching.  If you don't know do this: setLoc(getDimsLoc).
-     * When adding several rows you can just start at the last one by leaving loc
-     * at what this sets it to.
-     *
-     * @param row the row record to be added
-     */
-
-    public void addRow(RowRecord row) {
-        if (log.check( POILogger.DEBUG ))
-            log.log(POILogger.DEBUG, "addRow ");
-        DimensionsRecord d = _dimensions;
-
-        if (row.getRowNumber() >= d.getLastRow()) {
-            d.setLastRow(row.getRowNumber() + 1);
-        }
-        if (row.getRowNumber() < d.getFirstRow()) {
-            d.setFirstRow(row.getRowNumber());
-        }
-
-        //If the row exists remove it, so that any cells attached to the row are removed
-        RowRecord existingRow = _rowsAggregate.getRow(row.getRowNumber());
-        if (existingRow != null) {
-            _rowsAggregate.removeRow(existingRow);
-        }
-
-        _rowsAggregate.insertRow(row);
-
-        if (log.check( POILogger.DEBUG ))
-            log.log(POILogger.DEBUG, "exit addRow");
-    }
-
-    /**
-     * Removes a row record
-     *
-     * This method is not loc sensitive, it resets loc to = dimsloc so no worries.
-     *
-     * @param row  the row record to remove
-     */
-    public void removeRow(RowRecord row) {
-        _rowsAggregate.removeRow(row);
-    }
-
-    /**
-     * Get all the value records (from LOC). Records will be returned from the first
-     *  record (starting at LOC) which is a value record.
-     *
-     * <P>
-     * This method is "loc" sensitive.  Meaning you need to set LOC to where you
-     * want it to start searching.  If you don't know do this: setLoc(getDimsLoc).
-     * When adding several rows you can just start at the last one by leaving loc
-     * at what this sets it to.  For this method, set loc to dimsloc to start with,
-     * subsequent calls will return values in (physical) sequence or NULL when you get to the end.
-     *
-     * @return Iterator of CellValueRecordInterface representing the value records
-     */
-    public Iterator<CellValueRecordInterface> getCellValueIterator(){
-    	return _rowsAggregate.getCellValueIterator();
-    }
-
-    /**
-     * get the NEXT RowRecord (from LOC).  The first record that is a Row record
-     * (starting at LOC) will be returned.
-     * <P>
-     * This method is "loc" sensitive.  Meaning you need to set LOC to where you
-     * want it to start searching.  If you don't know do this: setLoc(getDimsLoc).
-     * When adding several rows you can just start at the last one by leaving loc
-     * at what this sets it to.  For this method, set loc to dimsloc to start with.
-     * subsequent calls will return rows in (physical) sequence or NULL when you get to the end.
-     *
-     * @return RowRecord representing the next row record or NULL if there are no more
-     */
-    public RowRecord getNextRow() {
-        if (rowRecIterator == null)
-        {
-            rowRecIterator = _rowsAggregate.getIterator();
-        }
-        if (!rowRecIterator.hasNext())
-        {
-            return null;
-        }
-        return rowRecIterator.next();
-    }
-
-    /**
-     * get the NEXT (from LOC) RowRecord where rownumber matches the given rownum.
-     * The first record that is a Row record (starting at LOC) that has the
-     * same rownum as the given rownum will be returned.
-     * <P>
-     * This method is "loc" sensitive.  Meaning you need to set LOC to where you
-     * want it to start searching.  If you don't know do this: setLoc(getDimsLoc).
-     * When adding several rows you can just start at the last one by leaving loc
-     * at what this sets it to.  For this method, set loc to dimsloc to start with.
-     * subsequent calls will return rows in (physical) sequence or NULL when you get to the end.
-     *
-     * @param rownum   which row to return (careful with LOC)
-     * @return RowRecord representing the next row record or NULL if there are no more
-     *
-     */
-    public RowRecord getRow(int rownum) {
-        return _rowsAggregate.getRow(rownum);
-    }
-
-    /**
-     * creates the BOF record
-     */
-    /* package */ static BOFRecord createBOF() {
-        BOFRecord retval = new BOFRecord();
-
-        retval.setVersion(( short ) 0x600);
-        retval.setType(( short ) 0x010);
-
-        retval.setBuild(( short ) 0x0dbb);
-        retval.setBuildYear(( short ) 1996);
-        retval.setHistoryBitMask(0xc1);
-        retval.setRequiredVersion(0x6);
-        return retval;
-    }
-
-    /**
-     * creates the CalcMode record and sets it to 1 (automatic formula caculation)
-     */
-    private static CalcModeRecord createCalcMode() {
-        CalcModeRecord retval = new CalcModeRecord();
-
-        retval.setCalcMode(( short ) 1);
-        return retval;
-    }
-
-    /**
-     * creates the CalcCount record and sets it to 100 (default number of iterations)
-     */
-    private static CalcCountRecord createCalcCount() {
-        CalcCountRecord retval = new CalcCountRecord();
-
-        retval.setIterations(( short ) 100);   // default 100 iterations
-        return retval;
-    }
-
-    /**
-     * creates the RefMode record and sets it to A1 Mode (default reference mode)
-     */
-    private static RefModeRecord createRefMode() {
-        RefModeRecord retval = new RefModeRecord();
-
-        retval.setMode(RefModeRecord.USE_A1_MODE);
-        return retval;
-    }
-
-    /**
-     * creates the Iteration record and sets it to false (don't iteratively calculate formulas)
-     */
-    private static IterationRecord createIteration() {
-        return new IterationRecord(false);
-    }
-
-    /**
-     * creates the Delta record and sets it to 0.0010 (default accuracy)
-     */
-    private static DeltaRecord createDelta() {
-        return new DeltaRecord(DeltaRecord.DEFAULT_VALUE);
-    }
-
-    /**
-     * creates the SaveRecalc record and sets it to true (recalculate before saving)
-     */
-    private static SaveRecalcRecord createSaveRecalc() {
-        SaveRecalcRecord retval = new SaveRecalcRecord();
-
-        retval.setRecalc(true);
-        return retval;
-    }
-
-    /**
-     * creates the PrintHeaders record and sets it to false (we don't create headers yet so why print them)
-     */
-    private static PrintHeadersRecord createPrintHeaders() {
-        PrintHeadersRecord retval = new PrintHeadersRecord();
-
-        retval.setPrintHeaders(false);
-        return retval;
-    }
-
-    /**
-     * creates the PrintGridlines record and sets it to false (that makes for ugly sheets).  As far as I can
-     * tell this does the same thing as the GridsetRecord
-     */
-    private static PrintGridlinesRecord createPrintGridlines() {
-        PrintGridlinesRecord retval = new PrintGridlinesRecord();
-
-        retval.setPrintGridlines(false);
-        return retval;
-    }
-
-    /**
-     * creates the Gridset record and sets it to true (user has mucked with the gridlines)
-     */
-    private static GridsetRecord createGridset() {
-        GridsetRecord retval = new GridsetRecord();
-
-        retval.setGridset(true);
-        return retval;
-    }
-
-    /**
-     * creates the Guts record and sets leftrow/topcol guttter and rowlevelmax/collevelmax to 0
-      */
-    private static GutsRecord createGuts() {
-        GutsRecord retval = new GutsRecord();
-
-        retval.setLeftRowGutter(( short ) 0);
-        retval.setTopColGutter(( short ) 0);
-        retval.setRowLevelMax(( short ) 0);
-        retval.setColLevelMax(( short ) 0);
-        return retval;
-    }
-
-    private GutsRecord getGutsRecord() {
-        if (_gutsRecord == null) {
-            GutsRecord result = createGuts();
-            RecordOrderer.addNewSheetRecord(_records, result);
-            _gutsRecord = result;
-        }
-
-        return _gutsRecord;
-    }
-
-    /**
-     * creates the DefaultRowHeight Record and sets its options to 0 and rowheight to 0xff
-     */
-    private static DefaultRowHeightRecord createDefaultRowHeight() {
-        DefaultRowHeightRecord retval = new DefaultRowHeightRecord();
-
-        retval.setOptionFlags(( short ) 0);
-        retval.setRowHeight(DefaultRowHeightRecord.DEFAULT_ROW_HEIGHT);
-        return retval;
-    }
-
-    /**
-     * creates the WSBoolRecord and sets its values to defaults
-     */
-    private static WSBoolRecord createWSBool() {
-        WSBoolRecord retval = new WSBoolRecord();
-
-        retval.setWSBool1(( byte ) 0x4);
-        retval.setWSBool2(( byte ) 0xffffffc1);
-        return retval;
-    }
-
-
-    /**
-     * creates the DefaultColWidth Record and sets it to 8
-      */
-    private static DefaultColWidthRecord createDefaultColWidth() {
-        DefaultColWidthRecord retval = new DefaultColWidthRecord();
-        retval.setColWidth(DefaultColWidthRecord.DEFAULT_COLUMN_WIDTH);
-        return retval;
-    }
-
-    /**
-     * get the default column width for the sheet (if the columns do not define their own width)
-     * @return default column width
-     */
-    public int getDefaultColumnWidth() {
-        return defaultcolwidth.getColWidth();
-    }
-
-    /**
-     * @return <code>true</code> if gridlines are printed
-     */
-    public boolean isGridsPrinted() {
-        if (gridset == null) {
-            gridset = createGridset();
-            //Insert the newlycreated Gridset record at the end of the record (just before the EOF)
-            int loc = findFirstRecordLocBySid(EOFRecord.sid);
-            _records.add(loc, gridset);
-        }
-        return !gridset.getGridset();
-    }
-
-    /**
-     * set whether gridlines printed or not.
-     * @param value     True if gridlines printed.
-     */
-    public void setGridsPrinted(boolean value) {
-        gridset.setGridset(!value);
-    }
-
-    /**
-     * set the default column width for the sheet (if the columns do not define their own width)
-     * @param dcw  default column width
-     */
-    public void setDefaultColumnWidth(int dcw) {
-        defaultcolwidth.setColWidth(dcw);
-    }
-
-    /**
-     * set the default row height for the sheet (if the rows do not define their own height)
-     * 
-     * @param dch the default row height
-     */
-    public void setDefaultRowHeight(short dch) {
-        defaultrowheight.setRowHeight(dch);
-        // set the bit that specifies that the default settings for the row height have been changed.
-        defaultrowheight.setOptionFlags((short)1);
-    }
-
-    /**
-     * get the default row height for the sheet (if the rows do not define their own height)
-     * @return  default row height
-     */
-    public short getDefaultRowHeight() {
-        return defaultrowheight.getRowHeight();
-    }
-
-    /**
-     * get the width of a given column in units of 1/256th of a character width
-     * @param columnIndex index
-     * @see org.apache.poi.hssf.record.DefaultColWidthRecord
-     * @see org.apache.poi.hssf.record.ColumnInfoRecord
-     * @see #setColumnWidth(int, int)
-     * @return column width in units of 1/256th of a character width
-     */
-    public int getColumnWidth(int columnIndex) {
-
-        ColumnInfoRecord ci = _columnInfos.findColumnInfo(columnIndex);
-        if (ci != null) {
-            return ci.getColumnWidth();
-        }
-        //default column width is measured in characters
-        //multiply
-        return (256*defaultcolwidth.getColWidth());
-    }
-
-    /**
-     * get the index to the ExtendedFormatRecord "associated" with
-     * the column at specified 0-based index. (In this case, an
-     * ExtendedFormatRecord index is actually associated with a
-     * ColumnInfoRecord which spans 1 or more columns)
-     * <p>
-     * Returns the index to the default ExtendedFormatRecord (0xF)
-     * if no ColumnInfoRecord exists that includes the column
-     * index specified.
-     * @param columnIndex the column index
-     * @return index of ExtendedFormatRecord associated with
-     * ColumnInfoRecord that includes the column index or the
-     * index of the default ExtendedFormatRecord (0xF)
-     */
-    public short getXFIndexForColAt(short columnIndex) {
-        ColumnInfoRecord ci = _columnInfos.findColumnInfo(columnIndex);
-        if (ci != null) {
-            return (short)ci.getXFIndex();
-        }
-        return 0xF;
-    }
-
-    /**
-     * set the width for a given column in 1/256th of a character width units
-     *
-     * @param column -
-     *            the column number
-     * @param width
-     *            (in units of 1/256th of a character width)
-     */
-    public void setColumnWidth(int column, int width) {
-        if(width > 255*256) throw new IllegalArgumentException("The maximum column width for an individual cell is 255 characters.");
-
-        setColumn(column, null, Integer.valueOf(width), null, null, null);
-    }
-
-    /**
-     * Get the hidden property for a given column.
-     * @param columnIndex column index
-     * @see org.apache.poi.hssf.record.DefaultColWidthRecord
-     * @see org.apache.poi.hssf.record.ColumnInfoRecord
-     * @see #setColumnHidden(int, boolean)
-     * @return whether the column is hidden or not.
-     */
-    public boolean isColumnHidden(int columnIndex) {
-        ColumnInfoRecord cir = _columnInfos.findColumnInfo(columnIndex);
-        if (cir == null) {
-            return false;
-        }
-        return cir.getHidden();
-    }
-
-    /**
-     * Get the hidden property for a given column.
-     * @param column - the column number
-     * @param hidden - whether the column is hidden or not
-     */
-    public void setColumnHidden(int column, boolean hidden) {
-        setColumn( column, null, null, null, Boolean.valueOf(hidden), null);
-    }
-    public void setDefaultColumnStyle(int column, int styleIndex) {
-        setColumn(column, Short.valueOf((short)styleIndex), null, null, null, null);
-    }
-
-    private void setColumn(int column, Short xfStyle, Integer width, Integer level, Boolean hidden, Boolean collapsed) {
-        _columnInfos.setColumn( column, xfStyle, width, level, hidden, collapsed );
-    }
-
-
-    /**
-     * Creates an outline group for the specified columns.
-     * @param fromColumn    group from this column (inclusive)
-     * @param toColumn      group to this column (inclusive)
-     * @param indent        if true the group will be indented by one level,
-     *                      if false indenting will be removed by one level.
-     */
-    public void groupColumnRange(int fromColumn, int toColumn, boolean indent) {
-
-        // Set the level for each column
-        _columnInfos.groupColumnRange( fromColumn, toColumn, indent);
-
-        // Determine the maximum overall level
-        int maxLevel = _columnInfos.getMaxOutlineLevel();
-
-        GutsRecord guts = getGutsRecord();
-        guts.setColLevelMax( (short) ( maxLevel+1 ) );
-        if (maxLevel == 0) {
-            guts.setTopColGutter( (short)0 );
-        } else {
-            guts.setTopColGutter( (short) ( 29 + (12 * (maxLevel-1)) ) );
-        }
-    }
-
-    /**
-     * creates the Dimensions Record and sets it to bogus values (you should set this yourself
-     * or let the high level API do it for you)
-     */
-    private static DimensionsRecord createDimensions() {
-        DimensionsRecord retval = new DimensionsRecord();
-
-        retval.setFirstCol(( short ) 0);
-        retval.setLastRow(1);             // one more than it is
-        retval.setFirstRow(0);
-        retval.setLastCol(( short ) 1);   // one more than it is
-        return retval;
-    }
-
-    /**
-     * creates the WindowTwo Record and sets it to:  <P>
-     * options        = 0x6b6 <P>
-     * toprow         = 0 <P>
-     * leftcol        = 0 <P>
-     * headercolor    = 0x40 <P>
-     * pagebreakzoom  = 0x0 <P>
-     * normalzoom     = 0x0 <p>
-     */
-    private static WindowTwoRecord createWindowTwo() {
-        WindowTwoRecord retval = new WindowTwoRecord();
-
-        retval.setOptions(( short ) 0x6b6);
-        retval.setTopRow(( short ) 0);
-        retval.setLeftCol(( short ) 0);
-        retval.setHeaderColor(0x40);
-        retval.setPageBreakZoom(( short ) 0);
-        retval.setNormalZoom(( short ) 0);
-        return retval;
-    }
-
-    /**
-     * Creates the Selection record and sets it to nothing selected
-    */
-    private static SelectionRecord createSelection() {
-        return new SelectionRecord(0, 0);
-    }
-
-    public short getTopRow() {
-        return (windowTwo==null) ? (short) 0 : windowTwo.getTopRow();
-    }
-
-    public void setTopRow(short topRow) {
-        if (windowTwo!=null) {
-            windowTwo.setTopRow(topRow);
-        }
-    }
-
-    /**
-     * Sets the left column to show in desktop window pane.
-     * @param leftCol the left column to show in desktop window pane
-     */
-    public void setLeftCol(short leftCol) {
-        if (windowTwo!=null) {
-            windowTwo.setLeftCol(leftCol);
-        }
-    }
-
-    public short getLeftCol() {
-        return (windowTwo==null) ? (short) 0 : windowTwo.getLeftCol();
-    }
-
-    /**
-     * Returns the active row
-     *
-     * @see org.apache.poi.hssf.record.SelectionRecord
-     * @return row the active row index
-     */
-    public int getActiveCellRow() {
-        if (_selection == null) {
-            return 0;
-        }
-        return _selection.getActiveCellRow();
-    }
-
-    /**
-     * Sets the active row
-     *
-     * @param row the row index
-     * @see org.apache.poi.hssf.record.SelectionRecord
-     */
-    public void setActiveCellRow(int row) {
-        //shouldn't have a sheet w/o a SelectionRecord, but best to guard anyway
-        if (_selection != null) {
-            _selection.setActiveCellRow(row);
-        }
-    }
-
-    /**
-     * @see org.apache.poi.hssf.record.SelectionRecord
-     * @return column of the active cell
-     */
-    public short getActiveCellCol() {
-        if (_selection == null) {
-            return 0;
-        }
-        return (short)_selection.getActiveCellCol();
-    }
-
-    /**
-     * Sets the active column
-     *
-     * @param col the column index
-     * @see org.apache.poi.hssf.record.SelectionRecord
-     */
-    public void setActiveCellCol(short col) {
-        //shouldn't have a sheet w/o a SelectionRecord, but best to guard anyway
-        if (_selection != null)
-        {
-            _selection.setActiveCellCol(col);
-        }
-    }
-
-    public List<RecordBase> getRecords() {
-        return _records;
-    }
-
-    /**
-     * Gets the gridset record for this sheet.
-     * 
-     * @return the gridset record for this sheet
-     */
-    public GridsetRecord getGridsetRecord()
-    {
-        return gridset;
-    }
-
-    /**
-     * Returns the first occurrence of a record matching a particular sid.
-     * 
-     * @param sid the sid to search for
-     * 
-     * @return the matching record or {@code null} if it wasn't found
-     */
-    public Record findFirstRecordBySid(short sid) {
-        int ix = findFirstRecordLocBySid(sid);
-        if (ix < 0) {
-            return null;
-        }
-        return (Record) _records.get(ix);
-    }
-
-    /**
-     * Sets the SCL record or creates it in the correct place if it does not
-     * already exist.
-     *
-     * @param sclRecord     The record to set.
-     */
-    public void setSCLRecord(SCLRecord sclRecord) {
-        int oldRecordLoc = findFirstRecordLocBySid(SCLRecord.sid);
-        if (oldRecordLoc == -1) {
-            // Insert it after the window record
-            int windowRecordLoc = findFirstRecordLocBySid(WindowTwoRecord.sid);
-            _records.add(windowRecordLoc+1, sclRecord);
-        } else {
-            _records.set(oldRecordLoc, sclRecord);
-        }
-    }
-
-    /**
-     * Finds the first occurrence of a record matching a particular sid and
-     * returns it's position.
-     * @param sid   the sid to search for
-     * @return  the record position of the matching record or -1 if no match
-     *          is made.
-     */
-    public int findFirstRecordLocBySid( short sid ) { // TODO - remove this method
-        int max = _records.size();
-        for (int i=0; i< max; i++) {
-            Object rb = _records.get(i);
-            if (!(rb instanceof Record)) {
-                continue;
-            }
-            Record record = (Record) rb;
-            if (record.getSid() == sid) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    public WindowTwoRecord getWindowTwo() {
-        return windowTwo;
-    }
-
-    /**
-     * Returns the PrintGridlinesRecord.
-     * @return PrintGridlinesRecord for the sheet.
-     */
-    public PrintGridlinesRecord getPrintGridlines ()
-    {
-        return printGridlines;
-    }
-
-    /**
-     * Sets the PrintGridlinesRecord.
-     * @param newPrintGridlines The new PrintGridlinesRecord for the sheet.
-     */
-    public void setPrintGridlines (PrintGridlinesRecord newPrintGridlines)
-    {
-        printGridlines = newPrintGridlines;
-    }
-    
-    /**
-     * Returns the PrintHeadersRecord.
-     * @return PrintHeadersRecord for the sheet.
-     */
-    public PrintHeadersRecord getPrintHeaders()
-    {
-        return printHeaders;
-    }
-
-    /**
-     * Sets the PrintHeadersRecord.
-     * @param newPrintHeaders The new PrintHeadersRecord for the sheet.
-     */
-    public void setPrintHeaders(PrintHeadersRecord newPrintHeaders)
-    {
-        printHeaders = newPrintHeaders;
-    }
-
-    /**
-     * Sets whether the sheet is selected
-     * @param sel True to select the sheet, false otherwise.
-     */
-    public void setSelected(boolean sel) {
-        windowTwo.setSelected(sel);
-    }
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.
-     *
-     * <p>If both colSplit and rowSplit are zero then the existing freeze pane is removed</p>
-     *
-     * @param colSplit      Horizonatal position of split.
-     * @param rowSplit      Vertical position of split.
-     * @param topRow        Top row visible in bottom pane
-     * @param leftmostColumn   Left column visible in right pane.
-     */
-    public void createFreezePane(int colSplit, int rowSplit, int topRow, int leftmostColumn) {
-        int paneLoc = findFirstRecordLocBySid(PaneRecord.sid);
-        if (paneLoc != -1)
-            _records.remove(paneLoc);
-
-        // If both colSplit and rowSplit are zero then the existing freeze pane is removed
-        if(colSplit == 0 && rowSplit == 0){
-            windowTwo.setFreezePanes(false);
-            windowTwo.setFreezePanesNoSplit(false);
-            SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
-            sel.setPane(PaneInformation.PANE_UPPER_LEFT);
-            return;
-        }
-
-        int loc = findFirstRecordLocBySid(WindowTwoRecord.sid);
-        PaneRecord pane = new PaneRecord();
-        pane.setX((short)colSplit);
-        pane.setY((short)rowSplit);
-        pane.setTopRow((short) topRow);
-        pane.setLeftColumn((short) leftmostColumn);
-        if (rowSplit == 0) {
-            pane.setTopRow((short)0);
-            pane.setActivePane((short)1);
-        } else if (colSplit == 0) {
-            pane.setLeftColumn((short)0);
-            pane.setActivePane((short)2);
-        } else {
-            pane.setActivePane((short)0);
-        }
-        _records.add(loc+1, pane);
-
-        windowTwo.setFreezePanes(true);
-        windowTwo.setFreezePanesNoSplit(true);
-
-        SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
-        sel.setPane((byte)pane.getActivePane());
-
-    }
-
-    /**
-     * Creates a split pane. Any existing freezepane or split pane is overwritten.
-     * @param xSplitPos      Horizonatal position of split (in 1/20th of a point).
-     * @param ySplitPos      Vertical position of split (in 1/20th of a point).
-     * @param topRow        Top row visible in bottom pane
-     * @param leftmostColumn   Left column visible in right pane.
-     * @param activePane    Active pane.  One of: PANE_LOWER_RIGHT,
-     *                      PANE_UPPER_RIGHT, PANE_LOWER_LEFT, PANE_UPPER_LEFT
-     * @see #PANE_LOWER_LEFT
-     * @see #PANE_LOWER_RIGHT
-     * @see #PANE_UPPER_LEFT
-     * @see #PANE_UPPER_RIGHT
-     */
-    public void createSplitPane(int xSplitPos, int ySplitPos, int topRow, int leftmostColumn, int activePane) {
-        int paneLoc = findFirstRecordLocBySid(PaneRecord.sid);
-        if (paneLoc != -1)
-            _records.remove(paneLoc);
-
-        int loc = findFirstRecordLocBySid(WindowTwoRecord.sid);
-        PaneRecord r = new PaneRecord();
-        r.setX((short)xSplitPos);
-        r.setY((short)ySplitPos);
-        r.setTopRow((short) topRow);
-        r.setLeftColumn((short) leftmostColumn);
-        r.setActivePane((short) activePane);
-        _records.add(loc+1, r);
-
-        windowTwo.setFreezePanes(false);
-        windowTwo.setFreezePanesNoSplit(false);
-
-        SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
-        sel.setPane(PANE_LOWER_RIGHT);
-
-    }
-
-    /**
-     * Returns the information regarding the currently configured pane (split or freeze).
-     * @return <code>null</code> if no pane configured, or the pane information.
-     */
-    public PaneInformation getPaneInformation() {
-      PaneRecord rec = (PaneRecord)findFirstRecordBySid(PaneRecord.sid);
-      if (rec == null)
-        return null;
-
-      return new PaneInformation(rec.getX(), rec.getY(), rec.getTopRow(),
-                                 rec.getLeftColumn(), (byte)rec.getActivePane(), windowTwo.getFreezePanes());
-    }
-
-    public SelectionRecord getSelection() {
-        return _selection;
-    }
-
-    public void setSelection( SelectionRecord selection) {
-        _selection = selection;
-    }
-
-    /**
-     * @return the {@link WorksheetProtectionBlock} for this sheet
-     */
-    public WorksheetProtectionBlock getProtectionBlock() {
-        return _protectionBlock;
-    }
-    /**
-     * Sets whether the gridlines are shown in a viewer.
-     * @param show whether to show gridlines or not
-     */
-    public void setDisplayGridlines(boolean show) {
-        windowTwo.setDisplayGridlines(show);
-    }
-
-    /**
-     * @return <code>true</code> if gridlines are displayed
-     */
-    public boolean isDisplayGridlines() {
-    return windowTwo.getDisplayGridlines();
-    }
-
-    /**
-     * Sets whether the formulas are shown in a viewer.
-     * @param show whether to show formulas or not
-     */
-    public void setDisplayFormulas(boolean show) {
-        windowTwo.setDisplayFormulas(show);
-    }
-
-    /**
-     * Returns if formulas are displayed.
-     * @return whether formulas are displayed
-     */
-    public boolean isDisplayFormulas() {
-    return windowTwo.getDisplayFormulas();
-    }
-
-    /**
-     * Sets whether the RowColHeadings are shown in a viewer.
-     * @param show whether to show RowColHeadings or not
-     */
-    public void setDisplayRowColHeadings(boolean show) {
-        windowTwo.setDisplayRowColHeadings(show);
-    }
-
-    /**
-     * Returns if RowColHeadings are displayed.
-     * @return whether RowColHeadings are displayed
-     */
-    public boolean isDisplayRowColHeadings() {
-        return windowTwo.getDisplayRowColHeadings();
-    }
-    
-    /**
-     * Sets whether the RowColHeadings are shown in a viewer.
-     * @param show whether to show RowColHeadings or not
-     */
-    public void setPrintRowColHeadings(boolean show) {
-        windowTwo.setDisplayRowColHeadings(show);
-    }
-
-    /**
-     * Returns if RowColHeadings are displayed.
-     * @return whether RowColHeadings are displayed
-     */
-    public boolean isPrintRowColHeadings() {
-        return windowTwo.getDisplayRowColHeadings();
-    }
-
-
-    /**
-     * @return whether an uncalced record must be inserted or not at generation
-     */
-    public boolean getUncalced() {
-        return _isUncalced;
-    }
-    /**
-     * @param uncalced whether an uncalced record must be inserted or not at generation
-     */
-    public void setUncalced(boolean uncalced) {
-        this._isUncalced = uncalced;
-    }
-
-    /**
-     * Finds the DrawingRecord for our sheet, and
-     *  attaches it to the DrawingManager (which knows about
-     *  the overall DrawingGroup for our workbook).
-     * If requested, will create a new DrawRecord
-     *  if none currently exist
-     * @param drawingManager The DrawingManager2 for our workbook
-     * @param createIfMissing Should one be created if missing?
-     * @return location of EscherAggregate record. if no EscherAggregate record is found return -1
-     */
-    public int aggregateDrawingRecords(DrawingManager2 drawingManager, boolean createIfMissing) {
-        int loc = findFirstRecordLocBySid(DrawingRecord.sid);
-        boolean noDrawingRecordsFound = (loc == -1);
-        if (noDrawingRecordsFound) {
-            if(!createIfMissing) {
-                // None found, and not allowed to add in
-                return -1;
-            }
-
-            EscherAggregate aggregate = new EscherAggregate(true);
-            loc = findFirstRecordLocBySid(EscherAggregate.sid);
-            if (loc == -1) {
-                loc = findFirstRecordLocBySid( WindowTwoRecord.sid );
-            } else {
-                getRecords().remove(loc);
-            }
-            getRecords().add( loc, aggregate );
-            return loc;
-        }
-        List<RecordBase> records = getRecords();
-
-        EscherAggregate.createAggregate(records, loc);
-
-        return loc;
-    }
-
-    /**
-     * Perform any work necessary before the sheet is about to be serialized.
-     * For instance the escher aggregates size needs to be calculated before
-     * serialization so that the dgg record (which occurs first) can be written.
-     */
-    public void preSerialize() {
-        for (RecordBase r: getRecords()) {
-            if (r instanceof EscherAggregate) {
-                // Trigger flattening of user model and corresponding update of dgg record.
-                r.getRecordSize();
-            }
-        }
-    }
-
-
-    public PageSettingsBlock getPageSettings() {
-        if (_psBlock == null) {
-            _psBlock = new PageSettingsBlock();
-            RecordOrderer.addNewSheetRecord(_records, _psBlock);
-        }
-        return _psBlock;
-    }
-
-
-    public void setColumnGroupCollapsed(int columnNumber, boolean collapsed) {
-        if (collapsed) {
-            _columnInfos.collapseColumn(columnNumber);
-        } else {
-            _columnInfos.expandColumn(columnNumber);
-        }
-    }
-
-
-    public void groupRowRange(int fromRow, int toRow, boolean indent)
-    {
-        for (int rowNum = fromRow; rowNum <= toRow; rowNum++)
-        {
-            RowRecord row = getRow( rowNum );
-            if (row == null)
-            {
-                row = RowRecordsAggregate.createRow(rowNum);
-                addRow( row );
-            }
-            int level = row.getOutlineLevel();
-            if (indent) level++; else level--;
-            level = Math.max(0, level);
-            level = Math.min(7, level);
-            row.setOutlineLevel((short) ( level ));
-        }
-
-        recalcRowGutter();
-    }
-
-    private void recalcRowGutter() {
-        int maxLevel = 0;
-        Iterator<RowRecord> iterator = _rowsAggregate.getIterator();
-        while (iterator.hasNext()) {
-            RowRecord rowRecord = iterator.next();
-            maxLevel = Math.max(rowRecord.getOutlineLevel(), maxLevel);
-        }
-
-        // Grab the guts record, adding if needed
-        GutsRecord guts = getGutsRecord();
-        // Set the levels onto it
-        guts.setRowLevelMax( (short) ( maxLevel + 1 ) );
-        guts.setLeftRowGutter( (short) ( 29 + (12 * (maxLevel)) ) );
-    }
-
-    public DataValidityTable getOrCreateDataValidityTable() {
-        if (_dataValidityTable == null) {
-            DataValidityTable result = new DataValidityTable();
-            RecordOrderer.addNewSheetRecord(_records, result);
-            _dataValidityTable = result;
-        }
-        return _dataValidityTable;
-    }
-    /**
-     * Get the {@link NoteRecord}s (related to cell comments) for this sheet
-     * @return never <code>null</code>, typically empty array
-     */
-    public NoteRecord[] getNoteRecords() {
-        List<NoteRecord> temp = new ArrayList<NoteRecord>();
-        for(int i=_records.size()-1; i>=0; i--) {
-            RecordBase rec = _records.get(i);
-            if (rec instanceof NoteRecord) {
-                temp.add((NoteRecord) rec);
-            }
-        }
-        if (temp.size() < 1) {
-            return NoteRecord.EMPTY_ARRAY;
-        }
-        NoteRecord[] result = new NoteRecord[temp.size()];
-        temp.toArray(result);
-        return result;
-    }
-    
-    public int getColumnOutlineLevel(int columnIndex) {
-        return _columnInfos.getOutlineLevel(columnIndex);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
deleted file mode 100644
index 3a5fc1e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
+++ /dev/null
@@ -1,2701 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.security.AccessControlException;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.crypto.SecretKey;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherBoolProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherRGBProperty;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.ddf.EscherSplitMenuColorsRecord;
-import org.apache.poi.hssf.extractor.OldExcelExtractor;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BackupRecord;
-import org.apache.poi.hssf.record.BookBoolRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.CodepageRecord;
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.DSFRecord;
-import org.apache.poi.hssf.record.DateWindow1904Record;
-import org.apache.poi.hssf.record.DrawingGroupRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.ExtSSTRecord;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.FilePassRecord;
-import org.apache.poi.hssf.record.FileSharingRecord;
-import org.apache.poi.hssf.record.FnGroupCountRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.hssf.record.HideObjRecord;
-import org.apache.poi.hssf.record.HyperlinkRecord;
-import org.apache.poi.hssf.record.InterfaceEndRecord;
-import org.apache.poi.hssf.record.InterfaceHdrRecord;
-import org.apache.poi.hssf.record.MMSRecord;
-import org.apache.poi.hssf.record.NameCommentRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.PaletteRecord;
-import org.apache.poi.hssf.record.PasswordRecord;
-import org.apache.poi.hssf.record.PasswordRev4Record;
-import org.apache.poi.hssf.record.PrecisionRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.ProtectionRev4Record;
-import org.apache.poi.hssf.record.RecalcIdRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RefreshAllRecord;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.StyleRecord;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.hssf.record.TabIdRecord;
-import org.apache.poi.hssf.record.UseSelFSRecord;
-import org.apache.poi.hssf.record.WindowOneRecord;
-import org.apache.poi.hssf.record.WindowProtectRecord;
-import org.apache.poi.hssf.record.WriteAccessRecord;
-import org.apache.poi.hssf.record.WriteProtectRecord;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalName;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheet;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheetRange;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.OperandPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Low level model implementation of a Workbook.  Provides creational methods
- * for settings and objects contained in the workbook object.
- * <P>
- * This file contains the low level binary records starting at the workbook's BOF and
- * ending with the workbook's EOF.  Use HSSFWorkbook for a high level representation.
- * <P>
- * The structures of the highlevel API use references to this to perform most of their
- * operations.  Its probably unwise to use these low level structures directly unless you
- * really know what you're doing.  I recommend you read the Microsoft Excel 97 Developer's
- * Kit (Microsoft Press) and the documentation at http://sc.openoffice.org/excelfileformat.pdf
- * before even attempting to use this.
- *
- * @see org.apache.poi.hssf.usermodel.HSSFWorkbook
- */
-@Internal
-public final class InternalWorkbook {
-    /**
-     * Excel silently truncates long sheet names to 31 chars.
-     * This constant is used to ensure uniqueness in the first 31 chars
-     */
-    private static final int MAX_SENSITIVE_SHEET_NAME_LEN = 31;
-
-    /**
-     * Normally, the Workbook will be in a POIFS Stream called 
-     *  "Workbook". However, some weird XLS generators use "WORKBOOK"
-     *  or "BOOK".
-     */
-    public static final String[] WORKBOOK_DIR_ENTRY_NAMES = {
-        "Workbook", // as per BIFF8 spec
-        "WORKBOOK", // Typically from third party programs
-        "BOOK",     // Typically odd Crystal Reports exports
-    };
-    /**
-     * Name of older (pre-Excel 97) Workbook streams, which
-     *  aren't supported by HSSFWorkbook, only by
-     *  {@link OldExcelExtractor}
-     */
-    public static final String OLD_WORKBOOK_DIR_ENTRY_NAME = "Book";
-
-    private static final POILogger log = POILogFactory.getLogger(InternalWorkbook.class);
-    private static final int DEBUG = POILogger.DEBUG;
-
-    /**
-     * constant used to set the "codepage" wherever "codepage" is set in records
-     * (which is duplicated in more than one record)
-     */
-    private final static short CODEPAGE = 0x04B0;
-
-    /**
-     * this contains the Worksheet record objects
-     */
-    private final WorkbookRecordList records;
-
-    /**
-     * this contains a reference to the SSTRecord so that new stings can be added
-     * to it.
-     */
-    protected SSTRecord sst;
-
-
-    private LinkTable linkTable; // optionally occurs if there are  references in the document. (4.10.3)
-
-    /**
-     * holds the "boundsheet" records (aka bundlesheet) so that they can have their
-     * reference to their "BOF" marker
-     */
-    private final List<BoundSheetRecord> boundsheets;
-    private final List<FormatRecord> formats;
-    private final List<HyperlinkRecord> hyperlinks;
-
-    /** the number of extended format records */
-	private int numxfs;
-    /** the number of font records */
-	private int numfonts;
-    /** holds the max format id */
-	private int maxformatid;
-    /** whether 1904 date windowing is being used */
-    private boolean uses1904datewindowing;
-    private DrawingManager2 drawingManager;
-    private List<EscherBSERecord> escherBSERecords;
-    private WindowOneRecord windowOne;
-    private FileSharingRecord fileShare;
-    private WriteAccessRecord writeAccess;
-    private WriteProtectRecord writeProtect;
-
-    /**
-     * Hold the {@link NameCommentRecord}s indexed by the name of the {@link NameRecord} to which they apply.
-     */
-    private final Map<String, NameCommentRecord> commentRecords;
-
-    private InternalWorkbook() {
-    	records     = new WorkbookRecordList();
-
-		boundsheets = new ArrayList<BoundSheetRecord>();
-		formats = new ArrayList<FormatRecord>();
-		hyperlinks = new ArrayList<HyperlinkRecord>();
-		numxfs = 0;
-		numfonts = 0;
-		maxformatid = -1;
-		uses1904datewindowing = false;
-		escherBSERecords = new ArrayList<EscherBSERecord>();
-		commentRecords = new LinkedHashMap<String, NameCommentRecord>();
-    }
-
-    /**
-     * read support  for low level
-     * API.  Pass in an array of Record objects, A Workbook
-     * object is constructed and passed back with all of its initialization set
-     * to the passed in records and references to those records held. Unlike Sheet
-     * workbook does not use an offset (its assumed to be 0) since its first in a file.
-     * If you need an offset then construct a new array with a 0 offset or write your
-     * own ;-p.
-     *
-     * @param recs an array of Record objects
-     * @return Workbook object
-     */
-    public static InternalWorkbook createWorkbook(List<Record> recs) {
-        if (log.check( POILogger.DEBUG ))
-            log.log(DEBUG, "Workbook (readfile) created with reclen=",
-                    Integer.valueOf(recs.size()));
-        InternalWorkbook retval = new InternalWorkbook();
-        List<Record> records = new ArrayList<Record>(recs.size() / 3);
-        retval.records.setRecords(records);
-
-        int k;
-        for (k = 0; k < recs.size(); k++) {
-            Record rec = recs.get(k);
-
-            if (rec.getSid() == EOFRecord.sid) {
-                records.add(rec);
-                if (log.check( POILogger.DEBUG ))
-                    log.log(DEBUG, "found workbook eof record at " + k);
-                break;
-            }
-            switch (rec.getSid()) {
-
-                case BoundSheetRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found boundsheet record at " + k);
-                    retval.boundsheets.add((BoundSheetRecord) rec);
-                    retval.records.setBspos( k );
-                    break;
-
-                case SSTRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found sst record at " + k);
-                    retval.sst = ( SSTRecord ) rec;
-                    break;
-
-                case FontRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found font record at " + k);
-                    retval.records.setFontpos( k );
-                    retval.numfonts++;
-                    break;
-
-                case ExtendedFormatRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found XF record at " + k);
-                    retval.records.setXfpos( k );
-                    retval.numxfs++;
-                    break;
-
-                case TabIdRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found tabid record at " + k);
-                    retval.records.setTabpos( k );
-                    break;
-
-                case ProtectRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found protect record at " + k);
-                    retval.records.setProtpos( k );
-                    break;
-
-                case BackupRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found backup record at " + k);
-                    retval.records.setBackuppos( k );
-                    break;
-                case ExternSheetRecord.sid :
-                    throw new RuntimeException("Extern sheet is part of LinkTable");
-                case NameRecord.sid :
-                case SupBookRecord.sid :
-                    // LinkTable can start with either of these
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found SupBook record at " + k);
-                    retval.linkTable = new LinkTable(recs, k, retval.records, retval.commentRecords);
-                    k+=retval.linkTable.getRecordCount() - 1;
-                    continue;
-                case FormatRecord.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found format record at " + k);
-                    retval.formats.add((FormatRecord) rec);
-                    retval.maxformatid = retval.maxformatid >= ((FormatRecord)rec).getIndexCode() ? retval.maxformatid : ((FormatRecord)rec).getIndexCode();
-                    break;
-                case DateWindow1904Record.sid :
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found datewindow1904 record at " + k);
-                    retval.uses1904datewindowing = ((DateWindow1904Record)rec).getWindowing() == 1;
-                    break;
-                case PaletteRecord.sid:
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found palette record at " + k);
-                    retval.records.setPalettepos( k );
-                    break;
-                case WindowOneRecord.sid:
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found WindowOneRecord at " + k);
-                    retval.windowOne = (WindowOneRecord) rec;
-                    break;
-                case WriteAccessRecord.sid:
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found WriteAccess at " + k);
-                    retval.writeAccess = (WriteAccessRecord) rec;
-                    break;
-                case WriteProtectRecord.sid:
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found WriteProtect at " + k);
-                    retval.writeProtect = (WriteProtectRecord) rec;
-                    break;
-                case FileSharingRecord.sid:
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found FileSharing at " + k);
-                    retval.fileShare = (FileSharingRecord) rec;
-                    break;
-
-                case NameCommentRecord.sid:
-                    final NameCommentRecord ncr = (NameCommentRecord) rec;
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG, "found NameComment at " + k);
-                    retval.commentRecords.put(ncr.getNameText(), ncr);
-                    break;
-                default:
-                    if (log.check( POILogger.DEBUG ))
-                        log.log(DEBUG,  "ignoring record (sid=" + rec.getSid() + ") at " + k);
-                    break;
-            }
-            records.add(rec);
-        }
-        //What if we dont have any ranges and supbooks
-        //        if (retval.records.supbookpos == 0) {
-        //            retval.records.supbookpos = retval.records.bspos + 1;
-        //            retval.records.namepos    = retval.records.supbookpos + 1;
-        //        }
-
-        // Look for other interesting values that
-        //  follow the EOFRecord
-        for ( ; k < recs.size(); k++) {
-            Record rec = recs.get(k);
-            switch (rec.getSid()) {
-                case HyperlinkRecord.sid:
-                    retval.hyperlinks.add((HyperlinkRecord)rec);
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        if (retval.windowOne == null) {
-            retval.windowOne = createWindowOne();
-        }
-        if (log.check( POILogger.DEBUG ))
-            log.log(DEBUG, "exit create workbook from existing file function");
-        return retval;
-    }
-
-    /**
-     * Creates an empty workbook object with three blank sheets and all the empty
-     * fields.  Use this to create a workbook from scratch.
-     * 
-     * @return an empty workbook object
-     */
-    public static InternalWorkbook createWorkbook()
-    {
-        if (log.check( POILogger.DEBUG ))
-            log.log( DEBUG, "creating new workbook from scratch" );
-        InternalWorkbook retval = new InternalWorkbook();
-        List<Record> records = new ArrayList<Record>( 30 );
-        retval.records.setRecords(records);
-        List<FormatRecord> formats = retval.formats;
-
-        records.add(createBOF());
-        records.add(new InterfaceHdrRecord(CODEPAGE));
-        records.add(createMMS());
-        records.add(InterfaceEndRecord.instance);
-        records.add(createWriteAccess());
-        records.add(createCodepage());
-        records.add(createDSF());
-        records.add(createTabId());
-        retval.records.setTabpos(records.size() - 1);
-        records.add(createFnGroupCount());
-        records.add(createWindowProtect());
-        records.add(createProtect());
-        retval.records.setProtpos(records.size() - 1);
-        records.add(createPassword());
-        records.add(createProtectionRev4());
-        records.add(createPasswordRev4());
-        retval.windowOne = createWindowOne();
-        records.add(retval.windowOne);
-        records.add(createBackup());
-        retval.records.setBackuppos(records.size() - 1);
-        records.add(createHideObj());
-        records.add(createDateWindow1904());
-        records.add(createPrecision());
-        records.add(createRefreshAll());
-        records.add(createBookBool());
-        records.add(createFont());
-        records.add(createFont());
-        records.add(createFont());
-        records.add(createFont());
-        retval.records.setFontpos( records.size() - 1 );   // last font record position
-        retval.numfonts = 4;
-
-        // set up format records
-        for (int i = 0; i <= 7; i++) {
-            FormatRecord rec = createFormat(i);
-            retval.maxformatid = retval.maxformatid >= rec.getIndexCode() ? retval.maxformatid : rec.getIndexCode();
-            formats.add(rec);
-            records.add(rec);
-        }
-
-        for (int k = 0; k < 21; k++) {
-            records.add(InternalWorkbook.createExtendedFormat(k));
-            retval.numxfs++;
-        }
-        retval.records.setXfpos( records.size() - 1 );
-        for (int k = 0; k < 6; k++) {
-            records.add(InternalWorkbook.createStyle(k));
-        }
-        records.add(InternalWorkbook.createUseSelFS());
-
-        int nBoundSheets = 1; // now just do 1
-        for (int k = 0; k < nBoundSheets; k++) {
-            BoundSheetRecord bsr = createBoundSheet(k);
-
-            records.add(bsr);
-            retval.boundsheets.add(bsr);
-            retval.records.setBspos(records.size() - 1);
-        }
-        records.add( InternalWorkbook.createCountry() );
-        for ( int k = 0; k < nBoundSheets; k++ ) {
-            retval.getOrCreateLinkTable().checkExternSheet(k);
-        }
-        retval.sst = new SSTRecord();
-        records.add(retval.sst);
-        records.add(InternalWorkbook.createExtendedSST());
-
-        records.add(EOFRecord.instance);
-        if (log.check( POILogger.DEBUG ))
-            log.log( DEBUG, "exit create new workbook from scratch" );
-        return retval;
-    }
-
-
-    /**Retrieves the Builtin NameRecord that matches the name and index
-     * There shouldn't be too many names to make the sequential search too slow
-     * @param name byte representation of the builtin name to match
-     * @param sheetNumber 1-based sheet number
-     * @return null if no builtin NameRecord matches
-     */
-    public NameRecord getSpecificBuiltinRecord(byte name, int sheetNumber)
-    {
-        return getOrCreateLinkTable().getSpecificBuiltinRecord(name, sheetNumber);
-    }
-
-    /**
-     * Removes the specified Builtin NameRecord that matches the name and index
-     * @param name byte representation of the builtin to match
-     * @param sheetIndex zero-based sheet reference
-     */
-    public void removeBuiltinRecord(byte name, int sheetIndex) {
-        linkTable.removeBuiltinRecord(name, sheetIndex);
-        // TODO - do we need "this.records.remove(...);" similar to that in this.removeName(int namenum) {}?
-    }
-
-    public int getNumRecords() {
-        return records.size();
-    }
-
-    /**
-     * gets the font record at the given index in the font table.  Remember
-     * "There is No Four" (someone at M$ must have gone to Rocky Horror one too
-     * many times)
-     *
-     * @param idx the index to look at (0 or greater but NOT 4)
-     * @return FontRecord located at the given index
-     */
-
-    public FontRecord getFontRecordAt(int idx) {
-        int index = idx;
-
-        if (index > 4) {
-            index -= 1;   // adjust for "There is no 4"
-        }
-        if (index > (numfonts - 1)) {
-            throw new ArrayIndexOutOfBoundsException(
-            "There are only " + numfonts
-            + " font records, you asked for " + idx);
-        }
-        FontRecord retval =
-        ( FontRecord ) records.get((records.getFontpos() - (numfonts - 1)) + index);
-
-        return retval;
-    }
-
-    /**
-     * Retrieves the index of the given font
-     * 
-     * @param font the font
-     * 
-     * @return the font index
-     * 
-     * @throws IllegalArgumentException if the font index can't be determined 
-     */
-    public int getFontIndex(FontRecord font) {
-        for(int i=0; i<=numfonts; i++) {
-            FontRecord thisFont =
-                ( FontRecord ) records.get((records.getFontpos() - (numfonts - 1)) + i);
-            if(thisFont == font) {
-                // There is no 4!
-                if(i > 3) {
-                    return (i+1);
-                }
-                return i;
-            }
-        }
-        throw new IllegalArgumentException("Could not find that font!");
-    }
-
-    /**
-     * creates a new font record and adds it to the "font table".  This causes the
-     * boundsheets to move down one, extended formats to move down (so this function moves
-     * those pointers as well)
-     *
-     * @return FontRecord that was just created
-     */
-
-    public FontRecord createNewFont() {
-        FontRecord rec = createFont();
-
-        records.add(records.getFontpos()+1, rec);
-        records.setFontpos( records.getFontpos() + 1 );
-        numfonts++;
-        return rec;
-    }
-
-    /**
-     * Removes the given font record from the
-     *  file's list. This will make all
-     *  subsequent font indicies drop by one,
-     *  so you'll need to update those yourself!
-     * 
-     * @param rec the font record
-     */
-    public void removeFontRecord(FontRecord rec) {
-        records.remove(rec); // this updates FontPos for us
-        numfonts--;
-    }
-
-    /**
-     * gets the number of font records
-     *
-     * @return   number of font records in the "font table"
-     */
-
-    public int getNumberOfFontRecords() {
-        return numfonts;
-    }
-
-    /**
-     * Sets the BOF for a given sheet
-     *
-     * @param sheetIndex the number of the sheet to set the positing of the bof for
-     * @param pos the actual bof position
-     */
-
-    public void setSheetBof(int sheetIndex, int pos) {
-        if (log.check( POILogger.DEBUG ))
-            log.log(DEBUG, "setting bof for sheetnum =", Integer.valueOf(sheetIndex),
-                " at pos=", Integer.valueOf(pos));
-        checkSheets(sheetIndex);
-        getBoundSheetRec(sheetIndex)
-        .setPositionOfBof(pos);
-    }
-
-    private BoundSheetRecord getBoundSheetRec(int sheetIndex) {
-        return boundsheets.get(sheetIndex);
-    }
-
-    /**
-     * Returns the position of the backup record.
-     * 
-     * @return the position of the backup record
-     */
-    public BackupRecord getBackupRecord() {
-        return ( BackupRecord ) records.get(records.getBackuppos());
-    }
-
-
-    /**
-     * sets the name for a given sheet.  If the boundsheet record doesn't exist and
-     * its only one more than we have, go ahead and create it.  If it's &gt; 1 more than
-     * we have, except
-     *
-     * @param sheetnum the sheet number (0 based)
-     * @param sheetname the name for the sheet
-     */
-    public void setSheetName(int sheetnum, String sheetname) {
-        checkSheets(sheetnum);
-
-        // YK: Mimic Excel and silently truncate sheet names longer than 31 characters
-        if(sheetname.length() > 31) sheetname = sheetname.substring(0, 31);
-
-        BoundSheetRecord sheet = boundsheets.get(sheetnum);
-        sheet.setSheetname(sheetname);
-    }
-
-    /**
-     * Determines whether a workbook contains the provided sheet name.  For the purpose of
-     * comparison, long names are truncated to 31 chars.
-     *
-     * @param name the name to test (case insensitive match)
-     * @param excludeSheetIdx the sheet to exclude from the check or -1 to include all sheets in the check.
-     * @return true if the sheet contains the name, false otherwise.
-     */
-    public boolean doesContainsSheetName(String name, int excludeSheetIdx) {
-        String aName = name;
-        if (aName.length() > MAX_SENSITIVE_SHEET_NAME_LEN) {
-            aName = aName.substring(0, MAX_SENSITIVE_SHEET_NAME_LEN);
-        }
-        for (int i = 0; i < boundsheets.size(); i++) {
-            BoundSheetRecord boundSheetRecord = getBoundSheetRec(i);
-            if (excludeSheetIdx == i) {
-                continue;
-            }
-            String bName = boundSheetRecord.getSheetname();
-            if (bName.length() > MAX_SENSITIVE_SHEET_NAME_LEN) {
-                bName = bName.substring(0, MAX_SENSITIVE_SHEET_NAME_LEN);
-            }
-            if (aName.equalsIgnoreCase(bName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * sets the order of appearance for a given sheet.
-     *
-     * @param sheetname the name of the sheet to reorder
-     * @param pos the position that we want to insert the sheet into (0 based)
-     */
-    public void setSheetOrder(String sheetname, int pos ) {
-        int sheetNumber = getSheetIndex(sheetname);
-        //remove the sheet that needs to be reordered and place it in the spot we want
-        boundsheets.add(pos, boundsheets.remove(sheetNumber));
-        
-        // also adjust order of Records, calculate the position of the Boundsheets via getBspos()...
-        int initialBspos = records.getBspos();
-        int pos0 = initialBspos - (boundsheets.size() - 1);
-        Record removed = records.get(pos0 + sheetNumber);
-        records.remove(pos0 + sheetNumber);
-		records.add(pos0 + pos, removed);
-        records.setBspos(initialBspos);
-    }
-
-    /**
-     * gets the name for a given sheet.
-     *
-     * @param sheetIndex the sheet number (0 based)
-     * @return sheetname the name for the sheet
-     */
-    public String getSheetName(int sheetIndex) {
-        return getBoundSheetRec(sheetIndex).getSheetname();
-    }
-
-    /**
-     * Gets the hidden flag for a given sheet.
-     * Note that a sheet could instead be
-     *  set to be very hidden, which is different
-     *  ({@link #isSheetVeryHidden(int)})
-     *
-     * @param sheetnum the sheet number (0 based)
-     * @return True if sheet is hidden
-     */
-    public boolean isSheetHidden(int sheetnum) {
-        return getBoundSheetRec(sheetnum).isHidden();
-    }
-
-    /**
-     * Gets the very hidden flag for a given sheet.
-     * This is different from the normal
-     *  hidden flag
-     *  ({@link #isSheetHidden(int)})
-     *
-     * @param sheetnum the sheet number (0 based)
-     * @return True if sheet is very hidden
-     */
-    public boolean isSheetVeryHidden(int sheetnum) {
-        return getBoundSheetRec(sheetnum).isVeryHidden();
-    }
-
-    /**
-     * Hide or unhide a sheet
-     *
-     * @param sheetnum The sheet number
-     * @param hidden True to mark the sheet as hidden, false otherwise
-     */
-    public void setSheetHidden(int sheetnum, boolean hidden) {
-        getBoundSheetRec(sheetnum).setHidden(hidden);
-    }
-
-    /**
-     * Hide or unhide a sheet.
-     *  0 = not hidden
-     *  1 = hidden
-     *  2 = very hidden.
-     *
-     * @param sheetnum The sheet number
-     * @param hidden 0 for not hidden, 1 for hidden, 2 for very hidden
-     */
-    public void setSheetHidden(int sheetnum, int hidden) {
-        BoundSheetRecord bsr = getBoundSheetRec(sheetnum);
-        boolean h = false;
-        boolean vh = false;
-        if(hidden == 0) {
-        } else if(hidden == 1) {
-            h = true;
-        } else if(hidden == 2) {
-            vh = true;
-        } else {
-            throw new IllegalArgumentException("Invalid hidden flag " + hidden + " given, must be 0, 1 or 2");
-        }
-        bsr.setHidden(h);
-        bsr.setVeryHidden(vh);
-    }
-
-
-    /**
-     * get the sheet's index
-     * @param name  sheet name
-     * @return sheet index or -1 if it was not found.
-     */
-    public int getSheetIndex(String name) {
-        int retval = -1;
-
-        for (int k = 0; k < boundsheets.size(); k++) {
-            String sheet = getSheetName(k);
-
-            if (sheet.equalsIgnoreCase(name)) {
-                retval = k;
-                break;
-            }
-        }
-        return retval;
-    }
-
-    /**
-     * if we're trying to address one more sheet than we have, go ahead and add it!  if we're
-     * trying to address >1 more than we have throw an exception!
-     */
-    private void checkSheets(int sheetnum) {
-        if ((boundsheets.size()) <= sheetnum) {   // if we're short one add another..
-            if ((boundsheets.size() + 1) <= sheetnum) {
-                throw new RuntimeException("Sheet number out of bounds!");
-            }
-            BoundSheetRecord bsr = createBoundSheet(sheetnum);
-
-            records.add(records.getBspos()+1, bsr);
-            records.setBspos( records.getBspos() + 1 );
-            boundsheets.add(bsr);
-            getOrCreateLinkTable().checkExternSheet(sheetnum);
-            fixTabIdRecord();
-        }
-    }
-
-    /**
-     * @param sheetIndex zero based sheet index
-     */
-    public void removeSheet(int sheetIndex) {
-        if (boundsheets.size() > sheetIndex) {
-            records.remove(records.getBspos() - (boundsheets.size() - 1) + sheetIndex);
-            boundsheets.remove(sheetIndex);
-            fixTabIdRecord();
-        }
-
-        // Within NameRecords, it's ok to have the formula
-        //  part point at deleted sheets. It's also ok to
-        //  have the ExternSheetNumber point at deleted
-        //  sheets.
-        // However, the sheet index must be adjusted, or
-        //  excel will break. (Sheet index is either 0 for
-        //  global, or 1 based index to sheet)
-        int sheetNum1Based = sheetIndex + 1;
-        for(int i=0; i<getNumNames(); i++) {
-            NameRecord nr = getNameRecord(i);
-
-            if(nr.getSheetNumber() == sheetNum1Based) {
-                // Excel re-writes these to point to no sheet
-                nr.setSheetNumber(0);
-            } else if(nr.getSheetNumber() > sheetNum1Based) {
-                // Bump down by one, so still points
-                //  at the same sheet
-                nr.setSheetNumber(nr.getSheetNumber()-1);
-            }
-        }
-        
-        if (linkTable != null) {
-            // also tell the LinkTable about the removed sheet
-            //index hasn't change in the linktable
-            linkTable.removeSheet(sheetIndex);
-        }
-    }
-
-    /**
-     * make the tabid record look like the current situation.
-     */
-    private void fixTabIdRecord() {
-        Record rec = records.get(records.getTabpos());
-
-        // see bug 55982, quite a number of documents do not have a TabIdRecord and
-        // thus there is no way to do the fixup here,
-        // we use the same check on Tabpos as done in other places
-        if(records.getTabpos() <= 0) {
-            return;
-        }
-
-        TabIdRecord tir = ( TabIdRecord ) rec;
-        short[]     tia = new short[ boundsheets.size() ];
-
-        for (short k = 0; k < tia.length; k++) {
-            tia[ k ] = k;
-        }
-        tir.setTabIdArray(tia);
-    }
-
-    /**
-     * returns the number of boundsheet objects contained in this workbook.
-     *
-     * @return number of BoundSheet records
-     */
-
-    public int getNumSheets() {
-        if (log.check( POILogger.DEBUG ))
-            log.log(DEBUG, "getNumSheets=", Integer.valueOf(boundsheets.size()));
-        return boundsheets.size();
-    }
-
-    /**
-     * get the number of ExtendedFormat records contained in this workbook.
-     *
-     * @return int count of ExtendedFormat records
-     */
-
-    public int getNumExFormats() {
-        if (log.check( POILogger.DEBUG ))
-            log.log(DEBUG, "getXF=", Integer.valueOf(numxfs));
-        return numxfs;
-    }
-
-    /**
-     * gets the ExtendedFormatRecord at the given 0-based index
-     *
-     * @param index of the Extended format record (0-based)
-     * @return ExtendedFormatRecord at the given index
-     */
-
-    public ExtendedFormatRecord getExFormatAt(int index) {
-        int xfptr = records.getXfpos() - (numxfs - 1);
-
-        xfptr += index;
-        ExtendedFormatRecord retval =
-        ( ExtendedFormatRecord ) records.get(xfptr);
-
-        return retval;
-    }
-
-    /**
-     * Removes the given ExtendedFormatRecord record from the
-     *  file's list. This will make all
-     *  subsequent font indicies drop by one,
-     *  so you'll need to update those yourself!
-     * 
-     * @param rec the ExtendedFormatRecord
-     */
-    public void removeExFormatRecord(ExtendedFormatRecord rec) {
-        records.remove(rec); // this updates XfPos for us
-        numxfs--;
-    }
-    
-    /**
-     * Removes ExtendedFormatRecord record with given index from the
-     *  file's list. This will make all
-     *  subsequent font indicies drop by one,
-     *  so you'll need to update those yourself!
-     *  @param index of the Extended format record (0-based)
-     */
-    public void removeExFormatRecord(int index) {
-        int xfptr = records.getXfpos() - (numxfs - 1) + index;
-        records.remove(xfptr); // this updates XfPos for us
-        numxfs--;
-    }
-
-
-    /**
-     * creates a new Cell-type Extended Format Record and adds it to the end of
-     *  ExtendedFormatRecords collection
-     *
-     * @return ExtendedFormatRecord that was created
-     */
-
-    public ExtendedFormatRecord createCellXF() {
-        ExtendedFormatRecord xf = createExtendedFormat();
-
-        records.add(records.getXfpos()+1, xf);
-        records.setXfpos( records.getXfpos() + 1 );
-        numxfs++;
-        return xf;
-    }
-
-    /**
-     * Returns the StyleRecord for the given
-     *  xfIndex, or null if that ExtendedFormat doesn't
-     *  have a Style set.
-     *  
-     * @param xfIndex the extended format index
-     * 
-     * @return the StyleRecord, {@code null} if it that ExtendedFormat doesn't have a Style set.
-     */
-    public StyleRecord getStyleRecord(int xfIndex) {
-        // Style records always follow after
-        //  the ExtendedFormat records
-        for(int i=records.getXfpos(); i<records.size(); i++) {
-            Record r = records.get(i);
-            if(r instanceof ExtendedFormatRecord) {
-                continue;
-            }
-            if(!(r instanceof StyleRecord)) {
-                continue;
-            }
-            StyleRecord sr = (StyleRecord)r;
-            if(sr.getXFIndex() == xfIndex) {
-                return sr;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Creates a new StyleRecord, for the given Extended
-     *  Format index, and adds it onto the end of the
-     *  records collection
-     * 
-     * @param xfIndex the extended format index
-     * 
-     * @return a new StyleRecord
-     */
-    public StyleRecord createStyleRecord(int xfIndex) {
-        // Style records always follow after
-        //  the ExtendedFormat records
-        StyleRecord newSR = new StyleRecord();
-        newSR.setXFIndex(xfIndex);
-
-        // Find the spot
-        int addAt = -1;
-        for(int i=records.getXfpos(); i<records.size() &&
-                addAt == -1; i++) {
-            Record r = records.get(i);
-            if(r instanceof ExtendedFormatRecord ||
-                    r instanceof StyleRecord) {
-                // Keep going
-            } else {
-                addAt = i;
-            }
-        }
-        if(addAt == -1) {
-            throw new IllegalStateException("No XF Records found!");
-        }
-        records.add(addAt, newSR);
-
-        return newSR;
-    }
-
-    /**
-     * Adds a string to the SST table and returns its index (if its a duplicate
-     * just returns its index and update the counts) ASSUMES compressed unicode
-     * (meaning 8bit)
-     *
-     * @param string the string to be added to the SSTRecord
-     *
-     * @return index of the string within the SSTRecord
-     */
-
-    public int addSSTString(UnicodeString string) {
-        if (log.check( POILogger.DEBUG ))
-          log.log(DEBUG, "insert to sst string='", string);
-        if (sst == null) {
-            insertSST();
-        }
-      return sst.addString(string);
-    }
-
-    /**
-     * given an index into the SST table, this function returns the corresponding String value
-     * @param str the index into the SST table
-     * @return String containing the SST String
-     */
-    public UnicodeString getSSTString(int str) {
-        if (sst == null) {
-            insertSST();
-        }
-        UnicodeString retval = sst.getString(str);
-
-        if (log.check( POILogger.DEBUG ))
-            log.log(DEBUG, "Returning SST for index=", Integer.valueOf(str),
-                " String= ", retval);
-        return retval;
-    }
-
-    /**
-     * use this function to add a Shared String Table to an existing sheet (say
-     * generated by a different java api) without an sst....
-     * @see #createExtendedSST()
-     * @see org.apache.poi.hssf.record.SSTRecord
-     */
-
-    public void insertSST() {
-        if (log.check( POILogger.DEBUG ))
-            log.log(DEBUG, "creating new SST via insertSST!");
-        sst = new SSTRecord();
-        records.add(records.size() - 1, createExtendedSST());
-        records.add(records.size() - 2, sst);
-    }
-
-    /**
-     * Serializes all records int the worksheet section into a big byte array. Use
-     * this to write the Workbook out.
-     *
-     * @return byte array containing the HSSF-only portions of the POIFS file.
-     */
-     // GJS: Not used so why keep it.
-//    public byte [] serialize() {
-//        log.log(DEBUG, "Serializing Workbook!");
-//        byte[] retval    = null;
-//
-////         ArrayList bytes     = new ArrayList(records.size());
-//        int    arraysize = getSize();
-//        int    pos       = 0;
-//
-//        retval = new byte[ arraysize ];
-//        for (int k = 0; k < records.size(); k++) {
-//
-//            Record record = records.get(k);
-////             Let's skip RECALCID records, as they are only use for optimization
-//        if(record.getSid() != RecalcIdRecord.sid || ((RecalcIdRecord)record).isNeeded()) {
-//                pos += record.serialize(pos, retval);   // rec.length;
-//        }
-//        }
-//        log.log(DEBUG, "Exiting serialize workbook");
-//        return retval;
-//    }
-
-    /**
-     * Serializes all records int the worksheet section into a big byte array. Use
-     * this to write the Workbook out.
-     * @param offset of the data to be written
-     * @param data array of bytes to write this to
-     * @return the length of serialized bytes
-     */
-    public int serialize( int offset, byte[] data )
-    {
-        if (log.check( POILogger.DEBUG ))
-            log.log( DEBUG, "Serializing Workbook with offsets" );
-
-        int pos = 0;
-
-        SSTRecord sst = null;
-        int sstPos = 0;
-        boolean wroteBoundSheets = false;
-        for ( Record record : records ) {
-
-            int len = 0;
-            if (record instanceof SSTRecord)
-            {
-                sst = (SSTRecord)record;
-                sstPos = pos;
-            }
-            if (record.getSid() == ExtSSTRecord.sid && sst != null)
-            {
-                record = sst.createExtSSTRecord(sstPos + offset);
-            }
-            if (record instanceof BoundSheetRecord) {
-                 if(!wroteBoundSheets) {
-                    for (int i = 0; i < boundsheets.size(); i++) {
-                        len+= getBoundSheetRec(i)
-                                         .serialize(pos+offset+len, data);
-                    }
-                    wroteBoundSheets = true;
-                 }
-            } else {
-               len = record.serialize( pos + offset, data );
-            }
-            /////  DEBUG BEGIN /////
-//                if (len != record.getRecordSize())
-//                    throw new IllegalStateException("Record size does not match serialized bytes.  Serialized size = " + len + " but getRecordSize() returns " + record.getRecordSize());
-            /////  DEBUG END /////
-            pos += len;   // rec.length;
-        }
-        if (log.check( POILogger.DEBUG ))
-            log.log( DEBUG, "Exiting serialize workbook" );
-        return pos;
-    }
-
-    /**
-     * Perform any work necessary before the workbook is about to be serialized.
-     *
-     * Include in it ant code that modifies the workbook record stream and affects its size.
-     */
-    public void preSerialize(){
-        updateEncryptionRecord();
-        
-        // Ensure we have enough tab IDs
-        // Can be a few short if new sheets were added
-        if(records.getTabpos() > 0) {
-            TabIdRecord tir = ( TabIdRecord ) records.get(records.getTabpos());
-            if(tir._tabids.length < boundsheets.size()) {
-                fixTabIdRecord();
-            }
-        }
-    }
-
-    private void updateEncryptionRecord() {
-        FilePassRecord fpr = null;
-        int fprPos = -1;
-        for (Record r : records.getRecords()) {
-            fprPos++;
-            if (r instanceof FilePassRecord) {
-                fpr = (FilePassRecord)r;
-                break;
-            }
-        }
-        
-        String password = Biff8EncryptionKey.getCurrentUserPassword();
-        if (password == null) {
-            if (fpr != null) {
-                // need to remove password data
-                records.remove(fprPos);
-            }
-            return;
-        } else {
-            // create password record
-            if (fpr == null) {
-                fpr = new FilePassRecord(EncryptionMode.binaryRC4);
-                records.add(1, fpr);
-            }
-            
-            // check if the password has been changed
-            EncryptionInfo ei = fpr.getEncryptionInfo();
-            byte encVer[] = ei.getVerifier().getEncryptedVerifier();
-            try {
-                Decryptor dec = ei.getDecryptor();
-                Encryptor enc = ei.getEncryptor();
-                if (encVer == null || !dec.verifyPassword(password)) {
-                    enc.confirmPassword(password);
-                } else {
-                    SecretKey sk = dec.getSecretKey();
-                    ei.getEncryptor().setSecretKey(sk);
-                }
-            } catch (GeneralSecurityException e) {
-                throw new EncryptedDocumentException("can't validate/update encryption setting", e);
-            }
-        }
-    }
-    
-    public int getSize()
-    {
-        int retval = 0;
-
-        SSTRecord sst = null;
-        for ( int k = 0; k < records.size(); k++ )
-        {
-            Record record = records.get( k );
-            if (record instanceof SSTRecord)
-                sst = (SSTRecord)record;
-
-            if (record.getSid() == ExtSSTRecord.sid && sst != null)
-                retval += sst.calcExtSSTRecordSize();
-            else
-                retval += record.getRecordSize();
-        }
-
-        return retval;
-    }
-
-    private static BOFRecord createBOF() {
-        BOFRecord retval = new BOFRecord();
-
-        retval.setVersion(( short ) 0x600);
-        retval.setType(BOFRecord.TYPE_WORKBOOK);
-        retval.setBuild(( short ) 0x10d3);
-        retval.setBuildYear(( short ) 1996);
-        retval.setHistoryBitMask(0x41);   // was c1 before verify
-        retval.setRequiredVersion(0x6);
-        return retval;
-    }
-
-
-    private static MMSRecord createMMS() {
-        MMSRecord retval = new MMSRecord();
-
-        retval.setAddMenuCount(( byte ) 0);
-        retval.setDelMenuCount(( byte ) 0);
-        return retval;
-    }
-
-    /**
-     * creates the WriteAccess record containing the logged in user's name
-     */
-    private static WriteAccessRecord createWriteAccess() {
-        WriteAccessRecord retval = new WriteAccessRecord();
-
-        String defaultUserName = "POI";
-        try {
-            String username = System.getProperty("user.name");
-            // Google App engine returns null for user.name, see Bug 53974
-            if(username == null) username = defaultUserName;
-
-            retval.setUsername(username);
-        } catch (AccessControlException e) {
-                // AccessControlException can occur in a restricted context
-                // (client applet/jws application or restricted security server)
-                retval.setUsername(defaultUserName);
-        }
-        return retval;
-    }
-
-    private static CodepageRecord createCodepage() {
-        CodepageRecord retval = new CodepageRecord();
-
-        retval.setCodepage(CODEPAGE);
-        return retval;
-    }
-
-    private static DSFRecord createDSF() {
-        return new DSFRecord(false); // we don't even support double stream files
-    }
-
-    /**
-     * creates the TabId record containing an array
-     */
-    private static TabIdRecord createTabId() {
-        return new TabIdRecord();
-    }
-
-    /**
-     * creates the FnGroupCount record containing the Magic number constant of 14.
-     */
-    private static FnGroupCountRecord createFnGroupCount() {
-        FnGroupCountRecord retval = new FnGroupCountRecord();
-
-        retval.setCount(( short ) 14);
-        return retval;
-    }
-
-    /**
-     * @return a new WindowProtect record with protect set to false.
-     */
-    private static WindowProtectRecord createWindowProtect() {
-        // by default even when we support it we won't
-        // want it to be protected
-        return new WindowProtectRecord(false);
-    }
-
-    /**
-     * @return a new Protect record with protect set to false.
-     */
-    private static ProtectRecord createProtect() {
-        // by default even when we support it we won't
-        // want it to be protected
-        return new ProtectRecord(false);
-    }
-
-    /**
-     * @return a new Password record with password set to 0x0000 (no password).
-     */
-    private static PasswordRecord createPassword() {
-        return new PasswordRecord(0x0000); // no password by default!
-    }
-
-    /**
-     * @return a new ProtectionRev4 record with protect set to false.
-     */
-    private static ProtectionRev4Record createProtectionRev4() {
-        return new ProtectionRev4Record(false);
-    }
-
-    /**
-     * @return a new PasswordRev4 record with password set to 0.
-     */
-    private static PasswordRev4Record createPasswordRev4() {
-        return new PasswordRev4Record(0x0000);
-    }
-
-    /**
-     * creates the WindowOne record with the following magic values: <P>
-     * horizontal hold - 0x168 <P>
-     * vertical hold   - 0x10e <P>
-     * width           - 0x3a5c <P>
-     * height          - 0x23be <P>
-     * options         - 0x38 <P>
-     * selected tab    - 0 <P>
-     * displayed tab   - 0 <P>
-     * num selected tab- 0 <P>
-     * tab width ratio - 0x258 <P>
-     */
-    private static WindowOneRecord createWindowOne() {
-        WindowOneRecord retval = new WindowOneRecord();
-
-        retval.setHorizontalHold(( short ) 0x168);
-        retval.setVerticalHold(( short ) 0x10e);
-        retval.setWidth(( short ) 0x3a5c);
-        retval.setHeight(( short ) 0x23be);
-        retval.setOptions(( short ) 0x38);
-        retval.setActiveSheetIndex( 0x0);
-        retval.setFirstVisibleTab(0x0);
-        retval.setNumSelectedTabs(( short ) 1);
-        retval.setTabWidthRatio(( short ) 0x258);
-        return retval;
-    }
-
-    /**
-     * creates the Backup record with backup set to 0. (loose the data, who cares)
-     */
-    private static BackupRecord createBackup() {
-        BackupRecord retval = new BackupRecord();
-
-        retval.setBackup(( short ) 0);   // by default DONT save backups of files...just loose data
-        return retval;
-    }
-
-    /**
-     * creates the HideObj record with hide object set to 0. (don't hide)
-     */
-    private static HideObjRecord createHideObj() {
-        HideObjRecord retval = new HideObjRecord();
-        retval.setHideObj(( short ) 0);   // by default set hide object off
-        return retval;
-    }
-
-    /**
-     * creates the DateWindow1904 record with windowing set to 0. (don't window)
-     */
-    private static DateWindow1904Record createDateWindow1904() {
-        DateWindow1904Record retval = new DateWindow1904Record();
-
-        retval.setWindowing(( short ) 0);   // don't EVER use 1904 date windowing...tick tock..
-        return retval;
-    }
-
-    /**
-     * creates the Precision record with precision set to true. (full precision)
-     */
-    private static PrecisionRecord createPrecision() {
-        PrecisionRecord retval = new PrecisionRecord();
-        retval.setFullPrecision(true);   // always use real numbers in calculations!
-        return retval;
-    }
-
-    /**
-     * @return a new RefreshAll record with refreshAll set to false. (do not refresh all calcs)
-     */
-    private static RefreshAllRecord createRefreshAll() {
-        return new RefreshAllRecord(false);
-    }
-
-    /**
-     * creates the BookBool record with saveLinkValues set to 0. (don't save link values)
-     */
-    private static BookBoolRecord createBookBool() {
-        BookBoolRecord retval = new BookBoolRecord();
-        retval.setSaveLinkValues(( short ) 0);
-        return retval;
-    }
-
-    /**
-     * creates a Font record with the following magic values: <P>
-     * fontheight           = 0xc8<P>
-     * attributes           = 0x0<P>
-     * color palette index  = 0x7fff<P>
-     * bold weight          = 0x190<P>
-     * Font Name Length     = 5 <P>
-     * Font Name            = Arial <P>
-     */
-    private static FontRecord createFont() {
-        FontRecord retval = new FontRecord();
-
-        retval.setFontHeight(( short ) 0xc8);
-        retval.setAttributes(( short ) 0x0);
-        retval.setColorPaletteIndex(( short ) 0x7fff);
-        retval.setBoldWeight(( short ) 0x190);
-        retval.setFontName("Arial");
-        return retval;
-    }
-
-    /**
-     * Creates a FormatRecord object
-     * @param id    the number of the format record to create (meaning its position in
-     *        a file as M$ Excel would create it.)
-     */
-    private static FormatRecord createFormat(int id) {
-        // we'll need multiple editions for
-        // the different formats
-
-        
-        switch (id) {
-            case 0: return new FormatRecord(5, BuiltinFormats.getBuiltinFormat(5)); 
-            case 1: return new FormatRecord(6, BuiltinFormats.getBuiltinFormat(6)); 
-            case 2: return new FormatRecord(7, BuiltinFormats.getBuiltinFormat(7)); 
-            case 3: return new FormatRecord(8, BuiltinFormats.getBuiltinFormat(8)); 
-            case 4: return new FormatRecord(0x2a, BuiltinFormats.getBuiltinFormat(0x2a)); 
-            case 5: return new FormatRecord(0x29, BuiltinFormats.getBuiltinFormat(0x29)); 
-            case 6: return new FormatRecord(0x2c, BuiltinFormats.getBuiltinFormat(0x2c)); 
-            case 7: return new FormatRecord(0x2b, BuiltinFormats.getBuiltinFormat(0x2b)); 
-        }
-        throw new  IllegalArgumentException("Unexpected id " + id);
-    }
-
-    /**
-     * Creates an ExtendedFormatRecord object
-     * @param id    the number of the extended format record to create (meaning its position in
-     *        a file as MS Excel would create it.)
-     */
-    private static ExtendedFormatRecord createExtendedFormat(int id) {   // we'll need multiple editions
-        ExtendedFormatRecord retval = new ExtendedFormatRecord();
-
-        switch (id) {
-
-            case 0 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 1 :
-                retval.setFontIndex(( short ) 1);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 2 :
-                retval.setFontIndex(( short ) 1);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 3 :
-                retval.setFontIndex(( short ) 2);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 4 :
-                retval.setFontIndex(( short ) 2);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 5 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 6 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 7 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 8 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 9 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 10 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 11 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 12 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 13 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 14 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff400);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-                // cell records
-            case 15 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0);
-                retval.setCellOptions(( short ) 0x1);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0x0);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-                // style
-            case 16 :
-                retval.setFontIndex(( short ) 1);
-                retval.setFormatIndex(( short ) 0x2b);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff800);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 17 :
-                retval.setFontIndex(( short ) 1);
-                retval.setFormatIndex(( short ) 0x29);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff800);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 18 :
-                retval.setFontIndex(( short ) 1);
-                retval.setFormatIndex(( short ) 0x2c);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff800);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 19 :
-                retval.setFontIndex(( short ) 1);
-                retval.setFormatIndex(( short ) 0x2a);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff800);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 20 :
-                retval.setFontIndex(( short ) 1);
-                retval.setFormatIndex(( short ) 0x9);
-                retval.setCellOptions(( short ) 0xfffffff5);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0xfffff800);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-                // unused from this point down
-            case 21 :
-                retval.setFontIndex(( short ) 5);
-                retval.setFormatIndex(( short ) 0x0);
-                retval.setCellOptions(( short ) 0x1);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0x800);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 22 :
-                retval.setFontIndex(( short ) 6);
-                retval.setFormatIndex(( short ) 0x0);
-                retval.setCellOptions(( short ) 0x1);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0x5c00);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 23 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0x31);
-                retval.setCellOptions(( short ) 0x1);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0x5c00);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 24 :
-                retval.setFontIndex(( short ) 0);
-                retval.setFormatIndex(( short ) 0x8);
-                retval.setCellOptions(( short ) 0x1);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0x5c00);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            case 25 :
-                retval.setFontIndex(( short ) 6);
-                retval.setFormatIndex(( short ) 0x8);
-                retval.setCellOptions(( short ) 0x1);
-                retval.setAlignmentOptions(( short ) 0x20);
-                retval.setIndentionOptions(( short ) 0x5c00);
-                retval.setBorderOptions(( short ) 0);
-                retval.setPaletteOptions(( short ) 0);
-                retval.setAdtlPaletteOptions(( short ) 0);
-                retval.setFillPaletteOptions(( short ) 0x20c0);
-                break;
-
-            default:
-                throw new IllegalStateException("Unrecognized format id: " + id);
-        }
-        return retval;
-    }
-
-    /**
-     * creates an default cell type ExtendedFormatRecord object.
-     * @return ExtendedFormatRecord with intial defaults (cell-type)
-     */
-    private static ExtendedFormatRecord createExtendedFormat() {
-        ExtendedFormatRecord retval = new ExtendedFormatRecord();
-
-        retval.setFontIndex(( short ) 0);
-        retval.setFormatIndex(( short ) 0x0);
-        retval.setCellOptions(( short ) 0x1);
-        retval.setAlignmentOptions(( short ) 0x20);
-        retval.setIndentionOptions(( short ) 0);
-        retval.setBorderOptions(( short ) 0);
-        retval.setPaletteOptions(( short ) 0);
-        retval.setAdtlPaletteOptions(( short ) 0);
-        retval.setFillPaletteOptions(( short ) 0x20c0);
-        retval.setTopBorderPaletteIdx(HSSFColor.BLACK.index);
-        retval.setBottomBorderPaletteIdx(HSSFColor.BLACK.index);
-        retval.setLeftBorderPaletteIdx(HSSFColor.BLACK.index);
-        retval.setRightBorderPaletteIdx(HSSFColor.BLACK.index);
-        return retval;
-    }
-
-    /**
-     * Creates a StyleRecord object
-     * @param id        the number of the style record to create (meaning its position in
-     *                  a file as MS Excel would create it.
-     */
-    private static StyleRecord createStyle(int id) {   // we'll need multiple editions
-        StyleRecord retval = new StyleRecord();
-
-        switch (id) {
-
-            case 0 :
-                retval.setXFIndex(0x010);
-                retval.setBuiltinStyle(3);
-                retval.setOutlineStyleLevel(( byte ) 0xffffffff);
-                break;
-
-            case 1 :
-                retval.setXFIndex(0x011);
-                retval.setBuiltinStyle(6);
-                retval.setOutlineStyleLevel(( byte ) 0xffffffff);
-                break;
-
-            case 2 :
-                retval.setXFIndex(0x012);
-                retval.setBuiltinStyle(4);
-                retval.setOutlineStyleLevel(( byte ) 0xffffffff);
-                break;
-
-            case 3 :
-                retval.setXFIndex(0x013);
-                retval.setBuiltinStyle(7);
-                retval.setOutlineStyleLevel(( byte ) 0xffffffff);
-                break;
-
-            case 4 :
-                retval.setXFIndex(0x000);
-                retval.setBuiltinStyle(0);
-                retval.setOutlineStyleLevel(( byte ) 0xffffffff);
-                break;
-
-            case 5 :
-                retval.setXFIndex(0x014);
-                retval.setBuiltinStyle(5);
-                retval.setOutlineStyleLevel(( byte ) 0xffffffff);
-                break;
-
-            default:
-                throw new IllegalStateException("Unrecognized style id: " + id);
-        }
-        return retval;
-    }
-
-    /**
-     * Creates a palette record initialized to the default palette
-     */
-    private static PaletteRecord createPalette() {
-        return new PaletteRecord();
-    }
-
-    /**
-     * @return a new UseSelFS object with the use natural language flag set to 0 (false)
-     */
-    private static UseSelFSRecord createUseSelFS() {
-        return new UseSelFSRecord(false);
-    }
-
-    /**
-     * create a "bound sheet" or "bundlesheet" (depending who you ask) record
-     * Always sets the sheet's bof to 0.  You'll need to set that yourself.
-     * @param id either sheet 0,1 or 2.
-     * @return record containing a BoundSheetRecord
-     * @see org.apache.poi.hssf.record.BoundSheetRecord
-     * @see org.apache.poi.hssf.record.Record
-     */
-    private static BoundSheetRecord createBoundSheet(int id) {
-        return new BoundSheetRecord("Sheet" + (id+1));
-    }
-
-    /**
-     * Creates the Country record with the default country set to 1
-     * and current country set to 7 in case of russian locale ("ru_RU") and 1 otherwise
-     */
-    private static CountryRecord createCountry() {
-        CountryRecord retval = new CountryRecord();
-
-        retval.setDefaultCountry(( short ) 1);
-
-        // from Russia with love ;)
-        if ( LocaleUtil.getUserLocale().toString().equals( "ru_RU" ) ) {
-            retval.setCurrentCountry(( short ) 7);
-        }
-        else {
-            retval.setCurrentCountry(( short ) 1);
-        }
-
-        return retval;
-    }
-
-    /**
-     * Creates the ExtendedSST record with numstrings per bucket set to 0x8.  HSSF
-     * doesn't yet know what to do with this thing, but we create it with nothing in
-     * it hardly just to make Excel happy and our sheets look like Excel's
-     */
-    private static ExtSSTRecord createExtendedSST() {
-        ExtSSTRecord retval = new ExtSSTRecord();
-        retval.setNumStringsPerBucket(( short ) 0x8);
-        return retval;
-    }
-
-    /**
-     * lazy initialization
-     * Note - creating the link table causes creation of 1 EXTERNALBOOK and 1 EXTERNALSHEET record
-     */
-    private LinkTable getOrCreateLinkTable() {
-        if(linkTable == null) {
-            linkTable = new LinkTable((short) getNumSheets(), records);
-        }
-        return linkTable;
-    }
-    
-    public int linkExternalWorkbook(String name, Workbook externalWorkbook) {
-        return getOrCreateLinkTable().linkExternalWorkbook(name, externalWorkbook);
-    }
-
-    /** 
-     * Finds the first sheet name by his extern sheet index
-     * @param externSheetIndex extern sheet index
-     * @return first sheet name.
-     */
-    public String findSheetFirstNameFromExternSheet(int externSheetIndex){
-        int indexToSheet = linkTable.getFirstInternalSheetIndexForExtIndex(externSheetIndex);
-        return findSheetNameFromIndex(indexToSheet);
-    }
-    public String findSheetLastNameFromExternSheet(int externSheetIndex){
-        int indexToSheet = linkTable.getLastInternalSheetIndexForExtIndex(externSheetIndex);
-        return findSheetNameFromIndex(indexToSheet);
-    }
-    private String findSheetNameFromIndex(int internalSheetIndex) {
-        if (internalSheetIndex < 0) {
-            // TODO - what does '-1' mean here?
-            //error check, bail out gracefully!
-            return "";
-        }
-        if (internalSheetIndex >= boundsheets.size()) {
-            // Not sure if this can ever happen (See bug 45798)
-            return ""; // Seems to be what excel would do in this case
-        }
-        return getSheetName(internalSheetIndex);
-    }
-    
-    public ExternalSheet getExternalSheet(int externSheetIndex) {
-        String[] extNames = linkTable.getExternalBookAndSheetName(externSheetIndex);
-        if (extNames == null) {
-            return null;
-        }
-        if (extNames.length == 2) {
-            return new ExternalSheet(extNames[0], extNames[1]);
-        } else {
-            return new ExternalSheetRange(extNames[0], extNames[1], extNames[2]);
-        }
-    }
-    public ExternalName getExternalName(int externSheetIndex, int externNameIndex) {
-       String nameName = linkTable.resolveNameXText(externSheetIndex, externNameIndex, this);
-       if(nameName == null) {
-          return null;
-       }
-       int ix = linkTable.resolveNameXIx(externSheetIndex, externNameIndex);
-       return new ExternalName(nameName, externNameIndex, ix);
-    }
-
-    /**
-     * Finds the (first) sheet index for a particular external sheet number.
-     * @param externSheetNumber     The external sheet number to convert
-     * @return  The index to the sheet found.
-     */
-    public int getFirstSheetIndexFromExternSheetIndex(int externSheetNumber)
-    {
-        return linkTable.getFirstInternalSheetIndexForExtIndex(externSheetNumber);
-    }
-
-    /**
-     * Finds the last sheet index for a particular external sheet number,
-     *  which may be the same as the first (except for multi-sheet references)
-     * @param externSheetNumber     The external sheet number to convert
-     * @return  The index to the sheet found.
-     */
-    public int getLastSheetIndexFromExternSheetIndex(int externSheetNumber)
-    {
-        return linkTable.getLastInternalSheetIndexForExtIndex(externSheetNumber);
-    }
-
-    /** 
-     * Returns the extern sheet number for specific sheet number.
-     * If this sheet doesn't exist in extern sheet, add it
-     * @param sheetNumber local sheet number
-     * @return index to extern sheet
-     */
-    public short checkExternSheet(int sheetNumber){
-        return (short)getOrCreateLinkTable().checkExternSheet(sheetNumber);
-    }
-    /** 
-     * Returns the extern sheet number for specific range of sheets.
-     * If this sheet range doesn't exist in extern sheet, add it
-     * @param firstSheetNumber first local sheet number
-     * @param lastSheetNumber last local sheet number
-     * @return index to extern sheet
-     */
-    public short checkExternSheet(int firstSheetNumber, int lastSheetNumber){
-        return (short)getOrCreateLinkTable().checkExternSheet(firstSheetNumber, lastSheetNumber);
-    }
-
-    public int getExternalSheetIndex(String workbookName, String sheetName) {
-        return getOrCreateLinkTable().getExternalSheetIndex(workbookName, sheetName, sheetName);
-    }
-    public int getExternalSheetIndex(String workbookName, String firstSheetName, String lastSheetName) {
-        return getOrCreateLinkTable().getExternalSheetIndex(workbookName, firstSheetName, lastSheetName);
-    }
-
-
-    /** gets the total number of names
-     * @return number of names
-     */
-    public int getNumNames(){
-        if(linkTable == null) {
-            return 0;
-        }
-        return linkTable.getNumNames();
-    }
-
-    /**
-     * gets the name record
-     * @param index name index
-     * @return name record
-     */
-    public NameRecord getNameRecord(int index){
-        return linkTable.getNameRecord(index);
-    }
-
-    /**
-     * gets the name comment record
-     * @param nameRecord name record who's comment is required.
-     * @return name comment record or <code>null</code> if there isn't one for the given name.
-     */
-    public NameCommentRecord getNameCommentRecord(final NameRecord nameRecord){
-        return commentRecords.get(nameRecord.getNameText());
-    }
-
-    /**
-     * creates new name
-     * @return new name record
-     */
-    public NameRecord createName(){
-        return addName(new NameRecord());
-    }
-
-
-    /**
-     * adds a name record
-     * 
-     * @param name the name record to be added
-     * @return the given name record 
-     */
-    public NameRecord addName(NameRecord name)
-    {
-
-        LinkTable linkTable = getOrCreateLinkTable();
-        linkTable.addName(name);
-
-        return name;
-    }
-
-    /**
-     * Generates a NameRecord to represent a built-in region
-     * 
-     * @param builtInName the built-in name
-     * @param sheetNumber the sheet number
-     * 
-     * @return a new NameRecord
-     */
-    public NameRecord createBuiltInName(byte builtInName, int sheetNumber) {
-        if (sheetNumber < 0 || sheetNumber+1 > Short.MAX_VALUE) {
-            throw new IllegalArgumentException("Sheet number ["+sheetNumber+"]is not valid ");
-        }
-
-        NameRecord name = new NameRecord(builtInName, sheetNumber);
-
-        if(linkTable.nameAlreadyExists(name)) {
-            throw new RuntimeException("Builtin (" + builtInName
-                    + ") already exists for sheet (" + sheetNumber + ")");
-        }
-        addName(name);
-        return name;
-    }
-
-
-    /** removes the name
-     * @param nameIndex name index
-     */
-    public void removeName(int nameIndex){
-
-        if (linkTable.getNumNames() > nameIndex) {
-            int idx = findFirstRecordLocBySid(NameRecord.sid);
-            records.remove(idx + nameIndex);
-            linkTable.removeName(nameIndex);
-        }
-    }
-
-    /**
-     * If a {@link NameCommentRecord} is added or the name it references
-     *  is renamed, then this will update the lookup cache for it.
-     * 
-     * @param commentRecord the comment record
-     */
-    public void updateNameCommentRecordCache(final NameCommentRecord commentRecord) {
-       if(commentRecords.containsValue(commentRecord)) {
-          for(Entry<String,NameCommentRecord> entry : commentRecords.entrySet()) {
-             if(entry.getValue().equals(commentRecord)) {
-                commentRecords.remove(entry.getKey());
-                break;
-             }
-          }
-       }
-       commentRecords.put(commentRecord.getNameText(), commentRecord);
-    }
-
-    /**
-     * Returns a format index that matches the passed in format.  It does not tie into HSSFDataFormat.
-     * @param format the format string
-     * @param createIfNotFound creates a new format if format not found
-     * @return the format id of a format that matches or -1 if none found and createIfNotFound
-     */
-    public short getFormat(String format, boolean createIfNotFound) {
-      for (FormatRecord r : formats) {
-        if (r.getFormatString().equals(format)) {
-        return (short)r.getIndexCode();
-        }
-      }
-
-      if (createIfNotFound) {
-        return (short)createFormat(format);
-      }
-
-      return -1;
-    }
-
-    /**
-     * Returns the list of FormatRecords in the workbook.
-     * @return ArrayList of FormatRecords in the notebook
-     */
-    public List<FormatRecord> getFormats() {
-      return formats;
-    }
-
-    /**
-     * Creates a FormatRecord, inserts it, and returns the index code.
-     * @param formatString the format string
-     * @return the index code of the format record.
-     * @see org.apache.poi.hssf.record.FormatRecord
-     * @see org.apache.poi.hssf.record.Record
-     */
-    public int createFormat(String formatString) {
-
-        maxformatid = maxformatid >= 0xa4 ? maxformatid + 1 : 0xa4; //Starting value from M$ empircal study.
-        FormatRecord rec = new FormatRecord(maxformatid, formatString);
-
-        int pos = 0;
-        while ( pos < records.size() && records.get( pos ).getSid() != FormatRecord.sid )
-            pos++;
-        pos += formats.size();
-        formats.add( rec );
-        records.add( pos, rec );
-        return maxformatid;
-    }
-
-
-
-    /**
-     * Returns the first occurance of a record matching a particular sid.
-     * 
-     * @param sid the sid
-     * 
-     * @return the matching record or {@code null} if it wasn't found
-     */
-    public Record findFirstRecordBySid(short sid) {
-        for (Record record : records) {
-            if (record.getSid() == sid) {
-                return record;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the index of a record matching a particular sid.
-     * @param sid   The sid of the record to match
-     * @return      The index of -1 if no match made.
-     */
-    public int findFirstRecordLocBySid(short sid) {
-        int index = 0;
-        for (Record record : records) {
-            if (record.getSid() == sid) {
-                return index;
-            }
-            index ++;
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the next occurance of a record matching a particular sid.
-     * 
-     * @param sid the sid
-     * @param pos specifies the n-th matching sid
-     * 
-     * @return the matching record or {@code null} if it wasn't found
-     */
-    public Record findNextRecordBySid(short sid, int pos) {
-        int matches = 0;
-        for (Record record : records) {
-            if (record.getSid() == sid) {
-                if (matches++ == pos)
-                    return record;
-            }
-        }
-        return null;
-    }
-
-    public List<HyperlinkRecord> getHyperlinks()
-    {
-        return hyperlinks;
-    }
-
-    public List<Record> getRecords() {
-        return records.getRecords();
-    }
-
-    /**
-    * Whether date windowing is based on 1/2/1904 or 1/1/1900.
-    * Some versions of Excel (Mac) can save workbooks using 1904 date windowing.
-    *
-    * @return true if using 1904 date windowing
-    */
-    public boolean isUsing1904DateWindowing() {
-        return uses1904datewindowing;
-    }
-
-    /**
-     * Returns the custom palette in use for this workbook; if a custom palette record
-     * does not exist, then it is created.
-     * 
-     * @return the custom palette
-     */
-    public PaletteRecord getCustomPalette()
-    {
-      PaletteRecord palette;
-      int palettePos = records.getPalettepos();
-      if (palettePos != -1) {
-        Record rec = records.get(palettePos);
-        if (rec instanceof PaletteRecord) {
-          palette = (PaletteRecord) rec;
-        } else throw new RuntimeException("InternalError: Expected PaletteRecord but got a '"+rec+"'");
-      }
-      else
-      {
-          palette = createPalette();
-          //Add the palette record after the bof which is always the first record
-          records.add(1, palette);
-          records.setPalettepos(1);
-      }
-      return palette;
-    }
-
-    /**
-     * Finds the primary drawing group, if one already exists
-     * 
-     * @return the primary drawing group
-     */
-    public DrawingManager2 findDrawingGroup() {
-        if(drawingManager != null) {
-           // We already have it!
-           return drawingManager;
-        }
-        
-        // Need to find a DrawingGroupRecord that
-        //  contains a EscherDggRecord
-        for(Record r : records) {
-            if(r instanceof DrawingGroupRecord) {
-                DrawingGroupRecord dg = (DrawingGroupRecord)r;
-                dg.processChildRecords();
-
-                EscherContainerRecord cr =
-                    dg.getEscherContainer();
-                if(cr == null) {
-                    continue;
-                }
-
-                EscherDggRecord dgg = null;
-                EscherContainerRecord bStore = null;
-                for(Iterator<EscherRecord> it = cr.getChildIterator(); it.hasNext();) {
-                    EscherRecord er = it.next();
-                    if(er instanceof EscherDggRecord) {
-                        dgg = (EscherDggRecord)er;
-                    } else if (er.getRecordId() == EscherContainerRecord.BSTORE_CONTAINER) {
-                        bStore = (EscherContainerRecord) er;
-                    }
-                }
-
-                if(dgg != null) {
-                    drawingManager = new DrawingManager2(dgg);
-                    if(bStore != null){
-                        for(EscherRecord bs : bStore.getChildRecords()){
-                            if(bs instanceof EscherBSERecord) escherBSERecords.add((EscherBSERecord)bs);
-                        }
-                    }
-                    return drawingManager;
-                }
-            }
-        }
-
-        // Look for the DrawingGroup record
-        int dgLoc = findFirstRecordLocBySid(DrawingGroupRecord.sid);
-
-        // If there is one, does it have a EscherDggRecord?
-        if(dgLoc != -1) {
-            DrawingGroupRecord dg = (DrawingGroupRecord)records.get(dgLoc);
-            EscherDggRecord dgg = null;
-            EscherContainerRecord bStore = null;
-            for(EscherRecord er : dg.getEscherRecords()) {
-                if (er instanceof EscherDggRecord) {
-                    dgg = (EscherDggRecord) er;
-                } else if (er.getRecordId() == EscherContainerRecord.BSTORE_CONTAINER) {
-                    bStore = (EscherContainerRecord) er;
-                }
-            }
-
-            if(dgg != null) {
-                drawingManager = new DrawingManager2(dgg);
-                if(bStore != null){
-                    for(EscherRecord bs : bStore.getChildRecords()){
-                        if(bs instanceof EscherBSERecord) escherBSERecords.add((EscherBSERecord)bs);
-                    }
-                }
-            }
-        }
-        return drawingManager;
-    }
-
-    /**
-     * Creates a primary drawing group record.  If it already
-     *  exists then it's modified.
-     */
-    public void createDrawingGroup() {
-        if (drawingManager == null) {
-            EscherContainerRecord dggContainer = new EscherContainerRecord();
-            EscherDggRecord dgg = new EscherDggRecord();
-            EscherOptRecord opt = new EscherOptRecord();
-            EscherSplitMenuColorsRecord splitMenuColors = new EscherSplitMenuColorsRecord();
-
-            dggContainer.setRecordId((short) 0xF000);
-            dggContainer.setOptions((short) 0x000F);
-            dgg.setRecordId(EscherDggRecord.RECORD_ID);
-            dgg.setOptions((short)0x0000);
-            dgg.setShapeIdMax(1024);
-            dgg.setNumShapesSaved(0);
-            dgg.setDrawingsSaved(0);
-            dgg.setFileIdClusters(new EscherDggRecord.FileIdCluster[] {} );
-            drawingManager = new DrawingManager2(dgg);
-            EscherContainerRecord bstoreContainer = null;
-            if (escherBSERecords.size() > 0)
-            {
-                bstoreContainer = new EscherContainerRecord();
-                bstoreContainer.setRecordId( EscherContainerRecord.BSTORE_CONTAINER );
-                bstoreContainer.setOptions( (short) ( (escherBSERecords.size() << 4) | 0xF ) );
-                for (EscherRecord escherRecord : escherBSERecords) {
-                    bstoreContainer.addChildRecord( escherRecord );
-                }
-            }
-            opt.setRecordId((short) 0xF00B);
-            opt.setOptions((short) 0x0033);
-            opt.addEscherProperty( new EscherBoolProperty(EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 524296) );
-            opt.addEscherProperty( new EscherRGBProperty(EscherProperties.FILL__FILLCOLOR, 0x08000041) );
-            opt.addEscherProperty( new EscherRGBProperty(EscherProperties.LINESTYLE__COLOR, 134217792) );
-            splitMenuColors.setRecordId((short) 0xF11E);
-            splitMenuColors.setOptions((short) 0x0040);
-            splitMenuColors.setColor1(0x0800000D);
-            splitMenuColors.setColor2(0x0800000C);
-            splitMenuColors.setColor3(0x08000017);
-            splitMenuColors.setColor4(0x100000F7);
-
-            dggContainer.addChildRecord(dgg);
-            if (bstoreContainer != null)
-                dggContainer.addChildRecord( bstoreContainer );
-            dggContainer.addChildRecord(opt);
-            dggContainer.addChildRecord(splitMenuColors);
-
-            int dgLoc = findFirstRecordLocBySid(DrawingGroupRecord.sid);
-            if (dgLoc == -1) {
-                DrawingGroupRecord drawingGroup = new DrawingGroupRecord();
-                drawingGroup.addEscherRecord(dggContainer);
-                int loc = findFirstRecordLocBySid(CountryRecord.sid);
-
-                getRecords().add(loc+1, drawingGroup);
-            } else {
-                DrawingGroupRecord drawingGroup = new DrawingGroupRecord();
-                drawingGroup.addEscherRecord(dggContainer);
-                getRecords().set(dgLoc, drawingGroup);
-            }
-
-        }
-    }
-
-    public WindowOneRecord getWindowOne() {
-        return windowOne;
-    }
-
-    public EscherBSERecord getBSERecord(int pictureIndex) {
-        return escherBSERecords.get(pictureIndex-1);
-    }
-
-    public int addBSERecord(EscherBSERecord e) {
-        createDrawingGroup();
-
-        // maybe we don't need that as an instance variable anymore
-        escherBSERecords.add( e );
-
-        int dgLoc = findFirstRecordLocBySid(DrawingGroupRecord.sid);
-        DrawingGroupRecord drawingGroup = (DrawingGroupRecord) getRecords().get( dgLoc );
-
-        EscherContainerRecord dggContainer = (EscherContainerRecord) drawingGroup.getEscherRecord( 0 );
-        EscherContainerRecord bstoreContainer;
-        if (dggContainer.getChild( 1 ).getRecordId() == EscherContainerRecord.BSTORE_CONTAINER )
-        {
-            bstoreContainer = (EscherContainerRecord) dggContainer.getChild( 1 );
-        }
-        else
-        {
-            bstoreContainer = new EscherContainerRecord();
-            bstoreContainer.setRecordId( EscherContainerRecord.BSTORE_CONTAINER );
-            List<EscherRecord> childRecords = dggContainer.getChildRecords();
-            childRecords.add(1, bstoreContainer);
-            dggContainer.setChildRecords(childRecords);
-        }
-        bstoreContainer.setOptions( (short) ( (escherBSERecords.size() << 4) | 0xF ) );
-
-        bstoreContainer.addChildRecord( e );
-
-        return escherBSERecords.size();
-    }
-
-    public DrawingManager2 getDrawingManager()
-    {
-        return drawingManager;
-    }
-
-    public WriteProtectRecord getWriteProtect() {
-        if (writeProtect == null) {
-           writeProtect = new WriteProtectRecord();
-           int i = 0;
-           for (i = 0;
-                i < records.size() && !(records.get(i) instanceof BOFRecord);
-                i++) {
-           }
-           records.add(i+1, writeProtect);
-        }
-        return this.writeProtect;
-    }
-
-    public WriteAccessRecord getWriteAccess() {
-        if (writeAccess == null) {
-           writeAccess = createWriteAccess();
-           int i = 0;
-           for (i = 0;
-                i < records.size() && !(records.get(i) instanceof InterfaceEndRecord);
-                i++) {
-           }
-           records.add(i+1, writeAccess);
-        }
-        return writeAccess;
-    }
-
-    public FileSharingRecord getFileSharing() {
-        if (fileShare == null) {
-           fileShare = new FileSharingRecord();
-           int i = 0;
-           for (i = 0;
-                i < records.size() && !(records.get(i) instanceof WriteAccessRecord);
-                i++) {
-           }
-           records.add(i+1, fileShare);
-        }
-        return fileShare;
-    }
-
-    /**
-     * is the workbook protected with a password (not encrypted)?
-     * 
-     * @return {@code true} if the workbook is write protected
-     */
-    public boolean isWriteProtected() {
-        if (fileShare == null) {
-            return false;
-        }
-        FileSharingRecord frec = getFileSharing();
-        return frec.getReadOnly() == 1;
-    }
-
-    /**
-     * protect a workbook with a password (not encypted, just sets writeprotect
-     * flags and the password.
-     * 
-     * @param password the password
-     * @param username the username
-     */
-    public void writeProtectWorkbook( String password, String username ) {
-        FileSharingRecord frec = getFileSharing();
-        WriteAccessRecord waccess = getWriteAccess();
-        /* WriteProtectRecord wprotect =*/ getWriteProtect();
-        frec.setReadOnly((short)1);
-        frec.setPassword((short)CryptoFunctions.createXorVerifier1(password));
-        frec.setUsername(username);
-        waccess.setUsername(username);
-    }
-
-    /**
-     * removes the write protect flag
-     */
-    public void unwriteProtectWorkbook() {
-        records.remove(fileShare);
-        records.remove(writeProtect);
-        fileShare = null;
-        writeProtect = null;
-    }
-
-    /**
-     * @param refIndex Index to REF entry in EXTERNSHEET record in the Link Table
-     * @param definedNameIndex zero-based to DEFINEDNAME or EXTERNALNAME record
-     * @return the string representation of the defined or external name
-     */
-    public String resolveNameXText(int refIndex, int definedNameIndex) {
-        return linkTable.resolveNameXText(refIndex, definedNameIndex, this);
-    }
-
-    /**
-     *
-     * @param name the  name of an external function, typically a name of a UDF
-     * @param sheetRefIndex the sheet ref index, or -1 if not known
-     * @param udf  locator of user-defiend functions to resolve names of VBA and Add-In functions
-     * @return the external name or null
-     */
-    public NameXPtg getNameXPtg(String name, int sheetRefIndex, UDFFinder udf) {
-        LinkTable lnk = getOrCreateLinkTable();
-        NameXPtg xptg = lnk.getNameXPtg(name, sheetRefIndex);
-
-        if(xptg == null && udf.findFunction(name) != null) {
-            // the name was not found in the list of external names
-            // check if the Workbook's UDFFinder is aware about it and register the name if it is
-            xptg = lnk.addNameXPtg(name);
-        }
-        return xptg;
-    }
-    public NameXPtg getNameXPtg(String name, UDFFinder udf) {
-        return getNameXPtg(name, -1, udf);
-    }
-
-    /**
-     * Check if the cloned sheet has drawings. If yes, then allocate a new drawing group ID and
-     * re-generate shape IDs
-     *
-     * @param sheet the cloned sheet
-     */
-    public void cloneDrawings(InternalSheet sheet){
-
-        findDrawingGroup();
-
-        if(drawingManager == null) {
-            //this workbook does not have drawings
-            return;
-        }
-
-        //check if the cloned sheet has drawings
-        int aggLoc = sheet.aggregateDrawingRecords(drawingManager, false);
-        if(aggLoc != -1) {
-            EscherAggregate agg = (EscherAggregate) sheet.findFirstRecordBySid(EscherAggregate.sid);
-            EscherContainerRecord escherContainer = agg.getEscherContainer();
-            if (escherContainer == null) {
-                return;
-            }
-
-            EscherDggRecord dgg = drawingManager.getDgg();
-
-            //register a new drawing group for the cloned sheet
-            int dgId = drawingManager.findNewDrawingGroupId();
-            dgg.addCluster( dgId, 0 );
-            dgg.setDrawingsSaved(dgg.getDrawingsSaved() + 1);
-
-            EscherDgRecord dg = null;
-            for(Iterator<EscherRecord> it = escherContainer.getChildIterator(); it.hasNext();) {
-                EscherRecord er = it.next();
-                if(er instanceof EscherDgRecord) {
-                    dg = (EscherDgRecord)er;
-                    //update id of the drawing in the cloned sheet
-                    dg.setOptions( (short) ( dgId << 4 ) );
-                } else if (er instanceof EscherContainerRecord){
-                    // iterate over shapes and re-generate shapeId
-                    EscherContainerRecord cp = (EscherContainerRecord)er;
-                    for(Iterator<EscherRecord> spIt = cp.getChildRecords().iterator(); spIt.hasNext();) {
-                        EscherContainerRecord shapeContainer = (EscherContainerRecord)spIt.next();
-                        for(EscherRecord shapeChildRecord : shapeContainer.getChildRecords()) {
-                            int recordId = shapeChildRecord.getRecordId();
-                            if (recordId == EscherSpRecord.RECORD_ID){
-                                EscherSpRecord sp = (EscherSpRecord)shapeChildRecord;
-                                int shapeId = drawingManager.allocateShapeId((short)dgId, dg);
-                                //allocateShapeId increments the number of shapes. roll back to the previous value
-                                dg.setNumShapes(dg.getNumShapes()-1);
-                                sp.setShapeId(shapeId);
-                            } else if (recordId == EscherOptRecord.RECORD_ID){
-                                EscherOptRecord opt = (EscherOptRecord)shapeChildRecord;
-                                EscherSimpleProperty prop = (EscherSimpleProperty)opt.lookup(
-                                        EscherProperties.BLIP__BLIPTODISPLAY );
-                                if (prop != null){
-                                    int pictureIndex = prop.getPropertyValue();
-                                    // increment reference count for pictures
-                                    EscherBSERecord bse = getBSERecord(pictureIndex);
-                                    bse.setRef(bse.getRef() + 1);
-                                }
-
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    public NameRecord cloneFilter(int filterDbNameIndex, int newSheetIndex){
-        NameRecord origNameRecord = getNameRecord(filterDbNameIndex);
-        // copy original formula but adjust 3D refs to the new external sheet index
-        int newExtSheetIx = checkExternSheet(newSheetIndex);
-        Ptg[] ptgs = origNameRecord.getNameDefinition();
-        for (int i=0; i< ptgs.length; i++) {
-            Ptg ptg = ptgs[i];
-
-            if (ptg instanceof Area3DPtg) {
-                Area3DPtg a3p = (Area3DPtg) ((OperandPtg) ptg).copy();
-                a3p.setExternSheetIndex(newExtSheetIx);
-                ptgs[i] = a3p;
-            } else if (ptg instanceof Ref3DPtg) {
-                Ref3DPtg r3p = (Ref3DPtg) ((OperandPtg) ptg).copy();
-                r3p.setExternSheetIndex(newExtSheetIx);
-                ptgs[i] = r3p;
-            }
-        }
-        NameRecord newNameRecord = createBuiltInName(NameRecord.BUILTIN_FILTER_DB, newSheetIndex+1);
-        newNameRecord.setNameDefinition(ptgs);
-        newNameRecord.setHidden(true);
-        return newNameRecord;
-
-    }
-    /**
-     * Updates named ranges due to moving of cells
-     * 
-     * @param shifter the formula shifter
-     */
-    public void updateNamesAfterCellShift(FormulaShifter shifter) {
-        for (int i = 0 ; i < getNumNames() ; ++i){
-            NameRecord nr = getNameRecord(i);
-            Ptg[] ptgs = nr.getNameDefinition();
-            if (shifter.adjustFormula(ptgs, nr.getSheetNumber())) {
-                nr.setNameDefinition(ptgs);
-            }
-        }
-    }
-
-    /**
-     * Get or create RecalcIdRecord
-     *
-     * @return a new RecalcIdRecord
-     *
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#setForceFormulaRecalculation(boolean)
-     */
-    public RecalcIdRecord getRecalcId(){
-        RecalcIdRecord record = (RecalcIdRecord)findFirstRecordBySid(RecalcIdRecord.sid);
-        if(record == null){
-            record = new RecalcIdRecord();
-            // typically goes after the Country record
-            int pos = findFirstRecordLocBySid(CountryRecord.sid);
-            records.add(pos + 1, record);
-        }
-        return record;
-    }
-
-        
-	/**
-	 * Changes an external referenced file to another file.
-	 * A formular in Excel which refers a cell in another file is saved in two parts: 
-	 * The referenced file is stored in an reference table. the row/cell information is saved separate.
-	 * This method invokation will only change the reference in the lookup-table itself.
-	 * @param oldUrl The old URL to search for and which is to be replaced
-	 * @param newUrl The URL replacement
-	 * @return true if the oldUrl was found and replaced with newUrl. Otherwise false
-	 */
-    public boolean changeExternalReference(String oldUrl, String newUrl) {
-    	return linkTable.changeExternalReference(oldUrl, newUrl);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/LinkTable.java b/trunk/src/java/org/apache/poi/hssf/model/LinkTable.java
deleted file mode 100644
index f6f7569..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/LinkTable.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hssf.record.CRNCountRecord;
-import org.apache.poi.hssf.record.CRNRecord;
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.ExternalNameRecord;
-import org.apache.poi.hssf.record.NameCommentRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.ErrPtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * Link Table (OOO pdf reference: 4.10.3 ) <p/>
- *
- * The main data of all types of references is stored in the Link Table inside the Workbook Globals
- * Substream (4.2.5). The Link Table itself is optional and occurs only if there are any
- * references in the document.
- *  <p/>
- *
- *  In BIFF8 the Link Table consists of
- *  <ul>
- *  <li>zero or more EXTERNALBOOK Blocks<p/>
- *  	each consisting of
- *  	<ul>
- *  	<li>exactly one EXTERNALBOOK (0x01AE) record</li>
- *  	<li>zero or more EXTERNALNAME (0x0023) records</li>
- *  	<li>zero or more CRN Blocks<p/>
- *			each consisting of
- *  		<ul>
- *  		<li>exactly one XCT (0x0059)record</li>
- *  		<li>zero or more CRN (0x005A) records (documentation says one or more)</li>
- *  		</ul>
- *  	</li>
- *  	</ul>
- *  </li>
- *  <li>zero or one EXTERNSHEET (0x0017) record</li>
- *  <li>zero or more DEFINEDNAME (0x0018) records</li>
- *  </ul>
- */
-final class LinkTable {
-
-	// TODO make this class into a record aggregate
-	private static final class CRNBlock {
-
-		private final CRNCountRecord _countRecord;
-		private final CRNRecord[] _crns;
-
-		public CRNBlock(RecordStream rs) {
-			_countRecord = (CRNCountRecord) rs.getNext();
-			int nCRNs = _countRecord.getNumberOfCRNs();
-			CRNRecord[] crns = new CRNRecord[nCRNs];
-			for (int i = 0; i < crns.length; i++) {
-				crns[i] = (CRNRecord) rs.getNext();
-			}
-			_crns = crns;
-		}
-		public CRNRecord[] getCrns() {
-			return _crns.clone();
-		}
-	}
-
-	private static final class ExternalBookBlock {
-		private final SupBookRecord _externalBookRecord;
-		private ExternalNameRecord[] _externalNameRecords;
-		private final CRNBlock[] _crnBlocks;
-
-		public ExternalBookBlock(RecordStream rs) {
-			_externalBookRecord = (SupBookRecord) rs.getNext();
-			List<Object> temp = new ArrayList<Object>();
-			while(rs.peekNextClass() == ExternalNameRecord.class) {
-			   temp.add(rs.getNext());
-			}
-			_externalNameRecords = new ExternalNameRecord[temp.size()];
-			temp.toArray(_externalNameRecords);
-
-			temp.clear();
-
-			while(rs.peekNextClass() == CRNCountRecord.class) {
-				temp.add(new CRNBlock(rs));
-			}
-			_crnBlocks = new CRNBlock[temp.size()];
-			temp.toArray(_crnBlocks);
-		}
-		
-       /**
-        * Create a new block for external references.
-        */
-       public ExternalBookBlock(String url, String[] sheetNames) {
-           _externalBookRecord = SupBookRecord.createExternalReferences(url, sheetNames);
-           _crnBlocks = new CRNBlock[0];
-       }
-
-       /**
-        * Create a new block for internal references. It is called when constructing a new LinkTable.
-        *
-        * @see org.apache.poi.hssf.model.LinkTable#LinkTable(int, WorkbookRecordList)
-        */
-       public ExternalBookBlock(int numberOfSheets) {
-           _externalBookRecord = SupBookRecord.createInternalReferences((short)numberOfSheets);
-           _externalNameRecords = new ExternalNameRecord[0];
-           _crnBlocks = new CRNBlock[0];
-       }
-
-       /**
-        * Create a new block for registering add-in functions
-        *
-        * @see org.apache.poi.hssf.model.LinkTable#addNameXPtg(String)
-        */
-       public ExternalBookBlock() {
-           _externalBookRecord = SupBookRecord.createAddInFunctions();
-           _externalNameRecords = new ExternalNameRecord[0];
-           _crnBlocks = new CRNBlock[0];
-       }
-
-		public SupBookRecord getExternalBookRecord() {
-		    return _externalBookRecord;
-		}
-
-		public String getNameText(int definedNameIndex) {
-			return _externalNameRecords[definedNameIndex].getText();
-		}
-		
-		public int getNameIx(int definedNameIndex) {
-		   return _externalNameRecords[definedNameIndex].getIx();
-		}
-
-		/**
-		 * Performs case-insensitive search
-		 * @return -1 if not found
-		 */
-		public int getIndexOfName(String name) {
-			for (int i = 0; i < _externalNameRecords.length; i++) {
-				if(_externalNameRecords[i].getText().equalsIgnoreCase(name)) {
-					return i;
-				}
-			}
-			return -1;
-		}
-
-        public int getNumberOfNames() {
-            return _externalNameRecords.length;
-        }
-
-        public int addExternalName(ExternalNameRecord rec){
-            ExternalNameRecord[] tmp = new ExternalNameRecord[_externalNameRecords.length + 1];
-            System.arraycopy(_externalNameRecords, 0, tmp, 0, _externalNameRecords.length);
-            tmp[tmp.length - 1] = rec;
-            _externalNameRecords = tmp;
-            return _externalNameRecords.length - 1;
-        }
-    }
-
-    private ExternalBookBlock[] _externalBookBlocks;
-	private final ExternSheetRecord _externSheetRecord;
-	private final List<NameRecord> _definedNames;
-	private final int _recordCount;
-	private final WorkbookRecordList _workbookRecordList; // TODO - would be nice to remove this
-
-	public LinkTable(List<Record> inputList, int startIndex, WorkbookRecordList workbookRecordList, Map<String, NameCommentRecord> commentRecords) {
-
-		_workbookRecordList = workbookRecordList;
-		RecordStream rs = new RecordStream(inputList, startIndex);
-
-		List<ExternalBookBlock> temp = new ArrayList<ExternalBookBlock>();
-		while(rs.peekNextClass() == SupBookRecord.class) {
-		   temp.add(new ExternalBookBlock(rs));
-		}
-
-		_externalBookBlocks = new ExternalBookBlock[temp.size()];
-		temp.toArray(_externalBookBlocks);
-		temp.clear();
-
-		if (_externalBookBlocks.length > 0) {
-			// If any ExternalBookBlock present, there is always 1 of ExternSheetRecord
-			if (rs.peekNextClass() != ExternSheetRecord.class) {
-				// not quite - if written by google docs
-				_externSheetRecord = null;
-			} else {
-				_externSheetRecord = readExtSheetRecord(rs);
-			}
-		} else {
-			_externSheetRecord = null;
-		}
-
-		_definedNames = new ArrayList<NameRecord>();
-		// collect zero or more DEFINEDNAMEs id=0x18,
-		//  with their comments if present
-		while(true) {
-		  Class<? extends Record> nextClass = rs.peekNextClass();
-		  if (nextClass == NameRecord.class) {
-		    NameRecord nr = (NameRecord)rs.getNext();
-		    _definedNames.add(nr);
-		  }
-		  else if (nextClass == NameCommentRecord.class) {
-		    NameCommentRecord ncr = (NameCommentRecord)rs.getNext();
-		    commentRecords.put(ncr.getNameText(), ncr);
-		  }
-		  else {
-		    break;
-		  }
-		}
-
-		_recordCount = rs.getCountRead();
-		_workbookRecordList.getRecords().addAll(inputList.subList(startIndex, startIndex + _recordCount));
-	}
-
-	private static ExternSheetRecord readExtSheetRecord(RecordStream rs) {
-		List<ExternSheetRecord> temp = new ArrayList<ExternSheetRecord>(2);
-		while(rs.peekNextClass() == ExternSheetRecord.class) {
-			temp.add((ExternSheetRecord) rs.getNext());
-		}
-
-		int nItems = temp.size();
-		if (nItems < 1) {
-			throw new RuntimeException("Expected an EXTERNSHEET record but got ("
-					+ rs.peekNextClass().getName() + ")");
-		}
-		if (nItems == 1) {
-			// this is the normal case. There should be just one ExternSheetRecord
-			return temp.get(0);
-		}
-		// Some apps generate multiple ExternSheetRecords (see bug 45698).
-		// It seems like the best thing to do might be to combine these into one
-		ExternSheetRecord[] esrs = new ExternSheetRecord[nItems];
-		temp.toArray(esrs);
-		return ExternSheetRecord.combine(esrs);
-	}
-
-	public LinkTable(int numberOfSheets, WorkbookRecordList workbookRecordList) {
-		_workbookRecordList = workbookRecordList;
-		_definedNames = new ArrayList<NameRecord>();
-		_externalBookBlocks = new ExternalBookBlock[] {
-				new ExternalBookBlock(numberOfSheets),
-		};
-		_externSheetRecord = new ExternSheetRecord();
-		_recordCount = 2;
-
-		// tell _workbookRecordList about the 2 new records
-
-		SupBookRecord supbook = _externalBookBlocks[0].getExternalBookRecord();
-
-		int idx = findFirstRecordLocBySid(CountryRecord.sid);
-		if(idx < 0) {
-			throw new RuntimeException("CountryRecord not found");
-		}
-		_workbookRecordList.add(idx+1, _externSheetRecord);
-		_workbookRecordList.add(idx+1, supbook);
-	}
-
-	/**
-	 * TODO - would not be required if calling code used RecordStream or similar
-	 */
-	public int getRecordCount() {
-		return _recordCount;
-	}
-
-
-	/**
-	 * @param builtInCode a BUILTIN_~ constant from {@link NameRecord}
-	 * @param sheetNumber 1-based sheet number
-	 */
-	public NameRecord getSpecificBuiltinRecord(byte builtInCode, int sheetNumber) {
-		Iterator<NameRecord> iterator = _definedNames.iterator();
-		while (iterator.hasNext()) {
-			NameRecord record = iterator.next();
-
-			//print areas are one based
-			if (record.getBuiltInName() == builtInCode && record.getSheetNumber() == sheetNumber) {
-				return record;
-			}
-		}
-
-		return null;
-	}
-
-	public void removeBuiltinRecord(byte name, int sheetIndex) {
-		//the name array is smaller so searching through it should be faster than
-		//using the findFirstXXXX methods
-		NameRecord record = getSpecificBuiltinRecord(name, sheetIndex);
-		if (record != null) {
-			_definedNames.remove(record);
-		}
-		// TODO - do we need "Workbook.records.remove(...);" similar to that in Workbook.removeName(int namenum) {}?
-	}
-
-	public int getNumNames() {
-		return _definedNames.size();
-	}
-
-	public NameRecord getNameRecord(int index) {
-		return _definedNames.get(index);
-	}
-
-	public void addName(NameRecord name) {
-		_definedNames.add(name);
-
-		// TODO - this is messy
-		// Not the most efficient way but the other way was causing too many bugs
-		int idx = findFirstRecordLocBySid(ExternSheetRecord.sid);
-		if (idx == -1) idx = findFirstRecordLocBySid(SupBookRecord.sid);
-		if (idx == -1) idx = findFirstRecordLocBySid(CountryRecord.sid);
-		int countNames = _definedNames.size();
-		_workbookRecordList.add(idx+countNames, name);
-	}
-
-	public void removeName(int namenum) {
-		_definedNames.remove(namenum);
-	}
-
-	/**
-	 * checks if the given name is already included in the linkTable
-	 */
-	public boolean nameAlreadyExists(NameRecord name)
-	{
-		// Check to ensure no other names have the same case-insensitive name
-		for ( int i = getNumNames()-1; i >=0; i-- ) {
-			NameRecord rec = getNameRecord(i);
-			if (rec != name) {
-				if (isDuplicatedNames(name, rec))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private static boolean isDuplicatedNames(NameRecord firstName, NameRecord lastName) {
-		return lastName.getNameText().equalsIgnoreCase(firstName.getNameText())
-			&& isSameSheetNames(firstName, lastName);
-	}
-	private static boolean isSameSheetNames(NameRecord firstName, NameRecord lastName) {
-		return lastName.getSheetNumber() == firstName.getSheetNumber();
-	}
-
-	public String[] getExternalBookAndSheetName(int extRefIndex) {
-		int ebIx = _externSheetRecord.getExtbookIndexFromRefIndex(extRefIndex);
-		SupBookRecord ebr = _externalBookBlocks[ebIx].getExternalBookRecord();
-		if (!ebr.isExternalReferences()) {
-			return null;
-		}
-		// Sheet name only applies if not a global reference
-		int shIx1 = _externSheetRecord.getFirstSheetIndexFromRefIndex(extRefIndex);
-        int shIx2 = _externSheetRecord.getLastSheetIndexFromRefIndex(extRefIndex);
-		String firstSheetName = null;
-        String lastSheetName = null;
-		if(shIx1 >= 0) {
-		    firstSheetName = ebr.getSheetNames()[shIx1];
-		}
-		if (shIx2 >= 0) {
-		    lastSheetName = ebr.getSheetNames()[shIx2];
-		}
-		if (shIx1 == shIx2) {
-    		return new String[] {
-    				ebr.getURL(),
-    				firstSheetName
-    		};
-		} else {
-            return new String[] {
-                    ebr.getURL(),
-                    firstSheetName,
-                    lastSheetName
-            };
-		}
-	}
-	
-	private int getExternalWorkbookIndex(String workbookName) {
-	    for (int i=0; i<_externalBookBlocks.length; i++) {
-	        SupBookRecord ebr = _externalBookBlocks[i].getExternalBookRecord();
-	        if (!ebr.isExternalReferences()) {
-	            continue;
-	        }
-	        if (workbookName.equals(ebr.getURL())) { // not sure if 'equals()' works when url has a directory
-	            return i;
-	        }
-	    } 
-	    return -1;
-	}
-	
-	public int linkExternalWorkbook(String name, Workbook externalWorkbook) {
-        int extBookIndex = getExternalWorkbookIndex(name);
-        if (extBookIndex != -1) {
-            // Already linked!
-            return extBookIndex;
-        }
-        
-        // Create a new SupBookRecord
-        String[] sheetNames = new String[externalWorkbook.getNumberOfSheets()];
-        for (int sn=0; sn<sheetNames.length; sn++) {
-            sheetNames[sn] = externalWorkbook.getSheetName(sn);
-        }
-        String url = "\000" + name;
-        ExternalBookBlock block = new ExternalBookBlock(url, sheetNames);
-        
-        // Add it into the list + records
-        extBookIndex = extendExternalBookBlocks(block);
-
-        // add the created SupBookRecord before ExternSheetRecord
-        int idx = findFirstRecordLocBySid(ExternSheetRecord.sid);
-        if (idx == -1) {
-            idx = _workbookRecordList.size();
-        }
-        _workbookRecordList.add(idx, block.getExternalBookRecord());
-        
-        // Setup links for the sheets
-        for (int sn=0; sn<sheetNames.length; sn++) {
-            _externSheetRecord.addRef(extBookIndex, sn, sn);
-        }
-        
-        // Report where it went
-        return extBookIndex;
-	}
-
-	public int getExternalSheetIndex(String workbookName, String firstSheetName, String lastSheetName) {
-	    int externalBookIndex = getExternalWorkbookIndex(workbookName);
-        if (externalBookIndex == -1) {
-            throw new RuntimeException("No external workbook with name '" + workbookName + "'");
-        }
-        SupBookRecord ebrTarget = _externalBookBlocks[externalBookIndex].getExternalBookRecord();
-
-		int firstSheetIndex = getSheetIndex(ebrTarget.getSheetNames(), firstSheetName);
-        int lastSheetIndex = getSheetIndex(ebrTarget.getSheetNames(), lastSheetName);
-
-        // Find or add the external sheet record definition for this
-		int result = _externSheetRecord.getRefIxForSheet(externalBookIndex, firstSheetIndex, lastSheetIndex);
-		if (result < 0) {
-		    result = _externSheetRecord.addRef(externalBookIndex, firstSheetIndex, lastSheetIndex);
-		}
-		return result;
-	}
-
-	private static int getSheetIndex(String[] sheetNames, String sheetName) {
-		for (int i = 0; i < sheetNames.length; i++) {
-			if (sheetNames[i].equals(sheetName)) {
-				return i;
-			}
-
-		}
-		throw new RuntimeException("External workbook does not contain sheet '" + sheetName + "'");
-	}
-
-	/**
-	 * @param extRefIndex as from a {@link Ref3DPtg} or {@link Area3DPtg}
-	 * @return -1 if the reference is to an external book
-	 */
-	public int getFirstInternalSheetIndexForExtIndex(int extRefIndex) {
-        if (extRefIndex >= _externSheetRecord.getNumOfRefs() || extRefIndex < 0) {
-            return -1;
-        }
-		return _externSheetRecord.getFirstSheetIndexFromRefIndex(extRefIndex);
-	}
-    /**
-     * @param extRefIndex as from a {@link Ref3DPtg} or {@link Area3DPtg}
-     * @return -1 if the reference is to an external book
-     */
-    public int getLastInternalSheetIndexForExtIndex(int extRefIndex) {
-        if (extRefIndex >= _externSheetRecord.getNumOfRefs() || extRefIndex < 0) {
-            return -1;
-        }
-        return _externSheetRecord.getLastSheetIndexFromRefIndex(extRefIndex);
-    }
-
-	public void removeSheet(int sheetIdx) {
-		_externSheetRecord.removeSheet(sheetIdx);
-	}
-
-	public int checkExternSheet(int sheetIndex) {
-	    return checkExternSheet(sheetIndex, sheetIndex);
-	}
-    public int checkExternSheet(int firstSheetIndex, int lastSheetIndex) {
-		int thisWbIndex = -1; // this is probably always zero
-		for (int i=0; i<_externalBookBlocks.length; i++) {
-			SupBookRecord ebr = _externalBookBlocks[i].getExternalBookRecord();
-			if (ebr.isInternalReferences()) {
-				thisWbIndex = i;
-				break;
-			}
-		}
-		if (thisWbIndex < 0) {
-			throw new RuntimeException("Could not find 'internal references' EXTERNALBOOK");
-		}
-
-		//Trying to find reference to this sheet
-		int i = _externSheetRecord.getRefIxForSheet(thisWbIndex, firstSheetIndex, lastSheetIndex);
-		if (i>=0) {
-			return i;
-		}
-		//We haven't found reference to this sheet
-		return _externSheetRecord.addRef(thisWbIndex, firstSheetIndex, lastSheetIndex);
-	}
-
-	/**
-	 * copied from Workbook
-	 */
-	private int findFirstRecordLocBySid(short sid) {
-		int index = 0;
-		for (Iterator<Record> iterator = _workbookRecordList.iterator(); iterator.hasNext(); ) {
-			Record record = iterator.next();
-
-			if (record.getSid() == sid) {
-				return index;
-			}
-			index ++;
-		}
-		return -1;
-	}
-	
-	public String resolveNameXText(int refIndex, int definedNameIndex, InternalWorkbook workbook) {
-        int extBookIndex = _externSheetRecord.getExtbookIndexFromRefIndex(refIndex);
-        int firstTabIndex = _externSheetRecord.getFirstSheetIndexFromRefIndex(refIndex);
-		if (firstTabIndex == -1) {
-		    // The referenced sheet could not be found
-            throw new RuntimeException("Referenced sheet could not be found");
-		}
-		
-		// Does it exist via the external book block?
-		ExternalBookBlock externalBook = _externalBookBlocks[extBookIndex];
-		if (externalBook._externalNameRecords.length > definedNameIndex) {
-            return _externalBookBlocks[extBookIndex].getNameText(definedNameIndex);
-		} else if (firstTabIndex == -2) {
-		    // Workbook scoped name, not actually external after all
-		    NameRecord nr = getNameRecord(definedNameIndex);
-		    int sheetNumber = nr.getSheetNumber();
-		    
-		    StringBuffer text = new StringBuffer();
-		    if (sheetNumber > 0) {
-		        String sheetName = workbook.getSheetName(sheetNumber-1);
-		        SheetNameFormatter.appendFormat(text, sheetName);
-		        text.append("!");
-		    }
-		    text.append(nr.getNameText());
-		    return text.toString();
-		} else {
-		    throw new ArrayIndexOutOfBoundsException(
-		            "Ext Book Index relative but beyond the supported length, was " +
-		            extBookIndex + " but maximum is " + _externalBookBlocks.length
-		    );
-		}
-	}
-	public int resolveNameXIx(int refIndex, int definedNameIndex) {
-      int extBookIndex = _externSheetRecord.getExtbookIndexFromRefIndex(refIndex);
-      return _externalBookBlocks[extBookIndex].getNameIx(definedNameIndex);
-	}
-
-	/**
-	 * Finds the external name definition for the given name,
-	 *  optionally restricted by externsheet index, and returns
-	 *  (if found) as a NameXPtg.
-	 * @param sheetRefIndex The Extern Sheet Index to look for, or -1 if any
-	 */
-	public NameXPtg getNameXPtg(String name, int sheetRefIndex) {
-		// first find any external book block that contains the name:
-		for (int i = 0; i < _externalBookBlocks.length; i++) {
-			int definedNameIndex = _externalBookBlocks[i].getIndexOfName(name);
-			if (definedNameIndex < 0) {
-				continue;
-			}
-			
-			// Found one
-			int thisSheetRefIndex = findRefIndexFromExtBookIndex(i);
-			if (thisSheetRefIndex >= 0) {
-			    // Check for the sheet index match, if requested
-			    if (sheetRefIndex == -1 || thisSheetRefIndex == sheetRefIndex) {
-			        return new NameXPtg(thisSheetRefIndex, definedNameIndex);
-			    }
-			}
-		}
-		return null;
-	}
-
-    /**
-     * Register an external name in this workbook
-     *
-     * @param name  the name to register
-     * @return a NameXPtg describing this name 
-     */
-    public NameXPtg addNameXPtg(String name) {
-        int extBlockIndex = -1;
-        ExternalBookBlock extBlock = null;
-
-        // find ExternalBlock for Add-In functions and remember its index
-        for (int i = 0; i < _externalBookBlocks.length; i++) {
-            SupBookRecord ebr = _externalBookBlocks[i].getExternalBookRecord();
-            if (ebr.isAddInFunctions()) {
-                extBlock = _externalBookBlocks[i];
-                extBlockIndex = i;
-                break;
-            }
-        }
-        // An ExternalBlock for Add-In functions was not found. Create a new one.
-        if (extBlock == null) {
-            extBlock = new ExternalBookBlock();
-            extBlockIndex = extendExternalBookBlocks(extBlock);
-
-            // add the created SupBookRecord before ExternSheetRecord
-            int idx = findFirstRecordLocBySid(ExternSheetRecord.sid);
-            _workbookRecordList.add(idx, extBlock.getExternalBookRecord());
-
-            // register the SupBookRecord in the ExternSheetRecord
-            // -2 means that the scope of this name is Workbook and the reference applies to the entire workbook.
-            _externSheetRecord.addRef(_externalBookBlocks.length - 1, -2, -2);
-        }
-
-        // create a ExternalNameRecord that will describe this name
-        ExternalNameRecord extNameRecord = new ExternalNameRecord();
-        extNameRecord.setText(name);
-        // The docs don't explain why Excel set the formula to #REF!
-        extNameRecord.setParsedExpression(new Ptg[]{ErrPtg.REF_INVALID});
-
-        int nameIndex = extBlock.addExternalName(extNameRecord);
-        int supLinkIndex = 0;
-        // find the posistion of the Add-In SupBookRecord in the workbook stream,
-        // the created ExternalNameRecord will be appended to it
-        for (Iterator<Record> iterator = _workbookRecordList.iterator(); iterator.hasNext(); supLinkIndex++) {
-            Record record = iterator.next();
-            if (record instanceof SupBookRecord) {
-                if (((SupBookRecord) record).isAddInFunctions()) break;
-            }
-        }
-        int numberOfNames = extBlock.getNumberOfNames();
-        // a new name is inserted in the end of the SupBookRecord, after the last name
-        _workbookRecordList.add(supLinkIndex + numberOfNames, extNameRecord);
-        int fakeSheetIdx = -2; /* the scope is workbook*/
-        int ix = _externSheetRecord.getRefIxForSheet(extBlockIndex, fakeSheetIdx, fakeSheetIdx);
-        return new NameXPtg(ix, nameIndex);
-    }
-    private int extendExternalBookBlocks(ExternalBookBlock newBlock) {
-        ExternalBookBlock[] tmp = new ExternalBookBlock[_externalBookBlocks.length + 1];
-        System.arraycopy(_externalBookBlocks, 0, tmp, 0, _externalBookBlocks.length);
-        tmp[tmp.length - 1] = newBlock;
-        _externalBookBlocks = tmp;
-
-        return (_externalBookBlocks.length - 1);
-    }
-
-    private int findRefIndexFromExtBookIndex(int extBookIndex) {
-		return _externSheetRecord.findRefIndexFromExtBookIndex(extBookIndex);
-	}
-   
-	/**
-	 * Changes an external referenced file to another file.
-	 * A formular in Excel which refers a cell in another file is saved in two parts: 
-	 * The referenced file is stored in an reference table. the row/cell information is saved separate.
-	 * This method invokation will only change the reference in the lookup-table itself.
-	 * @param oldUrl The old URL to search for and which is to be replaced
-	 * @param newUrl The URL replacement
-	 * @return true if the oldUrl was found and replaced with newUrl. Otherwise false
-	 */
-	public boolean changeExternalReference(String oldUrl, String newUrl) {
-		for(ExternalBookBlock ex : _externalBookBlocks) {
-			SupBookRecord externalRecord = ex.getExternalBookRecord();
-			if (externalRecord.isExternalReferences() 
-				&& externalRecord.getURL().equals(oldUrl)) {
-				
-				externalRecord.setURL(newUrl);
-				return true;
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/RecordOrderer.java b/trunk/src/java/org/apache/poi/hssf/model/RecordOrderer.java
deleted file mode 100644
index 9f1871c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/RecordOrderer.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.util.List;
-
-import org.apache.poi.hssf.record.ArrayRecord;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.BoolErrRecord;
-import org.apache.poi.hssf.record.CalcCountRecord;
-import org.apache.poi.hssf.record.CalcModeRecord;
-import org.apache.poi.hssf.record.ColumnInfoRecord;
-import org.apache.poi.hssf.record.DVALRecord;
-import org.apache.poi.hssf.record.DateWindow1904Record;
-import org.apache.poi.hssf.record.DefaultColWidthRecord;
-import org.apache.poi.hssf.record.DefaultRowHeightRecord;
-import org.apache.poi.hssf.record.DeltaRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.DrawingRecord;
-import org.apache.poi.hssf.record.DrawingSelectionRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.FeatRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.GutsRecord;
-import org.apache.poi.hssf.record.HyperlinkRecord;
-import org.apache.poi.hssf.record.IndexRecord;
-import org.apache.poi.hssf.record.IterationRecord;
-import org.apache.poi.hssf.record.LabelRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.PaneRecord;
-import org.apache.poi.hssf.record.PrecisionRecord;
-import org.apache.poi.hssf.record.PrintGridlinesRecord;
-import org.apache.poi.hssf.record.PrintHeadersRecord;
-import org.apache.poi.hssf.record.RKRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RefModeRecord;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.SaveRecalcRecord;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.TableRecord;
-import org.apache.poi.hssf.record.TextObjectRecord;
-import org.apache.poi.hssf.record.UncalcedRecord;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.hssf.record.WindowOneRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.aggregates.ColumnInfoRecordsAggregate;
-import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable;
-import org.apache.poi.hssf.record.aggregates.DataValidityTable;
-import org.apache.poi.hssf.record.aggregates.MergedCellsTable;
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
-import org.apache.poi.hssf.record.pivottable.ViewDefinitionRecord;
-
-/**
- * Finds correct insert positions for records in workbook streams<p/>
- *
- * See OOO excelfileformat.pdf sec. 4.2.5 'Record Order in a BIFF8 Workbook Stream'
- */
-final class RecordOrderer {
-
-	// TODO - simplify logic using a generalised record ordering
-
-	private RecordOrderer() {
-		// no instances of this class
-	}
-	/**
-	 * Adds the specified new record in the correct place in sheet records list
-	 */
-	public static void addNewSheetRecord(List<RecordBase> sheetRecords, RecordBase newRecord) {
-		int index = findSheetInsertPos(sheetRecords, newRecord.getClass());
-		sheetRecords.add(index, newRecord);
-	}
-
-	private static int findSheetInsertPos(List<RecordBase> records, Class<? extends RecordBase> recClass) {
-		if (recClass == DataValidityTable.class) {
-			return findDataValidationTableInsertPos(records);
-		}
-		if (recClass == MergedCellsTable.class) {
-			return findInsertPosForNewMergedRecordTable(records);
-		}
-		if (recClass == ConditionalFormattingTable.class) {
-			return findInsertPosForNewCondFormatTable(records);
-		}
-		if (recClass == GutsRecord.class) {
-			return getGutsRecordInsertPos(records);
-		}
-		if (recClass == PageSettingsBlock.class) {
-			return getPageBreakRecordInsertPos(records);
-		}
-		if (recClass == WorksheetProtectionBlock.class) {
-			return getWorksheetProtectionBlockInsertPos(records);
-		}
-		throw new RuntimeException("Unexpected record class (" + recClass.getName() + ")");
-	}
-
-	/**
-	 * Finds the index where the protection block should be inserted
-	 * @param records the records for this sheet
-	 * <pre>
-	 * + BOF
-	 * o INDEX
-	 * o Calculation Settings Block
-	 * o PRINTHEADERS
-	 * o PRINTGRIDLINES
-	 * o GRIDSET
-	 * o GUTS
-	 * o DEFAULTROWHEIGHT
-	 * o SHEETPR
-	 * o Page Settings Block
-	 * o Worksheet Protection Block
-	 * o DEFCOLWIDTH
-	 * oo COLINFO
-	 * o SORT
-	 * + DIMENSION
-	 * </pre>
-	 */
-	private static int getWorksheetProtectionBlockInsertPos(List<RecordBase> records) {
-		int i = getDimensionsIndex(records);
-		while (i > 0) {
-			i--;
-			Object rb = records.get(i);
-			if (!isProtectionSubsequentRecord(rb)) {
-				return i+1;
-			}
-		}
-		throw new IllegalStateException("did not find insert pos for protection block");
-	}
-
-
-	/**
-	 * These records may occur between the 'Worksheet Protection Block' and DIMENSION:
-	 * <pre>
-	 * o DEFCOLWIDTH
-	 * oo COLINFO
-	 * o SORT
-	 * </pre>
-	 */
-	private static boolean isProtectionSubsequentRecord(Object rb) {
-		if (rb instanceof ColumnInfoRecordsAggregate) {
-			return true; // oo COLINFO
-		}
-		if (rb instanceof Record) {
-			Record record = (Record) rb;
-			switch (record.getSid()) {
-				case DefaultColWidthRecord.sid:
-				case UnknownRecord.SORT_0090:
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private static int getPageBreakRecordInsertPos(List<RecordBase> records) {
-		int dimensionsIndex = getDimensionsIndex(records);
-		int i = dimensionsIndex-1;
-		while (i > 0) {
-			i--;
-			Object rb = records.get(i);
-			if (isPageBreakPriorRecord(rb)) {
-				return i+1;
-			}
-		}
-		throw new RuntimeException("Did not find insert point for GUTS");
-	}
-	private static boolean isPageBreakPriorRecord(Object rb) {
-		if (rb instanceof Record) {
-			Record record = (Record) rb;
-			switch (record.getSid()) {
-				case BOFRecord.sid:
-				case IndexRecord.sid:
-				// calc settings block
-					case UncalcedRecord.sid:
-					case CalcCountRecord.sid:
-					case CalcModeRecord.sid:
-					case PrecisionRecord.sid:
-					case RefModeRecord.sid:
-					case DeltaRecord.sid:
-					case IterationRecord.sid:
-					case DateWindow1904Record.sid:
-					case SaveRecalcRecord.sid:
-				// end calc settings
-				case PrintHeadersRecord.sid:
-				case PrintGridlinesRecord.sid:
-				case GridsetRecord.sid:
-				case DefaultRowHeightRecord.sid:
-				case UnknownRecord.SHEETPR_0081:
-					return true;
-				// next is the 'Worksheet Protection Block'
-			}
-		}
-		return false;
-	}
-	/**
-	 * Find correct position to add new CFHeader record
-	 */
-	private static int findInsertPosForNewCondFormatTable(List<RecordBase> records) {
-
-		for (int i = records.size() - 2; i >= 0; i--) { // -2 to skip EOF record
-			Object rb = records.get(i);
-			if (rb instanceof MergedCellsTable) {
-				return i + 1;
-			}
-			if (rb instanceof DataValidityTable) {
-				continue;
-			}
-
-			Record rec = (Record) rb;
-			switch (rec.getSid()) {
-				case WindowTwoRecord.sid:
-				case SCLRecord.sid:
-				case PaneRecord.sid:
-				case SelectionRecord.sid:
-				case UnknownRecord.STANDARDWIDTH_0099:
-				// MergedCellsTable usually here
-				case UnknownRecord.LABELRANGES_015F:
-				case UnknownRecord.PHONETICPR_00EF:
-					// ConditionalFormattingTable goes here
-					return i + 1;
-				// HyperlinkTable (not aggregated by POI yet)
-				// DataValidityTable
-			}
-		}
-		throw new RuntimeException("Did not find Window2 record");
-	}
-
-	private static int findInsertPosForNewMergedRecordTable(List<RecordBase> records) {
-		for (int i = records.size() - 2; i >= 0; i--) { // -2 to skip EOF record
-			Object rb = records.get(i);
-			if (!(rb instanceof Record)) {
-				// DataValidityTable, ConditionalFormattingTable,
-				// even PageSettingsBlock (which doesn't normally appear after 'View Settings')
-				continue;
-			}
-			Record rec = (Record) rb;
-			switch (rec.getSid()) {
-				// 'View Settings' (4 records)
-				case WindowTwoRecord.sid:
-				case SCLRecord.sid:
-				case PaneRecord.sid:
-				case SelectionRecord.sid:
-
-				case UnknownRecord.STANDARDWIDTH_0099:
-					return i + 1;
-			}
-		}
-		throw new RuntimeException("Did not find Window2 record");
-	}
-
-
-	/**
-	 * Finds the index where the sheet validations header record should be inserted
-	 * @param records the records for this sheet
-	 *
-	 * + WINDOW2
-	 * o SCL
-	 * o PANE
-	 * oo SELECTION
-	 * o STANDARDWIDTH
-	 * oo MERGEDCELLS
-	 * o LABELRANGES
-	 * o PHONETICPR
-	 * o Conditional Formatting Table
-	 * o Hyperlink Table
-	 * o Data Validity Table
-	 * o SHEETLAYOUT
-	 * o SHEETPROTECTION
-	 * o RANGEPROTECTION
-	 * + EOF
-	 */
-	private static int findDataValidationTableInsertPos(List<RecordBase> records) {
-		int i = records.size() - 1;
-		if (!(records.get(i) instanceof EOFRecord)) {
-			throw new IllegalStateException("Last sheet record should be EOFRecord");
-		}
-		while (i > 0) {
-			i--;
-			RecordBase rb = records.get(i);
-			if (isDVTPriorRecord(rb)) {
-				Record nextRec = (Record) records.get(i + 1);
-				if (!isDVTSubsequentRecord(nextRec.getSid())) {
-					throw new IllegalStateException("Unexpected (" + nextRec.getClass().getName()
-							+ ") found after (" + rb.getClass().getName() + ")");
-				}
-				return i+1;
-			}
-			Record rec = (Record) rb;
-			if (!isDVTSubsequentRecord(rec.getSid())) {
-				throw new IllegalStateException("Unexpected (" + rec.getClass().getName()
-						+ ") while looking for DV Table insert pos");
-			}
-		}
-		return 0;
-	}
-
-
-	private static boolean isDVTPriorRecord(RecordBase rb) {
-		if (rb instanceof MergedCellsTable || rb instanceof ConditionalFormattingTable) {
-			return true;
-		}
-		short sid = ((Record)rb).getSid();
-		switch(sid) {
-			case WindowTwoRecord.sid:
-			case UnknownRecord.SCL_00A0:
-			case PaneRecord.sid:
-			case SelectionRecord.sid:
-			case UnknownRecord.STANDARDWIDTH_0099:
-			// MergedCellsTable
-			case UnknownRecord.LABELRANGES_015F:
-			case UnknownRecord.PHONETICPR_00EF:
-			// ConditionalFormattingTable
-			case HyperlinkRecord.sid:
-			case UnknownRecord.QUICKTIP_0800:
-            // name of a VBA module    
-            case UnknownRecord.CODENAME_1BA:
-				return true;
-		}
-		return false;
-	}
-
-	private static boolean isDVTSubsequentRecord(short sid) {
-		switch(sid) {
-			case UnknownRecord.SHEETEXT_0862:
-			case UnknownRecord.SHEETPROTECTION_0867:
-			case UnknownRecord.PLV_MAC:
-			case FeatRecord.sid:
-			case EOFRecord.sid:
-				return true;
-		}
-		return false;
-	}
-	/**
-	 * DIMENSIONS record is always present
-	 */
-	private static int getDimensionsIndex(List<RecordBase> records) {
-		int nRecs = records.size();
-		for(int i=0; i<nRecs; i++) {
-			if(records.get(i) instanceof DimensionsRecord) {
-				return i;
-			}
-		}
-		// worksheet stream is seriously broken
-		throw new RuntimeException("DimensionsRecord not found");
-	}
-
-	private static int getGutsRecordInsertPos(List<RecordBase> records) {
-		int dimensionsIndex = getDimensionsIndex(records);
-		int i = dimensionsIndex-1;
-		while (i > 0) {
-			i--;
-			RecordBase rb = records.get(i);
-			if (isGutsPriorRecord(rb)) {
-				return i+1;
-			}
-		}
-		throw new RuntimeException("Did not find insert point for GUTS");
-	}
-
-	private static boolean isGutsPriorRecord(RecordBase rb) {
-		if (rb instanceof Record) {
-			Record record = (Record) rb;
-			switch (record.getSid()) {
-				case BOFRecord.sid:
-				case IndexRecord.sid:
-				// calc settings block
-					case UncalcedRecord.sid:
-					case CalcCountRecord.sid:
-					case CalcModeRecord.sid:
-					case PrecisionRecord.sid:
-					case RefModeRecord.sid:
-					case DeltaRecord.sid:
-					case IterationRecord.sid:
-					case DateWindow1904Record.sid:
-					case SaveRecalcRecord.sid:
-				// end calc settings
-				case PrintHeadersRecord.sid:
-				case PrintGridlinesRecord.sid:
-				case GridsetRecord.sid:
-					return true;
-				// DefaultRowHeightRecord.sid is next
-			}
-		}
-		return false;
-	}
-	/**
-	 * @return <code>true</code> if the specified record ID terminates a sequence of Row block records
-	 * It is assumed that at least one row or cell value record has been found prior to the current
-	 * record
-	 */
-	public static boolean isEndOfRowBlock(int sid) {
-		switch(sid) {
-			case ViewDefinitionRecord.sid:
-				// should have been prefixed with DrawingRecord (0x00EC), but bug 46280 seems to allow this
-			case DrawingRecord.sid:
-			case DrawingSelectionRecord.sid:
-			case ObjRecord.sid:
-			case TextObjectRecord.sid:
-            case ColumnInfoRecord.sid: // See Bugzilla 53984
-            case GutsRecord.sid:   // see Bugzilla 50426
-			case WindowOneRecord.sid:
-				// should really be part of workbook stream, but some apps seem to put this before WINDOW2
-			case WindowTwoRecord.sid:
-				return true;
-
-			case DVALRecord.sid:
-				return true;
-			case EOFRecord.sid:
-				// WINDOW2 should always be present, so shouldn't have got this far
-				throw new RuntimeException("Found EOFRecord before WindowTwoRecord was encountered");
-		}
-		return PageSettingsBlock.isComponentRecord(sid);
-	}
-
-	/**
-	 * @return <code>true</code> if the specified record id normally appears in the row blocks section
-	 * of the sheet records
-	 */
-	public static boolean isRowBlockRecord(int sid) {
-		switch (sid) {
-			case RowRecord.sid:
-
-			case BlankRecord.sid:
-			case BoolErrRecord.sid:
-			case FormulaRecord.sid:
-			case LabelRecord.sid:
-			case LabelSSTRecord.sid:
-			case NumberRecord.sid:
-			case RKRecord.sid:
-
-			case ArrayRecord.sid:
-			case SharedFormulaRecord.sid:
-			case TableRecord.sid:
-				return true;
-		}
-		return false;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/RecordStream.java b/trunk/src/java/org/apache/poi/hssf/model/RecordStream.java
deleted file mode 100644
index 23c2d3d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/RecordStream.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.util.List;
-
-import org.apache.poi.hssf.record.Record;
-/**
- * Simplifies iteration over a sequence of <tt>Record</tt> objects.
- */
-public final class RecordStream {
-
-	private final List<Record> _list;
-	private int _nextIndex;
-	private int _countRead;
-	private final int _endIx;
-
-	/**
-	 * Creates a RecordStream bounded by startIndex and endIndex
-	 * 
-	 * @param inputList the list to iterate over
-	 * @param startIndex the start index within the list
-	 * @param endIx the end index within the list, which is the index of the end element + 1
-	 */
-	public RecordStream(List<Record> inputList, int startIndex, int endIx) {
-		_list = inputList;
-		_nextIndex = startIndex;
-		_endIx = endIx;
-		_countRead = 0;
-	}
-
-	public RecordStream(List<Record> records, int startIx) {
-		this(records, startIx, records.size());
-	}
-
-	public boolean hasNext() {
-		return _nextIndex < _endIx;
-	}
-
-	public Record getNext() {
-		if(!hasNext()) {
-			throw new RuntimeException("Attempt to read past end of record stream");
-		}
-		_countRead ++;
-		return _list.get(_nextIndex++);
-	}
-
-	/**
-	 * @return the {@link Class} of the next Record. <code>null</code> if this stream is exhausted.
-	 */
-	public Class<? extends Record> peekNextClass() {
-		if(!hasNext()) {
-			return null;
-		}
-		return _list.get(_nextIndex).getClass();
-	}
-
-	/**
-	 * @return -1 if at end of records
-	 */
-	public int peekNextSid() {
-		if(!hasNext()) {
-			return -1;
-		}
-		return _list.get(_nextIndex).getSid();
-	}
-
-	public int getCountRead() {
-		return _countRead;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java b/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
deleted file mode 100644
index 0bc7e29..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.record.ArrayRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.MergeCellsRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.TableRecord;
-import org.apache.poi.hssf.record.aggregates.MergedCellsTable;
-import org.apache.poi.hssf.record.aggregates.SharedValueManager;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Segregates the 'Row Blocks' section of a single sheet into plain row/cell records and
- * shared formula records.
- */
-public final class RowBlocksReader {
-
-	private final List<Record> _plainRecords;
-	private final SharedValueManager _sfm;
-	private final MergeCellsRecord[] _mergedCellsRecords;
-
-	/**
-	 * Also collects any loose MergeCellRecords and puts them in the supplied
-	 * mergedCellsTable
-	 * 
-	 * @param  rs the record stream
-	 */
-	public RowBlocksReader(RecordStream rs) {
-		List<Record> plainRecords = new ArrayList<Record>();
-		List<Record> shFrmRecords = new ArrayList<Record>();
-		List<CellReference> firstCellRefs = new ArrayList<CellReference>();
-		List<Record> arrayRecords = new ArrayList<Record>();
-		List<Record> tableRecords = new ArrayList<Record>();
-		List<Record> mergeCellRecords = new ArrayList<Record>();
-
-		Record prevRec = null;
-		while(!RecordOrderer.isEndOfRowBlock(rs.peekNextSid())) {
-			// End of row/cell records for the current sheet
-			// Note - It is important that this code does not inadvertently add any sheet
-			// records from a subsequent sheet.  For example, if SharedFormulaRecords
-			// are taken from the wrong sheet, this could cause bug 44449.
-			if (!rs.hasNext()) {
-				throw new RuntimeException("Failed to find end of row/cell records");
-
-			}
-			Record rec = rs.getNext();
-			List<Record> dest;
-			switch (rec.getSid()) {
-				case MergeCellsRecord.sid:    dest = mergeCellRecords; break;
-				case SharedFormulaRecord.sid: dest = shFrmRecords;
-					if (!(prevRec instanceof FormulaRecord)) {
-						throw new RuntimeException("Shared formula record should follow a FormulaRecord");
-					}
-					FormulaRecord fr = (FormulaRecord)prevRec;
-					firstCellRefs.add(new CellReference(fr.getRow(), fr.getColumn()));
-					break;
-				case ArrayRecord.sid:         dest = arrayRecords;     break;
-				case TableRecord.sid:         dest = tableRecords;     break;
-				default:                      dest = plainRecords;
-			}
-			dest.add(rec);
-			prevRec = rec;
-		}
-		SharedFormulaRecord[] sharedFormulaRecs = new SharedFormulaRecord[shFrmRecords.size()];
-		CellReference[] firstCells = new CellReference[firstCellRefs.size()];
-		ArrayRecord[] arrayRecs = new ArrayRecord[arrayRecords.size()];
-		TableRecord[] tableRecs = new TableRecord[tableRecords.size()];
-		shFrmRecords.toArray(sharedFormulaRecs);
-		firstCellRefs.toArray(firstCells);
-		arrayRecords.toArray(arrayRecs);
-		tableRecords.toArray(tableRecs);
-
-		_plainRecords = plainRecords;
-		_sfm = SharedValueManager.create(sharedFormulaRecs, firstCells, arrayRecs, tableRecs);
-		_mergedCellsRecords = new MergeCellsRecord[mergeCellRecords.size()];
-		mergeCellRecords.toArray(_mergedCellsRecords);
-	}
-
-	/**
-	 * Some unconventional apps place {@link MergeCellsRecord}s within the row block.  They
-	 * actually should be in the {@link MergedCellsTable} which is much later (see bug 45699).
-	 * @return any loose  <tt>MergeCellsRecord</tt>s found
-	 */
-	public MergeCellsRecord[] getLooseMergedCells() {
-		return _mergedCellsRecords;
-	}
-
-	public SharedValueManager getSharedFormulaManager() {
-		return _sfm;
-	}
-	/**
-	 * @return a {@link RecordStream} containing all the non-{@link SharedFormulaRecord}
-	 * non-{@link ArrayRecord} and non-{@link TableRecord} Records.
-	 */
-	public RecordStream getPlainRecordStream() {
-		return new RecordStream(_plainRecords, 0);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java b/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java
deleted file mode 100644
index e02f8ba..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hssf.record.Record;
-
-public final class WorkbookRecordList implements Iterable<Record> {
-    private List<Record> records = new ArrayList<Record>();
-
-	private int  protpos	 = 0;   // holds the position of the protect record.
-	private int  bspos	   = 0;   // holds the position of the last bound sheet.
-	private int  tabpos	  = 0;   // holds the position of the tabid record
-	private int  fontpos	 = 0;   // hold the position of the last font record
-	private int  xfpos	   = 0;   // hold the position of the last extended font record
-	private int  backuppos   = 0;   // holds the position of the backup record.
-	private int  namepos	 = 0;   // holds the position of last name record
-	private int  supbookpos  = 0;   // holds the position of sup book
-	private int  externsheetPos = 0;// holds the position of the extern sheet
-	private int  palettepos  = -1;   // hold the position of the palette, if applicable
-
-
-	public void setRecords(List<Record> records) {
-		this.records = records;
-	}
-
-	public int size() {
-		return records.size();
-	}
-
-	public Record get(int i) {
-		return records.get(i);
-	}
-
-	public void add(int pos, Record r) {
-		records.add(pos, r);
-		if (getProtpos() >= pos) setProtpos( protpos + 1 );
-		if (getBspos() >= pos) setBspos( bspos + 1 );
-		if (getTabpos() >= pos) setTabpos( tabpos + 1 );
-		if (getFontpos() >= pos) setFontpos( fontpos + 1 );
-		if (getXfpos() >= pos) setXfpos( xfpos + 1 );
-		if (getBackuppos() >= pos) setBackuppos( backuppos + 1 );
-		if (getNamepos() >= pos) setNamepos(namepos+1);
-		if (getSupbookpos() >= pos) setSupbookpos(supbookpos+1);
-		if ((getPalettepos() != -1) && (getPalettepos() >= pos)) setPalettepos( palettepos + 1 );
-		if (getExternsheetPos() >= pos) setExternsheetPos(getExternsheetPos() + 1);
-	}
-
-	public List<Record> getRecords() {
-		return records;
-	}
-
-	public Iterator<Record> iterator() {
-		return records.iterator();
-	}
-
-	/**
-	 * Find the given record in the record list by identity and removes it
-	 *
-	 * @param record the identical record to be searched for
-	 */
-	public void remove( Object record ) {
-	   // can't use List.indexOf here because it checks the records for equality and not identity
-	   int i = 0;
-	   for (Record r : records) {
-	       if (r == record) {
-	           remove(i);
-	           break;
-	       }
-	       i++;
-	   }
-	}
-
-	public void remove( int pos )
-	{
-		records.remove(pos);
-		if (getProtpos() >= pos) setProtpos( protpos - 1 );
-		if (getBspos() >= pos) setBspos( bspos - 1 );
-		if (getTabpos() >= pos) setTabpos( tabpos - 1 );
-		if (getFontpos() >= pos) setFontpos( fontpos - 1 );
-		if (getXfpos() >= pos) setXfpos( xfpos - 1 );
-		if (getBackuppos() >= pos) setBackuppos( backuppos - 1 );
-		if (getNamepos() >= pos) setNamepos(getNamepos()-1);
-		if (getSupbookpos() >= pos) setSupbookpos(getSupbookpos()-1);
-		if ((getPalettepos() != -1) && (getPalettepos() >= pos)) setPalettepos( palettepos - 1 );
-		if (getExternsheetPos() >= pos) setExternsheetPos( getExternsheetPos() -1);
-	}
-
-	public int getProtpos() {
-		return protpos;
-	}
-
-	public void setProtpos(int protpos) {
-		this.protpos = protpos;
-	}
-
-	public int getBspos() {
-		return bspos;
-	}
-
-	public void setBspos(int bspos) {
-		this.bspos = bspos;
-	}
-
-	public int getTabpos() {
-		return tabpos;
-	}
-
-	public void setTabpos(int tabpos) {
-		this.tabpos = tabpos;
-	}
-
-	public int getFontpos() {
-		return fontpos;
-	}
-
-	public void setFontpos(int fontpos) {
-		this.fontpos = fontpos;
-	}
-
-	public int getXfpos() {
-		return xfpos;
-	}
-
-	public void setXfpos(int xfpos) {
-		this.xfpos = xfpos;
-	}
-
-	public int getBackuppos() {
-		return backuppos;
-	}
-
-	public void setBackuppos(int backuppos) {
-		this.backuppos = backuppos;
-	}
-
-	public int getPalettepos() {
-		return palettepos;
-	}
-
-	public void setPalettepos(int palettepos) {
-		this.palettepos = palettepos;
-	}
-
-	
-	/**
-	 * Returns the namepos.
-	 * @return int
-	 */
-	public int getNamepos() {
-		return namepos;
-	}
-
-	/**
-	 * Returns the supbookpos.
-	 * @return int
-	 */
-	public int getSupbookpos() {
-		return supbookpos;
-	}
-
-	/**
-	 * Sets the namepos.
-	 * @param namepos The namepos to set
-	 */
-	public void setNamepos(int namepos) {
-		this.namepos = namepos;
-	}
-
-	/**
-	 * Sets the supbookpos.
-	 * @param supbookpos The supbookpos to set
-	 */
-	public void setSupbookpos(int supbookpos) {
-		this.supbookpos = supbookpos;
-	}
-
-	/**
-	 * Returns the externsheetPos.
-	 * @return int
-	 */
-	public int getExternsheetPos() {
-		return externsheetPos;
-	}
-
-	/**
-	 * Sets the externsheetPos.
-	 * @param externsheetPos The externsheetPos to set
-	 */
-	public void setExternsheetPos(int externsheetPos) {
-		this.externsheetPos = externsheetPos;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/model/package.html b/trunk/src/java/org/apache/poi/hssf/model/package.html
deleted file mode 100644
index 2833d70..0000000
--- a/trunk/src/java/org/apache/poi/hssf/model/package.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-Provides low level API structures for reading, writing, modifying XLS files.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.hssf.usermodel
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/hssf/package.html b/trunk/src/java/org/apache/poi/hssf/package.html
deleted file mode 100644
index b8d8b61..0000000
--- a/trunk/src/java/org/apache/poi/hssf/package.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-Horrible SpreadSheet Format API's for reading/writting Excel files using pure Java.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java b/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
deleted file mode 100644
index 1005b38..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherRecordFactory;
-import org.apache.poi.ddf.NullEscherSerializationListener;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.util.LazilyConcatenatedByteArray;
-
-/**
- * The escher container record is used to hold escher records.  It is abstract and
- * must be subclassed for maximum benefit.
- */
-public abstract class AbstractEscherHolderRecord extends Record implements Cloneable {
-    private static boolean DESERIALISE;
-    static {
-    try {
-            DESERIALISE = (System.getProperty("poi.deserialize.escher") != null);
-        } catch (SecurityException e) {
-            DESERIALISE = false;
-        }
-    }
-
-    private final List<EscherRecord> escherRecords;
-    private final LazilyConcatenatedByteArray rawDataContainer = new LazilyConcatenatedByteArray();
-
-    public AbstractEscherHolderRecord()
-    {
-        escherRecords = new ArrayList<EscherRecord>();
-    }
-
-    public AbstractEscherHolderRecord(RecordInputStream in)
-    {
-        escherRecords = new ArrayList<EscherRecord>();
-        if (! DESERIALISE ) {
-            rawDataContainer.concatenate(in.readRemainder());
-        } else {
-            byte[] data = in.readAllContinuedRemainder();
-            convertToEscherRecords( 0, data.length, data );
-        }
-    }
-
-    protected void convertRawBytesToEscherRecords() {
-        if (! DESERIALISE ) {
-            byte[] rawData = getRawData();
-        	convertToEscherRecords(0, rawData.length, rawData);
-        }
-    }
-    private void convertToEscherRecords( int offset, int size, byte[] data )
-    {
-         escherRecords.clear();
-        EscherRecordFactory recordFactory = new DefaultEscherRecordFactory();
-        int pos = offset;
-        while ( pos < offset + size )
-        {
-            EscherRecord r = recordFactory.createRecord(data, pos);
-            int bytesRead = r.fillFields(data, pos, recordFactory );
-            escherRecords.add(r);
-            pos += bytesRead;
-        }
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        final String nl = System.getProperty("line.separator");
-        buffer.append('[' + getRecordName() + ']' + nl);
-        if (escherRecords.size() == 0)
-            buffer.append("No Escher Records Decoded" + nl);
-        for (EscherRecord r : escherRecords) {
-            buffer.append(r.toString());
-        }
-        buffer.append("[/" + getRecordName() + ']' + nl);
-
-        return buffer.toString();
-    }
-
-    protected abstract String getRecordName();
-
-    @Override
-    public int serialize(int offset, byte[] data)
-    {
-        LittleEndian.putShort( data, 0 + offset, getSid() );
-        LittleEndian.putShort( data, 2 + offset, (short) ( getRecordSize() - 4 ) );
-        byte[] rawData = getRawData();
-        if ( escherRecords.size() == 0 && rawData != null )
-        {
-            LittleEndian.putShort(data, 0 + offset, getSid());
-            LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
-            System.arraycopy( rawData, 0, data, 4 + offset, rawData.length);
-            return rawData.length + 4;
-        }
-        LittleEndian.putShort(data, 0 + offset, getSid());
-        LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
-
-        int pos = offset + 4;
-        for (EscherRecord r : escherRecords) {
-            pos += r.serialize( pos, data, new NullEscherSerializationListener() );
-        }
-        return getRecordSize();
-    }
-
-    @Override
-    public int getRecordSize() {
-        byte[] rawData = getRawData();
-        if (escherRecords.size() == 0 && rawData != null) {
-            // XXX: It should be possible to derive this without concatenating the array, too.
-            return rawData.length;
-        }
-        int size = 0;
-        for (EscherRecord r : escherRecords) {
-            size += r.getRecordSize();
-        }
-        return size;
-    }
-
-
-
-    @Override
-    public abstract short getSid();
-
-    @Override
-    public AbstractEscherHolderRecord clone() {
-    	return (AbstractEscherHolderRecord)cloneViaReserialise();
-    }
-
-    public void addEscherRecord(int index, EscherRecord element)
-    {
-        escherRecords.add( index, element );
-    }
-
-    public boolean addEscherRecord(EscherRecord element)
-    {
-        return escherRecords.add( element );
-    }
-
-    public List<EscherRecord> getEscherRecords()
-    {
-        return escherRecords;
-    }
-
-    public void clearEscherRecords()
-    {
-        escherRecords.clear();
-    }
-
-    /**
-     * If we have a EscherContainerRecord as one of our
-     *  children (and most top level escher holders do),
-     *  then return that.
-     * 
-     * @return the EscherContainerRecord or {@code null} if no child is a container record
-     */
-    public EscherContainerRecord getEscherContainer() {
-    	for (EscherRecord er : escherRecords) {
-    		if(er instanceof EscherContainerRecord) {
-    			return (EscherContainerRecord)er;
-    		}
-    	}
-    	return null;
-    }
-
-    /**
-     * Descends into all our children, returning the
-     *  first EscherRecord with the given id, or null
-     *  if none found
-     *  
-     * @param id the record to look for
-     * 
-     * @return the record or {@code null} if it can't be found
-     */
-    public EscherRecord findFirstWithId(short id) {
-    	return findFirstWithId(id, getEscherRecords());
-    }
-    
-    private EscherRecord findFirstWithId(short id, List<EscherRecord> records) {
-    	// Check at our level
-    	for (EscherRecord r : records) {
-    		if(r.getRecordId() == id) {
-    			return r;
-    		}
-    	}
-
-    	// Then check our children in turn
-    	for (EscherRecord r : records) {
-    		if(r.isContainerRecord()) {
-    			EscherRecord found = findFirstWithId(id, r.getChildRecords());
-    			if(found != null) {
-    				return found;
-    			}
-    		}
-    	}
-
-    	// Not found in this lot
-    	return null;
-    }
-
-
-    public EscherRecord getEscherRecord(int index)
-    {
-        return escherRecords.get(index);
-    }
-
-    /**
-     * Big drawing group records are split but it's easier to deal with them
-     * as a whole group so we need to join them together.
-     * 
-     * @param record the record data to concatenate to the end
-     */
-    public void join( AbstractEscherHolderRecord record )
-    {
-        rawDataContainer.concatenate(record.getRawData());
-    }
-
-    public void processContinueRecord( byte[] record )
-    {
-        rawDataContainer.concatenate(record);
-    }
-
-    public byte[] getRawData()
-    {
-        return rawDataContainer.toArray();
-    }
-
-    public void setRawData( byte[] rawData )
-    {
-        rawDataContainer.clear();
-        rawDataContainer.concatenate(rawData);
-    }
-
-    /**
-     * Convert raw data to escher records.
-     */
-    public void decode()
-    {
-        if (null == escherRecords || 0 == escherRecords.size()){
-            byte[] rawData = getRawData();
-            convertToEscherRecords(0, rawData.length, rawData );
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java
deleted file mode 100644
index 0ff4eb0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ARRAY (0x0221)<p>
- *
- * Treated in a similar way to SharedFormulaRecord
- */
-public final class ArrayRecord extends SharedValueRecordBase implements Cloneable {
-
-	public final static short sid = 0x0221;
-	private static final int OPT_ALWAYS_RECALCULATE = 0x0001;
-	private static final int OPT_CALCULATE_ON_OPEN  = 0x0002;
-
-	private int _options;
-	private int _field3notUsed;
-	private Formula _formula;
-
-	public ArrayRecord(RecordInputStream in) {
-		super(in);
-		_options = in.readUShort();
-		_field3notUsed = in.readInt();
-		int formulaTokenLen = in.readUShort();
-		int totalFormulaLen = in.available();
-		_formula = Formula.read(formulaTokenLen, in, totalFormulaLen);
-	}
-
-	public ArrayRecord(Formula formula, CellRangeAddress8Bit range) {
-		super(range);
-		_options = 0; //YK: Excel 2007 leaves this field unset
-		_field3notUsed = 0;
-		_formula = formula;
-	}
-
-	public boolean isAlwaysRecalculate() {
-		return (_options & OPT_ALWAYS_RECALCULATE) != 0;
-	}
-	public boolean isCalculateOnOpen() {
-		return (_options & OPT_CALCULATE_ON_OPEN) != 0;
-	}
-
-	public Ptg[] getFormulaTokens() {
-		return _formula.getTokens();
-	}
-
-	protected int getExtraDataSize() {
-		return 2 + 4 + _formula.getEncodedSize();
-	}
-	protected void serializeExtraData(LittleEndianOutput out) {
-		out.writeShort(_options);
-		out.writeInt(_field3notUsed);
-		_formula.serialize(out);
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append(getClass().getName()).append(" [ARRAY]\n");
-		sb.append(" range=").append(getRange().toString()).append("\n");
-		sb.append(" options=").append(HexDump.shortToHex(_options)).append("\n");
-		sb.append(" notUsed=").append(HexDump.intToHex(_field3notUsed)).append("\n");
-		sb.append(" formula:").append("\n");
-		Ptg[] ptgs = _formula.getTokens();
-		for (int i = 0; i < ptgs.length; i++) {
-			Ptg ptg = ptgs[i];
-			sb.append(ptg.toString()).append(ptg.getRVAType()).append("\n");
-		}
-		sb.append("]");
-		return sb.toString();
-	}	
-    
-	@Override
-    public ArrayRecord clone() {
-        ArrayRecord rec = new ArrayRecord(_formula.copy(), getRange());
-
-        // they both seem unused, but clone them nevertheless to have an exact copy
-        rec._options = _options;
-        rec._field3notUsed = _field3notUsed;
-
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java b/trunk/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
deleted file mode 100644
index e514dc2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The AutoFilterInfo record specifies the number of columns that have AutoFilter enabled
- * and indicates the beginning of the collection of AutoFilter records.
- *
- * @author Yegor Kozlov
- */
-
-public final class AutoFilterInfoRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x9D;
-    /**
-     * Number of AutoFilter drop-down arrows on the sheet
-     */
-    private short             _cEntries;   // = 0;
-
-    public AutoFilterInfoRecord()
-    {
-    }
-
-    public AutoFilterInfoRecord(RecordInputStream in)
-    {
-        _cEntries = in.readShort();
-    }
-
-    /**
-     * set the number of AutoFilter drop-down arrows on the sheet
-     *
-     * @param num  the number of AutoFilter drop-down arrows on the sheet
-     */
-
-    public void setNumEntries(short num)
-    {
-        _cEntries = num;
-    }
-
-    /**
-     * get the number of AutoFilter drop-down arrows on the sheet
-     *
-     * @return the number of AutoFilter drop-down arrows on the sheet
-     */
-
-    public short getNumEntries()
-    {
-        return _cEntries;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AUTOFILTERINFO]\n");
-        buffer.append("    .numEntries          = ")
-            .append(_cEntries).append("\n");
-        buffer.append("[/AUTOFILTERINFO]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_cEntries);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AutoFilterInfoRecord clone()
-    {
-    	return (AutoFilterInfoRecord)cloneViaReserialise();
-    }
-    
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java b/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java
deleted file mode 100644
index aca680c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Beginning Of File (0x0809)<P>
- * Description: Somewhat of a misnomer, its used for the beginning of a set of
- *              records that have a particular purpose or subject.
- *              Used in sheets and workbooks.<P>
- * REFERENCE:  PG 289 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class BOFRecord extends StandardRecord implements Cloneable {
-    /**
-     * for BIFF8 files the BOF is 0x809. For earlier versions see
-     *  {@link #biff2_sid} {@link #biff3_sid} {@link #biff4_sid} 
-     *  {@link #biff5_sid}
-     */
-    public final static short sid = 0x809;
-    // SIDs from earlier BIFF versions
-    public final static short biff2_sid = 0x009;
-    public final static short biff3_sid = 0x209;
-    public final static short biff4_sid = 0x409;
-    public final static short biff5_sid = 0x809;
-
-    /** suggested default (0x0600 - BIFF8) */
-    public final static int VERSION             = 0x0600;
-    /** suggested default 0x10d3 */
-    public final static int BUILD               = 0x10d3;
-    /** suggested default  0x07CC (1996) */
-    public final static int BUILD_YEAR          = 0x07CC;   // 1996
-    /** suggested default for a normal sheet (0x41) */
-    public final static int HISTORY_MASK        = 0x41;
-
-    public final static int TYPE_WORKBOOK       = 0x05;
-    public final static int TYPE_VB_MODULE      = 0x06;
-    public final static int TYPE_WORKSHEET      = 0x10;
-    public final static int TYPE_CHART          = 0x20;
-    public final static int TYPE_EXCEL_4_MACRO  = 0x40;
-    public final static int TYPE_WORKSPACE_FILE = 0x100;
-
-    private int field_1_version;
-    private int field_2_type;
-    private int field_3_build;
-    private int field_4_year;
-    private int field_5_history;
-    private int field_6_rversion;
-
-    /**
-     * Constructs an empty BOFRecord with no fields set.
-     */
-    public BOFRecord() {
-    }
-    
-    private BOFRecord(int type) {
-        field_1_version = VERSION;
-        field_2_type = type;
-        field_3_build = BUILD;
-        field_4_year = BUILD_YEAR;
-        field_5_history = 0x01;
-        field_6_rversion = VERSION;
-    }
-    
-    public static BOFRecord createSheetBOF() {
-        return new BOFRecord(TYPE_WORKSHEET);
-    }
-
-    public BOFRecord(RecordInputStream in) {
-        field_1_version  = in.readShort();
-        field_2_type     = in.readShort();
-
-        // Some external tools don't generate all of
-        //  the remaining fields
-        if (in.remaining() >= 2) {
-            field_3_build = in.readShort();
-        }
-        if (in.remaining() >= 2) {
-            field_4_year = in.readShort();
-        }
-        if (in.remaining() >= 4) {
-            field_5_history  = in.readInt();
-        }
-        if (in.remaining() >= 4) {
-            field_6_rversion = in.readInt();
-        }
-    }
-
-    /**
-     * Version number - for BIFF8 should be 0x06
-     * @see #VERSION
-     * @param version version to be set
-     */
-    public void setVersion(int version) {
-        field_1_version = version;
-    }
-
-    /**
-     * type of object this marks
-     * @see #TYPE_WORKBOOK
-     * @see #TYPE_VB_MODULE
-     * @see #TYPE_WORKSHEET
-     * @see #TYPE_CHART
-     * @see #TYPE_EXCEL_4_MACRO
-     * @see #TYPE_WORKSPACE_FILE
-     * @param type type to be set
-     */
-    public void setType(int type) {
-        field_2_type = type;
-    }
-
-    /**
-     * build that wrote this file
-     * @see #BUILD
-     * @param build build number to set
-     */
-    public void setBuild(int build) {
-        field_3_build = build;
-    }
-
-    /**
-     * Year of the build that wrote this file
-     * @see #BUILD_YEAR
-     * @param year build year to set
-     */
-    public void setBuildYear(int year) {
-        field_4_year = year;
-    }
-
-    /**
-     * set the history bit mask (not very useful)
-     * @see #HISTORY_MASK
-     * @param bitmask bitmask to set for the history
-     */
-    public void setHistoryBitMask(int bitmask) {
-        field_5_history = bitmask;
-    }
-
-    /**
-     * set the minimum version required to read this file
-     *
-     * @see #VERSION
-     * @param version version to set
-     */
-    public void setRequiredVersion(int version) {
-        field_6_rversion = version;
-    }
-
-    /**
-     * Version number - for BIFF8 should be 0x06
-     * @see #VERSION
-     * @return version number of the generator of this file
-     */
-    public int getVersion() {
-        return field_1_version;
-    }
-
-    /**
-     * type of object this marks
-     * @see #TYPE_WORKBOOK
-     * @see #TYPE_VB_MODULE
-     * @see #TYPE_WORKSHEET
-     * @see #TYPE_CHART
-     * @see #TYPE_EXCEL_4_MACRO
-     * @see #TYPE_WORKSPACE_FILE
-     * @return type of object
-     */
-    public int getType() {
-        return field_2_type;
-    }
-
-    /**
-     * get the build that wrote this file
-     * @see #BUILD
-     * @return short build number of the generator of this file
-     */
-    public int getBuild() {
-        return field_3_build;
-    }
-
-    /**
-     * Year of the build that wrote this file
-     * @see #BUILD_YEAR
-     * @return short build year of the generator of this file
-     */
-    public int getBuildYear() {
-        return field_4_year;
-    }
-
-    /**
-     * get the history bit mask (not very useful)
-     * @see #HISTORY_MASK
-     * @return int bitmask showing the history of the file (who cares!)
-     */
-    public int getHistoryBitMask() {
-        return field_5_history;
-    }
-
-    /**
-     * get the minimum version required to read this file
-     *
-     * @see #VERSION
-     * @return int least version that can read the file
-     */
-    public int getRequiredVersion() {
-        return field_6_rversion;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[BOF RECORD]\n");
-        buffer.append("    .version  = ").append(HexDump.shortToHex(getVersion())).append("\n");
-        buffer.append("    .type     = ").append(HexDump.shortToHex(getType()));
-        buffer.append(" (").append(getTypeName()).append(")").append("\n");
-        buffer.append("    .build    = ").append(HexDump.shortToHex(getBuild())).append("\n");
-        buffer.append("    .buildyear= ").append(getBuildYear()).append("\n");
-        buffer.append("    .history  = ").append(HexDump.intToHex(getHistoryBitMask())).append("\n");
-        buffer.append("    .reqver   = ").append(HexDump.intToHex(getRequiredVersion())).append("\n");
-        buffer.append("[/BOF RECORD]\n");
-        return buffer.toString();
-    }
-
-    private String getTypeName() {
-        switch(field_2_type) {
-            case TYPE_CHART: return "chart";
-            case TYPE_EXCEL_4_MACRO: return "excel 4 macro";
-            case TYPE_VB_MODULE: return "vb module";
-            case TYPE_WORKBOOK: return "workbook";
-            case TYPE_WORKSHEET: return "worksheet";
-            case TYPE_WORKSPACE_FILE: return "workspace file";
-        }
-        return "#error unknown type#";
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getVersion());
-        out.writeShort(getType());
-        out.writeShort(getBuild());
-        out.writeShort(getBuildYear());
-        out.writeInt(getHistoryBitMask());
-        out.writeInt(getRequiredVersion());
-    }
-
-    protected int getDataSize() {
-        return 16;
-    }
-
-    public short getSid(){
-        return sid;
-    }
-
-    @Override
-    public BOFRecord clone() {
-      BOFRecord rec = new BOFRecord();
-      rec.field_1_version = field_1_version;
-      rec.field_2_type = field_2_type;
-      rec.field_3_build = field_3_build;
-      rec.field_4_year = field_4_year;
-      rec.field_5_history = field_5_history;
-      rec.field_6_rversion = field_6_rversion;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java b/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java
deleted file mode 100644
index 0381b22..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Backup Record <P>
- * Description:  Boolean specifying whether
- *               the GUI should store a backup of the file.<P>
- * REFERENCE:  PG 287 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-
-public final class BackupRecord
-    extends StandardRecord
-{
-    public final static short sid = 0x40;
-    private short             field_1_backup;   // = 0;
-
-    public BackupRecord()
-    {
-    }
-
-    public BackupRecord(RecordInputStream in)
-    {
-        field_1_backup = in.readShort();
-    }
-
-    /**
-     * set the backup flag (0,1)
-     *
-     * @param backup    backup flag
-     */
-
-    public void setBackup(short backup)
-    {
-        field_1_backup = backup;
-    }
-
-    /**
-     * get the backup flag
-     *
-     * @return short 0/1 (off/on)
-     */
-
-    public short getBackup()
-    {
-        return field_1_backup;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[BACKUP]\n");
-        buffer.append("    .backup          = ")
-            .append(Integer.toHexString(getBackup())).append("\n");
-        buffer.append("[/BACKUP]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getBackup());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BiffHeaderInput.java b/trunk/src/java/org/apache/poi/hssf/record/BiffHeaderInput.java
deleted file mode 100644
index 089dce6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BiffHeaderInput.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.record;
-
-public interface BiffHeaderInput {
-
-	/**
-	 * Read an unsigned short from the stream without decrypting
-	 * 
-	 * @return the record sid
-	 */
-	int readRecordSID();
-	
-	/**
-	 * Read an unsigned short from the stream without decrypting
-	 * 
-	 * @return the data size
-	 */
-	int readDataSize();
-
-	/**
-	 * @return the available bytes
-	 */
-	int available();
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java b/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java
deleted file mode 100644
index d465ad3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Blank cell record (0x0201) <P>
- * Description:  Represents a column in a row with no value but with styling.<P>
- * REFERENCE:  PG 287 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-public final class BlankRecord extends StandardRecord implements CellValueRecordInterface, Cloneable {
-    public final static short sid = 0x0201;
-    private int             field_1_row;
-    private short             field_2_col;
-    private short             field_3_xf;
-
-    /** Creates a new instance of BlankRecord */
-    public BlankRecord()
-    {
-    }
-
-    public BlankRecord(RecordInputStream in)
-    {
-        field_1_row = in.readUShort();
-        field_2_col = in.readShort();
-        field_3_xf  = in.readShort();
-    }
-
-    /**
-     * set the row this cell occurs on
-     * @param row the row this cell occurs within
-     */
-    public void setRow(int row)
-    {
-        field_1_row = row;
-    }
-
-    /**
-     * get the row this cell occurs on
-     *
-     * @return the row
-     */
-    public int getRow()
-    {
-        return field_1_row;
-    }
-
-    /**
-     * get the column this cell defines within the row
-     *
-     * @return the column
-     */
-    public short getColumn()
-    {
-        return field_2_col;
-    }
-
-    /**
-     * set the index of the extended format record to style this cell with
-     *
-     * @param xf - the 0-based index of the extended format
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     */
-    public void setXFIndex(short xf)
-    {
-        field_3_xf = xf;
-    }
-
-    /**
-     * get the index of the extended format record to style this cell with
-     *
-     * @return extended format index
-     */
-    public short getXFIndex()
-    {
-        return field_3_xf;
-    }
-
-    /**
-     * set the column this cell defines within the row
-     *
-     * @param col the column this cell defines
-     */
-
-    public void setColumn(short col)
-    {
-        field_2_col = col;
-    }
-
-    /**
-     * return the non static version of the id for this record.
-     */
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public String toString()
-    {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[BLANK]\n");
-        sb.append("    row= ").append(HexDump.shortToHex(getRow())).append("\n");
-        sb.append("    col= ").append(HexDump.shortToHex(getColumn())).append("\n");
-        sb.append("    xf = ").append(HexDump.shortToHex(getXFIndex())).append("\n");
-        sb.append("[/BLANK]\n");
-        return sb.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getRow());
-        out.writeShort(getColumn());
-        out.writeShort(getXFIndex());
-    }
-
-    protected int getDataSize() {
-        return 6;
-    }
-
-    @Override
-    public BlankRecord clone() {
-      BlankRecord rec = new BlankRecord();
-      rec.field_1_row = field_1_row;
-      rec.field_2_col = field_2_col;
-      rec.field_3_xf = field_3_xf;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java b/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
deleted file mode 100644
index 652e2ec..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Save External Links record (BookBool)<P>
- * Description:  Contains a flag specifying whether the Gui should save externally
- *               linked values from other workbooks. <P>
- * REFERENCE:  PG 289 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-
-public final class BookBoolRecord
-    extends StandardRecord
-{
-    public final static short sid = 0xDA;
-    private short             field_1_save_link_values;
-
-    public BookBoolRecord()
-    {
-    }
-
-    public BookBoolRecord(RecordInputStream in)
-    {
-        field_1_save_link_values = in.readShort();
-    }
-
-    /**
-     * set the save ext links flag
-     *
-     * @param flag flag (0/1 -off/on)
-     */
-
-    public void setSaveLinkValues(short flag)
-    {
-        field_1_save_link_values = flag;
-    }
-
-    /**
-     * get the save ext links flag
-     *
-     * @return short 0/1 (off/on)
-     */
-
-    public short getSaveLinkValues()
-    {
-        return field_1_save_link_values;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[BOOKBOOL]\n");
-        buffer.append("    .savelinkvalues  = ")
-            .append(Integer.toHexString(getSaveLinkValues())).append("\n");
-        buffer.append("[/BOOKBOOL]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_save_link_values);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java b/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
deleted file mode 100644
index 3ff786a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Creates new BoolErrRecord. (0x0205) <P>
- * REFERENCE:  PG ??? Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Michael P. Harhen
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class BoolErrRecord extends CellRecord implements Cloneable {
-	public final static short sid = 0x0205;
-	private int _value;
-	/**
-	 * If <code>true</code>, this record represents an error cell value, otherwise this record represents a boolean cell value
-	 */
-	private boolean _isError;
-
-	/** Creates new BoolErrRecord */
-	public BoolErrRecord() {
-		// fields uninitialised
-	}
-
-	/**
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public BoolErrRecord(RecordInputStream in) {
-		super(in);
-		switch (in.remaining()) {
-			case 2:
-				_value = in.readByte();
-				break;
-			case 3:
-				_value = in.readUShort();
-				break;
-			default:
-				throw new RecordFormatException("Unexpected size ("
-						+ in.remaining() + ") for BOOLERR record.");
-		}
-		int flag = in.readUByte();
-		switch (flag) {
-			case 0:
-				_isError = false;
-				break;
-			case 1:
-				_isError = true;
-				break;
-			default:
-				throw new RecordFormatException("Unexpected isError flag ("
-						+ flag + ") for BOOLERR record.");
-		}
-	}
-
-	/**
-	 * set the boolean value for the cell
-	 *
-	 * @param value   representing the boolean value
-	 */
-	public void setValue(boolean value) {
-		_value = value ? 1 : 0;
-		_isError = false;
-	}
-
-	/**
-	 * set the error value for the cell. See {@link FormulaError} for valid codes.
-	 *
-	 * @param value     error representing the error value
-	 *                  this value can only be 0,7,15,23,29,36 or 42
-	 *                  see bugzilla bug 16560 for an explanation
-	 */
-	public void setValue(byte value) {
-		setValue(FormulaError.forInt(value));
-	}
-
-	/**
-	 * set the error value for the cell
-	 *
-	 * @param value     error representing the error value
-	 *                  this value can only be 0,7,15,23,29,36 or 42
-	 *                  see bugzilla bug 16560 for an explanation
-	 */
-	public void setValue(FormulaError value) {
-		switch(value) {
-			case NULL:
-			case DIV0:
-			case VALUE:
-			case REF:
-			case NAME:
-			case NUM:
-			case NA:
-				_value = value.getCode();
-				_isError = true;
-				return;
-			default:
-		        throw new IllegalArgumentException("Error Value can only be 0,7,15,23,29,36 or 42. It cannot be "+value.getCode()+" ("+value+")");
-		}
-	}
-
-	/**
-	 * get the value for the cell
-	 *
-	 * @return boolean representing the boolean value
-	 */
-	public boolean getBooleanValue() {
-		return _value != 0;
-	}
-
-	/**
-	 * get the error value for the cell
-	 *
-	 * @return byte representing the error value
-	 */
-	public byte getErrorValue() {
-		return (byte)_value;
-	}
-
-	/**
-	 * Indicates whether the call holds a boolean value
-	 *
-	 * @return boolean true if the cell holds a boolean value
-	 */
-	public boolean isBoolean() {
-		return !_isError;
-	}
-
-	/**
-	 * Indicates whether the call holds an error value
-	 *
-	 * @return boolean true if the cell holds an error value
-	 */
-	public boolean isError() {
-		return _isError;
-	}
-
-	@Override
-	protected String getRecordName() {
-		return "BOOLERR";
-	}
-	@Override
-	protected void appendValueText(StringBuilder sb) {
-		if (isBoolean()) {
-			sb.append("  .boolVal = ");
-			sb.append(getBooleanValue());
-		} else {
-			sb.append("  .errCode = ");
-			sb.append(FormulaError.forInt(getErrorValue()).getString());
-			sb.append(" (").append(HexDump.byteToHex(getErrorValue())).append(")");
-		}
-	}
-	@Override
-	protected void serializeValue(LittleEndianOutput out) {
-		out.writeByte(_value);
-		out.writeByte(_isError ? 1 : 0);
-	}
-
-	@Override
-	protected int getValueDataSize() {
-		return 2;
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public BoolErrRecord clone() {
-	  BoolErrRecord rec = new BoolErrRecord();
-	  copyBaseFields(rec);
-	  rec._value = _value;
-	  rec._isError = _isError;
-	  return rec;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java b/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
deleted file mode 100644
index 104d6a0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.record;
-
-
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * Record for the bottom margin.
- */
-public final class BottomMarginRecord extends StandardRecord implements Margin, Cloneable {
-    public final static short sid = 0x29;
-    private double field_1_margin;
-
-    public BottomMarginRecord()
-    {
-
-    }
-
-    public BottomMarginRecord( RecordInputStream in )
-    {
-        field_1_margin = in.readDouble();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append( "[BottomMargin]\n" );
-        buffer.append( "    .margin               = " )
-                .append( " (" ).append( getMargin() ).append( " )\n" );
-        buffer.append( "[/BottomMargin]\n" );
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeDouble(field_1_margin);
-    }
-
-    protected int getDataSize() {
-        return 8;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    /**
-     * Get the margin field for the BottomMargin record.
-     */
-    public double getMargin()
-    {
-        return field_1_margin;
-    }
-
-    /**
-     * Set the margin field for the BottomMargin record.
-     */
-    public void setMargin( double field_1_margin )
-    {
-        this.field_1_margin = field_1_margin;
-    }
-
-    @Override
-    public BottomMarginRecord clone() {
-        BottomMarginRecord rec = new BottomMarginRecord();
-        rec.field_1_margin = this.field_1_margin;
-        return rec;
-    }
-
-}  // END OF 
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java b/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
deleted file mode 100644
index 61b9283..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.ss.util.WorkbookUtil;
-
-/**
- * Title:        Bound Sheet Record (aka BundleSheet) (0x0085)<P>
- * Description:  Defines a sheet within a workbook.  Basically stores the sheet name
- *               and tells where the Beginning of file record is within the HSSF
- *               file. <P>
- * REFERENCE:  PG 291 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class BoundSheetRecord extends StandardRecord {
-	public final static short sid = 0x0085;
-
-	private static final BitField hiddenFlag = BitFieldFactory.getInstance(0x01);
-	private static final BitField veryHiddenFlag = BitFieldFactory.getInstance(0x02);
-	private int field_1_position_of_BOF;
-	private int field_2_option_flags;
-	private int field_4_isMultibyteUnicode;
-	private String field_5_sheetname;
-
-	public BoundSheetRecord(String sheetname) {
-		field_2_option_flags = 0;
-		setSheetname(sheetname);
-	}
-
-	/**
-	 * UTF8: sid + len + bof + flags + len(str) + unicode + str 2 + 2 + 4 + 2 +
-	 * 1 + 1 + len(str)
-	 *
-	 * UNICODE: sid + len + bof + flags + len(str) + unicode + str 2 + 2 + 4 + 2 +
-	 * 1 + 1 + 2 * len(str)
-	 * 
-	 * @param in the record stream to read from
-	 */
-	public BoundSheetRecord(RecordInputStream in) {
-	    byte buf[] = new byte[LittleEndianConsts.INT_SIZE];
-	    in.readPlain(buf, 0, buf.length);
-		field_1_position_of_BOF = LittleEndian.getInt(buf);
-		field_2_option_flags = in.readUShort();
-		int field_3_sheetname_length = in.readUByte();
-		field_4_isMultibyteUnicode = in.readByte();
-
-		if (isMultibyte()) {
-			field_5_sheetname = in.readUnicodeLEString(field_3_sheetname_length);
-		} else {
-			field_5_sheetname = in.readCompressedUnicode(field_3_sheetname_length);
-		}
-	}
-
-	/**
-	 * set the offset in bytes of the Beginning of File Marker within the HSSF
-	 * Stream part of the POIFS file
-	 *
-	 * @param pos offset in bytes
-	 */
-	public void setPositionOfBof(int pos) {
-		field_1_position_of_BOF = pos;
-	}
-
-	/**
-	 * Set the sheetname for this sheet.  (this appears in the tabs at the bottom)
-	 * @param sheetName the name of the sheet
-	 * @see org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)
-	 *      for a safe way to create valid names
-	 * @throws IllegalArgumentException if sheet name will cause excel to crash.
-	 */
-	public void setSheetname(String sheetName) {
-
-		WorkbookUtil.validateSheetName(sheetName);
-		field_5_sheetname = sheetName;
-		field_4_isMultibyteUnicode = StringUtil.hasMultibyte(sheetName) ?  1 : 0;
-	}
-
-	/**
-	 * get the offset in bytes of the Beginning of File Marker within the HSSF Stream part of the POIFS file
-	 *
-	 * @return offset in bytes
-	 */
-	public int getPositionOfBof() {
-		return field_1_position_of_BOF;
-	}
-
-	private boolean isMultibyte() {
-		return (field_4_isMultibyteUnicode & 0x01) != 0;
-	}
-
-	/**
-	 * get the sheetname for this sheet.  (this appears in the tabs at the bottom)
-	 * @return sheetname the name of the sheet
-	 */
-	public String getSheetname() {
-		return field_5_sheetname;
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[BOUNDSHEET]\n");
-		buffer.append("    .bof        = ").append(HexDump.intToHex(getPositionOfBof())).append("\n");
-		buffer.append("    .options    = ").append(HexDump.shortToHex(field_2_option_flags)).append("\n");
-		buffer.append("    .unicodeflag= ").append(HexDump.byteToHex(field_4_isMultibyteUnicode)).append("\n");
-		buffer.append("    .sheetname  = ").append(field_5_sheetname).append("\n");
-		buffer.append("[/BOUNDSHEET]\n");
-		return buffer.toString();
-	}
-
-	protected int getDataSize() {
-		return 8 + field_5_sheetname.length() * (isMultibyte() ? 2 : 1);
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeInt(getPositionOfBof());
-		out.writeShort(field_2_option_flags);
-
-		String name = field_5_sheetname;
-		out.writeByte(name.length());
-		out.writeByte(field_4_isMultibyteUnicode);
-
-		if (isMultibyte()) {
-			StringUtil.putUnicodeLE(name, out);
-		} else {
-			StringUtil.putCompressedUnicode(name, out);
-		}
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	/**
-	 * Is the sheet hidden? Different from very hidden
-	 * 
-	 * @return {@code true} if hidden
-	 */
-	public boolean isHidden() {
-		return hiddenFlag.isSet(field_2_option_flags);
-	}
-
-	/**
-	 * Is the sheet hidden? Different from very hidden
-	 * 
-	 * @param hidden {@code true} if hidden
-	 */
-	public void setHidden(boolean hidden) {
-		field_2_option_flags = hiddenFlag.setBoolean(field_2_option_flags, hidden);
-	}
-
-	/**
-	 * Is the sheet very hidden? Different from (normal) hidden
-	 * 
-	 * @return {@code true} if very hidden
-	 */
-	public boolean isVeryHidden() {
-		return veryHiddenFlag.isSet(field_2_option_flags);
-	}
-
-	/**
-	 * Is the sheet very hidden? Different from (normal) hidden
-	 * 
-	 * @param veryHidden {@code true} if very hidden
-	 */
-	public void setVeryHidden(boolean veryHidden) {
-		field_2_option_flags = veryHiddenFlag.setBoolean(field_2_option_flags, veryHidden);
-	}
-
-	/**
-	 * Converts a List of {@link BoundSheetRecord}s to an array and sorts by the position of their
-	 * BOFs.
-	 * 
-	 * @param boundSheetRecords the boundSheetRecord list to arrayify
-	 * 
-	 * @return the sorted boundSheetRecords
-	 */
-	public static BoundSheetRecord[] orderByBofPosition(List<BoundSheetRecord> boundSheetRecords) {
-		BoundSheetRecord[] bsrs = new BoundSheetRecord[boundSheetRecords.size()];
-		boundSheetRecords.toArray(bsrs);
-		Arrays.sort(bsrs, BOFComparator);
-	 	return bsrs;
-	}
-	
-	private static final Comparator<BoundSheetRecord> BOFComparator = new Comparator<BoundSheetRecord>() {
-
-		public int compare(BoundSheetRecord bsr1, BoundSheetRecord bsr2) {
-			return bsr1.getPositionOfBof() - bsr2.getPositionOfBof();
-		}
-	};
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CFHeader12Record.java b/trunk/src/java/org/apache/poi/hssf/record/CFHeader12Record.java
deleted file mode 100644
index 241faf1..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CFHeader12Record.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.common.FtrHeader;
-import org.apache.poi.hssf.record.common.FutureRecord;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Conditional Formatting Header v12 record CFHEADER12 (0x0879),
- *  for conditional formattings introduced in Excel 2007 and newer.
- */
-public final class CFHeader12Record extends CFHeaderBase implements FutureRecord, Cloneable {
-    public static final short sid = 0x0879;
-
-    private FtrHeader futureHeader;
-
-    /** Creates new CFHeaderRecord */
-    public CFHeader12Record() {
-        createEmpty();
-        futureHeader = new FtrHeader();
-        futureHeader.setRecordType(sid);
-    }
-    public CFHeader12Record(CellRangeAddress[] regions, int nRules) {
-        super(regions, nRules);
-        futureHeader = new FtrHeader();
-        futureHeader.setRecordType(sid);
-    }
-    public CFHeader12Record(RecordInputStream in) {
-        futureHeader = new FtrHeader(in);
-        read(in);
-    }
-
-    @Override
-    protected String getRecordName() {
-        return "CFHEADER12";
-    }
-
-    protected int getDataSize() {
-        return FtrHeader.getDataSize() + super.getDataSize();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        // Sync the associated range
-        futureHeader.setAssociatedRange(getEnclosingCellRange());
-        // Write the future header first
-        futureHeader.serialize(out);
-        // Then the rest of the CF Header details
-        super.serialize(out);
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public short getFutureRecordType() {
-        return futureHeader.getRecordType();
-    }
-    public FtrHeader getFutureHeader() {
-        return futureHeader;
-    }
-    public CellRangeAddress getAssociatedRange() {
-        return futureHeader.getAssociatedRange();
-    }
-    
-    @Override
-    public CFHeader12Record clone() {
-        CFHeader12Record result = new CFHeader12Record();
-        result.futureHeader = (FtrHeader)futureHeader.clone();
-        super.copyTo(result);
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java b/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
deleted file mode 100644
index 3784638..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.ss.util.CellRangeUtil;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Parent of Conditional Formatting Header records,
- *  {@link CFHeaderRecord} and {@link CFHeader12Record}.
- */
-public abstract class CFHeaderBase extends StandardRecord implements Cloneable {
-    private int field_1_numcf;
-    private int field_2_need_recalculation_and_id;
-    private CellRangeAddress field_3_enclosing_cell_range;
-    private CellRangeAddressList field_4_cell_ranges;
-
-    /** Creates new CFHeaderBase */
-    protected CFHeaderBase() {
-    }
-    protected CFHeaderBase(CellRangeAddress[] regions, int nRules) {
-        CellRangeAddress[] unmergedRanges = regions;
-        CellRangeAddress[] mergeCellRanges = CellRangeUtil.mergeCellRanges(unmergedRanges);
-        setCellRanges(mergeCellRanges);
-        field_1_numcf = nRules;
-    }
-
-    protected void createEmpty() {
-        field_3_enclosing_cell_range = new CellRangeAddress(0, 0, 0, 0);
-        field_4_cell_ranges = new CellRangeAddressList();
-    }
-    protected void read(RecordInputStream in) {
-        field_1_numcf = in.readShort();
-        field_2_need_recalculation_and_id = in.readShort();
-        field_3_enclosing_cell_range = new CellRangeAddress(in);
-        field_4_cell_ranges = new CellRangeAddressList(in);
-    }
-
-    public int getNumberOfConditionalFormats() {
-        return field_1_numcf;
-    }
-    public void setNumberOfConditionalFormats(int n) {
-        field_1_numcf=n;
-    }
-
-    public boolean getNeedRecalculation() {
-        // Held on the 1st bit
-        return (field_2_need_recalculation_and_id & 1) == 1;
-    }
-    public void setNeedRecalculation(boolean b) {
-        // held on the first bit
-        if (b == getNeedRecalculation()) {
-            return;
-        } else if (b) {
-            field_2_need_recalculation_and_id++;
-        } else {
-            field_2_need_recalculation_and_id--;
-        }
-    }
-
-    public int getID() {
-        // Remaining 15 bits of field 2
-        return field_2_need_recalculation_and_id>>1;
-    }
-    public void setID(int id) {
-        // Remaining 15 bits of field 2
-        boolean needsRecalc = getNeedRecalculation();
-        field_2_need_recalculation_and_id = (id<<1);
-        if (needsRecalc) {
-            field_2_need_recalculation_and_id++;
-        }
-    }
-
-    public CellRangeAddress getEnclosingCellRange() {
-        return field_3_enclosing_cell_range;
-    }
-    public void setEnclosingCellRange(CellRangeAddress cr) {
-        field_3_enclosing_cell_range = cr;
-    }
-
-    /**
-     * Set cell ranges list to a single cell range and 
-     * modify the enclosing cell range accordingly.
-     * @param cellRanges - list of CellRange objects
-     */
-    public void setCellRanges(CellRangeAddress[] cellRanges) {
-        if(cellRanges == null) {
-            throw new IllegalArgumentException("cellRanges must not be null");
-        }
-        CellRangeAddressList cral = new CellRangeAddressList();
-        CellRangeAddress enclosingRange = null;
-        for (int i = 0; i < cellRanges.length; i++) {
-            CellRangeAddress cr = cellRanges[i];
-            enclosingRange = CellRangeUtil.createEnclosingCellRange(cr, enclosingRange);
-            cral.addCellRangeAddress(cr);
-        }
-        field_3_enclosing_cell_range = enclosingRange;
-        field_4_cell_ranges = cral;
-    }
-
-    public CellRangeAddress[] getCellRanges() {
-        return field_4_cell_ranges.getCellRangeAddresses();
-    }
-
-    protected abstract String getRecordName();
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[").append(getRecordName()).append("]\n");
-        buffer.append("\t.numCF             = ").append(getNumberOfConditionalFormats()).append("\n");
-        buffer.append("\t.needRecalc        = ").append(getNeedRecalculation()).append("\n");
-        buffer.append("\t.id                = ").append(getID()).append("\n");
-        buffer.append("\t.enclosingCellRange= ").append(getEnclosingCellRange()).append("\n");
-        buffer.append("\t.cfranges=[");
-        for( int i=0; i<field_4_cell_ranges.countRanges(); i++) {
-            buffer.append(i==0?"":",").append(field_4_cell_ranges.getCellRangeAddress(i).toString());
-        }
-        buffer.append("]\n");
-        buffer.append("[/").append(getRecordName()).append("]\n");
-        return buffer.toString();
-    }
-
-    protected int getDataSize() {
-        return 4 // 2 short fields
-             + CellRangeAddress.ENCODED_SIZE
-             + field_4_cell_ranges.getSize();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_numcf);
-        out.writeShort(field_2_need_recalculation_and_id);
-        field_3_enclosing_cell_range.serialize(out);
-        field_4_cell_ranges.serialize(out);
-    }
-
-    protected void copyTo(CFHeaderBase result) {
-        result.field_1_numcf = field_1_numcf;
-        result.field_2_need_recalculation_and_id = field_2_need_recalculation_and_id;
-        result.field_3_enclosing_cell_range = field_3_enclosing_cell_range.copy();
-        result.field_4_cell_ranges = field_4_cell_ranges.copy();
-    }
-
-    @Override
-    public abstract CFHeaderBase clone(); // NOSONAR
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
deleted file mode 100644
index c3c6851..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * Conditional Formatting Header record CFHEADER (0x01B0).
- * Used to describe a {@link CFRuleRecord}.
- * @see CFHeader12Record
- */
-public final class CFHeaderRecord extends CFHeaderBase implements Cloneable {
-    public static final short sid = 0x01B0;
-
-    /** Creates new CFHeaderRecord */
-    public CFHeaderRecord() {
-        createEmpty();
-    }
-    public CFHeaderRecord(CellRangeAddress[] regions, int nRules) {
-        super(regions, nRules);
-    }
-
-    public CFHeaderRecord(RecordInputStream in) {
-        read(in);
-    }
-
-    protected String getRecordName() {
-        return "CFHEADER";
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public CFHeaderRecord clone() {
-        CFHeaderRecord result = new CFHeaderRecord();
-        super.copyTo(result);
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java b/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java
deleted file mode 100644
index fd4cafa..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Arrays;
-
-import org.apache.poi.hssf.record.cf.ColorGradientFormatting;
-import org.apache.poi.hssf.record.cf.ColorGradientThreshold;
-import org.apache.poi.hssf.record.cf.DataBarFormatting;
-import org.apache.poi.hssf.record.cf.DataBarThreshold;
-import org.apache.poi.hssf.record.cf.IconMultiStateFormatting;
-import org.apache.poi.hssf.record.cf.IconMultiStateThreshold;
-import org.apache.poi.hssf.record.cf.Threshold;
-import org.apache.poi.hssf.record.common.ExtendedColor;
-import org.apache.poi.hssf.record.common.FtrHeader;
-import org.apache.poi.hssf.record.common.FutureRecord;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogger;
-
-/**
- * Conditional Formatting v12 Rule Record (0x087A). 
- * 
- * <p>This is for newer-style Excel conditional formattings,
- *  from Excel 2007 onwards.
- *  
- * <p>{@link CFRuleRecord} is used where the condition type is
- *  {@link #CONDITION_TYPE_CELL_VALUE_IS} or {@link #CONDITION_TYPE_FORMULA},
- *  this is only used for the other types
- */
-public final class CFRule12Record extends CFRuleBase implements FutureRecord, Cloneable {
-    public static final short sid = 0x087A;
-
-    private FtrHeader futureHeader;
-    private int ext_formatting_length;
-    private byte[] ext_formatting_data;
-    private Formula formula_scale;
-    private byte ext_opts;
-    private int priority;
-    private int template_type;
-    private byte template_param_length;
-    private byte[] template_params;
-    
-    private DataBarFormatting data_bar;
-    private IconMultiStateFormatting multistate;
-    private ColorGradientFormatting color_gradient;
-    // TODO Parse this, see #58150
-    private byte[] filter_data;
-
-    /** Creates new CFRuleRecord */
-    private CFRule12Record(byte conditionType, byte comparisonOperation) {
-        super(conditionType, comparisonOperation);
-        setDefaults();
-    }
-
-    private CFRule12Record(byte conditionType, byte comparisonOperation, Ptg[] formula1, Ptg[] formula2, Ptg[] formulaScale) {
-        super(conditionType, comparisonOperation, formula1, formula2);
-        setDefaults();
-        this.formula_scale = Formula.create(formulaScale);
-    }
-    private void setDefaults() {
-        futureHeader = new FtrHeader();
-        futureHeader.setRecordType(sid);
-        
-        ext_formatting_length = 0;
-        ext_formatting_data = new byte[4];
-        
-        formula_scale = Formula.create(Ptg.EMPTY_PTG_ARRAY);
-        
-        ext_opts = 0;
-        priority = 0;
-        template_type = getConditionType();
-        template_param_length = 16;
-        template_params = new byte[template_param_length];
-    }
-
-    /**
-     * Creates a new comparison operation rule
-     * 
-     * @param sheet the sheet
-     * @param formulaText the first formula text
-     * 
-     * @return a new comparison operation rule
-     */
-    public static CFRule12Record create(HSSFSheet sheet, String formulaText) {
-        Ptg[] formula1 = parseFormula(formulaText, sheet);
-        return new CFRule12Record(CONDITION_TYPE_FORMULA, ComparisonOperator.NO_COMPARISON,
-                formula1, null, null);
-    }
-    
-    /**
-     * Creates a new comparison operation rule
-     * 
-     * @param sheet the sheet
-     * @param comparisonOperation the comparison operation
-     * @param formulaText1 the first formula text
-     * @param formulaText2 the second formula text
-     * 
-     * @return a new comparison operation rule
-     */
-    public static CFRule12Record create(HSSFSheet sheet, byte comparisonOperation,
-            String formulaText1, String formulaText2) {
-        Ptg[] formula1 = parseFormula(formulaText1, sheet);
-        Ptg[] formula2 = parseFormula(formulaText2, sheet);
-        return new CFRule12Record(CONDITION_TYPE_CELL_VALUE_IS, comparisonOperation, 
-                formula1, formula2, null);
-    }
-    
-    /**
-     * Creates a new comparison operation rule
-     * 
-     * @param sheet the sheet
-     * @param comparisonOperation the comparison operation
-     * @param formulaText1 the first formula text
-     * @param formulaText2 the second formula text
-     * @param formulaTextScale the scale to apply for the comparison
-     * 
-     * @return a new comparison operation rule
-     */
-    public static CFRule12Record create(HSSFSheet sheet, byte comparisonOperation,
-            String formulaText1, String formulaText2, String formulaTextScale) {
-        Ptg[] formula1 = parseFormula(formulaText1, sheet);
-        Ptg[] formula2 = parseFormula(formulaText2, sheet);
-        Ptg[] formula3 = parseFormula(formulaTextScale, sheet);
-        return new CFRule12Record(CONDITION_TYPE_CELL_VALUE_IS, comparisonOperation, 
-                formula1, formula2, formula3);
-    }
-    
-    /**
-     * Creates a new Data Bar formatting
-     * 
-     * @param sheet the sheet
-     * @param color the data bar color
-     * 
-     * @return a new Data Bar formatting
-     */
-    public static CFRule12Record create(HSSFSheet sheet, ExtendedColor color) {
-        CFRule12Record r = new CFRule12Record(CONDITION_TYPE_DATA_BAR, 
-                                              ComparisonOperator.NO_COMPARISON);
-        DataBarFormatting dbf = r.createDataBarFormatting();
-        dbf.setColor(color);
-        dbf.setPercentMin((byte)0);
-        dbf.setPercentMax((byte)100);
-        
-        DataBarThreshold min = new DataBarThreshold();
-        min.setType(RangeType.MIN.id);
-        dbf.setThresholdMin(min);
-        
-        DataBarThreshold max = new DataBarThreshold();
-        max.setType(RangeType.MAX.id);
-        dbf.setThresholdMax(max);
-        
-        return r;
-    }
-    
-    /**
-     * Creates a new Icon Set / Multi-State formatting
-     * 
-     * @param sheet the sheet
-     * @param iconSet the icon set
-     * 
-     * @return a new Icon Set / Multi-State formatting
-     */
-    public static CFRule12Record create(HSSFSheet sheet, IconSet iconSet) {
-        Threshold[] ts = new Threshold[iconSet.num];
-        for (int i=0; i<ts.length; i++) {
-            ts[i] = new IconMultiStateThreshold();
-        }
-        
-        CFRule12Record r = new CFRule12Record(CONDITION_TYPE_ICON_SET, 
-                                              ComparisonOperator.NO_COMPARISON);
-        IconMultiStateFormatting imf = r.createMultiStateFormatting();
-        imf.setIconSet(iconSet);
-        imf.setThresholds(ts);
-        return r;
-    }
-    
-    /**
-     * Creates a new Color Scale / Color Gradient formatting
-     * 
-     * @param sheet the sheet
-     * 
-     * @return a new Color Scale / Color Gradient formatting
-     */
-    public static CFRule12Record createColorScale(HSSFSheet sheet) {
-        int numPoints = 3;
-        ExtendedColor[] colors = new ExtendedColor[numPoints];
-        ColorGradientThreshold[] ts = new ColorGradientThreshold[numPoints];
-        for (int i=0; i<ts.length; i++) {
-            ts[i] = new ColorGradientThreshold();
-            colors[i] = new ExtendedColor();
-        }
-        
-        CFRule12Record r = new CFRule12Record(CONDITION_TYPE_COLOR_SCALE, 
-                                              ComparisonOperator.NO_COMPARISON);
-        ColorGradientFormatting cgf = r.createColorGradientFormatting();
-        cgf.setNumControlPoints(numPoints);
-        cgf.setThresholds(ts);
-        cgf.setColors(colors);
-        return r;
-    }
-
-    public CFRule12Record(RecordInputStream in) {
-        futureHeader = new FtrHeader(in);
-        setConditionType(in.readByte());
-        setComparisonOperation(in.readByte());
-        int field_3_formula1_len = in.readUShort();
-        int field_4_formula2_len = in.readUShort();
-        
-        ext_formatting_length = in.readInt();
-        ext_formatting_data = new byte[0];
-        if (ext_formatting_length == 0) {
-            // 2 bytes reserved
-            in.readUShort();
-        } else {
-            int len = readFormatOptions(in);
-            if (len < ext_formatting_length) {
-                ext_formatting_data = new byte[ext_formatting_length-len];
-                in.readFully(ext_formatting_data);
-            }
-        }
-        
-        setFormula1(Formula.read(field_3_formula1_len, in));
-        setFormula2(Formula.read(field_4_formula2_len, in));
-        
-        int formula_scale_len = in.readUShort();
-        formula_scale = Formula.read(formula_scale_len, in);
-        
-        ext_opts = in.readByte();
-        priority = in.readUShort();
-        template_type = in.readUShort();
-        template_param_length = in.readByte();
-        if (template_param_length == 0 || template_param_length == 16) {
-            template_params = new byte[template_param_length];
-            in.readFully(template_params);
-        } else {
-            logger.log(POILogger.WARN, "CF Rule v12 template params length should be 0 or 16, found " + template_param_length);
-            in.readRemainder();
-        }
-        
-        byte type = getConditionType();
-        if (type == CONDITION_TYPE_COLOR_SCALE) {
-            color_gradient = new ColorGradientFormatting(in);
-        } else if (type == CONDITION_TYPE_DATA_BAR) {
-            data_bar = new DataBarFormatting(in);
-        } else if (type == CONDITION_TYPE_FILTER) {
-            filter_data = in.readRemainder();
-        } else if (type == CONDITION_TYPE_ICON_SET) {
-            multistate = new IconMultiStateFormatting(in);
-        }
-    }
-    
-    public boolean containsDataBarBlock() {
-        return (data_bar != null);
-    }
-    public DataBarFormatting getDataBarFormatting() {
-        return data_bar;
-    }
-    public DataBarFormatting createDataBarFormatting() {
-        if (data_bar != null) return data_bar;
-        
-        // Convert, setup and return
-        setConditionType(CONDITION_TYPE_DATA_BAR);
-        data_bar = new DataBarFormatting();
-        return data_bar;
-    }
-
-    public boolean containsMultiStateBlock() {
-        return (multistate != null);
-    }
-    public IconMultiStateFormatting getMultiStateFormatting() {
-        return multistate;
-    }
-    public IconMultiStateFormatting createMultiStateFormatting() {
-        if (multistate != null) return multistate;
-        
-        // Convert, setup and return
-        setConditionType(CONDITION_TYPE_ICON_SET);
-        multistate = new IconMultiStateFormatting();
-        return multistate;
-    }
-
-    public boolean containsColorGradientBlock() {
-        return (color_gradient != null);
-    }
-    public ColorGradientFormatting getColorGradientFormatting() {
-        return color_gradient;
-    }
-    public ColorGradientFormatting createColorGradientFormatting() {
-        if (color_gradient != null) return color_gradient;
-        
-        // Convert, setup and return
-        setConditionType(CONDITION_TYPE_COLOR_SCALE);
-        color_gradient = new ColorGradientFormatting();
-        return color_gradient;
-    }
-
-    /**
-     * get the stack of the scale expression as a list
-     *
-     * @return list of tokens (casts stack to a list and returns it!)
-     * this method can return null is we are unable to create Ptgs from
-     *	 existing excel file
-     * callers should check for null!
-     */
-    public Ptg[] getParsedExpressionScale() {
-        return formula_scale.getTokens();
-    }
-    public void setParsedExpressionScale(Ptg[] ptgs) {
-        formula_scale = Formula.create(ptgs);
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * 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.
-     *
-     * @param out the stream to write to
-     */
-    public void serialize(LittleEndianOutput out) {
-        futureHeader.serialize(out);
-        
-        int formula1Len=getFormulaSize(getFormula1());
-        int formula2Len=getFormulaSize(getFormula2());
-
-        out.writeByte(getConditionType());
-        out.writeByte(getComparisonOperation());
-        out.writeShort(formula1Len);
-        out.writeShort(formula2Len);
-        
-        // TODO Update ext_formatting_length
-        if (ext_formatting_length == 0) {
-            out.writeInt(0);
-            out.writeShort(0);
-        } else {
-            out.writeInt(ext_formatting_length);
-            serializeFormattingBlock(out);
-            out.write(ext_formatting_data);
-        }
-        
-        getFormula1().serializeTokens(out);
-        getFormula2().serializeTokens(out);
-        out.writeShort(getFormulaSize(formula_scale));
-        formula_scale.serializeTokens(out);
-        
-        out.writeByte(ext_opts);
-        out.writeShort(priority);
-        out.writeShort(template_type);
-        out.writeByte(template_param_length);
-        out.write(template_params);
-        
-        byte type = getConditionType();
-        if (type == CONDITION_TYPE_COLOR_SCALE) {
-            color_gradient.serialize(out);
-        } else if (type == CONDITION_TYPE_DATA_BAR) {
-            data_bar.serialize(out);
-        } else if (type == CONDITION_TYPE_FILTER) {
-            out.write(filter_data);
-        } else if (type == CONDITION_TYPE_ICON_SET) {
-            multistate.serialize(out);
-        }
-    }
-
-    protected int getDataSize() {
-        int len = FtrHeader.getDataSize() + 6;
-        if (ext_formatting_length == 0) {
-            len += 6;
-        } else {
-            len += 4 + getFormattingBlockSize() + ext_formatting_data.length;
-        }
-        len += getFormulaSize(getFormula1());
-        len += getFormulaSize(getFormula2());
-        len += 2 + getFormulaSize(formula_scale);
-        len += 6 + template_params.length;
-        
-        byte type = getConditionType();
-        if (type == CONDITION_TYPE_COLOR_SCALE) {
-            len += color_gradient.getDataLength();
-        } else if (type == CONDITION_TYPE_DATA_BAR) {
-            len += data_bar.getDataLength();
-        } else if (type == CONDITION_TYPE_FILTER) {
-            len += filter_data.length;
-        } else if (type == CONDITION_TYPE_ICON_SET) {
-            len += multistate.getDataLength();
-        }
-        return len;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("[CFRULE12]\n");
-        buffer.append("    .condition_type=").append(getConditionType()).append("\n");
-        buffer.append("    .dxfn12_length =0x").append(Integer.toHexString(ext_formatting_length)).append("\n");
-        buffer.append("    .option_flags  =0x").append(Integer.toHexString(getOptions())).append("\n");
-        if (containsFontFormattingBlock()) {
-            buffer.append(_fontFormatting.toString()).append("\n");
-        }
-        if (containsBorderFormattingBlock()) {
-            buffer.append(_borderFormatting.toString()).append("\n");
-        }
-        if (containsPatternFormattingBlock()) {
-            buffer.append(_patternFormatting.toString()).append("\n");
-        }
-        buffer.append("    .dxfn12_ext=").append(HexDump.toHex(ext_formatting_data)).append("\n");
-        buffer.append("    .formula_1 =").append(Arrays.toString(getFormula1().getTokens())).append("\n");
-        buffer.append("    .formula_2 =").append(Arrays.toString(getFormula2().getTokens())).append("\n");
-        buffer.append("    .formula_S =").append(Arrays.toString(formula_scale.getTokens())).append("\n");
-        buffer.append("    .ext_opts  =").append(ext_opts).append("\n");
-        buffer.append("    .priority  =").append(priority).append("\n");
-        buffer.append("    .template_type  =").append(template_type).append("\n");
-        buffer.append("    .template_params=").append(HexDump.toHex(template_params)).append("\n");
-        buffer.append("    .filter_data    =").append(HexDump.toHex(filter_data)).append("\n");
-        if (color_gradient != null) {
-            buffer.append(color_gradient);
-        }
-        if (multistate != null) {
-            buffer.append(multistate);
-        }
-        if (data_bar != null) {
-            buffer.append(data_bar);
-        }
-        buffer.append("[/CFRULE12]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public CFRule12Record clone() {
-        CFRule12Record rec = new CFRule12Record(getConditionType(), getComparisonOperation());
-        rec.futureHeader.setAssociatedRange(futureHeader.getAssociatedRange().copy());
-        
-        super.copyTo(rec);
-        
-        rec.ext_formatting_length = ext_formatting_length;
-        rec.ext_formatting_data = new byte[ext_formatting_length];
-        System.arraycopy(ext_formatting_data, 0, rec.ext_formatting_data, 0, ext_formatting_length);
-        
-        rec.formula_scale = formula_scale.copy();
-        
-        rec.ext_opts = ext_opts;
-        rec.priority = priority;
-        rec.template_type = template_type;
-        rec.template_param_length = template_param_length;
-        rec.template_params = new byte[template_param_length];
-        System.arraycopy(template_params, 0, rec.template_params, 0, template_param_length);
-
-        if (color_gradient != null) {
-            rec.color_gradient = (ColorGradientFormatting)color_gradient.clone();
-        }
-        if (multistate != null) {
-            rec.multistate = (IconMultiStateFormatting)multistate.clone();
-        }
-        if (data_bar != null) {
-            rec.data_bar = (DataBarFormatting)data_bar.clone();
-        }
-        if (filter_data != null) {
-            rec.filter_data = new byte[filter_data.length];
-            System.arraycopy(filter_data, 0, rec.filter_data, 0, filter_data.length);
-        }
-        
-        return rec;
-    }
-    
-    public short getFutureRecordType() {
-        return futureHeader.getRecordType();
-    }
-    public FtrHeader getFutureHeader() {
-        return futureHeader;
-    }
-    public CellRangeAddress getAssociatedRange() {
-        return futureHeader.getAssociatedRange();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java b/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java
deleted file mode 100644
index aae5073..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.cf.BorderFormatting;
-import org.apache.poi.hssf.record.cf.FontFormatting;
-import org.apache.poi.hssf.record.cf.PatternFormatting;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Conditional Formatting Rules. This can hold old-style rules
- *   
- * 
- * <p>This is for the older-style Excel conditional formattings,
- *  new-style (Excel 2007+) also make use of {@link CFRule12Record}
- *  for their rules.</p>
- */
-public abstract class CFRuleBase extends StandardRecord implements Cloneable {
-    // FIXME: Merge with org.apache.poi.ss.usermodel.ComparisonOperator and rewrite as an enum
-    public static final class ComparisonOperator {
-        public static final byte NO_COMPARISON = 0;
-        public static final byte BETWEEN       = 1;
-        public static final byte NOT_BETWEEN   = 2;
-        public static final byte EQUAL         = 3;
-        public static final byte NOT_EQUAL     = 4;
-        public static final byte GT            = 5;
-        public static final byte LT            = 6;
-        public static final byte GE            = 7;
-        public static final byte LE            = 8;
-        private static final byte max_operator = 8;
-    }
-    protected static final POILogger logger = POILogFactory.getLogger(CFRuleBase.class);
-
-    private byte condition_type;
-    // The only kinds that CFRuleRecord handles
-    public static final byte CONDITION_TYPE_CELL_VALUE_IS = 1;
-    public static final byte CONDITION_TYPE_FORMULA = 2;
-    // These are CFRule12Rule only
-    public static final byte CONDITION_TYPE_COLOR_SCALE = 3;
-    public static final byte CONDITION_TYPE_DATA_BAR = 4;
-    public static final byte CONDITION_TYPE_FILTER = 5;
-    public static final byte CONDITION_TYPE_ICON_SET = 6;
-
-    private byte comparison_operator;
-
-    public static final int TEMPLATE_CELL_VALUE = 0x0000;
-    public static final int TEMPLATE_FORMULA = 0x0001;
-    public static final int TEMPLATE_COLOR_SCALE_FORMATTING = 0x0002;
-    public static final int TEMPLATE_DATA_BAR_FORMATTING = 0x0003;
-    public static final int TEMPLATE_ICON_SET_FORMATTING = 0x0004;
-    public static final int TEMPLATE_FILTER = 0x0005;
-    public static final int TEMPLATE_UNIQUE_VALUES = 0x0007;
-    public static final int TEMPLATE_CONTAINS_TEXT = 0x0008;
-    public static final int TEMPLATE_CONTAINS_BLANKS = 0x0009;
-    public static final int TEMPLATE_CONTAINS_NO_BLANKS = 0x000A;
-    public static final int TEMPLATE_CONTAINS_ERRORS = 0x000B;
-    public static final int TEMPLATE_CONTAINS_NO_ERRORS = 0x000C;
-    public static final int TEMPLATE_TODAY = 0x000F;
-    public static final int TEMPLATE_TOMORROW = 0x0010;
-    public static final int TEMPLATE_YESTERDAY = 0x0011;
-    public static final int TEMPLATE_LAST_7_DAYS = 0x0012;
-    public static final int TEMPLATE_LAST_MONTH = 0x0013;
-    public static final int TEMPLATE_NEXT_MONTH = 0x0014;
-    public static final int TEMPLATE_THIS_WEEK = 0x0015;
-    public static final int TEMPLATE_NEXT_WEEK = 0x0016;
-    public static final int TEMPLATE_LAST_WEEK = 0x0017;
-    public static final int TEMPLATE_THIS_MONTH = 0x0018;
-    public static final int TEMPLATE_ABOVE_AVERAGE = 0x0019;
-    public static final int TEMPLATE_BELOW_AVERAGE = 0x001A;
-    public static final int TEMPLATE_DUPLICATE_VALUES = 0x001B;
-    public static final int TEMPLATE_ABOVE_OR_EQUAL_TO_AVERAGE = 0x001D;
-    public static final int TEMPLATE_BELOW_OR_EQUAL_TO_AVERAGE = 0x001E;
-    
-    static final BitField modificationBits = bf(0x003FFFFF); // Bits: font,align,bord,patt,prot
-    static final BitField alignHor         = bf(0x00000001); // 0 = Horizontal alignment modified
-    static final BitField alignVer         = bf(0x00000002); // 0 = Vertical alignment modified
-    static final BitField alignWrap        = bf(0x00000004); // 0 = Text wrapped flag modified
-    static final BitField alignRot         = bf(0x00000008); // 0 = Text rotation modified
-    static final BitField alignJustLast    = bf(0x00000010); // 0 = Justify last line flag modified
-    static final BitField alignIndent      = bf(0x00000020); // 0 = Indentation modified
-    static final BitField alignShrin       = bf(0x00000040); // 0 = Shrink to fit flag modified
-    static final BitField mergeCell        = bf(0x00000080); // Normally 1, 0 = Merge Cell flag modified
-    static final BitField protLocked       = bf(0x00000100); // 0 = Cell locked flag modified
-    static final BitField protHidden       = bf(0x00000200); // 0 = Cell hidden flag modified
-    static final BitField bordLeft         = bf(0x00000400); // 0 = Left border style and colour modified
-    static final BitField bordRight        = bf(0x00000800); // 0 = Right border style and colour modified
-    static final BitField bordTop          = bf(0x00001000); // 0 = Top border style and colour modified
-    static final BitField bordBot          = bf(0x00002000); // 0 = Bottom border style and colour modified
-    static final BitField bordTlBr         = bf(0x00004000); // 0 = Top-left to bottom-right border flag modified
-    static final BitField bordBlTr         = bf(0x00008000); // 0 = Bottom-left to top-right border flag modified
-    static final BitField pattStyle        = bf(0x00010000); // 0 = Pattern style modified
-    static final BitField pattCol          = bf(0x00020000); // 0 = Pattern colour modified
-    static final BitField pattBgCol        = bf(0x00040000); // 0 = Pattern background colour modified
-    static final BitField notUsed2         = bf(0x00380000); // Always 111 (ifmt / ifnt / 1)
-    static final BitField undocumented     = bf(0x03C00000); // Undocumented bits
-    static final BitField fmtBlockBits     = bf(0x7C000000); // Bits: font,align,bord,patt,prot
-    static final BitField font             = bf(0x04000000); // 1 = Record contains font formatting block
-    static final BitField align            = bf(0x08000000); // 1 = Record contains alignment formatting block
-    static final BitField bord             = bf(0x10000000); // 1 = Record contains border formatting block
-    static final BitField patt             = bf(0x20000000); // 1 = Record contains pattern formatting block
-    static final BitField prot             = bf(0x40000000); // 1 = Record contains protection formatting block
-    static final BitField alignTextDir     = bf(0x80000000); // 0 = Text direction modified
-
-    private static BitField bf(int i) {
-        return BitFieldFactory.getInstance(i);
-    }
-
-    protected int formatting_options;
-    protected short formatting_not_used; // TODO Decode this properly
-
-    protected FontFormatting _fontFormatting;
-    protected BorderFormatting _borderFormatting;
-    protected PatternFormatting _patternFormatting;
-    
-    private Formula formula1;
-    private Formula formula2;
-
-    /**
-     * Creates new CFRuleRecord
-     * 
-     * @param conditionType the condition type
-     * @param comparisonOperation the comparison operation
-     */
-    protected CFRuleBase(byte conditionType, byte comparisonOperation) {
-        setConditionType(conditionType);
-        setComparisonOperation(comparisonOperation);
-        formula1 = Formula.create(Ptg.EMPTY_PTG_ARRAY);
-        formula2 = Formula.create(Ptg.EMPTY_PTG_ARRAY);
-    }
-    protected CFRuleBase(byte conditionType, byte comparisonOperation, Ptg[] formula1, Ptg[] formula2) {
-        this(conditionType, comparisonOperation);
-        this.formula1 = Formula.create(formula1);
-        this.formula2 = Formula.create(formula2);
-    }
-    protected CFRuleBase() {}
-    
-    protected int readFormatOptions(RecordInputStream in) {
-        formatting_options = in.readInt();
-        formatting_not_used = in.readShort();
-
-        int len = 6;
-        
-        if (containsFontFormattingBlock()) {
-            _fontFormatting = new FontFormatting(in);
-            len += _fontFormatting.getDataLength();
-        }
-
-        if (containsBorderFormattingBlock()) {
-            _borderFormatting = new BorderFormatting(in);
-            len += _borderFormatting.getDataLength();
-        }
-
-        if (containsPatternFormattingBlock()) {
-            _patternFormatting = new PatternFormatting(in);
-            len += _patternFormatting.getDataLength();
-        }
-        
-        return len;
-    }
-
-    public byte getConditionType() {
-        return condition_type;
-    }
-    protected void setConditionType(byte condition_type) {
-        if ((this instanceof CFRuleRecord)) {
-            if (condition_type == CONDITION_TYPE_CELL_VALUE_IS ||
-                condition_type == CONDITION_TYPE_FORMULA) {
-                // Good, valid combination
-            } else {
-                throw new IllegalArgumentException("CFRuleRecord only accepts Value-Is and Formula types");
-            }
-        }
-        this.condition_type = condition_type;
-    }
-
-    public void setComparisonOperation(byte operation) {
-        if (operation < 0 || operation > ComparisonOperator.max_operator)
-            throw new IllegalArgumentException(
-                    "Valid operators are only in the range 0 to " +ComparisonOperator.max_operator);
-        
-        this.comparison_operator = operation;
-    }
-    public byte getComparisonOperation() {
-        return comparison_operator;
-    }
-
-    public boolean containsFontFormattingBlock() {
-        return getOptionFlag(font);
-    }
-    public void setFontFormatting(FontFormatting fontFormatting) {
-        _fontFormatting = fontFormatting;
-        setOptionFlag(fontFormatting != null, font);
-    }
-    public FontFormatting getFontFormatting() {
-        if( containsFontFormattingBlock()) {
-            return _fontFormatting;
-        }
-        return null;
-    }
-
-    public boolean containsAlignFormattingBlock() {
-        return getOptionFlag(align);
-    }
-    public void setAlignFormattingUnchanged() {
-        setOptionFlag(false,align);
-    }
-
-    public boolean containsBorderFormattingBlock() {
-        return getOptionFlag(bord);
-    }
-    public void setBorderFormatting(BorderFormatting borderFormatting) {
-        _borderFormatting = borderFormatting;
-        setOptionFlag(borderFormatting != null, bord);
-    }
-    public BorderFormatting getBorderFormatting() {
-        if( containsBorderFormattingBlock()) {
-            return _borderFormatting;
-        }
-        return null;
-    }
-
-    public boolean containsPatternFormattingBlock() {
-        return getOptionFlag(patt);
-    }
-    public void setPatternFormatting(PatternFormatting patternFormatting) {
-        _patternFormatting = patternFormatting;
-        setOptionFlag(patternFormatting!=null, patt);
-    }
-    public PatternFormatting getPatternFormatting() {
-        if( containsPatternFormattingBlock())
-        {
-            return _patternFormatting;
-        }
-        return null;
-    }
-
-    public boolean containsProtectionFormattingBlock() {
-        return getOptionFlag(prot);
-    }
-    public void setProtectionFormattingUnchanged() {
-        setOptionFlag(false,prot);
-    }
-
-    /**
-     * get the option flags
-     *
-     * @return bit mask
-     */
-    public int getOptions() {
-        return formatting_options;
-    }
-
-    private boolean isModified(BitField field) {
-        return !field.isSet(formatting_options);
-    }
-    private void setModified(boolean modified, BitField field) {
-        formatting_options = field.setBoolean(formatting_options, !modified);
-    }
-
-    public boolean isLeftBorderModified() {
-        return isModified(bordLeft);
-    }
-    public void setLeftBorderModified(boolean modified) {
-        setModified(modified,bordLeft);
-    }
-
-    public boolean isRightBorderModified() {
-        return isModified(bordRight);
-    }
-    public void setRightBorderModified(boolean modified)
-    {
-        setModified(modified,bordRight);
-    }
-
-    public boolean isTopBorderModified() {
-        return isModified(bordTop);
-    }
-    public void setTopBorderModified(boolean modified) {
-        setModified(modified,bordTop);
-    }
-
-    public boolean isBottomBorderModified() {
-        return isModified(bordBot);
-    }
-    public void setBottomBorderModified(boolean modified) {
-        setModified(modified,bordBot);
-    }
-
-    public boolean isTopLeftBottomRightBorderModified() {
-        return isModified(bordTlBr);
-    }
-    public void setTopLeftBottomRightBorderModified(boolean modified) {
-        setModified(modified,bordTlBr);
-    }
-
-    public boolean isBottomLeftTopRightBorderModified() {
-        return isModified(bordBlTr);
-    }
-    public void setBottomLeftTopRightBorderModified(boolean modified) {
-        setModified(modified,bordBlTr);
-    }
-
-    public boolean isPatternStyleModified() {
-        return isModified(pattStyle);
-    }
-    public void setPatternStyleModified(boolean modified) {
-        setModified(modified,pattStyle);
-    }
-
-    public boolean isPatternColorModified() {
-        return isModified(pattCol);
-    }
-    public void setPatternColorModified(boolean modified) {
-        setModified(modified,pattCol);
-    }
-
-    public boolean isPatternBackgroundColorModified() {
-        return isModified(pattBgCol);
-    }
-    public void setPatternBackgroundColorModified(boolean modified) {
-        setModified(modified,pattBgCol);
-    }
-
-    private boolean getOptionFlag(BitField field) {
-        return field.isSet(formatting_options);
-    }
-    private void setOptionFlag(boolean flag, BitField field) {
-        formatting_options = field.setBoolean(formatting_options, flag);
-    }
-    
-    protected int getFormattingBlockSize() {
-        return 6 +
-          (containsFontFormattingBlock()?_fontFormatting.getRawRecord().length:0)+
-          (containsBorderFormattingBlock()?8:0)+
-          (containsPatternFormattingBlock()?4:0);
-    }
-    protected void serializeFormattingBlock(LittleEndianOutput out) {
-        out.writeInt(formatting_options);
-        out.writeShort(formatting_not_used);
-
-        if (containsFontFormattingBlock()) {
-            byte[] fontFormattingRawRecord  = _fontFormatting.getRawRecord();
-            out.write(fontFormattingRawRecord);
-        }
-
-        if (containsBorderFormattingBlock()) {
-            _borderFormatting.serialize(out);
-        }
-
-        if (containsPatternFormattingBlock()) {
-            _patternFormatting.serialize(out);
-        }
-    }
-    
-    /**
-     * get the stack of the 1st expression as a list
-     *
-     * @return list of tokens (casts stack to a list and returns it!)
-     * this method can return null is we are unable to create Ptgs from
-     *	 existing excel file
-     * callers should check for null!
-     */
-    public Ptg[] getParsedExpression1() {
-        return formula1.getTokens();
-    }
-    public void setParsedExpression1(Ptg[] ptgs) {
-        formula1 = Formula.create(ptgs);
-    }
-    protected Formula getFormula1() {
-        return formula1;
-    }
-    protected void setFormula1(Formula formula1) {
-        this.formula1 = formula1;
-    }
-
-    /**
-     * get the stack of the 2nd expression as a list
-     *
-     * @return array of {@link Ptg}s, possibly <code>null</code>
-     */
-    public Ptg[] getParsedExpression2() {
-        return Formula.getTokens(formula2);
-    }
-    public void setParsedExpression2(Ptg[] ptgs) {
-        formula2 = Formula.create(ptgs);
-    }
-    protected Formula getFormula2() {
-        return formula2;
-    }
-    protected void setFormula2(Formula formula2) {
-        this.formula2 = formula2;
-    }
-
-    /**
-     * @param formula must not be <code>null</code>
-     * @return encoded size of the formula tokens (does not include 2 bytes for ushort length)
-     */
-    protected static int getFormulaSize(Formula formula) {
-        return formula.getEncodedTokenSize();
-    }
-
-    /**
-     * TODO - parse conditional format formulas properly i.e. produce tRefN and tAreaN instead of tRef and tArea
-     * this call will produce the wrong results if the formula contains any cell references
-     * One approach might be to apply the inverse of SharedFormulaRecord.convertSharedFormulas(Stack, int, int)
-     * Note - two extra parameters (rowIx &amp; colIx) will be required. They probably come from one of the Region objects.
-     *
-     * @param formula  The formula to parse, excluding the leading equals sign.
-     * @param sheet  The sheet that the formula is on.
-     * @return <code>null</code> if <tt>formula</tt> was null.
-     */
-    public static Ptg[] parseFormula(String formula, HSSFSheet sheet) {
-        if(formula == null) {
-            return null;
-        }
-        int sheetIndex = sheet.getWorkbook().getSheetIndex(sheet);
-        return HSSFFormulaParser.parse(formula, sheet.getWorkbook(), FormulaType.CELL, sheetIndex);
-    }
-    
-    protected void copyTo(CFRuleBase rec) {
-        rec.condition_type = condition_type;
-        rec.comparison_operator = comparison_operator;
-        
-        rec.formatting_options = formatting_options;
-        rec.formatting_not_used = formatting_not_used;
-        if (containsFontFormattingBlock()) {
-            rec._fontFormatting = _fontFormatting.clone();
-        }
-        if (containsBorderFormattingBlock()) {
-            rec._borderFormatting = _borderFormatting.clone();
-        }
-        if (containsPatternFormattingBlock()) {
-            rec._patternFormatting = (PatternFormatting) _patternFormatting.clone();
-        }
-        
-        rec.setFormula1(getFormula1().copy());
-        rec.setFormula2(getFormula2().copy());
-    }
-    
-    @Override
-    public abstract CFRuleBase clone();
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
deleted file mode 100644
index 83915cc..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Arrays;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Conditional Formatting Rule Record (0x01B1). 
- * 
- * <p>This is for the older-style Excel conditional formattings,
- *  new-style (Excel 2007+) also make use of {@link CFRule12Record}
- *  for their rules.</p>
- */
-public final class CFRuleRecord extends CFRuleBase implements Cloneable {
-    public static final short sid = 0x01B1;
-
-    /** Creates new CFRuleRecord */
-    private CFRuleRecord(byte conditionType, byte comparisonOperation) {
-        super(conditionType, comparisonOperation);
-        setDefaults();
-    }
-
-    private CFRuleRecord(byte conditionType, byte comparisonOperation, Ptg[] formula1, Ptg[] formula2) {
-        super(conditionType, comparisonOperation, formula1, formula2);
-        setDefaults();
-    }
-    private void setDefaults() {
-        // Set modification flags to 1: by default options are not modified
-        formatting_options = modificationBits.setValue(formatting_options, -1);
-        // Set formatting block flags to 0 (no formatting blocks)
-        formatting_options = fmtBlockBits.setValue(formatting_options, 0);
-        formatting_options = undocumented.clear(formatting_options);
-
-        formatting_not_used = (short)0x8002; // Excel seems to write this value, but it doesn't seem to care what it reads
-        _fontFormatting = null;
-        _borderFormatting = null;
-        _patternFormatting = null;
-    }
-
-    /**
-     * Creates a new comparison operation rule
-     * 
-     * @param sheet the sheet
-     * @param formulaText the formula text
-     * 
-     * @return a new comparison operation rule
-     */
-    public static CFRuleRecord create(HSSFSheet sheet, String formulaText) {
-        Ptg[] formula1 = parseFormula(formulaText, sheet);
-        return new CFRuleRecord(CONDITION_TYPE_FORMULA, ComparisonOperator.NO_COMPARISON,
-                formula1, null);
-    }
-    /**
-     * Creates a new comparison operation rule
-     * 
-     * @param sheet the sheet
-     * @param comparisonOperation the comparison operation
-     * @param formulaText1 the first formula text
-     * @param formulaText2 the second formula text
-     * 
-     * @return a new comparison operation rule
-     */
-    public static CFRuleRecord create(HSSFSheet sheet, byte comparisonOperation,
-            String formulaText1, String formulaText2) {
-        Ptg[] formula1 = parseFormula(formulaText1, sheet);
-        Ptg[] formula2 = parseFormula(formulaText2, sheet);
-        return new CFRuleRecord(CONDITION_TYPE_CELL_VALUE_IS, comparisonOperation, formula1, formula2);
-    }
-
-    public CFRuleRecord(RecordInputStream in) {
-        setConditionType(in.readByte());
-        setComparisonOperation(in.readByte());
-        int field_3_formula1_len = in.readUShort();
-        int field_4_formula2_len = in.readUShort();
-        readFormatOptions(in);
-
-        // "You may not use unions, intersections or array constants in Conditional Formatting criteria"
-        setFormula1(Formula.read(field_3_formula1_len, in));
-        setFormula2(Formula.read(field_4_formula2_len, in));
-    }
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * 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.
-     *
-     * @param out the stream to write to
-     */
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        int formula1Len=getFormulaSize(getFormula1());
-        int formula2Len=getFormulaSize(getFormula2());
-
-        out.writeByte(getConditionType());
-        out.writeByte(getComparisonOperation());
-        out.writeShort(formula1Len);
-        out.writeShort(formula2Len);
-        
-        serializeFormattingBlock(out);
-
-        getFormula1().serializeTokens(out);
-        getFormula2().serializeTokens(out);
-    }
-
-    @Override
-    protected int getDataSize() {
-        return 6 + getFormattingBlockSize() +
-               getFormulaSize(getFormula1())+
-               getFormulaSize(getFormula2());
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("[CFRULE]\n");
-        buffer.append("    .condition_type   =").append(getConditionType()).append("\n");
-        buffer.append("    OPTION FLAGS=0x").append(Integer.toHexString(getOptions())).append("\n");
-        if (containsFontFormattingBlock()) {
-            buffer.append(_fontFormatting.toString()).append("\n");
-        }
-        if (containsBorderFormattingBlock()) {
-            buffer.append(_borderFormatting.toString()).append("\n");
-        }
-        if (containsPatternFormattingBlock()) {
-            buffer.append(_patternFormatting.toString()).append("\n");
-        }
-        buffer.append("    Formula 1 =").append(Arrays.toString(getFormula1().getTokens())).append("\n");
-        buffer.append("    Formula 2 =").append(Arrays.toString(getFormula2().getTokens())).append("\n");
-        buffer.append("[/CFRULE]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public CFRuleRecord clone() {
-        CFRuleRecord rec = new CFRuleRecord(getConditionType(), getComparisonOperation());
-        super.copyTo(rec);
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java
deleted file mode 100644
index 88cebe2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-/**
- * XCT - CRN Count <P>
- *
- * REFERENCE:  5.114<P>
- *
- * @author Josh Micich
- */
-public final class CRNCountRecord extends StandardRecord {
-	public final static short sid = 0x59;
-
-	private static final short DATA_SIZE = 4;
-
-
-	private int	 field_1_number_crn_records;
-	private int	 field_2_sheet_table_index;
-
-	public CRNCountRecord() {
-		throw new RuntimeException("incomplete code");
-	}
-
-	public int getNumberOfCRNs() {
-		return field_1_number_crn_records;
-	}
-
-
-	public CRNCountRecord(RecordInputStream in) {
-		field_1_number_crn_records = in.readShort();
-		if(field_1_number_crn_records < 0) {
-			// TODO - seems like the sign bit of this field might be used for some other purpose
-			// see example file for test case "TestBugs.test19599()"
-			field_1_number_crn_records = (short)-field_1_number_crn_records;
-		}
-		field_2_sheet_table_index = in.readShort();
-	 }
-
-
-	public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(getClass().getName()).append(" [XCT");
-        sb.append(" nCRNs=").append(field_1_number_crn_records);
-        sb.append(" sheetIx=").append(field_2_sheet_table_index);
-        sb.append("]");
-        return sb.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort((short)field_1_number_crn_records);
-		out.writeShort((short)field_2_sheet_table_index);
-	}
-	protected int getDataSize() {
-		return DATA_SIZE;
-	}
-
-	/**
-	 * return the non static version of the id for this record.
-	 */
-	public short getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java
deleted file mode 100644
index 1192187..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.constant.ConstantValueParser;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:       CRN(0x005A)<p>
- * Description: This record stores the contents of an external cell or cell range<p>
- * REFERENCE:   OOO 5.23
- */
-public final class CRNRecord extends StandardRecord {
-	public final static short sid = 0x005A;
-
-	private int	 field_1_last_column_index;
-	private int	 field_2_first_column_index;
-	private int	 field_3_row_index;
-	private Object[] field_4_constant_values;
-
-	public CRNRecord() {
-		throw new RuntimeException("incomplete code");
-	}
-
-	public int getNumberOfCRNs() {
-		return field_1_last_column_index;
-	}
-
-
-	public CRNRecord(RecordInputStream in) {
-		field_1_last_column_index = in.readUByte();
-		field_2_first_column_index = in.readUByte();
-		field_3_row_index = in.readShort();
-		int nValues = field_1_last_column_index - field_2_first_column_index + 1;
-		field_4_constant_values = ConstantValueParser.parse(in, nValues);
-	}
-
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append(getClass().getName()).append(" [CRN");
-		sb.append(" rowIx=").append(field_3_row_index);
-		sb.append(" firstColIx=").append(field_2_first_column_index);
-		sb.append(" lastColIx=").append(field_1_last_column_index);
-		sb.append("]");
-		return sb.toString();
-	}
-	protected int getDataSize() {
-		return 4 + ConstantValueParser.getEncodedSize(field_4_constant_values);
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeByte(field_1_last_column_index);
-		out.writeByte(field_2_first_column_index);
-		out.writeShort(field_3_row_index);
-		ConstantValueParser.encode(out, field_4_constant_values);
-	}
-
-	/**
-	 * return the non static version of the id for this record.
-	 */
-	public short getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
deleted file mode 100644
index f416def..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Calc Count Record
- * Description:  Specifies the maximum times the gui should perform a formula
- *               recalculation.  For instance: in the case a formula includes
- *               cells that are themselves a result of a formula and a value
- *               changes.  This is essentially a failsafe against an infinate
- *               loop in the event the formulas are not independant. <P>
- * REFERENCE:  PG 292 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @version 2.0-pre
- * @see org.apache.poi.hssf.record.CalcModeRecord
- */
-
-public final class CalcCountRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0xC;
-    private short             field_1_iterations;
-
-    public CalcCountRecord()
-    {
-    }
-
-    public CalcCountRecord(RecordInputStream in)
-    {
-        field_1_iterations = in.readShort();
-    }
-
-    /**
-     * set the number of iterations to perform
-     * @param iterations to perform
-     */
-
-    public void setIterations(short iterations)
-    {
-        field_1_iterations = iterations;
-    }
-
-    /**
-     * get the number of iterations to perform
-     * @return iterations
-     */
-
-    public short getIterations()
-    {
-        return field_1_iterations;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[CALCCOUNT]\n");
-        buffer.append("    .iterations     = ")
-            .append(Integer.toHexString(getIterations())).append("\n");
-        buffer.append("[/CALCCOUNT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getIterations());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public CalcCountRecord clone() {
-      CalcCountRecord rec = new CalcCountRecord();
-      rec.field_1_iterations = field_1_iterations;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
deleted file mode 100644
index 9f74ecf..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
+++ /dev/null
@@ -1,127 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Calc Mode Record<P>
- * Description:  Tells the gui whether to calculate formulas
- *               automatically, manually or automatically
- *               except for tables.<P>
- * REFERENCE:  PG 292 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- * @see org.apache.poi.hssf.record.CalcCountRecord
- */
-
-public final class CalcModeRecord extends StandardRecord implements Cloneable {
-    public final static short sid                     = 0xD;
-
-    /**
-     * manually calculate formulas (0)
-     */
-
-    public final static short MANUAL                  = 0;
-
-    /**
-     * automatically calculate formulas (1)
-     */
-
-    public final static short AUTOMATIC               = 1;
-
-    /**
-     * automatically calculate formulas except for tables (-1)
-     */
-
-    public final static short AUTOMATIC_EXCEPT_TABLES = -1;
-    private short             field_1_calcmode;
-
-    public CalcModeRecord()
-    {
-    }
-
-    public CalcModeRecord(RecordInputStream in)
-    {
-        field_1_calcmode = in.readShort();
-    }
-
-    /**
-     * set the calc mode flag for formulas
-     *
-     * @see #MANUAL
-     * @see #AUTOMATIC
-     * @see #AUTOMATIC_EXCEPT_TABLES
-     *
-     * @param calcmode one of the three flags above
-     */
-
-    public void setCalcMode(short calcmode)
-    {
-        field_1_calcmode = calcmode;
-    }
-
-    /**
-     * get the calc mode flag for formulas
-     *
-     * @see #MANUAL
-     * @see #AUTOMATIC
-     * @see #AUTOMATIC_EXCEPT_TABLES
-     *
-     * @return calcmode one of the three flags above
-     */
-
-    public short getCalcMode()
-    {
-        return field_1_calcmode;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[CALCMODE]\n");
-        buffer.append("    .calcmode       = ")
-            .append(Integer.toHexString(getCalcMode())).append("\n");
-        buffer.append("[/CALCMODE]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getCalcMode());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public CalcModeRecord clone() {
-      CalcModeRecord rec = new CalcModeRecord();
-      rec.field_1_calcmode = field_1_calcmode;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CellRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CellRecord.java
deleted file mode 100644
index 5ae7abe..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CellRecord.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Base class for all cell value records (implementors of {@link CellValueRecordInterface}).
- * Subclasses are expected to manage the cell data values (of various types).
- */
-public abstract class CellRecord extends StandardRecord implements CellValueRecordInterface {
-    private int _rowIndex;
-    private int _columnIndex;
-    private int _formatIndex;
-
-    protected CellRecord() {
-        // fields uninitialised
-    }
-
-    protected CellRecord(RecordInputStream in) {
-        _rowIndex = in.readUShort();
-        _columnIndex = in.readUShort();
-        _formatIndex = in.readUShort();
-    }
-
-    @Override
-    public final void setRow(int row) {
-        _rowIndex = row;
-    }
-
-    @Override
-    public final void setColumn(short col) {
-        _columnIndex = col;
-    }
-
-    /**
-     * set the index to the ExtendedFormat
-     *
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     * @param xf index to the XF record
-     */
-    @Override
-    public final void setXFIndex(short xf) {
-        _formatIndex = xf;
-    }
-
-    @Override
-    public final int getRow() {
-        return _rowIndex;
-    }
-
-    @Override
-    public final short getColumn() {
-        return (short) _columnIndex;
-    }
-
-    /**
-     * get the index to the ExtendedFormat
-     *
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     * @return index to the XF record
-     */
-    @Override
-    public final short getXFIndex() {
-        return (short) _formatIndex;
-    }
-
-    @Override
-    public final String toString() {
-        StringBuilder sb = new StringBuilder();
-        String recordName = getRecordName();
-
-        sb.append("[").append(recordName).append("]\n");
-        sb.append("    .row    = ").append(HexDump.shortToHex(getRow())).append("\n");
-        sb.append("    .col    = ").append(HexDump.shortToHex(getColumn())).append("\n");
-        sb.append("    .xfindex= ").append(HexDump.shortToHex(getXFIndex())).append("\n");
-        appendValueText(sb);
-        sb.append("\n");
-        sb.append("[/").append(recordName).append("]\n");
-        return sb.toString();
-    }
-
-    /**
-     * Append specific debug info (used by {@link #toString()} for the value
-     * contained in this record. Trailing new-line should not be appended
-     * (superclass does that).
-     * 
-     * @param sb the StringBuilder to write to
-     */
-    protected abstract void appendValueText(StringBuilder sb);
-
-    /**
-     * Gets the debug info BIFF record type name (used by {@link #toString()}.
-     * 
-     * @return the record type name
-     */
-    protected abstract String getRecordName();
-
-    /**
-     * writes out the value data for this cell record
-     * 
-     * @param out the output
-     */
-    protected abstract void serializeValue(LittleEndianOutput out);
-
-    /**
-     * @return the size (in bytes) of the value data for this cell record
-     */
-    protected abstract int getValueDataSize();
-
-    @Override
-    public final void serialize(LittleEndianOutput out) {
-        out.writeShort(getRow());
-        out.writeShort(getColumn());
-        out.writeShort(getXFIndex());
-        serializeValue(out);
-    }
-
-    @Override
-    protected final int getDataSize() {
-        return 6 + getValueDataSize();
-    }
-
-    protected final void copyBaseFields(CellRecord rec) {
-        rec._rowIndex = _rowIndex;
-        rec._columnIndex = _columnIndex;
-        rec._formatIndex = _formatIndex;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CellValueRecordInterface.java b/trunk/src/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
deleted file mode 100644
index c91a400..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-/**
- * The cell value record interface is implemented by all classes of type Record that
- * contain cell values.  It allows the containing sheet to move through them and compare
- * them.
- *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- *
- * @see org.apache.poi.hssf.record.Record
- * @see org.apache.poi.hssf.record.RecordFactory
- */
-public interface CellValueRecordInterface {
-
-    /**
-     * @return the row this cell occurs on
-     */
-    int getRow();
-
-    /**
-     * @return the column this cell defines within the row
-     */
-    short getColumn();
-
-    /**
-     * @param row the row this cell occurs within
-     */
-    void setRow(int row);
-
-    /**
-     * @param col the column this cell defines
-     */
-    void setColumn(short col);
-
-    void setXFIndex(short xf);
-
-    short getXFIndex();
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java
deleted file mode 100644
index 59f69af..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Codepage Record
- * <p>Description:  the default characterset. for the workbook</p>
- * <p>REFERENCE:  PG 293 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)</p>
- * <p>Use {@link CodePageUtil} to turn these values into Java code pages
- *  to encode/decode strings.</p>
- * @version 2.0-pre
- */
-
-public final class CodepageRecord
-    extends StandardRecord
-{
-    public final static short sid = 0x42;
-    private short             field_1_codepage;   // = 0;
-
-    /**
-     * Excel 97+ (Biff 8) should always store strings as UTF-16LE or
-     *  compressed versions of that. As such, this should always be
-     *  0x4b0 = UTF_16, except for files coming from older versions.
-     */
-    public final static short CODEPAGE = ( short ) 0x4b0;
-
-    public CodepageRecord()
-    {
-    }
-
-    public CodepageRecord(RecordInputStream in)
-    {
-        field_1_codepage = in.readShort();
-    }
-
-    /**
-     * set the codepage for this workbook
-     *
-     * @see #CODEPAGE
-     * @param cp the codepage to set
-     */
-
-    public void setCodepage(short cp)
-    {
-        field_1_codepage = cp;
-    }
-
-    /**
-     * get the codepage for this workbook
-     *
-     * @see #CODEPAGE
-     * @return codepage - the codepage to set
-     */
-
-    public short getCodepage()
-    {
-        return field_1_codepage;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[CODEPAGE]\n");
-        buffer.append("    .codepage        = ")
-            .append(Integer.toHexString(getCodepage())).append("\n");
-        buffer.append("[/CODEPAGE]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getCodepage());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
deleted file mode 100644
index 1f48458..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-
-/**
- * Title: COLINFO Record (0x007D)<p>
- * Description:  Defines with width and formatting for a range of columns<p>
- * REFERENCE:  PG 293 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class ColumnInfoRecord extends StandardRecord implements Cloneable {
-    public static final short sid = 0x007D;
-
-    private int _firstCol;
-    private int _lastCol;
-    private int _colWidth;
-    private int _xfIndex;
-    private int _options;
-    private static final BitField hidden    = BitFieldFactory.getInstance(0x01);
-    private static final BitField outlevel  = BitFieldFactory.getInstance(0x0700);
-    private static final BitField collapsed = BitFieldFactory.getInstance(0x1000);
-    // Excel seems write values 2, 10, and 260, even though spec says "must be zero"
-    private int field_6_reserved;
-
-    /**
-     * Creates a column info record with default width and format
-     */
-    public ColumnInfoRecord() {
-        setColumnWidth(2275);
-        _options = 2;
-        _xfIndex = 0x0f;
-        field_6_reserved = 2; // seems to be the most common value
-    }
-
-    public ColumnInfoRecord(RecordInputStream in) {
-        _firstCol = in.readUShort();
-        _lastCol  = in.readUShort();
-        _colWidth = in.readUShort();
-        _xfIndex  = in.readUShort();
-        _options   = in.readUShort();
-        switch(in.remaining()) {
-            case 2: // usual case
-                field_6_reserved  = in.readUShort();
-                break;
-            case 1:
-                // often COLINFO gets encoded 1 byte short
-                // shouldn't matter because this field is unused
-                field_6_reserved  = in.readByte();
-                break;
-            case 0:
-                // According to bugzilla 48332,
-                // "SoftArtisans OfficeWriter for Excel" totally skips field 6
-                // Excel seems to be OK with this, and assumes zero.
-                field_6_reserved  = 0;
-                break;
-            default:
-                throw new RuntimeException("Unusual record size remaining=(" + in.remaining() + ")");
-        }
-    }
-
-    /**
-     * set the first column this record defines formatting info for
-     * @param fc - the first column index (0-based)
-     */
-    public void setFirstColumn(int fc) {
-        _firstCol = fc;
-    }
-
-    /**
-     * set the last column this record defines formatting info for
-     * @param lc - the last column index (0-based)
-     */
-    public void setLastColumn(int lc) {
-        _lastCol = lc;
-    }
-
-    /**
-     * set the columns' width in 1/256 of a character width
-     * @param cw - column width
-     */
-    public void setColumnWidth(int cw) {
-        _colWidth = cw;
-    }
-
-    /**
-     * set the columns' default format info
-     * @param xfi - the extended format index
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     */
-    public void setXFIndex(int xfi) {
-        _xfIndex = xfi;
-    }
-
-    /**
-     * set whether or not these cells are hidden
-     * @param ishidden - whether the cells are hidden.
-     */
-    public void setHidden(boolean ishidden) {
-        _options = hidden.setBoolean(_options, ishidden);
-    }
-
-    /**
-     * set the outline level for the cells
-     * @param olevel -outline level for the cells
-     */
-    public void setOutlineLevel(int olevel) {
-        _options = outlevel.setValue(_options, olevel);
-    }
-
-    /**
-     * set whether the cells are collapsed
-     * @param isCollapsed - whether the cells are collapsed
-     */
-    public void setCollapsed(boolean isCollapsed) {
-        _options = collapsed.setBoolean(_options, isCollapsed);
-    }
-
-    /**
-     * get the first column this record defines formatting info for
-     * @return the first column index (0-based)
-     */
-    public int getFirstColumn() {
-        return _firstCol;
-    }
-
-    /**
-     * get the last column this record defines formatting info for
-     * @return the last column index (0-based)
-     */
-    public int getLastColumn() {
-        return _lastCol;
-    }
-
-    /**
-     * @return column width in units of 1/256 of a character width
-     */
-    public int getColumnWidth() {
-        return _colWidth;
-    }
-
-    /**
-     * get the columns' default format info
-     * @return the extended format index
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     */
-    public int getXFIndex() {
-        return _xfIndex;
-    }
-
-    /**
-     * @return whether the cells are hidden.
-     */
-    public boolean getHidden() {
-        return hidden.isSet(_options);
-    }
-
-    /**
-     * @return outline level for the cells
-     */
-    public int getOutlineLevel() {
-        return outlevel.getValue(_options);
-    }
-
-    /**
-     * @return whether the cells are collapsed
-     */
-    public boolean getCollapsed() {
-        return collapsed.isSet(_options);
-    }
-
-    public boolean containsColumn(int columnIndex) {
-        return _firstCol <= columnIndex && columnIndex <= _lastCol;
-    }
-    public boolean isAdjacentBefore(ColumnInfoRecord other) {
-        return _lastCol == other._firstCol - 1;
-    }
-
-    /**
-     * @param other the format to match with
-     * 
-     * @return {@code true} if the format, options and column width match
-     */
-    public boolean formatMatches(ColumnInfoRecord other) {
-        if (_xfIndex != other._xfIndex) {
-            return false;
-        }
-        if (_options != other._options) {
-            return false;
-        }
-        if (_colWidth != other._colWidth) {
-            return false;
-        }
-        return true;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getFirstColumn());
-        out.writeShort(getLastColumn());
-        out.writeShort(getColumnWidth());
-        out.writeShort(getXFIndex());
-        out.writeShort(_options);
-        out.writeShort(field_6_reserved);
-    }
-
-    protected int getDataSize() {
-        return 12;
-    }
-
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("[COLINFO]\n");
-        sb.append("  colfirst = ").append(getFirstColumn()).append("\n");
-        sb.append("  collast  = ").append(getLastColumn()).append("\n");
-        sb.append("  colwidth = ").append(getColumnWidth()).append("\n");
-        sb.append("  xfindex  = ").append(getXFIndex()).append("\n");
-        sb.append("  options  = ").append(HexDump.shortToHex(_options)).append("\n");
-        sb.append("    hidden   = ").append(getHidden()).append("\n");
-        sb.append("    olevel   = ").append(getOutlineLevel()).append("\n");
-        sb.append("    collapsed= ").append(getCollapsed()).append("\n");
-        sb.append("[/COLINFO]\n");
-        return sb.toString();
-    }
-
-    @Override
-    public ColumnInfoRecord clone() {
-        ColumnInfoRecord rec = new ColumnInfoRecord();
-        rec._firstCol = _firstCol;
-        rec._lastCol = _lastCol;
-        rec._colWidth = _colWidth;
-        rec._xfIndex = _xfIndex;
-        rec._options = _options;
-        rec.field_6_reserved = field_6_reserved;
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
deleted file mode 100644
index 18be70c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The common object data record is used to store all common preferences for an excel object.
- */
-public final class CommonObjectDataSubRecord extends SubRecord implements Cloneable {
-    public final static short sid = 0x0015;
-
-    private static final BitField locked    = BitFieldFactory.getInstance(0x0001);
-    private static final BitField printable = BitFieldFactory.getInstance(0x0010);
-    private static final BitField autofill  = BitFieldFactory.getInstance(0x2000);
-    private static final BitField autoline  = BitFieldFactory.getInstance(0x4000);
-
-    public final static short OBJECT_TYPE_GROUP              = 0;
-    public final static short OBJECT_TYPE_LINE               = 1;
-    public final static short OBJECT_TYPE_RECTANGLE          = 2;
-    public final static short OBJECT_TYPE_OVAL               = 3;
-    public final static short OBJECT_TYPE_ARC                = 4;
-    public final static short OBJECT_TYPE_CHART              = 5;
-    public final static short OBJECT_TYPE_TEXT               = 6;
-    public final static short OBJECT_TYPE_BUTTON             = 7;
-    public final static short OBJECT_TYPE_PICTURE            = 8;
-    public final static short OBJECT_TYPE_POLYGON            = 9;
-    public final static short OBJECT_TYPE_RESERVED1          = 10;
-    public final static short OBJECT_TYPE_CHECKBOX           = 11;
-    public final static short OBJECT_TYPE_OPTION_BUTTON      = 12;
-    public final static short OBJECT_TYPE_EDIT_BOX           = 13;
-    public final static short OBJECT_TYPE_LABEL              = 14;
-    public final static short OBJECT_TYPE_DIALOG_BOX         = 15;
-    public final static short OBJECT_TYPE_SPINNER            = 16;
-    public final static short OBJECT_TYPE_SCROLL_BAR         = 17;
-    public final static short OBJECT_TYPE_LIST_BOX           = 18;
-    public final static short OBJECT_TYPE_GROUP_BOX          = 19;
-    public final static short OBJECT_TYPE_COMBO_BOX          = 20;
-    public final static short OBJECT_TYPE_RESERVED2          = 21;
-    public final static short OBJECT_TYPE_RESERVED3          = 22;
-    public final static short OBJECT_TYPE_RESERVED4          = 23;
-    public final static short OBJECT_TYPE_RESERVED5          = 24;
-    public final static short OBJECT_TYPE_COMMENT            = 25;
-    public final static short OBJECT_TYPE_RESERVED6          = 26;
-    public final static short OBJECT_TYPE_RESERVED7          = 27;
-    public final static short OBJECT_TYPE_RESERVED8          = 28;
-    public final static short OBJECT_TYPE_RESERVED9          = 29;
-    public final static short OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 30;
-    
-    private  short      field_1_objectType;
-    private  int        field_2_objectId;
-    private  short      field_3_option;
-    private  int        field_4_reserved1;
-    private  int        field_5_reserved2;
-    private  int        field_6_reserved3;
-
-
-    public CommonObjectDataSubRecord()
-    {
-
-    }
-
-    public CommonObjectDataSubRecord(LittleEndianInput in, int size) {
-        if (size != 18) {
-            throw new RecordFormatException("Expected size 18 but got (" + size + ")");
-        }
-        field_1_objectType             = in.readShort();
-        field_2_objectId               = in.readUShort();
-        field_3_option                 = in.readShort();
-        field_4_reserved1              = in.readInt();
-        field_5_reserved2              = in.readInt();
-        field_6_reserved3              = in.readInt();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[ftCmo]\n");
-        buffer.append("    .objectType           = ")
-            .append("0x").append(HexDump.toHex(  getObjectType ()))
-            .append(" (").append( getObjectType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .objectId             = ")
-            .append("0x").append(HexDump.toHex(  getObjectId ()))
-            .append(" (").append( getObjectId() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .option               = ")
-            .append("0x").append(HexDump.toHex(  getOption ()))
-            .append(" (").append( getOption() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .locked                   = ").append(isLocked()).append('\n'); 
-        buffer.append("         .printable                = ").append(isPrintable()).append('\n'); 
-        buffer.append("         .autofill                 = ").append(isAutofill()).append('\n'); 
-        buffer.append("         .autoline                 = ").append(isAutoline()).append('\n'); 
-        buffer.append("    .reserved1            = ")
-            .append("0x").append(HexDump.toHex(  getReserved1 ()))
-            .append(" (").append( getReserved1() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .reserved2            = ")
-            .append("0x").append(HexDump.toHex(  getReserved2 ()))
-            .append(" (").append( getReserved2() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .reserved3            = ")
-            .append("0x").append(HexDump.toHex(  getReserved3 ()))
-            .append(" (").append( getReserved3() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/ftCmo]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-
-        out.writeShort(sid);
-        out.writeShort(getDataSize());
-
-        out.writeShort(field_1_objectType);
-        out.writeShort(field_2_objectId);
-        out.writeShort(field_3_option);
-        out.writeInt(field_4_reserved1);
-        out.writeInt(field_5_reserved2);
-        out.writeInt(field_6_reserved3);
-    }
-
-	@Override
-    protected int getDataSize() {
-        return 2 + 2 + 2 + 4 + 4 + 4;
-    }
-
-	/**
-	 * @return the record sid
-	 */
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public CommonObjectDataSubRecord clone() {
-        CommonObjectDataSubRecord rec = new CommonObjectDataSubRecord();
-    
-        rec.field_1_objectType = field_1_objectType;
-        rec.field_2_objectId = field_2_objectId;
-        rec.field_3_option = field_3_option;
-        rec.field_4_reserved1 = field_4_reserved1;
-        rec.field_5_reserved2 = field_5_reserved2;
-        rec.field_6_reserved3 = field_6_reserved3;
-        return rec;
-    }
-
-
-    /**
-     * Get the object type field for the CommonObjectData record.
-     *
-     * @return  One of 
-     *        OBJECT_TYPE_GROUP
-     *        OBJECT_TYPE_LINE
-     *        OBJECT_TYPE_RECTANGLE
-     *        OBJECT_TYPE_OVAL
-     *        OBJECT_TYPE_ARC
-     *        OBJECT_TYPE_CHART
-     *        OBJECT_TYPE_TEXT
-     *        OBJECT_TYPE_BUTTON
-     *        OBJECT_TYPE_PICTURE
-     *        OBJECT_TYPE_POLYGON
-     *        OBJECT_TYPE_RESERVED1
-     *        OBJECT_TYPE_CHECKBOX
-     *        OBJECT_TYPE_OPTION_BUTTON
-     *        OBJECT_TYPE_EDIT_BOX
-     *        OBJECT_TYPE_LABEL
-     *        OBJECT_TYPE_DIALOG_BOX
-     *        OBJECT_TYPE_SPINNER
-     *        OBJECT_TYPE_SCROLL_BAR
-     *        OBJECT_TYPE_LIST_BOX
-     *        OBJECT_TYPE_GROUP_BOX
-     *        OBJECT_TYPE_COMBO_BOX
-     *        OBJECT_TYPE_RESERVED2
-     *        OBJECT_TYPE_RESERVED3
-     *        OBJECT_TYPE_RESERVED4
-     *        OBJECT_TYPE_RESERVED5
-     *        OBJECT_TYPE_COMMENT
-     *        OBJECT_TYPE_RESERVED6
-     *        OBJECT_TYPE_RESERVED7
-     *        OBJECT_TYPE_RESERVED8
-     *        OBJECT_TYPE_RESERVED9
-     *        OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING
-     */
-    public short getObjectType()
-    {
-        return field_1_objectType;
-    }
-
-    /**
-     * Set the object type field for the CommonObjectData record.
-     *
-     * @param field_1_objectType
-     *        One of 
-     *        OBJECT_TYPE_GROUP
-     *        OBJECT_TYPE_LINE
-     *        OBJECT_TYPE_RECTANGLE
-     *        OBJECT_TYPE_OVAL
-     *        OBJECT_TYPE_ARC
-     *        OBJECT_TYPE_CHART
-     *        OBJECT_TYPE_TEXT
-     *        OBJECT_TYPE_BUTTON
-     *        OBJECT_TYPE_PICTURE
-     *        OBJECT_TYPE_POLYGON
-     *        OBJECT_TYPE_RESERVED1
-     *        OBJECT_TYPE_CHECKBOX
-     *        OBJECT_TYPE_OPTION_BUTTON
-     *        OBJECT_TYPE_EDIT_BOX
-     *        OBJECT_TYPE_LABEL
-     *        OBJECT_TYPE_DIALOG_BOX
-     *        OBJECT_TYPE_SPINNER
-     *        OBJECT_TYPE_SCROLL_BAR
-     *        OBJECT_TYPE_LIST_BOX
-     *        OBJECT_TYPE_GROUP_BOX
-     *        OBJECT_TYPE_COMBO_BOX
-     *        OBJECT_TYPE_RESERVED2
-     *        OBJECT_TYPE_RESERVED3
-     *        OBJECT_TYPE_RESERVED4
-     *        OBJECT_TYPE_RESERVED5
-     *        OBJECT_TYPE_COMMENT
-     *        OBJECT_TYPE_RESERVED6
-     *        OBJECT_TYPE_RESERVED7
-     *        OBJECT_TYPE_RESERVED8
-     *        OBJECT_TYPE_RESERVED9
-     *        OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING
-     */
-    public void setObjectType(short field_1_objectType)
-    {
-        this.field_1_objectType = field_1_objectType;
-    }
-
-    /**
-     * Get the object id field for the CommonObjectData record.
-     * 
-     * @return the object id field
-     */
-    public int getObjectId()
-    {
-        return field_2_objectId;
-    }
-
-    /**
-     * Set the object id field for the CommonObjectData record.
-     * 
-     * @param field_2_objectId the object id field
-     */
-    public void setObjectId(int field_2_objectId)
-    {
-        this.field_2_objectId = field_2_objectId;
-    }
-
-    /**
-     * Get the option field for the CommonObjectData record.
-     * 
-     * @return the option field
-     */
-    public short getOption()
-    {
-        return field_3_option;
-    }
-
-    /**
-     * Set the option field for the CommonObjectData record.
-     * 
-     * @param field_3_option the option field
-     */
-    public void setOption(short field_3_option)
-    {
-        this.field_3_option = field_3_option;
-    }
-
-    /**
-     * Get the reserved1 field for the CommonObjectData record.
-     * 
-     * @return the reserved1 field
-     */
-    public int getReserved1()
-    {
-        return field_4_reserved1;
-    }
-
-    /**
-     * Set the reserved1 field for the CommonObjectData record.
-     * 
-     * @param field_4_reserved1 the reserved1 field
-     */
-    public void setReserved1(int field_4_reserved1)
-    {
-        this.field_4_reserved1 = field_4_reserved1;
-    }
-
-    /**
-     * Get the reserved2 field for the CommonObjectData record.
-     * 
-     * @return the reserved2 field
-     */
-    public int getReserved2()
-    {
-        return field_5_reserved2;
-    }
-
-    /**
-     * Set the reserved2 field for the CommonObjectData record.
-     * 
-     * @param field_5_reserved2 the reserved2 field
-     */
-    public void setReserved2(int field_5_reserved2)
-    {
-        this.field_5_reserved2 = field_5_reserved2;
-    }
-
-    /**
-     * Get the reserved3 field for the CommonObjectData record.
-     * 
-     * @return the reserved3 field
-     */
-    public int getReserved3()
-    {
-        return field_6_reserved3;
-    }
-
-    /**
-     * Set the reserved3 field for the CommonObjectData record.
-     * 
-     * @param field_6_reserved3 the reserved3 field
-     */
-    public void setReserved3(int field_6_reserved3)
-    {
-        this.field_6_reserved3 = field_6_reserved3;
-    }
-
-    /**
-     * Sets the locked field value.
-     * true if object is locked when sheet has been protected
-     * 
-     * @param value {@code true} if object is locked when sheet has been protected
-     */
-    public void setLocked(boolean value)
-    {
-        field_3_option = locked.setShortBoolean(field_3_option, value);
-    }
-
-    /**
-     * true if object is locked when sheet has been protected
-     * @return  the locked field value.
-     */
-    public boolean isLocked()
-    {
-        return locked.isSet(field_3_option);
-    }
-
-    /**
-     * Sets the printable field value.
-     * object appears when printed
-     * 
-     * @param value {@code true} if object appears when printed
-     */
-    public void setPrintable(boolean value)
-    {
-        field_3_option = printable.setShortBoolean(field_3_option, value);
-    }
-
-    /**
-     * object appears when printed
-     * @return  the printable field value.
-     */
-    public boolean isPrintable()
-    {
-        return printable.isSet(field_3_option);
-    }
-
-    /**
-     * Sets the autofill field value.
-     * whether object uses an automatic fill style
-     * 
-     * @param value {@code true} if object uses an automatic fill style
-     */
-    public void setAutofill(boolean value)
-    {
-        field_3_option = autofill.setShortBoolean(field_3_option, value);
-    }
-
-    /**
-     * whether object uses an automatic fill style
-     * @return  the autofill field value.
-     */
-    public boolean isAutofill()
-    {
-        return autofill.isSet(field_3_option);
-    }
-
-    /**
-     * Sets the autoline field value.
-     * whether object uses an automatic line style
-     * 
-     * @param value {@code true} if object uses an automatic line style
-     */
-    public void setAutoline(boolean value)
-    {
-        field_3_option = autoline.setShortBoolean(field_3_option, value);
-    }
-
-    /**
-     * whether object uses an automatic line style
-     * @return  the autoline field value.
-     */
-    public boolean isAutoline()
-    {
-        return autoline.isSet(field_3_option);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java
deleted file mode 100644
index 17a0c51..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Continue Record(0x003C) - Helper class used primarily for SST Records <P>
- * Description:  handles overflow for prior record in the input
- *               stream; content is tailored to that prior record<P>
- * @author Marc Johnson (mjohnson at apache dot org)
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Csaba Nagy (ncsaba at yahoo dot com)
- */
-public final class ContinueRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x003C;
-    private byte[] _data;
-
-    public ContinueRecord(byte[] data) {
-        _data = data;
-    }
-
-    protected int getDataSize() {
-        return _data.length;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.write(_data);
-    }
-
-    /**
-     * get the data for continuation
-     * @return byte array containing all of the continued data
-     */
-    public byte[] getData() {
-        return _data;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[CONTINUE RECORD]\n");
-        buffer.append("    .data = ").append(HexDump.toHex(_data)).append("\n");
-        buffer.append("[/CONTINUE RECORD]\n");
-        return buffer.toString();
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public ContinueRecord(RecordInputStream in) {
-        _data = in.readRemainder();
-    }
-
-    @Override
-    public ContinueRecord clone() {
-        return new ContinueRecord(_data);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java b/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java
deleted file mode 100644
index 44181aa..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java
+++ /dev/null
@@ -1,123 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Country Record (aka WIN.INI country)<P>
- * Description:  used for localization.  Currently HSSF always sets this to 1
- * and it seems to work fine even in Germany.  (es geht's auch fuer Deutschland)<P>
- *
- * REFERENCE:  PG 298 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-
-public final class CountryRecord
-    extends StandardRecord
-{
-    public final static short sid = 0x8c;
-
-    // 1 for US
-    private short             field_1_default_country;
-    private short             field_2_current_country;
-
-    public CountryRecord()
-    {
-    }
-
-    public CountryRecord(RecordInputStream in)
-    {
-        field_1_default_country = in.readShort();
-        field_2_current_country = in.readShort();
-    }
-
-    /**
-     * sets the default country
-     *
-     * @param country ID to set (1 = US)
-     */
-
-    public void setDefaultCountry(short country)
-    {
-        field_1_default_country = country;
-    }
-
-    /**
-     * sets the current country
-     *
-     * @param country ID to set (1 = US)
-     */
-
-    public void setCurrentCountry(short country)
-    {
-        field_2_current_country = country;
-    }
-
-    /**
-     * gets the default country
-     *
-     * @return country ID (1 = US)
-     */
-
-    public short getDefaultCountry()
-    {
-        return field_1_default_country;
-    }
-
-    /**
-     * gets the current country
-     *
-     * @return country ID (1 = US)
-     */
-
-    public short getCurrentCountry()
-    {
-        return field_2_current_country;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[COUNTRY]\n");
-        buffer.append("    .defaultcountry  = ")
-            .append(Integer.toHexString(getDefaultCountry())).append("\n");
-        buffer.append("    .currentcountry  = ")
-            .append(Integer.toHexString(getCurrentCountry())).append("\n");
-        buffer.append("[/COUNTRY]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getDefaultCountry());
-        out.writeShort(getCurrentCountry());
-    }
-
-    protected int getDataSize() {
-        return 4;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
deleted file mode 100644
index c4080f0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        DBCell Record (0x00D7)<p>
- * Description:  Used by Excel and other MS apps to quickly find rows in the sheets.<P>
- * REFERENCE:  PG 299/440 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class DBCellRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x00D7;
-    public final static int BLOCK_SIZE = 32;
-    
-    public static final class Builder {
-        private short[] _cellOffsets;
-        private int _nCellOffsets;
-        public Builder() {
-        	_cellOffsets = new short[4];
-		}
-
-        public void addCellOffset(int cellRefOffset) {
-            if (_cellOffsets.length <= _nCellOffsets) {
-                short[] temp = new short[_nCellOffsets * 2];
-                System.arraycopy(_cellOffsets, 0, temp, 0, _nCellOffsets);
-                _cellOffsets = temp;
-            }
-            _cellOffsets[_nCellOffsets] = (short) cellRefOffset;
-            _nCellOffsets++;
-        }
-
-        public DBCellRecord build(int rowOffset) {
-            short[] cellOffsets = new short[_nCellOffsets];
-            System.arraycopy(_cellOffsets, 0, cellOffsets, 0, _nCellOffsets);
-            return new DBCellRecord(rowOffset, cellOffsets);
-        }
-    }
-    /**
-     * offset from the start of this DBCellRecord to the start of the first cell in
-     * the next DBCell block.
-     */
-    private final int     field_1_row_offset;
-    private final short[] field_2_cell_offsets;
-
-    DBCellRecord(int rowOffset, short[]cellOffsets) {
-        field_1_row_offset = rowOffset;
-        field_2_cell_offsets = cellOffsets;
-    }
-
-    public DBCellRecord(RecordInputStream in) {
-        field_1_row_offset   = in.readUShort();
-        int size = in.remaining();        
-        field_2_cell_offsets = new short[ size / 2 ];
-
-        for (int i=0;i<field_2_cell_offsets.length;i++)
-        {
-            field_2_cell_offsets[ i ] = in.readShort();
-        }
-    }
-
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DBCELL]\n");
-        buffer.append("    .rowoffset = ").append(HexDump.intToHex(field_1_row_offset)).append("\n");
-        for (int k = 0; k < field_2_cell_offsets.length; k++) {
-            buffer.append("    .cell_").append(k).append(" = ")
-                .append(HexDump.shortToHex(field_2_cell_offsets[ k ])).append("\n");
-        }
-        buffer.append("[/DBCELL]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(field_1_row_offset);
-        for (int k = 0; k < field_2_cell_offsets.length; k++) {
-            out.writeShort(field_2_cell_offsets[ k ]);
-        }
-    }
-    protected int getDataSize() {
-        return 4 + field_2_cell_offsets.length * 2;
-    }
-    
-    /**
-     * @param nBlocks number of blocks
-     * @param nRows number of rows
-     * 
-     * @return the size of the group of <tt>DBCellRecord</tt>s needed to encode
-     *         the specified number of blocks and rows
-     * 
-     * @deprecated in POI 3.15-beta2, scheduled for removal in POI 3.17 - this method is not used within POI
-     */
-    public static int calculateSizeOfRecords(int nBlocks, int nRows) {
-        // One DBCell per block.
-        // 8 bytes per DBCell (non variable section)
-        // 2 bytes per row reference
-        return nBlocks * 8 + nRows * 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public DBCellRecord clone() {
-        // safe because immutable
-        return this;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DConRefRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DConRefRecord.java
deleted file mode 100644
index 90bed26..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DConRefRecord.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hssf.record;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * DConRef records specify a range in a workbook (internal or external) that serves as a data source
- * for pivot tables or data consolidation.
- *
- * Represents a <code>DConRef</code> Structure
- * <a href="http://msdn.microsoft.com/en-us/library/dd923854(office.12).aspx">[MS-XLS s.
- * 2.4.86]</a>, and the contained <code>DConFile</code> structure
- * <a href="http://msdn.microsoft.com/en-us/library/dd950157(office.12).aspx">
- * [MS-XLS s. 2.5.69]</a>. This in turn contains a <code>XLUnicodeStringNoCch</code>
- * <a href="http://msdn.microsoft.com/en-us/library/dd910585(office.12).aspx">
- * [MS-XLS s. 2.5.296]</a>.
- *
- * <pre>
- *         _______________________________
- *        |          DConRef              |
- *(bytes) +-+-+-+-+-+-+-+-+-+-+...+-+-+-+-+
- *        |    ref    |cch|  stFile   | un|
- *        +-+-+-+-+-+-+-+-+-+-+...+-+-+-+-+
- *                              |
- *                     _________|_____________________
- *                    |DConFile / XLUnicodeStringNoCch|
- *                    +-+-+-+-+-+-+-+-+-+-+-+...+-+-+-+
- *             (bits) |h|   reserved  |      rgb      |
- *                    +-+-+-+-+-+-+-+-+-+-+-+...+-+-+-+
- * </pre>
- * Where
- * <ul>
- * <li><code>DConFile.h = 0x00</code> if the characters in<code>rgb</code> are single byte, and
- * <code>DConFile.h = 0x01</code> if they are double byte.<p>
- * If they are double byte, then
- * <ul>
- * <li> If it exists, the length of <code>DConRef.un = 2</code>. Otherwise it is 1.
- * <li> The length of <code>DConFile.rgb = (2 * DConRef.cch)</code>. Otherwise it is equal to
- * <code>DConRef.cch</code>.
- * </ul>
- * <li><code>DConRef.rgb</code> starts with <code>0x01</code> if it is an external reference,
- * and with <code>0x02</code> if it is a self-reference.
- * </ul>
- *
- * At the moment this class is read-only.
- */
-public class DConRefRecord extends StandardRecord
-{
-
-    /**
-     * The id of the record type,
-     * <code>sid = {@value}</code>
-     */
-    public static final short sid = 0x0051;
-    /**
-     * A RefU structure specifying the range of cells if this record is part of an SXTBL.
-     * <a href="http://msdn.microsoft.com/en-us/library/dd920420(office.12).aspx">
-     * [MS XLS s.2.5.211]</a>
-     */
-    private int firstRow, lastRow, firstCol, lastCol;
-    /**
-     * the number of chars in the link
-     */
-    private int charCount;
-    /**
-     * the type of characters (single or double byte)
-     */
-    private int charType;
-    /**
-     * The link's path string. This is the <code>rgb</code> field of a
-     * <code>XLUnicodeStringNoCch</code>. Therefore it will contain at least one leading special
-     * character (0x01 or 0x02) and probably other ones.<p/>
-     * @see <A href="http://msdn.microsoft.com/en-us/library/dd923491(office.12).aspx">
-     * DConFile [MS-XLS s. 2.5.77]</A> and
-     * <A href="http://msdn.microsoft.com/en-us/library/dd950157(office.12).aspx">
-     * VirtualPath [MS-XLS s. 2.5.69]</a>
-     * <p/>
-     */
-    private byte[] path;
-    /**
-     * unused bits at the end, must be set to 0.
-     */
-    private byte[] _unused;
-
-    /**
-     * Read constructor.
-     *
-     * @param data byte array containing a DConRef Record, including the header.
-     */
-    public DConRefRecord(byte[] data)
-    {
-        int offset = 0;
-        if (!(LittleEndian.getShort(data, offset) == DConRefRecord.sid))
-            throw new RecordFormatException("incompatible sid.");
-        offset += LittleEndian.SHORT_SIZE;
-
-        //length = LittleEndian.getShort(data, offset);
-        offset += LittleEndian.SHORT_SIZE;
-
-        firstRow = LittleEndian.getUShort(data, offset);
-        offset += LittleEndian.SHORT_SIZE;
-        lastRow = LittleEndian.getUShort(data, offset);
-        offset += LittleEndian.SHORT_SIZE;
-        firstCol = LittleEndian.getUByte(data, offset);
-        offset += LittleEndian.BYTE_SIZE;
-        lastCol = LittleEndian.getUByte(data, offset);
-        offset += LittleEndian.BYTE_SIZE;
-        charCount = LittleEndian.getUShort(data, offset);
-        offset += LittleEndian.SHORT_SIZE;
-        if (charCount < 2)
-            throw new org.apache.poi.hssf.record.RecordFormatException(
-                    "Character count must be >= 2");
-
-        charType = LittleEndian.getUByte(data, offset);
-        offset += LittleEndian.BYTE_SIZE; //7 bits reserved + 1 bit type
-
-        /*
-         * bytelength is the length of the string in bytes, which depends on whether the string is
-         * made of single- or double-byte chars. This is given by charType, which equals 0 if
-         * single-byte, 1 if double-byte.
-         */
-        int byteLength = charCount * ((charType & 1) + 1);
-
-        path = LittleEndian.getByteArray(data, offset, byteLength);
-        offset += byteLength;
-
-        /*
-         * If it's a self reference, the last one or two bytes (depending on char type) are the
-         * unused field. Not sure If i need to bother with this...
-         */
-        if (path[0] == 0x02)
-            _unused = LittleEndian.getByteArray(data, offset, (charType + 1));
-
-    }
-
-    /**
-     * Read Constructor.
-     *
-     * @param inStream RecordInputStream containing a DConRefRecord structure.
-     */
-    public DConRefRecord(RecordInputStream inStream)
-    {
-        if (inStream.getSid() != sid)
-            throw new RecordFormatException("Wrong sid: " + inStream.getSid());
-
-        firstRow = inStream.readUShort();
-        lastRow = inStream.readUShort();
-        firstCol = inStream.readUByte();
-        lastCol = inStream.readUByte();
-
-        charCount = inStream.readUShort();
-        charType = inStream.readUByte() & 0x01; //first bit only.
-
-        // byteLength depends on whether we are using single- or double-byte chars.
-        int byteLength = charCount * (charType + 1);
-
-        path = new byte[byteLength];
-        inStream.readFully(path);
-
-        if (path[0] == 0x02)
-            _unused = inStream.readRemainder();
-
-    }
-
-    /*
-     * assuming this wants the number of bytes returned by {@link serialize(LittleEndianOutput)},
-     * that is, (length - 4).
-     */
-    @Override
-    protected int getDataSize()
-    {
-        int sz = 9 + path.length;
-        if (path[0] == 0x02)
-            sz += _unused.length;
-        return sz;
-    }
-
-    @Override
-    protected void serialize(LittleEndianOutput out)
-    {
-        out.writeShort(firstRow);
-        out.writeShort(lastRow);
-        out.writeByte(firstCol);
-        out.writeByte(lastCol);
-        out.writeShort(charCount);
-        out.writeByte(charType);
-        out.write(path);
-        if (path[0] == 0x02)
-            out.write(_unused);
-    }
-
-    @Override
-    public short getSid()
-    {
-        return sid;
-    }
-
-    /**
-     * @return The first column of the range.
-     */
-    public int getFirstColumn()
-    {
-        return firstCol;
-    }
-
-    /**
-     * @return The first row of the range.
-     */
-    public int getFirstRow()
-    {
-        return firstRow;
-    }
-
-    /**
-     * @return The last column of the range.
-     */
-    public int getLastColumn()
-    {
-        return lastCol;
-    }
-
-    /**
-     * @return The last row of the range.
-     */
-    public int getLastRow()
-    {
-        return lastRow;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder b = new StringBuilder();
-	b.append("[DCONREF]\n");
-        b.append("    .ref\n");
-        b.append("        .firstrow   = ").append(firstRow).append("\n");
-        b.append("        .lastrow    = ").append(lastRow).append("\n");
-        b.append("        .firstcol   = ").append(firstCol).append("\n");
-        b.append("        .lastcol    = ").append(lastCol).append("\n");
-        b.append("    .cch            = ").append(charCount).append("\n");
-	b.append("    .stFile\n");
-	b.append("        .h          = ").append(charType).append("\n");
-	b.append("        .rgb        = ").append(getReadablePath()).append("\n");
-	b.append("[/DCONREF]\n");
-
-        return b.toString();
-    }
-
-    /**
-     *
-     * @return raw path byte array.
-     */
-    public byte[] getPath()
-    {
-        return Arrays.copyOf(path, path.length);
-    }
-
-    /**
-     * @return the link's path, with the special characters stripped/replaced. May be null.
-     * See MS-XLS 2.5.277 (VirtualPath)
-     */
-    public String getReadablePath()
-    {
-        if (path != null)
-        {
-            //all of the path strings start with either 0x02 or 0x01 followed by zero or
-            //more of 0x01..0x08
-            int offset = 1;
-            while (path[offset] < 0x20 && offset < path.length)
-            {
-                offset++;
-            }
-            String out = new String(Arrays.copyOfRange(path, offset, path.length), StringUtil.UTF8);
-            //UNC paths have \u0003 chars as path separators.
-            out = out.replaceAll("\u0003", "/");
-            return out;
-        }
-        return null;
-    }
-
-    /**
-     * Checks if the data source in this reference record is external to this sheet or internal.
-     *
-     * @return true iff this is an external reference.
-     */
-    public boolean isExternalRef()
-    {
-        if (path[0] == 0x01)
-            return true;
-        return false;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java
deleted file mode 100644
index 8d28562..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Double Stream Flag Record (0x0161)<p>
- * Description:  tells if this is a double stream file. (always no for HSSF generated files)<p>
- *               Double Stream files contain both BIFF8 and BIFF7 workbooks.<p>
- * REFERENCE:  PG 305 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class DSFRecord extends StandardRecord {
-    public final static short sid = 0x0161;
-
-    private static final BitField biff5BookStreamFlag = BitFieldFactory.getInstance(0x0001);
-
-    private int _options;
-
-    private DSFRecord(int options) {
-        _options = options;
-    }
-    public DSFRecord(boolean isBiff5BookStreamPresent) {
-        this(0);
-        _options = biff5BookStreamFlag.setBoolean(0, isBiff5BookStreamPresent);
-    }
-
-    public DSFRecord(RecordInputStream in) {
-        this(in.readShort());
-    }
-
-    public boolean isBiff5BookStreamPresent() {
-        return biff5BookStreamFlag.isSet(_options);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DSF]\n");
-        buffer.append("    .options = ").append(HexDump.shortToHex(_options)).append("\n");
-        buffer.append("[/DSF]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_options);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java
deleted file mode 100644
index fd7163a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        DATAVALIDATIONS Record (0x01B2)<p>
- * Description:  used in data validation ;
- *               This record is the list header of all data validation records (0x01BE) in the current sheet.
- */
-public final class DVALRecord extends StandardRecord implements Cloneable {
-	public final static short sid = 0x01B2;
-
-	/** Options of the DVAL */
-	private short field_1_options;
-	/** Horizontal position of the dialog */
-	private int field_2_horiz_pos;
-	/** Vertical position of the dialog */
-	private int field_3_vert_pos;
-
-	/** Object ID of the drop down arrow object for list boxes ;
-	 * in our case this will be always FFFF , until
-	 * MSODrawingGroup and MSODrawing records are implemented */
-	private int  field_cbo_id;
-
-	/** Number of following DV Records */
-	private int  field_5_dv_no;
-
-    public DVALRecord() {
-        field_cbo_id = 0xFFFFFFFF;
-        field_5_dv_no = 0x00000000;
-    }
-
-	public DVALRecord(RecordInputStream in) {
-		field_1_options = in.readShort();
-		field_2_horiz_pos = in.readInt();
-		field_3_vert_pos = in.readInt();
-        field_cbo_id    = in.readInt(); 
-        field_5_dv_no   = in.readInt();
-	}
-
-    /**
-	 * @param options the options of the dialog
-	 */
-	public void setOptions(short options) {
-		field_1_options = options;
-	}
-
-	/**
-	 * @param horiz_pos the Horizontal position of the dialog
-	 */
-	public void setHorizontalPos(int horiz_pos) {
-		field_2_horiz_pos = horiz_pos;
-	}
-
-	/**
-	 * @param vert_pos the Vertical position of the dialog
-	 */
-	public void setVerticalPos(int vert_pos) {
-		field_3_vert_pos = vert_pos;
-	}
-
-	/**
-     * set the object ID of the drop down arrow object for list boxes
-     * @param cboID - Object ID
-     */
-    public void setObjectID(int cboID) {
-        field_cbo_id = cboID;
-    }
-
-    /**
-     * Set the number of following DV records
-     * @param dvNo - the DV records number
-     */
-    public void setDVRecNo(int dvNo) {
-        field_5_dv_no = dvNo;
-    }
-
-    /**
-	 * @return the field_1_options
-	 */
-	public short getOptions() {
-		return field_1_options;
-	}
-
-	/**
-	 * @return the Horizontal position of the dialog
-	 */
-	public int getHorizontalPos() {
-		return field_2_horiz_pos;
-	}
-
-	/**
-	 * @return the the Vertical position of the dialog
-	 */
-	public int getVerticalPos() {
-		return field_3_vert_pos;
-	}
-
-	/**
-     * @return the Object ID of the drop down arrow object for list boxes
-     */
-    public int getObjectID() {
-        return field_cbo_id;
-    }
-
-    /**
-     * @return the number of following DV records
-     */
-    public int getDVRecNo() {
-        return field_5_dv_no;
-    }
-
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[DVAL]\n");
-		buffer.append("    .options      = ").append(getOptions()).append('\n');
-		buffer.append("    .horizPos     = ").append(getHorizontalPos()).append('\n');
-		buffer.append("    .vertPos      = ").append(getVerticalPos()).append('\n');
-		buffer.append("    .comboObjectID   = ").append(Integer.toHexString(getObjectID())).append("\n");
-		buffer.append("    .DVRecordsNumber = ").append(Integer.toHexString(getDVRecNo())).append("\n");
-		buffer.append("[/DVAL]\n");
-		return buffer.toString();
-	}
-
-    public void serialize(LittleEndianOutput out) {
- 		
-		out.writeShort(getOptions());
-		out.writeInt(getHorizontalPos());
-		out.writeInt(getVerticalPos());
-		out.writeInt(getObjectID());
-		out.writeInt(getDVRecNo());
-    }
-
-    protected int getDataSize() {
-        return 18;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public DVALRecord clone() {
-      DVALRecord rec = new DVALRecord();
-      rec.field_1_options = field_1_options;
-      rec.field_2_horiz_pos = field_2_horiz_pos;
-      rec.field_3_vert_pos = field_3_vert_pos;
-      rec.field_cbo_id = field_cbo_id;
-      rec.field_5_dv_no = field_5_dv_no;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java
deleted file mode 100644
index 68d560a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.usermodel.HSSFDataValidation;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title:        DATAVALIDATION Record (0x01BE)<p>
- * Description:  This record stores data validation settings and a list of cell ranges
- *               which contain these settings. The data validation settings of a sheet
- *               are stored in a sequential list of DV records. This list is followed by
- *               DVAL record(s)
- */
-public final class DVRecord extends StandardRecord implements Cloneable {
-	public final static short sid = 0x01BE;
-	
-	/** the unicode string used for error/prompt title/text when not present */
-	private static final UnicodeString NULL_TEXT_STRING = new UnicodeString("\0");
-
-	/** Option flags */
-	private int _option_flags;
-	/** Title of the prompt box */
-	private UnicodeString _promptTitle;
-	/** Title of the error box */
-	private UnicodeString _errorTitle;
-	/** Text of the prompt box */
-	private UnicodeString _promptText;
-	/** Text of the error box */
-	private UnicodeString _errorText;
-	/** Not used - Excel seems to always write 0x3FE0 */
-	private short _not_used_1 = 0x3FE0;
-	/** Formula data for first condition (RPN token array without size field) */
-	private Formula _formula1;
-	/** Not used - Excel seems to always write 0x0000 */
-	private short _not_used_2 = 0x0000;
-	/** Formula data for second condition (RPN token array without size field) */
-	private Formula _formula2;
-	/** Cell range address list with all affected ranges */
-	private CellRangeAddressList _regions;
-
-	/**
-	 * Option flags field
-	 * 
-	 * @see HSSFDataValidation utility class
-	 */
-	private static final BitField opt_data_type                    = new BitField(0x0000000F);
-	private static final BitField opt_error_style                  = new BitField(0x00000070);
-	private static final BitField opt_string_list_formula          = new BitField(0x00000080);
-	private static final BitField opt_empty_cell_allowed           = new BitField(0x00000100);
-	private static final BitField opt_suppress_dropdown_arrow      = new BitField(0x00000200);
-	private static final BitField opt_show_prompt_on_cell_selected = new BitField(0x00040000);
-	private static final BitField opt_show_error_on_invalid_value  = new BitField(0x00080000);
-	private static final BitField opt_condition_operator           = new BitField(0x00700000);
-
-	public DVRecord(int validationType, int operator, int errorStyle, boolean emptyCellAllowed,
-			boolean suppressDropDownArrow, boolean isExplicitList,
-			boolean showPromptBox, String promptTitle, String promptText, 
-			boolean showErrorBox, String errorTitle, String errorText,
-			Ptg[] formula1, Ptg[] formula2,
-			CellRangeAddressList regions) {
-		
-		int flags = 0;
-		flags = opt_data_type.setValue(flags, validationType);
-		flags = opt_condition_operator.setValue(flags, operator);
-		flags = opt_error_style.setValue(flags, errorStyle);
-		flags = opt_empty_cell_allowed.setBoolean(flags, emptyCellAllowed);
-		flags = opt_suppress_dropdown_arrow.setBoolean(flags, suppressDropDownArrow);
-		flags = opt_string_list_formula.setBoolean(flags, isExplicitList);
-		flags = opt_show_prompt_on_cell_selected.setBoolean(flags, showPromptBox);
-		flags = opt_show_error_on_invalid_value.setBoolean(flags, showErrorBox);
-		_option_flags = flags;
-		_promptTitle = resolveTitleText(promptTitle);
-		_promptText = resolveTitleText(promptText);
-		_errorTitle = resolveTitleText(errorTitle);
-		_errorText = resolveTitleText(errorText);
-		_formula1 = Formula.create(formula1);
-		_formula2 = Formula.create(formula2);
-		_regions = regions;
-	}
-
-	public DVRecord(RecordInputStream in) {
-
-		_option_flags = in.readInt();
-
-		_promptTitle = readUnicodeString(in);
-		_errorTitle = readUnicodeString(in);
-		_promptText = readUnicodeString(in);
-		_errorText = readUnicodeString(in);
-
-		int field_size_first_formula = in.readUShort();
-		_not_used_1 = in.readShort();
-
-		// "You may not use unions, intersections or array constants in Data Validation criteria"
-
-		// read first formula data condition
-		_formula1 = Formula.read(field_size_first_formula, in);
-
-		int field_size_sec_formula = in.readUShort();
-		_not_used_2 = in.readShort();
-
-		// read sec formula data condition
-		_formula2 = Formula.read(field_size_sec_formula, in);
-
-		// read cell range address list with all affected ranges
-		_regions = new CellRangeAddressList(in);
-	}
-
-	// --> start option flags
-	/**
-	 * @return the condition data type
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType
-	 */
-	public int getDataType() {
-	   return opt_data_type.getValue(_option_flags);
-	}
-
-	/**
-	 * @return the condition error style
-	 * @see org.apache.poi.ss.usermodel.DataValidation.ErrorStyle
-	 */
-	public int getErrorStyle() {
-	   return opt_error_style.getValue(_option_flags);
-	}
-
-	/**
-	 * @return <code>true</code> if in list validations the string list is explicitly given in the
-	 *  formula, <code>false</code> otherwise
-	  */
-	public boolean getListExplicitFormula() {
-	   return (opt_string_list_formula.isSet(_option_flags));
-	}
-
-	/**
-	 * @return <code>true</code> if empty values are allowed in cells, <code>false</code> otherwise
-	 */
-	public boolean getEmptyCellAllowed() {
-	   return (opt_empty_cell_allowed.isSet(_option_flags));
-	}
-
-
-	/**
-	  * @return <code>true</code> if drop down arrow should be suppressed when list validation is
-	  * used, <code>false</code> otherwise
-	 */
-	public boolean getSuppressDropdownArrow() {
-	   return (opt_suppress_dropdown_arrow.isSet(_option_flags));
-	}
-
-	/**
-	 * @return <code>true</code> if a prompt window should appear when cell is selected, <code>false</code> otherwise
-	 */
-	public boolean getShowPromptOnCellSelected() {
-	   return (opt_show_prompt_on_cell_selected.isSet(_option_flags));
-	}
-
-	/**
-	 * @return <code>true</code> if an error window should appear when an invalid value is entered
-	 *  in the cell, <code>false</code> otherwise
-	 */
-	public boolean getShowErrorOnInvalidValue() {
-	   return (opt_show_error_on_invalid_value.isSet(_option_flags));
-	}
-
-	/**
-	 * get the condition operator
-	 * @return the condition operator
-	 * @see HSSFDataValidation utility class
-	 */
-	public int getConditionOperator() {
-	   return opt_condition_operator.getValue(_option_flags);
-	}
-	// <-- end option flags
-
-    public String getPromptTitle() {
-        return resolveTitleString(_promptTitle);
-    }
-
-    public String getErrorTitle() {
-        return resolveTitleString(_errorTitle);
-    }
-
-    public String getPromptText() {
-        return resolveTitleString(_promptText);
-    }
-
-    public String getErrorText() {
-        return resolveTitleString(_errorText);
-    }
-
-    public Ptg[] getFormula1() {
-        return Formula.getTokens(_formula1);
-    }
-
-    public Ptg[] getFormula2() {
-        return Formula.getTokens(_formula2);
-    }
-
-	public CellRangeAddressList getCellRangeAddress() {
-		return this._regions;
-	}
-
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("[DV]\n");
-		sb.append(" options=").append(Integer.toHexString(_option_flags));
-		sb.append(" title-prompt=").append(formatTextTitle(_promptTitle));
-		sb.append(" title-error=").append(formatTextTitle(_errorTitle));
-		sb.append(" text-prompt=").append(formatTextTitle(_promptText));
-		sb.append(" text-error=").append(formatTextTitle(_errorText));
-		sb.append("\n");
-		appendFormula(sb, "Formula 1:",  _formula1);
-		appendFormula(sb, "Formula 2:",  _formula2);
-		sb.append("Regions: ");
-		int nRegions = _regions.countRanges();
-		for(int i=0; i<nRegions; i++) {
-			if (i>0) {
-				sb.append(", ");
-			}
-			CellRangeAddress addr = _regions.getCellRangeAddress(i);
-			sb.append('(').append(addr.getFirstRow()).append(',').append(addr.getLastRow());
-			sb.append(',').append(addr.getFirstColumn()).append(',').append(addr.getLastColumn()).append(')');
-		}
-		sb.append("\n");
-		sb.append("[/DV]");
-
-		return sb.toString();
-	}
-
-	private static String formatTextTitle(UnicodeString us) {
-		String str = us.getString();
-		if (str.length() == 1 && str.charAt(0) == '\0') {
-			return "'\\0'";
-		}
-		return str;
-	}
-
-	private static void appendFormula(StringBuffer sb, String label, Formula f) {
-		sb.append(label);
-		
-		if (f == null) {
-			sb.append("<empty>\n");
-			return;
-		}
-		Ptg[] ptgs = f.getTokens();
-		sb.append('\n');
-		for (int i = 0; i < ptgs.length; i++) {
-			sb.append('\t').append(ptgs[i].toString()).append('\n');
-		}
-	}
-
-	public void serialize(LittleEndianOutput out) {
-
-		out.writeInt(_option_flags);
-		
-		serializeUnicodeString(_promptTitle, out);
-		serializeUnicodeString(_errorTitle, out);
-		serializeUnicodeString(_promptText, out);
-		serializeUnicodeString(_errorText, out);
-		out.writeShort(_formula1.getEncodedTokenSize());
-		out.writeShort(_not_used_1);
-		_formula1.serializeTokens(out);
-		
-		out.writeShort(_formula2.getEncodedTokenSize());
-		out.writeShort(_not_used_2);
-		_formula2.serializeTokens(out);
-		
-		_regions.serialize(out);
-	}
-
-	/**
-	 * When entered via the UI, Excel translates empty string into "\0"
-	 * While it is possible to encode the title/text as empty string (Excel doesn't exactly crash),
-	 * the resulting tool-tip text / message box looks wrong.  It is best to do the same as the 
-	 * Excel UI and encode 'not present' as "\0". 
-	 */
-	private static UnicodeString resolveTitleText(String str) {
-		if (str == null || str.length() < 1) {
-			return NULL_TEXT_STRING;
-		}
-		return new UnicodeString(str);
-	}
-
-    private static String resolveTitleString(UnicodeString us) {
-        if (us == null || us.equals(NULL_TEXT_STRING)) {
-            return null;
-        }
-        return us.getString();
-    }
-
-	private static UnicodeString readUnicodeString(RecordInputStream in) {
-		return new UnicodeString(in);
-	}
-
-	private static void serializeUnicodeString(UnicodeString us, LittleEndianOutput out) {
-		StringUtil.writeUnicodeString(out, us.getString());
-	}
-	private static int getUnicodeStringSize(UnicodeString us) {
-		String str = us.getString();
-		return 3 + str.length() * (StringUtil.hasMultibyte(str) ? 2 : 1);
-	}
-
-	protected int getDataSize() {
-		int size = 4+2+2+2+2;//options_field+first_formula_size+first_unused+sec_formula_size+sec+unused;
-		size += getUnicodeStringSize(_promptTitle);
-		size += getUnicodeStringSize(_errorTitle);
-		size += getUnicodeStringSize(_promptText);
-		size += getUnicodeStringSize(_errorText);
-		size += _formula1.getEncodedTokenSize();
-		size += _formula2.getEncodedTokenSize();
-		size += _regions.getSize();
-		return size;
-	}
-
-	public short getSid() {
-		return sid;
-	}
-	
-	/**
-	 * Clones the object. Uses serialisation, as the
-	 *  contents are somewhat complex
-	 */
-	@Override
-	public DVRecord clone() {
-		return (DVRecord)cloneViaReserialise();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java b/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
deleted file mode 100644
index 39b4740..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
+++ /dev/null
@@ -1,91 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Date Window 1904 Flag record <P>
- * Description:  Flag specifying whether 1904 date windowing is used.
- *               (tick toc tick toc...BOOM!) <P>
- * REFERENCE:  PG 280 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-
-public final class DateWindow1904Record
-    extends StandardRecord
-{
-    public final static short sid = 0x22;
-    private short             field_1_window;
-
-    public DateWindow1904Record()
-    {
-    }
-
-    public DateWindow1904Record(RecordInputStream in)
-    {
-        field_1_window = in.readShort();
-    }
-
-    /**
-     * sets whether or not to use 1904 date windowing (which means you'll be screwed in 2004)
-     * @param window flag - 0/1 (false,true)
-     */
-
-    public void setWindowing(short window)
-    {   // I hate using numbers in method names so I wont!
-        field_1_window = window;
-    }
-
-    /**
-     * gets whether or not to use 1904 date windowing (which means you'll be screwed in 2004)
-     * @return window flag - 0/1 (false,true)
-     */
-
-    public short getWindowing()
-    {
-        return field_1_window;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[1904]\n");
-        buffer.append("    .is1904          = ")
-            .append(Integer.toHexString(getWindowing())).append("\n");
-        buffer.append("[/1904]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getWindowing());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
deleted file mode 100644
index c2f37b8..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Default Column Width Record (0x0055) <P>
- * Description:  Specifies the default width for columns that have no specific
- *               width set.<P>
- * REFERENCE:  PG 302 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-public final class DefaultColWidthRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x0055;
-    private int             field_1_col_width;
-
-    /**
-     *  The default column width is 8 characters
-     */
-    public final static int DEFAULT_COLUMN_WIDTH = 0x0008;
-
-    public DefaultColWidthRecord()
-    {
-        field_1_col_width = DEFAULT_COLUMN_WIDTH;
-    }
-
-    public DefaultColWidthRecord(RecordInputStream in)
-    {
-        field_1_col_width = in.readUShort();
-    }
-
-    /**
-     * set the default column width
-     * @param width defaultwidth for columns
-     */
-
-    public void setColWidth(int width)
-    {
-        field_1_col_width = width;
-    }
-
-    /**
-     * get the default column width
-     * @return defaultwidth for columns
-     */
-
-    public int getColWidth()
-    {
-        return field_1_col_width;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DEFAULTCOLWIDTH]\n");
-        buffer.append("    .colwidth      = ")
-            .append(Integer.toHexString(getColWidth())).append("\n");
-        buffer.append("[/DEFAULTCOLWIDTH]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getColWidth());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public DefaultColWidthRecord clone() {
-      DefaultColWidthRecord rec = new DefaultColWidthRecord();
-      rec.field_1_col_width = field_1_col_width;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
deleted file mode 100644
index 850e895..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
+++ /dev/null
@@ -1,130 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Default Row Height Record
- * Description:  Row height for rows with undefined or not explicitly defined
- *               heights.
- * REFERENCE:  PG 301 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class DefaultRowHeightRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x225;
-    private short             field_1_option_flags;
-    private short             field_2_row_height;
-
-    /**
-     * The default row height for empty rows is 255 twips (255 / 20 == 12.75 points)
-     */
-    public static final short DEFAULT_ROW_HEIGHT = 0xFF;
-
-    public DefaultRowHeightRecord()
-    {
-        field_1_option_flags = 0x0000;
-        field_2_row_height = DEFAULT_ROW_HEIGHT;
-    }
-
-    public DefaultRowHeightRecord(RecordInputStream in)
-    {
-        field_1_option_flags = in.readShort();
-        field_2_row_height   = in.readShort();
-    }
-
-    /**
-     * set the (currently unimportant to HSSF) option flags
-     * @param flags the bitmask to set
-     */
-
-    public void setOptionFlags(short flags)
-    {
-        field_1_option_flags = flags;
-    }
-
-    /**
-     * set the default row height
-     * @param height    for undefined rows/rows w/undefined height
-     */
-
-    public void setRowHeight(short height)
-    {
-        field_2_row_height = height;
-    }
-
-    /**
-     * get the (currently unimportant to HSSF) option flags
-     * @return flags - the current bitmask
-     */
-
-    public short getOptionFlags()
-    {
-        return field_1_option_flags;
-    }
-
-    /**
-     * get the default row height
-     * @return rowheight for undefined rows/rows w/undefined height
-     */
-
-    public short getRowHeight()
-    {
-        return field_2_row_height;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DEFAULTROWHEIGHT]\n");
-        buffer.append("    .optionflags    = ")
-            .append(Integer.toHexString(getOptionFlags())).append("\n");
-        buffer.append("    .rowheight      = ")
-            .append(Integer.toHexString(getRowHeight())).append("\n");
-        buffer.append("[/DEFAULTROWHEIGHT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getOptionFlags());
-        out.writeShort(getRowHeight());
-    }
-
-    protected int getDataSize() {
-        return 4;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public DefaultRowHeightRecord clone() {
-      DefaultRowHeightRecord rec = new DefaultRowHeightRecord();
-      rec.field_1_option_flags = field_1_option_flags;
-      rec.field_2_row_height = field_2_row_height;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java
deleted file mode 100644
index 9cc2c07..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Delta Record (0x0010)<p>
- * Description:  controls the accuracy of the calculations<p>
- * REFERENCE:  PG 303 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class DeltaRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x0010;
-    public final static double DEFAULT_VALUE = 0.0010;   // should be .001
-
-    // a double is an IEEE 8-byte float...damn IEEE and their goofy standards an
-    // ambiguous numeric identifiers
-    private double field_1_max_change;
-
-    public DeltaRecord(double maxChange) {
-        field_1_max_change = maxChange;
-    }
-
-    public DeltaRecord(RecordInputStream in) {
-        field_1_max_change = in.readDouble();
-    }
-
-    /**
-     * get the maximum change
-     * @return maxChange - maximum rounding error
-     */
-    public double getMaxChange() {
-        return field_1_max_change;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DELTA]\n");
-        buffer.append("    .maxchange = ").append(getMaxChange()).append("\n");
-        buffer.append("[/DELTA]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeDouble(getMaxChange());
-    }
-
-    protected int getDataSize() {
-        return 8;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public DeltaRecord clone() {
-        // immutable
-        return this;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
deleted file mode 100644
index e326b5c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
+++ /dev/null
@@ -1,181 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Dimensions Record<P>
- * Description:  provides the minumum and maximum bounds
- *               of a sheet.<P>
- * REFERENCE:  PG 303 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class DimensionsRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x200;
-    private int               field_1_first_row;
-    private int               field_2_last_row;   // plus 1
-    private short             field_3_first_col;
-    private short             field_4_last_col;
-    private short             field_5_zero;       // must be 0 (reserved)
-
-    public DimensionsRecord()
-    {
-    }
-
-    public DimensionsRecord(RecordInputStream in)
-    {
-        field_1_first_row = in.readInt();
-        field_2_last_row  = in.readInt();
-        field_3_first_col = in.readShort();
-        field_4_last_col  = in.readShort();
-        field_5_zero      = in.readShort();
-    }
-
-    /**
-     * set the first row number for the sheet
-     * @param row - first row on the sheet
-     */
-
-    public void setFirstRow(int row)
-    {
-        field_1_first_row = row;
-    }
-
-    /**
-     * set the last row number for the sheet
-     * @param row - last row on the sheet
-     */
-
-    public void setLastRow(int row)
-    {
-        field_2_last_row = row;
-    }
-
-    /**
-     * set the first column number for the sheet
-     * @param col  first column on the sheet
-     */
-
-    public void setFirstCol(short col)
-    {
-        field_3_first_col = col;
-    }
-
-    /**
-     * set the last col number for the sheet
-     * @param col  last column on the sheet
-     */
-
-    public void setLastCol(short col)
-    {
-        field_4_last_col = col;
-    }
-
-    /**
-     * get the first row number for the sheet
-     * @return row - first row on the sheet
-     */
-
-    public int getFirstRow()
-    {
-        return field_1_first_row;
-    }
-
-    /**
-     * get the last row number for the sheet
-     * @return row - last row on the sheet
-     */
-
-    public int getLastRow()
-    {
-        return field_2_last_row;
-    }
-
-    /**
-     * get the first column number for the sheet
-     * @return column - first column on the sheet
-     */
-
-    public short getFirstCol()
-    {
-        return field_3_first_col;
-    }
-
-    /**
-     * get the last col number for the sheet
-     * @return column - last column on the sheet
-     */
-
-    public short getLastCol()
-    {
-        return field_4_last_col;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DIMENSIONS]\n");
-        buffer.append("    .firstrow       = ")
-            .append(Integer.toHexString(getFirstRow())).append("\n");
-        buffer.append("    .lastrow        = ")
-            .append(Integer.toHexString(getLastRow())).append("\n");
-        buffer.append("    .firstcol       = ")
-            .append(Integer.toHexString(getFirstCol())).append("\n");
-        buffer.append("    .lastcol        = ")
-            .append(Integer.toHexString(getLastCol())).append("\n");
-        buffer.append("    .zero           = ")
-            .append(Integer.toHexString(field_5_zero)).append("\n");
-        buffer.append("[/DIMENSIONS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(getFirstRow());
-        out.writeInt(getLastRow());
-        out.writeShort(getFirstCol());
-        out.writeShort(getLastCol());
-        out.writeShort(( short ) 0);
-    }
-
-    protected int getDataSize() {
-        return 14;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public DimensionsRecord clone() {
-      DimensionsRecord rec = new DimensionsRecord();
-      rec.field_1_first_row = field_1_first_row;
-      rec.field_2_last_row = field_2_last_row;
-      rec.field_3_first_col = field_3_first_col;
-      rec.field_4_last_col = field_4_last_col;
-      rec.field_5_zero = field_5_zero;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
deleted file mode 100644
index 2304c04..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.NullEscherSerializationListener;
-import org.apache.poi.util.LittleEndian;
-
-import java.util.Iterator;
-import java.util.List;
-
-
-public final class DrawingGroupRecord extends AbstractEscherHolderRecord {
-    public static final short sid = 0xEB;
-
-    static final int MAX_RECORD_SIZE = 8228;
-    private static final int MAX_DATA_SIZE = MAX_RECORD_SIZE - 4;
-
-    public DrawingGroupRecord()
-    {
-    }
-
-    public DrawingGroupRecord( RecordInputStream in )
-    {
-        super( in );
-    }
-
-    protected String getRecordName()
-    {
-        return "MSODRAWINGGROUP";
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public int serialize(int offset, byte[] data)
-    {
-        byte[] rawData = getRawData();
-        if (getEscherRecords().size() == 0 && rawData != null)
-        {
-            return writeData( offset, data, rawData );
-        }
-        byte[] buffer = new byte[getRawDataSize()];
-        int pos = 0;
-        for ( Iterator<EscherRecord> iterator = getEscherRecords().iterator(); iterator.hasNext(); )
-        {
-            EscherRecord r = iterator.next();
-            pos += r.serialize(pos, buffer, new NullEscherSerializationListener() );
-        }
-
-        return writeData( offset, data, buffer );
-    }
-
-    /**
-     * Process the bytes into escher records.
-     * (Not done by default in case we break things,
-     *  unless you set the "poi.deserialize.escher"
-     *  system property)
-     */
-    public void processChildRecords() {
-    	convertRawBytesToEscherRecords();
-    }
-
-    public int getRecordSize() {
-        // TODO - convert this to a RecordAggregate
-        return grossSizeFromDataSize(getRawDataSize());
-    }
-
-    private int getRawDataSize() {
-        List<EscherRecord> escherRecords = getEscherRecords();
-        byte[] rawData = getRawData();
-        if (escherRecords.size() == 0 && rawData != null)
-        {
-            return rawData.length;
-        }
-        int size = 0;
-        for ( Iterator<EscherRecord> iterator = escherRecords.iterator(); iterator.hasNext(); )
-        {
-            EscherRecord r = iterator.next();
-            size += r.getRecordSize();
-        }
-        return size;
-    }
-
-    static int grossSizeFromDataSize(int dataSize)
-    {
-        return dataSize + ( (dataSize - 1) / MAX_DATA_SIZE + 1 ) * 4;
-    }
-
-    private int writeData( int offset, byte[] data, byte[] rawData )
-    {
-        int writtenActualData = 0;
-        int writtenRawData = 0;
-        while (writtenRawData < rawData.length)
-        {
-            int segmentLength = Math.min( rawData.length - writtenRawData, MAX_DATA_SIZE);
-            if (writtenRawData / MAX_DATA_SIZE >= 2)
-                writeContinueHeader( data, offset, segmentLength );
-            else
-                writeHeader( data, offset, segmentLength );
-            writtenActualData += 4;
-            offset += 4;
-            System.arraycopy( rawData, writtenRawData, data, offset, segmentLength );
-            offset += segmentLength;
-            writtenRawData += segmentLength;
-            writtenActualData += segmentLength;
-        }
-        return writtenActualData;
-    }
-
-    private void writeHeader( byte[] data, int offset, int sizeExcludingHeader )
-    {
-        LittleEndian.putShort(data, 0 + offset, getSid());
-        LittleEndian.putShort(data, 2 + offset, (short) sizeExcludingHeader);
-    }
-
-    private void writeContinueHeader( byte[] data, int offset, int sizeExcludingHeader )
-    {
-        LittleEndian.putShort(data, 0 + offset, ContinueRecord.sid);
-        LittleEndian.putShort(data, 2 + offset, (short) sizeExcludingHeader);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java
deleted file mode 100644
index c55cafa..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-/**
- * DrawingRecord (0x00EC)
- */
-public final class DrawingRecord extends StandardRecord implements Cloneable {
-    public static final short sid = 0x00EC;
-
-    private static final byte[] EMPTY_BYTE_ARRAY = {};
-
-    private byte[] recordData;
-    private byte[] contd;
-
-    public DrawingRecord() {
-        recordData = EMPTY_BYTE_ARRAY;
-    }
-
-    public DrawingRecord(RecordInputStream in) {
-        recordData = in.readRemainder();
-    }
-
-    /**
-     * @deprecated POI 3.9
-     */
-    @Deprecated
-    public void processContinueRecord(byte[] record) {
-        //don't merge continue record with the drawing record, it must be serialized separately
-        contd = record;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.write(recordData);
-    }
-
-    protected int getDataSize() {
-        return recordData.length;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public byte[] getRecordData(){
-        return recordData;
-    }
-
-    public void setData(byte[] thedata) {
-        if (thedata == null) {
-            throw new IllegalArgumentException("data must not be null");
-        }
-        recordData = thedata;
-    }
-
-    /**
-     * Cloning of drawing records must be executed through HSSFPatriarch, because all id's must be changed
-     * @return cloned drawing records
-     */
-    @Override
-    public DrawingRecord clone() {
-        DrawingRecord rec = new DrawingRecord();
-        rec.recordData = recordData.clone();
-        if (contd != null) {
-            // TODO - this code probably never executes
-            rec.contd = contd.clone();
-        }
-
-        return rec;
-    }
-
-    @Override
-    public String toString() {
-        return "DrawingRecord["+recordData.length+"]";
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java b/trunk/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
deleted file mode 100644
index bbbe0b3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayInputStream;
-
-/**
- * This is purely for the biff viewer.  During normal operations we don't want
- * to be seeing this.
- */
-public final class DrawingRecordForBiffViewer extends AbstractEscherHolderRecord {
-    public static final short sid = 0xEC;
-
-    public DrawingRecordForBiffViewer()
-    {
-    }
-
-    public DrawingRecordForBiffViewer( RecordInputStream in)
-    {
-        super(in);
-    }
-
-    public DrawingRecordForBiffViewer(DrawingRecord r)
-    {
-    	super(convertToInputStream(r));
-    	convertRawBytesToEscherRecords();
-    }
-    private static RecordInputStream convertToInputStream(DrawingRecord r)
-    {
-    	byte[] data = r.serialize();
-    	RecordInputStream rinp = new RecordInputStream(
-    			new ByteArrayInputStream(data)
-    	);
-    	rinp.nextRecord();
-    	return rinp;
-    }
-
-    protected String getRecordName()
-    {
-        return "MSODRAWING";
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java b/trunk/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
deleted file mode 100644
index 1433bcb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * MsoDrawingSelection (0x00ED)<p>
- * Reference:
- * [MS-OGRAPH].pdf sec 2.4.69
- */
-public final class DrawingSelectionRecord extends StandardRecord implements Cloneable {
-	public static final short sid = 0x00ED;
-
-	/**
-	 * From [MS-ODRAW].pdf sec 2.2.1<p>
-	 * TODO - make EscherRecordHeader {@link LittleEndianInput} aware and refactor with this
-	 */
-	private static final class OfficeArtRecordHeader {
-		public static final int ENCODED_SIZE = 8;
-		/**
-		 * lower 4 bits is 'version' usually 0x01 or 0x0F (for containers)
-		 * upper 12 bits is 'instance'
-		 */
-		private final int _verAndInstance;
-		/** value should be between 0xF000 and 0xFFFF */
-		private final int _type;
-		private final int _length;
-
-		public OfficeArtRecordHeader(LittleEndianInput in) {
-			_verAndInstance = in.readUShort();
-			_type = in.readUShort();
-			_length = in.readInt();
-		}
-
-		public void serialize(LittleEndianOutput out) {
-			out.writeShort(_verAndInstance);
-			out.writeShort(_type);
-			out.writeInt(_length);
-		}
-
-		public String debugFormatAsString() {
-			StringBuffer sb = new StringBuffer(32);
-			sb.append("ver+inst=").append(HexDump.shortToHex(_verAndInstance));
-			sb.append(" type=").append(HexDump.shortToHex(_type));
-			sb.append(" len=").append(HexDump.intToHex(_length));
-			return sb.toString();
-		}
-	}
-
-	// [MS-OGRAPH].pdf says that the data of this record is an OfficeArtFDGSL structure
-	// as described in[MS-ODRAW].pdf sec 2.2.33
-	private OfficeArtRecordHeader _header;
-	private int _cpsp;
-	/** a MSODGSLK enum value for the current selection mode */
-	private int _dgslk;
-	private int _spidFocus;
-	/** selected shape IDs (e.g. from EscherSpRecord.ShapeId) */
-	private int[] _shapeIds;
-
-	public DrawingSelectionRecord(RecordInputStream in) {
-		_header = new OfficeArtRecordHeader(in);
-		_cpsp = in.readInt();
-		_dgslk = in.readInt();
-		_spidFocus = in.readInt();
-		int nShapes = in.available() / 4;
-		int[] shapeIds = new int[nShapes];
-		for (int i = 0; i < nShapes; i++) {
-			shapeIds[i] = in.readInt();
-		}
-		_shapeIds = shapeIds;
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	protected int getDataSize() {
-		return OfficeArtRecordHeader.ENCODED_SIZE 
-			+ 12 // 3 int fields
-			+ _shapeIds.length * 4;
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		_header.serialize(out);
-		out.writeInt(_cpsp);
-		out.writeInt(_dgslk);
-		out.writeInt(_spidFocus);
-		for (int i = 0; i < _shapeIds.length; i++) {
-			out.writeInt(_shapeIds[i]);
-		}
-	}
-
-	@Override
-	public DrawingSelectionRecord clone() {
-		// currently immutable
-		return this;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("[MSODRAWINGSELECTION]\n");
-		sb.append("    .rh       =(").append(_header.debugFormatAsString()).append(")\n");
-		sb.append("    .cpsp     =").append(HexDump.intToHex(_cpsp)).append('\n');
-		sb.append("    .dgslk    =").append(HexDump.intToHex(_dgslk)).append('\n');
-		sb.append("    .spidFocus=").append(HexDump.intToHex(_spidFocus)).append('\n');
-		sb.append("    .shapeIds =(");
-		for (int i = 0; i < _shapeIds.length; i++) {
-			if (i > 0) {
-				sb.append(", ");
-			}
-			sb.append(HexDump.intToHex(_shapeIds[i]));
-		}
-		sb.append(")\n");
-
-		sb.append("[/MSODRAWINGSELECTION]\n");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java b/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java
deleted file mode 100644
index 02d734a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * End Of File record.
- * <P>
- * Description:  Marks the end of records belonging to a particular object in the
- *               HSSF File<P>
- * REFERENCE:  PG 307 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-public final class EOFRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x0A;
-	public static final int ENCODED_SIZE = 4;
-
-	public static final EOFRecord instance = new EOFRecord();
-	
-    private EOFRecord() {
-    	// no data fields
-    }
-
-    /**
-     * @param in unused (since this record has no data)
-     */
-    public EOFRecord(RecordInputStream in)
-    {
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[EOF]\n");
-        buffer.append("[/EOF]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-    }
-
-    protected int getDataSize() {
-        return ENCODED_SIZE - 4;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public EOFRecord clone() {
-      return instance;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
deleted file mode 100644
index 877ef8c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayInputStream;
-
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianInputStream;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * ftPictFmla (0x0009)<p>
- * A sub-record within the OBJ record which stores a reference to an object
- * stored in a separate entry within the OLE2 compound file.
- */
-public final class EmbeddedObjectRefSubRecord extends SubRecord implements Cloneable {
-	private static POILogger logger = POILogFactory.getLogger(EmbeddedObjectRefSubRecord.class);
-	public static final short sid = 0x0009;
-
-	private static final byte[] EMPTY_BYTE_ARRAY = { };
-
-	private int field_1_unknown_int;
-	/** either an area or a cell ref */
-	private Ptg field_2_refPtg;
-	/** for when the 'formula' doesn't parse properly */
-	private byte[] field_2_unknownFormulaData;
-	/** note- this byte is not present in the encoding if the string length is zero */
-	private boolean field_3_unicode_flag;  // Flags whether the string is Unicode.
-	private String  field_4_ole_classname; // Classname of the embedded OLE document (e.g. Word.Document.8)
-	/** Formulas often have a single non-zero trailing byte.
-	 * This is in a similar position to he pre-streamId padding
-	 * It is unknown if the value is important (it seems to mirror a value a few bytes earlier)
-	 *  */
-	private Byte  field_4_unknownByte;
-	private Integer field_5_stream_id;	 // ID of the OLE stream containing the actual data.
-	private byte[] field_6_unknown;
-
-
-	// currently for testing only - needs review
-	public EmbeddedObjectRefSubRecord() {
-		field_2_unknownFormulaData = new byte[] { 0x02, 0x6C, 0x6A, 0x16, 0x01, }; // just some sample data.  These values vary a lot
-		field_6_unknown = EMPTY_BYTE_ARRAY;
-		field_4_ole_classname = null;
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public EmbeddedObjectRefSubRecord(LittleEndianInput in, int size) {
-
-		// Much guess-work going on here due to lack of any documentation.
-		// See similar source code in OOO:
-		// http://svn.services.openoffice.org/ooo/trunk/sc/source/filter/excel/xiescher.cxx
-		// 1223 void XclImpOleObj::ReadPictFmla( XclImpStream& rStrm, sal_uInt16 nRecSize )
-
-		int streamIdOffset = in.readShort(); // OOO calls this 'nFmlaLen'
-		int remaining = size - LittleEndian.SHORT_SIZE;
-
-		int dataLenAfterFormula = remaining - streamIdOffset;
-		int formulaSize = in.readUShort();
-		remaining -= LittleEndian.SHORT_SIZE;
-		field_1_unknown_int = in.readInt();
-		remaining -= LittleEndian.INT_SIZE;
-		byte[] formulaRawBytes = readRawData(in, formulaSize);
-		remaining -= formulaSize;
-		field_2_refPtg = readRefPtg(formulaRawBytes);
-		if (field_2_refPtg == null) {
-			// common case
-			// field_2_n16 seems to be 5 here
-			// The formula almost looks like tTbl but the row/column values seem like garbage.
-			field_2_unknownFormulaData = formulaRawBytes;
-		} else {
-			field_2_unknownFormulaData = null;
-		}
-
-		int stringByteCount;
-		if (remaining >= dataLenAfterFormula + 3) {
-			int tag = in.readByte();
-			stringByteCount = LittleEndian.BYTE_SIZE;
-			if (tag != 0x03) {
-				throw new RecordFormatException("Expected byte 0x03 here");
-			}
-			int nChars = in.readUShort();
-			stringByteCount += LittleEndian.SHORT_SIZE;
-			if (nChars > 0) {
-				 // OOO: the 4th way Xcl stores a unicode string: not even a Grbit byte present if length 0
-				field_3_unicode_flag = ( in.readByte() & 0x01 ) != 0;
-				stringByteCount += LittleEndian.BYTE_SIZE;
-				if (field_3_unicode_flag) {
-					field_4_ole_classname = StringUtil.readUnicodeLE(in, nChars);
-					stringByteCount += nChars * 2;
-				} else {
-					field_4_ole_classname = StringUtil.readCompressedUnicode(in, nChars);
-					stringByteCount += nChars;
-				}
-			} else {
-				field_4_ole_classname = "";
-			}
-		} else {
-			field_4_ole_classname = null;
-			stringByteCount = 0;
-		}
-		remaining -= stringByteCount;
-		// Pad to next 2-byte boundary
-		if (((stringByteCount + formulaSize) % 2) != 0) {
-			int b = in.readByte();
-			remaining -= LittleEndian.BYTE_SIZE;
-			if (field_2_refPtg != null && field_4_ole_classname == null) {
-				field_4_unknownByte = Byte.valueOf((byte)b);
-			}
-		}
-		int nUnexpectedPadding = remaining - dataLenAfterFormula;
-
-		if (nUnexpectedPadding > 0) {
-			logger.log( POILogger.ERROR, "Discarding " + nUnexpectedPadding + " unexpected padding bytes ");
-			readRawData(in, nUnexpectedPadding);
-			remaining-=nUnexpectedPadding;
-		}
-
-		// Fetch the stream ID
-		if (dataLenAfterFormula >= 4) {
-			field_5_stream_id = Integer.valueOf(in.readInt());
-			remaining -= LittleEndian.INT_SIZE;
-		} else {
-			field_5_stream_id = null;
-		}
-		field_6_unknown = readRawData(in, remaining);
-	}
-
-	private static Ptg readRefPtg(byte[] formulaRawBytes) {
-		LittleEndianInput in = new LittleEndianInputStream(new ByteArrayInputStream(formulaRawBytes));
-		byte ptgSid = in.readByte();
-		switch(ptgSid) {
-			case AreaPtg.sid:   return new AreaPtg(in);
-			case Area3DPtg.sid: return new Area3DPtg(in);
-			case RefPtg.sid:	return new RefPtg(in);
-			case Ref3DPtg.sid:  return new Ref3DPtg(in);
-		}
-		return null;
-	}
-
-	private static byte[] readRawData(LittleEndianInput in, int size) {
-		if (size < 0) {
-			throw new IllegalArgumentException("Negative size (" + size + ")");
-		}
-		if (size == 0) {
-			return EMPTY_BYTE_ARRAY;
-		}
-		byte[] result = new byte[size];
-		in.readFully(result);
-		return result;
-	}
-
-	private int getStreamIDOffset(int formulaSize) {
-		int result = 2 + 4; // formulaSize + f2unknown_int
-		result += formulaSize;
-
-		int stringLen;
-		if (field_4_ole_classname == null) {
-			// don't write 0x03, stringLen, flag, text
-			stringLen = 0;
-		} else {
-			result += 1 + 2;  // 0x03, stringLen
-			stringLen = field_4_ole_classname.length();
-			if (stringLen > 0) {
-				result += 1; // flag
-				if (field_3_unicode_flag) {
-					result += stringLen * 2;
-				} else {
-					result += stringLen;
-				}
-			}
-		}
-		// pad to next 2 byte boundary
-		if ((result % 2) != 0) {
-			result ++;
-		}
-		return result;
-	}
-
-	private int getDataSize(int idOffset) {
-
-		int result = 2 + idOffset; // 2 for idOffset short field itself
-		if (field_5_stream_id != null) {
-			result += 4;
-		}
-		return result +  field_6_unknown.length;
-	}
-	protected int getDataSize() {
-		int formulaSize = field_2_refPtg == null ? field_2_unknownFormulaData.length : field_2_refPtg.getSize();
-		int idOffset = getStreamIDOffset(formulaSize);
-		return getDataSize(idOffset);
-	}
-
-	public void serialize(LittleEndianOutput out) {
-
-		int formulaSize = field_2_refPtg == null ? field_2_unknownFormulaData.length : field_2_refPtg.getSize();
-		int idOffset = getStreamIDOffset(formulaSize);
-		int dataSize = getDataSize(idOffset);
-
-
-		out.writeShort(sid);
-		out.writeShort(dataSize);
-
-		out.writeShort(idOffset);
-		out.writeShort(formulaSize);
-		out.writeInt(field_1_unknown_int);
-
-		int pos = 12;
-
-		if (field_2_refPtg == null) {
-			out.write(field_2_unknownFormulaData);
-		} else {
-			field_2_refPtg.write(out);
-		}
-		pos += formulaSize;
-
-		int stringLen;
-		if (field_4_ole_classname == null) {
-			// don't write 0x03, stringLen, flag, text
-			stringLen = 0;
-		} else {
-			out.writeByte(0x03);
-			pos+=1;
-			stringLen = field_4_ole_classname.length();
-			out.writeShort(stringLen);
-			pos+=2;
-			if (stringLen > 0) {
-				out.writeByte(field_3_unicode_flag ? 0x01 : 0x00);
-				pos+=1;
-
-				if (field_3_unicode_flag) {
-					StringUtil.putUnicodeLE(field_4_ole_classname, out);
-					pos += stringLen * 2;
-				} else {
-					StringUtil.putCompressedUnicode(field_4_ole_classname, out);
-					pos += stringLen;
-				}
-			}
-		}
-
-		// pad to next 2-byte boundary (requires 0 or 1 bytes)
-		switch(idOffset - (pos - 6)) { // 6 for 3 shorts: sid, dataSize, idOffset
-			case 1:
-				out.writeByte(field_4_unknownByte == null ? 0x00 : field_4_unknownByte.intValue());
-				pos++;
-				break;
-			case 0:
-				break;
-			default:
-				throw new IllegalStateException("Bad padding calculation (" + idOffset + ", " + pos + ")");
-		}
-
-		if (field_5_stream_id != null) {
-			out.writeInt(field_5_stream_id.intValue());
-			pos += 4;
-		}
-		out.write(field_6_unknown);
-	}
-
-	/**
-	 * Gets the stream ID containing the actual data.  The data itself
-	 * can be found under a top-level directory entry in the OLE2 filesystem
-	 * under the name "MBD<var>xxxxxxxx</var>" where <var>xxxxxxxx</var> is
-	 * this ID converted into hex (in big endian order, funnily enough.)
-	 *
-	 * @return the data stream ID. Possibly <code>null</code>
-	 */
-	public Integer getStreamId() {
-		return field_5_stream_id;
-	}
-
-	public String getOLEClassName() {
-		return field_4_ole_classname;
-	}
-
-	public byte[] getObjectData() {
-		return field_6_unknown;
-	}
-
-	@Override
-	public EmbeddedObjectRefSubRecord clone() {
-		return this; // TODO proper clone
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("[ftPictFmla]\n");
-		sb.append("    .f2unknown     = ").append(HexDump.intToHex(field_1_unknown_int)).append("\n");
-		if (field_2_refPtg == null) {
-			sb.append("    .f3unknown     = ").append(HexDump.toHex(field_2_unknownFormulaData)).append("\n");
-		} else {
-			sb.append("    .formula       = ").append(field_2_refPtg.toString()).append("\n");
-		}
-		if (field_4_ole_classname != null) {
-			sb.append("    .unicodeFlag   = ").append(field_3_unicode_flag).append("\n");
-			sb.append("    .oleClassname  = ").append(field_4_ole_classname).append("\n");
-		}
-		if (field_4_unknownByte != null) {
-			sb.append("    .f4unknown   = ").append(HexDump.byteToHex(field_4_unknownByte.intValue())).append("\n");
-		}
-		if (field_5_stream_id != null) {
-			sb.append("    .streamId      = ").append(HexDump.intToHex(field_5_stream_id.intValue())).append("\n");
-		}
-		if (field_6_unknown.length > 0) {
-			sb.append("    .f7unknown     = ").append(HexDump.toHex(field_6_unknown)).append("\n");
-		}
-		sb.append("[/ftPictFmla]");
-		return sb.toString();
-	}
-	
-	public void setUnknownFormulaData(byte[] formularData) {
-		field_2_unknownFormulaData = formularData;
-	}
-	
-	public void setOleClassname(String oleClassname) {
-		field_4_ole_classname = oleClassname;
-	}
-	
-	public void setStorageId(int storageId) {
-		field_5_stream_id = storageId;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
deleted file mode 100644
index f0a676b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ftEnd (0x0000)<p>
- * 
- * The end data record is used to denote the end of the subrecords.
- */
-public final class EndSubRecord extends SubRecord implements Cloneable {
-    // Note - zero sid is somewhat unusual (compared to plain Records)
-    public final static short sid = 0x0000;
-    private static final int ENCODED_SIZE = 0;
-
-    public EndSubRecord()
-    {
-
-    }
-
-    /**
-     * @param in unused (since this record has no data)
-     * @param size must be 0
-     */
-    public EndSubRecord(LittleEndianInput in, int size) {
-        if ((size & 0xFF) != ENCODED_SIZE) { // mask out random crap in upper byte
-            throw new RecordFormatException("Unexpected size (" + size + ")");
-        }
-    }
-
-    @Override
-    public boolean isTerminating(){
-        return true;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[ftEnd]\n");
-
-        buffer.append("[/ftEnd]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid);
-        out.writeShort(ENCODED_SIZE);
-    }
-
-	protected int getDataSize() {
-        return ENCODED_SIZE;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public EndSubRecord clone() {
-        EndSubRecord rec = new EndSubRecord();
-    
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
deleted file mode 100644
index 01e685c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
+++ /dev/null
@@ -1,813 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherClientDataRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherRecordFactory;
-import org.apache.poi.ddf.EscherSerializationListener;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.ddf.EscherSpgrRecord;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class is used to aggregate the MSODRAWING and OBJ record
- * combinations.  This is necessary due to the bizare way in which
- * these records are serialized.  What happens is that you get a
- * combination of MSODRAWING -&gt; OBJ -&gt; MSODRAWING -&gt; OBJ records
- * but the escher records are serialized _across_ the MSODRAWING
- * records.
- * <p>
- * It gets even worse when you start looking at TXO records.
- * <p>
- * So what we do with this class is aggregate lazily.  That is
- * we don't aggregate the MSODRAWING -&gt; OBJ records unless we
- * need to modify them.
- * <p>
- * At first document contains 4 types of records which belong to drawing layer.
- * There are can be such sequence of record:
- * <p>
- * DrawingRecord
- * ContinueRecord
- * ...
- * ContinueRecord
- * ObjRecord | TextObjectRecord
- * .....
- * ContinueRecord
- * ...
- * ContinueRecord
- * ObjRecord | TextObjectRecord
- * NoteRecord
- * ...
- * NoteRecord
- * <p>
- * To work with shapes we have to read data from Drawing and Continue records into single array of bytes and
- * build escher(office art) records tree from this array.
- * Each shape in drawing layer matches corresponding ObjRecord
- * Each textbox matches corresponding TextObjectRecord
- * <p>
- * ObjRecord contains information about shape. Thus each ObjRecord corresponds EscherContainerRecord(SPGR)
- * <p>
- * EscherAggrefate contains also NoteRecords
- * NoteRecords must be serial
- */
-
-public final class EscherAggregate extends AbstractEscherHolderRecord {
-    public static final short sid = 9876; // not a real sid - dummy value
-    private static POILogger log = POILogFactory.getLogger(EscherAggregate.class);
-
-    public static final short ST_MIN = (short) 0;
-    public static final short ST_NOT_PRIMATIVE = ST_MIN;
-    public static final short ST_RECTANGLE = (short) 1;
-    public static final short ST_ROUNDRECTANGLE = (short) 2;
-    public static final short ST_ELLIPSE = (short) 3;
-    public static final short ST_DIAMOND = (short) 4;
-    public static final short ST_ISOCELESTRIANGLE = (short) 5;
-    public static final short ST_RIGHTTRIANGLE = (short) 6;
-    public static final short ST_PARALLELOGRAM = (short) 7;
-    public static final short ST_TRAPEZOID = (short) 8;
-    public static final short ST_HEXAGON = (short) 9;
-    public static final short ST_OCTAGON = (short) 10;
-    public static final short ST_PLUS = (short) 11;
-    public static final short ST_STAR = (short) 12;
-    public static final short ST_ARROW = (short) 13;
-    public static final short ST_THICKARROW = (short) 14;
-    public static final short ST_HOMEPLATE = (short) 15;
-    public static final short ST_CUBE = (short) 16;
-    public static final short ST_BALLOON = (short) 17;
-    public static final short ST_SEAL = (short) 18;
-    public static final short ST_ARC = (short) 19;
-    public static final short ST_LINE = (short) 20;
-    public static final short ST_PLAQUE = (short) 21;
-    public static final short ST_CAN = (short) 22;
-    public static final short ST_DONUT = (short) 23;
-    public static final short ST_TEXTSIMPLE = (short) 24;
-    public static final short ST_TEXTOCTAGON = (short) 25;
-    public static final short ST_TEXTHEXAGON = (short) 26;
-    public static final short ST_TEXTCURVE = (short) 27;
-    public static final short ST_TEXTWAVE = (short) 28;
-    public static final short ST_TEXTRING = (short) 29;
-    public static final short ST_TEXTONCURVE = (short) 30;
-    public static final short ST_TEXTONRING = (short) 31;
-    public static final short ST_STRAIGHTCONNECTOR1 = (short) 32;
-    public static final short ST_BENTCONNECTOR2 = (short) 33;
-    public static final short ST_BENTCONNECTOR3 = (short) 34;
-    public static final short ST_BENTCONNECTOR4 = (short) 35;
-    public static final short ST_BENTCONNECTOR5 = (short) 36;
-    public static final short ST_CURVEDCONNECTOR2 = (short) 37;
-    public static final short ST_CURVEDCONNECTOR3 = (short) 38;
-    public static final short ST_CURVEDCONNECTOR4 = (short) 39;
-    public static final short ST_CURVEDCONNECTOR5 = (short) 40;
-    public static final short ST_CALLOUT1 = (short) 41;
-    public static final short ST_CALLOUT2 = (short) 42;
-    public static final short ST_CALLOUT3 = (short) 43;
-    public static final short ST_ACCENTCALLOUT1 = (short) 44;
-    public static final short ST_ACCENTCALLOUT2 = (short) 45;
-    public static final short ST_ACCENTCALLOUT3 = (short) 46;
-    public static final short ST_BORDERCALLOUT1 = (short) 47;
-    public static final short ST_BORDERCALLOUT2 = (short) 48;
-    public static final short ST_BORDERCALLOUT3 = (short) 49;
-    public static final short ST_ACCENTBORDERCALLOUT1 = (short) 50;
-    public static final short ST_ACCENTBORDERCALLOUT2 = (short) 51;
-    public static final short ST_ACCENTBORDERCALLOUT3 = (short) 52;
-    public static final short ST_RIBBON = (short) 53;
-    public static final short ST_RIBBON2 = (short) 54;
-    public static final short ST_CHEVRON = (short) 55;
-    public static final short ST_PENTAGON = (short) 56;
-    public static final short ST_NOSMOKING = (short) 57;
-    public static final short ST_SEAL8 = (short) 58;
-    public static final short ST_SEAL16 = (short) 59;
-    public static final short ST_SEAL32 = (short) 60;
-    public static final short ST_WEDGERECTCALLOUT = (short) 61;
-    public static final short ST_WEDGERRECTCALLOUT = (short) 62;
-    public static final short ST_WEDGEELLIPSECALLOUT = (short) 63;
-    public static final short ST_WAVE = (short) 64;
-    public static final short ST_FOLDEDCORNER = (short) 65;
-    public static final short ST_LEFTARROW = (short) 66;
-    public static final short ST_DOWNARROW = (short) 67;
-    public static final short ST_UPARROW = (short) 68;
-    public static final short ST_LEFTRIGHTARROW = (short) 69;
-    public static final short ST_UPDOWNARROW = (short) 70;
-    public static final short ST_IRREGULARSEAL1 = (short) 71;
-    public static final short ST_IRREGULARSEAL2 = (short) 72;
-    public static final short ST_LIGHTNINGBOLT = (short) 73;
-    public static final short ST_HEART = (short) 74;
-    public static final short ST_PICTUREFRAME = (short) 75;
-    public static final short ST_QUADARROW = (short) 76;
-    public static final short ST_LEFTARROWCALLOUT = (short) 77;
-    public static final short ST_RIGHTARROWCALLOUT = (short) 78;
-    public static final short ST_UPARROWCALLOUT = (short) 79;
-    public static final short ST_DOWNARROWCALLOUT = (short) 80;
-    public static final short ST_LEFTRIGHTARROWCALLOUT = (short) 81;
-    public static final short ST_UPDOWNARROWCALLOUT = (short) 82;
-    public static final short ST_QUADARROWCALLOUT = (short) 83;
-    public static final short ST_BEVEL = (short) 84;
-    public static final short ST_LEFTBRACKET = (short) 85;
-    public static final short ST_RIGHTBRACKET = (short) 86;
-    public static final short ST_LEFTBRACE = (short) 87;
-    public static final short ST_RIGHTBRACE = (short) 88;
-    public static final short ST_LEFTUPARROW = (short) 89;
-    public static final short ST_BENTUPARROW = (short) 90;
-    public static final short ST_BENTARROW = (short) 91;
-    public static final short ST_SEAL24 = (short) 92;
-    public static final short ST_STRIPEDRIGHTARROW = (short) 93;
-    public static final short ST_NOTCHEDRIGHTARROW = (short) 94;
-    public static final short ST_BLOCKARC = (short) 95;
-    public static final short ST_SMILEYFACE = (short) 96;
-    public static final short ST_VERTICALSCROLL = (short) 97;
-    public static final short ST_HORIZONTALSCROLL = (short) 98;
-    public static final short ST_CIRCULARARROW = (short) 99;
-    public static final short ST_NOTCHEDCIRCULARARROW = (short) 100;
-    public static final short ST_UTURNARROW = (short) 101;
-    public static final short ST_CURVEDRIGHTARROW = (short) 102;
-    public static final short ST_CURVEDLEFTARROW = (short) 103;
-    public static final short ST_CURVEDUPARROW = (short) 104;
-    public static final short ST_CURVEDDOWNARROW = (short) 105;
-    public static final short ST_CLOUDCALLOUT = (short) 106;
-    public static final short ST_ELLIPSERIBBON = (short) 107;
-    public static final short ST_ELLIPSERIBBON2 = (short) 108;
-    public static final short ST_FLOWCHARTPROCESS = (short) 109;
-    public static final short ST_FLOWCHARTDECISION = (short) 110;
-    public static final short ST_FLOWCHARTINPUTOUTPUT = (short) 111;
-    public static final short ST_FLOWCHARTPREDEFINEDPROCESS = (short) 112;
-    public static final short ST_FLOWCHARTINTERNALSTORAGE = (short) 113;
-    public static final short ST_FLOWCHARTDOCUMENT = (short) 114;
-    public static final short ST_FLOWCHARTMULTIDOCUMENT = (short) 115;
-    public static final short ST_FLOWCHARTTERMINATOR = (short) 116;
-    public static final short ST_FLOWCHARTPREPARATION = (short) 117;
-    public static final short ST_FLOWCHARTMANUALINPUT = (short) 118;
-    public static final short ST_FLOWCHARTMANUALOPERATION = (short) 119;
-    public static final short ST_FLOWCHARTCONNECTOR = (short) 120;
-    public static final short ST_FLOWCHARTPUNCHEDCARD = (short) 121;
-    public static final short ST_FLOWCHARTPUNCHEDTAPE = (short) 122;
-    public static final short ST_FLOWCHARTSUMMINGJUNCTION = (short) 123;
-    public static final short ST_FLOWCHARTOR = (short) 124;
-    public static final short ST_FLOWCHARTCOLLATE = (short) 125;
-    public static final short ST_FLOWCHARTSORT = (short) 126;
-    public static final short ST_FLOWCHARTEXTRACT = (short) 127;
-    public static final short ST_FLOWCHARTMERGE = (short) 128;
-    public static final short ST_FLOWCHARTOFFLINESTORAGE = (short) 129;
-    public static final short ST_FLOWCHARTONLINESTORAGE = (short) 130;
-    public static final short ST_FLOWCHARTMAGNETICTAPE = (short) 131;
-    public static final short ST_FLOWCHARTMAGNETICDISK = (short) 132;
-    public static final short ST_FLOWCHARTMAGNETICDRUM = (short) 133;
-    public static final short ST_FLOWCHARTDISPLAY = (short) 134;
-    public static final short ST_FLOWCHARTDELAY = (short) 135;
-    public static final short ST_TEXTPLAINTEXT = (short) 136;
-    public static final short ST_TEXTSTOP = (short) 137;
-    public static final short ST_TEXTTRIANGLE = (short) 138;
-    public static final short ST_TEXTTRIANGLEINVERTED = (short) 139;
-    public static final short ST_TEXTCHEVRON = (short) 140;
-    public static final short ST_TEXTCHEVRONINVERTED = (short) 141;
-    public static final short ST_TEXTRINGINSIDE = (short) 142;
-    public static final short ST_TEXTRINGOUTSIDE = (short) 143;
-    public static final short ST_TEXTARCHUPCURVE = (short) 144;
-    public static final short ST_TEXTARCHDOWNCURVE = (short) 145;
-    public static final short ST_TEXTCIRCLECURVE = (short) 146;
-    public static final short ST_TEXTBUTTONCURVE = (short) 147;
-    public static final short ST_TEXTARCHUPPOUR = (short) 148;
-    public static final short ST_TEXTARCHDOWNPOUR = (short) 149;
-    public static final short ST_TEXTCIRCLEPOUR = (short) 150;
-    public static final short ST_TEXTBUTTONPOUR = (short) 151;
-    public static final short ST_TEXTCURVEUP = (short) 152;
-    public static final short ST_TEXTCURVEDOWN = (short) 153;
-    public static final short ST_TEXTCASCADEUP = (short) 154;
-    public static final short ST_TEXTCASCADEDOWN = (short) 155;
-    public static final short ST_TEXTWAVE1 = (short) 156;
-    public static final short ST_TEXTWAVE2 = (short) 157;
-    public static final short ST_TEXTWAVE3 = (short) 158;
-    public static final short ST_TEXTWAVE4 = (short) 159;
-    public static final short ST_TEXTINFLATE = (short) 160;
-    public static final short ST_TEXTDEFLATE = (short) 161;
-    public static final short ST_TEXTINFLATEBOTTOM = (short) 162;
-    public static final short ST_TEXTDEFLATEBOTTOM = (short) 163;
-    public static final short ST_TEXTINFLATETOP = (short) 164;
-    public static final short ST_TEXTDEFLATETOP = (short) 165;
-    public static final short ST_TEXTDEFLATEINFLATE = (short) 166;
-    public static final short ST_TEXTDEFLATEINFLATEDEFLATE = (short) 167;
-    public static final short ST_TEXTFADERIGHT = (short) 168;
-    public static final short ST_TEXTFADELEFT = (short) 169;
-    public static final short ST_TEXTFADEUP = (short) 170;
-    public static final short ST_TEXTFADEDOWN = (short) 171;
-    public static final short ST_TEXTSLANTUP = (short) 172;
-    public static final short ST_TEXTSLANTDOWN = (short) 173;
-    public static final short ST_TEXTCANUP = (short) 174;
-    public static final short ST_TEXTCANDOWN = (short) 175;
-    public static final short ST_FLOWCHARTALTERNATEPROCESS = (short) 176;
-    public static final short ST_FLOWCHARTOFFPAGECONNECTOR = (short) 177;
-    public static final short ST_CALLOUT90 = (short) 178;
-    public static final short ST_ACCENTCALLOUT90 = (short) 179;
-    public static final short ST_BORDERCALLOUT90 = (short) 180;
-    public static final short ST_ACCENTBORDERCALLOUT90 = (short) 181;
-    public static final short ST_LEFTRIGHTUPARROW = (short) 182;
-    public static final short ST_SUN = (short) 183;
-    public static final short ST_MOON = (short) 184;
-    public static final short ST_BRACKETPAIR = (short) 185;
-    public static final short ST_BRACEPAIR = (short) 186;
-    public static final short ST_SEAL4 = (short) 187;
-    public static final short ST_DOUBLEWAVE = (short) 188;
-    public static final short ST_ACTIONBUTTONBLANK = (short) 189;
-    public static final short ST_ACTIONBUTTONHOME = (short) 190;
-    public static final short ST_ACTIONBUTTONHELP = (short) 191;
-    public static final short ST_ACTIONBUTTONINFORMATION = (short) 192;
-    public static final short ST_ACTIONBUTTONFORWARDNEXT = (short) 193;
-    public static final short ST_ACTIONBUTTONBACKPREVIOUS = (short) 194;
-    public static final short ST_ACTIONBUTTONEND = (short) 195;
-    public static final short ST_ACTIONBUTTONBEGINNING = (short) 196;
-    public static final short ST_ACTIONBUTTONRETURN = (short) 197;
-    public static final short ST_ACTIONBUTTONDOCUMENT = (short) 198;
-    public static final short ST_ACTIONBUTTONSOUND = (short) 199;
-    public static final short ST_ACTIONBUTTONMOVIE = (short) 200;
-    public static final short ST_HOSTCONTROL = (short) 201;
-    public static final short ST_TEXTBOX = (short) 202;
-    public static final short ST_NIL = (short) 0x0FFF;
-
-    /**
-     * Maps shape container objects to their {@link TextObjectRecord} or {@link ObjRecord}
-     */
-    private final Map<EscherRecord, Record> shapeToObj = new HashMap<EscherRecord, Record>();
-
-    /**
-     * list of "tail" records that need to be serialized after all drawing group records
-     */
-    private final Map<Integer, NoteRecord> tailRec = new LinkedHashMap<Integer, NoteRecord>();
-
-    /**
-     * create new EscherAggregate
-     * @param createDefaultTree if true creates base tree of the escher records, see EscherAggregate.buildBaseTree()
-     *                          else return empty escher aggregate
-     */
-    public EscherAggregate(boolean createDefaultTree) {
-        if (createDefaultTree){
-            buildBaseTree();
-        }
-    }
-
-    /**
-     * @return Returns the current sid.
-     */
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * Calculates the string representation of this record.  This is
-     * simply a dump of all the records.
-     */
-    public String toString() {
-        String nl = System.getProperty("line.separtor");
-
-        StringBuilder result = new StringBuilder();
-        result.append('[').append(getRecordName()).append(']').append(nl);
-        for (EscherRecord escherRecord : getEscherRecords()) {
-            result.append(escherRecord.toString());
-        }
-        result.append("[/").append(getRecordName()).append(']').append(nl);
-
-        return result.toString();
-    }
-
-    /**
-     * Calculates the xml representation of this record.  This is
-     * simply a dump of all the records.
-     * @param tab - string which must be added before each line (used by default '\t')
-     * @return xml representation of the all aggregated records
-     */
-    public String toXml(String tab) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(tab).append("<").append(getRecordName()).append(">\n");
-        for (EscherRecord escherRecord : getEscherRecords()) {
-            builder.append(escherRecord.toXml(tab + "\t"));
-        }
-        builder.append(tab).append("</").append(getRecordName()).append(">\n");
-        return builder.toString();
-    }
-
-    /**
-     * @param sid - record sid we want to check if it belongs to drawing layer
-     * @return true if record is instance of DrawingRecord or ContinueRecord or ObjRecord or TextObjRecord
-     */
-    private static boolean isDrawingLayerRecord(final short sid) {
-        return sid == DrawingRecord.sid ||
-                sid == ContinueRecord.sid ||
-                sid == ObjRecord.sid ||
-                sid == TextObjectRecord.sid;
-    }
-
-    /**
-     * Collapses the drawing records into an aggregate.
-     * read Drawing, Obj, TxtObj, Note and Continue records into single byte array,
-     * create Escher tree from byte array, create map &lt;EscherRecord, Record&gt;
-     *
-     * @param records - list of all records inside sheet
-     * @param locFirstDrawingRecord - location of the first DrawingRecord inside sheet
-     * @return new EscherAggregate create from all aggregated records which belong to drawing layer
-     */
-    public static EscherAggregate createAggregate(List<RecordBase> records, int locFirstDrawingRecord) {
-        // Keep track of any shape records created so we can match them back to the object id's.
-        // Textbox objects are also treated as shape objects.
-        final List<EscherRecord> shapeRecords = new ArrayList<EscherRecord>();
-        EscherRecordFactory recordFactory = new DefaultEscherRecordFactory() {
-            public EscherRecord createRecord(byte[] data, int offset) {
-                EscherRecord r = super.createRecord(data, offset);
-                if (r.getRecordId() == EscherClientDataRecord.RECORD_ID || r.getRecordId() == EscherTextboxRecord.RECORD_ID) {
-                    shapeRecords.add(r);
-                }
-                return r;
-            }
-        };
-
-        // Create one big buffer
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        EscherAggregate agg = new EscherAggregate(false);
-        int loc = locFirstDrawingRecord;
-        while (loc + 1 < records.size()
-                && (isDrawingLayerRecord(sid(records, loc)))) {
-            try {
-                if (!(sid(records, loc) == DrawingRecord.sid || sid(records, loc) == ContinueRecord.sid)) {
-                    loc++;
-                    continue;
-                }
-                if (sid(records, loc) == DrawingRecord.sid) {
-                    buffer.write(((DrawingRecord) records.get(loc)).getRecordData());
-                } else {
-                    buffer.write(((ContinueRecord) records.get(loc)).getData());
-                }
-            } catch (IOException e) {
-                throw new RuntimeException("Couldn't get data from drawing/continue records", e);
-            }
-            loc++;
-        }
-
-        // Decode the shapes
-        // agg.escherRecords = new ArrayList();
-        int pos = 0;
-        while (pos < buffer.size()) {
-            EscherRecord r = recordFactory.createRecord(buffer.toByteArray(), pos);
-            int bytesRead = r.fillFields(buffer.toByteArray(), pos, recordFactory);
-            agg.addEscherRecord(r);
-            pos += bytesRead;
-        }
-
-        // Associate the object records with the shapes
-        loc = locFirstDrawingRecord + 1;
-        int shapeIndex = 0;
-        while (loc < records.size()
-                && (isDrawingLayerRecord(sid(records, loc)))) {
-            if (!isObjectRecord(records, loc)) {
-                loc++;
-                continue;
-            }
-            Record objRecord = (Record) records.get(loc);
-            agg.shapeToObj.put(shapeRecords.get(shapeIndex++), objRecord);
-            loc++;
-        }
-
-        // any NoteRecords that follow the drawing block must be aggregated and and saved in the tailRec collection
-        while (loc < records.size()) {
-            if (sid(records, loc) == NoteRecord.sid) {
-                NoteRecord r = (NoteRecord) records.get(loc);
-                agg.tailRec.put(r.getShapeId(), r);
-            } else {
-                break;
-            }
-            loc++;
-        }
-
-        int locLastDrawingRecord = loc;
-        // replace drawing block with the created EscherAggregate
-        records.subList(locFirstDrawingRecord, locLastDrawingRecord).clear();
-        records.add(locFirstDrawingRecord, agg);
-        return agg;
-    }
-
-    /**
-     * Serializes this aggregate to a byte array.  Since this is an aggregate
-     * record it will effectively serialize the aggregated records.
-     *
-     * @param offset The offset into the start of the array.
-     * @param data   The byte array to serialize to.
-     * @return The number of bytes serialized.
-     */
-    public int serialize(int offset, byte[] data) {
-        // Determine buffer size
-        List <EscherRecord>records = getEscherRecords();
-        int size = getEscherRecordSize(records);
-        byte[] buffer = new byte[size];
-
-        // Serialize escher records into one big data structure and keep note of ending offsets.
-        final List <Integer>spEndingOffsets = new ArrayList<Integer>();
-        final List <EscherRecord> shapes = new ArrayList<EscherRecord>();
-        int pos = 0;
-        for (Object record : records) {
-            EscherRecord e = (EscherRecord) record;
-            pos += e.serialize(pos, buffer, new EscherSerializationListener() {
-                public void beforeRecordSerialize(int offset, short recordId, EscherRecord record) {
-                }
-
-                public void afterRecordSerialize(int offset, short recordId, int size, EscherRecord record) {
-                    if (recordId == EscherClientDataRecord.RECORD_ID || recordId == EscherTextboxRecord.RECORD_ID) {
-                        spEndingOffsets.add(offset);
-                        shapes.add(record);
-                    }
-                }
-            });
-        }
-        shapes.add(0, null);
-        spEndingOffsets.add(0, 0);
-
-        // Split escher records into separate MSODRAWING and OBJ, TXO records.  (We don't break on
-        // the first one because it's the patriach).
-        pos = offset;
-        int writtenEscherBytes = 0;
-        int i;
-        for (i = 1; i < shapes.size(); i++) {
-            int endOffset = spEndingOffsets.get(i) - 1;
-            int startOffset;
-            if (i == 1)
-                startOffset = 0;
-            else
-                startOffset = spEndingOffsets.get(i - 1);
-
-            byte[] drawingData = new byte[endOffset - startOffset + 1];
-            System.arraycopy(buffer, startOffset, drawingData, 0, drawingData.length);
-            pos += writeDataIntoDrawingRecord(drawingData, writtenEscherBytes, pos, data, i);
-
-            writtenEscherBytes += drawingData.length;
-
-            // Write the matching OBJ record
-            Record obj = shapeToObj.get(shapes.get(i));
-            pos += obj.serialize(pos, data);
-
-            if (i == shapes.size() - 1 && endOffset < buffer.length - 1) {
-                drawingData = new byte[buffer.length - endOffset - 1];
-                System.arraycopy(buffer, endOffset + 1, drawingData, 0, drawingData.length);
-                pos += writeDataIntoDrawingRecord(drawingData, writtenEscherBytes, pos, data, i);
-            }
-        }
-        if ((pos - offset) < buffer.length - 1) {
-            byte[] drawingData = new byte[buffer.length - (pos - offset)];
-            System.arraycopy(buffer, (pos - offset), drawingData, 0, drawingData.length);
-            pos += writeDataIntoDrawingRecord(drawingData, writtenEscherBytes, pos, data, i);
-        }
-
-        for (NoteRecord noteRecord : tailRec.values()) {
-            Record rec = (Record) noteRecord;
-            pos += rec.serialize(pos, data);
-        }
-        int bytesWritten = pos - offset;
-        if (bytesWritten != getRecordSize())
-            throw new RecordFormatException(bytesWritten + " bytes written but getRecordSize() reports " + getRecordSize());
-        return bytesWritten;
-    }
-
-    /**
-     * @param drawingData - escher records saved into single byte array
-     * @param writtenEscherBytes - count of bytes already saved into drawing records (we should know it to decide create
-     *                           drawing or continue record)
-     * @param pos current position of data array
-     * @param data - array of bytes where drawing records must be serialized
-     * @param i - number of shape, saved into data array
-     * @return offset of data array after serialization
-     */
-    private int writeDataIntoDrawingRecord(byte[] drawingData, int writtenEscherBytes, int pos, byte[] data, int i) {
-        int temp = 0;
-        //First record in drawing layer MUST be DrawingRecord
-        if (writtenEscherBytes + drawingData.length > RecordInputStream.MAX_RECORD_DATA_SIZE && i != 1) {
-            for (int j = 0; j < drawingData.length; j += RecordInputStream.MAX_RECORD_DATA_SIZE) {
-                byte[] buf = new byte[Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j)];
-                System.arraycopy(drawingData, j, buf, 0, Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j));
-                ContinueRecord drawing = new ContinueRecord(buf);
-                temp += drawing.serialize(pos + temp, data);
-            }
-        } else {
-            for (int j = 0; j < drawingData.length; j += RecordInputStream.MAX_RECORD_DATA_SIZE) {
-                if (j == 0) {
-                    DrawingRecord drawing = new DrawingRecord();
-                    byte[] buf = new byte[Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j)];
-                    System.arraycopy(drawingData, j, buf, 0, Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j));
-                    drawing.setData(buf);
-                    temp += drawing.serialize(pos + temp, data);
-                } else {
-                    byte[] buf = new byte[Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j)];
-                    System.arraycopy(drawingData, j, buf, 0, Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j));
-                    ContinueRecord drawing = new ContinueRecord(buf);
-                    temp += drawing.serialize(pos + temp, data);
-                }
-            }
-        }
-        return temp;
-    }
-
-    /**
-     * How many bytes do the raw escher records contain.
-     *
-     * @param records List of escher records
-     * @return the number of bytes
-     */
-    private int getEscherRecordSize(List<EscherRecord> records) {
-        int size = 0;
-        for (EscherRecord record : records){
-            size += record.getRecordSize();
-        }
-        return size;
-    }
-
-    /**
-     * @return record size, including header size of obj, text, note, drawing, continue records
-     */
-    public int getRecordSize() {
-        // To determine size of aggregate record we have to know size of each DrawingRecord because if DrawingRecord
-        // is split into several continue records we have to add header size to total EscherAggregate size
-        int continueRecordsHeadersSize = 0;
-        // Determine buffer size
-        List<EscherRecord> records = getEscherRecords();
-        int rawEscherSize = getEscherRecordSize(records);
-        byte[] buffer = new byte[rawEscherSize];
-        final List<Integer> spEndingOffsets = new ArrayList<Integer>();
-        int pos = 0;
-        for (EscherRecord e : records) {
-            pos += e.serialize(pos, buffer, new EscherSerializationListener() {
-                public void beforeRecordSerialize(int offset, short recordId, EscherRecord record) {
-                }
-
-                public void afterRecordSerialize(int offset, short recordId, int size, EscherRecord record) {
-                    if (recordId == EscherClientDataRecord.RECORD_ID || recordId == EscherTextboxRecord.RECORD_ID) {
-                        spEndingOffsets.add(offset);
-                    }
-                }
-            });
-        }
-        spEndingOffsets.add(0, 0);
-
-        for (int i = 1; i < spEndingOffsets.size(); i++) {
-            if (i == spEndingOffsets.size() - 1 && spEndingOffsets.get(i) < pos) {
-                continueRecordsHeadersSize += 4;
-            }
-            if (spEndingOffsets.get(i) - spEndingOffsets.get(i - 1) <= RecordInputStream.MAX_RECORD_DATA_SIZE) {
-                continue;
-            }
-            continueRecordsHeadersSize += ((spEndingOffsets.get(i) - spEndingOffsets.get(i - 1)) / RecordInputStream.MAX_RECORD_DATA_SIZE) * 4;
-        }
-
-        int drawingRecordSize = rawEscherSize + (shapeToObj.size()) * 4;
-        if (rawEscherSize != 0 && spEndingOffsets.size() == 1/**EMPTY**/) {
-            continueRecordsHeadersSize += 4;
-        }
-        int objRecordSize = 0;
-        for (Record r : shapeToObj.values()) {
-            objRecordSize += r.getRecordSize();
-        }
-        int tailRecordSize = 0;
-        for (NoteRecord noteRecord : tailRec.values()) {
-            tailRecordSize += noteRecord.getRecordSize();
-        }
-        return drawingRecordSize + objRecordSize + tailRecordSize + continueRecordsHeadersSize;
-    }
-
-    /**
-     * Associates an escher record to an OBJ record or a TXO record.
-     * @param r - ClientData or Textbox record
-     * @param objRecord - Obj or TextObj record
-     */
-    public void associateShapeToObjRecord(EscherRecord r, Record objRecord) {
-        shapeToObj.put(r, objRecord);
-    }
-
-    /**
-     * Remove echerRecord and associated to it Obj or TextObj record
-     * @param rec - clientData or textbox record to be removed
-     */
-    public void removeShapeToObjRecord(EscherRecord rec) {
-        shapeToObj.remove(rec);
-    }
-
-    /**
-     * @return "ESCHERAGGREGATE"
-     */
-    protected String getRecordName() {
-        return "ESCHERAGGREGATE";
-    }
-
-    // =============== Private methods ========================
-
-    /**
-     *
-     * @param records list of the record to look inside
-     * @param loc location of the checked record
-     * @return true if record is instance of ObjRecord or TextObjectRecord
-     */
-    private static boolean isObjectRecord(List <RecordBase>records, int loc) {
-        return sid(records, loc) == ObjRecord.sid || sid(records, loc) == TextObjectRecord.sid;
-    }
-
-    /**
-     * create base tree with such structure:
-     * EscherDgContainer
-     * -EscherSpgrContainer
-     * --EscherSpContainer
-     * ---EscherSpRecord
-     * ---EscherSpgrRecord
-     * ---EscherSpRecord
-     * -EscherDgRecord
-     *
-     * id of DgRecord and SpRecord are empty and must be set later by HSSFPatriarch
-     */
-    private void buildBaseTree() {
-        EscherContainerRecord dgContainer = new EscherContainerRecord();
-        EscherContainerRecord spgrContainer = new EscherContainerRecord();
-        EscherContainerRecord spContainer1 = new EscherContainerRecord();
-        EscherSpgrRecord spgr = new EscherSpgrRecord();
-        EscherSpRecord sp1 = new EscherSpRecord();
-        dgContainer.setRecordId(EscherContainerRecord.DG_CONTAINER);
-        dgContainer.setOptions((short) 0x000F);
-        EscherDgRecord dg = new EscherDgRecord();
-        dg.setRecordId(EscherDgRecord.RECORD_ID);
-        short dgId = 1;
-        dg.setOptions((short) (dgId << 4));
-        dg.setNumShapes(0);
-        dg.setLastMSOSPID(1024);
-        spgrContainer.setRecordId(EscherContainerRecord.SPGR_CONTAINER);
-        spgrContainer.setOptions((short) 0x000F);
-        spContainer1.setRecordId(EscherContainerRecord.SP_CONTAINER);
-        spContainer1.setOptions((short) 0x000F);
-        spgr.setRecordId(EscherSpgrRecord.RECORD_ID);
-        spgr.setOptions((short) 0x0001);    // version
-        spgr.setRectX1(0);
-        spgr.setRectY1(0);
-        spgr.setRectX2(1023);
-        spgr.setRectY2(255);
-        sp1.setRecordId(EscherSpRecord.RECORD_ID);
-
-        sp1.setOptions((short) 0x0002);
-        sp1.setVersion((short) 0x2);
-        sp1.setShapeId(-1);
-        sp1.setFlags(EscherSpRecord.FLAG_GROUP | EscherSpRecord.FLAG_PATRIARCH);
-        dgContainer.addChildRecord(dg);
-        dgContainer.addChildRecord(spgrContainer);
-        spgrContainer.addChildRecord(spContainer1);
-        spContainer1.addChildRecord(spgr);
-        spContainer1.addChildRecord(sp1);
-        addEscherRecord(dgContainer);
-    }
-
-    /**
-     * EscherDgContainer
-     * -EscherSpgrContainer
-     * -EscherDgRecord - set id for this record
-     * set id for DgRecord of DgContainer
-     * @param dgId - id which must be set
-     */
-    public void setDgId(short dgId) {
-        EscherContainerRecord dgContainer = getEscherContainer();
-        EscherDgRecord dg = dgContainer.getChildById(EscherDgRecord.RECORD_ID);
-        dg.setOptions((short) (dgId << 4));
-    }
-
-    /**
-     * EscherDgContainer
-     * -EscherSpgrContainer
-     * --EscherSpContainer
-     * ---EscherSpRecord -set id for this record
-     * ---***
-     * --***
-     * -EscherDgRecord
-     * set id for the sp record of the first spContainer in main spgrConatiner
-     * @param shapeId - id which must be set
-     */
-    public void setMainSpRecordId(int shapeId) {
-        EscherContainerRecord dgContainer = getEscherContainer();
-        EscherContainerRecord spgrConatiner = (EscherContainerRecord) dgContainer.getChildById(EscherContainerRecord.SPGR_CONTAINER);
-        EscherContainerRecord spContainer = (EscherContainerRecord) spgrConatiner.getChild(0);
-        EscherSpRecord sp = (EscherSpRecord) spContainer.getChildById(EscherSpRecord.RECORD_ID);
-        sp.setShapeId(shapeId);
-    }
-
-    /**
-     * @param records list of records to look into
-     * @param loc - location of the record which sid must be returned
-     * @return sid of the record with selected location
-     */
-    private static short sid(List<RecordBase> records, int loc) {
-        RecordBase record = records.get(loc);
-        if (record instanceof Record) {
-            return ((Record)record).getSid();
-        } else {
-            // Aggregates don't have a sid
-            // We could step into them, but for these needs we don't care
-            return -1;
-        }
-    }
-
-    /**
-     * @return unmodifiable copy of the mapping  of {@link EscherClientDataRecord} and {@link EscherTextboxRecord}
-     * to their {@link TextObjectRecord} or {@link ObjRecord} .
-     * <p>
-     * We need to access it outside of EscherAggregate when building shapes
-     */
-    public Map<EscherRecord, Record> getShapeToObjMapping() {
-        return Collections.unmodifiableMap(shapeToObj);
-    }
-
-    /**
-     * @return unmodifiable copy of tail records. We need to access them when building shapes.
-     *         Every HSSFComment shape has a link to a NoteRecord from the tailRec collection.
-     */
-    public Map<Integer, NoteRecord> getTailRecords() {
-        return Collections.unmodifiableMap(tailRec);
-    }
-
-    /**
-     * @param obj - ObjRecord with id == NoteRecord.id
-     * @return null if note record is not found else returns note record with id == obj.id
-     */
-    public NoteRecord getNoteRecordByObj(ObjRecord obj) {
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) obj.getSubRecords().get(0);
-        return tailRec.get(cod.getObjectId());
-    }
-
-    /**
-     * Add tail record to existing map
-     * @param note to be added
-     */
-    public void addTailRecord(NoteRecord note) {
-        tailRec.put(note.getShapeId(), note);
-    }
-
-    /**
-     * Remove tail record from the existing map
-     * @param note to be removed
-     */
-    public void removeTailRecord(NoteRecord note) {
-        tailRec.remove(note.getShapeId());
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java
deleted file mode 100644
index 3732fd5..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.cont.ContinuableRecord;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.util.LittleEndianOutput;
-
-import java.util.ArrayList;
-
-/**
- * Title:        Extended Static String Table (0x00FF)<p>
- * Description: This record is used for a quick lookup into the SST record. This
- *              record breaks the SST table into a set of buckets. The offsets
- *              to these buckets within the SST record are kept as well as the
- *              position relative to the start of the SST record.<p>
- * REFERENCE:  PG 313 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class ExtSSTRecord extends ContinuableRecord {
-    public final static short sid = 0x00FF;
-    public static final int DEFAULT_BUCKET_SIZE = 8;
-    //Can't seem to find this documented but from the biffviewer it is clear that
-    //Excel only records the indexes for the first 128 buckets.
-    public static final int MAX_BUCKETS = 128;
-    
-    
-    public static final class InfoSubRecord {
-    	public static final int ENCODED_SIZE = 8;
-        private int field_1_stream_pos;          // stream pointer to the SST record
-        private int field_2_bucket_sst_offset;   // don't really understand this yet.
-        /** unused - supposed to be zero */
-        private short field_3_zero;
-
-        /**
-         * Creates new ExtSSTInfoSubRecord
-         * 
-         * @param streamPos stream pointer to the SST record
-         * @param bucketSstOffset ... don't really understand this yet
-         */
-        public InfoSubRecord(int streamPos, int bucketSstOffset) {
-            field_1_stream_pos        = streamPos;
-            field_2_bucket_sst_offset = bucketSstOffset;
-        }
-
-        public InfoSubRecord(RecordInputStream in)
-        {
-            field_1_stream_pos        = in.readInt();
-            field_2_bucket_sst_offset = in.readShort();
-            field_3_zero              = in.readShort();
-        }
-
-        public int getStreamPos() {
-            return field_1_stream_pos;
-        }
-
-        public int getBucketSSTOffset() {
-            return field_2_bucket_sst_offset;
-        }
-
-        public void serialize(LittleEndianOutput out) {
-            out.writeInt(field_1_stream_pos);
-            out.writeShort(field_2_bucket_sst_offset);
-            out.writeShort(field_3_zero);
-        }
-    }
-    
-    
-    private short _stringsPerBucket;
-    private InfoSubRecord[] _sstInfos;
-
-
-    public ExtSSTRecord() {
-    	_stringsPerBucket = DEFAULT_BUCKET_SIZE;
-        _sstInfos = new InfoSubRecord[0];
-    }
-
-    public ExtSSTRecord(RecordInputStream in) {
-        _stringsPerBucket = in.readShort();
-
-        int nInfos = in.remaining() / InfoSubRecord.ENCODED_SIZE;
-        ArrayList<InfoSubRecord> lst = new ArrayList<InfoSubRecord>(nInfos);
-
-        while (in.available() > 0) {
-            InfoSubRecord info = new InfoSubRecord(in);
-            lst.add(info);
-
-            if(in.available() == 0 && in.hasNextRecord() && in.getNextSid() == ContinueRecord.sid) {
-                in.nextRecord();
-            }
-        }
-        _sstInfos = lst.toArray(new InfoSubRecord[lst.size()]);
-    }
-
-    public void setNumStringsPerBucket(short numStrings) {
-        _stringsPerBucket = numStrings;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[EXTSST]\n");
-        buffer.append("    .dsst           = ")
-            .append(Integer.toHexString(_stringsPerBucket))
-            .append("\n");
-        buffer.append("    .numInfoRecords = ").append(_sstInfos.length)
-            .append("\n");
-        for (int k = 0; k < _sstInfos.length; k++)
-        {
-            buffer.append("    .inforecord     = ").append(k).append("\n");
-            buffer.append("    .streampos      = ")
-                .append(Integer
-                .toHexString(_sstInfos[k].getStreamPos())).append("\n");
-            buffer.append("    .sstoffset      = ")
-                .append(Integer
-                .toHexString(_sstInfos[k].getBucketSSTOffset()))
-                    .append("\n");
-        }
-        buffer.append("[/EXTSST]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(ContinuableRecordOutput out) {
-        out.writeShort(_stringsPerBucket);
-        for (int k = 0; k < _sstInfos.length; k++) {
-            _sstInfos[k].serialize(out);
-        }
-    }
-    protected int getDataSize() {
-    	return 2 + InfoSubRecord.ENCODED_SIZE*_sstInfos.length;
-    }
-
-    protected InfoSubRecord[] getInfoSubRecords() {
-        return _sstInfos;
-    }
-
-    public static final int getNumberOfInfoRecsForStrings(int numStrings) {
-      int infoRecs = (numStrings / DEFAULT_BUCKET_SIZE);
-      if ((numStrings % DEFAULT_BUCKET_SIZE) != 0)
-        infoRecs ++;
-      //Excel seems to max out after 128 info records.
-      //This isn't really documented anywhere...
-      if (infoRecs > MAX_BUCKETS)
-        infoRecs = MAX_BUCKETS;
-      return infoRecs;
-    }
-
-    /**
-     * Given a number of strings (in the sst), returns the size of the extsst record
-     * 
-     * @param numStrings the number of strings
-     * 
-     * @return the size of the extsst record
-     */
-    public static final int getRecordSizeForStrings(int numStrings) {
-        return 4 + 2 + getNumberOfInfoRecsForStrings(numStrings) * 8;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public void setBucketOffsets(int[] bucketAbsoluteOffsets, int[] bucketRelativeOffsets) {
-    	// TODO - replace no-arg constructor with this logic
-        _sstInfos = new InfoSubRecord[bucketAbsoluteOffsets.length];
-        for (int i = 0; i < bucketAbsoluteOffsets.length; i++) {
-            _sstInfos[i] = new InfoSubRecord(bucketAbsoluteOffsets[i], bucketRelativeOffsets[i]);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
deleted file mode 100644
index 3d04368..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
+++ /dev/null
@@ -1,1873 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Extended Format Record
- * Description:  Probably one of the more complex records.  There are two breeds:
- *               Style and Cell.
- *<P>
- *               It should be noted that fields in the extended format record are
- *               somewhat arbitrary.  Almost all of the fields are bit-level, but
- *               we name them as best as possible by functional group.  In some
- *               places this is better than others.
- *<P>
- *
- * REFERENCE:  PG 426 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
-
- * @since 2.0-pre
- */
-
-public final class ExtendedFormatRecord
-    extends StandardRecord
-{
-    public static final short     sid                 = 0xE0;
-
-    // null constant
-    public static final short     NULL                = (short)0xfff0;
-
-    // xf type
-    public static final short     XF_STYLE            = 1;
-    public static final short     XF_CELL             = 0;
-
-    // borders
-    public static final short     NONE                = 0x0;
-    public static final short     THIN                = 0x1;
-    public static final short     MEDIUM              = 0x2;
-    public static final short     DASHED              = 0x3;
-    public static final short     DOTTED              = 0x4;
-    public static final short     THICK               = 0x5;
-    public static final short     DOUBLE              = 0x6;
-    public static final short     HAIR                = 0x7;
-    public static final short     MEDIUM_DASHED       = 0x8;
-    public static final short     DASH_DOT            = 0x9;
-    public static final short     MEDIUM_DASH_DOT     = 0xA;
-    public static final short     DASH_DOT_DOT        = 0xB;
-    public static final short     MEDIUM_DASH_DOT_DOT = 0xC;
-    public static final short     SLANTED_DASH_DOT    = 0xD;
-
-    // alignment
-    public static final short     GENERAL             = 0x0;
-    public static final short     LEFT                = 0x1;
-    public static final short     CENTER              = 0x2;
-    public static final short     RIGHT               = 0x3;
-    public static final short     FILL                = 0x4;
-    public static final short     JUSTIFY             = 0x5;
-    public static final short     CENTER_SELECTION    = 0x6;
-
-    // vertical alignment
-    public static final short     VERTICAL_TOP        = 0x0;
-    public static final short     VERTICAL_CENTER     = 0x1;
-    public static final short     VERTICAL_BOTTOM     = 0x2;
-    public static final short     VERTICAL_JUSTIFY    = 0x3;
-
-    // fill
-    public static final short     NO_FILL             = 0  ;
-    public static final short     SOLID_FILL          = 1  ;
-    public static final short     FINE_DOTS           = 2  ;
-    public static final short     ALT_BARS            = 3  ;
-    public static final short     SPARSE_DOTS         = 4  ;
-    public static final short     THICK_HORZ_BANDS    = 5  ;
-    public static final short     THICK_VERT_BANDS    = 6  ;
-    public static final short     THICK_BACKWARD_DIAG = 7  ;
-    public static final short     THICK_FORWARD_DIAG  = 8  ;
-    public static final short     BIG_SPOTS           = 9  ;
-    public static final short     BRICKS              = 10 ;
-    public static final short     THIN_HORZ_BANDS     = 11 ;
-    public static final short     THIN_VERT_BANDS     = 12 ;
-    public static final short     THIN_BACKWARD_DIAG  = 13 ;
-    public static final short     THIN_FORWARD_DIAG   = 14 ;
-    public static final short     SQUARES             = 15 ;
-    public static final short     DIAMONDS            = 16 ;
-
-    // fields in BOTH style and Cell XF records
-    private short                 field_1_font_index;             // not bit-mapped
-    private short                 field_2_format_index;           // not bit-mapped
-
-    // field_3_cell_options bit map
-    private static final BitField _locked       = BitFieldFactory.getInstance(0x0001);
-    private static final BitField _hidden       = BitFieldFactory.getInstance(0x0002);
-    private static final BitField _xf_type      = BitFieldFactory.getInstance(0x0004);
-    private static final BitField _123_prefix   = BitFieldFactory.getInstance(0x0008);
-    private static final BitField _parent_index = BitFieldFactory.getInstance(0xFFF0);
-    private short                 field_3_cell_options;
-
-    // field_4_alignment_options bit map
-    private static final BitField _alignment          = BitFieldFactory.getInstance(0x0007);
-    private static final BitField _wrap_text          = BitFieldFactory.getInstance(0x0008);
-    private static final BitField _vertical_alignment = BitFieldFactory.getInstance(0x0070);
-    private static final BitField _justify_last       = BitFieldFactory.getInstance(0x0080);
-    private static final BitField _rotation           = BitFieldFactory.getInstance(0xFF00);
-    private short                 field_4_alignment_options;
-
-    // field_5_indention_options
-    private static final BitField _indent                         =
-        BitFieldFactory.getInstance(0x000F);
-    private static final BitField _shrink_to_fit                  =
-        BitFieldFactory.getInstance(0x0010);
-    private static final BitField _merge_cells                    =
-        BitFieldFactory.getInstance(0x0020);
-    private static final BitField _reading_order                  =
-        BitFieldFactory.getInstance(0x00C0);
-
-    // apparently bits 8 and 9 are unused
-    private static final BitField _indent_not_parent_format       =
-        BitFieldFactory.getInstance(0x0400);
-    private static final BitField _indent_not_parent_font         =
-        BitFieldFactory.getInstance(0x0800);
-    private static final BitField _indent_not_parent_alignment    =
-        BitFieldFactory.getInstance(0x1000);
-    private static final BitField _indent_not_parent_border       =
-        BitFieldFactory.getInstance(0x2000);
-    private static final BitField _indent_not_parent_pattern      =
-        BitFieldFactory.getInstance(0x4000);
-    private static final BitField _indent_not_parent_cell_options =
-        BitFieldFactory.getInstance(0x8000);
-    private short                 field_5_indention_options;
-
-    // field_6_border_options bit map
-    private static final BitField _border_left   = BitFieldFactory.getInstance(0x000F);
-    private static final BitField _border_right  = BitFieldFactory.getInstance(0x00F0);
-    private static final BitField _border_top    = BitFieldFactory.getInstance(0x0F00);
-    private static final BitField _border_bottom = BitFieldFactory.getInstance(0xF000);
-    private short                 field_6_border_options;
-
-    // all three of the following attributes are palette options
-    // field_7_palette_options bit map
-    private static final BitField _left_border_palette_idx  =
-        BitFieldFactory.getInstance(0x007F);
-    private static final BitField _right_border_palette_idx =
-        BitFieldFactory.getInstance(0x3F80);
-    private static final BitField _diag                     =
-        BitFieldFactory.getInstance(0xC000);
-    private short                 field_7_palette_options;
-
-    // field_8_adtl_palette_options bit map
-    private static final BitField _top_border_palette_idx    =
-        BitFieldFactory.getInstance(0x0000007F);
-    private static final BitField _bottom_border_palette_idx =
-        BitFieldFactory.getInstance(0x00003F80);
-    private static final BitField _adtl_diag                 =
-        BitFieldFactory.getInstance(0x001fc000);
-    private static final BitField _adtl_diag_line_style      =
-        BitFieldFactory.getInstance(0x01e00000);
-
-    // apparently bit 25 is unused
-    private static final BitField _adtl_fill_pattern         =
-        BitFieldFactory.getInstance(0xfc000000);
-    private int                   field_8_adtl_palette_options;   // additional to avoid 2
-
-    // field_9_fill_palette_options bit map
-    private static final BitField _fill_foreground = BitFieldFactory.getInstance(0x007F);
-    private static final BitField _fill_background = BitFieldFactory.getInstance(0x3f80);
-
-    // apparently bits 15 and 14 are unused
-    private short                 field_9_fill_palette_options;
-
-    /**
-     * Constructor ExtendedFormatRecord
-     *
-     *
-     */
-
-    public ExtendedFormatRecord()
-    {
-    }
-
-    public ExtendedFormatRecord(RecordInputStream in)
-    {
-        field_1_font_index           = in.readShort();
-        field_2_format_index         = in.readShort();
-        field_3_cell_options         = in.readShort();
-        field_4_alignment_options    = in.readShort();
-        field_5_indention_options    = in.readShort();
-        field_6_border_options       = in.readShort();
-        field_7_palette_options      = in.readShort();
-        field_8_adtl_palette_options = in.readInt();
-        field_9_fill_palette_options = in.readShort();
-    }
-
-    /**
-     * set the index to the FONT record (which font to use 0 based)
-     *
-     *
-     * @param index to the font
-     * @see org.apache.poi.hssf.record.FontRecord
-     */
-
-    public void setFontIndex(short index)
-    {
-        field_1_font_index = index;
-    }
-
-    /**
-     *  set the index to the Format record (which FORMAT to use 0-based)
-     *
-     *
-     * @param index to the format record
-     * @see org.apache.poi.hssf.record.FormatRecord
-     */
-
-    public void setFormatIndex(short index)
-    {
-        field_2_format_index = index;
-    }
-
-    /**
-     * sets the options bitmask - you can also use corresponding option bit setters
-     * (see other methods that reference this one)
-     *
-     *
-     * @param options bitmask to set
-     *
-     */
-
-    public void setCellOptions(short options)
-    {
-        field_3_cell_options = options;
-    }
-
-    // These are the bit fields in cell options
-
-    /**
-     * set whether the cell is locked or not
-     *
-     *
-     * @param locked - if the cell is locked
-     * @see #setCellOptions(short)
-     */
-
-    public void setLocked(boolean locked)
-    {
-        field_3_cell_options = _locked.setShortBoolean(field_3_cell_options,
-                locked);
-    }
-
-    /**
-     * set whether the cell is hidden or not
-     *
-     *
-     * @param hidden - if the cell is hidden
-     * @see #setCellOptions(short)
-     */
-
-    public void setHidden(boolean hidden)
-    {
-        field_3_cell_options = _hidden.setShortBoolean(field_3_cell_options,
-                hidden);
-    }
-
-    /**
-     * set whether the cell is a cell or style XFRecord
-     *
-     *
-     * @param type - cell or style (0/1)
-     * @see #XF_STYLE
-     * @see #XF_CELL
-     * @see #setCellOptions(short)
-     */
-
-    public void setXFType(short type)
-    {
-        field_3_cell_options = _xf_type.setShortValue(field_3_cell_options,
-                type);
-    }
-
-    /**
-     * set some old holdover from lotus 123.  Who cares, its all over for Lotus.
-     * RIP Lotus.
-     *
-     * @param prefix - the lotus thing to set.
-     * @see #setCellOptions(short)
-     */
-
-    public void set123Prefix(boolean prefix)
-    {
-        field_3_cell_options =
-            _123_prefix.setShortBoolean(field_3_cell_options, prefix);
-    }
-
-    // present in both but NULL except in cell records
-
-    /**
-     * for cell XF types this is the parent style (usually 0/normal).  For
-     * style this should be NULL.
-     *
-     * @param parent  index of parent XF
-     * @see #NULL
-     * @see #setCellOptions(short)
-     */
-
-    public void setParentIndex(short parent)
-    {
-        field_3_cell_options =
-            _parent_index.setShortValue(field_3_cell_options, parent);
-    }
-
-    // end bitfields in cell options
-
-    /**
-     * set the alignment options bitmask.  See corresponding bitsetter methods
-     * that reference this one.
-     *
-     *
-     * @param options     - the bitmask to set
-     */
-
-    public void setAlignmentOptions(short options)
-    {
-        field_4_alignment_options = options;
-    }
-
-    /**
-     * set the horizontal alignment of the cell.
-     *
-     *
-     * @param align - how to align the cell (see constants)
-     * @see #GENERAL
-     * @see #LEFT
-     * @see #CENTER
-     * @see #RIGHT
-     * @see #FILL
-     * @see #JUSTIFY
-     * @see #CENTER_SELECTION
-     * @see #setAlignmentOptions(short)
-     */
-
-    public void setAlignment(short align)
-    {
-        field_4_alignment_options =
-            _alignment.setShortValue(field_4_alignment_options, align);
-    }
-
-    /**
-     * set whether to wrap the text in the cell
-     *
-     *
-     * @param wrapped - whether or not to wrap the cell text
-     * @see #setAlignmentOptions(short)
-     */
-
-    public void setWrapText(boolean wrapped)
-    {
-        field_4_alignment_options =
-            _wrap_text.setShortBoolean(field_4_alignment_options, wrapped);
-    }
-
-    /**
-     * set the vertical alignment of text in the cell
-     *
-     *
-     * @param align     where to align the text
-     * @see #VERTICAL_TOP
-     * @see #VERTICAL_CENTER
-     * @see #VERTICAL_BOTTOM
-     * @see #VERTICAL_JUSTIFY
-     *
-     * @see #setAlignmentOptions(short)
-     */
-
-    public void setVerticalAlignment(short align)
-    {
-        field_4_alignment_options =
-            _vertical_alignment.setShortValue(field_4_alignment_options,
-                                              align);
-    }
-
-    /**
-     * Dunno.  Docs just say this is for far east versions..  (I'm guessing it
-     * justifies for right-to-left read languages)
-     *
-     * @param justify use 0 for US
-     * @see #setAlignmentOptions(short)
-     */
-
-    public void setJustifyLast(short justify)
-    {   // for far east languages supported only for format always 0 for US
-        field_4_alignment_options =
-            _justify_last.setShortValue(field_4_alignment_options, justify);
-    }
-
-    /**
-     * set the degree of rotation.
-     *
-     *
-     * @param rotation the degree of rotation
-     * @see #setAlignmentOptions(short)
-     */
-
-    public void setRotation(short rotation)
-    {
-        field_4_alignment_options =
-            _rotation.setShortValue(field_4_alignment_options, rotation);
-    }
-
-    /**
-     * set the indent options bitmask  (see corresponding bitmask setters that reference
-     * this field)
-     *
-     *
-     * @param options bitmask to set.
-     *
-     */
-
-    public void setIndentionOptions(short options)
-    {
-        field_5_indention_options = options;
-    }
-
-    // set bitfields for indention options
-
-    /**
-     * set indention (not sure of the units, think its spaces)
-     *
-     * @param indent - how far to indent the cell
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setIndent(short indent)
-    {
-        field_5_indention_options =
-            _indent.setShortValue(field_5_indention_options, indent);
-    }
-
-    /**
-     * set whether to shrink the text to fit
-     *
-     *
-     * @param shrink - shrink to fit or not
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setShrinkToFit(boolean shrink)
-    {
-        field_5_indention_options =
-            _shrink_to_fit.setShortBoolean(field_5_indention_options, shrink);
-    }
-
-    /**
-     * set whether to merge cells
-     *
-     *
-     * @param merge - merge cells or not
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setMergeCells(boolean merge)
-    {
-        field_5_indention_options =
-            _merge_cells.setShortBoolean(field_5_indention_options, merge);
-    }
-
-    /**
-     * set the reading order for far east versions (0 - Context, 1 - Left to right,
-     * 2 - right to left) - We could use some help with support for the far east.
-     *
-     * @param order - the reading order (0,1,2)
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setReadingOrder(short order)
-    {   // only for far east  always 0 in US
-        field_5_indention_options =
-            _reading_order.setShortValue(field_5_indention_options, order);
-    }
-
-    /**
-     * set whether or not to use the format in this XF instead of the parent XF.
-     *
-     *
-     * @param parent - true if this XF has a different format value than its parent,
-     *                 false otherwise.
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setIndentNotParentFormat(boolean parent)
-    {
-        field_5_indention_options =
-            _indent_not_parent_format
-                .setShortBoolean(field_5_indention_options, parent);
-    }
-
-    /**
-     * set whether or not to use the font in this XF instead of the parent XF.
-     *
-     *
-     * @param font   - true if this XF has a different font value than its parent,
-     *                 false otherwise.
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setIndentNotParentFont(boolean font)
-    {
-        field_5_indention_options =
-            _indent_not_parent_font.setShortBoolean(field_5_indention_options,
-                                                    font);
-    }
-
-    /**
-     * set whether or not to use the alignment in this XF instead of the parent XF.
-     *
-     *
-     * @param alignment true if this XF has a different alignment value than its parent,
-     *                  false otherwise.
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setIndentNotParentAlignment(boolean alignment)
-    {
-        field_5_indention_options =
-            _indent_not_parent_alignment
-                .setShortBoolean(field_5_indention_options, alignment);
-    }
-
-    /**
-     * set whether or not to use the border in this XF instead of the parent XF.
-     *
-     *
-     * @param border - true if this XF has a different border value than its parent,
-     *                 false otherwise.
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setIndentNotParentBorder(boolean border)
-    {
-        field_5_indention_options =
-            _indent_not_parent_border
-                .setShortBoolean(field_5_indention_options, border);
-    }
-
-    /**
-     * <p>Sets whether or not to use the pattern in this XF instead of the
-     * parent XF (foreground/background).</p>
-     * 
-     * @param pattern {@code true} if this XF has a different pattern
-     *        value than its parent, {@code false} otherwise.
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setIndentNotParentPattern(boolean pattern)
-    {
-        field_5_indention_options =
-            _indent_not_parent_pattern
-                .setShortBoolean(field_5_indention_options, pattern);
-    }
-
-    /**
-     * set whether or not to use the locking/hidden in this XF instead of the parent XF.
-     *
-     *
-     * @param options true if this XF has a different locking or hidden value than its parent,
-     *                 false otherwise.
-     * @see #setIndentionOptions(short)
-     */
-
-    public void setIndentNotParentCellOptions(boolean options)
-    {
-        field_5_indention_options =
-            _indent_not_parent_cell_options
-                .setShortBoolean(field_5_indention_options, options);
-    }
-
-    // end indention options bitmask sets
-
-    /**
-     * set the border options bitmask (see the corresponding bitsetter methods
-     * that reference back to this one)
-     *
-     * @param options - the bit mask to set
-     *
-     */
-
-    public void setBorderOptions(short options)
-    {
-        field_6_border_options = options;
-    }
-
-    // border options bitfields
-
-    /**
-     * set the borderline style for the left border
-     *
-     *
-     * @param border - type of border for the left side of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #setBorderOptions(short)
-     */
-
-    public void setBorderLeft(short border)
-    {
-        field_6_border_options =
-            _border_left.setShortValue(field_6_border_options, border);
-    }
-
-    /**
-     * set the border line style for the right border
-     *
-     *
-     * @param border - type of border for the right side of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #setBorderOptions(short)
-     */
-
-    public void setBorderRight(short border)
-    {
-        field_6_border_options =
-            _border_right.setShortValue(field_6_border_options, border);
-    }
-
-    /**
-     * set the border line style for the top border
-     *
-     *
-     * @param border - type of border for the top of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #setBorderOptions(short)
-     */
-
-    public void setBorderTop(short border)
-    {
-        field_6_border_options =
-            _border_top.setShortValue(field_6_border_options, border);
-    }
-
-    /**
-     * set the border line style for the bottom border
-     *
-     *
-     * @param border - type of border for the bottom of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #setBorderOptions(short)
-     */
-
-    public void setBorderBottom(short border)
-    {
-        field_6_border_options =
-            _border_bottom.setShortValue(field_6_border_options, border);
-    }
-
-    // end border option bitfields
-
-    /**
-     * set the palette options bitmask (see the individual bitsetter methods that
-     * reference this one)
-     *
-     *
-     * @param options - the bitmask to set
-     *
-     */
-
-    public void setPaletteOptions(short options)
-    {
-        field_7_palette_options = options;
-    }
-
-    // bitfields for palette options
-
-    /**
-     * set the palette index for the left border color
-     *
-     *
-     * @param border - palette index
-     * @see #setPaletteOptions(short)
-     */
-
-    public void setLeftBorderPaletteIdx(short border)
-    {
-        field_7_palette_options =
-            _left_border_palette_idx.setShortValue(field_7_palette_options,
-                                                   border);
-    }
-
-    /**
-     * set the palette index for the right border color
-     *
-     *
-     * @param border - palette index
-     * @see #setPaletteOptions(short)
-     */
-
-    public void setRightBorderPaletteIdx(short border)
-    {
-        field_7_palette_options =
-            _right_border_palette_idx.setShortValue(field_7_palette_options,
-                                                    border);
-    }
-
-    // i've no idea.. possible values are 1 for down, 2 for up and 3 for both...0 for none..
-    // maybe a diagnal line?
-
-    /**
-     * Not sure what this is for (maybe fill lines?) 1 = down, 2 = up, 3 = both, 0 for none..
-     *
-     *
-     * @param diag - set whatever it is that this is.
-     * @see #setPaletteOptions(short)
-     */
-
-    public void setDiag(short diag)
-    {
-        field_7_palette_options = _diag.setShortValue(field_7_palette_options,
-                diag);
-    }
-
-    // end of palette options
-
-    /**
-     * set the additional palette options bitmask (see individual bitsetter methods
-     * that reference this method)
-     *
-     *
-     * @param options - bitmask to set
-     *
-     */
-
-    public void setAdtlPaletteOptions(short options)
-    {
-        field_8_adtl_palette_options = options;
-    }
-
-    // bitfields for additional palette options
-
-    /**
-     * set the palette index for the top border
-     *
-     *
-     * @param border - palette index
-     * @see #setAdtlPaletteOptions(short)
-     */
-
-    public void setTopBorderPaletteIdx(short border)
-    {
-        field_8_adtl_palette_options =
-            _top_border_palette_idx.setValue(field_8_adtl_palette_options,
-                                             border);
-    }
-
-    /**
-     * set the palette index for the bottom border
-     *
-     *
-     * @param border - palette index
-     * @see #setAdtlPaletteOptions(short)
-     */
-
-    public void setBottomBorderPaletteIdx(short border)
-    {
-        field_8_adtl_palette_options =
-            _bottom_border_palette_idx.setValue(field_8_adtl_palette_options,
-                                                border);
-    }
-
-    /**
-     * set for diagonal borders?  No idea (its a palette color for the other function
-     * we didn't know what was?)
-     *
-     *
-     * @param diag - the palette index?
-     * @see #setAdtlPaletteOptions(short)
-     */
-
-    public void setAdtlDiag(short diag)
-    {
-        field_8_adtl_palette_options =
-            _adtl_diag.setValue(field_8_adtl_palette_options, diag);
-    }
-
-    /**
-     * set the diagonal border line style?  Who the heck ever heard of a diagonal border?
-     *
-     *
-     * @param diag - the line style
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #setAdtlPaletteOptions(short)
-     */
-
-    public void setAdtlDiagLineStyle(short diag)
-    {
-        field_8_adtl_palette_options =
-            _adtl_diag_line_style.setValue(field_8_adtl_palette_options,
-                                           diag);
-    }
-
-    /**
-     * set the fill pattern
-     *
-     * @see #NO_FILL
-     * @see #SOLID_FILL
-     * @see #FINE_DOTS
-     * @see #ALT_BARS
-     * @see #SPARSE_DOTS
-     * @see #THICK_HORZ_BANDS
-     * @see #THICK_VERT_BANDS
-     * @see #THICK_BACKWARD_DIAG
-     * @see #THICK_FORWARD_DIAG
-     * @see #BIG_SPOTS
-     * @see #BRICKS
-     * @see #THIN_HORZ_BANDS
-     * @see #THIN_VERT_BANDS
-     * @see #THIN_BACKWARD_DIAG
-     * @see #THIN_FORWARD_DIAG
-     * @see #SQUARES
-     * @see #DIAMONDS
-     *
-     * @param fill - fill pattern??
-     * @see #setAdtlPaletteOptions(short)
-     */
-
-    public void setAdtlFillPattern(short fill)
-    {
-        field_8_adtl_palette_options =
-            _adtl_fill_pattern.setValue(field_8_adtl_palette_options, fill);
-    }
-
-    /**
-     * set the fill palette options bitmask (see bitfields for additional palette options)
-     *
-     * @param options the palette options
-     */
-
-    public void setFillPaletteOptions(short options)
-    {
-        field_9_fill_palette_options = options;
-    }
-
-    /**
-     * set the foreground palette color index
-     *
-     *
-     * @param color - palette index
-     * @see #setFillPaletteOptions(short)
-     */
-
-    public void setFillForeground(short color)
-    {
-        field_9_fill_palette_options =
-            _fill_foreground.setShortValue(field_9_fill_palette_options,
-                                           color);
-    }
-
-    /**
-     * set the background palette color index
-     *
-     *
-     * @param color - palette index
-     * @see #setFillPaletteOptions(short)
-     */
-
-    public void setFillBackground(short color)
-    {
-        field_9_fill_palette_options =
-            _fill_background.setShortValue(field_9_fill_palette_options,
-                                           color);
-    }
-
-    /**
-     * get the index to the FONT record (which font to use 0 based)
-     *
-     *
-     * @return index to the font
-     * @see org.apache.poi.hssf.record.FontRecord
-     */
-
-    public short getFontIndex()
-    {
-        return field_1_font_index;
-    }
-
-    /**
-     *  get the index to the Format record (which FORMAT to use 0-based)
-     *
-     *
-     * @return index to the format record
-     * @see org.apache.poi.hssf.record.FormatRecord
-     */
-
-    public short getFormatIndex()
-    {
-        return field_2_format_index;
-    }
-
-    /**
-     * gets the options bitmask - you can also use corresponding option bit getters
-     * (see other methods that reference this one)
-     *
-     *
-     * @return options bitmask
-     *
-     */
-
-    public short getCellOptions()
-    {
-        return field_3_cell_options;
-    }
-
-    // These are the bit fields in cell options
-
-    /**
-     * get whether the cell is locked or not
-     *
-     *
-     * @return locked - if the cell is locked
-     * @see #getCellOptions()
-     */
-
-    public boolean isLocked()
-    {
-        return _locked.isSet(field_3_cell_options);
-    }
-
-    /**
-     * get whether the cell is hidden or not
-     *
-     *
-     * @return hidden - if the cell is hidden
-     * @see #getCellOptions()
-     */
-
-    public boolean isHidden()
-    {
-        return _hidden.isSet(field_3_cell_options);
-    }
-
-    /**
-     * get whether the cell is a cell or style XFRecord
-     *
-     *
-     * @return type - cell or style (0/1)
-     * @see #XF_STYLE
-     * @see #XF_CELL
-     * @see #getCellOptions()
-     */
-
-    public short getXFType()
-    {
-        return _xf_type.getShortValue(field_3_cell_options);
-    }
-
-    /**
-     * get some old holdover from lotus 123.  Who cares, its all over for Lotus.
-     * RIP Lotus.
-     *
-     * @return prefix - the lotus thing
-     * @see #getCellOptions()
-     */
-
-    public boolean get123Prefix()
-    {
-        return _123_prefix.isSet(field_3_cell_options);
-    }
-
-    /**
-     * for cell XF types this is the parent style (usually 0/normal).  For
-     * style this should be NULL.
-     *
-     * @return index of parent XF
-     * @see #NULL
-     * @see #getCellOptions()
-     */
-
-    public short getParentIndex()
-    {
-        return _parent_index.getShortValue(field_3_cell_options);
-    }
-
-    // end bitfields in cell options
-
-    /**
-     * get the alignment options bitmask.  See corresponding bitgetter methods
-     * that reference this one.
-     *
-     *
-     * @return options     - the bitmask
-     */
-
-    public short getAlignmentOptions()
-    {
-        return field_4_alignment_options;
-    }
-
-    // bitfields in alignment options
-
-    /**
-     * get the horizontal alignment of the cell.
-     *
-     *
-     * @return align - how to align the cell (see constants)
-     * @see #GENERAL
-     * @see #LEFT
-     * @see #CENTER
-     * @see #RIGHT
-     * @see #FILL
-     * @see #JUSTIFY
-     * @see #CENTER_SELECTION
-     * @see #getAlignmentOptions()
-     */
-
-    public short getAlignment()
-    {
-        return _alignment.getShortValue(field_4_alignment_options);
-    }
-
-    /**
-     * get whether to wrap the text in the cell
-     *
-     *
-     * @return wrapped - whether or not to wrap the cell text
-     * @see #getAlignmentOptions()
-     */
-
-    public boolean getWrapText()
-    {
-        return _wrap_text.isSet(field_4_alignment_options);
-    }
-
-    /**
-     * get the vertical alignment of text in the cell
-     *
-     *
-     * @return where to align the text
-     * @see #VERTICAL_TOP
-     * @see #VERTICAL_CENTER
-     * @see #VERTICAL_BOTTOM
-     * @see #VERTICAL_JUSTIFY
-     *
-     * @see #getAlignmentOptions()
-     */
-
-    public short getVerticalAlignment()
-    {
-        return _vertical_alignment.getShortValue(field_4_alignment_options);
-    }
-
-    /**
-     * Dunno.  Docs just say this is for far east versions..  (I'm guessing it
-     * justifies for right-to-left read languages)
-     *
-     *
-     * @return justify
-     * @see #getAlignmentOptions()
-     */
-
-    public short getJustifyLast()
-    {   // for far east languages supported only for format always 0 for US
-        return _justify_last.getShortValue(field_4_alignment_options);
-    }
-
-    /**
-     * get the degree of rotation.
-     *
-     *
-     * @return rotation - the degree of rotation
-     * @see #getAlignmentOptions()
-     */
-
-    public short getRotation()
-    {
-        return _rotation.getShortValue(field_4_alignment_options);
-    }
-
-    // end alignment options bitfields
-
-    /**
-     * get the indent options bitmask  (see corresponding bit getters that reference
-     * this field)
-     *
-     *
-     * @return options bitmask
-     *
-     */
-
-    public short getIndentionOptions()
-    {
-        return field_5_indention_options;
-    }
-
-    // bitfields for indention options
-
-    /**
-     * get indention (not sure of the units, think its spaces)
-     *
-     * @return indent - how far to indent the cell
-     * @see #getIndentionOptions()
-     */
-
-    public short getIndent()
-    {
-        return _indent.getShortValue(field_5_indention_options);
-    }
-
-    /**
-     * get whether to shrink the text to fit
-     *
-     *
-     * @return shrink - shrink to fit or not
-     * @see #getIndentionOptions()
-     */
-
-    public boolean getShrinkToFit()
-    {
-        return _shrink_to_fit.isSet(field_5_indention_options);
-    }
-
-    /**
-     * get whether to merge cells
-     *
-     *
-     * @return merge - merge cells or not
-     * @see #getIndentionOptions()
-     */
-
-    public boolean getMergeCells()
-    {
-        return _merge_cells.isSet(field_5_indention_options);
-    }
-
-    /**
-     * get the reading order for far east versions (0 - Context, 1 - Left to right,
-     * 2 - right to left) - We could use some help with support for the far east.
-     *
-     * @return order - the reading order (0,1,2)
-     * @see #getIndentionOptions()
-     */
-
-    public short getReadingOrder()
-    {   // only for far east  always 0 in US
-        return _reading_order.getShortValue(field_5_indention_options);
-    }
-
-    /**
-     * get whether or not to use the format in this XF instead of the parent XF.
-     *
-     *
-     * @return parent - true if this XF has a different format value than its parent,
-     *                 false otherwise.
-     * @see #getIndentionOptions()
-     */
-
-    public boolean isIndentNotParentFormat()
-    {
-        return _indent_not_parent_format.isSet(field_5_indention_options);
-    }
-
-    /**
-     * get whether or not to use the font in this XF instead of the parent XF.
-     *
-     *
-     * @return font   - true if this XF has a different font value than its parent,
-     *                 false otherwise.
-     * @see #getIndentionOptions()
-     */
-
-    public boolean isIndentNotParentFont()
-    {
-        return _indent_not_parent_font.isSet(field_5_indention_options);
-    }
-
-    /**
-     * get whether or not to use the alignment in this XF instead of the parent XF.
-     *
-     *
-     * @return alignment true if this XF has a different alignment value than its parent,
-     *                  false otherwise.
-     * @see #getIndentionOptions()
-     */
-
-    public boolean isIndentNotParentAlignment()
-    {
-        return _indent_not_parent_alignment.isSet(field_5_indention_options);
-    }
-
-    /**
-     * get whether or not to use the border in this XF instead of the parent XF.
-     *
-     *
-     * @return border - true if this XF has a different border value than its parent,
-     *                 false otherwise.
-     * @see #getIndentionOptions()
-     */
-
-    public boolean isIndentNotParentBorder()
-    {
-        return _indent_not_parent_border.isSet(field_5_indention_options);
-    }
-
-    /**
-     * get whether or not to use the pattern in this XF instead of the parent XF.
-     * (foregrount/background)
-     *
-     * @return pattern- true if this XF has a different pattern value than its parent,
-     *                 false otherwise.
-     * @see #getIndentionOptions()
-     */
-
-    public boolean isIndentNotParentPattern()
-    {
-        return _indent_not_parent_pattern.isSet(field_5_indention_options);
-    }
-
-    /**
-     * get whether or not to use the locking/hidden in this XF instead of the parent XF.
-     *
-     *
-     * @return options- true if this XF has a different locking or hidden value than its parent,
-     *                 false otherwise.
-     * @see #getIndentionOptions()
-     */
-
-    public boolean isIndentNotParentCellOptions()
-    {
-        return _indent_not_parent_cell_options
-            .isSet(field_5_indention_options);
-    }
-
-    // end of bitfields for indention options
-    // border options
-
-    /**
-     * get the border options bitmask (see the corresponding bit getter methods
-     * that reference back to this one)
-     *
-     * @return options - the bit mask to set
-     *
-     */
-
-    public short getBorderOptions()
-    {
-        return field_6_border_options;
-    }
-
-    // bitfields for border options
-
-    /**
-     * get the borderline style for the left border
-     *
-     *
-     * @return border - type of border for the left side of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #getBorderOptions()
-     */
-
-    public short getBorderLeft()
-    {
-        return _border_left.getShortValue(field_6_border_options);
-    }
-
-    /**
-     * get the borderline style for the right border
-     *
-     *
-     * @return  border - type of border for the right side of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #getBorderOptions()
-     */
-
-    public short getBorderRight()
-    {
-        return _border_right.getShortValue(field_6_border_options);
-    }
-
-    /**
-     * get the borderline style for the top border
-     *
-     *
-     * @return border - type of border for the top of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #getBorderOptions()
-     */
-
-    public short getBorderTop()
-    {
-        return _border_top.getShortValue(field_6_border_options);
-    }
-
-    /**
-     * get the borderline style for the bottom border
-     *
-     *
-     * @return border - type of border for the bottom of the cell
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #getBorderOptions()
-     */
-
-    public short getBorderBottom()
-    {
-        return _border_bottom.getShortValue(field_6_border_options);
-    }
-
-    // record types -- palette options
-
-    /**
-     * get the palette options bitmask (see the individual bit getter methods that
-     * reference this one)
-     *
-     *
-     * @return options - the bitmask
-     *
-     */
-
-    public short getPaletteOptions()
-    {
-        return field_7_palette_options;
-    }
-
-    // bitfields for palette options
-
-    /**
-     * get the palette index for the left border color
-     *
-     *
-     * @return border - palette index
-     * @see #getPaletteOptions()
-     */
-
-    public short getLeftBorderPaletteIdx()
-    {
-        return _left_border_palette_idx
-            .getShortValue(field_7_palette_options);
-    }
-
-    /**
-     * get the palette index for the right border color
-     *
-     *
-     * @return border - palette index
-     * @see #getPaletteOptions()
-     */
-
-    public short getRightBorderPaletteIdx()
-    {
-        return _right_border_palette_idx
-            .getShortValue(field_7_palette_options);
-    }
-
-    // i've no idea.. possible values are 1 for down, 2 for up and 3 for both...0 for none..
-    // maybe a diagnal line?
-
-    /**
-     * Not sure what this is for (maybe fill lines?) 1 = down, 2 = up, 3 = both, 0 for none..
-     *
-     *
-     * @return diag - whatever it is that this is.
-     * @see #getPaletteOptions()
-     */
-
-    public short getDiag()
-    {
-        return _diag.getShortValue(field_7_palette_options);
-    }
-
-    // end of style palette options
-    // additional palette options
-
-    /**
-     * get the additional palette options bitmask (see individual bit getter methods
-     * that reference this method)
-     *
-     *
-     * @return options - bitmask to set
-     *
-     */
-
-    public int getAdtlPaletteOptions()
-    {
-        return field_8_adtl_palette_options;
-    }
-
-    // bitfields for additional palette options
-
-    /**
-     * get the palette index for the top border
-     *
-     *
-     * @return border - palette index
-     * @see #getAdtlPaletteOptions()
-     */
-
-    public short getTopBorderPaletteIdx()
-    {
-        return ( short ) _top_border_palette_idx
-            .getValue(field_8_adtl_palette_options);
-    }
-
-    /**
-     * get the palette index for the bottom border
-     *
-     *
-     * @return border - palette index
-     * @see #getAdtlPaletteOptions()
-     */
-
-    public short getBottomBorderPaletteIdx()
-    {
-        return ( short ) _bottom_border_palette_idx
-            .getValue(field_8_adtl_palette_options);
-    }
-
-    /**
-     * get for diagonal borders?  No idea (its a palette color for the other function
-     * we didn't know what was?)
-     *
-     *
-     * @return diag - the palette index?
-     * @see #getAdtlPaletteOptions()
-     */
-
-    public short getAdtlDiag()
-    {
-        return ( short ) _adtl_diag.getValue(field_8_adtl_palette_options);
-    }
-
-    /**
-     * get the diagonal border line style?  Who the heck ever heard of a diagonal border?
-     *
-     *
-     * @return diag - the line style
-     * @see     #NONE
-     * @see     #THIN
-     * @see     #MEDIUM
-     * @see     #DASHED
-     * @see     #DOTTED
-     * @see     #THICK
-     * @see     #DOUBLE
-     * @see     #HAIR
-     * @see     #MEDIUM_DASHED
-     * @see     #DASH_DOT
-     * @see     #MEDIUM_DASH_DOT
-     * @see     #DASH_DOT_DOT
-     * @see     #MEDIUM_DASH_DOT_DOT
-     * @see     #SLANTED_DASH_DOT
-     * @see #getAdtlPaletteOptions()
-     */
-
-    public short getAdtlDiagLineStyle()
-    {
-        return ( short ) _adtl_diag_line_style
-            .getValue(field_8_adtl_palette_options);
-    }
-
-    /**
-     * get the additional fill pattern
-     *
-     * @see #NO_FILL
-     * @see #SOLID_FILL
-     * @see #FINE_DOTS
-     * @see #ALT_BARS
-     * @see #SPARSE_DOTS
-     * @see #THICK_HORZ_BANDS
-     * @see #THICK_VERT_BANDS
-     * @see #THICK_BACKWARD_DIAG
-     * @see #THICK_FORWARD_DIAG
-     * @see #BIG_SPOTS
-     * @see #BRICKS
-     * @see #THIN_HORZ_BANDS
-     * @see #THIN_VERT_BANDS
-     * @see #THIN_BACKWARD_DIAG
-     * @see #THIN_FORWARD_DIAG
-     * @see #SQUARES
-     * @see #DIAMONDS
-     *
-     * @return fill - fill pattern??
-     * @see #getAdtlPaletteOptions()
-     */
-
-    public short getAdtlFillPattern()
-    {
-        return ( short ) _adtl_fill_pattern
-            .getValue(field_8_adtl_palette_options);
-    }
-
-    // end bitfields for additional palette options
-    // fill palette options
-
-    /**
-     * get the fill palette options bitmask (see indivdual bit getters that
-     * reference this method)
-     *
-     * @return options
-     *
-     */
-
-    public short getFillPaletteOptions()
-    {
-        return field_9_fill_palette_options;
-    }
-
-    // bitfields for fill palette options
-
-    /**
-     * get the foreground palette color index
-     *
-     *
-     * @return color - palette index
-     * @see #getFillPaletteOptions()
-     */
-
-    public short getFillForeground()
-    {
-        return _fill_foreground.getShortValue(field_9_fill_palette_options);
-    }
-
-    /**
-     * get the background palette color index
-     *
-     * @return color palette index
-     * @see #getFillPaletteOptions()
-     */
-
-    public short getFillBackground()
-    {
-        return _fill_background.getShortValue(field_9_fill_palette_options);
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[EXTENDEDFORMAT]\n");
-        if (getXFType() == XF_STYLE)
-        {
-            buffer.append(" STYLE_RECORD_TYPE\n");
-        }
-        else if (getXFType() == XF_CELL)
-        {
-            buffer.append(" CELL_RECORD_TYPE\n");
-        }
-        buffer.append("    .fontindex       = ")
-            .append(Integer.toHexString(getFontIndex())).append("\n");
-        buffer.append("    .formatindex     = ")
-            .append(Integer.toHexString(getFormatIndex())).append("\n");
-        buffer.append("    .celloptions     = ")
-            .append(Integer.toHexString(getCellOptions())).append("\n");
-        buffer.append("          .islocked  = ").append(isLocked())
-            .append("\n");
-        buffer.append("          .ishidden  = ").append(isHidden())
-            .append("\n");
-        buffer.append("          .recordtype= ")
-            .append(Integer.toHexString(getXFType())).append("\n");
-        buffer.append("          .parentidx = ")
-            .append(Integer.toHexString(getParentIndex())).append("\n");
-        buffer.append("    .alignmentoptions= ")
-            .append(Integer.toHexString(getAlignmentOptions())).append("\n");
-        buffer.append("          .alignment = ").append(getAlignment())
-            .append("\n");
-        buffer.append("          .wraptext  = ").append(getWrapText())
-            .append("\n");
-        buffer.append("          .valignment= ")
-            .append(Integer.toHexString(getVerticalAlignment())).append("\n");
-        buffer.append("          .justlast  = ")
-            .append(Integer.toHexString(getJustifyLast())).append("\n");
-        buffer.append("          .rotation  = ")
-            .append(Integer.toHexString(getRotation())).append("\n");
-        buffer.append("    .indentionoptions= ")
-            .append(Integer.toHexString(getIndentionOptions())).append("\n");
-        buffer.append("          .indent    = ")
-            .append(Integer.toHexString(getIndent())).append("\n");
-        buffer.append("          .shrinktoft= ").append(getShrinkToFit())
-            .append("\n");
-        buffer.append("          .mergecells= ").append(getMergeCells())
-            .append("\n");
-        buffer.append("          .readngordr= ")
-            .append(Integer.toHexString(getReadingOrder())).append("\n");
-        buffer.append("          .formatflag= ")
-            .append(isIndentNotParentFormat()).append("\n");
-        buffer.append("          .fontflag  = ")
-            .append(isIndentNotParentFont()).append("\n");
-        buffer.append("          .prntalgnmt= ")
-            .append(isIndentNotParentAlignment()).append("\n");
-        buffer.append("          .borderflag= ")
-            .append(isIndentNotParentBorder()).append("\n");
-        buffer.append("          .paternflag= ")
-            .append(isIndentNotParentPattern()).append("\n");
-        buffer.append("          .celloption= ")
-            .append(isIndentNotParentCellOptions()).append("\n");
-        buffer.append("    .borderoptns     = ")
-            .append(Integer.toHexString(getBorderOptions())).append("\n");
-        buffer.append("          .lftln     = ")
-            .append(Integer.toHexString(getBorderLeft())).append("\n");
-        buffer.append("          .rgtln     = ")
-            .append(Integer.toHexString(getBorderRight())).append("\n");
-        buffer.append("          .topln     = ")
-            .append(Integer.toHexString(getBorderTop())).append("\n");
-        buffer.append("          .btmln     = ")
-            .append(Integer.toHexString(getBorderBottom())).append("\n");
-        buffer.append("    .paleteoptns     = ")
-            .append(Integer.toHexString(getPaletteOptions())).append("\n");
-        buffer.append("          .leftborder= ")
-            .append(Integer.toHexString(getLeftBorderPaletteIdx()))
-            .append("\n");
-        buffer.append("          .rghtborder= ")
-            .append(Integer.toHexString(getRightBorderPaletteIdx()))
-            .append("\n");
-        buffer.append("          .diag      = ")
-            .append(Integer.toHexString(getDiag())).append("\n");
-        buffer.append("    .paleteoptn2     = ")
-            .append(Integer.toHexString(getAdtlPaletteOptions()))
-            .append("\n");
-        buffer.append("          .topborder = ")
-            .append(Integer.toHexString(getTopBorderPaletteIdx()))
-            .append("\n");
-        buffer.append("          .botmborder= ")
-            .append(Integer.toHexString(getBottomBorderPaletteIdx()))
-            .append("\n");
-        buffer.append("          .adtldiag  = ")
-            .append(Integer.toHexString(getAdtlDiag())).append("\n");
-        buffer.append("          .diaglnstyl= ")
-            .append(Integer.toHexString(getAdtlDiagLineStyle())).append("\n");
-        buffer.append("          .fillpattrn= ")
-            .append(Integer.toHexString(getAdtlFillPattern())).append("\n");
-        buffer.append("    .fillpaloptn     = ")
-            .append(Integer.toHexString(getFillPaletteOptions()))
-            .append("\n");
-        buffer.append("          .foreground= ")
-            .append(Integer.toHexString(getFillForeground())).append("\n");
-        buffer.append("          .background= ")
-            .append(Integer.toHexString(getFillBackground())).append("\n");
-        buffer.append("[/EXTENDEDFORMAT]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getFontIndex());
-        out.writeShort(getFormatIndex());
-        out.writeShort(getCellOptions());
-        out.writeShort(getAlignmentOptions());
-        out.writeShort(getIndentionOptions());
-        out.writeShort(getBorderOptions());
-        out.writeShort(getPaletteOptions());
-        out.writeInt(getAdtlPaletteOptions());
-        out.writeShort(getFillPaletteOptions());
-    }
-
-    @Override
-    protected int getDataSize() {
-        return 20;
-    }
-
-    @Override
-    public short getSid()
-    {
-        return sid;
-    }
-    
-    /**
-     * Clones all the style information from another
-     *  ExtendedFormatRecord, onto this one. This 
-     *  will then hold all the same style options.
-     *  
-     * If The source ExtendedFormatRecord comes from
-     *  a different Workbook, you will need to sort
-     *  out the font and format indices yourself!
-     * 
-     * @param source the ExtendedFormatRecord to copy from
-     */
-    public void cloneStyleFrom(ExtendedFormatRecord source) {
-        field_1_font_index           = source.field_1_font_index;
-        field_2_format_index         = source.field_2_format_index;
-        field_3_cell_options         = source.field_3_cell_options;
-        field_4_alignment_options    = source.field_4_alignment_options;
-        field_5_indention_options    = source.field_5_indention_options;
-        field_6_border_options       = source.field_6_border_options;
-        field_7_palette_options      = source.field_7_palette_options;
-        field_8_adtl_palette_options = source.field_8_adtl_palette_options;
-        field_9_fill_palette_options = source.field_9_fill_palette_options;
-    }
-
-	@Override
-    public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + field_1_font_index;
-		result = prime * result + field_2_format_index;
-		result = prime * result + field_3_cell_options;
-		result = prime * result + field_4_alignment_options;
-		result = prime * result + field_5_indention_options;
-		result = prime * result + field_6_border_options;
-		result = prime * result + field_7_palette_options;
-		result = prime * result + field_8_adtl_palette_options;
-		result = prime * result + field_9_fill_palette_options;
-		return result;
-	}
-
-	/**
-	 * Will consider two different records with the same
-	 *  contents as equals, as the various indexes
-	 *  that matter are embedded in the records
-	 */
-	@Override
-    public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (obj instanceof ExtendedFormatRecord) {
-			final ExtendedFormatRecord other = (ExtendedFormatRecord) obj;
-			if (field_1_font_index != other.field_1_font_index)
-				return false;
-			if (field_2_format_index != other.field_2_format_index)
-				return false;
-			if (field_3_cell_options != other.field_3_cell_options)
-				return false;
-			if (field_4_alignment_options != other.field_4_alignment_options)
-				return false;
-			if (field_5_indention_options != other.field_5_indention_options)
-				return false;
-			if (field_6_border_options != other.field_6_border_options)
-				return false;
-			if (field_7_palette_options != other.field_7_palette_options)
-				return false;
-			if (field_8_adtl_palette_options != other.field_8_adtl_palette_options)
-				return false;
-			if (field_9_fill_palette_options != other.field_9_fill_palette_options)
-				return false;
-			return true;
-		}
-		return false;
-	}
-	
-	public int[] stateSummary() {
-		return new int[] { field_1_font_index, field_2_format_index, field_3_cell_options, field_4_alignment_options,
-				field_5_indention_options, field_6_border_options, field_7_palette_options, field_8_adtl_palette_options, field_9_fill_palette_options };
-	}
-    
-    
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
deleted file mode 100644
index 343c149..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * EXTERNSHEET (0x0017)<p>
- * A List of Indexes to  EXTERNALBOOK (supplemental book) Records
- */
-public class ExternSheetRecord extends StandardRecord {
-
-    public final static short sid = 0x0017;
-	private final List<RefSubRecord> _list;
-	
-	private static final class RefSubRecord {
-		public static final int ENCODED_SIZE = 6;
-
-		/** index to External Book Block (which starts with a EXTERNALBOOK record) */
-		private final int _extBookIndex;
-		private int _firstSheetIndex; // may be -1 (0xFFFF)
-		private int _lastSheetIndex;  // may be -1 (0xFFFF)
-		
-		public void adjustIndex(int offset) {
-			_firstSheetIndex += offset;
-			_lastSheetIndex += offset;
-		}
-		
-		/** a Constructor for making new sub record
-		 */
-		public RefSubRecord(int extBookIndex, int firstSheetIndex, int lastSheetIndex) {
-			_extBookIndex = extBookIndex;
-			_firstSheetIndex = firstSheetIndex;
-			_lastSheetIndex = lastSheetIndex;
-		}
-		
-		/**
-		 * @param in the RecordInputstream to read the record from
-		 */
-		public RefSubRecord(RecordInputStream in) {
-			this(in.readShort(), in.readShort(), in.readShort());
-		}
-		public int getExtBookIndex(){
-			return _extBookIndex;
-		}
-		public int getFirstSheetIndex(){
-			return _firstSheetIndex;
-		}
-		public int getLastSheetIndex(){
-			return _lastSheetIndex;
-		}
-		
-		@Override
-		public String toString() {
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("extBook=").append(_extBookIndex);
-			buffer.append(" firstSheet=").append(_firstSheetIndex);
-			buffer.append(" lastSheet=").append(_lastSheetIndex);
-			return buffer.toString();
-		}
-		
-		public void serialize(LittleEndianOutput out) {
-			out.writeShort(_extBookIndex);
-			out.writeShort(_firstSheetIndex);
-			out.writeShort(_lastSheetIndex);
-		}
-	}	
-	
-	
-	
-	public ExternSheetRecord() {
-		_list = new ArrayList<RefSubRecord>();
-	}
-
-	public ExternSheetRecord(RecordInputStream in) {
-		_list = new ArrayList<RefSubRecord>();
-		
-		int nItems  = in.readShort();
-		
-		for (int i = 0 ; i < nItems ; ++i) {
-			RefSubRecord rec = new RefSubRecord(in);
-			_list.add(rec);
-		}
-	}
-	
-
-	/**  
-	 * @return number of REF structures
-	 */
-	public int getNumOfRefs() {
-		return _list.size();
-	}
-	
-	/** 
-	 * adds REF struct (ExternSheetSubRecord)
-	 * @param rec REF struct
-	 */
-	public void addREFRecord(RefSubRecord rec) {
-		_list.add(rec);
-	}
-	
-	/** returns the number of REF Records, which is in model
-	 * @return number of REF records
-	 */
-	public int getNumOfREFRecords() {
-		return _list.size();
-	}
-	
-	
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		int nItems = _list.size();
-		sb.append("[EXTERNSHEET]\n");
-		sb.append("   numOfRefs     = ").append(nItems).append("\n");
-		for (int i=0; i < nItems; i++) {
-			sb.append("refrec         #").append(i).append(": ");
-			sb.append(getRef(i).toString());
-			sb.append('\n');
-		}
-		sb.append("[/EXTERNSHEET]\n");
-		
-		
-		return sb.toString();
-	}
-	
-	@Override
-	protected int getDataSize() {
-		return 2 + _list.size() * RefSubRecord.ENCODED_SIZE;
-	}
-	
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		int nItems = _list.size();
-
-		out.writeShort(nItems);
-		
-		for (int i = 0; i < nItems; i++) {
-			getRef(i).serialize(out);
-		}
-	}
-
-	private RefSubRecord getRef(int i) {
-		return _list.get(i);
-	}
-	
-	public void removeSheet(int sheetIdx) {
-        int nItems = _list.size();
-        for (int i = 0; i < nItems; i++) {
-            RefSubRecord refSubRecord = _list.get(i);
-            if(refSubRecord.getFirstSheetIndex() == sheetIdx && 
-                    refSubRecord.getLastSheetIndex() == sheetIdx) {
-            	// removing the entry would mess up the sheet index in Formula of NameRecord
-            	_list.set(i, new RefSubRecord(refSubRecord.getExtBookIndex(), -1, -1));
-            } else if (refSubRecord.getFirstSheetIndex() > sheetIdx && 
-                    refSubRecord.getLastSheetIndex() > sheetIdx) {
-                _list.set(i, new RefSubRecord(refSubRecord.getExtBookIndex(), refSubRecord.getFirstSheetIndex()-1, refSubRecord.getLastSheetIndex()-1));
-            }
-        }
-	}
-	
-	/**
-	 * return the non static version of the id for this record.
-	 */
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-    /**
-     * @param refIndex specifies the n-th refIndex
-     * 
-     * @return the index of the SupBookRecord for this index
-     */
-    public int getExtbookIndexFromRefIndex(int refIndex) {
-        RefSubRecord refRec = getRef(refIndex);
-        return refRec.getExtBookIndex();
-    }
-
-	/**
-	 * @param extBookIndex external sheet reference index
-	 * 
-	 * @return -1 if not found
-	 */
-	public int findRefIndexFromExtBookIndex(int extBookIndex) {
-		int nItems = _list.size();
-		for (int i = 0; i < nItems; i++) {
-			if (getRef(i).getExtBookIndex() == extBookIndex) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-    /**
-     * Returns the first sheet that the reference applies to, or
-     *  -1 if the referenced sheet can't be found, or -2 if the
-     *  reference is workbook scoped.
-     *  
-     * @param extRefIndex external sheet reference index
-     * 
-     * @return the first sheet that the reference applies to, or
-     *  -1 if the referenced sheet can't be found, or -2 if the
-     *  reference is workbook scoped
-     */
-	public int getFirstSheetIndexFromRefIndex(int extRefIndex) {
-		return getRef(extRefIndex).getFirstSheetIndex();
-	}
-
-    /**
-     * Returns the last sheet that the reference applies to, or
-     *  -1 if the referenced sheet can't be found, or -2 if the
-     *  reference is workbook scoped.
-     * For a single sheet reference, the first and last should be
-     *  the same.
-     *  
-     * @param extRefIndex external sheet reference index
-     * 
-     * @return the last sheet that the reference applies to, or
-     *  -1 if the referenced sheet can't be found, or -2 if the
-     *  reference is workbook scoped.
-     */
-    public int getLastSheetIndexFromRefIndex(int extRefIndex) {
-        return getRef(extRefIndex).getLastSheetIndex();
-    }
-
-	/**
-     * Add a zero-based reference to a {@link org.apache.poi.hssf.record.SupBookRecord}.
-     * <p>
-     *  If the type of the SupBook record is same-sheet referencing, Add-In referencing,
-     *  DDE data source referencing, or OLE data source referencing,
-     *  then no scope is specified and this value <em>MUST</em> be -2. Otherwise,
-     *  the scope must be set as follows:
-     *  <ol>
-     *    <li><code>-2</code> Workbook-level reference that applies to the entire workbook.</li>
-     *    <li><code>-1</code> Sheet-level reference. </li>
-     *    <li><code>&gt;=0</code> Sheet-level reference. This specifies the first sheet in the reference.
-     *    <p>If the SupBook type is unused or external workbook referencing,
-     *    then this value specifies the zero-based index of an external sheet name,
-     *    see {@link org.apache.poi.hssf.record.SupBookRecord#getSheetNames()}.
-     *    This referenced string specifies the name of the first sheet within the external workbook that is in scope.
-     *    This sheet MUST be a worksheet or macro sheet.</p>
-     *    
-     *    <p>If the supporting link type is self-referencing, then this value specifies the zero-based index of a
-     *    {@link org.apache.poi.hssf.record.BoundSheetRecord} record in the workbook stream that specifies
-     *    the first sheet within the scope of this reference. This sheet MUST be a worksheet or a macro sheet.
-     *    </p>
-     *    </li>
-     *  </ol>
-     *
-     * @param extBookIndex  the external book block index
-     * @param firstSheetIndex  the scope, must be -2 for add-in references
-     * @param lastSheetIndex   the scope, must be -2 for add-in references
-	 * @return index of newly added ref
-	 */
-	public int addRef(int extBookIndex, int firstSheetIndex, int lastSheetIndex) {
-		_list.add(new RefSubRecord(extBookIndex, firstSheetIndex, lastSheetIndex));
-		return _list.size() - 1;
-	}
-
-	public int getRefIxForSheet(int externalBookIndex, int firstSheetIndex, int lastSheetIndex) {
-		int nItems = _list.size();
-		for (int i = 0; i < nItems; i++) {
-			RefSubRecord ref = getRef(i);
-			if (ref.getExtBookIndex() != externalBookIndex) {
-				continue;
-			}
-			if (ref.getFirstSheetIndex() == firstSheetIndex && 
-			        ref.getLastSheetIndex() == lastSheetIndex) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	public static ExternSheetRecord combine(ExternSheetRecord[] esrs) {
-		ExternSheetRecord result = new ExternSheetRecord();
-		for (ExternSheetRecord esr : esrs) {
-			int nRefs = esr.getNumOfREFRecords();
-			for (int j=0; j<nRefs; j++) {
-				result.addREFRecord(esr.getRef(j));
-			}
-		}
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
deleted file mode 100644
index b672135..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.constant.ConstantValueParser;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * EXTERNALNAME (0x0023)
- */
-public final class ExternalNameRecord extends StandardRecord {
-
-	public final static short sid = 0x0023; // as per BIFF8. (some old versions used 0x223)
-
-	private static final int OPT_BUILTIN_NAME          = 0x0001;
-	private static final int OPT_AUTOMATIC_LINK        = 0x0002; // m$ doc calls this fWantAdvise
-	private static final int OPT_PICTURE_LINK          = 0x0004;
-	private static final int OPT_STD_DOCUMENT_NAME     = 0x0008; //fOle
-	private static final int OPT_OLE_LINK              = 0x0010; //fOleLink
-//	private static final int OPT_CLIP_FORMAT_MASK      = 0x7FE0;
-	private static final int OPT_ICONIFIED_PICTURE_LINK= 0x8000;
-
-
-	private short  field_1_option_flag;
-	private short  field_2_ixals;
-	private short  field_3_not_used;
-	private String field_4_name;
-	private Formula  field_5_name_definition;
-
-	/**
-	 * 'rgoper' / 'Last received results of the DDE link'
-	 * (seems to be only applicable to DDE links)<br/>
-	 * Logically this is a 2-D array, which has been flattened into 1-D array here.
-	 */
-	private Object[] _ddeValues;
-	/**
-	 * (logical) number of columns in the {@link #_ddeValues} array
-	 */
-	private int _nColumns;
-	/**
-	 * (logical) number of rows in the {@link #_ddeValues} array
-	 */
-	private int _nRows;
-
-	/**
-	 * @return {@code true} if the name is a built-in name
-	 */
-	public boolean isBuiltInName() {
-		return (field_1_option_flag & OPT_BUILTIN_NAME) != 0;
-	}
-	/**
-	 * For OLE and DDE, links can be either 'automatic' or 'manual'
-	 * 
-	 * @return {@code true} if this is a automatic link
-	 */
-	public boolean isAutomaticLink() {
-		return (field_1_option_flag & OPT_AUTOMATIC_LINK) != 0;
-	}
-	/**
-	 * only for OLE and DDE
-	 * 
-	 * @return {@code true} if this is a picture link
-	 */
-	public boolean isPicureLink() {
-		return (field_1_option_flag & OPT_PICTURE_LINK) != 0;
-	}
-	/**
-	 * DDE links only. If <code>true</code>, this denotes the 'StdDocumentName'
-	 * 
-	 * @return {@code true} if this denotes the 'StdDocumentName'
-	 */
-	public boolean isStdDocumentNameIdentifier() {
-		return (field_1_option_flag & OPT_STD_DOCUMENT_NAME) != 0;
-	}
-	public boolean isOLELink() {
-		return (field_1_option_flag & OPT_OLE_LINK) != 0;
-	}
-	public boolean isIconifiedPictureLink() {
-		return (field_1_option_flag & OPT_ICONIFIED_PICTURE_LINK) != 0;
-	}
-	/**
-	 * @return the standard String representation of this name
-	 */
-	public String getText() {
-		return field_4_name;
-	}
-	
-    public void setText(String str) {
-        field_4_name = str;
-    }
-
-	/**
-	 * If this is a local name, then this is the (1 based)
-	 *  index of the name of the Sheet this refers to, as
-	 *  defined in the preceding {@link SupBookRecord}.
-	 * If it isn't a local name, then it must be zero.
-	 * 
-	 * @return the index of the name of the Sheet this refers to
-	 */
-	public short getIx() {
-	   return field_2_ixals;
-	}
-	
-    public void setIx(short ix) {
-        field_2_ixals = ix;
-    }
-
-    public Ptg[] getParsedExpression() {
-        return Formula.getTokens(field_5_name_definition);
-    }
-    public void setParsedExpression(Ptg[] ptgs) {
-        field_5_name_definition = Formula.create(ptgs);
-    }
-
-
-	@Override
-	protected int getDataSize(){
-		int result = 2 + 4;  // short and int
-        result += StringUtil.getEncodedSize(field_4_name) - 1; //size is byte, not short 
-
-        if(!isOLELink() && !isStdDocumentNameIdentifier()){
-            if(isAutomaticLink()){
-            	if(_ddeValues != null) {
-                    result += 3; // byte, short
-                    result += ConstantValueParser.getEncodedSize(_ddeValues);
-            	}
-            } else {
-                result += field_5_name_definition.getEncodedSize();
-            }
-        }
-		return result;
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(field_1_option_flag);
-		out.writeShort(field_2_ixals);
-		out.writeShort(field_3_not_used);
-
-		out.writeByte(field_4_name.length());
-		StringUtil.writeUnicodeStringFlagAndData(out, field_4_name);
-
-        if(!isOLELink() && !isStdDocumentNameIdentifier()){
-            if(isAutomaticLink()){
-            	if(_ddeValues != null) {
-                    out.writeByte(_nColumns-1);
-                    out.writeShort(_nRows-1);
-                    ConstantValueParser.encode(out, _ddeValues);
-            	}
-            } else {
-                field_5_name_definition.serialize(out);
-            }
-        }
-	}
-
-    public ExternalNameRecord() {
-        field_2_ixals = 0;
-    }
-    
-    public ExternalNameRecord(RecordInputStream in) {
-		field_1_option_flag = in.readShort();
-		field_2_ixals       = in.readShort();
-      field_3_not_used    = in.readShort();
-
-        int numChars = in.readUByte();
-        field_4_name = StringUtil.readUnicodeString(in, numChars);
-
-        // the record body can take different forms.
-        // The form is dictated by the values of 3-th and 4-th bits in field_1_option_flag
-        if(!isOLELink() && !isStdDocumentNameIdentifier()){
-            // another switch: the fWantAdvise bit specifies whether the body describes
-            // an external defined name or a DDE data item
-            if(isAutomaticLink()){
-                if(in.available() > 0) {
-                   //body specifies DDE data item
-                   int nColumns = in.readUByte() + 1;
-                   int nRows = in.readShort() + 1;
-   
-                   int totalCount = nRows * nColumns;
-                   _ddeValues = ConstantValueParser.parse(in, totalCount);
-                   _nColumns = nColumns;
-                   _nRows = nRows;
-                }
-            } else {
-                //body specifies an external defined name
-                int formulaLen = in.readUShort();
-                field_5_name_definition = Formula.read(formulaLen, in);
-            }
-        }
-    }
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("[EXTERNALNAME]\n");
-        sb.append("    .options      = ").append(field_1_option_flag).append("\n");
-		sb.append("    .ix      = ").append(field_2_ixals).append("\n");
-		sb.append("    .name    = ").append(field_4_name).append("\n");
-		if(field_5_name_definition != null) {
-            Ptg[] ptgs = field_5_name_definition.getTokens();
-            for (Ptg ptg : ptgs) {
-                sb.append(ptg.toString()).append(ptg.getRVAType()).append("\n");
-            }
-		}
-		sb.append("[/EXTERNALNAME]\n");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
deleted file mode 100644
index d12bc8b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.common.FtrHeader;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: FeatHdr (Feature Header) Record
- * <P>
- * This record specifies common information for Shared Features, and 
- *  specifies the beginning of a collection of records to define them. 
- * The collection of data (Globals Substream ABNF, macro sheet substream 
- *  ABNF or worksheet substream ABNF) specifies Shared Feature data.
- */
-public final class FeatHdrRecord extends StandardRecord implements Cloneable  {
-	/**
-	 * Specifies the enhanced protection type. Used to protect a 
-	 * shared workbook by restricting access to some areas of it 
-	 */
-	public static final int SHAREDFEATURES_ISFPROTECTION = 0x02;
-	/**
-	 * Specifies that formula errors should be ignored 
-	 */
-	public static final int SHAREDFEATURES_ISFFEC2       = 0x03;
-	/**
-	 * Specifies the smart tag type. Recognises certain
-	 * types of entries (proper names, dates/times etc) and
-	 * flags them for action 
-	 */
-	public static final int SHAREDFEATURES_ISFFACTOID    = 0x04;
-	/**
-	 * Specifies the shared list type. Used for a table
-	 * within a sheet
-	 */
-	public static final int SHAREDFEATURES_ISFLIST       = 0x05;
-
-	
-	public final static short sid = 0x0867;
-
-	private FtrHeader futureHeader;
-	private int isf_sharedFeatureType; // See SHAREDFEATURES_
-	private byte reserved; // Should always be one
-	/** 
-	 * 0x00000000 = rgbHdrData not present
-	 * 0xffffffff = rgbHdrData present
-	 */
-	private long cbHdrData;
-	/** We need a BOFRecord to make sense of this... */
-	private byte[] rgbHdrData;
-
-	public FeatHdrRecord() {
-		futureHeader = new FtrHeader();
-		futureHeader.setRecordType(sid);
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public FeatHdrRecord(RecordInputStream in) {
-		futureHeader = new FtrHeader(in);
-		
-		isf_sharedFeatureType = in.readShort();
-		reserved = in.readByte();
-		cbHdrData = in.readInt();
-		// Don't process this just yet, need the BOFRecord
-		rgbHdrData = in.readRemainder();
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("[FEATURE HEADER]\n");
-		
-		// TODO ...
-		
-		buffer.append("[/FEATURE HEADER]\n");
-		return buffer.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		futureHeader.serialize(out);
-		
-		out.writeShort(isf_sharedFeatureType);
-		out.writeByte(reserved);
-		out.writeInt((int)cbHdrData);
-		out.write(rgbHdrData);
-	}
-
-	protected int getDataSize() {
-		return 12 + 2+1+4+rgbHdrData.length;
-	}
-    
-	@Override
-    public FeatHdrRecord clone() {
-	    //HACK: do a "cheat" clone, see Record.java for more information
-        return (FeatHdrRecord)cloneViaReserialise();
-    }
-
-    
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java
deleted file mode 100644
index 404fc24..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.common.FeatFormulaErr2;
-import org.apache.poi.hssf.record.common.FeatProtection;
-import org.apache.poi.hssf.record.common.FeatSmartTag;
-import org.apache.poi.hssf.record.common.FtrHeader;
-import org.apache.poi.hssf.record.common.SharedFeature;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Title: Feat (Feature) Record
- * <P>
- * This record specifies Shared Features data. It is normally paired
- *  up with a {@link FeatHdrRecord}.
- */
-public final class FeatRecord extends StandardRecord implements Cloneable  {
-    private static POILogger logger = POILogFactory.getLogger(FeatRecord.class);
-    public final static short sid = 0x0868;
-    // SIDs from newer versions
-    public final static short v11_sid = 0x0872;
-    public final static short v12_sid = 0x0878;
-	
-	private FtrHeader futureHeader;
-	
-	/**
-	 * See SHAREDFEATURES_* on {@link FeatHdrRecord}
-	 */
-	private int isf_sharedFeatureType; 
-	private byte reserved1; // Should always be zero
-	private long reserved2; // Should always be zero
-	/** Only matters if type is ISFFEC2 */
-	private long cbFeatData;
-	private int reserved3; // Should always be zero
-	private CellRangeAddress[] cellRefs;
-
-	/**
-	 * Contents depends on isf_sharedFeatureType :
-	 *  ISFPROTECTION -> FeatProtection 
-	 *  ISFFEC2       -> FeatFormulaErr2
-	 *  ISFFACTOID    -> FeatSmartTag
-	 */
-	private SharedFeature sharedFeature; 
-	
-	public FeatRecord() {
-		futureHeader = new FtrHeader();
-		futureHeader.setRecordType(sid);
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public FeatRecord(RecordInputStream in) {
-		futureHeader = new FtrHeader(in);
-		
-		isf_sharedFeatureType = in.readShort();
-		reserved1 = in.readByte();
-		reserved2 = in.readInt();
-		int cref = in.readUShort();
-		cbFeatData = in.readInt();
-		reserved3 = in.readShort();
-
-		cellRefs = new CellRangeAddress[cref];
-		for(int i=0; i<cellRefs.length; i++) {
-			cellRefs[i] = new CellRangeAddress(in);
-		}
-		
-		switch(isf_sharedFeatureType) {
-		case FeatHdrRecord.SHAREDFEATURES_ISFPROTECTION:
-			sharedFeature = new FeatProtection(in);
-			break;
-		case FeatHdrRecord.SHAREDFEATURES_ISFFEC2:
-			sharedFeature = new FeatFormulaErr2(in);
-			break;
-		case FeatHdrRecord.SHAREDFEATURES_ISFFACTOID:
-			sharedFeature = new FeatSmartTag(in);
-			break;
-		default:
-			logger.log( POILogger.ERROR, "Unknown Shared Feature " + isf_sharedFeatureType + " found!");
-		}
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("[SHARED FEATURE]\n");
-		
-		// TODO ...
-		
-		buffer.append("[/SHARED FEATURE]\n");
-		return buffer.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		futureHeader.serialize(out);
-		
-		out.writeShort(isf_sharedFeatureType);
-		out.writeByte(reserved1);
-		out.writeInt((int)reserved2);
-		out.writeShort(cellRefs.length);
-		out.writeInt((int)cbFeatData);
-		out.writeShort(reserved3);
-		
-		for(int i=0; i<cellRefs.length; i++) {
-			cellRefs[i].serialize(out);
-		}
-		
-		sharedFeature.serialize(out);
-	}
-
-	protected int getDataSize() {
-		return 12 + 2+1+4+2+4+2+
-			(cellRefs.length * CellRangeAddress.ENCODED_SIZE)
-			+sharedFeature.getDataSize();
-	}
-
-	public int getIsf_sharedFeatureType() {
-		return isf_sharedFeatureType;
-	}
-
-	public long getCbFeatData() {
-		return cbFeatData;
-	}
-	public void setCbFeatData(long cbFeatData) {
-		this.cbFeatData = cbFeatData;
-	}
-
-	public CellRangeAddress[] getCellRefs() {
-		return cellRefs;
-	}
-	public void setCellRefs(CellRangeAddress[] cellRefs) {
-		this.cellRefs = cellRefs;
-	}
-
-	public SharedFeature getSharedFeature() {
-		return sharedFeature;
-	}
-	public void setSharedFeature(SharedFeature feature) {
-		this.sharedFeature = feature;
-		
-		if(feature instanceof FeatProtection) {
-			isf_sharedFeatureType = FeatHdrRecord.SHAREDFEATURES_ISFPROTECTION;
-		}
-		if(feature instanceof FeatFormulaErr2) {
-			isf_sharedFeatureType = FeatHdrRecord.SHAREDFEATURES_ISFFEC2;
-		}
-		if(feature instanceof FeatSmartTag) {
-			isf_sharedFeatureType = FeatHdrRecord.SHAREDFEATURES_ISFFACTOID;
-		}
-		
-		if(isf_sharedFeatureType == FeatHdrRecord.SHAREDFEATURES_ISFFEC2) {
-			cbFeatData = sharedFeature.getDataSize();
-		} else {
-			cbFeatData = 0;
-		}
-	}
-
-    
-	@Override
-	public FeatRecord clone() {
-        //HACK: do a "cheat" clone, see Record.java for more information
-        return (FeatRecord)cloneViaReserialise();
-    }
-
-    
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java
deleted file mode 100644
index ab941fa..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.apache.poi.poifs.crypt.binaryrc4.BinaryRC4EncryptionHeader;
-import org.apache.poi.poifs.crypt.binaryrc4.BinaryRC4EncryptionVerifier;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionHeader;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionVerifier;
-import org.apache.poi.poifs.crypt.xor.XOREncryptionHeader;
-import org.apache.poi.poifs.crypt.xor.XOREncryptionVerifier;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.LittleEndianOutputStream;
-
-/**
- * Title: File Pass Record (0x002F) <p>
- *
- * Description: Indicates that the record after this record are encrypted.
- */
-public final class FilePassRecord extends StandardRecord implements Cloneable {
-	public static final short sid = 0x002F;
-    private static final int ENCRYPTION_XOR = 0;
-    private static final int ENCRYPTION_OTHER = 1;
-	
-	private final int encryptionType;
-    private EncryptionInfo encryptionInfo;
-	
-	private FilePassRecord(FilePassRecord other) {
-	    encryptionType = other.encryptionType;
-        try {
-            encryptionInfo = other.encryptionInfo.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new EncryptedDocumentException(e);
-        }
-	}
-	
-	public FilePassRecord(EncryptionMode encryptionMode) {
-	    encryptionType = (encryptionMode == EncryptionMode.xor) ? ENCRYPTION_XOR : ENCRYPTION_OTHER;
-	    encryptionInfo = new EncryptionInfo(encryptionMode);
-	}
-	
-	public FilePassRecord(RecordInputStream in) {
-		encryptionType = in.readUShort();
-		
-		EncryptionMode preferredMode;
-        switch (encryptionType) {
-            case ENCRYPTION_XOR:
-                preferredMode = EncryptionMode.xor;
-                break;
-            case ENCRYPTION_OTHER:
-                preferredMode = EncryptionMode.cryptoAPI;
-                break;
-            default:
-                throw new EncryptedDocumentException("invalid encryption type");
-        }
-		
-		try {
-            encryptionInfo = new EncryptionInfo(in, preferredMode);
-        } catch (IOException e) {
-            throw new EncryptedDocumentException(e);
-        }
-	}
-
-	@SuppressWarnings("resource")
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(encryptionType);
-
-        byte data[] = new byte[1024];
-        LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(data, 0);
-
-        switch (encryptionInfo.getEncryptionMode()) {
-            case xor:
-                ((XOREncryptionHeader)encryptionInfo.getHeader()).write(bos);
-                ((XOREncryptionVerifier)encryptionInfo.getVerifier()).write(bos);
-                break;
-            case binaryRC4:
-                out.writeShort(encryptionInfo.getVersionMajor());
-                out.writeShort(encryptionInfo.getVersionMinor());
-                ((BinaryRC4EncryptionHeader)encryptionInfo.getHeader()).write(bos);
-                ((BinaryRC4EncryptionVerifier)encryptionInfo.getVerifier()).write(bos);
-                break;
-            case cryptoAPI:
-                out.writeShort(encryptionInfo.getVersionMajor());
-                out.writeShort(encryptionInfo.getVersionMinor());
-                out.writeInt(encryptionInfo.getEncryptionFlags());
-                ((CryptoAPIEncryptionHeader)encryptionInfo.getHeader()).write(bos);
-                ((CryptoAPIEncryptionVerifier)encryptionInfo.getVerifier()).write(bos);
-                break;
-            default:
-                throw new EncryptedDocumentException("not supported");
-        }
-
-        out.write(data, 0, bos.getWriteIndex());
-	}
-
-	@Override
-    protected int getDataSize() {
-	    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-	    LittleEndianOutputStream leos = new LittleEndianOutputStream(bos);
-        serialize(leos);
-        return bos.size();
-	}
-
-	public EncryptionInfo getEncryptionInfo() {
-        return encryptionInfo;
-    }
-
-    @Override
-    public short getSid() {
-		return sid;
-	}
-	
-	@Override
-	public FilePassRecord clone() {
-		return new FilePassRecord(this);
-	}
-
-	@Override
-    public String toString() {
-	    StringBuilder buffer = new StringBuilder();
-
-		buffer.append("[FILEPASS]\n");
-		buffer.append("    .type = ").append(HexDump.shortToHex(encryptionType)).append('\n');
-        String prefix = "     ."+encryptionInfo.getEncryptionMode();
-        buffer.append(prefix+".info = ").append(HexDump.shortToHex(encryptionInfo.getVersionMajor())).append('\n');
-        buffer.append(prefix+".ver  = ").append(HexDump.shortToHex(encryptionInfo.getVersionMinor())).append('\n');
-        buffer.append(prefix+".salt = ").append(HexDump.toHex(encryptionInfo.getVerifier().getSalt())).append('\n');
-        buffer.append(prefix+".verifier = ").append(HexDump.toHex(encryptionInfo.getVerifier().getEncryptedVerifier())).append('\n');
-        buffer.append(prefix+".verifierHash = ").append(HexDump.toHex(encryptionInfo.getVerifier().getEncryptedVerifierHash())).append('\n');
-		buffer.append("[/FILEPASS]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
deleted file mode 100644
index f2698a3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title:        FILESHARING (0x005B) <p>
- * Description:  stores the encrypted readonly for a workbook (write protect) 
- * This functionality is accessed from the options dialog box available when performing 'Save As'.<p>
- * REFERENCE:  PG 314 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class FileSharingRecord extends StandardRecord implements Cloneable {
-
-    public final static short sid = 0x005B;
-    private short             field_1_readonly;
-    private short             field_2_password;
-    private byte              field_3_username_unicode_options;
-    private String            field_3_username_value;
-
-    public FileSharingRecord() {}
-
-    public FileSharingRecord(RecordInputStream in) {
-        field_1_readonly = in.readShort();
-        field_2_password = in.readShort();
-        
-        int nameLen = in.readShort();
-        
-        if(nameLen > 0) {
-            // TODO - Current examples(3) from junits only have zero length username. 
-            field_3_username_unicode_options = in.readByte();
-            field_3_username_value = in.readCompressedUnicode(nameLen);
-        } else {
-            field_3_username_value = "";
-        }
-    }
-
-    /**
-     * set the readonly flag
-     *
-     * @param readonly 1 for true, not 1 for false
-     */
-    public void setReadOnly(short readonly) {
-        field_1_readonly = readonly;
-    }
-
-    /**
-     * get the readonly
-     *
-     * @return short  representing if this is read only (1 = true)
-     */
-    public short getReadOnly() {
-        return field_1_readonly;
-    }
-
-    /**
-     * @param password hashed password
-     */
-    public void setPassword(short password) {
-        field_2_password = password;
-    }
-
-    /**
-     * @return password hashed with hashPassword() (very lame)
-     */
-    public short getPassword() {
-        return field_2_password;
-    }
-
-
-    /**
-     * @return username of the user that created the file
-     */
-    public String getUsername() {
-        return field_3_username_value;
-    }
-
-    /**
-     * @param username of the user that created the file
-     */
-    public void setUsername(String username) {
-        field_3_username_value = username;
-    }
-
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FILESHARING]\n");
-        buffer.append("    .readonly       = ")
-            .append(getReadOnly() == 1 ? "true" : "false").append("\n");
-        buffer.append("    .password       = ")
-            .append(Integer.toHexString(getPassword())).append("\n");
-        buffer.append("    .username       = ")
-            .append(getUsername()).append("\n");
-        buffer.append("[/FILESHARING]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        // TODO - junit
-        out.writeShort(getReadOnly());
-        out.writeShort(getPassword());
-        out.writeShort(field_3_username_value.length());
-        if(field_3_username_value.length() > 0) {
-        	out.writeByte(field_3_username_unicode_options);
-            StringUtil.putCompressedUnicode(getUsername(), out);
-        }
-    }
-
-    protected int getDataSize() {
-        int nameLen = field_3_username_value.length();
-        if (nameLen < 1) {
-            return 6;
-        }
-        return 7+nameLen;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public FileSharingRecord clone() {
-      FileSharingRecord clone = new FileSharingRecord();
-      clone.setReadOnly(field_1_readonly);
-      clone.setPassword(field_2_password);
-      clone.setUsername(field_3_username_value);
-      return clone;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
deleted file mode 100644
index 5d70aeb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Function Group Count Record<P>
- * Description:  Number of built in function groups in the current version of the
- *               Spreadsheet (probably only used on Windoze)<P>
- * REFERENCE:  PG 315 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-
-public final class FnGroupCountRecord
-    extends StandardRecord
-{
-    public final static short sid   = 0x9c;
-
-    /**
-     * suggested default (14 dec)
-     */
-
-    public final static short COUNT = 14;
-    private short             field_1_count;
-
-    public FnGroupCountRecord()
-    {
-    }
-
-    public FnGroupCountRecord(RecordInputStream in)
-    {
-        field_1_count = in.readShort();
-    }
-
-    /**
-     * set the number of built-in functions
-     *
-     * @param count - number of functions
-     */
-
-    public void setCount(short count)
-    {
-        field_1_count = count;
-    }
-
-    /**
-     * get the number of built-in functions
-     *
-     * @return number of built-in functions
-     */
-
-    public short getCount()
-    {
-        return field_1_count;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FNGROUPCOUNT]\n");
-        buffer.append("    .count            = ").append(getCount())
-            .append("\n");
-        buffer.append("[/FNGROUPCOUNT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getCount());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java
deleted file mode 100644
index 03efd84..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java
+++ /dev/null
@@ -1,494 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title:        Font Record (0x0031) <p>
- * - describes a font in the workbook (index = 0-3,5-infinity - skip 4)<P>
- * Description:  An element in the Font Table<p>
- * REFERENCE:  PG 315 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class FontRecord extends StandardRecord {
-	public final static short     sid                 = 0x0031;                                                 // docs are wrong (0x231 Microsoft Support site article Q184647)
-	public final static short     SS_NONE             = 0;
-	public final static short     SS_SUPER            = 1;
-	public final static short     SS_SUB              = 2;
-	public final static byte      U_NONE              = 0;
-	public final static byte      U_SINGLE            = 1;
-	public final static byte      U_DOUBLE            = 2;
-	public final static byte      U_SINGLE_ACCOUNTING = 0x21;
-	public final static byte      U_DOUBLE_ACCOUNTING = 0x22;
-	private short                 field_1_font_height;        // in units of .05 of a point
-	private short                 field_2_attributes;
-
-	// 0 0x01 - Reserved bit must be 0
-	private static final BitField italic     = BitFieldFactory.getInstance(0x02); // is this font in italics
-
-	// 2 0x04 - reserved bit must be 0
-	private static final BitField strikeout  =BitFieldFactory.getInstance(0x08);  // is this font has a line through the center
-	private static final BitField macoutline = BitFieldFactory.getInstance(0x10); // some weird macintosh thing....but who understands those mac people anyhow
-	private static final BitField macshadow  = BitFieldFactory.getInstance(0x20); // some weird macintosh thing....but who understands those mac people anyhow
-
-	// 7-6 - reserved bits must be 0
-	// the rest is unused
-	private short                 field_3_color_palette_index;
-	private short                 field_4_bold_weight;
-	private short                 field_5_super_sub_script;   // 00none/01super/02sub
-	private byte                  field_6_underline;          // 00none/01single/02double/21singleaccounting/22doubleaccounting
-	private byte                  field_7_family;             // ?? defined by windows api logfont structure?
-	private byte                  field_8_charset;            // ?? defined by windows api logfont structure?
-	private byte                  field_9_zero = 0;           // must be 0
-	/** possibly empty string never <code>null</code> */
-	private String                field_11_font_name;
-
-	public FontRecord() {
-	}
-
-	public FontRecord(RecordInputStream in) {
-		field_1_font_height         = in.readShort();
-		field_2_attributes          = in.readShort();
-		field_3_color_palette_index = in.readShort();
-		field_4_bold_weight         = in.readShort();
-		field_5_super_sub_script    = in.readShort();
-		field_6_underline           = in.readByte();
-		field_7_family              = in.readByte();
-		field_8_charset             = in.readByte();
-		field_9_zero                = in.readByte();
-		int field_10_font_name_len  = in.readUByte();
-		int unicodeFlags            = in.readUByte(); // options byte present always (even if no character data)
-
-		if (field_10_font_name_len > 0) {
-			if (unicodeFlags == 0) {   // is compressed unicode
-				field_11_font_name = in.readCompressedUnicode(field_10_font_name_len);
-			} else {   // is not compressed unicode
-				field_11_font_name = in.readUnicodeLEString(field_10_font_name_len);
-			}
-		} else {
-			field_11_font_name = "";
-		}
-	}
-
-	/**
-	 * sets the height of the font in 1/20th point units
-	 *
-	 * @param height  fontheight (in points/20)
-	 */
-	public void setFontHeight(short height) {
-		field_1_font_height = height;
-	}
-
-	/**
-	 * set the font attributes (see individual bit setters that reference this method)
-	 *
-	 * @param attributes    the bitmask to set
-	 */
-	public void setAttributes(short attributes) {
-		field_2_attributes = attributes;
-	}
-
-	// attributes bitfields
-
-	/**
-	 * set the font to be italics or not
-	 *
-	 * @param italics - whether the font is italics or not
-	 * @see #setAttributes(short)
-	 */
-	public void setItalic(boolean italics) {
-		field_2_attributes = italic.setShortBoolean(field_2_attributes, italics);
-	}
-
-	/**
-	 * set the font to be stricken out or not
-	 *
-	 * @param strike - whether the font is stricken out or not
-	 * @see #setAttributes(short)
-	 */
-	public void setStrikeout(boolean strike) {
-		field_2_attributes = strikeout.setShortBoolean(field_2_attributes, strike);
-	}
-
-	/**
-	 * whether to use the mac outline font style thing (mac only) - Some mac person
-	 * should comment this instead of me doing it (since I have no idea)
-	 *
-	 * @param mac - whether to do that mac font outline thing or not
-	 * @see #setAttributes(short)
-	 */
-	public void setMacoutline(boolean mac) {
-		field_2_attributes = macoutline.setShortBoolean(field_2_attributes, mac);
-	}
-
-	/**
-	 * whether to use the mac shado font style thing (mac only) - Some mac person
-	 * should comment this instead of me doing it (since I have no idea)
-	 *
-	 * @param mac - whether to do that mac font shadow thing or not
-	 * @see #setAttributes(short)
-	 */
-	public void setMacshadow(boolean mac) {
-		field_2_attributes = macshadow.setShortBoolean(field_2_attributes, mac);
-	}
-
-	/**
-	 * set the font's color palette index
-	 *
-	 * @param cpi - font color index
-	 */
-	public void setColorPaletteIndex(short cpi) {
-		field_3_color_palette_index = cpi;
-	}
-
-	/**
-	 * set the bold weight for this font (100-1000dec or 0x64-0x3e8).  Default is
-	 * 0x190 for normal and 0x2bc for bold
-	 *
-	 * @param bw - a number between 100-1000 for the fonts "boldness"
-	 */
-	public void setBoldWeight(short bw) {
-		field_4_bold_weight = bw;
-	}
-
-	/**
-	 * set the type of super or subscript for the font
-	 *
-	 * @param sss  super or subscript option
-	 * @see #SS_NONE
-	 * @see #SS_SUPER
-	 * @see #SS_SUB
-	 */
-	public void setSuperSubScript(short sss) {
-		field_5_super_sub_script = sss;
-	}
-
-	/**
-	 * set the type of underlining for the font
-	 *
-	 * @param u  super or subscript option
-	 *
-	 * @see #U_NONE
-	 * @see #U_SINGLE
-	 * @see #U_DOUBLE
-	 * @see #U_SINGLE_ACCOUNTING
-	 * @see #U_DOUBLE_ACCOUNTING
-	 */
-	public void setUnderline(byte u) {
-		field_6_underline = u;
-	}
-
-	/**
-	 * set the font family (TODO)
-	 *
-	 * @param f family
-	 */
-	public void setFamily(byte f) {
-		field_7_family = f;
-	}
-
-	/**
-	 * set the character set
-	 *
-	 * @param charset - character set
-	 */
-	public void setCharset(byte charset) {
-		field_8_charset = charset;
-	}
-
-
-	/**
-	 * set the name of the font
-	 *
-	 * @param fn - name of the font (i.e. "Arial")
-	 */
-	public void setFontName(String fn) {
-		field_11_font_name = fn;
-	}
-
-	/**
-	 * gets the height of the font in 1/20th point units
-	 *
-	 * @return fontheight (in points/20)
-	 */
-	public short getFontHeight() {
-		return field_1_font_height;
-	}
-
-	/**
-	 * get the font attributes (see individual bit getters that reference this method)
-	 *
-	 * @return attribute - the bitmask
-	 */
-	public short getAttributes() {
-		return field_2_attributes;
-	}
-
-	/**
-	 * get whether the font is to be italics or not
-	 *
-	 * @return italics - whether the font is italics or not
-	 * @see #getAttributes()
-	 */
-	public boolean isItalic() {
-		return italic.isSet(field_2_attributes);
-	}
-
-	/**
-	 * get whether the font is to be stricken out or not
-	 *
-	 * @return strike - whether the font is stricken out or not
-	 * @see #getAttributes()
-	 */
-	public boolean isStruckout(){
-		return strikeout.isSet(field_2_attributes);
-	}
-
-	/**
-	 * whether to use the mac outline font style thing (mac only) - Some mac person
-	 * should comment this instead of me doing it (since I have no idea)
-	 *
-	 * @return mac - whether to do that mac font outline thing or not
-	 * @see #getAttributes()
-	 */
-	public boolean isMacoutlined(){
-		return macoutline.isSet(field_2_attributes);
-	}
-
-	/**
-	 * whether to use the mac shado font style thing (mac only) - Some mac person
-	 * should comment this instead of me doing it (since I have no idea)
-	 *
-	 * @return mac - whether to do that mac font shadow thing or not
-	 * @see #getAttributes()
-	 */
-	public boolean isMacshadowed(){
-		return macshadow.isSet(field_2_attributes);
-	}
-
-	/**
-	 * get the font's color palette index
-	 *
-	 * @return cpi - font color index
-	 */
-	public short getColorPaletteIndex(){
-		return field_3_color_palette_index;
-	}
-
-	/**
-	 * get the bold weight for this font (100-1000dec or 0x64-0x3e8).  Default is
-	 * 0x190 for normal and 0x2bc for bold
-	 *
-	 * @return bw - a number between 100-1000 for the fonts "boldness"
-	 */
-	public short getBoldWeight(){
-		return field_4_bold_weight;
-	}
-
-	/**
-	 * get the type of super or subscript for the font
-	 *
-	 * @return super or subscript option
-	 * @see #SS_NONE
-	 * @see #SS_SUPER
-	 * @see #SS_SUB
-	 */
-	public short getSuperSubScript(){
-		return field_5_super_sub_script;
-	}
-
-	/**
-	 * get the type of underlining for the font
-	 *
-	 * @return super or subscript option
-	 *
-	 * @see #U_NONE
-	 * @see #U_SINGLE
-	 * @see #U_DOUBLE
-	 * @see #U_SINGLE_ACCOUNTING
-	 * @see #U_DOUBLE_ACCOUNTING
-	 */
-	public byte getUnderline() {
-		return field_6_underline;
-	}
-
-	/**
-	 * get the font family (TODO)
-	 *
-	 * @return family
-	 */
-	public byte getFamily() {
-		return field_7_family;
-	}
-
-	/**
-	 * get the character set
-	 *
-	 * @return charset - character set
-	 */
-	public byte getCharset() {
-		return field_8_charset;
-	}
-
-	/**
-	 * get the name of the font
-	 *
-	 * @return fn - name of the font (i.e. "Arial")
-	 */
-	public String getFontName() {
-		return field_11_font_name;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("[FONT]\n");
-		sb.append("    .fontheight    = ").append(HexDump.shortToHex(getFontHeight())).append("\n");
-		sb.append("    .attributes    = ").append(HexDump.shortToHex(getAttributes())).append("\n");
-		sb.append("       .italic     = ").append(isItalic()).append("\n");
-		sb.append("       .strikout   = ").append(isStruckout()).append("\n");
-		sb.append("       .macoutlined= ").append(isMacoutlined()).append("\n");
-		sb.append("       .macshadowed= ").append(isMacshadowed()).append("\n");
-		sb.append("    .colorpalette  = ").append(HexDump.shortToHex(getColorPaletteIndex())).append("\n");
-		sb.append("    .boldweight    = ").append(HexDump.shortToHex(getBoldWeight())).append("\n");
-		sb.append("    .supersubscript= ").append(HexDump.shortToHex(getSuperSubScript())).append("\n");
-		sb.append("    .underline     = ").append(HexDump.byteToHex(getUnderline())).append("\n");
-		sb.append("    .family        = ").append(HexDump.byteToHex(getFamily())).append("\n");
-		sb.append("    .charset       = ").append(HexDump.byteToHex(getCharset())).append("\n");
-		sb.append("    .fontname      = ").append(getFontName()).append("\n");
-		sb.append("[/FONT]\n");
-		return sb.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-
-		out.writeShort(getFontHeight());
-		out.writeShort(getAttributes());
-		out.writeShort(getColorPaletteIndex());
-		out.writeShort(getBoldWeight());
-		out.writeShort(getSuperSubScript());
-		out.writeByte(getUnderline());
-		out.writeByte(getFamily());
-		out.writeByte(getCharset());
-		out.writeByte(field_9_zero);
-		int fontNameLen = field_11_font_name.length();
-		out.writeByte(fontNameLen);
-		boolean hasMultibyte = StringUtil.hasMultibyte(field_11_font_name);
-		out.writeByte(hasMultibyte ? 0x01 : 0x00);
-		if (fontNameLen > 0) {
-			if (hasMultibyte) {
-			   StringUtil.putUnicodeLE(field_11_font_name, out);
-			} else {
-				StringUtil.putCompressedUnicode(field_11_font_name, out);
-			}
-		}
-	}
-	protected int getDataSize() {
-		int size = 16; // 5 shorts + 6 bytes
-		int fontNameLen = field_11_font_name.length();
-		if (fontNameLen < 1) {
-			return size;
-		}
-
-		boolean hasMultibyte = StringUtil.hasMultibyte(field_11_font_name);
-		return size + fontNameLen * (hasMultibyte ? 2 : 1);
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	/**
-	 * Clones all the font style information from another
-	 *  FontRecord, onto this one. This
-	 *  will then hold all the same font style options.
-	 * 
-	 * @param source the record to clone the properties from
-	 */
-	public void cloneStyleFrom(FontRecord source) {
-		field_1_font_height         = source.field_1_font_height;
-		field_2_attributes          = source.field_2_attributes;
-		field_3_color_palette_index = source.field_3_color_palette_index;
-		field_4_bold_weight         = source.field_4_bold_weight;
-		field_5_super_sub_script    = source.field_5_super_sub_script;
-		field_6_underline           = source.field_6_underline;
-		field_7_family              = source.field_7_family;
-		field_8_charset             = source.field_8_charset;
-		field_9_zero                = source.field_9_zero;
-		field_11_font_name          = source.field_11_font_name;
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime
-				* result
-				+ ((field_11_font_name == null) ? 0 : field_11_font_name
-						.hashCode());
-		result = prime * result + field_1_font_height;
-		result = prime * result + field_2_attributes;
-		result = prime * result + field_3_color_palette_index;
-		result = prime * result + field_4_bold_weight;
-		result = prime * result + field_5_super_sub_script;
-		result = prime * result + field_6_underline;
-		result = prime * result + field_7_family;
-		result = prime * result + field_8_charset;
-		result = prime * result + field_9_zero;
-		return result;
-	}
-
-	/**
-	 * Does this FontRecord have all the same font
-	 *  properties as the supplied FontRecord?
-	 * Note that {@link #equals(Object)} will check
-	 *  for exact objects, while this will check
-	 *  for exact contents, because normally the
-	 *  font record's position makes a big
-	 *  difference too.
-	 *  
-	 *  @param other the record to compare with
-	 *  
-	 *  @return true, if the properties match
-	 */
-	public boolean sameProperties(FontRecord other) {
-		return
-		field_1_font_height         == other.field_1_font_height &&
-		field_2_attributes          == other.field_2_attributes &&
-		field_3_color_palette_index == other.field_3_color_palette_index &&
-		field_4_bold_weight         == other.field_4_bold_weight &&
-		field_5_super_sub_script    == other.field_5_super_sub_script &&
-		field_6_underline           == other.field_6_underline &&
-		field_7_family              == other.field_7_family &&
-		field_8_charset             == other.field_8_charset &&
-		field_9_zero                == other.field_9_zero &&
-        stringEquals(this.field_11_font_name, other.field_11_font_name)
-		;
-	}
-
-    public boolean equals(Object o) {
-        return (o instanceof FontRecord) ? sameProperties((FontRecord)o) : false;
-    }
-    
-    private static boolean stringEquals(String s1, String s2) {
-        return (s1 == s2 || (s1 != null && s1.equals(s2)));
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java
deleted file mode 100644
index e5e98bb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-/**
- * Title:        Footer Record (0x0015)<p>
- * Description:  Specifies the footer for a sheet<p>
- * REFERENCE:  PG 317 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class FooterRecord extends HeaderFooterBase implements Cloneable {
-	public final static short sid = 0x0015;
-
-	public FooterRecord(String text) {
-		super(text);
-	}
-
-	public FooterRecord(RecordInputStream in) {
-		super(in);
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[FOOTER]\n");
-		buffer.append("    .footer = ").append(getText()).append("\n");
-		buffer.append("[/FOOTER]\n");
-		return buffer.toString();
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public FooterRecord clone() {
-		return new FooterRecord(getText());
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
deleted file mode 100644
index 955c52c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title:        Format Record (0x041E)<p>
- * Description:  describes a number format -- those goofy strings like $(#,###)<p>
- *
- * REFERENCE:  PG 317 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class FormatRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x041E;
-
-    private final int field_1_index_code;
-    private final boolean field_3_hasMultibyte;
-    private final String field_4_formatstring;
-
-    private FormatRecord(FormatRecord other) {
-        field_1_index_code = other.field_1_index_code;
-        field_3_hasMultibyte = other.field_3_hasMultibyte;
-        field_4_formatstring = other.field_4_formatstring;
-    }
-    
-    public FormatRecord(int indexCode, String fs) {
-        field_1_index_code = indexCode;
-        field_4_formatstring = fs;
-        field_3_hasMultibyte = StringUtil.hasMultibyte(fs);
-    }
-
-    public FormatRecord(RecordInputStream in) {
-        field_1_index_code = in.readShort();
-        int field_3_unicode_len = in.readUShort();
-        field_3_hasMultibyte = (in.readByte() & 0x01) != 0;
-
-        if (field_3_hasMultibyte) {
-            field_4_formatstring = in.readUnicodeLEString(field_3_unicode_len);
-        } else {
-            field_4_formatstring = in.readCompressedUnicode(field_3_unicode_len);
-        }
-    }
-
-    /**
-     * get the format index code (for built in formats)
-     *
-     * @return the format index code
-     * @see org.apache.poi.hssf.model.InternalWorkbook
-     */
-    public int getIndexCode() {
-        return field_1_index_code;
-    }
-
-    /**
-     * get the format string
-     *
-     * @return the format string
-     */
-    public String getFormatString() {
-        return field_4_formatstring;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FORMAT]\n");
-        buffer.append("    .indexcode       = ").append(HexDump.shortToHex(getIndexCode())).append("\n");
-        buffer.append("    .isUnicode       = ").append(field_3_hasMultibyte ).append("\n");
-        buffer.append("    .formatstring    = ").append(getFormatString()).append("\n");
-        buffer.append("[/FORMAT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        String formatString = getFormatString();
-        out.writeShort(getIndexCode());
-        out.writeShort(formatString.length());
-        out.writeByte(field_3_hasMultibyte ? 0x01 : 0x00);
-
-      if ( field_3_hasMultibyte ) {
-          StringUtil.putUnicodeLE( formatString, out);
-      }  else {
-          StringUtil.putCompressedUnicode( formatString, out);
-      }
-    }
-    protected int getDataSize() {
-        return 5 // 2 shorts + 1 byte
-            + getFormatString().length() * (field_3_hasMultibyte ? 2 : 1);
-    }
-
-    public short getSid() {
-        return sid;
-    }
-    
-    @Override
-    public FormatRecord clone() {
-        return new FormatRecord(this);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
deleted file mode 100644
index 4eae6ce..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Formula Record (0x0006).
- * REFERENCE:  PG 317/444 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class FormulaRecord extends CellRecord implements Cloneable {
-
-	public static final short sid = 0x0006;   // docs say 406...because of a bug Microsoft support site article #Q184647)
-	private static int FIXED_SIZE = 14; // double + short + int
-
-	private static final BitField alwaysCalc = BitFieldFactory.getInstance(0x0001);
-	private static final BitField calcOnLoad = BitFieldFactory.getInstance(0x0002);
-	private static final BitField sharedFormula = BitFieldFactory.getInstance(0x0008);
-
-	/**
-	 * Manages the cached formula result values of other types besides numeric.
-	 * Excel encodes the same 8 bytes that would be field_4_value with various NaN
-	 * values that are decoded/encoded by this class. 
-	 */
-	static final class SpecialCachedValue {
-		/** deliberately chosen by Excel in order to encode other values within Double NaNs */
-		private static final long BIT_MARKER = 0xFFFF000000000000L;
-		private static final int VARIABLE_DATA_LENGTH = 6;
-		private static final int DATA_INDEX = 2;
-
-		// FIXME: can these be merged with {@link CellType}?
-		// are the numbers specific to the HSSF formula record format or just a poor-man's enum?
-		public static final int STRING = 0;
-		public static final int BOOLEAN = 1;
-		public static final int ERROR_CODE = 2;
-		public static final int EMPTY = 3;
-
-		private final byte[] _variableData;
-
-		private SpecialCachedValue(byte[] data) {
-			_variableData = data;
-		}
-		public int getTypeCode() {
-			return _variableData[0];
-		}
-
-		/**
-		 * @return <code>null</code> if the double value encoded by <tt>valueLongBits</tt> 
-		 * is a normal (non NaN) double value.
-		 */
-		public static SpecialCachedValue create(long valueLongBits) {
-			if ((BIT_MARKER & valueLongBits) != BIT_MARKER) {
-				return null;
-			}
-
-			byte[] result = new byte[VARIABLE_DATA_LENGTH];
-			long x = valueLongBits;
-			for (int i=0; i<VARIABLE_DATA_LENGTH; i++) {
-				result[i] = (byte) x;
-				x >>= 8;
-			}
-			switch (result[0]) {
-				case STRING:
-				case BOOLEAN:
-				case ERROR_CODE:
-				case EMPTY:
-					break;
-				default:
-					throw new RecordFormatException("Bad special value code (" + result[0] + ")");
-			}
-			return new SpecialCachedValue(result);
-		}
-		public void serialize(LittleEndianOutput out) {
-			out.write(_variableData);
-			out.writeShort(0xFFFF);
-		}
-		public String formatDebugString() {
-			return formatValue() + ' ' + HexDump.toHex(_variableData);
-		}
-		private String formatValue() {
-			int typeCode = getTypeCode();
-			switch (typeCode) {
-				case STRING:	 return "<string>";
-				case BOOLEAN:	return getDataValue() == 0 ? "FALSE" : "TRUE";
-				case ERROR_CODE: return ErrorEval.getText(getDataValue());
-				case EMPTY:	  return "<empty>";
-			}
-			return "#error(type=" + typeCode + ")#";
-		}
-		private int getDataValue() {
-			return _variableData[DATA_INDEX];
-		}
-		public static SpecialCachedValue createCachedEmptyValue() {
-			return create(EMPTY, 0);
-		}
-		public static SpecialCachedValue createForString() {
-			return create(STRING, 0);
-		}
-		public static SpecialCachedValue createCachedBoolean(boolean b) {
-			return create(BOOLEAN, b ? 1 : 0);
-		}
-		public static SpecialCachedValue createCachedErrorCode(int errorCode) {
-			return create(ERROR_CODE, errorCode);
-		}
-		private static SpecialCachedValue create(int code, int data) {
-			byte[] vd = {
-					(byte) code,
-					0,
-					(byte) data,
-					0,
-					0,
-					0,
-			};
-			return new SpecialCachedValue(vd);
-		}
-		@Override
-        public String toString() {
-			StringBuffer sb = new StringBuffer(64);
-			sb.append(getClass().getName());
-			sb.append('[').append(formatValue()).append(']');
-			return sb.toString();
-		}
-		public int getValueType() {
-			int typeCode = getTypeCode();
-			switch (typeCode) {
-				case STRING:	 return CellType.STRING.getCode();
-				case BOOLEAN:	return CellType.BOOLEAN.getCode();
-				case ERROR_CODE: return CellType.ERROR.getCode();
-				case EMPTY:	  return CellType.STRING.getCode(); // is this correct?
-			}
-			throw new IllegalStateException("Unexpected type id (" + typeCode + ")");
-		}
-		public boolean getBooleanValue() {
-			if (getTypeCode() != BOOLEAN) {
-				throw new IllegalStateException("Not a boolean cached value - " + formatValue());
-			}
-			return getDataValue() != 0;
-		}
-		public int getErrorValue() {
-			if (getTypeCode() != ERROR_CODE) {
-				throw new IllegalStateException("Not an error cached value - " + formatValue());
-			}
-			return getDataValue();
-		}
-	}
-
-	private double field_4_value;
-	private short  field_5_options;
-	/**
-	 * Unused field.  As it turns out this field is often not zero..
-	 * According to Microsoft Excel Developer's Kit Page 318:
-	 * when writing the chn field (offset 20), it's supposed to be 0 but ignored on read
-	 */
-	private int field_6_zero;
-	private Formula field_8_parsed_expr;
-
-	/**
-	 * Since the NaN support seems sketchy (different constants) we'll store and spit it out directly
-	 */
-	private SpecialCachedValue specialCachedValue;
-
-	/** Creates new FormulaRecord */
-
-	public FormulaRecord() {
-		field_8_parsed_expr = Formula.create(Ptg.EMPTY_PTG_ARRAY);
-	}
-
-	public FormulaRecord(RecordInputStream ris) {
-		super(ris);
-		LittleEndianInput in = ris;
-		long valueLongBits  = in.readLong();
-		field_5_options = in.readShort();
-		specialCachedValue = SpecialCachedValue.create(valueLongBits);
-		if (specialCachedValue == null) {
-			field_4_value = Double.longBitsToDouble(valueLongBits);
-		}
-
-		field_6_zero = in.readInt();
-
-		int field_7_expression_len = in.readShort(); // this length does not include any extra array data
-		int nBytesAvailable = in.available();
-		field_8_parsed_expr = Formula.read(field_7_expression_len, in, nBytesAvailable);
-	}
-
-	/**
-	 * set the calculated value of the formula
-	 *
-	 * @param value  calculated value
-	 */
-	public void setValue(double value) {
-		field_4_value = value;
-		specialCachedValue = null;
-	}
-
-	public void setCachedResultTypeEmptyString() {
-		specialCachedValue = SpecialCachedValue.createCachedEmptyValue();
-	}
-	public void setCachedResultTypeString() {
-		specialCachedValue = SpecialCachedValue.createForString();
-	}
-	public void setCachedResultErrorCode(int errorCode) {
-		specialCachedValue = SpecialCachedValue.createCachedErrorCode(errorCode);
-	}
-	public void setCachedResultBoolean(boolean value) {
-		specialCachedValue = SpecialCachedValue.createCachedBoolean(value);
-	}
-	/**
-	 * @return <code>true</code> if this {@link FormulaRecord} is followed by a
-	 *  {@link StringRecord} representing the cached text result of the formula
-	 *  evaluation.
-	 */
-	public boolean hasCachedResultString() {
-		if (specialCachedValue == null) {
-			return false;
-		}
-		return specialCachedValue.getTypeCode() == SpecialCachedValue.STRING;
-	}
-
-	public int getCachedResultType() {
-		if (specialCachedValue == null) {
-			return CellType.NUMERIC.getCode();
-		}
-		return specialCachedValue.getValueType();
-	}
-
-	public boolean getCachedBooleanValue() {
-		return specialCachedValue.getBooleanValue();
-	}
-	public int getCachedErrorValue() {
-		return specialCachedValue.getErrorValue();
-	}
-
-
-	/**
-	 * set the option flags
-	 *
-	 * @param options  bitmask
-	 */
-	public void setOptions(short options) {
-		field_5_options = options;
-	}
-
-	/**
-	 * get the calculated value of the formula
-	 *
-	 * @return calculated value
-	 */
-	public double getValue() {
-		return field_4_value;
-	}
-
-	/**
-	 * get the option flags
-	 *
-	 * @return bitmask
-	 */
-	public short getOptions() {
-		return field_5_options;
-	}
-
-	public boolean isSharedFormula() {
-		return sharedFormula.isSet(field_5_options);
-	}
-	public void setSharedFormula(boolean flag) {
-		field_5_options =
-			sharedFormula.setShortBoolean(field_5_options, flag);
-	}
-
-	public boolean isAlwaysCalc() {
-		return alwaysCalc.isSet(field_5_options);
-	}
-	public void setAlwaysCalc(boolean flag) {
-		field_5_options =
-			alwaysCalc.setShortBoolean(field_5_options, flag);
-	}
-
-	public boolean isCalcOnLoad() {
-		return calcOnLoad.isSet(field_5_options);
-	}
-	public void setCalcOnLoad(boolean flag) {
-		field_5_options =
-			calcOnLoad.setShortBoolean(field_5_options, flag);
-	}
-
-	/**
-	 * @return the formula tokens. never <code>null</code>
-	 */
-	public Ptg[] getParsedExpression() {
-		return field_8_parsed_expr.getTokens();
-	}
-
-	public Formula getFormula() {
-		return field_8_parsed_expr;
-	}
-
-	public void setParsedExpression(Ptg[] ptgs) {
-		field_8_parsed_expr = Formula.create(ptgs);
-	}
-
-	@Override
-    public short getSid() {
-		return sid;
-	}
-
-	@Override
-	protected int getValueDataSize() {
-		return FIXED_SIZE + field_8_parsed_expr.getEncodedSize();
-	}
-	@Override
-	protected void serializeValue(LittleEndianOutput out) {
-
-		if (specialCachedValue == null) {
-			out.writeDouble(field_4_value);
-		} else {
-			specialCachedValue.serialize(out);
-		}
-
-		out.writeShort(getOptions());
-
-		out.writeInt(field_6_zero); // may as well write original data back so as to minimise differences from original
-		field_8_parsed_expr.serialize(out);
-	}
-	
-	@Override
-	protected String getRecordName() {
-		return "FORMULA";
-	}
-	
-	@Override
-	protected void appendValueText(StringBuilder sb) {
-		sb.append("  .value	 = ");
-		if (specialCachedValue == null) {
-			sb.append(field_4_value).append("\n");
-		} else {
-			sb.append(specialCachedValue.formatDebugString()).append("\n");
-		}
-		sb.append("  .options   = ").append(HexDump.shortToHex(getOptions())).append("\n");
-		sb.append("    .alwaysCalc= ").append(isAlwaysCalc()).append("\n");
-		sb.append("    .calcOnLoad= ").append(isCalcOnLoad()).append("\n");
-		sb.append("    .shared    = ").append(isSharedFormula()).append("\n");
-		sb.append("  .zero      = ").append(HexDump.intToHex(field_6_zero)).append("\n");
-
-		Ptg[] ptgs = field_8_parsed_expr.getTokens();
-		for (int k = 0; k < ptgs.length; k++ ) {
-			if (k>0) {
-				sb.append("\n");
-			}
-			sb.append("    Ptg[").append(k).append("]=");
-			Ptg ptg = ptgs[k];
-			sb.append(ptg.toString()).append(ptg.getRVAType());
-		}
-	}
-
-	@Override
-    public FormulaRecord clone() {
-		FormulaRecord rec = new FormulaRecord();
-		copyBaseFields(rec);
-		rec.field_4_value = field_4_value;
-		rec.field_5_options = field_5_options;
-		rec.field_6_zero = field_6_zero;
-		rec.field_8_parsed_expr = field_8_parsed_expr;
-		rec.specialCachedValue = specialCachedValue;
-		return rec;
-	}
-}
-
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
deleted file mode 100644
index 14c0ddd..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * This structure appears as part of an Obj record that represents a checkbox or radio button.
- *
- * @author Yegor Kozlov
- */
-public final class FtCblsSubRecord extends SubRecord implements Cloneable {
-    public final static short sid = 0x0C;
-    private static final int ENCODED_SIZE = 20;
-
-    private byte[] reserved;
-
-    /**
-     * Construct a new <code>FtCblsSubRecord</code> and
-     * fill its data with the default values
-     */
-    public FtCblsSubRecord()
-    {
-        reserved = new byte[ENCODED_SIZE];
-    }
-
-    public FtCblsSubRecord(LittleEndianInput in, int size) {
-        if (size != ENCODED_SIZE) {
-            throw new RecordFormatException("Unexpected size (" + size + ")");
-        }
-        //just grab the raw data
-        byte[] buf = new byte[size];
-        in.readFully(buf);
-        reserved = buf;
-    }
-
-    /**
-     * Convert this record to string.
-     * Used by BiffViewer and other utilities.
-     */
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FtCbls ]").append("\n");
-        buffer.append("  size     = ").append(getDataSize()).append("\n");
-        buffer.append("  reserved = ").append(HexDump.toHex(reserved)).append("\n");
-        buffer.append("[/FtCbls ]").append("\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Serialize the record data into the supplied array of bytes
-     *
-     * @param out the stream to serialize into
-     */
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid);
-        out.writeShort(reserved.length);
-        out.write(reserved);
-    }
-
-	protected int getDataSize() {
-        return reserved.length;
-    }
-
-    /**
-     * @return id of this record.
-     */
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public FtCblsSubRecord clone() {
-        FtCblsSubRecord rec = new FtCblsSubRecord();
-        byte[] recdata = new byte[reserved.length];
-        System.arraycopy(reserved, 0, recdata, 0, recdata.length);
-        rec.reserved = recdata;
-        return rec;
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
deleted file mode 100644
index 08a6612..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * The FtCf structure specifies the clipboard format of the picture-type Obj record containing this FtCf.
- */
-public final class FtCfSubRecord extends SubRecord implements Cloneable {
-    public final static short sid = 0x07;
-    public final static short length = 0x02;
-    
-    /**
-     * Specifies the format of the picture is an enhanced metafile.
-     */
-    public static final short METAFILE_BIT    = (short)0x0002;
-
-    /**
-     * Specifies the format of the picture is a bitmap.
-     */
-    public static final short BITMAP_BIT      = (short)0x0009;
-    
-    /**
-     * Specifies the picture is in an unspecified format that is
-     * neither and enhanced metafile nor a bitmap.
-     */
-    public static final short UNSPECIFIED_BIT = (short)0xFFFF;
-    
-    private short flags = 0;
-
-    /**
-     * Construct a new <code>FtPioGrbitSubRecord</code> and
-     * fill its data with the default values
-     */
-    public FtCfSubRecord() {
-    }
-
-    public FtCfSubRecord(LittleEndianInput in, int size) {
-        if (size != length) {
-            throw new RecordFormatException("Unexpected size (" + size + ")");
-        }
-        flags = in.readShort();
-    }
-
-    /**
-     * Convert this record to string.
-     * Used by BiffViewer and other utilities.
-     */
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("[FtCf ]\n");
-        buffer.append("  size     = ").append(length).append("\n");
-        buffer.append("  flags    = ").append(HexDump.toHex(flags)).append("\n");
-        buffer.append("[/FtCf ]\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Serialize the record data into the supplied array of bytes
-     *
-     * @param out the stream to serialize into
-     */
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid);
-        out.writeShort(length);
-        out.writeShort(flags);
-    }
-
- protected int getDataSize() {
-        return length;
-    }
-
-    /**
-     * @return id of this record.
-     */
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public FtCfSubRecord clone() {
-        FtCfSubRecord rec = new FtCfSubRecord();
-        rec.flags = this.flags;
-        return rec;
-    }
-
- public short getFlags() {
-   return flags;
- }
-
- public void setFlags(short flags) {
-   this.flags = flags;
- }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
deleted file mode 100644
index fa8c453..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * This structure appears as part of an Obj record that represents image display properties.
- */
-public final class FtPioGrbitSubRecord extends SubRecord implements Cloneable {
-    public final static short sid = 0x08;
-    public final static short length = 0x02;
-    
-    /**
-     * A bit that specifies whether the picture's aspect ratio is preserved when rendered in 
-     * different views (Normal view, Page Break Preview view, Page Layout view and printing).
-     */
-    public static final int AUTO_PICT_BIT    = 1 << 0;
-
-    /**
-     * A bit that specifies whether the pictFmla field of the Obj record that contains 
-     * this FtPioGrbit specifies a DDE reference.
-     */
-    public static final int DDE_BIT          = 1 << 1;
-    
-    /**
-     * A bit that specifies whether this object is expected to be updated on print to
-     * reflect the values in the cell associated with the object.
-     */
-    public static final int PRINT_CALC_BIT   = 1 << 2;
-
-    /**
-     * A bit that specifies whether the picture is displayed as an icon.
-     */
-    public static final int ICON_BIT         = 1 << 3;
-    
-    /**
-     * A bit that specifies whether this object is an ActiveX control.
-     * It MUST NOT be the case that both fCtl and fDde are equal to 1.
-     */
-    public static final int CTL_BIT          = 1 << 4;
-    
-    /**
-     * A bit that specifies whether the object data are stored in an
-     * embedding storage (= 0) or in the controls stream (ctls) (= 1).
-     */
-    public static final int PRSTM_BIT        = 1 << 5;
-    
-    /**
-     * A bit that specifies whether this is a camera picture.
-     */
-    public static final int CAMERA_BIT       = 1 << 7;
-    
-    /**
-     * A bit that specifies whether this picture's size has been explicitly set.
-     * 0 = picture size has been explicitly set, 1 = has not been set
-     */
-    public static final int DEFAULT_SIZE_BIT = 1 << 8;
-    
-    /**
-     * A bit that specifies whether the OLE server for the object is called
-     * to load the object's data automatically when the parent workbook is opened.
-     */
-    public static final int AUTO_LOAD_BIT    = 1 << 9;
-
-    
-    private short flags = 0;
-
-    /**
-     * Construct a new <code>FtPioGrbitSubRecord</code> and
-     * fill its data with the default values
-     */
-    public FtPioGrbitSubRecord() {
-    }
-
-    public FtPioGrbitSubRecord(LittleEndianInput in, int size) {
-        if (size != length) {
-            throw new RecordFormatException("Unexpected size (" + size + ")");
-        }
-        flags = in.readShort();
-    }
-
-    /**
-     * Use one of the bitmasks MANUAL_ADVANCE_BIT ... CURSOR_VISIBLE_BIT
-     * @param bitmask the bitmask to apply
-     * @param enabled if true, the bitmask will be or-ed, otherwise the bits set in the mask will be removed from the flags
-     */
-    public void setFlagByBit(int bitmask, boolean enabled) {
-        if (enabled) {
-            flags |= bitmask;
-        } else {
-            flags &= (0xFFFF ^ bitmask);
-        }
-    }    
-    
-    public boolean getFlagByBit(int bitmask) {
-        return ((flags & bitmask) != 0);
-    }
-    
-    /**
-     * Convert this record to string.
-     * Used by BiffViewer and other utilities.
-     */
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("[FtPioGrbit ]\n");
-        buffer.append("  size     = ").append(length).append("\n");
-        buffer.append("  flags    = ").append(HexDump.toHex(flags)).append("\n");
-        buffer.append("[/FtPioGrbit ]\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Serialize the record data into the supplied array of bytes
-     *
-     * @param out the stream to serialize into
-     */
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid);
-        out.writeShort(length);
-        out.writeShort(flags);
-    }
-
- protected int getDataSize() {
-        return length;
-    }
-
-    /**
-     * @return id of this record.
-     */
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public FtPioGrbitSubRecord clone() {
-        FtPioGrbitSubRecord rec = new FtPioGrbitSubRecord();
-        rec.flags = this.flags;
-        return rec;
-    }
-
- public short getFlags() {
-   return flags;
- }
-
- public void setFlags(short flags) {
-   this.flags = flags;
- }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java b/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java
deleted file mode 100644
index 14f04ab..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java
+++ /dev/null
@@ -1,109 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Gridset Record.<P>
- * Description:  flag denoting whether the user specified that gridlines are used when
- *               printing.<P>
- * REFERENCE:  PG 320 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author  Glen Stampoultzis (glens at apache.org)
- * @author Jason Height (jheight at chariot dot net dot au)
- *
- * @version 2.0-pre
- */
-
-public final class GridsetRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x82;
-    public short              field_1_gridset_flag;
-
-    public GridsetRecord()
-    {
-    }
-
-    public GridsetRecord(RecordInputStream in)
-    {
-        field_1_gridset_flag = in.readShort();
-    }
-
-    /**
-     * set whether gridlines are visible when printing
-     *
-     * @param gridset - <b>true</b> if no gridlines are print, <b>false</b> if gridlines are not print.
-     */
-
-    public void setGridset(boolean gridset)
-    {
-        if (gridset == true)
-        {
-            field_1_gridset_flag = 1;
-        }
-        else
-        {
-            field_1_gridset_flag = 0;
-        }
-    }
-
-    /**
-     * get whether the gridlines are shown during printing.
-     *
-     * @return gridset - true if gridlines are NOT printed, false if they are.
-     */
-
-    public boolean getGridset()
-    {
-        return (field_1_gridset_flag == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[GRIDSET]\n");
-        buffer.append("    .gridset        = ").append(getGridset())
-            .append("\n");
-        buffer.append("[/GRIDSET]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_gridset_flag);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public GridsetRecord clone() {
-      GridsetRecord rec = new GridsetRecord();
-      rec.field_1_gridset_flag = field_1_gridset_flag;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
deleted file mode 100644
index c7af79e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ftGmo (0x0006)<p>
- * The group marker record is used as a position holder for groups.
- */
-public final class GroupMarkerSubRecord extends SubRecord implements Cloneable {
-    public final static short sid = 0x0006;
-
-    private static final byte[] EMPTY_BYTE_ARRAY = { };
-
-    // would really love to know what goes in here.
-    private byte[] reserved;
-
-    public GroupMarkerSubRecord() {
-        reserved = EMPTY_BYTE_ARRAY;
-    }
-
-    public GroupMarkerSubRecord(LittleEndianInput in, int size) {
-        byte[] buf = new byte[size];
-        in.readFully(buf);
-        reserved = buf;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        String nl = System.getProperty("line.separator");
-        buffer.append("[ftGmo]" + nl);
-        buffer.append("  reserved = ").append(HexDump.toHex(reserved)).append(nl);
-        buffer.append("[/ftGmo]" + nl);
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid);
-        out.writeShort(reserved.length);
-        out.write(reserved);
-    }
-
-	protected int getDataSize() {
-        return reserved.length;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public GroupMarkerSubRecord clone() {
-        GroupMarkerSubRecord rec = new GroupMarkerSubRecord();
-        rec.reserved = new byte[reserved.length];
-        for ( int i = 0; i < reserved.length; i++ )
-            rec.reserved[i] = reserved[i];
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java
deleted file mode 100644
index 97cc0f7..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java
+++ /dev/null
@@ -1,182 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Guts Record <P>
- * Description:  Row/column gutter sizes <P>
- * REFERENCE:  PG 320 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class GutsRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x80;
-    private short             field_1_left_row_gutter;   // size of the row gutter to the left of the rows
-    private short             field_2_top_col_gutter;    // size of the column gutter above the columns
-    private short             field_3_row_level_max;     // maximum outline level for row gutters
-    private short             field_4_col_level_max;     // maximum outline level for column gutters
-
-    public GutsRecord()
-    {
-    }
-
-    public GutsRecord(RecordInputStream in)
-    {
-        field_1_left_row_gutter = in.readShort();
-        field_2_top_col_gutter  = in.readShort();
-        field_3_row_level_max   = in.readShort();
-        field_4_col_level_max   = in.readShort();
-    }
-
-    /**
-     * set the size of the gutter that appears at the left of the rows
-     *
-     * @param gut  gutter size in screen units
-     */
-
-    public void setLeftRowGutter(short gut)
-    {
-        field_1_left_row_gutter = gut;
-    }
-
-    /**
-     * set the size of the gutter that appears at the above the columns
-     *
-     * @param gut  gutter size in screen units
-     */
-
-    public void setTopColGutter(short gut)
-    {
-        field_2_top_col_gutter = gut;
-    }
-
-    /**
-     * set the maximum outline level for the row gutter.
-     *
-     * @param max  maximum outline level
-     */
-
-    public void setRowLevelMax(short max)
-    {
-        field_3_row_level_max = max;
-    }
-
-    /**
-     * set the maximum outline level for the col gutter.
-     *
-     * @param max  maximum outline level
-     */
-
-    public void setColLevelMax(short max)
-    {
-        field_4_col_level_max = max;
-    }
-
-    /**
-     * get the size of the gutter that appears at the left of the rows
-     *
-     * @return gutter size in screen units
-     */
-
-    public short getLeftRowGutter()
-    {
-        return field_1_left_row_gutter;
-    }
-
-    /**
-     * get the size of the gutter that appears at the above the columns
-     *
-     * @return gutter size in screen units
-     */
-
-    public short getTopColGutter()
-    {
-        return field_2_top_col_gutter;
-    }
-
-    /**
-     * get the maximum outline level for the row gutter.
-     *
-     * @return maximum outline level
-     */
-
-    public short getRowLevelMax()
-    {
-        return field_3_row_level_max;
-    }
-
-    /**
-     * get the maximum outline level for the col gutter.
-     *
-     * @return maximum outline level
-     */
-
-    public short getColLevelMax()
-    {
-        return field_4_col_level_max;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[GUTS]\n");
-        buffer.append("    .leftgutter     = ")
-            .append(Integer.toHexString(getLeftRowGutter())).append("\n");
-        buffer.append("    .topgutter      = ")
-            .append(Integer.toHexString(getTopColGutter())).append("\n");
-        buffer.append("    .rowlevelmax    = ")
-            .append(Integer.toHexString(getRowLevelMax())).append("\n");
-        buffer.append("    .collevelmax    = ")
-            .append(Integer.toHexString(getColLevelMax())).append("\n");
-        buffer.append("[/GUTS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getLeftRowGutter());
-        out.writeShort(getTopColGutter());
-        out.writeShort(getRowLevelMax());
-        out.writeShort(getColLevelMax());
-    }
-
-    protected int getDataSize() {
-        return 8;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public GutsRecord clone() {
-      GutsRecord rec = new GutsRecord();
-      rec.field_1_left_row_gutter = field_1_left_row_gutter;
-      rec.field_2_top_col_gutter = field_2_top_col_gutter;
-      rec.field_3_row_level_max = field_3_row_level_max;
-      rec.field_4_col_level_max = field_4_col_level_max;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java b/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java
deleted file mode 100644
index 604ddea..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        HCenter record (0x0083)<P>
- * Description:  whether to center between horizontal margins<P>
- * REFERENCE:  PG 320 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-public final class HCenterRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x0083;
-    private short             field_1_hcenter;
-
-    public HCenterRecord()
-    {
-    }
-
-    public HCenterRecord(RecordInputStream in)
-    {
-        field_1_hcenter = in.readShort();
-    }
-
-    /**
-     * set whether or not to horizonatally center this sheet.
-     * @param hc  center - t/f
-     */
-
-    public void setHCenter(boolean hc)
-    {
-        if (hc == true)
-        {
-            field_1_hcenter = 1;
-        }
-        else
-        {
-            field_1_hcenter = 0;
-        }
-    }
-
-    /**
-     * get whether or not to horizonatally center this sheet.
-     * @return center - t/f
-     */
-
-    public boolean getHCenter()
-    {
-        return (field_1_hcenter == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[HCENTER]\n");
-        buffer.append("    .hcenter        = ").append(getHCenter())
-            .append("\n");
-        buffer.append("[/HCENTER]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_hcenter);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public HCenterRecord clone() {
-      HCenterRecord rec = new HCenterRecord();
-      rec.field_1_hcenter = field_1_hcenter;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/HeaderFooterBase.java b/trunk/src/java/org/apache/poi/hssf/record/HeaderFooterBase.java
deleted file mode 100644
index 53d5f46..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/HeaderFooterBase.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Common header/footer base class
- *
- * @author Josh Micich
- */
-public abstract class HeaderFooterBase extends StandardRecord {
-	private boolean field_2_hasMultibyte;
-	private String field_3_text;
-
-	protected HeaderFooterBase(String text) {
-		setText(text);
-	}
-
-	protected HeaderFooterBase(RecordInputStream in) {
-		if (in.remaining() > 0) {
-			int field_1_footer_len = in.readShort();
-			field_2_hasMultibyte = in.readByte() != 0x00;
-
-			if (field_2_hasMultibyte) {
-				field_3_text = in.readUnicodeLEString(field_1_footer_len);
-			} else {
-				field_3_text = in.readCompressedUnicode(field_1_footer_len);
-			}
-		} else {
-			// Note - this is unusual for BIFF records in general, but normal for header / footer records:
-			// when the text is empty string, the whole record is empty (just the 4 byte BIFF header)
-			field_3_text = "";
-		}
-	}
-
-	/**
-	 * set the footer string
-	 *
-	 * @param text string to display
-	 */
-	public final void setText(String text) {
-		if (text == null) {
-			throw new IllegalArgumentException("text must not be null");
-		}
-		field_2_hasMultibyte = StringUtil.hasMultibyte(text);
-		field_3_text = text;
-
-		// Check it'll fit into the space in the record
-		if (getDataSize() > RecordInputStream.MAX_RECORD_DATA_SIZE) {
-			throw new IllegalArgumentException("Header/Footer string too long (limit is "
-					+ RecordInputStream.MAX_RECORD_DATA_SIZE + " bytes)");
-		}
-	}
-
-	/**
-	 * get the length of the footer string
-	 *
-	 * @return length of the footer string
-	 */
-	private int getTextLength() {
-		return field_3_text.length();
-	}
-
-	public final String getText() {
-		return field_3_text;
-	}
-
-	public final void serialize(LittleEndianOutput out) {
-		if (getTextLength() > 0) {
-			out.writeShort(getTextLength());
-			out.writeByte(field_2_hasMultibyte ? 0x01 : 0x00);
-			if (field_2_hasMultibyte) {
-				StringUtil.putUnicodeLE(field_3_text, out);
-			} else {
-				StringUtil.putCompressedUnicode(field_3_text, out);
-			}
-		}
-	}
-
-	protected final int getDataSize() {
-		if (getTextLength() < 1) {
-			return 0;
-		}
-		return 3 + getTextLength() * (field_2_hasMultibyte ? 2 : 1);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java b/trunk/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
deleted file mode 100644
index af4a385..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-import java.util.Arrays;
-import java.util.Locale;
-
-/**
- * The HEADERFOOTER record stores information added in Office Excel 2007 for headers/footers.
- *
- * @author Yegor Kozlov
- */
-public final class HeaderFooterRecord extends StandardRecord implements Cloneable {
-
-    private static final byte[] BLANK_GUID = new byte[16];
-
-    public final static short sid = 0x089C;
-	private byte[] _rawData;
-
-    public HeaderFooterRecord(byte[] data) {
-        _rawData = data;
-    }
-
-	/**
-	 * construct a HeaderFooterRecord record.  No fields are interpreted and the record will
-	 * be serialized in its original form more or less
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public HeaderFooterRecord(RecordInputStream in) {
-		_rawData = in.readRemainder();
-	}
-
-	/**
-	 * spit the record out AS IS. no interpretation or identification
-	 */
-	public void serialize(LittleEndianOutput out) {
-		out.write(_rawData);
-	}
-
-	protected int getDataSize() {
-		return _rawData.length;
-	}
-    
-    public short getSid()
-    {
-        return sid;
-    }
-
-    /**
-     * If this header belongs to a specific sheet view , the sheet view?s GUID will be saved here.
-     * <p>
-     * If it is zero, it means the current sheet. Otherwise, this field MUST match the guid field
-     * of the preceding {@link UserSViewBegin} record.
-     *
-     * @return the sheet view?s GUID
-     */
-    public byte[] getGuid(){
-        byte[] guid = new byte[16];
-        System.arraycopy(_rawData, 12, guid, 0, guid.length);
-        return guid;
-    }
-
-    /**
-     * @return whether this record belongs to the current sheet 
-     */
-    public boolean isCurrentSheet(){
-        return Arrays.equals(getGuid(), BLANK_GUID);
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[").append("HEADERFOOTER").append("] (0x");
-        sb.append(Integer.toHexString(sid).toUpperCase(Locale.ROOT) + ")\n");
-        sb.append("  rawData=").append(HexDump.toHex(_rawData)).append("\n");
-        sb.append("[/").append("HEADERFOOTER").append("]\n");
-        return sb.toString();
-    }
-
-    @Override
-    public HeaderFooterRecord clone() {
-        //HACK: do a "cheat" clone, see Record.java for more information
-        return (HeaderFooterRecord)cloneViaReserialise();
-    }
-    
- 
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java b/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java
deleted file mode 100644
index ec6733c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-/**
- * Title:        Header Record<P>
- * Description:  Specifies a header for a sheet<P>
- * REFERENCE:  PG 321 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Shawn Laubach (slaubach at apache dot org) Modified 3/14/02
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class HeaderRecord extends HeaderFooterBase implements Cloneable {
-	public final static short sid = 0x0014;
-
-	public HeaderRecord(String text) {
-		super(text);
-	}
-
-	public HeaderRecord(RecordInputStream in) {
-		super(in);
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[HEADER]\n");
-		buffer.append("    .header = ").append(getText()).append("\n");
-		buffer.append("[/HEADER]\n");
-		return buffer.toString();
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public HeaderRecord clone() {
-		return new HeaderRecord(getText());
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java b/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java
deleted file mode 100644
index 9f4f1ca..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java
+++ /dev/null
@@ -1,101 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Hide Object Record<P>
- * Description:  flag defines whether to hide placeholders and object<P>
- * REFERENCE:  PG 321 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-
-public final class HideObjRecord
-    extends StandardRecord
-{
-    public final static short sid               = 0x8d;
-    public final static short HIDE_ALL          = 2;
-    public final static short SHOW_PLACEHOLDERS = 1;
-    public final static short SHOW_ALL          = 0;
-    private short             field_1_hide_obj;
-
-    public HideObjRecord()
-    {
-    }
-
-    public HideObjRecord(RecordInputStream in)
-    {
-        field_1_hide_obj = in.readShort();
-    }
-
-    /**
-     * set hide object options
-     *
-     * @param hide options
-     * @see #HIDE_ALL
-     * @see #SHOW_PLACEHOLDERS
-     * @see #SHOW_ALL
-     */
-
-    public void setHideObj(short hide)
-    {
-        field_1_hide_obj = hide;
-    }
-
-    /**
-     * get hide object options
-     *
-     * @return hide options
-     * @see #HIDE_ALL
-     * @see #SHOW_PLACEHOLDERS
-     * @see #SHOW_ALL
-     */
-
-    public short getHideObj()
-    {
-        return field_1_hide_obj;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[HIDEOBJ]\n");
-        buffer.append("    .hideobj         = ")
-            .append(Integer.toHexString(getHideObj())).append("\n");
-        buffer.append("[/HIDEOBJ]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getHideObj());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java b/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
deleted file mode 100644
index ff034ef..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- ==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Iterator;
-
-/**
- * HorizontalPageBreak (0x001B) record that stores page breaks at rows
- * 
- * @see PageBreakRecord
- */
-public final class HorizontalPageBreakRecord extends PageBreakRecord implements Cloneable {
-
-	public static final short sid = 0x001B;
-
-	/**
-	 * Creates an empty horizontal page break record
-	 */
-	public HorizontalPageBreakRecord() {
-	}
-
-	/**
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public HorizontalPageBreakRecord(RecordInputStream in) {
-		super(in);
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public PageBreakRecord clone() {
-		PageBreakRecord result = new HorizontalPageBreakRecord();
-		Iterator<Break> iterator = getBreaksIterator();
-		while (iterator.hasNext()) {
-			Break original = iterator.next();
-			result.addBreak(original.main, original.subFrom, original.subTo);
-		}
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
deleted file mode 100644
index 4048255..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * The <code>HyperlinkRecord</code> (0x01B8) wraps an HLINK-record
- *  from the Excel-97 format.
- * Supports only external links for now (eg http://)
- */
-public final class HyperlinkRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x01B8;
-    private static POILogger logger = POILogFactory.getLogger(HyperlinkRecord.class);
-
-    static final class GUID {
-		/*
-		 * this class is currently only used here, but could be moved to a
-		 * common package if needed
-		 */
-		private static final int TEXT_FORMAT_LENGTH = 36;
-
-		public static final int ENCODED_SIZE = 16;
-
-		/** 4 bytes - little endian */
-		private final int _d1;
-		/** 2 bytes - little endian */
-		private final int _d2;
-		/** 2 bytes - little endian */
-		private final int _d3;
-		/**
-		 * 8 bytes - serialized as big endian,  stored with inverted endianness here
-		 */
-		private final long _d4;
-
-		public GUID(LittleEndianInput in) {
-			this(in.readInt(), in.readUShort(), in.readUShort(), in.readLong());
-		}
-
-		public GUID(int d1, int d2, int d3, long d4) {
-			_d1 = d1;
-			_d2 = d2;
-			_d3 = d3;
-			_d4 = d4;
-		}
-
-		public void serialize(LittleEndianOutput out) {
-			out.writeInt(_d1);
-			out.writeShort(_d2);
-			out.writeShort(_d3);
-			out.writeLong(_d4);
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-            if (!(obj instanceof GUID)) {
-                return false;
-            }
-			GUID other = (GUID) obj;
-			return _d1 == other._d1 && _d2 == other._d2
-			    && _d3 == other._d3 && _d4 == other._d4;
-		}
-
-       @Override
-       public int hashCode() {
-           assert false : "hashCode not designed";
-           return 42; // any arbitrary constant will do
-       }
-
-       public int getD1() {
-			return _d1;
-		}
-
-		public int getD2() {
-			return _d2;
-		}
-
-		public int getD3() {
-			return _d3;
-		}
-
-		public long getD4() {
-			//
-			ByteArrayOutputStream baos = new ByteArrayOutputStream(8);
-			try {
-				new DataOutputStream(baos).writeLong(_d4);
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-			byte[] buf = baos.toByteArray();
-			return new LittleEndianByteArrayInputStream(buf).readLong();
-		}
-
-		public String formatAsString() {
-
-			StringBuilder sb = new StringBuilder(36);
-
-			int PREFIX_LEN = "0x".length();
-			sb.append(HexDump.intToHex(_d1).substring(PREFIX_LEN));
-			sb.append("-");
-			sb.append(HexDump.shortToHex(_d2).substring(PREFIX_LEN));
-			sb.append("-");
-			sb.append(HexDump.shortToHex(_d3).substring(PREFIX_LEN));
-			sb.append("-");
-			String d4Chars = HexDump.longToHex(getD4());
-			sb.append(d4Chars.substring(PREFIX_LEN, PREFIX_LEN+4));
-			sb.append("-");
-			sb.append(d4Chars.substring(PREFIX_LEN+4));
-			return sb.toString();
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder sb = new StringBuilder(64);
-			sb.append(getClass().getName()).append(" [");
-			sb.append(formatAsString());
-			sb.append("]");
-			return sb.toString();
-		}
-
-		/**
-		 * Read a GUID in standard text form e.g.<br/>
-		 * 13579BDF-0246-8ACE-0123-456789ABCDEF 
-		 * <br/> -&gt; <br/>
-		 *  0x13579BDF, 0x0246, 0x8ACE 0x0123456789ABCDEF
-		 */
-		public static GUID parse(String rep) {
-			char[] cc = rep.toCharArray();
-			if (cc.length != TEXT_FORMAT_LENGTH) {
-				throw new RecordFormatException("supplied text is the wrong length for a GUID");
-			}
-			int d0 = (parseShort(cc, 0) << 16) + (parseShort(cc, 4) << 0);
-			int d1 = parseShort(cc, 9);
-			int d2 = parseShort(cc, 14);
-			for (int i = 23; i > 19; i--) {
-				cc[i] = cc[i - 1];
-			}
-			long d3 = parseLELong(cc, 20);
-
-			return new GUID(d0, d1, d2, d3);
-		}
-
-		private static long parseLELong(char[] cc, int startIndex) {
-			long acc = 0;
-			for (int i = startIndex + 14; i >= startIndex; i -= 2) {
-				acc <<= 4;
-				acc += parseHexChar(cc[i + 0]);
-				acc <<= 4;
-				acc += parseHexChar(cc[i + 1]);
-			}
-			return acc;
-		}
-
-		private static int parseShort(char[] cc, int startIndex) {
-			int acc = 0;
-			for (int i = 0; i < 4; i++) {
-				acc <<= 4;
-				acc += parseHexChar(cc[startIndex + i]);
-			}
-			return acc;
-		}
-
-		private static int parseHexChar(char c) {
-			if (c >= '0' && c <= '9') {
-				return c - '0';
-			}
-			if (c >= 'A' && c <= 'F') {
-				return c - 'A' + 10;
-			}
-			if (c >= 'a' && c <= 'f') {
-				return c - 'a' + 10;
-			}
-			throw new RecordFormatException("Bad hex char '" + c + "'");
-		}
-	}
-
-    /**
-     * Link flags
-     */
-     static final int  HLINK_URL    = 0x01;  // File link or URL.
-     static final int  HLINK_ABS    = 0x02;  // Absolute path.
-     static final int  HLINK_LABEL  = 0x14;  // Has label/description.
-    /** Place in worksheet. If set, the {@link #_textMark} field will be present */
-     static final int  HLINK_PLACE  = 0x08;
-    private static final int  HLINK_TARGET_FRAME  = 0x80;  // has 'target frame'
-    private static final int  HLINK_UNC_PATH  = 0x100;  // has UNC path
-
-     final static GUID STD_MONIKER = GUID.parse("79EAC9D0-BAF9-11CE-8C82-00AA004BA90B");
-     final static GUID URL_MONIKER = GUID.parse("79EAC9E0-BAF9-11CE-8C82-00AA004BA90B");
-     final static GUID FILE_MONIKER = GUID.parse("00000303-0000-0000-C000-000000000046");
-    /** expected Tail of a URL link */
-    private final static byte[] URL_TAIL  = HexRead.readFromString("79 58 81 F4  3B 1D 7F 48   AF 2C 82 5D  C4 85 27 63   00 00 00 00  A5 AB 00 00"); 
-    /** expected Tail of a file link */
-    private final static byte[] FILE_TAIL = HexRead.readFromString("FF FF AD DE  00 00 00 00   00 00 00 00  00 00 00 00   00 00 00 00  00 00 00 00");
-
-    private static final int TAIL_SIZE = FILE_TAIL.length;
-
-    /** cell range of this hyperlink */
-    private CellRangeAddress _range;
-
-    /** 16-byte GUID */
-    private GUID _guid;
-    /** Some sort of options for file links. */
-    private int _fileOpts;
-    /** Link options. Can include any of HLINK_* flags. */
-    private int _linkOpts;
-    /** Test label */
-    private String _label;
-
-    private String _targetFrame;
-    /** Moniker. Makes sense only for URL and file links */
-    private GUID _moniker;
-    /** in 8:3 DOS format No Unicode string header,
-     * always 8-bit characters, zero-terminated */
-    private String _shortFilename;
-    /** Link */
-    private String _address;
-    /**
-     * Text describing a place in document.  In Excel UI, this is appended to the
-     * address, (after a '#' delimiter).<br/>
-     * This field is optional.  If present, the {@link #HLINK_PLACE} must be set.
-     */
-    private String _textMark;
-    
-    private byte[] _uninterpretedTail;
-
-    /**
-     * Create a new hyperlink
-     */
-    public HyperlinkRecord()
-    {
-
-    }
-
-    /**
-     * @return the 0-based column of the first cell that contains this hyperlink
-     */
-    public int getFirstColumn() {
-        return _range.getFirstColumn();
-    }
-
-    /**
-     * Set the first column (zero-based) of the range that contains this hyperlink
-     * 
-     * @param firstCol the first column (zero-based)
-     */
-    public void setFirstColumn(int firstCol) {
-        _range.setFirstColumn(firstCol);
-    }
-
-    /**
-     * @return the 0-based column of the last cell that contains this hyperlink
-     */
-    public int getLastColumn() {
-        return _range.getLastColumn();
-    }
-
-    /**
-     * Set the last column (zero-based) of the range that contains this hyperlink
-     * 
-     * @param lastCol the last column (zero-based)
-     */
-    public void setLastColumn(int lastCol) {
-        _range.setLastColumn(lastCol);
-    }
-
-    /**
-     * @return the 0-based row of the first cell that contains this hyperlink
-     */
-    public int getFirstRow() {
-        return _range.getFirstRow();
-    }
-
-    /**
-     * Set the first row (zero-based) of the range that contains this hyperlink
-     * 
-     * @param firstRow the first row (zero-based)
-     */
-    public void setFirstRow(int firstRow) {
-        _range.setFirstRow(firstRow);
-    }
-
-    /**
-     * @return the 0-based row of the last cell that contains this hyperlink
-     */
-    public int getLastRow() {
-        return _range.getLastRow();
-    }
-
-    /**
-     * Set the last row (zero-based) of the range that contains this hyperlink
-     * 
-     * @param lastRow the last row (zero-based)
-     */
-    public void setLastRow(int lastRow) {
-        _range.setLastRow(lastRow);
-    }
-
-    /**
-     * @return 16-byte guid identifier Seems to always equal {@link #STD_MONIKER}
-     */
-    GUID getGuid() {
-        return _guid;
-    }
-
-    /**
-     * @return 16-byte moniker
-     */
-    GUID getMoniker()
-    {
-        return _moniker;
-    }
-
-    private static String cleanString(String s) {
-        if (s == null) {
-            return null;
-        }
-        int idx = s.indexOf('\u0000');
-        if (idx < 0) {
-            return s;
-        }
-        return s.substring(0, idx);
-    }
-    private static String appendNullTerm(String s) {
-        if (s == null) {
-            return null;
-        }
-        return s + '\u0000';
-    }
-
-    /**
-     * Return text label for this hyperlink
-     *
-     * @return  text to display
-     */
-    public String getLabel() {
-        return cleanString(_label);
-    }
-
-    /**
-     * Sets text label for this hyperlink
-     *
-     * @param label text label for this hyperlink
-     */
-    public void setLabel(String label) {
-        _label = appendNullTerm(label);
-    }
-    public String getTargetFrame() {
-        return cleanString(_targetFrame);
-    }
-
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file, etc.
-     *
-     * @return  the address of this hyperlink
-     */
-    public String getAddress() {
-        if ((_linkOpts & HLINK_URL) != 0 && FILE_MONIKER.equals(_moniker)) {
-            return cleanString(_address != null ? _address : _shortFilename);
-        } else if((_linkOpts & HLINK_PLACE) != 0) {
-            return cleanString(_textMark);
-        } else {
-            return cleanString(_address);
-        }
-    }
-
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file, etc.
-     *
-     * @param address  the address of this hyperlink
-     */
-    public void setAddress(String address) {
-        if ((_linkOpts & HLINK_URL) != 0 && FILE_MONIKER.equals(_moniker)) {
-            _shortFilename = appendNullTerm(address);
-        } else if((_linkOpts & HLINK_PLACE) != 0) {
-            _textMark = appendNullTerm(address);
-        } else {
-            _address = appendNullTerm(address);
-        }
-    }
-
-    public String getShortFilename() {
-        return cleanString(_shortFilename);
-    }
-
-    public void setShortFilename(String shortFilename) {
-        _shortFilename = appendNullTerm(shortFilename);
-    }
-
-    public String getTextMark() {
-        return cleanString(_textMark);
-    }
-    public void setTextMark(String textMark) {
-        _textMark = appendNullTerm(textMark);
-    }
-
-
-    /**
-     * Link options. Must be a combination of HLINK_* constants.
-     * For testing only
-     * 
-     * @return Link options
-     */
-    int getLinkOptions(){
-        return _linkOpts;
-    }
-
-    /**
-     * @return Label options
-     */
-    public int getLabelOptions(){
-        return 2; // always 2
-    }
-
-    /**
-     * @return Options for a file link
-     */
-    public int getFileOptions(){
-        return _fileOpts;
-    }
-
-
-    public HyperlinkRecord(RecordInputStream in) {
-        _range = new CellRangeAddress(in);
-
-        _guid = new GUID(in);
-
-        /**
-         * streamVersion (4 bytes): An unsigned integer that specifies the version number
-         * of the serialization implementation used to save this structure. This value MUST equal 2.
-         */
-        int streamVersion = in.readInt();
-        if (streamVersion != 0x00000002) {
-            throw new RecordFormatException("Stream Version must be 0x2 but found " + streamVersion);
-        }
-        _linkOpts = in.readInt();
-
-        if ((_linkOpts & HLINK_LABEL) != 0){
-            int label_len = in.readInt();
-            _label = in.readUnicodeLEString(label_len);
-        }
-
-        if ((_linkOpts & HLINK_TARGET_FRAME) != 0){
-            int len = in.readInt();
-            _targetFrame = in.readUnicodeLEString(len);
-        }
-
-        if ((_linkOpts & HLINK_URL) != 0 && (_linkOpts & HLINK_UNC_PATH) != 0) {
-            _moniker = null;
-            int nChars = in.readInt();
-            _address = in.readUnicodeLEString(nChars);
-        }
-
-        if ((_linkOpts & HLINK_URL) != 0 && (_linkOpts & HLINK_UNC_PATH) == 0) {
-            _moniker = new GUID(in);
-
-            if(URL_MONIKER.equals(_moniker)){
-                int length = in.readInt();
-                /**
-                 * The value of <code>length<code> be either the byte size of the url field
-                 * (including the terminating NULL character) or the byte size of the url field plus 24.
-                 * If the value of this field is set to the byte size of the url field,
-                 * then the tail bytes fields are not present.
-                 */
-                int remaining = in.remaining();
-                if (length == remaining) {
-                    int nChars = length/2;
-                    _address = in.readUnicodeLEString(nChars);
-                } else {
-                    int nChars = (length - TAIL_SIZE)/2;
-                    _address = in.readUnicodeLEString(nChars);
-                    /**
-                     * TODO: make sense of the remaining bytes
-                     * According to the spec they consist of:
-                     * 1. 16-byte  GUID: This field MUST equal
-                     *    {0xF4815879, 0x1D3B, 0x487F, 0xAF, 0x2C, 0x82, 0x5D, 0xC4, 0x85, 0x27, 0x63}
-                     * 2. Serial version, this field MUST equal 0 if present.
-                     * 3. URI Flags
-                     */
-                    _uninterpretedTail = readTail(URL_TAIL, in);
-                }
-            } else if (FILE_MONIKER.equals(_moniker)) {
-                _fileOpts = in.readShort();
-
-                int len = in.readInt();
-                _shortFilename = StringUtil.readCompressedUnicode(in, len);
-                _uninterpretedTail = readTail(FILE_TAIL, in);
-                int size = in.readInt();
-                if (size > 0) {
-                    int charDataSize = in.readInt();
-
-                    //From the spec: An optional unsigned integer that MUST be 3 if present
-                    // but some files has 4
-                    /*int usKeyValue = */ in.readUShort();
-
-                    _address = StringUtil.readUnicodeLE(in, charDataSize/2);
-                } else {
-                    _address = null;
-                }
-            } else if (STD_MONIKER.equals(_moniker)) {
-                _fileOpts = in.readShort();
-
-                int len = in.readInt();
-
-                byte[] path_bytes = new byte[len];
-                in.readFully(path_bytes);
-
-                _address = new String(path_bytes, StringUtil.UTF8);
-            }
-        }
-
-        if((_linkOpts & HLINK_PLACE) != 0) {
-
-            int len = in.readInt();
-            _textMark = in.readUnicodeLEString(len);
-        }
-
-        if (in.remaining() > 0) {
-           logger.log(POILogger.WARN, 
-                 "Hyperlink data remains: " + in.remaining() +
-                 " : " +HexDump.toHex(in.readRemainder())
-           );
-        }
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        _range.serialize(out);
-
-        _guid.serialize(out);
-        out.writeInt(0x00000002); // TODO const
-        out.writeInt(_linkOpts);
-
-        if ((_linkOpts & HLINK_LABEL) != 0){
-            out.writeInt(_label.length());
-            StringUtil.putUnicodeLE(_label, out);
-        }
-        if ((_linkOpts & HLINK_TARGET_FRAME) != 0){
-            out.writeInt(_targetFrame.length());
-            StringUtil.putUnicodeLE(_targetFrame, out);
-        }
-
-        if ((_linkOpts & HLINK_URL) != 0 && (_linkOpts & HLINK_UNC_PATH) != 0) {
-            out.writeInt(_address.length());
-            StringUtil.putUnicodeLE(_address, out);
-        }
-
-        if ((_linkOpts & HLINK_URL) != 0 && (_linkOpts & HLINK_UNC_PATH) == 0) {
-            _moniker.serialize(out);
-            if(URL_MONIKER.equals(_moniker)){
-                if (_uninterpretedTail == null) {
-                    out.writeInt(_address.length()*2);
-                    StringUtil.putUnicodeLE(_address, out);
-                } else {
-                    out.writeInt(_address.length()*2 + TAIL_SIZE);
-                    StringUtil.putUnicodeLE(_address, out);
-                    writeTail(_uninterpretedTail, out);
-                }
-            } else if (FILE_MONIKER.equals(_moniker)){
-                out.writeShort(_fileOpts);
-                out.writeInt(_shortFilename.length());
-                StringUtil.putCompressedUnicode(_shortFilename, out);
-                writeTail(_uninterpretedTail, out);
-                if (_address == null) {
-                    out.writeInt(0);
-                } else {
-                    int addrLen = _address.length() * 2;
-                    out.writeInt(addrLen + 6);
-                    out.writeInt(addrLen);
-                    out.writeShort(0x0003); // TODO const
-                    StringUtil.putUnicodeLE(_address, out);
-                }
-            }
-        }
-        if((_linkOpts & HLINK_PLACE) != 0){
-               out.writeInt(_textMark.length());
-            StringUtil.putUnicodeLE(_textMark, out);
-        }
-    }
-
-    @Override
-    protected int getDataSize() {
-        int size = 0;
-        size += 2 + 2 + 2 + 2;  //rwFirst, rwLast, colFirst, colLast
-        size += GUID.ENCODED_SIZE;
-        size += 4;  //label_opts
-        size += 4;  //link_opts
-        if ((_linkOpts & HLINK_LABEL) != 0){
-            size += 4;  //link length
-            size += _label.length()*2;
-        }
-        if ((_linkOpts & HLINK_TARGET_FRAME) != 0){
-            size += 4;  // int nChars
-            size += _targetFrame.length()*2;
-        }
-        if ((_linkOpts & HLINK_URL) != 0 && (_linkOpts & HLINK_UNC_PATH) != 0) {
-            size += 4;  // int nChars
-            size += _address.length()*2;
-        }
-        if ((_linkOpts & HLINK_URL) != 0 && (_linkOpts & HLINK_UNC_PATH) == 0) {
-            size += GUID.ENCODED_SIZE;
-            if(URL_MONIKER.equals(_moniker)){
-                size += 4;  //address length
-                size += _address.length()*2;
-                if (_uninterpretedTail != null) {
-                	size += TAIL_SIZE;
-                }
-            } else if (FILE_MONIKER.equals(_moniker)){
-                size += 2;  //file_opts
-                size += 4;  //address length
-                size += _shortFilename.length();
-                size += TAIL_SIZE;
-                size += 4;
-                if (_address != null) {
-                    size += 6;
-                    size += _address.length() * 2;
-                }
-
-            }
-        }
-        if((_linkOpts & HLINK_PLACE) != 0){
-            size += 4;  //address length
-            size += _textMark.length()*2;
-        }
-        return size;
-    }
-
-
-    private static byte[] readTail(byte[] expectedTail, LittleEndianInput in) {
-    	byte[] result = new byte[TAIL_SIZE];
-    	in.readFully(result);
-//    	if (false) { // Quite a few examples in the unit tests which don't have the exact expected tail
-//            for (int i = 0; i < expectedTail.length; i++) {
-//                if (expectedTail[i] != result[i]) {
-//                	logger.log( POILogger.ERROR, "Mismatch in tail byte [" + i + "]"
-//                    		+ "expected " + (expectedTail[i] & 0xFF) + " but got " + (result[i] & 0xFF));
-//                }
-//            }
-//    	}
-        return result;
-    }
-    private static void writeTail(byte[] tail, LittleEndianOutput out) {
-        out.write(tail);
-    }
-
-    @Override
-    public short getSid() {
-        return HyperlinkRecord.sid;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[HYPERLINK RECORD]\n");
-        buffer.append("    .range   = ").append(_range.formatAsString()).append("\n");
-        buffer.append("    .guid    = ").append(_guid.formatAsString()).append("\n");
-        buffer.append("    .linkOpts= ").append(HexDump.intToHex(_linkOpts)).append("\n");
-        buffer.append("    .label   = ").append(getLabel()).append("\n");
-        if ((_linkOpts & HLINK_TARGET_FRAME) != 0) {
-            buffer.append("    .targetFrame= ").append(getTargetFrame()).append("\n");
-        }
-        if((_linkOpts & HLINK_URL) != 0 && _moniker != null) {
-            buffer.append("    .moniker   = ").append(_moniker.formatAsString()).append("\n");
-        }
-        if ((_linkOpts & HLINK_PLACE) != 0) {
-            buffer.append("    .textMark= ").append(getTextMark()).append("\n");
-        }
-        buffer.append("    .address   = ").append(getAddress()).append("\n");
-        buffer.append("[/HYPERLINK RECORD]\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Based on the link options, is this a url?
-     * 
-     * @return true, if this is a url link
-     */
-    public boolean isUrlLink() {
-       return (_linkOpts & HLINK_URL) > 0 
-           && (_linkOpts & HLINK_ABS) > 0;
-    }
-    /**
-     * Based on the link options, is this a file?
-     * 
-     * @return true, if this is a file link
-     */
-    public boolean isFileLink() {
-       return (_linkOpts & HLINK_URL) > 0 
-           && (_linkOpts & HLINK_ABS) == 0;
-    }
-    /**
-     * Based on the link options, is this a document?
-     * 
-     * @return true, if this is a docment link
-     */
-    public boolean isDocumentLink() {
-       return (_linkOpts & HLINK_PLACE) > 0; 
-    }
-    
-    /**
-     * Initialize a new url link
-     */
-    public void newUrlLink() {
-        _range = new CellRangeAddress(0, 0, 0, 0);
-        _guid = STD_MONIKER;
-        _linkOpts = HLINK_URL | HLINK_ABS | HLINK_LABEL;
-        setLabel("");
-        _moniker = URL_MONIKER;
-        setAddress("");
-        _uninterpretedTail = URL_TAIL;
-    }
-
-    /**
-     * Initialize a new file link
-     */
-    public void newFileLink() {
-        _range = new CellRangeAddress(0, 0, 0, 0);
-        _guid = STD_MONIKER;
-        _linkOpts = HLINK_URL | HLINK_LABEL;
-        _fileOpts = 0;
-        setLabel("");
-        _moniker = FILE_MONIKER;
-        setAddress(null);
-        setShortFilename("");
-        _uninterpretedTail = FILE_TAIL;
-    }
-
-    /**
-     * Initialize a new document link
-     */
-    public void newDocumentLink() {
-        _range = new CellRangeAddress(0, 0, 0, 0);
-        _guid = STD_MONIKER;
-        _linkOpts = HLINK_LABEL | HLINK_PLACE;
-        setLabel("");
-        _moniker = FILE_MONIKER;
-        setAddress("");
-        setTextMark("");
-    }
-
-    @Override
-    public HyperlinkRecord clone() {
-        HyperlinkRecord rec = new HyperlinkRecord();
-        rec._range = _range.copy();
-        rec._guid = _guid;
-        rec._linkOpts = _linkOpts;
-        rec._fileOpts = _fileOpts;
-        rec._label = _label;
-        rec._address = _address;
-        rec._moniker = _moniker;
-        rec._shortFilename = _shortFilename;
-        rec._targetFrame = _targetFrame;
-        rec._textMark = _textMark;
-        rec._uninterpretedTail = _uninterpretedTail;
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java b/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java
deleted file mode 100644
index 4eb000b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.IntList;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Index Record (0x020B)<p>
- * Description:  Occurs right after BOF, tells you where the DBCELL records are for a sheet
- *               Important for locating cells<p>
- *               
- * REFERENCE:  PG 323 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class IndexRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x020B;
-    private int                field_2_first_row;       // first row on the sheet
-    private int                field_3_last_row_add1;   // last row
-    private int                field_4_zero;            // supposed to be zero
-    private IntList            field_5_dbcells;         // array of offsets to DBCELL records
-
-    public IndexRecord()
-    {
-    }
-
-    public IndexRecord(RecordInputStream in)
-    {
-        int field_1_zero          = in.readInt();
-        if (field_1_zero != 0) {
-        	throw new RecordFormatException("Expected zero for field 1 but got " + field_1_zero);
-        }
-        field_2_first_row     = in.readInt();
-        field_3_last_row_add1 = in.readInt();
-        field_4_zero      = in.readInt();
-        
-        int nCells = in.remaining() / 4;
-        field_5_dbcells = new IntList(nCells);
-        for(int i=0; i<nCells; i++) {
-            field_5_dbcells.add(in.readInt());
-        }
-    }
-
-    public void setFirstRow(int row)
-    {
-        field_2_first_row = row;
-    }
-
-    public void setLastRowAdd1(int row)
-    {
-        field_3_last_row_add1 = row;
-    }
-
-    public void addDbcell(int cell)
-    {
-        if (field_5_dbcells == null)
-        {
-            field_5_dbcells = new IntList();
-        }
-        field_5_dbcells.add(cell);
-    }
-
-    public void setDbcell(int cell, int value)
-    {
-        field_5_dbcells.set(cell, value);
-    }
-
-    public int getFirstRow()
-    {
-        return field_2_first_row;
-    }
-
-    public int getLastRowAdd1()
-    {
-        return field_3_last_row_add1;
-    }
-
-    public int getNumDbcells()
-    {
-        if (field_5_dbcells == null)
-        {
-            return 0;
-        }
-        return field_5_dbcells.size();
-    }
-
-    public int getDbcellAt(int cellnum)
-    {
-        return field_5_dbcells.get(cellnum);
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[INDEX]\n");
-        buffer.append("    .firstrow       = ")
-            .append(Integer.toHexString(getFirstRow())).append("\n");
-        buffer.append("    .lastrowadd1    = ")
-            .append(Integer.toHexString(getLastRowAdd1())).append("\n");
-        for (int k = 0; k < getNumDbcells(); k++) {
-            buffer.append("    .dbcell_").append(k).append(" = ")
-                .append(Integer.toHexString(getDbcellAt(k))).append("\n");
-        }
-        buffer.append("[/INDEX]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-
-        out.writeInt(0);
-        out.writeInt(getFirstRow());
-        out.writeInt(getLastRowAdd1());
-        out.writeInt(field_4_zero);
-        for (int k = 0; k < getNumDbcells(); k++) {
-        	out.writeInt(getDbcellAt(k));
-        }
-    }
-
-    @Override
-    protected int getDataSize() {
-        return 16 // 4 ints
-        	+ getNumDbcells() * 4;
-    }
-    
-    /** 
-     * @param blockCount the number of blocks to be indexed
-     * @return the size of an IndexRecord when it needs to index the specified number of blocks
-     */
-    public static int getRecordSizeForBlockCount(int blockCount) {
-        return 20 + 4 * blockCount;
-    }  
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public IndexRecord clone() {
-      IndexRecord rec = new IndexRecord();
-      rec.field_2_first_row = field_2_first_row;
-      rec.field_3_last_row_add1 = field_3_last_row_add1;
-      rec.field_4_zero = field_4_zero;
-      rec.field_5_dbcells = new IntList();
-      rec.field_5_dbcells.addAll(field_5_dbcells);
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java b/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
deleted file mode 100644
index 44224a9..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Interface End Record (0x00E2)<P>
- * Description: Shows where the Interface Records end (MMS)
- *  (has no fields)<P>
- * REFERENCE:  PG 324 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-public final class InterfaceEndRecord extends StandardRecord {
-
-    public static final short sid = 0x00E2;
-    public static final InterfaceEndRecord instance = new InterfaceEndRecord();
-
-    private InterfaceEndRecord() {
-        // enforce singleton
-    }
-
-    public static Record create(RecordInputStream in) {
-        switch (in.remaining()) {
-            case 0:
-                return instance;
-            case 2:
-                return new InterfaceHdrRecord(in);
-        }
-        throw new RecordFormatException("Invalid record data size: " + in.remaining());
-    }
-
-    public String toString() {
-        return "[INTERFACEEND/]\n";
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        // no instance data
-    }
-
-    protected int getDataSize() {
-        return 0;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java b/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
deleted file mode 100644
index afd7705..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Interface Header Record (0x00E1)<P>
- * Description: Defines the beginning of Interface records (MMS)<P>
- * REFERENCE:  PG 324 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-public final class InterfaceHdrRecord extends StandardRecord {
-    public final static short sid = 0x00E1;
-    private final int _codepage;
-
-    /**
-     * suggested (and probably correct) default
-     */
-    public final static int CODEPAGE = 0x04B0;
-
-    public InterfaceHdrRecord(int codePage) {
-        _codepage = codePage;
-    }
-
-    public InterfaceHdrRecord(RecordInputStream in) {
-        _codepage = in.readShort();
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[INTERFACEHDR]\n");
-        buffer.append("    .codepage = ").append(HexDump.shortToHex(_codepage)).append("\n");
-        buffer.append("[/INTERFACEHDR]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_codepage);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java b/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java
deleted file mode 100644
index 8a7595c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Iteration Record (0x0011)<p>
- * Description:  Tells whether to iterate over formula calculations or not
- *               (if a formula is dependent upon another formula's result)
- *               (odd feature for something that can only have 32 elements in
- *                a formula!)<p>
- * REFERENCE:  PG 325 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class IterationRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x0011;
-
-    private static final BitField iterationOn = BitFieldFactory.getInstance(0x0001);
-
-    private int _flags;
-
-    public IterationRecord(boolean iterateOn) {
-        _flags = iterationOn.setBoolean(0, iterateOn);
-    }
-
-    public IterationRecord(RecordInputStream in)
-    {
-        _flags = in.readShort();
-    }
-
-    /**
-     * set whether or not to iterate for calculations
-     * @param iterate or not
-     */
-    public void setIteration(boolean iterate) {
-        _flags = iterationOn.setBoolean(_flags, iterate);
-    }
-
-    /**
-     * get whether or not to iterate for calculations
-     *
-     * @return whether iterative calculations are turned off or on
-     */
-    public boolean getIteration() {
-        return iterationOn.isSet(_flags);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[ITERATION]\n");
-        buffer.append("    .flags      = ").append(HexDump.shortToHex(_flags)).append("\n");
-        buffer.append("[/ITERATION]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_flags);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public IterationRecord clone() {
-        return new IterationRecord(getIteration());
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java b/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
deleted file mode 100644
index bac8ce2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Label Record (0x0204) - read only support for strings stored directly in the cell...
- * Don't use this (except to read), use LabelSST instead <P>
- * REFERENCE:  PG 325 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- * 
- * @see org.apache.poi.hssf.record.LabelSSTRecord
- */
-public final class LabelRecord extends Record implements CellValueRecordInterface, Cloneable {
-    private final static POILogger logger = POILogFactory.getLogger(LabelRecord.class);
-
-    public final static short sid = 0x0204;
-
-    private int               field_1_row;
-    private short             field_2_column;
-    private short             field_3_xf_index;
-    private short             field_4_string_len;
-    private byte              field_5_unicode_flag;
-    private String            field_6_value;
-
-    /** Creates new LabelRecord */
-    public LabelRecord()
-    {
-    }
-
-    /**
-     * @param in the RecordInputstream to read the record from
-     */
-    public LabelRecord(RecordInputStream in)
-    {
-        field_1_row          = in.readUShort();
-        field_2_column       = in.readShort();
-        field_3_xf_index     = in.readShort();
-        field_4_string_len   = in.readShort();
-        field_5_unicode_flag = in.readByte();
-        if (field_4_string_len > 0) {
-            if (isUnCompressedUnicode()) {
-                field_6_value = in.readUnicodeLEString(field_4_string_len);
-            } else {
-                field_6_value = in.readCompressedUnicode(field_4_string_len);
-            }
-        } else {
-            field_6_value = "";
-        }
-
-        if (in.remaining() > 0) {
-           logger.log(POILogger.INFO,
-                   "LabelRecord data remains: " + in.remaining() +
-                           " : " + HexDump.toHex(in.readRemainder())
-           );
-        }
-    }
-
-/*
- * READ ONLY ACCESS... THIS IS FOR COMPATIBILITY ONLY...USE LABELSST! public
- */
-    @Override
-    public int getRow()
-    {
-        return field_1_row;
-    }
-
-    @Override
-    public short getColumn()
-    {
-        return field_2_column;
-    }
-
-    @Override
-    public short getXFIndex()
-    {
-        return field_3_xf_index;
-    }
-
-    /**
-     * get the number of characters this string contains
-     * @return number of characters
-     */
-    public short getStringLength()
-    {
-        return field_4_string_len;
-    }
-
-    /**
-     * is this uncompressed unicode (16bit)?  Or just 8-bit compressed?
-     * @return isUnicode - True for 16bit- false for 8bit
-     */
-    public boolean isUnCompressedUnicode()
-    {
-        return (field_5_unicode_flag & 0x01) != 0;
-    }
-
-    /**
-     * get the value
-     *
-     * @return the text string
-     * @see #getStringLength()
-     */
-    public String getValue()
-    {
-        return field_6_value;
-    }
-
-    /**
-     * THROWS A RUNTIME EXCEPTION..  USE LABELSSTRecords.  YOU HAVE NO REASON to use LABELRecord!!
-     */
-    @Override
-    public int serialize(int offset, byte [] data) {
-        throw new RecordFormatException("Label Records are supported READ ONLY...convert to LabelSST");
-    }
-    @Override
-    public int getRecordSize() {
-        throw new RecordFormatException("Label Records are supported READ ONLY...convert to LabelSST");
-    }
-
-    @Override
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer sb = new StringBuffer();
-		sb.append("[LABEL]\n");
-		sb.append("    .row       = ").append(HexDump.shortToHex(getRow())).append("\n");
-		sb.append("    .column    = ").append(HexDump.shortToHex(getColumn())).append("\n");
-		sb.append("    .xfindex   = ").append(HexDump.shortToHex(getXFIndex())).append("\n");
-		sb.append("    .string_len= ").append(HexDump.shortToHex(field_4_string_len)).append("\n");
-		sb.append("    .unicode_flag= ").append(HexDump.byteToHex(field_5_unicode_flag)).append("\n");
-		sb.append("    .value       = ").append(getValue()).append("\n");
-		sb.append("[/LABEL]\n");
-        return sb.toString();
-    }
-
-    /**
-	 * NO-OP!
-	 */
-    @Override
-    public void setColumn(short col)
-    {
-    }
-
-    /**
-     * NO-OP!
-     */
-    @Override
-    public void setRow(int row)
-    {
-    }
-
-    /**
-     * no op!
-     */
-    @Override
-    public void setXFIndex(short xf)
-    {
-    }
-
-    @Override
-    public LabelRecord clone() {
-      LabelRecord rec = new LabelRecord();
-      rec.field_1_row = field_1_row;
-      rec.field_2_column = field_2_column;
-      rec.field_3_xf_index = field_3_xf_index;
-      rec.field_4_string_len = field_4_string_len;
-      rec.field_5_unicode_flag = field_5_unicode_flag;
-      rec.field_6_value = field_6_value;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
deleted file mode 100644
index 80bd99c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Label SST Record<P>
- * Description:  Refers to a string in the shared string table and is a column value.<P>
- * REFERENCE:  PG 325 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class LabelSSTRecord extends CellRecord implements Cloneable {
-    public final static short sid = 0xfd;
-    private int field_4_sst_index;
-
-    public LabelSSTRecord() {
-    	// fields uninitialised
-    }
-
-    public LabelSSTRecord(RecordInputStream in) {
-        super(in);
-        field_4_sst_index = in.readInt();
-    }
-
-    /**
-     * set the index to the string in the SSTRecord
-     *
-     * @param index - of string in the SST Table
-     * @see org.apache.poi.hssf.record.SSTRecord
-     */
-    public void setSSTIndex(int index) {
-        field_4_sst_index = index;
-    }
-
-
-    /**
-     * get the index to the string in the SSTRecord
-     *
-     * @return index of string in the SST Table
-     * @see org.apache.poi.hssf.record.SSTRecord
-     */
-    public int getSSTIndex() {
-        return field_4_sst_index;
-    }
-    
-    @Override
-    protected String getRecordName() {
-    	return "LABELSST";
-    }
-
-    @Override
-    protected void appendValueText(StringBuilder sb) {
-		sb.append("  .sstIndex = ");
-    	sb.append(HexDump.shortToHex(getSSTIndex()));
-    }
-    @Override
-    protected void serializeValue(LittleEndianOutput out) {
-        out.writeInt(getSSTIndex());
-    }
-
-    @Override
-    protected int getValueDataSize() {
-        return 4;
-    }
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public LabelSSTRecord clone() {
-      LabelSSTRecord rec = new LabelSSTRecord();
-      copyBaseFields(rec);
-      rec.field_4_sst_index = field_4_sst_index;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
deleted file mode 100644
index 2e98cba..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * This structure specifies the properties of a list or drop-down list embedded object in a sheet.
- */
-public class LbsDataSubRecord extends SubRecord {
-
-    public static final int sid = 0x0013;
-
-    /**
-     * From [MS-XLS].pdf 2.5.147 FtLbsData:
-     *
-     * An unsigned integer that indirectly specifies whether
-     * some of the data in this structure appear in a subsequent Continue record.
-     * If _cbFContinued is 0x00, all of the fields in this structure except sid and _cbFContinued
-     *  MUST NOT exist. If this entire structure is contained within the same record,
-     * then _cbFContinued MUST be greater than or equal to the size, in bytes,
-     * of this structure, not including the four bytes for the ft and _cbFContinued fields
-     */
-    private int _cbFContinued;
-
-    /**
-     * a formula that specifies the range of cell values that are the items in this list.
-     */
-    private int _unknownPreFormulaInt;
-    private Ptg _linkPtg;
-    private Byte _unknownPostFormulaByte;
-
-    /**
-     * An unsigned integer that specifies the number of items in the list.
-     */
-    private int _cLines;
-
-    /**
-     * An unsigned integer that specifies the one-based index of the first selected item in this list.
-     * A value of 0x00 specifies there is no currently selected item.
-     */
-    private int _iSel;
-
-    /**
-     *  flags that tell what data follows
-     */
-    private int _flags;
-
-    /**
-     * An ObjId that specifies the edit box associated with this list.
-     * A value of 0x00 specifies that there is no edit box associated with this list.
-     */
-    private int _idEdit;
-
-    /**
-     * An optional LbsDropData that specifies properties for this dropdown control.
-     * This field MUST exist if and only if the containing Obj?s cmo.ot is equal to 0x14.
-     */
-    private LbsDropData _dropData;
-
-    /**
-     * An optional array of strings where each string specifies an item in the list.
-     * The number of elements in this array, if it exists, MUST be {@link #_cLines}
-     */
-    private String[] _rgLines;
-
-    /**
-     * An optional array of booleans that specifies
-     * which items in the list are part of a multiple selection
-     */
-    private boolean[] _bsels;
-
-    /**
-     * @param in the stream to read data from
-     * @param cbFContinued the seconf short in the record header
-     * @param cmoOt the containing Obj's {@link CommonObjectDataSubRecord#field_1_objectType}
-     */
-    public LbsDataSubRecord(LittleEndianInput in, int cbFContinued, int cmoOt) {
-        _cbFContinued = cbFContinued;
-
-        int encodedTokenLen = in.readUShort();
-        if (encodedTokenLen > 0) {
-            int formulaSize = in.readUShort();
-            _unknownPreFormulaInt = in.readInt();
-
-            Ptg[] ptgs = Ptg.readTokens(formulaSize, in);
-            if (ptgs.length != 1) {
-                throw new RecordFormatException("Read " + ptgs.length
-                        + " tokens but expected exactly 1");
-            }
-            _linkPtg = ptgs[0];
-            switch (encodedTokenLen - formulaSize - 6) {
-                case 1:
-                    _unknownPostFormulaByte = in.readByte();
-                    break;
-                case 0:
-                    _unknownPostFormulaByte = null;
-                    break;
-                default:
-                    throw new RecordFormatException("Unexpected leftover bytes");
-            }
-        }
-
-        _cLines = in.readUShort();
-        _iSel = in.readUShort();
-        _flags = in.readUShort();
-        _idEdit = in.readUShort();
-
-        // From [MS-XLS].pdf 2.5.147 FtLbsData:
-        // This field MUST exist if and only if the containing Obj?s cmo.ot is equal to 0x14.
-        if(cmoOt == 0x14) {
-            _dropData = new LbsDropData(in);
-        }
-
-        // From [MS-XLS].pdf 2.5.147 FtLbsData:
-        // This array MUST exist if and only if the fValidPlex flag (0x2) is set
-        if((_flags & 0x2) != 0) {
-            _rgLines = new String[_cLines];
-            for(int i=0; i < _cLines; i++) {
-                _rgLines[i] = StringUtil.readUnicodeString(in);
-            }
-        }
-
-        // bits 5-6 in the _flags specify the type
-        // of selection behavior this list control is expected to support
-
-        // From [MS-XLS].pdf 2.5.147 FtLbsData:
-        // This array MUST exist if and only if the wListType field is not equal to 0.
-        if(((_flags >> 4) & 0x2) != 0) {
-            _bsels = new boolean[_cLines];
-            for(int i=0; i < _cLines; i++) {
-                _bsels[i] = in.readByte() == 1;
-            }
-        }
-
-    }
-
-    LbsDataSubRecord(){
-
-    }
-
-    /**
-     *
-     * @return a new instance of LbsDataSubRecord to construct auto-filters
-     * @see org.apache.poi.hssf.usermodel.HSSFCombobox
-     */
-    public static LbsDataSubRecord newAutoFilterInstance(){
-        LbsDataSubRecord lbs = new LbsDataSubRecord();
-        lbs._cbFContinued = 0x1FEE;  //autofilters seem to alway have this magic number
-        lbs._iSel = 0x000;
-
-        lbs._flags = 0x0301;
-        lbs._dropData = new LbsDropData();
-        lbs._dropData._wStyle = LbsDropData.STYLE_COMBO_SIMPLE_DROPDOWN;
-
-        // the number of lines to be displayed in the dropdown
-        lbs._dropData._cLine = 8;
-        return lbs;
-    }
-
-    /**
-     * @return true as LbsDataSubRecord is always the last sub-record
-     */
-    @Override
-    public boolean isTerminating(){
-        return true;
-    }
-
-    @Override
-    protected int getDataSize() {
-        int result = 2; // 2 initial shorts
-
-        // optional link formula
-        if (_linkPtg != null) {
-            result += 2; // encoded Ptg size
-            result += 4; // unknown int
-            result += _linkPtg.getSize();
-            if (_unknownPostFormulaByte != null) {
-                result += 1;
-            }
-        }
-
-        result += 4 * 2; // 4 shorts
-        if(_dropData != null) {
-            result += _dropData.getDataSize();
-        }
-        if(_rgLines != null) {
-            for(String str : _rgLines){
-                result += StringUtil.getEncodedSize(str);
-            }
-        }
-        if(_bsels != null) {
-            result += _bsels.length;
-        }
-        return result;
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid);
-        out.writeShort(_cbFContinued);
-
-        if (_linkPtg == null) {
-            out.writeShort(0);
-        } else {
-            int formulaSize = _linkPtg.getSize();
-            int linkSize = formulaSize + 6;
-            if (_unknownPostFormulaByte != null) {
-                linkSize++;
-            }
-            out.writeShort(linkSize);
-            out.writeShort(formulaSize);
-            out.writeInt(_unknownPreFormulaInt);
-            _linkPtg.write(out);
-            if (_unknownPostFormulaByte != null) {
-                out.writeByte(_unknownPostFormulaByte.intValue());
-            }
-        }
-
-        out.writeShort(_cLines);
-        out.writeShort(_iSel);
-        out.writeShort(_flags);
-        out.writeShort(_idEdit);
-
-        if(_dropData != null) {
-            _dropData.serialize(out);
-        }
-
-        if(_rgLines != null) {
-            for(String str : _rgLines){
-                StringUtil.writeUnicodeString(out, str);
-            }
-        }
-
-        if(_bsels != null) {
-            for(boolean val : _bsels){
-                out.writeByte(val ? 1 : 0);
-            }
-        }
-    }
-
-    @Override
-    public LbsDataSubRecord clone() {
-        // TODO: is immutable ???
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer(256);
-
-        sb.append("[ftLbsData]\n");
-        sb.append("    .unknownShort1 =").append(HexDump.shortToHex(_cbFContinued)).append("\n");
-        sb.append("    .formula        = ").append('\n');
-        if(_linkPtg != null) {
-            sb.append(_linkPtg.toString()).append(_linkPtg.getRVAType()).append('\n');
-        }
-        sb.append("    .nEntryCount   =").append(HexDump.shortToHex(_cLines)).append("\n");
-        sb.append("    .selEntryIx    =").append(HexDump.shortToHex(_iSel)).append("\n");
-        sb.append("    .style         =").append(HexDump.shortToHex(_flags)).append("\n");
-        sb.append("    .unknownShort10=").append(HexDump.shortToHex(_idEdit)).append("\n");
-        if(_dropData != null) {
-            sb.append('\n').append(_dropData.toString());
-        }
-        sb.append("[/ftLbsData]\n");
-        return sb.toString();
-    }
-
-    /**
-     *
-     * @return the formula that specifies the range of cell values that are the items in this list.
-     */
-    public Ptg getFormula(){
-        return _linkPtg;
-    }
-
-    /**
-     * @return the number of items in the list
-     */
-    public int getNumberOfItems(){
-        return _cLines;
-    }
-
-    /**
-     * This structure specifies properties of the dropdown list control
-     */
-    public static class LbsDropData {
-        /**
-         * Combo dropdown control
-         */
-        public static final int STYLE_COMBO_DROPDOWN = 0;
-        /**
-         * Combo Edit dropdown control
-         */
-        public static final int STYLE_COMBO_EDIT_DROPDOWN = 1;
-        /**
-         * Simple dropdown control (just the dropdown button)
-         */
-        public static final int STYLE_COMBO_SIMPLE_DROPDOWN = 2;
-
-        /**
-         *  An unsigned integer that specifies the style of this dropdown. 
-         */
-        private int _wStyle;
-
-        /**
-         * An unsigned integer that specifies the number of lines to be displayed in the dropdown.
-         */
-        private int _cLine;
-
-        /**
-         * An unsigned integer that specifies the smallest width in pixels allowed for the dropdown window
-         */
-        private int _dxMin;
-
-        /**
-         * a string that specifies the current string value in the dropdown
-         */
-        private final String _str;
-
-        /**
-         * Optional, undefined and MUST be ignored.
-         * This field MUST exist if and only if the size of str in bytes is an odd number
-         */
-        private Byte _unused;
-
-        public LbsDropData(){
-            _str = "";
-            _unused = 0;
-        }
-
-        public LbsDropData(LittleEndianInput in){
-            _wStyle = in.readUShort();
-            _cLine = in.readUShort();
-            _dxMin = in.readUShort();
-            _str = StringUtil.readUnicodeString(in);
-            if(StringUtil.getEncodedSize(_str) % 2 != 0){
-                _unused = in.readByte();
-            }
-        }
-
-        /**
-         * Set the style of this dropdown.<p>
-         *
-         * Possible values:
-         * <ul>
-         * <li>0: Combo dropdown control</li>
-         * <li>1: Combo Edit dropdown control</li>
-         * <li>2: Simple dropdown control (just the dropdown button)</li>
-         * </ul>
-         * 
-         * @param style the style - see possible values
-         */
-        public void setStyle(int style){
-            _wStyle = style;
-        }
-
-        /**
-         * Set the number of lines to be displayed in the dropdown.
-         * 
-         * @param num the number of lines to be displayed in the dropdown
-         */
-        public void setNumLines(int num){
-            _cLine = num;
-        }
-
-        public void serialize(LittleEndianOutput out) {
-            out.writeShort(_wStyle);
-            out.writeShort(_cLine);
-            out.writeShort(_dxMin);
-            StringUtil.writeUnicodeString(out, _str);
-            if(_unused != null) {
-                out.writeByte(_unused);
-            }
-        }
-
-        public int getDataSize() {
-            int size = 6;
-            size += StringUtil.getEncodedSize(_str);
-            if(_unused != null) {
-                size++;
-            }
-            return size;
-        }
-
-        @Override
-        public String toString(){
-            StringBuffer sb = new StringBuffer();
-            sb.append("[LbsDropData]\n");
-            sb.append("  ._wStyle:  ").append(_wStyle).append('\n');
-            sb.append("  ._cLine:  ").append(_cLine).append('\n');
-            sb.append("  ._dxMin:  ").append(_dxMin).append('\n');
-            sb.append("  ._str:  ").append(_str).append('\n');
-            if(_unused != null) {
-                sb.append("  ._unused:  ").append(_unused).append('\n');
-            }
-            sb.append("[/LbsDropData]\n");
-
-            return sb.toString();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
deleted file mode 100644
index 6e8cb8f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Record for the left margin.
- */
-public final class LeftMarginRecord extends StandardRecord implements Margin, Cloneable {
-    public final static short sid = 0x0026;
-    private double field_1_margin;
-
-    public LeftMarginRecord()    {    }
-
-    public LeftMarginRecord(RecordInputStream in)
-    {
-        field_1_margin = in.readDouble();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append( "[LeftMargin]\n" );
-        buffer.append( "    .margin               = " ).append( " (" ).append( getMargin() ).append( " )\n" );
-        buffer.append( "[/LeftMargin]\n" );
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeDouble(field_1_margin);
-    }
-
-    protected int getDataSize() {
-        return 8;
-    }
-
-    public short getSid()    {
-        return sid;
-    }
-
-    /**
-     * Get the margin field for the LeftMargin record.
-     */
-    public double getMargin()    {
-        return field_1_margin;
-    }
-
-    /**
-     * Set the margin field for the LeftMargin record.
-     */
-    public void setMargin( double field_1_margin )
-    {
-        this.field_1_margin = field_1_margin;
-    }
-
-    @Override
-    public LeftMarginRecord clone() {
-        LeftMarginRecord rec = new LeftMarginRecord();
-        rec.field_1_margin = this.field_1_margin;
-        return rec;
-    }
-} 
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java b/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java
deleted file mode 100644
index cc28f94..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java
+++ /dev/null
@@ -1,120 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: MMS Record<P>
- * Description: defines how many add menu and del menu options are stored
- *                    in the file. Should always be set to 0 for HSSF workbooks<P>
- * REFERENCE:  PG 328 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-
-public final class MMSRecord
-    extends StandardRecord
-{
-    public final static short sid = 0xC1;
-    private byte              field_1_addMenuCount;   // = 0;
-    private byte              field_2_delMenuCount;   // = 0;
-
-    public MMSRecord()
-    {
-    }
-
-    public MMSRecord(RecordInputStream in)
-    {
-        if (in.remaining()==0) {
-            return;
-        }
-        
-        field_1_addMenuCount = in.readByte();
-        field_2_delMenuCount = in.readByte();
-    }
-
-    /**
-     * set number of add menu options (set to 0)
-     * @param am  number of add menu options
-     */
-
-    public void setAddMenuCount(byte am)
-    {
-        field_1_addMenuCount = am;
-    }
-
-    /**
-     * set number of del menu options (set to 0)
-     * @param dm  number of del menu options
-     */
-
-    public void setDelMenuCount(byte dm)
-    {
-        field_2_delMenuCount = dm;
-    }
-
-    /**
-     * get number of add menu options (should be 0)
-     * @return number of add menu options
-     */
-
-    public byte getAddMenuCount()
-    {
-        return field_1_addMenuCount;
-    }
-
-    /**
-     * get number of add del options (should be 0)
-     * @return number of add menu options
-     */
-
-    public byte getDelMenuCount()
-    {
-        return field_2_delMenuCount;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[MMS]\n");
-        buffer.append("    .addMenu        = ")
-            .append(Integer.toHexString(getAddMenuCount())).append("\n");
-        buffer.append("    .delMenu        = ")
-            .append(Integer.toHexString(getDelMenuCount())).append("\n");
-        buffer.append("[/MMS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeByte(getAddMenuCount());
-        out.writeByte(getDelMenuCount());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/Margin.java b/trunk/src/java/org/apache/poi/hssf/record/Margin.java
deleted file mode 100644
index 546db98..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/Margin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-/**
- * The margin interface is a parent used to define left, right, top and bottom margins.
- * This allows much of the code to be generic when it comes to handling margins.
- */
-public interface Margin {
-	// TODO - introduce MarginBaseRecord
-	/**
-	 * Get the margin field for the Margin.
-	 * 
-	 * @return the margin
-	 */
-	public double getMargin();
-
-	/**
-	 * Set the margin field for the Margin.
-	 * 
-	 * @param field_1_margin the margin
-	 */
-	public void setMargin(double field_1_margin);
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
deleted file mode 100644
index f9ebfd3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Merged Cells Record (0x00E5)<p>
- * 
- * Description:  Optional record defining a square area of cells to "merged" into one cell.
- */
-public final class MergeCellsRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x00E5;
-    /** sometimes the regions array is shared with other MergedCellsRecords */ 
-    private final CellRangeAddress[] _regions;
-    private final int _startIndex;
-    private final int _numberOfRegions;
-
-    public MergeCellsRecord(CellRangeAddress[] regions, int startIndex, int numberOfRegions) {
-		_regions = regions;
-		_startIndex = startIndex;
-		_numberOfRegions = numberOfRegions;
-    }
-    /**
-     * Constructs a MergedCellsRecord and sets its fields appropriately
-     * @param in the RecordInputstream to read the record from
-     */
-    public MergeCellsRecord(RecordInputStream in) {
-     	int nRegions = in.readUShort();
-    	CellRangeAddress[] cras = new CellRangeAddress[nRegions];
-    	for (int i = 0; i < nRegions; i++) {
-			cras[i] = new CellRangeAddress(in);
-		}
-    	_numberOfRegions = nRegions;
-    	_startIndex = 0;
-    	_regions = cras;
-    }
-    /**
-     * get the number of merged areas.  If this drops down to 0 you should just go
-     * ahead and delete the record.
-     * @return number of areas
-     */
-    public short getNumAreas() {
-        return (short)_numberOfRegions;
-    }
-
-    /**
-     * @param index the n-th MergedRegion
-     * 
-     * @return MergedRegion at the given index representing the area that is Merged (r1,c1 - r2,c2)
-     */
-    public CellRangeAddress getAreaAt(int index) {
-        return _regions[_startIndex + index];
-    }
-
-    @Override
-    protected int getDataSize() {
-		return CellRangeAddressList.getEncodedSize(_numberOfRegions);
-	}
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        int nItems = _numberOfRegions;
-        out.writeShort(nItems);
-        for (int i = 0; i < _numberOfRegions; i++) {
-			_regions[_startIndex + i].serialize(out);
-		}
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer retval = new StringBuffer();
-
-        retval.append("[MERGEDCELLS]").append("\n");
-        retval.append("     .numregions =").append(getNumAreas()).append("\n");
-        for (int k = 0; k < _numberOfRegions; k++) {
-            CellRangeAddress r = _regions[_startIndex + k];
-
-            retval.append("     .rowfrom =").append(r.getFirstRow()).append("\n");
-            retval.append("     .rowto   =").append(r.getLastRow()).append("\n");
-            retval.append("     .colfrom =").append(r.getFirstColumn()).append("\n");
-            retval.append("     .colto   =").append(r.getLastColumn()).append("\n");
-        }
-        retval.append("[MERGEDCELLS]").append("\n");
-        return retval.toString();
-    }
-
-    @Override
-    public MergeCellsRecord clone() {
-    	int nRegions = _numberOfRegions;
-    	CellRangeAddress[] clonedRegions = new CellRangeAddress[nRegions];
-		for (int i = 0; i < clonedRegions.length; i++) {
-			clonedRegions[i] = _regions[_startIndex + i].copy();
-		}
-        return new MergeCellsRecord(clonedRegions, 0, nRegions);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java b/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
deleted file mode 100644
index cbdcd2a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Multiple Blank cell record(0x00BE)<p>
- * Description:  Represents a  set of columns in a row with no value but with styling.<p>
- *
- * REFERENCE:  PG 329 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- * 
- * @see BlankRecord
- */
-public final class MulBlankRecord extends StandardRecord {
-	public final static short sid = 0x00BE;
-
-	private final int _row;
-	private final int _firstCol;
-	private final short[] _xfs;
-	private final int _lastCol;
-
-	public MulBlankRecord(int row, int firstCol, short[] xfs) {
-		_row = row;
-		_firstCol = firstCol;
-		_xfs = xfs;
-		_lastCol = firstCol + xfs.length - 1;
-	}
-
-	/**
-	 * @return the row number of the cells this represents
-	 */
-	public int getRow() {
-		return _row;
-	}
-
-	/**
-	 * @return starting column (first cell this holds in the row). Zero based
-	 */
-	public int getFirstColumn() {
-		return _firstCol;
-	}
-	
-	/**
-	 * @return ending column (last cell this holds in the row). Zero based
-	 */
-	public int getLastColumn() {
-		return _lastCol;
-	}
-
-	/**
-	 * get the number of columns this contains (last-first +1)
-	 * @return number of columns (last - first +1)
-	 */
-	public int getNumColumns() {
-		return _lastCol - _firstCol + 1;
-	}
-
-	/**
-	 * returns the xf index for column (coffset = column - field_2_first_col)
-	 * @param coffset  the column (coffset = column - field_2_first_col)
-	 * @return the XF index for the column
-	 */
-	public short getXFAt(int coffset) {
-		return _xfs[coffset];
-	}
-
-	/**
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public MulBlankRecord(RecordInputStream in) {
-		_row	   = in.readUShort();
-		_firstCol = in.readShort();
-		_xfs	   = parseXFs(in);
-		_lastCol  = in.readShort();
-	}
-
-	private static short [] parseXFs(RecordInputStream in) {
-		short[] retval = new short[(in.remaining() - 2) / 2];
-
-		for (int idx = 0; idx < retval.length;idx++) {
-		  retval[idx] = in.readShort();
-		}
-		return retval;
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[MULBLANK]\n");
-		buffer.append("row  = ").append(Integer.toHexString(getRow())).append("\n");
-		buffer.append("firstcol  = ").append(Integer.toHexString(getFirstColumn())).append("\n");
-		buffer.append(" lastcol  = ").append(Integer.toHexString(_lastCol)).append("\n");
-		for (int k = 0; k < getNumColumns(); k++) {
-			buffer.append("xf").append(k).append("		= ").append(
-					Integer.toHexString(getXFAt(k))).append("\n");
-		}
-		buffer.append("[/MULBLANK]\n");
-		return buffer.toString();
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(_row);
-		out.writeShort(_firstCol);
-		int nItems = _xfs.length;
-		for (int i = 0; i < nItems; i++) {
-			out.writeShort(_xfs[i]);
-		}
-		out.writeShort(_lastCol);
-	}
-
-	protected int getDataSize() {
-		// 3 short fields + array of shorts
-		return 6 + _xfs.length * 2;
-	}
-
-	@Override
-	public MulBlankRecord clone() {
-		// immutable - so OK to return this
-		return this;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java b/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java
deleted file mode 100644
index 9942014..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.util.RKUtil;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * MULRK (0x00BD)<p>
- * 
- * Used to store multiple RK numbers on a row.  1 MulRk = Multiple Cell values.
- * HSSF just converts this into multiple NUMBER records.  READ-ONLY SUPPORT!<P>
- * REFERENCE:  PG 330 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- * 
- * @since 2.0-pre
- */
-public final class MulRKRecord extends StandardRecord {
-	public final static short sid = 0x00BD;
-
-	private final int	 field_1_row;
-	private final short   field_2_first_col;
-	private final RkRec[] field_3_rks;
-	private final short   field_4_last_col;
-
-	public int getRow() {
-		return field_1_row;
-	}
-
-	/**
-	 * starting column (first cell this holds in the row)
-	 * @return first column number
-	 */
-	public short getFirstColumn() {
-		return field_2_first_col;
-	}
-
-	/**
-	 * ending column (last cell this holds in the row)
-	 * @return first column number
-	 */
-	public short getLastColumn() {
-		return field_4_last_col;
-	}
-
-	/**
-	 * get the number of columns this contains (last-first +1)
-	 * @return number of columns (last - first +1)
-	 */
-	public int getNumColumns() {
-		return field_4_last_col - field_2_first_col + 1;
-	}
-
-	/**
-	 * returns the xf index for column (coffset = column - field_2_first_col)
-	 * 
-     * @param coffset the coffset = column - field_2_first_col
-     * 
-	 * @return the XF index for the column
-	 */
-	public short getXFAt(int coffset) {
-		return field_3_rks[coffset].xf;
-	}
-
-	/**
-	 * returns the rk number for column (coffset = column - field_2_first_col)
-	 * 
-	 * @param coffset the coffset = column - field_2_first_col
-	 * 
-	 * @return the value (decoded into a double)
-	 */
-	public double getRKNumberAt(int coffset) {
-		return RKUtil.decodeNumber(field_3_rks[coffset].rk);
-	}
-
-	/**
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public MulRKRecord(RecordInputStream in) {
-		field_1_row = in.readUShort();
-		field_2_first_col = in.readShort();
-		field_3_rks = RkRec.parseRKs(in);
-		field_4_last_col = in.readShort();
-	}
-
-
-	@Override
-    public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[MULRK]\n");
-		buffer.append("	.row	 = ").append(HexDump.shortToHex(getRow())).append("\n");
-		buffer.append("	.firstcol= ").append(HexDump.shortToHex(getFirstColumn())).append("\n");
-		buffer.append("	.lastcol = ").append(HexDump.shortToHex(getLastColumn())).append("\n");
-
-		for (int k = 0; k < getNumColumns(); k++) {
-			buffer.append("	xf[").append(k).append("] = ").append(HexDump.shortToHex(getXFAt(k))).append("\n");
-			buffer.append("	rk[").append(k).append("] = ").append(getRKNumberAt(k)).append("\n");
-		}
-		buffer.append("[/MULRK]\n");
-		return buffer.toString();
-	}
-
-	@Override
-    public short getSid()
-	{
-		return sid;
-	}
-
-	@Override
-    public void serialize(LittleEndianOutput out) {
-		throw new RecordFormatException( "Sorry, you can't serialize MulRK in this release");
-	}
-	@Override
-    protected int getDataSize() {
-		throw new RecordFormatException( "Sorry, you can't serialize MulRK in this release");
-	}
-
-	private static final class RkRec {
-		public static final int ENCODED_SIZE = 6;
-		public final short xf;
-		public final int   rk;
-
-		private RkRec(RecordInputStream in) {
-			xf = in.readShort();
-			rk = in.readInt();
-		}
-
-		public static RkRec[] parseRKs(RecordInputStream in) {
-			int nItems = (in.remaining()-2) / ENCODED_SIZE;
-			RkRec[] retval = new RkRec[nItems];
-			for (int i=0; i<nItems; i++) {
-				retval[i] = new RkRec(in);
-			}
-			return retval;
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java b/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java
deleted file mode 100644
index 0a3323f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title: NAMECMT Record (0x0894)<p>
- * 
- * Description: Defines a comment associated with a specified name.
- */
-public final class NameCommentRecord extends StandardRecord {
-  public final static short sid = 0x0894;
-
-  private final short field_1_record_type;
-  private final short field_2_frt_cell_ref_flag;
-  private final long field_3_reserved;
-  //private short             field_4_name_length;
-  //private short             field_5_comment_length;
-  private String field_6_name_text;
-  private String field_7_comment_text;
-
-  public NameCommentRecord(final String name, final String comment) {
-    field_1_record_type = 0;
-    field_2_frt_cell_ref_flag = 0;
-    field_3_reserved = 0;
-    field_6_name_text = name;
-    field_7_comment_text = comment;
-  }
-
-  @Override
-  public void serialize(final LittleEndianOutput out) {
-    final int field_4_name_length = field_6_name_text.length();
-    final int field_5_comment_length = field_7_comment_text.length();
-
-    out.writeShort(field_1_record_type);
-    out.writeShort(field_2_frt_cell_ref_flag);
-    out.writeLong(field_3_reserved);
-    out.writeShort(field_4_name_length);
-    out.writeShort(field_5_comment_length);
-
-    boolean isNameMultiByte = StringUtil.hasMultibyte(field_6_name_text);
-    out.writeByte(isNameMultiByte ? 1 : 0);
-    if (isNameMultiByte) {
-        StringUtil.putUnicodeLE(field_6_name_text, out);
-    } else {
-        StringUtil.putCompressedUnicode(field_6_name_text, out);
-    }
-    boolean isCommentMultiByte = StringUtil.hasMultibyte(field_7_comment_text);
-    out.writeByte(isCommentMultiByte ? 1 : 0);
-    if (isCommentMultiByte) {
-        StringUtil.putUnicodeLE(field_7_comment_text, out);
-    } else {
-        StringUtil.putCompressedUnicode(field_7_comment_text, out);
-    }
-  }
-
-  @Override
-  protected int getDataSize() {
-    return 18 // 4 shorts + 1 long + 2 spurious 'nul's
-         + (StringUtil.hasMultibyte(field_6_name_text) ? field_6_name_text.length()*2 : field_6_name_text.length())
-         + (StringUtil.hasMultibyte(field_7_comment_text) ? field_7_comment_text.length()*2 : field_7_comment_text.length());
-  }
-
-  /**
-   * @param ris the RecordInputstream to read the record from
-   */
-  public NameCommentRecord(final RecordInputStream ris) {
-    final LittleEndianInput in = ris;
-    field_1_record_type = in.readShort();
-    field_2_frt_cell_ref_flag = in.readShort();
-    field_3_reserved = in.readLong();
-    final int field_4_name_length = in.readShort();
-    final int field_5_comment_length = in.readShort();
-
-    if (in.readByte() == 0) {
-        field_6_name_text = StringUtil.readCompressedUnicode(in, field_4_name_length);
-    } else {
-        field_6_name_text = StringUtil.readUnicodeLE(in, field_4_name_length);
-    }
-    if (in.readByte() == 0) {
-        field_7_comment_text = StringUtil.readCompressedUnicode(in, field_5_comment_length);
-    } else {
-        field_7_comment_text = StringUtil.readUnicodeLE(in, field_5_comment_length);
-    }    
-  }
-
-  /**
-   * return the non static version of the id for this record.
-   */
-  @Override
-  public short getSid() {
-    return sid;
-  }
-
-  @Override
-  public String toString() {
-    final StringBuffer sb = new StringBuffer();
-
-    sb.append("[NAMECMT]\n");
-    sb.append("    .record type            = ").append(HexDump.shortToHex(field_1_record_type)).append("\n");
-    sb.append("    .frt cell ref flag      = ").append(HexDump.byteToHex(field_2_frt_cell_ref_flag)).append("\n");
-    sb.append("    .reserved               = ").append(field_3_reserved).append("\n");
-    sb.append("    .name length            = ").append(field_6_name_text.length()).append("\n");
-    sb.append("    .comment length         = ").append(field_7_comment_text.length()).append("\n");
-    sb.append("    .name                   = ").append(field_6_name_text).append("\n");
-    sb.append("    .comment                = ").append(field_7_comment_text).append("\n");
-    sb.append("[/NAMECMT]\n");
-
-    return sb.toString();
-  }
-
-  /**
-   * @return the name of the NameRecord to which this comment applies.
-   */
-  public String getNameText() {
-    return field_6_name_text;
-  }
-  
-  /**
-   * Updates the name we're associated with, normally used
-   *  when renaming that Name
-   * 
-   * @param newName the new name
-   */
-  public void setNameText(String newName) {
-     field_6_name_text = newName;
-  }
-
-  /**
-   * @return the text of the comment.
-   */
-  public String getCommentText() {
-    return field_7_comment_text;
-  }
-  
-  public void setCommentText(String comment) {
-     field_7_comment_text = comment;
-  }
-
-  public short getRecordType() {
-    return field_1_record_type;
-  }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java b/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
deleted file mode 100644
index 613239b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
+++ /dev/null
@@ -1,593 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.cont.ContinuableRecord;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.util.*;
-
-/**
- * Title:        DEFINEDNAME Record (0x0018)<p>
- * Description:  Defines a named range within a workbook.
- */
-public final class NameRecord extends ContinuableRecord {
-    public final static short sid = 0x0018;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_CONSOLIDATE_AREA      = 1;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_AUTO_OPEN             = 2;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_AUTO_CLOSE            = 3;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_DATABASE              = 4;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_CRITERIA              = 5;
-
-	public final static byte  BUILTIN_PRINT_AREA            = 6;
-	public final static byte  BUILTIN_PRINT_TITLE           = 7;
-
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_RECORDER              = 8;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_DATA_FORM             = 9;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_AUTO_ACTIVATE         = 10;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_AUTO_DEACTIVATE       = 11;
-	/**Included for completeness sake, not implemented */
-	public final static byte  BUILTIN_SHEET_TITLE           = 12;
-
-	public final static byte  BUILTIN_FILTER_DB             = 13;
-
-	private static final class Option {
-		public static final int OPT_HIDDEN_NAME =   0x0001;
-		public static final int OPT_FUNCTION_NAME = 0x0002;
-		public static final int OPT_COMMAND_NAME =  0x0004;
-		public static final int OPT_MACRO =         0x0008;
-		public static final int OPT_COMPLEX =       0x0010;
-		public static final int OPT_BUILTIN =       0x0020;
-		public static final int OPT_BINDATA =       0x1000;
-		public static final boolean isFormula(int optValue) {
-			return (optValue & 0x0F) == 0;
-		}
-	}
-
-	private short             field_1_option_flag;
-	private byte              field_2_keyboard_shortcut;
-	/** One-based extern index of sheet (resolved via LinkTable). Zero if this is a global name  */
-	private short             field_5_externSheetIndex_plus1;
-	/** the one based sheet number.  */
-	private int               field_6_sheetNumber;
-	private boolean           field_11_nameIsMultibyte;
-	private byte              field_12_built_in_code;
-	private String            field_12_name_text;
-	private Formula           field_13_name_definition;
-	private String            field_14_custom_menu_text;
-	private String            field_15_description_text;
-	private String            field_16_help_topic_text;
-	private String            field_17_status_bar_text;
-
-
-	/** Creates new NameRecord */
-	public NameRecord() {
-		field_13_name_definition = Formula.create(Ptg.EMPTY_PTG_ARRAY);
-
-		field_12_name_text = "";
-		field_14_custom_menu_text = "";
-		field_15_description_text = "";
-		field_16_help_topic_text = "";
-		field_17_status_bar_text = "";
-	}
-
-	/**
-	 * Constructor to create a built-in named region
-	 * @param builtin Built-in byte representation for the name record, use the public constants
-	 * @param sheetNumber the sheet which the name applies to 
-	 */
-	public NameRecord(byte builtin, int sheetNumber)
-	{
-		this();
-		field_12_built_in_code = builtin;
-		setOptionFlag((short)(field_1_option_flag | Option.OPT_BUILTIN));
-		// the extern sheets are set through references
-		field_6_sheetNumber = sheetNumber;
-	}
-
-	/** sets the option flag for the named range
-	 * @param flag option flag
-	 */
-	public void setOptionFlag(short flag){
-		field_1_option_flag = flag;
-	}
-
-
-	/** sets the keyboard shortcut
-	 * @param shortcut keyboard shortcut
-	 */
-	public void setKeyboardShortcut(byte shortcut){
-		field_2_keyboard_shortcut = shortcut;
-	}
-
-	/**
-	 * For named ranges, and built-in names
-	 * @return the 1-based sheet number.
-	 */
-	public int getSheetNumber()
-	{
-		return field_6_sheetNumber;
-	}
-
-	/**
-	 * @return function group
-	 * @see FnGroupCountRecord
-	 */
-	public byte getFnGroup() {
-		int masked = field_1_option_flag & 0x0fc0;
-		return (byte) (masked >> 4);
-	}
-
-
-	public void setSheetNumber(int value)
-	{
-		field_6_sheetNumber = value;
-	}
-
-
-	/** sets the name of the named range
-	 * @param name named range name
-	 */
-	public void setNameText(String name){
-		field_12_name_text = name;
-		field_11_nameIsMultibyte = StringUtil.hasMultibyte(name);
-	}
-
-	/** sets the custom menu text
-	 * @param text custom menu text
-	 */
-	public void setCustomMenuText(String text){
-		field_14_custom_menu_text = text;
-	}
-
-	/** sets the description text
-	 * @param text the description text
-	 */
-	public void setDescriptionText(String text){
-		field_15_description_text = text;
-	}
-
-	/** sets the help topic text
-	 * @param text help topix text
-	 */
-	public void setHelpTopicText(String text){
-		field_16_help_topic_text = text;
-	}
-
-	/** sets the status bar text
-	 * @param text status bar text
-	 */
-	public void setStatusBarText(String text){
-		field_17_status_bar_text = text;
-	}
-
-	/** gets the option flag
-	 * @return option flag
-	 */
-	public short getOptionFlag(){
-		return field_1_option_flag;
-	}
-
-	/** returns the keyboard shortcut
-	 * @return keyboard shortcut
-	 */
-	public byte getKeyboardShortcut(){
-		return field_2_keyboard_shortcut ;
-	}
-
-	/**
-	 * gets the name length, in characters
-	 * @return name length
-	 */
-	private int getNameTextLength(){
-		if (isBuiltInName()) {
-			return 1;
-		}
-		return field_12_name_text.length();
-	}
-
-
-	/**
-	 * @return true if name is hidden
-	 */
-	public boolean isHiddenName() {
-		return (field_1_option_flag & Option.OPT_HIDDEN_NAME) != 0;
-	}
-	public void setHidden(boolean b) {
-		if (b) {
-			field_1_option_flag |= Option.OPT_HIDDEN_NAME;
-		} else {
-			field_1_option_flag &= (~Option.OPT_HIDDEN_NAME);
-		}
-	}
-	/**
-	 * @return <code>true</code> if name is a function
-	 */
-	public boolean isFunctionName() {
-		return (field_1_option_flag & Option.OPT_FUNCTION_NAME) != 0;
-	}
-
-	/**
-	 * Indicates that the defined name refers to a user-defined function.
-	 * This attribute is used when there is an add-in or other code project associated with the file.
-	 *
-	 * @param function <code>true</code> indicates the name refers to a function.
-	 */
-	public void setFunction(boolean function){
-		if (function) {
-			field_1_option_flag |= Option.OPT_FUNCTION_NAME;
-		} else {
-			field_1_option_flag &= (~Option.OPT_FUNCTION_NAME);
-		}
-	}
-
-	/**
-	 * @return <code>true</code> if name has a formula (named range or defined value)
-	 */
-	public boolean hasFormula() {
-		return Option.isFormula(field_1_option_flag) && field_13_name_definition.getEncodedTokenSize() > 0;
-	}
-
-	/**
-	 * @return true if name is a command
-	 */
-	public boolean isCommandName() {
-		return (field_1_option_flag & Option.OPT_COMMAND_NAME) != 0;
-	}
-	/**
-	 * @return true if function macro or command macro
-	 */
-	public boolean isMacro() {
-		return (field_1_option_flag & Option.OPT_MACRO) != 0;
-	}
-	/**
-	 * @return true if array formula or user defined
-	 */
-	public boolean isComplexFunction() {
-		return (field_1_option_flag & Option.OPT_COMPLEX) != 0;
-	}
-
-	/**
-	 * Convenience Function to determine if the name is a built-in name
-	 * 
-	 * @return true, if the name is a built-in name
-	 */
-	public boolean isBuiltInName()
-	{
-		return ((field_1_option_flag & Option.OPT_BUILTIN) != 0);
-	}
-
-
-	/** gets the name
-	 * @return name
-	 */
-	public String getNameText(){
-
-		return isBuiltInName() ? translateBuiltInName(getBuiltInName()) : field_12_name_text;
-	}
-
-	/** Gets the Built In Name
-	 * @return the built in Name
-	 */
-	public byte getBuiltInName()
-	{
-		return field_12_built_in_code;
-	}
-
-
-	/** gets the definition, reference (Formula)
-	 * @return the name formula. never <code>null</code>
-	 */
-	public Ptg[] getNameDefinition() {
-		return field_13_name_definition.getTokens();
-	}
-
-	public void setNameDefinition(Ptg[] ptgs) {
-		field_13_name_definition = Formula.create(ptgs);
-	}
-
-	/** get the custom menu text
-	 * @return custom menu text
-	 */
-	public String getCustomMenuText(){
-		return field_14_custom_menu_text;
-	}
-
-	/** gets the description text
-	 * @return description text
-	 */
-	public String getDescriptionText(){
-		return field_15_description_text;
-	}
-
-	/** get the help topic text
-	 * @return gelp topic text
-	 */
-	public String getHelpTopicText(){
-		return field_16_help_topic_text;
-	}
-
-	/** gets the status bar text
-	 * @return status bar text
-	 */
-	public String getStatusBarText(){
-		return field_17_status_bar_text;
-	}
-
-    /**
-     * NameRecord can span into
-     *
-     * @param out a data output stream
-     */
-	@Override
-    public void serialize(ContinuableRecordOutput out) {
-
-		int field_7_length_custom_menu = field_14_custom_menu_text.length();
-		int field_8_length_description_text = field_15_description_text.length();
-		int field_9_length_help_topic_text = field_16_help_topic_text.length();
-		int field_10_length_status_bar_text = field_17_status_bar_text.length();
-
-		// size defined below
-		out.writeShort(getOptionFlag());
-		out.writeByte(getKeyboardShortcut());
-		out.writeByte(getNameTextLength());
-		// Note - formula size is not immediately before encoded formula, and does not include any array constant data
-		out.writeShort(field_13_name_definition.getEncodedTokenSize());
-		out.writeShort(field_5_externSheetIndex_plus1);
-		out.writeShort(field_6_sheetNumber);
-		out.writeByte(field_7_length_custom_menu);
-		out.writeByte(field_8_length_description_text);
-		out.writeByte(field_9_length_help_topic_text);
-		out.writeByte(field_10_length_status_bar_text);
-		out.writeByte(field_11_nameIsMultibyte ? 1 : 0);
-
-		if (isBuiltInName()) {
-			//can send the builtin name directly in
-			out.writeByte(field_12_built_in_code);
-		} else {
-			String nameText = field_12_name_text;
-			if (field_11_nameIsMultibyte) {
-				StringUtil.putUnicodeLE(nameText, out);
-			} else {
-				StringUtil.putCompressedUnicode(nameText, out);
-			}
-		}
-		field_13_name_definition.serializeTokens(out);
-		field_13_name_definition.serializeArrayConstantData(out);
-
-		StringUtil.putCompressedUnicode( getCustomMenuText(), out);
-		StringUtil.putCompressedUnicode( getDescriptionText(), out);
-		StringUtil.putCompressedUnicode( getHelpTopicText(), out);
-		StringUtil.putCompressedUnicode( getStatusBarText(), out);
-	}
-	private int getNameRawSize() {
-		if (isBuiltInName()) {
-			return 1;
-		}
-		int nChars = field_12_name_text.length();
-		if(field_11_nameIsMultibyte) {
-			return 2 * nChars;
-		}
-		return nChars;
-	}
-
-	protected int getDataSize() {
-		return 13 // 3 shorts + 7 bytes
-			+ getNameRawSize()
-			+ field_14_custom_menu_text.length()
-			+ field_15_description_text.length()
-			+ field_16_help_topic_text.length()
-			+ field_17_status_bar_text.length()
-			+ field_13_name_definition.getEncodedSize();
-	}
-
-	/** gets the extern sheet number
-	 * @return extern sheet index
-	 */
-	public int getExternSheetNumber(){
-	    Ptg[] tokens = field_13_name_definition.getTokens();
-		if (tokens.length == 0) {
-			return 0;
-		}
-
-		Ptg ptg = tokens[0];
-		if (ptg.getClass() == Area3DPtg.class){
-			return ((Area3DPtg) ptg).getExternSheetIndex();
-
-		}
-		if (ptg.getClass() == Ref3DPtg.class){
-			return ((Ref3DPtg) ptg).getExternSheetIndex();
-		}
-		return 0;
-	}
-
-	/**
-	 * called by the constructor, should set class level fields.  Should throw
-	 * runtime exception for bad/icomplete data.
-	 *
-	 * @param ris the RecordInputstream to read the record from
-	 */
-	public NameRecord(RecordInputStream ris) {
-        // YK: Formula data can span into continue records, for example,
-        // when containing a large array of strings. See Bugzilla 50244
-
-        // read all remaining bytes and wrap into a LittleEndianInput
-        byte[] remainder = ris.readAllContinuedRemainder();
-        LittleEndianInput in = new LittleEndianByteArrayInputStream(remainder);
-
-		field_1_option_flag                 = in.readShort();
-		field_2_keyboard_shortcut           = in.readByte();
-		int field_3_length_name_text        = in.readUByte();
-		int field_4_length_name_definition  = in.readShort();
-		field_5_externSheetIndex_plus1      = in.readShort();
-		field_6_sheetNumber                 = in.readUShort();
-		int f7_customMenuLen      = in.readUByte();
-		int f8_descriptionTextLen = in.readUByte();
-		int f9_helpTopicTextLen  = in.readUByte();
-		int f10_statusBarTextLen = in.readUByte();
-
-		//store the name in byte form if it's a built-in name
-		field_11_nameIsMultibyte = (in.readByte() != 0);
-		if (isBuiltInName()) {
-			field_12_built_in_code = in.readByte();
-		} else {
-			if (field_11_nameIsMultibyte) {
-				field_12_name_text = StringUtil.readUnicodeLE(in, field_3_length_name_text);
-			} else {
-				field_12_name_text = StringUtil.readCompressedUnicode(in, field_3_length_name_text);
-			}
-		}
-
-		int nBytesAvailable = in.available() - (f7_customMenuLen
-				+ f8_descriptionTextLen + f9_helpTopicTextLen + f10_statusBarTextLen);
-		field_13_name_definition = Formula.read(field_4_length_name_definition, in, nBytesAvailable);
-
-		//Who says that this can only ever be compressed unicode???
-		field_14_custom_menu_text = StringUtil.readCompressedUnicode(in, f7_customMenuLen);
-		field_15_description_text = StringUtil.readCompressedUnicode(in, f8_descriptionTextLen);
-		field_16_help_topic_text  = StringUtil.readCompressedUnicode(in, f9_helpTopicTextLen);
-		field_17_status_bar_text  = StringUtil.readCompressedUnicode(in, f10_statusBarTextLen);
-	}
-
-	/**
-	 * return the non static version of the id for this record.
-	 */
-	@Override
-    public short getSid() {
-		return sid;
-	}
-	/*
-	  20 00
-	  00
-	  01
-	  1A 00 // sz = 0x1A = 26
-	  00 00
-	  01 00
-	  00
-	  00
-	  00
-	  00
-	  00 // unicode flag
-	  07 // name
-
-	  29 17 00 3B 00 00 00 00 FF FF 00 00 02 00 3B 00 //{ 26
-	  00 07 00 07 00 00 00 FF 00 10                   //  }
-
-
-
-	  20 00
-	  00
-	  01
-	  0B 00 // sz = 0xB = 11
-	  00 00
-	  01 00
-	  00
-	  00
-	  00
-	  00
-	  00 // unicode flag
-	  07 // name
-
-	  3B 00 00 07 00 07 00 00 00 FF 00   // { 11 }
-  */
-	/*
-	  18, 00,
-	  1B, 00,
-
-	  20, 00,
-	  00,
-	  01,
-	  0B, 00,
-	  00,
-	  00,
-	  00,
-	  00,
-	  00,
-	  07,
-	  3B 00 00 07 00 07 00 00 00 FF 00 ]
-	 */
-
-	@Override
-    public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("[NAME]\n");
-		sb.append("    .option flags           = ").append(HexDump.shortToHex(field_1_option_flag)).append("\n");
-		sb.append("    .keyboard shortcut      = ").append(HexDump.byteToHex(field_2_keyboard_shortcut)).append("\n");
-		sb.append("    .length of the name     = ").append(getNameTextLength()).append("\n");
-		sb.append("    .extSheetIx(1-based, 0=Global)= ").append( field_5_externSheetIndex_plus1 ).append("\n");
-		sb.append("    .sheetTabIx             = ").append(field_6_sheetNumber ).append("\n");
-		sb.append("    .Menu text length       = ").append(field_14_custom_menu_text.length()).append("\n");
-		sb.append("    .Description text length= ").append(field_15_description_text.length()).append("\n");
-		sb.append("    .Help topic text length = ").append(field_16_help_topic_text.length()).append("\n");
-		sb.append("    .Status bar text length = ").append(field_17_status_bar_text.length()).append("\n");
-		sb.append("    .NameIsMultibyte        = ").append(field_11_nameIsMultibyte).append("\n");
-		sb.append("    .Name (Unicode text)    = ").append( getNameText() ).append("\n");
-		Ptg[] ptgs = field_13_name_definition.getTokens();
-		sb.append("    .Formula (nTokens=").append(ptgs.length).append("):") .append("\n");
-		for (Ptg ptg : ptgs) {
-			sb.append("       " + ptg.toString()).append(ptg.getRVAType()).append("\n");
-		}
-
-		sb.append("    .Menu text       = ").append(field_14_custom_menu_text).append("\n");
-		sb.append("    .Description text= ").append(field_15_description_text).append("\n");
-		sb.append("    .Help topic text = ").append(field_16_help_topic_text).append("\n");
-		sb.append("    .Status bar text = ").append(field_17_status_bar_text).append("\n");
-		sb.append("[/NAME]\n");
-
-		return sb.toString();
-	}
-
-	/**Creates a human readable name for built in types
-	 * @return Unknown if the built-in name cannot be translated
-	 */
-	private static String translateBuiltInName(byte name)
-	{
-		switch (name)
-		{
-			case NameRecord.BUILTIN_AUTO_ACTIVATE :     return "Auto_Activate";
-			case NameRecord.BUILTIN_AUTO_CLOSE :        return "Auto_Close";
-			case NameRecord.BUILTIN_AUTO_DEACTIVATE :   return "Auto_Deactivate";
-			case NameRecord.BUILTIN_AUTO_OPEN :         return "Auto_Open";
-			case NameRecord.BUILTIN_CONSOLIDATE_AREA :  return "Consolidate_Area";
-			case NameRecord.BUILTIN_CRITERIA :          return "Criteria";
-			case NameRecord.BUILTIN_DATABASE :          return "Database";
-			case NameRecord.BUILTIN_DATA_FORM :         return "Data_Form";
-			case NameRecord.BUILTIN_PRINT_AREA :        return "Print_Area";
-			case NameRecord.BUILTIN_PRINT_TITLE :       return "Print_Titles";
-			case NameRecord.BUILTIN_RECORDER :          return "Recorder";
-			case NameRecord.BUILTIN_SHEET_TITLE :       return "Sheet_Title";
-			case NameRecord.BUILTIN_FILTER_DB  :        return "_FilterDatabase";
-
-		}
-
-		return "Unknown";
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java b/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java
deleted file mode 100644
index 1717444..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * NOTE: Comment Associated with a Cell (0x001C)
- */
-public final class NoteRecord extends StandardRecord implements Cloneable {
-	public final static short sid = 0x001C;
-
-	public static final NoteRecord[] EMPTY_ARRAY = { };
-
-	/**
-	 * Flag indicating that the comment is hidden (default)
-	 */
-	public final static short NOTE_HIDDEN = 0x0;
-
-	/**
-	 * Flag indicating that the comment is visible
-	 */
-	public final static short NOTE_VISIBLE = 0x2;
-
-	private static final Byte DEFAULT_PADDING = Byte.valueOf((byte)0);
-
-	private int field_1_row;
-	private int field_2_col;
-	private short field_3_flags;
-	private int field_4_shapeid;
-	private boolean field_5_hasMultibyte;
-	private String field_6_author;
-	/**
-	 * Saves padding byte value to reduce delta during round-trip serialization.<br/>
-	 *
-	 * The documentation is not clear about how padding should work.  In any case
-	 * Excel(2007) does something different.
-	 */
-	private Byte field_7_padding;
-
-	/**
-	 * Construct a new <code>NoteRecord</code> and
-	 * fill its data with the default values
-	 */
-	public NoteRecord() {
-		field_6_author = "";
-		field_3_flags = 0;
-		field_7_padding = DEFAULT_PADDING; // seems to be always present regardless of author text
-	}
-
-	/**
-	 * @return id of this record.
-	 */
-	public short getSid() {
-		return sid;
-	}
-
-	/**
-	 * Read the record data from the supplied <code>RecordInputStream</code>
-	 * 
-	 * @param in the RecordInputStream to read from
-	 */
-	public NoteRecord(RecordInputStream in) {
-		field_1_row = in.readUShort();
-		field_2_col = in.readShort();
-		field_3_flags = in.readShort();
-		field_4_shapeid = in.readUShort();
-		int length = in.readShort();
-		field_5_hasMultibyte = in.readByte() != 0x00;
-		if (field_5_hasMultibyte) {
-			field_6_author = StringUtil.readUnicodeLE(in, length);
-		} else {
-			field_6_author = StringUtil.readCompressedUnicode(in, length);
-		}
- 		if (in.available() == 1) {
-			field_7_padding = Byte.valueOf(in.readByte());
-		} else if (in.available() == 2 && length == 0) {
-		    // If there's no author, may be double padded
-            field_7_padding = Byte.valueOf(in.readByte());
-            in.readByte();
- 		}
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(field_1_row);
-		out.writeShort(field_2_col);
-		out.writeShort(field_3_flags);
-		out.writeShort(field_4_shapeid);
-		out.writeShort(field_6_author.length());
-		out.writeByte(field_5_hasMultibyte ? 0x01 : 0x00);
-		if (field_5_hasMultibyte) {
-			StringUtil.putUnicodeLE(field_6_author, out);
-		} else {
-			StringUtil.putCompressedUnicode(field_6_author, out);
-		}
-		if (field_7_padding != null) {
-			out.writeByte(field_7_padding.intValue());
-		}
-	}
-
-	protected int getDataSize() {
-		return 11 // 5 shorts + 1 byte
-			+ field_6_author.length() * (field_5_hasMultibyte ? 2 : 1)
-			+ (field_7_padding == null ? 0 : 1);
-	}
-
-	/**
-	 * Convert this record to string.
-	 * Used by BiffViewer and other utilities.
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[NOTE]\n");
-		buffer.append("    .row    = ").append(field_1_row).append("\n");
-		buffer.append("    .col    = ").append(field_2_col).append("\n");
-		buffer.append("    .flags  = ").append(field_3_flags).append("\n");
-		buffer.append("    .shapeid= ").append(field_4_shapeid).append("\n");
-		buffer.append("    .author = ").append(field_6_author).append("\n");
-		buffer.append("[/NOTE]\n");
-		return buffer.toString();
-	}
-
-	/**
-	 * Return the row that contains the comment
-	 *
-	 * @return the row that contains the comment
-	 */
-	public int getRow() {
-		return field_1_row;
-	}
-
-	/**
-	 * Specify the row that contains the comment
-	 *
-	 * @param row the row that contains the comment
-	 */
-	public void setRow(int row) {
-		field_1_row = row;
-	}
-
-	/**
-	 * Return the column that contains the comment
-	 *
-	 * @return the column that contains the comment
-	 */
-	public int getColumn() {
-		return field_2_col;
-	}
-
-	/**
-	 * Specify the column that contains the comment
-	 *
-	 * @param col the column that contains the comment
-	 */
-	public void setColumn(int col) {
-		field_2_col = col;
-	}
-
-	/**
-	 * Options flags.
-	 *
-	 * @return the options flag
-	 * @see #NOTE_VISIBLE
-	 * @see #NOTE_HIDDEN
-	 */
-	public short getFlags() {
-		return field_3_flags;
-	}
-
-	/**
-	 * Options flag
-	 *
-	 * @param flags the options flag
-	 * @see #NOTE_VISIBLE
-	 * @see #NOTE_HIDDEN
-	 */
-	public void setFlags(short flags) {
-		field_3_flags = flags;
-	}
-	
-	/**
-	 * For unit testing only!
-	 * 
-	 * @return true, if author element uses multi byte
-	 */
-	protected boolean authorIsMultibyte() {
-	   return field_5_hasMultibyte;
-	}
-
-	/**
-	 * Object id for OBJ record that contains the comment
-	 * 
-	 * @return the Object id for OBJ record that contains the comment
-	 */
-	public int getShapeId() {
-		return field_4_shapeid;
-	}
-
-	/**
-	 * Object id for OBJ record that contains the comment
-	 * 
-	 * @param id the Object id for OBJ record that contains the comment
-	 */
-	public void setShapeId(int id) {
-		field_4_shapeid = id;
-	}
-
-	/**
-	 * Name of the original comment author
-	 *
-	 * @return the name of the original author of the comment
-	 */
-	public String getAuthor() {
-		return field_6_author;
-	}
-
-	/**
-	 * Name of the original comment author
-	 *
-	 * @param author the name of the original author of the comment
-	 */
-	public void setAuthor(String author) {
-		field_6_author = author;
-      field_5_hasMultibyte = StringUtil.hasMultibyte(author);
-	}
-
-	@Override
-	public NoteRecord clone() {
-		NoteRecord rec = new NoteRecord();
-		rec.field_1_row = field_1_row;
-		rec.field_2_col = field_2_col;
-		rec.field_3_flags = field_3_flags;
-		rec.field_4_shapeid = field_4_shapeid;
-		rec.field_6_author = field_6_author;
-		return rec;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
deleted file mode 100644
index b2c1878..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ftNts (0x000D)<p>
- * Represents a NoteStructure sub record.<p>
- *
- * The docs say nothing about it. The length of this record is always 26 bytes.
- */
-public final class NoteStructureSubRecord extends SubRecord implements Cloneable {
-    public final static short sid = 0x0D;
-    private static final int ENCODED_SIZE = 22;
-
-    private byte[] reserved;
-
-    /**
-     * Construct a new <code>NoteStructureSubRecord</code> and
-     * fill its data with the default values
-     */
-    public NoteStructureSubRecord()
-    {
-        //all we know is that the the length of <code>NoteStructureSubRecord</code> is always 22 bytes
-        reserved = new byte[ENCODED_SIZE];
-    }
-
-    /**
-     * Read the record data from the supplied <code>RecordInputStream</code>
-     * 
-     * @param in the input to read from
-     * @param size the provided size - must be 22
-     */
-    public NoteStructureSubRecord(LittleEndianInput in, int size) {
-        if (size != ENCODED_SIZE) {
-            throw new RecordFormatException("Unexpected size (" + size + ")");
-        }
-        //just grab the raw data
-        byte[] buf = new byte[size];
-        in.readFully(buf);
-        reserved = buf;
-    }
-
-    /**
-     * Convert this record to string.
-     * Used by BiffViewer and other utilities.
-     */
-    @Override
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[ftNts ]").append("\n");
-        buffer.append("  size     = ").append(getDataSize()).append("\n");
-        buffer.append("  reserved = ").append(HexDump.toHex(reserved)).append("\n");
-        buffer.append("[/ftNts ]").append("\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Serialize the record data into the supplied array of bytes
-     *
-     * @param out the stream to serialize into
-     */
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid);
-        out.writeShort(reserved.length);
-        out.write(reserved);
-    }
-
-	@Override
-    protected int getDataSize() {
-        return reserved.length;
-    }
-
-    /**
-     * @return id of this record.
-     */
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public NoteStructureSubRecord clone() {
-        NoteStructureSubRecord rec = new NoteStructureSubRecord();
-        byte[] recdata = new byte[reserved.length];
-        System.arraycopy(reserved, 0, recdata, 0, recdata.length);
-        rec.reserved = recdata;
-        return rec;
-    }
-
-}
-
-
diff --git a/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java b/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java
deleted file mode 100644
index ebc6d9e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * NUMBER (0x0203) Contains a numeric cell value. <P>
- * REFERENCE:  PG 334 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class NumberRecord extends CellRecord implements Cloneable {
-    public static final short sid = 0x0203;
-    private double field_4_value;
-
-    /** Creates new NumberRecord */
-    public NumberRecord() {
-    	// fields uninitialised
-    }
-
-    /**
-     * @param in the RecordInputstream to read the record from
-     */
-    public NumberRecord(RecordInputStream in) {
-        super(in);
-        field_4_value = in.readDouble();
-    }
-
-    /**
-     * set the value for the cell
-     *
-     * @param value  double representing the value
-     */
-    public void setValue(double value){
-        field_4_value = value;
-    }
-
-    /**
-     * get the value for the cell
-     *
-     * @return double representing the value
-     */
-    public double getValue(){
-        return field_4_value;
-    }
-
-    @Override
-    protected String getRecordName() {
-    	return "NUMBER";
-    }
-
-    @Override
-    protected void appendValueText(StringBuilder sb) {
-    	sb.append("  .value= ").append(NumberToTextConverter.toText(field_4_value));
-    }
-
-    @Override
-    protected void serializeValue(LittleEndianOutput out) {
-        out.writeDouble(getValue());
-    }
-
-    @Override
-    protected int getValueDataSize() {
-    	return 8;
-    }
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public NumberRecord clone() {
-      NumberRecord rec = new NumberRecord();
-      copyBaseFields(rec);
-      rec.field_4_value = field_4_value;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java
deleted file mode 100644
index 8eb4e03..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInputStream;
-
-/**
- * OBJRECORD (0x005D)<p>
- * 
- * The obj record is used to hold various graphic objects and controls.
- */
-public final class ObjRecord extends Record implements Cloneable {
-	public final static short sid = 0x005D;
-
-	private static final int NORMAL_PAD_ALIGNMENT = 2;
-	private static int MAX_PAD_ALIGNMENT = 4;
-	
-	private List<SubRecord> subrecords;
-	/** used when POI has no idea what is going on */
-	private final byte[] _uninterpretedData;
-	/**
-	 * Excel seems to tolerate padding to quad or double byte length
-	 */
-	private boolean _isPaddedToQuadByteMultiple;
-
-	//00000000 15 00 12 00 01 00 01 00 11 60 00 00 00 00 00 0D .........`......
-	//00000010 26 01 00 00 00 00 00 00 00 00                   &.........
-
-
-	public ObjRecord() {
-		subrecords = new ArrayList<SubRecord>(2);
-		// TODO - ensure 2 sub-records (ftCmo 15h, and ftEnd 00h) are always created
-		_uninterpretedData = null;
-	}
-
-	public ObjRecord(RecordInputStream in) {
-		// TODO - problems with OBJ sub-records stream
-		// MS spec says first sub-record is always CommonObjectDataSubRecord,
-		// and last is
-		// always EndSubRecord. OOO spec does not mention ObjRecord(0x005D).
-		// Existing POI test data seems to violate that rule. Some test data
-		// seems to contain
-		// garbage, and a crash is only averted by stopping at what looks like
-		// the 'EndSubRecord'
-
-		// Check if this can be continued, if so then the
-		// following wont work properly
-		byte[] subRecordData = in.readRemainder();
-		if (LittleEndian.getUShort(subRecordData, 0) != CommonObjectDataSubRecord.sid) {
-			// seems to occur in just one junit on "OddStyleRecord.xls" (file created by CrystalReports)
-			// Excel tolerates the funny ObjRecord, and replaces it with a corrected version
-			// The exact logic/reasoning is not yet understood
-			_uninterpretedData = subRecordData;
-			subrecords = null;
-			return;
-		}
-
-        //YK: files produced by OO violate the condition below
-        /*
-        if (subRecordData.length % 2 != 0) {
-			String msg = "Unexpected length of subRecordData : " + HexDump.toHex(subRecordData);
-			throw new RecordFormatException(msg);
-		}
-        */
-
-		subrecords = new ArrayList<SubRecord>();
-		ByteArrayInputStream bais = new ByteArrayInputStream(subRecordData);
-		LittleEndianInputStream subRecStream = new LittleEndianInputStream(bais);
-		CommonObjectDataSubRecord cmo = (CommonObjectDataSubRecord)SubRecord.createSubRecord(subRecStream, 0);
-        subrecords.add(cmo);
-        while (true) {
-			SubRecord subRecord = SubRecord.createSubRecord(subRecStream, cmo.getObjectType());
-			subrecords.add(subRecord);
-			if (subRecord.isTerminating()) {
-				break;
-			}
-		}
-		int nRemainingBytes = bais.available();
-		if (nRemainingBytes > 0) {
-			// At present (Oct-2008), most unit test samples have (subRecordData.length % 2 == 0)
-			_isPaddedToQuadByteMultiple = subRecordData.length % MAX_PAD_ALIGNMENT == 0;
-			if (nRemainingBytes >= (_isPaddedToQuadByteMultiple ? MAX_PAD_ALIGNMENT : NORMAL_PAD_ALIGNMENT)) {
-				if (!canPaddingBeDiscarded(subRecordData, nRemainingBytes)) {
-					String msg = "Leftover " + nRemainingBytes 
-						+ " bytes in subrecord data " + HexDump.toHex(subRecordData);
-					throw new RecordFormatException(msg);
-				}
-				_isPaddedToQuadByteMultiple = false;
-			}
-
-        } else {
-			_isPaddedToQuadByteMultiple = false;
-		}
-		_uninterpretedData = null;
-	}
-
-	/**
-	 * Some XLS files have ObjRecords with nearly 8Kb of excessive padding. These were probably
-	 * written by a version of POI (around 3.1) which incorrectly interpreted the second short of
-	 * the ftLbs subrecord (0x1FEE) as a length, and read that many bytes as padding (other bugs
-	 * helped allow this to occur).
-	 * 
-	 * Excel reads files with this excessive padding OK, truncating the over-sized ObjRecord back
-	 * to the its proper size.  POI does the same.
-	 */
-	private static boolean canPaddingBeDiscarded(byte[] data, int nRemainingBytes) {
-        // make sure none of the padding looks important
-		for(int i=data.length-nRemainingBytes; i<data.length; i++) {
-			if (data[i] != 0x00) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("[OBJ]\n");
-		if(subrecords != null) {	// there are special cases where this can be, see comments in constructor above
-    		for (int i = 0; i < subrecords.size(); i++) {
-    			SubRecord record = subrecords.get(i);
-    			sb.append("SUBRECORD: ").append(record.toString());
-    		}
-		}
-		sb.append("[/OBJ]\n");
-		return sb.toString();
-	}
-	
-	@Override
-	public int getRecordSize() {
-		if (_uninterpretedData != null) {
-			return _uninterpretedData.length + 4;
-		}
-		int size = 0;
-		for (int i=subrecords.size()-1; i>=0; i--) {
-			SubRecord record = subrecords.get(i);
-			size += record.getDataSize()+4;
-		}
-		if (_isPaddedToQuadByteMultiple) {
-			while (size % MAX_PAD_ALIGNMENT != 0) {
-				size++;
-			}
-		} else {
-			while (size % NORMAL_PAD_ALIGNMENT != 0) {
-				size++;
-			}
-		}
-		return size + 4;
-	}
-
-	@Override
-	public int serialize(int offset, byte[] data) {
-		int recSize = getRecordSize();
-		int dataSize = recSize - 4;
-		LittleEndianByteArrayOutputStream out = new LittleEndianByteArrayOutputStream(data, offset, recSize);
-
-		out.writeShort(sid);
-		out.writeShort(dataSize);
-
-		if (_uninterpretedData == null) {
-
-			for (int i = 0; i < subrecords.size(); i++) {
-				SubRecord record = subrecords.get(i);
-				record.serialize(out);
-			}
-			int expectedEndIx = offset+dataSize;
-			// padding
-			while (out.getWriteIndex() < expectedEndIx) {
-				out.writeByte(0);
-			}
-		} else {
-			out.write(_uninterpretedData);
-		}
-		return recSize;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	public List<SubRecord> getSubRecords() {
-		return subrecords;
-	}
-
-	public void clearSubRecords() {
-		subrecords.clear();
-	}
-
-	public void addSubRecord(int index, SubRecord element) {
-		subrecords.add(index, element);
-	}
-
-	public boolean addSubRecord(SubRecord o) {
-		return subrecords.add(o);
-	}
-
-	@Override
-	public ObjRecord clone() {
-		ObjRecord rec = new ObjRecord();
-
-		for (int i = 0; i < subrecords.size(); i++) {
-			SubRecord record = subrecords.get(i);
-			rec.addSubRecord((SubRecord) record.clone());
-		}
-		return rec;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
deleted file mode 100644
index 06aab44..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Object Protect Record<P>
- * Description: Protect embedded object with the lamest "security" ever invented.  
- * This record tells  "I want to protect my objects" with lame security.  It 
- * appears in conjunction with the PASSWORD and PROTECT records as well as its 
- * scenario protect cousin.<P>
- * REFERENCE:  PG 368 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-
-public final class ObjectProtectRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x63;
-    private short             field_1_protect;
-
-    public ObjectProtectRecord()
-    {
-    }
-
-    public ObjectProtectRecord(RecordInputStream in)
-    {
-        field_1_protect = in.readShort();
-    }
-
-    /**
-     * set whether the sheet is protected or not
-     * @param protect whether to protect the sheet or not
-     */
-
-    public void setProtect(boolean protect)
-    {
-        if (protect)
-        {
-            field_1_protect = 1;
-        }
-        else
-        {
-            field_1_protect = 0;
-        }
-    }
-
-    /**
-     * get whether the sheet is protected or not
-     * @return whether to protect the sheet or not
-     */
-
-    public boolean getProtect()
-    {
-        return (field_1_protect == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SCENARIOPROTECT]\n");
-	    buffer.append("    .protect         = ").append(getProtect())
-            .append("\n");
-        buffer.append("[/SCENARIOPROTECT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_protect);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public ObjectProtectRecord clone() {
-        ObjectProtectRecord rec = new ObjectProtectRecord();
-        rec.field_1_protect = field_1_protect;
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/OldCellRecord.java b/trunk/src/java/org/apache/poi/hssf/record/OldCellRecord.java
deleted file mode 100644
index 76f2dd3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/OldCellRecord.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-
-/**
- * Base class for all old (Biff 2 - Biff 4) cell value records 
- *  (implementors of {@link CellValueRecordInterface}).
- * Subclasses are expected to manage the cell data values (of various types).
- */
-public abstract class OldCellRecord {
-    private final short    sid;
-    private final boolean  isBiff2;   
-    private final int      field_1_row;
-    private final short    field_2_column;
-    private int      field_3_cell_attrs; // Biff 2
-    private short    field_3_xf_index;   // Biff 3+
-
-    protected OldCellRecord(RecordInputStream in, boolean isBiff2) {
-        this.sid = in.getSid();
-        this.isBiff2 = isBiff2;
-        field_1_row  = in.readUShort();
-        field_2_column = in.readShort();
-        
-        if (isBiff2) {
-            field_3_cell_attrs = in.readUShort() << 8;
-            field_3_cell_attrs += in.readUByte();
-        } else {
-            field_3_xf_index     = in.readShort();
-        }
-    }
-
-    public final int getRow() {
-        return field_1_row;
-    }
-
-    public final short getColumn() {
-        return field_2_column;
-    }
-
-    /**
-     * get the index to the ExtendedFormat, for non-Biff2
-     *
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     * @return index to the XF record
-     */
-    public final short getXFIndex() {
-        return field_3_xf_index;
-    }
-    
-    public int getCellAttrs()
-    {
-        return field_3_cell_attrs;
-    }
-
-    /**
-     * Is this a Biff2 record, or newer?
-     * 
-     * @return true, if this is a Biff2 record or newer
-     */
-    public boolean isBiff2() {
-        return isBiff2;
-    }
-    
-    public short getSid() {
-        return sid;
-    }
-    
-    @Override
-    public final String toString() {
-        StringBuilder sb = new StringBuilder();
-        String recordName = getRecordName();
-
-        sb.append("[").append(recordName).append("]\n");
-        sb.append("    .row    = ").append(HexDump.shortToHex(getRow())).append("\n");
-        sb.append("    .col    = ").append(HexDump.shortToHex(getColumn())).append("\n");
-        if (isBiff2()) {
-            sb.append("    .cellattrs = ").append(HexDump.shortToHex(getCellAttrs())).append("\n");
-        } else {
-            sb.append("    .xfindex   = ").append(HexDump.shortToHex(getXFIndex())).append("\n");
-        }
-        appendValueText(sb);
-        sb.append("\n");
-        sb.append("[/").append(recordName).append("]\n");
-        return sb.toString();
-    }
-    
-    /**
-     * Append specific debug info (used by {@link #toString()} for the value
-     * contained in this record. Trailing new-line should not be appended
-     * (superclass does that).
-     * 
-     * @param sb the StringBuilder to append to
-     */
-    protected abstract void appendValueText(StringBuilder sb);
-
-    /**
-     * Gets the debug info BIFF record type name (used by {@link #toString()}.
-     * 
-     * @return the debug info BIFF record type name
-     */
-    protected abstract String getRecordName();
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java b/trunk/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java
deleted file mode 100644
index 365059f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.FormulaRecord.SpecialCachedValue;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.CellType;
-
-/**
- * Formula Record (0x0006 / 0x0206 / 0x0406) - holds a formula in
- *  encoded form, along with the value if a number
- */
-public final class OldFormulaRecord extends OldCellRecord {
-    public final static short biff2_sid = 0x0006;
-    public final static short biff3_sid = 0x0206;
-    public final static short biff4_sid = 0x0406;
-    public final static short biff5_sid = 0x0006;
-
-    private SpecialCachedValue specialCachedValue;
-    private double  field_4_value;
-    private short   field_5_options;
-    private Formula field_6_parsed_expr;
-
-    public OldFormulaRecord(RecordInputStream ris) {
-        super(ris, ris.getSid() == biff2_sid);
-
-        if (isBiff2()) {
-            field_4_value = ris.readDouble();
-        } else {
-            long valueLongBits  = ris.readLong();
-            specialCachedValue = SpecialCachedValue.create(valueLongBits);
-            if (specialCachedValue == null) {
-                field_4_value = Double.longBitsToDouble(valueLongBits);
-            }
-        }
-
-        if (isBiff2()) {
-            field_5_options = (short)ris.readUByte();
-        } else {
-            field_5_options = ris.readShort();
-        }
-
-        int expression_len = ris.readShort();
-        int nBytesAvailable = ris.available();
-        field_6_parsed_expr = Formula.read(expression_len, ris, nBytesAvailable);
-    }
-
-    public int getCachedResultType() {
-        if (specialCachedValue == null) {
-            return CellType.NUMERIC.getCode();
-        }
-        return specialCachedValue.getValueType();
-    }
-    
-    public boolean getCachedBooleanValue() {
-        return specialCachedValue.getBooleanValue();
-    }
-    public int getCachedErrorValue() {
-        return specialCachedValue.getErrorValue();
-    }
-    
-    /**
-     * get the calculated value of the formula
-     *
-     * @return calculated value
-     */
-    public double getValue() {
-        return field_4_value;
-    }
-
-    /**
-     * get the option flags
-     *
-     * @return bitmask
-     */
-    public short getOptions() {
-        return field_5_options;
-    }
-
-    /**
-     * @return the formula tokens. never <code>null</code>
-     */
-    public Ptg[] getParsedExpression() {
-        return field_6_parsed_expr.getTokens();
-    }
-
-    public Formula getFormula() {
-        return field_6_parsed_expr;
-    }
-
-    protected void appendValueText(StringBuilder sb) {
-        sb.append("    .value       = ").append(getValue()).append("\n");
-    }
-    protected String getRecordName() {
-        return "Old Formula";
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java b/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java
deleted file mode 100644
index c123749..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Biff2 - Biff 4 Label Record (0x0004 / 0x0204) - read only support for 
- *  strings stored directly in the cell, from the older file formats that
- *  didn't use {@link LabelSSTRecord}
- */
-public final class OldLabelRecord extends OldCellRecord {
-    private final static POILogger logger = POILogFactory.getLogger(OldLabelRecord.class);
-
-    public final static short biff2_sid = 0x0004;
-    public final static short biff345_sid = 0x0204;
-
-    private short          field_4_string_len;
-    private final byte[]         field_5_bytes;
-    private CodepageRecord codepage;
-
-    /**
-     * @param in the RecordInputstream to read the record from
-     */
-    public OldLabelRecord(RecordInputStream in)
-    {
-        super(in, in.getSid() == biff2_sid);
-
-        if (isBiff2()) {
-            field_4_string_len  = (short)in.readUByte();
-        } else {
-            field_4_string_len   = in.readShort();
-        }
-
-        // Can only decode properly later when you know the codepage
-        field_5_bytes = new byte[field_4_string_len];
-        in.read(field_5_bytes, 0, field_4_string_len);
-
-        if (in.remaining() > 0) {
-            logger.log(POILogger.INFO,
-                    "LabelRecord data remains: " + in.remaining() +
-                    " : " + HexDump.toHex(in.readRemainder())
-                    );
-        }
-    }
-
-    public void setCodePage(CodepageRecord codepage) {
-        this.codepage = codepage;
-    }
-    
-    /**
-     * get the number of characters this string contains
-     * @return number of characters
-     */
-    public short getStringLength()
-    {
-        return field_4_string_len;
-    }
-
-    /**
-     * Get the String of the cell
-     * 
-     * @return the String of the cell
-     */
-    public String getValue()
-    {
-        return OldStringRecord.getString(field_5_bytes, codepage);
-    }
-
-    /**
-     * Not supported
-     * 
-     * @param offset not supported
-     * @param data not supported
-     * @return not supported
-     */
-    public int serialize(int offset, byte [] data) {
-        throw new RecordFormatException("Old Label Records are supported READ ONLY");
-    }
-    
-    public int getRecordSize() {
-        throw new RecordFormatException("Old Label Records are supported READ ONLY");
-    }
-
-    @Override
-    protected void appendValueText(StringBuilder sb) {
-        sb.append("    .string_len= ").append(HexDump.shortToHex(field_4_string_len)).append("\n");
-        sb.append("    .value       = ").append(getValue()).append("\n");
-    }
-
-    @Override
-    protected String getRecordName() {
-        return "OLD LABEL";
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java b/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java
deleted file mode 100644
index 92ffcf9..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-
-/**
- * Title:        Bound Sheet Record (aka BundleSheet) (0x0085) for BIFF 5<P>
- * Description:  Defines a sheet within a workbook.  Basically stores the sheet name
- *               and tells where the Beginning of file record is within the HSSF
- *               file.
- */
-public final class OldSheetRecord {
-    public final static short sid = 0x0085;
-
-    private int field_1_position_of_BOF;
-    private int field_2_visibility;
-    private int field_3_type;
-    private byte[] field_5_sheetname;
-    private CodepageRecord codepage;
-
-    public OldSheetRecord(RecordInputStream in) {
-        field_1_position_of_BOF = in.readInt();
-        field_2_visibility = in.readUByte();
-        field_3_type = in.readUByte();
-        int field_4_sheetname_length = in.readUByte();
-        field_5_sheetname = new byte[field_4_sheetname_length];
-        in.read(field_5_sheetname, 0, field_4_sheetname_length);
-    }
-
-    public void setCodePage(CodepageRecord codepage) {
-        this.codepage = codepage;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * get the offset in bytes of the Beginning of File Marker within the HSSF Stream part of the POIFS file
-     *
-     * @return offset in bytes
-     */
-    public int getPositionOfBof() {
-        return field_1_position_of_BOF;
-    }
-
-    /**
-     * get the sheetname for this sheet.  (this appears in the tabs at the bottom)
-     * @return sheetname the name of the sheet
-     */
-    public String getSheetname() {
-        return OldStringRecord.getString(field_5_sheetname, codepage);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[BOUNDSHEET]\n");
-        buffer.append("    .bof        = ").append(HexDump.intToHex(getPositionOfBof())).append("\n");
-        buffer.append("    .visibility = ").append(HexDump.shortToHex(field_2_visibility)).append("\n");
-        buffer.append("    .type       = ").append(HexDump.byteToHex(field_3_type)).append("\n");
-        buffer.append("    .sheetname  = ").append(getSheetname()).append("\n");
-        buffer.append("[/BOUNDSHEET]\n");
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java b/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java
deleted file mode 100644
index 4964f84..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.UnsupportedEncodingException;
-
-import org.apache.poi.util.CodePageUtil;
-
-
-/**
- * Biff2 - Biff 4 Label Record (0x0007 / 0x0207) - read only support for 
- *  formula string results.
- */
-public final class OldStringRecord {
-    public final static short biff2_sid = 0x0007;
-    public final static short biff345_sid = 0x0207;
-
-    private short             sid;
-    private short             field_1_string_len;
-    private byte[]            field_2_bytes;
-    private CodepageRecord    codepage;
-
-    /**
-     * @param in the RecordInputstream to read the record from
-     */
-    public OldStringRecord(RecordInputStream in) {
-        sid = in.getSid();
-        
-        if (in.getSid() == biff2_sid) {
-            field_1_string_len  = (short)in.readUByte();
-        } else {
-            field_1_string_len   = in.readShort();
-        }
-
-        // Can only decode properly later when you know the codepage
-        field_2_bytes = new byte[field_1_string_len];
-        in.read(field_2_bytes, 0, field_1_string_len);
-    }
-
-    public boolean isBiff2() {
-        return sid == biff2_sid;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-    
-    public void setCodePage(CodepageRecord codepage) {
-        this.codepage = codepage;
-    }
-
-    /**
-     * @return The string represented by this record.
-     */
-    public String getString()
-    {
-        return getString(field_2_bytes, codepage);
-    }
-    
-    protected static String getString(byte[] data, CodepageRecord codepage) {
-        int cp = CodePageUtil.CP_ISO_8859_1;
-        if (codepage != null) {
-            cp = codepage.getCodepage() & 0xffff;
-        }
-        try {
-            return CodePageUtil.getStringFromCodePage(data, cp);
-        } catch (UnsupportedEncodingException uee) {
-            throw new IllegalArgumentException("Unsupported codepage requested", uee);
-        }
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[OLD STRING]\n");
-        buffer.append("    .string            = ")
-            .append(getString()).append("\n");
-        buffer.append("[/OLD STRING]\n");
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
deleted file mode 100644
index fe182d0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * <p>Record that contains the functionality page breaks (horizontal and vertical)</p>
- *
- * <p>The other two classes just specifically set the SIDS for record creation.</p>
- *
- * <p>REFERENCE:  Microsoft Excel SDK page 322 and 420</p>
- *
- * @see HorizontalPageBreakRecord
- * @see VerticalPageBreakRecord
- * @author Danny Mui (dmui at apache dot org)
- */
-public abstract class PageBreakRecord extends StandardRecord {
-    private static final int[] EMPTY_INT_ARRAY = { };
-
-    private List<Break> _breaks;
-    private Map<Integer, Break> _breakMap;
-
-    /**
-     * Since both records store 2byte integers (short), no point in
-     * differentiating it in the records.
-     * <p>
-     * The subs (rows or columns, don't seem to be able to set but excel sets
-     * them automatically)
-     */
-    public static final class Break {
-
-        public static final int ENCODED_SIZE = 6;
-        public int main;
-        public int subFrom;
-        public int subTo;
-
-        public Break(int main, int subFrom, int subTo)
-        {
-            this.main = main;
-            this.subFrom = subFrom;
-            this.subTo = subTo;
-        }
-
-        public Break(RecordInputStream in) {
-            main = in.readUShort() - 1;
-            subFrom = in.readUShort();
-            subTo = in.readUShort();
-        }
-
-        public void serialize(LittleEndianOutput out) {
-            out.writeShort(main + 1);
-            out.writeShort(subFrom);
-            out.writeShort(subTo);
-        }
-    }
-
-    protected PageBreakRecord() {
-        _breaks = new ArrayList<Break>();
-        _breakMap = new HashMap<Integer, Break>();
-    }
-
-    public PageBreakRecord(RecordInputStream in)
-    {
-        int nBreaks = in.readShort();
-        _breaks = new ArrayList<Break>(nBreaks + 2);
-        _breakMap = new HashMap<Integer, Break>();
-
-        for(int k = 0; k < nBreaks; k++) {
-            Break br = new Break(in);
-            _breaks.add(br);
-            _breakMap.put(Integer.valueOf(br.main), br);
-        }
-
-    }
-
-    public boolean isEmpty() {
-    	return _breaks.isEmpty();
-    }
-    protected int getDataSize() {
-        return 2 + _breaks.size() * Break.ENCODED_SIZE;
-    }
-
-    public final void serialize(LittleEndianOutput out) {
-        int nBreaks = _breaks.size();
-        out.writeShort(nBreaks);
-        for (int i=0; i<nBreaks; i++) {
-            _breaks.get(i).serialize(out);
-        }
-    }
-
-    public int getNumBreaks() {
-        return _breaks.size();
-    }
-
-    public final Iterator<Break> getBreaksIterator() {
-        return _breaks.iterator();
-    }
-
-    public String toString() {
-        StringBuffer retval = new StringBuffer();
-
-        String label;
-        String mainLabel;
-        String subLabel;
-
-        if (getSid() == HorizontalPageBreakRecord.sid) {
-           label = "HORIZONTALPAGEBREAK";
-           mainLabel = "row";
-           subLabel = "col";
-        } else {
-           label = "VERTICALPAGEBREAK";
-           mainLabel = "column";
-           subLabel = "row";
-        }
-
-        retval.append("["+label+"]").append("\n");
-        retval.append("     .sid        =").append(getSid()).append("\n");
-        retval.append("     .numbreaks =").append(getNumBreaks()).append("\n");
-        Iterator<Break> iterator = getBreaksIterator();
-        for(int k = 0; k < getNumBreaks(); k++)
-        {
-            Break region = iterator.next();
-
-            retval.append("     .").append(mainLabel).append(" (zero-based) =").append(region.main).append("\n");
-            retval.append("     .").append(subLabel).append("From    =").append(region.subFrom).append("\n");
-            retval.append("     .").append(subLabel).append("To      =").append(region.subTo).append("\n");
-        }
-
-        retval.append("["+label+"]").append("\n");
-        return retval.toString();
-    }
-
-   /**
-    * Adds the page break at the specified parameters
-    * @param main Depending on sid, will determine row or column to put page break (zero-based)
-    * @param subFrom No user-interface to set (defaults to minimum, 0)
-    * @param subTo No user-interface to set
-    */
-    public void addBreak(int main, int subFrom, int subTo) {
-
-        Integer key = Integer.valueOf(main);
-        Break region = _breakMap.get(key);
-        if(region == null) {
-            region = new Break(main, subFrom, subTo);
-            _breakMap.put(key, region);
-            _breaks.add(region);
-        } else {
-            region.main = main;
-            region.subFrom = subFrom;
-            region.subTo = subTo;
-        }
-    }
-
-    /**
-     * Removes the break indicated by the parameter
-     * @param main (zero-based)
-     */
-    public final void removeBreak(int main) {
-        Integer rowKey = Integer.valueOf(main);
-        Break region = _breakMap.get(rowKey);
-        _breaks.remove(region);
-        _breakMap.remove(rowKey);
-    }
-
-    /**
-     * Retrieves the region at the row/column indicated
-     * @param main FIXME: Document this!
-     * @return The Break or null if no break exists at the row/col specified.
-     */
-    public final Break getBreak(int main) {
-        Integer rowKey = Integer.valueOf(main);
-        return _breakMap.get(rowKey);
-    }
-
-    public final int[] getBreaks() {
-        int count = getNumBreaks();
-        if (count < 1) {
-            return EMPTY_INT_ARRAY;
-        }
-        int[] result = new int[count];
-        for (int i=0; i<count; i++) {
-            Break breakItem = _breaks.get(i);
-            result[i] = breakItem.main;
-        }
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java
deleted file mode 100644
index 5fa318b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * PaletteRecord (0x0092) - Supports custom palettes.
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Brian Sanders (bsanders at risklabs dot com) - custom palette editing
- *
- */
-public final class PaletteRecord extends StandardRecord {
-    public final static short sid = 0x0092;
-    /** The standard size of an XLS palette */
-    public final static byte STANDARD_PALETTE_SIZE = (byte) 56;
-    /** The byte index of the first color */
-    public final static short FIRST_COLOR_INDEX = (short) 0x8;
-
-    private final List<PColor>  _colors;
-
-    public PaletteRecord() {
-      PColor[] defaultPalette = createDefaultPalette();
-      _colors    = new ArrayList<PColor>(defaultPalette.length);
-      for (PColor element : defaultPalette) {
-        _colors.add(element);
-      }
-    }
-
-    public PaletteRecord(RecordInputStream in) {
-       int field_1_numcolors = in.readShort();
-       _colors    = new ArrayList<PColor>(field_1_numcolors);
-       for (int k = 0; k < field_1_numcolors; k++) {
-           _colors.add(new PColor(in));
-       }
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PALETTE]\n");
-        buffer.append("  numcolors     = ").append(_colors.size()).append('\n');
-        for (int i = 0; i < _colors.size(); i++) {
-            PColor c = _colors.get(i);
-            buffer.append("* colornum      = ").append(i).append('\n');
-            buffer.append(c.toString());
-            buffer.append("/*colornum      = ").append(i).append('\n');
-        }
-        buffer.append("[/PALETTE]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_colors.size());
-        for (int i = 0; i < _colors.size(); i++) {
-          _colors.get(i).serialize(out);
-        }
-    }
-
-    @Override
-    protected int getDataSize() {
-        return 2 + _colors.size() * PColor.ENCODED_SIZE;
-    }
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * Returns the color value at a given index
-     * 
-     * @param byteIndex palette index, must be &gt;= 0x8
-     *
-     * @return the RGB triplet for the color, or <code>null</code> if the specified index
-     * does not exist
-     */
-    public byte[] getColor(int byteIndex) {
-        int i = byteIndex - FIRST_COLOR_INDEX;
-        if (i < 0 || i >= _colors.size()) {
-            return null;
-        }
-        return _colors.get(i).getTriplet();
-    }
-
-    /**
-     * Sets the color value at a given index
-     *
-     * If the given index is greater than the current last color index,
-     * then black is inserted at every index required to make the palette continuous.
-     *
-     * @param byteIndex the index to set; if this index is less than 0x8 or greater than
-     * 0x40, then no modification is made
-     * @param red the red color part
-     * @param green the green color part
-     * @param blue the blue color part
-     */
-    public void setColor(short byteIndex, byte red, byte green, byte blue)
-    {
-        int i = byteIndex - FIRST_COLOR_INDEX;
-        if (i < 0 || i >= STANDARD_PALETTE_SIZE)
-        {
-            return;
-        }
-        // may need to grow - fill intervening palette entries with black
-        while (_colors.size() <= i) {
-            _colors.add(new PColor(0, 0, 0));
-        }
-        PColor custColor = new PColor(red, green, blue);
-        _colors.set(i, custColor);
-    }
-
-    /**
-     * Creates the default palette as PaletteRecord binary data
-     */
-    private static PColor[] createDefaultPalette()
-    {
-        return new PColor[] {
-                pc(0, 0, 0),
-                pc(255, 255, 255),
-                pc(255, 0, 0),
-                pc(0, 255, 0),
-                pc(0, 0, 255),
-                pc(255, 255, 0),
-                pc(255, 0, 255),
-                pc(0, 255, 255),
-                pc(128, 0, 0),
-                pc(0, 128, 0),
-                pc(0, 0, 128),
-                pc(128, 128, 0),
-                pc(128, 0, 128),
-                pc(0, 128, 128),
-                pc(192, 192, 192),
-                pc(128, 128, 128),
-                pc(153, 153, 255),
-                pc(153, 51, 102),
-                pc(255, 255, 204),
-                pc(204, 255, 255),
-                pc(102, 0, 102),
-                pc(255, 128, 128),
-                pc(0, 102, 204),
-                pc(204, 204, 255),
-                pc(0, 0, 128),
-                pc(255, 0, 255),
-                pc(255, 255, 0),
-                pc(0, 255, 255),
-                pc(128, 0, 128),
-                pc(128, 0, 0),
-                pc(0, 128, 128),
-                pc(0, 0, 255),
-                pc(0, 204, 255),
-                pc(204, 255, 255),
-                pc(204, 255, 204),
-                pc(255, 255, 153),
-                pc(153, 204, 255),
-                pc(255, 153, 204),
-                pc(204, 153, 255),
-                pc(255, 204, 153),
-                pc(51, 102, 255),
-                pc(51, 204, 204),
-                pc(153, 204, 0),
-                pc(255, 204, 0),
-                pc(255, 153, 0),
-                pc(255, 102, 0),
-                pc(102, 102, 153),
-                pc(150, 150, 150),
-                pc(0, 51, 102),
-                pc(51, 153, 102),
-                pc(0, 51, 0),
-                pc(51, 51, 0),
-                pc(153, 51, 0),
-                pc(153, 51, 102),
-                pc(51, 51, 153),
-                pc(51, 51, 51),
-        };
-    }
-
-    private static PColor pc(int r, int g, int b) {
-        return new PColor(r, g, b);
-    }
-
-    /**
-     * PColor - element in the list of colors
-     */
-    private static final class PColor {
-        public static final short ENCODED_SIZE = 4;
-        private final int _red;
-        private final int _green;
-        private final int _blue;
-
-        public PColor(int red, int green, int blue) {
-            _red = red;
-            _green = green;
-            _blue = blue;
-        }
-
-        public byte[] getTriplet() {
-            return new byte[] { (byte) _red, (byte) _green, (byte) _blue };
-        }
-
-        public PColor(RecordInputStream in) {
-            _red = in.readByte();
-            _green = in.readByte();
-            _blue = in.readByte();
-            in.readByte(); // unused
-        }
-
-        public void serialize(LittleEndianOutput out) {
-            out.writeByte(_red);
-            out.writeByte(_green);
-            out.writeByte(_blue);
-            out.writeByte(0);
-        }
-
-        @Override
-        public String toString() {
-            StringBuffer buffer = new StringBuffer();
-            buffer.append("  red   = ").append(_red & 0xff).append('\n');
-            buffer.append("  green = ").append(_green & 0xff).append('\n');
-            buffer.append("  blue  = ").append(_blue & 0xff).append('\n');
-            return buffer.toString();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java
deleted file mode 100644
index 69b94fe..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Describes the frozen and unfrozen panes.
- */
-public final class PaneRecord extends StandardRecord {
-    public final static short      sid                             = 0x41;
-    private  short      field_1_x;
-    private  short      field_2_y;
-    private  short      field_3_topRow;
-    private  short      field_4_leftColumn;
-    private  short      field_5_activePane;
-    public final static short       ACTIVE_PANE_LOWER_RIGHT        = 0;
-    public final static short       ACTIVE_PANE_UPPER_RIGHT        = 1;
-    public final static short       ACTIVE_PANE_LOWER_LEFT         = 2;
-    public final static short       ACTIVE_PANE_UPPER_LEFT         = 3;
-
-
-    public PaneRecord()
-    {
-
-    }
-
-    public PaneRecord(RecordInputStream in)
-    {
-        field_1_x                      = in.readShort();
-        field_2_y                      = in.readShort();
-        field_3_topRow                 = in.readShort();
-        field_4_leftColumn             = in.readShort();
-        field_5_activePane             = in.readShort();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PANE]\n");
-        buffer.append("    .x                    = ")
-            .append("0x").append(HexDump.toHex(  getX ()))
-            .append(" (").append( getX() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .y                    = ")
-            .append("0x").append(HexDump.toHex(  getY ()))
-            .append(" (").append( getY() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .topRow               = ")
-            .append("0x").append(HexDump.toHex(  getTopRow ()))
-            .append(" (").append( getTopRow() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .leftColumn           = ")
-            .append("0x").append(HexDump.toHex(  getLeftColumn ()))
-            .append(" (").append( getLeftColumn() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .activePane           = ")
-            .append("0x").append(HexDump.toHex(  getActivePane ()))
-            .append(" (").append( getActivePane() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/PANE]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_x);
-        out.writeShort(field_2_y);
-        out.writeShort(field_3_topRow);
-        out.writeShort(field_4_leftColumn);
-        out.writeShort(field_5_activePane);
-    }
-
-    @Override
-    protected int getDataSize() {
-        return 2 + 2 + 2 + 2 + 2;
-    }
-
-    @Override
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public Object clone() {
-        PaneRecord rec = new PaneRecord();
-    
-        rec.field_1_x = field_1_x;
-        rec.field_2_y = field_2_y;
-        rec.field_3_topRow = field_3_topRow;
-        rec.field_4_leftColumn = field_4_leftColumn;
-        rec.field_5_activePane = field_5_activePane;
-        return rec;
-    }
-
-    /**
-     * Get the x field for the Pane record.
-     * 
-     * @return the x value
-     */
-    public short getX()
-    {
-        return field_1_x;
-    }
-
-    /**
-     * Set the x field for the Pane record.
-     * 
-     * @param field_1_x the x value
-     */
-    public void setX(short field_1_x)
-    {
-        this.field_1_x = field_1_x;
-    }
-
-    /**
-     * Get the y field for the Pane record.
-     * 
-     * @return the y value
-     */
-    public short getY()
-    {
-        return field_2_y;
-    }
-
-    /**
-     * Set the y field for the Pane record.
-     * 
-     * @param field_2_y the y value
-     */
-    public void setY(short field_2_y)
-    {
-        this.field_2_y = field_2_y;
-    }
-
-    /**
-     * Get the top row field for the Pane record.
-     * 
-     * @return the top row
-     */
-    public short getTopRow()
-    {
-        return field_3_topRow;
-    }
-
-    /**
-     * Set the top row field for the Pane record.
-     * 
-     * @param field_3_topRow the top row
-     */
-    public void setTopRow(short field_3_topRow)
-    {
-        this.field_3_topRow = field_3_topRow;
-    }
-
-    /**
-     * Get the left column field for the Pane record.
-     * 
-     * @return the left column
-     */
-    public short getLeftColumn()
-    {
-        return field_4_leftColumn;
-    }
-
-    /**
-     * Set the left column field for the Pane record.
-     * 
-     * @param field_4_leftColumn the left column
-     */
-    public void setLeftColumn(short field_4_leftColumn)
-    {
-        this.field_4_leftColumn = field_4_leftColumn;
-    }
-
-    /**
-     * Get the active pane field for the Pane record.
-     *
-     * @return  One of 
-     *        ACTIVE_PANE_LOWER_RIGHT
-     *        ACTIVE_PANE_UPPER_RIGHT
-     *        ACTIVE_PANE_LOWER_LEFT
-     *        ACTIVE_PANE_UPPER_LEFT
-     */
-    public short getActivePane()
-    {
-        return field_5_activePane;
-    }
-
-    /**
-     * Set the active pane field for the Pane record.
-     *
-     * @param field_5_activePane
-     *        One of 
-     *        ACTIVE_PANE_LOWER_RIGHT
-     *        ACTIVE_PANE_UPPER_RIGHT
-     *        ACTIVE_PANE_LOWER_LEFT
-     *        ACTIVE_PANE_UPPER_LEFT
-     */
-    public void setActivePane(short field_5_activePane)
-    {
-        this.field_5_activePane = field_5_activePane;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java
deleted file mode 100644
index c80e8c8..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Password Record (0x0013)<p>
- * Description:  stores the encrypted password for a sheet or workbook (HSSF doesn't support encryption)
- * REFERENCE:  PG 371 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class PasswordRecord extends StandardRecord {
-    public final static short sid = 0x0013;
-    private int field_1_password;   // not sure why this is only 2 bytes, but it is... go figure
-
-    public PasswordRecord(int password) {
-        field_1_password = password;
-    }
-
-    public PasswordRecord(RecordInputStream in) {
-        field_1_password = in.readShort();
-    }
-
-    /**
-     * set the password
-     *
-     * @param password  representing the password
-     */
-
-    public void setPassword(int password) {
-        field_1_password = password;
-    }
-
-    /**
-     * get the password
-     *
-     * @return short  representing the password
-     */
-    public int getPassword() {
-        return field_1_password;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PASSWORD]\n");
-        buffer.append("    .password = ").append(HexDump.shortToHex(field_1_password)).append("\n");
-        buffer.append("[/PASSWORD]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_password);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * Clone this record.
-     */
-    public Object clone() {
-        return new PasswordRecord(field_1_password);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java b/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java
deleted file mode 100644
index 16ef49a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Protection Revision 4 password Record (0x01BC)<p>
- * Description:  Stores the (2 byte??!!) encrypted password for a shared workbook<p>
- * REFERENCE:  PG 374 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class PasswordRev4Record extends StandardRecord {
-    public final static short sid = 0x01BC;
-    private int field_1_password;
-
-    public PasswordRev4Record(int pw) {
-        field_1_password = pw;
-    }
-
-    public PasswordRev4Record(RecordInputStream in) {
-        field_1_password = in.readShort();
-    }
-
-    /**
-     * set the password
-     *
-     * @param pw  representing the password
-     */
-    public void setPassword(short pw) {
-        field_1_password = pw;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PROT4REVPASSWORD]\n");
-        buffer.append("    .password = ").append(HexDump.shortToHex(field_1_password)).append("\n");
-        buffer.append("[/PROT4REVPASSWORD]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_password);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
deleted file mode 100644
index 0dede18..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Precision Record<P>
- * Description:  defines whether to store with full precision or what's displayed by the gui
- *               (meaning have really screwed up and skewed figures or only think you do!)<P>
- * REFERENCE:  PG 372 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @version 2.0-pre
- */
-
-public final class PrecisionRecord
-    extends StandardRecord
-{
-    public final static short sid = 0xE;
-    public short              field_1_precision;
-
-    public PrecisionRecord()
-    {
-    }
-
-    public PrecisionRecord(RecordInputStream in)
-    {
-        field_1_precision = in.readShort();
-    }
-
-    /**
-     * set whether to use full precision or just skew all you figures all to hell.
-     *
-     * @param fullprecision - or not
-     */
-
-    public void setFullPrecision(boolean fullprecision)
-    {
-        if (fullprecision == true)
-        {
-            field_1_precision = 1;
-        }
-        else
-        {
-            field_1_precision = 0;
-        }
-    }
-
-    /**
-     * get whether to use full precision or just skew all you figures all to hell.
-     *
-     * @return fullprecision - or not
-     */
-
-    public boolean getFullPrecision()
-    {
-        return (field_1_precision == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PRECISION]\n");
-        buffer.append("    .precision       = ").append(getFullPrecision())
-            .append("\n");
-        buffer.append("[/PRECISION]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_precision);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
deleted file mode 100644
index b22e244..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
+++ /dev/null
@@ -1,106 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Print Gridlines Record<P>
- * Description:  whether to print the gridlines when you enjoy you spreadsheet on paper.<P>
- * REFERENCE:  PG 373 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class PrintGridlinesRecord
-    extends StandardRecord
-{
-    public final static short sid = 0x2b;
-    private short             field_1_print_gridlines;
-
-    public PrintGridlinesRecord()
-    {
-    }
-
-    public PrintGridlinesRecord(RecordInputStream in)
-    {
-        field_1_print_gridlines = in.readShort();
-    }
-
-    /**
-     * set whether or not to print the gridlines (and make your spreadsheet ugly)
-     *
-     * @param pg  make spreadsheet ugly - Y/N
-     */
-
-    public void setPrintGridlines(boolean pg)
-    {
-        if (pg == true)
-        {
-            field_1_print_gridlines = 1;
-        }
-        else
-        {
-            field_1_print_gridlines = 0;
-        }
-    }
-
-    /**
-     * get whether or not to print the gridlines (and make your spreadsheet ugly)
-     *
-     * @return make spreadsheet ugly - Y/N
-     */
-
-    public boolean getPrintGridlines()
-    {
-        return (field_1_print_gridlines == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PRINTGRIDLINES]\n");
-        buffer.append("    .printgridlines = ").append(getPrintGridlines())
-            .append("\n");
-        buffer.append("[/PRINTGRIDLINES]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_print_gridlines);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      PrintGridlinesRecord rec = new PrintGridlinesRecord();
-      rec.field_1_print_gridlines = field_1_print_gridlines;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
deleted file mode 100644
index f2287ee..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
+++ /dev/null
@@ -1,105 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Print Headers Record<P>
- * Description:  Whether or not to print the row/column headers when you
- *               enjoy your spreadsheet in the physical form.<P>
- * REFERENCE:  PG 373 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class PrintHeadersRecord
-    extends StandardRecord
-{
-    public final static short sid = 0x2a;
-    private short             field_1_print_headers;
-
-    public PrintHeadersRecord()
-    {
-    }
-
-    public PrintHeadersRecord(RecordInputStream in)
-    {
-        field_1_print_headers = in.readShort();
-    }
-
-    /**
-     * set to print the headers - y/n
-     * @param p printheaders or not
-     */
-
-    public void setPrintHeaders(boolean p)
-    {
-        if (p == true)
-        {
-            field_1_print_headers = 1;
-        }
-        else
-        {
-            field_1_print_headers = 0;
-        }
-    }
-
-    /**
-     * get whether to print the headers - y/n
-     * @return printheaders or not
-     */
-
-    public boolean getPrintHeaders()
-    {
-        return (field_1_print_headers == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PRINTHEADERS]\n");
-        buffer.append("    .printheaders   = ").append(getPrintHeaders())
-            .append("\n");
-        buffer.append("[/PRINTHEADERS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_print_headers);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      PrintHeadersRecord rec = new PrintHeadersRecord();
-      rec.field_1_print_headers = field_1_print_headers;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java b/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
deleted file mode 100644
index 9ab4fe1..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.usermodel.PrintSetup;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-
-/**
- * Title:        PAGESETUP (0x00A1)<p>
- * Description:  Stores print setup options -- bogus for HSSF (and marked as such)<p>
- * REFERENCE:  PG 385 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<p>
- * REFERENCE:  PG 412 Microsoft Excel Binary File Format Structure v20091214
- * 
- * @since 2.0-pre
- */
-public final class PrintSetupRecord extends StandardRecord {
-    public final static short     sid = 0x00A1;
-    /** Constants for this are held in {@link PrintSetup} */
-    private short                 field_1_paper_size;
-    private short                 field_2_scale;
-    private short                 field_3_page_start;
-    private short                 field_4_fit_width;
-    private short                 field_5_fit_height;
-    private short                 field_6_options;
-    static final private BitField lefttoright   =
-        BitFieldFactory.getInstance(0x01);   // print over then down
-    static final private BitField landscape     =
-        BitFieldFactory.getInstance(0x02);   // landscape mode
-    static final private BitField validsettings = BitFieldFactory.getInstance(
-        0x04);                // if papersize, scale, resolution, copies, landscape
-
-    // weren't obtained from the print consider them
-    // mere bunk
-    static final private BitField nocolor       =
-        BitFieldFactory.getInstance(0x08);   // print mono/b&w, colorless
-    static final private BitField draft         =
-        BitFieldFactory.getInstance(0x10);   // print draft quality
-    static final private BitField notes         =
-        BitFieldFactory.getInstance(0x20);   // print the notes
-    static final private BitField noOrientation =
-        BitFieldFactory.getInstance(0x40);   // the orientation is not set
-    static final private BitField usepage       =
-        BitFieldFactory.getInstance(0x80);   // use a user set page no, instead of auto
-    private short                 field_7_hresolution;
-    private short                 field_8_vresolution;
-    private double                field_9_headermargin;
-    private double                field_10_footermargin;
-    private short                 field_11_copies;
-
-    public PrintSetupRecord()
-    {
-    }
-
-    public PrintSetupRecord(RecordInputStream in)
-    {
-        field_1_paper_size    = in.readShort();
-        field_2_scale         = in.readShort();
-        field_3_page_start    = in.readShort();
-        field_4_fit_width     = in.readShort();
-        field_5_fit_height    = in.readShort();
-        field_6_options       = in.readShort();
-        field_7_hresolution   = in.readShort();
-        field_8_vresolution   = in.readShort();
-        field_9_headermargin  = in.readDouble();
-        field_10_footermargin = in.readDouble();
-        field_11_copies       = in.readShort();
-    }
-
-    public void setPaperSize(short size)
-    {
-        field_1_paper_size = size;
-    }
-
-    public void setScale(short scale)
-    {
-        field_2_scale = scale;
-    }
-
-    public void setPageStart(short start)
-    {
-        field_3_page_start = start;
-    }
-
-    public void setFitWidth(short width)
-    {
-        field_4_fit_width = width;
-    }
-
-    public void setFitHeight(short height)
-    {
-        field_5_fit_height = height;
-    }
-
-    public void setOptions(short options)
-    {
-        field_6_options = options;
-    }
-
-    // option bitfields
-    public void setLeftToRight(boolean ltor)
-    {
-        field_6_options = lefttoright.setShortBoolean(field_6_options, ltor);
-    }
-
-    public void setLandscape(boolean ls)
-    {
-        field_6_options = landscape.setShortBoolean(field_6_options, ls);
-    }
-
-    public void setValidSettings(boolean valid)
-    {
-        field_6_options = validsettings.setShortBoolean(field_6_options, valid);
-    }
-
-    public void setNoColor(boolean mono)
-    {
-        field_6_options = nocolor.setShortBoolean(field_6_options, mono);
-    }
-
-    public void setDraft(boolean d)
-    {
-        field_6_options = draft.setShortBoolean(field_6_options, d);
-    }
-
-    public void setNotes(boolean printnotes)
-    {
-        field_6_options = notes.setShortBoolean(field_6_options, printnotes);
-    }
-
-    public void setNoOrientation(boolean orientation)
-    {
-        field_6_options = noOrientation.setShortBoolean(field_6_options, orientation);
-    }
-
-    public void setUsePage(boolean page)
-    {
-        field_6_options = usepage.setShortBoolean(field_6_options, page);
-    }
-
-    // end option bitfields
-    public void setHResolution(short resolution)
-    {
-        field_7_hresolution = resolution;
-    }
-
-    public void setVResolution(short resolution)
-    {
-        field_8_vresolution = resolution;
-    }
-
-    public void setHeaderMargin(double headermargin)
-    {
-        field_9_headermargin = headermargin;
-    }
-
-    public void setFooterMargin(double footermargin)
-    {
-        field_10_footermargin = footermargin;
-    }
-
-    public void setCopies(short copies)
-    {
-        field_11_copies = copies;
-    }
-
-    public short getPaperSize()
-    {
-        return field_1_paper_size;
-    }
-
-    public short getScale()
-    {
-        return field_2_scale;
-    }
-
-    public short getPageStart()
-    {
-        return field_3_page_start;
-    }
-
-    public short getFitWidth()
-    {
-        return field_4_fit_width;
-    }
-
-    public short getFitHeight()
-    {
-        return field_5_fit_height;
-    }
-
-    public short getOptions()
-    {
-        return field_6_options;
-    }
-
-    // option bitfields
-    public boolean getLeftToRight()
-    {
-        return lefttoright.isSet(field_6_options);
-    }
-
-    public boolean getLandscape()
-    {
-        return landscape.isSet(field_6_options);
-    }
-
-    public boolean getValidSettings()
-    {
-        return validsettings.isSet(field_6_options);
-    }
-
-    public boolean getNoColor()
-    {
-        return nocolor.isSet(field_6_options);
-    }
-
-    public boolean getDraft()
-    {
-        return draft.isSet(field_6_options);
-    }
-
-    public boolean getNotes()
-    {
-        return notes.isSet(field_6_options);
-    }
-
-    public boolean getNoOrientation()
-    {
-        return noOrientation.isSet(field_6_options);
-    }
-
-    public boolean getUsePage()
-    {
-        return usepage.isSet(field_6_options);
-    }
-
-    // end option bitfields
-    public short getHResolution()
-    {
-        return field_7_hresolution;
-    }
-
-    public short getVResolution()
-    {
-        return field_8_vresolution;
-    }
-
-    public double getHeaderMargin()
-    {
-        return field_9_headermargin;
-    }
-
-    public double getFooterMargin()
-    {
-        return field_10_footermargin;
-    }
-
-    public short getCopies()
-    {
-        return field_11_copies;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PRINTSETUP]\n");
-        buffer.append("    .papersize      = ").append(getPaperSize())
-            .append("\n");
-        buffer.append("    .scale          = ").append(getScale())
-            .append("\n");
-        buffer.append("    .pagestart      = ").append(getPageStart())
-            .append("\n");
-        buffer.append("    .fitwidth       = ").append(getFitWidth())
-            .append("\n");
-        buffer.append("    .fitheight      = ").append(getFitHeight())
-            .append("\n");
-        buffer.append("    .options        = ").append(getOptions())
-            .append("\n");
-        buffer.append("        .ltor       = ").append(getLeftToRight())
-            .append("\n");
-        buffer.append("        .landscape  = ").append(getLandscape())
-            .append("\n");
-        buffer.append("        .valid      = ").append(getValidSettings())
-            .append("\n");
-        buffer.append("        .mono       = ").append(getNoColor())
-            .append("\n");
-        buffer.append("        .draft      = ").append(getDraft())
-            .append("\n");
-        buffer.append("        .notes      = ").append(getNotes())
-            .append("\n");
-        buffer.append("        .noOrientat = ").append(getNoOrientation())
-            .append("\n");
-        buffer.append("        .usepage    = ").append(getUsePage())
-            .append("\n");
-        buffer.append("    .hresolution    = ").append(getHResolution())
-            .append("\n");
-        buffer.append("    .vresolution    = ").append(getVResolution())
-            .append("\n");
-        buffer.append("    .headermargin   = ").append(getHeaderMargin())
-            .append("\n");
-        buffer.append("    .footermargin   = ").append(getFooterMargin())
-            .append("\n");
-        buffer.append("    .copies         = ").append(getCopies())
-            .append("\n");
-        buffer.append("[/PRINTSETUP]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getPaperSize());
-        out.writeShort(getScale());
-        out.writeShort(getPageStart());
-        out.writeShort(getFitWidth());
-        out.writeShort(getFitHeight());
-        out.writeShort(getOptions());
-        out.writeShort(getHResolution());
-        out.writeShort(getVResolution());
-        out.writeDouble(getHeaderMargin());
-        out.writeDouble(getFooterMargin());
-        out.writeShort(getCopies());
-    }
-
-    protected int getDataSize() {
-        return 34;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      PrintSetupRecord rec = new PrintSetupRecord();
-      rec.field_1_paper_size = field_1_paper_size;
-      rec.field_2_scale = field_2_scale;
-      rec.field_3_page_start = field_3_page_start;
-      rec.field_4_fit_width = field_4_fit_width;
-      rec.field_5_fit_height = field_5_fit_height;
-      rec.field_6_options = field_6_options;
-      rec.field_7_hresolution = field_7_hresolution;
-      rec.field_8_vresolution = field_8_vresolution;
-      rec.field_9_headermargin = field_9_headermargin;
-      rec.field_10_footermargin = field_10_footermargin;
-      rec.field_11_copies = field_11_copies;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java
deleted file mode 100644
index dca418e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Protect Record (0x0012)<p>
- * Description:  defines whether a sheet or workbook is protected (HSSF DOES NOT SUPPORT ENCRYPTION)<p>
- * HSSF now supports the simple "protected" sheets (where they are not encrypted and open office et al
- * ignore the password record entirely).
- * REFERENCE:  PG 373 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class ProtectRecord extends StandardRecord {
-    public final static short sid = 0x0012;
-
-    private static final BitField protectFlag = BitFieldFactory.getInstance(0x0001);
-
-    private int _options;
-
-    private ProtectRecord(int options) {
-        _options = options;
-    }
-
-    public ProtectRecord(boolean isProtected) {
-        this(0);
-        setProtect(isProtected);
-    }
-
-    public ProtectRecord(RecordInputStream in) {
-        this(in.readShort());
-    }
-
-    /**
-     * set whether the sheet is protected or not
-     * @param protect whether to protect the sheet or not
-     */
-    public void setProtect(boolean protect) {
-        _options = protectFlag.setBoolean(_options, protect);
-    }
-
-    /**
-     * get whether the sheet is protected or not
-     * @return whether to protect the sheet or not
-     */
-    public boolean getProtect() {
-        return protectFlag.isSet(_options);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PROTECT]\n");
-        buffer.append("    .options = ").append(HexDump.shortToHex(_options)).append("\n");
-        buffer.append("[/PROTECT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_options);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public Object clone() {
-        return new ProtectRecord(_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java b/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
deleted file mode 100644
index 6a9ca30..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Protection Revision 4 Record (0x01AF)<p>
- * Description:  describes whether this is a protected shared/tracked workbook<p>
- * REFERENCE:  PG 373 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class ProtectionRev4Record extends StandardRecord {
-    public final static short sid = 0x01AF;
-
-    private static final BitField protectedFlag = BitFieldFactory.getInstance(0x0001);
-
-    private int _options;
-
-    private ProtectionRev4Record(int options) {
-        _options = options;
-    }
-
-    public ProtectionRev4Record(boolean protect) {
-        this(0);
-        setProtect(protect);
-    }
-
-    public ProtectionRev4Record(RecordInputStream in) {
-        this(in.readUShort());
-    }
-
-    /**
-     * set whether the this is protected shared/tracked workbook or not
-     * @param protect  whether to protect the workbook or not
-     */
-    public void setProtect(boolean protect) {
-        _options = protectedFlag.setBoolean(_options, protect);
-    }
-
-    /**
-     * get whether the this is protected shared/tracked workbook or not
-     * @return whether to protect the workbook or not
-     */
-    public boolean getProtect() {
-        return protectedFlag.isSet(_options);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PROT4REV]\n");
-        buffer.append("    .options = ").append(HexDump.shortToHex(_options)).append("\n");
-        buffer.append("[/PROT4REV]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_options);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java b/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java
deleted file mode 100644
index 3aac08d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.util.RKUtil;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        RK Record (0x027E)<p>
- * Description:  An internal 32 bit number with the two most significant bits
- *               storing the type.  This is part of a bizarre scheme to save disk
- *               space and memory (gee look at all the other whole records that
- *               are in the file just "cause"..,far better to waste processor
- *               cycles on this then leave on of those "valuable" records out).<p>
- * We support this in READ-ONLY mode.  HSSF converts these to NUMBER records<p>
- *
- * REFERENCE:  PG 376 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- * 
- * @see org.apache.poi.hssf.record.NumberRecord
- */
-public final class RKRecord extends CellRecord {
-    public final static short sid                      = 0x027E;
-    public final static short RK_IEEE_NUMBER           = 0;
-    public final static short RK_IEEE_NUMBER_TIMES_100 = 1;
-    public final static short RK_INTEGER               = 2;
-    public final static short RK_INTEGER_TIMES_100     = 3;
-    private int field_4_rk_number;
-
-    private RKRecord() {
-    	// fields uninitialised
-    }
-
-    public RKRecord(RecordInputStream in) {
-        super(in);
-        field_4_rk_number = in.readInt();
-    }
-
-    /**
-     * Extract the value of the number
-     * <P>
-     * The mechanism for determining the value is dependent on the two
-     * low order bits of the raw number. If bit 1 is set, the number
-     * is an integer and can be cast directly as a double, otherwise,
-     * it's apparently the exponent and mantissa of a double (and the
-     * remaining low-order bits of the double's mantissa are 0's).
-     * <P>
-     * If bit 0 is set, the result of the conversion to a double is
-     * divided by 100; otherwise, the value is left alone.
-     * <P>
-     * [insert picture of Screwy Squirrel in full Napoleonic regalia]
-     *
-     * @return the value as a proper double (hey, it <B>could</B>
-     *         happen)
-     */
-    public double getRKNumber() {
-        return RKUtil.decodeNumber(field_4_rk_number);
-    }
-
-    @Override
-    protected String getRecordName() {
-    	return "RK";
-    }
-
-    @Override
-    protected void appendValueText(StringBuilder sb) {
-    	sb.append("  .value= ").append(getRKNumber());
-    }
-
-    @Override
-    protected void serializeValue(LittleEndianOutput out) {
-    	out.writeInt(field_4_rk_number);
-    }
-
-    @Override
-    protected int getValueDataSize() {
-    	return 4;
-    }
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public Object clone() {
-      RKRecord rec = new RKRecord();
-      copyBaseFields(rec);
-      rec.field_4_rk_number = field_4_rk_number;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java b/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java
deleted file mode 100644
index e890b43..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Recalc Id Record (0x01C1)<p>
- * Description:  This record contains an ID that marks when a worksheet was last
- *               recalculated. It's an optimization Excel uses to determine if it
- *               needs to  recalculate the spreadsheet when it's opened. So far, only
- *               the two engine ids {@code 0x80 0x38 0x01 0x00}
- *               and {@code 0x60 0x69 0x01 0x00} have been seen.
- *               A value of {@code 0x00} will cause Excel to recalculate
- *               all formulas on the next load.<p>
- * REFERENCE:  http://chicago.sourceforge.net/devel/docs/excel/biff8.html
- */
-public final class RecalcIdRecord extends StandardRecord {
-    public final static short sid = 0x01C1;
-    private final int _reserved0;
-
-    /**
-     * An unsigned integer that specifies the recalculation engine identifier
-     * of the recalculation engine that performed the last recalculation.
-     * If the value is less than the recalculation engine identifier associated with the application,
-     * the application will recalculate the results of all formulas on
-     * this workbook immediately after loading the file
-     */
-    private int _engineId;
-
-    public RecalcIdRecord() {
-        _reserved0 = 0;
-        _engineId = 0;
-    }
-
-    public RecalcIdRecord(RecordInputStream in) {
-    	in.readUShort(); // field 'rt' should have value 0x01C1, but Excel doesn't care during reading
-    	_reserved0 = in.readUShort();
-    	_engineId = in.readInt();
-    }
-
-    public boolean isNeeded() {
-        return true;
-    }
-
-    public void setEngineId(int val) {
-        _engineId = val;
-    }
-
-    public int getEngineId() {
-        return _engineId;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[RECALCID]\n");
-        buffer.append("    .reserved = ").append(HexDump.shortToHex(_reserved0)).append("\n");
-        buffer.append("    .engineId = ").append(HexDump.intToHex(_engineId)).append("\n");
-        buffer.append("[/RECALCID]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(sid); // always write 'rt' field as 0x01C1
-        out.writeShort(_reserved0);
-        out.writeInt(_engineId);
-    }
-
-    protected int getDataSize() {
-        return 8;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/Record.java b/trunk/src/java/org/apache/poi/hssf/record/Record.java
deleted file mode 100644
index 60ba7cd..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/Record.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayInputStream;
-
-/**
- * All HSSF Records inherit from this class.
- */
-public abstract class Record extends RecordBase {
-
-    protected Record() {
-        // no fields to initialise
-    }
-
-    /**
-     * 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
-     */
-    public final byte[] serialize() {
-        byte[] retval = new byte[ getRecordSize() ];
-
-        serialize(0, retval);
-        return retval;
-    }
-
-    /**
-     * get a string representation of the record (for biffview/debugging)
-     */
-    @Override
-    public String toString() {
-        return super.toString();
-    }
-
-    /**
-     * return the non static version of the id for this record.
-     * 
-     * @return he id for this record
-     */
-    public abstract short getSid();
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        throw new CloneNotSupportedException("The class "+getClass().getName()+" needs to define a clone method");
-    }
-
-    /**
-     * Clone the current record, via a call to serialize
-     *  it, and another to create a new record from the
-     *  bytes.
-     * May only be used for classes which don't have
-     *  internal counts / ids in them. For those which
-     *  do, a full model-aware cloning is needed, which
-     *  allocates new ids / counts as needed.
-     * 
-     * @return the cloned current record
-     */
-    public Record cloneViaReserialise() {
-        // Do it via a re-serialization
-        // It's a cheat, but it works...
-        byte[] b = serialize();
-        RecordInputStream rinp = new RecordInputStream(new ByteArrayInputStream(b));
-        rinp.nextRecord();
-
-        Record[] r = RecordFactory.createRecord(rinp);
-        if(r.length != 1) {
-            throw new IllegalStateException("Re-serialised a record to clone it, but got " + r.length + " records back!");
-        }
-        return r[0];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RecordBase.java b/trunk/src/java/org/apache/poi/hssf/record/RecordBase.java
deleted file mode 100644
index d19d271..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RecordBase.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-/**
- * Common base class of {@link Record} and {@link org.apache.poi.hssf.record.aggregates.RecordAggregate}
- */
-public abstract class RecordBase {
-	/**
-	 * 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.
-	 * 
-	 * @param offset to begin writing at
-	 * @param data byte array containing instance data
-	 * @return number of bytes written
-	 */
-	public abstract int serialize(int offset, byte[] data);
-
-	/**
-	 * gives the current serialized size of the record. Should include the sid
-	 * and reclength (4 bytes).
-	 * 
-	 * @return the record size
-	 */
-	public abstract int getRecordSize();
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java b/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java
deleted file mode 100644
index 2336999..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.record.chart.BeginRecord;
-import org.apache.poi.hssf.record.chart.CatLabRecord;
-import org.apache.poi.hssf.record.chart.ChartEndBlockRecord;
-import org.apache.poi.hssf.record.chart.ChartEndObjectRecord;
-import org.apache.poi.hssf.record.chart.ChartFRTInfoRecord;
-import org.apache.poi.hssf.record.chart.ChartRecord;
-import org.apache.poi.hssf.record.chart.ChartStartBlockRecord;
-import org.apache.poi.hssf.record.chart.ChartStartObjectRecord;
-import org.apache.poi.hssf.record.chart.ChartTitleFormatRecord;
-import org.apache.poi.hssf.record.chart.DataFormatRecord;
-import org.apache.poi.hssf.record.chart.EndRecord;
-import org.apache.poi.hssf.record.chart.LegendRecord;
-import org.apache.poi.hssf.record.chart.LinkedDataRecord;
-import org.apache.poi.hssf.record.chart.SeriesRecord;
-import org.apache.poi.hssf.record.chart.SeriesTextRecord;
-import org.apache.poi.hssf.record.chart.SeriesToChartGroupRecord;
-import org.apache.poi.hssf.record.chart.ValueRangeRecord;
-import org.apache.poi.hssf.record.pivottable.DataItemRecord;
-import org.apache.poi.hssf.record.pivottable.ExtendedPivotTableViewFieldsRecord;
-import org.apache.poi.hssf.record.pivottable.PageItemRecord;
-import org.apache.poi.hssf.record.pivottable.StreamIDRecord;
-import org.apache.poi.hssf.record.pivottable.ViewDefinitionRecord;
-import org.apache.poi.hssf.record.pivottable.ViewFieldsRecord;
-import org.apache.poi.hssf.record.pivottable.ViewSourceRecord;
-
-/**
- * Title:  Record Factory<p>
- * Description:  Takes a stream and outputs an array of Record objects.
- *
- * @see org.apache.poi.hssf.eventmodel.EventRecordFactory
- */
-public final class RecordFactory {
-    private static final int NUM_RECORDS = 512;
-
-    private interface I_RecordCreator {
-        Record create(RecordInputStream in);
-
-        Class<? extends Record> getRecordClass();
-    }
-    private static final class ReflectionConstructorRecordCreator implements I_RecordCreator {
-
-        private final Constructor<? extends Record> _c;
-        public ReflectionConstructorRecordCreator(Constructor<? extends Record> c) {
-            _c = c;
-        }
-        @Override
-        public Record create(RecordInputStream in) {
-            Object[] args = { in, };
-            try {
-                return _c.newInstance(args);
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(e);
-            } catch (InstantiationException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            } catch (InvocationTargetException e) {
-                Throwable t = e.getTargetException();
-                if (t instanceof org.apache.poi.util.RecordFormatException) {
-                    throw (org.apache.poi.util.RecordFormatException)t;
-                } else if (t instanceof EncryptedDocumentException) {
-                    throw (EncryptedDocumentException)t;
-                } else {
-                    throw new org.apache.poi.util.RecordFormatException("Unable to construct record instance" , t);
-                }
-            }
-        }
-        @Override
-        public Class<? extends Record> getRecordClass() {
-            return _c.getDeclaringClass();
-        }
-    }
-    /**
-     * A "create" method is used instead of the usual constructor if the created record might
-     * be of a different class to the declaring class.
-     */
-    private static final class ReflectionMethodRecordCreator implements I_RecordCreator {
-        private final Method _m;
-        public ReflectionMethodRecordCreator(Method m) {
-            _m = m;
-        }
-        @Override
-        public Record create(RecordInputStream in) {
-            Object[] args = { in, };
-            try {
-                return (Record) _m.invoke(null, args);
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            } catch (InvocationTargetException e) {
-                throw new org.apache.poi.util.RecordFormatException("Unable to construct record instance" , e.getTargetException());
-            }
-        }
-        @Override
-        @SuppressWarnings("unchecked")
-        public Class<? extends Record> getRecordClass() {
-            return (Class<? extends Record>) _m.getDeclaringClass();
-        }
-    }
-
-    private static final Class<?>[] CONSTRUCTOR_ARGS = { RecordInputStream.class, };
-
-    /**
-     * contains the classes for all the records we want to parse.<br/>
-     * Note - this most but not *every* subclass of Record.
-     */
-    @SuppressWarnings("unchecked")
-    private static final Class<? extends Record>[] recordClasses = new Class[] {
-        ArrayRecord.class,
-        AutoFilterInfoRecord.class,
-        BackupRecord.class,
-        BlankRecord.class,
-        BOFRecord.class,
-        BookBoolRecord.class,
-        BoolErrRecord.class,
-        BottomMarginRecord.class,
-        BoundSheetRecord.class,
-        CalcCountRecord.class,
-        CalcModeRecord.class,
-        CFHeaderRecord.class,
-        CFHeader12Record.class,
-        CFRuleRecord.class,
-        CFRule12Record.class,
-        ChartRecord.class,
-        ChartTitleFormatRecord.class,
-        CodepageRecord.class,
-        ColumnInfoRecord.class,
-        ContinueRecord.class,
-        CountryRecord.class,
-        CRNCountRecord.class,
-        CRNRecord.class,
-        DateWindow1904Record.class,
-        DBCellRecord.class,
-        DConRefRecord.class,
-        DefaultColWidthRecord.class,
-        DefaultRowHeightRecord.class,
-        DeltaRecord.class,
-        DimensionsRecord.class,
-        DrawingGroupRecord.class,
-        DrawingRecord.class,
-        DrawingSelectionRecord.class,
-        DSFRecord.class,
-        DVALRecord.class,
-        DVRecord.class,
-        EOFRecord.class,
-        ExtendedFormatRecord.class,
-        ExternalNameRecord.class,
-        ExternSheetRecord.class,
-        ExtSSTRecord.class,
-        FeatRecord.class,
-        FeatHdrRecord.class,
-        FilePassRecord.class,
-        FileSharingRecord.class,
-        FnGroupCountRecord.class,
-        FontRecord.class,
-        FooterRecord.class,
-        FormatRecord.class,
-        FormulaRecord.class,
-        GridsetRecord.class,
-        GutsRecord.class,
-        HCenterRecord.class,
-        HeaderRecord.class,
-        HeaderFooterRecord.class,
-        HideObjRecord.class,
-        HorizontalPageBreakRecord.class,
-        HyperlinkRecord.class,
-        IndexRecord.class,
-        InterfaceEndRecord.class,
-        InterfaceHdrRecord.class,
-        IterationRecord.class,
-        LabelRecord.class,
-        LabelSSTRecord.class,
-        LeftMarginRecord.class,
-        LegendRecord.class,
-        MergeCellsRecord.class,
-        MMSRecord.class,
-        MulBlankRecord.class,
-        MulRKRecord.class,
-        NameRecord.class,
-        NameCommentRecord.class,
-        NoteRecord.class,
-        NumberRecord.class,
-        ObjectProtectRecord.class,
-        ObjRecord.class,
-        PaletteRecord.class,
-        PaneRecord.class,
-        PasswordRecord.class,
-        PasswordRev4Record.class,
-        PrecisionRecord.class,
-        PrintGridlinesRecord.class,
-        PrintHeadersRecord.class,
-        PrintSetupRecord.class,
-        ProtectionRev4Record.class,
-        ProtectRecord.class,
-        RecalcIdRecord.class,
-        RefModeRecord.class,
-        RefreshAllRecord.class,
-        RightMarginRecord.class,
-        RKRecord.class,
-        RowRecord.class,
-        SaveRecalcRecord.class,
-        ScenarioProtectRecord.class,
-        SelectionRecord.class,
-        SeriesRecord.class,
-        SeriesTextRecord.class,
-        SharedFormulaRecord.class,
-        SSTRecord.class,
-        StringRecord.class,
-        StyleRecord.class,
-        SupBookRecord.class,
-        TabIdRecord.class,
-        TableRecord.class,
-        TableStylesRecord.class,
-        TextObjectRecord.class,
-        TopMarginRecord.class,
-        UncalcedRecord.class,
-        UseSelFSRecord.class,
-        UserSViewBegin.class,
-        UserSViewEnd.class,
-        ValueRangeRecord.class,
-        VCenterRecord.class,
-        VerticalPageBreakRecord.class,
-        WindowOneRecord.class,
-        WindowProtectRecord.class,
-        WindowTwoRecord.class,
-        WriteAccessRecord.class,
-        WriteProtectRecord.class,
-        WSBoolRecord.class,
-
-        // chart records
-        BeginRecord.class,
-        ChartFRTInfoRecord.class,
-        ChartStartBlockRecord.class,
-        ChartEndBlockRecord.class,
-        // TODO ChartFormatRecord.class,
-        ChartStartObjectRecord.class,
-        ChartEndObjectRecord.class,
-        CatLabRecord.class,
-        DataFormatRecord.class,
-        EndRecord.class,
-        LinkedDataRecord.class,
-        SeriesToChartGroupRecord.class,
-
-        // pivot table records
-        DataItemRecord.class,
-        ExtendedPivotTableViewFieldsRecord.class,
-        PageItemRecord.class,
-        StreamIDRecord.class,
-        ViewDefinitionRecord.class,
-        ViewFieldsRecord.class,
-        ViewSourceRecord.class,
-    };
-
-    /**
-     * cache of the recordsToMap();
-     */
-    private static final Map<Integer, I_RecordCreator> _recordCreatorsById  = recordsToMap(recordClasses);
-
-    private static short[] _allKnownRecordSIDs;
-
-    /**
-     * Debug / diagnosis method<p>
-     *
-     * Gets the POI implementation class for a given {@code sid}.  Only a subset of the BIFF
-     * records are actually interpreted by POI.  A few others are known but not interpreted
-     * (see {@link UnknownRecord#getBiffName(int)}).
-     *
-     * @param sid the record sid
-     *
-     * @return the POI implementation class for the specified record {@code sid}.
-     * {@code null} if the specified record is not interpreted by POI.
-     */
-    public static Class<? extends Record> getRecordClass(int sid) {
-        I_RecordCreator rc = _recordCreatorsById.get(Integer.valueOf(sid));
-        if (rc == null) {
-            return null;
-        }
-        return rc.getRecordClass();
-    }
-
-    /**
-     * create a record, if there are MUL records than multiple records
-     * are returned digested into the non-mul form.
-     *
-     * @param in the RecordInputStream to read from
-     * @return the extracted records
-     */
-    public static Record [] createRecord(RecordInputStream in) {
-        Record record = createSingleRecord(in);
-        if (record instanceof DBCellRecord) {
-            // Not needed by POI.  Regenerated from scratch by POI when spreadsheet is written
-            return new Record[] { null, };
-        }
-        if (record instanceof RKRecord) {
-            return new Record[] { convertToNumberRecord((RKRecord) record), };
-        }
-        if (record instanceof MulRKRecord) {
-            return convertRKRecords((MulRKRecord)record);
-        }
-        return new Record[] { record, };
-    }
-
-    public static Record createSingleRecord(RecordInputStream in) {
-        I_RecordCreator constructor = _recordCreatorsById.get(Integer.valueOf(in.getSid()));
-
-        if (constructor == null) {
-            return new UnknownRecord(in);
-        }
-
-        return constructor.create(in);
-    }
-
-    /**
-     * RK record is a slightly smaller alternative to NumberRecord
-     * POI likes NumberRecord better
-     *
-     * @param rk the RK record to convert
-     * @return the NumberRecord
-     */
-    public static NumberRecord convertToNumberRecord(RKRecord rk) {
-        NumberRecord num = new NumberRecord();
-
-        num.setColumn(rk.getColumn());
-        num.setRow(rk.getRow());
-        num.setXFIndex(rk.getXFIndex());
-        num.setValue(rk.getRKNumber());
-        return num;
-    }
-
-    /**
-     * Converts a {@link MulRKRecord} into an equivalent array of {@link NumberRecord NumberRecords}
-     *
-     * @param mrk the MulRKRecord to convert
-     * @return the equivalent array of {@link NumberRecord NumberRecords}
-     */
-    public static NumberRecord[] convertRKRecords(MulRKRecord mrk) {
-        NumberRecord[] mulRecs = new NumberRecord[mrk.getNumColumns()];
-        for (int k = 0; k < mrk.getNumColumns(); k++) {
-            NumberRecord nr = new NumberRecord();
-
-            nr.setColumn((short) (k + mrk.getFirstColumn()));
-            nr.setRow(mrk.getRow());
-            nr.setXFIndex(mrk.getXFAt(k));
-            nr.setValue(mrk.getRKNumberAt(k));
-            mulRecs[k] = nr;
-        }
-        return mulRecs;
-    }
-
-    /**
-     * Converts a {@link MulBlankRecord} into an equivalent array of {@link BlankRecord BlankRecords}
-     *
-     * @param mbk the MulBlankRecord to convert
-     * @return the equivalent array of {@link BlankRecord BlankRecords}
-     */
-    public static BlankRecord[] convertBlankRecords(MulBlankRecord mbk) {
-        BlankRecord[] mulRecs = new BlankRecord[mbk.getNumColumns()];
-        for (int k = 0; k < mbk.getNumColumns(); k++) {
-            BlankRecord br = new BlankRecord();
-
-            br.setColumn((short) (k + mbk.getFirstColumn()));
-            br.setRow(mbk.getRow());
-            br.setXFIndex(mbk.getXFAt(k));
-            mulRecs[k] = br;
-        }
-        return mulRecs;
-    }
-
-    /**
-     * @return an array of all the SIDS for all known records
-     */
-    public static short[] getAllKnownRecordSIDs() {
-        if (_allKnownRecordSIDs == null) {
-            short[] results = new short[ _recordCreatorsById.size() ];
-            int i = 0;
-
-            for (Integer sid : _recordCreatorsById.keySet()) {
-                results[i++] = sid.shortValue();
-            }
-            Arrays.sort(results);
-            _allKnownRecordSIDs = results;
-        }
-
-        return _allKnownRecordSIDs.clone();
-    }
-
-    /**
-     * gets the record constructors and sticks them in the map by SID
-     * @return map of SIDs to short,short,byte[] constructors for Record classes
-     * most of org.apache.poi.hssf.record.*
-     */
-    private static Map<Integer, I_RecordCreator> recordsToMap(Class<? extends Record> [] records) {
-        Map<Integer, I_RecordCreator> result = new HashMap<Integer, I_RecordCreator>();
-        Set<Class<?>> uniqueRecClasses = new HashSet<Class<?>>(records.length * 3 / 2);
-
-        for (Class<? extends Record> recClass : records) {
-            if(!Record.class.isAssignableFrom(recClass)) {
-                throw new RuntimeException("Invalid record sub-class (" + recClass.getName() + ")");
-            }
-            if(Modifier.isAbstract(recClass.getModifiers())) {
-                throw new RuntimeException("Invalid record class (" + recClass.getName() + ") - must not be abstract");
-            }
-            if(!uniqueRecClasses.add(recClass)) {
-                throw new RuntimeException("duplicate record class (" + recClass.getName() + ")");
-            }
-
-            int sid;
-            try {
-                sid = recClass.getField("sid").getShort(null);
-            } catch (Exception illegalArgumentException) {
-                throw new org.apache.poi.util.RecordFormatException(
-                        "Unable to determine record types");
-            }
-            Integer key = Integer.valueOf(sid);
-            if (result.containsKey(key)) {
-                Class<?> prevClass = result.get(key).getRecordClass();
-                throw new RuntimeException("duplicate record sid 0x" +
-                        Integer.toHexString(sid).toUpperCase(Locale.ROOT)
-                        + " for classes (" + recClass.getName() + ") and ("
-                        + prevClass.getName() + ")");
-            }
-            result.put(key, getRecordCreator(recClass));
-        }
-        // result.put(Integer.valueOf(0x0406), result.get(Integer.valueOf(0x06)));
-        return result;
-    }
-
-    private static I_RecordCreator getRecordCreator(Class<? extends Record> recClass) {
-        try {
-            Constructor<? extends Record> constructor;
-            constructor = recClass.getConstructor(CONSTRUCTOR_ARGS);
-            return new ReflectionConstructorRecordCreator(constructor);
-        } catch (NoSuchMethodException e) {
-            // fall through and look for other construction methods
-        }
-        try {
-            Method m = recClass.getDeclaredMethod("create", CONSTRUCTOR_ARGS);
-            return new ReflectionMethodRecordCreator(m);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Failed to find constructor or create method for (" + recClass.getName() + ").");
-        }
-    }
-    /**
-     * Create an array of records from an input stream
-     *
-     * @param in the InputStream from which the records will be obtained
-     *
-     * @return an array of Records created from the InputStream
-     *
-     * @exception org.apache.poi.util.RecordFormatException on error processing the InputStream
-     */
-    public static List<Record> createRecords(InputStream in) throws org.apache.poi.util.RecordFormatException {
-
-        List<Record> records = new ArrayList<Record>(NUM_RECORDS);
-
-        RecordFactoryInputStream recStream = new RecordFactoryInputStream(in, true);
-
-        Record record;
-        while ((record = recStream.nextRecord())!=null) {
-            records.add(record);
-        }
-
-        return records;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java b/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
deleted file mode 100644
index 2c5ba94..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.record;
-
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
-import org.apache.poi.hssf.eventusermodel.HSSFListener;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-
-/**
- * A stream based way to get at complete records, with
- * as low a memory footprint as possible.
- * This handles reading from a RecordInputStream, turning
- * the data into full records, processing continue records
- * etc.
- * Most users should use {@link HSSFEventFactory} /
- * {@link HSSFListener} and have new records pushed to
- * them, but this does allow for a "pull" style of coding.
- */
-public final class RecordFactoryInputStream {
-
-	/**
-	 * Keeps track of the sizes of the initial records up to and including {@link FilePassRecord}
-	 * Needed for protected files because each byte is encrypted with respect to its absolute
-	 * position from the start of the stream.
-	 */
-	private static final class StreamEncryptionInfo {
-		private final int _initialRecordsSize;
-		private final FilePassRecord _filePassRec;
-		private final Record _lastRecord;
-		private final boolean _hasBOFRecord;
-
-		public StreamEncryptionInfo(RecordInputStream rs, List<Record> outputRecs) {
-			Record rec;
-			rs.nextRecord();
-			int recSize = 4 + rs.remaining();
-			rec = RecordFactory.createSingleRecord(rs);
-			outputRecs.add(rec);
-			FilePassRecord fpr = null;
-			if (rec instanceof BOFRecord) {
-				_hasBOFRecord = true;
-				
-				// Fetch the next record, and see if it indicates whether
-				//  the document is encrypted or not
-				if (rs.hasNextRecord()) {
-					rs.nextRecord();
-					rec = RecordFactory.createSingleRecord(rs);
-					recSize += rec.getRecordSize();
-					outputRecs.add(rec);
-					
-					// Encrypted is normally BOF then FILEPASS
-					// May sometimes be BOF, WRITEPROTECT, FILEPASS
-					if (rec instanceof WriteProtectRecord && rs.hasNextRecord()) {
-	               rs.nextRecord();
-	               rec = RecordFactory.createSingleRecord(rs);
-	               recSize += rec.getRecordSize();
-	               outputRecs.add(rec);
-					}
-					
-					// If it's a FILEPASS, track it specifically
-					if (rec instanceof FilePassRecord) {
-						fpr = (FilePassRecord) rec;
-					}
-
-					// workbook not encrypted (typical case)
-					if (rec instanceof EOFRecord) {
-						// A workbook stream is never empty, so crash instead
-						// of trying to keep track of nesting level
-						throw new IllegalStateException("Nothing between BOF and EOF");
-					}
-				}
-			} else {
-				// Invalid in a normal workbook stream.
-				// However, some test cases work on sub-sections of
-				// the workbook stream that do not begin with BOF
-				_hasBOFRecord = false;
-			}
-			_initialRecordsSize = recSize;
-			_filePassRec = fpr;
-			_lastRecord = rec;
-		}
-
-		public RecordInputStream createDecryptingStream(InputStream original) {
-			FilePassRecord fpr = _filePassRec;
-			String userPassword = Biff8EncryptionKey.getCurrentUserPassword();
-			if (userPassword == null) {
-			    userPassword = Decryptor.DEFAULT_PASSWORD;
-			}
-
-			EncryptionInfo info = fpr.getEncryptionInfo();
-            try {
-                if (!info.getDecryptor().verifyPassword(userPassword)) {
-                    throw new EncryptedDocumentException(
-                            (Decryptor.DEFAULT_PASSWORD.equals(userPassword) ? "Default" : "Supplied")
-                            + " password is invalid for salt/verifier/verifierHash");
-                }
-            } catch (GeneralSecurityException e) {
-                throw new EncryptedDocumentException(e);
-            }
-
-			return new RecordInputStream(original, info, _initialRecordsSize);
-		}
-
-		public boolean hasEncryption() {
-			return _filePassRec != null;
-		}
-
-		/**
-		 * @return last record scanned while looking for encryption info.
-		 * This will typically be the first or second record read. Possibly <code>null</code>
-		 * if stream was empty
-		 */
-		public Record getLastRecord() {
-			return _lastRecord;
-		}
-
-		/**
-		 * <code>false</code> in some test cases
-		 */
-		public boolean hasBOFRecord() {
-			return _hasBOFRecord;
-		}
-	}
-
-
-	private final RecordInputStream _recStream;
-	private final boolean _shouldIncludeContinueRecords;
-
-	/**
-	 * Temporarily stores a group of {@link Record}s, for future return by {@link #nextRecord()}.
-	 * This is used at the start of the workbook stream, and also when the most recently read
-	 * underlying record is a {@link MulRKRecord}
-	 */
-	private Record[] _unreadRecordBuffer;
-
-	/**
-	 * used to help iterating over the unread records
-	 */
-	private int _unreadRecordIndex = -1;
-
-	/**
-	 * The most recent record that we gave to the user
-	 */
-	private Record _lastRecord = null;
-	/**
-	 * The most recent DrawingRecord seen
-	 */
-	private DrawingRecord _lastDrawingRecord = new DrawingRecord();
-
-	private int _bofDepth;
-
-	private boolean _lastRecordWasEOFLevelZero;
-
-
-	/**
-	 * @param in the InputStream to read from
-	 * 
-	 * @param shouldIncludeContinueRecords caller can pass <code>false</code> if loose
-	 * {@link ContinueRecord}s should be skipped (this is sometimes useful in event based
-	 * processing).
-	 */
-	public RecordFactoryInputStream(InputStream in, boolean shouldIncludeContinueRecords) {
-		RecordInputStream rs = new RecordInputStream(in);
-		List<Record> records = new ArrayList<Record>();
-		StreamEncryptionInfo sei = new StreamEncryptionInfo(rs, records);
-		if (sei.hasEncryption()) {
-			rs = sei.createDecryptingStream(in);
-		} else {
-			// typical case - non-encrypted stream
-		}
-
-		if (!records.isEmpty()) {
-			_unreadRecordBuffer = new Record[records.size()];
-			records.toArray(_unreadRecordBuffer);
-			_unreadRecordIndex =0;
-		}
-		_recStream = rs;
-		_shouldIncludeContinueRecords = shouldIncludeContinueRecords;
-		_lastRecord = sei.getLastRecord();
-
-		/*
-		* How to recognise end of stream?
-		* In the best case, the underlying input stream (in) ends just after the last EOF record
-		* Usually however, the stream is padded with an arbitrary byte count.  Excel and most apps
-		* reliably use zeros for padding and if this were always the case, this code could just
-		* skip all the (zero sized) records with sid==0.  However, bug 46987 shows a file with
-		* non-zero padding that is read OK by Excel (Excel also fixes the padding).
-		*
-		* So to properly detect the workbook end of stream, this code has to identify the last
-		* EOF record.  This is not so easy because the worbook bof+eof pair do not bracket the
-		* whole stream.  The worksheets follow the workbook, but it is not easy to tell how many
-		* sheet sub-streams should be present.  Hence we are looking for an EOF record that is not
-		* immediately followed by a BOF record.  One extra complication is that bof+eof sub-
-		* streams can be nested within worksheet streams and it's not clear in these cases what
-		* record might follow any EOF record.  So we also need to keep track of the bof/eof
-		* nesting level.
-		*/
-		_bofDepth = sei.hasBOFRecord() ? 1 : 0;
-		_lastRecordWasEOFLevelZero = false;
-	}
-
-	/**
-	 * @return the next (complete) record from the stream, or null if there are no more.
-	 */
-	public Record nextRecord() {
-		Record r;
-		r = getNextUnreadRecord();
-		if (r != null) {
-			// found an unread record
-			return r;
-		}
-		while (true) {
-			if (!_recStream.hasNextRecord()) {
-				// recStream is exhausted;
-				return null;
-			}
-
-			if (_lastRecordWasEOFLevelZero) {
-				// Potential place for ending the workbook stream
-				// Check that the next record is not BOFRecord(0x0809)
-				// Normally the input stream contains only zero padding after the last EOFRecord,
-				// but bug 46987 and 48068 suggests that the padding may be garbage.
-				// This code relies on the padding bytes not starting with BOFRecord.sid
-				if (_recStream.getNextSid() != BOFRecord.sid) {
-					return null;
-				}
-				// else - another sheet substream starting here
-			}
-
-            // step underlying RecordInputStream to the next record
-            _recStream.nextRecord();
-
-			r = readNextRecord();
-			if (r == null) {
-				// some record types may get skipped (e.g. DBCellRecord and ContinueRecord)
-				continue;
-			}
-			return r;
-		}
-	}
-
-	/**
-	 * @return the next {@link Record} from the multiple record group as expanded from
-	 * a recently read {@link MulRKRecord}. <code>null</code> if not present.
-	 */
-	private Record getNextUnreadRecord() {
-		if (_unreadRecordBuffer != null) {
-			int ix = _unreadRecordIndex;
-			if (ix < _unreadRecordBuffer.length) {
-				Record result = _unreadRecordBuffer[ix];
-				_unreadRecordIndex = ix + 1;
-				return result;
-			}
-			_unreadRecordIndex = -1;
-			_unreadRecordBuffer = null;
-		}
-		return null;
-	}
-
-	/**
-	 * @return the next available record, or <code>null</code> if
-	 * this pass didn't return a record that's
-	 * suitable for returning (eg was a continue record).
-	 */
-	private Record readNextRecord() {
-
-		Record record = RecordFactory.createSingleRecord(_recStream);
-		_lastRecordWasEOFLevelZero = false;
-
-		if (record instanceof BOFRecord) {
-			_bofDepth++;
-			return record;
-		}
-
-		if (record instanceof EOFRecord) {
-			_bofDepth--;
-			if (_bofDepth < 1) {
-				_lastRecordWasEOFLevelZero = true;
-			}
-
-			return record;
-		}
-
-		if (record instanceof DBCellRecord) {
-			// Not needed by POI.  Regenerated from scratch by POI when spreadsheet is written
-			return null;
-		}
-
-		if (record instanceof RKRecord) {
-			return RecordFactory.convertToNumberRecord((RKRecord) record);
-		}
-
-		if (record instanceof MulRKRecord) {
-			Record[] records = RecordFactory.convertRKRecords((MulRKRecord) record);
-
-			_unreadRecordBuffer = records;
-			_unreadRecordIndex = 1;
-			return records[0];
-		}
-
-		if (record.getSid() == DrawingGroupRecord.sid
-				&& _lastRecord instanceof DrawingGroupRecord) {
-			DrawingGroupRecord lastDGRecord = (DrawingGroupRecord) _lastRecord;
-			lastDGRecord.join((AbstractEscherHolderRecord) record);
-			return null;
-		}
-		if (record.getSid() == ContinueRecord.sid) {
-			ContinueRecord contRec = (ContinueRecord) record;
-
-			if (_lastRecord instanceof ObjRecord || _lastRecord instanceof TextObjectRecord) {
-				// Drawing records have a very strange continue behaviour.
-				//There can actually be OBJ records mixed between the continues.
-				_lastDrawingRecord.processContinueRecord(contRec.getData());
-				//we must remember the position of the continue record.
-				//in the serialization procedure the original structure of records must be preserved
-				if (_shouldIncludeContinueRecords) {
-					return record;
-				}
-				return null;
-			}
-			if (_lastRecord instanceof DrawingGroupRecord) {
-				((DrawingGroupRecord) _lastRecord).processContinueRecord(contRec.getData());
-				return null;
-			}
-			if (_lastRecord instanceof DrawingRecord) {
-//				((DrawingRecord) _lastRecord).appendContinueRecord(contRec.getData());
-				return contRec;
-			}
-			if (_lastRecord instanceof UnknownRecord) {
-				//Gracefully handle records that we don't know about,
-				//that happen to be continued
-				return record;
-			}
-			if (_lastRecord instanceof EOFRecord) {
-				// This is really odd, but excel still sometimes
-				//  outputs a file like this all the same
-				return record;
-			}
-			throw new RecordFormatException("Unhandled Continue Record followining " + _lastRecord.getClass());
-		}
-		_lastRecord = record;
-		if (record instanceof DrawingRecord) {
-			_lastDrawingRecord = (DrawingRecord) record;
-		}
-		return record;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java b/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java
deleted file mode 100644
index 63d05aa..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-/**
- * Used by records to indicate invalid format/data.<P>
- *
- * @deprecated as of 3.15-beta1, scheduled for removal in 3.17
- *      use the class with the same name from the utils-package
- */
-
-public class RecordFormatException
-    extends org.apache.poi.util.RecordFormatException
-{
-    public RecordFormatException(String exception)
-    {
-        super(exception);
-    }
-    
-    public RecordFormatException(String exception, Throwable thr) {
-      super(exception, thr);
-    }
-    
-    public RecordFormatException(Throwable thr) {
-      super(thr);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java
deleted file mode 100644
index 8fd0423..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-
-import org.apache.poi.hssf.dev.BiffViewer;
-import org.apache.poi.hssf.record.crypto.Biff8DecryptingStream;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianInputStream;
-
-/**
- * Title:  Record Input Stream<P>
- * Description:  Wraps a stream and provides helper methods for the construction of records.<P>
- */
-public final class RecordInputStream implements LittleEndianInput {
-	/** Maximum size of a single record (minus the 4 byte header) without a continue*/
-	public final static short MAX_RECORD_DATA_SIZE = 8224;
-	private static final int INVALID_SID_VALUE = -1;
-	/**
-	 * When {@link #_currentDataLength} has this value, it means that the previous BIFF record is
-	 * finished, the next sid has been properly read, but the data size field has not been read yet.
-	 */
-	private static final int DATA_LEN_NEEDS_TO_BE_READ = -1;
-	private static final byte[] EMPTY_BYTE_ARRAY = { };
-
-	/**
-	 * For use in {@link BiffViewer} which may construct {@link Record}s that don't completely
-	 * read all available data.  This exception should never be thrown otherwise.
-	 */
-	@SuppressWarnings("serial")
-	public static final class LeftoverDataException extends RuntimeException {
-		public LeftoverDataException(int sid, int remainingByteCount) {
-			super("Initialisation of record 0x" + Integer.toHexString(sid).toUpperCase(Locale.ROOT)
-					+ "(" + getRecordName(sid) + ") left " + remainingByteCount 
-					+ " bytes remaining still to be read.");
-		}
-
-        private static String getRecordName(int sid) {
-            Class<? extends Record> recordClass = RecordFactory.getRecordClass(sid);
-            if(recordClass == null) {
-                return null;
-            }
-            return recordClass.getSimpleName();
-        }
-	}
-
-	/** Header {@link LittleEndianInput} facet of the wrapped {@link InputStream} */
-	private final BiffHeaderInput _bhi;
-	/** Data {@link LittleEndianInput} facet of the wrapped {@link InputStream} */
-	private final LittleEndianInput _dataInput;
-	/** the record identifier of the BIFF record currently being read */
-	private int _currentSid;
-	/**
-	 * Length of the data section of the current BIFF record (always 4 less than the total record size).
-	 * When uninitialised, this field is set to {@link #DATA_LEN_NEEDS_TO_BE_READ}.
-	 */
-	private int _currentDataLength;
-	/**
-	 * The BIFF record identifier for the next record is read when just as the current record
-	 * is finished.
-	 * This field is only really valid during the time that ({@link #_currentDataLength} ==
-	 * {@link #DATA_LEN_NEEDS_TO_BE_READ}).  At most other times its value is not really the
-	 * 'sid of the next record'.  Wwhile mid-record, this field coincidentally holds the sid
-	 * of the current record.
-	 */
-	private int _nextSid;
-	/**
-	 * index within the data section of the current BIFF record
-	 */
-	private int _currentDataOffset;
-	/**
-	 * index within the data section when mark() was called
-	 */
-	private int _markedDataOffset;
-
-	private static final class SimpleHeaderInput implements BiffHeaderInput {
-
-		private final LittleEndianInput _lei;
-
-		public SimpleHeaderInput(InputStream in) {
-			_lei = getLEI(in);
-		}
-		@Override
-        public int available() {
-			return _lei.available();
-		}
-		@Override
-        public int readDataSize() {
-			return _lei.readUShort();
-		}
-		@Override
-        public int readRecordSID() {
-			return _lei.readUShort();
-		}
-	}
-
-	public RecordInputStream(InputStream in) throws RecordFormatException {
-		this (in, null, 0);
-	}
-
-	public RecordInputStream(InputStream in, EncryptionInfo key, int initialOffset) throws RecordFormatException {
-		if (key == null) {
-			_dataInput = getLEI(in);
-			_bhi = new SimpleHeaderInput(in);
-		} else {
-			Biff8DecryptingStream bds = new Biff8DecryptingStream(in, initialOffset, key);
-            _dataInput = bds;
-			_bhi = bds;
-		}
-		_nextSid = readNextSid();
-	}
-
-	static LittleEndianInput getLEI(InputStream is) {
-		if (is instanceof LittleEndianInput) {
-			// accessing directly is an optimisation
-			return (LittleEndianInput) is;
-		}
-		// less optimal, but should work OK just the same. Often occurs in junit tests.
-		return new LittleEndianInputStream(is);
-	}
-
-	/**
-	 * @return the number of bytes available in the current BIFF record
-	 * @see #remaining()
-	 */
-	@Override
-    public int available() {
-		return remaining();
-	}
-
-	public int read(byte[] b, int off, int len) {
-		int limit = Math.min(len, remaining());
-		if (limit == 0) {
-			return 0;
-		}
-		readFully(b, off,limit);
-		return limit;
-	}
-
-	public short getSid() {
-		return (short) _currentSid;
-	}
-
-	/**
-	 * Note - this method is expected to be called only when completed reading the current BIFF
-	 * record.
-	 * 
-	 * @return true, if there's another record in the stream
-	 * 
-	 * @throws LeftoverDataException if this method is called before reaching the end of the
-	 * current record.
-	 */
-	public boolean hasNextRecord() throws LeftoverDataException {
-		if (_currentDataLength != -1 && _currentDataLength != _currentDataOffset) {
-			throw new LeftoverDataException(_currentSid, remaining());
-		}
-		if (_currentDataLength != DATA_LEN_NEEDS_TO_BE_READ) {
-			_nextSid = readNextSid();
-		}
-		return _nextSid != INVALID_SID_VALUE;
-	}
-
-	/**
-	 * @return the sid of the next record or {@link #INVALID_SID_VALUE} if at end of stream
-	 */
-	private int readNextSid() {
-		int nAvailable  = _bhi.available();
-		if (nAvailable < EOFRecord.ENCODED_SIZE) {
-			if (nAvailable > 0) {
-				// some scrap left over?
-				// ex45582-22397.xls has one extra byte after the last record
-				// Excel reads that file OK
-			}
-			return INVALID_SID_VALUE;
-		}
-		int result = _bhi.readRecordSID();
-		if (result == INVALID_SID_VALUE) {
-			throw new RecordFormatException("Found invalid sid (" + result + ")");
-		}
-		_currentDataLength = DATA_LEN_NEEDS_TO_BE_READ;
-		return result;
-	}
-
-	/** Moves to the next record in the stream.
-	 *
-	 * <i>Note: The auto continue flag is reset to true</i>
-	 */
-	public void nextRecord() throws RecordFormatException {
-		if (_nextSid == INVALID_SID_VALUE) {
-			throw new IllegalStateException("EOF - next record not available");
-		}
-		if (_currentDataLength != DATA_LEN_NEEDS_TO_BE_READ) {
-			throw new IllegalStateException("Cannot call nextRecord() without checking hasNextRecord() first");
-		}
-		_currentSid = _nextSid;
-		_currentDataOffset = 0;
-		_currentDataLength = _bhi.readDataSize();
-		if (_currentDataLength > MAX_RECORD_DATA_SIZE) {
-			throw new RecordFormatException("The content of an excel record cannot exceed "
-					+ MAX_RECORD_DATA_SIZE + " bytes");
-		}
-	}
-
-	private void checkRecordPosition(int requiredByteCount) {
-
-		int nAvailable = remaining();
-		if (nAvailable >= requiredByteCount) {
-			// all OK
-			return;
-		}
-		if (nAvailable == 0 && isContinueNext()) {
-			nextRecord();
-			return;
-		}
-		throw new RecordFormatException("Not enough data (" + nAvailable
-				+ ") to read requested (" + requiredByteCount +") bytes");
-	}
-
-	/**
-	 * Reads an 8 bit, signed value
-	 */
-	@Override
-    public byte readByte() {
-		checkRecordPosition(LittleEndianConsts.BYTE_SIZE);
-		_currentDataOffset += LittleEndianConsts.BYTE_SIZE;
-		return _dataInput.readByte();
-	}
-
-	/**
-	 * Reads a 16 bit, signed value
-	 */
-	@Override
-    public short readShort() {
-		checkRecordPosition(LittleEndianConsts.SHORT_SIZE);
-		_currentDataOffset += LittleEndianConsts.SHORT_SIZE;
-		return _dataInput.readShort();
-	}
-
-	/**
-	 * Reads a 32 bit, signed value 
-	 */
-	@Override
-    public int readInt() {
-		checkRecordPosition(LittleEndianConsts.INT_SIZE);
-		_currentDataOffset += LittleEndianConsts.INT_SIZE;
-		return _dataInput.readInt();
-	}
-
-	/**
-	 * Reads a 64 bit, signed value
-	 */
-	@Override
-    public long readLong() {
-		checkRecordPosition(LittleEndianConsts.LONG_SIZE);
-		_currentDataOffset += LittleEndianConsts.LONG_SIZE;
-		return _dataInput.readLong();
-	}
-
-	/**
-	 * Reads an 8 bit, unsigned value
-	 */
-	@Override
-    public int readUByte() {
-		return readByte() & 0x00FF;
-	}
-
-	/**
-	 * Reads a 16 bit, unsigned value.
-	 */
-	@Override
-    public int readUShort() {
-		checkRecordPosition(LittleEndianConsts.SHORT_SIZE);
-		_currentDataOffset += LittleEndianConsts.SHORT_SIZE;
-		return _dataInput.readUShort();
-	}
-
-	@Override
-    public double readDouble() {
-		long valueLongBits = readLong();
-		double result = Double.longBitsToDouble(valueLongBits);
-		if (Double.isNaN(result)) {
-            // YK: Excel doesn't write NaN but instead converts the cell type into {@link CellType#ERROR}.
-            // HSSF prior to version 3.7 had a bug: it could write Double.NaN but could not read such a file back.
-            // This behavior was fixed in POI-3.7.
-            //throw new RuntimeException("Did not expect to read NaN"); // (Because Excel typically doesn't write NaN)
-		}
-		return result;
-	}
-	
-	public void readPlain(byte[] buf, int off, int len) {
-	    readFully(buf, 0, buf.length, true);
-	}
-	
-	@Override
-    public void readFully(byte[] buf) {
-		readFully(buf, 0, buf.length, false);
-	}
-
-    @Override
-    public void readFully(byte[] buf, int off, int len) {
-        readFully(buf, off, len, false);
-    }
-	
-    protected void readFully(byte[] buf, int off, int len, boolean isPlain) {
-	    int origLen = len;
-	    if (buf == null) {
-	        throw new NullPointerException();
-	    } else if (off < 0 || len < 0 || len > buf.length - off) {
-	        throw new IndexOutOfBoundsException();
-	    }
-	    
-	    while (len > 0) {
-	        int nextChunk = Math.min(available(),len);
-	        if (nextChunk == 0) {
-	            if (!hasNextRecord()) {
-	                throw new RecordFormatException("Can't read the remaining "+len+" bytes of the requested "+origLen+" bytes. No further record exists.");
-	            } else {
-	                nextRecord();
-	                nextChunk = Math.min(available(),len);
-	                assert(nextChunk > 0);
-	            }
-	        }
-	        checkRecordPosition(nextChunk);
-	        if (isPlain) {
-                _dataInput.readPlain(buf, off, nextChunk);
-	        } else {
-                _dataInput.readFully(buf, off, nextChunk);
-	        }
-	        _currentDataOffset+=nextChunk;
-	        off += nextChunk;
-	        len -= nextChunk;
-	    }
-	}
-
-	public String readString() {
-		int requestedLength = readUShort();
-		byte compressFlag = readByte();
-		return readStringCommon(requestedLength, compressFlag == 0);
-	}
-	/**
-	 *  given a byte array of 16-bit unicode characters, compress to 8-bit and
-	 *  return a string
-	 *
-	 * { 0x16, 0x00 } -0x16
-	 *
-	 * @param requestedLength the length of the final string
-	 * @return                                     the converted string
-	 * @exception  IllegalArgumentException        if len is too large (i.e.,
-	 *      there is not enough data in string to create a String of that
-	 *      length)
-	 */
-	public String readUnicodeLEString(int requestedLength) {
-		return readStringCommon(requestedLength, false);
-	}
-
-	public String readCompressedUnicode(int requestedLength) {
-		return readStringCommon(requestedLength, true);
-	}
-
-	private String readStringCommon(int requestedLength, boolean pIsCompressedEncoding) {
-		// Sanity check to detect garbage string lengths
-		if (requestedLength < 0 || requestedLength > 0x100000) { // 16 million chars?
-			throw new IllegalArgumentException("Bad requested string length (" + requestedLength + ")");
-		}
-		char[] buf = new char[requestedLength];
-		boolean isCompressedEncoding = pIsCompressedEncoding;
-		int curLen = 0;
-		while(true) {
-			int availableChars =isCompressedEncoding ?  remaining() : remaining() / LittleEndianConsts.SHORT_SIZE;
-			if (requestedLength - curLen <= availableChars) {
-				// enough space in current record, so just read it out
-				while(curLen < requestedLength) {
-					char ch;
-					if (isCompressedEncoding) {
-						ch = (char)readUByte();
-					} else {
-						ch = (char)readShort();
-					}
-					buf[curLen] = ch;
-					curLen++;
-				}
-				return new String(buf);
-			}
-			// else string has been spilled into next continue record
-			// so read what's left of the current record
-			while(availableChars > 0) {
-				char ch;
-				if (isCompressedEncoding) {
-					ch = (char)readUByte();
-				} else {
-					ch = (char)readShort();
-				}
-				buf[curLen] = ch;
-				curLen++;
-				availableChars--;
-			}
-			if (!isContinueNext()) {
-				throw new RecordFormatException("Expected to find a ContinueRecord in order to read remaining "
-						+ (requestedLength-curLen) + " of " + requestedLength + " chars");
-			}
-			if(remaining() != 0) {
-				throw new RecordFormatException("Odd number of bytes(" + remaining() + ") left behind");
-			}
-			nextRecord();
-			// note - the compressed flag may change on the fly
-			byte compressFlag = readByte();
-            assert(compressFlag == 0 || compressFlag == 1);
-			isCompressedEncoding = (compressFlag == 0);
-		}
-	}
-
-	/** Returns the remaining bytes for the current record.
-	 *
-	  * @return The remaining bytes of the current record.
-	  */
-	public byte[] readRemainder() {
-		int size = remaining();
-		if (size ==0) {
-			return EMPTY_BYTE_ARRAY;
-		}
-		byte[] result = new byte[size];
-		readFully(result);
-		return result;
-	}
-
-    /**
-     * Reads all byte data for the current record, including any that overlaps
-     * into any following continue records.
-     *
-     * @return all byte data for the current record
-     * 
-     * @deprecated POI 2.0 Best to write a input stream that wraps this one
-     *             where there is special sub record that may overlap continue
-     *             records.
-     */
-    @Deprecated
-    public byte[] readAllContinuedRemainder() {
-        ByteArrayOutputStream out = new ByteArrayOutputStream(2 * MAX_RECORD_DATA_SIZE);
-
-        while (true) {
-            byte[] b = readRemainder();
-            out.write(b, 0, b.length);
-            if (!isContinueNext()) {
-                break;
-            }
-            nextRecord();
-        }
-        return out.toByteArray();
-    }
-
-	/** The remaining number of bytes in the <i>current</i> record.
-	 *
-	 * @return The number of bytes remaining in the current record
-	 */
-	public int remaining() {
-		if (_currentDataLength == DATA_LEN_NEEDS_TO_BE_READ) {
-			// already read sid of next record. so current one is finished
-			return 0;
-		}
-		return _currentDataLength - _currentDataOffset;
-	}
-
-	/**
-	 *
-	 * @return <code>true</code> when a {@link ContinueRecord} is next.
-	 */
-	private boolean isContinueNext() {
-		if (_currentDataLength != DATA_LEN_NEEDS_TO_BE_READ && _currentDataOffset != _currentDataLength) {
-			throw new IllegalStateException("Should never be called before end of current record");
-		}
-		if (!hasNextRecord()) {
-			return false;
-		}
-		// At what point are records continued?
-		//  - Often from within the char data of long strings (caller is within readStringCommon()).
-		//  - From UnicodeString construction (many different points - call via checkRecordPosition)
-		//  - During TextObjectRecord construction (just before the text, perhaps within the text,
-		//    and before the formatting run data)
-		return _nextSid == ContinueRecord.sid;
-	}
-
-    /**
-     @return sid of next record. Can be called after hasNextRecord()
-     */
-    public int getNextSid() {
-        return _nextSid;
-    }
-
-    /**
-     * Mark the stream position - experimental function 
-     *
-     * @param readlimit the read ahead limit
-     * 
-     * @see InputStream#mark(int)
-     */
-    @Internal
-    public void mark(int readlimit) {
-        ((InputStream)_dataInput).mark(readlimit);
-        _markedDataOffset = _currentDataOffset;
-    }
-    
-    /**
-     * Resets the stream position to the previously marked position.
-     * Experimental function - this only works, when nextRecord() wasn't called in the meantime.
-     *
-     * @throws IOException if marking is not supported
-     * 
-     * @see InputStream#reset()
-     */
-    @Internal
-    public void reset() throws IOException {
-        ((InputStream)_dataInput).reset();
-        _currentDataOffset = _markedDataOffset;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RecordProcessor.java b/trunk/src/java/org/apache/poi/hssf/record/RecordProcessor.java
deleted file mode 100644
index 715cb84..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RecordProcessor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-
-/**
- * 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
-{
-  //This class is not required anymore
-}
-
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java b/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java
deleted file mode 100644
index ef1316e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        RefMode Record<P>
- * Description:  Describes which reference mode to use<P>
- * REFERENCE:  PG 376 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class RefModeRecord
-    extends StandardRecord
-{
-    public final static short sid           = 0xf;
-    public final static short USE_A1_MODE   = 1;
-    public final static short USE_R1C1_MODE = 0;
-    private short             field_1_mode;
-
-    public RefModeRecord()
-    {
-    }
-
-    public RefModeRecord(RecordInputStream in)
-    {
-        field_1_mode = in.readShort();
-    }
-
-    /**
-     * set the reference mode to use (HSSF uses/assumes A1)
-     * @param mode the mode to use
-     * @see #USE_A1_MODE
-     * @see #USE_R1C1_MODE
-     *
-     */
-
-    public void setMode(short mode)
-    {
-        field_1_mode = mode;
-    }
-
-    /**
-     * get the reference mode to use (HSSF uses/assumes A1)
-     * @return mode to use
-     * @see #USE_A1_MODE
-     * @see #USE_R1C1_MODE
-     */
-
-    public short getMode()
-    {
-        return field_1_mode;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[REFMODE]\n");
-        buffer.append("    .mode           = ")
-            .append(Integer.toHexString(getMode())).append("\n");
-        buffer.append("[/REFMODE]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getMode());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      RefModeRecord rec = new RefModeRecord();
-      rec.field_1_mode = field_1_mode;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
deleted file mode 100644
index a6e547f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Refresh All Record (0x01B7)<p>
- * Description:  Flag whether to refresh all external data when loading a sheet.
- *               (which hssf doesn't support anyhow so who really cares?)<p>
- * REFERENCE:  PG 376 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class RefreshAllRecord extends StandardRecord {
-    public final static short sid = 0x01B7;
-
-    private static final BitField refreshFlag = BitFieldFactory.getInstance(0x0001);
-
-    private int _options;
-
-    private RefreshAllRecord(int options) {
-        _options = options;
-    }
-
-    public RefreshAllRecord(RecordInputStream in) {
-        this(in.readUShort());
-    }
-
-    public RefreshAllRecord(boolean refreshAll) {
-        this(0);
-        setRefreshAll(refreshAll);
-    }
-
-    /**
-     * set whether to refresh all external data when loading a sheet
-     * @param refreshAll or not
-     */
-    public void setRefreshAll(boolean refreshAll) {
-        _options = refreshFlag.setBoolean(_options, refreshAll);
-    }
-
-    /**
-     * get whether to refresh all external data when loading a sheet
-     * @return refreshall or not
-     */
-    public boolean getRefreshAll() {
-        return refreshFlag.isSet(_options);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[REFRESHALL]\n");
-        buffer.append("    .options      = ").append(HexDump.shortToHex(_options)).append("\n");
-        buffer.append("[/REFRESHALL]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_options);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-    @Override
-    public Object clone() {
-        return new RefreshAllRecord(_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java b/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
deleted file mode 100644
index 09b1d96..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Record for the right margin.
- */
-public final class RightMarginRecord extends StandardRecord implements Margin {
-    public final static short sid = 0x27;
-    private double field_1_margin;
-
-    public RightMarginRecord()    {    }
-
-    public RightMarginRecord( RecordInputStream in )
-    {
-        field_1_margin = in.readDouble();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append( "[RightMargin]\n" );
-        buffer.append( "    .margin               = " ).append( " (" ).append( getMargin() ).append( " )\n" );
-        buffer.append( "[/RightMargin]\n" );
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeDouble(field_1_margin);
-    }
-
-    protected int getDataSize() {
-        return 8;
-    }
-
-    public short getSid()    {        return sid;    }
-
-    /**
-     * Get the margin field for the RightMargin record.
-     */
-    public double getMargin()    {        return field_1_margin;    }
-
-    /**
-     * Set the margin field for the RightMargin record.
-     */
-    public void setMargin( double field_1_margin )
-    {        this.field_1_margin = field_1_margin;    }
-
-    public Object clone()
-    {
-        RightMarginRecord rec = new RightMarginRecord();
-        rec.field_1_margin = this.field_1_margin;
-        return rec;
-    }
-}  // END OF
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java b/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
deleted file mode 100644
index 20951cb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Row Record (0x0208)<p>
- * Description:  stores the row information for the sheet.<p>
- * REFERENCE:  PG 379 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- * 
- * @since 2.0-pre
- */
-public final class RowRecord extends StandardRecord {
-    public final static short sid = 0x0208;
-
-    public static final int ENCODED_SIZE = 20;
-    
-    private static final int OPTION_BITS_ALWAYS_SET = 0x0100;
-    //private static final int DEFAULT_HEIGHT_BIT = 0x8000;
-
-    private int field_1_row_number;
-    private int field_2_first_col;
-    private int field_3_last_col; // plus 1
-    private short field_4_height;
-    private short field_5_optimize; // hint field for gui, can/should be set to zero
-
-    // for generated sheets.
-    private short field_6_reserved;
-    /** 16 bit options flags */
-    private int field_7_option_flags;
-    private static final BitField          outlineLevel  = BitFieldFactory.getInstance(0x07);
-    // bit 3 reserved
-    private static final BitField          colapsed      = BitFieldFactory.getInstance(0x10);
-    private static final BitField          zeroHeight    = BitFieldFactory.getInstance(0x20);
-    private static final BitField          badFontHeight = BitFieldFactory.getInstance(0x40);
-    private static final BitField          formatted     = BitFieldFactory.getInstance(0x80);
-    
-    /** 16 bit options flags */
-    private int field_8_option_flags;   // only if isFormatted
-    private static final BitField          xfIndex       = BitFieldFactory.getInstance(0xFFF);
-    private static final BitField          topBorder     = BitFieldFactory.getInstance(0x1000);
-    private static final BitField          bottomBorder  = BitFieldFactory.getInstance(0x2000);
-    private static final BitField          phoeneticGuide  = BitFieldFactory.getInstance(0x4000);
-    // bit 15 is unused
-
-    public RowRecord(int rowNumber) {
-    	if(rowNumber < 0) {
-    		throw new IllegalArgumentException("Invalid row number (" + rowNumber + ")");
-    	}
-        field_1_row_number = rowNumber;
-        field_4_height = (short)0xFF;
-        field_5_optimize = ( short ) 0;
-        field_6_reserved = ( short ) 0;
-        field_7_option_flags = OPTION_BITS_ALWAYS_SET; // seems necessary for outlining
-
-        field_8_option_flags = ( short ) 0xf;
-        setEmpty();
-    }
-
-    public RowRecord(RecordInputStream in) {
-        field_1_row_number   = in.readUShort();
-    	if(field_1_row_number < 0) {
-    		throw new IllegalArgumentException("Invalid row number " + field_1_row_number + " found in InputStream");
-    	}
-        field_2_first_col    = in.readShort();
-        field_3_last_col     = in.readShort();
-        field_4_height       = in.readShort();
-        field_5_optimize     = in.readShort();
-        field_6_reserved     = in.readShort();
-        field_7_option_flags = in.readShort();
-        field_8_option_flags = in.readShort();
-    }
-
-    /**
-     * Updates the firstCol and lastCol fields to the reserved value (-1) 
-     * to signify that this row is empty
-     */
-    public void setEmpty() {
-        field_2_first_col = 0;
-        field_3_last_col = 0;
-    }
-    public boolean isEmpty() {
-        return (field_2_first_col | field_3_last_col) == 0;
-    }
-    
-    /**
-     * set the logical row number for this row (0 based index)
-     * @param row - the row number
-     */
-    public void setRowNumber(int row) {
-        field_1_row_number = row;
-    }
-
-    /**
-     * set the logical col number for the first cell this row (0 based index)
-     * @param col - the col number
-     */
-    public void setFirstCol(int col) {
-        field_2_first_col = col;
-    }
-
-    /**
-     * @param col - one past the zero-based index to the last cell in this row
-     */
-    public void setLastCol(int col) {
-        field_3_last_col = col;
-    }
-
-    /**
-     * set the height of the row
-     * @param height of the row
-     */
-    public void setHeight(short height) {
-        field_4_height = height;
-    }
-
-    /**
-     * set whether to optimize or not (set to 0)
-     * @param optimize (set to 0)
-     */
-    public void setOptimize(short optimize) {
-        field_5_optimize = optimize;
-    }
-
-    // option bitfields
-
-    /**
-     * set the outline level of this row
-     * @param ol - the outline level
-     */
-    public void setOutlineLevel(short ol) {
-        field_7_option_flags = outlineLevel.setValue(field_7_option_flags, ol);
-    }
-
-    /**
-     * set whether or not to collapse this row
-     * @param c - collapse or not
-     */
-    public void setColapsed(boolean c) {
-        field_7_option_flags = colapsed.setBoolean(field_7_option_flags, c);
-    }
-
-    /**
-     * set whether or not to display this row with 0 height
-     * @param z  height is zero or not.
-     */
-    public void setZeroHeight(boolean z) {
-        field_7_option_flags = zeroHeight.setBoolean(field_7_option_flags, z);
-    }
-
-    /**
-     * set whether the font and row height are not compatible
-     * @param  f  true if they aren't compatible (damn not logic)
-     */
-    public void setBadFontHeight(boolean f) {
-        field_7_option_flags = badFontHeight.setBoolean(field_7_option_flags, f);
-    }
-
-    /**
-     * set whether the row has been formatted (even if its got all blank cells)
-     * @param f  formatted or not
-     */
-    public void setFormatted(boolean f) {
-        field_7_option_flags = formatted.setBoolean(field_7_option_flags, f);
-    }
-
-    // end bitfields
-
-    /**
-     * if the row is formatted then this is the index to the extended format record
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     * @param index to the XF record
-     */
-    public void setXFIndex(short index) {
-    	field_8_option_flags = xfIndex.setValue(field_8_option_flags, index);
-    }
-
-    /**
-     * bit that specifies whether any cell in the row has a thick top border, or any
-     * cell in the row directly above the current row has a thick bottom border.
-     * @param f has thick top border
-     */
-    public void setTopBorder(boolean f) {
-    	field_8_option_flags = topBorder.setBoolean(field_8_option_flags, f);
-    }
-    
-    /**
-     * A bit that specifies whether any cell in the row has a medium or thick
-     * bottom border, or any cell in the row directly below the current row has
-     * a medium or thick top border.
-     * @param f has thick bottom border
-     */
-    public void setBottomBorder(boolean f) {
-    	field_8_option_flags = bottomBorder.setBoolean(field_8_option_flags, f);
-    }
-    
-    /**
-     * A bit that specifies whether the phonetic guide feature is enabled for
-     * any cell in this row.
-     * @param f use phoenetic guide
-     */
-    public void setPhoeneticGuide(boolean f) {
-    	field_8_option_flags = phoeneticGuide.setBoolean(field_8_option_flags, f);
-    }
-    
-    /**
-     * get the logical row number for this row (0 based index)
-     * @return row - the row number
-     */
-    public int getRowNumber() {
-        return field_1_row_number;
-    }
-
-    /**
-     * get the logical col number for the first cell this row (0 based index)
-     * @return col - the col number
-     */
-    public int getFirstCol() {
-        return field_2_first_col;
-    }
-
-    /**
-     * get the logical col number for the last cell this row (0 based index), plus one 
-     * @return col - the last col index + 1
-     */
-    public int getLastCol() {
-        return field_3_last_col;
-    }
-
-    /**
-     * get the height of the row
-     * @return height of the row
-     */
-    public short getHeight() {
-        return field_4_height;
-    }
-
-    /**
-     * get whether to optimize or not (set to 0)
-     * @return optimize (set to 0)
-     */
-    public short getOptimize() {
-        return field_5_optimize;
-    }
-
-    /**
-     * gets the option bitmask.  (use the individual bit setters that refer to this
-     * method)
-     * @return options - the bitmask
-     */
-    public short getOptionFlags() {
-        return (short)field_7_option_flags;
-    }
-
-    // option bitfields
-
-    /**
-     * get the outline level of this row
-     * @return ol - the outline level
-     * @see #getOptionFlags()
-     */
-    public short getOutlineLevel() {
-        return (short)outlineLevel.getValue(field_7_option_flags);
-    }
-
-    /**
-     * get whether or not to colapse this row
-     * @return c - colapse or not
-     * @see #getOptionFlags()
-     */
-    public boolean getColapsed() {
-        return (colapsed.isSet(field_7_option_flags));
-    }
-
-    /**
-     * get whether or not to display this row with 0 height
-     * @return - z height is zero or not.
-     * @see #getOptionFlags()
-     */
-    public boolean getZeroHeight() {
-        return zeroHeight.isSet(field_7_option_flags);
-    }
-
-    /**
-     * get whether the font and row height are not compatible
-     * @return - f -true if they aren't compatible (damn not logic)
-     * @see #getOptionFlags()
-     */
-    public boolean getBadFontHeight() {
-        return badFontHeight.isSet(field_7_option_flags);
-    }
-
-    /**
-     * get whether the row has been formatted (even if its got all blank cells)
-     * @return formatted or not
-     * @see #getOptionFlags()
-     */
-    public boolean getFormatted() {
-        return formatted.isSet(field_7_option_flags);
-    }
-
-    // end bitfields
-
-    /**
-     * gets the 2nd option bitmask.  (use the individual bit setters that refer to this
-     * method)
-     * @return options - the bitmask
-     */
-    public short getOptionFlags2() {
-        return (short)field_8_option_flags;
-    }
-    
-    /**
-     * if the row is formatted then this is the index to the extended format record
-     * @see org.apache.poi.hssf.record.ExtendedFormatRecord
-     * @return index to the XF record or bogus value (undefined) if isn't formatted
-     */
-    public short getXFIndex() {
-    	return xfIndex.getShortValue((short)field_8_option_flags);
-    }
-
-    /**
-     * A bit that specifies whether any cell in the row has a thick top border, or any
-     * cell in the row directly above the current row has a thick bottom border.
-     * @return has cells with a thick top border
-     */
-    public boolean getTopBorder() {
-    	return topBorder.isSet(field_8_option_flags);
-    }
-
-    /**
-     * A bit that specifies whether any cell in the row has a medium or thick bottom border,
-     * or any cell in the row directly below the current row has a medium or thick top border.
-     * @return has cells with a thick bottom border
-     */
-    public boolean getBottomBorder() {
-    	return bottomBorder.isSet(field_8_option_flags);
-    }
-
-    /**
-     * A bit that specifies whether the phonetic guide feature is enabled for
-     * any cell in this row.
-     * @return has phoentic guide
-     */
-    public boolean getPhoeneticGuide() {
-    	return phoeneticGuide.isSet(field_8_option_flags);
-    }
-    
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[ROW]\n");
-        sb.append("    .rownumber      = ").append(Integer.toHexString(getRowNumber()))
-                .append("\n");
-        sb.append("    .firstcol       = ").append(HexDump.shortToHex(getFirstCol())).append("\n");
-        sb.append("    .lastcol        = ").append(HexDump.shortToHex(getLastCol())).append("\n");
-        sb.append("    .height         = ").append(HexDump.shortToHex(getHeight())).append("\n");
-        sb.append("    .optimize       = ").append(HexDump.shortToHex(getOptimize())).append("\n");
-        sb.append("    .reserved       = ").append(HexDump.shortToHex(field_6_reserved)).append("\n");
-        sb.append("    .optionflags    = ").append(HexDump.shortToHex(getOptionFlags())).append("\n");
-        sb.append("        .outlinelvl = ").append(Integer.toHexString(getOutlineLevel())).append("\n");
-        sb.append("        .colapsed   = ").append(getColapsed()).append("\n");
-        sb.append("        .zeroheight = ").append(getZeroHeight()).append("\n");
-        sb.append("        .badfontheig= ").append(getBadFontHeight()).append("\n");
-        sb.append("        .formatted  = ").append(getFormatted()).append("\n");
-        sb.append("    .optionsflags2  = ").append(HexDump.shortToHex(getOptionFlags2())).append("\n");
-        sb.append("        .xfindex       = ").append(Integer.toHexString(getXFIndex())).append("\n");
-        sb.append("        .topBorder     = ").append(getTopBorder()).append("\n");
-        sb.append("        .bottomBorder  = ").append(getBottomBorder()).append("\n");
-        sb.append("        .phoeneticGuide= ").append(getPhoeneticGuide()).append("\n");
-        sb.append("[/ROW]\n");
-        return sb.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getRowNumber());
-        out.writeShort(getFirstCol() == -1 ? (short)0 : getFirstCol());
-        out.writeShort(getLastCol() == -1 ? (short)0 : getLastCol());
-        out.writeShort(getHeight());
-        out.writeShort(getOptimize());
-        out.writeShort(field_6_reserved);
-        out.writeShort(getOptionFlags());
-        out.writeShort(getOptionFlags2());
-    }
-
-    protected int getDataSize() {
-        return ENCODED_SIZE - 4;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public Object clone() {
-      RowRecord rec = new RowRecord(field_1_row_number);
-      rec.field_2_first_col = field_2_first_col;
-      rec.field_3_last_col = field_3_last_col;
-      rec.field_4_height = field_4_height;
-      rec.field_5_optimize = field_5_optimize;
-      rec.field_6_reserved = field_6_reserved;
-      rec.field_7_option_flags = field_7_option_flags;
-      rec.field_8_option_flags = field_8_option_flags;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java b/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java
deleted file mode 100644
index 5b36093..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Specifies the window's zoom magnification.<p>
- * If this record isn't present then the windows zoom is 100%. see p384 Excel Dev Kit
- */
-public final class SCLRecord extends StandardRecord {
-    public final static short      sid                             = 0x00A0;
-    private  short      field_1_numerator;
-    private  short      field_2_denominator;
-
-
-    public SCLRecord()
-    {
-
-    }
-
-    public SCLRecord(RecordInputStream in)
-    {
-        field_1_numerator              = in.readShort();
-        field_2_denominator            = in.readShort();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SCL]\n");
-        buffer.append("    .numerator            = ")
-            .append("0x").append(HexDump.toHex(  getNumerator ()))
-            .append(" (").append( getNumerator() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .denominator          = ")
-            .append("0x").append(HexDump.toHex(  getDenominator ()))
-            .append(" (").append( getDenominator() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/SCL]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_numerator);
-        out.writeShort(field_2_denominator);
-    }
-
-    @Override
-    protected int getDataSize() {
-        return 2 + 2;
-    }
-
-    @Override
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public Object clone() {
-        SCLRecord rec = new SCLRecord();
-    
-        rec.field_1_numerator = field_1_numerator;
-        rec.field_2_denominator = field_2_denominator;
-        return rec;
-    }
-
-    /**
-     * Get the numerator field for the SCL record.
-     * 
-     * @return the numerator
-     */
-    public short getNumerator()
-    {
-        return field_1_numerator;
-    }
-
-    /**
-     * Set the numerator field for the SCL record.
-     * 
-     * @param field_1_numerator the numerator
-     */
-    public void setNumerator(short field_1_numerator)
-    {
-        this.field_1_numerator = field_1_numerator;
-    }
-
-    /**
-     * Get the denominator field for the SCL record.
-     * 
-     * @return the denominator
-     */
-    public short getDenominator()
-    {
-        return field_2_denominator;
-    }
-
-    /**
-     * Set the denominator field for the SCL record.
-     * 
-     * @param field_2_denominator the denominator
-     */
-    public void setDenominator(short field_2_denominator)
-    {
-        this.field_2_denominator = field_2_denominator;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java b/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java
deleted file mode 100644
index 1816161..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.util.IntMapper;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Handles the task of deserializing a SST string.  The two main entry points are
- *
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Jason Height (jheight at apache.org)
- */
-class SSTDeserializer
-{
-	private static POILogger logger = POILogFactory.getLogger(SSTDeserializer.class);
-    private IntMapper<UnicodeString> strings;
-
-    public SSTDeserializer( IntMapper<UnicodeString> strings )
-    {
-        this.strings = strings;
-    }
-
-    /**
-     * 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( int stringCount, RecordInputStream in )
-    {
-      for (int i=0;i<stringCount;i++) {
-         // Extract exactly the count of strings from the SST record.
-         UnicodeString str;
-         if(in.available() == 0 && ! in.hasNextRecord()) {
-        	 logger.log( POILogger.ERROR, "Ran out of data before creating all the strings! String at index " + i + "");
-            str = new UnicodeString("");
-         } else {
-            str = new UnicodeString(in);
-         }
-         addToStringTable( strings, str );
-      }
-    }
-
-    static public void addToStringTable( IntMapper<UnicodeString> strings, UnicodeString string )
-    {
-      strings.add(string);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java b/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java
deleted file mode 100644
index 43f42de..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Iterator;
-
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.record.cont.ContinuableRecord;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.util.IntMapper;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * Title:        Static String Table Record (0x00FC)<p>
- *
- * Description:  This holds all the strings for LabelSSTRecords.<p>
- * 
- * REFERENCE:    PG 389 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- *
- * @see org.apache.poi.hssf.record.LabelSSTRecord
- * @see org.apache.poi.hssf.record.ContinueRecord
- */
-public final class SSTRecord extends ContinuableRecord {
-    public static final short sid = 0x00FC;
-
-    private static final UnicodeString EMPTY_STRING = new UnicodeString("");
-
-    // TODO - move these constants to test class (the only consumer)
-    /** 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 */
-    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 */
-    static final int MAX_DATA_SPACE = RecordInputStream.MAX_RECORD_DATA_SIZE - 8;
-
-    /** union of strings in the SST and EXTSST */
-    private int field_1_num_strings;
-
-    /** according to docs ONLY SST */
-    private int field_2_num_unique_strings;
-    private IntMapper<UnicodeString> field_3_strings;
-
-    private SSTDeserializer deserializer;
-
-    /** Offsets from the beginning of the SST record (even across continuations) */
-    int[] bucketAbsoluteOffsets;
-    /** Offsets relative the start of the current SST or continue record */
-    int[] bucketRelativeOffsets;
-
-    public SSTRecord()
-    {
-        field_1_num_strings = 0;
-        field_2_num_unique_strings = 0;
-        field_3_strings = new IntMapper<UnicodeString>();
-        deserializer = new SSTDeserializer(field_3_strings);
-    }
-
-    /**
-     * Add a string.
-     *
-     * @param string string to be added
-     *
-     * @return the index of that string in the table
-     */
-    public int addString(UnicodeString string)
-    {
-        field_1_num_strings++;
-        UnicodeString ucs = ( string == null ) ? EMPTY_STRING
-                : string;
-        int rval;
-        int index = field_3_strings.getIndex(ucs);
-
-        if ( index != -1 ) {
-            rval = index;
-        } else {
-            // This is a new string -- we didn't see it among the
-            // strings we've already collected
-            rval = field_3_strings.size();
-            field_2_num_unique_strings++;
-            SSTDeserializer.addToStringTable( field_3_strings, ucs );
-        }
-        return rval;
-    }
-
-    /**
-     * @return number of strings
-     */
-    public int getNumStrings()
-    {
-        return field_1_num_strings;
-    }
-
-    /**
-     * @return number of unique strings
-     */
-    public int getNumUniqueStrings()
-    {
-        return field_2_num_unique_strings;
-    }
-
-
-    /**
-     * Get a particular string by its index
-     *
-     * @param id index into the array of strings
-     *
-     * @return the desired string
-     */
-    public UnicodeString getString(int id )
-    {
-        return field_3_strings.get( id );
-    }
-
-
-    /**
-     * Return a debugging string representation
-     *
-     * @return string representation
-     */
-    public String toString() {
-        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++ )
-        {
-          UnicodeString s = field_3_strings.get( k );
-            buffer.append( "    .string_" + k + "      = " )
-                    .append( s.getDebugInfo() ).append( "\n" );
-        }
-        buffer.append( "[/SST]\n" );
-        return buffer.toString();
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * Fill the fields from the data
-     * <P>
-     * The data consists of sets of string data. This string data is
-     * arranged as follows:
-     * <P>
-     * <pre>
-     * short  string_length;   // length of string data
-     * byte   string_flag;     // flag specifying special string
-     *                         // handling
-     * short  run_count;       // optional count of formatting runs
-     * int    extend_length;   // optional extension length
-     * char[] string_data;     // string data, can be byte[] or
-     *                         // short[] (length of array is
-     *                         // string_length)
-     * int[]  formatting_runs; // optional formatting runs (length of
-     *                         // array is run_count)
-     * byte[] extension;       // optional extension (length of array
-     *                         // is extend_length)
-     * </pre>
-     * <P>
-     * The string_flag is bit mapped as follows:
-     * <P>
-     * <TABLE summary="string_flag mapping">
-     *   <TR>
-     *      <TH>Bit number</TH>
-     *      <TH>Meaning if 0</TH>
-     *      <TH>Meaning if 1</TH>
-     *   <TR>
-     *   <TR>
-     *      <TD>0</TD>
-     *      <TD>string_data is byte[]</TD>
-     *      <TD>string_data is short[]</TD>
-     *   <TR>
-     *   <TR>
-     *      <TD>1</TD>
-     *      <TD>Should always be 0</TD>
-     *      <TD>string_flag is defective</TD>
-     *   <TR>
-     *   <TR>
-     *      <TD>2</TD>
-     *      <TD>extension is not included</TD>
-     *      <TD>extension is included</TD>
-     *   <TR>
-     *   <TR>
-     *      <TD>3</TD>
-     *      <TD>formatting run data is not included</TD>
-     *      <TD>formatting run data is included</TD>
-     *   <TR>
-     *   <TR>
-     *      <TD>4</TD>
-     *      <TD>Should always be 0</TD>
-     *      <TD>string_flag is defective</TD>
-     *   <TR>
-     *   <TR>
-     *      <TD>5</TD>
-     *      <TD>Should always be 0</TD>
-     *      <TD>string_flag is defective</TD>
-     *   <TR>
-     *   <TR>
-     *      <TD>6</TD>
-     *      <TD>Should always be 0</TD>
-     *      <TD>string_flag is defective</TD>
-     *   <TR>
-     *   <TR>
-     *      <TD>7</TD>
-     *      <TD>Should always be 0</TD>
-     *      <TD>string_flag is defective</TD>
-     *   <TR>
-     * </TABLE>
-     * <P>
-     * We can handle eating the overhead associated with bits 2 or 3
-     * (or both) being set, but we have no idea what to do with the
-     * associated data. The UnicodeString class can handle the byte[]
-     * vs short[] nature of the actual string data
-     *
-     * @param in the RecordInputstream to read the record from
-     */
-    public SSTRecord(RecordInputStream in) {
-        // 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 = in.readInt();
-        field_2_num_unique_strings = in.readInt();
-        field_3_strings = new IntMapper<UnicodeString>();
-        
-        deserializer = new SSTDeserializer(field_3_strings);
-        // Bug 57456: some Excel Sheets send 0 as field=1, but have some random number in field_2,
-        // we should not try to read the strings in this case.
-        if(field_1_num_strings == 0) {
-            field_2_num_unique_strings = 0;
-            return;
-        }
-        deserializer.manufactureStrings( field_2_num_unique_strings, in );
-    }
-
-
-    /**
-     * @return an iterator of the strings we hold. All instances are
-     *         UnicodeStrings
-     */
-    Iterator<UnicodeString> getStrings()
-    {
-        return field_3_strings.iterator();
-    }
-
-    /**
-     * @return count of the strings we hold.
-     */
-    int countStrings() {
-        return field_3_strings.size();
-    }
-
-    protected void serialize(ContinuableRecordOutput out) {
-        SSTSerializer serializer = new SSTSerializer(field_3_strings, getNumStrings(), getNumUniqueStrings() );
-        serializer.serialize(out);
-        bucketAbsoluteOffsets = serializer.getBucketAbsoluteOffsets();
-        bucketRelativeOffsets = serializer.getBucketRelativeOffsets();
-    }
-
-    SSTDeserializer getDeserializer() {
-        return deserializer;
-    }
-
-    /**
-     * Creates an extended string record based on the current contents of
-     * the current SST record.  The offset within the stream to the SST record
-     * is required because the extended string record points directly to the
-     * strings in the SST record.
-     * <p>
-     * NOTE: THIS FUNCTION MUST ONLY BE CALLED AFTER THE SST RECORD HAS BEEN
-     *       SERIALIZED.
-     *
-     * @param sstOffset     The offset in the stream to the start of the
-     *                      SST record.
-     * @return  The new SST record.
-     */
-    public ExtSSTRecord createExtSSTRecord(int sstOffset) {
-        if (bucketAbsoluteOffsets == null || bucketRelativeOffsets == null) {
-            throw new IllegalStateException("SST record has not yet been serialized.");
-        }
-
-        ExtSSTRecord extSST = new ExtSSTRecord();
-        extSST.setNumStringsPerBucket((short)8);
-        int[] absoluteOffsets = bucketAbsoluteOffsets.clone();
-        int[] relativeOffsets = bucketRelativeOffsets.clone();
-        for ( int i = 0; i < absoluteOffsets.length; i++ ) {
-            absoluteOffsets[i] += sstOffset;
-        }
-        extSST.setBucketOffsets(absoluteOffsets, relativeOffsets);
-        return extSST;
-    }
-
-    /**
-     * Calculates the size in bytes of the EXTSST record as it would be if the
-     * record was serialized.
-     *
-     * @return  The size of the ExtSST record in bytes.
-     */
-    public int calcExtSSTRecordSize() {
-      return ExtSSTRecord.getRecordSizeForStrings(field_3_strings.size());
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SSTSerializer.java b/trunk/src/java/org/apache/poi/hssf/record/SSTSerializer.java
deleted file mode 100644
index c15c7ad..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SSTSerializer.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.util.IntMapper;
-
-/**
- * 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)
- */
-final class SSTSerializer {
-
-	private final int _numStrings;
-	private final int _numUniqueStrings;
-
-    private final IntMapper<UnicodeString> strings;
-
-    /** Offsets from the beginning of the SST record (even across continuations) */
-    private final int[] bucketAbsoluteOffsets;
-    /** Offsets relative the start of the current SST or continue record */
-    private final int[] bucketRelativeOffsets;
-
-    public SSTSerializer( IntMapper<UnicodeString> strings, int numStrings, int numUniqueStrings )
-    {
-        this.strings = strings;
-		_numStrings = numStrings;
-		_numUniqueStrings = numUniqueStrings;
-
-        int infoRecs = ExtSSTRecord.getNumberOfInfoRecsForStrings(strings.size());
-        this.bucketAbsoluteOffsets = new int[infoRecs];
-        this.bucketRelativeOffsets = new int[infoRecs];
-    }
-
-    public void serialize(ContinuableRecordOutput out) {
-        out.writeInt(_numStrings);
-        out.writeInt(_numUniqueStrings);
-
-        for ( int k = 0; k < strings.size(); k++ )
-        {
-            if (k % ExtSSTRecord.DEFAULT_BUCKET_SIZE == 0)
-            {
-              int rOff = out.getTotalSize();
-              int index = k/ExtSSTRecord.DEFAULT_BUCKET_SIZE;
-              if (index < ExtSSTRecord.MAX_BUCKETS) {
-                 //Excel only indexes the first 128 buckets.
-                 bucketAbsoluteOffsets[index] = rOff;
-                 bucketRelativeOffsets[index] = rOff;
-              }
-          }
-          UnicodeString s = getUnicodeString(k);
-          s.serialize(out);
-        }
-    }
-
-
-    private UnicodeString getUnicodeString( int index )
-    {
-        return getUnicodeString(strings, index);
-    }
-
-    private static UnicodeString getUnicodeString( IntMapper<UnicodeString> strings, int index )
-    {
-        return ( strings.get( index ) );
-    }
-
-    public int[] getBucketAbsoluteOffsets()
-    {
-        return bucketAbsoluteOffsets;
-    }
-
-    public int[] getBucketRelativeOffsets()
-    {
-        return bucketRelativeOffsets;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
deleted file mode 100644
index 96cfde2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
+++ /dev/null
@@ -1,98 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Save Recalc Record <P>
- * Description:  defines whether to recalculate before saving (set to true)<P>
- * REFERENCE:  PG 381 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class SaveRecalcRecord
-    extends StandardRecord
-{
-    public final static short sid = 0x5f;
-    private short             field_1_recalc;
-
-    public SaveRecalcRecord()
-    {
-    }
-
-    public SaveRecalcRecord(RecordInputStream in)
-    {
-        field_1_recalc = in.readShort();
-    }
-
-    /**
-     * set whether to recalculate formulas/etc before saving or not
-     * @param recalc - whether to recalculate or not
-     */
-
-    public void setRecalc(boolean recalc)
-    {
-        field_1_recalc = ( short ) ((recalc == true) ? 1
-                                                     : 0);
-    }
-
-    /**
-     * get whether to recalculate formulas/etc before saving or not
-     * @return recalc - whether to recalculate or not
-     */
-
-    public boolean getRecalc()
-    {
-        return (field_1_recalc == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SAVERECALC]\n");
-        buffer.append("    .recalc         = ").append(getRecalc())
-            .append("\n");
-        buffer.append("[/SAVERECALC]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_recalc);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      SaveRecalcRecord rec = new SaveRecalcRecord();
-      rec.field_1_recalc = field_1_recalc;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
deleted file mode 100644
index 37605c6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
+++ /dev/null
@@ -1,106 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Scenario Protect Record<P>
- * Description:  I have no idea what a Scenario is or why on would want to 
- * protect it with the lamest "security" ever invented.  However this record tells
- * excel "I want to protect my scenarios" (0xAF) with lame security.  It appears 
- * in conjunction with the PASSWORD and PROTECT records as well as its object 
- * protect cousin.<P>
- * REFERENCE:  PG 383 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-
-public final class ScenarioProtectRecord
-    extends StandardRecord
-{
-    public final static short sid = 0xdd;
-    private short             field_1_protect;
-
-    public ScenarioProtectRecord()
-    {
-    }
-
-    public ScenarioProtectRecord(RecordInputStream in)
-    {
-        field_1_protect = in.readShort();
-    }
-
-    /**
-     * set whether the sheet is protected or not
-     * @param protect whether to protect the sheet or not
-     */
-
-    public void setProtect(boolean protect)
-    {
-        if (protect)
-        {
-            field_1_protect = 1;
-        }
-        else
-        {
-            field_1_protect = 0;
-        }
-    }
-
-    /**
-     * get whether the sheet is protected or not
-     * @return whether to protect the sheet or not
-     */
-
-    public boolean getProtect()
-    {
-        return (field_1_protect == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SCENARIOPROTECT]\n");
-	    buffer.append("    .protect         = ").append(getProtect())
-            .append("\n");
-        buffer.append("[/SCENARIOPROTECT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_protect);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        ScenarioProtectRecord rec = new ScenarioProtectRecord();
-        rec.field_1_protect = field_1_protect;
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java
deleted file mode 100644
index 12928b9..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Selection Record (0x001D)<P>
- * Description:  shows the user's selection on the sheet
- *               for write set num refs to 0<P>
- *
- * REFERENCE:  PG 291 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class SelectionRecord extends StandardRecord {
-    public final static short sid = 0x001D;
-    private byte        field_1_pane;
-    private int         field_2_row_active_cell;
-    private int         field_3_col_active_cell;
-    private int         field_4_active_cell_ref_index;
-    private CellRangeAddress8Bit[] field_6_refs;
-
-    /**
-     * Creates a default selection record (cell A1, in pane ID 3)
-     * 
-     * @param activeCellRow the active cells row index
-     * @param activeCellCol the active cells column index
-     */
-    public SelectionRecord(int activeCellRow, int activeCellCol) {
-        field_1_pane = 3; // pane id 3 is always present.  see OOO sec 5.75 'PANE'
-        field_2_row_active_cell = activeCellRow;
-        field_3_col_active_cell = activeCellCol;
-        field_4_active_cell_ref_index = 0;
-        field_6_refs = new CellRangeAddress8Bit[] {
-            new CellRangeAddress8Bit(activeCellRow, activeCellRow, activeCellCol, activeCellCol),
-        };
-    }
-
-    public SelectionRecord(RecordInputStream in) {
-        field_1_pane            = in.readByte();
-        field_2_row_active_cell = in.readUShort();
-        field_3_col_active_cell = in.readShort();
-        field_4_active_cell_ref_index = in.readShort();
-        int field_5_num_refs    = in.readUShort();
-
-        field_6_refs = new CellRangeAddress8Bit[field_5_num_refs];
-        for (int i = 0; i < field_6_refs.length; i++) {
-            field_6_refs[i] = new CellRangeAddress8Bit(in);
-        }
-    }
-
-    /**
-     * set which window pane this is for
-     * @param pane the window pane
-     */
-    public void setPane(byte pane) {
-        field_1_pane = pane;
-    }
-
-    /**
-     * set the active cell's row
-     * @param row number of active cell
-     */
-    public void setActiveCellRow(int row) {
-        field_2_row_active_cell = row;
-    }
-
-    /**
-     * set the active cell's col
-     * @param col number of active cell
-     */
-    public void setActiveCellCol(short col) {
-        field_3_col_active_cell = col;
-    }
-
-    /**
-     * set the active cell's reference number
-     * @param ref number of active cell
-     */
-    public void setActiveCellRef(short ref) {
-        field_4_active_cell_ref_index = ref;
-    }
-
-    /**
-     * @return the pane ID which window pane this is for
-     */
-    public byte getPane() {
-        return field_1_pane;
-    }
-
-    /**
-     * get the active cell's row
-     * @return row number of active cell
-     */
-    public int getActiveCellRow() {
-        return field_2_row_active_cell;
-    }
-
-    /**
-     * get the active cell's col
-     * @return col number of active cell
-     */
-    public int getActiveCellCol() {
-        return field_3_col_active_cell;
-    }
-
-    /**
-     * get the active cell's reference number
-     * @return ref number of active cell
-     */
-    public int getActiveCellRef() {
-        return field_4_active_cell_ref_index;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[SELECTION]\n");
-        sb.append("    .pane            = ").append(HexDump.byteToHex(getPane())).append("\n");
-        sb.append("    .activecellrow   = ").append(HexDump.shortToHex(getActiveCellRow())).append("\n");
-        sb.append("    .activecellcol   = ").append(HexDump.shortToHex(getActiveCellCol())).append("\n");
-        sb.append("    .activecellref   = ").append(HexDump.shortToHex(getActiveCellRef())).append("\n");
-        sb.append("    .numrefs         = ").append(HexDump.shortToHex(field_6_refs.length)).append("\n");
-        sb.append("[/SELECTION]\n");
-        return sb.toString();
-    }
-    @Override
-    protected int getDataSize() {
-        return 9 // 1 byte + 4 shorts
-            + CellRangeAddress8Bit.getEncodedSize(field_6_refs.length);
-    }
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.writeByte(getPane());
-        out.writeShort(getActiveCellRow());
-        out.writeShort(getActiveCellCol());
-        out.writeShort(getActiveCellRef());
-        int nRefs = field_6_refs.length;
-        out.writeShort(nRefs);
-        for (CellRangeAddress8Bit field_6_ref : field_6_refs) {
-            field_6_ref.serialize(out);
-        }
-    }
-
-    @Override
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public Object clone() {
-        SelectionRecord rec = new SelectionRecord(field_2_row_active_cell, field_3_col_active_cell);
-        rec.field_1_pane = field_1_pane;
-        rec.field_4_active_cell_ref_index = field_4_active_cell_ref_index;
-        rec.field_6_refs = field_6_refs;
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
deleted file mode 100644
index 9acf82c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.ptg.*;
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.SharedFormula;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        SHAREDFMLA (0x04BC) SharedFormulaRecord
- * Description:  Primarily used as an excel optimization so that multiple similar formulas
- *               are not written out too many times.  We should recognize this record and
- *               serialize as is since this is used when reading templates.
- * <p>
- * Note: the documentation says that the SID is BC where biffviewer reports 4BC.  The hex dump shows
- * that the two byte sid representation to be 'BC 04' that is consistent with the other high byte
- * record types.
- * @author Danny Mui at apache dot org
- */
-public final class SharedFormulaRecord extends SharedValueRecordBase {
-    public final static short   sid = 0x04BC;
-
-    private int field_5_reserved;
-    private Formula field_7_parsed_expr;
-
-    // for testing only
-    public SharedFormulaRecord() {
-        this(new CellRangeAddress8Bit(0,0,0,0));
-    }
-    private SharedFormulaRecord(CellRangeAddress8Bit range) {
-        super(range);
-        field_7_parsed_expr = Formula.create(Ptg.EMPTY_PTG_ARRAY);
-    }
-
-    /**
-     * @param in the RecordInputstream to read the record from
-     */
-    public SharedFormulaRecord(RecordInputStream in) {
-        super(in);
-        field_5_reserved        = in.readShort();
-        int field_6_expression_len = in.readShort();
-        int nAvailableBytes = in.available();
-        field_7_parsed_expr = Formula.read(field_6_expression_len, in, nAvailableBytes);
-    }
-
-    protected void serializeExtraData(LittleEndianOutput out) {
-        out.writeShort(field_5_reserved);
-        field_7_parsed_expr.serialize(out);
-    }
-
-    protected int getExtraDataSize() {
-        return 2 + field_7_parsed_expr.getEncodedSize();
-    }
-
-    /**
-     * print a sort of string representation ([SHARED FORMULA RECORD] id = x [/SHARED FORMULA RECORD])
-     */
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SHARED FORMULA (").append(HexDump.intToHex(sid)).append("]\n");
-        buffer.append("    .range      = ").append(getRange().toString()).append("\n");
-        buffer.append("    .reserved    = ").append(HexDump.shortToHex(field_5_reserved)).append("\n");
-
-        Ptg[] ptgs = field_7_parsed_expr.getTokens();
-        for (int k = 0; k < ptgs.length; k++ ) {
-           buffer.append("Formula[").append(k).append("]");
-           Ptg ptg = ptgs[k];
-           buffer.append(ptg.toString()).append(ptg.getRVAType()).append("\n");
-        }
-
-        buffer.append("[/SHARED FORMULA]\n");
-        return buffer.toString();
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    /**
-     * @return the equivalent {@link Ptg} array that the formula would have, were it not shared.
-     */
-    public Ptg[] getFormulaTokens(FormulaRecord formula) {
-        int formulaRow = formula.getRow();
-        int formulaColumn = formula.getColumn();
-        //Sanity checks
-        if (!isInRange(formulaRow, formulaColumn)) {
-            throw new RuntimeException("Shared Formula Conversion: Coding Error");
-        }
-
-        SharedFormula sf = new SharedFormula(SpreadsheetVersion.EXCEL97);
-        return sf.convertSharedFormulas(field_7_parsed_expr.getTokens(), formulaRow, formulaColumn);
-    }
-
-    public Object clone() {
-        SharedFormulaRecord result = new SharedFormulaRecord(getRange());
-        result.field_5_reserved = field_5_reserved;
-        result.field_7_parsed_expr = field_7_parsed_expr.copy();
-        return result;
-    }
-	public boolean isFormulaSame(SharedFormulaRecord other) {
-		return field_7_parsed_expr.isSame(other.field_7_parsed_expr);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java b/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
deleted file mode 100644
index a503530..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Common base class for {@link SharedFormulaRecord}, {@link ArrayRecord} and
- * {@link TableRecord} which are have similarities.
- */
-public abstract class SharedValueRecordBase extends StandardRecord {
-
-	private CellRangeAddress8Bit _range;
-
-	protected SharedValueRecordBase(CellRangeAddress8Bit range) {
-		if (range == null) {
-			throw new IllegalArgumentException("range must be supplied.");
-		}
-		_range = range;
-	}
-
-	protected SharedValueRecordBase() {
-		this(new CellRangeAddress8Bit(0, 0, 0, 0));
-	}
-
-	/**
-	 * reads only the range (1 {@link CellRangeAddress8Bit}) from the stream
-	 */
-	public SharedValueRecordBase(LittleEndianInput in) {
-		_range = new CellRangeAddress8Bit(in);
-	}
-
-	/**
-	 * @return the range of cells that this record is shared across.  Never <code>null</code>.
-	 */
-	public final CellRangeAddress8Bit getRange() {
-		return _range;
-	}
-
-	public final int getFirstRow() {
-		return _range.getFirstRow();
-	}
-
-	public final int getLastRow() {
-		return _range.getLastRow();
-	}
-
-	public final int getFirstColumn() {
-		return (short) _range.getFirstColumn();
-	}
-
-	public final int getLastColumn() {
-		return (short) _range.getLastColumn();
-	}
-
-	protected int getDataSize() {
-		return CellRangeAddress8Bit.ENCODED_SIZE + getExtraDataSize();
-	}
-
-	protected abstract int getExtraDataSize();
-
-	protected abstract void serializeExtraData(LittleEndianOutput out);
-
-	public void serialize(LittleEndianOutput out) {
-		_range.serialize(out);
-		serializeExtraData(out);
-	}
-
-	/**
-     * @param rowIx the row index
-     * @param colIx the column index
-     * 
-	 * @return {@code true} if (rowIx, colIx) is within the range of this shared value object.
-     * 
-     * @see #getRange()
-	 */
-	public final boolean isInRange(int rowIx, int colIx) {
-		CellRangeAddress8Bit r = _range;
-		return r.getFirstRow() <= rowIx
-			&& r.getLastRow() >= rowIx
-			&& r.getFirstColumn() <= colIx
-			&& r.getLastColumn() >= colIx;
-	}
-	/**
-	 * @return {@code true} if (rowIx, colIx) describes the first cell in this shared value
-	 * object's range
-	 * 
-	 * @param rowIx the row index
-	 * @param colIx the column index
-	 * 
-	 * @return {@code true} if its the first cell in this shared value object range
-	 * 
-	 * @see #getRange()
-	 */
-	public final boolean isFirstCell(int rowIx, int colIx) {
-		CellRangeAddress8Bit r = getRange();
-		return r.getFirstRow() == rowIx && r.getFirstColumn() == colIx;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/StandardRecord.java b/trunk/src/java/org/apache/poi/hssf/record/StandardRecord.java
deleted file mode 100644
index 54886d7..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/StandardRecord.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Subclasses of this class (the majority of BIFF records) are non-continuable.  This allows for
- * some simplification of serialization logic
- */
-public abstract class StandardRecord extends Record {
-	protected abstract int getDataSize();
-	public final int getRecordSize() {
-		return 4 + getDataSize();
-	}
-
-    /**
-     * Write the data content of this BIFF record including the sid and record length.
-     * <p>
-     * The subclass must write the exact number of bytes as reported by
-     *  {@link org.apache.poi.hssf.record.Record#getRecordSize()}}
-     */
-	@Override
-	public final int serialize(int offset, byte[] data) {
-		int dataSize = getDataSize();
-		int recSize = 4 + dataSize;
-		LittleEndianByteArrayOutputStream out = new LittleEndianByteArrayOutputStream(data, offset, recSize);
-		out.writeShort(getSid());
-		out.writeShort(dataSize);
-		serialize(out);
-		if (out.getWriteIndex() - offset != recSize) {
-			throw new IllegalStateException("Error in serialization of (" + getClass().getName() + "): "
-					+ "Incorrect number of bytes written - expected "
-					+ recSize + " but got " + (out.getWriteIndex() - offset));
-		}
-		return recSize;
-	}
-
-    /**
-     * Write the data content of this BIFF record.  The 'ushort sid' and 'ushort size' header fields
-     * have already been written by the superclass.
-     * <p>
-     * The number of bytes written must equal the record size reported by
-     *  {@link org.apache.poi.hssf.record.Record#getRecordSize()}} minus four
-     *  ( record header consisting of a 'ushort sid' and 'ushort reclength' has already been written
-     *  by their superclass).
-     * 
-     * @param out the output object
-     */
-	protected abstract void serialize(LittleEndianOutput out);
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java b/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java
deleted file mode 100644
index d2113df..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.cont.ContinuableRecord;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * STRING (0x0207)<p>
- * 
- * Stores the cached result of a text formula
- */
-public final class StringRecord extends ContinuableRecord {
-
-	public final static short sid = 0x0207;
-
-	private boolean _is16bitUnicode;
-	private String _text;
-
-
-    public StringRecord()
-    {
-    }
-
-    /**
-     * @param in the RecordInputstream to read the record from
-     */
-    public StringRecord( RecordInputStream in) {
-        int field_1_string_length           = in.readUShort();
-        _is16bitUnicode            = in.readByte() != 0x00;
-        
-        if (_is16bitUnicode){
-            _text = in.readUnicodeLEString(field_1_string_length);
-        } else {
-            _text = in.readCompressedUnicode(field_1_string_length);
-        }
-    }
-
-
-    protected void serialize(ContinuableRecordOutput out) {
-        out.writeShort(_text.length());
-        out.writeStringData(_text);
-    }
-
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    /**
-     * @return The string represented by this record.
-     */
-    public String getString()
-    {
-        return _text;
-    }
-
-
-    /**
-     * Sets the string represented by this record.
-     */
-    public void setString(String string) {
-        _text = string;
-        _is16bitUnicode = StringUtil.hasMultibyte(string);        
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[STRING]\n");
-        buffer.append("    .string            = ")
-            .append(_text).append("\n");
-        buffer.append("[/STRING]\n");
-        return buffer.toString();
-    }
-    
-    public Object clone() {
-        StringRecord rec = new StringRecord();
-        rec._is16bitUnicode= _is16bitUnicode;
-        rec._text = _text;
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java b/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java
deleted file mode 100644
index 4d60217..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title:        Style Record (0x0293)<p>
- * Description:  Describes a builtin to the gui or user defined style<p>
- * REFERENCE:  PG 390 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class StyleRecord extends StandardRecord {
-	public final static short sid = 0x0293;
-
-	private static final BitField styleIndexMask = BitFieldFactory.getInstance(0x0FFF);
-	private static final BitField isBuiltinFlag  = BitFieldFactory.getInstance(0x8000);
-
-	/** shared by both user defined and built-in styles */
-	private int field_1_xf_index;
-
-	// only for built in styles
-	private int field_2_builtin_style;
-	private int field_3_outline_style_level;
-
-	// only for user defined styles
-	private boolean field_3_stringHasMultibyte;
-	private String field_4_name;
-
-	/**
-	 * creates a new style record, initially set to 'built-in'
-	 */
-	public StyleRecord() {
-		field_1_xf_index = isBuiltinFlag.set(0);
-	}
-
-	public StyleRecord(RecordInputStream in) {
-		field_1_xf_index = in.readShort();
-		if (isBuiltin()) {
-			field_2_builtin_style	   = in.readByte();
-			field_3_outline_style_level = in.readByte();
-		} else {
-			int field_2_name_length = in.readShort();
-
-			if(in.remaining() < 1) {
-				// Some files from Crystal Reports lack the is16BitUnicode byte
-				//  the remaining fields, which is naughty
-				if (field_2_name_length != 0) {
-					throw new RecordFormatException("Ran out of data reading style record");
-				}
-				// guess this is OK if the string length is zero
-				field_4_name = "";
-			} else {
-
-				field_3_stringHasMultibyte = in.readByte() != 0x00;
-				if (field_3_stringHasMultibyte) {
-					field_4_name = StringUtil.readUnicodeLE(in, field_2_name_length);
-				} else {
-					field_4_name = StringUtil.readCompressedUnicode(in, field_2_name_length);
-				}
-			}
-		}
-	}
-
-	/**
-	 * set the actual index of the style extended format record
-	 * @param xfIndex of the xf record
-	 */
-	public void setXFIndex(int xfIndex) {
-		field_1_xf_index = styleIndexMask.setValue(field_1_xf_index, xfIndex);
-	}
-
-	/**
-	 * get the actual index of the style extended format record
-	 * @see #getXFIndex()
-	 * @return index of the xf record
-	 */
-	public int getXFIndex() {
-		return styleIndexMask.getValue(field_1_xf_index);
-	}
-
-	/**
-	 * set the style's name
-	 * @param name of the style
-	 */
-	public void setName(String name) {
-		field_4_name = name;
-		field_3_stringHasMultibyte = StringUtil.hasMultibyte(name);
-		field_1_xf_index = isBuiltinFlag.clear(field_1_xf_index);
-	}
-
-	/**
-	 * if this is a builtin style set the number of the built in style
-	 * @param  builtinStyleId style number (0-7)
-	 *
-	 */
-	public void setBuiltinStyle(int builtinStyleId) {
-		field_1_xf_index = isBuiltinFlag.set(field_1_xf_index);
-		field_2_builtin_style = builtinStyleId;
-	}
-
-	/**
-	 * set the row or column level of the style (if builtin 1||2)
-	 */
-	public void setOutlineStyleLevel(int level) {
-		field_3_outline_style_level = level & 0x00FF;
-	}
-
-	public boolean isBuiltin(){
-		return isBuiltinFlag.isSet(field_1_xf_index);
-	}
-
-	/**
-	 * get the style's name
-	 * @return name of the style
-	 */
-	public String getName() {
-		return field_4_name;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-
-		sb.append("[STYLE]\n");
-		sb.append("    .xf_index_raw =").append(HexDump.shortToHex(field_1_xf_index)).append("\n");
-		sb.append("        .type     =").append(isBuiltin() ? "built-in" : "user-defined").append("\n");
-		sb.append("        .xf_index =").append(HexDump.shortToHex(getXFIndex())).append("\n");
-		if (isBuiltin()){
-			sb.append("    .builtin_style=").append(HexDump.byteToHex(field_2_builtin_style)).append("\n");
-			sb.append("    .outline_level=").append(HexDump.byteToHex(field_3_outline_style_level)).append("\n");
-		} else {
-			 sb.append("    .name        =").append(getName()).append("\n");
-		}
-		sb.append("[/STYLE]\n");
-		return sb.toString();
-	}
-
-
-	@Override
-	protected int getDataSize() {
-		if (isBuiltin()) {
-			return 4; // short, byte, byte
-		}
-		return 2 // short xf index
-			+ 3 // str len + flag
-			+ field_4_name.length() * (field_3_stringHasMultibyte ? 2 : 1);
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(field_1_xf_index);
-		if (isBuiltin()) {
-			out.writeByte(field_2_builtin_style);
-			out.writeByte(field_3_outline_style_level);
-		} else {
-			out.writeShort(field_4_name.length());
-			out.writeByte(field_3_stringHasMultibyte ? 0x01 : 0x00);
-			if (field_3_stringHasMultibyte) {
-				StringUtil.putUnicodeLE(getName(), out);
-			} else {
-				StringUtil.putCompressedUnicode(getName(), out);
-			}
-		}
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java b/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java
deleted file mode 100644
index 35b62c3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.LittleEndianOutputStream;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * Subrecords are part of the OBJ class.
- */
-public abstract class SubRecord {
-	protected SubRecord() {
-		// no fields to initialise
-	}
-
-    /**
-     * read a sub-record from the supplied stream
-     *
-     * @param in    the stream to read from
-     * @param cmoOt the objectType field of the containing CommonObjectDataSubRecord,
-     *   we need it to propagate to next sub-records as it defines what data follows
-     * @return the created sub-record
-     */
-    public static SubRecord createSubRecord(LittleEndianInput in, int cmoOt) {
-		int sid = in.readUShort();
-		int secondUShort = in.readUShort(); // Often (but not always) the datasize for the sub-record
-
-		switch (sid) {
-			case CommonObjectDataSubRecord.sid:
-				return new CommonObjectDataSubRecord(in, secondUShort);
-			case EmbeddedObjectRefSubRecord.sid:
-				return new EmbeddedObjectRefSubRecord(in, secondUShort);
-			case GroupMarkerSubRecord.sid:
-				return new GroupMarkerSubRecord(in, secondUShort);
-			case EndSubRecord.sid:
-				return new EndSubRecord(in, secondUShort);
-			case NoteStructureSubRecord.sid:
-				return new NoteStructureSubRecord(in, secondUShort);
-			case LbsDataSubRecord.sid:
-				return new LbsDataSubRecord(in, secondUShort, cmoOt);
-            case FtCblsSubRecord.sid:
-                return new FtCblsSubRecord(in, secondUShort);
-            case FtPioGrbitSubRecord.sid:
-            	return new FtPioGrbitSubRecord(in, secondUShort);
-            case FtCfSubRecord.sid:
-            	return new FtCfSubRecord(in, secondUShort);
-		}
-		return new UnknownSubRecord(in, sid, secondUShort);
-	}
-
-	/**
-	 * @return the size of the data for this record (which is always 4 bytes less than the total
-	 * record size).  Note however, that ushort encoded after the record sid is usually but not
-	 * always the data size.
-	 */
-	protected abstract int getDataSize();
-	public byte[] serialize() {
-		int size = getDataSize() + 4;
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
-		serialize(new LittleEndianOutputStream(baos));
-		if (baos.size() != size) {
-			throw new RuntimeException("write size mismatch");
-		}
-		return baos.toByteArray();
-	}
-
-	public abstract void serialize(LittleEndianOutput out);
-	public abstract Object clone();
-
-    /**
-     * Wether this record terminates the sub-record stream.
-     * There are two cases when this method must be overridden and return <code>true</code>
-     *  - EndSubRecord (sid = 0x00)
-     *  - LbsDataSubRecord (sid = 0x12)
-     *
-     * @return whether this record is the last in the sub-record stream
-     */
-    public boolean isTerminating(){
-        return false;
-    }
-
-    private static final class UnknownSubRecord extends SubRecord {
-
-		private final int _sid;
-		private final byte[] _data;
-
-		public UnknownSubRecord(LittleEndianInput in, int sid, int size) {
-			_sid = sid;
-	    	byte[] buf = new byte[size];
-	    	in.readFully(buf);
-	        _data = buf;
-		}
-		protected int getDataSize() {
-			return _data.length;
-		}
-		public void serialize(LittleEndianOutput out) {
-			out.writeShort(_sid);
-			out.writeShort(_data.length);
-			out.write(_data);
-		}
-		public Object clone() {
-			return this;
-		}
-		public String toString() {
-			StringBuffer sb = new StringBuffer(64);
-			sb.append(getClass().getName()).append(" [");
-			sb.append("sid=").append(HexDump.shortToHex(_sid));
-			sb.append(" size=").append(_data.length);
-			sb.append(" : ").append(HexDump.toHex(_data));
-			sb.append("]\n");
-			return sb.toString();
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java b/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java
deleted file mode 100644
index 9067c24..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title:        Sup Book - EXTERNALBOOK (0x01AE)<p>
- * Description:  A External Workbook Description (Supplemental Book)
- *               Its only a dummy record for making new ExternSheet Record<p>
- * REFERENCE:  5.38
- */
-public final class SupBookRecord extends StandardRecord {
-
-    private final static POILogger logger = POILogFactory.getLogger(SupBookRecord.class);
-	
-    public final static short sid = 0x01AE;
-
-    private static final short SMALL_RECORD_SIZE = 4;
-    private static final short TAG_INTERNAL_REFERENCES = 0x0401;
-    private static final short TAG_ADD_IN_FUNCTIONS = 0x3A01;
-
-    private short field_1_number_of_sheets;
-    private String field_2_encoded_url;
-    private String[] field_3_sheet_names;
-    private boolean _isAddInFunctions;
-
-    protected static final char CH_VOLUME = 1;
-    protected static final char CH_SAME_VOLUME = 2;
-    protected static final char CH_DOWN_DIR = 3;
-    protected static final char CH_UP_DIR = 4;
-    protected static final char CH_LONG_VOLUME = 5;
-    protected static final char CH_STARTUP_DIR = 6;
-    protected static final char CH_ALT_STARTUP_DIR = 7;
-    protected static final char CH_LIB_DIR = 8;
-    protected static final String PATH_SEPERATOR = System.getProperty("file.separator");
-
-    public static SupBookRecord createInternalReferences(short numberOfSheets) {
-        return new SupBookRecord(false, numberOfSheets);
-    }
-    public static SupBookRecord createAddInFunctions() {
-        return new SupBookRecord(true, (short)1 /* this field MUST be 0x0001 for add-in referencing */);
-    }
-    public static SupBookRecord createExternalReferences(String url, String[] sheetNames) {
-        return new SupBookRecord(url, sheetNames);
-    }
-    private SupBookRecord(boolean isAddInFuncs, short numberOfSheets) {
-        // else not 'External References'
-        field_1_number_of_sheets = numberOfSheets;
-        field_2_encoded_url = null;
-        field_3_sheet_names = null;
-        _isAddInFunctions = isAddInFuncs;
-    }
-    public SupBookRecord(String url, String[] sheetNames) {
-        field_1_number_of_sheets = (short) sheetNames.length;
-        field_2_encoded_url = url;
-        field_3_sheet_names = sheetNames;
-        _isAddInFunctions = false;
-    }
-
-    public boolean isExternalReferences() {
-        return field_3_sheet_names != null;
-    }
-    public boolean isInternalReferences() {
-        return field_3_sheet_names == null && !_isAddInFunctions;
-    }
-    public boolean isAddInFunctions() {
-        return field_3_sheet_names == null && _isAddInFunctions;
-    }
-    /**
-     * called by the constructor, should set class level fields.  Should throw
-     * runtime exception for bad/incomplete data.
-     *
-     * @param in the stream to read from
-     */
-    public SupBookRecord(RecordInputStream in) {
-        int recLen = in.remaining();
-
-        field_1_number_of_sheets = in.readShort();
-
-        if(recLen > SMALL_RECORD_SIZE) {
-            // 5.38.1 External References
-            _isAddInFunctions = false;
-
-            field_2_encoded_url = in.readString();
-            String[] sheetNames = new String[field_1_number_of_sheets];
-            for (int i = 0; i < sheetNames.length; i++) {
-                sheetNames[i] = in.readString();
-            }
-            field_3_sheet_names = sheetNames;
-            return;
-        }
-        // else not 'External References'
-        field_2_encoded_url = null;
-        field_3_sheet_names = null;
-
-        short nextShort = in.readShort();
-        if(nextShort == TAG_INTERNAL_REFERENCES) {
-            // 5.38.2 'Internal References'
-            _isAddInFunctions = false;
-        } else if(nextShort == TAG_ADD_IN_FUNCTIONS) {
-            // 5.38.3 'Add-In Functions'
-            _isAddInFunctions = true;
-            if(field_1_number_of_sheets != 1) {
-                throw new RuntimeException("Expected 0x0001 for number of sheets field in 'Add-In Functions' but got ("
-                     + field_1_number_of_sheets + ")");
-            }
-        } else {
-            throw new RuntimeException("invalid EXTERNALBOOK code ("
-                     + Integer.toHexString(nextShort) + ")");
-        }
-     }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append("[SUPBOOK ");
-
-        if(isExternalReferences()) {
-            sb.append("External References]\n");
-            sb.append(" .url     = ").append(field_2_encoded_url).append("\n");
-            sb.append(" .nSheets = ").append(field_1_number_of_sheets).append("\n");
-            for (String sheetname : field_3_sheet_names) {
-                sb.append("    .name = ").append(sheetname).append("\n");
-            }
-            sb.append("[/SUPBOOK");
-        } else if(_isAddInFunctions) {
-            sb.append("Add-In Functions");
-        } else {
-            sb.append("Internal References");
-            sb.append(" nSheets=").append(field_1_number_of_sheets);
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-    protected int getDataSize() {
-        if(!isExternalReferences()) {
-            return SMALL_RECORD_SIZE;
-        }
-        int sum = 2; // u16 number of sheets
-
-        sum += StringUtil.getEncodedSize(field_2_encoded_url);
-
-        for(int i=0; i<field_3_sheet_names.length; i++) {
-            sum += StringUtil.getEncodedSize(field_3_sheet_names[i]);
-        }
-        return sum;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_number_of_sheets);
-
-        if(isExternalReferences()) {
-            StringUtil.writeUnicodeString(out, field_2_encoded_url);
-
-            for(int i=0; i<field_3_sheet_names.length; i++) {
-                StringUtil.writeUnicodeString(out, field_3_sheet_names[i]);
-            }
-        } else {
-            int field2val = _isAddInFunctions ? TAG_ADD_IN_FUNCTIONS : TAG_INTERNAL_REFERENCES;
-
-            out.writeShort(field2val);
-        }
-    }
-
-    public void setNumberOfSheets(short number){
-        field_1_number_of_sheets = number;
-    }
-
-    public short getNumberOfSheets(){
-        return field_1_number_of_sheets;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-    public String getURL() {
-        String encodedUrl = field_2_encoded_url;
-        switch(encodedUrl.charAt(0)) {
-            case 0: // Reference to an empty workbook name
-                return encodedUrl.substring(1); // will this just be empty string?
-            case 1: // encoded file name
-                return decodeFileName(encodedUrl);
-            case 2: // Self-referential external reference
-                return encodedUrl.substring(1);
-
-        }
-        return encodedUrl;
-    }
-    private static String decodeFileName(String encodedUrl) {
-        /* see "MICROSOFT OFFICE EXCEL 97-2007  BINARY FILE FORMAT SPECIFICATION" */
-    	StringBuilder sb = new StringBuilder();
-        for(int i=1; i<encodedUrl.length(); i++) {
-        	char c = encodedUrl.charAt(i);
-        	switch (c) {
-        	case CH_VOLUME:
-        		char driveLetter = encodedUrl.charAt(++i);
-        		if (driveLetter == '@') {
-        			sb.append("\\\\");
-        		} else {
-        			//Windows notation for drive letters
-        			sb.append(driveLetter).append(":");
-        		}
-        		break;
-        	case CH_SAME_VOLUME:
-        		sb.append(PATH_SEPERATOR);
-        		break;
-        	case CH_DOWN_DIR:
-        		sb.append(PATH_SEPERATOR);
-        		break;
-        	case CH_UP_DIR:
-        		sb.append("..").append(PATH_SEPERATOR);
-        		break;
-        	case CH_LONG_VOLUME:
-        		//Don't known to handle...
-        		logger.log(POILogger.WARN, "Found unexpected key: ChLongVolume - IGNORING");
-        		break;
-        	case CH_STARTUP_DIR:
-        	case CH_ALT_STARTUP_DIR:
-        	case CH_LIB_DIR:
-        		logger.log(POILogger.WARN, "EXCEL.EXE path unkown - using this directoy instead: .");
-        		sb.append(".").append(PATH_SEPERATOR);
-        		break;
-        	default:
-        		sb.append(c);
-        	}
-        }
-        return sb.toString();
-    }
-    public String[] getSheetNames() {
-        return field_3_sheet_names.clone();
-    }
-    
-    public void setURL(String pUrl) {
-    	//Keep the first marker character!
-    	field_2_encoded_url = field_2_encoded_url.substring(0, 1) + pUrl; 
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java b/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java
deleted file mode 100644
index acc6a05..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Sheet Tab Index Array Record (0x013D)<p>
- * Description:  Contains an array of sheet id's.  Sheets always keep their ID
- *               regardless of what their name is.<p>
- * REFERENCE:  PG 412 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class TabIdRecord extends StandardRecord {
-    public final static short sid = 0x013D;
-    private static final short[] EMPTY_SHORT_ARRAY = { };
-
-    public short[] _tabids;
-
-    public TabIdRecord() {
-        _tabids = EMPTY_SHORT_ARRAY;
-    }
-
-    public TabIdRecord(RecordInputStream in) {
-        int nTabs = in.remaining() / 2;
-        _tabids = new short[nTabs];
-        for (int i = 0; i < _tabids.length; i++) {
-            _tabids[i] = in.readShort();
-        }
-    }
-
-    /**
-     * set the tab array.  (0,1,2).
-     * @param array of tab id's {0,1,2}
-     */
-    public void setTabIdArray(short[] array) {
-        _tabids = array.clone();
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[TABID]\n");
-        buffer.append("    .elements        = ").append(_tabids.length).append("\n");
-        for (int i = 0; i < _tabids.length; i++) {
-            buffer.append("    .element_").append(i).append(" = ").append(_tabids[i]).append("\n");
-        }
-        buffer.append("[/TABID]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        short[] tabids = _tabids;
-
-        for (int i = 0; i < tabids.length; i++) {
-            out.writeShort(tabids[i]);
-        }
-    }
-
-    protected int getDataSize() {
-        return _tabids.length * 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java b/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java
deleted file mode 100644
index 7c42db2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.ptg.TblPtg;
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-/**
- * DATATABLE (0x0236)<p>
- *
- * TableRecord - The record specifies a data table.
- * This record is preceded by a single Formula record that
- *  defines the first cell in the data table, which should
- *  only contain a single Ptg, {@link TblPtg}.
- *
- * See p536 of the June 08 binary docs
- */
-public final class TableRecord extends SharedValueRecordBase {
-	public static final short sid = 0x0236;
-
-	private static final BitField alwaysCalc      = BitFieldFactory.getInstance(0x0001);
-	private static final BitField calcOnOpen      = BitFieldFactory.getInstance(0x0002);
-	private static final BitField rowOrColInpCell = BitFieldFactory.getInstance(0x0004);
-	private static final BitField oneOrTwoVar     = BitFieldFactory.getInstance(0x0008);
-	private static final BitField rowDeleted      = BitFieldFactory.getInstance(0x0010);
-	private static final BitField colDeleted      = BitFieldFactory.getInstance(0x0020);
-
-	private int field_5_flags;
-	private int field_6_res;
-	private int field_7_rowInputRow;
-	private int field_8_colInputRow;
-	private int field_9_rowInputCol;
-	private int field_10_colInputCol;
-
-	public TableRecord(RecordInputStream in) {
-		super(in);
-		field_5_flags        = in.readByte();
-		field_6_res          = in.readByte();
-		field_7_rowInputRow  = in.readShort();
-		field_8_colInputRow  = in.readShort();
-		field_9_rowInputCol  = in.readShort();
-		field_10_colInputCol = in.readShort();
-	}
-
-	public TableRecord(CellRangeAddress8Bit range) {
-		super(range);
-		field_6_res = 0;
-	}
-
-	public int getFlags() {
-		return field_5_flags;
-	}
-	public void setFlags(int flags) {
-		field_5_flags = flags;
-	}
-
-	public int getRowInputRow() {
-		return field_7_rowInputRow;
-	}
-	public void setRowInputRow(int rowInputRow) {
-		field_7_rowInputRow = rowInputRow;
-	}
-
-	public int getColInputRow() {
-		return field_8_colInputRow;
-	}
-	public void setColInputRow(int colInputRow) {
-		field_8_colInputRow = colInputRow;
-	}
-
-	public int getRowInputCol() {
-		return field_9_rowInputCol;
-	}
-	public void setRowInputCol(int rowInputCol) {
-		field_9_rowInputCol = rowInputCol;
-	}
-
-	public int getColInputCol() {
-		return field_10_colInputCol;
-	}
-	public void setColInputCol(int colInputCol) {
-		field_10_colInputCol = colInputCol;
-	}
-
-
-	public boolean isAlwaysCalc() {
-		return alwaysCalc.isSet(field_5_flags);
-	}
-	public void setAlwaysCalc(boolean flag) {
-		field_5_flags = alwaysCalc.setBoolean(field_5_flags, flag);
-	}
-
-	public boolean isRowOrColInpCell() {
-		return rowOrColInpCell.isSet(field_5_flags);
-	}
-	public void setRowOrColInpCell(boolean flag) {
-		field_5_flags = rowOrColInpCell.setBoolean(field_5_flags, flag);
-	}
-
-	public boolean isOneNotTwoVar() {
-		return oneOrTwoVar.isSet(field_5_flags);
-	}
-	public void setOneNotTwoVar(boolean flag) {
-		field_5_flags = oneOrTwoVar.setBoolean(field_5_flags, flag);
-	}
-
-	public boolean isColDeleted() {
-		return colDeleted.isSet(field_5_flags);
-	}
-	public void setColDeleted(boolean flag) {
-		field_5_flags = colDeleted.setBoolean(field_5_flags, flag);
-	}
-
-	public boolean isRowDeleted() {
-		return rowDeleted.isSet(field_5_flags);
-	}
-	public void setRowDeleted(boolean flag) {
-		field_5_flags = rowDeleted.setBoolean(field_5_flags, flag);
-	}
-
-
-	public short getSid() {
-		return sid;
-	}
-	protected int getExtraDataSize() {
-		return 
-		2 // 2 byte fields
-		+ 8; // 4 short fields
-	}
-	protected void serializeExtraData(LittleEndianOutput out) {
-		out.writeByte(field_5_flags);
-		out.writeByte(field_6_res);
-		out.writeShort(field_7_rowInputRow);
-		out.writeShort(field_8_colInputRow);
-		out.writeShort(field_9_rowInputCol);
-		out.writeShort(field_10_colInputCol);
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("[TABLE]\n");
-		buffer.append("    .range    = ").append(getRange().toString()).append("\n");
-		buffer.append("    .flags    = ") .append(HexDump.byteToHex(field_5_flags)).append("\n");
-		buffer.append("    .alwaysClc= ").append(isAlwaysCalc()).append("\n");
-		buffer.append("    .reserved = ").append(HexDump.intToHex(field_6_res)).append("\n");
-		CellReference crRowInput = cr(field_7_rowInputRow, field_8_colInputRow);
-		CellReference crColInput = cr(field_9_rowInputCol, field_10_colInputCol);
-		buffer.append("    .rowInput = ").append(crRowInput.formatAsString()).append("\n");
-		buffer.append("    .colInput = ").append(crColInput.formatAsString()).append("\n");
-		buffer.append("[/TABLE]\n");
-		return buffer.toString();
-	}
-
-	private static CellReference cr(int rowIx, int colIxAndFlags) {
-		int colIx = colIxAndFlags & 0x00FF;
-		boolean isRowAbs = (colIxAndFlags & 0x8000) == 0;
-		boolean isColAbs = (colIxAndFlags & 0x4000) == 0;
-		return new CellReference(rowIx, colIx, isRowAbs, isColAbs);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/TableStylesRecord.java b/trunk/src/java/org/apache/poi/hssf/record/TableStylesRecord.java
deleted file mode 100644
index 27bd8a7..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/TableStylesRecord.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * TABLESTYLES (0x088E)
- */
-public final class TableStylesRecord extends StandardRecord {
-	public static final short sid = 0x088E;
-	
-	private int rt;
-	private int grbitFrt;
-	private byte[] unused = new byte[8];
-	private int cts;
-	
-	private String rgchDefListStyle;
-	private String rgchDefPivotStyle;
-	
-	
-	public TableStylesRecord(RecordInputStream in) {
-		rt = in.readUShort();
-		grbitFrt = in.readUShort();
-		in.readFully(unused);
-		cts = in.readInt();
-		int cchDefListStyle = in.readUShort();
-		int cchDefPivotStyle = in.readUShort();
-		
-		rgchDefListStyle = in.readUnicodeLEString(cchDefListStyle);
-		rgchDefPivotStyle = in.readUnicodeLEString(cchDefPivotStyle);
-	}
-	
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.write(unused);
-		out.writeInt(cts);
-		
-		out.writeShort(rgchDefListStyle.length());
-		out.writeShort(rgchDefPivotStyle.length());
-		
-		StringUtil.putUnicodeLE(rgchDefListStyle, out);
-		StringUtil.putUnicodeLE(rgchDefPivotStyle, out);
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 8 + 4 + 2 + 2
-			+ (2*rgchDefListStyle.length()) + (2*rgchDefPivotStyle.length());
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[TABLESTYLES]\n");
-		buffer.append("    .rt      =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt=").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .unused  =").append(HexDump.toHex(unused)).append('\n');
-		buffer.append("    .cts=").append(HexDump.intToHex(cts)).append('\n');
-		buffer.append("    .rgchDefListStyle=").append(rgchDefListStyle).append('\n');
-		buffer.append("    .rgchDefPivotStyle=").append(rgchDefPivotStyle).append('\n');
-
-		buffer.append("[/TABLESTYLES]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
deleted file mode 100644
index 148bee3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.cont.ContinuableRecord;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.ss.formula.ptg.OperandPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-
-/**
- * The TXO record (0x01B6) is used to define the properties of a text box. It is
- * followed by two or more continue records unless there is no actual text. The
- * first continue records contain the text data and the last continue record
- * contains the formatting runs.
- */
-public final class TextObjectRecord extends ContinuableRecord {
-	public final static short sid = 0x01B6;
-
-	private static final int FORMAT_RUN_ENCODED_SIZE = 8; // 2 shorts and 4 bytes reserved
-
-	private static final BitField HorizontalTextAlignment = BitFieldFactory.getInstance(0x000E);
-	private static final BitField VerticalTextAlignment = BitFieldFactory.getInstance(0x0070);
-	private static final BitField textLocked = BitFieldFactory.getInstance(0x0200);
-
-	public final static short HORIZONTAL_TEXT_ALIGNMENT_LEFT_ALIGNED = 1;
-	public final static short HORIZONTAL_TEXT_ALIGNMENT_CENTERED = 2;
-	public final static short HORIZONTAL_TEXT_ALIGNMENT_RIGHT_ALIGNED = 3;
-	public final static short HORIZONTAL_TEXT_ALIGNMENT_JUSTIFIED = 4;
-	public final static short VERTICAL_TEXT_ALIGNMENT_TOP = 1;
-	public final static short VERTICAL_TEXT_ALIGNMENT_CENTER = 2;
-	public final static short VERTICAL_TEXT_ALIGNMENT_BOTTOM = 3;
-	public final static short VERTICAL_TEXT_ALIGNMENT_JUSTIFY = 4;
-
-	public final static short TEXT_ORIENTATION_NONE = 0;
-	public final static short TEXT_ORIENTATION_TOP_TO_BOTTOM = 1;
-	public final static short TEXT_ORIENTATION_ROT_RIGHT = 2;
-	public final static short TEXT_ORIENTATION_ROT_LEFT = 3;
-
-	private int field_1_options;
-	private int field_2_textOrientation;
-	private int field_3_reserved4;
-	private int field_4_reserved5;
-	private int field_5_reserved6;
-	private int field_8_reserved7;
-
-	private HSSFRichTextString _text;
-
-	/*
-	 * Note - the next three fields are very similar to those on
-	 * EmbededObjectRefSubRecord(ftPictFmla 0x0009)
-	 *
-	 * some observed values for the 4 bytes preceding the formula: C0 5E 86 03
-	 * C0 11 AC 02 80 F1 8A 03 D4 F0 8A 03
-	 */
-	private int _unknownPreFormulaInt;
-	/** expect tRef, tRef3D, tArea, tArea3D or tName */
-	private OperandPtg _linkRefPtg;
-	/**
-	 * Not clear if needed .  Excel seems to be OK if this byte is not present.
-	 * Value is often the same as the earlier firstColumn byte. */
-	private Byte _unknownPostFormulaByte;
-
-	public TextObjectRecord() {
-		//
-	}
-
-	public TextObjectRecord(RecordInputStream in) {
-		field_1_options = in.readUShort();
-		field_2_textOrientation = in.readUShort();
-		field_3_reserved4 = in.readUShort();
-		field_4_reserved5 = in.readUShort();
-		field_5_reserved6 = in.readUShort();
-		int field_6_textLength = in.readUShort();
-		int field_7_formattingDataLength = in.readUShort();
-		field_8_reserved7 = in.readInt();
-
-		if (in.remaining() > 0) {
-			// Text Objects can have simple reference formulas
-			// (This bit not mentioned in the MS document)
-			if (in.remaining() < 11) {
-				throw new RecordFormatException("Not enough remaining data for a link formula");
-			}
-			int formulaSize = in.readUShort();
-			_unknownPreFormulaInt = in.readInt();
-			Ptg[] ptgs = Ptg.readTokens(formulaSize, in);
-			if (ptgs.length != 1) {
-				throw new RecordFormatException("Read " + ptgs.length
-						+ " tokens but expected exactly 1");
-			}
-			_linkRefPtg = (OperandPtg) ptgs[0];
-			if (in.remaining() > 0) {
-				_unknownPostFormulaByte = Byte.valueOf(in.readByte());
-			} else {
-				_unknownPostFormulaByte = null;
-			}
-		} else {
-			_linkRefPtg = null;
-		}
-		if (in.remaining() > 0) {
-			throw new RecordFormatException("Unused " + in.remaining() + " bytes at end of record");
-		}
-
-		String text;
-		if (field_6_textLength > 0) {
-			text = readRawString(in, field_6_textLength);
-		} else {
-			text = "";
-		}
-		_text = new HSSFRichTextString(text);
-
-		if (field_7_formattingDataLength > 0) {
-			processFontRuns(in, _text, field_7_formattingDataLength);
-		}
-	}
-
-	private static String readRawString(RecordInputStream in, int textLength) {
-		byte compressByte = in.readByte();
-		boolean isCompressed = (compressByte & 0x01) == 0;
-		if (isCompressed) {
-			return in.readCompressedUnicode(textLength);
-		}
-		return in.readUnicodeLEString(textLength);
-	}
-
-	private static void processFontRuns(RecordInputStream in, HSSFRichTextString str,
-			int formattingRunDataLength) {
-		if (formattingRunDataLength % FORMAT_RUN_ENCODED_SIZE != 0) {
-			throw new RecordFormatException("Bad format run data length " + formattingRunDataLength
-					+ ")");
-		}
-		int nRuns = formattingRunDataLength / FORMAT_RUN_ENCODED_SIZE;
-		for (int i = 0; i < nRuns; i++) {
-			short index = in.readShort();
-			short iFont = in.readShort();
-			in.readInt(); // skip reserved.
-			str.applyFont(index, str.length(), iFont);
-		}
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	private void serializeTXORecord(ContinuableRecordOutput out) {
-
-		out.writeShort(field_1_options);
-		out.writeShort(field_2_textOrientation);
-		out.writeShort(field_3_reserved4);
-		out.writeShort(field_4_reserved5);
-		out.writeShort(field_5_reserved6);
-		out.writeShort(_text.length());
-		out.writeShort(getFormattingDataLength());
-		out.writeInt(field_8_reserved7);
-
-		if (_linkRefPtg != null) {
-			int formulaSize = _linkRefPtg.getSize();
-			out.writeShort(formulaSize);
-			out.writeInt(_unknownPreFormulaInt);
-			_linkRefPtg.write(out);
-			if (_unknownPostFormulaByte != null) {
-				out.writeByte(_unknownPostFormulaByte.byteValue());
-			}
-		}
-	}
-
-	private void serializeTrailingRecords(ContinuableRecordOutput out) {
-		out.writeContinue();
-		out.writeStringData(_text.getString());
-		out.writeContinue();
-		writeFormatData(out, _text);
-	}
-
-	protected void serialize(ContinuableRecordOutput out) {
-
-		serializeTXORecord(out);
-		if (_text.getString().length() > 0) {
-			serializeTrailingRecords(out);
-		}
-	}
-
-	private int getFormattingDataLength() {
-		if (_text.length() < 1) {
-			// important - no formatting data if text is empty
-			return 0;
-		}
-		return (_text.numFormattingRuns() + 1) * FORMAT_RUN_ENCODED_SIZE;
-	}
-
-	private static void writeFormatData(ContinuableRecordOutput out , HSSFRichTextString str) {
-		int nRuns = str.numFormattingRuns();
-		for (int i = 0; i < nRuns; i++) {
-			out.writeShort(str.getIndexOfFormattingRun(i));
-			int fontIndex = str.getFontOfFormattingRun(i);
-			out.writeShort(fontIndex == HSSFRichTextString.NO_FONT ? 0 : fontIndex);
-			out.writeInt(0); // skip reserved
-		}
-		out.writeShort(str.length());
-		out.writeShort(0);
-		out.writeInt(0); // skip reserved
-	}
-
-	/**
-	 * Sets the Horizontal text alignment field value.
-	 */
-	public void setHorizontalTextAlignment(int value) {
-		field_1_options = HorizontalTextAlignment.setValue(field_1_options, value);
-	}
-
-	/**
-	 * @return the Horizontal text alignment field value.
-	 */
-	public int getHorizontalTextAlignment() {
-		return HorizontalTextAlignment.getValue(field_1_options);
-	}
-
-	/**
-	 * Sets the Vertical text alignment field value.
-	 */
-	public void setVerticalTextAlignment(int value) {
-		field_1_options = VerticalTextAlignment.setValue(field_1_options, value);
-	}
-
-	/**
-	 * @return the Vertical text alignment field value.
-	 */
-	public int getVerticalTextAlignment() {
-		return VerticalTextAlignment.getValue(field_1_options);
-	}
-
-	/**
-	 * Sets the text locked field value.
-	 */
-	public void setTextLocked(boolean value) {
-		field_1_options = textLocked.setBoolean(field_1_options, value);
-	}
-
-	/**
-	 * @return the text locked field value.
-	 */
-	public boolean isTextLocked() {
-		return textLocked.isSet(field_1_options);
-	}
-
-	/**
-	 * Get the text orientation field for the TextObjectBase record.
-	 *
-	 * @return One of TEXT_ORIENTATION_NONE TEXT_ORIENTATION_TOP_TO_BOTTOM
-	 *         TEXT_ORIENTATION_ROT_RIGHT TEXT_ORIENTATION_ROT_LEFT
-	 */
-	public int getTextOrientation() {
-		return field_2_textOrientation;
-	}
-
-	/**
-	 * Set the text orientation field for the TextObjectBase record.
-	 *
-	 * @param textOrientation
-	 *            One of TEXT_ORIENTATION_NONE TEXT_ORIENTATION_TOP_TO_BOTTOM
-	 *            TEXT_ORIENTATION_ROT_RIGHT TEXT_ORIENTATION_ROT_LEFT
-	 */
-	public void setTextOrientation(int textOrientation) {
-		this.field_2_textOrientation = textOrientation;
-	}
-
-	public HSSFRichTextString getStr() {
-		return _text;
-	}
-
-	public void setStr(HSSFRichTextString str) {
-		_text = str;
-	}
-
-	public Ptg getLinkRefPtg() {
-		return _linkRefPtg;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("[TXO]\n");
-		sb.append("    .options        = ").append(HexDump.shortToHex(field_1_options)).append("\n");
-		sb.append("         .isHorizontal = ").append(getHorizontalTextAlignment()).append('\n');
-		sb.append("         .isVertical   = ").append(getVerticalTextAlignment()).append('\n');
-		sb.append("         .textLocked   = ").append(isTextLocked()).append('\n');
-		sb.append("    .textOrientation= ").append(HexDump.shortToHex(getTextOrientation())).append("\n");
-		sb.append("    .reserved4      = ").append(HexDump.shortToHex(field_3_reserved4)).append("\n");
-		sb.append("    .reserved5      = ").append(HexDump.shortToHex(field_4_reserved5)).append("\n");
-		sb.append("    .reserved6      = ").append(HexDump.shortToHex(field_5_reserved6)).append("\n");
-		sb.append("    .textLength     = ").append(HexDump.shortToHex(_text.length())).append("\n");
-		sb.append("    .reserved7      = ").append(HexDump.intToHex(field_8_reserved7)).append("\n");
-
-		sb.append("    .string = ").append(_text).append('\n');
-
-		for (int i = 0; i < _text.numFormattingRuns(); i++) {
-			sb.append("    .textrun = ").append(_text.getFontOfFormattingRun(i)).append('\n');
-
-		}
-		sb.append("[/TXO]\n");
-		return sb.toString();
-	}
-
-	public Object clone() {
-
-		TextObjectRecord rec = new TextObjectRecord();
-		rec._text = _text;
-
-		rec.field_1_options = field_1_options;
-		rec.field_2_textOrientation = field_2_textOrientation;
-		rec.field_3_reserved4 = field_3_reserved4;
-		rec.field_4_reserved5 = field_4_reserved5;
-		rec.field_5_reserved6 = field_5_reserved6;
-		rec.field_8_reserved7 = field_8_reserved7;
-
-		rec._text = _text; // clone needed?
-
-		if (_linkRefPtg != null) {
-			rec._unknownPreFormulaInt = _unknownPreFormulaInt;
-			rec._linkRefPtg = _linkRefPtg.copy();
-			rec._unknownPostFormulaByte = _unknownPostFormulaByte;
-		}
-		return rec;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java b/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
deleted file mode 100644
index 2dfa32b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.*;
-
-/**
- * Record for the top margin.
- */
-public final class TopMarginRecord extends StandardRecord implements Margin {
-    public final static short sid = 0x28;
-    private double field_1_margin;
-
-    public TopMarginRecord()    {    }
-
-    /**
-     * @param in the RecordInputstream to read the record from
-     */
-    public TopMarginRecord( RecordInputStream in )
-    {
-        field_1_margin = in.readDouble();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append( "[TopMargin]\n" );
-        buffer.append( "    .margin               = " ).append( " (" ).append( getMargin() ).append( " )\n" );
-        buffer.append( "[/TopMargin]\n" );
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeDouble(field_1_margin);
-    }
-
-    protected int getDataSize() {
-        return 8;
-    }
-
-    public short getSid()    {        return sid;    }
-
-    /**
-     * Get the margin field for the TopMargin record.
-     */
-    public double getMargin()    {        return field_1_margin;    }
-
-    /**
-     * Set the margin field for the TopMargin record.
-     */
-    public void setMargin( double field_1_margin )
-    {        this.field_1_margin = field_1_margin;    }
-
-    public Object clone()
-    {
-        TopMarginRecord rec = new TopMarginRecord();
-        rec.field_1_margin = this.field_1_margin;
-        return rec;
-    }
-}  // END OF 
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java b/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java
deleted file mode 100644
index 2ae3e03..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Uncalced Record
- * <P>
- * If this record occurs in the Worksheet Substream, it indicates that the formulas have not 
- * been recalculated before the document was saved.
- * 
- * @author Olivier Leprince
- */
-public final class UncalcedRecord extends StandardRecord  {
-	public final static short sid = 0x005E;
-
-    private short _reserved;
-
-	public UncalcedRecord() {
-        _reserved = 0;
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public UncalcedRecord(RecordInputStream in) {
-		_reserved = in.readShort(); // unused
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("[UNCALCED]\n");
-        buffer.append("    _reserved: ").append(_reserved).append('\n');
-		buffer.append("[/UNCALCED]\n");
-		return buffer.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(_reserved);
-	}
-
-	protected int getDataSize() {
-		return 2;
-	}
-
-	public static int getStaticRecordSize() {
-		return 6;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java b/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java
deleted file mode 100644
index 59bab98..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Locale;
-
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Unknown Record (for debugging)<p>
- * Description:  Unknown record just tells you the sid so you can figure out
- *               what records you are missing.  Also helps us read/modify sheets we
- *               don't know all the records to.  (HSSF leaves these alone!)<p>
- * Company:      SuperLink Software, Inc.
- */
-public final class UnknownRecord extends StandardRecord {
-
-    /*
-     * Some Record IDs used by POI as 'milestones' in the record stream
-     */
-    /**
-     * seems to be part of the {@link PageSettingsBlock}. Not interpreted by POI.
-     * The name 'PRINTSIZE' was taken from OOO source.<p>
-     * The few POI test samples with this record have data { 0x03, 0x00 }.
-     */
-    public static final int PRINTSIZE_0033       = 0x0033;
-    /**
-     * Environment-Specific Print Record
-     */
-    public static final int PLS_004D             = 0x004D;
-    public static final int SHEETPR_0081         = 0x0081;
-    public static final int SORT_0090            = 0x0090;
-    public static final int STANDARDWIDTH_0099   = 0x0099;
-    public static final int SCL_00A0             = 0x00A0;
-    public static final int BITMAP_00E9          = 0x00E9;
-    public static final int PHONETICPR_00EF      = 0x00EF;
-    public static final int LABELRANGES_015F     = 0x015F;
-    public static final int QUICKTIP_0800        = 0x0800;
-    public static final int SHEETEXT_0862        = 0x0862; // OOO calls this SHEETLAYOUT
-    public static final int SHEETPROTECTION_0867 = 0x0867;
-    public static final int HEADER_FOOTER_089C   = 0x089C;
-    public static final int CODENAME_1BA         = 0x01BA;
-    public static final int PLV_MAC              = 0x08C8;
-
-    private int _sid;
-    private byte[] _rawData;
-
-    /**
-     * @param id    id of the record -not validated, just stored for serialization
-     * @param data  the data
-     */
-    public UnknownRecord(int id, byte[] data) {
-        _sid = id & 0xFFFF;
-        _rawData = data;
-    }
-
-
-    /**
-     * construct an unknown record.  No fields are interpreted and the record will
-     * be serialized in its original form more or less
-     * @param in the RecordInputstream to read the record from
-     */
-    public UnknownRecord(RecordInputStream in) {
-        _sid = in.getSid();
-        _rawData = in.readRemainder();
-//        if (false && getBiffName(_sid) == null) {
-//            // unknown sids in the range 0x0004-0x0013 are probably 'sub-records' of ObjectRecord
-//            // those sids are in a different number space.
-//            // TODO - put unknown OBJ sub-records in a different class
-//            System.out.println("Unknown record 0x" + 
-//                               Integer.toHexString(_sid).toUpperCase(Locale.ROOT));
-//        }
-    }
-
-    /**
-     * spit the record out AS IS. no interpretation or identification
-     */
-    @Override
-    public void serialize(LittleEndianOutput out) {
-        out.write(_rawData);
-    }
-
-    @Override
-    protected int getDataSize() {
-        return _rawData.length;
-    }
-
-    /**
-     * print a sort of string representation ([UNKNOWN RECORD] id = x [/UNKNOWN RECORD])
-     */
-    @Override
-    public String toString() {
-        String biffName = getBiffName(_sid);
-        if (biffName == null) {
-            biffName = "UNKNOWNRECORD";
-        }
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[").append(biffName).append("] (0x");
-        sb.append(Integer.toHexString(_sid).toUpperCase(Locale.ROOT) + ")\n");
-        if (_rawData.length > 0) {
-            sb.append("  rawData=").append(HexDump.toHex(_rawData)).append("\n");
-        }
-        sb.append("[/").append(biffName).append("]\n");
-        return sb.toString();
-    }
-
-    @Override
-    public short getSid() {
-        return (short) _sid;
-    }
-
-    /**
-     * These BIFF record types are known but still uninterpreted by POI
-     *
-     * @return the documented name of this BIFF record type, <code>null</code> if unknown to POI
-     */
-    public static String getBiffName(int sid) {
-        // Note to POI developers:
-        // Make sure you delete the corresponding entry from
-        // this method any time a new Record subclass is created.
-        switch (sid) {
-            case PRINTSIZE_0033: return "PRINTSIZE";
-            case PLS_004D: return "PLS";
-            case 0x0050: return "DCON"; // Data Consolidation Information
-            case 0x007F: return "IMDATA";
-            case SHEETPR_0081: return "SHEETPR";
-            case SORT_0090: return "SORT"; // Sorting Options
-            case 0x0094: return "LHRECORD"; // .WK? File Conversion Information
-            case STANDARDWIDTH_0099: return "STANDARDWIDTH"; //Standard Column Width
-            case SCL_00A0: return "SCL"; // Window Zoom Magnification
-            case 0x00AE: return "SCENMAN"; // Scenario Output Data
-
-            case 0x00B2: return "SXVI";        // (pivot table) View Item
-            case 0x00B4: return "SXIVD";       // (pivot table) Row/Column Field IDs
-            case 0x00B5: return "SXLI";        // (pivot table) Line Item Array
-
-            case 0x00D3: return "OBPROJ";
-            case 0x00DC: return "PARAMQRY";
-            case 0x00DE: return "OLESIZE";
-            case BITMAP_00E9: return "BITMAP";
-            case PHONETICPR_00EF: return "PHONETICPR";
-            case 0x00F1: return "SXEX";        // PivotTable View Extended Information
-
-            case LABELRANGES_015F: return "LABELRANGES";
-            case 0x01BA: return "CODENAME";
-            case 0x01A9: return "USERBVIEW";
-            case 0x01AD: return "QSI";
-
-            case 0x01C0: return "EXCEL9FILE";
-
-            case 0x0802: return "QSISXTAG";   // Pivot Table and Query Table Extensions
-            case 0x0803: return "DBQUERYEXT";
-            case 0x0805: return "TXTQUERY";
-            case 0x0810: return "SXVIEWEX9";  // Pivot Table Extensions
-
-            case 0x0812: return "CONTINUEFRT";
-            case QUICKTIP_0800: return "QUICKTIP";
-            case SHEETEXT_0862: return "SHEETEXT";
-            case 0x0863: return "BOOKEXT";
-            case 0x0864: return "SXADDL";    // Pivot Table Additional Info
-            case SHEETPROTECTION_0867: return "SHEETPROTECTION";
-            case 0x086B: return "DATALABEXTCONTENTS";
-            case 0x086C: return "CELLWATCH";
-            case FeatRecord.v11_sid: return "SHARED FEATURE v11";
-            case 0x0874: return "DROPDOWNOBJIDS";
-            case 0x0876: return "DCONN";
-            case FeatRecord.v12_sid: return "SHARED FEATURE v12";
-            case 0x087B: return "CFEX";
-            case 0x087C: return "XFCRC";
-            case 0x087D: return "XFEXT";
-            case 0x087F: return "CONTINUEFRT12";
-            case 0x088B: return "PLV";
-            case 0x088C: return "COMPAT12";
-            case 0x088D: return "DXF";
-            case 0x0892: return "STYLEEXT";
-            case 0x0896: return "THEME";
-            case 0x0897: return "GUIDTYPELIB";
-            case 0x089A: return "MTRSETTINGS";
-            case 0x089B: return "COMPRESSPICTURES";
-            case HEADER_FOOTER_089C: return "HEADERFOOTER";
-            case 0x089D: return "CRTLAYOUT12";
-            case 0x089E: return "CRTMLFRT";
-            case 0x089F: return "CRTMLFRTCONTINUE";
-            case 0x08A1: return "SHAPEPROPSSTREAM";
-            case 0x08A3: return "FORCEFULLCALCULATION";
-            case 0x08A4: return "SHAPEPROPSSTREAM";
-            case 0x08A5: return "TEXTPROPSSTREAM";
-            case 0x08A6: return "RICHTEXTSTREAM";
-            case 0x08A7: return "CRTLAYOUT12A";
-
-            case 0x08C8: return "PLV{Mac Excel}";
-            
-            case 0x1001: return "UNITS";
-            case 0x1006: return "CHARTDATAFORMAT";
-            case 0x1007: return "CHARTLINEFORMAT";
-        }
-        if (isObservedButUnknown(sid)) {
-            return "UNKNOWN-" + Integer.toHexString(sid).toUpperCase(Locale.ROOT);
-        }
-
-        return null;
-    }
-
-    /**
-     * @return <code>true</code> if the unknown record id has been observed in POI unit tests
-     */
-    private static boolean isObservedButUnknown(int sid) {
-        // TODO Look up more of these in the latest [MS-XLS] doc and move to getBiffName
-        switch (sid) {
-            case 0x0033:
-                // contains 2 bytes of data: 0x0001 or 0x0003
-            case 0x0034:
-                // Seems to be written by MSAccess
-                // contains text "[Microsoft JET Created Table]0021010"
-                // appears after last cell value record and before WINDOW2
-            case 0x01BD:
-            case 0x01C2:
-                // Written by Excel 2007
-                // rawData is multiple of 12 bytes long
-                // appears after last cell value record and before WINDOW2 or drawing records
-
-            case 0x1009:
-            case 0x100A:
-            case 0x100B:
-            case 0x100C:
-            case 0x1014:
-            case 0x1017:
-            case 0x1018:
-            case 0x1019:
-            case 0x101A:
-            case 0x101B:
-            case 0x101D:
-            case 0x101E:
-            case 0x101F:
-            case 0x1020:
-            case 0x1021:
-            case 0x1022:
-            case 0x1024:
-            case 0x1025:
-            case 0x1026:
-            case 0x1027:
-            case 0x1032:
-            case 0x1033:
-            case 0x1034:
-            case 0x1035:
-            case 0x103A:
-            case 0x1041:
-            case 0x1043:
-            case 0x1044:
-            case 0x1045:
-            case 0x1046:
-            case 0x104A:
-            case 0x104B:
-            case 0x104E:
-            case 0x104F:
-            case 0x1051:
-            case 0x105C:
-            case 0x105D:
-            case 0x105F:
-            case 0x1060:
-            case 0x1062:
-            case 0x1063:
-            case 0x1064:
-            case 0x1065:
-            case 0x1066:
-                return true;
-        }
-        return false;
-    }
-
-    @Override
-    public Object clone() {
-        // immutable - OK to return this
-        return this;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
deleted file mode 100644
index 19fdf35..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        USESELFS (0x0160) - Use Natural Language Formulas Flag <p>
- * Description:  Tells the GUI if this was written by something that can use
- *               "natural language" formulas. HSSF can't.<p>
- * REFERENCE:  PG 420 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class UseSelFSRecord extends StandardRecord {
-    public final static short sid   = 0x0160;
-
-    private static final BitField useNaturalLanguageFormulasFlag = BitFieldFactory.getInstance(0x0001);
-
-    private int _options;
-
-    private UseSelFSRecord(int options) {
-        _options = options;
-    }
-
-    public UseSelFSRecord(RecordInputStream in) {
-        this(in.readUShort());
-    }
-
-    public UseSelFSRecord(boolean b) {
-        this(0);
-        _options = useNaturalLanguageFormulasFlag.setBoolean(_options, b);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[USESELFS]\n");
-        buffer.append("    .options = ").append(HexDump.shortToHex(_options)).append("\n");
-        buffer.append("[/USESELFS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_options);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public Object clone() {
-        return new UseSelFSRecord(_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java b/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
deleted file mode 100644
index 1c4895a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Locale;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The UserSViewBegin record specifies settings for a custom view associated with the sheet.
- * This record also marks the start of custom view records, which save custom view settings.
- * Records between {@link UserSViewBegin} and {@link UserSViewEnd} contain settings for the custom view,
- * not settings for the sheet itself.
- *
- * @author Yegor Kozlov
- */
-public final class UserSViewBegin extends StandardRecord {
-
-    public final static short sid = 0x01AA;
-	private byte[] _rawData;
-
-    public UserSViewBegin(byte[] data) {
-        _rawData = data;
-    }
-
-	/**
-	 * construct an UserSViewBegin record.  No fields are interpreted and the record will
-	 * be serialized in its original form more or less
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public UserSViewBegin(RecordInputStream in) {
-		_rawData = in.readRemainder();
-	}
-
-	/**
-	 * spit the record out AS IS. no interpretation or identification
-	 */
-	public void serialize(LittleEndianOutput out) {
-		out.write(_rawData);
-	}
-
-	protected int getDataSize() {
-		return _rawData.length;
-	}
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    /**
-     * @return Globally unique identifier for the custom view
-     */
-    public byte[] getGuid(){
-        byte[] guid = new byte[16];
-        System.arraycopy(_rawData, 0, guid, 0, guid.length);
-        return guid;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[").append("USERSVIEWBEGIN").append("] (0x");
-        sb.append(Integer.toHexString(sid).toUpperCase(Locale.ROOT) + ")\n");
-        sb.append("  rawData=").append(HexDump.toHex(_rawData)).append("\n");
-        sb.append("[/").append("USERSVIEWBEGIN").append("]\n");
-        return sb.toString();
-    }
-
-    //HACK: do a "cheat" clone, see Record.java for more information
-    public Object clone() {
-        return cloneViaReserialise();
-    }
- 
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/UserSViewEnd.java b/trunk/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
deleted file mode 100644
index aa72eac..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Locale;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The UserSViewEnd record marks the end of the settings for a custom view associated with the sheet
- */
-public final class UserSViewEnd extends StandardRecord {
-
-    public final static short sid = 0x01AB;
-	private byte[] _rawData;
-
-    public UserSViewEnd(byte[] data) {
-        _rawData = data;
-    }
-
-	/**
-	 * construct an UserSViewEnd record.  No fields are interpreted and the record will
-	 * be serialized in its original form more or less
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public UserSViewEnd(RecordInputStream in) {
-		_rawData = in.readRemainder();
-	}
-
-	/**
-	 * spit the record out AS IS. no interpretation or identification
-	 */
-	public void serialize(LittleEndianOutput out) {
-		out.write(_rawData);
-	}
-
-	protected int getDataSize() {
-		return _rawData.length;
-	}
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[").append("USERSVIEWEND").append("] (0x");
-        sb.append(Integer.toHexString(sid).toUpperCase(Locale.ROOT) + ")\n");
-        sb.append("  rawData=").append(HexDump.toHex(_rawData)).append("\n");
-        sb.append("[/").append("USERSVIEWEND").append("]\n");
-        return sb.toString();
-    }
-
-    //HACK: do a "cheat" clone, see Record.java for more information
-    public Object clone() {
-        return cloneViaReserialise();
-    }
-
-    
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java b/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java
deleted file mode 100644
index f14845c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        VCenter record<P>
- * Description:  tells whether to center the sheet between vertical margins<P>
- * REFERENCE:  PG 420 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-
-public final class VCenterRecord extends StandardRecord {
-    public final static short sid = 0x84;
-    private int field_1_vcenter;
-
-    public VCenterRecord()
-    {
-    }
-
-    public VCenterRecord(RecordInputStream in)
-    {
-        field_1_vcenter = in.readShort();
-    }
-
-    /**
-     * set whether to center vertically or not
-     * @param hc  vcenter or not
-     */
-
-    public void setVCenter(boolean hc)
-    {
-    	field_1_vcenter = hc ? 1 : 0;
-    }
-
-    /**
-     * get whether to center vertically or not
-     * @return vcenter or not
-     */
-
-    public boolean getVCenter()
-    {
-        return (field_1_vcenter == 1);
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[VCENTER]\n");
-        buffer.append("    .vcenter        = ").append(getVCenter())
-            .append("\n");
-        buffer.append("[/VCENTER]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_vcenter);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      VCenterRecord rec = new VCenterRecord();
-      rec.field_1_vcenter = field_1_vcenter;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java b/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
deleted file mode 100644
index f15baf6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Iterator;
-
-/**
- * VerticalPageBreak (0x001A) record that stores page breaks at columns
- * 
- * @see PageBreakRecord
- */
-public final class VerticalPageBreakRecord extends PageBreakRecord {
-
-	public static final short sid = 0x001A;
-
-	/**
-	 * Creates an empty vertical page break record
-	 */
-	public VerticalPageBreakRecord() {
-
-	}
-
-	/**
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public VerticalPageBreakRecord(RecordInputStream in) {
-		super(in);
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public Object clone() {
-		PageBreakRecord result = new VerticalPageBreakRecord();
-		Iterator<Break> iterator = getBreaksIterator();
-		while (iterator.hasNext()) {
-			Break original = iterator.next();
-			result.addBreak(original.main, original.subFrom, original.subTo);
-		}
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
deleted file mode 100644
index 78185c1..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        WSBOOL (0x0081) (called SHEETPR in OOO doc)<p>
- * Description:  stores workbook settings  (aka its a big "everything we didn't
- *               put somewhere else")<p>
- * REFERENCE:  PG 425 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class WSBoolRecord extends StandardRecord {
-    public final static short     sid = 0x0081;
-    private byte                  field_1_wsbool;         // crappy names are because this is really one big short field (2byte)
-    private byte                  field_2_wsbool;         // but the docs inconsistently use it as 2 separate bytes
-
-    // I decided to be consistent in this way.
-    private static final BitField autobreaks    = BitFieldFactory.getInstance(0x01); // are automatic page breaks visible
-
-    // bits 1 to 3 unused
-    private static final BitField dialog        = BitFieldFactory.getInstance(0x10); // is sheet dialog sheet
-    private static final BitField applystyles   = BitFieldFactory.getInstance(0x20); // whether to apply automatic styles to outlines
-    private static final BitField rowsumsbelow  = BitFieldFactory.getInstance(0x40); // whether summary rows will appear below detail in outlines
-    private static final BitField rowsumsright  = BitFieldFactory.getInstance(0x80); // whether summary rows will appear right of the detail in outlines
-    private static final BitField fittopage     = BitFieldFactory.getInstance(0x01); // whether to fit stuff to the page
-
-    // bit 2 reserved
-    private static final BitField displayguts   = BitFieldFactory.getInstance(0x06); // whether to display outline symbols (in the gutters)
-
-    // bits 4-5 reserved
-    private static final BitField alternateexpression = BitFieldFactory.getInstance(0x40); // whether to use alternate expression eval
-    private static final BitField alternateformula    = BitFieldFactory.getInstance(0x80); // whether to use alternate formula entry
-
-    public WSBoolRecord()
-    {
-    }
-
-    public WSBoolRecord(RecordInputStream in)
-    {
-       byte data[] = in.readRemainder();
-        field_1_wsbool =
-            data[ 1 ];   // backwards because theoretically this is one short field
-        field_2_wsbool =
-            data[ 0 ];   // but it was easier to implement it this way to avoid confusion
-    }                             // because the dev kit shows the masks for it as 2 byte fields
-
-    // why?  Why ask why?  But don't drink bud dry as its a really
-    // crappy beer, try the czech "Budvar" beer (which is the real
-    // budweiser though its ironically good...its sold in the USs
-    // as czechvar  --- odd that they had the name first but can't
-    // use it)...
-
-    /**
-     * set first byte (see bit setters)
-     */
-
-    public void setWSBool1(byte bool1)
-    {
-        field_1_wsbool = bool1;
-    }
-
-    // bool1 bitfields
-
-    /**
-     * show automatic page breaks or not
-     * @param ab  whether to show auto page breaks
-     */
-
-    public void setAutobreaks(boolean ab)
-    {
-        field_1_wsbool = autobreaks.setByteBoolean(field_1_wsbool, ab);
-    }
-
-    /**
-     * set whether sheet is a dialog sheet or not
-     * @param isDialog or not
-     */
-
-    public void setDialog(boolean isDialog)
-    {
-        field_1_wsbool = dialog.setByteBoolean(field_1_wsbool, isDialog);
-    }
-
-    /**
-     * set if row summaries appear below detail in the outline
-     * @param below or not
-     */
-
-    public void setRowSumsBelow(boolean below)
-    {
-        field_1_wsbool = rowsumsbelow.setByteBoolean(field_1_wsbool, below);
-    }
-
-    /**
-     * set if col summaries appear right of the detail in the outline
-     * @param right or not
-     */
-
-    public void setRowSumsRight(boolean right)
-    {
-        field_1_wsbool = rowsumsright.setByteBoolean(field_1_wsbool, right);
-    }
-
-    // end bitfields
-
-    /**
-     * set the second byte (see bit setters)
-     */
-
-    public void setWSBool2(byte bool2)
-    {
-        field_2_wsbool = bool2;
-    }
-
-    // bool2 bitfields
-
-    /**
-     * fit to page option is on
-     * @param fit2page  fit or not
-     */
-
-    public void setFitToPage(boolean fit2page)
-    {
-        field_2_wsbool = fittopage.setByteBoolean(field_2_wsbool, fit2page);
-    }
-
-    /**
-     * set whether to display the guts or not
-     *
-     * @param guts or no guts (or glory)
-     */
-
-    public void setDisplayGuts(boolean guts)
-    {
-        field_2_wsbool = displayguts.setByteBoolean(field_2_wsbool, guts);
-    }
-
-    /**
-     * whether alternate expression evaluation is on
-     * @param altexp  alternative expression evaluation or not
-     */
-
-    public void setAlternateExpression(boolean altexp)
-    {
-        field_2_wsbool = alternateexpression.setByteBoolean(field_2_wsbool,
-                altexp);
-    }
-
-    /**
-     * whether alternative formula entry is on
-     * @param formula  alternative formulas or not
-     */
-
-    public void setAlternateFormula(boolean formula)
-    {
-        field_2_wsbool = alternateformula.setByteBoolean(field_2_wsbool,
-                formula);
-    }
-
-    // end bitfields
-
-    /**
-     * get first byte (see bit getters)
-     */
-
-    public byte getWSBool1()
-    {
-        return field_1_wsbool;
-    }
-
-    // bool1 bitfields
-
-    /**
-     * show automatic page breaks or not
-     * @return whether to show auto page breaks
-     */
-
-    public boolean getAutobreaks()
-    {
-        return autobreaks.isSet(field_1_wsbool);
-    }
-
-    /**
-     * get whether sheet is a dialog sheet or not
-     * @return isDialog or not
-     */
-
-    public boolean getDialog()
-    {
-        return dialog.isSet(field_1_wsbool);
-    }
-
-    /**
-     * get if row summaries appear below detail in the outline
-     * @return below or not
-     */
-
-    public boolean getRowSumsBelow()
-    {
-        return rowsumsbelow.isSet(field_1_wsbool);
-    }
-
-    /**
-     * get if col summaries appear right of the detail in the outline
-     * @return right or not
-     */
-
-    public boolean getRowSumsRight()
-    {
-        return rowsumsright.isSet(field_1_wsbool);
-    }
-
-    // end bitfields
-
-    /**
-     * get the second byte (see bit getters)
-     */
-
-    public byte getWSBool2()
-    {
-        return field_2_wsbool;
-    }
-
-    // bool2 bitfields
-
-    /**
-     * fit to page option is on
-     * @return fit or not
-     */
-
-    public boolean getFitToPage()
-    {
-        return fittopage.isSet(field_2_wsbool);
-    }
-
-    /**
-     * get whether to display the guts or not
-     *
-     * @return guts or no guts (or glory)
-     */
-
-    public boolean getDisplayGuts()
-    {
-        return displayguts.isSet(field_2_wsbool);
-    }
-
-    /**
-     * whether alternate expression evaluation is on
-     * @return alternative expression evaluation or not
-     */
-
-    public boolean getAlternateExpression()
-    {
-        return alternateexpression.isSet(field_2_wsbool);
-    }
-
-    /**
-     * whether alternative formula entry is on
-     * @return alternative formulas or not
-     */
-
-    public boolean getAlternateFormula()
-    {
-        return alternateformula.isSet(field_2_wsbool);
-    }
-
-    // end bitfields
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[WSBOOL]\n");
-        buffer.append("    .wsbool1        = ")
-            .append(Integer.toHexString(getWSBool1())).append("\n");
-        buffer.append("        .autobreaks = ").append(getAutobreaks())
-            .append("\n");
-        buffer.append("        .dialog     = ").append(getDialog())
-            .append("\n");
-        buffer.append("        .rowsumsbelw= ").append(getRowSumsBelow())
-            .append("\n");
-        buffer.append("        .rowsumsrigt= ").append(getRowSumsRight())
-            .append("\n");
-        buffer.append("    .wsbool2        = ")
-            .append(Integer.toHexString(getWSBool2())).append("\n");
-        buffer.append("        .fittopage  = ").append(getFitToPage())
-            .append("\n");
-        buffer.append("        .displayguts= ").append(getDisplayGuts())
-            .append("\n");
-        buffer.append("        .alternateex= ")
-            .append(getAlternateExpression()).append("\n");
-        buffer.append("        .alternatefo= ").append(getAlternateFormula())
-            .append("\n");
-        buffer.append("[/WSBOOL]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeByte(getWSBool2());
-        out.writeByte(getWSBool1());
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      WSBoolRecord rec = new WSBoolRecord();
-      rec.field_1_wsbool = field_1_wsbool;
-      rec.field_2_wsbool = field_2_wsbool;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java b/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java
deleted file mode 100644
index 440348e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Window1 Record<P>
- * Description:  Stores the attributes of the workbook window.  This is basically
- *               so the gui knows how big to make the window holding the spreadsheet
- *               document.<P>
- * REFERENCE:  PG 421 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @version 2.0-pre
- */
-public final class WindowOneRecord extends StandardRecord {
-    public final static short     sid = 0x3d;
-
-    // our variable names stolen from old TV sets.
-    private short                 field_1_h_hold;                  // horizontal position
-    private short                 field_2_v_hold;                  // vertical position
-    private short                 field_3_width;
-    private short                 field_4_height;
-    private short                 field_5_options;
-    static final private BitField hidden   =
-        BitFieldFactory.getInstance(0x01);                                        // is this window is hidden
-    static final private BitField iconic   =
-        BitFieldFactory.getInstance(0x02);                                        // is this window is an icon
-    @SuppressWarnings("unused")
-    static final private BitField reserved = BitFieldFactory.getInstance(0x04);   // reserved
-    static final private BitField hscroll  =
-        BitFieldFactory.getInstance(0x08);                                        // display horizontal scrollbar
-    static final private BitField vscroll  =
-        BitFieldFactory.getInstance(0x10);                                        // display vertical scrollbar
-    static final private BitField tabs     =
-        BitFieldFactory.getInstance(0x20);                                        // display tabs at the bottom
-
-    // all the rest are "reserved"
-    private int                   field_6_active_sheet;
-    private int                   field_7_first_visible_tab;
-    private short                 field_8_num_selected_tabs;
-    private short                 field_9_tab_width_ratio;
-
-    public WindowOneRecord()
-    {
-    }
-
-    public WindowOneRecord(RecordInputStream in)
-    {
-        field_1_h_hold            = in.readShort();
-        field_2_v_hold            = in.readShort();
-        field_3_width             = in.readShort();
-        field_4_height            = in.readShort();
-        field_5_options           = in.readShort();
-        field_6_active_sheet      = in.readShort();
-        field_7_first_visible_tab     = in.readShort();
-        field_8_num_selected_tabs = in.readShort();
-        field_9_tab_width_ratio   = in.readShort();
-    }
-
-    /**
-     * set the horizontal position of the window (in 1/20ths of a point)
-     * @param h - horizontal location
-     */
-
-    public void setHorizontalHold(short h)
-    {
-        field_1_h_hold = h;
-    }
-
-    /**
-     * set the vertical position of the window (in 1/20ths of a point)
-     * @param v - vertical location
-     */
-
-    public void setVerticalHold(short v)
-    {
-        field_2_v_hold = v;
-    }
-
-    /**
-     * set the width of the window
-     * @param w  width
-     */
-
-    public void setWidth(short w)
-    {
-        field_3_width = w;
-    }
-
-    /**
-     * set teh height of the window
-     * @param h  height
-     */
-
-    public void setHeight(short h)
-    {
-        field_4_height = h;
-    }
-
-    /**
-     * set the options bitmask (see bit setters)
-     *
-     * @param o - the bitmask
-     */
-
-    public void setOptions(short o)
-    {
-        field_5_options = o;
-    }
-
-    // bitfields for options
-
-    /**
-     * set whether the window is hidden or not
-     * @param ishidden or not
-     */
-
-    public void setHidden(boolean ishidden)
-    {
-        field_5_options = hidden.setShortBoolean(field_5_options, ishidden);
-    }
-
-    /**
-     * set whether the window has been iconized or not
-     * @param isiconic  iconize  or not
-     */
-
-    public void setIconic(boolean isiconic)
-    {
-        field_5_options = iconic.setShortBoolean(field_5_options, isiconic);
-    }
-
-    /**
-     * set whether to display the horizontal scrollbar or not
-     * @param scroll display or not
-     */
-
-    public void setDisplayHorizonalScrollbar(boolean scroll)
-    {
-        field_5_options = hscroll.setShortBoolean(field_5_options, scroll);
-    }
-
-    /**
-     * set whether to display the vertical scrollbar or not
-     * @param scroll  display or not
-     */
-
-    public void setDisplayVerticalScrollbar(boolean scroll)
-    {
-        field_5_options = vscroll.setShortBoolean(field_5_options, scroll);
-    }
-
-    /**
-     * set whether to display the tabs or not
-     * @param disptabs  display or not
-     */
-
-    public void setDisplayTabs(boolean disptabs)
-    {
-        field_5_options = tabs.setShortBoolean(field_5_options, disptabs);
-    }
-
-    // end bitfields
-
-    public void setActiveSheetIndex(int index) {
-    	field_6_active_sheet = index;
-	}
-
-    /**
-     * Sets the first visible sheet in the worksheet tab-bar.  This method does <b>not</b>
-     *  hide, select or focus sheets.  It just sets the scroll position in the tab-bar.
-     * @param t the sheet index of the tab that will become the first in the tab-bar
-     */
-    public void setFirstVisibleTab(int t) {
-        field_7_first_visible_tab = t;
-    }
-
-    /**
-     * set the number of selected tabs
-     * @param n  number of tabs
-     */
-
-    public void setNumSelectedTabs(short n)
-    {
-        field_8_num_selected_tabs = n;
-    }
-
-    /**
-     * ratio of the width of the tabs to the horizontal scrollbar
-     * @param r  ratio
-     */
-
-    public void setTabWidthRatio(short r)
-    {
-        field_9_tab_width_ratio = r;
-    }
-
-    /**
-     * get the horizontal position of the window (in 1/20ths of a point)
-     * @return h - horizontal location
-     */
-
-    public short getHorizontalHold()
-    {
-        return field_1_h_hold;
-    }
-
-    /**
-     * get the vertical position of the window (in 1/20ths of a point)
-     * @return v - vertical location
-     */
-
-    public short getVerticalHold()
-    {
-        return field_2_v_hold;
-    }
-
-    /**
-     * get the width of the window
-     * @return width
-     */
-
-    public short getWidth()
-    {
-        return field_3_width;
-    }
-
-    /**
-     * get the height of the window
-     * @return height
-     */
-
-    public short getHeight()
-    {
-        return field_4_height;
-    }
-
-    /**
-     * get the options bitmask (see bit setters)
-     *
-     * @return o - the bitmask
-     */
-
-    public short getOptions()
-    {
-        return field_5_options;
-    }
-
-    // bitfields for options
-
-    /**
-     * get whether the window is hidden or not
-     * @return ishidden or not
-     */
-
-    public boolean getHidden()
-    {
-        return hidden.isSet(field_5_options);
-    }
-
-    /**
-     * get whether the window has been iconized or not
-     * @return iconize  or not
-     */
-
-    public boolean getIconic()
-    {
-        return iconic.isSet(field_5_options);
-    }
-
-    /**
-     * get whether to display the horizontal scrollbar or not
-     * @return display or not
-     */
-
-    public boolean getDisplayHorizontalScrollbar()
-    {
-        return hscroll.isSet(field_5_options);
-    }
-
-    /**
-     * get whether to display the vertical scrollbar or not
-     * @return display or not
-     */
-
-    public boolean getDisplayVerticalScrollbar()
-    {
-        return vscroll.isSet(field_5_options);
-    }
-
-    /**
-     * get whether to display the tabs or not
-     * @return display or not
-     */
-
-    public boolean getDisplayTabs()
-    {
-        return tabs.isSet(field_5_options);
-    }
-
-    // end options bitfields
-
-    
-    /**
-     * @return the index of the currently displayed sheet 
-     */
-    public int getActiveSheetIndex() {
-    	return field_6_active_sheet;
-    }
-
-    /**
-     * @return the first visible sheet in the worksheet tab-bar. 
-     * I.E. the scroll position of the tab-bar.
-     */
-    public int getFirstVisibleTab() {
-        return field_7_first_visible_tab;
-    }
-
-    /**
-     * get the number of selected tabs
-     * @return number of tabs
-     */
-
-    public short getNumSelectedTabs()
-    {
-        return field_8_num_selected_tabs;
-    }
-
-    /**
-     * ratio of the width of the tabs to the horizontal scrollbar
-     * @return ratio
-     */
-
-    public short getTabWidthRatio()
-    {
-        return field_9_tab_width_ratio;
-    }
-
-    public String toString() {
-        return "[WINDOW1]\n" +
-                "    .h_hold          = " +
-                Integer.toHexString(getHorizontalHold()) + "\n" +
-                "    .v_hold          = " +
-                Integer.toHexString(getVerticalHold()) + "\n" +
-                "    .width           = " +
-                Integer.toHexString(getWidth()) + "\n" +
-                "    .height          = " +
-                Integer.toHexString(getHeight()) + "\n" +
-                "    .options         = " +
-                Integer.toHexString(getOptions()) + "\n" +
-                "        .hidden      = " + getHidden() +
-                "\n" +
-                "        .iconic      = " + getIconic() +
-                "\n" +
-                "        .hscroll     = " +
-                getDisplayHorizontalScrollbar() + "\n" +
-                "        .vscroll     = " +
-                getDisplayVerticalScrollbar() + "\n" +
-                "        .tabs        = " + getDisplayTabs() +
-                "\n" +
-                "    .activeSheet     = " +
-                Integer.toHexString(getActiveSheetIndex()) + "\n" +
-                "    .firstVisibleTab    = " +
-                Integer.toHexString(getFirstVisibleTab()) + "\n" +
-                "    .numselectedtabs = " +
-                Integer.toHexString(getNumSelectedTabs()) + "\n" +
-                "    .tabwidthratio   = " +
-                Integer.toHexString(getTabWidthRatio()) + "\n" +
-                "[/WINDOW1]\n";
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getHorizontalHold());
-        out.writeShort(getVerticalHold());
-        out.writeShort(getWidth());
-        out.writeShort(getHeight());
-        out.writeShort(getOptions());
-        out.writeShort(getActiveSheetIndex());
-        out.writeShort(getFirstVisibleTab());
-        out.writeShort(getNumSelectedTabs());
-        out.writeShort(getTabWidthRatio());
-    }
-
-    protected int getDataSize() {
-        return 18;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
deleted file mode 100644
index a360bc4..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: Window Protect Record (0x0019)<p>
- * Description:  flags whether workbook windows are protected<p>
- * REFERENCE:  PG 424 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class WindowProtectRecord extends StandardRecord {
-    public final static short sid = 0x0019;
-
-    private static final BitField settingsProtectedFlag = BitFieldFactory.getInstance(0x0001);
-
-    private int _options;
-
-    public WindowProtectRecord(int options) {
-        _options = options;
-    }
-
-    public WindowProtectRecord(RecordInputStream in) {
-        this(in.readUShort());
-    }
-
-    public WindowProtectRecord(boolean protect) {
-        this(0);
-        setProtect(protect);
-    }
-
-    /**
-     * set whether this window should be protected or not
-     * @param protect or not
-     */
-    public void setProtect(boolean protect) {
-        _options = settingsProtectedFlag.setBoolean(_options, protect);
-    }
-
-    /**
-     * is this window protected or not
-     *
-     * @return protected or not
-     */
-    public boolean getProtect() {
-        return settingsProtectedFlag.isSet(_options);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[WINDOWPROTECT]\n");
-        buffer.append("    .options = ").append(HexDump.shortToHex(_options)).append("\n");
-        buffer.append("[/WINDOWPROTECT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(_options);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-    @Override
-    public Object clone() {
-        return new WindowProtectRecord(_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
deleted file mode 100644
index d7f0ec4..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
+++ /dev/null
@@ -1,543 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Window Two Record<P>
- * Description:  sheet window settings<P>
- * REFERENCE:  PG 422 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- * @version 2.0-pre
- */
-public final class WindowTwoRecord extends StandardRecord {
-    public final static short sid = 0x023E;
-
-    // bitfields
-    private static final BitField displayFormulas         = BitFieldFactory.getInstance(0x01);
-    private static final BitField displayGridlines        = BitFieldFactory.getInstance(0x02);
-    private static final BitField displayRowColHeadings   = BitFieldFactory.getInstance(0x04);
-    private static final BitField freezePanes             = BitFieldFactory.getInstance(0x08);
-    private static final BitField displayZeros            = BitFieldFactory.getInstance(0x10);
-    /**  if false use color in field 4 if true use default foreground for headers */
-    private static final BitField defaultHeader           = BitFieldFactory.getInstance(0x20);   
-    private static final BitField arabic                  = BitFieldFactory.getInstance(0x040);
-    private static final BitField displayGuts             = BitFieldFactory.getInstance(0x080);
-    private static final BitField freezePanesNoSplit      = BitFieldFactory.getInstance(0x100);
-    private static final BitField selected                = BitFieldFactory.getInstance(0x200);
-    private static final BitField active                  = BitFieldFactory.getInstance(0x400);
-    private static final BitField savedInPageBreakPreview = BitFieldFactory.getInstance(0x800);
-    // 4-7 reserved
-    // end bitfields
-
-    private short             field_1_options;
-    private short             field_2_top_row;
-    private short             field_3_left_col;
-    private int               field_4_header_color;
-    private short             field_5_page_break_zoom;
-    private short             field_6_normal_zoom;
-    private int               field_7_reserved;
-
-    public WindowTwoRecord()
-    {
-    }
-
-    public WindowTwoRecord(RecordInputStream in)
-    {
-      int size = in.remaining();
-        field_1_options      = in.readShort();
-        field_2_top_row      = in.readShort();
-        field_3_left_col     = in.readShort();
-        field_4_header_color = in.readInt();
-        if (size > 10)
-        {
-            field_5_page_break_zoom = in.readShort();
-            field_6_normal_zoom     = in.readShort();
-        }
-        if (size > 14)
-        {   // there is a special case of this record that has only 14 bytes...undocumented!
-            field_7_reserved = in.readInt();
-        }
-    }
-
-    /**
-     * set the options bitmask or just use the bit setters.
-     * @param options
-     */
-
-    public void setOptions(short options)
-    {
-        field_1_options = options;
-    }
-
-    // option bitfields
-
-    /**
-     * set whether the window should display formulas
-     * @param formulas or not
-     */
-
-    public void setDisplayFormulas(boolean formulas)
-    {
-        field_1_options = displayFormulas.setShortBoolean(field_1_options, formulas);
-    }
-
-    /**
-     * set whether the window should display gridlines
-     * @param gridlines or not
-     */
-
-    public void setDisplayGridlines(boolean gridlines)
-    {
-        field_1_options = displayGridlines.setShortBoolean(field_1_options, gridlines);
-    }
-
-    /**
-     * set whether the window should display row and column headings
-     * @param headings or not
-     */
-
-    public void setDisplayRowColHeadings(boolean headings)
-    {
-        field_1_options = displayRowColHeadings.setShortBoolean(field_1_options, headings);
-    }
-
-    /**
-     * set whether the window should freeze panes
-     * @param freezepanes  freeze panes or not
-     */
-
-    public void setFreezePanes(boolean freezepanes)
-    {
-        field_1_options = freezePanes.setShortBoolean(field_1_options, freezepanes);
-    }
-
-    /**
-     * set whether the window should display zero values
-     * @param zeros or not
-     */
-
-    public void setDisplayZeros(boolean zeros)
-    {
-        field_1_options = displayZeros.setShortBoolean(field_1_options, zeros);
-    }
-
-    /**
-     * set whether the window should display a default header
-     * @param header or not
-     */
-
-    public void setDefaultHeader(boolean header)
-    {
-        field_1_options = defaultHeader.setShortBoolean(field_1_options, header);
-    }
-
-    /**
-     * is this arabic?
-     * @param isarabic  arabic or not
-     */
-
-    public void setArabic(boolean isarabic)
-    {
-        field_1_options = arabic.setShortBoolean(field_1_options, isarabic);
-    }
-
-    /**
-     * set whether the outline symbols are displaed
-     * @param guts  symbols or not
-     */
-
-    public void setDisplayGuts(boolean guts)
-    {
-        field_1_options = displayGuts.setShortBoolean(field_1_options, guts);
-    }
-
-    /**
-     * freeze unsplit panes or not
-     * @param freeze or not
-     */
-
-    public void setFreezePanesNoSplit(boolean freeze)
-    {
-        field_1_options = freezePanesNoSplit.setShortBoolean(field_1_options, freeze);
-    }
-
-    /**
-     * sheet tab is selected
-     * @param sel  selected or not
-     */
-
-    public void setSelected(boolean sel)
-    {
-        field_1_options = selected.setShortBoolean(field_1_options, sel);
-    }
-
-    /**
-     * is the sheet currently displayed in the window
-     * @param p  displayed or not
-     */
-    public void setActive(boolean p) {
-        field_1_options = active.setShortBoolean(field_1_options, p);
-    }
-
-    /**
-     * was the sheet saved in page break view
-     * @param p  pagebreaksaved or not
-     */
-
-    public void setSavedInPageBreakPreview(boolean p)
-    {
-        field_1_options = savedInPageBreakPreview.setShortBoolean(field_1_options, p);
-    }
-
-    // end of bitfields.
-
-    /**
-     * set the top row visible in the window
-     * @param topRow  top row visible
-     */
-
-    public void setTopRow(short topRow)
-    {
-        field_2_top_row = topRow;
-    }
-
-    /**
-     * set the leftmost column displayed in the window
-     * @param leftCol  leftmost column
-     */
-
-    public void setLeftCol(short leftCol)
-    {
-        field_3_left_col = leftCol;
-    }
-
-    /**
-     * set the palette index for the header color
-     * @param color
-     */
-
-    public void setHeaderColor(int color)
-    {
-        field_4_header_color = color;
-    }
-
-    /**
-     * zoom magification in page break view
-     * @param zoom
-     */
-
-    public void setPageBreakZoom(short zoom)
-    {
-        field_5_page_break_zoom = zoom;
-    }
-
-    /**
-     * set the zoom magnification in normal view
-     * @param zoom
-     */
-
-    public void setNormalZoom(short zoom)
-    {
-        field_6_normal_zoom = zoom;
-    }
-
-    /**
-     * set the reserved (don't do this) value
-     */
-
-    public void setReserved(int reserved)
-    {
-        field_7_reserved = reserved;
-    }
-
-    /**
-     * get the options bitmask or just use the bit setters.
-     * @return options
-     */
-
-    public short getOptions()
-    {
-        return field_1_options;
-    }
-
-    // option bitfields
-
-    /**
-     * get whether the window should display formulas
-     * @return formulas or not
-     */
-
-    public boolean getDisplayFormulas()
-    {
-        return displayFormulas.isSet(field_1_options);
-    }
-
-    /**
-     * get whether the window should display gridlines
-     * @return gridlines or not
-     */
-
-    public boolean getDisplayGridlines()
-    {
-        return displayGridlines.isSet(field_1_options);
-    }
-
-    /**
-     * get whether the window should display row and column headings
-     * @return headings or not
-     */
-
-    public boolean getDisplayRowColHeadings()
-    {
-        return displayRowColHeadings.isSet(field_1_options);
-    }
-
-    /**
-     * get whether the window should freeze panes
-     * @return freeze panes or not
-     */
-
-    public boolean getFreezePanes()
-    {
-        return freezePanes.isSet(field_1_options);
-    }
-
-    /**
-     * get whether the window should display zero values
-     * @return zeros or not
-     */
-
-    public boolean getDisplayZeros()
-    {
-        return displayZeros.isSet(field_1_options);
-    }
-
-    /**
-     * get whether the window should display a default header
-     * @return header or not
-     */
-
-    public boolean getDefaultHeader()
-    {
-        return defaultHeader.isSet(field_1_options);
-    }
-
-    /**
-     * is this arabic?
-     * @return arabic or not
-     */
-
-    public boolean getArabic()
-    {
-        return arabic.isSet(field_1_options);
-    }
-
-    /**
-     * get whether the outline symbols are displaed
-     * @return symbols or not
-     */
-
-    public boolean getDisplayGuts()
-    {
-        return displayGuts.isSet(field_1_options);
-    }
-
-    /**
-     * freeze unsplit panes or not
-     * @return freeze or not
-     */
-
-    public boolean getFreezePanesNoSplit()
-    {
-        return freezePanesNoSplit.isSet(field_1_options);
-    }
-
-    /**
-     * sheet tab is selected
-     * @return selected or not
-     */
-
-    public boolean getSelected()
-    {
-        return selected.isSet(field_1_options);
-    }
-
-    /**
-     * is the sheet currently displayed in the window
-     * @return displayed or not
-     */
-
-    public boolean isActive() {
-        return active.isSet(field_1_options);
-    }
-
-    /**
-     * was the sheet saved in page break view
-     * @return pagebreaksaved or not
-     */
-
-    public boolean getSavedInPageBreakPreview()
-    {
-        return savedInPageBreakPreview.isSet(field_1_options);
-    }
-
-    // end of bitfields.
-
-    /**
-     * get the top row visible in the window
-     * @return toprow
-     */
-
-    public short getTopRow()
-    {
-        return field_2_top_row;
-    }
-
-    /**
-     * get the leftmost column displayed in the window
-     * @return leftmost
-     */
-
-    public short getLeftCol()
-    {
-        return field_3_left_col;
-    }
-
-    /**
-     * get the palette index for the header color
-     * @return color
-     */
-
-    public int getHeaderColor()
-    {
-        return field_4_header_color;
-    }
-
-    /**
-     * zoom magification in page break view
-     * @return zoom
-     */
-
-    public short getPageBreakZoom()
-    {
-        return field_5_page_break_zoom;
-    }
-
-    /**
-     * get the zoom magnification in normal view
-     * @return zoom
-     */
-
-    public short getNormalZoom()
-    {
-        return field_6_normal_zoom;
-    }
-
-    /**
-     * get the reserved bits - why would you do this?
-     * @return reserved stuff -probably garbage
-     */
-
-    public int getReserved()
-    {
-        return field_7_reserved;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[WINDOW2]\n");
-        buffer.append("    .options        = ")
-            .append(Integer.toHexString(getOptions())).append("\n");
-        buffer.append("       .dispformulas= ").append(getDisplayFormulas())
-            .append("\n");
-        buffer.append("       .dispgridlins= ").append(getDisplayGridlines())
-            .append("\n");
-        buffer.append("       .disprcheadin= ")
-            .append(getDisplayRowColHeadings()).append("\n");
-        buffer.append("       .freezepanes = ").append(getFreezePanes())
-            .append("\n");
-        buffer.append("       .displayzeros= ").append(getDisplayZeros())
-            .append("\n");
-        buffer.append("       .defaultheadr= ").append(getDefaultHeader())
-            .append("\n");
-        buffer.append("       .arabic      = ").append(getArabic())
-            .append("\n");
-        buffer.append("       .displayguts = ").append(getDisplayGuts())
-            .append("\n");
-        buffer.append("       .frzpnsnosplt= ")
-            .append(getFreezePanesNoSplit()).append("\n");
-        buffer.append("       .selected    = ").append(getSelected())
-            .append("\n");
-        buffer.append("       .active       = ").append(isActive())
-            .append("\n");
-        buffer.append("       .svdinpgbrkpv= ")
-            .append(getSavedInPageBreakPreview()).append("\n");
-        buffer.append("    .toprow         = ")
-            .append(Integer.toHexString(getTopRow())).append("\n");
-        buffer.append("    .leftcol        = ")
-            .append(Integer.toHexString(getLeftCol())).append("\n");
-        buffer.append("    .headercolor    = ")
-            .append(Integer.toHexString(getHeaderColor())).append("\n");
-        buffer.append("    .pagebreakzoom  = ")
-            .append(Integer.toHexString(getPageBreakZoom())).append("\n");
-        buffer.append("    .normalzoom     = ")
-            .append(Integer.toHexString(getNormalZoom())).append("\n");
-        buffer.append("    .reserved       = ")
-            .append(Integer.toHexString(getReserved())).append("\n");
-        buffer.append("[/WINDOW2]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(getOptions());
-        out.writeShort(getTopRow());
-        out.writeShort(getLeftCol());
-        out.writeInt(getHeaderColor());
-        out.writeShort(getPageBreakZoom());
-        out.writeShort(getNormalZoom());
-        out.writeInt(getReserved());
-    }
-
-    protected int getDataSize() {
-        return 18;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-      WindowTwoRecord rec = new WindowTwoRecord();
-      rec.field_1_options = field_1_options;
-      rec.field_2_top_row = field_2_top_row;
-      rec.field_3_left_col = field_3_left_col;
-      rec.field_4_header_color = field_4_header_color;
-      rec.field_5_page_break_zoom = field_5_page_break_zoom;
-      rec.field_6_normal_zoom = field_6_normal_zoom;
-      rec.field_7_reserved = field_7_reserved;
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java b/trunk/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java
deleted file mode 100644
index e8c4a6f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title: Write Access Record (0x005C)<p>
- * 
- * Description: Stores the username of that who owns the spreadsheet generator (on unix the user's 
- * login, on Windoze its the name you typed when you installed the thing)<p>
- * 
- * REFERENCE: PG 424 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- */
-public final class WriteAccessRecord extends StandardRecord {
-	public final static short sid = 0x005C;
-
-	private static final byte PAD_CHAR = (byte) ' ';
-	private static final int DATA_SIZE = 112;
-	private String field_1_username;
-	/** this record is always padded to a constant length */
-	private static final byte[] PADDING = new byte[DATA_SIZE];
-	static {
-		Arrays.fill(PADDING, PAD_CHAR);
-	}
-
-	public WriteAccessRecord() {
-		setUsername("");
-	}
-
-	public WriteAccessRecord(RecordInputStream in) {
-		if (in.remaining() > DATA_SIZE) {
-			throw new RecordFormatException("Expected data size (" + DATA_SIZE + ") but got ("
-					+ in.remaining() + ")");
-		}
-		// The string is always 112 characters (padded with spaces), therefore
-		// this record can not be continued.
-
-		int nChars = in.readUShort();
-		int is16BitFlag = in.readUByte();
-		if (nChars > DATA_SIZE || (is16BitFlag & 0xFE) != 0) {
-			// String header looks wrong (probably missing)
-			// OOO doc says this is optional anyway.
-			// reconstruct data
-			byte[] data = new byte[3 + in.remaining()];
-			LittleEndian.putUShort(data, 0, nChars);
-			LittleEndian.putByte(data, 2, is16BitFlag);
-			in.readFully(data, 3, data.length-3);
-			String rawValue = new String(data, StringUtil.UTF8);
-			setUsername(rawValue.trim());
-			return;
-		}
-
-		String rawText;
-		if ((is16BitFlag & 0x01) == 0x00) {
-			rawText = StringUtil.readCompressedUnicode(in, nChars);
-		} else {
-			rawText = StringUtil.readUnicodeLE(in, nChars);
-		}
-		field_1_username = rawText.trim();
-
-		// consume padding
-		int padSize = in.remaining();
-		while (padSize > 0) {
-			// in some cases this seems to be garbage (non spaces)
-			in.readUByte();
-			padSize--;
-		}
-	}
-
-	/**
-	 * set the username for the user that created the report. HSSF uses the
-	 * logged in user.
-	 * 
-	 * @param username of the user who is logged in (probably "tomcat" or "apache")
-	 */
-	public void setUsername(String username) {
-		boolean is16bit = StringUtil.hasMultibyte(username);
-		int encodedByteCount = 3 + username.length() * (is16bit ? 2 : 1);
-		int paddingSize = DATA_SIZE - encodedByteCount;
-		if (paddingSize < 0) {
-			throw new IllegalArgumentException("Name is too long: " + username);
-		}
-
-		field_1_username = username;
-	}
-
-	/**
-	 * get the username for the user that created the report. HSSF uses the
-	 * logged in user. On natively created M$ Excel sheet this would be the name
-	 * you typed in when you installed it in most cases.
-	 * 
-	 * @return username of the user who is logged in (probably "tomcat" or "apache")
-	 */
-	public String getUsername() {
-		return field_1_username;
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[WRITEACCESS]\n");
-		buffer.append("    .name = ").append(field_1_username).append("\n");
-		buffer.append("[/WRITEACCESS]\n");
-		return buffer.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		String username = getUsername();
-		boolean is16bit = StringUtil.hasMultibyte(username);
-
-		out.writeShort(username.length());
-		out.writeByte(is16bit ? 0x01 : 0x00);
-		if (is16bit) {
-			StringUtil.putUnicodeLE(username, out);
-		} else {
-			StringUtil.putCompressedUnicode(username, out);
-		}
-		int encodedByteCount = 3 + username.length() * (is16bit ? 2 : 1);
-		int paddingSize = DATA_SIZE - encodedByteCount;
-		out.write(PADDING, 0, paddingSize);
-	}
-
-	protected int getDataSize() {
-		return DATA_SIZE;
-	}
-
-	public short getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java
deleted file mode 100644
index 14afeed..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Write Protect Record<P>
- * Description:  Indicated that the sheet/workbook is write protected. 
- * REFERENCE:  PG 425 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @version 3.0-pre
- */
-public final class WriteProtectRecord extends StandardRecord {
-    public final static short sid = 0x86;
-
-    public WriteProtectRecord()
-    {
-    }
-
-    /**
-     * @param in unused (since this record has no data)
-     */
-    public WriteProtectRecord(RecordInputStream in)
-    {
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[WRITEPROTECT]\n");
-        buffer.append("[/WRITEPROTECT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-    }
-
-    protected int getDataSize() {
-        return 0;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
deleted file mode 100644
index 40fd288..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.CFHeader12Record;
-import org.apache.poi.hssf.record.CFHeaderBase;
-import org.apache.poi.hssf.record.CFHeaderRecord;
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.CFRuleRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.ptg.AreaErrPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.RecordFormatException;
-
-/**
- * <p>CFRecordsAggregate - aggregates Conditional Formatting records CFHeaderRecord 
- * and number of up CFRuleRecord records together to simplify access to them.</p>
- * <p>Note that Excel versions before 2007 can only cope with a maximum of 3
- *  Conditional Formatting rules per sheet. Excel 2007 or newer can cope with
- *  unlimited numbers, as can Apache OpenOffice. This is an Excel limitation,
- *  not a file format one.</p>
- */
-public final class CFRecordsAggregate extends RecordAggregate {
-    /** Excel 97-2003 allows up to 3 conditional formating rules */
-    private static final int MAX_97_2003_CONDTIONAL_FORMAT_RULES = 3;
-    private static final POILogger logger = POILogFactory.getLogger(CFRecordsAggregate.class);
-
-    private final CFHeaderBase header;
-
-    /** List of CFRuleRecord objects */
-    private final List<CFRuleBase> rules;
-
-    private CFRecordsAggregate(CFHeaderBase pHeader, CFRuleBase[] pRules) {
-        if(pHeader == null) {
-            throw new IllegalArgumentException("header must not be null");
-        }
-        if(pRules == null) {
-            throw new IllegalArgumentException("rules must not be null");
-        }
-        if(pRules.length > MAX_97_2003_CONDTIONAL_FORMAT_RULES) {
-            logger.log(POILogger.WARN, "Excel versions before 2007 require that "
-                    + "No more than " + MAX_97_2003_CONDTIONAL_FORMAT_RULES 
-                    + " rules may be specified, " + pRules.length + " were found,"
-                    + " this file will cause problems with old Excel versions");
-        }
-        if (pRules.length != pHeader.getNumberOfConditionalFormats()) {
-            throw new RecordFormatException("Mismatch number of rules");
-        }
-        header = pHeader;
-        rules = new ArrayList<CFRuleBase>(pRules.length);
-        for (CFRuleBase pRule : pRules) {
-            checkRuleType(pRule);
-            rules.add(pRule);
-        }
-    }
-
-    public CFRecordsAggregate(CellRangeAddress[] regions, CFRuleBase[] rules) {
-        this(createHeader(regions, rules), rules);
-    }
-    private static CFHeaderBase createHeader(CellRangeAddress[] regions, CFRuleBase[] rules) {
-        final CFHeaderBase header;
-        if (rules.length == 0 || rules[0] instanceof CFRuleRecord) {
-            header = new CFHeaderRecord(regions, rules.length);
-        } else {
-            header = new CFHeader12Record(regions, rules.length);
-        }
-
-        // set the "needs recalculate" by default to avoid Excel handling conditional formatting incorrectly
-        // see bug 52122 for details
-        header.setNeedRecalculation(true);
-
-        return header;
-    }
-
-    /**
-     * Create CFRecordsAggregate from a list of CF Records
-     * @param rs - the stream to read from
-     * @return CFRecordsAggregate object
-     */
-    public static CFRecordsAggregate createCFAggregate(RecordStream rs) {
-        Record rec = rs.getNext();
-        if (rec.getSid() != CFHeaderRecord.sid &&
-            rec.getSid() != CFHeader12Record.sid) {
-            throw new IllegalStateException("next record sid was " + rec.getSid() 
-                    + " instead of " + CFHeaderRecord.sid + " or " +
-                    CFHeader12Record.sid + " as expected");
-        }
-
-        CFHeaderBase header = (CFHeaderBase)rec;
-        int nRules = header.getNumberOfConditionalFormats();
-
-        CFRuleBase[] rules = new CFRuleBase[nRules];
-        for (int i = 0; i < rules.length; i++) {
-            rules[i] = (CFRuleBase) rs.getNext();
-        }
-
-        return new CFRecordsAggregate(header, rules);
-    }
-
-    /**
-     * Create a deep clone of the record
-     */
-    public CFRecordsAggregate cloneCFAggregate() {
-        CFRuleBase[] newRecs = new CFRuleBase[rules.size()];
-        for (int i = 0; i < newRecs.length; i++) {
-            newRecs[i] = getRule(i).clone();
-        }
-        return new CFRecordsAggregate(header.clone(), newRecs);
-    }
-
-    /**
-     * @return the header. Never <code>null</code>.
-     */
-    public CFHeaderBase getHeader() {
-        return header;
-    }
-
-    private void checkRuleIndex(int idx) {
-        if(idx < 0 || idx >= rules.size()) {
-            throw new IllegalArgumentException("Bad rule record index (" + idx 
-                    + ") nRules=" + rules.size());
-        }
-    }
-    private void checkRuleType(CFRuleBase r) {
-        if (header instanceof CFHeaderRecord &&
-                 r instanceof CFRuleRecord) {
-            return;
-        }
-        if (header instanceof CFHeader12Record &&
-                 r instanceof CFRule12Record) {
-           return;
-        }
-        throw new IllegalArgumentException("Header and Rule must both be CF or both be CF12, can't mix");
-    }
-
-    public CFRuleBase getRule(int idx) {
-        checkRuleIndex(idx);
-        return rules.get(idx);
-    }
-    public void setRule(int idx, CFRuleBase r) {
-        if (r == null) {
-            throw new IllegalArgumentException("r must not be null");
-        }
-        checkRuleIndex(idx);
-        checkRuleType(r);
-        rules.set(idx, r);
-    }
-    public void addRule(CFRuleBase r) {
-        if (r == null) {
-            throw new IllegalArgumentException("r must not be null");
-        }
-        if(rules.size() >= MAX_97_2003_CONDTIONAL_FORMAT_RULES) {
-            logger.log(POILogger.WARN, "Excel versions before 2007 cannot cope with" 
-                    + " any more than " + MAX_97_2003_CONDTIONAL_FORMAT_RULES 
-                    + " - this file will cause problems with old Excel versions");
-        }
-        checkRuleType(r);
-        rules.add(r);
-        header.setNumberOfConditionalFormats(rules.size());
-    }
-    public int getNumberOfRules() {
-        return rules.size();
-    }
-
-    /**
-     * String representation of CFRecordsAggregate
-     */
-    public String toString() {
-        StringBuilder buffer = new StringBuilder();
-        String type = "CF";
-        if (header instanceof CFHeader12Record) {
-            type = "CF12";
-        }
-
-        buffer.append("[").append(type).append("]\n");
-        if( header != null ) {
-            buffer.append(header.toString());
-        }
-        for (CFRuleBase cfRule : rules) {
-            buffer.append(cfRule.toString());
-        }
-        buffer.append("[/").append(type).append("]\n");
-        return buffer.toString();
-    }
-
-    public void visitContainedRecords(RecordVisitor rv) {
-        rv.visitRecord(header);
-        for (CFRuleBase rule : rules) {
-            rv.visitRecord(rule);
-        }
-    }
-
-    /**
-     * @return <code>false</code> if this whole {@link CFHeaderRecord} / {@link CFRuleRecord}s should be deleted
-     */
-    public boolean updateFormulasAfterCellShift(FormulaShifter shifter, int currentExternSheetIx) {
-        CellRangeAddress[] cellRanges = header.getCellRanges();
-        boolean changed = false;
-        List<CellRangeAddress> temp = new ArrayList<CellRangeAddress>();
-        for (CellRangeAddress craOld : cellRanges) {
-            CellRangeAddress craNew = shiftRange(shifter, craOld, currentExternSheetIx);
-            if (craNew == null) {
-                changed = true;
-                continue;
-            }
-            temp.add(craNew);
-            if (craNew != craOld) {
-                changed = true;
-            }
-        }
-
-        if (changed) {
-            int nRanges = temp.size();
-            if (nRanges == 0) {
-                return false;
-            }
-            CellRangeAddress[] newRanges = new CellRangeAddress[nRanges];
-            temp.toArray(newRanges);
-            header.setCellRanges(newRanges);
-        }
-
-        for (CFRuleBase rule : rules) {
-            Ptg[] ptgs;
-            ptgs = rule.getParsedExpression1();
-            if (ptgs != null && shifter.adjustFormula(ptgs, currentExternSheetIx)) {
-                rule.setParsedExpression1(ptgs);
-            }
-            ptgs = rule.getParsedExpression2();
-            if (ptgs != null && shifter.adjustFormula(ptgs, currentExternSheetIx)) {
-                rule.setParsedExpression2(ptgs);
-            }
-            if (rule instanceof CFRule12Record) {
-                CFRule12Record rule12 = (CFRule12Record)rule;
-                ptgs = rule12.getParsedExpressionScale();
-                if (ptgs != null && shifter.adjustFormula(ptgs, currentExternSheetIx)) {
-                    rule12.setParsedExpressionScale(ptgs);
-                }
-            }
-        }
-        return true;
-    }
-
-    private static CellRangeAddress shiftRange(FormulaShifter shifter, CellRangeAddress cra, int currentExternSheetIx) {
-        // FormulaShifter works well in terms of Ptgs - so convert CellRangeAddress to AreaPtg (and back) here
-        AreaPtg aptg = new AreaPtg(cra.getFirstRow(), cra.getLastRow(), cra.getFirstColumn(), cra.getLastColumn(), false, false, false, false);
-        Ptg[] ptgs = { aptg, };
-
-        if (!shifter.adjustFormula(ptgs, currentExternSheetIx)) {
-            return cra;
-        }
-        Ptg ptg0 = ptgs[0];
-        if (ptg0 instanceof AreaPtg) {
-            AreaPtg bptg = (AreaPtg) ptg0;
-            return new CellRangeAddress(bptg.getFirstRow(), bptg.getLastRow(), bptg.getFirstColumn(), bptg.getLastColumn());
-        }
-        if (ptg0 instanceof AreaErrPtg) {
-            return null;
-        }
-        throw new IllegalStateException("Unexpected shifted ptg class (" + ptg0.getClass().getName() + ")");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
deleted file mode 100644
index 5df1993..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.*;
-
-/**
- * Manages the all the records associated with a chart sub-stream.<p>
- * Includes the initial {@link BOFRecord} and final {@link EOFRecord}.
- */
-public final class ChartSubstreamRecordAggregate extends RecordAggregate {
-
-	private final BOFRecord _bofRec;
-	/**
-	 * All the records between BOF and EOF
-	 */
-	private final List<RecordBase> _recs;
-	private PageSettingsBlock _psBlock;
-
-	public ChartSubstreamRecordAggregate(RecordStream rs) {
-		_bofRec = (BOFRecord) rs.getNext();
-		List<RecordBase> temp = new ArrayList<RecordBase>();
-		while (rs.peekNextClass() != EOFRecord.class) {
-			if (PageSettingsBlock.isComponentRecord(rs.peekNextSid())) {
-				if (_psBlock != null) {
-					if (rs.peekNextSid() == HeaderFooterRecord.sid) {
-						// test samples: 45538_classic_Footer.xls, 45538_classic_Header.xls
-						_psBlock.addLateHeaderFooter((HeaderFooterRecord)rs.getNext());
-						continue;
-					}
-					throw new IllegalStateException(
-							"Found more than one PageSettingsBlock in chart sub-stream, had sid: " + rs.peekNextSid());
-				}
-				_psBlock = new PageSettingsBlock(rs);
-				temp.add(_psBlock);
-				continue;
-			}
-			temp.add(rs.getNext());
-		}
-		_recs = temp;
-		Record eof = rs.getNext(); // no need to save EOF in field
-		if (!(eof instanceof EOFRecord)) {
-			throw new IllegalStateException("Bad chart EOF");
-		}
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		if (_recs.isEmpty()) {
-			return;
-		}
-		rv.visitRecord(_bofRec);
-		for (int i = 0; i < _recs.size(); i++) {
-			RecordBase rb = _recs.get(i);
-			if (rb instanceof RecordAggregate) {
-				((RecordAggregate) rb).visitContainedRecords(rv);
-			} else {
-				rv.visitRecord((Record) rb);
-			}
-		}
-		rv.visitRecord(EOFRecord.instance);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
deleted file mode 100644
index 7c02b8b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.ColumnInfoRecord;
-
-/**
- * @author Glen Stampoultzis
- */
-public final class ColumnInfoRecordsAggregate extends RecordAggregate implements Cloneable {
-	/**
-	 * List of {@link ColumnInfoRecord}s assumed to be in order
-	 */
-	private final List<ColumnInfoRecord> records;
-
-
-	private static final class CIRComparator implements Comparator<ColumnInfoRecord> {
-		public static final Comparator<ColumnInfoRecord> instance = new CIRComparator();
-		private CIRComparator() {
-			// enforce singleton
-		}
-		public int compare(ColumnInfoRecord a, ColumnInfoRecord b) {
-			return compareColInfos(a, b);
-		}
-		public static int compareColInfos(ColumnInfoRecord a, ColumnInfoRecord b) {
-			return a.getFirstColumn()-b.getFirstColumn();
-		}
-	}
-
-	/**
-	 * Creates an empty aggregate
-	 */
-	public ColumnInfoRecordsAggregate() {
-		records = new ArrayList<ColumnInfoRecord>();
-	}
-	public ColumnInfoRecordsAggregate(RecordStream rs) {
-		this();
-
-		boolean isInOrder = true;
-		ColumnInfoRecord cirPrev = null;
-		while(rs.peekNextClass() == ColumnInfoRecord.class) {
-			ColumnInfoRecord cir = (ColumnInfoRecord) rs.getNext();
-			records.add(cir);
-			if (cirPrev != null && CIRComparator.compareColInfos(cirPrev, cir) > 0) {
-				isInOrder = false;
-			}
-			cirPrev = cir;
-		}
-		if (records.size() < 1) {
-			throw new RuntimeException("No column info records found");
-		}
-		if (!isInOrder) {
-			Collections.sort(records, CIRComparator.instance);
-		}
-	}
-
-	@Override
-	public ColumnInfoRecordsAggregate clone() {
-		ColumnInfoRecordsAggregate rec = new ColumnInfoRecordsAggregate();
-		for (ColumnInfoRecord ci : records) {
-			rec.records.add(ci.clone());
-		}
-		return rec;
-	}
-
-	/**
-	 * Inserts a column into the aggregate (at the end of the list).
-	 */
-	public void insertColumn(ColumnInfoRecord col) {
-		records.add(col);
-		Collections.sort(records, CIRComparator.instance);
-	}
-
-	/**
-	 * Inserts a column into the aggregate (at the position specified by
-	 * <code>idx</code>.
-	 */
-	private void insertColumn(int idx, ColumnInfoRecord col) {
-		records.add(idx, col);
-	}
-
-	/* package */ int getNumColumns() {
-		return records.size();
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		int nItems = records.size();
-		if (nItems < 1) {
-			return;
-		}
-		ColumnInfoRecord cirPrev = null;
-		for(int i=0; i<nItems; i++) {
-			ColumnInfoRecord cir = records.get(i);
-			rv.visitRecord(cir);
-			if (cirPrev != null && CIRComparator.compareColInfos(cirPrev, cir) > 0) {
-				// Excel probably wouldn't mind, but there is much logic in this class
-				// that assumes the column info records are kept in order
-				throw new RuntimeException("Column info records are out of order");
-			}
-			cirPrev = cir;
-		}
-	}
-
-	private int findStartOfColumnOutlineGroup(int pIdx) {
-		// Find the start of the group.
-		ColumnInfoRecord columnInfo = records.get(pIdx);
-		int level = columnInfo.getOutlineLevel();
-		int idx = pIdx;
-		while (idx != 0) {
-			ColumnInfoRecord prevColumnInfo = records.get(idx - 1);
-			if (!prevColumnInfo.isAdjacentBefore(columnInfo)) {
-				break;
-			}
-			if (prevColumnInfo.getOutlineLevel() < level) {
-				break;
-			}
-			idx--;
-			columnInfo = prevColumnInfo;
-		}
-
-		return idx;
-	}
-
-	private int findEndOfColumnOutlineGroup(int colInfoIndex) {
-		// Find the end of the group.
-		ColumnInfoRecord columnInfo = records.get(colInfoIndex);
-		int level = columnInfo.getOutlineLevel();
-		int idx = colInfoIndex;
-		while (idx < records.size() - 1) {
-			ColumnInfoRecord nextColumnInfo = records.get(idx + 1);
-			if (!columnInfo.isAdjacentBefore(nextColumnInfo)) {
-				break;
-			}
-			if (nextColumnInfo.getOutlineLevel() < level) {
-				break;
-			}
-			idx++;
-			columnInfo = nextColumnInfo;
-		}
-		return idx;
-	}
-
-	private ColumnInfoRecord getColInfo(int idx) {
-		return records.get( idx );
-	}
-
-	/**
-	 * 'Collapsed' state is stored in a single column col info record immediately after the outline group
-	 * @param idx
-	 * @return true, if the column is collapsed, false otherwise.
-	 */
-	private boolean isColumnGroupCollapsed(int idx) {
-		int endOfOutlineGroupIdx = findEndOfColumnOutlineGroup(idx);
-		int nextColInfoIx = endOfOutlineGroupIdx+1;
-		if (nextColInfoIx >= records.size()) {
-			return false;
-		}
-		ColumnInfoRecord nextColInfo = getColInfo(nextColInfoIx);
-		if (!getColInfo(endOfOutlineGroupIdx).isAdjacentBefore(nextColInfo)) {
-			return false;
-		}
-		return nextColInfo.getCollapsed();
-	}
-
-
-	private boolean isColumnGroupHiddenByParent(int idx) {
-		// Look out outline details of end
-		int endLevel = 0;
-		boolean endHidden = false;
-		int endOfOutlineGroupIdx = findEndOfColumnOutlineGroup( idx );
-		if (endOfOutlineGroupIdx < records.size()) {
-			ColumnInfoRecord nextInfo = getColInfo(endOfOutlineGroupIdx + 1);
-			if (getColInfo(endOfOutlineGroupIdx).isAdjacentBefore(nextInfo)) {
-				endLevel = nextInfo.getOutlineLevel();
-				endHidden = nextInfo.getHidden();
-			}
-		}
-		// Look out outline details of start
-		int startLevel = 0;
-		boolean startHidden = false;
-		int startOfOutlineGroupIdx = findStartOfColumnOutlineGroup( idx );
-		if (startOfOutlineGroupIdx > 0) {
-			ColumnInfoRecord prevInfo = getColInfo(startOfOutlineGroupIdx - 1);
-			if (prevInfo.isAdjacentBefore(getColInfo(startOfOutlineGroupIdx))) {
-				startLevel = prevInfo.getOutlineLevel();
-				startHidden = prevInfo.getHidden();
-			}
-		}
-		if (endLevel > startLevel) {
-			return endHidden;
-		}
-		return startHidden;
-	}
-
-	public void collapseColumn(int columnIndex) {
-		int colInfoIx = findColInfoIdx(columnIndex, 0);
-		if (colInfoIx == -1) {
-			return;
-		}
-
-		// Find the start of the group.
-		int groupStartColInfoIx = findStartOfColumnOutlineGroup(colInfoIx);
-		ColumnInfoRecord columnInfo = getColInfo(groupStartColInfoIx);
-
-		// Hide all the columns until the end of the group
-		int lastColIx = setGroupHidden(groupStartColInfoIx, columnInfo.getOutlineLevel(), true);
-
-		// Write collapse field
-		setColumn(lastColIx + 1, null, null, null, null, Boolean.TRUE);
-	}
-	/**
-	 * Sets all adjacent columns of the same outline level to the specified hidden status.
-	 * @param pIdx the col info index of the start of the outline group
-	 * @return the column index of the last column in the outline group
-	 */
-	private int setGroupHidden(int pIdx, int level, boolean hidden) {
-		int idx = pIdx;
-		ColumnInfoRecord columnInfo = getColInfo(idx);
-		while (idx < records.size()) {
-			columnInfo.setHidden(hidden);
-			if (idx + 1 < records.size()) {
-				ColumnInfoRecord nextColumnInfo = getColInfo(idx + 1);
-				if (!columnInfo.isAdjacentBefore(nextColumnInfo)) {
-					break;
-				}
-				if (nextColumnInfo.getOutlineLevel() < level) {
-					break;
-				}
-				columnInfo = nextColumnInfo;
-			}
-			idx++;
-		}
-		return columnInfo.getLastColumn();
-	}
-
-
-	public void expandColumn(int columnIndex) {
-		int idx = findColInfoIdx(columnIndex, 0);
-		if (idx == -1) {
-			return;
-		}
-
-		// If it is already expanded do nothing.
-		if (!isColumnGroupCollapsed(idx)) {
-			return;
-		}
-
-		// Find the start/end of the group.
-		int startIdx = findStartOfColumnOutlineGroup(idx);
-		int endIdx = findEndOfColumnOutlineGroup(idx);
-
-		// expand:
-		// colapsed bit must be unset
-		// hidden bit gets unset _if_ surrounding groups are expanded you can determine
-		//   this by looking at the hidden bit of the enclosing group.  You will have
-		//   to look at the start and the end of the current group to determine which
-		//   is the enclosing group
-		// hidden bit only is altered for this outline level.  ie.  don't uncollapse contained groups
-		ColumnInfoRecord columnInfo = getColInfo(endIdx);
-		if (!isColumnGroupHiddenByParent(idx)) {
-			int outlineLevel = columnInfo.getOutlineLevel();
-			for (int i = startIdx; i <= endIdx; i++) {
-				ColumnInfoRecord ci = getColInfo(i);
-				if (outlineLevel == ci.getOutlineLevel())
-					ci.setHidden(false);
-			}
-		}
-
-		// Write collapse flag (stored in a single col info record after this outline group)
-		setColumn(columnInfo.getLastColumn() + 1, null, null, null, null, Boolean.FALSE);
-	}
-
-	private static ColumnInfoRecord copyColInfo(ColumnInfoRecord ci) {
-		return ci.clone();
-	}
-
-
-	public void setColumn(int targetColumnIx, Short xfIndex, Integer width,
-					Integer level, Boolean hidden, Boolean collapsed) {
-		ColumnInfoRecord ci = null;
-		int k  = 0;
-
-		for (k = 0; k < records.size(); k++) {
-			ColumnInfoRecord tci = records.get(k);
-			if (tci.containsColumn(targetColumnIx)) {
-				ci = tci;
-				break;
-			}
-			if (tci.getFirstColumn() > targetColumnIx) {
-				// call column infos after k are for later columns
-				break; // exit now so k will be the correct insert pos
-			}
-		}
-
-		if (ci == null) {
-			// okay so there ISN'T a column info record that covers this column so lets create one!
-			ColumnInfoRecord nci = new ColumnInfoRecord();
-
-			nci.setFirstColumn(targetColumnIx);
-			nci.setLastColumn(targetColumnIx);
-			setColumnInfoFields( nci, xfIndex, width, level, hidden, collapsed );
-			insertColumn(k, nci);
-			attemptMergeColInfoRecords(k);
-			return;
-		}
-
-		boolean styleChanged = xfIndex != null && ci.getXFIndex() != xfIndex.shortValue();
-		boolean widthChanged = width != null && ci.getColumnWidth() != width.shortValue();
-		boolean levelChanged = level != null && ci.getOutlineLevel() != level.intValue();
-		boolean hiddenChanged = hidden != null && ci.getHidden() != hidden.booleanValue();
-		boolean collapsedChanged = collapsed != null && ci.getCollapsed() != collapsed.booleanValue();
-
-		boolean columnChanged = styleChanged || widthChanged || levelChanged || hiddenChanged || collapsedChanged;
-		if (!columnChanged) {
-			// do nothing...nothing changed.
-			return;
-		}
-
-		if (ci.getFirstColumn() == targetColumnIx && ci.getLastColumn() == targetColumnIx) {
-			// ColumnInfo ci for a single column, the target column
-			setColumnInfoFields(ci, xfIndex, width, level, hidden, collapsed);
-			attemptMergeColInfoRecords(k);
-			return;
-		}
-
-		if (ci.getFirstColumn() == targetColumnIx || ci.getLastColumn() == targetColumnIx) {
-			// The target column is at either end of the multi-column ColumnInfo ci
-			// we'll just divide the info and create a new one
-			if (ci.getFirstColumn() == targetColumnIx) {
-				ci.setFirstColumn(targetColumnIx + 1);
-			} else {
-				ci.setLastColumn(targetColumnIx - 1);
-				k++; // adjust insert pos to insert after
-			}
-			ColumnInfoRecord nci = copyColInfo(ci);
-
-			nci.setFirstColumn(targetColumnIx);
-			nci.setLastColumn(targetColumnIx);
-			setColumnInfoFields( nci, xfIndex, width, level, hidden, collapsed );
-
-			insertColumn(k, nci);
-			attemptMergeColInfoRecords(k);
-		} else {
-			//split to 3 records
-			ColumnInfoRecord ciStart = ci;
-			ColumnInfoRecord ciMid = copyColInfo(ci);
-			ColumnInfoRecord ciEnd = copyColInfo(ci);
-			int lastcolumn = ci.getLastColumn();
-
-			ciStart.setLastColumn(targetColumnIx - 1);
-
-			ciMid.setFirstColumn(targetColumnIx);
-			ciMid.setLastColumn(targetColumnIx);
-			setColumnInfoFields(ciMid, xfIndex, width, level, hidden, collapsed);
-			insertColumn(++k, ciMid);
-
-			ciEnd.setFirstColumn(targetColumnIx+1);
-			ciEnd.setLastColumn(lastcolumn);
-			insertColumn(++k, ciEnd);
-			// no need to attemptMergeColInfoRecords because we
-			// know both on each side are different
-		}
-	}
-
-	/**
-	 * Sets all non null fields into the <code>ci</code> parameter.
-	 */
-	private static void setColumnInfoFields(ColumnInfoRecord ci, Short xfStyle, Integer width,
-				Integer level, Boolean hidden, Boolean collapsed) {
-		if (xfStyle != null) {
-			ci.setXFIndex(xfStyle.shortValue());
-		}
-		if (width != null) {
-			ci.setColumnWidth(width.intValue());
-		}
-		if (level != null) {
-			ci.setOutlineLevel( level.shortValue() );
-		}
-		if (hidden != null) {
-			ci.setHidden( hidden.booleanValue() );
-		}
-		if (collapsed != null) {
-			ci.setCollapsed( collapsed.booleanValue() );
-		}
-	}
-
-	private int findColInfoIdx(int columnIx, int fromColInfoIdx) {
-		if (columnIx < 0) {
-			throw new IllegalArgumentException( "column parameter out of range: " + columnIx );
-		}
-		if (fromColInfoIdx < 0) {
-			throw new IllegalArgumentException( "fromIdx parameter out of range: " + fromColInfoIdx );
-		}
-
-		for (int k = fromColInfoIdx; k < records.size(); k++) {
-			ColumnInfoRecord ci = getColInfo(k);
-			if (ci.containsColumn(columnIx)) {
-				return k;
-			}
-			if (ci.getFirstColumn() > columnIx) {
-				break;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Attempts to merge the col info record at the specified index
-	 * with either or both of its neighbours
-	 */
-	private void attemptMergeColInfoRecords(int colInfoIx) {
-		int nRecords = records.size();
-		if (colInfoIx < 0 || colInfoIx >= nRecords) {
-			throw new IllegalArgumentException("colInfoIx " + colInfoIx
-					+ " is out of range (0.." + (nRecords-1) + ")");
-		}
-		ColumnInfoRecord currentCol = getColInfo(colInfoIx);
-		int nextIx = colInfoIx+1;
-		if (nextIx < nRecords) {
-			if (mergeColInfoRecords(currentCol, getColInfo(nextIx))) {
-    			records.remove(nextIx);
-			}
-		}
-		if (colInfoIx > 0) {
-			if (mergeColInfoRecords(getColInfo(colInfoIx - 1), currentCol)) {
-    			records.remove(colInfoIx);
-    		}
-		}
-	}
-	/**
-	 * merges two column info records (if they are adjacent and have the same formatting, etc)
-	 * @return <code>false</code> if the two column records could not be merged
-	 */
-	private static boolean mergeColInfoRecords(ColumnInfoRecord ciA, ColumnInfoRecord ciB) {
-		if (ciA.isAdjacentBefore(ciB) && ciA.formatMatches(ciB)) {
-			ciA.setLastColumn(ciB.getLastColumn());
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * Creates an outline group for the specified columns, by setting the level
-	 * field for each col info record in the range. {@link ColumnInfoRecord}s
-	 * may be created, split or merged as a result of this operation.
-	 *
-	 * @param fromColumnIx
-	 *            group from this column (inclusive)
-	 * @param toColumnIx
-	 *            group to this column (inclusive)
-	 * @param indent
-	 *            if <code>true</code> the group will be indented by one
-	 *            level, if <code>false</code> indenting will be decreased by
-	 *            one level.
-	 */
-	public void groupColumnRange(int fromColumnIx, int toColumnIx, boolean indent) {
-
-		int colInfoSearchStartIdx = 0; // optimization to speed up the search for col infos
-		for (int i = fromColumnIx; i <= toColumnIx; i++) {
-			int level = 1;
-			int colInfoIdx = findColInfoIdx(i, colInfoSearchStartIdx);
-			if (colInfoIdx != -1) {
-				level = getColInfo(colInfoIdx).getOutlineLevel();
-				if (indent) {
-					level++;
-				} else {
-					level--;
-				}
-				level = Math.max(0, level);
-				level = Math.min(7, level);
-				colInfoSearchStartIdx = Math.max(0, colInfoIdx - 1); // -1 just in case this column is collapsed later.
-			}
-			setColumn(i, null, null, Integer.valueOf(level), null, null);
-		}
-	}
-	/**
-	 * Finds the <tt>ColumnInfoRecord</tt> which contains the specified columnIndex
-	 * @param columnIndex index of the column (not the index of the ColumnInfoRecord)
-	 * @return <code>null</code> if no column info found for the specified column
-	 */
-	public ColumnInfoRecord findColumnInfo(int columnIndex) {
-		int nInfos = records.size();
-		for(int i=0; i< nInfos; i++) {
-			ColumnInfoRecord ci = getColInfo(i);
-			if (ci.containsColumn(columnIndex)) {
-				return ci;
-			}
-		}
-		return null;
-	}
-	public int getMaxOutlineLevel() {
-		int result = 0;
-		int count=records.size();
-		for (int i=0; i<count; i++) {
-			ColumnInfoRecord columnInfoRecord = getColInfo(i);
-			result = Math.max(columnInfoRecord.getOutlineLevel(), result);
-		}
-		return result;
-	}
-	public int getOutlineLevel(int columnIndex) {
-	    ColumnInfoRecord ci = findColumnInfo(columnIndex);
-	    if (ci != null) {
-            return ci.getOutlineLevel();
-	    } else {
-	        return 0;
-	    }
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
deleted file mode 100644
index cfbd369..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.CFHeader12Record;
-import org.apache.poi.hssf.record.CFHeaderRecord;
-import org.apache.poi.ss.formula.FormulaShifter;
-
-/**
- * Holds all the conditional formatting for a workbook sheet.<p>
- * 
- * See OOO exelfileformat.pdf sec 4.12 'Conditional Formatting Table'
- */
-public final class ConditionalFormattingTable extends RecordAggregate {
-	private final List<CFRecordsAggregate> _cfHeaders;
-
-	/**
-	 * Creates an empty ConditionalFormattingTable
-	 */
-	public ConditionalFormattingTable() {
-		_cfHeaders = new ArrayList<CFRecordsAggregate>();
-	}
-
-	public ConditionalFormattingTable(RecordStream rs) {
-
-		List<CFRecordsAggregate> temp = new ArrayList<CFRecordsAggregate>();
-		while (rs.peekNextClass() == CFHeaderRecord.class ||
-		       rs.peekNextClass() == CFHeader12Record.class) {
-			temp.add(CFRecordsAggregate.createCFAggregate(rs));
-		}
-		_cfHeaders = temp;
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		for (CFRecordsAggregate subAgg : _cfHeaders) {
-			subAgg.visitContainedRecords(rv);
-		}
-	}
-
-	/**
-	 * @return index of the newly added CF header aggregate
-	 */
-	public int add(CFRecordsAggregate cfAggregate) {
-	    cfAggregate.getHeader().setID(_cfHeaders.size());
-		_cfHeaders.add(cfAggregate);
-		return _cfHeaders.size() - 1;
-	}
-
-	public int size() {
-		return _cfHeaders.size();
-	}
-
-	public CFRecordsAggregate get(int index) {
-		checkIndex(index);
-		return _cfHeaders.get(index);
-	}
-
-	public void remove(int index) {
-		checkIndex(index);
-		_cfHeaders.remove(index);
-	}
-
-	private void checkIndex(int index) {
-		if (index < 0 || index >= _cfHeaders.size()) {
-			throw new IllegalArgumentException("Specified CF index " + index
-					+ " is outside the allowable range (0.." + (_cfHeaders.size() - 1) + ")");
-		}
-	}
-
-	public void updateFormulasAfterCellShift(FormulaShifter shifter, int externSheetIndex) {
-		for (int i = 0; i < _cfHeaders.size(); i++) {
-			CFRecordsAggregate subAgg = _cfHeaders.get(i);
-			boolean shouldKeep = subAgg.updateFormulasAfterCellShift(shifter, externSheetIndex);
-			if (!shouldKeep) {
-				_cfHeaders.remove(i);
-				i--;
-			}
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
deleted file mode 100644
index 7018eec..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.*;
-
-/**
- * Manages the all the records associated with a 'Custom View Settings' sub-stream.<p>
- * Includes the initial USERSVIEWBEGIN(0x01AA) and final USERSVIEWEND(0x01AB).
- */
-public final class CustomViewSettingsRecordAggregate extends RecordAggregate {
-
-	private final Record _begin;
-	private final Record _end;
-	/**
-	 * All the records between BOF and EOF
-	 */
-	private final List<RecordBase> _recs;
-	private PageSettingsBlock _psBlock;
-
-	public CustomViewSettingsRecordAggregate(RecordStream rs) {
-		_begin = rs.getNext();
-		if (_begin.getSid() != UserSViewBegin.sid) {
-			throw new IllegalStateException("Bad begin record");
-		}
-		List<RecordBase> temp = new ArrayList<RecordBase>();
-		while (rs.peekNextSid() != UserSViewEnd.sid) {
-			if (PageSettingsBlock.isComponentRecord(rs.peekNextSid())) {
-                if (_psBlock != null) {
-                    if (rs.peekNextSid() == HeaderFooterRecord.sid) {
-                        // test samples: 45538_classic_Footer.xls, 45538_classic_Header.xls
-                        _psBlock.addLateHeaderFooter((HeaderFooterRecord)rs.getNext());
-                        continue;
-                    }
-                    throw new IllegalStateException(
-                            "Found more than one PageSettingsBlock in chart sub-stream, had sid: " + rs.peekNextSid());
-                }
-				_psBlock = new PageSettingsBlock(rs);
-				temp.add(_psBlock);
-				continue;
-			}
-			temp.add(rs.getNext());
-		}
-		_recs = temp;
-		_end = rs.getNext(); // no need to save EOF in field
-		if (_end.getSid() != UserSViewEnd.sid) {
-			throw new IllegalStateException("Bad custom view settings end record");
-		}
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		if (_recs.isEmpty()) {
-			return;
-		}
-		rv.visitRecord(_begin);
-		for (int i = 0; i < _recs.size(); i++) {
-			RecordBase rb = _recs.get(i);
-			if (rb instanceof RecordAggregate) {
-				((RecordAggregate) rb).visitContainedRecords(rv);
-			} else {
-				rv.visitRecord((Record) rb);
-			}
-		}
-		rv.visitRecord(_end);
-	}
-
-	public static boolean isBeginRecord(int sid) {
-		return sid == UserSViewBegin.sid;
-	}
-
-    public void append(RecordBase r){
-        _recs.add(r);    
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
deleted file mode 100644
index a4bb38a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.DVALRecord;
-import org.apache.poi.hssf.record.DVRecord;
-
-/**
- * Manages the DVALRecord and DVRecords for a single sheet<p>
- * See OOO excelfileformat.pdf section 4.14
- */
-public final class DataValidityTable extends RecordAggregate {
-
-	private final DVALRecord _headerRec;
-	/**
-	 * The list of data validations for the current sheet.
-	 * Note - this may be empty (contrary to OOO documentation)
-	 */
-	private final List<DVRecord> _validationList;
-
-	public DataValidityTable(RecordStream rs) {
-		_headerRec = (DVALRecord) rs.getNext();
-		List<DVRecord> temp = new ArrayList<DVRecord>();
-		while (rs.peekNextClass() == DVRecord.class) {
-			temp.add((DVRecord) rs.getNext());
-		}
-		_validationList = temp;
-	}
-
-	public DataValidityTable() {
-		_headerRec = new DVALRecord();
-		_validationList = new ArrayList<DVRecord>();
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		if (_validationList.isEmpty()) {
-			return;
-		}
-		rv.visitRecord(_headerRec);
-		for (int i = 0; i < _validationList.size(); i++) {
-			rv.visitRecord(_validationList.get(i));
-		}
-	}
-
-	public void addDataValidation(DVRecord dvRecord) {
-		_validationList.add(dvRecord);
-		_headerRec.setDVRecNo(_validationList.size());
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
deleted file mode 100644
index 4382d99..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import org.apache.poi.hssf.record.ArrayRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.ss.formula.ptg.ExpPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * The formula record aggregate is used to join together the formula record and it's
- * (optional) string record and (optional) Shared Formula Record (template reads, excel optimization).
- *
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Vladimirs Abramovs(Vladimirs.Abramovs at exigenservices.com) - Array Formula support
- */
-public final class FormulaRecordAggregate extends RecordAggregate implements CellValueRecordInterface {
-
-	private final FormulaRecord _formulaRecord;
-	private SharedValueManager _sharedValueManager;
-	/** caches the calculated result of the formula */
-	private StringRecord _stringRecord;
-	private SharedFormulaRecord _sharedFormulaRecord;
-
-	/**
-	 * @param stringRec may be <code>null</code> if this formula does not have a cached text
-	 * value.
-	 * @param svm the {@link SharedValueManager} for the current sheet
-	 */
-	public FormulaRecordAggregate(FormulaRecord formulaRec, StringRecord stringRec, SharedValueManager svm) {
-		if (svm == null) {
-			throw new IllegalArgumentException("sfm must not be null");
-		}
-		if (formulaRec.hasCachedResultString()) {
-			if (stringRec == null) {
-				throw new RecordFormatException("Formula record flag is set but String record was not found");
-			}
-			_stringRecord = stringRec;
-		} else {
-			// Usually stringRec is null here (in agreement with what the formula rec says).
-			// In the case where an extra StringRecord is erroneously present, Excel (2007)
-			// ignores it (see bug 46213).
-			_stringRecord = null;
-		}
-
-		_formulaRecord = formulaRec;
-		_sharedValueManager = svm;
-		if (formulaRec.isSharedFormula()) {
-			CellReference firstCell = formulaRec.getFormula().getExpReference();
-			if (firstCell == null) {
-				handleMissingSharedFormulaRecord(formulaRec);
-			} else {
-				_sharedFormulaRecord = svm.linkSharedFormulaRecord(firstCell, this);
-			}
-		}
-	}
-	/**
-	 * Sometimes the shared formula flag "seems" to be erroneously set (because the corresponding
-	 * {@link SharedFormulaRecord} does not exist). Normally this would leave no way of determining
-	 * the {@link Ptg} tokens for the formula.  However as it turns out in these
-	 * cases, Excel encodes the unshared {@link Ptg} tokens in the right place (inside the {@link
-	 * FormulaRecord}).  So the the only thing that needs to be done is to ignore the erroneous
-	 * shared formula flag.<br/>
-	 *
-	 * This method may also be used for setting breakpoints to help diagnose issues regarding the
-	 * abnormally-set 'shared formula' flags.
-	 * (see TestValueRecordsAggregate.testSpuriousSharedFormulaFlag()).<p/>
-	 */
-	private static void handleMissingSharedFormulaRecord(FormulaRecord formula) {
-		// make sure 'unshared' formula is actually available
-		Ptg firstToken = formula.getParsedExpression()[0];
-		if (firstToken instanceof ExpPtg) {
-			throw new RecordFormatException(
-					"SharedFormulaRecord not found for FormulaRecord with (isSharedFormula=true)");
-		}
-		// could log an info message here since this is a fairly unusual occurrence.
-		formula.setSharedFormula(false); // no point leaving the flag erroneously set
-	}
-
-	public FormulaRecord getFormulaRecord() {
-		return _formulaRecord;
-	}
-
-	/**
-	 * debug only
-	 * TODO - encapsulate
-	 */
-	public StringRecord getStringRecord() {
-		return _stringRecord;
-	}
-
-	public short getXFIndex() {
-		return _formulaRecord.getXFIndex();
-	}
-
-	public void setXFIndex(short xf) {
-		_formulaRecord.setXFIndex(xf);
-	}
-
-	public void setColumn(short col) {
-		_formulaRecord.setColumn(col);
-	}
-
-	public void setRow(int row) {
-		_formulaRecord.setRow(row);
-	}
-
-	public short getColumn() {
-		return _formulaRecord.getColumn();
-	}
-
-	public int getRow() {
-		return _formulaRecord.getRow();
-	}
-
-	public String toString() {
-		return _formulaRecord.toString();
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		 rv.visitRecord(_formulaRecord);
-		 Record sharedFormulaRecord = _sharedValueManager.getRecordForFirstCell(this);
-		 if (sharedFormulaRecord != null) {
-			 rv.visitRecord(sharedFormulaRecord);
-		 }
-		 if (_formulaRecord.hasCachedResultString() && _stringRecord != null) {
-			 rv.visitRecord(_stringRecord);
-		 }
-	}
-
-	public String getStringValue() {
-		if(_stringRecord==null) {
-			return null;
-		}
-		return _stringRecord.getString();
-	}
-
-	public void setCachedStringResult(String value) {
-
-		// Save the string into a String Record, creating one if required
-		if(_stringRecord == null) {
-			_stringRecord = new StringRecord();
-		}
-		_stringRecord.setString(value);
-		if (value.length() < 1) {
-			_formulaRecord.setCachedResultTypeEmptyString();
-		} else {
-			_formulaRecord.setCachedResultTypeString();
-		}
-	}
-	public void setCachedBooleanResult(boolean value) {
-		_stringRecord = null;
-		_formulaRecord.setCachedResultBoolean(value);
-	}
-	public void setCachedErrorResult(int errorCode) {
-		_stringRecord = null;
-		_formulaRecord.setCachedResultErrorCode(errorCode);
-	}
-	public void setCachedErrorResult(FormulaError error) {
-		setCachedErrorResult(error.getCode());
-	}
-	public void setCachedDoubleResult(double value) {
-		_stringRecord = null;
-		_formulaRecord.setValue(value);
-	}
-
-	public Ptg[] getFormulaTokens() {
-		if (_sharedFormulaRecord != null) {
-			return _sharedFormulaRecord.getFormulaTokens(_formulaRecord);
-		}
-		CellReference expRef = _formulaRecord.getFormula().getExpReference();
-		if (expRef != null) {
-			ArrayRecord arec = _sharedValueManager.getArrayRecord(expRef.getRow(), expRef.getCol());
-			return arec.getFormulaTokens();
-		}
-		return _formulaRecord.getParsedExpression();
-	}
-
-	/**
-	 * Also checks for a related shared formula and unlinks it if found
-	 */
-	public void setParsedExpression(Ptg[] ptgs) {
-		notifyFormulaChanging();
-		_formulaRecord.setParsedExpression(ptgs);
-	}
-
-	public void unlinkSharedFormula() {
-		SharedFormulaRecord sfr = _sharedFormulaRecord;
-		if (sfr == null) {
-			throw new IllegalStateException("Formula not linked to shared formula");
-		}
-		Ptg[] ptgs = sfr.getFormulaTokens(_formulaRecord);
-		_formulaRecord.setParsedExpression(ptgs);
-		//Now its not shared!
-		_formulaRecord.setSharedFormula(false);
-		_sharedFormulaRecord = null;
-	}
-	/**
-	 * Should be called by any code which is either deleting this formula cell, or changing
-	 * its type.  This method gives the aggregate a chance to unlink any shared formula
-	 * that may be involved with this cell formula.
-	 */
-	public void notifyFormulaChanging() {
-		if (_sharedFormulaRecord != null) {
-			_sharedValueManager.unlink(_sharedFormulaRecord);
-		}
-	}
-	public boolean isPartOfArrayFormula() {
-		if (_sharedFormulaRecord != null) {
-			return false;
-		}
-        CellReference expRef = _formulaRecord.getFormula().getExpReference();
-        ArrayRecord arec = expRef == null ? null : _sharedValueManager.getArrayRecord(expRef.getRow(), expRef.getCol());
-		return arec != null;
-	}
-
-	public CellRangeAddress getArrayFormulaRange() {
-		if (_sharedFormulaRecord != null) {
-			throw new IllegalStateException("not an array formula cell.");
-		}
-		CellReference expRef = _formulaRecord.getFormula().getExpReference();
-		if (expRef == null) {
-			throw new IllegalStateException("not an array formula cell.");
-		}
-		ArrayRecord arec = _sharedValueManager.getArrayRecord(expRef.getRow(), expRef.getCol());
-		if (arec == null) {
-			throw new IllegalStateException("ArrayRecord was not found for the locator " + expRef.formatAsString());
-		}
-		CellRangeAddress8Bit a = arec.getRange();
-		return new CellRangeAddress(a.getFirstRow(), a.getLastRow(), a.getFirstColumn(),a.getLastColumn());
-	}
-
-	public void setArrayFormula(CellRangeAddress r, Ptg[] ptgs) {
-
-		ArrayRecord arr = new ArrayRecord(Formula.create(ptgs), new CellRangeAddress8Bit(r.getFirstRow(), r.getLastRow(), r.getFirstColumn(), r.getLastColumn()));
-		_sharedValueManager.addArrayRecord(arr);
-	}
-	/**
-	 * Removes an array formula
-	 * @return the range of the array formula containing the specified cell. Never <code>null</code>
-	 */
-	public CellRangeAddress removeArrayFormula(int rowIndex, int columnIndex) {
-		CellRangeAddress8Bit a = _sharedValueManager.removeArrayFormula(rowIndex, columnIndex);
-        // at this point FormulaRecordAggregate#isPartOfArrayFormula() should return false
-        _formulaRecord.setParsedExpression(null);
-        return new CellRangeAddress(a.getFirstRow(), a.getLastRow(), a.getFirstColumn(), a.getLastColumn());
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
deleted file mode 100644
index cc59338..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.MergeCellsRecord;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-
-/**
- * 
- * @author Josh Micich
- */
-public final class MergedCellsTable extends RecordAggregate {
-	private static int MAX_MERGED_REGIONS = 1027; // enforced by the 8224 byte limit
-
-	private final List<CellRangeAddress> _mergedRegions;
-
-	/**
-	 * Creates an empty aggregate
-	 */
-	public MergedCellsTable() {
-		_mergedRegions = new ArrayList<CellRangeAddress>();
-	}
-
-	/**
-	 * reads zero or more consecutive {@link MergeCellsRecord}s
-	 * @param rs
-	 */
-	public void read(RecordStream rs) {
-		List<CellRangeAddress> temp = _mergedRegions;
-		while (rs.peekNextClass() == MergeCellsRecord.class) {
-			MergeCellsRecord mcr = (MergeCellsRecord) rs.getNext();
-			int nRegions = mcr.getNumAreas();
-			for (int i = 0; i < nRegions; i++) {
-				CellRangeAddress cra = mcr.getAreaAt(i);
-				temp.add(cra);
-			}
-		}
-	}
-
-	public int getRecordSize() {
-		// a bit cheaper than the default impl
-		int nRegions = _mergedRegions.size();
-		if (nRegions < 1) {
-			// no need to write a single empty MergeCellsRecord
-			return 0;
-		}
-		int nMergedCellsRecords = nRegions / MAX_MERGED_REGIONS;
-		int nLeftoverMergedRegions = nRegions % MAX_MERGED_REGIONS;
-
-		int result = nMergedCellsRecords
-				* (4 + CellRangeAddressList.getEncodedSize(MAX_MERGED_REGIONS)) + 4
-				+ CellRangeAddressList.getEncodedSize(nLeftoverMergedRegions);
-		return result;
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		int nRegions = _mergedRegions.size();
-		if (nRegions < 1) {
-			// no need to write a single empty MergeCellsRecord
-			return;
-		}
-
-		int nFullMergedCellsRecords = nRegions / MAX_MERGED_REGIONS;
-		int nLeftoverMergedRegions = nRegions % MAX_MERGED_REGIONS;
-		CellRangeAddress[] cras = new CellRangeAddress[nRegions];
-		_mergedRegions.toArray(cras);
-
-		for (int i = 0; i < nFullMergedCellsRecords; i++) {
-			int startIx = i * MAX_MERGED_REGIONS;
-			rv.visitRecord(new MergeCellsRecord(cras, startIx, MAX_MERGED_REGIONS));
-		}
-		if (nLeftoverMergedRegions > 0) {
-			int startIx = nFullMergedCellsRecords * MAX_MERGED_REGIONS;
-			rv.visitRecord(new MergeCellsRecord(cras, startIx, nLeftoverMergedRegions));
-		}
-	}
-	public void addRecords(MergeCellsRecord[] mcrs) {
-		for (int i = 0; i < mcrs.length; i++) {
-			addMergeCellsRecord(mcrs[i]);
-		}
-	}
-
-	private void addMergeCellsRecord(MergeCellsRecord mcr) {
-		int nRegions = mcr.getNumAreas();
-		for (int i = 0; i < nRegions; i++) {
-			CellRangeAddress cra = mcr.getAreaAt(i);
-			_mergedRegions.add(cra);
-		}
-	}
-
-	public CellRangeAddress get(int index) {
-		checkIndex(index);
-		return _mergedRegions.get(index);
-	}
-
-	public void remove(int index) {
-		checkIndex(index);
-		_mergedRegions.remove(index);
-	}
-
-	private void checkIndex(int index) {
-		if (index < 0 || index >= _mergedRegions.size()) {
-			throw new IllegalArgumentException("Specified CF index " + index
-					+ " is outside the allowable range (0.." + (_mergedRegions.size() - 1) + ")");
-		}
-	}
-
-	public void addArea(int rowFrom, int colFrom, int rowTo, int colTo) {
-		_mergedRegions.add(new CellRangeAddress(rowFrom, rowTo, colFrom, colTo));
-	}
-
-	public int getNumberOfMergedRegions() {
-		return _mergedRegions.size();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
deleted file mode 100644
index b42f09b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.util.HexDump;
-
-/**
- * Groups the page settings records for a worksheet.<p>
- *
- * See OOO excelfileformat.pdf sec 4.4 'Page Settings Block'
- */
-public final class PageSettingsBlock extends RecordAggregate {
-
-    /**
-     * PLS is potentially a <i>continued</i> record, but is currently uninterpreted by POI
-     */
-    private static final class PLSAggregate extends RecordAggregate {
-        private static final ContinueRecord[] EMPTY_CONTINUE_RECORD_ARRAY = { };
-        private final Record _pls;
-        /**
-         * holds any continue records found after the PLS record.<br/>
-         * This would not be required if PLS was properly interpreted.
-         * Currently, PLS is an {@link UnknownRecord} and does not automatically
-         * include any trailing {@link ContinueRecord}s.
-         */
-        private ContinueRecord[] _plsContinues;
-
-        public PLSAggregate(RecordStream rs) {
-            _pls = rs.getNext();
-            if (rs.peekNextSid()==ContinueRecord.sid) {
-                List<ContinueRecord> temp = new ArrayList<ContinueRecord>();
-                while (rs.peekNextSid()==ContinueRecord.sid) {
-                    temp.add((ContinueRecord)rs.getNext());
-                }
-                _plsContinues = new ContinueRecord[temp.size()];
-                temp.toArray(_plsContinues);
-            } else {
-                _plsContinues = EMPTY_CONTINUE_RECORD_ARRAY;
-            }
-        }
-
-        @Override
-        public void visitContainedRecords(RecordVisitor rv) {
-            rv.visitRecord(_pls);
-            for (ContinueRecord _plsContinue : _plsContinues) {
-                rv.visitRecord(_plsContinue);
-            }
-        }
-    }
-
-    // Every one of these component records is optional
-    // (The whole PageSettingsBlock may not be present)
-    private PageBreakRecord _rowBreaksRecord;
-    private PageBreakRecord _columnBreaksRecord;
-    private HeaderRecord _header;
-    private FooterRecord _footer;
-    private HCenterRecord _hCenter;
-    private VCenterRecord _vCenter;
-    private LeftMarginRecord _leftMargin;
-    private RightMarginRecord _rightMargin;
-    private TopMarginRecord _topMargin;
-    private BottomMarginRecord _bottomMargin;
-    private final List<PLSAggregate> _plsRecords;
-    private PrintSetupRecord _printSetup;
-    private Record _bitmap;
-    private HeaderFooterRecord _headerFooter;
-    /**
-     * HeaderFooterRecord records belonging to preceding CustomViewSettingsRecordAggregates.
-     * The indicator of such records is a non-zero GUID,
-     *  see {@link  org.apache.poi.hssf.record.HeaderFooterRecord#getGuid()}
-     */
-    private final List<HeaderFooterRecord> _sviewHeaderFooters = new ArrayList<HeaderFooterRecord>();
-    private Record _printSize;
-
-    public PageSettingsBlock(RecordStream rs) {
-        _plsRecords = new ArrayList<PLSAggregate>();
-        while(true) {
-            if (!readARecord(rs)) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Creates a PageSettingsBlock with default settings
-     */
-    public PageSettingsBlock() {
-        _plsRecords = new ArrayList<PLSAggregate>();
-        _rowBreaksRecord = new HorizontalPageBreakRecord();
-        _columnBreaksRecord = new VerticalPageBreakRecord();
-        _header = new HeaderRecord("");
-        _footer = new FooterRecord("");
-        _hCenter = createHCenter();
-        _vCenter = createVCenter();
-        _printSetup = createPrintSetup();
-    }
-
-    /**
-     * @param sid the record sid
-     * 
-     * @return <code>true</code> if the specified Record sid is one belonging to the
-     * 'Page Settings Block'.
-     */
-    public static boolean isComponentRecord(int sid) {
-        switch (sid) {
-            case HorizontalPageBreakRecord.sid:
-            case VerticalPageBreakRecord.sid:
-            case HeaderRecord.sid:
-            case FooterRecord.sid:
-            case HCenterRecord.sid:
-            case VCenterRecord.sid:
-            case LeftMarginRecord.sid:
-            case RightMarginRecord.sid:
-            case TopMarginRecord.sid:
-            case BottomMarginRecord.sid:
-            case UnknownRecord.PLS_004D:
-            case PrintSetupRecord.sid:
-            case UnknownRecord.BITMAP_00E9:
-            case UnknownRecord.PRINTSIZE_0033:
-            case HeaderFooterRecord.sid: // extra header/footer settings supported by Excel 2007
-                return true;
-        }
-        return false;
-    }
-
-    private boolean readARecord(RecordStream rs) {
-        switch (rs.peekNextSid()) {
-            case HorizontalPageBreakRecord.sid:
-                checkNotPresent(_rowBreaksRecord);
-                _rowBreaksRecord = (PageBreakRecord) rs.getNext();
-                break;
-            case VerticalPageBreakRecord.sid:
-                checkNotPresent(_columnBreaksRecord);
-                _columnBreaksRecord = (PageBreakRecord) rs.getNext();
-                break;
-            case HeaderRecord.sid:
-                checkNotPresent(_header);
-                _header = (HeaderRecord) rs.getNext();
-                break;
-            case FooterRecord.sid:
-                checkNotPresent(_footer);
-                _footer = (FooterRecord) rs.getNext();
-                break;
-            case HCenterRecord.sid:
-                checkNotPresent(_hCenter);
-                _hCenter = (HCenterRecord) rs.getNext();
-                break;
-            case VCenterRecord.sid:
-                checkNotPresent(_vCenter);
-                _vCenter = (VCenterRecord) rs.getNext();
-                break;
-            case LeftMarginRecord.sid:
-                checkNotPresent(_leftMargin);
-                _leftMargin = (LeftMarginRecord) rs.getNext();
-                break;
-            case RightMarginRecord.sid:
-                checkNotPresent(_rightMargin);
-                _rightMargin = (RightMarginRecord) rs.getNext();
-                break;
-            case TopMarginRecord.sid:
-                checkNotPresent(_topMargin);
-                _topMargin = (TopMarginRecord) rs.getNext();
-                break;
-            case BottomMarginRecord.sid:
-                checkNotPresent(_bottomMargin);
-                _bottomMargin = (BottomMarginRecord) rs.getNext();
-                break;
-            case UnknownRecord.PLS_004D:
-                _plsRecords.add(new PLSAggregate(rs));
-                break;
-            case PrintSetupRecord.sid:
-                checkNotPresent(_printSetup);
-                _printSetup = (PrintSetupRecord)rs.getNext();
-                break;
-            case UnknownRecord.BITMAP_00E9:
-                checkNotPresent(_bitmap);
-                _bitmap = rs.getNext();
-                break;
-            case UnknownRecord.PRINTSIZE_0033:
-                checkNotPresent(_printSize);
-                _printSize = rs.getNext();
-                break;
-            case HeaderFooterRecord.sid:
-                //there can be multiple HeaderFooterRecord records belonging to different sheet views
-                HeaderFooterRecord hf = (HeaderFooterRecord)rs.getNext();
-                if(hf.isCurrentSheet()) {
-                    _headerFooter = hf;
-                } else {
-                    _sviewHeaderFooters.add(hf);
-                }
-                break;
-            default:
-                // all other record types are not part of the PageSettingsBlock
-                return false;
-        }
-        return true;
-    }
-
-    private void checkNotPresent(Record rec) {
-        if (rec != null) {
-            throw new RecordFormatException("Duplicate PageSettingsBlock record (sid=0x"
-                    + Integer.toHexString(rec.getSid()) + ")");
-        }
-    }
-
-    private PageBreakRecord getRowBreaksRecord() {
-        if (_rowBreaksRecord == null) {
-            _rowBreaksRecord = new HorizontalPageBreakRecord();
-        }
-        return _rowBreaksRecord;
-    }
-
-    private PageBreakRecord getColumnBreaksRecord() {
-        if (_columnBreaksRecord == null) {
-            _columnBreaksRecord = new VerticalPageBreakRecord();
-        }
-        return _columnBreaksRecord;
-    }
-
-
-    /**
-     * Sets a page break at the indicated column
-     *
-     * @param column the column to add page breaks to
-     * @param fromRow the starting row
-     * @param toRow the ending row
-     */
-    public void setColumnBreak(short column, short fromRow, short toRow) {
-        getColumnBreaksRecord().addBreak(column, fromRow, toRow);
-    }
-
-    /**
-     * Removes a page break at the indicated column
-     *
-     * @param column the column to check for page breaks
-     */
-    public void removeColumnBreak(int column) {
-        getColumnBreaksRecord().removeBreak(column);
-    }
-
-
-
-
-    @Override
-    public void visitContainedRecords(RecordVisitor rv) {
-        // Replicates record order from Excel 2007, though this is not critical
-
-        visitIfPresent(_rowBreaksRecord, rv);
-        visitIfPresent(_columnBreaksRecord, rv);
-        // Write out empty header / footer records if these are missing
-        if (_header == null) {
-            rv.visitRecord(new HeaderRecord(""));
-        } else {
-            rv.visitRecord(_header);
-        }
-        if (_footer == null) {
-            rv.visitRecord(new FooterRecord(""));
-        } else {
-            rv.visitRecord(_footer);
-        }
-        visitIfPresent(_hCenter, rv);
-        visitIfPresent(_vCenter, rv);
-        visitIfPresent(_leftMargin, rv);
-        visitIfPresent(_rightMargin, rv);
-        visitIfPresent(_topMargin, rv);
-        visitIfPresent(_bottomMargin, rv);
-        for (RecordAggregate pls : _plsRecords) {
-            pls.visitContainedRecords(rv);
-        }
-        visitIfPresent(_printSetup, rv);
-        visitIfPresent(_printSize, rv);
-        visitIfPresent(_headerFooter, rv);
-        visitIfPresent(_bitmap, rv);
-    }
-    private static void visitIfPresent(Record r, RecordVisitor rv) {
-        if (r != null) {
-            rv.visitRecord(r);
-        }
-    }
-    private static void visitIfPresent(PageBreakRecord r, RecordVisitor rv) {
-        if (r != null) {
-            if (r.isEmpty()) {
-                // its OK to not serialize empty page break records
-                return;
-            }
-            rv.visitRecord(r);
-        }
-    }
-
-    /**
-     * creates the HCenter Record and sets it to false (don't horizontally center)
-     */
-    private static HCenterRecord createHCenter() {
-        HCenterRecord retval = new HCenterRecord();
-
-        retval.setHCenter(false);
-        return retval;
-    }
-
-    /**
-     * creates the VCenter Record and sets it to false (don't horizontally center)
-     */
-    private static VCenterRecord createVCenter() {
-        VCenterRecord retval = new VCenterRecord();
-
-        retval.setVCenter(false);
-        return retval;
-    }
-
-    /**
-     * creates the PrintSetup Record and sets it to defaults and marks it invalid
-     * @see org.apache.poi.hssf.record.PrintSetupRecord
-     * @see org.apache.poi.hssf.record.Record
-     * @return record containing a PrintSetupRecord
-     */
-    private static PrintSetupRecord createPrintSetup() {
-        PrintSetupRecord retval = new PrintSetupRecord();
-
-        retval.setPaperSize(( short ) 1);
-        retval.setScale(( short ) 100);
-        retval.setPageStart(( short ) 1);
-        retval.setFitWidth(( short ) 1);
-        retval.setFitHeight(( short ) 1);
-        retval.setOptions(( short ) 2);
-        retval.setHResolution(( short ) 300);
-        retval.setVResolution(( short ) 300);
-        retval.setHeaderMargin( 0.5);
-        retval.setFooterMargin( 0.5);
-        retval.setCopies(( short ) 1);
-        return retval;
-    }
-
-
-    /**
-     * Returns the HeaderRecord.
-     * @return HeaderRecord for the sheet.
-     */
-    public HeaderRecord getHeader ()
-    {
-        return _header;
-    }
-
-    /**
-     * Sets the HeaderRecord.
-     * @param newHeader The new HeaderRecord for the sheet.
-     */
-    public void setHeader (HeaderRecord newHeader)
-    {
-        _header = newHeader;
-    }
-
-    /**
-     * Returns the FooterRecord.
-     * @return FooterRecord for the sheet.
-     */
-    public FooterRecord getFooter ()
-    {
-        return _footer;
-    }
-
-    /**
-     * Sets the FooterRecord.
-     * @param newFooter The new FooterRecord for the sheet.
-     */
-    public void setFooter (FooterRecord newFooter)
-    {
-        _footer = newFooter;
-    }
-
-    /**
-     * Returns the PrintSetupRecord.
-     * @return PrintSetupRecord for the sheet.
-     */
-    public PrintSetupRecord getPrintSetup ()
-    {
-        return _printSetup;
-    }
-
-    /**
-     * Sets the PrintSetupRecord.
-     * @param newPrintSetup The new PrintSetupRecord for the sheet.
-     */
-    public void setPrintSetup (PrintSetupRecord newPrintSetup)
-    {
-        _printSetup = newPrintSetup;
-    }
-
-
-    private Margin getMarginRec(int marginIndex) {
-        switch (marginIndex) {
-            case InternalSheet.LeftMargin:   return _leftMargin;
-            case InternalSheet.RightMargin:  return _rightMargin;
-            case InternalSheet.TopMargin:    return _topMargin;
-            case InternalSheet.BottomMargin: return _bottomMargin;
-        }
-        throw new IllegalArgumentException( "Unknown margin constant:  " + marginIndex );
-    }
-
-
-    /**
-     * Gets the size of the margin in inches.
-     * @param margin which margin to get
-     * @return the size of the margin
-     */
-    public double getMargin(short margin) {
-        Margin m = getMarginRec(margin);
-        if (m != null) {
-            return m.getMargin();
-        }
-        switch (margin) {
-            case InternalSheet.LeftMargin:   return .75;
-            case InternalSheet.RightMargin:  return .75;
-            case InternalSheet.TopMargin:    return 1.0;
-            case InternalSheet.BottomMargin: return 1.0;
-        }
-        throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
-    }
-
-    /**
-     * Sets the size of the margin in inches.
-     * @param margin which margin to get
-     * @param size the size of the margin
-     */
-    public void setMargin(short margin, double size) {
-        Margin m = getMarginRec(margin);
-        if (m  == null) {
-            switch (margin) {
-                case InternalSheet.LeftMargin:
-                    _leftMargin = new LeftMarginRecord();
-                    m = _leftMargin;
-                    break;
-                case InternalSheet.RightMargin:
-                    _rightMargin = new RightMarginRecord();
-                    m = _rightMargin;
-                    break;
-                case InternalSheet.TopMargin:
-                    _topMargin = new TopMarginRecord();
-                    m = _topMargin;
-                    break;
-                case InternalSheet.BottomMargin:
-                    _bottomMargin = new BottomMarginRecord();
-                    m = _bottomMargin;
-                    break;
-                default :
-                    throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
-            }
-        }
-        m.setMargin( size );
-    }
-
-    /**
-     * Shifts all the page breaks in the range "count" number of rows/columns
-     * @param breaks The page record to be shifted
-     * @param start Starting "main" value to shift breaks
-     * @param stop Ending "main" value to shift breaks
-     * @param count number of units (rows/columns) to shift by
-     */
-    private static void shiftBreaks(PageBreakRecord breaks, int start, int stop, int count) {
-
-        Iterator<PageBreakRecord.Break> iterator = breaks.getBreaksIterator();
-        List<PageBreakRecord.Break> shiftedBreak = new ArrayList<PageBreakRecord.Break>();
-        while(iterator.hasNext())
-        {
-            PageBreakRecord.Break breakItem = iterator.next();
-            int breakLocation = breakItem.main;
-            boolean inStart = (breakLocation >= start);
-            boolean inEnd = (breakLocation <= stop);
-            if(inStart && inEnd) {
-                shiftedBreak.add(breakItem);
-            }
-        }
-
-        iterator = shiftedBreak.iterator();
-        while (iterator.hasNext()) {
-            PageBreakRecord.Break breakItem = iterator.next();
-            breaks.removeBreak(breakItem.main);
-            breaks.addBreak((short)(breakItem.main+count), breakItem.subFrom, breakItem.subTo);
-        }
-    }
-
-
-    /**
-     * Sets a page break at the indicated row
-     * @param row the row
-     * @param fromCol the starting column
-     * @param toCol the ending column
-     */
-    public void setRowBreak(int row, short fromCol, short toCol) {
-        getRowBreaksRecord().addBreak((short)row, fromCol, toCol);
-    }
-
-    /**
-     * Removes a page break at the indicated row
-     * @param row the row
-     */
-    public void removeRowBreak(int row) {
-        if (getRowBreaksRecord().getBreaks().length < 1) {
-            throw new IllegalArgumentException("Sheet does not define any row breaks");
-        }
-        getRowBreaksRecord().removeBreak((short)row);
-    }
-
-    /**
-     * Queries if the specified row has a page break
-     * 
-     * @param row the row to check for
-     * 
-     * @return true if the specified row has a page break
-     */
-    public boolean isRowBroken(int row) {
-        return getRowBreaksRecord().getBreak(row) != null;
-    }
-
-
-    /**
-     * Queries if the specified column has a page break
-     * 
-     * @param column the column to check for
-     *
-     * @return <code>true</code> if the specified column has a page break
-     */
-    public boolean isColumnBroken(int column) {
-        return getColumnBreaksRecord().getBreak(column) != null;
-    }
-
-    /**
-     * Shifts the horizontal page breaks for the indicated count
-     * @param startingRow the starting row
-     * @param endingRow the ending row
-     * @param count the number of rows to shift by
-     */
-    public void shiftRowBreaks(int startingRow, int endingRow, int count) {
-        shiftBreaks(getRowBreaksRecord(), startingRow, endingRow, count);
-    }
-
-    /**
-     * Shifts the vertical page breaks for the indicated count
-     * @param startingCol the starting column
-     * @param endingCol the ending column
-     * @param count the number of columns to shift by
-     */
-    public void shiftColumnBreaks(short startingCol, short endingCol, short count) {
-        shiftBreaks(getColumnBreaksRecord(), startingCol, endingCol, count);
-    }
-
-    /**
-     * @return all the horizontal page breaks, never <code>null</code>
-     */
-    public int[] getRowBreaks() {
-        return getRowBreaksRecord().getBreaks();
-    }
-
-    /**
-     * @return the number of row page breaks
-     */
-    public int getNumRowBreaks(){
-        return getRowBreaksRecord().getNumBreaks();
-    }
-
-    /**
-     * @return all the column page breaks, never <code>null</code>
-     */
-    public int[] getColumnBreaks(){
-        return getColumnBreaksRecord().getBreaks();
-    }
-
-    /**
-     * @return the number of column page breaks
-     */
-    public int getNumColumnBreaks(){
-        return getColumnBreaksRecord().getNumBreaks();
-    }
-
-    public VCenterRecord getVCenter() {
-        return _vCenter;
-    }
-
-    public HCenterRecord getHCenter() {
-        return _hCenter;
-    }
-
-    /**
-     * HEADERFOOTER is new in 2007.  Some apps seem to have scattered this record long after
-     * the {@link PageSettingsBlock} where it belongs.
-     * 
-     * @param rec the HeaderFooterRecord to set
-     */
-    public void addLateHeaderFooter(HeaderFooterRecord rec) {
-        if (_headerFooter != null) {
-            throw new IllegalStateException("This page settings block already has a header/footer record");
-        }
-        if (rec.getSid() != HeaderFooterRecord.sid) {
-            throw new RecordFormatException("Unexpected header-footer record sid: 0x" + Integer.toHexString(rec.getSid()));
-        }
-        _headerFooter = rec;
-    }
-
-    /**
-     * This method reads PageSettingsBlock records from the supplied RecordStream until the first
-     * non-PageSettingsBlock record is encountered.  As each record is read, it is incorporated
-     * into this PageSettingsBlock.<p>
-     * 
-     * The latest Excel version seems to write the PageSettingsBlock uninterrupted. However there
-     * are several examples (that Excel reads OK) where these records are not written together:
-     * 
-     * <ul>
-     * <li><b>HEADER_FOOTER(0x089C) after WINDOW2</b> - This record is new in 2007.  Some apps
-     * seem to have scattered this record long after the PageSettingsBlock where it belongs
-     * test samples: SharedFormulaTest.xls, ex44921-21902.xls, ex42570-20305.xls</li>
-     * <li><b>PLS, WSBOOL, PageSettingsBlock</b> - WSBOOL is not a PSB record.
-     * This happens in the test sample file "NoGutsRecords.xls" and "WORKBOOK_in_capitals.xls"</li>
-     * <li><b>Margins after DIMENSION</b> - All of PSB should be before DIMENSION. (Bug-47199)</li>
-     * </ul>
-     * 
-     * These were probably written by other applications (or earlier versions of Excel). It was
-     * decided to not write specific code for detecting each of these cases.  POI now tolerates
-     * PageSettingsBlock records scattered all over the sheet record stream, and in any order, but
-     * does not allow duplicates of any of those records.<p>
-     *
-     * <b>Note</b> - when POI writes out this PageSettingsBlock, the records will always be written
-     * in one consolidated block (in the standard ordering) regardless of how scattered the records
-     * were when they were originally read.
-     *
-     * @param rs the RecordStream to read from
-     * 
-     * @throws  RecordFormatException if any PSB record encountered has the same type (sid) as
-     * a record that is already part of this PageSettingsBlock
-     */
-    public void addLateRecords(RecordStream rs) {
-        while(true) {
-            if (!readARecord(rs)) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Some apps can define multiple HeaderFooterRecord records for a sheet.
-     * When saving such a file Excel 2007 re-positions them according to the following rules:
-     *  - take a HeaderFooterRecord and read 16-byte GUID at offset 12. If it is zero,
-     *    it means the current sheet and the given HeaderFooterRecord belongs to this PageSettingsBlock
-     *  - If GUID is not zero then search in preceding CustomViewSettingsRecordAggregates.
-     *    Compare first 16 bytes of UserSViewBegin with the HeaderFooterRecord's GUID. If match,
-     *    then append the HeaderFooterRecord to this CustomViewSettingsRecordAggregates
-     *
-     * @param sheetRecords the list of sheet records read so far
-     */
-    public void positionRecords(List<RecordBase> sheetRecords) {
-        // Take a copy to loop over, so we can update the real one
-        //  without concurrency issues
-        List<HeaderFooterRecord> hfRecordsToIterate = new ArrayList<HeaderFooterRecord>(_sviewHeaderFooters);
-
-        final Map<String, HeaderFooterRecord> hfGuidMap = new HashMap<String, HeaderFooterRecord>();
-
-        for(final HeaderFooterRecord hf : hfRecordsToIterate) {
-            hfGuidMap.put(HexDump.toHex(hf.getGuid()), hf);
-        }
-
-        // loop through HeaderFooterRecord records having not-empty GUID and match them with
-        // CustomViewSettingsRecordAggregate blocks having UserSViewBegin with the same GUID
-        for (RecordBase rb : sheetRecords) {
-            if (rb instanceof CustomViewSettingsRecordAggregate) {
-                final CustomViewSettingsRecordAggregate cv = (CustomViewSettingsRecordAggregate) rb;
-                cv.visitContainedRecords(new RecordVisitor() {
-                    @Override
-                    public void visitRecord(Record r) {
-                        if (r.getSid() == UserSViewBegin.sid) {
-                            String guid = HexDump.toHex(((UserSViewBegin) r).getGuid());
-                            HeaderFooterRecord hf = hfGuidMap.get(guid);
-
-                            if (hf != null) {
-                                cv.append(hf);
-                                _sviewHeaderFooters.remove(hf);
-                            }
-                        }
-                    }
-                });
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
deleted file mode 100644
index fd458df..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-
-/**
- * <tt>RecordAggregate</tt>s are groups of of BIFF <tt>Record</tt>s that are typically stored
- * together and/or updated together.  Workbook / Sheet records are typically stored in a sequential
- * list, which does not provide much structure to coordinate updates.
- *
- * @author Josh Micich
- */
-public abstract class RecordAggregate extends RecordBase {
-
-	/**
-	 * Visit each of the atomic BIFF records contained in this {@link RecordAggregate} in the order
-	 * that they should be written to file.  Implementors may or may not return the actual
-	 * {@link Record}s being used to manage POI's internal implementation.  Callers should not
-	 * assume either way, and therefore only attempt to modify those {@link Record}s after cloning
-	 */
-	public abstract void visitContainedRecords(RecordVisitor rv);
-
-	public final int serialize(int offset, byte[] data) {
-		SerializingRecordVisitor srv = new SerializingRecordVisitor(data, offset);
-		visitContainedRecords(srv);
-		return srv.countBytesWritten();
-	}
-	public int getRecordSize() {
-		RecordSizingVisitor rsv = new RecordSizingVisitor();
-		visitContainedRecords(rsv);
-		return rsv.getTotalSize();
-	}
-
-	public interface RecordVisitor {
-		/**
-		 * Implementors may call non-mutating methods on Record r.
-		 * @param r must not be <code>null</code>
-		 */
-		void visitRecord(Record r);
-	}
-
-	private static final class SerializingRecordVisitor implements RecordVisitor {
-
-		private final byte[] _data;
-		private final int _startOffset;
-		private int _countBytesWritten;
-
-		public SerializingRecordVisitor(byte[] data, int startOffset) {
-			_data = data;
-			_startOffset = startOffset;
-			_countBytesWritten = 0;
-		}
-		public int countBytesWritten() {
-			return _countBytesWritten;
-		}
-		public void visitRecord(Record r) {
-			int currentOffset = _startOffset + _countBytesWritten;
-			_countBytesWritten += r.serialize(currentOffset, _data);
-		}
-	}
-	private static final class RecordSizingVisitor implements RecordVisitor {
-
-		private int _totalSize;
-
-		public RecordSizingVisitor() {
-			_totalSize = 0;
-		}
-		public int getTotalSize() {
-			return _totalSize;
-		}
-		public void visitRecord(Record r) {
-			_totalSize += r.getRecordSize();
-		}
-	}
-	/**
-	 * A wrapper for {@link RecordVisitor} which accumulates the sizes of all
-	 * records visited.
-	 */
-	public static final class PositionTrackingVisitor implements RecordVisitor {
-		private final RecordVisitor _rv;
-		private int _position;
-
-		public PositionTrackingVisitor(RecordVisitor rv, int initialPosition) {
-			_rv = rv;
-			_position = initialPosition;
-		}
-		public void visitRecord(Record r) {
-			_position += r.getRecordSize();
-			_rv.visitRecord(r);
-		}
-		public void setPosition(int position) {
-			_position = position;
-		}
-		public int getPosition() {
-			return _position;
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
deleted file mode 100644
index 5551639..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaShifter;
-
-/**
- *
- * @author  andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class RowRecordsAggregate extends RecordAggregate {
-    private int _firstrow = -1;
-    private int _lastrow  = -1;
-    private final Map<Integer, RowRecord> _rowRecords;
-    private final ValueRecordsAggregate _valuesAgg;
-    private final List<Record> _unknownRecords;
-    private final SharedValueManager _sharedValueManager;
-
-    // Cache values to speed up performance of
-    // getStartRowNumberForBlock / getEndRowNumberForBlock, see Bugzilla 47405
-    private RowRecord[] _rowRecordValues = null;
-
-    /** Creates a new instance of ValueRecordsAggregate */
-    public RowRecordsAggregate() {
-        this(SharedValueManager.createEmpty());
-    }
-    private RowRecordsAggregate(SharedValueManager svm) {
-        if (svm == null) {
-            throw new IllegalArgumentException("SharedValueManager must be provided.");
-        }
-        _rowRecords = new TreeMap<Integer, RowRecord>();
-        _valuesAgg = new ValueRecordsAggregate();
-        _unknownRecords = new ArrayList<Record>();
-        _sharedValueManager = svm;
-    }
-
-    /**
-     * @param rs record stream with all {@link SharedFormulaRecord}
-     * {@link ArrayRecord}, {@link TableRecord} {@link MergeCellsRecord} Records removed
-     * @param svm an initialised {@link SharedValueManager} (from the shared formula, array
-     * and table records of the current sheet).  Never <code>null</code>.
-     */
-    public RowRecordsAggregate(RecordStream rs, SharedValueManager svm) {
-        this(svm);
-        while(rs.hasNext()) {
-            Record rec = rs.getNext();
-            switch (rec.getSid()) {
-                case RowRecord.sid:
-                    insertRow((RowRecord) rec);
-                    continue;
-                case DConRefRecord.sid:
-                    addUnknownRecord(rec);
-                    continue;
-                case DBCellRecord.sid:
-                    // end of 'Row Block'.  Should only occur after cell records
-                    // ignore DBCELL records because POI generates them upon re-serialization
-                    continue;
-            }
-            if (rec instanceof UnknownRecord) {
-                // might need to keep track of where exactly these belong
-                addUnknownRecord(rec);
-                while (rs.peekNextSid() == ContinueRecord.sid) {
-                    addUnknownRecord(rs.getNext());
-                }
-                continue;
-            }
-            if (rec instanceof MulBlankRecord) {
-                _valuesAgg.addMultipleBlanks((MulBlankRecord) rec);
-                continue;
-            }
-            if (!(rec instanceof CellValueRecordInterface)) {
-                throw new RuntimeException("Unexpected record type (" + rec.getClass().getName() + ")");
-            }
-            _valuesAgg.construct((CellValueRecordInterface)rec, rs, svm);
-        }
-    }
-    /**
-     * Handles UnknownRecords which appear within the row/cell records
-     */
-    private void addUnknownRecord(Record rec) {
-        // ony a few distinct record IDs are encountered by the existing POI test cases:
-        // 0x1065 // many
-        // 0x01C2 // several
-        // 0x0034 // few
-        // No documentation could be found for these
-
-        // keep the unknown records for re-serialization
-        _unknownRecords.add(rec);
-    }
-    public void insertRow(RowRecord row) {
-        // Integer integer = Integer.valueOf(row.getRowNumber());
-        _rowRecords.put(Integer.valueOf(row.getRowNumber()), row);
-        // Clear the cached values
-        _rowRecordValues = null; 
-        if ((row.getRowNumber() < _firstrow) || (_firstrow == -1)) {
-            _firstrow = row.getRowNumber();
-        }
-        if ((row.getRowNumber() > _lastrow) || (_lastrow == -1)) {
-            _lastrow = row.getRowNumber();
-        }
-    }
-
-    public void removeRow(RowRecord row) {
-        int rowIndex = row.getRowNumber();
-        _valuesAgg.removeAllCellsValuesForRow(rowIndex);
-        Integer key = Integer.valueOf(rowIndex);
-        RowRecord rr = _rowRecords.remove(key);
-        if (rr == null) {
-            throw new RuntimeException("Invalid row index (" + key.intValue() + ")");
-        }
-        if (row != rr) {
-            _rowRecords.put(key, rr);
-            throw new RuntimeException("Attempt to remove row that does not belong to this sheet");
-        }
-        
-        // Clear the cached values
-        _rowRecordValues = null;
-    }
-
-    public RowRecord getRow(int rowIndex) {
-        int maxrow = SpreadsheetVersion.EXCEL97.getLastRowIndex();
-        if (rowIndex < 0 || rowIndex > maxrow) {
-            throw new IllegalArgumentException("The row number must be between 0 and " + maxrow + ", but had: " + rowIndex);
-        }
-        return _rowRecords.get(Integer.valueOf(rowIndex));
-    }
-
-    public int getPhysicalNumberOfRows()
-    {
-        return _rowRecords.size();
-    }
-
-    public int getFirstRowNum()
-    {
-        return _firstrow;
-    }
-
-    public int getLastRowNum()
-    {
-        return _lastrow;
-    }
-
-    /** Returns the number of row blocks.
-     * <p/>The row blocks are goupings of rows that contain the DBCell record
-     * after them
-     */
-    public int getRowBlockCount() {
-        int size = _rowRecords.size()/DBCellRecord.BLOCK_SIZE;
-        if ((_rowRecords.size() % DBCellRecord.BLOCK_SIZE) != 0)
-            size++;
-        return size;
-    }
-
-    private int getRowBlockSize(int block) {
-        return RowRecord.ENCODED_SIZE * getRowCountForBlock(block);
-    }
-
-    /** Returns the number of physical rows within a block*/
-    public int getRowCountForBlock(int block) {
-        int startIndex = block * DBCellRecord.BLOCK_SIZE;
-        int endIndex = startIndex + DBCellRecord.BLOCK_SIZE - 1;
-        if (endIndex >= _rowRecords.size())
-            endIndex = _rowRecords.size()-1;
-
-        return endIndex-startIndex+1;
-    }
-
-    /** Returns the physical row number of the first row in a block*/
-    private int getStartRowNumberForBlock(int block) {
-        int startIndex = block * DBCellRecord.BLOCK_SIZE;
-
-        if (_rowRecordValues == null) {
-            _rowRecordValues = _rowRecords.values().toArray(new RowRecord[_rowRecords.size()]);
-        }
-
-        try {
-            return _rowRecordValues[startIndex].getRowNumber();
-        } catch(ArrayIndexOutOfBoundsException e) {
-            throw new RuntimeException("Did not find start row for block " + block);
-        }
-    }
-
-    /** Returns the physical row number of the end row in a block*/
-    private int getEndRowNumberForBlock(int block) {
-        int endIndex = ((block + 1)*DBCellRecord.BLOCK_SIZE)-1;
-        if (endIndex >= _rowRecords.size())
-            endIndex = _rowRecords.size()-1;
-
-        if (_rowRecordValues == null){
-            _rowRecordValues = _rowRecords.values().toArray(new RowRecord[_rowRecords.size()]);
-        }
-
-        try {
-            return _rowRecordValues[endIndex].getRowNumber();
-        } catch(ArrayIndexOutOfBoundsException e) {
-            throw new RuntimeException("Did not find end row for block " + block);
-      }
-    }
-
-    private int visitRowRecordsForBlock(int blockIndex, RecordVisitor rv) {
-        final int startIndex = blockIndex*DBCellRecord.BLOCK_SIZE;
-        final int endIndex = startIndex + DBCellRecord.BLOCK_SIZE;
-
-        Iterator<RowRecord> rowIterator = _rowRecords.values().iterator();
-
-        //Given that we basically iterate through the rows in order,
-        //For a performance improvement, it would be better to return an instance of
-        //an iterator and use that instance throughout, rather than recreating one and
-        //having to move it to the right position.
-        int i=0;
-        for (;i<startIndex;i++)
-          rowIterator.next();
-        int result = 0;
-        while(rowIterator.hasNext() && (i++ < endIndex)) {
-          Record rec = rowIterator.next();
-          result += rec.getRecordSize();
-          rv.visitRecord(rec);
-        }
-        return result;
-    }
-
-    @Override
-    public void visitContainedRecords(RecordVisitor rv) {
-
-        PositionTrackingVisitor stv = new PositionTrackingVisitor(rv, 0);
-        //DBCells are serialized before row records.
-        final int blockCount = getRowBlockCount();
-        for (int blockIndex = 0; blockIndex < blockCount; blockIndex++) {
-            // Serialize a block of rows.
-            // Hold onto the position of the first row in the block
-            int pos=0;
-            // Hold onto the size of this block that was serialized
-            final int rowBlockSize = visitRowRecordsForBlock(blockIndex, rv);
-            pos += rowBlockSize;
-            // Serialize a block of cells for those rows
-            final int startRowNumber = getStartRowNumberForBlock(blockIndex);
-            final int endRowNumber = getEndRowNumberForBlock(blockIndex);
-            DBCellRecord.Builder dbcrBuilder = new DBCellRecord.Builder();
-            // Note: Cell references start from the second row...
-            int cellRefOffset = (rowBlockSize - RowRecord.ENCODED_SIZE);
-            for (int row = startRowNumber; row <= endRowNumber; row++) {
-                if (_valuesAgg.rowHasCells(row)) {
-                    stv.setPosition(0);
-                    _valuesAgg.visitCellsForRow(row, stv);
-                    int rowCellSize = stv.getPosition();
-                    pos += rowCellSize;
-                    // Add the offset to the first cell for the row into the
-                    // DBCellRecord.
-                    dbcrBuilder.addCellOffset(cellRefOffset);
-                    cellRefOffset = rowCellSize;
-                }
-            }
-            // Calculate Offset from the start of a DBCellRecord to the first Row
-            rv.visitRecord(dbcrBuilder.build(pos));
-        }
-        for (Record _unknownRecord : _unknownRecords) {
-            // Potentially breaking the file here since we don't know exactly where to write these records
-            rv.visitRecord(_unknownRecord);
-        }
-    }
-
-    public Iterator<RowRecord> getIterator() {
-        return _rowRecords.values().iterator();
-    }
-
-    public int findStartOfRowOutlineGroup(int row) {
-        // Find the start of the group.
-        RowRecord rowRecord = this.getRow( row );
-        int level = rowRecord.getOutlineLevel();
-        int currentRow = row;
-        while (currentRow >= 0 && this.getRow( currentRow ) != null) {
-            rowRecord = this.getRow( currentRow );
-            if (rowRecord.getOutlineLevel() < level) {
-                return currentRow + 1;
-            }
-            currentRow--;
-        }
-
-        return currentRow + 1;
-    }
-
-    public int findEndOfRowOutlineGroup(int row) {
-        int level = getRow( row ).getOutlineLevel();
-        int currentRow;
-        for (currentRow = row; currentRow < getLastRowNum(); currentRow++) {
-            if (getRow(currentRow) == null || getRow(currentRow).getOutlineLevel() < level) {
-                break;
-            }
-        }
-
-        return currentRow-1;
-    }
-
-    /**
-     * Hide all rows at or below the current outline level
-     * @return index of the <em>next<em> row after the last row that gets hidden
-     */
-    private int writeHidden(RowRecord pRowRecord, int row) {
-        int rowIx = row;
-        RowRecord rowRecord = pRowRecord;
-        int level = rowRecord.getOutlineLevel();
-        while (rowRecord != null && getRow(rowIx).getOutlineLevel() >= level) {
-            rowRecord.setZeroHeight(true);
-            rowIx++;
-            rowRecord = getRow(rowIx);
-        }
-        return rowIx;
-    }
-
-    public void collapseRow(int rowNumber) {
-
-        // Find the start of the group.
-        int startRow = findStartOfRowOutlineGroup(rowNumber);
-        RowRecord rowRecord = getRow(startRow);
-
-        // Hide all the columns until the end of the group
-        int nextRowIx = writeHidden(rowRecord, startRow);
-
-        RowRecord row = getRow(nextRowIx);
-        if (row == null) {
-            row = createRow(nextRowIx);
-            insertRow(row);
-        }
-        // Write collapse field
-        row.setColapsed(true);
-    }
-
-    /**
-     * Create a row record.
-     *
-     * @param rowNumber row number
-     * @return RowRecord created for the passed in row number
-     * @see org.apache.poi.hssf.record.RowRecord
-     */
-    public static RowRecord createRow(int rowNumber) {
-        return new RowRecord(rowNumber);
-    }
-
-    public boolean isRowGroupCollapsed(int row) {
-        int collapseRow = findEndOfRowOutlineGroup(row) + 1;
-
-        return getRow(collapseRow) != null && getRow(collapseRow).getColapsed();
-    }
-
-    public void expandRow(int rowNumber) {
-        if (rowNumber == -1)
-            return;
-
-        // If it is already expanded do nothing.
-        if (!isRowGroupCollapsed(rowNumber)) {
-            return;
-        }
-
-        // Find the start of the group.
-        int startIdx = findStartOfRowOutlineGroup(rowNumber);
-        RowRecord row = getRow(startIdx);
-
-        // Find the end of the group.
-        int endIdx = findEndOfRowOutlineGroup(rowNumber);
-
-        // expand:
-        // collapsed bit must be unset
-        // hidden bit gets unset _if_ surrounding groups are expanded you can determine
-        //   this by looking at the hidden bit of the enclosing group.  You will have
-        //   to look at the start and the end of the current group to determine which
-        //   is the enclosing group
-        // hidden bit only is altered for this outline level.  ie.  don't un-collapse contained groups
-        if (!isRowGroupHiddenByParent(rowNumber)) {
-            for (int i = startIdx; i <= endIdx; i++) {
-                RowRecord otherRow = getRow(i);
-                if (row.getOutlineLevel() == otherRow.getOutlineLevel() || !isRowGroupCollapsed(i)) {
-                    otherRow.setZeroHeight(false);
-                }
-            }
-        }
-
-        // Write collapse field
-        getRow(endIdx + 1).setColapsed(false);
-    }
-
-    public boolean isRowGroupHiddenByParent(int row) {
-        // Look out outline details of end
-        int endLevel;
-        boolean endHidden;
-        int endOfOutlineGroupIdx = findEndOfRowOutlineGroup(row);
-        if (getRow(endOfOutlineGroupIdx + 1) == null) {
-            endLevel = 0;
-            endHidden = false;
-        } else {
-            endLevel = getRow(endOfOutlineGroupIdx + 1).getOutlineLevel();
-            endHidden = getRow(endOfOutlineGroupIdx + 1).getZeroHeight();
-        }
-
-        // Look out outline details of start
-        int startLevel;
-        boolean startHidden;
-        int startOfOutlineGroupIdx = findStartOfRowOutlineGroup( row );
-        if (startOfOutlineGroupIdx - 1 < 0 || getRow(startOfOutlineGroupIdx - 1) == null) {
-            startLevel = 0;
-            startHidden = false;
-        } else {
-            startLevel = getRow(startOfOutlineGroupIdx - 1).getOutlineLevel();
-            startHidden = getRow(startOfOutlineGroupIdx - 1).getZeroHeight();
-        }
-
-        if (endLevel > startLevel) {
-            return endHidden;
-        }
-
-        return startHidden;
-    }
-    
-    /**
-     * Returns an iterator for the cell values
-     */
-    public Iterator<CellValueRecordInterface> getCellValueIterator() {
-        return _valuesAgg.iterator();
-    }
-
-    public IndexRecord createIndexRecord(int indexRecordOffset, int sizeOfInitialSheetRecords) {
-        IndexRecord result = new IndexRecord();
-        result.setFirstRow(_firstrow);
-        result.setLastRowAdd1(_lastrow + 1);
-        // Calculate the size of the records from the end of the BOF
-        // and up to the RowRecordsAggregate...
-
-        // Add the references to the DBCells in the IndexRecord (one for each block)
-        // Note: The offsets are relative to the Workbook BOF. Assume that this is
-        // 0 for now.....
-
-        int blockCount = getRowBlockCount();
-        // Calculate the size of this IndexRecord
-        int indexRecSize = IndexRecord.getRecordSizeForBlockCount(blockCount);
-
-        int currentOffset = indexRecordOffset + indexRecSize + sizeOfInitialSheetRecords;
-
-        for (int block = 0; block < blockCount; block++) {
-            // each row-block has a DBCELL record.
-            // The offset of each DBCELL record needs to be updated in the INDEX record
-
-            // account for row records in this row-block
-            currentOffset += getRowBlockSize(block);
-            // account for cell value records after those
-            currentOffset += _valuesAgg.getRowCellBlockSize(
-                    getStartRowNumberForBlock(block), getEndRowNumberForBlock(block));
-
-            // currentOffset is now the location of the DBCELL record for this row-block
-            result.addDbcell(currentOffset);
-            // Add space required to write the DBCELL record (whose reference was just added).
-            currentOffset += (8 + (getRowCountForBlock(block) * 2));
-        }
-        return result;
-    }
-    public void insertCell(CellValueRecordInterface cvRec) {
-        _valuesAgg.insertCell(cvRec);
-    }
-    public void removeCell(CellValueRecordInterface cvRec) {
-        if (cvRec instanceof FormulaRecordAggregate) {
-            ((FormulaRecordAggregate)cvRec).notifyFormulaChanging();
-        }
-        _valuesAgg.removeCell(cvRec);
-    }
-    public FormulaRecordAggregate createFormula(int row, int col) {
-        FormulaRecord fr = new FormulaRecord();
-        fr.setRow(row);
-        fr.setColumn((short) col);
-        return new FormulaRecordAggregate(fr, null, _sharedValueManager);
-    }
-    public void updateFormulasAfterRowShift(FormulaShifter formulaShifter, int currentExternSheetIndex) {
-        _valuesAgg.updateFormulasAfterRowShift(formulaShifter, currentExternSheetIndex);
-    }
-    public DimensionsRecord createDimensions() {
-        DimensionsRecord result = new DimensionsRecord();
-        result.setFirstRow(_firstrow);
-        result.setLastRow(_lastrow);
-        result.setFirstCol((short) _valuesAgg.getFirstCellNum());
-        result.setLastCol((short) _valuesAgg.getLastCellNum());
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
deleted file mode 100644
index f2ccc71..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hssf.record.ArrayRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.SharedValueRecordBase;
-import org.apache.poi.hssf.record.TableRecord;
-import org.apache.poi.ss.formula.ptg.ExpPtg;
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Manages various auxiliary records while constructing a
- * {@link RowRecordsAggregate}:
- * <ul>
- * <li>{@link SharedFormulaRecord}s</li>
- * <li>{@link ArrayRecord}s</li>
- * <li>{@link TableRecord}s</li>
- * </ul>
- *
- * @author Josh Micich
- * @author Vladimirs Abramovs(Vladimirs.Abramovs at exigenservices.com) - handling of ArrayRecords
- */
-public final class SharedValueManager {
-
-	private static final class SharedFormulaGroup {
-		private final SharedFormulaRecord _sfr;
-		private final FormulaRecordAggregate[] _frAggs;
-		private int _numberOfFormulas;
-		/**
-		 * Coordinates of the first cell having a formula that uses this shared formula.
-		 * This is often <i>but not always</i> the top left cell in the range covered by
-		 * {@link #_sfr}
-		 */
-		private final CellReference _firstCell;
-
-		public SharedFormulaGroup(SharedFormulaRecord sfr, CellReference firstCell) {
-			if (!sfr.isInRange(firstCell.getRow(), firstCell.getCol())) {
-				throw new IllegalArgumentException("First formula cell " + firstCell.formatAsString()
-						+ " is not shared formula range " + sfr.getRange().toString() + ".");
-			}
-			_sfr = sfr;
-			_firstCell = firstCell;
-			int width = sfr.getLastColumn() - sfr.getFirstColumn() + 1;
-			int height = sfr.getLastRow() - sfr.getFirstRow() + 1;
-			_frAggs = new FormulaRecordAggregate[width * height];
-			_numberOfFormulas = 0;
-		}
-
-		public void add(FormulaRecordAggregate agg) {
-			if (_numberOfFormulas == 0) {
-				if (_firstCell.getRow() != agg.getRow() || _firstCell.getCol() != agg.getColumn()) {
-					throw new IllegalStateException("shared formula coding error: "+_firstCell.getCol()+'/'+_firstCell.getRow()+" != "+agg.getColumn()+'/'+agg.getRow());
-				}
-			}
-			if (_numberOfFormulas >= _frAggs.length) {
-				throw new RuntimeException("Too many formula records for shared formula group");
-			}
-			_frAggs[_numberOfFormulas++] = agg;
-		}
-
-		public void unlinkSharedFormulas() {
-			for (int i = 0; i < _numberOfFormulas; i++) {
-				_frAggs[i].unlinkSharedFormula();
-			}
-		}
-
-		public SharedFormulaRecord getSFR() {
-			return _sfr;
-		}
-
-		public final String toString() {
-			StringBuffer sb = new StringBuffer(64);
-			sb.append(getClass().getName()).append(" [");
-			sb.append(_sfr.getRange().toString());
-			sb.append("]");
-			return sb.toString();
-		}
-	}
-
-	/**
-	 * @return a new empty {@link SharedValueManager}.
-	 */
-	public static SharedValueManager createEmpty() {
-		// Note - must create distinct instances because they are assumed to be mutable.
-		return new SharedValueManager(
-			new SharedFormulaRecord[0], new CellReference[0], new ArrayRecord[0], new TableRecord[0]);
-	}
-	private final List<ArrayRecord> _arrayRecords;
-	private final TableRecord[] _tableRecords;
-	private final Map<SharedFormulaRecord, SharedFormulaGroup> _groupsBySharedFormulaRecord;
-	/** cached for optimization purposes */
-    private Map<Integer,SharedFormulaGroup> _groupsCache;
-
-	private SharedValueManager(SharedFormulaRecord[] sharedFormulaRecords,
-			CellReference[] firstCells, ArrayRecord[] arrayRecords, TableRecord[] tableRecords) {
-		int nShF = sharedFormulaRecords.length;
-		if (nShF != firstCells.length) {
-			throw new IllegalArgumentException("array sizes don't match: " + nShF + "!=" + firstCells.length + ".");
-		}
-		_arrayRecords = toList(arrayRecords);
-		_tableRecords = tableRecords;
-		Map<SharedFormulaRecord, SharedFormulaGroup> m = new HashMap<SharedFormulaRecord, SharedFormulaGroup>(nShF * 3 / 2);
-		for (int i = 0; i < nShF; i++) {
-			SharedFormulaRecord sfr = sharedFormulaRecords[i];
-			m.put(sfr, new SharedFormulaGroup(sfr, firstCells[i]));
-		}
-		_groupsBySharedFormulaRecord = m;
-	}
-
-	/**
-	 * @return a modifiable list, independent of the supplied array
-	 */
-	private static <Z> List<Z> toList(Z[] zz) {
-		List<Z> result = new ArrayList<Z>(zz.length);
-		for (int i = 0; i < zz.length; i++) {
-			result.add(zz[i]);
-		}
-		return result;
-	}
-
-	/**
-	 */
-	public static SharedValueManager create(SharedFormulaRecord[] sharedFormulaRecords,
-			CellReference[] firstCells, ArrayRecord[] arrayRecords, TableRecord[] tableRecords) {
-		if (sharedFormulaRecords.length + firstCells.length + arrayRecords.length + tableRecords.length < 1) {
-			return createEmpty();
-		}
-		return new SharedValueManager(sharedFormulaRecords, firstCells, arrayRecords, tableRecords);
-	}
-
-
-	/**
-	 * @param firstCell as extracted from the {@link ExpPtg} from the cell's formula.
-	 * @return never <code>null</code>
-	 */
-	public SharedFormulaRecord linkSharedFormulaRecord(CellReference firstCell, FormulaRecordAggregate agg) {
-		SharedFormulaGroup result = findFormulaGroupForCell(firstCell);
-        if(null == result) {
-            throw new RuntimeException("Failed to find a matching shared formula record");
-        }
-		result.add(agg);
-		return result.getSFR();
-	}
-
-    private SharedFormulaGroup findFormulaGroupForCell(final CellReference cellRef) {
-        if(null == _groupsCache) {
-            _groupsCache = new HashMap<Integer,SharedFormulaGroup>(_groupsBySharedFormulaRecord.size());
-            for(SharedFormulaGroup group: _groupsBySharedFormulaRecord.values()) {
-                _groupsCache.put(getKeyForCache(group._firstCell),group);
-            }
-        }
-        SharedFormulaGroup sfg = _groupsCache.get(getKeyForCache(cellRef));
-        return sfg;
-    }
-
-    private Integer getKeyForCache(final CellReference cellRef) {
-        // The HSSF has a max of 2^16 rows and 2^8 cols
-        return ((cellRef.getCol()+1)<<16 | cellRef.getRow());
-    }
-
-	/**
-	 * Gets the {@link SharedValueRecordBase} record if it should be encoded immediately after the
-	 * formula record contained in the specified {@link FormulaRecordAggregate} agg.  Note - the
-	 * shared value record always appears after the first formula record in the group.  For arrays
-	 * and tables the first formula is always the in the top left cell.  However, since shared
-	 * formula groups can be sparse and/or overlap, the first formula may not actually be in the
-	 * top left cell.
-	 *
-	 * @return the SHRFMLA, TABLE or ARRAY record for the formula cell, if it is the first cell of
-	 * a table or array region. <code>null</code> if the formula cell is not shared/array/table,
-	 * or if the specified formula is not the the first in the group.
-	 */
-	public SharedValueRecordBase getRecordForFirstCell(FormulaRecordAggregate agg) {
-		CellReference firstCell = agg.getFormulaRecord().getFormula().getExpReference();
-		// perhaps this could be optimised by consulting the (somewhat unreliable) isShared flag
-		// and/or distinguishing between tExp and tTbl.
-		if (firstCell == null) {
-			// not a shared/array/table formula
-			return null;
-		}
-
-
-		int row = firstCell.getRow();
-		int column = firstCell.getCol();
-		if (agg.getRow() != row || agg.getColumn() != column) {
-			// not the first formula cell in the group
-			return null;
-		}
-
-        if(!_groupsBySharedFormulaRecord.isEmpty()) {
-            SharedFormulaGroup sfg = findFormulaGroupForCell(firstCell);
-            if(null != sfg) {
-                return sfg.getSFR();
-            }
-        }
-
-		// Since arrays and tables cannot be sparse (all cells in range participate)
-		// The first cell will be the top left in the range.  So we can match the
-		// ARRAY/TABLE record directly.
-
-		for (TableRecord tr : _tableRecords) {
-			if (tr.isFirstCell(row, column)) {
-				return tr;
-			}
-		}
-		for (ArrayRecord ar : _arrayRecords) {
-			if (ar.isFirstCell(row, column)) {
-				return ar;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Converts all {@link FormulaRecord}s handled by <tt>sharedFormulaRecord</tt>
-	 * to plain unshared formulas
-	 */
-	public void unlink(SharedFormulaRecord sharedFormulaRecord) {
-		SharedFormulaGroup svg = _groupsBySharedFormulaRecord.remove(sharedFormulaRecord);
-		if (svg == null) {
-			throw new IllegalStateException("Failed to find formulas for shared formula");
-		}
-		_groupsCache = null; // be sure to reset cached value
-		svg.unlinkSharedFormulas();
-	}
-
-	/**
-	 * Add specified Array Record.
-	 */
-	public void addArrayRecord(ArrayRecord ar) {
-		// could do a check here to make sure none of the ranges overlap
-		_arrayRecords.add(ar);
-	}
-
-	/**
-	 * Removes the {@link ArrayRecord} for the cell group containing the specified cell.
-	 * The caller should clear (set blank) all cells in the returned range.
-	 * @return the range of the array formula which was just removed. Never <code>null</code>.
-	 */
-	public CellRangeAddress8Bit removeArrayFormula(int rowIndex, int columnIndex) {
-		for (ArrayRecord ar : _arrayRecords) {
-			if (ar.isInRange(rowIndex, columnIndex)) {
-				_arrayRecords.remove(ar);
-				return ar.getRange();
-			}
-		}
-		String ref = new CellReference(rowIndex, columnIndex, false, false).formatAsString();
-		throw new IllegalArgumentException("Specified cell " + ref
-				+ " is not part of an array formula.");
-	}
-
-	/**
-	 * @return the shared ArrayRecord identified by (firstRow, firstColumn). never <code>null</code>.
-	 */
-	public ArrayRecord getArrayRecord(int firstRow, int firstColumn) {
-		for(ArrayRecord ar : _arrayRecords) {
-			if(ar.isFirstCell(firstRow, firstColumn)) {
-				return ar;
-			}
-		}
-		return null;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
deleted file mode 100644
index 106da8b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.Iterator;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.MulBlankRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.ptg.Ptg;
-
-/**
- *
- * Aggregate value records together.  Things are easier to handle that way.
- *
- * @author  andy
- * @author  Glen Stampoultzis (glens at apache.org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class ValueRecordsAggregate implements Iterable<CellValueRecordInterface> {
-	private static final int MAX_ROW_INDEX = 0XFFFF;
-	private static final int INDEX_NOT_SET = -1;
-	private int firstcell = INDEX_NOT_SET;
-	private int lastcell  = INDEX_NOT_SET;
-	private CellValueRecordInterface[][] records;
-
-	/** Creates a new instance of ValueRecordsAggregate */
-
-	public ValueRecordsAggregate() {
-		this(INDEX_NOT_SET, INDEX_NOT_SET, new CellValueRecordInterface[30][]); // We start with 30 Rows.
-	}
-	private ValueRecordsAggregate(int firstCellIx, int lastCellIx, CellValueRecordInterface[][] pRecords) {
-		firstcell = firstCellIx;
-		lastcell = lastCellIx;
-		records = pRecords;
-	}
-
-	public void insertCell(CellValueRecordInterface cell) {
-		short column = cell.getColumn();
-		int row = cell.getRow();
-		if (row >= records.length) {
-			CellValueRecordInterface[][] oldRecords = records;
-			int newSize = oldRecords.length * 2;
-			if (newSize < row + 1)
-				newSize = row + 1;
-			records = new CellValueRecordInterface[newSize][];
-			System.arraycopy(oldRecords, 0, records, 0, oldRecords.length);
-		}
-		CellValueRecordInterface[] rowCells = records[row];
-		if (rowCells == null) {
-			int newSize = column + 1;
-			if (newSize < 10)
-				newSize = 10;
-			rowCells = new CellValueRecordInterface[newSize];
-			records[row] = rowCells;
-		}
-		if (column >= rowCells.length) {
-			CellValueRecordInterface[] oldRowCells = rowCells;
-			int newSize = oldRowCells.length * 2;
-			if (newSize < column + 1)
-				newSize = column + 1;
-			// if(newSize>257) newSize=257; // activate?
-			rowCells = new CellValueRecordInterface[newSize];
-			System.arraycopy(oldRowCells, 0, rowCells, 0, oldRowCells.length);
-			records[row] = rowCells;
-		}
-		rowCells[column] = cell;
-
-		if (column < firstcell || firstcell == INDEX_NOT_SET) {
-			firstcell = column;
-		}
-		if (column > lastcell || lastcell == INDEX_NOT_SET) {
-			lastcell = column;
-		}
-	}
-
-	public void removeCell(CellValueRecordInterface cell) {
-		if (cell == null) {
-			throw new IllegalArgumentException("cell must not be null");
-		}
-		int row = cell.getRow();
-		if (row >= records.length) {
-			throw new RuntimeException("cell row is out of range");
-		}
-		CellValueRecordInterface[] rowCells = records[row];
-		if (rowCells == null) {
-			throw new RuntimeException("cell row is already empty");
-		}
-		short column = cell.getColumn();
-		if (column >= rowCells.length) {
-			throw new RuntimeException("cell column is out of range");
-		}
-		rowCells[column] = null;
-	}
-
-	public void removeAllCellsValuesForRow(int rowIndex) {
-		if (rowIndex < 0 || rowIndex > MAX_ROW_INDEX) {
-			throw new IllegalArgumentException("Specified rowIndex " + rowIndex
-					+ " is outside the allowable range (0.." +MAX_ROW_INDEX + ")");
-		}
-		if (rowIndex >= records.length) {
-			// this can happen when the client code has created a row,
-			// and then removes/replaces it before adding any cells. (see bug 46312)
-			return;
-		}
-
-		records[rowIndex] = null;
-	}
-
-
-	public int getPhysicalNumberOfCells() {
-		int count = 0;
-		for (int r = 0; r < records.length; r++) {
-			CellValueRecordInterface[] rowCells = records[r];
-			if (rowCells != null) {
-				for (int c = 0; c < rowCells.length; c++) {
-					if (rowCells[c] != null)
-						count++;
-				}
-			}
-		}
-		return count;
-	}
-
-	public int getFirstCellNum() {
-		return firstcell;
-	}
-
-	public int getLastCellNum() {
-		return lastcell;
-	}
-
-	public void addMultipleBlanks(MulBlankRecord mbr) {
-		for (int j = 0; j < mbr.getNumColumns(); j++) {
-			BlankRecord br = new BlankRecord();
-
-			br.setColumn(( short ) (j + mbr.getFirstColumn()));
-			br.setRow(mbr.getRow());
-			br.setXFIndex(mbr.getXFAt(j));
-			insertCell(br);
-		}
-	}
-
-	/**
-	 * Processes a single cell value record
-	 * @param sfh used to resolve any shared-formulas/arrays/tables for the current sheet
-	 */
-	public void construct(CellValueRecordInterface rec, RecordStream rs, SharedValueManager sfh) {
-		if (rec instanceof FormulaRecord) {
-			FormulaRecord formulaRec = (FormulaRecord)rec;
-			// read optional cached text value
-			StringRecord cachedText;
-			Class<? extends Record> nextClass = rs.peekNextClass();
-			if (nextClass == StringRecord.class) {
-				cachedText = (StringRecord) rs.getNext();
-			} else {
-				cachedText = null;
-			}
-			insertCell(new FormulaRecordAggregate(formulaRec, cachedText, sfh));
-		} else {
-			insertCell(rec);
-		}
-	}
-
-	/** Tallies a count of the size of the cell records
-	 *  that are attached to the rows in the range specified.
-	 */
-	public int getRowCellBlockSize(int startRow, int endRow) {
-		int result = 0;
-		for(int rowIx=startRow; rowIx<=endRow && rowIx<records.length; rowIx++) {
-			result += getRowSerializedSize(records[rowIx]);
-		}
-		return result;
-	}
-
-	/** Returns true if the row has cells attached to it */
-	public boolean rowHasCells(int row) {
-		if (row >= records.length) {
-			return false;
-		}
-		CellValueRecordInterface[] rowCells=records[row];
-		if(rowCells==null) return false;
-		for(int col=0;col<rowCells.length;col++) {
-			if(rowCells[col]!=null) return true;
-		}
-		return false;
-	}
-
-	private static int getRowSerializedSize(CellValueRecordInterface[] rowCells) {
-		if(rowCells == null) {
-			return 0;
-		}
-		int result = 0;
-		for (int i = 0; i < rowCells.length; i++) {
-			RecordBase cvr = (RecordBase) rowCells[i];
-			if(cvr == null) {
-				continue;
-			}
-			int nBlank = countBlanks(rowCells, i);
-			if (nBlank > 1) {
-				result += (10 + 2*nBlank);
-				i+=nBlank-1;
-			} else {
-				result += cvr.getRecordSize();
-			}
-		}
-		return result;
-	}
-
-	public void visitCellsForRow(int rowIndex, RecordVisitor rv) {
-
-		CellValueRecordInterface[] rowCells = records[rowIndex];
-		if(rowCells == null) {
-			throw new IllegalArgumentException("Row [" + rowIndex + "] is empty");
-		}
-
-
-		for (int i = 0; i < rowCells.length; i++) {
-			RecordBase cvr = (RecordBase) rowCells[i];
-			if(cvr == null) {
-				continue;
-			}
-			int nBlank = countBlanks(rowCells, i);
-			if (nBlank > 1) {
-				rv.visitRecord(createMBR(rowCells, i, nBlank));
-				i+=nBlank-1;
-			} else if (cvr instanceof RecordAggregate) {
-				RecordAggregate agg = (RecordAggregate) cvr;
-				agg.visitContainedRecords(rv);
-			} else {
-				rv.visitRecord((Record) cvr);
-			}
-		}
-	}
-
-	/**
-	 * @return the number of <em>consecutive</em> {@link BlankRecord}s in the specified row
-	 * starting from startIx.
-	 */
-	private static int countBlanks(CellValueRecordInterface[] rowCellValues, int startIx) {
-		int i = startIx;
-		while(i < rowCellValues.length) {
-			CellValueRecordInterface cvr = rowCellValues[i];
-			if (!(cvr instanceof BlankRecord)) {
-				break;
-			}
-			i++;
-		}
-		return i - startIx;
-	}
-
-	private MulBlankRecord createMBR(CellValueRecordInterface[] cellValues, int startIx, int nBlank) {
-
-		short[] xfs = new short[nBlank];
-		for (int i = 0; i < xfs.length; i++) {
-			xfs[i] = ((BlankRecord)cellValues[startIx + i]).getXFIndex();
-		}
-		int rowIx = cellValues[startIx].getRow();
-		return new MulBlankRecord(rowIx, startIx, xfs);
-	}
-
-	public void updateFormulasAfterRowShift(FormulaShifter shifter, int currentExternSheetIndex) {
-		for (int i = 0; i < records.length; i++) {
-			CellValueRecordInterface[] rowCells = records[i];
-			if (rowCells == null) {
-				continue;
-			}
-			for (int j = 0; j < rowCells.length; j++) {
-				CellValueRecordInterface cell = rowCells[j];
-				if (cell instanceof FormulaRecordAggregate) {
-                    FormulaRecordAggregate fra = (FormulaRecordAggregate)cell;
-                    Ptg[] ptgs = fra.getFormulaTokens(); // needs clone() inside this getter?
-                    Ptg[] ptgs2 = ((FormulaRecordAggregate)cell).getFormulaRecord().getParsedExpression(); // needs clone() inside this getter?
-
-                    if (shifter.adjustFormula(ptgs, currentExternSheetIndex)) {
-                        fra.setParsedExpression(ptgs);
-                    }
-                }
-			}
-		}
-	}
-
-	/**
-	 * iterator for CellValueRecordInterface
-	 */
-	class ValueIterator implements Iterator<CellValueRecordInterface> {
-
-		int curRowIndex = 0, curColIndex = -1;
-		int nextRowIndex = 0, nextColIndex = -1;
-
-		public ValueIterator() {
-			getNextPos();
-		}
-
-		void getNextPos() {
-			if (nextRowIndex >= records.length)
-				return; // no next already
-
-			while (nextRowIndex < records.length) {
-				++nextColIndex;
-				if (records[nextRowIndex] == null || nextColIndex >= records[nextRowIndex].length) {
-					++nextRowIndex;
-					nextColIndex = -1;
-					continue;
-				}
-
-				if (records[nextRowIndex][nextColIndex] != null)
-					return; // next cell found
-			}
-			// no next found
-		}
-
-		public boolean hasNext() {
-			return nextRowIndex < records.length;
-		}
-
-		public CellValueRecordInterface next() {
-			if (!hasNext())
-				throw new IndexOutOfBoundsException("iterator has no next");
-
-			curRowIndex = nextRowIndex;
-			curColIndex = nextColIndex;
-			final CellValueRecordInterface ret = records[curRowIndex][curColIndex];
-			getNextPos();
-			return ret;
-		}
-
-		public void remove() {
-			records[curRowIndex][curColIndex] = null;
-		}
-	}
-
-	/** value iterator */
-	public Iterator<CellValueRecordInterface> iterator() {
-		return new ValueIterator();
-	}
-
-	public Object clone() {
-		throw new RuntimeException("clone() should not be called.  ValueRecordsAggregate should be copied via Sheet.cloneSheet()");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java b/trunk/src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
deleted file mode 100644
index 275fbf1..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.ObjectProtectRecord;
-import org.apache.poi.hssf.record.PasswordRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.ScenarioProtectRecord;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-
-/**
- * Groups the sheet protection records for a worksheet.
- * <p/>
- *
- * See OOO excelfileformat.pdf sec 4.18.2 'Sheet Protection in a Workbook
- * (BIFF5-BIFF8)'
- *
- * @author Josh Micich
- */
-public final class WorksheetProtectionBlock extends RecordAggregate {
-	// Every one of these component records is optional
-	// (The whole WorksheetProtectionBlock may not be present)
-	private ProtectRecord _protectRecord;
-	private ObjectProtectRecord _objectProtectRecord;
-	private ScenarioProtectRecord _scenarioProtectRecord;
-	private PasswordRecord _passwordRecord;
-
-	/**
-	 * Creates an empty WorksheetProtectionBlock
-	 */
-	public WorksheetProtectionBlock() {
-		// all fields empty
-	}
-
-	/**
-	 * @return <code>true</code> if the specified Record sid is one belonging to
-	 *         the 'Page Settings Block'.
-	 */
-	public static boolean isComponentRecord(int sid) {
-		switch (sid) {
-			case ProtectRecord.sid:
-			case ObjectProtectRecord.sid:
-			case ScenarioProtectRecord.sid:
-			case PasswordRecord.sid:
-				return true;
-		}
-		return false;
-	}
-
-	private boolean readARecord(RecordStream rs) {
-		switch (rs.peekNextSid()) {
-			case ProtectRecord.sid:
-				checkNotPresent(_protectRecord);
-				_protectRecord = (ProtectRecord) rs.getNext();
-				break;
-			case ObjectProtectRecord.sid:
-				checkNotPresent(_objectProtectRecord);
-				_objectProtectRecord = (ObjectProtectRecord) rs.getNext();
-				break;
-			case ScenarioProtectRecord.sid:
-				checkNotPresent(_scenarioProtectRecord);
-				_scenarioProtectRecord = (ScenarioProtectRecord) rs.getNext();
-				break;
-			case PasswordRecord.sid:
-				checkNotPresent(_passwordRecord);
-				_passwordRecord = (PasswordRecord) rs.getNext();
-				break;
-			default:
-				// all other record types are not part of the PageSettingsBlock
-				return false;
-		}
-		return true;
-	}
-
-	private void checkNotPresent(Record rec) {
-		if (rec != null) {
-			throw new RecordFormatException("Duplicate PageSettingsBlock record (sid=0x"
-					+ Integer.toHexString(rec.getSid()) + ")");
-		}
-	}
-
-	public void visitContainedRecords(RecordVisitor rv) {
-		// Replicates record order from Excel 2007, though this is not critical
-
-		visitIfPresent(_protectRecord, rv);
-		visitIfPresent(_objectProtectRecord, rv);
-		visitIfPresent(_scenarioProtectRecord, rv);
-		visitIfPresent(_passwordRecord, rv);
-	}
-
-	private static void visitIfPresent(Record r, RecordVisitor rv) {
-		if (r != null) {
-			rv.visitRecord(r);
-		}
-	}
-
-	public PasswordRecord getPasswordRecord() {
-		return _passwordRecord;
-	}
-
-	public ScenarioProtectRecord getHCenter() {
-		return _scenarioProtectRecord;
-	}
-
-	/**
-	 * This method reads {@link WorksheetProtectionBlock} records from the supplied RecordStream
-	 * until the first non-WorksheetProtectionBlock record is encountered. As each record is read,
-	 * it is incorporated into this WorksheetProtectionBlock.
-	 * <p/>
-	 * As per the OOO documentation, the protection block records can be expected to be written
-	 * together (with no intervening records), but earlier versions of POI (prior to Jun 2009)
-	 * didn't do this.  Workbooks with sheet protection created by those earlier POI versions
-	 * seemed to be valid (Excel opens them OK). So PO allows continues to support reading of files
-	 * with non continuous worksheet protection blocks.
-	 *
-	 * <p/>
-	 * <b>Note</b> - when POI writes out this WorksheetProtectionBlock, the records will always be
-	 * written in one consolidated block (in the standard ordering) regardless of how scattered the
-	 * records were when they were originally read.
-	 */
-	public void addRecords(RecordStream rs) {
-		while (true) {
-			if (!readARecord(rs)) {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * @return the ProtectRecord. If one is not contained in the sheet, then one
-	 *         is created.
-	 */
-	private ProtectRecord getProtect() {
-		if (_protectRecord == null) {
-			_protectRecord = new ProtectRecord(false);
-		}
-		return _protectRecord;
-	}
-
-	/**
-	 * @return the PasswordRecord. If one is not contained in the sheet, then
-	 *         one is created.
-	 */
-	private PasswordRecord getPassword() {
-		if (_passwordRecord == null) {
-			_passwordRecord = createPassword();
-		}
-		return _passwordRecord;
-	}
-
-	/**
-	 * protect a spreadsheet with a password (not encrypted, just sets protect
-	 * flags and the password.
-	 *
-	 * @param password to set. Pass <code>null</code> to remove all protection
-	 * @param shouldProtectObjects are protected
-	 * @param shouldProtectScenarios are protected
-	 */
-	public void protectSheet(String password, boolean shouldProtectObjects,
-			boolean shouldProtectScenarios) {
-		if (password == null) {
-			_passwordRecord = null;
-			_protectRecord = null;
-			_objectProtectRecord = null;
-			_scenarioProtectRecord = null;
-			return;
-		}
-
-		ProtectRecord prec = getProtect();
-		PasswordRecord pass = getPassword();
-		prec.setProtect(true);
-		pass.setPassword((short)CryptoFunctions.createXorVerifier1(password));
-		if (_objectProtectRecord == null && shouldProtectObjects) {
-			ObjectProtectRecord rec = createObjectProtect();
-			rec.setProtect(true);
-			_objectProtectRecord = rec;
-		}
-		if (_scenarioProtectRecord == null && shouldProtectScenarios) {
-			ScenarioProtectRecord srec = createScenarioProtect();
-			srec.setProtect(true);
-			_scenarioProtectRecord = srec;
-		}
-	}
-
-	public boolean isSheetProtected() {
-		return _protectRecord != null && _protectRecord.getProtect();
-	}
-
-	public boolean isObjectProtected() {
-		return _objectProtectRecord != null && _objectProtectRecord.getProtect();
-	}
-
-	public boolean isScenarioProtected() {
-		return _scenarioProtectRecord != null && _scenarioProtectRecord.getProtect();
-	}
-
-	/**
-	 * creates an ObjectProtect record with protect set to false.
-	 */
-	private static ObjectProtectRecord createObjectProtect() {
-		ObjectProtectRecord retval = new ObjectProtectRecord();
-		retval.setProtect(false);
-		return retval;
-	}
-
-	/**
-	 * creates a ScenarioProtect record with protect set to false.
-	 */
-	private static ScenarioProtectRecord createScenarioProtect() {
-		ScenarioProtectRecord retval = new ScenarioProtectRecord();
-		retval.setProtect(false);
-		return retval;
-	}
-
-	/**
-	 * creates a Password record with password set to 0x0000.
-	 */
-	private static PasswordRecord createPassword() {
-		return new PasswordRecord(0x0000);
-	}
-
-	public int getPasswordHash() {
-		if (_passwordRecord == null) {
-			return 0;
-		}
-		return _passwordRecord.getPassword();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/aggregates/package.html b/trunk/src/java/org/apache/poi/hssf/record/aggregates/package.html
deleted file mode 100644
index ccf7a60..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/aggregates/package.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-record aggregates are not real "records" but collections of records that act as a single record.
-This is an optimization basically.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.hssf.record
-@see org.apache.poi.hssf.eventmodel
-@see org.apache.poi.hssf.record.RecordFactory
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java b/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
deleted file mode 100644
index 41f4653..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Border Formatting Block of the Conditional Formatting Rule Record.
- */
-public final class BorderFormatting implements Cloneable {
-    /** No border */
-    public final static short    BORDER_NONE                = 0x0;
-    /** Thin border */
-    public final static short    BORDER_THIN                = 0x1;
-    /** Medium border */
-    public final static short    BORDER_MEDIUM              = 0x2;
-    /** dash border */
-    public final static short    BORDER_DASHED              = 0x3;
-    /** dot border */
-    public final static short    BORDER_HAIR                = 0x4;
-    /** Thick border */
-    public final static short    BORDER_THICK               = 0x5;
-    /** double-line border */
-    public final static short    BORDER_DOUBLE              = 0x6;
-    /** hair-line border */
-    public final static short    BORDER_DOTTED              = 0x7;
-    /** Medium dashed border */
-    public final static short    BORDER_MEDIUM_DASHED       = 0x8;
-    /** dash-dot border */
-    public final static short    BORDER_DASH_DOT            = 0x9;
-    /** medium dash-dot border */
-    public final static short    BORDER_MEDIUM_DASH_DOT     = 0xA;
-    /** dash-dot-dot border */
-    public final static short    BORDER_DASH_DOT_DOT        = 0xB;
-    /** medium dash-dot-dot border */
-    public final static short    BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
-    /** slanted dash-dot border */
-    public final static short    BORDER_SLANTED_DASH_DOT    = 0xD;
-
-    // BORDER FORMATTING BLOCK
-    // For Border Line Style codes see HSSFCellStyle.BORDER_XXXXXX
-    private int              field_13_border_styles1;
-    private static final BitField  bordLeftLineStyle  = BitFieldFactory.getInstance(0x0000000F);
-    private static final BitField  bordRightLineStyle = BitFieldFactory.getInstance(0x000000F0);
-    private static final BitField  bordTopLineStyle   = BitFieldFactory.getInstance(0x00000F00);
-    private static final BitField  bordBottomLineStyle= BitFieldFactory.getInstance(0x0000F000);
-    private static final BitField  bordLeftLineColor  = BitFieldFactory.getInstance(0x007F0000);
-    private static final BitField  bordRightLineColor = BitFieldFactory.getInstance(0x3F800000);
-    private static final BitField  bordTlBrLineOnOff  = BitFieldFactory.getInstance(0x40000000);
-    private static final BitField  bordBlTrtLineOnOff = BitFieldFactory.getInstance(0x80000000);
-
-    private int              field_14_border_styles2;
-    private static final BitField  bordTopLineColor   = BitFieldFactory.getInstance(0x0000007F);
-    private static final BitField  bordBottomLineColor= BitFieldFactory.getInstance(0x00003f80);
-    private static final BitField  bordDiagLineColor  = BitFieldFactory.getInstance(0x001FC000);
-    private static final BitField  bordDiagLineStyle  = BitFieldFactory.getInstance(0x01E00000);
-
-
-    public BorderFormatting() {
-        field_13_border_styles1    = 0;
-        field_14_border_styles2    = 0;
-    }
-
-    /** Creates new FontFormatting */
-    public BorderFormatting(LittleEndianInput in) {
-        field_13_border_styles1    = in.readInt();
-        field_14_border_styles2    = in.readInt();
-    }
-
-    public int getDataLength() {
-        return 8;
-    }
-
-    /**
-     * set the type of border to use for the left border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public void setBorderLeft(int border) {
-        field_13_border_styles1 = bordLeftLineStyle.setValue(field_13_border_styles1, border);
-    }
-
-    /**
-     * get the type of border to use for the left border of the cell
-     * @return border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public int getBorderLeft() {
-        return bordLeftLineStyle.getValue(field_13_border_styles1);
-    }
-
-    /**
-     * set the type of border to use for the right border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public void setBorderRight(int border) {
-        field_13_border_styles1 = bordRightLineStyle.setValue(field_13_border_styles1, border);
-    }
-
-    /**
-     * get the type of border to use for the right border of the cell
-     * @return border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public int getBorderRight() {
-        return bordRightLineStyle.getValue(field_13_border_styles1);
-    }
-
-    /**
-     * set the type of border to use for the top border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public void setBorderTop(int border) {
-        field_13_border_styles1 = bordTopLineStyle.setValue(field_13_border_styles1, border);
-    }
-
-    /**
-     * get the type of border to use for the top border of the cell
-     * @return border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public int getBorderTop() {
-        return bordTopLineStyle.getValue(field_13_border_styles1);
-    }
-
-    /**
-     * set the type of border to use for the bottom border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public void setBorderBottom(int border) {
-        field_13_border_styles1 = bordBottomLineStyle.setValue(field_13_border_styles1, border);
-    }
-
-    /**
-     * get the type of border to use for the bottom border of the cell
-     * @return border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public int getBorderBottom() {
-        return bordBottomLineStyle.getValue(field_13_border_styles1);
-    }
-
-    /**
-     * set the type of border to use for the diagonal border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public void setBorderDiagonal(int border) {
-        field_14_border_styles2 = bordDiagLineStyle.setValue(field_14_border_styles2, border);
-    }
-
-    /**
-     * get the type of border to use for the diagonal border of the cell
-     * @return border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     */
-    public int getBorderDiagonal() {
-        return bordDiagLineStyle.getValue(field_14_border_styles2);
-    }
-
-    /**
-     * set the color to use for the left border
-     * @param color The index of the color definition
-     */
-    public void setLeftBorderColor(int color) {
-        field_13_border_styles1 = bordLeftLineColor.setValue(field_13_border_styles1, color);
-    }
-
-    /**
-     * get the color to use for the left border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return  The index of the color definition
-     */
-    public int getLeftBorderColor() {
-        return bordLeftLineColor.getValue(field_13_border_styles1);
-    }
-
-    /**
-     * set the color to use for the right border
-     * @param color The index of the color definition
-     */
-    public void setRightBorderColor(int color) {
-        field_13_border_styles1 = bordRightLineColor.setValue(field_13_border_styles1, color);
-    }
-
-    /**
-     * get the color to use for the right border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    public int getRightBorderColor() {
-        return bordRightLineColor.getValue(field_13_border_styles1);
-    }
-
-    /**
-     * set the color to use for the top border
-     * @param color The index of the color definition
-     */
-    public void setTopBorderColor(int color) {
-        field_14_border_styles2 = bordTopLineColor.setValue(field_14_border_styles2, color);
-    }
-
-    /**
-     * get the color to use for the top border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    public int getTopBorderColor() {
-        return bordTopLineColor.getValue(field_14_border_styles2);
-    }
-
-    /**
-     * set the color to use for the bottom border
-     * @param color The index of the color definition
-     */
-    public void setBottomBorderColor(int color)
-    {
-        field_14_border_styles2 = bordBottomLineColor.setValue(field_14_border_styles2, color);
-    }
-
-    /**
-     * get the color to use for the bottom border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    public int getBottomBorderColor() {
-        return bordBottomLineColor.getValue(field_14_border_styles2);
-    }
-
-    /**
-     * set the color to use for the diagonal borders
-     * @param color The index of the color definition
-     */
-    public void setDiagonalBorderColor(int color) {
-        field_14_border_styles2 = bordDiagLineColor.setValue(field_14_border_styles2, color);
-    }
-
-    /**
-     * get the color to use for the diagonal border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    public int getDiagonalBorderColor() {
-        return bordDiagLineColor.getValue(field_14_border_styles2);
-    }
-
-    /**
-     * Of/off bottom left to top right line
-     *
-     * @param on - if <code>true</code> - on, otherwise off
-     */
-    public void setForwardDiagonalOn(boolean on) {
-        field_13_border_styles1 = bordBlTrtLineOnOff.setBoolean(field_13_border_styles1, on);
-    }
-
-    /**
-     * Of/off top left to bottom right line
-     *
-     * @param on - if <code>true</code> - on, otherwise off
-     */
-    public void setBackwardDiagonalOn(boolean on) {
-        field_13_border_styles1 = bordTlBrLineOnOff.setBoolean(field_13_border_styles1, on);
-    }
-
-    /**
-     * @return <code>true</code> if forward diagonal is on
-     */
-    public boolean isForwardDiagonalOn() {
-        return bordBlTrtLineOnOff.isSet(field_13_border_styles1);
-    }
-
-    /**
-     * @return <code>true</code> if backward diagonal is on
-     */
-    public boolean isBackwardDiagonalOn() {
-        return bordTlBrLineOnOff.isSet(field_13_border_styles1);
-    }
-
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [Border Formatting]\n");
-        buffer.append("          .lftln     = ").append(Integer.toHexString(getBorderLeft())).append("\n");
-        buffer.append("          .rgtln     = ").append(Integer.toHexString(getBorderRight())).append("\n");
-        buffer.append("          .topln     = ").append(Integer.toHexString(getBorderTop())).append("\n");
-        buffer.append("          .btmln     = ").append(Integer.toHexString(getBorderBottom())).append("\n");
-        buffer.append("          .leftborder= ").append(Integer.toHexString(getLeftBorderColor())).append("\n");
-        buffer.append("          .rghtborder= ").append(Integer.toHexString(getRightBorderColor())).append("\n");
-        buffer.append("          .topborder= ").append(Integer.toHexString(getTopBorderColor())).append("\n");
-        buffer.append("          .bottomborder= ").append(Integer.toHexString(getBottomBorderColor())).append("\n");
-        buffer.append("          .fwdiag= ").append(isForwardDiagonalOn()).append("\n");
-        buffer.append("          .bwdiag= ").append(isBackwardDiagonalOn()).append("\n");
-        buffer.append("    [/Border Formatting]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public BorderFormatting clone() {
-      BorderFormatting rec = new BorderFormatting();
-      rec.field_13_border_styles1 = field_13_border_styles1;
-      rec.field_14_border_styles2 = field_14_border_styles2;
-      return rec;
-    }
-
-    public int serialize(int offset, byte [] data) {
-        LittleEndian.putInt(data, offset+0, field_13_border_styles1);
-        LittleEndian.putInt(data, offset+4, field_14_border_styles2);
-        return 8;
-    }
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(field_13_border_styles1);
-        out.writeInt(field_14_border_styles2);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java b/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
deleted file mode 100644
index 0bc179a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.hssf.record.common.ExtendedColor;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Color Gradient / Color Scale Conditional Formatting Rule Record.
- * (Called Color Gradient in the file format docs, but more commonly
- *  Color Scale in the UI)
- */
-public final class ColorGradientFormatting implements Cloneable {
-    private static POILogger log = POILogFactory.getLogger(ColorGradientFormatting.class);
-
-    private byte options = 0;
-    private ColorGradientThreshold[] thresholds;
-    private ExtendedColor[] colors;
-    
-    private static BitField clamp = BitFieldFactory.getInstance(0x01);
-    private static BitField background = BitFieldFactory.getInstance(0x02);
-    
-    public ColorGradientFormatting() {
-        options = 3;
-        thresholds = new ColorGradientThreshold[3];
-        colors = new ExtendedColor[3];  
-    }
-    public ColorGradientFormatting(LittleEndianInput in) {
-        in.readShort(); // Ignored
-        in.readByte();  // Reserved
-        int numI = in.readByte();
-        int numG = in.readByte();
-        if (numI != numG) {
-            log.log(POILogger.WARN, "Inconsistent Color Gradient defintion, found " + numI + " vs " + numG + " entries");
-        }
-        options = in.readByte();
-        
-        thresholds = new ColorGradientThreshold[numI];
-        for (int i=0; i<thresholds.length; i++) {
-            thresholds[i] = new ColorGradientThreshold(in);
-        }
-        colors = new ExtendedColor[numG];
-        for (int i=0; i<colors.length; i++) {
-            in.readDouble(); // Slightly pointless step counter
-            colors[i] = new ExtendedColor(in);
-        }
-    }
-    
-    public int getNumControlPoints() {
-        return thresholds.length;
-    }
-    public void setNumControlPoints(int num) {
-        if (num != thresholds.length) {
-            ColorGradientThreshold[] nt = new ColorGradientThreshold[num];
-            ExtendedColor[] nc = new ExtendedColor[num];
-            
-            int copy = Math.min(thresholds.length, num);
-            System.arraycopy(thresholds, 0, nt, 0, copy);
-            System.arraycopy(colors, 0, nc, 0, copy);
-            
-            this.thresholds = nt;
-            this.colors = nc;
-            
-            updateThresholdPositions();
-        }
-    }
-    
-    public ColorGradientThreshold[] getThresholds() {
-        return thresholds;
-    }
-    public void setThresholds(ColorGradientThreshold[] thresholds) {
-        this.thresholds = (thresholds == null) ? null : thresholds.clone();
-        updateThresholdPositions();
-    }
-
-    public ExtendedColor[] getColors() {
-        return colors;
-    }
-    public void setColors(ExtendedColor[] colors) {
-        this.colors = (colors == null) ? null : colors.clone();
-    }
-    
-    public boolean isClampToCurve() {
-        return getOptionFlag(clamp);
-    }
-    public boolean isAppliesToBackground() {
-        return getOptionFlag(background);
-    }
-    private boolean getOptionFlag(BitField field) {
-        int value = field.getValue(options);
-        return value==0 ? false : true;
-    }
-
-    private void updateThresholdPositions() {
-        double step = 1d / (thresholds.length-1);
-        for (int i=0; i<thresholds.length; i++) {
-            thresholds[i].setPosition(step*i);
-        }
-    }    
-    
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [Color Gradient Formatting]\n");
-        buffer.append("          .clamp     = ").append(isClampToCurve()).append("\n");
-        buffer.append("          .background= ").append(isAppliesToBackground()).append("\n");
-        for (Threshold t : thresholds) {
-            buffer.append(t.toString());
-        }
-        for (ExtendedColor c : colors) {
-            buffer.append(c.toString());
-        }
-        buffer.append("    [/Color Gradient Formatting]\n");
-        return buffer.toString();
-    }
-    
-    public Object clone()  {
-      ColorGradientFormatting rec = new ColorGradientFormatting();
-      rec.options = options;
-      rec.thresholds = new ColorGradientThreshold[thresholds.length];
-      rec.colors = new ExtendedColor[colors.length];
-      System.arraycopy(thresholds, 0, rec.thresholds, 0, thresholds.length);
-      System.arraycopy(colors, 0, rec.colors, 0, colors.length);
-      return rec;
-    }
-    
-    public int getDataLength() {
-        int len = 6;
-        for (Threshold t : thresholds) {
-            len += t.getDataLength();
-        }
-        for (ExtendedColor c : colors) {
-            len += c.getDataLength();
-            len += 8;
-        }
-        return len;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(0);
-        out.writeByte(0);
-        out.writeByte(thresholds.length);
-        out.writeByte(thresholds.length);
-        out.writeByte(options);
-        
-        for (ColorGradientThreshold t : thresholds) {
-            t.serialize(out);
-        }
-        
-        double step = 1d / (colors.length-1);
-        for (int i=0; i<colors.length; i++) {
-            out.writeDouble(i*step);
-            
-            ExtendedColor c = colors[i];
-            c.serialize(out);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java b/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
deleted file mode 100644
index e7bea75..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Color Gradient / Color Scale specific Threshold / value (CFVO),
- *  for changes in Conditional Formatting
- */
-public final class ColorGradientThreshold extends Threshold implements Cloneable {
-    private double position;
-
-    public ColorGradientThreshold() {
-        super();
-        position = 0d;
-    }
-
-    /** Creates new Color Gradient Threshold */
-    public ColorGradientThreshold(LittleEndianInput in) {
-        super(in);
-        position = in.readDouble();
-    }
-
-    public double getPosition() {
-        return position;
-    }
-    public void setPosition(double position) {
-        this.position = position;
-    }
-
-    public int getDataLength() {
-        return super.getDataLength() + 8;
-    }
-
-    @Override
-    public ColorGradientThreshold clone() {
-      ColorGradientThreshold rec = new ColorGradientThreshold();
-      super.copyTo(rec);
-      rec.position = position;
-      return rec;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        super.serialize(out);
-        out.writeDouble(position);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java b/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
deleted file mode 100644
index 8810ef5..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.hssf.record.common.ExtendedColor;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Data Bar Conditional Formatting Rule Record.
- */
-public final class DataBarFormatting implements Cloneable {
-    private static POILogger log = POILogFactory.getLogger(DataBarFormatting.class);
-
-    private byte options = 0;
-    private byte percentMin = 0;
-    private byte percentMax = 0;
-    private ExtendedColor color;
-    private DataBarThreshold thresholdMin;
-    private DataBarThreshold thresholdMax;
-    
-    private static BitField iconOnly = BitFieldFactory.getInstance(0x01);
-    private static BitField reversed = BitFieldFactory.getInstance(0x04);
-    
-    public DataBarFormatting() {
-        options = 2;
-    }
-    public DataBarFormatting(LittleEndianInput in) {
-        in.readShort(); // Ignored
-        in.readByte();  // Reserved
-        options = in.readByte();
-        
-        percentMin = in.readByte();
-        percentMax = in.readByte();
-        if (percentMin < 0 || percentMin > 100)
-            log.log(POILogger.WARN, "Inconsistent Minimum Percentage found " + percentMin);
-        if (percentMax < 0 || percentMax > 100)
-            log.log(POILogger.WARN, "Inconsistent Minimum Percentage found " + percentMin);
-        
-        color = new ExtendedColor(in);
-        thresholdMin = new DataBarThreshold(in);
-        thresholdMax = new DataBarThreshold(in);
-    }
-    
-    public boolean isIconOnly() {
-        return getOptionFlag(iconOnly);
-    }
-    public void setIconOnly(boolean only) {
-        setOptionFlag(only, iconOnly);
-    }
-    
-    public boolean isReversed() {
-        return getOptionFlag(reversed);
-    }
-    public void setReversed(boolean rev) {
-        setOptionFlag(rev, reversed);
-    }
-    
-    private boolean getOptionFlag(BitField field) {
-        int value = field.getValue(options);
-        return value==0 ? false : true;
-    }
-    private void setOptionFlag(boolean option, BitField field) {
-        options = field.setByteBoolean(options, option);
-    }
-
-    public byte getPercentMin() {
-        return percentMin;
-    }
-    public void setPercentMin(byte percentMin) {
-        this.percentMin = percentMin;
-    }
-    
-    public byte getPercentMax() {
-        return percentMax;
-    }
-    public void setPercentMax(byte percentMax) {
-        this.percentMax = percentMax;
-    }
-    
-    public ExtendedColor getColor() {
-        return color;
-    }
-    public void setColor(ExtendedColor color) {
-        this.color = color;
-    }
-    
-    public DataBarThreshold getThresholdMin() {
-        return thresholdMin;
-    }
-    public void setThresholdMin(DataBarThreshold thresholdMin) {
-        this.thresholdMin = thresholdMin;
-    }
-    
-    public DataBarThreshold getThresholdMax() {
-        return thresholdMax;
-    }
-    public void setThresholdMax(DataBarThreshold thresholdMax) {
-        this.thresholdMax = thresholdMax;
-    }
-    
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [Data Bar Formatting]\n");
-        buffer.append("          .icon_only= ").append(isIconOnly()).append("\n");
-        buffer.append("          .reversed = ").append(isReversed()).append("\n");
-        buffer.append(color);
-        buffer.append(thresholdMin);
-        buffer.append(thresholdMax);
-        buffer.append("    [/Data Bar Formatting]\n");
-        return buffer.toString();
-    }
-    
-    public Object clone()  {
-      DataBarFormatting rec = new DataBarFormatting();
-      rec.options = options;
-      rec.percentMin = percentMin;
-      rec.percentMax = percentMax;
-      rec.color = color.clone();
-      rec.thresholdMin = thresholdMin.clone();
-      rec.thresholdMax = thresholdMax.clone();
-      return rec;
-    }
-    
-    public int getDataLength() {
-        return 6 + color.getDataLength() +
-               thresholdMin.getDataLength() + 
-               thresholdMax.getDataLength();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(0);
-        out.writeByte(0);
-        out.writeByte(options);
-        out.writeByte(percentMin);
-        out.writeByte(percentMax);
-        color.serialize(out);
-        thresholdMin.serialize(out);
-        thresholdMax.serialize(out);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java b/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
deleted file mode 100644
index 63c7f6b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * Data Bar specific Threshold / value (CFVO),
- *  for changes in Conditional Formatting
- */
-public final class DataBarThreshold extends Threshold implements Cloneable {
-    public DataBarThreshold() {
-        super();
-    }
-
-    /** Creates new Data Bar Threshold */
-    public DataBarThreshold(LittleEndianInput in) {
-        super(in);
-    }
-
-    @Override
-    public DataBarThreshold clone() {
-      DataBarThreshold rec = new DataBarThreshold();
-      super.copyTo(rec);
-      return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java b/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
deleted file mode 100644
index 807d67a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
+++ /dev/null
@@ -1,540 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import java.util.Locale;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Font Formatting Block of the Conditional Formatting Rule Record.
- */
-public final class FontFormatting implements Cloneable {
-    private final byte[] _rawData = new byte[RAW_DATA_SIZE];
-
-    private static final int OFFSET_FONT_NAME = 0;
-    private static final int OFFSET_FONT_HEIGHT = 64;
-    private static final int OFFSET_FONT_OPTIONS = 68;
-    private static final int OFFSET_FONT_WEIGHT = 72;
-    private static final int OFFSET_ESCAPEMENT_TYPE = 74;
-    private static final int OFFSET_UNDERLINE_TYPE = 76;
-    private static final int OFFSET_FONT_COLOR_INDEX = 80;
-    private static final int OFFSET_OPTION_FLAGS = 88;
-    private static final int OFFSET_ESCAPEMENT_TYPE_MODIFIED = 92;
-    private static final int OFFSET_UNDERLINE_TYPE_MODIFIED = 96;
-    private static final int OFFSET_FONT_WEIGHT_MODIFIED = 100;
-    private static final int OFFSET_NOT_USED1 = 104;
-    private static final int OFFSET_NOT_USED2 = 108;
-    private static final int OFFSET_NOT_USED3 = 112; // for some reason Excel always writes  0x7FFFFFFF at this offset
-    private static final int OFFSET_FONT_FORMATING_END = 116;
-    private static final int RAW_DATA_SIZE = 118;
-
-
-    public final static int  FONT_CELL_HEIGHT_PRESERVED   = 0xFFFFFFFF;
-
-    // FONT OPTIONS MASKS
-    private static final BitField posture       = BitFieldFactory.getInstance(0x00000002);
-    private static final BitField outline       = BitFieldFactory.getInstance(0x00000008);
-    private static final BitField shadow        = BitFieldFactory.getInstance(0x00000010);
-    private static final BitField cancellation	= BitFieldFactory.getInstance(0x00000080);
-
-    // OPTION FLAGS MASKS
-
-    private static final BitField styleModified        = BitFieldFactory.getInstance(0x00000002);
-    private static final BitField outlineModified      = BitFieldFactory.getInstance(0x00000008);
-    private static final BitField shadowModified       = BitFieldFactory.getInstance(0x00000010);
-    private static final BitField cancellationModified = BitFieldFactory.getInstance(0x00000080);
-
-    /** Escapement type - None */
-    public static final short SS_NONE  = 0;
-    /** Escapement type - Superscript */
-    public static final short SS_SUPER = 1;
-    /** Escapement type - Subscript */
-    public static final short SS_SUB   = 2;
-    /** Underline type - None */
-    public static final byte U_NONE               = 0;
-    /** Underline type - Single */
-    public static final byte U_SINGLE             = 1;
-    /** Underline type - Double */
-    public static final byte U_DOUBLE             = 2;
-    /** Underline type - Single Accounting */
-    public static final byte U_SINGLE_ACCOUNTING  = 0x21;
-    /** Underline type - Double Accounting */
-    public static final byte U_DOUBLE_ACCOUNTING  = 0x22;
-    /** Normal boldness (not bold) */
-    private static final short FONT_WEIGHT_NORMAL = 0x190;
-
-    /**
-     * Bold boldness (bold)
-     */
-    private static final short FONT_WEIGHT_BOLD	 = 0x2bc;
-
-    public FontFormatting() {
-        setFontHeight(-1);
-        setItalic(false);
-        setFontWieghtModified(false);
-        setOutline(false);
-        setShadow(false);
-        setStrikeout(false);
-        setEscapementType((short)0);
-        setUnderlineType((byte)0);
-        setFontColorIndex((short)-1);
-
-        setFontStyleModified(false);
-        setFontOutlineModified(false);
-        setFontShadowModified(false);
-        setFontCancellationModified(false);
-
-        setEscapementTypeModified(false);
-        setUnderlineTypeModified(false);
-
-        setShort(OFFSET_FONT_NAME, 0);
-        setInt(OFFSET_NOT_USED1, 0x00000001);
-        setInt(OFFSET_NOT_USED2, 0x00000000);
-        setInt(OFFSET_NOT_USED3, 0x7FFFFFFF);// for some reason Excel always writes  0x7FFFFFFF at this offset
-        setShort(OFFSET_FONT_FORMATING_END, 0x0001);
-    }
-
-    /** Creates new FontFormatting */
-    public FontFormatting(RecordInputStream in) {
-        for (int i = 0; i < _rawData.length; i++) {
-            _rawData[i] = in.readByte();
-        }
-    }
-
-    private short getShort(int offset) {
-        return LittleEndian.getShort( _rawData, offset);
-    }
-    private void setShort(int offset, int value) {
-        LittleEndian.putShort( _rawData, offset, (short)value);
-    }
-    private int getInt(int offset) {
-        return LittleEndian.getInt( _rawData, offset);
-    }
-    private void setInt(int offset, int value) {
-        LittleEndian.putInt( _rawData, offset, value);
-    }
-
-    public byte[] getRawRecord()
-    {
-        return _rawData;
-    }
-
-    public int getDataLength() {
-        return RAW_DATA_SIZE;
-    }
-
-    /**
-     * sets the height of the font in 1/20th point units
-     *
-     *
-     * @param height  fontheight (in points/20); or -1 to preserve the cell font height
-     */
-
-    public void setFontHeight(int height)
-    {
-        setInt(OFFSET_FONT_HEIGHT, height);
-    }
-
-    /**
-     * gets the height of the font in 1/20th point units
-     *
-     * @return fontheight (in points/20); or -1 if not modified
-     */
-    public int getFontHeight()
-    {
-        return getInt(OFFSET_FONT_HEIGHT);
-    }
-
-    private void setFontOption(boolean option, BitField field)
-    {
-        int options = getInt(OFFSET_FONT_OPTIONS);
-        options = field.setBoolean(options, option);
-        setInt(OFFSET_FONT_OPTIONS, options);
-    }
-
-    private boolean getFontOption(BitField field)
-    {
-        int options = getInt(OFFSET_FONT_OPTIONS);
-        return field.isSet(options);
-    }
-
-    /**
-     * set the font to be italics or not
-     *
-     * @param italic - whether the font is italics or not
-     * @see #setFontOption(boolean, org.apache.poi.util.BitField)
-     */
-
-    public void setItalic(boolean italic)
-    {
-        setFontOption(italic, posture);
-    }
-
-    /**
-     * get whether the font is to be italics or not
-     *
-     * @return italics - whether the font is italics or not
-     * @see #getFontOption(org.apache.poi.util.BitField)
-     */
-
-    public boolean isItalic()
-    {
-        return getFontOption(posture);
-    }
-
-    public void setOutline(boolean on)
-    {
-        setFontOption(on, outline);
-    }
-
-    public boolean isOutlineOn()
-    {
-        return getFontOption(outline);
-    }
-
-    public void setShadow(boolean on)
-    {
-        setFontOption(on, shadow);
-    }
-
-    public boolean isShadowOn()
-    {
-        return getFontOption(shadow);
-    }
-
-    /**
-     * set the font to be stricken out or not
-     *
-     * @param strike - whether the font is stricken out or not
-     */
-    public void setStrikeout(boolean strike)
-    {
-        setFontOption(strike, cancellation);
-    }
-
-    /**
-     * get whether the font is to be stricken out or not
-     *
-     * @return strike - whether the font is stricken out or not
-     * @see #getFontOption(org.apache.poi.util.BitField)
-     */
-    public boolean isStruckout()
-    {
-        return getFontOption(cancellation);
-    }
-
-    /**
-     * set the font weight (100-1000dec or 0x64-0x3e8).  Default is
-     * 0x190 for normal and 0x2bc for bold
-     *
-     * @param bw - a number between 100-1000 for the fonts "boldness"
-     */
-
-    private void setFontWeight(short pbw)
-    {
-        short bw = pbw;
-        if( bw<100) { bw=100; }
-        if( bw>1000){ bw=1000; }
-        setShort(OFFSET_FONT_WEIGHT, bw);
-    }
-
-    /**
-     * set the font weight to bold (weight=700) or to normal(weight=400) boldness.
-     *
-     * @param bold - set font weight to bold if true; to normal otherwise
-     */
-    public void setBold(boolean bold)
-    {
-        setFontWeight(bold?FONT_WEIGHT_BOLD:FONT_WEIGHT_NORMAL);
-    }
-
-    /**
-     * get the font weight for this font (100-1000dec or 0x64-0x3e8).  Default is
-     * 0x190 for normal and 0x2bc for bold
-     *
-     * @return bw - a number between 100-1000 for the fonts "boldness"
-     */
-
-    public short getFontWeight()
-    {
-        return getShort(OFFSET_FONT_WEIGHT);
-    }
-
-    /**
-     * get whether the font weight is set to bold or not
-     *
-     * @return bold - whether the font is bold or not
-     */
-
-    public boolean isBold()
-    {
-        return getFontWeight()==FONT_WEIGHT_BOLD;
-    }
-
-    /**
-     * get the type of super or subscript for the font
-     *
-     * @return super or subscript option
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#SS_NONE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#SS_SUPER
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#SS_SUB
-     */
-    public short getEscapementType()
-    {
-        return getShort(OFFSET_ESCAPEMENT_TYPE);
-    }
-
-    /**
-     * set the escapement type for the font
-     *
-     * @param escapementType  super or subscript option
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#SS_NONE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#SS_SUPER
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#SS_SUB
-     */
-    public void setEscapementType( short escapementType)
-    {
-        setShort(OFFSET_ESCAPEMENT_TYPE, escapementType);
-    }
-
-    /**
-     * get the type of underlining for the font
-     *
-     * @return font underlining type
-     *
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_NONE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_SINGLE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_DOUBLE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_SINGLE_ACCOUNTING
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_DOUBLE_ACCOUNTING
-     */
-    public short getUnderlineType()
-    {
-        return getShort(OFFSET_UNDERLINE_TYPE);
-    }
-
-    /**
-     * set the type of underlining type for the font
-     *
-     * @param underlineType underline option
-     *
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_NONE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_SINGLE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_DOUBLE
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_SINGLE_ACCOUNTING
-     * @see org.apache.poi.hssf.usermodel.HSSFFontFormatting#U_DOUBLE_ACCOUNTING
-     */
-    public void setUnderlineType( short underlineType)
-    {
-        setShort(OFFSET_UNDERLINE_TYPE, underlineType);
-    }
-
-
-    public short getFontColorIndex()
-    {
-        return (short)getInt(OFFSET_FONT_COLOR_INDEX);
-    }
-
-    public void setFontColorIndex(short fci )
-    {
-        setInt(OFFSET_FONT_COLOR_INDEX,fci);
-    }
-
-    private boolean getOptionFlag(BitField field) {
-        int optionFlags = getInt(OFFSET_OPTION_FLAGS);
-        int value = field.getValue(optionFlags);
-        return value==0? true : false ;
-    }
-
-    private void setOptionFlag(boolean modified, BitField field)
-    {
-        int value = modified? 0 : 1;
-        int optionFlags = getInt(OFFSET_OPTION_FLAGS);
-        optionFlags = field.setValue(optionFlags, value);
-        setInt(OFFSET_OPTION_FLAGS, optionFlags);
-    }
-
-
-    public boolean isFontStyleModified()
-    {
-        return getOptionFlag(styleModified);
-    }
-
-
-    public void setFontStyleModified(boolean modified)
-    {
-        setOptionFlag(modified, styleModified);
-    }
-
-    public boolean isFontOutlineModified()
-    {
-        return getOptionFlag(outlineModified);
-    }
-
-    public void setFontOutlineModified(boolean modified)
-    {
-        setOptionFlag(modified, outlineModified);
-    }
-
-    public boolean isFontShadowModified()
-    {
-        return getOptionFlag(shadowModified);
-    }
-
-    public void setFontShadowModified(boolean modified)
-    {
-        setOptionFlag(modified, shadowModified);
-    }
-    public void setFontCancellationModified(boolean modified)
-    {
-        setOptionFlag(modified, cancellationModified);
-    }
-
-    public boolean isFontCancellationModified()
-    {
-        return getOptionFlag(cancellationModified);
-    }
-
-    public void setEscapementTypeModified(boolean modified)
-    {
-        int value = modified? 0 : 1;
-        setInt(OFFSET_ESCAPEMENT_TYPE_MODIFIED, value);
-    }
-    public boolean isEscapementTypeModified()
-    {
-        int escapementModified = getInt(OFFSET_ESCAPEMENT_TYPE_MODIFIED);
-        return escapementModified == 0;
-    }
-
-    public void setUnderlineTypeModified(boolean modified)
-    {
-        int value = modified? 0 : 1;
-        setInt(OFFSET_UNDERLINE_TYPE_MODIFIED, value);
-    }
-
-    public boolean isUnderlineTypeModified()
-    {
-        int underlineModified = getInt(OFFSET_UNDERLINE_TYPE_MODIFIED);
-        return underlineModified == 0;
-    }
-
-    public void setFontWieghtModified(boolean modified)
-    {
-        int value = modified? 0 : 1;
-        setInt(OFFSET_FONT_WEIGHT_MODIFIED, value);
-    }
-
-    public boolean isFontWeightModified()
-    {
-        int fontStyleModified = getInt(OFFSET_FONT_WEIGHT_MODIFIED);
-        return fontStyleModified == 0;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [Font Formatting]\n");
-
-        buffer.append("	.font height = ").append(getFontHeight()).append(" twips\n");
-
-        if( isFontStyleModified() )
-        {
-            buffer.append("	.font posture = ").append(isItalic()?"Italic":"Normal").append("\n");
-        }
-        else
-        {
-            buffer.append("	.font posture = ]not modified]").append("\n");
-        }
-
-        if( isFontOutlineModified() )
-        {
-            buffer.append("	.font outline = ").append(isOutlineOn()).append("\n");
-        }
-        else
-        {
-            buffer.append("	.font outline is not modified\n");
-        }
-
-        if( isFontShadowModified() )
-        {
-            buffer.append("	.font shadow = ").append(isShadowOn()).append("\n");
-        }
-        else
-        {
-            buffer.append("	.font shadow is not modified\n");
-        }
-
-        if( isFontCancellationModified() )
-        {
-            buffer.append("	.font strikeout = ").append(isStruckout()).append("\n");
-        }
-        else
-        {
-            buffer.append("	.font strikeout is not modified\n");
-        }
-
-        if( isFontStyleModified() )
-        {
-            buffer.append("	.font weight = ").
-            append(getFontWeight()).
-            append(
-                    getFontWeight() == FONT_WEIGHT_NORMAL ? "(Normal)"
-                    : getFontWeight() == FONT_WEIGHT_BOLD ? "(Bold)" 
-                    : "0x"+Integer.toHexString(getFontWeight())).
-            append("\n");
-        }
-        else
-        {
-            buffer.append("	.font weight = ]not modified]").append("\n");
-        }
-
-        if( isEscapementTypeModified() )
-        {
-            buffer.append("	.escapement type = ").append(getEscapementType()).append("\n");
-        }
-        else
-        {
-            buffer.append("	.escapement type is not modified\n");
-        }
-
-        if( isUnderlineTypeModified() )
-        {
-            buffer.append("	.underline type = ").append(getUnderlineType()).append("\n");
-        }
-        else
-        {
-            buffer.append("	.underline type is not modified\n");
-        }
-        buffer.append("	.color index = ").append("0x"+Integer.toHexString(getFontColorIndex()).toUpperCase(Locale.ROOT)).append("\n");
-
-        buffer.append("    [/Font Formatting]\n");
-        return buffer.toString();
-    }
-
-    @Override
-    public FontFormatting clone() {
-        FontFormatting other = new FontFormatting();
-        System.arraycopy(_rawData, 0, other._rawData, 0, _rawData.length);
-        return other;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java b/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
deleted file mode 100644
index 6c984b2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Icon / Multi-State Conditional Formatting Rule Record.
- */
-public final class IconMultiStateFormatting implements Cloneable {
-    private static POILogger log = POILogFactory.getLogger(IconMultiStateFormatting.class);
-            
-    private IconSet iconSet;
-    private byte options;
-    private Threshold[] thresholds;
-    
-    private static BitField iconOnly = BitFieldFactory.getInstance(0x01);
-    private static BitField reversed = BitFieldFactory.getInstance(0x04);
-
-    public IconMultiStateFormatting() {
-        iconSet = IconSet.GYR_3_TRAFFIC_LIGHTS;
-        options = 0;
-        thresholds = new Threshold[iconSet.num];
-    }
-    public IconMultiStateFormatting(LittleEndianInput in) {
-        in.readShort(); // Ignored
-        in.readByte();  // Reserved
-        int num = in.readByte();
-        int set = in.readByte();
-        iconSet = IconSet.byId(set);
-        if (iconSet.num != num) {
-            log.log(POILogger.WARN, "Inconsistent Icon Set defintion, found " + iconSet + " but defined as " + num + " entries");
-        }
-        options = in.readByte();
-        
-        thresholds = new Threshold[iconSet.num];
-        for (int i=0; i<thresholds.length; i++) {
-            thresholds[i] = new IconMultiStateThreshold(in);
-        }
-    }
-    
-    public IconSet getIconSet() {
-        return iconSet;
-    }
-    public void setIconSet(IconSet set) {
-        this.iconSet = set;
-    }
-
-    public Threshold[] getThresholds() {
-        return thresholds;
-    }
-    public void setThresholds(Threshold[] thresholds) {
-        this.thresholds = (thresholds == null) ? null : thresholds.clone();
-    }
-    
-    public boolean isIconOnly() {
-        return getOptionFlag(iconOnly);
-    }
-    public void setIconOnly(boolean only) {
-        setOptionFlag(only, iconOnly);
-    }
-    
-    public boolean isReversed() {
-        return getOptionFlag(reversed);
-    }
-    public void setReversed(boolean rev) {
-        setOptionFlag(rev, reversed);
-    }
-    
-    private boolean getOptionFlag(BitField field) {
-        int value = field.getValue(options);
-        return value==0 ? false : true;
-    }
-    private void setOptionFlag(boolean option, BitField field) {
-        options = field.setByteBoolean(options, option);
-    }
-    
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [Icon Formatting]\n");
-        buffer.append("          .icon_set = ").append(iconSet).append("\n");
-        buffer.append("          .icon_only= ").append(isIconOnly()).append("\n");
-        buffer.append("          .reversed = ").append(isReversed()).append("\n");
-        for (Threshold t : thresholds) {
-            buffer.append(t.toString());
-        }
-        buffer.append("    [/Icon Formatting]\n");
-        return buffer.toString();
-    }
-    
-    public Object clone()  {
-      IconMultiStateFormatting rec = new IconMultiStateFormatting();
-      rec.iconSet = iconSet;
-      rec.options = options;
-      rec.thresholds = new Threshold[thresholds.length];
-      System.arraycopy(thresholds, 0, rec.thresholds, 0, thresholds.length);
-      return rec;
-    }
-    
-    public int getDataLength() {
-        int len = 6;
-        for (Threshold t : thresholds) {
-            len += t.getDataLength();
-        }
-        return len;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(0);
-        out.writeByte(0);
-        out.writeByte(iconSet.num);
-        out.writeByte(iconSet.id);
-        out.writeByte(options);
-        for (Threshold t : thresholds) {
-            t.serialize(out);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java b/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
deleted file mode 100644
index 03d95ca..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Icon / Multi-State specific Threshold / value (CFVO),
- *  for changes in Conditional Formatting
- */
-public final class IconMultiStateThreshold extends Threshold implements Cloneable {
-    /**
-     * Cell values that are equal to the threshold value do not pass the threshold
-     */
-    public static final byte EQUALS_EXCLUDE = 0;
-    /**
-     * Cell values that are equal to the threshold value pass the threshold.
-     */
-    public static final byte EQUALS_INCLUDE = 1;
-    
-    private byte equals;
-
-    public IconMultiStateThreshold() {
-        super();
-        equals = EQUALS_INCLUDE;
-    }
-
-    /** Creates new Ico Multi-State Threshold */
-    public IconMultiStateThreshold(LittleEndianInput in) {
-        super(in);
-        equals = in.readByte();
-        // Reserved, 4 bytes, all 0
-        in.readInt();
-    }
-
-    public byte getEquals() {
-        return equals;
-    }
-    public void setEquals(byte equals) {
-        this.equals = equals;
-    }
-
-    public int getDataLength() {
-        return super.getDataLength() + 5;
-    }
-
-    @Override
-    public IconMultiStateThreshold clone() {
-      IconMultiStateThreshold rec = new IconMultiStateThreshold();
-      super.copyTo(rec);
-      rec.equals = equals;
-      return rec;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        super.serialize(out);
-        out.writeByte(equals);
-        out.writeInt(0); // Reserved
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java b/trunk/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
deleted file mode 100644
index 3e18eac..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Pattern Formatting Block of the Conditional Formatting Rule Record.
- */
-public final class PatternFormatting implements Cloneable {
-    /**  No background */
-    public final static short     NO_FILL             = 0  ;
-    /**  Solidly filled */
-    public final static short     SOLID_FOREGROUND    = 1  ;
-    /**  Small fine dots */
-    public final static short     FINE_DOTS           = 2  ;
-    /**  Wide dots */
-    public final static short     ALT_BARS            = 3  ;
-    /**  Sparse dots */
-    public final static short     SPARSE_DOTS         = 4  ;
-    /**  Thick horizontal bands */
-    public final static short     THICK_HORZ_BANDS    = 5  ;
-    /**  Thick vertical bands */
-    public final static short     THICK_VERT_BANDS    = 6  ;
-    /**  Thick backward facing diagonals */
-    public final static short     THICK_BACKWARD_DIAG = 7  ;
-    /**  Thick forward facing diagonals */
-    public final static short     THICK_FORWARD_DIAG  = 8  ;
-    /**  Large spots */
-    public final static short     BIG_SPOTS           = 9  ;
-    /**  Brick-like layout */
-    public final static short     BRICKS              = 10 ;
-    /**  Thin horizontal bands */
-    public final static short     THIN_HORZ_BANDS     = 11 ;
-    /**  Thin vertical bands */
-    public final static short     THIN_VERT_BANDS     = 12 ;
-    /**  Thin backward diagonal */
-    public final static short     THIN_BACKWARD_DIAG  = 13 ;
-    /**  Thin forward diagonal */
-    public final static short     THIN_FORWARD_DIAG   = 14 ;
-    /**  Squares */
-    public final static short     SQUARES             = 15 ;
-    /**  Diamonds */
-    public final static short     DIAMONDS            = 16 ;
-    /**  Less Dots */
-    public final static short     LESS_DOTS           = 17 ;
-    /**  Least Dots */
-    public final static short     LEAST_DOTS          = 18 ;
-    
-    
-    // PATTERN FORMATING BLOCK
-    // For Pattern Styles see constants at HSSFCellStyle (from NO_FILL to LEAST_DOTS)
-    private int              field_15_pattern_style;
-    private static final BitField  fillPatternStyle = BitFieldFactory.getInstance(0xFC00);
-    
-    private int              field_16_pattern_color_indexes;
-    private static final BitField  patternColorIndex = BitFieldFactory.getInstance(0x007F);         
-    private static final BitField  patternBackgroundColorIndex = BitFieldFactory.getInstance(0x3F80);         
-
-    
-    public PatternFormatting() {
-        field_15_pattern_style    = 0;
-        field_16_pattern_color_indexes    = 0;
-    }
-    
-    /** Creates new FontFormatting */
-    public PatternFormatting(LittleEndianInput in) {
-        field_15_pattern_style    = in.readUShort();
-        field_16_pattern_color_indexes    = in.readUShort();
-    }
-    
-    public int getDataLength() {
-        return 4;
-    }
-    
-    /**
-     * setting fill pattern
-     *
-     * @see #NO_FILL
-     * @see #SOLID_FOREGROUND
-     * @see #FINE_DOTS
-     * @see #ALT_BARS
-     * @see #SPARSE_DOTS
-     * @see #THICK_HORZ_BANDS
-     * @see #THICK_VERT_BANDS
-     * @see #THICK_BACKWARD_DIAG
-     * @see #THICK_FORWARD_DIAG
-     * @see #BIG_SPOTS
-     * @see #BRICKS
-     * @see #THIN_HORZ_BANDS
-     * @see #THIN_VERT_BANDS
-     * @see #THIN_BACKWARD_DIAG
-     * @see #THIN_FORWARD_DIAG
-     * @see #SQUARES
-     * @see #DIAMONDS
-     *
-     * @param fp  fill pattern 
-     */
-    public void setFillPattern(int fp) {
-        field_15_pattern_style = fillPatternStyle.setValue(field_15_pattern_style, fp);
-    }
-
-    /**
-     * @return fill pattern
-     */
-    public int getFillPattern() {
-        return fillPatternStyle.getValue(field_15_pattern_style);
-    }
-    
-    /**
-     * set the background fill color.
-     */
-    public void setFillBackgroundColor(int bg) {        
-        field_16_pattern_color_indexes = patternBackgroundColorIndex.setValue(field_16_pattern_color_indexes,bg);
-    }
-
-    /**
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return get the background fill color
-     */
-    public int getFillBackgroundColor() {
-        return patternBackgroundColorIndex.getValue(field_16_pattern_color_indexes);
-    }
-
-    /**
-     * set the foreground fill color
-     */
-    public void setFillForegroundColor(int fg) {
-        field_16_pattern_color_indexes = patternColorIndex.setValue(field_16_pattern_color_indexes,fg);
-    }
-
-    /**
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return get the foreground fill color
-     */
-    public int getFillForegroundColor() {
-        return patternColorIndex.getValue(field_16_pattern_color_indexes);
-    }
-    
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [Pattern Formatting]\n");
-        buffer.append("          .fillpattern= ").append(Integer.toHexString(getFillPattern())).append("\n");
-        buffer.append("          .fgcoloridx= ").append(Integer.toHexString(getFillForegroundColor())).append("\n");
-        buffer.append("          .bgcoloridx= ").append(Integer.toHexString(getFillBackgroundColor())).append("\n");
-        buffer.append("    [/Pattern Formatting]\n");
-        return buffer.toString();
-    }
-    
-    public Object clone()  {
-      PatternFormatting rec = new PatternFormatting();
-      rec.field_15_pattern_style = field_15_pattern_style;
-      rec.field_16_pattern_color_indexes = field_16_pattern_color_indexes; 
-      return rec;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_15_pattern_style);
-        out.writeShort(field_16_pattern_color_indexes);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cf/Threshold.java b/trunk/src/java/org/apache/poi/hssf/record/cf/Threshold.java
deleted file mode 100644
index 946c181..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cf/Threshold.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import java.util.Arrays;
-
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Threshold / value (CFVO) for changes in Conditional Formatting
- */
-public abstract class Threshold {
-    private byte type;
-    private Formula formula;
-    private Double value;
-
-    protected Threshold() {
-        type = (byte)RangeType.NUMBER.id;
-        formula = Formula.create(null);
-        value = 0d;
-    }
-
-    /** Creates new Threshold */
-    protected Threshold(LittleEndianInput in) {
-        type = in.readByte();
-        short formulaLen = in.readShort();
-        if (formulaLen > 0) {
-            formula = Formula.read(formulaLen, in);
-        } else {
-            formula = Formula.create(null);
-        }
-        // Value is only there for non-formula, non min/max thresholds
-        if (formulaLen == 0 && type != RangeType.MIN.id &&
-                type != RangeType.MAX.id) {
-            value = in.readDouble();
-        }
-    }
-
-    public byte getType() {
-        return type;
-    }
-    public void setType(byte type) {
-        this.type = type;
-
-        // Ensure the value presence / absence is consistent for the new type
-        if (type == RangeType.MIN.id || type == RangeType.MAX.id ||
-               type == RangeType.FORMULA.id) {
-            this.value = null;
-        } else if (value == null) {
-            this.value = 0d;
-        }
-    }
-    public void setType(int type) {
-        this.type = (byte)type;
-    }
-
-    protected Formula getFormula() {
-        return formula;
-    }
-    public Ptg[] getParsedExpression() {
-        return formula.getTokens();
-    }
-    public void setParsedExpression(Ptg[] ptgs) {
-        formula = Formula.create(ptgs);
-        if (ptgs.length > 0) {
-            this.value = null;
-        }
-    }
-
-    public Double getValue() {
-        return value;
-    }
-    public void setValue(Double value) {
-        this.value = value;
-    }
-    
-    public int getDataLength() {
-        int len = 1 + formula.getEncodedSize();
-        if (value != null) {
-            len += 8;
-        }
-        return len;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [CF Threshold]\n");
-        buffer.append("          .type    = ").append(Integer.toHexString(type)).append("\n");
-        buffer.append("          .formula = ").append(Arrays.toString(formula.getTokens())).append("\n");
-        buffer.append("          .value   = ").append(value).append("\n");
-        buffer.append("    [/CF Threshold]\n");
-        return buffer.toString();
-    }
-
-    public void copyTo(Threshold rec) {
-      rec.type = type;
-      rec.formula = formula;
-      rec.value = value;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeByte(type);
-        if (formula.getTokens().length == 0) {
-            out.writeShort(0);
-        } else {
-            formula.serialize(out);
-        }
-        if (value != null) {
-            out.writeDouble(value);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
deleted file mode 100644
index 229743e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The area format record is used to define the colours and patterns for an area.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class AreaFormatRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x100A;
-    
-    private static final BitField automatic = BitFieldFactory.getInstance(0x1);
-    private static final BitField invert    = BitFieldFactory.getInstance(0x2);
-    
-    private  int        field_1_foregroundColor;
-    private  int        field_2_backgroundColor;
-    private  short      field_3_pattern;
-    private  short      field_4_formatFlags;
-    private  short      field_5_forecolorIndex;
-    private  short      field_6_backcolorIndex;
-
-
-    public AreaFormatRecord()
-    {
-
-    }
-
-    public AreaFormatRecord(RecordInputStream in)
-    {
-        field_1_foregroundColor        = in.readInt();
-        field_2_backgroundColor        = in.readInt();
-        field_3_pattern                = in.readShort();
-        field_4_formatFlags            = in.readShort();
-        field_5_forecolorIndex         = in.readShort();
-        field_6_backcolorIndex         = in.readShort();
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AREAFORMAT]\n");
-        buffer.append("    .foregroundColor      = ")
-            .append("0x").append(HexDump.toHex(  getForegroundColor ()))
-            .append(" (").append( getForegroundColor() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .backgroundColor      = ")
-            .append("0x").append(HexDump.toHex(  getBackgroundColor ()))
-            .append(" (").append( getBackgroundColor() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .pattern              = ")
-            .append("0x").append(HexDump.toHex(  getPattern ()))
-            .append(" (").append( getPattern() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .formatFlags          = ")
-            .append("0x").append(HexDump.toHex(  getFormatFlags ()))
-            .append(" (").append( getFormatFlags() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .automatic                = ").append(isAutomatic()).append('\n'); 
-        buffer.append("         .invert                   = ").append(isInvert()).append('\n'); 
-        buffer.append("    .forecolorIndex       = ")
-            .append("0x").append(HexDump.toHex(  getForecolorIndex ()))
-            .append(" (").append( getForecolorIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .backcolorIndex       = ")
-            .append("0x").append(HexDump.toHex(  getBackcolorIndex ()))
-            .append(" (").append( getBackcolorIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/AREAFORMAT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(field_1_foregroundColor);
-        out.writeInt(field_2_backgroundColor);
-        out.writeShort(field_3_pattern);
-        out.writeShort(field_4_formatFlags);
-        out.writeShort(field_5_forecolorIndex);
-        out.writeShort(field_6_backcolorIndex);
-    }
-
-    protected int getDataSize() {
-        return 4 + 4 + 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AreaFormatRecord clone() {
-        AreaFormatRecord rec = new AreaFormatRecord();
-    
-        rec.field_1_foregroundColor = field_1_foregroundColor;
-        rec.field_2_backgroundColor = field_2_backgroundColor;
-        rec.field_3_pattern = field_3_pattern;
-        rec.field_4_formatFlags = field_4_formatFlags;
-        rec.field_5_forecolorIndex = field_5_forecolorIndex;
-        rec.field_6_backcolorIndex = field_6_backcolorIndex;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the foreground color field for the AreaFormat record.
-     */
-    public int getForegroundColor()
-    {
-        return field_1_foregroundColor;
-    }
-
-    /**
-     * Set the foreground color field for the AreaFormat record.
-     */
-    public void setForegroundColor(int field_1_foregroundColor)
-    {
-        this.field_1_foregroundColor = field_1_foregroundColor;
-    }
-
-    /**
-     * Get the background color field for the AreaFormat record.
-     */
-    public int getBackgroundColor()
-    {
-        return field_2_backgroundColor;
-    }
-
-    /**
-     * Set the background color field for the AreaFormat record.
-     */
-    public void setBackgroundColor(int field_2_backgroundColor)
-    {
-        this.field_2_backgroundColor = field_2_backgroundColor;
-    }
-
-    /**
-     * Get the pattern field for the AreaFormat record.
-     */
-    public short getPattern()
-    {
-        return field_3_pattern;
-    }
-
-    /**
-     * Set the pattern field for the AreaFormat record.
-     */
-    public void setPattern(short field_3_pattern)
-    {
-        this.field_3_pattern = field_3_pattern;
-    }
-
-    /**
-     * Get the format flags field for the AreaFormat record.
-     */
-    public short getFormatFlags()
-    {
-        return field_4_formatFlags;
-    }
-
-    /**
-     * Set the format flags field for the AreaFormat record.
-     */
-    public void setFormatFlags(short field_4_formatFlags)
-    {
-        this.field_4_formatFlags = field_4_formatFlags;
-    }
-
-    /**
-     * Get the forecolor index field for the AreaFormat record.
-     */
-    public short getForecolorIndex()
-    {
-        return field_5_forecolorIndex;
-    }
-
-    /**
-     * Set the forecolor index field for the AreaFormat record.
-     */
-    public void setForecolorIndex(short field_5_forecolorIndex)
-    {
-        this.field_5_forecolorIndex = field_5_forecolorIndex;
-    }
-
-    /**
-     * Get the backcolor index field for the AreaFormat record.
-     */
-    public short getBackcolorIndex()
-    {
-        return field_6_backcolorIndex;
-    }
-
-    /**
-     * Set the backcolor index field for the AreaFormat record.
-     */
-    public void setBackcolorIndex(short field_6_backcolorIndex)
-    {
-        this.field_6_backcolorIndex = field_6_backcolorIndex;
-    }
-
-    /**
-     * Sets the automatic field value.
-     * automatic formatting
-     */
-    public void setAutomatic(boolean value)
-    {
-        field_4_formatFlags = automatic.setShortBoolean(field_4_formatFlags, value);
-    }
-
-    /**
-     * automatic formatting
-     * @return  the automatic field value.
-     */
-    public boolean isAutomatic()
-    {
-        return automatic.isSet(field_4_formatFlags);
-    }
-
-    /**
-     * Sets the invert field value.
-     * swap foreground and background colours when data is negative
-     */
-    public void setInvert(boolean value)
-    {
-        field_4_formatFlags = invert.setShortBoolean(field_4_formatFlags, value);
-    }
-
-    /**
-     * swap foreground and background colours when data is negative
-     * @return  the invert field value.
-     */
-    public boolean isInvert()
-    {
-        return invert.isSet(field_4_formatFlags);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
deleted file mode 100644
index 0bc901d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The area record is used to define a area chart.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class AreaRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x101A;
-    private  short      field_1_formatFlags;
-    private static final BitField stacked             = BitFieldFactory.getInstance(0x1);
-    private static final BitField displayAsPercentage = BitFieldFactory.getInstance(0x2);
-    private static final BitField shadow              = BitFieldFactory.getInstance(0x4);
-
-
-    public AreaRecord()
-    {
-
-    }
-
-    public AreaRecord(RecordInputStream in)
-    {
-
-        field_1_formatFlags            = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AREA]\n");
-        buffer.append("    .formatFlags          = ")
-            .append("0x").append(HexDump.toHex(  getFormatFlags ()))
-            .append(" (").append( getFormatFlags() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .stacked                  = ").append(isStacked()).append('\n'); 
-        buffer.append("         .displayAsPercentage      = ").append(isDisplayAsPercentage()).append('\n'); 
-        buffer.append("         .shadow                   = ").append(isShadow()).append('\n'); 
-
-        buffer.append("[/AREA]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_formatFlags);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AreaRecord clone() {
-        AreaRecord rec = new AreaRecord();
-    
-        rec.field_1_formatFlags = field_1_formatFlags;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the format flags field for the Area record.
-     */
-    public short getFormatFlags()
-    {
-        return field_1_formatFlags;
-    }
-
-    /**
-     * Set the format flags field for the Area record.
-     */
-    public void setFormatFlags(short field_1_formatFlags)
-    {
-        this.field_1_formatFlags = field_1_formatFlags;
-    }
-
-    /**
-     * Sets the stacked field value.
-     * series is stacked
-     */
-    public void setStacked(boolean value)
-    {
-        field_1_formatFlags = stacked.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * series is stacked
-     * @return  the stacked field value.
-     */
-    public boolean isStacked()
-    {
-        return stacked.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the display as percentage field value.
-     * results displayed as percentages
-     */
-    public void setDisplayAsPercentage(boolean value)
-    {
-        field_1_formatFlags = displayAsPercentage.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * results displayed as percentages
-     * @return  the display as percentage field value.
-     */
-    public boolean isDisplayAsPercentage()
-    {
-        return displayAsPercentage.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the shadow field value.
-     * display a shadow for the chart
-     */
-    public void setShadow(boolean value)
-    {
-        field_1_formatFlags = shadow.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * display a shadow for the chart
-     * @return  the shadow field value.
-     */
-    public boolean isShadow()
-    {
-        return shadow.isSet(field_1_formatFlags);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
deleted file mode 100644
index 92b0b6a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The axis line format record defines the axis type details.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class AxisLineFormatRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x1021;
-    private  short      field_1_axisType;
-    public final static short       AXIS_TYPE_AXIS_LINE            = 0;
-    public final static short       AXIS_TYPE_MAJOR_GRID_LINE      = 1;
-    public final static short       AXIS_TYPE_MINOR_GRID_LINE      = 2;
-    public final static short       AXIS_TYPE_WALLS_OR_FLOOR       = 3;
-
-
-    public AxisLineFormatRecord()
-    {
-
-    }
-
-    public AxisLineFormatRecord(RecordInputStream in)
-    {
-        field_1_axisType               = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AXISLINEFORMAT]\n");
-        buffer.append("    .axisType             = ")
-            .append("0x").append(HexDump.toHex(  getAxisType ()))
-            .append(" (").append( getAxisType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/AXISLINEFORMAT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_axisType);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AxisLineFormatRecord clone() {
-        AxisLineFormatRecord rec = new AxisLineFormatRecord();
-    
-        rec.field_1_axisType = field_1_axisType;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the axis type field for the AxisLineFormat record.
-     *
-     * @return  One of 
-     *        AXIS_TYPE_AXIS_LINE
-     *        AXIS_TYPE_MAJOR_GRID_LINE
-     *        AXIS_TYPE_MINOR_GRID_LINE
-     *        AXIS_TYPE_WALLS_OR_FLOOR
-     */
-    public short getAxisType()
-    {
-        return field_1_axisType;
-    }
-
-    /**
-     * Set the axis type field for the AxisLineFormat record.
-     *
-     * @param field_1_axisType
-     *        One of 
-     *        AXIS_TYPE_AXIS_LINE
-     *        AXIS_TYPE_MAJOR_GRID_LINE
-     *        AXIS_TYPE_MINOR_GRID_LINE
-     *        AXIS_TYPE_WALLS_OR_FLOOR
-     */
-    public void setAxisType(short field_1_axisType)
-    {
-        this.field_1_axisType = field_1_axisType;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
deleted file mode 100644
index e6c4768..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The axis options record provides unit information and other various tidbits about the axis.<p/>
- * 
- * @author Andrew C. Oliver(acoliver at apache.org)
- */
-public final class AxisOptionsRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1062;
-
-    private static final BitField defaultMinimum      = BitFieldFactory.getInstance(0x01);
-    private static final BitField defaultMaximum      = BitFieldFactory.getInstance(0x02);
-    private static final BitField defaultMajor        = BitFieldFactory.getInstance(0x04);
-    private static final BitField defaultMinorUnit    = BitFieldFactory.getInstance(0x08);
-    private static final BitField isDate              = BitFieldFactory.getInstance(0x10);
-    private static final BitField defaultBase         = BitFieldFactory.getInstance(0x20);
-    private static final BitField defaultCross        = BitFieldFactory.getInstance(0x40);
-    private static final BitField defaultDateSettings = BitFieldFactory.getInstance(0x80);
-
-    private short field_1_minimumCategory;
-    private short field_2_maximumCategory;
-    private short field_3_majorUnitValue;
-    private short field_4_majorUnit;
-    private short field_5_minorUnitValue;
-    private short field_6_minorUnit;
-    private short field_7_baseUnit;
-    private short field_8_crossingPoint;
-    private short field_9_options;
-
-
-    public AxisOptionsRecord()
-    {
-
-    }
-
-    public AxisOptionsRecord(RecordInputStream in)
-    {
-        field_1_minimumCategory        = in.readShort();
-        field_2_maximumCategory        = in.readShort();
-        field_3_majorUnitValue         = in.readShort();
-        field_4_majorUnit              = in.readShort();
-        field_5_minorUnitValue         = in.readShort();
-        field_6_minorUnit              = in.readShort();
-        field_7_baseUnit               = in.readShort();
-        field_8_crossingPoint          = in.readShort();
-        field_9_options                = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AXCEXT]\n");
-        buffer.append("    .minimumCategory      = ")
-            .append("0x").append(HexDump.toHex(  getMinimumCategory ()))
-            .append(" (").append( getMinimumCategory() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .maximumCategory      = ")
-            .append("0x").append(HexDump.toHex(  getMaximumCategory ()))
-            .append(" (").append( getMaximumCategory() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .majorUnitValue       = ")
-            .append("0x").append(HexDump.toHex(  getMajorUnitValue ()))
-            .append(" (").append( getMajorUnitValue() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .majorUnit            = ")
-            .append("0x").append(HexDump.toHex(  getMajorUnit ()))
-            .append(" (").append( getMajorUnit() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .minorUnitValue       = ")
-            .append("0x").append(HexDump.toHex(  getMinorUnitValue ()))
-            .append(" (").append( getMinorUnitValue() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .minorUnit            = ")
-            .append("0x").append(HexDump.toHex(  getMinorUnit ()))
-            .append(" (").append( getMinorUnit() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .baseUnit             = ")
-            .append("0x").append(HexDump.toHex(  getBaseUnit ()))
-            .append(" (").append( getBaseUnit() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .crossingPoint        = ")
-            .append("0x").append(HexDump.toHex(  getCrossingPoint ()))
-            .append(" (").append( getCrossingPoint() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options              = ")
-            .append("0x").append(HexDump.toHex(  getOptions ()))
-            .append(" (").append( getOptions() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .defaultMinimum           = ").append(isDefaultMinimum()).append('\n'); 
-        buffer.append("         .defaultMaximum           = ").append(isDefaultMaximum()).append('\n'); 
-        buffer.append("         .defaultMajor             = ").append(isDefaultMajor()).append('\n'); 
-        buffer.append("         .defaultMinorUnit         = ").append(isDefaultMinorUnit()).append('\n'); 
-        buffer.append("         .isDate                   = ").append(isIsDate()).append('\n'); 
-        buffer.append("         .defaultBase              = ").append(isDefaultBase()).append('\n'); 
-        buffer.append("         .defaultCross             = ").append(isDefaultCross()).append('\n'); 
-        buffer.append("         .defaultDateSettings      = ").append(isDefaultDateSettings()).append('\n'); 
-
-        buffer.append("[/AXCEXT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_minimumCategory);
-        out.writeShort(field_2_maximumCategory);
-        out.writeShort(field_3_majorUnitValue);
-        out.writeShort(field_4_majorUnit);
-        out.writeShort(field_5_minorUnitValue);
-        out.writeShort(field_6_minorUnit);
-        out.writeShort(field_7_baseUnit);
-        out.writeShort(field_8_crossingPoint);
-        out.writeShort(field_9_options);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AxisOptionsRecord clone() {
-        AxisOptionsRecord rec = new AxisOptionsRecord();
-    
-        rec.field_1_minimumCategory = field_1_minimumCategory;
-        rec.field_2_maximumCategory = field_2_maximumCategory;
-        rec.field_3_majorUnitValue = field_3_majorUnitValue;
-        rec.field_4_majorUnit = field_4_majorUnit;
-        rec.field_5_minorUnitValue = field_5_minorUnitValue;
-        rec.field_6_minorUnit = field_6_minorUnit;
-        rec.field_7_baseUnit = field_7_baseUnit;
-        rec.field_8_crossingPoint = field_8_crossingPoint;
-        rec.field_9_options = field_9_options;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the minimum category field for the AxisOptions record.
-     */
-    public short getMinimumCategory()
-    {
-        return field_1_minimumCategory;
-    }
-
-    /**
-     * Set the minimum category field for the AxisOptions record.
-     */
-    public void setMinimumCategory(short field_1_minimumCategory)
-    {
-        this.field_1_minimumCategory = field_1_minimumCategory;
-    }
-
-    /**
-     * Get the maximum category field for the AxisOptions record.
-     */
-    public short getMaximumCategory()
-    {
-        return field_2_maximumCategory;
-    }
-
-    /**
-     * Set the maximum category field for the AxisOptions record.
-     */
-    public void setMaximumCategory(short field_2_maximumCategory)
-    {
-        this.field_2_maximumCategory = field_2_maximumCategory;
-    }
-
-    /**
-     * Get the major unit value field for the AxisOptions record.
-     */
-    public short getMajorUnitValue()
-    {
-        return field_3_majorUnitValue;
-    }
-
-    /**
-     * Set the major unit value field for the AxisOptions record.
-     */
-    public void setMajorUnitValue(short field_3_majorUnitValue)
-    {
-        this.field_3_majorUnitValue = field_3_majorUnitValue;
-    }
-
-    /**
-     * Get the major unit field for the AxisOptions record.
-     */
-    public short getMajorUnit()
-    {
-        return field_4_majorUnit;
-    }
-
-    /**
-     * Set the major unit field for the AxisOptions record.
-     */
-    public void setMajorUnit(short field_4_majorUnit)
-    {
-        this.field_4_majorUnit = field_4_majorUnit;
-    }
-
-    /**
-     * Get the minor unit value field for the AxisOptions record.
-     */
-    public short getMinorUnitValue()
-    {
-        return field_5_minorUnitValue;
-    }
-
-    /**
-     * Set the minor unit value field for the AxisOptions record.
-     */
-    public void setMinorUnitValue(short field_5_minorUnitValue)
-    {
-        this.field_5_minorUnitValue = field_5_minorUnitValue;
-    }
-
-    /**
-     * Get the minor unit field for the AxisOptions record.
-     */
-    public short getMinorUnit()
-    {
-        return field_6_minorUnit;
-    }
-
-    /**
-     * Set the minor unit field for the AxisOptions record.
-     */
-    public void setMinorUnit(short field_6_minorUnit)
-    {
-        this.field_6_minorUnit = field_6_minorUnit;
-    }
-
-    /**
-     * Get the base unit field for the AxisOptions record.
-     */
-    public short getBaseUnit()
-    {
-        return field_7_baseUnit;
-    }
-
-    /**
-     * Set the base unit field for the AxisOptions record.
-     */
-    public void setBaseUnit(short field_7_baseUnit)
-    {
-        this.field_7_baseUnit = field_7_baseUnit;
-    }
-
-    /**
-     * Get the crossing point field for the AxisOptions record.
-     */
-    public short getCrossingPoint()
-    {
-        return field_8_crossingPoint;
-    }
-
-    /**
-     * Set the crossing point field for the AxisOptions record.
-     */
-    public void setCrossingPoint(short field_8_crossingPoint)
-    {
-        this.field_8_crossingPoint = field_8_crossingPoint;
-    }
-
-    /**
-     * Get the options field for the AxisOptions record.
-     */
-    public short getOptions()
-    {
-        return field_9_options;
-    }
-
-    /**
-     * Set the options field for the AxisOptions record.
-     */
-    public void setOptions(short field_9_options)
-    {
-        this.field_9_options = field_9_options;
-    }
-
-    /**
-     * Sets the default minimum field value.
-     * use the default minimum category
-     */
-    public void setDefaultMinimum(boolean value)
-    {
-        field_9_options = defaultMinimum.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * use the default minimum category
-     * @return  the default minimum field value.
-     */
-    public boolean isDefaultMinimum()
-    {
-        return defaultMinimum.isSet(field_9_options);
-    }
-
-    /**
-     * Sets the default maximum field value.
-     * use the default maximum category
-     */
-    public void setDefaultMaximum(boolean value)
-    {
-        field_9_options = defaultMaximum.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * use the default maximum category
-     * @return  the default maximum field value.
-     */
-    public boolean isDefaultMaximum()
-    {
-        return defaultMaximum.isSet(field_9_options);
-    }
-
-    /**
-     * Sets the default major field value.
-     * use the default major unit
-     */
-    public void setDefaultMajor(boolean value)
-    {
-        field_9_options = defaultMajor.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * use the default major unit
-     * @return  the default major field value.
-     */
-    public boolean isDefaultMajor()
-    {
-        return defaultMajor.isSet(field_9_options);
-    }
-
-    /**
-     * Sets the default minor unit field value.
-     * use the default minor unit
-     */
-    public void setDefaultMinorUnit(boolean value)
-    {
-        field_9_options = defaultMinorUnit.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * use the default minor unit
-     * @return  the default minor unit field value.
-     */
-    public boolean isDefaultMinorUnit()
-    {
-        return defaultMinorUnit.isSet(field_9_options);
-    }
-
-    /**
-     * Sets the isDate field value.
-     * this is a date axis
-     */
-    public void setIsDate(boolean value)
-    {
-        field_9_options = isDate.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * this is a date axis
-     * @return  the isDate field value.
-     */
-    public boolean isIsDate()
-    {
-        return isDate.isSet(field_9_options);
-    }
-
-    /**
-     * Sets the default base field value.
-     * use the default base unit
-     */
-    public void setDefaultBase(boolean value)
-    {
-        field_9_options = defaultBase.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * use the default base unit
-     * @return  the default base field value.
-     */
-    public boolean isDefaultBase()
-    {
-        return defaultBase.isSet(field_9_options);
-    }
-
-    /**
-     * Sets the default cross field value.
-     * use the default crossing point
-     */
-    public void setDefaultCross(boolean value)
-    {
-        field_9_options = defaultCross.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * use the default crossing point
-     * @return  the default cross field value.
-     */
-    public boolean isDefaultCross()
-    {
-        return defaultCross.isSet(field_9_options);
-    }
-
-    /**
-     * Sets the default date settings field value.
-     * use default date setttings for this axis
-     */
-    public void setDefaultDateSettings(boolean value)
-    {
-        field_9_options = defaultDateSettings.setShortBoolean(field_9_options, value);
-    }
-
-    /**
-     * use default date setttings for this axis
-     * @return  the default date settings field value.
-     */
-    public boolean isDefaultDateSettings()
-    {
-        return defaultDateSettings.isSet(field_9_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
deleted file mode 100644
index 8cf8fdb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The axis size and location<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class AxisParentRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x1041;
-    private  short      field_1_axisType;
-    public final static short       AXIS_TYPE_MAIN                 = 0;
-    public final static short       AXIS_TYPE_SECONDARY            = 1;
-    private  int        field_2_x;
-    private  int        field_3_y;
-    private  int        field_4_width;
-    private  int        field_5_height;
-
-
-    public AxisParentRecord()
-    {
-
-    }
-
-    public AxisParentRecord(RecordInputStream in)
-    {
-        field_1_axisType               = in.readShort();
-        field_2_x                      = in.readInt();
-        field_3_y                      = in.readInt();
-        field_4_width                  = in.readInt();
-        field_5_height                 = in.readInt();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AXISPARENT]\n");
-        buffer.append("    .axisType             = ")
-            .append("0x").append(HexDump.toHex(  getAxisType ()))
-            .append(" (").append( getAxisType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .x                    = ")
-            .append("0x").append(HexDump.toHex(  getX ()))
-            .append(" (").append( getX() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .y                    = ")
-            .append("0x").append(HexDump.toHex(  getY ()))
-            .append(" (").append( getY() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .width                = ")
-            .append("0x").append(HexDump.toHex(  getWidth ()))
-            .append(" (").append( getWidth() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .height               = ")
-            .append("0x").append(HexDump.toHex(  getHeight ()))
-            .append(" (").append( getHeight() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/AXISPARENT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_axisType);
-        out.writeInt(field_2_x);
-        out.writeInt(field_3_y);
-        out.writeInt(field_4_width);
-        out.writeInt(field_5_height);
-    }
-
-    protected int getDataSize() {
-        return 2 + 4 + 4 + 4 + 4;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AxisParentRecord clone() {
-        AxisParentRecord rec = new AxisParentRecord();
-    
-        rec.field_1_axisType = field_1_axisType;
-        rec.field_2_x = field_2_x;
-        rec.field_3_y = field_3_y;
-        rec.field_4_width = field_4_width;
-        rec.field_5_height = field_5_height;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the axis type field for the AxisParent record.
-     *
-     * @return  One of 
-     *        AXIS_TYPE_MAIN
-     *        AXIS_TYPE_SECONDARY
-     */
-    public short getAxisType()
-    {
-        return field_1_axisType;
-    }
-
-    /**
-     * Set the axis type field for the AxisParent record.
-     *
-     * @param field_1_axisType
-     *        One of 
-     *        AXIS_TYPE_MAIN
-     *        AXIS_TYPE_SECONDARY
-     */
-    public void setAxisType(short field_1_axisType)
-    {
-        this.field_1_axisType = field_1_axisType;
-    }
-
-    /**
-     * Get the x field for the AxisParent record.
-     */
-    public int getX()
-    {
-        return field_2_x;
-    }
-
-    /**
-     * Set the x field for the AxisParent record.
-     */
-    public void setX(int field_2_x)
-    {
-        this.field_2_x = field_2_x;
-    }
-
-    /**
-     * Get the y field for the AxisParent record.
-     */
-    public int getY()
-    {
-        return field_3_y;
-    }
-
-    /**
-     * Set the y field for the AxisParent record.
-     */
-    public void setY(int field_3_y)
-    {
-        this.field_3_y = field_3_y;
-    }
-
-    /**
-     * Get the width field for the AxisParent record.
-     */
-    public int getWidth()
-    {
-        return field_4_width;
-    }
-
-    /**
-     * Set the width field for the AxisParent record.
-     */
-    public void setWidth(int field_4_width)
-    {
-        this.field_4_width = field_4_width;
-    }
-
-    /**
-     * Get the height field for the AxisParent record.
-     */
-    public int getHeight()
-    {
-        return field_5_height;
-    }
-
-    /**
-     * Set the height field for the AxisParent record.
-     */
-    public void setHeight(int field_5_height)
-    {
-        this.field_5_height = field_5_height;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
deleted file mode 100644
index 42aefb4..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The axis record defines the type of an axis.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class AxisRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x101d;
-    private  short      field_1_axisType;
-    public final static short       AXIS_TYPE_CATEGORY_OR_X_AXIS   = 0;
-    public final static short       AXIS_TYPE_VALUE_AXIS           = 1;
-    public final static short       AXIS_TYPE_SERIES_AXIS          = 2;
-    private  int        field_2_reserved1;
-    private  int        field_3_reserved2;
-    private  int        field_4_reserved3;
-    private  int        field_5_reserved4;
-
-
-    public AxisRecord()
-    {
-
-    }
-
-    public AxisRecord(RecordInputStream in)
-    {
-        field_1_axisType               = in.readShort();
-        field_2_reserved1              = in.readInt();
-        field_3_reserved2              = in.readInt();
-        field_4_reserved3              = in.readInt();
-        field_5_reserved4              = in.readInt();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AXIS]\n");
-        buffer.append("    .axisType             = ")
-            .append("0x").append(HexDump.toHex(  getAxisType ()))
-            .append(" (").append( getAxisType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .reserved1            = ")
-            .append("0x").append(HexDump.toHex(  getReserved1 ()))
-            .append(" (").append( getReserved1() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .reserved2            = ")
-            .append("0x").append(HexDump.toHex(  getReserved2 ()))
-            .append(" (").append( getReserved2() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .reserved3            = ")
-            .append("0x").append(HexDump.toHex(  getReserved3 ()))
-            .append(" (").append( getReserved3() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .reserved4            = ")
-            .append("0x").append(HexDump.toHex(  getReserved4 ()))
-            .append(" (").append( getReserved4() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/AXIS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_axisType);
-        out.writeInt(field_2_reserved1);
-        out.writeInt(field_3_reserved2);
-        out.writeInt(field_4_reserved3);
-        out.writeInt(field_5_reserved4);
-    }
-
-    protected int getDataSize() {
-        return 2 + 4 + 4 + 4 + 4;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AxisRecord clone() {
-        AxisRecord rec = new AxisRecord();
-    
-        rec.field_1_axisType = field_1_axisType;
-        rec.field_2_reserved1 = field_2_reserved1;
-        rec.field_3_reserved2 = field_3_reserved2;
-        rec.field_4_reserved3 = field_4_reserved3;
-        rec.field_5_reserved4 = field_5_reserved4;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the axis type field for the Axis record.
-     *
-     * @return  One of 
-     *        AXIS_TYPE_CATEGORY_OR_X_AXIS
-     *        AXIS_TYPE_VALUE_AXIS
-     *        AXIS_TYPE_SERIES_AXIS
-     */
-    public short getAxisType()
-    {
-        return field_1_axisType;
-    }
-
-    /**
-     * Set the axis type field for the Axis record.
-     *
-     * @param field_1_axisType
-     *        One of 
-     *        AXIS_TYPE_CATEGORY_OR_X_AXIS
-     *        AXIS_TYPE_VALUE_AXIS
-     *        AXIS_TYPE_SERIES_AXIS
-     */
-    public void setAxisType(short field_1_axisType)
-    {
-        this.field_1_axisType = field_1_axisType;
-    }
-
-    /**
-     * Get the reserved1 field for the Axis record.
-     */
-    public int getReserved1()
-    {
-        return field_2_reserved1;
-    }
-
-    /**
-     * Set the reserved1 field for the Axis record.
-     */
-    public void setReserved1(int field_2_reserved1)
-    {
-        this.field_2_reserved1 = field_2_reserved1;
-    }
-
-    /**
-     * Get the reserved2 field for the Axis record.
-     */
-    public int getReserved2()
-    {
-        return field_3_reserved2;
-    }
-
-    /**
-     * Set the reserved2 field for the Axis record.
-     */
-    public void setReserved2(int field_3_reserved2)
-    {
-        this.field_3_reserved2 = field_3_reserved2;
-    }
-
-    /**
-     * Get the reserved3 field for the Axis record.
-     */
-    public int getReserved3()
-    {
-        return field_4_reserved3;
-    }
-
-    /**
-     * Set the reserved3 field for the Axis record.
-     */
-    public void setReserved3(int field_4_reserved3)
-    {
-        this.field_4_reserved3 = field_4_reserved3;
-    }
-
-    /**
-     * Get the reserved4 field for the Axis record.
-     */
-    public int getReserved4()
-    {
-        return field_5_reserved4;
-    }
-
-    /**
-     * Set the reserved4 field for the Axis record.
-     */
-    public void setReserved4(int field_5_reserved4)
-    {
-        this.field_5_reserved4 = field_5_reserved4;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
deleted file mode 100644
index baca15b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The number of axes used on a chart.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class AxisUsedRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x1046;
-    private  short      field_1_numAxis;
-
-
-    public AxisUsedRecord()
-    {
-
-    }
-
-    public AxisUsedRecord(RecordInputStream in)
-    {
-        field_1_numAxis                = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AXISUSED]\n");
-        buffer.append("    .numAxis              = ")
-            .append("0x").append(HexDump.toHex(  getNumAxis ()))
-            .append(" (").append( getNumAxis() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/AXISUSED]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_numAxis);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public AxisUsedRecord clone() {
-        AxisUsedRecord rec = new AxisUsedRecord();
-    
-        rec.field_1_numAxis = field_1_numAxis;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the num axis field for the AxisUsed record.
-     */
-    public short getNumAxis()
-    {
-        return field_1_numAxis;
-    }
-
-    /**
-     * Set the num axis field for the AxisUsed record.
-     */
-    public void setNumAxis(short field_1_numAxis)
-    {
-        this.field_1_numAxis = field_1_numAxis;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
deleted file mode 100644
index 72d418c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The bar record is used to define a bar chart.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class BarRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1017;
-
-    private static final BitField   horizontal          = BitFieldFactory.getInstance(0x1);
-    private static final BitField   stacked             = BitFieldFactory.getInstance(0x2);
-    private static final BitField   displayAsPercentage = BitFieldFactory.getInstance(0x4);
-    private static final BitField   shadow              = BitFieldFactory.getInstance(0x8);
-
-    private  short      field_1_barSpace;
-    private  short      field_2_categorySpace;
-    private  short      field_3_formatFlags;
-
-
-    public BarRecord()
-    {
-
-    }
-
-    public BarRecord(RecordInputStream in)
-    {
-        field_1_barSpace               = in.readShort();
-        field_2_categorySpace          = in.readShort();
-        field_3_formatFlags            = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[BAR]\n");
-        buffer.append("    .barSpace             = ")
-            .append("0x").append(HexDump.toHex(  getBarSpace ()))
-            .append(" (").append( getBarSpace() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .categorySpace        = ")
-            .append("0x").append(HexDump.toHex(  getCategorySpace ()))
-            .append(" (").append( getCategorySpace() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .formatFlags          = ")
-            .append("0x").append(HexDump.toHex(  getFormatFlags ()))
-            .append(" (").append( getFormatFlags() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .horizontal               = ").append(isHorizontal()).append('\n'); 
-        buffer.append("         .stacked                  = ").append(isStacked()).append('\n'); 
-        buffer.append("         .displayAsPercentage      = ").append(isDisplayAsPercentage()).append('\n'); 
-        buffer.append("         .shadow                   = ").append(isShadow()).append('\n'); 
-
-        buffer.append("[/BAR]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_barSpace);
-        out.writeShort(field_2_categorySpace);
-        out.writeShort(field_3_formatFlags);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public BarRecord clone() {
-        BarRecord rec = new BarRecord();
-    
-        rec.field_1_barSpace = field_1_barSpace;
-        rec.field_2_categorySpace = field_2_categorySpace;
-        rec.field_3_formatFlags = field_3_formatFlags;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the bar space field for the Bar record.
-     */
-    public short getBarSpace()
-    {
-        return field_1_barSpace;
-    }
-
-    /**
-     * Set the bar space field for the Bar record.
-     */
-    public void setBarSpace(short field_1_barSpace)
-    {
-        this.field_1_barSpace = field_1_barSpace;
-    }
-
-    /**
-     * Get the category space field for the Bar record.
-     */
-    public short getCategorySpace()
-    {
-        return field_2_categorySpace;
-    }
-
-    /**
-     * Set the category space field for the Bar record.
-     */
-    public void setCategorySpace(short field_2_categorySpace)
-    {
-        this.field_2_categorySpace = field_2_categorySpace;
-    }
-
-    /**
-     * Get the format flags field for the Bar record.
-     */
-    public short getFormatFlags()
-    {
-        return field_3_formatFlags;
-    }
-
-    /**
-     * Set the format flags field for the Bar record.
-     */
-    public void setFormatFlags(short field_3_formatFlags)
-    {
-        this.field_3_formatFlags = field_3_formatFlags;
-    }
-
-    /**
-     * Sets the horizontal field value.
-     * true to display horizontal bar charts, false for vertical
-     */
-    public void setHorizontal(boolean value)
-    {
-        field_3_formatFlags = horizontal.setShortBoolean(field_3_formatFlags, value);
-    }
-
-    /**
-     * true to display horizontal bar charts, false for vertical
-     * @return  the horizontal field value.
-     */
-    public boolean isHorizontal()
-    {
-        return horizontal.isSet(field_3_formatFlags);
-    }
-
-    /**
-     * Sets the stacked field value.
-     * stack displayed values
-     */
-    public void setStacked(boolean value)
-    {
-        field_3_formatFlags = stacked.setShortBoolean(field_3_formatFlags, value);
-    }
-
-    /**
-     * stack displayed values
-     * @return  the stacked field value.
-     */
-    public boolean isStacked()
-    {
-        return stacked.isSet(field_3_formatFlags);
-    }
-
-    /**
-     * Sets the display as percentage field value.
-     * display chart values as a percentage
-     */
-    public void setDisplayAsPercentage(boolean value)
-    {
-        field_3_formatFlags = displayAsPercentage.setShortBoolean(field_3_formatFlags, value);
-    }
-
-    /**
-     * display chart values as a percentage
-     * @return  the display as percentage field value.
-     */
-    public boolean isDisplayAsPercentage()
-    {
-        return displayAsPercentage.isSet(field_3_formatFlags);
-    }
-
-    /**
-     * Sets the shadow field value.
-     * display a shadow for the chart
-     */
-    public void setShadow(boolean value)
-    {
-        field_3_formatFlags = shadow.setShortBoolean(field_3_formatFlags, value);
-    }
-
-    /**
-     * display a shadow for the chart
-     * @return  the shadow field value.
-     */
-    public boolean isShadow()
-    {
-        return shadow.isSet(field_3_formatFlags);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
deleted file mode 100644
index 88a7efc..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The begin record defines the start of a block of records for a (grpahing
- * data object. This record is matched with a corresponding EndRecord.
- *
- * @see EndRecord
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class BeginRecord extends StandardRecord implements Cloneable {
-    public static final short sid = 0x1033;
-
-    public BeginRecord()
-    {
-    }
-
-    /**
-     * @param in unused (since this record has no data)
-     */
-    public BeginRecord(RecordInputStream in)
-    {
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[BEGIN]\n");
-        buffer.append("[/BEGIN]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-    }
-
-    protected int getDataSize() {
-        return 0;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-    
-    @Override
-    public BeginRecord clone() {
-       BeginRecord br = new BeginRecord();
-       // No data so nothing to copy
-       return br;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/CatLabRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
deleted file mode 100644
index 92f3b55..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * CATLAB - Category Labels (0x0856)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class CatLabRecord extends StandardRecord {
-	public static final short sid = 0x0856;
-	
-	private short rt;
-	private short grbitFrt;
-	private short wOffset;
-	private short at;
-	private short grbit;
-	private Short unused;
-	
-	public CatLabRecord(RecordInputStream in) {
-		rt = in.readShort();
-		grbitFrt = in.readShort();
-		wOffset = in.readShort();
-		at = in.readShort();
-		grbit = in.readShort();
-		
-		// Often, but not always has an unused short at the end
-		if(in.available() == 0) {
-			unused = null;
-		} else {
-			unused = in.readShort();
-		}
-	}
-	
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 2 + 2 + 2 + (unused==null? 0:2);
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.writeShort(wOffset);
-		out.writeShort(at);
-		out.writeShort(grbit);
-		if(unused != null)
-			out.writeShort(unused);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[CATLAB]\n");
-		buffer.append("    .rt      =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt=").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .wOffset =").append(HexDump.shortToHex(wOffset)).append('\n');
-		buffer.append("    .at      =").append(HexDump.shortToHex(at)).append('\n');
-		buffer.append("    .grbit   =").append(HexDump.shortToHex(grbit)).append('\n');
-		if(unused != null)
-			buffer.append("    .unused  =").append(HexDump.shortToHex(unused)).append('\n');
-
-		buffer.append("[/CATLAB]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
deleted file mode 100644
index 6e8216a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * This record refers to a category or series axis and is used to specify label/tickmark frequency.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class CategorySeriesAxisRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1020;
-
-    private static final BitField valueAxisCrossing = BitFieldFactory.getInstance(0x1);
-    private static final BitField crossesFarRight   = BitFieldFactory.getInstance(0x2);
-    private static final BitField reversed          = BitFieldFactory.getInstance(0x4);
-    
-    private  short      field_1_crossingPoint;
-    private  short      field_2_labelFrequency;
-    private  short      field_3_tickMarkFrequency;
-    private  short      field_4_options;
-
-
-    public CategorySeriesAxisRecord()
-    {
-
-    }
-
-    public CategorySeriesAxisRecord(RecordInputStream in)
-    {
-        field_1_crossingPoint          = in.readShort();
-        field_2_labelFrequency         = in.readShort();
-        field_3_tickMarkFrequency      = in.readShort();
-        field_4_options                = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[CATSERRANGE]\n");
-        buffer.append("    .crossingPoint        = ")
-            .append("0x").append(HexDump.toHex(  getCrossingPoint ()))
-            .append(" (").append( getCrossingPoint() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .labelFrequency       = ")
-            .append("0x").append(HexDump.toHex(  getLabelFrequency ()))
-            .append(" (").append( getLabelFrequency() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .tickMarkFrequency    = ")
-            .append("0x").append(HexDump.toHex(  getTickMarkFrequency ()))
-            .append(" (").append( getTickMarkFrequency() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options              = ")
-            .append("0x").append(HexDump.toHex(  getOptions ()))
-            .append(" (").append( getOptions() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .valueAxisCrossing        = ").append(isValueAxisCrossing()).append('\n'); 
-        buffer.append("         .crossesFarRight          = ").append(isCrossesFarRight()).append('\n'); 
-        buffer.append("         .reversed                 = ").append(isReversed()).append('\n'); 
-
-        buffer.append("[/CATSERRANGE]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_crossingPoint);
-        out.writeShort(field_2_labelFrequency);
-        out.writeShort(field_3_tickMarkFrequency);
-        out.writeShort(field_4_options);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public CategorySeriesAxisRecord clone() {
-        CategorySeriesAxisRecord rec = new CategorySeriesAxisRecord();
-    
-        rec.field_1_crossingPoint = field_1_crossingPoint;
-        rec.field_2_labelFrequency = field_2_labelFrequency;
-        rec.field_3_tickMarkFrequency = field_3_tickMarkFrequency;
-        rec.field_4_options = field_4_options;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the crossing point field for the CategorySeriesAxis record.
-     */
-    public short getCrossingPoint()
-    {
-        return field_1_crossingPoint;
-    }
-
-    /**
-     * Set the crossing point field for the CategorySeriesAxis record.
-     */
-    public void setCrossingPoint(short field_1_crossingPoint)
-    {
-        this.field_1_crossingPoint = field_1_crossingPoint;
-    }
-
-    /**
-     * Get the label frequency field for the CategorySeriesAxis record.
-     */
-    public short getLabelFrequency()
-    {
-        return field_2_labelFrequency;
-    }
-
-    /**
-     * Set the label frequency field for the CategorySeriesAxis record.
-     */
-    public void setLabelFrequency(short field_2_labelFrequency)
-    {
-        this.field_2_labelFrequency = field_2_labelFrequency;
-    }
-
-    /**
-     * Get the tick mark frequency field for the CategorySeriesAxis record.
-     */
-    public short getTickMarkFrequency()
-    {
-        return field_3_tickMarkFrequency;
-    }
-
-    /**
-     * Set the tick mark frequency field for the CategorySeriesAxis record.
-     */
-    public void setTickMarkFrequency(short field_3_tickMarkFrequency)
-    {
-        this.field_3_tickMarkFrequency = field_3_tickMarkFrequency;
-    }
-
-    /**
-     * Get the options field for the CategorySeriesAxis record.
-     */
-    public short getOptions()
-    {
-        return field_4_options;
-    }
-
-    /**
-     * Set the options field for the CategorySeriesAxis record.
-     */
-    public void setOptions(short field_4_options)
-    {
-        this.field_4_options = field_4_options;
-    }
-
-    /**
-     * Sets the value axis crossing field value.
-     * set true to indicate axis crosses between categories and false to cross axis midway
-     */
-    public void setValueAxisCrossing(boolean value)
-    {
-        field_4_options = valueAxisCrossing.setShortBoolean(field_4_options, value);
-    }
-
-    /**
-     * set true to indicate axis crosses between categories and false to cross axis midway
-     * @return  the value axis crossing field value.
-     */
-    public boolean isValueAxisCrossing()
-    {
-        return valueAxisCrossing.isSet(field_4_options);
-    }
-
-    /**
-     * Sets the crosses far right field value.
-     * axis crosses at the far right
-     */
-    public void setCrossesFarRight(boolean value)
-    {
-        field_4_options = crossesFarRight.setShortBoolean(field_4_options, value);
-    }
-
-    /**
-     * axis crosses at the far right
-     * @return  the crosses far right field value.
-     */
-    public boolean isCrossesFarRight()
-    {
-        return crossesFarRight.isSet(field_4_options);
-    }
-
-    /**
-     * Sets the reversed field value.
-     * categories are displayed in reverse order
-     */
-    public void setReversed(boolean value)
-    {
-        field_4_options = reversed.setShortBoolean(field_4_options, value);
-    }
-
-    /**
-     * categories are displayed in reverse order
-     * @return  the reversed field value.
-     */
-    public boolean isReversed()
-    {
-        return reversed.isSet(field_4_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
deleted file mode 100644
index 4354b01..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ENDBLOCK - Chart Future Record Type End Block (0x0853)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class ChartEndBlockRecord extends StandardRecord implements Cloneable {
-	public static final short sid = 0x0853;
-
-	private short rt;
-	private short grbitFrt;
-	private short iObjectKind;
-	private byte[] unused;
-
-	public ChartEndBlockRecord() {
-	}
-	
-	public ChartEndBlockRecord(RecordInputStream in) {
-		rt = in.readShort();
-		grbitFrt = in.readShort();
-		iObjectKind = in.readShort();
-
-		// Often, but not always has 6 unused bytes at the end
-		if(in.available() == 0) {
-			unused = new byte[0];
-		} else {
-			unused = new byte[6];
-			in.readFully(unused);
-		}
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 2 + unused.length;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.writeShort(iObjectKind);
-		// 6 bytes unused
-		out.write(unused);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[ENDBLOCK]\n");
-		buffer.append("    .rt         =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt   =").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .iObjectKind=").append(HexDump.shortToHex(iObjectKind)).append('\n');
-		buffer.append("    .unused     =").append(HexDump.toHex(unused)).append('\n');
-		buffer.append("[/ENDBLOCK]\n");
-		return buffer.toString();
-	}
-	
-	@Override
-	public ChartEndBlockRecord clone() {
-		ChartEndBlockRecord record = new ChartEndBlockRecord();
-		
-		record.rt = rt ;
-		record.grbitFrt = grbitFrt ;
-		record.iObjectKind = iObjectKind ;
-		record.unused = unused.clone() ;
-		
-		return record;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
deleted file mode 100644
index 49de239..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ENDOBJECT - Chart Future Record Type End Object (0x0855)
- */
-public final class ChartEndObjectRecord extends StandardRecord {
-	public static final short sid = 0x0855;
-
-	private short rt;
-	private short grbitFrt;
-	private short iObjectKind;
-	private byte[] reserved;
-
-	public ChartEndObjectRecord(RecordInputStream in) {
-		rt = in.readShort();
-		grbitFrt = in.readShort();
-		iObjectKind = in.readShort();
-
-		// The spec says that there should be 6 bytes at the
-		//  end, which must be there and must be zero
-		// However, sometimes Excel forgets them...
-		reserved = new byte[6];
-		if(in.available() == 0) {
-		   // They've gone missing...
-		} else {
-		   // Read the reserved bytes 
-		   in.readFully(reserved);
-		}
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 2 + 6;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.writeShort(iObjectKind);
-		// 6 bytes unused
-		out.write(reserved);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[ENDOBJECT]\n");
-		buffer.append("    .rt         =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt   =").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .iObjectKind=").append(HexDump.shortToHex(iObjectKind)).append('\n');
-		buffer.append("    .reserved   =").append(HexDump.toHex(reserved)).append('\n');
-		buffer.append("[/ENDOBJECT]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
deleted file mode 100644
index 83b135c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * CHARTFRTINFO - Chart Future Record Type Info (0x0850)
- */
-public final class ChartFRTInfoRecord extends StandardRecord {
-	public static final short sid = 0x850;
-
-	private short rt;
-	private short grbitFrt;
-	private byte verOriginator;
-	private byte verWriter;
-	private CFRTID[] rgCFRTID;
-
-	private static final class CFRTID {
-		public static final int ENCODED_SIZE = 4;
-		private int rtFirst;
-		private int rtLast;
-
-		public CFRTID(LittleEndianInput in) {
-			rtFirst = in.readShort();
-			rtLast = in.readShort();
-		}
-
-		public void serialize(LittleEndianOutput out) {
-			out.writeShort(rtFirst);
-			out.writeShort(rtLast);
-		}
-	}
-
-	public ChartFRTInfoRecord(RecordInputStream in) {
-		rt = in.readShort();
-		grbitFrt = in.readShort();
-		verOriginator = in.readByte();
-		verWriter = in.readByte();
-		int cCFRTID = in.readShort();
-
-		rgCFRTID = new CFRTID[cCFRTID];
-		for (int i = 0; i < cCFRTID; i++) {
-			rgCFRTID[i] = new CFRTID(in);
-		}
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 1 + 1 + 2 + rgCFRTID.length * CFRTID.ENCODED_SIZE;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.writeByte(verOriginator);
-		out.writeByte(verWriter);
-		int nCFRTIDs = rgCFRTID.length;
-		out.writeShort(nCFRTIDs);
-
-		for (int i = 0; i < nCFRTIDs; i++) {
-			rgCFRTID[i].serialize(out);
-		}
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[CHARTFRTINFO]\n");
-		buffer.append("    .rt           =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt     =").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .verOriginator=").append(HexDump.byteToHex(verOriginator)).append('\n');
-		buffer.append("    .verWriter    =").append(HexDump.byteToHex(verOriginator)).append('\n');
-		buffer.append("    .nCFRTIDs     =").append(HexDump.shortToHex(rgCFRTID.length)).append('\n');
-		buffer.append("[/CHARTFRTINFO]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
deleted file mode 100644
index 326e405..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Class ChartFormatRecord (0x1014)<p>
- *
- * (As with all chart related records, documentation is lacking.
- * See {@link ChartRecord} for more details)
- */
-public final class ChartFormatRecord extends StandardRecord {
-    public static final short sid = 0x1014;
-
-    private static final BitField varyDisplayPattern = BitFieldFactory.getInstance(0x01);
-
-    // ignored?
-    private int field1_x_position; // lower left
-    private int field2_y_position; // lower left
-    private int field3_width;
-    private int field4_height;
-    private int field5_grbit;
-    private int field6_unknown;
-
-    public ChartFormatRecord() {
-        // fields uninitialised
-    }
-
-    public ChartFormatRecord(RecordInputStream in) {
-        field1_x_position = in.readInt();
-        field2_y_position = in.readInt();
-        field3_width = in.readInt();
-        field4_height = in.readInt();
-        field5_grbit = in.readUShort();
-        field6_unknown = in.readUShort();
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[CHARTFORMAT]\n");
-        buffer.append("    .xPosition       = ").append(getXPosition()).append("\n");
-        buffer.append("    .yPosition       = ").append(getYPosition()).append("\n");
-        buffer.append("    .width           = ").append(getWidth()).append("\n");
-        buffer.append("    .height          = ").append(getHeight()).append("\n");
-        buffer.append("    .grBit           = ").append(HexDump.intToHex(field5_grbit)).append("\n");
-        buffer.append("[/CHARTFORMAT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(getXPosition());
-        out.writeInt(getYPosition());
-        out.writeInt(getWidth());
-        out.writeInt(getHeight());
-        out.writeShort(field5_grbit);
-        out.writeShort(field6_unknown);
-    }
-
-    protected int getDataSize() {
-        return 20; // 4 ints and 2 shorts
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public int getXPosition() {
-        return field1_x_position;
-    }
-
-    public void setXPosition(int xPosition) {
-        field1_x_position = xPosition;
-    }
-
-    public int getYPosition() {
-        return field2_y_position;
-    }
-
-    public void setYPosition(int yPosition) {
-        field2_y_position = yPosition;
-    }
-
-    public int getWidth() {
-        return field3_width;
-    }
-
-    public void setWidth(int width) {
-        field3_width = width;
-    }
-
-    public int getHeight() {
-        return field4_height;
-    }
-
-    public void setHeight(int height) {
-        field4_height = height;
-    }
-
-    public boolean getVaryDisplayPattern() {
-        return varyDisplayPattern.isSet(field5_grbit);
-    }
-
-    public void setVaryDisplayPattern(boolean value) {
-        field5_grbit = varyDisplayPattern.setBoolean(field5_grbit, value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
deleted file mode 100644
index 8a4deeb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * CHART (0x1002)<p>
- * 
- * The chart record is used to define the location and size of a chart.<p>
- * 
- * Chart related records don't seem to be covered in either the 
- * <A HREF="http://sc.openoffice.org/excelfileformat.pdf">OOO</A> 
- *  or the  
- * <A HREF="http://download.microsoft.com/download/0/B/E/0BE8BDD7-E5E8-422A-ABFD-4342ED7AD886/Excel97-2007BinaryFileFormat(xls)Specification.pdf">MS</A> 
- *  documentation. 
- * 
- * The book "Microsoft Excel 97 Developer's Kit" ISBN: (1-57231-498-2) seems to have an entire
- * chapter (10) devoted to Chart records.  One  
- * <A HREF="http://ooxmlisdefectivebydesign.blogspot.com/2008/03/bad-surprise-in-microsoft-office-binary.html">blog</A>
- *  suggests that some documentation for these records is available in "MSDN Library, Feb 1998",
- * but no later.
- */
-public final class ChartRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1002;
-    private int field_1_x;
-    private int field_2_y;
-    private int field_3_width;
-    private int field_4_height;
-
-
-    public ChartRecord() {
-        // fields uninitialised
-    }
-
-    public ChartRecord(RecordInputStream in) {
-        field_1_x = in.readInt();
-        field_2_y = in.readInt();
-        field_3_width = in.readInt();
-        field_4_height = in.readInt();
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append("[CHART]\n");
-        sb.append("    .x     = ").append(getX()).append('\n');
-        sb.append("    .y     = ").append(getY()).append('\n');
-        sb.append("    .width = ").append(getWidth()).append('\n');
-        sb.append("    .height= ").append(getHeight()).append('\n');
-        sb.append("[/CHART]\n");
-        return sb.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(field_1_x);
-        out.writeInt(field_2_y);
-        out.writeInt(field_3_width);
-        out.writeInt(field_4_height);
-    }
-
-    protected int getDataSize() {
-        return 4 + 4 + 4 + 4;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public ChartRecord clone() {
-        ChartRecord rec = new ChartRecord();
-    
-        rec.field_1_x = field_1_x;
-        rec.field_2_y = field_2_y;
-        rec.field_3_width = field_3_width;
-        rec.field_4_height = field_4_height;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the x field for the Chart record.
-     */
-    public int getX() {
-        return field_1_x;
-    }
-
-    /**
-     * Set the x field for the Chart record.
-     */
-    public void setX(int x) {
-        field_1_x = x;
-    }
-
-    /**
-     * Get the y field for the Chart record.
-     */
-    public int getY() {
-        return field_2_y;
-    }
-
-    /**
-     * Set the y field for the Chart record.
-     */
-    public void setY(int y) {
-        field_2_y = y;
-    }
-
-    /**
-     * Get the width field for the Chart record.
-     */
-    public int getWidth() {
-        return field_3_width;
-    }
-
-    /**
-     * Set the width field for the Chart record.
-     */
-    public void setWidth(int width) {
-        field_3_width = width;
-    }
-
-    /**
-     * Get the height field for the Chart record.
-     */
-    public int getHeight() {
-        return field_4_height;
-    }
-
-    /**
-     * Set the height field for the Chart record.
-     */
-    public void setHeight(int height) {
-        field_4_height = height;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
deleted file mode 100644
index 80ef481..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * STARTBLOCK - Chart Future Record Type Start Block (0x0852)
- */
-public final class ChartStartBlockRecord extends StandardRecord implements Cloneable {
-	public static final short sid = 0x0852;
-
-	private short rt;
-	private short grbitFrt;
-	private short iObjectKind;
-	private short iObjectContext;
-	private short iObjectInstance1;
-	private short iObjectInstance2;
-
-	public ChartStartBlockRecord() {
-	}
-	
-	public ChartStartBlockRecord(RecordInputStream in) {
-		rt = in.readShort();
-		grbitFrt = in.readShort();
-		iObjectKind = in.readShort();
-		iObjectContext = in.readShort();
-		iObjectInstance1 = in.readShort();
-		iObjectInstance2 = in.readShort();
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 2 + 2 + 2 + 2;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.writeShort(iObjectKind);
-		out.writeShort(iObjectContext);
-		out.writeShort(iObjectInstance1);
-		out.writeShort(iObjectInstance2);
-	}
-
-	public String toString() {
-
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[STARTBLOCK]\n");
-		buffer.append("    .rt              =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt        =").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .iObjectKind     =").append(HexDump.shortToHex(iObjectKind)).append('\n');
-		buffer.append("    .iObjectContext  =").append(HexDump.shortToHex(iObjectContext)).append('\n');
-		buffer.append("    .iObjectInstance1=").append(HexDump.shortToHex(iObjectInstance1)).append('\n');
-		buffer.append("    .iObjectInstance2=").append(HexDump.shortToHex(iObjectInstance2)).append('\n');
-		buffer.append("[/STARTBLOCK]\n");
-		return buffer.toString();
-	}
-	
-	@Override
-	public ChartStartBlockRecord clone() {
-		ChartStartBlockRecord record = new ChartStartBlockRecord();
-		
-		record.rt = rt;
-		record.grbitFrt = grbitFrt;
-		record.iObjectKind = iObjectKind;
-		record.iObjectContext = iObjectContext;
-		record.iObjectInstance1 = iObjectInstance1;
-		record.iObjectInstance2 = iObjectInstance2;
-		
-		return record;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
deleted file mode 100644
index aa2ed5f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * STARTOBJECT - Chart Future Record Type Start Object (0x0854)
- */
-public final class ChartStartObjectRecord extends StandardRecord {
-	public static final short sid = 0x0854;
-
-	private short rt;
-	private short grbitFrt;
-	private short iObjectKind;
-	private short iObjectContext;
-	private short iObjectInstance1;
-	private short iObjectInstance2;
-
-	public ChartStartObjectRecord(RecordInputStream in) {
-		rt = in.readShort();
-		grbitFrt = in.readShort();
-		iObjectKind = in.readShort();
-		iObjectContext = in.readShort();
-		iObjectInstance1 = in.readShort();
-		iObjectInstance2 = in.readShort();
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 2 + 2 + 2 + 2;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.writeShort(iObjectKind);
-		out.writeShort(iObjectContext);
-		out.writeShort(iObjectInstance1);
-		out.writeShort(iObjectInstance2);
-	}
-
-	public String toString() {
-
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[STARTOBJECT]\n");
-		buffer.append("    .rt              =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt        =").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .iObjectKind     =").append(HexDump.shortToHex(iObjectKind)).append('\n');
-		buffer.append("    .iObjectContext  =").append(HexDump.shortToHex(iObjectContext)).append('\n');
-		buffer.append("    .iObjectInstance1=").append(HexDump.shortToHex(iObjectInstance1)).append('\n');
-		buffer.append("    .iObjectInstance2=").append(HexDump.shortToHex(iObjectInstance2)).append('\n');
-		buffer.append("[/STARTOBJECT]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
deleted file mode 100644
index f98891d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/*
- * HSSF Chart Title Format Record Type
- */
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * CHARTTITLEFORMAT (0x1050)<p>
- * Describes the formatting runs associated with a chart title.
- */
-public class ChartTitleFormatRecord extends StandardRecord {
-	public static final short sid = 0x1050;
-	
-	private CTFormat[] _formats;
-	
-	private static final class CTFormat {
-		public static final int ENCODED_SIZE=4;
-		private int _offset;
-		private int _fontIndex;
-		
-		public CTFormat(RecordInputStream in) {
-			_offset = in.readShort();
-			_fontIndex = in.readShort();
-		}
-
-		public int getOffset(){
-			return _offset;
-		}
-		public void setOffset(int newOff){
-			_offset = newOff;
-		}
-		public int getFontIndex() {
-			return _fontIndex;
-		}
-
-		public void serialize(LittleEndianOutput out) {
-			out.writeShort(_offset);
-			out.writeShort(_fontIndex);
-		}
-	}
-
-
-	public ChartTitleFormatRecord(RecordInputStream in) {
-		int nRecs = in.readUShort();
-		_formats = new CTFormat[nRecs];
-
-		for(int i=0;i<nRecs;i++) {
-			_formats[i] = new CTFormat(in);
-		}
-	}
-
-	public void serialize(LittleEndianOutput out) {
-        out.writeShort(_formats.length);
-        for(int i=0; i<_formats.length; i++){
-            _formats[i].serialize(out);
-        }
-    }
-
-    protected int getDataSize() {
-        return 2 + CTFormat.ENCODED_SIZE * _formats.length;
-    }
-    
-	public short getSid() {
-		return sid;
-	}
-	
-	public int getFormatCount() {
-		return _formats.length;
-	}
-	
-	public void modifyFormatRun(short oldPos, short newLen) {
-		int shift = 0;
-		for(int i=0; i < _formats.length; i++) {
-			CTFormat ctf = _formats[i];
-			if (shift != 0) {
-				ctf.setOffset(ctf.getOffset() + shift);
-			} else if (oldPos == ctf.getOffset() && i < _formats.length - 1){
-				CTFormat nextCTF = _formats[i + 1];
-				shift = newLen - (nextCTF.getOffset() - ctf.getOffset());
-			} 
-		}
-	}
-	
-	public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[CHARTTITLEFORMAT]\n");
-        buffer.append("    .format_runs       = ").append(_formats.length).append("\n");
-        for(int i=0; i<_formats.length; i++) {
-            CTFormat ctf = _formats[i];
-        	buffer.append("       .char_offset= ").append(ctf.getOffset());
-        	buffer.append(",.fontidx= ").append(ctf.getFontIndex());
-            buffer.append("\n");
-        }
-        buffer.append("[/CHARTTITLEFORMAT]\n");
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
deleted file mode 100644
index 18d07bf..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The dat record is used to store options for the chart.
- */
-public final class DatRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1063;
-
-    private static final BitField horizontalBorder = BitFieldFactory.getInstance(0x1);
-    private static final BitField verticalBorder   = BitFieldFactory.getInstance(0x2);
-    private static final BitField border           = BitFieldFactory.getInstance(0x4);
-    private static final BitField showSeriesKey    = BitFieldFactory.getInstance(0x8);
-
-    private  short      field_1_options;
-
-
-    public DatRecord()
-    {
-
-    }
-
-    public DatRecord(RecordInputStream in)
-    {
-        field_1_options                = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DAT]\n");
-        buffer.append("    .options              = ")
-            .append("0x").append(HexDump.toHex(  getOptions ()))
-            .append(" (").append( getOptions() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .horizontalBorder         = ").append(isHorizontalBorder()).append('\n'); 
-        buffer.append("         .verticalBorder           = ").append(isVerticalBorder()).append('\n'); 
-        buffer.append("         .border                   = ").append(isBorder()).append('\n'); 
-        buffer.append("         .showSeriesKey            = ").append(isShowSeriesKey()).append('\n'); 
-
-        buffer.append("[/DAT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_options);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public DatRecord clone() {
-        DatRecord rec = new DatRecord();
-        rec.field_1_options = field_1_options;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the options field for the Dat record.
-     */
-    public short getOptions()
-    {
-        return field_1_options;
-    }
-
-    /**
-     * Set the options field for the Dat record.
-     */
-    public void setOptions(short field_1_options)
-    {
-        this.field_1_options = field_1_options;
-    }
-
-    /**
-     * Sets the horizontal border field value.
-     * has a horizontal border
-     */
-    public void setHorizontalBorder(boolean value)
-    {
-        field_1_options = horizontalBorder.setShortBoolean(field_1_options, value);
-    }
-
-    /**
-     * has a horizontal border
-     * @return  the horizontal border field value.
-     */
-    public boolean isHorizontalBorder()
-    {
-        return horizontalBorder.isSet(field_1_options);
-    }
-
-    /**
-     * Sets the vertical border field value.
-     * has vertical border
-     */
-    public void setVerticalBorder(boolean value)
-    {
-        field_1_options = verticalBorder.setShortBoolean(field_1_options, value);
-    }
-
-    /**
-     * has vertical border
-     * @return  the vertical border field value.
-     */
-    public boolean isVerticalBorder()
-    {
-        return verticalBorder.isSet(field_1_options);
-    }
-
-    /**
-     * Sets the border field value.
-     * data table has a border
-     */
-    public void setBorder(boolean value)
-    {
-        field_1_options = border.setShortBoolean(field_1_options, value);
-    }
-
-    /**
-     * data table has a border
-     * @return  the border field value.
-     */
-    public boolean isBorder()
-    {
-        return border.isSet(field_1_options);
-    }
-
-    /**
-     * Sets the show series key field value.
-     * shows the series key
-     */
-    public void setShowSeriesKey(boolean value)
-    {
-        field_1_options = showSeriesKey.setShortBoolean(field_1_options, value);
-    }
-
-    /**
-     * shows the series key
-     * @return  the show series key field value.
-     */
-    public boolean isShowSeriesKey()
-    {
-        return showSeriesKey.isSet(field_1_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
deleted file mode 100644
index 7151608..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The data format record is used to index into a series.
- */
-public final class DataFormatRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1006;
-
-    private static final BitField useExcel4Colors = BitFieldFactory.getInstance(0x1);
-
-    private short field_1_pointNumber;
-    private short field_2_seriesIndex;
-    private short field_3_seriesNumber;
-    private short field_4_formatFlags;
-
-
-    public DataFormatRecord()
-    {
-
-    }
-
-    public DataFormatRecord(RecordInputStream in)
-    {
-        field_1_pointNumber            = in.readShort();
-        field_2_seriesIndex            = in.readShort();
-        field_3_seriesNumber           = in.readShort();
-        field_4_formatFlags            = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DATAFORMAT]\n");
-        buffer.append("    .pointNumber          = ")
-            .append("0x").append(HexDump.toHex(  getPointNumber ()))
-            .append(" (").append( getPointNumber() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .seriesIndex          = ")
-            .append("0x").append(HexDump.toHex(  getSeriesIndex ()))
-            .append(" (").append( getSeriesIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .seriesNumber         = ")
-            .append("0x").append(HexDump.toHex(  getSeriesNumber ()))
-            .append(" (").append( getSeriesNumber() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .formatFlags          = ")
-            .append("0x").append(HexDump.toHex(  getFormatFlags ()))
-            .append(" (").append( getFormatFlags() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .useExcel4Colors          = ").append(isUseExcel4Colors()).append('\n'); 
-
-        buffer.append("[/DATAFORMAT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_pointNumber);
-        out.writeShort(field_2_seriesIndex);
-        out.writeShort(field_3_seriesNumber);
-        out.writeShort(field_4_formatFlags);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public DataFormatRecord clone() {
-        DataFormatRecord rec = new DataFormatRecord();
-    
-        rec.field_1_pointNumber = field_1_pointNumber;
-        rec.field_2_seriesIndex = field_2_seriesIndex;
-        rec.field_3_seriesNumber = field_3_seriesNumber;
-        rec.field_4_formatFlags = field_4_formatFlags;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the point number field for the DataFormat record.
-     */
-    public short getPointNumber()
-    {
-        return field_1_pointNumber;
-    }
-
-    /**
-     * Set the point number field for the DataFormat record.
-     */
-    public void setPointNumber(short field_1_pointNumber)
-    {
-        this.field_1_pointNumber = field_1_pointNumber;
-    }
-
-    /**
-     * Get the series index field for the DataFormat record.
-     */
-    public short getSeriesIndex()
-    {
-        return field_2_seriesIndex;
-    }
-
-    /**
-     * Set the series index field for the DataFormat record.
-     */
-    public void setSeriesIndex(short field_2_seriesIndex)
-    {
-        this.field_2_seriesIndex = field_2_seriesIndex;
-    }
-
-    /**
-     * Get the series number field for the DataFormat record.
-     */
-    public short getSeriesNumber()
-    {
-        return field_3_seriesNumber;
-    }
-
-    /**
-     * Set the series number field for the DataFormat record.
-     */
-    public void setSeriesNumber(short field_3_seriesNumber)
-    {
-        this.field_3_seriesNumber = field_3_seriesNumber;
-    }
-
-    /**
-     * Get the format flags field for the DataFormat record.
-     */
-    public short getFormatFlags()
-    {
-        return field_4_formatFlags;
-    }
-
-    /**
-     * Set the format flags field for the DataFormat record.
-     */
-    public void setFormatFlags(short field_4_formatFlags)
-    {
-        this.field_4_formatFlags = field_4_formatFlags;
-    }
-
-    /**
-     * Sets the use excel 4 colors field value.
-     * set true to use excel 4 colors.
-     */
-    public void setUseExcel4Colors(boolean value)
-    {
-        field_4_formatFlags = useExcel4Colors.setShortBoolean(field_4_formatFlags, value);
-    }
-
-    /**
-     * set true to use excel 4 colors.
-     * @return  the use excel 4 colors field value.
-     */
-    public boolean isUseExcel4Colors()
-    {
-        return useExcel4Colors.isSet(field_4_formatFlags);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
deleted file mode 100644
index abda36e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * DATALABEXT - Chart Data Label Extension (0x086A)
- */
-public final class DataLabelExtensionRecord extends StandardRecord {
-	public static final short sid = 0x086A;
-	
-	private int rt;
-	private int grbitFrt;
-	private byte[] unused = new byte[8];
-	
-	public DataLabelExtensionRecord(RecordInputStream in) {
-		rt = in.readShort();
-		grbitFrt = in.readShort();
-		in.readFully(unused);
-	}
-	
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 8;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		out.writeShort(rt);
-		out.writeShort(grbitFrt);
-		out.write(unused);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[DATALABEXT]\n");
-		buffer.append("    .rt      =").append(HexDump.shortToHex(rt)).append('\n');
-		buffer.append("    .grbitFrt=").append(HexDump.shortToHex(grbitFrt)).append('\n');
-		buffer.append("    .unused  =").append(HexDump.toHex(unused)).append('\n');
-
-		buffer.append("[/DATALABEXT]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
deleted file mode 100644
index 48c6d6c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The default data label text properties record identifies the text characteristics of the preceding text record.
- */
-public final class DefaultDataLabelTextPropertiesRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x1024;
-    private  short      field_1_categoryDataType;
-    public final static short       CATEGORY_DATA_TYPE_SHOW_LABELS_CHARACTERISTIC = 0;
-    public final static short       CATEGORY_DATA_TYPE_VALUE_AND_PERCENTAGE_CHARACTERISTIC = 1;
-    public final static short       CATEGORY_DATA_TYPE_ALL_TEXT_CHARACTERISTIC = 2;
-
-
-    public DefaultDataLabelTextPropertiesRecord()
-    {
-
-    }
-
-    public DefaultDataLabelTextPropertiesRecord(RecordInputStream in)
-    {
-        field_1_categoryDataType       = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[DEFAULTTEXT]\n");
-        buffer.append("    .categoryDataType     = ")
-            .append("0x").append(HexDump.toHex(  getCategoryDataType ()))
-            .append(" (").append( getCategoryDataType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/DEFAULTTEXT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_categoryDataType);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public DefaultDataLabelTextPropertiesRecord clone() {
-        DefaultDataLabelTextPropertiesRecord rec = new DefaultDataLabelTextPropertiesRecord();
-    
-        rec.field_1_categoryDataType = field_1_categoryDataType;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the category data type field for the DefaultDataLabelTextProperties record.
-     *
-     * @return  One of 
-     *        CATEGORY_DATA_TYPE_SHOW_LABELS_CHARACTERISTIC
-     *        CATEGORY_DATA_TYPE_VALUE_AND_PERCENTAGE_CHARACTERISTIC
-     *        CATEGORY_DATA_TYPE_ALL_TEXT_CHARACTERISTIC
-     */
-    public short getCategoryDataType()
-    {
-        return field_1_categoryDataType;
-    }
-
-    /**
-     * Set the category data type field for the DefaultDataLabelTextProperties record.
-     *
-     * @param field_1_categoryDataType
-     *        One of 
-     *        CATEGORY_DATA_TYPE_SHOW_LABELS_CHARACTERISTIC
-     *        CATEGORY_DATA_TYPE_VALUE_AND_PERCENTAGE_CHARACTERISTIC
-     *        CATEGORY_DATA_TYPE_ALL_TEXT_CHARACTERISTIC
-     */
-    public void setCategoryDataType(short field_1_categoryDataType)
-    {
-        this.field_1_categoryDataType = field_1_categoryDataType;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
deleted file mode 100644
index 23d09d1..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The end record defines the end of a block of records for a (Graphing)
- * data object. This record is matched with a corresponding BeginRecord.
- *
- * @see BeginRecord
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-
-public final class EndRecord extends StandardRecord implements Cloneable {
-    public static final short sid = 0x1034;
-
-    public EndRecord()
-    {
-    }
-
-    /**
-     * @param in unused (since this record has no data)
-     */
-    public EndRecord(RecordInputStream in)
-    {
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[END]\n");
-        buffer.append("[/END]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-    }
-
-    protected int getDataSize() {
-        return 0;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-    
-    @Override
-    public EndRecord clone() {
-       EndRecord er = new EndRecord();
-       // No data so nothing to copy
-       return er;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
deleted file mode 100644
index 65be237..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The font basis record stores various font metrics.
- */
-public final class FontBasisRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1060;
-    private  short      field_1_xBasis;
-    private  short      field_2_yBasis;
-    private  short      field_3_heightBasis;
-    private  short      field_4_scale;
-    private  short      field_5_indexToFontTable;
-
-
-    public FontBasisRecord()
-    {
-
-    }
-
-    public FontBasisRecord(RecordInputStream in)
-    {
-        field_1_xBasis                 = in.readShort();
-        field_2_yBasis                 = in.readShort();
-        field_3_heightBasis            = in.readShort();
-        field_4_scale                  = in.readShort();
-        field_5_indexToFontTable       = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FBI]\n");
-        buffer.append("    .xBasis               = ")
-            .append("0x").append(HexDump.toHex(  getXBasis ()))
-            .append(" (").append( getXBasis() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .yBasis               = ")
-            .append("0x").append(HexDump.toHex(  getYBasis ()))
-            .append(" (").append( getYBasis() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .heightBasis          = ")
-            .append("0x").append(HexDump.toHex(  getHeightBasis ()))
-            .append(" (").append( getHeightBasis() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .scale                = ")
-            .append("0x").append(HexDump.toHex(  getScale ()))
-            .append(" (").append( getScale() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .indexToFontTable     = ")
-            .append("0x").append(HexDump.toHex(  getIndexToFontTable ()))
-            .append(" (").append( getIndexToFontTable() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/FBI]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_xBasis);
-        out.writeShort(field_2_yBasis);
-        out.writeShort(field_3_heightBasis);
-        out.writeShort(field_4_scale);
-        out.writeShort(field_5_indexToFontTable);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public FontBasisRecord clone() {
-        FontBasisRecord rec = new FontBasisRecord();
-    
-        rec.field_1_xBasis = field_1_xBasis;
-        rec.field_2_yBasis = field_2_yBasis;
-        rec.field_3_heightBasis = field_3_heightBasis;
-        rec.field_4_scale = field_4_scale;
-        rec.field_5_indexToFontTable = field_5_indexToFontTable;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the x Basis field for the FontBasis record.
-     */
-    public short getXBasis()
-    {
-        return field_1_xBasis;
-    }
-
-    /**
-     * Set the x Basis field for the FontBasis record.
-     */
-    public void setXBasis(short field_1_xBasis)
-    {
-        this.field_1_xBasis = field_1_xBasis;
-    }
-
-    /**
-     * Get the y Basis field for the FontBasis record.
-     */
-    public short getYBasis()
-    {
-        return field_2_yBasis;
-    }
-
-    /**
-     * Set the y Basis field for the FontBasis record.
-     */
-    public void setYBasis(short field_2_yBasis)
-    {
-        this.field_2_yBasis = field_2_yBasis;
-    }
-
-    /**
-     * Get the height basis field for the FontBasis record.
-     */
-    public short getHeightBasis()
-    {
-        return field_3_heightBasis;
-    }
-
-    /**
-     * Set the height basis field for the FontBasis record.
-     */
-    public void setHeightBasis(short field_3_heightBasis)
-    {
-        this.field_3_heightBasis = field_3_heightBasis;
-    }
-
-    /**
-     * Get the scale field for the FontBasis record.
-     */
-    public short getScale()
-    {
-        return field_4_scale;
-    }
-
-    /**
-     * Set the scale field for the FontBasis record.
-     */
-    public void setScale(short field_4_scale)
-    {
-        this.field_4_scale = field_4_scale;
-    }
-
-    /**
-     * Get the index to font table field for the FontBasis record.
-     */
-    public short getIndexToFontTable()
-    {
-        return field_5_indexToFontTable;
-    }
-
-    /**
-     * Set the index to font table field for the FontBasis record.
-     */
-    public void setIndexToFontTable(short field_5_indexToFontTable)
-    {
-        this.field_5_indexToFontTable = field_5_indexToFontTable;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
deleted file mode 100644
index 4faacab..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The font index record indexes into the font table for the text record.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class FontIndexRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1026;
-    private  short      field_1_fontIndex;
-
-
-    public FontIndexRecord()
-    {
-
-    }
-
-    public FontIndexRecord(RecordInputStream in)
-    {
-        field_1_fontIndex              = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FONTX]\n");
-        buffer.append("    .fontIndex            = ")
-            .append("0x").append(HexDump.toHex(  getFontIndex ()))
-            .append(" (").append( getFontIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/FONTX]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_fontIndex);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public FontIndexRecord clone() {
-        FontIndexRecord rec = new FontIndexRecord();
-    
-        rec.field_1_fontIndex = field_1_fontIndex;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the font index field for the FontIndex record.
-     */
-    public short getFontIndex()
-    {
-        return field_1_fontIndex;
-    }
-
-    /**
-     * Set the font index field for the FontIndex record.
-     */
-    public void setFontIndex(short field_1_fontIndex)
-    {
-        this.field_1_fontIndex = field_1_fontIndex;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
deleted file mode 100644
index 6515d4a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The frame record indicates whether there is a border around the displayed text of a chart.
- */
-public final class FrameRecord extends StandardRecord implements Cloneable {
-    public final static short sid  = 0x1032;
-
-    private static final BitField autoSize     = BitFieldFactory.getInstance(0x1);
-    private static final BitField autoPosition = BitFieldFactory.getInstance(0x2);
-
-    private  short      field_1_borderType;
-    public final static short       BORDER_TYPE_REGULAR            = 0;
-    public final static short       BORDER_TYPE_SHADOW             = 1;
-    private  short      field_2_options;
-
-
-    public FrameRecord()
-    {
-
-    }
-
-    public FrameRecord(RecordInputStream in)
-    {
-        field_1_borderType             = in.readShort();
-        field_2_options                = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[FRAME]\n");
-        buffer.append("    .borderType           = ")
-            .append("0x").append(HexDump.toHex(  getBorderType ()))
-            .append(" (").append( getBorderType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options              = ")
-            .append("0x").append(HexDump.toHex(  getOptions ()))
-            .append(" (").append( getOptions() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .autoSize                 = ").append(isAutoSize()).append('\n'); 
-        buffer.append("         .autoPosition             = ").append(isAutoPosition()).append('\n'); 
-
-        buffer.append("[/FRAME]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_borderType);
-        out.writeShort(field_2_options);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public FrameRecord clone() {
-        FrameRecord rec = new FrameRecord();
-    
-        rec.field_1_borderType = field_1_borderType;
-        rec.field_2_options = field_2_options;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the border type field for the Frame record.
-     *
-     * @return  One of 
-     *        BORDER_TYPE_REGULAR
-     *        BORDER_TYPE_SHADOW
-     */
-    public short getBorderType()
-    {
-        return field_1_borderType;
-    }
-
-    /**
-     * Set the border type field for the Frame record.
-     *
-     * @param field_1_borderType
-     *        One of 
-     *        BORDER_TYPE_REGULAR
-     *        BORDER_TYPE_SHADOW
-     */
-    public void setBorderType(short field_1_borderType)
-    {
-        this.field_1_borderType = field_1_borderType;
-    }
-
-    /**
-     * Get the options field for the Frame record.
-     */
-    public short getOptions()
-    {
-        return field_2_options;
-    }
-
-    /**
-     * Set the options field for the Frame record.
-     */
-    public void setOptions(short field_2_options)
-    {
-        this.field_2_options = field_2_options;
-    }
-
-    /**
-     * Sets the auto size field value.
-     * excel calculates the size automatically if true
-     */
-    public void setAutoSize(boolean value)
-    {
-        field_2_options = autoSize.setShortBoolean(field_2_options, value);
-    }
-
-    /**
-     * excel calculates the size automatically if true
-     * @return  the auto size field value.
-     */
-    public boolean isAutoSize()
-    {
-        return autoSize.isSet(field_2_options);
-    }
-
-    /**
-     * Sets the auto position field value.
-     * excel calculates the position automatically
-     */
-    public void setAutoPosition(boolean value)
-    {
-        field_2_options = autoPosition.setShortBoolean(field_2_options, value);
-    }
-
-    /**
-     * excel calculates the position automatically
-     * @return  the auto position field value.
-     */
-    public boolean isAutoPosition()
-    {
-        return autoPosition.isSet(field_2_options);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
deleted file mode 100644
index 04e3de1..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Defines a legend for a chart.
- */
-public final class LegendRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1015;
-
-    private static final BitField autoPosition     = BitFieldFactory.getInstance(0x01);
-    private static final BitField autoSeries       = BitFieldFactory.getInstance(0x02);
-    private static final BitField autoXPositioning = BitFieldFactory.getInstance(0x04);
-    private static final BitField autoYPositioning = BitFieldFactory.getInstance(0x08);
-    private static final BitField vertical         = BitFieldFactory.getInstance(0x10);
-    private static final BitField dataTable        = BitFieldFactory.getInstance(0x20);
-
-    private  int        field_1_xAxisUpperLeft;
-    private  int        field_2_yAxisUpperLeft;
-    private  int        field_3_xSize;
-    private  int        field_4_ySize;
-    private  byte       field_5_type;
-    public final static byte        TYPE_BOTTOM                    = 0;
-    public final static byte        TYPE_CORNER                    = 1;
-    public final static byte        TYPE_TOP                       = 2;
-    public final static byte        TYPE_RIGHT                     = 3;
-    public final static byte        TYPE_LEFT                      = 4;
-    public final static byte        TYPE_UNDOCKED                  = 7;
-    private  byte       field_6_spacing;
-    public final static byte        SPACING_CLOSE                  = 0;
-    public final static byte        SPACING_MEDIUM                 = 1;
-    public final static byte        SPACING_OPEN                   = 2;
-    private  short      field_7_options;
-
-
-    public LegendRecord()
-    {
-
-    }
-
-    public LegendRecord(RecordInputStream in)
-    {
-        field_1_xAxisUpperLeft         = in.readInt();
-        field_2_yAxisUpperLeft         = in.readInt();
-        field_3_xSize                  = in.readInt();
-        field_4_ySize                  = in.readInt();
-        field_5_type                   = in.readByte();
-        field_6_spacing                = in.readByte();
-        field_7_options                = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[LEGEND]\n");
-        buffer.append("    .xAxisUpperLeft       = ")
-            .append("0x").append(HexDump.toHex(  getXAxisUpperLeft ()))
-            .append(" (").append( getXAxisUpperLeft() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .yAxisUpperLeft       = ")
-            .append("0x").append(HexDump.toHex(  getYAxisUpperLeft ()))
-            .append(" (").append( getYAxisUpperLeft() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .xSize                = ")
-            .append("0x").append(HexDump.toHex(  getXSize ()))
-            .append(" (").append( getXSize() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .ySize                = ")
-            .append("0x").append(HexDump.toHex(  getYSize ()))
-            .append(" (").append( getYSize() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .type                 = ")
-            .append("0x").append(HexDump.toHex(  getType ()))
-            .append(" (").append( getType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .spacing              = ")
-            .append("0x").append(HexDump.toHex(  getSpacing ()))
-            .append(" (").append( getSpacing() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options              = ")
-            .append("0x").append(HexDump.toHex(  getOptions ()))
-            .append(" (").append( getOptions() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .autoPosition             = ").append(isAutoPosition()).append('\n'); 
-        buffer.append("         .autoSeries               = ").append(isAutoSeries()).append('\n'); 
-        buffer.append("         .autoXPositioning         = ").append(isAutoXPositioning()).append('\n'); 
-        buffer.append("         .autoYPositioning         = ").append(isAutoYPositioning()).append('\n'); 
-        buffer.append("         .vertical                 = ").append(isVertical()).append('\n'); 
-        buffer.append("         .dataTable                = ").append(isDataTable()).append('\n'); 
-
-        buffer.append("[/LEGEND]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(field_1_xAxisUpperLeft);
-        out.writeInt(field_2_yAxisUpperLeft);
-        out.writeInt(field_3_xSize);
-        out.writeInt(field_4_ySize);
-        out.writeByte(field_5_type);
-        out.writeByte(field_6_spacing);
-        out.writeShort(field_7_options);
-    }
-
-    protected int getDataSize() {
-        return 4 + 4 + 4 + 4 + 1 + 1 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public LegendRecord clone() {
-        LegendRecord rec = new LegendRecord();
-    
-        rec.field_1_xAxisUpperLeft = field_1_xAxisUpperLeft;
-        rec.field_2_yAxisUpperLeft = field_2_yAxisUpperLeft;
-        rec.field_3_xSize = field_3_xSize;
-        rec.field_4_ySize = field_4_ySize;
-        rec.field_5_type = field_5_type;
-        rec.field_6_spacing = field_6_spacing;
-        rec.field_7_options = field_7_options;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the x axis upper left field for the Legend record.
-     */
-    public int getXAxisUpperLeft()
-    {
-        return field_1_xAxisUpperLeft;
-    }
-
-    /**
-     * Set the x axis upper left field for the Legend record.
-     */
-    public void setXAxisUpperLeft(int field_1_xAxisUpperLeft)
-    {
-        this.field_1_xAxisUpperLeft = field_1_xAxisUpperLeft;
-    }
-
-    /**
-     * Get the y axis upper left field for the Legend record.
-     */
-    public int getYAxisUpperLeft()
-    {
-        return field_2_yAxisUpperLeft;
-    }
-
-    /**
-     * Set the y axis upper left field for the Legend record.
-     */
-    public void setYAxisUpperLeft(int field_2_yAxisUpperLeft)
-    {
-        this.field_2_yAxisUpperLeft = field_2_yAxisUpperLeft;
-    }
-
-    /**
-     * Get the x size field for the Legend record.
-     */
-    public int getXSize()
-    {
-        return field_3_xSize;
-    }
-
-    /**
-     * Set the x size field for the Legend record.
-     */
-    public void setXSize(int field_3_xSize)
-    {
-        this.field_3_xSize = field_3_xSize;
-    }
-
-    /**
-     * Get the y size field for the Legend record.
-     */
-    public int getYSize()
-    {
-        return field_4_ySize;
-    }
-
-    /**
-     * Set the y size field for the Legend record.
-     */
-    public void setYSize(int field_4_ySize)
-    {
-        this.field_4_ySize = field_4_ySize;
-    }
-
-    /**
-     * Get the type field for the Legend record.
-     *
-     * @return  One of 
-     *        TYPE_BOTTOM
-     *        TYPE_CORNER
-     *        TYPE_TOP
-     *        TYPE_RIGHT
-     *        TYPE_LEFT
-     *        TYPE_UNDOCKED
-     */
-    public byte getType()
-    {
-        return field_5_type;
-    }
-
-    /**
-     * Set the type field for the Legend record.
-     *
-     * @param field_5_type
-     *        One of 
-     *        TYPE_BOTTOM
-     *        TYPE_CORNER
-     *        TYPE_TOP
-     *        TYPE_RIGHT
-     *        TYPE_LEFT
-     *        TYPE_UNDOCKED
-     */
-    public void setType(byte field_5_type)
-    {
-        this.field_5_type = field_5_type;
-    }
-
-    /**
-     * Get the spacing field for the Legend record.
-     *
-     * @return  One of 
-     *        SPACING_CLOSE
-     *        SPACING_MEDIUM
-     *        SPACING_OPEN
-     */
-    public byte getSpacing()
-    {
-        return field_6_spacing;
-    }
-
-    /**
-     * Set the spacing field for the Legend record.
-     *
-     * @param field_6_spacing
-     *        One of 
-     *        SPACING_CLOSE
-     *        SPACING_MEDIUM
-     *        SPACING_OPEN
-     */
-    public void setSpacing(byte field_6_spacing)
-    {
-        this.field_6_spacing = field_6_spacing;
-    }
-
-    /**
-     * Get the options field for the Legend record.
-     */
-    public short getOptions()
-    {
-        return field_7_options;
-    }
-
-    /**
-     * Set the options field for the Legend record.
-     */
-    public void setOptions(short field_7_options)
-    {
-        this.field_7_options = field_7_options;
-    }
-
-    /**
-     * Sets the auto position field value.
-     * automatic positioning (1=docked)
-     */
-    public void setAutoPosition(boolean value)
-    {
-        field_7_options = autoPosition.setShortBoolean(field_7_options, value);
-    }
-
-    /**
-     * automatic positioning (1=docked)
-     * @return  the auto position field value.
-     */
-    public boolean isAutoPosition()
-    {
-        return autoPosition.isSet(field_7_options);
-    }
-
-    /**
-     * Sets the auto series field value.
-     * excel 5 only (true)
-     */
-    public void setAutoSeries(boolean value)
-    {
-        field_7_options = autoSeries.setShortBoolean(field_7_options, value);
-    }
-
-    /**
-     * excel 5 only (true)
-     * @return  the auto series field value.
-     */
-    public boolean isAutoSeries()
-    {
-        return autoSeries.isSet(field_7_options);
-    }
-
-    /**
-     * Sets the auto x positioning field value.
-     * position of legend on the x axis is automatic
-     */
-    public void setAutoXPositioning(boolean value)
-    {
-        field_7_options = autoXPositioning.setShortBoolean(field_7_options, value);
-    }
-
-    /**
-     * position of legend on the x axis is automatic
-     * @return  the auto x positioning field value.
-     */
-    public boolean isAutoXPositioning()
-    {
-        return autoXPositioning.isSet(field_7_options);
-    }
-
-    /**
-     * Sets the auto y positioning field value.
-     * position of legend on the y axis is automatic
-     */
-    public void setAutoYPositioning(boolean value)
-    {
-        field_7_options = autoYPositioning.setShortBoolean(field_7_options, value);
-    }
-
-    /**
-     * position of legend on the y axis is automatic
-     * @return  the auto y positioning field value.
-     */
-    public boolean isAutoYPositioning()
-    {
-        return autoYPositioning.isSet(field_7_options);
-    }
-
-    /**
-     * Sets the vertical field value.
-     * vertical or horizontal legend (1 or 0 respectively).  Always 0 if not automatic.
-     */
-    public void setVertical(boolean value)
-    {
-        field_7_options = vertical.setShortBoolean(field_7_options, value);
-    }
-
-    /**
-     * vertical or horizontal legend (1 or 0 respectively).  Always 0 if not automatic.
-     * @return  the vertical field value.
-     */
-    public boolean isVertical()
-    {
-        return vertical.isSet(field_7_options);
-    }
-
-    /**
-     * Sets the data table field value.
-     * 1 if chart contains data table
-     */
-    public void setDataTable(boolean value)
-    {
-        field_7_options = dataTable.setShortBoolean(field_7_options, value);
-    }
-
-    /**
-     * 1 if chart contains data table
-     * @return  the data table field value.
-     */
-    public boolean isDataTable()
-    {
-        return dataTable.isSet(field_7_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
deleted file mode 100644
index d21a564..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Describes a line format record.  The line format record controls how a line on a chart appears.
- */
-public final class LineFormatRecord extends StandardRecord implements Cloneable {
-    public final static short sid = 0x1007;
-
-    private static final BitField auto      = BitFieldFactory.getInstance(0x1);
-    private static final BitField drawTicks = BitFieldFactory.getInstance(0x4);
-    private static final BitField unknown   = BitFieldFactory.getInstance(0x4);
-
-    private  int        field_1_lineColor;
-    private  short      field_2_linePattern;
-    public final static short       LINE_PATTERN_SOLID             = 0;
-    public final static short       LINE_PATTERN_DASH              = 1;
-    public final static short       LINE_PATTERN_DOT               = 2;
-    public final static short       LINE_PATTERN_DASH_DOT          = 3;
-    public final static short       LINE_PATTERN_DASH_DOT_DOT      = 4;
-    public final static short       LINE_PATTERN_NONE              = 5;
-    public final static short       LINE_PATTERN_DARK_GRAY_PATTERN = 6;
-    public final static short       LINE_PATTERN_MEDIUM_GRAY_PATTERN = 7;
-    public final static short       LINE_PATTERN_LIGHT_GRAY_PATTERN = 8;
-    private  short      field_3_weight;
-    public final static short       WEIGHT_HAIRLINE                = -1;
-    public final static short       WEIGHT_NARROW                  = 0;
-    public final static short       WEIGHT_MEDIUM                  = 1;
-    public final static short       WEIGHT_WIDE                    = 2;
-    private  short      field_4_format;
-    private  short      field_5_colourPaletteIndex;
-
-
-    public LineFormatRecord()
-    {
-
-    }
-
-    public LineFormatRecord(RecordInputStream in)
-    {
-        field_1_lineColor              = in.readInt();
-        field_2_linePattern            = in.readShort();
-        field_3_weight                 = in.readShort();
-        field_4_format                 = in.readShort();
-        field_5_colourPaletteIndex     = in.readShort();
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[LINEFORMAT]\n");
-        buffer.append("    .lineColor            = ")
-            .append("0x").append(HexDump.toHex(  getLineColor ()))
-            .append(" (").append( getLineColor() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .linePattern          = ")
-            .append("0x").append(HexDump.toHex(  getLinePattern ()))
-            .append(" (").append( getLinePattern() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .weight               = ")
-            .append("0x").append(HexDump.toHex(  getWeight ()))
-            .append(" (").append( getWeight() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .format               = ")
-            .append("0x").append(HexDump.toHex(  getFormat ()))
-            .append(" (").append( getFormat() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .auto                     = ").append(isAuto()).append('\n'); 
-        buffer.append("         .drawTicks                = ").append(isDrawTicks()).append('\n'); 
-        buffer.append("         .unknown                  = ").append(isUnknown()).append('\n'); 
-        buffer.append("    .colourPaletteIndex   = ")
-            .append("0x").append(HexDump.toHex(  getColourPaletteIndex ()))
-            .append(" (").append( getColourPaletteIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/LINEFORMAT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(field_1_lineColor);
-        out.writeShort(field_2_linePattern);
-        out.writeShort(field_3_weight);
-        out.writeShort(field_4_format);
-        out.writeShort(field_5_colourPaletteIndex);
-    }
-
-    protected int getDataSize() {
-        return 4 + 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public LineFormatRecord clone() {
-        LineFormatRecord rec = new LineFormatRecord();
-    
-        rec.field_1_lineColor = field_1_lineColor;
-        rec.field_2_linePattern = field_2_linePattern;
-        rec.field_3_weight = field_3_weight;
-        rec.field_4_format = field_4_format;
-        rec.field_5_colourPaletteIndex = field_5_colourPaletteIndex;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the line color field for the LineFormat record.
-     */
-    public int getLineColor()
-    {
-        return field_1_lineColor;
-    }
-
-    /**
-     * Set the line color field for the LineFormat record.
-     */
-    public void setLineColor(int field_1_lineColor)
-    {
-        this.field_1_lineColor = field_1_lineColor;
-    }
-
-    /**
-     * Get the line pattern field for the LineFormat record.
-     *
-     * @return  One of 
-     *        LINE_PATTERN_SOLID
-     *        LINE_PATTERN_DASH
-     *        LINE_PATTERN_DOT
-     *        LINE_PATTERN_DASH_DOT
-     *        LINE_PATTERN_DASH_DOT_DOT
-     *        LINE_PATTERN_NONE
-     *        LINE_PATTERN_DARK_GRAY_PATTERN
-     *        LINE_PATTERN_MEDIUM_GRAY_PATTERN
-     *        LINE_PATTERN_LIGHT_GRAY_PATTERN
-     */
-    public short getLinePattern()
-    {
-        return field_2_linePattern;
-    }
-
-    /**
-     * Set the line pattern field for the LineFormat record.
-     *
-     * @param field_2_linePattern
-     *        One of 
-     *        LINE_PATTERN_SOLID
-     *        LINE_PATTERN_DASH
-     *        LINE_PATTERN_DOT
-     *        LINE_PATTERN_DASH_DOT
-     *        LINE_PATTERN_DASH_DOT_DOT
-     *        LINE_PATTERN_NONE
-     *        LINE_PATTERN_DARK_GRAY_PATTERN
-     *        LINE_PATTERN_MEDIUM_GRAY_PATTERN
-     *        LINE_PATTERN_LIGHT_GRAY_PATTERN
-     */
-    public void setLinePattern(short field_2_linePattern)
-    {
-        this.field_2_linePattern = field_2_linePattern;
-    }
-
-    /**
-     * Get the weight field for the LineFormat record.
-     *
-     * @return  One of 
-     *        WEIGHT_HAIRLINE
-     *        WEIGHT_NARROW
-     *        WEIGHT_MEDIUM
-     *        WEIGHT_WIDE
-     */
-    public short getWeight()
-    {
-        return field_3_weight;
-    }
-
-    /**
-     * Set the weight field for the LineFormat record.
-     *
-     * @param field_3_weight
-     *        One of 
-     *        WEIGHT_HAIRLINE
-     *        WEIGHT_NARROW
-     *        WEIGHT_MEDIUM
-     *        WEIGHT_WIDE
-     */
-    public void setWeight(short field_3_weight)
-    {
-        this.field_3_weight = field_3_weight;
-    }
-
-    /**
-     * Get the format field for the LineFormat record.
-     */
-    public short getFormat()
-    {
-        return field_4_format;
-    }
-
-    /**
-     * Set the format field for the LineFormat record.
-     */
-    public void setFormat(short field_4_format)
-    {
-        this.field_4_format = field_4_format;
-    }
-
-    /**
-     * Get the colour palette index field for the LineFormat record.
-     */
-    public short getColourPaletteIndex()
-    {
-        return field_5_colourPaletteIndex;
-    }
-
-    /**
-     * Set the colour palette index field for the LineFormat record.
-     */
-    public void setColourPaletteIndex(short field_5_colourPaletteIndex)
-    {
-        this.field_5_colourPaletteIndex = field_5_colourPaletteIndex;
-    }
-
-    /**
-     * Sets the auto field value.
-     * automatic format
-     */
-    public void setAuto(boolean value)
-    {
-        field_4_format = auto.setShortBoolean(field_4_format, value);
-    }
-
-    /**
-     * automatic format
-     * @return  the auto field value.
-     */
-    public boolean isAuto()
-    {
-        return auto.isSet(field_4_format);
-    }
-
-    /**
-     * Sets the draw ticks field value.
-     * draw tick marks
-     */
-    public void setDrawTicks(boolean value)
-    {
-        field_4_format = drawTicks.setShortBoolean(field_4_format, value);
-    }
-
-    /**
-     * draw tick marks
-     * @return  the draw ticks field value.
-     */
-    public boolean isDrawTicks()
-    {
-        return drawTicks.isSet(field_4_format);
-    }
-
-    /**
-     * Sets the unknown field value.
-     * book marks this as reserved = 0 but it seems to do something
-     */
-    public void setUnknown(boolean value)
-    {
-        field_4_format = unknown.setShortBoolean(field_4_format, value);
-    }
-
-    /**
-     * book marks this as reserved = 0 but it seems to do something
-     * @return  the unknown field value.
-     */
-    public boolean isUnknown()
-    {
-        return unknown.isSet(field_4_format);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
deleted file mode 100644
index 7723270..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Describes a linked data record.  This record refers to the series data or text.
- */
-public final class LinkedDataRecord extends StandardRecord implements Cloneable {
-    public final static short sid  = 0x1051;
-
-    private static final BitField customNumberFormat= BitFieldFactory.getInstance(0x1);
-
-    private  byte       field_1_linkType;
-    public final static byte        LINK_TYPE_TITLE_OR_TEXT        = 0;
-    public final static byte        LINK_TYPE_VALUES               = 1;
-    public final static byte        LINK_TYPE_CATEGORIES           = 2;
-    public final static byte        LINK_TYPE_SECONDARY_CATEGORIES = 3;
-    private  byte       field_2_referenceType;
-    public final static byte        REFERENCE_TYPE_DEFAULT_CATEGORIES = 0;
-    public final static byte        REFERENCE_TYPE_DIRECT          = 1;
-    public final static byte        REFERENCE_TYPE_WORKSHEET       = 2;
-    public final static byte        REFERENCE_TYPE_NOT_USED        = 3;
-    public final static byte        REFERENCE_TYPE_ERROR_REPORTED  = 4;
-    private  short      field_3_options;
-    private  short      field_4_indexNumberFmtRecord;
-    private  Formula field_5_formulaOfLink;
-
-
-    public LinkedDataRecord()
-    {
-
-    }
-
-    public LinkedDataRecord(RecordInputStream in)
-    {
-        field_1_linkType               = in.readByte();
-        field_2_referenceType          = in.readByte();
-        field_3_options                = in.readShort();
-        field_4_indexNumberFmtRecord   = in.readShort();
-        int encodedTokenLen = in.readUShort();
-        field_5_formulaOfLink = Formula.read(encodedTokenLen, in);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[AI]\n");
-        buffer.append("    .linkType             = ").append(HexDump.byteToHex(getLinkType())).append('\n');
-        buffer.append("    .referenceType        = ").append(HexDump.byteToHex(getReferenceType())).append('\n');
-        buffer.append("    .options              = ").append(HexDump.shortToHex(getOptions())).append('\n');
-        buffer.append("    .customNumberFormat   = ").append(isCustomNumberFormat()).append('\n');
-        buffer.append("    .indexNumberFmtRecord = ").append(HexDump.shortToHex(getIndexNumberFmtRecord())).append('\n');
-        buffer.append("    .formulaOfLink        = ").append('\n');
-        Ptg[] ptgs = field_5_formulaOfLink.getTokens();
-        for (int i = 0; i < ptgs.length; i++) {
-            Ptg ptg = ptgs[i];
-            buffer.append(ptg.toString()).append(ptg.getRVAType()).append('\n');
-        }
-
-        buffer.append("[/AI]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeByte(field_1_linkType);
-        out.writeByte(field_2_referenceType);
-        out.writeShort(field_3_options);
-        out.writeShort(field_4_indexNumberFmtRecord);
-        field_5_formulaOfLink.serialize(out);
-    }
-
-    protected int getDataSize() {
-        return 1 + 1 + 2 + 2 + field_5_formulaOfLink.getEncodedSize();
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    @Override
-    public LinkedDataRecord clone() {
-        LinkedDataRecord rec = new LinkedDataRecord();
-
-        rec.field_1_linkType = field_1_linkType;
-        rec.field_2_referenceType = field_2_referenceType;
-        rec.field_3_options = field_3_options;
-        rec.field_4_indexNumberFmtRecord = field_4_indexNumberFmtRecord;
-        rec.field_5_formulaOfLink = field_5_formulaOfLink.copy();
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the link type field for the LinkedData record.
-     *
-     * @return  One of
-     *        {@link #LINK_TYPE_TITLE_OR_TEXT},
-     *        {@link #LINK_TYPE_VALUES}, 
-     *        {@link #LINK_TYPE_CATEGORIES}, or
-     *        {@link #LINK_TYPE_SECONDARY_CATEGORIES}
-     */
-    public byte getLinkType()
-    {
-        return field_1_linkType;
-    }
-
-    /**
-     * Set the link type field for the LinkedData record.
-     *
-     * @param field_1_linkType
-     *        One of
-     *        {@link #LINK_TYPE_TITLE_OR_TEXT},
-     *        {@link #LINK_TYPE_VALUES},
-     *        {@link #LINK_TYPE_CATEGORIES}, or
-     *        {@link #LINK_TYPE_SECONDARY_CATEGORIES}
-     */
-    public void setLinkType(byte field_1_linkType)
-    {
-        this.field_1_linkType = field_1_linkType;
-    }
-
-    /**
-     * Get the reference type field for the LinkedData record.
-     *
-     * @return  One of
-     *        {@link #REFERENCE_TYPE_DEFAULT_CATEGORIES}
-     *        {@link #REFERENCE_TYPE_DIRECT}
-     *        {@link #REFERENCE_TYPE_WORKSHEET}
-     *        {@link #REFERENCE_TYPE_NOT_USED}
-     *        {@link #REFERENCE_TYPE_ERROR_REPORTED}
-     */
-    public byte getReferenceType()
-    {
-        return field_2_referenceType;
-    }
-
-    /**
-     * Set the reference type field for the LinkedData record.
-     *
-     * @param field_2_referenceType
-     *        One of
-     *        {@link #REFERENCE_TYPE_DEFAULT_CATEGORIES}
-     *        {@link #REFERENCE_TYPE_DIRECT}
-     *        {@link #REFERENCE_TYPE_WORKSHEET}
-     *        {@link #REFERENCE_TYPE_NOT_USED}
-     *        {@link #REFERENCE_TYPE_ERROR_REPORTED}
-     */
-    public void setReferenceType(byte field_2_referenceType)
-    {
-        this.field_2_referenceType = field_2_referenceType;
-    }
-
-    /**
-     * Get the options field for the LinkedData record.
-     */
-    public short getOptions()
-    {
-        return field_3_options;
-    }
-
-    /**
-     * Set the options field for the LinkedData record.
-     */
-    public void setOptions(short field_3_options)
-    {
-        this.field_3_options = field_3_options;
-    }
-
-    /**
-     * Get the index number fmt record field for the LinkedData record.
-     */
-    public short getIndexNumberFmtRecord()
-    {
-        return field_4_indexNumberFmtRecord;
-    }
-
-    /**
-     * Set the index number fmt record field for the LinkedData record.
-     */
-    public void setIndexNumberFmtRecord(short field_4_indexNumberFmtRecord)
-    {
-        this.field_4_indexNumberFmtRecord = field_4_indexNumberFmtRecord;
-    }
-
-    /**
-     * Get the formula of link field for the LinkedData record.
-     */
-    public Ptg[] getFormulaOfLink() {
-        return field_5_formulaOfLink.getTokens();
-    }
-
-    /**
-     * Set the formula of link field for the LinkedData record.
-     */
-    public void setFormulaOfLink(Ptg[] ptgs)
-    {
-        this.field_5_formulaOfLink = Formula.create(ptgs);
-    }
-
-    /**
-     * Sets the custom number format field value.
-     * true if this object has a custom number format
-     */
-    public void setCustomNumberFormat(boolean value)
-    {
-        field_3_options = customNumberFormat.setShortBoolean(field_3_options, value);
-    }
-
-    /**
-     * true if this object has a custom number format
-     * @return  the custom number format field value.
-     */
-    public boolean isCustomNumberFormat()
-    {
-        return customNumberFormat.isSet(field_3_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
deleted file mode 100644
index 99f609f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The number format index record indexes format table. This applies to an axis.
- */
-public final class NumberFormatIndexRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x104E;
-    private  short      field_1_formatIndex;
-
-
-    public NumberFormatIndexRecord()
-    {
-
-    }
-
-    public NumberFormatIndexRecord(RecordInputStream in)
-    {
-        field_1_formatIndex            = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[IFMT]\n");
-        buffer.append("    .formatIndex          = ")
-            .append("0x").append(HexDump.toHex(  getFormatIndex ()))
-            .append(" (").append( getFormatIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/IFMT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_formatIndex);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public NumberFormatIndexRecord clone() {
-        NumberFormatIndexRecord rec = new NumberFormatIndexRecord();
-    
-        rec.field_1_formatIndex = field_1_formatIndex;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the format index field for the NumberFormatIndex record.
-     */
-    public short getFormatIndex()
-    {
-        return field_1_formatIndex;
-    }
-
-    /**
-     * Set the format index field for the NumberFormatIndex record.
-     */
-    public void setFormatIndex(short field_1_formatIndex)
-    {
-        this.field_1_formatIndex = field_1_formatIndex;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
deleted file mode 100644
index d21387c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Links text to an object on the chart or identifies it as the title.
- */
-public final class ObjectLinkRecord extends StandardRecord implements Cloneable {
-    public final static short      sid                             = 0x1027;
-    private  short      field_1_anchorId;
-    public final static short       ANCHOR_ID_CHART_TITLE          = 1;
-    public final static short       ANCHOR_ID_Y_AXIS               = 2;
-    public final static short       ANCHOR_ID_X_AXIS               = 3;
-    public final static short       ANCHOR_ID_SERIES_OR_POINT      = 4;
-    public final static short       ANCHOR_ID_Z_AXIS               = 7;
-    private  short      field_2_link1;
-    private  short      field_3_link2;
-
-
-    public ObjectLinkRecord()
-    {
-
-    }
-
-    public ObjectLinkRecord(RecordInputStream in)
-    {
-        field_1_anchorId               = in.readShort();
-        field_2_link1                  = in.readShort();
-        field_3_link2                  = in.readShort();
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[OBJECTLINK]\n");
-        buffer.append("    .anchorId             = ")
-            .append("0x").append(HexDump.toHex(  getAnchorId ()))
-            .append(" (").append( getAnchorId() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .link1                = ")
-            .append("0x").append(HexDump.toHex(  getLink1 ()))
-            .append(" (").append( getLink1() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .link2                = ")
-            .append("0x").append(HexDump.toHex(  getLink2 ()))
-            .append(" (").append( getLink2() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/OBJECTLINK]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_anchorId);
-        out.writeShort(field_2_link1);
-        out.writeShort(field_3_link2);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    @Override
-    public ObjectLinkRecord clone() {
-        ObjectLinkRecord rec = new ObjectLinkRecord();
-    
-        rec.field_1_anchorId = field_1_anchorId;
-        rec.field_2_link1 = field_2_link1;
-        rec.field_3_link2 = field_3_link2;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the anchor id field for the ObjectLink record.
-     *
-     * @return  One of 
-     *        ANCHOR_ID_CHART_TITLE
-     *        ANCHOR_ID_Y_AXIS
-     *        ANCHOR_ID_X_AXIS
-     *        ANCHOR_ID_SERIES_OR_POINT
-     *        ANCHOR_ID_Z_AXIS
-     */
-    public short getAnchorId()
-    {
-        return field_1_anchorId;
-    }
-
-    /**
-     * Set the anchor id field for the ObjectLink record.
-     *
-     * @param field_1_anchorId
-     *        One of 
-     *        ANCHOR_ID_CHART_TITLE
-     *        ANCHOR_ID_Y_AXIS
-     *        ANCHOR_ID_X_AXIS
-     *        ANCHOR_ID_SERIES_OR_POINT
-     *        ANCHOR_ID_Z_AXIS
-     */
-    public void setAnchorId(short field_1_anchorId)
-    {
-        this.field_1_anchorId = field_1_anchorId;
-    }
-
-    /**
-     * Get the link 1 field for the ObjectLink record.
-     */
-    public short getLink1()
-    {
-        return field_2_link1;
-    }
-
-    /**
-     * Set the link 1 field for the ObjectLink record.
-     */
-    public void setLink1(short field_2_link1)
-    {
-        this.field_2_link1 = field_2_link1;
-    }
-
-    /**
-     * Get the link 2 field for the ObjectLink record.
-     */
-    public short getLink2()
-    {
-        return field_3_link2;
-    }
-
-    /**
-     * Set the link 2 field for the ObjectLink record.
-     */
-    public void setLink2(short field_3_link2)
-    {
-        this.field_3_link2 = field_3_link2;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
deleted file mode 100644
index 775354c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * preceeds and identifies a frame as belonging to the plot area.
- */
-public final class PlotAreaRecord extends StandardRecord {
-    public final static short      sid                             = 0x1035;
-
-
-    public PlotAreaRecord()
-    {
-
-    }
-
-    /**
-     * @param in unused (since this record has no data)
-     */
-    public PlotAreaRecord(RecordInputStream in)
-    {
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PLOTAREA]\n");
-
-        buffer.append("[/PLOTAREA]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-    }
-
-    protected int getDataSize() {
-        return 0;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        PlotAreaRecord rec = new PlotAreaRecord();
-    
-        return rec;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
deleted file mode 100644
index aa326ac..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The plot growth record specifies the scaling factors used when a font is scaled.
- */
-public final class PlotGrowthRecord extends StandardRecord {
-    public final static short      sid                             = 0x1064;
-    private  int        field_1_horizontalScale;
-    private  int        field_2_verticalScale;
-
-
-    public PlotGrowthRecord()
-    {
-
-    }
-
-    public PlotGrowthRecord(RecordInputStream in)
-    {
-        field_1_horizontalScale        = in.readInt();
-        field_2_verticalScale          = in.readInt();
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[PLOTGROWTH]\n");
-        buffer.append("    .horizontalScale      = ")
-            .append("0x").append(HexDump.toHex(  getHorizontalScale ()))
-            .append(" (").append( getHorizontalScale() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .verticalScale        = ")
-            .append("0x").append(HexDump.toHex(  getVerticalScale ()))
-            .append(" (").append( getVerticalScale() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/PLOTGROWTH]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(field_1_horizontalScale);
-        out.writeInt(field_2_verticalScale);
-    }
-
-    protected int getDataSize() {
-        return 4 + 4;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        PlotGrowthRecord rec = new PlotGrowthRecord();
-    
-        rec.field_1_horizontalScale = field_1_horizontalScale;
-        rec.field_2_verticalScale = field_2_verticalScale;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the horizontalScale field for the PlotGrowth record.
-     */
-    public int getHorizontalScale()
-    {
-        return field_1_horizontalScale;
-    }
-
-    /**
-     * Set the horizontalScale field for the PlotGrowth record.
-     */
-    public void setHorizontalScale(int field_1_horizontalScale)
-    {
-        this.field_1_horizontalScale = field_1_horizontalScale;
-    }
-
-    /**
-     * Get the verticalScale field for the PlotGrowth record.
-     */
-    public int getVerticalScale()
-    {
-        return field_2_verticalScale;
-    }
-
-    /**
-     * Set the verticalScale field for the PlotGrowth record.
-     */
-    public void setVerticalScale(int field_2_verticalScale)
-    {
-        this.field_2_verticalScale = field_2_verticalScale;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
deleted file mode 100644
index 18f428a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The series chart group index record stores the index to the CHARTFORMAT record (0 based).
- */
-public final class SeriesChartGroupIndexRecord extends StandardRecord {
-    public final static short      sid                             = 0x1045;
-    private  short      field_1_chartGroupIndex;
-
-
-    public SeriesChartGroupIndexRecord()
-    {
-
-    }
-
-    public SeriesChartGroupIndexRecord(RecordInputStream in)
-    {
-        field_1_chartGroupIndex        = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SERTOCRT]\n");
-        buffer.append("    .chartGroupIndex      = ")
-            .append("0x").append(HexDump.toHex(  getChartGroupIndex ()))
-            .append(" (").append( getChartGroupIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/SERTOCRT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_chartGroupIndex);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        SeriesChartGroupIndexRecord rec = new SeriesChartGroupIndexRecord();
-    
-        rec.field_1_chartGroupIndex = field_1_chartGroupIndex;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the chart group index field for the SeriesChartGroupIndex record.
-     */
-    public short getChartGroupIndex()
-    {
-        return field_1_chartGroupIndex;
-    }
-
-    /**
-     * Set the chart group index field for the SeriesChartGroupIndex record.
-     */
-    public void setChartGroupIndex(short field_1_chartGroupIndex)
-    {
-        this.field_1_chartGroupIndex = field_1_chartGroupIndex;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
deleted file mode 100644
index 08efc7f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * links a series to its position in the series list.
- */
-public final class SeriesIndexRecord extends StandardRecord {
-    public final static short      sid                             = 0x1065;
-    private  short      field_1_index;
-
-
-    public SeriesIndexRecord()
-    {
-
-    }
-
-    public SeriesIndexRecord(RecordInputStream in)
-    {
-        field_1_index                  = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SINDEX]\n");
-        buffer.append("    .index                = ")
-            .append("0x").append(HexDump.toHex(  getIndex ()))
-            .append(" (").append( getIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/SINDEX]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_index);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        SeriesIndexRecord rec = new SeriesIndexRecord();
-    
-        rec.field_1_index = field_1_index;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the index field for the SeriesIndex record.
-     */
-    public short getIndex()
-    {
-        return field_1_index;
-    }
-
-    /**
-     * Set the index field for the SeriesIndex record.
-     */
-    public void setIndex(short field_1_index)
-    {
-        this.field_1_index = field_1_index;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
deleted file mode 100644
index 9fff21a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The series label record defines the type of label associated with the data format record.<p/>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class SeriesLabelsRecord extends StandardRecord {
-    public final static short      sid = 0x100c;
-
-    private static final BitField showActual        = BitFieldFactory.getInstance(0x01);
-    private static final BitField showPercent       = BitFieldFactory.getInstance(0x02);
-    private static final BitField labelAsPercentage = BitFieldFactory.getInstance(0x04);
-    private static final BitField smoothedLine      = BitFieldFactory.getInstance(0x08);
-    private static final BitField showLabel         = BitFieldFactory.getInstance(0x10);
-    private static final BitField showBubbleSizes   = BitFieldFactory.getInstance(0x20);
-
-    private  short      field_1_formatFlags;
-
-    public SeriesLabelsRecord()
-    {
-
-    }
-
-    public SeriesLabelsRecord(RecordInputStream in)
-    {
-        field_1_formatFlags            = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[ATTACHEDLABEL]\n");
-        buffer.append("    .formatFlags          = ")
-            .append("0x").append(HexDump.toHex(  getFormatFlags ()))
-            .append(" (").append( getFormatFlags() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .showActual               = ").append(isShowActual()).append('\n'); 
-        buffer.append("         .showPercent              = ").append(isShowPercent()).append('\n'); 
-        buffer.append("         .labelAsPercentage        = ").append(isLabelAsPercentage()).append('\n'); 
-        buffer.append("         .smoothedLine             = ").append(isSmoothedLine()).append('\n'); 
-        buffer.append("         .showLabel                = ").append(isShowLabel()).append('\n'); 
-        buffer.append("         .showBubbleSizes          = ").append(isShowBubbleSizes()).append('\n'); 
-
-        buffer.append("[/ATTACHEDLABEL]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_formatFlags);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        SeriesLabelsRecord rec = new SeriesLabelsRecord();
-    
-        rec.field_1_formatFlags = field_1_formatFlags;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the format flags field for the SeriesLabels record.
-     */
-    public short getFormatFlags()
-    {
-        return field_1_formatFlags;
-    }
-
-    /**
-     * Set the format flags field for the SeriesLabels record.
-     */
-    public void setFormatFlags(short field_1_formatFlags)
-    {
-        this.field_1_formatFlags = field_1_formatFlags;
-    }
-
-    /**
-     * Sets the show actual field value.
-     * show actual value of the data point
-     */
-    public void setShowActual(boolean value)
-    {
-        field_1_formatFlags = showActual.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * show actual value of the data point
-     * @return  the show actual field value.
-     */
-    public boolean isShowActual()
-    {
-        return showActual.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the show percent field value.
-     * show value as percentage of total (pie charts only)
-     */
-    public void setShowPercent(boolean value)
-    {
-        field_1_formatFlags = showPercent.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * show value as percentage of total (pie charts only)
-     * @return  the show percent field value.
-     */
-    public boolean isShowPercent()
-    {
-        return showPercent.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the label as percentage field value.
-     * show category label/value as percentage (pie charts only)
-     */
-    public void setLabelAsPercentage(boolean value)
-    {
-        field_1_formatFlags = labelAsPercentage.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * show category label/value as percentage (pie charts only)
-     * @return  the label as percentage field value.
-     */
-    public boolean isLabelAsPercentage()
-    {
-        return labelAsPercentage.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the smoothed line field value.
-     * show smooth line
-     */
-    public void setSmoothedLine(boolean value)
-    {
-        field_1_formatFlags = smoothedLine.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * show smooth line
-     * @return  the smoothed line field value.
-     */
-    public boolean isSmoothedLine()
-    {
-        return smoothedLine.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the show label field value.
-     * display category label
-     */
-    public void setShowLabel(boolean value)
-    {
-        field_1_formatFlags = showLabel.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * display category label
-     * @return  the show label field value.
-     */
-    public boolean isShowLabel()
-    {
-        return showLabel.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the show bubble sizes field value.
-     * ??
-     */
-    public void setShowBubbleSizes(boolean value)
-    {
-        field_1_formatFlags = showBubbleSizes.setShortBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * ??
-     * @return  the show bubble sizes field value.
-     */
-    public boolean isShowBubbleSizes()
-    {
-        return showBubbleSizes.isSet(field_1_formatFlags);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
deleted file mode 100644
index 5d101f9..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import java.util.Arrays;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * SERIESLIST (0x1016)<p>
- * 
- * The series list record defines the series displayed as an overlay to the main chart record.<p>
- * 
- * (As with all chart related records, documentation is lacking.
- * See {@link ChartRecord} for more details)
- */
-public final class SeriesListRecord extends StandardRecord {
-    public final static short sid = 0x1016;
-    private  short[]    field_1_seriesNumbers;
-
-    public SeriesListRecord(short[] seriesNumbers) {
-    	field_1_seriesNumbers = (seriesNumbers == null) ? null : seriesNumbers.clone();
-    }
-
-    public SeriesListRecord(RecordInputStream in) {
-    	int nItems = in.readUShort();
-    	short[] ss = new short[nItems];
-    	for (int i = 0; i < nItems; i++) {
-			ss[i] = in.readShort();
-			
-		}
-        field_1_seriesNumbers = ss;
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        
-        buffer.append("[SERIESLIST]\n");
-        buffer.append("    .seriesNumbers= ").append(" (").append( Arrays.toString(getSeriesNumbers()) ).append(" )");
-        buffer.append("\n"); 
-
-        buffer.append("[/SERIESLIST]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-
-        int nItems = field_1_seriesNumbers.length;
-        out.writeShort(nItems);
-    	for (int i = 0; i < nItems; i++) {
-    		out.writeShort(field_1_seriesNumbers[i]);
-    	}
-    }
-
-    protected int getDataSize() {
-        return field_1_seriesNumbers.length * 2 + 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public Object clone() {
-        return new SeriesListRecord(field_1_seriesNumbers);
-    }
-
-    /**
-     * Get the series numbers field for the SeriesList record.
-     */
-    public short[] getSeriesNumbers() {
-        return field_1_seriesNumbers;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
deleted file mode 100644
index 0ff5564..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The series record describes the overall data for a series.
- */
-public final class SeriesRecord extends StandardRecord {
-    public final static short      sid                             = 0x1003;
-    private  short      field_1_categoryDataType;
-    public final static short       CATEGORY_DATA_TYPE_DATES       = 0;
-    public final static short       CATEGORY_DATA_TYPE_NUMERIC     = 1;
-    public final static short       CATEGORY_DATA_TYPE_SEQUENCE    = 2;
-    public final static short       CATEGORY_DATA_TYPE_TEXT        = 3;
-    private  short      field_2_valuesDataType;
-    public final static short       VALUES_DATA_TYPE_DATES         = 0;
-    public final static short       VALUES_DATA_TYPE_NUMERIC       = 1;
-    public final static short       VALUES_DATA_TYPE_SEQUENCE      = 2;
-    public final static short       VALUES_DATA_TYPE_TEXT          = 3;
-    private  short      field_3_numCategories;
-    private  short      field_4_numValues;
-    private  short      field_5_bubbleSeriesType;
-    public final static short       BUBBLE_SERIES_TYPE_DATES       = 0;
-    public final static short       BUBBLE_SERIES_TYPE_NUMERIC     = 1;
-    public final static short       BUBBLE_SERIES_TYPE_SEQUENCE    = 2;
-    public final static short       BUBBLE_SERIES_TYPE_TEXT        = 3;
-    private  short      field_6_numBubbleValues;
-
-
-    public SeriesRecord()
-    {
-
-    }
-
-    public SeriesRecord(RecordInputStream in)
-    {
-        field_1_categoryDataType       = in.readShort();
-        field_2_valuesDataType         = in.readShort();
-        field_3_numCategories          = in.readShort();
-        field_4_numValues              = in.readShort();
-        field_5_bubbleSeriesType       = in.readShort();
-        field_6_numBubbleValues        = in.readShort();
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SERIES]\n");
-        buffer.append("    .categoryDataType     = ")
-            .append("0x").append(HexDump.toHex(  getCategoryDataType ()))
-            .append(" (").append( getCategoryDataType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .valuesDataType       = ")
-            .append("0x").append(HexDump.toHex(  getValuesDataType ()))
-            .append(" (").append( getValuesDataType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .numCategories        = ")
-            .append("0x").append(HexDump.toHex(  getNumCategories ()))
-            .append(" (").append( getNumCategories() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .numValues            = ")
-            .append("0x").append(HexDump.toHex(  getNumValues ()))
-            .append(" (").append( getNumValues() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .bubbleSeriesType     = ")
-            .append("0x").append(HexDump.toHex(  getBubbleSeriesType ()))
-            .append(" (").append( getBubbleSeriesType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .numBubbleValues      = ")
-            .append("0x").append(HexDump.toHex(  getNumBubbleValues ()))
-            .append(" (").append( getNumBubbleValues() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/SERIES]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_categoryDataType);
-        out.writeShort(field_2_valuesDataType);
-        out.writeShort(field_3_numCategories);
-        out.writeShort(field_4_numValues);
-        out.writeShort(field_5_bubbleSeriesType);
-        out.writeShort(field_6_numBubbleValues);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2 + 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        SeriesRecord rec = new SeriesRecord();
-    
-        rec.field_1_categoryDataType = field_1_categoryDataType;
-        rec.field_2_valuesDataType = field_2_valuesDataType;
-        rec.field_3_numCategories = field_3_numCategories;
-        rec.field_4_numValues = field_4_numValues;
-        rec.field_5_bubbleSeriesType = field_5_bubbleSeriesType;
-        rec.field_6_numBubbleValues = field_6_numBubbleValues;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the category data type field for the Series record.
-     *
-     * @return  One of 
-     *        CATEGORY_DATA_TYPE_DATES
-     *        CATEGORY_DATA_TYPE_NUMERIC
-     *        CATEGORY_DATA_TYPE_SEQUENCE
-     *        CATEGORY_DATA_TYPE_TEXT
-     */
-    public short getCategoryDataType()
-    {
-        return field_1_categoryDataType;
-    }
-
-    /**
-     * Set the category data type field for the Series record.
-     *
-     * @param field_1_categoryDataType
-     *        One of 
-     *        CATEGORY_DATA_TYPE_DATES
-     *        CATEGORY_DATA_TYPE_NUMERIC
-     *        CATEGORY_DATA_TYPE_SEQUENCE
-     *        CATEGORY_DATA_TYPE_TEXT
-     */
-    public void setCategoryDataType(short field_1_categoryDataType)
-    {
-        this.field_1_categoryDataType = field_1_categoryDataType;
-    }
-
-    /**
-     * Get the values data type field for the Series record.
-     *
-     * @return  One of 
-     *        VALUES_DATA_TYPE_DATES
-     *        VALUES_DATA_TYPE_NUMERIC
-     *        VALUES_DATA_TYPE_SEQUENCE
-     *        VALUES_DATA_TYPE_TEXT
-     */
-    public short getValuesDataType()
-    {
-        return field_2_valuesDataType;
-    }
-
-    /**
-     * Set the values data type field for the Series record.
-     *
-     * @param field_2_valuesDataType
-     *        One of 
-     *        VALUES_DATA_TYPE_DATES
-     *        VALUES_DATA_TYPE_NUMERIC
-     *        VALUES_DATA_TYPE_SEQUENCE
-     *        VALUES_DATA_TYPE_TEXT
-     */
-    public void setValuesDataType(short field_2_valuesDataType)
-    {
-        this.field_2_valuesDataType = field_2_valuesDataType;
-    }
-
-    /**
-     * Get the num categories field for the Series record.
-     */
-    public short getNumCategories()
-    {
-        return field_3_numCategories;
-    }
-
-    /**
-     * Set the num categories field for the Series record.
-     */
-    public void setNumCategories(short field_3_numCategories)
-    {
-        this.field_3_numCategories = field_3_numCategories;
-    }
-
-    /**
-     * Get the num values field for the Series record.
-     */
-    public short getNumValues()
-    {
-        return field_4_numValues;
-    }
-
-    /**
-     * Set the num values field for the Series record.
-     */
-    public void setNumValues(short field_4_numValues)
-    {
-        this.field_4_numValues = field_4_numValues;
-    }
-
-    /**
-     * Get the bubble series type field for the Series record.
-     *
-     * @return  One of 
-     *        BUBBLE_SERIES_TYPE_DATES
-     *        BUBBLE_SERIES_TYPE_NUMERIC
-     *        BUBBLE_SERIES_TYPE_SEQUENCE
-     *        BUBBLE_SERIES_TYPE_TEXT
-     */
-    public short getBubbleSeriesType()
-    {
-        return field_5_bubbleSeriesType;
-    }
-
-    /**
-     * Set the bubble series type field for the Series record.
-     *
-     * @param field_5_bubbleSeriesType
-     *        One of 
-     *        BUBBLE_SERIES_TYPE_DATES
-     *        BUBBLE_SERIES_TYPE_NUMERIC
-     *        BUBBLE_SERIES_TYPE_SEQUENCE
-     *        BUBBLE_SERIES_TYPE_TEXT
-     */
-    public void setBubbleSeriesType(short field_5_bubbleSeriesType)
-    {
-        this.field_5_bubbleSeriesType = field_5_bubbleSeriesType;
-    }
-
-    /**
-     * Get the num bubble values field for the Series record.
-     */
-    public short getNumBubbleValues()
-    {
-        return field_6_numBubbleValues;
-    }
-
-    /**
-     * Set the num bubble values field for the Series record.
-     */
-    public void setNumBubbleValues(short field_6_numBubbleValues)
-    {
-        this.field_6_numBubbleValues = field_6_numBubbleValues;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
deleted file mode 100644
index 7e34989..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * SERIESTEXT (0x100D)<p> 
- * Defines a series name
- */
-public final class SeriesTextRecord extends StandardRecord {
-	public final static short sid = 0x100D;
-
-	/** the actual text cannot be longer than 255 characters */
-	private static final int MAX_LEN = 0xFF;
-	private int field_1_id;
-	private boolean is16bit;
-	private String field_4_text;
-
-	public SeriesTextRecord() {
-		field_4_text = "";
-		is16bit = false;
-	}
-
-	public SeriesTextRecord(RecordInputStream in) {
-		field_1_id = in.readUShort();
-		int field_2_textLength = in.readUByte();
-		is16bit = (in.readUByte() & 0x01) != 0;
-		if (is16bit) {
-			field_4_text = in.readUnicodeLEString(field_2_textLength);
-		} else {
-			field_4_text = in.readCompressedUnicode(field_2_textLength);
-		}
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("[SERIESTEXT]\n");
-		sb.append("  .id     =").append(HexDump.shortToHex(getId())).append('\n');
-		sb.append("  .textLen=").append(field_4_text.length()).append('\n');
-		sb.append("  .is16bit=").append(is16bit).append('\n');
-		sb.append("  .text   =").append(" (").append(getText()).append(" )").append('\n');
-		sb.append("[/SERIESTEXT]\n");
-		return sb.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-
-		out.writeShort(field_1_id);
-		out.writeByte(field_4_text.length());
-		if (is16bit) {
-			// Excel (2007) seems to choose 16bit regardless of whether it is needed
-			out.writeByte(0x01);
-			StringUtil.putUnicodeLE(field_4_text, out);
-		} else {
-			// Excel can read this OK
-			out.writeByte(0x00);
-			StringUtil.putCompressedUnicode(field_4_text, out);
-		}
-	}
-
-	protected int getDataSize() {
-		return 2 + 1 + 1 + field_4_text.length() * (is16bit ? 2 : 1);
-	}
-
-	public short getSid() {
-		return sid;
-	}
-
-	public Object clone() {
-		SeriesTextRecord rec = new SeriesTextRecord();
-
-		rec.field_1_id = field_1_id;
-		rec.is16bit = is16bit;
-		rec.field_4_text = field_4_text;
-		return rec;
-	}
-
-	/**
-	 * Get the id field for the SeriesText record.
-	 */
-	public int getId() {
-		return field_1_id;
-	}
-
-	/**
-	 * Set the id field for the SeriesText record.
-	 */
-	public void setId(int id) {
-		field_1_id = id;
-	}
-
-	/**
-	 * Get the text field for the SeriesText record.
-	 */
-	public String getText() {
-		return field_4_text;
-	}
-
-	/**
-	 * Set the text field for the SeriesText record.
-	 */
-	public void setText(String text) {
-		if (text.length() > MAX_LEN) {
-			throw new IllegalArgumentException("Text is too long ("
-					+ text.length() + ">" + MAX_LEN + ")");
-		}
-		field_4_text = text;
-		is16bit = StringUtil.hasMultibyte(text);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesToChartGroupRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesToChartGroupRecord.java
deleted file mode 100644
index fcb73e8..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SeriesToChartGroupRecord.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Indicates the chart-group index for a series. The order probably defines the mapping.  
- * So the 0th record probably means the 0th series. The only field in this of course defines which chart 
- * group the 0th series (for instance) would map to. Confusing?  Well thats because it is.  (p 522 BCG)
- */
-public final class SeriesToChartGroupRecord extends StandardRecord {
-    public final static short      sid                             = 0x1045;
-    private  short      field_1_chartGroupIndex;
-
-
-    public SeriesToChartGroupRecord()
-    {
-
-    }
-
-    public SeriesToChartGroupRecord(RecordInputStream in)
-    {
-        field_1_chartGroupIndex        = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SeriesToChartGroup]\n");
-        buffer.append("    .chartGroupIndex      = ")
-            .append("0x").append(HexDump.toHex(  getChartGroupIndex ()))
-            .append(" (").append( getChartGroupIndex() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/SeriesToChartGroup]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_chartGroupIndex);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        SeriesToChartGroupRecord rec = new SeriesToChartGroupRecord();
-    
-        rec.field_1_chartGroupIndex = field_1_chartGroupIndex;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the chart group index field for the SeriesToChartGroup record.
-     */
-    public short getChartGroupIndex()
-    {
-        return field_1_chartGroupIndex;
-    }
-
-    /**
-     * Set the chart group index field for the SeriesToChartGroup record.
-     */
-    public void setChartGroupIndex(short field_1_chartGroupIndex)
-    {
-        this.field_1_chartGroupIndex = field_1_chartGroupIndex;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
deleted file mode 100644
index d264459..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Describes a chart sheet properties record. SHTPROPS (0x1044)<p>
- * 
- * (As with all chart related records, documentation is lacking.
- * See {@link ChartRecord} for more details)
- */
-public final class SheetPropertiesRecord extends StandardRecord {
-    public final static short sid = 0x1044;
-    
-    private static final BitField chartTypeManuallyFormatted = BitFieldFactory.getInstance(0x01);
-    private static final BitField plotVisibleOnly            = BitFieldFactory.getInstance(0x02);
-    private static final BitField doNotSizeWithWindow        = BitFieldFactory.getInstance(0x04);
-    private static final BitField defaultPlotDimensions      = BitFieldFactory.getInstance(0x08);
-    private static final BitField autoPlotArea               = BitFieldFactory.getInstance(0x10);
-    
-    private int field_1_flags;
-    private int field_2_empty;
-    public final static byte        EMPTY_NOT_PLOTTED              = 0;
-    public final static byte        EMPTY_ZERO                     = 1;
-    public final static byte        EMPTY_INTERPOLATED             = 2;
-
-
-    public SheetPropertiesRecord() {
-        // fields uninitialised
-    }
-
-    public SheetPropertiesRecord(RecordInputStream in) {
-        field_1_flags = in.readUShort();
-        field_2_empty = in.readUShort();
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[SHTPROPS]\n");
-        buffer.append("    .flags                = ").append(HexDump.shortToHex(field_1_flags)).append('\n');
-        buffer.append("         .chartTypeManuallyFormatted= ").append(isChartTypeManuallyFormatted()).append('\n'); 
-        buffer.append("         .plotVisibleOnly           = ").append(isPlotVisibleOnly()).append('\n'); 
-        buffer.append("         .doNotSizeWithWindow       = ").append(isDoNotSizeWithWindow()).append('\n'); 
-        buffer.append("         .defaultPlotDimensions     = ").append(isDefaultPlotDimensions()).append('\n'); 
-        buffer.append("         .autoPlotArea              = ").append(isAutoPlotArea()).append('\n'); 
-        buffer.append("    .empty                = ").append(HexDump.shortToHex(field_2_empty)).append('\n'); 
-
-        buffer.append("[/SHTPROPS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_flags);
-        out.writeShort(field_2_empty);
-    }
-
-    protected int getDataSize() {
-        return 2 + 2;
-    }
-
-    public short getSid() {
-        return sid;
-    }
-
-    public Object clone() {
-        SheetPropertiesRecord rec = new SheetPropertiesRecord();
-    
-        rec.field_1_flags = field_1_flags;
-        rec.field_2_empty = field_2_empty;
-        return rec;
-    }
-
-    /**
-     * Get the flags field for the SheetProperties record.
-     */
-    public int getFlags() {
-        return field_1_flags;
-    }
-
-    /**
-     * Get the empty field for the SheetProperties record.
-     *
-     * @return  One of 
-     *        EMPTY_NOT_PLOTTED
-     *        EMPTY_ZERO
-     *        EMPTY_INTERPOLATED
-     */
-    public int getEmpty() {
-        return field_2_empty;
-    }
-
-    /**
-     * Set the empty field for the SheetProperties record.
-     *
-     * @param empty
-     *        One of 
-     *        EMPTY_NOT_PLOTTED
-     *        EMPTY_ZERO
-     *        EMPTY_INTERPOLATED
-     */
-    public void setEmpty(byte empty) {
-        this.field_2_empty = empty;
-    }
-
-    /**
-     * Sets the chart type manually formatted field value.
-     * Has the chart type been manually formatted?
-     */
-    public void setChartTypeManuallyFormatted(boolean value) {
-        field_1_flags = chartTypeManuallyFormatted.setBoolean(field_1_flags, value);
-    }
-
-    /**
-     * Has the chart type been manually formatted?
-     * @return  the chart type manually formatted field value.
-     */
-    public boolean isChartTypeManuallyFormatted() {
-        return chartTypeManuallyFormatted.isSet(field_1_flags);
-    }
-
-    /**
-     * Sets the plot visible only field value.
-     * Only show visible cells on the chart.
-     */
-    public void setPlotVisibleOnly(boolean value) {
-        field_1_flags = plotVisibleOnly.setBoolean(field_1_flags, value);
-    }
-
-    /**
-     * Only show visible cells on the chart.
-     * @return  the plot visible only field value.
-     */
-    public boolean isPlotVisibleOnly() {
-        return plotVisibleOnly.isSet(field_1_flags);
-    }
-
-    /**
-     * Sets the do not size with window field value.
-     * Do not size the chart when the window changes size
-     */
-    public void setDoNotSizeWithWindow(boolean value) {
-        field_1_flags = doNotSizeWithWindow.setBoolean(field_1_flags, value);
-    }
-
-    /**
-     * Do not size the chart when the window changes size
-     * @return  the do not size with window field value.
-     */
-    public boolean isDoNotSizeWithWindow() {
-        return doNotSizeWithWindow.isSet(field_1_flags);
-    }
-
-    /**
-     * Sets the default plot dimensions field value.
-     * Indicates that the default area dimensions should be used.
-     */
-    public void setDefaultPlotDimensions(boolean value) {
-        field_1_flags = defaultPlotDimensions.setBoolean(field_1_flags, value);
-    }
-
-    /**
-     * Indicates that the default area dimensions should be used.
-     * @return  the default plot dimensions field value.
-     */
-    public boolean isDefaultPlotDimensions() {
-        return defaultPlotDimensions.isSet(field_1_flags);
-    }
-
-    /**
-     * Sets the auto plot area field value.
-     * ??
-     */
-    public void setAutoPlotArea(boolean value)  {
-        field_1_flags = autoPlotArea.setBoolean(field_1_flags, value);
-    }
-
-    /**
-     * ??
-     * @return  the auto plot area field value.
-     */
-    public boolean isAutoPlotArea() {
-        return autoPlotArea.isSet(field_1_flags);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/TextRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
deleted file mode 100644
index 28fb653..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The text record is used to define text stored on a chart.
- */
-public final class TextRecord extends StandardRecord {
-    public final static short      sid                             = 0x1025;
-    
-    private static final BitField dataLabelPlacement            = BitFieldFactory.getInstance(0x000F);
-    private static final BitField autoColor                     = BitFieldFactory.getInstance(0x0001);
-    private static final BitField showKey                       = BitFieldFactory.getInstance(0x0002);
-    private static final BitField showValue                     = BitFieldFactory.getInstance(0x0004);
-    private static final BitField vertical                      = BitFieldFactory.getInstance(0x0008);
-    private static final BitField autoGeneratedText             = BitFieldFactory.getInstance(0x0010);
-    private static final BitField generated                     = BitFieldFactory.getInstance(0x0020);
-    private static final BitField autoLabelDeleted              = BitFieldFactory.getInstance(0x0040);
-    private static final BitField autoBackground                = BitFieldFactory.getInstance(0x0080);
-    private static final BitField rotation                      = BitFieldFactory.getInstance(0x0700);
-
-    private static final BitField showCategoryLabelAsPercentage = BitFieldFactory.getInstance(0x0800);
-    private static final BitField showValueAsPercentage         = BitFieldFactory.getInstance(0x1000);
-    private static final BitField showBubbleSizes               = BitFieldFactory.getInstance(0x2000);
-    private static final BitField showLabel                     = BitFieldFactory.getInstance(0x4000);
-    
-    
-    private  byte       field_1_horizontalAlignment;
-    public final static byte        HORIZONTAL_ALIGNMENT_LEFT      = 1;
-    public final static byte        HORIZONTAL_ALIGNMENT_CENTER    = 2;
-    public final static byte        HORIZONTAL_ALIGNMENT_BOTTOM    = 3;
-    public final static byte        HORIZONTAL_ALIGNMENT_JUSTIFY   = 4;
-    private  byte       field_2_verticalAlignment;
-    public final static byte        VERTICAL_ALIGNMENT_TOP         = 1;
-    public final static byte        VERTICAL_ALIGNMENT_CENTER      = 2;
-    public final static byte        VERTICAL_ALIGNMENT_BOTTOM      = 3;
-    public final static byte        VERTICAL_ALIGNMENT_JUSTIFY     = 4;
-    private  short      field_3_displayMode;
-    public final static short       DISPLAY_MODE_TRANSPARENT       = 1;
-    public final static short       DISPLAY_MODE_OPAQUE            = 2;
-    private  int        field_4_rgbColor;
-    private  int        field_5_x;
-    private  int        field_6_y;
-    private  int        field_7_width;
-    private  int        field_8_height;
-    private  short      field_9_options1;
-    public final static short  ROTATION_NONE                  = 0;
-    public final static short  ROTATION_TOP_TO_BOTTOM         = 1;
-    public final static short  ROTATION_ROTATED_90_DEGREES    = 2;
-    public final static short  ROTATION_ROTATED_90_DEGREES_CLOCKWISE = 3;
-    private  short      field_10_indexOfColorValue;
-    private  short      field_11_options2;
-    public final static short  DATA_LABEL_PLACEMENT_CHART_DEPENDENT = 0;
-    public final static short  DATA_LABEL_PLACEMENT_OUTSIDE   = 1;
-    public final static short  DATA_LABEL_PLACEMENT_INSIDE    = 2;
-    public final static short  DATA_LABEL_PLACEMENT_CENTER    = 3;
-    public final static short  DATA_LABEL_PLACEMENT_AXIS      = 4;
-    public final static short  DATA_LABEL_PLACEMENT_ABOVE     = 5;
-    public final static short  DATA_LABEL_PLACEMENT_BELOW     = 6;
-    public final static short  DATA_LABEL_PLACEMENT_LEFT      = 7;
-    public final static short  DATA_LABEL_PLACEMENT_RIGHT     = 8;
-    public final static short  DATA_LABEL_PLACEMENT_AUTO      = 9;
-    public final static short  DATA_LABEL_PLACEMENT_USER_MOVED = 10;
-    private  short      field_12_textRotation;
-
-
-    public TextRecord()
-    {
-
-    }
-
-    public TextRecord(RecordInputStream in)
-    {
-        field_1_horizontalAlignment    = in.readByte();
-        field_2_verticalAlignment      = in.readByte();
-        field_3_displayMode            = in.readShort();
-        field_4_rgbColor               = in.readInt();
-        field_5_x                      = in.readInt();
-        field_6_y                      = in.readInt();
-        field_7_width                  = in.readInt();
-        field_8_height                 = in.readInt();
-        field_9_options1               = in.readShort();
-        field_10_indexOfColorValue     = in.readShort();
-        field_11_options2              = in.readShort();
-        field_12_textRotation          = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[TEXT]\n");
-        buffer.append("    .horizontalAlignment  = ")
-            .append("0x").append(HexDump.toHex(  getHorizontalAlignment ()))
-            .append(" (").append( getHorizontalAlignment() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .verticalAlignment    = ")
-            .append("0x").append(HexDump.toHex(  getVerticalAlignment ()))
-            .append(" (").append( getVerticalAlignment() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .displayMode          = ")
-            .append("0x").append(HexDump.toHex(  getDisplayMode ()))
-            .append(" (").append( getDisplayMode() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .rgbColor             = ")
-            .append("0x").append(HexDump.toHex(  getRgbColor ()))
-            .append(" (").append( getRgbColor() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .x                    = ")
-            .append("0x").append(HexDump.toHex(  getX ()))
-            .append(" (").append( getX() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .y                    = ")
-            .append("0x").append(HexDump.toHex(  getY ()))
-            .append(" (").append( getY() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .width                = ")
-            .append("0x").append(HexDump.toHex(  getWidth ()))
-            .append(" (").append( getWidth() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .height               = ")
-            .append("0x").append(HexDump.toHex(  getHeight ()))
-            .append(" (").append( getHeight() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options1             = ")
-            .append("0x").append(HexDump.toHex(  getOptions1 ()))
-            .append(" (").append( getOptions1() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .autoColor                = ").append(isAutoColor()).append('\n'); 
-        buffer.append("         .showKey                  = ").append(isShowKey()).append('\n'); 
-        buffer.append("         .showValue                = ").append(isShowValue()).append('\n'); 
-        buffer.append("         .vertical                 = ").append(isVertical()).append('\n'); 
-        buffer.append("         .autoGeneratedText        = ").append(isAutoGeneratedText()).append('\n'); 
-        buffer.append("         .generated                = ").append(isGenerated()).append('\n'); 
-        buffer.append("         .autoLabelDeleted         = ").append(isAutoLabelDeleted()).append('\n'); 
-        buffer.append("         .autoBackground           = ").append(isAutoBackground()).append('\n'); 
-            buffer.append("         .rotation                 = ").append(getRotation()).append('\n'); 
-        buffer.append("         .showCategoryLabelAsPercentage     = ").append(isShowCategoryLabelAsPercentage()).append('\n'); 
-        buffer.append("         .showValueAsPercentage     = ").append(isShowValueAsPercentage()).append('\n'); 
-        buffer.append("         .showBubbleSizes          = ").append(isShowBubbleSizes()).append('\n'); 
-        buffer.append("         .showLabel                = ").append(isShowLabel()).append('\n'); 
-        buffer.append("    .indexOfColorValue    = ")
-            .append("0x").append(HexDump.toHex(  getIndexOfColorValue ()))
-            .append(" (").append( getIndexOfColorValue() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options2             = ")
-            .append("0x").append(HexDump.toHex(  getOptions2 ()))
-            .append(" (").append( getOptions2() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-            buffer.append("         .dataLabelPlacement       = ").append(getDataLabelPlacement()).append('\n'); 
-        buffer.append("    .textRotation         = ")
-            .append("0x").append(HexDump.toHex(  getTextRotation ()))
-            .append(" (").append( getTextRotation() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/TEXT]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeByte(field_1_horizontalAlignment);
-        out.writeByte(field_2_verticalAlignment);
-        out.writeShort(field_3_displayMode);
-        out.writeInt(field_4_rgbColor);
-        out.writeInt(field_5_x);
-        out.writeInt(field_6_y);
-        out.writeInt(field_7_width);
-        out.writeInt(field_8_height);
-        out.writeShort(field_9_options1);
-        out.writeShort(field_10_indexOfColorValue);
-        out.writeShort(field_11_options2);
-        out.writeShort(field_12_textRotation);
-    }
-
-    protected int getDataSize() {
-        return 1 + 1 + 2 + 4 + 4 + 4 + 4 + 4 + 2 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        TextRecord rec = new TextRecord();
-    
-        rec.field_1_horizontalAlignment = field_1_horizontalAlignment;
-        rec.field_2_verticalAlignment = field_2_verticalAlignment;
-        rec.field_3_displayMode = field_3_displayMode;
-        rec.field_4_rgbColor = field_4_rgbColor;
-        rec.field_5_x = field_5_x;
-        rec.field_6_y = field_6_y;
-        rec.field_7_width = field_7_width;
-        rec.field_8_height = field_8_height;
-        rec.field_9_options1 = field_9_options1;
-        rec.field_10_indexOfColorValue = field_10_indexOfColorValue;
-        rec.field_11_options2 = field_11_options2;
-        rec.field_12_textRotation = field_12_textRotation;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the horizontal alignment field for the Text record.
-     *
-     * @return  One of 
-     *        HORIZONTAL_ALIGNMENT_LEFT
-     *        HORIZONTAL_ALIGNMENT_CENTER
-     *        HORIZONTAL_ALIGNMENT_BOTTOM
-     *        HORIZONTAL_ALIGNMENT_JUSTIFY
-     */
-    public byte getHorizontalAlignment()
-    {
-        return field_1_horizontalAlignment;
-    }
-
-    /**
-     * Set the horizontal alignment field for the Text record.
-     *
-     * @param field_1_horizontalAlignment
-     *        One of 
-     *        HORIZONTAL_ALIGNMENT_LEFT
-     *        HORIZONTAL_ALIGNMENT_CENTER
-     *        HORIZONTAL_ALIGNMENT_BOTTOM
-     *        HORIZONTAL_ALIGNMENT_JUSTIFY
-     */
-    public void setHorizontalAlignment(byte field_1_horizontalAlignment)
-    {
-        this.field_1_horizontalAlignment = field_1_horizontalAlignment;
-    }
-
-    /**
-     * Get the vertical alignment field for the Text record.
-     *
-     * @return  One of 
-     *        VERTICAL_ALIGNMENT_TOP
-     *        VERTICAL_ALIGNMENT_CENTER
-     *        VERTICAL_ALIGNMENT_BOTTOM
-     *        VERTICAL_ALIGNMENT_JUSTIFY
-     */
-    public byte getVerticalAlignment()
-    {
-        return field_2_verticalAlignment;
-    }
-
-    /**
-     * Set the vertical alignment field for the Text record.
-     *
-     * @param field_2_verticalAlignment
-     *        One of 
-     *        VERTICAL_ALIGNMENT_TOP
-     *        VERTICAL_ALIGNMENT_CENTER
-     *        VERTICAL_ALIGNMENT_BOTTOM
-     *        VERTICAL_ALIGNMENT_JUSTIFY
-     */
-    public void setVerticalAlignment(byte field_2_verticalAlignment)
-    {
-        this.field_2_verticalAlignment = field_2_verticalAlignment;
-    }
-
-    /**
-     * Get the display mode field for the Text record.
-     *
-     * @return  One of 
-     *        DISPLAY_MODE_TRANSPARENT
-     *        DISPLAY_MODE_OPAQUE
-     */
-    public short getDisplayMode()
-    {
-        return field_3_displayMode;
-    }
-
-    /**
-     * Set the display mode field for the Text record.
-     *
-     * @param field_3_displayMode
-     *        One of 
-     *        DISPLAY_MODE_TRANSPARENT
-     *        DISPLAY_MODE_OPAQUE
-     */
-    public void setDisplayMode(short field_3_displayMode)
-    {
-        this.field_3_displayMode = field_3_displayMode;
-    }
-
-    /**
-     * Get the rgbColor field for the Text record.
-     */
-    public int getRgbColor()
-    {
-        return field_4_rgbColor;
-    }
-
-    /**
-     * Set the rgbColor field for the Text record.
-     */
-    public void setRgbColor(int field_4_rgbColor)
-    {
-        this.field_4_rgbColor = field_4_rgbColor;
-    }
-
-    /**
-     * Get the x field for the Text record.
-     */
-    public int getX()
-    {
-        return field_5_x;
-    }
-
-    /**
-     * Set the x field for the Text record.
-     */
-    public void setX(int field_5_x)
-    {
-        this.field_5_x = field_5_x;
-    }
-
-    /**
-     * Get the y field for the Text record.
-     */
-    public int getY()
-    {
-        return field_6_y;
-    }
-
-    /**
-     * Set the y field for the Text record.
-     */
-    public void setY(int field_6_y)
-    {
-        this.field_6_y = field_6_y;
-    }
-
-    /**
-     * Get the width field for the Text record.
-     */
-    public int getWidth()
-    {
-        return field_7_width;
-    }
-
-    /**
-     * Set the width field for the Text record.
-     */
-    public void setWidth(int field_7_width)
-    {
-        this.field_7_width = field_7_width;
-    }
-
-    /**
-     * Get the height field for the Text record.
-     */
-    public int getHeight()
-    {
-        return field_8_height;
-    }
-
-    /**
-     * Set the height field for the Text record.
-     */
-    public void setHeight(int field_8_height)
-    {
-        this.field_8_height = field_8_height;
-    }
-
-    /**
-     * Get the options1 field for the Text record.
-     */
-    public short getOptions1()
-    {
-        return field_9_options1;
-    }
-
-    /**
-     * Set the options1 field for the Text record.
-     */
-    public void setOptions1(short field_9_options1)
-    {
-        this.field_9_options1 = field_9_options1;
-    }
-
-    /**
-     * Get the index of color value field for the Text record.
-     */
-    public short getIndexOfColorValue()
-    {
-        return field_10_indexOfColorValue;
-    }
-
-    /**
-     * Set the index of color value field for the Text record.
-     */
-    public void setIndexOfColorValue(short field_10_indexOfColorValue)
-    {
-        this.field_10_indexOfColorValue = field_10_indexOfColorValue;
-    }
-
-    /**
-     * Get the options2 field for the Text record.
-     */
-    public short getOptions2()
-    {
-        return field_11_options2;
-    }
-
-    /**
-     * Set the options2 field for the Text record.
-     */
-    public void setOptions2(short field_11_options2)
-    {
-        this.field_11_options2 = field_11_options2;
-    }
-
-    /**
-     * Get the text rotation field for the Text record.
-     */
-    public short getTextRotation()
-    {
-        return field_12_textRotation;
-    }
-
-    /**
-     * Set the text rotation field for the Text record.
-     */
-    public void setTextRotation(short field_12_textRotation)
-    {
-        this.field_12_textRotation = field_12_textRotation;
-    }
-
-    /**
-     * Sets the auto color field value.
-     * true = automaticly selected colour, false = user-selected
-     */
-    public void setAutoColor(boolean value)
-    {
-        field_9_options1 = autoColor.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * true = automaticly selected colour, false = user-selected
-     * @return  the auto color field value.
-     */
-    public boolean isAutoColor()
-    {
-        return autoColor.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the show key field value.
-     * true = draw legend
-     */
-    public void setShowKey(boolean value)
-    {
-        field_9_options1 = showKey.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * true = draw legend
-     * @return  the show key field value.
-     */
-    public boolean isShowKey()
-    {
-        return showKey.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the show value field value.
-     * false = text is category label
-     */
-    public void setShowValue(boolean value)
-    {
-        field_9_options1 = showValue.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * false = text is category label
-     * @return  the show value field value.
-     */
-    public boolean isShowValue()
-    {
-        return showValue.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the vertical field value.
-     * true = text is vertical
-     */
-    public void setVertical(boolean value)
-    {
-        field_9_options1 = vertical.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * true = text is vertical
-     * @return  the vertical field value.
-     */
-    public boolean isVertical()
-    {
-        return vertical.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the auto generated text field value.
-     * 
-     */
-    public void setAutoGeneratedText(boolean value)
-    {
-        field_9_options1 = autoGeneratedText.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the auto generated text field value.
-     */
-    public boolean isAutoGeneratedText()
-    {
-        return autoGeneratedText.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the generated field value.
-     * 
-     */
-    public void setGenerated(boolean value)
-    {
-        field_9_options1 = generated.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the generated field value.
-     */
-    public boolean isGenerated()
-    {
-        return generated.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the auto label deleted field value.
-     * 
-     */
-    public void setAutoLabelDeleted(boolean value)
-    {
-        field_9_options1 = autoLabelDeleted.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the auto label deleted field value.
-     */
-    public boolean isAutoLabelDeleted()
-    {
-        return autoLabelDeleted.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the auto background field value.
-     * 
-     */
-    public void setAutoBackground(boolean value)
-    {
-        field_9_options1 = autoBackground.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the auto background field value.
-     */
-    public boolean isAutoBackground()
-    {
-        return autoBackground.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the rotation field value.
-     * 
-     */
-    public void setRotation(short value)
-    {
-        field_9_options1 = rotation.setShortValue(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the rotation field value.
-     */
-    public short getRotation()
-    {
-        return rotation.getShortValue(field_9_options1);
-    }
-
-    /**
-     * Sets the show category label as percentage field value.
-     * 
-     */
-    public void setShowCategoryLabelAsPercentage(boolean value)
-    {
-        field_9_options1 = showCategoryLabelAsPercentage.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the show category label as percentage field value.
-     */
-    public boolean isShowCategoryLabelAsPercentage()
-    {
-        return showCategoryLabelAsPercentage.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the show value as percentage field value.
-     * 
-     */
-    public void setShowValueAsPercentage(boolean value)
-    {
-        field_9_options1 = showValueAsPercentage.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the show value as percentage field value.
-     */
-    public boolean isShowValueAsPercentage()
-    {
-        return showValueAsPercentage.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the show bubble sizes field value.
-     * 
-     */
-    public void setShowBubbleSizes(boolean value)
-    {
-        field_9_options1 = showBubbleSizes.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the show bubble sizes field value.
-     */
-    public boolean isShowBubbleSizes()
-    {
-        return showBubbleSizes.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the show label field value.
-     * 
-     */
-    public void setShowLabel(boolean value)
-    {
-        field_9_options1 = showLabel.setShortBoolean(field_9_options1, value);
-    }
-
-    /**
-     * 
-     * @return  the show label field value.
-     */
-    public boolean isShowLabel()
-    {
-        return showLabel.isSet(field_9_options1);
-    }
-
-    /**
-     * Sets the data label placement field value.
-     * 
-     */
-    public void setDataLabelPlacement(short value)
-    {
-        field_11_options2 = dataLabelPlacement.setShortValue(field_11_options2, value);
-    }
-
-    /**
-     * 
-     * @return  the data label placement field value.
-     */
-    public short getDataLabelPlacement()
-    {
-        return dataLabelPlacement.getShortValue(field_11_options2);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/TickRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
deleted file mode 100644
index 993f570..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The Tick record defines how tick marks and label positioning/formatting<p/>
- * 
- * @author Andrew C. Oliver(acoliver at apache.org)
- */
-public final class TickRecord extends StandardRecord {
-    public final static short sid = 0x101E;
-    
-    private static final BitField autoTextColor      = BitFieldFactory.getInstance(0x1);
-    private static final BitField autoTextBackground = BitFieldFactory.getInstance(0x2);
-    private static final BitField rotation           = BitFieldFactory.getInstance(0x1c);
-    private static final BitField autorotate         = BitFieldFactory.getInstance(0x20);
-    
-    private  byte       field_1_majorTickType;
-    private  byte       field_2_minorTickType;
-    private  byte       field_3_labelPosition;
-    private  byte       field_4_background;
-    private  int        field_5_labelColorRgb;
-    private  int        field_6_zero1;
-    private  int        field_7_zero2;
-    private  int        field_8_zero3;
-    private  int        field_9_zero4;
-    private  short      field_10_options;
-    private  short      field_11_tickColor;
-    private  short      field_12_zero5;
-
-
-    public TickRecord()
-    {
-
-    }
-
-    public TickRecord(RecordInputStream in)
-    {
-
-        field_1_majorTickType          = in.readByte();
-        field_2_minorTickType          = in.readByte();
-        field_3_labelPosition          = in.readByte();
-        field_4_background             = in.readByte();
-        field_5_labelColorRgb          = in.readInt();
-        field_6_zero1                  = in.readInt();
-        field_7_zero2                  = in.readInt();
-        field_8_zero3                  = in.readInt();
-        field_9_zero4                  = in.readInt();
-        
-        field_10_options                = in.readShort();
-        field_11_tickColor              = in.readShort();
-        field_12_zero5                 = in.readShort();
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[TICK]\n");
-        buffer.append("    .majorTickType        = ")
-            .append("0x").append(HexDump.toHex(  getMajorTickType ()))
-            .append(" (").append( getMajorTickType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .minorTickType        = ")
-            .append("0x").append(HexDump.toHex(  getMinorTickType ()))
-            .append(" (").append( getMinorTickType() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .labelPosition        = ")
-            .append("0x").append(HexDump.toHex(  getLabelPosition ()))
-            .append(" (").append( getLabelPosition() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .background           = ")
-            .append("0x").append(HexDump.toHex(  getBackground ()))
-            .append(" (").append( getBackground() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .labelColorRgb        = ")
-            .append("0x").append(HexDump.toHex(  getLabelColorRgb ()))
-            .append(" (").append( getLabelColorRgb() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .zero1                = ")
-            .append("0x").append(HexDump.toHex(  getZero1 ()))
-            .append(" (").append( getZero1() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .zero2                = ")
-            .append("0x").append(HexDump.toHex(  getZero2 ()))
-            .append(" (").append( getZero2() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options              = ")
-            .append("0x").append(HexDump.toHex(  getOptions ()))
-            .append(" (").append( getOptions() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .autoTextColor            = ").append(isAutoTextColor()).append('\n'); 
-        buffer.append("         .autoTextBackground       = ").append(isAutoTextBackground()).append('\n'); 
-            buffer.append("         .rotation                 = ").append(getRotation()).append('\n'); 
-        buffer.append("         .autorotate               = ").append(isAutorotate()).append('\n'); 
-        buffer.append("    .tickColor            = ")
-            .append("0x").append(HexDump.toHex(  getTickColor ()))
-            .append(" (").append( getTickColor() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .zero3                = ")
-            .append("0x").append(HexDump.toHex(  getZero3 ()))
-            .append(" (").append( getZero3() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/TICK]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeByte(field_1_majorTickType);
-        out.writeByte(field_2_minorTickType);
-        out.writeByte(field_3_labelPosition);
-        out.writeByte(field_4_background);
-        out.writeInt(field_5_labelColorRgb);
-        out.writeInt(field_6_zero1);
-        out.writeInt(field_7_zero2);
-        out.writeInt(field_8_zero3);
-        out.writeInt(field_9_zero4);
-        out.writeShort(field_10_options);
-        out.writeShort(field_11_tickColor);
-        out.writeShort(field_12_zero5);
-    }
-
-    protected int getDataSize() {
-        return 1 + 1 + 1 + 1 + 4 + 8 + 8 + 2 + 2 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        TickRecord rec = new TickRecord();
-    
-        rec.field_1_majorTickType = field_1_majorTickType;
-        rec.field_2_minorTickType = field_2_minorTickType;
-        rec.field_3_labelPosition = field_3_labelPosition;
-        rec.field_4_background = field_4_background;
-        rec.field_5_labelColorRgb = field_5_labelColorRgb;
-        rec.field_6_zero1 = field_6_zero1;
-        rec.field_7_zero2 = field_7_zero2;
-        rec.field_8_zero3 = field_8_zero3;
-        rec.field_9_zero4 = field_9_zero4;
-        rec.field_10_options = field_10_options;
-        rec.field_11_tickColor = field_11_tickColor;
-        rec.field_12_zero5 = field_12_zero5;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the major tick type field for the Tick record.
-     */
-    public byte getMajorTickType()
-    {
-        return field_1_majorTickType;
-    }
-
-    /**
-     * Set the major tick type field for the Tick record.
-     */
-    public void setMajorTickType(byte field_1_majorTickType)
-    {
-        this.field_1_majorTickType = field_1_majorTickType;
-    }
-
-    /**
-     * Get the minor tick type field for the Tick record.
-     */
-    public byte getMinorTickType()
-    {
-        return field_2_minorTickType;
-    }
-
-    /**
-     * Set the minor tick type field for the Tick record.
-     */
-    public void setMinorTickType(byte field_2_minorTickType)
-    {
-        this.field_2_minorTickType = field_2_minorTickType;
-    }
-
-    /**
-     * Get the label position field for the Tick record.
-     */
-    public byte getLabelPosition()
-    {
-        return field_3_labelPosition;
-    }
-
-    /**
-     * Set the label position field for the Tick record.
-     */
-    public void setLabelPosition(byte field_3_labelPosition)
-    {
-        this.field_3_labelPosition = field_3_labelPosition;
-    }
-
-    /**
-     * Get the background field for the Tick record.
-     */
-    public byte getBackground()
-    {
-        return field_4_background;
-    }
-
-    /**
-     * Set the background field for the Tick record.
-     */
-    public void setBackground(byte field_4_background)
-    {
-        this.field_4_background = field_4_background;
-    }
-
-    /**
-     * Get the label color rgb field for the Tick record.
-     */
-    public int getLabelColorRgb()
-    {
-        return field_5_labelColorRgb;
-    }
-
-    /**
-     * Set the label color rgb field for the Tick record.
-     */
-    public void setLabelColorRgb(int field_5_labelColorRgb)
-    {
-        this.field_5_labelColorRgb = field_5_labelColorRgb;
-    }
-
-    /**
-     * Get the zero 1 field for the Tick record.
-     */
-    public int getZero1()
-    {
-        return field_6_zero1;
-    }
-
-    /**
-     * Set the zero 1 field for the Tick record.
-     */
-    public void setZero1(int field_6_zero1)
-    {
-        this.field_6_zero1 = field_6_zero1;
-    }
-
-    /**
-     * Get the zero 2 field for the Tick record.
-     */
-    public int getZero2()
-    {
-        return field_7_zero2;
-    }
-
-    /**
-     * Set the zero 2 field for the Tick record.
-     */
-    public void setZero2(int field_7_zero2)
-    {
-        this.field_7_zero2 = field_7_zero2;
-    }
-
-    /**
-     * Get the options field for the Tick record.
-     */
-    public short getOptions()
-    {
-        return field_10_options;
-    }
-
-    /**
-     * Set the options field for the Tick record.
-     */
-    public void setOptions(short field_10_options)
-    {
-        this.field_10_options = field_10_options;
-    }
-
-    /**
-     * Get the tick color field for the Tick record.
-     */
-    public short getTickColor()
-    {
-        return field_11_tickColor;
-    }
-
-    /**
-     * Set the tick color field for the Tick record.
-     */
-    public void setTickColor(short field_11_tickColor)
-    {
-        this.field_11_tickColor = field_11_tickColor;
-    }
-
-    /**
-     * Get the zero 3 field for the Tick record.
-     */
-    public short getZero3()
-    {
-        return field_12_zero5;
-    }
-
-    /**
-     * Set the zero 3 field for the Tick record.
-     */
-    public void setZero3(short field_12_zero3)
-    {
-        this.field_12_zero5 = field_12_zero3;
-    }
-
-    /**
-     * Sets the auto text color field value.
-     * use the quote unquote automatic color for text
-     */
-    public void setAutoTextColor(boolean value)
-    {
-        field_10_options = autoTextColor.setShortBoolean(field_10_options, value);
-    }
-
-    /**
-     * use the quote unquote automatic color for text
-     * @return  the auto text color field value.
-     */
-    public boolean isAutoTextColor()
-    {
-        return autoTextColor.isSet(field_10_options);
-    }
-
-    /**
-     * Sets the auto text background field value.
-     * use the quote unquote automatic color for text background
-     */
-    public void setAutoTextBackground(boolean value)
-    {
-        field_10_options = autoTextBackground.setShortBoolean(field_10_options, value);
-    }
-
-    /**
-     * use the quote unquote automatic color for text background
-     * @return  the auto text background field value.
-     */
-    public boolean isAutoTextBackground()
-    {
-        return autoTextBackground.isSet(field_10_options);
-    }
-
-    /**
-     * Sets the rotation field value.
-     * rotate text (0=none, 1=normal, 2=90 degrees counterclockwise, 3=90 degrees clockwise)
-     */
-    public void setRotation(short value)
-    {
-        field_10_options = rotation.setShortValue(field_10_options, value);
-    }
-
-    /**
-     * rotate text (0=none, 1=normal, 2=90 degrees counterclockwise, 3=90 degrees clockwise)
-     * @return  the rotation field value.
-     */
-    public short getRotation()
-    {
-        return rotation.getShortValue(field_10_options);
-    }
-
-    /**
-     * Sets the autorotate field value.
-     * automatically rotate the text
-     */
-    public void setAutorotate(boolean value)
-    {
-        field_10_options = autorotate.setShortBoolean(field_10_options, value);
-    }
-
-    /**
-     * automatically rotate the text
-     * @return  the autorotate field value.
-     */
-    public boolean isAutorotate()
-    {
-        return autorotate.isSet(field_10_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
deleted file mode 100644
index cab88c0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The units record describes units.
- */
-public final class UnitsRecord extends StandardRecord {
-    public final static short      sid                             = 0x1001;
-    private  short      field_1_units;
-
-
-    public UnitsRecord()
-    {
-
-    }
-
-    public UnitsRecord(RecordInputStream in)
-    {
-        field_1_units                  = in.readShort();
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[UNITS]\n");
-        buffer.append("    .units                = ")
-            .append("0x").append(HexDump.toHex(  getUnits ()))
-            .append(" (").append( getUnits() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-
-        buffer.append("[/UNITS]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(field_1_units);
-    }
-
-    protected int getDataSize() {
-        return 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        UnitsRecord rec = new UnitsRecord();
-    
-        rec.field_1_units = field_1_units;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the units field for the Units record.
-     */
-    public short getUnits()
-    {
-        return field_1_units;
-    }
-
-    /**
-     * Set the units field for the Units record.
-     */
-    public void setUnits(short field_1_units)
-    {
-        this.field_1_units = field_1_units;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java b/trunk/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
deleted file mode 100644
index e098011..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * The value range record defines the range of the value axis.
- */
-public final class ValueRangeRecord extends StandardRecord {
-    public final static short sid = 0x101f;
-    
-    private static final BitField automaticMinimum           = BitFieldFactory.getInstance(0x0001);
-    private static final BitField automaticMaximum           = BitFieldFactory.getInstance(0x0002);
-    private static final BitField automaticMajor             = BitFieldFactory.getInstance(0x0004);
-    private static final BitField automaticMinor             = BitFieldFactory.getInstance(0x0008);
-    private static final BitField automaticCategoryCrossing  = BitFieldFactory.getInstance(0x0010);
-    private static final BitField logarithmicScale           = BitFieldFactory.getInstance(0x0020);
-    private static final BitField valuesInReverse            = BitFieldFactory.getInstance(0x0040);
-    private static final BitField crossCategoryAxisAtMaximum = BitFieldFactory.getInstance(0x0080);
-    private static final BitField reserved                   = BitFieldFactory.getInstance(0x0100);
-    
-    private  double     field_1_minimumAxisValue;
-    private  double     field_2_maximumAxisValue;
-    private  double     field_3_majorIncrement;
-    private  double     field_4_minorIncrement;
-    private  double     field_5_categoryAxisCross;
-    private  short      field_6_options;
-
-
-    public ValueRangeRecord()
-    {
-
-    }
-
-    public ValueRangeRecord(RecordInputStream in)
-    {
-        field_1_minimumAxisValue       = in.readDouble();
-        field_2_maximumAxisValue       = in.readDouble();
-        field_3_majorIncrement         = in.readDouble();
-        field_4_minorIncrement         = in.readDouble();
-        field_5_categoryAxisCross      = in.readDouble();
-        field_6_options                = in.readShort();
-
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[VALUERANGE]\n");
-        buffer.append("    .minimumAxisValue     = ")
-            .append(" (").append( getMinimumAxisValue() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .maximumAxisValue     = ")
-            .append(" (").append( getMaximumAxisValue() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .majorIncrement       = ")
-            .append(" (").append( getMajorIncrement() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .minorIncrement       = ")
-            .append(" (").append( getMinorIncrement() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .categoryAxisCross    = ")
-            .append(" (").append( getCategoryAxisCross() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("    .options              = ")
-            .append("0x").append(HexDump.toHex(  getOptions ()))
-            .append(" (").append( getOptions() ).append(" )");
-        buffer.append(System.getProperty("line.separator")); 
-        buffer.append("         .automaticMinimum         = ").append(isAutomaticMinimum()).append('\n'); 
-        buffer.append("         .automaticMaximum         = ").append(isAutomaticMaximum()).append('\n'); 
-        buffer.append("         .automaticMajor           = ").append(isAutomaticMajor()).append('\n'); 
-        buffer.append("         .automaticMinor           = ").append(isAutomaticMinor()).append('\n'); 
-        buffer.append("         .automaticCategoryCrossing     = ").append(isAutomaticCategoryCrossing()).append('\n'); 
-        buffer.append("         .logarithmicScale         = ").append(isLogarithmicScale()).append('\n'); 
-        buffer.append("         .valuesInReverse          = ").append(isValuesInReverse()).append('\n'); 
-        buffer.append("         .crossCategoryAxisAtMaximum     = ").append(isCrossCategoryAxisAtMaximum()).append('\n'); 
-        buffer.append("         .reserved                 = ").append(isReserved()).append('\n'); 
-
-        buffer.append("[/VALUERANGE]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeDouble(field_1_minimumAxisValue);
-        out.writeDouble(field_2_maximumAxisValue);
-        out.writeDouble(field_3_majorIncrement);
-        out.writeDouble(field_4_minorIncrement);
-        out.writeDouble(field_5_categoryAxisCross);
-        out.writeShort(field_6_options);
-    }
-
-    protected int getDataSize() {
-        return 8 + 8 + 8 + 8 + 8 + 2;
-    }
-
-    public short getSid()
-    {
-        return sid;
-    }
-
-    public Object clone() {
-        ValueRangeRecord rec = new ValueRangeRecord();
-    
-        rec.field_1_minimumAxisValue = field_1_minimumAxisValue;
-        rec.field_2_maximumAxisValue = field_2_maximumAxisValue;
-        rec.field_3_majorIncrement = field_3_majorIncrement;
-        rec.field_4_minorIncrement = field_4_minorIncrement;
-        rec.field_5_categoryAxisCross = field_5_categoryAxisCross;
-        rec.field_6_options = field_6_options;
-        return rec;
-    }
-
-
-
-
-    /**
-     * Get the minimum axis value field for the ValueRange record.
-     */
-    public double getMinimumAxisValue()
-    {
-        return field_1_minimumAxisValue;
-    }
-
-    /**
-     * Set the minimum axis value field for the ValueRange record.
-     */
-    public void setMinimumAxisValue(double field_1_minimumAxisValue)
-    {
-        this.field_1_minimumAxisValue = field_1_minimumAxisValue;
-    }
-
-    /**
-     * Get the maximum axis value field for the ValueRange record.
-     */
-    public double getMaximumAxisValue()
-    {
-        return field_2_maximumAxisValue;
-    }
-
-    /**
-     * Set the maximum axis value field for the ValueRange record.
-     */
-    public void setMaximumAxisValue(double field_2_maximumAxisValue)
-    {
-        this.field_2_maximumAxisValue = field_2_maximumAxisValue;
-    }
-
-    /**
-     * Get the major increment field for the ValueRange record.
-     */
-    public double getMajorIncrement()
-    {
-        return field_3_majorIncrement;
-    }
-
-    /**
-     * Set the major increment field for the ValueRange record.
-     */
-    public void setMajorIncrement(double field_3_majorIncrement)
-    {
-        this.field_3_majorIncrement = field_3_majorIncrement;
-    }
-
-    /**
-     * Get the minor increment field for the ValueRange record.
-     */
-    public double getMinorIncrement()
-    {
-        return field_4_minorIncrement;
-    }
-
-    /**
-     * Set the minor increment field for the ValueRange record.
-     */
-    public void setMinorIncrement(double field_4_minorIncrement)
-    {
-        this.field_4_minorIncrement = field_4_minorIncrement;
-    }
-
-    /**
-     * Get the category axis cross field for the ValueRange record.
-     */
-    public double getCategoryAxisCross()
-    {
-        return field_5_categoryAxisCross;
-    }
-
-    /**
-     * Set the category axis cross field for the ValueRange record.
-     */
-    public void setCategoryAxisCross(double field_5_categoryAxisCross)
-    {
-        this.field_5_categoryAxisCross = field_5_categoryAxisCross;
-    }
-
-    /**
-     * Get the options field for the ValueRange record.
-     */
-    public short getOptions()
-    {
-        return field_6_options;
-    }
-
-    /**
-     * Set the options field for the ValueRange record.
-     */
-    public void setOptions(short field_6_options)
-    {
-        this.field_6_options = field_6_options;
-    }
-
-    /**
-     * Sets the automatic minimum field value.
-     * automatic minimum value selected
-     */
-    public void setAutomaticMinimum(boolean value)
-    {
-        field_6_options = automaticMinimum.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * automatic minimum value selected
-     * @return  the automatic minimum field value.
-     */
-    public boolean isAutomaticMinimum()
-    {
-        return automaticMinimum.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the automatic maximum field value.
-     * automatic maximum value selected
-     */
-    public void setAutomaticMaximum(boolean value)
-    {
-        field_6_options = automaticMaximum.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * automatic maximum value selected
-     * @return  the automatic maximum field value.
-     */
-    public boolean isAutomaticMaximum()
-    {
-        return automaticMaximum.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the automatic major field value.
-     * automatic major unit selected
-     */
-    public void setAutomaticMajor(boolean value)
-    {
-        field_6_options = automaticMajor.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * automatic major unit selected
-     * @return  the automatic major field value.
-     */
-    public boolean isAutomaticMajor()
-    {
-        return automaticMajor.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the automatic minor field value.
-     * automatic minor unit selected
-     */
-    public void setAutomaticMinor(boolean value)
-    {
-        field_6_options = automaticMinor.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * automatic minor unit selected
-     * @return  the automatic minor field value.
-     */
-    public boolean isAutomaticMinor()
-    {
-        return automaticMinor.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the automatic category crossing field value.
-     * category crossing point is automatically selected
-     */
-    public void setAutomaticCategoryCrossing(boolean value)
-    {
-        field_6_options = automaticCategoryCrossing.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * category crossing point is automatically selected
-     * @return  the automatic category crossing field value.
-     */
-    public boolean isAutomaticCategoryCrossing()
-    {
-        return automaticCategoryCrossing.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the logarithmic scale field value.
-     * use logarithmic scale
-     */
-    public void setLogarithmicScale(boolean value)
-    {
-        field_6_options = logarithmicScale.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * use logarithmic scale
-     * @return  the logarithmic scale field value.
-     */
-    public boolean isLogarithmicScale()
-    {
-        return logarithmicScale.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the values in reverse field value.
-     * values are reverses in graph
-     */
-    public void setValuesInReverse(boolean value)
-    {
-        field_6_options = valuesInReverse.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * values are reverses in graph
-     * @return  the values in reverse field value.
-     */
-    public boolean isValuesInReverse()
-    {
-        return valuesInReverse.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the cross category axis at maximum field value.
-     * category axis to cross at maximum value
-     */
-    public void setCrossCategoryAxisAtMaximum(boolean value)
-    {
-        field_6_options = crossCategoryAxisAtMaximum.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * category axis to cross at maximum value
-     * @return  the cross category axis at maximum field value.
-     */
-    public boolean isCrossCategoryAxisAtMaximum()
-    {
-        return crossCategoryAxisAtMaximum.isSet(field_6_options);
-    }
-
-    /**
-     * Sets the reserved field value.
-     * reserved, must equal 1 (excel dev. guide says otherwise)
-     */
-    public void setReserved(boolean value)
-    {
-        field_6_options = reserved.setShortBoolean(field_6_options, value);
-    }
-
-    /**
-     * reserved, must equal 1 (excel dev. guide says otherwise)
-     * @return  the reserved field value.
-     */
-    public boolean isReserved()
-    {
-        return reserved.isSet(field_6_options);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java b/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
deleted file mode 100644
index a4defe8..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * Title: CTColor (Extended Color) record part
- * <P>
- * The HSSF file format normally stores Color information in the
- *  Palette (see PaletteRecord), but for a few cases (eg Conditional
- *  Formatting, Sheet Extensions), this XSSF-style color record 
- *  can be used.
- */
-public final class ExtendedColor implements Cloneable {
-    public static final int TYPE_AUTO = 0;
-    public static final int TYPE_INDEXED = 1;
-    public static final int TYPE_RGB = 2;
-    public static final int TYPE_THEMED = 3;
-    public static final int TYPE_UNSET = 4;
-    
-    public static final int THEME_DARK_1  = 0;
-    public static final int THEME_LIGHT_1 = 1;
-    public static final int THEME_DARK_2  = 2;
-    public static final int THEME_LIGHT_2 = 3;
-    public static final int THEME_ACCENT_1 = 4;
-    public static final int THEME_ACCENT_2 = 5;
-    public static final int THEME_ACCENT_3 = 6;
-    public static final int THEME_ACCENT_4 = 7;
-    public static final int THEME_ACCENT_5 = 8;
-    public static final int THEME_ACCENT_6 = 9;
-    public static final int THEME_HYPERLINK = 10;
-    // This one is SheetEx only, not allowed in CFs
-    public static final int THEME_FOLLOWED_HYPERLINK = 11;
-    
-    private int type;
-    
-    // Type = Indexed
-    private int colorIndex;
-    // Type = RGB
-    private byte[] rgba;
-    // Type = Theme
-    private int themeIndex;
-    
-    private double tint;
-    
-    public ExtendedColor() {
-        this.type = TYPE_INDEXED;
-        this.colorIndex = 0;
-        this.tint = 0d;
-    }
-    public ExtendedColor(LittleEndianInput in) {
-        type = in.readInt();
-        if (type == TYPE_INDEXED) {
-            colorIndex = in.readInt();
-        } else if (type == TYPE_RGB) {
-            rgba = new byte[4];
-            in.readFully(rgba);
-        } else if (type == TYPE_THEMED) {
-            themeIndex = in.readInt();
-        } else {
-            // Ignored
-            in.readInt();
-        }
-        tint = in.readDouble();
-    }
-
-    public int getType() {
-        return type;
-    }
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    /**
-     * @return Palette color index, if type is {@link #TYPE_INDEXED}
-     */
-    public int getColorIndex() {
-        return colorIndex;
-    }
-    public void setColorIndex(int colorIndex) {
-        this.colorIndex = colorIndex;
-    }
-    
-    /**
-     * @return Red Green Blue Alpha, if type is {@link #TYPE_RGB}
-     */
-    public byte[] getRGBA() {
-        return rgba;
-    }
-    public void setRGBA(byte[] rgba) {
-        this.rgba = (rgba == null) ? null : rgba.clone();
-    }
-    
-    /**
-     * @return Theme color type index, eg {@link #THEME_DARK_1}, if type is {@link #TYPE_THEMED}
-     */
-    public int getThemeIndex() {
-        return themeIndex;
-    }
-    public void setThemeIndex(int themeIndex) {
-        this.themeIndex = themeIndex;
-    }
-    /**
-     * @return Tint and Shade value, between -1 and +1
-     */
-    public double getTint() {
-        return tint;
-    }
-    /**
-     * @param tint Tint and Shade value, between -1 and +1
-     */
-    public void setTint(double tint) {
-        if (tint < -1 || tint > 1) {
-            throw new IllegalArgumentException("Tint/Shade must be between -1 and +1");
-        }
-        this.tint = tint;
-    }
-    
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("    [Extended Color]\n");
-        buffer.append("          .type  = ").append(type).append("\n");
-        buffer.append("          .tint  = ").append(tint).append("\n");
-        buffer.append("          .c_idx = ").append(colorIndex).append("\n");
-        buffer.append("          .rgba  = ").append(HexDump.toHex(rgba)).append("\n");
-        buffer.append("          .t_idx = ").append(themeIndex).append("\n");
-        buffer.append("    [/Extended Color]\n");
-        return buffer.toString();
-    }
-    
-    @Override
-    public ExtendedColor clone()  {
-        ExtendedColor exc = new ExtendedColor();
-        exc.type = type;
-        exc.tint = tint;
-        if (type == TYPE_INDEXED) {
-            exc.colorIndex = colorIndex;
-        } else if (type == TYPE_RGB) {
-            exc.rgba = new byte[4];
-            System.arraycopy(rgba, 0, exc.rgba, 0, 4);
-        } else if (type == TYPE_THEMED) {
-            exc.themeIndex = themeIndex;
-        }
-        return exc;
-    }
-    
-    public int getDataLength() {
-        return 4+4+8;
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeInt(type);
-        if (type == TYPE_INDEXED) {
-            out.writeInt(colorIndex);
-        } else if (type == TYPE_RGB) {
-            out.write(rgba);
-        } else if (type == TYPE_THEMED) {
-            out.writeInt(themeIndex);
-        } else {
-            out.writeInt(0);
-        }
-        out.writeDouble(tint);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java b/trunk/src/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
deleted file mode 100644
index 8ab9936..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import org.apache.poi.hssf.record.FeatRecord;
-//import org.apache.poi.hssf.record.Feat11Record;
-//import org.apache.poi.hssf.record.Feat12Record;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: FeatFormulaErr2 (Formula Evaluation Shared Feature) common record part
- * <P>
- * This record part specifies Formula Evaluation & Error Ignoring data 
- *  for a sheet, stored as part of a Shared Feature. It can be found in 
- *  records such as {@link FeatRecord}.
- * For the full meanings of the flags, see pages 669 and 670
- *  of the Excel binary file format documentation and/or
- *  https://msdn.microsoft.com/en-us/library/dd924991%28v=office.12%29.aspx
- */
-public final class FeatFormulaErr2 implements SharedFeature {
-	private static final BitField CHECK_CALCULATION_ERRORS =    BitFieldFactory.getInstance(0x01);
-	private static final BitField CHECK_EMPTY_CELL_REF =        BitFieldFactory.getInstance(0x02);
-	private static final BitField CHECK_NUMBERS_AS_TEXT =       BitFieldFactory.getInstance(0x04);
-	private static final BitField CHECK_INCONSISTENT_RANGES =   BitFieldFactory.getInstance(0x08);
-	private static final BitField CHECK_INCONSISTENT_FORMULAS = BitFieldFactory.getInstance(0x10);
-	private static final BitField CHECK_DATETIME_FORMATS =      BitFieldFactory.getInstance(0x20);
-	private static final BitField CHECK_UNPROTECTED_FORMULAS =  BitFieldFactory.getInstance(0x40);
-	private static final BitField PERFORM_DATA_VALIDATION =     BitFieldFactory.getInstance(0x80);
-	
-	/**
-	 * What errors we should ignore
-	 */
-	private int errorCheck;
-	
-	
-	public FeatFormulaErr2() {}
-
-	public FeatFormulaErr2(RecordInputStream in) {
-		errorCheck = in.readInt();
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(" [FEATURE FORMULA ERRORS]\n");
-		buffer.append("  checkCalculationErrors    = "); 
-		buffer.append("  checkEmptyCellRef         = "); 
-		buffer.append("  checkNumbersAsText        = "); 
-		buffer.append("  checkInconsistentRanges   = "); 
-		buffer.append("  checkInconsistentFormulas = "); 
-		buffer.append("  checkDateTimeFormats      = "); 
-		buffer.append("  checkUnprotectedFormulas  = "); 
-		buffer.append("  performDataValidation     = "); 
-		buffer.append(" [/FEATURE FORMULA ERRORS]\n");
-		return buffer.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeInt(errorCheck);
-	}
-
-	public int getDataSize() {
-		return 4;
-	}
-	
-	public int _getRawErrorCheckValue() {
-		return errorCheck;
-	}
-
-	public boolean getCheckCalculationErrors() {
-		return CHECK_CALCULATION_ERRORS.isSet(errorCheck);
-	}
-	public void setCheckCalculationErrors(boolean checkCalculationErrors) {
-	    errorCheck = CHECK_CALCULATION_ERRORS.setBoolean(errorCheck, checkCalculationErrors);
-	}
-
-	public boolean getCheckEmptyCellRef() {
-		return CHECK_EMPTY_CELL_REF.isSet(errorCheck);
-	}
-	public void setCheckEmptyCellRef(boolean checkEmptyCellRef) {
-	    errorCheck = CHECK_EMPTY_CELL_REF.setBoolean(errorCheck, checkEmptyCellRef);
-	}
-
-	public boolean getCheckNumbersAsText() {
-		return CHECK_NUMBERS_AS_TEXT.isSet(errorCheck);
-	}
-	public void setCheckNumbersAsText(boolean checkNumbersAsText) {
-	    errorCheck = CHECK_NUMBERS_AS_TEXT.setBoolean(errorCheck, checkNumbersAsText);
-	}
-
-	public boolean getCheckInconsistentRanges() {
-		return CHECK_INCONSISTENT_RANGES.isSet(errorCheck);
-	}
-	public void setCheckInconsistentRanges(boolean checkInconsistentRanges) {
-	    errorCheck = CHECK_INCONSISTENT_RANGES.setBoolean(errorCheck, checkInconsistentRanges);
-	}
-
-	public boolean getCheckInconsistentFormulas() {
-		return CHECK_INCONSISTENT_FORMULAS.isSet(errorCheck);
-	}
-	public void setCheckInconsistentFormulas(boolean checkInconsistentFormulas) {
-	    errorCheck = CHECK_INCONSISTENT_FORMULAS.setBoolean(errorCheck, checkInconsistentFormulas);
-	}
-
-	public boolean getCheckDateTimeFormats() {
-		return CHECK_DATETIME_FORMATS.isSet(errorCheck);
-	}
-	public void setCheckDateTimeFormats(boolean checkDateTimeFormats) {
-	    errorCheck = CHECK_DATETIME_FORMATS.setBoolean(errorCheck, checkDateTimeFormats);
-	}
-
-	public boolean getCheckUnprotectedFormulas() {
-		return CHECK_UNPROTECTED_FORMULAS.isSet(errorCheck);
-	}
-	public void setCheckUnprotectedFormulas(boolean checkUnprotectedFormulas) {
-	    errorCheck = CHECK_UNPROTECTED_FORMULAS.setBoolean(errorCheck, checkUnprotectedFormulas);
-	}
-
-	public boolean getPerformDataValidation() {
-		return PERFORM_DATA_VALIDATION.isSet(errorCheck);
-	}
-	public void setPerformDataValidation(boolean performDataValidation) {
-	    errorCheck = PERFORM_DATA_VALIDATION.setBoolean(errorCheck, performDataValidation);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/FeatProtection.java b/trunk/src/java/org/apache/poi/hssf/record/common/FeatProtection.java
deleted file mode 100644
index a10d711..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/FeatProtection.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import org.apache.poi.hssf.record.FeatRecord;
-import org.apache.poi.hssf.record.PasswordRecord;
-import org.apache.poi.hssf.record.PasswordRev4Record;
-//import org.apache.poi.hssf.record.Feat11Record;
-//import org.apache.poi.hssf.record.Feat12Record;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title: FeatProtection (Protection Shared Feature) common record part
- * <P>
- * This record part specifies Protection data for a sheet, stored
- *  as part of a Shared Feature. It can be found in records such
- *  as {@link FeatRecord}
- */
-public final class FeatProtection implements SharedFeature {
-	public static long NO_SELF_RELATIVE_SECURITY_FEATURE = 0;
-	public static long HAS_SELF_RELATIVE_SECURITY_FEATURE = 1;
-
-	private int fSD;
-	
-	/**
-	 * 0 means no password. Otherwise indicates the
-	 *  password verifier algorithm (same kind as 
-	 *   {@link PasswordRecord} and
-	 *   {@link PasswordRev4Record})
-	 */
-	private int passwordVerifier;
-	
-	private String title;
-	private byte[] securityDescriptor;
-	
-	public FeatProtection() {
-		securityDescriptor = new byte[0];
-	}
-
-	public FeatProtection(RecordInputStream in) {
-		fSD = in.readInt();
-		passwordVerifier = in.readInt();
-		
-		title = StringUtil.readUnicodeString(in);
-		
-		securityDescriptor = in.readRemainder();
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(" [FEATURE PROTECTION]\n");
-		buffer.append("   Self Relative = " + fSD); 
-		buffer.append("   Password Verifier = " + passwordVerifier);
-		buffer.append("   Title = " + title);
-		buffer.append("   Security Descriptor Size = " + securityDescriptor.length);
-		buffer.append(" [/FEATURE PROTECTION]\n");
-		return buffer.toString();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeInt(fSD);
-		out.writeInt(passwordVerifier);
-		StringUtil.writeUnicodeString(out, title);
-		out.write(securityDescriptor);
-	}
-
-	public int getDataSize() {
-		return 4 + 4 + StringUtil.getEncodedSize(title) + securityDescriptor.length;
-	}
-
-	public int getPasswordVerifier() {
-		return passwordVerifier;
-	}
-	public void setPasswordVerifier(int passwordVerifier) {
-		this.passwordVerifier = passwordVerifier;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public int getFSD() {
-		return fSD;
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/FeatSmartTag.java b/trunk/src/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
deleted file mode 100644
index f2e9cc6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import org.apache.poi.hssf.record.FeatRecord;
-//import org.apache.poi.hssf.record.Feat11Record;
-//import org.apache.poi.hssf.record.Feat12Record;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: FeatSmartTag (Smart Tag Shared Feature) common record part
- * <P>
- * This record part specifies Smart Tag data for a sheet, stored as part
- *  of a Shared Feature. It can be found in records such as  {@link FeatRecord}.
- * It is made up of a hash, and a set of Factoid Data that makes up
- *  the smart tags.
- * For more details, see page 669 of the Excel binary file
- *  format documentation.
- */
-public final class FeatSmartTag implements SharedFeature {
-	// TODO - process
-	private byte[] data;
-	
-	public FeatSmartTag() {
-		data = new byte[0];
-	}
-
-	public FeatSmartTag(RecordInputStream in) {
-		data = in.readRemainder();
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(" [FEATURE SMART TAGS]\n");
-		buffer.append(" [/FEATURE SMART TAGS]\n");
-		return buffer.toString();
-	}
-
-	public int getDataSize() {
-		return data.length;
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.write(data);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java b/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java
deleted file mode 100644
index eecc541..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/FtrHeader.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title: FtrHeader (Future Record Header) common record part
- * <P>
- * This record part specifies a header for a Ftr (Future)
- *  style record, which includes extra attributes above and
- *  beyond those of a traditional record. 
- */
-public final class FtrHeader implements Cloneable {
-    /** This MUST match the type on the containing record */
-    private short recordType;
-    /** This is a FrtFlags */
-    private short grbitFrt;
-    /** The range of cells the parent record applies to, or 0 if N/A */
-    private CellRangeAddress associatedRange;
-
-    public FtrHeader() {
-        associatedRange = new CellRangeAddress(0, 0, 0, 0);
-    }
-
-    public FtrHeader(RecordInputStream in) {
-        recordType = in.readShort();
-        grbitFrt   = in.readShort();
-
-        associatedRange = new CellRangeAddress(in);
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(" [FUTURE HEADER]\n");
-        buffer.append("   Type " + recordType);
-        buffer.append("   Flags " + grbitFrt);
-        buffer.append(" [/FUTURE HEADER]\n");
-        return buffer.toString();
-    }
-
-    public void serialize(LittleEndianOutput out) {
-        out.writeShort(recordType);
-        out.writeShort(grbitFrt);
-        associatedRange.serialize(out);
-    }
-
-    public static int getDataSize() {
-        return 12;
-    }
-
-    public short getRecordType() {
-        return recordType;
-    }
-    public void setRecordType(short recordType) {
-        this.recordType = recordType;
-    }
-
-    public short getGrbitFrt() {
-        return grbitFrt;
-    }
-    public void setGrbitFrt(short grbitFrt) {
-        this.grbitFrt = grbitFrt;
-    }
-
-    public CellRangeAddress getAssociatedRange() {
-        return associatedRange;
-    }
-    public void setAssociatedRange(CellRangeAddress associatedRange) {
-        this.associatedRange = associatedRange;
-    }
-
-    public Object clone() {
-        FtrHeader result = new FtrHeader();
-        result.recordType = recordType;
-        result.grbitFrt = grbitFrt;
-        result.associatedRange = associatedRange.copy();
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/FutureRecord.java b/trunk/src/java/org/apache/poi/hssf/record/common/FutureRecord.java
deleted file mode 100644
index 65a26cc..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/FutureRecord.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * Title: Future Record, a newer (largely Excel 2007+) record
- *  which contains a Future Record Header ({@link FtrHeader})
- */
-public interface FutureRecord {
-    public short getFutureRecordType();
-    public FtrHeader getFutureHeader();
-    public CellRangeAddress getAssociatedRange();
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/SharedFeature.java b/trunk/src/java/org/apache/poi/hssf/record/common/SharedFeature.java
deleted file mode 100644
index 1ce8bce..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/SharedFeature.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Common Interface for all Shared Features
- */
-public interface SharedFeature {
-	public String toString();
-	public void serialize(LittleEndianOutput out);
-	public int getDataSize();
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java b/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
deleted file mode 100644
index 4cefdee..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.cont.ContinuableRecordInput;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Title: Unicode String<p/>
- * Description:  Unicode String - just standard fields that are in several records.
- *               It is considered more desirable then repeating it in all of them.<p/>
- *               This is often called a XLUnicodeRichExtendedString in MS documentation.<p/>
- * REFERENCE:  PG 264 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<p/>
- * REFERENCE:  PG 951 Excel Binary File Format (.xls) Structure Specification v20091214 
- */
-public class UnicodeString implements Comparable<UnicodeString> {
-    // TODO - make this final when the compatibility version is removed
-    private static POILogger _logger = POILogFactory.getLogger(UnicodeString.class);
-
-    private short             field_1_charCount;
-    private byte              field_2_optionflags;
-    private String            field_3_string;
-    private List<FormatRun>   field_4_format_runs;
-    private ExtRst            field_5_ext_rst;
-    private static final BitField   highByte  = BitFieldFactory.getInstance(0x1);
-    // 0x2 is reserved
-    private static final BitField   extBit    = BitFieldFactory.getInstance(0x4);
-    private static final BitField   richText  = BitFieldFactory.getInstance(0x8);
-
-    public static class FormatRun implements Comparable<FormatRun> {
-        final short _character;
-        short _fontIndex;
-
-        public FormatRun(short character, short fontIndex) {
-            this._character = character;
-            this._fontIndex = fontIndex;
-        }
-
-        public FormatRun(LittleEndianInput in) {
-            this(in.readShort(), in.readShort());
-        }
-
-        public short getCharacterPos() {
-            return _character;
-        }
-
-        public short getFontIndex() {
-            return _fontIndex;
-        }
-
-        public boolean equals(Object o) {
-            if (!(o instanceof FormatRun)) {
-                return false;
-            }
-            FormatRun other = ( FormatRun ) o;
-
-            return _character == other._character && _fontIndex == other._fontIndex;
-        }
-
-        public int compareTo(FormatRun r) {
-            if (_character == r._character && _fontIndex == r._fontIndex) {
-                return 0;
-            }
-            if (_character == r._character) {
-                return _fontIndex - r._fontIndex;
-            }
-            return _character - r._character;
-        }
-
-        @Override
-        public int hashCode() {
-            assert false : "hashCode not designed";
-            return 42; // any arbitrary constant will do
-        }
-
-        public String toString() {
-            return "character="+_character+",fontIndex="+_fontIndex;
-        }
-
-        public void serialize(LittleEndianOutput out) {
-            out.writeShort(_character);
-            out.writeShort(_fontIndex);
-        }
-    }
-    
-    // See page 681
-    public static class ExtRst implements Comparable<ExtRst> {
-       private short reserved;
-       
-       // This is a Phs (see page 881)
-       private short formattingFontIndex;
-       private short formattingOptions;
-       
-       // This is a RPHSSub (see page 894)
-       private int numberOfRuns;
-       private String phoneticText;
-       
-       // This is an array of PhRuns (see page 881)
-       private PhRun[] phRuns;
-       // Sometimes there's some cruft at the end
-       private byte[] extraData;
-
-       private void populateEmpty() {
-          reserved = 1;
-          phoneticText = "";
-          phRuns = new PhRun[0];
-          extraData = new byte[0];
-       }
-       
-       protected ExtRst() {
-          populateEmpty();
-       }
-       protected ExtRst(LittleEndianInput in, int expectedLength) {
-          reserved = in.readShort();
-          
-          // Old style detection (Reserved = 0xFF)
-          if(reserved == -1) {
-             populateEmpty();
-             return;
-          }
-          
-          // Spot corrupt records
-          if(reserved != 1) {
-             _logger.log(POILogger.WARN, "Warning - ExtRst has wrong magic marker, expecting 1 but found " + reserved + " - ignoring");
-             // Grab all the remaining data, and ignore it
-             for(int i=0; i<expectedLength-2; i++) {
-                in.readByte();
-             }
-             // And make us be empty
-             populateEmpty();
-             return;
-          }
-
-          // Carry on reading in as normal
-          short stringDataSize = in.readShort();
-          
-          formattingFontIndex = in.readShort();
-          formattingOptions   = in.readShort();
-          
-          // RPHSSub
-          numberOfRuns = in.readUShort();
-          short length1 = in.readShort();
-          // No really. Someone clearly forgot to read
-          //  the docs on their datastructure...
-          short length2 = in.readShort();
-          // And sometimes they write out garbage :(
-          if(length1 == 0 && length2 > 0) {
-             length2 = 0;
-          }
-          if(length1 != length2) {
-             throw new IllegalStateException(
-                   "The two length fields of the Phonetic Text don't agree! " +
-                   length1 + " vs " + length2
-             );
-          }
-          phoneticText = StringUtil.readUnicodeLE(in, length1);
-          
-          int runData = stringDataSize - 4 - 6 - (2*phoneticText.length());
-          int numRuns = (runData / 6);
-          phRuns = new PhRun[numRuns];
-          for(int i=0; i<phRuns.length; i++) {
-             phRuns[i] = new PhRun(in);
-          }
-
-          int extraDataLength = runData - (numRuns*6);
-          if(extraDataLength < 0) {
-        	 _logger.log( POILogger.WARN, "Warning - ExtRst overran by " + (0-extraDataLength) + " bytes");
-             extraDataLength = 0;
-          }
-          extraData = new byte[extraDataLength];
-          for(int i=0; i<extraData.length; i++) {
-             extraData[i] = in.readByte();
-          }
-       }
-       /**
-        * Returns our size, excluding our 
-        *  4 byte header
-        */
-       protected int getDataSize() {
-          return 4 + 6 + (2*phoneticText.length()) + 
-             (6*phRuns.length) + extraData.length;
-       }
-       protected void serialize(ContinuableRecordOutput out) {
-          int dataSize = getDataSize();
-          
-          out.writeContinueIfRequired(8);
-          out.writeShort(reserved);
-          out.writeShort(dataSize);
-          out.writeShort(formattingFontIndex);
-          out.writeShort(formattingOptions);
-          
-          out.writeContinueIfRequired(6);
-          out.writeShort(numberOfRuns);
-          out.writeShort(phoneticText.length());
-          out.writeShort(phoneticText.length());
-          
-          out.writeContinueIfRequired(phoneticText.length()*2);
-          StringUtil.putUnicodeLE(phoneticText, out);
-          
-          for(int i=0; i<phRuns.length; i++) {
-             phRuns[i].serialize(out);
-          }
-          
-          out.write(extraData);
-       }
-
-       public boolean equals(Object obj) {
-          if(! (obj instanceof ExtRst)) {
-             return false;
-          }
-          ExtRst other = (ExtRst)obj;
-          return (compareTo(other) == 0);
-       }
-       public int compareTo(ExtRst o) {
-          int result;
-          
-          result = reserved - o.reserved;
-          if (result != 0) {
-              return result;
-          }
-          result = formattingFontIndex - o.formattingFontIndex;
-          if (result != 0) {
-              return result;
-          }
-          result = formattingOptions - o.formattingOptions;
-          if (result != 0) {
-              return result;
-          }
-          result = numberOfRuns - o.numberOfRuns;
-          if (result != 0) {
-              return result;
-          }
-          
-          result = phoneticText.compareTo(o.phoneticText);
-          if (result != 0) {
-              return result;
-          }
-          
-          result = phRuns.length - o.phRuns.length;
-          if (result != 0) {
-              return result;
-          }
-          for(int i=0; i<phRuns.length; i++) {
-             result = phRuns[i].phoneticTextFirstCharacterOffset - o.phRuns[i].phoneticTextFirstCharacterOffset;
-             if (result != 0) {
-                 return result;
-             }
-             result = phRuns[i].realTextFirstCharacterOffset - o.phRuns[i].realTextFirstCharacterOffset;
-             if (result != 0) {
-                 return result;
-             }
-             result = phRuns[i].realTextLength - o.phRuns[i].realTextLength;
-             if (result != 0) {
-                 return result;
-             }
-          }
-          
-          result = Arrays.hashCode(extraData)-Arrays.hashCode(o.extraData);
-          
-          return result;
-       }
-
-       @Override
-       public int hashCode() {
-           int hash = reserved;
-           hash = 31*hash+formattingFontIndex;
-           hash = 31*hash+formattingOptions;
-           hash = 31*hash+numberOfRuns;
-           hash = 31*hash+phoneticText.hashCode();
-
-           if (phRuns != null) {
-               for (PhRun ph : phRuns) {
-                   hash = 31*hash+ph.phoneticTextFirstCharacterOffset;
-                   hash = 31*hash+ph.realTextFirstCharacterOffset;
-                   hash = 31*hash+ph.realTextLength;
-               }
-           }
-           return hash;
-       }
-
-       protected ExtRst clone() {
-          ExtRst ext = new ExtRst();
-          ext.reserved = reserved;
-          ext.formattingFontIndex = formattingFontIndex;
-          ext.formattingOptions = formattingOptions;
-          ext.numberOfRuns = numberOfRuns;
-          ext.phoneticText = phoneticText;
-          ext.phRuns = new PhRun[phRuns.length];
-          for(int i=0; i<ext.phRuns.length; i++) {
-             ext.phRuns[i] = new PhRun(
-                   phRuns[i].phoneticTextFirstCharacterOffset,
-                   phRuns[i].realTextFirstCharacterOffset,
-                   phRuns[i].realTextLength
-             );
-          }
-          return ext;
-       }
-       
-       public short getFormattingFontIndex() {
-         return formattingFontIndex;
-       }
-       public short getFormattingOptions() {
-         return formattingOptions;
-       }
-       public int getNumberOfRuns() {
-         return numberOfRuns;
-       }
-       public String getPhoneticText() {
-         return phoneticText;
-       }
-       public PhRun[] getPhRuns() {
-         return phRuns;
-       }
-    }
-    public static class PhRun {
-       private int phoneticTextFirstCharacterOffset;
-       private int realTextFirstCharacterOffset;
-       private int realTextLength;
-       
-       public PhRun(int phoneticTextFirstCharacterOffset,
-            int realTextFirstCharacterOffset, int realTextLength) {
-         this.phoneticTextFirstCharacterOffset = phoneticTextFirstCharacterOffset;
-         this.realTextFirstCharacterOffset = realTextFirstCharacterOffset;
-         this.realTextLength = realTextLength;
-      }
-      private PhRun(LittleEndianInput in) {
-          phoneticTextFirstCharacterOffset = in.readUShort();
-          realTextFirstCharacterOffset = in.readUShort();
-          realTextLength = in.readUShort();
-       }
-       private void serialize(ContinuableRecordOutput out) {
-          out.writeContinueIfRequired(6);
-          out.writeShort(phoneticTextFirstCharacterOffset);
-          out.writeShort(realTextFirstCharacterOffset);
-          out.writeShort(realTextLength);
-       }
-    }
-
-    private UnicodeString() {
-     //Used for clone method.
-    }
-
-    public UnicodeString(String str)
-    {
-      setString(str);
-    }
-
-
-
-    public int hashCode()
-    {
-        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 instanceof UnicodeString)) {
-            return false;
-        }
-        UnicodeString other = (UnicodeString) o;
-
-        //OK lets do this in stages to return a quickly, first check the actual string
-        if (field_1_charCount != other.field_1_charCount
-            || field_2_optionflags != other.field_2_optionflags
-            || !field_3_string.equals(other.field_3_string)) {
-            return false;
-        }
-
-        //OK string appears to be equal but now lets compare formatting runs
-        if (field_4_format_runs == null) {
-            // Strings are equal, and there are not formatting runs.
-            return (other.field_4_format_runs == null);
-        } else if (other.field_4_format_runs == null) {
-            // Strings are equal, but one or the other has formatting runs
-            return false;
-        }
-
-        //Strings are equal, so now compare formatting runs.
-        int size = field_4_format_runs.size();
-        if (size != other.field_4_format_runs.size()) {
-          return false;
-        }
-
-        for (int i=0;i<size;i++) {
-          FormatRun run1 = field_4_format_runs.get(i);
-          FormatRun run2 = other.field_4_format_runs.get(i);
-
-          if (!run1.equals(run2)) {
-            return false;
-          }
-        }
-
-        // Well the format runs are equal as well!, better check the ExtRst data
-        if (field_5_ext_rst == null) {
-            return (other.field_5_ext_rst == null);
-        } else if (other.field_5_ext_rst == null) {
-            return false;
-        }
-            
-       return field_5_ext_rst.equals(other.field_5_ext_rst);
-    }
-
-    /**
-     * construct a unicode string record and fill its fields, ID is ignored
-     * @param in the RecordInputstream to read the record from
-     */
-    public UnicodeString(RecordInputStream in) {
-        field_1_charCount   = in.readShort();
-        field_2_optionflags = in.readByte();
-
-        int runCount = 0;
-        int extensionLength = 0;
-        //Read the number of rich runs if rich text.
-        if (isRichText()) {
-            runCount = in.readShort();
-        }
-        //Read the size of extended data if present.
-        if (isExtendedText()) {
-            extensionLength = in.readInt();
-        }
-
-        boolean isCompressed = ((field_2_optionflags & 1) == 0);
-        int cc = getCharCount();
-        field_3_string = (isCompressed) ? in.readCompressedUnicode(cc) : in.readUnicodeLEString(cc);
-
-        if (isRichText() && (runCount > 0)) {
-          field_4_format_runs = new ArrayList<FormatRun>(runCount);
-          for (int i=0;i<runCount;i++) {
-            field_4_format_runs.add(new FormatRun(in));
-          }
-        }
-
-        if (isExtendedText() && (extensionLength > 0)) {
-          field_5_ext_rst = new ExtRst(new ContinuableRecordInput(in), extensionLength);
-          if(field_5_ext_rst.getDataSize()+4 != extensionLength) {
-             _logger.log(POILogger.WARN, "ExtRst was supposed to be " + extensionLength + " bytes long, but seems to actually be " + (field_5_ext_rst.getDataSize() + 4));
-          }
-        }
-    }
-
-
-
-    /**
-     * get the number of characters in the string,
-     *  as an un-wrapped int
-     *
-     * @return number of characters
-     */
-    public int getCharCount() {
-    	if(field_1_charCount < 0) {
-    		return field_1_charCount + 65536;
-    	}
-        return field_1_charCount;
-    }
-
-    /**
-     * get the number of characters in the string,
-     * wrapped as needed to fit within a short
-     *
-     * @return number of characters
-     */
-    public short getCharCountShort() {
-        return field_1_charCount;
-    }
-
-    /**
-     * set the number of characters in the string
-     * @param cc - number of characters
-     */
-
-    public void setCharCount(short cc)
-    {
-        field_1_charCount = cc;
-    }
-
-    /**
-     * get the option flags which among other things return if this is a 16-bit or
-     * 8 bit string
-     *
-     * @return optionflags bitmask
-     *
-     */
-
-    public byte getOptionFlags()
-    {
-        return field_2_optionflags;
-    }
-
-    /**
-     * set the option flags which among other things return if this is a 16-bit or
-     * 8 bit string
-     *
-     * @param of  optionflags bitmask
-     *
-     */
-
-    public void setOptionFlags(byte of)
-    {
-        field_2_optionflags = of;
-    }
-
-    /**
-     * @return the actual string this contains as a java String object
-     */
-    public String getString()
-    {
-        return field_3_string;
-    }
-
-    /**
-     * set the actual string this contains
-     * @param string  the text
-     */
-
-    public void setString(String string)
-    {
-        field_3_string = string;
-        setCharCount((short)field_3_string.length());
-        // scan for characters greater than 255 ... if any are
-        // present, we have to use 16-bit encoding. Otherwise, we
-        // can use 8-bit encoding
-        boolean useUTF16 = false;
-        int strlen = string.length();
-
-        for ( int j = 0; j < strlen; j++ ) {
-            if ( string.charAt( j ) > 255 ) {
-                useUTF16 = true;
-                break;
-            }
-        }
-        if (useUTF16) {
-          //Set the uncompressed bit
-          field_2_optionflags = highByte.setByte(field_2_optionflags);
-        } else {
-          field_2_optionflags = highByte.clearByte(field_2_optionflags);
-        }
-    }
-
-    public int getFormatRunCount() {
-        return (field_4_format_runs == null) ? 0 : field_4_format_runs.size();
-    }
-
-    public FormatRun getFormatRun(int index) {
-      if (field_4_format_runs == null) {
-		return null;
-	  }
-      if (index < 0 || index >= field_4_format_runs.size()) {
-		return null;
-	  }
-      return field_4_format_runs.get(index);
-    }
-
-    private int findFormatRunAt(int characterPos) {
-      int size = field_4_format_runs.size();
-      for (int i=0;i<size;i++) {
-        FormatRun r = field_4_format_runs.get(i);
-        if (r._character == characterPos) {
-          return i;
-        } else if (r._character > characterPos) {
-          return -1;
-        }
-      }
-      return -1;
-    }
-
-    /** Adds a font run to the formatted string.
-     *
-     *  If a font run exists at the current charcter location, then it is
-     *  replaced with the font run to be added.
-     */
-    public void addFormatRun(FormatRun r) {
-      if (field_4_format_runs == null) {
-		field_4_format_runs = new ArrayList<FormatRun>();
-	  }
-
-      int index = findFormatRunAt(r._character);
-      if (index != -1) {
-         field_4_format_runs.remove(index);
-      }
-
-      field_4_format_runs.add(r);
-      //Need to sort the font runs to ensure that the font runs appear in
-      //character order
-      Collections.sort(field_4_format_runs);
-
-      //Make sure that we now say that we are a rich string
-      field_2_optionflags = richText.setByte(field_2_optionflags);
-    }
-
-    public Iterator<FormatRun> formatIterator() {
-      if (field_4_format_runs != null) {
-        return field_4_format_runs.iterator();
-      }
-      return null;
-    }
-
-    public void removeFormatRun(FormatRun r) {
-      field_4_format_runs.remove(r);
-      if (field_4_format_runs.size() == 0) {
-        field_4_format_runs = null;
-        field_2_optionflags = richText.clearByte(field_2_optionflags);
-      }
-    }
-
-    public void clearFormatting() {
-      field_4_format_runs = null;
-      field_2_optionflags = richText.clearByte(field_2_optionflags);
-    }
-
-
-    public ExtRst getExtendedRst() {
-       return this.field_5_ext_rst;
-    }
-    void setExtendedRst(ExtRst ext_rst) {
-      if (ext_rst != null) {
-         field_2_optionflags = extBit.setByte(field_2_optionflags);
-      } else {
-         field_2_optionflags = extBit.clearByte(field_2_optionflags);
-      }
-      this.field_5_ext_rst = ext_rst;
-    }
-
-
-    /**
-     * Swaps all use in the string of one font index
-     *  for use of a different font index.
-     * Normally only called when fonts have been
-     *  removed / re-ordered
-     */
-    public void swapFontUse(short oldFontIndex, short newFontIndex) {
-        for (FormatRun run : field_4_format_runs) {
-            if(run._fontIndex == oldFontIndex) {
-                run._fontIndex = newFontIndex;
-            }
-        }
-    }
-
-    /**
-     * unlike the real records we return the same as "getString()" rather than debug info
-     * @see #getDebugInfo()
-     * @return String value of the record
-     */
-
-    public String toString()
-    {
-        return getString();
-    }
-
-    /**
-     * return a character representation of the fields of this record
-     *
-     *
-     * @return String of output for biffviewer etc.
-     *
-     */
-    public String getDebugInfo()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[UNICODESTRING]\n");
-        buffer.append("    .charcount       = ")
-            .append(Integer.toHexString(getCharCount())).append("\n");
-        buffer.append("    .optionflags     = ")
-            .append(Integer.toHexString(getOptionFlags())).append("\n");
-        buffer.append("    .string          = ").append(getString()).append("\n");
-        if (field_4_format_runs != null) {
-          for (int i = 0; i < field_4_format_runs.size();i++) {
-            FormatRun r = field_4_format_runs.get(i);
-            buffer.append("      .format_run"+i+"          = ").append(r.toString()).append("\n");
-          }
-        }
-        if (field_5_ext_rst != null) {
-          buffer.append("    .field_5_ext_rst          = ").append("\n");
-          buffer.append( field_5_ext_rst.toString() ).append("\n");
-        }
-        buffer.append("[/UNICODESTRING]\n");
-        return buffer.toString();
-    }
-
-    /**
-     * Serialises out the String. There are special rules
-     *  about where we can and can't split onto
-     *  Continue records.
-     */
-    public void serialize(ContinuableRecordOutput out) {
-        int numberOfRichTextRuns = 0;
-        int extendedDataSize = 0;
-        if (isRichText() && field_4_format_runs != null) {
-            numberOfRichTextRuns = field_4_format_runs.size();
-        }
-        if (isExtendedText() && field_5_ext_rst != null) {
-            extendedDataSize = 4 + field_5_ext_rst.getDataSize();
-        }
-       
-        // Serialise the bulk of the String
-        // The writeString handles tricky continue stuff for us
-        out.writeString(field_3_string, numberOfRichTextRuns, extendedDataSize);
-
-        if (numberOfRichTextRuns > 0) {
-
-          //This will ensure that a run does not split a continue
-          for (int i=0;i<numberOfRichTextRuns;i++) {
-              if (out.getAvailableSpace() < 4) {
-                  out.writeContinue();
-              }
-              FormatRun r = field_4_format_runs.get(i);
-              r.serialize(out);
-          }
-        }
-
-        if (extendedDataSize > 0) {
-           field_5_ext_rst.serialize(out);
-        }
-    }
-
-    public int compareTo(UnicodeString str) {
-
-        int result = getString().compareTo(str.getString());
-
-        //As per the equals method lets do this in stages
-        if (result != 0) {
-          return result;
-        }
-
-        //OK string appears to be equal but now lets compare formatting runs
-        if (field_4_format_runs == null) {
-            //Strings are equal, and there are no formatting runs. -> 0
-            //Strings are equal, but one or the other has formatting runs -> 1
-            return (str.field_4_format_runs == null) ? 0 : 1;
-        } else if (str.field_4_format_runs == null) {
-            //Strings are equal, but one or the other has formatting runs
-            return -1;
-        }
-
-        //Strings are equal, so now compare formatting runs.
-        int size = field_4_format_runs.size();
-        if (size != str.field_4_format_runs.size()) {
-          return size - str.field_4_format_runs.size();
-        }
-
-        for (int i=0;i<size;i++) {
-          FormatRun run1 = field_4_format_runs.get(i);
-          FormatRun run2 = str.field_4_format_runs.get(i);
-
-          result = run1.compareTo(run2);
-          if (result != 0) {
-            return result;
-          }
-        }
-
-        //Well the format runs are equal as well!, better check the ExtRst data
-        if (field_5_ext_rst == null) {
-            return (str.field_5_ext_rst == null) ? 0 : 1;
-        } else if (str.field_5_ext_rst == null) {
-            return -1;
-        } else {
-            return field_5_ext_rst.compareTo(str.field_5_ext_rst);
-        }
-    }
-
-    private boolean isRichText() {
-      return richText.isSet(getOptionFlags());
-    }
-
-    private boolean isExtendedText() {
-        return extBit.isSet(getOptionFlags());
-    }
-
-    public Object clone() {
-        UnicodeString str = new UnicodeString();
-        str.field_1_charCount = field_1_charCount;
-        str.field_2_optionflags = field_2_optionflags;
-        str.field_3_string = field_3_string;
-        if (field_4_format_runs != null) {
-          str.field_4_format_runs = new ArrayList<FormatRun>();
-          for (FormatRun r : field_4_format_runs) {
-            str.field_4_format_runs.add(new FormatRun(r._character, r._fontIndex));
-          }
-        }
-        if (field_5_ext_rst != null) {
-           str.field_5_ext_rst = field_5_ext_rst.clone();
-        }
-
-        return str;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java b/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
deleted file mode 100644
index 8839907..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cont;
-
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Common superclass of all records that can produce {@link ContinueRecord}s while being serialized.
- */
-public abstract class ContinuableRecord extends Record {
-
-	protected ContinuableRecord() {
-		// no fields to initialise
-	}
-	/**
-	 * Serializes this record's content to the supplied data output.<p>
-	 * The standard BIFF header (ushort sid, ushort size) has been handled by the superclass, so
-	 * only BIFF data should be written by this method.  Simple data types can be written with the
-	 * standard {@link LittleEndianOutput} methods.  Methods from {@link ContinuableRecordOutput}
-	 * can be used to serialize strings (with {@link ContinueRecord}s being written as required).
-	 * If necessary, implementors can explicitly start {@link ContinueRecord}s (regardless of the
-	 * amount of remaining space).
-	 *
-	 * @param out a data output stream
-	 */
-	protected abstract void serialize(ContinuableRecordOutput out);
-
-
-	/**
-	 * @return the total length of the encoded record(s)
-	 * (Note - if any {@link ContinueRecord} is required, this result includes the
-	 * size of those too)
-	 */
-	public final int getRecordSize() {
-		ContinuableRecordOutput out = ContinuableRecordOutput.createForCountingOnly();
-		serialize(out);
-		out.terminate();
-		return out.getTotalSize();
-	}
-
-	public final int serialize(int offset, byte[] data) {
-
-		LittleEndianOutput leo = new LittleEndianByteArrayOutputStream(data, offset);
-		ContinuableRecordOutput out = new ContinuableRecordOutput(leo, getSid());
-		serialize(out);
-		out.terminate();
-		return out.getTotalSize();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java b/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
deleted file mode 100644
index ecd8d4b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hssf.record.cont;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * A decorated {@link RecordInputStream} that can read primitive data types
- * (short, int, long, etc.) spanned across a {@link ContinueRecord } boundary.
- *
- * <p>
- *  Most records construct themselves from {@link RecordInputStream}.
- *  This class assumes that a {@link ContinueRecord} record break always occurs at the type boundary,
- *  however, it is not always so.
- * </p>
- *  Two  attachments to <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=50779">Bugzilla 50779</a>
- *  demonstrate that a CONTINUE break can appear right in between two bytes of a unicode character
- *  or between two bytes of a <code>short</code>. The problematic portion of the data is
- *  in a Asian Phonetic Settings Block (ExtRst) of a UnicodeString.
- * <p>
- *  {@link RecordInputStream} greedily requests the bytes to be read and stumbles on such files with a
- *  "Not enough data (1) to read requested (2) bytes" exception.  The <code>ContinuableRecordInput</code>
- *   class circumvents this "type boundary" rule and reads data byte-by-byte rolling over CONTINUE if necessary.
- * </p>
- *
- * <p>
- * YK: For now (March 2011) this class is only used to read
- *   @link org.apache.poi.hssf.record.common.UnicodeString.ExtRst} blocks of a UnicodeString.
- *
- * </p>
- */
-public class ContinuableRecordInput implements LittleEndianInput {
-    private final RecordInputStream _in;
-
-    public ContinuableRecordInput(RecordInputStream in){
-        _in = in;
-    }
-    @Override
-    public int available(){
-        return _in.available();
-    }
-
-    @Override
-    public byte readByte(){
-        return _in.readByte();
-    }
-
-    @Override
-    public int readUByte(){
-        return _in.readUByte();
-    }
-
-    @Override
-    public short readShort(){
-        return _in.readShort();
-    }
-
-    @Override
-    public int readUShort(){
-        int ch1 = readUByte();
-        int ch2 = readUByte();
-        return (ch2 << 8) + (ch1 << 0);
-    }
-
-    @Override
-    public int readInt(){
-        int ch1 = _in.readUByte();
-        int ch2 = _in.readUByte();
-        int ch3 = _in.readUByte();
-        int ch4 = _in.readUByte();
-        return (ch4 << 24) + (ch3 << 16) + (ch2 << 8) + (ch1 << 0);
-    }
-
-    @Override
-    public long readLong(){
-        int b0 = _in.readUByte();
-        int b1 = _in.readUByte();
-        int b2 = _in.readUByte();
-        int b3 = _in.readUByte();
-        int b4 = _in.readUByte();
-        int b5 = _in.readUByte();
-        int b6 = _in.readUByte();
-        int b7 = _in.readUByte();
-        return (((long)b7 << 56) +
-                ((long)b6 << 48) +
-                ((long)b5 << 40) +
-                ((long)b4 << 32) +
-                ((long)b3 << 24) +
-                (b2 << 16) +
-                (b1 <<  8) +
-                (b0 <<  0));
-    }
-
-    @Override
-    public double readDouble(){
-        return _in.readDouble();
-    }
-
-    @Override
-    public void readFully(byte[] buf){
-        _in.readFully(buf);
-    }
-
-    @Override
-    public void readFully(byte[] buf, int off, int len){
-        _in.readFully(buf, off, len);
-    }
-    
-    @Override
-    public void readPlain(byte[] buf, int off, int len) {
-        readFully(buf, off, len);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java b/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
deleted file mode 100644
index a39f139..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cont;
-
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.util.DelayableLittleEndianOutput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * An augmented {@link LittleEndianOutput} used for serialization of {@link ContinuableRecord}s.
- * This class keeps track of how much remaining space is available in the current BIFF record and
- * can start new {@link ContinueRecord}s as required.
- */
-public final class ContinuableRecordOutput implements LittleEndianOutput {
-
-	private final LittleEndianOutput _out;
-	private UnknownLengthRecordOutput _ulrOutput;
-	private int _totalPreviousRecordsSize;
-
-	public ContinuableRecordOutput(LittleEndianOutput out, int sid) {
-		_ulrOutput = new UnknownLengthRecordOutput(out, sid);
-		_out = out;
-		_totalPreviousRecordsSize = 0;
-	}
-
-	public static ContinuableRecordOutput createForCountingOnly() {
-		return new ContinuableRecordOutput(NOPOutput, -777); // fake sid
-	}
-
-	/**
-	 * @return total number of bytes written so far (including all BIFF headers)
-	 */
-	public int getTotalSize() {
-		return _totalPreviousRecordsSize + _ulrOutput.getTotalSize();
-	}
-	/**
-	 * Terminates the last record (also updates its 'ushort size' field)
-	 */
-	void terminate() {
-		_ulrOutput.terminate();
-	}
-	/**
-	 * @return number of remaining bytes of space in current record
-	 */
-	public int getAvailableSpace() {
-		return _ulrOutput.getAvailableSpace();
-	}
-
-	/**
-	 * Terminates the current record and starts a new {@link ContinueRecord} (regardless
-	 * of how much space is still available in the current record).
-	 */
-	public void writeContinue() {
-		_ulrOutput.terminate();
-		_totalPreviousRecordsSize += _ulrOutput.getTotalSize();
-		_ulrOutput = new UnknownLengthRecordOutput(_out, ContinueRecord.sid);
-	}
-	/**
-	 * Will terminate the current record and start a new {@link ContinueRecord}
-	 *  if there isn't space for the requested number of bytes
-	 * @param requiredContinuousSize The number of bytes that need to be written
-	 */
-	public void writeContinueIfRequired(int requiredContinuousSize) {
-		if (_ulrOutput.getAvailableSpace() < requiredContinuousSize) {
-			writeContinue();
-		}
-	}
-
-	/**
-	 * Writes the 'optionFlags' byte and encoded character data of a unicode string.  This includes:
-	 * <ul>
-	 * <li>byte optionFlags</li>
-	 * <li>encoded character data (in "ISO-8859-1" or "UTF-16LE" encoding)</li>
-	 * </ul>
-	 *
-	 * Notes:
-	 * <ul>
-	 * <li>The value of the 'is16bitEncoded' flag is determined by the actual character data
-	 * of <tt>text</tt></li>
-	 * <li>The string options flag is never separated (by a {@link ContinueRecord}) from the
-	 * first chunk of character data it refers to.</li>
-	 * <li>The 'ushort length' field is assumed to have been explicitly written earlier.  Hence,
-	 * there may be an intervening {@link ContinueRecord}</li>
-	 * </ul>
-	 */
-	public void writeStringData(String text) {
-		boolean is16bitEncoded = StringUtil.hasMultibyte(text);
-		// calculate total size of the header and first encoded char
-		int keepTogetherSize = 1 + 1; // ushort len, at least one character byte
-		int optionFlags = 0x00;
-		if (is16bitEncoded) {
-			optionFlags |= 0x01;
-			keepTogetherSize += 1; // one extra byte for first char
-		}
-		writeContinueIfRequired(keepTogetherSize);
-		writeByte(optionFlags);
-		writeCharacterData(text, is16bitEncoded);
-	}
-	/**
-	 * Writes a unicode string complete with header and character data.  This includes:
-	 * <ul>
-	 * <li>ushort length</li>
-	 * <li>byte optionFlags</li>
-	 * <li>ushort numberOfRichTextRuns (optional)</li>
-	 * <li>ushort extendedDataSize (optional)</li>
-	 * <li>encoded character data (in "ISO-8859-1" or "UTF-16LE" encoding)</li>
-	 * </ul>
-	 *
-	 * The following bits of the 'optionFlags' byte will be set as appropriate:
-	 * <table border='1'>
-	 * <tr><th>Mask</th><th>Description</th></tr>
-	 * <tr><td>0x01</td><td>is16bitEncoded</td></tr>
-	 * <tr><td>0x04</td><td>hasExtendedData</td></tr>
-	 * <tr><td>0x08</td><td>isRichText</td></tr>
-	 * </table>
-	 * Notes:
-	 * <ul>
-	 * <li>The value of the 'is16bitEncoded' flag is determined by the actual character data
-	 * of <tt>text</tt></li>
-	 * <li>The string header fields are never separated (by a {@link ContinueRecord}) from the
-	 * first chunk of character data (i.e. the first character is always encoded in the same
-	 * record as the string header).</li>
-	 * </ul>
-	 */
-	public void writeString(String text, int numberOfRichTextRuns, int extendedDataSize) {
-		boolean is16bitEncoded = StringUtil.hasMultibyte(text);
-		// calculate total size of the header and first encoded char
-		int keepTogetherSize = 2 + 1 + 1; // ushort len, byte optionFlags, at least one character byte
-		int optionFlags = 0x00;
-		if (is16bitEncoded) {
-			optionFlags |= 0x01;
-			keepTogetherSize += 1; // one extra byte for first char
-		}
-		if (numberOfRichTextRuns > 0) {
-			optionFlags |= 0x08;
-			keepTogetherSize += 2;
-		}
-		if (extendedDataSize > 0) {
-			optionFlags |= 0x04;
-			keepTogetherSize += 4;
-		}
-		writeContinueIfRequired(keepTogetherSize);
-		writeShort(text.length());
-		writeByte(optionFlags);
-		if (numberOfRichTextRuns > 0) {
-			writeShort(numberOfRichTextRuns);
-		}
-		if (extendedDataSize > 0) {
-			writeInt(extendedDataSize);
-		}
-		writeCharacterData(text, is16bitEncoded);
-	}
-
-
-	private void writeCharacterData(String text, boolean is16bitEncoded) {
-		int nChars = text.length();
-		int i=0;
-		if (is16bitEncoded) {
-			while(true) {
-				int nWritableChars = Math.min(nChars-i, _ulrOutput.getAvailableSpace() / 2);
-				for ( ; nWritableChars > 0; nWritableChars--) {
-					_ulrOutput.writeShort(text.charAt(i++));
-				}
-				if (i >= nChars) {
-					break;
-				}
-				writeContinue();
-				writeByte(0x01);
-			}
-		} else {
-			while(true) {
-				int nWritableChars = Math.min(nChars-i, _ulrOutput.getAvailableSpace() / 1);
-				for ( ; nWritableChars > 0; nWritableChars--) {
-					_ulrOutput.writeByte(text.charAt(i++));
-				}
-				if (i >= nChars) {
-					break;
-				}
-				writeContinue();
-				writeByte(0x00);
-			}
-		}
-	}
-
-	public void write(byte[] b) {
-		writeContinueIfRequired(b.length);
-		_ulrOutput.write(b);
-	}
-
-	public void write(byte[] b, int offset, int len) {
-
-        int i=0;
-        while(true) {
-            int nWritableChars = Math.min(len - i, _ulrOutput.getAvailableSpace() / 1);
-            for ( ; nWritableChars > 0; nWritableChars--) {
-                _ulrOutput.writeByte(b[offset + i++]);
-            }
-            if (i >= len) {
-                break;
-            }
-            writeContinue();
-        }
-	}
-
-	public void writeByte(int v) {
-		writeContinueIfRequired(1);
-		_ulrOutput.writeByte(v);
-	}
-	public void writeDouble(double v) {
-		writeContinueIfRequired(8);
-		_ulrOutput.writeDouble(v);
-	}
-	public void writeInt(int v) {
-		writeContinueIfRequired(4);
-		_ulrOutput.writeInt(v);
-	}
-	public void writeLong(long v) {
-		writeContinueIfRequired(8);
-		_ulrOutput.writeLong(v);
-	}
-	public void writeShort(int v) {
-		writeContinueIfRequired(2);
-		_ulrOutput.writeShort(v);
-	}
-
-	/**
-	 * Allows optimised usage of {@link ContinuableRecordOutput} for sizing purposes only.
-	 */
-	private static final LittleEndianOutput NOPOutput = new DelayableLittleEndianOutput() {
-
-		public LittleEndianOutput createDelayedOutput(int size) {
-			return this;
-		}
-		public void write(byte[] b) {
-			// does nothing
-		}
-		public void write(byte[] b, int offset, int len) {
-			// does nothing
-		}
-		public void writeByte(int v) {
-			// does nothing
-		}
-		public void writeDouble(double v) {
-			// does nothing
-		}
-		public void writeInt(int v) {
-			// does nothing
-		}
-		public void writeLong(long v) {
-			// does nothing
-		}
-		public void writeShort(int v) {
-			// does nothing
-		}
-	};
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java b/trunk/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
deleted file mode 100644
index 5e5206f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cont;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.DelayableLittleEndianOutput;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianOutput;
-/**
- * Allows the writing of BIFF records when the 'ushort size' header field is not known in advance.
- * When the client is finished writing data, it calls {@link #terminate()}, at which point this
- * class updates the 'ushort size' with its final value.
- */
-final class UnknownLengthRecordOutput implements LittleEndianOutput {
-	private static final int MAX_DATA_SIZE = RecordInputStream.MAX_RECORD_DATA_SIZE;
-
-	private final LittleEndianOutput _originalOut;
-	/** for writing the 'ushort size'  field once its value is known */
-	private final LittleEndianOutput _dataSizeOutput;
-	private final byte[] _byteBuffer;
-	private LittleEndianOutput _out;
-	private int _size;
-
-	public UnknownLengthRecordOutput(LittleEndianOutput out, int sid) {
-		_originalOut = out;
-		out.writeShort(sid);
-		if (out instanceof DelayableLittleEndianOutput) {
-			// optimisation
-			DelayableLittleEndianOutput dleo = (DelayableLittleEndianOutput) out;
-			_dataSizeOutput = dleo.createDelayedOutput(2);
-			_byteBuffer = null;
-			_out = out;
-		} else {
-			// otherwise temporarily write all subsequent data to a buffer
-			_dataSizeOutput = out;
-			_byteBuffer = new byte[RecordInputStream.MAX_RECORD_DATA_SIZE];
-			_out = new LittleEndianByteArrayOutputStream(_byteBuffer, 0);
-		}
-	}
-	/**
-	 * includes 4 byte header
-	 */
-	public int getTotalSize() {
-		return 4 + _size;
-	}
-	public int getAvailableSpace() {
-		if (_out == null) {
-			throw new IllegalStateException("Record already terminated");
-		}
-		return MAX_DATA_SIZE - _size;
-	}
-	/**
-	 * Finishes writing the current record and updates 'ushort size' field.<br/>
-	 * After this method is called, only {@link #getTotalSize()} may be called.
-	 */
-	public void terminate() {
-		if (_out == null) {
-			throw new IllegalStateException("Record already terminated");
-		}
-		_dataSizeOutput.writeShort(_size);
-		if (_byteBuffer != null) {
-			_originalOut.write(_byteBuffer, 0, _size);
-			_out = null;
-			return;
-		}
-		_out = null;
-	}
-
-	public void write(byte[] b) {
-		_out.write(b);
-		_size += b.length;
-	}
-	public void write(byte[] b, int offset, int len) {
-		_out.write(b, offset, len);
-		_size += len;
-	}
-	public void writeByte(int v) {
-		_out.writeByte(v);
-		_size += 1;
-	}
-	public void writeDouble(double v) {
-		_out.writeDouble(v);
-		_size += 8;
-	}
-	public void writeInt(int v) {
-		_out.writeInt(v);
-		_size += 4;
-	}
-	public void writeLong(long v) {
-		_out.writeLong(v);
-		_size += 8;
-	}
-	public void writeShort(int v) {
-		_out.writeShort(v);
-		_size += 2;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java b/trunk/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
deleted file mode 100644
index cef3102..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.crypto;
-
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BiffHeaderInput;
-import org.apache.poi.hssf.record.FilePassRecord;
-import org.apache.poi.hssf.record.InterfaceHdrRecord;
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.poifs.crypt.ChunkedCipherInputStream;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInput;
-
-public final class Biff8DecryptingStream implements BiffHeaderInput, LittleEndianInput {
-
-    public static final int RC4_REKEYING_INTERVAL = 1024;
-
-    private final EncryptionInfo info;
-    private ChunkedCipherInputStream ccis;
-    private final byte buffer[] = new byte[LittleEndianConsts.LONG_SIZE];
-    private boolean shouldSkipEncryptionOnCurrentRecord = false;
-
-	public Biff8DecryptingStream(InputStream in, int initialOffset, EncryptionInfo info) throws RecordFormatException {
-        try {
-    	    byte initialBuf[] = new byte[initialOffset];
-    	    InputStream stream;
-    	    if (initialOffset == 0) {
-    	        stream = in;
-    	    } else {
-    	        stream = new PushbackInputStream(in, initialOffset);
-    	        ((PushbackInputStream)stream).unread(initialBuf);
-    	    }
-    	    
-            this.info = info;
-            Decryptor dec = this.info.getDecryptor();
-            dec.setChunkSize(RC4_REKEYING_INTERVAL);
-            ccis = (ChunkedCipherInputStream)dec.getDataStream(stream, Integer.MAX_VALUE, 0);
-            
-            if (initialOffset > 0) {
-                ccis.readFully(initialBuf);
-            }
-        } catch (Exception e) {
-            throw new RecordFormatException(e);
-        }
-	}
-
-	@Override
-    public int available() {
-		return ccis.available();
-	}
-
-	/**
-	 * Reads an unsigned short value without decrypting
-	 */
-	@Override
-    public int readRecordSID() {
-	    readPlain(buffer, 0, LittleEndianConsts.SHORT_SIZE);
-		int sid = LittleEndian.getUShort(buffer, 0);
-		shouldSkipEncryptionOnCurrentRecord = isNeverEncryptedRecord(sid);
-		return sid;
-	}
-
-	/**
-	 * Reads an unsigned short value without decrypting
-	 */
-	@Override
-    public int readDataSize() {
-        readPlain(buffer, 0, LittleEndianConsts.SHORT_SIZE);
-        int dataSize = LittleEndian.getUShort(buffer, 0);
-        ccis.setNextRecordSize(dataSize);
-		return dataSize;
-	}
-
-	@Override
-    public double readDouble() {
-	    long valueLongBits = readLong();
-		double result = Double.longBitsToDouble(valueLongBits);
-		if (Double.isNaN(result)) {
-		    // (Because Excel typically doesn't write NaN
-		    throw new RuntimeException("Did not expect to read NaN");
-		}
-		return result;
-	}
-
-	@Override
-    public void readFully(byte[] buf) {
-	    readFully(buf, 0, buf.length);
-	}
-
-	@Override
-    public void readFully(byte[] buf, int off, int len) {
-        if (shouldSkipEncryptionOnCurrentRecord) {
-            readPlain(buf, off, buf.length);
-        } else {
-            ccis.readFully(buf, off, len);
-        }
-	}
-
-	@Override
-    public int readUByte() {
-	    return readByte() & 0xFF;
-	}
-	
-	@Override
-    public byte readByte() {
-        if (shouldSkipEncryptionOnCurrentRecord) {
-            readPlain(buffer, 0, LittleEndianConsts.BYTE_SIZE);
-            return buffer[0];
-        } else {
-            return ccis.readByte();
-        }
-	}
-
-	@Override
-    public int readUShort() {
-	    return readShort() & 0xFFFF;
-	}
-	
-	@Override
-    public short readShort() {
-        if (shouldSkipEncryptionOnCurrentRecord) {
-            readPlain(buffer, 0, LittleEndianConsts.SHORT_SIZE);
-            return LittleEndian.getShort(buffer);
-        } else {
-            return ccis.readShort();
-        }
-	}
-
-	@Override
-    public int readInt() {
-        if (shouldSkipEncryptionOnCurrentRecord) {
-            readPlain(buffer, 0, LittleEndianConsts.INT_SIZE);
-            return LittleEndian.getInt(buffer);
-        } else {
-            return ccis.readInt();
-        }
-	}
-
-	@Override
-    public long readLong() {
-        if (shouldSkipEncryptionOnCurrentRecord) {
-            readPlain(buffer, 0, LittleEndianConsts.LONG_SIZE);
-            return LittleEndian.getLong(buffer);
-        } else {
-            return ccis.readLong();
-        }
-	}
-
-	/**
-	 * @return the absolute position in the stream
-	 */
-	public long getPosition() {
-	    return ccis.getPos();
-	}
-	
-    /**
-     * TODO: Additionally, the lbPlyPos (position_of_BOF) field of the BoundSheet8 record MUST NOT be encrypted.
-     *
-     * @return <code>true</code> if record type specified by <tt>sid</tt> is never encrypted
-     */
-    public static boolean isNeverEncryptedRecord(int sid) {
-        switch (sid) {
-            case BOFRecord.sid:
-                // sheet BOFs for sure
-                // TODO - find out about chart BOFs
-
-            case InterfaceHdrRecord.sid:
-                // don't know why this record doesn't seem to get encrypted
-
-            case FilePassRecord.sid:
-                // this only really counts when writing because FILEPASS is read early
-
-            // UsrExcl(0x0194)
-            // FileLock
-            // RRDInfo(0x0196)
-            // RRDHead(0x0138)
-
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public void readPlain(byte b[], int off, int len) {
-        ccis.readPlain(b, off, len);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java b/trunk/src/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
deleted file mode 100644
index 382ae2f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.record.crypto;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-public final class Biff8EncryptionKey {
-	/**
-	 * Stores the BIFF8 encryption/decryption password for the current thread.  This has been done
-	 * using a {@link ThreadLocal} in order to avoid further overloading the various public APIs
-	 * (e.g. {@link HSSFWorkbook}) that need this functionality.
-	 */
-	private static final ThreadLocal<String> _userPasswordTLS = new ThreadLocal<String>();
-
-	/**
-	 * Sets the BIFF8 encryption/decryption password for the current thread.
-	 *
-	 * @param password pass <code>null</code> to clear user password (and use default)
-	 */
-	public static void setCurrentUserPassword(String password) {
-		_userPasswordTLS.set(password);
-	}
-
-	/**
-	 * @return the BIFF8 encryption/decryption password for the current thread.
-	 * <code>null</code> if it is currently unset.
-	 */
-	public static String getCurrentUserPassword() {
-		return _userPasswordTLS.get();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/package.html b/trunk/src/java/org/apache/poi/hssf/record/package.html
deleted file mode 100644
index 4465358..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/package.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-Record package contains class representations for XLS binary strutures.  Its very
-low level.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.hssf.eventmodel
-@see org.apache.poi.hssf.record.RecordFactory
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java b/trunk/src/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
deleted file mode 100644
index 05cf6a6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivottable;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * SXDI - Data Item (0x00C5)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class DataItemRecord extends StandardRecord {
-	public static final short sid = 0x00C5;
-
-	private int isxvdData;
-	private int iiftab;
-	private int df;
-	private int isxvd;
-	private int isxvi;
-	private int ifmt;
-	private String name;
-	
-	public DataItemRecord(RecordInputStream in) {
-		isxvdData = in.readUShort();
-		iiftab = in.readUShort();
-		df = in.readUShort();
-		isxvd = in.readUShort();
-		isxvi = in.readUShort();
-		ifmt = in.readUShort();
-		
-		name = in.readString();
-	}
-	
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		
-		out.writeShort(isxvdData);
-		out.writeShort(iiftab);
-		out.writeShort(df);
-		out.writeShort(isxvd);
-		out.writeShort(isxvi);
-		out.writeShort(ifmt);
-		
-		StringUtil.writeUnicodeString(out, name);
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2 + 2 + 2 + 2 + 2 + 2 + StringUtil.getEncodedSize(name);
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		
-		buffer.append("[SXDI]\n");
-		buffer.append("  .isxvdData = ").append(HexDump.shortToHex(isxvdData)).append("\n");
-		buffer.append("  .iiftab = ").append(HexDump.shortToHex(iiftab)).append("\n");
-		buffer.append("  .df = ").append(HexDump.shortToHex(df)).append("\n");
-		buffer.append("  .isxvd = ").append(HexDump.shortToHex(isxvd)).append("\n");
-		buffer.append("  .isxvi = ").append(HexDump.shortToHex(isxvi)).append("\n");
-		buffer.append("  .ifmt = ").append(HexDump.shortToHex(ifmt)).append("\n");
-		buffer.append("[/SXDI]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
deleted file mode 100644
index 70c9ebc..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivottable;
-
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * SXVDEX - Extended PivotTable View Fields (0x0100)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class ExtendedPivotTableViewFieldsRecord extends StandardRecord {
-	public static final short sid = 0x0100;
-
-	/** the value of the subname length when the {@link #_subtotalName} is not present */
-	private static final int STRING_NOT_PRESENT_LEN = 0xFFFF;
-
-	private int _grbit1;
-	private int _grbit2;
-	private int _citmShow;
-	private int _isxdiSort;
-	private int _isxdiShow;
-	private int _reserved1;
-	private int _reserved2;
-	/** custom sub-total name */
-	private String _subtotalName;
-
-	public ExtendedPivotTableViewFieldsRecord(RecordInputStream in) {
-
-		_grbit1 = in.readInt();
-		_grbit2 = in.readUByte();
-		_citmShow = in.readUByte();
-		_isxdiSort = in.readUShort();
-		_isxdiShow = in.readUShort();
-		// This record seems to have different valid encodings
-		switch (in.remaining()) {
-			case 0:
-				// as per "Microsoft Excel Developer's Kit" book
-				// older version of SXVDEX - doesn't seem to have a sub-total name
-				_reserved1 = 0;
-				_reserved2 = 0;
-				_subtotalName = null;
-				return;
-			case 10:
-				// as per "MICROSOFT OFFICE EXCEL 97-2007 BINARY FILE FORMAT SPECIFICATION" pdf
-				break;
-			default:
-				throw new RecordFormatException("Unexpected remaining size (" + in.remaining() + ")");
-		}
-		int cchSubName = in.readUShort();
-		_reserved1 = in.readInt();
-		_reserved2 = in.readInt();
-		if (cchSubName != STRING_NOT_PRESENT_LEN) {
-			_subtotalName = in.readUnicodeLEString(cchSubName);
-		}
-	}
-
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-
-		out.writeInt(_grbit1);
-		out.writeByte(_grbit2);
-		out.writeByte(_citmShow);
-		out.writeShort(_isxdiSort);
-		out.writeShort(_isxdiShow);
-
-		if (_subtotalName == null) {
-			out.writeShort(STRING_NOT_PRESENT_LEN);
-		} else {
-			out.writeShort(_subtotalName.length());
-		}
-
-		out.writeInt(_reserved1);
-		out.writeInt(_reserved2);
-		if (_subtotalName != null) {
-			StringUtil.putUnicodeLE(_subtotalName, out);
-		}
-	}
-
-	@Override
-	protected int getDataSize() {
-		
-		return 4 + 1 + 1 + 2 + 2 + 2 +  4 + 4 +
-					(_subtotalName == null ? 0 : (2*_subtotalName.length())); // in unicode
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[SXVDEX]\n");
-
-		buffer.append("    .grbit1 =").append(HexDump.intToHex(_grbit1)).append("\n");
-		buffer.append("    .grbit2 =").append(HexDump.byteToHex(_grbit2)).append("\n");
-		buffer.append("    .citmShow =").append(HexDump.byteToHex(_citmShow)).append("\n");
-		buffer.append("    .isxdiSort =").append(HexDump.shortToHex(_isxdiSort)).append("\n");
-		buffer.append("    .isxdiShow =").append(HexDump.shortToHex(_isxdiShow)).append("\n");
-		buffer.append("    .subtotalName =").append(_subtotalName).append("\n");
-		buffer.append("[/SXVDEX]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java b/trunk/src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
deleted file mode 100644
index ebcb843..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivottable;
-
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * SXPI - Page Item (0x00B6)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class PageItemRecord extends StandardRecord {
-	public static final short sid = 0x00B6;
-
-	private static final class FieldInfo {
-		public static final int ENCODED_SIZE = 6;
-		/** Index to the View Item SXVI(0x00B2) record */
-		private int _isxvi;
-		/** Index to the {@link ViewFieldsRecord} SXVD(0x00B1) record */
-		private int _isxvd;
-		/** Object ID for the drop-down arrow */
-		private int _idObj;
-
-		public FieldInfo(RecordInputStream in) {
-			_isxvi = in.readShort();
-			_isxvd = in.readShort();
-			_idObj = in.readShort();
-		}
-
-		protected void serialize(LittleEndianOutput out) {
-			out.writeShort(_isxvi);
-			out.writeShort(_isxvd);
-			out.writeShort(_idObj);
-		}
-
-		public void appendDebugInfo(StringBuffer sb) {
-			sb.append('(');
-			sb.append( "isxvi=").append(HexDump.shortToHex(_isxvi));
-			sb.append(" isxvd=").append(HexDump.shortToHex(_isxvd));
-			sb.append(" idObj=").append(HexDump.shortToHex(_idObj));
-			sb.append(')');
-		}
-	}
-
-	private final FieldInfo[] _fieldInfos;
-
-	public PageItemRecord(RecordInputStream in) {
-		int dataSize = in.remaining();
-		if (dataSize % FieldInfo.ENCODED_SIZE != 0) {
-			throw new RecordFormatException("Bad data size " + dataSize);
-		}
-
-		int nItems = dataSize / FieldInfo.ENCODED_SIZE;
-
-		FieldInfo[] fis = new FieldInfo[nItems];
-		for (int i = 0; i < fis.length; i++) {
-			fis[i] = new FieldInfo(in);
-		}
-		_fieldInfos = fis;
-	}
-
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		for (int i = 0; i < _fieldInfos.length; i++) {
-			_fieldInfos[i].serialize(out);
-		}
-	}
-
-	@Override
-	protected int getDataSize() {
-		return _fieldInfos.length * FieldInfo.ENCODED_SIZE;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("[SXPI]\n");
-		for (int i = 0; i < _fieldInfos.length; i++) {
-			sb.append("    item[").append(i).append("]=");
-			_fieldInfos[i].appendDebugInfo(sb);
-			sb.append('\n');
-		}
-		sb.append("[/SXPI]\n");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java b/trunk/src/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
deleted file mode 100644
index bd72900..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivottable;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * SXIDSTM - Stream ID (0x00D5)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class StreamIDRecord extends StandardRecord {
-	public static final short sid = 0x00D5;
-
-	private int idstm;
-	
-	public StreamIDRecord(RecordInputStream in) {
-		idstm = in.readShort();
-	}
-	
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		out.writeShort(idstm);
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[SXIDSTM]\n");
-		buffer.append("    .idstm      =").append(HexDump.shortToHex(idstm)).append('\n');
-
-		buffer.append("[/SXIDSTM]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java b/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
deleted file mode 100644
index 3c37924..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivottable;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * SXVIEW - View Definition (0x00B0)<br/>
- */
-public final class ViewDefinitionRecord extends StandardRecord {
-	public static final short sid = 0x00B0;
-
-	private int rwFirst;
-	private int rwLast;
-	private int colFirst;
-	private int colLast;
-	private int rwFirstHead;
-	private int rwFirstData;
-	private int colFirstData;
-	private int iCache;
-	private int reserved;
-	
-	private int sxaxis4Data;
-	private int ipos4Data;
-	private int cDim;
-	
-	private int cDimRw;
-	
-	private int cDimCol;
-	private int cDimPg;
-	
-	private int cDimData;
-	private int cRw;
-	private int cCol;
-	private int grbit;
-	private int itblAutoFmt;
-	
-	private String dataField;
-	private String name;
-
-	
-	public ViewDefinitionRecord(RecordInputStream in) {
-		rwFirst = in.readUShort();
-		rwLast = in.readUShort();
-		colFirst = in.readUShort();
-		colLast = in.readUShort();
-		rwFirstHead = in.readUShort();
-		rwFirstData = in.readUShort();
-		colFirstData = in.readUShort();
-		iCache = in.readUShort();
-		reserved = in.readUShort();
-		sxaxis4Data = in.readUShort();
-		ipos4Data = in.readUShort();
-		cDim = in.readUShort();
-		cDimRw = in.readUShort();
-		cDimCol = in.readUShort();
-		cDimPg = in.readUShort();
-		cDimData = in.readUShort();
-		cRw = in.readUShort();
-		cCol = in.readUShort();
-		grbit = in.readUShort();
-		itblAutoFmt = in.readUShort();
-		int cchName = in.readUShort();
-		int cchData = in.readUShort();
-
-		name = StringUtil.readUnicodeString(in, cchName);
-		dataField = StringUtil.readUnicodeString(in, cchData);
-	}
-	
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		out.writeShort(rwFirst);
-		out.writeShort(rwLast);
-		out.writeShort(colFirst);
-		out.writeShort(colLast);
-		out.writeShort(rwFirstHead);
-		out.writeShort(rwFirstData);
-		out.writeShort(colFirstData);
-		out.writeShort(iCache);
-		out.writeShort(reserved);
-		out.writeShort(sxaxis4Data);
-		out.writeShort(ipos4Data);
-		out.writeShort(cDim);
-		out.writeShort(cDimRw);
-		out.writeShort(cDimCol);
-		out.writeShort(cDimPg);
-		out.writeShort(cDimData);
-		out.writeShort(cRw);
-		out.writeShort(cCol);
-		out.writeShort(grbit);
-		out.writeShort(itblAutoFmt);
-		out.writeShort(name.length());
-		out.writeShort(dataField.length());
-
-		StringUtil.writeUnicodeStringFlagAndData(out, name);
-		StringUtil.writeUnicodeStringFlagAndData(out, dataField);		
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 40 + // 20 short fields (rwFirst ... itblAutoFmt)
-			StringUtil.getEncodedSize(name) + StringUtil.getEncodedSize(dataField) ;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[SXVIEW]\n");
-		buffer.append("    .rwFirst      =").append(HexDump.shortToHex(rwFirst)).append('\n');
-		buffer.append("    .rwLast       =").append(HexDump.shortToHex(rwLast)).append('\n');
-		buffer.append("    .colFirst     =").append(HexDump.shortToHex(colFirst)).append('\n');
-		buffer.append("    .colLast      =").append(HexDump.shortToHex(colLast)).append('\n');
-		buffer.append("    .rwFirstHead  =").append(HexDump.shortToHex(rwFirstHead)).append('\n');
-		buffer.append("    .rwFirstData  =").append(HexDump.shortToHex(rwFirstData)).append('\n');
-		buffer.append("    .colFirstData =").append(HexDump.shortToHex(colFirstData)).append('\n');
-		buffer.append("    .iCache       =").append(HexDump.shortToHex(iCache)).append('\n');
-		buffer.append("    .reserved     =").append(HexDump.shortToHex(reserved)).append('\n');
-		buffer.append("    .sxaxis4Data  =").append(HexDump.shortToHex(sxaxis4Data)).append('\n');
-		buffer.append("    .ipos4Data    =").append(HexDump.shortToHex(ipos4Data)).append('\n');
-		buffer.append("    .cDim         =").append(HexDump.shortToHex(cDim)).append('\n');
-		buffer.append("    .cDimRw       =").append(HexDump.shortToHex(cDimRw)).append('\n');
-		buffer.append("    .cDimCol      =").append(HexDump.shortToHex(cDimCol)).append('\n');
-		buffer.append("    .cDimPg       =").append(HexDump.shortToHex(cDimPg)).append('\n');
-		buffer.append("    .cDimData     =").append(HexDump.shortToHex(cDimData)).append('\n');
-		buffer.append("    .cRw          =").append(HexDump.shortToHex(cRw)).append('\n');
-		buffer.append("    .cCol         =").append(HexDump.shortToHex(cCol)).append('\n');
-		buffer.append("    .grbit        =").append(HexDump.shortToHex(grbit)).append('\n');
-		buffer.append("    .itblAutoFmt  =").append(HexDump.shortToHex(itblAutoFmt)).append('\n');
-		buffer.append("    .name         =").append(name).append('\n');
-		buffer.append("    .dataField    =").append(dataField).append('\n');
-
-		buffer.append("[/SXVIEW]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java b/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
deleted file mode 100644
index de73f84..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivottable;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * SXVD - View Fields (0x00B1)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class ViewFieldsRecord extends StandardRecord {
-	public static final short sid = 0x00B1;
-
-	/** the value of the <tt>cchName</tt> field when the {@link #_name} is not present */
-	private static final int STRING_NOT_PRESENT_LEN = 0xFFFF;
-	/** 5 shorts */
-	private static final int BASE_SIZE = 10;
-
-	private int _sxaxis;
-	private int _cSub;
-	private int _grbitSub;
-	private int _cItm;
-	
-	private String _name;
-	
-	/**
-	 * values for the {@link ViewFieldsRecord#_sxaxis} field
-	 */
-	private static final class Axis {
-		public static final int NO_AXIS = 0;
-		public static final int ROW = 1;
-		public static final int COLUMN = 2;
-		public static final int PAGE = 4;
-		public static final int DATA = 8;
-	}
-
-	public ViewFieldsRecord(RecordInputStream in) {
-		_sxaxis = in.readShort();
-		_cSub = in.readShort();
-		_grbitSub = in.readShort();
-		_cItm = in.readShort();
-		
-		int cchName = in.readUShort();
-		if (cchName != STRING_NOT_PRESENT_LEN) {
-			int flag = in.readByte();
-			if ((flag & 0x01) != 0) {
-				_name = in.readUnicodeLEString(cchName);
-			} else {
-				_name = in.readCompressedUnicode(cchName);
-			}
-		}
-	}
-	
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		
-		out.writeShort(_sxaxis);
-		out.writeShort(_cSub);
-		out.writeShort(_grbitSub);
-		out.writeShort(_cItm);
-		
-		if (_name != null) {
-			StringUtil.writeUnicodeString(out, _name);
-		} else {
-			out.writeShort(STRING_NOT_PRESENT_LEN);
-		}
-	}
-
-	@Override
-	protected int getDataSize() {
-		if (_name == null) {
-			return BASE_SIZE;
-		}
-		return BASE_SIZE 
-			+ 1 // unicode flag 
-			+ _name.length() * (StringUtil.hasMultibyte(_name) ? 2 : 1);
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("[SXVD]\n");
-		buffer.append("    .sxaxis    = ").append(HexDump.shortToHex(_sxaxis)).append('\n');
-		buffer.append("    .cSub      = ").append(HexDump.shortToHex(_cSub)).append('\n');
-		buffer.append("    .grbitSub  = ").append(HexDump.shortToHex(_grbitSub)).append('\n');
-		buffer.append("    .cItm      = ").append(HexDump.shortToHex(_cItm)).append('\n');
-		buffer.append("    .name      = ").append(_name).append('\n');
-		
-		buffer.append("[/SXVD]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java b/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
deleted file mode 100644
index daee007..0000000
--- a/trunk/src/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivottable;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.StandardRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * SXVS - View Source (0x00E3)<br/>
- * 
- * @author Patrick Cheng
- */
-public final class ViewSourceRecord extends StandardRecord {
-	public static final short sid = 0x00E3;
-
-	private int vs;
-	
-	public ViewSourceRecord(RecordInputStream in) {
-		vs = in.readShort();
-	}
-	
-	@Override
-	protected void serialize(LittleEndianOutput out) {
-		out.writeShort(vs);
-	}
-
-	@Override
-	protected int getDataSize() {
-		return 2;
-	}
-
-	@Override
-	public short getSid() {
-		return sid;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("[SXVS]\n");
-		buffer.append("    .vs      =").append(HexDump.shortToHex(vs)).append('\n');
-
-		buffer.append("[/SXVS]\n");
-		return buffer.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/DVConstraint.java b/trunk/src/java/org/apache/poi/hssf/usermodel/DVConstraint.java
deleted file mode 100644
index bf0ca4c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/DVConstraint.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.DVRecord;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.NumberPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Data Validation Constraint
- */
-public class DVConstraint implements DataValidationConstraint {
-	/* package */ static final class FormulaPair {
-
-		private final Ptg[] _formula1;
-		private final Ptg[] _formula2;
-
-		FormulaPair(Ptg[] formula1, Ptg[] formula2) {
-			_formula1 = (formula1 == null) ? null : formula1.clone();
-			_formula2 = (formula2 == null) ? null : formula2.clone();
-		}
-		public Ptg[] getFormula1() {
-			return _formula1;
-		}
-		public Ptg[] getFormula2() {
-			return _formula2;
-		}
-		
-	}
-	
-	private final int _validationType;
-	private int _operator;
-	private String[] _explicitListValues;
-	
-	private String _formula1;
-	private String _formula2;
-	private Double _value1;
-	private Double _value2;
-
-	
-	private DVConstraint(int validationType, int comparisonOperator, String formulaA,
-			String formulaB, Double value1, Double value2, String[] excplicitListValues) {
-		_validationType = validationType;
-		_operator = comparisonOperator;
-		_formula1 = formulaA;
-		_formula2 = formulaB;
-		_value1 = value1;
-		_value2 = value2;
-		_explicitListValues = (excplicitListValues == null) ? null : excplicitListValues.clone();
-	}
-	
-	
-	/**
-	 * Creates a list constraint
-	 */
-	private DVConstraint(String listFormula, String[] excplicitListValues) {
-		this(ValidationType.LIST, OperatorType.IGNORED,
-			listFormula, null, null, null, excplicitListValues);
-	}
-
-	/**
-	 * Creates a number based data validation constraint. The text values entered for expr1 and expr2
-	 * can be either standard Excel formulas or formatted number values. If the expression starts 
-	 * with '=' it is parsed as a formula, otherwise it is parsed as a formatted number. 
-	 * 
-	 * @param validationType one of {@link org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType#ANY},
-     * {@link org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType#DECIMAL},
-     * {@link org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType#INTEGER},
-     * {@link org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType#TEXT_LENGTH}
-	 * @param comparisonOperator any constant from {@link org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType} enum
-	 * @param expr1 date formula (when first char is '=') or formatted number value
-	 * @param expr2 date formula (when first char is '=') or formatted number value
-	 */
-	public static DVConstraint createNumericConstraint(int validationType, int comparisonOperator, 
-			String expr1, String expr2) {
-		switch (validationType) {
-			case ValidationType.ANY:
-				if (expr1 != null || expr2 != null) {
-					throw new IllegalArgumentException("expr1 and expr2 must be null for validation type 'any'");
-				}
-				break;
-			case ValidationType.DECIMAL:
-			case ValidationType.INTEGER:
-			case ValidationType.TEXT_LENGTH:
-				if (expr1 == null) {
-					throw new IllegalArgumentException("expr1 must be supplied");
-				}
-				OperatorType.validateSecondArg(comparisonOperator, expr2);
-				break;
-			default:
-				throw new IllegalArgumentException("Validation Type ("
-						+ validationType + ") not supported with this method");
-		}
-		// formula1 and value1 are mutually exclusive
-		String formula1 = getFormulaFromTextExpression(expr1);
-		Double value1 = formula1 == null ? convertNumber(expr1) : null;
-		// formula2 and value2 are mutually exclusive
-		String formula2 = getFormulaFromTextExpression(expr2);
-		Double value2 = formula2 == null ? convertNumber(expr2) : null;
-		return new DVConstraint(validationType, comparisonOperator, formula1, formula2, value1, value2, null);
-	}
-
-	public static DVConstraint createFormulaListConstraint(String listFormula) {
-		return new DVConstraint(listFormula, null);
-	}
-	public static DVConstraint createExplicitListConstraint(String[] explicitListValues) {
-		return new DVConstraint(null, explicitListValues);
-	}
-	
-	
-	/**
-	 * Creates a time based data validation constraint. The text values entered for expr1 and expr2
-	 * can be either standard Excel formulas or formatted time values. If the expression starts 
-	 * with '=' it is parsed as a formula, otherwise it is parsed as a formatted time.  To parse 
-	 * formatted times, two formats are supported:  "HH:MM" or "HH:MM:SS".  This is contrary to 
-	 * Excel which uses the default time format from the OS.
-	 * 
-	 * @param comparisonOperator constant from {@link org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType} enum
-	 * @param expr1 date formula (when first char is '=') or formatted time value
-	 * @param expr2 date formula (when first char is '=') or formatted time value
-	 */
-	public static DVConstraint createTimeConstraint(int comparisonOperator, String expr1, String expr2) {
-		if (expr1 == null) {
-			throw new IllegalArgumentException("expr1 must be supplied");
-		}
-		OperatorType.validateSecondArg(comparisonOperator, expr1);
-		
-		// formula1 and value1 are mutually exclusive
-		String formula1 = getFormulaFromTextExpression(expr1);
-		Double value1 = formula1 == null ? convertTime(expr1) : null;
-		// formula2 and value2 are mutually exclusive
-		String formula2 = getFormulaFromTextExpression(expr2);
-		Double value2 = formula2 == null ? convertTime(expr2) : null;
-		return new DVConstraint(ValidationType.TIME, comparisonOperator, formula1, formula2, value1, value2, null);
-	}
-	
-	/**
-	 * Creates a date based data validation constraint. The text values entered for expr1 and expr2
-	 * can be either standard Excel formulas or formatted date values. If the expression starts 
-	 * with '=' it is parsed as a formula, otherwise it is parsed as a formatted date (Excel uses 
-	 * the same convention).  To parse formatted dates, a date format needs to be specified.  This
-	 * is contrary to Excel which uses the default short date format from the OS.
-	 * 
-	 * @param comparisonOperator constant from {@link org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType} enum
-	 * @param expr1 date formula (when first char is '=') or formatted date value
-	 * @param expr2 date formula (when first char is '=') or formatted date value
-	 * @param dateFormat ignored if both expr1 and expr2 are formulas.  Default value is "YYYY/MM/DD"
-	 * otherwise any other valid argument for <tt>SimpleDateFormat</tt> can be used
-	 * @see <a href='http://java.sun.com/j2se/1.5.0/docs/api/java/text/DateFormat.html'>SimpleDateFormat</a>
-	 */
-	public static DVConstraint createDateConstraint(int comparisonOperator, String expr1, String expr2, String dateFormat) {
-		if (expr1 == null) {
-			throw new IllegalArgumentException("expr1 must be supplied");
-		}
-		OperatorType.validateSecondArg(comparisonOperator, expr2);
-		SimpleDateFormat df = null;
-		if (dateFormat != null) {
-		    df = new SimpleDateFormat(dateFormat, LocaleUtil.getUserLocale());
-		    df.setTimeZone(LocaleUtil.getUserTimeZone());
-		}
-		
-		// formula1 and value1 are mutually exclusive
-		String formula1 = getFormulaFromTextExpression(expr1);
-		Double value1 = formula1 == null ? convertDate(expr1, df) : null;
-		// formula2 and value2 are mutually exclusive
-		String formula2 = getFormulaFromTextExpression(expr2);
-		Double value2 = formula2 == null ? convertDate(expr2, df) : null;
-		return new DVConstraint(ValidationType.DATE, comparisonOperator, formula1, formula2, value1, value2, null);
-	}
-	
-	/**
-	 * Distinguishes formula expressions from simple value expressions.  This logic is only 
-	 * required by a few factory methods in this class that create data validation constraints
-	 * from more or less the same parameters that would have been entered in the Excel UI.  The
-	 * data validation dialog box uses the convention that formulas begin with '='.  Other methods
-	 * in this class follow the POI convention (formulas and values are distinct), so the '=' 
-	 * convention is not used there.
-	 *  
-	 * @param textExpr a formula or value expression
-	 * @return all text after '=' if textExpr begins with '='. Otherwise <code>null</code> if textExpr does not begin with '='
-	 */
-	private static String getFormulaFromTextExpression(String textExpr) {
-		if (textExpr == null) {
-			return null;
-		}
-		if (textExpr.length() < 1) {
-			throw new IllegalArgumentException("Empty string is not a valid formula/value expression");
-		}
-		if (textExpr.charAt(0) == '=') {
-			return textExpr.substring(1);
-		}
-		return null;
-	}
-
-
-	/**
-	 * @return <code>null</code> if numberStr is <code>null</code>
-	 */
-	private static Double convertNumber(String numberStr) {
-		if (numberStr == null) {
-			return null;
-		}
-		try {
-			return new Double(numberStr);
-		} catch (NumberFormatException e) {
-			throw new RuntimeException("The supplied text '" + numberStr 
-					+ "' could not be parsed as a number");
-		}
-	}
-
-	/**
-	 * @return <code>null</code> if timeStr is <code>null</code>
-	 */
-	private static Double convertTime(String timeStr) {
-		if (timeStr == null) {
-			return null;
-		}
-		return new Double(HSSFDateUtil.convertTime(timeStr));
-	}
-	/**
-	 * @param dateFormat pass <code>null</code> for default YYYYMMDD
-	 * @return <code>null</code> if timeStr is <code>null</code>
-	 */
-	private static Double convertDate(String dateStr, SimpleDateFormat dateFormat) {
-		if (dateStr == null) {
-			return null;
-		}
-		Date dateVal; 
-		if (dateFormat == null) {
-			dateVal = HSSFDateUtil.parseYYYYMMDDDate(dateStr);
-		} else {
-			try {
-				dateVal = dateFormat.parse(dateStr);
-			} catch (ParseException e) {
-				throw new RuntimeException("Failed to parse date '" + dateStr 
-						+ "' using specified format '" + dateFormat + "'", e);
-			}
-		}
-		return new Double(HSSFDateUtil.getExcelDate(dateVal));
-	}
-
-	public static DVConstraint createCustomFormulaConstraint(String formula) {
-		if (formula == null) {
-			throw new IllegalArgumentException("formula must be supplied");
-		}
-		return new DVConstraint(ValidationType.FORMULA, OperatorType.IGNORED, formula, null, null, null, null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#getValidationType()
-	 */
-	public int getValidationType() {
-		return _validationType;
-	}
-	/**
-	 * Convenience method
-	 * @return <code>true</code> if this constraint is a 'list' validation
-	 */
-	public boolean isListValidationType() {
-		return _validationType == ValidationType.LIST;
-	}
-	/**
-	 * Convenience method
-	 * @return <code>true</code> if this constraint is a 'list' validation with explicit values
-	 */
-	public boolean isExplicitList() {
-		return _validationType == ValidationType.LIST && _explicitListValues != null;
-	}
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#getOperator()
-	 */
-	public int getOperator() {
-		return _operator;
-	}
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#setOperator(int)
-	 */
-	public void setOperator(int operator) {
-		_operator = operator;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#getExplicitListValues()
-	 */
-	public String[] getExplicitListValues() {
-		return _explicitListValues;
-	}
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#setExplicitListValues(java.lang.String[])
-	 */
-	public void setExplicitListValues(String[] explicitListValues) {
-		if (_validationType != ValidationType.LIST) {
-			throw new RuntimeException("Cannot setExplicitListValues on non-list constraint");
-		}
-		_formula1 = null;
-		_explicitListValues = explicitListValues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#getFormula1()
-	 */
-	public String getFormula1() {
-		return _formula1;
-	}
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#setFormula1(java.lang.String)
-	 */
-	public void setFormula1(String formula1) {
-		_value1 = null;
-		_explicitListValues = null;
-		_formula1 = formula1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#getFormula2()
-	 */
-	public String getFormula2() {
-		return _formula2;
-	}
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidationConstraint#setFormula2(java.lang.String)
-	 */
-	public void setFormula2(String formula2) {
-		_value2 = null;
-		_formula2 = formula2;
-	}
-
-	/**
-	 * @return the numeric value for expression 1. May be <code>null</code>
-	 */
-	public Double getValue1() {
-		return _value1;
-	}
-	/**
-	 * Sets a numeric value for expression 1.
-	 */
-	public void setValue1(double value1) {
-		_formula1 = null;
-		_value1 = new Double(value1);
-	}
-
-	/**
-	 * @return the numeric value for expression 2. May be <code>null</code>
-	 */
-	public Double getValue2() {
-		return _value2;
-	}
-	/**
-	 * Sets a numeric value for expression 2.
-	 */
-	public void setValue2(double value2) {
-		_formula2 = null;
-		_value2 = new Double(value2);
-	}
-	
-	/**
-	 * @return both parsed formulas (for expression 1 and 2). 
-	 */
-	/* package */ FormulaPair createFormulas(HSSFSheet sheet) {
-		Ptg[] formula1;
-		Ptg[] formula2;
-		if (isListValidationType()) {
-			formula1 = createListFormula(sheet);
-			formula2 = Ptg.EMPTY_PTG_ARRAY;
-		} else {
-			formula1 = convertDoubleFormula(_formula1, _value1, sheet);
-			formula2 = convertDoubleFormula(_formula2, _value2, sheet);
-		}
-		return new FormulaPair(formula1, formula2);
-	}
-
-    @SuppressWarnings("resource")
-    private Ptg[] createListFormula(HSSFSheet sheet) {
-
-		if (_explicitListValues == null) {
-            HSSFWorkbook wb = sheet.getWorkbook();
-            // formula is parsed with slightly different RVA rules: (root node type must be 'reference')
-			return HSSFFormulaParser.parse(_formula1, wb, FormulaType.DATAVALIDATION_LIST, wb.getSheetIndex(sheet));
-			// To do: Excel places restrictions on the available operations within a list formula.
-			// Some things like union and intersection are not allowed.
-		}
-		// explicit list was provided
-		StringBuffer sb = new StringBuffer(_explicitListValues.length * 16);
-		for (int i = 0; i < _explicitListValues.length; i++) {
-			if (i > 0) {
-				sb.append('\0'); // list delimiter is the nul char
-			}
-			sb.append(_explicitListValues[i]);
-		
-		}
-		return new Ptg[] { new StringPtg(sb.toString()), };
-	}
-
-	/**
-	 * @return The parsed token array representing the formula or value specified. 
-	 * Empty array if both formula and value are <code>null</code>
-	 */
-    @SuppressWarnings("resource")
-	private static Ptg[] convertDoubleFormula(String formula, Double value, HSSFSheet sheet) {
-		if (formula == null) {
-			if (value == null) {
-				return Ptg.EMPTY_PTG_ARRAY;
-			}
-			return new Ptg[] { new NumberPtg(value.doubleValue()), };
-		}
-		if (value != null) {
-			throw new IllegalStateException("Both formula and value cannot be present");
-		}
-        HSSFWorkbook wb = sheet.getWorkbook();
-		return HSSFFormulaParser.parse(formula, wb, FormulaType.CELL, wb.getSheetIndex(sheet));
-	}	
-
-    static DVConstraint createDVConstraint(DVRecord dvRecord, FormulaRenderingWorkbook book) {
-        switch (dvRecord.getDataType()) {
-        case ValidationType.ANY:
-            return new DVConstraint(ValidationType.ANY, dvRecord.getConditionOperator(), null, null, null, null, null);
-        case ValidationType.INTEGER:
-        case ValidationType.DECIMAL:
-        case ValidationType.DATE:
-        case ValidationType.TIME:
-        case ValidationType.TEXT_LENGTH:
-            FormulaValuePair pair1 = toFormulaString(dvRecord.getFormula1(), book);
-            FormulaValuePair pair2 = toFormulaString(dvRecord.getFormula2(), book);
-            return new DVConstraint(dvRecord.getDataType(), dvRecord.getConditionOperator(), pair1.formula(),
-                    pair2.formula(), pair1.value(), pair2.value(), null);
-        case ValidationType.LIST:
-            if (dvRecord.getListExplicitFormula()) {
-                String values = toFormulaString(dvRecord.getFormula1(), book).string();
-                if (values.startsWith("\"")) {
-                    values = values.substring(1);
-                }
-                if (values.endsWith("\"")) {
-                    values = values.substring(0, values.length() - 1);
-                }
-                String[] explicitListValues = values.split(Pattern.quote("\0"));
-                return createExplicitListConstraint(explicitListValues);
-            } else {
-                String listFormula = toFormulaString(dvRecord.getFormula1(), book).string();
-                return createFormulaListConstraint(listFormula);
-            }
-        case ValidationType.FORMULA:
-            return createCustomFormulaConstraint(toFormulaString(dvRecord.getFormula1(), book).string());
-        default:
-            throw new UnsupportedOperationException("validationType="+dvRecord.getDataType());
-        }
-    }
-
-    private static class FormulaValuePair {
-        private String _formula;
-        private String _value;
-
-        public String formula() {
-            return _formula;
-        }
-
-        public Double value() {
-            if (_value == null) {
-                return null;
-            }
-            return new Double(_value);
-        }
-
-        public String string() {
-            if (_formula != null) {
-                return _formula;
-            }
-            if (_value != null) {
-                return _value;
-            }
-            return null;
-        }
-    }
-
-    private static FormulaValuePair toFormulaString(Ptg[] ptgs, FormulaRenderingWorkbook book) {
-        FormulaValuePair pair = new FormulaValuePair();
-        if (ptgs != null && ptgs.length > 0) {
-            String string = FormulaRenderer.toFormulaString(book, ptgs);
-            if (ptgs.length == 1 && ptgs[0].getClass() == NumberPtg.class) {
-                pair._value = string;
-            } else {
-                pair._formula = string;
-            }
-        }
-        return pair;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java b/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
deleted file mode 100644
index 31cd919..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
+++ /dev/null
@@ -1,832 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Image;
-import java.awt.Paint;
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.io.PrintStream;
-import java.text.AttributedCharacterIterator;
-import java.util.Arrays;
-import java.util.Map;
-
-import org.apache.poi.util.Internal;
-
-public class DummyGraphics2d extends Graphics2D {
-    private BufferedImage bufimg;
-    private final Graphics2D g2D;
-    private final PrintStream log;
-
-    public DummyGraphics2d() {
-        this(System.out);
-    }
-    
-    public DummyGraphics2d(PrintStream log) {
-        bufimg = new BufferedImage(1000, 1000, 2);
-        g2D = (Graphics2D)bufimg.getGraphics();
-        this.log = log;
-    }
-    
-    public DummyGraphics2d(PrintStream log, Graphics2D g2D) {
-        this.g2D = g2D;
-        this.log = log;
-    }
-
-    public void addRenderingHints(Map<?,?> hints) {
-        String l =
-            "addRenderingHinds(Map):" +
-            "\n  hints = " + hints;
-        log.println( l );
-        g2D.addRenderingHints( hints );
-    }
-
-    public void clip(Shape s) {
-        String l =
-            "clip(Shape):" +
-            "\n  s = " + s;
-        log.println( l );
-        g2D.clip( s );
-    }
-
-    public void draw(Shape s) {
-        String l =
-            "draw(Shape):" + 
-            "\n  s = " + s;
-        log.println( l );
-        g2D.draw( s );
-    }
-
-    public void drawGlyphVector(GlyphVector g, float x, float y) {
-        String l =
-            "drawGlyphVector(GlyphVector, float, float):" +
-            "\n  g = " + g +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawGlyphVector( g, x, y );
-    }
-
-    public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
-        String l =
-            "drawImage(BufferedImage, BufferedImageOp, x, y):" +
-            "\n  img = " + img +
-            "\n  op = " + op +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawImage( img, op, x, y );
-    }
-
-    public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
-        String l =
-            "drawImage(Image,AfflineTransform,ImageObserver):" +
-            "\n  img = " + img +
-            "\n  xform = " + xform +
-            "\n  obs = " + obs;
-        log.println( l );
-        return g2D.drawImage( img, xform, obs );
-    }
-
-    public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
-        String l =
-            "drawRenderableImage(RenderableImage, AfflineTransform):" +
-            "\n  img = " + img +
-            "\n  xform = " + xform;
-        log.println( l );
-        g2D.drawRenderableImage( img, xform );
-    }
-
-    public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
-        String l =
-            "drawRenderedImage(RenderedImage, AffineTransform):" +
-            "\n  img = " + img +
-            "\n  xform = " + xform;
-        log.println( l );
-        g2D.drawRenderedImage( img, xform );
-    }
-
-    public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-        String l =
-            "drawString(AttributedCharacterIterator):" +
-            "\n  iterator = " + iterator +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawString( iterator, x, y );
-    }
-
-    public void drawString(String s, float x, float y) {
-        String l =
-            "drawString(s,x,y):" +
-            "\n  s = " + s +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawString( s, x, y );
-    }
-
-    public void fill(Shape s) {
-        String l =
-            "fill(Shape):" +
-            "\n  s = " + s;
-        log.println( l );
-        g2D.fill( s );
-    }
-
-    public Color getBackground() {
-        log.println( "getBackground():" );
-        return g2D.getBackground();
-    }
-
-    public Composite getComposite() {
-        log.println( "getComposite():" );
-        return g2D.getComposite();
-    }
-
-    public GraphicsConfiguration getDeviceConfiguration() {
-        log.println( "getDeviceConfiguration():" );
-        return g2D.getDeviceConfiguration();
-    }
-
-    public FontRenderContext getFontRenderContext() {
-        log.println( "getFontRenderContext():" );
-        return g2D.getFontRenderContext();
-    }
-
-    public Paint getPaint() {
-        log.println( "getPaint():" );
-        return g2D.getPaint();
-    }
-
-    public Object getRenderingHint(RenderingHints.Key hintKey) {
-        String l =
-            "getRenderingHint(RenderingHints.Key):" +
-            "\n  hintKey = " + hintKey;
-        log.println( l );
-        return g2D.getRenderingHint( hintKey );
-    }
-
-    public RenderingHints getRenderingHints() {
-        log.println( "getRenderingHints():" );
-        return g2D.getRenderingHints();
-    }
-
-    public Stroke getStroke() {
-        log.println( "getStroke():" );
-        return g2D.getStroke();
-    }
-
-    public AffineTransform getTransform() {
-        log.println( "getTransform():" );
-        return g2D.getTransform();
-    }
-
-    public boolean hit(Rectangle rect, Shape s, boolean onStroke) {
-        String l =
-            "hit(Rectangle, Shape, onStroke):" +
-            "\n  rect = " + rect +
-            "\n  s = " + s +
-            "\n  onStroke = " + onStroke;
-        log.println( l );
-        return g2D.hit( rect, s, onStroke );
-    }
-
-    public void rotate(double theta) {
-        String l =
-            "rotate(theta):" +
-            "\n  theta = " + theta;
-        log.println( l );
-        g2D.rotate( theta );
-    }
-
-    public void rotate(double theta, double x, double y) {
-        String l =
-            "rotate(double,double,double):" +
-            "\n  theta = " + theta +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.rotate( theta, x, y );
-    }
-
-    public void scale(double sx, double sy) {
-        String l =
-            "scale(double,double):" +
-            "\n  sx = " + sx +
-            "\n  sy";
-        log.println( l );
-        g2D.scale( sx, sy );
-    }
-
-    public void setBackground(Color color) {
-        String l =
-            "setBackground(Color):" +
-            "\n  color = " + color;
-        log.println( l );
-        g2D.setBackground( color );
-    }
-
-    public void setComposite(Composite comp) {
-        String l =
-            "setComposite(Composite):" +
-            "\n  comp = " + comp;
-        log.println( l );
-        g2D.setComposite( comp );
-    }
-
-    public void setPaint( Paint paint ) {
-        String l =
-            "setPaint(Paint):" +
-            "\n  paint = " + paint;
-        log.println( l );
-        g2D.setPaint( paint );
-    }
-
-    public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue) {
-        String l =
-            "setRenderingHint(RenderingHints.Key, Object):" +
-            "\n  hintKey = " + hintKey +
-            "\n  hintValue = " + hintValue;
-        log.println( l );
-        g2D.setRenderingHint( hintKey, hintValue );
-    }
-
-    public void setRenderingHints(Map<?,?> hints) {
-        String l =
-            "setRenderingHints(Map):" +
-            "\n  hints = " + hints;
-        log.println( l );
-        g2D.setRenderingHints( hints );
-    }
-
-    public void setStroke(Stroke s) {
-        String l;
-        if (s instanceof BasicStroke) {
-            BasicStroke bs = (BasicStroke)s;
-            l = "setStroke(Stoke):" +
-                "\n  s = BasicStroke(" +
-                "\n    dash[]: "+Arrays.toString(bs.getDashArray()) +
-                "\n    dashPhase: "+bs.getDashPhase() +
-                "\n    endCap: "+bs.getEndCap() +
-                "\n    lineJoin: "+bs.getLineJoin() +
-                "\n    width: "+bs.getLineWidth() +
-                "\n    miterLimit: "+bs.getMiterLimit() +
-                "\n  )";
-        } else {
-            l = "setStroke(Stoke):" +
-                "\n  s = " + s;
-        }
-        log.println( l );
-        g2D.setStroke( s );
-    }
-
-    public void setTransform(AffineTransform Tx) {
-        String l =
-            "setTransform():" +
-            "\n  Tx = " + Tx;
-        log.println( l );
-        g2D.setTransform( Tx );
-    }
-
-    public void shear(double shx, double shy) {
-        String l =
-            "shear(shx, dhy):" +
-            "\n  shx = " + shx +
-            "\n  shy = " + shy;
-        log.println( l );
-        g2D.shear( shx, shy );
-    }
-
-    public void transform(AffineTransform Tx) {
-        String l =
-            "transform(AffineTransform):" +
-            "\n  Tx = " + Tx;
-        log.println( l );
-        g2D.transform( Tx );
-    }
-
-    public void translate(double tx, double ty) {
-        String l =
-            "translate(double, double):" +
-            "\n  tx = " + tx +
-            "\n  ty = " + ty;
-        log.println( l );
-        g2D.translate( tx, ty );
-    }
-
-    public void clearRect(int x, int y, int width, int height) {
-        String l =
-            "clearRect(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.clearRect( x, y, width, height );
-    }
-
-    public void clipRect(int x, int y, int width, int height) {
-        String l =
-            "clipRect(int, int, int, int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "height = " + height;
-        log.println( l );
-        g2D.clipRect( x, y, width, height );
-    }
-
-    public void copyArea(int x, int y, int width, int height, int dx, int dy) {
-        String l =
-            "copyArea(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.copyArea( x, y, width, height, dx, dy );
-    }
-
-    public Graphics create() {
-        log.println( "create():" );
-        return g2D.create();
-    }
-
-    public Graphics create(int x, int y, int width, int height) {
-        String l =
-            "create(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        return g2D.create( x, y, width, height );
-    }
-
-    public void dispose() {
-        log.println( "dispose():" );
-        g2D.dispose();
-    }
-
-    public void draw3DRect(int x, int y, int width, int height, boolean raised) {
-        String l =
-            "draw3DRect(int,int,int,int,boolean):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height +
-            "\n  raised = " + raised;
-        log.println( l );
-        g2D.draw3DRect( x, y, width, height, raised );
-    }
-
-    public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-        String l =
-            "drawArc(int,int,int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height +
-            "\n  startAngle = " + startAngle +
-            "\n  arcAngle = " + arcAngle;
-        log.println( l );
-        g2D.drawArc( x, y, width, height, startAngle, arcAngle );
-    }
-
-    public void drawBytes(byte data[], int offset, int length, int x, int y) {
-        String l =
-            "drawBytes(byte[],int,int,int,int):" +
-            "\n  data = " + Arrays.toString(data) +
-            "\n  offset = " + offset +
-            "\n  length = " + length +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawBytes( data, offset, length, x, y );
-    }
-
-    public void drawChars(char data[], int offset, int length, int x, int y) {
-        String l =
-            "drawChars(data,int,int,int,int):" +
-            "\n  data = " + Arrays.toString(data) +
-            "\n  offset = " + offset +
-            "\n  length = " + length +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawChars( data, offset, length, x, y );
-    }
-
-    public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, ImageObserver observer) {
-        String l =
-            "drawImage(Image,int,int,int,int,int,int,int,int,ImageObserver):" +
-            "\n  img = " + img +
-            "\n  dx1 = " + dx1 +
-            "\n  dy1 = " + dy1 +
-            "\n  dx2 = " + dx2 +
-            "\n  dy2 = " + dy2 +
-            "\n  sx1 = " + sx1 +
-            "\n  sy1 = " + sy1 +
-            "\n  sx2 = " + sx2 +
-            "\n  sy2 = " + sy2 +
-            "\n  observer = " + observer;
-        log.println( l );
-        return g2D.drawImage( img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer );
-    }
-
-    public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, Color bgcolor, ImageObserver observer) {
-        String l =
-            "drawImage(Image,int,int,int,int,int,int,int,int,Color,ImageObserver):" +
-            "\n  img = " + img +
-            "\n  dx1 = " + dx1 +
-            "\n  dy1 = " + dy1 +
-            "\n  dx2 = " + dx2 +
-            "\n  dy2 = " + dy2 +
-            "\n  sx1 = " + sx1 +
-            "\n  sy1 = " + sy1 +
-            "\n  sx2 = " + sx2 +
-            "\n  sy2 = " + sy2 +
-            "\n  bgcolor = " + bgcolor +
-            "\n  observer = " + observer;
-        log.println( l );
-        return g2D.drawImage( img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, bgcolor, observer );
-    }
-
-    public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
-        String l =
-            "drawImage(Image,int,int,Color,ImageObserver):" +
-            "\n  img = " + img +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  bgcolor = " + bgcolor +
-            "\n  observer = " + observer;
-        log.println( l );
-        return g2D.drawImage( img, x, y, bgcolor, observer );
-    }
-
-    public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
-        String l =
-            "drawImage(Image,int,int,observer):" +
-            "\n  img = " + img +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  observer = " + observer;
-        log.println( l );
-        return g2D.drawImage( img, x, y, observer );
-    }
-
-    public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) {
-        String l =
-            "drawImage(Image,int,int,int,int,Color,ImageObserver):" +
-            "\n  img = " + img +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height +
-            "\n  bgcolor = " + bgcolor +
-            "\n  observer = " + observer;
-        log.println( l );
-        return g2D.drawImage( img, x, y, width, height, bgcolor, observer );
-    }
-
-    public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) {
-        String l =
-            "drawImage(Image,int,int,width,height,observer):" +
-            "\n  img = " + img +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height +
-            "\n  observer = " + observer;
-        log.println( l );
-        return g2D.drawImage( img, x, y, width, height, observer );
-    }
-
-    public void drawLine(int x1, int y1, int x2, int y2) {
-        String l =
-            "drawLine(int,int,int,int):" +
-            "\n  x1 = " + x1 +
-            "\n  y1 = " + y1 +
-            "\n  x2 = " + x2 +
-            "\n  y2 = " + y2;
-        log.println( l );
-        g2D.drawLine( x1, y1, x2, y2 );
-    }
-
-    public void drawOval(int x, int y, int width, int height) {
-        String l =
-            "drawOval(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.drawOval( x, y, width, height );
-    }
-
-    public void drawPolygon(Polygon p) {
-        String l =
-            "drawPolygon(Polygon):" +
-            "\n  p = " + p;
-        log.println( l );
-        g2D.drawPolygon( p );
-    }
-
-    public void drawPolygon(int xPoints[], int yPoints[], int nPoints) {
-        String l =
-            "drawPolygon(int[],int[],int):" +
-            "\n  xPoints = " + Arrays.toString(xPoints) +
-            "\n  yPoints = " + Arrays.toString(yPoints) +
-            "\n  nPoints = " + nPoints;
-        log.println( l );
-        g2D.drawPolygon( xPoints, yPoints, nPoints );
-    }
-
-    public void drawPolyline(int xPoints[], int yPoints[], int nPoints) {
-        String l =
-            "drawPolyline(int[],int[],int):" +
-            "\n  xPoints = " + Arrays.toString(xPoints) +
-            "\n  yPoints = " + Arrays.toString(yPoints) +
-            "\n  nPoints = " + nPoints;
-        log.println( l );
-        g2D.drawPolyline( xPoints, yPoints, nPoints );
-    }
-
-    public void drawRect(int x, int y, int width, int height) {
-        String l =
-            "drawRect(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.drawRect( x, y, width, height );
-    }
-
-    public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-        String l =
-            "drawRoundRect(int,int,int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height +
-            "\n  arcWidth = " + arcWidth +
-            "\n  arcHeight = " + arcHeight;
-        log.println( l );
-        g2D.drawRoundRect( x, y, width, height, arcWidth, arcHeight );
-    }
-
-    public void drawString(AttributedCharacterIterator iterator, int x, int y) {
-        String l =
-            "drawString(AttributedCharacterIterator,int,int):" +
-            "\n  iterator = " + iterator +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawString( iterator, x, y );
-    }
-
-    public void drawString(String str, int x, int y) {
-        String l =
-            "drawString(str,int,int):" +
-            "\n  str = " + str +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.drawString( str, x, y );
-    }
-
-    public void fill3DRect(int x, int y, int width, int height, boolean raised) {
-        String l =
-            "fill3DRect(int,int,int,int,boolean):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height +
-            "\n  raised = " + raised;
-        log.println( l );
-        g2D.fill3DRect( x, y, width, height, raised );
-    }
-
-    public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-        String l =
-            "fillArc(int,int,int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height +
-            "\n  startAngle = " + startAngle +
-            "\n  arcAngle = " + arcAngle;
-        log.println( l );
-        g2D.fillArc( x, y, width, height, startAngle, arcAngle );
-    }
-
-    public void fillOval(int x, int y, int width, int height) {
-        String l =
-            "fillOval(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.fillOval( x, y, width, height );
-    }
-
-    public void fillPolygon(Polygon p) {
-        String l =
-            "fillPolygon(Polygon):" +
-            "\n  p = " + p;
-        log.println( l );
-        g2D.fillPolygon( p );
-    }
-
-    public void fillPolygon(int xPoints[], int yPoints[], int nPoints) {
-        String l =
-            "fillPolygon(int[],int[],int):" +
-            "\n  xPoints = " + Arrays.toString(xPoints) +
-            "\n  yPoints = " + Arrays.toString(yPoints) +
-            "\n  nPoints = " + nPoints;
-        log.println( l );
-        g2D.fillPolygon( xPoints, yPoints, nPoints );
-    }
-
-    public void fillRect(int x, int y, int width, int height) {
-        String l =
-            "fillRect(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.fillRect( x, y, width, height );
-    }
-
-    public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-        String l =
-            "fillRoundRect(int,int,int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.fillRoundRect( x, y, width, height, arcWidth, arcHeight );
-    }
-
-    // FIXME: should be protected
-    // FindBugs, category MALICIOUS_CODE, FI_PUBLIC_SHOULD_BE_PROTECTED
-    // A class's finalize() method should have protected access, not public
-    @Internal
-    @Override
-    public final void finalize() {
-        log.println( "finalize():" );
-        g2D.finalize(); // NOSOLAR
-        super.finalize();
-    }
-
-    public Shape getClip() {
-        log.println( "getClip():" );
-        return g2D.getClip();
-    }
-
-    public Rectangle getClipBounds() {
-        log.println( "getClipBounds():" );
-        return g2D.getClipBounds();
-    }
-
-    public Rectangle getClipBounds(Rectangle r) {
-        String l =
-            "getClipBounds(Rectangle):" +
-            "\n  r = " + r;
-        log.println( l );
-        return g2D.getClipBounds( r );
-    }
-
-    public Color getColor() {
-        log.println( "getColor():" );
-        return g2D.getColor();
-    }
-
-    public Font getFont() {
-        log.println( "getFont():" );
-        return g2D.getFont();
-    }
-
-    public FontMetrics getFontMetrics() {
-        log.println( "getFontMetrics():" );
-        return g2D.getFontMetrics();
-    }
-
-    public FontMetrics getFontMetrics(Font f) {
-        log.println( "getFontMetrics():" );
-        return g2D.getFontMetrics( f );
-    }
-
-    public boolean hitClip(int x, int y, int width, int height) {
-        String l =
-            "hitClip(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        return g2D.hitClip( x, y, width, height );
-    }
-
-    public void setClip(Shape clip) {
-        String l =
-            "setClip(Shape):" +
-            "\n  clip = " + clip;
-        log.println( l );
-        g2D.setClip( clip );
-    }
-
-    public void setClip(int x, int y, int width, int height) {
-        String l =
-            "setClip(int,int,int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y +
-            "\n  width = " + width +
-            "\n  height = " + height;
-        log.println( l );
-        g2D.setClip( x, y, width, height );
-    }
-
-    public void setColor(Color c) {
-        String l =
-            "setColor():" +
-            "\n  c = " + c;
-        log.println( l );
-        g2D.setColor( c );
-    }
-
-    public void setFont(Font font) {
-        String l =
-            "setFont(Font):" +
-            "\n  font = " + font;
-        log.println( l );
-        g2D.setFont( font );
-    }
-
-    public void setPaintMode() {
-        log.println( "setPaintMode():" );
-        g2D.setPaintMode();
-    }
-
-    public void setXORMode(Color c1) {
-        String l =
-            "setXORMode(Color):" +
-            "\n  c1 = " + c1;
-        log.println( l );
-        g2D.setXORMode( c1 );
-    }
-
-    public String toString() {
-        log.println( "toString():" );
-        return g2D.toString();
-    }
-
-    public void translate(int x, int y) {
-        String l =
-            "translate(int,int):" +
-            "\n  x = " + x +
-            "\n  y = " + y;
-        log.println( l );
-        g2D.translate( x, y );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java b/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
deleted file mode 100644
index 5cdb2a3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.SuppressForbidden;
-
-import java.awt.*;
-import java.awt.image.ImageObserver;
-import java.text.AttributedCharacterIterator;
-
-/**
- * Translates Graphics calls into escher calls.  The translation is lossy so
- * many features are not supported and some just aren't implemented yet.  If
- * in doubt test the specific calls you wish to make. Graphics calls are
- * always performed into an EscherGroup so one will need to be created.
- * <p>
- * <b>Important:</b>
- * <blockquote>
- * One important concept worth considering is that of font size.  One of the
- * difficulties in converting Graphics calls into escher drawing calls is that
- * Excel does not have the concept of absolute pixel positions.  It measures
- * it's cell widths in 'characters' and the cell heights in points.
- * Unfortunately it's not defined exactly what a type of character it's
- * measuring.  Presumably this is due to the fact that the Excel will be
- * using different fonts on different platforms or even within the same
- * platform.
- * <p>
- * Because of this constraint we've had to calculate the
- * verticalPointsPerPixel.  This the amount the font should be scaled by when
- * you issue commands such as drawString().  A good way to calculate this
- * is to use the follow formula:
- * <p>
- * <pre>
- *      multipler = groupHeightInPoints / heightOfGroup
- * </pre>
- * <p>
- * The height of the group is calculated fairly simply by calculating the
- * difference between the y coordinates of the bounding box of the shape.  The
- * height of the group can be calculated by using a convenience called
- * <code>HSSFClientAnchor.getAnchorHeightInPoints()</code>.
- * </blockquote>
- */
-public class EscherGraphics extends Graphics
-{
-    private final HSSFShapeGroup escherGroup;
-    private final HSSFWorkbook workbook;
-    private float verticalPointsPerPixel = 1.0f;
-    private final float verticalPixelsPerPoint;
-    private Color foreground;
-    private Color background = Color.white;
-    private Font font;
-    private static final POILogger logger = POILogFactory.getLogger(EscherGraphics.class);
-
-    /**
-     * Construct an escher graphics object.
-     *
-     * @param escherGroup           The escher group to write the graphics calls into.
-     * @param workbook              The workbook we are using.
-     * @param forecolor             The foreground color to use as default.
-     * @param verticalPointsPerPixel    The font multiplier.  (See class description for information on how this works.).
-     */
-    public EscherGraphics(HSSFShapeGroup escherGroup, HSSFWorkbook workbook, Color forecolor, float verticalPointsPerPixel )
-    {
-        this.escherGroup = escherGroup;
-        this.workbook = workbook;
-        this.verticalPointsPerPixel = verticalPointsPerPixel;
-        this.verticalPixelsPerPoint = 1 / verticalPointsPerPixel;
-        this.font = new Font("Arial", 0, 10);
-        this.foreground = forecolor;
-//        background = backcolor;
-    }
-
-    /**
-     * Constructs an escher graphics object.
-     *
-     * @param escherGroup           The escher group to write the graphics calls into.
-     * @param workbook              The workbook we are using.
-     * @param foreground            The foreground color to use as default.
-     * @param verticalPointsPerPixel    The font multiplier.  (See class description for information on how this works.).
-     * @param font                  The font to use.
-     */
-    EscherGraphics( HSSFShapeGroup escherGroup, HSSFWorkbook workbook, Color foreground, Font font, float verticalPointsPerPixel )
-    {
-        this.escherGroup = escherGroup;
-        this.workbook = workbook;
-        this.foreground = foreground;
-//        this.background = background;
-        this.font = font;
-        this.verticalPointsPerPixel = verticalPointsPerPixel;
-        this.verticalPixelsPerPoint = 1 / verticalPointsPerPixel;
-    }
-
-//    /**
-//     * Constructs an escher graphics object.
-//     *
-//     * @param escherGroup           The escher group to write the graphics calls into.
-//     * @param workbook              The workbook we are using.
-//     * @param forecolor             The default foreground color.
-//     */
-//    public EscherGraphics( HSSFShapeGroup escherGroup, HSSFWorkbook workbook, Color forecolor)
-//    {
-//        this(escherGroup, workbook, forecolor, 1.0f);
-//    }
-
-
-    @Override
-    @NotImplemented
-    public void clearRect(int x, int y, int width, int height)
-    {
-        Color color = foreground;
-        setColor(background);
-        fillRect(x,y,width,height);
-        setColor(color);
-    }
-
-    @Override
-    @NotImplemented
-    public void clipRect(int x, int y, int width, int height)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"clipRect not supported");
-    }
-
-    @Override
-    @NotImplemented
-    public void copyArea(int x, int y, int width, int height, int dx, int dy)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"copyArea not supported");
-    }
-
-    @Override
-    public Graphics create()
-    {
-        EscherGraphics g = new EscherGraphics(escherGroup, workbook,
-                foreground, font, verticalPointsPerPixel );
-        return g;
-    }
-
-    @Override
-    public void dispose()
-    {
-    }
-
-    @Override
-    @NotImplemented
-    public void drawArc(int x, int y, int width, int height,
-				 int startAngle, int arcAngle)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawArc not supported");
-    }
-
-    @Override
-    @NotImplemented
-    public boolean drawImage(Image img,
-				      int dx1, int dy1, int dx2, int dy2,
-				      int sx1, int sy1, int sx2, int sy2,
-				      Color bgcolor,
-				      ImageObserver observer)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage not supported");
-
-        return true;
-    }
-
-    @Override
-    @NotImplemented
-    public boolean drawImage(Image img,
-				      int dx1, int dy1, int dx2, int dy2,
-				      int sx1, int sy1, int sx2, int sy2,
-				      ImageObserver observer)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage not supported");
-        return true;
-    }
-
-    @Override
-    public boolean drawImage(Image image, int i, int j, int k, int l, Color color, ImageObserver imageobserver)
-    {
-        return drawImage(image, i, j, i + k, j + l, 0, 0, image.getWidth(imageobserver), image.getHeight(imageobserver), color, imageobserver);
-    }
-
-    @Override
-    public boolean drawImage(Image image, int i, int j, int k, int l, ImageObserver imageobserver)
-    {
-        return drawImage(image, i, j, i + k, j + l, 0, 0, image.getWidth(imageobserver), image.getHeight(imageobserver), imageobserver);
-    }
-
-    @Override
-    public boolean drawImage(Image image, int i, int j, Color color, ImageObserver imageobserver)
-    {
-        return drawImage(image, i, j, image.getWidth(imageobserver), image.getHeight(imageobserver), color, imageobserver);
-    }
-
-    @Override
-    public boolean drawImage(Image image, int i, int j, ImageObserver imageobserver)
-    {
-        return drawImage(image, i, j, image.getWidth(imageobserver), image.getHeight(imageobserver), imageobserver);
-    }
-
-    @Override
-    public void drawLine(int x1, int y1, int x2, int y2)
-    {
-        drawLine(x1,y1,x2,y2,0);
-    }
-
-    public void drawLine(int x1, int y1, int x2, int y2, int width)
-    {
-        HSSFSimpleShape shape = escherGroup.createShape(new HSSFChildAnchor(x1, y1, x2, y2) );
-        shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-        shape.setLineWidth(width);
-        shape.setLineStyleColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-    }
-
-    @Override
-    public void drawOval(int x, int y, int width, int height)
-    {
-        HSSFSimpleShape shape = escherGroup.createShape(new HSSFChildAnchor(x,y,x+width,y+height) );
-        shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_OVAL);
-        shape.setLineWidth(0);
-        shape.setLineStyleColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-        shape.setNoFill(true);
-    }
-
-    @Override
-    public void drawPolygon(int xPoints[], int yPoints[],
-				     int nPoints)
-    {
-        int right  = findBiggest(xPoints);
-        int bottom = findBiggest(yPoints);
-        int left   = findSmallest(xPoints);
-        int top    = findSmallest(yPoints);
-        HSSFPolygon shape = escherGroup.createPolygon(new HSSFChildAnchor(left,top,right,bottom) );
-        shape.setPolygonDrawArea(right - left, bottom - top);
-        shape.setPoints(addToAll(xPoints, -left), addToAll(yPoints, -top));
-        shape.setLineStyleColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-        shape.setLineWidth(0);
-        shape.setNoFill(true);
-    }
-
-    private int[] addToAll( int[] values, int amount )
-    {
-        int[] result = new int[values.length];
-        for ( int i = 0; i < values.length; i++ )
-            result[i] = values[i] + amount;
-        return result;
-    }
-
-    @Override
-    @NotImplemented
-    public void drawPolyline(int xPoints[], int yPoints[],
-				      int nPoints)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawPolyline not supported");
-    }
-
-    @Override
-    @NotImplemented
-    public void drawRect(int x, int y, int width, int height)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawRect not supported");
-    }
-
-    @Override
-    @NotImplemented
-    public void drawRoundRect(int x, int y, int width, int height,
-				       int arcWidth, int arcHeight)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawRoundRect not supported");
-    }
-
-    @Override
-    public void drawString(String str, int x, int y)
-    {
-        if (str == null || str.equals(""))
-            return;
-
-        Font excelFont = font;
-        if ( font.getName().equals( "SansSerif" ) )
-        {
-            excelFont = new Font( "Arial", font.getStyle(), (int) ( font.getSize() / verticalPixelsPerPoint ) );
-        }
-        else
-        {
-            excelFont = new Font( font.getName(), font.getStyle(), (int) ( font.getSize() / verticalPixelsPerPoint ));
-        }
-        FontDetails d = StaticFontMetrics.getFontDetails( excelFont );
-        int width = d.getStringWidth( str ) * 8  + 12;
-        int height = (int) ( ( font.getSize() / verticalPixelsPerPoint ) + 6 ) * 2;
-        y -= ( font.getSize() / verticalPixelsPerPoint ) + 2 * verticalPixelsPerPoint;    // we want to draw the shape from the top-left
-        HSSFTextbox textbox = escherGroup.createTextbox( new HSSFChildAnchor( x, y, x + width, y + height ) );
-        textbox.setNoFill( true );
-        textbox.setLineStyle( HSSFShape.LINESTYLE_NONE );
-        HSSFRichTextString s = new HSSFRichTextString( str );
-        HSSFFont hssfFont = matchFont( excelFont );
-        s.applyFont( hssfFont );
-        textbox.setString( s );
-    }
-
-    private HSSFFont matchFont( Font matchFont )
-    {
-        HSSFColor hssfColor = workbook.getCustomPalette()
-                .findColor((byte)foreground.getRed(), (byte)foreground.getGreen(), (byte)foreground.getBlue());
-        if (hssfColor == null)
-            hssfColor = workbook.getCustomPalette().findSimilarColor((byte)foreground.getRed(), (byte)foreground.getGreen(), (byte)foreground.getBlue());
-        boolean bold = (matchFont.getStyle() & Font.BOLD) != 0;
-        boolean italic = (matchFont.getStyle() & Font.ITALIC) != 0;
-        HSSFFont hssfFont = workbook.findFont(bold ? HSSFFont.BOLDWEIGHT_BOLD : 0,
-                    hssfColor.getIndex(),
-                    (short)(matchFont.getSize() * 20),
-                    matchFont.getName(),
-                    italic,
-                    false,
-                    (short)0,
-                    (byte)0);
-        if (hssfFont == null)
-        {
-            hssfFont = workbook.createFont();
-            hssfFont.setBoldweight(bold ? HSSFFont.BOLDWEIGHT_BOLD : 0);
-            hssfFont.setColor(hssfColor.getIndex());
-            hssfFont.setFontHeight((short)(matchFont.getSize() * 20));
-            hssfFont.setFontName(matchFont.getName());
-            hssfFont.setItalic(italic);
-            hssfFont.setStrikeout(false);
-            hssfFont.setTypeOffset((short) 0);
-            hssfFont.setUnderline((byte) 0);
-        }
-
-        return hssfFont;
-    }
-
-
-    @Override
-    public void drawString(AttributedCharacterIterator iterator,
-                                    int x, int y)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawString not supported");
-    }
-
-    @Override
-    public void fillArc(int x, int y, int width, int height,
-				 int startAngle, int arcAngle)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"fillArc not supported");
-    }
-
-    @Override
-    public void fillOval(int x, int y, int width, int height)
-    {
-        HSSFSimpleShape shape = escherGroup.createShape(new HSSFChildAnchor( x, y, x + width, y + height ) );
-        shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_OVAL);
-        shape.setLineStyle(HSSFShape.LINESTYLE_NONE);
-        shape.setFillColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-        shape.setLineStyleColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-        shape.setNoFill(false);
-    }
-
-    /**
-     * Fills a (closed) polygon, as defined by a pair of arrays, which
-     *  hold the <i>x</i> and <i>y</i> coordinates.
-     * <p>
-     * This draws the polygon, with <code>nPoint</code> line segments.
-     * The first <code>nPoint&nbsp;-&nbsp;1</code> line segments are
-     *  drawn between sequential points
-     *  (<code>xPoints[i],yPoints[i],xPoints[i+1],yPoints[i+1]</code>).
-     * The final line segment is a closing one, from the last point to
-     *  the first (assuming they are different).
-     * <p>
-     * The area inside of the polygon is defined by using an
-     *  even-odd fill rule (also known as the alternating rule), and
-     *  the area inside of it is filled.
-     * @param xPoints array of the <code>x</code> coordinates.
-     * @param yPoints array of the <code>y</code> coordinates.
-     * @param nPoints the total number of points in the polygon.
-     * @see   java.awt.Graphics#drawPolygon(int[], int[], int)
-     */
-    @Override
-    public void fillPolygon(int xPoints[], int yPoints[],
-				     int nPoints)
-    {
-        int right  = findBiggest(xPoints);
-        int bottom = findBiggest(yPoints);
-        int left   = findSmallest(xPoints);
-        int top    = findSmallest(yPoints);
-        HSSFPolygon shape = escherGroup.createPolygon(new HSSFChildAnchor(left,top,right,bottom) );
-        shape.setPolygonDrawArea(right - left, bottom - top);
-        shape.setPoints(addToAll(xPoints, -left), addToAll(yPoints, -top));
-        shape.setLineStyleColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-        shape.setFillColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-    }
-
-    private int findBiggest( int[] values )
-    {
-        int result = Integer.MIN_VALUE;
-        for ( int i = 0; i < values.length; i++ )
-        {
-            if (values[i] > result)
-                result = values[i];
-        }
-        return result;
-    }
-
-    private int findSmallest( int[] values )
-    {
-        int result = Integer.MAX_VALUE;
-        for ( int i = 0; i < values.length; i++ )
-        {
-            if (values[i] < result)
-                result = values[i];
-        }
-        return result;
-    }
-
-    @Override
-    public void fillRect(int x, int y, int width, int height)
-    {
-        HSSFSimpleShape shape = escherGroup.createShape(new HSSFChildAnchor( x, y, x + width, y + height ) );
-        shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-        shape.setLineStyle(HSSFShape.LINESTYLE_NONE);
-        shape.setFillColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-        shape.setLineStyleColor(foreground.getRed(), foreground.getGreen(), foreground.getBlue());
-    }
-
-    @Override
-    public void fillRoundRect(int x, int y, int width, int height,
-				       int arcWidth, int arcHeight)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"fillRoundRect not supported");
-    }
-
-    @Override
-    public Shape getClip()
-    {
-        return getClipBounds();
-    }
-
-    @Override
-    public Rectangle getClipBounds()
-    {
-        return null;
-    }
-
-    @Override
-    public Color getColor()
-    {
-        return foreground;
-    }
-
-    @Override
-    public Font getFont()
-    {
-        return font;
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    @SuppressForbidden
-    public FontMetrics getFontMetrics(Font f)
-    {
-        return Toolkit.getDefaultToolkit().getFontMetrics(f);
-    }
-
-    @Override
-    public void setClip(int x, int y, int width, int height)
-    {
-        setClip(new Rectangle(x,y,width,height));
-    }
-
-    @Override
-    @NotImplemented
-    public void setClip(Shape shape)
-    {
-        // ignore... not implemented
-    }
-
-    @Override
-    public void setColor(Color color)
-    {
-        foreground = color;
-    }
-
-    @Override
-    public void setFont(Font f)
-    {
-        font = f;
-    }
-
-    @Override
-    @NotImplemented
-    public void setPaintMode()
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"setPaintMode not supported");
-    }
-
-    @Override
-    @NotImplemented
-    public void setXORMode(Color color)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"setXORMode not supported");
-    }
-    @Override
-    @NotImplemented
-    public void translate(int x, int y)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"translate not supported");
-    }
-
-    public Color getBackground()
-    {
-        return background;
-    }
-
-    public void setBackground( Color background )
-    {
-        this.background = background;
-    }
-
-    HSSFShapeGroup getEscherGraphics()
-    {
-        return escherGroup;
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java b/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
deleted file mode 100644
index 949168a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-import java.awt.*;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.text.AttributedCharacterIterator;
-import java.util.Map;
-
-/**
- * Translates Graphics2d calls into escher calls.  The translation is lossy so
- * many features are not supported and some just aren't implemented yet.  If
- * in doubt test the specific calls you wish to make. Graphics calls are
- * always drawn into an EscherGroup so one will need to be created.
- * <p>
- * <b>Important:</b>
- * <blockquote>
- * One important concept worth considering is that of font size.  One of the
- * difficulties in converting Graphics calls into escher drawing calls is that
- * Excel does not have the concept of absolute pixel positions.  It measures
- * it's cell widths in 'characters' and the cell heights in points.
- * Unfortunately it's not defined exactly what a type of character it's
- * measuring.  Presumably this is due to the fact that the Excel will be
- * using different fonts on different platforms or even within the same
- * platform.
- * <p>
- * Because of this constraint you have to calculate the verticalPointsPerPixel.
- * This the amount the font should be scaled by when
- * you issue commands such as drawString().  A good way to calculate this
- * is to use the follow formula:
- * <p>
- * <pre>
- *      multipler = groupHeightInPoints / heightOfGroup
- * </pre>
- * <p>
- * The height of the group is calculated fairly simply by calculating the
- * difference between the y coordinates of the bounding box of the shape.  The
- * height of the group can be calculated by using a convenience called
- * <code>HSSFClientAnchor.getAnchorHeightInPoints()</code>.
- * </blockquote>
- */
-public final class EscherGraphics2d extends Graphics2D {
-    private EscherGraphics _escherGraphics;
-    private BufferedImage _img;
-    private AffineTransform _trans;
-    private Stroke _stroke;
-    private Paint _paint;
-    private Shape _deviceclip;
-    private POILogger logger = POILogFactory.getLogger(getClass());
-
-    /**
-     * Constructs one escher graphics object from an escher graphics object.
-     *
-     * @param escherGraphics    the original EscherGraphics2d object to copy
-     */
-    public EscherGraphics2d(EscherGraphics escherGraphics)
-    {
-        this._escherGraphics = escherGraphics;
-        setImg( new BufferedImage(1, 1, 2) );
-        setColor(Color.black);
-    }
-
-    public void addRenderingHints(Map<?, ?> map)
-    {
-        getG2D().addRenderingHints(map);
-    }
-
-    public void clearRect(int i, int j, int k, int l)
-    {
-        Paint paint1 = getPaint();
-        setColor(getBackground());
-        fillRect(i, j, k, l);
-        setPaint(paint1);
-    }
-
-    public void clip(Shape shape)
-    {
-        if(getDeviceclip() != null)
-        {
-            Area area = new Area(getClip());
-            if(shape != null)
-                area.intersect(new Area(shape));
-            shape = area;
-        }
-        setClip(shape);
-    }
-
-    public void clipRect(int x, int y, int width, int height)
-    {
-        clip(new Rectangle(x,y,width,height));
-    }
-
-    public void copyArea(int x, int y, int width, int height,
-				  int dx, int dy)
-    {
-        getG2D().copyArea(x,y,width,height,dx,dy);
-    }
-
-    public Graphics create()
-    {
-        EscherGraphics2d g2d = new EscherGraphics2d(_escherGraphics);
-        return g2d;
-    }
-
-    public void dispose()
-    {
-        getEscherGraphics().dispose();
-        getG2D().dispose();
-        getImg().flush();
-    }
-
-    public void draw(Shape shape)
-    {
-        if (shape instanceof Line2D)
-        {
-            Line2D shape2d = (Line2D) shape;
-
-            int width = 0;
-            if (_stroke != null && _stroke instanceof BasicStroke) {
-                width = (int) ((BasicStroke)_stroke).getLineWidth() * 12700;
-            }
-
-            drawLine((int)shape2d.getX1(), (int)shape2d.getY1(), (int)shape2d.getX2(), (int)shape2d.getY2(), width);
-        }
-        else
-        {
-            if (logger.check(POILogger.WARN))
-                logger.log(POILogger.WARN, "draw not fully supported");
-        }
-    }
-
-    public void drawArc(int x, int y, int width, int height,
-				 int startAngle, int arcAngle)
-    {
-        draw(new java.awt.geom.Arc2D.Float(x, y, width, height, startAngle, arcAngle, 0));
-    }
-
-    public void drawGlyphVector(GlyphVector g, float x, float y)
-    {
-        fill(g.getOutline(x, y));
-    }
-
-    public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
-            int sx2, int sy2, Color bgColor, ImageObserver imageobserver)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage() not supported");
-        return true;
-    }
-
-    public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
-            int sx2, int sy2, ImageObserver imageobserver)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage() not supported");
-        return drawImage(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, imageobserver);
-    }
-    public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, Color bgColor, ImageObserver imageobserver)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage() not supported");
-        return true;
-    }
-
-    public boolean drawImage(Image img, int x, int y,
-				      int width, int height,
-				      ImageObserver observer)
-    {
-        return drawImage(img, x,y,width,height, null, observer);
-    }
-
-    public boolean drawImage(Image image, int x, int y, Color bgColor, ImageObserver imageobserver)
-    {
-        return drawImage(image, x, y, image.getWidth(imageobserver), image.getHeight(imageobserver), bgColor, imageobserver);
-    }
-
-    public boolean drawImage(Image image, int x, int y, ImageObserver imageobserver)
-    {
-        return drawImage(image, x, y, image.getWidth(imageobserver), image.getHeight(imageobserver), imageobserver);
-    }
-
-    public boolean drawImage(Image image, AffineTransform affinetransform, ImageObserver imageobserver)
-    {
-        AffineTransform affinetransform1 = (AffineTransform)getTrans().clone();
-        getTrans().concatenate(affinetransform);
-        drawImage(image, 0, 0, imageobserver);
-        setTrans( affinetransform1 );
-        return true;
-    }
-
-    public void drawImage(BufferedImage bufferedimage, BufferedImageOp op, int x, int y)
-    {
-        BufferedImage img = op.filter(bufferedimage, null);
-        drawImage(img, new AffineTransform(1.0F, 0.0F, 0.0F, 1.0F, x, y), null);
-    }
-
-    public void drawLine(int x1, int y1, int x2, int y2, int width)
-    {
-        getEscherGraphics().drawLine(x1,y1,x2,y2, width);
-    }
-
-    public void drawLine(int x1, int y1, int x2, int y2)
-    {
-        int width = 0;
-        if (_stroke != null && _stroke instanceof BasicStroke) {
-            width = (int) ((BasicStroke)_stroke).getLineWidth() * 12700;
-        }
-        getEscherGraphics().drawLine(x1,y1,x2,y2, width);
-//        draw(new GeneralPath(new java.awt.geom.Line2D.Float(x1, y1, x2, y2)));
-    }
-
-    public void drawOval(int x, int y, int width, int height)
-    {
-        getEscherGraphics().drawOval(x,y,width,height);
-//        draw(new java.awt.geom.Ellipse2D.Float(x, y, width, height));
-    }
-
-    public void drawPolygon(int xPoints[], int yPoints[],
-				     int nPoints)
-    {
-        getEscherGraphics().drawPolygon(xPoints, yPoints, nPoints);
-    }
-
-    public void drawPolyline(int xPoints[], int yPoints[], int nPoints)
-    {
-        if(nPoints > 0)
-        {
-            GeneralPath generalpath = new GeneralPath();
-            generalpath.moveTo(xPoints[0], yPoints[0]);
-            for(int j = 1; j < nPoints; j++)
-                generalpath.lineTo(xPoints[j], yPoints[j]);
-
-            draw(generalpath);
-        }
-    }
-
-    public void drawRect(int x, int y, int width, int height)
-    {
-        _escherGraphics.drawRect(x,y,width,height);
-    }
-
-    public void drawRenderableImage(RenderableImage renderableimage, AffineTransform affinetransform)
-    {
-        drawRenderedImage(renderableimage.createDefaultRendering(), affinetransform);
-    }
-
-    public void drawRenderedImage(RenderedImage renderedimage, AffineTransform affinetransform)
-    {
-        BufferedImage bufferedimage = new BufferedImage(renderedimage.getColorModel(), renderedimage.getData().createCompatibleWritableRaster(), false, null);
-        bufferedimage.setData(renderedimage.getData());
-        drawImage(bufferedimage, affinetransform, null);
-    }
-
-    public void drawRoundRect(int i, int j, int k, int l, int i1, int j1)
-    {
-        draw(new java.awt.geom.RoundRectangle2D.Float(i, j, k, l, i1, j1));
-    }
-
-    public void drawString(String string, float x, float y)
-    {
-        getEscherGraphics().drawString(string, (int)x, (int)y);
-    }
-
-    public void drawString(String string, int x, int y)
-    {
-        getEscherGraphics().drawString(string, x, y);
-    }
-
-    public void drawString(AttributedCharacterIterator attributedcharacteriterator, float x, float y)
-    {
-        TextLayout textlayout = new TextLayout(attributedcharacteriterator, getFontRenderContext());
-        Paint paint1 = getPaint();
-        setColor(getColor());
-        fill(textlayout.getOutline(AffineTransform.getTranslateInstance(x, y)));
-        setPaint(paint1);
-    }
-
-    public void drawString(AttributedCharacterIterator attributedcharacteriterator, int x, int y)
-    {
-        getEscherGraphics().drawString(attributedcharacteriterator, x, y);
-    }
-
-    public void fill(Shape shape)
-    {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"fill(Shape) not supported");
-    }
-
-    public void fillArc(int i, int j, int k, int l, int i1, int j1)
-    {
-        fill(new java.awt.geom.Arc2D.Float(i, j, k, l, i1, j1, 2));
-    }
-
-    public void fillOval(int x, int y, int width, int height)
-    {
-        _escherGraphics.fillOval(x,y,width,height);
-    }
-
-    /**
-     * Fills a (closed) polygon, as defined by a pair of arrays, which
-     *  hold the <i>x</i> and <i>y</i> coordinates.
-     * <p>
-     * This draws the polygon, with <code>nPoint</code> line segments.
-     * The first <code>nPoint&nbsp;-&nbsp;1</code> line segments are
-     *  drawn between sequential points
-     *  (<code>xPoints[i],yPoints[i],xPoints[i+1],yPoints[i+1]</code>).
-     * The final line segment is a closing one, from the last point to
-     *  the first (assuming they are different).
-     * <p>
-     * The area inside of the polygon is defined by using an
-     *  even-odd fill rule (also known as the alternating rule), and
-     *  the area inside of it is filled.
-     * @param xPoints array of the <code>x</code> coordinates.
-     * @param yPoints array of the <code>y</code> coordinates.
-     * @param nPoints the total number of points in the polygon.
-     * @see   java.awt.Graphics#drawPolygon(int[], int[], int)
-     */
-    public void fillPolygon(int xPoints[], int yPoints[], int nPoints)
-    {
-        _escherGraphics.fillPolygon(xPoints, yPoints, nPoints);
-    }
-
-    public void fillRect(int x, int y, int width, int height)
-    {
-        getEscherGraphics().fillRect(x,y,width,height);
-    }
-
-    public void fillRoundRect(int x, int y, int width, int height,
-				       int arcWidth, int arcHeight)
-    {
-        fill(new java.awt.geom.RoundRectangle2D.Float(x, y, width, height, arcWidth, arcHeight));
-    }
-
-    public Color getBackground()
-    {
-        return getEscherGraphics().getBackground();
-    }
-
-    public Shape getClip()
-    {
-        try
-        {
-            return getTrans().createInverse().createTransformedShape(getDeviceclip());
-        }
-        catch(Exception _ex)
-        {
-            return null;
-        }
-    }
-
-    public Rectangle getClipBounds()
-    {
-        if(getDeviceclip() != null) {
-            return getClip().getBounds();
-        }
-        return null;
-    }
-
-    public Color getColor()
-    {
-        return _escherGraphics.getColor();
-    }
-
-    public Composite getComposite()
-    {
-        return getG2D().getComposite();
-    }
-
-    public GraphicsConfiguration getDeviceConfiguration()
-    {
-        return getG2D().getDeviceConfiguration();
-    }
-
-    public Font getFont()
-    {
-        return getEscherGraphics().getFont();
-    }
-
-    public FontMetrics getFontMetrics(Font font)
-    {
-        return getEscherGraphics().getFontMetrics(font);
-    }
-
-    public FontRenderContext getFontRenderContext()
-    {
-        getG2D().setTransform(getTrans());
-        return getG2D().getFontRenderContext();
-    }
-
-    public Paint getPaint()
-    {
-        return _paint;
-    }
-
-    public Object getRenderingHint(java.awt.RenderingHints.Key key)
-    {
-        return getG2D().getRenderingHint(key);
-    }
-
-    public RenderingHints getRenderingHints()
-    {
-        return getG2D().getRenderingHints();
-    }
-
-    public Stroke getStroke()
-    {
-        return _stroke;
-    }
-
-    public AffineTransform getTransform()
-    {
-        return (AffineTransform)getTrans().clone();
-    }
-
-    public boolean hit(Rectangle rectangle, Shape shape, boolean flag)
-    {
-        getG2D().setTransform(getTrans());
-        getG2D().setStroke(getStroke());
-        getG2D().setClip(getClip());
-        return getG2D().hit(rectangle, shape, flag);
-    }
-
-    public void rotate(double d)
-    {
-        getTrans().rotate(d);
-    }
-
-    public void rotate(double d, double d1, double d2)
-    {
-        getTrans().rotate(d, d1, d2);
-    }
-
-    public void scale(double d, double d1)
-    {
-        getTrans().scale(d, d1);
-    }
-
-    public void setBackground(Color c)
-    {
-        getEscherGraphics().setBackground(c);
-    }
-
-    public void setClip(int i, int j, int k, int l)
-    {
-        setClip(new Rectangle(i, j, k, l));
-    }
-
-    public void setClip(Shape shape)
-    {
-        setDeviceclip( getTrans().createTransformedShape(shape) );
-    }
-
-    public void setColor(Color c)
-    {
-        _escherGraphics.setColor(c);
-    }
-
-    public void setComposite(Composite composite)
-    {
-        getG2D().setComposite(composite);
-    }
-
-    public void setFont(Font font)
-    {
-        getEscherGraphics().setFont(font);
-    }
-
-    public void setPaint(Paint paint1)
-    {
-        if(paint1 != null)
-        {
-            _paint = paint1;
-            if(paint1 instanceof Color)
-                setColor( (Color)paint1 );
-        }
-    }
-
-    public void setPaintMode()
-    {
-        getEscherGraphics().setPaintMode();
-    }
-
-    public void setRenderingHint(java.awt.RenderingHints.Key key, Object obj)
-    {
-        getG2D().setRenderingHint(key, obj);
-    }
-
-    public void setRenderingHints(Map<?, ?> map)
-    {
-        getG2D().setRenderingHints(map);
-    }
-
-    public void setStroke(Stroke s)
-    {
-        _stroke = s;
-    }
-
-    public void setTransform(AffineTransform affinetransform)
-    {
-        setTrans( (AffineTransform)affinetransform.clone() );
-    }
-
-    public void setXORMode(Color color1)
-    {
-        getEscherGraphics().setXORMode(color1);
-    }
-
-    public void shear(double d, double d1)
-    {
-        getTrans().shear(d, d1);
-    }
-
-    public void transform(AffineTransform affinetransform)
-    {
-        getTrans().concatenate(affinetransform);
-    }
-
-//    Image transformImage(Image image, Rectangle rectangle, Rectangle rectangle1, ImageObserver imageobserver, Color color1)
-//    {
-//        logger.log(POILogger.WARN,"transformImage() not supported");
-//        return null;
-//    }
-//
-//    Image transformImage(Image image, int ai[], Rectangle rectangle, ImageObserver imageobserver, Color color1)
-//    {
-//        logger.log(POILogger.WARN,"transformImage() not supported");
-//        return null;
-//    }
-
-    public void translate(double d, double d1)
-    {
-        getTrans().translate(d, d1);
-    }
-
-    public void translate(int i, int j)
-    {
-        getTrans().translate(i, j);
-    }
-
-    private EscherGraphics getEscherGraphics()
-    {
-        return _escherGraphics;
-    }
-
-    private BufferedImage getImg()
-    {
-        return _img;
-    }
-
-    private void setImg( BufferedImage img )
-    {
-        this._img = img;
-    }
-
-    private Graphics2D getG2D()
-    {
-        return (Graphics2D) _img.getGraphics();
-    }
-
-    private AffineTransform getTrans()
-    {
-        return _trans;
-    }
-
-    private void setTrans( AffineTransform trans )
-    {
-        this._trans = trans;
-    }
-
-    private Shape getDeviceclip()
-    {
-        return _deviceclip;
-    }
-
-    private void setDeviceclip( Shape deviceclip )
-    {
-        this._deviceclip = deviceclip;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/FontDetails.java b/trunk/src/java/org/apache/poi/hssf/usermodel/FontDetails.java
deleted file mode 100644
index 29bcf5a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/FontDetails.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-/**
- * Stores width and height details about a font.
- */
-public class FontDetails
-{
-    private String _fontName;
-    private int _height;
-    private final Map<Character, Integer> charWidths = new HashMap<Character, Integer>();
-
-    /**
-     * Construct the font details with the given name and height.
-     *
-     * @param fontName  The font name.
-     * @param height    The height of the font.
-     */
-    public FontDetails( String fontName, int height )
-    {
-        _fontName = fontName;
-        _height = height;
-    }
-
-    public String getFontName()
-    {
-        return _fontName;
-    }
-
-    public int getHeight()
-    {
-        return _height;
-    }
-
-    public void addChar( char c, int width )
-    {
-        charWidths.put(Character.valueOf(c), Integer.valueOf(width));
-    }
-
-    /**
-     * Retrieves the width of the specified character.  If the metrics for
-     * a particular character are not available it defaults to returning the
-     * width for the 'W' character.
-     */
-    public int getCharWidth( char c )
-    {
-        Integer widthInteger = charWidths.get(Character.valueOf(c));
-        if (widthInteger == null) {
-            return 'W' == c ? 0 : getCharWidth('W');
-        }
-        return widthInteger;
-    }
-
-    public void addChars( char[] characters, int[] widths )
-    {
-        for ( int i = 0; i < characters.length; i++ )
-        {
-            charWidths.put( Character.valueOf(characters[i]), Integer.valueOf(widths[i]));
-        }
-    }
-
-    protected static String buildFontHeightProperty(String fontName) {
-        return "font." + fontName + ".height";
-    }
-    protected static String buildFontWidthsProperty(String fontName) {
-        return "font." + fontName + ".widths";
-    }
-    protected static String buildFontCharactersProperty(String fontName) {
-        return "font." + fontName + ".characters";
-    }
-
-    /**
-     * Create an instance of <code>FontDetails</code> by loading them from the
-     * provided property object.
-     * @param fontName          the font name
-     * @param fontMetricsProps  the property object holding the details of this
-     *                          particular font.
-     * @return  a new FontDetails instance.
-     */
-    public static FontDetails create( String fontName, Properties fontMetricsProps )
-    {
-        String heightStr = fontMetricsProps.getProperty( buildFontHeightProperty(fontName) );
-        String widthsStr = fontMetricsProps.getProperty( buildFontWidthsProperty(fontName) );
-        String charactersStr = fontMetricsProps.getProperty( buildFontCharactersProperty(fontName) );
-
-        // Ensure that this is a font we know about
-        if(heightStr == null || widthsStr == null || charactersStr == null) {
-            // We don't know all we need to about this font
-            // Since we don't know its sizes, we can't work with it
-            throw new IllegalArgumentException("The supplied FontMetrics doesn't know about the font '" + fontName + "', so we can't use it. Please add it to your font metrics file (see StaticFontMetrics.getFontDetails");
-        }
-
-        int height = Integer.parseInt(heightStr);
-        FontDetails d = new FontDetails(fontName, height);
-        String[] charactersStrArray = split(charactersStr, ",", -1);
-        String[] widthsStrArray = split(widthsStr, ",", -1);
-        if (charactersStrArray.length != widthsStrArray.length)
-            throw new RuntimeException("Number of characters does not number of widths for font " + fontName);
-        for ( int i = 0; i < widthsStrArray.length; i++ )
-        {
-            if (charactersStrArray[i].length() != 0)
-                d.addChar(charactersStrArray[i].charAt(0), Integer.parseInt(widthsStrArray[i]));
-        }
-        return d;
-    }
-
-    /**
-     * Gets the width of all characters in a string.
-     *
-     * @param str   The string to measure.
-     * @return      The width of the string for a 10 point font.
-     */
-    public int getStringWidth(String str)
-    {
-        int width = 0;
-        for (int i = 0; i < str.length(); i++)
-        {
-            width += getCharWidth(str.charAt(i));
-        }
-        return width;
-    }
-
-    /**
-     * Split the given string into an array of strings using the given
-     * delimiter.
-     */
-    private static String[] split(String text, String separator, int max)
-    {
-        StringTokenizer tok = new StringTokenizer(text, separator);
-        int listSize = tok.countTokens();
-        if(max != -1 && listSize > max)
-            listSize = max;
-        String list[] = new String[listSize];
-        for(int i = 0; tok.hasMoreTokens(); i++)
-        {
-            if(max != -1 && i == listSize - 1)
-            {
-                StringBuffer buf = new StringBuffer((text.length() * (listSize - i)) / listSize);
-                while(tok.hasMoreTokens())
-                {
-                    buf.append(tok.nextToken());
-                    if(tok.hasMoreTokens())
-                        buf.append(separator);
-                }
-                list[i] = buf.toString().trim();
-                break;
-            }
-            list[i] = tok.nextToken().trim();
-        }
-
-        return list;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
deleted file mode 100644
index 3ba5737..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-
-import org.apache.poi.ddf.EscherChildAnchorRecord;
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherRecord;
-
-/**
- * An anchor is what specifics the position of a shape within a client object
- * or within another containing shape.
- */
-public abstract class HSSFAnchor {
-
-    protected boolean _isHorizontallyFlipped = false;
-    protected boolean _isVerticallyFlipped = false;
-
-    public HSSFAnchor() {
-        createEscherAnchor();
-    }
-
-    public HSSFAnchor(int dx1, int dy1, int dx2, int dy2) {
-        createEscherAnchor();
-        setDx1(dx1);
-        setDy1(dy1);
-        setDx2(dx2);
-        setDy2(dy2);
-    }
-
-    public static HSSFAnchor createAnchorFromEscher(EscherContainerRecord container){
-        if (null != container.getChildById(EscherChildAnchorRecord.RECORD_ID)){
-            return new HSSFChildAnchor((EscherChildAnchorRecord) container.getChildById(EscherChildAnchorRecord.RECORD_ID));
-        } else {
-            if (null != container.getChildById(EscherClientAnchorRecord.RECORD_ID)){
-                return new HSSFClientAnchor((EscherClientAnchorRecord) container.getChildById(EscherClientAnchorRecord.RECORD_ID));
-            }
-            return null;
-        }
-    }
-
-    /**
-     * @return x coordinate of the left up corner
-     */
-    public abstract int getDx1();
-
-    /**
-     * @param dx1 x coordinate of the left up corner
-     */
-    public abstract void setDx1(int dx1);
-
-    /**
-     * @return y coordinate of the left up corner
-     */
-    public abstract int getDy1();
-
-    /**
-     * @param dy1 y coordinate of the left up corner
-     */
-    public abstract void setDy1(int dy1);
-
-    /**
-     * @return y coordinate of the right down corner
-     */
-    public abstract int getDy2();
-
-    /**
-     * @param dy2 y coordinate of the right down corner
-     */
-    public abstract void setDy2(int dy2);
-
-    /**
-     * @return x coordinate of the right down corner
-     */
-    public abstract int getDx2();
-
-    /**
-     * @param dx2 x coordinate of the right down corner
-     */
-    public abstract void setDx2(int dx2);
-
-    /**
-     * @return whether this shape is horizontally flipped
-     */
-    public abstract boolean isHorizontallyFlipped();
-
-    /**
-     * @return  whether this shape is vertically flipped
-     */
-    public abstract boolean isVerticallyFlipped();
-
-    protected abstract EscherRecord getEscherAnchor();
-
-    protected abstract void createEscherAnchor();
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
deleted file mode 100644
index 533dffe..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-import org.apache.poi.ss.usermodel.AutoFilter;
-
-/**
- * Represents autofiltering for the specified worksheet.
- */
-public final class HSSFAutoFilter implements AutoFilter {
-    private HSSFSheet _sheet;
-
-    HSSFAutoFilter(HSSFSheet sheet){
-        _sheet = sheet;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
deleted file mode 100644
index c4113b6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.cf.BorderFormatting;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Color;
-
-/**
- * High level representation for Border Formatting component
- * of Conditional Formatting settings
- */
-public final class HSSFBorderFormatting implements org.apache.poi.ss.usermodel.BorderFormatting {
-    private final HSSFWorkbook workbook;
-    private final CFRuleBase cfRuleRecord;
-    private final BorderFormatting borderFormatting;
-
-    protected HSSFBorderFormatting(CFRuleBase cfRuleRecord, HSSFWorkbook workbook) {
-        this.workbook = workbook;
-        this.cfRuleRecord = cfRuleRecord;
-        this.borderFormatting = cfRuleRecord.getBorderFormatting();
-    }
-
-    protected BorderFormatting getBorderFormattingBlock() {
-        return borderFormatting;
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderBottomEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderBottom() {
-        return (short)borderFormatting.getBorderBottom();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderBottomEnum() {
-        return BorderStyle.valueOf((short)borderFormatting.getBorderBottom());
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderDiagonalEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderDiagonal() {
-        return (short)borderFormatting.getBorderDiagonal();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderDiagonalEnum() {
-        return BorderStyle.valueOf((short)borderFormatting.getBorderDiagonal());
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderLeftEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderLeft() {
-        return (short)borderFormatting.getBorderLeft();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderLeftEnum() {
-        return BorderStyle.valueOf((short)borderFormatting.getBorderLeft());
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderRightEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderRight() {
-        return (short)borderFormatting.getBorderRight();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderRightEnum() {
-        return BorderStyle.valueOf((short)borderFormatting.getBorderRight());
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderTopEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderTop() {
-        return (short)borderFormatting.getBorderTop();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderTopEnum() {
-        return BorderStyle.valueOf((short)borderFormatting.getBorderTop());
-    }
-
-    @Override
-    public short getBottomBorderColor() {
-        return (short)borderFormatting.getBottomBorderColor();
-    }
-    @Override
-    public HSSFColor getBottomBorderColorColor() {
-        return workbook.getCustomPalette().getColor(
-                borderFormatting.getBottomBorderColor()
-        );
-    }
-
-    @Override
-    public short getDiagonalBorderColor() {
-        return (short)borderFormatting.getDiagonalBorderColor();
-    }
-    @Override
-    public HSSFColor getDiagonalBorderColorColor() {
-        return workbook.getCustomPalette().getColor(
-                borderFormatting.getDiagonalBorderColor()
-        );
-    }
-
-    @Override
-    public short getLeftBorderColor() {
-        return (short)borderFormatting.getLeftBorderColor();
-    }
-    @Override
-    public HSSFColor getLeftBorderColorColor() {
-        return workbook.getCustomPalette().getColor(
-                borderFormatting.getLeftBorderColor()
-        );
-    }
-
-    @Override
-    public short getRightBorderColor() {
-        return (short)borderFormatting.getRightBorderColor();
-    }
-    @Override
-    public HSSFColor getRightBorderColorColor() {
-        return workbook.getCustomPalette().getColor(
-                borderFormatting.getRightBorderColor()
-        );
-    }
-
-    @Override
-    public short getTopBorderColor() {
-        return (short)borderFormatting.getTopBorderColor();
-    }
-    @Override
-    public HSSFColor getTopBorderColorColor() {
-        return workbook.getCustomPalette().getColor(
-                borderFormatting.getTopBorderColor()
-        );
-    }
-
-    public boolean isBackwardDiagonalOn() {
-        return borderFormatting.isBackwardDiagonalOn();
-    }
-    public boolean isForwardDiagonalOn() {
-        return borderFormatting.isForwardDiagonalOn();
-    }
-
-    public void setBackwardDiagonalOn(boolean on) {
-        borderFormatting.setBackwardDiagonalOn(on);
-        if (on) {
-            cfRuleRecord.setTopLeftBottomRightBorderModified(on);
-        }
-    }
-    public void setForwardDiagonalOn(boolean on) {
-        borderFormatting.setForwardDiagonalOn(on);
-        if (on) {
-            cfRuleRecord.setBottomLeftTopRightBorderModified(on);
-        }
-    }
-
-    @Override
-    public void setBorderBottom(short border) {
-        borderFormatting.setBorderBottom(border);
-        if (border != 0) {
-            cfRuleRecord.setBottomBorderModified(true);
-        } else {
-            cfRuleRecord.setBottomBorderModified(false);
-        }
-    }
-    @Override
-    public void setBorderBottom(BorderStyle border) {
-        setBorderBottom(border.getCode());
-    }
-
-    @Override
-    public void setBorderDiagonal(short border) {
-        borderFormatting.setBorderDiagonal(border);
-        if (border != 0) {
-            cfRuleRecord.setBottomLeftTopRightBorderModified(true);
-            cfRuleRecord.setTopLeftBottomRightBorderModified(true);
-        } else {
-            cfRuleRecord.setBottomLeftTopRightBorderModified(false);
-            cfRuleRecord.setTopLeftBottomRightBorderModified(false);
-        }
-    }
-    @Override
-    public void setBorderDiagonal(BorderStyle border) {
-        setBorderDiagonal(border.getCode());
-    }
-
-    @Override
-    public void setBorderLeft(short border) {
-        borderFormatting.setBorderLeft(border);
-        if (border != 0) {
-            cfRuleRecord.setLeftBorderModified(true);
-        } else {
-            cfRuleRecord.setLeftBorderModified(false);
-        }
-    }
-    @Override
-    public void setBorderLeft(BorderStyle border) {
-        setBorderLeft(border.getCode());
-    }
-
-    @Override
-    public void setBorderRight(short border) {
-        borderFormatting.setBorderRight(border);
-        if (border != 0) {
-            cfRuleRecord.setRightBorderModified(true);
-        } else {
-            cfRuleRecord.setRightBorderModified(false);
-        }
-    }
-    @Override
-    public void setBorderRight(BorderStyle border) {
-        setBorderRight(border.getCode());
-    }
-
-    @Override
-    public void setBorderTop(short border) {
-        borderFormatting.setBorderTop(border);
-        if (border != 0) {
-            cfRuleRecord.setTopBorderModified(true);
-        } else {
-            cfRuleRecord.setTopBorderModified(false);
-        }
-    }
-    @Override
-    public void setBorderTop(BorderStyle border) {
-        setBorderTop(border.getCode());
-    }
-
-    @Override
-    public void setBottomBorderColor(short color) {
-        borderFormatting.setBottomBorderColor(color);
-        if (color != 0) {
-            cfRuleRecord.setBottomBorderModified(true);
-        } else {
-            cfRuleRecord.setBottomBorderModified(false);
-        }
-    }
-    public void setBottomBorderColor(Color color) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(color);
-        if (hcolor == null) {
-            setBottomBorderColor((short)0);
-        } else {
-            setBottomBorderColor(hcolor.getIndex());
-        }
-    }
-
-    @Override
-    public void setDiagonalBorderColor(short color) {
-        borderFormatting.setDiagonalBorderColor(color);
-        if (color != 0) {
-            cfRuleRecord.setBottomLeftTopRightBorderModified(true);
-            cfRuleRecord.setTopLeftBottomRightBorderModified(true);
-        } else {
-            cfRuleRecord.setBottomLeftTopRightBorderModified(false);
-            cfRuleRecord.setTopLeftBottomRightBorderModified(false);
-        }
-    }
-    @Override
-    public void setDiagonalBorderColor(Color color) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(color);
-        if (hcolor == null) {
-            setDiagonalBorderColor((short)0);
-        } else {
-            setDiagonalBorderColor(hcolor.getIndex());
-        }
-    }
-
-    @Override
-    public void setLeftBorderColor(short color) {
-        borderFormatting.setLeftBorderColor(color);
-        if (color != 0) {
-            cfRuleRecord.setLeftBorderModified(true);
-        } else {
-            cfRuleRecord.setLeftBorderModified(false);
-        }
-    }
-    @Override
-    public void setLeftBorderColor(Color color) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(color);
-        if (hcolor == null) {
-            setLeftBorderColor((short)0);
-        } else {
-            setLeftBorderColor(hcolor.getIndex());
-        }
-    }
-
-    @Override
-    public void setRightBorderColor(short color) {
-        borderFormatting.setRightBorderColor(color);
-        if (color != 0) {
-            cfRuleRecord.setRightBorderModified(true);
-        } else {
-            cfRuleRecord.setRightBorderModified(false);
-        }
-    }
-    @Override
-    public void setRightBorderColor(Color color) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(color);
-        if (hcolor == null) {
-            setRightBorderColor((short)0);
-        } else {
-            setRightBorderColor(hcolor.getIndex());
-        }
-    }
-
-    @Override
-    public void setTopBorderColor(short color) {
-        borderFormatting.setTopBorderColor(color);
-        if (color != 0) {
-            cfRuleRecord.setTopBorderModified(true);
-        } else {
-            cfRuleRecord.setTopBorderModified(false);
-        }
-    }
-    @Override
-    public void setTopBorderColor(Color color) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(color);
-        if (hcolor == null) {
-            setTopBorderColor((short)0);
-        } else {
-            setTopBorderColor(hcolor.getIndex());
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
deleted file mode 100644
index 981cbd4..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
+++ /dev/null
@@ -1,1288 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.BoolErrRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.HyperlinkRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.ptg.ExpPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * High level representation of a cell in a row of a spreadsheet.
- * Cells can be numeric, formula-based or string-based (text).  The cell type
- * specifies this.  String cells cannot contain numbers and numeric cells cannot
- * contain strings (at least according to our model).  Client apps should do the
- * conversions themselves.  Formula cells have the formula string, as well as
- * the formula result, which can be numeric or string.
- * <p>
- * Cells should have their number (0 based) before being added to a row.  Only
- * cells that have values should be added.
- * <p>
- */
-public class HSSFCell implements Cell {
-    private static final String FILE_FORMAT_NAME  = "BIFF8";
-    /**
-     * The maximum  number of columns in BIFF8
-     */
-    public static final int LAST_COLUMN_NUMBER  = SpreadsheetVersion.EXCEL97.getLastColumnIndex(); // 2^8 - 1
-    private static final String LAST_COLUMN_NAME  = SpreadsheetVersion.EXCEL97.getLastColumnName();
-
-    public final static short        ENCODING_UNCHANGED          = -1;
-    public final static short        ENCODING_COMPRESSED_UNICODE = 0;
-    public final static short        ENCODING_UTF_16             = 1;
-
-    private final HSSFWorkbook       _book;
-    private final HSSFSheet          _sheet;
-    private CellType                 _cellType;
-    private HSSFRichTextString       _stringValue;
-    private CellValueRecordInterface _record;
-    private HSSFComment              _comment;
-
-    /**
-     * Creates new Cell - Should only be called by HSSFRow.  This creates a cell
-     * from scratch.
-     * <p>
-     * When the cell is initially created it is set to {@link CellType#BLANK}. Cell types
-     * can be changed/overwritten by calling setCellValue with the appropriate
-     * type as a parameter although conversions from one type to another may be
-     * prohibited.
-     *
-     * @param book - Workbook record of the workbook containing this cell
-     * @param sheet - Sheet record of the sheet containing this cell
-     * @param row   - the row of this cell
-     * @param col   - the column for this cell
-     *
-     * @see org.apache.poi.hssf.usermodel.HSSFRow#createCell(int)
-     */
-    protected HSSFCell(HSSFWorkbook book, HSSFSheet sheet, int row, short col)
-    {
-        checkBounds(col);
-        _stringValue  = null;
-        _book    = book;
-        _sheet   = sheet;
-
-        // Relying on the fact that by default the cellType is set to 0 which
-        // is different to {@link CellType#BLANK} hence the following method call correctly
-        // creates a new blank cell.
-        short xfindex = sheet.getSheet().getXFIndexForColAt(col);
-        setCellType(CellType.BLANK, false, row, col,xfindex);
-    }
-
-    /**
-     * Returns the HSSFSheet this cell belongs to
-     *
-     * @return the HSSFSheet that owns this cell
-     */
-    public HSSFSheet getSheet() {
-        return _sheet;
-    }
-
-    /**
-     * Returns the HSSFRow this cell belongs to
-     *
-     * @return the HSSFRow that owns this cell
-     */
-    public HSSFRow getRow() {
-        int rowIndex = getRowIndex();
-        return _sheet.getRow(rowIndex);
-    }
-
-    /**
-     * Creates new Cell - Should only be called by HSSFRow.  This creates a cell
-     * from scratch.
-     *
-     * @param book - Workbook record of the workbook containing this cell
-     * @param sheet - Sheet record of the sheet containing this cell
-     * @param row   - the row of this cell
-     * @param col   - the column for this cell
-     * @param type  - Type of cell
-     * @see org.apache.poi.hssf.usermodel.HSSFRow#createCell(int,int)
-     */
-    protected HSSFCell(HSSFWorkbook book, HSSFSheet sheet, int row, short col,
-                       CellType type)
-    {
-        checkBounds(col);
-        _cellType     = CellType._NONE; // Force 'setCellType' to create a first Record
-        _stringValue  = null;
-        _book    = book;
-        _sheet   = sheet;
-
-        short xfindex = sheet.getSheet().getXFIndexForColAt(col);
-        setCellType(type,false,row,col,xfindex);
-    }
-
-    /**
-     * Creates an HSSFCell from a CellValueRecordInterface.  HSSFSheet uses this when
-     * reading in cells from an existing sheet.
-     *
-     * @param book - Workbook record of the workbook containing this cell
-     * @param sheet - Sheet record of the sheet containing this cell
-     * @param cval - the Cell Value Record we wish to represent
-     */
-    protected HSSFCell(HSSFWorkbook book, HSSFSheet sheet, CellValueRecordInterface cval) {
-        _record      = cval;
-        _cellType    = determineType(cval);
-        _stringValue = null;
-        _book   = book;
-        _sheet  = sheet;
-        switch (_cellType)
-        {
-            case STRING :
-                _stringValue = new HSSFRichTextString(book.getWorkbook(), (LabelSSTRecord ) cval);
-                break;
-
-            case BLANK :
-                break;
-
-            case FORMULA :
-                _stringValue=new HSSFRichTextString(((FormulaRecordAggregate) cval).getStringValue());
-                break;
-
-            default :
-                break;
-        }
-    }
-
-
-    /**
-     * used internally -- given a cell value record, figure out its type
-     */
-    private static CellType determineType(CellValueRecordInterface cval) {
-        if (cval instanceof FormulaRecordAggregate) {
-            return CellType.FORMULA;
-        }
-        // all others are plain BIFF records
-        Record record = ( Record ) cval;
-        switch (record.getSid()) {
-
-            case NumberRecord.sid :   return CellType.NUMERIC;
-            case BlankRecord.sid :    return CellType.BLANK;
-            case LabelSSTRecord.sid : return CellType.STRING;
-            case BoolErrRecord.sid :
-                BoolErrRecord boolErrRecord = ( BoolErrRecord ) record;
-
-                return boolErrRecord.isBoolean()
-                         ? CellType.BOOLEAN
-                         : CellType.ERROR;
-        }
-        throw new RuntimeException("Bad cell value rec (" + cval.getClass().getName() + ")");
-    }
-
-    /**
-     * Returns the Workbook that this Cell is bound to
-     */
-    protected InternalWorkbook getBoundWorkbook() {
-        return _book.getWorkbook();
-    }
-
-    /**
-     * @return the (zero based) index of the row containing this cell
-     */
-    @Override
-    public int getRowIndex() {
-        return _record.getRow();
-    }
-
-    /**
-     * Updates the cell record's idea of what
-     *  column it belongs in (0 based)
-     * @param num the new cell number
-     */
-    protected void updateCellNum(short num)
-    {
-        _record.setColumn(num);
-    }
-
-    @Override
-    public int getColumnIndex() {
-        return _record.getColumn() & 0xFFFF;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public CellAddress getAddress() {
-        return new CellAddress(this);
-    }
-    
-    /**
-     * Set the cells type (numeric, formula or string).
-     * If the cell currently contains a value, the value will
-     *  be converted to match the new type, if possible.
-     * @see CellType#NUMERIC
-     * @see CellType#STRING
-     * @see CellType#FORMULA
-     * @see CellType#BLANK
-     * @see CellType#BOOLEAN
-     * @see CellType#ERROR
-     * @deprecated POI 3.15 beta 3. Use {@link #setCellType(CellType)} instead.
-     */
-    @Override
-    public void setCellType(int cellType) {
-        setCellType(CellType.forInt(cellType));
-    }
-    /**
-     * Set the cells type (numeric, formula or string).
-     * If the cell currently contains a value, the value will
-     *  be converted to match the new type, if possible.
-     */
-    @Override
-    public void setCellType(CellType cellType) {
-        notifyFormulaChanging();
-        if(isPartOfArrayFormulaGroup()){
-            notifyArrayFormulaChanging();
-        }
-        int row=_record.getRow();
-        short col=_record.getColumn();
-        short styleIndex=_record.getXFIndex();
-        setCellType(cellType, true, row, col, styleIndex);
-    }
-
-    /**
-     * sets the cell type. The setValue flag indicates whether to bother about
-     *  trying to preserve the current value in the new record if one is created.
-     *  <p>
-     *  The @see #setCellValue method will call this method with false in setValue
-     *  since it will overwrite the cell value later
-     *
-     */
-
-    private void setCellType(CellType cellType, boolean setValue, int row,short col, short styleIndex)
-    {
-        switch (cellType)
-        {
-
-            case FORMULA :
-                FormulaRecordAggregate frec;
-
-                if (cellType != _cellType) {
-                    frec = _sheet.getSheet().getRowsAggregate().createFormula(row, col);
-                } else {
-                    frec = (FormulaRecordAggregate) _record;
-                    frec.setRow(row);
-                    frec.setColumn(col);
-                }
-                if (setValue)
-                {
-                    frec.getFormulaRecord().setValue(getNumericCellValue());
-                }
-                frec.setXFIndex(styleIndex);
-                _record = frec;
-                break;
-
-            case NUMERIC :
-                NumberRecord nrec = null;
-
-                if (cellType != _cellType)
-                {
-                    nrec = new NumberRecord();
-                }
-                else
-                {
-                    nrec = ( NumberRecord ) _record;
-                }
-                nrec.setColumn(col);
-                if (setValue)
-                {
-                    nrec.setValue(getNumericCellValue());
-                }
-                nrec.setXFIndex(styleIndex);
-                nrec.setRow(row);
-                _record = nrec;
-                break;
-
-            case STRING :
-                LabelSSTRecord lrec;
-
-                if (cellType == _cellType) {
-                    lrec = (LabelSSTRecord) _record;
-                } else {
-                    lrec = new LabelSSTRecord();
-                    lrec.setColumn(col);
-                    lrec.setRow(row);
-                    lrec.setXFIndex(styleIndex);
-                }
-                if (setValue) {
-                    String str = convertCellValueToString();
-                    if(str == null) {
-                        // bug 55668: don't try to store null-string when formula
-                        // results in empty/null value
-                        setCellType(CellType.BLANK, false, row, col, styleIndex);
-                        return;
-                    } else {
-                        int sstIndex = _book.getWorkbook().addSSTString(new UnicodeString(str));
-                        lrec.setSSTIndex(sstIndex);
-                        UnicodeString us = _book.getWorkbook().getSSTString(sstIndex);
-                        _stringValue = new HSSFRichTextString();
-                        _stringValue.setUnicodeString(us);
-                    }
-                }
-                _record = lrec;
-                break;
-
-            case BLANK :
-                BlankRecord brec = null;
-
-                if (cellType != _cellType)
-                {
-                    brec = new BlankRecord();
-                }
-                else
-                {
-                    brec = ( BlankRecord ) _record;
-                }
-                brec.setColumn(col);
-
-                // During construction the cellStyle may be null for a Blank cell.
-                brec.setXFIndex(styleIndex);
-                brec.setRow(row);
-                _record = brec;
-                break;
-
-            case BOOLEAN :
-                BoolErrRecord boolRec = null;
-
-                if (cellType != _cellType)
-                {
-                    boolRec = new BoolErrRecord();
-                }
-                else
-                {
-                    boolRec = ( BoolErrRecord ) _record;
-                }
-                boolRec.setColumn(col);
-                if (setValue)
-                {
-                    boolRec.setValue(convertCellValueToBoolean());
-                }
-                boolRec.setXFIndex(styleIndex);
-                boolRec.setRow(row);
-                _record = boolRec;
-                break;
-
-            case ERROR :
-                BoolErrRecord errRec = null;
-
-                if (cellType != _cellType)
-                {
-                    errRec = new BoolErrRecord();
-                }
-                else
-                {
-                    errRec = ( BoolErrRecord ) _record;
-                }
-                errRec.setColumn(col);
-                if (setValue)
-                {
-                    errRec.setValue(FormulaError.VALUE.getCode());
-                }
-                errRec.setXFIndex(styleIndex);
-                errRec.setRow(row);
-                _record = errRec;
-                break;
-            default :
-                throw new IllegalStateException("Invalid cell type: " + cellType);
-        }
-        if (cellType != _cellType &&
-            _cellType != CellType._NONE )  // Special Value to indicate an uninitialized Cell
-        {
-            _sheet.getSheet().replaceValueRecord(_record);
-        }
-        _cellType = cellType;
-    }
-
-    /**
-     * get the cells type (numeric, formula or string)
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     * @deprecated 3.15. Will be return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCellType()
-    {
-        return getCellTypeEnum().getCode();
-    }
-    
-    /**
-     * get the cells type (numeric, formula or string)
-     * @since POI 3.15 beta 3
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Override
-    public CellType getCellTypeEnum()
-    {
-        return _cellType;
-    }
-
-    /**
-     * set a numeric value for the cell
-     *
-     * @param value  the numeric value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    @SuppressWarnings("fallthrough")
-    @Override
-    public void setCellValue(double value) {
-        if(Double.isInfinite(value)) {
-            // Excel does not support positive/negative infinities,
-            // rather, it gives a #DIV/0! error in these cases.
-            setCellErrorValue(FormulaError.DIV0.getCode());
-        } else if (Double.isNaN(value)){
-            // Excel does not support Not-a-Number (NaN),
-            // instead it immediately generates a #NUM! error.
-            setCellErrorValue(FormulaError.NUM.getCode());
-        } else {
-            int row=_record.getRow();
-            short col=_record.getColumn();
-            short styleIndex=_record.getXFIndex();
-
-            switch (_cellType) {
-                default:
-                    setCellType(CellType.NUMERIC, false, row, col, styleIndex);
-                    // fall through
-                case NUMERIC:
-                    (( NumberRecord ) _record).setValue(value);
-                    break;
-                case FORMULA:
-                    ((FormulaRecordAggregate)_record).setCachedDoubleResult(value);
-                    break;
-            }
-        }
-
-    }
-
-    /**
-     * set a date value for the cell. Excel treats dates as numeric so you will need to format the cell as
-     * a date.
-     *
-     * @param value  the date value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    public void setCellValue(Date value)
-    {
-        setCellValue(HSSFDateUtil.getExcelDate(value, _book.getWorkbook().isUsing1904DateWindowing()));
-    }
-
-    /**
-     * set a date value for the cell. Excel treats dates as numeric so you will need to format the cell as
-     * a date.
-     *
-     * This will set the cell value based on the Calendar's timezone. As Excel
-     * does not support timezones this means that both 20:00+03:00 and
-     * 20:00-03:00 will be reported as the same value (20:00) even that there
-     * are 6 hours difference between the two times. This difference can be
-     * preserved by using <code>setCellValue(value.getTime())</code> which will
-     * automatically shift the times to the default timezone.
-     *
-     * @param value  the date value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For othertypes we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    public void setCellValue(Calendar value)
-    {
-        setCellValue( HSSFDateUtil.getExcelDate(value, _book.getWorkbook().isUsing1904DateWindowing()) );
-    }
-
-    /**
-     * set a string value for the cell.
-     *
-     * @param value value to set the cell to.  For formulas we'll set the formula
-     * cached string result, for String cells we'll set its value. For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is null then we will change the cell to a Blank cell.
-     */
-    public void setCellValue(String value) {
-        HSSFRichTextString str = value == null ? null :  new HSSFRichTextString(value);
-        setCellValue(str);
-    }
-
-    /**
-     * Set a string value for the cell.
-     *
-     * @param value  value to set the cell to.  For formulas we'll set the formula
-     * string, for String cells we'll set its value.  For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is <code>null</code> then we will change the cell to a Blank cell.
-     */
-
-    public void setCellValue(RichTextString value)
-    {
-        int row=_record.getRow();
-        short col=_record.getColumn();
-        short styleIndex=_record.getXFIndex();
-        if (value == null)
-        {
-            notifyFormulaChanging();
-            setCellType(CellType.BLANK, false, row, col, styleIndex);
-            return;
-        }
-
-        if(value.length() > SpreadsheetVersion.EXCEL97.getMaxTextLength()){
-            throw new IllegalArgumentException("The maximum length of cell contents (text) is 32,767 characters");
-        }
-
-        if (_cellType == CellType.FORMULA) {
-            // Set the 'pre-evaluated result' for the formula
-            // note - formulas do not preserve text formatting.
-            FormulaRecordAggregate fr = (FormulaRecordAggregate) _record;
-            fr.setCachedStringResult(value.getString());
-            // Update our local cache to the un-formatted version
-            _stringValue = new HSSFRichTextString(value.getString());
-
-            // All done
-            return;
-        }
-
-        // If we get here, we're not dealing with a formula,
-        //  so handle things as a normal rich text cell
-
-        if (_cellType != CellType.STRING) {
-            setCellType(CellType.STRING, false, row, col, styleIndex);
-        }
-        int index = 0;
-
-        HSSFRichTextString hvalue = (HSSFRichTextString) value;
-        UnicodeString str = hvalue.getUnicodeString();
-        index = _book.getWorkbook().addSSTString(str);
-        (( LabelSSTRecord ) _record).setSSTIndex(index);
-        _stringValue = hvalue;
-        _stringValue.setWorkbookReferences(_book.getWorkbook(), (( LabelSSTRecord ) _record));
-        _stringValue.setUnicodeString(_book.getWorkbook().getSSTString(index));
-    }
-
-    public void setCellFormula(String formula) {
-        if(isPartOfArrayFormulaGroup()){
-            notifyArrayFormulaChanging();
-        }
-
-        int row=_record.getRow();
-        short col=_record.getColumn();
-        short styleIndex=_record.getXFIndex();
-
-        if (formula==null) {
-            notifyFormulaChanging();
-            setCellType(CellType.BLANK, false, row, col, styleIndex);
-            return;
-        }
-        int sheetIndex = _book.getSheetIndex(_sheet);
-        Ptg[] ptgs = HSSFFormulaParser.parse(formula, _book, FormulaType.CELL, sheetIndex);
-        setCellType(CellType.FORMULA, false, row, col, styleIndex);
-        FormulaRecordAggregate agg = (FormulaRecordAggregate) _record;
-        FormulaRecord frec = agg.getFormulaRecord();
-        frec.setOptions((short) 2);
-        frec.setValue(0);
-
-        //only set to default if there is no extended format index already set
-        if (agg.getXFIndex() == (short)0) {
-            agg.setXFIndex((short) 0x0f);
-        }
-        agg.setParsedExpression(ptgs);
-    }
-    /**
-     * Should be called any time that a formula could potentially be deleted.
-     * Does nothing if this cell currently does not hold a formula
-     */
-    private void notifyFormulaChanging() {
-        if (_record instanceof FormulaRecordAggregate) {
-            ((FormulaRecordAggregate)_record).notifyFormulaChanging();
-        }
-    }
-
-    public String getCellFormula() {
-        if (!(_record instanceof FormulaRecordAggregate)) {
-            throw typeMismatch(CellType.FORMULA, _cellType, true);
-        }
-        return HSSFFormulaParser.toFormulaString(_book, ((FormulaRecordAggregate)_record).getFormulaTokens());
-    }
-
-    private static RuntimeException typeMismatch(CellType expectedTypeCode, CellType actualTypeCode, boolean isFormulaCell) {
-        String msg = "Cannot get a " + expectedTypeCode + " value from a " + actualTypeCode
-            + " " + (isFormulaCell ? "formula " : "") + "cell";
-        return new IllegalStateException(msg);
-    }
-    private static void checkFormulaCachedValueType(CellType expectedTypeCode, FormulaRecord fr) {
-        CellType cachedValueType = CellType.forInt(fr.getCachedResultType());
-        if (cachedValueType != expectedTypeCode) {
-            throw typeMismatch(expectedTypeCode, cachedValueType, true);
-        }
-    }
-
-    /**
-     * Get the value of the cell as a number.
-     * For strings we throw an exception.
-     * For blank cells we return a 0.
-     * See {@link HSSFDataFormatter} for turning this
-     *  number into a string similar to that which
-     *  Excel would render this number as.
-     */
-    public double getNumericCellValue() {
-
-        switch(_cellType) {
-            case BLANK:
-                return 0.0;
-            case NUMERIC:
-                return ((NumberRecord)_record).getValue();
-            default:
-                throw typeMismatch(CellType.NUMERIC, _cellType, false);
-            case FORMULA:
-                break;
-        }
-        FormulaRecord fr = ((FormulaRecordAggregate)_record).getFormulaRecord();
-        checkFormulaCachedValueType(CellType.NUMERIC, fr);
-        return fr.getValue();
-    }
-
-    /**
-     * Get the value of the cell as a date.
-     * For strings we throw an exception.
-     * For blank cells we return a null.
-     * See {@link HSSFDataFormatter} for formatting
-     *  this date into a string similar to how excel does.
-     */
-    public Date getDateCellValue() {
-
-        if (_cellType == CellType.BLANK) {
-            return null;
-        }
-        double value = getNumericCellValue();
-        if (_book.getWorkbook().isUsing1904DateWindowing()) {
-            return HSSFDateUtil.getJavaDate(value, true);
-        }
-        return HSSFDateUtil.getJavaDate(value, false);
-    }
-
-    /**
-     * get the value of the cell as a string - for numeric cells we throw an exception.
-     * For blank cells we return an empty string.
-     * For formulaCells that are not string Formulas, we throw an exception
-     */
-    public String getStringCellValue()
-    {
-      HSSFRichTextString str = getRichStringCellValue();
-      return str.getString();
-    }
-
-    /**
-     * get the value of the cell as a string - for numeric cells we throw an exception.
-     * For blank cells we return an empty string.
-     * For formulaCells that are not string Formulas, we throw an exception
-     */
-    public HSSFRichTextString getRichStringCellValue() {
-
-        switch(_cellType) {
-            case BLANK:
-                return new HSSFRichTextString("");
-            case STRING:
-                return _stringValue;
-            default:
-                throw typeMismatch(CellType.STRING, _cellType, false);
-            case FORMULA:
-                break;
-        }
-        FormulaRecordAggregate fra = ((FormulaRecordAggregate)_record);
-        checkFormulaCachedValueType(CellType.STRING, fra.getFormulaRecord());
-        String strVal = fra.getStringValue();
-        return new HSSFRichTextString(strVal == null ? "" : strVal);
-    }
-
-    /**
-     * set a boolean value for the cell
-     *
-     * @param value the boolean value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for booleans we'll set its value. For other types we
-     *        will change the cell to a boolean cell and set its value.
-     */
-    @SuppressWarnings("fallthrough")
-    public void setCellValue(boolean value) {
-        int row=_record.getRow();
-        short col=_record.getColumn();
-        short styleIndex=_record.getXFIndex();
-
-        switch (_cellType) {
-            default:
-                setCellType(CellType.BOOLEAN, false, row, col, styleIndex);
-                // fall through
-            case BOOLEAN:
-                (( BoolErrRecord ) _record).setValue(value);
-                break;
-            case FORMULA:
-                ((FormulaRecordAggregate)_record).setCachedBooleanResult(value);
-                break;
-        }
-    }
-
-    /**
-     * set a error value for the cell
-     *
-     * @param errorCode the error value to set this cell to.  For formulas we'll set the
-     *        precalculated value , for errors we'll set
-     *        its value. For other types we will change the cell to an error
-     *        cell and set its value.
-     *        For error code byte, see {@link FormulaError}.
-     * @deprecated 3.15 beta 2. Use {@link #setCellErrorValue(FormulaError)} instead.
-     */
-    public void setCellErrorValue(byte errorCode) {
-        FormulaError error = FormulaError.forInt(errorCode);
-        setCellErrorValue(error);
-    }
-    /**
-     * set a error value for the cell
-     *
-     * @param error the error value to set this cell to.  For formulas we'll set the
-     *        precalculated value , for errors we'll set
-     *        its value. For other types we will change the cell to an error
-     *        cell and set its value.
-     */
-    @SuppressWarnings("fallthrough")
-    public void setCellErrorValue(FormulaError error) {
-        int row=_record.getRow();
-        short col=_record.getColumn();
-        short styleIndex=_record.getXFIndex();
-        switch (_cellType) {
-            default:
-                setCellType(CellType.ERROR, false, row, col, styleIndex);
-                // fall through
-            case ERROR:
-                (( BoolErrRecord ) _record).setValue(error);
-                break;
-            case FORMULA:
-                ((FormulaRecordAggregate)_record).setCachedErrorResult(error.getCode());
-                break;
-        }
-    }
-
-
-    /**
-     * Chooses a new boolean value for the cell when its type is changing.<p/>
-     *
-     * Usually the caller is calling setCellType() with the intention of calling
-     * setCellValue(boolean) straight afterwards.  This method only exists to give
-     * the cell a somewhat reasonable value until the setCellValue() call (if at all).
-     * TODO - perhaps a method like setCellTypeAndValue(int, Object) should be introduced to avoid this
-     */
-    private boolean convertCellValueToBoolean() {
-
-        switch (_cellType) {
-            case BOOLEAN:
-                return (( BoolErrRecord ) _record).getBooleanValue();
-            case STRING:
-                int sstIndex = ((LabelSSTRecord)_record).getSSTIndex();
-                String text = _book.getWorkbook().getSSTString(sstIndex).getString();
-                return Boolean.valueOf(text).booleanValue();
-            case NUMERIC:
-                return ((NumberRecord)_record).getValue() != 0;
-
-            case FORMULA:
-                // use cached formula result if it's the right type:
-                FormulaRecord fr = ((FormulaRecordAggregate)_record).getFormulaRecord();
-                checkFormulaCachedValueType(CellType.BOOLEAN, fr);
-                return fr.getCachedBooleanValue();
-            // Other cases convert to false
-            // These choices are not well justified.
-            case ERROR:
-            case BLANK:
-                return false;
-        }
-        throw new RuntimeException("Unexpected cell type (" + _cellType + ")");
-    }
-    private String convertCellValueToString() {
-
-        switch (_cellType) {
-            case BLANK:
-                return "";
-            case BOOLEAN:
-                return ((BoolErrRecord) _record).getBooleanValue() ? "TRUE" : "FALSE";
-            case STRING:
-                int sstIndex = ((LabelSSTRecord)_record).getSSTIndex();
-                return _book.getWorkbook().getSSTString(sstIndex).getString();
-            case NUMERIC:
-                return NumberToTextConverter.toText(((NumberRecord)_record).getValue());
-            case ERROR:
-                   return FormulaError.forInt(((BoolErrRecord)_record).getErrorValue()).getString();
-            case FORMULA:
-                // should really evaluate, but HSSFCell can't call HSSFFormulaEvaluator
-                // just use cached formula result instead
-                break;
-            default:
-                throw new IllegalStateException("Unexpected cell type (" + _cellType + ")");
-        }
-        FormulaRecordAggregate fra = ((FormulaRecordAggregate)_record);
-        FormulaRecord fr = fra.getFormulaRecord();
-        switch (CellType.forInt(fr.getCachedResultType())) {
-            case BOOLEAN:
-                return fr.getCachedBooleanValue() ? "TRUE" : "FALSE";
-            case STRING:
-                return fra.getStringValue();
-            case NUMERIC:
-                return NumberToTextConverter.toText(fr.getValue());
-            case ERROR:
-                return FormulaError.forInt(fr.getCachedErrorValue()).getString();
-            default:
-                throw new IllegalStateException("Unexpected formula result type (" + _cellType + ")");
-        }
-        
-    }
-
-    /**
-     * get the value of the cell as a boolean.  For strings, numbers, and errors, we throw an exception.
-     * For blank cells we return a false.
-     */
-    @Override
-    public boolean getBooleanCellValue() {
-
-        switch(_cellType) {
-            case BLANK:
-                return false;
-            case BOOLEAN:
-                return (( BoolErrRecord ) _record).getBooleanValue();
-            case FORMULA:
-                break;
-            default:
-                throw typeMismatch(CellType.BOOLEAN, _cellType, false);
-        }
-        FormulaRecord fr = ((FormulaRecordAggregate)_record).getFormulaRecord();
-        checkFormulaCachedValueType(CellType.BOOLEAN, fr);
-        return fr.getCachedBooleanValue();
-    }
-
-    /**
-     * get the value of the cell as an error code.  For strings, numbers, and booleans, we throw an exception.
-     * For blank cells we return a 0.
-     */
-    @Override
-    public byte getErrorCellValue() {
-        switch(_cellType) {
-            case ERROR:
-                return (( BoolErrRecord ) _record).getErrorValue();
-            case FORMULA:
-                break;
-            default:
-                throw typeMismatch(CellType.ERROR, _cellType, false);
-        }
-        FormulaRecord fr = ((FormulaRecordAggregate)_record).getFormulaRecord();
-        checkFormulaCachedValueType(CellType.ERROR, fr);
-        return (byte) fr.getCachedErrorValue();
-    }
-
-    /**
-     * <p>Set the style for the cell.  The style should be an HSSFCellStyle created/retreived from
-     * the HSSFWorkbook.</p>
-     * 
-     * <p>To change the style of a cell without affecting other cells that use the same style,
-     * use {@link org.apache.poi.ss.util.CellUtil#setCellStyleProperties(org.apache.poi.ss.usermodel.Cell, java.util.Map)}</p>
-     *
-     * @param style  reference contained in the workbook
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createCellStyle()
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getCellStyleAt(int)
-     */
-    public void setCellStyle(CellStyle style) {
-        setCellStyle( (HSSFCellStyle)style );
-    }
-    public void setCellStyle(HSSFCellStyle style) {
-        // A style of null means resetting back to the default style
-        if (style == null) {
-            _record.setXFIndex((short)0xf);
-            return;
-        }
-
-        // Verify the style really does belong to our workbook
-        style.verifyBelongsToWorkbook(_book);
-
-        short styleIndex;
-        if(style.getUserStyleName() != null) {
-            styleIndex = applyUserCellStyle(style);
-        } else {
-            styleIndex = style.getIndex();
-        }
-
-        // Change our cell record to use this style
-        _record.setXFIndex(styleIndex);
-    }
-
-    /**
-     * get the style for the cell.  This is a reference to a cell style contained in the workbook
-     * object.
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getCellStyleAt(int)
-     */
-    public HSSFCellStyle getCellStyle()
-    {
-      short styleIndex=_record.getXFIndex();
-      ExtendedFormatRecord xf = _book.getWorkbook().getExFormatAt(styleIndex);
-      return new HSSFCellStyle(styleIndex, xf, _book);
-    }
-
-    /**
-     * Should only be used by HSSFSheet and friends.  Returns the low level CellValueRecordInterface record
-     *
-     * @return CellValueRecordInterface representing the cell via the low level api.
-     */
-
-    protected CellValueRecordInterface getCellValueRecord()
-    {
-        return _record;
-    }
-
-    /**
-     * @throws RuntimeException if the bounds are exceeded.
-     */
-    private static void checkBounds(int cellIndex) {
-        if (cellIndex < 0 || cellIndex > LAST_COLUMN_NUMBER) {
-            throw new IllegalArgumentException("Invalid column index (" + cellIndex
-                    + ").  Allowable column range for " + FILE_FORMAT_NAME + " is (0.."
-                    + LAST_COLUMN_NUMBER + ") or ('A'..'" + LAST_COLUMN_NAME + "')");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setAsActiveCell()
-    {
-        int row=_record.getRow();
-        short col=_record.getColumn();
-        _sheet.getSheet().setActiveCellRow(row);
-        _sheet.getSheet().setActiveCellCol(col);
-    }
-
-    /**
-     * Returns a string representation of the cell
-     *
-     * This method returns a simple representation,
-     * anything more complex should be in user code, with
-     * knowledge of the semantics of the sheet being processed.
-     *
-     * Formula cells return the formula string,
-     * rather than the formula result.
-     * Dates are displayed in dd-MMM-yyyy format
-     * Errors are displayed as #ERR&lt;errIdx&gt;
-     */
-    public String toString() {
-        switch (getCellTypeEnum()) {
-            case BLANK:
-                return "";
-            case BOOLEAN:
-                return getBooleanCellValue()?"TRUE":"FALSE";
-            case ERROR:
-                return ErrorEval.getText((( BoolErrRecord ) _record).getErrorValue());
-            case FORMULA:
-                return getCellFormula();
-            case NUMERIC:
-                //TODO apply the dataformat for this cell
-                if (HSSFDateUtil.isCellDateFormatted(this)) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("dd-MMM-yyyy", LocaleUtil.getUserLocale());
-                    sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-                    return sdf.format(getDateCellValue());
-                }
-				return  String.valueOf(getNumericCellValue());
-            case STRING:
-                return getStringCellValue();
-            default:
-                return "Unknown Cell Type: " + getCellTypeEnum();
-        }
-    }
-
-    /**
-     * Assign a comment to this cell. If the supplied
-     *  comment is null, the comment for this cell
-     *  will be removed.
-     *
-     * @param comment comment associated with this cell
-     */
-    public void setCellComment(Comment comment){
-        if(comment == null) {
-            removeCellComment();
-            return;
-        }
-
-        comment.setRow(_record.getRow());
-        comment.setColumn(_record.getColumn());
-        _comment = (HSSFComment)comment;
-    }
-
-    /**
-     * Returns comment associated with this cell
-     *
-     * @return comment associated with this cell
-     */
-     public HSSFComment getCellComment(){
-        if (_comment == null) {
-            _comment = _sheet.findCellComment(_record.getRow(), _record.getColumn());
-        }
-        return _comment;
-    }
-
-    /**
-     * Removes the comment for this cell, if
-     *  there is one.
-     * WARNING - some versions of excel will loose
-     *  all comments after performing this action!
-     */
-    public void removeCellComment() {
-        HSSFComment comment = _sheet.findCellComment(_record.getRow(), _record.getColumn());
-        _comment = null;
-        if (null == comment){
-            return;
-        }
-        _sheet.getDrawingPatriarch().removeShape(comment);
-    }
-
-    /**
-     * @return hyperlink associated with this cell or <code>null</code> if not found
-     */
-    @Override
-    public HSSFHyperlink getHyperlink(){
-        return _sheet.getHyperlink(_record.getRow(), _record.getColumn());
-    }
-
-    /**
-     * Assign a hyperlink to this cell. If the supplied hyperlink is null, the
-     * hyperlink for this cell will be removed.
-     *
-     * @param hyperlink hyperlink associated with this cell
-     */
-    @Override
-    public void setHyperlink(Hyperlink hyperlink){
-        if (hyperlink == null) {
-            removeHyperlink();
-            return;
-        }
-
-        HSSFHyperlink link = (HSSFHyperlink)hyperlink;
-
-        link.setFirstRow(_record.getRow());
-        link.setLastRow(_record.getRow());
-        link.setFirstColumn(_record.getColumn());
-        link.setLastColumn(_record.getColumn());
-
-        switch(link.getTypeEnum()){
-            case EMAIL:
-            case URL:
-                link.setLabel("url");
-                break;
-            case FILE:
-                link.setLabel("file");
-                break;
-            case DOCUMENT:
-                link.setLabel("place");
-                break;
-            default:
-                break;
-        }
-
-        List<RecordBase> records = _sheet.getSheet().getRecords();
-        int eofLoc = records.size() - 1;
-        records.add( eofLoc, link.record );
-    }
-
-    /**
-     * Removes the hyperlink for this cell, if there is one.
-     */
-    public void removeHyperlink() {
-        for (Iterator<RecordBase> it = _sheet.getSheet().getRecords().iterator(); it.hasNext();) {
-            RecordBase rec = it.next();
-            if (rec instanceof HyperlinkRecord) {
-                HyperlinkRecord link = (HyperlinkRecord) rec;
-                if (link.getFirstColumn() == _record.getColumn() && link.getFirstRow() == _record.getRow()) {
-                    it.remove();
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Only valid for formula cells
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     * 
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCachedFormulaResultType() {
-        return getCachedFormulaResultTypeEnum().getCode();
-    }
-
-    /**
-     * Only valid for formula cells
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @since POI 3.15 beta 3
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Override
-    public CellType getCachedFormulaResultTypeEnum() {
-        if (_cellType != CellType.FORMULA) {
-            throw new IllegalStateException("Only formula cells have cached results");
-        }
-        int code = ((FormulaRecordAggregate)_record).getFormulaRecord().getCachedResultType();
-        return CellType.forInt(code);
-    }
-
-    void setCellArrayFormula(CellRangeAddress range) {
-        int row = _record.getRow();
-        short col = _record.getColumn();
-        short styleIndex = _record.getXFIndex();
-        setCellType(CellType.FORMULA, false, row, col, styleIndex);
-
-        // Billet for formula in rec
-        Ptg[] ptgsForCell = {new ExpPtg(range.getFirstRow(), range.getFirstColumn())};
-        FormulaRecordAggregate agg = (FormulaRecordAggregate) _record;
-        agg.setParsedExpression(ptgsForCell);
-    }
-
-    public CellRangeAddress getArrayFormulaRange() {
-        if (_cellType != CellType.FORMULA) {
-            String ref = new CellReference(this).formatAsString();
-            throw new IllegalStateException("Cell " + ref
-                    + " is not part of an array formula.");
-        }
-        return ((FormulaRecordAggregate)_record).getArrayFormulaRange();
-    }
-
-    public boolean isPartOfArrayFormulaGroup() {
-        if (_cellType != CellType.FORMULA) {
-            return false;
-        }
-        return ((FormulaRecordAggregate)_record).isPartOfArrayFormula();
-    }
-
-    /**
-     * The purpose of this method is to validate the cell state prior to modification
-     *
-     * @see #notifyArrayFormulaChanging()
-     */
-    void notifyArrayFormulaChanging(String msg){
-        CellRangeAddress cra = getArrayFormulaRange();
-        if(cra.getNumberOfCells() > 1) {
-            throw new IllegalStateException(msg);
-        }
-        //un-register the single-cell array formula from the parent XSSFSheet
-        getRow().getSheet().removeArrayFormula(this);
-    }
-
-    /**
-     * Called when this cell is modified.
-     * <p>
-     * The purpose of this method is to validate the cell state prior to modification.
-     * </p>
-     *
-     * @see #setCellType(int)
-     * @see #setCellFormula(String)
-     * @see HSSFRow#removeCell(org.apache.poi.ss.usermodel.Cell)
-     * @see org.apache.poi.hssf.usermodel.HSSFSheet#removeRow(org.apache.poi.ss.usermodel.Row)
-     * @see org.apache.poi.hssf.usermodel.HSSFSheet#shiftRows(int, int, int)
-     * @see org.apache.poi.hssf.usermodel.HSSFSheet#addMergedRegion(org.apache.poi.ss.util.CellRangeAddress)
-     * @throws IllegalStateException if modification is not allowed
-     */
-    void notifyArrayFormulaChanging(){
-        CellReference ref = new CellReference(this);
-        String msg = "Cell "+ref.formatAsString()+" is part of a multi-cell array formula. " +
-                "You cannot change part of an array.";
-        notifyArrayFormulaChanging(msg);
-    }
-
-    /**
-     * Applying a user-defined style (UDS) is special. Excel does not directly reference user-defined styles, but
-     * instead create a 'proxy' ExtendedFormatRecord referencing the UDS as parent.
-     *
-     * The proceudre to apply a UDS is as follows:
-     *
-     * 1. search for a ExtendedFormatRecord with parentIndex == style.getIndex()
-     *    and xfType ==  ExtendedFormatRecord.XF_CELL.
-     * 2. if not found then create a new ExtendedFormatRecord and copy all attributes from the user-defined style
-     *    and set the parentIndex to be style.getIndex()
-     * 3. return the index of the ExtendedFormatRecord, this will be assigned to the parent cell record
-     *
-     * @param style  the user style to apply
-     *
-     * @return  the index of a ExtendedFormatRecord record that will be referenced by the cell
-     */
-    private short applyUserCellStyle(HSSFCellStyle style){
-        if(style.getUserStyleName() == null) {
-            throw new IllegalArgumentException("Expected user-defined style");
-        }
-
-        InternalWorkbook iwb = _book.getWorkbook();
-        short userXf = -1;
-        int numfmt = iwb.getNumExFormats();
-        for(short i = 0; i < numfmt; i++){
-            ExtendedFormatRecord xf = iwb.getExFormatAt(i);
-            if(xf.getXFType() == ExtendedFormatRecord.XF_CELL && xf.getParentIndex() == style.getIndex() ){
-                userXf = i;
-                break;
-            }
-        }
-        short styleIndex;
-        if (userXf == -1){
-            ExtendedFormatRecord xfr = iwb.createCellXF();
-            xfr.cloneStyleFrom(iwb.getExFormatAt(style.getIndex()));
-            xfr.setIndentionOptions((short)0);
-            xfr.setXFType(ExtendedFormatRecord.XF_CELL);
-            xfr.setParentIndex(style.getIndex());
-            styleIndex = (short)numfmt;
-        } else {
-            styleIndex = userXf;
-        }
-
-        return styleIndex;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
deleted file mode 100644
index 542ee22..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ /dev/null
@@ -1,1136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.List;
-
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.hssf.record.StyleRecord;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.util.Removal;
-
-/**
- * High level representation of the style of a cell in a sheet of a workbook.
- *
- * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createCellStyle()
- * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getCellStyleAt(int)
- * @see org.apache.poi.hssf.usermodel.HSSFCell#setCellStyle(HSSFCellStyle)
- */
-public final class HSSFCellStyle implements CellStyle {
-    private final ExtendedFormatRecord _format;
-    private final short                _index;
-    private final InternalWorkbook     _workbook;
-
-
-    /** Creates new HSSFCellStyle why would you want to do this?? */
-    protected HSSFCellStyle(short index, ExtendedFormatRecord rec, HSSFWorkbook workbook)
-    {
-        this(index, rec, workbook.getWorkbook());
-    }
-    protected HSSFCellStyle(short index, ExtendedFormatRecord rec, InternalWorkbook workbook)
-    {
-        _workbook = workbook;
-        _index = index;
-        _format     = rec;
-    }
-
-    /**
-     * get the index within the HSSFWorkbook (sequence within the collection of ExtnededFormat objects)
-     * @return unique index number of the underlying record this style represents (probably you don't care
-     *  unless you're comparing which one is which)
-     */
-    @Override
-    public short getIndex()
-    {
-        return _index;
-    }
-
-    /**
-     * Return the parent style for this cell style.
-     * In most cases this will be null, but in a few
-     *  cases there'll be a fully defined parent.
-     */
-    public HSSFCellStyle getParentStyle() {
-        short parentIndex = _format.getParentIndex();
-        // parentIndex equal 0xFFF indicates no inheritance from a cell style XF (See 2.4.353 XF)
-        if(parentIndex == 0 || parentIndex == 0xFFF) {
-            return null;
-        }
-        return new HSSFCellStyle(
-                parentIndex,
-                _workbook.getExFormatAt(parentIndex),
-                _workbook
-        );
-    }
-
-    /**
-     * set the data format (must be a valid format)
-     * @see org.apache.poi.hssf.usermodel.HSSFDataFormat
-     */
-    @Override
-    public void setDataFormat(short fmt)
-    {
-        _format.setFormatIndex(fmt);
-    }
-
-    /**
-     * get the index of the format
-     * @see org.apache.poi.hssf.usermodel.HSSFDataFormat
-     */
-    @Override
-    public short getDataFormat()
-    {
-        return _format.getFormatIndex();
-    }
-
-    // we keep the cached data in ThreadLocal members in order to
-    // avoid multi-threading issues when different workbooks are accessed in 
-    // multiple threads at the same time
-    private static final ThreadLocal<Short> lastDateFormat = new ThreadLocal<Short>() {
-        protected Short initialValue() {
-            return Short.MIN_VALUE;
-        }
-    };
-    private static final ThreadLocal<List<FormatRecord>> lastFormats = new ThreadLocal<List<FormatRecord>>();
-    private static final ThreadLocal<String> getDataFormatStringCache = new ThreadLocal<String>();
-
-    /**
-     * Get the contents of the format string, by looking up
-     *  the DataFormat against the bound workbook
-     * @see org.apache.poi.hssf.usermodel.HSSFDataFormat
-     * @return the format string or "General" if not found
-     */
-    @Override
-    public String getDataFormatString() {
-        if (getDataFormatStringCache.get() != null) {
-            if (lastDateFormat.get() == getDataFormat() && _workbook.getFormats().equals(lastFormats.get())) {
-                return getDataFormatStringCache.get();
-            }
-        }
-
-        lastFormats.set(_workbook.getFormats());
-        lastDateFormat.set(getDataFormat());
-
-        getDataFormatStringCache.set(getDataFormatString(_workbook));
-
-        return getDataFormatStringCache.get();
-    }
-
-    /**
-     * Get the contents of the format string, by looking up
-     *  the DataFormat against the supplied workbook
-     * @see org.apache.poi.hssf.usermodel.HSSFDataFormat
-     *
-     * @return the format string or "General" if not found
-     */
-    public String getDataFormatString(org.apache.poi.ss.usermodel.Workbook workbook) {
-        HSSFDataFormat format = new HSSFDataFormat( ((HSSFWorkbook)workbook).getWorkbook() );
-
-        int idx = getDataFormat();
-        return idx == -1 ? "General" : format.getFormat(getDataFormat());
-    }
-    /**
-     * Get the contents of the format string, by looking up
-     *  the DataFormat against the supplied low level workbook
-     * @see org.apache.poi.hssf.usermodel.HSSFDataFormat
-     */
-    public String getDataFormatString(org.apache.poi.hssf.model.InternalWorkbook workbook) {
-        HSSFDataFormat format = new HSSFDataFormat( workbook );
-
-        return format.getFormat(getDataFormat());
-    }
-
-    /**
-     * set the font for this style
-     * @param font  a font object created or retreived from the HSSFWorkbook object
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createFont()
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(short)
-     */
-    @Override
-    public void setFont(Font font) {
-        setFont((HSSFFont)font);
-    }
-    public void setFont(HSSFFont font) {
-        _format.setIndentNotParentFont(true);
-        short fontindex = font.getIndex();
-        _format.setFontIndex(fontindex);
-    }
-
-    /**
-     * gets the index of the font for this style
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(short)
-     */
-    @Override
-    public short getFontIndex()
-    {
-        return _format.getFontIndex();
-    }
-
-    /**
-     * gets the font for this style
-     * @param parentWorkbook The HSSFWorkbook that this style belongs to
-     * @see org.apache.poi.hssf.usermodel.HSSFCellStyle#getFontIndex()
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(short)
-     */
-    public HSSFFont getFont(org.apache.poi.ss.usermodel.Workbook parentWorkbook) {
-        return ((HSSFWorkbook) parentWorkbook).getFontAt(getFontIndex());
-    }
-
-    /**
-     * set the cell's using this style to be hidden
-     * @param hidden - whether the cell using this style should be hidden
-     */
-    @Override
-    public void setHidden(boolean hidden)
-    {
-        _format.setIndentNotParentCellOptions(true);
-        _format.setHidden(hidden);
-    }
-
-    /**
-     * get whether the cell's using this style are to be hidden
-     * @return hidden - whether the cell using this style should be hidden
-     */
-    @Override
-    public boolean getHidden()
-    {
-        return _format.isHidden();
-    }
-
-    /**
-     * set the cell's using this style to be locked
-     * @param locked - whether the cell using this style should be locked
-     */
-    @Override
-    public void setLocked(boolean locked)
-    {
-        _format.setIndentNotParentCellOptions(true);
-        _format.setLocked(locked);
-    }
-
-    /**
-     * get whether the cell's using this style are to be locked
-     * @return hidden - whether the cell using this style should be locked
-     */
-    @Override
-    public boolean getLocked()
-    {
-        return _format.isLocked();
-    }
-
-    /**
-     * Turn on or off "Quote Prefix" or "123 Prefix" for the style,
-     *  which is used to tell Excel that the thing which looks like
-     *  a number or a formula shouldn't be treated as on.
-     */
-    @Override
-    public void setQuotePrefixed(boolean quotePrefix) {
-        _format.set123Prefix(quotePrefix);
-    }
-    
-    /**
-     * Is "Quote Prefix" or "123 Prefix" enabled for the cell?
-     */
-    @Override
-    public boolean getQuotePrefixed() {
-        return _format.get123Prefix();
-    }
-    
-    /**
-     * set the type of horizontal alignment for the cell
-     * @param align - the type of alignment
-     * @see #ALIGN_GENERAL
-     * @see #ALIGN_LEFT
-     * @see #ALIGN_CENTER
-     * @see #ALIGN_RIGHT
-     * @see #ALIGN_FILL
-     * @see #ALIGN_JUSTIFY
-     * @see #ALIGN_CENTER_SELECTION
-     * @deprecated POI 3.15 beta 3. Use {@link #setAlignment(HorizontalAlignment)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setAlignment(short align)
-    {
-        _format.setIndentNotParentAlignment(true);
-        _format.setAlignment(align);
-    }
-    /**
-     * set the type of horizontal alignment for the cell
-     * @param align - the type of alignment
-     */
-    @Override
-    public void setAlignment(HorizontalAlignment align)
-    {
-        _format.setIndentNotParentAlignment(true);
-        _format.setAlignment(align.getCode());
-    }
-
-    /**
-     * get the type of horizontal alignment for the cell
-     * @return align - the type of alignment
-     * @see #ALIGN_GENERAL
-     * @see #ALIGN_LEFT
-     * @see #ALIGN_CENTER
-     * @see #ALIGN_RIGHT
-     * @see #ALIGN_FILL
-     * @see #ALIGN_JUSTIFY
-     * @see #ALIGN_CENTER_SELECTION
-     * @deprecated POI 3.15 beta 3. Use {@link #getAlignmentEnum()} instead.
-     */
-    @Override
-    public short getAlignment()
-    {
-        return _format.getAlignment();
-    }
-    /**
-     * get the type of horizontal alignment for the cell
-     * @return align - the type of alignment
-     */
-    @Override
-    public HorizontalAlignment getAlignmentEnum()
-    {
-        return HorizontalAlignment.forInt(_format.getAlignment());
-    }
-
-    /**
-     * set whether the text should be wrapped
-     * @param wrapped  wrap text or not
-     */
-    @Override
-    public void setWrapText(boolean wrapped)
-    {
-        _format.setIndentNotParentAlignment(true);
-        _format.setWrapText(wrapped);
-    }
-
-    /**
-     * get whether the text should be wrapped
-     * @return wrap text or not
-     */
-    @Override
-    public boolean getWrapText()
-    {
-        return _format.getWrapText();
-    }
-
-    /**
-     * set the type of vertical alignment for the cell
-     * @param align the type of alignment
-     * @see #VERTICAL_TOP
-     * @see #VERTICAL_CENTER
-     * @see #VERTICAL_BOTTOM
-     * @see #VERTICAL_JUSTIFY
-     * @see VerticalAlignment
-     * @deprecated POI 3.15 beta 3. Use {@link #setVerticalAlignment(VerticalAlignment)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setVerticalAlignment(short align)
-    {
-        _format.setVerticalAlignment(align);
-    }
-    /**
-     * set the type of vertical alignment for the cell
-     * @param align the type of alignment
-     */
-    @Override
-    public void setVerticalAlignment(VerticalAlignment align)
-    {
-        _format.setVerticalAlignment(align.getCode());
-    }
-
-    /**
-     * get the type of vertical alignment for the cell
-     * @return align the type of alignment
-     * @see #VERTICAL_TOP
-     * @see #VERTICAL_CENTER
-     * @see #VERTICAL_BOTTOM
-     * @see #VERTICAL_JUSTIFY
-     * @see VerticalAlignment
-     * @deprecated POI 3.15 beta 3. Use {@link #getVerticalAlignmentEnum()} instead.
-     */
-    @Override
-    public short getVerticalAlignment()
-    {
-        return _format.getVerticalAlignment();
-    }
-   /**
-    * get the type of vertical alignment for the cell
-    * @return align the type of alignment
-    */
-   @Override
-   public VerticalAlignment getVerticalAlignmentEnum()
-   {
-       return VerticalAlignment.forInt(_format.getVerticalAlignment());
-   }
-
-    /**
-     * set the degree of rotation for the text in the cell
-     *
-     * Note: HSSF uses values from -90 to 90 degrees, whereas XSSF 
-     * uses values from 0 to 180 degrees. The implementations of this method will map between these two value-ranges 
-     * accordingly, however the corresponding getter is returning values in the range mandated by the current type
-     * of Excel file-format that this CellStyle is applied to.
-     *
-     * @param rotation degrees (between -90 and 90 degrees, of 0xff for vertical)
-     */
-    @Override
-    public void setRotation(short rotation)
-    {
-      if (rotation == 0xff) {
-          // Special cases for vertically aligned text
-      } 
-      else if ((rotation < 0)&&(rotation >= -90)) {
-        //Take care of the funny 4th quadrant issue
-        //The 4th quadrant (-1 to -90) is stored as (91 to 180)
-        rotation = (short)(90 - rotation);
-      }
-      else if (rotation > 90 && rotation <= 180) {
-          // stay compatible with the range used by XSSF, map from ]90..180] to ]0..-90]
-          // we actually don't need to do anything here as the internal value is stored in [0-180] anyway!
-      }
-      else if ((rotation < -90)  || (rotation > 90)) {
-        //Do not allow an incorrect rotation to be set
-        throw new IllegalArgumentException("The rotation must be between -90 and 90 degrees, or 0xff");
-      }
-      _format.setRotation(rotation);
-    }
-
-    /**
-     * get the degree of rotation for the text in the cell
-     * @return rotation degrees (between -90 and 90 degrees, or 0xff for vertical)
-     */
-    @Override
-    public short getRotation()
-    {
-      short rotation = _format.getRotation();
-      if (rotation == 0xff) {
-         // Vertical aligned special case
-         return rotation;
-      }
-      if (rotation > 90) {
-        //This is actually the 4th quadrant
-        rotation = (short)(90-rotation);
-      }
-      return rotation;
-    }
-
-    /**
-     * set the number of spaces to indent the text in the cell
-     * @param indent - number of spaces
-     */
-    @Override
-    public void setIndention(short indent)
-    {
-        _format.setIndent(indent);
-    }
-
-    /**
-     * get the number of spaces to indent the text in the cell
-     * @return indent - number of spaces
-     */
-    @Override
-    public short getIndention()
-    {
-        return _format.getIndent();
-    }
-
-    /**
-     * set the type of border to use for the left border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderLeft(BorderStyle)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderLeft(short border)
-    {
-        _format.setIndentNotParentBorder(true);
-        _format.setBorderLeft(border);
-    }
-    
-    /**
-     * set the type of border to use for the left border of the cell
-     * @param border type
-     * @since POI 3.15
-     */
-    @Override
-    public void setBorderLeft(BorderStyle border)
-    {
-        setBorderLeft(border.getCode());
-    }
-
-    /**
-     * get the type of border to use for the left border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Will return a BorderStyle enum in the future. Use {@link #getBorderLeftEnum()}.
-     */
-    @Override
-    public short getBorderLeft()
-    {
-        return _format.getBorderLeft();
-    }
-    /**
-     * get the type of border to use for the left border of the cell
-     * @return border type
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderLeftEnum()
-    {
-        return BorderStyle.valueOf(_format.getBorderLeft());
-    }
-
-    /**
-     * set the type of border to use for the right border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderRight(BorderStyle)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderRight(short border)
-    {
-        _format.setIndentNotParentBorder(true);
-        _format.setBorderRight(border);
-    }
-    
-    /**
-     * set the type of border to use for the right border of the cell
-     * @param border type
-     * @since POI 3.15
-     */
-    @Override
-    public void setBorderRight(BorderStyle border)
-    {
-        setBorderRight(border.getCode());
-    }
-
-    /**
-     * get the type of border to use for the right border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Will return a BorderStyle enum in the future. Use {@link #getBorderRightEnum()}.
-     */
-    @Override
-    public short getBorderRight()
-    {
-        return _format.getBorderRight();
-    }
-    /**
-     * get the type of border to use for the right border of the cell
-     * @return border type
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderRightEnum()
-    {
-        return BorderStyle.valueOf(_format.getBorderRight());
-    }
-
-    /**
-     * set the type of border to use for the top border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderTop(BorderStyle)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderTop(short border)
-    {
-        _format.setIndentNotParentBorder(true);
-        _format.setBorderTop(border);
-    }
-    
-    /**
-     * set the type of border to use for the top border of the cell
-     * @param border type
-     * @since POI 3.15
-     */
-    @Override
-    public void setBorderTop(BorderStyle border)
-    {
-        setBorderTop(border.getCode());
-    }
-
-    /**
-     * get the type of border to use for the top border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Will return a BorderStyle enum in the future. Use {@link #getBorderTopEnum()}.
-     */
-    @Override
-    public short getBorderTop()
-    {
-        return _format.getBorderTop();
-    }
-    /**
-     * get the type of border to use for the top border of the cell
-     * @return border type
-     * @since 3.15
-     */
-    @Override
-    public BorderStyle getBorderTopEnum()
-    {
-        return BorderStyle.valueOf(_format.getBorderTop());
-    }
-
-    /**
-     * set the type of border to use for the bottom border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link HSSFCellStyle#setBorderBottom(BorderStyle)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderBottom(short border)
-    {
-        _format.setIndentNotParentBorder(true);
-        _format.setBorderBottom(border);
-    }
-    
-    /**
-     * set the type of border to use for the bottom border of the cell
-     * @param border type
-     * @since 3.15 beta 2
-     */
-    @Override
-    public void setBorderBottom(BorderStyle border)
-    {
-        setBorderBottom(border.getCode());
-    }
-
-    /**
-     * get the type of border to use for the bottom border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Will return a BorderStyle enum in the future. Use {@link #getBorderBottomEnum()}.
-     */
-    @Override
-    public short getBorderBottom()
-    {
-        return _format.getBorderBottom();
-    }
-    /**
-     * get the type of border to use for the bottom border of the cell
-     * @return border type
-     * @since 3.15
-     */
-    @Override
-    public BorderStyle getBorderBottomEnum()
-    {
-        return BorderStyle.valueOf(_format.getBorderBottom());
-    }
-
-    /**
-     * set the color to use for the left border
-     * @param color The index of the color definition
-     */
-    @Override
-    public void setLeftBorderColor(short color)
-    {
-        _format.setLeftBorderPaletteIdx(color);
-    }
-
-    /**
-     * get the color to use for the left border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    @Override
-    public short getLeftBorderColor()
-    {
-        return _format.getLeftBorderPaletteIdx();
-    }
-
-    /**
-     * set the color to use for the right border
-     * @param color The index of the color definition
-     */
-    @Override
-    public void setRightBorderColor(short color)
-    {
-        _format.setRightBorderPaletteIdx(color);
-    }
-
-    /**
-     * get the color to use for the left border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    @Override
-    public short getRightBorderColor()
-    {
-        return _format.getRightBorderPaletteIdx();
-    }
-
-    /**
-     * set the color to use for the top border
-     * @param color The index of the color definition
-     */
-    @Override
-    public void setTopBorderColor(short color)
-    {
-        _format.setTopBorderPaletteIdx(color);
-    }
-
-    /**
-     * get the color to use for the top border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    @Override
-    public short getTopBorderColor()
-    {
-        return _format.getTopBorderPaletteIdx();
-    }
-
-    /**
-     * set the color to use for the bottom border
-     * @param color The index of the color definition
-     */
-    @Override
-    public void setBottomBorderColor(short color)
-    {
-        _format.setBottomBorderPaletteIdx(color);
-    }
-
-    /**
-     * get the color to use for the left border
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return The index of the color definition
-     */
-    @Override
-    public short getBottomBorderColor()
-    {
-        return _format.getBottomBorderPaletteIdx();
-    }
-
-    /**
-     * setting to one fills the cell with the foreground color... No idea about
-     * other values
-     *
-     * @see #NO_FILL
-     * @see #SOLID_FOREGROUND
-     * @see #FINE_DOTS
-     * @see #ALT_BARS
-     * @see #SPARSE_DOTS
-     * @see #THICK_HORZ_BANDS
-     * @see #THICK_VERT_BANDS
-     * @see #THICK_BACKWARD_DIAG
-     * @see #THICK_FORWARD_DIAG
-     * @see #BIG_SPOTS
-     * @see #BRICKS
-     * @see #THIN_HORZ_BANDS
-     * @see #THIN_VERT_BANDS
-     * @see #THIN_BACKWARD_DIAG
-     * @see #THIN_FORWARD_DIAG
-     * @see #SQUARES
-     * @see #DIAMONDS
-     *
-     * @param fp  fill pattern (set to 1 to fill w/foreground color)
-     * @deprecated POI 3.15 beta 3. Use {@link #setFillPattern(FillPatternType)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setFillPattern(short fp)
-    {
-        setFillPattern(FillPatternType.forInt(fp));
-    }
-    
-    /**
-     * setting to one fills the cell with the foreground color... No idea about
-     * other values
-     *
-     * @param fp  fill pattern (set to {@link FillPatternType#SOLID_FOREGROUND} to fill w/foreground color)
-     */
-    @Override
-    public void setFillPattern(FillPatternType fp)
-    {
-        _format.setAdtlFillPattern(fp.getCode());
-    }
-
-    /**
-     * get the fill pattern
-     * @return fill pattern
-     * @deprecated POI 3.15 beta 3. This method will return {@link FillPatternType} in the future. Use {@link #setFillPattern(FillPatternType)} instead. 
-     */
-    @Override
-    public short getFillPattern()
-    {
-        return getFillPatternEnum().getCode();
-    }
-    
-    /**
-     * get the fill pattern
-     * @return fill pattern
-     */
-    @Override
-    public FillPatternType getFillPatternEnum()
-    {
-        return FillPatternType.forInt(_format.getAdtlFillPattern());
-    }
-
-    /**
-     * Checks if the background and foreground fills are set correctly when one
-     * or the other is set to the default color.
-     * <p>Works like the logic table below:</p>
-     * <p>BACKGROUND   FOREGROUND</p>
-     * <p>NONE         AUTOMATIC</p>
-     * <p>0x41         0x40</p>
-     * <p>NONE         RED/ANYTHING</p>
-     * <p>0x40         0xSOMETHING</p>
-     */
-    private void checkDefaultBackgroundFills() {
-      if (_format.getFillForeground() == org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index) {
-          //JMH: Why +1, hell why not. I guess it made some sense to someone at the time. Doesnt
-          //to me now.... But experience has shown that when the fore is set to AUTOMATIC then the
-          //background needs to be incremented......
-          if (_format.getFillBackground() != (org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1))
-              setFillBackgroundColor((short)(org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1));
-      } else if (_format.getFillBackground() == org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index+1)
-          //Now if the forground changes to a non-AUTOMATIC color the background resets itself!!!
-          if (_format.getFillForeground() != org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index)
-              setFillBackgroundColor(org.apache.poi.hssf.util.HSSFColor.AUTOMATIC.index);
-    }
-
-    /**
-     * set the background fill color.
-     * <p>
-     * For example:
-     * <pre>
-     * cs.setFillPattern(HSSFCellStyle.FINE_DOTS );
-     * cs.setFillBackgroundColor(new HSSFColor.RED().getIndex());
-     * </pre>
-     * optionally a Foreground and background fill can be applied:
-     * <i>Note: Ensure Foreground color is set prior to background</i>
-     * <pre>
-     * cs.setFillPattern(HSSFCellStyle.FINE_DOTS );
-     * cs.setFillForegroundColor(new HSSFColor.BLUE().getIndex());
-     * cs.setFillBackgroundColor(new HSSFColor.RED().getIndex());
-     * </pre>
-     * or, for the special case of SOLID_FILL:
-     * <pre>
-     * cs.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND );
-     * cs.setFillForegroundColor(new HSSFColor.RED().getIndex());
-     * </pre>
-     * It is necessary to set the fill style in order
-     * for the color to be shown in the cell.
-     *
-     * @param bg  color
-     */
-    @Override
-    public void setFillBackgroundColor(short bg)
-    {
-        _format.setFillBackground(bg);
-        checkDefaultBackgroundFills();
-    }
-
-    /**
-     * Get the background fill color.
-     * Note - many cells are actually filled with a foreground
-     *  fill, not a background fill - see {@link #getFillForegroundColor()}
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return fill color
-     */
-    @Override
-    public short getFillBackgroundColor()
-    {
-        short result = _format.getFillBackground();
-        //JMH: Do this ridiculous conversion, and let HSSFCellStyle
-        //internally migrate back and forth
-        if (result == (HSSFColor.AUTOMATIC.index+1)) {
-            return HSSFColor.AUTOMATIC.index;
-        }
-        return result;
-    }
-    
-    @Override
-    public HSSFColor getFillBackgroundColorColor() {
-       HSSFPalette pallette = new HSSFPalette(
-             _workbook.getCustomPalette()
-       );
-       return pallette.getColor(
-             getFillBackgroundColor()
-       );
-    }
-
-    /**
-     * set the foreground fill color
-     * <i>Note: Ensure Foreground color is set prior to background color.</i>
-     * @param bg  color
-     */
-    @Override
-    public void setFillForegroundColor(short bg)
-    {
-        _format.setFillForeground(bg);
-        checkDefaultBackgroundFills();
-    }
-
-    /**
-     * Get the foreground fill color.
-     * Many cells are filled with this, instead of a
-     *  background color ({@link #getFillBackgroundColor()})
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     * @return fill color
-     */
-    @Override
-    public short getFillForegroundColor()
-    {
-        return _format.getFillForeground();
-    }
-
-    @Override
-    public HSSFColor getFillForegroundColorColor() {
-       HSSFPalette pallette = new HSSFPalette(
-             _workbook.getCustomPalette()
-       );
-       return pallette.getColor(
-             getFillForegroundColor()
-       );
-    }
-
-    /**
-     * Gets the name of the user defined style.
-     * Returns null for built in styles, and
-     *  styles where no name has been defined
-     */
-    public String getUserStyleName() {
-        StyleRecord sr = _workbook.getStyleRecord(_index);
-        if(sr == null) {
-            return null;
-        }
-        if(sr.isBuiltin()) {
-            return null;
-        }
-        return sr.getName();
-    }
-
-    /**
-     * Sets the name of the user defined style.
-     * Will complain if you try this on a built in style.
-     */
-    public void setUserStyleName(String styleName) {
-        StyleRecord sr = _workbook.getStyleRecord(_index);
-        if(sr == null) {
-            sr = _workbook.createStyleRecord(_index);
-        }
-        // All Style records start as "builtin", but generally
-        //  only 20 and below really need to be
-        if(sr.isBuiltin() && _index <= 20) {
-            throw new IllegalArgumentException("Unable to set user specified style names for built in styles!");
-        }
-        sr.setName(styleName);
-    }
-
-    /**
-     * Controls if the Cell should be auto-sized
-     *  to shrink to fit if the text is too long
-     */
-    @Override
-    public void setShrinkToFit(boolean shrinkToFit) {
-        _format.setShrinkToFit(shrinkToFit);
-    }
-    /**
-     * Should the Cell be auto-sized by Excel to shrink
-     *  it to fit if this text is too long?
-     */
-    @Override
-    public boolean getShrinkToFit() {
-        return _format.getShrinkToFit();
-    }
-    
-    /**
-     * Get the reading order, for RTL/LTR ordering of
-     *  the text.
-     * <p>0 means Context (Default), 1 means Left To Right,
-     *  and 2 means Right to Left</p>
-     *
-     * @return order - the reading order (0,1,2)
-     */
-    public short getReadingOrder() {
-        return _format.getReadingOrder();
-    }
-    /**
-     * Sets the reading order, for RTL/LTR ordering of
-     *  the text.
-     * <p>0 means Context (Default), 1 means Left To Right,
-     *  and 2 means Right to Left</p>
-     *
-     * @param order - the reading order (0,1,2)
-     */
-    public void setReadingOrder(short order) {
-        _format.setReadingOrder(order);
-    }
-    
-    /**
-     * Verifies that this style belongs to the supplied Workbook.
-     * Will throw an exception if it belongs to a different one.
-     * This is normally called when trying to assign a style to a
-     *  cell, to ensure the cell and the style are from the same
-     *  workbook (if they're not, it won't work)
-     * @throws IllegalArgumentException if there's a workbook mis-match
-     */
-    public void verifyBelongsToWorkbook(HSSFWorkbook wb) {
-        if(wb.getWorkbook() != _workbook) {
-            throw new IllegalArgumentException("This Style does not belong to the supplied Workbook. Are you trying to assign a style from one workbook to the cell of a differnt workbook?");
-        }
-    }
-
-    /**
-     * Clones all the style information from another
-     *  HSSFCellStyle, onto this one. This
-     *  HSSFCellStyle will then have all the same
-     *  properties as the source, but the two may
-     *  be edited independently.
-     * Any stylings on this HSSFCellStyle will be lost!
-     *
-     * The source HSSFCellStyle could be from another
-     *  HSSFWorkbook if you like. This allows you to
-     *  copy styles from one HSSFWorkbook to another.
-     */
-    @Override
-    public void cloneStyleFrom(CellStyle source) {
-        if(source instanceof HSSFCellStyle) {
-            this.cloneStyleFrom((HSSFCellStyle)source);
-        } else {
-            throw new IllegalArgumentException("Can only clone from one HSSFCellStyle to another, not between HSSFCellStyle and XSSFCellStyle");
-        }
-    }
-    public void cloneStyleFrom(HSSFCellStyle source) {
-        // First we need to clone the extended format
-        //  record
-        _format.cloneStyleFrom(source._format);
-
-        // Handle matching things if we cross workbooks
-        if(_workbook != source._workbook) {
-
-            lastDateFormat.set(Short.MIN_VALUE);
-            lastFormats.set(null);
-            getDataFormatStringCache.set(null);
-           
-            // Then we need to clone the format string,
-            //  and update the format record for this
-            short fmt = (short)_workbook.createFormat(source.getDataFormatString() );
-            setDataFormat(fmt);
-
-            // Finally we need to clone the font,
-            //  and update the format record for this
-            FontRecord fr = _workbook.createNewFont();
-            fr.cloneStyleFrom(
-                    source._workbook.getFontRecordAt(
-                            source.getFontIndex()
-                    )
-            );
-
-            HSSFFont font = new HSSFFont(
-                    (short)_workbook.getFontIndex(fr), fr
-            );
-            setFont(font);
-        }
-    }
-
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((_format == null) ? 0 : _format.hashCode());
-        result = prime * result + _index;
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj == null) return false;
-        if (obj instanceof HSSFCellStyle) {
-            final HSSFCellStyle other = (HSSFCellStyle) obj;
-            if (_format == null) {
-                if (other._format != null)
-                    return false;
-            } else if (!_format.equals(other._format))
-                return false;
-            if (_index != other._index)
-                return false;
-            return true;
-        }
-        return false;
-    }
-    
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
deleted file mode 100644
index a7a88c6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-
-import org.apache.poi.ddf.EscherChildAnchorRecord;
-import org.apache.poi.ddf.EscherRecord;
-
-public final class HSSFChildAnchor extends HSSFAnchor {
-
-    private EscherChildAnchorRecord _escherChildAnchor;
-
-    /**
-     * create anchor from existing file
-     * @param escherChildAnchorRecord
-     */
-    public HSSFChildAnchor(EscherChildAnchorRecord escherChildAnchorRecord) {
-        this._escherChildAnchor = escherChildAnchorRecord;
-    }
-
-    public HSSFChildAnchor() {
-        _escherChildAnchor = new EscherChildAnchorRecord();
-    }
-
-    /**
-     * create anchor from scratch
-     * @param dx1 x coordinate of the left up corner
-     * @param dy1 y coordinate of the left up corner
-     * @param dx2 x coordinate of the right down corner
-     * @param dy2 y coordinate of the right down corner
-     */
-    public HSSFChildAnchor(int dx1, int dy1, int dx2, int dy2) {
-        super(Math.min(dx1, dx2), Math.min(dy1, dy2), Math.max(dx1, dx2), Math.max(dy1, dy2));
-        if (dx1 > dx2){
-            _isHorizontallyFlipped = true;
-        }
-        if (dy1 > dy2){
-            _isVerticallyFlipped = true;
-        }
-    }
-
-    @Override
-    public int getDx1() {
-        return _escherChildAnchor.getDx1();
-    }
-
-    @Override
-    public void setDx1(int dx1) {
-        _escherChildAnchor.setDx1(dx1);
-    }
-
-    @Override
-    public int getDy1() {
-        return _escherChildAnchor.getDy1();
-    }
-
-    @Override
-    public void setDy1(int dy1) {
-        _escherChildAnchor.setDy1(dy1);
-    }
-
-    @Override
-    public int getDy2() {
-        return _escherChildAnchor.getDy2();
-    }
-
-    @Override
-    public void setDy2(int dy2) {
-        _escherChildAnchor.setDy2(dy2);
-    }
-
-    @Override
-    public int getDx2() {
-        return _escherChildAnchor.getDx2();
-    }
-
-    @Override
-    public void setDx2(int dx2) {
-        _escherChildAnchor.setDx2(dx2);
-    }
-
-    /**
-     * @param dx1 x coordinate of the left up corner
-     * @param dy1 y coordinate of the left up corner
-     * @param dx2 x coordinate of the right down corner
-     * @param dy2 y coordinate of the right down corner
-     */
-    public void setAnchor(int dx1, int dy1, int dx2, int dy2) {
-        setDx1(Math.min(dx1, dx2));
-        setDy1(Math.min(dy1, dy2));
-        setDx2(Math.max(dx1, dx2));
-        setDy2(Math.max(dy1, dy2));
-    }
-
-
-    public boolean isHorizontallyFlipped() {
-        return _isHorizontallyFlipped;
-    }
-
-
-    public boolean isVerticallyFlipped() {
-        return _isVerticallyFlipped;
-    }
-
-    @Override
-    protected EscherRecord getEscherAnchor() {
-        return _escherChildAnchor;
-    }
-
-    @Override
-    protected void createEscherAnchor() {
-        _escherChildAnchor = new EscherChildAnchorRecord();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null)
-            return false;
-        if (obj == this)
-            return true;
-        if (obj.getClass() != getClass())
-            return false;
-        HSSFChildAnchor anchor = (HSSFChildAnchor) obj;
-
-        return anchor.getDx1() == getDx1() && anchor.getDx2() == getDx2() && anchor.getDy1() == getDy1()
-                && anchor.getDy2() == getDy2();
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
deleted file mode 100644
index d4c8c6d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.util.Removal;
-
-/**
- * A client anchor is attached to an excel worksheet.  It anchors against a
- * top-left and buttom-right cell.
- */
-public final class HSSFClientAnchor extends HSSFAnchor implements ClientAnchor {
-
-    public static final int MAX_COL = SpreadsheetVersion.EXCEL97.getLastColumnIndex();
-    public static final int MAX_ROW = SpreadsheetVersion.EXCEL97.getLastRowIndex();
-
-    private EscherClientAnchorRecord _escherClientAnchor;
-
-    public HSSFClientAnchor(EscherClientAnchorRecord escherClientAnchorRecord) {
-        this._escherClientAnchor = escherClientAnchorRecord;
-    }
-
-    /**
-     * Creates a new client anchor and defaults all the anchor positions to 0.
-     */
-    public HSSFClientAnchor() {
-    }
-
-    /**
-     * Creates a new client anchor and sets the top-left and bottom-right
-     * coordinates of the anchor.
-     * 
-     * Note: Microsoft Excel seems to sometimes disallow 
-     * higher y1 than y2 or higher x1 than x2, you might need to 
-     * reverse them and draw shapes vertically or horizontally flipped! 
-     *
-     * @param dx1  the x coordinate within the first cell.
-     * @param dy1  the y coordinate within the first cell.
-     * @param dx2  the x coordinate within the second cell.
-     * @param dy2  the y coordinate within the second cell.
-     * @param col1 the column (0 based) of the first cell.
-     * @param row1 the row (0 based) of the first cell.
-     * @param col2 the column (0 based) of the second cell.
-     * @param row2 the row (0 based) of the second cell.
-     */
-    public HSSFClientAnchor(int dx1, int dy1, int dx2, int dy2, short col1, int row1, short col2, int row2) {
-        super(dx1, dy1, dx2, dy2);
-
-        checkRange(dx1, 0, 1023, "dx1");
-        checkRange(dx2, 0, 1023, "dx2");
-        checkRange(dy1, 0, 255, "dy1");
-        checkRange(dy2, 0, 255, "dy2");
-        checkRange(col1, 0, MAX_COL, "col1");
-        checkRange(col2, 0, MAX_COL, "col2");
-        checkRange(row1, 0, MAX_ROW, "row1");
-        checkRange(row2, 0, MAX_ROW, "row2");
-
-        setCol1((short) Math.min(col1, col2));
-        setCol2((short) Math.max(col1, col2));
-        setRow1(Math.min(row1, row2));
-        setRow2(Math.max(row1, row2));
-
-        if (col1 > col2){
-            _isHorizontallyFlipped = true;
-        }
-        if (row1 > row2){
-            _isVerticallyFlipped = true;
-        }
-    }
-
-    /**
-     * Calculates the height of a client anchor in points.
-     *
-     * @param sheet the sheet the anchor will be attached to
-     * @return the shape height.
-     */
-    public float getAnchorHeightInPoints(HSSFSheet sheet) {
-        int y1 = getDy1();
-        int y2 = getDy2();
-        int row1 = Math.min(getRow1(), getRow2());
-        int row2 = Math.max(getRow1(), getRow2());
-
-        float points = 0;
-        if (row1 == row2) {
-            points = ((y2 - y1) / 256.0f) * getRowHeightInPoints(sheet, row2);
-        } else {
-            points += ((256.0f - y1) / 256.0f) * getRowHeightInPoints(sheet, row1);
-            for (int i = row1 + 1; i < row2; i++) {
-                points += getRowHeightInPoints(sheet, i);
-            }
-            points += (y2 / 256.0f) * getRowHeightInPoints(sheet, row2);
-        }
-
-        return points;
-    }
-
-    private float getRowHeightInPoints(HSSFSheet sheet, int rowNum) {
-        HSSFRow row = sheet.getRow(rowNum);
-        if (row == null) {
-            return sheet.getDefaultRowHeightInPoints();
-        }
-        return row.getHeightInPoints();
-    }
-
-    /**
-     * @return the column(0 based) of the first cell.
-     */
-    public short getCol1() {
-        return _escherClientAnchor.getCol1();
-    }
-
-    /**
-     * @param col1 the column(0 based) of the first cell.
-     */
-    public void setCol1(short col1) {
-        checkRange(col1, 0, MAX_COL, "col1");
-        _escherClientAnchor.setCol1(col1);
-    }
-
-    /**
-     * @param col1 0-based column of the first cell.
-     */
-    public void setCol1(int col1) {
-        setCol1((short) col1);
-    }
-
-    /**
-     * @return the column(0 based) of the first cell.
-     */
-    public short getCol2() {
-        return _escherClientAnchor.getCol2();
-    }
-
-    /**
-     * @param col2 the column(0 based) of the second cell.
-     */
-    public void setCol2(short col2) {
-        checkRange(col2, 0, MAX_COL, "col2");
-        _escherClientAnchor.setCol2(col2);
-    }
-
-    /**
-     * @param col2 the column(0 based) of the second cell.
-     */
-    public void setCol2(int col2) {
-        setCol2((short) col2);
-    }
-
-    /**
-     * @return the row(0 based) of the first cell.
-     */
-    public int getRow1() {
-        return unsignedValue(_escherClientAnchor.getRow1());
-    }
-
-    /**
-     * @param row1 0-based row of the first cell.
-     */
-    public void setRow1(int row1) {
-        checkRange(row1, 0, MAX_ROW, "row1");
-        _escherClientAnchor.setRow1(Integer.valueOf(row1).shortValue());
-    }
-
-    /**
-     * @return the row(0 based) of the second cell.
-     */
-    public int getRow2() {
-        return unsignedValue(_escherClientAnchor.getRow2());
-    }
-
-    /**
-     * @param row2 the row(0 based) of the second cell.
-     */
-    public void setRow2(int row2) {
-        checkRange(row2, 0, MAX_ROW, "row2");
-        _escherClientAnchor.setRow2(Integer.valueOf(row2).shortValue());
-    }
-
-    /**
-     * Sets the top-left and bottom-right coordinates of 
-     * the anchor.
-     * 
-     * Note: Microsoft Excel seems to sometimes disallow 
-     * higher y1 than y2 or higher x1 than x2, you might need to 
-     * reverse them and draw shapes vertically or horizontally flipped! 
-     *
-     * @param x1   the x coordinate within the first cell.
-     * @param y1   the y coordinate within the first cell.
-     * @param x2   the x coordinate within the second cell.
-     * @param y2   the y coordinate within the second cell.
-     * @param col1 the column (0 based) of the first cell.
-     * @param row1 the row (0 based) of the first cell.
-     * @param col2 the column (0 based) of the second cell.
-     * @param row2 the row (0 based) of the second cell.
-     */
-    public void setAnchor(short col1, int row1, int x1, int y1, short col2, int row2, int x2, int y2) {
-        checkRange(getDx1(), 0, 1023, "dx1");
-        checkRange(getDx2(), 0, 1023, "dx2");
-        checkRange(getDy1(), 0, 255, "dy1");
-        checkRange(getDy2(), 0, 255, "dy2");
-        checkRange(getCol1(), 0, MAX_COL, "col1");
-        checkRange(getCol2(), 0, MAX_COL, "col2");
-        checkRange(getRow1(), 0, MAX_ROW, "row1");
-        checkRange(getRow2(), 0, MAX_ROW, "row2");
-
-        setCol1(col1);
-        setRow1(row1);
-        setDx1(x1);
-        setDy1(y1);
-        setCol2(col2);
-        setRow2(row2);
-        setDx2(x2);
-        setDy2(y2);
-    }
-
-    public boolean isHorizontallyFlipped() {
-        return _isHorizontallyFlipped;
-    }
-
-    public boolean isVerticallyFlipped() {
-        return _isVerticallyFlipped;
-    }
-
-    @Override
-    protected EscherRecord getEscherAnchor() {
-        return _escherClientAnchor;
-    }
-
-    @Override
-    protected void createEscherAnchor() {
-        _escherClientAnchor = new EscherClientAnchorRecord();
-    }
-
-    /**
-     * Gets the anchor type
-     * Changed from returning an int to an enum in POI 3.14 beta 1.
-     * @return the anchor type
-     */
-    @Override
-    public AnchorType getAnchorType() {
-        return AnchorType.byId(_escherClientAnchor.getFlag());
-    }
-
-    /**
-     * Sets the anchor type
-     * @param anchorType the anchor type to set
-     * @since POI 3.14
-     */
-    @Override
-    public void setAnchorType(AnchorType anchorType) {
-        _escherClientAnchor.setFlag(anchorType.value);
-    }
-    /**
-     * Sets the anchor type
-     * @param anchorType the anchor type to set
-     * @deprecated POI 3.15. Use {@link #setAnchorType(AnchorType)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setAnchorType(int anchorType) {
-        _escherClientAnchor.setFlag((short) anchorType);
-    }
-
-    private void checkRange(int value, int minRange, int maxRange, String varName) {
-        if (value < minRange || value > maxRange)
-            throw new IllegalArgumentException(varName + " must be between " + minRange + " and " + maxRange + ", but was: " + value);
-    }
-
-    /**
-     * Given a 16-bit unsigned integer stored in a short, return the unsigned value.
-     *
-     * @param s A 16-bit value intended to be interpreted as an unsigned integer.
-     * @return The value represented by <code>s</code>.
-     */
-    private static int unsignedValue(final short s) {
-        return (s < 0 ? 0x10000 + s : s);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null)
-            return false;
-        if (obj == this)
-            return true;
-        if (obj.getClass() != getClass())
-            return false;
-        HSSFClientAnchor anchor = (HSSFClientAnchor) obj;
-
-        return anchor.getCol1() == getCol1() && anchor.getCol2() == getCol2() && anchor.getDx1() == getDx1()
-                && anchor.getDx2() == getDx2() && anchor.getDy1() == getDy1() && anchor.getDy2() == getDy2()
-                && anchor.getRow1() == getRow1() && anchor.getRow2() == getRow2() && anchor.getAnchorType() == getAnchorType();
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-      }
-
-    @Override
-    public int getDx1() {
-        return _escherClientAnchor.getDx1();
-    }
-
-    @Override
-    public void setDx1(int dx1) {
-        _escherClientAnchor.setDx1(Integer.valueOf(dx1).shortValue());
-    }
-
-    @Override
-    public int getDy1() {
-        return _escherClientAnchor.getDy1();
-    }
-
-    @Override
-    public void setDy1(int dy1) {
-        _escherClientAnchor.setDy1(Integer.valueOf(dy1).shortValue());
-    }
-
-    @Override
-    public int getDy2() {
-        return _escherClientAnchor.getDy2();
-    }
-
-    @Override
-    public void setDy2(int dy2) {
-        _escherClientAnchor.setDy2(Integer.valueOf(dy2).shortValue());
-    }
-
-    @Override
-    public int getDx2() {
-        return _escherClientAnchor.getDx2();
-    }
-
-    @Override
-    public void setDx2(int dx2) {
-        _escherClientAnchor.setDx2(Integer.valueOf(dx2).shortValue());
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
deleted file mode 100644
index 36c5a53..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.cf.ColorGradientFormatting;
-import org.apache.poi.hssf.record.cf.ColorGradientThreshold;
-import org.apache.poi.hssf.record.cf.Threshold;
-import org.apache.poi.hssf.record.common.ExtendedColor;
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold;
-
-/**
- * High level representation for Color Scale / Color Gradient 
- *  Formatting component of Conditional Formatting settings
- */
-public final class HSSFColorScaleFormatting implements org.apache.poi.ss.usermodel.ColorScaleFormatting {
-    private final HSSFSheet sheet;
-    private final CFRule12Record cfRule12Record;
-    private final ColorGradientFormatting colorFormatting;
-
-    protected HSSFColorScaleFormatting(CFRule12Record cfRule12Record, HSSFSheet sheet) {
-        this.sheet = sheet;
-        this.cfRule12Record = cfRule12Record;
-        this.colorFormatting = this.cfRule12Record.getColorGradientFormatting();
-    }
-
-    public int getNumControlPoints() {
-        return colorFormatting.getNumControlPoints();
-    }
-    public void setNumControlPoints(int num) {
-        colorFormatting.setNumControlPoints(num);
-    }
-
-    public HSSFExtendedColor[] getColors() {
-        ExtendedColor[] colors = colorFormatting.getColors();
-        HSSFExtendedColor[] hcolors = new HSSFExtendedColor[colors.length];
-        for (int i=0; i<colors.length; i++) {
-            hcolors[i] = new HSSFExtendedColor(colors[i]);
-        }
-        return hcolors;
-    }
-    public void setColors(Color[] colors) {
-        ExtendedColor[] cr = new ExtendedColor[colors.length];
-        for (int i=0; i<colors.length; i++) {
-            cr[i] = ((HSSFExtendedColor)colors[i]).getExtendedColor();
-        }
-        colorFormatting.setColors(cr);
-    }
-
-    public HSSFConditionalFormattingThreshold[] getThresholds() {
-        Threshold[] t = colorFormatting.getThresholds();
-        HSSFConditionalFormattingThreshold[] ht = new HSSFConditionalFormattingThreshold[t.length];
-        for (int i=0; i<t.length; i++) {
-            ht[i] = new HSSFConditionalFormattingThreshold(t[i], sheet);
-        }
-        return ht;
-    }
-
-    public void setThresholds(ConditionalFormattingThreshold[] thresholds) {
-        ColorGradientThreshold[] t = new ColorGradientThreshold[thresholds.length];
-        for (int i=0; i<t.length; i++) {
-            HSSFConditionalFormattingThreshold hssfT = (HSSFConditionalFormattingThreshold)thresholds[i];
-            t[i] = (ColorGradientThreshold)hssfT.getThreshold();
-        }
-        colorFormatting.setThresholds(t);
-    }
-
-    public HSSFConditionalFormattingThreshold createThreshold() {
-        return new HSSFConditionalFormattingThreshold(new ColorGradientThreshold(), sheet);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
deleted file mode 100644
index 6ebca2f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-
-/**
- * 
- */
-public class HSSFCombobox extends HSSFSimpleShape {
-
-    public HSSFCombobox(EscherContainerRecord spContainer, ObjRecord objRecord) {
-        super(spContainer, objRecord);
-    }
-
-    public HSSFCombobox(HSSFShape parent, HSSFAnchor anchor) {
-        super(parent, anchor);
-        super.setShapeType(OBJECT_TYPE_COMBO_BOX);
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0);
-        cod.setObjectType(CommonObjectDataSubRecord.OBJECT_TYPE_COMBO_BOX);
-    }
-
-    @Override
-    protected TextObjectRecord createTextObjRecord() {
-        return null;
-    }
-
-    @Override
-    protected EscherContainerRecord createSpContainer() {
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        EscherSpRecord sp = new EscherSpRecord();
-        EscherOptRecord opt = new EscherOptRecord();
-        EscherClientDataRecord clientData = new EscherClientDataRecord();
-
-        spContainer.setRecordId(EscherContainerRecord.SP_CONTAINER);
-        spContainer.setOptions((short) 0x000F);
-        sp.setRecordId(EscherSpRecord.RECORD_ID);
-        sp.setOptions((short) ((EscherAggregate.ST_HOSTCONTROL << 4) | 0x2));
-
-        sp.setFlags(EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HASSHAPETYPE);
-        opt.setRecordId(EscherOptRecord.RECORD_ID);
-        opt.addEscherProperty(new EscherBoolProperty(EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, 17039620));
-        opt.addEscherProperty(new EscherBoolProperty(EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 0x00080008));
-        opt.addEscherProperty(new EscherBoolProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x00080000));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__PRINT, 0x00020000));
-
-        HSSFClientAnchor userAnchor = (HSSFClientAnchor) getAnchor();
-        userAnchor.setAnchorType(AnchorType.DONT_MOVE_DO_RESIZE);
-        EscherRecord anchor = userAnchor.getEscherAnchor();
-        clientData.setRecordId(EscherClientDataRecord.RECORD_ID);
-        clientData.setOptions((short) 0x0000);
-
-        spContainer.addChildRecord(sp);
-        spContainer.addChildRecord(opt);
-        spContainer.addChildRecord(anchor);
-        spContainer.addChildRecord(clientData);
-
-        return spContainer;
-    }
-
-    @Override
-    protected ObjRecord createObjRecord() {
-        ObjRecord obj = new ObjRecord();
-        CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
-        c.setObjectType(HSSFSimpleShape.OBJECT_TYPE_COMBO_BOX);
-        c.setLocked(true);
-        c.setPrintable(false);
-        c.setAutofill(true);
-        c.setAutoline(false);
-        FtCblsSubRecord f = new FtCblsSubRecord();
-        LbsDataSubRecord l = LbsDataSubRecord.newAutoFilterInstance();
-        EndSubRecord e = new EndSubRecord();
-        obj.addSubRecord(c);
-        obj.addSubRecord(f);
-        obj.addSubRecord(l);
-        obj.addSubRecord(e);
-        return obj;
-    }
-
-    @Override
-    public void setShapeType(int shapeType) {
-        throw new IllegalStateException("Shape type can not be changed in "+this.getClass().getSimpleName());
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
deleted file mode 100644
index 593f362..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.EndSubRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.NoteStructureSubRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.TextObjectRecord;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.util.CellAddress;
-
-/**
- * Represents a cell comment - a sticky note associated with a cell.
- */
-public class HSSFComment extends HSSFTextbox implements Comment {
-
-    private final static int FILL_TYPE_SOLID = 0;
-    private final static int FILL_TYPE_PICTURE = 3;
-
-    private final static int GROUP_SHAPE_PROPERTY_DEFAULT_VALUE = 655362;
-    private final static int GROUP_SHAPE_HIDDEN_MASK = 0x1000002;
-    private final static int GROUP_SHAPE_NOT_HIDDEN_MASK = 0xFEFFFFFD;
-
-    /*
-      * TODO - make HSSFComment more consistent when created vs read from file.
-      * Currently HSSFComment has two main forms (corresponding to the two constructors).   There
-      * are certain operations that only work on comment objects in one of the forms (e.g. deleting
-      * comments).
-      * POI is also deficient in its management of RowRecord fields firstCol and lastCol.  Those
-      * fields are supposed to take comments into account, but POI does not do this yet (feb 2009).
-      * It seems like HSSFRow should manage a collection of local HSSFComments
-      */
-
-    private final NoteRecord _note;
-
-    public HSSFComment(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord textObjectRecord, NoteRecord note) {
-        super(spContainer, objRecord, textObjectRecord);
-        _note = note;
-    }
-
-    /**
-     * Construct a new comment with the given parent and anchor.
-     *
-     * @param parent
-     * @param anchor defines position of this anchor in the sheet
-     */
-    public HSSFComment(HSSFShape parent, HSSFAnchor anchor) {
-        this(parent, anchor, createNoteRecord());
-    }
-
-    private HSSFComment(HSSFShape parent, HSSFAnchor anchor, NoteRecord note) {
-        super(parent, anchor);
-        _note = note;
-        //default color for comments
-        setFillColor(0x08000050);
-
-        //by default comments are hidden
-        setVisible(false);
-        setAuthor("");
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0);
-        cod.setObjectType(CommonObjectDataSubRecord.OBJECT_TYPE_COMMENT);
-    }
-
-    protected HSSFComment(NoteRecord note, TextObjectRecord txo) {
-        this(null, new HSSFClientAnchor(), note);
-    }
-
-    @Override
-    void afterInsert(HSSFPatriarch patriarch) {
-        super.afterInsert(patriarch);
-        patriarch.getBoundAggregate().addTailRecord(getNoteRecord());
-    }
-
-    @Override
-    protected EscherContainerRecord createSpContainer() {
-        EscherContainerRecord spContainer = super.createSpContainer();
-        EscherOptRecord opt = spContainer.getChildById(EscherOptRecord.RECORD_ID);
-        opt.removeEscherProperty(EscherProperties.TEXT__TEXTLEFT);
-        opt.removeEscherProperty(EscherProperties.TEXT__TEXTRIGHT);
-        opt.removeEscherProperty(EscherProperties.TEXT__TEXTTOP);
-        opt.removeEscherProperty(EscherProperties.TEXT__TEXTBOTTOM);
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__PRINT, false, false, GROUP_SHAPE_PROPERTY_DEFAULT_VALUE));
-        return spContainer;
-    }
-
-    @Override
-    protected ObjRecord createObjRecord() {
-        ObjRecord obj = new ObjRecord();
-        CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
-        c.setObjectType(OBJECT_TYPE_COMMENT);
-        c.setLocked(true);
-        c.setPrintable(true);
-        c.setAutofill(false);
-        c.setAutoline(true);
-
-        NoteStructureSubRecord u = new NoteStructureSubRecord();
-        EndSubRecord e = new EndSubRecord();
-        obj.addSubRecord(c);
-        obj.addSubRecord(u);
-        obj.addSubRecord(e);
-        return obj;
-    }
-
-    private static NoteRecord createNoteRecord() {
-        NoteRecord note = new NoteRecord();
-        note.setFlags(NoteRecord.NOTE_HIDDEN);
-        note.setAuthor("");
-        return note;
-    }
-
-    @Override
-    void setShapeId(int shapeId) {
-        if(shapeId > 65535) {
-            throw new IllegalArgumentException("Cannot add more than " + 65535 + " shapes");
-        }
-        super.setShapeId(shapeId);
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0);
-        cod.setObjectId(shapeId);
-        _note.setShapeId(shapeId);
-    }
-
-    /**
-     * Sets whether this comment is visible.
-     *
-     * @param visible <code>true</code> if the comment is visible, <code>false</code> otherwise
-     */
-    @Override
-    public void setVisible(boolean visible) {
-        _note.setFlags(visible ? NoteRecord.NOTE_VISIBLE : NoteRecord.NOTE_HIDDEN);
-        setHidden(!visible);
-    }
-
-    /**
-     * Returns whether this comment is visible.
-     *
-     * @return <code>true</code> if the comment is visible, <code>false</code> otherwise
-     */
-    @Override
-    public boolean isVisible() {
-        return _note.getFlags() == NoteRecord.NOTE_VISIBLE;
-    }
-    
-    @Override
-    public CellAddress getAddress() {
-        return new CellAddress(getRow(), getColumn());
-    }
-    
-    @Override
-    public void setAddress(CellAddress address) {
-        setRow(address.getRow());
-        setColumn(address.getColumn());
-    }
-    
-    @Override
-    public void setAddress(int row, int col) {
-        setRow(row);
-        setColumn(col);
-    }
-
-    /**
-     * Return the row of the cell that contains the comment
-     *
-     * @return the 0-based row of the cell that contains the comment
-     */
-    @Override
-    public int getRow() {
-        return _note.getRow();
-    }
-
-    /**
-     * Set the row of the cell that contains the comment
-     *
-     * @param row the 0-based row of the cell that contains the comment
-     */
-    @Override
-    public void setRow(int row) {
-        _note.setRow(row);
-    }
-
-    /**
-     * Return the column of the cell that contains the comment
-     *
-     * @return the 0-based column of the cell that contains the comment
-     */
-    @Override
-    public int getColumn() {
-        return _note.getColumn();
-    }
-
-    /**
-     * Set the column of the cell that contains the comment
-     *
-     * @param col the 0-based column of the cell that contains the comment
-     */
-    @Override
-    public void setColumn(int col) {
-        _note.setColumn(col);
-    }
-
-    /**
-     * Name of the original comment author
-     *
-     * @return the name of the original author of the comment
-     */
-    @Override
-    public String getAuthor() {
-        return _note.getAuthor();
-    }
-
-    /**
-     * Name of the original comment author
-     *
-     * @param author the name of the original author of the comment
-     */
-    @Override
-    public void setAuthor(String author) {
-        if (_note != null) _note.setAuthor(author);
-    }
-
-    /**
-     * Returns the underlying Note record
-     */
-    protected NoteRecord getNoteRecord() {
-        return _note;
-    }
-    
-    /**
-     * Do we know which cell this comment belongs to?
-     */
-    public boolean hasPosition() {
-        if (_note == null) return false;
-        if (getColumn() < 0 || getRow() < 0) return false;
-        return true;
-    }
-
-    @Override
-    public ClientAnchor getClientAnchor() {
-        HSSFAnchor ha = super.getAnchor();
-        if (ha instanceof ClientAnchor) {
-            return (ClientAnchor) ha;
-        }
-
-        throw new IllegalStateException("Anchor can not be changed in "
-                + ClientAnchor.class.getSimpleName());
-    }
-
-    @Override
-    public void setShapeType(int shapeType) {
-        throw new IllegalStateException("Shape type can not be changed in "+this.getClass().getSimpleName());
-    }
-
-    @Override
-    public void afterRemove(HSSFPatriarch patriarch){
-        super.afterRemove(patriarch);
-        patriarch.getBoundAggregate().removeTailRecord(getNoteRecord());
-    }
-
-    @Override
-    protected HSSFShape cloneShape() {
-        TextObjectRecord txo = (TextObjectRecord) getTextObjectRecord().cloneViaReserialise();
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        byte [] inSp = getEscherContainer().serialize();
-        spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());
-        ObjRecord obj = (ObjRecord) getObjRecord().cloneViaReserialise();
-        NoteRecord note = (NoteRecord) getNoteRecord().cloneViaReserialise();
-        return new HSSFComment(spContainer, obj, txo, note);
-    }
-    
-    public void setBackgroundImage(int pictureIndex){
-        setPropertyValue(new EscherSimpleProperty( EscherProperties.FILL__PATTERNTEXTURE, false, true, pictureIndex));
-        setPropertyValue(new EscherSimpleProperty( EscherProperties.FILL__FILLTYPE, false, false, FILL_TYPE_PICTURE));
-        EscherBSERecord bse = getPatriarch().getSheet().getWorkbook().getWorkbook().getBSERecord(pictureIndex);
-        bse.setRef(bse.getRef() + 1);
-    }
-    
-    public void resetBackgroundImage(){
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.FILL__PATTERNTEXTURE);
-        if (null != property){
-            EscherBSERecord bse = getPatriarch().getSheet().getWorkbook().getWorkbook().getBSERecord(property.getPropertyValue());
-            bse.setRef(bse.getRef() - 1);
-            getOptRecord().removeEscherProperty(EscherProperties.FILL__PATTERNTEXTURE);
-        }
-        setPropertyValue(new EscherSimpleProperty( EscherProperties.FILL__FILLTYPE, false, false, FILL_TYPE_SOLID));
-    }
-    
-    public int getBackgroundImageId(){
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.FILL__PATTERNTEXTURE);
-        return property == null ? 0 : property.getPropertyValue();
-    }
-
-    private void setHidden(boolean value){
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.GROUPSHAPE__PRINT);
-        // see http://msdn.microsoft.com/en-us/library/dd949807(v=office.12).aspx
-        if (value){
-            setPropertyValue(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__PRINT, false, false, property.getPropertyValue() | GROUP_SHAPE_HIDDEN_MASK));
-        } else {
-            setPropertyValue(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__PRINT, false, false, property.getPropertyValue() & GROUP_SHAPE_NOT_HIDDEN_MASK));
-        }
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof HSSFComment)) {
-            return false;
-        }
-        HSSFComment other = (HSSFComment) obj;
-        return getNoteRecord().equals(other.getNoteRecord());
-    }
-
-    @Override
-    public int hashCode() {
-        return ((getRow()*17) + getColumn())*31;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
deleted file mode 100644
index 26bdd6b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.aggregates.CFRecordsAggregate;
-import org.apache.poi.ss.usermodel.ConditionalFormatting;
-import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * HSSFConditionalFormatting class encapsulates all settings of Conditional Formatting. 
- * 
- * The class can be used 
- * 
- * <UL>
- * <LI>
- * to make a copy HSSFConditionalFormatting settings.
- * </LI>
- *  
- * 
- * For example:
- * <PRE>
- * HSSFConditionalFormatting cf = sheet.getConditionalFormattingAt(index);
- * newSheet.addConditionalFormatting(cf);
- * </PRE>
- * 
- *  <LI>
- *  or to modify existing Conditional Formatting settings (formatting regions and/or rules).
- *  </LI>
- *  </UL>
- * 
- * Use {@link org.apache.poi.hssf.usermodel.HSSFSheet#getSheetConditionalFormatting()} to get access to an instance of this class.
- * <P>
- * To create a new Conditional Formatting set use the following approach:
- * 
- * <PRE>
- * 
- * // Define a Conditional Formatting rule, which triggers formatting
- * // when cell's value is greater or equal than 100.0 and
- * // applies patternFormatting defined below.
- * HSSFConditionalFormattingRule rule = sheet.createConditionalFormattingRule(
- *     ComparisonOperator.GE, 
- *     "100.0", // 1st formula 
- *     null     // 2nd formula is not used for comparison operator GE
- * );
- * 
- * // Create pattern with red background
- * HSSFPatternFormatting patternFmt = rule.cretePatternFormatting();
- * patternFormatting.setFillBackgroundColor(HSSFColor.RED.index);
- * 
- * // Define a region containing first column
- * Region [] regions =
- * {
- *     new Region(1,(short)1,-1,(short)1)
- * };
- *     
- * // Apply Conditional Formatting rule defined above to the regions  
- * sheet.addConditionalFormatting(regions, rule);
- * </PRE>
- */
-public final class HSSFConditionalFormatting  implements ConditionalFormatting {
-    private final HSSFSheet sheet;
-    private final CFRecordsAggregate cfAggregate;
-
-    HSSFConditionalFormatting(HSSFSheet sheet, CFRecordsAggregate cfAggregate) {
-        if(sheet == null) {
-            throw new IllegalArgumentException("sheet must not be null");
-        }
-        if(cfAggregate == null) {
-            throw new IllegalArgumentException("cfAggregate must not be null");
-        }
-        this.sheet = sheet; 
-        this.cfAggregate = cfAggregate;
-    }
-    CFRecordsAggregate getCFRecordsAggregate() {
-        return cfAggregate;
-    }
-
-    /**
-     * @return array of <tt>CellRangeAddress</tt>s. never <code>null</code> 
-     */
-    @Override
-    public CellRangeAddress[] getFormattingRanges() {
-        return cfAggregate.getHeader().getCellRanges();
-    }
-
-    @Override
-    public void setFormattingRanges(
-            final CellRangeAddress[] ranges) {
-        cfAggregate.getHeader().setCellRanges(ranges);
-    }
-
-    /**
-     * Replaces an existing Conditional Formatting rule at position idx. 
-     * Older versions of Excel only allow up to 3 Conditional Formatting rules,
-     *  and will ignore rules beyond that, while newer versions are fine.
-     * This method can be useful to modify existing  Conditional Formatting rules.
-     * 
-     * @param idx position of the rule. Should be between 0 and 2 for older Excel versions
-     * @param cfRule - Conditional Formatting rule
-     */
-    public void setRule(int idx, HSSFConditionalFormattingRule cfRule) {
-        cfAggregate.setRule(idx, cfRule.getCfRuleRecord());
-    }
-
-    @Override
-    public void setRule(int idx, ConditionalFormattingRule cfRule){
-        setRule(idx, (HSSFConditionalFormattingRule)cfRule);
-    }
-
-    /**
-     * add a Conditional Formatting rule. 
-     * Excel allows to create up to 3 Conditional Formatting rules.
-     * @param cfRule - Conditional Formatting rule
-     */
-    public void addRule(HSSFConditionalFormattingRule cfRule) {
-        cfAggregate.addRule(cfRule.getCfRuleRecord());
-    }
-
-    @Override
-    public void addRule(ConditionalFormattingRule cfRule){
-        addRule((HSSFConditionalFormattingRule)cfRule);
-    }
-
-    /**
-     * @return the Conditional Formatting rule at position idx.
-     */
-    @Override
-    public HSSFConditionalFormattingRule getRule(int idx) {
-        CFRuleBase ruleRecord = cfAggregate.getRule(idx);
-        return new HSSFConditionalFormattingRule(sheet, ruleRecord);
-    }
-
-    /**
-     * @return number of Conditional Formatting rules.
-     */
-    @Override
-    public int getNumberOfRules() {
-        return cfAggregate.getNumberOfRules();
-    }
-
-    @Override
-    public String toString() {
-        return cfAggregate.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
deleted file mode 100644
index b52ea91..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator;
-import org.apache.poi.hssf.record.CFRuleRecord;
-import org.apache.poi.hssf.record.cf.BorderFormatting;
-import org.apache.poi.hssf.record.cf.ColorGradientFormatting;
-import org.apache.poi.hssf.record.cf.DataBarFormatting;
-import org.apache.poi.hssf.record.cf.FontFormatting;
-import org.apache.poi.hssf.record.cf.IconMultiStateFormatting;
-import org.apache.poi.hssf.record.cf.PatternFormatting;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.ConditionType;
-import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
-
-/**
- *
- * High level representation of Conditional Formatting Rule.
- * It allows to specify formula based conditions for the Conditional Formatting
- * and the formatting settings such as font, border and pattern.
- */
-public final class HSSFConditionalFormattingRule implements ConditionalFormattingRule {
-    private static final byte CELL_COMPARISON = CFRuleRecord.CONDITION_TYPE_CELL_VALUE_IS;
-
-    private final CFRuleBase cfRuleRecord;
-    private final HSSFWorkbook workbook;
-    private final HSSFSheet sheet;
-
-    HSSFConditionalFormattingRule(HSSFSheet pSheet, CFRuleBase pRuleRecord) {
-        if (pSheet == null) {
-            throw new IllegalArgumentException("pSheet must not be null");
-        }
-        if (pRuleRecord == null) {
-            throw new IllegalArgumentException("pRuleRecord must not be null");
-        }
-        sheet = pSheet;
-        workbook = pSheet.getWorkbook();
-        cfRuleRecord = pRuleRecord;
-    }
-
-    CFRuleBase getCfRuleRecord() {
-        return cfRuleRecord;
-    }
-    private CFRule12Record getCFRule12Record(boolean create) {
-        if (cfRuleRecord instanceof CFRule12Record) {
-            // Good
-        } else {
-            if (create) throw new IllegalArgumentException("Can't convert a CF into a CF12 record");
-            return null;
-        }
-        return (CFRule12Record)cfRuleRecord;
-    }
-
-    private HSSFFontFormatting getFontFormatting(boolean create) {
-        FontFormatting fontFormatting = cfRuleRecord.getFontFormatting();
-        if (fontFormatting == null) {
-            if (!create) return null;
-            fontFormatting = new FontFormatting();
-            cfRuleRecord.setFontFormatting(fontFormatting);
-        }
-        return new HSSFFontFormatting(cfRuleRecord, workbook);
-    }
-
-    /**
-     * @return - font formatting object  if defined,  <code>null</code> otherwise
-     */
-    public HSSFFontFormatting getFontFormatting() {
-        return getFontFormatting(false);
-    }
-    /**
-     * create a new font formatting structure if it does not exist,
-     * otherwise just return existing object.
-     * @return - font formatting object, never returns <code>null</code>.
-     */
-    public HSSFFontFormatting createFontFormatting() {
-        return getFontFormatting(true);
-    }
-
-    private HSSFBorderFormatting getBorderFormatting(boolean create) {
-        BorderFormatting borderFormatting = cfRuleRecord.getBorderFormatting();
-        if (borderFormatting == null) {
-            if (!create) return null;
-            borderFormatting = new BorderFormatting();
-            cfRuleRecord.setBorderFormatting(borderFormatting);
-        }
-        return new HSSFBorderFormatting(cfRuleRecord, workbook);
-    }
-
-    /**
-     * @return - border formatting object  if defined,  <code>null</code> otherwise
-     */
-    public HSSFBorderFormatting getBorderFormatting() {
-        return getBorderFormatting(false);
-    }
-    /**
-     * create a new border formatting structure if it does not exist,
-     * otherwise just return existing object.
-     * @return - border formatting object, never returns <code>null</code>.
-     */
-    public HSSFBorderFormatting createBorderFormatting() {
-        return getBorderFormatting(true);
-    }
-
-    private HSSFPatternFormatting getPatternFormatting(boolean create) {
-        PatternFormatting patternFormatting = cfRuleRecord.getPatternFormatting();
-        if (patternFormatting == null) {
-            if (!create) return null;
-            patternFormatting = new PatternFormatting();
-            cfRuleRecord.setPatternFormatting(patternFormatting);
-        }
-        return new HSSFPatternFormatting(cfRuleRecord, workbook);
-    }
-
-    /**
-     * @return - pattern formatting object  if defined, <code>null</code> otherwise
-     */
-    public HSSFPatternFormatting getPatternFormatting()
-    {
-        return getPatternFormatting(false);
-    }
-    /**
-     * create a new pattern formatting structure if it does not exist,
-     * otherwise just return existing object.
-     * @return - pattern formatting object, never returns <code>null</code>.
-     */
-    public HSSFPatternFormatting createPatternFormatting()
-    {
-        return getPatternFormatting(true);
-    }
-    
-    private HSSFDataBarFormatting getDataBarFormatting(boolean create) {
-        CFRule12Record cfRule12Record = getCFRule12Record(create);
-        if (cfRule12Record == null) return null;
-        
-        DataBarFormatting databarFormatting = cfRule12Record.getDataBarFormatting();
-        if (databarFormatting == null) {
-            if (!create) return null;
-            cfRule12Record.createDataBarFormatting();
-        }
-        
-        return new HSSFDataBarFormatting(cfRule12Record, sheet);
-    }
-    
-    /**
-     * @return databar / data-bar formatting object if defined, <code>null</code> otherwise
-     */
-    public HSSFDataBarFormatting getDataBarFormatting() {
-        return getDataBarFormatting(false);
-    }
-    /**
-     * create a new databar / data-bar formatting object if it does not exist,
-     * otherwise just return the existing object.
-     */
-    public HSSFDataBarFormatting createDataBarFormatting() {
-        return getDataBarFormatting(true);
-    }
-    
-    private HSSFIconMultiStateFormatting getMultiStateFormatting(boolean create) {
-        CFRule12Record cfRule12Record = getCFRule12Record(create);
-        if (cfRule12Record == null) return null;
-        
-        IconMultiStateFormatting iconFormatting = cfRule12Record.getMultiStateFormatting();
-        if (iconFormatting == null) {
-            if (!create) return null;
-            cfRule12Record.createMultiStateFormatting();
-        }
-        return new HSSFIconMultiStateFormatting(cfRule12Record, sheet);
-    }
-    
-    /**
-     * @return icon / multi-state formatting object if defined, <code>null</code> otherwise
-     */
-    public HSSFIconMultiStateFormatting getMultiStateFormatting() {
-        return getMultiStateFormatting(false);
-    }
-    /**
-     * create a new icon / multi-state formatting object if it does not exist,
-     * otherwise just return the existing object.
-     */
-    public HSSFIconMultiStateFormatting createMultiStateFormatting() {
-        return getMultiStateFormatting(true);
-    }
-    
-    private HSSFColorScaleFormatting getColorScaleFormatting(boolean create) {
-        CFRule12Record cfRule12Record = getCFRule12Record(create);
-        if (cfRule12Record == null) return null;
-        
-        ColorGradientFormatting colorFormatting = cfRule12Record.getColorGradientFormatting();
-        if (colorFormatting == null) {
-            if (!create) return null;
-            cfRule12Record.createColorGradientFormatting();
-        }
-
-        return new HSSFColorScaleFormatting(cfRule12Record, sheet);
-    }
-    
-    /**
-     * @return color scale / gradient formatting object if defined, <code>null</code> otherwise
-     */
-    public HSSFColorScaleFormatting getColorScaleFormatting() {
-        return getColorScaleFormatting(false);
-    }
-    /**
-     * create a new color scale / gradient formatting object if it does not exist,
-     * otherwise just return the existing object.
-     */
-    public HSSFColorScaleFormatting createColorScaleFormatting() {
-        return getColorScaleFormatting(true);
-    }
-    
-    /**
-     * @return -  the conditiontype for the cfrule
-     */
-    @Override
-    public ConditionType getConditionType() {
-        byte code = cfRuleRecord.getConditionType();
-        return ConditionType.forId(code);
-    }
-
-    /**
-     * @return - the comparisionoperatation for the cfrule
-     */
-    @Override
-    public byte getComparisonOperation() {
-        return cfRuleRecord.getComparisonOperation();
-    }
-
-    public String getFormula1()
-    {
-        return toFormulaString(cfRuleRecord.getParsedExpression1());
-    }
-
-    public String getFormula2() {
-        byte conditionType = cfRuleRecord.getConditionType();
-        if (conditionType == CELL_COMPARISON) {
-            byte comparisonOperation = cfRuleRecord.getComparisonOperation();
-            switch(comparisonOperation) {
-                case ComparisonOperator.BETWEEN:
-                case ComparisonOperator.NOT_BETWEEN:
-                    return toFormulaString(cfRuleRecord.getParsedExpression2());
-            }
-        }
-        return null;
-    }
-
-    protected String toFormulaString(Ptg[] parsedExpression) {
-        return toFormulaString(parsedExpression, workbook);
-    }
-    protected static String toFormulaString(Ptg[] parsedExpression, HSSFWorkbook workbook) {
-        if(parsedExpression == null || parsedExpression.length == 0) {
-            return null;
-        }
-        return HSSFFormulaParser.toFormulaString(workbook, parsedExpression);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
deleted file mode 100644
index 4ab124c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.hssf.record.CFRuleBase.parseFormula;
-import static org.apache.poi.hssf.usermodel.HSSFConditionalFormattingRule.toFormulaString;
-
-import org.apache.poi.hssf.record.cf.Threshold;
-
-/**
- * High level representation for Icon / Multi-State / Databar /
- *  Colour Scale change thresholds
- */
-public final class HSSFConditionalFormattingThreshold implements org.apache.poi.ss.usermodel.ConditionalFormattingThreshold {
-    private final Threshold threshold;
-    private final HSSFSheet sheet;
-    private final HSSFWorkbook workbook;
-
-    protected HSSFConditionalFormattingThreshold(Threshold threshold, HSSFSheet sheet) {
-        this.threshold = threshold;
-        this.sheet = sheet;
-        this.workbook = sheet.getWorkbook();
-    }
-    protected Threshold getThreshold() {
-        return threshold;
-    }
-
-    public RangeType getRangeType() {
-        return RangeType.byId(threshold.getType());
-    }
-    public void setRangeType(RangeType type) {
-        threshold.setType((byte)type.id);
-    }
-
-    public String getFormula() {
-        return toFormulaString(threshold.getParsedExpression(), workbook);
-    }
-    public void setFormula(String formula) {
-        threshold.setParsedExpression(parseFormula(formula, sheet));
-    }
-
-    public Double getValue() {
-        return threshold.getValue();
-    }
-    public void setValue(Double value) {
-        threshold.setValue(value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
deleted file mode 100644
index 863d1a0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.record.common.ExtendedColor;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-
-public class HSSFCreationHelper implements CreationHelper {
-    private final HSSFWorkbook workbook;
-
-    /**
-     * Should only be called by {@link HSSFWorkbook#getCreationHelper()}
-     *
-     * @param wb the workbook to create objects for
-     */
-    @Internal(since="3.15 beta 3")
-    /*package*/ HSSFCreationHelper(HSSFWorkbook wb) {
-        workbook = wb;
-    }
-
-    @Override
-    public HSSFRichTextString createRichTextString(String text) {
-        return new HSSFRichTextString(text);
-    }
-
-    @Override
-    public HSSFDataFormat createDataFormat() {
-        return workbook.createDataFormat();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead.
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    @Override
-    public HSSFHyperlink createHyperlink(int type) {
-        return new HSSFHyperlink(type);
-    }
-    @Override
-    public HSSFHyperlink createHyperlink(HyperlinkType type) {
-        return new HSSFHyperlink(type);
-    }
-
-    @Override
-    public HSSFExtendedColor createExtendedColor() {
-        return new HSSFExtendedColor(new ExtendedColor());
-    }
-
-    /**
-     * Creates a HSSFFormulaEvaluator, the object that evaluates formula cells.
-     *
-     * @return a HSSFFormulaEvaluator instance
-     */
-    @Override
-    public HSSFFormulaEvaluator createFormulaEvaluator(){
-        return new HSSFFormulaEvaluator(workbook);
-    }
-
-    /**
-     * Creates a HSSFClientAnchor. Use this object to position drawing object in a sheet
-     *
-     * @return a HSSFClientAnchor instance
-     * @see org.apache.poi.ss.usermodel.Drawing
-     */
-    @Override
-    public HSSFClientAnchor createClientAnchor(){
-        return new HSSFClientAnchor();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
deleted file mode 100644
index f796dd8..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.cf.DataBarFormatting;
-import org.apache.poi.hssf.record.cf.DataBarThreshold;
-import org.apache.poi.ss.usermodel.Color;
-
-/**
- * High level representation for DataBar / Data-Bar Formatting 
- *  component of Conditional Formatting settings
- */
-public final class HSSFDataBarFormatting implements org.apache.poi.ss.usermodel.DataBarFormatting {
-    private final HSSFSheet sheet;
-    private final CFRule12Record cfRule12Record;
-    private final DataBarFormatting databarFormatting;
-
-    protected HSSFDataBarFormatting(CFRule12Record cfRule12Record, HSSFSheet sheet) {
-        this.sheet = sheet;
-        this.cfRule12Record = cfRule12Record;
-        this.databarFormatting = this.cfRule12Record.getDataBarFormatting();
-    }
-
-    public boolean isLeftToRight() {
-        return !databarFormatting.isReversed();
-    }
-    public void setLeftToRight(boolean ltr) {
-        databarFormatting.setReversed(!ltr);
-    }
-
-    public int getWidthMin() {
-        return databarFormatting.getPercentMin();
-    }
-    public void setWidthMin(int width) {
-        databarFormatting.setPercentMin((byte)width);
-    }
-
-    public int getWidthMax() {
-        return databarFormatting.getPercentMax();
-    }
-    public void setWidthMax(int width) {
-        databarFormatting.setPercentMax((byte)width);
-    }
-
-    public HSSFExtendedColor getColor() {
-        return new HSSFExtendedColor(databarFormatting.getColor());
-    }
-    public void setColor(Color color) {
-        HSSFExtendedColor hcolor = (HSSFExtendedColor)color;
-        databarFormatting.setColor(hcolor.getExtendedColor());
-    }
-
-    public HSSFConditionalFormattingThreshold getMinThreshold() {
-        return new HSSFConditionalFormattingThreshold(databarFormatting.getThresholdMin(), sheet);
-    }
-    public HSSFConditionalFormattingThreshold getMaxThreshold() {
-        return new HSSFConditionalFormattingThreshold(databarFormatting.getThresholdMax(), sheet);
-    }
-
-    public boolean isIconOnly() {
-        return databarFormatting.isIconOnly();
-    }
-    public void setIconOnly(boolean only) {
-        databarFormatting.setIconOnly(only);
-    }
-
-    public HSSFConditionalFormattingThreshold createThreshold() {
-        return new HSSFConditionalFormattingThreshold(new DataBarThreshold(), sheet);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
deleted file mode 100644
index 23fe8ca..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.DataFormat;
-
-/**
- * Identifies both built-in and user defined formats within a workbook.<p/>
- * See {@link BuiltinFormats} for a list of supported built-in formats.<p/>
- *
- * <b>International Formats</b><br/>
- * Since version 2003 Excel has supported international formats.  These are denoted
- * with a prefix "[$-xxx]" (where xxx is a 1-7 digit hexadecimal number).
- * See the Microsoft article
- * <a href="http://office.microsoft.com/assistance/hfws.aspx?AssetID=HA010346351033&CTT=6&Origin=EC010272491033">
- *   Creating international number formats
- * </a> for more details on these codes.
- */
-public final class HSSFDataFormat implements DataFormat {
-	private static final String[] _builtinFormats = BuiltinFormats.getAll();
-
-	private final Vector<String> _formats = new Vector<String>();
-	private final InternalWorkbook _workbook;
-	private boolean _movedBuiltins = false;  // Flag to see if need to
-	// check the built in list
-	// or if the regular list
-	// has all entries.
-
-	/**
-	 * Constructs a new data formatter.  It takes a workbook to have
-	 * access to the workbooks format records.
-	 * @param workbook the workbook the formats are tied to.
-	 */
-	HSSFDataFormat(InternalWorkbook workbook) {
-		_workbook = workbook;
-
-		Iterator<FormatRecord> i = workbook.getFormats().iterator();
-		while (i.hasNext()) {
-			FormatRecord r = i.next();
-			ensureFormatsSize(r.getIndexCode());
-			_formats.set(r.getIndexCode(), r.getFormatString());
-		}
-	}
-
-	public static List<String> getBuiltinFormats() {
-		return Arrays.asList(_builtinFormats);
-	}
-
-	/**
-	 * get the format index that matches the given format string<p>
-	 * Automatically converts "text" to excel's format string to represent text.
-	 * @param format string matching a built in format
-	 * @return index of format or -1 if undefined.
-	 */
-	public static short getBuiltinFormat(String format) {
-		return (short) BuiltinFormats.getBuiltinFormat(format);
-	}
-
-	/**
-	 * Get the format index that matches the given format
-	 *  string, creating a new format entry if required.
-	 * Aliases text to the proper format as required.
-	 * @param pFormat string matching a built in format
-	 * @return index of format.
-	 */
-	public short getFormat(String pFormat) {
-	   // Normalise the format string
-		String format;
-		if (pFormat.equalsIgnoreCase("TEXT")) {
-			format = "@";
-		} else {
-			format = pFormat;
-		}
-
-		// Merge in the built in formats if we haven't already
-		if (!_movedBuiltins) {
-			for (int i=0; i<_builtinFormats.length; i++) {
-			   ensureFormatsSize(i);
-				if (_formats.get(i) == null) {
-				   _formats.set(i, _builtinFormats[i]);
-				} else {
-				   // The workbook overrides this default format
-				}
-			}
-			_movedBuiltins = true;
-		}
-		
-		// See if we can find it
-		for(int i=0; i<_formats.size(); i++) {
-		   if(format.equals(_formats.get(i))) {
-		      return (short)i;
-		   }
-		}
-
-		// We can't find it, so add it as a new one
-		short index = _workbook.getFormat(format, true);
-		ensureFormatsSize(index);
-		_formats.set(index, format);
-		return index;
-	}
-
-	/**
-	 * get the format string that matches the given format index
-	 * @param index of a format
-	 * @return string represented at index of format or null if there is not a  format at that index
-	 */
-	public String getFormat(short index) {
-		if (_movedBuiltins) {
-			return _formats.get(index);
-		}
-
-        if(index == -1) {
-            // YK: formatIndex can be -1, for example, for cell in column Y in test-data/spreadsheet/45322.xls
-            // return null for those
-            return null;
-        }
-
-		String fmt = _formats.size() > index ? _formats.get(index) : null;
-		if (_builtinFormats.length > index && _builtinFormats[index] != null) {
-		   // It's in the built in range
-		   if (fmt != null) {
-		      // It's been overriden, use that value
-		      return fmt;
-		   } else {
-		      // Standard built in format
-	         return _builtinFormats[index];
-		   }
-		}
-		return fmt;
-	}
-
-	/**
-	 * get the format string that matches the given format index
-	 * @param index of a built in format
-	 * @return string represented at index of format or null if there is not a builtin format at that index
-	 */
-	public static String getBuiltinFormat(short index) {
-		return BuiltinFormats.getBuiltinFormat(index);
-	}
-
-	/**
-	 * get the number of built-in and reserved builtinFormats
-	 * @return number of built-in and reserved builtinFormats
-	 */
-	public static int getNumberOfBuiltinBuiltinFormats() {
-		return _builtinFormats.length;
-	}
-	
-	/**
-	 * Ensures that the formats list can hold entries
-	 *  up to and including the entry with this index
-	 */
-	private void ensureFormatsSize(int index) {
-	   if(_formats.size() <= index) {
-	      _formats.setSize(index+1);
-	   }
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
deleted file mode 100644
index ef3eb93..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.text.DecimalFormat;
-import java.text.Format;
-import java.util.Locale;
-
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * HSSFDataFormatter contains methods for formatting the value stored in an
- * HSSFCell. This can be useful for reports and GUI presentations when you
- * need to display data exactly as it appears in Excel. Supported formats
- * include currency, SSN, percentages, decimals, dates, phone numbers, zip
- * codes, etc.
- * <p>
- * Internally, formats will be implemented using subclasses of {@link Format}
- * such as {@link DecimalFormat} and {@link java.text.SimpleDateFormat}. Therefore the
- * formats used by this class must obey the same pattern rules as these Format
- * subclasses. This means that only legal number pattern characters ("0", "#",
- * ".", "," etc.) may appear in number formats. Other characters can be
- * inserted <em>before</em> or <em> after</em> the number pattern to form a
- * prefix or suffix.
- * </p>
- * <p>
- * For example the Excel pattern <code>"$#,##0.00 "USD"_);($#,##0.00 "USD")"
- * </code> will be correctly formatted as "$1,000.00 USD" or "($1,000.00 USD)".
- * However the pattern <code>"00-00-00"</code> is incorrectly formatted by
- * DecimalFormat as "000000--". For Excel formats that are not compatible with
- * DecimalFormat, you can provide your own custom {@link Format} implementation
- * via <code>HSSFDataFormatter.addFormat(String,Format)</code>. The following
- * custom formats are already provided by this class:
- * </p>
- * <pre>
- * <ul><li>SSN "000-00-0000"</li>
- *     <li>Phone Number "(###) ###-####"</li>
- *     <li>Zip plus 4 "00000-0000"</li>
- * </ul>
- * </pre>
- * <p>
- * If the Excel format pattern cannot be parsed successfully, then a default
- * format will be used. The default number format will mimic the Excel General
- * format: "#" for whole numbers and "#.##########" for decimal numbers. You
- * can override the default format pattern with <code>
- * HSSFDataFormatter.setDefaultNumberFormat(Format)</code>. <b>Note:</b> the
- * default format will only be used when a Format cannot be created from the
- * cell's data format string.
- */
-public final class HSSFDataFormatter extends DataFormatter {
-
-    /**
-     * Creates a formatter using the given locale.
-     */
-    public HSSFDataFormatter(Locale locale) {
-        super(locale);
-    }
-
-    /**
-     * Creates a formatter using the {@link Locale#getDefault() default locale}.
-     */
-    public HSSFDataFormatter() {
-        this(LocaleUtil.getUserLocale());
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
deleted file mode 100644
index 6654749..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.DVRecord;
-import org.apache.poi.hssf.usermodel.DVConstraint.FormulaPair;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.util.CellRangeAddressList;
-
-/**
- * Utility class for creating data validation cells
- */
-public final class HSSFDataValidation implements DataValidation {
-	private String _prompt_title;
-	private String _prompt_text;
-	private String _error_title;
-	private String _error_text;
-
-	private int _errorStyle = ErrorStyle.STOP;
-	private boolean _emptyCellAllowed = true;
-	private boolean _suppress_dropdown_arrow = false;
-	private boolean _showPromptBox = true;
-	private boolean _showErrorBox = true;
-	private CellRangeAddressList _regions;
-	private DVConstraint _constraint;
-
-	/**
-	 * Constructor which initializes the cell range on which this object will be
-	 * applied
-	 * @param constraint 
-	 */
-	public HSSFDataValidation(CellRangeAddressList regions, DataValidationConstraint constraint) {
-		_regions = regions;
-		
-		//FIXME: This cast can be avoided.
-		_constraint = (DVConstraint)constraint;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getConstraint()
-	 */
-	public DataValidationConstraint getValidationConstraint() {
-		return _constraint;
-	}
-
-	public DVConstraint getConstraint() {
-		return _constraint;
-	}
-	
-	public CellRangeAddressList getRegions() {
-		return _regions;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#setErrorStyle(int)
-	 */
-	public void setErrorStyle(int error_style) {
-		_errorStyle = error_style;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getErrorStyle()
-	 */
-	public int getErrorStyle() {
-		return _errorStyle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#setEmptyCellAllowed(boolean)
-	 */
-	public void setEmptyCellAllowed(boolean allowed) {
-		_emptyCellAllowed = allowed;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getEmptyCellAllowed()
-	 */
-	public boolean getEmptyCellAllowed() {
-		return _emptyCellAllowed;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#setSuppressDropDownArrow(boolean)
-	 */
-	public void setSuppressDropDownArrow(boolean suppress) {
-		_suppress_dropdown_arrow = suppress;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getSuppressDropDownArrow()
-	 */
-	public boolean getSuppressDropDownArrow() {
-		if (_constraint.getValidationType()==ValidationType.LIST) {
-			return _suppress_dropdown_arrow;
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#setShowPromptBox(boolean)
-	 */
-	public void setShowPromptBox(boolean show) {
-		_showPromptBox = show;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getShowPromptBox()
-	 */
-	public boolean getShowPromptBox() {
-		return _showPromptBox;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#setShowErrorBox(boolean)
-	 */
-	public void setShowErrorBox(boolean show) {
-		_showErrorBox = show;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getShowErrorBox()
-	 */
-	public boolean getShowErrorBox() {
-		return _showErrorBox;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#createPromptBox(java.lang.String, java.lang.String)
-	 */
-	public void createPromptBox(String title, String text) {
-		_prompt_title = title;
-		_prompt_text = text;
-		this.setShowPromptBox(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getPromptBoxTitle()
-	 */
-	public String getPromptBoxTitle() {
-		return _prompt_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getPromptBoxText()
-	 */
-	public String getPromptBoxText() {
-		return _prompt_text;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#createErrorBox(java.lang.String, java.lang.String)
-	 */
-	public void createErrorBox(String title, String text) {
-		_error_title = title;
-		_error_text = text;
-		this.setShowErrorBox(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getErrorBoxTitle()
-	 */
-	public String getErrorBoxTitle() {
-		return _error_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.hssf.usermodel.DataValidation#getErrorBoxText()
-	 */
-	public String getErrorBoxText() {
-		return _error_text;
-	}
-
-	public DVRecord createDVRecord(HSSFSheet sheet) {
-
-		FormulaPair fp = _constraint.createFormulas(sheet);
-		
-		return new DVRecord(_constraint.getValidationType(),
-				_constraint.getOperator(),
-				_errorStyle, _emptyCellAllowed, getSuppressDropDownArrow(),
-				_constraint.getValidationType()==ValidationType.LIST && _constraint.getExplicitListValues()!=null,
-				_showPromptBox, _prompt_title, _prompt_text,
-				_showErrorBox, _error_title, _error_text,
-				fp.getFormula1(), fp.getFormula2(),
-				_regions);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
deleted file mode 100644
index 15161cb..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.util.CellRangeAddressList;
-
-/**
- * Helper for working with Data Validation
- */
-public class HSSFDataValidationHelper implements DataValidationHelper {
-	// Findbugs: URF_UNREAD_FIELD . Do not delete without understanding how this class works.
-	//private HSSFSheet sheet;
-	
-	public HSSFDataValidationHelper(HSSFSheet sheet) {
-		super();
-		// Findbugs: URF_UNREAD_FIELD . Do not delete without understanding how this class works.
-		//this.sheet = sheet;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.poi.ss.usermodel.DataValidationHelper#createDateConstraint
-	 * (int, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createDateConstraint(int operatorType, String formula1, String formula2, String dateFormat) {
-		return DVConstraint.createDateConstraint(operatorType, formula1, formula2, dateFormat);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.poi.ss.usermodel.DataValidationHelper#createExplicitListConstraint
-	 * (java.lang.String[])
-	 */
-	public DataValidationConstraint createExplicitListConstraint(String[] listOfValues) {
-		return DVConstraint.createExplicitListConstraint(listOfValues);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.poi.ss.usermodel.DataValidationHelper#createFormulaListConstraint
-	 * (java.lang.String)
-	 */
-	public DataValidationConstraint createFormulaListConstraint(String listFormula) {
-		return DVConstraint.createFormulaListConstraint(listFormula);
-	}
-
-	
-	
-	public DataValidationConstraint createNumericConstraint(int validationType,int operatorType, String formula1, String formula2) {
-		return DVConstraint.createNumericConstraint(validationType, operatorType, formula1, formula2);
-	}
-
-	public DataValidationConstraint createIntegerConstraint(int operatorType, String formula1, String formula2) {
-		return DVConstraint.createNumericConstraint(ValidationType.INTEGER, operatorType, formula1, formula2);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.poi.ss.usermodel.DataValidationHelper#createNumericConstraint
-	 * (int, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createDecimalConstraint(int operatorType, String formula1, String formula2) {
-		return DVConstraint.createNumericConstraint(ValidationType.DECIMAL, operatorType, formula1, formula2);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.poi.ss.usermodel.DataValidationHelper#createTextLengthConstraint
-	 * (int, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createTextLengthConstraint(int operatorType, String formula1, String formula2) {
-		return DVConstraint.createNumericConstraint(ValidationType.TEXT_LENGTH, operatorType, formula1, formula2);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.poi.ss.usermodel.DataValidationHelper#createTimeConstraint
-	 * (int, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createTimeConstraint(int operatorType, String formula1, String formula2) {
-		return DVConstraint.createTimeConstraint(operatorType, formula1, formula2);
-	}
-
-	
-	
-	public DataValidationConstraint createCustomConstraint(String formula) {
-		return DVConstraint.createCustomFormulaConstraint(formula);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.apache.poi.ss.usermodel.DataValidationHelper#createValidation(org
-	 * .apache.poi.ss.usermodel.DataValidationConstraint,
-	 * org.apache.poi.ss.util.CellRangeAddressList)
-	 */
-	public DataValidation createValidation(DataValidationConstraint constraint, CellRangeAddressList cellRangeAddressList) {
-		return new HSSFDataValidation(cellRangeAddressList, constraint); 
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
deleted file mode 100644
index eb41526..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-
-/*
- * DateUtil.java
- *
- * Created on January 19, 2002, 9:30 AM
- */
-package org.apache.poi.hssf.usermodel;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.usermodel.DateUtil;
-
-/**
- * Contains methods for dealing with Excel dates.
- */
-public class HSSFDateUtil extends DateUtil {
-	protected static int absoluteDay(Calendar cal, boolean use1904windowing) {
-		return DateUtil.absoluteDay(cal, use1904windowing);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
deleted file mode 100644
index 1771b2e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.util.Internal;
-/**
- * HSSF wrapper for a cell under evaluation
- */
-final class HSSFEvaluationCell implements EvaluationCell {
-
-	private final EvaluationSheet _evalSheet;
-	private final HSSFCell _cell;
-
-	public HSSFEvaluationCell(HSSFCell cell, EvaluationSheet evalSheet) {
-		_cell = cell;
-		_evalSheet = evalSheet;
-	}
-	public HSSFEvaluationCell(HSSFCell cell) {
-		this(cell, new HSSFEvaluationSheet(cell.getSheet()));
-	}
-	@Override
-	public Object getIdentityKey() {
-		// save memory by just using the cell itself as the identity key
-		// Note - this assumes HSSFCell has not overridden hashCode and equals
-		return _cell;
-	}
-
-	public HSSFCell getHSSFCell() {
-		return _cell;
-	}
-	@Override
-	public boolean getBooleanCellValue() {
-		return _cell.getBooleanCellValue();
-	}
-	   /**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	@Override
-	public int getCellType() {
-		return _cell.getCellType();
-	}
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	@Override
-	public CellType getCellTypeEnum() {
-		return _cell.getCellTypeEnum();
-	}
-	@Override
-	public int getColumnIndex() {
-		return _cell.getColumnIndex();
-	}
-	@Override
-	public int getErrorCellValue() {
-		return _cell.getErrorCellValue();
-	}
-	@Override
-	public double getNumericCellValue() {
-		return _cell.getNumericCellValue();
-	}
-	@Override
-	public int getRowIndex() {
-		return _cell.getRowIndex();
-	}
-	@Override
-	public EvaluationSheet getSheet() {
-		return _evalSheet;
-	}
-	@Override
-	public String getStringCellValue() {
-		return _cell.getRichStringCellValue().getString();
-	}
-	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	@Override
-	public int getCachedFormulaResultType() {
-		return _cell.getCachedFormulaResultType();
-	}
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	@Override
-	public CellType getCachedFormulaResultTypeEnum() {
-		return _cell.getCachedFormulaResultTypeEnum();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
deleted file mode 100644
index f1b8d7b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.util.Internal;
-
-/**
- * HSSF wrapper for a sheet under evaluation
- */
-@Internal
-final class HSSFEvaluationSheet implements EvaluationSheet {
-
-    private final HSSFSheet _hs;
-
-    public HSSFEvaluationSheet(HSSFSheet hs) {
-        _hs = hs;
-    }
-
-    public HSSFSheet getHSSFSheet() {
-        return _hs;
-    }
-    @Override
-    public EvaluationCell getCell(int rowIndex, int columnIndex) {
-        HSSFRow row = _hs.getRow(rowIndex);
-        if (row == null) {
-            return null;
-        }
-        HSSFCell cell = row.getCell(columnIndex);
-        if (cell == null) {
-            return null;
-        }
-        return new HSSFEvaluationCell(cell, this);
-    }
-
-    /* (non-JavaDoc), inherit JavaDoc from EvaluationSheet
-     * @since POI 3.15 beta 3
-     */    
-    @Override
-    public void clearAllCachedResultValues() {
-        // nothing to do
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
deleted file mode 100644
index 1feb96c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationName;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.formula.EvaluationWorkbook;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.FormulaParsingWorkbook;
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.SheetIdentifier;
-import org.apache.poi.ss.formula.SheetRangeIdentifier;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Table;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Internal POI use only
- */
-@Internal
-public final class HSSFEvaluationWorkbook implements FormulaRenderingWorkbook, EvaluationWorkbook, FormulaParsingWorkbook {
-    private static POILogger logger = POILogFactory.getLogger(HSSFEvaluationWorkbook.class);
-    private final HSSFWorkbook _uBook;
-    private final InternalWorkbook _iBook;
-
-    public static HSSFEvaluationWorkbook create(HSSFWorkbook book) {
-        if (book == null) {
-            return null;
-        }
-        return new HSSFEvaluationWorkbook(book);
-    }
-
-    private HSSFEvaluationWorkbook(HSSFWorkbook book) {
-        _uBook = book;
-        _iBook = book.getWorkbook();
-    }
-
-    /* (non-JavaDoc), inherit JavaDoc from EvaluationWorkbook
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        // nothing to do
-    }
-    
-    @Override
-    public HSSFName createName() {
-        return _uBook.createName();
-    }
-
-    @Override
-    public int getExternalSheetIndex(String sheetName) {
-        int sheetIndex = _uBook.getSheetIndex(sheetName);
-        return _iBook.checkExternSheet(sheetIndex);
-    }
-    @Override
-    public int getExternalSheetIndex(String workbookName, String sheetName) {
-        return _iBook.getExternalSheetIndex(workbookName, sheetName);
-    }
-    
-    @Override
-    public Ptg get3DReferencePtg(CellReference cr, SheetIdentifier sheet) {
-        int extIx = getSheetExtIx(sheet);
-        return new Ref3DPtg(cr, extIx);
-    }
-    @Override
-    public Ptg get3DReferencePtg(AreaReference areaRef, SheetIdentifier sheet) {
-        int extIx = getSheetExtIx(sheet);
-        return new Area3DPtg(areaRef, extIx);
-    }
-    /**
-     * Return an external name (named range, function, user-defined function) Ptg
-     */
-    @Override
-    public NameXPtg getNameXPtg(String name, SheetIdentifier sheet) {
-        int sheetRefIndex = getSheetExtIx(sheet);
-        return _iBook.getNameXPtg(name, sheetRefIndex, _uBook.getUDFFinder());
-    }
-
-    /**
-     * Lookup a named range by its name.
-     *
-     * @param name the name to search
-     * @param sheetIndex  the 0-based index of the sheet this formula belongs to.
-     * The sheet index is required to resolve sheet-level names. <code>-1</code> means workbook-global names
-     */
-    public EvaluationName getName(String name, int sheetIndex) {
-        for(int i=0; i < _iBook.getNumNames(); i++) {
-            NameRecord nr = _iBook.getNameRecord(i);
-            if (nr.getSheetNumber() == sheetIndex+1 && name.equalsIgnoreCase(nr.getNameText())) {
-                return new Name(nr, i);
-            }
-        }
-        return sheetIndex == -1 ? null : getName(name, -1);
-    }
-
-    @Override
-    public int getSheetIndex(EvaluationSheet evalSheet) {
-        HSSFSheet sheet = ((HSSFEvaluationSheet)evalSheet).getHSSFSheet();
-        return _uBook.getSheetIndex(sheet);
-    }
-    @Override
-    public int getSheetIndex(String sheetName) {
-        return _uBook.getSheetIndex(sheetName);
-    }
-
-    @Override
-    public String getSheetName(int sheetIndex) {
-        return _uBook.getSheetName(sheetIndex);
-    }
-
-    @Override
-    public EvaluationSheet getSheet(int sheetIndex) {
-        // TODO Cache these evaluation sheets so they aren't re-generated on every getSheet call
-        return new HSSFEvaluationSheet(_uBook.getSheetAt(sheetIndex));
-    }
-    @Override
-    public int convertFromExternSheetIndex(int externSheetIndex) {
-        // TODO Update this to expose first and last sheet indexes
-        return _iBook.getFirstSheetIndexFromExternSheetIndex(externSheetIndex);
-    }
-
-    @Override
-    public ExternalSheet getExternalSheet(int externSheetIndex) {
-        ExternalSheet sheet = _iBook.getExternalSheet(externSheetIndex);
-        if (sheet == null) {
-            // Try to treat it as a local sheet
-            int localSheetIndex = convertFromExternSheetIndex(externSheetIndex);
-            if (localSheetIndex == -1) {
-                // The sheet referenced can't be found, sorry
-                return null;
-            }
-            if (localSheetIndex == -2) {
-                // Not actually sheet based at all - is workbook scoped
-                return null;
-            }
-            
-            // Look up the local sheet
-            String sheetName = getSheetName(localSheetIndex);
-            
-            // Is it a single local sheet, or a range?
-            int lastLocalSheetIndex = _iBook.getLastSheetIndexFromExternSheetIndex(externSheetIndex);
-            if (lastLocalSheetIndex == localSheetIndex) {
-                sheet = new ExternalSheet(null, sheetName);
-            } else {
-                String lastSheetName = getSheetName(lastLocalSheetIndex);
-                sheet = new ExternalSheetRange(null, sheetName, lastSheetName);
-            }
-        }
-        return sheet;
-    }
-
-    /**
-     * @throws IllegalStateException: XSSF-style external references are not supported for HSSF
-     */
-    @Override
-    public ExternalSheet getExternalSheet(String firstSheetName, String lastSheetName, int externalWorkbookNumber) {
-        throw new IllegalStateException("XSSF-style external references are not supported for HSSF");
-    }
-
-    @Override
-    public ExternalName getExternalName(int externSheetIndex, int externNameIndex) {
-        return _iBook.getExternalName(externSheetIndex, externNameIndex);
-    }
-
-    /**
-     * @throws IllegalStateException: XSSF-style external names are not supported for HSSF
-     */
-    @Override
-    public ExternalName getExternalName(String nameName, String sheetName, int externalWorkbookNumber) {
-        throw new IllegalStateException("XSSF-style external names are not supported for HSSF");
-    }
-
-    @Override
-    public String resolveNameXText(NameXPtg n) {
-        return _iBook.resolveNameXText(n.getSheetRefIndex(), n.getNameIndex());
-    }
-
-    @Override
-    public String getSheetFirstNameByExternSheet(int externSheetIndex) {
-        return _iBook.findSheetFirstNameFromExternSheet(externSheetIndex);
-    }
-    @Override
-    public String getSheetLastNameByExternSheet(int externSheetIndex) {
-        return _iBook.findSheetLastNameFromExternSheet(externSheetIndex);
-    }
-    @Override
-    public String getNameText(NamePtg namePtg) {
-        return _iBook.getNameRecord(namePtg.getIndex()).getNameText();
-    }
-    @Override
-    public EvaluationName getName(NamePtg namePtg) {
-        int ix = namePtg.getIndex();
-        return new Name(_iBook.getNameRecord(ix), ix);
-    }
-
-    @Override
-    @SuppressWarnings("unused")
-    public Ptg[] getFormulaTokens(EvaluationCell evalCell) {
-        HSSFCell cell = ((HSSFEvaluationCell)evalCell).getHSSFCell();
-        if (false) {
-            // re-parsing the formula text also works, but is a waste of time
-            // It is useful from time to time to run all unit tests with this code
-            // to make sure that all formulas POI can evaluate can also be parsed.
-            try {
-                return HSSFFormulaParser.parse(cell.getCellFormula(), _uBook, FormulaType.CELL, _uBook.getSheetIndex(cell.getSheet()));
-            } catch (FormulaParseException e) {
-                // Note - as of Bugzilla 48036 (svn r828244, r828247) POI is capable of evaluating
-                // IntesectionPtg.  However it is still not capable of parsing it.
-                // So FormulaEvalTestData.xls now contains a few formulas that produce errors here.
-                logger.log( POILogger.ERROR, e.getMessage());
-            }
-        }
-        FormulaRecordAggregate fra = (FormulaRecordAggregate) cell.getCellValueRecord();
-        return fra.getFormulaTokens();
-    }
-
-    @Override
-    public UDFFinder getUDFFinder(){
-        return _uBook.getUDFFinder();
-    }
-
-    private static final class Name implements EvaluationName {
-        private final NameRecord _nameRecord;
-        private final int _index;
-
-        public Name(NameRecord nameRecord, int index) {
-            _nameRecord = nameRecord;
-            _index = index;
-        }
-        public Ptg[] getNameDefinition() {
-            return _nameRecord.getNameDefinition();
-        }
-        public String getNameText() {
-            return _nameRecord.getNameText();
-        }
-        public boolean hasFormula() {
-            return _nameRecord.hasFormula();
-        }
-        public boolean isFunctionName() {
-            return _nameRecord.isFunctionName();
-        }
-        public boolean isRange() {
-            return _nameRecord.hasFormula(); // TODO - is this right?
-        }
-        public NamePtg createPtg() {
-            return new NamePtg(_index);
-        }
-    }
-
-    private int getSheetExtIx(SheetIdentifier sheetIden) {
-        int extIx;
-        if (sheetIden == null) {
-            extIx = -1;
-        } else {
-            String workbookName = sheetIden.getBookName(); 
-            String firstSheetName = sheetIden.getSheetIdentifier().getName();
-            String lastSheetName = firstSheetName;
-            
-            if (sheetIden instanceof SheetRangeIdentifier) {
-                lastSheetName = ((SheetRangeIdentifier)sheetIden).getLastSheetIdentifier().getName();
-            }
-            
-            if (workbookName == null) {
-                int firstSheetIndex = _uBook.getSheetIndex(firstSheetName);
-                int lastSheetIndex = _uBook.getSheetIndex(lastSheetName);
-                extIx = _iBook.checkExternSheet(firstSheetIndex, lastSheetIndex);
-            } else {
-                extIx = _iBook.getExternalSheetIndex(workbookName, firstSheetName, lastSheetName);
-            }
-        }
-        return extIx;
-    }
-
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion(){
-        return SpreadsheetVersion.EXCEL97;
-    }
-
-    /**
-      * @throws IllegalStateException: data tables are not supported in Excel 97-2003 format
-      */
-    @Override
-    public Table getTable(String name) {
-        throw new IllegalStateException("XSSF-style tables are not supported for HSSF");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
deleted file mode 100644
index e6c8c1b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_AUTO;
-import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_INDEXED;
-import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_RGB;
-import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_THEMED;
-
-import org.apache.poi.ss.usermodel.ExtendedColor;
-
-/**
- * The HSSF file format normally stores Color information in the
- *  Palette (see PaletteRecord), but for a few cases (eg Conditional
- *  Formatting, Sheet Extensions), this XSSF-style color record 
- *  can be used.
- */
-public class HSSFExtendedColor extends ExtendedColor {
-    private org.apache.poi.hssf.record.common.ExtendedColor color;
-    
-    public HSSFExtendedColor(org.apache.poi.hssf.record.common.ExtendedColor color) {
-        this.color = color;
-    }
-    
-    protected org.apache.poi.hssf.record.common.ExtendedColor getExtendedColor() {
-        return color;
-    }
-
-    public boolean isAuto() {
-        return color.getType() == TYPE_AUTO;
-    }
-    public boolean isIndexed() {
-        return color.getType() == TYPE_INDEXED;
-    }
-    public boolean isRGB() {
-        return color.getType() == TYPE_RGB;
-    }
-    public boolean isThemed() {
-        return color.getType() == TYPE_THEMED;
-    }
-
-    public short getIndex() {
-        return (short)color.getColorIndex();
-    }
-    public int getTheme() {
-        return color.getThemeIndex();
-    }
-
-    public byte[] getRGB() {
-        // Trim trailing A
-        byte[] rgb = new byte[3];
-        byte[] rgba = color.getRGBA();
-        if (rgba == null) return null;
-        System.arraycopy(rgba, 0, rgb, 0, 3);
-        return rgb;
-    }
-    public byte[] getARGB() {
-        // Swap from RGBA to ARGB
-        byte[] argb = new byte[4];
-        byte[] rgba = color.getRGBA();
-        if (rgba == null) return null;
-        System.arraycopy(rgba, 0, argb, 1, 3);
-        argb[0] = rgba[3];
-        return argb;
-    }
-
-    protected byte[] getStoredRBG() {
-        return getARGB();
-    }
-
-    public void setRGB(byte[] rgb) {
-        if (rgb.length == 3) {
-            byte[] rgba = new byte[4];
-            System.arraycopy(rgb, 0, rgba, 0, 3);
-            rgba[3] = -1;
-        } else {
-            // Shuffle from ARGB to RGBA
-            byte a = rgb[0];
-            rgb[0] = rgb[1];
-            rgb[1] = rgb[2];
-            rgb[2] = rgb[3];
-            rgb[3] = a;
-            color.setRGBA(rgb);
-        }
-        color.setType(TYPE_RGB);
-    }
-
-    public double getTint() {
-        return color.getTint();
-    }
-    public void setTint(double tint) {
-        color.setTint(tint);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
deleted file mode 100644
index cd3ac61..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.Font;
-
-/**
- * Represents a Font used in a workbook.
- * 
- * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createFont()
- * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(short)
- * @see org.apache.poi.hssf.usermodel.HSSFCellStyle#setFont(HSSFFont)
- */
-public final class HSSFFont implements Font {
-
-    /**
-     * Arial font
-     */
-
-    public final static String FONT_ARIAL = "Arial";
-
-
-    private FontRecord         font;
-    private short              index;
-
-    /** Creates a new instance of HSSFFont */
-
-    protected HSSFFont(short index, FontRecord rec)
-    {
-        font       = rec;
-        this.index = index;
-    }
-
-    /**
-     * set the name for the font (i.e. Arial)
-     * @param name  String representing the name of the font to use
-     * @see #FONT_ARIAL
-     */
-
-    public void setFontName(String name)
-    {
-        font.setFontName(name);
-    }
-
-    /**
-     * get the name for the font (i.e. Arial)
-     * @return String representing the name of the font to use
-     * @see #FONT_ARIAL
-     */
-
-    public String getFontName()
-    {
-        return font.getFontName();
-    }
-
-    /**
-     * get the index within the HSSFWorkbook (sequence within the collection of Font objects)
-     * @return unique index number of the underlying record this Font represents (probably you don't care
-     *  unless you're comparing which one is which)
-     */
-
-    public short getIndex()
-    {
-        return index;
-    }
-
-    /**
-     * set the font height in unit's of 1/20th of a point.  Maybe you might want to
-     * use the setFontHeightInPoints which matches to the familiar 10, 12, 14 etc..
-     * @param height height in 1/20ths of a point
-     * @see #setFontHeightInPoints(short)
-     */
-
-    public void setFontHeight(short height)
-    {
-        font.setFontHeight(height);
-    }
-
-    /**
-     * set the font height
-     * @param height height in the familiar unit of measure - points
-     * @see #setFontHeight(short)
-     */
-
-    public void setFontHeightInPoints(short height)
-    {
-        font.setFontHeight(( short ) (height * 20));
-    }
-
-    /**
-     * get the font height in unit's of 1/20th of a point.  Maybe you might want to
-     * use the getFontHeightInPoints which matches to the familiar 10, 12, 14 etc..
-     * @return short - height in 1/20ths of a point
-     * @see #getFontHeightInPoints()
-     */
-
-    public short getFontHeight()
-    {
-        return font.getFontHeight();
-    }
-
-    /**
-     * get the font height
-     * @return short - height in the familiar unit of measure - points
-     * @see #getFontHeight()
-     */
-
-    public short getFontHeightInPoints()
-    {
-        return ( short ) (font.getFontHeight() / 20);
-    }
-
-    /**
-     * set whether to use italics or not
-     * @param italic italics or not
-     */
-
-    public void setItalic(boolean italic)
-    {
-        font.setItalic(italic);
-    }
-
-    /**
-     * get whether to use italics or not
-     * @return italics or not
-     */
-
-    public boolean getItalic()
-    {
-        return font.isItalic();
-    }
-
-    /**
-     * set whether to use a strikeout horizontal line through the text or not
-     * @param strikeout or not
-     */
-
-    public void setStrikeout(boolean strikeout)
-    {
-        font.setStrikeout(strikeout);
-    }
-
-    /**
-     * get whether to use a strikeout horizontal line through the text or not
-     * @return strikeout or not
-     */
-
-    public boolean getStrikeout()
-    {
-        return font.isStruckout();
-    }
-
-    /**
-     * set the color for the font
-     * @param color to use
-     * @see #COLOR_NORMAL Note: Use this rather than HSSFColor.AUTOMATIC for default font color
-     * @see #COLOR_RED
-     */
-
-    public void setColor(short color)
-    {
-        font.setColorPaletteIndex(color);
-    }
-
-    /**
-     * get the color for the font
-     * @return color to use
-     * @see #COLOR_NORMAL
-     * @see #COLOR_RED
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     */
-    public short getColor()
-    {
-        return font.getColorPaletteIndex();
-    }
-    
-    /**
-     * get the color value for the font
-     */
-    public HSSFColor getHSSFColor(HSSFWorkbook wb)
-    {
-       HSSFPalette pallette = wb.getCustomPalette();
-       return pallette.getColor( getColor() );
-    }
-
-    /**
-     * set the boldness to use
-     * @param boldweight
-     * @see #BOLDWEIGHT_NORMAL
-     * @see #BOLDWEIGHT_BOLD
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #setBold(boolean)} instead.
-     */
-    public void setBoldweight(short boldweight)
-    {
-        font.setBoldWeight(boldweight);
-    }
-    
-    /**
-     * sets the font to be bold or not
-     */
-    public void setBold(boolean bold)
-    {
-        if (bold)
-            font.setBoldWeight(BOLDWEIGHT_BOLD);
-        else
-            font.setBoldWeight(BOLDWEIGHT_NORMAL);
-    }
-
-    /**
-     * get the boldness to use
-     * @return boldweight
-     * @see #BOLDWEIGHT_NORMAL
-     * @see #BOLDWEIGHT_BOLD
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #getBold} instead.
-     */
-    public short getBoldweight()
-    {
-        return font.getBoldWeight();
-    }
-    
-    /**
-     * get if the font is bold or not
-     */
-    public boolean getBold()
-    {
-        return getBoldweight() == BOLDWEIGHT_BOLD;
-    }
-
-    /**
-     * set normal,super or subscript.
-     * @param offset type to use (none,super,sub)
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-
-    public void setTypeOffset(short offset)
-    {
-        font.setSuperSubScript(offset);
-    }
-
-    /**
-     * get normal,super or subscript.
-     * @return offset type to use (none,super,sub)
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-
-    public short getTypeOffset()
-    {
-        return font.getSuperSubScript();
-    }
-
-    /**
-     * set type of text underlining to use
-     * @param underline type
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-
-    public void setUnderline(byte underline)
-    {
-        font.setUnderline(underline);
-    }
-
-    /**
-     * get type of text underlining to use
-     * @return underlining type
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-
-    public byte getUnderline()
-    {
-        return font.getUnderline();
-    }
-
-
-    /**
-     * get character-set to use.
-     * @return character-set
-     * @see #ANSI_CHARSET
-     * @see #DEFAULT_CHARSET
-     * @see #SYMBOL_CHARSET
-     */
-    public int getCharSet()
-    {
-        byte charset = font.getCharset();
-        if(charset >= 0) {
-           return charset;
-        } else {
-           return charset + 256;
-        }
-    }
-
-    /**
-     * set character-set to use.
-     * @see #ANSI_CHARSET
-     * @see #DEFAULT_CHARSET
-     * @see #SYMBOL_CHARSET
-     */
-    public void setCharSet(int charset)
-    {
-        byte cs = (byte)charset;
-        if(charset > 127) {
-           cs = (byte)(charset-256);
-        }
-        setCharSet(cs);
-    }
-
-    /**
-     * set character-set to use.
-     * @see #ANSI_CHARSET
-     * @see #DEFAULT_CHARSET
-     * @see #SYMBOL_CHARSET
-     */
-    public void setCharSet(byte charset)
-    {
-        font.setCharset(charset);
-    }
-
-    public String toString()
-    {
-        return "org.apache.poi.hssf.usermodel.HSSFFont{" +
-                 font +
-                "}";
-    }
-
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((font == null) ? 0 : font.hashCode());
-		result = prime * result + index;
-		return result;
-	}
-
-	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (obj instanceof HSSFFont) {
-			final HSSFFont other = (HSSFFont) obj;
-			if (font == null) {
-				if (other.font != null)
-					return false;
-			} else if (!font.equals(other.font))
-				return false;
-			if (index != other.index)
-				return false;
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
deleted file mode 100644
index 07f5fd4..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.cf.FontFormatting;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.Color;
-/**
- * High level representation for Font Formatting component
- * of Conditional Formatting settings
- */
-public final class HSSFFontFormatting implements org.apache.poi.ss.usermodel.FontFormatting {
-    /** Underline type - None */
-    public final static byte U_NONE              = FontFormatting.U_NONE;
-    /** Underline type - Single */
-    public final static byte U_SINGLE            = FontFormatting.U_SINGLE;
-    /** Underline type - Double */
-    public final static byte U_DOUBLE            = FontFormatting.U_DOUBLE;
-    /**  Underline type - Single Accounting */
-    public final static byte U_SINGLE_ACCOUNTING = FontFormatting.U_SINGLE_ACCOUNTING;
-    /** Underline type - Double Accounting */
-    public final static byte U_DOUBLE_ACCOUNTING = FontFormatting.U_DOUBLE_ACCOUNTING;
-
-    private final FontFormatting fontFormatting;
-    private final HSSFWorkbook workbook;
-
-    protected HSSFFontFormatting(CFRuleBase cfRuleRecord, HSSFWorkbook workbook) {
-        this.fontFormatting = cfRuleRecord.getFontFormatting();
-        this.workbook = workbook;
-    }
-
-    protected FontFormatting getFontFormattingBlock() {
-        return fontFormatting;
-    }
-
-    /**
-     * get the type of super or subscript for the font
-     *
-     * @return super or subscript option
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-    public short getEscapementType()
-    {
-        return fontFormatting.getEscapementType();
-    }
-
-    /**
-     * @return font color index
-     */
-    public short getFontColorIndex()
-    {
-        return fontFormatting.getFontColorIndex();
-    }
-
-    public HSSFColor getFontColor() {
-        return workbook.getCustomPalette().getColor(
-                getFontColorIndex()
-        );
-    }
-
-    public void setFontColor(Color color) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(color);
-        if (hcolor == null) {
-            fontFormatting.setFontColorIndex((short)0);
-        } else {
-            fontFormatting.setFontColorIndex(hcolor.getIndex());
-        }
-    }
-
-    /**
-     * gets the height of the font in 1/20th point units
-     *
-     * @return fontheight (in points/20); or -1 if not modified
-     */
-    public int getFontHeight() {
-        return fontFormatting.getFontHeight();
-    }
-
-    /**
-     * get the font weight for this font (100-1000dec or 0x64-0x3e8).  Default is
-     * 0x190 for normal and 0x2bc for bold
-     *
-     * @return bw - a number between 100-1000 for the fonts "boldness"
-     */
-    public short getFontWeight() {
-        return fontFormatting.getFontWeight();
-    }
-
-    /**
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#getRawRecord()
-     */
-    protected byte[] getRawRecord() {
-        return fontFormatting.getRawRecord();
-    }
-
-    /**
-     * get the type of underlining for the font
-     *
-     * @return font underlining type
-     *
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-    public short getUnderlineType()
-    {
-        return fontFormatting.getUnderlineType();
-    }
-
-    /**
-     * get whether the font weight is set to bold or not
-     *
-     * @return bold - whether the font is bold or not
-     */
-    public boolean isBold()
-    {
-        return fontFormatting.isFontWeightModified() && fontFormatting.isBold();
-    }
-
-    /**
-     * @return true if escapement type was modified from default   
-     */
-    public boolean isEscapementTypeModified()
-    {
-        return fontFormatting.isEscapementTypeModified();
-    }
-
-    /**
-     * @return true if font cancellation was modified from default   
-     */
-    public boolean isFontCancellationModified()
-    {
-        return fontFormatting.isFontCancellationModified();
-    }
-
-    /**
-     * @return true if font outline type was modified from default   
-     */
-    public boolean isFontOutlineModified()
-    {
-        return fontFormatting.isFontOutlineModified();
-    }
-
-    /**
-     * @return true if font shadow type was modified from default   
-     */
-    public boolean isFontShadowModified()
-    {
-        return fontFormatting.isFontShadowModified();
-    }
-
-    /**
-     * @return true if font style was modified from default   
-     */
-    public boolean isFontStyleModified()
-    {
-        return fontFormatting.isFontStyleModified();
-    }
-
-    /**
-     * @return true if font style was set to <i>italic</i> 
-     */
-    public boolean isItalic()
-    {
-        return fontFormatting.isFontStyleModified() && fontFormatting.isItalic();
-    }
-
-    /**
-     * @return true if font outline is on
-     */
-    public boolean isOutlineOn()
-    {
-        return fontFormatting.isFontOutlineModified() && fontFormatting.isOutlineOn();
-    }
-
-    /**
-     * @return true if font shadow is on
-     */
-    public boolean isShadowOn()
-    {
-        return fontFormatting.isFontOutlineModified() && fontFormatting.isShadowOn();
-    }
-
-    /**
-     * @return true if font strikeout is on
-     */
-    public boolean isStruckout()
-    {
-        return fontFormatting.isFontCancellationModified() && fontFormatting.isStruckout();
-    }
-
-    /**
-     * @return true if font underline type was modified from default   
-     */
-    public boolean isUnderlineTypeModified()
-    {
-        return fontFormatting.isUnderlineTypeModified();
-    }
-
-    /**
-     * @return true if font weight was modified from default   
-     */
-    public boolean isFontWeightModified()
-    {
-        return fontFormatting.isFontWeightModified();
-    }
-
-    /**
-     * set font style options.
-     * 
-     * @param italic - if true, set posture style to italic, otherwise to normal 
-     * @param bold if true, set font weight to bold, otherwise to normal
-     */
-
-    public void setFontStyle(boolean italic, boolean bold)
-    {
-        boolean modified = italic || bold;
-        fontFormatting.setItalic(italic);
-        fontFormatting.setBold(bold);
-        fontFormatting.setFontStyleModified(modified);
-        fontFormatting.setFontWieghtModified(modified);
-    }
-
-    /**
-     * set font style options to default values (non-italic, non-bold)
-     */
-    public void resetFontStyle()
-    {
-        setFontStyle(false,false);
-    }
-
-    /**
-     * set the escapement type for the font
-     *
-     * @param escapementType  super or subscript option
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-    public void setEscapementType(short escapementType) {
-        switch(escapementType) {
-            case HSSFFontFormatting.SS_SUB:
-            case HSSFFontFormatting.SS_SUPER:
-                fontFormatting.setEscapementType(escapementType);
-                fontFormatting.setEscapementTypeModified(true);
-                break;
-            case HSSFFontFormatting.SS_NONE:
-                fontFormatting.setEscapementType(escapementType);
-                fontFormatting.setEscapementTypeModified(false);
-                break;
-            default:
-        }
-    }
-
-    /**
-     * @param modified
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setEscapementTypeModified(boolean)
-     */
-    public void setEscapementTypeModified(boolean modified) {
-        fontFormatting.setEscapementTypeModified(modified);
-    }
-
-    /**
-     * @param modified
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setFontCancellationModified(boolean)
-     */
-    public void setFontCancellationModified(boolean modified)
-    {
-        fontFormatting.setFontCancellationModified(modified);
-    }
-
-    /**
-     * @param fci
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setFontColorIndex(short)
-     */
-    public void setFontColorIndex(short fci)
-    {
-        fontFormatting.setFontColorIndex(fci);
-    }
-
-    /**
-     * @param height
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setFontHeight(int)
-     */
-    public void setFontHeight(int height)
-    {
-        fontFormatting.setFontHeight(height);
-    }
-
-    /**
-     * @param modified
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setFontOutlineModified(boolean)
-     */
-    public void setFontOutlineModified(boolean modified)
-    {
-        fontFormatting.setFontOutlineModified(modified);
-    }
-
-    /**
-     * @param modified
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setFontShadowModified(boolean)
-     */
-    public void setFontShadowModified(boolean modified)
-    {
-        fontFormatting.setFontShadowModified(modified);
-    }
-
-    /**
-     * @param modified
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setFontStyleModified(boolean)
-     */
-    public void setFontStyleModified(boolean modified)
-    {
-        fontFormatting.setFontStyleModified(modified);
-    }
-
-    /**
-     * @param on
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setOutline(boolean)
-     */
-    public void setOutline(boolean on)
-    {
-        fontFormatting.setOutline(on);
-        fontFormatting.setFontOutlineModified(on);
-    }
-
-    /**
-     * @param on
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setShadow(boolean)
-     */
-    public void setShadow(boolean on)
-    {
-        fontFormatting.setShadow(on);
-        fontFormatting.setFontShadowModified(on);
-    }
-
-    /**
-     * @param strike
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setStrikeout(boolean)
-     */
-    public void setStrikeout(boolean strike)
-    {
-        fontFormatting.setStrikeout(strike);
-        fontFormatting.setFontCancellationModified(strike);
-    }
-
-    /**
-     * set the type of underlining type for the font
-     *
-     * @param underlineType  super or subscript option
-     *
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-    public void setUnderlineType(short underlineType) {
-        switch(underlineType) {
-            case HSSFFontFormatting.U_SINGLE:
-            case HSSFFontFormatting.U_DOUBLE:
-            case HSSFFontFormatting.U_SINGLE_ACCOUNTING:
-            case HSSFFontFormatting.U_DOUBLE_ACCOUNTING:
-                fontFormatting.setUnderlineType(underlineType);
-                setUnderlineTypeModified(true);
-                break;
-    
-            case HSSFFontFormatting.U_NONE:
-                fontFormatting.setUnderlineType(underlineType);
-                setUnderlineTypeModified(false);
-                break;
-            default:
-        }
-    }
-
-    /**
-     * @param modified
-     * @see org.apache.poi.hssf.record.cf.FontFormatting#setUnderlineTypeModified(boolean)
-     */
-    public void setUnderlineTypeModified(boolean modified)
-    {
-        fontFormatting.setUnderlineTypeModified(modified);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
deleted file mode 100644
index e23c21b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.FooterRecord;
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-import org.apache.poi.ss.usermodel.Footer;
-
-/**
- * Class to read and manipulate the footer.
- * <P>
- * The footer works by having a left, center, and right side.  The total cannot
- * be more that 255 bytes long.  One uses this class by getting the HSSFFooter
- * from HSSFSheet and then getting or setting the left, center, and right side.
- * For special things (such as page numbers and date), one can use a the methods
- * that return the characters used to represent these.  One can also change the
- * fonts by using similar methods.
- */
-public final class HSSFFooter extends HeaderFooter implements Footer {
-	private final PageSettingsBlock _psb;
-
-	protected HSSFFooter(PageSettingsBlock psb) {
-		_psb = psb;
-	}
-
-	protected String getRawText() {
-		FooterRecord hf = _psb.getFooter();
-		if (hf == null) {
-			return "";
-		}
-		return hf.getText();
-	}
-
-	@Override
-	protected void setHeaderFooterText(String text) {
-		FooterRecord hfr = _psb.getFooter();
-		if (hfr == null) {
-			hfr = new FooterRecord(text);
-			_psb.setFooter(hfr);
-		} else {
-			hfr.setText(text);
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
deleted file mode 100644
index 20c7ffa..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.Map;
-
-import org.apache.poi.ss.formula.BaseFormulaEvaluator;
-import org.apache.poi.ss.formula.CollaboratingWorkbooksEnvironment;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.StringValueEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * Evaluates formula cells.<p/>
- *
- * For performance reasons, this class keeps a cache of all previously calculated intermediate
- * cell values.  Be sure to call {@link #clearAllCachedResultValues()} if any workbook cells are changed between
- * calls to evaluate~ methods on this class.
- */
-public class HSSFFormulaEvaluator extends BaseFormulaEvaluator {
-    private final HSSFWorkbook _book;
-
-    public HSSFFormulaEvaluator(HSSFWorkbook workbook) {
-        this(workbook, null);
-    }
-    /**
-     * @param workbook  The workbook to perform the formula evaluations in
-     * @param stabilityClassifier used to optimise caching performance. Pass <code>null</code>
-     * for the (conservative) assumption that any cell may have its definition changed after
-     * evaluation begins.
-     */
-    public HSSFFormulaEvaluator(HSSFWorkbook workbook, IStabilityClassifier stabilityClassifier) {
-        this(workbook, stabilityClassifier, null);
-    }
-
-    /**
-     * @param workbook  The workbook to perform the formula evaluations in
-     * @param stabilityClassifier used to optimise caching performance. Pass <code>null</code>
-     * for the (conservative) assumption that any cell may have its definition changed after
-     * evaluation begins.
-     * @param udfFinder pass <code>null</code> for default (AnalysisToolPak only)
-     */
-    private HSSFFormulaEvaluator(HSSFWorkbook workbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        super(new WorkbookEvaluator(HSSFEvaluationWorkbook.create(workbook), stabilityClassifier, udfFinder));
-        _book = workbook;
-    }
-
-    /**
-     * @param workbook  The workbook to perform the formula evaluations in
-     * @param stabilityClassifier used to optimise caching performance. Pass <code>null</code>
-     * for the (conservative) assumption that any cell may have its definition changed after
-     * evaluation begins.
-     * @param udfFinder pass <code>null</code> for default (AnalysisToolPak only)
-     */
-    public static HSSFFormulaEvaluator create(HSSFWorkbook workbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        return new HSSFFormulaEvaluator(workbook, stabilityClassifier, udfFinder);
-    }
-    
-    @Override
-    protected RichTextString createRichTextString(String str) {
-        return new HSSFRichTextString(str);
-    }
-
-
-    /**
-     * Coordinates several formula evaluators together so that formulas that involve external
-     * references can be evaluated.
-     * @param workbookNames the simple file names used to identify the workbooks in formulas
-     * with external links (for example "MyData.xls" as used in a formula "[MyData.xls]Sheet1!A1")
-     * @param evaluators all evaluators for the full set of workbooks required by the formulas.
-     */
-    public static void setupEnvironment(String[] workbookNames, HSSFFormulaEvaluator[] evaluators) {
-        BaseFormulaEvaluator.setupEnvironment(workbookNames, evaluators);
-    }
-
-    @Override
-    public void setupReferencedWorkbooks(Map<String, FormulaEvaluator> evaluators) {
-        CollaboratingWorkbooksEnvironment.setupFormulaEvaluator(evaluators);
-    }
-
-    /**
-     * Should be called to tell the cell value cache that the specified (value or formula) cell
-     * has changed.
-     * Failure to call this method after changing cell values will cause incorrect behaviour
-     * of the evaluate~ methods of this class
-     */
-    public void notifyUpdateCell(HSSFCell cell) {
-        _bookEvaluator.notifyUpdateCell(new HSSFEvaluationCell(cell));
-    }
-    @Override
-    public void notifyUpdateCell(Cell cell) {
-        _bookEvaluator.notifyUpdateCell(new HSSFEvaluationCell((HSSFCell)cell));
-    }
-    /**
-     * Should be called to tell the cell value cache that the specified cell has just been
-     * deleted.
-     * Failure to call this method after changing cell values will cause incorrect behaviour
-     * of the evaluate~ methods of this class
-     */
-    public void notifyDeleteCell(HSSFCell cell) {
-        _bookEvaluator.notifyDeleteCell(new HSSFEvaluationCell(cell));
-    }
-    @Override
-    public void notifyDeleteCell(Cell cell) {
-        _bookEvaluator.notifyDeleteCell(new HSSFEvaluationCell((HSSFCell)cell));
-    }
-
-    /**
-     * Should be called to tell the cell value cache that the specified (value or formula) cell
-     * has changed.
-     * Failure to call this method after changing cell values will cause incorrect behaviour
-     * of the evaluate~ methods of this class
-     */
-    @Override
-    public void notifySetFormula(Cell cell) {
-        _bookEvaluator.notifyUpdateCell(new HSSFEvaluationCell((HSSFCell)cell));
-    }
-    
-    @Override
-    public HSSFCell evaluateInCell(Cell cell) {
-        return (HSSFCell) super.evaluateInCell(cell);
-    }
-
-    /**
-     * Loops over all cells in all sheets of the supplied
-     *  workbook.
-     * For cells that contain formulas, their formulas are
-     *  evaluated, and the results are saved. These cells
-     *  remain as formula cells.
-     * For cells that do not contain formulas, no changes
-     *  are made.
-     * This is a helpful wrapper around looping over all
-     *  cells, and calling evaluateFormulaCell on each one.
-     */
-    public static void evaluateAllFormulaCells(HSSFWorkbook wb) {
-        evaluateAllFormulaCells(wb, new HSSFFormulaEvaluator(wb));
-    }
-
-    /**
-     * Loops over all cells in all sheets of the supplied
-     *  workbook.
-     * For cells that contain formulas, their formulas are
-     *  evaluated, and the results are saved. These cells
-     *  remain as formula cells.
-     * For cells that do not contain formulas, no changes
-     *  are made.
-     * This is a helpful wrapper around looping over all
-     *  cells, and calling evaluateFormulaCell on each one.
-     */
-    public static void evaluateAllFormulaCells(Workbook wb) {
-        BaseFormulaEvaluator.evaluateAllFormulaCells(wb);
-    }
-
-    /**
-     * Loops over all cells in all sheets of the supplied
-     *  workbook.
-     * For cells that contain formulas, their formulas are
-     *  evaluated, and the results are saved. These cells
-     *  remain as formula cells.
-     * For cells that do not contain formulas, no changes
-     *  are made.
-     * This is a helpful wrapper around looping over all
-     *  cells, and calling evaluateFormulaCell on each one.
-     */
-    @Override
-    public void evaluateAll() {
-        evaluateAllFormulaCells(_book, this);
-    }
-
-    /**
-     * Returns a CellValue wrapper around the supplied ValueEval instance.
-     * @param cell
-     */
-    protected CellValue evaluateFormulaCellValue(Cell cell) {
-        ValueEval eval = _bookEvaluator.evaluate(new HSSFEvaluationCell((HSSFCell)cell));
-        if (eval instanceof BoolEval) {
-            BoolEval be = (BoolEval) eval;
-            return CellValue.valueOf(be.getBooleanValue());
-        }
-        if (eval instanceof NumericValueEval) {
-            NumericValueEval ne = (NumericValueEval) eval;
-            return new CellValue(ne.getNumberValue());
-        }
-        if (eval instanceof StringValueEval) {
-            StringValueEval ne = (StringValueEval) eval;
-            return new CellValue(ne.getStringValue());
-        }
-        if (eval instanceof ErrorEval) {
-            return CellValue.getError(((ErrorEval)eval).getErrorCode());
-        }
-        throw new RuntimeException("Unexpected eval class (" + eval.getClass().getName() + ")");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setIgnoreMissingWorkbooks(boolean ignore){
-        _bookEvaluator.setIgnoreMissingWorkbooks(ignore);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setDebugEvaluationOutputForNextEval(boolean value){
-        _bookEvaluator.setDebugEvaluationOutputForNextEval(value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
deleted file mode 100644
index 4153087..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.HeaderRecord;
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-import org.apache.poi.ss.usermodel.Header;
-
-/**
- * Class to read and manipulate the header.
- * <P>
- * The header works by having a left, center, and right side.  The total cannot
- * be more that 255 bytes long.  One uses this class by getting the HSSFHeader
- * from HSSFSheet and then getting or setting the left, center, and right side.
- * For special things (such as page numbers and date), one can use a the methods
- * that return the characters used to represent these.  One can also change the
- * fonts by using similar methods.
- */
-public final class HSSFHeader extends HeaderFooter implements Header {
-
-	private final PageSettingsBlock _psb;
-
-	protected HSSFHeader(PageSettingsBlock psb) {
-		_psb = psb;
-	}
-
-	protected String getRawText() {
-		HeaderRecord hf = _psb.getHeader();
-		if (hf == null) {
-			return "";
-		}
-		return hf.getText();
-	}
-
-	@Override
-	protected void setHeaderFooterText(String text) {
-		HeaderRecord hfr = _psb.getHeader();
-		if (hfr == null) {
-			hfr = new HeaderRecord(text);
-			_psb.setHeader(hfr);
-		} else {
-			hfr.setText(text);
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
deleted file mode 100644
index 084a6bf..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.record.HyperlinkRecord;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.util.Internal;
-
-/**
- * Represents an Excel hyperlink.
- */
-public class HSSFHyperlink implements Hyperlink {
-
-    /**
-     * Low-level record object that stores the actual hyperlink data
-     */
-    final protected HyperlinkRecord record;
-
-    /**
-     * If we create a new hyperlink remember its type
-     */
-    final protected HyperlinkType link_type;
-
-    /**
-     * Construct a new hyperlink
-     * 
-     * This method is internal to be used only by
-     * {@link HSSFCreationHelper#createHyperlink(int)}.
-     *
-     * @param type the type of hyperlink to create
-     * @deprecated POI 3.15 beta 3
-     */
-    @Internal(since="3.15 beta 3")
-    protected HSSFHyperlink( int type )
-    {
-        this(HyperlinkType.forInt(type));
-    }
-    
-    /**
-     * Construct a new hyperlink
-     * 
-     * This method is internal to be used only by
-     * {@link HSSFCreationHelper#createHyperlink(HyperlinkType)}.
-     *
-     * @param type the type of hyperlink to create
-     */
-    @Internal(since="3.15 beta 3")
-    protected HSSFHyperlink( HyperlinkType type )
-    {
-        this.link_type = type;
-        record = new HyperlinkRecord();
-        switch(type){
-            case URL:
-            case EMAIL:
-                record.newUrlLink();
-                break;
-            case FILE:
-                record.newFileLink();
-                break;
-            case DOCUMENT:
-                record.newDocumentLink();
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid type: " + type);
-        }
-    }
-
-    /**
-     * Initialize the hyperlink by a <code>HyperlinkRecord</code> record
-     *
-     * @param record
-     */
-    protected HSSFHyperlink( HyperlinkRecord record )
-    {
-        this.record = record;
-        link_type = getType(record);
-    }
-    
-    private static HyperlinkType getType(HyperlinkRecord record) {
-        HyperlinkType link_type;
-        // Figure out the type
-        if (record.isFileLink()) {
-            link_type = HyperlinkType.FILE;
-        } else if(record.isDocumentLink()) {
-            link_type = HyperlinkType.DOCUMENT;
-        } else {
-            if(record.getAddress() != null &&
-                    record.getAddress().startsWith("mailto:")) {
-                link_type = HyperlinkType.EMAIL;
-            } else {
-                link_type = HyperlinkType.URL;
-            }
-        }
-        return link_type;
-    }
-    
-    protected HSSFHyperlink(Hyperlink other) {
-        if (other instanceof HSSFHyperlink) {
-            HSSFHyperlink hlink = (HSSFHyperlink) other;
-            record = hlink.record.clone();
-            link_type = getType(record);
-        }
-        else {
-            link_type = other.getTypeEnum();
-            record = new HyperlinkRecord();
-            setFirstRow(other.getFirstRow());
-            setFirstColumn(other.getFirstColumn());
-            setLastRow(other.getLastRow());
-            setLastColumn(other.getLastColumn());
-        }
-    }
-
-    /**
-     * Return the row of the first cell that contains the hyperlink
-     *
-     * @return the 0-based row of the cell that contains the hyperlink
-     */
-    @Override
-    public int getFirstRow(){
-        return record.getFirstRow();
-    }
-
-    /**
-     * Set the row of the first cell that contains the hyperlink
-     *
-     * @param row the 0-based row of the first cell that contains the hyperlink
-     */
-    @Override
-    public void setFirstRow(int row){
-        record.setFirstRow(row);
-    }
-
-    /**
-     * Return the row of the last cell that contains the hyperlink
-     *
-     * @return the 0-based row of the last cell that contains the hyperlink
-     */
-    @Override
-    public int getLastRow(){
-        return record.getLastRow();
-    }
-
-    /**
-     * Set the row of the last cell that contains the hyperlink
-     *
-     * @param row the 0-based row of the last cell that contains the hyperlink
-     */
-    @Override
-    public void setLastRow(int row){
-        record.setLastRow(row);
-    }
-
-    /**
-     * Return the column of the first cell that contains the hyperlink
-     *
-     * @return the 0-based column of the first cell that contains the hyperlink
-     */
-    @Override
-    public int getFirstColumn(){
-        return record.getFirstColumn();
-    }
-
-    /**
-     * Set the column of the first cell that contains the hyperlink
-     *
-     * @param col the 0-based column of the first cell that contains the hyperlink
-     */
-    @Override
-    public void setFirstColumn(int col){
-        record.setFirstColumn((short)col);
-    }
-
-    /**
-     * Return the column of the last cell that contains the hyperlink
-     *
-     * @return the 0-based column of the last cell that contains the hyperlink
-     */
-    @Override
-    public int getLastColumn(){
-        return record.getLastColumn();
-    }
-
-    /**
-     * Set the column of the last cell that contains the hyperlink
-     *
-     * @param col the 0-based column of the last cell that contains the hyperlink
-     */
-    @Override
-    public void setLastColumn(int col){
-        record.setLastColumn((short)col);
-    }
-
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file, etc.
-     *
-     * @return  the address of this hyperlink
-     */
-    @Override
-    public String getAddress(){
-        return record.getAddress();
-    }
-    public String getTextMark(){
-        return record.getTextMark();
-    }
-
-    /**
-     * Convenience method equivalent to {@link #setAddress(String)}
-     *
-     * @param textMark the place in worksheet this hyperlink refers to, e.g. 'Target Sheet'!A1'
-     */
-    public void setTextMark(String textMark) {
-        record.setTextMark(textMark);
-    }
-    public String getShortFilename(){
-        return record.getShortFilename();
-    }
-    /**
-     * Convenience method equivalent to {@link #setAddress(String)}
-     *
-     * @param shortFilename the path to a file this hyperlink points to, e.g. 'readme.txt'
-     */
-    public void setShortFilename(String shortFilename) {
-        record.setShortFilename(shortFilename);
-    }
-
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file, etc.
-     *
-     * @param address  the address of this hyperlink
-     */
-    @Override
-    public void setAddress(String address){
-        record.setAddress(address);
-    }
-
-    /**
-     * Return text label for this hyperlink
-     *
-     * @return  text to display
-     */
-    @Override
-    public String getLabel(){
-        return record.getLabel();
-    }
-
-    /**
-     * Sets text label for this hyperlink
-     *
-     * @param label text label for this hyperlink
-     */
-    @Override
-    public void setLabel(String label){
-        record.setLabel(label);
-    }
-
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     * @see HyperlinkType#forInt
-     * @deprecated POI 3.15. Use {@link #getTypeEnum()} instead.
-     * getType will return a HyperlinkType enum in the future.
-     */
-    @Override
-    public int getType() {
-        return link_type.getCode();
-    }
-    
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     */
-    @Override
-    public HyperlinkType getTypeEnum() {
-        return link_type;
-    }
-    
-    /**
-     * @return whether the objects have the same HyperlinkRecord
-     */
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) return true;
-        if (!(other instanceof HSSFHyperlink)) return false;
-        HSSFHyperlink otherLink = (HSSFHyperlink) other;
-        return record == otherLink.record;
-    }
-    
-    @Override
-    public int hashCode() {
-        return record.hashCode();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
deleted file mode 100644
index cabfad2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.cf.IconMultiStateFormatting;
-import org.apache.poi.hssf.record.cf.IconMultiStateThreshold;
-import org.apache.poi.hssf.record.cf.Threshold;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold;
-
-/**
- * High level representation for Icon / Multi-State Formatting 
- *  component of Conditional Formatting settings
- */
-public final class HSSFIconMultiStateFormatting implements org.apache.poi.ss.usermodel.IconMultiStateFormatting {
-    private final HSSFSheet sheet;
-    private final CFRule12Record cfRule12Record;
-    private final IconMultiStateFormatting iconFormatting;
-
-    protected HSSFIconMultiStateFormatting(CFRule12Record cfRule12Record, HSSFSheet sheet) {
-        this.sheet = sheet;
-        this.cfRule12Record = cfRule12Record;
-        this.iconFormatting = this.cfRule12Record.getMultiStateFormatting();
-    }
-
-    public IconSet getIconSet() {
-        return iconFormatting.getIconSet();
-    }
-    public void setIconSet(IconSet set) {
-        iconFormatting.setIconSet(set);
-    }
-
-    public boolean isIconOnly() {
-        return iconFormatting.isIconOnly();
-    }
-    public void setIconOnly(boolean only) {
-        iconFormatting.setIconOnly(only);
-    }
-
-    public boolean isReversed() {
-        return iconFormatting.isReversed();
-    }
-    public void setReversed(boolean reversed) {
-        iconFormatting.setReversed(reversed);
-    }
-
-    public HSSFConditionalFormattingThreshold[] getThresholds() {
-        Threshold[] t = iconFormatting.getThresholds();
-        HSSFConditionalFormattingThreshold[] ht = new HSSFConditionalFormattingThreshold[t.length];
-        for (int i=0; i<t.length; i++) {
-            ht[i] = new HSSFConditionalFormattingThreshold(t[i], sheet);
-        }
-        return ht;
-    }
-
-    public void setThresholds(ConditionalFormattingThreshold[] thresholds) {
-        Threshold[] t = new Threshold[thresholds.length];
-        for (int i=0; i<t.length; i++) {
-            t[i] = ((HSSFConditionalFormattingThreshold)thresholds[i]).getThreshold();
-        }
-        iconFormatting.setThresholds(t);
-    }
-
-    public HSSFConditionalFormattingThreshold createThreshold() {
-        return new HSSFConditionalFormattingThreshold(new IconMultiStateThreshold(), sheet);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
deleted file mode 100644
index bbd48c2..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.NameCommentRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * High Level Representation of a 'defined name' which could be a 'built-in' name,
- * 'named range' or name of a user defined function.
- */
-public final class HSSFName implements Name {
-    
-    private HSSFWorkbook _book;
-    private NameRecord _definedNameRec;
-    private NameCommentRecord _commentRec;
-
-    /** 
-     * Creates new HSSFName   - called by HSSFWorkbook to create a name from
-     * scratch.
-     *
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createName()
-     * @param name the Name Record
-     * @param book workbook object associated with the sheet.
-     */
-    /* package */ HSSFName(HSSFWorkbook book, NameRecord name) {
-      this(book, name, null);
-    }
-    /** 
-     * Creates new HSSFName   - called by HSSFWorkbook to create a name from
-     * scratch.
-     *
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createName()
-     * @param name the Name Record
-     * @param comment the Name Comment Record, optional.
-     * @param book workbook object associated with the sheet.
-     */
-    /* package */ HSSFName(final HSSFWorkbook book, final NameRecord name, final NameCommentRecord comment) {
-        _book = book;
-        _definedNameRec = name;
-        _commentRec = comment;
-    }
-
-    /** Get the sheets name which this named range is referenced to
-     * @return sheet name, which this named range referred to
-     */
-    public String getSheetName() {
-        int indexToExternSheet = _definedNameRec.getExternSheetNumber();
-
-        return _book.getWorkbook().findSheetFirstNameFromExternSheet(indexToExternSheet);
-    }
-
-    /**
-     * @return text name of this defined name
-     */
-    public String getNameName(){
-        return _definedNameRec.getNameText();
-    }
-
-    /**
-     * Sets the name of the named range
-     *
-     * <p>The following is a list of syntax rules that you need to be aware of when you create and edit names.</p>
-     * <ul>
-     *   <li><strong>Valid characters</strong>
-     *   The first character of a name must be a letter, an underscore character (_), or a backslash (\).
-     *   Remaining characters in the name can be letters, numbers, periods, and underscore characters.
-     *   </li>
-     *   <li><strong>Cell references disallowed</strong>
-     *   Names cannot be the same as a cell reference, such as Z$100 or R1C1.</li>
-     *   <li><strong>Spaces are not valid</strong>
-     *   Spaces are not allowed as part of a name. Use the underscore character (_) and period (.) as word separators, such as, Sales_Tax or First.Quarter.
-     *   </li>
-     *   <li><strong>Name length</strong>
-     *    A name can contain up to 255 characters.
-     *   </li>
-     *   <li><strong>Case sensitivity</strong>
-     *   Names can contain uppercase and lowercase letters.
-     *   </li>
-     * </ul>
-     *
-     * <p>
-     * A name must always be unique within its scope. POI prevents you from defining a name that is not unique
-     * within its scope. However you can use the same name in different scopes. Example:
-     * <pre><blockquote>
-     * //by default names are workbook-global
-     * HSSFName name;
-     * name = workbook.createName();
-     * name.setNameName("sales_08");
-     *
-     * name = workbook.createName();
-     * name.setNameName("sales_08"); //will throw an exception: "The workbook already contains this name (case-insensitive)"
-     *
-     * //create sheet-level name
-     * name = workbook.createName();
-     * name.setSheetIndex(0); //the scope of the name is the first sheet
-     * name.setNameName("sales_08");  //ok
-     *
-     * name = workbook.createName();
-     * name.setSheetIndex(0);
-     * name.setNameName("sales_08");  //will throw an exception: "The sheet already contains this name (case-insensitive)"
-     *
-     * </blockquote></pre>
-    * </p>
-     *
-     * @param nameName named range name to set
-     * @throws IllegalArgumentException if the name is invalid or the name already exists (case-insensitive)
-     */
-    public void setNameName(String nameName){
-        validateName(nameName);
-
-        InternalWorkbook wb = _book.getWorkbook();
-        _definedNameRec.setNameText(nameName);
-
-        int sheetNumber = _definedNameRec.getSheetNumber();
-
-        //Check to ensure no other names have the same case-insensitive name
-        final int lastNameIndex = wb.getNumNames()-1;
-        for ( int i = lastNameIndex; i >=0; i-- )
-        {
-            NameRecord rec = wb.getNameRecord(i);
-            if (rec != _definedNameRec) {
-                if (rec.getNameText().equalsIgnoreCase(nameName) && sheetNumber == rec.getSheetNumber()){
-                    String msg = "The "+(sheetNumber == 0 ? "workbook" : "sheet")+" already contains this name: " + nameName;
-                    _definedNameRec.setNameText(nameName + "(2)");
-                    throw new IllegalArgumentException(msg);
-                }
-            }
-        }
-        
-        // Update our comment, if there is one
-        if(_commentRec != null) {
-           _commentRec.setNameText(nameName);
-           _book.getWorkbook().updateNameCommentRecordCache(_commentRec);
-        }
-    }
-
-    /**
-     * https://support.office.com/en-us/article/Define-and-use-names-in-formulas-4D0F13AC-53B7-422E-AFD2-ABD7FF379C64#bmsyntax_rules_for_names
-     * 
-     * Valid characters:
-     *   First character: { letter | underscore | backslash }
-     *   Remaining characters: { letter | number | period | underscore }
-     *   
-     * Cell shorthand: cannot be { "C" | "c" | "R" | "r" }
-     * 
-     * Cell references disallowed: cannot be a cell reference $A$1 or R1C1
-     * 
-     * Spaces are not valid (follows from valid characters above)
-     * 
-     * Name length: (XSSF-specific?) 255 characters maximum
-     * 
-     * Case sensitivity: all names are case-insensitive
-     * 
-     * Uniqueness: must be unique (for names with the same scope)
-     *
-     * @param name
-     */
-    private static void validateName(String name) {
-
-        if (name.length() == 0) {
-            throw new IllegalArgumentException("Name cannot be blank");
-        }
-        if (name.length() > 255) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': cannot exceed 255 characters in length");
-        }
-        if (name.equalsIgnoreCase("R") || name.equalsIgnoreCase("C")) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': cannot be special shorthand R or C");
-        }
-        
-        // is first character valid?
-        char c = name.charAt(0);
-        String allowedSymbols = "_\\";
-        boolean characterIsValid = (Character.isLetter(c) || allowedSymbols.indexOf(c) != -1);
-        if (!characterIsValid) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': first character must be underscore or a letter");
-        }
-        
-        // are all other characters valid?
-        allowedSymbols = "_.\\"; //backslashes needed for unicode escape
-        for (final char ch : name.toCharArray()) {
-            characterIsValid = (Character.isLetterOrDigit(ch) || allowedSymbols.indexOf(ch) != -1);
-            if (!characterIsValid) {
-                throw new IllegalArgumentException("Invalid name: '"+name+"': name must be letter, digit, period, or underscore");
-            }
-        }
-        
-        // Is the name a valid $A$1 cell reference
-        // Because $, :, and ! are disallowed characters, A1-style references become just a letter-number combination
-        if (name.matches("[A-Za-z]+\\d+")) {
-            String col = name.replaceAll("\\d", "");
-            String row = name.replaceAll("[A-Za-z]", "");
-            if (CellReference.cellReferenceIsWithinRange(col, row, SpreadsheetVersion.EXCEL97)) {
-                throw new IllegalArgumentException("Invalid name: '"+name+"': cannot be $A$1-style cell reference");
-            }
-        }
-        
-        // Is the name a valid R1C1 cell reference?
-        if (name.matches("[Rr]\\d+[Cc]\\d+")) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': cannot be R1C1-style cell reference");
-        }
-    }
-
-    public void setRefersToFormula(String formulaText) {
-        Ptg[] ptgs = HSSFFormulaParser.parse(formulaText, _book, FormulaType.NAMEDRANGE, getSheetIndex());
-        _definedNameRec.setNameDefinition(ptgs);
-    }
-
-    public String getRefersToFormula() {
-        if (_definedNameRec.isFunctionName()) {
-            throw new IllegalStateException("Only applicable to named ranges");
-        }
-        Ptg[] ptgs = _definedNameRec.getNameDefinition();
-        if (ptgs.length < 1) {
-            // 'refersToFormula' has not been set yet
-            return null;
-        }
-        return HSSFFormulaParser.toFormulaString(_book, ptgs);
-    }
-
-
-    /**
-     * Sets the NameParsedFormula structure that specifies the formula for the 
-     * defined name.
-     * 
-     * @param ptgs the sequence of {@link Ptg}s for the formula.
-     */
-    void setNameDefinition(Ptg[] ptgs) {
-      _definedNameRec.setNameDefinition(ptgs);
-    }
-
-
-    public boolean isDeleted(){
-        Ptg[] ptgs = _definedNameRec.getNameDefinition();
-        return Ptg.doesFormulaReferToDeletedCell(ptgs);
-    }
-
-    /**
-     * Checks if this name is a function name
-     *
-     * @return true if this name is a function name
-     */
-    public boolean isFunctionName() {
-        return _definedNameRec.isFunctionName();
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer(64);
-        sb.append(getClass().getName()).append(" [");
-        sb.append(_definedNameRec.getNameText());
-        sb.append("]");
-        return sb.toString();
-    }
-
-    /**
-     * Specifies if the defined name is a local name, and if so, which sheet it is on.
-     *
-     * @param index if greater than 0, the defined name is a local name and the value MUST be a 0-based index
-     * to the collection of sheets as they appear in the workbook.
-     * @throws IllegalArgumentException if the sheet index is invalid.
-     */
-    public void setSheetIndex(int index){
-        int lastSheetIx = _book.getNumberOfSheets() - 1;
-        if (index < -1 || index > lastSheetIx) {
-            throw new IllegalArgumentException("Sheet index (" + index +") is out of range" +
-                    (lastSheetIx == -1 ? "" : (" (0.." +    lastSheetIx + ")")));
-        }
-
-        _definedNameRec.setSheetNumber(index + 1);
-    }
-
-    /**
-     * Returns the sheet index this name applies to.
-     *
-     * @return the sheet index this name applies to, -1 if this name applies to the entire workbook
-     */
-    public int getSheetIndex(){
-        return _definedNameRec.getSheetNumber() - 1;
-    }
-
-    /**
-     * Returns the comment the user provided when the name was created.
-     *
-     * @return the user comment for this named range
-     */
-    public String getComment() {
-        if(_commentRec != null) {
-           // Prefer the comment record if it has text in it
-           if(_commentRec.getCommentText() != null &&
-                 _commentRec.getCommentText().length() > 0) {
-              return _commentRec.getCommentText();
-           }
-        }
-        return _definedNameRec.getDescriptionText();
-    }
-
-    /**
-     * Sets the comment the user provided when the name was created.
-     *
-     * @param comment the user comment for this named range
-     */
-    public void setComment(String comment){
-        // Update the main record
-        _definedNameRec.setDescriptionText(comment);
-        // If we have a comment record too, update that as well
-        if(_commentRec != null) {
-           _commentRec.setCommentText(comment);
-        }
-    }
-
-    /**
-     * Indicates that the defined name refers to a user-defined function.
-     * This attribute is used when there is an add-in or other code project associated with the file.
-     *
-     * @param value <code>true</code> indicates the name refers to a function.
-     */
-    public void setFunction(boolean value) {
-        _definedNameRec.setFunction(value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
deleted file mode 100644
index d92f216..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.util.HexDump;
-
-/**
- * Represents binary object (i.e. OLE) data stored in the file.  Eg. A GIF, JPEG etc...
- * <p/>
- * Right now, 13, july, 2012 can not be created from scratch
- */
-public final class HSSFObjectData extends HSSFPicture {
-    /**
-     * Reference to the filesystem root, required for retrieving the object data.
-     */
-    private final DirectoryEntry _root;
-
-    public HSSFObjectData(EscherContainerRecord spContainer, ObjRecord objRecord, DirectoryEntry _root) {
-        super(spContainer, objRecord);
-        this._root = _root;
-    }
-
-    /**
-     * Returns the OLE2 Class Name of the object
-     */
-    public String getOLE2ClassName() {
-        return findObjectRecord().getOLEClassName();
-    }
-
-    /**
-     * Gets the object data. Only call for ones that have
-     * data though. See {@link #hasDirectoryEntry()}
-     *
-     * @return the object data as an OLE2 directory.
-     * @throws IOException if there was an error reading the data.
-     */
-    public DirectoryEntry getDirectory() throws IOException {
-        EmbeddedObjectRefSubRecord subRecord = findObjectRecord();
-
-        int streamId = subRecord.getStreamId().intValue();
-        String streamName = "MBD" + HexDump.toHex(streamId);
-
-        Entry entry = _root.getEntry(streamName);
-        if (entry instanceof DirectoryEntry) {
-            return (DirectoryEntry) entry;
-        }
-        throw new IOException("Stream " + streamName + " was not an OLE2 directory");
-    }
-
-    /**
-     * Returns the data portion, for an ObjectData
-     * that doesn't have an associated POIFS Directory
-     * Entry
-     */
-    public byte[] getObjectData() {
-        return findObjectRecord().getObjectData();
-    }
-
-    /**
-     * Does this ObjectData have an associated POIFS
-     * Directory Entry?
-     * (Not all do, those that don't have a data portion)
-     */
-    public boolean hasDirectoryEntry() {
-        EmbeddedObjectRefSubRecord subRecord = findObjectRecord();
-
-        // 'stream id' field tells you
-        Integer streamId = subRecord.getStreamId();
-        return streamId != null && streamId.intValue() != 0;
-    }
-
-    /**
-     * Finds the EmbeddedObjectRefSubRecord, or throws an
-     * Exception if there wasn't one
-     */
-    protected EmbeddedObjectRefSubRecord findObjectRecord() {
-        Iterator<SubRecord> subRecordIter = getObjRecord().getSubRecords().iterator();
-
-        while (subRecordIter.hasNext()) {
-            Object subRecord = subRecordIter.next();
-            if (subRecord instanceof EmbeddedObjectRefSubRecord) {
-                return (EmbeddedObjectRefSubRecord) subRecord;
-            }
-        }
-
-        throw new IllegalStateException("Object data does not contain a reference to an embedded object OLE2 directory");
-    }
-
-    @Override
-    protected EscherContainerRecord createSpContainer() {
-        throw new IllegalStateException("HSSFObjectData cannot be created from scratch");
-    }
-
-    @Override
-    protected ObjRecord createObjRecord() {
-        throw new IllegalStateException("HSSFObjectData cannot be created from scratch");
-    }
-
-    @Override
-    protected void afterRemove(HSSFPatriarch patriarch) {
-        throw new IllegalStateException("HSSFObjectData cannot be created from scratch");
-    }
-
-    @Override
-    void afterInsert(HSSFPatriarch patriarch) {
-        EscherAggregate agg = patriarch.getBoundAggregate();
-        agg.associateShapeToObjRecord(getEscherContainer().getChildById(EscherClientDataRecord.RECORD_ID), getObjRecord());
-        EscherBSERecord bse =
-                patriarch.getSheet().getWorkbook().getWorkbook().getBSERecord(getPictureIndex());
-        bse.setRef(bse.getRef() + 1);
-    }
-
-    @Override
-    protected HSSFShape cloneShape() {
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        byte[] inSp = getEscherContainer().serialize();
-        spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());
-        ObjRecord obj = (ObjRecord) getObjRecord().cloneViaReserialise();
-        return new HSSFObjectData(spContainer, obj, _root);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
deleted file mode 100644
index d28b7fd..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import java.util.HashSet;
-
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-
-/**
- * Excel can get cranky if you give it files containing too
- *  many (especially duplicate) objects, and this class can
- *  help to avoid those.
- * In general, it's much better to make sure you don't 
- *  duplicate the objects in your code, as this is likely
- *  to be much faster than creating lots and lots of
- *  excel objects+records, only to optimise them down to
- *  many fewer at a later stage.
- * However, sometimes this is too hard / tricky to do, which
- *  is where the use of this class comes in.
- */
-public class HSSFOptimiser {
-	/**
-	 * Goes through the Workbook, optimising the fonts by
-	 *  removing duplicate ones.
-	 * For now, only works on fonts used in {@link HSSFCellStyle}
-	 *  and {@link HSSFRichTextString}. Any other font uses
-	 *  (eg charts, pictures) may well end up broken!
-	 * This can be a slow operation, especially if you have
-	 *  lots of cells, cell styles or rich text strings
-	 * @param workbook The workbook in which to optimise the fonts
-	 */
-	public static void optimiseFonts(HSSFWorkbook workbook) {
-		// Where each font has ended up, and if we need to
-		//  delete the record for it. Start off with no change
-		short[] newPos = 
-			new short[workbook.getWorkbook().getNumberOfFontRecords()+1];
-		boolean[] zapRecords = new boolean[newPos.length];
-		for(int i=0; i<newPos.length; i++) {
-			newPos[i] = (short)i;
-			zapRecords[i] = false;
-		}
-		
-		// Get each font record, so we can do deletes
-		//  without getting confused
-		FontRecord[] frecs = new FontRecord[newPos.length]; 
-		for(int i=0; i<newPos.length; i++) {
-			// There is no 4!
-			if(i == 4) continue;
-			
-			frecs[i] = workbook.getWorkbook().getFontRecordAt(i);
-		}
-		
-		// Loop over each font, seeing if it is the same
-		//  as an earlier one. If it is, point users of the
-		//  later duplicate copy to the earlier one, and 
-		//  mark the later one as needing deleting
-		// Note - don't change built in fonts (those before 5)
-		for(int i=5; i<newPos.length; i++) {
-			// Check this one for being a duplicate
-			//  of an earlier one
-			int earlierDuplicate = -1;
-			for(int j=0; j<i && earlierDuplicate == -1; j++) {
-				if(j == 4) continue;
-				
-				FontRecord frCheck = workbook.getWorkbook().getFontRecordAt(j);
-				if(frCheck.sameProperties(frecs[i])) {
-					earlierDuplicate = j;
-				}
-			}
-			
-			// If we got a duplicate, mark it as such
-			if(earlierDuplicate != -1) {
-				newPos[i] = (short)earlierDuplicate;
-				zapRecords[i] = true;
-			}
-		}
-		
-		// Update the new positions based on
-		//  deletes that have occurred between
-		//  the start and them
-		// Only need to worry about user fonts
-		for(int i=5; i<newPos.length; i++) {
-			// Find the number deleted to that
-			//  point, and adjust
-			short preDeletePos = newPos[i];
-			short newPosition = preDeletePos;
-			for(int j=0; j<preDeletePos; j++) {
-				if(zapRecords[j]) newPosition--;
-			}
-			
-			// Update the new position
-			newPos[i] = newPosition;
-		}
-		
-		// Zap the un-needed user font records
-		for(int i=5; i<newPos.length; i++) {
-			if(zapRecords[i]) {
-				workbook.getWorkbook().removeFontRecord(
-						frecs[i]
-				);
-			}
-		}
-		
-		// Tell HSSFWorkbook that it needs to
-		//  re-start its HSSFFontCache
-		workbook.resetFontCache();
-		
-		// Update the cell styles to point at the 
-		//  new locations of the fonts
-		for(int i=0; i<workbook.getWorkbook().getNumExFormats(); i++) {
-			ExtendedFormatRecord xfr = workbook.getWorkbook().getExFormatAt(i);
-			xfr.setFontIndex(
-					newPos[ xfr.getFontIndex() ]
-			);
-		}
-		
-		// Update the rich text strings to point at
-		//  the new locations of the fonts
-		// Remember that one underlying unicode string
-		//  may be shared by multiple RichTextStrings!
-		HashSet<UnicodeString> doneUnicodeStrings = new HashSet<UnicodeString>();
-		for(int sheetNum=0; sheetNum<workbook.getNumberOfSheets(); sheetNum++) {
-			HSSFSheet s = workbook.getSheetAt(sheetNum);
-			for (Row row : s) {
-			   for (Cell cell : row) {
-					if(cell.getCellTypeEnum() == CellType.STRING) {
-						HSSFRichTextString rtr = (HSSFRichTextString)cell.getRichStringCellValue();
-						UnicodeString u = rtr.getRawUnicodeString();
-						
-						// Have we done this string already?
-						if(! doneUnicodeStrings.contains(u)) {
-							// Update for each new position
-							for(short i=5; i<newPos.length; i++) {
-								if(i != newPos[i]) {
-									u.swapFontUse(i, newPos[i]);
-								}
-							}
-							
-							// Mark as done
-							doneUnicodeStrings.add(u);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-   /**
-    * Goes through the Wokrbook, optimising the cell styles
-    *  by removing duplicate ones, and ones that aren't used.
-    * For best results, optimise the fonts via a call to
-    *  {@link #optimiseFonts(HSSFWorkbook)} first.
-    * @param workbook The workbook in which to optimise the cell styles
-    */
-   public static void optimiseCellStyles(HSSFWorkbook workbook) {
-       // Where each style has ended up, and if we need to
-       //  delete the record for it. Start off with no change
-       short[] newPos = new short[workbook.getWorkbook().getNumExFormats()];
-       boolean[] isUsed = new boolean[newPos.length];
-       boolean[] zapRecords = new boolean[newPos.length];
-       for(int i=0; i<newPos.length; i++) {
-           isUsed[i] = false;
-           newPos[i] = (short)i;
-           zapRecords[i] = false;
-       }
-
-       // Get each style record, so we can do deletes
-       //  without getting confused
-       ExtendedFormatRecord[] xfrs = new ExtendedFormatRecord[newPos.length]; 
-       for(int i=0; i<newPos.length; i++) {
-           xfrs[i] = workbook.getWorkbook().getExFormatAt(i);
-       }
-
-       // Loop over each style, seeing if it is the same
-       //  as an earlier one. If it is, point users of the
-       //  later duplicate copy to the earlier one, and 
-       //  mark the later one as needing deleting
-       // Only work on user added ones, which come after 20
-       for(int i=21; i<newPos.length; i++) {
-           // Check this one for being a duplicate
-           //  of an earlier one
-           int earlierDuplicate = -1;
-           for(int j=0; j<i && earlierDuplicate == -1; j++) {
-               ExtendedFormatRecord xfCheck = workbook.getWorkbook().getExFormatAt(j);
-               if(xfCheck.equals(xfrs[i])) {
-                   earlierDuplicate = j;
-               }
-           }
-
-           // If we got a duplicate, mark it as such
-           if(earlierDuplicate != -1) {
-               newPos[i] = (short)earlierDuplicate;
-               zapRecords[i] = true;
-           }
-           // If we got a duplicate, mark the one we're keeping as used
-           if(earlierDuplicate != -1) {
-               isUsed[earlierDuplicate] = true;
-           }
-       }
-
-       // Loop over all the cells in the file, and identify any user defined
-       //  styles aren't actually being used (don't touch built-in ones)
-       for(int sheetNum=0; sheetNum<workbook.getNumberOfSheets(); sheetNum++) {
-           HSSFSheet s = workbook.getSheetAt(sheetNum);
-           for (Row row : s) {
-               for (Cell cellI : row) {
-                   HSSFCell cell = (HSSFCell)cellI;
-                   short oldXf = cell.getCellValueRecord().getXFIndex();
-                   isUsed[oldXf] = true;
-               }
-           }
-       }
-       // Mark any that aren't used as needing zapping
-       for (int i=21; i<isUsed.length; i++) {
-           if (! isUsed[i]) {
-               // Un-used style, can be removed
-               zapRecords[i] = true;
-               newPos[i] = 0;
-           }
-       }
-
-       // Update the new positions based on
-       //  deletes that have occurred between
-       //  the start and them
-       // Only work on user added ones, which come after 20
-       for(int i=21; i<newPos.length; i++) {
-           // Find the number deleted to that
-           //  point, and adjust
-           short preDeletePos = newPos[i];
-           short newPosition = preDeletePos;
-           for(int j=0; j<preDeletePos; j++) {
-               if(zapRecords[j]) newPosition--;
-           }
-
-           // Update the new position
-           newPos[i] = newPosition;
-       }
-
-       // Zap the un-needed user style records
-       // removing by index, because removing by object may delete
-       // styles we did not intend to (the ones that _were_ duplicated and not the duplicates)
-       int max = newPos.length;
-       int removed = 0; // to adjust index after deletion
-       for(int i=21; i<max; i++) {
-           if(zapRecords[i + removed]) {
-               workbook.getWorkbook().removeExFormatRecord(i);
-               i--;
-               max--;
-               removed++;
-           }
-       }
-
-       // Finally, update the cells to point at their new extended format records
-       for(int sheetNum=0; sheetNum<workbook.getNumberOfSheets(); sheetNum++) {
-           HSSFSheet s = workbook.getSheetAt(sheetNum);
-           for (Row row : s) {
-               for (Cell cellI : row) {
-                   HSSFCell cell = (HSSFCell)cellI;
-                   short oldXf = cell.getCellValueRecord().getXFIndex();
-
-                   HSSFCellStyle newStyle = workbook.getCellStyleAt(
-                           newPos[oldXf]
-                           );
-                   cell.setCellStyle(newStyle);
-               }
-           }
-       }
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
deleted file mode 100644
index 0d754da..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.Locale;
-
-import org.apache.poi.hssf.record.PaletteRecord;
-import org.apache.poi.hssf.util.HSSFColor;
-
-/**
- * Represents a workbook color palette.
- * Internally, the XLS format refers to colors using an offset into the palette
- * record.  Thus, the first color in the palette has the index 0x8, the second
- * has the index 0x9, etc. through 0x40
- */
-public final class HSSFPalette {
-    private PaletteRecord _palette;
-
-    protected HSSFPalette(PaletteRecord palette)
-    {
-        _palette = palette;
-    }
-
-    /**
-     * Retrieves the color at a given index
-     *
-     * @param index the palette index, between 0x8 to 0x40 inclusive
-     * @return the color, or null if the index is not populated
-     */
-    public HSSFColor getColor(short index)
-    {
-        //Handle the special AUTOMATIC case
-        if (index == HSSFColor.AUTOMATIC.index) {
-            return HSSFColor.AUTOMATIC.getInstance();
-        }
-        byte[] b = _palette.getColor(index);
-          if (b != null)
-          {
-             return new CustomColor(index, b);
-          }
-        return null;
-    }
-    /**
-     * Retrieves the color at a given index
-     *
-     * @param index the palette index, between 0x8 to 0x40 inclusive
-     * @return the color, or null if the index is not populated
-     */
-    public HSSFColor getColor(int index) {
-    	return getColor((short)index);
-    }
-
-    /**
-     * Finds the first occurrence of a given color
-     *
-     * @param red the RGB red component, between 0 and 255 inclusive
-     * @param green the RGB green component, between 0 and 255 inclusive
-     * @param blue the RGB blue component, between 0 and 255 inclusive
-     * @return the color, or null if the color does not exist in this palette
-     */
-    public HSSFColor findColor(byte red, byte green, byte blue)
-    {
-        byte[] b = _palette.getColor(PaletteRecord.FIRST_COLOR_INDEX);
-        for (short i = PaletteRecord.FIRST_COLOR_INDEX; b != null;
-            b = _palette.getColor(++i))
-        {
-            if (b[0] == red && b[1] == green && b[2] == blue)
-            {
-                return new CustomColor(i, b);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Finds the closest matching color in the custom palette.  The
-     * method for finding the distance between the colors is fairly
-     * primative.
-     *
-     * @param red   The red component of the color to match.
-     * @param green The green component of the color to match.
-     * @param blue  The blue component of the color to match.
-     * @return  The closest color or null if there are no custom
-     *          colors currently defined.
-     */
-    public HSSFColor findSimilarColor(byte red, byte green, byte blue) {
-    	return findSimilarColor(unsignedInt(red), unsignedInt(green), unsignedInt(blue));
-    }
-    /**
-     * Finds the closest matching color in the custom palette.  The
-     * method for finding the distance between the colors is fairly
-     * primative.
-     *
-     * @param red   The red component of the color to match.
-     * @param green The green component of the color to match.
-     * @param blue  The blue component of the color to match.
-     * @return  The closest color or null if there are no custom
-     *          colors currently defined.
-     */
-    public HSSFColor findSimilarColor(int red, int green, int blue) {
-        HSSFColor result = null;
-        int minColorDistance = Integer.MAX_VALUE;
-        byte[] b = _palette.getColor(PaletteRecord.FIRST_COLOR_INDEX);
-        for (short i = PaletteRecord.FIRST_COLOR_INDEX; b != null;
-            b = _palette.getColor(++i))
-        {
-            int colorDistance = Math.abs(red - unsignedInt(b[0])) +
-            	Math.abs(green - unsignedInt(b[1])) +
-            	Math.abs(blue - unsignedInt(b[2]));
-            if (colorDistance < minColorDistance)
-            {
-                minColorDistance = colorDistance;
-                result = getColor(i);
-            }
-        }
-        return result;
-    }
-    
-    /**
-     * Turn a byte of between -127 and 127 into something between
-     *  0 and 255, so distance calculations work as expected.
-     */
-    private int unsignedInt(byte b) {
-    	return 0xFF & b;
-    }
-
-    /**
-     * Sets the color at the given offset
-     *
-     * @param index the palette index, between 0x8 to 0x40 inclusive
-     * @param red the RGB red component, between 0 and 255 inclusive
-     * @param green the RGB green component, between 0 and 255 inclusive
-     * @param blue the RGB blue component, between 0 and 255 inclusive
-     */
-    public void setColorAtIndex(short index, byte red, byte green, byte blue)
-    {
-        _palette.setColor(index, red, green, blue);
-    }
-
-    /**
-     * Adds a new color into an empty color slot.
-     * @param red       The red component
-     * @param green     The green component
-     * @param blue      The blue component
-     *
-     * @return  The new custom color.
-     *
-     * @throws RuntimeException if there are more more free color indexes.
-     */
-    public HSSFColor addColor( byte red, byte green, byte blue )
-    {
-        byte[] b = _palette.getColor(PaletteRecord.FIRST_COLOR_INDEX);
-        short i;
-        for (i = PaletteRecord.FIRST_COLOR_INDEX; i < PaletteRecord.STANDARD_PALETTE_SIZE + PaletteRecord.FIRST_COLOR_INDEX; b = _palette.getColor(++i))
-        {
-            if (b == null)
-            {
-                setColorAtIndex( i, red, green, blue );
-                return getColor(i);
-            }
-        }
-        throw new RuntimeException("Could not find free color index");
-    }
-
-    private static final class CustomColor extends HSSFColor {
-        private short _byteOffset;
-        private byte _red;
-        private byte _green;
-        private byte _blue;
-
-        public CustomColor(short byteOffset, byte[] colors)
-        {
-            this(byteOffset, colors[0], colors[1], colors[2]);
-        }
-
-        private CustomColor(short byteOffset, byte red, byte green, byte blue)
-        {
-            _byteOffset = byteOffset;
-            _red = red;
-            _green = green;
-            _blue = blue;
-        }
-
-        @Override
-        public short getIndex()
-        {
-            return _byteOffset;
-        }
-
-        @Override
-        public short[] getTriplet()
-        {
-            return new short[]
-            {
-                (short) (_red   & 0xff),
-                (short) (_green & 0xff),
-                (short) (_blue  & 0xff)
-            };
-        }
-
-        @Override
-        public String getHexString()
-        {
-            StringBuffer sb = new StringBuffer();
-            sb.append(getGnumericPart(_red));
-            sb.append(':');
-            sb.append(getGnumericPart(_green));
-            sb.append(':');
-            sb.append(getGnumericPart(_blue));
-            return sb.toString();
-        }
-
-        private String getGnumericPart(byte color)
-        {
-            String s;
-            if (color == 0)
-            {
-                s = "0";
-            }
-            else
-            {
-                int c = color & 0xff; //as unsigned
-                c = (c << 8) | c; //pad to 16-bit
-                s = Integer.toHexString(c).toUpperCase(Locale.ROOT);
-                while (s.length() < 4)
-                {
-                    s = "0" + s;
-                }
-            }
-            return s;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
deleted file mode 100644
index 625897d..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
+++ /dev/null
@@ -1,566 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.ddf.EscherComplexProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.ddf.EscherSpgrRecord;
-import org.apache.poi.hssf.model.DrawingManager2;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.EmbeddedObjectRefSubRecord;
-import org.apache.poi.hssf.record.EndSubRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.FtCfSubRecord;
-import org.apache.poi.hssf.record.FtPioGrbitSubRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.StringUtil;
-
-/**
- * The patriarch is the toplevel container for shapes in a sheet.  It does
- * little other than act as a container for other shapes and groups.
- */
-public final class HSSFPatriarch implements HSSFShapeContainer, Drawing {
-    // private static POILogger log = POILogFactory.getLogger(HSSFPatriarch.class);
-    private final List<HSSFShape> _shapes = new ArrayList<HSSFShape>();
-
-    private final EscherSpgrRecord _spgrRecord;
-    private final EscherContainerRecord _mainSpgrContainer;
-
-    /**
-     * The EscherAggregate we have been bound to.
-     * (This will handle writing us out into records,
-     * and building up our shapes from the records)
-     */
-    private EscherAggregate _boundAggregate;
-    private final HSSFSheet _sheet;
-
-    /**
-     * Creates the patriarch.
-     *
-     * @param sheet the sheet this patriarch is stored in.
-     * @param boundAggregate -low level representation of all binary data inside sheet
-     */
-    HSSFPatriarch(HSSFSheet sheet, EscherAggregate boundAggregate) {
-        _sheet = sheet;
-        _boundAggregate = boundAggregate;
-        _mainSpgrContainer = _boundAggregate.getEscherContainer().getChildContainers().get(0);
-        EscherContainerRecord spContainer = (EscherContainerRecord) _boundAggregate.getEscherContainer()
-                .getChildContainers().get(0).getChild(0);
-        _spgrRecord = spContainer.getChildById(EscherSpgrRecord.RECORD_ID);
-        buildShapeTree();
-    }
-
-    /**
-     * used to clone patriarch
-     *
-     * create patriarch from existing one
-     * @param patriarch - copy all the shapes from this patriarch to new one
-     * @param sheet where must be located new patriarch
-     * @return new patriarch with copies of all shapes from the existing patriarch
-     */
-    static HSSFPatriarch createPatriarch(HSSFPatriarch patriarch, HSSFSheet sheet){
-        HSSFPatriarch newPatriarch = new HSSFPatriarch(sheet, new EscherAggregate(true));
-        newPatriarch.afterCreate();
-        for (HSSFShape shape: patriarch.getChildren()){
-            HSSFShape newShape;
-            if (shape instanceof HSSFShapeGroup){
-                newShape = ((HSSFShapeGroup)shape).cloneShape(newPatriarch);
-            } else {
-                newShape = shape.cloneShape();
-            }
-            newPatriarch.onCreate(newShape);
-            newPatriarch.addShape(newShape);
-        }
-        return newPatriarch;
-    }
-
-    /**
-     * check if any shapes contain wrong data
-     * At now(13.08.2010) check if patriarch contains 2 or more comments with same coordinates
-     */
-    protected void preSerialize(){
-        Map<Integer, NoteRecord> tailRecords = _boundAggregate.getTailRecords();
-        /**
-         * contains coordinates of comments we iterate over
-         */
-        Set<String> coordinates = new HashSet<String>(tailRecords.size());
-        for(NoteRecord rec : tailRecords.values()){
-            String noteRef = new CellReference(rec.getRow(),
-                    rec.getColumn()).formatAsString(); // A1-style notation
-            if(coordinates.contains(noteRef )){
-                throw new IllegalStateException("found multiple cell comments for cell " + noteRef );
-            } else {
-                coordinates.add(noteRef);
-            }
-        }
-    }
-
-    /**
-     * @param shape to be removed
-     * @return true of shape is removed
-     */
-    public boolean removeShape(HSSFShape shape) {
-        boolean  isRemoved = _mainSpgrContainer.removeChildRecord(shape.getEscherContainer());
-        if (isRemoved){
-            shape.afterRemove(this);
-            _shapes.remove(shape);
-        }
-        return isRemoved;
-    }
-
-    void afterCreate() {
-        DrawingManager2 drawingManager = _sheet.getWorkbook().getWorkbook().getDrawingManager();
-        short dgId = drawingManager.findNewDrawingGroupId();
-        _boundAggregate.setDgId(dgId);
-        _boundAggregate.setMainSpRecordId(newShapeId());
-        drawingManager.incrementDrawingsSaved();
-    }
-
-    /**
-     * Creates a new group record stored under this patriarch.
-     *
-     * @param anchor the client anchor describes how this group is attached
-     *               to the sheet.
-     * @return the newly created group.
-     */
-    public HSSFShapeGroup createGroup(HSSFClientAnchor anchor) {
-        HSSFShapeGroup group = new HSSFShapeGroup(null, anchor);
-        addShape(group);
-        onCreate(group);
-        return group;
-    }
-
-    /**
-     * Creates a simple shape.  This includes such shapes as lines, rectangles,
-     * and ovals.
-     * 
-     * Note: Microsoft Excel seems to sometimes disallow 
-     * higher y1 than y2 or higher x1 than x2 in the anchor, you might need to 
-     * reverse them and draw shapes vertically or horizontally flipped! 
-     *
-     * @param anchor the client anchor describes how this group is attached
-     *               to the sheet.
-     * @return the newly created shape.
-     */
-    public HSSFSimpleShape createSimpleShape(HSSFClientAnchor anchor) {
-        HSSFSimpleShape shape = new HSSFSimpleShape(null, anchor);
-        addShape(shape);
-        //open existing file
-        onCreate(shape);
-        return shape;
-    }
-
-    /**
-     * Creates a picture.
-     *
-     * @param anchor the client anchor describes how this group is attached
-     *               to the sheet.
-     * @param pictureIndex - pointer to the byte array saved inside workbook in escher bse record
-     * @return the newly created shape.
-     */
-    public HSSFPicture createPicture(HSSFClientAnchor anchor, int pictureIndex) {
-        HSSFPicture shape = new HSSFPicture(null, anchor);
-        shape.setPictureIndex(pictureIndex);
-        addShape(shape);
-        //open existing file
-        onCreate(shape);
-        return shape;
-    }
-
-    /**
-     *
-     * @param anchor       the client anchor describes how this picture is
-     *                     attached to the sheet.
-     * @param pictureIndex the index of the picture in the workbook collection
-     *                     of pictures.
-     *
-     * @return newly created shape
-     */
-    public HSSFPicture createPicture(ClientAnchor anchor, int pictureIndex) {
-        return createPicture((HSSFClientAnchor) anchor, pictureIndex);
-    }
-
-    /**
-     * Adds a new OLE Package Shape 
-     * 
-     * @param anchor       the client anchor describes how this picture is
-     *                     attached to the sheet.
-     * @param storageId    the storageId returned by {@link HSSFWorkbook#addOlePackage(POIFSFileSystem,String,String,String)}
-     * @param pictureIndex the index of the picture (used as preview image) in the
-     *                     workbook collection of pictures.
-     *
-     * @return newly created shape
-     */
-    public HSSFObjectData createObjectData(HSSFClientAnchor anchor, int storageId, int pictureIndex) {
-        ObjRecord obj = new ObjRecord();
-
-        CommonObjectDataSubRecord ftCmo = new CommonObjectDataSubRecord();
-        ftCmo.setObjectType(CommonObjectDataSubRecord.OBJECT_TYPE_PICTURE);
-        // ftCmo.setObjectId(oleShape.getShapeId()); ... will be set by onCreate(...)
-        ftCmo.setLocked(true);
-        ftCmo.setPrintable(true);
-        ftCmo.setAutofill(true);
-        ftCmo.setAutoline(true);
-        ftCmo.setReserved1(0);
-        ftCmo.setReserved2(0);
-        ftCmo.setReserved3(0);
-        obj.addSubRecord(ftCmo);
-        
-        // FtCf (pictFormat) 
-        FtCfSubRecord ftCf = new FtCfSubRecord();
-        HSSFPictureData pictData = getSheet().getWorkbook().getAllPictures().get(pictureIndex-1);
-        switch (pictData.getFormat()) {
-	        case HSSFWorkbook.PICTURE_TYPE_WMF:
-	        case HSSFWorkbook.PICTURE_TYPE_EMF:
-	        	// this needs patch #49658 to be applied to actually work 
-	            ftCf.setFlags(FtCfSubRecord.METAFILE_BIT);
-	            break;
-	        case HSSFWorkbook.PICTURE_TYPE_DIB:
-	        case HSSFWorkbook.PICTURE_TYPE_PNG:
-	        case HSSFWorkbook.PICTURE_TYPE_JPEG:
-	        case HSSFWorkbook.PICTURE_TYPE_PICT:
-	            ftCf.setFlags(FtCfSubRecord.BITMAP_BIT);
-	            break;
-	        default:
-	            throw new IllegalStateException("Invalid picture type: " + pictData.getFormat());
-        }
-        obj.addSubRecord(ftCf);
-        // FtPioGrbit (pictFlags)
-        FtPioGrbitSubRecord ftPioGrbit = new FtPioGrbitSubRecord();
-        ftPioGrbit.setFlagByBit(FtPioGrbitSubRecord.AUTO_PICT_BIT, true);
-        obj.addSubRecord(ftPioGrbit);
-        
-        EmbeddedObjectRefSubRecord ftPictFmla = new EmbeddedObjectRefSubRecord();
-        ftPictFmla.setUnknownFormulaData(new byte[]{2, 0, 0, 0, 0});
-        ftPictFmla.setOleClassname("Paket");
-        ftPictFmla.setStorageId(storageId);
-        
-        obj.addSubRecord(ftPictFmla);
-        obj.addSubRecord(new EndSubRecord());
-
-        String entryName = "MBD"+HexDump.toHex(storageId);
-        DirectoryEntry oleRoot;
-        try {
-            DirectoryNode dn = _sheet.getWorkbook().getRootDirectory();
-        	if (dn == null) throw new FileNotFoundException();
-        	oleRoot = (DirectoryEntry)dn.getEntry(entryName);
-        } catch (FileNotFoundException e) {
-        	throw new IllegalStateException("trying to add ole shape without actually adding data first - use HSSFWorkbook.addOlePackage first", e);
-        }
-        
-        // create picture shape, which need to be minimal modified for oleshapes
-        HSSFPicture shape = new HSSFPicture(null, anchor);
-        shape.setPictureIndex(pictureIndex);
-        EscherContainerRecord spContainer = shape.getEscherContainer();
-        EscherSpRecord spRecord = spContainer.getChildById(EscherSpRecord.RECORD_ID);
-        spRecord.setFlags(spRecord.getFlags() |  EscherSpRecord.FLAG_OLESHAPE);
-        
-        HSSFObjectData oleShape = new HSSFObjectData(spContainer, obj, oleRoot); 
-        addShape(oleShape);
-        onCreate(oleShape);
-        
-        
-        return oleShape;
-    }
-    
-    /**
-     * Creates a polygon
-     *
-     * @param anchor the client anchor describes how this group is attached
-     *               to the sheet.
-     * @return the newly created shape.
-     */
-    public HSSFPolygon createPolygon(HSSFClientAnchor anchor) {
-        HSSFPolygon shape = new HSSFPolygon(null, anchor);
-        addShape(shape);
-        onCreate(shape);
-        return shape;
-    }
-
-    /**
-     * Constructs a textbox under the patriarch.
-     *
-     * @param anchor the client anchor describes how this group is attached
-     *               to the sheet.
-     * @return the newly created textbox.
-     */
-    public HSSFTextbox createTextbox(HSSFClientAnchor anchor) {
-        HSSFTextbox shape = new HSSFTextbox(null, anchor);
-        addShape(shape);
-        onCreate(shape);
-        return shape;
-    }
-
-    /**
-     * Constructs a cell comment.
-     *
-     * @param anchor the client anchor describes how this comment is attached
-     *               to the sheet.
-     * @return the newly created comment.
-     */
-    public HSSFComment createComment(HSSFAnchor anchor) {
-        HSSFComment shape = new HSSFComment(null, anchor);
-        addShape(shape);
-        onCreate(shape);
-        return shape;
-    }
-
-    /**
-     * YK: used to create autofilters
-     *
-     * @see org.apache.poi.hssf.usermodel.HSSFSheet#setAutoFilter(org.apache.poi.ss.util.CellRangeAddress)
-     */
-    HSSFSimpleShape createComboBox(HSSFAnchor anchor) {
-        HSSFCombobox shape = new HSSFCombobox(null, anchor);
-        addShape(shape);
-        onCreate(shape);
-        return shape;
-    }
-
-    public HSSFComment createCellComment(ClientAnchor anchor) {
-        return createComment((HSSFAnchor) anchor);
-    }
-
-    /**
-     * Returns a unmodifiable list of all shapes contained by the patriarch.
-     */
-    public List<HSSFShape> getChildren() {
-        return Collections.unmodifiableList(_shapes);
-    }
-
-    /**
-     * add a shape to this drawing
-     */
-    @Internal
-    public void addShape(HSSFShape shape) {
-        shape.setPatriarch(this);
-        _shapes.add(shape);
-    }
-
-    private void onCreate(HSSFShape shape) {
-        EscherContainerRecord spgrContainer =
-                _boundAggregate.getEscherContainer().getChildContainers().get(0);
-
-        EscherContainerRecord spContainer = shape.getEscherContainer();
-        int shapeId = newShapeId();
-        shape.setShapeId(shapeId);
-
-        spgrContainer.addChildRecord(spContainer);
-        shape.afterInsert(this);
-        setFlipFlags(shape);
-    }
-
-    /**
-     * Total count of all children and their children's children.
-     * @return count of shapes including shapes inside shape groups
-     */
-    public int countOfAllChildren() {
-        int count = _shapes.size();
-        for (Iterator<HSSFShape> iterator = _shapes.iterator(); iterator.hasNext(); ) {
-            HSSFShape shape = iterator.next();
-            count += shape.countOfAllChildren();
-        }
-        return count;
-    }
-
-    /**
-     * Sets the coordinate space of this group.  All children are constrained
-     * to these coordinates.
-     */
-    public void setCoordinates(int x1, int y1, int x2, int y2) {
-        _spgrRecord.setRectY1(y1);
-        _spgrRecord.setRectY2(y2);
-        _spgrRecord.setRectX1(x1);
-        _spgrRecord.setRectX2(x2);
-    }
-
-    /**
-     * remove all shapes inside patriarch
-     */
-    public void clear() {
-        ArrayList <HSSFShape> copy = new ArrayList<HSSFShape>(_shapes);
-        for (HSSFShape shape: copy){
-            removeShape(shape);
-        }
-    }
-
-    /**
-     * @return new unique shapeId
-     */
-    int newShapeId() {
-        DrawingManager2 dm = _sheet.getWorkbook().getWorkbook().getDrawingManager();
-        EscherDgRecord dg =
-                _boundAggregate.getEscherContainer().getChildById(EscherDgRecord.RECORD_ID);
-        short drawingGroupId = dg.getDrawingGroupId();
-        return dm.allocateShapeId(drawingGroupId, dg);
-    }
-
-    /**
-     * Does this HSSFPatriarch contain a chart?
-     * (Technically a reference to a chart, since they
-     * get stored in a different block of records)
-     * FIXME - detect chart in all cases (only seems
-     * to work on some charts so far)
-     */
-    public boolean containsChart() {
-        // TODO - support charts properly in usermodel
-
-        // We're looking for a EscherOptRecord
-        EscherOptRecord optRecord = (EscherOptRecord)
-                _boundAggregate.findFirstWithId(EscherOptRecord.RECORD_ID);
-        if (optRecord == null) {
-            // No opt record, can't have chart
-            return false;
-        }
-
-        for (Iterator<EscherProperty> it = optRecord.getEscherProperties().iterator(); it.hasNext(); ) {
-            EscherProperty prop = it.next();
-            if (prop.getPropertyNumber() == 896 && prop.isComplex()) {
-                EscherComplexProperty cp = (EscherComplexProperty) prop;
-                String str = StringUtil.getFromUnicodeLE(cp.getComplexData());
-
-                if (str.equals("Chart 1\0")) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @return x coordinate of the left up corner
-     */
-    public int getX1() {
-        return _spgrRecord.getRectX1();
-    }
-
-    /**
-     * @return y coordinate of the left up corner
-     */
-    public int getY1() {
-        return _spgrRecord.getRectY1();
-    }
-
-    /**
-     * @return x coordinate of the right down corner
-     */
-    public int getX2() {
-        return _spgrRecord.getRectX2();
-    }
-
-    /**
-     * @return y coordinate of the right down corner
-     */
-    public int getY2() {
-        return _spgrRecord.getRectY2();
-    }
-
-    /**
-     * Returns the aggregate escher record we're bound to
-     * @return - low level representation of sheet drawing data
-     */
-    @Internal
-    public EscherAggregate getBoundAggregate() {
-        return _boundAggregate;
-    }
-
-    /**
-     * Creates a new client anchor and sets the top-left and bottom-right
-     * coordinates of the anchor.
-     *
-     * @param dx1  the x coordinate in EMU within the first cell.
-     * @param dy1  the y coordinate in EMU within the first cell.
-     * @param dx2  the x coordinate in EMU within the second cell.
-     * @param dy2  the y coordinate in EMU within the second cell.
-     * @param col1 the column (0 based) of the first cell.
-     * @param row1 the row (0 based) of the first cell.
-     * @param col2 the column (0 based) of the second cell.
-     * @param row2 the row (0 based) of the second cell.
-     * @return the newly created client anchor
-     */
-    public HSSFClientAnchor createAnchor(int dx1, int dy1, int dx2, int dy2, int col1, int row1, int col2, int row2) {
-        return new HSSFClientAnchor(dx1, dy1, dx2, dy2, (short) col1, row1, (short) col2, row2);
-    }
-
-    @NotImplemented
-    public Chart createChart(ClientAnchor anchor) {
-        throw new RuntimeException("NotImplemented");
-    }
-
-
-    /**
-     * create shape tree from existing escher records tree
-     */
-    void buildShapeTree() {
-        EscherContainerRecord dgContainer = _boundAggregate.getEscherContainer();
-        if (dgContainer == null) {
-            return;
-        }
-        EscherContainerRecord spgrConrainer = dgContainer.getChildContainers().get(0);
-        List<EscherContainerRecord> spgrChildren = spgrConrainer.getChildContainers();
-
-        for (int i = 0; i < spgrChildren.size(); i++) {
-            EscherContainerRecord spContainer = spgrChildren.get(i);
-            if (i != 0) {
-                HSSFShapeFactory.createShapeTree(spContainer, _boundAggregate, this, _sheet.getWorkbook().getRootDirectory());
-            }
-        }
-    }
-
-    private void setFlipFlags(HSSFShape shape){
-        EscherSpRecord sp = shape.getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        if (shape.getAnchor().isHorizontallyFlipped()) {
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPHORIZ);
-        }
-        if (shape.getAnchor().isVerticallyFlipped()) {
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPVERT);
-        }
-    }
-
-    public Iterator<HSSFShape> iterator() {
-        return _shapes.iterator();
-    }
-
-    protected HSSFSheet getSheet() {
-        return _sheet;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
deleted file mode 100644
index 1f521c5..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.cf.PatternFormatting;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.Color;
-
-/**
- * High level representation for Conditional Formatting settings
- */
-public class HSSFPatternFormatting implements org.apache.poi.ss.usermodel.PatternFormatting {
-    private final HSSFWorkbook workbook;
-    private final CFRuleBase cfRuleRecord;
-    private final PatternFormatting patternFormatting;
-
-    protected HSSFPatternFormatting(CFRuleBase cfRuleRecord, HSSFWorkbook workbook) {
-        this.workbook = workbook;
-        this.cfRuleRecord = cfRuleRecord; 
-        this.patternFormatting = cfRuleRecord.getPatternFormatting();
-    }
-
-    protected PatternFormatting getPatternFormattingBlock()
-    {
-        return patternFormatting;
-    }
-
-    public HSSFColor getFillBackgroundColorColor() {
-        return workbook.getCustomPalette().getColor(getFillBackgroundColor());
-    }
-
-    public HSSFColor getFillForegroundColorColor() {
-        return workbook.getCustomPalette().getColor(getFillForegroundColor());
-    }
-
-    /**
-     * @see org.apache.poi.hssf.record.cf.PatternFormatting#getFillBackgroundColor()
-     */
-    public short getFillBackgroundColor()
-    {
-        return (short)patternFormatting.getFillBackgroundColor();
-    }
-
-    /**
-     * @see org.apache.poi.hssf.record.cf.PatternFormatting#getFillForegroundColor()
-     */
-    public short getFillForegroundColor()
-    {
-        return (short)patternFormatting.getFillForegroundColor();
-    }
-
-    /**
-     * @see org.apache.poi.hssf.record.cf.PatternFormatting#getFillPattern()
-     */
-    public short getFillPattern()
-    {
-        return (short)patternFormatting.getFillPattern();
-    }
-
-    public void setFillBackgroundColor(Color bg) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(bg);
-        if (hcolor == null) {
-            setFillBackgroundColor((short)0);
-        } else {
-            setFillBackgroundColor(hcolor.getIndex());
-        }
-    }
-
-    public void setFillForegroundColor(Color fg) {
-        HSSFColor hcolor = HSSFColor.toHSSFColor(fg);
-        if (hcolor == null) {
-            setFillForegroundColor((short)0);
-        } else {
-            setFillForegroundColor(hcolor.getIndex());
-        }
-    }
-
-    /**
-     * @param bg
-     * @see org.apache.poi.hssf.record.cf.PatternFormatting#setFillBackgroundColor(int)
-     */
-    public void setFillBackgroundColor(short bg)
-    {
-        patternFormatting.setFillBackgroundColor(bg);
-        if( bg != 0)
-        {
-            cfRuleRecord.setPatternBackgroundColorModified(true);
-        }
-    }
-
-    /**
-     * @param fg
-     * @see org.apache.poi.hssf.record.cf.PatternFormatting#setFillForegroundColor(int)
-     */
-    public void setFillForegroundColor(short fg)
-    {
-        patternFormatting.setFillForegroundColor(fg);
-        if( fg != 0)
-        {
-            cfRuleRecord.setPatternColorModified(true);
-        }
-    }
-
-    /**
-     * @param fp
-     * @see org.apache.poi.hssf.record.cf.PatternFormatting#setFillPattern(int)
-     */
-    public void setFillPattern(short fp)
-    {
-        patternFormatting.setFillPattern(fp);
-        if( fp != 0)
-        {
-            cfRuleRecord.setPatternStyleModified(true);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
deleted file mode 100644
index 8b3b980..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.awt.Dimension;
-import java.io.ByteArrayInputStream;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherBlipRecord;
-import org.apache.poi.ddf.EscherClientDataRecord;
-import org.apache.poi.ddf.EscherComplexProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-import org.apache.poi.ss.usermodel.Picture;
-import org.apache.poi.ss.util.ImageUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Represents a escher picture.  Eg. A GIF, JPEG etc...
- */
-public class HSSFPicture extends HSSFSimpleShape implements Picture {
-	@SuppressWarnings("unused")
-    private static POILogger logger = POILogFactory.getLogger(HSSFPicture.class);
-	
-    public static final int PICTURE_TYPE_EMF = HSSFWorkbook.PICTURE_TYPE_EMF;                // Windows Enhanced Metafile
-    public static final int PICTURE_TYPE_WMF = HSSFWorkbook.PICTURE_TYPE_WMF;                // Windows Metafile
-    public static final int PICTURE_TYPE_PICT = HSSFWorkbook.PICTURE_TYPE_PICT;              // Macintosh PICT
-    public static final int PICTURE_TYPE_JPEG = HSSFWorkbook.PICTURE_TYPE_JPEG;              // JFIF
-    public static final int PICTURE_TYPE_PNG = HSSFWorkbook.PICTURE_TYPE_PNG;                // PNG
-    public static final int PICTURE_TYPE_DIB = HSSFWorkbook.PICTURE_TYPE_DIB;                // Windows DIB
-
-    public HSSFPicture(EscherContainerRecord spContainer, ObjRecord objRecord) {
-        super(spContainer, objRecord);
-    }
-
-    /**
-     * Constructs a picture object.
-     */
-    public HSSFPicture( HSSFShape parent, HSSFAnchor anchor )
-    {
-        super( parent, anchor );
-        super.setShapeType(OBJECT_TYPE_PICTURE);
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0);
-        cod.setObjectType(CommonObjectDataSubRecord.OBJECT_TYPE_PICTURE);
-    }
-
-    public int getPictureIndex()
-    {
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.BLIP__BLIPTODISPLAY);
-        if (null == property){
-            return -1;
-        }
-        return property.getPropertyValue();
-    }
-
-    public void setPictureIndex( int pictureIndex )
-    {
-        setPropertyValue(new EscherSimpleProperty( EscherProperties.BLIP__BLIPTODISPLAY, false, true, pictureIndex));
-    }
-
-    @Override
-    protected EscherContainerRecord createSpContainer() {
-        EscherContainerRecord spContainer = super.createSpContainer();
-        EscherOptRecord opt = spContainer.getChildById(EscherOptRecord.RECORD_ID);
-        opt.removeEscherProperty(EscherProperties.LINESTYLE__LINEDASHING);
-        opt.removeEscherProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH);
-        spContainer.removeChildRecord(spContainer.getChildById(EscherTextboxRecord.RECORD_ID));
-        return spContainer;
-    }
-
-    /**
-     * Reset the image to the dimension of the embedded image
-     * 
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with default font size (Arial 10pt for .xls).
-     * If the default font is changed the resized image can be streched vertically or horizontally.
-     * </p>
-     */
-    public void resize(){
-        resize(Double.MAX_VALUE);
-    }
-
-    /**
-     * Resize the image proportionally.
-     *
-     * @see #resize(double, double)
-     */
-    public void resize(double scale) {
-        resize(scale,scale);
-    }
-    
-    /**
-     * Resize the image
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with default font size (Arial 10pt for .xls).
-     * If the default font is changed the resized image can be streched vertically or horizontally.
-     * </p>
-     * <p>
-     * <code>resize(1.0,1.0)</code> keeps the original size,<br/>
-     * <code>resize(0.5,0.5)</code> resize to 50% of the original,<br/>
-     * <code>resize(2.0,2.0)</code> resizes to 200% of the original.<br/>
-     * <code>resize({@link Double#MAX_VALUE},{@link Double#MAX_VALUE})</code> resizes to the dimension of the embedded image. 
-     * </p>
-     *
-     * @param scaleX the amount by which the image width is multiplied relative to the original width.
-     * @param scaleY the amount by which the image height is multiplied relative to the original height.
-     */
-    public void resize(double scaleX, double scaleY) {
-        HSSFClientAnchor anchor = getClientAnchor();
-        anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE);
-
-        HSSFClientAnchor pref = getPreferredSize(scaleX,scaleY);
-
-        int row2 = anchor.getRow1() + (pref.getRow2() - pref.getRow1());
-        int col2 = anchor.getCol1() + (pref.getCol2() - pref.getCol1());
-
-        anchor.setCol2((short)col2);
-        // anchor.setDx1(0);
-        anchor.setDx2(pref.getDx2());
-
-        anchor.setRow2(row2);
-        // anchor.setDy1(0);
-        anchor.setDy2(pref.getDy2());
-    }
-
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @return HSSFClientAnchor with the preferred size for this image
-     * @since POI 3.0.2
-     */
-    public HSSFClientAnchor getPreferredSize(){
-        return getPreferredSize(1.0);
-    }
-
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @param scale the amount by which image dimensions are multiplied relative to the original size.
-     * @return HSSFClientAnchor with the preferred size for this image
-     * @since POI 3.0.2
-     */
-    public HSSFClientAnchor getPreferredSize(double scale){
-        return getPreferredSize(scale, scale);
-    }
-    
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @param scaleX the amount by which image width is multiplied relative to the original width.
-     * @param scaleY the amount by which image height is multiplied relative to the original height.
-     * @return HSSFClientAnchor with the preferred size for this image
-     * @since POI 3.11
-     */
-    public HSSFClientAnchor getPreferredSize(double scaleX, double scaleY){
-        ImageUtils.setPreferredSize(this, scaleX, scaleY);
-        return getClientAnchor();
-    }
-
-    /**
-     * Return the dimension of the embedded image in pixel
-     *
-     * @return image dimension in pixels
-     */
-    public Dimension getImageDimension(){
-        InternalWorkbook iwb = getPatriarch().getSheet().getWorkbook().getWorkbook();
-        EscherBSERecord bse = iwb.getBSERecord(getPictureIndex());
-        byte[] data = bse.getBlipRecord().getPicturedata();
-        int type = bse.getBlipTypeWin32();
-        return ImageUtils.getImageDimension(new ByteArrayInputStream(data), type);
-    }
-    
-    /**
-     * Return picture data for this shape
-     *
-     * @return picture data for this shape
-     */
-    public HSSFPictureData getPictureData(){
-        InternalWorkbook iwb = getPatriarch().getSheet().getWorkbook().getWorkbook();
-        EscherBSERecord bse = iwb.getBSERecord(getPictureIndex());
-    	EscherBlipRecord blipRecord = bse.getBlipRecord();
-    	return new HSSFPictureData(blipRecord);
-    }
-
-    @Override
-    void afterInsert(HSSFPatriarch patriarch) {
-        EscherAggregate agg = patriarch.getBoundAggregate();
-        agg.associateShapeToObjRecord(getEscherContainer().getChildById(EscherClientDataRecord.RECORD_ID), getObjRecord());
-        if(getPictureIndex() != -1) {
-            EscherBSERecord bse =
-                    patriarch.getSheet().getWorkbook().getWorkbook().getBSERecord(getPictureIndex());
-            bse.setRef(bse.getRef() + 1);
-        }
-    }
-
-    /**
-     * The filename of the embedded image
-     */
-    public String getFileName() {
-        EscherComplexProperty propFile = (EscherComplexProperty) getOptRecord().lookup(
-                      EscherProperties.BLIP__BLIPFILENAME);
-        return (null == propFile)
-            ? ""
-            : StringUtil.getFromUnicodeLE(propFile.getComplexData()).trim();
-    }
-    
-    public void setFileName(String data){
-        // TODO: add trailing \u0000? 
-        byte bytes[] = StringUtil.getToUnicodeLE(data);
-        EscherComplexProperty prop = new EscherComplexProperty(EscherProperties.BLIP__BLIPFILENAME, true, bytes);
-        setPropertyValue(prop);
-    }
-
-    @Override
-    public void setShapeType(int shapeType) {
-        throw new IllegalStateException("Shape type can not be changed in "+this.getClass().getSimpleName());
-    }
-
-    @Override
-    protected HSSFShape cloneShape() {
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        byte [] inSp = getEscherContainer().serialize();
-        spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());
-        ObjRecord obj = (ObjRecord) getObjRecord().cloneViaReserialise();
-        return new HSSFPicture(spContainer, obj);
-    }
-    
-    /**
-     * @return the anchor that is used by this picture.
-     */
-    @Override
-    public HSSFClientAnchor getClientAnchor() {
-        HSSFAnchor a = getAnchor();
-        return (a instanceof HSSFClientAnchor) ? (HSSFClientAnchor)a : null;
-    }
-
-    
-    /**
-     * @return the sheet which contains the picture shape
-     */
-    @Override
-    public HSSFSheet getSheet() {
-        return getPatriarch().getSheet();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
deleted file mode 100644
index 267bd2e..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.EscherBitmapBlip;
-import org.apache.poi.ddf.EscherBlipRecord;
-import org.apache.poi.ddf.EscherMetafileBlip;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.PngUtils;
-
-/**
- * Represents binary data stored in the file.  Eg. A GIF, JPEG etc...
- */
-public class HSSFPictureData implements PictureData
-{
-    // MSOBI constants for various formats.
-    public static final short MSOBI_WMF   = 0x2160;
-    public static final short MSOBI_EMF   = 0x3D40;
-    public static final short MSOBI_PICT  = 0x5420;
-    public static final short MSOBI_PNG   = 0x6E00;
-    public static final short MSOBI_JPEG  = 0x46A0;
-    public static final short MSOBI_DIB   = 0x7A80;
-    // Mask of the bits in the options used to store the image format.
-    public static final short FORMAT_MASK = (short) 0xFFF0;
-
-    /**
-     * Underlying escher blip record containing the bitmap data.
-     */
-    private EscherBlipRecord blip;
-
-    /**
-     * Constructs a picture object.
-     *
-     * @param blip the underlying blip record containing the bitmap data.
-     */
-    public HSSFPictureData( EscherBlipRecord blip )
-    {
-        this.blip = blip;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.poi.hssf.usermodel.PictureData#getData()
-     */
-    public byte[] getData()
-    {
-        byte[] pictureData = blip.getPicturedata();
-
-        //PNG created on MAC may have a 16-byte prefix which prevents successful reading.
-        //Just cut it off!.
-        if (PngUtils.matchesPngHeader(pictureData, 16))
-        {
-            byte[] png = new byte[pictureData.length-16];
-            System.arraycopy(pictureData, 16, png, 0, png.length);
-            pictureData = png;
-        }
-
-        return pictureData;
-    }
-
-    /**
-     *
-     * @return format of the picture.
-     * @see HSSFWorkbook#PICTURE_TYPE_DIB
-     * @see HSSFWorkbook#PICTURE_TYPE_WMF
-     * @see HSSFWorkbook#PICTURE_TYPE_EMF
-     * @see HSSFWorkbook#PICTURE_TYPE_PNG
-     * @see HSSFWorkbook#PICTURE_TYPE_JPEG
-     * @see HSSFWorkbook#PICTURE_TYPE_PICT
-     */
-    public int getFormat(){
-        return blip.getRecordId() - (short)0xF018;
-    }
-
-    /**
-    * @see #getFormat
-    * @return 'wmf', 'jpeg' etc depending on the format. never <code>null</code>
-    */
-    public String suggestFileExtension() {
-        switch (blip.getRecordId()) {
-            case EscherMetafileBlip.RECORD_ID_WMF:
-                return "wmf";
-            case EscherMetafileBlip.RECORD_ID_EMF:
-                return "emf";
-            case EscherMetafileBlip.RECORD_ID_PICT:
-                return "pict";
-            case EscherBitmapBlip.RECORD_ID_PNG:
-                return "png";
-            case EscherBitmapBlip.RECORD_ID_JPEG:
-                return "jpeg";
-            case EscherBitmapBlip.RECORD_ID_DIB:
-                return "dib";
-            default:
-                return "";
-        }
-    }
-    
-    /**
-     * Returns the mime type for the image
-     */
-    public String getMimeType() {
-       switch (blip.getRecordId()) {
-           case EscherMetafileBlip.RECORD_ID_WMF:
-               return "image/x-wmf";
-           case EscherMetafileBlip.RECORD_ID_EMF:
-               return "image/x-emf";
-           case EscherMetafileBlip.RECORD_ID_PICT:
-               return "image/x-pict";
-           case EscherBitmapBlip.RECORD_ID_PNG:
-               return "image/png";
-           case EscherBitmapBlip.RECORD_ID_JPEG:
-               return "image/jpeg";
-           case EscherBitmapBlip.RECORD_ID_DIB:
-               return "image/bmp";
-           default:
-               return "image/unknown";
-       }
-    }
-    
-    /**
-     * @return the POI internal image type, -1 if not unknown image type
-     *
-     * @see Workbook#PICTURE_TYPE_DIB
-     * @see Workbook#PICTURE_TYPE_EMF
-     * @see Workbook#PICTURE_TYPE_JPEG
-     * @see Workbook#PICTURE_TYPE_PICT
-     * @see Workbook#PICTURE_TYPE_PNG
-     * @see Workbook#PICTURE_TYPE_WMF
-     */
-    public int getPictureType() {
-        switch (blip.getRecordId()) {
-            case EscherMetafileBlip.RECORD_ID_WMF:
-                return Workbook.PICTURE_TYPE_WMF;
-            case EscherMetafileBlip.RECORD_ID_EMF:
-                return Workbook.PICTURE_TYPE_EMF;
-            case EscherMetafileBlip.RECORD_ID_PICT:
-                return Workbook.PICTURE_TYPE_PICT;
-            case EscherBitmapBlip.RECORD_ID_PNG:
-                return Workbook.PICTURE_TYPE_PNG;
-            case EscherBitmapBlip.RECORD_ID_JPEG:
-                return Workbook.PICTURE_TYPE_JPEG;
-            case EscherBitmapBlip.RECORD_ID_DIB:
-                return Workbook.PICTURE_TYPE_DIB;
-            default:
-                return -1;
-        }        
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
deleted file mode 100644
index 8403a81..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * 
- */
-public class HSSFPolygon  extends HSSFSimpleShape {
-	private static POILogger logger = POILogFactory.getLogger(HSSFPolygon.class);
-    public final static short OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 0x1E;
-
-    public HSSFPolygon(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord _textObjectRecord) {
-        super(spContainer, objRecord, _textObjectRecord);
-    }
-
-    public HSSFPolygon(EscherContainerRecord spContainer, ObjRecord objRecord) {
-        super(spContainer, objRecord);
-    }
-
-    HSSFPolygon(HSSFShape parent, HSSFAnchor anchor) {
-        super(parent, anchor);
-    }
-
-    @Override
-    protected TextObjectRecord createTextObjRecord() {
-        return null;
-    }
-
-    /**
-     * Generates the shape records for this shape.
-     */
-    protected EscherContainerRecord createSpContainer() {
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        EscherSpRecord sp = new EscherSpRecord();
-        EscherOptRecord opt = new EscherOptRecord();
-        EscherClientDataRecord clientData = new EscherClientDataRecord();
-
-        spContainer.setRecordId(EscherContainerRecord.SP_CONTAINER);
-        spContainer.setOptions((short) 0x000F);
-        sp.setRecordId(EscherSpRecord.RECORD_ID);
-        sp.setOptions((short) ((EscherAggregate.ST_NOT_PRIMATIVE << 4) | 0x2));
-        if (getParent() == null) {
-            sp.setFlags(EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HASSHAPETYPE);
-        } else {
-            sp.setFlags(EscherSpRecord.FLAG_CHILD | EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HASSHAPETYPE);
-        }
-        opt.setRecordId(EscherOptRecord.RECORD_ID);
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.TRANSFORM__ROTATION, false, false, 0));
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__RIGHT, false, false, 100));
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__BOTTOM, false, false, 100));
-        opt.setEscherProperty(new EscherShapePathProperty(EscherProperties.GEOMETRY__SHAPEPATH, EscherShapePathProperty.COMPLEX));
-
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__FILLOK, false, false, 0x00010001));
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINESTARTARROWHEAD, false, false, 0x0));
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEENDARROWHEAD, false, false, 0x0));
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEENDCAPSTYLE, false, false, 0x0));
-
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEDASHING, LINESTYLE_SOLID));
-        opt.setEscherProperty( new EscherBoolProperty( EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x00080008));
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEWIDTH, LINEWIDTH_DEFAULT));
-        opt.setEscherProperty(new EscherRGBProperty(EscherProperties.FILL__FILLCOLOR, FILL__FILLCOLOR_DEFAULT));
-        opt.setEscherProperty(new EscherRGBProperty(EscherProperties.LINESTYLE__COLOR, LINESTYLE__COLOR_DEFAULT));
-        opt.setEscherProperty(new EscherBoolProperty(EscherProperties.FILL__NOFILLHITTEST, 1));
-
-        opt.setEscherProperty(new EscherBoolProperty( EscherProperties.GROUPSHAPE__PRINT, 0x080000));
-
-        EscherRecord anchor = getAnchor().getEscherAnchor();
-        clientData.setRecordId(EscherClientDataRecord.RECORD_ID);
-        clientData.setOptions((short) 0x0000);
-
-        spContainer.addChildRecord(sp);
-        spContainer.addChildRecord(opt);
-        spContainer.addChildRecord(anchor);
-        spContainer.addChildRecord(clientData);
-
-        return spContainer;
-    }
-
-    /**
-     * Creates the low level OBJ record for this shape.
-     */
-    protected ObjRecord createObjRecord() {
-        ObjRecord obj = new ObjRecord();
-        CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
-        c.setObjectType(OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING);
-        c.setLocked(true);
-        c.setPrintable(true);
-        c.setAutofill(true);
-        c.setAutoline(true);
-        EndSubRecord e = new EndSubRecord();
-        obj.addSubRecord(c);
-        obj.addSubRecord(e);
-        return obj;
-    }
-
-    @Override
-    protected void afterRemove(HSSFPatriarch patriarch) {
-        patriarch.getBoundAggregate().removeShapeToObjRecord(getEscherContainer().getChildById(EscherClientDataRecord.RECORD_ID));
-    }
-
-    /**
-     * @return array of x coordinates
-     */
-    public int[] getXPoints() {
-        EscherArrayProperty verticesProp = getOptRecord().lookup(EscherProperties.GEOMETRY__VERTICES);
-        if (null == verticesProp){
-            return new int[]{};
-        }
-        int []array = new int[verticesProp.getNumberOfElementsInArray()-1];
-        for (int i=0; i< verticesProp.getNumberOfElementsInArray()-1; i++){
-            byte[] property = verticesProp.getElement(i);
-            short x = LittleEndian.getShort(property, 0);
-            array[i] = x;
-        }
-        return array;
-    }
-
-    /**
-     * @return array of y coordinates
-     */
-    public int[] getYPoints() {
-        EscherArrayProperty verticesProp = getOptRecord().lookup(EscherProperties.GEOMETRY__VERTICES);
-        if (null == verticesProp){
-            return new int[]{};
-        }
-        int []array = new int[verticesProp.getNumberOfElementsInArray()-1];
-        for (int i=0; i< verticesProp.getNumberOfElementsInArray()-1; i++){
-            byte[] property = verticesProp.getElement(i);
-            short x = LittleEndian.getShort(property, 2);
-            array[i] = x;
-        }
-        return array;
-    }
-
-    /**
-     * @param xPoints - array of x coordinates
-     * @param yPoints - array of y coordinates
-     */
-    public void setPoints(int[] xPoints, int[] yPoints) {
-        if (xPoints.length != yPoints.length){
-        	logger.log( POILogger.ERROR, "xPoint.length must be equal to yPoints.length");
-            return;
-        }
-        if (xPoints.length == 0){
-        	logger.log( POILogger.ERROR, "HSSFPolygon must have at least one point");
-        }
-        EscherArrayProperty verticesProp = new EscherArrayProperty(EscherProperties.GEOMETRY__VERTICES, false, new byte[0] );
-        verticesProp.setNumberOfElementsInArray(xPoints.length+1);
-        verticesProp.setNumberOfElementsInMemory(xPoints.length+1);
-        verticesProp.setSizeOfElements(0xFFF0);
-        for (int i = 0; i < xPoints.length; i++)
-        {
-            byte[] data = new byte[4];
-            LittleEndian.putShort(data, 0, (short)xPoints[i]);
-            LittleEndian.putShort(data, 2, (short)yPoints[i]);
-            verticesProp.setElement(i, data);
-        }
-        int point = xPoints.length;
-        byte[] data = new byte[4];
-        LittleEndian.putShort(data, 0, (short)xPoints[0]);
-        LittleEndian.putShort(data, 2, (short)yPoints[0]);
-        verticesProp.setElement(point, data);
-        setPropertyValue(verticesProp);
-
-        EscherArrayProperty segmentsProp = new EscherArrayProperty(EscherProperties.GEOMETRY__SEGMENTINFO, false, null );
-        segmentsProp.setSizeOfElements(0x0002);
-        segmentsProp.setNumberOfElementsInArray(xPoints.length * 2 + 4);
-        segmentsProp.setNumberOfElementsInMemory(xPoints.length * 2 + 4);
-        segmentsProp.setElement(0, new byte[] { (byte)0x00, (byte)0x40 } );
-        segmentsProp.setElement(1, new byte[] { (byte)0x00, (byte)0xAC } );
-        for (int i = 0; i < xPoints.length; i++)
-        {
-            segmentsProp.setElement(2 + i * 2, new byte[] { (byte)0x01, (byte)0x00 } );
-            segmentsProp.setElement(3 + i * 2, new byte[] { (byte)0x00, (byte)0xAC } );
-        }
-        segmentsProp.setElement(segmentsProp.getNumberOfElementsInArray() - 2, new byte[] { (byte)0x01, (byte)0x60 } );
-        segmentsProp.setElement(segmentsProp.getNumberOfElementsInArray() - 1, new byte[] { (byte)0x00, (byte)0x80 } );
-        setPropertyValue(segmentsProp);
-    }
-
-    /**
-     * Defines the width and height of the points in the polygon
-     * @param width
-     * @param height
-     */
-    public void setPolygonDrawArea(int width, int height) {
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.GEOMETRY__RIGHT, width));
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.GEOMETRY__BOTTOM, height));
-    }
-
-    /**
-     * @return shape width
-     */
-    public int getDrawAreaWidth() {
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.GEOMETRY__RIGHT);
-        return property == null ? 100: property.getPropertyValue();
-    }
-
-    /**
-     * @return shape height
-     */
-    public int getDrawAreaHeight() {
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.GEOMETRY__BOTTOM);
-        return property == null ? 100: property.getPropertyValue();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
deleted file mode 100644
index 6399b88..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.PrintSetupRecord;
-import org.apache.poi.ss.usermodel.PrintSetup;
-
-/**
- * Used to modify the print setup.
- * <P>
- * Paper size constants have been added for the ones I have access
- * to.  They follow as:<br>
- *  public static final short PRINTER_DEFAULT_PAPERSIZE   = 0;<br>
- *  public static final short LETTER_PAPERSIZE 	          = 1;<br>
- *  public static final short LEGAL_PAPERSIZE 		  = 5;<br>
- *  public static final short EXECUTIVE_PAPERSIZE 	  = 7;<br>
- *  public static final short A4_PAPERSIZE 	  	  = 9;<br>
- *  public static final short A5_PAPERSIZE 		  = 11;<br>
- *  public static final short ENVELOPE_10_PAPERSIZE 	  = 20;<br>
- *  public static final short ENVELOPE_DL_PAPERSIZE 	  = 27;<br>
- *  public static final short ENVELOPE_CS_PAPERSIZE 	  = 28;<br>
- *  public static final short ENVELOPE_MONARCH_PAPERSIZE  = 37;<br>
- */
-public class HSSFPrintSetup implements PrintSetup {    
-    PrintSetupRecord printSetupRecord;
-    
-    /**    
-     * Constructor.  Takes the low level print setup record.    
-     * @param printSetupRecord the low level print setup record    
-     */
-    protected HSSFPrintSetup(PrintSetupRecord printSetupRecord) {
-	this.printSetupRecord = printSetupRecord;
-    }    
-    
-    /**    
-     * Set the paper size.    
-     * @param size the paper size.    
-     */
-    public void setPaperSize(short size)    {
-	printSetupRecord.setPaperSize(size);
-    }    
-    
-    /**    
-     * Set the scale.    
-     * @param scale the scale to use    
-     */
-    public void setScale(short scale)    {
-	printSetupRecord.setScale(scale);
-    }    
-    
-    /**    
-     * Set the page numbering start.    
-     * @param start the page numbering start    
-     */
-    public void setPageStart(short start)    {
-	printSetupRecord.setPageStart(start);
-    }    
-    
-    /**    
-     * Set the number of pages wide to fit the sheet in    
-     * @param width the number of pages    
-     */
-    public void setFitWidth(short width)    {
-	printSetupRecord.setFitWidth(width);
-    }    
-    
-    /**    
-     * Set the number of pages high to fit the sheet in    
-     * @param height the number of pages    
-     */
-    public void setFitHeight(short height)    {
-	printSetupRecord.setFitHeight(height);
-    }    
-    
-    /**    
-     * Sets the options flags.  Not advisable to do it directly.    
-     * @param options The bit flags for the options    
-     */
-    public void setOptions(short options)    {
-	printSetupRecord.setOptions(options);
-    }    
-    
-    /**    
-     * Set whether to go left to right or top down in ordering    
-     * @param ltor left to right    
-     */
-    public void setLeftToRight(boolean ltor)    {
-	printSetupRecord.setLeftToRight(ltor);
-    }    
-    
-    /**    
-     * Set whether to print in landscape    
-     * @param ls landscape    
-     */
-    public void setLandscape(boolean ls)    {
-	printSetupRecord.setLandscape(!ls);
-    }    
-    
-    /**    
-     * Valid settings.  I'm not for sure.    
-     * @param valid Valid    
-     */
-    public void setValidSettings(boolean valid)    {
-	printSetupRecord.setValidSettings(valid);
-    }    
-    
-    /**    
-     * Set whether it is black and white    
-     * @param mono Black and white    
-     */
-    public void setNoColor(boolean mono)    {
-	printSetupRecord.setNoColor(mono);
-    }    
-    
-    /**    
-     * Set whether it is in draft mode    
-     * @param d draft    
-     */
-    public void setDraft(boolean d)    {
-	printSetupRecord.setDraft(d);
-    }    
-    
-    /**    
-     * Print the include notes    
-     * @param printnotes print the notes    
-     */
-    public void setNotes(boolean printnotes)    {
-	printSetupRecord.setNotes(printnotes);
-    }    
-    
-    /**    
-     * Set no orientation. ?    
-     * @param orientation Orientation.    
-     */
-    public void setNoOrientation(boolean orientation)    {
-	printSetupRecord.setNoOrientation(orientation);
-    }    
-    
-    /**    
-     * Set whether to use page start    
-     * @param page Use page start    
-     */
-    public void setUsePage(boolean page)    {
-	printSetupRecord.setUsePage(page);
-    }    
-    
-    /**    
-     * Sets the horizontal resolution.    
-     * @param resolution horizontal resolution    
-     */
-    public void setHResolution(short resolution)    {
-	printSetupRecord.setHResolution(resolution);
-    }    
-    
-    /**    
-     * Sets the vertical resolution.    
-     * @param resolution vertical resolution    
-     */
-    public void setVResolution(short resolution)    {
-	printSetupRecord.setVResolution(resolution);
-    }    
-    
-    /**    
-     * Sets the header margin.    
-     * @param headermargin header margin    
-     */
-    public void setHeaderMargin(double headermargin)    {
-	printSetupRecord.setHeaderMargin(headermargin);
-    }    
-    
-    /**    
-     * Sets the footer margin.    
-     * @param footermargin footer margin    
-     */
-    public void setFooterMargin(double footermargin)    {
-	printSetupRecord.setFooterMargin(footermargin);
-    }    
-    
-    /**    
-     * Sets the number of copies.    
-     * @param copies number of copies    
-     */
-    public void setCopies(short copies)    {
-	printSetupRecord.setCopies(copies);
-    }    
-    
-    /**    
-     * Returns the paper size.    
-     * @return paper size    
-     */
-    public short getPaperSize()    {
-        return printSetupRecord.getPaperSize();
-    }    
-    
-    /**    
-     * Returns the scale.    
-     * @return scale    
-     */
-    public short getScale()    {
-        return printSetupRecord.getScale();
-    }    
-    
-    /**    
-     * Returns the page start.    
-     * @return page start    
-     */
-    public short getPageStart()    {
-        return printSetupRecord.getPageStart();
-    }    
-    
-    /**    
-     * Returns the number of pages wide to fit sheet in.    
-     * @return number of pages wide to fit sheet in    
-     */
-    public short getFitWidth()    {
-        return printSetupRecord.getFitWidth();
-    }    
-    
-    /**    
-     * Returns the number of pages high to fit the sheet in.    
-     * @return number of pages high to fit the sheet in    
-     */
-    public short getFitHeight()    {
-        return printSetupRecord.getFitHeight();
-    }    
-    
-    /**    
-     * Returns the bit flags for the options.    
-     * @return bit flags for the options    
-     */
-    public short getOptions()    {
-        return printSetupRecord.getOptions();
-    }    
-    
-    /**    
-     * Returns the left to right print order.    
-     * @return left to right print order    
-     */
-    public boolean getLeftToRight()    {
-        return printSetupRecord.getLeftToRight();
-    }    
-    
-    /**    
-     * Returns the landscape mode.    
-     * @return landscape mode    
-     */
-    public boolean getLandscape()    {
-        return !printSetupRecord.getLandscape();
-    }    
-    
-    /**    
-     * Returns the valid settings.    
-     * @return valid settings    
-     */
-    public boolean getValidSettings()    {
-        return printSetupRecord.getValidSettings();
-    }    
-    
-    /**    
-     * Returns the black and white setting.    
-     * @return black and white setting    
-     */
-    public boolean getNoColor()    {
-        return printSetupRecord.getNoColor();
-    }    
-    
-    /**    
-     * Returns the draft mode.    
-     * @return draft mode    
-     */
-    public boolean getDraft()    {
-        return printSetupRecord.getDraft();
-    }    
-    
-    /**    
-     * Returns the print notes.    
-     * @return print notes    
-     */
-    public boolean getNotes()    {
-        return printSetupRecord.getNotes();
-    }    
-    
-    /**    
-     * Returns the no orientation.    
-     * @return no orientation    
-     */
-    public boolean getNoOrientation()    {
-        return printSetupRecord.getNoOrientation();
-    }    
-    
-    /**    
-     * Returns the use page numbers.    
-     * @return use page numbers    
-     */
-    public boolean getUsePage()    {
-        return printSetupRecord.getUsePage();
-    }    
-    
-    /**    
-     * Returns the horizontal resolution.    
-     * @return horizontal resolution    
-     */
-    public short getHResolution()    {
-        return printSetupRecord.getHResolution();
-    }    
-    
-    /**    
-     * Returns the vertical resolution.    
-     * @return vertical resolution    
-     */
-    public short getVResolution()    {
-        return printSetupRecord.getVResolution();
-    }    
-    
-    /**    
-     * Returns the header margin.    
-     * @return header margin    
-     */
-    public double getHeaderMargin()    {
-        return printSetupRecord.getHeaderMargin();
-    }    
-    
-    /**    
-     * Returns the footer margin.    
-     * @return footer margin    
-     */
-    public double getFooterMargin()    {
-        return printSetupRecord.getFooterMargin();
-    }    
-    
-    /**    
-     * Returns the number of copies.    
-     * @return number of copies    
-     */
-    public short getCopies()    {
-        return printSetupRecord.getCopies();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
deleted file mode 100644
index 7898317..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.Iterator;
-
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.record.common.UnicodeString.FormatRun;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.RichTextString;
-/**
- * Rich text unicode string.  These strings can have fonts applied to
- * arbitary parts of the string.
- *
- * <p>
- * Note, that in certain cases creating too many HSSFRichTextString cells may cause Excel 2003 and lower to crash
- * when changing the color of the cells and then saving the Excel file. Compare two snippets that produce equivalent output:
- *
- * <p><blockquote><pre>
- *  HSSFCell hssfCell = row.createCell(idx);
- *  //rich text consists of two runs
- *  HSSFRichTextString richString = new HSSFRichTextString( "Hello, World!" );
- *  richString.applyFont( 0, 6, font1 );
- *  richString.applyFont( 6, 13, font2 );
- *  hssfCell.setCellValue( richString );
- * </pre></blockquote>
- *
- * and
- *
- * <p><blockquote><pre>
- *  //create a cell style and assign the first font to it
- *  HSSFCellStyle style = workbook.createCellStyle();
- *  style.setFont(font1);
- *
- *  HSSFCell hssfCell = row.createCell(idx);
- *  hssfCell.setCellStyle(style);
- *
- *  //rich text consists of one run overriding the cell style
- *  HSSFRichTextString richString = new HSSFRichTextString( "Hello, World!" );
- *  richString.applyFont( 6, 13, font2 );
- *  hssfCell.setCellValue( richString );
- * </pre></blockquote><p>
- *
- * Excel always uses the latter approach: for a reach text containing N runs Excel saves the font of the first run in the cell's
- * style and subsequent N-1 runs override this font.
- *
- * <p> For more information regarding this behavior please consult Bugzilla 47543:
- *
- * <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=47543">
- * https://issues.apache.org/bugzilla/show_bug.cgi?id=47543</a>
- */
-public final class HSSFRichTextString implements Comparable<HSSFRichTextString>, RichTextString {
-    /** Place holder for indicating that NO_FONT has been applied here */
-    public static final short NO_FONT = 0;
-
-    private UnicodeString _string;
-    private InternalWorkbook _book;
-    private LabelSSTRecord _record;
-
-    public HSSFRichTextString()
-    {
-        this("");
-    }
-
-    public HSSFRichTextString(String string) {
-        if (string == null) {
-            _string = new UnicodeString("");
-        } else {
-            _string = new UnicodeString(string);
-        }
-    }
-
-    HSSFRichTextString(InternalWorkbook book, LabelSSTRecord record) {
-      setWorkbookReferences(book, record);
-
-      _string = book.getSSTString(record.getSSTIndex());
-    }
-
-    /** This must be called to setup the internal work book references whenever
-     * a RichTextString is added to a cell
-     */
-    void setWorkbookReferences(InternalWorkbook book, LabelSSTRecord record) {
-      _book = book;
-      _record = record;
-    }
-
-    /** Called whenever the unicode string is modified. When it is modified
-     *  we need to create a new SST index, so that other LabelSSTRecords will not
-     *  be affected by changes that we make to this string.
-     */
-    private UnicodeString cloneStringIfRequired() {
-      if (_book == null)
-        return _string;
-      UnicodeString s = (UnicodeString)_string.clone();
-      return s;
-    }
-
-    private void addToSSTIfRequired() {
-      if (_book != null) {
-        int index = _book.addSSTString(_string);
-        _record.setSSTIndex(index);
-        //The act of adding the string to the SST record may have meant that
-        //an existing string was returned for the index, so update our local version
-        _string = _book.getSSTString(index);
-      }
-    }
-
-
-    /**
-     * Applies a font to the specified characters of a string.
-     *
-     * @param startIndex    The start index to apply the font to (inclusive)
-     * @param endIndex      The end index to apply the font to (exclusive)
-     * @param fontIndex     The font to use.
-     */
-    public void applyFont(int startIndex, int endIndex, short fontIndex)
-    {
-        if (startIndex > endIndex)
-            throw new IllegalArgumentException("Start index must be less than end index.");
-        if (startIndex < 0 || endIndex > length())
-            throw new IllegalArgumentException("Start and end index not in range.");
-        if (startIndex == endIndex)
-            return;
-
-        //Need to check what the font is currently, so we can reapply it after
-        //the range is completed
-        short currentFont = NO_FONT;
-        if (endIndex != length()) {
-          currentFont = this.getFontAtIndex(endIndex);
-        }
-
-        //Need to clear the current formatting between the startIndex and endIndex
-        _string = cloneStringIfRequired();
-        Iterator<FormatRun> formatting = _string.formatIterator();
-        if (formatting != null) {
-          while (formatting.hasNext()) {
-            UnicodeString.FormatRun r = formatting.next();
-            if ((r.getCharacterPos() >= startIndex) && (r.getCharacterPos() < endIndex))
-              formatting.remove();
-          }
-        }
-
-
-        _string.addFormatRun(new UnicodeString.FormatRun((short)startIndex, fontIndex));
-        if (endIndex != length())
-          _string.addFormatRun(new UnicodeString.FormatRun((short)endIndex, currentFont));
-
-        addToSSTIfRequired();
-    }
-
-    /**
-     * Applies a font to the specified characters of a string.
-     *
-     * @param startIndex    The start index to apply the font to (inclusive)
-     * @param endIndex      The end index to apply to font to (exclusive)
-     * @param font          The index of the font to use.
-     */
-    public void applyFont(int startIndex, int endIndex, Font font)
-    {
-        applyFont(startIndex, endIndex, ((HSSFFont) font).getIndex());
-    }
-
-    /**
-     * Sets the font of the entire string.
-     * @param font          The font to use.
-     */
-    public void applyFont(Font font)
-    {
-        applyFont(0, _string.getCharCount(), font);
-    }
-
-    /**
-     * Removes any formatting that may have been applied to the string.
-     */
-    public void clearFormatting() {
-      _string = cloneStringIfRequired();
-      _string.clearFormatting();
-      addToSSTIfRequired();
-    }
-
-    /**
-     * Returns the plain string representation.
-     */
-    public String getString()
-    {
-        return _string.getString();
-    }
-
-    /**
-     * Used internally by the HSSFCell to get the internal
-     * string value.
-     * Will ensure the string is not shared
-     */
-    UnicodeString getUnicodeString() {
-      return cloneStringIfRequired();
-    }
-
-    /**
-     * Returns the raw, probably shared Unicode String.
-     * Used when tweaking the styles, eg updating font
-     *  positions.
-     * Changes to this string may well effect
-     *  other RichTextStrings too!
-     */
-    UnicodeString getRawUnicodeString() {
-    	return _string;
-    }
-
-    /** Used internally by the HSSFCell to set the internal string value*/
-    void setUnicodeString(UnicodeString str) {
-      this._string = str;
-    }
-
-
-    /**
-     * @return  the number of characters in the text.
-     */
-    public int length() {
-        return _string.getCharCount();
-    }
-
-    /**
-     * Returns the font in use at a particular index.
-     *
-     * @param index         The index.
-     * @return              The font that's currently being applied at that
-     *                      index or null if no font is being applied or the
-     *                      index is out of range.
-     */
-    public short getFontAtIndex( int index )
-    {
-      int size = _string.getFormatRunCount();
-      UnicodeString.FormatRun currentRun = null;
-      for (int i=0;i<size;i++) {
-        UnicodeString.FormatRun r = _string.getFormatRun(i);
-        if (r.getCharacterPos() > index) {
-            break;
-        }
-        currentRun = r;
-      }
-      if (currentRun == null) {
-          return NO_FONT;
-      }
-      return currentRun.getFontIndex();
-    }
-
-    /**
-     * @return  The number of formatting runs used. There will always be at
-     *          least one of font NO_FONT.
-     *
-     * @see #NO_FONT
-     */
-    public int numFormattingRuns()
-    {
-        return _string.getFormatRunCount();
-    }
-
-    /**
-     * The index within the string to which the specified formatting run applies.
-     * @param index     the index of the formatting run
-     * @return  the index within the string.
-     */
-    public int getIndexOfFormattingRun(int index)
-    {
-        UnicodeString.FormatRun r = _string.getFormatRun(index);
-        return r.getCharacterPos();
-    }
-
-    /**
-     * Gets the font used in a particular formatting run.
-     *
-     * @param index     the index of the formatting run
-     * @return  the font number used.
-     */
-    public short getFontOfFormattingRun(int index)
-    {
-      UnicodeString.FormatRun r = _string.getFormatRun(index);
-      return r.getFontIndex();
-    }
-
-    /**
-     * Compares one rich text string to another.
-     */
-    public int compareTo(HSSFRichTextString r) {
-       return _string.compareTo(r._string);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (o instanceof HSSFRichTextString) {
-        return _string.equals(((HSSFRichTextString)o)._string);
-      }
-      return false;
-
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-    }
-
-    
-    /**
-     * @return  the plain text representation of this string.
-     */
-    public String toString()
-    {
-        return _string.toString();
-    }
-
-    /**
-     * Applies the specified font to the entire string.
-     *
-     * @param fontIndex  the font to apply.
-     */
-    public void applyFont( short fontIndex )
-    {
-        applyFont(0, _string.getCharCount(), fontIndex);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
deleted file mode 100644
index 7af241c..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.util.Configurator;
-
-/**
- * High level representation of a row of a spreadsheet.
- *
- * Only rows that have cells should be added to a Sheet.
- */
-public final class HSSFRow implements Row, Comparable<HSSFRow> {
-
-    // used for collections
-    public final static int INITIAL_CAPACITY = Configurator.getIntValue("HSSFRow.ColInitialCapacity", 5);
-
-    private int rowNum;
-    private HSSFCell[] cells;
-
-    /**
-     * reference to low level representation
-     */
-    private final RowRecord row;
-
-    /**
-     * reference to containing low level Workbook
-     */
-    private final HSSFWorkbook book;
-
-    /**
-     * reference to containing Sheet
-     */
-    private final HSSFSheet sheet;
-
-    /**
-     * Creates new HSSFRow from scratch. Only HSSFSheet should do this.
-     *
-     * @param book low-level Workbook object containing the sheet that contains this row
-     * @param sheet low-level Sheet object that contains this Row
-     * @param rowNum the row number of this row (0 based)
-     * @see org.apache.poi.hssf.usermodel.HSSFSheet#createRow(int)
-     */
-    HSSFRow(HSSFWorkbook book, HSSFSheet sheet, int rowNum) {
-        this(book, sheet, new RowRecord(rowNum));
-    }
-
-    /**
-     * Creates an HSSFRow from a low level RowRecord object.  Only HSSFSheet should do
-     * this.  HSSFSheet uses this when an existing file is read in.
-     *
-     * @param book low-level Workbook object containing the sheet that contains this row
-     * @param sheet low-level Sheet object that contains this Row
-     * @param record the low level api object this row should represent
-     * @see org.apache.poi.hssf.usermodel.HSSFSheet#createRow(int)
-     */
-    HSSFRow(HSSFWorkbook book, HSSFSheet sheet, RowRecord record) {
-        this.book = book;
-        this.sheet = sheet;
-        row = record;
-        setRowNum(record.getRowNumber());
-        
-        // Size the initial cell list such that a read only case won't waste
-        //  lots of memory, and a create/read followed by adding new cells can
-        //  add a bit without needing a resize
-        cells = new HSSFCell[record.getLastCol()+INITIAL_CAPACITY];
-        
-        // Don't trust colIx boundaries as read by other apps
-        // set the RowRecord empty for the moment
-        record.setEmpty();
-        // subsequent calls to createCellFromRecord() will update the colIx boundaries properly
-    }
-
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned is a {@link CellType#BLANK}. The type can be changed
-     * either through calling <code>setCellValue</code> or <code>setCellType</code>.
-     *
-     * @param column - the column number this cell represents
-     *
-     * @return HSSFCell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex < 0 or greater than 255,
-     *   the maximum number of columns supported by the Excel binary format (.xls)
-     */
-    @Override
-    public HSSFCell createCell(int column)
-    {
-        return this.createCell(column,CellType.BLANK);
-    }
-    
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned will be of the requested type.
-     * The type can be changed either through calling setCellValue 
-     *  or setCellType, but there is a small overhead to doing this,
-     *  so it is best to create the required type up front.
-     *
-     * @param columnIndex - the column number this cell represents
-     *
-     * @return HSSFCell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex < 0 or greater than 255,
-     *   the maximum number of columns supported by the Excel binary format (.xls)
-     * @deprecated POI 3.15 beta 3
-     */
-    @Override
-    public HSSFCell createCell(int columnIndex, int type)
-    {
-        return createCell(columnIndex, CellType.forInt(type));
-    }
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned will be of the requested type.
-     * The type can be changed either through calling setCellValue 
-     *  or setCellType, but there is a small overhead to doing this,
-     *  so it is best to create the required type up front.
-     *
-     * @param columnIndex - the column number this cell represents
-     *
-     * @return HSSFCell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex < 0 or greater than 255,
-     *   the maximum number of columns supported by the Excel binary format (.xls)
-     */
-    @Override
-    public HSSFCell createCell(int columnIndex, CellType type)
-    {
-        short shortCellNum = (short)columnIndex;
-        if(columnIndex > 0x7FFF) {
-            shortCellNum = (short)(0xffff - columnIndex);
-        }
-
-        HSSFCell cell = new HSSFCell(book, sheet, getRowNum(), shortCellNum, type);
-        addCell(cell);
-        sheet.getSheet().addValueRecord(getRowNum(), cell.getCellValueRecord());
-        return cell;
-    }
-
-    /**
-     * remove the HSSFCell from this row.
-     * @param cell to remove
-     */
-    @Override
-    public void removeCell(Cell cell) {
-        if(cell == null) {
-            throw new IllegalArgumentException("cell must not be null");
-        }
-        removeCell((HSSFCell)cell, true);
-    }
-    private void removeCell(HSSFCell cell, boolean alsoRemoveRecords) {
-
-        int column=cell.getColumnIndex();
-        if(column < 0) {
-            throw new RuntimeException("Negative cell indexes not allowed");
-        }
-        if(column >= cells.length || cell != cells[column]) {
-            throw new RuntimeException("Specified cell is not from this row");
-        }
-        if(cell.isPartOfArrayFormulaGroup()){
-            cell.notifyArrayFormulaChanging();
-        }
-
-        cells[column]=null;
-
-        if(alsoRemoveRecords) {
-            CellValueRecordInterface cval = cell.getCellValueRecord();
-            sheet.getSheet().removeValueRecord(getRowNum(), cval);
-        }
-        if (cell.getColumnIndex()+1 == row.getLastCol()) {
-            row.setLastCol(calculateNewLastCellPlusOne(row.getLastCol()));
-        }
-        if (cell.getColumnIndex() == row.getFirstCol()) {
-            row.setFirstCol(calculateNewFirstCell(row.getFirstCol()));
-        }
-    }
-
-    /**
-     * Removes all the cells from the row, and their
-     *  records too.
-     */
-    protected void removeAllCells() {
-        for (HSSFCell cell : cells) {
-            if (cell != null) {
-                removeCell(cell, true);
-            }
-        }
-        cells=new HSSFCell[INITIAL_CAPACITY];
-    }
-
-    /**
-     * create a high level HSSFCell object from an existing low level record.  Should
-     * only be called from HSSFSheet or HSSFRow itself.
-     * @param cell low level cell to create the high level representation from
-     * @return HSSFCell representing the low level record passed in
-     */
-    HSSFCell createCellFromRecord(CellValueRecordInterface cell) {
-        HSSFCell hcell = new HSSFCell(book, sheet, cell);
-
-        addCell(hcell);
-        int colIx = cell.getColumn();
-        if (row.isEmpty()) {
-            row.setFirstCol(colIx);
-            row.setLastCol(colIx + 1);
-        } else {
-            if (colIx < row.getFirstCol()) {
-                row.setFirstCol(colIx);
-            } else if (colIx > row.getLastCol()) {
-                row.setLastCol(colIx + 1);
-            } /*else {
-                // added cell is within first and last cells
-            }*/
-        }
-        // TODO - RowRecord column boundaries need to be updated for cell comments too
-        return hcell;
-    }
-
-    /**
-     * set the row number of this row.
-     * @param rowIndex  the row number (0-based)
-     * @throws IndexOutOfBoundsException if the row number is not within the range 0-65535.
-     */
-    @Override
-    public void setRowNum(int rowIndex) {
-        int maxrow = SpreadsheetVersion.EXCEL97.getLastRowIndex();
-        if ((rowIndex < 0) || (rowIndex > maxrow)) {
-          throw new IllegalArgumentException("Invalid row number (" + rowIndex
-                  + ") outside allowable range (0.." + maxrow + ")");
-        }
-        rowNum = rowIndex;
-        if (row != null) {
-            row.setRowNumber(rowIndex);   // used only for KEY comparison (HSSFRow)
-        }
-    }
-
-    /**
-     * get row number this row represents
-     * @return the row number (0 based)
-     */
-    @Override
-    public int getRowNum()
-    {
-        return rowNum;
-    }
-
-    /**
-     * Returns the HSSFSheet this row belongs to
-     *
-     * @return the HSSFSheet that owns this row
-     */
-    @Override
-    public HSSFSheet getSheet()
-    {
-        return sheet;
-    }
-
-    /**
-     * Returns the rows outline level. Increased as you
-     *  put it into more groups (outlines), reduced as
-     *  you take it out of them.
-     */
-    @Override
-    public int getOutlineLevel() {
-        return row.getOutlineLevel();
-    }
-
-    /**
-     * Moves the supplied cell to a new column, which
-     *  must not already have a cell there!
-     * @param cell The cell to move
-     * @param newColumn The new column number (0 based)
-     */
-    public void moveCell(HSSFCell cell, short newColumn) {
-        // Ensure the destination is free
-        if(cells.length > newColumn && cells[newColumn] != null) {
-            throw new IllegalArgumentException("Asked to move cell to column " + newColumn + " but there's already a cell there");
-        }
-
-        // Check it's one of ours
-        if(! cells[cell.getColumnIndex()].equals(cell)) {
-            throw new IllegalArgumentException("Asked to move a cell, but it didn't belong to our row");
-        }
-
-        // Move the cell to the new position
-        // (Don't remove the records though)
-        removeCell(cell, false);
-        cell.updateCellNum(newColumn);
-        addCell(cell);
-    }
-
-    /**
-     * used internally to add a cell.
-     */
-    private void addCell(HSSFCell cell) {
-
-        int column=cell.getColumnIndex();
-        // re-allocate cells array as required.
-        if(column>=cells.length) {
-            HSSFCell[] oldCells=cells;
-            // New size based on the same logic as ArrayList
-            int newSize=oldCells.length*3/2+1;
-            if(newSize<column+1) {
-                newSize=column+INITIAL_CAPACITY;
-            }
-            cells=new HSSFCell[newSize];
-            System.arraycopy(oldCells,0,cells,0,oldCells.length);
-        }
-        cells[column]=cell;
-
-        // fix up firstCol and lastCol indexes
-        if (row.isEmpty() || column < row.getFirstCol()) {
-            row.setFirstCol((short)column);
-        }
-
-        if (row.isEmpty() || column >= row.getLastCol()) {
-            row.setLastCol((short) (column+1)); // +1 -> for one past the last index
-        }
-    }
-
-    /**
-     * Get the hssfcell representing a given column (logical cell)
-     *  0-based. If you ask for a cell that is not defined, then
-     *  you get a null.
-     * This is the basic call, with no policies applied
-     *
-     * @param cellIndex  0 based column number
-     * @return HSSFCell representing that column or null if undefined.
-     */
-    private HSSFCell retrieveCell(int cellIndex) {
-        if(cellIndex<0||cellIndex>=cells.length) {
-            return null;
-        }
-        return cells[cellIndex];
-    }
-
-    /**
-     * Get the hssfcell representing a given column (logical cell)
-     *  0-based.  If you ask for a cell that is not defined then
-     *  you get a null, unless you have set a different
-     *  {@link org.apache.poi.ss.usermodel.Row.MissingCellPolicy} on the base workbook.
-     *
-     * @param cellnum  0 based column number
-     * @return HSSFCell representing that column or null if undefined.
-     */
-    @Override
-    public HSSFCell getCell(int cellnum) {
-        return getCell(cellnum, book.getMissingCellPolicy());
-    }
-
-    /**
-     * Get the hssfcell representing a given column (logical cell)
-     *  0-based.  If you ask for a cell that is not defined, then
-     *  your supplied policy says what to do
-     *
-     * @param cellnum  0 based column number
-     * @param policy Policy on blank / missing cells
-     * @return representing that column or null if undefined + policy allows.
-     */
-    @Override
-    public HSSFCell getCell(int cellnum, MissingCellPolicy policy) {
-        HSSFCell cell = retrieveCell(cellnum);
-        switch (policy) {
-            case RETURN_NULL_AND_BLANK:
-                return cell;
-            case RETURN_BLANK_AS_NULL:
-                boolean isBlank = (cell != null && cell.getCellTypeEnum() == CellType.BLANK);
-                return (isBlank) ? null : cell;
-            case CREATE_NULL_AS_BLANK:
-                return (cell == null) ? createCell(cellnum, CellType.BLANK) : cell;
-            default:
-                throw new IllegalArgumentException("Illegal policy " + policy + " (" + policy.id + ")");
-        }
-    }
-
-    /**
-     * get the number of the first cell contained in this row.
-     * @return short representing the first logical cell in the row, or -1 if the row does not contain any cells.
-     */
-    @Override
-    public short getFirstCellNum() {
-        if (row.isEmpty()) {
-            return -1;
-        }
-        return (short) row.getFirstCol();
-    }
-
-    /**
-     * Gets the index of the last cell contained in this row <b>PLUS ONE</b>. The result also
-     * happens to be the 1-based column number of the last cell.  This value can be used as a
-     * standard upper bound when iterating over cells:
-     * <pre>
-     * short minColIx = row.getFirstCellNum();
-     * short maxColIx = row.getLastCellNum();
-     * for(short colIx=minColIx; colIx&lt;maxColIx; colIx++) {
-     *   HSSFCell cell = row.getCell(colIx);
-     *   if(cell == null) {
-     *     continue;
-     *   }
-     *   //... do something with cell
-     * }
-     * </pre>
-     *
-     * @return short representing the last logical cell in the row <b>PLUS ONE</b>, or -1 if the
-     *  row does not contain any cells.
-     */
-    @Override
-    public short getLastCellNum() {
-        if (row.isEmpty()) {
-            return -1;
-        }
-        return (short) row.getLastCol();
-    }
-
-
-    /**
-     * gets the number of defined cells (NOT number of cells in the actual row!).
-     * That is to say if only columns 0,4,5 have values then there would be 3.
-     * @return int representing the number of defined cells in the row.
-     */
-
-    @Override
-    public int getPhysicalNumberOfCells()
-    {
-        int count = 0;
-        for (HSSFCell cell : cells) {
-            if (cell != null) count++;
-        }
-        return count;
-    }
-
-    /**
-     * set the row's height or set to ff (-1) for undefined/default-height.  Set the height in "twips" or
-     * 1/20th of a point.
-     * @param height  rowheight or -1 for undefined (use sheet default)
-     */
-
-    @Override
-    public void setHeight(short height)
-    {
-        if(height == -1){
-            row.setHeight((short)(0xFF | 0x8000));
-            row.setBadFontHeight(false);
-        } else {
-            row.setBadFontHeight(true);
-            row.setHeight(height);
-        }
-    }
-
-    /**
-     * set whether or not to display this row with 0 height
-     * @param zHeight  height is zero or not.
-     */
-    @Override
-    public void setZeroHeight(boolean zHeight) {
-        row.setZeroHeight(zHeight);
-    }
-
-    /**
-     * get whether or not to display this row with 0 height
-     * @return - zHeight height is zero or not.
-     */
-    @Override
-    public boolean getZeroHeight() {
-        return row.getZeroHeight();
-    }
-
-    /**
-     * set the row's height in points.
-     * @param height  row height in points, <code>-1</code> means to use the default height
-     */
-
-    @Override
-    public void setHeightInPoints(float height)
-    {
-        if(height == -1){
-            row.setHeight((short)(0xFF | 0x8000));
-            row.setBadFontHeight(false);
-        } else {
-            row.setBadFontHeight(true);
-            row.setHeight((short) (height * 20));
-        }
-    }
-
-    /**
-     * get the row's height or ff (-1) for undefined/default-height in twips (1/20th of a point)
-     * @return rowheight or 0xff for undefined (use sheet default)
-     */
-
-    @Override
-    public short getHeight()
-    {
-        short height = row.getHeight();
-
-        //The low-order 15 bits contain the row height.
-        //The 0x8000 bit indicates that the row is standard height (optional)
-        if ((height & 0x8000) != 0) height = sheet.getSheet().getDefaultRowHeight();
-        else height &= 0x7FFF;
-
-        return height;
-    }
-
-    /**
-     * get the row's height or ff (-1) for undefined/default-height in points (20*getHeight())
-     * @return rowheight or 0xff for undefined (use sheet default)
-     */
-
-    @Override
-    public float getHeightInPoints()
-    {
-        return ((float)getHeight() / 20);
-    }
-
-    /**
-     * get the lowlevel RowRecord represented by this object - should only be called
-     * by other parts of the high level API
-     *
-     * @return RowRecord this row represents
-     */
-
-    protected RowRecord getRowRecord()
-    {
-        return row;
-    }
-
-    /**
-     * used internally to refresh the "last cell plus one" when the last cell is removed.
-     * @return 0 when row contains no cells
-     */
-    private int calculateNewLastCellPlusOne(int lastcell) {
-        int cellIx = lastcell - 1;
-        HSSFCell r = retrieveCell(cellIx);
-
-        while (r == null) {
-            if (cellIx < 0) {
-                return 0;
-            }
-            r = retrieveCell(--cellIx);
-        }
-        return cellIx+1;
-    }
-
-    /**
-     * used internally to refresh the "first cell" when the first cell is removed.
-     * @return 0 when row contains no cells (also when first cell is occupied)
-     */
-    private int calculateNewFirstCell(int firstcell) {
-        int cellIx = firstcell + 1;
-        HSSFCell r = retrieveCell(cellIx);
-
-        while (r == null) {
-            if (cellIx <= cells.length) {
-                return 0;
-            }
-            r = retrieveCell(++cellIx);
-        }
-        return cellIx;
-    }
-
-    /**
-     * Is this row formatted? Most aren't, but some rows
-     *  do have whole-row styles. For those that do, you
-     *  can get the formatting from {@link #getRowStyle()}
-     */
-    @Override
-    public boolean isFormatted() {
-        return row.getFormatted();
-    }
-    /**
-     * Returns the whole-row cell styles. Most rows won't
-     *  have one of these, so will return null. Call
-     *  {@link #isFormatted()} to check first.
-     */
-    @Override
-    public HSSFCellStyle getRowStyle() {
-        if(!isFormatted()) { return null; }
-        short styleIndex = row.getXFIndex();
-        ExtendedFormatRecord xf = book.getWorkbook().getExFormatAt(styleIndex);
-        return new HSSFCellStyle(styleIndex, xf, book);
-    }
-    /**
-     * Applies a whole-row cell styling to the row.
-     */
-    public void setRowStyle(HSSFCellStyle style) {
-        row.setFormatted(true);
-        row.setXFIndex(style.getIndex());
-    }
-    /**
-     * Applies a whole-row cell styling to the row.
-     */
-    @Override
-    public void setRowStyle(CellStyle style) {
-        setRowStyle((HSSFCellStyle)style);
-    }
-
-    /**
-     * @return cell iterator of the physically defined cells.
-     * Note that the 4th element might well not be cell 4, as the iterator
-     *  will not return un-defined (null) cells.
-     * Call getCellNum() on the returned cells to know which cell they are.
-     * As this only ever works on physically defined cells,
-     *  the {@link org.apache.poi.ss.usermodel.Row.MissingCellPolicy} has no effect.
-     */
-    @Override
-    public Iterator<Cell> cellIterator()
-    {
-      return new CellIterator();
-    }
-    /**
-     * Alias for {@link #cellIterator} to allow
-     *  foreach loops
-     */
-    @Override
-    public Iterator<Cell> iterator() {
-       return cellIterator();
-    }
-
-    /**
-     * An iterator over the (physical) cells in the row.
-     */
-    private class CellIterator implements Iterator<Cell> {
-      int thisId=-1;
-      int nextId=-1;
-
-      public CellIterator()
-      {
-        findNext();
-      }
-
-      @Override
-    public boolean hasNext() {
-        return nextId<cells.length;
-      }
-
-      @Override
-    public Cell next() {
-          if (!hasNext())
-              throw new NoSuchElementException("At last element");
-        HSSFCell cell=cells[nextId];
-        thisId=nextId;
-        findNext();
-        return cell;
-      }
-
-      @Override
-    public void remove() {
-          if (thisId == -1)
-              throw new IllegalStateException("remove() called before next()");
-        cells[thisId]=null;
-      }
-
-      private void findNext()
-      {
-        int i=nextId+1;
-        for(;i<cells.length;i++)
-        {
-          if(cells[i]!=null) break;
-        }
-        nextId=i;
-      }
-
-    }
-    
-    /**
-     * Compares two <code>HSSFRow</code> objects.  Two rows are equal if they belong to the same worksheet and
-     * their row indexes are equal.
-     *
-     * @param   other   the <code>HSSFRow</code> to be compared.
-     * @return  <ul>
-     *      <li>
-     *      the value <code>0</code> if the row number of this <code>HSSFRow</code> is
-     *      equal to the row number of the argument <code>HSSFRow</code>
-     *      </li>
-     *      <li>
-     *      a value less than <code>0</code> if the row number of this this <code>HSSFRow</code> is
-     *      numerically less than the row number of the argument <code>HSSFRow</code>
-     *      </li>
-     *      <li>
-     *      a value greater than <code>0</code> if the row number of this this <code>HSSFRow</code> is
-     *      numerically greater than the row number of the argument <code>HSSFRow</code>
-     *      </li>
-     *      </ul>
-     * @throws IllegalArgumentException if the argument row belongs to a different worksheet
-     */
-    @Override
-    public int compareTo(HSSFRow other)
-    {
-        if (this.getSheet() != other.getSheet()) {
-            throw new IllegalArgumentException("The compared rows must belong to the same sheet");
-        }
-
-        Integer thisRow = this.getRowNum();
-        Integer otherRow = other.getRowNum();
-        return thisRow.compareTo(otherRow);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (!(obj instanceof HSSFRow))
-        {
-            return false;
-        }
-        HSSFRow other = (HSSFRow) obj;
-
-        return (this.getRowNum() == other.getRowNum()) &&
-               (this.getSheet() == other.getSheet());
-    }
-
-    @Override
-    public int hashCode() {
-        return row.hashCode();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
deleted file mode 100644
index dc31858..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.ddf.EscherBoolProperty;
-import org.apache.poi.ddf.EscherChildAnchorRecord;
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherRGBProperty;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * An abstract shape.
- * 
- * Note: Microsoft Excel seems to sometimes disallow 
- * higher y1 than y2 or higher x1 than x2 in the anchor, you might need to 
- * reverse them and draw shapes vertically or horizontally flipped via
- * setFlipVertical() or setFlipHorizontally(). 
- */
-public abstract class HSSFShape {
-    private static final POILogger LOG = POILogFactory.getLogger(HSSFShape.class);
-    
-    public static final int LINEWIDTH_ONE_PT = 12700;
-    public static final int LINEWIDTH_DEFAULT = 9525;
-    public static final int LINESTYLE__COLOR_DEFAULT = 0x08000040;
-    public static final int FILL__FILLCOLOR_DEFAULT = 0x08000009;
-    public static final boolean NO_FILL_DEFAULT = true;
-
-    public static final int LINESTYLE_SOLID = 0;              // Solid (continuous) pen
-    public static final int LINESTYLE_DASHSYS = 1;            // PS_DASH system   dash style
-    public static final int LINESTYLE_DOTSYS = 2;             // PS_DOT system   dash style
-    public static final int LINESTYLE_DASHDOTSYS = 3;         // PS_DASHDOT system dash style
-    public static final int LINESTYLE_DASHDOTDOTSYS = 4;      // PS_DASHDOTDOT system dash style
-    public static final int LINESTYLE_DOTGEL = 5;             // square dot style
-    public static final int LINESTYLE_DASHGEL = 6;            // dash style
-    public static final int LINESTYLE_LONGDASHGEL = 7;        // long dash style
-    public static final int LINESTYLE_DASHDOTGEL = 8;         // dash short dash
-    public static final int LINESTYLE_LONGDASHDOTGEL = 9;     // long dash short dash
-    public static final int LINESTYLE_LONGDASHDOTDOTGEL = 10; // long dash short dash short dash
-    public static final int LINESTYLE_NONE = -1;
-
-    public static final int LINESTYLE_DEFAULT = LINESTYLE_NONE;
-
-    // TODO - make all these fields private
-    private HSSFShape parent;
-    HSSFAnchor anchor;
-    private HSSFPatriarch _patriarch;
-
-    private final EscherContainerRecord _escherContainer;
-    private final ObjRecord _objRecord;
-    private final EscherOptRecord _optRecord;
-    
-    public final static int NO_FILLHITTEST_TRUE = 0x00110000;
-    public final static int NO_FILLHITTEST_FALSE = 0x00010000;
-
-    /**
-     * creates shapes from existing file
-     * @param spContainer
-     * @param objRecord
-     */
-    public HSSFShape(EscherContainerRecord spContainer, ObjRecord objRecord) {
-        this._escherContainer = spContainer;
-        this._objRecord = objRecord;
-        this._optRecord = spContainer.getChildById(EscherOptRecord.RECORD_ID);
-        this.anchor = HSSFAnchor.createAnchorFromEscher(spContainer);
-    }
-
-    /**
-     * Create a new shape with the specified parent and anchor.
-     */
-    public HSSFShape(HSSFShape parent, HSSFAnchor anchor) {
-        this.parent = parent;
-        this.anchor = anchor;
-        this._escherContainer = createSpContainer();
-        _optRecord = _escherContainer.getChildById(EscherOptRecord.RECORD_ID);
-        _objRecord = createObjRecord();
-
-    }
-
-    protected abstract EscherContainerRecord createSpContainer();
-
-    protected abstract ObjRecord createObjRecord();
-
-    /**
-     * remove escher container from the patriarch.escherAggregate
-     * remove obj, textObj and note records if it's necessary
-     * in case of ShapeGroup remove all contained shapes
-     * @param patriarch
-     */
-    protected abstract void afterRemove(HSSFPatriarch patriarch);
-
-    /**
-     * @param shapeId - global shapeId which must be set to EscherSpRecord
-     */
-    void setShapeId(int shapeId){
-        EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
-        spRecord.setShapeId(shapeId);
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) _objRecord.getSubRecords().get(0);
-        cod.setObjectId((short) (shapeId%1024));
-    }
-
-    /**
-     * @return global shapeId(from EscherSpRecord)
-     */
-    int getShapeId(){
-        return ((EscherSpRecord)_escherContainer.getChildById(EscherSpRecord.RECORD_ID)).getShapeId();
-    }
-
-    abstract void afterInsert(HSSFPatriarch patriarch);
-
-    protected EscherContainerRecord getEscherContainer() {
-        return _escherContainer;
-    }
-
-    protected ObjRecord getObjRecord() {
-        return _objRecord;
-    }
-
-    /**
-     * Return the low-level EscherOptRecord to read/modify not yet wrapped escher properties  
-     *
-     * @return the low-level EscherOptRecord
-     */
-    public EscherOptRecord getOptRecord() {
-        return _optRecord;
-    }
-
-    /**
-     * Gets the parent shape.
-     */
-    public HSSFShape getParent() {
-        return parent;
-    }
-
-    /**
-     * @return the anchor that is used by this shape.
-     */
-    public HSSFAnchor getAnchor() {
-        return anchor;
-    }
-
-    /**
-     * Sets a particular anchor.  A top-level shape must have an anchor of
-     * HSSFClientAnchor.  A child anchor must have an anchor of HSSFChildAnchor
-     *
-     * @param anchor the anchor to use.
-     * @throws IllegalArgumentException when the wrong anchor is used for
-     *                                  this particular shape.
-     * @see HSSFChildAnchor
-     * @see HSSFClientAnchor
-     */
-    public void setAnchor(HSSFAnchor anchor) {
-        int i = 0;
-        int recordId = -1;
-        if (parent == null) {
-            if (anchor instanceof HSSFChildAnchor)
-                throw new IllegalArgumentException("Must use client anchors for shapes directly attached to sheet.");
-            EscherClientAnchorRecord anch = _escherContainer.getChildById(EscherClientAnchorRecord.RECORD_ID);
-            if (null != anch) {
-                for (i=0; i< _escherContainer.getChildRecords().size(); i++){
-                    if (_escherContainer.getChild(i).getRecordId() == EscherClientAnchorRecord.RECORD_ID){
-                        if (i != _escherContainer.getChildRecords().size() -1){
-                            recordId = _escherContainer.getChild(i+1).getRecordId();
-                        }
-                    }
-                }
-                _escherContainer.removeChildRecord(anch);
-            }
-        } else {
-            if (anchor instanceof HSSFClientAnchor)
-                throw new IllegalArgumentException("Must use child anchors for shapes attached to groups.");
-            EscherChildAnchorRecord anch = _escherContainer.getChildById(EscherChildAnchorRecord.RECORD_ID);
-            if (null != anch) {
-                for (i=0; i< _escherContainer.getChildRecords().size(); i++){
-                    if (_escherContainer.getChild(i).getRecordId() == EscherChildAnchorRecord.RECORD_ID){
-                        if (i != _escherContainer.getChildRecords().size() -1){
-                            recordId = _escherContainer.getChild(i+1).getRecordId();
-                        }
-                    }
-                }
-                _escherContainer.removeChildRecord(anch);
-            }
-        }
-        if (-1 == recordId){
-            _escherContainer.addChildRecord(anchor.getEscherAnchor());
-        } else {
-            _escherContainer.addChildBefore(anchor.getEscherAnchor(), recordId);
-        }
-        this.anchor = anchor;
-    }
-
-    /**
-     * The color applied to the lines of this shape.
-     */
-    public int getLineStyleColor() {
-        EscherRGBProperty rgbProperty = _optRecord.lookup(EscherProperties.LINESTYLE__COLOR);
-        return rgbProperty == null ? LINESTYLE__COLOR_DEFAULT : rgbProperty.getRgbColor();
-    }
-
-    /**
-     * The color applied to the lines of this shape.
-     */
-    public void setLineStyleColor(int lineStyleColor) {
-        setPropertyValue(new EscherRGBProperty(EscherProperties.LINESTYLE__COLOR, lineStyleColor));
-    }
-
-    /**
-     * The color applied to the lines of this shape.
-     */
-    public void setLineStyleColor(int red, int green, int blue) {
-        int lineStyleColor = ((blue) << 16) | ((green) << 8) | red;
-        setPropertyValue(new EscherRGBProperty(EscherProperties.LINESTYLE__COLOR, lineStyleColor));
-    }
-
-    /**
-     * The color used to fill this shape.
-     */
-    public int getFillColor() {
-        EscherRGBProperty rgbProperty = _optRecord.lookup(EscherProperties.FILL__FILLCOLOR);
-        return rgbProperty == null ? FILL__FILLCOLOR_DEFAULT : rgbProperty.getRgbColor();
-    }
-
-    /**
-     * The color used to fill this shape.
-     */
-    public void setFillColor(int fillColor) {
-        setPropertyValue(new EscherRGBProperty(EscherProperties.FILL__FILLCOLOR, fillColor));
-    }
-
-    /**
-     * The color used to fill this shape.
-     */
-    public void setFillColor(int red, int green, int blue) {
-        int fillColor = ((blue) << 16) | ((green) << 8) | red;
-        setPropertyValue(new EscherRGBProperty(EscherProperties.FILL__FILLCOLOR, fillColor));
-    }
-
-    /**
-     * @return returns with width of the line in EMUs.  12700 = 1 pt.
-     */
-    public int getLineWidth() {
-        EscherSimpleProperty property = _optRecord.lookup(EscherProperties.LINESTYLE__LINEWIDTH);
-        return property == null ? LINEWIDTH_DEFAULT: property.getPropertyValue();
-    }
-
-    /**
-     * Sets the width of the line.  12700 = 1 pt.
-     *
-     * @param lineWidth width in EMU's.  12700EMU's = 1 pt
-     * @see HSSFShape#LINEWIDTH_ONE_PT
-     */
-    public void setLineWidth(int lineWidth) {
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEWIDTH, lineWidth));
-    }
-
-    /**
-     * @return One of the constants in LINESTYLE_*
-     */
-    public int getLineStyle() {
-        EscherSimpleProperty property = _optRecord.lookup(EscherProperties.LINESTYLE__LINEDASHING);
-        if (null == property){
-            return LINESTYLE_DEFAULT;
-        }
-        return property.getPropertyValue();
-    }
-
-    /**
-     * Sets the line style.
-     *
-     * @param lineStyle One of the constants in LINESTYLE_*
-     */
-    public void setLineStyle(int lineStyle) {
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEDASHING, lineStyle));
-        if (getLineStyle() != HSSFShape.LINESTYLE_SOLID) {
-            setPropertyValue(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEENDCAPSTYLE, 0));
-            if (getLineStyle() == HSSFShape.LINESTYLE_NONE){
-                setPropertyValue(new EscherBoolProperty( EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x00080000));
-            } else {
-                setPropertyValue( new EscherBoolProperty( EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x00080008));
-            }
-        }
-    }
-
-    /**
-     * @return <code>true</code> if this shape is not filled with a color.
-     */
-    public boolean isNoFill() {
-        EscherBoolProperty property = _optRecord.lookup(EscherProperties.FILL__NOFILLHITTEST);
-        return property == null ? NO_FILL_DEFAULT : property.getPropertyValue() == NO_FILLHITTEST_TRUE;
-    }
-
-    /**
-     * @param noFill sets whether this shape is filled or transparent.
-     */
-    public void setNoFill(boolean noFill) {
-        setPropertyValue(new EscherBoolProperty(EscherProperties.FILL__NOFILLHITTEST, noFill ? NO_FILLHITTEST_TRUE : NO_FILLHITTEST_FALSE));
-    }
-
-    protected void setPropertyValue(EscherProperty property){
-        _optRecord.setEscherProperty(property);
-    }
-
-    /**
-     * @param value specifies whether this shape is vertically flipped.
-     */
-    public void setFlipVertical(boolean value){
-        EscherSpRecord sp = getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        if (value){
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPVERT);
-        } else {
-            sp.setFlags(sp.getFlags() & (Integer.MAX_VALUE - EscherSpRecord.FLAG_FLIPVERT));
-        }
-    }
-
-    /**
-     * @param value specifies whether this shape is horizontally flipped.
-     */
-    public void setFlipHorizontal(boolean value){
-        EscherSpRecord sp = getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        if (value){
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPHORIZ);
-        } else {
-            sp.setFlags(sp.getFlags() & (Integer.MAX_VALUE - EscherSpRecord.FLAG_FLIPHORIZ));
-        }
-    }
-
-    /**
-     * @return whether this shape is vertically flipped.
-     */
-    public boolean isFlipVertical(){
-        EscherSpRecord sp = getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        return (sp.getFlags() & EscherSpRecord.FLAG_FLIPVERT) != 0;
-    }
-
-    /**
-     * @return whether this shape is horizontally flipped.
-     */
-    public boolean isFlipHorizontal(){
-        EscherSpRecord sp = getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        return (sp.getFlags() & EscherSpRecord.FLAG_FLIPHORIZ) != 0;
-    }
-
-    /**
-     * @return the rotation, in degrees, that is applied to a shape.
-     */
-    public int getRotationDegree(){
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.TRANSFORM__ROTATION);
-        if (null == property){
-            return 0;
-        }
-        try {
-            LittleEndian.putInt(property.getPropertyValue(), bos);
-            return LittleEndian.getShort(bos.toByteArray(), 2);
-        } catch (IOException e) {
-            LOG.log(POILogger.ERROR, "can't determine rotation degree", e);
-            return 0;
-        }
-    }
-
-    /**
-     * specifies the rotation, in degrees, that is applied to a shape.
-     * Positive values specify rotation in the clockwise direction.
-     * Negative values specify rotation in the counterclockwise direction.
-     * Rotation occurs around the center of the shape.
-     * The default value for this property is 0x00000000
-     * @param value
-     */
-    public void setRotationDegree(short value){
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.TRANSFORM__ROTATION , (value << 16)));
-    }
-
-    /**
-     * Count of all children and their children's children.
-     */
-    public int countOfAllChildren() {
-        return 1;
-    }
-
-    protected abstract HSSFShape cloneShape();
-
-    protected void setPatriarch(HSSFPatriarch _patriarch) {
-        this._patriarch = _patriarch;
-    }
-
-    public HSSFPatriarch getPatriarch() {
-        return _patriarch;
-    }
-
-    protected void setParent(HSSFShape parent) {
-        this.parent = parent;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
deleted file mode 100644
index 31ce24f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.List;
-
-/**
- * An interface that indicates whether a class can contain children.
- */
-public interface HSSFShapeContainer extends Iterable<HSSFShape>
-{
-    /**
-     * @return  Any children contained by this shape.
-     */
-    List<HSSFShape> getChildren();
-
-    /**
-     * add shape to the list of child records
-     * @param shape
-     */
-    public void addShape(HSSFShape shape);
-
-    /**
-     * set coordinates of this group relative to the parent
-     */
-    void setCoordinates( int x1, int y1, int x2, int y2 );
-
-    void clear();
-
-    /**
-     *@return The top left x coordinate of this group.
-     */
-    public int getX1();
-
-    /**
-     *@return The top left y coordinate of this group.
-     */
-    public int getY1();
-
-    /**
-     *@return The bottom right x coordinate of this group.
-     */
-    public int getX2();
-
-    /**
-     * @return The bottom right y coordinate of this group.
-     */
-    public int getY2();
-
-    /**
-     * remove first level shapes
-     * @param shape to be removed
-     * @return true if shape is removed else return false
-     */
-    public boolean removeShape(HSSFShape shape);
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
deleted file mode 100644
index 772ee58..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Factory class for producing Excel Shapes from Escher records
- */
-public class HSSFShapeFactory {
-    /**
-     * build shape tree from escher container
-     * @param container root escher container from which escher records must be taken
-     * @param agg - EscherAggregate
-     * @param out - shape container to which shapes must be added
-     * @param root - node to create HSSFObjectData shapes
-     */
-    public static void createShapeTree(EscherContainerRecord container, EscherAggregate agg, HSSFShapeContainer out, DirectoryNode root) {
-        if (container.getRecordId() == EscherContainerRecord.SPGR_CONTAINER) {
-            ObjRecord obj = null;
-            EscherClientDataRecord clientData = ((EscherContainerRecord) container.getChild(0)).getChildById(EscherClientDataRecord.RECORD_ID);
-            if (null != clientData) {
-                obj = (ObjRecord) agg.getShapeToObjMapping().get(clientData);
-            }
-            HSSFShapeGroup group = new HSSFShapeGroup(container, obj);
-            List<EscherContainerRecord> children = container.getChildContainers();
-            // skip the first child record, it is group descriptor
-            for (int i = 0; i < children.size(); i++) {
-                EscherContainerRecord spContainer = children.get(i);
-                if (i != 0) {
-                    createShapeTree(spContainer, agg, group, root);
-                }
-            }
-            out.addShape(group);
-        } else if (container.getRecordId() == EscherContainerRecord.SP_CONTAINER) {
-            Map<EscherRecord, Record> shapeToObj = agg.getShapeToObjMapping();
-            ObjRecord objRecord = null;
-            TextObjectRecord txtRecord = null;
-
-            for (EscherRecord record : container.getChildRecords()) {
-                switch (record.getRecordId()) {
-                    case EscherClientDataRecord.RECORD_ID:
-                        objRecord = (ObjRecord) shapeToObj.get(record);
-                        break;
-                    case EscherTextboxRecord.RECORD_ID:
-                        txtRecord = (TextObjectRecord) shapeToObj.get(record);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            if (isEmbeddedObject(objRecord)) {
-                HSSFObjectData objectData = new HSSFObjectData(container, objRecord, root);
-                out.addShape(objectData);
-                return;
-            }
-            CommonObjectDataSubRecord cmo = (CommonObjectDataSubRecord) objRecord.getSubRecords().get(0);
-            final HSSFShape shape;
-            switch (cmo.getObjectType()) {
-                case CommonObjectDataSubRecord.OBJECT_TYPE_PICTURE:
-                    shape = new HSSFPicture(container, objRecord);
-                    break;
-                case CommonObjectDataSubRecord.OBJECT_TYPE_RECTANGLE:
-                    shape = new HSSFSimpleShape(container, objRecord, txtRecord);
-                    break;
-                case CommonObjectDataSubRecord.OBJECT_TYPE_LINE:
-                    shape = new HSSFSimpleShape(container, objRecord);
-                    break;
-                case CommonObjectDataSubRecord.OBJECT_TYPE_COMBO_BOX:
-                    shape = new HSSFCombobox(container, objRecord);
-                    break;
-                case CommonObjectDataSubRecord.OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING:
-                    EscherOptRecord optRecord = container.getChildById(EscherOptRecord.RECORD_ID);
-                    if(optRecord == null) {
-                    	shape = new HSSFSimpleShape(container, objRecord, txtRecord);
-                    } else {
-                        EscherProperty property = optRecord.lookup(EscherProperties.GEOMETRY__VERTICES);
-                        if (null != property) {
-                            shape = new HSSFPolygon(container, objRecord, txtRecord);
-                        } else {
-                            shape = new HSSFSimpleShape(container, objRecord, txtRecord);
-                        }
-                    }
-                    break;
-                case CommonObjectDataSubRecord.OBJECT_TYPE_TEXT:
-                    shape = new HSSFTextbox(container, objRecord, txtRecord);
-                    break;
-                case CommonObjectDataSubRecord.OBJECT_TYPE_COMMENT:
-                    shape = new HSSFComment(container, objRecord, txtRecord, agg.getNoteRecordByObj(objRecord));
-                    break;
-                default:
-                    shape = new HSSFSimpleShape(container, objRecord, txtRecord);
-            }
-            out.addShape(shape);
-        }
-    }
-
-    private static boolean isEmbeddedObject(ObjRecord obj) {
-        Iterator<SubRecord> subRecordIter = obj.getSubRecords().iterator();
-        while (subRecordIter.hasNext()) {
-            SubRecord sub = subRecordIter.next();
-            if (sub instanceof EmbeddedObjectRefSubRecord) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
deleted file mode 100644
index 9e339c7..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.record.*;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Iterator;
-
-/**
- * A shape group may contain other shapes.  It was no actual form on the
- * sheet.
- */
-public class HSSFShapeGroup extends HSSFShape implements HSSFShapeContainer {
-    private final List<HSSFShape> shapes = new ArrayList<HSSFShape>();
-    private EscherSpgrRecord _spgrRecord;
-
-    public HSSFShapeGroup(EscherContainerRecord spgrContainer, ObjRecord objRecord) {
-        super(spgrContainer, objRecord);
-
-        // read internal and external coordinates from spgrContainer
-        EscherContainerRecord spContainer = spgrContainer.getChildContainers().get(0);
-        _spgrRecord = (EscherSpgrRecord) spContainer.getChild(0);
-        for (EscherRecord ch : spContainer.getChildRecords()) {
-            switch (ch.getRecordId()) {
-                case EscherSpgrRecord.RECORD_ID:
-                    break;
-                case EscherClientAnchorRecord.RECORD_ID:
-                    anchor = new HSSFClientAnchor((EscherClientAnchorRecord) ch);
-                    break;
-                case EscherChildAnchorRecord.RECORD_ID:
-                    anchor = new HSSFChildAnchor((EscherChildAnchorRecord) ch);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    public HSSFShapeGroup(HSSFShape parent, HSSFAnchor anchor) {
-        super(parent, anchor);
-        _spgrRecord = ((EscherContainerRecord)getEscherContainer().getChild(0)).getChildById(EscherSpgrRecord.RECORD_ID);
-    }
-
-    @Override
-    protected EscherContainerRecord createSpContainer() {
-        EscherContainerRecord spgrContainer = new EscherContainerRecord();
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        EscherSpgrRecord spgr = new EscherSpgrRecord();
-        EscherSpRecord sp = new EscherSpRecord();
-        EscherOptRecord opt = new EscherOptRecord();
-        EscherRecord anchor;
-        EscherClientDataRecord clientData = new EscherClientDataRecord();
-
-        spgrContainer.setRecordId(EscherContainerRecord.SPGR_CONTAINER);
-        spgrContainer.setOptions((short) 0x000F);
-        spContainer.setRecordId(EscherContainerRecord.SP_CONTAINER);
-        spContainer.setOptions((short) 0x000F);
-        spgr.setRecordId(EscherSpgrRecord.RECORD_ID);
-        spgr.setOptions((short) 0x0001);
-        spgr.setRectX1(0);
-        spgr.setRectY1(0);
-        spgr.setRectX2(1023);
-        spgr.setRectY2(255);
-        sp.setRecordId(EscherSpRecord.RECORD_ID);
-        sp.setOptions((short) 0x0002);
-        if (getAnchor() instanceof HSSFClientAnchor) {
-            sp.setFlags(EscherSpRecord.FLAG_GROUP | EscherSpRecord.FLAG_HAVEANCHOR);
-        } else {
-            sp.setFlags(EscherSpRecord.FLAG_GROUP | EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_CHILD);
-        }
-        opt.setRecordId(EscherOptRecord.RECORD_ID);
-        opt.setOptions((short) 0x0023);
-        opt.addEscherProperty(new EscherBoolProperty(EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, 0x00040004));
-        opt.addEscherProperty(new EscherBoolProperty(EscherProperties.GROUPSHAPE__PRINT, 0x00080000));
-
-        anchor = getAnchor().getEscherAnchor();
-        clientData.setRecordId(EscherClientDataRecord.RECORD_ID);
-        clientData.setOptions((short) 0x0000);
-
-        spgrContainer.addChildRecord(spContainer);
-        spContainer.addChildRecord(spgr);
-        spContainer.addChildRecord(sp);
-        spContainer.addChildRecord(opt);
-        spContainer.addChildRecord(anchor);
-        spContainer.addChildRecord(clientData);
-        return spgrContainer;
-    }
-
-    @Override
-    protected ObjRecord createObjRecord() {
-        ObjRecord obj = new ObjRecord();
-        CommonObjectDataSubRecord cmo = new CommonObjectDataSubRecord();
-        cmo.setObjectType(CommonObjectDataSubRecord.OBJECT_TYPE_GROUP);
-        cmo.setLocked(true);
-        cmo.setPrintable(true);
-        cmo.setAutofill(true);
-        cmo.setAutoline(true);
-        GroupMarkerSubRecord gmo = new GroupMarkerSubRecord();
-        EndSubRecord end = new EndSubRecord();
-        obj.addSubRecord(cmo);
-        obj.addSubRecord(gmo);
-        obj.addSubRecord(end);
-        return obj;
-    }
-
-    @Override
-    protected void afterRemove(HSSFPatriarch patriarch) {
-        patriarch.getBoundAggregate().removeShapeToObjRecord(getEscherContainer().getChildContainers().get(0)
-                .getChildById(EscherClientDataRecord.RECORD_ID));
-        for ( int i=0; i<shapes.size(); i++ ) {
-            HSSFShape shape = shapes.get(i);
-            removeShape(shape);
-            shape.afterRemove(getPatriarch());
-        }
-        shapes.clear();
-    }
-
-    private void onCreate(HSSFShape shape){
-        if(getPatriarch() != null){
-            EscherContainerRecord spContainer = shape.getEscherContainer();
-            int shapeId = getPatriarch().newShapeId();
-            shape.setShapeId(shapeId);
-            getEscherContainer().addChildRecord(spContainer);
-            shape.afterInsert(getPatriarch());
-            EscherSpRecord sp;
-            if (shape instanceof HSSFShapeGroup){
-                sp = shape.getEscherContainer().getChildContainers().get(0).getChildById(EscherSpRecord.RECORD_ID);
-            } else {
-                sp = shape.getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-            }
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_CHILD);
-        }
-    }
-
-    /**
-     * Create another group under this group.
-     *
-     * @param anchor the position of the new group.
-     * @return the group
-     */
-    public HSSFShapeGroup createGroup(HSSFChildAnchor anchor) {
-        HSSFShapeGroup group = new HSSFShapeGroup(this, anchor);
-        group.setParent(this);
-        group.setAnchor(anchor);
-        shapes.add(group);
-        onCreate(group);
-        return group;
-    }
-
-    public void addShape(HSSFShape shape) {
-        shape.setPatriarch(this.getPatriarch());
-        shape.setParent(this);
-        shapes.add(shape);
-    }
-
-    /**
-     * Create a new simple shape under this group.
-     *
-     * @param anchor the position of the shape.
-     * @return the shape
-     */
-    public HSSFSimpleShape createShape(HSSFChildAnchor anchor) {
-        HSSFSimpleShape shape = new HSSFSimpleShape(this, anchor);
-        shape.setParent(this);
-        shape.setAnchor(anchor);
-        shapes.add(shape);
-        onCreate(shape);
-        EscherSpRecord sp = shape.getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        if (shape.getAnchor().isHorizontallyFlipped()){
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPHORIZ);
-        }
-        if (shape.getAnchor().isVerticallyFlipped()){
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPVERT);
-        }
-        return shape;
-    }
-
-    /**
-     * Create a new textbox under this group.
-     *
-     * @param anchor the position of the shape.
-     * @return the textbox
-     */
-    public HSSFTextbox createTextbox(HSSFChildAnchor anchor) {
-        HSSFTextbox shape = new HSSFTextbox(this, anchor);
-        shape.setParent(this);
-        shape.setAnchor(anchor);
-        shapes.add(shape);
-        onCreate(shape);
-        return shape;
-    }
-
-    /**
-     * Creates a polygon
-     *
-     * @param anchor the client anchor describes how this group is attached
-     *               to the sheet.
-     * @return the newly created shape.
-     */
-    public HSSFPolygon createPolygon(HSSFChildAnchor anchor) {
-        HSSFPolygon shape = new HSSFPolygon(this, anchor);
-        shape.setParent(this);
-        shape.setAnchor(anchor);
-        shapes.add(shape);
-        onCreate(shape);
-        return shape;
-    }
-
-    /**
-     * Creates a picture.
-     *
-     * @param anchor the client anchor describes how this group is attached
-     *               to the sheet.
-     * @return the newly created shape.
-     */
-    public HSSFPicture createPicture(HSSFChildAnchor anchor, int pictureIndex) {
-        HSSFPicture shape = new HSSFPicture(this, anchor);
-        shape.setParent(this);
-        shape.setAnchor(anchor);
-        shape.setPictureIndex(pictureIndex);
-        shapes.add(shape);
-        onCreate(shape);
-        EscherSpRecord sp = shape.getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        if (shape.getAnchor().isHorizontallyFlipped()){
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPHORIZ);
-        }
-        if (shape.getAnchor().isVerticallyFlipped()){
-            sp.setFlags(sp.getFlags() | EscherSpRecord.FLAG_FLIPVERT);
-        }
-        return shape;
-    }
-
-    /**
-     * Return all children contained by this shape.
-     */
-    public List<HSSFShape> getChildren() {
-        return Collections.unmodifiableList(shapes);
-    }
-
-    /**
-     * Sets the coordinate space of this group.  All children are constrained
-     * to these coordinates.
-     */
-    public void setCoordinates(int x1, int y1, int x2, int y2) {
-        _spgrRecord.setRectX1(x1);
-        _spgrRecord.setRectX2(x2);
-        _spgrRecord.setRectY1(y1);
-        _spgrRecord.setRectY2(y2);
-    }
-
-    public void clear() {
-        ArrayList <HSSFShape> copy = new ArrayList<HSSFShape>(shapes);
-        for (HSSFShape shape: copy){
-            removeShape(shape);
-        }
-    }
-
-    /**
-     * The top left x coordinate of this group.
-     */
-    public int getX1() {
-        return _spgrRecord.getRectX1();
-    }
-
-    /**
-     * The top left y coordinate of this group.
-     */
-    public int getY1() {
-        return _spgrRecord.getRectY1();
-    }
-
-    /**
-     * The bottom right x coordinate of this group.
-     */
-    public int getX2() {
-        return _spgrRecord.getRectX2();
-    }
-
-    /**
-     * The bottom right y coordinate of this group.
-     */
-    public int getY2() {
-        return _spgrRecord.getRectY2();
-    }
-
-    /**
-     * Count of all children and their childrens children.
-     */
-    public int countOfAllChildren() {
-        int count = shapes.size();
-        for (Iterator<HSSFShape> iterator = shapes.iterator(); iterator.hasNext(); ) {
-            HSSFShape shape = iterator.next();
-            count += shape.countOfAllChildren();
-        }
-        return count;
-    }
-
-    @Override
-    void afterInsert(HSSFPatriarch patriarch){
-        EscherAggregate agg = patriarch.getBoundAggregate();
-        EscherContainerRecord containerRecord = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER);
-        agg.associateShapeToObjRecord(containerRecord.getChildById(EscherClientDataRecord.RECORD_ID), getObjRecord());
-    }
-
-    @Override
-    void setShapeId(int shapeId){
-        EscherContainerRecord containerRecord = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER);
-        EscherSpRecord spRecord = containerRecord.getChildById(EscherSpRecord.RECORD_ID);
-        spRecord.setShapeId(shapeId);
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0);
-        cod.setObjectId((short) (shapeId % 1024));
-    }
-
-    @Override
-    int getShapeId(){
-        EscherContainerRecord containerRecord = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER);
-        return ((EscherSpRecord)containerRecord.getChildById(EscherSpRecord.RECORD_ID)).getShapeId();
-    }
-
-    @Override
-    protected HSSFShape cloneShape() {
-        throw new IllegalStateException("Use method cloneShape(HSSFPatriarch patriarch)");
-    }
-
-    protected HSSFShape cloneShape(HSSFPatriarch patriarch) {
-        EscherContainerRecord spgrContainer = new EscherContainerRecord();
-        spgrContainer.setRecordId(EscherContainerRecord.SPGR_CONTAINER);
-        spgrContainer.setOptions((short) 0x000F);
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        EscherContainerRecord cont = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER);
-        byte [] inSp = cont.serialize();
-        spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());
-
-        spgrContainer.addChildRecord(spContainer);
-        ObjRecord obj = null;
-        if (null != getObjRecord()){
-            obj = (ObjRecord) getObjRecord().cloneViaReserialise();
-        }
-
-        HSSFShapeGroup group = new HSSFShapeGroup(spgrContainer, obj);
-        group.setPatriarch(patriarch);
-
-        for (HSSFShape shape: getChildren()){
-            HSSFShape newShape;
-            if (shape instanceof HSSFShapeGroup){
-                newShape = ((HSSFShapeGroup)shape).cloneShape(patriarch);
-            } else {
-                newShape = shape.cloneShape();
-            }
-            group.addShape(newShape);
-            group.onCreate(newShape);
-        }
-        return group;
-    }
-
-    public boolean removeShape(HSSFShape shape) {
-        boolean  isRemoved = getEscherContainer().removeChildRecord(shape.getEscherContainer());
-        if (isRemoved){
-            shape.afterRemove(this.getPatriarch());
-            shapes.remove(shape);
-        }
-        return isRemoved;
-    }
-
-    public Iterator<HSSFShape> iterator() {
-        return shapes.iterator();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
deleted file mode 100644
index d72b400..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-public interface HSSFShapeTypes {
-    public static final int NotPrimitive = 0;
-    public static final int Rectangle = 1;
-    public static final int RoundRectangle = 2;
-    public static final int Ellipse = 3;
-    public static final int Diamond = 4;
-    public static final int IsocelesTriangle = 5;
-    public static final int RightTriangle = 6;
-    public static final int Parallelogram = 7;
-    public static final int Trapezoid = 8;
-    public static final int Hexagon = 9;
-    public static final int Octagon = 10;
-    public static final int Plus = 11;
-    public static final int Star = 12;
-    public static final int Arrow = 13;
-    public static final int ThickArrow = 14;
-    public static final int HomePlate = 15;
-    public static final int Cube = 16;
-    public static final int Balloon = 17;
-    public static final int Seal = 18;
-    public static final int Arc = 19;
-    public static final int Line = 20;
-    public static final int Plaque = 21;
-    public static final int Can = 22;
-    public static final int Donut = 23;
-    public static final int TextSimple = 24;
-    public static final int TextOctagon = 25;
-    public static final int TextHexagon = 26;
-    public static final int TextCurve = 27;
-    public static final int TextWave = 28;
-    public static final int TextRing = 29;
-    public static final int TextOnCurve = 30;
-    public static final int TextOnRing = 31;
-    public static final int StraightConnector1 = 32;
-    public static final int BentConnector2 = 33;
-    public static final int BentConnector3 = 34;
-    public static final int BentConnector4 = 35;
-    public static final int BentConnector5 = 36;
-    public static final int CurvedConnector2 = 37;
-    public static final int CurvedConnector3 = 38;
-    public static final int CurvedConnector4 = 39;
-    public static final int CurvedConnector5 = 40;
-    public static final int Callout1 = 41;
-    public static final int Callout2 = 42;
-    public static final int Callout3 = 43;
-    public static final int AccentCallout1 = 44;
-    public static final int AccentCallout2 = 45;
-    public static final int AccentCallout3 = 46;
-    public static final int BorderCallout1 = 47;
-    public static final int BorderCallout2 = 48;
-    public static final int BorderCallout3 = 49;
-    public static final int AccentBorderCallout1 = 50;
-    public static final int AccentBorderCallout2 = 51;
-    public static final int AccentBorderCallout3 = 52;
-    public static final int Ribbon = 53;
-    public static final int Ribbon2 = 54;
-    public static final int Chevron = 55;
-    public static final int Pentagon = 56;
-    public static final int NoSmoking = 57;
-    public static final int Star8 = 58;
-    public static final int Star16 = 59;
-    public static final int Star32 = 60;
-    public static final int WedgeRectCallout = 61;
-    public static final int WedgeRRectCallout = 62;
-    public static final int WedgeEllipseCallout = 63;
-    public static final int Wave = 64;
-    public static final int FoldedCorner = 65;
-    public static final int LeftArrow = 66;
-    public static final int DownArrow = 67;
-    public static final int UpArrow = 68;
-    public static final int LeftRightArrow = 69;
-    public static final int UpDownArrow = 70;
-    public static final int IrregularSeal1 = 71;
-    public static final int IrregularSeal2 = 72;
-    public static final int LightningBolt = 73;
-    public static final int Heart = 74;
-    public static final int PictureFrame = 75;
-    public static final int QuadArrow = 76;
-    public static final int LeftArrowCallout = 77;
-    public static final int RightArrowCallout = 78;
-    public static final int UpArrowCallout = 79;
-    public static final int DownArrowCallout = 80;
-    public static final int LeftRightArrowCallout = 81;
-    public static final int UpDownArrowCallout = 82;
-    public static final int QuadArrowCallout = 83;
-    public static final int Bevel = 84;
-    public static final int LeftBracket = 85;
-    public static final int RightBracket = 86;
-    public static final int LeftBrace = 87;
-    public static final int RightBrace = 88;
-    public static final int LeftUpArrow = 89;
-    public static final int BentUpArrow = 90;
-    public static final int BentArrow = 91;
-    public static final int Star24 = 92;
-    public static final int StripedRightArrow = 93;
-    public static final int NotchedRightArrow = 94;
-    public static final int BlockArc = 95;
-    public static final int SmileyFace = 96;
-    public static final int VerticalScroll = 97;
-    public static final int HorizontalScroll = 98;
-    public static final int CircularArrow = 99;
-    public static final int NotchedCircularArrow = 100;
-    public static final int UturnArrow = 101;
-    public static final int CurvedRightArrow = 102;
-    public static final int CurvedLeftArrow = 103;
-    public static final int CurvedUpArrow = 104;
-    public static final int CurvedDownArrow = 105;
-    public static final int CloudCallout = 106;
-    public static final int EllipseRibbon = 107;
-    public static final int EllipseRibbon2 = 108;
-    public static final int FlowChartProcess = 109;
-    public static final int FlowChartDecision = 110;
-    public static final int FlowChartInputOutput = 111;
-    public static final int FlowChartPredefinedProcess = 112;
-    public static final int FlowChartInternalStorage = 113;
-    public static final int FlowChartDocument = 114;
-    public static final int FlowChartMultidocument = 115;
-    public static final int FlowChartTerminator = 116;
-    public static final int FlowChartPreparation = 117;
-    public static final int FlowChartManualInput = 118;
-    public static final int FlowChartManualOperation = 119;
-    public static final int FlowChartConnector = 120;
-    public static final int FlowChartPunchedCard = 121;
-    public static final int FlowChartPunchedTape = 122;
-    public static final int FlowChartSummingJunction = 123;
-    public static final int FlowChartOr = 124;
-    public static final int FlowChartCollate = 125;
-    public static final int FlowChartSort = 126;
-    public static final int FlowChartExtract = 127;
-    public static final int FlowChartMerge = 128;
-    public static final int FlowChartOfflineStorage = 129;
-    public static final int FlowChartOnlineStorage = 130;
-    public static final int FlowChartMagneticTape = 131;
-    public static final int FlowChartMagneticDisk = 132;
-    public static final int FlowChartMagneticDrum = 133;
-    public static final int FlowChartDisplay = 134;
-    public static final int FlowChartDelay = 135;
-    public static final int TextPlainText = 136;
-    public static final int TextStop = 137;
-    public static final int TextTriangle = 138;
-    public static final int TextTriangleInverted = 139;
-    public static final int TextChevron = 140;
-    public static final int TextChevronInverted = 141;
-    public static final int TextRingInside = 142;
-    public static final int TextRingOutside = 143;
-    public static final int TextArchUpCurve = 144;
-    public static final int TextArchDownCurve = 145;
-    public static final int TextCircleCurve = 146;
-    public static final int TextButtonCurve = 147;
-    public static final int TextArchUpPour = 148;
-    public static final int TextArchDownPour = 149;
-    public static final int TextCirclePour = 150;
-    public static final int TextButtonPour = 151;
-    public static final int TextCurveUp = 152;
-    public static final int TextCurveDown = 153;
-    public static final int TextCascadeUp = 154;
-    public static final int TextCascadeDown = 155;
-    public static final int TextWave1 = 156;
-    public static final int TextWave2 = 157;
-    public static final int TextWave3 = 158;
-    public static final int TextWave4 = 159;
-    public static final int TextInflate = 160;
-    public static final int TextDeflate = 161;
-    public static final int TextInflateBottom = 162;
-    public static final int TextDeflateBottom = 163;
-    public static final int TextInflateTop = 164;
-    public static final int TextDeflateTop = 165;
-    public static final int TextDeflateInflate = 166;
-    public static final int TextDeflateInflateDeflate = 167;
-    public static final int TextFadeRight = 168;
-    public static final int TextFadeLeft = 169;
-    public static final int TextFadeUp = 170;
-    public static final int TextFadeDown = 171;
-    public static final int TextSlantUp = 172;
-    public static final int TextSlantDown = 173;
-    public static final int TextCanUp = 174;
-    public static final int TextCanDown = 175;
-    public static final int FlowChartAlternateProcess = 176;
-    public static final int FlowChartOffpageConnector = 177;
-    public static final int Callout90 = 178;
-    public static final int AccentCallout90 = 179;
-    public static final int BorderCallout90 = 180;
-    public static final int AccentBorderCallout90 = 181;
-    public static final int LeftRightUpArrow = 182;
-    public static final int Sun = 183;
-    public static final int Moon = 184;
-    public static final int BracketPair = 185;
-    public static final int BracePair = 186;
-    public static final int Star4 = 187;
-    public static final int DoubleWave = 188;
-    public static final int ActionButtonBlank = 189;
-    public static final int ActionButtonHome = 190;
-    public static final int ActionButtonHelp = 191;
-    public static final int ActionButtonInformation = 192;
-    public static final int ActionButtonForwardNext = 193;
-    public static final int ActionButtonBackPrevious = 194;
-    public static final int ActionButtonEnd = 195;
-    public static final int ActionButtonBeginning = 196;
-    public static final int ActionButtonReturn = 197;
-    public static final int ActionButtonDocument = 198;
-    public static final int ActionButtonSound = 199;
-    public static final int ActionButtonMovie = 200;
-    public static final int HostControl = 201;
-    public static final int TextBox = 202;
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
deleted file mode 100644
index 5360fe6..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ /dev/null
@@ -1,2654 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.hssf.model.DrawingManager2;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.AutoFilterInfoRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.DVRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.DrawingRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.HyperlinkRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.aggregates.DataValidityTable;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
-import org.apache.poi.hssf.usermodel.helpers.HSSFRowShifter;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.UnionPtg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellRange;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.helpers.RowShifter;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.PaneInformation;
-import org.apache.poi.ss.util.SSCellRange;
-import org.apache.poi.ss.util.SheetUtil;
-import org.apache.poi.util.Configurator;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * High level representation of a worksheet.
- */
-public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
-    private static final POILogger log = POILogFactory.getLogger(HSSFSheet.class);
-    private static final int DEBUG = POILogger.DEBUG;
-
-    /**
-     * width of 1px in columns with default width in units of 1/256 of a character width
-     */
-    private static final float PX_DEFAULT = 32.00f;
-    /**
-     * width of 1px in columns with overridden width in units of 1/256 of a character width
-     */
-    private static final float PX_MODIFIED = 36.56f;
-
-    
-    /**
-     * Used for compile-time optimization.  This is the initial size for the collection of
-     * rows.  It is currently set to 20.  If you generate larger sheets you may benefit
-     * by setting this to a higher number and recompiling a custom edition of HSSFSheet.
-     */
-    public final static int INITIAL_CAPACITY = Configurator.getIntValue("HSSFSheet.RowInitialCapacity", 20);
-
-    /**
-     * reference to the low level {@link InternalSheet} object
-     */
-    private final InternalSheet _sheet;
-    /**
-     * stores rows by zero-based row number
-     */
-    private final TreeMap<Integer, HSSFRow> _rows;
-    protected final InternalWorkbook _book;
-    protected final HSSFWorkbook _workbook;
-    private HSSFPatriarch _patriarch;
-    private int _firstrow;
-    private int _lastrow;
-
-    /**
-     * Creates new HSSFSheet   - called by HSSFWorkbook to create a sheet from
-     * scratch.  You should not be calling this from application code (its protected anyhow).
-     *
-     * @param workbook - The HSSF Workbook object associated with the sheet.
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createSheet()
-     */
-    protected HSSFSheet(HSSFWorkbook workbook) {
-        _sheet = InternalSheet.createSheet();
-        _rows = new TreeMap<Integer, HSSFRow>();
-        this._workbook = workbook;
-        this._book = workbook.getWorkbook();
-    }
-
-    /**
-     * Creates an HSSFSheet representing the given Sheet object.  Should only be
-     * called by HSSFWorkbook when reading in an exisiting file.
-     *
-     * @param workbook - The HSSF Workbook object associated with the sheet.
-     * @param sheet    - lowlevel Sheet object this sheet will represent
-     * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#createSheet()
-     */
-    protected HSSFSheet(HSSFWorkbook workbook, InternalSheet sheet) {
-        this._sheet = sheet;
-        _rows = new TreeMap<Integer, HSSFRow>();
-        this._workbook = workbook;
-        this._book = workbook.getWorkbook();
-        setPropertiesFromSheet(sheet);
-    }
-
-    HSSFSheet cloneSheet(HSSFWorkbook workbook) {
-        this.getDrawingPatriarch();/**Aggregate drawing records**/
-        HSSFSheet sheet = new HSSFSheet(workbook, _sheet.cloneSheet());
-        int pos = sheet._sheet.findFirstRecordLocBySid(DrawingRecord.sid);
-        DrawingRecord dr = (DrawingRecord) sheet._sheet.findFirstRecordBySid(DrawingRecord.sid);
-        if (null != dr) {
-            sheet._sheet.getRecords().remove(dr);
-        }
-        if (getDrawingPatriarch() != null) {
-            HSSFPatriarch patr = HSSFPatriarch.createPatriarch(this.getDrawingPatriarch(), sheet);
-            sheet._sheet.getRecords().add(pos, patr.getBoundAggregate());
-            sheet._patriarch = patr;
-        }
-        return sheet;
-    }
-
-    /**
-     * check whether the data of sheet can be serialized
-     */
-    protected void preSerialize(){
-        if (_patriarch != null){
-            _patriarch.preSerialize();
-        }
-    }
-
-    /**
-     * Return the parent workbook
-     *
-     * @return the parent workbook
-     */
-    @Override
-    public HSSFWorkbook getWorkbook() {
-        return _workbook;
-    }
-
-    /**
-     * used internally to set the properties given a Sheet object
-     */
-    private void setPropertiesFromSheet(InternalSheet sheet) {
-        RowRecord row = sheet.getNextRow();
-
-        while (row != null) {
-            createRowFromRecord(row);
-
-            row = sheet.getNextRow();
-        }
-
-        Iterator<CellValueRecordInterface> iter = sheet.getCellValueIterator();
-        long timestart = System.currentTimeMillis();
-
-        if (log.check( POILogger.DEBUG )) {
-            log.log(DEBUG, "Time at start of cell creating in HSSF sheet = ",
-                    Long.valueOf(timestart));
-        }
-        HSSFRow lastrow = null;
-
-        // Add every cell to its row
-        while (iter.hasNext()) {
-            CellValueRecordInterface cval = iter.next();
-
-            long cellstart = System.currentTimeMillis();
-            HSSFRow hrow = lastrow;
-
-            if (hrow == null || hrow.getRowNum() != cval.getRow()) {
-                hrow = getRow(cval.getRow());
-                lastrow = hrow;
-                if (hrow == null) {
-                    /* we removed this check, see bug 47245 for the discussion around this
-                    // Some tools (like Perl module Spreadsheet::WriteExcel - bug 41187) skip the RowRecords
-                    // Excel, OpenOffice.org and GoogleDocs are all OK with this, so POI should be too.
-                    if (rowRecordsAlreadyPresent) {
-                        // if at least one row record is present, all should be present.
-                        throw new RuntimeException("Unexpected missing row when some rows already present");
-                    }*/
-
-                    // create the row record on the fly now.
-                    RowRecord rowRec = new RowRecord(cval.getRow());
-                    sheet.addRow(rowRec);
-                    hrow = createRowFromRecord(rowRec);
-                }
-            }
-            if (log.check( POILogger.DEBUG )) {
-                if (cval instanceof Record) {
-                log.log( DEBUG, "record id = " + Integer.toHexString( ( (Record) cval ).getSid() ) );
-                } else {
-                    log.log( DEBUG, "record = " + cval );
-                }
-            }
-            hrow.createCellFromRecord( cval );
-            if (log.check( POILogger.DEBUG )) {
-                log.log( DEBUG, "record took ",
-                    Long.valueOf( System.currentTimeMillis() - cellstart ) );
-            }
-
-        }
-        if (log.check( POILogger.DEBUG )) {
-            log.log(DEBUG, "total sheet cell creation took ",
-                Long.valueOf(System.currentTimeMillis() - timestart));
-    }
-    }
-
-    /**
-     * Create a new row within the sheet and return the high level representation
-     *
-     * @param rownum row number
-     * @return High level HSSFRow object representing a row in the sheet
-     * @see org.apache.poi.hssf.usermodel.HSSFRow
-     * @see #removeRow(org.apache.poi.ss.usermodel.Row)
-     */
-    @Override
-    public HSSFRow createRow(int rownum) {
-        HSSFRow row = new HSSFRow(_workbook, this, rownum);
-        // new rows inherit default height from the sheet
-        row.setHeight(getDefaultRowHeight());
-        row.getRowRecord().setBadFontHeight(false);
-
-        addRow(row, true);
-        return row;
-    }
-
-    /**
-     * Used internally to create a high level Row object from a low level row object.
-     * USed when reading an existing file
-     *
-     * @param row low level record to represent as a high level Row and add to sheet
-     * @return HSSFRow high level representation
-     */
-
-    private HSSFRow createRowFromRecord(RowRecord row) {
-        HSSFRow hrow = new HSSFRow(_workbook, this, row);
-
-        addRow(hrow, false);
-        return hrow;
-    }
-
-    /**
-     * Remove a row from this sheet.  All cells contained in the row are removed as well
-     *
-     * @param row representing a row to remove.
-     */
-    @Override
-    public void removeRow(Row row) {
-        HSSFRow hrow = (HSSFRow) row;
-        if (row.getSheet() != this) {
-            throw new IllegalArgumentException("Specified row does not belong to this sheet");
-        }
-        for (Cell cell : row) {
-            HSSFCell xcell = (HSSFCell) cell;
-            if (xcell.isPartOfArrayFormulaGroup()) {
-                String msg = "Row[rownum=" + row.getRowNum() + "] contains cell(s) included in a multi-cell array formula. You cannot change part of an array.";
-                xcell.notifyArrayFormulaChanging(msg);
-            }
-        }
-
-        if (_rows.size() > 0) {
-            Integer key = Integer.valueOf(row.getRowNum());
-            HSSFRow removedRow = _rows.remove(key);
-            if (removedRow != row) {
-                //should not happen if the input argument is valid
-                throw new IllegalArgumentException("Specified row does not belong to this sheet");
-            }
-            if (hrow.getRowNum() == getLastRowNum()) {
-                _lastrow = findLastRow(_lastrow);
-            }
-            if (hrow.getRowNum() == getFirstRowNum()) {
-                _firstrow = findFirstRow(_firstrow);
-            }
-            _sheet.removeRow(hrow.getRowRecord());
-        }
-    }
-
-    /**
-     * used internally to refresh the "last row" when the last row is removed.
-     */
-    private int findLastRow(int lastrow) {
-        if (lastrow < 1) {
-            return 0;
-        }
-        int rownum = lastrow - 1;
-        HSSFRow r = getRow(rownum);
-
-        while (r == null && rownum > 0) {
-            r = getRow(--rownum);
-        }
-        if (r == null) {
-            return 0;
-        }
-        return rownum;
-    }
-
-    /**
-     * used internally to refresh the "first row" when the first row is removed.
-     */
-
-    private int findFirstRow(int firstrow) {
-        int rownum = firstrow + 1;
-        HSSFRow r = getRow(rownum);
-
-        while (r == null && rownum <= getLastRowNum()) {
-            r = getRow(++rownum);
-        }
-
-        if (rownum > getLastRowNum())
-            return 0;
-
-        return rownum;
-    }
-
-    /**
-     * add a row to the sheet
-     *
-     * @param addLow whether to add the row to the low level model - false if its already there
-     */
-
-    private void addRow(HSSFRow row, boolean addLow) {
-        _rows.put(Integer.valueOf(row.getRowNum()), row);
-        if (addLow) {
-            _sheet.addRow(row.getRowRecord());
-        }
-        boolean firstRow = _rows.size() == 1;
-        if (row.getRowNum() > getLastRowNum() || firstRow) {
-            _lastrow = row.getRowNum();
-        }
-        if (row.getRowNum() < getFirstRowNum() || firstRow) {
-            _firstrow = row.getRowNum();
-        }
-    }
-
-    /**
-     * Returns the logical row (not physical) 0-based.  If you ask for a row that is not
-     * defined you get a null.  This is to say row 4 represents the fifth row on a sheet.
-     *
-     * @param rowIndex row to get
-     * @return HSSFRow representing the row number or null if its not defined on the sheet
-     */
-    @Override
-    public HSSFRow getRow(int rowIndex) {
-        return _rows.get(Integer.valueOf(rowIndex));
-    }
-
-    /**
-     * Returns the number of physically defined rows (NOT the number of rows in the sheet)
-     */
-    @Override
-    public int getPhysicalNumberOfRows() {
-        return _rows.size();
-    }
-
-    /**
-     * Gets the first row on the sheet
-     *
-     * @return the number of the first logical row on the sheet, zero based
-     */
-    @Override
-    public int getFirstRowNum() {
-        return _firstrow;
-    }
-
-    /**
-     * Gets the number last row on the sheet.
-     * Owing to idiosyncrasies in the excel file
-     * format, if the result of calling this method
-     * is zero, you can't tell if that means there
-     * are zero rows on the sheet, or one at
-     * position zero. For that case, additionally
-     * call {@link #getPhysicalNumberOfRows()} to
-     * tell if there is a row at position zero
-     * or not.
-     *
-     * @return the number of the last row contained in this sheet, zero based.
-     */
-    @Override
-    public int getLastRowNum() {
-        return _lastrow;
-    }
-
-    @Override
-    public List<HSSFDataValidation> getDataValidations() {
-        DataValidityTable dvt = _sheet.getOrCreateDataValidityTable();
-        final List<HSSFDataValidation> hssfValidations = new ArrayList<HSSFDataValidation>();
-        RecordVisitor visitor = new RecordVisitor() {
-            private HSSFEvaluationWorkbook book = HSSFEvaluationWorkbook.create(getWorkbook());
-
-            @Override
-            public void visitRecord(Record r) {
-                if (!(r instanceof DVRecord)) {
-                    return;
-                }
-                DVRecord dvRecord = (DVRecord) r;
-                CellRangeAddressList regions = dvRecord.getCellRangeAddress().copy();
-                DVConstraint constraint = DVConstraint.createDVConstraint(dvRecord, book);
-                HSSFDataValidation hssfDataValidation = new HSSFDataValidation(regions, constraint);
-                hssfDataValidation.setErrorStyle(dvRecord.getErrorStyle());
-                hssfDataValidation.setEmptyCellAllowed(dvRecord.getEmptyCellAllowed());
-                hssfDataValidation.setSuppressDropDownArrow(dvRecord.getSuppressDropdownArrow());
-                hssfDataValidation.createPromptBox(dvRecord.getPromptTitle(), dvRecord.getPromptText());
-                hssfDataValidation.setShowPromptBox(dvRecord.getShowPromptOnCellSelected());
-                hssfDataValidation.createErrorBox(dvRecord.getErrorTitle(), dvRecord.getErrorText());
-                hssfDataValidation.setShowErrorBox(dvRecord.getShowErrorOnInvalidValue());
-                hssfValidations.add(hssfDataValidation);
-            }
-        };
-        dvt.visitContainedRecords(visitor);
-        return hssfValidations;
-    }
-
-    /**
-     * Creates a data validation object
-     *
-     * @param dataValidation The Data validation object settings
-     */
-    @Override
-    public void addValidationData(DataValidation dataValidation) {
-        if (dataValidation == null) {
-            throw new IllegalArgumentException("objValidation must not be null");
-        }
-        HSSFDataValidation hssfDataValidation = (HSSFDataValidation) dataValidation;
-        DataValidityTable dvt = _sheet.getOrCreateDataValidityTable();
-
-        DVRecord dvRecord = hssfDataValidation.createDVRecord(this);
-        dvt.addDataValidation(dvRecord);
-    }
-
-    /**
-     * Get the visibility state for a given column.
-     *
-     * @param columnIndex - the column to get (0-based)
-     * @param hidden      - the visiblity state of the column
-     */
-    @Override
-    public void setColumnHidden(int columnIndex, boolean hidden) {
-        _sheet.setColumnHidden(columnIndex, hidden);
-    }
-
-    /**
-     * Get the hidden state for a given column.
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @return hidden - <code>false</code> if the column is visible
-     */
-    @Override
-    public boolean isColumnHidden(int columnIndex) {
-        return _sheet.isColumnHidden(columnIndex);
-    }
-
-    /**
-     * Set the width (in units of 1/256th of a character width)<p>
-     * 
-     * The maximum column width for an individual cell is 255 characters.
-     * This value represents the number of characters that can be displayed
-     * in a cell that is formatted with the standard font (first font in the workbook).<p>
-     * 
-     * Character width is defined as the maximum digit width
-     * of the numbers <code>0, 1, 2, ... 9</code> as rendered
-     * using the default font (first font in the workbook).<p>
-     * 
-     * Unless you are using a very special font, the default character is '0' (zero),
-     * this is true for Arial (default font font in HSSF) and Calibri (default font in XSSF)<p>
-     * 
-     * Please note, that the width set by this method includes 4 pixels of margin padding (two on each side),
-     * plus 1 pixel padding for the gridlines (Section 3.3.1.12 of the OOXML spec).
-     * This results is a slightly less value of visible characters than passed to this method (approx. 1/2 of a character).<p>
-     * 
-     * To compute the actual number of visible characters,
-     * Excel uses the following formula (Section 3.3.1.12 of the OOXML spec):<p>
-     * 
-     * <code>
-     * width = Truncate([{Number of Visible Characters} *
-     * {Maximum Digit Width} + {5 pixel padding}]/{Maximum Digit Width}*256)/256
-     * </code>
-     * <p>Using the Calibri font as an example, the maximum digit width of 11 point font size is 7 pixels (at 96 dpi).
-     * If you set a column width to be eight characters wide, e.g. <code>setColumnWidth(columnIndex, 8*256)</code>,
-     * then the actual value of visible characters (the value shown in Excel) is derived from the following equation:
-     * <code>
-     * Truncate([numChars*7+5]/7*256)/256 = 8;
-     * </code>
-     * <p/>
-     * which gives <code>7.29</code>.
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @param width       - the width in units of 1/256th of a character width
-     * @throws IllegalArgumentException if width &gt; 255*256 (the maximum column width in Excel is 255 characters)
-     */
-    @Override
-    public void setColumnWidth(int columnIndex, int width) {
-        _sheet.setColumnWidth(columnIndex, width);
-    }
-
-    /**
-     * get the width (in units of 1/256th of a character width )
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @return width - the width in units of 1/256th of a character width
-     */
-    @Override
-    public int getColumnWidth(int columnIndex) {
-        return _sheet.getColumnWidth(columnIndex);
-    }
-
-    @Override
-    public float getColumnWidthInPixels(int column){
-        int cw = getColumnWidth(column);
-        int def = getDefaultColumnWidth()*256;
-        float px = (cw == def ? PX_DEFAULT : PX_MODIFIED);
-
-        return cw/px;
-    }
-    
-    /**
-     * get the default column width for the sheet (if the columns do not define their own width) in
-     * characters
-     *
-     * @return default column width
-     */
-    @Override
-    public int getDefaultColumnWidth() {
-        return _sheet.getDefaultColumnWidth();
-    }
-
-    /**
-     * set the default column width for the sheet (if the columns do not define their own width) in
-     * characters
-     *
-     * @param width default column width
-     */
-    @Override
-    public void setDefaultColumnWidth(int width) {
-        _sheet.setDefaultColumnWidth(width);
-    }
-
-
-    /**
-     * get the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of  a point)
-     *
-     * @return default row height
-     */
-    @Override
-    public short getDefaultRowHeight() {
-        return _sheet.getDefaultRowHeight();
-    }
-
-    /**
-     * get the default row height for the sheet (if the rows do not define their own height) in
-     * points.
-     *
-     * @return default row height in points
-     */
-    @Override
-    public float getDefaultRowHeightInPoints() {
-        return ((float) _sheet.getDefaultRowHeight() / 20);
-    }
-
-    /**
-     * set the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of  a point)
-     *
-     * @param height default row height
-     */
-    @Override
-    public void setDefaultRowHeight(short height) {
-        _sheet.setDefaultRowHeight(height);
-    }
-
-    /**
-     * set the default row height for the sheet (if the rows do not define their own height) in
-     * points
-     *
-     * @param height default row height
-     */
-    @Override
-    public void setDefaultRowHeightInPoints(float height) {
-        _sheet.setDefaultRowHeight((short) (height * 20));
-    }
-
-    /**
-     * Returns the HSSFCellStyle that applies to the given
-     * (0 based) column, or null if no style has been
-     * set for that column
-     */
-    @Override
-    public HSSFCellStyle getColumnStyle(int column) {
-        short styleIndex = _sheet.getXFIndexForColAt((short) column);
-
-        if (styleIndex == 0xf) {
-            // None set
-            return null;
-        }
-
-        ExtendedFormatRecord xf = _book.getExFormatAt(styleIndex);
-        return new HSSFCellStyle(styleIndex, xf, _book);
-    }
-
-    /**
-     * get whether gridlines are printed.
-     *
-     * @return true if printed
-     */
-    public boolean isGridsPrinted() {
-        return _sheet.isGridsPrinted();
-    }
-
-    /**
-     * set whether gridlines printed.
-     *
-     * @param value false if not printed.
-     */
-    public void setGridsPrinted(boolean value) {
-        _sheet.setGridsPrinted(value);
-    }
-
-    /**
-     * Adds a merged region of cells on a sheet.
-     *
-     * @param region to merge
-     * @return index of this region
-     * @throws IllegalArgumentException if region contains fewer than 2 cells
-     * @throws IllegalStateException if region intersects with a multi-cell array formula
-     * @throws IllegalStateException if region intersects with an existing region on this sheet
-     */
-    @Override
-    public int addMergedRegion(CellRangeAddress region) {
-        return addMergedRegion(region, true);
-    }
-
-    /**
-     * Adds a merged region of cells (hence those cells form one).
-     * Skips validation. It is possible to create overlapping merged regions
-     * or create a merged region that intersects a multi-cell array formula
-     * with this formula, which may result in a corrupt workbook.
-     *
-     * To check for merged regions overlapping array formulas or other merged regions
-     * after addMergedRegionUnsafe has been called, call {@link #validateMergedRegions()}, which runs in O(n^2) time.
-     *
-     * @param region to merge
-     * @return index of this region
-     * @throws IllegalArgumentException if region contains fewer than 2 cells
-     */
-    @Override
-    public int addMergedRegionUnsafe(CellRangeAddress region) {
-        return addMergedRegion(region, false);
-    }
-
-    /**
-     * Verify that merged regions do not intersect multi-cell array formulas and
-     * no merged regions intersect another merged region in this sheet.
-     *
-     * @throws IllegalStateException if region intersects with a multi-cell array formula
-     * @throws IllegalStateException if at least one region intersects with another merged region in this sheet
-     */
-    @Override
-    public void validateMergedRegions() {
-        checkForMergedRegionsIntersectingArrayFormulas();
-        checkForIntersectingMergedRegions();
-    }
-
-    /**
-     * adds a merged region of cells (hence those cells form one)
-     *
-     * @param region (rowfrom/colfrom-rowto/colto) to merge
-     * @param validate whether to validate merged region
-     * @return index of this region
-     * @throws IllegalArgumentException if region contains fewer than 2 cells
-     * @throws IllegalStateException if region intersects with an existing merged region
-     * or multi-cell array formula on this sheet
-     */
-    private int addMergedRegion(CellRangeAddress region, boolean validate) {
-        if (region.getNumberOfCells() < 2) {
-            throw new IllegalArgumentException("Merged region " + region.formatAsString() + " must contain 2 or more cells");
-        }
-        region.validate(SpreadsheetVersion.EXCEL97);
-
-        if (validate) {
-            // throw IllegalStateException if the argument CellRangeAddress intersects with
-            // a multi-cell array formula defined in this sheet
-            validateArrayFormulas(region);
-        
-            // Throw IllegalStateException if the argument CellRangeAddress intersects with
-            // a merged region already in this sheet
-            validateMergedRegions(region);
-        }
-
-        return _sheet.addMergedRegion(region.getFirstRow(),
-                region.getFirstColumn(),
-                region.getLastRow(),
-                region.getLastColumn());
-    }
-
-    private void validateArrayFormulas(CellRangeAddress region) {
-        // FIXME: this may be faster if it looped over array formulas directly rather than looping over each cell in
-        // the region and searching if that cell belongs to an array formula
-        int firstRow = region.getFirstRow();
-        int firstColumn = region.getFirstColumn();
-        int lastRow = region.getLastRow();
-        int lastColumn = region.getLastColumn();
-        for (int rowIn = firstRow; rowIn <= lastRow; rowIn++) {
-            HSSFRow row = getRow(rowIn);
-            if (row == null) continue;
-            
-            for (int colIn = firstColumn; colIn <= lastColumn; colIn++) {
-                HSSFCell cell = row.getCell(colIn);
-                if (cell == null) continue;
-
-                if (cell.isPartOfArrayFormulaGroup()) {
-                    CellRangeAddress arrayRange = cell.getArrayFormulaRange();
-                    if (arrayRange.getNumberOfCells() > 1 && region.intersects(arrayRange)) {
-                        String msg = "The range " + region.formatAsString() + " intersects with a multi-cell array formula. " +
-                                "You cannot merge cells of an array.";
-                        throw new IllegalStateException(msg);
-                    }
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Verify that none of the merged regions intersect a multi-cell array formula in this sheet
-     *
-     * @throws IllegalStateException if candidate region intersects an existing array formula in this sheet
-     */
-    private void checkForMergedRegionsIntersectingArrayFormulas() {
-        for (CellRangeAddress region : getMergedRegions()) {
-            validateArrayFormulas(region);
-        }
-    }
-
-    private void validateMergedRegions(CellRangeAddress candidateRegion) {
-        for (final CellRangeAddress existingRegion : getMergedRegions()) {
-            if (existingRegion.intersects(candidateRegion)) {
-                throw new IllegalStateException("Cannot add merged region " + candidateRegion.formatAsString() +
-                        " to sheet because it overlaps with an existing merged region (" + existingRegion.formatAsString() + ").");
-            }
-        }
-    }
-
-    /**
-     * Verify that no merged regions intersect another merged region in this sheet.
-     *
-     * @throws IllegalStateException if at least one region intersects with another merged region in this sheet
-     */
-    private void checkForIntersectingMergedRegions() {
-        final List<CellRangeAddress> regions = getMergedRegions();
-        final int size = regions.size();
-        for (int i=0; i < size; i++) {
-            final CellRangeAddress region = regions.get(i);
-            for (final CellRangeAddress other : regions.subList(i+1, regions.size())) {
-                if (region.intersects(other)) {
-                    String msg = "The range " + region.formatAsString() +
-                                " intersects with another merged region " +
-                                other.formatAsString() + " in this sheet";
-                    throw new IllegalStateException(msg);
-                }
-            }
-        }
-    }
-
-    /**
-     * Control if Excel should be asked to recalculate all formulas on this sheet
-     * when the workbook is opened.<p>
-     * 
-     * Calculating the formula values with {@link org.apache.poi.ss.usermodel.FormulaEvaluator} is the
-     * recommended solution, but this may be used for certain cases where
-     * evaluation in POI is not possible.<p>
-     * 
-     * It is recommended to force recalcuation of formulas on workbook level using
-     * {@link org.apache.poi.ss.usermodel.Workbook#setForceFormulaRecalculation(boolean)}
-     * to ensure that all cross-worksheet formuals and external dependencies are updated.
-     *
-     * @param value true if the application will perform a full recalculation of
-     *              this worksheet values when the workbook is opened
-     * @see org.apache.poi.ss.usermodel.Workbook#setForceFormulaRecalculation(boolean)
-     */
-    @Override
-    public void setForceFormulaRecalculation(boolean value) {
-        _sheet.setUncalced(value);
-    }
-
-    /**
-     * Whether a record must be inserted or not at generation to indicate that
-     * formula must be recalculated when workbook is opened.
-     *
-     * @return true if an uncalced record must be inserted or not at generation
-     */
-    @Override
-    public boolean getForceFormulaRecalculation() {
-        return _sheet.getUncalced();
-    }
-
-
-    /**
-     * determines whether the output is vertically centered on the page.
-     *
-     * @param value true to vertically center, false otherwise.
-     */
-    @Override
-    public void setVerticallyCenter(boolean value) {
-        _sheet.getPageSettings().getVCenter().setVCenter(value);
-    }
-
-    /**
-     * Determine whether printed output for this sheet will be vertically centered.
-     */
-    @Override
-    public boolean getVerticallyCenter() {
-        return _sheet.getPageSettings().getVCenter().getVCenter();
-    }
-
-    /**
-     * determines whether the output is horizontally centered on the page.
-     *
-     * @param value true to horizontally center, false otherwise.
-     */
-    @Override
-    public void setHorizontallyCenter(boolean value) {
-        _sheet.getPageSettings().getHCenter().setHCenter(value);
-    }
-
-    /**
-     * Determine whether printed output for this sheet will be horizontally centered.
-     */
-    @Override
-    public boolean getHorizontallyCenter() {
-        return _sheet.getPageSettings().getHCenter().getHCenter();
-    }
-
-    /**
-     * Sets whether the worksheet is displayed from right to left instead of from left to right.
-     *
-     * @param value true for right to left, false otherwise.
-     */
-    @Override
-    public void setRightToLeft(boolean value) {
-        _sheet.getWindowTwo().setArabic(value);
-    }
-
-    /**
-     * Whether the text is displayed in right-to-left mode in the window
-     *
-     * @return whether the text is displayed in right-to-left mode in the window
-     */
-    @Override
-    public boolean isRightToLeft() {
-        return _sheet.getWindowTwo().getArabic();
-    }
-
-    /**
-     * removes a merged region of cells (hence letting them free)
-     *
-     * @param index of the region to unmerge
-     */
-    @Override
-    public void removeMergedRegion(int index) {
-        _sheet.removeMergedRegion(index);
-    }
-    
-    /**
-     * Removes a number of merged regions of cells (hence letting them free)
-     *
-     * @param indices A set of the regions to unmerge
-     */
-    @Override
-    public void removeMergedRegions(Collection<Integer> indices) {
-        for (int i : (new TreeSet<Integer>(indices)).descendingSet()) {
-            _sheet.removeMergedRegion(i);
-        }
-    }
-
-    /**
-     * returns the number of merged regions
-     *
-     * @return number of merged regions
-     */
-    @Override
-    public int getNumMergedRegions() {
-        return _sheet.getNumMergedRegions();
-    }
-
-    /**
-     * @return the merged region at the specified index
-     */
-    @Override
-    public CellRangeAddress getMergedRegion(int index) {
-        return _sheet.getMergedRegionAt(index);
-    }
-
-    /**
-     * @return the list of merged regions
-     */
-    @Override
-    public List<CellRangeAddress> getMergedRegions() {
-        List<CellRangeAddress> addresses = new ArrayList<CellRangeAddress>();
-        int count = _sheet.getNumMergedRegions();
-        for (int i=0; i < count; i++) {
-            addresses.add(_sheet.getMergedRegionAt(i));
-        }
-        return addresses;
-    }
-
-    /**
-     * @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.
-     *         Call getRowNum() on each row if you care which one it is.
-     */
-    @Override
-    public Iterator<Row> rowIterator() {
-        @SuppressWarnings("unchecked") // can this clumsy generic syntax be improved?
-                Iterator<Row> result = (Iterator<Row>) (Iterator<? extends Row>) _rows.values().iterator();
-        return result;
-    }
-
-    /**
-     * Alias for {@link #rowIterator()} to allow
-     * foreach loops
-     */
-    @Override
-    public Iterator<Row> iterator() {
-        return rowIterator();
-    }
-
-
-    /**
-     * used internally in the API to get the low level Sheet record represented by this
-     * Object.
-     *
-     * @return Sheet - low level representation of this HSSFSheet.
-     */
-    /*package*/ InternalSheet getSheet() {
-        return _sheet;
-    }
-
-    /**
-     * whether alternate expression evaluation is on
-     *
-     * @param b alternative expression evaluation or not
-     */
-    public void setAlternativeExpression(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setAlternateExpression(b);
-    }
-
-    /**
-     * whether alternative formula entry is on
-     *
-     * @param b alternative formulas or not
-     */
-    public void setAlternativeFormula(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setAlternateFormula(b);
-    }
-
-    /**
-     * show automatic page breaks or not
-     *
-     * @param b whether to show auto page breaks
-     */
-    @Override
-    public void setAutobreaks(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setAutobreaks(b);
-    }
-
-    /**
-     * set whether sheet is a dialog sheet or not
-     *
-     * @param b isDialog or not
-     */
-    public void setDialog(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setDialog(b);
-    }
-
-    /**
-     * set whether to display the guts or not
-     *
-     * @param b guts or no guts (or glory)
-     */
-    @Override
-    public void setDisplayGuts(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setDisplayGuts(b);
-    }
-
-    /**
-     * fit to page option is on
-     *
-     * @param b fit or not
-     */
-    @Override
-    public void setFitToPage(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setFitToPage(b);
-    }
-
-    /**
-     * set if row summaries appear below detail in the outline
-     *
-     * @param b below or not
-     */
-    @Override
-    public void setRowSumsBelow(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setRowSumsBelow(b);
-        //setAlternateExpression must be set in conjuction with setRowSumsBelow
-        record.setAlternateExpression(b);
-    }
-
-    /**
-     * set if col summaries appear right of the detail in the outline
-     *
-     * @param b right or not
-     */
-    @Override
-    public void setRowSumsRight(boolean b) {
-        WSBoolRecord record =
-                (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
-
-        record.setRowSumsRight(b);
-    }
-
-    /**
-     * whether alternate expression evaluation is on
-     *
-     * @return alternative expression evaluation or not
-     */
-    public boolean getAlternateExpression() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getAlternateExpression();
-    }
-
-    /**
-     * whether alternative formula entry is on
-     *
-     * @return alternative formulas or not
-     */
-    public boolean getAlternateFormula() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getAlternateFormula();
-    }
-
-    /**
-     * show automatic page breaks or not
-     *
-     * @return whether to show auto page breaks
-     */
-    @Override
-    public boolean getAutobreaks() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getAutobreaks();
-    }
-
-    /**
-     * get whether sheet is a dialog sheet or not
-     *
-     * @return isDialog or not
-     */
-    public boolean getDialog() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getDialog();
-    }
-
-    /**
-     * get whether to display the guts or not
-     *
-     * @return guts or no guts (or glory)
-     */
-    @Override
-    public boolean getDisplayGuts() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getDisplayGuts();
-    }
-
-
-    /**
-     * Gets the flag indicating whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     * <p>
-     * In Excel 2003 this option can be changed in the Options dialog on the View tab.
-     * </p>
-     *
-     * @return whether all zero values on the worksheet are displayed
-     */
-    @Override
-    public boolean isDisplayZeros() {
-        return _sheet.getWindowTwo().getDisplayZeros();
-    }
-
-    /**
-     * Set whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     * <p>
-     * In Excel 2003 this option can be set in the Options dialog on the View tab.
-     * </p>
-     *
-     * @param value whether to display or hide all zero values on the worksheet
-     */
-    @Override
-    public void setDisplayZeros(boolean value) {
-        _sheet.getWindowTwo().setDisplayZeros(value);
-    }
-
-    /**
-     * fit to page option is on
-     *
-     * @return fit or not
-     */
-    @Override
-    public boolean getFitToPage() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getFitToPage();
-    }
-
-    /**
-     * get if row summaries appear below detail in the outline
-     *
-     * @return below or not
-     */
-    @Override
-    public boolean getRowSumsBelow() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getRowSumsBelow();
-    }
-
-    /**
-     * get if col summaries appear right of the detail in the outline
-     *
-     * @return right or not
-     */
-    @Override
-    public boolean getRowSumsRight() {
-        return ((WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid))
-                .getRowSumsRight();
-    }
-
-    /**
-     * Returns whether gridlines are printed.
-     *
-     * @return Gridlines are printed
-     */
-    @Override
-    public boolean isPrintGridlines() {
-        return getSheet().getPrintGridlines().getPrintGridlines();
-    }
-
-    /**
-     * Turns on or off the printing of gridlines.
-     *
-     * @param show boolean to turn on or off the printing of
-     *                          gridlines
-     */
-    @Override
-    public void setPrintGridlines(boolean show) {
-        getSheet().getPrintGridlines().setPrintGridlines(show);
-    }
-    
-    /**
-     * Returns whether row and column headings are printed.
-     *
-     * @return row and column headings are printed
-     */
-    @Override
-    public boolean isPrintRowAndColumnHeadings() {
-        return getSheet().getPrintHeaders().getPrintHeaders();
-    }
-
-    /**
-     * Turns on or off the printing of row and column headings.
-     *
-     * @param show boolean to turn on or off the printing of
-     *                          row and column headings
-     */
-    @Override
-    public void setPrintRowAndColumnHeadings(boolean show) {
-        getSheet().getPrintHeaders().setPrintHeaders(show);
-    }
-
-    /**
-     * Gets the print setup object.
-     *
-     * @return The user model for the print setup object.
-     */
-    @Override
-    public HSSFPrintSetup getPrintSetup() {
-        return new HSSFPrintSetup(_sheet.getPageSettings().getPrintSetup());
-    }
-
-    @Override
-    public HSSFHeader getHeader() {
-        return new HSSFHeader(_sheet.getPageSettings());
-    }
-
-    @Override
-    public HSSFFooter getFooter() {
-        return new HSSFFooter(_sheet.getPageSettings());
-    }
-
-    /**
-     * Note - this is not the same as whether the sheet is focused (isActive)
-     *
-     * @return <code>true</code> if this sheet is currently selected
-     */
-    @Override
-    public boolean isSelected() {
-        return getSheet().getWindowTwo().getSelected();
-    }
-
-    /**
-     * Sets whether sheet is selected.
-     *
-     * @param sel Whether to select the sheet or deselect the sheet.
-     */
-    @Override
-    public void setSelected(boolean sel) {
-        getSheet().getWindowTwo().setSelected(sel);
-    }
-
-    /**
-     * @return <code>true</code> if this sheet is currently focused
-     */
-    public boolean isActive() {
-        return getSheet().getWindowTwo().isActive();
-    }
-
-    /**
-     * Sets whether sheet is selected.
-     *
-     * @param sel Whether to select the sheet or deselect the sheet.
-     */
-    public void setActive(boolean sel) {
-        getSheet().getWindowTwo().setActive(sel);
-    }
-
-    /**
-     * Gets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @return the size of the margin
-     */
-    @Override
-    public double getMargin(short margin) {
-        switch (margin) {
-            case FooterMargin:
-                return _sheet.getPageSettings().getPrintSetup().getFooterMargin();
-            case HeaderMargin:
-                return _sheet.getPageSettings().getPrintSetup().getHeaderMargin();
-            default:
-                return _sheet.getPageSettings().getMargin(margin);
-        }
-    }
-
-    /**
-     * Sets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @param size   the size of the margin
-     */
-    @Override
-    public void setMargin(short margin, double size) {
-        switch (margin) {
-            case FooterMargin:
-                _sheet.getPageSettings().getPrintSetup().setFooterMargin(size);
-                break;
-            case HeaderMargin:
-                _sheet.getPageSettings().getPrintSetup().setHeaderMargin(size);
-                break;
-            default:
-                _sheet.getPageSettings().setMargin(margin, size);
-        }
-    }
-
-    private WorksheetProtectionBlock getProtectionBlock() {
-        return _sheet.getProtectionBlock();
-    }
-
-    /**
-     * Answer whether protection is enabled or disabled
-     *
-     * @return true =&gt; protection enabled; false =&gt; protection disabled
-     */
-    @Override
-    public boolean getProtect() {
-        return getProtectionBlock().isSheetProtected();
-    }
-
-    /**
-     * @return hashed password
-     */
-    public short getPassword() {
-        return (short) getProtectionBlock().getPasswordHash();
-    }
-
-    /**
-     * Answer whether object protection is enabled or disabled
-     *
-     * @return true =&gt; protection enabled; false =&gt; protection disabled
-     */
-    public boolean getObjectProtect() {
-        return getProtectionBlock().isObjectProtected();
-    }
-
-    /**
-     * Answer whether scenario protection is enabled or disabled
-     *
-     * @return true =&gt; protection enabled; false =&gt; protection disabled
-     */
-    @Override
-    public boolean getScenarioProtect() {
-        return getProtectionBlock().isScenarioProtected();
-    }
-
-    /**
-     * Sets the protection enabled as well as the password
-     *
-     * @param password to set for protection. Pass <code>null</code> to remove protection
-     */
-    @Override
-    public void protectSheet(String password) {
-        getProtectionBlock().protectSheet(password, true, true); //protect objs&scenarios(normal)
-    }
-
-    /**
-     * Sets the zoom magnification for the sheet.  The zoom is expressed as a
-     * fraction.  For example to express a zoom of 75% use 3 for the numerator
-     * and 4 for the denominator.
-     *
-     * @param numerator   The numerator for the zoom magnification.
-     * @param denominator The denominator for the zoom magnification.
-     * @see #setZoom(int)
-     */
-    public void setZoom(int numerator, int denominator) {
-        if (numerator < 1 || numerator > 65535)
-            throw new IllegalArgumentException("Numerator must be greater than 0 and less than 65536");
-        if (denominator < 1 || denominator > 65535)
-            throw new IllegalArgumentException("Denominator must be greater than 0 and less than 65536");
-
-        SCLRecord sclRecord = new SCLRecord();
-        sclRecord.setNumerator((short) numerator);
-        sclRecord.setDenominator((short) denominator);
-        getSheet().setSCLRecord(sclRecord);
-    }
-    
-    /**
-     * Window zoom magnification for current view representing percent values.
-     * Valid values range from 10 to 400. Horizontal &amp; Vertical scale together.
-     *
-     * For example:
-     * <pre>
-     * 10 - 10%
-     * 20 - 20%
-     * ...
-     * 100 - 100%
-     * ...
-     * 400 - 400%
-     * </pre>
-     *
-     * @param scale window zoom magnification
-     * @throws IllegalArgumentException if scale is invalid
-     */
-    @Override
-    public void setZoom(int scale) {
-        setZoom(scale, 100);
-    }
-
-    /**
-     * The top row in the visible view when the sheet is
-     * first viewed after opening it in a viewer
-     *
-     * @return short indicating the rownum (0 based) of the top row
-     */
-    @Override
-    public short getTopRow() {
-        return _sheet.getTopRow();
-    }
-
-    /**
-     * The left col in the visible view when the sheet is
-     * first viewed after opening it in a viewer
-     *
-     * @return short indicating the rownum (0 based) of the top row
-     */
-    @Override
-    public short getLeftCol() {
-        return _sheet.getLeftCol();
-    }
-
-    /**
-     * Sets desktop window pane display area, when the
-     * file is first opened in a viewer.
-     *
-     * @param toprow  the top row to show in desktop window pane
-     * @param leftcol the left column to show in desktop window pane
-     */
-    @Override
-    public void showInPane(int toprow, int leftcol) {
-        int maxrow = SpreadsheetVersion.EXCEL97.getLastRowIndex();
-        if (toprow > maxrow) throw new IllegalArgumentException("Maximum row number is " + maxrow);
-        
-        showInPane((short)toprow, (short)leftcol);
-    }
-    /**
-     * Sets desktop window pane display area, when the
-     * file is first opened in a viewer.
-     *
-     * @param toprow  the top row to show in desktop window pane
-     * @param leftcol the left column to show in desktop window pane
-     */
-    private void showInPane(short toprow, short leftcol) {
-        _sheet.setTopRow(toprow);
-        _sheet.setLeftCol(leftcol);
-    }
-    
-    /**
-     * Shifts, grows, or shrinks the merged regions due to a row shift
-     * 
-     * @param startRow the start-index of the rows to shift, zero-based
-     * @param endRow the end-index of the rows to shift, zero-based
-     * @param n how far to shift, negative to shift up
-     * @param isRow unused, kept for backwards compatibility
-     * @deprecated POI 3.15 beta 2. Use {@link HSSFRowShifter#shiftMergedRegions(int, int, int)}.
-     */
-    protected void shiftMerged(int startRow, int endRow, int n, boolean isRow) {
-        RowShifter rowShifter = new HSSFRowShifter(this);
-        rowShifter.shiftMergedRegions(startRow, endRow, n);
-    }
-
-    /**
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around.<p>
-     * 
-     * Calls {@code shiftRows(startRow, endRow, n, false, false);}<p>
-     * 
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted).
-     *
-     * @param startRow the row to start shifting
-     * @param endRow   the row to end shifting
-     * @param n        the number of rows to shift
-     */
-    @Override
-    public void shiftRows(int startRow, int endRow, int n) {
-        shiftRows(startRow, endRow, n, false, false);
-    }
-
-    /**
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around<p>
-     * 
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted). All merged regions that are
-     * completely overlaid by shifting will be deleted.<p>
-     * 
-     * TODO Might want to add bounds checking here
-     *
-     * @param startRow               the row to start shifting
-     * @param endRow                 the row to end shifting
-     * @param n                      the number of rows to shift
-     * @param copyRowHeight          whether to copy the row height during the shift
-     * @param resetOriginalRowHeight whether to set the original row's height to the default
-     */
-    @Override
-    public void shiftRows(int startRow, int endRow, int n, boolean copyRowHeight, boolean resetOriginalRowHeight) {
-        shiftRows(startRow, endRow, n, copyRowHeight, resetOriginalRowHeight, true);
-    }
-    
-    /**
-     * bound a row number between 0 and last row index (65535)
-     *
-     * @param row the row number
-     */
-    private static int clip(int row) {
-        return Math.min(
-                Math.max(0, row),
-                SpreadsheetVersion.EXCEL97.getLastRowIndex());
-    }
-
-    /**
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around<p>
-     * 
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted).<p>
-     * 
-     * TODO Might want to add bounds checking here
-     *
-     * @param startRow               the row to start shifting
-     * @param endRow                 the row to end shifting
-     * @param n                      the number of rows to shift
-     * @param copyRowHeight          whether to copy the row height during the shift
-     * @param resetOriginalRowHeight whether to set the original row's height to the default
-     * @param moveComments           whether to move comments at the same time as the cells they are attached to
-     */
-    public void shiftRows(int startRow, int endRow, int n,
-                          boolean copyRowHeight, boolean resetOriginalRowHeight, boolean moveComments) {
-        int s, inc;
-        if (endRow < startRow) {
-            throw new IllegalArgumentException("startRow must be less than or equal to endRow. To shift rows up, use n<0.");
-        }
-        if (n < 0) {
-            s = startRow;
-            inc = 1;
-        } else if (n > 0) {
-            s = endRow;
-            inc = -1;
-        } else {
-            // Nothing to do
-            return;
-        }
-        
-        final RowShifter rowShifter = new HSSFRowShifter(this);
-        
-        // Move comments from the source row to the
-        //  destination row. Note that comments can
-        //  exist for cells which are null
-        // If the row shift would shift the comments off the sheet
-        // (above the first row or below the last row), this code will shift the
-        // comments to the first or last row, rather than moving them out of
-        // bounds or deleting them
-        if (moveComments) {
-            final HSSFPatriarch patriarch = createDrawingPatriarch();
-            for (final HSSFShape shape : patriarch.getChildren()) {
-                if (!(shape instanceof HSSFComment)) {
-                    continue;
-                }
-                final HSSFComment comment = (HSSFComment) shape;
-                final int r = comment.getRow();
-                if (startRow <= r && r <= endRow) {
-                    comment.setRow(clip(r + n));
-                }
-            }
-        }
-
-        // Shift Merged Regions
-        rowShifter.shiftMergedRegions(startRow, endRow, n);
-        
-        // Shift Row Breaks
-        _sheet.getPageSettings().shiftRowBreaks(startRow, endRow, n);
-        
-        // Delete overwritten hyperlinks
-        final int firstOverwrittenRow = startRow + n;
-        final int lastOverwrittenRow = endRow + n;
-        for (HSSFHyperlink link : getHyperlinkList()) {
-            // If hyperlink is fully contained in the rows that will be overwritten, delete the hyperlink
-            final int firstRow = link.getFirstRow();
-            final int lastRow = link.getLastRow();
-            if (firstOverwrittenRow <= firstRow && firstRow <= lastOverwrittenRow &&
-                    lastOverwrittenRow <= lastRow && lastRow <= lastOverwrittenRow) {
-                removeHyperlink(link);
-            }
-        }
-
-        for (int rowNum = s; rowNum >= startRow && rowNum <= endRow && rowNum >= 0 && rowNum < 65536; rowNum += inc) {
-            HSSFRow row = getRow(rowNum);
-            // notify all cells in this row that we are going to shift them,
-            // it can throw IllegalStateException if the operation is not allowed, for example,
-            // if the row contains cells included in a multi-cell array formula
-            if (row != null) notifyRowShifting(row);
-
-            HSSFRow row2Replace = getRow(rowNum + n);
-            if (row2Replace == null)
-                row2Replace = createRow(rowNum + n);
-
-
-            // Remove all the old cells from the row we'll
-            //  be writing to, before we start overwriting
-            //  any cells. This avoids issues with cells
-            //  changing type, and records not being correctly
-            //  overwritten
-            row2Replace.removeAllCells();
-
-            // If this row doesn't exist, nothing needs to
-            //  be done for the now empty destination row
-            if (row == null) continue; // Nothing to do for this row
-
-            // Fix up row heights if required
-            if (copyRowHeight) {
-                row2Replace.setHeight(row.getHeight());
-            }
-            if (resetOriginalRowHeight) {
-                row.setHeight((short) 0xff);
-            }
-
-            // Copy each cell from the source row to
-            //  the destination row
-            for (Iterator<Cell> cells = row.cellIterator(); cells.hasNext(); ) {
-                HSSFCell cell = (HSSFCell) cells.next();
-                HSSFHyperlink link = cell.getHyperlink();
-                row.removeCell(cell);
-                CellValueRecordInterface cellRecord = cell.getCellValueRecord();
-                cellRecord.setRow(rowNum + n);
-                row2Replace.createCellFromRecord(cellRecord);
-                _sheet.addValueRecord(rowNum + n, cellRecord);
-
-                if (link != null) {
-                    link.setFirstRow(link.getFirstRow() + n);
-                    link.setLastRow(link.getLastRow() + n);
-                }
-            }
-            // Now zap all the cells in the source row
-            row.removeAllCells();
-        }
-
-        // Re-compute the first and last rows of the sheet as needed
-        if (n > 0) {
-            // Rows are moving down
-            if (startRow == _firstrow) {
-                // Need to walk forward to find the first non-blank row
-                _firstrow = Math.max(startRow + n, 0);
-                for (int i = startRow + 1; i < startRow + n; i++) {
-                    if (getRow(i) != null) {
-                        _firstrow = i;
-                        break;
-                    }
-                }
-            }
-            if (endRow + n > _lastrow) {
-                _lastrow = Math.min(endRow + n, SpreadsheetVersion.EXCEL97.getLastRowIndex());
-            }
-        } else {
-            // Rows are moving up
-            if (startRow + n < _firstrow) {
-                _firstrow = Math.max(startRow + n, 0);
-            }
-            if (endRow == _lastrow) {
-                // Need to walk backward to find the last non-blank row
-                _lastrow = Math.min(endRow + n, SpreadsheetVersion.EXCEL97.getLastRowIndex());
-                for (int i = endRow - 1; i > endRow + n; i++) {
-                    if (getRow(i) != null) {
-                        _lastrow = i;
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Update any formulas on this sheet that point to
-        //  rows which have been moved
-        int sheetIndex = _workbook.getSheetIndex(this);
-        String sheetName = _workbook.getSheetName(sheetIndex);
-        short externSheetIndex = _book.checkExternSheet(sheetIndex);
-        FormulaShifter shifter = FormulaShifter.createForRowShift(
-                         externSheetIndex, sheetName, startRow, endRow, n, SpreadsheetVersion.EXCEL97);
-        _sheet.updateFormulasAfterCellShift(shifter, externSheetIndex);
-
-        int nSheets = _workbook.getNumberOfSheets();
-        for (int i = 0; i < nSheets; i++) {
-            InternalSheet otherSheet = _workbook.getSheetAt(i).getSheet();
-            if (otherSheet == this._sheet) {
-                continue;
-            }
-            short otherExtSheetIx = _book.checkExternSheet(i);
-            otherSheet.updateFormulasAfterCellShift(shifter, otherExtSheetIx);
-        }
-        _workbook.getWorkbook().updateNamesAfterCellShift(shifter);
-    }
-
-    protected void insertChartRecords(List<Record> records) {
-        int window2Loc = _sheet.findFirstRecordLocBySid(WindowTwoRecord.sid);
-        _sheet.getRecords().addAll(window2Loc, records);
-    }
-
-    private void notifyRowShifting(HSSFRow row) {
-        String msg = "Row[rownum=" + row.getRowNum() + "] contains cell(s) included in a multi-cell array formula. " +
-                "You cannot change part of an array.";
-        for (Cell cell : row) {
-            HSSFCell hcell = (HSSFCell) cell;
-            if (hcell.isPartOfArrayFormulaGroup()) {
-                hcell.notifyArrayFormulaChanging(msg);
-            }
-        }
-    }
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.<p>
-     * 
-     * If both colSplit and rowSplit are zero then the existing freeze pane is removed
-     *
-     * @param colSplit       Horizonatal position of split.
-     * @param rowSplit       Vertical position of split.
-     * @param leftmostColumn Left column visible in right pane.
-     * @param topRow         Top row visible in bottom pane
-     */
-    @Override
-    public void createFreezePane(int colSplit, int rowSplit, int leftmostColumn, int topRow) {
-        validateColumn(colSplit);
-        validateRow(rowSplit);
-        if (leftmostColumn < colSplit)
-            throw new IllegalArgumentException("leftmostColumn parameter must not be less than colSplit parameter");
-        if (topRow < rowSplit)
-            throw new IllegalArgumentException("topRow parameter must not be less than leftmostColumn parameter");
-        getSheet().createFreezePane(colSplit, rowSplit, topRow, leftmostColumn);
-    }
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.<p>
-     * 
-     * If both colSplit and rowSplit are zero then the existing freeze pane is removed
-     *
-     * @param colSplit Horizonatal position of split.
-     * @param rowSplit Vertical position of split.
-     */
-    @Override
-    public void createFreezePane(int colSplit, int rowSplit) {
-        createFreezePane(colSplit, rowSplit, colSplit, rowSplit);
-    }
-
-    /**
-     * Creates a split pane. Any existing freezepane or split pane is overwritten.
-     *
-     * @param xSplitPos      Horizonatal position of split (in 1/20th of a point).
-     * @param ySplitPos      Vertical position of split (in 1/20th of a point).
-     * @param topRow         Top row visible in bottom pane
-     * @param leftmostColumn Left column visible in right pane.
-     * @param activePane     Active pane.  One of: PANE_LOWER_RIGHT,
-     *                       PANE_UPPER_RIGHT, PANE_LOWER_LEFT, PANE_UPPER_LEFT
-     * @see #PANE_LOWER_LEFT
-     * @see #PANE_LOWER_RIGHT
-     * @see #PANE_UPPER_LEFT
-     * @see #PANE_UPPER_RIGHT
-     */
-    @Override
-    public void createSplitPane(int xSplitPos, int ySplitPos, int leftmostColumn, int topRow, int activePane) {
-        getSheet().createSplitPane(xSplitPos, ySplitPos, topRow, leftmostColumn, activePane);
-    }
-
-    /**
-     * Returns the information regarding the currently configured pane (split or freeze).
-     *
-     * @return null if no pane configured, or the pane information.
-     */
-    @Override
-    public PaneInformation getPaneInformation() {
-        return getSheet().getPaneInformation();
-    }
-
-    /**
-     * Sets whether the gridlines are shown in a viewer.
-     *
-     * @param show whether to show gridlines or not
-     */
-    @Override
-    public void setDisplayGridlines(boolean show) {
-        _sheet.setDisplayGridlines(show);
-    }
-
-    /**
-     * Returns if gridlines are displayed.
-     *
-     * @return whether gridlines are displayed
-     */
-    @Override
-    public boolean isDisplayGridlines() {
-        return _sheet.isDisplayGridlines();
-    }
-
-    /**
-     * Sets whether the formulas are shown in a viewer.
-     *
-     * @param show whether to show formulas or not
-     */
-    @Override
-    public void setDisplayFormulas(boolean show) {
-        _sheet.setDisplayFormulas(show);
-    }
-
-    /**
-     * Returns if formulas are displayed.
-     *
-     * @return whether formulas are displayed
-     */
-    @Override
-    public boolean isDisplayFormulas() {
-        return _sheet.isDisplayFormulas();
-    }
-
-    /**
-     * Sets whether the RowColHeadings are shown in a viewer.
-     *
-     * @param show whether to show RowColHeadings or not
-     */
-    @Override
-    public void setDisplayRowColHeadings(boolean show) {
-        _sheet.setDisplayRowColHeadings(show);
-    }
-
-    /**
-     * Returns if RowColHeadings are displayed.
-     *
-     * @return whether RowColHeadings are displayed
-     */
-    @Override
-    public boolean isDisplayRowColHeadings() {
-        return _sheet.isDisplayRowColHeadings();
-    }
-
-    /**
-     * Sets a page break at the indicated row
-     * Breaks occur above the specified row and left of the specified column inclusive.<p>
-     * 
-     * For example, <code>sheet.setColumnBreak(2);</code> breaks the sheet into two parts
-     * with columns A,B,C in the first and D,E,... in the second. Simuilar, <code>sheet.setRowBreak(2);</code>
-     * breaks the sheet into two parts with first three rows (rownum=1...3) in the first part
-     * and rows starting with rownum=4 in the second.
-     *
-     * @param row the row to break, inclusive
-     */
-    @Override
-    public void setRowBreak(int row) {
-        validateRow(row);
-        _sheet.getPageSettings().setRowBreak(row, (short) 0, (short) 255);
-    }
-
-    /**
-     * @return <code>true</code> if there is a page break at the indicated row
-     */
-    @Override
-    public boolean isRowBroken(int row) {
-        return _sheet.getPageSettings().isRowBroken(row);
-    }
-
-    /**
-     * Removes the page break at the indicated row
-     */
-    @Override
-    public void removeRowBreak(int row) {
-        _sheet.getPageSettings().removeRowBreak(row);
-    }
-
-    /**
-     * @return row indexes of all the horizontal page breaks, never <code>null</code>
-     */
-    @Override
-    public int[] getRowBreaks() {
-        //we can probably cache this information, but this should be a sparsely used function
-        return _sheet.getPageSettings().getRowBreaks();
-    }
-
-    /**
-     * @return column indexes of all the vertical page breaks, never <code>null</code>
-     */
-    @Override
-    public int[] getColumnBreaks() {
-        //we can probably cache this information, but this should be a sparsely used function
-        return _sheet.getPageSettings().getColumnBreaks();
-    }
-
-
-    /**
-     * Sets a page break at the indicated column.
-     * Breaks occur above the specified row and left of the specified column inclusive.<p>
-     * 
-     * For example, <code>sheet.setColumnBreak(2);</code> breaks the sheet into two parts
-     * with columns A,B,C in the first and D,E,... in the second. Simuilar, {@code sheet.setRowBreak(2);}
-     * breaks the sheet into two parts with first three rows (rownum=1...3) in the first part
-     * and rows starting with rownum=4 in the second.
-     *
-     * @param column the column to break, inclusive
-     */
-    @Override
-    public void setColumnBreak(int column) {
-        validateColumn((short) column);
-        _sheet.getPageSettings().setColumnBreak((short) column, (short) 0, (short) SpreadsheetVersion.EXCEL97.getLastRowIndex());
-    }
-
-    /**
-     * Determines if there is a page break at the indicated column
-     *
-     * @param column FIXME: Document this!
-     * @return FIXME: Document this!
-     */
-    @Override
-    public boolean isColumnBroken(int column) {
-        return _sheet.getPageSettings().isColumnBroken(column);
-    }
-
-    /**
-     * Removes a page break at the indicated column
-     *
-     * @param column The index of the column for which to remove a page-break, zero-based
-     */
-    @Override
-    public void removeColumnBreak(int column) {
-        _sheet.getPageSettings().removeColumnBreak(column);
-    }
-
-    /**
-     * Runs a bounds check for row numbers
-     *
-     * @param row the index of the row to validate, zero-based
-     */
-    protected void validateRow(int row) {
-        int maxrow = SpreadsheetVersion.EXCEL97.getLastRowIndex();
-        if (row > maxrow) throw new IllegalArgumentException("Maximum row number is " + maxrow);
-        if (row < 0) throw new IllegalArgumentException("Minumum row number is 0");
-    }
-
-    /**
-     * Runs a bounds check for column numbers
-     *
-     * @param column the index of the column to validate, zero-based
-     */
-    protected void validateColumn(int column) {
-        int maxcol = SpreadsheetVersion.EXCEL97.getLastColumnIndex();
-        if (column > maxcol) throw new IllegalArgumentException("Maximum column number is " + maxcol);
-        if (column < 0) throw new IllegalArgumentException("Minimum column number is 0");
-    }
-
-    /**
-     * Aggregates the drawing records and dumps the escher record hierarchy
-     * to the standard output.
-     */
-    public void dumpDrawingRecords(boolean fat, PrintWriter pw) {
-        _sheet.aggregateDrawingRecords(_book.getDrawingManager(), false);
-
-        EscherAggregate r = (EscherAggregate) getSheet().findFirstRecordBySid(EscherAggregate.sid);
-        List<EscherRecord> escherRecords = r.getEscherRecords();
-        for (EscherRecord escherRecord : escherRecords) {
-            if (fat) {
-                pw.println(escherRecord.toString());
-            } else {
-                escherRecord.display(pw, 0);
-            }
-        }
-        pw.flush();
-    }
-
-    /**
-     * Returns the agregate escher records for this sheet,
-     * it there is one.
-     */
-    public EscherAggregate getDrawingEscherAggregate() {
-        _book.findDrawingGroup();
-
-        // If there's now no drawing manager, then there's
-        //  no drawing escher records on the workbook
-        if (_book.getDrawingManager() == null) {
-            return null;
-        }
-
-        int found = _sheet.aggregateDrawingRecords(
-                _book.getDrawingManager(), false
-        );
-        if (found == -1) {
-            // Workbook has drawing stuff, but this sheet doesn't
-            return null;
-        }
-
-        // Grab our aggregate record, and wire it up
-        return (EscherAggregate) _sheet.findFirstRecordBySid(EscherAggregate.sid);
-    }
-
-    /**
-     * This will hold any graphics or charts for the sheet.
-     *
-     * @return the top-level drawing patriarch, if there is one, else returns null
-     */
-    @Override
-    public HSSFPatriarch getDrawingPatriarch() {
-        _patriarch = getPatriarch(false);
-        return _patriarch;
-    }
-
-    /**
-     * Creates the top-level drawing patriarch. 
-     * <p>This may then be used to add graphics or charts.</p>
-     * <p>Note that this will normally have the effect of removing 
-     *  any existing drawings on this sheet.</p>
-     *
-     * @return The new patriarch.
-     */
-    @Override
-    public HSSFPatriarch createDrawingPatriarch() {
-        _patriarch = getPatriarch(true);
-        return _patriarch;
-    }
-
-    private HSSFPatriarch getPatriarch(boolean createIfMissing) {
-        if (_patriarch != null) {
-            return _patriarch;
-        }
-        DrawingManager2 dm = _book.findDrawingGroup();
-        if (null == dm) {
-            if (!createIfMissing) {
-                return null;
-            } else {
-                _book.createDrawingGroup();
-                dm = _book.getDrawingManager();
-            }
-        }
-        EscherAggregate agg = (EscherAggregate) _sheet.findFirstRecordBySid(EscherAggregate.sid);
-        if (null == agg) {
-            int pos = _sheet.aggregateDrawingRecords(dm, false);
-            if (-1 == pos) {
-                if (createIfMissing) {
-                    pos = _sheet.aggregateDrawingRecords(dm, true);
-                    agg = (EscherAggregate) _sheet.getRecords().get(pos);
-                    HSSFPatriarch patriarch = new HSSFPatriarch(this, agg);
-                    patriarch.afterCreate();
-                    return patriarch;
-                } else {
-                    return null;
-                }
-            }
-            agg = (EscherAggregate) _sheet.getRecords().get(pos);
-        }
-        return new HSSFPatriarch(this, agg);
-    }
-
-    /**
-     * Expands or collapses a column group.
-     *
-     * @param columnNumber One of the columns in the group.
-     * @param collapsed    true = collapse group, false = expand group.
-     */
-    @Override
-    public void setColumnGroupCollapsed(int columnNumber, boolean collapsed) {
-        _sheet.setColumnGroupCollapsed(columnNumber, collapsed);
-    }
-
-    /**
-     * Create an outline for the provided column range.
-     *
-     * @param fromColumn beginning of the column range.
-     * @param toColumn   end of the column range.
-     */
-    @Override
-    public void groupColumn(int fromColumn, int toColumn) {
-        _sheet.groupColumnRange(fromColumn, toColumn, true);
-    }
-
-    @Override
-    public void ungroupColumn(int fromColumn, int toColumn) {
-        _sheet.groupColumnRange(fromColumn, toColumn, false);
-    }
-
-    /**
-     * Tie a range of cell together so that they can be collapsed or expanded
-     *
-     * @param fromRow start row (0-based)
-     * @param toRow   end row (0-based)
-     */
-    @Override
-    public void groupRow(int fromRow, int toRow) {
-        _sheet.groupRowRange(fromRow, toRow, true);
-    }
-
-    @Override
-    public void ungroupRow(int fromRow, int toRow) {
-        _sheet.groupRowRange(fromRow, toRow, false);
-    }
-
-    @Override
-    public void setRowGroupCollapsed(int rowIndex, boolean collapse) {
-        if (collapse) {
-            _sheet.getRowsAggregate().collapseRow(rowIndex);
-        } else {
-            _sheet.getRowsAggregate().expandRow(rowIndex);
-        }
-    }
-
-    /**
-     * Sets the default column style for a given column.  POI will only apply this style to new cells added to the sheet.
-     *
-     * @param column the column index
-     * @param style  the style to set
-     */
-    @Override
-    public void setDefaultColumnStyle(int column, CellStyle style) {
-        _sheet.setDefaultColumnStyle(column, ((HSSFCellStyle) style).getIndex());
-    }
-
-    /**
-     * Adjusts the column width to fit the contents.<p>
-     * 
-     * This process can be relatively slow on large sheets, so this should
-     * normally only be called once per column, at the end of your
-     * processing.
-     *
-     * @param column the column index
-     */
-    @Override
-    public void autoSizeColumn(int column) {
-        autoSizeColumn(column, false);
-    }
-
-    /**
-     * Adjusts the column width to fit the contents.<p>
-     * 
-     * This process can be relatively slow on large sheets, so this should
-     * normally only be called once per column, at the end of your
-     * processing.<p>
-     * 
-     * You can specify whether the content of merged cells should be considered or ignored.
-     * Default is to ignore merged cells.
-     *
-     * @param column         the column index
-     * @param useMergedCells whether to use the contents of merged cells when calculating the width of the column
-     */
-    @Override
-    public void autoSizeColumn(int column, boolean useMergedCells) {
-        double width = SheetUtil.getColumnWidth(this, column, useMergedCells);
-
-        if (width != -1) {
-            width *= 256;
-            int maxColumnWidth = 255 * 256; // The maximum column width for an individual cell is 255 characters
-            if (width > maxColumnWidth) {
-                width = maxColumnWidth;
-            }
-            setColumnWidth(column, (int) (width));
-        }
-
-    }
-
-    /**
-     * Returns cell comment for the specified row and column
-     *
-     * @return cell comment or <code>null</code> if not found
-     * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead.
-     */
-    @Override
-    public HSSFComment getCellComment(int row, int column) {
-        return findCellComment(row, column);
-    }
-    
-    /**
-     * Returns cell comment for the specified row and column
-     *
-     * @return cell comment or <code>null</code> if not found
-     */
-    @Override
-    public HSSFComment getCellComment(CellAddress ref) {
-        return findCellComment(ref.getRow(), ref.getColumn());
-    }
-    
-    /**
-     * Get a Hyperlink in this sheet anchored at row, column
-     *
-     * @param row The index of the row of the hyperlink, zero-based
-     * @param column the index of the column of the hyperlink, zero-based
-     * @return hyperlink if there is a hyperlink anchored at row, column; otherwise returns null
-     */
-    @Override
-    public HSSFHyperlink getHyperlink(int row, int column) {
-        for (RecordBase rec : _sheet.getRecords()) {
-            if (rec instanceof HyperlinkRecord) {
-                HyperlinkRecord link = (HyperlinkRecord) rec;
-                if (link.getFirstColumn() == column && link.getFirstRow() == row) {
-                    return new HSSFHyperlink(link);
-                }
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Get a Hyperlink in this sheet located in a cell specified by {code addr}
-     *
-     * @param addr The address of the cell containing the hyperlink
-     * @return hyperlink if there is a hyperlink anchored at {@code addr}; otherwise returns {@code null}
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public HSSFHyperlink getHyperlink(CellAddress addr) {
-        return getHyperlink(addr.getRow(), addr.getColumn());
-    }
-    
-    /**
-     * Get a list of Hyperlinks in this sheet
-     *
-     * @return Hyperlinks for the sheet
-     */
-    @Override
-    public List<HSSFHyperlink> getHyperlinkList() {
-        final List<HSSFHyperlink> hyperlinkList = new ArrayList<HSSFHyperlink>();
-        for (RecordBase rec : _sheet.getRecords()) {
-            if (rec instanceof HyperlinkRecord) {
-                HyperlinkRecord link = (HyperlinkRecord) rec;
-                hyperlinkList.add(new HSSFHyperlink(link));
-            }
-        }
-        return hyperlinkList;
-    }
-    
-    /**
-     * Remove the underlying HyperlinkRecord from this sheet.
-     * If multiple HSSFHyperlinks refer to the same HyperlinkRecord, all HSSFHyperlinks will be removed.
-     *
-     * @param link the HSSFHyperlink wrapper around the HyperlinkRecord to remove
-     */
-    protected void removeHyperlink(HSSFHyperlink link) {
-        removeHyperlink(link.record);
-    }
-    
-    /**
-     * Remove the underlying HyperlinkRecord from this sheet
-     *
-     * @param link the underlying HyperlinkRecord to remove from this sheet
-     */
-    protected void removeHyperlink(HyperlinkRecord link) {
-        for (Iterator<RecordBase> it = _sheet.getRecords().iterator(); it.hasNext();) {
-            RecordBase rec = it.next();
-            if (rec instanceof HyperlinkRecord) {
-                HyperlinkRecord recLink = (HyperlinkRecord) rec;
-                if (link == recLink) {
-                    it.remove();
-                    // if multiple HSSFHyperlinks refer to the same record
-                    return;
-                }
-            }
-        }
-    }
-
-    @Override
-    public HSSFSheetConditionalFormatting getSheetConditionalFormatting() {
-        return new HSSFSheetConditionalFormatting(this);
-    }
-
-    /**
-     * Returns the name of this sheet
-     *
-     * @return the name of this sheet
-     */
-    @SuppressWarnings("resource")
-    @Override
-    public String getSheetName() {
-        HSSFWorkbook wb = getWorkbook();
-        int idx = wb.getSheetIndex(this);
-        return wb.getSheetName(idx);
-    }
-
-    /**
-     * Also creates cells if they don't exist
-     */
-    private CellRange<HSSFCell> getCellRange(CellRangeAddress range) {
-        int firstRow = range.getFirstRow();
-        int firstColumn = range.getFirstColumn();
-        int lastRow = range.getLastRow();
-        int lastColumn = range.getLastColumn();
-        int height = lastRow - firstRow + 1;
-        int width = lastColumn - firstColumn + 1;
-        List<HSSFCell> temp = new ArrayList<HSSFCell>(height * width);
-        for (int rowIn = firstRow; rowIn <= lastRow; rowIn++) {
-            for (int colIn = firstColumn; colIn <= lastColumn; colIn++) {
-                HSSFRow row = getRow(rowIn);
-                if (row == null) {
-                    row = createRow(rowIn);
-                }
-                HSSFCell cell = row.getCell(colIn);
-                if (cell == null) {
-                    cell = row.createCell(colIn);
-                }
-                temp.add(cell);
-            }
-        }
-        return SSCellRange.create(firstRow, firstColumn, height, width, temp, HSSFCell.class);
-    }
-
-    @Override
-    public CellRange<HSSFCell> setArrayFormula(String formula, CellRangeAddress range) {
-        // make sure the formula parses OK first
-        int sheetIndex = _workbook.getSheetIndex(this);
-        Ptg[] ptgs = HSSFFormulaParser.parse(formula, _workbook, FormulaType.ARRAY, sheetIndex);
-        CellRange<HSSFCell> cells = getCellRange(range);
-
-        for (HSSFCell c : cells) {
-            c.setCellArrayFormula(range);
-        }
-        HSSFCell mainArrayFormulaCell = cells.getTopLeftCell();
-        FormulaRecordAggregate agg = (FormulaRecordAggregate) mainArrayFormulaCell.getCellValueRecord();
-        agg.setArrayFormula(range, ptgs);
-        return cells;
-    }
-
-    @Override
-    public CellRange<HSSFCell> removeArrayFormula(Cell cell) {
-        if (cell.getSheet() != this) {
-            throw new IllegalArgumentException("Specified cell does not belong to this sheet.");
-        }
-        CellValueRecordInterface rec = ((HSSFCell) cell).getCellValueRecord();
-        if (!(rec instanceof FormulaRecordAggregate)) {
-            String ref = new CellReference(cell).formatAsString();
-            throw new IllegalArgumentException("Cell " + ref + " is not part of an array formula.");
-        }
-        FormulaRecordAggregate fra = (FormulaRecordAggregate) rec;
-        CellRangeAddress range = fra.removeArrayFormula(cell.getRowIndex(), cell.getColumnIndex());
-
-        CellRange<HSSFCell> result = getCellRange(range);
-        // clear all cells in the range
-        for (Cell c : result) {
-            c.setCellType(CellType.BLANK);
-        }
-        return result;
-    }
-
-    @Override
-    public DataValidationHelper getDataValidationHelper() {
-        return new HSSFDataValidationHelper(this);
-    }
-
-    @Override
-    public HSSFAutoFilter setAutoFilter(CellRangeAddress range) {
-        InternalWorkbook workbook = _workbook.getWorkbook();
-        int sheetIndex = _workbook.getSheetIndex(this);
-
-        NameRecord name = workbook.getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, sheetIndex + 1);
-
-        if (name == null) {
-            name = workbook.createBuiltInName(NameRecord.BUILTIN_FILTER_DB, sheetIndex + 1);
-        }
-
-        int firstRow = range.getFirstRow();
-        
-        // if row was not given when constructing the range...
-        if(firstRow == -1) {
-            firstRow = 0;
-        }
-
-        // The built-in name must consist of a single Area3d Ptg.
-        Area3DPtg ptg = new Area3DPtg(firstRow, range.getLastRow(),
-                range.getFirstColumn(), range.getLastColumn(),
-                false, false, false, false, sheetIndex);
-        name.setNameDefinition(new Ptg[]{ptg});
-
-        AutoFilterInfoRecord r = new AutoFilterInfoRecord();
-        // the number of columns that have AutoFilter enabled.
-        int numcols = 1 + range.getLastColumn() - range.getFirstColumn();
-        r.setNumEntries((short) numcols);
-        int idx = _sheet.findFirstRecordLocBySid(DimensionsRecord.sid);
-        _sheet.getRecords().add(idx, r);
-
-        //create a combobox control for each column
-        HSSFPatriarch p = createDrawingPatriarch();
-        final int firstColumn = range.getFirstColumn();
-        final int lastColumn = range.getLastColumn();
-        for (int col = firstColumn; col <= lastColumn; col++) {
-            p.createComboBox(new HSSFClientAnchor(0, 0, 0, 0,
-                    (short) col, firstRow, (short) (col + 1), firstRow + 1));
-        }
-
-        return new HSSFAutoFilter(this);
-    }
-
-    protected HSSFComment findCellComment(int row, int column) {
-        HSSFPatriarch patriarch = getDrawingPatriarch();
-        if (null == patriarch) {
-            patriarch = createDrawingPatriarch();
-        }
-        return lookForComment(patriarch, row, column);
-    }
-
-    private HSSFComment lookForComment(HSSFShapeContainer container, int row, int column) {
-        for (Object object : container.getChildren()) {
-            HSSFShape shape = (HSSFShape) object;
-            if (shape instanceof HSSFShapeGroup) {
-                HSSFShape res = lookForComment((HSSFShapeContainer) shape, row, column);
-                if (null != res) {
-                    return (HSSFComment) res;
-                }
-                continue;
-            }
-            if (shape instanceof HSSFComment) {
-                HSSFComment comment = (HSSFComment) shape;
-                if (comment.hasPosition() && comment.getColumn() == column && comment.getRow() == row) {
-                    return comment;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns all cell comments on this sheet.
-     * @return A map of each Comment in the sheet, keyed on the cell address where
-     * the comment is located.
-     */
-    @Override
-    public Map<CellAddress, HSSFComment> getCellComments() {
-        HSSFPatriarch patriarch = getDrawingPatriarch();
-        if (null == patriarch) {
-            patriarch = createDrawingPatriarch();
-        }
-        
-        Map<CellAddress, HSSFComment> locations = new TreeMap<CellAddress, HSSFComment>();
-        findCellCommentLocations(patriarch, locations);
-        return locations;
-    }
-    /**
-     * Finds all cell comments in this sheet and adds them to the specified locations map
-     *
-     * @param container a container that may contain HSSFComments
-     * @param locations the map to store the HSSFComments in
-     */
-    private void findCellCommentLocations(HSSFShapeContainer container, Map<CellAddress, HSSFComment> locations) {
-        for (Object object : container.getChildren()) {
-            HSSFShape shape = (HSSFShape) object;
-            if (shape instanceof HSSFShapeGroup) {
-                findCellCommentLocations((HSSFShapeGroup) shape, locations);
-                continue;
-            }
-            if (shape instanceof HSSFComment) {
-                HSSFComment comment = (HSSFComment) shape;
-                if (comment.hasPosition()) {
-                    locations.put(new CellAddress(comment.getRow(), comment.getColumn()), comment);
-                }
-            }
-        }
-    }
-
-    @Override
-    public CellRangeAddress getRepeatingRows() {
-        return getRepeatingRowsOrColums(true);
-    }
-
-    @Override
-    public CellRangeAddress getRepeatingColumns() {
-        return getRepeatingRowsOrColums(false);
-    }
-
-    @Override
-    public void setRepeatingRows(CellRangeAddress rowRangeRef) {
-        CellRangeAddress columnRangeRef = getRepeatingColumns();
-        setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
-    }
-
-    @Override
-    public void setRepeatingColumns(CellRangeAddress columnRangeRef) {
-        CellRangeAddress rowRangeRef = getRepeatingRows();
-        setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
-    }
-
-
-    private void setRepeatingRowsAndColumns(
-            CellRangeAddress rowDef, CellRangeAddress colDef) {
-        int sheetIndex = _workbook.getSheetIndex(this);
-        int maxRowIndex = SpreadsheetVersion.EXCEL97.getLastRowIndex();
-        int maxColIndex = SpreadsheetVersion.EXCEL97.getLastColumnIndex();
-
-        int col1 = -1;
-        int col2 = -1;
-        int row1 = -1;
-        int row2 = -1;
-
-        if (rowDef != null) {
-            row1 = rowDef.getFirstRow();
-            row2 = rowDef.getLastRow();
-            if ((row1 == -1 && row2 != -1) || (row1 > row2)
-                    || (row1 < 0 || row1 > maxRowIndex)
-                    || (row2 < 0 || row2 > maxRowIndex)) {
-                throw new IllegalArgumentException("Invalid row range specification");
-            }
-        }
-        if (colDef != null) {
-            col1 = colDef.getFirstColumn();
-            col2 = colDef.getLastColumn();
-            if ((col1 == -1 && col2 != -1) || (col1 > col2)
-                    || (col1 < 0 || col1 > maxColIndex)
-                    || (col2 < 0 || col2 > maxColIndex)) {
-                throw new IllegalArgumentException("Invalid column range specification");
-            }
-        }
-
-        short externSheetIndex =
-                _workbook.getWorkbook().checkExternSheet(sheetIndex);
-
-        boolean setBoth = rowDef != null && colDef != null;
-        boolean removeAll = rowDef == null && colDef == null;
-
-        HSSFName name = _workbook.getBuiltInName(
-                NameRecord.BUILTIN_PRINT_TITLE, sheetIndex);
-        if (removeAll) {
-            if (name != null) {
-                _workbook.removeName(name);
-            }
-            return;
-        }
-        if (name == null) {
-            name = _workbook.createBuiltInName(
-                    NameRecord.BUILTIN_PRINT_TITLE, sheetIndex);
-        }
-
-        List<Ptg> ptgList = new ArrayList<Ptg>();
-        if (setBoth) {
-            final int exprsSize = 2 * 11 + 1; // 2 * Area3DPtg.SIZE + UnionPtg.SIZE
-            ptgList.add(new MemFuncPtg(exprsSize));
-        }
-        if (colDef != null) {
-            Area3DPtg colArea = new Area3DPtg(0, maxRowIndex, col1, col2,
-                    false, false, false, false, externSheetIndex);
-            ptgList.add(colArea);
-        }
-        if (rowDef != null) {
-            Area3DPtg rowArea = new Area3DPtg(row1, row2, 0, maxColIndex,
-                    false, false, false, false, externSheetIndex);
-            ptgList.add(rowArea);
-        }
-        if (setBoth) {
-            ptgList.add(UnionPtg.instance);
-        }
-
-        Ptg[] ptgs = new Ptg[ptgList.size()];
-        ptgList.toArray(ptgs);
-        name.setNameDefinition(ptgs);
-
-        HSSFPrintSetup printSetup = getPrintSetup();
-        printSetup.setValidSettings(false);
-        setActive(true);
-    }
-
-
-    private CellRangeAddress getRepeatingRowsOrColums(boolean rows) {
-        NameRecord rec = getBuiltinNameRecord(NameRecord.BUILTIN_PRINT_TITLE);
-        if (rec == null) {
-            return null;
-        }
-
-        Ptg[] nameDefinition = rec.getNameDefinition();
-        if (nameDefinition == null) {
-            return null;
-        }
-
-        int maxRowIndex = SpreadsheetVersion.EXCEL97.getLastRowIndex();
-        int maxColIndex = SpreadsheetVersion.EXCEL97.getLastColumnIndex();
-
-        for (Ptg ptg : nameDefinition) {
-
-            if (ptg instanceof Area3DPtg) {
-                Area3DPtg areaPtg = (Area3DPtg) ptg;
-
-                if (areaPtg.getFirstColumn() == 0
-                        && areaPtg.getLastColumn() == maxColIndex) {
-                    if (rows) {
-                        return new CellRangeAddress(
-                                areaPtg.getFirstRow(), areaPtg.getLastRow(), -1, -1);
-                    }
-                } else if (areaPtg.getFirstRow() == 0
-                        && areaPtg.getLastRow() == maxRowIndex) {
-                    if (!rows) {
-                        return new CellRangeAddress(-1, -1,
-                                areaPtg.getFirstColumn(), areaPtg.getLastColumn());
-                    }
-                }
-
-            }
-
-        }
-
-        return null;
-    }
-
-
-    private NameRecord getBuiltinNameRecord(byte builtinCode) {
-        int sheetIndex = _workbook.getSheetIndex(this);
-        int recIndex =
-                _workbook.findExistingBuiltinNameRecordIdx(sheetIndex, builtinCode);
-        if (recIndex == -1) {
-            return null;
-        }
-        return _workbook.getNameRecord(recIndex);
-    }
-    
-    /**
-     * Returns the column outline level. Increased as you
-     *  put it into more groups (outlines), reduced as
-     *  you take it out of them.
-     */
-    @Override
-    public int getColumnOutlineLevel(int columnIndex) {
-        return _sheet.getColumnOutlineLevel(columnIndex);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public CellAddress getActiveCell() {
-        int row = _sheet.getActiveCellRow();
-        int col = _sheet.getActiveCellCol();
-        return new CellAddress(row, col);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setActiveCell(CellAddress address) {
-        int row = address.getRow();
-        short col = (short) address.getColumn();
-        _sheet.setActiveCellRow(row);
-        _sheet.setActiveCellCol(col);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
deleted file mode 100644
index d3aba5b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.CFRuleRecord;
-import org.apache.poi.hssf.record.aggregates.CFRecordsAggregate;
-import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.ConditionalFormatting;
-import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
-import org.apache.poi.ss.usermodel.ExtendedColor;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * The 'Conditional Formatting' facet of <tt>HSSFSheet</tt>
- */
-public final class HSSFSheetConditionalFormatting implements SheetConditionalFormatting {
-    private final HSSFSheet _sheet;
-    private final ConditionalFormattingTable _conditionalFormattingTable;
-
-    /* package */ HSSFSheetConditionalFormatting(HSSFSheet sheet) {
-        _sheet = sheet;
-        _conditionalFormattingTable = sheet.getSheet().getConditionalFormattingTable();
-    }
-
-    /**
-     * A factory method allowing to create a conditional formatting rule
-     * with a cell comparison operator<p/>
-     * TODO - formulas containing cell references are currently not parsed properly
-     *
-     * @param comparisonOperation - a constant value from
-     *		 <tt>{@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator}</tt>: <p>
-     * <ul>
-     *		 <li>BETWEEN</li>
-     *		 <li>NOT_BETWEEN</li>
-     *		 <li>EQUAL</li>
-     *		 <li>NOT_EQUAL</li>
-     *		 <li>GT</li>
-     *		 <li>LT</li>
-     *		 <li>GE</li>
-     *		 <li>LE</li>
-     * </ul>
-     * </p>
-     * @param formula1 - formula for the valued, compared with the cell
-     * @param formula2 - second formula (only used with
-     * {@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator#BETWEEN}) and
-     * {@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator#NOT_BETWEEN} operations)
-     */
-    public HSSFConditionalFormattingRule createConditionalFormattingRule(
-            byte comparisonOperation,
-            String formula1,
-            String formula2) {
-        CFRuleRecord rr = CFRuleRecord.create(_sheet, comparisonOperation, formula1, formula2);
-        return new HSSFConditionalFormattingRule(_sheet, rr);
-    }
-
-    public HSSFConditionalFormattingRule createConditionalFormattingRule(
-            byte comparisonOperation,
-            String formula1) {
-        CFRuleRecord rr = CFRuleRecord.create(_sheet, comparisonOperation, formula1, null);
-        return new HSSFConditionalFormattingRule(_sheet, rr);
-    }
-
-    /**
-     * A factory method allowing to create a conditional formatting rule with a formula.<br>
-     *
-     * The formatting rules are applied by Excel when the value of the formula not equal to 0.<p/>
-     * TODO - formulas containing cell references are currently not parsed properly
-     * @param formula - formula for the valued, compared with the cell
-     */
-    public HSSFConditionalFormattingRule createConditionalFormattingRule(String formula) {
-        CFRuleRecord rr = CFRuleRecord.create(_sheet, formula);
-        return new HSSFConditionalFormattingRule(_sheet, rr);
-    }
-
-    /**
-     * A factory method allowing the creation of conditional formatting
-     *  rules using an Icon Set / Multi-State formatting.
-     * The thresholds for it will be created, but will be empty
-     *  and require configuring with 
-     *  {@link HSSFConditionalFormattingRule#getMultiStateFormatting()}
-     *  then
-     *  {@link HSSFIconMultiStateFormatting#getThresholds()}
-     */
-    public HSSFConditionalFormattingRule createConditionalFormattingRule(
-            IconSet iconSet) {
-        CFRule12Record rr = CFRule12Record.create(_sheet, iconSet);
-        return new HSSFConditionalFormattingRule(_sheet, rr);
-    }
-
-    /**
-     * Create a Databar conditional formatting rule.
-     * <p>The thresholds and colour for it will be created, but will be 
-     *  empty and require configuring with 
-     *  {@link HSSFConditionalFormattingRule#getDataBarFormatting()}
-     *  then
-     *  {@link HSSFDataBarFormatting#getMinThreshold()}
-     *  and 
-     *  {@link HSSFDataBarFormatting#getMaxThreshold()}
-     */
-    public HSSFConditionalFormattingRule createConditionalFormattingRule(HSSFExtendedColor color) {
-        CFRule12Record rr = CFRule12Record.create(_sheet, color.getExtendedColor());
-        return new HSSFConditionalFormattingRule(_sheet, rr);
-    }
-    public HSSFConditionalFormattingRule createConditionalFormattingRule(ExtendedColor color) {
-        return createConditionalFormattingRule((HSSFExtendedColor)color);
-    }
-
-    /**
-     * Create a Color Scale / Color Gradient conditional formatting rule.
-     * <p>The thresholds and colours for it will be created, but will be 
-     *  empty and require configuring with 
-     *  {@link HSSFConditionalFormattingRule#getColorScaleFormatting()}
-     *  then
-     *  {@link HSSFColorScaleFormatting#getThresholds()}
-     *  and
-     *  {@link HSSFColorScaleFormatting#getColors()}
-     */
-    public HSSFConditionalFormattingRule createConditionalFormattingColorScaleRule() {
-        CFRule12Record rr = CFRule12Record.createColorScale(_sheet);
-        return new HSSFConditionalFormattingRule(_sheet, rr);
-    }
-    
-    /**
-     * Adds a copy of HSSFConditionalFormatting object to the sheet
-     * <p>This method could be used to copy HSSFConditionalFormatting object
-     * from one sheet to another. For example:
-     * <pre>
-     * HSSFConditionalFormatting cf = sheet.getConditionalFormattingAt(index);
-     * newSheet.addConditionalFormatting(cf);
-     * </pre>
-     *
-     * @param cf HSSFConditionalFormatting object
-     * @return index of the new Conditional Formatting object
-     */
-    public int addConditionalFormatting( HSSFConditionalFormatting cf ) {
-        CFRecordsAggregate cfraClone = cf.getCFRecordsAggregate().cloneCFAggregate();
-
-        return _conditionalFormattingTable.add(cfraClone);
-    }
-
-    public int addConditionalFormatting( ConditionalFormatting cf ) {
-        return addConditionalFormatting((HSSFConditionalFormatting)cf);
-    }
-
-    /**
-     * Allows to add a new Conditional Formatting set to the sheet.
-     *
-     * @param regions - list of rectangular regions to apply conditional formatting rules
-     * @param cfRules - set of up to three conditional formatting rules
-     *
-     * @return index of the newly created Conditional Formatting object
-     */
-    public int addConditionalFormatting(CellRangeAddress[] regions, HSSFConditionalFormattingRule[] cfRules) {
-        if (regions == null) {
-            throw new IllegalArgumentException("regions must not be null");
-        }
-        for(CellRangeAddress range : regions) range.validate(SpreadsheetVersion.EXCEL97);
-
-        if (cfRules == null) {
-            throw new IllegalArgumentException("cfRules must not be null");
-        }
-        if (cfRules.length == 0) {
-            throw new IllegalArgumentException("cfRules must not be empty");
-        }
-        if (cfRules.length > 3) {
-            throw new IllegalArgumentException("Number of rules must not exceed 3");
-        }
-
-        CFRuleBase[] rules = new CFRuleBase[cfRules.length];
-        for (int i = 0; i != cfRules.length; i++) {
-            rules[i] = cfRules[i].getCfRuleRecord();
-        }
-        CFRecordsAggregate cfra = new CFRecordsAggregate(regions, rules);
-        return _conditionalFormattingTable.add(cfra);
-    }
-
-    public int addConditionalFormatting(CellRangeAddress[] regions, ConditionalFormattingRule[] cfRules) {
-        HSSFConditionalFormattingRule[] hfRules;
-        if(cfRules instanceof HSSFConditionalFormattingRule[]) hfRules = (HSSFConditionalFormattingRule[])cfRules;
-        else {
-            hfRules = new HSSFConditionalFormattingRule[cfRules.length];
-            System.arraycopy(cfRules, 0, hfRules, 0, hfRules.length);
-        }
-        return addConditionalFormatting(regions, hfRules);
-    }
-
-    public int addConditionalFormatting(CellRangeAddress[] regions,
-            HSSFConditionalFormattingRule rule1) {
-        return addConditionalFormatting(regions, rule1 == null ? 
-                    null : new HSSFConditionalFormattingRule[] { rule1 }
-        );
-    }
-
-    public int addConditionalFormatting(CellRangeAddress[] regions,
-            ConditionalFormattingRule rule1) {
-        return addConditionalFormatting(regions,  (HSSFConditionalFormattingRule)rule1);
-    }
-
-    public int addConditionalFormatting(CellRangeAddress[] regions,
-            HSSFConditionalFormattingRule rule1,
-            HSSFConditionalFormattingRule rule2) {
-        return addConditionalFormatting(regions,
-                new HSSFConditionalFormattingRule[] { rule1, rule2 });
-    }
-
-    public int addConditionalFormatting(CellRangeAddress[] regions,
-            ConditionalFormattingRule rule1,
-            ConditionalFormattingRule rule2) {
-        return addConditionalFormatting(regions,
-                (HSSFConditionalFormattingRule)rule1,
-                (HSSFConditionalFormattingRule)rule2
-        );
-    }
-
-    /**
-     * gets Conditional Formatting object at a particular index
-     *
-     * @param index
-     *			of the Conditional Formatting object to fetch
-     * @return Conditional Formatting object
-     */
-    public HSSFConditionalFormatting getConditionalFormattingAt(int index) {
-        CFRecordsAggregate cf = _conditionalFormattingTable.get(index);
-        if (cf == null) {
-            return null;
-        }
-        return new HSSFConditionalFormatting(_sheet, cf);
-    }
-
-    /**
-     * @return number of Conditional Formatting objects of the sheet
-     */
-    public int getNumConditionalFormattings() {
-        return _conditionalFormattingTable.size();
-    }
-
-    /**
-     * removes a Conditional Formatting object by index
-     * @param index of a Conditional Formatting object to remove
-     */
-    public void removeConditionalFormatting(int index) {
-        _conditionalFormattingTable.remove(index);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
deleted file mode 100644
index ec5293b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.ss.usermodel.RichTextString;
-
-/**
- * Represents a simple shape such as a line, rectangle or oval.
- */
-public class HSSFSimpleShape extends HSSFShape
-{
-    // The commented out ones haven't been tested yet or aren't supported
-    // by HSSFSimpleShape.
-
-    public final static short       OBJECT_TYPE_LINE               = HSSFShapeTypes.Line;
-    public final static short       OBJECT_TYPE_RECTANGLE          = HSSFShapeTypes.Rectangle;
-    public final static short       OBJECT_TYPE_OVAL               = HSSFShapeTypes.Ellipse;
-    public final static short       OBJECT_TYPE_ARC                = HSSFShapeTypes.Arc;
-    //    public final static short       OBJECT_TYPE_CHART              = 5;
-//    public final static short       OBJECT_TYPE_TEXT               = 6;
-//    public final static short       OBJECT_TYPE_BUTTON             = 7;
-    public final static short       OBJECT_TYPE_PICTURE            = HSSFShapeTypes.PictureFrame;
-
-//    public final static short       OBJECT_TYPE_POLYGON            = 9;
-//    public final static short       OBJECT_TYPE_CHECKBOX           = 11;
-//    public final static short       OBJECT_TYPE_OPTION_BUTTON      = 12;
-//    public final static short       OBJECT_TYPE_EDIT_BOX           = 13;
-//    public final static short       OBJECT_TYPE_LABEL              = 14;
-//    public final static short       OBJECT_TYPE_DIALOG_BOX         = 15;
-//    public final static short       OBJECT_TYPE_SPINNER            = 16;
-//    public final static short       OBJECT_TYPE_SCROLL_BAR         = 17;
-//    public final static short       OBJECT_TYPE_LIST_BOX           = 18;
-//    public final static short       OBJECT_TYPE_GROUP_BOX          = 19;
-    public final static short       OBJECT_TYPE_COMBO_BOX          = HSSFShapeTypes.HostControl;
-    public final static short       OBJECT_TYPE_COMMENT            = HSSFShapeTypes.TextBox;
-    public final static short       OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 30;
-
-    public final static int WRAP_SQUARE = 0;
-    public final static int WRAP_BY_POINTS = 1;
-    public final static int WRAP_NONE = 2;
-
-    private TextObjectRecord _textObjectRecord;
-
-    public HSSFSimpleShape(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord textObjectRecord) {
-        super(spContainer, objRecord);
-        this._textObjectRecord = textObjectRecord;
-    }
-
-    public HSSFSimpleShape(EscherContainerRecord spContainer, ObjRecord objRecord) {
-        super(spContainer, objRecord);
-    }
-
-    public HSSFSimpleShape( HSSFShape parent, HSSFAnchor anchor)
-    {
-        super( parent, anchor );
-        _textObjectRecord = createTextObjRecord();
-    }
-
-    protected TextObjectRecord getTextObjectRecord() {
-        return _textObjectRecord;
-    }
-
-    protected TextObjectRecord createTextObjRecord(){
-        TextObjectRecord obj = new TextObjectRecord();
-        obj.setHorizontalTextAlignment(2);
-        obj.setVerticalTextAlignment(2);
-        obj.setTextLocked(true);
-        obj.setTextOrientation(TextObjectRecord.TEXT_ORIENTATION_NONE);
-        obj.setStr(new HSSFRichTextString(""));
-        return obj;
-    }
-
-    @Override
-    protected EscherContainerRecord createSpContainer() {
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        spContainer.setRecordId( EscherContainerRecord.SP_CONTAINER );
-        spContainer.setOptions( (short) 0x000F );
-
-        EscherSpRecord sp = new EscherSpRecord();
-        sp.setRecordId( EscherSpRecord.RECORD_ID );
-        sp.setFlags( EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HASSHAPETYPE );
-        sp.setVersion((short) 0x2);
-
-        EscherClientDataRecord clientData = new EscherClientDataRecord();
-        clientData.setRecordId( EscherClientDataRecord.RECORD_ID );
-        clientData.setOptions( (short) (0x0000) );
-
-        EscherOptRecord optRecord = new EscherOptRecord();
-        optRecord.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEDASHING, LINESTYLE_SOLID));
-        optRecord.setEscherProperty( new EscherBoolProperty( EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x00080008));
-//        optRecord.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEWIDTH, LINEWIDTH_DEFAULT));
-        optRecord.setEscherProperty(new EscherRGBProperty(EscherProperties.FILL__FILLCOLOR, FILL__FILLCOLOR_DEFAULT));
-        optRecord.setEscherProperty(new EscherRGBProperty(EscherProperties.LINESTYLE__COLOR, LINESTYLE__COLOR_DEFAULT));
-        optRecord.setEscherProperty(new EscherBoolProperty(EscherProperties.FILL__NOFILLHITTEST, NO_FILLHITTEST_FALSE));
-        optRecord.setEscherProperty( new EscherBoolProperty( EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x00080008));
-
-        optRecord.setEscherProperty( new EscherShapePathProperty( EscherProperties.GEOMETRY__SHAPEPATH, EscherShapePathProperty.COMPLEX ) );
-        optRecord.setEscherProperty(new EscherBoolProperty( EscherProperties.GROUPSHAPE__PRINT, 0x080000));
-        optRecord.setRecordId( EscherOptRecord.RECORD_ID );
-
-        EscherTextboxRecord escherTextbox = new EscherTextboxRecord();
-        escherTextbox.setRecordId(EscherTextboxRecord.RECORD_ID);
-        escherTextbox.setOptions((short) 0x0000);
-
-        spContainer.addChildRecord(sp);
-        spContainer.addChildRecord(optRecord);
-        spContainer.addChildRecord(getAnchor().getEscherAnchor());
-        spContainer.addChildRecord(clientData);
-        spContainer.addChildRecord(escherTextbox);
-        return spContainer;
-    }
-
-    @Override
-    protected ObjRecord createObjRecord() {
-        ObjRecord obj = new ObjRecord();
-        CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
-        c.setLocked(true);
-        c.setPrintable(true);
-        c.setAutofill(true);
-        c.setAutoline(true);
-        EndSubRecord e = new EndSubRecord();
-
-        obj.addSubRecord(c);
-        obj.addSubRecord(e);
-        return obj;
-    }
-
-    @Override
-    protected void afterRemove(HSSFPatriarch patriarch) {
-        patriarch.getBoundAggregate().removeShapeToObjRecord(getEscherContainer().getChildById(EscherClientDataRecord.RECORD_ID));
-        if (null != getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID)){
-            patriarch.getBoundAggregate().removeShapeToObjRecord(getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));
-        }
-    }
-
-    /**
-     * @return the rich text string for this textbox.
-     */
-    public HSSFRichTextString getString() {
-        return _textObjectRecord.getStr();
-    }
-
-    /**
-     * @param string Sets the rich text string used by this object.
-     */
-    public void setString(RichTextString string) {
-        //TODO add other shape types which can not contain text
-        if (getShapeType() == 0 || getShapeType() == OBJECT_TYPE_LINE){
-            throw new IllegalStateException("Cannot set text for shape type: "+getShapeType());
-        }
-        HSSFRichTextString rtr = (HSSFRichTextString) string;
-        // If font is not set we must set the default one
-        if (rtr.numFormattingRuns() == 0) rtr.applyFont((short) 0);
-        TextObjectRecord txo = getOrCreateTextObjRecord();
-        txo.setStr(rtr);
-        if (string.getString() != null){
-            setPropertyValue(new EscherSimpleProperty(EscherProperties.TEXT__TEXTID, string.getString().hashCode()));
-        }
-    }
-
-    @Override
-    void afterInsert(HSSFPatriarch patriarch){
-        EscherAggregate agg = patriarch.getBoundAggregate();
-        agg.associateShapeToObjRecord(getEscherContainer().getChildById(EscherClientDataRecord.RECORD_ID), getObjRecord());
-
-        if (null != getTextObjectRecord()){
-            agg.associateShapeToObjRecord(getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID), getTextObjectRecord());
-        }
-    }
-
-    @Override
-    protected HSSFShape cloneShape() {
-        TextObjectRecord txo = null;
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        byte [] inSp = getEscherContainer().serialize();
-        spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());
-        ObjRecord obj = (ObjRecord) getObjRecord().cloneViaReserialise();
-        if (getTextObjectRecord() != null && getString() != null && null != getString().getString()){
-            txo = (TextObjectRecord) getTextObjectRecord().cloneViaReserialise();
-        }
-        return new HSSFSimpleShape(spContainer, obj, txo);
-    }
-
-
-    /**
-     * Gets the shape type.
-     * @return  One of the OBJECT_TYPE_* constants.
-     *
-     * @see #OBJECT_TYPE_LINE
-     * @see #OBJECT_TYPE_OVAL
-     * @see #OBJECT_TYPE_RECTANGLE
-     * @see #OBJECT_TYPE_PICTURE
-     * @see #OBJECT_TYPE_COMMENT
-     */
-    public int getShapeType() {
-        EscherSpRecord spRecord = getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        return spRecord.getShapeType();
-    }
-
-    public int getWrapText(){
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.TEXT__WRAPTEXT);
-        return null == property ? WRAP_SQUARE : property.getPropertyValue();
-    }
-
-    public void setWrapText(int value){
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.TEXT__WRAPTEXT, false, false, value));
-    }
-
-    /**
-     * @see HSSFShapeTypes
-     * @param value - shapeType
-     */
-    public void setShapeType(int value){
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0);
-        cod.setObjectType(OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING);
-        EscherSpRecord spRecord = getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-        spRecord.setShapeType((short) value);
-    }
-    
-    private TextObjectRecord getOrCreateTextObjRecord(){
-        if (getTextObjectRecord() == null){
-            _textObjectRecord = createTextObjRecord();
-        }
-        EscherTextboxRecord escherTextbox = getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID);
-        if (null == escherTextbox){
-            escherTextbox = new EscherTextboxRecord();
-            escherTextbox.setRecordId(EscherTextboxRecord.RECORD_ID);
-            escherTextbox.setOptions((short) 0x0000);
-            getEscherContainer().addChildRecord(escherTextbox);
-            getPatriarch().getBoundAggregate().associateShapeToObjRecord(escherTextbox, _textObjectRecord);
-        }
-        return _textObjectRecord;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
deleted file mode 100644
index d1e8b9f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.record.*;
-
-/**
- * A textbox is a shape that may hold a rich text string.
- */
-public class HSSFTextbox extends HSSFSimpleShape {
-    public final static short OBJECT_TYPE_TEXT = 6;
-
-    /**
-     * How to align text horizontally
-     */
-    public final static short HORIZONTAL_ALIGNMENT_LEFT = 1;
-    public final static short HORIZONTAL_ALIGNMENT_CENTERED = 2;
-    public final static short HORIZONTAL_ALIGNMENT_RIGHT = 3;
-    public final static short HORIZONTAL_ALIGNMENT_JUSTIFIED = 4;
-    public final static short HORIZONTAL_ALIGNMENT_DISTRIBUTED = 7;
-
-    /**
-     * How to align text vertically
-     */
-    public final static short VERTICAL_ALIGNMENT_TOP = 1;
-    public final static short VERTICAL_ALIGNMENT_CENTER = 2;
-    public final static short VERTICAL_ALIGNMENT_BOTTOM = 3;
-    public final static short VERTICAL_ALIGNMENT_JUSTIFY = 4;
-    public final static short VERTICAL_ALIGNMENT_DISTRIBUTED = 7;
-
-    public HSSFTextbox(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord textObjectRecord) {
-        super(spContainer, objRecord, textObjectRecord);
-    }
-
-    // Findbugs: URF_UNREAD_FIELD. Do not delete without understanding how this class works.
-    //HSSFRichTextString string = new HSSFRichTextString("");
-
-    /**
-     * Construct a new textbox with the given parent and anchor.
-     *
-     * @param parent
-     * @param anchor One of HSSFClientAnchor or HSSFChildAnchor
-     */
-    public HSSFTextbox(HSSFShape parent, HSSFAnchor anchor) {
-        super(parent, anchor);
-        setHorizontalAlignment(HORIZONTAL_ALIGNMENT_LEFT);
-        setVerticalAlignment(VERTICAL_ALIGNMENT_TOP);
-        setString(new HSSFRichTextString(""));
-    }
-
-    @Override
-    protected ObjRecord createObjRecord() {
-        ObjRecord obj = new ObjRecord();
-        CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
-        c.setObjectType(HSSFTextbox.OBJECT_TYPE_TEXT);
-        c.setLocked(true);
-        c.setPrintable(true);
-        c.setAutofill(true);
-        c.setAutoline(true);
-        EndSubRecord e = new EndSubRecord();
-        obj.addSubRecord(c);
-        obj.addSubRecord(e);
-        return obj;
-    }
-
-    @Override
-    protected EscherContainerRecord createSpContainer() {
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        EscherSpRecord sp = new EscherSpRecord();
-        EscherOptRecord opt = new EscherOptRecord();
-        EscherClientDataRecord clientData = new EscherClientDataRecord();
-        EscherTextboxRecord escherTextbox = new EscherTextboxRecord();
-
-        spContainer.setRecordId(EscherContainerRecord.SP_CONTAINER);
-        spContainer.setOptions((short) 0x000F);
-        sp.setRecordId(EscherSpRecord.RECORD_ID);
-        sp.setOptions((short) ((EscherAggregate.ST_TEXTBOX << 4) | 0x2));
-
-        sp.setFlags(EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HASSHAPETYPE);
-        opt.setRecordId(EscherOptRecord.RECORD_ID);
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.TEXT__TEXTID, 0));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.TEXT__WRAPTEXT, 0));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.TEXT__ANCHORTEXT, 0));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__PRINT, 0x00080000));
-
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.TEXT__TEXTLEFT, 0));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.TEXT__TEXTRIGHT, 0));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.TEXT__TEXTTOP, 0));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.TEXT__TEXTBOTTOM, 0));
-
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEDASHING, LINESTYLE_SOLID));
-        opt.setEscherProperty(new EscherBoolProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x00080008));
-        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.LINESTYLE__LINEWIDTH, LINEWIDTH_DEFAULT));
-        opt.setEscherProperty(new EscherRGBProperty(EscherProperties.FILL__FILLCOLOR, FILL__FILLCOLOR_DEFAULT));
-        opt.setEscherProperty(new EscherRGBProperty(EscherProperties.LINESTYLE__COLOR, LINESTYLE__COLOR_DEFAULT));
-        opt.setEscherProperty(new EscherBoolProperty(EscherProperties.FILL__NOFILLHITTEST, NO_FILLHITTEST_FALSE));
-        opt.setEscherProperty(new EscherBoolProperty(EscherProperties.GROUPSHAPE__PRINT, 0x080000));
-
-        EscherRecord anchor = getAnchor().getEscherAnchor();
-        clientData.setRecordId(EscherClientDataRecord.RECORD_ID);
-        clientData.setOptions((short) 0x0000);
-        escherTextbox.setRecordId(EscherTextboxRecord.RECORD_ID);
-        escherTextbox.setOptions((short) 0x0000);
-
-        spContainer.addChildRecord(sp);
-        spContainer.addChildRecord(opt);
-        spContainer.addChildRecord(anchor);
-        spContainer.addChildRecord(clientData);
-        spContainer.addChildRecord(escherTextbox);
-
-        return spContainer;
-    }
-
-    @Override
-    void afterInsert(HSSFPatriarch patriarch) {
-        EscherAggregate agg = patriarch.getBoundAggregate();
-        agg.associateShapeToObjRecord(getEscherContainer().getChildById(EscherClientDataRecord.RECORD_ID), getObjRecord());
-        if (getTextObjectRecord() != null){
-            agg.associateShapeToObjRecord(getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID), getTextObjectRecord());
-        }
-    }
-
-    /**
-     * @return Returns the left margin within the textbox.
-     */
-    public int getMarginLeft() {
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.TEXT__TEXTLEFT);
-        return property == null ? 0 : property.getPropertyValue();
-    }
-
-    /**
-     * Sets the left margin within the textbox.
-     */
-    public void setMarginLeft(int marginLeft) {
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.TEXT__TEXTLEFT, marginLeft));
-    }
-
-    /**
-     * @return returns the right margin within the textbox.
-     */
-    public int getMarginRight() {
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.TEXT__TEXTRIGHT);
-        return property == null ? 0 : property.getPropertyValue();
-    }
-
-    /**
-     * Sets the right margin within the textbox.
-     */
-    public void setMarginRight(int marginRight) {
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.TEXT__TEXTRIGHT, marginRight));
-    }
-
-    /**
-     * @return returns the top margin within the textbox.
-     */
-    public int getMarginTop() {
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.TEXT__TEXTTOP);
-        return property == null ? 0 : property.getPropertyValue();
-    }
-
-    /**
-     * Sets the top margin within the textbox.
-     */
-    public void setMarginTop(int marginTop) {
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.TEXT__TEXTTOP, marginTop));
-    }
-
-    /**
-     * Gets the bottom margin within the textbox.
-     */
-    public int getMarginBottom() {
-        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.TEXT__TEXTBOTTOM);
-        return property == null ? 0 : property.getPropertyValue();
-    }
-
-    /**
-     * Sets the bottom margin within the textbox.
-     */
-    public void setMarginBottom(int marginBottom) {
-        setPropertyValue(new EscherSimpleProperty(EscherProperties.TEXT__TEXTBOTTOM, marginBottom));
-    }
-
-    /**
-     * Gets the horizontal alignment.
-     */
-    public short getHorizontalAlignment() {
-        return (short) getTextObjectRecord().getHorizontalTextAlignment();
-    }
-
-    /**
-     * Sets the horizontal alignment.
-     */
-    public void setHorizontalAlignment(short align) {
-        getTextObjectRecord().setHorizontalTextAlignment(align);
-    }
-
-    /**
-     * Gets the vertical alignment.
-     */
-    public short getVerticalAlignment() {
-        return (short) getTextObjectRecord().getVerticalTextAlignment();
-    }
-
-    /**
-     * Sets the vertical alignment.
-     */
-    public void setVerticalAlignment(short align) {
-        getTextObjectRecord().setVerticalTextAlignment(align);
-    }
-
-    @Override
-    public void setShapeType(int shapeType) {
-        throw new IllegalStateException("Shape type can not be changed in " + this.getClass().getSimpleName());
-    }
-
-    @Override
-    protected HSSFShape cloneShape() {
-        TextObjectRecord txo = getTextObjectRecord() == null ? null : (TextObjectRecord) getTextObjectRecord().cloneViaReserialise();
-        EscherContainerRecord spContainer = new EscherContainerRecord();
-        byte[] inSp = getEscherContainer().serialize();
-        spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());
-        ObjRecord obj = (ObjRecord) getObjRecord().cloneViaReserialise();
-        return new HSSFTextbox(spContainer, obj, txo);
-    }
-
-    @Override
-    protected void afterRemove(HSSFPatriarch patriarch) {
-        patriarch.getBoundAggregate().removeShapeToObjRecord(getEscherContainer().getChildById(EscherClientDataRecord.RECORD_ID));
-        patriarch.getBoundAggregate().removeShapeToObjRecord(getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
deleted file mode 100644
index 89b36c0..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ /dev/null
@@ -1,2264 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.hssf.model.InternalWorkbook.OLD_WORKBOOK_DIR_ENTRY_NAME;
-import static org.apache.poi.hssf.model.InternalWorkbook.WORKBOOK_DIR_ENTRY_NAMES;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.POIDocument;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherBitmapBlip;
-import org.apache.poi.ddf.EscherBlipRecord;
-import org.apache.poi.ddf.EscherMetafileBlip;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.hpsf.ClassID;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.model.DrawingManager2;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalSheet.UnsupportedBOFType;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.AbstractEscherHolderRecord;
-import org.apache.poi.hssf.record.BackupRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.DrawingGroupRecord;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.FilePassRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.LabelRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.RecalcIdRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFactory;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.record.crypto.Biff8DecryptingStream;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.poifs.crypt.ChunkedCipherOutputStream;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.EntryUtils;
-import org.apache.poi.poifs.filesystem.FilteringDirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSDocument;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.Ole10Native;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
-import org.apache.poi.ss.formula.udf.IndexedUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.WorkbookUtil;
-import org.apache.poi.util.Configurator;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * High level representation of a workbook.  This is the first object most users
- * will construct whether they are reading or writing a workbook.  It is also the
- * top level object for creating new sheets/etc.
- *
- * @see org.apache.poi.hssf.model.InternalWorkbook
- * @see org.apache.poi.hssf.usermodel.HSSFSheet
- */
-public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss.usermodel.Workbook {
-    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-
-    /**
-     * The maximum number of cell styles in a .xls workbook.
-     * The 'official' limit is 4,000, but POI allows a slightly larger number.
-     * This extra delta takes into account built-in styles that are automatically
-     *
-     * See http://office.microsoft.com/en-us/excel-help/excel-specifications-and-limits-HP005199291.aspx
-     */
-    private static final int MAX_STYLES = 4030;
-
-    private static final int DEBUG = POILogger.DEBUG;
-
-    /**
-     * used for compile-time performance/memory optimization.  This determines the
-     * initial capacity for the sheet collection.  Its currently set to 3.
-     * Changing it in this release will decrease performance
-     * since you're never allowed to have more or less than three sheets!
-     */
-
-    public final static int INITIAL_CAPACITY = Configurator.getIntValue("HSSFWorkbook.SheetInitialCapacity",3);
-
-    /**
-     * this is the reference to the low level Workbook object
-     */
-
-    private InternalWorkbook workbook;
-
-    /**
-     * this holds the HSSFSheet objects attached to this workbook
-     */
-
-    protected List<HSSFSheet> _sheets;
-
-    /**
-     * this holds the HSSFName objects attached to this workbook
-     */
-
-    private ArrayList<HSSFName> names;
-
-    /**
-     * this holds the HSSFFont objects attached to this workbook.
-     * We only create these from the low level records as required.
-     */
-    private Map<Short,HSSFFont> fonts;
-
-    /**
-     * holds whether or not to preserve other nodes in the POIFS.  Used
-     * for macros and embedded objects.
-     */
-    private boolean   preserveNodes;
-
-    /**
-     * Used to keep track of the data formatter so that all
-     * createDataFormatter calls return the same one for a given
-     * book.  This ensures that updates from one places is visible
-     * someplace else.
-     */
-    private HSSFDataFormat formatter;
-
-    /**
-     * The policy to apply in the event of missing or
-     *  blank cells when fetching from a row.
-     * See {@link MissingCellPolicy}
-     */
-    private MissingCellPolicy missingCellPolicy = MissingCellPolicy.RETURN_NULL_AND_BLANK;
-
-    private static POILogger log = POILogFactory.getLogger(HSSFWorkbook.class);
-
-    /**
-     * The locator of user-defined functions.
-     * By default includes functions from the Excel Analysis Toolpack
-     */
-    private UDFFinder _udfFinder = new IndexedUDFFinder(AggregatingUDFFinder.DEFAULT);
-
-    public static HSSFWorkbook create(InternalWorkbook book) {
-    	return new HSSFWorkbook(book);
-    }
-    /**
-     * Creates new HSSFWorkbook from scratch (start here!)
-     *
-     */
-    public HSSFWorkbook() {
-        this(InternalWorkbook.createWorkbook());
-    }
-
-    private HSSFWorkbook(InternalWorkbook book) {
-        super((DirectoryNode)null);
-        workbook = book;
-        _sheets = new ArrayList<HSSFSheet>(INITIAL_CAPACITY);
-        names = new ArrayList<HSSFName>(INITIAL_CAPACITY);
-    }
-
-    /**
-     * Given a POI POIFSFileSystem object, read in its Workbook along
-     *  with all related nodes, and populate the high and low level models.
-     * <p>This calls {@link #HSSFWorkbook(POIFSFileSystem, boolean)} with
-     *  preserve nodes set to true.
-     *
-     * @see #HSSFWorkbook(POIFSFileSystem, boolean)
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     * @exception IOException if the stream cannot be read
-     */
-    public HSSFWorkbook(POIFSFileSystem fs) throws IOException {
-        this(fs,true);
-    }
-    /**
-     * Given a POI POIFSFileSystem object, read in its Workbook along
-     *  with all related nodes, and populate the high and low level models.
-     * <p>This calls {@link #HSSFWorkbook(POIFSFileSystem, boolean)} with
-     *  preserve nodes set to true.
-     *
-     * @see #HSSFWorkbook(POIFSFileSystem, boolean)
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     * @exception IOException if the stream cannot be read
-     */
-    public HSSFWorkbook(NPOIFSFileSystem fs) throws IOException {
-        this(fs.getRoot(),true);
-    }
-
-    /**
-     * Given a POI POIFSFileSystem object, read in its Workbook and populate
-     * the high and low level models.  If you're reading in a workbook... start here!
-     *
-     * @param fs the POI filesystem that contains the Workbook stream.
-     * @param preserveNodes whether to preserve other nodes, such as
-     *        macros.  This takes more memory, so only say yes if you
-     *        need to. If set, will store all of the POIFSFileSystem
-     *        in memory
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     * @exception IOException if the stream cannot be read
-     */
-    public HSSFWorkbook(POIFSFileSystem fs, boolean preserveNodes)
-            throws IOException {
-        this(fs.getRoot(), fs, preserveNodes);
-    }
-
-    public static String getWorkbookDirEntryName(DirectoryNode directory) {
-
-        for (String wbName : WORKBOOK_DIR_ENTRY_NAMES) {
-            try {
-                directory.getEntry(wbName);
-                return wbName;
-            } catch (FileNotFoundException e) {
-                // continue - to try other options
-            }
-        }
-
-        // check for an encrypted .xlsx file - they get OLE2 wrapped
-        try {
-        	directory.getEntry(Decryptor.DEFAULT_POIFS_ENTRY);
-        	throw new EncryptedDocumentException("The supplied spreadsheet seems to be an Encrypted .xlsx file. " +
-        			"It must be decrypted before use by XSSF, it cannot be used by HSSF");
-        } catch (FileNotFoundException e) {
-            // fall through
-        }
-
-        // check for previous version of file format
-        try {
-            directory.getEntry(OLD_WORKBOOK_DIR_ENTRY_NAME);
-            throw new OldExcelFormatException("The supplied spreadsheet seems to be Excel 5.0/7.0 (BIFF5) format. "
-                    + "POI only supports BIFF8 format (from Excel versions 97/2000/XP/2003)");
-        } catch (FileNotFoundException e) {
-            // fall through
-        }
-
-        throw new IllegalArgumentException("The supplied POIFSFileSystem does not contain a BIFF8 'Workbook' entry. "
-            + "Is it really an excel file?");
-    }
-
-    /**
-     * given a POI POIFSFileSystem object, and a specific directory
-     *  within it, read in its Workbook and populate the high and
-     *  low level models.  If you're reading in a workbook...start here.
-     *
-     * @param directory the POI filesystem directory to process from
-     * @param fs the POI filesystem that contains the Workbook stream.
-     * @param preserveNodes whether to preserve other nodes, such as
-     *        macros.  This takes more memory, so only say yes if you
-     *        need to. If set, will store all of the POIFSFileSystem
-     *        in memory
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     * @exception IOException if the stream cannot be read
-     */
-    public HSSFWorkbook(DirectoryNode directory, POIFSFileSystem fs, boolean preserveNodes)
-            throws IOException
-    {
-       this(directory, preserveNodes);
-    }
-
-    /**
-     * given a POI POIFSFileSystem object, and a specific directory
-     *  within it, read in its Workbook and populate the high and
-     *  low level models.  If you're reading in a workbook...start here.
-     *
-     * @param directory the POI filesystem directory to process from
-     * @param preserveNodes whether to preserve other nodes, such as
-     *        macros.  This takes more memory, so only say yes if you
-     *        need to. If set, will store all of the POIFSFileSystem
-     *        in memory
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     * @exception IOException if the stream cannot be read
-     */
-    public HSSFWorkbook(DirectoryNode directory, boolean preserveNodes)
-            throws IOException
-    {
-        super(directory);
-        String workbookName = getWorkbookDirEntryName(directory);
-
-        this.preserveNodes = preserveNodes;
-
-        // If we're not preserving nodes, don't track the
-        //  POIFS any more
-        if(! preserveNodes) {
-           this.directory = null;
-        }
-
-        _sheets = new ArrayList<HSSFSheet>(INITIAL_CAPACITY);
-        names  = new ArrayList<HSSFName>(INITIAL_CAPACITY);
-
-        // Grab the data from the workbook stream, however
-        //  it happens to be spelled.
-        InputStream stream = directory.createDocumentInputStream(workbookName);
-
-        List<Record> records = RecordFactory.createRecords(stream);
-
-        workbook = InternalWorkbook.createWorkbook(records);
-        setPropertiesFromWorkbook(workbook);
-        int recOffset = workbook.getNumRecords();
-
-        // convert all LabelRecord records to LabelSSTRecord
-        convertLabelRecords(records, recOffset);
-        RecordStream rs = new RecordStream(records, recOffset);
-        while (rs.hasNext()) {
-            try {
-                InternalSheet sheet = InternalSheet.createSheet(rs);
-                _sheets.add(new HSSFSheet(this, sheet));
-            } catch (UnsupportedBOFType eb) {
-                // Hopefully there's a supported one after this!
-                log.log(POILogger.WARN, "Unsupported BOF found of type " + eb.getType());
-            }
-        }
-
-        for (int i = 0 ; i < workbook.getNumNames() ; ++i){
-            NameRecord nameRecord = workbook.getNameRecord(i);
-            HSSFName name = new HSSFName(this, nameRecord, workbook.getNameCommentRecord(nameRecord));
-            names.add(name);
-        }
-    }
-
-    /**
-     * Companion to HSSFWorkbook(POIFSFileSystem), this constructs the
-     *  POI filesystem around your {@link InputStream}, including all nodes.
-     * <p>This calls {@link #HSSFWorkbook(InputStream, boolean)} with
-     *  preserve nodes set to true.
-     *
-     * @see #HSSFWorkbook(InputStream, boolean)
-     * @see #HSSFWorkbook(POIFSFileSystem)
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     * @exception IOException if the stream cannot be read
-     */
-    public HSSFWorkbook(InputStream s) throws IOException {
-        this(s,true);
-    }
-
-    /**
-     * Companion to HSSFWorkbook(POIFSFileSystem), this constructs the
-     * POI filesystem around your {@link InputStream}.
-     *
-     * @param s  the POI filesystem that contains the Workbook stream.
-     * @param preserveNodes whether to preserve other nodes, such as
-     *        macros.  This takes more memory, so only say yes if you
-     *        need to.
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     * @see #HSSFWorkbook(POIFSFileSystem)
-     * @exception IOException if the stream cannot be read
-     */
-    @SuppressWarnings("resource")   // NPOIFSFileSystem always closes the stream
-    public HSSFWorkbook(InputStream s, boolean preserveNodes)
-            throws IOException
-    {
-        this(new NPOIFSFileSystem(s).getRoot(), preserveNodes);
-    }
-
-    /**
-     * used internally to set the workbook properties.
-     */
-
-    private void setPropertiesFromWorkbook(InternalWorkbook book)
-    {
-        this.workbook = book;
-
-        // none currently
-    }
-
-    /**
-      * This is basically a kludge to deal with the now obsolete Label records.  If
-      * you have to read in a sheet that contains Label records, be aware that the rest
-      * of the API doesn't deal with them, the low level structure only provides read-only
-      * semi-immutable structures (the sets are there for interface conformance with NO
-      * Implementation).  In short, you need to call this function passing it a reference
-      * to the Workbook object.  All labels will be converted to LabelSST records and their
-      * contained strings will be written to the Shared String table (SSTRecord) within
-      * the Workbook.
-      *
-      * @param records a collection of sheet's records.
-      * @param offset the offset to search at
-      * @see org.apache.poi.hssf.record.LabelRecord
-      * @see org.apache.poi.hssf.record.LabelSSTRecord
-      * @see org.apache.poi.hssf.record.SSTRecord
-      */
-
-     private void convertLabelRecords(List<Record> records, int offset)
-     {
-         if (log.check( POILogger.DEBUG ))
-             log.log(POILogger.DEBUG, "convertLabelRecords called");
-         for (int k = offset; k < records.size(); k++)
-         {
-             Record rec = records.get(k);
-
-             if (rec.getSid() == LabelRecord.sid)
-             {
-                 LabelRecord oldrec = ( LabelRecord ) rec;
-
-                 records.remove(k);
-                 LabelSSTRecord newrec   = new LabelSSTRecord();
-                 int            stringid =
-                     workbook.addSSTString(new UnicodeString(oldrec.getValue()));
-
-                 newrec.setRow(oldrec.getRow());
-                 newrec.setColumn(oldrec.getColumn());
-                 newrec.setXFIndex(oldrec.getXFIndex());
-                 newrec.setSSTIndex(stringid);
-                       records.add(k, newrec);
-             }
-         }
-         if (log.check( POILogger.DEBUG ))
-             log.log(POILogger.DEBUG, "convertLabelRecords exit");
-     }
-
-    /**
-     * Retrieves the current policy on what to do when
-     *  getting missing or blank cells from a row.
-     * The default is to return blank and null cells.
-     *  {@link MissingCellPolicy}
-     */
-    @Override
-    public MissingCellPolicy getMissingCellPolicy() {
-        return missingCellPolicy;
-    }
-
-    /**
-     * Sets the policy on what to do when
-     *  getting missing or blank cells from a row.
-     * This will then apply to all calls to
-     *  {@link HSSFRow#getCell(int)}}. See
-     *  {@link MissingCellPolicy}.
-     * Note that this has no effect on any
-     *  iterators, only on when fetching Cells
-     *  by their column index.
-     */
-    @Override
-    public void setMissingCellPolicy(MissingCellPolicy missingCellPolicy) {
-        this.missingCellPolicy = missingCellPolicy;
-    }
-
-    /**
-     * sets the order of appearance for a given sheet.
-     *
-     * @param sheetname the name of the sheet to reorder
-     * @param pos the position that we want to insert the sheet into (0 based)
-     */
-
-    @Override
-    public void setSheetOrder(String sheetname, int pos ) {
-        int oldSheetIndex = getSheetIndex(sheetname);
-        _sheets.add(pos,_sheets.remove(oldSheetIndex));
-        workbook.setSheetOrder(sheetname, pos);
-
-        FormulaShifter shifter = FormulaShifter.createForSheetShift(oldSheetIndex, pos);
-        for (HSSFSheet sheet : _sheets) {
-            sheet.getSheet().updateFormulasAfterCellShift(shifter, /* not used */ -1 );
-        }
-
-        workbook.updateNamesAfterCellShift(shifter);
-        updateNamedRangesAfterSheetReorder(oldSheetIndex, pos);
-        
-        updateActiveSheetAfterSheetReorder(oldSheetIndex, pos);
-    }
-    
-    /**
-     * copy-pasted from XSSFWorkbook#updateNamedRangesAfterSheetReorder(int, int)
-     * 
-     * update sheet-scoped named ranges in this workbook after changing the sheet order
-     * of a sheet at oldIndex to newIndex.
-     * Sheets between these indices will move left or right by 1.
-     *
-     * @param oldIndex the original index of the re-ordered sheet
-     * @param newIndex the new index of the re-ordered sheet
-     */
-    private void updateNamedRangesAfterSheetReorder(int oldIndex, int newIndex) {
-        // update sheet index of sheet-scoped named ranges
-        for (final HSSFName name : names) {
-            final int i = name.getSheetIndex();
-            // name has sheet-level scope
-            if (i != -1) {
-                // name refers to this sheet
-                if (i == oldIndex) {
-                    name.setSheetIndex(newIndex);
-                }
-                // if oldIndex > newIndex then this sheet moved left and sheets between newIndex and oldIndex moved right
-                else if (newIndex <= i && i < oldIndex) {
-                    name.setSheetIndex(i+1);
-                }
-                // if oldIndex < newIndex then this sheet moved right and sheets between oldIndex and newIndex moved left
-                else if (oldIndex < i && i <= newIndex) {
-                    name.setSheetIndex(i-1);
-                }
-            }
-        }
-    }
-
-    
-    private void updateActiveSheetAfterSheetReorder(int oldIndex, int newIndex) {
-        // adjust active sheet if necessary
-        int active = getActiveSheetIndex();
-        if(active == oldIndex) {
-            // moved sheet was the active one
-            setActiveSheet(newIndex);
-        } else if ((active < oldIndex && active < newIndex) ||
-                (active > oldIndex && active > newIndex)) {
-            // not affected
-        } else if (newIndex > oldIndex) {
-            // moved sheet was below before and is above now => active is one less
-            setActiveSheet(active-1);
-        } else {
-            // remaining case: moved sheet was higher than active before and is lower now => active is one more
-            setActiveSheet(active+1);
-        }
-    }
-
-    private void validateSheetIndex(int index) {
-        int lastSheetIx = _sheets.size() - 1;
-        if (index < 0 || index > lastSheetIx) {
-            String range = "(0.." +    lastSheetIx + ")";
-            if (lastSheetIx == -1) {
-                range = "(no sheets)";
-            }
-            throw new IllegalArgumentException("Sheet index ("
-                    + index +") is out of range " + range);
-        }
-    }
-
-    /**
-     * Selects a single sheet. This may be different to
-     * the 'active' sheet (which is the sheet with focus).
-     */
-    @Override
-    public void setSelectedTab(int index) {
-
-        validateSheetIndex(index);
-        int nSheets = _sheets.size();
-        for (int i=0; i<nSheets; i++) {
-               getSheetAt(i).setSelected(i == index);
-        }
-        workbook.getWindowOne().setNumSelectedTabs((short)1);
-    }
-
-    /**
-     * Selects multiple sheets as a group. This is distinct from
-     * the 'active' sheet (which is the sheet with focus).
-     * Unselects sheets that are not in <code>indexes</code>.
-     *
-     * @param indexes Array of sheets to select, the index is 0-based.
-     */
-    public void setSelectedTabs(int[] indexes) {
-        Collection<Integer> list = new ArrayList<Integer>(indexes.length);
-        for (int index : indexes) {
-            list.add(index);
-        }
-        setSelectedTabs(list);
-    }
-    
-    /**
-     * Selects multiple sheets as a group. This is distinct from
-     * the 'active' sheet (which is the sheet with focus).
-     * Unselects sheets that are not in <code>indexes</code>.
-     *
-     * @param indexes Collection of sheets to select, the index is 0-based.
-     */
-    public void setSelectedTabs(Collection<Integer> indexes) {
-
-        for (int index : indexes) {
-            validateSheetIndex(index);
-        }
-        // ignore duplicates
-        Set<Integer> set = new HashSet<Integer>(indexes);
-        int nSheets = _sheets.size();
-        for (int i=0; i<nSheets; i++) {
-            boolean bSelect = set.contains(i);
-            getSheetAt(i).setSelected(bSelect);
-        }
-        // this is true only if all values in set were valid sheet indexes (between 0 and nSheets-1, inclusive)
-        short nSelected = (short) set.size();
-        workbook.getWindowOne().setNumSelectedTabs(nSelected);
-    }
-    
-    /**
-     * Gets the selected sheets (if more than one, Excel calls these a [Group]). 
-     *
-     * @return indices of selected sheets
-     */
-    public Collection<Integer> getSelectedTabs() {
-        Collection<Integer> indexes = new ArrayList<Integer>();
-        int nSheets = _sheets.size();
-        for (int i=0; i<nSheets; i++) {
-            HSSFSheet sheet = getSheetAt(i);
-            if (sheet.isSelected()) {
-                indexes.add(i);
-            }
-        }
-        return Collections.unmodifiableCollection(indexes);
-    }
-    
-    /**
-     * Convenience method to set the active sheet.  The active sheet is is the sheet
-     * which is currently displayed when the workbook is viewed in Excel.
-     * 'Selected' sheet(s) is a distinct concept.
-     */
-    @Override
-    public void setActiveSheet(int index) {
-
-        validateSheetIndex(index);
-        int nSheets = _sheets.size();
-        for (int i=0; i<nSheets; i++) {
-             getSheetAt(i).setActive(i == index);
-        }
-        workbook.getWindowOne().setActiveSheetIndex(index);
-    }
-
-    /**
-     * gets the tab whose data is actually seen when the sheet is opened.
-     * This may be different from the "selected sheet" since excel seems to
-     * allow you to show the data of one sheet when another is seen "selected"
-     * in the tabs (at the bottom).
-     * @see org.apache.poi.hssf.usermodel.HSSFSheet#setSelected(boolean)
-     */
-    @Override
-    public int getActiveSheetIndex() {
-        return workbook.getWindowOne().getActiveSheetIndex();
-    }
-
-
-    /**
-     * sets the first tab that is displayed in the list of tabs
-     * in excel. This method does <b>not</b> hide, select or focus sheets.
-     * It just sets the scroll position in the tab-bar.
-     *
-     * @param index the sheet index of the tab that will become the first in the tab-bar
-     */
-    @Override
-    public void setFirstVisibleTab(int index) {
-        workbook.getWindowOne().setFirstVisibleTab(index);
-    }
-
-    /**
-     * sets the first tab that is displayed in the list of tabs in excel.
-     */
-    @Override
-    public int getFirstVisibleTab() {
-        return workbook.getWindowOne().getFirstVisibleTab();
-    }
-
-    /**
-     * Set the sheet name.
-     *
-     * @param sheetIx number (0 based)
-     * @throws IllegalArgumentException if the name is null or invalid
-     *  or workbook already contains a sheet with this name
-     * @see #createSheet(String)
-     * @see org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)
-     */
-    @Override
-    public void setSheetName(int sheetIx, String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("sheetName must not be null");
-        }
-
-        if (workbook.doesContainsSheetName(name, sheetIx)) {
-            throw new IllegalArgumentException("The workbook already contains a sheet named '" + name + "'");
-        }
-        validateSheetIndex(sheetIx);
-        workbook.setSheetName(sheetIx, name);
-    }
-
-    /**
-     * @return Sheet name for the specified index
-     */
-    @Override
-    public String getSheetName(int sheetIndex) {
-        validateSheetIndex(sheetIndex);
-        return workbook.getSheetName(sheetIndex);
-    }
-
-    @Override
-    public boolean isHidden() {
-        return workbook.getWindowOne().getHidden();
-    }
-
-    @Override
-    public void setHidden(boolean hiddenFlag) {
-        workbook.getWindowOne().setHidden(hiddenFlag);
-    }
-
-    @Override
-    public boolean isSheetHidden(int sheetIx) {
-        validateSheetIndex(sheetIx);
-        return workbook.isSheetHidden(sheetIx);
-    }
-
-    @Override
-    public boolean isSheetVeryHidden(int sheetIx) {
-        validateSheetIndex(sheetIx);
-        return workbook.isSheetVeryHidden(sheetIx);
-    }
-
-
-    @Override
-    public void setSheetHidden(int sheetIx, boolean hidden) {
-        validateSheetIndex(sheetIx);
-        workbook.setSheetHidden(sheetIx, hidden);
-    }
-
-    @Override
-    public void setSheetHidden(int sheetIx, int hidden) {
-        validateSheetIndex(sheetIx);
-        WorkbookUtil.validateSheetState(hidden);
-        workbook.setSheetHidden(sheetIx, hidden);
-    }
-
-    /** Returns the index of the sheet by his name
-     * @param name the sheet name
-     * @return index of the sheet (0 based)
-     */
-    @Override
-    public int getSheetIndex(String name){
-        return workbook.getSheetIndex(name);
-    }
-
-    /** Returns the index of the given sheet
-     * @param sheet the sheet to look up
-     * @return index of the sheet (0 based). <tt>-1</tt> if not found
-     */
-    @Override
-    public int getSheetIndex(org.apache.poi.ss.usermodel.Sheet sheet) {
-        for(int i=0; i<_sheets.size(); i++) {
-            if(_sheets.get(i) == sheet) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * create an HSSFSheet for this HSSFWorkbook, adds it to the sheets and returns
-     * the high level representation.  Use this to create new sheets.
-     *
-     * @return HSSFSheet representing the new sheet.
-     */
-
-    @Override
-    public HSSFSheet createSheet()
-    {
-        HSSFSheet sheet = new HSSFSheet(this);
-
-        _sheets.add(sheet);
-        workbook.setSheetName(_sheets.size() - 1, "Sheet" + (_sheets.size() - 1));
-        boolean isOnlySheet = _sheets.size() == 1;
-        sheet.setSelected(isOnlySheet);
-        sheet.setActive(isOnlySheet);
-        return sheet;
-    }
-
-    /**
-     * create an HSSFSheet from an existing sheet in the HSSFWorkbook.
-     *
-     * @return HSSFSheet representing the cloned sheet.
-     */
-
-    @Override
-    public HSSFSheet cloneSheet(int sheetIndex) {
-        validateSheetIndex(sheetIndex);
-        HSSFSheet srcSheet = _sheets.get(sheetIndex);
-        String srcName = workbook.getSheetName(sheetIndex);
-        HSSFSheet clonedSheet = srcSheet.cloneSheet(this);
-        clonedSheet.setSelected(false);
-        clonedSheet.setActive(false);
-
-        String name = getUniqueSheetName(srcName);
-        int newSheetIndex = _sheets.size();
-        _sheets.add(clonedSheet);
-        workbook.setSheetName(newSheetIndex, name);
-
-        // Check this sheet has an autofilter, (which has a built-in NameRecord at workbook level)
-        int filterDbNameIndex = findExistingBuiltinNameRecordIdx(sheetIndex, NameRecord.BUILTIN_FILTER_DB);
-        if (filterDbNameIndex != -1) {
-            NameRecord newNameRecord = workbook.cloneFilter(filterDbNameIndex, newSheetIndex);
-            HSSFName newName = new HSSFName(this, newNameRecord);
-            names.add(newName);
-        }
-        // TODO - maybe same logic required for other/all built-in name records
-//        workbook.cloneDrawings(clonedSheet.getSheet());
-
-        return clonedSheet;
-    }
-
-    private String getUniqueSheetName(String srcName) {
-        int uniqueIndex = 2;
-        String baseName = srcName;
-        int bracketPos = srcName.lastIndexOf('(');
-        if (bracketPos > 0 && srcName.endsWith(")")) {
-            String suffix = srcName.substring(bracketPos + 1, srcName.length() - ")".length());
-            try {
-                uniqueIndex = Integer.parseInt(suffix.trim());
-                uniqueIndex++;
-                baseName=srcName.substring(0, bracketPos).trim();
-            } catch (NumberFormatException e) {
-                // contents of brackets not numeric
-            }
-        }
-        while (true) {
-            // Try and find the next sheet name that is unique
-            String index = Integer.toString(uniqueIndex++);
-            String name;
-            if (baseName.length() + index.length() + 2 < 31) {
-                name = baseName + " (" + index + ")";
-            } else {
-                name = baseName.substring(0, 31 - index.length() - 2) + "(" + index + ")";
-            }
-
-            //If the sheet name is unique, then set it otherwise move on to the next number.
-            if (workbook.getSheetIndex(name) == -1) {
-              return name;
-            }
-        }
-    }
-
-    /**
-     * Create a new sheet for this Workbook and return the high level representation.
-     * Use this to create new sheets.
-     *
-     * <p>
-     *     Note that Excel allows sheet names up to 31 chars in length but other applications
-     *     (such as OpenOffice) allow more. Some versions of Excel crash with names longer than 31 chars,
-     *     others - truncate such names to 31 character.
-     * </p>
-     * <p>
-     *     POI's SpreadsheetAPI silently truncates the input argument to 31 characters.
-     *     Example:
-     *
-     *     <pre><code>
-     *     Sheet sheet = workbook.createSheet("My very long sheet name which is longer than 31 chars"); // will be truncated
-     *     assert 31 == sheet.getSheetName().length();
-     *     assert "My very long sheet name which i" == sheet.getSheetName();
-     *     </code></pre>
-     * </p>
-     *
-     * Except the 31-character constraint, Excel applies some other rules:
-     * <p>
-     * Sheet name MUST be unique in the workbook and MUST NOT contain the any of the following characters:
-     * <ul>
-     * <li> 0x0000 </li>
-     * <li> 0x0003 </li>
-     * <li> colon (:) </li>
-     * <li> backslash (\) </li>
-     * <li> asterisk (*) </li>
-     * <li> question mark (?) </li>
-     * <li> forward slash (/) </li>
-     * <li> opening square bracket ([) </li>
-     * <li> closing square bracket (]) </li>
-     * </ul>
-     * The string MUST NOT begin or end with the single quote (') character.
-     * </p>
-     *
-     * @param sheetname  sheetname to set for the sheet.
-     * @return Sheet representing the new sheet.
-     * @throws IllegalArgumentException if the name is null or invalid
-     *  or workbook already contains a sheet with this name
-     * @see org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)
-     */
-    @Override
-    public HSSFSheet createSheet(String sheetname)
-    {
-        if (sheetname == null) {
-            throw new IllegalArgumentException("sheetName must not be null");
-        }
-
-        if (workbook.doesContainsSheetName( sheetname, _sheets.size() ))
-            throw new IllegalArgumentException("The workbook already contains a sheet named '" + sheetname + "'");
-
-        HSSFSheet sheet = new HSSFSheet(this);
-
-        workbook.setSheetName(_sheets.size(), sheetname);
-        _sheets.add(sheet);
-        boolean isOnlySheet = _sheets.size() == 1;
-        sheet.setSelected(isOnlySheet);
-        sheet.setActive(isOnlySheet);
-        return sheet;
-    }
-
-    /**
-     *  Returns an iterator of the sheets in the workbook
-     *  in sheet order. Includes hidden and very hidden sheets.
-     *
-     * @return an iterator of the sheets.
-     */
-    @Override
-    public Iterator<Sheet> sheetIterator() {
-        return new SheetIterator<Sheet>();
-    }
-
-    /**
-     * Alias for {@link #sheetIterator()} to allow
-     * foreach loops
-     */
-    @Override
-    public Iterator<Sheet> iterator() {
-        return sheetIterator();
-    }
-    
-    private final class SheetIterator<T extends Sheet> implements Iterator<T> {
-        final private Iterator<T> it;
-        private T cursor = null;
-        @SuppressWarnings("unchecked")
-        public SheetIterator() {
-            it = (Iterator<T>) _sheets.iterator();
-        }
-        @Override
-        public boolean hasNext() {
-            return it.hasNext();
-        }
-        @Override
-        public T next() throws NoSuchElementException {
-            cursor = it.next();
-            return cursor;
-        }
-        /**
-         * Unexpected behavior may occur if sheets are reordered after iterator
-         * has been created. Support for the remove method may be added in the future
-         * if someone can figure out a reliable implementation.
-         */
-        @Override
-        public void remove() throws IllegalStateException {
-            throw new UnsupportedOperationException("remove method not supported on HSSFWorkbook.iterator(). "+
-                        "Use Sheet.removeSheetAt(int) instead.");
-        }
-    }
-
-    /**
-     * get the number of spreadsheets in the workbook (this will be three after serialization)
-     * @return number of sheets
-     */
-    @Override
-    public int getNumberOfSheets()
-    {
-        return _sheets.size();
-    }
-
-    private HSSFSheet[] getSheets() {
-        HSSFSheet[] result = new HSSFSheet[_sheets.size()];
-        _sheets.toArray(result);
-        return result;
-    }
-
-    /**
-     * Get the HSSFSheet object at the given index.
-     * @param index of the sheet number (0-based physical & logical)
-     * @return HSSFSheet at the provided index
-     * @throws IllegalArgumentException if the index is out of range (index
-     *            &lt; 0 || index &gt;= getNumberOfSheets()).
-     */
-    @Override
-    public HSSFSheet getSheetAt(int index)
-    {
-        validateSheetIndex(index);
-        return _sheets.get(index);
-    }
-
-    /**
-     * Get sheet with the given name (case insensitive match)
-     * @param name of the sheet
-     * @return HSSFSheet with the name provided or <code>null</code> if it does not exist
-     */
-
-    @Override
-    public HSSFSheet getSheet(String name)
-    {
-        HSSFSheet retval = null;
-
-        for (int k = 0; k < _sheets.size(); k++)
-        {
-            String sheetname = workbook.getSheetName(k);
-
-            if (sheetname.equalsIgnoreCase(name))
-            {
-                retval = _sheets.get(k);
-            }
-        }
-        return retval;
-    }
-
-    /**
-     * Removes sheet at the given index.<p/>
-     *
-     * Care must be taken if the removed sheet is the currently active or only selected sheet in
-     * the workbook. There are a few situations when Excel must have a selection and/or active
-     * sheet. (For example when printing - see Bug 40414).<br/>
-     *
-     * This method makes sure that if the removed sheet was active, another sheet will become
-     * active in its place.  Furthermore, if the removed sheet was the only selected sheet, another
-     * sheet will become selected.  The newly active/selected sheet will have the same index, or
-     * one less if the removed sheet was the last in the workbook.
-     *
-     * @param index of the sheet  (0-based)
-     */
-    @Override
-    public void removeSheetAt(int index) {
-        validateSheetIndex(index);
-        boolean wasSelected = getSheetAt(index).isSelected();
-
-        _sheets.remove(index);
-        workbook.removeSheet(index);
-
-        // set the remaining active/selected sheet
-        int nSheets = _sheets.size();
-        if (nSheets < 1) {
-            // nothing more to do if there are no sheets left
-            return;
-        }
-        // the index of the closest remaining sheet to the one just deleted
-        int newSheetIndex = index;
-        if (newSheetIndex >= nSheets) {
-            newSheetIndex = nSheets-1;
-        }
-
-        if (wasSelected) {
-            boolean someOtherSheetIsStillSelected = false;
-            for (int i =0; i < nSheets; i++) {
-                if (getSheetAt(i).isSelected()) {
-                    someOtherSheetIsStillSelected = true;
-                    break;
-                }
-            }
-            if (!someOtherSheetIsStillSelected) {
-                setSelectedTab(newSheetIndex);
-            }
-        }
-
-        // adjust active sheet
-        int active = getActiveSheetIndex();
-        if(active == index) {
-            // removed sheet was the active one, reset active sheet if there is still one left now
-            setActiveSheet(newSheetIndex);
-        } else if (active > index) {
-            // removed sheet was below the active one => active is one less now
-            setActiveSheet(active-1);
-        }
-    }
-
-    /**
-     * determine whether the Excel GUI will backup the workbook when saving.
-     *
-     * @param backupValue   true to indicate a backup will be performed.
-     */
-
-    public void setBackupFlag(boolean backupValue)
-    {
-        BackupRecord backupRecord = workbook.getBackupRecord();
-
-        backupRecord.setBackup(backupValue ? (short) 1
-                : (short) 0);
-    }
-
-    /**
-     * determine whether the Excel GUI will backup the workbook when saving.
-     *
-     * @return the current setting for backups.
-     */
-
-    public boolean getBackupFlag()
-    {
-        BackupRecord backupRecord = workbook.getBackupRecord();
-
-        return backupRecord.getBackup() != 0;
-    }
-
-    int findExistingBuiltinNameRecordIdx(int sheetIndex, byte builtinCode) {
-        for(int defNameIndex =0; defNameIndex<names.size(); defNameIndex++) {
-            NameRecord r = workbook.getNameRecord(defNameIndex);
-            if (r == null) {
-                throw new RuntimeException("Unable to find all defined names to iterate over");
-            }
-            if (!r.isBuiltInName() || r.getBuiltInName() != builtinCode) {
-                continue;
-            }
-            if (r.getSheetNumber() -1 == sheetIndex) {
-                return defNameIndex;
-            }
-        }
-        return -1;
-    }
-
-
-    HSSFName createBuiltInName(byte builtinCode, int sheetIndex) {
-      NameRecord nameRecord =
-        workbook.createBuiltInName(builtinCode, sheetIndex + 1);
-      HSSFName newName = new HSSFName(this, nameRecord, null);
-      names.add(newName);
-      return newName;
-    }
-
-
-    HSSFName getBuiltInName(byte builtinCode, int sheetIndex) {
-      int index = findExistingBuiltinNameRecordIdx(sheetIndex, builtinCode);
-      if (index < 0) {
-        return null;
-      } else {
-        return names.get(index);
-      }
-    }
-
-
-    /**
-     * create a new Font and add it to the workbook's font table
-     * @return new font object
-     */
-
-    @Override
-    public HSSFFont createFont()
-    {
-        /*FontRecord font =*/ workbook.createNewFont();
-        short fontindex = (short) (getNumberOfFonts() - 1);
-
-        if (fontindex > 3)
-        {
-            fontindex++;   // THERE IS NO FOUR!!
-        }
-        if(fontindex == Short.MAX_VALUE){
-            throw new IllegalArgumentException("Maximum number of fonts was exceeded");
-        }
-
-        // Ask getFontAt() to build it for us,
-        //  so it gets properly cached
-        return getFontAt(fontindex);
-    }
-
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     * @deprecated 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead.
-     */
-    @Deprecated
-    @Override
-    public HSSFFont findFont(short boldWeight, short color, short fontHeight,
-                             String name, boolean italic, boolean strikeout,
-                             short typeOffset, byte underline)
-    {
-        short numberOfFonts = getNumberOfFonts();
-        for (short i=0; i<=numberOfFonts; i++) {
-            // Remember - there is no 4!
-            if(i == 4) continue;
-
-            HSSFFont hssfFont = getFontAt(i);
-            if (hssfFont.getBoldweight() == boldWeight
-                    && hssfFont.getColor() == color
-                    && hssfFont.getFontHeight() == fontHeight
-                    && hssfFont.getFontName().equals(name)
-                    && hssfFont.getItalic() == italic
-                    && hssfFont.getStrikeout() == strikeout
-                    && hssfFont.getTypeOffset() == typeOffset
-                    && hssfFont.getUnderline() == underline)
-            {
-                return hssfFont;
-            }
-        }
-
-        return null;
-    }
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     */
-    @Override
-    public HSSFFont findFont(boolean bold, short color, short fontHeight,
-                             String name, boolean italic, boolean strikeout,
-                             short typeOffset, byte underline)
-    {
-        short numberOfFonts = getNumberOfFonts();
-        for (short i=0; i<=numberOfFonts; i++) {
-            // Remember - there is no 4!
-            if(i == 4) continue;
-
-            HSSFFont hssfFont = getFontAt(i);
-            if (hssfFont.getBold() == bold
-                    && hssfFont.getColor() == color
-                    && hssfFont.getFontHeight() == fontHeight
-                    && hssfFont.getFontName().equals(name)
-                    && hssfFont.getItalic() == italic
-                    && hssfFont.getStrikeout() == strikeout
-                    && hssfFont.getTypeOffset() == typeOffset
-                    && hssfFont.getUnderline() == underline)
-            {
-                return hssfFont;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * get the number of fonts in the font table
-     * @return number of fonts
-     */
-
-    @Override
-    public short getNumberOfFonts()
-    {
-        return (short) workbook.getNumberOfFontRecords();
-    }
-
-    /**
-     * Get the font at the given index number
-     * @param idx  index number
-     * @return HSSFFont at the index
-     */
-    @Override
-    public HSSFFont getFontAt(short idx) {
-        if(fonts == null) fonts = new HashMap<Short, HSSFFont>();
-
-        // So we don't confuse users, give them back
-        //  the same object every time, but create
-        //  them lazily
-        Short sIdx = Short.valueOf(idx);
-        if(fonts.containsKey(sIdx)) {
-            return fonts.get(sIdx);
-        }
-
-        FontRecord font = workbook.getFontRecordAt(idx);
-        HSSFFont retval = new HSSFFont(idx, font);
-        fonts.put(sIdx, retval);
-
-        return retval;
-    }
-
-    /**
-     * Reset the fonts cache, causing all new calls
-     *  to getFontAt() to create new objects.
-     * Should only be called after deleting fonts,
-     *  and that's not something you should normally do
-     */
-    protected void resetFontCache() {
-        fonts = new HashMap<Short, HSSFFont>();
-    }
-
-    /**
-     * Create a new Cell style and add it to the workbook's style table.
-     * You can define up to 4000 unique styles in a .xls workbook.
-     *
-     * @return the new Cell Style object
-     * @throws IllegalStateException if the number of cell styles exceeded the limit for this type of Workbook.
-     */
-    @Override
-    public HSSFCellStyle createCellStyle()
-    {
-        if(workbook.getNumExFormats() == MAX_STYLES) {
-            throw new IllegalStateException("The maximum number of cell styles was exceeded. " +
-                    "You can define up to 4000 styles in a .xls workbook");
-        }
-        ExtendedFormatRecord xfr = workbook.createCellXF();
-        short index = (short) (getNumCellStyles() - 1);
-        return new HSSFCellStyle(index, xfr, this);
-    }
-
-    /**
-     * get the number of styles the workbook contains
-     * @return count of cell styles
-     */
-    @Override
-    public int getNumCellStyles()
-    {
-        return workbook.getNumExFormats();
-    }
-
-    /**
-     * get the cell style object at the given index
-     * @param idx  index within the set of styles
-     * @return HSSFCellStyle object at the index
-     */
-    @Override
-    public HSSFCellStyle getCellStyleAt(int idx)
-    {
-        ExtendedFormatRecord xfr = workbook.getExFormatAt(idx);
-        return new HSSFCellStyle((short)idx, xfr, this);
-    }
-
-    /**
-     * Closes the underlying {@link NPOIFSFileSystem} from which
-     *  the Workbook was read, if any.
-     *
-     * <p>Once this has been called, no further
-     *  operations, updates or reads should be performed on the 
-     *  Workbook.
-     */
-    @Override
-    public void close() throws IOException {
-        super.close();
-    }
-
-    /**
-     * Write out this workbook to the currently open {@link File} via the
-     *  writeable {@link POIFSFileSystem} it was opened as. 
-     *  
-     * <p>This will fail (with an {@link IllegalStateException} if the
-     *  Workbook was opened read-only, opened from an {@link InputStream}
-     *   instead of a File, or if this is not the root document. For those cases, 
-     *   you must use {@link #write(OutputStream)} or {@link #write(File)} to 
-     *   write to a brand new document.
-     */
-    @Override
-    public void write() throws IOException {
-        validateInPlaceWritePossible();
-        
-        // Update the Workbook stream in the file
-        DocumentNode workbookNode = (DocumentNode)directory.getEntry(
-                getWorkbookDirEntryName(directory));
-        NPOIFSDocument workbookDoc = new NPOIFSDocument(workbookNode);
-        workbookDoc.replaceContents(new ByteArrayInputStream(getBytes()));
-        
-        // Update the properties streams in the file
-        writeProperties();
-        
-        // Sync with the File on disk
-        directory.getFileSystem().writeFilesystem();
-    }
-    
-    /**
-     * Method write - write out this workbook to a new {@link File}. Constructs
-     * a new POI POIFSFileSystem, passes in the workbook binary representation and
-     * writes it out. If the file exists, it will be replaced, otherwise a new one
-     * will be created.
-     * 
-     * Note that you cannot write to the currently open File using this method.
-     * If you opened your Workbook from a File, you <i>must</i> use the {@link #write()}
-     * method instead!
-     * 
-     * @param newFile The new File you wish to write the XLS to
-     *
-     * @exception IOException if anything can't be written.
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     */
-    @Override
-    public void write(File newFile) throws IOException {
-        POIFSFileSystem fs = POIFSFileSystem.create(newFile);
-        try {
-            write(fs);
-            fs.writeFilesystem();
-        } finally {
-            fs.close();
-        }
-    }
-    
-    /**
-     * Method write - write out this workbook to an {@link OutputStream}. Constructs
-     * a new POI POIFSFileSystem, passes in the workbook binary representation and
-     * writes it out.
-     * 
-     * If {@code stream} is a {@link java.io.FileOutputStream} on a networked drive
-     * or has a high cost/latency associated with each written byte,
-     * consider wrapping the OutputStream in a {@link java.io.BufferedOutputStream}
-     * to improve write performance.
-     *
-     * @param stream - the java OutputStream you wish to write the XLS to
-     *
-     * @exception IOException if anything can't be written.
-     * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
-     */
-    @Override
-	public void write(OutputStream stream) throws IOException {
-        NPOIFSFileSystem fs = new NPOIFSFileSystem();
-        try {
-            write(fs);
-            fs.writeFilesystem(stream);
-        } finally {
-            fs.close();
-        }
-    }
-    
-    /** Writes the workbook out to a brand new, empty POIFS */
-    private void write(NPOIFSFileSystem fs) throws IOException {
-        // For tracking what we've written out, used if we're
-        //  going to be preserving nodes
-        List<String> excepts = new ArrayList<String>(1);
-
-        // Write out the Workbook stream
-        fs.createDocument(new ByteArrayInputStream(getBytes()), "Workbook");
-
-        // Write out our HPFS properties, if we have them
-        writeProperties(fs, excepts);
-
-        if (preserveNodes) {
-            // Don't write out the old Workbook, we'll be doing our new one
-            // If the file had an "incorrect" name for the workbook stream,
-            // don't write the old one as we'll use the correct name shortly
-            excepts.addAll(Arrays.asList(WORKBOOK_DIR_ENTRY_NAMES));
-
-            // Copy over all the other nodes to our new poifs
-            EntryUtils.copyNodes(
-                    new FilteringDirectoryNode(this.directory, excepts)
-                    , new FilteringDirectoryNode(fs.getRoot(), excepts)
-                    );
-
-            // YK: preserve StorageClsid, it is important for embedded workbooks,
-            // see Bugzilla 47920
-            fs.getRoot().setStorageClsid(this.directory.getStorageClsid());
-        }
-    }
-
-    /**
-     * Totals the sizes of all sheet records and eventually serializes them
-     */
-    private static final class SheetRecordCollector implements RecordVisitor {
-
-        private List<Record> _list;
-        private int _totalSize;
-
-        public SheetRecordCollector() {
-            _totalSize = 0;
-            _list = new ArrayList<Record>(128);
-        }
-        public int getTotalSize() {
-            return _totalSize;
-        }
-        @Override
-        public void visitRecord(Record r) {
-            _list.add(r);
-            _totalSize+=r.getRecordSize();
-
-        }
-        public int serialize(int offset, byte[] data) {
-            int result = 0;
-            for (Record rec : _list) {
-                result += rec.serialize(offset + result, data);
-            }
-            return result;
-        }
-    }
-
-
-    /**
-     * Method getBytes - get the bytes of just the HSSF portions of the XLS file.
-     * Use this to construct a POI POIFSFileSystem yourself.
-     *
-     *
-     * @return byte[] array containing the binary representation of this workbook and all contained
-     *         sheets, rows, cells, etc.
-     */
-    public byte[] getBytes() {
-        if (log.check( POILogger.DEBUG )) {
-            log.log(DEBUG, "HSSFWorkbook.getBytes()");
-        }
-        
-        HSSFSheet[] sheets = getSheets();
-        int nSheets = sheets.length;
-
-
-        // before getting the workbook size we must tell the sheets that
-        // serialization is about to occur.
-        workbook.preSerialize();
-        for (HSSFSheet sheet : sheets) {
-            sheet.getSheet().preSerialize();
-            sheet.preSerialize();
-        }
-
-        int totalsize = workbook.getSize();
-
-        // pre-calculate all the sheet sizes and set BOF indexes
-        SheetRecordCollector[] srCollectors = new SheetRecordCollector[nSheets];
-        for (int k = 0; k < nSheets; k++) {
-            workbook.setSheetBof(k, totalsize);
-            SheetRecordCollector src = new SheetRecordCollector();
-            sheets[k].getSheet().visitContainedRecords(src, totalsize);
-            totalsize += src.getTotalSize();
-            srCollectors[k] = src;
-        }
-
-        byte[] retval = new byte[totalsize];
-        int pos = workbook.serialize(0, retval);
-
-        for (int k = 0; k < nSheets; k++) {
-            SheetRecordCollector src = srCollectors[k];
-            int serializedSize = src.serialize(pos, retval);
-            if (serializedSize != src.getTotalSize()) {
-                // Wrong offset values have been passed in the call to setSheetBof() above.
-                // For books with more than one sheet, this discrepancy would cause excel
-                // to report errors and loose data while reading the workbook
-                throw new IllegalStateException("Actual serialized sheet size (" + serializedSize
-                        + ") differs from pre-calculated size (" + src.getTotalSize()
-                        + ") for sheet (" + k + ")");
-                // TODO - add similar sanity check to ensure that Sheet.serializeIndexRecord() does not write mis-aligned offsets either
-            }
-            pos += serializedSize;
-        }
-
-        encryptBytes(retval);
-        
-        return retval;
-    }
-
-    @SuppressWarnings("resource")
-    protected void encryptBytes(byte buf[]) {
-        int initialOffset = 0;
-        FilePassRecord fpr = null;
-        for (Record r : workbook.getRecords()) {
-            initialOffset += r.getRecordSize();
-            if (r instanceof FilePassRecord) {
-                fpr = (FilePassRecord)r;
-                break;
-            }
-        }
-        if (fpr == null) {
-            return;
-        }
-        
-        LittleEndianByteArrayInputStream plain = new LittleEndianByteArrayInputStream(buf, 0);
-        LittleEndianByteArrayOutputStream leos = new LittleEndianByteArrayOutputStream(buf, 0);
-        Encryptor enc = fpr.getEncryptionInfo().getEncryptor();
-        enc.setChunkSize(Biff8DecryptingStream.RC4_REKEYING_INTERVAL);
-        byte tmp[] = new byte[1024];
-        try {
-            ChunkedCipherOutputStream os = enc.getDataStream(leos, initialOffset);
-            int totalBytes = 0;
-            while (totalBytes < buf.length) {
-                plain.read(tmp, 0, 4);
-                final int sid = LittleEndian.getUShort(tmp, 0);
-                final int len = LittleEndian.getUShort(tmp, 2);
-                boolean isPlain = Biff8DecryptingStream.isNeverEncryptedRecord(sid);
-                os.setNextRecordSize(len, isPlain);
-                os.writePlain(tmp, 0, 4);
-                if (sid == BoundSheetRecord.sid) {
-                    // special case for the field_1_position_of_BOF (=lbPlyPos) field of
-                    // the BoundSheet8 record which must be unencrypted
-                    byte bsrBuf[] = new byte[len];
-                    plain.readFully(bsrBuf);
-                    os.writePlain(bsrBuf, 0, 4);
-                    os.write(bsrBuf, 4, len-4);
-                } else {
-                    int todo = len;
-                    while (todo > 0) {
-                        int nextLen = Math.min(todo, tmp.length);
-                        plain.readFully(tmp, 0, nextLen);
-                        if (isPlain) {
-                            os.writePlain(tmp, 0, nextLen);
-                        } else {
-                            os.write(tmp, 0, nextLen);
-                        }
-                        todo -= nextLen;
-                    }
-                }
-                totalBytes += 4 + len;
-            }
-            os.close();
-        } catch (Exception e) {
-            throw new EncryptedDocumentException(e);
-        }
-    }
-    
-    /*package*/ InternalWorkbook getWorkbook() {
-        return workbook;
-    }
-
-    @Override
-    public int getNumberOfNames(){
-        return names.size();
-    }
-
-    @Override
-    public HSSFName getName(String name) {
-        int nameIndex = getNameIndex(name);
-        if (nameIndex < 0) {
-            return null;
-        }
-        return names.get(nameIndex);
-    }
-
-    @Override
-    public List<HSSFName> getNames(String name) {
-        List<HSSFName> nameList = new ArrayList<HSSFName>();
-        for(HSSFName nr : names) {
-            if(nr.getNameName().equals(name)) {
-                nameList.add(nr);
-            }
-        }
-
-        return Collections.unmodifiableList(nameList);
-    }
-
-    @Override
-    public HSSFName getNameAt(int nameIndex) {
-        int nNames = names.size();
-        if (nNames < 1) {
-            throw new IllegalStateException("There are no defined names in this workbook");
-        }
-        if (nameIndex < 0 || nameIndex > nNames) {
-            throw new IllegalArgumentException("Specified name index " + nameIndex
-                    + " is outside the allowable range (0.." + (nNames-1) + ").");
-        }
-        return names.get(nameIndex);
-    }
-
-    @Override
-    public List<HSSFName> getAllNames() {
-        return Collections.unmodifiableList(names);
-    }
-
-    public NameRecord getNameRecord(int nameIndex) {
-        return getWorkbook().getNameRecord(nameIndex);
-    }
-
-    /** gets the named range name
-     * @param index the named range index (0 based)
-     * @return named range name
-     */
-    public String getNameName(int index){
-        return getNameAt(index).getNameName();
-    }
-
-    /**
-     * Sets the printarea for the sheet provided
-     * <p>
-     * i.e. Reference = $A$1:$B$2
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @param reference Valid name Reference for the Print Area
-     */
-    @Override
-    public void setPrintArea(int sheetIndex, String reference)
-    {
-        NameRecord name = workbook.getSpecificBuiltinRecord(NameRecord.BUILTIN_PRINT_AREA, sheetIndex+1);
-
-
-        if (name == null) {
-            name = workbook.createBuiltInName(NameRecord.BUILTIN_PRINT_AREA, sheetIndex+1);
-            // adding one here because 0 indicates a global named region; doesn't make sense for print areas
-        }
-        String[] parts = COMMA_PATTERN.split(reference);
-        StringBuffer sb = new StringBuffer(32);
-        for (int i = 0; i < parts.length; i++) {
-            if(i>0) {
-                sb.append(",");
-            }
-            SheetNameFormatter.appendFormat(sb, getSheetName(sheetIndex));
-            sb.append("!");
-            sb.append(parts[i]);
-        }
-        name.setNameDefinition(HSSFFormulaParser.parse(sb.toString(), this, FormulaType.NAMEDRANGE, sheetIndex));
-    }
-
-    /**
-     * For the Convenience of Java Programmers maintaining pointers.
-     * @see #setPrintArea(int, String)
-     * @param sheetIndex Zero-based sheet index (0 = First Sheet)
-     * @param startColumn Column to begin printarea
-     * @param endColumn Column to end the printarea
-     * @param startRow Row to begin the printarea
-     * @param endRow Row to end the printarea
-     */
-    @Override
-    public void setPrintArea(int sheetIndex, int startColumn, int endColumn,
-                              int startRow, int endRow) {
-
-        //using absolute references because they don't get copied and pasted anyway
-        CellReference cell = new CellReference(startRow, startColumn, true, true);
-        String reference = cell.formatAsString();
-
-        cell = new CellReference(endRow, endColumn, true, true);
-        reference = reference+":"+cell.formatAsString();
-
-        setPrintArea(sheetIndex, reference);
-    }
-
-
-    /**
-     * Retrieves the reference for the printarea of the specified sheet, the sheet name is appended to the reference even if it was not specified.
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @return String Null if no print area has been defined
-     */
-    @Override
-    public String getPrintArea(int sheetIndex) {
-        NameRecord name = workbook.getSpecificBuiltinRecord(NameRecord.BUILTIN_PRINT_AREA, sheetIndex+1);
-        //adding one here because 0 indicates a global named region; doesn't make sense for print areas
-        if (name == null) {
-            return null;
-        }
-
-        return HSSFFormulaParser.toFormulaString(this, name.getNameDefinition());
-    }
-
-    /**
-     * Delete the printarea for the sheet specified
-     * @param sheetIndex Zero-based sheet index (0 = First Sheet)
-     */
-    @Override
-    public void removePrintArea(int sheetIndex) {
-        getWorkbook().removeBuiltinRecord(NameRecord.BUILTIN_PRINT_AREA, sheetIndex+1);
-    }
-
-    /** creates a new named range and add it to the model
-     * @return named range high level
-     */
-    @Override
-    public HSSFName createName(){
-        NameRecord nameRecord = workbook.createName();
-
-        HSSFName newName = new HSSFName(this, nameRecord);
-
-        names.add(newName);
-
-        return newName;
-    }
-
-    @Override
-    public int getNameIndex(String name) {
-
-        for (int k = 0; k < names.size(); k++) {
-            String nameName = getNameName(k);
-
-            if (nameName.equalsIgnoreCase(name)) {
-                return k;
-            }
-        }
-        return -1;
-    }
-
-
-    /**
-     * As {@link #getNameIndex(String)} is not necessarily unique
-     * (name + sheet index is unique), this method is more accurate.
-     *
-     * @param name the name whose index in the list of names of this workbook
-     *        should be looked up.
-     * @return an index value >= 0 if the name was found; -1, if the name was
-     *         not found
-     */
-    int getNameIndex(HSSFName name) {
-      for (int k = 0; k < names.size(); k++) {
-        if (name == names.get(k)) {
-            return k;
-        }
-      }
-      return -1;
-    }
-
-
-    @Override
-    public void removeName(int index){
-        names.remove(index);
-        workbook.removeName(index);
-    }
-
-    /**
-     * Returns the instance of HSSFDataFormat for this workbook.
-     * @return the HSSFDataFormat object
-     * @see org.apache.poi.hssf.record.FormatRecord
-     * @see org.apache.poi.hssf.record.Record
-     */
-    @Override
-    public HSSFDataFormat createDataFormat() {
-    if (formatter == null)
-        formatter = new HSSFDataFormat(workbook);
-    return formatter;
-    }
-
-
-    @Override
-    public void removeName(String name) {
-        int index = getNameIndex(name);
-        removeName(index);
-    }
-
-
-    /**
-     * As {@link #removeName(String)} is not necessarily unique
-     * (name + sheet index is unique), this method is more accurate.
-     *
-     * @param name the name to remove.
-     */
-    @Override
-    public void removeName(Name name) {
-      int index = getNameIndex((HSSFName) name);
-      removeName(index);
-    }
-
-    public HSSFPalette getCustomPalette()
-    {
-        return new HSSFPalette(workbook.getCustomPalette());
-    }
-
-    /** Test only. Do not use */
-    public void insertChartRecord()
-    {
-        int loc = workbook.findFirstRecordLocBySid(SSTRecord.sid);
-        byte[] data = {
-           (byte)0x0F, (byte)0x00, (byte)0x00, (byte)0xF0, (byte)0x52,
-           (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
-           (byte)0x06, (byte)0xF0, (byte)0x18, (byte)0x00, (byte)0x00,
-           (byte)0x00, (byte)0x01, (byte)0x08, (byte)0x00, (byte)0x00,
-           (byte)0x02, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x02,
-           (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x01, (byte)0x00,
-           (byte)0x00, (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x00,
-           (byte)0x00, (byte)0x03, (byte)0x00, (byte)0x00, (byte)0x00,
-           (byte)0x33, (byte)0x00, (byte)0x0B, (byte)0xF0, (byte)0x12,
-           (byte)0x00, (byte)0x00, (byte)0x00, (byte)0xBF, (byte)0x00,
-           (byte)0x08, (byte)0x00, (byte)0x08, (byte)0x00, (byte)0x81,
-           (byte)0x01, (byte)0x09, (byte)0x00, (byte)0x00, (byte)0x08,
-           (byte)0xC0, (byte)0x01, (byte)0x40, (byte)0x00, (byte)0x00,
-           (byte)0x08, (byte)0x40, (byte)0x00, (byte)0x1E, (byte)0xF1,
-           (byte)0x10, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x0D,
-           (byte)0x00, (byte)0x00, (byte)0x08, (byte)0x0C, (byte)0x00,
-           (byte)0x00, (byte)0x08, (byte)0x17, (byte)0x00, (byte)0x00,
-           (byte)0x08, (byte)0xF7, (byte)0x00, (byte)0x00, (byte)0x10,
-        };
-        UnknownRecord r = new UnknownRecord((short)0x00EB, data);
-        workbook.getRecords().add(loc, r);
-    }
-
-    /**
-     * Spits out a list of all the drawing records in the workbook.
-     */
-    public void dumpDrawingGroupRecords(boolean fat)
-    {
-        DrawingGroupRecord r = (DrawingGroupRecord) workbook.findFirstRecordBySid( DrawingGroupRecord.sid );
-        r.decode();
-        List<EscherRecord> escherRecords = r.getEscherRecords();
-        PrintWriter w = new PrintWriter(new OutputStreamWriter(System.out, Charset.defaultCharset()));
-        for (EscherRecord escherRecord : escherRecords) {
-            if (fat)
-                System.out.println(escherRecord.toString());
-            else
-                escherRecord.display(w, 0);
-        }
-        w.flush();
-    }
-
-    void initDrawings(){
-        DrawingManager2 mgr = workbook.findDrawingGroup();
-        if(mgr != null) {
-            for(HSSFSheet sh : _sheets)  {
-                sh.getDrawingPatriarch();
-            }
-        } else {
-            workbook.createDrawingGroup();
-        }
-    }
-
-    /**
-     * Adds a picture to the workbook.
-     *
-     * @param pictureData       The bytes of the picture
-     * @param format            The format of the picture.  One of <code>PICTURE_TYPE_*</code>
-     *
-     * @return the index to this picture (1 based).
-     * @see #PICTURE_TYPE_WMF
-     * @see #PICTURE_TYPE_EMF
-     * @see #PICTURE_TYPE_PICT
-     * @see #PICTURE_TYPE_PNG
-     * @see #PICTURE_TYPE_JPEG
-     * @see #PICTURE_TYPE_DIB
-     */
-    @SuppressWarnings("fallthrough")
-    @Override
-    public int addPicture(byte[] pictureData, int format)
-    {
-        initDrawings();
-
-        byte[] uid = DigestUtils.md5(pictureData);
-        EscherBlipRecord blipRecord;
-        int blipSize;
-        short escherTag;
-        switch (format) {
-            case PICTURE_TYPE_WMF:
-                // remove first 22 bytes if file starts with magic bytes D7-CD-C6-9A
-                // see also http://de.wikipedia.org/wiki/Windows_Metafile#Hinweise_zur_WMF-Spezifikation
-                if (LittleEndian.getInt(pictureData) == 0x9AC6CDD7) {
-                    byte picDataNoHeader[] = new byte[pictureData.length-22];
-                    System.arraycopy(pictureData, 22, picDataNoHeader, 0, pictureData.length-22);
-                    pictureData = picDataNoHeader;
-                }
-                // fall through
-            case PICTURE_TYPE_EMF:
-                EscherMetafileBlip blipRecordMeta = new EscherMetafileBlip();
-                blipRecord = blipRecordMeta;
-                blipRecordMeta.setUID(uid);
-                blipRecordMeta.setPictureData(pictureData);
-                // taken from libre office export, it won't open, if this is left to 0
-                blipRecordMeta.setFilter((byte)-2);
-                blipSize = blipRecordMeta.getCompressedSize() + 58;
-                escherTag = 0;
-                break;
-            default:
-                EscherBitmapBlip blipRecordBitmap = new EscherBitmapBlip();
-                blipRecord = blipRecordBitmap;
-                blipRecordBitmap.setUID( uid );
-                blipRecordBitmap.setMarker( (byte) 0xFF );
-                blipRecordBitmap.setPictureData( pictureData );
-                blipSize = pictureData.length + 25;
-                escherTag = (short) 0xFF;
-    	        break;
-        }
-
-        blipRecord.setRecordId((short) (EscherBlipRecord.RECORD_ID_START + format));
-        switch (format)
-        {
-            case PICTURE_TYPE_EMF:
-                blipRecord.setOptions(HSSFPictureData.MSOBI_EMF);
-                break;
-            case PICTURE_TYPE_WMF:
-                blipRecord.setOptions(HSSFPictureData.MSOBI_WMF);
-                break;
-            case PICTURE_TYPE_PICT:
-                blipRecord.setOptions(HSSFPictureData.MSOBI_PICT);
-                break;
-            case PICTURE_TYPE_PNG:
-                blipRecord.setOptions(HSSFPictureData.MSOBI_PNG);
-                break;
-            case PICTURE_TYPE_JPEG:
-                blipRecord.setOptions(HSSFPictureData.MSOBI_JPEG);
-                break;
-            case PICTURE_TYPE_DIB:
-                blipRecord.setOptions(HSSFPictureData.MSOBI_DIB);
-                break;
-            default:
-                throw new IllegalStateException("Unexpected picture format: " + format);
-        }
-
-        EscherBSERecord r = new EscherBSERecord();
-        r.setRecordId( EscherBSERecord.RECORD_ID );
-        r.setOptions( (short) ( 0x0002 | ( format << 4 ) ) );
-        r.setBlipTypeMacOS( (byte) format );
-        r.setBlipTypeWin32( (byte) format );
-        r.setUid( uid );
-        r.setTag( escherTag );
-        r.setSize( blipSize );
-        r.setRef( 0 );
-        r.setOffset( 0 );
-        r.setBlipRecord( blipRecord );
-
-        return workbook.addBSERecord( r );
-    }
-
-    /**
-     * Gets all pictures from the Workbook.
-     *
-     * @return the list of pictures (a list of {@link HSSFPictureData} objects.)
-     */
-    @Override
-    public List<HSSFPictureData> getAllPictures()
-    {
-        // The drawing group record always exists at the top level, so we won't need to do this recursively.
-        List<HSSFPictureData> pictures = new ArrayList<HSSFPictureData>();
-        for (Record r : workbook.getRecords()) {
-            if (r instanceof AbstractEscherHolderRecord) {
-                ((AbstractEscherHolderRecord) r).decode();
-                List<EscherRecord> escherRecords = ((AbstractEscherHolderRecord) r).getEscherRecords();
-                searchForPictures(escherRecords, pictures);
-            }
-        }
-        return Collections.unmodifiableList(pictures);
-    }
-
-    /**
-     * Performs a recursive search for pictures in the given list of escher records.
-     *
-     * @param escherRecords the escher records.
-     * @param pictures the list to populate with the pictures.
-     */
-    private void searchForPictures(List<EscherRecord> escherRecords, List<HSSFPictureData> pictures)
-    {
-        for(EscherRecord escherRecord : escherRecords) {
-
-            if (escherRecord instanceof EscherBSERecord)
-            {
-                EscherBlipRecord blip = ((EscherBSERecord) escherRecord).getBlipRecord();
-                if (blip != null)
-                {
-                    // TODO: Some kind of structure.
-                    HSSFPictureData picture = new HSSFPictureData(blip);
-					pictures.add(picture);
-                }
-
-
-            }
-
-            // Recursive call.
-            searchForPictures(escherRecord.getChildRecords(), pictures);
-        }
-
-    }
-
-    protected static Map<String,ClassID> getOleMap() {
-    	Map<String,ClassID> olemap = new HashMap<String,ClassID>();
-    	olemap.put("PowerPoint Document", ClassID.PPT_SHOW);
-    	for (String str : WORKBOOK_DIR_ENTRY_NAMES) {
-    		olemap.put(str, ClassID.XLS_WORKBOOK);
-    	}
-    	// ... to be continued
-    	return olemap;
-    }
-
-    public int addOlePackage(POIFSFileSystem poiData, String label, String fileName, String command)
-    throws IOException {
-    	DirectoryNode root = poiData.getRoot();
-    	Map<String,ClassID> olemap = getOleMap();
-    	for (Map.Entry<String,ClassID> entry : olemap.entrySet()) {
-    		if (root.hasEntry(entry.getKey())) {
-    			root.setStorageClsid(entry.getValue());
-    			break;
-    		}
-    	}
-
-    	ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    	poiData.writeFilesystem(bos);
-        return addOlePackage(bos.toByteArray(), label, fileName, command);
-    }
-
-    public int addOlePackage(byte[] oleData, String label, String fileName, String command)
-    throws IOException {
-    	// check if we were created by POIFS otherwise create a new dummy POIFS for storing the package data
-    	if (directory == null) {
-    		directory = new NPOIFSFileSystem().getRoot();
-    		preserveNodes = true;
-    	}
-
-        // get free MBD-Node
-        int storageId = 0;
-        DirectoryEntry oleDir = null;
-        do {
-            String storageStr = "MBD"+ HexDump.toHex(++storageId);
-            if (!directory.hasEntry(storageStr)) {
-                oleDir = directory.createDirectory(storageStr);
-                oleDir.setStorageClsid(ClassID.OLE10_PACKAGE);
-            }
-        } while (oleDir == null);
-
-        // the following data was taken from an example libre office document
-        // beside this "\u0001Ole" record there were several other records, e.g. CompObj,
-        // OlePresXXX, but it seems, that they aren't neccessary
-        byte oleBytes[] = { 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        oleDir.createDocument("\u0001Ole", new ByteArrayInputStream(oleBytes));
-
-        Ole10Native oleNative = new Ole10Native(label, fileName, command, oleData);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        oleNative.writeOut(bos);
-        oleDir.createDocument(Ole10Native.OLE10_NATIVE, new ByteArrayInputStream(bos.toByteArray()));
-
-    	return storageId;
-    }
-
-    /**
-     * Adds the LinkTable records required to allow formulas referencing
-     *  the specified external workbook to be added to this one. Allows
-     *  formulas such as "[MyOtherWorkbook]Sheet3!$A$5" to be added to the
-     *  file, for workbooks not already referenced.
-     *
-     * @param name The name the workbook will be referenced as in formulas
-     * @param workbook The open workbook to fetch the link required information from
-     */
-    @Override
-    public int linkExternalWorkbook(String name, Workbook workbook) {
-        return this.workbook.linkExternalWorkbook(name, workbook);
-    }
-
-    /**
-     * Is the workbook protected with a password (not encrypted)?
-     */
-    public boolean isWriteProtected() {
-        return this.workbook.isWriteProtected();
-    }
-
-    /**
-     * protect a workbook with a password (not encypted, just sets writeprotect
-     * flags and the password.
-     * @param password to set
-     */
-    public void writeProtectWorkbook( String password, String username ) {
-       this.workbook.writeProtectWorkbook(password, username);
-    }
-
-    /**
-     * removes the write protect flag
-     */
-    public void unwriteProtectWorkbook() {
-       this.workbook.unwriteProtectWorkbook();
-    }
-
-    /**
-     * Gets all embedded OLE2 objects from the Workbook.
-     *
-     * @return the list of embedded objects (a list of {@link HSSFObjectData} objects.)
-     */
-    public List<HSSFObjectData> getAllEmbeddedObjects()
-    {
-        List<HSSFObjectData> objects = new ArrayList<HSSFObjectData>();
-        for (HSSFSheet sheet : _sheets)
-        {
-            getAllEmbeddedObjects(sheet, objects);
-        }
-        return Collections.unmodifiableList(objects);
-    }
-
-    /**
-     * Gets all embedded OLE2 objects from the Workbook.
-     *
-     * @param sheet embedded object attached to
-     * @param objects the list of embedded objects to populate.
-     */
-    private void getAllEmbeddedObjects(HSSFSheet sheet, List<HSSFObjectData> objects)
-    {
-        HSSFPatriarch patriarch = sheet.getDrawingPatriarch();
-        if (null == patriarch){
-            return;
-        }
-        getAllEmbeddedObjects(patriarch, objects);
-    }
-    /**
-     * Recursively iterates a shape container to get all embedded objects.
-     *
-     * @param parent the parent.
-     * @param objects the list of embedded objects to populate.
-     */
-    private void getAllEmbeddedObjects(HSSFShapeContainer parent, List<HSSFObjectData> objects)
-    {
-        for (HSSFShape shape : parent.getChildren()) {
-            if (shape instanceof HSSFObjectData) {
-                objects.add((HSSFObjectData) shape);
-            } else if (shape instanceof HSSFShapeContainer) {
-                getAllEmbeddedObjects((HSSFShapeContainer) shape, objects);
-            }
-        }
-    }
-    @Override
-    public HSSFCreationHelper getCreationHelper() {
-        return new HSSFCreationHelper(this);
-    }
-
-    /**
-     *
-     * Returns the locator of user-defined functions.
-     * The default instance extends the built-in functions with the Analysis Tool Pack
-     *
-     * @return the locator of user-defined functions
-     */
-    /*package*/ UDFFinder getUDFFinder(){
-        return _udfFinder;
-    }
-
-    /**
-     * Register a new toolpack in this workbook.
-     *
-     * @param toopack the toolpack to register
-     */
-    @Override
-    public void addToolPack(UDFFinder toopack){
-        AggregatingUDFFinder udfs = (AggregatingUDFFinder)_udfFinder;
-        udfs.add(toopack);
-    }
-
-    /**
-     * Whether the application shall perform a full recalculation when the workbook is opened.
-     * <p>
-     * Typically you want to force formula recalculation when you modify cell formulas or values
-     * of a workbook previously created by Excel. When set to true, this flag will tell Excel
-     * that it needs to recalculate all formulas in the workbook the next time the file is opened.
-     * </p>
-     * <p>
-     * Note, that recalculation updates cached formula results and, thus, modifies the workbook.
-     * Depending on the version, Excel may prompt you with "Do you want to save the changes in <em>filename</em>?"
-     * on close.
-     * </p>
-     *
-     * @param value true if the application will perform a full recalculation of
-     * workbook values when the workbook is opened
-     * @since 3.8
-     */
-    @Override
-    public void setForceFormulaRecalculation(boolean value){
-        InternalWorkbook iwb = getWorkbook();
-        RecalcIdRecord recalc = iwb.getRecalcId();
-        recalc.setEngineId(0);
-    }
-
-    /**
-     * Whether Excel will be asked to recalculate all formulas when the  workbook is opened.
-     *
-     * @since 3.8
-     */
-    @Override
-    public boolean getForceFormulaRecalculation(){
-        InternalWorkbook iwb = getWorkbook();
-        RecalcIdRecord recalc = (RecalcIdRecord)iwb.findFirstRecordBySid(RecalcIdRecord.sid);
-        return recalc != null && recalc.getEngineId() != 0;
-    }
-
-	/**
-	 * Changes an external referenced file to another file.
-	 * A formula in Excel which references a cell in another file is saved in two parts:
-	 * The referenced file is stored in an reference table. the row/cell information is saved separate.
-	 * This method invocation will only change the reference in the lookup-table itself.
-	 * @param oldUrl The old URL to search for and which is to be replaced
-	 * @param newUrl The URL replacement
-	 * @return true if the oldUrl was found and replaced with newUrl. Otherwise false
-	 */
-    public boolean changeExternalReference(String oldUrl, String newUrl) {
-    	return workbook.changeExternalReference(oldUrl, newUrl);
-    }
-
-    public DirectoryNode getRootDirectory(){
-        return directory;
-    }
-    
-    @Internal
-    public InternalWorkbook getInternalWorkbook() {
-        return workbook;
-    }
-    
-    /**
-     * Returns the spreadsheet version (EXCLE97) of this workbook
-     * 
-     * @return EXCEL97 SpreadsheetVersion enum
-     * @since 3.14 beta 2
-     */
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion() {
-        return SpreadsheetVersion.EXCEL97;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java b/trunk/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
deleted file mode 100644
index 94a4e3b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-
-/**
- * Common class for {@link HSSFHeader} and {@link HSSFFooter}.
- */
-public abstract class HeaderFooter implements org.apache.poi.ss.usermodel.HeaderFooter {
-
-	protected HeaderFooter() {
-		//
-	}
-	
-	/**
-	 * @return the internal text representation (combining center, left and right parts).
-	 * Possibly empty string if no header or footer is set.  Never <code>null</code>.
-	 */
-	protected abstract String getRawText(); 
-	
-	private String[] splitParts() {
-		String text = getRawText();
-		// default values
-		String _left = "";
-		String _center = "";
-		String _right = "";
-
-outer:
-		while (text.length() > 1) {
-			if (text.charAt(0) != '&') {
-				// Mimics the behaviour of Excel, which would put it in the center.
-				_center = text;
-				break;
-			}
-			int pos = text.length();
-			switch (text.charAt(1)) {
-			case 'L':
-				if (text.indexOf("&C") >= 0) {
-					pos = Math.min(pos, text.indexOf("&C"));
-				}
-				if (text.indexOf("&R") >= 0) {
-					pos = Math.min(pos, text.indexOf("&R"));
-				}
-				_left = text.substring(2, pos);
-				text = text.substring(pos);
-				break;
-			case 'C':
-				if (text.indexOf("&L") >= 0) {
-					pos = Math.min(pos, text.indexOf("&L"));
-				}
-				if (text.indexOf("&R") >= 0) {
-					pos = Math.min(pos, text.indexOf("&R"));
-				}
-				_center = text.substring(2, pos);
-				text = text.substring(pos);
-				break;
-			case 'R':
-				if (text.indexOf("&C") >= 0) {
-					pos = Math.min(pos, text.indexOf("&C"));
-				}
-				if (text.indexOf("&L") >= 0) {
-					pos = Math.min(pos, text.indexOf("&L"));
-				}
-				_right = text.substring(2, pos);
-				text = text.substring(pos);
-				break;
-			default:
-				// Mimics the behaviour of Excel, which would put it in the center.
-				_center = text;
-				break outer;
-			}
-		}
-		return new String[] { _left, _center, _right, };
-	}
-
-	/**
-	 * @return the left side of the header or footer.
-	 */
-	public final String getLeft() {
-		return splitParts()[0];
-	}
-
-	/**
-	 * @param newLeft The string to set as the left side.
-	 */
-	public final void setLeft(String newLeft) {
-		updatePart(0, newLeft); 
-	}
-
-	/**
-	 * @return the center of the header or footer.
-	 */
-	public final String getCenter() {
-		return splitParts()[1];
-	}
-
-	/**
-	 * @param newCenter The string to set as the center.
-	 */
-	public final void setCenter(String newCenter) {
-		updatePart(1, newCenter); 
-	}
-
-	/**
-	 * @return The right side of the header or footer.
-	 */
-	public final String getRight() {
-		return splitParts()[2];
-	}
-
-	/**
-	 * @param newRight The string to set as the right side.
-	 */
-	public final void setRight(String newRight) {
-		updatePart(2, newRight); 
-	}
-	
-	private void updatePart(int partIndex, String newValue) {
-		String[] parts = splitParts();
-		parts[partIndex] = newValue == null ? "" : newValue;
-		updateHeaderFooterText(parts);
-	}
-	/**
-	 * Creates the complete footer string based on the left, center, and middle
-	 * strings.
-	 */
-	private void updateHeaderFooterText(String[] parts) {
-		String _left = parts[0];
-		String _center = parts[1];
-		String _right = parts[2];
-		
-		if (_center.length() < 1 && _left.length() < 1 && _right.length() < 1) {
-			setHeaderFooterText("");
-			return;
-		}
-		StringBuilder sb = new StringBuilder(64);
-		sb.append("&C");
-		sb.append(_center);
-		sb.append("&L");
-		sb.append(_left);
-		sb.append("&R");
-		sb.append(_right);
-		String text = sb.toString();
-		setHeaderFooterText(text);
-	}
-
-	/**
-	 * @param text the new header footer text (contains mark-up tags). Possibly
-	 *            empty string never <code>null</code>
-	 */
-	protected abstract void setHeaderFooterText(String text);
-
-	/**
-	 * @param size
-	 *            the new font size
-	 * @return The mark-up tag representing a new font size
-	 */
-	public static String fontSize(short size) {
-		return "&" + size;
-	}
-
-	/**
-	 * @param font
-	 *            the new font
-	 * @param style
-	 *            the fonts style, one of regular, italic, bold, italic bold or
-	 *            bold italic
-	 * @return The mark-up tag representing a new font size
-	 */
-	public static String font(String font, String style) {
-		return "&\"" + font + "," + style + "\"";
-	}
-
-	/**
-	 * @return The mark-up tag representing the current page number
-	 */
-	public static String page() {
-		return MarkupTag.PAGE_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag representing the number of pages
-	 */
-	public static String numPages() {
-		return MarkupTag.NUM_PAGES_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag representing the current date date
-	 */
-	public static String date() {
-		return MarkupTag.DATE_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag representing current time
-	 */
-	public static String time() {
-		return MarkupTag.TIME_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag representing the current file name
-	 */
-	public static String file() {
-		return MarkupTag.FILE_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag representing the current tab (sheet) name
-	 */
-	public static String tab() {
-		return MarkupTag.SHEET_NAME_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag for start bold
-	 */
-	public static String startBold() {
-		return MarkupTag.BOLD_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag for end bold
-	 */
-	public static String endBold() {
-		return MarkupTag.BOLD_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag for start underline
-	 */
-	public static String startUnderline() {
-		return MarkupTag.UNDERLINE_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag for end underline
-	 */
-	public static String endUnderline() {
-		return MarkupTag.UNDERLINE_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag for start double underline
-	 */
-	public static String startDoubleUnderline() {
-		return MarkupTag.DOUBLE_UNDERLINE_FIELD.getRepresentation();
-	}
-
-	/**
-	 * @return The mark-up tag for end double underline
-	 */
-	public static String endDoubleUnderline() {
-		return MarkupTag.DOUBLE_UNDERLINE_FIELD.getRepresentation();
-	}
-
-	/**
-	 * Removes any fields (eg macros, page markers etc) from the string.
-	 * Normally used to make some text suitable for showing to humans, and the
-	 * resultant text should not normally be saved back into the document!
-	 */
-	public static String stripFields(String pText) {
-		int pos;
-
-		// Check we really got something to work on
-		if (pText == null || pText.length() == 0) {
-			return pText;
-		}
-
-		String text = pText;
-
-		// Firstly, do the easy ones which are static
-		for (MarkupTag mt : MarkupTag.values()) {
-			String seq = mt.getRepresentation();
-			while ((pos = text.indexOf(seq)) > -1) {
-				text = text.substring(0, pos) + text.substring(pos + seq.length());
-			}
-		}
-
-		// Now do the tricky, dynamic ones
-		// These are things like font sizes and font names
-		text = text.replaceAll("\\&\\d+", "");
-		text = text.replaceAll("\\&\".*?,.*?\"", "");
-
-		// All done
-		return text;
-	}
-
-	private enum MarkupTag {
-		SHEET_NAME_FIELD ("&A", false),
-		DATE_FIELD       ("&D", false),
-		FILE_FIELD       ("&F", false),
-		FULL_FILE_FIELD  ("&Z", false),
-		PAGE_FIELD       ("&P", false),
-		TIME_FIELD       ("&T", false),
-		NUM_PAGES_FIELD  ("&N", false),
-
-		PICTURE_FIELD    ("&G", false),
-
-		BOLD_FIELD             ("&B", true),
-		ITALIC_FIELD           ("&I", true),
-		STRIKETHROUGH_FIELD    ("&S", true),
-		SUBSCRIPT_FIELD        ("&Y", true),
-		SUPERSCRIPT_FIELD      ("&X", true),
-		UNDERLINE_FIELD        ("&U", true),
-		DOUBLE_UNDERLINE_FIELD ("&E", true),
-		;
-		
-		private final String _representation;
-		private final boolean _occursInPairs;
-		private MarkupTag(String sequence, boolean occursInPairs) {
-			_representation = sequence;
-			_occursInPairs = occursInPairs;
-		}
-		/**
-		 * @return The character sequence that marks this field
-		 */
-		public String getRepresentation() {
-			return _representation;
-		}
-
-		/**
-		 * @return true if this markup tag normally comes in a pair, eg turn on
-		 *         underline / turn off underline
-		 */
-		public boolean occursPairs() {
-			return _occursInPairs;
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java b/trunk/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
deleted file mode 100644
index fcfd23f..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.awt.Font;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Allows the user to lookup the font metrics for a particular font without
- * actually having the font on the system. The font details are loaded as a
- * resource from the POI jar file (or classpath) and should be contained in path
- * "/font_metrics.properties". The font widths are for a 10 point version of the
- * font. Use a multiplier for other sizes.
- */
-final class StaticFontMetrics {
-    private static final POILogger LOGGER = POILogFactory.getLogger(StaticFontMetrics.class);
-	/** The font metrics property file we're using */
-	private static Properties fontMetricsProps;
-	/** Our cache of font details we've already looked up */
-	private static final Map<String, FontDetails> fontDetailsMap = new HashMap<String, FontDetails>();
-
-	private StaticFontMetrics() {}
-	
-	/**
-	 * Retrieves the fake font details for a given font.
-	 *
-	 * @param font
-	 *            the font to lookup.
-	 * @return the fake font.
-	 */
-	public static synchronized FontDetails getFontDetails(Font font) {
-		// If we haven't already identified out font metrics file,
-		// figure out which one to use and load it
-		if (fontMetricsProps == null) {
-		    try {
-		        fontMetricsProps = loadMetrics();
-		    } catch (IOException e) {
-		        throw new RuntimeException("Could not load font metrics", e);
-		    }
-		}
-
-		// Grab the base name of the font they've asked about
-		String fontName = font.getName();
-
-		// Some fonts support plain/bold/italic/bolditalic variants
-		// Others have different font instances for bold etc
-		// (eg font.dialog.plain.* vs font.Californian FB Bold.*)
-		String fontStyle = "";
-		if (font.isPlain()) {
-			fontStyle += "plain";
-		}
-		if (font.isBold()) {
-			fontStyle += "bold";
-		}
-		if (font.isItalic()) {
-			fontStyle += "italic";
-		}
-
-		// Do we have a definition for this font with just the name?
-		// If not, check with the font style added
-		String fontHeight = FontDetails.buildFontHeightProperty(fontName);
-		String styleHeight = FontDetails.buildFontHeightProperty(fontName + "." + fontStyle);
-		
-		if (fontMetricsProps.get(fontHeight) == null
-			&& fontMetricsProps.get(styleHeight) != null) {
-			// Need to add on the style to the font name
-			fontName += "." + fontStyle;
-		}
-
-		// Get the details on this font
-		FontDetails fontDetails = fontDetailsMap.get(fontName);
-		if (fontDetails == null) {
-			fontDetails = FontDetails.create(fontName, fontMetricsProps);
-			fontDetailsMap.put(fontName, fontDetails);
-		}
-        return fontDetails;
-	}
-	
-	private static Properties loadMetrics() throws IOException {
-        // Check to see if the font metric file was specified
-        // as a system property
-        File propFile = null;
-        try {
-            String propFileName = System.getProperty("font.metrics.filename");
-            if (propFileName != null) {
-                propFile = new File(propFileName);
-                if (!propFile.exists()) {
-                    LOGGER.log(POILogger.WARN, "font_metrics.properties not found at path "+propFile.getAbsolutePath());
-                    propFile = null;
-                }
-            }
-        } catch (SecurityException e) {
-            LOGGER.log(POILogger.WARN, "Can't access font.metrics.filename system property", e);
-        }
-
-        InputStream metricsIn = null;
-        try {
-            if (propFile != null) {
-                metricsIn = new FileInputStream(propFile);
-            } else {
-                // Use the built-in font metrics file off the classpath
-                metricsIn =  FontDetails.class.getResourceAsStream("/font_metrics.properties");
-                if (metricsIn == null) {
-                    String err = "font_metrics.properties not found in classpath";
-                    throw new IOException(err);
-                }
-            }
-
-            Properties props = new Properties();
-            props.load(metricsIn);
-            return props;
-        } finally {
-            if (metricsIn != null) {
-                metricsIn.close();
-            }
-        }
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java b/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
deleted file mode 100644
index 88a6f9b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel.helpers;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.helpers.RowShifter;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Helper for shifting rows up or down
- * 
- * When possible, code should be implemented in the RowShifter abstract class to avoid duplication with {@link org.apache.poi.xssf.usermodel.helpers.XSSFRowShifter}
- */
-public final class HSSFRowShifter extends RowShifter {
-    private static final POILogger logger = POILogFactory.getLogger(HSSFRowShifter.class);
-
-    public HSSFRowShifter(HSSFSheet sh) {
-        super(sh);
-    }
-
-    @NotImplemented
-    public void updateNamedRanges(FormulaShifter shifter) {
-        throw new NotImplementedException("HSSFRowShifter.updateNamedRanges");
-    }
-
-    @NotImplemented
-    public void updateFormulas(FormulaShifter shifter) {
-        throw new NotImplementedException("updateFormulas");
-    }
-
-    @Internal
-    @NotImplemented
-    public void updateRowFormulas(Row row, FormulaShifter shifter) {
-        throw new NotImplementedException("updateRowFormulas");
-    }
-
-    @NotImplemented
-    public void updateConditionalFormatting(FormulaShifter shifter) {
-        throw new NotImplementedException("updateConditionalFormatting");
-    }
-    
-    @NotImplemented
-    public void updateHyperlinks(FormulaShifter shifter) {
-        throw new NotImplementedException("updateHyperlinks");
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/usermodel/package.html b/trunk/src/java/org/apache/poi/hssf/usermodel/package.html
deleted file mode 100644
index 5779057..0000000
--- a/trunk/src/java/org/apache/poi/hssf/usermodel/package.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-usermodel package maps HSSF low level strutures to familiar workbook/sheet model
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/hssf/util/AreaReference.java b/trunk/src/java/org/apache/poi/hssf/util/AreaReference.java
deleted file mode 100644
index 3474abf..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/AreaReference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-/**
- * @deprecated POI 3.15 beta 3. Use {@link org.apache.poi.ss.util.AreaReference} instead.
- */
-@Deprecated
-public final class AreaReference extends org.apache.poi.ss.util.AreaReference {
-    /**
-     * Create an area ref from a string representation.  Sheet names containing special characters should be
-     * delimited and escaped as per normal syntax rules for formulas.<br/> 
-     * The area reference must be contiguous (i.e. represent a single rectangle, not a union of rectangles)
-     */
-    public AreaReference(String reference) {
-		super(reference);
-    }
-    
-    /**
-     * Creates an area ref from a pair of Cell References.
-     * Also normalises such that the top-left
-     */
-    public AreaReference(CellReference topLeft, CellReference botRight) {
-		super(topLeft, botRight);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java b/trunk/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
deleted file mode 100644
index 9c866f9..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import org.apache.poi.ss.util.CellRangeAddressBase;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * See OOO documentation: excelfileformat.pdf sec 2.5.14 - 'Cell Range Address'<p/>
- *
- * Implements a CellRangeAddress with 8-but column fields.
- */
-public final class CellRangeAddress8Bit extends CellRangeAddressBase {
-
-	public static final int ENCODED_SIZE = 6;
-
-	public CellRangeAddress8Bit(int firstRow, int lastRow, int firstCol, int lastCol) {
-		super(firstRow, lastRow, firstCol, lastCol);
-	}
-
-	public CellRangeAddress8Bit(LittleEndianInput in) {
-		super(readUShortAndCheck(in), in.readUShort(), in.readUByte(), in.readUByte());
-	}
-
-	private static int readUShortAndCheck(LittleEndianInput in) {
-		if (in.available() < ENCODED_SIZE) {
-			// Ran out of data
-			throw new RuntimeException("Ran out of data reading CellRangeAddress");
-		}
-		return in.readUShort();
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(getFirstRow());
-		out.writeShort(getLastRow());
-		out.writeByte(getFirstColumn());
-		out.writeByte(getLastColumn());
-	}
-
-	public CellRangeAddress8Bit copy() {
-		return new CellRangeAddress8Bit(getFirstRow(), getLastRow(), getFirstColumn(), getLastColumn());
-	}
-
-	public static int getEncodedSize(int numberOfItems) {
-		return numberOfItems * ENCODED_SIZE;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/CellReference.java b/trunk/src/java/org/apache/poi/hssf/util/CellReference.java
deleted file mode 100644
index ac3e5f3..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/CellReference.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-/**
- * Common conversion functions between Excel style A1, C27 style
- *  cell references, and POI usermodel style row=0, column=0
- *  style references.
- */
-public final class CellReference extends org.apache.poi.ss.util.CellReference {
-    /**
-     * Create an cell ref from a string representation.  Sheet names containing special characters should be
-     * delimited and escaped as per normal syntax rules for formulas.
-     */
-    public CellReference(String cellRef) {
-    	super(cellRef);
-    }
-
-    public CellReference(int pRow, int pCol) {
-    	super(pRow, pCol, true, true);
-    }
-    
-    public CellReference(int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {
-        super(null, pRow, pCol, pAbsRow, pAbsCol);
-    }
-
-    public CellReference(String pSheetName, int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {
-    	super(pSheetName, pRow, pCol, pAbsRow, pAbsCol);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java b/trunk/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
deleted file mode 100644
index ae46a5a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.util.CellUtil;
-import org.apache.poi.util.Removal;
-
-/**
- * Various utility functions that make working with a cells and rows easier.  The various
- * methods that deal with style's allow you to create your HSSFCellStyles as you need them.
- * When you apply a style change to a cell, the code will attempt to see if a style already
- * exists that meets your needs.  If not, then it will create a new style.  This is to prevent
- * creating too many styles.  there is an upper limit in Excel on the number of styles that
- * can be supported.
- * 
- * @deprecated 3.15 beta2. Use {@link org.apache.poi.ss.util.CellUtil} instead.
- */
-@Deprecated
-@Removal(version="3.17")
-public final class HSSFCellUtil {
-
-    private HSSFCellUtil() {
-        // no instances of this class
-    }
-
-    /**
-     *  Get a row from the spreadsheet, and create it if it doesn't exist.
-     *
-     * @param  rowIndex  The 0 based row number
-     * @param  sheet       The sheet that the row is part of.
-     * @return             The row indicated by the rowCounter
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#getRow} instead.
-     */
-    public static HSSFRow getRow(int rowIndex, HSSFSheet sheet) {
-    	return (HSSFRow) CellUtil.getRow(rowIndex, sheet);
-    }
-
-    /**
-     * Get a specific cell from a row. If the cell doesn't exist,
-     *  then create it.
-     *
-     * @param  row     The row that the cell is part of
-     * @param  columnIndex  The column index that the cell is in.
-     * @return         The cell indicated by the column.
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#getCell} instead.
-     */
-    public static HSSFCell getCell(HSSFRow row, int columnIndex) {
-        return (HSSFCell) CellUtil.getCell(row, columnIndex);
-    }
-
-    /**
-     *  Creates a cell, gives it a value, and applies a style if provided
-     *
-     * @param  row     the row to create the cell in
-     * @param  column  the column index to create the cell in
-     * @param  value   The value of the cell
-     * @param  style   If the style is not null, then set
-     * @return         A new HSSFCell
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#createCell} instead.
-     */
-    public static HSSFCell createCell(HSSFRow row, int column, String value, HSSFCellStyle style) {
-    	return (HSSFCell) CellUtil.createCell(row, column, value, style);
-    }
-
-    /**
-     *  Create a cell, and give it a value.
-     *
-     * @param  row     the row to create the cell in
-     * @param  column  the column index to create the cell in
-     * @param  value   The value of the cell
-     * @return         A new HSSFCell.
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#createCell} instead.
-     */
-    public static HSSFCell createCell(HSSFRow row, int column, String value) {
-        return createCell( row, column, value, null );
-    }
-
-    /**
-     *  Take a cell, and align it.
-     *
-     * @param  cell     the cell to set the alignment for
-     * @param  workbook               The workbook that is being worked with.
-     * @param  align  the column alignment to use.
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#setAlignment} instead.
-     *
-     * @see HSSFCellStyle for alignment options
-     */
-    public static void setAlignment(HSSFCell cell, HSSFWorkbook workbook, short align) {
-    	setAlignment(cell, HorizontalAlignment.forInt(align));
-    }
-    /**
-     *  Take a cell, and align it.
-     *
-     * @param  cell     the cell to set the alignment for
-     * @param  align  the column alignment to use.
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#setAlignment} instead.
-     *
-     * @see HSSFCellStyle for alignment options
-     */
-    public static void setAlignment(HSSFCell cell, HorizontalAlignment align) {
-        CellUtil.setAlignment(cell, align);
-    }
-
-    /**
-     *  Take a cell, and apply a font to it
-     *
-     * @param  cell     the cell to set the alignment for
-     * @param  workbook  The workbook that is being worked with.
-     * @param  font  The HSSFFont that you want to set.
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#setFont} instead.
-     */
-    public static void setFont(HSSFCell cell, HSSFWorkbook workbook, HSSFFont font) {
-    	CellUtil.setFont(cell, font);
-    }
-
-    /**
-     *  This method attempt to find an already existing HSSFCellStyle that matches
-     *  what you want the style to be. If it does not find the style, then it
-     *  creates a new one. If it does create a new one, then it applies the
-     *  propertyName and propertyValue to the style. This is necessary because
-     *  Excel has an upper limit on the number of Styles that it supports.
-     *
-     * @param  workbook               The workbook that is being worked with.
-     * @param  propertyName           The name of the property that is to be changed.
-     * @param  propertyValue          The value of the property that is to be changed.
-     * @param  cell                   The cell that needs it's style changes
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#setCellStyleProperty} instead.
-     */
-    public static void setCellStyleProperty(HSSFCell cell, HSSFWorkbook workbook,
-			String propertyName, Object propertyValue) {
-    	CellUtil.setCellStyleProperty(cell, propertyName, propertyValue);
-    }
-
-    /**
-     *  Looks for text in the cell that should be unicode, like &alpha; and provides the
-     *  unicode version of it.
-     *
-     * @param  cell  The cell to check for unicode values
-     * @return       translated to unicode (the cell is modified in-place and returned)
-     * 
-     * @deprecated 3.15 beta2. Removed in 3.17. Use {@link org.apache.poi.ss.util.CellUtil#translateUnicodeValues} instead.
-     */
-    public static HSSFCell translateUnicodeValues(HSSFCell cell){
-    	CellUtil.translateUnicodeValues(cell);
-    	return cell;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java b/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java
deleted file mode 100644
index 55ff46b..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java
+++ /dev/null
@@ -1,1717 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import java.lang.reflect.Field;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.Color;
-
-
-/**
- * Intends to provide support for the very evil index to triplet issue and
- * will likely replace the color constants interface for HSSF 2.0.
- * This class contains static inner class members for representing colors.
- * Each color has an index (for the standard palette in Excel (tm) ),
- * native (RGB) triplet and string triplet.  The string triplet is as the
- * color would be represented by Gnumeric.  Having (string) this here is a bit of a
- * collusion of function between HSSF and the HSSFSerializer but I think its
- * a reasonable one in this case.
- */
-public class HSSFColor implements Color {
-    private static Map<Integer,HSSFColor> indexHash; 
-
-    /** Creates a new instance of HSSFColor */
-    public HSSFColor()
-    {
-    }
-
-    /**
-     * This function returns all the colours in an unmodifiable Map.
-     * The map is cached on first use.
-     *
-     * @return a Map containing all colours keyed by <tt>Integer</tt> excel-style palette indexes
-     */
-    public final static Map<Integer,HSSFColor> getIndexHash() {
-        if(indexHash == null) {
-           indexHash = Collections.unmodifiableMap( createColorsByIndexMap() );
-        }
-
-        return indexHash;
-    }
-    /**
-     * This function returns all the Colours, stored in a Map that
-     *  can be edited. No caching is performed. If you don't need to edit
-     *  the table, then call {@link #getIndexHash()} which returns a
-     *  statically cached imuatable map of colours.
-     */
-    public final static Map<Integer,HSSFColor> getMutableIndexHash() {
-       return createColorsByIndexMap();
-    }
-
-    private static Map<Integer,HSSFColor> createColorsByIndexMap() {
-        HSSFColor[] colors = getAllColors();
-        Map<Integer,HSSFColor> result = new HashMap<Integer,HSSFColor>(colors.length * 3 / 2);
-
-        for (int i = 0; i < colors.length; i++) {
-            HSSFColor color = colors[i];
-
-            Integer index1 = Integer.valueOf(color.getIndex());
-            if (result.containsKey(index1)) {
-                HSSFColor prevColor = result.get(index1);
-                throw new RuntimeException("Dup color index (" + index1
-                        + ") for colors (" + prevColor.getClass().getName()
-                        + "),(" + color.getClass().getName() + ")");
-            }
-            result.put(index1, color);
-        }
-
-        for (int i = 0; i < colors.length; i++) {
-            HSSFColor color = colors[i];
-            Integer index2 = getIndex2(color);
-            if (index2 == null) {
-                // most colors don't have a second index
-                continue;
-            }
-//            if (result.containsKey(index2)) {
-//                if (false) { // Many of the second indexes clash
-//                    HSSFColor prevColor = (HSSFColor)result.get(index2);
-//                    throw new RuntimeException("Dup color index (" + index2
-//                            + ") for colors (" + prevColor.getClass().getName()
-//                            + "),(" + color.getClass().getName() + ")");
-//                }
-//            }
-            result.put(index2, color);
-        }
-        return result;
-    }
-
-    private static Integer getIndex2(HSSFColor color) {
-
-        Field f;
-        try {
-            f = color.getClass().getDeclaredField("index2");
-        } catch (NoSuchFieldException e) {
-            // can happen because not all colors have a second index
-            return null;
-        }
-
-        Short s;
-        try {
-            s = (Short) f.get(color);
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-        return Integer.valueOf(s.intValue());
-    }
-
-    private static HSSFColor[] getAllColors() {
-
-        return new HSSFColor[] {
-                new BLACK(), new BROWN(), new OLIVE_GREEN(), new DARK_GREEN(),
-                new DARK_TEAL(), new DARK_BLUE(), new INDIGO(), new GREY_80_PERCENT(),
-                new ORANGE(), new DARK_YELLOW(), new GREEN(), new TEAL(), new BLUE(),
-                new BLUE_GREY(), new GREY_50_PERCENT(), new RED(), new LIGHT_ORANGE(), new LIME(),
-                new SEA_GREEN(), new AQUA(), new LIGHT_BLUE(), new VIOLET(), new GREY_40_PERCENT(),
-                new PINK(), new GOLD(), new YELLOW(), new BRIGHT_GREEN(), new TURQUOISE(),
-                new DARK_RED(), new SKY_BLUE(), new PLUM(), new GREY_25_PERCENT(), new ROSE(),
-                new LIGHT_YELLOW(), new LIGHT_GREEN(), new LIGHT_TURQUOISE(), new PALE_BLUE(),
-                new LAVENDER(), new WHITE(), new CORNFLOWER_BLUE(), new LEMON_CHIFFON(),
-                new MAROON(), new ORCHID(), new CORAL(), new ROYAL_BLUE(),
-                new LIGHT_CORNFLOWER_BLUE(), new TAN(),
-        };
-    }
-
-    /**
-     * this function returns all colors in a hastable.  Its not implemented as a
-     * static member/staticly initialized because that would be dirty in a
-     * server environment as it is intended.  This means you'll eat the time
-     * it takes to create it once per request but you will not hold onto it
-     * if you have none of those requests.
-     *
-     * @return a Map containing all colors keyed by String gnumeric-like triplets
-     */
-    public final static Map<String,HSSFColor> getTripletHash()
-    {
-        return createColorsByHexStringMap();
-    }
-
-    private static Map<String,HSSFColor> createColorsByHexStringMap() {
-        HSSFColor[] colors = getAllColors();
-        Map<String,HSSFColor> result = new HashMap<String,HSSFColor>(colors.length * 3 / 2);
-
-        for (int i = 0; i < colors.length; i++) {
-            HSSFColor color = colors[i];
-
-            String hexString = color.getHexString();
-            if (result.containsKey(hexString)) {
-            	HSSFColor other = result.get(hexString);
-                throw new RuntimeException(
-                		"Dup color hexString (" + hexString
-                        + ") for color (" + color.getClass().getName() + ") - "
-                        + " already taken by (" + other.getClass().getName() + ")"
-                );
-            }
-            result.put(hexString, color);
-        }
-        return result;
-    }
-
-    /**
-     * returns color standard palette index (0x08)
-     * @return index to the standard palette
-     */
-
-    public short getIndex()
-    {
-        // this will be overridden by the specific color subclass
-        return BLACK.index;
-    }
-
-    /**
-     * returns  RGB triplet (0, 0, 0)
-     * @return  triplet representation like that in Excel
-     */
-
-    public short [] getTriplet()
-    {
-        // this will be overridden by the specific color subclass
-        return BLACK.triplet;
-    }
-
-    /**
-     * returns colon-delimited hex string "0:0:0"
-     * @return a hex string exactly like a gnumeric triplet
-     */
-
-    public String getHexString()
-    {
-        // this will be overridden by the specific color subclass
-        return BLACK.hexString;
-    }
-    
-    /**
-     * Checked type cast <tt>color</tt> to an HSSFColor.
-     *
-     * @param color the color to type cast
-     * @return the type casted color
-     * @throws IllegalArgumentException if color is null or is not an instance of HSSFColor
-     */
-    public static HSSFColor toHSSFColor(Color color) {
-        // FIXME: this method would be more useful if it could convert any Color to an HSSFColor
-        // Currently the only benefit of this method is to throw an IllegalArgumentException
-        // instead of a ClassCastException.
-        if (color != null && !(color instanceof HSSFColor)) {
-            throw new IllegalArgumentException("Only HSSFColor objects are supported");
-        }
-        return (HSSFColor)color;
-    }
-
-    /**
-     * Class BLACK
-     *
-     */
-
-    public final static class BLACK
-        extends HSSFColor
-    {
-        public final static short   index     = 0x8;
-        public final static short[] triplet   =
-        {
-            0, 0, 0
-        };
-        public final static String  hexString = "0:0:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class BROWN
-     *
-     */
-
-    public final static class BROWN
-        extends HSSFColor
-    {
-        public final static short   index     = 0x3c;
-        public final static short[] triplet   =
-        {
-            153, 51, 0
-        };
-        public final static String  hexString = "9999:3333:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class OLIVE_GREEN
-     *
-     */
-
-    public static class OLIVE_GREEN
-        extends HSSFColor
-    {
-        public final static short   index     = 0x3b;
-        public final static short[] triplet   =
-        {
-            51, 51, 0
-        };
-        public final static String  hexString = "3333:3333:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class DARK_GREEN
-     *
-     */
-
-    public final static class DARK_GREEN
-        extends HSSFColor
-    {
-        public final static short   index     = 0x3a;
-        public final static short[] triplet   =
-        {
-            0, 51, 0
-        };
-        public final static String  hexString = "0:3333:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class DARK_TEAL
-     *
-     */
-
-    public final static class DARK_TEAL
-        extends HSSFColor
-    {
-        public final static short   index     = 0x38;
-        public final static short[] triplet   =
-        {
-            0, 51, 102
-        };
-        public final static String  hexString = "0:3333:6666";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class DARK_BLUE
-     *
-     */
-
-    public final static class DARK_BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x12;
-        public final static short   index2    = 0x20;
-        public final static short[] triplet   =
-        {
-            0, 0, 128
-        };
-        public final static String  hexString = "0:0:8080";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class INDIGO
-     *
-     */
-
-    public final static class INDIGO
-        extends HSSFColor
-    {
-        public final static short   index     = 0x3e;
-        public final static short[] triplet   =
-        {
-            51, 51, 153
-        };
-        public final static String  hexString = "3333:3333:9999";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class GREY_80_PERCENT
-     *
-     */
-
-    public final static class GREY_80_PERCENT
-        extends HSSFColor
-    {
-        public final static short   index     = 0x3f;
-        public final static short[] triplet   =
-        {
-            51, 51, 51
-        };
-        public final static String  hexString = "3333:3333:3333";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class DARK_RED
-     *
-     */
-
-    public final static class DARK_RED
-        extends HSSFColor
-    {
-        public final static short   index     = 0x10;
-        public final static short   index2    = 0x25;
-        public final static short[] triplet   =
-        {
-            128, 0, 0
-        };
-        public final static String  hexString = "8080:0:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class ORANGE
-     *
-     */
-
-    public final static class ORANGE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x35;
-        public final static short[] triplet   =
-        {
-            255, 102, 0
-        };
-        public final static String  hexString = "FFFF:6666:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class DARK_YELLOW
-     *
-     */
-
-    public final static class DARK_YELLOW
-        extends HSSFColor
-    {
-        public final static short   index     = 0x13;
-        public final static short[] triplet   =
-        {
-            128, 128, 0
-        };
-        public final static String  hexString = "8080:8080:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class GREEN
-     *
-     */
-
-    public final static class GREEN
-        extends HSSFColor
-    {
-        public final static short   index     = 0x11;
-        public final static short[] triplet   =
-        {
-            0, 128, 0
-        };
-        public final static String  hexString = "0:8080:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class TEAL
-     *
-     */
-
-    public final static class TEAL
-        extends HSSFColor
-    {
-        public final static short   index     = 0x15;
-        public final static short   index2    = 0x26;
-        public final static short[] triplet   =
-        {
-            0, 128, 128
-        };
-        public final static String  hexString = "0:8080:8080";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class BLUE
-     *
-     */
-
-    public final static class BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0xc;
-        public final static short   index2    = 0x27;
-        public final static short[] triplet   =
-        {
-            0, 0, 255
-        };
-        public final static String  hexString = "0:0:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class BLUE_GREY
-     *
-     */
-
-    public final static class BLUE_GREY
-        extends HSSFColor
-    {
-        public final static short   index     = 0x36;
-        public final static short[] triplet   =
-        {
-            102, 102, 153
-        };
-        public final static String  hexString = "6666:6666:9999";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class GREY_50_PERCENT
-     *
-     */
-
-    public final static class GREY_50_PERCENT
-        extends HSSFColor
-    {
-        public final static short   index     = 0x17;
-        public final static short[] triplet   =
-        {
-            128, 128, 128
-        };
-        public final static String  hexString = "8080:8080:8080";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class RED
-     *
-     */
-
-    public final static class RED
-        extends HSSFColor
-    {
-        public final static short   index     = 0xa;
-        public final static short[] triplet   =
-        {
-            255, 0, 0
-        };
-        public final static String  hexString = "FFFF:0:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LIGHT_ORANGE
-     *
-     */
-
-    public final static class LIGHT_ORANGE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x34;
-        public final static short[] triplet   =
-        {
-            255, 153, 0
-        };
-        public final static String  hexString = "FFFF:9999:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LIME
-     *
-     */
-
-    public final static class LIME
-        extends HSSFColor
-    {
-        public final static short   index     = 0x32;
-        public final static short[] triplet   =
-        {
-            153, 204, 0
-        };
-        public final static String  hexString = "9999:CCCC:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class SEA_GREEN
-     *
-     */
-
-    public final static class SEA_GREEN
-        extends HSSFColor
-    {
-        public final static short   index     = 0x39;
-        public final static short[] triplet   =
-        {
-            51, 153, 102
-        };
-        public final static String  hexString = "3333:9999:6666";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class AQUA
-     *
-     */
-
-    public final static class AQUA
-        extends HSSFColor
-    {
-        public final static short   index     = 0x31;
-        public final static short[] triplet   =
-        {
-            51, 204, 204
-        };
-        public final static String  hexString = "3333:CCCC:CCCC";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LIGHT_BLUE
-     *
-     */
-
-    public final static class LIGHT_BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x30;
-        public final static short[] triplet   =
-        {
-            51, 102, 255
-        };
-        public final static String  hexString = "3333:6666:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class VIOLET
-     *
-     */
-
-    public final static class VIOLET
-        extends HSSFColor
-    {
-        public final static short   index     = 0x14;
-        public final static short   index2    = 0x24;
-        public final static short[] triplet   =
-        {
-            128, 0, 128
-        };
-        public final static String  hexString = "8080:0:8080";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class GREY_40_PERCENT
-     *
-     */
-
-    public final static class GREY_40_PERCENT
-        extends HSSFColor
-    {
-        public final static short   index     = 0x37;
-        public final static short[] triplet   =
-        {
-            150, 150, 150
-        };
-        public final static String  hexString = "9696:9696:9696";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class PINK
-     *
-     */
-
-    public final static class PINK
-        extends HSSFColor
-    {
-        public final static short   index     = 0xe;
-        public final static short   index2    = 0x21;
-        public final static short[] triplet   =
-        {
-            255, 0, 255
-        };
-        public final static String  hexString = "FFFF:0:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class GOLD
-     *
-     */
-
-    public final static class GOLD
-        extends HSSFColor
-    {
-        public final static short   index     = 0x33;
-        public final static short[] triplet   =
-        {
-            255, 204, 0
-        };
-        public final static String  hexString = "FFFF:CCCC:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class YELLOW
-     *
-     */
-
-    public final static class YELLOW
-        extends HSSFColor
-    {
-        public final static short   index     = 0xd;
-        public final static short   index2    = 0x22;
-        public final static short[] triplet   =
-        {
-            255, 255, 0
-        };
-        public final static String  hexString = "FFFF:FFFF:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class BRIGHT_GREEN
-     *
-     */
-
-    public final static class BRIGHT_GREEN
-        extends HSSFColor
-    {
-        public final static short   index     = 0xb;
-        public final static short   index2    = 0x23;
-        public final static short[] triplet   =
-        {
-            0, 255, 0
-        };
-        public final static String  hexString = "0:FFFF:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-    }
-
-    /**
-     * Class TURQUOISE
-     *
-     */
-
-    public final static class TURQUOISE
-        extends HSSFColor
-    {
-        public final static short   index     = 0xf;
-        public final static short   index2    = 0x23;
-        public final static short[] triplet   =
-        {
-            0, 255, 255
-        };
-        public final static String  hexString = "0:FFFF:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class SKY_BLUE
-     *
-     */
-
-    public final static class SKY_BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x28;
-        public final static short[] triplet   =
-        {
-            0, 204, 255
-        };
-        public final static String  hexString = "0:CCCC:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class PLUM
-     *
-     */
-
-    public final static class PLUM
-        extends HSSFColor
-    {
-        public final static short   index     = 0x3d;
-        public final static short   index2    = 0x19;
-        public final static short[] triplet   =
-        {
-            153, 51, 102
-        };
-        public final static String  hexString = "9999:3333:6666";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class GREY_25_PERCENT
-     *
-     */
-
-    public final static class GREY_25_PERCENT
-        extends HSSFColor
-    {
-        public final static short   index     = 0x16;
-        public final static short[] triplet   =
-        {
-            192, 192, 192
-        };
-        public final static String  hexString = "C0C0:C0C0:C0C0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class ROSE
-     *
-     */
-
-    public final static class ROSE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x2d;
-        public final static short[] triplet   =
-        {
-            255, 153, 204
-        };
-        public final static String  hexString = "FFFF:9999:CCCC";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class TAN
-     *
-     */
-
-    public final static class TAN
-        extends HSSFColor
-    {
-        public final static short   index     = 0x2f;
-        public final static short[] triplet   =
-        {
-            255, 204, 153
-        };
-        public final static String  hexString = "FFFF:CCCC:9999";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LIGHT_YELLOW
-     *
-     */
-
-    public final static class LIGHT_YELLOW
-        extends HSSFColor
-    {
-        public final static short   index     = 0x2b;
-        public final static short[] triplet   =
-        {
-            255, 255, 153
-        };
-        public final static String  hexString = "FFFF:FFFF:9999";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LIGHT_GREEN
-     *
-     */
-
-    public final static class LIGHT_GREEN
-        extends HSSFColor
-    {
-        public final static short   index     = 0x2a;
-        public final static short[] triplet   =
-        {
-            204, 255, 204
-        };
-        public final static String  hexString = "CCCC:FFFF:CCCC";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LIGHT_TURQUOISE
-     *
-     */
-
-    public final static class LIGHT_TURQUOISE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x29;
-        public final static short   index2    = 0x1b;
-        public final static short[] triplet   =
-        {
-            204, 255, 255
-        };
-        public final static String  hexString = "CCCC:FFFF:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class PALE_BLUE
-     *
-     */
-
-    public final static class PALE_BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x2c;
-        public final static short[] triplet   =
-        {
-            153, 204, 255
-        };
-        public final static String  hexString = "9999:CCCC:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LAVENDER
-     *
-     */
-
-    public final static class LAVENDER
-        extends HSSFColor
-    {
-        public final static short   index     = 0x2e;
-        public final static short[] triplet   =
-        {
-            204, 153, 255
-        };
-        public final static String  hexString = "CCCC:9999:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class WHITE
-     *
-     */
-
-    public final static class WHITE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x9;
-        public final static short[] triplet   =
-        {
-            255, 255, 255
-        };
-        public final static String  hexString = "FFFF:FFFF:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class CORNFLOWER_BLUE
-     */
-    public final static class CORNFLOWER_BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x18;
-        public final static short[] triplet   =
-        {
-            153, 153, 255
-        };
-        public final static String  hexString = "9999:9999:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-
-    /**
-     * Class LEMON_CHIFFON
-     */
-    public final static class LEMON_CHIFFON
-        extends HSSFColor
-    {
-        public final static short   index     = 0x1a;
-        public final static short[] triplet   =
-        {
-            255, 255, 204
-        };
-        public final static String  hexString = "FFFF:FFFF:CCCC";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class MAROON
-     */
-    public final static class MAROON
-        extends HSSFColor
-    {
-        public final static short   index     = 0x19;
-        public final static short[] triplet   =
-        {
-            127, 0, 0
-        };
-        public final static String  hexString = "8000:0:0";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class ORCHID
-     */
-    public final static class ORCHID
-        extends HSSFColor
-    {
-        public final static short   index     = 0x1c;
-        public final static short[] triplet   =
-        {
-            102, 0, 102
-        };
-        public final static String  hexString = "6666:0:6666";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class CORAL
-     */
-    public final static class CORAL
-        extends HSSFColor
-    {
-        public final static short   index     = 0x1d;
-        public final static short[] triplet   =
-        {
-            255, 128, 128
-        };
-        public final static String  hexString = "FFFF:8080:8080";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class ROYAL_BLUE
-     */
-    public final static class ROYAL_BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x1e;
-        public final static short[] triplet   =
-        {
-            0, 102, 204
-        };
-        public final static String  hexString = "0:6666:CCCC";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Class LIGHT_CORNFLOWER_BLUE
-     */
-    public final static class LIGHT_CORNFLOWER_BLUE
-        extends HSSFColor
-    {
-        public final static short   index     = 0x1f;
-        public final static short[] triplet   =
-        {
-            204, 204, 255
-        };
-        public final static String  hexString = "CCCC:CCCC:FFFF";
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return triplet;
-        }
-
-        public String getHexString()
-        {
-            return hexString;
-        }
-    }
-
-    /**
-     * Special Default/Normal/Automatic color.
-     * <p><i>Note:</i> This class is NOT in the default Map returned by HSSFColor.
-     * The index is a special case which is interpreted in the various setXXXColor calls.
-     *
-     * @author Jason
-     *
-     */
-    public final static class AUTOMATIC extends HSSFColor
-    {
-        private static HSSFColor instance = new AUTOMATIC();
-
-        public final static short   index     = 0x40;
-
-        public short getIndex()
-        {
-            return index;
-        }
-
-        public short [] getTriplet()
-        {
-            return BLACK.triplet;
-        }
-
-        public String getHexString()
-        {
-            return BLACK.hexString;
-        }
-
-        public static HSSFColor getInstance() {
-          return instance;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java b/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
deleted file mode 100644
index 826875a..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.RegionUtil;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * Various utility functions that make working with a region of cells easier.
- */
-public final class HSSFRegionUtil {
-
-	private HSSFRegionUtil() {
-		// no instances of this class
-	}
-
-	/**
-	 * Sets the left border for a region of cells by manipulating the cell style
-	 * of the individual cells on the left
-	 *
-	 * @param border The new border
-	 * @param region The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setBorderLeft(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderLeft(border, region, sheet, workbook);
-	}
-
-	/**
-	 * Sets the leftBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @param color The color of the border
-	 * @param region The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setLeftBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setLeftBorderColor(color, region, sheet, workbook);
-	}
-
-	/**
-	 * Sets the borderRight attribute of the HSSFRegionUtil object
-	 *
-	 * @param border The new border
-	 * @param region The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setBorderRight(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderRight(border, region, sheet, workbook);
-	}
-
-	/**
-	 * Sets the rightBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @param color The color of the border
-	 * @param region The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setRightBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setRightBorderColor(color, region, sheet, workbook);
-	}
-
-	/**
-	 * Sets the borderBottom attribute of the HSSFRegionUtil object
-	 *
-	 * @param border The new border
-	 * @param region The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setBorderBottom(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderBottom(border, region, sheet, workbook);
-	}
-
-	/**
-	 * Sets the bottomBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @param color The color of the border
-	 * @param region The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setBottomBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBottomBorderColor(color, region, sheet, workbook);
-	}
-
-	/**
-	 * Sets the borderBottom attribute of the HSSFRegionUtil object
-	 *
-	 * @param border The new border
-	 * @param region The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setBorderTop(int border, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setBorderTop(border, region, sheet, workbook);
-	}
-
-	/**
-	 * Sets the topBorderColor attribute of the HSSFRegionUtil object
-	 *
-	 * @param color The color of the border
-	 * @param region  The region that should have the border
-	 * @param workbook The workbook that the region is on.
-	 * @param sheet The sheet that the region is on.
-	 */
-	public static void setTopBorderColor(int color, CellRangeAddress region, HSSFSheet sheet,
-			HSSFWorkbook workbook) {
-		RegionUtil.setTopBorderColor(color, region, sheet, workbook);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java b/trunk/src/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
deleted file mode 100644
index e7ca949..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Utility for delaying the concatenation of multiple byte arrays.  Doing this up-front
- * causes significantly more copying, which for a large number of byte arrays can cost
- * a large amount of time.
- */
-public class LazilyConcatenatedByteArray {
-    private final List<byte[]> arrays = new ArrayList<byte[]>(1);
-
-    /**
-     * Clears the array (sets the concatenated length back to zero.
-     */
-    public void clear() {
-        arrays.clear();
-    }
-
-    /**
-     * Concatenates an array onto the end of our array.
-     * This is a relatively fast operation.
-     *
-     * @param array the array to concatenate.
-     * @throws IllegalArgumentException if {@code array} is {@code null}.
-     */
-    public void concatenate(byte[] array) {
-        if (array == null) {
-            throw new IllegalArgumentException("array cannot be null");
-        }
-        arrays.add(array);
-    }
-
-    /**
-     * Gets the concatenated contents as a single byte array.
-     *
-     * This is a slower operation, but the concatenated array is stored off as a single
-     * array again so that subsequent calls will not perform additional copying.
-     *
-     * @return the byte array.  Returns {@code null} if no data has been placed into it.
-     */
-    public byte[] toArray() {
-        if (arrays.isEmpty()) {
-            return null;
-        } else if (arrays.size() > 1) {
-            int totalLength = 0;
-            for (byte[] array : arrays) {
-                totalLength += array.length;
-            }
-
-            byte[] concatenated = new byte[totalLength];
-            int destPos = 0;
-            for (byte[] array : arrays) {
-                System.arraycopy(array, 0, concatenated, destPos, array.length);
-                destPos += array.length;
-            }
-
-            arrays.clear();
-            arrays.add(concatenated);
-        }
-
-        return arrays.get(0);
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java b/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java
deleted file mode 100644
index d038296..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/PaneInformation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-/**
- * Holds information regarding a split plane or freeze plane for a sheet.
- * @deprecated POI 3.15 beta 3. Use {@link org.apache.poi.ss.util.PaneInformation} instead.
- */
-public class PaneInformation extends org.apache.poi.ss.util.PaneInformation
-{
-        public PaneInformation(short x, short y, short top, short left, byte active, boolean frozen) {
-                super(x, y, top, left, active, frozen);
-        }
-
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/RKUtil.java b/trunk/src/java/org/apache/poi/hssf/util/RKUtil.java
deleted file mode 100644
index 42cdd37..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/RKUtil.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-/**
- * Utility class for helping convert RK numbers.
- *
- * @see org.apache.poi.hssf.record.MulRKRecord
- * @see org.apache.poi.hssf.record.RKRecord
- */
-public final class RKUtil {
-    private RKUtil() {
-        // no instances of this class
-    }
-
-    /**
-     * Do the dirty work of decoding; made a private static method to
-     * facilitate testing the algorithm
-     */
-    public static double decodeNumber(int number) {
-        long raw_number = number;
-
-        // mask off the two low-order bits, 'cause they're not part of
-        // the number
-        raw_number = raw_number >> 2;
-        double rvalue = 0;
-
-        if ((number & 0x02) == 0x02)
-        {
-            // ok, it's just a plain ol' int; we can handle this
-            // trivially by casting
-            rvalue = raw_number;
-        }
-        else
-        {
-
-            // also trivial, but not as obvious ... left shift the
-            // bits high and use that clever static method in Double
-            // to convert the resulting bit image to a double
-            rvalue = Double.longBitsToDouble(raw_number << 34);
-        }
-        if ((number & 0x01) == 0x01)
-        {
-
-            // low-order bit says divide by 100, and so we do. Why?
-            // 'cause that's what the algorithm says. Can't fight city
-            // hall, especially if it's the city of Redmond
-            rvalue /= 100;
-        }
-
-        return rvalue;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/hssf/util/package.html b/trunk/src/java/org/apache/poi/hssf/util/package.html
deleted file mode 100644
index 7936e88..0000000
--- a/trunk/src/java/org/apache/poi/hssf/util/package.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-util package contains tools needed for writing HSSF files that are not necesarily "real" 
-HSSF concepts.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java b/trunk/src/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
deleted file mode 100644
index 1e8b1b1..0000000
--- a/trunk/src/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.common;
-
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * <p>A class describing attributes of the Big Block Size</p>
- */
-public final class POIFSBigBlockSize
-{
-   private int bigBlockSize;
-   private short headerValue;
-   
-   protected POIFSBigBlockSize(int bigBlockSize, short headerValue) {
-      this.bigBlockSize = bigBlockSize;
-      this.headerValue = headerValue;
-   }
-   
-   public int getBigBlockSize() {
-      return bigBlockSize;
-   }
-   
-   /**
-    * Returns the value that gets written into the 
-    *  header.
-    * Is the power of two that corresponds to the
-    *  size of the block, eg 512 => 9
-    */
-   public short getHeaderValue() {
-      return headerValue;
-   }
-   
-   public int getPropertiesPerBlock() {
-      return bigBlockSize / POIFSConstants.PROPERTY_SIZE;
-   }
-   
-   public int getBATEntriesPerBlock() {
-      return bigBlockSize / LittleEndianConsts.INT_SIZE;
-   }
-   public int getXBATEntriesPerBlock() {
-      return getBATEntriesPerBlock() - 1;
-   }
-   public int getNextXBATChainOffset() {
-      return getXBATEntriesPerBlock() * LittleEndianConsts.INT_SIZE;
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/common/POIFSConstants.java b/trunk/src/java/org/apache/poi/poifs/common/POIFSConstants.java
deleted file mode 100644
index 1cc5d03..0000000
--- a/trunk/src/java/org/apache/poi/poifs/common/POIFSConstants.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.common;
-
-/**
- * <p>A repository for constants shared by POI classes.</p>
- */
-public interface POIFSConstants
-{
-    /** Most files use 512 bytes as their big block size */
-    public static final int SMALLER_BIG_BLOCK_SIZE = 0x0200;
-    public static final POIFSBigBlockSize SMALLER_BIG_BLOCK_SIZE_DETAILS = 
-       new POIFSBigBlockSize(SMALLER_BIG_BLOCK_SIZE, (short)9);
-    /** Some use 4096 bytes */
-    public static final int LARGER_BIG_BLOCK_SIZE = 0x1000;
-    public static final POIFSBigBlockSize LARGER_BIG_BLOCK_SIZE_DETAILS = 
-       new POIFSBigBlockSize(LARGER_BIG_BLOCK_SIZE, (short)12);
-    
-    /** How big a block in the small block stream is. Fixed size */
-    public static final int SMALL_BLOCK_SIZE = 0x0040; 
-    
-    /** How big a single property is */
-    public static final int PROPERTY_SIZE  = 0x0080;
-    
-    /** 
-     * The minimum size of a document before it's stored using 
-     *  Big Blocks (normal streams). Smaller documents go in the 
-     *  Mini Stream (SBAT / Small Blocks)
-     */
-    public static final int BIG_BLOCK_MINIMUM_DOCUMENT_SIZE = 0x1000;
-    
-    /** The highest sector number you're allowed, 0xFFFFFFFA */
-    public static final int LARGEST_REGULAR_SECTOR_NUMBER = -5;
-    
-    /** Indicates the sector holds a DIFAT block (0xFFFFFFFC) */
-    public static final int DIFAT_SECTOR_BLOCK   = -4;
-    /** Indicates the sector holds a FAT block (0xFFFFFFFD) */
-    public static final int FAT_SECTOR_BLOCK   = -3;
-    /** Indicates the sector is the end of a chain (0xFFFFFFFE) */
-    public static final int END_OF_CHAIN   = -2;
-    /** Indicates the sector is not used (0xFFFFFFFF) */
-    public static final int UNUSED_BLOCK   = -1;
-    
-    /** The first 4 bytes of an OOXML file, used in detection */
-    public static final byte[] OOXML_FILE_HEADER = 
-    	new byte[] { 0x50, 0x4b, 0x03, 0x04 };
-    /** The first 5 bytes of a raw XML file, used in detection */
-    public static final byte[] RAW_XML_FILE_HEADER =
-        new byte[] { 0x3c, 0x3f, 0x78, 0x6d, 0x6c };
-}   // end public interface POIFSConstants;
diff --git a/trunk/src/java/org/apache/poi/poifs/common/package.html b/trunk/src/java/org/apache/poi/poifs/common/package.html
deleted file mode 100644
index da2edf1..0000000
--- a/trunk/src/java/org/apache/poi/poifs/common/package.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-common package contains constants and other classes shared across all POIFS subpackages
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/ChainingMode.java b/trunk/src/java/org/apache/poi/poifs/crypt/ChainingMode.java
deleted file mode 100644
index 7fccccf..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/ChainingMode.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-public enum ChainingMode {
-    // ecb - only for standard encryption
-    ecb("ECB", 1),
-    cbc("CBC", 2),
-    /* Cipher feedback chaining (CFB), with an 8-bit window */
-    cfb("CFB8", 3);
-
-    public final String jceId;
-    public final int ecmaId;
-    ChainingMode(String jceId, int ecmaId) {
-        this.jceId = jceId;
-        this.ecmaId = ecmaId;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java b/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
deleted file mode 100644
index db3d724..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.ShortBufferException;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndianInputStream;
-
-@Internal
-public abstract class ChunkedCipherInputStream extends LittleEndianInputStream {
-    private final int chunkSize;
-    private final int chunkBits;
-
-    private final long size;
-    private final byte[] chunk, plain;
-    private final Cipher cipher;
-
-    private int lastIndex;
-    private long pos;
-    private boolean chunkIsValid = false;
-
-    public ChunkedCipherInputStream(InputStream stream, long size, int chunkSize)
-    throws GeneralSecurityException {
-        this(stream, size, chunkSize, 0);
-    }
-
-    public ChunkedCipherInputStream(InputStream stream, long size, int chunkSize, int initialPos)
-    throws GeneralSecurityException {
-        super(stream);
-        this.size = size;
-        this.pos = initialPos;
-        this.chunkSize = chunkSize;
-        int cs = chunkSize == -1 ? 4096 : chunkSize;
-        this.chunk = new byte[cs];
-        this.plain = new byte[cs];
-        this.chunkBits = Integer.bitCount(chunk.length-1);
-        this.lastIndex = (int)(pos >> chunkBits);
-        this.cipher = initCipherForBlock(null, lastIndex);
-    }
-
-    public final Cipher initCipherForBlock(int block) throws IOException, GeneralSecurityException {
-        if (chunkSize != -1) {
-            throw new GeneralSecurityException("the cipher block can only be set for streaming encryption, e.g. CryptoAPI...");
-        }
-
-        chunkIsValid = false;
-        return initCipherForBlock(cipher, block);
-    }
-
-    protected abstract Cipher initCipherForBlock(Cipher existing, int block)
-    throws GeneralSecurityException;
-
-    @Override
-    public int read() throws IOException {
-        byte[] b = new byte[1];
-        if (read(b) == 1) {
-            return b[0];
-        }
-        return -1;
-    }
-
-    // do not implement! -> recursion
-    // public int read(byte[] b) throws IOException;
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        return read(b, off, len, false);
-    }
-
-    private int read(byte[] b, int off, int len, boolean readPlain) throws IOException {
-        int total = 0;
-
-        if (available() <= 0) {
-            return -1;
-        }
-
-        final int chunkMask = getChunkMask();
-        while (len > 0) {
-            if (!chunkIsValid) {
-                try {
-                    nextChunk();
-                    chunkIsValid = true;
-                } catch (GeneralSecurityException e) {
-                    throw new EncryptedDocumentException(e.getMessage(), e);
-                }
-            }
-            int count = (int)(chunk.length - (pos & chunkMask));
-            int avail = available();
-            if (avail == 0) {
-                return total;
-            }
-            count = Math.min(avail, Math.min(count, len));
-
-            System.arraycopy(readPlain ? plain : chunk, (int)(pos & chunkMask), b, off, count);
-
-            off += count;
-            len -= count;
-            pos += count;
-            if ((pos & chunkMask) == 0) {
-                chunkIsValid = false;
-            }
-            total += count;
-        }
-
-        return total;
-    }
-
-    @Override
-    public long skip(final long n) throws IOException {
-        long start = pos;
-        long skip = Math.min(remainingBytes(), n);
-
-        if ((((pos + skip) ^ start) & ~getChunkMask()) != 0) {
-            chunkIsValid = false;
-        }
-        pos += skip;
-        return skip;
-    }
-
-    @Override
-    public int available() {
-        return remainingBytes();
-    }
-
-    /**
-     * Helper method for forbidden available call - we know the size beforehand, so it's ok ...
-     *
-     * @return the remaining byte until EOF
-     */
-    private int remainingBytes() {
-        return (int)(size - pos);
-    }
-
-    @Override
-    public boolean markSupported() {
-        return false;
-    }
-
-    @Override
-    public synchronized void mark(int readlimit) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public synchronized void reset() throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    protected int getChunkMask() {
-        return chunk.length-1;
-    }
-
-    private void nextChunk() throws GeneralSecurityException, IOException {
-        if (chunkSize != -1) {
-            int index = (int)(pos >> chunkBits);
-            initCipherForBlock(cipher, index);
-
-            if (lastIndex != index) {
-                super.skip((index - lastIndex) << chunkBits);
-            }
-
-            lastIndex = index + 1;
-        }
-
-        final int todo = (int)Math.min(size, chunk.length);
-        int readBytes = 0, totalBytes = 0;
-        do {
-            readBytes = super.read(plain, totalBytes, todo-totalBytes);
-            totalBytes += Math.max(0, readBytes);
-        } while (readBytes != -1 && totalBytes < todo);
-
-        if (readBytes == -1 && pos+totalBytes < size && size < Integer.MAX_VALUE) {
-            throw new EOFException("buffer underrun");
-        }
-
-        System.arraycopy(plain, 0, chunk, 0, totalBytes);
-
-        invokeCipher(totalBytes, totalBytes == chunkSize);
-    }
-
-    /**
-     * Helper function for overriding the cipher invocation, i.e. XOR doesn't use a cipher
-     * and uses it's own implementation
-     *
-     * @throws BadPaddingException
-     * @throws IllegalBlockSizeException
-     * @throws ShortBufferException
-     */
-    protected int invokeCipher(int totalBytes, boolean doFinal) throws GeneralSecurityException {
-        if (doFinal) {
-            return cipher.doFinal(chunk, 0, totalBytes, chunk);
-        } else {
-            return cipher.update(chunk, 0, totalBytes, chunk);
-        }
-    }
-
-    /**
-     * Used when BIFF header fields (sid, size) are being read. The internal
-     * {@link Cipher} instance must step even when unencrypted bytes are read
-     * 
-     */
-    @Override
-    public void readPlain(byte b[], int off, int len) {
-        if (len <= 0) {
-            return;
-        }
-
-        try {
-            int readBytes, total = 0;
-            do {
-                readBytes = read(b, off, len, true);
-                total += Math.max(0, readBytes);
-            } while (readBytes > -1 && total < len);
-    
-            if (total < len) {
-                throw new EOFException("buffer underrun");
-            }
-        } catch (IOException e) {
-            // need to wrap checked exception, because of LittleEndianInput interface :(
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Some ciphers (actually just XOR) are based on the record size,
-     * which needs to be set before decryption
-     *
-     * @param recordSize the size of the next record
-     */
-    public void setNextRecordSize(int recordSize) {
-    }
-
-    /**
-     * @return the chunk bytes
-     */
-    protected byte[] getChunk() {
-        return chunk;
-    }
-
-    /**
-     * @return the plain bytes
-     */
-    protected byte[] getPlain() {
-        return plain;
-    }
-
-    /**
-     * @return the absolute position in the stream
-     */
-    public long getPos() {
-        return pos;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java b/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
deleted file mode 100644
index a8e920d..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import static org.apache.poi.poifs.crypt.Decryptor.DEFAULT_POIFS_ENTRY;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.util.BitSet;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.ShortBufferException;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSWriterEvent;
-import org.apache.poi.poifs.filesystem.POIFSWriterListener;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-
-@Internal
-public abstract class ChunkedCipherOutputStream extends FilterOutputStream {
-    private static final POILogger LOG = POILogFactory.getLogger(ChunkedCipherOutputStream.class);
-    private static final int STREAMING = -1;
-
-    private final int chunkSize;
-    private final int chunkBits;
-
-    private final byte[] chunk;
-    private final BitSet plainByteFlags;
-    private final File fileOut;
-    private final DirectoryNode dir;
-
-    private long pos = 0;
-    private long totalPos = 0;
-    private long written = 0;
-    
-    // the cipher can't be final, because for the last chunk we change the padding
-    // and therefore need to change the cipher too
-    private Cipher cipher;
-
-    public ChunkedCipherOutputStream(DirectoryNode dir, int chunkSize) throws IOException, GeneralSecurityException {
-        super(null);
-        this.chunkSize = chunkSize;
-        int cs = chunkSize == STREAMING ? 4096 : chunkSize;
-        this.chunk = new byte[cs];
-        this.plainByteFlags = new BitSet(cs);
-        this.chunkBits = Integer.bitCount(cs-1);
-        this.fileOut = TempFile.createTempFile("encrypted_package", "crypt");
-        this.fileOut.deleteOnExit();
-        this.out = new FileOutputStream(fileOut);
-        this.dir = dir;
-        this.cipher = initCipherForBlock(null, 0, false);
-    }
-
-    public ChunkedCipherOutputStream(OutputStream stream, int chunkSize) throws IOException, GeneralSecurityException {
-        super(stream);
-        this.chunkSize = chunkSize;
-        int cs = chunkSize == STREAMING ? 4096 : chunkSize;
-        this.chunk = new byte[cs];
-        this.plainByteFlags = new BitSet(cs);
-        this.chunkBits = Integer.bitCount(cs-1);
-        this.fileOut = null;
-        this.dir = null;
-        this.cipher = initCipherForBlock(null, 0, false);
-    }
-
-    public final Cipher initCipherForBlock(int block, boolean lastChunk) throws IOException, GeneralSecurityException {
-        return initCipherForBlock(cipher, block, lastChunk);
-    }
-
-    protected abstract Cipher initCipherForBlock(Cipher existing, int block, boolean lastChunk)
-    throws IOException, GeneralSecurityException;
-
-    protected abstract void calculateChecksum(File fileOut, int oleStreamSize)
-    throws GeneralSecurityException, IOException;
-
-    protected abstract void createEncryptionInfoEntry(DirectoryNode dir, File tmpFile)
-    throws IOException, GeneralSecurityException;
-
-    @Override
-    public void write(int b) throws IOException {
-        write(new byte[]{(byte)b});
-    }
-
-    @Override
-    public void write(byte[] b) throws IOException {
-        write(b, 0, b.length);
-    }
-
-    @Override
-    public void write(byte[] b, int off, int len) throws IOException {
-        write(b, off, len, false);
-    }
-
-    public void writePlain(byte[] b, int off, int len) throws IOException {
-        write(b, off, len, true);
-    }
-    
-    protected void write(byte[] b, int off, int len, boolean writePlain) throws IOException {
-        if (len == 0) {
-            return;
-        }
-
-        if (len < 0 || b.length < off+len) {
-            throw new IOException("not enough bytes in your input buffer");
-        }
-
-        final int chunkMask = getChunkMask();
-        while (len > 0) {
-            int posInChunk = (int)(pos & chunkMask);
-            int nextLen = Math.min(chunk.length-posInChunk, len);
-            System.arraycopy(b, off, chunk, posInChunk, nextLen);
-            if (writePlain) {
-                plainByteFlags.set(posInChunk, posInChunk+nextLen);
-            }
-            pos += nextLen;
-            totalPos += nextLen;
-            off += nextLen;
-            len -= nextLen;
-            if ((pos & chunkMask) == 0) {
-                writeChunk(len > 0);
-            }
-        }
-    }
-
-    protected int getChunkMask() {
-        return chunk.length-1;
-    }
-
-    protected void writeChunk(boolean continued) throws IOException {
-        if (pos == 0 || totalPos == written) {
-            return;
-        }
-
-        int posInChunk = (int)(pos & getChunkMask());
-
-        // normally posInChunk is 0, i.e. on the next chunk (-> index-1)
-        // but if called on close(), posInChunk is somewhere within the chunk data
-        int index = (int)(pos >> chunkBits);
-        boolean lastChunk;
-        if (posInChunk==0) {
-            index--;
-            posInChunk = chunk.length;
-            lastChunk = false;
-        } else {
-            // pad the last chunk
-            lastChunk = true;
-        }
-
-        int ciLen;
-        try {
-            boolean doFinal = true;
-            long oldPos = pos;
-            // reset stream (not only) in case we were interrupted by plain stream parts
-            // this also needs to be set to prevent an endless loop
-            pos = 0;
-            if (chunkSize == STREAMING) {
-                if (continued) {
-                    doFinal = false;
-                }
-            } else {
-                cipher = initCipherForBlock(cipher, index, lastChunk);
-                // restore pos - only streaming chunks will be reset
-                pos = oldPos;
-            }
-            ciLen = invokeCipher(posInChunk, doFinal);
-        } catch (GeneralSecurityException e) {
-            throw new IOException("can't re-/initialize cipher", e);
-        }
-
-        out.write(chunk, 0, ciLen);
-        plainByteFlags.clear();
-        written += ciLen;
-    }
-
-    /**
-     * Helper function for overriding the cipher invocation, i.e. XOR doesn't use a cipher
-     * and uses it's own implementation
-     *
-     * @throws BadPaddingException 
-     * @throws IllegalBlockSizeException 
-     * @throws ShortBufferException 
-     */
-    protected int invokeCipher(int posInChunk, boolean doFinal) throws GeneralSecurityException {
-        byte plain[] = (plainByteFlags.isEmpty()) ? null : chunk.clone();
-
-        int ciLen = (doFinal)
-            ? cipher.doFinal(chunk, 0, posInChunk, chunk)
-            : cipher.update(chunk, 0, posInChunk, chunk);
-        
-        for (int i = plainByteFlags.nextSetBit(0); i >= 0 && i < posInChunk; i = plainByteFlags.nextSetBit(i+1)) {
-            chunk[i] = plain[i];
-        }
-        
-        return ciLen;
-    }
-    
-    @Override
-    public void close() throws IOException {
-        try {
-            writeChunk(false);
-
-            super.close();
-
-            if (fileOut != null) {
-                int oleStreamSize = (int)(fileOut.length()+LittleEndianConsts.LONG_SIZE);
-                calculateChecksum(fileOut, (int)pos);
-                dir.createDocument(DEFAULT_POIFS_ENTRY, oleStreamSize, new EncryptedPackageWriter());
-                createEncryptionInfoEntry(dir, fileOut);
-            }
-        } catch (GeneralSecurityException e) {
-            throw new IOException(e);
-        }
-    }
-    
-    protected byte[] getChunk() {
-        return chunk;
-    }
-
-    protected BitSet getPlainByteFlags() {
-        return plainByteFlags;
-    }
-
-    protected long getPos() {
-        return pos;
-    }
-
-    protected long getTotalPos() {
-        return totalPos;
-    }
-
-    /**
-     * Some ciphers (actually just XOR) are based on the record size,
-     * which needs to be set before encryption
-     *
-     * @param recordSize the size of the next record
-     * @param isPlain {@code true} if the record is unencrypted
-     */
-    public void setNextRecordSize(int recordSize, boolean isPlain) {
-    }
-    
-    private class EncryptedPackageWriter implements POIFSWriterListener {
-        @Override
-        public void processPOIFSWriterEvent(POIFSWriterEvent event) {
-            try {
-                OutputStream os = event.getStream();
-
-                // StreamSize (8 bytes): An unsigned integer that specifies the number of bytes used by data
-                // encrypted within the EncryptedData field, not including the size of the StreamSize field.
-                // Note that the actual size of the \EncryptedPackage stream (1) can be larger than this
-                // value, depending on the block size of the chosen encryption algorithm
-                byte buf[] = new byte[LittleEndianConsts.LONG_SIZE];
-                LittleEndian.putLong(buf, 0, pos);
-                os.write(buf);
-
-                FileInputStream fis = new FileInputStream(fileOut);
-                IOUtils.copy(fis, os);
-                fis.close();
-
-                os.close();
-
-                if (!fileOut.delete()) {
-                    LOG.log(POILogger.ERROR, "Can't delete temporary encryption file: "+fileOut);
-                }
-            } catch (IOException e) {
-                throw new EncryptedDocumentException(e);
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java b/trunk/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
deleted file mode 100644
index c588735..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import org.apache.poi.EncryptedDocumentException;
-
-public enum CipherAlgorithm {
-    // key size for rc4: 0x00000028 - 0x00000080 (inclusive) with 8-bit increments
-    // no block size, because its a streaming cipher
-    rc4(CipherProvider.rc4,    "RC4", 0x6801, 0x40, new int[]{0x28,0x30,0x38,0x40,0x48,0x50,0x58,0x60,0x68,0x70,0x78,0x80}, -1, 20, "RC4", false),
-    // aes has always a block size of 128 - only its keysize may vary
-    aes128(CipherProvider.aes, "AES", 0x660E, 128, new int[]{128}, 16, 32, "AES", false),
-    aes192(CipherProvider.aes, "AES", 0x660F, 192, new int[]{192}, 16, 32, "AES", false),
-    aes256(CipherProvider.aes, "AES", 0x6610, 256, new int[]{256}, 16, 32, "AES", false),
-    rc2(null, "RC2", -1, 0x80, new int[]{0x28,0x30,0x38,0x40,0x48,0x50,0x58,0x60,0x68,0x70,0x78,0x80}, 8, 20, "RC2", false),
-    des(null, "DES", -1, 64, new int[]{64}, 8/*for 56-bit*/, 32, "DES", false),
-    // desx is not supported. Not sure, if it can be simulated by des3 somehow
-    des3(null, "DESede", -1, 192, new int[]{192}, 8, 32, "3DES", false),
-    // need bouncycastle provider for this one ...
-    // see http://stackoverflow.com/questions/4436397/3des-des-encryption-using-the-jce-generating-an-acceptable-key
-    des3_112(null, "DESede", -1, 128, new int[]{128}, 8, 32, "3DES_112", true),
-    // only for digital signatures
-    rsa(null, "RSA", -1, 1024, new int[]{1024, 2048, 3072, 4096}, -1, -1, "", false);
-
-    public final CipherProvider provider;
-    public final String jceId;
-    public final int ecmaId;
-    public final int defaultKeySize;
-    public final int allowedKeySize[];
-    public final int blockSize;
-    public final int encryptedVerifierHashLength;
-    public final String xmlId;
-    public final boolean needsBouncyCastle;
-    
-    CipherAlgorithm(CipherProvider provider, String jceId, int ecmaId, int defaultKeySize, int allowedKeySize[], int blockSize, int encryptedVerifierHashLength, String xmlId, boolean needsBouncyCastle) {
-        this.provider = provider;
-        this.jceId = jceId;
-        this.ecmaId = ecmaId;
-        this.defaultKeySize = defaultKeySize;
-        this.allowedKeySize = allowedKeySize.clone();
-        this.blockSize = blockSize;
-        this.encryptedVerifierHashLength = encryptedVerifierHashLength;
-        this.xmlId = xmlId;
-        this.needsBouncyCastle = needsBouncyCastle;
-    }
-
-    public static CipherAlgorithm fromEcmaId(int ecmaId) {
-        for (CipherAlgorithm ca : CipherAlgorithm.values()) {
-            if (ca.ecmaId == ecmaId) return ca;
-        }
-        throw new EncryptedDocumentException("cipher algorithm " + ecmaId + " not found");
-    }
-    
-    public static CipherAlgorithm fromXmlId(String xmlId, int keySize) {
-        for (CipherAlgorithm ca : CipherAlgorithm.values()) {
-            if (!ca.xmlId.equals(xmlId)) continue;
-            for (int ks : ca.allowedKeySize) {
-                if (ks == keySize) return ca;
-            }
-        }
-        throw new EncryptedDocumentException("cipher algorithm " + xmlId + "/" + keySize + " not found");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/CipherProvider.java b/trunk/src/java/org/apache/poi/poifs/crypt/CipherProvider.java
deleted file mode 100644
index 5ffe1d3..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/CipherProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import org.apache.poi.EncryptedDocumentException;
-
-public enum CipherProvider {
-    rc4("RC4", 1, "Microsoft Base Cryptographic Provider v1.0"),
-    aes("AES", 0x18, "Microsoft Enhanced RSA and AES Cryptographic Provider");
-
-    public static CipherProvider fromEcmaId(int ecmaId) {
-        for (CipherProvider cp : CipherProvider.values()) {
-            if (cp.ecmaId == ecmaId) return cp;
-        }
-        throw new EncryptedDocumentException("cipher provider not found");
-    }    
-    
-    public final String jceId;
-    public final int ecmaId;
-    public final String cipherProviderName;
-    CipherProvider(String jceId, int ecmaId, String cipherProviderName) {
-        this.jceId = jceId;
-        this.ecmaId = ecmaId;
-        this.cipherProviderName = cipherProviderName;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
deleted file mode 100644
index b35d2c5..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import java.nio.charset.Charset;
-import java.security.DigestException;
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.MessageDigest;
-import java.security.Provider;
-import java.security.Security;
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.Arrays;
-import java.util.Locale;
-
-import javax.crypto.Cipher;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Helper functions used for standard and agile encryption
- */
-@Internal
-public class CryptoFunctions {
-    /**
-     * <p><cite>2.3.4.7 ECMA-376 Document Encryption Key Generation (Standard Encryption)<br/>
-     * 2.3.4.11 Encryption Key Generation (Agile Encryption)</cite></p>
-     * 
-     * <p>The encryption key for ECMA-376 document encryption [ECMA-376] using agile
-     * encryption MUST be generated by using the following method, which is derived from PKCS #5:
-     * <a href="https://www.ietf.org/rfc/rfc2898.txt">Password-Based Cryptography Version 2.0 [RFC2898]</a>.</p>
-     * 
-     * <p>Let H() be a hashing algorithm as determined by the PasswordKeyEncryptor.hashAlgorithm
-     * element, H_n be the hash data of the n-th iteration, and a plus sign (+) represent concatenation.
-     * The password MUST be provided as an array of Unicode characters. Limitations on the length of the
-     * password and the characters used by the password are implementation-dependent.
-     * The initial password hash is generated as follows:</p>
-     * 
-     * 
-     * <pre>H_0 = H(salt + password)</pre>
-     * 
-     * <p>The salt used MUST be generated randomly. The salt MUST be stored in the
-     * PasswordKeyEncryptor.saltValue element contained within the \EncryptionInfo stream as
-     * specified in section 2.3.4.10. The hash is then iterated by using the following approach:</p>
-     * 
-     * <pre>H_n = H(iterator + H_n-1)</pre>
-     * 
-     * <p>where iterator is an unsigned 32-bit value that is initially set to 0x00000000 and then incremented
-     * monotonically on each iteration until PasswordKey.spinCount iterations have been performed.
-     * The value of iterator on the last iteration MUST be one less than PasswordKey.spinCount.</p>
-     * 
-     * <p>For POI, H_final will be calculated by {@link #generateKey(byte[],HashAlgorithm,byte[],int)}</p>
-     *
-     * @param password
-     * @param hashAlgorithm
-     * @param salt
-     * @param spinCount
-     * @return the hashed password
-     */
-    public static byte[] hashPassword(String password, HashAlgorithm hashAlgorithm, byte salt[], int spinCount) {
-        return hashPassword(password, hashAlgorithm, salt, spinCount, true);
-    }
-        
-    /**
-     * Generalized method for read and write protection hash generation.
-     * The difference is, read protection uses the order iterator then hash in the hash loop, whereas write protection
-     * uses first the last hash value and then the current iterator value
-     *
-     * @param password
-     * @param hashAlgorithm
-     * @param salt
-     * @param spinCount
-     * @param iteratorFirst if true, the iterator is hashed before the n-1 hash value,
-     *        if false the n-1 hash value is applied first
-     * @return the hashed password
-     */
-    public static byte[] hashPassword(String password, HashAlgorithm hashAlgorithm, byte salt[], int spinCount, boolean iteratorFirst) {
-        // If no password was given, use the default
-        if (password == null) {
-            password = Decryptor.DEFAULT_PASSWORD;
-        }
-        
-        MessageDigest hashAlg = getMessageDigest(hashAlgorithm);
-        
-        hashAlg.update(salt);
-        byte[] hash = hashAlg.digest(StringUtil.getToUnicodeLE(password));
-        byte[] iterator = new byte[LittleEndianConsts.INT_SIZE];
-
-        byte[] first = (iteratorFirst ? iterator : hash);
-        byte[] second = (iteratorFirst ? hash : iterator);
-        
-        try {
-            for (int i = 0; i < spinCount; i++) {
-                LittleEndian.putInt(iterator, 0, i);
-                hashAlg.reset();
-                hashAlg.update(first);
-                hashAlg.update(second);
-                hashAlg.digest(hash, 0, hash.length); // don't create hash buffer everytime new
-            }
-        } catch (DigestException e) {
-            throw new EncryptedDocumentException("error in password hashing");
-        }
-        
-        return hash;
-    }    
-
-    /**
-     * <p><cite>2.3.4.12 Initialization Vector Generation (Agile Encryption)</cite></p>
-     * 
-     * <p>Initialization vectors are used in all cases for agile encryption. An initialization vector MUST be
-     * generated by using the following method, where H() is a hash function that MUST be the same as
-     * specified in section 2.3.4.11 and a plus sign (+) represents concatenation:</p>
-     * <ul>
-     * <li>If a blockKey is provided, let IV be a hash of the KeySalt and the following value:<br/>
-     *     {@code blockKey: IV = H(KeySalt + blockKey)}</li>
-     * <li>If a blockKey is not provided, let IV be equal to the following value:<br/>
-     *     {@code KeySalt:IV = KeySalt}</li>
-     * <li>If the number of bytes in the value of IV is less than the the value of the blockSize attribute
-     *     corresponding to the cipherAlgorithm attribute, pad the array of bytes by appending 0x36 until
-     *     the array is blockSize bytes. If the array of bytes is larger than blockSize bytes, truncate the
-     *     array to blockSize bytes.</li>
-     * </ul> 
-     **/
-    public static byte[] generateIv(HashAlgorithm hashAlgorithm, byte[] salt, byte[] blockKey, int blockSize) {
-        byte iv[] = salt;
-        if (blockKey != null) {
-            MessageDigest hashAlgo = getMessageDigest(hashAlgorithm);
-            hashAlgo.update(salt);
-            iv = hashAlgo.digest(blockKey);
-        }
-        return getBlock36(iv, blockSize);
-    }
-
-    /**
-     * <p><cite>2.3.4.11 Encryption Key Generation (Agile Encryption)</cite></p>
-     * 
-     * <p>The final hash data that is used for an encryption key is then generated by using the following
-     * method:</p>
-     * 
-     * <pre>H_final = H(H_n + blockKey)</pre>
-     * 
-     * <p>where blockKey represents an array of bytes used to prevent two different blocks from encrypting
-     * to the same cipher text.</p>
-     * 
-     * <p>If the size of the resulting H_final is smaller than that of PasswordKeyEncryptor.keyBits, the key
-     * MUST be padded by appending bytes with a value of 0x36. If the hash value is larger in size than
-     * PasswordKeyEncryptor.keyBits, the key is obtained by truncating the hash value.</p> 
-     *
-     * @param passwordHash
-     * @param hashAlgorithm
-     * @param blockKey
-     * @param keySize
-     * @return intermediate key
-     */
-    public static byte[] generateKey(byte[] passwordHash, HashAlgorithm hashAlgorithm, byte[] blockKey, int keySize) {
-        MessageDigest hashAlgo = getMessageDigest(hashAlgorithm);
-        hashAlgo.update(passwordHash);
-        byte[] key = hashAlgo.digest(blockKey);
-        return getBlock36(key, keySize);
-    }
-
-    /**
-     * Initialize a new cipher object with the given cipher properties and no padding
-     * If the given algorithm is not implemented in the JCE, it will try to load it from the bouncy castle
-     * provider.
-     *
-     * @param key the secrect key
-     * @param cipherAlgorithm the cipher algorithm
-     * @param chain the chaining mode
-     * @param vec the initialization vector (IV), can be null
-     * @param cipherMode Cipher.DECRYPT_MODE or Cipher.ENCRYPT_MODE
-     * @return the requested cipher
-     * @throws GeneralSecurityException
-     * @throws EncryptedDocumentException if the initialization failed or if an algorithm was specified,
-     *   which depends on a missing bouncy castle provider 
-     */
-    public static Cipher getCipher(SecretKey key, CipherAlgorithm cipherAlgorithm, ChainingMode chain, byte[] vec, int cipherMode) {
-        return getCipher(key, cipherAlgorithm, chain, vec, cipherMode, null);
-    }
-
-    /**
-     * Initialize a new cipher object with the given cipher properties
-     * If the given algorithm is not implemented in the JCE, it will try to load it from the bouncy castle
-     * provider.
-     *
-     * @param key the secrect key
-     * @param cipherAlgorithm the cipher algorithm
-     * @param chain the chaining mode
-     * @param vec the initialization vector (IV), can be null
-     * @param cipherMode Cipher.DECRYPT_MODE or Cipher.ENCRYPT_MODE
-     * @param padding the padding (null = NOPADDING, ANSIX923Padding, PKCS5Padding, PKCS7Padding, ISO10126Padding, ...)
-     * @return the requested cipher
-     * @throws GeneralSecurityException
-     * @throws EncryptedDocumentException if the initialization failed or if an algorithm was specified,
-     *   which depends on a missing bouncy castle provider 
-     */
-    public static Cipher getCipher(Key key, CipherAlgorithm cipherAlgorithm, ChainingMode chain, byte[] vec, int cipherMode, String padding) {
-        int keySizeInBytes = key.getEncoded().length;
-        if (padding == null) padding = "NoPadding";
-        
-        try {
-            // Ensure the JCE policies files allow for this sized key
-            if (Cipher.getMaxAllowedKeyLength(cipherAlgorithm.jceId) < keySizeInBytes*8) {
-                throw new EncryptedDocumentException("Export Restrictions in place - please install JCE Unlimited Strength Jurisdiction Policy files");
-            }
-
-            Cipher cipher;
-            if (cipherAlgorithm == CipherAlgorithm.rc4) {
-                cipher = Cipher.getInstance(cipherAlgorithm.jceId);
-            } else if (cipherAlgorithm.needsBouncyCastle) {
-                registerBouncyCastle();
-                cipher = Cipher.getInstance(cipherAlgorithm.jceId + "/" + chain.jceId + "/" + padding, "BC");
-            } else {
-                cipher = Cipher.getInstance(cipherAlgorithm.jceId + "/" + chain.jceId + "/" + padding);
-            }
-            
-            if (vec == null) {
-                cipher.init(cipherMode, key);
-            } else {
-                AlgorithmParameterSpec aps;
-                if (cipherAlgorithm == CipherAlgorithm.rc2) {
-                    aps = new RC2ParameterSpec(key.getEncoded().length*8, vec);
-                } else {
-                    aps = new IvParameterSpec(vec);
-                }
-                cipher.init(cipherMode, key, aps);
-            }
-            return cipher;
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException(e);
-        }
-    }    
-    
-    /**
-     * Returns a new byte array with a truncated to the given size. 
-     * If the hash has less then size bytes, it will be filled with 0x36-bytes
-     *
-     * @param hash the to be truncated/filled hash byte array
-     * @param size the size of the returned byte array
-     * @return the padded hash
-     */
-    private static byte[] getBlock36(byte[] hash, int size) {
-        return getBlockX(hash, size, (byte)0x36);
-    }
-
-    /**
-     * Returns a new byte array with a truncated to the given size. 
-     * If the hash has less then size bytes, it will be filled with 0-bytes
-     *
-     * @param hash the to be truncated/filled hash byte array
-     * @param size the size of the returned byte array
-     * @return the padded hash
-     */
-    public static byte[] getBlock0(byte[] hash, int size) {
-        return getBlockX(hash, size, (byte)0);
-    }
-    
-    private static byte[] getBlockX(byte[] hash, int size, byte fill) {
-        if (hash.length == size) return hash;
-        
-        byte[] result = new byte[size];
-        Arrays.fill(result, fill);
-        System.arraycopy(hash, 0, result, 0, Math.min(result.length, hash.length));
-        return result;
-    }
-    
-    public static MessageDigest getMessageDigest(HashAlgorithm hashAlgorithm) {
-        try {
-            if (hashAlgorithm.needsBouncyCastle) {
-                registerBouncyCastle();
-                return MessageDigest.getInstance(hashAlgorithm.jceId, "BC");
-            } else {
-                return MessageDigest.getInstance(hashAlgorithm.jceId);
-            }
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException("hash algo not supported", e);
-        }
-    }
-    
-    public static Mac getMac(HashAlgorithm hashAlgorithm) {
-        try {
-            if (hashAlgorithm.needsBouncyCastle) {
-                registerBouncyCastle();
-                return Mac.getInstance(hashAlgorithm.jceHmacId, "BC");
-            } else {
-                return Mac.getInstance(hashAlgorithm.jceHmacId);
-            }
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException("hmac algo not supported", e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void registerBouncyCastle() {
-        if (Security.getProvider("BC") != null) {
-            return;
-        }
-        
-        try {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            String bcProviderName = "org.bouncycastle.jce.provider.BouncyCastleProvider";
-            Class<Provider> clazz = (Class<Provider>)cl.loadClass(bcProviderName);
-            Security.addProvider(clazz.newInstance());
-        } catch (Exception e) {
-            throw new EncryptedDocumentException("Only the BouncyCastle provider supports your encryption settings - please add it to the classpath.", e);
-        }
-    }
-
-    private static final int INITIAL_CODE_ARRAY[] = { 
-        0xE1F0, 0x1D0F, 0xCC9C, 0x84C0, 0x110C, 0x0E10, 0xF1CE, 
-        0x313E, 0x1872, 0xE139, 0xD40F, 0x84F9, 0x280C, 0xA96A, 
-        0x4EC3
-    };
-
-    private static final byte PAD_ARRAY[] = {
-        (byte)0xBB, (byte)0xFF, (byte)0xFF, (byte)0xBA, (byte)0xFF,
-        (byte)0xFF, (byte)0xB9, (byte)0x80, (byte)0x00, (byte)0xBE,
-        (byte)0x0F, (byte)0x00, (byte)0xBF, (byte)0x0F, (byte)0x00
-    };
-    
-    private static final int ENCRYPTION_MATRIX[][] = {
-        /* char 1  */ {0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09},
-        /* char 2  */ {0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF},
-        /* char 3  */ {0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0},
-        /* char 4  */ {0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40},
-        /* char 5  */ {0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5},
-        /* char 6  */ {0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A},
-        /* char 7  */ {0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9},
-        /* char 8  */ {0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0},
-        /* char 9  */ {0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC},
-        /* char 10 */ {0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10},
-        /* char 11 */ {0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168},
-        /* char 12 */ {0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C},
-        /* char 13 */ {0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD},
-        /* char 14 */ {0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC},
-        /* char 15 */ {0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4}
-    };
-
-    /**
-     * Create the verifier for xor obfuscation (method 1)
-     *
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd926947.aspx">2.3.7.1 Binary Document Password Verifier Derivation Method 1</a>
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd905229.aspx">2.3.7.4 Binary Document Password Verifier Derivation Method 2</a>
-     * @see <a href="http://www.ecma-international.org/news/TC45_current_work/Office Open XML Part 4 - Markup Language Reference.pdf">Part 4 - Markup Language Reference - Ecma International - 3.2.12 fileSharing</a>
-     * 
-     * @param password the password
-     * @return the verifier (actually a short value)
-     */
-    public static int createXorVerifier1(String password) {
-        byte[] arrByteChars = toAnsiPassword(password);
-        
-        // SET Verifier TO 0x0000
-        short verifier = 0;
-
-        if (!"".equals(password)) {
-            // FOR EACH PasswordByte IN PasswordArray IN REVERSE ORDER
-            for (int i = arrByteChars.length-1; i >= 0; i--) {
-                // SET Verifier TO Intermediate3 BITWISE XOR PasswordByte
-                verifier = rotateLeftBase15Bit(verifier);
-                verifier ^= arrByteChars[i];
-            }
-    
-            // as we haven't prepended the password length into the input array
-            // we need to do it now separately ...
-            verifier = rotateLeftBase15Bit(verifier);
-            verifier ^= arrByteChars.length;
-            
-            // RETURN Verifier BITWISE XOR 0xCE4B
-            verifier ^= 0xCE4B; // (0x8000 | ('N' << 8) | 'K')
-        }
-        
-        return verifier & 0xFFFF;
-    }
- 
-    /**
-     * This method generates the xor verifier for word documents &lt; 2007 (method 2).
-     * Its output will be used as password input for the newer word generations which
-     * utilize a real hashing algorithm like sha1.
-     * 
-     * @param password the password
-     * @return the hashed password
-     * 
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd905229.aspx">2.3.7.4 Binary Document Password Verifier Derivation Method 2</a>
-     * @see <a href="http://blogs.msdn.com/b/vsod/archive/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0.aspx">How to set the editing restrictions in Word using Open XML SDK 2.0</a>
-     * @see <a href="http://www.aspose.com/blogs/aspose-blogs/vladimir-averkin/archive/2007/08/20/funny-how-the-new-powerful-cryptography-implemented-in-word-2007-turns-it-into-a-perfect-tool-for-document-password-removal.html">Funny: How the new powerful cryptography implemented in Word 2007 turns it into a perfect tool for document password removal.</a>
-     */
-    public static int createXorVerifier2(String password) {
-        //Array to hold Key Values
-        byte[] generatedKey = new byte[4];
-
-        //Maximum length of the password is 15 chars.
-        final int maxPasswordLength = 15; 
-        
-        if (!"".equals(password)) {
-            // Truncate the password to 15 characters
-            password = password.substring(0, Math.min(password.length(), maxPasswordLength));
-
-            byte[] arrByteChars = toAnsiPassword(password);
-            
-            // Compute the high-order word of the new key:
-
-            // --> Initialize from the initial code array (see below), depending on the passwords length. 
-            int highOrderWord = INITIAL_CODE_ARRAY[arrByteChars.length - 1];
-
-            // --> For each character in the password:
-            //      --> For every bit in the character, starting with the least significant and progressing to (but excluding) 
-            //          the most significant, if the bit is set, XOR the keys high-order word with the corresponding word from 
-            //          the Encryption Matrix
-            for (int i = 0; i < arrByteChars.length; i++) {
-                int tmp = maxPasswordLength - arrByteChars.length + i;
-                for (int intBit = 0; intBit < 7; intBit++) {
-                    if ((arrByteChars[i] & (0x0001 << intBit)) != 0) {
-                        highOrderWord ^= ENCRYPTION_MATRIX[tmp][intBit];
-                    }
-                }
-            }
-            
-            // Compute the low-order word of the new key:
-            int verifier = createXorVerifier1(password);
-
-            // The byte order of the result shall be reversed [password "Example": 0x64CEED7E becomes 7EEDCE64],
-            // and that value shall be hashed as defined by the attribute values.
-            
-            LittleEndian.putShort(generatedKey, 0, (short)verifier);
-            LittleEndian.putShort(generatedKey, 2, (short)highOrderWord);
-        }
-        
-        return LittleEndian.getInt(generatedKey);
-    }
-
-    /**
-     * This method generates the xored-hashed password for word documents &lt; 2007.
-     */
-    public static String xorHashPassword(String password) {
-        int hashedPassword = createXorVerifier2(password);
-        return String.format(Locale.ROOT, "%1$08X", hashedPassword);
-    }
-    
-    /**
-     * Convenience function which returns the reversed xored-hashed password for further 
-     * processing in word documents 2007 and newer, which utilize a real hashing algorithm like sha1.
-     */
-    public static String xorHashPasswordReversed(String password) {
-        int hashedPassword = createXorVerifier2(password);
-        
-        return String.format(Locale.ROOT, "%1$02X%2$02X%3$02X%4$02X"
-            , ( hashedPassword >>> 0 ) & 0xFF
-            , ( hashedPassword >>> 8 ) & 0xFF
-            , ( hashedPassword >>> 16 ) & 0xFF
-            , ( hashedPassword >>> 24 ) & 0xFF
-        );
-    }
-
-    /**
-     * Create the xor key for xor obfuscation, which is used to create the xor array (method 1)
-     *
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd924704.aspx">2.3.7.2 Binary Document XOR Array Initialization Method 1</a>
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd905229.aspx">2.3.7.4 Binary Document Password Verifier Derivation Method 2</a>
-     * 
-     * @param password the password
-     * @return the xor key
-     */
-    public static int createXorKey1(String password) {
-        // the xor key for method 1 is part of the verifier for method 2
-        // so we simply chop it from there
-        return createXorVerifier2(password) >>> 16;
-    }
-
-    /**
-     * Creates an byte array for xor obfuscation (method 1) 
-     *
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd924704.aspx">2.3.7.2 Binary Document XOR Array Initialization Method 1</a>
-     * @see <a href="http://docs.libreoffice.org/oox/html/binarycodec_8cxx_source.html">Libre Office implementation</a>
-     *
-     * @param password the password
-     * @return the byte array for xor obfuscation
-     */
-    public static byte[] createXorArray1(String password) {
-        if (password.length() > 15) {
-            password = password.substring(0, 15);
-        }
-        byte passBytes[] = password.getBytes(Charset.forName("ASCII"));
-        
-        // this code is based on the libre office implementation.
-        // The MS-OFFCRYPTO misses some infos about the various rotation sizes 
-        byte obfuscationArray[] = new byte[16];
-        System.arraycopy(passBytes, 0, obfuscationArray, 0, passBytes.length);
-        System.arraycopy(PAD_ARRAY, 0, obfuscationArray, passBytes.length, PAD_ARRAY.length-passBytes.length+1);
-        
-        int xorKey = createXorKey1(password);
-        
-        // rotation of key values is application dependent - Excel = 2 / Word = 7 
-        int nRotateSize = 2;
-        
-        byte baseKeyLE[] = { (byte)(xorKey & 0xFF), (byte)((xorKey >>> 8) & 0xFF) };
-        for (int i=0; i<obfuscationArray.length; i++) {
-            obfuscationArray[i] ^= baseKeyLE[i&1];
-            obfuscationArray[i] = rotateLeft(obfuscationArray[i], nRotateSize);
-        }
-        
-        return obfuscationArray;
-    }
-    
-    /**
-     * The provided Unicode password string is converted to a ANSI string
-     *
-     * @param password the password
-     * @return the ansi bytes
-     * 
-     * @see <a href="http://www.ecma-international.org/news/TC45_current_work/Office%20Open%20XML%20Part%204%20-%20Markup%20Language%20Reference.pdf">Part 4 - Markup Language Reference - Ecma International - section 3.2.29 (workbookProtection)</a>
-     */
-    private static byte[] toAnsiPassword(String password) {
-        // TODO: charset conversion (see ecma spec) 
-        
-        // Get the single-byte values by iterating through the Unicode characters.
-        // For each character, if the low byte is not equal to 0, take it.
-        // Otherwise, take the high byte.
-        byte[] arrByteChars = new byte[password.length()];
-        
-        for (int i = 0; i < password.length(); i++) {
-            int intTemp = password.charAt(i);
-            byte lowByte = (byte)(intTemp & 0xFF);
-            byte highByte = (byte)((intTemp >>> 8) & 0xFF);
-            arrByteChars[i] = (lowByte != 0 ? lowByte : highByte);
-        }
-
-        return arrByteChars;
-    }
-    
-    private static byte rotateLeft(byte bits, int shift) {
-        return (byte)(((bits & 0xff) << shift) | ((bits & 0xff) >>> (8 - shift)));
-    }
-    
-    private static short rotateLeftBase15Bit(short verifier) {
-        /*
-         * IF (Verifier BITWISE AND 0x4000) is 0x0000
-         *    SET Intermediate1 TO 0
-         * ELSE
-         *    SET Intermediate1 TO 1
-         * ENDIF
-         */
-        short intermediate1 = (short)(((verifier & 0x4000) == 0) ? 0 : 1);
-        /*
-         *  SET Intermediate2 TO Verifier MULTIPLED BY 2
-         *  SET most significant bit of Intermediate2 TO 0
-         */
-        short intermediate2 = (short)((verifier<<1) & 0x7FFF);
-        /*
-         *  SET Intermediate3 TO Intermediate1 BITWISE OR Intermediate2
-         */
-        short intermediate3 = (short)(intermediate1 | intermediate2);
-        return intermediate3;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java b/trunk/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
deleted file mode 100644
index 923d707..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSWriterEvent;
-import org.apache.poi.poifs.filesystem.POIFSWriterListener;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-public class DataSpaceMapUtils {
-    public static void addDefaultDataSpace(DirectoryEntry dir) throws IOException {
-        DataSpaceMapEntry dsme = new DataSpaceMapEntry(
-                new int[]{ 0 }
-              , new String[]{ Decryptor.DEFAULT_POIFS_ENTRY }
-              , "StrongEncryptionDataSpace"
-          );
-          DataSpaceMap dsm = new DataSpaceMap(new DataSpaceMapEntry[]{dsme});
-          createEncryptionEntry(dir, "\u0006DataSpaces/DataSpaceMap", dsm);
-
-          DataSpaceDefinition dsd = new DataSpaceDefinition(new String[]{ "StrongEncryptionTransform" });
-          createEncryptionEntry(dir, "\u0006DataSpaces/DataSpaceInfo/StrongEncryptionDataSpace", dsd);
-
-          TransformInfoHeader tih = new TransformInfoHeader(
-                1
-              , "{FF9A3F03-56EF-4613-BDD5-5A41C1D07246}"
-              , "Microsoft.Container.EncryptionTransform"
-              , 1, 0, 1, 0, 1, 0
-          );
-          IRMDSTransformInfo irm = new IRMDSTransformInfo(tih, 0, null);
-          createEncryptionEntry(dir, "\u0006DataSpaces/TransformInfo/StrongEncryptionTransform/\u0006Primary", irm);
-          
-          DataSpaceVersionInfo dsvi = new DataSpaceVersionInfo("Microsoft.Container.DataSpaces", 1, 0, 1, 0, 1, 0);
-          createEncryptionEntry(dir, "\u0006DataSpaces/Version", dsvi);
-    }
-    
-    public static DocumentEntry createEncryptionEntry(DirectoryEntry dir, String path, EncryptionRecord out) throws IOException {
-        String parts[] = path.split("/");
-        for (int i=0; i<parts.length-1; i++) {
-            dir = dir.hasEntry(parts[i])
-                ? (DirectoryEntry)dir.getEntry(parts[i])
-                : dir.createDirectory(parts[i]);
-        }
-        
-        final byte buf[] = new byte[5000];        
-        LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(buf, 0);
-        out.write(bos);
-        
-        String fileName = parts[parts.length-1];
-        
-        if (dir.hasEntry(fileName)) {
-            dir.getEntry(fileName).delete();
-        }
-        
-        return dir.createDocument(fileName, bos.getWriteIndex(), new POIFSWriterListener(){
-            public void processPOIFSWriterEvent(POIFSWriterEvent event) {
-                try {
-                    event.getStream().write(buf, 0, event.getLimit());
-                } catch (IOException e) {
-                    throw new EncryptedDocumentException(e);
-                }
-            }
-        });
-    }   
-    
-    public static class DataSpaceMap implements EncryptionRecord {
-        DataSpaceMapEntry entries[];
-        
-        public DataSpaceMap(DataSpaceMapEntry entries[]) {
-            this.entries = entries.clone();
-        }
-        
-        public DataSpaceMap(LittleEndianInput is) {
-            /*int length = */ is.readInt();
-            int entryCount = is.readInt();
-            entries = new DataSpaceMapEntry[entryCount];
-            for (int i=0; i<entryCount; i++) {
-                entries[i] = new DataSpaceMapEntry(is);
-            }
-        }
-    
-        public void write(LittleEndianByteArrayOutputStream os) {
-            os.writeInt(8);
-            os.writeInt(entries.length);
-            for (DataSpaceMapEntry dsme : entries) {
-                dsme.write(os);
-            }
-        }
-    }
-    
-    public static class DataSpaceMapEntry implements EncryptionRecord {
-        final int referenceComponentType[];
-        final String referenceComponent[];
-        final String dataSpaceName;
-        
-        public DataSpaceMapEntry(int referenceComponentType[], String referenceComponent[], String dataSpaceName) {
-            this.referenceComponentType = referenceComponentType.clone();
-            this.referenceComponent = referenceComponent.clone();
-            this.dataSpaceName = dataSpaceName;
-        }
-        
-        public DataSpaceMapEntry(LittleEndianInput is) {
-            /*int length = */ is.readInt();
-            int referenceComponentCount = is.readInt();
-            referenceComponentType = new int[referenceComponentCount];
-            referenceComponent = new String[referenceComponentCount];
-            for (int i=0; i<referenceComponentCount; i++) {
-                referenceComponentType[i] = is.readInt();
-                referenceComponent[i] = readUnicodeLPP4(is);
-            }
-            dataSpaceName = readUnicodeLPP4(is);
-        }
-        
-        public void write(LittleEndianByteArrayOutputStream os) {
-            int start = os.getWriteIndex();
-            LittleEndianOutput sizeOut = os.createDelayedOutput(LittleEndianConsts.INT_SIZE);
-            os.writeInt(referenceComponent.length);
-            for (int i=0; i<referenceComponent.length; i++) {
-                os.writeInt(referenceComponentType[i]);
-                writeUnicodeLPP4(os, referenceComponent[i]);
-            }
-            writeUnicodeLPP4(os, dataSpaceName);
-            sizeOut.writeInt(os.getWriteIndex()-start);
-        }
-    }
-    
-    public static class DataSpaceDefinition implements EncryptionRecord {
-        String transformer[];
-        
-        public DataSpaceDefinition(String transformer[]) {
-            this.transformer = transformer.clone();
-        }
-        
-        public DataSpaceDefinition(LittleEndianInput is) {
-            /* int headerLength = */ is.readInt();
-            int transformReferenceCount = is.readInt();
-            transformer = new String[transformReferenceCount];
-            for (int i=0; i<transformReferenceCount; i++) {
-                transformer[i] = readUnicodeLPP4(is);
-            }
-        }
-        
-        public void write(LittleEndianByteArrayOutputStream bos) {
-            bos.writeInt(8);
-            bos.writeInt(transformer.length);
-            for (String str : transformer) {
-                writeUnicodeLPP4(bos, str);
-            }
-        }
-    }
-    
-    public static class IRMDSTransformInfo implements EncryptionRecord {
-        TransformInfoHeader transformInfoHeader;
-        int extensibilityHeader;
-        String xrMLLicense;
-        
-        public IRMDSTransformInfo(TransformInfoHeader transformInfoHeader, int extensibilityHeader, String xrMLLicense) {
-            this.transformInfoHeader = transformInfoHeader;
-            this.extensibilityHeader = extensibilityHeader;
-            this.xrMLLicense = xrMLLicense;
-        }
-        
-        public IRMDSTransformInfo(LittleEndianInput is) {
-            transformInfoHeader = new TransformInfoHeader(is);
-            extensibilityHeader = is.readInt();
-            xrMLLicense = readUtf8LPP4(is);
-            // finish with 0x04 (int) ???
-        }
-        
-        public void write(LittleEndianByteArrayOutputStream bos) {
-            transformInfoHeader.write(bos);
-            bos.writeInt(extensibilityHeader);
-            writeUtf8LPP4(bos, xrMLLicense);
-            bos.writeInt(4); // where does this 4 come from???
-        }
-    }
-    
-    public static class TransformInfoHeader implements EncryptionRecord {
-        int transformType;
-        String transformerId;
-        String transformerName;
-        int readerVersionMajor = 1, readerVersionMinor = 0;
-        int updaterVersionMajor = 1, updaterVersionMinor = 0;
-        int writerVersionMajor = 1, writerVersionMinor = 0;
-
-        public TransformInfoHeader(
-            int transformType,
-            String transformerId,
-            String transformerName,
-            int readerVersionMajor, int readerVersionMinor,
-            int updaterVersionMajor, int updaterVersionMinor,
-            int writerVersionMajor, int writerVersionMinor                
-        ){
-            this.transformType = transformType;
-            this.transformerId = transformerId;
-            this.transformerName = transformerName;
-            this.readerVersionMajor = readerVersionMajor;
-            this.readerVersionMinor = readerVersionMinor;
-            this.updaterVersionMajor = updaterVersionMajor;
-            this.updaterVersionMinor = updaterVersionMinor;
-            this.writerVersionMajor = writerVersionMajor;
-            this.writerVersionMinor = writerVersionMinor;
-        }
-        
-        public TransformInfoHeader(LittleEndianInput is) {
-            /* int length = */ is.readInt();
-            transformType = is.readInt();
-            transformerId = readUnicodeLPP4(is);
-            transformerName = readUnicodeLPP4(is);
-            readerVersionMajor = is.readShort();
-            readerVersionMinor = is.readShort();
-            updaterVersionMajor = is.readShort();
-            updaterVersionMinor = is.readShort();
-            writerVersionMajor = is.readShort();
-            writerVersionMinor = is.readShort();
-        }
-        
-        public void write(LittleEndianByteArrayOutputStream bos) {
-            int start = bos.getWriteIndex();
-            LittleEndianOutput sizeOut = bos.createDelayedOutput(LittleEndianConsts.INT_SIZE);
-            bos.writeInt(transformType);
-            writeUnicodeLPP4(bos, transformerId);
-            sizeOut.writeInt(bos.getWriteIndex()-start);
-            writeUnicodeLPP4(bos, transformerName);
-            bos.writeShort(readerVersionMajor);
-            bos.writeShort(readerVersionMinor); 
-            bos.writeShort(updaterVersionMajor);
-            bos.writeShort(updaterVersionMinor);
-            bos.writeShort(writerVersionMajor); 
-            bos.writeShort(writerVersionMinor); 
-        }
-    }
-    
-    public static class DataSpaceVersionInfo implements EncryptionRecord {
-        String featureIdentifier;
-        int readerVersionMajor = 1, readerVersionMinor = 0;
-        int updaterVersionMajor = 1, updaterVersionMinor = 0;
-        int writerVersionMajor = 1, writerVersionMinor = 0;
-        
-        public DataSpaceVersionInfo(LittleEndianInput is) {
-            featureIdentifier = readUnicodeLPP4(is);
-            readerVersionMajor = is.readShort();
-            readerVersionMinor = is.readShort();
-            updaterVersionMajor = is.readShort();
-            updaterVersionMinor = is.readShort();
-            writerVersionMajor = is.readShort();
-            writerVersionMinor = is.readShort();
-        }
-        
-        public DataSpaceVersionInfo(
-            String featureIdentifier,
-            int readerVersionMajor, int readerVersionMinor,
-            int updaterVersionMajor, int updaterVersionMinor,
-            int writerVersionMajor, int writerVersionMinor                
-        ){
-            this.featureIdentifier = featureIdentifier;
-            this.readerVersionMajor = readerVersionMajor;
-            this.readerVersionMinor = readerVersionMinor;
-            this.updaterVersionMajor = updaterVersionMajor;
-            this.updaterVersionMinor = updaterVersionMinor;
-            this.writerVersionMajor = writerVersionMajor;
-            this.writerVersionMinor = writerVersionMinor;
-        }
-        
-        public void write(LittleEndianByteArrayOutputStream bos) {
-            writeUnicodeLPP4(bos, featureIdentifier);
-            bos.writeShort(readerVersionMajor);
-            bos.writeShort(readerVersionMinor); 
-            bos.writeShort(updaterVersionMajor);
-            bos.writeShort(updaterVersionMinor);
-            bos.writeShort(writerVersionMajor); 
-            bos.writeShort(writerVersionMinor); 
-        }
-    }
-    
-    public static String readUnicodeLPP4(LittleEndianInput is) {
-        int length = is.readInt();
-        if (length%2 != 0) {
-            throw new EncryptedDocumentException(
-                "UNICODE-LP-P4 structure is a multiple of 4 bytes. "
-                + "If Padding is present, it MUST be exactly 2 bytes long");
-        }
-        
-        String result = StringUtil.readUnicodeLE(is, length/2);
-        if (length%4==2) {
-            // Padding (variable): A set of bytes that MUST be of the correct size such that the size of the 
-            // UNICODE-LP-P4 structure is a multiple of 4 bytes. If Padding is present, it MUST be exactly 
-            // 2 bytes long, and each byte MUST be 0x00.            
-            is.readShort();
-        }
-        
-        return result;
-    }
-    
-    public static void writeUnicodeLPP4(LittleEndianOutput os, String string) {
-        byte buf[] = StringUtil.getToUnicodeLE(string);
-        os.writeInt(buf.length);
-        os.write(buf);
-        if (buf.length%4==2) {
-            os.writeShort(0);
-        }
-    }
-
-    public static String readUtf8LPP4(LittleEndianInput is) {
-        int length = is.readInt();
-        if (length == 0 || length == 4) {
-            /* int skip = */ is.readInt();
-            return length == 0 ? null : "";
-        }
-        
-        byte data[] = new byte[length];
-        is.readFully(data);
-
-        // Padding (variable): A set of bytes that MUST be of correct size such that the size of the UTF-8-LP-P4
-        // structure is a multiple of 4 bytes. If Padding is present, each byte MUST be 0x00. If 
-        // the length is exactly 0x00000000, this specifies a null string, and the entire structure uses 
-        // exactly 4 bytes. If the length is exactly 0x00000004, this specifies an empty string, and the 
-        // entire structure also uses exactly 4 bytes
-        int scratchedBytes = length%4;
-        if (scratchedBytes > 0) {
-            for (int i=0; i<(4-scratchedBytes); i++) {
-                is.readByte();
-            }
-        }
-
-        return new String(data, 0, data.length, Charset.forName("UTF-8"));
-    }
-    
-    public static void writeUtf8LPP4(LittleEndianOutput os, String str) {
-        if (str == null || "".equals(str)) {
-            os.writeInt(str == null ? 0 : 4);
-            os.writeInt(0);
-        } else {
-            byte buf[] = str.getBytes(Charset.forName("UTF-8"));
-            os.writeInt(buf.length);
-            os.write(buf);
-            int scratchBytes = buf.length%4;
-            if (scratchBytes > 0) {
-                for (int i=0; i<(4-scratchBytes); i++) {
-                    os.writeByte(0);
-                }
-            }
-        }        
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/Decryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/Decryptor.java
deleted file mode 100644
index da746d8..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/Decryptor.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-public abstract class Decryptor implements Cloneable {
-    public static final String DEFAULT_PASSWORD="VelvetSweatshop";
-    public static final String DEFAULT_POIFS_ENTRY="EncryptedPackage";
-    
-    protected EncryptionInfo encryptionInfo;
-    private SecretKey secretKey;
-    private byte[] verifier, integrityHmacKey, integrityHmacValue;
-
-    protected Decryptor() {
-    }
-    
-    /**
-     * Return a stream with decrypted data.
-     * <p>
-     * Use {@link #getLength()} to get the size of that data that can be safely read from the stream.
-     * Just reading to the end of the input stream is not sufficient because there are
-     * normally padding bytes that must be discarded
-     * </p>
-     *
-     * @param dir the node to read from
-     * @return decrypted stream
-     */
-    public abstract InputStream getDataStream(DirectoryNode dir)
-        throws IOException, GeneralSecurityException;
-
-    /**
-     * Wraps a stream for decryption<p>
-     * 
-     * As we are handling streams and don't know the total length beforehand,
-     * it's the callers duty to care for the length of the entries.
-     *
-     * @param stream the stream to be wrapped
-     * @param initialPos initial/current byte position within the stream
-     * @return decrypted stream
-     */
-    public InputStream getDataStream(InputStream stream, int size, int initialPos)
-        throws IOException, GeneralSecurityException {
-        throw new EncryptedDocumentException("this decryptor doesn't support reading from a stream");
-    }
-
-    /**
-     * Sets the chunk size of the data stream.
-     * Needs to be set before the data stream is requested.
-     * When not set, the implementation uses method specific default values
-     *
-     * @param chunkSize the chunk size, i.e. the block size with the same encryption key
-     */
-    public void setChunkSize(int chunkSize) {
-        throw new EncryptedDocumentException("this decryptor doesn't support changing the chunk size");
-    }
-
-    /**
-     * Initializes a cipher object for a given block index for encryption
-     *
-     * @param cipher may be null, otherwise the given instance is reset to the new block index
-     * @param block the block index, e.g. the persist/slide id (hslf)
-     * @return a new cipher object, if cipher was null, otherwise the reinitialized cipher
-     * @throws GeneralSecurityException
-     */
-    public Cipher initCipherForBlock(Cipher cipher, int block)
-    throws GeneralSecurityException {
-        throw new EncryptedDocumentException("this decryptor doesn't support initCipherForBlock");
-    }
-    
-    public abstract boolean verifyPassword(String password)
-        throws GeneralSecurityException;
-
-    /**
-     * Returns the length of the encrypted data that can be safely read with
-     * {@link #getDataStream(org.apache.poi.poifs.filesystem.DirectoryNode)}.
-     * Just reading to the end of the input stream is not sufficient because there are
-     * normally padding bytes that must be discarded
-     *
-     * <p>
-     *    The length variable is initialized in {@link #getDataStream(org.apache.poi.poifs.filesystem.DirectoryNode)},
-     *    an attempt to call getLength() prior to getDataStream() will result in IllegalStateException.
-     * </p>
-     *
-     * @return length of the encrypted data
-     * @throws IllegalStateException if {@link #getDataStream(org.apache.poi.poifs.filesystem.DirectoryNode)}
-     * was not called
-     */
-    public abstract long getLength();
-
-    public static Decryptor getInstance(EncryptionInfo info) {
-        Decryptor d = info.getDecryptor();
-        if (d == null) {
-            throw new EncryptedDocumentException("Unsupported version");
-        }
-        return d;
-    }
-
-    public InputStream getDataStream(NPOIFSFileSystem fs) throws IOException, GeneralSecurityException {
-        return getDataStream(fs.getRoot());
-    }
-
-    public InputStream getDataStream(OPOIFSFileSystem fs) throws IOException, GeneralSecurityException {
-        return getDataStream(fs.getRoot());
-    }
-
-    public InputStream getDataStream(POIFSFileSystem fs) throws IOException, GeneralSecurityException {
-        return getDataStream(fs.getRoot());
-    }
-    
-    // for tests
-    public byte[] getVerifier() {
-        return verifier;
-    }
-
-    public SecretKey getSecretKey() {
-        return secretKey;
-    }
-    
-    public byte[] getIntegrityHmacKey() {
-        return integrityHmacKey;
-    }
-
-    public byte[] getIntegrityHmacValue() {
-        return integrityHmacValue;
-    }
-
-    protected void setSecretKey(SecretKey secretKey) {
-        this.secretKey = secretKey;
-    }
-
-    protected void setVerifier(byte[] verifier) {
-        this.verifier = (verifier == null) ? null : verifier.clone();
-    }
-
-    protected void setIntegrityHmacKey(byte[] integrityHmacKey) {
-        this.integrityHmacKey = (integrityHmacKey == null) ? null : integrityHmacKey.clone();
-    }
-
-    protected void setIntegrityHmacValue(byte[] integrityHmacValue) {
-        this.integrityHmacValue = (integrityHmacValue == null) ? null : integrityHmacValue.clone();
-    }
-
-    protected int getBlockSizeInBytes() {
-        return encryptionInfo.getHeader().getBlockSize();
-    }
-    
-    protected int getKeySizeInBytes() {
-        return encryptionInfo.getHeader().getKeySize()/8;
-    }
-    
-    public EncryptionInfo getEncryptionInfo() {
-        return encryptionInfo;
-    }
-
-    public void setEncryptionInfo(EncryptionInfo encryptionInfo) {
-        this.encryptionInfo = encryptionInfo;
-    }
-
-    @Override
-    public Decryptor clone() throws CloneNotSupportedException {
-        Decryptor other = (Decryptor)super.clone();
-        other.integrityHmacKey = integrityHmacKey.clone();
-        other.integrityHmacValue = integrityHmacValue.clone();
-        other.verifier = verifier.clone();
-        other.secretKey = new SecretKeySpec(secretKey.getEncoded(), secretKey.getAlgorithm());
-        // encryptionInfo is set from outside
-        return other;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java b/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
deleted file mode 100644
index f13c116..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.util.Removal;
-
-/**
- * Reads and processes OOXML Encryption Headers
- * The constants are largely based on ZIP constants.
- */
-public abstract class EncryptionHeader implements Cloneable {
-    public static final int ALGORITHM_RC4 = CipherAlgorithm.rc4.ecmaId;
-    public static final int ALGORITHM_AES_128 = CipherAlgorithm.aes128.ecmaId;
-    public static final int ALGORITHM_AES_192 = CipherAlgorithm.aes192.ecmaId;
-    public static final int ALGORITHM_AES_256 = CipherAlgorithm.aes256.ecmaId;
-    
-    public static final int HASH_NONE   = HashAlgorithm.none.ecmaId;
-    public static final int HASH_SHA1   = HashAlgorithm.sha1.ecmaId;
-    public static final int HASH_SHA256 = HashAlgorithm.sha256.ecmaId;
-    public static final int HASH_SHA384 = HashAlgorithm.sha384.ecmaId;
-    public static final int HASH_SHA512 = HashAlgorithm.sha512.ecmaId;
-
-    public static final int PROVIDER_RC4 = CipherProvider.rc4.ecmaId;
-    public static final int PROVIDER_AES = CipherProvider.aes.ecmaId;
-
-    public static final int MODE_ECB = ChainingMode.ecb.ecmaId;
-    public static final int MODE_CBC = ChainingMode.cbc.ecmaId;
-    public static final int MODE_CFB = ChainingMode.cfb.ecmaId;
-    
-    private int flags;
-    private int sizeExtra;
-    private CipherAlgorithm cipherAlgorithm;
-    private HashAlgorithm hashAlgorithm;
-    private int keyBits;
-    private int blockSize;
-    private CipherProvider providerType;
-    private ChainingMode chainingMode;
-    private byte[] keySalt;
-    private String cspName;
-    
-    protected EncryptionHeader() {}
-
-    public ChainingMode getChainingMode() {
-        return chainingMode;
-    }
-    
-    protected void setChainingMode(ChainingMode chainingMode) {
-        this.chainingMode = chainingMode;
-    }
-
-    public int getFlags() {
-        return flags;
-    }
-    
-    protected void setFlags(int flags) {
-        this.flags = flags;
-    }
-
-    public int getSizeExtra() {
-        return sizeExtra;
-    }
-    
-    protected void setSizeExtra(int sizeExtra) {
-        this.sizeExtra = sizeExtra;
-    }
-
-    public CipherAlgorithm getCipherAlgorithm() {
-        return cipherAlgorithm;
-    }
-    
-    protected void setCipherAlgorithm(CipherAlgorithm cipherAlgorithm) {
-        this.cipherAlgorithm = cipherAlgorithm;
-        if (cipherAlgorithm.allowedKeySize.length == 1) {
-            setKeySize(cipherAlgorithm.defaultKeySize);
-        }
-    }
-
-    public HashAlgorithm getHashAlgorithm() {
-        return hashAlgorithm;
-    }
-    
-    /**
-     * @deprecated POI 3.16 beta 1. use {@link #getHashAlgorithm()}
-     */
-    @Removal(version="3.18")
-    public HashAlgorithm getHashAlgorithmEx() {
-        return hashAlgorithm;
-    }
-    
-    protected void setHashAlgorithm(HashAlgorithm hashAlgorithm) {
-        this.hashAlgorithm = hashAlgorithm;
-    }
-
-    public int getKeySize() {
-        return keyBits;
-    }
-    
-    /**
-     * Sets the keySize (in bits). Before calling this method, make sure
-     * to set the cipherAlgorithm, as the amount of keyBits gets validated against
-     * the list of allowed keyBits of the corresponding cipherAlgorithm
-     *
-     * @param keyBits
-     */
-    protected void setKeySize(int keyBits) {
-        this.keyBits = keyBits;
-        for (int allowedBits : getCipherAlgorithm().allowedKeySize) {
-            if (allowedBits == keyBits) {
-                return;
-            }
-        }
-        throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for cipher "+getCipherAlgorithm());
-    }
-
-    public int getBlockSize() {
-    	return blockSize;
-    }
-    
-    protected void setBlockSize(int blockSize) {
-        this.blockSize = blockSize;
-    }
-    
-    public byte[] getKeySalt() {
-        return keySalt;
-    }
-    
-    protected void setKeySalt(byte salt[]) {
-        this.keySalt = (salt == null) ? null : salt.clone();
-    }
-
-    public CipherProvider getCipherProvider() {
-        return providerType;
-    }    
-
-    protected void setCipherProvider(CipherProvider providerType) {
-        this.providerType = providerType;
-    }
-    
-    public String getCspName() {
-        return cspName;
-    }
-    
-    protected void setCspName(String cspName) {
-        this.cspName = cspName;
-    }
-
-    @Override
-    public EncryptionHeader clone() throws CloneNotSupportedException {
-        EncryptionHeader other = (EncryptionHeader)super.clone();
-        other.keySalt = (keySalt == null) ? null : keySalt.clone();
-        return other;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java b/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
deleted file mode 100644
index e8895c1..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import static org.apache.poi.poifs.crypt.EncryptionMode.agile;
-import static org.apache.poi.poifs.crypt.EncryptionMode.binaryRC4;
-import static org.apache.poi.poifs.crypt.EncryptionMode.cryptoAPI;
-import static org.apache.poi.poifs.crypt.EncryptionMode.standard;
-import static org.apache.poi.poifs.crypt.EncryptionMode.xor;
-
-import java.io.IOException;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * This class may require {@code poi-ooxml} to be on the classpath to load
- * some {@link EncryptionMode}s.
- * @see #getBuilder(EncryptionMode)
- */
-public class EncryptionInfo implements Cloneable {
-    private final EncryptionMode encryptionMode;
-    private final int versionMajor;
-    private final int versionMinor;
-    private final int encryptionFlags;
-    
-    private EncryptionHeader header;
-    private EncryptionVerifier verifier;
-    private Decryptor decryptor;
-    private Encryptor encryptor;
-
-    /**
-     * A flag that specifies whether CryptoAPI RC4 or ECMA-376 encryption
-     * ECMA-376 is used. It MUST be 1 unless flagExternal is 1. If flagExternal is 1, it MUST be 0.
-     */
-    public static final BitField flagCryptoAPI = BitFieldFactory.getInstance(0x04);
-
-    /**
-     * A value that MUST be 0 if document properties are encrypted.
-     * The encryption of document properties is specified in section 2.3.5.4.
-     */
-    public static final BitField flagDocProps = BitFieldFactory.getInstance(0x08);
-    
-    /**
-     * A value that MUST be 1 if extensible encryption is used. If this value is 1,
-     * the value of every other field in this structure MUST be 0.
-     */
-    public static final BitField flagExternal = BitFieldFactory.getInstance(0x10);
-    
-    /**
-     * A value that MUST be 1 if the protected content is an ECMA-376 document
-     * ECMA-376. If the fAES bit is 1, the fCryptoAPI bit MUST also be 1.
-     */
-    public static final BitField flagAES = BitFieldFactory.getInstance(0x20);
-    
-    
-    /**
-     * Opens for decryption
-     */
-    public EncryptionInfo(POIFSFileSystem fs) throws IOException {
-       this(fs.getRoot());
-    }
-    
-    /**
-     * Opens for decryption
-     */
-    public EncryptionInfo(OPOIFSFileSystem fs) throws IOException {
-       this(fs.getRoot());
-    }
-    
-    /**
-     * Opens for decryption
-     */
-    public EncryptionInfo(NPOIFSFileSystem fs) throws IOException {
-       this(fs.getRoot());
-    }
-    
-    /**
-     * Opens for decryption
-     */
-    public EncryptionInfo(DirectoryNode dir) throws IOException {
-        this(dir.createDocumentInputStream("EncryptionInfo"), null);
-    }
-
-    public EncryptionInfo(LittleEndianInput dis, EncryptionMode preferredEncryptionMode) throws IOException {
-        if (preferredEncryptionMode == xor) {
-            versionMajor = xor.versionMajor;
-            versionMinor = xor.versionMinor;
-        } else {
-            versionMajor = dis.readUShort();
-            versionMinor = dis.readUShort();
-        }
-
-        if (   versionMajor == xor.versionMajor
-            && versionMinor == xor.versionMinor) {
-            encryptionMode = xor;
-            encryptionFlags = -1;
-        } else if (   versionMajor == binaryRC4.versionMajor
-            && versionMinor == binaryRC4.versionMinor) {
-            encryptionMode = binaryRC4;
-            encryptionFlags = -1;
-        } else if (
-               2 <= versionMajor && versionMajor <= 4
-            && versionMinor == 2) {
-            encryptionMode = (preferredEncryptionMode == cryptoAPI) ? cryptoAPI : standard;
-            encryptionFlags = dis.readInt();
-        } else if (
-               versionMajor == agile.versionMajor
-            && versionMinor == agile.versionMinor){
-            encryptionMode = agile;
-            encryptionFlags = dis.readInt();
-        } else {
-            encryptionFlags = dis.readInt();
-            throw new EncryptedDocumentException(
-                "Unknown encryption: version major: "+versionMajor+
-                " / version minor: "+versionMinor+
-                " / fCrypto: "+flagCryptoAPI.isSet(encryptionFlags)+
-                " / fExternal: "+flagExternal.isSet(encryptionFlags)+
-                " / fDocProps: "+flagDocProps.isSet(encryptionFlags)+
-                " / fAES: "+flagAES.isSet(encryptionFlags));
-        }
-        
-        EncryptionInfoBuilder eib;
-        try {
-            eib = getBuilder(encryptionMode);
-        } catch (Exception e) {
-            throw new IOException(e);
-        }
-
-        eib.initialize(this, dis);
-    }
-    
-    /**
-     * Prepares for encryption, using the given Encryption Mode, and
-     *  all other parameters as default.
-     * @see #EncryptionInfo(EncryptionMode, CipherAlgorithm, HashAlgorithm, int, int, ChainingMode)
-     */
-    public EncryptionInfo(EncryptionMode encryptionMode) {
-        this(encryptionMode, null, null, -1, -1, null);
-    }
-    
-    /**
-     * Constructs an EncryptionInfo from scratch
-     *
-     * @param encryptionMode see {@link EncryptionMode} for values, {@link EncryptionMode#cryptoAPI} is for
-     *   internal use only, as it's record based
-     * @param cipherAlgorithm
-     * @param hashAlgorithm
-     * @param keyBits
-     * @param blockSize
-     * @param chainingMode
-     * 
-     * @throws EncryptedDocumentException if the given parameters mismatch, e.g. only certain combinations
-     *   of keyBits, blockSize are allowed for a given {@link CipherAlgorithm}
-     */
-    public EncryptionInfo(
-            EncryptionMode encryptionMode
-          , CipherAlgorithm cipherAlgorithm
-          , HashAlgorithm hashAlgorithm
-          , int keyBits
-          , int blockSize
-          , ChainingMode chainingMode
-      ) {
-        this.encryptionMode = encryptionMode; 
-        versionMajor = encryptionMode.versionMajor;
-        versionMinor = encryptionMode.versionMinor;
-        encryptionFlags = encryptionMode.encryptionFlags;
-
-        EncryptionInfoBuilder eib;
-        try {
-            eib = getBuilder(encryptionMode);
-        } catch (Exception e) {
-            throw new EncryptedDocumentException(e);
-        }
-        
-        eib.initialize(this, cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode);
-    }
-
-    /**
-     * This method loads the builder class with reflection, which may generate
-     * a {@code ClassNotFoundException} if the class is not on the classpath.
-     * For example, {@link org.apache.poi.poifs.crypt.agile.AgileEncryptionInfoBuilder}
-     * is contained in the {@code poi-ooxml} package since the class makes use of some OOXML
-     * classes rather than using the {@code poi} package and plain XML DOM calls.
-     * As such, you may need to include {@code poi-ooxml} and {@code poi-ooxml-schemas} to load
-     * some encryption mode builders. See bug #60021 for more information.
-     * https://bz.apache.org/bugzilla/show_bug.cgi?id=60021
-     *
-     * @param encryptionMode the encryption mode
-     * @return an encryption info builder
-     * @throws ClassNotFoundException
-     * @throws IllegalAccessException
-     * @throws InstantiationException
-     */
-    protected static EncryptionInfoBuilder getBuilder(EncryptionMode encryptionMode)
-    throws ClassNotFoundException, IllegalAccessException, InstantiationException {
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        EncryptionInfoBuilder eib;
-        eib = (EncryptionInfoBuilder)cl.loadClass(encryptionMode.builder).newInstance();
-        return eib;
-    }
-    
-    public int getVersionMajor() {
-        return versionMajor;
-    }
-
-    public int getVersionMinor() {
-        return versionMinor;
-    }
-
-    public int getEncryptionFlags() {
-        return encryptionFlags;
-    }
-
-    public EncryptionHeader getHeader() {
-        return header;
-    }
-
-    public EncryptionVerifier getVerifier() {
-        return verifier;
-    }
-    
-    public Decryptor getDecryptor() {
-        return decryptor;
-    }
-
-    public Encryptor getEncryptor() {
-        return encryptor;
-    }
-
-    public void setHeader(EncryptionHeader header) {
-        this.header = header;
-    }
-
-    public void setVerifier(EncryptionVerifier verifier) {
-        this.verifier = verifier;
-    }
-
-    public void setDecryptor(Decryptor decryptor) {
-        this.decryptor = decryptor;
-    }
-
-    public void setEncryptor(Encryptor encryptor) {
-        this.encryptor = encryptor;
-    }
-
-    public EncryptionMode getEncryptionMode() {
-        return encryptionMode;
-    }
-    
-    @Override
-    public EncryptionInfo clone() throws CloneNotSupportedException {
-        EncryptionInfo other = (EncryptionInfo)super.clone();
-        other.header = header.clone();
-        other.verifier = verifier.clone();
-        other.decryptor = decryptor.clone();
-        other.decryptor.setEncryptionInfo(other);
-        other.encryptor = encryptor.clone();
-        other.encryptor.setEncryptionInfo(other);
-        return other;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java b/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
deleted file mode 100644
index 24371df..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import java.io.IOException;
-
-import org.apache.poi.util.LittleEndianInput;
-
-public interface EncryptionInfoBuilder {
-    /**
-     * initialize the builder from a stream
-     */
-    void initialize(EncryptionInfo ei, LittleEndianInput dis) throws IOException;
-
-    /**
-     * initialize the builder from scratch
-     */
-    void initialize(EncryptionInfo ei, CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm, int keyBits, int blockSize, ChainingMode chainingMode);
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionMode.java b/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionMode.java
deleted file mode 100644
index 50064b5..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionMode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-
-/**
- * Office supports various encryption modes.
- * The encryption is either based on the whole container ({@link #agile}, {@link #standard} or {@link #binaryRC4})
- * or record based ({@link #cryptoAPI}). The record based encryption can't be accessed directly, but will be
- * invoked by using the {@link Biff8EncryptionKey#setCurrentUserPassword(String)} before saving the document.
- */
-public enum EncryptionMode {
-    /* @see <a href="http://msdn.microsoft.com/en-us/library/dd907466(v=office.12).aspx">2.3.6 Office Binary Document RC4 Encryption</a> */
-    binaryRC4("org.apache.poi.poifs.crypt.binaryrc4.BinaryRC4EncryptionInfoBuilder", 1, 1, 0x0),
-    /* @see <a href="http://msdn.microsoft.com/en-us/library/dd905225(v=office.12).aspx">2.3.5 Office Binary Document RC4 CryptoAPI Encryption</a> */
-    cryptoAPI("org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionInfoBuilder", 4, 2, 0x04),
-    /* @see <a href="http://msdn.microsoft.com/en-us/library/dd906097(v=office.12).aspx">2.3.4.5 \EncryptionInfo Stream (Standard Encryption)</a> */
-    standard("org.apache.poi.poifs.crypt.standard.StandardEncryptionInfoBuilder", 4, 2, 0x24),
-    /* @see <a href="http://msdn.microsoft.com/en-us/library/dd925810(v=office.12).aspx">2.3.4.10 \EncryptionInfo Stream (Agile Encryption)</a> */
-    agile("org.apache.poi.poifs.crypt.agile.AgileEncryptionInfoBuilder", 4, 4, 0x40),
-    /* @see <a href="https://msdn.microsoft.com/en-us/library/dd907599(v=office.12).aspx">XOR Obfuscation</a> */
-    xor("org.apache.poi.poifs.crypt.xor.XOREncryptionInfoBuilder", 0, 0, 0)
-    ;
-    
-    public final String builder;
-    public final int versionMajor;
-    public final int versionMinor;
-    public final int encryptionFlags;
-    
-    EncryptionMode(String builder, int versionMajor, int versionMinor, int encryptionFlags) {
-        this.builder = builder;
-        this.versionMajor = versionMajor;
-        this.versionMinor = versionMinor;
-        this.encryptionFlags = encryptionFlags;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java b/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
deleted file mode 100644
index df216c0..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import org.apache.poi.util.Removal;
-
-/**
- * Used when checking if a key is valid for a document 
- */
-public abstract class EncryptionVerifier implements Cloneable {
-    private byte[] salt;
-    private byte[] encryptedVerifier;
-    private byte[] encryptedVerifierHash;
-    private byte[] encryptedKey;
-    // protected int verifierHashSize;
-    private int spinCount;
-    private CipherAlgorithm cipherAlgorithm;
-    private ChainingMode chainingMode;
-    private HashAlgorithm hashAlgorithm;
-    
-    protected EncryptionVerifier() {}
-
-    public byte[] getSalt() {
-        return salt;
-    }
-
-    public byte[] getEncryptedVerifier() {
-        return encryptedVerifier;
-    }    
-    
-    public byte[] getEncryptedVerifierHash() {
-        return encryptedVerifierHash;
-    }    
-    
-    public int getSpinCount() {
-        return spinCount;
-    }
-
-    /**
-     * @deprecated POI 3.16 beta 1. use {@link #getChainingMode()}
-     */
-    @Removal(version="3.18")
-    public int getCipherMode() {
-        return chainingMode.ecmaId;
-    }
-
-    /**
-     * @deprecated POI 3.16 beta 1. use {@link #getCipherAlgorithm()}
-     */
-    public int getAlgorithm() {
-        return cipherAlgorithm.ecmaId;
-    }
-
-    public byte[] getEncryptedKey() {
-        return encryptedKey;
-    }
-    
-    public CipherAlgorithm getCipherAlgorithm() {
-        return cipherAlgorithm;
-    }
-    
-    public HashAlgorithm getHashAlgorithm() {
-        return hashAlgorithm;
-    }
-    
-    public ChainingMode getChainingMode() {
-        return chainingMode;
-    }
-
-    protected void setSalt(byte[] salt) {
-        this.salt = (salt == null) ? null : salt.clone();
-    }
-
-    protected void setEncryptedVerifier(byte[] encryptedVerifier) {
-        this.encryptedVerifier = (encryptedVerifier == null) ? null : encryptedVerifier.clone();
-    }
-
-    protected void setEncryptedVerifierHash(byte[] encryptedVerifierHash) {
-        this.encryptedVerifierHash = (encryptedVerifierHash == null) ? null : encryptedVerifierHash.clone();
-    }
-
-    protected void setEncryptedKey(byte[] encryptedKey) {
-        this.encryptedKey = (encryptedKey == null) ? null : encryptedKey.clone();
-    }
-
-    protected void setSpinCount(int spinCount) {
-        this.spinCount = spinCount;
-    }
-
-    protected void setCipherAlgorithm(CipherAlgorithm cipherAlgorithm) {
-        this.cipherAlgorithm = cipherAlgorithm;
-    }
-
-    protected void setChainingMode(ChainingMode chainingMode) {
-        this.chainingMode = chainingMode;
-    }
-
-    protected void setHashAlgorithm(HashAlgorithm hashAlgorithm) {
-        this.hashAlgorithm = hashAlgorithm;
-    }
-    
-    @Override
-    public EncryptionVerifier clone() throws CloneNotSupportedException {
-        EncryptionVerifier other = (EncryptionVerifier)super.clone();
-        other.salt = (salt == null) ? null : salt.clone();
-        other.encryptedVerifier = (encryptedVerifier == null) ? null : encryptedVerifier.clone();
-        other.encryptedVerifierHash = (encryptedVerifierHash == null) ? null : encryptedVerifierHash.clone();
-        other.encryptedKey = (encryptedKey == null) ? null : encryptedKey.clone();
-        return other;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/Encryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/Encryptor.java
deleted file mode 100644
index f4c0c16..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/Encryptor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-public abstract class Encryptor implements Cloneable {
-    protected static final String DEFAULT_POIFS_ENTRY = Decryptor.DEFAULT_POIFS_ENTRY;
-    private EncryptionInfo encryptionInfo;
-    private SecretKey secretKey;
-    
-    /**
-     * Return a output stream for encrypted data.
-     *
-     * @param dir the node to write to
-     * @return encrypted stream
-     */
-    public abstract OutputStream getDataStream(DirectoryNode dir)
-        throws IOException, GeneralSecurityException;
-
-    // for tests
-    public abstract void confirmPassword(String password, byte keySpec[], byte keySalt[], byte verifier[], byte verifierSalt[], byte integritySalt[]);
-    
-    public abstract void confirmPassword(String password);
-	
-	public static Encryptor getInstance(EncryptionInfo info) {
-	    return info.getEncryptor();
-    }
-
-    public OutputStream getDataStream(NPOIFSFileSystem fs) throws IOException, GeneralSecurityException {
-        return getDataStream(fs.getRoot());
-    }
-    public OutputStream getDataStream(OPOIFSFileSystem fs) throws IOException, GeneralSecurityException {
-        return getDataStream(fs.getRoot());
-    }
-    public OutputStream getDataStream(POIFSFileSystem fs) throws IOException, GeneralSecurityException {
-        return getDataStream(fs.getRoot());
-    }
-
-    public ChunkedCipherOutputStream getDataStream(OutputStream stream, int initialOffset)
-    throws IOException, GeneralSecurityException {
-        throw new EncryptedDocumentException("this decryptor doesn't support writing directly to a stream");
-    }
-    
-    public SecretKey getSecretKey() {
-        return secretKey;
-    }
-
-    public void setSecretKey(SecretKey secretKey) {
-        this.secretKey = secretKey;
-    }
-
-    public EncryptionInfo getEncryptionInfo() {
-        return encryptionInfo;
-    }
-
-    public void setEncryptionInfo(EncryptionInfo encryptionInfo) {
-        this.encryptionInfo = encryptionInfo;
-    }
-
-    /**
-     * Sets the chunk size of the data stream.
-     * Needs to be set before the data stream is requested.
-     * When not set, the implementation uses method specific default values
-     *
-     * @param chunkSize the chunk size, i.e. the block size with the same encryption key
-     */
-    public void setChunkSize(int chunkSize) {
-        throw new EncryptedDocumentException("this decryptor doesn't support changing the chunk size");
-    }
-    
-    @Override
-    public Encryptor clone() throws CloneNotSupportedException {
-        Encryptor other = (Encryptor)super.clone();
-        other.secretKey = new SecretKeySpec(secretKey.getEncoded(), secretKey.getAlgorithm());
-        // encryptionInfo is set from outside
-        return other;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/HashAlgorithm.java b/trunk/src/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
deleted file mode 100644
index 24c4332..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import org.apache.poi.EncryptedDocumentException;
-
-public enum HashAlgorithm {
-    none     (         "", 0x0000,           "",  0,               "", false),
-    sha1     (    "SHA-1", 0x8004,       "SHA1", 20,       "HmacSHA1", false),
-    sha256   (  "SHA-256", 0x800C,     "SHA256", 32,     "HmacSHA256", false),
-    sha384   (  "SHA-384", 0x800D,     "SHA384", 48,     "HmacSHA384", false),
-    sha512   (  "SHA-512", 0x800E,     "SHA512", 64,     "HmacSHA512", false),
-    /* only for agile encryption */
-    md5      (      "MD5",     -1,        "MD5", 16,        "HmacMD5", false),
-    // although sunjc2 supports md2, hmac-md2 is only supported by bouncycastle
-    md2      (      "MD2",     -1,        "MD2", 16,       "Hmac-MD2", true),
-    md4      (      "MD4",     -1,        "MD4", 16,       "Hmac-MD4", true),
-    ripemd128("RipeMD128",     -1, "RIPEMD-128", 16, "HMac-RipeMD128", true),
-    ripemd160("RipeMD160",     -1, "RIPEMD-160", 20, "HMac-RipeMD160", true),
-    whirlpool("Whirlpool",     -1,  "WHIRLPOOL", 64, "HMac-Whirlpool", true),
-    // only for xml signing
-    sha224   (  "SHA-224",     -1,     "SHA224", 28,     "HmacSHA224", true);
-
-    public final String jceId;
-    public final int ecmaId;
-    public final String ecmaString;
-    public final int hashSize;
-    public final String jceHmacId;
-    public final boolean needsBouncyCastle;
-    
-    HashAlgorithm(String jceId, int ecmaId, String ecmaString, int hashSize, String jceHmacId, boolean needsBouncyCastle) {
-        this.jceId = jceId;
-        this.ecmaId = ecmaId;
-        this.ecmaString = ecmaString;
-        this.hashSize = hashSize;
-        this.jceHmacId = jceHmacId;
-        this.needsBouncyCastle = needsBouncyCastle;
-    }
-    
-    public static HashAlgorithm fromEcmaId(int ecmaId) {
-        for (HashAlgorithm ha : values()) {
-            if (ha.ecmaId == ecmaId) return ha;
-        }
-        throw new EncryptedDocumentException("hash algorithm not found");
-    }    
-    
-    public static HashAlgorithm fromEcmaId(String ecmaString) {
-        for (HashAlgorithm ha : values()) {
-            if (ha.ecmaString.equals(ecmaString)) return ha;
-        }
-        throw new EncryptedDocumentException("hash algorithm not found");
-    }
-    
-    public static HashAlgorithm fromString(String string) {
-        for (HashAlgorithm ha : values()) {
-            if (ha.ecmaString.equalsIgnoreCase(string) || ha.jceId.equalsIgnoreCase(string)) return ha;
-        }
-        throw new EncryptedDocumentException("hash algorithm not found");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
deleted file mode 100644
index e022734..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.binaryrc4;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.util.Arrays;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.*;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
-public class BinaryRC4Decryptor extends Decryptor implements Cloneable {
-    private long length = -1L;
-    private int chunkSize = 512;
-    
-    private class BinaryRC4CipherInputStream extends ChunkedCipherInputStream {
-
-        @Override
-        protected Cipher initCipherForBlock(Cipher existing, int block)
-                throws GeneralSecurityException {
-            return BinaryRC4Decryptor.this.initCipherForBlock(existing, block);
-        }
-
-        public BinaryRC4CipherInputStream(DocumentInputStream stream, long size)
-                throws GeneralSecurityException {
-            super(stream, size, chunkSize);
-        }
-
-        public BinaryRC4CipherInputStream(InputStream stream)
-                throws GeneralSecurityException {
-            super(stream, Integer.MAX_VALUE, chunkSize);
-        }    
-    }
-
-    protected BinaryRC4Decryptor() {
-    }
-
-    @Override
-    public boolean verifyPassword(String password) {
-        EncryptionVerifier ver = getEncryptionInfo().getVerifier();
-        SecretKey skey = generateSecretKey(password, ver);
-        try {
-            Cipher cipher = initCipherForBlock(null, 0, getEncryptionInfo(), skey, Cipher.DECRYPT_MODE);
-            byte encryptedVerifier[] = ver.getEncryptedVerifier();
-            byte verifier[] = new byte[encryptedVerifier.length];
-            cipher.update(encryptedVerifier, 0, encryptedVerifier.length, verifier);
-            setVerifier(verifier);
-            byte encryptedVerifierHash[] = ver.getEncryptedVerifierHash();
-            byte verifierHash[] = cipher.doFinal(encryptedVerifierHash);
-            HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-            MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo);
-            byte calcVerifierHash[] = hashAlg.digest(verifier);
-            if (Arrays.equals(calcVerifierHash, verifierHash)) {
-                setSecretKey(skey);
-                return true;
-            }
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException(e);
-        }
-        return false;
-    }
-
-    @Override
-    public Cipher initCipherForBlock(Cipher cipher, int block)
-    throws GeneralSecurityException {
-        return initCipherForBlock(cipher, block, getEncryptionInfo(), getSecretKey(), Cipher.DECRYPT_MODE);
-    }    
-    
-    protected static Cipher initCipherForBlock(Cipher cipher, int block,
-        EncryptionInfo encryptionInfo, SecretKey skey, int encryptMode)
-    throws GeneralSecurityException {
-        EncryptionVerifier ver = encryptionInfo.getVerifier();
-        HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-        byte blockKey[] = new byte[4];
-        LittleEndian.putUInt(blockKey, 0, block);
-        byte encKey[] = CryptoFunctions.generateKey(skey.getEncoded(), hashAlgo, blockKey, 16);
-        SecretKey key = new SecretKeySpec(encKey, skey.getAlgorithm());
-        if (cipher == null) {
-            EncryptionHeader em = encryptionInfo.getHeader();
-            cipher = CryptoFunctions.getCipher(key, em.getCipherAlgorithm(), null, null, encryptMode);
-        } else {
-            cipher.init(encryptMode, key);
-        }
-        return cipher;
-    }
-
-    protected static SecretKey generateSecretKey(String password, EncryptionVerifier ver) {
-        if (password.length() > 255) {
-            password = password.substring(0, 255);
-        }
-        HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-        MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo);
-        byte hash[] = hashAlg.digest(StringUtil.getToUnicodeLE(password));
-        byte salt[] = ver.getSalt();
-        hashAlg.reset();
-        for (int i = 0; i < 16; i++) {
-            hashAlg.update(hash, 0, 5);
-            hashAlg.update(salt);
-        }
-
-        hash = new byte[5];
-        System.arraycopy(hashAlg.digest(), 0, hash, 0, 5);
-        SecretKey skey = new SecretKeySpec(hash, ver.getCipherAlgorithm().jceId);
-        return skey;
-    }
-
-    @Override
-    @SuppressWarnings("resource")
-    public ChunkedCipherInputStream getDataStream(DirectoryNode dir) throws IOException,
-            GeneralSecurityException {
-        DocumentInputStream dis = dir.createDocumentInputStream(DEFAULT_POIFS_ENTRY);
-        length = dis.readLong();
-        return new BinaryRC4CipherInputStream(dis, length);
-    }
-    
-    @Override
-    public InputStream getDataStream(InputStream stream, int size, int initialPos)
-            throws IOException, GeneralSecurityException {
-        return new BinaryRC4CipherInputStream(stream);
-    }
-    
-
-    @Override
-    public long getLength() {
-        if (length == -1L) {
-            throw new IllegalStateException("Decryptor.getDataStream() was not called");
-        }
-        
-        return length;
-    }
-
-    @Override
-    public void setChunkSize(int chunkSize) {
-        this.chunkSize = chunkSize;
-    }
-    
-    @Override
-    public BinaryRC4Decryptor clone() throws CloneNotSupportedException {
-        return (BinaryRC4Decryptor)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java b/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
deleted file mode 100644
index b902201..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.binaryrc4;
-
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CipherProvider;
-import org.apache.poi.poifs.crypt.EncryptionHeader;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-
-public class BinaryRC4EncryptionHeader extends EncryptionHeader implements EncryptionRecord, Cloneable {
-
-    protected BinaryRC4EncryptionHeader() {
-        setCipherAlgorithm(CipherAlgorithm.rc4);
-        setKeySize(40);
-        setBlockSize(-1);
-        setCipherProvider(CipherProvider.rc4);
-        setHashAlgorithm(HashAlgorithm.md5);
-        setSizeExtra(0);
-        setFlags(0);
-        setCspName("");
-        setChainingMode(null);
-    }
-
-    @Override
-    public void write(LittleEndianByteArrayOutputStream littleendianbytearrayoutputstream) {
-    }
-
-    @Override
-    public BinaryRC4EncryptionHeader clone() throws CloneNotSupportedException {
-        return (BinaryRC4EncryptionHeader)super.clone();
-    }
-    
-    
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java b/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
deleted file mode 100644
index 94ddde7..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.binaryrc4;
-
-import java.io.IOException;
-import org.apache.poi.poifs.crypt.*;
-import org.apache.poi.util.LittleEndianInput;
-
-public class BinaryRC4EncryptionInfoBuilder implements EncryptionInfoBuilder {
-
-    public BinaryRC4EncryptionInfoBuilder() {
-    }
-
-    @Override
-    public void initialize(EncryptionInfo info, LittleEndianInput dis)
-    throws IOException {
-        int vMajor = info.getVersionMajor();
-        int vMinor = info.getVersionMinor();
-        assert (vMajor == 1 && vMinor == 1);
-
-        info.setHeader(new BinaryRC4EncryptionHeader());
-        info.setVerifier(new BinaryRC4EncryptionVerifier(dis));
-        Decryptor dec = new BinaryRC4Decryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        Encryptor enc = new BinaryRC4Encryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-
-    @Override
-    public void initialize(EncryptionInfo info,
-        CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm,
-        int keyBits, int blockSize, ChainingMode chainingMode) {
-        info.setHeader(new BinaryRC4EncryptionHeader());
-        info.setVerifier(new BinaryRC4EncryptionVerifier());
-        Decryptor dec = new BinaryRC4Decryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        Encryptor enc = new BinaryRC4Encryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java b/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
deleted file mode 100644
index 654b64a..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.binaryrc4;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.*;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInput;
-
-public class BinaryRC4EncryptionVerifier extends EncryptionVerifier implements EncryptionRecord, Cloneable {
-
-    protected BinaryRC4EncryptionVerifier() {
-        setSpinCount(-1);
-        setCipherAlgorithm(CipherAlgorithm.rc4);
-        setChainingMode(null);
-        setEncryptedKey(null);
-        setHashAlgorithm(HashAlgorithm.md5);
-    }
-
-    protected BinaryRC4EncryptionVerifier(LittleEndianInput is) {
-        byte salt[] = new byte[16];
-        is.readFully(salt);
-        setSalt(salt);
-        byte encryptedVerifier[] = new byte[16];
-        is.readFully(encryptedVerifier);
-        setEncryptedVerifier(encryptedVerifier);
-        byte encryptedVerifierHash[] = new byte[16];
-        is.readFully(encryptedVerifierHash);
-        setEncryptedVerifierHash(encryptedVerifierHash);
-        setSpinCount(-1);
-        setCipherAlgorithm(CipherAlgorithm.rc4);
-        setChainingMode(null);
-        setEncryptedKey(null);
-        setHashAlgorithm(HashAlgorithm.md5);
-    }
-
-    @Override
-    protected void setSalt(byte salt[]) {
-        if (salt == null || salt.length != 16) {
-            throw new EncryptedDocumentException("invalid verifier salt");
-        }
-        
-        super.setSalt(salt);
-    }
-
-    @Override
-    protected void setEncryptedVerifier(byte encryptedVerifier[]) {
-        super.setEncryptedVerifier(encryptedVerifier);
-    }
-
-    @Override
-    protected void setEncryptedVerifierHash(byte encryptedVerifierHash[]) {
-        super.setEncryptedVerifierHash(encryptedVerifierHash);
-    }
-
-    @Override
-    public void write(LittleEndianByteArrayOutputStream bos) {
-        byte salt[] = getSalt();
-        assert (salt.length == 16);
-        bos.write(salt);
-        byte encryptedVerifier[] = getEncryptedVerifier();
-        assert (encryptedVerifier.length == 16);
-        bos.write(encryptedVerifier);
-        byte encryptedVerifierHash[] = getEncryptedVerifierHash();
-        assert (encryptedVerifierHash.length == 16);
-        bos.write(encryptedVerifierHash);
-    }
-
-    @Override
-    public BinaryRC4EncryptionVerifier clone() throws CloneNotSupportedException {
-        return (BinaryRC4EncryptionVerifier)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
deleted file mode 100644
index 15bb476..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.binaryrc4;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.Random;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChunkedCipherOutputStream;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.DataSpaceMapUtils;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-
-public class BinaryRC4Encryptor extends Encryptor implements Cloneable {
-
-    private int chunkSize = 512;
-    
-    protected BinaryRC4Encryptor() {
-    }
-
-    @Override
-    public void confirmPassword(String password) {
-        Random r = new SecureRandom();
-        byte salt[] = new byte[16];
-        byte verifier[] = new byte[16];
-        r.nextBytes(salt);
-        r.nextBytes(verifier);
-        confirmPassword(password, null, null, verifier, salt, null);
-    }
-
-    @Override
-    public void confirmPassword(String password, byte keySpec[],
-            byte keySalt[], byte verifier[], byte verifierSalt[],
-            byte integritySalt[]) {
-        BinaryRC4EncryptionVerifier ver = (BinaryRC4EncryptionVerifier)getEncryptionInfo().getVerifier();
-        ver.setSalt(verifierSalt);
-        SecretKey skey = BinaryRC4Decryptor.generateSecretKey(password, ver);
-        setSecretKey(skey);
-        try {
-            Cipher cipher = BinaryRC4Decryptor.initCipherForBlock(null, 0, getEncryptionInfo(), skey, Cipher.ENCRYPT_MODE);
-            byte encryptedVerifier[] = new byte[16];
-            cipher.update(verifier, 0, 16, encryptedVerifier);
-            ver.setEncryptedVerifier(encryptedVerifier);
-            HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-            MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo);
-            byte calcVerifierHash[] = hashAlg.digest(verifier);
-            byte encryptedVerifierHash[] = cipher.doFinal(calcVerifierHash);
-            ver.setEncryptedVerifierHash(encryptedVerifierHash);
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException("Password confirmation failed", e);
-        }
-    }
-
-    @Override
-    public OutputStream getDataStream(DirectoryNode dir)
-    throws IOException, GeneralSecurityException {
-        OutputStream countStream = new BinaryRC4CipherOutputStream(dir);
-        return countStream;
-    }
-
-    @Override
-    public BinaryRC4CipherOutputStream getDataStream(OutputStream stream, int initialOffset)
-    throws IOException, GeneralSecurityException {
-        return new BinaryRC4CipherOutputStream(stream);
-    }
-    
-    protected int getKeySizeInBytes() {
-        return getEncryptionInfo().getHeader().getKeySize() / 8;
-    }
-
-    protected void createEncryptionInfoEntry(DirectoryNode dir) throws IOException {
-        DataSpaceMapUtils.addDefaultDataSpace(dir);
-        final EncryptionInfo info = getEncryptionInfo();
-        final BinaryRC4EncryptionHeader header = (BinaryRC4EncryptionHeader)info.getHeader();
-        final BinaryRC4EncryptionVerifier verifier = (BinaryRC4EncryptionVerifier)info.getVerifier();
-        EncryptionRecord er = new EncryptionRecord() {
-            @Override
-            public void write(LittleEndianByteArrayOutputStream bos) {
-                bos.writeShort(info.getVersionMajor());
-                bos.writeShort(info.getVersionMinor());
-                header.write(bos);
-                verifier.write(bos);
-            }
-        };
-        DataSpaceMapUtils.createEncryptionEntry(dir, "EncryptionInfo", er);
-    }
-
-    @Override
-    public void setChunkSize(int chunkSize) {
-        this.chunkSize = chunkSize;
-    }
-    
-    @Override
-    public BinaryRC4Encryptor clone() throws CloneNotSupportedException {
-        return (BinaryRC4Encryptor)super.clone();
-    }
-
-    protected class BinaryRC4CipherOutputStream extends ChunkedCipherOutputStream {
-
-        public BinaryRC4CipherOutputStream(OutputStream stream)
-        throws IOException, GeneralSecurityException {
-            super(stream, BinaryRC4Encryptor.this.chunkSize);
-        }
-
-        public BinaryRC4CipherOutputStream(DirectoryNode dir)
-        throws IOException, GeneralSecurityException {
-            super(dir, BinaryRC4Encryptor.this.chunkSize);
-        }
-
-        @Override
-        protected Cipher initCipherForBlock(Cipher cipher, int block, boolean lastChunk)
-        throws GeneralSecurityException {
-            return BinaryRC4Decryptor.initCipherForBlock(cipher, block, getEncryptionInfo(), getSecretKey(), Cipher.ENCRYPT_MODE);
-        }
-        
-        @Override
-        protected void calculateChecksum(File file, int i) {
-        }
-
-        @Override
-        protected void createEncryptionInfoEntry(DirectoryNode dir, File tmpFile)
-        throws IOException, GeneralSecurityException {
-            BinaryRC4Encryptor.this.createEncryptionInfoEntry(dir);
-        }
-
-        @Override
-        public void flush() throws IOException {
-            writeChunk(false);
-            super.flush();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
deleted file mode 100644
index e781c9d..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.cryptoapi;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.util.Arrays;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChunkedCipherInputStream;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionHeader;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionVerifier;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.BoundedInputStream;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianInputStream;
-import org.apache.poi.util.StringUtil;
-
-public class CryptoAPIDecryptor extends Decryptor implements Cloneable {
-
-    private long length = -1L;
-    private int chunkSize = -1;
-    
-    static class StreamDescriptorEntry {
-        static BitField flagStream = BitFieldFactory.getInstance(1);
-        
-        int streamOffset;
-        int streamSize;
-        int block;
-        int flags;
-        int reserved2;
-        String streamName;
-    }
-
-    protected CryptoAPIDecryptor() {
-    }
-
-    @Override
-    public boolean verifyPassword(String password) {
-        EncryptionVerifier ver = getEncryptionInfo().getVerifier();
-        SecretKey skey = generateSecretKey(password, ver);
-        try {
-            Cipher cipher = initCipherForBlock(null, 0, getEncryptionInfo(), skey, Cipher.DECRYPT_MODE);
-            byte encryptedVerifier[] = ver.getEncryptedVerifier();
-            byte verifier[] = new byte[encryptedVerifier.length];
-            cipher.update(encryptedVerifier, 0, encryptedVerifier.length, verifier);
-            setVerifier(verifier);
-            byte encryptedVerifierHash[] = ver.getEncryptedVerifierHash();
-            byte verifierHash[] = cipher.doFinal(encryptedVerifierHash);
-            HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-            MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo);
-            byte calcVerifierHash[] = hashAlg.digest(verifier);
-            if (Arrays.equals(calcVerifierHash, verifierHash)) {
-                setSecretKey(skey);
-                return true;
-            }
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException(e);
-        }
-        return false;
-    }
-
-    @Override
-    public Cipher initCipherForBlock(Cipher cipher, int block)
-    throws GeneralSecurityException {
-        EncryptionInfo ei = getEncryptionInfo();
-        SecretKey sk = getSecretKey();
-        return initCipherForBlock(cipher, block, ei, sk, Cipher.DECRYPT_MODE);
-    }
-
-    protected static Cipher initCipherForBlock(Cipher cipher, int block,
-        EncryptionInfo encryptionInfo, SecretKey skey, int encryptMode)
-    throws GeneralSecurityException {
-        EncryptionVerifier ver = encryptionInfo.getVerifier();
-        HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-        byte blockKey[] = new byte[4];
-        LittleEndian.putUInt(blockKey, 0, block);
-        MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo);
-        hashAlg.update(skey.getEncoded());
-        byte encKey[] = hashAlg.digest(blockKey);
-        EncryptionHeader header = encryptionInfo.getHeader();
-        int keyBits = header.getKeySize();
-        encKey = CryptoFunctions.getBlock0(encKey, keyBits / 8);
-        if (keyBits == 40) {
-            encKey = CryptoFunctions.getBlock0(encKey, 16);
-        }
-        SecretKey key = new SecretKeySpec(encKey, skey.getAlgorithm());
-        if (cipher == null) {
-            cipher = CryptoFunctions.getCipher(key, header.getCipherAlgorithm(), null, null, encryptMode);
-        } else {
-            cipher.init(encryptMode, key);
-        }
-        return cipher;
-    }
-
-    protected static SecretKey generateSecretKey(String password, EncryptionVerifier ver) {
-        if (password.length() > 255) {
-            password = password.substring(0, 255);
-        }
-        HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-        MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo);
-        hashAlg.update(ver.getSalt());
-        byte hash[] = hashAlg.digest(StringUtil.getToUnicodeLE(password));
-        SecretKey skey = new SecretKeySpec(hash, ver.getCipherAlgorithm().jceId);
-        return skey;
-    }
-
-    @Override
-    public ChunkedCipherInputStream getDataStream(DirectoryNode dir)
-    throws IOException, GeneralSecurityException {
-        throw new IOException("not supported");
-    }
-
-    @Override
-    public ChunkedCipherInputStream getDataStream(InputStream stream, int size, int initialPos)
-            throws IOException, GeneralSecurityException {
-        return new CryptoAPICipherInputStream(stream, size, initialPos);
-    }
-    
-    /**
-     * Decrypt the Document-/SummaryInformation and other optionally streams.
-     * Opposed to other crypto modes, cryptoapi is record based and can't be used
-     * to stream-decrypt a whole file
-     * 
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd943321(v=office.12).aspx">2.3.5.4 RC4 CryptoAPI Encrypted Summary Stream</a>
-     */
-    public POIFSFileSystem getSummaryEntries(DirectoryNode root, String encryptedStream)
-    throws IOException, GeneralSecurityException {
-        POIFSFileSystem fsOut = new POIFSFileSystem();
-        // HSLF: encryptedStream
-        // HSSF: encryption
-        DocumentNode es = (DocumentNode) root.getEntry(encryptedStream);
-        DocumentInputStream dis = root.createDocumentInputStream(es);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        IOUtils.copy(dis, bos);
-        dis.close();
-        CryptoAPIDocumentInputStream sbis = new CryptoAPIDocumentInputStream(this, bos.toByteArray());
-        LittleEndianInputStream leis = new LittleEndianInputStream(sbis);
-        int streamDescriptorArrayOffset = (int) leis.readUInt();
-        /* int streamDescriptorArraySize = (int) */ leis.readUInt();
-        sbis.skip(streamDescriptorArrayOffset - 8);
-        sbis.setBlock(0);
-        int encryptedStreamDescriptorCount = (int) leis.readUInt();
-        StreamDescriptorEntry entries[] = new StreamDescriptorEntry[encryptedStreamDescriptorCount];
-        for (int i = 0; i < encryptedStreamDescriptorCount; i++) {
-            StreamDescriptorEntry entry = new StreamDescriptorEntry();
-            entries[i] = entry;
-            entry.streamOffset = (int) leis.readUInt();
-            entry.streamSize = (int) leis.readUInt();
-            entry.block = leis.readUShort();
-            int nameSize = leis.readUByte();
-            entry.flags = leis.readUByte();
-            // boolean isStream = StreamDescriptorEntry.flagStream.isSet(entry.flags);
-            entry.reserved2 = leis.readInt();
-            entry.streamName = StringUtil.readUnicodeLE(leis, nameSize);
-            leis.readShort();
-            assert(entry.streamName.length() == nameSize);
-        }
-
-        for (StreamDescriptorEntry entry : entries) {
-            sbis.seek(entry.streamOffset);
-            sbis.setBlock(entry.block);
-            InputStream is = new BoundedInputStream(sbis, entry.streamSize);
-            fsOut.createDocument(is, entry.streamName);
-            is.close();
-        }
-
-        leis.close();
-        sbis.close();
-        sbis = null;
-        return fsOut;
-    }
-
-    /**
-     * @return the length of the stream returned by {@link #getDataStream(DirectoryNode)}
-     */
-    @Override
-    public long getLength() {
-        if (length == -1L) {
-            throw new IllegalStateException("Decryptor.getDataStream() was not called");
-        }
-        return length;
-    }
-
-    public void setChunkSize(int chunkSize) {
-        this.chunkSize = chunkSize;
-    }
-    
-    @Override
-    public CryptoAPIDecryptor clone() throws CloneNotSupportedException {
-        return (CryptoAPIDecryptor)super.clone();
-    }
-
-    private class CryptoAPICipherInputStream extends ChunkedCipherInputStream {
-
-        @Override
-        protected Cipher initCipherForBlock(Cipher existing, int block)
-                throws GeneralSecurityException {
-            return CryptoAPIDecryptor.this.initCipherForBlock(existing, block);
-        }
-
-        public CryptoAPICipherInputStream(InputStream stream, long size, int initialPos)
-                throws GeneralSecurityException {
-            super(stream, size, chunkSize, initialPos);
-        }    
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java b/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
deleted file mode 100644
index 5736649..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.cryptoapi;
-
-import java.io.ByteArrayInputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.Cipher;
-import javax.crypto.ShortBufferException;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.util.Internal;
-
-/**
- * A seekable InputStream, which is used to decrypt/extract the document entries
- * within the encrypted stream 
- */
-@Internal
-/* package */ class CryptoAPIDocumentInputStream extends ByteArrayInputStream {
-    private Cipher cipher;
-    private final CryptoAPIDecryptor decryptor;
-    private byte oneByte[] = { 0 };
-    
-    public void seek(int newpos) {
-        if (newpos > count) {
-            throw new ArrayIndexOutOfBoundsException(newpos);
-        }
-        
-        this.pos = newpos;
-        mark = newpos;
-    }
-
-    public void setBlock(int block) throws GeneralSecurityException {
-        cipher = decryptor.initCipherForBlock(cipher, block);
-    }
-
-    @Override
-    public synchronized int read() {
-        int ch = super.read();
-        if (ch == -1) {
-            return -1;
-        }
-        oneByte[0] = (byte) ch;
-        try {
-            cipher.update(oneByte, 0, 1, oneByte);
-        } catch (ShortBufferException e) {
-            throw new EncryptedDocumentException(e);
-        }
-        return oneByte[0];
-    }
-
-    @Override
-    public synchronized int read(byte b[], int off, int len) {
-        int readLen = super.read(b, off, len);
-        if (readLen ==-1) {
-            return -1;
-        }
-        try {
-            cipher.update(b, off, readLen, b, off);
-        } catch (ShortBufferException e) {
-            throw new EncryptedDocumentException(e);
-        }
-        return readLen;
-    }
-
-    public CryptoAPIDocumentInputStream(CryptoAPIDecryptor decryptor, byte buf[])
-    throws GeneralSecurityException {
-        super(buf);
-        this.decryptor = decryptor;
-        cipher = decryptor.initCipherForBlock(null, 0);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java b/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
deleted file mode 100644
index 5fa9564..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.cryptoapi;
-
-import java.io.ByteArrayOutputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.Cipher;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.util.Internal;
-
-/**
- * An OutputStream for the document entries within the encrypted stream
- */
-@Internal
-/* package */ class CryptoAPIDocumentOutputStream extends ByteArrayOutputStream {
-    private final Cipher cipher;
-    private final CryptoAPIEncryptor encryptor;
-    private final byte oneByte[] = { 0 };
-
-    public CryptoAPIDocumentOutputStream(CryptoAPIEncryptor encryptor) throws GeneralSecurityException {
-        this.encryptor = encryptor;
-        cipher = encryptor.initCipherForBlock(null, 0);
-    }
-    
-    public byte[] getBuf() {
-        return buf;
-    }
-    
-    public void setSize(int count) {
-        this.count = count;
-    }
-    
-    public void setBlock(int block) throws GeneralSecurityException {
-        encryptor.initCipherForBlock(cipher, block);
-    }
-    
-    @Override
-    public void write(int b) {
-        try {
-            oneByte[0] = (byte)b;
-            cipher.update(oneByte, 0, 1, oneByte, 0);
-            super.write(oneByte);
-        } catch (Exception e) {
-            throw new EncryptedDocumentException(e);
-        }
-    }
-
-    @Override
-    public void write(byte[] b, int off, int len) {
-        try {
-            cipher.update(b, off, len, b, off);
-            super.write(b, off, len);
-        } catch (Exception e) {
-            throw new EncryptedDocumentException(e);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java b/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
deleted file mode 100644
index b54dc2f..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.cryptoapi;
-
-import java.io.IOException;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CipherProvider;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.standard.StandardEncryptionHeader;
-import org.apache.poi.util.LittleEndianInput;
-
-public class CryptoAPIEncryptionHeader extends StandardEncryptionHeader implements Cloneable {
-
-    public CryptoAPIEncryptionHeader(LittleEndianInput is) throws IOException {
-        super(is);
-    }
-
-    protected CryptoAPIEncryptionHeader(CipherAlgorithm cipherAlgorithm,
-            HashAlgorithm hashAlgorithm, int keyBits, int blockSize,
-            ChainingMode chainingMode) {
-        super(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode);
-    }
-
-    @Override
-    public void setKeySize(int keyBits) {
-        // Microsoft Base Cryptographic Provider is limited up to 40 bits
-        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa375599(v=vs.85).aspx
-        boolean found = false;
-        for (int size : getCipherAlgorithm().allowedKeySize) {
-            if (size == keyBits) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            throw new EncryptedDocumentException("invalid keysize "+keyBits+" for cipher algorithm "+getCipherAlgorithm());
-        }
-        super.setKeySize(keyBits);
-        if (keyBits > 40) {
-            setCspName("Microsoft Enhanced Cryptographic Provider v1.0");
-        } else {
-            setCspName(CipherProvider.rc4.cipherProviderName);
-        }
-    }
-
-    @Override
-    public CryptoAPIEncryptionHeader clone() throws CloneNotSupportedException {
-        return (CryptoAPIEncryptionHeader)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java b/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
deleted file mode 100644
index fef4dde..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.cryptoapi;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.crypt.*;
-import org.apache.poi.util.LittleEndianInput;
-
-public class CryptoAPIEncryptionInfoBuilder implements EncryptionInfoBuilder {
-    public CryptoAPIEncryptionInfoBuilder() {
-    }
-
-    /**
-     * initialize the builder from a stream
-     */
-    @Override
-    public void initialize(EncryptionInfo info, LittleEndianInput dis)
-    throws IOException {
-        /* int hSize = */ dis.readInt();
-        CryptoAPIEncryptionHeader header = new CryptoAPIEncryptionHeader(dis);
-        info.setHeader(header);
-        info.setVerifier(new CryptoAPIEncryptionVerifier(dis, header));
-        CryptoAPIDecryptor dec = new CryptoAPIDecryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        CryptoAPIEncryptor enc = new CryptoAPIEncryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-
-    /**
-     * initialize the builder from scratch
-     */
-    @Override
-    public void initialize(EncryptionInfo info,
-            CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm,
-            int keyBits, int blockSize, ChainingMode chainingMode) {
-        if (cipherAlgorithm == null) {
-            cipherAlgorithm = CipherAlgorithm.rc4;
-        }
-        if (hashAlgorithm == null) {
-            hashAlgorithm = HashAlgorithm.sha1;
-        }
-        if (keyBits == -1) {
-            keyBits = 0x28;
-        } 
-        assert(cipherAlgorithm == CipherAlgorithm.rc4 && hashAlgorithm == HashAlgorithm.sha1);
-        
-        info.setHeader(new CryptoAPIEncryptionHeader(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
-        info.setVerifier(new CryptoAPIEncryptionVerifier(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
-        CryptoAPIDecryptor dec = new CryptoAPIDecryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        CryptoAPIEncryptor enc = new CryptoAPIEncryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java b/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
deleted file mode 100644
index d2c87b7..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.cryptoapi;
-
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.standard.StandardEncryptionVerifier;
-import org.apache.poi.util.LittleEndianInput;
-
-public class CryptoAPIEncryptionVerifier extends StandardEncryptionVerifier implements Cloneable {
-
-    protected CryptoAPIEncryptionVerifier(LittleEndianInput is,
-            CryptoAPIEncryptionHeader header) {
-        super(is, header);
-    }
-
-    protected CryptoAPIEncryptionVerifier(CipherAlgorithm cipherAlgorithm,
-            HashAlgorithm hashAlgorithm, int keyBits, int blockSize,
-            ChainingMode chainingMode) {
-        super(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode);
-    }
-
-    @Override
-    protected void setSalt(byte salt[]) {
-        super.setSalt(salt);
-    }
-
-    @Override
-    protected void setEncryptedVerifier(byte encryptedVerifier[]) {
-        super.setEncryptedVerifier(encryptedVerifier);
-    }
-
-    @Override
-    protected void setEncryptedVerifierHash(byte encryptedVerifierHash[]) {
-        super.setEncryptedVerifierHash(encryptedVerifierHash);
-    }
-
-    @Override
-    public CryptoAPIEncryptionVerifier clone() throws CloneNotSupportedException {
-        return (CryptoAPIEncryptionVerifier)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
deleted file mode 100644
index d04096c..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.cryptoapi;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.WritingNotSupportedException;
-import org.apache.poi.poifs.crypt.ChunkedCipherOutputStream;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.DataSpaceMapUtils;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIDecryptor.StreamDescriptorEntry;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.StringUtil;
-
-public class CryptoAPIEncryptor extends Encryptor implements Cloneable {
-    
-    private int chunkSize = 512;
-    
-    protected CryptoAPIEncryptor() {
-    }
-
-    @Override
-    public void confirmPassword(String password) {
-        Random r = new SecureRandom();
-        byte salt[] = new byte[16];
-        byte verifier[] = new byte[16];
-        r.nextBytes(salt);
-        r.nextBytes(verifier);
-        confirmPassword(password, null, null, verifier, salt, null);
-    }
-
-    @Override
-    public void confirmPassword(String password, byte keySpec[],
-            byte keySalt[], byte verifier[], byte verifierSalt[],
-            byte integritySalt[]) {
-        assert(verifier != null && verifierSalt != null);
-        CryptoAPIEncryptionVerifier ver = (CryptoAPIEncryptionVerifier)getEncryptionInfo().getVerifier();
-        ver.setSalt(verifierSalt);
-        SecretKey skey = CryptoAPIDecryptor.generateSecretKey(password, ver);
-        setSecretKey(skey);
-        try {
-            Cipher cipher = initCipherForBlock(null, 0);
-            byte encryptedVerifier[] = new byte[verifier.length];
-            cipher.update(verifier, 0, verifier.length, encryptedVerifier);
-            ver.setEncryptedVerifier(encryptedVerifier);
-            HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-            MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo);
-            byte calcVerifierHash[] = hashAlg.digest(verifier);
-            byte encryptedVerifierHash[] = cipher.doFinal(calcVerifierHash);
-            ver.setEncryptedVerifierHash(encryptedVerifierHash);
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException("Password confirmation failed", e);
-        }
-    }
-
-    /**
-     * Initializes a cipher object for a given block index for encryption
-     *
-     * @param cipher may be null, otherwise the given instance is reset to the new block index
-     * @param block the block index, e.g. the persist/slide id (hslf)
-     * @return a new cipher object, if cipher was null, otherwise the reinitialized cipher
-     * @throws GeneralSecurityException
-     */
-    public Cipher initCipherForBlock(Cipher cipher, int block)
-    throws GeneralSecurityException {
-        return CryptoAPIDecryptor.initCipherForBlock(cipher, block, getEncryptionInfo(), getSecretKey(), Cipher.ENCRYPT_MODE);
-    }    
-
-    @Override
-    public ChunkedCipherOutputStream getDataStream(DirectoryNode dir)
-    throws IOException, GeneralSecurityException {
-        throw new IOException("not supported");
-    }
-    
-    @Override
-    public CryptoAPICipherOutputStream getDataStream(OutputStream stream, int initialOffset)
-    throws IOException, GeneralSecurityException {
-        return new CryptoAPICipherOutputStream(stream);
-    }
-    
-    /**
-     * Encrypt the Document-/SummaryInformation and other optionally streams.
-     * Opposed to other crypto modes, cryptoapi is record based and can't be used
-     * to stream-encrypt a whole file
-     * 
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd943321(v=office.12).aspx">2.3.5.4 RC4 CryptoAPI Encrypted Summary Stream</a>
-     */
-    public OutputStream getSummaryEntries(DirectoryNode dir)
-    throws IOException, GeneralSecurityException {
-        CryptoAPIDocumentOutputStream bos = new CryptoAPIDocumentOutputStream(this);
-        byte buf[] = new byte[8];
-        
-        bos.write(buf, 0, 8); // skip header
-        String entryNames[] = {
-            SummaryInformation.DEFAULT_STREAM_NAME,
-            DocumentSummaryInformation.DEFAULT_STREAM_NAME
-        };
-        
-        List<StreamDescriptorEntry> descList = new ArrayList<StreamDescriptorEntry>();
-
-        int block = 0;
-        for (String entryName : entryNames) {
-            if (!dir.hasEntry(entryName)) {
-                continue;
-            }
-            StreamDescriptorEntry descEntry = new StreamDescriptorEntry();
-            descEntry.block = block;
-            descEntry.streamOffset = bos.size();
-            descEntry.streamName = entryName;
-            descEntry.flags = StreamDescriptorEntry.flagStream.setValue(0, 1);
-            descEntry.reserved2 = 0;
-            
-            bos.setBlock(block);
-            DocumentInputStream dis = dir.createDocumentInputStream(entryName);
-            IOUtils.copy(dis, bos);
-            dis.close();
-            
-            descEntry.streamSize = bos.size() - descEntry.streamOffset;
-            descList.add(descEntry);
-            
-            dir.getEntry(entryName).delete();
-            
-            block++;
-        }
-        
-        int streamDescriptorArrayOffset = bos.size();
-        
-        bos.setBlock(0);
-        LittleEndian.putUInt(buf, 0, descList.size());
-        bos.write(buf, 0, 4);
-        
-        for (StreamDescriptorEntry sde : descList) {
-            LittleEndian.putUInt(buf, 0, sde.streamOffset);
-            bos.write(buf, 0, 4);
-            LittleEndian.putUInt(buf, 0, sde.streamSize);
-            bos.write(buf, 0, 4);
-            LittleEndian.putUShort(buf, 0, sde.block);
-            bos.write(buf, 0, 2);
-            LittleEndian.putUByte(buf, 0, (short)sde.streamName.length());
-            bos.write(buf, 0, 1);
-            LittleEndian.putUByte(buf, 0, (short)sde.flags);
-            bos.write(buf, 0, 1);
-            LittleEndian.putUInt(buf, 0, sde.reserved2);
-            bos.write(buf, 0, 4);
-            byte nameBytes[] = StringUtil.getToUnicodeLE(sde.streamName);
-            bos.write(nameBytes, 0, nameBytes.length);
-            LittleEndian.putShort(buf, 0, (short)0); // null-termination
-            bos.write(buf, 0, 2);
-        }
-        
-        int savedSize = bos.size();
-        int streamDescriptorArraySize = savedSize - streamDescriptorArrayOffset;
-        LittleEndian.putUInt(buf, 0, streamDescriptorArrayOffset);
-        LittleEndian.putUInt(buf, 4, streamDescriptorArraySize);
-
-        bos.reset();
-        bos.setBlock(0);
-        bos.write(buf, 0, 8);
-        bos.setSize(savedSize);
-        
-        dir.createDocument("EncryptedSummary", new ByteArrayInputStream(bos.getBuf(), 0, savedSize));
-        DocumentSummaryInformation dsi = PropertySetFactory.newDocumentSummaryInformation();
-        
-        try {
-            dsi.write(dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        } catch (WritingNotSupportedException e) {
-            throw new IOException(e);
-        }
-        
-        return bos;
-    }
-
-    protected int getKeySizeInBytes() {
-        return getEncryptionInfo().getHeader().getKeySize() / 8;
-    }
-
-    @Override
-    public void setChunkSize(int chunkSize) {
-        this.chunkSize = chunkSize;
-    }
-    
-    protected void createEncryptionInfoEntry(DirectoryNode dir) throws IOException {
-        DataSpaceMapUtils.addDefaultDataSpace(dir);
-        final EncryptionInfo info = getEncryptionInfo();
-        final CryptoAPIEncryptionHeader header = (CryptoAPIEncryptionHeader)getEncryptionInfo().getHeader();
-        final CryptoAPIEncryptionVerifier verifier = (CryptoAPIEncryptionVerifier)getEncryptionInfo().getVerifier();
-        EncryptionRecord er = new EncryptionRecord() {
-            @Override
-            public void write(LittleEndianByteArrayOutputStream bos) {
-                bos.writeShort(info.getVersionMajor());
-                bos.writeShort(info.getVersionMinor());
-                header.write(bos);
-                verifier.write(bos);
-            }
-        };
-        DataSpaceMapUtils.createEncryptionEntry(dir, "EncryptionInfo", er);
-    }
-
-
-    @Override
-    public CryptoAPIEncryptor clone() throws CloneNotSupportedException {
-        return (CryptoAPIEncryptor)super.clone();
-    }
-
-    protected class CryptoAPICipherOutputStream extends ChunkedCipherOutputStream {
-
-        @Override
-        protected Cipher initCipherForBlock(Cipher cipher, int block, boolean lastChunk)
-        throws IOException, GeneralSecurityException {
-            flush();
-            EncryptionInfo ei = getEncryptionInfo();
-            SecretKey sk = getSecretKey();
-            return CryptoAPIDecryptor.initCipherForBlock(cipher, block, ei, sk, Cipher.ENCRYPT_MODE);
-        }
-
-        @Override
-        protected void calculateChecksum(File file, int i) {
-        }
-
-        @Override
-        protected void createEncryptionInfoEntry(DirectoryNode dir, File tmpFile)
-        throws IOException, GeneralSecurityException {
-            throw new EncryptedDocumentException("createEncryptionInfoEntry not supported");
-        }
-
-        public CryptoAPICipherOutputStream(OutputStream stream)
-        throws IOException, GeneralSecurityException {
-            super(stream, CryptoAPIEncryptor.this.chunkSize);
-        }
-
-        @Override
-        public void flush() throws IOException {
-            writeChunk(false);
-            super.flush();
-        }
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/package.html b/trunk/src/java/org/apache/poi/poifs/crypt/package.html
deleted file mode 100644
index 977cf8b..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/package.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-<p>Implementation of the <a href="http://msdn.microsoft.com/en-us/library/dd952186(v=office.12).aspx">ECMA-376 Document Encryption</a></p>
-<p>The implementation is split into three packages:</p>
-<ul>
-<li>This package contains common functions for both current implemented cipher modes.</li>
-<li>the {@link org.apache.poi.poifs.crypt.standard standard} package is part of the base poi jar and contains classes for the standard encryption ...</li>
-<li>the {@link org.apache.poi.poifs.crypt.agile agile} package is part of the poi ooxml jar and the provides agile encryption support.</li>
-</ul>
-
-<h2>Related Documentation</h2>
-
-Some implementations informations can be found under:
-<ul>
-<li><a href="http://poi.apache.org/encryption.html">Apache POI - Encryption support</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.poifs.crypt.standard
-@see org.apache.poi.poifs.crypt.agile
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java b/trunk/src/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
deleted file mode 100644
index bf65fbe..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.standard;
-
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-
-public interface EncryptionRecord {
-    void write(LittleEndianByteArrayOutputStream os);
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
deleted file mode 100644
index d06f9a3..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.standard;
-
-import static org.apache.poi.poifs.crypt.CryptoFunctions.hashPassword;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.util.Arrays;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionHeader;
-import org.apache.poi.poifs.crypt.EncryptionVerifier;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.util.BoundedInputStream;
-import org.apache.poi.util.LittleEndian;
-
-/**
- */
-public class StandardDecryptor extends Decryptor implements Cloneable {
-    private long _length = -1;
-
-    protected StandardDecryptor() {
-    }
-
-    @Override
-    public boolean verifyPassword(String password) {
-        EncryptionVerifier ver = getEncryptionInfo().getVerifier();
-        SecretKey skey = generateSecretKey(password, ver, getKeySizeInBytes());
-        Cipher cipher = getCipher(skey);
-
-        try {
-            byte encryptedVerifier[] = ver.getEncryptedVerifier();
-            byte verifier[] = cipher.doFinal(encryptedVerifier);
-            setVerifier(verifier);
-            MessageDigest sha1 = CryptoFunctions.getMessageDigest(ver.getHashAlgorithm());
-            byte[] calcVerifierHash = sha1.digest(verifier);
-            byte encryptedVerifierHash[] = ver.getEncryptedVerifierHash();
-            byte decryptedVerifierHash[] = cipher.doFinal(encryptedVerifierHash);
-
-            // see 2.3.4.9 Password Verification (Standard Encryption)
-            // ... The number of bytes used by the encrypted Verifier hash MUST be 32 ...
-            // TODO: check and trim/pad the hashes to 32
-            byte[] verifierHash = Arrays.copyOf(decryptedVerifierHash, calcVerifierHash.length);
-    
-            if (Arrays.equals(calcVerifierHash, verifierHash)) {
-                setSecretKey(skey);
-                return true;
-            } else {
-                return false;
-            }
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException(e);
-        }
-    }
-    
-    protected static SecretKey generateSecretKey(String password, EncryptionVerifier ver, int keySize) {
-        HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-
-        byte pwHash[] = hashPassword(password, hashAlgo, ver.getSalt(), ver.getSpinCount());
-
-        byte[] blockKey = new byte[4];
-        LittleEndian.putInt(blockKey, 0, 0);
-
-        byte[] finalHash = CryptoFunctions.generateKey(pwHash, hashAlgo, blockKey, hashAlgo.hashSize);
-        byte x1[] = fillAndXor(finalHash, (byte) 0x36);
-        byte x2[] = fillAndXor(finalHash, (byte) 0x5c);
-
-        byte[] x3 = new byte[x1.length + x2.length];
-        System.arraycopy(x1, 0, x3, 0, x1.length);
-        System.arraycopy(x2, 0, x3, x1.length, x2.length);
-        
-        byte[] key = Arrays.copyOf(x3, keySize);
-
-        SecretKey skey = new SecretKeySpec(key, ver.getCipherAlgorithm().jceId);
-        return skey;
-    }
-
-    protected static byte[] fillAndXor(byte hash[], byte fillByte) {
-        byte[] buff = new byte[64];
-        Arrays.fill(buff, fillByte);
-
-        for (int i=0; i<hash.length; i++) {
-            buff[i] = (byte) (buff[i] ^ hash[i]);
-        }
-
-        MessageDigest sha1 = CryptoFunctions.getMessageDigest(HashAlgorithm.sha1);
-        return sha1.digest(buff);
-    }
-
-    private Cipher getCipher(SecretKey key) {
-        EncryptionHeader em = getEncryptionInfo().getHeader();
-        ChainingMode cm = em.getChainingMode();
-        assert(cm == ChainingMode.ecb);
-        return CryptoFunctions.getCipher(key, em.getCipherAlgorithm(), cm, null, Cipher.DECRYPT_MODE);
-    }
-
-    @Override
-    @SuppressWarnings("resource")
-    public InputStream getDataStream(DirectoryNode dir) throws IOException {
-        DocumentInputStream dis = dir.createDocumentInputStream(DEFAULT_POIFS_ENTRY);
-
-        _length = dis.readLong();
-
-        if(getSecretKey() == null) {
-            verifyPassword(null);
-        }
-        // limit wrong calculated ole entries - (bug #57080)
-        // standard encryption always uses aes encoding, so blockSize is always 16 
-        // http://stackoverflow.com/questions/3283787/size-of-data-after-aes-encryption
-        int blockSize = getEncryptionInfo().getHeader().getCipherAlgorithm().blockSize;
-        long cipherLen = (_length/blockSize + 1) * blockSize;
-        Cipher cipher = getCipher(getSecretKey());
-        
-        InputStream boundedDis = new BoundedInputStream(dis, cipherLen);
-        return new BoundedInputStream(new CipherInputStream(boundedDis, cipher), _length);
-    }
-
-    /**
-     * @return the length of the stream returned by {@link #getDataStream(DirectoryNode)}
-     */
-    @Override
-    public long getLength(){
-        if(_length == -1) {
-            throw new IllegalStateException("Decryptor.getDataStream() was not called");
-        }
-        return _length;
-    }
-
-    @Override
-    public StandardDecryptor clone() throws CloneNotSupportedException {
-        return (StandardDecryptor)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java b/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
deleted file mode 100644
index a04f74d..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.standard;
-
-import static org.apache.poi.poifs.crypt.EncryptionInfo.flagAES;
-import static org.apache.poi.poifs.crypt.EncryptionInfo.flagCryptoAPI;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CipherProvider;
-import org.apache.poi.poifs.crypt.EncryptionHeader;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-public class StandardEncryptionHeader extends EncryptionHeader implements EncryptionRecord, Cloneable {
-
-    protected StandardEncryptionHeader(LittleEndianInput is) throws IOException {
-        setFlags(is.readInt());
-        setSizeExtra(is.readInt());
-        setCipherAlgorithm(CipherAlgorithm.fromEcmaId(is.readInt()));
-        setHashAlgorithm(HashAlgorithm.fromEcmaId(is.readInt()));
-        int keySize = is.readInt();
-        if (keySize == 0) {
-            // for the sake of inheritance of the cryptoAPI classes
-            // see 2.3.5.1 RC4 CryptoAPI Encryption Header
-            // If set to 0x00000000, it MUST be interpreted as 0x00000028 bits.
-            keySize = 0x28;
-        }
-        setKeySize(keySize);
-        setBlockSize(getKeySize());
-        setCipherProvider(CipherProvider.fromEcmaId(is.readInt()));
-
-        is.readLong(); // skip reserved
-
-        // CSPName may not always be specified
-        // In some cases, the salt value of the EncryptionVerifier is the next chunk of data
-        if (is instanceof RecordInputStream) {
-            ((RecordInputStream)is).mark(LittleEndianConsts.INT_SIZE+1);
-        } else {
-            ((InputStream)is).mark(LittleEndianConsts.INT_SIZE+1);
-        }
-        int checkForSalt = is.readInt();
-        if (is instanceof RecordInputStream) {
-            ((RecordInputStream)is).reset();
-        } else {
-            ((InputStream)is).reset();
-        }
-        
-        if (checkForSalt == 16) {
-            setCspName("");
-        } else {
-            StringBuilder builder = new StringBuilder();
-            while (true) {
-                char c = (char) is.readShort();
-                if (c == 0) {
-                    break;
-                }
-                builder.append(c);
-            }
-            setCspName(builder.toString());
-        }
-        
-        setChainingMode(ChainingMode.ecb);
-        setKeySalt(null);
-    }
-
-    protected StandardEncryptionHeader(CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm, int keyBits, int blockSize, ChainingMode chainingMode) {
-        setCipherAlgorithm(cipherAlgorithm);
-        setHashAlgorithm(hashAlgorithm);
-        setKeySize(keyBits);
-        setBlockSize(blockSize);
-        setCipherProvider(cipherAlgorithm.provider);
-        setFlags(flagCryptoAPI.setBoolean(0, true)
-                | flagAES.setBoolean(0, cipherAlgorithm.provider == CipherProvider.aes));
-        // see http://msdn.microsoft.com/en-us/library/windows/desktop/bb931357(v=vs.85).aspx for a full list
-        // setCspName("Microsoft Enhanced RSA and AES Cryptographic Provider");
-    }
-    
-    /**
-     * serializes the header 
-     */
-    @Override
-    public void write(LittleEndianByteArrayOutputStream bos) {
-        int startIdx = bos.getWriteIndex();
-        LittleEndianOutput sizeOutput = bos.createDelayedOutput(LittleEndianConsts.INT_SIZE);
-        bos.writeInt(getFlags());
-        bos.writeInt(0); // size extra
-        bos.writeInt(getCipherAlgorithm().ecmaId);
-        bos.writeInt(getHashAlgorithm().ecmaId);
-        bos.writeInt(getKeySize());
-        bos.writeInt(getCipherProvider().ecmaId);
-        bos.writeInt(0); // reserved1
-        bos.writeInt(0); // reserved2
-        String cspName = getCspName();
-        if (cspName == null) {
-            cspName = getCipherProvider().cipherProviderName;
-        }
-        bos.write(StringUtil.getToUnicodeLE(cspName));
-        bos.writeShort(0);
-        int headerSize = bos.getWriteIndex()-startIdx-LittleEndianConsts.INT_SIZE;
-        sizeOutput.writeInt(headerSize);        
-    }
-
-    @Override
-    public StandardEncryptionHeader clone() throws CloneNotSupportedException {
-        return (StandardEncryptionHeader)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java b/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
deleted file mode 100644
index c2bffdd..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.standard;
-
-import java.io.IOException;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionInfoBuilder;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.LittleEndianInput;
-
-public class StandardEncryptionInfoBuilder implements EncryptionInfoBuilder {
-
-    /**
-     * initialize the builder from a stream
-     */
-    @Override
-    public void initialize(EncryptionInfo info, LittleEndianInput dis) throws IOException {
-        /* int hSize = */ dis.readInt();
-        StandardEncryptionHeader header = new StandardEncryptionHeader(dis);
-        info.setHeader(header);
-        info.setVerifier(new StandardEncryptionVerifier(dis, header));
-
-        if (info.getVersionMinor() == 2 && (info.getVersionMajor() == 3 || info.getVersionMajor() == 4)) {
-            StandardDecryptor dec = new StandardDecryptor();
-            dec.setEncryptionInfo(info);
-            info.setDecryptor(dec);
-        }
-    }
-    
-    /**
-     * initialize the builder from scratch
-     */
-    @Override
-    public void initialize(EncryptionInfo info, CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm, int keyBits, int blockSize, ChainingMode chainingMode) {
-        if (cipherAlgorithm == null) {
-            cipherAlgorithm = CipherAlgorithm.aes128;
-        }
-        if (cipherAlgorithm != CipherAlgorithm.aes128 &&
-            cipherAlgorithm != CipherAlgorithm.aes192 &&
-            cipherAlgorithm != CipherAlgorithm.aes256) {
-            throw new EncryptedDocumentException("Standard encryption only supports AES128/192/256.");
-        }
-        
-        if (hashAlgorithm == null) {
-            hashAlgorithm = HashAlgorithm.sha1;
-        }
-        if (hashAlgorithm != HashAlgorithm.sha1) {
-            throw new EncryptedDocumentException("Standard encryption only supports SHA-1.");
-        }
-        if (chainingMode == null) {
-            chainingMode = ChainingMode.ecb;
-        }
-        if (chainingMode != ChainingMode.ecb) {
-            throw new EncryptedDocumentException("Standard encryption only supports ECB chaining.");
-        }
-        if (keyBits == -1) {
-            keyBits = cipherAlgorithm.defaultKeySize;
-        }
-        if (blockSize == -1) {
-            blockSize = cipherAlgorithm.blockSize;
-        }
-        boolean found = false;
-        for (int ks : cipherAlgorithm.allowedKeySize) {
-            found |= (ks == keyBits);
-        }
-        if (!found) {
-            throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for Cipher "+cipherAlgorithm.toString());
-        }
-        info.setHeader(new StandardEncryptionHeader(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
-        info.setVerifier(new StandardEncryptionVerifier(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
-        StandardDecryptor dec = new StandardDecryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        StandardEncryptor enc = new StandardEncryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java b/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
deleted file mode 100644
index 4fd284a..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.standard;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.EncryptionVerifier;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * Used when checking if a key is valid for a document 
- */
-public class StandardEncryptionVerifier extends EncryptionVerifier implements EncryptionRecord, Cloneable {
-    private static final int SPIN_COUNT = 50000;
-    private final int verifierHashSize;
-    
-    protected StandardEncryptionVerifier(LittleEndianInput is, StandardEncryptionHeader header) {
-        int saltSize = is.readInt();
-
-        if (saltSize!=16) {
-            throw new RuntimeException("Salt size != 16 !?");
-        }
-
-        byte salt[] = new byte[16];
-        is.readFully(salt);
-        setSalt(salt);
-        
-        byte encryptedVerifier[] = new byte[16];
-        is.readFully(encryptedVerifier);
-        setEncryptedVerifier(encryptedVerifier);
-
-        verifierHashSize = is.readInt();
-
-        byte encryptedVerifierHash[] = new byte[header.getCipherAlgorithm().encryptedVerifierHashLength];
-        is.readFully(encryptedVerifierHash);
-        setEncryptedVerifierHash(encryptedVerifierHash);
-
-        setSpinCount(SPIN_COUNT);
-        setCipherAlgorithm(header.getCipherAlgorithm());
-        setChainingMode(header.getChainingMode());
-        setEncryptedKey(null);
-        setHashAlgorithm(header.getHashAlgorithm()); 
-    }
-    
-    protected StandardEncryptionVerifier(CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm, int keyBits, int blockSize, ChainingMode chainingMode) {
-        setCipherAlgorithm(cipherAlgorithm);
-        setHashAlgorithm(hashAlgorithm);
-        setChainingMode(chainingMode);
-        setSpinCount(SPIN_COUNT);
-        verifierHashSize = hashAlgorithm.hashSize;
-    }
-
-    // make method visible for this package
-    @Override
-    protected void setSalt(byte salt[]) {
-        if (salt == null || salt.length != 16) {
-            throw new EncryptedDocumentException("invalid verifier salt");
-        }
-        super.setSalt(salt);
-    }
-    
-    // make method visible for this package
-    @Override
-    protected void setEncryptedVerifier(byte encryptedVerifier[]) {
-        super.setEncryptedVerifier(encryptedVerifier);
-    }
-
-    // make method visible for this package
-    @Override
-    protected void setEncryptedVerifierHash(byte encryptedVerifierHash[]) {
-        super.setEncryptedVerifierHash(encryptedVerifierHash);
-    }
-    
-    @Override
-    public void write(LittleEndianByteArrayOutputStream bos) {
-        // see [MS-OFFCRYPTO] - 2.3.4.9
-        byte salt[] = getSalt();
-        assert(salt.length == 16);
-        bos.writeInt(salt.length); // salt size
-        bos.write(salt);
-        
-        // The resulting Verifier value MUST be an array of 16 bytes.
-        byte encryptedVerifier[] = getEncryptedVerifier(); 
-        assert(encryptedVerifier.length == 16);
-        bos.write(encryptedVerifier);
-
-        // The number of bytes used by the decrypted Verifier hash is given by
-        // the VerifierHashSize field, which MUST be 20
-        bos.writeInt(20);
-
-        // EncryptedVerifierHash: An array of bytes that contains the encrypted form of the hash of
-        // the randomly generated Verifier value. The length of the array MUST be the size of the
-        // encryption block size multiplied by the number of blocks needed to encrypt the hash of the
-        // Verifier. If the encryption algorithm is RC4, the length MUST be 20 bytes. If the encryption
-        // algorithm is AES, the length MUST be 32 bytes. After decrypting the EncryptedVerifierHash
-        // field, only the first VerifierHashSize bytes MUST be used.
-        byte encryptedVerifierHash[] = getEncryptedVerifierHash(); 
-        assert(encryptedVerifierHash.length == getCipherAlgorithm().encryptedVerifierHashLength);
-        bos.write(encryptedVerifierHash);
-    }
-
-    protected int getVerifierHashSize() {
-        return verifierHashSize;
-    }
-
-    @Override
-    public StandardEncryptionVerifier clone() throws CloneNotSupportedException {
-        return (StandardEncryptionVerifier)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
deleted file mode 100644
index 5372c2a..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.standard;
-
-import static org.apache.poi.poifs.crypt.DataSpaceMapUtils.createEncryptionEntry;
-import static org.apache.poi.poifs.crypt.standard.StandardDecryptor.generateSecretKey;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.Random;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.SecretKey;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.DataSpaceMapUtils;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionVerifier;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSWriterEvent;
-import org.apache.poi.poifs.filesystem.POIFSWriterListener;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-
-public class StandardEncryptor extends Encryptor implements Cloneable {
-    private static final POILogger logger = POILogFactory.getLogger(StandardEncryptor.class);
-
-    protected StandardEncryptor() {
-    }    
-
-    @Override
-    public void confirmPassword(String password) {
-        // see [MS-OFFCRYPTO] - 2.3.3 EncryptionVerifier
-        Random r = new SecureRandom();
-        byte[] salt = new byte[16], verifier = new byte[16];
-        r.nextBytes(salt);
-        r.nextBytes(verifier);
-        
-        confirmPassword(password, null, null, salt, verifier, null);
-    }
-    
-    
-    /**
-     * Fills the fields of verifier and header with the calculated hashes based
-     * on the password and a random salt
-     * 
-     * see [MS-OFFCRYPTO] - 2.3.4.7 ECMA-376 Document Encryption Key Generation
-     */
-    @Override
-    public void confirmPassword(String password, byte keySpec[], byte keySalt[], byte verifier[], byte verifierSalt[], byte integritySalt[]) {
-        StandardEncryptionVerifier ver = (StandardEncryptionVerifier)getEncryptionInfo().getVerifier();
-
-        ver.setSalt(verifierSalt);
-        SecretKey secretKey = generateSecretKey(password, ver, getKeySizeInBytes());
-        setSecretKey(secretKey);
-        Cipher cipher = getCipher(secretKey, null);
-        
-        try {
-            byte encryptedVerifier[] = cipher.doFinal(verifier); 
-            MessageDigest hashAlgo = CryptoFunctions.getMessageDigest(ver.getHashAlgorithm());
-            byte calcVerifierHash[] = hashAlgo.digest(verifier);
-            
-            // 2.3.3 EncryptionVerifier ...
-            // An array of bytes that contains the encrypted form of the 
-            // hash of the randomly generated Verifier value. The length of the array MUST be the size of 
-            // the encryption block size multiplied by the number of blocks needed to encrypt the hash of the 
-            // Verifier. If the encryption algorithm is RC4, the length MUST be 20 bytes. If the encryption 
-            // algorithm is AES, the length MUST be 32 bytes. After decrypting the EncryptedVerifierHash
-            // field, only the first VerifierHashSize bytes MUST be used.
-            int encVerHashSize = ver.getCipherAlgorithm().encryptedVerifierHashLength; 
-            byte encryptedVerifierHash[] = cipher.doFinal(Arrays.copyOf(calcVerifierHash, encVerHashSize));
-    
-            ver.setEncryptedVerifier(encryptedVerifier);
-            ver.setEncryptedVerifierHash(encryptedVerifierHash);
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException("Password confirmation failed", e);
-        }
-        
-    }
-
-    private Cipher getCipher(SecretKey key, String padding) {
-        EncryptionVerifier ver = getEncryptionInfo().getVerifier();
-        return CryptoFunctions.getCipher(key, ver.getCipherAlgorithm(), ver.getChainingMode(), null, Cipher.ENCRYPT_MODE, padding);
-    }
-    
-    @Override
-    public OutputStream getDataStream(final DirectoryNode dir)
-    throws IOException, GeneralSecurityException {
-        createEncryptionInfoEntry(dir);
-        DataSpaceMapUtils.addDefaultDataSpace(dir);
-        OutputStream countStream = new StandardCipherOutputStream(dir);
-        return countStream;
-    }
-    
-    protected class StandardCipherOutputStream extends FilterOutputStream implements POIFSWriterListener {
-        protected long countBytes;
-        protected final File fileOut;
-        protected final DirectoryNode dir;
-
-        @SuppressWarnings("resource")
-        private StandardCipherOutputStream(DirectoryNode dir, File fileOut) throws IOException {
-            // although not documented, we need the same padding as with agile encryption
-            // and instead of calculating the missing bytes for the block size ourselves
-            // we leave it up to the CipherOutputStream, which generates/saves them on close()
-            // ... we can't use "NoPadding" here
-            //
-            // see also [MS-OFFCRYPT] - 2.3.4.15
-            // The final data block MUST be padded to the next integral multiple of the
-            // KeyData.blockSize value. Any padding bytes can be used. Note that the StreamSize
-            // field of the EncryptedPackage field specifies the number of bytes of 
-            // unencrypted data as specified in section 2.3.4.4.
-            super(
-                new CipherOutputStream(new FileOutputStream(fileOut), getCipher(getSecretKey(), "PKCS5Padding"))   
-            );
-            this.fileOut = fileOut;
-            this.dir = dir;
-        }
-        
-        protected StandardCipherOutputStream(DirectoryNode dir) throws IOException {
-            this(dir, TempFile.createTempFile("encrypted_package", "crypt"));
-        }
-        
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            out.write(b, off, len);
-            countBytes += len;
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-            out.write(b);
-            countBytes++;
-        }
-    
-        @Override
-        public void close() throws IOException {
-            // the CipherOutputStream adds the padding bytes on close()
-            super.close(); 
-            writeToPOIFS();
-        }
-        
-        void writeToPOIFS() throws IOException {
-            int oleStreamSize = (int)(fileOut.length()+LittleEndianConsts.LONG_SIZE);
-            dir.createDocument(DEFAULT_POIFS_ENTRY, oleStreamSize, this);
-            // TODO: any properties???
-        }
-    
-        @Override
-        public void processPOIFSWriterEvent(POIFSWriterEvent event) {
-            try {
-                LittleEndianOutputStream leos = new LittleEndianOutputStream(event.getStream());
-
-                // StreamSize (8 bytes): An unsigned integer that specifies the number of bytes used by data 
-                // encrypted within the EncryptedData field, not including the size of the StreamSize field. 
-                // Note that the actual size of the \EncryptedPackage stream (1) can be larger than this 
-                // value, depending on the block size of the chosen encryption algorithm
-                leos.writeLong(countBytes);
-
-                FileInputStream fis = new FileInputStream(fileOut);
-                IOUtils.copy(fis, leos);
-                fis.close();
-                if (!fileOut.delete()) {
-                    logger.log(POILogger.ERROR, "Can't delete temporary encryption file: "+fileOut);
-                }
-
-                leos.close();
-            } catch (IOException e) {
-                throw new EncryptedDocumentException(e);
-            }
-        }
-    }
-    
-    protected int getKeySizeInBytes() {
-        return getEncryptionInfo().getHeader().getKeySize()/8;
-    }
-    
-    protected void createEncryptionInfoEntry(DirectoryNode dir) throws IOException {
-        final EncryptionInfo info = getEncryptionInfo();
-        final StandardEncryptionHeader header = (StandardEncryptionHeader)info.getHeader();
-        final StandardEncryptionVerifier verifier = (StandardEncryptionVerifier)info.getVerifier();
-        
-        EncryptionRecord er = new EncryptionRecord(){
-            @Override
-            public void write(LittleEndianByteArrayOutputStream bos) {
-                bos.writeShort(info.getVersionMajor());
-                bos.writeShort(info.getVersionMinor());
-                bos.writeInt(info.getEncryptionFlags());
-                header.write(bos);
-                verifier.write(bos);
-            }
-        };
-        
-        createEncryptionEntry(dir, "EncryptionInfo", er);
-        
-        // TODO: any properties???
-    }
-
-    @Override
-    public StandardEncryptor clone() throws CloneNotSupportedException {
-        return (StandardEncryptor)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
deleted file mode 100644
index 3eb66b5..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.xor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChunkedCipherInputStream;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.util.LittleEndian;
-
-public class XORDecryptor extends Decryptor implements Cloneable {
-    private long length = -1L;
-    private int chunkSize = 512;
-
-    protected XORDecryptor() {
-    }
-
-    @Override
-    public boolean verifyPassword(String password) {
-        XOREncryptionVerifier ver = (XOREncryptionVerifier)getEncryptionInfo().getVerifier();
-        int keyVer = LittleEndian.getUShort(ver.getEncryptedKey());
-        int verifierVer = LittleEndian.getUShort(ver.getEncryptedVerifier());
-        int keyComp      = CryptoFunctions.createXorKey1(password);
-        int verifierComp = CryptoFunctions.createXorVerifier1(password);
-        if (keyVer == keyComp && verifierVer == verifierComp) {
-            byte xorArray[] = CryptoFunctions.createXorArray1(password);
-            setSecretKey(new SecretKeySpec(xorArray, "XOR"));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public Cipher initCipherForBlock(Cipher cipher, int block)
-    throws GeneralSecurityException {
-        return null;
-    }
-
-    protected static Cipher initCipherForBlock(Cipher cipher, int block,
-        EncryptionInfo encryptionInfo, SecretKey skey, int encryptMode)
-    throws GeneralSecurityException {
-        return null;
-    }
-
-    @Override
-    public ChunkedCipherInputStream getDataStream(DirectoryNode dir) throws IOException, GeneralSecurityException {
-        throw new EncryptedDocumentException("not supported");
-    }
-
-    @Override
-    public InputStream getDataStream(InputStream stream, int size, int initialPos)
-            throws IOException, GeneralSecurityException {
-        return new XORCipherInputStream(stream, initialPos);
-    }
-
-
-    @Override
-    public long getLength() {
-        if (length == -1L) {
-            throw new IllegalStateException("Decryptor.getDataStream() was not called");
-        }
-
-        return length;
-    }
-
-    @Override
-    public void setChunkSize(int chunkSize) {
-        this.chunkSize = chunkSize;
-    }
-    
-    @Override
-    public XORDecryptor clone() throws CloneNotSupportedException {
-        return (XORDecryptor)super.clone();
-    }
-
-    private class XORCipherInputStream extends ChunkedCipherInputStream {
-        private final int initialOffset;
-        private int recordStart = 0;
-        private int recordEnd = 0;
-        
-        public XORCipherInputStream(InputStream stream, int initialPos)
-                throws GeneralSecurityException {
-            super(stream, Integer.MAX_VALUE, chunkSize);
-            this.initialOffset = initialPos;
-        }
-        
-        @Override
-        protected Cipher initCipherForBlock(Cipher existing, int block)
-                throws GeneralSecurityException {
-            return XORDecryptor.this.initCipherForBlock(existing, block);
-        }
-
-        @Override
-        protected int invokeCipher(int totalBytes, boolean doFinal) {
-            final int pos = (int)getPos();
-            final byte xorArray[] = getEncryptionInfo().getDecryptor().getSecretKey().getEncoded();
-            final byte chunk[] = getChunk();
-            final byte plain[] = getPlain();
-            final int posInChunk = pos & getChunkMask();
-            
-            /*
-             * From: http://social.msdn.microsoft.com/Forums/en-US/3dadbed3-0e68-4f11-8b43-3a2328d9ebd5
-             * 
-             * The initial value for XorArrayIndex is as follows:
-             * XorArrayIndex = (FileOffset + Data.Length) % 16
-             * 
-             * The FileOffset variable in this context is the stream offset into the Workbook stream at
-             * the time we are about to write each of the bytes of the record data.
-             * This (the value) is then incremented after each byte is written. 
-             */
-            final int xorArrayIndex = initialOffset+recordEnd+(pos-recordStart);
-            
-            for (int i=0; pos+i < recordEnd && i < totalBytes; i++) {
-                // The following is taken from the Libre Office implementation
-                // It seems that the encrypt and decrypt method is mixed up
-                // in the MS-OFFCRYPTO docs
-                byte value = plain[posInChunk+i];
-                value = rotateLeft(value, 3);
-                value ^= xorArray[(xorArrayIndex+i) & 0x0F];
-                chunk[posInChunk+i] = value;
-            }
-
-            // the other bytes will be encoded, when setNextRecordSize is called the next time
-            return totalBytes;
-        }
-        
-        private byte rotateLeft(byte bits, int shift) {
-            return (byte)(((bits & 0xff) << shift) | ((bits & 0xff) >>> (8 - shift)));
-        }
-        
-        
-        /**
-         * Decrypts a xor obfuscated byte array.
-         * The data is decrypted in-place
-         * 
-         * @see <a href="http://msdn.microsoft.com/en-us/library/dd908506.aspx">2.3.7.3 Binary Document XOR Data Transformation Method 1</a>
-         */
-        @Override
-        public void setNextRecordSize(int recordSize) {
-            final int pos = (int)getPos();
-            final byte chunk[] = getChunk();
-            final int chunkMask = getChunkMask();
-            recordStart = pos;
-            recordEnd = recordStart+recordSize;
-            int nextBytes = Math.min(recordSize, chunk.length-(pos & chunkMask));
-            invokeCipher(nextBytes, true);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java b/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
deleted file mode 100644
index 873c1ab..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.xor;
-
-import org.apache.poi.poifs.crypt.EncryptionHeader;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-
-public class XOREncryptionHeader extends EncryptionHeader implements EncryptionRecord, Cloneable {
-
-    protected XOREncryptionHeader() {
-    }
-
-    @Override
-    public void write(LittleEndianByteArrayOutputStream leos) {
-    }
-
-    @Override
-    public XOREncryptionHeader clone() throws CloneNotSupportedException {
-        return (XOREncryptionHeader)super.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java b/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
deleted file mode 100644
index 9fcaf8b..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.xor;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionInfoBuilder;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.LittleEndianInput;
-
-public class XOREncryptionInfoBuilder implements EncryptionInfoBuilder {
-
-    public XOREncryptionInfoBuilder() {
-    }
-
-    @Override
-    public void initialize(EncryptionInfo info, LittleEndianInput dis)
-    throws IOException {
-        info.setHeader(new XOREncryptionHeader());
-        info.setVerifier(new XOREncryptionVerifier(dis));
-        Decryptor dec = new XORDecryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        Encryptor enc = new XOREncryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-
-    @Override
-    public void initialize(EncryptionInfo info,
-        CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm,
-        int keyBits, int blockSize, ChainingMode chainingMode) {
-        info.setHeader(new XOREncryptionHeader());
-        info.setVerifier(new XOREncryptionVerifier());
-        Decryptor dec = new XORDecryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        Encryptor enc = new XOREncryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java b/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
deleted file mode 100644
index ba0645c..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.xor;
-
-import org.apache.poi.poifs.crypt.EncryptionVerifier;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInput;
-
-public class XOREncryptionVerifier extends EncryptionVerifier implements EncryptionRecord, Cloneable {
-
-    protected XOREncryptionVerifier() {
-        setEncryptedKey(new byte[2]);
-        setEncryptedVerifier(new byte[2]);
-    }
-
-    protected XOREncryptionVerifier(LittleEndianInput is) {
-        /**
-         * key (2 bytes): An unsigned integer that specifies the obfuscation key. 
-         * See [MS-OFFCRYPTO], 2.3.6.2 section, the first step of initializing XOR
-         * array where it describes the generation of 16-bit XorKey value.
-         */
-        byte key[] = new byte[2];
-        is.readFully(key);
-        setEncryptedKey(key);
-        
-        /**
-         * verificationBytes (2 bytes): An unsigned integer that specifies
-         * the password verification identifier.
-         */
-        byte verifier[] = new byte[2];
-        is.readFully(verifier);
-        setEncryptedVerifier(verifier);
-    }
-    
-    @Override
-    public void write(LittleEndianByteArrayOutputStream bos) {
-        bos.write(getEncryptedKey());
-        bos.write(getEncryptedVerifier());
-    }
-
-    @Override
-    public XOREncryptionVerifier clone() throws CloneNotSupportedException {
-        return (XOREncryptionVerifier)super.clone();
-    }
-
-    @Override
-    protected final void setEncryptedVerifier(byte[] encryptedVerifier) {
-        super.setEncryptedVerifier(encryptedVerifier);
-    }
-
-    @Override
-    protected final void setEncryptedKey(byte[] encryptedKey) {
-        super.setEncryptedKey(encryptedKey);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java b/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
deleted file mode 100644
index 1c0834c8..0000000
--- a/trunk/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.xor;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.util.BitSet;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.poifs.crypt.ChunkedCipherOutputStream;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.util.LittleEndian;
-
-public class XOREncryptor extends Encryptor implements Cloneable {
-    protected XOREncryptor() {
-    }
-
-    @Override
-    public void confirmPassword(String password) {
-        int keyComp      = CryptoFunctions.createXorKey1(password);
-        int verifierComp = CryptoFunctions.createXorVerifier1(password);
-        byte xorArray[]  = CryptoFunctions.createXorArray1(password);
-        
-        byte shortBuf[] = new byte[2];
-        XOREncryptionVerifier ver = (XOREncryptionVerifier)getEncryptionInfo().getVerifier();
-        LittleEndian.putUShort(shortBuf, 0, keyComp);
-        ver.setEncryptedKey(shortBuf);
-        LittleEndian.putUShort(shortBuf, 0, verifierComp);
-        ver.setEncryptedVerifier(shortBuf);
-        setSecretKey(new SecretKeySpec(xorArray, "XOR"));
-    }
-
-    @Override
-    public void confirmPassword(String password, byte keySpec[],
-            byte keySalt[], byte verifier[], byte verifierSalt[],
-            byte integritySalt[]) {
-        confirmPassword(password);
-    }
-
-    @Override
-    public OutputStream getDataStream(DirectoryNode dir)
-    throws IOException, GeneralSecurityException {
-        return new XORCipherOutputStream(dir);
-    }
-
-    @Override
-    public XORCipherOutputStream getDataStream(OutputStream stream, int initialOffset)
-    throws IOException, GeneralSecurityException {
-        return new XORCipherOutputStream(stream, initialOffset);
-    }
-
-    protected int getKeySizeInBytes() {
-        return -1;
-    }
-
-    @Override
-    public void setChunkSize(int chunkSize) {
-        // chunkSize is irrelevant
-    }
-
-    protected void createEncryptionInfoEntry(DirectoryNode dir) throws IOException {
-    }
-
-    @Override
-    public XOREncryptor clone() throws CloneNotSupportedException {
-        return (XOREncryptor)super.clone();
-    }
-
-    private class XORCipherOutputStream extends ChunkedCipherOutputStream {
-        private int recordStart = 0;
-        private int recordEnd = 0;
-
-        public XORCipherOutputStream(OutputStream stream, int initialPos) throws IOException, GeneralSecurityException {
-            super(stream, -1);
-        }
-
-        public XORCipherOutputStream(DirectoryNode dir) throws IOException, GeneralSecurityException {
-            super(dir, -1);
-        }
-
-        @Override
-        protected Cipher initCipherForBlock(Cipher cipher, int block, boolean lastChunk)
-        throws GeneralSecurityException {
-            return XORDecryptor.initCipherForBlock(cipher, block, getEncryptionInfo(), getSecretKey(), Cipher.ENCRYPT_MODE);
-        }
-
-        @Override
-        protected void calculateChecksum(File file, int i) {
-        }
-
-        @Override
-        protected void createEncryptionInfoEntry(DirectoryNode dir, File tmpFile)
-        throws IOException, GeneralSecurityException {
-            XOREncryptor.this.createEncryptionInfoEntry(dir);
-        }
-
-        @Override
-        public void setNextRecordSize(int recordSize, boolean isPlain) {
-            if (recordEnd > 0 && !isPlain) {
-                // encrypt last record
-                invokeCipher((int)getPos(), true);
-            }
-            recordStart = (int)getTotalPos()+4;
-            recordEnd = recordStart+recordSize;
-        }
-
-        @Override
-        public void flush() throws IOException {
-            setNextRecordSize(0, true);
-            super.flush();
-        }
-
-        @Override
-        protected int invokeCipher(int posInChunk, boolean doFinal) {
-            if (posInChunk == 0) {
-                return 0;
-            }
-
-            final int start = Math.max(posInChunk-(recordEnd-recordStart), 0);
-
-            final BitSet plainBytes = getPlainByteFlags();
-            final byte xorArray[] = getEncryptionInfo().getEncryptor().getSecretKey().getEncoded();
-            final byte chunk[] = getChunk();
-            final byte plain[] = (plainBytes.isEmpty()) ? null : chunk.clone();
-
-            /*
-             * From: http://social.msdn.microsoft.com/Forums/en-US/3dadbed3-0e68-4f11-8b43-3a2328d9ebd5
-             *
-             * The initial value for XorArrayIndex is as follows:
-             * XorArrayIndex = (FileOffset + Data.Length) % 16
-             *
-             * The FileOffset variable in this context is the stream offset into the Workbook stream at
-             * the time we are about to write each of the bytes of the record data.
-             * This (the value) is then incremented after each byte is written.
-             */
-            // ... also need to handle invocation in case of a filled chunk
-            int xorArrayIndex = recordEnd+(start-recordStart);
-
-            for (int i=start; i < posInChunk; i++) {
-                byte value = chunk[i];
-                value ^= xorArray[(xorArrayIndex++) & 0x0F];
-                value = rotateLeft(value, 8-3);
-                chunk[i] = value;
-            }
-
-            for (int i = plainBytes.nextSetBit(start); i >= 0 && i < posInChunk; i = plainBytes.nextSetBit(i+1)) {
-                chunk[i] = plain[i];
-            }
-
-            return posInChunk;
-        }
-
-        private byte rotateLeft(byte bits, int shift) {
-            return (byte)(((bits & 0xff) << shift) | ((bits & 0xff) >>> (8 - shift)));
-        }
-
-
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/dev/POIFSDump.java b/trunk/src/java/org/apache/poi/poifs/dev/POIFSDump.java
deleted file mode 100644
index ad3e617..0000000
--- a/trunk/src/java/org/apache/poi/poifs/dev/POIFSDump.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.dev;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.NPOIFSStream;
-import org.apache.poi.poifs.property.NPropertyTable;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.util.IOUtils;
-
-/**
- * Dump internal structure of a OLE2 file into file system
- */
-public class POIFSDump {
-    public static void main(String[] args) throws IOException {
-        if (args.length == 0) {
-            System.err.println("Must specify at least one file to dump");
-            System.exit(1);
-        }
-        
-        boolean dumpProps = false, dumpMini = false;
-        for (String filename : args) {
-            if (filename.equalsIgnoreCase("-dumprops") ||
-                    filename.equalsIgnoreCase("-dump-props") ||
-                    filename.equalsIgnoreCase("-dump-properties")) {
-                dumpProps = true;
-                continue;
-            }
-            if (filename.equalsIgnoreCase("-dumpmini") ||
-                    filename.equalsIgnoreCase("-dump-mini") ||
-                    filename.equalsIgnoreCase("-dump-ministream") ||
-                    filename.equalsIgnoreCase("-dump-mini-stream")) {
-                dumpMini = true;
-                continue;
-            }
-
-            System.out.println("Dumping " + filename);
-            FileInputStream is = new FileInputStream(filename);
-            NPOIFSFileSystem fs;
-            try {
-                fs = new NPOIFSFileSystem(is);
-            } finally {
-                is.close();
-            }
-            try {
-                DirectoryEntry root = fs.getRoot();
-                String filenameWithoutPath = new File(filename).getName();
-                File dumpDir = new File(filenameWithoutPath + "_dump");
-                File file = new File(dumpDir, root.getName());
-                if (!file.exists() && !file.mkdirs()) {
-                    throw new IOException("Could not create directory " + file);
-                }
-    
-                dump(root, file);
-    
-                if (dumpProps) {
-                    HeaderBlock header = fs.getHeaderBlock();
-                    dump(fs, header.getPropertyStart(), "properties", file);
-                }
-                if (dumpMini) {
-                    NPropertyTable props = fs.getPropertyTable();
-                    int startBlock = props.getRoot().getStartBlock();
-                    if (startBlock == POIFSConstants.END_OF_CHAIN) {
-                        System.err.println("No Mini Stream in file");
-                    } else {
-                        dump(fs, startBlock, "mini-stream", file);
-                    }
-                }
-            } finally {
-                fs.close();
-            }
-        }
-    }
-    
-    public static void dump(DirectoryEntry root, File parent) throws IOException {
-        for(Iterator<Entry> it = root.getEntries(); it.hasNext();){
-            Entry entry = it.next();
-            if(entry instanceof DocumentNode){
-                DocumentNode node = (DocumentNode)entry;
-                DocumentInputStream is = new DocumentInputStream(node);
-                byte[] bytes = IOUtils.toByteArray(is);
-                is.close();
-
-                OutputStream out = new FileOutputStream(new File(parent, node.getName().trim()));
-                try {
-                	out.write(bytes);
-                } finally {
-                	out.close();
-                }
-            } else if (entry instanceof DirectoryEntry){
-                DirectoryEntry dir = (DirectoryEntry)entry;
-                File file = new File(parent, entry.getName());
-                if(!file.exists() && !file.mkdirs()) {
-                    throw new IOException("Could not create directory " + file);
-                }
-                dump(dir, file);
-            } else {
-                System.err.println("Skipping unsupported POIFS entry: " + entry);
-            }
-        }
-    }
-    public static void dump(NPOIFSFileSystem fs, int startBlock, String name, File parent) throws IOException {
-        File file = new File(parent, name);
-        FileOutputStream out = new FileOutputStream(file);
-        try {
-            NPOIFSStream stream = new NPOIFSStream(fs, startBlock);
-
-            byte[] b = new byte[fs.getBigBlockSize()];
-            for (ByteBuffer bb : stream) {
-                int len = bb.remaining();
-                bb.get(b);
-                out.write(b, 0, len);
-            }
-        } finally {
-            out.close();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/dev/POIFSHeaderDumper.java b/trunk/src/java/org/apache/poi/poifs/dev/POIFSHeaderDumper.java
deleted file mode 100644
index 642ffa0..0000000
--- a/trunk/src/java/org/apache/poi/poifs/dev/POIFSHeaderDumper.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.dev;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.Property;
-import org.apache.poi.poifs.property.PropertyTable;
-import org.apache.poi.poifs.storage.BlockAllocationTableReader;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.poifs.storage.ListManagedBlock;
-import org.apache.poi.poifs.storage.RawDataBlockList;
-import org.apache.poi.poifs.storage.SmallBlockTableReader;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IntList;
-
-/**
- * A very low level debugging tool, for printing out core 
- *  information on the headers and FAT blocks.
- * You probably only want to use this if you're trying
- *  to understand POIFS, or if you're trying to track
- *  down the source of corruption in a file.
- */
-public class POIFSHeaderDumper {
-    /**
-     * Display the entries of multiple POIFS files
-     *
-     * @param args the names of the files to be displayed
-     */
-    public static void main(final String args[]) throws Exception {
-        if (args.length == 0) {
-            System.err.println("Must specify at least one file to view");
-            System.exit(1);
-        }
-
-        for (int j = 0; j < args.length; j++) {
-            viewFile(args[j]);
-        }
-    }
-
-    public static void viewFile(final String filename) throws Exception {
-        System.out.println("Dumping headers from: " + filename);
-        InputStream inp = new FileInputStream(filename);
-
-        // Header
-        HeaderBlock header_block = new HeaderBlock(inp);
-        displayHeader(header_block);
-
-        // Raw blocks
-        POIFSBigBlockSize bigBlockSize = header_block.getBigBlockSize();
-        RawDataBlockList data_blocks = new RawDataBlockList(inp, bigBlockSize);
-        displayRawBlocksSummary(data_blocks);
-
-        // Main FAT Table
-        BlockAllocationTableReader batReader =
-                new BlockAllocationTableReader(
-                        header_block.getBigBlockSize(),
-                        header_block.getBATCount(),
-                        header_block.getBATArray(),
-                        header_block.getXBATCount(),
-                        header_block.getXBATIndex(),
-                        data_blocks);
-        displayBATReader("Big Blocks", batReader);
-
-        // Properties Table
-        PropertyTable properties =
-                new PropertyTable(header_block, data_blocks);
-
-        // Mini Fat
-        BlockAllocationTableReader sbatReader = 
-                SmallBlockTableReader._getSmallDocumentBlockReader(
-                        bigBlockSize, data_blocks, properties.getRoot(),
-                        header_block.getSBATStart()
-                        );
-        displayBATReader("Small Blocks", sbatReader);
-
-        // Summary of the properties
-        displayPropertiesSummary(properties);
-    }
-
-    public static void displayHeader(HeaderBlock header_block) throws Exception {
-        System.out.println("Header Details:");
-        System.out.println(" Block size: " + header_block.getBigBlockSize().getBigBlockSize());
-        System.out.println(" BAT (FAT) header blocks: " + header_block.getBATArray().length);
-        System.out.println(" BAT (FAT) block count: " + header_block.getBATCount());
-        if (header_block.getBATCount() > 0) 
-            System.out.println(" BAT (FAT) block 1 at: " + header_block.getBATArray()[0]);
-        System.out.println(" XBAT (FAT) block count: " + header_block.getXBATCount());
-        System.out.println(" XBAT (FAT) block 1 at: " + header_block.getXBATIndex());
-        System.out.println(" SBAT (MiniFAT) block count: " + header_block.getSBATCount());
-        System.out.println(" SBAT (MiniFAT) block 1 at: " + header_block.getSBATStart());
-        System.out.println(" Property table at: " + header_block.getPropertyStart());
-        System.out.println("");
-    }
-
-    public static void displayRawBlocksSummary(RawDataBlockList data_blocks) throws Exception {
-        System.out.println("Raw Blocks Details:");
-        System.out.println(" Number of blocks: " + data_blocks.blockCount());
-
-        for(int i=0; i<Math.min(16, data_blocks.blockCount()); i++) {
-            ListManagedBlock block = data_blocks.get(i);
-            byte[] data = new byte[Math.min(48, block.getData().length)];
-            System.arraycopy(block.getData(), 0, data, 0, data.length);
-
-            System.out.println(" Block #" + i + ":");
-            System.out.println(HexDump.dump(data, 0, 0));
-        }
-
-        System.out.println("");
-    }
-
-    public static void displayBATReader(String type, BlockAllocationTableReader batReader) throws Exception {
-        System.out.println("Sectors, as referenced from the "+type+" FAT:");
-        IntList entries = batReader.getEntries();
-
-        for(int i=0; i<entries.size(); i++) {
-            int bn = entries.get(i);
-            String bnS = Integer.toString(bn);
-            if(bn == POIFSConstants.END_OF_CHAIN) {
-                bnS = "End Of Chain";
-            } else if(bn == POIFSConstants.DIFAT_SECTOR_BLOCK) {
-                bnS = "DI Fat Block";
-            } else if(bn == POIFSConstants.FAT_SECTOR_BLOCK) {
-                bnS = "Normal Fat Block";
-            } else if(bn == POIFSConstants.UNUSED_BLOCK) {
-                bnS = "Block Not Used (Free)";
-            }
-
-            System.out.println("  Block  # " + i + " -> " + bnS);
-        }
-
-        System.out.println("");
-    }
-
-    public static void displayPropertiesSummary(PropertyTable properties) {
-        System.out.println("Mini Stream starts at " + properties.getRoot().getStartBlock());
-        System.out.println("Mini Stream length is " + properties.getRoot().getSize());
-        System.out.println();
-        
-        System.out.println("Properties and their block start:");
-        displayProperties(properties.getRoot(), "");
-        System.out.println("");
-    }
-    public static void displayProperties(DirectoryProperty prop, String indent) {
-        String nextIndent = indent + "  ";
-        System.out.println(indent + "-> " + prop.getName());
-        for (Property cp : prop) {
-            if (cp instanceof DirectoryProperty) {
-                displayProperties((DirectoryProperty)cp, nextIndent);
-            } else {
-                System.out.println(nextIndent + "=> " + cp.getName());
-                System.out.print(nextIndent + "   " + cp.getSize() + " bytes in ");
-                if (cp.shouldUseSmallBlocks()) {
-                    System.out.print("mini");
-                } else {
-                    System.out.print("main");
-                }
-                System.out.println(" stream, starts at " + cp.getStartBlock());
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java b/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java
deleted file mode 100644
index 357773a..0000000
--- a/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.dev;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * A lister of the entries in POIFS files.
- *
- * Much simpler than {@link POIFSViewer}
- */
-public class POIFSLister {
-   /**
-    * Display the entries of multiple POIFS files
-    *
-    * @param args the names of the files to be displayed
-    */
-   public static void main(final String args[]) throws IOException {
-      if (args.length == 0) {
-         System.err.println("Must specify at least one file to view");
-         System.exit(1);
-      }
-
-      boolean withSizes = false;
-      boolean newPOIFS = true;
-      for (int j = 0; j < args.length; j++) {
-         if (args[j].equalsIgnoreCase("-size") || args[j].equalsIgnoreCase("-sizes")) {
-            withSizes = true;
-         } else if (args[j].equalsIgnoreCase("-old") || args[j].equalsIgnoreCase("-old-poifs")) {
-            newPOIFS = false;
-         } else {
-            if(newPOIFS) {
-               viewFile(args[j], withSizes);
-            } else {
-               viewFileOld(args[j], withSizes);
-            }
-         }
-      }
-   }
-
-   public static void viewFile(final String filename, boolean withSizes) throws IOException {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(new File(filename));
-      displayDirectory(fs.getRoot(), "", withSizes);
-   }
-
-   public static void viewFileOld(final String filename, boolean withSizes) throws IOException {
-      POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filename));
-      displayDirectory(fs.getRoot(), "", withSizes);
-   }
-
-   public static void displayDirectory(DirectoryNode dir, String indent, boolean withSizes) {
-      System.out.println(indent + dir.getName() + " -");
-      String newIndent = indent + "  ";
-
-      boolean hadChildren = false;
-      for(Iterator<Entry> it = dir.getEntries(); it.hasNext();) {
-         hadChildren = true;
-         Entry entry = it.next();
-         if (entry instanceof DirectoryNode) {
-            displayDirectory((DirectoryNode) entry, newIndent, withSizes);
-         } else {
-            DocumentNode doc = (DocumentNode) entry;
-            String name = doc.getName();
-            String size = "";
-            if (name.charAt(0) < 10) {
-               String altname = "(0x0" + (int) name.charAt(0) + ")" + name.substring(1);
-               name = name.substring(1) + " <" + altname + ">";
-            }
-            if (withSizes) {
-               size = " [" + doc.getSize() + " / 0x" + 
-                      Integer.toHexString(doc.getSize()) + "]";
-            }
-            System.out.println(newIndent + name + size);
-         }
-      }
-      if (!hadChildren) {
-         System.out.println(newIndent + "(no children)");
-      }
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewEngine.java b/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
deleted file mode 100644
index 84f2a54..0000000
--- a/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
+++ /dev/null
@@ -1,132 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.dev;
-
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * This class contains methods used to inspect POIFSViewable objects
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public class POIFSViewEngine
-{
-    private static final String _EOL = System.getProperty("line.separator");
-
-    /**
-     * Inspect an object that may be viewable, and drill down if told
-     * to
-     *
-     * @param viewable the object to be viewed
-     * @param drilldown if true, and the object implements
-     *                  POIFSViewable, inspect the objects' contents
-     *                  (recursively)
-     * @param indentLevel how far in to indent each string
-     * @param indentString string to use for indenting
-     *
-     * @return a List of Strings holding the content
-     */
-
-    public static List<String> inspectViewable(final Object viewable,
-                                       final boolean drilldown,
-                                       final int indentLevel,
-                                       final String indentString)
-    {
-        List<String> objects = new ArrayList<String>();
-
-        if (viewable instanceof POIFSViewable)
-        {
-            POIFSViewable inspected = ( POIFSViewable ) viewable;
-
-            objects.add(indent(indentLevel, indentString,
-                               inspected.getShortDescription()));
-            if (drilldown)
-            {
-                if (inspected.preferArray())
-                {
-                    Object[] data = inspected.getViewableArray();
-
-                    for (int j = 0; j < data.length; j++)
-                    {
-                        objects.addAll(inspectViewable(data[ j ], drilldown,
-                                                       indentLevel + 1,
-                                                       indentString));
-                    }
-                }
-                else
-                {
-                    Iterator<Object> iter = inspected.getViewableIterator();
-
-                    while (iter.hasNext())
-                    {
-                        objects.addAll(inspectViewable(iter.next(),
-                                                       drilldown,
-                                                       indentLevel + 1,
-                                                       indentString));
-                    }
-                }
-            }
-        }
-        else
-        {
-            objects.add(indent(indentLevel, indentString,
-                               viewable.toString()));
-        }
-        return objects;
-    }
-
-    private static String indent(final int indentLevel,
-                                 final String indentString, final String data)
-    {
-        StringBuffer finalBuffer  = new StringBuffer();
-        StringBuffer indentPrefix = new StringBuffer();
-
-        for (int j = 0; j < indentLevel; j++)
-        {
-            indentPrefix.append(indentString);
-        }
-        LineNumberReader reader =
-            new LineNumberReader(new StringReader(data));
-
-        try
-        {
-            String line = reader.readLine();
-
-            while (line != null)
-            {
-                finalBuffer.append(indentPrefix).append(line).append(_EOL);
-                line = reader.readLine();
-            }
-        }
-        catch (IOException e)
-        {
-            finalBuffer.append(indentPrefix).append(e.getMessage())
-                .append(_EOL);
-        }
-        return finalBuffer.toString();
-    }
-}   // end public class POIFSViewEngine
-
diff --git a/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewable.java b/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewable.java
deleted file mode 100644
index 8349e66..0000000
--- a/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewable.java
+++ /dev/null
@@ -1,78 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.dev;
-
-import java.util.Iterator;
-
-/**
- * Interface for a drill-down viewable object. Such an object has
- * content that may or may not be displayed, at the discretion of the
- * viewer. The content is returned to the viewer as an array or as an
- * Iterator, and the object provides a clue as to which technique the
- * viewer should use to get its content.
- *
- * A POIFSViewable object is also expected to provide a short
- * description of itself, that can be used by a viewer when the
- * viewable object is collapsed.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public interface POIFSViewable
-{
-
-    /**
-     * Get an array of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an array of Object; may not be null, but may be empty
-     */
-
-    public Object [] getViewableArray();
-    
-    /**
-     * Get an Iterator of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an Iterator; may not be null, but may have an empty
-     * back end store
-     */
-    public Iterator<Object> getViewableIterator();
-
-    /**
-     * Give viewers a hint as to whether to call getViewableArray or
-     * getViewableIterator
-     *
-     * @return true if a viewer should call getViewableArray, false if
-     *         a viewer should call getViewableIterator
-     */
-
-    public boolean preferArray();
-
-    /**
-     * Provides a short description of the object, to be used when a
-     * POIFSViewable object has not provided its contents.
-     *
-     * @return short description
-     */
-
-    public String getShortDescription();
-}   // end public interface POIFSViewable
-
diff --git a/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewer.java b/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewer.java
deleted file mode 100644
index cf98c01..0000000
--- a/trunk/src/java/org/apache/poi/poifs/dev/POIFSViewer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-/**
- * A simple viewer for POIFS files
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public class POIFSViewer
-{
-
-    /**
-     * Display the contents of multiple POIFS files
-     *
-     * @param args the names of the files to be displayed
-     */
-
-    public static void main(final String args[]) {
-        if (args.length == 0) {
-            System.err.println("Must specify at least one file to view");
-            System.exit(1);
-        }
-        boolean printNames = (args.length > 1);
-
-        for (int j = 0; j < args.length; j++)
-        {
-            viewFile(args[ j ], printNames);
-        }
-    }
-
-    private static void viewFile(String filename, boolean printName) {
-        if (printName) {
-            StringBuffer flowerbox = new StringBuffer();
-
-            flowerbox.append(".");
-            for (int j = 0; j < filename.length(); j++) {
-                flowerbox.append("-");
-            }
-            flowerbox.append(".");
-            System.out.println(flowerbox);
-            System.out.println("|" + filename + "|");
-            System.out.println(flowerbox);
-        }
-        try {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(new File(filename));
-            List<String> strings = POIFSViewEngine.inspectViewable(fs, true, 0, "  ");
-            for (String s : strings) {
-                System.out.print(s);
-            }
-            fs.close();
-        } catch (IOException e) {
-            System.out.println(e.getMessage());
-        }
-    }
-}   // end public class POIFSViewer
-
diff --git a/trunk/src/java/org/apache/poi/poifs/dev/package.html b/trunk/src/java/org/apache/poi/poifs/dev/package.html
deleted file mode 100644
index e4e60ce..0000000
--- a/trunk/src/java/org/apache/poi/poifs/dev/package.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-DEV package serves two purposes.  1. Examples for how to use POIFS and 2. tools for developing
-and validating POIFS.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java b/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
deleted file mode 100644
index 8015114..0000000
--- a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
+++ /dev/null
@@ -1,330 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.eventfilesystem;
-
-import java.io.*;
-
-import java.util.*;
-
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.OPOIFSDocument;
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.Property;
-import org.apache.poi.poifs.property.PropertyTable;
-import org.apache.poi.poifs.storage.BlockAllocationTableReader;
-import org.apache.poi.poifs.storage.BlockList;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.poifs.storage.RawDataBlockList;
-import org.apache.poi.poifs.storage.SmallBlockTableReader;
-
-/**
- * An event-driven reader for POIFS file systems. Users of this class
- * first create an instance of it, then use the registerListener
- * methods to register POIFSReaderListener instances for specific
- * documents. Once all the listeners have been registered, the read()
- * method is called, which results in the listeners being notified as
- * their documents are read.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public class POIFSReader
-{
-    private final POIFSReaderRegistry registry;
-    private boolean registryClosed;
-
-    /**
-     * Create a POIFSReader
-     */
-
-    public POIFSReader()
-    {
-        registry       = new POIFSReaderRegistry();
-        registryClosed = false;
-    }
-
-    /**
-     * Read from an InputStream and process the documents we get
-     *
-     * @param stream the InputStream from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-
-    public void read(final InputStream stream)
-        throws IOException
-    {
-        registryClosed = true;
-
-        // read the header block from the stream
-        HeaderBlock header_block = new HeaderBlock(stream);
-
-        // read the rest of the stream into blocks
-        RawDataBlockList data_blocks = new RawDataBlockList(stream, header_block.getBigBlockSize());
-
-        // set up the block allocation table (necessary for the
-        // data_blocks to be manageable
-        new BlockAllocationTableReader(header_block.getBigBlockSize(),
-                                       header_block.getBATCount(),
-                                       header_block.getBATArray(),
-                                       header_block.getXBATCount(),
-                                       header_block.getXBATIndex(),
-                                       data_blocks);
-
-        // get property table from the document
-        PropertyTable properties =
-            new PropertyTable(header_block, data_blocks);
-
-        // process documents
-        processProperties(SmallBlockTableReader
-            .getSmallDocumentBlocks(
-                  header_block.getBigBlockSize(),
-                  data_blocks, properties.getRoot(), 
-                  header_block.getSBATStart()), 
-                  data_blocks, properties.getRoot()
-                        .getChildren(), new POIFSDocumentPath());
-    }
-
-    /**
-     * Register a POIFSReaderListener for all documents
-     *
-     * @param listener the listener to be registered
-     *
-     * @exception NullPointerException if listener is null
-     * @exception IllegalStateException if read() has already been
-     *                                  called
-     */
-
-    public void registerListener(final POIFSReaderListener listener)
-    {
-        if (listener == null)
-        {
-            throw new NullPointerException();
-        }
-        if (registryClosed)
-        {
-            throw new IllegalStateException();
-        }
-        registry.registerListener(listener);
-    }
-
-    /**
-     * Register a POIFSReaderListener for a document in the root
-     * directory
-     *
-     * @param listener the listener to be registered
-     * @param name the document name
-     *
-     * @exception NullPointerException if listener is null or name is
-     *                                 null or empty
-     * @exception IllegalStateException if read() has already been
-     *                                  called
-     */
-
-    public void registerListener(final POIFSReaderListener listener,
-                                 final String name)
-    {
-        registerListener(listener, null, name);
-    }
-
-    /**
-     * Register a POIFSReaderListener for a document in the specified
-     * directory
-     *
-     * @param listener the listener to be registered
-     * @param path the document path; if null, the root directory is
-     *             assumed
-     * @param name the document name
-     *
-     * @exception NullPointerException if listener is null or name is
-     *                                 null or empty
-     * @exception IllegalStateException if read() has already been
-     *                                  called
-     */
-
-    public void registerListener(final POIFSReaderListener listener,
-                                 final POIFSDocumentPath path,
-                                 final String name)
-    {
-        if ((listener == null) || (name == null) || (name.length() == 0))
-        {
-            throw new NullPointerException();
-        }
-        if (registryClosed)
-        {
-            throw new IllegalStateException();
-        }
-        registry.registerListener(listener,
-                                  (path == null) ? new POIFSDocumentPath()
-                                                 : path, name);
-    }
-
-    /**
-     * read in files
-     *
-     * @param args names of the files
-     *
-     * @exception IOException
-     */
-
-    public static void main(String args[])
-        throws IOException
-    {
-        if (args.length == 0)
-        {
-            System.err
-                .println("at least one argument required: input filename(s)");
-            System.exit(1);
-        }
-
-        // register for all
-        for (int j = 0; j < args.length; j++)
-        {
-            POIFSReader         reader   = new POIFSReader();
-            POIFSReaderListener listener = new SampleListener();
-
-            reader.registerListener(listener);
-            System.out.println("reading " + args[ j ]);
-            FileInputStream istream = new FileInputStream(args[ j ]);
-
-            reader.read(istream);
-            istream.close();
-        }
-    }
-
-    private void processProperties(final BlockList small_blocks,
-                                   final BlockList big_blocks,
-                                   final Iterator<Property> properties,
-                                   final POIFSDocumentPath path)
-        throws IOException
-    {
-        while (properties.hasNext())
-        {
-            Property property = properties.next();
-            String   name     = property.getName();
-
-            if (property.isDirectory())
-            {
-                POIFSDocumentPath new_path = new POIFSDocumentPath(path,
-                                                 new String[]
-                {
-                    name
-                });
-
-                processProperties(
-                    small_blocks, big_blocks,
-                    (( DirectoryProperty ) property).getChildren(), new_path);
-            }
-            else
-            {
-                int startBlock = property.getStartBlock();
-                Iterator<POIFSReaderListener> listeners  = registry.getListeners(path, name);
-
-                if (listeners.hasNext())
-                {
-                    int            size     = property.getSize();
-                    OPOIFSDocument document = null;
-
-                    if (property.shouldUseSmallBlocks())
-                    {
-                        document =
-                            new OPOIFSDocument(name, small_blocks
-                                .fetchBlocks(startBlock, -1), size);
-                    }
-                    else
-                    {
-                        document =
-                            new OPOIFSDocument(name, big_blocks
-                                .fetchBlocks(startBlock, -1), size);
-                    }
-                    while (listeners.hasNext())
-                    {
-                        POIFSReaderListener listener = listeners.next();
-
-                        listener.processPOIFSReaderEvent(
-                            new POIFSReaderEvent(
-                                new DocumentInputStream(document), path,
-                                name));
-                    }
-                }
-                else
-                {
-
-                    // consume the document's data and discard it
-                    if (property.shouldUseSmallBlocks())
-                    {
-                        small_blocks.fetchBlocks(startBlock, -1);
-                    }
-                    else
-                    {
-                        big_blocks.fetchBlocks(startBlock, -1);
-                    }
-                }
-            }
-        }
-    }
-
-    private static class SampleListener
-        implements POIFSReaderListener
-    {
-
-        /**
-         * Constructor SampleListener
-         */
-
-        SampleListener()
-        {
-        }
-
-        /**
-         * Method processPOIFSReaderEvent
-         *
-         * @param event
-         */
-
-        public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-        {
-            @SuppressWarnings("resource")
-            DocumentInputStream istream = event.getStream();
-            POIFSDocumentPath   path    = event.getPath();
-            String              name    = event.getName();
-
-            try
-            {
-                byte[] data = new byte[ istream.available() ];
-
-                istream.read(data);
-                int pathLength = path.length();
-
-                for (int k = 0; k < pathLength; k++)
-                {
-                    System.out.print("/" + path.getComponent(k));
-                }
-                System.out.println("/" + name + ": " + data.length
-                                   + " bytes read");
-            }
-            catch (IOException ignored)
-            {
-            }
-        }
-    }   // end private class SampleListener
-}       // end public class POIFSReader
-
diff --git a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java b/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
deleted file mode 100644
index 4d9d93f..0000000
--- a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.eventfilesystem;
-
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-
-/**
- * Class POIFSReaderEvent
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-public class POIFSReaderEvent
-{
-    private final DocumentInputStream stream;
-    private final POIFSDocumentPath   path;
-    private final String              documentName;
-
-    /**
-     * package scoped constructor
-     *
-     * @param stream the DocumentInputStream, freshly opened
-     * @param path the path of the document
-     * @param documentName the name of the document
-     */
-
-    POIFSReaderEvent(final DocumentInputStream stream,
-                     final POIFSDocumentPath path, final String documentName)
-    {
-        this.stream       = stream;
-        this.path         = path;
-        this.documentName = documentName;
-    }
-
-    /**
-     * @return the DocumentInputStream, freshly opened
-     */
-
-    public DocumentInputStream getStream()
-    {
-        return stream;
-    }
-
-    /**
-     * @return the document's path
-     */
-
-    public POIFSDocumentPath getPath()
-    {
-        return path;
-    }
-
-    /**
-     * @return the document's name
-     */
-
-    public String getName()
-    {
-        return documentName;
-    }
-}   // end public class POIFSReaderEvent
-
diff --git a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java b/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
deleted file mode 100644
index 56a3b78..0000000
--- a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.eventfilesystem;
-
-/**
- * Interface POIFSReaderListener
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-public interface POIFSReaderListener
-{
-
-    /**
-     * Process a POIFSReaderEvent that this listener had registered
-     * for
-     *
-     * @param event the POIFSReaderEvent
-     */
-
-    public void processPOIFSReaderEvent(POIFSReaderEvent event);
-}   // end public interface POIFSReaderListener
-
diff --git a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java b/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
deleted file mode 100644
index 1ea85f7..0000000
--- a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
+++ /dev/null
@@ -1,184 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.eventfilesystem;
-
-import java.util.*;
-
-import org.apache.poi.poifs.filesystem.DocumentDescriptor;
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-
-/**
- * A registry for POIFSReaderListeners and the DocumentDescriptors of
- * the documents those listeners are interested in
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-class POIFSReaderRegistry
-{
-
-    // the POIFSReaderListeners who listen to all POIFSReaderEvents
-    private Set<POIFSReaderListener> omnivorousListeners;
-
-    // Each mapping in this Map has a key consisting of a
-    // POIFSReaderListener and a value cosisting of a Set of
-    // DocumentDescriptors for the documents that POIFSReaderListener
-    // is interested in; used to efficiently manage the registry
-    private Map<POIFSReaderListener, Set<DocumentDescriptor>> selectiveListeners;
-
-    // Each mapping in this Map has a key consisting of a
-    // DocumentDescriptor and a value consisting of a Set of
-    // POIFSReaderListeners for the document matching that
-    // DocumentDescriptor; used when a document is found, to quickly
-    // get the listeners interested in that document
-    private Map<DocumentDescriptor,Set<POIFSReaderListener>> chosenDocumentDescriptors;
-
-    /**
-     * Construct the registry
-     */
-
-    POIFSReaderRegistry()
-    {
-        omnivorousListeners       = new HashSet<POIFSReaderListener>();
-        selectiveListeners        = new HashMap<POIFSReaderListener, Set<DocumentDescriptor>>();
-        chosenDocumentDescriptors = new HashMap<DocumentDescriptor,Set<POIFSReaderListener>>();
-    }
-
-    /**
-     * register a POIFSReaderListener for a particular document
-     *
-     * @param listener the listener
-     * @param path the path of the document of interest
-     * @param documentName the name of the document of interest
-     */
-
-    void registerListener(final POIFSReaderListener listener,
-                          final POIFSDocumentPath path,
-                          final String documentName)
-    {
-        if (!omnivorousListeners.contains(listener))
-        {
-
-            // not an omnivorous listener (if it was, this method is a
-            // no-op)
-            Set<DocumentDescriptor> descriptors = selectiveListeners.get(listener);
-
-            if (descriptors == null)
-            {
-
-                // this listener has not registered before
-                descriptors = new HashSet<DocumentDescriptor>();
-                selectiveListeners.put(listener, descriptors);
-            }
-            DocumentDescriptor descriptor = new DocumentDescriptor(path,
-                                                documentName);
-
-            if (descriptors.add(descriptor))
-            {
-
-                // this listener wasn't already listening for this
-                // document -- add the listener to the set of
-                // listeners for this document
-                Set<POIFSReaderListener> listeners =
-                    chosenDocumentDescriptors.get(descriptor);
-
-                if (listeners == null)
-                {
-
-                    // nobody was listening for this document before
-                    listeners = new HashSet<POIFSReaderListener>();
-                    chosenDocumentDescriptors.put(descriptor, listeners);
-                }
-                listeners.add(listener);
-            }
-        }
-    }
-
-    /**
-     * register for all documents
-     *
-     * @param listener the listener who wants to get all documents
-     */
-
-    void registerListener(final POIFSReaderListener listener)
-    {
-        if (!omnivorousListeners.contains(listener))
-        {
-
-            // wasn't already listening for everything, so drop
-            // anything listener might have been listening for and
-            // then add the listener to the set of omnivorous
-            // listeners
-            removeSelectiveListener(listener);
-            omnivorousListeners.add(listener);
-        }
-    }
-
-    /**
-     * get am iterator of listeners for a particular document
-     *
-     * @param path the document path
-     * @param name the name of the document
-     *
-     * @return an Iterator POIFSReaderListeners; may be empty
-     */
-
-    Iterator<POIFSReaderListener> getListeners(final POIFSDocumentPath path, final String name)
-    {
-        Set<POIFSReaderListener> rval = new HashSet<POIFSReaderListener>(omnivorousListeners);
-        Set<POIFSReaderListener> selectiveListenersInner =
-            chosenDocumentDescriptors.get(new DocumentDescriptor(path, name));
-
-        if (selectiveListenersInner != null)
-        {
-            rval.addAll(selectiveListenersInner);
-        }
-        return rval.iterator();
-    }
-
-    private void removeSelectiveListener(final POIFSReaderListener listener)
-    {
-        Set<DocumentDescriptor> selectedDescriptors = selectiveListeners.remove(listener);
-
-        if (selectedDescriptors != null)
-        {
-            Iterator<DocumentDescriptor> iter = selectedDescriptors.iterator();
-
-            while (iter.hasNext())
-            {
-                dropDocument(listener, iter.next());
-            }
-        }
-    }
-
-    private void dropDocument(final POIFSReaderListener listener,
-                              final DocumentDescriptor descriptor)
-    {
-        Set<POIFSReaderListener> listeners = chosenDocumentDescriptors.get(descriptor);
-
-        listeners.remove(listener);
-        if (listeners.size() == 0)
-        {
-            chosenDocumentDescriptors.remove(descriptor);
-        }
-    }
-}   // end package scope class POIFSReaderRegistry
-
diff --git a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/package.html b/trunk/src/java/org/apache/poi/poifs/eventfilesystem/package.html
deleted file mode 100644
index 472a0d9..0000000
--- a/trunk/src/java/org/apache/poi/poifs/eventfilesystem/package.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-The eventfilesystem is an efficient method for reading OLE 2 CDF files.  It is to OLE 2 CDF what SAX is to XML.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.poifs.filesystem
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/BATManaged.java b/trunk/src/java/org/apache/poi/poifs/filesystem/BATManaged.java
deleted file mode 100644
index fcd3bde..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/BATManaged.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-/**
- * This interface defines behaviors for objects managed by the Block
- * Allocation Table (BAT).
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public interface BATManaged
-{
-
-    /**
-     * Return the number of BigBlock's this instance uses
-     *
-     * @return count of BigBlock instances
-     */
-
-    int countBlocks();
-
-    /**
-     * Set the start block for this instance
-     *
-     * @param index index into the array of BigBlock instances making
-     *              up the the filesystem
-     */
-
-    void setStartBlock(final int index);
-}   // end public interface BATManaged
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/BlockStore.java b/trunk/src/java/org/apache/poi/poifs/filesystem/BlockStore.java
deleted file mode 100644
index a56d111..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/BlockStore.java
+++ /dev/null
@@ -1,109 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.apache.poi.poifs.storage.BATBlock.BATBlockAndIndex;
-
-/**
- * This abstract class describes a way to read, store, chain
- *  and free a series of blocks (be they Big or Small ones)
- */
-public abstract class BlockStore {
-   /**
-    * Returns the size of the blocks managed through the block store.
-    */
-   protected abstract int getBlockStoreBlockSize();
-   
-    /**
-     * Load the block at the given offset.
-     */
-    protected abstract ByteBuffer getBlockAt(final int offset) throws IOException;
-    
-    /**
-     * Extends the file if required to hold blocks up to
-     *  the specified offset, and return the block from there. 
-     */
-    protected abstract ByteBuffer createBlockIfNeeded(final int offset) throws IOException;
-    
-    /**
-     * Returns the BATBlock that handles the specified offset,
-     *  and the relative index within it
-     */
-    protected abstract BATBlockAndIndex getBATBlockAndIndex(final int offset);
-    
-    /**
-     * Works out what block follows the specified one.
-     */
-    protected abstract int getNextBlock(final int offset);
-    
-    /**
-     * Changes the record of what block follows the specified one.
-     */
-    protected abstract void setNextBlock(final int offset, final int nextBlock);
-    
-    /**
-     * Finds a free block, and returns its offset.
-     * This method will extend the file/stream if needed, and if doing
-     *  so, allocate new FAT blocks to address the extra space.
-     */
-    protected abstract int getFreeBlock() throws IOException;
-    
-    /**
-     * Creates a Detector for loops in the chain 
-     */
-    protected abstract ChainLoopDetector getChainLoopDetector() throws IOException;
-    
-    /**
-     * Used to detect if a chain has a loop in it, so
-     *  we can bail out with an error rather than
-     *  spinning away for ever... 
-     */
-    protected class ChainLoopDetector {
-       private boolean[] used_blocks;
-       protected ChainLoopDetector(long rawSize) {
-          int blkSize = getBlockStoreBlockSize();
-          int numBlocks = (int)(rawSize / blkSize);
-          if ((rawSize % blkSize) != 0) {
-              numBlocks++;
-          }
-          used_blocks = new boolean[numBlocks];
-       }
-       protected void claim(int offset) {
-          if(offset >= used_blocks.length) {
-             // They're writing, and have had new blocks requested
-             //  for the write to proceed. That means they're into
-             //  blocks we've allocated for them, so are safe
-             return;
-          }
-          
-          // Claiming an existing block, ensure there's no loop
-          if(used_blocks[offset]) {
-             throw new IllegalStateException(
-                   "Potential loop detected - Block " + offset + 
-                   " was already claimed but was just requested again"
-             );
-          }
-          used_blocks[offset] = true;
-       }
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
deleted file mode 100644
index 7148fda..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.apache.poi.hpsf.ClassID;
-
-/**
- * This interface defines methods specific to Directory objects
- * managed by a Filesystem instance.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public interface DirectoryEntry
-    extends Entry, Iterable<Entry>
-{
-
-    /**
-     * get an iterator of the Entry instances contained directly in
-     * this instance (in other words, children only; no grandchildren
-     * etc.)
-     *
-     * @return iterator; never null, but hasNext() may return false
-     *         immediately (i.e., this DirectoryEntry is empty). All
-     *         objects retrieved by next() are guaranteed to be
-     *         implementations of Entry.
-     */
-
-    public Iterator<Entry> getEntries();
-    
-    /**
-     * get the names of all the Entries contained directly in this
-     * instance (in other words, names of children only; no grandchildren
-     * etc).
-     *
-     * @return the names of all the entries that may be retrieved with
-     *         getEntry(String), which may be empty (if this 
-     *         DirectoryEntry is empty)
-     */
-    public Set<String> getEntryNames();
-
-    /**
-     * is this DirectoryEntry empty?
-     *
-     * @return true if this instance contains no Entry instances
-     */
-
-    public boolean isEmpty();
-
-    /**
-     * find out how many Entry instances are contained directly within
-     * this DirectoryEntry
-     *
-     * @return number of immediately (no grandchildren etc.) contained
-     *         Entry instances
-     */
-
-    public int getEntryCount();
-
-    /**
-     * Checks if entry with specified name present
-     */
-
-    public boolean hasEntry( final String name );
-
-    /**
-     * get a specified Entry by name
-     *
-     * @param name the name of the Entry to obtain.
-     *
-     * @return the specified Entry, if it is directly contained in
-     *         this DirectoryEntry
-     *
-     * @exception FileNotFoundException if no Entry with the specified
-     *            name exists in this DirectoryEntry
-     */
-
-    public Entry getEntry(final String name)
-        throws FileNotFoundException;
-
-    /**
-     * create a new DocumentEntry
-     *
-     * @param name the name of the new DocumentEntry
-     * @param stream the InputStream from which to create the new
-     *               DocumentEntry
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-
-    public DocumentEntry createDocument(final String name,
-                                        final InputStream stream)
-        throws IOException;
-
-    /**
-     * create a new DocumentEntry; the data will be provided later
-     *
-     * @param name the name of the new DocumentEntry
-     * @param size the size of the new DocumentEntry
-     * @param writer the writer of the new DocumentEntry
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-
-    public DocumentEntry createDocument(final String name, final int size,
-                                        final POIFSWriterListener writer)
-        throws IOException;
-
-    /**
-     * create a new DirectoryEntry
-     *
-     * @param name the name of the new DirectoryEntry
-     *
-     * @return the new DirectoryEntry
-     *
-     * @exception IOException
-     */
-
-    public DirectoryEntry createDirectory(final String name)
-        throws IOException;
-
-    /**
-     * Gets the storage clsid of the directory entry
-     *
-     * @return storage Class ID
-     */
-    public ClassID getStorageClsid();
-
-    /**
-     * Sets the storage clsid for the directory entry
-     *
-     * @param clsidStorage storage Class ID
-     */
-    public void setStorageClsid(ClassID clsidStorage);
-
-}   // end public interface DirectoryEntry
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
deleted file mode 100644
index ccb0085..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
+++ /dev/null
@@ -1,636 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.hpsf.ClassID;
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.DocumentProperty;
-import org.apache.poi.poifs.property.Property;
-
-/**
- * Simple implementation of DirectoryEntry
- */
-public class DirectoryNode
-    extends EntryNode
-    implements DirectoryEntry, POIFSViewable, Iterable<Entry>
-{
-
-    // Map of Entry instances, keyed by their names
-    private Map<String,Entry> _byname;
-    // Our list of entries, kept sorted to preserve order
-    private ArrayList<Entry> _entries;
-
-    // Only one of these two will exist
-    // the OPOIFSFileSystem we belong to
-    private OPOIFSFileSystem   _ofilesystem;
-    // the NPOIFSFileSytem we belong to
-    private NPOIFSFileSystem  _nfilesystem;
-
-    // the path described by this document
-    private POIFSDocumentPath _path;
-
-    /**
-     * create a DirectoryNode. This method is not public by design; it
-     * is intended strictly for the internal use of this package
-     *
-     * @param property the DirectoryProperty for this DirectoryEntry
-     * @param filesystem the OPOIFSFileSystem we belong to
-     * @param parent the parent of this entry
-     */
-    DirectoryNode(final DirectoryProperty property,
-                  final OPOIFSFileSystem filesystem,
-                  final DirectoryNode parent)
-    {
-       this(property, parent, filesystem, (NPOIFSFileSystem)null);
-    }
-
-    /**
-     * create a DirectoryNode. This method is not public by design; it
-     * is intended strictly for the internal use of this package
-     *
-     * @param property the DirectoryProperty for this DirectoryEntry
-     * @param nfilesystem the NPOIFSFileSystem we belong to
-     * @param parent the parent of this entry
-     */
-    DirectoryNode(final DirectoryProperty property,
-                  final NPOIFSFileSystem nfilesystem,
-                  final DirectoryNode parent)
-    {
-       this(property, parent, (OPOIFSFileSystem)null, nfilesystem);
-    }
-
-    private DirectoryNode(final DirectoryProperty property,
-                          final DirectoryNode parent,
-                          final OPOIFSFileSystem ofilesystem,
-                          final NPOIFSFileSystem nfilesystem)
-    {
-        super(property, parent);
-        this._ofilesystem = ofilesystem;
-        this._nfilesystem = nfilesystem;
-
-        if (parent == null)
-        {
-            _path = new POIFSDocumentPath();
-        }
-        else
-        {
-            _path = new POIFSDocumentPath(parent._path, new String[]
-            {
-                property.getName()
-            });
-        }
-        _byname     = new HashMap<String, Entry>();
-        _entries    = new ArrayList<Entry>();
-        Iterator<Property> iter = property.getChildren();
-
-        while (iter.hasNext())
-        {
-            Property child     = iter.next();
-            Entry    childNode = null;
-
-            if (child.isDirectory())
-            {
-                DirectoryProperty childDir = (DirectoryProperty) child;
-                if(_ofilesystem != null) {
-                   childNode = new DirectoryNode(childDir, _ofilesystem, this);
-                } else {
-                   childNode = new DirectoryNode(childDir, _nfilesystem, this);
-                }
-            }
-            else
-            {
-                childNode = new DocumentNode((DocumentProperty) child, this);
-            }
-            _entries.add(childNode);
-            _byname.put(childNode.getName(), childNode);
-        }
-    }
-
-    /**
-     * @return this directory's path representation
-     */
-
-    public POIFSDocumentPath getPath()
-    {
-        return _path;
-    }
-
-    /**
-     * @return the filesystem that this belongs to
-     */
-    public NPOIFSFileSystem getFileSystem()
-    {
-        return _nfilesystem;
-    }
-
-    /**
-     * If this is OPOIFS based, return the NPOIFSFileSystem
-     *  that this belong to, otherwise Null if NPOIFS based
-     * @return the filesystem that this belongs to
-     */
-    public OPOIFSFileSystem getOFileSystem()
-    {
-        return _ofilesystem;
-    }
-
-    /**
-     * If this is NPOIFS based, return the NPOIFSFileSystem
-     *  that this belong to, otherwise Null if OPOIFS based
-     * @return the filesystem that this belongs to
-     */
-    public NPOIFSFileSystem getNFileSystem()
-    {
-        return _nfilesystem;
-    }
-
-    /**
-     * open a document in the directory's entry's list of entries
-     *
-     * @param documentName the name of the document to be opened
-     *
-     * @return a newly opened DocumentInputStream
-     *
-     * @exception IOException if the document does not exist or the
-     *            name is that of a DirectoryEntry
-     */
-    public DocumentInputStream createDocumentInputStream(
-            final String documentName)
-        throws IOException
-    {
-        return createDocumentInputStream(getEntry(documentName));
-    }
-
-    /**
-     * open a document in the directory's entry's list of entries
-     *
-     * @param document the document to be opened
-     *
-     * @return a newly opened DocumentInputStream or NDocumentInputStream
-     *
-     * @exception IOException if the document does not exist or the
-     *            name is that of a DirectoryEntry
-     */
-    public DocumentInputStream createDocumentInputStream(
-            final Entry document)
-        throws IOException
-    {
-        if (!document.isDocumentEntry()) {
-            throw new IOException("Entry '" + document.getName()
-                                  + "' is not a DocumentEntry");
-        }
-
-        DocumentEntry entry = (DocumentEntry)document;
-        return new DocumentInputStream(entry);
-    }
-
-    /**
-     * create a new DocumentEntry
-     *
-     * @param document the new document
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-    DocumentEntry createDocument(final OPOIFSDocument document)
-        throws IOException
-    {
-        DocumentProperty property = document.getDocumentProperty();
-        DocumentNode     rval     = new DocumentNode(property, this);
-
-        (( DirectoryProperty ) getProperty()).addChild(property);
-        _ofilesystem.addDocument(document);
-
-        _entries.add(rval);
-        _byname.put(property.getName(), rval);
-        return rval;
-    }
-
-    /**
-     * create a new DocumentEntry
-     *
-     * @param document the new document
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-    DocumentEntry createDocument(final NPOIFSDocument document)
-        throws IOException
-    {
-        DocumentProperty property = document.getDocumentProperty();
-        DocumentNode     rval     = new DocumentNode(property, this);
-
-        (( DirectoryProperty ) getProperty()).addChild(property);
-        _nfilesystem.addDocument(document);
-
-        _entries.add(rval);
-        _byname.put(property.getName(), rval);
-        return rval;
-    }
-
-    /**
-     * Change a contained Entry's name
-     *
-     * @param oldName the original name
-     * @param newName the new name
-     *
-     * @return true if the operation succeeded, else false
-     */
-    boolean changeName(final String oldName, final String newName)
-    {
-        boolean   rval  = false;
-        EntryNode child = ( EntryNode ) _byname.get(oldName);
-
-        if (child != null)
-        {
-            rval = (( DirectoryProperty ) getProperty())
-                .changeName(child.getProperty(), newName);
-            if (rval)
-            {
-                _byname.remove(oldName);
-                _byname.put(child.getProperty().getName(), child);
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Delete an entry
-     *
-     * @param entry the EntryNode to be deleted
-     *
-     * @return true if the entry was deleted, else false
-     */
-
-    boolean deleteEntry(final EntryNode entry)
-    {
-        boolean rval =
-            (( DirectoryProperty ) getProperty())
-                .deleteChild(entry.getProperty());
-
-        if (rval)
-        {
-            _entries.remove(entry);
-            _byname.remove(entry.getName());
-
-            if(_ofilesystem != null) {
-                _ofilesystem.remove(entry);
-            } else {
-                try {
-                    _nfilesystem.remove(entry);
-                } catch (IOException e) {
-                    // TODO Work out how to report this, given we can't change the method signature...
-                }
-            }
-        }
-        return rval;
-    }
-
-    /* ********** START implementation of DirectoryEntry ********** */
-
-    /**
-     * get an iterator of the Entry instances contained directly in
-     * this instance (in other words, children only; no grandchildren
-     * etc.)
-     *
-     * @return iterator; never null, but hasNext() may return false
-     *         immediately (i.e., this DirectoryEntry is empty). All
-     *         objects retrieved by next() are guaranteed to be
-     *         implementations of Entry.
-     */
-
-    public Iterator<Entry> getEntries()
-    {
-        return _entries.iterator();
-    }
-    
-    /**
-     * get the names of all the Entries contained directly in this
-     * instance (in other words, names of children only; no grandchildren
-     * etc).
-     *
-     * @return the names of all the entries that may be retrieved with
-     *         getEntry(String), which may be empty (if this 
-     *         DirectoryEntry is empty)
-     */
-    public Set<String> getEntryNames()
-    {
-        return _byname.keySet();
-    }
-
-    /**
-     * is this DirectoryEntry empty?
-     *
-     * @return true if this instance contains no Entry instances
-     */
-
-    public boolean isEmpty()
-    {
-        return _entries.isEmpty();
-    }
-
-    /**
-     * find out how many Entry instances are contained directly within
-     * this DirectoryEntry
-     *
-     * @return number of immediately (no grandchildren etc.) contained
-     *         Entry instances
-     */
-
-    public int getEntryCount()
-    {
-        return _entries.size();
-    }
-
-    public boolean hasEntry( String name )
-    {
-        return name != null && _byname.containsKey( name );
-    }
-
-    /**
-     * get a specified Entry by name
-     *
-     * @param name the name of the Entry to obtain.
-     *
-     * @return the specified Entry, if it is directly contained in
-     *         this DirectoryEntry
-     *
-     * @exception FileNotFoundException if no Entry with the specified
-     *            name exists in this DirectoryEntry
-     */
-
-    public Entry getEntry(final String name) throws FileNotFoundException {
-        Entry rval = null;
-
-        if (name != null) {
-            rval = _byname.get(name);
-        }
-        if (rval == null) {
-            // either a null name was given, or there is no such name
-            throw new FileNotFoundException("no such entry: \"" + name
-                    + "\", had: " + _byname.keySet());
-        }
-        return rval;
-    }
-
-    /**
-     * create a new DocumentEntry
-     *
-     * @param name the name of the new DocumentEntry
-     * @param stream the InputStream from which to create the new
-     *               DocumentEntry
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-
-    public DocumentEntry createDocument(final String name,
-                                        final InputStream stream)
-        throws IOException
-    {
-        if(_nfilesystem != null) {
-           return createDocument(new NPOIFSDocument(name, _nfilesystem, stream));
-        } else {
-           return createDocument(new OPOIFSDocument(name, stream));
-        }
-    }
-
-    /**
-     * create a new DocumentEntry; the data will be provided later
-     *
-     * @param name the name of the new DocumentEntry
-     * @param size the size of the new DocumentEntry
-     * @param writer the writer of the new DocumentEntry
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-
-    public DocumentEntry createDocument(final String name, final int size,
-                                        final POIFSWriterListener writer)
-        throws IOException
-    {
-        if(_nfilesystem != null) {
-            return createDocument(new NPOIFSDocument(name, size, _nfilesystem, writer));
-         } else {
-            return createDocument(new OPOIFSDocument(name, size, _path, writer));
-         }
-    }
-
-    /**
-     * create a new DirectoryEntry
-     *
-     * @param name the name of the new DirectoryEntry
-     *
-     * @return the new DirectoryEntry
-     *
-     * @exception IOException
-     */
-
-    public DirectoryEntry createDirectory(final String name)
-        throws IOException
-    {
-        DirectoryNode rval;
-        DirectoryProperty property = new DirectoryProperty(name);
-
-        if(_ofilesystem != null) {
-           rval = new DirectoryNode(property, _ofilesystem, this);
-           _ofilesystem.addDirectory(property);
-        } else {
-           rval = new DirectoryNode(property, _nfilesystem, this);
-           _nfilesystem.addDirectory(property);
-        }
-
-        (( DirectoryProperty ) getProperty()).addChild(property);
-        _entries.add(rval);
-        _byname.put(name, rval);
-        return rval;
-    }
-
-    /**
-     * Set the contents of a document, creating if needed, 
-     *  otherwise updating. Returns the created / updated DocumentEntry
-     *
-     * @param name the name of the new or existing DocumentEntry
-     * @param stream the InputStream from which to populate the DocumentEntry
-     *
-     * @return the new or updated DocumentEntry
-     *
-     * @exception IOException
-     */
-
-    public DocumentEntry createOrUpdateDocument(final String name,
-                                                final InputStream stream)
-        throws IOException
-    {
-        if (! hasEntry(name)) {
-            return createDocument(name, stream);
-        } else {
-            DocumentNode existing = (DocumentNode)getEntry(name);
-            if (_nfilesystem != null) {
-                NPOIFSDocument nDoc = new NPOIFSDocument(existing);
-                nDoc.replaceContents(stream);
-                return existing;
-            } else {
-                // Do it the hard way for Old POIFS...
-                deleteEntry(existing);
-                return createDocument(name, stream);
-            }
-        }
-    }
-    
-    /**
-     * Gets the storage clsid of the directory entry
-     *
-     * @return storage Class ID
-     */
-    public ClassID getStorageClsid()
-    {
-        return getProperty().getStorageClsid();
-    }
-
-    /**
-     * Sets the storage clsid for the directory entry
-     *
-     * @param clsidStorage storage Class ID
-     */
-    public void setStorageClsid(ClassID clsidStorage)
-    {
-        getProperty().setStorageClsid(clsidStorage);
-    }
-
-    /* **********  END  implementation of DirectoryEntry ********** */
-    /* ********** START implementation of Entry ********** */
-
-    /**
-     * is this a DirectoryEntry?
-     *
-     * @return true if the Entry is a DirectoryEntry, else false
-     */
-
-    @Override
-    public boolean isDirectoryEntry()
-    {
-        return true;
-    }
-
-    /* **********  END  implementation of Entry ********** */
-    /* ********** START extension of Entry ********** */
-
-    /**
-     * extensions use this method to verify internal rules regarding
-     * deletion of the underlying store.
-     *
-     * @return true if it's ok to delete the underlying store, else
-     *         false
-     */
-
-    @Override
-    protected boolean isDeleteOK()
-    {
-
-        // if this directory is empty, we can delete it
-        return isEmpty();
-    }
-
-    /* **********  END  extension of Entry ********** */
-    /* ********** START begin implementation of POIFSViewable ********** */
-
-    /**
-     * Get an array of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an array of Object; may not be null, but may be empty
-     */
-
-    public Object [] getViewableArray()
-    {
-        return new Object[ 0 ];
-    }
-
-    /**
-     * Get an Iterator of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an Iterator; may not be null, but may have an empty
-     * back end store
-     */
-    public Iterator<Object> getViewableIterator()
-    {
-        List<Object> components = new ArrayList<Object>();
-
-        components.add(getProperty());
-        Iterator<Entry> iter = _entries.iterator();
-        while (iter.hasNext())
-        {
-            components.add(iter.next());
-        }
-        return components.iterator();
-    }
-
-    /**
-     * Give viewers a hint as to whether to call getViewableArray or
-     * getViewableIterator
-     *
-     * @return true if a viewer should call getViewableArray, false if
-     *         a viewer should call getViewableIterator
-     */
-
-    public boolean preferArray()
-    {
-        return false;
-    }
-
-    /**
-     * Provides a short description of the object, to be used when a
-     * POIFSViewable object has not provided its contents.
-     *
-     * @return short description
-     */
-
-    public String getShortDescription()
-    {
-        return getName();
-    }
-
-    /**
-     * Returns an Iterator over all the entries
-     */
-    public Iterator<Entry> iterator() {
-        return getEntries();
-    }
-
-    /* **********  END  begin implementation of POIFSViewable ********** */
-}   // end public class DirectoryNode
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
deleted file mode 100644
index cc9d7eb..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
+++ /dev/null
@@ -1,117 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-/**
- * Class DocumentDescriptor
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-public class DocumentDescriptor
-{
-    private POIFSDocumentPath path;
-    private String            name;
-    private int               hashcode = 0;
-
-    /**
-     * Trivial constructor
-     *
-     * @param path the Document path
-     * @param name the Document name
-     */
-
-    public DocumentDescriptor(final POIFSDocumentPath path, final String name)
-    {
-        if (path == null)
-        {
-            throw new NullPointerException("path must not be null");
-        }
-        if (name == null)
-        {
-            throw new NullPointerException("name must not be null");
-        }
-        if (name.length() == 0)
-        {
-            throw new IllegalArgumentException("name cannot be empty");
-        }
-        this.path = path;
-        this.name = name;
-    }
-
-    /**
-     * equality. Two DocumentDescriptor instances are equal if they
-     * have equal paths and names
-     *
-     * @param o the object we're checking equality for
-     *
-     * @return true if the object is equal to this object
-     */
-
-    public boolean equals(final Object o)
-    {
-        boolean rval = false;
-
-        if ((o != null) && (o.getClass() == this.getClass()))
-        {
-            if (this == o)
-            {
-                rval = true;
-            }
-            else
-            {
-                DocumentDescriptor descriptor = ( DocumentDescriptor ) o;
-
-                rval = this.path.equals(descriptor.path)
-                       && this.name.equals(descriptor.name);
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * calculate and return the hashcode
-     *
-     * @return hashcode
-     */
-
-    public int hashCode()
-    {
-        if (hashcode == 0)
-        {
-            hashcode = path.hashCode() ^ name.hashCode();
-        }
-        return hashcode;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer(40 * (path.length() + 1));
-
-        for (int j = 0; j < path.length(); j++)
-        {
-            buffer.append(path.getComponent(j)).append("/");
-        }
-        buffer.append(name);
-        return buffer.toString();
-    }
-}   // end public class DocumentDescriptor
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentEntry.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
deleted file mode 100644
index 29f4b8a..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-/**
- * This interface defines methods specific to Document objects
- * managed by a Filesystem instance.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public interface DocumentEntry
-    extends Entry
-{
-
-    /**
-     * get the zize of the document, in bytes
-     *
-     * @return size in bytes
-     */
-
-    public int getSize();
-}   // end public interface DocumentEntry
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
deleted file mode 100644
index 58658fa..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.util.IOUtils;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.security.GeneralSecurityException;
-
-/**
- * A small base class for the various factories, e.g. WorkbookFactory,
- * SlideShowFactory to combine common code here.
- */
-public class DocumentFactoryHelper {
-    /**
-     * Wrap the OLE2 data in the NPOIFSFileSystem into a decrypted stream by using
-     * the given password.
-     *
-     * @param fs The OLE2 stream for the document
-     * @param password The password, null if the default password should be used
-     * @return A stream for reading the decrypted data
-     * @throws IOException If an error occurs while decrypting or if the password does not match
-     */
-    public static InputStream getDecryptedStream(final NPOIFSFileSystem fs, String password)
-            throws IOException {
-        EncryptionInfo info = new EncryptionInfo(fs);
-        Decryptor d = Decryptor.getInstance(info);
-
-        try {
-            boolean passwordCorrect = false;
-            if (password != null && d.verifyPassword(password)) {
-                passwordCorrect = true;
-            }
-            if (!passwordCorrect && d.verifyPassword(Decryptor.DEFAULT_PASSWORD)) {
-                passwordCorrect = true;
-            }
-
-            if (passwordCorrect) {
-                // wrap the stream in a FilterInputStream to close the NPOIFSFileSystem
-                // as well when the resulting OPCPackage is closed
-                return new FilterInputStream(d.getDataStream(fs.getRoot())) {
-                    @Override
-                    public void close() throws IOException {
-                        fs.close();
-
-                        super.close();
-                    }
-                };
-            } else {
-                if (password != null)
-                    throw new EncryptedDocumentException("Password incorrect");
-                else
-                    throw new EncryptedDocumentException("The supplied spreadsheet is protected, but no password was supplied");
-            }
-        } catch (GeneralSecurityException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /**
-     * Checks that the supplied InputStream (which MUST
-     *  support mark and reset, or be a PushbackInputStream)
-     *  has a OOXML (zip) header at the start of it.
-     * If your InputStream does not support mark / reset,
-     *  then wrap it in a PushBackInputStream, then be
-     *  sure to always use that, and not the original!
-     * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
-     */
-    public static boolean hasOOXMLHeader(InputStream inp) throws IOException {
-        // We want to peek at the first 4 bytes
-        inp.mark(4);
-
-        byte[] header = new byte[4];
-        int bytesRead = IOUtils.readFully(inp, header);
-
-        // Wind back those 4 bytes
-        if(inp instanceof PushbackInputStream) {
-            PushbackInputStream pin = (PushbackInputStream)inp;
-            pin.unread(header, 0, bytesRead);
-        } else {
-            inp.reset();
-        }
-
-        // Did it match the ooxml zip signature?
-        return (
-                bytesRead == 4 &&
-                        header[0] == POIFSConstants.OOXML_FILE_HEADER[0] &&
-                        header[1] == POIFSConstants.OOXML_FILE_HEADER[1] &&
-                        header[2] == POIFSConstants.OOXML_FILE_HEADER[2] &&
-                        header[3] == POIFSConstants.OOXML_FILE_HEADER[3]
-        );
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
deleted file mode 100644
index ffd6a1a..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * This class provides methods to read a DocumentEntry managed by a
- *  {@link POIFSFileSystem} or {@link NPOIFSFileSystem} instance.
- * It creates the appropriate one, and delegates, allowing us to
- *  work transparently with the two.
- */
-public class DocumentInputStream extends InputStream implements LittleEndianInput {
-	/** returned by read operations if we're at end of document */
-	protected static final int EOF = -1;
-
-	protected static final int SIZE_SHORT = 2;
-	protected static final int SIZE_INT = 4;
-	protected static final int SIZE_LONG = 8;
-	
-	private DocumentInputStream delegate;
-	
-	/** For use by downstream implementations */
-	protected DocumentInputStream() {}
-
-	/**
-	 * Create an InputStream from the specified DocumentEntry
-	 * 
-	 * @param document the DocumentEntry to be read
-	 * 
-	 * @exception IOException if the DocumentEntry cannot be opened (like, maybe it has
-	 *                been deleted?)
-	 */
-	public DocumentInputStream(DocumentEntry document) throws IOException {
-	   if (!(document instanceof DocumentNode)) {
-	      throw new IOException("Cannot open internal document storage");
-	   }
-	   DocumentNode documentNode = (DocumentNode)document;
-	   DirectoryNode parentNode = (DirectoryNode)document.getParent();
-
-	   if(documentNode.getDocument() != null) {
-	      delegate = new ODocumentInputStream(document);
-	   } else if(parentNode.getOFileSystem() != null) {
-	      delegate = new ODocumentInputStream(document);
-	   } else if(parentNode.getNFileSystem() != null) {
-	      delegate = new NDocumentInputStream(document);
-	   } else {
-	      throw new IOException("No FileSystem bound on the parent, can't read contents");
-	   }
-	}
-
-	/**
-	 * Create an InputStream from the specified Document
-	 * 
-	 * @param document the Document to be read
-	 */
-	public DocumentInputStream(OPOIFSDocument document) {
-	   delegate = new ODocumentInputStream(document);
-	}
-
-   /**
-    * Create an InputStream from the specified Document
-    * 
-    * @param document the Document to be read
-    */
-   public DocumentInputStream(NPOIFSDocument document) {
-      delegate = new NDocumentInputStream(document);
-   }
-
-    @Override
-	public int available() {
-	   return delegate.available();
-	}
-
-    @Override
-	public void close() {
-	   delegate.close();
-	}
-
-    @Override
-	public void mark(int ignoredReadlimit) {
-		delegate.mark(ignoredReadlimit);
-	}
-
-	/**
-	 * Tests if this input stream supports the mark and reset methods.
-	 * 
-	 * @return <code>true</code> always
-	 */
-    @Override
-	public boolean markSupported() {
-		return true;
-	}
-
-    @Override
-	public int read() throws IOException {
-	   return delegate.read();
-	}
-
-	@Override
-	public int read(byte[] b) throws IOException {
-		return read(b, 0, b.length);
-	}
-
-    @Override
-	public int read(byte[] b, int off, int len) throws IOException {
-	   return delegate.read(b, off, len);
-	}
-
-	/**
-	 * Repositions this stream to the position at the time the mark() method was
-	 * last called on this input stream. If mark() has not been called this
-	 * method repositions the stream to its beginning.
-	 */
-    @Override
-	public void reset() {
-	   delegate.reset();
-	}
-
-    @Override
-	public long skip(long n) throws IOException {
-	   return delegate.skip(n);
-	}
-
-    @Override
-	public byte readByte() {
-	   return delegate.readByte();
-	}
-
-    @Override
-	public double readDouble() {
-	   return delegate.readDouble();
-	}
-
-    @Override
-	public short readShort() {
-		return (short) readUShort();
-	}
-
-    @Override
-    public void readFully(byte[] buf) {
-        readFully(buf, 0, buf.length);
-    }
-
-    @Override
-	public void readFully(byte[] buf, int off, int len) {
-	   delegate.readFully(buf, off, len);
-	}
-
-    @Override
-	public long readLong() {
-	   return delegate.readLong();
-	}
-
-    @Override
-	public int readInt() {
-	   return delegate.readInt();
-	}
-
-    @Override
-	public int readUShort() {
-	   return delegate.readUShort();
-	}
-
-    @Override
-	public int readUByte() {
-	   return delegate.readUByte();
-	}
-	
-    public long readUInt() {
-        int i = readInt();
-        return i & 0xFFFFFFFFL;
-    }
-
-    @Override
-    public void readPlain(byte[] buf, int off, int len) {
-        readFully(buf, off, len);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentNode.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentNode.java
deleted file mode 100644
index 7a5bf69..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentNode.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.poifs.property.DocumentProperty;
-
-/**
- * Simple implementation of DocumentEntry for OPOIFS
- */
-public class DocumentNode
-    extends EntryNode
-    implements DocumentEntry, POIFSViewable
-{
-
-    // underlying POIFSDocument instance
-    private OPOIFSDocument _document;
-
-    /**
-     * create a DocumentNode. This method is not public by design; it
-     * is intended strictly for the internal use of this package
-     *
-     * @param property the DocumentProperty for this DocumentEntry
-     * @param parent the parent of this entry
-     */
-
-    DocumentNode(final DocumentProperty property, final DirectoryNode parent)
-    {
-        super(property, parent);
-        _document = property.getDocument();
-    }
-
-    /**
-     * get the POIFSDocument
-     *
-     * @return the internal POIFSDocument
-     */
-    OPOIFSDocument getDocument()
-    {
-        return _document;
-    }
-
-    /* ********** START implementation of DocumentEntry ********** */
-
-    /**
-     * get the zize of the document, in bytes
-     *
-     * @return size in bytes
-     */
-
-    public int getSize()
-    {
-        return getProperty().getSize();
-    }
-
-    /* **********  END  implementation of DocumentEntry ********** */
-    /* ********** START implementation of Entry ********** */
-
-    /**
-     * is this a DocumentEntry?
-     *
-     * @return true if the Entry is a DocumentEntry, else false
-     */
-
-    @Override
-    public boolean isDocumentEntry()
-    {
-        return true;
-    }
-
-    /* **********  END  implementation of Entry ********** */
-    /* ********** START extension of Entry ********** */
-
-    /**
-     * extensions use this method to verify internal rules regarding
-     * deletion of the underlying store.
-     *
-     * @return true if it's ok to delete the underlying store, else
-     *         false
-     */
-
-    @Override
-    protected boolean isDeleteOK()
-    {
-        return true;
-    }
-
-    /* **********  END  extension of Entry ********** */
-    /* ********** START begin implementation of POIFSViewable ********** */
-
-    /**
-     * Get an array of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an array of Object; may not be null, but may be empty
-     */
-
-    public Object [] getViewableArray()
-    {
-        return new Object[ 0 ];
-    }
-
-    /**
-     * Get an Iterator of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an Iterator; may not be null, but may have an empty
-     * back end store
-     */
-
-    public Iterator<Object> getViewableIterator()
-    {
-        List<Object> components = new ArrayList<Object>();
-
-        components.add(getProperty());
-        components.add(_document);
-        return components.iterator();
-    }
-
-    /**
-     * Give viewers a hint as to whether to call getViewableArray or
-     * getViewableIterator
-     *
-     * @return true if a viewer should call getViewableArray, false if
-     *         a viewer should call getViewableIterator
-     */
-
-    public boolean preferArray()
-    {
-        return false;
-    }
-
-    /**
-     * Provides a short description of the object, to be used when a
-     * POIFSViewable object has not provided its contents.
-     *
-     * @return short description
-     */
-
-    public String getShortDescription()
-    {
-        return getName();
-    }
-
-    /* **********  END  begin implementation of POIFSViewable ********** */
-}   // end public class DocumentNode
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java b/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
deleted file mode 100644
index fd1ffa9..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.*;
-
-import java.util.*;
-
-/**
- * This class provides a wrapper over an OutputStream so that Document
- * writers can't accidently go over their size limits
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public final class DocumentOutputStream extends OutputStream {
-    private final OutputStream _stream;
-    private final int          _limit;
-    private int          _written;
-
-    /**
-     * Create a DocumentOutputStream
-     *
-     * @param stream the OutputStream to which the data is actually
-     *               read
-     * @param limit the maximum number of bytes that can be written
-     */
-    DocumentOutputStream(OutputStream stream, int limit) {
-        _stream  = stream;
-        _limit   = limit;
-        _written = 0;
-    }
-
-    /**
-     * Writes the specified byte to this output stream. The general
-     * contract for write is that one byte is written to the output
-     * stream. The byte to be written is the eight low-order bits of
-     * the argument b. The 24 high-order bits of b are ignored.
-     *
-     * @param b the byte.
-     * @exception IOException if an I/O error occurs. In particular,
-     *                        an IOException may be thrown if the
-     *                        output stream has been closed, or if the
-     *                        writer tries to write too much data.
-     */
-    public void write(int b)
-        throws IOException
-    {
-        limitCheck(1);
-        _stream.write(b);
-    }
-
-    /**
-     * Writes b.length bytes from the specified byte array
-     * to this output stream.
-     *
-     * @param b the data.
-     * @exception IOException if an I/O error occurs.
-     */
-    public void write(byte b[])
-        throws IOException
-    {
-        write(b, 0, b.length);
-    }
-
-    /**
-     * Writes len bytes from the specified byte array starting at
-     * offset off to this output stream.  The general contract for
-     * write(b, off, len) is that some of the bytes in the array b are
-     * written to the output stream in order; element b[off] is the
-     * first byte written and b[off+len-1] is the last byte written by
-     * this operation.<p>
-     * If b is null, a NullPointerException is thrown.<p>
-     * If off is negative, or len is negative, or off+len is greater
-     * than the length of the array b, then an
-     * IndexOutOfBoundsException is thrown.
-     *
-     * @param b the data.
-     * @param off the start offset in the data.
-     * @param len the number of bytes to write.
-     * @exception IOException if an I/O error occurs. In particular,
-     *                        an IOException</code> is thrown if the
-     *                        output stream is closed or if the writer
-     *                        tries to write too many bytes.
-     */
-    public void write(byte b[], int off, int len)
-        throws IOException
-    {
-        limitCheck(len);
-        _stream.write(b, off, len);
-    }
-
-    /**
-     * Flushes this output stream and forces any buffered output bytes
-     * to be written out.
-     *
-     * @exception IOException if an I/O error occurs.
-     */
-    public void flush()
-        throws IOException
-    {
-        _stream.flush();
-    }
-
-    /**
-     * Closes this output stream and releases any system resources
-     * associated with this stream. The general contract of close is
-     * that it closes the output stream. A closed stream cannot
-     * perform output operations and cannot be reopened.
-     *
-     * @exception IOException if an I/O error occurs.
-     */
-    public void close() {
-
-        // ignore this call
-    }
-
-    /**
-     * write the rest of the document's data (fill in at the end)
-     *
-     * @param totalLimit the actual number of bytes the corresponding
-     *                   document must fill
-     * @param fill the byte to fill remaining space with
-     *
-     * @exception IOException on I/O error
-     */
-    void writeFiller(int totalLimit, byte fill)
-        throws IOException
-    {
-        if (totalLimit > _written)
-        {
-            byte[] filler = new byte[ totalLimit - _written ];
-
-            Arrays.fill(filler, fill);
-            _stream.write(filler);
-        }
-    }
-
-    private void limitCheck(int toBeWritten)
-        throws IOException
-    {
-        if ((_written + toBeWritten) > _limit)
-        {
-            throw new IOException("tried to write too much data");
-        }
-        _written += toBeWritten;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/Entry.java b/trunk/src/java/org/apache/poi/poifs/filesystem/Entry.java
deleted file mode 100644
index 2a8ea16..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/Entry.java
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-/**
- * This interface provides access to an object managed by a Filesystem
- * instance. Entry objects are further divided into DocumentEntry and
- * DirectoryEntry instances.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public interface Entry
-{
-
-    /**
-     * get the name of the Entry
-     *
-     * @return name
-     */
-
-    public String getName();
-
-    /**
-     * is this a DirectoryEntry?
-     *
-     * @return true if the Entry is a DirectoryEntry, else false
-     */
-
-    public boolean isDirectoryEntry();
-
-    /**
-     * is this a DocumentEntry?
-     *
-     * @return true if the Entry is a DocumentEntry, else false
-     */
-
-    public boolean isDocumentEntry();
-
-    /**
-     * get this Entry's parent (the DirectoryEntry that owns this
-     * Entry). All Entry objects, except the root Entry, has a parent.
-     *
-     * @return this Entry's parent; null iff this is the root Entry
-     */
-
-    public DirectoryEntry getParent();
-
-    /**
-     * Delete this Entry. This operation should succeed, but there are
-     * special circumstances when it will not:
-     *
-     * If this Entry is the root of the Entry tree, it cannot be
-     * deleted, as there is no way to create another one.
-     *
-     * If this Entry is a directory, it cannot be deleted unless it is
-     * empty.
-     *
-     * @return true if the Entry was successfully deleted, else false
-     */
-
-    public boolean delete();
-
-    /**
-     * Rename this Entry. This operation will fail if:
-     *
-     * There is a sibling Entry (i.e., an Entry whose parent is the
-     * same as this Entry's parent) with the same name.
-     *
-     * This Entry is the root of the Entry tree. Its name is dictated
-     * by the Filesystem and many not be changed.
-     *
-     * @param newName the new name for this Entry
-     *
-     * @return true if the operation succeeded, else false
-     */
-
-    public boolean renameTo(final String newName);
-}   // end public interface Entry
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/EntryNode.java b/trunk/src/java/org/apache/poi/poifs/filesystem/EntryNode.java
deleted file mode 100644
index a48d8e4..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/EntryNode.java
+++ /dev/null
@@ -1,191 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-import org.apache.poi.poifs.property.Property;
-
-/**
- * Abstract implementation of Entry
- *
- * Extending classes should override isDocument() or isDirectory(), as
- * appropriate
- *
- * Extending classes must override isDeleteOK()
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public abstract class EntryNode
-    implements Entry
-{
-
-    // the DocumentProperty backing this object
-    private Property      _property;
-
-    // this object's parent Entry
-    private DirectoryNode _parent;
-
-    /**
-     * create a DocumentNode. This method is not public by design; it
-     * is intended strictly for the internal use of extending classes
-     *
-     * @param property the Property for this Entry
-     * @param parent the parent of this entry
-     */
-
-    protected EntryNode(final Property property, final DirectoryNode parent)
-    {
-        _property = property;
-        _parent   = parent;
-    }
-
-    /**
-     * grant access to the property
-     *
-     * @return the property backing this entry
-     */
-
-    protected Property getProperty()
-    {
-        return _property;
-    }
-
-    /**
-     * is this the root of the tree?
-     *
-     * @return true if so, else false
-     */
-
-    protected boolean isRoot()
-    {
-
-        // only the root Entry has no parent ...
-        return (_parent == null);
-    }
-
-    /**
-     * extensions use this method to verify internal rules regarding
-     * deletion of the underlying store.
-     *
-     * @return true if it's ok to delete the underlying store, else
-     *         false
-     */
-
-    protected abstract boolean isDeleteOK();
-
-    /* ********** START implementation of Entry ********** */
-
-    /**
-     * get the name of the Entry
-     *
-     * @return name
-     */
-
-    public String getName()
-    {
-        return _property.getName();
-    }
-
-    /**
-     * is this a DirectoryEntry?
-     *
-     * @return true if the Entry is a DirectoryEntry, else false
-     */
-
-    public boolean isDirectoryEntry()
-    {
-        return false;
-    }
-
-    /**
-     * is this a DocumentEntry?
-     *
-     * @return true if the Entry is a DocumentEntry, else false
-     */
-
-    public boolean isDocumentEntry()
-    {
-        return false;
-    }
-
-    /**
-     * get this Entry's parent (the DocumentEntry that owns this
-     * Entry). All Entry objects, except the root Entry, has a parent.
-     *
-     * @return this Entry's parent; null iff this is the root Entry
-     */
-
-    public DirectoryEntry getParent()
-    {
-        return _parent;
-    }
-
-    /**
-     * Delete this Entry. This operation should succeed, but there are
-     * special circumstances when it will not:
-     *
-     * If this Entry is the root of the Entry tree, it cannot be
-     * deleted, as there is no way to create another one.
-     *
-     * If this Entry is a directory, it cannot be deleted unless it is
-     * empty.
-     *
-     * @return true if the Entry was successfully deleted, else false
-     */
-
-    public boolean delete()
-    {
-        boolean rval = false;
-
-        if ((!isRoot()) && isDeleteOK())
-        {
-            rval = _parent.deleteEntry(this);
-        }
-        return rval;
-    }
-
-    /**
-     * Rename this Entry. This operation will fail if:
-     *
-     * There is a sibling Entry (i.e., an Entry whose parent is the
-     * same as this Entry's parent) with the same name.
-     *
-     * This Entry is the root of the Entry tree. Its name is dictated
-     * by the Filesystem and many not be changed.
-     *
-     * @param newName the new name for this Entry
-     *
-     * @return true if the operation succeeded, else false
-     */
-
-    public boolean renameTo(final String newName)
-    {
-        boolean rval = false;
-
-        if (!isRoot())
-        {
-            rval = _parent.changeName(getName(), newName);
-        }
-        return rval;
-    }
-
-    /* **********  END  implementation of Entry ********** */
-}   // end public class EntryNode
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java b/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
deleted file mode 100644
index 18140d9..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.filesystem;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public class EntryUtils
-{
-
-    /**
-     * Copies an Entry into a target POIFS directory, recursively
-     */
-    @Internal
-    public static void copyNodeRecursively( Entry entry, DirectoryEntry target )
-            throws IOException
-    {
-        // logger.log( POILogger.ERROR, "copyNodeRecursively called with "+entry.getName()+
-        // ","+target.getName());
-        DirectoryEntry newTarget = null;
-        if ( entry.isDirectoryEntry() )
-        {
-        	DirectoryEntry dirEntry = (DirectoryEntry)entry;
-            newTarget = target.createDirectory( entry.getName() );
-            newTarget.setStorageClsid( dirEntry.getStorageClsid() );
-            Iterator<Entry> entries = dirEntry.getEntries();
-
-            while ( entries.hasNext() )
-            {
-                copyNodeRecursively( entries.next(), newTarget );
-            }
-        }
-        else
-        {
-            DocumentEntry dentry = (DocumentEntry) entry;
-            DocumentInputStream dstream = new DocumentInputStream( dentry );
-            target.createDocument( dentry.getName(), dstream );
-            dstream.close();
-        }
-    }
-
-    /**
-     * Copies all the nodes from one POIFS Directory to another
-     * 
-     * @param sourceRoot
-     *            is the source Directory to copy from
-     * @param targetRoot
-     *            is the target Directory to copy to
-     */
-    public static void copyNodes(DirectoryEntry sourceRoot,
-            DirectoryEntry targetRoot) throws IOException
-    {
-        for (Entry entry : sourceRoot) {
-            copyNodeRecursively( entry, targetRoot );
-        }
-    }
-
-    /**
-     * Copies nodes from one Directory to the other minus the excepts
-     * 
-     * @param filteredSource The filtering source Directory to copy from
-     * @param filteredTarget The filtering target Directory to copy to
-     */
-    public static void copyNodes( FilteringDirectoryNode filteredSource,
-            FilteringDirectoryNode filteredTarget ) throws IOException
-    {
-        // Nothing special here, just overloaded types to make the
-        //  recommended new way to handle this clearer
-        copyNodes( (DirectoryEntry)filteredSource, (DirectoryEntry)filteredTarget );
-    }
-
-    /**
-     * Copies all nodes from one POIFS to the other
-     * 
-     * @param source
-     *            is the source POIFS to copy from
-     * @param target
-     *            is the target POIFS to copy to
-     */
-    public static void copyNodes( OPOIFSFileSystem source,
-            OPOIFSFileSystem target ) throws IOException
-    {
-        copyNodes( source.getRoot(), target.getRoot() );
-    }
-    /**
-     * Copies all nodes from one POIFS to the other
-     * 
-     * @param source
-     *            is the source POIFS to copy from
-     * @param target
-     *            is the target POIFS to copy to
-     */
-    public static void copyNodes( NPOIFSFileSystem source,
-            NPOIFSFileSystem target ) throws IOException
-    {
-        copyNodes( source.getRoot(), target.getRoot() );
-    }
-    
-    /**
-     * Copies nodes from one POIFS to the other, minus the excepts.
-     * This delegates the filtering work to {@link FilteringDirectoryNode},
-     *  so excepts can be of the form "NodeToExclude" or
-     *  "FilteringDirectory/ExcludedChildNode"
-     * 
-     * @param source is the source POIFS to copy from
-     * @param target is the target POIFS to copy to
-     * @param excepts is a list of Entry Names to be excluded from the copy
-     */
-    public static void copyNodes( OPOIFSFileSystem source,
-            OPOIFSFileSystem target, List<String> excepts ) throws IOException
-    {
-        copyNodes(
-              new FilteringDirectoryNode(source.getRoot(), excepts),
-              new FilteringDirectoryNode(target.getRoot(), excepts)
-        );
-    }
-    /**
-     * Copies nodes from one POIFS to the other, minus the excepts.
-     * This delegates the filtering work to {@link FilteringDirectoryNode},
-     *  so excepts can be of the form "NodeToExclude" or
-     *  "FilteringDirectory/ExcludedChildNode"
-     * 
-     * @param source is the source POIFS to copy from
-     * @param target is the target POIFS to copy to
-     * @param excepts is a list of Entry Names to be excluded from the copy
-     */
-    public static void copyNodes( NPOIFSFileSystem source,
-            NPOIFSFileSystem target, List<String> excepts ) throws IOException
-    {
-        copyNodes(
-              new FilteringDirectoryNode(source.getRoot(), excepts),
-              new FilteringDirectoryNode(target.getRoot(), excepts)
-        );
-    }
-    
-    /**
-     * Checks to see if the two Directories hold the same contents.
-     * For this to be true, they must have entries with the same names,
-     *  no entries in one but not the other, and the size+contents
-     *  of each entry must match, and they must share names.
-     * To exclude certain parts of the Directory from being checked,
-     *  use a {@link FilteringDirectoryNode}
-     */
-    public static boolean areDirectoriesIdentical(DirectoryEntry dirA, DirectoryEntry dirB) {
-       // First, check names
-       if (! dirA.getName().equals(dirB.getName())) {
-          return false;
-       }
-       
-       // Next up, check they have the same number of children
-       if (dirA.getEntryCount() != dirB.getEntryCount()) {
-          return false;
-       }
-       
-       // Next, check entries and their types/sizes
-       Map<String,Integer> aSizes = new HashMap<String, Integer>();
-       final int isDirectory = -12345; 
-       for (Entry a : dirA) {
-          String aName = a.getName();
-          if (a.isDirectoryEntry()) {
-             aSizes.put(aName, isDirectory);
-          } else {
-             aSizes.put(aName, ((DocumentNode)a).getSize());
-          }
-       }
-       for (Entry b : dirB) {
-          String bName = b.getName();
-          if (! aSizes.containsKey(bName)) {
-             // In B but not A
-             return false;
-          }
-          
-          int size;
-          if (b.isDirectoryEntry()) {
-             size = isDirectory;
-          } else {
-             size = ((DocumentNode)b).getSize();
-          }
-          if (size != aSizes.get(bName)) {
-             // Either the wrong type, or they're different sizes
-             return false;
-          }
-          
-          // Track it as checked
-          aSizes.remove(bName);
-       }
-       if (!aSizes.isEmpty()) {
-          // Nodes were in A but not B
-          return false;
-       }
-       
-       // If that passed, check entry contents
-       for (Entry a : dirA) {
-          try {
-             Entry b = dirB.getEntry(a.getName());
-             boolean match;
-             if (a.isDirectoryEntry()) {
-                match = areDirectoriesIdentical(
-                      (DirectoryEntry)a, (DirectoryEntry)b);
-             } else {
-                match = areDocumentsIdentical(
-                      (DocumentEntry)a, (DocumentEntry)b);
-             }
-             if (!match) return false;
-          } catch(FileNotFoundException e) {
-             // Shouldn't really happen...
-             return false;
-          } catch(IOException e) {
-             // Something's messed up with one document, not a match
-             return false;
-          }
-       }
-       
-       // If we get here, they match!
-       return true;
-    }
-    
-    /**
-     * Checks to see if two Documents have the same name
-     *  and the same contents. (Their parent directories are
-     *  not checked)
-     */
-    public static boolean areDocumentsIdentical(DocumentEntry docA, DocumentEntry docB) throws IOException {
-       if (! docA.getName().equals(docB.getName())) {
-          // Names don't match, not the same
-          return false;
-       }
-       if (docA.getSize() != docB.getSize()) {
-          // Wrong sizes, can't have the same contents
-          return false;
-       }
-
-       boolean matches = true;
-       DocumentInputStream inpA = null, inpB = null;
-       try {
-          inpA = new DocumentInputStream(docA);
-          inpB = new DocumentInputStream(docB);
-          
-          int readA, readB;
-          do {
-             readA = inpA.read();
-             readB = inpB.read();
-             if (readA != readB) {
-                matches = false;
-                break;
-             }
-          } while(readA != -1 && readB != -1);
-       } finally {
-          if (inpA != null) inpA.close();
-          if (inpB != null) inpB.close();
-       }
-       
-       return matches;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java b/trunk/src/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
deleted file mode 100644
index 3296ddb..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
+++ /dev/null
@@ -1,221 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.hpsf.ClassID;
-
-/**
- * A DirectoryEntry filter, which exposes another
- *  DirectoryEntry less certain parts.
- * This is typically used when copying or comparing
- *  Filesystems. 
- */
-public class FilteringDirectoryNode implements DirectoryEntry
-{
-   /**
-    * The names of our entries to exclude
-    */
-   private Set<String> excludes;
-   /**
-    * Excludes of our child directories
-    */
-   private Map<String,List<String>> childExcludes;
-   
-   private DirectoryEntry directory;
-   
-   /**
-    * Creates a filter round the specified directory, which
-    *  will exclude entries such as "MyNode" and "MyDir/IgnoreNode".
-    * The excludes can stretch into children, if they contain a /.
-    *  
-    * @param directory The Directory to filter
-    * @param excludes The Entries to exclude
-    */
-   public FilteringDirectoryNode(DirectoryEntry directory, Collection<String> excludes) {
-      this.directory = directory;
-      
-      // Process the excludes
-      this.excludes = new HashSet<String>();
-      this.childExcludes = new HashMap<String, List<String>>();
-      for (String excl : excludes) {
-         int splitAt = excl.indexOf('/');
-         if (splitAt == -1) {
-            // Applies to us
-            this.excludes.add(excl);
-         } else {
-            // Applies to a child
-            String child = excl.substring(0, splitAt);
-            String childExcl = excl.substring(splitAt+1);
-            if (! this.childExcludes.containsKey(child)) {
-               this.childExcludes.put(child, new ArrayList<String>());
-            }
-            this.childExcludes.get(child).add(childExcl);
-         }
-      }
-   }
-
-   public DirectoryEntry createDirectory(String name) throws IOException {
-      return directory.createDirectory(name);
-   }
-
-   public DocumentEntry createDocument(String name, InputStream stream)
-         throws IOException {
-      return directory.createDocument(name, stream);
-   }
-
-   public DocumentEntry createDocument(String name, int size,
-         POIFSWriterListener writer) throws IOException {
-      return directory.createDocument(name, size, writer);
-   }
-
-   public Iterator<Entry> getEntries() {
-      return new FilteringIterator();
-   }
-
-   public Iterator<Entry> iterator() {
-      return getEntries();
-   }
-   
-   public int getEntryCount() {
-      int size = directory.getEntryCount();
-      for (String excl : excludes) {
-         if (directory.hasEntry(excl)) {
-            size--;
-         }
-      }
-      return size;
-   }
-   
-   public Set<String> getEntryNames() {
-       Set<String> names = new HashSet<String>();
-       for (String name : directory.getEntryNames()) {
-           if (!excludes.contains(name)) {
-               names.add(name);
-           }
-       }
-       return names;
-   }
-
-   public boolean isEmpty() {
-      return (getEntryCount() == 0);
-   }
-
-   public boolean hasEntry(String name) {
-      if (excludes.contains(name)) {
-         return false;
-      }
-      return directory.hasEntry(name);
-   }
-
-   public Entry getEntry(String name) throws FileNotFoundException {
-      if (excludes.contains(name)) {
-         throw new FileNotFoundException(name);
-      }
-      
-      Entry entry = directory.getEntry(name);
-      return wrapEntry(entry);
-   }
-   private Entry wrapEntry(Entry entry) {
-      String name = entry.getName();
-      if (childExcludes.containsKey(name) && entry instanceof DirectoryEntry) {
-         return new FilteringDirectoryNode(
-               (DirectoryEntry)entry, childExcludes.get(name)); 
-      }
-      return entry;
-   }
-
-   public ClassID getStorageClsid() {
-      return directory.getStorageClsid();
-   }
-
-   public void setStorageClsid(ClassID clsidStorage) {
-      directory.setStorageClsid(clsidStorage);
-   }
-
-   public boolean delete() {
-      return directory.delete();
-   }
-
-   public boolean renameTo(String newName) {
-      return directory.renameTo(newName);
-   }
-   
-   public String getName() {
-      return directory.getName();
-   }
-
-   public DirectoryEntry getParent() {
-      return directory.getParent();
-   }
-
-   public boolean isDirectoryEntry() {
-      return true;
-   }
-
-   public boolean isDocumentEntry() {
-      return false;
-   }
-   
-   private class FilteringIterator implements Iterator<Entry> {
-      private Iterator<Entry> parent;
-      private Entry next;
-      
-      private FilteringIterator() {
-         parent = directory.getEntries();
-         locateNext();
-      }
-      private void locateNext() {
-         next = null;
-         Entry e;
-         while (parent.hasNext() && next == null) {
-            e = parent.next();
-            if (! excludes.contains(e.getName())) {
-               next = wrapEntry(e);
-            }
-         }
-      }
-      
-      public boolean hasNext() {
-         return (next != null);
-      }
-      
-      public Entry next() {
-         Entry e = next;
-         locateNext();
-         return e;
-      }
-      
-      public void remove() {
-         throw new UnsupportedOperationException("Remove not supported");
-      }
-   }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/NDocumentInputStream.java b/trunk/src/java/org/apache/poi/poifs/filesystem/NDocumentInputStream.java
deleted file mode 100644
index 0d09c47..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/NDocumentInputStream.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import org.apache.poi.poifs.property.DocumentProperty;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class provides methods to read a DocumentEntry managed by a
- * {@link NPOIFSFileSystem} instance.
- */
-public final class NDocumentInputStream extends DocumentInputStream {
-    /** current offset into the Document */
-    private int _current_offset;
-    /** current block count */
-    private int _current_block_count;
-
-    /** current marked offset into the Document (used by mark and reset) */
-    private int _marked_offset;
-    /** and the block count for it */
-    private int _marked_offset_count;
-
-    /** the Document's size */
-    private int _document_size;
-
-    /** have we been closed? */
-    private boolean _closed;
-
-    /** the actual Document */
-    private NPOIFSDocument _document;
-
-    private Iterator<ByteBuffer> _data;
-    private ByteBuffer _buffer;
-
-    /**
-     * Create an InputStream from the specified DocumentEntry
-     * 
-     * @param document the DocumentEntry to be read
-     * 
-     * @exception IOException if the DocumentEntry cannot be opened (like, maybe it has
-     *                been deleted?)
-     */
-    public NDocumentInputStream(DocumentEntry document) throws IOException {
-        if (!(document instanceof DocumentNode)) {
-            throw new IOException("Cannot open internal document storage, " + document + " not a Document Node");
-        }
-        _current_offset = 0;
-        _current_block_count = 0;
-        _marked_offset = 0;
-        _marked_offset_count = 0;
-        _document_size = document.getSize();
-        _closed = false;
-
-        DocumentNode doc = (DocumentNode)document;
-        DocumentProperty property = (DocumentProperty)doc.getProperty();
-        _document = new NPOIFSDocument(
-                property, 
-                ((DirectoryNode)doc.getParent()).getNFileSystem()
-        );
-        _data = _document.getBlockIterator();
-    }
-
-    /**
-     * Create an InputStream from the specified Document
-     * 
-     * @param document the Document to be read
-     */
-    public NDocumentInputStream(NPOIFSDocument document) {
-        _current_offset = 0;
-        _current_block_count = 0;
-        _marked_offset = 0;
-        _marked_offset_count = 0;
-        _document_size = document.getSize();
-        _closed = false;
-        _document = document;
-        _data = _document.getBlockIterator();
-    }
-
-    @Override
-    public int available() {
-        if (_closed) {
-            throw new IllegalStateException("cannot perform requested operation on a closed stream");
-        }
-        return _document_size - _current_offset;
-    }
-
-    @Override
-    public void close() {
-        _closed = true;
-    }
-
-    @Override
-    public void mark(int ignoredReadlimit) {
-        _marked_offset = _current_offset;
-        _marked_offset_count = Math.max(0, _current_block_count - 1);
-    }
-
-    @Override
-    public int read() throws IOException {
-        dieIfClosed();
-        if (atEOD()) {
-            return EOF;
-        }
-        byte[] b = new byte[1];
-        int result = read(b, 0, 1);
-        if(result >= 0) {
-            if(b[0] < 0) {
-                return b[0]+256;
-            }
-            return b[0];
-        }
-        return result;
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        dieIfClosed();
-        if (b == null) {
-            throw new IllegalArgumentException("buffer must not be null");
-        }
-        if (off < 0 || len < 0 || b.length < off + len) {
-            throw new IndexOutOfBoundsException("can't read past buffer boundaries");
-        }
-        if (len == 0) {
-            return 0;
-        }
-        if (atEOD()) {
-            return EOF;
-        }
-        int limit = Math.min(available(), len);
-        readFully(b, off, limit);
-        return limit;
-    }
-
-    /**
-     * Repositions this stream to the position at the time the mark() method was
-     * last called on this input stream. If mark() has not been called this
-     * method repositions the stream to its beginning.
-     */
-    @Override
-    public void reset() {
-        // Special case for reset to the start
-        if(_marked_offset == 0 && _marked_offset_count == 0) {
-            _current_block_count = _marked_offset_count;
-            _current_offset = _marked_offset;
-            _data = _document.getBlockIterator();
-            _buffer = null;
-            return;
-        }
-
-        // Start again, then wind on to the required block
-        _data = _document.getBlockIterator();
-        _current_offset = 0;
-		for(int i=0; i<_marked_offset_count; i++) {
-		   _buffer = _data.next();
-		   _current_offset += _buffer.remaining();
-		}
-		
-      _current_block_count = _marked_offset_count;
-      
-      // Do we need to position within it?
-      if(_current_offset != _marked_offset) {
-   		// Grab the right block
-         _buffer = _data.next();
-         _current_block_count++;
-         
-   		// Skip to the right place in it
-         // (It should be positioned already at the start of the block,
-         //  we need to move further inside the block)
-         int skipBy = _marked_offset - _current_offset;
-   		_buffer.position(_buffer.position() + skipBy);
-      }
-
-      // All done
-      _current_offset = _marked_offset;
-	}
-
-   @Override
-	public long skip(long n) throws IOException {
-		dieIfClosed();
-		if (n < 0) {
-			return 0;
-		}
-		int new_offset = _current_offset + (int) n;
-
-		if (new_offset < _current_offset) {
-			// wrap around in converting a VERY large long to an int
-			new_offset = _document_size;
-		} else if (new_offset > _document_size) {
-			new_offset = _document_size;
-		}
-		
-		long rval = new_offset - _current_offset;
-		
-		// TODO Do this better
-		byte[] skip = new byte[(int)rval];
-		readFully(skip);
-		return rval;
-	}
-
-	private void dieIfClosed() throws IOException {
-		if (_closed) {
-			throw new IOException("cannot perform requested operation on a closed stream");
-		}
-	}
-
-	private boolean atEOD() {
-		return _current_offset == _document_size;
-	}
-
-	private void checkAvaliable(int requestedSize) {
-		if (_closed) {
-			throw new IllegalStateException("cannot perform requested operation on a closed stream");
-		}
-		if (requestedSize > _document_size - _current_offset) {
-			throw new RuntimeException("Buffer underrun - requested " + requestedSize
-					+ " bytes but " + (_document_size - _current_offset) + " was available");
-		}
-	}
-
-   @Override
-	public void readFully(byte[] buf, int off, int len) {
-		checkAvaliable(len);
-
-		int read = 0;
-		while(read < len) {
-		   if(_buffer == null || _buffer.remaining() == 0) {
-		      _current_block_count++;
-		      _buffer = _data.next();
-		   }
-		   
-		   int limit = Math.min(len-read, _buffer.remaining());
-		   _buffer.get(buf, off+read, limit);
-         _current_offset += limit;
-		   read += limit;
-		}
-	}
-
-   @Override
-   public byte readByte() {
-      return (byte) readUByte();
-   }
-
-   @Override
-   public double readDouble() {
-      return Double.longBitsToDouble(readLong());
-   }
-
-   @Override
-	public long readLong() {
-		checkAvaliable(SIZE_LONG);
-		byte[] data = new byte[SIZE_LONG];
-		readFully(data, 0, SIZE_LONG);
-		return LittleEndian.getLong(data, 0);
-	}
-
-   @Override
-   public short readShort() {
-      checkAvaliable(SIZE_SHORT);
-      byte[] data = new byte[SIZE_SHORT];
-      readFully(data, 0, SIZE_SHORT);
-      return LittleEndian.getShort(data);
-   }
-
-   @Override
-	public int readInt() {
-		checkAvaliable(SIZE_INT);
-      byte[] data = new byte[SIZE_INT];
-      readFully(data, 0, SIZE_INT);
-      return LittleEndian.getInt(data);
-	}
-
-   @Override
-	public int readUShort() {
-		checkAvaliable(SIZE_SHORT);
-      byte[] data = new byte[SIZE_SHORT];
-      readFully(data, 0, SIZE_SHORT);
-      return LittleEndian.getUShort(data);
-	}
-
-   @Override
-	public int readUByte() {
-		checkAvaliable(1);
-      byte[] data = new byte[1];
-      readFully(data, 0, 1);
-      if(data[0] >= 0)
-         return data[0];
-      return data[0] + 256;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/NDocumentOutputStream.java b/trunk/src/java/org/apache/poi/poifs/filesystem/NDocumentOutputStream.java
deleted file mode 100644
index 6d4d13d..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/NDocumentOutputStream.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.property.DocumentProperty;
-
-/**
- * This class provides methods to write a DocumentEntry managed by a
- * {@link NPOIFSFileSystem} instance.
- */
-public final class NDocumentOutputStream extends OutputStream {
-	/** the Document's size */
-	private int _document_size;
-
-	/** have we been closed? */
-	private boolean _closed;
-
-	/** the actual Document */
-	private NPOIFSDocument _document;
-	/** and its Property */
-	private DocumentProperty _property;
-	
-	/** our buffer, when null we're into normal blocks */
-	private ByteArrayOutputStream _buffer = 
-	        new ByteArrayOutputStream(POIFSConstants.BIG_BLOCK_MINIMUM_DOCUMENT_SIZE);
-	
-	/** our main block stream, when we're into normal blocks */
-	private NPOIFSStream _stream;
-	private OutputStream _stream_output;
-	
-	/**
-	 * Create an OutputStream from the specified DocumentEntry.
-	 * The specified entry will be emptied.
-	 * 
-	 * @param document the DocumentEntry to be written
-	 */
-	public NDocumentOutputStream(DocumentEntry document) throws IOException {
-		if (!(document instanceof DocumentNode)) {
-			throw new IOException("Cannot open internal document storage, " + document + " not a Document Node");
-		}
-		_document_size = 0;
-		_closed = false;
-		
-		_property = (DocumentProperty)((DocumentNode)document).getProperty();
-		
-		_document = new NPOIFSDocument((DocumentNode)document);
-		_document.free();
-	}
-	
-	/**
-	 * Create an OutputStream to create the specified new Entry
-	 * 
-	 * @param parent Where to create the Entry
-	 * @param name Name of the new entry
-	 */
-	public NDocumentOutputStream(DirectoryEntry parent, String name) throws IOException {
-        if (!(parent instanceof DirectoryNode)) {
-            throw new IOException("Cannot open internal directory storage, " + parent + " not a Directory Node");
-        }
-        _document_size = 0;
-        _closed = false;
-
-        // Have an empty one created for now
-        DocumentEntry doc = parent.createDocument(name, new ByteArrayInputStream(new byte[0]));
-        _property = (DocumentProperty)((DocumentNode)doc).getProperty();
-        _document = new NPOIFSDocument((DocumentNode)doc);
-	}
-	
-    private void dieIfClosed() throws IOException {
-        if (_closed) {
-            throw new IOException("cannot perform requested operation on a closed stream");
-        }
-    }
-    
-    private void checkBufferSize() throws IOException {
-        // Have we gone over the mini stream limit yet?
-        if (_buffer.size() > POIFSConstants.BIG_BLOCK_MINIMUM_DOCUMENT_SIZE) {
-            // Will need to be in the main stream
-            byte[] data = _buffer.toByteArray();
-            _buffer = null;
-            write(data, 0, data.length);
-        } else {
-            // So far, mini stream will work, keep going
-        }
-    }
-
-    public void write(int b) throws IOException {
-        dieIfClosed();
-        
-        if (_buffer != null) {
-            _buffer.write(b);
-            checkBufferSize();
-        } else {
-            write(new byte[] { (byte)b });
-        }
-    }
-
-    public void write(byte[] b) throws IOException {
-        dieIfClosed();
-        
-        if (_buffer != null) {
-            _buffer.write(b);
-            checkBufferSize();
-        } else {
-            write(b, 0, b.length);
-        }
-    }
-
-    public void write(byte[] b, int off, int len) throws IOException {
-        dieIfClosed();
-        
-        if (_buffer != null) {
-            _buffer.write(b, off, len);
-            checkBufferSize();
-        } else {
-            if (_stream == null) {
-                _stream = new NPOIFSStream(_document.getFileSystem());
-                _stream_output = _stream.getOutputStream();
-            }
-            _stream_output.write(b, off, len);
-            _document_size += len;
-        }
-    }
-
-    public void close() throws IOException {
-        // Do we have a pending buffer for the mini stream?
-        if (_buffer != null) {
-            // It's not much data, so ask NPOIFSDocument to do it for us
-            _document.replaceContents(new ByteArrayInputStream(_buffer.toByteArray()));
-        }
-        else {
-            // We've been writing to the stream as we've gone along
-            // Update the details on the property now
-            _stream_output.close();
-            _property.updateSize(_document_size);
-            _property.setStartBlock(_stream.getStartBlock());
-        }
-        
-        // No more!
-        _closed = true;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSDocument.java b/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSDocument.java
deleted file mode 100644
index 7e7ca07..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSDocument.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.poifs.property.DocumentProperty;
-import org.apache.poi.util.HexDump;
-
-/**
- * This class manages a document in the NIO POIFS filesystem.
- * This is the {@link NPOIFSFileSystem} version.
- */
-public final class NPOIFSDocument implements POIFSViewable {
-   private DocumentProperty _property;
-
-   private NPOIFSFileSystem _filesystem;
-   private NPOIFSStream _stream;
-   private int _block_size;
-	
-   /**
-    * Constructor for an existing Document 
-    */
-   public NPOIFSDocument(DocumentNode document) throws IOException {
-       this((DocumentProperty)document.getProperty(), 
-            ((DirectoryNode)document.getParent()).getNFileSystem());
-   }
-   
-   /**
-    * Constructor for an existing Document 
-    */
-   public NPOIFSDocument(DocumentProperty property, NPOIFSFileSystem filesystem) 
-      throws IOException
-   {
-      this._property = property;
-      this._filesystem = filesystem;
-
-      if(property.getSize() < POIFSConstants.BIG_BLOCK_MINIMUM_DOCUMENT_SIZE) {
-         _stream = new NPOIFSStream(_filesystem.getMiniStore(), property.getStartBlock());
-         _block_size = _filesystem.getMiniStore().getBlockStoreBlockSize();
-      } else {
-         _stream = new NPOIFSStream(_filesystem, property.getStartBlock());
-         _block_size = _filesystem.getBlockStoreBlockSize();
-      }
-   }
-
-   /**
-    * Constructor for a new Document
-    *
-    * @param name the name of the POIFSDocument
-    * @param stream the InputStream we read data from
-    */
-   public NPOIFSDocument(String name, NPOIFSFileSystem filesystem, InputStream stream) 
-      throws IOException 
-   {
-      this._filesystem = filesystem;
-
-      // Store it
-      int length = store(stream);
-
-      // Build the property for it
-      this._property = new DocumentProperty(name, length);
-      _property.setStartBlock(_stream.getStartBlock());     
-   }
-   
-   public NPOIFSDocument(String name, int size, NPOIFSFileSystem filesystem, POIFSWriterListener writer) 
-      throws IOException 
-   {
-       this._filesystem = filesystem;
-
-       if (size < POIFSConstants.BIG_BLOCK_MINIMUM_DOCUMENT_SIZE) {
-           _stream = new NPOIFSStream(filesystem.getMiniStore());
-           _block_size = _filesystem.getMiniStore().getBlockStoreBlockSize();
-       } else {
-           _stream = new NPOIFSStream(filesystem);
-           _block_size = _filesystem.getBlockStoreBlockSize();
-       }
-       
-       OutputStream innerOs = _stream.getOutputStream();
-       DocumentOutputStream os = new DocumentOutputStream(innerOs, size);
-       POIFSDocumentPath path = new POIFSDocumentPath(name.split("\\\\"));
-       String docName = path.getComponent(path.length()-1);
-       POIFSWriterEvent event = new POIFSWriterEvent(os, path, docName, size);
-       writer.processPOIFSWriterEvent(event);
-       innerOs.close();
-
-       // And build the property for it
-       this._property = new DocumentProperty(name, size);
-       _property.setStartBlock(_stream.getStartBlock());     
-   }
-   
-   /**
-    * Stores the given data for this Document
-    */
-   private int store(InputStream stream) throws IOException {
-       final int bigBlockSize = POIFSConstants.BIG_BLOCK_MINIMUM_DOCUMENT_SIZE;
-       BufferedInputStream bis = new BufferedInputStream(stream, bigBlockSize+1);
-       bis.mark(bigBlockSize);
-
-       // Do we need to store as a mini stream or a full one?
-       if(bis.skip(bigBlockSize) < bigBlockSize) {
-          _stream = new NPOIFSStream(_filesystem.getMiniStore());
-          _block_size = _filesystem.getMiniStore().getBlockStoreBlockSize();
-       } else {
-          _stream = new NPOIFSStream(_filesystem);
-          _block_size = _filesystem.getBlockStoreBlockSize();
-       }
-
-       // start from the beginning 
-       bis.reset();
-       
-       // Store it
-       OutputStream os = _stream.getOutputStream();
-       byte buf[] = new byte[1024];
-       int length = 0;
-       
-       for (int readBytes; (readBytes = bis.read(buf)) != -1; length += readBytes) {
-           os.write(buf, 0, readBytes);
-       }
-       
-       // Pad to the end of the block with -1s
-       int usedInBlock = length % _block_size;
-       if (usedInBlock != 0 && usedInBlock != _block_size) {
-           int toBlockEnd = _block_size - usedInBlock;
-           byte[] padding = new byte[toBlockEnd];
-           Arrays.fill(padding, (byte)0xFF);
-           os.write(padding);
-       }
-       
-       // Tidy and return the length
-       os.close();
-       return length;
-   }
-   
-   /**
-    * Frees the underlying stream and property
-    */
-   void free() throws IOException {
-       _stream.free();
-       _property.setStartBlock(POIFSConstants.END_OF_CHAIN);
-   }
-   
-   NPOIFSFileSystem getFileSystem()
-   {
-       return _filesystem;
-   }
-   
-   int getDocumentBlockSize() {
-      return _block_size;
-   }
-   
-   Iterator<ByteBuffer> getBlockIterator() {
-      if(getSize() > 0) {
-         return _stream.getBlockIterator();
-      } else {
-         List<ByteBuffer> empty = Collections.emptyList();
-         return empty.iterator();
-      }
-   }
-
-   /**
-    * @return size of the document
-    */
-   public int getSize() {
-      return _property.getSize();
-   }
-   
-   public void replaceContents(InputStream stream) throws IOException {
-       free();
-       int size = store(stream);
-       _property.setStartBlock(_stream.getStartBlock()); 
-       _property.updateSize(size);
-   }
-
-   /**
-    * @return the instance's DocumentProperty
-    */
-   DocumentProperty getDocumentProperty() {
-      return _property;
-   }
-
-   /**
-    * Get an array of objects, some of which may implement POIFSViewable
-    *
-    * @return an array of Object; may not be null, but may be empty
-    */
-   public Object[] getViewableArray() {
-      String result = "<NO DATA>";
-
-      if(getSize() > 0) {
-         // Get all the data into a single array
-         byte[] data = new byte[getSize()];
-         int offset = 0;
-         for(ByteBuffer buffer : _stream) {
-            int length = Math.min(_block_size, data.length-offset); 
-            buffer.get(data, offset, length);
-            offset += length;
-         }
- 
-         result = HexDump.dump(data, 0, 0);
-      }
-      
-      return new String[]{ result };
-   }
-
-   /**
-    * Get an Iterator of objects, some of which may implement POIFSViewable
-    *
-    * @return an Iterator; may not be null, but may have an empty back end
-    *		 store
-    */
-   public Iterator<Object> getViewableIterator() {
-      return Collections.emptyList().iterator();
-   }
-
-   /**
-    * Give viewers a hint as to whether to call getViewableArray or
-    * getViewableIterator
-    *
-    * @return <code>true</code> if a viewer should call getViewableArray,
-    *		 <code>false</code> if a viewer should call getViewableIterator
-    */
-   public boolean preferArray() {
-      return true;
-   }
-
-   /**
-    * Provides a short description of the object, to be used when a
-    * POIFSViewable object has not provided its contents.
-    *
-    * @return short description
-    */
-   public String getShortDescription() {
-      StringBuffer buffer = new StringBuffer();
-
-      buffer.append("Document: \"").append(_property.getName()).append("\"");
-      buffer.append(" size = ").append(getSize());
-      return buffer.toString();
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java b/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
deleted file mode 100644
index f987c43..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
+++ /dev/null
@@ -1,1023 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PushbackInputStream;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
-import java.nio.channels.ReadableByteChannel;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.EmptyFileException;
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.poifs.nio.ByteArrayBackedDataSource;
-import org.apache.poi.poifs.nio.DataSource;
-import org.apache.poi.poifs.nio.FileBackedDataSource;
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.DocumentProperty;
-import org.apache.poi.poifs.property.NPropertyTable;
-import org.apache.poi.poifs.storage.BATBlock;
-import org.apache.poi.poifs.storage.BATBlock.BATBlockAndIndex;
-import org.apache.poi.poifs.storage.BlockAllocationTableReader;
-import org.apache.poi.poifs.storage.BlockAllocationTableWriter;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.poifs.storage.HeaderBlockConstants;
-import org.apache.poi.poifs.storage.HeaderBlockWriter;
-import org.apache.poi.util.CloseIgnoringInputStream;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LongField;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * <p>This is the main class of the POIFS system; it manages the entire
- * life cycle of the filesystem.</p>
- * <p>This is the new NIO version, which uses less memory</p>
- */
-
-public class NPOIFSFileSystem extends BlockStore
-    implements POIFSViewable, Closeable
-{
-	private static final POILogger LOG = POILogFactory.getLogger(NPOIFSFileSystem.class);
-
-    /**
-     * Convenience method for clients that want to avoid the auto-close behaviour of the constructor.
-     */
-    public static InputStream createNonClosingInputStream(InputStream is) {
-       return new CloseIgnoringInputStream(is);
-    }
-   
-    private NPOIFSMiniStore _mini_store;
-    private NPropertyTable  _property_table;
-    private List<BATBlock>  _xbat_blocks;
-    private List<BATBlock>  _bat_blocks;
-    private HeaderBlock     _header;
-    private DirectoryNode   _root;
-    
-    private DataSource _data;
-    
-    /**
-     * What big block size the file uses. Most files
-     *  use 512 bytes, but a few use 4096
-     */
-    private POIFSBigBlockSize bigBlockSize = 
-       POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS;
-
-    private NPOIFSFileSystem(boolean newFS)
-    {
-        _header         = new HeaderBlock(bigBlockSize);
-        _property_table = new NPropertyTable(_header);
-        _mini_store     = new NPOIFSMiniStore(this, _property_table.getRoot(), new ArrayList<BATBlock>(), _header);
-        _xbat_blocks    = new ArrayList<BATBlock>();
-        _bat_blocks     = new ArrayList<BATBlock>();
-        _root           = null;
-        
-        if(newFS) {
-           // Data needs to initially hold just the header block,
-           //  a single bat block, and an empty properties section
-           _data        = new ByteArrayBackedDataSource(new byte[bigBlockSize.getBigBlockSize()*3]);
-        }
-    }
-    
-    /**
-     * Constructor, intended for writing
-     */
-    public NPOIFSFileSystem()
-    {
-       this(true);
-       
-        // Reserve block 0 for the start of the Properties Table
-        // Create a single empty BAT, at pop that at offset 1
-        _header.setBATCount(1);
-        _header.setBATArray(new int[] { 1 });
-        BATBlock bb = BATBlock.createEmptyBATBlock(bigBlockSize, false);
-        bb.setOurBlockIndex(1);
-        _bat_blocks.add(bb);
-
-        setNextBlock(0, POIFSConstants.END_OF_CHAIN);
-        setNextBlock(1, POIFSConstants.FAT_SECTOR_BLOCK);
-
-        _property_table.setStartBlock(0);
-    }
-
-    /**
-     * <p>Creates a POIFSFileSystem from a <tt>File</tt>. This uses less memory than
-     *  creating from an <tt>InputStream</tt>. The File will be opened read-only</p>
-     *  
-     * <p>Note that with this constructor, you will need to call {@link #close()}
-     *  when you're done to have the underlying file closed, as the file is
-     *  kept open during normal operation to read the data out.</p> 
-     *  
-     * @param file the File from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-    public NPOIFSFileSystem(File file)
-         throws IOException
-    {
-       this(file, true);
-    }
-    
-    /**
-     * <p>Creates a POIFSFileSystem from a <tt>File</tt>. This uses less memory than
-     *  creating from an <tt>InputStream</tt>.</p>
-     *  
-     * <p>Note that with this constructor, you will need to call {@link #close()}
-     *  when you're done to have the underlying file closed, as the file is
-     *  kept open during normal operation to read the data out.</p> 
-     *  
-     * @param file the File from which to read or read/write the data
-     * @param readOnly whether the POIFileSystem will only be used in read-only mode
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-    public NPOIFSFileSystem(File file, boolean readOnly)
-         throws IOException
-    {
-       this(null, file, readOnly, true);
-    }
-    
-    /**
-     * <p>Creates a POIFSFileSystem from an open <tt>FileChannel</tt>. This uses 
-     *  less memory than creating from an <tt>InputStream</tt>. The stream will
-     *  be used in read-only mode.</p>
-     *  
-     * <p>Note that with this constructor, you will need to call {@link #close()}
-     *  when you're done to have the underlying Channel closed, as the channel is
-     *  kept open during normal operation to read the data out.</p> 
-     *  
-     * @param channel the FileChannel from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-    public NPOIFSFileSystem(FileChannel channel)
-         throws IOException
-    {
-       this(channel, true);
-    }
-    
-    /**
-     * <p>Creates a POIFSFileSystem from an open <tt>FileChannel</tt>. This uses 
-     *  less memory than creating from an <tt>InputStream</tt>.</p>
-     *  
-     * <p>Note that with this constructor, you will need to call {@link #close()}
-     *  when you're done to have the underlying Channel closed, as the channel is
-     *  kept open during normal operation to read the data out.</p> 
-     *  
-     * @param channel the FileChannel from which to read or read/write the data
-     * @param readOnly whether the POIFileSystem will only be used in read-only mode
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-    public NPOIFSFileSystem(FileChannel channel, boolean readOnly)
-         throws IOException
-    {
-       this(channel, null, readOnly, false);
-    }
-    
-    private NPOIFSFileSystem(FileChannel channel, File srcFile, boolean readOnly, boolean closeChannelOnError)
-         throws IOException
-    {
-       this(false);
-
-       try {
-          // Initialize the datasource
-          if (srcFile != null) {
-              if (srcFile.length() == 0)
-                  throw new EmptyFileException();
-              
-              FileBackedDataSource d = new FileBackedDataSource(srcFile, readOnly);
-              channel = d.getChannel();
-              _data = d;
-          } else {
-              _data = new FileBackedDataSource(channel, readOnly);
-          }
-           
-          // Get the header
-          ByteBuffer headerBuffer = ByteBuffer.allocate(POIFSConstants.SMALLER_BIG_BLOCK_SIZE);
-          IOUtils.readFully(channel, headerBuffer);
-          
-          // Have the header processed
-          _header = new HeaderBlock(headerBuffer);
-          
-          // Now process the various entries
-          readCoreContents();
-       } catch(IOException e) {
-          // Until we upgrade to Java 7, and can do a MultiCatch, we 
-          //  need to keep these two catch blocks in sync on their cleanup
-          if (closeChannelOnError && channel != null) {
-              channel.close();
-              channel = null;
-          }
-          throw e;
-       } catch(RuntimeException e) {
-          // Comes from Iterators etc.
-          // TODO Decide if we can handle these better whilst
-          //  still sticking to the iterator contract
-           if (closeChannelOnError && channel != null) {
-               channel.close();
-               channel = null;
-           }
-          throw e;
-       }
-    }
-    
-    /**
-     * Create a POIFSFileSystem from an <tt>InputStream</tt>.  Normally the stream is read until
-     * EOF.  The stream is always closed.<p/>
-     *
-     * Some streams are usable after reaching EOF (typically those that return <code>true</code>
-     * for <tt>markSupported()</tt>).  In the unlikely case that the caller has such a stream
-     * <i>and</i> needs to use it after this constructor completes, a work around is to wrap the
-     * stream in order to trap the <tt>close()</tt> call.  A convenience method (
-     * <tt>createNonClosingInputStream()</tt>) has been provided for this purpose:
-     * <pre>
-     * InputStream wrappedStream = POIFSFileSystem.createNonClosingInputStream(is);
-     * HSSFWorkbook wb = new HSSFWorkbook(wrappedStream);
-     * is.reset();
-     * doSomethingElse(is);
-     * </pre>
-     * Note also the special case of <tt>ByteArrayInputStream</tt> for which the <tt>close()</tt>
-     * method does nothing.
-     * <pre>
-     * ByteArrayInputStream bais = ...
-     * HSSFWorkbook wb = new HSSFWorkbook(bais); // calls bais.close() !
-     * bais.reset(); // no problem
-     * doSomethingElse(bais);
-     * </pre>
-     *
-     * @param stream the InputStream from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-
-    public NPOIFSFileSystem(InputStream stream)
-        throws IOException
-    {
-        this(false);
-        
-        ReadableByteChannel channel = null;
-        boolean success = false;
-        
-        try {
-           // Turn our InputStream into something NIO based
-           channel = Channels.newChannel(stream);
-           
-           // Get the header
-           ByteBuffer headerBuffer = ByteBuffer.allocate(POIFSConstants.SMALLER_BIG_BLOCK_SIZE);
-           IOUtils.readFully(channel, headerBuffer);
-           
-           // Have the header processed
-           _header = new HeaderBlock(headerBuffer);
-           
-           // Sanity check the block count
-           BlockAllocationTableReader.sanityCheckBlockCount(_header.getBATCount());
-   
-           // We need to buffer the whole file into memory when
-           //  working with an InputStream.
-           // The max possible size is when each BAT block entry is used
-           long maxSize = BATBlock.calculateMaximumSize(_header); 
-           if (maxSize > Integer.MAX_VALUE) {
-               throw new IllegalArgumentException("Unable read a >2gb file via an InputStream");
-           }
-           ByteBuffer data = ByteBuffer.allocate((int)maxSize);
-           
-           // Copy in the header
-           headerBuffer.position(0);
-           data.put(headerBuffer);
-           data.position(headerBuffer.capacity());
-           
-           // Now read the rest of the stream
-           IOUtils.readFully(channel, data);
-           success = true;
-           
-           // Turn it into a DataSource
-           _data = new ByteArrayBackedDataSource(data.array(), data.position());
-        } finally {
-           // As per the constructor contract, always close the stream
-           if(channel != null)
-              channel.close();
-           closeInputStream(stream, success);
-        }
-        
-        // Now process the various entries
-        readCoreContents();
-    }
-    /**
-     * @param stream the stream to be closed
-     * @param success <code>false</code> if an exception is currently being thrown in the calling method
-     */
-    private void closeInputStream(InputStream stream, boolean success) {
-        try {
-            stream.close();
-        } catch (IOException e) {
-            if(success) {
-                throw new RuntimeException(e);
-            }
-            // else not success? Try block did not complete normally
-            // just print stack trace and leave original ex to be thrown
-            LOG.log(POILogger.ERROR, "can't close input stream", e);
-        }
-    }
-
-    /**
-     * Checks that the supplied InputStream (which MUST
-     *  support mark and reset, or be a PushbackInputStream)
-     *  has a POIFS (OLE2) header at the start of it.
-     * If your InputStream does not support mark / reset,
-     *  then wrap it in a PushBackInputStream, then be
-     *  sure to always use that and not the original!
-     *  
-     *  After the method call, the InputStream is at the
-     *  same position as of the time of entering the method.
-     *  
-     * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
-     */
-    public static boolean hasPOIFSHeader(InputStream inp) throws IOException {
-        // We want to peek at the first 8 bytes
-        inp.mark(8);
-
-        byte[] header = new byte[8];
-        int bytesRead = IOUtils.readFully(inp, header);
-        LongField signature = new LongField(HeaderBlockConstants._signature_offset, header);
-
-        // Wind back those 8 bytes
-        if(inp instanceof PushbackInputStream) {
-            PushbackInputStream pin = (PushbackInputStream)inp;
-            pin.unread(header, 0, bytesRead);
-        } else {
-            inp.reset();
-        }
-
-        // Did it match the signature?
-        return (signature.get() == HeaderBlockConstants._signature);
-    }
-    
-    /**
-     * Checks if the supplied first 8 bytes of a stream / file
-     *  has a POIFS (OLE2) header.
-     */
-    public static boolean hasPOIFSHeader(byte[] header8Bytes) {
-        LongField signature = new LongField(HeaderBlockConstants._signature_offset, header8Bytes);
-        return (signature.get() == HeaderBlockConstants._signature);
-    }
-    
-    /**
-     * Read and process the PropertiesTable and the
-     *  FAT / XFAT blocks, so that we're ready to
-     *  work with the file
-     */
-    private void readCoreContents() throws IOException {
-       // Grab the block size
-       bigBlockSize = _header.getBigBlockSize();
-       
-       // Each block should only ever be used by one of the
-       //  FAT, XFAT or Property Table. Ensure it does
-       ChainLoopDetector loopDetector = getChainLoopDetector();
-       
-       // Read the FAT blocks
-       for(int fatAt : _header.getBATArray()) {
-          readBAT(fatAt, loopDetector);
-       }
-       
-       // Work out how many FAT blocks remain in the XFATs
-       int remainingFATs = _header.getBATCount() - _header.getBATArray().length;
-       
-       // Now read the XFAT blocks, and the FATs within them
-       BATBlock xfat; 
-       int nextAt = _header.getXBATIndex();
-       for(int i=0; i<_header.getXBATCount(); i++) {
-          loopDetector.claim(nextAt);
-          ByteBuffer fatData = getBlockAt(nextAt);
-          xfat = BATBlock.createBATBlock(bigBlockSize, fatData);
-          xfat.setOurBlockIndex(nextAt);
-          nextAt = xfat.getValueAt(bigBlockSize.getXBATEntriesPerBlock());
-          _xbat_blocks.add(xfat);
-          
-          // Process all the (used) FATs from this XFAT
-          int xbatFATs = Math.min(remainingFATs, bigBlockSize.getXBATEntriesPerBlock());
-          for(int j=0; j<xbatFATs; j++) {
-             int fatAt = xfat.getValueAt(j);
-             if(fatAt == POIFSConstants.UNUSED_BLOCK || fatAt == POIFSConstants.END_OF_CHAIN) break;
-             readBAT(fatAt, loopDetector);
-          }
-          remainingFATs -= xbatFATs;
-       }
-       
-       // We're now able to load steams
-       // Use this to read in the properties
-       _property_table = new NPropertyTable(_header, this);
-       
-       // Finally read the Small Stream FAT (SBAT) blocks
-       BATBlock sfat;
-       List<BATBlock> sbats = new ArrayList<BATBlock>();
-       _mini_store     = new NPOIFSMiniStore(this, _property_table.getRoot(), sbats, _header);
-       nextAt = _header.getSBATStart();
-       for(int i=0; i<_header.getSBATCount() && nextAt != POIFSConstants.END_OF_CHAIN; i++) {
-          loopDetector.claim(nextAt);
-          ByteBuffer fatData = getBlockAt(nextAt);
-          sfat = BATBlock.createBATBlock(bigBlockSize, fatData);
-          sfat.setOurBlockIndex(nextAt);
-          sbats.add(sfat);
-          nextAt = getNextBlock(nextAt);  
-       }
-    }
-    private void readBAT(int batAt, ChainLoopDetector loopDetector) throws IOException {
-       loopDetector.claim(batAt);
-       ByteBuffer fatData = getBlockAt(batAt);
-       BATBlock bat = BATBlock.createBATBlock(bigBlockSize, fatData);
-       bat.setOurBlockIndex(batAt);
-       _bat_blocks.add(bat);
-    }
-    private BATBlock createBAT(int offset, boolean isBAT) throws IOException {
-       // Create a new BATBlock
-       BATBlock newBAT = BATBlock.createEmptyBATBlock(bigBlockSize, !isBAT);
-       newBAT.setOurBlockIndex(offset);
-       // Ensure there's a spot in the file for it
-       ByteBuffer buffer = ByteBuffer.allocate(bigBlockSize.getBigBlockSize());
-       int writeTo = (1+offset) * bigBlockSize.getBigBlockSize(); // Header isn't in BATs
-       _data.write(buffer, writeTo);
-       // All done
-       return newBAT;
-    }
-    
-    /**
-     * Load the block at the given offset.
-     */
-    @Override
-    protected ByteBuffer getBlockAt(final int offset) throws IOException {
-       // The header block doesn't count, so add one
-       long blockWanted = offset + 1;
-       long startAt = blockWanted * bigBlockSize.getBigBlockSize();
-       try {
-           return _data.read(bigBlockSize.getBigBlockSize(), startAt);
-       } catch (IndexOutOfBoundsException e) {
-           IndexOutOfBoundsException wrapped = new IndexOutOfBoundsException("Block " + offset + " not found");
-           wrapped.initCause(e);
-           throw wrapped;
-       }
-    }
-    
-    /**
-     * Load the block at the given offset, 
-     *  extending the file if needed
-     */
-    @Override
-    protected ByteBuffer createBlockIfNeeded(final int offset) throws IOException {
-       try {
-          return getBlockAt(offset);
-       } catch(IndexOutOfBoundsException e) {
-          // The header block doesn't count, so add one
-          long startAt = (offset+1) * bigBlockSize.getBigBlockSize();
-          // Allocate and write
-          ByteBuffer buffer = ByteBuffer.allocate(getBigBlockSize());
-          _data.write(buffer, startAt);
-          // Retrieve the properly backed block
-          return getBlockAt(offset);
-       }
-    }
-    
-    /**
-     * Returns the BATBlock that handles the specified offset,
-     *  and the relative index within it
-     */
-    @Override
-    protected BATBlockAndIndex getBATBlockAndIndex(final int offset) {
-       return BATBlock.getBATBlockAndIndex(
-             offset, _header, _bat_blocks
-       );
-    }
-    
-    /**
-     * Works out what block follows the specified one.
-     */
-    @Override
-    protected int getNextBlock(final int offset) {
-       BATBlockAndIndex bai = getBATBlockAndIndex(offset);
-       return bai.getBlock().getValueAt( bai.getIndex() );
-    }
-    
-    /**
-     * Changes the record of what block follows the specified one.
-     */
-    @Override
-    protected void setNextBlock(final int offset, final int nextBlock) {
-       BATBlockAndIndex bai = getBATBlockAndIndex(offset);
-       bai.getBlock().setValueAt(
-             bai.getIndex(), nextBlock
-       );
-    }
-    
-    /**
-     * Finds a free block, and returns its offset.
-     * This method will extend the file if needed, and if doing
-     *  so, allocate new FAT blocks to address the extra space.
-     */
-    @Override
-    protected int getFreeBlock() throws IOException {
-        int numSectors = bigBlockSize.getBATEntriesPerBlock();
-
-       // First up, do we have any spare ones?
-       int offset = 0;
-       for (BATBlock bat : _bat_blocks) {
-          if(bat.hasFreeSectors()) {
-             // Claim one of them and return it
-             for(int j=0; j<numSectors; j++) {
-                int batValue = bat.getValueAt(j);
-                if(batValue == POIFSConstants.UNUSED_BLOCK) {
-                   // Bingo
-                   return offset + j;
-                }
-             }
-          }
-          
-          // Move onto the next BAT
-          offset += numSectors;
-       }
-       
-       // If we get here, then there aren't any free sectors
-       //  in any of the BATs, so we need another BAT
-       BATBlock bat = createBAT(offset, true);
-       bat.setValueAt(0, POIFSConstants.FAT_SECTOR_BLOCK);
-       _bat_blocks.add(bat);
-       
-       // Now store a reference to the BAT in the required place 
-       if(_header.getBATCount() >= 109) {
-          // Needs to come from an XBAT
-          BATBlock xbat = null;
-          for(BATBlock x : _xbat_blocks) {
-             if(x.hasFreeSectors()) {
-                xbat = x;
-                break;
-             }
-          }
-          if(xbat == null) {
-             // Oh joy, we need a new XBAT too...
-             xbat = createBAT(offset+1, false);
-             // Allocate our new BAT as the first block in the XBAT
-             xbat.setValueAt(0, offset);
-             // And allocate the XBAT in the BAT
-             bat.setValueAt(1, POIFSConstants.DIFAT_SECTOR_BLOCK);
-             
-             // Will go one place higher as XBAT added in
-             offset++;
-             
-             // Chain it
-             if(_xbat_blocks.size() == 0) {
-                _header.setXBATStart(offset);
-             } else {
-                _xbat_blocks.get(_xbat_blocks.size()-1).setValueAt(
-                      bigBlockSize.getXBATEntriesPerBlock(), offset
-                );
-             }
-             _xbat_blocks.add(xbat);
-             _header.setXBATCount(_xbat_blocks.size());
-          } else {
-              // Allocate our BAT in the existing XBAT with space
-              for(int i=0; i<bigBlockSize.getXBATEntriesPerBlock(); i++) {
-                 if(xbat.getValueAt(i) == POIFSConstants.UNUSED_BLOCK) {
-                    xbat.setValueAt(i, offset);
-                    break;
-                 }
-              }
-          }
-       } else {
-          // Store us in the header
-          int[] newBATs = new int[_header.getBATCount()+1];
-          System.arraycopy(_header.getBATArray(), 0, newBATs, 0, newBATs.length-1);
-          newBATs[newBATs.length-1] = offset;
-          _header.setBATArray(newBATs);
-       }
-       _header.setBATCount(_bat_blocks.size());
-       
-       // The current offset stores us, but the next one is free
-       return offset+1;
-    }
-    
-    protected long size() throws IOException {
-        return _data.size();
-    }
-    
-    @Override
-    protected ChainLoopDetector getChainLoopDetector() throws IOException {
-      return new ChainLoopDetector(_data.size());
-    }
-
-   /**
-     * For unit testing only! Returns the underlying
-     *  properties table
-     */
-    NPropertyTable _get_property_table() {
-      return _property_table;
-    }
-    
-    /**
-     * Returns the MiniStore, which performs a similar low
-     *  level function to this, except for the small blocks.
-     */
-    public NPOIFSMiniStore getMiniStore() {
-       return _mini_store;
-    }
-
-    /**
-     * add a new POIFSDocument to the FileSytem 
-     *
-     * @param document the POIFSDocument being added
-     */
-    void addDocument(final NPOIFSDocument document)
-    {
-        _property_table.addProperty(document.getDocumentProperty());
-    }
-
-    /**
-     * add a new DirectoryProperty to the FileSystem
-     *
-     * @param directory the DirectoryProperty being added
-     */
-    void addDirectory(final DirectoryProperty directory)
-    {
-        _property_table.addProperty(directory);
-    }
-
-   /**
-     * Create a new document to be added to the root directory
-     *
-     * @param stream the InputStream from which the document's data
-     *               will be obtained
-     * @param name the name of the new POIFSDocument
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException on error creating the new POIFSDocument
-     */
-
-    public DocumentEntry createDocument(final InputStream stream,
-                                        final String name)
-        throws IOException
-    {
-        return getRoot().createDocument(name, stream);
-    }
-
-    /**
-     * create a new DocumentEntry in the root entry; the data will be
-     * provided later
-     *
-     * @param name the name of the new DocumentEntry
-     * @param size the size of the new DocumentEntry
-     * @param writer the writer of the new DocumentEntry
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-
-    public DocumentEntry createDocument(final String name, final int size,
-                                        final POIFSWriterListener writer)
-        throws IOException
-    {
-        return getRoot().createDocument(name, size, writer);
-    }
-
-    /**
-     * create a new DirectoryEntry in the root directory
-     *
-     * @param name the name of the new DirectoryEntry
-     *
-     * @return the new DirectoryEntry
-     *
-     * @exception IOException on name duplication
-     */
-
-    public DirectoryEntry createDirectory(final String name)
-        throws IOException
-    {
-        return getRoot().createDirectory(name);
-    }
-    
-    /**
-     * Set the contents of a document in the root directory,
-     *  creating if needed, otherwise updating
-     *
-     * @param stream the InputStream from which the document's data
-     *               will be obtained
-     * @param name the name of the new or existing POIFSDocument
-     *
-     * @return the new or updated DocumentEntry
-     *
-     * @exception IOException on error populating the POIFSDocument
-     */
-
-    public DocumentEntry createOrUpdateDocument(final InputStream stream,
-                                                final String name)
-        throws IOException
-    {
-        return getRoot().createOrUpdateDocument(name, stream);
-    }
-    
-    /**
-     * Does the filesystem support an in-place write via
-     *  {@link #writeFilesystem()} ? If false, only writing out to
-     *  a brand new file via {@link #writeFilesystem(OutputStream)}
-     *  is supported.
-     */
-    public boolean isInPlaceWriteable() {
-        if(_data instanceof FileBackedDataSource) {
-            if ( ((FileBackedDataSource)_data).isWriteable() ) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     * Write the filesystem out to the open file. Will thrown an
-     *  {@link IllegalArgumentException} if opened from an 
-     *  {@link InputStream}.
-     * 
-     * @exception IOException thrown on errors writing to the stream
-     */
-    public void writeFilesystem() throws IOException
-    {
-       if(_data instanceof FileBackedDataSource) {
-          // Good, correct type
-       } else {
-          throw new IllegalArgumentException(
-                "POIFS opened from an inputstream, so writeFilesystem() may " +
-                "not be called. Use writeFilesystem(OutputStream) instead"
-          );
-       }
-       if (! ((FileBackedDataSource)_data).isWriteable()) {
-           throw new IllegalArgumentException(
-                "POIFS opened in read only mode, so writeFilesystem() may " +
-                "not be called. Open the FileSystem in read-write mode first"
-           );
-       }
-       syncWithDataSource();
-    }
-
-    /**
-     * Write the filesystem out
-     *
-     * @param stream the OutputStream to which the filesystem will be
-     *               written
-     *
-     * @exception IOException thrown on errors writing to the stream
-     */
-
-    public void writeFilesystem(final OutputStream stream)
-        throws IOException
-    {
-       // Have the datasource updated
-       syncWithDataSource();
-       
-       // Now copy the contents to the stream
-       _data.copyTo(stream);
-    }
-    
-    /**
-     * Has our in-memory objects write their state
-     *  to their backing blocks 
-     */
-    private void syncWithDataSource() throws IOException {
-        // Mini Stream + SBATs first, as mini-stream details have
-        //  to be stored in the Root Property
-        _mini_store.syncWithDataSource();
-        
-        // Properties
-        NPOIFSStream propStream = new NPOIFSStream(this, _header.getPropertyStart());
-        _property_table.preWrite();
-        _property_table.write(propStream);
-        // _header.setPropertyStart has been updated on write ...
-        
-       // HeaderBlock
-       HeaderBlockWriter hbw = new HeaderBlockWriter(_header);
-       hbw.writeBlock( getBlockAt(-1) );
-       
-       // BATs
-       for(BATBlock bat : _bat_blocks) {
-          ByteBuffer block = getBlockAt(bat.getOurBlockIndex());
-          BlockAllocationTableWriter.writeBlock(bat, block);
-       }
-       // XBats
-       for(BATBlock bat : _xbat_blocks) {
-           ByteBuffer block = getBlockAt(bat.getOurBlockIndex());
-           BlockAllocationTableWriter.writeBlock(bat, block);
-        }
-    }
-    
-    /**
-     * Closes the FileSystem, freeing any underlying files, streams
-     *  and buffers. After this, you will be unable to read or 
-     *  write from the FileSystem.
-     */
-    public void close() throws IOException {
-       _data.close();
-    }
-
-    /**
-     * read in a file and write it back out again
-     *
-     * @param args names of the files; arg[ 0 ] is the input file,
-     *             arg[ 1 ] is the output file
-     *
-     * @exception IOException
-     */
-
-    public static void main(String args[])
-        throws IOException
-    {
-        if (args.length != 2)
-        {
-            System.err.println(
-                "two arguments required: input filename and output filename");
-            System.exit(1);
-        }
-        FileInputStream  istream = new FileInputStream(args[ 0 ]);
-        try {
-            FileOutputStream ostream = new FileOutputStream(args[ 1 ]);
-            try {
-                NPOIFSFileSystem fs = new NPOIFSFileSystem(istream);
-                try {
-                    fs.writeFilesystem(ostream);
-                } finally {
-                    fs.close();
-                }
-            } finally {
-                ostream.close();
-            }
-        } finally {
-            istream.close();
-        }
-    }
-
-    /**
-     * Get the root entry
-     *
-     * @return the root entry
-     */
-    public DirectoryNode getRoot()
-    {
-        if (_root == null) {
-           _root = new DirectoryNode(_property_table.getRoot(), this, null);
-        }
-        return _root;
-    }
-
-    /**
-     * open a document in the root entry's list of entries
-     *
-     * @param documentName the name of the document to be opened
-     *
-     * @return a newly opened DocumentInputStream
-     *
-     * @exception IOException if the document does not exist or the
-     *            name is that of a DirectoryEntry
-     */
-
-    public DocumentInputStream createDocumentInputStream(
-            final String documentName)
-        throws IOException
-    {
-    	return getRoot().createDocumentInputStream(documentName);
-    }
-
-    /**
-     * remove an entry
-     *
-     * @param entry to be removed
-     */
-    void remove(EntryNode entry) throws IOException
-    {
-        // If it's a document, free the blocks
-        if (entry instanceof DocumentEntry) {
-            NPOIFSDocument doc = new NPOIFSDocument((DocumentProperty)entry.getProperty(), this);
-            doc.free();
-        }
-        
-        // Now zap it from the properties list
-        _property_table.removeProperty(entry.getProperty());
-    }
-    
-    /* ********** START begin implementation of POIFSViewable ********** */
-
-    /**
-     * Get an array of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an array of Object; may not be null, but may be empty
-     */
-
-    public Object [] getViewableArray()
-    {
-        if (preferArray())
-        {
-            return (( POIFSViewable ) getRoot()).getViewableArray();
-        }
-        return new Object[ 0 ];
-    }
-
-    /**
-     * Get an Iterator of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an Iterator; may not be null, but may have an empty
-     * back end store
-     */
-
-    public Iterator<Object> getViewableIterator()
-    {
-        if (!preferArray())
-        {
-            return (( POIFSViewable ) getRoot()).getViewableIterator();
-        }
-        return Collections.emptyList().iterator();
-    }
-
-    /**
-     * Give viewers a hint as to whether to call getViewableArray or
-     * getViewableIterator
-     *
-     * @return true if a viewer should call getViewableArray, false if
-     *         a viewer should call getViewableIterator
-     */
-
-    public boolean preferArray()
-    {
-        return (( POIFSViewable ) getRoot()).preferArray();
-    }
-
-    /**
-     * Provides a short description of the object, to be used when a
-     * POIFSViewable object has not provided its contents.
-     *
-     * @return short description
-     */
-
-    public String getShortDescription()
-    {
-        return "POIFS FileSystem";
-    }
-
-    /* **********  END  begin implementation of POIFSViewable ********** */
-
-    /**
-     * @return The Big Block size, normally 512 bytes, sometimes 4096 bytes
-     */
-    public int getBigBlockSize() {
-      return bigBlockSize.getBigBlockSize();
-    }
-
-    /**
-     * @return The Big Block size, normally 512 bytes, sometimes 4096 bytes
-     */
-    public POIFSBigBlockSize getBigBlockSizeDetails() {
-      return bigBlockSize;
-    }
-
-    @Override
-    protected int getBlockStoreBlockSize() {
-       return getBigBlockSize();
-    }
-
-    @Internal
-    public NPropertyTable getPropertyTable() {
-        return _property_table;
-    }
-
-    @Internal
-    public HeaderBlock getHeaderBlock() {
-        return _header;
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java b/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java
deleted file mode 100644
index b784058..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java
+++ /dev/null
@@ -1,265 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.property.RootProperty;
-import org.apache.poi.poifs.storage.BATBlock;
-import org.apache.poi.poifs.storage.BATBlock.BATBlockAndIndex;
-import org.apache.poi.poifs.storage.BlockAllocationTableWriter;
-import org.apache.poi.poifs.storage.HeaderBlock;
-
-/**
- * This class handles the MiniStream (small block store)
- *  in the NIO case for {@link NPOIFSFileSystem}
- */
-public class NPOIFSMiniStore extends BlockStore
-{
-    private NPOIFSFileSystem _filesystem;
-    private NPOIFSStream     _mini_stream;
-    private List<BATBlock>   _sbat_blocks;
-    private HeaderBlock      _header;
-    private RootProperty     _root;
-
-    protected NPOIFSMiniStore(NPOIFSFileSystem filesystem, RootProperty root,
-         List<BATBlock> sbats, HeaderBlock header)
-    {
-       this._filesystem = filesystem;
-       this._sbat_blocks = sbats;
-       this._header = header;
-       this._root = root;
-       
-       this._mini_stream = new NPOIFSStream(filesystem, root.getStartBlock());
-    }
-    
-    /**
-     * Load the block at the given offset.
-     */
-    protected ByteBuffer getBlockAt(final int offset) throws IOException {
-       // Which big block is this?
-       int byteOffset = offset * POIFSConstants.SMALL_BLOCK_SIZE;
-       int bigBlockNumber = byteOffset / _filesystem.getBigBlockSize();
-       int bigBlockOffset = byteOffset % _filesystem.getBigBlockSize();
-       
-       // Now locate the data block for it
-       Iterator<ByteBuffer> it = _mini_stream.getBlockIterator();
-       for(int i=0; i<bigBlockNumber; i++) {
-          it.next();
-       }
-       ByteBuffer dataBlock = it.next();
-       if(dataBlock == null) {
-          throw new IndexOutOfBoundsException("Big block " + bigBlockNumber + " outside stream");
-       }
-
-       // Position ourselves, and take a slice 
-       dataBlock.position(
-             dataBlock.position() + bigBlockOffset
-       );
-       ByteBuffer miniBuffer = dataBlock.slice();
-       miniBuffer.limit(POIFSConstants.SMALL_BLOCK_SIZE);
-       return miniBuffer;
-    }
-    
-    /**
-     * Load the block, extending the underlying stream if needed
-     */
-    protected ByteBuffer createBlockIfNeeded(final int offset) throws IOException {
-       boolean firstInStore = false;
-       if (_mini_stream.getStartBlock() == POIFSConstants.END_OF_CHAIN) {
-           firstInStore = true;
-       }
-       
-       // Try to get it without extending the stream
-       if (! firstInStore) {
-           try {
-              return getBlockAt(offset);
-           } catch(IndexOutOfBoundsException e) {}
-       }
-       
-       // Need to extend the stream
-       // TODO Replace this with proper append support
-       // For now, do the extending by hand...
-
-       // Ask for another block
-       int newBigBlock = _filesystem.getFreeBlock();
-       _filesystem.createBlockIfNeeded(newBigBlock);
-       
-       // If we are the first block to be allocated, initialise the stream
-       if (firstInStore) {
-           _filesystem._get_property_table().getRoot().setStartBlock(newBigBlock);
-           _mini_stream = new NPOIFSStream(_filesystem, newBigBlock);
-       } else {
-           // Tack it onto the end of our chain
-           ChainLoopDetector loopDetector = _filesystem.getChainLoopDetector();
-           int block = _mini_stream.getStartBlock();
-           while(true) {
-              loopDetector.claim(block);
-              int next = _filesystem.getNextBlock(block);
-              if(next == POIFSConstants.END_OF_CHAIN) {
-                 break;
-              }
-              block = next;
-           }
-           _filesystem.setNextBlock(block, newBigBlock);
-       }
-       
-       // This is now the new end
-       _filesystem.setNextBlock(newBigBlock, POIFSConstants.END_OF_CHAIN);
-
-       // Now try again, to get the real small block
-       return createBlockIfNeeded(offset);
-    }
-    
-    /**
-     * Returns the BATBlock that handles the specified offset,
-     *  and the relative index within it
-     */
-    protected BATBlockAndIndex getBATBlockAndIndex(final int offset) {
-       return BATBlock.getSBATBlockAndIndex(
-             offset, _header, _sbat_blocks
-       );
-    }
-    
-    /**
-     * Works out what block follows the specified one.
-     */
-    protected int getNextBlock(final int offset) {
-       BATBlockAndIndex bai = getBATBlockAndIndex(offset);
-       return bai.getBlock().getValueAt( bai.getIndex() );
-    }
-    
-    /**
-     * Changes the record of what block follows the specified one.
-     */
-    protected void setNextBlock(final int offset, final int nextBlock) {
-       BATBlockAndIndex bai = getBATBlockAndIndex(offset);
-       bai.getBlock().setValueAt(
-             bai.getIndex(), nextBlock
-       );
-    }
-    
-    /**
-     * Finds a free block, and returns its offset.
-     * This method will extend the file if needed, and if doing
-     *  so, allocate new FAT blocks to address the extra space.
-     */
-    protected int getFreeBlock() throws IOException {
-       int sectorsPerSBAT = _filesystem.getBigBlockSizeDetails().getBATEntriesPerBlock();
-       
-       // First up, do we have any spare ones?
-       int offset = 0;
-       for(int i=0; i<_sbat_blocks.size(); i++) {
-          // Check this one
-          BATBlock sbat = _sbat_blocks.get(i);
-          if(sbat.hasFreeSectors()) {
-             // Claim one of them and return it
-             for(int j=0; j<sectorsPerSBAT; j++) {
-                int sbatValue = sbat.getValueAt(j);
-                if(sbatValue == POIFSConstants.UNUSED_BLOCK) {
-                   // Bingo
-                   return offset + j;
-                }
-             }
-          }
-          
-          // Move onto the next SBAT
-          offset += sectorsPerSBAT;
-       }
-       
-       // If we get here, then there aren't any
-       //  free sectors in any of the SBATs
-       // So, we need to extend the chain and add another
-       
-       // Create a new BATBlock
-       BATBlock newSBAT = BATBlock.createEmptyBATBlock(_filesystem.getBigBlockSizeDetails(), false);
-       int batForSBAT = _filesystem.getFreeBlock();
-       newSBAT.setOurBlockIndex(batForSBAT);
-       
-       // Are we the first SBAT?
-       if(_header.getSBATCount() == 0) {
-          // Tell the header that we've got our first SBAT there
-          _header.setSBATStart(batForSBAT);
-          _header.setSBATBlockCount(1);
-       } else {
-          // Find the end of the SBAT stream, and add the sbat in there
-          ChainLoopDetector loopDetector = _filesystem.getChainLoopDetector();
-          int batOffset = _header.getSBATStart();
-          while(true) {
-             loopDetector.claim(batOffset);
-             int nextBat = _filesystem.getNextBlock(batOffset);
-             if(nextBat == POIFSConstants.END_OF_CHAIN) {
-                break;
-             }
-             batOffset = nextBat;
-          }
-          
-          // Add it in at the end
-          _filesystem.setNextBlock(batOffset, batForSBAT);
-          
-          // And update the count
-          _header.setSBATBlockCount(
-                _header.getSBATCount() + 1
-          );
-       }
-       
-       // Finish allocating
-       _filesystem.setNextBlock(batForSBAT, POIFSConstants.END_OF_CHAIN);
-       _sbat_blocks.add(newSBAT);
-       
-       // Return our first spot
-       return offset;
-    }
-    
-    @Override
-    protected ChainLoopDetector getChainLoopDetector() throws IOException {
-      return new ChainLoopDetector( _root.getSize() );
-    }
-
-    protected int getBlockStoreBlockSize() {
-       return POIFSConstants.SMALL_BLOCK_SIZE;
-    }
-    
-    /**
-     * Writes the SBATs to their backing blocks, and updates
-     *  the mini-stream size in the properties. Stream size is
-     *  based on full blocks used, not the data within the streams
-     */
-    protected void syncWithDataSource() throws IOException {
-       int blocksUsed = 0;
-       for (BATBlock sbat : _sbat_blocks) {
-          ByteBuffer block = _filesystem.getBlockAt(sbat.getOurBlockIndex());
-          BlockAllocationTableWriter.writeBlock(sbat, block);
-          
-          if (!sbat.hasFreeSectors()) {
-              blocksUsed += _filesystem.getBigBlockSizeDetails().getBATEntriesPerBlock();
-          } else {
-              blocksUsed += sbat.getUsedSectors(false);
-          }
-       }
-       // Set the size on the root in terms of the number of SBAT blocks
-       // RootProperty.setSize does the sbat -> bytes conversion for us
-       _filesystem._get_property_table().getRoot().setSize(blocksUsed);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSStream.java b/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSStream.java
deleted file mode 100644
index da24fc3..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSStream.java
+++ /dev/null
@@ -1,266 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.BlockStore.ChainLoopDetector;
-import org.apache.poi.poifs.property.Property;
-import org.apache.poi.poifs.storage.HeaderBlock;
-
-/**
- * This handles reading and writing a stream within a
- *  {@link NPOIFSFileSystem}. It can supply an iterator
- *  to read blocks, and way to write out to existing and
- *  new blocks.
- * Most users will want a higher level version of this, 
- *  which deals with properties to track which stream
- *  this is.
- * This only works on big block streams, it doesn't
- *  handle small block ones.
- * This uses the new NIO code
- * 
- * TODO Implement a streaming write method, and append
- */
-
-public class NPOIFSStream implements Iterable<ByteBuffer>
-{
-	private BlockStore blockStore;
-	private int startBlock;
-	private OutputStream outStream;
-	
-	/**
-	 * Constructor for an existing stream. It's up to you
-	 *  to know how to get the start block (eg from a 
-	 *  {@link HeaderBlock} or a {@link Property}) 
-	 */
-	public NPOIFSStream(BlockStore blockStore, int startBlock) {
-	   this.blockStore = blockStore;
-	   this.startBlock = startBlock;
-	}
-	
-	/**
-	 * Constructor for a new stream. A start block won't
-	 *  be allocated until you begin writing to it.
-	 */
-	public NPOIFSStream(BlockStore blockStore) {
-      this.blockStore = blockStore;
-	   this.startBlock = POIFSConstants.END_OF_CHAIN;
-	}
-	
-	/**
-	 * What block does this stream start at?
-	 * Will be {@link POIFSConstants#END_OF_CHAIN} for a
-	 *  new stream that hasn't been written to yet.
-	 */
-	public int getStartBlock() {
-	   return startBlock;
-	}
-
-	/**
-	 * Returns an iterator that'll supply one {@link ByteBuffer}
-	 *  per block in the stream.
-	 */
-   public Iterator<ByteBuffer> iterator() {
-      return getBlockIterator();
-   }
-	
-   public Iterator<ByteBuffer> getBlockIterator() {
-      if(startBlock == POIFSConstants.END_OF_CHAIN) {
-         throw new IllegalStateException(
-               "Can't read from a new stream before it has been written to"
-         );
-      }
-      return new StreamBlockByteBufferIterator(startBlock);
-   }
-
-   /**
-    * Updates the contents of the stream to the new
-    *  set of bytes.
-    * Note - if this is property based, you'll still
-    *  need to update the size in the property yourself
-    */
-   public void updateContents(byte[] contents) throws IOException {
-       OutputStream os = getOutputStream();
-       os.write(contents);
-       os.close();
-   }
-
-   public OutputStream getOutputStream() throws IOException {
-       if (outStream == null) {
-           outStream = new StreamBlockByteBuffer();
-       }
-       return outStream;
-   }
-   
-   // TODO Streaming write support
-   // TODO  then convert fixed sized write to use streaming internally
-   // TODO Append write support (probably streaming)
-   
-   /**
-    * Frees all blocks in the stream
-    */
-   public void free() throws IOException {
-      ChainLoopDetector loopDetector = blockStore.getChainLoopDetector();
-      free(loopDetector);
-   }
-   private void free(ChainLoopDetector loopDetector) {
-      int nextBlock = startBlock;
-      while(nextBlock != POIFSConstants.END_OF_CHAIN) {
-         int thisBlock = nextBlock;
-         loopDetector.claim(thisBlock);
-         nextBlock = blockStore.getNextBlock(thisBlock);
-         blockStore.setNextBlock(thisBlock, POIFSConstants.UNUSED_BLOCK);
-      }
-      this.startBlock = POIFSConstants.END_OF_CHAIN;
-   }
-   
-   /**
-    * Class that handles a streaming read of one stream
-    */
-   protected class StreamBlockByteBufferIterator implements Iterator<ByteBuffer> {
-      private ChainLoopDetector loopDetector;
-      private int nextBlock;
-      
-      protected StreamBlockByteBufferIterator(int firstBlock) {
-         this.nextBlock = firstBlock;
-         try {
-            this.loopDetector = blockStore.getChainLoopDetector();
-         } catch(IOException e) {
-            throw new RuntimeException(e);
-         }
-      }
-
-      public boolean hasNext() {
-         if(nextBlock == POIFSConstants.END_OF_CHAIN) {
-            return false;
-         }
-         return true;
-      }
-
-      public ByteBuffer next() {
-         if(nextBlock == POIFSConstants.END_OF_CHAIN) {
-            throw new IndexOutOfBoundsException("Can't read past the end of the stream");
-         }
-         
-         try {
-            loopDetector.claim(nextBlock);
-            ByteBuffer data = blockStore.getBlockAt(nextBlock);
-            nextBlock = blockStore.getNextBlock(nextBlock);
-            return data;
-         } catch(IOException e) {
-            throw new RuntimeException(e);
-         }
-      }
-
-      public void remove() {
-         throw new UnsupportedOperationException();
-      }
-   }
-   
-   protected class StreamBlockByteBuffer extends OutputStream {
-       byte oneByte[] = new byte[1];
-       ByteBuffer buffer;
-       // Make sure we don't encounter a loop whilst overwriting
-       // the existing blocks
-       ChainLoopDetector loopDetector;
-       int prevBlock, nextBlock;
-
-       protected StreamBlockByteBuffer() throws IOException {
-           loopDetector = blockStore.getChainLoopDetector();
-           prevBlock = POIFSConstants.END_OF_CHAIN;
-           nextBlock = startBlock;
-       }
-
-       protected void createBlockIfNeeded() throws IOException {
-           if (buffer != null && buffer.hasRemaining()) return;
-           
-           int thisBlock = nextBlock;
-           
-           // Allocate a block if needed, otherwise figure
-           //  out what the next block will be
-           if(thisBlock == POIFSConstants.END_OF_CHAIN) {
-              thisBlock = blockStore.getFreeBlock();
-              loopDetector.claim(thisBlock);
-              
-              // We're on the end of the chain
-              nextBlock = POIFSConstants.END_OF_CHAIN;
-              
-              // Mark the previous block as carrying on to us if needed
-              if(prevBlock != POIFSConstants.END_OF_CHAIN) {
-                 blockStore.setNextBlock(prevBlock, thisBlock);
-              }
-              blockStore.setNextBlock(thisBlock, POIFSConstants.END_OF_CHAIN);
-              
-              // If we've just written the first block on a 
-              //  new stream, save the start block offset
-              if(startBlock == POIFSConstants.END_OF_CHAIN) {
-                 startBlock = thisBlock;
-              }
-           } else {
-              loopDetector.claim(thisBlock);
-              nextBlock = blockStore.getNextBlock(thisBlock);
-           }
-
-           buffer = blockStore.createBlockIfNeeded(thisBlock);
-           
-           // Update pointers
-           prevBlock = thisBlock;
-       }
-       
-       public void write(int b) throws IOException {
-            oneByte[0] = (byte)(b & 0xFF);
-            write(oneByte);
-       }
-    
-        public void write(byte[] b, int off, int len) throws IOException {
-            if ((off < 0) || (off > b.length) || (len < 0) ||
-                    ((off + len) > b.length) || ((off + len) < 0)) {
-                throw new IndexOutOfBoundsException();
-            } else if (len == 0) {
-                return;
-            }
-
-            do {
-                createBlockIfNeeded();
-                int writeBytes = Math.min(buffer.remaining(), len);
-                buffer.put(b, off, writeBytes);
-                off += writeBytes;
-                len -= writeBytes;
-            } while (len > 0);
-        }
-    
-        public void close() throws IOException {
-            // If we're overwriting, free any remaining blocks
-            NPOIFSStream toFree = new NPOIFSStream(blockStore, nextBlock);
-            toFree.free(loopDetector);
-            
-            // Mark the end of the stream, if we have any data
-            if (prevBlock != POIFSConstants.END_OF_CHAIN) {
-                blockStore.setNextBlock(prevBlock, POIFSConstants.END_OF_CHAIN);
-            }
-        }
-   }
-}
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java b/trunk/src/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
deleted file mode 100644
index 18387cf..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-
-/**
- * This exception is thrown when we try to open a file that doesn't
- *  seem to actually be an OLE2 file after all
- */
-public class NotOLE2FileException extends IOException {
-	public NotOLE2FileException(String s) {
-		super(s);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/ODocumentInputStream.java b/trunk/src/java/org/apache/poi/poifs/filesystem/ODocumentInputStream.java
deleted file mode 100644
index 858e2d9..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/ODocumentInputStream.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.storage.DataInputBlock;
-
-/**
- * This class provides methods to read a DocumentEntry managed by a
- * {@link OPOIFSFileSystem} instance.
- */
-public final class ODocumentInputStream extends DocumentInputStream {
-	/** current offset into the Document */
-	private int _current_offset;
-
-	/** current marked offset into the Document (used by mark and reset) */
-	private int _marked_offset;
-
-	/** the Document's size */
-	private int _document_size;
-
-	/** have we been closed? */
-	private boolean _closed;
-
-	/** the actual Document */
-	private OPOIFSDocument _document;
-
-	/** the data block containing the current stream pointer */
-	private DataInputBlock _currentBlock;
-
-	/**
-	 * Create an InputStream from the specified DocumentEntry
-	 * 
-	 * @param document the DocumentEntry to be read
-	 * 
-	 * @exception IOException if the DocumentEntry cannot be opened (like, maybe it has
-	 *                been deleted?)
-	 */
-	public ODocumentInputStream(DocumentEntry document) throws IOException {
-		if (!(document instanceof DocumentNode)) {
-			throw new IOException("Cannot open internal document storage");
-		}
-		DocumentNode documentNode = (DocumentNode)document;
-		if (documentNode.getDocument() == null) {
-         throw new IOException("Cannot open internal document storage");
-		}
-		      
-		_current_offset = 0;
-		_marked_offset = 0;
-		_document_size = document.getSize();
-		_closed = false;
-		_document = documentNode.getDocument();
-		_currentBlock = getDataInputBlock(0);
-	}
-
-	/**
-	 * Create an InputStream from the specified Document
-	 * 
-	 * @param document the Document to be read
-	 */
-	public ODocumentInputStream(OPOIFSDocument document) {
-		_current_offset = 0;
-		_marked_offset = 0;
-		_document_size = document.getSize();
-		_closed = false;
-		_document = document;
-		_currentBlock = getDataInputBlock(0);
-	}
-
-	@Override
-	public int available() {
-		if (_closed) {
-			throw new IllegalStateException("cannot perform requested operation on a closed stream");
-		}
-		return _document_size - _current_offset;
-	}
-
-   @Override
-	public void close() {
-		_closed = true;
-	}
-
-   @Override
-	public void mark(int ignoredReadlimit) {
-		_marked_offset = _current_offset;
-	}
-
-	private DataInputBlock getDataInputBlock(int offset) {
-		return _document.getDataInputBlock(offset);
-	}
-
-   @Override
-	public int read() throws IOException {
-		dieIfClosed();
-		if (atEOD()) {
-			return EOF;
-		}
-		int result = _currentBlock.readUByte();
-		_current_offset++;
-		if (_currentBlock.available() < 1) {
-			_currentBlock = getDataInputBlock(_current_offset);
-		}
-		return result;
-	}
-
-   @Override
-	public int read(byte[] b, int off, int len) throws IOException {
-		dieIfClosed();
-		if (b == null) {
-			throw new IllegalArgumentException("buffer must not be null");
-		}
-		if (off < 0 || len < 0 || b.length < off + len) {
-			throw new IndexOutOfBoundsException("can't read past buffer boundaries");
-		}
-		if (len == 0) {
-			return 0;
-		}
-		if (atEOD()) {
-			return EOF;
-		}
-		int limit = Math.min(available(), len);
-		readFully(b, off, limit);
-		return limit;
-	}
-
-	/**
-	 * Repositions this stream to the position at the time the mark() method was
-	 * last called on this input stream. If mark() has not been called this
-	 * method repositions the stream to its beginning.
-	 */
-   @Override
-	public void reset() {
-		_current_offset = _marked_offset;
-		_currentBlock = getDataInputBlock(_current_offset);
-	}
-
-   @Override
-	public long skip(long n) throws IOException {
-		dieIfClosed();
-		if (n < 0) {
-			return 0;
-		}
-		int new_offset = _current_offset + (int) n;
-
-		if (new_offset < _current_offset) {
-
-			// wrap around in converting a VERY large long to an int
-			new_offset = _document_size;
-		} else if (new_offset > _document_size) {
-			new_offset = _document_size;
-		}
-		long rval = new_offset - _current_offset;
-
-		_current_offset = new_offset;
-		_currentBlock = getDataInputBlock(_current_offset);
-		return rval;
-	}
-
-	private void dieIfClosed() throws IOException {
-		if (_closed) {
-			throw new IOException("cannot perform requested operation on a closed stream");
-		}
-	}
-
-	private boolean atEOD() {
-		return _current_offset == _document_size;
-	}
-
-	private void checkAvaliable(int requestedSize) {
-		if (_closed) {
-			throw new IllegalStateException("cannot perform requested operation on a closed stream");
-		}
-		if (requestedSize > _document_size - _current_offset) {
-			throw new RuntimeException("Buffer underrun - requested " + requestedSize
-					+ " bytes but " + (_document_size - _current_offset) + " was available");
-		}
-	}
-
-   @Override
-	public byte readByte() {
-		return (byte) readUByte();
-	}
-
-   @Override
-	public double readDouble() {
-		return Double.longBitsToDouble(readLong());
-	}
-
-   @Override
-	public short readShort() {
-		return (short) readUShort();
-	}
-
-   @Override
-	public void readFully(byte[] buf, int off, int len) {
-		checkAvaliable(len);
-		int blockAvailable = _currentBlock.available();
-		if (blockAvailable > len) {
-			_currentBlock.readFully(buf, off, len);
-			_current_offset += len;
-			return;
-		}
-		// else read big amount in chunks
-		int remaining = len;
-		int writePos = off;
-		while (remaining > 0) {
-			boolean blockIsExpiring = remaining >= blockAvailable;
-			int reqSize;
-			if (blockIsExpiring) {
-				reqSize = blockAvailable;
-			} else {
-				reqSize = remaining;
-			}
-			_currentBlock.readFully(buf, writePos, reqSize);
-			remaining -= reqSize;
-			writePos += reqSize;
-			_current_offset += reqSize;
-			if (blockIsExpiring) {
-				if (_current_offset == _document_size) {
-					if (remaining > 0) {
-						throw new IllegalStateException(
-								"reached end of document stream unexpectedly");
-					}
-					_currentBlock = null;
-					break;
-				}
-				_currentBlock = getDataInputBlock(_current_offset);
-				blockAvailable = _currentBlock.available();
-			}
-		}
-	}
-
-   @Override
-	public long readLong() {
-		checkAvaliable(SIZE_LONG);
-		int blockAvailable = _currentBlock.available();
-		long result;
-		if (blockAvailable > SIZE_LONG) {
-			result = _currentBlock.readLongLE();
-		} else {
-			DataInputBlock nextBlock = getDataInputBlock(_current_offset + blockAvailable);
-			if (blockAvailable == SIZE_LONG) {
-				result = _currentBlock.readLongLE();
-			} else {
-				result = nextBlock.readLongLE(_currentBlock, blockAvailable);
-			}
-			_currentBlock = nextBlock;
-		}
-		_current_offset += SIZE_LONG;
-		return result;
-	}
-
-   @Override
-	public int readInt() {
-		checkAvaliable(SIZE_INT);
-		int blockAvailable = _currentBlock.available();
-		int result;
-		if (blockAvailable > SIZE_INT) {
-			result = _currentBlock.readIntLE();
-		} else {
-			DataInputBlock nextBlock = getDataInputBlock(_current_offset + blockAvailable);
-			if (blockAvailable == SIZE_INT) {
-				result = _currentBlock.readIntLE();
-			} else {
-				result = nextBlock.readIntLE(_currentBlock, blockAvailable);
-			}
-			_currentBlock = nextBlock;
-		}
-		_current_offset += SIZE_INT;
-		return result;
-	}
-
-   @Override
-	public int readUShort() {
-		checkAvaliable(SIZE_SHORT);
-		int blockAvailable = _currentBlock.available();
-		int result;
-		if (blockAvailable > SIZE_SHORT) {
-			result = _currentBlock.readUShortLE();
-		} else {
-			DataInputBlock nextBlock = getDataInputBlock(_current_offset + blockAvailable);
-			if (blockAvailable == SIZE_SHORT) {
-				result = _currentBlock.readUShortLE();
-			} else {
-				result = nextBlock.readUShortLE(_currentBlock);
-			}
-			_currentBlock = nextBlock;
-		}
-		_current_offset += SIZE_SHORT;
-		return result;
-	}
-
-   @Override
-	public int readUByte() {
-		checkAvaliable(1);
-		int result = _currentBlock.readUByte();
-		_current_offset++;
-		if (_currentBlock.available() < 1) {
-			_currentBlock = getDataInputBlock(_current_offset);
-		}
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSDocument.java b/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSDocument.java
deleted file mode 100644
index a7479f3..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSDocument.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.poifs.property.DocumentProperty;
-import org.apache.poi.poifs.property.Property;
-import org.apache.poi.poifs.storage.BlockWritable;
-import org.apache.poi.poifs.storage.DataInputBlock;
-import org.apache.poi.poifs.storage.DocumentBlock;
-import org.apache.poi.poifs.storage.ListManagedBlock;
-import org.apache.poi.poifs.storage.RawDataBlock;
-import org.apache.poi.poifs.storage.SmallDocumentBlock;
-import org.apache.poi.util.HexDump;
-
-/**
- * This class manages a document in a old-style 
- *  OPOIFS filesystem.
- */
-public final class OPOIFSDocument implements BATManaged, BlockWritable, POIFSViewable  {
-	private static final DocumentBlock[] EMPTY_BIG_BLOCK_ARRAY = { };
-	private static final SmallDocumentBlock[] EMPTY_SMALL_BLOCK_ARRAY = { };
-	private DocumentProperty _property;
-	private int _size;
-	
-   private final POIFSBigBlockSize _bigBigBlockSize;
-
-	// one of these stores will be valid
-	private SmallBlockStore  _small_store;
-	private BigBlockStore	 _big_store;
-	
-		/**
-	 * Constructor from large blocks
-	 *
-	 * @param name the name of the POIFSDocument
-	 * @param blocks the big blocks making up the POIFSDocument
-	 * @param length the actual length of the POIFSDocument
-	 */
-	public OPOIFSDocument(String name, RawDataBlock[] blocks, int length) throws IOException {
-		_size = length;
-		if(blocks.length == 0) {
-		   _bigBigBlockSize = POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS;
-		} else {
-		   _bigBigBlockSize = (blocks[0].getBigBlockSize() == POIFSConstants.SMALLER_BIG_BLOCK_SIZE ?
-		         POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS : 
-		         POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS
-		   );
-		}
-		
-		_big_store = new BigBlockStore(_bigBigBlockSize, convertRawBlocksToBigBlocks(blocks));
-		_property = new DocumentProperty(name, _size);
-		_small_store = new SmallBlockStore(_bigBigBlockSize, EMPTY_SMALL_BLOCK_ARRAY);
-		_property.setDocument(this);
-	}
-
-	// TODO - awkward typing going on here
-	private static DocumentBlock[] convertRawBlocksToBigBlocks(ListManagedBlock[] blocks) throws IOException {
-		DocumentBlock[] result = new DocumentBlock[blocks.length];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new DocumentBlock((RawDataBlock)blocks[i]);
-		}
-		return result;
-	}
-	private static SmallDocumentBlock[] convertRawBlocksToSmallBlocks(ListManagedBlock[] blocks) {
-		if (blocks instanceof SmallDocumentBlock[]) {
-			return (SmallDocumentBlock[]) blocks;
-		}
-		SmallDocumentBlock[] result = new SmallDocumentBlock[blocks.length];
-		System.arraycopy(blocks, 0, result, 0, blocks.length);
-		return result;
-	}
-
-	/**
-	 * Constructor from small blocks
-	 *
-	 * @param name the name of the POIFSDocument
-	 * @param blocks the small blocks making up the POIFSDocument
-	 * @param length the actual length of the POIFSDocument
-	 */
-	public OPOIFSDocument(String name, SmallDocumentBlock[] blocks, int length) {
-		_size = length;
-		
-		if(blocks.length == 0) {
-		   _bigBigBlockSize = POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS;
-		} else {
-		   _bigBigBlockSize = blocks[0].getBigBlockSize();
-		}
-
-		_big_store = new BigBlockStore(_bigBigBlockSize, EMPTY_BIG_BLOCK_ARRAY);
-		_property = new DocumentProperty(name, _size);
-		_small_store = new SmallBlockStore(_bigBigBlockSize, blocks);
-		_property.setDocument(this);
-	}
-
-	/**
-	 * Constructor from small blocks
-	 *
-	 * @param name the name of the POIFSDocument
-	 * @param blocks the small blocks making up the POIFSDocument
-	 * @param length the actual length of the POIFSDocument
-	 */
-	public OPOIFSDocument(String name, POIFSBigBlockSize bigBlockSize, ListManagedBlock[] blocks, int length) throws IOException {
-		_size = length;
-		_bigBigBlockSize = bigBlockSize;
-		_property = new DocumentProperty(name, _size);
-		_property.setDocument(this);
-		if (Property.isSmall(_size)) {
-			_big_store = new BigBlockStore(bigBlockSize,EMPTY_BIG_BLOCK_ARRAY);
-			_small_store = new SmallBlockStore(bigBlockSize,convertRawBlocksToSmallBlocks(blocks));
-		} else {
-			_big_store = new BigBlockStore(bigBlockSize,convertRawBlocksToBigBlocks(blocks));
-			_small_store = new SmallBlockStore(bigBlockSize,EMPTY_SMALL_BLOCK_ARRAY);
-		}
-	}
-	public OPOIFSDocument(String name, ListManagedBlock[] blocks, int length) throws IOException {
-	   this(name, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, blocks, length);
-	}
-
-	/**
-	 * Constructor
-	 *
-	 * @param name the name of the POIFSDocument
-	 * @param stream the InputStream we read data from
-	 */
-	public OPOIFSDocument(String name, POIFSBigBlockSize bigBlockSize, InputStream stream) throws IOException {
-		List<DocumentBlock> blocks = new ArrayList<DocumentBlock>();
-
-		_size = 0;
-		_bigBigBlockSize = bigBlockSize;
-		while (true) {
-			DocumentBlock block = new DocumentBlock(stream, bigBlockSize);
-			int blockSize = block.size();
-
-			if (blockSize > 0) {
-				blocks.add(block);
-				_size += blockSize;
-			}
-			if (block.partiallyRead()) {
-				break;
-			}
-		}
-		DocumentBlock[] bigBlocks = blocks.toArray(new DocumentBlock[blocks.size()]);
-
-		_big_store = new BigBlockStore(bigBlockSize,bigBlocks);
-		_property = new DocumentProperty(name, _size);
-		_property.setDocument(this);
-		if (_property.shouldUseSmallBlocks()) {
-			_small_store = new SmallBlockStore(bigBlockSize,SmallDocumentBlock.convert(bigBlockSize,bigBlocks, _size));
-			_big_store = new BigBlockStore(bigBlockSize,new DocumentBlock[0]);
-		} else {
-			_small_store = new SmallBlockStore(bigBlockSize,EMPTY_SMALL_BLOCK_ARRAY);
-		}
-	}
-	public OPOIFSDocument(String name, InputStream stream) throws IOException {
-	   this(name, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, stream);
-	}
-
-	/**
-	 * Constructor
-	 *
-	 * @param name the name of the POIFSDocument
-	 * @param size the length of the POIFSDocument
-	 * @param path the path of the POIFSDocument
-	 * @param writer the writer who will eventually write the document contents
-	 */
-	public OPOIFSDocument(String name, int size, POIFSBigBlockSize bigBlockSize, POIFSDocumentPath path, POIFSWriterListener writer) {
-		_size = size;
-		_bigBigBlockSize = bigBlockSize;
-		_property = new DocumentProperty(name, _size);
-		_property.setDocument(this);
-		if (_property.shouldUseSmallBlocks()) {
-			_small_store = new SmallBlockStore(_bigBigBlockSize, path, name, size, writer);
-			_big_store = new BigBlockStore(_bigBigBlockSize, EMPTY_BIG_BLOCK_ARRAY);
-		} else {
-			_small_store = new SmallBlockStore(_bigBigBlockSize, EMPTY_SMALL_BLOCK_ARRAY);
-			_big_store = new BigBlockStore(_bigBigBlockSize, path, name, size, writer);
-		}
-	}
-	public OPOIFSDocument(String name, int size, POIFSDocumentPath path, POIFSWriterListener writer) {
-	   this(name, size, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, path, writer);
-	}
-
-	/**
-	 * @return array of SmallDocumentBlocks; may be empty, cannot be null
-	 */
-	public SmallDocumentBlock[] getSmallBlocks() {
-		return _small_store.getBlocks();
-	}
-
-	/**
-	 * @return size of the document
-	 */
-	public int getSize() {
-		return _size;
-	}
-
-	/**
-	 * read data from the internal stores
-	 *
-	 * @param buffer the buffer to write to
-	 * @param offset the offset into our storage to read from
-	 * This method is currently (Oct 2008) only used by test code. Perhaps it can be deleted
-	 */
-	void read(byte[] buffer, int offset) {
-		int len = buffer.length;
-
-		DataInputBlock currentBlock = getDataInputBlock(offset);
-
-		int blockAvailable = currentBlock.available();
-		if (blockAvailable > len) {
-			currentBlock.readFully(buffer, 0, len);
-			return;
-		}
-		// else read big amount in chunks
-		int remaining = len;
-		int writePos = 0;
-		int currentOffset = offset;
-		while (remaining > 0) {
-			boolean blockIsExpiring = remaining >= blockAvailable;
-			int reqSize;
-			if (blockIsExpiring) {
-				reqSize = blockAvailable;
-			} else {
-				reqSize = remaining;
-			}
-			currentBlock.readFully(buffer, writePos, reqSize);
-			remaining-=reqSize;
-			writePos+=reqSize;
-			currentOffset += reqSize;
-			if (blockIsExpiring) {
-				if (currentOffset == _size) {
-					if (remaining > 0) {
-						throw new IllegalStateException("reached end of document stream unexpectedly");
-					}
-					currentBlock = null;
-					break;
-				}
-				currentBlock = getDataInputBlock(currentOffset);
-				blockAvailable = currentBlock.available();
-			}
-		}
-	}
-
-	/**
-	 * @return <code>null</code> if <tt>offset</tt> points to the end of the document stream
-	 */
-	DataInputBlock getDataInputBlock(int offset) {
-		if (offset >= _size) {
-			if (offset > _size) {
-				throw new RuntimeException("Request for Offset " + offset + " doc size is " + _size);
-			}
-			return null;
-		}
-		if (_property.shouldUseSmallBlocks()) {
-			return SmallDocumentBlock.getDataInputBlock(_small_store.getBlocks(), offset);
-		}
-		return DocumentBlock.getDataInputBlock(_big_store.getBlocks(), offset);
-	}
-
-	/**
-	 * @return the instance's DocumentProperty
-	 */
-
-	DocumentProperty getDocumentProperty() {
-		return _property;
-	}
-
-	/* ********** START implementation of BlockWritable ********** */
-
-	/**
-	 * Write the storage to an OutputStream
-	 *
-	 * @param stream the OutputStream to which the stored data should be written
-	 */
-	public void writeBlocks(OutputStream stream) throws IOException {
-		_big_store.writeBlocks(stream);
-	}
-
-	/* **********  END  implementation of BlockWritable ********** */
-	/* ********** START implementation of BATManaged ********** */
-
-	/**
-	 * Return the number of BigBlock's this instance uses
-	 *
-	 * @return count of BigBlock instances
-	 */
-	public int countBlocks() {
-		return _big_store.countBlocks();
-	}
-
-	/**
-	 * Set the start block for this instance
-	 *
-	 * @param index index into the array of blocks making up the filesystem
-	 */
-	public void setStartBlock(int index) {
-		_property.setStartBlock(index);
-	}
-
-	/* **********  END  implementation of BATManaged ********** */
-	/* ********** START begin implementation of POIFSViewable ********** */
-
-	/**
-	 * Get an array of objects, some of which may implement POIFSViewable
-	 *
-	 * @return an array of Object; may not be null, but may be empty
-	 */
-	public Object[] getViewableArray() {
-		String result = "<NO DATA>";
-
-		try {
-			BlockWritable[] blocks = null;
-
-			if (_big_store.isValid()) {
-				blocks = _big_store.getBlocks();
-			} else if (_small_store.isValid()) {
-				blocks = _small_store.getBlocks();
-			}
-			if (blocks != null) {
-	            ByteArrayOutputStream output = new ByteArrayOutputStream();
-				for (BlockWritable bw : blocks) {
-					bw.writeBlocks(output);
-				}
-				int length = Math.min(output.size(), _property.getSize());
-				result = HexDump.dump(output.toByteArray(), 0, 0, length);
-			}
-		} catch (IOException e) {
-			result = e.getMessage();
-		}
-		return new String[]{ result };
-	}
-
-	/**
-	 * Get an Iterator of objects, some of which may implement POIFSViewable
-	 *
-	 * @return an Iterator; may not be null, but may have an empty back end
-	 *		 store
-	 */
-	public Iterator<Object> getViewableIterator() {
-		return Collections.emptyList().iterator();
-	}
-
-	/**
-	 * Give viewers a hint as to whether to call getViewableArray or
-	 * getViewableIterator
-	 *
-	 * @return <code>true</code> if a viewer should call getViewableArray,
-	 *		 <code>false</code> if a viewer should call getViewableIterator
-	 */
-	public boolean preferArray() {
-		return true;
-	}
-
-	/**
-	 * Provides a short description of the object, to be used when a
-	 * POIFSViewable object has not provided its contents.
-	 *
-	 * @return short description
-	 */
-	public String getShortDescription() {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append("Document: \"").append(_property.getName()).append("\"");
-		buffer.append(" size = ").append(getSize());
-		return buffer.toString();
-	}
-
-	/* **********  END  begin implementation of POIFSViewable ********** */
-	private static final class SmallBlockStore {
-		private SmallDocumentBlock[] _smallBlocks;
-		private final POIFSDocumentPath _path;
-		private final String _name;
-		private final int _size;
-		private final POIFSWriterListener _writer;
-		private final POIFSBigBlockSize _bigBlockSize;
-
-		/**
-		 * Constructor
-		 *
-		 * @param blocks blocks to construct the store from
-		 */
-		SmallBlockStore(POIFSBigBlockSize bigBlockSize, SmallDocumentBlock[] blocks) {
-		   _bigBlockSize = bigBlockSize;
-			_smallBlocks = blocks.clone();
-			this._path = null;
-			this._name = null;
-			this._size = -1;
-			this._writer = null;
-		}
-
-		/**
-		 * Constructor for a small block store that will be written later
-		 *
-		 * @param path path of the document
-		 * @param name name of the document
-		 * @param size length of the document
-		 * @param writer the object that will eventually write the document
-		 */
-		SmallBlockStore(POIFSBigBlockSize bigBlockSize, POIFSDocumentPath path, 
-		                String name, int size, POIFSWriterListener writer) {
-		   _bigBlockSize = bigBlockSize;
-			_smallBlocks = new SmallDocumentBlock[0];
-			this._path = path;
-			this._name = name;
-			this._size = size;
-			this._writer = writer;
-		}
-
-		/**
-		 * @return <code>true</code> if this store is a valid source of data
-		 */
-		boolean isValid() {
-			return _smallBlocks.length > 0 || _writer != null;
-		}
-
-		/**
-		 * @return the SmallDocumentBlocks
-		 */
-		SmallDocumentBlock[] getBlocks() {
-			if (isValid() && _writer != null) {
-				ByteArrayOutputStream stream = new ByteArrayOutputStream(_size);
-				DocumentOutputStream dstream = new DocumentOutputStream(stream, _size);
-
-				_writer.processPOIFSWriterEvent(new POIFSWriterEvent(dstream, _path, _name, _size));
-				_smallBlocks = SmallDocumentBlock.convert(_bigBlockSize, stream.toByteArray(), _size);
-			}
-			return _smallBlocks;
-		}
-	} // end private class SmallBlockStore
-
-	private static final class BigBlockStore {
-		private DocumentBlock[] bigBlocks;
-		private final POIFSDocumentPath _path;
-		private final String _name;
-		private final int _size;
-		private final POIFSWriterListener _writer;
-      private final POIFSBigBlockSize _bigBlockSize;
-
-		/**
-		 * Constructor
-		 *
-		 * @param blocks the blocks making up the store
-		 */
-		BigBlockStore(POIFSBigBlockSize bigBlockSize, DocumentBlock[] blocks) {
-		   _bigBlockSize = bigBlockSize;
-			bigBlocks = blocks.clone();
-			_path = null;
-			_name = null;
-			_size = -1;
-			_writer = null;
-		}
-
-		/**
-		 * Constructor for a big block store that will be written later
-		 *
-		 * @param path path of the document
-		 * @param name name of the document
-		 * @param size length of the document
-		 * @param writer the object that will eventually write the document
-		 */
-		BigBlockStore(POIFSBigBlockSize bigBlockSize, POIFSDocumentPath path, 
-		              String name, int size, POIFSWriterListener writer) {
-		   _bigBlockSize = bigBlockSize;
-			bigBlocks = new DocumentBlock[0];
-			_path = path;
-			_name = name;
-			_size = size;
-			_writer = writer;
-		}
-
-		/**
-		 * @return <code>true</code> if this store is a valid source of data
-		 */
-		boolean isValid() {
-			return bigBlocks.length > 0 || _writer != null;
-		}
-
-		/**
-		 * @return the DocumentBlocks
-		 */
-		DocumentBlock[] getBlocks() {
-			if (isValid() && _writer != null) {
-				ByteArrayOutputStream stream = new ByteArrayOutputStream(_size);
-				DocumentOutputStream dstream = new DocumentOutputStream(stream, _size);
-
-				_writer.processPOIFSWriterEvent(new POIFSWriterEvent(dstream, _path, _name, _size));
-				bigBlocks = DocumentBlock.convert(_bigBlockSize, stream.toByteArray(), _size);
-			}
-			return bigBlocks;
-		}
-
-		/**
-		 * write the blocks to a stream
-		 *
-		 * @param stream the stream to which the data is to be written
-		 */
-		void writeBlocks(OutputStream stream) throws IOException {
-			if (isValid()) {
-				if (_writer != null) {
-					DocumentOutputStream dstream = new DocumentOutputStream(stream, _size);
-
-					_writer.processPOIFSWriterEvent(new POIFSWriterEvent(dstream, _path, _name, _size));
-					dstream.writeFiller(countBlocks() * _bigBlockSize.getBigBlockSize(),
-							DocumentBlock.getFillByte());
-				} else {
-					for (int k = 0; k < bigBlocks.length; k++) {
-						bigBlocks[k].writeBlocks(stream);
-					}
-				}
-			}
-		}
-
-		/**
-		 * @return number of big blocks making up this document
-		 */
-		int countBlocks() {
-
-			if (isValid()) {
-				if (_writer == null) {
-					return bigBlocks.length;
-				}
-				return (_size + _bigBlockSize.getBigBlockSize() - 1)
-							/ _bigBlockSize.getBigBlockSize();
-			}
-			return 0;
-		}
-	} // end private class BigBlockStore
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java b/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java
deleted file mode 100644
index b0afaa3..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java
+++ /dev/null
@@ -1,607 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.Property;
-import org.apache.poi.poifs.property.PropertyTable;
-import org.apache.poi.poifs.storage.BATBlock;
-import org.apache.poi.poifs.storage.BlockAllocationTableReader;
-import org.apache.poi.poifs.storage.BlockAllocationTableWriter;
-import org.apache.poi.poifs.storage.BlockList;
-import org.apache.poi.poifs.storage.BlockWritable;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.poifs.storage.HeaderBlockConstants;
-import org.apache.poi.poifs.storage.HeaderBlockWriter;
-import org.apache.poi.poifs.storage.RawDataBlockList;
-import org.apache.poi.poifs.storage.SmallBlockTableReader;
-import org.apache.poi.poifs.storage.SmallBlockTableWriter;
-import org.apache.poi.util.CloseIgnoringInputStream;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LongField;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * <p>This is the main class of the POIFS system; it manages the entire
- * life cycle of the filesystem.</p>
- * <p>This is the older version, which uses more memory, and doesn't
- *  support in-place writes.</p>
- */
-public class OPOIFSFileSystem
-    implements POIFSViewable
-{
-	private static final POILogger _logger =
-		POILogFactory.getLogger(OPOIFSFileSystem.class);
-
-    /**
-     * Convenience method for clients that want to avoid the auto-close behaviour of the constructor.
-     */
-    public static InputStream createNonClosingInputStream(InputStream is) {
-        return new CloseIgnoringInputStream(is);
-    }
-
-    private PropertyTable _property_table;
-    private List<OPOIFSDocument> _documents;
-    private DirectoryNode _root;
-
-    /**
-     * What big block size the file uses. Most files
-     *  use 512 bytes, but a few use 4096
-     */
-    private POIFSBigBlockSize bigBlockSize = 
-       POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS;
-
-    /**
-     * Constructor, intended for writing
-     */
-    public OPOIFSFileSystem()
-    {
-        HeaderBlock header_block = new HeaderBlock(bigBlockSize);
-        _property_table = new PropertyTable(header_block);
-        _documents      = new ArrayList<OPOIFSDocument>();
-        _root           = null;
-    }
-
-    /**
-     * Create a OPOIFSFileSystem from an <tt>InputStream</tt>.  Normally the stream is read until
-     * EOF.  The stream is always closed.<p/>
-     *
-     * Some streams are usable after reaching EOF (typically those that return <code>true</code>
-     * for <tt>markSupported()</tt>).  In the unlikely case that the caller has such a stream
-     * <i>and</i> needs to use it after this constructor completes, a work around is to wrap the
-     * stream in order to trap the <tt>close()</tt> call.  A convenience method (
-     * <tt>createNonClosingInputStream()</tt>) has been provided for this purpose:
-     * <pre>
-     * InputStream wrappedStream = OPOIFSFileSystem.createNonClosingInputStream(is);
-     * HSSFWorkbook wb = new HSSFWorkbook(wrappedStream);
-     * is.reset();
-     * doSomethingElse(is);
-     * </pre>
-     * Note also the special case of <tt>ByteArrayInputStream</tt> for which the <tt>close()</tt>
-     * method does nothing.
-     * <pre>
-     * ByteArrayInputStream bais = ...
-     * HSSFWorkbook wb = new HSSFWorkbook(bais); // calls bais.close() !
-     * bais.reset(); // no problem
-     * doSomethingElse(bais);
-     * </pre>
-     *
-     * @param stream the InputStream from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-
-    public OPOIFSFileSystem(InputStream stream)
-        throws IOException
-    {
-        this();
-        boolean success = false;
-
-        HeaderBlock header_block;
-        RawDataBlockList data_blocks;
-        try {
-            // read the header block from the stream
-            header_block = new HeaderBlock(stream);
-            bigBlockSize = header_block.getBigBlockSize();
-
-            // read the rest of the stream into blocks
-            data_blocks = new RawDataBlockList(stream, bigBlockSize);
-            success = true;
-        } finally {
-            closeInputStream(stream, success);
-        }
-
-
-        // set up the block allocation table (necessary for the
-        // data_blocks to be manageable
-        new BlockAllocationTableReader(header_block.getBigBlockSize(),
-                                       header_block.getBATCount(),
-                                       header_block.getBATArray(),
-                                       header_block.getXBATCount(),
-                                       header_block.getXBATIndex(),
-                                       data_blocks);
-
-        // get property table from the document
-        PropertyTable properties =
-            new PropertyTable(header_block, data_blocks);
-
-        // init documents
-        processProperties(
-        		SmallBlockTableReader.getSmallDocumentBlocks(
-        		      bigBlockSize, data_blocks, properties.getRoot(),
-        				header_block.getSBATStart()
-        		),
-        		data_blocks,
-        		properties.getRoot().getChildren(),
-        		null,
-        		header_block.getPropertyStart()
-        );
-
-        // For whatever reason CLSID of root is always 0.
-        getRoot().setStorageClsid(properties.getRoot().getStorageClsid());
-    }
-    /**
-     * @param stream the stream to be closed
-     * @param success <code>false</code> if an exception is currently being thrown in the calling method
-     */
-    protected void closeInputStream(InputStream stream, boolean success) {
-
-        if(stream.markSupported() && !(stream instanceof ByteArrayInputStream)) {
-            String msg = "POIFS is closing the supplied input stream of type ("
-                    + stream.getClass().getName() + ") which supports mark/reset.  "
-                    + "This will be a problem for the caller if the stream will still be used.  "
-                    + "If that is the case the caller should wrap the input stream to avoid this close logic.  "
-                    + "This warning is only temporary and will not be present in future versions of POI.";
-            _logger.log(POILogger.WARN, msg);
-        }
-        try {
-            stream.close();
-        } catch (IOException e) {
-            if(success) {
-                throw new RuntimeException(e);
-            }
-            // else not success? Try block did not complete normally
-            // just print stack trace and leave original ex to be thrown
-            _logger.log(POILogger.ERROR, "can't close input stream", e);
-        }
-    }
-
-    /**
-     * Checks that the supplied InputStream (which MUST
-     *  support mark and reset, or be a PushbackInputStream)
-     *  has a POIFS (OLE2) header at the start of it.
-     * If your InputStream does not support mark / reset,
-     *  then wrap it in a PushBackInputStream, then be
-     *  sure to always use that, and not the original!
-     * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
-     */
-    public static boolean hasPOIFSHeader(InputStream inp) throws IOException {
-        // We want to peek at the first 8 bytes
-        byte[] header = IOUtils.peekFirst8Bytes(inp);
-        return hasPOIFSHeader(header);
-    }
-    /**
-     * Checks if the supplied first 8 bytes of a stream / file
-     *  has a POIFS (OLE2) header.
-     */
-    public static boolean hasPOIFSHeader(byte[] header8Bytes) {
-        LongField signature = new LongField(HeaderBlockConstants._signature_offset, header8Bytes);
-
-        // Did it match the signature?
-        return (signature.get() == HeaderBlockConstants._signature);
-    }
-
-    /**
-     * Create a new document to be added to the root directory
-     *
-     * @param stream the InputStream from which the document's data
-     *               will be obtained
-     * @param name the name of the new POIFSDocument
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException on error creating the new POIFSDocument
-     */
-
-    public DocumentEntry createDocument(final InputStream stream,
-                                        final String name)
-        throws IOException
-    {
-        return getRoot().createDocument(name, stream);
-    }
-
-    /**
-     * create a new DocumentEntry in the root entry; the data will be
-     * provided later
-     *
-     * @param name the name of the new DocumentEntry
-     * @param size the size of the new DocumentEntry
-     * @param writer the writer of the new DocumentEntry
-     *
-     * @return the new DocumentEntry
-     *
-     * @exception IOException
-     */
-
-    public DocumentEntry createDocument(final String name, final int size,
-                                        final POIFSWriterListener writer)
-        throws IOException
-    {
-        return getRoot().createDocument(name, size, writer);
-    }
-
-    /**
-     * create a new DirectoryEntry in the root directory
-     *
-     * @param name the name of the new DirectoryEntry
-     *
-     * @return the new DirectoryEntry
-     *
-     * @exception IOException on name duplication
-     */
-
-    public DirectoryEntry createDirectory(final String name)
-        throws IOException
-    {
-        return getRoot().createDirectory(name);
-    }
-
-    /**
-     * Write the filesystem out
-     *
-     * @param stream the OutputStream to which the filesystem will be
-     *               written
-     *
-     * @exception IOException thrown on errors writing to the stream
-     */
-
-    public void writeFilesystem(final OutputStream stream)
-        throws IOException
-    {
-
-        // get the property table ready
-        _property_table.preWrite();
-
-        // create the small block store, and the SBAT
-        SmallBlockTableWriter      sbtw       =
-            new SmallBlockTableWriter(bigBlockSize, _documents, _property_table.getRoot());
-
-        // create the block allocation table
-        BlockAllocationTableWriter bat        =
-            new BlockAllocationTableWriter(bigBlockSize);
-
-        // create a list of BATManaged objects: the documents plus the
-        // property table and the small block table
-        List<Object> bm_objects = new ArrayList<Object>();
-
-        bm_objects.addAll(_documents);
-        bm_objects.add(_property_table);
-        bm_objects.add(sbtw);
-        bm_objects.add(sbtw.getSBAT());
-
-        // walk the list, allocating space for each and assigning each
-        // a starting block number
-        Iterator<Object> iter = bm_objects.iterator();
-
-        while (iter.hasNext())
-        {
-            BATManaged bmo         = ( BATManaged ) iter.next();
-            int        block_count = bmo.countBlocks();
-
-            if (block_count != 0)
-            {
-                bmo.setStartBlock(bat.allocateSpace(block_count));
-            }
-            else
-            {
-
-                // Either the BATManaged object is empty or its data
-                // is composed of SmallBlocks; in either case,
-                // allocating space in the BAT is inappropriate
-            }
-        }
-
-        // allocate space for the block allocation table and take its
-        // starting block
-        int               batStartBlock       = bat.createBlocks();
-
-        // get the extended block allocation table blocks
-        HeaderBlockWriter header_block_writer = new HeaderBlockWriter(bigBlockSize);
-        BATBlock[]        xbat_blocks         =
-            header_block_writer.setBATBlocks(bat.countBlocks(),
-                                             batStartBlock);
-
-        // set the property table start block
-        header_block_writer.setPropertyStart(_property_table.getStartBlock());
-
-        // set the small block allocation table start block
-        header_block_writer.setSBATStart(sbtw.getSBAT().getStartBlock());
-
-        // set the small block allocation table block count
-        header_block_writer.setSBATBlockCount(sbtw.getSBATBlockCount());
-
-        // the header is now properly initialized. Make a list of
-        // writers (the header block, followed by the documents, the
-        // property table, the small block store, the small block
-        // allocation table, the block allocation table, and the
-        // extended block allocation table blocks)
-        List<Object> writers = new ArrayList<Object>();
-
-        writers.add(header_block_writer);
-        writers.addAll(_documents);
-        writers.add(_property_table);
-        writers.add(sbtw);
-        writers.add(sbtw.getSBAT());
-        writers.add(bat);
-        for (int j = 0; j < xbat_blocks.length; j++)
-        {
-            writers.add(xbat_blocks[ j ]);
-        }
-
-        // now, write everything out
-        iter = writers.iterator();
-        while (iter.hasNext())
-        {
-            BlockWritable writer = ( BlockWritable ) iter.next();
-
-            writer.writeBlocks(stream);
-        }
-    }
-
-    /**
-     * read in a file and write it back out again
-     *
-     * @param args names of the files; arg[ 0 ] is the input file,
-     *             arg[ 1 ] is the output file
-     *
-     * @exception IOException
-     */
-
-    public static void main(String args[])
-        throws IOException
-    {
-        if (args.length != 2)
-        {
-            System.err.println(
-                "two arguments required: input filename and output filename");
-            System.exit(1);
-        }
-        FileInputStream  istream = new FileInputStream(args[ 0 ]);
-        FileOutputStream ostream = new FileOutputStream(args[ 1 ]);
-
-        new OPOIFSFileSystem(istream).writeFilesystem(ostream);
-        istream.close();
-        ostream.close();
-    }
-
-    /**
-     * get the root entry
-     *
-     * @return the root entry
-     */
-
-    public DirectoryNode getRoot()
-    {
-        if (_root == null)
-        {
-            _root = new DirectoryNode(_property_table.getRoot(), this, null);
-        }
-        return _root;
-    }
-
-    /**
-     * open a document in the root entry's list of entries
-     *
-     * @param documentName the name of the document to be opened
-     *
-     * @return a newly opened DocumentInputStream
-     *
-     * @exception IOException if the document does not exist or the
-     *            name is that of a DirectoryEntry
-     */
-
-    public DocumentInputStream createDocumentInputStream(
-            final String documentName)
-        throws IOException
-    {
-    	return getRoot().createDocumentInputStream(documentName);
-    }
-
-    /**
-     * add a new POIFSDocument
-     *
-     * @param document the POIFSDocument being added
-     */
-
-    void addDocument(final OPOIFSDocument document)
-    {
-        _documents.add(document);
-        _property_table.addProperty(document.getDocumentProperty());
-    }
-
-    /**
-     * add a new DirectoryProperty
-     *
-     * @param directory the DirectoryProperty being added
-     */
-
-    void addDirectory(final DirectoryProperty directory)
-    {
-        _property_table.addProperty(directory);
-    }
-
-    /**
-     * remove an entry
-     *
-     * @param entry to be removed
-     */
-
-    void remove(EntryNode entry)
-    {
-        _property_table.removeProperty(entry.getProperty());
-        if (entry.isDocumentEntry())
-        {
-            _documents.remove((( DocumentNode ) entry).getDocument());
-        }
-    }
-
-    private void processProperties(final BlockList small_blocks,
-                                   final BlockList big_blocks,
-                                   final Iterator<Property> properties,
-                                   final DirectoryNode dir,
-                                   final int headerPropertiesStartAt)
-        throws IOException
-    {
-        while (properties.hasNext())
-        {
-            Property      property = properties.next();
-            String        name     = property.getName();
-            DirectoryNode parent   = (dir == null)
-                                     ? (( DirectoryNode ) getRoot())
-                                     : dir;
-
-            if (property.isDirectory())
-            {
-                DirectoryNode new_dir =
-                    ( DirectoryNode ) parent.createDirectory(name);
-
-                new_dir.setStorageClsid( property.getStorageClsid() );
-
-                processProperties(
-                    small_blocks, big_blocks,
-                    (( DirectoryProperty ) property).getChildren(),
-                    new_dir, headerPropertiesStartAt);
-            }
-            else
-            {
-                int           startBlock = property.getStartBlock();
-                int           size       = property.getSize();
-                OPOIFSDocument document  = null;
-
-                if (property.shouldUseSmallBlocks())
-                {
-                    document =
-                        new OPOIFSDocument(name,
-                                           small_blocks.fetchBlocks(startBlock, headerPropertiesStartAt),
-                                           size);
-                }
-                else
-                {
-                    document =
-                        new OPOIFSDocument(name,
-                                           big_blocks.fetchBlocks(startBlock, headerPropertiesStartAt),
-                                           size);
-                }
-                parent.createDocument(document);
-            }
-        }
-    }
-
-    /* ********** START begin implementation of POIFSViewable ********** */
-
-    /**
-     * Get an array of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an array of Object; may not be null, but may be empty
-     */
-
-    public Object [] getViewableArray()
-    {
-        if (preferArray())
-        {
-            return (( POIFSViewable ) getRoot()).getViewableArray();
-        }
-        return new Object[ 0 ];
-    }
-
-    /**
-     * Get an Iterator of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an Iterator; may not be null, but may have an empty
-     * back end store
-     */
-
-    public Iterator<Object> getViewableIterator()
-    {
-        if (!preferArray())
-        {
-            return (( POIFSViewable ) getRoot()).getViewableIterator();
-        }
-        return Collections.emptyList().iterator();
-    }
-
-    /**
-     * Give viewers a hint as to whether to call getViewableArray or
-     * getViewableIterator
-     *
-     * @return true if a viewer should call getViewableArray, false if
-     *         a viewer should call getViewableIterator
-     */
-
-    public boolean preferArray()
-    {
-        return (( POIFSViewable ) getRoot()).preferArray();
-    }
-
-    /**
-     * Provides a short description of the object, to be used when a
-     * POIFSViewable object has not provided its contents.
-     *
-     * @return short description
-     */
-
-    public String getShortDescription()
-    {
-        return "POIFS FileSystem";
-    }
-
-    /**
-     * @return The Big Block size, normally 512 bytes, sometimes 4096 bytes
-     */
-    public int getBigBlockSize() {
-    	return bigBlockSize.getBigBlockSize();
-    }
-    /**
-     * @return The Big Block size, normally 512 bytes, sometimes 4096 bytes
-     */
-    public POIFSBigBlockSize getBigBlockSizeDetails() {
-      return bigBlockSize;
-    }
-
-    /* **********  END  begin implementation of POIFSViewable ********** */
-}   // end public class OPOIFSFileSystem
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java b/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
deleted file mode 100644
index ac2404b..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.poifs.filesystem;
-
-import org.apache.poi.UnsupportedFileFormatException;
-
-/**
- * This exception is thrown when we try to open a file that's actually
- *  an Office 2007+ XML file, rather than an OLE2 file (which is what
- *  POIFS works with)
- */
-public class OfficeXmlFileException extends UnsupportedFileFormatException {
-	public OfficeXmlFileException(String s) {
-		super(s);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java b/trunk/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java
deleted file mode 100644
index d11841d..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Represents an Ole10Native record which is wrapped around certain binary
- * files being embedded in OLE2 documents.
- *
- * @author Rainer Schwarze
- */
-public class Ole10Native {
-
-    public static final String OLE10_NATIVE = "\u0001Ole10Native";
-    protected static final String ISO1 = "ISO-8859-1";
-  
-    // (the fields as they appear in the raw record:)
-    private int totalSize;             // 4 bytes, total size of record not including this field
-    private short flags1 = 2;          // 2 bytes, unknown, mostly [02 00]
-    private String label;              // ASCIIZ, stored in this field without the terminating zero
-    private String fileName;           // ASCIIZ, stored in this field without the terminating zero
-    private short flags2 = 0;          // 2 bytes, unknown, mostly [00 00]
-    private short unknown1 = 3;        // see below
-    private String command;            // ASCIIZ, stored in this field without the terminating zero
-    private byte[] dataBuffer;         // varying size, the actual native data
-    private short flags3 = 0;          // some final flags? or zero terminators?, sometimes not there
-  
-    /**
-     * the field encoding mode - merely a try-and-error guess ...
-     **/ 
-    private enum EncodingMode {
-        /**
-         * the data is stored in parsed format - including label, command, etc.
-         */
-        parsed,
-        /**
-         * the data is stored raw after the length field
-         */
-        unparsed,
-        /**
-         * the data is stored raw after the length field and the flags1 field
-         */
-        compact
-    }
-    
-    private EncodingMode mode;
-
-    
-    
-    /**
-     * Creates an instance of this class from an embedded OLE Object. The OLE Object is expected
-     * to include a stream &quot;{01}Ole10Native&quot; which contains the actual
-     * data relevant for this class.
-     *
-     * @param poifs POI Filesystem object
-     * @return Returns an instance of this class
-     * @throws IOException on IO error
-     * @throws Ole10NativeException on invalid or unexcepted data format
-     */
-    public static Ole10Native createFromEmbeddedOleObject(POIFSFileSystem poifs) throws IOException, Ole10NativeException {
-       return createFromEmbeddedOleObject(poifs.getRoot());
-    }
-    
-    /**
-     * Creates an instance of this class from an embedded OLE Object. The OLE Object is expected
-     * to include a stream &quot;{01}Ole10Native&quot; which contains the actual
-     * data relevant for this class.
-     *
-     * @param directory POI Filesystem object
-     * @return Returns an instance of this class
-     * @throws IOException on IO error
-     * @throws Ole10NativeException on invalid or unexcepted data format
-     */
-    public static Ole10Native createFromEmbeddedOleObject(DirectoryNode directory) throws IOException, Ole10NativeException {
-       DocumentEntry nativeEntry = 
-          (DocumentEntry)directory.getEntry(OLE10_NATIVE);
-       byte[] data = new byte[nativeEntry.getSize()];
-       int readBytes = directory.createDocumentInputStream(nativeEntry).read(data);
-       assert(readBytes == data.length);
-  
-       return new Ole10Native(data, 0);
-    }
-    
-    /**
-     * Creates an instance and fills the fields based on ... the fields
-     */
-    public Ole10Native(String label, String filename, String command, byte[] data) {
-       setLabel(label);
-       setFileName(filename);
-       setCommand(command);
-       setDataBuffer(data);
-       mode = EncodingMode.parsed;
-    }
-    
-    /**
-     * Creates an instance and fills the fields based on the data in the given buffer.
-     *
-     * @param data   The buffer containing the Ole10Native record
-     * @param offset The start offset of the record in the buffer
-     * @throws Ole10NativeException on invalid or unexcepted data format
-     */
-    public Ole10Native(byte[] data, int offset) throws Ole10NativeException {
-        int ofs = offset; // current offset, initialized to start
-        
-        if (data.length < offset + 2) {
-            throw new Ole10NativeException("data is too small");
-        }
-        
-        totalSize = LittleEndian.getInt(data, ofs);
-        ofs += LittleEndianConsts.INT_SIZE;
-        
-        mode = EncodingMode.unparsed;
-        if (LittleEndian.getShort(data, ofs) == 2) {
-            // some files like equations don't have a valid filename,
-            // but somehow encode the formula right away in the ole10 header
-            if (Character.isISOControl(data[ofs+LittleEndianConsts.SHORT_SIZE])) {
-                mode = EncodingMode.compact;
-            } else {
-                mode = EncodingMode.parsed;
-            }
-        }
-
-        int dataSize;
-        switch (mode) {
-        case parsed: {
-            flags1 = LittleEndian.getShort(data, ofs);
-            
-            // structured format
-            ofs += LittleEndianConsts.SHORT_SIZE;
-        
-            int len = getStringLength(data, ofs);
-            label = StringUtil.getFromCompressedUnicode(data, ofs, len - 1);
-            ofs += len;
-            
-            len = getStringLength(data, ofs);
-            fileName = StringUtil.getFromCompressedUnicode(data, ofs, len - 1);
-            ofs += len;
-    
-            flags2 = LittleEndian.getShort(data, ofs);
-            ofs += LittleEndianConsts.SHORT_SIZE;
-            
-            unknown1 = LittleEndian.getShort(data, ofs);
-            ofs += LittleEndianConsts.SHORT_SIZE;
-          
-            len = LittleEndian.getInt(data, ofs);
-            ofs += LittleEndianConsts.INT_SIZE;
-            command = StringUtil.getFromCompressedUnicode(data, ofs, len - 1);
-            ofs += len;
-            
-            if (totalSize < ofs) {
-                throw new Ole10NativeException("Invalid Ole10Native");
-            }
-          
-            dataSize = LittleEndian.getInt(data, ofs);
-            ofs += LittleEndianConsts.INT_SIZE;
-          
-            if (dataSize < 0 || totalSize - (ofs - LittleEndianConsts.INT_SIZE) < dataSize) {
-                throw new Ole10NativeException("Invalid Ole10Native");
-            }
-            break;
-        }
-        case compact:
-            flags1 = LittleEndian.getShort(data, ofs);
-            ofs += LittleEndianConsts.SHORT_SIZE;
-            dataSize = totalSize - LittleEndianConsts.SHORT_SIZE;
-            break;
-        default:
-        case unparsed:
-            dataSize = totalSize;
-            break;
-        }
-
-        if ((long)dataSize + (long)ofs > (long)data.length) { //cast to avoid overflow
-            throw new Ole10NativeException("Invalid Ole10Native: declared data length > available data");
-        }
-        dataBuffer = new byte[dataSize];
-        System.arraycopy(data, ofs, dataBuffer, 0, dataSize);
-        ofs += dataSize;
-    }
-
-    /*
-     * Helper - determine length of zero terminated string (ASCIIZ).
-     */
-    private static int getStringLength(byte[] data, int ofs) {
-        int len = 0;
-        while (len + ofs < data.length && data[ofs + len] != 0) {
-            len++;
-        }
-        len++;
-        return len;
-    }
-
-    /**
-     * Returns the value of the totalSize field - the total length of the
-     * structure is totalSize + 4 (value of this field + size of this field).
-     * 
-     * @return the totalSize
-     */
-    public int getTotalSize() {
-        return totalSize;
-    }
-
-    /**
-     * Returns flags1 - currently unknown - usually 0x0002.
-     * 
-     * @return the flags1
-     */
-    public short getFlags1() {
-        return flags1;
-    }
-
-    /**
-     * Returns the label field - usually the name of the file (without
-     * directory) but probably may be any name specified during
-     * packaging/embedding the data.
-     * 
-     * @return the label
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Returns the fileName field - usually the name of the file being embedded
-     * including the full path.
-     * 
-     * @return the fileName
-     */
-    public String getFileName() {
-        return fileName;
-    }
-
-    /**
-     * Returns flags2 - currently unknown - mostly 0x0000.
-     * 
-     * @return the flags2
-     */
-    public short getFlags2() {
-        return flags2;
-    }
-
-    /**
-     * Returns unknown1 field - currently unknown.
-     * 
-     * @return the unknown1
-     */
-    public short getUnknown1() {
-        return unknown1;
-    }
-
-    /**
-     * Returns the command field - usually the name of the file being embedded
-     * including the full path, may be a command specified during embedding the
-     * file.
-     * 
-     * @return the command
-     */
-    public String getCommand() {
-        return command;
-    }
-
-    /**
-     * Returns the size of the embedded file. If the size is 0 (zero), no data
-     * has been embedded. To be sure, that no data has been embedded, check
-     * whether {@link #getDataBuffer()} returns <code>null</code>.
-     * 
-     * @return the dataSize
-     */
-    public int getDataSize() {
-        return dataBuffer.length;
-    }
-
-    /**
-     * Returns the buffer containing the embedded file's data, or
-     * <code>null</code> if no data was embedded. Note that an embedding may
-     * provide information about the data, but the actual data is not included.
-     * (So label, filename etc. are available, but this method returns
-     * <code>null</code>.)
-     * 
-     * @return the dataBuffer
-     */
-    public byte[] getDataBuffer() {
-        return dataBuffer;
-    }
-
-    /**
-     * Returns the flags3 - currently unknown.
-     * 
-     * @return the flags3
-     */
-    public short getFlags3() {
-        return flags3;
-    }
-
-    /**
-     * Have the contents printer out into an OutputStream, used when writing a
-     * file back out to disk (Normally, atom classes will keep their bytes
-     * around, but non atom classes will just request the bytes from their
-     * children, then chuck on their header and return)
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        // byte intbuf[] = new byte[LittleEndianConsts.INT_SIZE];
-        // byte shortbuf[] = new byte[LittleEndianConsts.SHORT_SIZE];
-
-        @SuppressWarnings("resource")
-        LittleEndianOutputStream leosOut = new LittleEndianOutputStream(out);
-        
-        switch (mode) {
-        case parsed: {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            LittleEndianOutputStream leos = new LittleEndianOutputStream(bos);
-            // total size, will be determined later ..
-
-            leos.writeShort(getFlags1());
-            leos.write(getLabel().getBytes(ISO1));
-            leos.write(0);
-            leos.write(getFileName().getBytes(ISO1));
-            leos.write(0);
-            leos.writeShort(getFlags2());
-            leos.writeShort(getUnknown1());
-            leos.writeInt(getCommand().length() + 1);
-            leos.write(getCommand().getBytes(ISO1));
-            leos.write(0);
-            leos.writeInt(getDataSize());
-            leos.write(getDataBuffer());
-            leos.writeShort(getFlags3());
-            leos.close(); // satisfy compiler ...
-            
-            leosOut.writeInt(bos.size()); // total size
-            bos.writeTo(out);
-            break;
-        }
-        case compact:
-            leosOut.writeInt(getDataSize()+LittleEndianConsts.SHORT_SIZE);
-            leosOut.writeShort(getFlags1());
-            out.write(getDataBuffer());
-            break;
-        default:
-        case unparsed:
-            leosOut.writeInt(getDataSize());
-            out.write(getDataBuffer());
-            break;
-        }
-
-    }
-
-    public void setFlags1(short flags1) {
-        this.flags1 = flags1;
-    }
-
-    public void setFlags2(short flags2) {
-        this.flags2 = flags2;
-    }
-
-    public void setFlags3(short flags3) {
-        this.flags3 = flags3;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-
-    public void setUnknown1(short unknown1) {
-        this.unknown1 = unknown1;
-    }
-
-    public void setDataBuffer(byte dataBuffer[]) {
-        this.dataBuffer = dataBuffer.clone();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java b/trunk/src/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
deleted file mode 100644
index a186990..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-public class Ole10NativeException extends Exception {
-    public Ole10NativeException(String message) {
-        super(message);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java b/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
deleted file mode 100644
index 5b6441c..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
+++ /dev/null
@@ -1,307 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.File;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Class POIFSDocumentPath
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-public class POIFSDocumentPath
-{
-    private static final POILogger log = POILogFactory.getLogger(POIFSDocumentPath.class);
-          
-    private final String[] components;
-    private int hashcode = 0; //lazy-compute hashCode
-
-    /**
-     * constructor for the path of a document that is not in the root
-     * of the POIFSFileSystem
-     *
-     * @param components the Strings making up the path to a document.
-     *                   The Strings must be ordered as they appear in
-     *                   the directory hierarchy of the the document
-     *                   -- the first string must be the name of a
-     *                   directory in the root of the POIFSFileSystem,
-     *                   and every Nth (for N > 1) string thereafter
-     *                   must be the name of a directory in the
-     *                   directory identified by the (N-1)th string.
-     *                   <p>
-     *                   If the components parameter is null or has
-     *                   zero length, the POIFSDocumentPath is
-     *                   appropriate for a document that is in the
-     *                   root of a POIFSFileSystem
-     *
-     * @exception IllegalArgumentException if any of the elements in
-     *                                     the components parameter
-     *                                     are null or have zero
-     *                                     length
-     */
-
-    public POIFSDocumentPath(final String [] components)
-        throws IllegalArgumentException
-    {
-        if (components == null)
-        {
-            this.components = new String[ 0 ];
-        }
-        else
-        {
-            this.components = new String[ components.length ];
-            for (int j = 0; j < components.length; j++)
-            {
-                if ((components[ j ] == null)
-                        || (components[ j ].length() == 0))
-                {
-                    throw new IllegalArgumentException(
-                        "components cannot contain null or empty strings");
-                }
-                this.components[ j ] = components[ j ];
-            }
-        }
-    }
-
-    /**
-     * simple constructor for the path of a document that is in the
-     * root of the POIFSFileSystem. The constructor that takes an
-     * array of Strings can also be used to create such a
-     * POIFSDocumentPath by passing it a null or empty String array
-     */
-
-    public POIFSDocumentPath()
-    {
-        this.components = new String[ 0 ];
-    }
-
-    /**
-     * constructor that adds additional subdirectories to an existing
-     * path
-     *
-     * @param path the existing path
-     * @param components the additional subdirectory names to be added
-     *
-     * @exception IllegalArgumentException if any of the Strings in
-     *                                     components is null or zero
-     *                                     length
-     */
-
-    public POIFSDocumentPath(final POIFSDocumentPath path,
-                             final String [] components)
-        throws IllegalArgumentException
-    {
-        if (components == null)
-        {
-            this.components = new String[ path.components.length ];
-        }
-        else
-        {
-            this.components =
-                new String[ path.components.length + components.length ];
-        }
-        for (int j = 0; j < path.components.length; j++)
-        {
-            this.components[ j ] = path.components[ j ];
-        }
-        if (components != null)
-        {
-            for (int j = 0; j < components.length; j++)
-            {
-                if (components[ j ] == null)
-                {
-                    throw new IllegalArgumentException(
-                        "components cannot contain null");
-                }
-                if (components[ j ].length() == 0)
-                {
-                    log.log(POILogger.WARN, "Directory under " + path + " has an empty name, " +
-                            "not all OLE2 readers will handle this file correctly!");
-                }
-                
-                this.components[ j + path.components.length ] =
-                    components[ j ];
-            }
-        }
-    }
-
-    /**
-     * equality. Two POIFSDocumentPath instances are equal if they
-     * have the same number of component Strings, and if each
-     * component String is equal to its coresponding component String
-     *
-     * @param o the object we're checking equality for
-     *
-     * @return true if the object is equal to this object
-     */
-
-    public boolean equals(final Object o)
-    {
-        boolean rval = false;
-
-        if ((o != null) && (o.getClass() == this.getClass()))
-        {
-            if (this == o)
-            {
-                rval = true;
-            }
-            else
-            {
-                POIFSDocumentPath path = ( POIFSDocumentPath ) o;
-
-                if (path.components.length == this.components.length)
-                {
-                    rval = true;
-                    for (int j = 0; j < this.components.length; j++)
-                    {
-                        if (!path.components[ j ]
-                                .equals(this.components[ j ]))
-                        {
-                            rval = false;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * calculate and return the hashcode
-     *
-     * @return hashcode
-     */
-
-    public int hashCode()
-    {
-        if (hashcode == 0)
-        {
-            hashcode = computeHashCode();
-        }
-        return hashcode;
-    }
-    
-    private int computeHashCode() {
-        int code = 0;
-        for (int j = 0; j < components.length; j++)
-        {
-            code += components[ j ].hashCode();
-        }
-        return code;
-    }
-
-    /**
-     * @return the number of components
-     */
-
-    public int length()
-    {
-        return components.length;
-    }
-
-    /**
-     * get the specified component
-     *
-     * @param n which component (0 ... length() - 1)
-     *
-     * @return the nth component;
-     *
-     * @exception ArrayIndexOutOfBoundsException if n < 0 or n >=
-     *                                           length()
-     */
-
-    public String getComponent(int n)
-        throws ArrayIndexOutOfBoundsException
-    {
-        return components[ n ];
-    }
-
-    /**
-     * <p>Returns the path's parent or <code>null</code> if this path
-     * is the root path.</p>
-     *
-     * @since 2002-01-24
-     * @return path of parent, or null if this path is the root path
-     */
-
-    public POIFSDocumentPath getParent()
-    {
-        final int length = components.length - 1;
-
-        if (length < 0)
-        {
-            return null;
-        }
-        String[] parentComponents = new String[ length ];
-        System.arraycopy(components, 0, parentComponents, 0, length);
-        POIFSDocumentPath parent = new POIFSDocumentPath(parentComponents);
-        
-        return parent;
-    }
-    
-    /**
-     * <p>Returns the last name in the document path's name sequence.
-     * If the document path's name sequence is empty, then the empty string is returned.</p>
-     *
-     * @since 2016-04-09
-     * @return The last name in the document path's name sequence, or empty string if this is the root path
-     */
-
-    public String getName()
-    {
-        if (components.length == 0) {
-            return "";
-        }
-        return components[components.length - 1];
-    }
-
-    /**
-     * <p>Returns a string representation of the path. Components are
-     * separated by the platform-specific file separator {@link File#separatorChar}</p>
-     *
-     * @return string representation
-     *
-     * @since 2002-01-24
-     */
-
-    public String toString()
-    {
-        final StringBuffer b = new StringBuffer();
-        final int          l = length();
-
-        b.append(File.separatorChar);
-        for (int i = 0; i < l; i++)
-        {
-            b.append(getComponent(i));
-            if (i < l - 1)
-            {
-                b.append(File.separatorChar);
-            }
-        }
-        return b.toString();
-    }
-}   // end public class POIFSDocumentPath
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
deleted file mode 100644
index cc48253..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
+++ /dev/null
@@ -1,179 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.util.CloseIgnoringInputStream;
-
-/**
- * Transition class for the move from {@link POIFSFileSystem} to 
- *  {@link OPOIFSFileSystem}, and from {@link NPOIFSFileSystem} to
- *  {@link POIFSFileSystem}. Currently, this is OPOIFS-powered
- */
-
-public class POIFSFileSystem
-    extends NPOIFSFileSystem // TODO Temporary workaround during #56791
-    implements POIFSViewable
-{
-    /**
-     * Convenience method for clients that want to avoid the auto-close behaviour of the constructor.
-     */
-    public static InputStream createNonClosingInputStream(InputStream is) {
-        return new CloseIgnoringInputStream(is);
-    }
-
-    /**
-     * Constructor, intended for writing
-     */
-    public POIFSFileSystem()
-    {
-        super();
-    }
-
-    /**
-     * Create a POIFSFileSystem from an <tt>InputStream</tt>.  Normally the stream is read until
-     * EOF.  The stream is always closed.<p/>
-     *
-     * Some streams are usable after reaching EOF (typically those that return <code>true</code>
-     * for <tt>markSupported()</tt>).  In the unlikely case that the caller has such a stream
-     * <i>and</i> needs to use it after this constructor completes, a work around is to wrap the
-     * stream in order to trap the <tt>close()</tt> call.  A convenience method (
-     * <tt>createNonClosingInputStream()</tt>) has been provided for this purpose:
-     * <pre>
-     * InputStream wrappedStream = POIFSFileSystem.createNonClosingInputStream(is);
-     * HSSFWorkbook wb = new HSSFWorkbook(wrappedStream);
-     * is.reset();
-     * doSomethingElse(is);
-     * </pre>
-     * Note also the special case of <tt>ByteArrayInputStream</tt> for which the <tt>close()</tt>
-     * method does nothing.
-     * <pre>
-     * ByteArrayInputStream bais = ...
-     * HSSFWorkbook wb = new HSSFWorkbook(bais); // calls bais.close() !
-     * bais.reset(); // no problem
-     * doSomethingElse(bais);
-     * </pre>
-     *
-     * @param stream the InputStream from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-
-    public POIFSFileSystem(InputStream stream)
-        throws IOException
-    {
-        super(stream);
-    }
-
-    /**
-     * <p>Creates a POIFSFileSystem from a <tt>File</tt>. This uses less memory than
-     *  creating from an <tt>InputStream</tt>.</p>
-     *  
-     * <p>Note that with this constructor, you will need to call {@link #close()}
-     *  when you're done to have the underlying file closed, as the file is
-     *  kept open during normal operation to read the data out.</p> 
-     * @param readOnly whether the POIFileSystem will only be used in read-only mode
-     *  
-     * @param file the File from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-    public POIFSFileSystem(File file, boolean readOnly) throws IOException {
-        super(file, readOnly);
-    }
-    
-    /**
-     * <p>Creates a POIFSFileSystem from a <tt>File</tt>. This uses less memory than
-     *  creating from an <tt>InputStream</tt>. The File will be opened read-only</p>
-     *  
-     * <p>Note that with this constructor, you will need to call {@link #close()}
-     *  when you're done to have the underlying file closed, as the file is
-     *  kept open during normal operation to read the data out.</p> 
-     *  
-     * @param file the File from which to read the data
-     *
-     * @exception IOException on errors reading, or on invalid data
-     */
-    public POIFSFileSystem(File file) throws IOException {
-        super(file);
-    }
-    
-    /**
-     * Checks that the supplied InputStream (which MUST
-     *  support mark and reset, or be a PushbackInputStream)
-     *  has a POIFS (OLE2) header at the start of it.
-     * If your InputStream does not support mark / reset,
-     *  then wrap it in a PushBackInputStream, then be
-     *  sure to always use that, and not the original!
-     * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
-     */
-    public static boolean hasPOIFSHeader(InputStream inp) throws IOException {
-        return NPOIFSFileSystem.hasPOIFSHeader(inp);
-    }
-    /**
-     * Checks if the supplied first 8 bytes of a stream / file
-     *  has a POIFS (OLE2) header.
-     */
-    public static boolean hasPOIFSHeader(byte[] header8Bytes) {
-        return NPOIFSFileSystem.hasPOIFSHeader(header8Bytes);
-    }
-    
-    /**
-     * Creates a new {@link POIFSFileSystem} in a new {@link File}.
-     * Use {@link #POIFSFileSystem(File)} to open an existing File,
-     *  this should only be used to create a new empty filesystem.
-     *
-     * @param file The file to create and open
-     * @return The created and opened {@link POIFSFileSystem}
-     */
-    public static POIFSFileSystem create(File file) throws IOException {
-        // TODO Make this nicer!
-        // Create a new empty POIFS in the file
-        POIFSFileSystem tmp = new POIFSFileSystem();
-        FileOutputStream fout = new FileOutputStream(file);
-        tmp.writeFilesystem(fout);
-        fout.close();
-        tmp.close();
-        
-        // Open it up again backed by the file
-        return new POIFSFileSystem(file, false);
-    }
-
-    /**
-     * read in a file and write it back out again
-     *
-     * @param args names of the files; arg[ 0 ] is the input file,
-     *             arg[ 1 ] is the output file
-     *
-     * @exception IOException
-     */
-
-    public static void main(String args[])
-        throws IOException
-    {
-        OPOIFSFileSystem.main(args);
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java b/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
deleted file mode 100644
index a3954c3..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
+++ /dev/null
@@ -1,92 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-/**
- * Class POIFSWriterEvent
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-public class POIFSWriterEvent
-{
-    private DocumentOutputStream stream;
-    private POIFSDocumentPath    path;
-    private String               documentName;
-    private int                  limit;
-
-    /**
-     * package scoped constructor
-     *
-     * @param stream the DocumentOutputStream, freshly opened
-     * @param path the path of the document
-     * @param documentName the name of the document
-     * @param limit the limit, in bytes, that can be written to the
-     *              stream
-     */
-
-    POIFSWriterEvent(final DocumentOutputStream stream,
-                     final POIFSDocumentPath path, final String documentName,
-                     final int limit)
-    {
-        this.stream       = stream;
-        this.path         = path;
-        this.documentName = documentName;
-        this.limit        = limit;
-    }
-
-    /**
-     * @return the DocumentOutputStream, freshly opened
-     */
-
-    public DocumentOutputStream getStream()
-    {
-        return stream;
-    }
-
-    /**
-     * @return the document's path
-     */
-
-    public POIFSDocumentPath getPath()
-    {
-        return path;
-    }
-
-    /**
-     * @return the document's name
-     */
-
-    public String getName()
-    {
-        return documentName;
-    }
-
-    /**
-     * @return the limit on writing, in bytes
-     */
-
-    public int getLimit()
-    {
-        return limit;
-    }
-}   // end public class POIFSWriterEvent
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java b/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
deleted file mode 100644
index 9f9e396..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-/**
- * Interface POIFSWriterListener
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-public interface POIFSWriterListener
-{
-
-    /**
-     * Process a POIFSWriterEvent that this listener had registered
-     * for
-     *
-     * @param event the POIFSWriterEvent
-     */
-
-    public void processPOIFSWriterEvent(POIFSWriterEvent event);
-}   // end public interface POIFSWriterListener
-
diff --git a/trunk/src/java/org/apache/poi/poifs/filesystem/package.html b/trunk/src/java/org/apache/poi/poifs/filesystem/package.html
deleted file mode 100644
index d673ed5..0000000
--- a/trunk/src/java/org/apache/poi/poifs/filesystem/package.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-filesystem package maps OLE 2 Compound document files to a more familiar filesystem interface.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.poifs.eventfilesystem
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java b/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
deleted file mode 100644
index c5c84af..0000000
--- a/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.macros;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.poi.util.StringUtil;
-
-/**
- * This tool extracts out the source of all VBA Modules of an office file,
- *  both OOXML (eg XLSM) and OLE2/POIFS (eg DOC), to STDOUT or a directory.
- * 
- * @since 3.15-beta2
- */
-public class VBAMacroExtractor {
-    public static void main(String args[]) throws IOException {
-        if (args.length == 0) {
-            System.err.println("Use:");
-            System.err.println("   VBAMacroExtractor <office.doc> [output]");
-            System.err.println("");
-            System.err.println("If an output directory is given, macros are written there");
-            System.err.println("Otherwise they are output to the screen");
-            System.exit(1);
-        }
-        
-        File input = new File(args[0]);
-        File output = null;
-        if (args.length > 1) {
-            output = new File(args[1]);
-        }
-        
-        VBAMacroExtractor extractor = new VBAMacroExtractor();
-        extractor.extract(input, output);
-    }
-    
-    /**
-      * Extracts the VBA modules from a macro-enabled office file and writes them
-      * to files in <tt>outputDir</tt>.
-      *
-      * Creates the <tt>outputDir</tt>, directory, including any necessary but
-      * nonexistent parent directories, if <tt>outputDir</tt> does not exist.
-      * If <tt>outputDir</tt> is null, writes the contents to standard out instead.
-      *
-      * @param input  the macro-enabled office file.
-      * @param outputDir  the directory to write the extracted VBA modules to.
-      * @param extension  file extension of the extracted VBA modules
-      * @since 3.15-beta2
-      */
-    public void extract(File input, File outputDir, String extension) throws IOException {
-        if (! input.exists()) throw new FileNotFoundException(input.toString());
-        System.err.print("Extracting VBA Macros from " + input + " to ");
-        if (outputDir != null) {
-            if (!outputDir.exists() && !outputDir.mkdirs()) {
-                throw new IOException("Output directory " + outputDir + " could not be created");
-            }
-            System.err.println(outputDir);
-        } else {
-            System.err.println("STDOUT");
-        }
-        
-        VBAMacroReader reader = new VBAMacroReader(input);
-        Map<String,String> macros = reader.readMacros();
-        reader.close();
-        
-        final String divider = "---------------------------------------";
-        for (Entry<String, String> entry : macros.entrySet()) {
-            String moduleName = entry.getKey();
-            String moduleCode = entry.getValue();
-            if (outputDir == null) {
-                System.out.println(divider);
-                System.out.println(moduleName);
-                System.out.println("");
-                System.out.println(moduleCode);
-            } else {
-                File out = new File(outputDir, moduleName + extension);
-                FileOutputStream fout = new FileOutputStream(out);
-                OutputStreamWriter fwriter = new OutputStreamWriter(fout, StringUtil.UTF8);
-                fwriter.write(moduleCode);
-                fwriter.close();
-                fout.close();
-                System.out.println("Extracted " + out);
-            }
-        }
-        if (outputDir == null) {
-            System.out.println(divider);
-        }
-    }
-
-    /**
-      * Extracts the VBA modules from a macro-enabled office file and writes them
-      * to <tt>.vba</tt> files in <tt>outputDir</tt>. 
-      * 
-      * Creates the <tt>outputDir</tt>, directory, including any necessary but
-      * nonexistent parent directories, if <tt>outputDir</tt> does not exist.
-      * If <tt>outputDir</tt> is null, writes the contents to standard out instead.
-      * 
-      * @param input  the macro-enabled office file.
-      * @param outputDir  the directory to write the extracted VBA modules to.
-      * @since 3.15-beta2
-      */
-    public void extract(File input, File outputDir) throws IOException {
-        extract(input, outputDir, ".vba");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java b/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
deleted file mode 100644
index 83eb729..0000000
--- a/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.macros;
-
-import static org.apache.poi.util.StringUtil.startsWithIgnoreCase;
-import static org.apache.poi.util.StringUtil.endsWithIgnoreCase;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.RLEDecompressingInputStream;
-
-/**
- * <p>Finds all VBA Macros in an office file (OLE2/POIFS and OOXML/OPC),
- *  and returns them.
- * </p>
- * <p>
- * <b>NOTE:</b> This does not read macros from .ppt files.
- * See org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF() in the scratchpad
- * module for an example of how to do this. Patches that make macro
- * extraction from .ppt more elegant are welcomed!
- * </p>
- * 
- * @since 3.15-beta2
- */
-public class VBAMacroReader implements Closeable {
-    protected static final String VBA_PROJECT_OOXML = "vbaProject.bin";
-    protected static final String VBA_PROJECT_POIFS = "VBA";
-    // FIXME: When minimum supported version is Java 7, replace with java.nio.charset.StandardCharsets.UTF_16LE
-    private static final Charset UTF_16LE = Charset.forName("UTF-16LE");
-    
-    private NPOIFSFileSystem fs;
-    
-    public VBAMacroReader(InputStream rstream) throws IOException {
-        PushbackInputStream stream = new PushbackInputStream(rstream, 8);
-        byte[] header8 = IOUtils.peekFirst8Bytes(stream);
-
-        if (NPOIFSFileSystem.hasPOIFSHeader(header8)) {
-            fs = new NPOIFSFileSystem(stream);
-        } else {
-            openOOXML(stream);
-        }
-    }
-    
-    public VBAMacroReader(File file) throws IOException {
-        try {
-            this.fs = new NPOIFSFileSystem(file);
-        } catch (OfficeXmlFileException e) {
-            openOOXML(new FileInputStream(file));
-        }
-    }
-    public VBAMacroReader(NPOIFSFileSystem fs) {
-        this.fs = fs;
-    }
-    
-    private void openOOXML(InputStream zipFile) throws IOException {
-        ZipInputStream zis = new ZipInputStream(zipFile);
-        ZipEntry zipEntry;
-        while ((zipEntry = zis.getNextEntry()) != null) {
-            if (endsWithIgnoreCase(zipEntry.getName(), VBA_PROJECT_OOXML)) {
-                try {
-                    // Make a NPOIFS from the contents, and close the stream
-                    this.fs = new NPOIFSFileSystem(zis);
-                    return;
-                } catch (IOException e) {
-                    // Tidy up
-                    zis.close();
-                    
-                    // Pass on
-                    throw e;
-                }
-            }
-        }
-        zis.close();
-        throw new IllegalArgumentException("No VBA project found");
-    }
-    
-    public void close() throws IOException {
-        fs.close();
-        fs = null;
-    }
-
-    /**
-     * Reads all macros from all modules of the opened office file. 
-     * @return All the macros and their contents
-     *
-     * @since 3.15-beta2
-     */
-    public Map<String, String> readMacros() throws IOException {
-        final ModuleMap modules = new ModuleMap();
-        findMacros(fs.getRoot(), modules);
-        
-        Map<String, String> moduleSources = new HashMap<String, String>();
-        for (Map.Entry<String, Module> entry : modules.entrySet()) {
-            Module module = entry.getValue();
-            if (module.buf != null && module.buf.length > 0) { // Skip empty modules
-                moduleSources.put(entry.getKey(), new String(module.buf, modules.charset));
-            }
-        }
-        return moduleSources;
-    }
-    
-    protected static class Module {
-        Integer offset;
-        byte[] buf;
-        void read(InputStream in) throws IOException {
-            final ByteArrayOutputStream out = new ByteArrayOutputStream();
-            IOUtils.copy(in, out);
-            out.close();
-            buf = out.toByteArray();
-        }
-    }
-    protected static class ModuleMap extends HashMap<String, Module> {
-        Charset charset = Charset.forName("Cp1252"); // default charset
-    }
-    
-    /**
-     * Recursively traverses directory structure rooted at <tt>dir</tt>.
-     * For each macro module that is found, the module's name and code are
-     * added to <tt>modules<tt>.
-     *
-     * @param dir The directory of entries to look at
-     * @param modules The resulting map of modules
-     * @throws IOException If reading the VBA module fails
-     * @since 3.15-beta2
-     */
-    protected void findMacros(DirectoryNode dir, ModuleMap modules) throws IOException {
-        if (VBA_PROJECT_POIFS.equalsIgnoreCase(dir.getName())) {
-            // VBA project directory, process
-            readMacros(dir, modules);
-        } else {
-            // Check children
-            for (Entry child : dir) {
-                if (child instanceof DirectoryNode) {
-                    findMacros((DirectoryNode)child, modules);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Read <tt>length</tt> bytes of MBCS (multi-byte character set) characters from the stream
-     *
-     * @param stream the inputstream to read from
-     * @param length number of bytes to read from stream
-     * @param charset the character set encoding of the bytes in the stream
-     * @return a java String in the supplied character set
-     * @throws IOException If reading from the stream fails
-     */
-    private static String readString(InputStream stream, int length, Charset charset) throws IOException {
-        byte[] buffer = new byte[length];
-        int count = stream.read(buffer);
-        return new String(buffer, 0, count, charset);
-    }
-    
-    /**
-     * reads module from DIR node in input stream and adds it to the modules map for decompression later
-     * on the second pass through this function, the module will be decompressed
-     * 
-     * Side-effects: adds a new module to the module map or sets the buf field on the module
-     * to the decompressed stream contents (the VBA code for one module)
-     *
-     * @param in the run-length encoded input stream to read from
-     * @param streamName the stream name of the module
-     * @param modules a map to store the modules
-     * @throws IOException If reading data from the stream or from modules fails
-     */
-    private static void readModule(RLEDecompressingInputStream in, String streamName, ModuleMap modules) throws IOException {
-        int moduleOffset = in.readInt();
-        Module module = modules.get(streamName);
-        if (module == null) {
-            // First time we've seen the module. Add it to the ModuleMap and decompress it later
-            module = new Module();
-            module.offset = moduleOffset;
-            modules.put(streamName, module);
-            // Would adding module.read(in) here be correct?
-        } else {
-            // Decompress a previously found module and store the decompressed result into module.buf
-            InputStream stream = new RLEDecompressingInputStream(
-                    new ByteArrayInputStream(module.buf, moduleOffset, module.buf.length - moduleOffset)
-            );
-            module.read(stream);
-            stream.close();
-        }
-    }
-    
-    private static void readModule(DocumentInputStream dis, String name, ModuleMap modules) throws IOException {
-        Module module = modules.get(name);
-        // TODO Refactor this to fetch dir then do the rest
-        if (module == null) {
-            // no DIR stream with offsets yet, so store the compressed bytes for later
-            module = new Module();
-            modules.put(name, module);
-            module.read(dis);
-        } else if (module.buf == null) { //if we haven't already read the bytes for the module keyed off this name...
-            if (module.offset == null) {
-                //This should not happen. bug 59858
-                throw new IOException("Module offset for '" + name + "' was never read.");
-            }
-            // we know the offset already, so decompress immediately on-the-fly
-            long skippedBytes = dis.skip(module.offset);
-            if (skippedBytes != module.offset) {
-                throw new IOException("tried to skip " + module.offset + " bytes, but actually skipped " + skippedBytes + " bytes");
-            }
-            InputStream stream = new RLEDecompressingInputStream(dis);
-            module.read(stream);
-            stream.close();
-        }
-        
-    }
-
-    /**
-      * Skips <tt>n</tt> bytes in an input stream, throwing IOException if the
-      * number of bytes skipped is different than requested.
-      * @throws IOException If skipping would exceed the available data or skipping did not work.
-      */
-    private static void trySkip(InputStream in, long n) throws IOException {
-        long skippedBytes = in.skip(n);
-        if (skippedBytes != n) {
-            if (skippedBytes < 0) {
-                throw new IOException(
-                    "Tried skipping " + n + " bytes, but no bytes were skipped. "
-                    + "The end of the stream has been reached or the stream is closed.");
-            } else {
-                throw new IOException(
-                    "Tried skipping " + n + " bytes, but only " + skippedBytes + " bytes were skipped. "
-                    + "This should never happen.");
-            }
-        }
-    }
-    
-    // Constants from MS-OVBA: https://msdn.microsoft.com/en-us/library/office/cc313094(v=office.12).aspx
-    private static final int EOF = -1;
-    private static final int VERSION_INDEPENDENT_TERMINATOR = 0x0010;
-    @SuppressWarnings("unused")
-    private static final int VERSION_DEPENDENT_TERMINATOR = 0x002B;
-    private static final int PROJECTVERSION = 0x0009;
-    private static final int PROJECTCODEPAGE = 0x0003;
-    private static final int STREAMNAME = 0x001A;
-    private static final int MODULEOFFSET = 0x0031;
-    @SuppressWarnings("unused")
-    private static final int MODULETYPE_PROCEDURAL = 0x0021;
-    @SuppressWarnings("unused")
-    private static final int MODULETYPE_DOCUMENT_CLASS_OR_DESIGNER = 0x0022;
-    @SuppressWarnings("unused")
-    private static final int PROJECTLCID = 0x0002;
-    @SuppressWarnings("unused")
-    private static final int MODULE_NAME = 0x0019;
-    @SuppressWarnings("unused")
-    private static final int MODULE_NAME_UNICODE = 0x0047;
-    @SuppressWarnings("unused")
-    private static final int MODULE_DOC_STRING = 0x001c;
-    private static final int STREAMNAME_RESERVED = 0x0032;
-
-    /**
-     * Reads VBA Project modules from a VBA Project directory located at
-     * <tt>macroDir</tt> into <tt>modules</tt>.
-     *
-     * @since 3.15-beta2
-     */    
-    protected void readMacros(DirectoryNode macroDir, ModuleMap modules) throws IOException {
-        for (Entry entry : macroDir) {
-            if (! (entry instanceof DocumentNode)) { continue; }
-            
-            String name = entry.getName();
-            DocumentNode document = (DocumentNode)entry;
-            DocumentInputStream dis = new DocumentInputStream(document);
-            try {
-                if ("dir".equalsIgnoreCase(name)) {
-                    // process DIR
-                    RLEDecompressingInputStream in = new RLEDecompressingInputStream(dis);
-                    String streamName = null;
-                    int recordId = 0;
-                    try {
-                        while (true) {
-                            recordId = in.readShort();
-                            if (EOF == recordId
-                                    || VERSION_INDEPENDENT_TERMINATOR == recordId) {
-                                break;
-                            }
-                            int recordLength = in.readInt();
-                            switch (recordId) {
-                            case PROJECTVERSION:
-                                trySkip(in, 6);
-                                break;
-                            case PROJECTCODEPAGE:
-                                int codepage = in.readShort();
-                                modules.charset = Charset.forName(CodePageUtil.codepageToEncoding(codepage, true));
-                                break;
-                            case STREAMNAME:
-                                streamName = readString(in, recordLength, modules.charset);
-                                int reserved = in.readShort();
-                                if (reserved != STREAMNAME_RESERVED) {
-                                    throw new IOException("Expected x0032 after stream name before Unicode stream name, but found: "+
-                                            Integer.toHexString(reserved));
-                                }
-                                int unicodeNameRecordLength = in.readInt();
-                                readUnicodeString(in, unicodeNameRecordLength);
-                                // do something with this at some point
-                                break;
-                            case MODULEOFFSET:
-                                readModule(in, streamName, modules);
-                                break;
-                            default:
-                                trySkip(in, recordLength);
-                                break;
-                            }
-                        }
-                    } catch (final IOException e) {
-                        throw new IOException(
-                                "Error occurred while reading macros at section id "
-                                + recordId + " (" + HexDump.shortToHex(recordId) + ")", e);
-                    }
-                    finally {
-                        in.close();
-                    }
-                } else if (!startsWithIgnoreCase(name, "__SRP")
-                        && !startsWithIgnoreCase(name, "_VBA_PROJECT")) {
-                    // process module, skip __SRP and _VBA_PROJECT since these do not contain macros
-                    readModule(dis, name, modules);
-                }
-            }
-            finally {
-                dis.close();
-            }
-        }
-    }
-
-    private String readUnicodeString(RLEDecompressingInputStream in, int unicodeNameRecordLength) throws IOException {
-        byte[] buffer = new byte[unicodeNameRecordLength];
-        IOUtils.readFully(in, buffer);
-        return new String(buffer, UTF_16LE);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java b/trunk/src/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
deleted file mode 100644
index 88ee7da..0000000
--- a/trunk/src/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.nio;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * A POIFS {@link DataSource} backed by a byte array.
- */
-public class ByteArrayBackedDataSource extends DataSource {
-   private byte[] buffer;
-   private long size;
-   
-   public ByteArrayBackedDataSource(byte[] data, int size) { // NOSONAR
-      this.buffer = data;
-      this.size = size;
-   }
-   public ByteArrayBackedDataSource(byte[] data) {
-      this(data, data.length);
-   }
-                
-   @Override
-   public ByteBuffer read(int length, long position) {
-      if(position >= size) {
-         throw new IndexOutOfBoundsException(
-               "Unable to read " + length + " bytes from " +
-               position + " in stream of length " + size
-         );
-      }
-      
-      int toRead = (int)Math.min(length, size - position);
-      return ByteBuffer.wrap(buffer, (int)position, toRead);
-   }
-   
-   @Override
-   public void write(ByteBuffer src, long position) {
-      // Extend if needed
-      long endPosition = position + src.capacity(); 
-      if(endPosition > buffer.length) {
-         extend(endPosition);
-      }
-      
-      // Now copy
-      src.get(buffer, (int)position, src.capacity());
-      
-      // Update size if needed
-      if(endPosition > size) {
-         size = endPosition;
-      }
-   }
-   
-   private void extend(long length) {
-      // Consider extending by a bit more than requested
-      long difference = length - buffer.length;
-      if(difference < buffer.length*0.25) {
-         difference = (long)(buffer.length*0.25);
-      }
-      if(difference < 4096) {
-         difference = 4096;
-      }
-
-      byte[] nb = new byte[(int)(difference+buffer.length)];
-      System.arraycopy(buffer, 0, nb, 0, (int)size);
-      buffer = nb;
-   }
-   
-   @Override
-   public void copyTo(OutputStream stream) throws IOException {
-      stream.write(buffer, 0, (int)size);
-   }
-   
-   @Override
-   public long size() {
-      return size;
-   }
-   
-   @Override
-   public void close() {
-      buffer = null;
-      size = -1;
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/nio/DataSource.java b/trunk/src/java/org/apache/poi/poifs/nio/DataSource.java
deleted file mode 100644
index f436676..0000000
--- a/trunk/src/java/org/apache/poi/poifs/nio/DataSource.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.nio;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Common definition of how we read and write bytes
- */
-public abstract class DataSource {
-   public abstract ByteBuffer read(int length, long position) throws IOException;
-   public abstract void write(ByteBuffer src, long position) throws IOException;
-   public abstract long size() throws IOException;
-   /** Close the underlying stream */
-   public abstract void close() throws IOException;
-   /** Copies the contents to the specified OutputStream */
-   public abstract void copyTo(OutputStream stream) throws IOException;
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java b/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
deleted file mode 100644
index 32a8701..0000000
--- a/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.nio;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
-import java.lang.reflect.Method;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
-import java.nio.channels.WritableByteChannel;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.SuppressForbidden;
-
-/**
- * A POIFS {@link DataSource} backed by a File
- */
-public class FileBackedDataSource extends DataSource {
-   private final static POILogger logger = POILogFactory.getLogger( FileBackedDataSource.class );
-   
-   private FileChannel channel;
-   private boolean writable;
-   // remember file base, which needs to be closed too
-   private RandomAccessFile srcFile;
-   
-   // Buffers which map to a file-portion are not closed automatically when the Channel is closed
-   // therefore we need to keep the list of mapped buffers and do some ugly reflection to try to 
-   // clean the buffer during close().
-   // See https://bz.apache.org/bugzilla/show_bug.cgi?id=58480, 
-   // http://stackoverflow.com/questions/3602783/file-access-synchronized-on-java-object and
-   // http://bugs.java.com/view_bug.do?bug_id=4724038 for related discussions
-   private List<ByteBuffer> buffersToClean = new ArrayList<ByteBuffer>();
-
-   public FileBackedDataSource(File file) throws FileNotFoundException {
-       this(newSrcFile(file, "r"), true);
-   }
-
-   public FileBackedDataSource(File file, boolean readOnly) throws FileNotFoundException {
-       this(newSrcFile(file, readOnly ? "r" : "rw"), readOnly);
-   }
-
-   public FileBackedDataSource(RandomAccessFile srcFile, boolean readOnly) {
-       this(srcFile.getChannel(), readOnly);
-       this.srcFile = srcFile;
-   }   
-   
-   public FileBackedDataSource(FileChannel channel, boolean readOnly) {
-      this.channel = channel;
-      this.writable = !readOnly;
-   }
-   
-   public boolean isWriteable() {
-       return this.writable;
-   }
-   
-   public FileChannel getChannel() {
-       return this.channel;
-   }
-
-   @Override
-   public ByteBuffer read(int length, long position) throws IOException {
-      if(position >= size()) {
-         throw new IndexOutOfBoundsException("Position " + position + " past the end of the file");
-      }
-      
-      // Do we read or map (for read/write)?
-      ByteBuffer dst;
-      if (writable) {
-          dst = channel.map(FileChannel.MapMode.READ_WRITE, position, length);
-
-          // remember this buffer for cleanup
-          buffersToClean.add(dst);
-      } else {
-          // allocate the buffer on the heap if we cannot map the data in directly
-          channel.position(position);
-          dst = ByteBuffer.allocate(length);
-
-          // Read the contents and check that we could read some data
-          int worked = IOUtils.readFully(channel, dst);
-          if(worked == -1) {
-              throw new IndexOutOfBoundsException("Position " + position + " past the end of the file");
-          }
-      }
-
-      // make it ready for reading
-      dst.position(0);
-
-      // All done
-      return dst;
-   }
-
-   @Override
-   public void write(ByteBuffer src, long position) throws IOException {
-      channel.write(src, position);
-   }
-
-   @Override
-   public void copyTo(OutputStream stream) throws IOException {
-      // Wrap the OutputSteam as a channel
-      WritableByteChannel out = Channels.newChannel(stream);
-      // Now do the transfer
-      channel.transferTo(0, channel.size(), out);
-   }
-
-   @Override
-   public long size() throws IOException {
-      return channel.size();
-   }
-
-   @Override
-   public void close() throws IOException {
-	   // also ensure that all buffers are unmapped so we do not keep files locked on Windows
-	   // We consider it a bug if a Buffer is still in use now! 
-       for(ByteBuffer buffer : buffersToClean) {
-           unmap(buffer);
-       }
-       buffersToClean.clear();
-
-       if (srcFile != null) {
-          // see http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4796385
-          srcFile.close();
-      } else {
-          channel.close();
-      }
-   }
-
-   private static RandomAccessFile newSrcFile(File file, String mode) throws FileNotFoundException {
-       if(!file.exists()) {
-           throw new FileNotFoundException(file.toString());
-        }
-        return new RandomAccessFile(file, mode);
-   }
-
-   // need to use reflection to avoid depending on the sun.nio internal API
-   // unfortunately this might break silently with newer/other Java implementations, 
-   // but we at least have unit-tests which will indicate this when run on Windows
-   private static void unmap(final ByteBuffer buffer) {
-       // not necessary for HeapByteBuffer, avoid lots of log-output on this class
-       if(buffer.getClass().getName().endsWith("HeapByteBuffer")) {
-           return;
-       }
-
-       AccessController.doPrivileged(new PrivilegedAction<Void>() {
-           @Override
-           @SuppressForbidden("Java 9 Jigsaw whitelists access to sun.misc.Cleaner, so setAccessible works")
-           public Void run() {
-               try {
-                   final Method getCleanerMethod = buffer.getClass().getMethod("cleaner");
-                   getCleanerMethod.setAccessible(true);
-                   final Object cleaner = getCleanerMethod.invoke(buffer);
-                   if (cleaner != null) {
-                       cleaner.getClass().getMethod("clean").invoke(cleaner);
-                   }
-               } catch (Exception e) {
-                   logger.log(POILogger.WARN, "Unable to unmap memory mapped ByteBuffer.", e);
-               }
-               return null; // Void
-           }
-       });
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/package.html b/trunk/src/java/org/apache/poi/poifs/package.html
deleted file mode 100644
index f86821c..0000000
--- a/trunk/src/java/org/apache/poi/poifs/package.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-Poor Obfuscation Implementation FileSystem APIs implement the OLE 2 Compound Document format in
-pure Java.  All POI subprojects are based upon this API.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.hssf
-@see org.apache.poi.hpsf
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/property/Child.java b/trunk/src/java/org/apache/poi/poifs/property/Child.java
deleted file mode 100644
index 6047452..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/Child.java
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.property;
-
-/**
- * This interface defines methods for finding and setting sibling
- * Property instances
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public interface Child {
-    /**
-     * Get the next Child, if any
-     *
-     * @return the next Child; may return null
-     */
-
-    public Child getNextChild();
-
-    /**
-     * Get the previous Child, if any
-     *
-     * @return the previous Child; may return null
-     */
-
-    public Child getPreviousChild();
-
-    /**
-     * Set the next Child
-     *
-     * @param child the new 'next' child; may be null, which has the
-     *              effect of saying there is no 'next' child
-     */
-
-    public void setNextChild(final Child child);
-
-    /**
-     * Set the previous Child
-     *
-     * @param child the new 'previous' child; may be null, which has
-     *              the effect of saying there is no 'previous' child
-     */
-
-    public void setPreviousChild(final Child child);
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/DirectoryProperty.java b/trunk/src/java/org/apache/poi/poifs/property/DirectoryProperty.java
deleted file mode 100644
index ef4ff34..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/DirectoryProperty.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Directory property
- */
-public class DirectoryProperty extends Property implements Parent, Iterable<Property> { // TODO - fix instantiable superclass
-
-    /** List of Property instances */
-    private List<Property> _children;
-
-    /** set of children's names */
-    private Set<String>  _children_names;
-
-    /**
-     * Default constructor
-     *
-     * @param name the name of the directory
-     */
-    public DirectoryProperty(String name)
-    {
-        super();
-        _children       = new ArrayList<Property>();
-        _children_names = new HashSet<String>();
-        setName(name);
-        setSize(0);
-        setPropertyType(PropertyConstants.DIRECTORY_TYPE);
-        setStartBlock(0);
-        setNodeColor(_NODE_BLACK);   // simplification
-    }
-
-    /**
-     * reader constructor
-     *
-     * @param index index number
-     * @param array byte data
-     * @param offset offset into byte data
-     */
-    protected DirectoryProperty(final int index, final byte [] array,
-                                final int offset)
-    {
-        super(index, array, offset);
-        _children       = new ArrayList<Property>();
-        _children_names = new HashSet<String>();
-    }
-
-    /**
-     * Change a Property's name
-     *
-     * @param property the Property whose name is being changed
-     * @param newName the new name for the Property
-     *
-     * @return true if the name change could be made, else false
-     */
-    public boolean changeName(Property property, String newName)
-    {
-        boolean result;
-        String  oldName = property.getName();
-
-        property.setName(newName);
-        String cleanNewName = property.getName();
-
-        if (_children_names.contains(cleanNewName))
-        {
-
-            // revert the change
-            property.setName(oldName);
-            result = false;
-        }
-        else
-        {
-            _children_names.add(cleanNewName);
-            _children_names.remove(oldName);
-            result = true;
-        }
-        return result;
-    }
-
-    /**
-     * Delete a Property
-     *
-     * @param property the Property being deleted
-     *
-     * @return true if the Property could be deleted, else false
-     */
-    public boolean deleteChild(Property property)
-    {
-        boolean result = _children.remove(property);
-
-        if (result)
-        {
-            _children_names.remove(property.getName());
-        }
-        return result;
-    }
-
-    public static class PropertyComparator implements Comparator<Property>, Serializable {
-        
-        /**
-         * compare method. Assumes both parameters are non-null
-         * instances of Property. One property is less than another if
-         * its name is shorter than the other property's name. If the
-         * names are the same length, the property whose name comes
-         * before the other property's name, alphabetically, is less
-         * than the other property.
-         *
-         * @param o1 first object to compare, better be a Property
-         * @param o2 second object to compare, better be a Property
-         *
-         * @return negative value if o1 <  o2,
-         *         zero           if o1 == o2,
-         *         positive value if o1 >  o2.
-         */
-        public int compare(Property o1, Property o2)
-        {
-            String VBA_PROJECT = "_VBA_PROJECT";
-            String name1  = o1.getName();
-            String name2  = o2.getName();
-            int  result = name1.length() - name2.length();
-
-            if (result == 0)
-            {
-              // _VBA_PROJECT, it seems, will always come last
-              if (name1.compareTo(VBA_PROJECT) == 0)
-                result = 1;
-              else if (name2.compareTo(VBA_PROJECT) == 0)
-                result = -1;
-              else
-              {
-                if (name1.startsWith("__") && name2.startsWith("__"))
-                {
-                  // Betweeen __SRP_0 and __SRP_1 just sort as normal
-                  result = name1.compareToIgnoreCase(name2);
-                }
-                else if (name1.startsWith("__"))
-                {
-                  // If only name1 is __XXX then this will be placed after name2
-                  result = 1;
-                }
-                else if (name2.startsWith("__"))
-                {
-                  // If only name2 is __XXX then this will be placed after name1
-                  result = -1;
-                }
-                else
-                  // result = name1.compareTo(name2);
-                  // The default case is to sort names ignoring case
-                  result = name1.compareToIgnoreCase(name2);
-              }
-            }
-            return result;
-        }
-    }
-
-    /**
-     * @return true if a directory type Property
-     */
-    public boolean isDirectory()
-    {
-        return true;
-    }
-
-    /**
-     * Perform whatever activities need to be performed prior to
-     * writing
-     */
-    protected void preWrite()
-    {
-        if (_children.size() > 0)
-        {
-            Property[] children = _children.toArray(new Property[ 0 ]);
-
-            Arrays.sort(children, new PropertyComparator());
-            int midpoint = children.length / 2;
-
-            setChildProperty(children[ midpoint ].getIndex());
-            children[ 0 ].setPreviousChild(null);
-            children[ 0 ].setNextChild(null);
-            for (int j = 1; j < midpoint; j++)
-            {
-                children[ j ].setPreviousChild(children[ j - 1 ]);
-                children[ j ].setNextChild(null);
-            }
-            if (midpoint != 0)
-            {
-                children[ midpoint ]
-                    .setPreviousChild(children[ midpoint - 1 ]);
-            }
-            if (midpoint != (children.length - 1))
-            {
-                children[ midpoint ].setNextChild(children[ midpoint + 1 ]);
-                for (int j = midpoint + 1; j < children.length - 1; j++)
-                {
-                    children[ j ].setPreviousChild(null);
-                    children[ j ].setNextChild(children[ j + 1 ]);
-                }
-                children[ children.length - 1 ].setPreviousChild(null);
-                children[ children.length - 1 ].setNextChild(null);
-            }
-            else
-            {
-                children[ midpoint ].setNextChild(null);
-            }
-        }
-    }
-
-    /**
-     * Get an iterator over the children of this Parent; all elements
-     * are instances of Property.
-     *
-     * @return Iterator of children; may refer to an empty collection
-     */
-    public Iterator<Property> getChildren()
-    {
-        return _children.iterator();
-    }
-    /**
-     * Get an iterator over the children of this Parent, alias for
-     *  {@link #getChildren()} which supports foreach use
-     */
-    public Iterator<Property> iterator() {
-        return getChildren();
-    }
-
-    /**
-     * Add a new child to the collection of children
-     *
-     * @param property the new child to be added; must not be null
-     *
-     * @exception IOException if we already have a child with the same
-     *                        name
-     */
-    public void addChild(final Property property)
-        throws IOException
-    {
-        String name = property.getName();
-
-        if (_children_names.contains(name))
-        {
-            throw new IOException("Duplicate name \"" + name + "\"");
-        }
-        _children_names.add(name);
-        _children.add(property);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/DocumentProperty.java b/trunk/src/java/org/apache/poi/poifs/property/DocumentProperty.java
deleted file mode 100644
index ea693d8..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/DocumentProperty.java
+++ /dev/null
@@ -1,121 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.property;
-
-import org.apache.poi.poifs.filesystem.OPOIFSDocument;
-
-/**
- * Trivial extension of Property for POIFSDocuments
- */
-public class DocumentProperty extends Property {
-    // the POIFSDocument this property is associated with
-    private OPOIFSDocument _document;
-
-    /**
-     * Constructor
-     *
-     * @param name POIFSDocument name
-     * @param size POIFSDocument size
-     */
-
-    public DocumentProperty(final String name, final int size)
-    {
-        super();
-        _document = null;
-        setName(name);
-        setSize(size);
-        setNodeColor(_NODE_BLACK);   // simplification
-        setPropertyType(PropertyConstants.DOCUMENT_TYPE);
-    }
-
-    /**
-     * reader constructor
-     *
-     * @param index index number
-     * @param array byte data
-     * @param offset offset into byte data
-     */
-    protected DocumentProperty(final int index, final byte [] array,
-                               final int offset)
-    {
-        super(index, array, offset);
-        _document = null;
-    }
-
-    /**
-     * set the POIFSDocument
-     *
-     * @param doc the associated POIFSDocument
-     */
-    public void setDocument(OPOIFSDocument doc)
-    {
-        _document = doc;
-    }
-
-    /**
-     * get the POIFSDocument
-     *
-     * @return the associated document
-     */
-    public OPOIFSDocument getDocument()
-    {
-        return _document;
-    }
-
-    /* ********** START extension of Property ********** */
-
-    /**
-     * give method more visibility
-     *
-     * @return true if this property should use small blocks
-     */
-    public boolean shouldUseSmallBlocks()
-    {
-        return super.shouldUseSmallBlocks();
-    }
-
-    /**
-     * @return true if a directory type Property
-     */
-    public boolean isDirectory()
-    {
-        return false;
-    }
-
-    /**
-     * Perform whatever activities need to be performed prior to
-     * writing
-     */
-    protected void preWrite()
-    {
-
-        // do nothing
-    }
-    
-    /**
-     * Update the size of the property's data
-     */
-    public void updateSize(int size)
-    {
-        setSize(size);
-    }
-
-    /* **********  END  extension of Property ********** */
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/NPropertyTable.java b/trunk/src/java/org/apache/poi/poifs/property/NPropertyTable.java
deleted file mode 100644
index 7117bc2..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/NPropertyTable.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.NPOIFSStream;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class embodies the Property Table for a {@link NPOIFSFileSystem}; 
- *  this is basically the directory for all of the documents in the
- * filesystem.
- */
-public final class NPropertyTable extends PropertyTableBase {
-    private static final POILogger _logger =
-       POILogFactory.getLogger(NPropertyTable.class);
-    private POIFSBigBlockSize _bigBigBlockSize;
-
-    public NPropertyTable(HeaderBlock headerBlock)
-    {
-        super(headerBlock);
-        _bigBigBlockSize = headerBlock.getBigBlockSize();
-    }
-
-    /**
-     * reading constructor (used when we've read in a file and we want
-     * to extract the property table from it). Populates the
-     * properties thoroughly
-     *
-     * @param headerBlock the header block of the file
-     * @param filesystem the filesystem to read from
-     *
-     * @exception IOException if anything goes wrong (which should be
-     *            a result of the input being NFG)
-     */
-    public NPropertyTable(final HeaderBlock headerBlock,
-                          final NPOIFSFileSystem filesystem)
-        throws IOException
-    {
-        super(
-              headerBlock,
-              buildProperties(
-                    (new NPOIFSStream(filesystem, headerBlock.getPropertyStart())).iterator(),
-                    headerBlock.getBigBlockSize()
-              )
-        );
-        _bigBigBlockSize = headerBlock.getBigBlockSize();
-    }
-    
-    private static List<Property> buildProperties(final Iterator<ByteBuffer> dataSource,
-          final POIFSBigBlockSize bigBlockSize) throws IOException
-    {
-       List<Property> properties = new ArrayList<Property>();
-       while(dataSource.hasNext()) {
-          ByteBuffer bb = dataSource.next();
-          
-          // Turn it into an array
-          byte[] data;
-          if(bb.hasArray() && bb.arrayOffset() == 0 && 
-                bb.array().length == bigBlockSize.getBigBlockSize()) {
-             data = bb.array();
-          } else {
-             data = new byte[bigBlockSize.getBigBlockSize()];
-             
-             int toRead = data.length;
-             if (bb.remaining() < bigBlockSize.getBigBlockSize()) {
-                // Looks to be a truncated block
-                // This isn't allowed, but some third party created files
-                //  sometimes do this, and we can normally read anyway
-                _logger.log(POILogger.WARN, "Short Property Block, ", bb.remaining(),
-                            " bytes instead of the expected " + bigBlockSize.getBigBlockSize());
-                toRead = bb.remaining();
-             }
-             
-             bb.get(data, 0, toRead);
-          }
-          
-          PropertyFactory.convertToProperties(data, properties);
-       }
-       return properties;
-    }
-
-    /**
-     * Return the number of BigBlock's this instance uses
-     *
-     * @return count of BigBlock instances
-     */
-    public int countBlocks()
-    {
-       long rawSize = _properties.size() * POIFSConstants.PROPERTY_SIZE;
-       int blkSize = _bigBigBlockSize.getBigBlockSize();
-       int numBlocks = (int)(rawSize / blkSize);
-       if ((rawSize % blkSize) != 0) {
-           numBlocks++;
-       }
-       return numBlocks;
-    }
- 
-    /**
-     * Prepare to be written
-     */
-    public void preWrite() {
-        List<Property> pList = new ArrayList<Property>();
-        // give each property its index
-        int i=0;
-        for (Property p : _properties) {
-            // only handle non-null properties 
-            if (p == null) continue;
-            p.setIndex(i++);
-            pList.add(p);
-        }
-
-        // prepare each property for writing
-        for (Property p : pList) p.preWrite();
-    }    
-    
-    /**
-     * Writes the properties out into the given low-level stream
-     */
-    public void write(NPOIFSStream stream) throws IOException {
-       OutputStream os = stream.getOutputStream();
-       for(Property property : _properties) {
-          if(property != null) {
-             property.writeData(os);
-          }
-       }
-       os.close();
-       
-       // Update the start position if needed
-       if(getStartBlock() != stream.getStartBlock()) {
-          setStartBlock(stream.getStartBlock());
-       }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/Parent.java b/trunk/src/java/org/apache/poi/poifs/property/Parent.java
deleted file mode 100644
index 79c286c..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/Parent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.util.Iterator;
-
-import java.io.IOException;
-
-/**
- * Behavior for parent (directory) properties
- *
- * @author Marc Johnson27591@hotmail.com
- */
-public interface Parent
-    extends Child
-{
-
-    /**
-     * Get an iterator over the children of this Parent; all elements
-     * are instances of Property.
-     *
-     * @return Iterator of children; may refer to an empty collection
-     */
-
-    public Iterator getChildren();
-
-    /**
-     * Add a new child to the collection of children
-     *
-     * @param property the new child to be added; must not be null
-     *
-     * @exception IOException if the Parent already has a child with
-     *                        the same name
-     */
-
-    public void addChild(final Property property)
-        throws IOException;
-
-    /**
-     * Set the previous Child
-     *
-     * @param child the new 'previous' child; may be null, which has
-     *              the effect of saying there is no 'previous' child
-     */
-
-    public void setPreviousChild(final Child child);
-
-    /**
-     * Set the next Child
-     *
-     * @param child the new 'next' child; may be null, which has the
-     *              effect of saying there is no 'next' child
-     */
-
-    public void setNextChild(final Child child);
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/Property.java b/trunk/src/java/org/apache/poi/poifs/property/Property.java
deleted file mode 100644
index bccac35..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/Property.java
+++ /dev/null
@@ -1,526 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.apache.poi.hpsf.ClassID;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.dev.POIFSViewable;
-import org.apache.poi.util.ByteField;
-import org.apache.poi.util.IntegerField;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.ShortField;
-
-/**
- * This abstract base class is the ancestor of all classes
- * implementing POIFS Property behavior.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public abstract class Property implements Child, POIFSViewable {
-    static final private byte   _default_fill             = ( byte ) 0x00;
-    static final private int    _name_size_offset         = 0x40;
-    static final private int    _max_name_length          =
-        (_name_size_offset / LittleEndianConsts.SHORT_SIZE) - 1;
-    static final protected int  _NO_INDEX                 = -1;
-
-    // useful offsets
-    static final private int    _node_color_offset        = 0x43;
-    static final private int    _previous_property_offset = 0x44;
-    static final private int    _next_property_offset     = 0x48;
-    static final private int    _child_property_offset    = 0x4C;
-    static final private int    _storage_clsid_offset     = 0x50;
-    static final private int    _user_flags_offset        = 0x60;
-    static final private int    _seconds_1_offset         = 0x64;
-    static final private int    _days_1_offset            = 0x68;
-    static final private int    _seconds_2_offset         = 0x6C;
-    static final private int    _days_2_offset            = 0x70;
-    static final private int    _start_block_offset       = 0x74;
-    static final private int    _size_offset              = 0x78;
-
-    // node colors
-    static final protected byte _NODE_BLACK               = 1;
-    static final protected byte _NODE_RED                 = 0;
-
-    // documents must be at least this size to be stored in big blocks
-    static final private int    _big_block_minimum_bytes  = POIFSConstants.BIG_BLOCK_MINIMUM_DOCUMENT_SIZE;
-    private String              _name;
-    private ShortField          _name_size;
-    private ByteField           _property_type;
-    private ByteField           _node_color;
-    private IntegerField        _previous_property;
-    private IntegerField        _next_property;
-    private IntegerField        _child_property;
-    private ClassID             _storage_clsid;
-    private IntegerField        _user_flags;
-    private IntegerField        _seconds_1;
-    private IntegerField        _days_1;
-    private IntegerField        _seconds_2;
-    private IntegerField        _days_2;
-    private IntegerField        _start_block;
-    private IntegerField        _size;
-    private byte[]              _raw_data;
-    private int                 _index;
-    private Child               _next_child;
-    private Child               _previous_child;
-
-    protected Property()
-    {
-        _raw_data = new byte[ POIFSConstants.PROPERTY_SIZE ];
-        Arrays.fill(_raw_data, _default_fill);
-        _name_size         = new ShortField(_name_size_offset);
-        _property_type     =
-            new ByteField(PropertyConstants.PROPERTY_TYPE_OFFSET);
-        _node_color        = new ByteField(_node_color_offset);
-        _previous_property = new IntegerField(_previous_property_offset,
-                                              _NO_INDEX, _raw_data);
-        _next_property     = new IntegerField(_next_property_offset,
-                                              _NO_INDEX, _raw_data);
-        _child_property    = new IntegerField(_child_property_offset,
-                                              _NO_INDEX, _raw_data);
-        _storage_clsid     = new ClassID(_raw_data,_storage_clsid_offset);
-        _user_flags        = new IntegerField(_user_flags_offset, 0, _raw_data);
-        _seconds_1         = new IntegerField(_seconds_1_offset, 0,
-                                              _raw_data);
-        _days_1            = new IntegerField(_days_1_offset, 0, _raw_data);
-        _seconds_2         = new IntegerField(_seconds_2_offset, 0,
-                                              _raw_data);
-        _days_2            = new IntegerField(_days_2_offset, 0, _raw_data);
-        _start_block       = new IntegerField(_start_block_offset);
-        _size              = new IntegerField(_size_offset, 0, _raw_data);
-        _index             = _NO_INDEX;
-        setName("");
-        setNextChild(null);
-        setPreviousChild(null);
-    }
-
-    /**
-     * Constructor from byte data
-     *
-     * @param index index number
-     * @param array byte data
-     * @param offset offset into byte data
-     */
-    protected Property(int index, byte [] array, int offset)
-    {
-        _raw_data = new byte[ POIFSConstants.PROPERTY_SIZE ];
-        System.arraycopy(array, offset, _raw_data, 0,
-                         POIFSConstants.PROPERTY_SIZE);
-        _name_size         = new ShortField(_name_size_offset, _raw_data);
-        _property_type     =
-            new ByteField(PropertyConstants.PROPERTY_TYPE_OFFSET, _raw_data);
-        _node_color        = new ByteField(_node_color_offset, _raw_data);
-        _previous_property = new IntegerField(_previous_property_offset,
-                                              _raw_data);
-        _next_property     = new IntegerField(_next_property_offset,
-                                              _raw_data);
-        _child_property    = new IntegerField(_child_property_offset,
-                                              _raw_data);
-        _storage_clsid     = new ClassID(_raw_data,_storage_clsid_offset);
-        _user_flags        = new IntegerField(_user_flags_offset, 0, _raw_data);
-        _seconds_1         = new IntegerField(_seconds_1_offset, _raw_data);
-        _days_1            = new IntegerField(_days_1_offset, _raw_data);
-        _seconds_2         = new IntegerField(_seconds_2_offset, _raw_data);
-        _days_2            = new IntegerField(_days_2_offset, _raw_data);
-        _start_block       = new IntegerField(_start_block_offset, _raw_data);
-        _size              = new IntegerField(_size_offset, _raw_data);
-        _index             = index;
-        int name_length = (_name_size.get() / LittleEndianConsts.SHORT_SIZE)
-                          - 1;
-
-        if (name_length < 1)
-        {
-            _name = "";
-        }
-        else
-        {
-            char[] char_array  = new char[ name_length ];
-            int    name_offset = 0;
-
-            for (int j = 0; j < name_length; j++)
-            {
-                char_array[ j ] = ( char ) new ShortField(name_offset,
-                                                          _raw_data).get();
-                name_offset     += LittleEndianConsts.SHORT_SIZE;
-            }
-            _name = new String(char_array, 0, name_length);
-        }
-        _next_child     = null;
-        _previous_child = null;
-    }
-
-    /**
-     * Write the raw data to an OutputStream.
-     *
-     * @param stream the OutputStream to which the data should be
-     *               written.
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream.
-     */
-    public void writeData(OutputStream stream)
-        throws IOException
-    {
-        stream.write(_raw_data);
-    }
-
-    /**
-     * Set the start block for the document referred to by this
-     * Property.
-     *
-     * @param startBlock the start block index
-     */
-    public void setStartBlock(int startBlock)
-    {
-        _start_block.set(startBlock, _raw_data);
-    }
-
-    /**
-     * @return the start block
-     */
-    public int getStartBlock()
-    {
-        return _start_block.get();
-    }
-
-    /**
-     * find out the document size
-     *
-     * @return size in bytes
-     */
-    public int getSize()
-    {
-        return _size.get();
-    }
-
-    /**
-     * Based on the currently defined size, should this property use
-     * small blocks?
-     *
-     * @return true if the size is less than _big_block_minimum_bytes
-     */
-    public boolean shouldUseSmallBlocks()
-    {
-        return Property.isSmall(_size.get());
-    }
-
-    /**
-     * does the length indicate a small document?
-     *
-     * @param length length in bytes
-     *
-     * @return true if the length is less than
-     *         _big_block_minimum_bytes
-     */
-    public static boolean isSmall(int length)
-    {
-        return length < _big_block_minimum_bytes;
-    }
-
-    /**
-     * Get the name of this property
-     *
-     * @return property name as String
-     */
-    public String getName()
-    {
-        return _name;
-    }
-
-    /**
-     * @return true if a directory type Property
-     */
-    abstract public boolean isDirectory();
-
-    /**
-     * Sets the storage clsid, which is the Class ID of a COM object which
-     *   reads and writes this stream
-     * @return storage Class ID for this property stream
-     */
-    public ClassID getStorageClsid()
-    {
-        return _storage_clsid;
-    }
-
-    /**
-     * Set the name; silently truncates the name if it's too long.
-     *
-     * @param name the new name
-     */
-    protected void setName(String name)
-    {
-        char[] char_array = name.toCharArray();
-        int    limit      = Math.min(char_array.length, _max_name_length);
-
-        _name = new String(char_array, 0, limit);
-        short offset = 0;
-        int   j      = 0;
-
-        for (; j < limit; j++)
-        {
-            new ShortField(offset, ( short ) char_array[ j ], _raw_data);
-            offset += LittleEndianConsts.SHORT_SIZE;
-        }
-        for (; j < _max_name_length + 1; j++)
-        {
-            new ShortField(offset, ( short ) 0, _raw_data);
-            offset += LittleEndianConsts.SHORT_SIZE;
-        }
-
-        // double the count, and include the null at the end
-        _name_size
-            .set(( short ) ((limit + 1)
-                            * LittleEndianConsts.SHORT_SIZE), _raw_data);
-    }
-
-    /**
-     * Sets the storage class ID for this property stream. This is the Class ID
-     *   of the COM object which can read and write this property stream
-     * @param clsidStorage Storage Class ID
-     */
-    public void setStorageClsid( ClassID clsidStorage)
-    {
-        _storage_clsid = clsidStorage;
-        if( clsidStorage == null) {
-            Arrays.fill( _raw_data, _storage_clsid_offset, _storage_clsid_offset + ClassID.LENGTH, (byte) 0);
-        } else {
-            clsidStorage.write( _raw_data, _storage_clsid_offset);
-        }
-    }
-    /**
-     * Set the property type. Makes no attempt to validate the value.
-     *
-     * @param propertyType the property type (root, file, directory)
-     */
-    protected void setPropertyType(byte propertyType)
-    {
-        _property_type.set(propertyType, _raw_data);
-    }
-
-    /**
-     * Set the node color.
-     *
-     * @param nodeColor the node color (red or black)
-     */
-    protected void setNodeColor(byte nodeColor)
-    {
-        _node_color.set(nodeColor, _raw_data);
-    }
-
-    /**
-     * Set the child property.
-     *
-     * @param child the child property's index in the Property Table
-     */
-    protected void setChildProperty(int child)
-    {
-        _child_property.set(child, _raw_data);
-    }
-
-    /**
-     * Get the child property (its index in the Property Table)
-     *
-     * @return child property index
-     */
-    protected int getChildIndex()
-    {
-        return _child_property.get();
-    }
-
-    /**
-     * Set the size of the document associated with this Property
-     *
-     * @param size the size of the document, in bytes
-     */
-    protected void setSize(int size)
-    {
-        _size.set(size, _raw_data);
-    }
-
-    /**
-     * Set the index for this Property
-     *
-     * @param index this Property's index within its containing
-     *              Property Table
-     */
-    protected void setIndex(int index)
-    {
-        _index = index;
-    }
-
-    /**
-     * get the index for this Property
-     *
-     * @return the index of this Property within its Property Table
-     */
-    protected int getIndex()
-    {
-        return _index;
-    }
-
-    /**
-     * Perform whatever activities need to be performed prior to
-     * writing
-     */
-    abstract protected void preWrite();
-
-    /**
-     * get the next sibling
-     *
-     * @return index of next sibling
-     */
-    int getNextChildIndex()
-    {
-        return _next_property.get();
-    }
-
-    /**
-     * get the previous sibling
-     *
-     * @return index of previous sibling
-     */
-    int getPreviousChildIndex()
-    {
-        return _previous_property.get();
-    }
-
-    /**
-     * determine whether the specified index is valid
-     *
-     * @param index value to be checked
-     *
-     * @return true if the index is valid
-     */
-    static boolean isValidIndex(int index)
-    {
-        return index != _NO_INDEX;
-    }
-
-    /**
-     * Get the next Child, if any
-     *
-     * @return the next Child; may return null
-     */
-    public Child getNextChild()
-    {
-        return _next_child;
-    }
-
-    /**
-     * Get the previous Child, if any
-     *
-     * @return the previous Child; may return null
-     */
-    public Child getPreviousChild()
-    {
-        return _previous_child;
-    }
-
-    /**
-     * Set the next Child
-     *
-     * @param child the new 'next' child; may be null, which has the
-     *              effect of saying there is no 'next' child
-     */
-    public void setNextChild(Child child)
-    {
-        _next_child = child;
-        _next_property.set((child == null) ? _NO_INDEX
-                                           : (( Property ) child)
-                                               .getIndex(), _raw_data);
-    }
-
-    /**
-     * Set the previous Child
-     *
-     * @param child the new 'previous' child; may be null, which has
-     *              the effect of saying there is no 'previous' child
-     */
-    public void setPreviousChild(Child child)
-    {
-        _previous_child = child;
-        _previous_property.set((child == null) ? _NO_INDEX
-                                               : (( Property ) child)
-                                                   .getIndex(), _raw_data);
-    }
-
-    /**
-     * Get an array of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an array of Object; may not be null, but may be empty
-     */
-    public Object [] getViewableArray()
-    {
-        Object[] results = new Object[ 5 ];
-
-        results[ 0 ] = "Name          = \"" + getName() + "\"";
-        results[ 1 ] = "Property Type = " + _property_type.get();
-        results[ 2 ] = "Node Color    = " + _node_color.get();
-        long time = _days_1.get();
-
-        time         <<= 32;
-        time         += _seconds_1.get() & 0x0000FFFFL;
-        results[ 3 ] = "Time 1        = " + time;
-        time         = _days_2.get();
-        time         <<= 32;
-        time         += _seconds_2.get() & 0x0000FFFFL;
-        results[ 4 ] = "Time 2        = " + time;
-        return results;
-    }
-
-    /**
-     * Get an Iterator of objects, some of which may implement
-     * POIFSViewable
-     *
-     * @return an Iterator; may not be null, but may have an empty
-     * back end store
-     */
-    public Iterator<Object> getViewableIterator()
-    {
-        return Collections.emptyList().iterator();
-    }
-
-    /**
-     * Give viewers a hint as to whether to call getViewableArray or
-     * getViewableIterator
-     *
-     * @return true if a viewer should call getViewableArray, false if
-     *         a viewer should call getViewableIterator
-     */
-    public boolean preferArray()
-    {
-        return true;
-    }
-
-    /**
-     * Provides a short description of the object, to be used when a
-     * POIFSViewable object has not provided its contents.
-     *
-     * @return short description
-     */
-    public String getShortDescription() {
-        return "Property: \"" + getName() + "\"";
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/PropertyConstants.java b/trunk/src/java/org/apache/poi/poifs/property/PropertyConstants.java
deleted file mode 100644
index cf89f40..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/PropertyConstants.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.property;
-
-/**
- * Interface PropertyConstants
- */
-
-public interface PropertyConstants
-{
-    public static final int  PROPERTY_TYPE_OFFSET = 0x42;
-
-    // the property types
-    public static final byte DIRECTORY_TYPE       = 1;
-    public static final byte DOCUMENT_TYPE        = 2;
-    public static final byte ROOT_TYPE            = 5;
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/PropertyFactory.java b/trunk/src/java/org/apache/poi/poifs/property/PropertyFactory.java
deleted file mode 100644
index df3dcba..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/PropertyFactory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.property;
-
-import java.io.IOException;
-
-import java.util.*;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.storage.ListManagedBlock;
-
-/**
- * Factory for turning an array of RawDataBlock instances containing
- * Property data into an array of proper Property objects.
- *
- * The array produced may be sparse, in that any portion of data that
- * should correspond to a Property, but which does not map to a proper
- * Property (i.e., a DirectoryProperty, DocumentProperty, or
- * RootProperty) will get mapped to a null Property in the array.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-class PropertyFactory {
-    // no need for an accessible constructor
-    private PropertyFactory()
-    {
-    }
-
-    /**
-     * Convert raw data blocks to an array of Property's
-     *
-     * @param blocks to be converted
-     *
-     * @return the converted List of Property objects. May contain
-     *         nulls, but will not be null
-     *
-     * @exception IOException if any of the blocks are empty
-     */
-    static List<Property> convertToProperties(ListManagedBlock [] blocks)
-        throws IOException
-    {
-        List<Property> properties = new ArrayList<Property>();
-
-        for (ListManagedBlock block : blocks) {
-            byte[] data = block.getData();
-            convertToProperties(data, properties);
-        }
-        return properties;
-    }
-    
-    static void convertToProperties(byte[] data, List<Property> properties)
-        throws IOException
-    {
-       int property_count = data.length / POIFSConstants.PROPERTY_SIZE;
-       int offset         = 0;
-
-       for (int k = 0; k < property_count; k++) {
-          switch (data[ offset + PropertyConstants.PROPERTY_TYPE_OFFSET ]) {
-          case PropertyConstants.DIRECTORY_TYPE :
-             properties.add(
-                   new DirectoryProperty(properties.size(), data, offset)
-             );
-             break;
-
-          case PropertyConstants.DOCUMENT_TYPE :
-             properties.add(
-                   new DocumentProperty(properties.size(), data, offset)
-             );
-             break;
-
-          case PropertyConstants.ROOT_TYPE :
-             properties.add(
-                   new RootProperty(properties.size(), data, offset)
-             );
-             break;
-
-          default :
-             properties.add(null);
-             break;
-          }
-          
-          offset += POIFSConstants.PROPERTY_SIZE;
-       }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java b/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java
deleted file mode 100644
index e2b5772..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.storage.BlockWritable;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.poifs.storage.PropertyBlock;
-import org.apache.poi.poifs.storage.RawDataBlockList;
-
-/**
- * This class embodies the Property Table for the {@link org.apache.poi.poifs.filesystem.POIFSFileSystem}; 
- *  this is basically the directory for all of the documents in the
- * filesystem.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-public final class PropertyTable extends PropertyTableBase implements BlockWritable {
-    private POIFSBigBlockSize _bigBigBlockSize;
-    private BlockWritable[]   _blocks;
-
-    public PropertyTable(HeaderBlock headerBlock)
-    {
-        super(headerBlock);
-        _bigBigBlockSize = headerBlock.getBigBlockSize();
-        _blocks = null;
-    }
-
-    /**
-     * reading constructor (used when we've read in a file and we want
-     * to extract the property table from it). Populates the
-     * properties thoroughly
-     *
-     * @param headerBlock the header block of the file
-     * @param blockList the list of blocks
-     *
-     * @exception IOException if anything goes wrong (which should be
-     *            a result of the input being NFG)
-     */
-    public PropertyTable(final HeaderBlock headerBlock,
-                         final RawDataBlockList blockList)
-        throws IOException
-    {
-        super(
-              headerBlock,
-              PropertyFactory.convertToProperties(
-                    blockList.fetchBlocks(headerBlock.getPropertyStart(), -1)
-              )
-        );
-        _bigBigBlockSize = headerBlock.getBigBlockSize();
-        _blocks      = null;
-    }
-
-    /**
-     * Prepare to be written
-     */
-    public void preWrite()
-    {
-        Property[] properties = _properties.toArray(new Property[_properties.size()]);
-
-        // give each property its index
-        for (int k = 0; k < properties.length; k++)
-        {
-            properties[ k ].setIndex(k);
-        }
-
-        // allocate the blocks for the property table
-        _blocks = PropertyBlock.createPropertyBlockArray(_bigBigBlockSize, _properties);
-
-        // prepare each property for writing
-        for (Property property : properties) {
-            property.preWrite();
-        }
-    }
-    
-    /**
-     * Return the number of BigBlock's this instance uses
-     *
-     * @return count of BigBlock instances
-     */
-    public int countBlocks()
-    {
-        return (_blocks == null) ? 0
-                                 : _blocks.length;
-    }
-
-    /**
-     * Write the storage to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-    public void writeBlocks(final OutputStream stream)
-        throws IOException
-    {
-        if (_blocks != null)
-        {
-            for (BlockWritable _block : _blocks) {
-                _block.writeBlocks(stream);
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/PropertyTableBase.java b/trunk/src/java/org/apache/poi/poifs/property/PropertyTableBase.java
deleted file mode 100644
index 477cf03..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/PropertyTableBase.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-import org.apache.poi.poifs.filesystem.BATManaged;
-import org.apache.poi.poifs.storage.HeaderBlock;
-
-/**
- * This class embodies the Property Table for the filesystem,
- *  which looks up entries in the filesystem to their
- *  chain of blocks.
- * This is the core support, there are implementations
- *  for the different block schemes as needed.
- */
-public abstract class PropertyTableBase implements BATManaged {
-    private   final HeaderBlock    _header_block;
-    protected final List<Property> _properties;
-
-    public PropertyTableBase(final HeaderBlock header_block)
-    {
-        _header_block = header_block;
-        _properties  = new ArrayList<Property>();
-        addProperty(new RootProperty());
-    }
-
-    /**
-     * Reading constructor (used when we've read in a file and we want
-     * to extract the property table from it). Populates the
-     * properties thoroughly
-     *
-     * @param header_block the first block to read from
-     * @param properties the list to populate
-     *
-     * @exception IOException if anything goes wrong (which should be
-     *            a result of the input being NFG)
-     */
-    public PropertyTableBase(final HeaderBlock header_block,
-                         final List<Property> properties)
-        throws IOException
-    {
-        _header_block = header_block;
-        _properties   = properties;
-        populatePropertyTree( (DirectoryProperty)_properties.get(0));
-    }
-
-    /**
-     * Add a property to the list of properties we manage
-     *
-     * @param property the new Property to manage
-     */
-    public void addProperty(Property property)
-    {
-        _properties.add(property);
-    }
-
-    /**
-     * Remove a property from the list of properties we manage
-     *
-     * @param property the Property to be removed
-     */
-    public void removeProperty(final Property property)
-    {
-        _properties.remove(property);
-    }
-
-    /**
-     * Get the root property
-     *
-     * @return the root property
-     */
-    public RootProperty getRoot()
-    {
-        // it's always the first element in the List
-        return ( RootProperty ) _properties.get(0);
-    }
-    
-    private void populatePropertyTree(DirectoryProperty root)
-        throws IOException
-    {
-        int index = root.getChildIndex();
-
-        if (!Property.isValidIndex(index))
-        {
-
-            // property has no children
-            return;
-        }
-        Stack<Property> children = new Stack<Property>();
-
-        children.push(_properties.get(index));
-        while (!children.empty())
-        {
-            Property property = children.pop();
-            if (property == null)
-            {
-                // unknown / unsupported / corrupted property, skip
-                continue;
-            }
-
-            root.addChild(property);
-            if (property.isDirectory())
-            {
-                populatePropertyTree(( DirectoryProperty ) property);
-            }
-            index = property.getPreviousChildIndex();
-            if (Property.isValidIndex(index))
-            {
-                children.push(_properties.get(index));
-            }
-            index = property.getNextChildIndex();
-            if (Property.isValidIndex(index))
-            {
-                children.push(_properties.get(index));
-            }
-        }
-    }
-
-    /**
-     * Get the start block for the property table
-     *
-     * @return start block index
-     */
-    public int getStartBlock()
-    {
-        return _header_block.getPropertyStart();
-    }
-
-    /**
-     * Set the start block for this instance
-     *
-     * @param index index into the array of BigBlock instances making
-     *              up the the filesystem
-     */
-    public void setStartBlock(final int index)
-    {
-        _header_block.setPropertyStart(index);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java b/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java
deleted file mode 100644
index 5a8f3d5..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.storage.SmallDocumentBlock;
-
-/**
- * Root property
- */
-public final class RootProperty extends DirectoryProperty {
-   private static final String NAME = "Root Entry";
-
-    RootProperty()
-    {
-        super(NAME);
-
-        // overrides
-        setNodeColor(_NODE_BLACK);
-        setPropertyType(PropertyConstants.ROOT_TYPE);
-        setStartBlock(POIFSConstants.END_OF_CHAIN);
-    }
-
-    /**
-     * reader constructor
-     *
-     * @param index index number
-     * @param array byte data
-     * @param offset offset into byte data
-     */
-    protected RootProperty(final int index, final byte [] array,
-                           final int offset)
-    {
-        super(index, array, offset);
-    }
-
-    /**
-     * set size
-     *
-     * @param size size in terms of small blocks
-     */
-    public void setSize(int size)
-    {
-        super.setSize(SmallDocumentBlock.calcSize(size));
-    }
-
-    /**
-     * Returns the fixed name "Root Entry", as the
-     *  raw property doesn't have a real name set
-     */
-    @Override
-    public String getName() {
-        return NAME;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/property/package.html b/trunk/src/java/org/apache/poi/poifs/property/package.html
deleted file mode 100644
index ff11a20..0000000
--- a/trunk/src/java/org/apache/poi/poifs/property/package.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-property package contains high and low level Property structures for POIFS.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.poifs.filesystem
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java
deleted file mode 100644
index 2aef116..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A block of block allocation table entries. BATBlocks are created
- * only through a static factory method: createBATBlocks.
- */
-public final class BATBlock extends BigBlock {
-    /**
-     * For a regular fat block, these are 128 / 1024 
-     *  next sector values.
-     * For a XFat (DIFat) block, these are 127 / 1023
-     *  next sector values, then a chaining value.
-     */
-    private int[] _values;
-    
-    /**
-     * Does this BATBlock have any free sectors in it?
-     */
-    private boolean _has_free_sectors;
-    
-    /**
-     * Where in the file are we?
-     */
-    private int ourBlockIndex;
-    
-    /**
-     * Create a single instance initialized with default values
-     */
-    private BATBlock(POIFSBigBlockSize bigBlockSize)
-    {
-        super(bigBlockSize);
-        
-        int _entries_per_block = bigBlockSize.getBATEntriesPerBlock();
-        _values = new int[_entries_per_block];
-        _has_free_sectors = true;
-
-        Arrays.fill(_values, POIFSConstants.UNUSED_BLOCK);
-    }
-
-    /**
-     * Create a single instance initialized (perhaps partially) with entries
-     *
-     * @param entries the array of block allocation table entries
-     * @param start_index the index of the first entry to be written
-     *                    to the block
-     * @param end_index the index, plus one, of the last entry to be
-     *                  written to the block (writing is for all index
-     *                  k, start_index <= k < end_index)
-     */
-
-    private BATBlock(POIFSBigBlockSize bigBlockSize, final int [] entries,
-                     final int start_index, final int end_index)
-    {
-        this(bigBlockSize);
-        for (int k = start_index; k < end_index; k++) {
-           _values[k - start_index] = entries[k];
-        }
-        
-        // Do we have any free sectors?
-        if(end_index - start_index == _values.length) {
-           recomputeFree();
-        }
-    }
-    
-    private void recomputeFree() {
-       boolean hasFree = false;
-       for(int k=0; k<_values.length; k++) {
-          if(_values[k] == POIFSConstants.UNUSED_BLOCK) {
-             hasFree = true;
-             break;
-          }
-       }
-       _has_free_sectors = hasFree;
-    }
-
-    /**
-     * Create a single BATBlock from the byte buffer, which must hold at least
-     *  one big block of data to be read.
-     */
-    public static BATBlock createBATBlock(final POIFSBigBlockSize bigBlockSize, ByteBuffer data)
-    {
-       // Create an empty block
-       BATBlock block = new BATBlock(bigBlockSize);
-       
-       // Fill it
-       byte[] buffer = new byte[LittleEndian.INT_SIZE];
-       for(int i=0; i<block._values.length; i++) {
-          data.get(buffer);
-          block._values[i] = LittleEndian.getInt(buffer);
-       }
-       block.recomputeFree();
-       
-       // All done
-       return block;
-    }
-    
-    /**
-     * Creates a single BATBlock, with all the values set to empty.
-     */
-    public static BATBlock createEmptyBATBlock(final POIFSBigBlockSize bigBlockSize, boolean isXBAT) {
-       BATBlock block = new BATBlock(bigBlockSize);
-       if(isXBAT) {
-          block.setXBATChain(bigBlockSize, POIFSConstants.END_OF_CHAIN);
-       }
-       return block;
-    }
-
-    /**
-     * Create an array of BATBlocks from an array of int block
-     * allocation table entries
-     *
-     * @param entries the array of int entries
-     *
-     * @return the newly created array of BATBlocks
-     */
-    public static BATBlock [] createBATBlocks(final POIFSBigBlockSize bigBlockSize, final int [] entries)
-    {
-        int        block_count = calculateStorageRequirements(bigBlockSize, entries.length);
-        BATBlock[] blocks      = new BATBlock[ block_count ];
-        int        index       = 0;
-        int        remaining   = entries.length;
-
-        int _entries_per_block = bigBlockSize.getBATEntriesPerBlock();
-        for (int j = 0; j < entries.length; j += _entries_per_block)
-        {
-            blocks[ index++ ] = new BATBlock(bigBlockSize, entries, j,
-                                             (remaining > _entries_per_block)
-                                             ? j + _entries_per_block
-                                             : entries.length);
-            remaining         -= _entries_per_block;
-        }
-        return blocks;
-    }
-    
-    /**
-     * Create an array of XBATBlocks from an array of int block
-     * allocation table entries
-     *
-     * @param entries the array of int entries
-     * @param startBlock the start block of the array of XBAT blocks
-     *
-     * @return the newly created array of BATBlocks
-     */
-
-    public static BATBlock [] createXBATBlocks(final POIFSBigBlockSize bigBlockSize,
-                                               final int [] entries,
-                                               final int startBlock)
-    {
-        int        block_count =
-            calculateXBATStorageRequirements(bigBlockSize, entries.length);
-        BATBlock[] blocks      = new BATBlock[ block_count ];
-        int        index       = 0;
-        int        remaining   = entries.length;
-
-        int _entries_per_xbat_block = bigBlockSize.getXBATEntriesPerBlock();
-        if (block_count != 0)
-        {
-            for (int j = 0; j < entries.length; j += _entries_per_xbat_block)
-            {
-                blocks[ index++ ] =
-                    new BATBlock(bigBlockSize, entries, j,
-                                 (remaining > _entries_per_xbat_block)
-                                 ? j + _entries_per_xbat_block
-                                 : entries.length);
-                remaining         -= _entries_per_xbat_block;
-            }
-            for (index = 0; index < blocks.length - 1; index++)
-            {
-                blocks[ index ].setXBATChain(bigBlockSize, startBlock + index + 1);
-            }
-            blocks[ index ].setXBATChain(bigBlockSize, POIFSConstants.END_OF_CHAIN);
-        }
-        return blocks;
-    }
-
-    /**
-     * Calculate how many BATBlocks are needed to hold a specified
-     * number of BAT entries.
-     *
-     * @param entryCount the number of entries
-     *
-     * @return the number of BATBlocks needed
-     */
-    public static int calculateStorageRequirements(final POIFSBigBlockSize bigBlockSize, final int entryCount)
-    {
-        int _entries_per_block = bigBlockSize.getBATEntriesPerBlock();
-        return (entryCount + _entries_per_block - 1) / _entries_per_block;
-    }
-
-    /**
-     * Calculate how many XBATBlocks are needed to hold a specified
-     * number of BAT entries.
-     *
-     * @param entryCount the number of entries
-     *
-     * @return the number of XBATBlocks needed
-     */
-    public static int calculateXBATStorageRequirements(final POIFSBigBlockSize bigBlockSize, final int entryCount)
-    {
-        int _entries_per_xbat_block = bigBlockSize.getXBATEntriesPerBlock();
-        return (entryCount + _entries_per_xbat_block - 1)
-               / _entries_per_xbat_block;
-    }
-    
-    /**
-     * Calculates the maximum size of a file which is addressable given the
-     *  number of FAT (BAT) sectors specified. (We don't care if those BAT
-     *  blocks come from the 109 in the header, or from header + XBATS, it
-     *  won't affect the calculation)
-     *  
-     * The actual file size will be between [size of fatCount-1 blocks] and
-     *   [size of fatCount blocks].
-     *  For 512 byte block sizes, this means we may over-estimate by up to 65kb.
-     *  For 4096 byte block sizes, this means we may over-estimate by up to 4mb
-     */
-    public static long calculateMaximumSize(final POIFSBigBlockSize bigBlockSize,
-          final int numBATs) {
-       // Header isn't FAT addressed
-       long size = 1;
-       
-       // The header has up to 109 BATs, and extra ones are referenced
-       //  from XBATs
-       // However, all BATs can contain 128/1024 blocks
-       size += (((long)numBATs) * bigBlockSize.getBATEntriesPerBlock());
-       
-       // So far we've been in sector counts, turn into bytes
-       return size * bigBlockSize.getBigBlockSize();
-    }
-    public static long calculateMaximumSize(final HeaderBlock header)
-    {
-       return calculateMaximumSize(header.getBigBlockSize(), header.getBATCount());
-    }
-
-    /**
-     * Returns the BATBlock that handles the specified offset,
-     *  and the relative index within it.
-     * The List of BATBlocks must be in sequential order
-     */
-    public static BATBlockAndIndex getBATBlockAndIndex(final int offset, 
-                final HeaderBlock header, final List<BATBlock> bats) {
-       POIFSBigBlockSize bigBlockSize = header.getBigBlockSize();
-       int entriesPerBlock = bigBlockSize.getBATEntriesPerBlock();
-       
-       int whichBAT = offset / entriesPerBlock;
-       int index = offset % entriesPerBlock;
-       return new BATBlockAndIndex( index, bats.get(whichBAT) );
-    }
-    
-    /**
-     * Returns the BATBlock that handles the specified offset,
-     *  and the relative index within it, for the mini stream.
-     * The List of BATBlocks must be in sequential order
-     */
-    public static BATBlockAndIndex getSBATBlockAndIndex(final int offset, 
-          final HeaderBlock header, final List<BATBlock> sbats) {
-       POIFSBigBlockSize bigBlockSize = header.getBigBlockSize();
-       int entriesPerBlock = bigBlockSize.getBATEntriesPerBlock();
-       
-       // SBATs are so much easier, as they're chained streams
-       int whichSBAT = offset / entriesPerBlock;
-       int index = offset % entriesPerBlock;
-       return new BATBlockAndIndex( index, sbats.get(whichSBAT) );
-    }
-    
-    private void setXBATChain(final POIFSBigBlockSize bigBlockSize, int chainIndex)
-    {
-        int _entries_per_xbat_block = bigBlockSize.getXBATEntriesPerBlock();
-        _values[ _entries_per_xbat_block ] = chainIndex;
-    }
-    
-    /**
-     * Does this BATBlock have any free sectors in it, or
-     *  is it full?
-     */
-    public boolean hasFreeSectors() {
-       return _has_free_sectors;
-    }
-    /**
-     * How many sectors in this block are taken?
-     * Note that calling {@link #hasFreeSectors()} is much quicker
-     */
-    public int getUsedSectors(boolean isAnXBAT) {
-        int usedSectors = 0;
-        int toCheck = _values.length;
-        if (isAnXBAT) toCheck--; // Last is a chain location
-        for(int k=0; k<toCheck; k++) {
-            if(_values[k] != POIFSConstants.UNUSED_BLOCK) {
-                usedSectors ++;
-            }
-        }
-        return usedSectors;
-    }
-    
-    public int getValueAt(int relativeOffset) {
-       if(relativeOffset >= _values.length) {
-          throw new ArrayIndexOutOfBoundsException(
-                "Unable to fetch offset " + relativeOffset + " as the " + 
-                "BAT only contains " + _values.length + " entries"
-          ); 
-       }
-       return _values[relativeOffset];
-    }
-    public void setValueAt(int relativeOffset, int value) {
-       int oldValue = _values[relativeOffset];
-       _values[relativeOffset] = value;
-       
-       // Do we need to re-compute the free?
-       if(value == POIFSConstants.UNUSED_BLOCK) {
-          _has_free_sectors = true;
-          return;
-       }
-       if(oldValue == POIFSConstants.UNUSED_BLOCK) {
-          recomputeFree();
-       }
-    }
-    
-    /**
-     * Record where in the file we live
-     */
-    public void setOurBlockIndex(int index) {
-       this.ourBlockIndex = index;
-    }
-    /**
-     * Retrieve where in the file we live 
-     */
-    public int getOurBlockIndex() {
-       return ourBlockIndex;
-    }
-
-
-    /* ********** START extension of BigBlock ********** */
-
-   /**
-     * Write the block's data to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-    void writeData(final OutputStream stream)
-        throws IOException
-    {
-       // Save it out
-       stream.write( serialize() );
-    }
-    
-    void writeData(final ByteBuffer block)
-        throws IOException
-    {
-       // Save it out
-       block.put( serialize() );
-    }
-    
-    private byte[] serialize() {
-       // Create the empty array
-       byte[] data = new byte[ bigBlockSize.getBigBlockSize() ];
-       
-       // Fill in the values
-       int offset = 0;
-       for(int i=0; i<_values.length; i++) {
-          LittleEndian.putInt(data, offset, _values[i]);
-          offset += LittleEndian.INT_SIZE;
-       }
-       
-       // Done
-       return data;
-    }
-
-    /* **********  END  extension of BigBlock ********** */
-    
-    
-    public static class BATBlockAndIndex {
-       private final int index;
-       private final BATBlock block;
-       private BATBlockAndIndex(int index, BATBlock block) {
-          this.index = index;
-          this.block = block;
-       }
-       public int getIndex() {
-          return index;
-       }
-       public BATBlock getBlock() {
-          return block;
-       }
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/BigBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/BigBlock.java
deleted file mode 100644
index a3fa3f9..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/BigBlock.java
+++ /dev/null
@@ -1,103 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-/**
- * Abstract base class of all POIFS block storage classes. All
- * extensions of BigBlock should write 512 or 4096 bytes of data when
- * requested to write their data (as per their BigBlockSize).
- *
- * This class has package scope, as there is no reason at this time to
- * make the class public.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-
-abstract class BigBlock
-    implements BlockWritable
-{
-    /** 
-     * Either 512 bytes ({@link POIFSConstants#SMALLER_BIG_BLOCK_SIZE}) 
-     *  or 4096 bytes ({@link POIFSConstants#LARGER_BIG_BLOCK_SIZE})
-     */
-    protected POIFSBigBlockSize bigBlockSize;
-    
-    protected BigBlock(POIFSBigBlockSize bigBlockSize) {
-       this.bigBlockSize = bigBlockSize;
-    }
-
-    /**
-     * Default implementation of write for extending classes that
-     * contain their data in a simple array of bytes.
-     *
-     * @param stream the OutputStream to which the data should be
-     *               written.
-     * @param data the byte array of to be written.
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream.
-     */
-
-    protected void doWriteData(final OutputStream stream, final byte [] data)
-        throws IOException
-    {
-        stream.write(data);
-    }
-
-    /**
-     * Write the block's data to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-
-    abstract void writeData(final OutputStream stream)
-        throws IOException;
-
-    /* ********** START implementation of BlockWritable ********** */
-
-    /**
-     * Write the storage to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-
-    public void writeBlocks(final OutputStream stream)
-        throws IOException
-    {
-        writeData(stream);
-    }
-
-    /* **********  END  implementation of BlockWritable ********** */
-}   // end abstract class BigBlock
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java b/trunk/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java
deleted file mode 100644
index df872b3..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-
-import java.util.*;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.*;
-
-/**
- * This class manages and creates the Block Allocation Table, which is
- * basically a set of linked lists of block indices.
- * <P>
- * Each block of the filesystem has an index. The first block, the
- * header, is skipped; the first block after the header is index 0,
- * the next is index 1, and so on.
- * <P>
- * A block's index is also its index into the Block Allocation
- * Table. The entry that it finds in the Block Allocation Table is the
- * index of the next block in the linked list of blocks making up a
- * file, or it is set to -2: end of list.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-public final class BlockAllocationTableReader {
-    private static final POILogger _logger = POILogFactory.getLogger(BlockAllocationTableReader.class);
-
-    /**
-     * Maximum number size (in blocks) of the allocation table as supported by
-     * POI.<br/>
-     *
-     * This constant has been chosen to help POI identify corrupted data in the
-     * header block (rather than crash immediately with {@link OutOfMemoryError}
-     * ). It's not clear if the compound document format actually specifies any
-     * upper limits. For files with 512 byte blocks, having an allocation table
-     * of 65,335 blocks would correspond to a total file size of 4GB. Needless
-     * to say, POI probably cannot handle files anywhere near that size.
-     */
-    private static final int MAX_BLOCK_COUNT = 65535;
-    private final IntList _entries;
-    private POIFSBigBlockSize bigBlockSize;
-
-    /**
-     * create a BlockAllocationTableReader for an existing filesystem. Side
-     * effect: when this method finishes, the BAT blocks will have
-     * been removed from the raw block list, and any blocks labeled as
-     * 'unused' in the block allocation table will also have been
-     * removed from the raw block list.
-     *
-     * @param block_count the number of BAT blocks making up the block
-     *                    allocation table
-     * @param block_array the array of BAT block indices from the
-     *                    filesystem's header
-     * @param xbat_count the number of XBAT blocks
-     * @param xbat_index the index of the first XBAT block
-     * @param raw_block_list the list of RawDataBlocks
-     *
-     * @exception IOException if, in trying to create the table, we
-     *            encounter logic errors
-     */
-    public BlockAllocationTableReader(POIFSBigBlockSize bigBlockSize, int block_count, int [] block_array,
-            int xbat_count, int xbat_index, BlockList raw_block_list) throws IOException {
-        this(bigBlockSize);
-        
-        sanityCheckBlockCount(block_count);
-
-        // We want to get the whole of the FAT table
-        // To do this:
-        //  * Work through raw_block_list, which points to the 
-        //     first (up to) 109 BAT blocks
-        //  * Jump to the XBAT offset, and read in XBATs which
-        //     point to more BAT blocks
-        int          limit    = Math.min(block_count, block_array.length);
-        int          block_index;
-        
-        // This will hold all of the BAT blocks in order
-        RawDataBlock blocks[] = new RawDataBlock[ block_count ];
-
-        // Process the first (up to) 109 BAT blocks
-        for (block_index = 0; block_index < limit; block_index++)
-        {
-            // Check that the sector number of the BAT block is a valid one
-            int nextOffset = block_array[ block_index ];
-            if(nextOffset > raw_block_list.blockCount()) {
-               throw new IOException("Your file contains " + raw_block_list.blockCount() + 
-                     " sectors, but the initial DIFAT array at index " + block_index +
-                     " referenced block # " + nextOffset + ". This isn't allowed and " +
-                     " your file is corrupt");
-            }
-            // Record the sector number of this BAT block 
-            blocks[ block_index ] =
-                ( RawDataBlock ) raw_block_list.remove(nextOffset);
-        }
-        
-        // Process additional BAT blocks via the XBATs
-        if (block_index < block_count)
-        {
-
-            // must have extended blocks
-            if (xbat_index < 0)
-            {
-                throw new IOException(
-                    "BAT count exceeds limit, yet XBAT index indicates no valid entries");
-            }
-            int chain_index           = xbat_index;
-            int max_entries_per_block = bigBlockSize.getXBATEntriesPerBlock(); 
-            int chain_index_offset    = bigBlockSize.getNextXBATChainOffset(); 
-
-            // Each XBAT block contains either:
-            //  (maximum number of sector indexes) + index of next XBAT
-            //  some sector indexes + FREE sectors to max # + EndOfChain
-            for (int j = 0; j < xbat_count; j++)
-            {
-                limit = Math.min(block_count - block_index,
-                                 max_entries_per_block);
-                byte[] data   = raw_block_list.remove(chain_index).getData();
-                int    offset = 0;
-
-                for (int k = 0; k < limit; k++)
-                {
-                    blocks[ block_index++ ] =
-                        ( RawDataBlock ) raw_block_list
-                            .remove(LittleEndian.getInt(data, offset));
-                    offset                  += LittleEndianConsts.INT_SIZE;
-                }
-                chain_index = LittleEndian.getInt(data, chain_index_offset);
-                if (chain_index == POIFSConstants.END_OF_CHAIN)
-                {
-                    break;
-                }
-            }
-        }
-        if (block_index != block_count)
-        {
-            throw new IOException("Could not find all blocks");
-        }
-
-        // Now that we have all of the raw data blocks which make
-        //  up the FAT, go through and create the indices
-        setEntries(blocks, raw_block_list);
-    }
-
-    /**
-     * create a BlockAllocationTableReader from an array of raw data blocks
-     *
-     * @param blocks the raw data
-     * @param raw_block_list the list holding the managed blocks
-     *
-     * @exception IOException
-     */
-    BlockAllocationTableReader(POIFSBigBlockSize bigBlockSize, ListManagedBlock[] blocks, BlockList raw_block_list)
-            throws IOException {
-        this(bigBlockSize);
-        setEntries(blocks, raw_block_list);
-    }
-
-    BlockAllocationTableReader(POIFSBigBlockSize bigBlockSize) {
-        this.bigBlockSize = bigBlockSize;
-        _entries = new IntList();
-    }
-    
-    public static void sanityCheckBlockCount(int block_count) throws IOException {
-       if (block_count <= 0) {
-          throw new IOException(
-                "Illegal block count; minimum count is 1, got " + 
-                block_count + " instead"
-          );
-       }
-       if (block_count > MAX_BLOCK_COUNT) {
-          throw new IOException(
-                "Block count " + block_count + 
-                " is too high. POI maximum is " + MAX_BLOCK_COUNT + "."
-          );
-       }
-    }
-
-    /**
-     * walk the entries from a specified point and return the
-     * associated blocks. The associated blocks are removed from the
-     * block list
-     *
-     * @param startBlock the first block in the chain
-     * @param blockList the raw data block list
-     *
-     * @return array of ListManagedBlocks, in their correct order
-     *
-     * @exception IOException if there is a problem acquiring the blocks
-     */
-    ListManagedBlock[] fetchBlocks(int startBlock, int headerPropertiesStartBlock,
-            BlockList blockList) throws IOException {
-        List<ListManagedBlock> blocks = new ArrayList<ListManagedBlock>();
-        int  currentBlock = startBlock;
-        boolean firstPass = true;
-        ListManagedBlock dataBlock = null;
-
-        // Process the chain from the start to the end
-        // Normally we have header, data, end
-        // Sometimes we have data, header, end
-        // For those cases, stop at the header, not the end
-        while (currentBlock != POIFSConstants.END_OF_CHAIN) {
-            try {
-                // Grab the data at the current block offset
-                dataBlock = blockList.remove(currentBlock);
-                blocks.add(dataBlock);
-                // Now figure out which block we go to next
-                currentBlock = _entries.get(currentBlock);
-                firstPass = false;
-            } catch(IOException e) {
-                if(currentBlock == headerPropertiesStartBlock) {
-                    // Special case where things are in the wrong order
-                    _logger.log(POILogger.WARN, "Warning, header block comes after data blocks in POIFS block listing");
-                    currentBlock = POIFSConstants.END_OF_CHAIN;
-                } else if(currentBlock == 0 && firstPass) {
-                    // Special case where the termination isn't done right
-                    //  on an empty set
-                    _logger.log(POILogger.WARN, "Warning, incorrectly terminated empty data blocks in POIFS block listing (should end at -2, ended at 0)");
-                    currentBlock = POIFSConstants.END_OF_CHAIN;
-                } else {
-                    // Ripple up
-                    throw e;
-                }
-            }
-        }
-
-        return blocks.toArray(new ListManagedBlock[blocks.size()]);
-    }
-
-    // methods for debugging reader
-
-    /**
-     * determine whether the block specified by index is used or not
-     *
-     * @param index index of block in question
-     *
-     * @return true if the specific block is used, else false
-     */
-    boolean isUsed(int index) {
-
-        try {
-            return _entries.get(index) != -1;
-        } catch (IndexOutOfBoundsException e) {
-            // ignored
-            return false;
-        }
-    }
-
-    /**
-     * return the next block index
-     *
-     * @param index of the current block
-     *
-     * @return index of the next block (may be
-     *         POIFSConstants.END_OF_CHAIN, indicating end of chain
-     *         (duh))
-     *
-     * @exception IOException if the current block is unused
-     */
-    int getNextBlockIndex(int index) throws IOException {
-        if (isUsed(index)) {
-            return _entries.get(index);
-        }
-        throw new IOException("index " + index + " is unused");
-    }
-
-    /**
-     * Convert an array of blocks into a set of integer indices
-     *
-     * @param blocks the array of blocks containing the indices
-     * @param raw_blocks the list of blocks being managed. Unused
-     *                   blocks will be eliminated from the list
-     */
-    private void setEntries(ListManagedBlock[] blocks, BlockList raw_blocks) throws IOException {
-        int limit = bigBlockSize.getBATEntriesPerBlock(); 
-
-        for (int block_index = 0; block_index < blocks.length; block_index++)
-        {
-            byte[] data   = blocks[ block_index ].getData();
-            int    offset = 0;
-
-            for (int k = 0; k < limit; k++)
-            {
-                int entry = LittleEndian.getInt(data, offset);
-
-                if (entry == POIFSConstants.UNUSED_BLOCK)
-                {
-                    raw_blocks.zap(_entries.size());
-                }
-                _entries.add(entry);
-                offset += LittleEndianConsts.INT_SIZE;
-            }
-
-            // discard block
-            blocks[ block_index ] = null;
-        }
-        raw_blocks.setBAT(this);
-    }
-
-    @Internal
-    public IntList getEntries() {
-        return _entries;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/BlockAllocationTableWriter.java b/trunk/src/java/org/apache/poi/poifs/storage/BlockAllocationTableWriter.java
deleted file mode 100644
index e037b89..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/BlockAllocationTableWriter.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.BATManaged;
-import org.apache.poi.util.IntList;
-
-/**
- * This class manages and creates the Block Allocation Table, which is
- * basically a set of linked lists of block indices.
- * <P>
- * Each block of the filesystem has an index. The first block, the
- * header, is skipped; the first block after the header is index 0,
- * the next is index 1, and so on.
- * <P>
- * A block's index is also its index into the Block Allocation
- * Table. The entry that it finds in the Block Allocation Table is the
- * index of the next block in the linked list of blocks making up a
- * file, or it is set to -2: end of list.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-public final class BlockAllocationTableWriter implements BlockWritable, BATManaged {
-    private IntList    _entries;
-    private BATBlock[] _blocks;
-    private int        _start_block;
-    private POIFSBigBlockSize _bigBlockSize;
-
-    /**
-     * create a BlockAllocationTableWriter
-     */
-    public BlockAllocationTableWriter(POIFSBigBlockSize bigBlockSize)
-    {
-       _bigBlockSize = bigBlockSize; 
-        _start_block  = POIFSConstants.END_OF_CHAIN;
-        _entries      = new IntList();
-        _blocks       = new BATBlock[ 0 ];
-    }
-
-    /**
-     * Create the BATBlocks we need
-     *
-     * @return start block index of BAT blocks
-     */
-    public int createBlocks()
-    {
-        int xbat_blocks = 0;
-        int bat_blocks  = 0;
-
-        while (true)
-        {
-            int calculated_bat_blocks  =
-                BATBlock.calculateStorageRequirements(_bigBlockSize,
-                                                      bat_blocks
-                                                      + xbat_blocks
-                                                      + _entries.size());
-            int calculated_xbat_blocks =
-                HeaderBlockWriter.calculateXBATStorageRequirements(
-                      _bigBlockSize, calculated_bat_blocks);
-
-            if ((bat_blocks == calculated_bat_blocks)
-                    && (xbat_blocks == calculated_xbat_blocks))
-            {
-
-                // stable ... we're OK
-                break;
-            }
-            bat_blocks  = calculated_bat_blocks;
-            xbat_blocks = calculated_xbat_blocks;
-        }
-        int startBlock = allocateSpace(bat_blocks);
-
-        allocateSpace(xbat_blocks);
-        simpleCreateBlocks();
-        return startBlock;
-    }
-
-    /**
-     * Allocate space for a block of indices
-     *
-     * @param blockCount the number of blocks to allocate space for
-     *
-     * @return the starting index of the blocks
-     */
-    public int allocateSpace(final int blockCount)
-    {
-        int startBlock = _entries.size();
-
-        if (blockCount > 0)
-        {
-            int limit = blockCount - 1;
-            int index = startBlock + 1;
-
-            for (int k = 0; k < limit; k++)
-            {
-                _entries.add(index++);
-            }
-            _entries.add(POIFSConstants.END_OF_CHAIN);
-        }
-        return startBlock;
-    }
-
-    /**
-     * get the starting block
-     *
-     * @return the starting block index
-     */
-    public int getStartBlock()
-    {
-        return _start_block;
-    }
-
-    /**
-     * create the BATBlocks
-     */
-    void simpleCreateBlocks()
-    {
-        _blocks = BATBlock.createBATBlocks(_bigBlockSize, _entries.toArray());
-    }
-
-    /**
-     * Write the storage to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-    public void writeBlocks(final OutputStream stream)
-        throws IOException
-    {
-        for (int j = 0; j < _blocks.length; j++)
-        {
-            _blocks[ j ].writeBlocks(stream);
-        }
-    }
-    
-    /**
-     * Write the BAT into its associated block
-     */
-    public static void writeBlock(final BATBlock bat, final ByteBuffer block) 
-        throws IOException
-    {
-        bat.writeData(block);
-    }
-
-    /**
-     * Return the number of BigBlock's this instance uses
-     *
-     * @return count of BigBlock instances
-     */
-    public int countBlocks()
-    {
-        return _blocks.length;
-    }
-
-    /**
-     * Set the start block for this instance
-     */
-    public void setStartBlock(int start_block)
-    {
-        _start_block = start_block;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/BlockList.java b/trunk/src/java/org/apache/poi/poifs/storage/BlockList.java
deleted file mode 100644
index dfbd69c..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/BlockList.java
+++ /dev/null
@@ -1,83 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-
-/**
- * Interface for lists of blocks that are mapped by block allocation
- * tables
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public interface BlockList
-{
-
-    /**
-     * remove the specified block from the list
-     *
-     * @param index the index of the specified block; if the index is
-     *              out of range, that's ok
-     */
-
-    void zap(final int index);
-
-    /**
-     * remove and return the specified block from the list
-     *
-     * @param index the index of the specified block
-     *
-     * @return the specified block
-     *
-     * @exception IOException if the index is out of range or has
-     *            already been removed
-     */
-
-     ListManagedBlock remove(final int index) throws IOException;
-
-    /**
-     * get the blocks making up a particular stream in the list. The
-     * blocks are removed from the list.
-     *
-     * @param startBlock the index of the first block in the stream
-     * @param headerPropertiesStartBlock the index of the first header block in the stream
-     *
-     * @return the stream as an array of correctly ordered blocks
-     *
-     * @exception IOException if blocks are missing
-     */
-
-     ListManagedBlock [] fetchBlocks(final int startBlock, final int headerPropertiesStartBlock)
-        throws IOException;
-
-    /**
-     * set the associated BlockAllocationTable
-     *
-     * @param bat the associated BlockAllocationTable
-     *
-     * @exception IOException
-     */
-
-    void setBAT(final BlockAllocationTableReader bat) throws IOException;
-    
-    int blockCount();
-}   // end public interface BlockList
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/BlockListImpl.java b/trunk/src/java/org/apache/poi/poifs/storage/BlockListImpl.java
deleted file mode 100644
index f3d459e..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/BlockListImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-
-import org.apache.poi.util.Internal;
-
-/**
- * A simple implementation of BlockList
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-abstract class BlockListImpl implements BlockList {
-    private ListManagedBlock[]         _blocks;
-    private BlockAllocationTableReader _bat;
-
-    protected BlockListImpl()
-    {
-        _blocks = new ListManagedBlock[ 0 ];
-        _bat    = null;
-    }
-
-    /**
-     * provide blocks to manage
-     *
-     * @param blocks blocks to be managed
-     */
-    protected void setBlocks(final ListManagedBlock [] blocks)
-    {
-        _blocks = blocks.clone();
-    }
-
-    /**
-     * remove the specified block from the list
-     *
-     * @param index the index of the specified block; if the index is
-     *              out of range, that's ok
-     */
-    public void zap(final int index)
-    {
-        if ((index >= 0) && (index < _blocks.length))
-        {
-            _blocks[ index ] = null;
-        }
-    }
-
-    /**
-     * Internal method. Gets, without sanity checks or
-     *  removing.
-     */
-    @Internal
-    public ListManagedBlock get(final int index) {
-        return _blocks[index];
-    }
-
-    /**
-     * remove and return the specified block from the list
-     *
-     * @param index the index of the specified block
-     *
-     * @return the specified block
-     *
-     * @exception IOException if the index is out of range or has
-     *            already been removed
-     */
-    public ListManagedBlock remove(final int index)
-        throws IOException
-    {
-        ListManagedBlock result = null;
-
-        try
-        {
-            result = _blocks[ index ];
-            if (result == null)
-            {
-                throw new IOException(
-                		"block[ " + index + " ] already removed - " +
-                		"does your POIFS have circular or duplicate block references?"
-                );
-            }
-            _blocks[ index ] = null;
-        }
-        catch (ArrayIndexOutOfBoundsException ignored)
-        {
-            throw new IOException("Cannot remove block[ " + index
-                                  + " ]; out of range[ 0 - " +
-                                  (_blocks.length-1) + " ]");
-        }
-        return result;
-    }
-
-    /**
-     * get the blocks making up a particular stream in the list. The
-     * blocks are removed from the list.
-     *
-     * @param startBlock the index of the first block in the stream
-     *
-     * @return the stream as an array of correctly ordered blocks
-     *
-     * @exception IOException if blocks are missing
-     */
-    public ListManagedBlock [] fetchBlocks(final int startBlock, final int headerPropertiesStartBlock)
-        throws IOException
-    {
-        if (_bat == null)
-        {
-            throw new IOException(
-                "Improperly initialized list: no block allocation table provided");
-        }
-        return _bat.fetchBlocks(startBlock, headerPropertiesStartBlock, this);
-    }
-
-    /**
-     * set the associated BlockAllocationTable
-     *
-     * @param bat the associated BlockAllocationTable
-     */
-    public void setBAT(final BlockAllocationTableReader bat)
-        throws IOException
-    {
-        if (_bat != null)
-        {
-            throw new IOException(
-                "Attempt to replace existing BlockAllocationTable");
-        }
-        _bat = bat;
-    }
-    
-    /**
-     * Returns the count of the number of blocks
-     */
-    public int blockCount() {
-       return _blocks.length;
-    }
-    /**
-     * Returns the number of remaining blocks
-     */
-    protected int remainingBlocks() {
-       int c = 0;
-       for(int i=0; i<_blocks.length; i++) {
-          if(_blocks[i] != null) c++;
-       }
-       return c;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/BlockWritable.java b/trunk/src/java/org/apache/poi/poifs/storage/BlockWritable.java
deleted file mode 100644
index 3bf833e..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/BlockWritable.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * An interface for persisting block storage of POIFS components.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public interface BlockWritable
-{
-
-    /**
-     * Write the storage to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-
-    void writeBlocks(final OutputStream stream) throws IOException;
-}   // end public interface BlockWritable
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/DataInputBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/DataInputBlock.java
deleted file mode 100644
index 0710b4e..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/DataInputBlock.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-/**
- * Wraps a <tt>byte</tt> array and provides simple data input access.
- * Internally, this class maintains a buffer read index, so that for the most part, primitive
- * data can be read in a data-input-stream-like manner.<p/>
- *
- * Note - the calling class should call the {@link #available()} method to detect end-of-buffer
- * and move to the next data block when the current is exhausted.
- * For optimisation reasons, no error handling is performed in this class.  Thus, mistakes in
- * calling code ran may raise ugly exceptions here, like {@link ArrayIndexOutOfBoundsException},
- * etc .<p/>
- *
- * The multi-byte primitive input methods ({@link #readUShortLE()}, {@link #readIntLE()} and
- * {@link #readLongLE()}) have corresponding 'spanning read' methods which (when required) perform
- * a read across the block boundary.  These spanning read methods take the previous
- * {@link DataInputBlock} as a parameter.
- * Reads of larger amounts of data (into <tt>byte</tt> array buffers) must be managed by the caller
- * since these could conceivably involve more than two blocks.
- *
- * @author Josh Micich
- */
-public final class DataInputBlock {
-
-	/**
-	 * Possibly any size (usually 512K or 64K).  Assumed to be at least 8 bytes for all blocks
-	 * before the end of the stream.  The last block in the stream can be any size except zero. 
-	 */
-	private final byte[] _buf;
-	private int _readIndex;
-	private int _maxIndex;
-
-	DataInputBlock(byte[] data, int startOffset) { // NOSONAR
-		_buf = data;
-		_readIndex = startOffset;
-		_maxIndex = _buf.length;
-	}
-	public int available() {
-		return _maxIndex-_readIndex;
-	}
-
-	public int readUByte() {
-		return _buf[_readIndex++] & 0xFF;
-	}
-
-	/**
-	 * Reads a <tt>short</tt> which was encoded in <em>little endian</em> format.
-	 */
-	public int readUShortLE() {
-		int i = _readIndex;
-		
-		int b0 = _buf[i++] & 0xFF;
-		int b1 = _buf[i++] & 0xFF;
-		_readIndex = i;
-		return (b1 << 8) + (b0 << 0);
-	}
-
-	/**
-	 * Reads a <tt>short</tt> which spans the end of <tt>prevBlock</tt> and the start of this block.
-	 */
-	public int readUShortLE(DataInputBlock prevBlock) {
-		// simple case - will always be one byte in each block
-		int i = prevBlock._buf.length-1;
-		
-		int b0 = prevBlock._buf[i] & 0xFF;
-		int b1 = _buf[_readIndex++] & 0xFF;
-		return (b1 << 8) + (b0 << 0);
-	}
-
-	/**
-	 * Reads an <tt>int</tt> which was encoded in <em>little endian</em> format.
-	 */
-	public int readIntLE() {
-		int i = _readIndex;
-		
-		int b0 = _buf[i++] & 0xFF;
-		int b1 = _buf[i++] & 0xFF;
-		int b2 = _buf[i++] & 0xFF;
-		int b3 = _buf[i++] & 0xFF;
-		_readIndex = i;
-		return (b3 << 24) + (b2 << 16) + (b1 << 8) + (b0 << 0);
-	}
-
-	/**
-	 * Reads an <tt>int</tt> which spans the end of <tt>prevBlock</tt> and the start of this block.
-	 */
-	public int readIntLE(DataInputBlock prevBlock, int prevBlockAvailable) {
-		byte[] buf = new byte[4];
-		
-		readSpanning(prevBlock, prevBlockAvailable, buf);
-		int b0 = buf[0] & 0xFF;
-		int b1 = buf[1] & 0xFF;
-		int b2 = buf[2] & 0xFF;
-		int b3 = buf[3] & 0xFF;
-		return (b3 << 24) + (b2 << 16) + (b1 << 8) + (b0 << 0);
-	}
-
-	/**
-	 * Reads a <tt>long</tt> which was encoded in <em>little endian</em> format.
-	 */
-	public long readLongLE() {
-		int i = _readIndex;
-		
-		int b0 = _buf[i++] & 0xFF;
-		int b1 = _buf[i++] & 0xFF;
-		int b2 = _buf[i++] & 0xFF;
-		int b3 = _buf[i++] & 0xFF;
-		int b4 = _buf[i++] & 0xFF;
-		int b5 = _buf[i++] & 0xFF;
-		int b6 = _buf[i++] & 0xFF;
-		int b7 = _buf[i++] & 0xFF;
-		_readIndex = i;
-		return (((long)b7 << 56) +
-				((long)b6 << 48) +
-				((long)b5 << 40) +
-				((long)b4 << 32) +
-				((long)b3 << 24) +
-				(b2 << 16) +
-				(b1 <<  8) +
-				(b0 <<  0));
-	}
-
-	/**
-	 * Reads a <tt>long</tt> which spans the end of <tt>prevBlock</tt> and the start of this block.
-	 */
-	public long readLongLE(DataInputBlock prevBlock, int prevBlockAvailable) {
-		byte[] buf = new byte[8];
-		
-		readSpanning(prevBlock, prevBlockAvailable, buf);
-		
-		int b0 = buf[0] & 0xFF;
-		int b1 = buf[1] & 0xFF;
-		int b2 = buf[2] & 0xFF;
-		int b3 = buf[3] & 0xFF;
-		int b4 = buf[4] & 0xFF;
-		int b5 = buf[5] & 0xFF;
-		int b6 = buf[6] & 0xFF;
-		int b7 = buf[7] & 0xFF;
-		return (((long)b7 << 56) +
-				((long)b6 << 48) +
-				((long)b5 << 40) +
-				((long)b4 << 32) +
-				((long)b3 << 24) +
-				(b2 << 16) +
-				(b1 <<  8) +
-				(b0 <<  0));
-	}
-
-	/**
-	 * Reads a small amount of data from across the boundary between two blocks.  
-	 * The {@link #_readIndex} of this (the second) block is updated accordingly.
-	 * Note- this method (and other code) assumes that the second {@link DataInputBlock}
-	 * always is big enough to complete the read without being exhausted.
-	 */
-	private void readSpanning(DataInputBlock prevBlock, int prevBlockAvailable, byte[] buf) {
-		System.arraycopy(prevBlock._buf, prevBlock._readIndex, buf, 0, prevBlockAvailable);
-		int secondReadLen = buf.length-prevBlockAvailable;
-		System.arraycopy(_buf, 0, buf, prevBlockAvailable, secondReadLen);
-		_readIndex = secondReadLen;
-	}
-
-	/**
-	 * Reads <tt>len</tt> bytes from this block into the supplied buffer.
-	 */
-	public void readFully(byte[] buf, int off, int len) {
-		System.arraycopy(_buf, _readIndex, buf, off, len);
-		_readIndex += len;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/DocumentBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/DocumentBlock.java
deleted file mode 100644
index a7c5686..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/DocumentBlock.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.IOUtils;
-
-/**
- * A block of document data.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-public final class DocumentBlock extends BigBlock {
-    private static final byte _default_value = ( byte ) 0xFF;
-    private byte[]            _data;
-    private int               _bytes_read;
-
-    /**
-     * create a document block from a raw data block
-     *
-     * @param block the raw data block
-     *
-     * @exception IOException
-     */
-
-    public DocumentBlock(final RawDataBlock block)
-        throws IOException
-    {
-        super(
-              block.getBigBlockSize() == POIFSConstants.SMALLER_BIG_BLOCK_SIZE ?
-                    POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS :
-                    POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS
-        );
-        _data       = block.getData();
-        _bytes_read = _data.length;
-    }
-
-    /**
-     * Create a single instance initialized with data.
-     *
-     * @param stream the InputStream delivering the data.
-     *
-     * @exception IOException
-     */
-
-    public DocumentBlock(final InputStream stream, POIFSBigBlockSize bigBlockSize)
-        throws IOException
-    {
-        this(bigBlockSize);
-        int count = IOUtils.readFully(stream, _data);
-
-        _bytes_read = (count == -1) ? 0
-                                    : count;
-    }
-
-    /**
-     * Create a single instance initialized with default values
-     */
-
-    private DocumentBlock(POIFSBigBlockSize bigBlockSize)
-    {
-        super(bigBlockSize);
-        _data = new byte[ bigBlockSize.getBigBlockSize() ];
-        Arrays.fill(_data, _default_value);
-    }
-
-    /**
-     * Get the number of bytes read for this block
-     *
-     * @return bytes read into the block
-     */
-
-    public int size()
-    {
-        return _bytes_read;
-    }
-
-    /**
-     * Was this a partially read block?
-     *
-     * @return true if the block was only partially filled with data
-     */
-
-    public boolean partiallyRead()
-    {
-        return _bytes_read != bigBlockSize.getBigBlockSize();
-    }
-
-    /**
-     * @return the fill byte used
-     */
-
-    public static byte getFillByte()
-    {
-        return _default_value;
-    }
-
-    /**
-     * convert a single long array into an array of DocumentBlock
-     * instances
-     *
-     * @param array the byte array to be converted
-     * @param size the intended size of the array (which may be smaller)
-     *
-     * @return an array of DocumentBlock instances, filled from the
-     *         input array
-     */
-
-    public static DocumentBlock [] convert(final POIFSBigBlockSize bigBlockSize,
-                                           final byte [] array,
-                                           final int size)
-    {
-        DocumentBlock[] rval   =
-            new DocumentBlock[ (size + bigBlockSize.getBigBlockSize() - 1) / bigBlockSize.getBigBlockSize() ];
-        int             offset = 0;
-
-        for (int k = 0; k < rval.length; k++)
-        {
-            rval[ k ] = new DocumentBlock(bigBlockSize);
-            if (offset < array.length)
-            {
-                int length = Math.min(bigBlockSize.getBigBlockSize(),
-                                      array.length - offset);
-
-                System.arraycopy(array, offset, rval[ k ]._data, 0, length);
-                if (length != bigBlockSize.getBigBlockSize())
-                {
-                    Arrays.fill(rval[ k ]._data, length,
-                          bigBlockSize.getBigBlockSize(),
-                                _default_value);
-                }
-            }
-            else
-            {
-                Arrays.fill(rval[ k ]._data, _default_value);
-            }
-            offset += bigBlockSize.getBigBlockSize();
-        }
-        return rval;
-    }
-
-    public static DataInputBlock getDataInputBlock(DocumentBlock[] blocks, int offset) {
-        if(blocks == null || blocks.length == 0) {
-           return null;
-        }
-        
-        // Key things about the size of the block
-        POIFSBigBlockSize bigBlockSize = blocks[0].bigBlockSize;
-        int BLOCK_SHIFT = bigBlockSize.getHeaderValue();
-        int BLOCK_SIZE = bigBlockSize.getBigBlockSize();
-        int BLOCK_MASK = BLOCK_SIZE - 1;
-
-        // Now do the offset lookup
-        int firstBlockIndex = offset >> BLOCK_SHIFT;
-        int firstBlockOffset= offset & BLOCK_MASK;
-        return new DataInputBlock(blocks[firstBlockIndex]._data, firstBlockOffset);
-    }
-
-    /* ********** START extension of BigBlock ********** */
-
-    /**
-     * Write the block's data to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-
-    void writeData(final OutputStream stream)
-        throws IOException
-    {
-        doWriteData(stream, _data);
-    }
-
-    /* **********  END  extension of BigBlock ********** */
-}   // end public class DocumentBlock
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java
deleted file mode 100644
index aced76b..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.NotOLE2FileException;
-import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.IntegerField;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LongField;
-import org.apache.poi.util.ShortField;
-
-/**
- * The block containing the archive header
- */
-public final class HeaderBlock implements HeaderBlockConstants {
-    private static final byte[] MAGIC_BIFF2 = {
-        0x09, 0x00, // sid=0x0009
-        0x04, 0x00, // size=0x0004
-        0x00, 0x00, // unused
-        0x70, 0x00  // 0x70 = multiple values
-    };
-
-    private static final byte[] MAGIC_BIFF3 = {
-        0x09, 0x02, // sid=0x0209
-        0x06, 0x00, // size=0x0006
-        0x00, 0x00, // unused
-        0x70, 0x00  // 0x70 = multiple values
-    };
-
-    private static final byte[] MAGIC_BIFF4a = {
-        0x09, 0x04, // sid=0x0409
-        0x06, 0x00, // size=0x0006
-        0x00, 0x00, // unused
-        0x70, 0x00  // 0x70 = multiple values
-    };
-
-    private static final byte[] MAGIC_BIFF4b = {
-        0x09, 0x04, // sid=0x0409
-        0x06, 0x00, // size=0x0006
-        0x00, 0x00, // unused
-        0x00, 0x01
-    };
-
-    private static final byte _default_value = ( byte ) 0xFF;
-
-    /**
-	 * What big block size the file uses. Most files
-	 *  use 512 bytes, but a few use 4096
-	 */
-	private final POIFSBigBlockSize bigBlockSize;
-
-	/** 
-	 * Number of big block allocation table blocks (int).
-	 * (Number of FAT Sectors in Microsoft parlance).
-	 */
-	private int _bat_count;
-
-	/** 
-	 * Start of the property set block (int index of the property set
-	 * chain's first big block).
-	 */
-	private int _property_start;
-
-	/** 
-	 * start of the small block allocation table (int index of small
-	 * block allocation table's first big block)
-	 */
-	private int _sbat_start;
-	/**
-	 * Number of small block allocation table blocks (int)
-	 * (Number of MiniFAT Sectors in Microsoft parlance)
-	 */
-	private int _sbat_count;
-
-	/** 
-	 * Big block index for extension to the big block allocation table
-	 */
-	private int _xbat_start;
-	/**
-	 * Number of big block allocation table blocks (int)
-	 * (Number of DIFAT Sectors in Microsoft parlance)
-	 */
-	private int _xbat_count;
-	
-	/**
-	 * The data. Only ever 512 bytes, because 4096 byte
-	 *  files use zeros for the extra header space.
-	 */
-	private final byte[] _data;
-	
-	/**
-	 * create a new HeaderBlockReader from an InputStream
-	 *
-	 * @param stream the source InputStream
-	 *
-	 * @exception IOException on errors or bad data
-	 */
-	public HeaderBlock(InputStream stream) throws IOException {
-		// Grab the first 512 bytes
-	    // (For 4096 sized blocks, the remaining 3584 bytes are zero)
-		// Then, process the contents
-		this(readFirst512(stream));
-		
-		// Fetch the rest of the block if needed
-		if(bigBlockSize.getBigBlockSize() != 512) {
-		   int rest = bigBlockSize.getBigBlockSize() - 512;
-		   byte[] tmp = new byte[rest];
-		   IOUtils.readFully(stream, tmp);
-		}
-	}
-	
-	public HeaderBlock(ByteBuffer buffer) throws IOException {
-	   this(IOUtils.toByteArray(buffer, POIFSConstants.SMALLER_BIG_BLOCK_SIZE));
-	}
-	
-	private HeaderBlock(byte[] data) throws IOException {
-	   this._data = data.clone();
-	   
-		// verify signature
-		long signature = LittleEndian.getLong(_data, _signature_offset);
-
-		if (signature != _signature) {
-			// Is it one of the usual suspects?
-			if (cmp(POIFSConstants.OOXML_FILE_HEADER, data)) {
-				throw new OfficeXmlFileException("The supplied data appears to be in the Office 2007+ XML. "
-			        + "You are calling the part of POI that deals with OLE2 Office Documents. "
-			        + "You need to call a different part of POI to process this data (eg XSSF instead of HSSF)");
-			}
-			
-            if (cmp(POIFSConstants.RAW_XML_FILE_HEADER, data)) {
-                throw new NotOLE2FileException("The supplied data appears to be a raw XML file. "
-                    + "Formats such as Office 2003 XML are not supported");
-            }
-            
-            // BIFF2 raw stream
-            if (cmp(MAGIC_BIFF2, data)) {
-                throw new OldExcelFormatException("The supplied data appears to be in BIFF2 format. "
-                    + "HSSF only supports the BIFF8 format, try OldExcelExtractor");
-            }
-            
-            // BIFF3 raw stream
-            if (cmp(MAGIC_BIFF3, data)) {
-                throw new OldExcelFormatException("The supplied data appears to be in BIFF3 format. "
-                    + "HSSF only supports the BIFF8 format, try OldExcelExtractor");
-            }
-            
-            // BIFF4 raw stream
-            if (cmp(MAGIC_BIFF4a, data) || cmp(MAGIC_BIFF4b, data)) {
-                throw new OldExcelFormatException("The supplied data appears to be in BIFF4 format. "
-                    + "HSSF only supports the BIFF8 format, try OldExcelExtractor");
-            }
-
-			// Give a generic error if the OLE2 signature isn't found
-			throw new NotOLE2FileException("Invalid header signature; read "
-				                  + HexDump.longToHex(signature) + ", expected "
-				                  + HexDump.longToHex(_signature) + " - Your file appears "
-				                  + "not to be a valid OLE2 document");
-		}
-
-
-		// Figure out our block size
-		if (_data[30] == 12) {
-			this.bigBlockSize = POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS;
-		} else if(_data[30] == 9) {
-			this.bigBlockSize = POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS;
-		} else {
-		   throw new IOException("Unsupported blocksize  (2^"+ _data[30] + "). Expected 2^9 or 2^12.");
-		}
-
-	   // Setup the fields to read and write the counts and starts
-      _bat_count  = new IntegerField(_bat_count_offset, data).get();
-      _property_start = new IntegerField(_property_start_offset,_data).get();
-      _sbat_start = new IntegerField(_sbat_start_offset, _data).get();
-      _sbat_count = new IntegerField(_sbat_block_count_offset, _data).get();
-      _xbat_start = new IntegerField(_xbat_start_offset, _data).get();
-      _xbat_count = new IntegerField(_xbat_count_offset, _data).get();
-	}
-	
-   /**
-    * Create a single instance initialized with default values
-    */
-   public HeaderBlock(POIFSBigBlockSize bigBlockSize)
-   {
-      this.bigBlockSize = bigBlockSize;
-
-      // Our data is always 512 big no matter what
-      _data = new byte[ POIFSConstants.SMALLER_BIG_BLOCK_SIZE ];
-      Arrays.fill(_data, _default_value);
-      
-      // Set all the default values
-      new LongField(_signature_offset, _signature, _data);
-      new IntegerField(0x08, 0, _data);
-      new IntegerField(0x0c, 0, _data);
-      new IntegerField(0x10, 0, _data);
-      new IntegerField(0x14, 0, _data);
-      new ShortField(0x18, ( short ) 0x3b, _data);
-      new ShortField(0x1a, ( short ) 0x3, _data);
-      new ShortField(0x1c, ( short ) -2, _data);
-       
-      new ShortField(0x1e, bigBlockSize.getHeaderValue(), _data);
-      new IntegerField(0x20, 0x6, _data);
-      new IntegerField(0x24, 0, _data);
-      new IntegerField(0x28, 0, _data);
-      new IntegerField(0x34, 0, _data);
-      new IntegerField(0x38, 0x1000, _data);
-      
-      // Initialize the variables
-      _bat_count = 0;
-      _sbat_count = 0;
-      _xbat_count = 0;
-      _property_start = POIFSConstants.END_OF_CHAIN;
-      _sbat_start = POIFSConstants.END_OF_CHAIN;
-      _xbat_start = POIFSConstants.END_OF_CHAIN;
-   }
-   
-	private static byte[] readFirst512(InputStream stream) throws IOException {
-      // Grab the first 512 bytes
-      // (For 4096 sized blocks, the remaining 3584 bytes are zero)
-      byte[] data = new byte[512];
-      int bsCount = IOUtils.readFully(stream, data);
-      if(bsCount != 512) {
-         throw alertShortRead(bsCount, 512);
-      }
-      return data;
-	}
-
-	private static IOException alertShortRead(int pRead, int expectedReadSize) {
-		int read;
-		if (pRead < 0) {
-			//Can't have -1 bytes read in the error message!
-			read = 0;
-		} else {
-			read = pRead;
-		}
-		String type = " byte" + (read == 1 ? (""): ("s"));
-
-		return new IOException("Unable to read entire header; "
-				+ read + type + " read; expected "
-				+ expectedReadSize + " bytes");
-	}
-
-	/**
-	 * get start of Property Table
-	 *
-	 * @return the index of the first block of the Property Table
-	 */
-	public int getPropertyStart() {
-		return _property_start;
-	}
-   /**
-    * Set start of Property Table
-    *
-    * @param startBlock the index of the first block of the Property Table
-    */
-   public void setPropertyStart(final int startBlock) {
-       _property_start = startBlock;
-   }
-
-	/**
-	 * @return start of small block (MiniFAT) allocation table
-	 */
-	public int getSBATStart() {
-		return _sbat_start;
-	}
-	public int getSBATCount() {
-	   return _sbat_count;
-	}
-	
-   /**
-    * Set start of small block allocation table
-    *
-    * @param startBlock the index of the first big block of the small
-    *                   block allocation table
-    */
-   public void setSBATStart(final int startBlock) {
-       _sbat_start = startBlock;
-   }
-   /**
-    * Set count of SBAT blocks
-    *
-    * @param count the number of SBAT blocks
-    */
-   public void setSBATBlockCount(final int count)
-   {
-      _sbat_count = count;
-   }
-
-	/**
-	 * @return number of BAT blocks
-	 */
-	public int getBATCount() {
-		return _bat_count;
-	}
-   /**
-    * Sets the number of BAT blocks that are used.
-    * This is the number used in both the BAT and XBAT. 
-    */
-   public void setBATCount(final int count) {
-      _bat_count = count;
-   }
-
-	/**
-	 * Returns the offsets to the first (up to) 109
-	 *  BAT sectors.
-	 * Any additional BAT sectors are held in the XBAT (DIFAT)
-	 *  sectors in a chain.
-	 * @return BAT offset array
-	 */
-	public int[] getBATArray() {
-      // Read them in
-		int[] result = new int[ Math.min(_bat_count,_max_bats_in_header) ];
-		int offset = _bat_array_offset;
-		for (int j = 0; j < result.length; j++) {
-			result[ j ] = LittleEndian.getInt(_data, offset);
-			offset     += LittleEndianConsts.INT_SIZE;
-		}
-		return result;
-	}
-	/**
-	 * Sets the offsets of the first (up to) 109
-	 *  BAT sectors.
-	 */
-	public void setBATArray(int[] bat_array) {
-	   int count = Math.min(bat_array.length, _max_bats_in_header);
-	   int blank = _max_bats_in_header - count;
-	   
-      int offset = _bat_array_offset;
-	   for(int i=0; i<count; i++) {
-	      LittleEndian.putInt(_data, offset, bat_array[i]);
-         offset += LittleEndianConsts.INT_SIZE;
-	   }
-	   for(int i=0; i<blank; i++) {
-         LittleEndian.putInt(_data, offset, POIFSConstants.UNUSED_BLOCK);
-         offset += LittleEndianConsts.INT_SIZE;
-	   }
-	}
-
-	/**
-	 * @return XBAT (DIFAT) count
-	 */
-	public int getXBATCount() {
-		return _xbat_count;
-	}
-	/**
-	 * Sets the number of XBAT (DIFAT) blocks used
-	 */
-	public void setXBATCount(final int count) {
-	   _xbat_count = count;
-	}
-
-	/**
-	 * @return XBAT (DIFAT) index
-	 */
-	public int getXBATIndex() {
-		return _xbat_start;
-	}
-	/**
-	 * Sets the first XBAT (DIFAT) block location
-	 */
-   public void setXBATStart(final int startBlock) {
-      _xbat_start = startBlock;
-  }
-
-	/**
-	 * @return The Big Block size, normally 512 bytes, sometimes 4096 bytes
-	 */
-	public POIFSBigBlockSize getBigBlockSize() {
-		return bigBlockSize;
-	}
-	
-   /**
-    * Write the block's data to an OutputStream
-    *
-    * @param stream the OutputStream to which the stored data should
-    *               be written
-    *
-    * @exception IOException on problems writing to the specified
-    *            stream
-    */
-   void writeData(final OutputStream stream) throws IOException {
-      // Update the counts and start positions 
-      new IntegerField(_bat_count_offset,      _bat_count, _data);
-      new IntegerField(_property_start_offset, _property_start, _data);
-      new IntegerField(_sbat_start_offset,     _sbat_start, _data);
-      new IntegerField(_sbat_block_count_offset, _sbat_count, _data);
-      new IntegerField(_xbat_start_offset,      _xbat_start, _data);
-      new IntegerField(_xbat_count_offset,      _xbat_count, _data);
-      
-      // Write the main data out
-      stream.write(_data, 0, 512);
-      
-      // Now do the padding if needed
-      for(int i=POIFSConstants.SMALLER_BIG_BLOCK_SIZE; i<bigBlockSize.getBigBlockSize(); i++) {
-         stream.write(0);
-      }
-   }
-   
-   private static boolean cmp(byte[] magic, byte[] data) {
-       int i=0;
-       for (byte m : magic) {
-           byte d = data[i++];
-           if (!(d == m || (m == 0x70 && (d == 0x10 || d == 0x20 || d == 0x40)))) {
-               return false;
-           }
-       }
-       return true;
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java b/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
deleted file mode 100644
index 27e4b41..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * Constants used in reading/writing the Header block
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-public interface HeaderBlockConstants
-{
-    public static final long _signature               = 0xE11AB1A1E011CFD0L;
-    public static final int  _bat_array_offset        = 0x4c;
-    public static final int  _max_bats_in_header      =
-        (POIFSConstants.SMALLER_BIG_BLOCK_SIZE - _bat_array_offset)
-        / LittleEndianConsts.INT_SIZE; // If 4k blocks, rest is blank
-
-    // Note - in Microsoft terms:
-    //  BAT ~= FAT
-    //  SBAT ~= MiniFAT
-    //  XBAT ~= DIFat
-    
-    // useful offsets
-    public static final int  _signature_offset        = 0;
-    public static final int  _bat_count_offset        = 0x2C;
-    public static final int  _property_start_offset   = 0x30;
-    public static final int  _sbat_start_offset       = 0x3C;
-    public static final int  _sbat_block_count_offset = 0x40;
-    public static final int  _xbat_start_offset       = 0x44;
-    public static final int  _xbat_count_offset       = 0x48;
-}   // end public interface HeaderBlockConstants
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockWriter.java b/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockWriter.java
deleted file mode 100644
index 531c2e8..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockWriter.java
+++ /dev/null
@@ -1,195 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-
-/**
- * The block containing the archive header
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-public class HeaderBlockWriter implements HeaderBlockConstants, BlockWritable
-{
-   private final HeaderBlock _header_block;
-
-    /**
-     * Create a single instance initialized with default values
-     */
-    public HeaderBlockWriter(POIFSBigBlockSize bigBlockSize)
-    {
-       _header_block = new HeaderBlock(bigBlockSize);
-    }
-
-    /**
-     * Create a single instance initialized with the specified 
-     *  existing values
-     */
-    public HeaderBlockWriter(HeaderBlock headerBlock)
-    {
-       _header_block = headerBlock;
-    }
-
-    /**
-     * Set BAT block parameters. Assumes that all BAT blocks are
-     * contiguous. Will construct XBAT blocks if necessary and return
-     * the array of newly constructed XBAT blocks.
-     *
-     * @param blockCount count of BAT blocks
-     * @param startBlock index of first BAT block
-     *
-     * @return array of XBAT blocks; may be zero length, will not be
-     *         null
-     */
-
-    public BATBlock [] setBATBlocks(final int blockCount,
-                                    final int startBlock)
-    {
-        BATBlock[] rvalue;
-        POIFSBigBlockSize bigBlockSize = _header_block.getBigBlockSize();
-
-        _header_block.setBATCount(blockCount);
-
-        // Set the BAT locations
-        int limit  = Math.min(blockCount, _max_bats_in_header);
-        int[] bat_blocks = new int[limit];
-        for (int j = 0; j < limit; j++) {
-           bat_blocks[j] = startBlock + j;
-        }
-        _header_block.setBATArray(bat_blocks);
-        
-        // Now do the XBATs
-        if (blockCount > _max_bats_in_header)
-        {
-            int   excess_blocks      = blockCount - _max_bats_in_header;
-            int[] excess_block_array = new int[ excess_blocks ];
-
-            for (int j = 0; j < excess_blocks; j++)
-            {
-                excess_block_array[ j ] = startBlock + j
-                                          + _max_bats_in_header;
-            }
-            rvalue = BATBlock.createXBATBlocks(bigBlockSize, excess_block_array,
-                                               startBlock + blockCount);
-            _header_block.setXBATStart(startBlock + blockCount);
-        }
-        else
-        {
-            rvalue = BATBlock.createXBATBlocks(bigBlockSize, new int[ 0 ], 0);
-            _header_block.setXBATStart(POIFSConstants.END_OF_CHAIN);
-        }
-        _header_block.setXBATCount(rvalue.length);
-        return rvalue;
-    }
-
-    /**
-     * Set start of Property Table
-     *
-     * @param startBlock the index of the first block of the Property
-     *                   Table
-     */
-    public void setPropertyStart(final int startBlock)
-    {
-       _header_block.setPropertyStart(startBlock);
-    }
-
-    /**
-     * Set start of small block allocation table
-     *
-     * @param startBlock the index of the first big block of the small
-     *                   block allocation table
-     */
-    public void setSBATStart(final int startBlock)
-    {
-        _header_block.setSBATStart(startBlock);
-    }
-
-    /**
-     * Set count of SBAT blocks
-     *
-     * @param count the number of SBAT blocks
-     */
-    public void setSBATBlockCount(final int count)
-    {
-       _header_block.setSBATBlockCount(count);
-    }
-
-    /**
-     * For a given number of BAT blocks, calculate how many XBAT
-     * blocks will be needed
-     *
-     * @param blockCount number of BAT blocks
-     *
-     * @return number of XBAT blocks needed
-     */
-
-    static int calculateXBATStorageRequirements(POIFSBigBlockSize bigBlockSize, final int blockCount)
-    {
-        return (blockCount > _max_bats_in_header)
-               ? BATBlock.calculateXBATStorageRequirements(
-                     bigBlockSize, blockCount - _max_bats_in_header)
-               : 0;
-    }
-
-    /* ********** START extension of BigBlock ********** */
-
-    /**
-     * Write the block's data to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-    public void writeBlocks(final OutputStream stream)
-        throws IOException
-    {
-        _header_block.writeData(stream);
-    }
-    
-    /**
-     * Write the block's data to an existing block
-     *
-     * @param block the ByteBuffer of the block to which the 
-     *               stored data should be written
-     *
-     * @exception IOException on problems writing to the block
-     */
-    public void writeBlock(ByteBuffer block)
-        throws IOException
-    {
-       ByteArrayOutputStream baos = new ByteArrayOutputStream(
-             _header_block.getBigBlockSize().getBigBlockSize()
-       );
-       _header_block.writeData(baos);
-       
-       block.put(baos.toByteArray());
-    }
-
-    /* **********  END  extension of BigBlock ********** */
-}   // end public class HeaderBlockWriter
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/ListManagedBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/ListManagedBlock.java
deleted file mode 100644
index 3d582d2..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/ListManagedBlock.java
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-
-/**
- * An interface for blocks managed by a list that works with a
- * BlockAllocationTable to keep block sequences straight
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public interface ListManagedBlock
-{
-
-    /**
-     * Get the data from the block
-     *
-     * @return the block's data as a byte array
-     *
-     * @exception IOException if there is no data
-     */
-
-    public byte [] getData()
-        throws IOException;
-}   // end public interface ListManagedBlock
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/PropertyBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/PropertyBlock.java
deleted file mode 100644
index c824166..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/PropertyBlock.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.property.Property;
-
-/**
- * A block of Property instances
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-public final class PropertyBlock extends BigBlock {
-    private Property[]       _properties;
-
-    /**
-     * Create a single instance initialized with default values
-     *
-     * @param properties the properties to be inserted
-     * @param offset the offset into the properties array
-     */
-
-    private PropertyBlock(final POIFSBigBlockSize bigBlockSize, final Property [] properties, final int offset)
-    {
-        super(bigBlockSize);
-        
-        _properties = new Property[ bigBlockSize.getPropertiesPerBlock() ]; 
-        for (int j = 0; j < _properties.length; j++)
-        {
-            _properties[ j ] = properties[ j + offset ];
-        }
-    }
-
-    /**
-     * Create an array of PropertyBlocks from an array of Property
-     * instances, creating empty Property instances to make up any
-     * shortfall
-     *
-     * @param properties the Property instances to be converted into
-     *                   PropertyBlocks, in a java List
-     *
-     * @return the array of newly created PropertyBlock instances
-     */
-
-    public static BlockWritable [] createPropertyBlockArray(
-            final POIFSBigBlockSize bigBlockSize, final List<Property> properties)
-    {
-        int _properties_per_block = bigBlockSize.getPropertiesPerBlock();
-        int        block_count   =
-            (properties.size() + _properties_per_block - 1)
-            / _properties_per_block;
-        Property[] to_be_written =
-            new Property[ block_count * _properties_per_block ];
-
-        System.arraycopy(properties.toArray(new Property[ 0 ]), 0,
-                         to_be_written, 0, properties.size());
-        for (int j = properties.size(); j < to_be_written.length; j++)
-        {
-
-            // create an instance of an anonymous inner class that
-            // extends Property
-            to_be_written[ j ] = new Property()
-            {
-                protected void preWrite()
-                {
-                }
-
-                public boolean isDirectory()
-                {
-                    return false;
-                }
-            };
-        }
-        BlockWritable[] rvalue = new BlockWritable[ block_count ];
-
-        for (int j = 0; j < block_count; j++)
-        {
-            rvalue[ j ] = new PropertyBlock(bigBlockSize, to_be_written,
-                                            j * _properties_per_block);
-        }
-        return rvalue;
-    }
-
-    /* ********** START extension of BigBlock ********** */
-
-    /**
-     * Write the block's data to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-
-    void writeData(final OutputStream stream)
-        throws IOException
-    {
-        int _properties_per_block = bigBlockSize.getPropertiesPerBlock();
-        for (int j = 0; j < _properties_per_block; j++)
-        {
-            _properties[ j ].writeData(stream);
-        }
-    }
-
-    /* **********  END  extension of BigBlock ********** */
-}   // end public class PropertyBlock
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
deleted file mode 100644
index 923e76f..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-import java.io.*;
-
-/**
- * A big block created from an InputStream, holding the raw data
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public class RawDataBlock
-    implements ListManagedBlock
-{
-    private byte[]  _data;
-    private boolean _eof;
-    private boolean _hasData;
-    static POILogger log = POILogFactory.getLogger(RawDataBlock.class);
-
-    /**
-     * Constructor RawDataBlock
-     *
-     * @param stream the InputStream from which the data will be read
-     *
-     * @exception IOException on I/O errors, and if an insufficient
-     *            amount of data is read (the InputStream must
-     *            be an exact multiple of the block size)
-     */
-    public RawDataBlock(final InputStream stream)
-    		throws IOException {
-    	this(stream, POIFSConstants.SMALLER_BIG_BLOCK_SIZE);
-    }
-    /**
-     * Constructor RawDataBlock
-     *
-     * @param stream the InputStream from which the data will be read
-     * @param blockSize the size of the POIFS blocks, normally 512 bytes
-     * {@link org.apache.poi.poifs.common.POIFSConstants#SMALLER_BIG_BLOCK_SIZE}
-     *
-     * @exception IOException on I/O errors, and if an insufficient
-     *            amount of data is read (the InputStream must
-     *            be an exact multiple of the block size)
-     */
-    public RawDataBlock(final InputStream stream, int blockSize)
-    		throws IOException {
-        _data = new byte[ blockSize ];
-        int count = IOUtils.readFully(stream, _data);
-        _hasData = (count > 0);
-
-        if (count == -1) {
-            _eof = true;
-        }
-        else if (count != blockSize) {
-        	// IOUtils.readFully will always read the
-        	//  requested number of bytes, unless it hits
-        	//  an EOF
-            _eof = true;
-            String type = " byte" + ((count == 1) ? ("")
-                                                  : ("s"));
-
-            log.log(POILogger.ERROR,
-            		"Unable to read entire block; " + count
-                     + type + " read before EOF; expected "
-                     + blockSize + " bytes. Your document "
-                     + "was either written by software that "
-                     + "ignores the spec, or has been truncated!"
-            );
-        }
-        else {
-            _eof = false;
-        }
-    }
-
-    /**
-     * When we read the data, did we hit end of file?
-     *
-     * @return true if the EoF was hit during this block, or
-     *  false if not. If you have a dodgy short last block, then
-     *  it's possible to both have data, and also hit EoF...
-     */
-    public boolean eof() {
-        return _eof;
-    }
-    /**
-     * Did we actually find any data to read? It's possible,
-     *  in the event of a short last block, to both have hit
-     *  the EoF, but also to have data
-     */
-    public boolean hasData() {
-    	return _hasData;
-    }
-    
-    public String toString() {
-       return "RawDataBlock of size " + _data.length; 
-    }
-
-    /* ********** START implementation of ListManagedBlock ********** */
-
-    /**
-     * Get the data from the block
-     *
-     * @return the block's data as a byte array
-     *
-     * @exception IOException if there is no data
-     */
-    public byte [] getData()
-        throws IOException
-    {
-        if (! hasData())
-        {
-            throw new IOException("Cannot return empty data");
-        }
-        return _data;
-    }
-    
-    /**
-     * What's the big block size?
-     */
-    public int getBigBlockSize() {
-       return _data.length;
-    }
-
-    /* **********  END  implementation of ListManagedBlock ********** */
-}   // end public class RawDataBlock
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlockList.java b/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlockList.java
deleted file mode 100644
index eb8bcc0..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlockList.java
+++ /dev/null
@@ -1,70 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import java.io.*;
-
-import java.util.*;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-
-/**
- * A list of RawDataBlocks instances, and methods to manage the list
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public class RawDataBlockList
-    extends BlockListImpl
-{
-
-    /**
-     * Constructor RawDataBlockList
-     *
-     * @param stream the InputStream from which the data will be read
-     * @param bigBlockSize The big block size, either 512 bytes or 4096 bytes
-     *
-     * @exception IOException on I/O errors, and if an incomplete
-     *            block is read
-     */
-
-    public RawDataBlockList(final InputStream stream, POIFSBigBlockSize bigBlockSize)
-        throws IOException
-    {
-        List<RawDataBlock> blocks = new ArrayList<RawDataBlock>();
-
-        while (true)
-        {
-            RawDataBlock block = new RawDataBlock(stream, bigBlockSize.getBigBlockSize());
-            
-            // If there was data, add the block to the list
-            if(block.hasData()) {
-            	blocks.add(block);
-            }
-
-            // If the stream is now at the End Of File, we're done
-            if (block.eof()) {
-                break;
-            }
-        }
-        setBlocks( blocks.toArray(new RawDataBlock[ blocks.size() ]) );
-    }
-}   // end public class RawDataBlockList
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java b/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java
deleted file mode 100644
index 2f95283..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.property.RootProperty;
-
-/**
- * This class implements reading the small document block list from an
- * existing file
- */
-public final class SmallBlockTableReader {
-    private static BlockList prepareSmallDocumentBlocks(
-            final POIFSBigBlockSize bigBlockSize,
-            final RawDataBlockList blockList, final RootProperty root,
-            final int sbatStart)
-        throws IOException
-    {
-        // Fetch the blocks which hold the Small Blocks stream
-        ListManagedBlock [] smallBlockBlocks = 
-                blockList.fetchBlocks(root.getStartBlock(), -1);
-        
-       // Turn that into a list
-        BlockList list =new SmallDocumentBlockList(
-                SmallDocumentBlock.extract(bigBlockSize, smallBlockBlocks));
-
-        return list;
-    }
-    private static BlockAllocationTableReader prepareReader(
-            final POIFSBigBlockSize bigBlockSize,
-            final RawDataBlockList blockList, final BlockList list, 
-            final RootProperty root, final int sbatStart)
-        throws IOException
-    {
-        // Process the SBAT and blocks
-        return new BlockAllocationTableReader(bigBlockSize,
-                blockList.fetchBlocks(sbatStart, -1),
-                list);
-    }
-            
-    /**
-     * Fetch the small document block reader from an existing file, normally
-     *  needed for debugging and low level dumping. You should typically call
-     *  {@link #getSmallDocumentBlocks(POIFSBigBlockSize, RawDataBlockList, RootProperty, int)}
-     *  instead.
-     *
-     * @param blockList the raw data from which the small block table
-     *                  will be extracted
-     * @param root the root property (which contains the start block
-     *             and small block table size)
-     * @param sbatStart the start block of the SBAT
-     *
-     * @return the small document block reader
-     *
-     * @exception IOException
-     */
-    public static BlockAllocationTableReader _getSmallDocumentBlockReader(
-            final POIFSBigBlockSize bigBlockSize,
-            final RawDataBlockList blockList, final RootProperty root,
-            final int sbatStart)
-        throws IOException
-    {
-       BlockList list = prepareSmallDocumentBlocks(
-                bigBlockSize, blockList, root, sbatStart);
-        return prepareReader(
-                bigBlockSize, blockList, list, root, sbatStart);
-    }
-
-    /**
-     * Fetch the small document block list from an existing file
-     *
-     * @param blockList the raw data from which the small block table
-     *                  will be extracted
-     * @param root the root property (which contains the start block
-     *             and small block table size)
-     * @param sbatStart the start block of the SBAT
-     *
-     * @return the small document block list
-     *
-     * @exception IOException
-     */
-    public static BlockList getSmallDocumentBlocks(
-            final POIFSBigBlockSize bigBlockSize,
-            final RawDataBlockList blockList, final RootProperty root,
-            final int sbatStart)
-        throws IOException
-    {
-        BlockList list = prepareSmallDocumentBlocks(
-                bigBlockSize, blockList, root, sbatStart);
-        prepareReader(bigBlockSize, blockList, list, root, sbatStart);
-        return list;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableWriter.java b/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableWriter.java
deleted file mode 100644
index 9c98bb4..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableWriter.java
+++ /dev/null
@@ -1,149 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.BATManaged;
-import org.apache.poi.poifs.filesystem.OPOIFSDocument;
-import org.apache.poi.poifs.property.RootProperty;
-
-import java.util.*;
-
-import java.io.*;
-
-/**
- * This class implements storage for writing the small blocks used by
- * small documents.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public class SmallBlockTableWriter
-    implements BlockWritable, BATManaged
-{
-    private BlockAllocationTableWriter _sbat;
-    private List<SmallDocumentBlock>   _small_blocks;
-    private int                        _big_block_count;
-    private RootProperty               _root;
-
-    /**
-     * Creates new SmallBlockTable
-     *
-     * @param documents a List of POIFSDocument instances
-     * @param root the Filesystem's root property
-     */
-    public SmallBlockTableWriter(final POIFSBigBlockSize bigBlockSize,
-                                 final List<OPOIFSDocument> documents,
-                                 final RootProperty root)
-    {
-        _sbat         = new BlockAllocationTableWriter(bigBlockSize);
-        _small_blocks = new ArrayList<SmallDocumentBlock>();
-        _root         = root;
-
-        for (OPOIFSDocument doc : documents)
-        {
-            SmallDocumentBlock[] blocks = doc.getSmallBlocks();
-
-            if (blocks.length != 0)
-            {
-                doc.setStartBlock(_sbat.allocateSpace(blocks.length));
-                for (int j = 0; j < blocks.length; j++)
-                {
-                    _small_blocks.add(blocks[ j ]);
-                }
-            } else {
-            	doc.setStartBlock(POIFSConstants.END_OF_CHAIN);
-            }
-        }
-        _sbat.simpleCreateBlocks();
-        _root.setSize(_small_blocks.size());
-        _big_block_count = SmallDocumentBlock.fill(bigBlockSize,_small_blocks);
-    }
-
-    /**
-     * Get the number of SBAT blocks
-     *
-     * @return number of SBAT big blocks
-     */
-    
-    public int getSBATBlockCount()
-    {
-	return (_big_block_count + 15) / 16;
-    }
-
-    /**
-     * Get the SBAT
-     *
-     * @return the Small Block Allocation Table
-     */
-
-    public BlockAllocationTableWriter getSBAT()
-    {
-        return _sbat;
-    }
-
-    /* ********** START implementation of BATManaged ********** */
-
-    /**
-     * Return the number of BigBlock's this instance uses
-     *
-     * @return count of BigBlock instances
-     */
-
-    public int countBlocks()
-    {
-        return _big_block_count;
-    }
-
-    /**
-     * Set the start block for this instance
-     *
-     * @param start_block
-     */
-
-    public void setStartBlock(int start_block)
-    {
-        _root.setStartBlock(start_block);
-    }
-
-    /* **********  END  implementation of BATManaged ********** */
-    /* ********** START implementation of BlockWritable ********** */
-
-    /**
-     * Write the storage to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-
-    public void writeBlocks(final OutputStream stream)
-        throws IOException
-    {
-        for (BlockWritable block : _small_blocks) {
-            block.writeBlocks(stream);
-        }
-    }
-
-    /* **********  END  implementation of BlockWritable ********** */
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java b/trunk/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
deleted file mode 100644
index d09bf9e..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-
-/**
- * Storage for documents that are too small to use regular
- * DocumentBlocks for their data
- */
-public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock {
-    private static final int BLOCK_SHIFT = 6;
-
-    private byte[]            _data;
-    private static final byte _default_fill         = ( byte ) 0xff;
-    private static final int  _block_size           = 1 << BLOCK_SHIFT;
-    private static final int BLOCK_MASK = _block_size-1;
-
-    private final int  _blocks_per_big_block;
-    private final POIFSBigBlockSize _bigBlockSize;
-
-    private SmallDocumentBlock(final POIFSBigBlockSize bigBlockSize, final byte [] data, final int index)
-    {
-        this(bigBlockSize);
-        System.arraycopy(data, index * _block_size, _data, 0, _block_size);
-    }
-
-    protected SmallDocumentBlock(final POIFSBigBlockSize bigBlockSize)
-    {
-        _bigBlockSize = bigBlockSize;
-        _blocks_per_big_block = getBlocksPerBigBlock(bigBlockSize);
-        _data = new byte[ _block_size ];
-    }
-    
-    private static int getBlocksPerBigBlock(final POIFSBigBlockSize bigBlockSize)
-    {
-       return bigBlockSize.getBigBlockSize() / _block_size;
-    }
-
-    /**
-     * convert a single long array into an array of SmallDocumentBlock
-     * instances
-     *
-     * @param array the byte array to be converted
-     * @param size the intended size of the array (which may be smaller)
-     *
-     * @return an array of SmallDocumentBlock instances, filled from
-     *         the array
-     */
-    public static SmallDocumentBlock [] convert(POIFSBigBlockSize bigBlockSize,
-                                                byte [] array,
-                                                int size)
-    {
-        SmallDocumentBlock[] rval   =
-            new SmallDocumentBlock[ (size + _block_size - 1) / _block_size ];
-        int                  offset = 0;
-
-        for (int k = 0; k < rval.length; k++)
-        {
-            rval[ k ] = new SmallDocumentBlock(bigBlockSize);
-            if (offset < array.length)
-            {
-                int length = Math.min(_block_size, array.length - offset);
-
-                System.arraycopy(array, offset, rval[ k ]._data, 0, length);
-                if (length != _block_size)
-                {
-                    Arrays.fill(rval[ k ]._data, length, _block_size,
-                                _default_fill);
-                }
-            }
-            else
-            {
-                Arrays.fill(rval[ k ]._data, _default_fill);
-            }
-            offset += _block_size;
-        }
-        return rval;
-    }
-
-    /**
-     * fill out a List of SmallDocumentBlocks so that it fully occupies
-     * a set of big blocks
-     *
-     * @param blocks the List to be filled out
-     *
-     * @return number of big blocks the list encompasses
-     */
-    public static int fill(POIFSBigBlockSize bigBlockSize, List<SmallDocumentBlock> blocks)
-    {
-        int _blocks_per_big_block = getBlocksPerBigBlock(bigBlockSize);
-        
-        int count           = blocks.size();
-        int big_block_count = (count + _blocks_per_big_block - 1)
-                              / _blocks_per_big_block;
-        int full_count      = big_block_count * _blocks_per_big_block;
-
-        for (; count < full_count; count++)
-        {
-            blocks.add(makeEmptySmallDocumentBlock(bigBlockSize));
-        }
-        return big_block_count;
-    }
-
-    /**
-     * Factory for creating SmallDocumentBlocks from DocumentBlocks
-     *
-     * @param store the original DocumentBlocks
-     * @param size the total document size
-     *
-     * @return an array of new SmallDocumentBlocks instances
-     *
-     * @exception IOException on errors reading from the DocumentBlocks
-     * @exception ArrayIndexOutOfBoundsException if, somehow, the store
-     *            contains less data than size indicates
-     */
-    public static SmallDocumentBlock [] convert(POIFSBigBlockSize bigBlockSize,
-                                                BlockWritable [] store,
-                                                int size)
-        throws IOException, ArrayIndexOutOfBoundsException
-    {
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-        for (int j = 0; j < store.length; j++)
-        {
-            store[ j ].writeBlocks(stream);
-        }
-        byte[]               data = stream.toByteArray();
-        SmallDocumentBlock[] rval =
-            new SmallDocumentBlock[ convertToBlockCount(size) ];
-
-        for (int index = 0; index < rval.length; index++)
-        {
-            rval[ index ] = new SmallDocumentBlock(bigBlockSize, data, index);
-        }
-        return rval;
-    }
-
-    /**
-     * create a list of SmallDocumentBlock's from raw data
-     *
-     * @param blocks the raw data containing the SmallDocumentBlock
-     *               data
-     *
-     * @return a List of SmallDocumentBlock's extracted from the input
-     */
-    public static List<SmallDocumentBlock> extract(POIFSBigBlockSize bigBlockSize, ListManagedBlock [] blocks)
-        throws IOException
-    {
-        int _blocks_per_big_block = getBlocksPerBigBlock(bigBlockSize);
-        
-        List<SmallDocumentBlock> sdbs = new ArrayList<SmallDocumentBlock>();
-
-        for (int j = 0; j < blocks.length; j++)
-        {
-            byte[] data = blocks[ j ].getData();
-
-            for (int k = 0; k < _blocks_per_big_block; k++)
-            {
-                sdbs.add(new SmallDocumentBlock(bigBlockSize, data, k));
-            }
-        }
-        return sdbs;
-    }
-
-    public static DataInputBlock getDataInputBlock(SmallDocumentBlock[] blocks, int offset) {
-        int firstBlockIndex = offset >> BLOCK_SHIFT;
-        int firstBlockOffset= offset & BLOCK_MASK;
-        return new DataInputBlock(blocks[firstBlockIndex]._data, firstBlockOffset);
-    }
-
-    /**
-     * Calculate the storage size of a set of SmallDocumentBlocks
-     *
-     * @param size number of SmallDocumentBlocks
-     *
-     * @return total size
-     */
-    public static int calcSize(int size)
-    {
-        return size * _block_size;
-    }
-    
-    protected int getSmallBlocksPerBigBlock()
-    {
-        return _blocks_per_big_block;
-    }
-
-    private static SmallDocumentBlock makeEmptySmallDocumentBlock(POIFSBigBlockSize bigBlockSize)
-    {
-        SmallDocumentBlock block = new SmallDocumentBlock(bigBlockSize);
-
-        Arrays.fill(block._data, _default_fill);
-        return block;
-    }
-
-    private static int convertToBlockCount(int size)
-    {
-        return (size + _block_size - 1) / _block_size;
-    }
-
-    /**
-     * Write the storage to an OutputStream
-     *
-     * @param stream the OutputStream to which the stored data should
-     *               be written
-     *
-     * @exception IOException on problems writing to the specified
-     *            stream
-     */
-    public void writeBlocks(OutputStream stream)
-        throws IOException
-    {
-        stream.write(_data);
-    }
-
-    /**
-     * Get the data from the block
-     *
-     * @return the block's data as a byte array
-     *
-     * @exception IOException if there is no data
-     */
-    public byte [] getData() {
-        return _data;
-    }
-    
-    public POIFSBigBlockSize getBigBlockSize() {
-       return _bigBlockSize;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/SmallDocumentBlockList.java b/trunk/src/java/org/apache/poi/poifs/storage/SmallDocumentBlockList.java
deleted file mode 100644
index cc6bb7c..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/SmallDocumentBlockList.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import java.util.*;
-
-/**
- * A list of SmallDocumentBlocks instances, and methods to manage the list
- */
-public class SmallDocumentBlockList
-    extends BlockListImpl
-{
-    /**
-     * Constructor SmallDocumentBlockList
-     *
-     * @param blocks a list of SmallDocumentBlock instances
-     */
-
-    public SmallDocumentBlockList(final List<SmallDocumentBlock> blocks)
-    {
-        setBlocks(blocks.toArray(new SmallDocumentBlock[blocks.size()]));
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/poifs/storage/package.html b/trunk/src/java/org/apache/poi/poifs/storage/package.html
deleted file mode 100644
index b098350..0000000
--- a/trunk/src/java/org/apache/poi/poifs/storage/package.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-storage package contains low level binary structures for POIFS's implementation of the OLE 2
-Compound Document Format.
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java b/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
deleted file mode 100644
index 818b10b..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.AlphaComposite;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.awt.image.RescaleOp;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.stream.ImageInputStream;
-import javax.imageio.stream.MemoryCacheImageInputStream;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * For now this class renders only images supported by the javax.imageio.ImageIO framework.
- **/
-public class BitmapImageRenderer implements ImageRenderer {
-    private final static POILogger LOG = POILogFactory.getLogger(ImageRenderer.class);
-
-    protected BufferedImage img;
-
-    @Override
-    public void loadImage(InputStream data, String contentType) throws IOException {
-        img = readImage(data, contentType);
-    }
-
-    @Override
-    public void loadImage(byte data[], String contentType) throws IOException {
-        img = readImage(new ByteArrayInputStream(data), contentType);
-    }
-    
-    /**
-     * Read the image data via ImageIO and optionally try to workaround metadata errors.
-     * The resulting image is of image type {@link BufferedImage#TYPE_INT_ARGB}
-     *
-     * @param data the data stream
-     * @param contentType the content type
-     * @return the bufferedImage or null, if there was no image reader for this content type
-     * @throws IOException thrown if there was an error while processing the image
-     */
-    private static BufferedImage readImage(InputStream data, String contentType) throws IOException {
-        IOException lastException = null;
-        BufferedImage img = null;
-        if (data.markSupported()) {
-            data.mark(data.available());
-        }
-        
-        // currently don't use FileCacheImageInputStream,
-        // because of the risk of filling the file handles (see #59166)
-        ImageInputStream iis = new MemoryCacheImageInputStream(data);
-        try {
-            iis = new MemoryCacheImageInputStream(data);
-            iis.mark();
-            
-            Iterator<ImageReader> iter = ImageIO.getImageReaders(iis);
-            while (img==null && iter.hasNext()) {
-                ImageReader reader = iter.next();
-                ImageReadParam param = reader.getDefaultReadParam();
-                // 0:default mode, 1:fallback mode
-                for (int mode=0; img==null && mode<3; mode++) {
-                    lastException = null;
-                    try {
-                        iis.reset();
-                    } catch (IOException e) {
-                        if (data.markSupported()) {
-                            data.reset();
-                            data.mark(data.available());
-                            iis.close();
-                            iis = new MemoryCacheImageInputStream(data);
-                        } else {
-                            // can't restore the input stream, so we need to stop processing here
-                            lastException = e;
-                            break;
-                        }
-                    }
-                    iis.mark();
-
-                    try {
-                    
-                        switch (mode) {
-                            case 0:
-                                reader.setInput(iis, false, true);
-                                img = reader.read(0, param);
-                                break;
-                            case 1: {
-                                // try to load picture in gray scale mode
-                                // fallback mode for invalid image band metadata
-                                // see http://stackoverflow.com/questions/10416378
-                                Iterator<ImageTypeSpecifier> imageTypes = reader.getImageTypes(0);
-                                while (imageTypes.hasNext()) {
-                                    ImageTypeSpecifier imageTypeSpecifier = imageTypes.next();
-                                    int bufferedImageType = imageTypeSpecifier.getBufferedImageType();
-                                    if (bufferedImageType == BufferedImage.TYPE_BYTE_GRAY) {
-                                        param.setDestinationType(imageTypeSpecifier);
-                                        break;
-                                    }
-                                }
-                                reader.setInput(iis, false, true);
-                                img = reader.read(0, param);
-                                break;
-                            }
-                            case 2: {
-                                // try to load truncated pictures by supplying a BufferedImage
-                                // and use the processed data up till the point of error
-                                reader.setInput(iis, false, true);
-                                int height = reader.getHeight(0);
-                                int width = reader.getWidth(0);
-                                
-                                Iterator<ImageTypeSpecifier> imageTypes = reader.getImageTypes(0);
-                                if (imageTypes.hasNext()) {
-                                    ImageTypeSpecifier imageTypeSpecifier = imageTypes.next();
-                                    img = imageTypeSpecifier.createBufferedImage(width, height);
-                                    param.setDestination(img);
-                                } else {
-                                    lastException = new IOException("unable to load even a truncated version of the image.");
-                                    break;
-                                }
-
-                                try {
-                                    reader.read(0, param);
-                                } finally {
-                                    if (img.getType() != BufferedImage.TYPE_INT_ARGB) {
-                                        int y = findTruncatedBlackBox(img, width, height);
-                                        if (y < height) {
-                                            BufferedImage argbImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-                                            Graphics2D g = argbImg.createGraphics();
-                                            g.clipRect(0, 0, width, y);
-                                            g.drawImage(img, 0, 0, null);
-                                            g.dispose();
-                                            img.flush();
-                                            img = argbImg;
-                                        }
-                                    }
-                                }                                
-                                break;
-                            }
-                        }
-                    
-                    } catch (IOException e) {
-                        if (mode < 2) {
-                            lastException = e;
-                        }
-                    } catch (RuntimeException e) {
-                        if (mode < 2) {
-                            lastException = new IOException("ImageIO runtime exception - "+(mode==0 ? "normal" : "fallback"), e);
-                        }
-                    }
-                }
-                reader.dispose();
-            }
-        } finally {
-            iis.close();
-        }
-        
-        // If you don't have an image at the end of all readers
-        if (img == null) {
-            if (lastException != null) {
-                // rethrow exception - be aware that the exception source can be in
-                // multiple locations above ...
-                throw lastException;
-            }
-            LOG.log(POILogger.WARN, "Content-type: "+contentType+" is not support. Image ignored.");
-            return null;
-        }
-
-        // add alpha channel
-        if (img.getType() != BufferedImage.TYPE_INT_ARGB) {
-            BufferedImage argbImg = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_INT_ARGB);
-            Graphics g = argbImg.getGraphics();
-            g.drawImage(img, 0, 0, null);
-            g.dispose();
-            return argbImg;
-        }
-        
-        return img;
-    }
-
-    private static int findTruncatedBlackBox(BufferedImage img, int width, int height) {
-        // scan through the image to find the black box after the truncated data
-        int h = height-1;
-        for (; h > 0; h--) {
-            for (int w = width-1; w > 0; w-=width/10) {
-                int p = img.getRGB(w, h);
-                if (p != 0xff000000) {
-                    return h+1;
-                }
-            }
-        }
-        return 0;
-    }
-    
-    
-    @Override
-    public BufferedImage getImage() {
-        return img;
-    }
-
-    @Override
-    public BufferedImage getImage(Dimension dim) {
-        double w_old = img.getWidth();
-        double h_old = img.getHeight();
-        BufferedImage scaled = new BufferedImage((int)w_old, (int)h_old, BufferedImage.TYPE_INT_ARGB);
-        double w_new = dim.getWidth();
-        double h_new = dim.getHeight();
-        AffineTransform at = new AffineTransform();
-        at.scale(w_new/w_old, h_new/h_old);
-        AffineTransformOp scaleOp = new AffineTransformOp(at, AffineTransformOp.TYPE_BILINEAR);
-        scaleOp.filter(img, scaled);
-        return scaled;
-    }
-
-    @Override
-    public Dimension getDimension() {
-        return (img == null)
-            ? new Dimension(0,0)
-            : new Dimension(img.getWidth(),img.getHeight());
-    }
-
-    @Override
-    public void setAlpha(double alpha) {
-        if (img == null) return;
-
-        Dimension dim = getDimension();
-        BufferedImage newImg = new BufferedImage((int)dim.getWidth(), (int)dim.getHeight(), BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = newImg.createGraphics();
-        RescaleOp op = new RescaleOp(new float[]{1.0f, 1.0f, 1.0f, (float)alpha}, new float[]{0,0,0,0}, null);
-        g.drawImage(img, op, 0, 0);
-        g.dispose();
-
-        img = newImg;
-    }
-
-
-    @Override
-    public boolean drawImage(
-        Graphics2D graphics,
-        Rectangle2D anchor) {
-        return drawImage(graphics, anchor, null);
-    }
-
-    @Override
-    public boolean drawImage(
-        Graphics2D graphics,
-        Rectangle2D anchor,
-        Insets clip) {
-        if (img == null) return false;
-
-        boolean isClipped = true;
-        if (clip == null) {
-            isClipped = false;
-            clip = new Insets(0,0,0,0);
-        }
-
-        int iw = img.getWidth();
-        int ih = img.getHeight();
-
-
-        double cw = (100000-clip.left-clip.right) / 100000.0;
-        double ch = (100000-clip.top-clip.bottom) / 100000.0;
-        double sx = anchor.getWidth()/(iw*cw);
-        double sy = anchor.getHeight()/(ih*ch);
-        double tx = anchor.getX()-(iw*sx*clip.left/100000.0);
-        double ty = anchor.getY()-(ih*sy*clip.top/100000.0);
-
-        AffineTransform at = new AffineTransform(sx, 0, 0, sy, tx, ty) ;
-
-        Shape clipOld = graphics.getClip();
-        if (isClipped) graphics.clip(anchor.getBounds2D());
-        graphics.drawRenderedImage(img, at);
-        graphics.setClip(clipOld);
-
-        return true;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawAutoShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawAutoShape.java
deleted file mode 100644
index 9cda7a3..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawAutoShape.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import org.apache.poi.sl.usermodel.*;
-
-
-public class DrawAutoShape extends DrawTextShape {
-    public DrawAutoShape(AutoShape<?,?> shape) {
-        super(shape);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java b/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java
deleted file mode 100644
index aa12b47..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.sl.usermodel.Background;
-import org.apache.poi.sl.usermodel.PlaceableShape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.Sheet;
-
-
-public class DrawBackground extends DrawShape {
-    public DrawBackground(Background<?,?> shape) {
-        super(shape);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public void draw(Graphics2D graphics) {
-        Dimension pg = shape.getSheet().getSlideShow().getPageSize();
-        final Rectangle2D anchor = new Rectangle2D.Double(0, 0, pg.getWidth(), pg.getHeight());
-
-        PlaceableShape<?,?> ps = new PlaceableShape(){
-            public ShapeContainer<?,?> getParent() { return null; }
-            public Rectangle2D getAnchor() { return anchor; }
-            public void setAnchor(Rectangle2D newAnchor) {}
-            public double getRotation() { return 0; }
-            public void setRotation(double theta) {}
-            public void setFlipHorizontal(boolean flip) {}
-            public void setFlipVertical(boolean flip) {}
-            public boolean getFlipHorizontal() { return false; }
-            public boolean getFlipVertical() { return false; }
-            public Sheet<?,?> getSheet() { return shape.getSheet(); }
-        };
-        
-        DrawFactory drawFact = DrawFactory.getInstance(graphics);
-        DrawPaint dp = drawFact.getPaint(ps);
-        Paint fill = dp.getPaint(graphics, getShape().getFillStyle().getPaint());
-        Rectangle2D anchor2 = getAnchor(graphics, anchor);
-        
-        if(fill != null) {
-            graphics.setRenderingHint(Drawable.GRADIENT_SHAPE, anchor);
-            graphics.setPaint(fill);
-            graphics.fill(anchor2);
-        }
-    }
-    
-    protected Background<?,?> getShape() {
-        return (Background<?,?>)shape;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawConnectorShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawConnectorShape.java
deleted file mode 100644
index 00bcd1b..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawConnectorShape.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import org.apache.poi.sl.usermodel.ConnectorShape;
-
-public class DrawConnectorShape extends DrawSimpleShape {
-    public DrawConnectorShape(ConnectorShape<?,?> shape) {
-        super(shape);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawFactory.java b/trunk/src/java/org/apache/poi/sl/draw/DrawFactory.java
deleted file mode 100644
index f06ccdc..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawFactory.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.text.AttributedString;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.sl.usermodel.Background;
-import org.apache.poi.sl.usermodel.ConnectorShape;
-import org.apache.poi.sl.usermodel.FreeformShape;
-import org.apache.poi.sl.usermodel.GraphicalFrame;
-import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.MasterSheet;
-import org.apache.poi.sl.usermodel.PictureShape;
-import org.apache.poi.sl.usermodel.PlaceableShape;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.sl.usermodel.Sheet;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.TableShape;
-import org.apache.poi.sl.usermodel.TextBox;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.sl.usermodel.TextShape;
-import org.apache.poi.util.JvmBugs;
-
-public class DrawFactory {
-    protected static final ThreadLocal<DrawFactory> defaultFactory = new ThreadLocal<DrawFactory>();
-
-    /**
-     * Set a custom draw factory for the current thread.
-     * This is a fallback, for operations where usercode can't set a graphics context.
-     * Preferably use the rendering hint {@link Drawable#DRAW_FACTORY} to set the factory.
-     *
-     * @param factory
-     */
-    public static void setDefaultFactory(DrawFactory factory) {
-        defaultFactory.set(factory);
-    }
-
-    /**
-     * Returns the DrawFactory, preferably via a graphics instance.
-     * If graphics is null, the current thread local is checked or
-     * if it is not set, a new factory is created. 
-     *
-     * @param graphics the current graphics context or null
-     * @return the draw factory
-     */
-    public static DrawFactory getInstance(Graphics2D graphics) {
-        // first try to find the factory over the rendering hint
-        DrawFactory factory = null;
-        boolean isHint = false;
-        if (graphics != null) {
-            factory = (DrawFactory)graphics.getRenderingHint(Drawable.DRAW_FACTORY);
-            isHint = (factory != null);
-        }
-        // secondly try the thread local default
-        if (factory == null) {
-            factory = defaultFactory.get();
-        }
-        // and at last, use the default factory
-        if (factory == null) {
-            factory = new DrawFactory();
-        }
-        if (graphics != null && !isHint) {
-            graphics.setRenderingHint(Drawable.DRAW_FACTORY, factory);
-        }
-        return factory;
-    }
-
-    public Drawable getDrawable(Shape<?,?> shape) {
-        if (shape instanceof TextBox) {
-            return getDrawable((TextBox<?,?>)shape);
-        } else if (shape instanceof FreeformShape) {
-            return getDrawable((FreeformShape<?,?>)shape);
-        } else if (shape instanceof TextShape) {
-            return getDrawable((TextShape<?,?>)shape);
-        } else if (shape instanceof TableShape) {
-            return getDrawable((TableShape<?,?>)shape);
-        } else if (shape instanceof GroupShape) {
-            return getDrawable((GroupShape<?,?>)shape);
-        } else if (shape instanceof PictureShape) {
-            return getDrawable((PictureShape<?,?>)shape);
-        } else if (shape instanceof GraphicalFrame) {
-            return getDrawable((GraphicalFrame<?,?>)shape);
-        } else if (shape instanceof Background) {
-            return getDrawable((Background<?,?>)shape);
-        } else if (shape instanceof ConnectorShape) {
-            return getDrawable((ConnectorShape<?,?>)shape);
-        } else if (shape instanceof Slide) {
-            return getDrawable((Slide<?,?>)shape);
-        } else if (shape instanceof MasterSheet) {
-            return getDrawable((MasterSheet<?,?>)shape);
-        } else if (shape instanceof Sheet) {
-            return getDrawable((Sheet<?,?>)shape);
-        } else if (shape.getClass().isAnnotationPresent(DrawNotImplemented.class)) {
-            return new DrawNothing(shape);
-        }
-        
-        throw new IllegalArgumentException("Unsupported shape type: "+shape.getClass());
-    }
-
-    public DrawSlide getDrawable(Slide<?,?> sheet) {
-        return new DrawSlide(sheet);
-    }
-
-    public DrawSheet getDrawable(Sheet<?,?> sheet) {
-        return new DrawSheet(sheet);
-    }
-
-    public DrawMasterSheet getDrawable(MasterSheet<?,?> sheet) {
-        return new DrawMasterSheet(sheet);
-    }
-
-    public DrawTextBox getDrawable(TextBox<?,?> shape) {
-        return new DrawTextBox(shape);
-    }
-
-    public DrawFreeformShape getDrawable(FreeformShape<?,?> shape) {
-        return new DrawFreeformShape(shape);
-    }
-
-    public DrawConnectorShape getDrawable(ConnectorShape<?,?> shape) {
-        return new DrawConnectorShape(shape);
-    }
-    
-    public DrawTableShape getDrawable(TableShape<?,?> shape) {
-        return new DrawTableShape(shape);
-    }
-    
-    public DrawTextShape getDrawable(TextShape<?,?> shape) {
-        return new DrawTextShape(shape);
-    }
-
-    public DrawGroupShape getDrawable(GroupShape<?,?> shape) {
-        return new DrawGroupShape(shape);
-    }
-    
-    public DrawPictureShape getDrawable(PictureShape<?,?> shape) {
-        return new DrawPictureShape(shape);
-    }
-    
-    public DrawGraphicalFrame getDrawable(GraphicalFrame<?,?> shape) {
-        return new DrawGraphicalFrame(shape);
-    }
-    
-    public DrawTextParagraph getDrawable(TextParagraph<?,?,?> paragraph) {
-        return new DrawTextParagraph(paragraph);
-    }
-
-    public DrawBackground getDrawable(Background<?,?> shape) {
-        return new DrawBackground(shape);
-    }
-    
-    public DrawTextFragment getTextFragment(TextLayout layout, AttributedString str) {
-        return new DrawTextFragment(layout, str);
-    }
-    
-    public DrawPaint getPaint(PlaceableShape<?,?> shape) {
-        return new DrawPaint(shape);
-    }
-
-    /**
-     * Convenience method for drawing single shapes.
-     * For drawing whole slides, use {@link Slide#draw(Graphics2D)}
-     *
-     * @param graphics the graphics context to draw to
-     * @param shape the shape
-     * @param bounds the bounds within the graphics context to draw to 
-     */
-    public void drawShape(Graphics2D graphics, Shape<?,?> shape, Rectangle2D bounds) {
-        Rectangle2D shapeBounds = shape.getAnchor();
-        if (shapeBounds.isEmpty() || (bounds != null && bounds.isEmpty())) {
-            return;
-        }
-
-        AffineTransform txg = (AffineTransform)graphics.getRenderingHint(Drawable.GROUP_TRANSFORM);
-        AffineTransform tx = new AffineTransform();
-        try {
-            if (bounds != null) {
-                double scaleX = bounds.getWidth()/shapeBounds.getWidth();
-                double scaleY = bounds.getHeight()/shapeBounds.getHeight();
-                tx.translate(bounds.getCenterX(), bounds.getCenterY());
-                tx.scale(scaleX, scaleY);
-                tx.translate(-shapeBounds.getCenterX(), -shapeBounds.getCenterY());
-            }
-            graphics.setRenderingHint(Drawable.GROUP_TRANSFORM, tx);
-            
-            Drawable d = getDrawable(shape);
-            d.applyTransform(graphics);
-            d.draw(graphics);
-        } finally {
-            graphics.setRenderingHint(Drawable.GROUP_TRANSFORM, txg);
-        }
-    }
-    
-    
-    /**
-     * Replace font families for Windows JVM 6, which contains a font rendering error.
-     * This is likely to be removed, when POI upgrades to JDK 7
-     *
-     * @param graphics the graphics context which will contain the font mapping
-     */
-    public void fixFonts(Graphics2D graphics) {
-        if (!JvmBugs.hasLineBreakMeasurerBug()) return;
-        @SuppressWarnings("unchecked")
-        Map<String,String> fontMap = (Map<String,String>)graphics.getRenderingHint(Drawable.FONT_MAP);
-        if (fontMap == null) {
-            fontMap = new HashMap<String,String>();
-            graphics.setRenderingHint(Drawable.FONT_MAP, fontMap);
-        }
-        
-        String fonts[][] = { { "Calibri", "Lucida Sans" }, { "Cambria", "Lucida Bright" } };
-
-        for (String f[] : fonts) {
-            if (!fontMap.containsKey(f[0])) {
-                fontMap.put(f[0], f[1]);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawFontManager.java b/trunk/src/java/org/apache/poi/sl/draw/DrawFontManager.java
deleted file mode 100644
index 9c49489..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawFontManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw;
-
-/**
- * Manages fonts when rendering slides.
- *
- * Use this class to handle unknown / missing fonts or to substitute fonts
- */
-public interface DrawFontManager {
-
-    /**
-     * select a font to be used to paint text
-     *
-     * @param typeface the font family as defined in the .pptx file.
-     * This can be unknown or missing in the graphic environment.
-     *
-     * @return the font to be used to paint text
-     */
-    String getRendererableFont(String typeface, int pitchFamily);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java
deleted file mode 100644
index d8f9868..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Path2D;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.poi.sl.draw.geom.Outline;
-import org.apache.poi.sl.draw.geom.Path;
-import org.apache.poi.sl.usermodel.FillStyle;
-import org.apache.poi.sl.usermodel.FreeformShape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-
-public class DrawFreeformShape extends DrawAutoShape {
-    public DrawFreeformShape(FreeformShape<?,?> shape) {
-        super(shape);
-    }
-
-    protected Collection<Outline> computeOutlines(Graphics2D graphics) {
-        List<Outline> lst = new ArrayList<Outline>();
-        FreeformShape<?,?> fsh = getShape();
-        Path2D sh = fsh.getPath();
-
-        AffineTransform tx = (AffineTransform)graphics.getRenderingHint(Drawable.GROUP_TRANSFORM);
-        if (tx == null) {
-            tx = new AffineTransform();
-        }
-
-        java.awt.Shape canvasShape = tx.createTransformedShape(sh);
-
-        FillStyle fs = fsh.getFillStyle();
-        StrokeStyle ss = fsh.getStrokeStyle();
-        Path path = new Path(fs != null, ss != null);
-        lst.add(new Outline(canvasShape, path));
-        return lst;
-    }
-
-    @Override
-    protected FreeformShape<?,?> getShape() {
-        return (FreeformShape<?,?>)shape;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java b/trunk/src/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
deleted file mode 100644
index c4b75f1..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-
-import org.apache.poi.sl.usermodel.GraphicalFrame;
-import org.apache.poi.sl.usermodel.PictureShape;
-
-
-public class DrawGraphicalFrame extends DrawShape {
-
-    public DrawGraphicalFrame(GraphicalFrame<?,?> shape) {
-        super(shape);
-    }
-    
-    public void draw(Graphics2D context) {
-        PictureShape<?,?> ps = ((GraphicalFrame<?,?>)getShape()).getFallbackPicture();
-        if (ps == null) {
-            return;
-        }
-        DrawPictureShape dps = DrawFactory.getInstance(context).getDrawable(ps);
-        dps.draw(context);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawGroupShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawGroupShape.java
deleted file mode 100644
index 999e34c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawGroupShape.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.sl.usermodel.*;
-
-
-public class DrawGroupShape extends DrawShape {
-
-    public DrawGroupShape(GroupShape<?,?> shape) {
-        super(shape);
-    }
-    
-    public void draw(Graphics2D graphics) {
-
-        // the coordinate system of this group of shape
-        Rectangle2D interior = getShape().getInteriorAnchor();
-        // anchor of this group relative to the parent shape
-        Rectangle2D exterior = getShape().getAnchor();
-
-        AffineTransform tx = (AffineTransform)graphics.getRenderingHint(Drawable.GROUP_TRANSFORM);
-        AffineTransform tx0 = new AffineTransform(tx);
-
-        double scaleX = interior.getWidth() == 0. ? 1.0 : exterior.getWidth() / interior.getWidth();
-        double scaleY = interior.getHeight() == 0. ? 1.0 : exterior.getHeight() / interior.getHeight();
-
-        tx.translate(exterior.getX(), exterior.getY());
-        tx.scale(scaleX, scaleY);
-        tx.translate(-interior.getX(), -interior.getY());
-
-        DrawFactory drawFact = DrawFactory.getInstance(graphics);
-        AffineTransform at2 = graphics.getTransform();
-        
-        for (Shape<?,?> child : getShape()) {
-            // remember the initial transform and restore it after we are done with the drawing
-            AffineTransform at = graphics.getTransform();
-            graphics.setRenderingHint(Drawable.GSAVE, true);
-
-            Drawable draw = drawFact.getDrawable(child);
-            draw.applyTransform(graphics);
-            draw.draw(graphics);
-
-            // restore the coordinate system
-            graphics.setTransform(at);
-            graphics.setRenderingHint(Drawable.GRESTORE, true);
-        }
-
-        graphics.setTransform(at2);
-        graphics.setRenderingHint(Drawable.GROUP_TRANSFORM, tx0);
-    }
-
-    @Override
-    protected GroupShape<?,?> getShape() {
-        return (GroupShape<?,?>)shape;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawMasterSheet.java b/trunk/src/java/org/apache/poi/sl/draw/DrawMasterSheet.java
deleted file mode 100644
index 3bcedbe..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawMasterSheet.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import org.apache.poi.sl.usermodel.*;
-
-
-public class DrawMasterSheet extends DrawSheet {
-
-    public DrawMasterSheet(MasterSheet<?,?> sheet) {
-        super(sheet);
-    }
-
-    /**
-     * Checks if this <code>sheet</code> displays the specified shape.
-     *
-     * Subclasses can override it and skip certain shapes from drawings,
-     * for instance, slide masters and layouts don't display placeholders
-     */
-    @Override
-    protected boolean canDraw(Shape<?,?> shape) {
-        if (shape instanceof SimpleShape) {
-            Placeholder ph = ((SimpleShape<?,?>)shape).getPlaceholder();
-            return ph == null;
-        } else {
-            return true;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawNotImplemented.java b/trunk/src/java/org/apache/poi/sl/draw/DrawNotImplemented.java
deleted file mode 100644
index 45b80ea..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawNotImplemented.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import org.apache.poi.util.Internal;
-
-
-/**
- * This is a marker annotation for classes which don't have a defined
- * draw implementation.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Internal
-public @interface DrawNotImplemented {
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawNothing.java b/trunk/src/java/org/apache/poi/sl/draw/DrawNothing.java
deleted file mode 100644
index d1710b2..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawNothing.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-
-import org.apache.poi.sl.usermodel.Shape;
-
-
-public class DrawNothing implements Drawable {
-
-    protected final Shape<?,?> shape;
-    
-    public DrawNothing(Shape<?,?> shape) {
-        this.shape = shape;
-    }
-    
-    /**
-     * Apply 2-D transforms before drawing this shape. This includes rotation and flipping.
-     *
-     * @param graphics the graphics whos transform matrix will be modified
-     */
-    public void applyTransform(Graphics2D graphics) {
-    }
-
-
-    public void draw(Graphics2D graphics) {
-    }
-
-    public void drawContent(Graphics2D context) {
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java b/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java
deleted file mode 100644
index 4bfbe43..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java
+++ /dev/null
@@ -1,524 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.LinearGradientPaint;
-import java.awt.MultipleGradientPaint.ColorSpaceType;
-import java.awt.MultipleGradientPaint.CycleMethod;
-import java.awt.Paint;
-import java.awt.RadialGradientPaint;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.sl.usermodel.ColorStyle;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.GradientPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.TexturePaint;
-import org.apache.poi.sl.usermodel.PlaceableShape;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-
-/**
- * This class handles color transformations.
- * 
- * @see <a href="https://tips4java.wordpress.com/2009/07/05/hsl-color/">HSL code taken from Java Tips Weblog</a>
- */
-public class DrawPaint {
-    // HSL code is public domain - see https://tips4java.wordpress.com/contact-us/
-    
-    private static final POILogger LOG = POILogFactory.getLogger(DrawPaint.class);
-
-    private static final Color TRANSPARENT = new Color(1f,1f,1f,0f);
-    
-    protected PlaceableShape<?,?> shape;
-    
-    public DrawPaint(PlaceableShape<?,?> shape) {
-        this.shape = shape;
-    }
-
-    private static class SimpleSolidPaint implements SolidPaint {
-        private final ColorStyle solidColor;
-
-        SimpleSolidPaint(final Color color) {
-            if (color == null) {
-                throw new NullPointerException("Color needs to be specified");
-            }
-            this.solidColor = new ColorStyle(){
-                    public Color getColor() {
-                        return new Color(color.getRed(), color.getGreen(), color.getBlue());
-                    }
-                    public int getAlpha() { return (int)Math.round(color.getAlpha()*100000./255.); }
-                    public int getHueOff() { return -1; }
-                    public int getHueMod() { return -1; }
-                    public int getSatOff() { return -1; }
-                    public int getSatMod() { return -1; }
-                    public int getLumOff() { return -1; }
-                    public int getLumMod() { return -1; }
-                    public int getShade() { return -1; }
-                    public int getTint() { return -1; }
-                };
-        }
-
-        SimpleSolidPaint(ColorStyle color) {
-            if (color == null) {
-                throw new NullPointerException("Color needs to be specified");
-            }
-            this.solidColor = color;
-        }
-        
-        public ColorStyle getSolidColor() {
-            return solidColor;
-        }
-    }
-    
-    public static SolidPaint createSolidPaint(final Color color) {
-        return (color == null) ? null : new SimpleSolidPaint(color);
-    }
-    
-    public static SolidPaint createSolidPaint(final ColorStyle color) {
-        return (color == null) ? null : new SimpleSolidPaint(color);
-    }
-    
-    public Paint getPaint(Graphics2D graphics, PaintStyle paint) {
-        if (paint instanceof SolidPaint) {
-            return getSolidPaint((SolidPaint)paint, graphics);
-        } else if (paint instanceof GradientPaint) {
-            return getGradientPaint((GradientPaint)paint, graphics);
-        } else if (paint instanceof TexturePaint) {
-            return getTexturePaint((TexturePaint)paint, graphics);
-        }
-        return null;
-    }
-    
-    protected Paint getSolidPaint(SolidPaint fill, Graphics2D graphics) {
-        return applyColorTransform(fill.getSolidColor());
-    }
-
-    protected Paint getGradientPaint(GradientPaint fill, Graphics2D graphics) {
-        switch (fill.getGradientType()) {
-        case linear:
-            return createLinearGradientPaint(fill, graphics);
-        case circular:
-            return createRadialGradientPaint(fill, graphics);
-        case shape:
-            return createPathGradientPaint(fill, graphics);
-        default:
-            throw new UnsupportedOperationException("gradient fill of type "+fill+" not supported.");
-        }
-    }
-
-    protected Paint getTexturePaint(TexturePaint fill, Graphics2D graphics) {
-        InputStream is = fill.getImageData();
-        if (is == null) return null;
-        assert(graphics != null);
-        
-        ImageRenderer renderer = DrawPictureShape.getImageRenderer(graphics, fill.getContentType());
-
-        try {
-            try {
-                renderer.loadImage(is, fill.getContentType());
-            } finally {
-                is.close();
-            }
-        } catch (IOException e) {
-            LOG.log(POILogger.ERROR, "Can't load image data - using transparent color", e);
-            return null;
-        }
-
-        int alpha = fill.getAlpha();
-        if (0 <= alpha && alpha < 100000) {
-            renderer.setAlpha(alpha/100000.f);
-        }
-        
-        Rectangle2D textAnchor = shape.getAnchor();
-        BufferedImage image;
-        if ("image/x-wmf".equals(fill.getContentType())) {
-            // don't rely on wmf dimensions, use dimension of anchor
-            // TODO: check pixels vs. points for image dimension 
-            image = renderer.getImage(new Dimension((int)textAnchor.getWidth(), (int)textAnchor.getHeight()));
-        } else {
-            image = renderer.getImage();
-        }
-
-        if(image == null) {
-            LOG.log(POILogger.ERROR, "Can't load image data");
-            return null;
-        }
-        Paint paint = new java.awt.TexturePaint(image, textAnchor);
-
-        return paint;
-    }
-    
-    /**
-     * Convert color transformations in {@link ColorStyle} to a {@link Color} instance
-     * 
-     * @see <a href="https://msdn.microsoft.com/en-us/library/dd560821%28v=office.12%29.aspx">Using Office Open XML to Customize Document Formatting in the 2007 Office System</a>
-     * @see <a href="https://social.msdn.microsoft.com/Forums/office/en-US/040e0a1f-dbfe-4ce5-826b-38b4b6f6d3f7/saturation-modulation-satmod">saturation modulation (satMod)</a>
-     * @see <a href="http://stackoverflow.com/questions/6754127/office-open-xml-satmod-results-in-more-than-100-saturation">Office Open XML satMod results in more than 100% saturation</a>
-     */
-    public static Color applyColorTransform(ColorStyle color){
-        // TODO: The colors don't match 100% the results of Powerpoint, maybe because we still
-        // operate in sRGB and not scRGB ... work in progress ...
-        if (color == null || color.getColor() == null) {
-            return TRANSPARENT;
-        }
-        
-        Color result = color.getColor();
-
-        double alpha = getAlpha(result, color);
-        double hsl[] = RGB2HSL(result); // values are in the range [0..100] (usually ...)
-        applyHslModOff(hsl, 0, color.getHueMod(), color.getHueOff());
-        applyHslModOff(hsl, 1, color.getSatMod(), color.getSatOff());
-        applyHslModOff(hsl, 2, color.getLumMod(), color.getLumOff());
-        applyShade(hsl, color);
-        applyTint(hsl, color);
-
-        result = HSL2RGB(hsl[0], hsl[1], hsl[2], alpha);
-        
-        return result;
-    }
-
-    private static double getAlpha(Color c, ColorStyle fc) {
-        double alpha = c.getAlpha()/255d;
-        int fcAlpha = fc.getAlpha();
-        if (fcAlpha != -1) {
-            alpha *= fcAlpha/100000d;
-        }
-        return Math.min(1, Math.max(0, alpha));
-    }
-    
-    /**
-     * Apply the modulation and offset adjustments to the given HSL part
-     * 
-     * Example for lumMod/lumOff:
-     * The lumMod value is the percent luminance. A lumMod value of "60000",
-     * is 60% of the luminance of the original color.
-     * When the color is a shade of the original theme color, the lumMod
-     * attribute is the only one of the tags shown here that appears.
-     * The <a:lumOff> tag appears after the <a:lumMod> tag when the color is a
-     * tint of the original. The lumOff value always equals 1-lumMod, which is used in the tint calculation
-     * 
-     * Despite having different ways to display the tint and shade percentages,
-     * all of the programs use the same method to calculate the resulting color.
-     * Convert the original RGB value to HSL ... and then adjust the luminance (L)
-     * with one of the following equations before converting the HSL value back to RGB.
-     * (The % tint in the following equations refers to the tint, themetint, themeshade,
-     * or lumMod values, as applicable.)
-     * 
-     * @param hsl the hsl values
-     * @param hslPart the hsl part to modify [0..2]
-     * @param mod the modulation adjustment
-     * @param off the offset adjustment
-     * @return the modified hsl value
-     * 
-     */
-    private static void applyHslModOff(double hsl[], int hslPart, int mod, int off) {
-        if (mod == -1) mod = 100000;
-        if (off == -1) off = 0;
-        if (!(mod == 100000 && off == 0)) {
-            double fOff = off / 1000d;
-            double fMod = mod / 100000d;
-            hsl[hslPart] = hsl[hslPart]*fMod+fOff;
-        }
-    }
-    
-    /**
-     * Apply the shade
-     * 
-     * For a shade, the equation is luminance * %tint.
-     */
-    private static void applyShade(double hsl[], ColorStyle fc) {
-        int shade = fc.getShade();
-        if (shade == -1) return;
-        
-        double fshade = shade / 100000.d;
-        
-        hsl[2] *= fshade;
-    }
-
-    /**
-     * Apply the tint
-     * 
-     * For a tint, the equation is luminance * %tint + (1-%tint).
-     * (Note that 1-%tint is equal to the lumOff value in DrawingML.)
-     */
-    private static void applyTint(double hsl[], ColorStyle fc) {
-        int tint = fc.getTint();
-        if (tint == -1) return;
-        
-        double ftint = tint / 100000.f;
-
-        hsl[2] = hsl[2] * ftint + (100 - ftint*100.);
-    }
-    
-
-    protected Paint createLinearGradientPaint(GradientPaint fill, Graphics2D graphics) {
-        double angle = fill.getGradientAngle();
-        Rectangle2D anchor = DrawShape.getAnchor(graphics, shape);
-
-        AffineTransform at = AffineTransform.getRotateInstance(
-            Math.toRadians(angle),
-            anchor.getX() + anchor.getWidth() / 2,
-            anchor.getY() + anchor.getHeight() / 2);
-
-        double diagonal = Math.sqrt(anchor.getHeight() * anchor.getHeight() + anchor.getWidth() * anchor.getWidth());
-        Point2D p1 = new Point2D.Double(anchor.getX() + anchor.getWidth() / 2 - diagonal / 2,
-                anchor.getY() + anchor.getHeight() / 2);
-        p1 = at.transform(p1, null);
-
-        Point2D p2 = new Point2D.Double(anchor.getX() + anchor.getWidth(), anchor.getY() + anchor.getHeight() / 2);
-        p2 = at.transform(p2, null);
-        
-        snapToAnchor(p1, anchor);
-        snapToAnchor(p2, anchor);
-
-        if (p1.equals(p2)) {
-            // gradient paint on the same point throws an exception ... and doesn't make sense
-            return null;
-        }
-
-        float[] fractions = fill.getGradientFractions();
-        Color[] colors = new Color[fractions.length];
-        
-        int i = 0;
-        for (ColorStyle fc : fill.getGradientColors()) {
-            // if fc is null, use transparent color to get color of background
-            colors[i++] = (fc == null) ? TRANSPARENT : applyColorTransform(fc);
-        }
-
-        AffineTransform grAt  = new AffineTransform();
-        if(fill.isRotatedWithShape()) {
-            double rotation = shape.getRotation();
-            if (rotation != 0.) {
-                double centerX = anchor.getX() + anchor.getWidth() / 2;
-                double centerY = anchor.getY() + anchor.getHeight() / 2;
-
-                grAt.translate(centerX, centerY);
-                grAt.rotate(Math.toRadians(-rotation));
-                grAt.translate(-centerX, -centerY);
-            }
-        }
-
-        return new LinearGradientPaint
-            (p1, p2, fractions, colors, CycleMethod.NO_CYCLE, ColorSpaceType.SRGB, grAt);
-    }
-
-    protected Paint createRadialGradientPaint(GradientPaint fill, Graphics2D graphics) {
-        Rectangle2D anchor = DrawShape.getAnchor(graphics, shape);
-
-        Point2D pCenter = new Point2D.Double(anchor.getX() + anchor.getWidth()/2,
-                anchor.getY() + anchor.getHeight()/2);
-
-        float radius = (float)Math.max(anchor.getWidth(), anchor.getHeight());
-
-        float[] fractions = fill.getGradientFractions();
-        Color[] colors = new Color[fractions.length];
-
-        int i=0;
-        for (ColorStyle fc : fill.getGradientColors()) {
-            colors[i++] = applyColorTransform(fc);
-        }
-
-        return new RadialGradientPaint(pCenter, radius, fractions, colors);
-    }
-
-    protected Paint createPathGradientPaint(GradientPaint fill, Graphics2D graphics) {
-        // currently we ignore an eventually center setting
-        
-        float[] fractions = fill.getGradientFractions();
-        Color[] colors = new Color[fractions.length];
-
-        int i=0;
-        for (ColorStyle fc : fill.getGradientColors()) {
-            colors[i++] = applyColorTransform(fc);
-        }
-
-        return new PathGradientPaint(colors, fractions);
-    }
-    
-    protected void snapToAnchor(Point2D p, Rectangle2D anchor) {
-        if (p.getX() < anchor.getX()) {
-            p.setLocation(anchor.getX(), p.getY());
-        } else if (p.getX() > (anchor.getX() + anchor.getWidth())) {
-            p.setLocation(anchor.getX() + anchor.getWidth(), p.getY());
-        }
-
-        if (p.getY() < anchor.getY()) {
-            p.setLocation(p.getX(), anchor.getY());
-        } else if (p.getY() > (anchor.getY() + anchor.getHeight())) {
-            p.setLocation(p.getX(), anchor.getY() + anchor.getHeight());
-        }
-    }
-
-    /**
-     *  Convert HSL values to a RGB Color.
-     *
-     *  @param h Hue is specified as degrees in the range 0 - 360.
-     *  @param s Saturation is specified as a percentage in the range 1 - 100.
-     *  @param l Luminance is specified as a percentage in the range 1 - 100.
-     *  @param alpha  the alpha value between 0 - 1
-     *
-     *  @return the RGB Color object
-     */
-    public static Color HSL2RGB(double h, double s, double l, double alpha) {
-        // we clamp the values, as it possible to come up with more than 100% sat/lum
-        // (see links in applyColorTransform() for more info)
-        s = Math.max(0, Math.min(100, s));
-        l = Math.max(0, Math.min(100, l));
-
-        if (alpha <0.0f || alpha > 1.0f) {
-            String message = "Color parameter outside of expected range - Alpha: " + alpha;
-            throw new IllegalArgumentException( message );
-        }
-
-        //  Formula needs all values between 0 - 1.
-
-        h = h % 360.0f;
-        h /= 360f;
-        s /= 100f;
-        l /= 100f;
-
-        double q = (l < 0.5d)
-            ? l * (1d + s)
-            : (l + s) - (s * l);
-
-        double p = 2d * l - q;
-
-        double r = Math.max(0, HUE2RGB(p, q, h + (1.0d / 3.0d)));
-        double g = Math.max(0, HUE2RGB(p, q, h));
-        double b = Math.max(0, HUE2RGB(p, q, h - (1.0d / 3.0d)));
-
-        r = Math.min(r, 1.0d);
-        g = Math.min(g, 1.0d);
-        b = Math.min(b, 1.0d);
-
-        return new Color((float)r, (float)g, (float)b, (float)alpha);
-    }
-
-    private static double HUE2RGB(double p, double q, double h) {
-        if (h < 0d) h += 1d;
-
-        if (h > 1d) h -= 1d;
-
-        if (6d * h < 1d) {
-            return p + ((q - p) * 6d * h);
-        }
-
-        if (2d * h < 1d) {
-            return q;
-        }
-
-        if (3d * h < 2d) {
-            return p + ( (q - p) * 6d * ((2.0d / 3.0d) - h) );
-        }
-
-        return p;
-    }
-
-
-    /**
-     *  Convert a RGB Color to it corresponding HSL values.
-     *
-     *  @return an array containing the 3 HSL values.
-     */
-    private static double[] RGB2HSL(Color color)
-    {
-        //  Get RGB values in the range 0 - 1
-
-        float[] rgb = color.getRGBColorComponents( null );
-        double r = rgb[0];
-        double g = rgb[1];
-        double b = rgb[2];
-
-        //  Minimum and Maximum RGB values are used in the HSL calculations
-
-        double min = Math.min(r, Math.min(g, b));
-        double max = Math.max(r, Math.max(g, b));
-
-        //  Calculate the Hue
-
-        double h = 0;
-
-        if (max == min) {
-            h = 0;
-        } else if (max == r) {
-            h = ((60d * (g - b) / (max - min)) + 360d) % 360d;
-        } else if (max == g) {
-            h = (60d * (b - r) / (max - min)) + 120d;
-        } else if (max == b) {
-            h = (60d * (r - g) / (max - min)) + 240d;
-        }
-
-        //  Calculate the Luminance
-
-        double l = (max + min) / 2d;
-
-        //  Calculate the Saturation
-
-        double s = 0;
-
-        if (max == min) {
-            s = 0;
-        } else if (l <= .5d) {
-            s = (max - min) / (max + min);
-        } else {
-            s = (max - min) / (2d - max - min);
-        }
-
-        return new double[] {h, s * 100, l * 100};
-    }
-    
-    /**
-     * Convert sRGB float component [0..1] from sRGB to linear RGB [0..100000]
-     * 
-     * @see Color#getRGBColorComponents(float[])
-     */
-    public static int srgb2lin(float sRGB) {
-        // scRGB has a linear gamma of 1.0, scale the AWT-Color which is in sRGB to linear RGB
-        // see https://en.wikipedia.org/wiki/SRGB (the reverse transformation)
-        if (sRGB <= 0.04045d) {
-            return (int)Math.rint(100000d * sRGB / 12.92d);
-        } else {
-            return (int)Math.rint(100000d * Math.pow((sRGB + 0.055d) / 1.055d, 2.4d));
-        }
-    }
-    
-    /**
-     * Convert linear RGB [0..100000] to sRGB float component [0..1]
-     * 
-     * @see Color#getRGBColorComponents(float[])
-     */
-    public static float lin2srgb(int linRGB) {
-        // color in percentage is in linear RGB color space, i.e. needs to be gamma corrected for AWT color
-        // see https://en.wikipedia.org/wiki/SRGB (The forward transformation)
-        if (linRGB <= 0.0031308d) {
-            return (float)(linRGB / 100000d * 12.92d);
-        } else {
-            return (float)(1.055d * Math.pow(linRGB / 100000d, 1.0d/2.4d) - 0.055d);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
deleted file mode 100644
index bdc5ab6..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.sl.usermodel.PictureShape;
-import org.apache.poi.sl.usermodel.RectAlign;
-
-
-public class DrawPictureShape extends DrawSimpleShape {
-    private static final POILogger LOG = POILogFactory.getLogger(DrawPictureShape.class);
-    private static final String WMF_IMAGE_RENDERER = "org.apache.poi.hwmf.draw.HwmfSLImageRenderer";
-    
-    public DrawPictureShape(PictureShape<?,?> shape) {
-        super(shape);
-    }
-    
-    @Override
-    public void drawContent(Graphics2D graphics) {
-        PictureData data = getShape().getPictureData();
-        if(data == null) return;
-
-        Rectangle2D anchor = getAnchor(graphics, getShape());
-        Insets insets = getShape().getClipping();
-
-        try {
-            ImageRenderer renderer = getImageRenderer(graphics, data.getContentType());
-            renderer.loadImage(data.getData(), data.getContentType());
-            renderer.drawImage(graphics, anchor, insets);
-        } catch (IOException e) {
-            LOG.log(POILogger.ERROR, "image can't be loaded/rendered.", e);
-        }
-    }    
-
-    /**
-     * Returns an ImageRenderer for the PictureData
-     *
-     * @param graphics
-     * @return the image renderer
-     */
-    public static ImageRenderer getImageRenderer(Graphics2D graphics, String contentType) {
-        ImageRenderer renderer = (ImageRenderer)graphics.getRenderingHint(Drawable.IMAGE_RENDERER);
-        if (renderer != null) {
-            return renderer;
-        }
-        
-        if (PictureType.WMF.contentType.equals(contentType)) {
-            try {
-                @SuppressWarnings("unchecked")
-                Class<? extends ImageRenderer> irc = (Class<? extends ImageRenderer>)
-                    Thread.currentThread().getContextClassLoader().loadClass(WMF_IMAGE_RENDERER);
-                return irc.newInstance();
-            } catch (Exception e) {
-                // WMF image renderer is not on the classpath, continuing with BitmapRenderer
-                // although this doesn't make much sense ...
-                LOG.log(POILogger.ERROR, "WMF image renderer is not on the classpath - include poi-scratchpad jar!", e);
-            }
-        }
-        
-        return new BitmapImageRenderer();
-    }
-    
-    @Override
-    protected PictureShape<?,?> getShape() {
-        return (PictureShape<?,?>)shape;
-    }
-    
-    /**
-     * Resize this picture to the default size.
-     *
-     * For PNG and JPEG resizes the image to 100%,
-     * for other types, if the size can't be determined it will be 200x200 pixels.
-     */
-    public void resize() {
-        PictureShape<?,?> ps = getShape();
-        Dimension dim = ps.getPictureData().getImageDimension();
-
-        Rectangle2D origRect = ps.getAnchor();
-        double x = origRect.getX();
-        double y = origRect.getY();
-        double w = dim.getWidth();
-        double h = dim.getHeight();
-        ps.setAnchor(new Rectangle2D.Double(x, y, w, h));
-    }
-
-
-    /**
-     * Fit picture shape into the target rectangle, maintaining the aspect ratio
-     * and repositioning within the target rectangle with a centered alignment.
-     *
-     * @param target    The target rectangle
-     */
-    public void resize(Rectangle2D target) {
-        resize(target, RectAlign.CENTER);
-    }
-
-
-    /**
-     * Fit picture shape into the target rectangle, maintaining the aspect ratio
-     * and repositioning within the target rectangle based on the specified
-     * alignment (gravity).
-     *
-     * @param target    The target rectangle
-     * @param align
-     *            The alignment within the target rectangle when resizing.
-     *            A null value corresponds to RectAlign.CENTER
-     */
-    public void resize(Rectangle2D target, RectAlign align) {
-        PictureShape<?,?> ps = getShape();
-        Dimension dim = ps.getPictureData().getImageDimension();
-        if (dim.width <= 0 || dim.height <= 0) {
-            // nothing useful to be done for this case
-            ps.setAnchor(target);
-            return;
-        }
-
-        double w = target.getWidth();
-        double h = target.getHeight();
-
-        // scaling
-        double sx = w / dim.width;
-        double sy = h / dim.height;
-
-        // position adjustments
-        double dx = 0, dy = 0;
-
-        if (sx > sy) {
-            // use y-scaling for both, reposition x accordingly
-            w  = sy * dim.width;
-            dx = target.getWidth() - w;
-        } else if (sy > sx) {
-            // use x-scaling for both, reposition y accordingly
-            h  = sx * dim.height;
-            dy = target.getHeight() - h;
-        } else {
-            // uniform scaling, can use target values directly
-            ps.setAnchor(target);
-            return;
-        }
-
-        // the positioning
-        double x = target.getX();
-        double y = target.getY();
-        switch (align) {
-            case TOP:           // X=balance, Y=ok
-                x += dx/2;
-                break;
-            case TOP_RIGHT:     // X=shift, Y=ok
-                x += dx;
-                break;
-            case RIGHT:         // X=shift, Y=balance
-                x += dx;
-                y += dy/2;
-                break;
-            case BOTTOM_RIGHT:  // X=shift, Y=shift
-                x += dx;
-                y += dy;
-                break;
-            case BOTTOM:        // X=balance, Y=shift
-                x += dx/2;
-                y += dy;
-                break;
-            case BOTTOM_LEFT:   // X=ok, Y=shift
-                y += dy;
-                break;
-            case LEFT:          // X=ok, Y=balance
-                y += dy/2;
-                break;
-            case TOP_LEFT:      // X=ok, Y=ok
-                /* no-op */
-                break;
-            default:            // CENTER: X=balance, Y=balance
-                x += dx/2;
-                y += dy/2;
-                break;
-        }
-
-        ps.setAnchor(new Rectangle2D.Double(x, y, w, h));
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java
deleted file mode 100644
index 1d0eca0..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.BasicStroke;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.util.Locale;
-
-import org.apache.poi.sl.usermodel.PlaceableShape;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCap;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-
-
-public class DrawShape implements Drawable {
-
-    protected final Shape<?,?> shape;
-
-    public DrawShape(Shape<?,?> shape) {
-        this.shape = shape;
-    }
-
-    /**
-     * Apply 2-D transforms before drawing this shape. This includes rotation and flipping.
-     *
-     * @param graphics the graphics whos transform matrix will be modified
-     */
-    public void applyTransform(Graphics2D graphics) {
-        if (!(shape instanceof PlaceableShape)) return;
-
-        PlaceableShape<?,?> ps = (PlaceableShape<?,?>)shape;
-        final boolean isHSLF = ps.getClass().getCanonicalName().toLowerCase(Locale.ROOT).contains("hslf");
-        AffineTransform tx = (AffineTransform)graphics.getRenderingHint(Drawable.GROUP_TRANSFORM);
-        if (tx == null) tx = new AffineTransform();
-        final Rectangle2D anchor = tx.createTransformedShape(ps.getAnchor()).getBounds2D();
-
-        char cmds[] = isHSLF ? new char[]{ 'h','v','r' } : new char[]{ 'r','h','v' };
-        for (char ch : cmds) {
-            switch (ch) {
-            case 'h':
-                //flip horizontal
-                if (ps.getFlipHorizontal()) {
-                    graphics.translate(anchor.getX() + anchor.getWidth(), anchor.getY());
-                    graphics.scale(-1, 1);
-                    graphics.translate(-anchor.getX(), -anchor.getY());
-                }
-                break;
-            case 'v':
-                //flip vertical
-                if (ps.getFlipVertical()) {
-                    graphics.translate(anchor.getX(), anchor.getY() + anchor.getHeight());
-                    graphics.scale(1, -1);
-                    graphics.translate(-anchor.getX(), -anchor.getY());
-                }
-                break;
-            case 'r':
-                // rotation
-                double rotation = ps.getRotation();
-                if (rotation != 0.) {
-                    // PowerPoint rotates shapes relative to the geometric center
-                    double centerX = anchor.getCenterX();
-                    double centerY = anchor.getCenterY();
-
-                    // normalize rotation
-                    rotation %= 360.;
-                    if (rotation < 0) rotation += 360.;
-
-                    int quadrant = (((int)rotation+45)/90)%4;
-                    double scaleX = 1.0, scaleY = 1.0;
-
-                    // scale to bounding box (bug #53176)
-                    if (quadrant == 1 || quadrant == 3) {
-                        // In quadrant 1 and 3, which is basically a shape in a more or less portrait orientation
-                        // (45-135 degrees and 225-315 degrees), we need to first rotate the shape by a multiple
-                        // of 90 degrees and then resize the bounding box to its original bbox. After that we can
-                        // rotate the shape to the exact rotation amount.
-                        // It's strange that you'll need to rotate the shape back and forth again, but you can
-                        // think of it, as if you paint the shape on a canvas. First you rotate the canvas, which might
-                        // be already (differently) scaled, so you can paint the shape in its default orientation
-                        // and later on, turn it around again to compare it with its original size ...
-
-                        AffineTransform txs;
-                        if (isHSLF) {
-                            txs = new AffineTransform(tx);
-                        } else {
-                            // this handling is only based on try and error ... not sure why xslf is handled differently.
-                            txs = new AffineTransform();
-                            txs.translate(centerX, centerY);
-                            txs.rotate(Math.PI/2.); // actually doesn't matter if +/- 90 degrees
-                            txs.translate(-centerX, -centerY);
-                            txs.concatenate(tx);
-                        }
-
-                        txs.translate(centerX, centerY);
-                        txs.rotate(Math.PI/2.);
-                        txs.translate(-centerX, -centerY);
-
-                        Rectangle2D anchor2 = txs.createTransformedShape(ps.getAnchor()).getBounds2D();
-
-                        scaleX = safeScale(anchor.getWidth(), anchor2.getWidth());
-                        scaleY = safeScale(anchor.getHeight(), anchor2.getHeight());
-                    } else {
-                        quadrant = 0;
-                    }
-
-                    // transformation is applied reversed ...
-                    graphics.translate(centerX, centerY);
-                    double rot = Math.toRadians(rotation-quadrant*90.);
-                    if (rot != 0) {
-                        graphics.rotate(rot);
-                    }
-                    graphics.scale(scaleX, scaleY);
-                    rot = Math.toRadians(quadrant*90);
-                    if (rot != 0) {
-                        graphics.rotate(rot);
-                    }
-                    graphics.translate(-centerX, -centerY);
-                }
-                break;
-            default:
-                throw new RuntimeException("unexpected transform code " + ch);
-            }
-        }
-    }
-
-    private static double safeScale(double dim1, double dim2) {
-        if (dim1 == 0.) {
-            return 1;
-        }
-        return (dim2 == 0.) ? 1 : dim1/dim2;
-    }
-
-    public void draw(Graphics2D graphics) {
-    }
-
-    public void drawContent(Graphics2D graphics) {
-    }
-
-    public static Rectangle2D getAnchor(Graphics2D graphics, PlaceableShape<?,?> shape) {
-        return getAnchor(graphics, shape.getAnchor());
-    }
-
-    public static Rectangle2D getAnchor(Graphics2D graphics, Rectangle2D anchor) {
-        if(graphics == null)  {
-            return anchor;
-        }
-
-        AffineTransform tx = (AffineTransform)graphics.getRenderingHint(Drawable.GROUP_TRANSFORM);
-        if(tx != null) {
-            anchor = tx.createTransformedShape(anchor).getBounds2D();
-        }
-        return anchor;
-    }
-    
-    protected Shape<?,?> getShape() {
-        return shape;
-    }
-    
-    protected static BasicStroke getStroke(StrokeStyle strokeStyle) {
-        float lineWidth = (float) strokeStyle.getLineWidth();
-        if (lineWidth == 0.0f) lineWidth = 0.25f; // Both PowerPoint and OOo draw zero-length lines as 0.25pt
-
-        LineDash lineDash = strokeStyle.getLineDash();
-        if (lineDash == null) {
-            lineDash = LineDash.SOLID;
-        }
-
-        int dashPatI[] = lineDash.pattern;
-        final float dash_phase = 0;
-        float[] dashPatF = null;
-        if (dashPatI != null) {
-            dashPatF = new float[dashPatI.length];
-            for (int i=0; i<dashPatI.length; i++) {
-                dashPatF[i] = dashPatI[i]*Math.max(1, lineWidth);
-            }
-        }
-
-        LineCap lineCapE = strokeStyle.getLineCap();
-        if (lineCapE == null) lineCapE = LineCap.FLAT;
-        int lineCap;
-        switch (lineCapE) {
-            case ROUND:
-                lineCap = BasicStroke.CAP_ROUND;
-                break;
-            case SQUARE:
-                lineCap = BasicStroke.CAP_SQUARE;
-                break;
-            default:
-            case FLAT:
-                lineCap = BasicStroke.CAP_BUTT;
-                break;
-        }
-
-        int lineJoin = BasicStroke.JOIN_ROUND;
-
-        return new BasicStroke(lineWidth, lineCap, lineJoin, lineWidth, dashPatF, dash_phase);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawSheet.java b/trunk/src/java/org/apache/poi/sl/draw/DrawSheet.java
deleted file mode 100644
index dbe82ea..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawSheet.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Dimension;
-import java.awt.Color;
-import java.awt.Graphics2D;
-
-import java.awt.geom.AffineTransform;
-
-import org.apache.poi.sl.usermodel.*;
-
-
-public class DrawSheet implements Drawable {
-
-    protected final Sheet<?,?> sheet;
-    
-    public DrawSheet(Sheet<?,?> sheet) {
-        this.sheet = sheet;
-    }
-    
-    public void draw(Graphics2D graphics) {
-        Dimension dim = sheet.getSlideShow().getPageSize();
-        Color whiteTrans = new Color(1f,1f,1f,0f);
-        graphics.setColor(whiteTrans);
-        graphics.fillRect(0, 0, (int)dim.getWidth(), (int)dim.getHeight());
-        
-        DrawFactory drawFact = DrawFactory.getInstance(graphics);
-        MasterSheet<?,?> master = sheet.getMasterSheet();
-        
-        if(sheet.getFollowMasterGraphics() && master != null) {
-            Drawable drawer = drawFact.getDrawable(master);
-            drawer.draw(graphics);
-        }
-        
-        graphics.setRenderingHint(Drawable.GROUP_TRANSFORM, new AffineTransform());
-
-        for (Shape<?,?> shape : sheet.getShapes()) {
-            if(!canDraw(shape)) continue;
-            
-            // remember the initial transform and restore it after we are done with drawing
-            AffineTransform at = graphics.getTransform();
-
-            // concrete implementations can make sense of this hint,
-            // for example PSGraphics2D or PDFGraphics2D would call gsave() / grestore
-            graphics.setRenderingHint(Drawable.GSAVE, true);
-
-            // apply rotation and flipping
-            Drawable drawer = drawFact.getDrawable(shape);
-            drawer.applyTransform(graphics);
-            // draw stuff
-            drawer.draw(graphics);
-
-            // restore the coordinate system
-            graphics.setTransform(at);
-
-            graphics.setRenderingHint(Drawable.GRESTORE, true);
-        }
-    }
-
-    public void applyTransform(Graphics2D context) {
-    }
-
-    public void drawContent(Graphics2D context) {
-    }
-
-    /**
-     * Checks if this <code>sheet</code> displays the specified shape.
-     *
-     * Subclasses can override it and skip certain shapes from drawings,
-     * for instance, slide masters and layouts don't display placeholders
-     */
-    protected boolean canDraw(Shape<?,?> shape){
-        return true;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
deleted file mode 100644
index 1032750..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.stream.EventFilter;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.events.StartElement;
-import javax.xml.stream.events.XMLEvent;
-
-import org.apache.poi.sl.draw.binding.CTCustomGeometry2D;
-import org.apache.poi.sl.draw.geom.Context;
-import org.apache.poi.sl.draw.geom.CustomGeometry;
-import org.apache.poi.sl.draw.geom.Outline;
-import org.apache.poi.sl.draw.geom.Path;
-import org.apache.poi.sl.usermodel.LineDecoration;
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape;
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.Shadow;
-import org.apache.poi.sl.usermodel.SimpleShape;
-import org.apache.poi.util.Units;
-
-
-public class DrawSimpleShape extends DrawShape {
-    
-    private static final double DECO_SIZE_POW = 1.5d;
-
-    public DrawSimpleShape(SimpleShape<?,?> shape) {
-        super(shape);
-    }
-
-    @Override
-    public void draw(Graphics2D graphics) {
-        DrawPaint drawPaint = DrawFactory.getInstance(graphics).getPaint(getShape());
-        Paint fill = drawPaint.getPaint(graphics, getShape().getFillStyle().getPaint());
-        Paint line = drawPaint.getPaint(graphics, getShape().getStrokeStyle().getPaint());
-        BasicStroke stroke = getStroke(); // the stroke applies both to the shadow and the shape
-        graphics.setStroke(stroke);
-
-        Collection<Outline> elems = computeOutlines(graphics);
-
-        // first paint the shadow
-        drawShadow(graphics, elems, fill, line);
-
-        // then fill the shape interior
-        if (fill != null) {
-            graphics.setPaint(fill);
-            for (Outline o : elems) {
-                if (o.getPath().isFilled()){
-                    java.awt.Shape s = o.getOutline();
-                    graphics.setRenderingHint(Drawable.GRADIENT_SHAPE, s);
-                    graphics.fill(s);
-                }
-            }
-        }
-
-        // then draw any content within this shape (text, image, etc.)
-        drawContent(graphics);
-
-        // then stroke the shape outline
-        if(line != null) {
-            graphics.setPaint(line);
-            graphics.setStroke(stroke);
-            for(Outline o : elems){
-                if(o.getPath().isStroked()){
-                    java.awt.Shape s = o.getOutline();
-                    graphics.setRenderingHint(Drawable.GRADIENT_SHAPE, s);
-                    graphics.draw(s);
-                }
-            }
-        }
-
-        // draw line decorations
-        drawDecoration(graphics, line, stroke);
-    }
-
-    protected void drawDecoration(Graphics2D graphics, Paint line, BasicStroke stroke) {
-        if(line == null) return;
-        graphics.setPaint(line);
-
-        List<Outline> lst = new ArrayList<Outline>();
-        LineDecoration deco = getShape().getLineDecoration();
-        Outline head = getHeadDecoration(graphics, deco, stroke);
-        if (head != null) lst.add(head);
-        Outline tail = getTailDecoration(graphics, deco, stroke);
-        if (tail != null) lst.add(tail);
-
-
-        for(Outline o : lst){
-            java.awt.Shape s = o.getOutline();
-            Path p = o.getPath();
-            graphics.setRenderingHint(Drawable.GRADIENT_SHAPE, s);
-
-            if(p.isFilled()) graphics.fill(s);
-            if(p.isStroked()) graphics.draw(s);
-        }
-    }
-
-    protected Outline getTailDecoration(Graphics2D graphics, LineDecoration deco, BasicStroke stroke) {
-        if (deco == null || stroke == null) {
-            return null;
-        }
-        DecorationSize tailLength = deco.getTailLength();
-        if (tailLength == null) {
-            tailLength = DecorationSize.MEDIUM;
-        }
-        DecorationSize tailWidth = deco.getTailWidth();
-        if (tailWidth == null) {
-            tailWidth = DecorationSize.MEDIUM;
-        }
-
-        double lineWidth = Math.max(2.5, stroke.getLineWidth());
-
-        Rectangle2D anchor = getAnchor(graphics, getShape());
-        double x2 = anchor.getX() + anchor.getWidth(),
-               y2 = anchor.getY() + anchor.getHeight();
-
-        double alpha = Math.atan(anchor.getHeight() / anchor.getWidth());
-
-        AffineTransform at = new AffineTransform();
-        java.awt.Shape tailShape = null;
-        Path p = null;
-        Rectangle2D bounds;
-        final double scaleY = Math.pow(DECO_SIZE_POW, tailWidth.ordinal()+1);
-        final double scaleX = Math.pow(DECO_SIZE_POW, tailLength.ordinal()+1);
-
-        DecorationShape tailShapeEnum = deco.getTailShape();
-
-        if (tailShapeEnum == null) {
-            return null;
-        }
-
-        switch (tailShapeEnum) {
-            case OVAL:
-                p = new Path();
-                tailShape = new Ellipse2D.Double(0, 0, lineWidth * scaleX, lineWidth * scaleY);
-                bounds = tailShape.getBounds2D();
-                at.translate(x2 - bounds.getWidth() / 2, y2 - bounds.getHeight() / 2);
-                at.rotate(alpha, bounds.getX() + bounds.getWidth() / 2, bounds.getY() + bounds.getHeight() / 2);
-                break;
-            case STEALTH:
-            case ARROW:
-                p = new Path(false, true);
-                Path2D.Double arrow = new Path2D.Double();
-                arrow.moveTo((-lineWidth * scaleX), (-lineWidth * scaleY / 2));
-                arrow.lineTo(0, 0);
-                arrow.lineTo((-lineWidth * scaleX), (lineWidth * scaleY / 2));
-                tailShape = arrow;
-                at.translate(x2, y2);
-                at.rotate(alpha);
-                break;
-            case TRIANGLE:
-                p = new Path();
-                Path2D.Double triangle = new Path2D.Double();
-                triangle.moveTo((-lineWidth * scaleX), (-lineWidth * scaleY / 2));
-                triangle.lineTo(0, 0);
-                triangle.lineTo((-lineWidth * scaleX), (lineWidth * scaleY / 2));
-                triangle.closePath();
-                tailShape = triangle;
-                at.translate(x2, y2);
-                at.rotate(alpha);
-                break;
-            default:
-                break;
-        }
-
-        if (tailShape != null) {
-            tailShape = at.createTransformedShape(tailShape);
-        }
-        return tailShape == null ? null : new Outline(tailShape, p);
-    }
-
-    protected Outline getHeadDecoration(Graphics2D graphics, LineDecoration deco, BasicStroke stroke) {
-        if (deco == null || stroke == null) {
-            return null;
-        }
-        DecorationSize headLength = deco.getHeadLength();
-        if (headLength == null) {
-            headLength = DecorationSize.MEDIUM;
-        }
-        DecorationSize headWidth = deco.getHeadWidth();
-        if (headWidth == null) {
-            headWidth = DecorationSize.MEDIUM;
-        }
-
-        double lineWidth = Math.max(2.5, stroke.getLineWidth());
-
-        Rectangle2D anchor = getAnchor(graphics, getShape());
-        double x1 = anchor.getX(),
-                y1 = anchor.getY();
-
-        double alpha = Math.atan(anchor.getHeight() / anchor.getWidth());
-
-        AffineTransform at = new AffineTransform();
-        java.awt.Shape headShape = null;
-        Path p = null;
-        Rectangle2D bounds;
-        final double scaleY = Math.pow(DECO_SIZE_POW, headWidth.ordinal()+1);
-        final double scaleX = Math.pow(DECO_SIZE_POW, headLength.ordinal()+1);
-        DecorationShape headShapeEnum = deco.getHeadShape();
-
-        if (headShapeEnum == null) {
-            return null;
-        }
-
-        switch (headShapeEnum) {
-            case OVAL:
-                p = new Path();
-                headShape = new Ellipse2D.Double(0, 0, lineWidth * scaleX, lineWidth * scaleY);
-                bounds = headShape.getBounds2D();
-                at.translate(x1 - bounds.getWidth() / 2, y1 - bounds.getHeight() / 2);
-                at.rotate(alpha, bounds.getX() + bounds.getWidth() / 2, bounds.getY() + bounds.getHeight() / 2);
-                break;
-            case STEALTH:
-            case ARROW:
-                p = new Path(false, true);
-                Path2D.Double arrow = new Path2D.Double();
-                arrow.moveTo((lineWidth * scaleX), (-lineWidth * scaleY / 2));
-                arrow.lineTo(0, 0);
-                arrow.lineTo((lineWidth * scaleX), (lineWidth * scaleY / 2));
-                headShape = arrow;
-                at.translate(x1, y1);
-                at.rotate(alpha);
-                break;
-            case TRIANGLE:
-                p = new Path();
-                Path2D.Double triangle = new Path2D.Double();
-                triangle.moveTo((lineWidth * scaleX), (-lineWidth * scaleY / 2));
-                triangle.lineTo(0, 0);
-                triangle.lineTo((lineWidth * scaleX), (lineWidth * scaleY / 2));
-                triangle.closePath();
-                headShape = triangle;
-                at.translate(x1, y1);
-                at.rotate(alpha);
-                break;
-            default:
-                break;
-        }
-
-        if (headShape != null) {
-            headShape = at.createTransformedShape(headShape);
-        }
-        return headShape == null ? null : new Outline(headShape, p);
-    }
-
-    public BasicStroke getStroke() {
-        return getStroke(getShape().getStrokeStyle());
-    }
-
-    protected void drawShadow(
-            Graphics2D graphics
-          , Collection<Outline> outlines
-          , Paint fill
-          , Paint line
-    ) {
-          Shadow<?,?> shadow = getShape().getShadow();
-          if (shadow == null || (fill == null && line == null)) return;
-
-          SolidPaint shadowPaint = shadow.getFillStyle();
-          Color shadowColor = DrawPaint.applyColorTransform(shadowPaint.getSolidColor());
-
-          double shapeRotation = getShape().getRotation();
-          if(getShape().getFlipVertical()) {
-              shapeRotation += 180;
-          }
-          double angle = shadow.getAngle() - shapeRotation;
-          double dist = shadow.getDistance();
-          double dx = dist * Math.cos(Math.toRadians(angle));
-          double dy = dist * Math.sin(Math.toRadians(angle));
-
-          graphics.translate(dx, dy);
-
-          for(Outline o : outlines){
-              java.awt.Shape s = o.getOutline();
-              Path p = o.getPath();
-              graphics.setRenderingHint(Drawable.GRADIENT_SHAPE, s);
-              graphics.setPaint(shadowColor);
-
-              if(fill != null && p.isFilled()){
-                  graphics.fill(s);
-              } else if (line != null && p.isStroked()) {
-                  graphics.draw(s);
-              }
-          }
-
-          graphics.translate(-dx, -dy);
-      }
-
-    protected static CustomGeometry getCustomGeometry(String name) {
-        return getCustomGeometry(name, null);
-    }
-
-    protected static CustomGeometry getCustomGeometry(String name, Graphics2D graphics) {
-        @SuppressWarnings("unchecked")
-        Map<String, CustomGeometry> presets = (graphics == null)
-            ? null
-            : (Map<String, CustomGeometry>)graphics.getRenderingHint(Drawable.PRESET_GEOMETRY_CACHE);
-
-        if (presets == null) {
-            presets = new HashMap<String,CustomGeometry>();
-            if (graphics != null) {
-                graphics.setRenderingHint(Drawable.PRESET_GEOMETRY_CACHE, presets);
-            }
-
-            String packageName = "org.apache.poi.sl.draw.binding";
-            InputStream presetIS = Drawable.class.getResourceAsStream("presetShapeDefinitions.xml");
-
-            // StAX:
-            EventFilter startElementFilter = new EventFilter() {
-                @Override
-                public boolean accept(XMLEvent event) {
-                    return event.isStartElement();
-                }
-            };
-
-            try {
-                XMLInputFactory staxFactory = XMLInputFactory.newInstance();
-                XMLEventReader staxReader = staxFactory.createXMLEventReader(presetIS);
-                XMLEventReader staxFiltRd = staxFactory.createFilteredReader(staxReader, startElementFilter);
-                // Ignore StartElement:
-                staxFiltRd.nextEvent();
-                // JAXB:
-                JAXBContext jaxbContext = JAXBContext.newInstance(packageName);
-                Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-
-                while (staxFiltRd.peek() != null) {
-                    StartElement evRoot = (StartElement)staxFiltRd.peek();
-                    String cusName = evRoot.getName().getLocalPart();
-                    // XMLEvent ev = staxReader.nextEvent();
-                    JAXBElement<org.apache.poi.sl.draw.binding.CTCustomGeometry2D> el = unmarshaller.unmarshal(staxReader, CTCustomGeometry2D.class);
-                    CTCustomGeometry2D cusGeom = el.getValue();
-
-                    presets.put(cusName, new CustomGeometry(cusGeom));
-                }
-                
-                staxFiltRd.close();
-                staxReader.close();
-            } catch (Exception e) {
-                throw new RuntimeException("Unable to load preset geometries.", e);
-            } finally {
-                try {
-                    presetIS.close();
-                } catch (IOException e) {
-                    throw new RuntimeException("Unable to load preset geometries.", e);
-                }
-            }
-        }
-
-        return presets.get(name);
-    }
-
-    protected Collection<Outline> computeOutlines(Graphics2D graphics) {
-
-        List<Outline> lst = new ArrayList<Outline>();
-        CustomGeometry geom = getShape().getGeometry();
-        if(geom == null) {
-            return lst;
-        }
-
-        Rectangle2D anchor = getAnchor(graphics, getShape());
-        for (Path p : geom) {
-
-            double w = p.getW() == -1 ? anchor.getWidth() * Units.EMU_PER_POINT : p.getW();
-            double h = p.getH() == -1 ? anchor.getHeight() * Units.EMU_PER_POINT : p.getH();
-
-            // the guides in the shape definitions are all defined relative to each other,
-            // so we build the path starting from (0,0).
-            final Rectangle2D pathAnchor = new Rectangle2D.Double(0,0,w,h);
-
-            Context ctx = new Context(geom, pathAnchor, getShape());
-
-            java.awt.Shape gp = p.getPath(ctx);
-
-            // translate the result to the canvas coordinates in points
-            AffineTransform at = new AffineTransform();
-            at.translate(anchor.getX(), anchor.getY());
-
-            double scaleX, scaleY;
-            if (p.getW() != -1) {
-                scaleX = anchor.getWidth() / p.getW();
-            } else {
-                scaleX = 1.0 / Units.EMU_PER_POINT;
-            }
-            if (p.getH() != -1) {
-                scaleY = anchor.getHeight() / p.getH();
-            } else {
-                scaleY = 1.0 / Units.EMU_PER_POINT;
-            }
-
-            at.scale(scaleX, scaleY);
-
-            java.awt.Shape canvasShape = at.createTransformedShape(gp);
-
-            lst.add(new Outline(canvasShape, p));
-        }
-
-        return lst;
-    }
-
-    @Override
-    protected SimpleShape<?,?> getShape() {
-        return (SimpleShape<?,?>)shape;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawSlide.java b/trunk/src/java/org/apache/poi/sl/draw/DrawSlide.java
deleted file mode 100644
index ae4baa2..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawSlide.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-
-import org.apache.poi.sl.usermodel.*;
-
-
-public class DrawSlide extends DrawSheet {
-
-    public DrawSlide(Slide<?,?> slide) {
-        super(slide);
-    }
-    
-    public void draw(Graphics2D graphics) {
-        Background<?,?> bg = sheet.getBackground();
-        if(bg != null) {
-            DrawFactory drawFact = DrawFactory.getInstance(graphics);
-            Drawable db = drawFact.getDrawable(bg);
-            db.draw(graphics);
-        }
-
-        super.draw(graphics);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawTableShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawTableShape.java
deleted file mode 100644
index 970c9b4..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawTableShape.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.geom.Line2D;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.apache.poi.sl.usermodel.TableCell;
-import org.apache.poi.sl.usermodel.TableCell.BorderEdge;
-import org.apache.poi.util.Internal;
-import org.apache.poi.sl.usermodel.TableShape;
-
-public class DrawTableShape extends DrawShape {
-    /**
-     * Additional spacing between cells
-     */
-    @Internal
-    public static final int borderSize = 2;
-    
-    public DrawTableShape(TableShape<?,?> shape) {
-        super(shape);
-    }
-
-    protected Drawable getGroupShape(Graphics2D graphics) {
-        if (shape instanceof GroupShape) {
-            DrawFactory df = DrawFactory.getInstance(graphics);
-            return df.getDrawable((GroupShape<?,?>)shape);
-        }
-        return null;
-    }
-
-    public void applyTransform(Graphics2D graphics) {
-        Drawable d = getGroupShape(graphics);
-        if (d != null) {
-            d.applyTransform(graphics);
-        } else {
-            super.applyTransform(graphics);
-        }
-    }
-
-    public void draw(Graphics2D graphics) {
-        Drawable d = getGroupShape(graphics);
-        if (d != null) {
-            d.draw(graphics);
-            return;
-        }
-
-        TableShape<?,?> ts = getShape();
-        DrawPaint drawPaint = DrawFactory.getInstance(graphics).getPaint(ts);
-        final int rows = ts.getNumberOfRows();
-        final int cols = ts.getNumberOfColumns();
-        
-        // draw background boxes
-        for (int row=0; row<rows; row++) {
-            for (int col=0; col<cols; col++) {
-                TableCell<?,?> tc = ts.getCell(row, col);
-                if (tc == null || tc.isMerged()) {
-                    continue;
-                }
-
-                Paint fillPaint = drawPaint.getPaint(graphics, tc.getFillStyle().getPaint());
-                graphics.setPaint(fillPaint);
-                Rectangle2D cellAnc = tc.getAnchor();
-                graphics.fill(cellAnc);
-                
-                for (BorderEdge edge : BorderEdge.values()) {
-                    StrokeStyle stroke = tc.getBorderStyle(edge);
-                    if (stroke == null) {
-                        continue;
-                    }
-                    graphics.setStroke(getStroke(stroke));
-                    Paint linePaint = drawPaint.getPaint(graphics, stroke.getPaint());
-                    graphics.setPaint(linePaint);
-
-                    double x=cellAnc.getX(), y=cellAnc.getY(), w=cellAnc.getWidth(), h=cellAnc.getHeight();
-                    Line2D line;
-                    switch (edge) {
-                        default:
-                        case bottom:
-                            line = new Line2D.Double(x-borderSize, y+h, x+w+borderSize, y+h);
-                            break;
-                        case left:
-                            line = new Line2D.Double(x, y, x, y+h+borderSize);
-                            break;
-                        case right:
-                            line = new Line2D.Double(x+w, y, x+w, y+h+borderSize);
-                            break;
-                        case top:
-                            line = new Line2D.Double(x-borderSize, y, x+w+borderSize, y);
-                            break;
-                    }
-
-                    graphics.draw(line);
-                }
-            }
-        }
-
-        // draw text
-        drawContent(graphics);
-    }
-
-    public void drawContent(Graphics2D graphics) {
-        Drawable d = getGroupShape(graphics);
-        if (d != null) {
-            d.drawContent(graphics);
-            return;
-        }
-        
-        TableShape<?,?> ts = getShape();
-        DrawFactory df = DrawFactory.getInstance(graphics);
-
-        final int rows = ts.getNumberOfRows();
-        final int cols = ts.getNumberOfColumns();
-        
-        for (int row=0; row<rows; row++) {
-            for (int col=0; col<cols; col++) {
-                TableCell<?,?> tc = ts.getCell(row, col);
-                DrawTextShape dts = df.getDrawable(tc);
-                dts.drawContent(graphics);
-            }
-        }
-    }
-
-    @Override
-    protected TableShape<?,?> getShape() {
-        return (TableShape<?,?>)shape;
-    }
-
-    /**
-     * Format the table and apply the specified Line to all cell boundaries,
-     * both outside and inside.
-     * An empty args parameter removes the affected border.
-     *
-     * @param args a varargs array possible containing {@link Double} (width),
-     * {@link LineCompound}, {@link Color}, {@link LineDash}
-     */
-    public void setAllBorders(Object... args) {
-        TableShape<?,?> table = getShape();
-        final int rows = table.getNumberOfRows();
-        final int cols = table.getNumberOfColumns();
-
-        BorderEdge edges[] = { BorderEdge.top, BorderEdge.left, null, null };
-        for (int row = 0; row < rows; row++) {
-            for (int col = 0; col < cols; col++) {
-                edges[2] = (col == cols - 1) ? BorderEdge.right : null;
-                edges[3] = (row == rows - 1) ? BorderEdge.bottom : null;
-                setEdges(table.getCell(row, col), edges, args);
-            }
-        }
-    }
-
-    /**
-     * Format the outside border using the specified Line object
-     * An empty args parameter removes the affected border.
-     *
-     * @param args a varargs array possible containing {@link Double} (width),
-     * {@link LineCompound}, {@link Color}, {@link LineDash}
-     */
-    public void setOutsideBorders(Object... args){
-        if (args.length == 0) return;
-
-        TableShape<?,?> table = getShape();
-        final int rows = table.getNumberOfRows();
-        final int cols = table.getNumberOfColumns();
-
-        BorderEdge edges[] = new BorderEdge[4];
-        for (int row = 0; row < rows; row++) {
-            for (int col = 0; col < cols; col++) {
-                edges[0] = (col == 0) ? BorderEdge.left : null;
-                edges[1] = (col == cols - 1) ? BorderEdge.right : null;
-                edges[2] = (row == 0) ? BorderEdge.top : null;
-                edges[3] = (row == rows - 1) ? BorderEdge.bottom : null;
-                setEdges(table.getCell(row, col), edges, args);
-            }
-        }
-    }
-
-    /**
-     * Format the inside border using the specified Line object
-     * An empty args parameter removes the affected border.
-     *
-     * @param args a varargs array possible containing {@link Double} (width),
-     * {@link LineCompound}, {@link Color}, {@link LineDash}
-     */
-    public void setInsideBorders(Object... args) {
-        if (args.length == 0) return;
-
-        TableShape<?,?> table = getShape();
-        final int rows = table.getNumberOfRows();
-        final int cols = table.getNumberOfColumns();
-
-        BorderEdge edges[] = new BorderEdge[2];
-        for (int row = 0; row < rows; row++) {
-            for (int col = 0; col < cols; col++) {
-                edges[0] = (col > 0 && col < cols - 1) ? BorderEdge.right : null;
-                edges[1] = (row > 0 && row < rows - 1) ? BorderEdge.bottom : null;
-                setEdges(table.getCell(row, col), edges, args);
-            }
-        }
-    }
-
-    /**
-     * Apply the border attributes (args) to the given cell and edges
-     *
-     * @param cell the cell
-     * @param edges the border edges
-     * @param args the border attributes
-     */
-    private static void setEdges(TableCell<?,?> cell, BorderEdge edges[], Object... args) {
-        for (BorderEdge be : edges) {
-            if (be != null) {
-                if (args.length == 0) {
-                    cell.removeBorder(be);
-                } else {
-                    for (Object o : args) {
-                        if (o instanceof Double) {
-                            cell.setBorderWidth(be, (Double)o);
-                        } else if (o instanceof Color) {
-                            cell.setBorderColor(be, (Color)o);
-                        } else if (o instanceof LineDash) {
-                            cell.setBorderDash(be, (LineDash)o);
-                        } else if (o instanceof LineCompound) {
-                            cell.setBorderCompound(be, (LineCompound)o);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawTextBox.java b/trunk/src/java/org/apache/poi/sl/draw/DrawTextBox.java
deleted file mode 100644
index d44d108..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawTextBox.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import org.apache.poi.sl.usermodel.*;
-
-public class DrawTextBox extends DrawAutoShape {
-    public DrawTextBox(TextBox<?,?> shape) {
-        super(shape);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawTextFragment.java b/trunk/src/java/org/apache/poi/sl/draw/DrawTextFragment.java
deleted file mode 100644
index acb6b4c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawTextFragment.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-import java.awt.font.TextLayout;
-import java.text.*;
-
-public class DrawTextFragment implements Drawable  {
-    final TextLayout layout;
-    final AttributedString str;
-    double x, y;
-    
-    public DrawTextFragment(TextLayout layout, AttributedString str) {
-        this.layout = layout;
-        this.str = str;
-    }
-
-    public void setPosition(double x, double y) {
-        // TODO: replace it, by applyTransform????
-        this.x = x;
-        this.y = y;
-    }
-
-    public void draw(Graphics2D graphics){
-        if(str == null) {
-            return;
-        }
-
-        double yBaseline = y + layout.getAscent();
-
-        Integer textMode = (Integer)graphics.getRenderingHint(Drawable.TEXT_RENDERING_MODE);
-        if(textMode != null && textMode == Drawable.TEXT_AS_SHAPES){
-            layout.draw(graphics, (float)x, (float)yBaseline);
-        } else {
-            graphics.drawString(str.getIterator(), (float)x, (float)yBaseline );
-        }
-    }
-
-    public void applyTransform(Graphics2D graphics) {
-    }
-
-    public void drawContent(Graphics2D graphics) {
-    }
-    
-    public TextLayout getLayout() {
-        return layout;
-    }
-
-    public AttributedString getAttributedString() {
-        return str;
-    }
-    
-    /**
-     * @return full height of this text run which is sum of ascent, descent and leading
-     */
-    public float getHeight(){
-        double h = Math.ceil(layout.getAscent()) + Math.ceil(layout.getDescent()) + layout.getLeading();
-        return (float)h;
-    }
-
-    /**
-     *
-     * @return width if this text run
-     */
-    public float getWidth(){
-        return layout.getAdvance();
-    }
-
-    /**
-     *
-     * @return the string to be painted
-     */
-    public String getString(){
-        if (str == null) return "";
-
-        AttributedCharacterIterator it = str.getIterator();
-         StringBuilder buf = new StringBuilder();
-         for (char c = it.first(); c != CharacterIterator.DONE; c = it.next()) {
-             buf.append(c);
-         }
-        return buf.toString();
-    }
-
-    @Override
-    public String toString(){
-        return "[" + getClass().getSimpleName() + "] " + getString();
-    }
-    
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
deleted file mode 100644
index efdd7f4..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.font.FontRenderContext;
-import java.awt.font.LineBreakMeasurer;
-import java.awt.font.TextAttribute;
-import java.awt.font.TextLayout;
-import java.awt.geom.Rectangle2D;
-import java.io.InvalidObjectException;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedCharacterIterator.Attribute;
-import java.text.AttributedString;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.apache.poi.sl.usermodel.Hyperlink;
-import org.apache.poi.sl.usermodel.Insets2D;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PlaceableShape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.Sheet;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.sl.usermodel.TextParagraph.BulletStyle;
-import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.sl.usermodel.TextRun.TextCap;
-import org.apache.poi.sl.usermodel.TextShape;
-import org.apache.poi.sl.usermodel.TextShape.TextDirection;
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.util.Units;
-
-
-public class DrawTextParagraph implements Drawable {
-    /** Keys for passing hyperlinks to the graphics context */
-    public static final XlinkAttribute HYPERLINK_HREF = new XlinkAttribute("href");
-    public static final XlinkAttribute HYPERLINK_LABEL = new XlinkAttribute("label");
-
-    protected TextParagraph<?,?,?> paragraph;
-    double x, y;
-    protected List<DrawTextFragment> lines = new ArrayList<DrawTextFragment>();
-    protected String rawText;
-    protected DrawTextFragment bullet;
-    protected int autoNbrIdx = 0;
-
-    /**
-     * the highest line in this paragraph. Used for line spacing.
-     */
-    protected double maxLineHeight;
-
-    /**
-     * Defines an attribute used for storing the hyperlink associated with
-     * some renderable text.
-     */
-    private static class XlinkAttribute extends Attribute {
-
-        XlinkAttribute(String name) {
-            super(name);
-        }
-
-        /**
-         * Resolves instances being deserialized to the predefined constants.
-         */
-        protected Object readResolve() throws InvalidObjectException {
-            if (HYPERLINK_HREF.getName().equals(getName())) {
-                return HYPERLINK_HREF;
-            }
-            if (HYPERLINK_LABEL.getName().equals(getName())) {
-                return HYPERLINK_LABEL;
-            }
-            throw new InvalidObjectException("unknown attribute name");
-        }
-    }
-
-
-    public DrawTextParagraph(TextParagraph<?,?,?> paragraph) {
-        this.paragraph = paragraph;
-    }
-
-    public void setPosition(double x, double y) {
-        // TODO: replace it, by applyTransform????
-        this.x = x;
-        this.y = y;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    /**
-     * Sets the auto numbering index of the handled paragraph
-     * @param index the auto numbering index
-     */
-    public void setAutoNumberingIdx(int index) {
-        autoNbrIdx = index;
-    }
-
-    public void draw(Graphics2D graphics){
-        if (lines.isEmpty()) return;
-
-        double penY = y;
-
-        boolean firstLine = true;
-        int indentLevel = paragraph.getIndentLevel();
-        Double leftMargin = paragraph.getLeftMargin();
-        if (leftMargin == null) {
-            // if the marL attribute is omitted, then a value of 347663 is implied
-            leftMargin = Units.toPoints(347663L*indentLevel);
-        }
-        Double indent = paragraph.getIndent();
-        if (indent == null) {
-            indent = Units.toPoints(347663L*indentLevel);
-        }
-        if (isHSLF()) {
-            // special handling for HSLF
-            indent -= leftMargin;
-        }
-
-//        Double rightMargin = paragraph.getRightMargin();
-//        if (rightMargin == null) {
-//            rightMargin = 0d;
-//        }
-
-        //The vertical line spacing
-        Double spacing = paragraph.getLineSpacing();
-        if (spacing == null) spacing = 100d;
-
-        for(DrawTextFragment line : lines){
-            double penX;
-
-            if(firstLine) {
-                if (!isEmptyParagraph()) {
-                    // TODO: find out character style for empty, but bulleted/numbered lines
-                    bullet = getBullet(graphics, line.getAttributedString().getIterator());
-                }
-
-                if (bullet != null){
-                    bullet.setPosition(x+leftMargin+indent, penY);
-                    bullet.draw(graphics);
-                    // don't let text overlay the bullet and advance by the bullet width
-                    double bulletWidth = bullet.getLayout().getAdvance() + 1;
-                    penX = x + Math.max(leftMargin, leftMargin+indent+bulletWidth);
-                } else {
-                    penX = x + leftMargin;
-                }
-            } else {
-                penX = x + leftMargin;
-            }
-
-            Rectangle2D anchor = DrawShape.getAnchor(graphics, paragraph.getParentShape());
-            // Insets are already applied on DrawTextShape.drawContent
-            // but (outer) anchor need to be adjusted
-            Insets2D insets = paragraph.getParentShape().getInsets();
-            double leftInset = insets.left;
-            double rightInset = insets.right;
-
-            TextAlign ta = paragraph.getTextAlign();
-            if (ta == null) ta = TextAlign.LEFT;
-            switch (ta) {
-                case CENTER:
-                    penX += (anchor.getWidth() - line.getWidth() - leftInset - rightInset - leftMargin) / 2;
-                    break;
-                case RIGHT:
-                    penX += (anchor.getWidth() - line.getWidth() - leftInset - rightInset);
-                    break;
-                default:
-                    break;
-            }
-
-            line.setPosition(penX, penY);
-            line.draw(graphics);
-
-            if(spacing > 0) {
-                // If linespacing >= 0, then linespacing is a percentage of normal line height.
-                penY += spacing*0.01* line.getHeight();
-            } else {
-                // negative value means absolute spacing in points
-                penY += -spacing;
-            }
-
-            firstLine = false;
-        }
-
-        y = penY - y;
-    }
-
-    public float getFirstLineHeight() {
-        return (lines.isEmpty()) ? 0 : lines.get(0).getHeight();
-    }
-
-    public float getLastLineHeight() {
-        return (lines.isEmpty()) ? 0 : lines.get(lines.size()-1).getHeight();
-    }
-
-    public boolean isEmptyParagraph() {
-        return (lines.isEmpty() || rawText.trim().isEmpty());
-    }
-
-    public void applyTransform(Graphics2D graphics) {
-    }
-
-    public void drawContent(Graphics2D graphics) {
-    }
-
-    /**
-     * break text into lines, each representing a line of text that fits in the wrapping width
-     *
-     * @param graphics
-     */
-    protected void breakText(Graphics2D graphics){
-        lines.clear();
-
-        DrawFactory fact = DrawFactory.getInstance(graphics);
-        StringBuilder text = new StringBuilder();
-        AttributedString at = getAttributedString(graphics, text);
-        boolean emptyParagraph = ("".equals(text.toString().trim()));
-
-        AttributedCharacterIterator it = at.getIterator();
-        LineBreakMeasurer measurer = new LineBreakMeasurer(it, graphics.getFontRenderContext());
-        for (;;) {
-            int startIndex = measurer.getPosition();
-
-            double wrappingWidth = getWrappingWidth(lines.size() == 0, graphics) + 1; // add a pixel to compensate rounding errors
-            // shape width can be smaller that the sum of insets (this was proved by a test file)
-            if(wrappingWidth < 0) wrappingWidth = 1;
-
-            int nextBreak = text.indexOf("\n", startIndex + 1);
-            if (nextBreak == -1) nextBreak = it.getEndIndex();
-
-            TextLayout layout = measurer.nextLayout((float)wrappingWidth, nextBreak, true);
-            if (layout == null) {
-                 // layout can be null if the entire word at the current position
-                 // does not fit within the wrapping width. Try with requireNextWord=false.
-                 layout = measurer.nextLayout((float)wrappingWidth, nextBreak, false);
-            }
-
-            if(layout == null) {
-                // exit if can't break any more
-                break;
-            }
-
-            int endIndex = measurer.getPosition();
-            // skip over new line breaks (we paint 'clear' text runs not starting or ending with \n)
-            if(endIndex < it.getEndIndex() && text.charAt(endIndex) == '\n'){
-                measurer.setPosition(endIndex + 1);
-            }
-
-            TextAlign hAlign = paragraph.getTextAlign();
-            if(hAlign == TextAlign.JUSTIFY || hAlign == TextAlign.JUSTIFY_LOW) {
-                layout = layout.getJustifiedLayout((float)wrappingWidth);
-            }
-
-            AttributedString str = (emptyParagraph)
-                ? null // we will not paint empty paragraphs
-                : new AttributedString(it, startIndex, endIndex);
-            DrawTextFragment line = fact.getTextFragment(layout, str);
-            lines.add(line);
-
-            maxLineHeight = Math.max(maxLineHeight, line.getHeight());
-
-            if(endIndex == it.getEndIndex()) break;
-        }
-
-        rawText = text.toString();
-    }
-
-    protected DrawTextFragment getBullet(Graphics2D graphics, AttributedCharacterIterator firstLineAttr) {
-        BulletStyle bulletStyle = paragraph.getBulletStyle();
-        if (bulletStyle == null) return null;
-
-        String buCharacter;
-        AutoNumberingScheme ans = bulletStyle.getAutoNumberingScheme();
-        if (ans != null) {
-            buCharacter = ans.format(autoNbrIdx);
-        } else {
-            buCharacter = bulletStyle.getBulletCharacter();
-        }
-        if (buCharacter == null) return null;
-
-        String buFont = bulletStyle.getBulletFont();
-        if (buFont == null) buFont = paragraph.getDefaultFontFamily();
-        assert(buFont != null);
-
-        PlaceableShape<?,?> ps = getParagraphShape();
-        PaintStyle fgPaintStyle = bulletStyle.getBulletFontColor();
-        Paint fgPaint;
-        if (fgPaintStyle == null) {
-            fgPaint = (Paint)firstLineAttr.getAttribute(TextAttribute.FOREGROUND);
-        } else {
-            fgPaint = new DrawPaint(ps).getPaint(graphics, fgPaintStyle);
-        }
-
-        float fontSize = (Float)firstLineAttr.getAttribute(TextAttribute.SIZE);
-        Double buSz = bulletStyle.getBulletFontSize();
-        if (buSz == null) buSz = 100d;
-        if (buSz > 0) fontSize *= buSz* 0.01;
-        else fontSize = (float)-buSz;
-
-
-        AttributedString str = new AttributedString(mapFontCharset(buCharacter,buFont));
-        str.addAttribute(TextAttribute.FOREGROUND, fgPaint);
-        str.addAttribute(TextAttribute.FAMILY, buFont);
-        str.addAttribute(TextAttribute.SIZE, fontSize);
-
-        TextLayout layout = new TextLayout(str.getIterator(), graphics.getFontRenderContext());
-        DrawFactory fact = DrawFactory.getInstance(graphics);
-        return fact.getTextFragment(layout, str);
-    }
-
-    protected String getRenderableText(TextRun tr) {
-        StringBuilder buf = new StringBuilder();
-        TextCap cap = tr.getTextCap();
-        String tabs = null;
-        for (char c : tr.getRawText().toCharArray()) {
-            switch (c) {
-                case '\t':
-                    if (tabs == null) {
-                        tabs = tab2space(tr);
-                    }
-                    buf.append(tabs);
-                    break;
-                case '\u000b':
-                    buf.append('\n');
-                    break;
-                default:
-                    switch (cap) {
-                        case ALL: c = Character.toUpperCase(c); break;
-                        case SMALL: c = Character.toLowerCase(c); break;
-                        case NONE: break;
-                    }
-
-                    buf.append(c);
-                    break;
-            }
-        }
-
-        return buf.toString();
-    }
-
-    /**
-     * Replace a tab with the effective number of white spaces.
-     */
-    private String tab2space(TextRun tr) {
-        AttributedString string = new AttributedString(" ");
-        String fontFamily = tr.getFontFamily();
-        if (fontFamily == null) fontFamily = "Lucida Sans";
-        string.addAttribute(TextAttribute.FAMILY, fontFamily);
-
-        Double fs = tr.getFontSize();
-        if (fs == null) fs = 12d;
-        string.addAttribute(TextAttribute.SIZE, fs.floatValue());
-
-        TextLayout l = new TextLayout(string.getIterator(), new FontRenderContext(null, true, true));
-        double wspace = l.getAdvance();
-
-        Double tabSz = paragraph.getDefaultTabSize();
-        if (tabSz == null) tabSz = wspace*4;
-
-        int numSpaces = (int)Math.ceil(tabSz / wspace);
-        StringBuilder buf = new StringBuilder();
-        for(int i = 0; i < numSpaces; i++) {
-            buf.append(' ');
-        }
-        return buf.toString();
-    }
-
-
-    /**
-     * Returns wrapping width to break lines in this paragraph
-     *
-     * @param firstLine whether the first line is breaking
-     *
-     * @return  wrapping width in points
-     */
-    protected double getWrappingWidth(boolean firstLine, Graphics2D graphics){
-        TextShape<?,?> ts = paragraph.getParentShape();
-
-        // internal margins for the text box
-        Insets2D insets = ts.getInsets();
-        double leftInset = insets.left;
-        double rightInset = insets.right;
-
-        int indentLevel = paragraph.getIndentLevel();
-        if (indentLevel == -1) {
-            // default to 0, if indentLevel is not set
-            indentLevel = 0;
-        }
-        Double leftMargin = paragraph.getLeftMargin();
-        if (leftMargin == null) {
-            // if the marL attribute is omitted, then a value of 347663 is implied
-            leftMargin = Units.toPoints(347663L*(indentLevel+1));
-        }
-        Double indent = paragraph.getIndent();
-        if (indent == null) {
-            indent = Units.toPoints(347663L*indentLevel);
-        }
-        Double rightMargin = paragraph.getRightMargin();
-        if (rightMargin == null) {
-            rightMargin = 0d;
-        }
-
-        Rectangle2D anchor = DrawShape.getAnchor(graphics, ts);
-        TextDirection textDir = ts.getTextDirection();
-        double width;
-        if (!ts.getWordWrap()) {
-            Dimension pageDim = ts.getSheet().getSlideShow().getPageSize();
-            // if wordWrap == false then we return the advance to the (right) border of the sheet
-            switch (textDir) {
-                default:
-                    width = pageDim.getWidth() - anchor.getX();
-                    break;
-                case VERTICAL:
-                    width = pageDim.getHeight() - anchor.getX();
-                    break;
-                case VERTICAL_270:
-                    width = anchor.getX();
-                    break;
-            }
-        } else {
-            switch (textDir) {
-                default:
-                    width = anchor.getWidth() - leftInset - rightInset - leftMargin - rightMargin;
-                    break;
-                case VERTICAL:
-                case VERTICAL_270:
-                    width = anchor.getHeight() - leftInset - rightInset - leftMargin - rightMargin;
-                    break;
-            }
-            if (firstLine && !isHSLF()) {
-                if (bullet != null){
-                    if (indent > 0) width -= indent;
-                } else {
-                    if (indent > 0) width -= indent; // first line indentation
-                    else if (indent < 0) { // hanging indentation: the first line start at the left margin
-                        width += leftMargin;
-                    }
-                }
-            }
-        }
-
-        return width;
-    }
-
-    private static class AttributedStringData {
-        Attribute attribute;
-        Object value;
-        int beginIndex, endIndex;
-        AttributedStringData(Attribute attribute, Object value, int beginIndex, int endIndex) {
-            this.attribute = attribute;
-            this.value = value;
-            this.beginIndex = beginIndex;
-            this.endIndex = endIndex;
-        }
-    }
-
-    /**
-     * Helper method for paint style relative to bounds, e.g. gradient paint
-     */
-    @SuppressWarnings("rawtypes")
-    private PlaceableShape<?,?> getParagraphShape() {
-        PlaceableShape<?,?> ps = new PlaceableShape(){
-            public ShapeContainer<?,?> getParent() { return null; }
-            public Rectangle2D getAnchor() { return paragraph.getParentShape().getAnchor(); }
-            public void setAnchor(Rectangle2D anchor) {}
-            public double getRotation() { return 0; }
-            public void setRotation(double theta) {}
-            public void setFlipHorizontal(boolean flip) {}
-            public void setFlipVertical(boolean flip) {}
-            public boolean getFlipHorizontal() { return false; }
-            public boolean getFlipVertical() { return false; }
-            public Sheet<?,?> getSheet() { return paragraph.getParentShape().getSheet(); }
-        };
-        return ps;
-    }
-
-    protected AttributedString getAttributedString(Graphics2D graphics, StringBuilder text){
-        List<AttributedStringData> attList = new ArrayList<AttributedStringData>();
-        if (text == null) text = new StringBuilder();
-
-        PlaceableShape<?,?> ps = getParagraphShape();
-
-        DrawFontManager fontHandler = (DrawFontManager)graphics.getRenderingHint(Drawable.FONT_HANDLER);
-
-        for (TextRun run : paragraph){
-            String runText = getRenderableText(run);
-            // skip empty runs
-            if (runText.isEmpty()) continue;
-
-            // user can pass an custom object to convert fonts
-            String fontFamily = run.getFontFamily();
-            @SuppressWarnings("unchecked")
-            Map<String,String> fontMap = (Map<String,String>)graphics.getRenderingHint(Drawable.FONT_MAP);
-            if (fontMap != null && fontMap.containsKey(fontFamily)) {
-                fontFamily = fontMap.get(fontFamily);
-            }
-            if(fontHandler != null) {
-                fontFamily = fontHandler.getRendererableFont(fontFamily, run.getPitchAndFamily());
-            }
-            if (fontFamily == null) {
-                fontFamily = paragraph.getDefaultFontFamily();
-            }
-
-            int beginIndex = text.length();
-            text.append(mapFontCharset(runText,fontFamily));
-            int endIndex = text.length();
-
-            attList.add(new AttributedStringData(TextAttribute.FAMILY, fontFamily, beginIndex, endIndex));
-
-            PaintStyle fgPaintStyle = run.getFontColor();
-            Paint fgPaint = new DrawPaint(ps).getPaint(graphics, fgPaintStyle);
-            attList.add(new AttributedStringData(TextAttribute.FOREGROUND, fgPaint, beginIndex, endIndex));
-
-            Double fontSz = run.getFontSize();
-            if (fontSz == null) fontSz = paragraph.getDefaultFontSize();
-            attList.add(new AttributedStringData(TextAttribute.SIZE, fontSz.floatValue(), beginIndex, endIndex));
-
-            if(run.isBold()) {
-                attList.add(new AttributedStringData(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD, beginIndex, endIndex));
-            }
-            if(run.isItalic()) {
-                attList.add(new AttributedStringData(TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE, beginIndex, endIndex));
-            }
-            if(run.isUnderlined()) {
-                attList.add(new AttributedStringData(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON, beginIndex, endIndex));
-                attList.add(new AttributedStringData(TextAttribute.INPUT_METHOD_UNDERLINE, TextAttribute.UNDERLINE_LOW_TWO_PIXEL, beginIndex, endIndex));
-            }
-            if(run.isStrikethrough()) {
-                attList.add(new AttributedStringData(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON, beginIndex, endIndex));
-            }
-            if(run.isSubscript()) {
-                attList.add(new AttributedStringData(TextAttribute.SUPERSCRIPT, TextAttribute.SUPERSCRIPT_SUB, beginIndex, endIndex));
-            }
-            if(run.isSuperscript()) {
-                attList.add(new AttributedStringData(TextAttribute.SUPERSCRIPT, TextAttribute.SUPERSCRIPT_SUPER, beginIndex, endIndex));
-            }
-            
-            Hyperlink<?,?> hl = run.getHyperlink();
-            if (hl != null) {
-                attList.add(new AttributedStringData(HYPERLINK_HREF, hl.getAddress(), beginIndex, endIndex));
-                attList.add(new AttributedStringData(HYPERLINK_LABEL, hl.getLabel(), beginIndex, endIndex));
-            }
-        }
-
-        // ensure that the paragraph contains at least one character
-        // We need this trick to correctly measure text
-        if (text.length() == 0) {
-            Double fontSz = paragraph.getDefaultFontSize();
-            text.append(" ");
-            attList.add(new AttributedStringData(TextAttribute.SIZE, fontSz.floatValue(), 0, 1));
-        }
-
-        AttributedString string = new AttributedString(text.toString());
-        for (AttributedStringData asd : attList) {
-            string.addAttribute(asd.attribute, asd.value, asd.beginIndex, asd.endIndex);
-        }
-
-        return string;
-    }
-
-    protected boolean isHSLF() {
-        return paragraph.getClass().getName().contains("HSLF");
-    }
-
-    /**
-     * Map text charset depending on font family.
-     * Currently this only maps for wingdings font (into unicode private use area)
-     *
-     * @param text the raw text
-     * @param fontFamily the font family
-     * @return AttributedString with mapped codepoints
-     *
-     * @see <a href="http://stackoverflow.com/questions/8692095">Drawing exotic fonts in a java applet</a>
-     * @see StringUtil#mapMsCodepointString(String)
-     */
-    protected String mapFontCharset(String text, String fontFamily) {
-        // TODO: find a real charset mapping solution instead of hard coding for Wingdings
-        String attStr = text;
-        if ("Wingdings".equalsIgnoreCase(fontFamily)) {
-            // wingdings doesn't contain high-surrogates, so chars are ok
-            boolean changed = false;
-            char chrs[] = attStr.toCharArray();
-            for (int i=0; i<chrs.length; i++) {
-                // only change valid chars
-                if ((0x20 <= chrs[i] && chrs[i] <= 0x7f) ||
-                    (0xa0 <= chrs[i] && chrs[i] <= 0xff)) {
-                    chrs[i] |= 0xf000;
-                    changed = true;
-                }
-            }
-
-            if (changed) {
-                attStr = new String(chrs);
-            }
-        }
-        return attStr;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/DrawTextShape.java b/trunk/src/java/org/apache/poi/sl/draw/DrawTextShape.java
deleted file mode 100644
index 3a1d8fa..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/DrawTextShape.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.util.Iterator;
-
-import org.apache.poi.sl.usermodel.Insets2D;
-import org.apache.poi.sl.usermodel.PlaceableShape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.sl.usermodel.TextParagraph.BulletStyle;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.sl.usermodel.TextShape;
-import org.apache.poi.sl.usermodel.TextShape.TextDirection;
-
-public class DrawTextShape extends DrawSimpleShape {
-
-    public DrawTextShape(TextShape<?,?> shape) {
-        super(shape);
-    }
-
-    @Override
-    public void drawContent(Graphics2D graphics) {
-        DrawFactory.getInstance(graphics).fixFonts(graphics);
-        
-        TextShape<?,?> s = getShape();
-        
-        Rectangle2D anchor = DrawShape.getAnchor(graphics, s);
-        Insets2D insets = s.getInsets();
-        double x = anchor.getX() + insets.left;
-        double y = anchor.getY();
-
-        // remember the initial transform
-        AffineTransform tx = graphics.getTransform();
-    
-        // Transform of text in flipped shapes is special.
-        // At this point the flip and rotation transform is already applied
-        // (see DrawShape#applyTransform ), but we need to restore it to avoid painting "upside down".
-        // See Bugzilla 54210.
-
-        boolean vertFlip = s.getFlipVertical();
-        boolean horzFlip = s.getFlipHorizontal();
-        ShapeContainer<?,?> sc = s.getParent();
-        while (sc instanceof PlaceableShape) {
-            PlaceableShape<?,?> ps = (PlaceableShape<?,?>)sc;
-            vertFlip ^= ps.getFlipVertical();
-            horzFlip ^= ps.getFlipHorizontal();
-            sc = ps.getParent();
-        }
-        
-        // Horizontal flipping applies only to shape outline and not to the text in the shape.
-        // Applying flip second time restores the original not-flipped transform
-        if (horzFlip ^ vertFlip) {
-            final double ax = anchor.getX();
-            final double ay = anchor.getY();
-            graphics.translate(ax + anchor.getWidth(), ay);
-            graphics.scale(-1, 1);
-            graphics.translate(-ax, -ay);
-        }
-
-        Double textRot = s.getTextRotation();
-        if (textRot != null && textRot != 0) {
-            final double cx = anchor.getCenterX();
-            final double cy = anchor.getCenterY();
-            graphics.translate(cx, cy);
-            graphics.rotate(Math.toRadians(textRot));
-            graphics.translate(-cx, -cy);
-        }
-        
-        // first dry-run to calculate the total height of the text
-        double textHeight;
-
-        switch (s.getVerticalAlignment()){
-            default:
-            case TOP:
-                y += insets.top;
-                break;
-            case BOTTOM:
-                textHeight = getTextHeight(graphics);
-                y += anchor.getHeight() - textHeight - insets.bottom;
-                break;
-            case MIDDLE:
-                textHeight = getTextHeight(graphics);
-                double delta = anchor.getHeight() - textHeight - insets.top - insets.bottom;
-                y += insets.top + delta/2;
-                break;
-        }
-
-        TextDirection textDir = s.getTextDirection();
-        if (textDir == TextDirection.VERTICAL || textDir == TextDirection.VERTICAL_270) {
-            final double deg = (textDir == TextDirection.VERTICAL) ? 90 : 270;
-            final double cx = anchor.getCenterX();
-            final double cy = anchor.getCenterY();
-            graphics.translate(cx, cy);
-            graphics.rotate(Math.toRadians(deg));
-            graphics.translate(-cx, -cy);
-            
-            // old top/left edge is now bottom/left or top/right - as we operate on the already
-            // rotated drawing context, both verticals can be moved in the same direction
-            final double w = anchor.getWidth();
-            final double h = anchor.getHeight();
-            final double dx = (w-h)/2d;
-            graphics.translate(dx,-dx);
-        }
-
-        drawParagraphs(graphics, x, y);
-
-        // restore the transform
-        graphics.setTransform(tx);
-    }
-
-    /**
-     * paint the paragraphs starting from top left (x,y)
-     *
-     * @return  the vertical advance, i.e. the cumulative space occupied by the text
-     */
-    public double drawParagraphs(Graphics2D graphics, double x, double y) {
-        DrawFactory fact = DrawFactory.getInstance(graphics);
-
-        double y0 = y;
-        //noinspection RedundantCast
-        Iterator<? extends TextParagraph<?,?,? extends TextRun>> paragraphs =
-            (Iterator<? extends TextParagraph<?,?,? extends TextRun>>) getShape().iterator();
-        
-        boolean isFirstLine = true;
-        for (int autoNbrIdx=0; paragraphs.hasNext(); autoNbrIdx++){
-            TextParagraph<?,?,? extends TextRun> p = paragraphs.next();
-            DrawTextParagraph dp = fact.getDrawable(p);
-            BulletStyle bs = p.getBulletStyle();
-            if (bs == null || bs.getAutoNumberingScheme() == null) {
-                autoNbrIdx = -1;
-            } else {
-                Integer startAt = bs.getAutoNumberingStartAt();
-                if (startAt == null) startAt = 1;
-                // TODO: handle reset auto number indexes
-                if (startAt > autoNbrIdx) autoNbrIdx = startAt;
-            }
-            dp.setAutoNumberingIdx(autoNbrIdx);
-            dp.breakText(graphics);
-
-            if (!isFirstLine) {
-                // the amount of vertical white space before the paragraph
-                Double spaceBefore = p.getSpaceBefore();
-                if (spaceBefore == null) spaceBefore = 0d;
-                if(spaceBefore > 0) {
-                    // positive value means percentage spacing of the height of the first line, e.g.
-                    // the higher the first line, the bigger the space before the paragraph
-                    y += spaceBefore*0.01*dp.getFirstLineHeight();
-                } else {
-                    // negative value means the absolute spacing in points
-                    y += -spaceBefore;
-                }
-            }
-            isFirstLine = false;
-            
-            dp.setPosition(x, y);
-            dp.draw(graphics);
-            y += dp.getY();
-
-            if (paragraphs.hasNext()) {
-                Double spaceAfter = p.getSpaceAfter();
-                if (spaceAfter == null) spaceAfter = 0d;
-                if(spaceAfter > 0) {
-                    // positive value means percentage spacing of the height of the last line, e.g.
-                    // the higher the last line, the bigger the space after the paragraph
-                    y += spaceAfter*0.01*dp.getLastLineHeight();
-                } else {
-                    // negative value means the absolute spacing in points
-                    y += -spaceAfter;
-                }
-            }
-        }
-        return y - y0;
-    }
-
-    /**
-     * Compute the cumulative height occupied by the text
-     * 
-     * @return the height in points
-     */
-    public double getTextHeight() {
-        return getTextHeight(null);
-    }
-    
-    /**
-     * Compute the cumulative height occupied by the text
-     *
-     * @param oldGraphics the graphics context, which properties are to be copied, may be null
-     * @return the height in points
-     */
-    protected double getTextHeight(Graphics2D oldGraphics) {
-        // dry-run in a 1x1 image and return the vertical advance
-        BufferedImage img = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
-        Graphics2D graphics = img.createGraphics();
-        if (oldGraphics != null) {
-            graphics.addRenderingHints(oldGraphics.getRenderingHints());
-            graphics.setTransform(oldGraphics.getTransform());
-        }
-        DrawFactory.getInstance(graphics).fixFonts(graphics);
-        return drawParagraphs(graphics, 0, 0);
-    }
-    
-    @Override
-    protected TextShape<?,?> getShape() {
-        return (TextShape<?,?>)shape;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/Drawable.java b/trunk/src/java/org/apache/poi/sl/draw/Drawable.java
deleted file mode 100644
index 54128b8..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/Drawable.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-
-import org.apache.poi.util.Internal;
-
-
-public interface Drawable {
-    class DrawableHint extends RenderingHints.Key {
-        protected DrawableHint(int id) {
-            super(id);
-        }
-        
-        public boolean isCompatibleValue(Object val) {
-            return true;
-        }
-        
-        public String toString() {
-            switch (intKey()) {
-            case 1: return "DRAW_FACTORY";
-            case 2: return "GROUP_TRANSFORM";
-            case 3: return "IMAGE_RENDERER";
-            case 4: return "TEXT_RENDERING_MODE";
-            case 5: return "GRADIENT_SHAPE";
-            case 6: return "PRESET_GEOMETRY_CACHE";
-            case 7: return "FONT_HANDLER";
-            case 8: return "FONT_FALLBACK";
-            case 9: return "FONT_MAP";
-            case 10: return "GSAVE";
-            case 11: return "GRESTORE";
-            default: return "UNKNOWN_ID "+intKey();
-            }
-        }
-    }
-    
-    /**
-     * {@link DrawFactory} which will be used to draw objects into this graphics context
-     */
-    DrawableHint DRAW_FACTORY = new DrawableHint(1);
-
-    /**
-     * Key will be internally used to store affine transformation temporarily within group shapes
-     */
-    @Internal
-    DrawableHint GROUP_TRANSFORM = new DrawableHint(2);
-
-    /**
-     * Use a custom image renderer of an instance of {@link ImageRenderer}
-     */
-    DrawableHint IMAGE_RENDERER = new DrawableHint(3);
-
-    /**
-     *  how to render text:
-     *
-     *  {@link #TEXT_AS_CHARACTERS} (default) means to draw via
-     *   {@link java.awt.Graphics2D#drawString(java.text.AttributedCharacterIterator, float, float)}.
-     *   This mode draws text as characters. Use it if the target graphics writes the actual
-     *   character codes instead of glyph outlines (PDFGraphics2D, SVGGraphics2D, etc.)
-     *
-     *   {@link #TEXT_AS_SHAPES} means to render via
-     *   {@link java.awt.font.TextLayout#draw(java.awt.Graphics2D, float, float)}.
-     *   This mode draws glyphs as shapes and provides some advanced capabilities such as
-     *   justification and font substitution. Use it if the target graphics is an image.
-     *
-     */
-    DrawableHint TEXT_RENDERING_MODE = new DrawableHint(4);
-
-    /**
-     * PathGradientPaint needs the shape to be set.
-     * It will be achieved through setting it in the rendering hints
-     */
-    DrawableHint GRADIENT_SHAPE = new DrawableHint(5);
-
-
-    /**
-     * Internal key for caching the preset geometries
-     */
-    DrawableHint PRESET_GEOMETRY_CACHE = new DrawableHint(6);
-    
-    /**
-     * draw text via {@link java.awt.Graphics2D#drawString(java.text.AttributedCharacterIterator, float, float)}
-     */
-    int TEXT_AS_CHARACTERS = 1;
-
-    /**
-     * draw text via {@link java.awt.font.TextLayout#draw(java.awt.Graphics2D, float, float)}
-     */
-    int TEXT_AS_SHAPES = 2;
-
-    /**
-     * Use this object to resolve unknown / missing fonts when rendering slides
-     */
-    DrawableHint FONT_HANDLER = new DrawableHint(7);
-    DrawableHint FONT_FALLBACK = new DrawableHint(8);
-    DrawableHint FONT_MAP = new DrawableHint(9);
-    
-    DrawableHint GSAVE = new DrawableHint(10);
-    DrawableHint GRESTORE = new DrawableHint(11);
-    
-    
-    
-    /**
-     * Apply 2-D transforms before drawing this shape. This includes rotation and flipping.
-     *
-     * @param graphics the graphics whos transform matrix will be modified
-     */
-    void applyTransform(Graphics2D graphics);
-    
-    /**
-     * Draw this shape into the supplied canvas
-     *
-     * @param graphics the graphics to draw into
-     */
-    void draw(Graphics2D graphics);
-    
-    /**
-     * draw any content within this shape (image, text, etc.).
-     *
-     * @param graphics the graphics to draw into
-     */
-    void drawContent(Graphics2D graphics);    
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/ImageRenderer.java b/trunk/src/java/org/apache/poi/sl/draw/ImageRenderer.java
deleted file mode 100644
index 6b8c49a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/ImageRenderer.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.sl.draw;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Classes can implement this interfaces to support other formats, for
- * example, use Apache Batik to render WMF, PICT can be rendered using Apple QuickTime API for Java:
- *
- * <pre>
- * <code>
- * public class MyImageRendener implements ImageRendener {
- *     InputStream data;
- *
- *     public boolean drawImage(Graphics2D graphics,Rectangle2D anchor,Insets clip) {
- *         // draw image
- *       DataInputStream is = new DataInputStream(data);
- *       org.apache.batik.transcoder.wmf.tosvg.WMFRecordStore wmfStore =
- *               new org.apache.batik.transcoder.wmf.tosvg.WMFRecordStore();
- *       try {
- *           wmfStore.read(is);
- *       } catch (IOException e){
- *           return;
- *       }
- *
- *       float scale = (float)anchor.width/wmfStore.getWidthPixels();
- *
- *       org.apache.batik.transcoder.wmf.tosvg.WMFPainter painter =
- *               new org.apache.batik.transcoder.wmf.tosvg.WMFPainter(wmfStore, 0, 0, scale);
- *       graphics.translate(anchor.x, anchor.y);
- *       painter.paint(graphics);
- *     }
- *
- *     public void loadImage(InputStream data, String contentType) throws IOException {
- *         if ("image/wmf".equals(contentType)) {
- *             this.data = data;
- *             // use Apache Batik to handle WMF
- *         } else {
- *             super.loadImage(data,contentType);
- *         }
- *     }
- * }
- * </code>
- * </pre>
- *
- * and then pass this class to your instance of java.awt.Graphics2D:
- *
- * <pre>
- * <code>
- * graphics.setRenderingHint(Drawable.IMAGE_RENDERER, new MyImageRendener());
- * </code>
- * </pre>
- */
-public interface ImageRenderer {
-    /**
-     * Load and buffer the image
-     *
-     * @param data the raw image stream
-     * @param contentType the content type
-     */
-    void loadImage(InputStream data, String contentType) throws IOException;
-
-    /**
-     * Load and buffer the image
-     *
-     * @param data the raw image bytes
-     * @param contentType the content type
-     */
-    void loadImage(byte data[], String contentType) throws IOException;
-
-    /**
-     * @return the dimension of the buffered image
-     */
-    Dimension getDimension();
-
-    /**
-     * @param alpha the alpha [0..1] to be added to the image (possibly already containing an alpha channel)
-     */
-    void setAlpha(double alpha);
-
-    /**
-     * @return the image as buffered image
-     */
-    BufferedImage getImage();
-
-    /**
-     * @param dim the dimension in pixels of the returned image
-     * @return the image as buffered image
-     * 
-     * @since POI 3.15-beta2
-     */
-    BufferedImage getImage(Dimension dim);
-    
-    /**
-     * Render picture data into the supplied graphics
-     *
-     * @return true if the picture data was successfully rendered
-     */
-    boolean drawImage(Graphics2D graphics, Rectangle2D anchor);
-
-    /**
-     * Render picture data into the supplied graphics
-     *
-     * @return true if the picture data was successfully rendered
-     */
-    boolean drawImage(Graphics2D graphics, Rectangle2D anchor, Insets clip);
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/sl/draw/PathGradientPaint.java b/trunk/src/java/org/apache/poi/sl/draw/PathGradientPaint.java
deleted file mode 100644
index 63cae11..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/PathGradientPaint.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-import java.awt.*;
-import java.awt.MultipleGradientPaint.ColorSpaceType;
-import java.awt.MultipleGradientPaint.CycleMethod;
-import java.awt.geom.*;
-import java.awt.image.*;
-
-class PathGradientPaint implements Paint {
-
-    // http://asserttrue.blogspot.de/2010/01/how-to-iimplement-custom-paint-in-50.html
-    protected final Color colors[];
-    protected final float fractions[];
-    protected final int capStyle;
-    protected final int joinStyle;
-    protected final int transparency;
-
-    
-    public PathGradientPaint(Color colors[], float fractions[]) {
-        this(colors,fractions,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND);
-    }
-    
-    public PathGradientPaint(Color colors[], float fractions[], int capStyle, int joinStyle) {
-        this.colors = colors.clone();
-        this.fractions = fractions.clone();
-        this.capStyle = capStyle;
-        this.joinStyle = joinStyle;
-
-        // determine transparency
-        boolean opaque = true;
-        for (Color c : colors) {
-            if (c != null) {
-                opaque = opaque && (c.getAlpha() == 0xff);
-            }
-        }
-        this.transparency = opaque ? OPAQUE : TRANSLUCENT;
-    }
-    
-    public PaintContext createContext(ColorModel cm,
-        Rectangle deviceBounds,
-        Rectangle2D userBounds,
-        AffineTransform transform,
-        RenderingHints hints) {
-        return new PathGradientContext(cm, deviceBounds, userBounds, transform, hints);
-    }
-    
-    public int getTransparency() {
-        return transparency;
-    }
-
-    class PathGradientContext implements PaintContext {
-        protected final Rectangle deviceBounds;
-        protected final Rectangle2D userBounds;
-        protected final AffineTransform xform;
-        protected final RenderingHints hints;
-
-        /**
-         * for POI: the shape will be only known when the subclasses determines the concrete implementation 
-         * in the draw/-content method, so we need to postpone the setting/creation as long as possible
-         **/
-        protected final Shape shape;
-        protected final PaintContext pCtx;
-        protected final int gradientSteps;
-        WritableRaster raster;
-
-        public PathGradientContext(
-              ColorModel cm
-            , Rectangle deviceBounds
-            , Rectangle2D userBounds
-            , AffineTransform xform
-            , RenderingHints hints
-        ) {
-            shape = (Shape)hints.get(Drawable.GRADIENT_SHAPE);
-            if (shape == null) {
-                throw new IllegalPathStateException("PathGradientPaint needs a shape to be set via the rendering hint Drawable.GRADIANT_SHAPE.");
-            }
-
-            this.deviceBounds = deviceBounds;
-            this.userBounds = userBounds;
-            this.xform = xform;
-            this.hints = hints;
-
-            gradientSteps = getGradientSteps(shape);
-
-            Point2D start = new Point2D.Double(0, 0);
-            Point2D end = new Point2D.Double(gradientSteps, 0);
-            LinearGradientPaint gradientPaint = new LinearGradientPaint(start, end, fractions, colors, CycleMethod.NO_CYCLE, ColorSpaceType.SRGB, new AffineTransform());
-            
-            Rectangle bounds = new Rectangle(0, 0, gradientSteps, 1);
-            pCtx = gradientPaint.createContext(cm, bounds, bounds, new AffineTransform(), hints);
-        }
-
-        public void dispose() {}
-
-        public ColorModel getColorModel() {
-            return pCtx.getColorModel();
-        }
-
-        public Raster getRaster(int xOffset, int yOffset, int w, int h) {
-            ColorModel cm = getColorModel();
-            if (raster == null) createRaster();
-
-            // TODO: eventually use caching here
-            WritableRaster childRaster = cm.createCompatibleWritableRaster(w, h);
-            Rectangle2D childRect = new Rectangle2D.Double(xOffset, yOffset, w, h);
-            if (!childRect.intersects(deviceBounds)) {
-                // usually doesn't happen ...
-                return childRaster;
-            }
-            
-            Rectangle2D destRect = new Rectangle2D.Double();
-            Rectangle2D.intersect(childRect, deviceBounds, destRect);
-            int dx = (int)(destRect.getX()-deviceBounds.getX());
-            int dy = (int)(destRect.getY()-deviceBounds.getY());
-            int dw = (int)destRect.getWidth();
-            int dh = (int)destRect.getHeight();
-            Object data = raster.getDataElements(dx, dy, dw, dh, null);
-            dx = (int)(destRect.getX()-childRect.getX());
-            dy = (int)(destRect.getY()-childRect.getY());
-            childRaster.setDataElements(dx, dy, dw, dh, data);
-            
-            return childRaster;
-        }
-
-        protected int getGradientSteps(Shape gradientShape) {
-            Rectangle rect = gradientShape.getBounds();
-            int lower = 1;
-            int upper = (int)(Math.max(rect.getWidth(),rect.getHeight())/2.0);
-            while (lower < upper-1) {
-                int mid = lower + (upper - lower) / 2;
-                BasicStroke bs = new BasicStroke(mid, capStyle, joinStyle);
-                Area area = new Area(bs.createStrokedShape(gradientShape));
-                if (area.isSingular()) {
-                    upper = mid;
-                } else {
-                    lower = mid;
-                }
-            }
-            return upper;
-        }
-        
-        
-        
-        protected void createRaster() {
-            ColorModel cm = getColorModel();
-            raster = cm.createCompatibleWritableRaster((int)deviceBounds.getWidth(), (int)deviceBounds.getHeight());
-            BufferedImage img = new BufferedImage(cm, raster, false, null);
-            Graphics2D graphics = img.createGraphics();
-            graphics.setRenderingHints(hints);
-            graphics.translate(-deviceBounds.getX(), -deviceBounds.getY());
-            graphics.transform(xform);
-
-            Raster img2 = pCtx.getRaster(0, 0, gradientSteps, 1);
-            int rgb[] = new int[cm.getNumComponents()];
-
-            for (int i = gradientSteps-1; i>=0; i--) {
-                img2.getPixel(i, 0, rgb);
-                Color c = new Color(rgb[0],rgb[1],rgb[2]);
-                if (rgb.length == 4) {
-                    // it doesn't work to use just a color with transparency ...
-                    graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC, rgb[3]/255.0f));                           
-                }
-                graphics.setStroke(new BasicStroke(i+1, capStyle, joinStyle));
-                graphics.setColor(c);
-                graphics.draw(shape);
-            }
-            
-            graphics.dispose();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/SLGraphics.java b/trunk/src/java/org/apache/poi/sl/draw/SLGraphics.java
deleted file mode 100644
index 47dba62..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/SLGraphics.java
+++ /dev/null
@@ -1,1846 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw;
-
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Paint;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.Toolkit;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.RoundRectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.text.AttributedCharacterIterator;
-import java.util.Map;
-
-import org.apache.poi.sl.usermodel.FreeformShape;
-import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.Insets2D;
-import org.apache.poi.sl.usermodel.SimpleShape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.TextBox;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.SuppressForbidden;
-
-/**
- * Translates Graphics2D calls into PowerPoint.
- *
- * @author Yegor Kozlov
- */
-public final class SLGraphics extends Graphics2D implements Cloneable {
-
-    protected POILogger log = POILogFactory.getLogger(this.getClass());
-
-    //The ppt object to write into.
-    private GroupShape<?,?> _group;
-
-    private AffineTransform _transform;
-    private Stroke _stroke;
-    private Paint _paint;
-    private Font _font;
-    private Color _foreground;
-    private Color _background;
-    private RenderingHints _hints;
-
-    /**
-     * Construct Java Graphics object which translates graphic calls in ppt drawing layer.
-     *
-     * @param group           The shape group to write the graphics calls into.
-     */
-    public SLGraphics(GroupShape<?,?> group){
-        this._group = group;
-
-        _transform = new AffineTransform();
-        _stroke = new BasicStroke();
-        _paint = Color.black;
-        _font = new Font("Arial", Font.PLAIN, 12);
-        _background = Color.black;
-        _foreground = Color.white;
-        _hints = new RenderingHints(null);
-    }
-
-    /**
-     * @return  the shape group being used for drawing
-     */
-    public GroupShape<?,?> getShapeGroup(){
-        return _group;
-    }
-
-    /**
-     * Gets the current font.
-     * @return    this graphics context's current font.
-     * @see       java.awt.Font
-     * @see       java.awt.Graphics#setFont(Font)
-     */
-    public Font getFont(){
-        return _font;
-    }
-
-    /**
-     * Sets this graphics context's font to the specified font.
-     * All subsequent text operations using this graphics context
-     * use this font.
-     * @param  font   the font.
-     * @see     java.awt.Graphics#getFont
-     * @see     java.awt.Graphics#drawString(java.lang.String, int, int)
-     * @see     java.awt.Graphics#drawBytes(byte[], int, int, int, int)
-     * @see     java.awt.Graphics#drawChars(char[], int, int, int, int)
-    */
-    public void setFont(Font font){
-        this._font = font;
-    }
-
-    /**
-     * Gets this graphics context's current color.
-     * @return    this graphics context's current color.
-     * @see       java.awt.Color
-     * @see       java.awt.Graphics#setColor
-     */
-     public Color getColor(){
-        return _foreground;
-    }
-
-    /**
-     * Sets this graphics context's current color to the specified
-     * color. All subsequent graphics operations using this graphics
-     * context use this specified color.
-     * @param     c   the new rendering color.
-     * @see       java.awt.Color
-     * @see       java.awt.Graphics#getColor
-     */
-    public void setColor(Color c) {
-        setPaint(c);
-    }
-
-    /**
-     * Returns the current <code>Stroke</code> in the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>Graphics2D</code> <code>Stroke</code>,
-     *                 which defines the line style.
-     * @see #setStroke
-     */
-    public Stroke getStroke(){
-        return _stroke;
-    }
-
-    /**
-     * Sets the <code>Stroke</code> for the <code>Graphics2D</code> context.
-     * @param s the <code>Stroke</code> object to be used to stroke a
-     * <code>Shape</code> during the rendering process
-     */
-    public void setStroke(Stroke s){
-        this._stroke = s;
-    }
-
-    /**
-     * Returns the current <code>Paint</code> of the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>Graphics2D</code> <code>Paint</code>,
-     * which defines a color or pattern.
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     */
-    public Paint getPaint(){
-        return _paint;
-    }
-
-    /**
-     * Sets the <code>Paint</code> attribute for the
-     * <code>Graphics2D</code> context.  Calling this method
-     * with a <code>null</code> <code>Paint</code> object does
-     * not have any effect on the current <code>Paint</code> attribute
-     * of this <code>Graphics2D</code>.
-     * @param paint the <code>Paint</code> object to be used to generate
-     * color during the rendering process, or <code>null</code>
-     * @see java.awt.Graphics#setColor
-     */
-     public void setPaint(Paint paint){
-        if(paint == null) return;
-
-        this._paint = paint;
-        if (paint instanceof Color) _foreground = (Color)paint;
-    }
-
-    /**
-     * Returns a copy of the current <code>Transform</code> in the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>AffineTransform</code> in the
-     *             <code>Graphics2D</code> context.
-     * @see #_transform
-     * @see #setTransform
-     */
-    public AffineTransform getTransform(){
-        return new AffineTransform(_transform);
-    }
-
-    /**
-     * Sets the <code>Transform</code> in the <code>Graphics2D</code>
-     * context.
-     * @param Tx the <code>AffineTransform</code> object to be used in the
-     * rendering process
-     * @see #_transform
-     * @see AffineTransform
-     */
-    public void setTransform(AffineTransform Tx) {
-        _transform = new AffineTransform(Tx);
-    }
-
-    /**
-     * Strokes the outline of a <code>Shape</code> using the settings of the
-     * current <code>Graphics2D</code> context.  The rendering attributes
-     * applied include the <code>Clip</code>, <code>Transform</code>,
-     * <code>Paint</code>, <code>Composite</code> and
-     * <code>Stroke</code> attributes.
-     * @param shape the <code>Shape</code> to be rendered
-     * @see #setStroke
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #_transform
-     * @see #setTransform
-     * @see #clip
-     * @see #setClip
-     * @see #setComposite
-     */
-    public void draw(Shape shape){
-        Path2D.Double path = new Path2D.Double(_transform.createTransformedShape(shape));
-        FreeformShape<?,?> p = _group.createFreeform();
-        p.setPath(path);
-        p.setFillColor(null);
-        applyStroke(p);
-        if (_paint instanceof Color) {
-            p.setStrokeStyle((Color)_paint);
-        }
-    }
-
-    /**
-     * Renders the text specified by the specified <code>String</code>,
-     * using the current text attribute state in the <code>Graphics2D</code> context.
-     * The baseline of the first character is at position
-     * (<i>x</i>,&nbsp;<i>y</i>) in the User Space.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, <code>Paint</code>, <code>Font</code> and
-     * <code>Composite</code> attributes. For characters in script systems
-     * such as Hebrew and Arabic, the glyphs can be rendered from right to
-     * left, in which case the coordinate supplied is the location of the
-     * leftmost character on the baseline.
-     * @param s the <code>String</code> to be rendered
-     * @param x the x coordinate of the location where the
-     * <code>String</code> should be rendered
-     * @param y the y coordinate of the location where the
-     * <code>String</code> should be rendered
-     * @throws NullPointerException if <code>str</code> is
-     *         <code>null</code>
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see java.awt.Graphics#setFont
-     * @see #setTransform
-     * @see #setComposite
-     * @see #setClip
-     */
-    public void drawString(String s, float x, float y) {
-        TextBox<?,?> txt = _group.createTextBox();
-
-        TextRun rt = txt.getTextParagraphs().get(0).getTextRuns().get(0);
-        rt.setFontSize((double)_font.getSize());
-        rt.setFontFamily(_font.getFamily());
-
-        if (getColor() != null) rt.setFontColor(DrawPaint.createSolidPaint(getColor()));
-        if (_font.isBold()) rt.setBold(true);
-        if (_font.isItalic()) rt.setItalic(true);
-
-        txt.setText(s);
-
-        txt.setInsets(new Insets2D(0,0,0,0));
-        txt.setWordWrap(false);
-        txt.setHorizontalCentered(false);
-        txt.setVerticalAlignment(VerticalAlignment.MIDDLE);
-
-
-        TextLayout layout = new TextLayout(s, _font, getFontRenderContext());
-        float ascent = layout.getAscent();
-
-        float width = (float) Math.floor(layout.getAdvance());
-        /**
-         * Even if top and bottom margins are set to 0 PowerPoint
-         * always sets extra space between the text and its bounding box.
-         *
-         * The approximation height = ascent*2 works good enough in most cases
-         */
-        float height = ascent * 2;
-
-        /*
-          In powerpoint anchor of a shape is its top left corner.
-          Java graphics sets string coordinates by the baseline of the first character
-          so we need to shift up by the height of the textbox
-        */
-        y -= height / 2 + ascent / 2;
-
-        /*
-          In powerpoint anchor of a shape is its top left corner.
-          Java graphics sets string coordinates by the baseline of the first character
-          so we need to shift down by the height of the textbox
-        */
-        txt.setAnchor(new Rectangle((int)x, (int)y, (int)width, (int)height));
-    }
-
-    /**
-     * Fills the interior of a <code>Shape</code> using the settings of the
-     * <code>Graphics2D</code> context. The rendering attributes applied
-     * include the <code>Clip</code>, <code>Transform</code>,
-     * <code>Paint</code>, and <code>Composite</code>.
-     * @param shape the <code>Shape</code> to be filled
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip
-     */
-    public void fill(Shape shape){
-        Path2D.Double path = new Path2D.Double(_transform.createTransformedShape(shape));
-        FreeformShape<?,?> p = _group.createFreeform();
-        p.setPath(path);
-        applyPaint(p);
-        p.setStrokeStyle();   //Fills must be "No Line"
-    }
-
-    /**
-     * Translates the origin of the graphics context to the point
-     * (<i>x</i>,&nbsp;<i>y</i>) in the current coordinate system.
-     * Modifies this graphics context so that its new origin corresponds
-     * to the point (<i>x</i>,&nbsp;<i>y</i>) in this graphics context's
-     * original coordinate system.  All coordinates used in subsequent
-     * rendering operations on this graphics context will be relative
-     * to this new origin.
-     * @param  x   the <i>x</i> coordinate.
-     * @param  y   the <i>y</i> coordinate.
-     */
-    public void translate(int x, int y){
-        _transform.translate(x, y);
-    }
-
-    /**
-     * Intersects the current <code>Clip</code> with the interior of the
-     * specified <code>Shape</code> and sets the <code>Clip</code> to the
-     * resulting intersection.  The specified <code>Shape</code> is
-     * transformed with the current <code>Graphics2D</code>
-     * <code>Transform</code> before being intersected with the current
-     * <code>Clip</code>.  This method is used to make the current
-     * <code>Clip</code> smaller.
-     * To make the <code>Clip</code> larger, use <code>setClip</code>.
-     * The <i>user clip</i> modified by this method is independent of the
-     * clipping associated with device bounds and visibility.  If no clip has
-     * previously been set, or if the clip has been cleared using
-     * {@link java.awt.Graphics#setClip(Shape) setClip} with a
-     * <code>null</code> argument, the specified <code>Shape</code> becomes
-     * the new user clip.
-     * @param s the <code>Shape</code> to be intersected with the current
-     *          <code>Clip</code>.  If <code>s</code> is <code>null</code>,
-     *          this method clears the current <code>Clip</code>.
-     */
-    @NotImplemented
-    public void clip(Shape s){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Gets the current clipping area.
-     * This method returns the user clip, which is independent of the
-     * clipping associated with device bounds and window visibility.
-     * If no clip has previously been set, or if the clip has been
-     * cleared using <code>setClip(null)</code>, this method returns
-     * <code>null</code>.
-     * @return      a <code>Shape</code> object representing the
-     *              current clipping area, or <code>null</code> if
-     *              no clip is set.
-     * @see         java.awt.Graphics#getClipBounds()
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(int, int, int, int)
-     * @see         java.awt.Graphics#setClip(Shape)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public Shape getClip(){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return null;
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a scaling transformation
-     * Subsequent rendering is resized according to the specified scaling
-     * factors relative to the previous scaling.
-     * This is equivalent to calling <code>transform(S)</code>, where S is an
-     * <code>AffineTransform</code> represented by the following matrix:
-     * <pre>
-     *          [   sx   0    0   ]
-     *          [   0    sy   0   ]
-     *          [   0    0    1   ]
-     * </pre>
-     * @param sx the amount by which X coordinates in subsequent
-     * rendering operations are multiplied relative to previous
-     * rendering operations.
-     * @param sy the amount by which Y coordinates in subsequent
-     * rendering operations are multiplied relative to previous
-     * rendering operations.
-     */
-    public void scale(double sx, double sy){
-        _transform.scale(sx, sy);
-    }
-
-    /**
-     * Draws an outlined round-cornered rectangle using this graphics
-     * context's current color. The left and right edges of the rectangle
-     * are at <code>x</code> and <code>x&nbsp;+&nbsp;width</code>,
-     * respectively. The top and bottom edges of the rectangle are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height</code>.
-     * @param      x the <i>x</i> coordinate of the rectangle to be drawn.
-     * @param      y the <i>y</i> coordinate of the rectangle to be drawn.
-     * @param      width the width of the rectangle to be drawn.
-     * @param      height the height of the rectangle to be drawn.
-     * @param      arcWidth the horizontal diameter of the arc
-     *                    at the four corners.
-     * @param      arcHeight the vertical diameter of the arc
-     *                    at the four corners.
-     * @see        java.awt.Graphics#fillRoundRect
-     */
-    public void drawRoundRect(int x, int y, int width, int height,
-                              int arcWidth, int arcHeight){
-        RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, arcWidth, arcHeight);
-        draw(rect);
-     }
-
-    /**
-     * Draws the text given by the specified string, using this
-     * graphics context's current font and color. The baseline of the
-     * first character is at position (<i>x</i>,&nbsp;<i>y</i>) in this
-     * graphics context's coordinate system.
-     * @param       str      the string to be drawn.
-     * @param       x        the <i>x</i> coordinate.
-     * @param       y        the <i>y</i> coordinate.
-     * @see         java.awt.Graphics#drawBytes
-     * @see         java.awt.Graphics#drawChars
-     */
-    public void drawString(String str, int x, int y){
-        drawString(str, (float)x, (float)y);
-    }
-
-    /**
-     * Fills an oval bounded by the specified rectangle with the
-     * current color.
-     * @param       x the <i>x</i> coordinate of the upper left corner
-     *                     of the oval to be filled.
-     * @param       y the <i>y</i> coordinate of the upper left corner
-     *                     of the oval to be filled.
-     * @param       width the width of the oval to be filled.
-     * @param       height the height of the oval to be filled.
-     * @see         java.awt.Graphics#drawOval
-     */
-    public void fillOval(int x, int y, int width, int height){
-        Ellipse2D oval = new Ellipse2D.Double(x, y, width, height);
-        fill(oval);
-    }
-
-    /**
-     * Fills the specified rounded corner rectangle with the current color.
-     * The left and right edges of the rectangle
-     * are at <code>x</code> and <code>x&nbsp;+&nbsp;width&nbsp;-&nbsp;1</code>,
-     * respectively. The top and bottom edges of the rectangle are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height&nbsp;-&nbsp;1</code>.
-     * @param       x the <i>x</i> coordinate of the rectangle to be filled.
-     * @param       y the <i>y</i> coordinate of the rectangle to be filled.
-     * @param       width the width of the rectangle to be filled.
-     * @param       height the height of the rectangle to be filled.
-     * @param       arcWidth the horizontal diameter
-     *                     of the arc at the four corners.
-     * @param       arcHeight the vertical diameter
-     *                     of the arc at the four corners.
-     * @see         java.awt.Graphics#drawRoundRect
-     */
-    public void fillRoundRect(int x, int y, int width, int height,
-                              int arcWidth, int arcHeight){
-
-        RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, arcWidth, arcHeight);
-        fill(rect);
-    }
-
-    /**
-     * Fills a circular or elliptical arc covering the specified rectangle.
-     * <p>
-     * The resulting arc begins at <code>startAngle</code> and extends
-     * for <code>arcAngle</code> degrees.
-     * Angles are interpreted such that 0&nbsp;degrees
-     * is at the 3&nbsp;o'clock position.
-     * A positive value indicates a counter-clockwise rotation
-     * while a negative value indicates a clockwise rotation.
-     * <p>
-     * The center of the arc is the center of the rectangle whose origin
-     * is (<i>x</i>,&nbsp;<i>y</i>) and whose size is specified by the
-     * <code>width</code> and <code>height</code> arguments.
-     * <p>
-     * The resulting arc covers an area
-     * <code>width&nbsp;+&nbsp;1</code> pixels wide
-     * by <code>height&nbsp;+&nbsp;1</code> pixels tall.
-     * <p>
-     * The angles are specified relative to the non-square extents of
-     * the bounding rectangle such that 45 degrees always falls on the
-     * line from the center of the ellipse to the upper right corner of
-     * the bounding rectangle. As a result, if the bounding rectangle is
-     * noticeably longer in one axis than the other, the angles to the
-     * start and end of the arc segment will be skewed farther along the
-     * longer axis of the bounds.
-     * @param        x the <i>x</i> coordinate of the
-     *                    upper-left corner of the arc to be filled.
-     * @param        y the <i>y</i>  coordinate of the
-     *                    upper-left corner of the arc to be filled.
-     * @param        width the width of the arc to be filled.
-     * @param        height the height of the arc to be filled.
-     * @param        startAngle the beginning angle.
-     * @param        arcAngle the angular extent of the arc,
-     *                    relative to the start angle.
-     * @see         java.awt.Graphics#drawArc
-     */
-    public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle){
-        Arc2D arc = new Arc2D.Double(x, y, width, height, startAngle, arcAngle, Arc2D.PIE);
-        fill(arc);
-    }
-
-    /**
-     * Draws the outline of a circular or elliptical arc
-     * covering the specified rectangle.
-     * <p>
-     * The resulting arc begins at <code>startAngle</code> and extends
-     * for <code>arcAngle</code> degrees, using the current color.
-     * Angles are interpreted such that 0&nbsp;degrees
-     * is at the 3&nbsp;o'clock position.
-     * A positive value indicates a counter-clockwise rotation
-     * while a negative value indicates a clockwise rotation.
-     * <p>
-     * The center of the arc is the center of the rectangle whose origin
-     * is (<i>x</i>,&nbsp;<i>y</i>) and whose size is specified by the
-     * <code>width</code> and <code>height</code> arguments.
-     * <p>
-     * The resulting arc covers an area
-     * <code>width&nbsp;+&nbsp;1</code> pixels wide
-     * by <code>height&nbsp;+&nbsp;1</code> pixels tall.
-     * <p>
-     * The angles are specified relative to the non-square extents of
-     * the bounding rectangle such that 45 degrees always falls on the
-     * line from the center of the ellipse to the upper right corner of
-     * the bounding rectangle. As a result, if the bounding rectangle is
-     * noticeably longer in one axis than the other, the angles to the
-     * start and end of the arc segment will be skewed farther along the
-     * longer axis of the bounds.
-     * @param        x the <i>x</i> coordinate of the
-     *                    upper-left corner of the arc to be drawn.
-     * @param        y the <i>y</i>  coordinate of the
-     *                    upper-left corner of the arc to be drawn.
-     * @param        width the width of the arc to be drawn.
-     * @param        height the height of the arc to be drawn.
-     * @param        startAngle the beginning angle.
-     * @param        arcAngle the angular extent of the arc,
-     *                    relative to the start angle.
-     * @see         java.awt.Graphics#fillArc
-     */
-    public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-        Arc2D arc = new Arc2D.Double(x, y, width, height, startAngle, arcAngle, Arc2D.OPEN);
-        draw(arc);
-    }
-
-
-    /**
-     * Draws a sequence of connected lines defined by
-     * arrays of <i>x</i> and <i>y</i> coordinates.
-     * Each pair of (<i>x</i>,&nbsp;<i>y</i>) coordinates defines a point.
-     * The figure is not closed if the first point
-     * differs from the last point.
-     * @param       xPoints an array of <i>x</i> points
-     * @param       yPoints an array of <i>y</i> points
-     * @param       nPoints the total number of points
-     * @see         java.awt.Graphics#drawPolygon(int[], int[], int)
-     * @since       JDK1.1
-     */
-    public void drawPolyline(int[] xPoints, int[] yPoints,
-                             int nPoints){
-        if(nPoints > 0){
-            GeneralPath path = new GeneralPath();
-            path.moveTo(xPoints[0], yPoints[0]);
-            for(int i=1; i<nPoints; i++)
-                path.lineTo(xPoints[i], yPoints[i]);
-
-            draw(path);
-        }
-    }
-
-    /**
-     * Draws the outline of an oval.
-     * The result is a circle or ellipse that fits within the
-     * rectangle specified by the <code>x</code>, <code>y</code>,
-     * <code>width</code>, and <code>height</code> arguments.
-     * <p>
-     * The oval covers an area that is
-     * <code>width&nbsp;+&nbsp;1</code> pixels wide
-     * and <code>height&nbsp;+&nbsp;1</code> pixels tall.
-     * @param       x the <i>x</i> coordinate of the upper left
-     *                     corner of the oval to be drawn.
-     * @param       y the <i>y</i> coordinate of the upper left
-     *                     corner of the oval to be drawn.
-     * @param       width the width of the oval to be drawn.
-     * @param       height the height of the oval to be drawn.
-     * @see         java.awt.Graphics#fillOval
-     */
-    public void drawOval(int x, int y, int width, int height){
-        Ellipse2D oval = new Ellipse2D.Double(x, y, width, height);
-        draw(oval);
-    }
-
-    /**
-     * Draws as much of the specified image as is currently available.
-     * The image is drawn with its top-left corner at
-     * (<i>x</i>,&nbsp;<i>y</i>) in this graphics context's coordinate
-     * space.  Transparent pixels are drawn in the specified
-     * background color.
-     * <p>
-     * This operation is equivalent to filling a rectangle of the
-     * width and height of the specified image with the given color and then
-     * drawing the image on top of it, but possibly more efficient.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * complete image has not yet been loaded, and it has not been dithered
-     * and converted for the current output device.
-     * <p>
-     * If the image has not yet been completely loaded, then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * @param    img    the specified image to be drawn.
-     * @param    x      the <i>x</i> coordinate.
-     * @param    y      the <i>y</i> coordinate.
-     * @param    bgcolor the background color to paint under the
-     *                         non-opaque portions of the image.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             Color bgcolor,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified image as has already been scaled
-     * to fit inside the specified rectangle.
-     * <p>
-     * The image is drawn inside the specified rectangle of this
-     * graphics context's coordinate space, and is scaled if
-     * necessary. Transparent pixels are drawn in the specified
-     * background color.
-     * This operation is equivalent to filling a rectangle of the
-     * width and height of the specified image with the given color and then
-     * drawing the image on top of it, but possibly more efficient.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * entire image has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * <p>
-     * A scaled version of an image will not necessarily be
-     * available immediately just because an unscaled version of the
-     * image has been constructed for this output device.  Each size of
-     * the image may be cached separately and generated from the original
-     * data in a separate image production sequence.
-     * @param    img       the specified image to be drawn.
-     * @param    x         the <i>x</i> coordinate.
-     * @param    y         the <i>y</i> coordinate.
-     * @param    width     the width of the rectangle.
-     * @param    height    the height of the rectangle.
-     * @param    bgcolor   the background color to paint under the
-     *                         non-opaque portions of the image.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             int width, int height,
-                             Color bgcolor,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Draws as much of the specified area of the specified image as is
-     * currently available, scaling it on the fly to fit inside the
-     * specified area of the destination drawable surface. Transparent pixels
-     * do not affect whatever pixels are already there.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * image area to be drawn has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * <p>
-     * This method always uses the unscaled version of the image
-     * to render the scaled rectangle and performs the required
-     * scaling on the fly. It does not use a cached, scaled version
-     * of the image for this operation. Scaling of the image from source
-     * to destination is performed such that the first coordinate
-     * of the source rectangle is mapped to the first coordinate of
-     * the destination rectangle, and the second source coordinate is
-     * mapped to the second destination coordinate. The subimage is
-     * scaled and flipped as needed to preserve those mappings.
-     * @param       img the specified image to be drawn
-     * @param       dx1 the <i>x</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dy1 the <i>y</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dx2 the <i>x</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       dy2 the <i>y</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       sx1 the <i>x</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sy1 the <i>y</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sx2 the <i>x</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       sy2 the <i>y</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       observer object to be notified as more of the image is
-     *                    scaled and converted.
-     * @see         java.awt.Image
-     * @see         java.awt.image.ImageObserver
-     * @see         java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public boolean drawImage(Image img,
-                             int dx1, int dy1, int dx2, int dy2,
-                             int sx1, int sy1, int sx2, int sy2,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified area of the specified image as is
-     * currently available, scaling it on the fly to fit inside the
-     * specified area of the destination drawable surface.
-     * <p>
-     * Transparent pixels are drawn in the specified background color.
-     * This operation is equivalent to filling a rectangle of the
-     * width and height of the specified image with the given color and then
-     * drawing the image on top of it, but possibly more efficient.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * image area to be drawn has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * <p>
-     * This method always uses the unscaled version of the image
-     * to render the scaled rectangle and performs the required
-     * scaling on the fly. It does not use a cached, scaled version
-     * of the image for this operation. Scaling of the image from source
-     * to destination is performed such that the first coordinate
-     * of the source rectangle is mapped to the first coordinate of
-     * the destination rectangle, and the second source coordinate is
-     * mapped to the second destination coordinate. The subimage is
-     * scaled and flipped as needed to preserve those mappings.
-     * @param       img the specified image to be drawn
-     * @param       dx1 the <i>x</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dy1 the <i>y</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dx2 the <i>x</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       dy2 the <i>y</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       sx1 the <i>x</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sy1 the <i>y</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sx2 the <i>x</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       sy2 the <i>y</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       bgcolor the background color to paint under the
-     *                    non-opaque portions of the image.
-     * @param       observer object to be notified as more of the image is
-     *                    scaled and converted.
-     * @see         java.awt.Image
-     * @see         java.awt.image.ImageObserver
-     * @see         java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public boolean drawImage(Image img,
-                             int dx1, int dy1, int dx2, int dy2,
-                             int sx1, int sy1, int sx2, int sy2,
-                             Color bgcolor,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified image as is currently available.
-     * The image is drawn with its top-left corner at
-     * (<i>x</i>,&nbsp;<i>y</i>) in this graphics context's coordinate
-     * space. Transparent pixels in the image do not affect whatever
-     * pixels are already there.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * complete image has not yet been loaded, and it has not been dithered
-     * and converted for the current output device.
-     * <p>
-     * If the image has completely loaded and its pixels are
-     * no longer being changed, then
-     * <code>drawImage</code> returns <code>true</code>.
-     * Otherwise, <code>drawImage</code> returns <code>false</code>
-     * and as more of
-     * the image becomes available
-     * or it is time to draw another frame of animation,
-     * the process that loads the image notifies
-     * the specified image observer.
-     * @param    img the specified image to be drawn. This method does
-     *               nothing if <code>img</code> is null.
-     * @param    x   the <i>x</i> coordinate.
-     * @param    y   the <i>y</i> coordinate.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @return   <code>false</code> if the image pixels are still changing;
-     *           <code>true</code> otherwise.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             ImageObserver observer) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Disposes of this graphics context and releases
-     * any system resources that it is using.
-     * A <code>Graphics</code> object cannot be used after
-     * <code>dispose</code>has been called.
-     * <p>
-     * When a Java program runs, a large number of <code>Graphics</code>
-     * objects can be created within a short time frame.
-     * Although the finalization process of the garbage collector
-     * also disposes of the same system resources, it is preferable
-     * to manually free the associated resources by calling this
-     * method rather than to rely on a finalization process which
-     * may not run to completion for a long period of time.
-     * <p>
-     * Graphics objects which are provided as arguments to the
-     * <code>paint</code> and <code>update</code> methods
-     * of components are automatically released by the system when
-     * those methods return. For efficiency, programmers should
-     * call <code>dispose</code> when finished using
-     * a <code>Graphics</code> object only if it was created
-     * directly from a component or another <code>Graphics</code> object.
-     * @see         java.awt.Graphics#finalize
-     * @see         java.awt.Component#paint
-     * @see         java.awt.Component#update
-     * @see         java.awt.Component#getGraphics
-     * @see         java.awt.Graphics#create
-     */
-    public void dispose() {
-    }
-
-    /**
-     * Draws a line, using the current color, between the points
-     * <code>(x1,&nbsp;y1)</code> and <code>(x2,&nbsp;y2)</code>
-     * in this graphics context's coordinate system.
-     * @param   x1  the first point's <i>x</i> coordinate.
-     * @param   y1  the first point's <i>y</i> coordinate.
-     * @param   x2  the second point's <i>x</i> coordinate.
-     * @param   y2  the second point's <i>y</i> coordinate.
-     */
-    public void drawLine(int x1, int y1, int x2, int y2){
-        Line2D line = new Line2D.Double(x1, y1, x2, y2);
-        draw(line);
-    }
-
-    /**
-     * Fills a closed polygon defined by
-     * arrays of <i>x</i> and <i>y</i> coordinates.
-     * <p>
-     * This method draws the polygon defined by <code>nPoint</code> line
-     * segments, where the first <code>nPoint&nbsp;-&nbsp;1</code>
-     * line segments are line segments from
-     * <code>(xPoints[i&nbsp;-&nbsp;1],&nbsp;yPoints[i&nbsp;-&nbsp;1])</code>
-     * to <code>(xPoints[i],&nbsp;yPoints[i])</code>, for
-     * 1&nbsp;&le;&nbsp;<i>i</i>&nbsp;&le;&nbsp;<code>nPoints</code>.
-     * The figure is automatically closed by drawing a line connecting
-     * the final point to the first point, if those points are different.
-     * <p>
-     * The area inside the polygon is defined using an
-     * even-odd fill rule, also known as the alternating rule.
-     * @param        xPoints   a an array of <code>x</code> coordinates.
-     * @param        yPoints   a an array of <code>y</code> coordinates.
-     * @param        nPoints   a the total number of points.
-     * @see          java.awt.Graphics#drawPolygon(int[], int[], int)
-     */
-    public void fillPolygon(int[] xPoints, int[] yPoints,
-                            int nPoints){
-        java.awt.Polygon polygon = new java.awt.Polygon(xPoints, yPoints, nPoints);
-        fill(polygon);
-    }
-
-    /**
-     * Fills the specified rectangle.
-     * The left and right edges of the rectangle are at
-     * <code>x</code> and <code>x&nbsp;+&nbsp;width&nbsp;-&nbsp;1</code>.
-     * The top and bottom edges are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height&nbsp;-&nbsp;1</code>.
-     * The resulting rectangle covers an area
-     * <code>width</code> pixels wide by
-     * <code>height</code> pixels tall.
-     * The rectangle is filled using the graphics context's current color.
-     * @param         x   the <i>x</i> coordinate
-     *                         of the rectangle to be filled.
-     * @param         y   the <i>y</i> coordinate
-     *                         of the rectangle to be filled.
-     * @param         width   the width of the rectangle to be filled.
-     * @param         height   the height of the rectangle to be filled.
-     * @see           java.awt.Graphics#clearRect
-     * @see           java.awt.Graphics#drawRect
-     */
-    public void fillRect(int x, int y, int width, int height){
-        Rectangle rect = new Rectangle(x, y, width, height);
-        fill(rect);
-    }
-
-    /**
-     * Draws the outline of the specified rectangle.
-     * The left and right edges of the rectangle are at
-     * <code>x</code> and <code>x&nbsp;+&nbsp;width</code>.
-     * The top and bottom edges are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height</code>.
-     * The rectangle is drawn using the graphics context's current color.
-     * @param         x   the <i>x</i> coordinate
-     *                         of the rectangle to be drawn.
-     * @param         y   the <i>y</i> coordinate
-     *                         of the rectangle to be drawn.
-     * @param         width   the width of the rectangle to be drawn.
-     * @param         height   the height of the rectangle to be drawn.
-     * @see          java.awt.Graphics#fillRect
-     * @see          java.awt.Graphics#clearRect
-     */
-    public void drawRect(int x, int y, int width, int height) {
-        Rectangle rect = new Rectangle(x, y, width, height);
-        draw(rect);
-    }
-
-    /**
-     * Draws a closed polygon defined by
-     * arrays of <i>x</i> and <i>y</i> coordinates.
-     * Each pair of (<i>x</i>,&nbsp;<i>y</i>) coordinates defines a point.
-     * <p>
-     * This method draws the polygon defined by <code>nPoint</code> line
-     * segments, where the first <code>nPoint&nbsp;-&nbsp;1</code>
-     * line segments are line segments from
-     * <code>(xPoints[i&nbsp;-&nbsp;1],&nbsp;yPoints[i&nbsp;-&nbsp;1])</code>
-     * to <code>(xPoints[i],&nbsp;yPoints[i])</code>, for
-     * 1&nbsp;&le;&nbsp;<i>i</i>&nbsp;&le;&nbsp;<code>nPoints</code>.
-     * The figure is automatically closed by drawing a line connecting
-     * the final point to the first point, if those points are different.
-     * @param        xPoints   a an array of <code>x</code> coordinates.
-     * @param        yPoints   a an array of <code>y</code> coordinates.
-     * @param        nPoints   a the total number of points.
-     * @see          java.awt.Graphics#fillPolygon(int[],int[],int)
-     * @see          java.awt.Graphics#drawPolyline
-     */
-    public void drawPolygon(int[] xPoints, int[] yPoints,
-                            int nPoints){
-        java.awt.Polygon polygon = new java.awt.Polygon(xPoints, yPoints, nPoints);
-        draw(polygon);
-    }
-
-    /**
-     * Intersects the current clip with the specified rectangle.
-     * The resulting clipping area is the intersection of the current
-     * clipping area and the specified rectangle.  If there is no
-     * current clipping area, either because the clip has never been
-     * set, or the clip has been cleared using <code>setClip(null)</code>,
-     * the specified rectangle becomes the new clip.
-     * This method sets the user clip, which is independent of the
-     * clipping associated with device bounds and window visibility.
-     * This method can only be used to make the current clip smaller.
-     * To set the current clip larger, use any of the setClip methods.
-     * Rendering operations have no effect outside of the clipping area.
-     * @param x the x coordinate of the rectangle to intersect the clip with
-     * @param y the y coordinate of the rectangle to intersect the clip with
-     * @param width the width of the rectangle to intersect the clip with
-     * @param height the height of the rectangle to intersect the clip with
-     * @see #setClip(int, int, int, int)
-     * @see #setClip(Shape)
-     */
-    public void clipRect(int x, int y, int width, int height){
-        clip(new Rectangle(x, y, width, height));
-    }
-
-    /**
-     * Sets the current clipping area to an arbitrary clip shape.
-     * Not all objects that implement the <code>Shape</code>
-     * interface can be used to set the clip.  The only
-     * <code>Shape</code> objects that are guaranteed to be
-     * supported are <code>Shape</code> objects that are
-     * obtained via the <code>getClip</code> method and via
-     * <code>Rectangle</code> objects.  This method sets the
-     * user clip, which is independent of the clipping associated
-     * with device bounds and window visibility.
-     * @param clip the <code>Shape</code> to use to set the clip
-     * @see         java.awt.Graphics#getClip()
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(int, int, int, int)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public void setClip(Shape clip) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Returns the bounding rectangle of the current clipping area.
-     * This method refers to the user clip, which is independent of the
-     * clipping associated with device bounds and window visibility.
-     * If no clip has previously been set, or if the clip has been
-     * cleared using <code>setClip(null)</code>, this method returns
-     * <code>null</code>.
-     * The coordinates in the rectangle are relative to the coordinate
-     * system origin of this graphics context.
-     * @return      the bounding rectangle of the current clipping area,
-     *              or <code>null</code> if no clip is set.
-     * @see         java.awt.Graphics#getClip
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(int, int, int, int)
-     * @see         java.awt.Graphics#setClip(Shape)
-     * @since       JDK1.1
-     */
-    public Rectangle getClipBounds(){
-        Shape c = getClip();
-        if (c==null) {
-            return null;
-        }
-        return c.getBounds();
-    }
-
-    /**
-     * Draws the text given by the specified iterator, using this
-     * graphics context's current color. The iterator has to specify a font
-     * for each character. The baseline of the
-     * first character is at position (<i>x</i>,&nbsp;<i>y</i>) in this
-     * graphics context's coordinate system.
-     * @param       iterator the iterator whose text is to be drawn
-     * @param       x        the <i>x</i> coordinate.
-     * @param       y        the <i>y</i> coordinate.
-     * @see         java.awt.Graphics#drawBytes
-     * @see         java.awt.Graphics#drawChars
-     */
-    public void drawString(AttributedCharacterIterator iterator,
-                           int x, int y){
-        drawString(iterator, (float)x, (float)y);
-    }
-
-    /**
-     * Clears the specified rectangle by filling it with the background
-     * color of the current drawing surface. This operation does not
-     * use the current paint mode.
-     * <p>
-     * Beginning with Java&nbsp;1.1, the background color
-     * of offscreen images may be system dependent. Applications should
-     * use <code>setColor</code> followed by <code>fillRect</code> to
-     * ensure that an offscreen image is cleared to a specific color.
-     * @param       x the <i>x</i> coordinate of the rectangle to clear.
-     * @param       y the <i>y</i> coordinate of the rectangle to clear.
-     * @param       width the width of the rectangle to clear.
-     * @param       height the height of the rectangle to clear.
-     * @see         java.awt.Graphics#fillRect(int, int, int, int)
-     * @see         java.awt.Graphics#drawRect
-     * @see         java.awt.Graphics#setColor(java.awt.Color)
-     * @see         java.awt.Graphics#setPaintMode
-     * @see         java.awt.Graphics#setXORMode(java.awt.Color)
-     */
-    public void clearRect(int x, int y, int width, int height) {
-        Paint paint = getPaint();
-        setColor(getBackground());
-        fillRect(x, y, width, height);
-        setPaint(paint);
-    }
-
-    public void copyArea(int x, int y, int width, int height, int dx, int dy) {
-    }
-
-    /**
-     * Sets the current clip to the rectangle specified by the given
-     * coordinates.  This method sets the user clip, which is
-     * independent of the clipping associated with device bounds
-     * and window visibility.
-     * Rendering operations have no effect outside of the clipping area.
-     * @param       x the <i>x</i> coordinate of the new clip rectangle.
-     * @param       y the <i>y</i> coordinate of the new clip rectangle.
-     * @param       width the width of the new clip rectangle.
-     * @param       height the height of the new clip rectangle.
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(Shape)
-     * @since       JDK1.1
-     */
-    public void setClip(int x, int y, int width, int height){
-        setClip(new Rectangle(x, y, width, height));
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a rotation transform.
-     * Subsequent rendering is rotated by the specified radians relative
-     * to the previous origin.
-     * This is equivalent to calling <code>transform(R)</code>, where R is an
-     * <code>AffineTransform</code> represented by the following matrix:
-     * <pre>
-     *          [   cos(theta)    -sin(theta)    0   ]
-     *          [   sin(theta)     cos(theta)    0   ]
-     *          [       0              0         1   ]
-     * </pre>
-     * Rotating with a positive angle theta rotates points on the positive
-     * x axis toward the positive y axis.
-     * @param theta the angle of rotation in radians
-     */
-    public void rotate(double theta){
-        _transform.rotate(theta);
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a translated rotation
-     * transform.  Subsequent rendering is transformed by a transform
-     * which is constructed by translating to the specified location,
-     * rotating by the specified radians, and translating back by the same
-     * amount as the original translation.  This is equivalent to the
-     * following sequence of calls:
-     * <pre>
-     *          translate(x, y);
-     *          rotate(theta);
-     *          translate(-x, -y);
-     * </pre>
-     * Rotating with a positive angle theta rotates points on the positive
-     * x axis toward the positive y axis.
-     * @param theta the angle of rotation in radians
-     * @param x x coordinate of the origin of the rotation
-     * @param y y coordinate of the origin of the rotation
-     */
-    public void rotate(double theta, double x, double y){
-        _transform.rotate(theta, x, y);
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a shearing transform.
-     * Subsequent renderings are sheared by the specified
-     * multiplier relative to the previous position.
-     * This is equivalent to calling <code>transform(SH)</code>, where SH
-     * is an <code>AffineTransform</code> represented by the following
-     * matrix:
-     * <pre>
-     *          [   1   shx   0   ]
-     *          [  shy   1    0   ]
-     *          [   0    0    1   ]
-     * </pre>
-     * @param shx the multiplier by which coordinates are shifted in
-     * the positive X axis direction as a function of their Y coordinate
-     * @param shy the multiplier by which coordinates are shifted in
-     * the positive Y axis direction as a function of their X coordinate
-     */
-    public void shear(double shx, double shy){
-        _transform.shear(shx, shy);
-    }
-
-    /**
-     * Get the rendering context of the <code>Font</code> within this
-     * <code>Graphics2D</code> context.
-     * The {@link FontRenderContext}
-     * encapsulates application hints such as anti-aliasing and
-     * fractional metrics, as well as target device specific information
-     * such as dots-per-inch.  This information should be provided by the
-     * application when using objects that perform typographical
-     * formatting, such as <code>Font</code> and
-     * <code>TextLayout</code>.  This information should also be provided
-     * by applications that perform their own layout and need accurate
-     * measurements of various characteristics of glyphs such as advance
-     * and line height when various rendering hints have been applied to
-     * the text rendering.
-     *
-     * @return a reference to an instance of FontRenderContext.
-     * @see java.awt.font.FontRenderContext
-     * @see java.awt.Font#createGlyphVector(FontRenderContext,char[])
-     * @see java.awt.font.TextLayout
-     * @since     JDK1.2
-     */
-    public FontRenderContext getFontRenderContext() {
-        boolean isAntiAliased = RenderingHints.VALUE_TEXT_ANTIALIAS_ON.equals(
-                getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING));
-        boolean usesFractionalMetrics = RenderingHints.VALUE_FRACTIONALMETRICS_ON.equals(
-                getRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS));
-
-
-        return new FontRenderContext(new AffineTransform(), isAntiAliased, usesFractionalMetrics);
-    }
-
-    /**
-     * Composes an <code>AffineTransform</code> object with the
-     * <code>Transform</code> in this <code>Graphics2D</code> according
-     * to the rule last-specified-first-applied.  If the current
-     * <code>Transform</code> is Cx, the result of composition
-     * with Tx is a new <code>Transform</code> Cx'.  Cx' becomes the
-     * current <code>Transform</code> for this <code>Graphics2D</code>.
-     * Transforming a point p by the updated <code>Transform</code> Cx' is
-     * equivalent to first transforming p by Tx and then transforming
-     * the result by the original <code>Transform</code> Cx.  In other
-     * words, Cx'(p) = Cx(Tx(p)).  A copy of the Tx is made, if necessary,
-     * so further modifications to Tx do not affect rendering.
-     * @param Tx the <code>AffineTransform</code> object to be composed with
-     * the current <code>Transform</code>
-     * @see #setTransform
-     * @see AffineTransform
-     */
-    public void transform(AffineTransform Tx) {
-        _transform.concatenate(Tx);
-    }
-
-    /**
-     * Renders a <code>BufferedImage</code> that is
-     * filtered with a
-     * {@link BufferedImageOp}.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>
-     * and <code>Composite</code> attributes.  This is equivalent to:
-     * <pre>
-     * img1 = op.filter(img, null);
-     * drawImage(img1, new AffineTransform(1f,0f,0f,1f,x,y), null);
-     * </pre>
-     * @param img the <code>BufferedImage</code> to be rendered
-     * @param op the filter to be applied to the image before rendering
-     * @param x the x coordinate in user space where the image is rendered
-     * @param y the y coordinate in user space where the image is rendered
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip(Shape)
-     */
-    public void drawImage(BufferedImage img,
-                          BufferedImageOp op,
-                          int x,
-                          int y){
-        img = op.filter(img, null);
-        drawImage(img, x, y, null);
-    }
-
-    /**
-     * Sets the background color for the <code>Graphics2D</code> context.
-     * The background color is used for clearing a region.
-     * When a <code>Graphics2D</code> is constructed for a
-     * <code>Component</code>, the background color is
-     * inherited from the <code>Component</code>. Setting the background color
-     * in the <code>Graphics2D</code> context only affects the subsequent
-     * <code>clearRect</code> calls and not the background color of the
-     * <code>Component</code>.  To change the background
-     * of the <code>Component</code>, use appropriate methods of
-     * the <code>Component</code>.
-     * @param color the background color that isused in
-     * subsequent calls to <code>clearRect</code>
-     * @see #getBackground
-     * @see java.awt.Graphics#clearRect
-     */
-    public void setBackground(Color color) {
-        if(color == null)
-            return;
-
-        _background = color;
-    }
-
-    /**
-     * Returns the background color used for clearing a region.
-     * @return the current <code>Graphics2D</code> <code>Color</code>,
-     * which defines the background color.
-     * @see #setBackground
-     */
-    public Color getBackground(){
-        return _background;
-    }
-
-    /**
-     * Sets the <code>Composite</code> for the <code>Graphics2D</code> context.
-     * The <code>Composite</code> is used in all drawing methods such as
-     * <code>drawImage</code>, <code>drawString</code>, <code>draw</code>,
-     * and <code>fill</code>.  It specifies how new pixels are to be combined
-     * with the existing pixels on the graphics device during the rendering
-     * process.
-     * <p>If this <code>Graphics2D</code> context is drawing to a
-     * <code>Component</code> on the display screen and the
-     * <code>Composite</code> is a custom object rather than an
-     * instance of the <code>AlphaComposite</code> class, and if
-     * there is a security manager, its <code>checkPermission</code>
-     * method is called with an <code>AWTPermission("readDisplayPixels")</code>
-     * permission.
-     *
-     * @param comp the <code>Composite</code> object to be used for rendering
-     * @throws SecurityException
-     *         if a custom <code>Composite</code> object is being
-     *         used to render to the screen and a security manager
-     *         is set and its <code>checkPermission</code> method
-     *         does not allow the operation.
-     * @see java.awt.Graphics#setXORMode
-     * @see java.awt.Graphics#setPaintMode
-     * @see java.awt.AlphaComposite
-     */
-    @NotImplemented
-    public void setComposite(Composite comp){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Returns the current <code>Composite</code> in the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>Graphics2D</code> <code>Composite</code>,
-     *              which defines a compositing style.
-     * @see #setComposite
-     */
-    @NotImplemented
-    public Composite getComposite(){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return null;
-    }
-
-    /**
-     * Returns the value of a single preference for the rendering algorithms.
-     * Hint categories include controls for rendering quality and overall
-     * time/quality trade-off in the rendering process.  Refer to the
-     * <code>RenderingHints</code> class for definitions of some common
-     * keys and values.
-     * @param hintKey the key corresponding to the hint to get.
-     * @return an object representing the value for the specified hint key.
-     * Some of the keys and their associated values are defined in the
-     * <code>RenderingHints</code> class.
-     * @see RenderingHints
-     */
-    public Object getRenderingHint(RenderingHints.Key hintKey){
-        return _hints.get(hintKey);
-    }
-
-    /**
-     * Sets the value of a single preference for the rendering algorithms.
-     * Hint categories include controls for rendering quality and overall
-     * time/quality trade-off in the rendering process.  Refer to the
-     * <code>RenderingHints</code> class for definitions of some common
-     * keys and values.
-     * @param hintKey the key of the hint to be set.
-     * @param hintValue the value indicating preferences for the specified
-     * hint category.
-     * @see RenderingHints
-     */
-    public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue){
-        _hints.put(hintKey, hintValue);
-    }
-
-
-    /**
-     * Renders the text of the specified
-     * {@link GlyphVector} using
-     * the <code>Graphics2D</code> context's rendering attributes.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, <code>Paint</code>, and
-     * <code>Composite</code> attributes.  The <code>GlyphVector</code>
-     * specifies individual glyphs from a {@link Font}.
-     * The <code>GlyphVector</code> can also contain the glyph positions.
-     * This is the fastest way to render a set of characters to the
-     * screen.
-     *
-     * @param g the <code>GlyphVector</code> to be rendered
-     * @param x the x position in user space where the glyphs should be
-     *        rendered
-     * @param y the y position in user space where the glyphs should be
-     *        rendered
-     *
-     * @see java.awt.Font#createGlyphVector(FontRenderContext, char[])
-     * @see java.awt.font.GlyphVector
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #setTransform
-     * @see #setComposite
-     * @see #setClip(Shape)
-     */
-    public void drawGlyphVector(GlyphVector g, float x, float y) {
-        Shape glyphOutline = g.getOutline(x, y);
-        fill(glyphOutline);
-    }
-
-    /**
-     * Returns the device configuration associated with this
-     * <code>Graphics2D</code>.
-     * @return the device configuration
-     */
-    public GraphicsConfiguration getDeviceConfiguration() {
-        return GraphicsEnvironment.getLocalGraphicsEnvironment().
-                getDefaultScreenDevice().getDefaultConfiguration();
-    }
-
-    /**
-     * Sets the values of an arbitrary number of preferences for the
-     * rendering algorithms.
-     * Only values for the rendering hints that are present in the
-     * specified <code>Map</code> object are modified.
-     * All other preferences not present in the specified
-     * object are left unmodified.
-     * Hint categories include controls for rendering quality and
-     * overall time/quality trade-off in the rendering process.
-     * Refer to the <code>RenderingHints</code> class for definitions of
-     * some common keys and values.
-     * @param hints the rendering hints to be set
-     * @see RenderingHints
-     */
-    public void addRenderingHints(Map<?,?> hints){
-        this._hints.putAll(hints);
-    }
-
-    /**
-     * Concatenates the current
-     * <code>Graphics2D</code> <code>Transform</code>
-     * with a translation transform.
-     * Subsequent rendering is translated by the specified
-     * distance relative to the previous position.
-     * This is equivalent to calling transform(T), where T is an
-     * <code>AffineTransform</code> represented by the following matrix:
-     * <pre>
-     *          [   1    0    tx  ]
-     *          [   0    1    ty  ]
-     *          [   0    0    1   ]
-     * </pre>
-     * @param tx the distance to translate along the x-axis
-     * @param ty the distance to translate along the y-axis
-     */
-    public void translate(double tx, double ty){
-        _transform.translate(tx, ty);
-    }
-
-    /**
-     * Renders the text of the specified iterator, using the
-     * <code>Graphics2D</code> context's current <code>Paint</code>. The
-     * iterator must specify a font
-     * for each character. The baseline of the
-     * first character is at position (<i>x</i>,&nbsp;<i>y</i>) in the
-     * User Space.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, <code>Paint</code>, and
-     * <code>Composite</code> attributes.
-     * For characters in script systems such as Hebrew and Arabic,
-     * the glyphs can be rendered from right to left, in which case the
-     * coordinate supplied is the location of the leftmost character
-     * on the baseline.
-     * @param iterator the iterator whose text is to be rendered
-     * @param x the x coordinate where the iterator's text is to be
-     * rendered
-     * @param y the y coordinate where the iterator's text is to be
-     * rendered
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #setTransform
-     * @see #setComposite
-     * @see #setClip
-     */
-    @NotImplemented
-    public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Checks whether or not the specified <code>Shape</code> intersects
-     * the specified {@link Rectangle}, which is in device
-     * space. If <code>onStroke</code> is false, this method checks
-     * whether or not the interior of the specified <code>Shape</code>
-     * intersects the specified <code>Rectangle</code>.  If
-     * <code>onStroke</code> is <code>true</code>, this method checks
-     * whether or not the <code>Stroke</code> of the specified
-     * <code>Shape</code> outline intersects the specified
-     * <code>Rectangle</code>.
-     * The rendering attributes taken into account include the
-     * <code>Clip</code>, <code>Transform</code>, and <code>Stroke</code>
-     * attributes.
-     * @param rect the area in device space to check for a hit
-     * @param s the <code>Shape</code> to check for a hit
-     * @param onStroke flag used to choose between testing the
-     * stroked or the filled shape.  If the flag is <code>true</code>, the
-     * <code>Stroke</code> oultine is tested.  If the flag is
-     * <code>false</code>, the filled <code>Shape</code> is tested.
-     * @return <code>true</code> if there is a hit; <code>false</code>
-     * otherwise.
-     * @see #setStroke
-     * @see #fill(Shape)
-     * @see #draw(Shape)
-     * @see #_transform
-     * @see #setTransform
-     * @see #clip
-     * @see #setClip(Shape)
-     */
-    public boolean hit(Rectangle rect,
-                       Shape s,
-                       boolean onStroke){
-        if (onStroke) {
-            s = getStroke().createStrokedShape(s);
-        }
-
-        s = getTransform().createTransformedShape(s);
-
-        return s.intersects(rect);
-    }
-
-    /**
-     * Gets the preferences for the rendering algorithms.  Hint categories
-     * include controls for rendering quality and overall time/quality
-     * trade-off in the rendering process.
-     * Returns all of the hint key/value pairs that were ever specified in
-     * one operation.  Refer to the
-     * <code>RenderingHints</code> class for definitions of some common
-     * keys and values.
-     * @return a reference to an instance of <code>RenderingHints</code>
-     * that contains the current preferences.
-     * @see RenderingHints
-     */
-    public RenderingHints getRenderingHints(){
-        return _hints;
-    }
-
-    /**
-     * Replaces the values of all preferences for the rendering
-     * algorithms with the specified <code>hints</code>.
-     * The existing values for all rendering hints are discarded and
-     * the new set of known hints and values are initialized from the
-     * specified {@link Map} object.
-     * Hint categories include controls for rendering quality and
-     * overall time/quality trade-off in the rendering process.
-     * Refer to the <code>RenderingHints</code> class for definitions of
-     * some common keys and values.
-     * @param hints the rendering hints to be set
-     * @see RenderingHints
-     */
-    public void setRenderingHints(Map<?,?> hints){
-        this._hints = new RenderingHints(null);
-        this._hints.putAll(hints);
-    }
-
-    /**
-     * Renders an image, applying a transform from image space into user space
-     * before drawing.
-     * The transformation from user space into device space is done with
-     * the current <code>Transform</code> in the <code>Graphics2D</code>.
-     * The specified transformation is applied to the image before the
-     * transform attribute in the <code>Graphics2D</code> context is applied.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, and <code>Composite</code> attributes.
-     * Note that no rendering is done if the specified transform is
-     * noninvertible.
-     * @param img the <code>Image</code> to be rendered
-     * @param xform the transformation from image space into user space
-     * @param obs the {@link ImageObserver}
-     * to be notified as more of the <code>Image</code>
-     * is converted
-     * @return <code>true</code> if the <code>Image</code> is
-     * fully loaded and completely rendered;
-     * <code>false</code> if the <code>Image</code> is still being loaded.
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip(Shape)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified image as has already been scaled
-     * to fit inside the specified rectangle.
-     * <p>
-     * The image is drawn inside the specified rectangle of this
-     * graphics context's coordinate space, and is scaled if
-     * necessary. Transparent pixels do not affect whatever pixels
-     * are already there.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * entire image has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete, then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that loads the image notifies
-     * the image observer by calling its <code>imageUpdate</code> method.
-     * <p>
-     * A scaled version of an image will not necessarily be
-     * available immediately just because an unscaled version of the
-     * image has been constructed for this output device.  Each size of
-     * the image may be cached separately and generated from the original
-     * data in a separate image production sequence.
-     * @param    img    the specified image to be drawn. This method does
-     *                  nothing if <code>img</code> is null.
-     * @param    x      the <i>x</i> coordinate.
-     * @param    y      the <i>y</i> coordinate.
-     * @param    width  the width of the rectangle.
-     * @param    height the height of the rectangle.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @return   <code>false</code> if the image pixels are still changing;
-     *           <code>true</code> otherwise.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             int width, int height,
-                             ImageObserver observer) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Creates a new <code>Graphics</code> object that is
-     * a copy of this <code>Graphics</code> object.
-     * @return     a new graphics context that is a copy of
-     *                       this graphics context.
-     */
-    public Graphics create() {
-        try {
-            return (Graphics)clone();
-        } catch (CloneNotSupportedException e){
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Gets the font metrics for the specified font.
-     * @return    the font metrics for the specified font.
-     * @param     f the specified font
-     * @see       java.awt.Graphics#getFont
-     * @see       java.awt.FontMetrics
-     * @see       java.awt.Graphics#getFontMetrics()
-     */
-    @SuppressWarnings("deprecation")
-    @SuppressForbidden
-    public FontMetrics getFontMetrics(Font f) {
-        return Toolkit.getDefaultToolkit().getFontMetrics(f);
-    }
-
-    /**
-     * Sets the paint mode of this graphics context to alternate between
-     * this graphics context's current color and the new specified color.
-     * This specifies that logical pixel operations are performed in the
-     * XOR mode, which alternates pixels between the current color and
-     * a specified XOR color.
-     * <p>
-     * When drawing operations are performed, pixels which are the
-     * current color are changed to the specified color, and vice versa.
-     * <p>
-     * Pixels that are of colors other than those two colors are changed
-     * in an unpredictable but reversible manner; if the same figure is
-     * drawn twice, then all pixels are restored to their original values.
-     * @param     c1 the XOR alternation color
-     */
-    @NotImplemented
-    public void setXORMode(Color c1) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Sets the paint mode of this graphics context to overwrite the
-     * destination with this graphics context's current color.
-     * This sets the logical pixel operation function to the paint or
-     * overwrite mode.  All subsequent rendering operations will
-     * overwrite the destination with the current color.
-     */
-    @NotImplemented
-    public void setPaintMode() {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Renders a
-     * {@link RenderableImage},
-     * applying a transform from image space into user space before drawing.
-     * The transformation from user space into device space is done with
-     * the current <code>Transform</code> in the <code>Graphics2D</code>.
-     * The specified transformation is applied to the image before the
-     * transform attribute in the <code>Graphics2D</code> context is applied.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, and <code>Composite</code> attributes. Note
-     * that no rendering is done if the specified transform is
-     * noninvertible.
-     *<p>
-     * Rendering hints set on the <code>Graphics2D</code> object might
-     * be used in rendering the <code>RenderableImage</code>.
-     * If explicit control is required over specific hints recognized by a
-     * specific <code>RenderableImage</code>, or if knowledge of which hints
-     * are used is required, then a <code>RenderedImage</code> should be
-     * obtained directly from the <code>RenderableImage</code>
-     * and rendered using
-     *{@link #drawRenderedImage(RenderedImage, AffineTransform) drawRenderedImage}.
-     * @param img the image to be rendered. This method does
-     *            nothing if <code>img</code> is null.
-     * @param xform the transformation from image space into user space
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip
-     * @see #drawRenderedImage
-     */
-    @NotImplemented
-    public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Renders a {@link RenderedImage},
-     * applying a transform from image
-     * space into user space before drawing.
-     * The transformation from user space into device space is done with
-     * the current <code>Transform</code> in the <code>Graphics2D</code>.
-     * The specified transformation is applied to the image before the
-     * transform attribute in the <code>Graphics2D</code> context is applied.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, and <code>Composite</code> attributes. Note
-     * that no rendering is done if the specified transform is
-     * noninvertible.
-     * @param img the image to be rendered. This method does
-     *            nothing if <code>img</code> is null.
-     * @param xform the transformation from image space into user space
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip
-     */
-    @NotImplemented
-    public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    protected void applyStroke(SimpleShape<?,?> shape) {
-        if (_stroke instanceof BasicStroke){
-            BasicStroke bs = (BasicStroke)_stroke;
-            shape.setStrokeStyle((double)bs.getLineWidth());
-            float[] dash = bs.getDashArray();
-            if (dash != null) {
-                //TODO: implement more dashing styles
-                shape.setStrokeStyle(StrokeStyle.LineDash.DASH);
-            }
-        }
-    }
-
-    protected void applyPaint(SimpleShape<?,?> shape) {
-        if (_paint instanceof Color) {
-            shape.setFillColor((Color)_paint);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
deleted file mode 100644
index 32ee2a0..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_AdjPoint2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_AdjPoint2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_AdjPoint2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTAdjPoint2D {
-
-    @XmlAttribute(required = true)
-    protected String x;
-    @XmlAttribute(required = true)
-    protected String y;
-
-    /**
-     * Gets the value of the x property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getX() {
-        return x;
-    }
-
-    /**
-     * Sets the value of the x property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setX(String value) {
-        this.x = value;
-    }
-
-    public boolean isSetX() {
-        return (this.x!= null);
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setY(String value) {
-        this.y = value;
-    }
-
-    public boolean isSetY() {
-        return (this.y!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
deleted file mode 100644
index d684ccc..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_AdjustHandleList complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_AdjustHandleList">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="ahXY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_XYAdjustHandle"/>
- *         &lt;element name="ahPolar" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PolarAdjustHandle"/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_AdjustHandleList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "ahXYOrAhPolar"
-})
-public class CTAdjustHandleList {
-
-    @XmlElements({
-        @XmlElement(name = "ahXY", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTXYAdjustHandle.class),
-        @XmlElement(name = "ahPolar", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPolarAdjustHandle.class)
-    })
-    protected List<Object> ahXYOrAhPolar;
-
-    /**
-     * Gets the value of the ahXYOrAhPolar property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the ahXYOrAhPolar property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAhXYOrAhPolar().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTXYAdjustHandle }
-     * {@link CTPolarAdjustHandle }
-     * 
-     * 
-     */
-    public List<Object> getAhXYOrAhPolar() {
-        if (ahXYOrAhPolar == null) {
-            ahXYOrAhPolar = new ArrayList<Object>();
-        }
-        return this.ahXYOrAhPolar;
-    }
-
-    public boolean isSetAhXYOrAhPolar() {
-        return ((this.ahXYOrAhPolar!= null)&&(!this.ahXYOrAhPolar.isEmpty()));
-    }
-
-    public void unsetAhXYOrAhPolar() {
-        this.ahXYOrAhPolar = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
deleted file mode 100644
index 2e39602..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Angle complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Angle">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Angle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTAngle {
-
-    @XmlAttribute(required = true)
-    protected int val;
-
-    /**
-     * Gets the value of the val property.
-     * 
-     */
-    public int getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     */
-    public void setVal(int value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java
deleted file mode 100644
index dd3cca3..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Color complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Color">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Color", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "scrgbClr",
-    "srgbClr",
-    "hslClr",
-    "sysClr",
-    "schemeClr",
-    "prstClr"
-})
-public class CTColor {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTScRgbColor scrgbClr;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTSRgbColor srgbClr;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTHslColor hslClr;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTSystemColor sysClr;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTSchemeColor schemeClr;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTPresetColor prstClr;
-
-    /**
-     * Gets the value of the scrgbClr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTScRgbColor }
-     *     
-     */
-    public CTScRgbColor getScrgbClr() {
-        return scrgbClr;
-    }
-
-    /**
-     * Sets the value of the scrgbClr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTScRgbColor }
-     *     
-     */
-    public void setScrgbClr(CTScRgbColor value) {
-        this.scrgbClr = value;
-    }
-
-    public boolean isSetScrgbClr() {
-        return (this.scrgbClr!= null);
-    }
-
-    /**
-     * Gets the value of the srgbClr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTSRgbColor }
-     *     
-     */
-    public CTSRgbColor getSrgbClr() {
-        return srgbClr;
-    }
-
-    /**
-     * Sets the value of the srgbClr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTSRgbColor }
-     *     
-     */
-    public void setSrgbClr(CTSRgbColor value) {
-        this.srgbClr = value;
-    }
-
-    public boolean isSetSrgbClr() {
-        return (this.srgbClr!= null);
-    }
-
-    /**
-     * Gets the value of the hslClr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTHslColor }
-     *     
-     */
-    public CTHslColor getHslClr() {
-        return hslClr;
-    }
-
-    /**
-     * Sets the value of the hslClr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTHslColor }
-     *     
-     */
-    public void setHslClr(CTHslColor value) {
-        this.hslClr = value;
-    }
-
-    public boolean isSetHslClr() {
-        return (this.hslClr!= null);
-    }
-
-    /**
-     * Gets the value of the sysClr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTSystemColor }
-     *     
-     */
-    public CTSystemColor getSysClr() {
-        return sysClr;
-    }
-
-    /**
-     * Sets the value of the sysClr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTSystemColor }
-     *     
-     */
-    public void setSysClr(CTSystemColor value) {
-        this.sysClr = value;
-    }
-
-    public boolean isSetSysClr() {
-        return (this.sysClr!= null);
-    }
-
-    /**
-     * Gets the value of the schemeClr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTSchemeColor }
-     *     
-     */
-    public CTSchemeColor getSchemeClr() {
-        return schemeClr;
-    }
-
-    /**
-     * Sets the value of the schemeClr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTSchemeColor }
-     *     
-     */
-    public void setSchemeClr(CTSchemeColor value) {
-        this.schemeClr = value;
-    }
-
-    public boolean isSetSchemeClr() {
-        return (this.schemeClr!= null);
-    }
-
-    /**
-     * Gets the value of the prstClr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPresetColor }
-     *     
-     */
-    public CTPresetColor getPrstClr() {
-        return prstClr;
-    }
-
-    /**
-     * Sets the value of the prstClr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPresetColor }
-     *     
-     */
-    public void setPrstClr(CTPresetColor value) {
-        this.prstClr = value;
-    }
-
-    public boolean isSetPrstClr() {
-        return (this.prstClr!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
deleted file mode 100644
index 973603d..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ColorMRU complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_ColorMRU">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice" maxOccurs="10" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ColorMRU", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "egColorChoice"
-})
-public class CTColorMRU {
-
-    @XmlElements({
-        @XmlElement(name = "prstClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPresetColor.class),
-        @XmlElement(name = "sysClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSystemColor.class),
-        @XmlElement(name = "hslClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTHslColor.class),
-        @XmlElement(name = "srgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSRgbColor.class),
-        @XmlElement(name = "scrgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTScRgbColor.class),
-        @XmlElement(name = "schemeClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSchemeColor.class)
-    })
-    protected List<Object> egColorChoice;
-
-    /**
-     * Gets the value of the egColorChoice property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the egColorChoice property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEGColorChoice().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTPresetColor }
-     * {@link CTSystemColor }
-     * {@link CTHslColor }
-     * {@link CTSRgbColor }
-     * {@link CTScRgbColor }
-     * {@link CTSchemeColor }
-     * 
-     * 
-     */
-    public List<Object> getEGColorChoice() {
-        if (egColorChoice == null) {
-            egColorChoice = new ArrayList<Object>();
-        }
-        return this.egColorChoice;
-    }
-
-    public boolean isSetEGColorChoice() {
-        return ((this.egColorChoice!= null)&&(!this.egColorChoice.isEmpty()));
-    }
-
-    public void unsetEGColorChoice() {
-        this.egColorChoice = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
deleted file mode 100644
index dd1a56c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ComplementTransform complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_ComplementTransform">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ComplementTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTComplementTransform {
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
deleted file mode 100644
index 4af3fac..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Connection complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Connection">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="id" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_DrawingElementId" />
- *       &lt;attribute name="idx" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Connection", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTConnection {
-
-    @XmlAttribute(required = true)
-    protected long id;
-    @XmlAttribute(required = true)
-    @XmlSchemaType(name = "unsignedInt")
-    protected long idx;
-
-    /**
-     * Gets the value of the id property.
-     * 
-     */
-    public long getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     */
-    public void setId(long value) {
-        this.id = value;
-    }
-
-    public boolean isSetId() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the idx property.
-     * 
-     */
-    public long getIdx() {
-        return idx;
-    }
-
-    /**
-     * Sets the value of the idx property.
-     * 
-     */
-    public void setIdx(long value) {
-        this.idx = value;
-    }
-
-    public boolean isSetIdx() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
deleted file mode 100644
index 7ec6297..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ConnectionSite complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_ConnectionSite">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="pos" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ang" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ConnectionSite", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "pos"
-})
-public class CTConnectionSite {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTAdjPoint2D pos;
-    @XmlAttribute(required = true)
-    protected String ang;
-
-    /**
-     * Gets the value of the pos property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public CTAdjPoint2D getPos() {
-        return pos;
-    }
-
-    /**
-     * Sets the value of the pos property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public void setPos(CTAdjPoint2D value) {
-        this.pos = value;
-    }
-
-    public boolean isSetPos() {
-        return (this.pos!= null);
-    }
-
-    /**
-     * Gets the value of the ang property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAng() {
-        return ang;
-    }
-
-    /**
-     * Sets the value of the ang property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAng(String value) {
-        this.ang = value;
-    }
-
-    public boolean isSetAng() {
-        return (this.ang!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
deleted file mode 100644
index a3c9889..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ConnectionSiteList complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_ConnectionSiteList">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="cxn" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSite" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ConnectionSiteList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "cxn"
-})
-public class CTConnectionSiteList {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected List<CTConnectionSite> cxn;
-
-    /**
-     * Gets the value of the cxn property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the cxn property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCxn().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTConnectionSite }
-     * 
-     * 
-     */
-    public List<CTConnectionSite> getCxn() {
-        if (cxn == null) {
-            cxn = new ArrayList<CTConnectionSite>();
-        }
-        return this.cxn;
-    }
-
-    public boolean isSetCxn() {
-        return ((this.cxn!= null)&&(!this.cxn.isEmpty()));
-    }
-
-    public void unsetCxn() {
-        this.cxn = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
deleted file mode 100644
index d6856ee..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_CustomGeometry2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_CustomGeometry2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="avLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/>
- *         &lt;element name="gdLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/>
- *         &lt;element name="ahLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjustHandleList" minOccurs="0"/>
- *         &lt;element name="cxnLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSiteList" minOccurs="0"/>
- *         &lt;element name="rect" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomRect" minOccurs="0"/>
- *         &lt;element name="pathLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DList"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_CustomGeometry2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "avLst",
-    "gdLst",
-    "ahLst",
-    "cxnLst",
-    "rect",
-    "pathLst"
-})
-public class CTCustomGeometry2D {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTGeomGuideList avLst;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTGeomGuideList gdLst;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTAdjustHandleList ahLst;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTConnectionSiteList cxnLst;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTGeomRect rect;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTPath2DList pathLst;
-
-    /**
-     * Gets the value of the avLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public CTGeomGuideList getAvLst() {
-        return avLst;
-    }
-
-    /**
-     * Sets the value of the avLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public void setAvLst(CTGeomGuideList value) {
-        this.avLst = value;
-    }
-
-    public boolean isSetAvLst() {
-        return (this.avLst!= null);
-    }
-
-    /**
-     * Gets the value of the gdLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public CTGeomGuideList getGdLst() {
-        return gdLst;
-    }
-
-    /**
-     * Sets the value of the gdLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public void setGdLst(CTGeomGuideList value) {
-        this.gdLst = value;
-    }
-
-    public boolean isSetGdLst() {
-        return (this.gdLst!= null);
-    }
-
-    /**
-     * Gets the value of the ahLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTAdjustHandleList }
-     *     
-     */
-    public CTAdjustHandleList getAhLst() {
-        return ahLst;
-    }
-
-    /**
-     * Sets the value of the ahLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTAdjustHandleList }
-     *     
-     */
-    public void setAhLst(CTAdjustHandleList value) {
-        this.ahLst = value;
-    }
-
-    public boolean isSetAhLst() {
-        return (this.ahLst!= null);
-    }
-
-    /**
-     * Gets the value of the cxnLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTConnectionSiteList }
-     *     
-     */
-    public CTConnectionSiteList getCxnLst() {
-        return cxnLst;
-    }
-
-    /**
-     * Sets the value of the cxnLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTConnectionSiteList }
-     *     
-     */
-    public void setCxnLst(CTConnectionSiteList value) {
-        this.cxnLst = value;
-    }
-
-    public boolean isSetCxnLst() {
-        return (this.cxnLst!= null);
-    }
-
-    /**
-     * Gets the value of the rect property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTGeomRect }
-     *     
-     */
-    public CTGeomRect getRect() {
-        return rect;
-    }
-
-    /**
-     * Sets the value of the rect property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTGeomRect }
-     *     
-     */
-    public void setRect(CTGeomRect value) {
-        this.rect = value;
-    }
-
-    public boolean isSetRect() {
-        return (this.rect!= null);
-    }
-
-    /**
-     * Gets the value of the pathLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPath2DList }
-     *     
-     */
-    public CTPath2DList getPathLst() {
-        return pathLst;
-    }
-
-    /**
-     * Sets the value of the pathLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPath2DList }
-     *     
-     */
-    public void setPathLst(CTPath2DList value) {
-        this.pathLst = value;
-    }
-
-    public boolean isSetPathLst() {
-        return (this.pathLst!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
deleted file mode 100644
index 94d44ec..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_EmbeddedWAVAudioFile complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_EmbeddedWAVAudioFile">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}embed use="required""/>
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       &lt;attribute name="builtIn" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_EmbeddedWAVAudioFile", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTEmbeddedWAVAudioFile {
-
-    @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)
-    protected String embed;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected Boolean builtIn;
-
-    /**
-     * Embedded Audio File Relationship ID
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEmbed() {
-        return embed;
-    }
-
-    /**
-     * Sets the value of the embed property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEmbed(String value) {
-        this.embed = value;
-    }
-
-    public boolean isSetEmbed() {
-        return (this.embed!= null);
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        if (name == null) {
-            return "";
-        } else {
-            return name;
-        }
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    public boolean isSetName() {
-        return (this.name!= null);
-    }
-
-    /**
-     * Gets the value of the builtIn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isBuiltIn() {
-        if (builtIn == null) {
-            return false;
-        } else {
-            return builtIn;
-        }
-    }
-
-    /**
-     * Sets the value of the builtIn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setBuiltIn(boolean value) {
-        this.builtIn = value;
-    }
-
-    public boolean isSetBuiltIn() {
-        return (this.builtIn!= null);
-    }
-
-    public void unsetBuiltIn() {
-        this.builtIn = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
deleted file mode 100644
index 92f41ae..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_FixedPercentage complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_FixedPercentage">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_FixedPercentage" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_FixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTFixedPercentage {
-
-    @XmlAttribute(required = true)
-    protected int val;
-
-    /**
-     * Gets the value of the val property.
-     * 
-     */
-    public int getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     */
-    public void setVal(int value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java
deleted file mode 100644
index 7cf6cb1..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GammaTransform complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_GammaTransform">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GammaTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGammaTransform {
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
deleted file mode 100644
index 3df2209..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_GeomGuide complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_GeomGuide">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="name" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName" />
- *       &lt;attribute name="fmla" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideFormula" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomGuide", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGeomGuide {
-
-    @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String name;
-    @XmlAttribute(required = true)
-    protected String fmla;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    public boolean isSetName() {
-        return (this.name!= null);
-    }
-
-    /**
-     * Gets the value of the fmla property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFmla() {
-        return fmla;
-    }
-
-    /**
-     * Sets the value of the fmla property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFmla(String value) {
-        this.fmla = value;
-    }
-
-    public boolean isSetFmla() {
-        return (this.fmla!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
deleted file mode 100644
index 4490933..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GeomGuideList complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_GeomGuideList">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="gd" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuide" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomGuideList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "gd"
-})
-public class CTGeomGuideList {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected List<CTGeomGuide> gd;
-
-    /**
-     * Gets the value of the gd property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the gd property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getGd().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTGeomGuide }
-     * 
-     * 
-     */
-    public List<CTGeomGuide> getGd() {
-        if (gd == null) {
-            gd = new ArrayList<CTGeomGuide>();
-        }
-        return this.gd;
-    }
-
-    public boolean isSetGd() {
-        return ((this.gd!= null)&&(!this.gd.isEmpty()));
-    }
-
-    public void unsetGd() {
-        this.gd = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
deleted file mode 100644
index b1368be..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GeomRect complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_GeomRect">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="l" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="t" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="r" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="b" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGeomRect {
-
-    @XmlAttribute(required = true)
-    protected String l;
-    @XmlAttribute(required = true)
-    protected String t;
-    @XmlAttribute(required = true)
-    protected String r;
-    @XmlAttribute(required = true)
-    protected String b;
-
-    /**
-     * Gets the value of the l property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getL() {
-        return l;
-    }
-
-    /**
-     * Sets the value of the l property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setL(String value) {
-        this.l = value;
-    }
-
-    public boolean isSetL() {
-        return (this.l!= null);
-    }
-
-    /**
-     * Gets the value of the t property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getT() {
-        return t;
-    }
-
-    /**
-     * Sets the value of the t property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setT(String value) {
-        this.t = value;
-    }
-
-    public boolean isSetT() {
-        return (this.t!= null);
-    }
-
-    /**
-     * Gets the value of the r property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getR() {
-        return r;
-    }
-
-    /**
-     * Sets the value of the r property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setR(String value) {
-        this.r = value;
-    }
-
-    public boolean isSetR() {
-        return (this.r!= null);
-    }
-
-    /**
-     * Gets the value of the b property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getB() {
-        return b;
-    }
-
-    /**
-     * Sets the value of the b property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setB(String value) {
-        this.b = value;
-    }
-
-    public boolean isSetB() {
-        return (this.b!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
deleted file mode 100644
index 643db02..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GrayscaleTransform complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_GrayscaleTransform">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GrayscaleTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGrayscaleTransform {
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
deleted file mode 100644
index 6508613..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GroupTransform2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_GroupTransform2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="off" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D" minOccurs="0"/>
- *         &lt;element name="ext" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D" minOccurs="0"/>
- *         &lt;element name="chOff" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D" minOccurs="0"/>
- *         &lt;element name="chExt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="rot" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle" default="0" />
- *       &lt;attribute name="flipH" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       &lt;attribute name="flipV" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GroupTransform2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "off",
-    "ext",
-    "chOff",
-    "chExt"
-})
-public class CTGroupTransform2D {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTPoint2D off;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTPositiveSize2D ext;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTPoint2D chOff;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTPositiveSize2D chExt;
-    @XmlAttribute
-    protected Integer rot;
-    @XmlAttribute
-    protected Boolean flipH;
-    @XmlAttribute
-    protected Boolean flipV;
-
-    /**
-     * Gets the value of the off property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPoint2D }
-     *     
-     */
-    public CTPoint2D getOff() {
-        return off;
-    }
-
-    /**
-     * Sets the value of the off property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPoint2D }
-     *     
-     */
-    public void setOff(CTPoint2D value) {
-        this.off = value;
-    }
-
-    public boolean isSetOff() {
-        return (this.off!= null);
-    }
-
-    /**
-     * Gets the value of the ext property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPositiveSize2D }
-     *     
-     */
-    public CTPositiveSize2D getExt() {
-        return ext;
-    }
-
-    /**
-     * Sets the value of the ext property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPositiveSize2D }
-     *     
-     */
-    public void setExt(CTPositiveSize2D value) {
-        this.ext = value;
-    }
-
-    public boolean isSetExt() {
-        return (this.ext!= null);
-    }
-
-    /**
-     * Gets the value of the chOff property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPoint2D }
-     *     
-     */
-    public CTPoint2D getChOff() {
-        return chOff;
-    }
-
-    /**
-     * Sets the value of the chOff property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPoint2D }
-     *     
-     */
-    public void setChOff(CTPoint2D value) {
-        this.chOff = value;
-    }
-
-    public boolean isSetChOff() {
-        return (this.chOff!= null);
-    }
-
-    /**
-     * Gets the value of the chExt property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPositiveSize2D }
-     *     
-     */
-    public CTPositiveSize2D getChExt() {
-        return chExt;
-    }
-
-    /**
-     * Sets the value of the chExt property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPositiveSize2D }
-     *     
-     */
-    public void setChExt(CTPositiveSize2D value) {
-        this.chExt = value;
-    }
-
-    public boolean isSetChExt() {
-        return (this.chExt!= null);
-    }
-
-    /**
-     * Gets the value of the rot property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public int getRot() {
-        if (rot == null) {
-            return  0;
-        } else {
-            return rot;
-        }
-    }
-
-    /**
-     * Sets the value of the rot property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRot(int value) {
-        this.rot = value;
-    }
-
-    public boolean isSetRot() {
-        return (this.rot!= null);
-    }
-
-    public void unsetRot() {
-        this.rot = null;
-    }
-
-    /**
-     * Gets the value of the flipH property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isFlipH() {
-        if (flipH == null) {
-            return false;
-        } else {
-            return flipH;
-        }
-    }
-
-    /**
-     * Sets the value of the flipH property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setFlipH(boolean value) {
-        this.flipH = value;
-    }
-
-    public boolean isSetFlipH() {
-        return (this.flipH!= null);
-    }
-
-    public void unsetFlipH() {
-        this.flipH = null;
-    }
-
-    /**
-     * Gets the value of the flipV property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isFlipV() {
-        if (flipV == null) {
-            return false;
-        } else {
-            return flipV;
-        }
-    }
-
-    /**
-     * Sets the value of the flipV property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setFlipV(boolean value) {
-        this.flipV = value;
-    }
-
-    public boolean isSetFlipV() {
-        return (this.flipV!= null);
-    }
-
-    public void unsetFlipV() {
-        this.flipV = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
deleted file mode 100644
index 53ced8d..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_HslColor complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_HslColor">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="hue" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" />
- *       &lt;attribute name="sat" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" />
- *       &lt;attribute name="lum" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_HslColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "egColorTransform"
-})
-public class CTHslColor {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> egColorTransform;
-    @XmlAttribute(required = true)
-    protected int hue;
-    @XmlAttribute(required = true)
-    protected int sat;
-    @XmlAttribute(required = true)
-    protected int lum;
-
-    /**
-     * Gets the value of the egColorTransform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEGColorTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getEGColorTransform() {
-        if (egColorTransform == null) {
-            egColorTransform = new ArrayList<JAXBElement<?>>();
-        }
-        return this.egColorTransform;
-    }
-
-    public boolean isSetEGColorTransform() {
-        return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
-    }
-
-    public void unsetEGColorTransform() {
-        this.egColorTransform = null;
-    }
-
-    /**
-     * Gets the value of the hue property.
-     * 
-     */
-    public int getHue() {
-        return hue;
-    }
-
-    /**
-     * Sets the value of the hue property.
-     * 
-     */
-    public void setHue(int value) {
-        this.hue = value;
-    }
-
-    public boolean isSetHue() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the sat property.
-     * 
-     */
-    public int getSat() {
-        return sat;
-    }
-
-    /**
-     * Sets the value of the sat property.
-     * 
-     */
-    public void setSat(int value) {
-        this.sat = value;
-    }
-
-    public boolean isSetSat() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the lum property.
-     * 
-     */
-    public int getLum() {
-        return lum;
-    }
-
-    /**
-     * Sets the value of the lum property.
-     * 
-     */
-    public void setLum(int value) {
-        this.lum = value;
-    }
-
-    public boolean isSetLum() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
deleted file mode 100644
index 03e486a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Hyperlink complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Hyperlink">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="snd" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_EmbeddedWAVAudioFile" minOccurs="0"/>
- *         &lt;element name="extLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_OfficeArtExtensionList" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}id"/>
- *       &lt;attribute name="invalidUrl" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       &lt;attribute name="action" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       &lt;attribute name="tgtFrame" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       &lt;attribute name="tooltip" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       &lt;attribute name="history" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *       &lt;attribute name="highlightClick" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       &lt;attribute name="endSnd" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Hyperlink", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "snd",
-    "extLst"
-})
-public class CTHyperlink {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTEmbeddedWAVAudioFile snd;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTOfficeArtExtensionList extLst;
-    @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")
-    protected String id;
-    @XmlAttribute
-    protected String invalidUrl;
-    @XmlAttribute
-    protected String action;
-    @XmlAttribute
-    protected String tgtFrame;
-    @XmlAttribute
-    protected String tooltip;
-    @XmlAttribute
-    protected Boolean history;
-    @XmlAttribute
-    protected Boolean highlightClick;
-    @XmlAttribute
-    protected Boolean endSnd;
-
-    /**
-     * Gets the value of the snd property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTEmbeddedWAVAudioFile }
-     *     
-     */
-    public CTEmbeddedWAVAudioFile getSnd() {
-        return snd;
-    }
-
-    /**
-     * Sets the value of the snd property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTEmbeddedWAVAudioFile }
-     *     
-     */
-    public void setSnd(CTEmbeddedWAVAudioFile value) {
-        this.snd = value;
-    }
-
-    public boolean isSetSnd() {
-        return (this.snd!= null);
-    }
-
-    /**
-     * Gets the value of the extLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTOfficeArtExtensionList }
-     *     
-     */
-    public CTOfficeArtExtensionList getExtLst() {
-        return extLst;
-    }
-
-    /**
-     * Sets the value of the extLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTOfficeArtExtensionList }
-     *     
-     */
-    public void setExtLst(CTOfficeArtExtensionList value) {
-        this.extLst = value;
-    }
-
-    public boolean isSetExtLst() {
-        return (this.extLst!= null);
-    }
-
-    /**
-     * Drawing Object Hyperlink Target
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public boolean isSetId() {
-        return (this.id!= null);
-    }
-
-    /**
-     * Gets the value of the invalidUrl property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInvalidUrl() {
-        if (invalidUrl == null) {
-            return "";
-        } else {
-            return invalidUrl;
-        }
-    }
-
-    /**
-     * Sets the value of the invalidUrl property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInvalidUrl(String value) {
-        this.invalidUrl = value;
-    }
-
-    public boolean isSetInvalidUrl() {
-        return (this.invalidUrl!= null);
-    }
-
-    /**
-     * Gets the value of the action property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAction() {
-        if (action == null) {
-            return "";
-        } else {
-            return action;
-        }
-    }
-
-    /**
-     * Sets the value of the action property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAction(String value) {
-        this.action = value;
-    }
-
-    public boolean isSetAction() {
-        return (this.action!= null);
-    }
-
-    /**
-     * Gets the value of the tgtFrame property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTgtFrame() {
-        if (tgtFrame == null) {
-            return "";
-        } else {
-            return tgtFrame;
-        }
-    }
-
-    /**
-     * Sets the value of the tgtFrame property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTgtFrame(String value) {
-        this.tgtFrame = value;
-    }
-
-    public boolean isSetTgtFrame() {
-        return (this.tgtFrame!= null);
-    }
-
-    /**
-     * Gets the value of the tooltip property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTooltip() {
-        if (tooltip == null) {
-            return "";
-        } else {
-            return tooltip;
-        }
-    }
-
-    /**
-     * Sets the value of the tooltip property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTooltip(String value) {
-        this.tooltip = value;
-    }
-
-    public boolean isSetTooltip() {
-        return (this.tooltip!= null);
-    }
-
-    /**
-     * Gets the value of the history property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isHistory() {
-        if (history == null) {
-            return true;
-        } else {
-            return history;
-        }
-    }
-
-    /**
-     * Sets the value of the history property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setHistory(boolean value) {
-        this.history = value;
-    }
-
-    public boolean isSetHistory() {
-        return (this.history!= null);
-    }
-
-    public void unsetHistory() {
-        this.history = null;
-    }
-
-    /**
-     * Gets the value of the highlightClick property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isHighlightClick() {
-        if (highlightClick == null) {
-            return false;
-        } else {
-            return highlightClick;
-        }
-    }
-
-    /**
-     * Sets the value of the highlightClick property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setHighlightClick(boolean value) {
-        this.highlightClick = value;
-    }
-
-    public boolean isSetHighlightClick() {
-        return (this.highlightClick!= null);
-    }
-
-    public void unsetHighlightClick() {
-        this.highlightClick = null;
-    }
-
-    /**
-     * Gets the value of the endSnd property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isEndSnd() {
-        if (endSnd == null) {
-            return false;
-        } else {
-            return endSnd;
-        }
-    }
-
-    /**
-     * Sets the value of the endSnd property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setEndSnd(boolean value) {
-        this.endSnd = value;
-    }
-
-    public boolean isSetEndSnd() {
-        return (this.endSnd!= null);
-    }
-
-    public void unsetEndSnd() {
-        this.endSnd = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
deleted file mode 100644
index eaff064..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_InverseGammaTransform complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_InverseGammaTransform">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_InverseGammaTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTInverseGammaTransform {
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
deleted file mode 100644
index 84af625..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_InverseTransform complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_InverseTransform">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_InverseTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTInverseTransform {
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
deleted file mode 100644
index 62edc57..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for CT_OfficeArtExtension complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_OfficeArtExtension">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any processContents='lax'/>
- *       &lt;/sequence>
- *       &lt;attribute name="uri" type="{http://www.w3.org/2001/XMLSchema}token" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_OfficeArtExtension", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "any"
-})
-public class CTOfficeArtExtension {
-
-    @XmlAnyElement(lax = true)
-    protected Object any;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "token")
-    protected String uri;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     {@link Element }
-     *     
-     */
-    public Object getAny() {
-        return any;
-    }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     {@link Element }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
-    }
-
-    public boolean isSetAny() {
-        return (this.any!= null);
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUri() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUri(String value) {
-        this.uri = value;
-    }
-
-    public boolean isSetUri() {
-        return (this.uri!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
deleted file mode 100644
index f0b54cb..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_OfficeArtExtensionList complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_OfficeArtExtensionList">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_OfficeArtExtensionList"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_OfficeArtExtensionList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "ext"
-})
-public class CTOfficeArtExtensionList {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected List<CTOfficeArtExtension> ext;
-
-    /**
-     * Gets the value of the ext property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the ext property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExt().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTOfficeArtExtension }
-     * 
-     * 
-     */
-    public List<CTOfficeArtExtension> getExt() {
-        if (ext == null) {
-            ext = new ArrayList<CTOfficeArtExtension>();
-        }
-        return this.ext;
-    }
-
-    public boolean isSetExt() {
-        return ((this.ext!= null)&&(!this.ext.isEmpty()));
-    }
-
-    public void unsetExt() {
-        this.ext = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
deleted file mode 100644
index 25fcd49..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element name="close" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DClose"/>
- *         &lt;element name="moveTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DMoveTo"/>
- *         &lt;element name="lnTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DLineTo"/>
- *         &lt;element name="arcTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DArcTo"/>
- *         &lt;element name="quadBezTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DQuadBezierTo"/>
- *         &lt;element name="cubicBezTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DCubicBezierTo"/>
- *       &lt;/choice>
- *       &lt;attribute name="w" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" default="0" />
- *       &lt;attribute name="h" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" default="0" />
- *       &lt;attribute name="fill" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PathFillMode" default="norm" />
- *       &lt;attribute name="stroke" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *       &lt;attribute name="extrusionOk" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "closeOrMoveToOrLnTo"
-})
-public class CTPath2D {
-
-    @XmlElements({
-        @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DLineTo.class),
-        @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DClose.class),
-        @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DCubicBezierTo.class),
-        @XmlElement(name = "quadBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DQuadBezierTo.class),
-        @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DArcTo.class),
-        @XmlElement(name = "moveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DMoveTo.class)
-    })
-    protected List<Object> closeOrMoveToOrLnTo;
-    @XmlAttribute
-    protected Long w;
-    @XmlAttribute
-    protected Long h;
-    @XmlAttribute
-    protected STPathFillMode fill;
-    @XmlAttribute
-    protected Boolean stroke;
-    @XmlAttribute
-    protected Boolean extrusionOk;
-
-    /**
-     * Gets the value of the closeOrMoveToOrLnTo property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the closeOrMoveToOrLnTo property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCloseOrMoveToOrLnTo().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTPath2DLineTo }
-     * {@link CTPath2DClose }
-     * {@link CTPath2DCubicBezierTo }
-     * {@link CTPath2DQuadBezierTo }
-     * {@link CTPath2DArcTo }
-     * {@link CTPath2DMoveTo }
-     * 
-     * 
-     */
-    public List<Object> getCloseOrMoveToOrLnTo() {
-        if (closeOrMoveToOrLnTo == null) {
-            closeOrMoveToOrLnTo = new ArrayList<Object>();
-        }
-        return this.closeOrMoveToOrLnTo;
-    }
-
-    public boolean isSetCloseOrMoveToOrLnTo() {
-        return ((this.closeOrMoveToOrLnTo!= null)&&(!this.closeOrMoveToOrLnTo.isEmpty()));
-    }
-
-    public void unsetCloseOrMoveToOrLnTo() {
-        this.closeOrMoveToOrLnTo = null;
-    }
-
-    /**
-     * Gets the value of the w property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public long getW() {
-        if (w == null) {
-            return  0L;
-        } else {
-            return w;
-        }
-    }
-
-    /**
-     * Sets the value of the w property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setW(long value) {
-        this.w = value;
-    }
-
-    public boolean isSetW() {
-        return (this.w!= null);
-    }
-
-    public void unsetW() {
-        this.w = null;
-    }
-
-    /**
-     * Gets the value of the h property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Long }
-     *     
-     */
-    public long getH() {
-        if (h == null) {
-            return  0L;
-        } else {
-            return h;
-        }
-    }
-
-    /**
-     * Sets the value of the h property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Long }
-     *     
-     */
-    public void setH(long value) {
-        this.h = value;
-    }
-
-    public boolean isSetH() {
-        return (this.h!= null);
-    }
-
-    public void unsetH() {
-        this.h = null;
-    }
-
-    /**
-     * Gets the value of the fill property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link STPathFillMode }
-     *     
-     */
-    public STPathFillMode getFill() {
-        if (fill == null) {
-            return STPathFillMode.NORM;
-        } else {
-            return fill;
-        }
-    }
-
-    /**
-     * Sets the value of the fill property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link STPathFillMode }
-     *     
-     */
-    public void setFill(STPathFillMode value) {
-        this.fill = value;
-    }
-
-    public boolean isSetFill() {
-        return (this.fill!= null);
-    }
-
-    /**
-     * Gets the value of the stroke property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isStroke() {
-        if (stroke == null) {
-            return true;
-        } else {
-            return stroke;
-        }
-    }
-
-    /**
-     * Sets the value of the stroke property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setStroke(boolean value) {
-        this.stroke = value;
-    }
-
-    public boolean isSetStroke() {
-        return (this.stroke!= null);
-    }
-
-    public void unsetStroke() {
-        this.stroke = null;
-    }
-
-    /**
-     * Gets the value of the extrusionOk property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isExtrusionOk() {
-        if (extrusionOk == null) {
-            return true;
-        } else {
-            return extrusionOk;
-        }
-    }
-
-    /**
-     * Sets the value of the extrusionOk property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setExtrusionOk(boolean value) {
-        this.extrusionOk = value;
-    }
-
-    public boolean isSetExtrusionOk() {
-        return (this.extrusionOk!= null);
-    }
-
-    public void unsetExtrusionOk() {
-        this.extrusionOk = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
deleted file mode 100644
index a4c325a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DArcTo complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2DArcTo">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="wR" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="hR" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="stAng" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" />
- *       &lt;attribute name="swAng" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DArcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPath2DArcTo {
-
-    @XmlAttribute(name = "wR", required = true)
-    protected String wr;
-    @XmlAttribute(name = "hR", required = true)
-    protected String hr;
-    @XmlAttribute(required = true)
-    protected String stAng;
-    @XmlAttribute(required = true)
-    protected String swAng;
-
-    /**
-     * Gets the value of the wr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getWR() {
-        return wr;
-    }
-
-    /**
-     * Sets the value of the wr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setWR(String value) {
-        this.wr = value;
-    }
-
-    public boolean isSetWR() {
-        return (this.wr!= null);
-    }
-
-    /**
-     * Gets the value of the hr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHR() {
-        return hr;
-    }
-
-    /**
-     * Sets the value of the hr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHR(String value) {
-        this.hr = value;
-    }
-
-    public boolean isSetHR() {
-        return (this.hr!= null);
-    }
-
-    /**
-     * Gets the value of the stAng property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStAng() {
-        return stAng;
-    }
-
-    /**
-     * Sets the value of the stAng property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStAng(String value) {
-        this.stAng = value;
-    }
-
-    public boolean isSetStAng() {
-        return (this.stAng!= null);
-    }
-
-    /**
-     * Gets the value of the swAng property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSwAng() {
-        return swAng;
-    }
-
-    /**
-     * Sets the value of the swAng property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSwAng(String value) {
-        this.swAng = value;
-    }
-
-    public boolean isSetSwAng() {
-        return (this.swAng!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java
deleted file mode 100644
index a60f98b..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DClose complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2DClose">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DClose", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPath2DClose {
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java
deleted file mode 100644
index e1818fa..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DCubicBezierTo complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2DCubicBezierTo">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D" maxOccurs="3" minOccurs="3"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DCubicBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "pt"
-})
-public class CTPath2DCubicBezierTo {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected List<CTAdjPoint2D> pt;
-
-    /**
-     * Gets the value of the pt property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the pt property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPt().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTAdjPoint2D }
-     * 
-     * 
-     */
-    public List<CTAdjPoint2D> getPt() {
-        if (pt == null) {
-            pt = new ArrayList<CTAdjPoint2D>();
-        }
-        return this.pt;
-    }
-
-    public boolean isSetPt() {
-        return ((this.pt!= null)&&(!this.pt.isEmpty()));
-    }
-
-    public void unsetPt() {
-        this.pt = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java
deleted file mode 100644
index 9c6d1b3..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DLineTo complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2DLineTo">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DLineTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "pt"
-})
-public class CTPath2DLineTo {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTAdjPoint2D pt;
-
-    /**
-     * Gets the value of the pt property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public CTAdjPoint2D getPt() {
-        return pt;
-    }
-
-    /**
-     * Sets the value of the pt property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public void setPt(CTAdjPoint2D value) {
-        this.pt = value;
-    }
-
-    public boolean isSetPt() {
-        return (this.pt!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java
deleted file mode 100644
index cd31a0b..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DList complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2DList">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="path" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2D" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "path"
-})
-public class CTPath2DList {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected List<CTPath2D> path;
-
-    /**
-     * Gets the value of the path property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the path property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPath().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTPath2D }
-     * 
-     * 
-     */
-    public List<CTPath2D> getPath() {
-        if (path == null) {
-            path = new ArrayList<CTPath2D>();
-        }
-        return this.path;
-    }
-
-    public boolean isSetPath() {
-        return ((this.path!= null)&&(!this.path.isEmpty()));
-    }
-
-    public void unsetPath() {
-        this.path = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java
deleted file mode 100644
index f5e210f..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DMoveTo complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2DMoveTo">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DMoveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "pt"
-})
-public class CTPath2DMoveTo {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTAdjPoint2D pt;
-
-    /**
-     * Gets the value of the pt property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public CTAdjPoint2D getPt() {
-        return pt;
-    }
-
-    /**
-     * Sets the value of the pt property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public void setPt(CTAdjPoint2D value) {
-        this.pt = value;
-    }
-
-    public boolean isSetPt() {
-        return (this.pt!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java
deleted file mode 100644
index b588775..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DQuadBezierTo complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Path2DQuadBezierTo">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D" maxOccurs="2" minOccurs="2"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DQuadBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "pt"
-})
-public class CTPath2DQuadBezierTo {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected List<CTAdjPoint2D> pt;
-
-    /**
-     * Gets the value of the pt property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the pt property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPt().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CTAdjPoint2D }
-     * 
-     * 
-     */
-    public List<CTAdjPoint2D> getPt() {
-        if (pt == null) {
-            pt = new ArrayList<CTAdjPoint2D>();
-        }
-        return this.pt;
-    }
-
-    public boolean isSetPt() {
-        return ((this.pt!= null)&&(!this.pt.isEmpty()));
-    }
-
-    public void unsetPt() {
-        this.pt = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
deleted file mode 100644
index 7ca8c1f..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Percentage complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Percentage">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Percentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPercentage {
-
-    @XmlAttribute(required = true)
-    protected int val;
-
-    /**
-     * Gets the value of the val property.
-     * 
-     */
-    public int getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     */
-    public void setVal(int value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
deleted file mode 100644
index ae87986..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Point2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Point2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *       &lt;attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Point2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPoint2D {
-
-    @XmlAttribute(required = true)
-    protected long x;
-    @XmlAttribute(required = true)
-    protected long y;
-
-    /**
-     * Gets the value of the x property.
-     * 
-     */
-    public long getX() {
-        return x;
-    }
-
-    /**
-     * Sets the value of the x property.
-     * 
-     */
-    public void setX(long value) {
-        this.x = value;
-    }
-
-    public boolean isSetX() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     */
-    public long getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     */
-    public void setY(long value) {
-        this.y = value;
-    }
-
-    public boolean isSetY() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
deleted file mode 100644
index e14c6ba..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Point3D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Point3D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *       &lt;attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *       &lt;attribute name="z" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Point3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPoint3D {
-
-    @XmlAttribute(required = true)
-    protected long x;
-    @XmlAttribute(required = true)
-    protected long y;
-    @XmlAttribute(required = true)
-    protected long z;
-
-    /**
-     * Gets the value of the x property.
-     * 
-     */
-    public long getX() {
-        return x;
-    }
-
-    /**
-     * Sets the value of the x property.
-     * 
-     */
-    public void setX(long value) {
-        this.x = value;
-    }
-
-    public boolean isSetX() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     */
-    public long getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     */
-    public void setY(long value) {
-        this.y = value;
-    }
-
-    public boolean isSetY() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the z property.
-     * 
-     */
-    public long getZ() {
-        return z;
-    }
-
-    /**
-     * Sets the value of the z property.
-     * 
-     */
-    public void setZ(long value) {
-        this.z = value;
-    }
-
-    public boolean isSetZ() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
deleted file mode 100644
index 9547ca9..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_PolarAdjustHandle complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PolarAdjustHandle">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="pos" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/>
- *       &lt;/sequence>
- *       &lt;attribute name="gdRefR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName" />
- *       &lt;attribute name="minR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="maxR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="gdRefAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName" />
- *       &lt;attribute name="minAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" />
- *       &lt;attribute name="maxAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PolarAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "pos"
-})
-public class CTPolarAdjustHandle {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTAdjPoint2D pos;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String gdRefR;
-    @XmlAttribute
-    protected String minR;
-    @XmlAttribute
-    protected String maxR;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String gdRefAng;
-    @XmlAttribute
-    protected String minAng;
-    @XmlAttribute
-    protected String maxAng;
-
-    /**
-     * Gets the value of the pos property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public CTAdjPoint2D getPos() {
-        return pos;
-    }
-
-    /**
-     * Sets the value of the pos property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public void setPos(CTAdjPoint2D value) {
-        this.pos = value;
-    }
-
-    public boolean isSetPos() {
-        return (this.pos!= null);
-    }
-
-    /**
-     * Gets the value of the gdRefR property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGdRefR() {
-        return gdRefR;
-    }
-
-    /**
-     * Sets the value of the gdRefR property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGdRefR(String value) {
-        this.gdRefR = value;
-    }
-
-    public boolean isSetGdRefR() {
-        return (this.gdRefR!= null);
-    }
-
-    /**
-     * Gets the value of the minR property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMinR() {
-        return minR;
-    }
-
-    /**
-     * Sets the value of the minR property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMinR(String value) {
-        this.minR = value;
-    }
-
-    public boolean isSetMinR() {
-        return (this.minR!= null);
-    }
-
-    /**
-     * Gets the value of the maxR property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaxR() {
-        return maxR;
-    }
-
-    /**
-     * Sets the value of the maxR property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaxR(String value) {
-        this.maxR = value;
-    }
-
-    public boolean isSetMaxR() {
-        return (this.maxR!= null);
-    }
-
-    /**
-     * Gets the value of the gdRefAng property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGdRefAng() {
-        return gdRefAng;
-    }
-
-    /**
-     * Sets the value of the gdRefAng property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGdRefAng(String value) {
-        this.gdRefAng = value;
-    }
-
-    public boolean isSetGdRefAng() {
-        return (this.gdRefAng!= null);
-    }
-
-    /**
-     * Gets the value of the minAng property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMinAng() {
-        return minAng;
-    }
-
-    /**
-     * Sets the value of the minAng property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMinAng(String value) {
-        this.minAng = value;
-    }
-
-    public boolean isSetMinAng() {
-        return (this.minAng!= null);
-    }
-
-    /**
-     * Gets the value of the maxAng property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaxAng() {
-        return maxAng;
-    }
-
-    /**
-     * Sets the value of the maxAng property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaxAng(String value) {
-        this.maxAng = value;
-    }
-
-    public boolean isSetMaxAng() {
-        return (this.maxAng!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
deleted file mode 100644
index 94348d9..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositiveFixedAngle complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PositiveFixedAngle">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositiveFixedAngle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositiveFixedAngle {
-
-    @XmlAttribute(required = true)
-    protected int val;
-
-    /**
-     * Gets the value of the val property.
-     * 
-     */
-    public int getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     */
-    public void setVal(int value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
deleted file mode 100644
index de65915..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositiveFixedPercentage complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PositiveFixedPercentage">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedPercentage" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositiveFixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositiveFixedPercentage {
-
-    @XmlAttribute(required = true)
-    protected int val;
-
-    /**
-     * Gets the value of the val property.
-     * 
-     */
-    public int getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     */
-    public void setVal(int value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
deleted file mode 100644
index 7b377e1..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositivePercentage complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PositivePercentage">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositivePercentage" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositivePercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositivePercentage {
-
-    @XmlAttribute(required = true)
-    protected int val;
-
-    /**
-     * Gets the value of the val property.
-     * 
-     */
-    public int getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     */
-    public void setVal(int value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
deleted file mode 100644
index 210fd92..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositiveSize2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PositiveSize2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="cx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" />
- *       &lt;attribute name="cy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositiveSize2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositiveSize2D {
-
-    @XmlAttribute(required = true)
-    protected long cx;
-    @XmlAttribute(required = true)
-    protected long cy;
-
-    /**
-     * Gets the value of the cx property.
-     * 
-     */
-    public long getCx() {
-        return cx;
-    }
-
-    /**
-     * Sets the value of the cx property.
-     * 
-     */
-    public void setCx(long value) {
-        this.cx = value;
-    }
-
-    public boolean isSetCx() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the cy property.
-     * 
-     */
-    public long getCy() {
-        return cy;
-    }
-
-    /**
-     * Sets the value of the cy property.
-     * 
-     */
-    public void setCy(long value) {
-        this.cy = value;
-    }
-
-    public boolean isSetCy() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
deleted file mode 100644
index 595d1c5..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PresetColor complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PresetColor">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="val" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PresetColorVal" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PresetColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "egColorTransform"
-})
-public class CTPresetColor {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> egColorTransform;
-    @XmlAttribute
-    protected STPresetColorVal val;
-
-    /**
-     * Gets the value of the egColorTransform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEGColorTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getEGColorTransform() {
-        if (egColorTransform == null) {
-            egColorTransform = new ArrayList<JAXBElement<?>>();
-        }
-        return this.egColorTransform;
-    }
-
-    public boolean isSetEGColorTransform() {
-        return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
-    }
-
-    public void unsetEGColorTransform() {
-        this.egColorTransform = null;
-    }
-
-    /**
-     * Gets the value of the val property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link STPresetColorVal }
-     *     
-     */
-    public STPresetColorVal getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link STPresetColorVal }
-     *     
-     */
-    public void setVal(STPresetColorVal value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return (this.val!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
deleted file mode 100644
index 234bbd9..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PresetGeometry2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PresetGeometry2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="avLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_ShapeType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PresetGeometry2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "avLst"
-})
-public class CTPresetGeometry2D {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTGeomGuideList avLst;
-    @XmlAttribute(required = true)
-    protected STShapeType prst;
-
-    /**
-     * Gets the value of the avLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public CTGeomGuideList getAvLst() {
-        return avLst;
-    }
-
-    /**
-     * Sets the value of the avLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public void setAvLst(CTGeomGuideList value) {
-        this.avLst = value;
-    }
-
-    public boolean isSetAvLst() {
-        return (this.avLst!= null);
-    }
-
-    /**
-     * Gets the value of the prst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link STShapeType }
-     *     
-     */
-    public STShapeType getPrst() {
-        return prst;
-    }
-
-    /**
-     * Sets the value of the prst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link STShapeType }
-     *     
-     */
-    public void setPrst(STShapeType value) {
-        this.prst = value;
-    }
-
-    public boolean isSetPrst() {
-        return (this.prst!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
deleted file mode 100644
index 0a6135f..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PresetTextShape complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_PresetTextShape">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="avLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_TextShapeType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PresetTextShape", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "avLst"
-})
-public class CTPresetTextShape {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTGeomGuideList avLst;
-    @XmlAttribute(required = true)
-    protected STTextShapeType prst;
-
-    /**
-     * Gets the value of the avLst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public CTGeomGuideList getAvLst() {
-        return avLst;
-    }
-
-    /**
-     * Sets the value of the avLst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTGeomGuideList }
-     *     
-     */
-    public void setAvLst(CTGeomGuideList value) {
-        this.avLst = value;
-    }
-
-    public boolean isSetAvLst() {
-        return (this.avLst!= null);
-    }
-
-    /**
-     * Gets the value of the prst property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link STTextShapeType }
-     *     
-     */
-    public STTextShapeType getPrst() {
-        return prst;
-    }
-
-    /**
-     * Sets the value of the prst property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link STTextShapeType }
-     *     
-     */
-    public void setPrst(STTextShapeType value) {
-        this.prst = value;
-    }
-
-    public boolean isSetPrst() {
-        return (this.prst!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
deleted file mode 100644
index 4a61b88..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Ratio complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Ratio">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="n" use="required" type="{http://www.w3.org/2001/XMLSchema}long" />
- *       &lt;attribute name="d" use="required" type="{http://www.w3.org/2001/XMLSchema}long" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Ratio", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTRatio {
-
-    @XmlAttribute(required = true)
-    protected long n;
-    @XmlAttribute(required = true)
-    protected long d;
-
-    /**
-     * Gets the value of the n property.
-     * 
-     */
-    public long getN() {
-        return n;
-    }
-
-    /**
-     * Sets the value of the n property.
-     * 
-     */
-    public void setN(long value) {
-        this.n = value;
-    }
-
-    public boolean isSetN() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the d property.
-     * 
-     */
-    public long getD() {
-        return d;
-    }
-
-    /**
-     * Sets the value of the d property.
-     * 
-     */
-    public void setD(long value) {
-        this.d = value;
-    }
-
-    public boolean isSetD() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
deleted file mode 100644
index a8b82c4..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_RelativeRect complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_RelativeRect">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="l" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" />
- *       &lt;attribute name="t" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" />
- *       &lt;attribute name="r" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" />
- *       &lt;attribute name="b" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_RelativeRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTRelativeRect {
-
-    @XmlAttribute
-    protected Integer l;
-    @XmlAttribute
-    protected Integer t;
-    @XmlAttribute
-    protected Integer r;
-    @XmlAttribute
-    protected Integer b;
-
-    /**
-     * Gets the value of the l property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public int getL() {
-        if (l == null) {
-            return  0;
-        } else {
-            return l;
-        }
-    }
-
-    /**
-     * Sets the value of the l property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setL(int value) {
-        this.l = value;
-    }
-
-    public boolean isSetL() {
-        return (this.l!= null);
-    }
-
-    public void unsetL() {
-        this.l = null;
-    }
-
-    /**
-     * Gets the value of the t property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public int getT() {
-        if (t == null) {
-            return  0;
-        } else {
-            return t;
-        }
-    }
-
-    /**
-     * Sets the value of the t property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setT(int value) {
-        this.t = value;
-    }
-
-    public boolean isSetT() {
-        return (this.t!= null);
-    }
-
-    public void unsetT() {
-        this.t = null;
-    }
-
-    /**
-     * Gets the value of the r property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public int getR() {
-        if (r == null) {
-            return  0;
-        } else {
-            return r;
-        }
-    }
-
-    /**
-     * Sets the value of the r property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setR(int value) {
-        this.r = value;
-    }
-
-    public boolean isSetR() {
-        return (this.r!= null);
-    }
-
-    public void unsetR() {
-        this.r = null;
-    }
-
-    /**
-     * Gets the value of the b property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public int getB() {
-        if (b == null) {
-            return  0;
-        } else {
-            return b;
-        }
-    }
-
-    /**
-     * Sets the value of the b property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setB(int value) {
-        this.b = value;
-    }
-
-    public boolean isSetB() {
-        return (this.b!= null);
-    }
-
-    public void unsetB() {
-        this.b = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
deleted file mode 100644
index 36cefe5..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_SRgbColor complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_SRgbColor">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "egColorTransform"
-})
-public class CTSRgbColor {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> egColorTransform;
-    @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(HexBinaryAdapter.class)
-    protected byte[] val;
-
-    /**
-     * Gets the value of the egColorTransform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEGColorTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getEGColorTransform() {
-        if (egColorTransform == null) {
-            egColorTransform = new ArrayList<JAXBElement<?>>();
-        }
-        return this.egColorTransform;
-    }
-
-    public boolean isSetEGColorTransform() {
-        return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
-    }
-
-    public void unsetEGColorTransform() {
-        this.egColorTransform = null;
-    }
-
-    /**
-     * Gets the value of the val property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public byte[] getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVal(byte[] value) {
-        this.val = (value != null) ? value.clone() : null;
-    }
-
-    public boolean isSetVal() {
-        return (this.val!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
deleted file mode 100644
index 2cb3986..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ScRgbColor complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_ScRgbColor">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="r" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" />
- *       &lt;attribute name="g" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" />
- *       &lt;attribute name="b" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ScRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "egColorTransform"
-})
-public class CTScRgbColor {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> egColorTransform;
-    @XmlAttribute(required = true)
-    protected int r;
-    @XmlAttribute(required = true)
-    protected int g;
-    @XmlAttribute(required = true)
-    protected int b;
-
-    /**
-     * Gets the value of the egColorTransform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEGColorTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getEGColorTransform() {
-        if (egColorTransform == null) {
-            egColorTransform = new ArrayList<JAXBElement<?>>();
-        }
-        return this.egColorTransform;
-    }
-
-    public boolean isSetEGColorTransform() {
-        return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
-    }
-
-    public void unsetEGColorTransform() {
-        this.egColorTransform = null;
-    }
-
-    /**
-     * Gets the value of the r property.
-     * 
-     */
-    public int getR() {
-        return r;
-    }
-
-    /**
-     * Sets the value of the r property.
-     * 
-     */
-    public void setR(int value) {
-        this.r = value;
-    }
-
-    public boolean isSetR() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the g property.
-     * 
-     */
-    public int getG() {
-        return g;
-    }
-
-    /**
-     * Sets the value of the g property.
-     * 
-     */
-    public void setG(int value) {
-        this.g = value;
-    }
-
-    public boolean isSetG() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the b property.
-     * 
-     */
-    public int getB() {
-        return b;
-    }
-
-    /**
-     * Sets the value of the b property.
-     * 
-     */
-    public void setB(int value) {
-        this.b = value;
-    }
-
-    public boolean isSetB() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java
deleted file mode 100644
index 2e8eba1..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Scale2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Scale2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="sx" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/>
- *         &lt;element name="sy" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Scale2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "sx",
-    "sy"
-})
-public class CTScale2D {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTRatio sx;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTRatio sy;
-
-    /**
-     * Gets the value of the sx property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTRatio }
-     *     
-     */
-    public CTRatio getSx() {
-        return sx;
-    }
-
-    /**
-     * Sets the value of the sx property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTRatio }
-     *     
-     */
-    public void setSx(CTRatio value) {
-        this.sx = value;
-    }
-
-    public boolean isSetSx() {
-        return (this.sx!= null);
-    }
-
-    /**
-     * Gets the value of the sy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTRatio }
-     *     
-     */
-    public CTRatio getSy() {
-        return sy;
-    }
-
-    /**
-     * Sets the value of the sy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTRatio }
-     *     
-     */
-    public void setSy(CTRatio value) {
-        this.sy = value;
-    }
-
-    public boolean isSetSy() {
-        return (this.sy!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
deleted file mode 100644
index ac8fb5c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_SchemeColor complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_SchemeColor">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_SchemeColorVal" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SchemeColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "egColorTransform"
-})
-public class CTSchemeColor {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> egColorTransform;
-    @XmlAttribute(required = true)
-    protected STSchemeColorVal val;
-
-    /**
-     * Gets the value of the egColorTransform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEGColorTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getEGColorTransform() {
-        if (egColorTransform == null) {
-            egColorTransform = new ArrayList<JAXBElement<?>>();
-        }
-        return this.egColorTransform;
-    }
-
-    public boolean isSetEGColorTransform() {
-        return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
-    }
-
-    public void unsetEGColorTransform() {
-        this.egColorTransform = null;
-    }
-
-    /**
-     * Gets the value of the val property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link STSchemeColorVal }
-     *     
-     */
-    public STSchemeColorVal getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link STSchemeColorVal }
-     *     
-     */
-    public void setVal(STSchemeColorVal value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return (this.val!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
deleted file mode 100644
index 7f03d0d..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_SphereCoords complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_SphereCoords">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="lat" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" />
- *       &lt;attribute name="lon" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" />
- *       &lt;attribute name="rev" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SphereCoords", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTSphereCoords {
-
-    @XmlAttribute(required = true)
-    protected int lat;
-    @XmlAttribute(required = true)
-    protected int lon;
-    @XmlAttribute(required = true)
-    protected int rev;
-
-    /**
-     * Gets the value of the lat property.
-     * 
-     */
-    public int getLat() {
-        return lat;
-    }
-
-    /**
-     * Sets the value of the lat property.
-     * 
-     */
-    public void setLat(int value) {
-        this.lat = value;
-    }
-
-    public boolean isSetLat() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the lon property.
-     * 
-     */
-    public int getLon() {
-        return lon;
-    }
-
-    /**
-     * Sets the value of the lon property.
-     * 
-     */
-    public void setLon(int value) {
-        this.lon = value;
-    }
-
-    public boolean isSetLon() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the rev property.
-     * 
-     */
-    public int getRev() {
-        return rev;
-    }
-
-    /**
-     * Sets the value of the rev property.
-     * 
-     */
-    public void setRev(int value) {
-        this.rev = value;
-    }
-
-    public boolean isSetRev() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
deleted file mode 100644
index 1300f87..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_SystemColor complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_SystemColor">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_SystemColorVal" />
- *       &lt;attribute name="lastClr" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SystemColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "egColorTransform"
-})
-public class CTSystemColor {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> egColorTransform;
-    @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String val;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(HexBinaryAdapter.class)
-    protected byte[] lastClr;
-
-    /**
-     * Gets the value of the egColorTransform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEGColorTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getEGColorTransform() {
-        if (egColorTransform == null) {
-            egColorTransform = new ArrayList<JAXBElement<?>>();
-        }
-        return this.egColorTransform;
-    }
-
-    public boolean isSetEGColorTransform() {
-        return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
-    }
-
-    public void unsetEGColorTransform() {
-        this.egColorTransform = null;
-    }
-
-    /**
-     * Gets the value of the val property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVal() {
-        return val;
-    }
-
-    /**
-     * Sets the value of the val property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVal(String value) {
-        this.val = value;
-    }
-
-    public boolean isSetVal() {
-        return (this.val!= null);
-    }
-
-    /**
-     * Gets the value of the lastClr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public byte[] getLastClr() {
-        return lastClr;
-    }
-
-    /**
-     * Sets the value of the lastClr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLastClr(byte[] value) {
-        this.lastClr = (value != null) ? value.clone() : null;
-    }
-
-    public boolean isSetLastClr() {
-        return (this.lastClr!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
deleted file mode 100644
index dd1dcb5..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Transform2D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Transform2D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="off" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D" minOccurs="0"/>
- *         &lt;element name="ext" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="rot" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle" default="0" />
- *       &lt;attribute name="flipH" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       &lt;attribute name="flipV" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Transform2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "off",
-    "ext"
-})
-public class CTTransform2D {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTPoint2D off;
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-    protected CTPositiveSize2D ext;
-    @XmlAttribute
-    protected Integer rot;
-    @XmlAttribute
-    protected Boolean flipH;
-    @XmlAttribute
-    protected Boolean flipV;
-
-    /**
-     * Gets the value of the off property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPoint2D }
-     *     
-     */
-    public CTPoint2D getOff() {
-        return off;
-    }
-
-    /**
-     * Sets the value of the off property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPoint2D }
-     *     
-     */
-    public void setOff(CTPoint2D value) {
-        this.off = value;
-    }
-
-    public boolean isSetOff() {
-        return (this.off!= null);
-    }
-
-    /**
-     * Gets the value of the ext property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTPositiveSize2D }
-     *     
-     */
-    public CTPositiveSize2D getExt() {
-        return ext;
-    }
-
-    /**
-     * Sets the value of the ext property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTPositiveSize2D }
-     *     
-     */
-    public void setExt(CTPositiveSize2D value) {
-        this.ext = value;
-    }
-
-    public boolean isSetExt() {
-        return (this.ext!= null);
-    }
-
-    /**
-     * Gets the value of the rot property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public int getRot() {
-        if (rot == null) {
-            return  0;
-        } else {
-            return rot;
-        }
-    }
-
-    /**
-     * Sets the value of the rot property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRot(int value) {
-        this.rot = value;
-    }
-
-    public boolean isSetRot() {
-        return (this.rot!= null);
-    }
-
-    public void unsetRot() {
-        this.rot = null;
-    }
-
-    /**
-     * Gets the value of the flipH property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isFlipH() {
-        if (flipH == null) {
-            return false;
-        } else {
-            return flipH;
-        }
-    }
-
-    /**
-     * Sets the value of the flipH property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setFlipH(boolean value) {
-        this.flipH = value;
-    }
-
-    public boolean isSetFlipH() {
-        return (this.flipH!= null);
-    }
-
-    public void unsetFlipH() {
-        this.flipH = null;
-    }
-
-    /**
-     * Gets the value of the flipV property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isFlipV() {
-        if (flipV == null) {
-            return false;
-        } else {
-            return flipV;
-        }
-    }
-
-    /**
-     * Sets the value of the flipV property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setFlipV(boolean value) {
-        this.flipV = value;
-    }
-
-    public boolean isSetFlipV() {
-        return (this.flipV!= null);
-    }
-
-    public void unsetFlipV() {
-        this.flipV = null;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
deleted file mode 100644
index d7f744b..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Vector3D complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_Vector3D">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="dx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *       &lt;attribute name="dy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *       &lt;attribute name="dz" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Vector3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTVector3D {
-
-    @XmlAttribute(required = true)
-    protected long dx;
-    @XmlAttribute(required = true)
-    protected long dy;
-    @XmlAttribute(required = true)
-    protected long dz;
-
-    /**
-     * Gets the value of the dx property.
-     * 
-     */
-    public long getDx() {
-        return dx;
-    }
-
-    /**
-     * Sets the value of the dx property.
-     * 
-     */
-    public void setDx(long value) {
-        this.dx = value;
-    }
-
-    public boolean isSetDx() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the dy property.
-     * 
-     */
-    public long getDy() {
-        return dy;
-    }
-
-    /**
-     * Sets the value of the dy property.
-     * 
-     */
-    public void setDy(long value) {
-        this.dy = value;
-    }
-
-    public boolean isSetDy() {
-        return true;
-    }
-
-    /**
-     * Gets the value of the dz property.
-     * 
-     */
-    public long getDz() {
-        return dz;
-    }
-
-    /**
-     * Sets the value of the dz property.
-     * 
-     */
-    public void setDz(long value) {
-        this.dz = value;
-    }
-
-    public boolean isSetDz() {
-        return true;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java b/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
deleted file mode 100644
index 2b22a58..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_XYAdjustHandle complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CT_XYAdjustHandle">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="pos" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/>
- *       &lt;/sequence>
- *       &lt;attribute name="gdRefX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName" />
- *       &lt;attribute name="minX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="maxX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="gdRefY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName" />
- *       &lt;attribute name="minY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *       &lt;attribute name="maxY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_XYAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
-    "pos"
-})
-public class CTXYAdjustHandle {
-
-    @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
-    protected CTAdjPoint2D pos;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String gdRefX;
-    @XmlAttribute
-    protected String minX;
-    @XmlAttribute
-    protected String maxX;
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String gdRefY;
-    @XmlAttribute
-    protected String minY;
-    @XmlAttribute
-    protected String maxY;
-
-    /**
-     * Gets the value of the pos property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public CTAdjPoint2D getPos() {
-        return pos;
-    }
-
-    /**
-     * Sets the value of the pos property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CTAdjPoint2D }
-     *     
-     */
-    public void setPos(CTAdjPoint2D value) {
-        this.pos = value;
-    }
-
-    public boolean isSetPos() {
-        return (this.pos!= null);
-    }
-
-    /**
-     * Gets the value of the gdRefX property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGdRefX() {
-        return gdRefX;
-    }
-
-    /**
-     * Sets the value of the gdRefX property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGdRefX(String value) {
-        this.gdRefX = value;
-    }
-
-    public boolean isSetGdRefX() {
-        return (this.gdRefX!= null);
-    }
-
-    /**
-     * Gets the value of the minX property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMinX() {
-        return minX;
-    }
-
-    /**
-     * Sets the value of the minX property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMinX(String value) {
-        this.minX = value;
-    }
-
-    public boolean isSetMinX() {
-        return (this.minX!= null);
-    }
-
-    /**
-     * Gets the value of the maxX property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaxX() {
-        return maxX;
-    }
-
-    /**
-     * Sets the value of the maxX property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaxX(String value) {
-        this.maxX = value;
-    }
-
-    public boolean isSetMaxX() {
-        return (this.maxX!= null);
-    }
-
-    /**
-     * Gets the value of the gdRefY property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGdRefY() {
-        return gdRefY;
-    }
-
-    /**
-     * Sets the value of the gdRefY property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGdRefY(String value) {
-        this.gdRefY = value;
-    }
-
-    public boolean isSetGdRefY() {
-        return (this.gdRefY!= null);
-    }
-
-    /**
-     * Gets the value of the minY property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMinY() {
-        return minY;
-    }
-
-    /**
-     * Sets the value of the minY property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMinY(String value) {
-        this.minY = value;
-    }
-
-    public boolean isSetMinY() {
-        return (this.minY!= null);
-    }
-
-    /**
-     * Gets the value of the maxY property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaxY() {
-        return maxY;
-    }
-
-    /**
-     * Sets the value of the maxY property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaxY(String value) {
-        this.maxY = value;
-    }
-
-    public boolean isSetMaxY() {
-        return (this.maxY!= null);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java b/trunk/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
deleted file mode 100644
index 896fb24..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
+++ /dev/null
@@ -1,2023 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.apache.poi.sl.draw.binding package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _CTSRgbColorAlpha_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alpha");
-    private final static QName _CTSRgbColorLum_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lum");
-    private final static QName _CTSRgbColorGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gamma");
-    private final static QName _CTSRgbColorInvGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "invGamma");
-    private final static QName _CTSRgbColorRedOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redOff");
-    private final static QName _CTSRgbColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");
-    private final static QName _CTSRgbColorAlphaOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaOff");
-    private final static QName _CTSRgbColorGreenOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenOff");
-    private final static QName _CTSRgbColorRedMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redMod");
-    private final static QName _CTSRgbColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");
-    private final static QName _CTSRgbColorSatOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satOff");
-    private final static QName _CTSRgbColorGreenMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenMod");
-    private final static QName _CTSRgbColorSat_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "sat");
-    private final static QName _CTSRgbColorBlue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blue");
-    private final static QName _CTSRgbColorRed_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "red");
-    private final static QName _CTSRgbColorSatMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satMod");
-    private final static QName _CTSRgbColorHueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueOff");
-    private final static QName _CTSRgbColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");
-    private final static QName _CTSRgbColorShade_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "shade");
-    private final static QName _CTSRgbColorLumMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumMod");
-    private final static QName _CTSRgbColorInv_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "inv");
-    private final static QName _CTSRgbColorLumOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumOff");
-    private final static QName _CTSRgbColorTint_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "tint");
-    private final static QName _CTSRgbColorGreen_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "green");
-    private final static QName _CTSRgbColorComp_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "comp");
-    private final static QName _CTSRgbColorBlueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueOff");
-    private final static QName _CTSRgbColorHueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueMod");
-    private final static QName _CTSRgbColorGray_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gray");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.poi.sl.draw.binding
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link CTPositiveSize2D }
-     * 
-     */
-    public CTPositiveSize2D createCTPositiveSize2D() {
-        return new CTPositiveSize2D();
-    }
-
-    /**
-     * Create an instance of {@link CTSphereCoords }
-     * 
-     */
-    public CTSphereCoords createCTSphereCoords() {
-        return new CTSphereCoords();
-    }
-
-    /**
-     * Create an instance of {@link CTPositivePercentage }
-     * 
-     */
-    public CTPositivePercentage createCTPositivePercentage() {
-        return new CTPositivePercentage();
-    }
-
-    /**
-     * Create an instance of {@link CTAdjPoint2D }
-     * 
-     */
-    public CTAdjPoint2D createCTAdjPoint2D() {
-        return new CTAdjPoint2D();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2DCubicBezierTo }
-     * 
-     */
-    public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {
-        return new CTPath2DCubicBezierTo();
-    }
-
-    /**
-     * Create an instance of {@link CTEmbeddedWAVAudioFile }
-     * 
-     */
-    public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {
-        return new CTEmbeddedWAVAudioFile();
-    }
-
-    /**
-     * Create an instance of {@link CTPresetGeometry2D }
-     * 
-     */
-    public CTPresetGeometry2D createCTPresetGeometry2D() {
-        return new CTPresetGeometry2D();
-    }
-
-    /**
-     * Create an instance of {@link CTSchemeColor }
-     * 
-     */
-    public CTSchemeColor createCTSchemeColor() {
-        return new CTSchemeColor();
-    }
-
-    /**
-     * Create an instance of {@link CTInverseTransform }
-     * 
-     */
-    public CTInverseTransform createCTInverseTransform() {
-        return new CTInverseTransform();
-    }
-
-    /**
-     * Create an instance of {@link CTScRgbColor }
-     * 
-     */
-    public CTScRgbColor createCTScRgbColor() {
-        return new CTScRgbColor();
-    }
-
-    /**
-     * Create an instance of {@link CTPositiveFixedAngle }
-     * 
-     */
-    public CTPositiveFixedAngle createCTPositiveFixedAngle() {
-        return new CTPositiveFixedAngle();
-    }
-
-    /**
-     * Create an instance of {@link CTInverseGammaTransform }
-     * 
-     */
-    public CTInverseGammaTransform createCTInverseGammaTransform() {
-        return new CTInverseGammaTransform();
-    }
-
-    /**
-     * Create an instance of {@link CTColorMRU }
-     * 
-     */
-    public CTColorMRU createCTColorMRU() {
-        return new CTColorMRU();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2DArcTo }
-     * 
-     */
-    public CTPath2DArcTo createCTPath2DArcTo() {
-        return new CTPath2DArcTo();
-    }
-
-    /**
-     * Create an instance of {@link CTSystemColor }
-     * 
-     */
-    public CTSystemColor createCTSystemColor() {
-        return new CTSystemColor();
-    }
-
-    /**
-     * Create an instance of {@link CTGroupTransform2D }
-     * 
-     */
-    public CTGroupTransform2D createCTGroupTransform2D() {
-        return new CTGroupTransform2D();
-    }
-
-    /**
-     * Create an instance of {@link CTPoint2D }
-     * 
-     */
-    public CTPoint2D createCTPoint2D() {
-        return new CTPoint2D();
-    }
-
-    /**
-     * Create an instance of {@link CTGeomRect }
-     * 
-     */
-    public CTGeomRect createCTGeomRect() {
-        return new CTGeomRect();
-    }
-
-    /**
-     * Create an instance of {@link CTScale2D }
-     * 
-     */
-    public CTScale2D createCTScale2D() {
-        return new CTScale2D();
-    }
-
-    /**
-     * Create an instance of {@link CTGeomGuide }
-     * 
-     */
-    public CTGeomGuide createCTGeomGuide() {
-        return new CTGeomGuide();
-    }
-
-    /**
-     * Create an instance of {@link CTXYAdjustHandle }
-     * 
-     */
-    public CTXYAdjustHandle createCTXYAdjustHandle() {
-        return new CTXYAdjustHandle();
-    }
-
-    /**
-     * Create an instance of {@link CTCustomGeometry2D }
-     * 
-     */
-    public CTCustomGeometry2D createCTCustomGeometry2D() {
-        return new CTCustomGeometry2D();
-    }
-
-    /**
-     * Create an instance of {@link CTOfficeArtExtension }
-     * 
-     */
-    public CTOfficeArtExtension createCTOfficeArtExtension() {
-        return new CTOfficeArtExtension();
-    }
-
-    /**
-     * Create an instance of {@link CTGrayscaleTransform }
-     * 
-     */
-    public CTGrayscaleTransform createCTGrayscaleTransform() {
-        return new CTGrayscaleTransform();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2DClose }
-     * 
-     */
-    public CTPath2DClose createCTPath2DClose() {
-        return new CTPath2DClose();
-    }
-
-    /**
-     * Create an instance of {@link CTComplementTransform }
-     * 
-     */
-    public CTComplementTransform createCTComplementTransform() {
-        return new CTComplementTransform();
-    }
-
-    /**
-     * Create an instance of {@link CTPoint3D }
-     * 
-     */
-    public CTPoint3D createCTPoint3D() {
-        return new CTPoint3D();
-    }
-
-    /**
-     * Create an instance of {@link CTPositiveFixedPercentage }
-     * 
-     */
-    public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {
-        return new CTPositiveFixedPercentage();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2D }
-     * 
-     */
-    public CTPath2D createCTPath2D() {
-        return new CTPath2D();
-    }
-
-    /**
-     * Create an instance of {@link CTAdjustHandleList }
-     * 
-     */
-    public CTAdjustHandleList createCTAdjustHandleList() {
-        return new CTAdjustHandleList();
-    }
-
-    /**
-     * Create an instance of {@link CTConnectionSiteList }
-     * 
-     */
-    public CTConnectionSiteList createCTConnectionSiteList() {
-        return new CTConnectionSiteList();
-    }
-
-    /**
-     * Create an instance of {@link CTPresetTextShape }
-     * 
-     */
-    public CTPresetTextShape createCTPresetTextShape() {
-        return new CTPresetTextShape();
-    }
-
-    /**
-     * Create an instance of {@link CTSRgbColor }
-     * 
-     */
-    public CTSRgbColor createCTSRgbColor() {
-        return new CTSRgbColor();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2DMoveTo }
-     * 
-     */
-    public CTPath2DMoveTo createCTPath2DMoveTo() {
-        return new CTPath2DMoveTo();
-    }
-
-    /**
-     * Create an instance of {@link CTRelativeRect }
-     * 
-     */
-    public CTRelativeRect createCTRelativeRect() {
-        return new CTRelativeRect();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2DList }
-     * 
-     */
-    public CTPath2DList createCTPath2DList() {
-        return new CTPath2DList();
-    }
-
-    /**
-     * Create an instance of {@link CTPolarAdjustHandle }
-     * 
-     */
-    public CTPolarAdjustHandle createCTPolarAdjustHandle() {
-        return new CTPolarAdjustHandle();
-    }
-
-    /**
-     * Create an instance of {@link CTPercentage }
-     * 
-     */
-    public CTPercentage createCTPercentage() {
-        return new CTPercentage();
-    }
-
-    /**
-     * Create an instance of {@link CTHslColor }
-     * 
-     */
-    public CTHslColor createCTHslColor() {
-        return new CTHslColor();
-    }
-
-    /**
-     * Create an instance of {@link CTRatio }
-     * 
-     */
-    public CTRatio createCTRatio() {
-        return new CTRatio();
-    }
-
-    /**
-     * Create an instance of {@link CTGeomGuideList }
-     * 
-     */
-    public CTGeomGuideList createCTGeomGuideList() {
-        return new CTGeomGuideList();
-    }
-
-    /**
-     * Create an instance of {@link CTTransform2D }
-     * 
-     */
-    public CTTransform2D createCTTransform2D() {
-        return new CTTransform2D();
-    }
-
-    /**
-     * Create an instance of {@link CTGammaTransform }
-     * 
-     */
-    public CTGammaTransform createCTGammaTransform() {
-        return new CTGammaTransform();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2DQuadBezierTo }
-     * 
-     */
-    public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {
-        return new CTPath2DQuadBezierTo();
-    }
-
-    /**
-     * Create an instance of {@link CTAngle }
-     * 
-     */
-    public CTAngle createCTAngle() {
-        return new CTAngle();
-    }
-
-    /**
-     * Create an instance of {@link CTConnectionSite }
-     * 
-     */
-    public CTConnectionSite createCTConnectionSite() {
-        return new CTConnectionSite();
-    }
-
-    /**
-     * Create an instance of {@link CTHyperlink }
-     * 
-     */
-    public CTHyperlink createCTHyperlink() {
-        return new CTHyperlink();
-    }
-
-    /**
-     * Create an instance of {@link CTFixedPercentage }
-     * 
-     */
-    public CTFixedPercentage createCTFixedPercentage() {
-        return new CTFixedPercentage();
-    }
-
-    /**
-     * Create an instance of {@link CTPath2DLineTo }
-     * 
-     */
-    public CTPath2DLineTo createCTPath2DLineTo() {
-        return new CTPath2DLineTo();
-    }
-
-    /**
-     * Create an instance of {@link CTColor }
-     * 
-     */
-    public CTColor createCTColor() {
-        return new CTColor();
-    }
-
-    /**
-     * Create an instance of {@link CTPresetColor }
-     * 
-     */
-    public CTPresetColor createCTPresetColor() {
-        return new CTPresetColor();
-    }
-
-    /**
-     * Create an instance of {@link CTVector3D }
-     * 
-     */
-    public CTVector3D createCTVector3D() {
-        return new CTVector3D();
-    }
-
-    /**
-     * Create an instance of {@link CTOfficeArtExtensionList }
-     * 
-     */
-    public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {
-        return new CTOfficeArtExtensionList();
-    }
-
-    /**
-     * Create an instance of {@link CTConnection }
-     * 
-     */
-    public CTConnection createCTConnection() {
-        return new CTConnection();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSRgbColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorAlpha(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorLum(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSRgbColor.class)
-    public JAXBElement<CTGammaTransform> createCTSRgbColorGamma(CTGammaTransform value) {
-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSRgbColor.class)
-    public JAXBElement<CTInverseGammaTransform> createCTSRgbColorInvGamma(CTInverseGammaTransform value) {
-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)
-    public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSRgbColor.class)
-    public JAXBElement<CTFixedPercentage> createCTSRgbColorAlphaOff(CTFixedPercentage value) {
-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorGreenOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)
-    public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {
-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorSatOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorGreenMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorSat(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorBlue(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorRed(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorSatMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)
-    public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {
-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSRgbColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorShade(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorLumMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSRgbColor.class)
-    public JAXBElement<CTInverseTransform> createCTSRgbColorInv(CTInverseTransform value) {
-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorLumOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSRgbColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorTint(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorGreen(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSRgbColor.class)
-    public JAXBElement<CTComplementTransform> createCTSRgbColorComp(CTComplementTransform value) {
-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSRgbColor.class)
-    public JAXBElement<CTPercentage> createCTSRgbColorBlueOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSRgbColor.class)
-    public JAXBElement<CTPositivePercentage> createCTSRgbColorHueMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSRgbColor.class)
-    public JAXBElement<CTGrayscaleTransform> createCTSRgbColorGray(CTGrayscaleTransform value) {
-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSystemColor.class)
-    public JAXBElement<CTGammaTransform> createCTSystemColorGamma(CTGammaTransform value) {
-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSystemColor.class)
-    public JAXBElement<CTInverseGammaTransform> createCTSystemColorInvGamma(CTInverseGammaTransform value) {
-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)
-    public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSystemColor.class)
-    public JAXBElement<CTFixedPercentage> createCTSystemColorAlphaOff(CTFixedPercentage value) {
-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorGreenOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)
-    public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {
-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorSatOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorGreenMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorRed(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorSatMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorBlueMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSystemColor.class)
-    public JAXBElement<CTAngle> createCTSystemColorHueOff(CTAngle value) {
-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSystemColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorShade(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorLumMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSystemColor.class)
-    public JAXBElement<CTInverseTransform> createCTSystemColorInv(CTInverseTransform value) {
-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorLumOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSystemColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorTint(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorGreen(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSystemColor.class)
-    public JAXBElement<CTComplementTransform> createCTSystemColorComp(CTComplementTransform value) {
-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSystemColor.class)
-    public JAXBElement<CTPercentage> createCTSystemColorBlueOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSystemColor.class)
-    public JAXBElement<CTPositivePercentage> createCTSystemColorHueMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSystemColor.class)
-    public JAXBElement<CTGrayscaleTransform> createCTSystemColorGray(CTGrayscaleTransform value) {
-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)
-    public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {
-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)
-    public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {
-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)
-    public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)
-    public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {
-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)
-    public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {
-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)
-    public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {
-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)
-    public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {
-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)
-    public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {
-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)
-    public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)
-    public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)
-    public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {
-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)
-    public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {
-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)
-    public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {
-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)
-    public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)
-    public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {
-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)
-    public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {
-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)
-    public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {
-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)
-    public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {
-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)
-    public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {
-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)
-    public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)
-    public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)
-    public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {
-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTHslColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorAlpha(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorLum(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTHslColor.class)
-    public JAXBElement<CTGammaTransform> createCTHslColorGamma(CTGammaTransform value) {
-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTHslColor.class)
-    public JAXBElement<CTInverseGammaTransform> createCTHslColorInvGamma(CTInverseGammaTransform value) {
-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTHslColor.class)
-    public JAXBElement<CTPositivePercentage> createCTHslColorAlphaMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorRedOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTHslColor.class)
-    public JAXBElement<CTFixedPercentage> createCTHslColorAlphaOff(CTFixedPercentage value) {
-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorGreenOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTHslColor.class)
-    public JAXBElement<CTPositiveFixedAngle> createCTHslColorHue(CTPositiveFixedAngle value) {
-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorRedMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorSatOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorGreenMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorRed(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorSatMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorBlueMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTHslColor.class)
-    public JAXBElement<CTAngle> createCTHslColorHueOff(CTAngle value) {
-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTHslColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorShade(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorLumMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTHslColor.class)
-    public JAXBElement<CTInverseTransform> createCTHslColorInv(CTInverseTransform value) {
-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorLumOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTHslColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorTint(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorGreen(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTHslColor.class)
-    public JAXBElement<CTComplementTransform> createCTHslColorComp(CTComplementTransform value) {
-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTHslColor.class)
-    public JAXBElement<CTPercentage> createCTHslColorBlueOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTHslColor.class)
-    public JAXBElement<CTPositivePercentage> createCTHslColorHueMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTHslColor.class)
-    public JAXBElement<CTGrayscaleTransform> createCTHslColorGray(CTGrayscaleTransform value) {
-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTHslColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTPresetColor.class)
-    public JAXBElement<CTGammaTransform> createCTPresetColorGamma(CTGammaTransform value) {
-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTPresetColor.class)
-    public JAXBElement<CTInverseGammaTransform> createCTPresetColorInvGamma(CTInverseGammaTransform value) {
-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)
-    public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTPresetColor.class)
-    public JAXBElement<CTFixedPercentage> createCTPresetColorAlphaOff(CTFixedPercentage value) {
-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorGreenOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTPresetColor.class)
-    public JAXBElement<CTPositiveFixedAngle> createCTPresetColorHue(CTPositiveFixedAngle value) {
-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorRedMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorSatOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorGreenMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorRed(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorSatMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorBlueMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTPresetColor.class)
-    public JAXBElement<CTAngle> createCTPresetColorHueOff(CTAngle value) {
-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTPresetColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorShade(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorLumMod(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTPresetColor.class)
-    public JAXBElement<CTInverseTransform> createCTPresetColorInv(CTInverseTransform value) {
-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorLumOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTPresetColor.class)
-    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorTint(CTPositiveFixedPercentage value) {
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorGreen(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTPresetColor.class)
-    public JAXBElement<CTComplementTransform> createCTPresetColorComp(CTComplementTransform value) {
-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTPresetColor.class)
-    public JAXBElement<CTPercentage> createCTPresetColorBlueOff(CTPercentage value) {
-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTPresetColor.class)
-    public JAXBElement<CTPositivePercentage> createCTPresetColorHueMod(CTPositivePercentage value) {
-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTPresetColor.class)
-    public JAXBElement<CTGrayscaleTransform> createCTPresetColorGray(CTGrayscaleTransform value) {
-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTPresetColor.class, value);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java b/trunk/src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java
deleted file mode 100644
index 27262d6..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_BlackWhiteMode.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_BlackWhiteMode">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="clr"/>
- *     &lt;enumeration value="auto"/>
- *     &lt;enumeration value="gray"/>
- *     &lt;enumeration value="ltGray"/>
- *     &lt;enumeration value="invGray"/>
- *     &lt;enumeration value="grayWhite"/>
- *     &lt;enumeration value="blackGray"/>
- *     &lt;enumeration value="blackWhite"/>
- *     &lt;enumeration value="black"/>
- *     &lt;enumeration value="white"/>
- *     &lt;enumeration value="hidden"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "ST_BlackWhiteMode", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-@XmlEnum
-public enum STBlackWhiteMode {
-
-
-    /**
-     * Color
-     * 
-     */
-    @XmlEnumValue("clr")
-    CLR("clr"),
-
-    /**
-     * Automatic
-     * 
-     */
-    @XmlEnumValue("auto")
-    AUTO("auto"),
-
-    /**
-     * Gray
-     * 
-     */
-    @XmlEnumValue("gray")
-    GRAY("gray"),
-
-    /**
-     * Light Gray
-     * 
-     */
-    @XmlEnumValue("ltGray")
-    LT_GRAY("ltGray"),
-
-    /**
-     * Inverse Gray
-     * 
-     */
-    @XmlEnumValue("invGray")
-    INV_GRAY("invGray"),
-
-    /**
-     * Gray and White
-     * 
-     */
-    @XmlEnumValue("grayWhite")
-    GRAY_WHITE("grayWhite"),
-
-    /**
-     * Black and Gray
-     * 
-     */
-    @XmlEnumValue("blackGray")
-    BLACK_GRAY("blackGray"),
-
-    /**
-     * Black and White
-     * 
-     */
-    @XmlEnumValue("blackWhite")
-    BLACK_WHITE("blackWhite"),
-
-    /**
-     * Black
-     * 
-     */
-    @XmlEnumValue("black")
-    BLACK("black"),
-
-    /**
-     * White
-     * 
-     */
-    @XmlEnumValue("white")
-    WHITE("white"),
-
-    /**
-     * Hidden
-     * 
-     */
-    @XmlEnumValue("hidden")
-    HIDDEN("hidden");
-    private final String value;
-
-    STBlackWhiteMode(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static STBlackWhiteMode fromValue(String v) {
-        for (STBlackWhiteMode c: STBlackWhiteMode.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java b/trunk/src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java
deleted file mode 100644
index 8a26458..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_PathFillMode.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_PathFillMode">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="none"/>
- *     &lt;enumeration value="norm"/>
- *     &lt;enumeration value="lighten"/>
- *     &lt;enumeration value="lightenLess"/>
- *     &lt;enumeration value="darken"/>
- *     &lt;enumeration value="darkenLess"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "ST_PathFillMode", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-@XmlEnum
-public enum STPathFillMode {
-
-
-    /**
-     * No Path Fill
-     * 
-     */
-    @XmlEnumValue("none")
-    NONE("none"),
-
-    /**
-     * Normal Path Fill
-     * 
-     */
-    @XmlEnumValue("norm")
-    NORM("norm"),
-
-    /**
-     * Lighten Path Fill
-     * 
-     */
-    @XmlEnumValue("lighten")
-    LIGHTEN("lighten"),
-
-    /**
-     * Lighten Path Fill Less
-     * 
-     */
-    @XmlEnumValue("lightenLess")
-    LIGHTEN_LESS("lightenLess"),
-
-    /**
-     * Darken Path Fill
-     * 
-     */
-    @XmlEnumValue("darken")
-    DARKEN("darken"),
-
-    /**
-     * Darken Path Fill Less
-     * 
-     */
-    @XmlEnumValue("darkenLess")
-    DARKEN_LESS("darkenLess");
-    private final String value;
-
-    STPathFillMode(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static STPathFillMode fromValue(String v) {
-        for (STPathFillMode c: STPathFillMode.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java b/trunk/src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java
deleted file mode 100644
index 7450ac6..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java
+++ /dev/null
@@ -1,1181 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_PresetColorVal.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_PresetColorVal">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="aliceBlue"/>
- *     &lt;enumeration value="antiqueWhite"/>
- *     &lt;enumeration value="aqua"/>
- *     &lt;enumeration value="aquamarine"/>
- *     &lt;enumeration value="azure"/>
- *     &lt;enumeration value="beige"/>
- *     &lt;enumeration value="bisque"/>
- *     &lt;enumeration value="black"/>
- *     &lt;enumeration value="blanchedAlmond"/>
- *     &lt;enumeration value="blue"/>
- *     &lt;enumeration value="blueViolet"/>
- *     &lt;enumeration value="brown"/>
- *     &lt;enumeration value="burlyWood"/>
- *     &lt;enumeration value="cadetBlue"/>
- *     &lt;enumeration value="chartreuse"/>
- *     &lt;enumeration value="chocolate"/>
- *     &lt;enumeration value="coral"/>
- *     &lt;enumeration value="cornflowerBlue"/>
- *     &lt;enumeration value="cornsilk"/>
- *     &lt;enumeration value="crimson"/>
- *     &lt;enumeration value="cyan"/>
- *     &lt;enumeration value="dkBlue"/>
- *     &lt;enumeration value="dkCyan"/>
- *     &lt;enumeration value="dkGoldenrod"/>
- *     &lt;enumeration value="dkGray"/>
- *     &lt;enumeration value="dkGreen"/>
- *     &lt;enumeration value="dkKhaki"/>
- *     &lt;enumeration value="dkMagenta"/>
- *     &lt;enumeration value="dkOliveGreen"/>
- *     &lt;enumeration value="dkOrange"/>
- *     &lt;enumeration value="dkOrchid"/>
- *     &lt;enumeration value="dkRed"/>
- *     &lt;enumeration value="dkSalmon"/>
- *     &lt;enumeration value="dkSeaGreen"/>
- *     &lt;enumeration value="dkSlateBlue"/>
- *     &lt;enumeration value="dkSlateGray"/>
- *     &lt;enumeration value="dkTurquoise"/>
- *     &lt;enumeration value="dkViolet"/>
- *     &lt;enumeration value="deepPink"/>
- *     &lt;enumeration value="deepSkyBlue"/>
- *     &lt;enumeration value="dimGray"/>
- *     &lt;enumeration value="dodgerBlue"/>
- *     &lt;enumeration value="firebrick"/>
- *     &lt;enumeration value="floralWhite"/>
- *     &lt;enumeration value="forestGreen"/>
- *     &lt;enumeration value="fuchsia"/>
- *     &lt;enumeration value="gainsboro"/>
- *     &lt;enumeration value="ghostWhite"/>
- *     &lt;enumeration value="gold"/>
- *     &lt;enumeration value="goldenrod"/>
- *     &lt;enumeration value="gray"/>
- *     &lt;enumeration value="green"/>
- *     &lt;enumeration value="greenYellow"/>
- *     &lt;enumeration value="honeydew"/>
- *     &lt;enumeration value="hotPink"/>
- *     &lt;enumeration value="indianRed"/>
- *     &lt;enumeration value="indigo"/>
- *     &lt;enumeration value="ivory"/>
- *     &lt;enumeration value="khaki"/>
- *     &lt;enumeration value="lavender"/>
- *     &lt;enumeration value="lavenderBlush"/>
- *     &lt;enumeration value="lawnGreen"/>
- *     &lt;enumeration value="lemonChiffon"/>
- *     &lt;enumeration value="ltBlue"/>
- *     &lt;enumeration value="ltCoral"/>
- *     &lt;enumeration value="ltCyan"/>
- *     &lt;enumeration value="ltGoldenrodYellow"/>
- *     &lt;enumeration value="ltGray"/>
- *     &lt;enumeration value="ltGreen"/>
- *     &lt;enumeration value="ltPink"/>
- *     &lt;enumeration value="ltSalmon"/>
- *     &lt;enumeration value="ltSeaGreen"/>
- *     &lt;enumeration value="ltSkyBlue"/>
- *     &lt;enumeration value="ltSlateGray"/>
- *     &lt;enumeration value="ltSteelBlue"/>
- *     &lt;enumeration value="ltYellow"/>
- *     &lt;enumeration value="lime"/>
- *     &lt;enumeration value="limeGreen"/>
- *     &lt;enumeration value="linen"/>
- *     &lt;enumeration value="magenta"/>
- *     &lt;enumeration value="maroon"/>
- *     &lt;enumeration value="medAquamarine"/>
- *     &lt;enumeration value="medBlue"/>
- *     &lt;enumeration value="medOrchid"/>
- *     &lt;enumeration value="medPurple"/>
- *     &lt;enumeration value="medSeaGreen"/>
- *     &lt;enumeration value="medSlateBlue"/>
- *     &lt;enumeration value="medSpringGreen"/>
- *     &lt;enumeration value="medTurquoise"/>
- *     &lt;enumeration value="medVioletRed"/>
- *     &lt;enumeration value="midnightBlue"/>
- *     &lt;enumeration value="mintCream"/>
- *     &lt;enumeration value="mistyRose"/>
- *     &lt;enumeration value="moccasin"/>
- *     &lt;enumeration value="navajoWhite"/>
- *     &lt;enumeration value="navy"/>
- *     &lt;enumeration value="oldLace"/>
- *     &lt;enumeration value="olive"/>
- *     &lt;enumeration value="oliveDrab"/>
- *     &lt;enumeration value="orange"/>
- *     &lt;enumeration value="orangeRed"/>
- *     &lt;enumeration value="orchid"/>
- *     &lt;enumeration value="paleGoldenrod"/>
- *     &lt;enumeration value="paleGreen"/>
- *     &lt;enumeration value="paleTurquoise"/>
- *     &lt;enumeration value="paleVioletRed"/>
- *     &lt;enumeration value="papayaWhip"/>
- *     &lt;enumeration value="peachPuff"/>
- *     &lt;enumeration value="peru"/>
- *     &lt;enumeration value="pink"/>
- *     &lt;enumeration value="plum"/>
- *     &lt;enumeration value="powderBlue"/>
- *     &lt;enumeration value="purple"/>
- *     &lt;enumeration value="red"/>
- *     &lt;enumeration value="rosyBrown"/>
- *     &lt;enumeration value="royalBlue"/>
- *     &lt;enumeration value="saddleBrown"/>
- *     &lt;enumeration value="salmon"/>
- *     &lt;enumeration value="sandyBrown"/>
- *     &lt;enumeration value="seaGreen"/>
- *     &lt;enumeration value="seaShell"/>
- *     &lt;enumeration value="sienna"/>
- *     &lt;enumeration value="silver"/>
- *     &lt;enumeration value="skyBlue"/>
- *     &lt;enumeration value="slateBlue"/>
- *     &lt;enumeration value="slateGray"/>
- *     &lt;enumeration value="snow"/>
- *     &lt;enumeration value="springGreen"/>
- *     &lt;enumeration value="steelBlue"/>
- *     &lt;enumeration value="tan"/>
- *     &lt;enumeration value="teal"/>
- *     &lt;enumeration value="thistle"/>
- *     &lt;enumeration value="tomato"/>
- *     &lt;enumeration value="turquoise"/>
- *     &lt;enumeration value="violet"/>
- *     &lt;enumeration value="wheat"/>
- *     &lt;enumeration value="white"/>
- *     &lt;enumeration value="whiteSmoke"/>
- *     &lt;enumeration value="yellow"/>
- *     &lt;enumeration value="yellowGreen"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "ST_PresetColorVal", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-@XmlEnum
-public enum STPresetColorVal {
-
-
-    /**
-     * Alice Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("aliceBlue")
-    ALICE_BLUE("aliceBlue"),
-
-    /**
-     * Antique White Preset Color
-     * 
-     */
-    @XmlEnumValue("antiqueWhite")
-    ANTIQUE_WHITE("antiqueWhite"),
-
-    /**
-     * Aqua Preset Color
-     * 
-     */
-    @XmlEnumValue("aqua")
-    AQUA("aqua"),
-
-    /**
-     * Aquamarine Preset Color
-     * 
-     */
-    @XmlEnumValue("aquamarine")
-    AQUAMARINE("aquamarine"),
-
-    /**
-     * Azure Preset Color
-     * 
-     */
-    @XmlEnumValue("azure")
-    AZURE("azure"),
-
-    /**
-     * Beige Preset Color
-     * 
-     */
-    @XmlEnumValue("beige")
-    BEIGE("beige"),
-
-    /**
-     * Bisque Preset Color
-     * 
-     */
-    @XmlEnumValue("bisque")
-    BISQUE("bisque"),
-
-    /**
-     * Black Preset Color
-     * 
-     */
-    @XmlEnumValue("black")
-    BLACK("black"),
-
-    /**
-     * Blanched Almond Preset Color
-     * 
-     */
-    @XmlEnumValue("blanchedAlmond")
-    BLANCHED_ALMOND("blanchedAlmond"),
-
-    /**
-     * Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("blue")
-    BLUE("blue"),
-
-    /**
-     * Blue Violet Preset Color
-     * 
-     */
-    @XmlEnumValue("blueViolet")
-    BLUE_VIOLET("blueViolet"),
-
-    /**
-     * Brown Preset Color
-     * 
-     */
-    @XmlEnumValue("brown")
-    BROWN("brown"),
-
-    /**
-     * Burly Wood Preset Color
-     * 
-     */
-    @XmlEnumValue("burlyWood")
-    BURLY_WOOD("burlyWood"),
-
-    /**
-     * Cadet Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("cadetBlue")
-    CADET_BLUE("cadetBlue"),
-
-    /**
-     * Chartreuse Preset Color
-     * 
-     */
-    @XmlEnumValue("chartreuse")
-    CHARTREUSE("chartreuse"),
-
-    /**
-     * Chocolate Preset Color
-     * 
-     */
-    @XmlEnumValue("chocolate")
-    CHOCOLATE("chocolate"),
-
-    /**
-     * Coral Preset Color
-     * 
-     */
-    @XmlEnumValue("coral")
-    CORAL("coral"),
-
-    /**
-     * Cornflower Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("cornflowerBlue")
-    CORNFLOWER_BLUE("cornflowerBlue"),
-
-    /**
-     * Cornsilk Preset Color
-     * 
-     */
-    @XmlEnumValue("cornsilk")
-    CORNSILK("cornsilk"),
-
-    /**
-     * Crimson Preset Color
-     * 
-     */
-    @XmlEnumValue("crimson")
-    CRIMSON("crimson"),
-
-    /**
-     * Cyan Preset Color
-     * 
-     */
-    @XmlEnumValue("cyan")
-    CYAN("cyan"),
-
-    /**
-     * Dark Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("dkBlue")
-    DK_BLUE("dkBlue"),
-
-    /**
-     * Dark Cyan Preset Color
-     * 
-     */
-    @XmlEnumValue("dkCyan")
-    DK_CYAN("dkCyan"),
-
-    /**
-     * Dark Goldenrod Preset Color
-     * 
-     */
-    @XmlEnumValue("dkGoldenrod")
-    DK_GOLDENROD("dkGoldenrod"),
-
-    /**
-     * Dark Gray Preset Color
-     * 
-     */
-    @XmlEnumValue("dkGray")
-    DK_GRAY("dkGray"),
-
-    /**
-     * Dark Green Preset Color
-     * 
-     */
-    @XmlEnumValue("dkGreen")
-    DK_GREEN("dkGreen"),
-
-    /**
-     * Dark Khaki Preset Color
-     * 
-     */
-    @XmlEnumValue("dkKhaki")
-    DK_KHAKI("dkKhaki"),
-
-    /**
-     * Dark Magenta Preset Color
-     * 
-     */
-    @XmlEnumValue("dkMagenta")
-    DK_MAGENTA("dkMagenta"),
-
-    /**
-     * Dark Olive Green Preset Color
-     * 
-     */
-    @XmlEnumValue("dkOliveGreen")
-    DK_OLIVE_GREEN("dkOliveGreen"),
-
-    /**
-     * Dark Orange Preset Color
-     * 
-     */
-    @XmlEnumValue("dkOrange")
-    DK_ORANGE("dkOrange"),
-
-    /**
-     * Dark Orchid Preset Color
-     * 
-     */
-    @XmlEnumValue("dkOrchid")
-    DK_ORCHID("dkOrchid"),
-
-    /**
-     * Dark Red Preset Color
-     * 
-     */
-    @XmlEnumValue("dkRed")
-    DK_RED("dkRed"),
-
-    /**
-     * Dark Salmon Preset Color
-     * 
-     */
-    @XmlEnumValue("dkSalmon")
-    DK_SALMON("dkSalmon"),
-
-    /**
-     * Dark Sea Green Preset Color
-     * 
-     */
-    @XmlEnumValue("dkSeaGreen")
-    DK_SEA_GREEN("dkSeaGreen"),
-
-    /**
-     * Dark Slate Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("dkSlateBlue")
-    DK_SLATE_BLUE("dkSlateBlue"),
-
-    /**
-     * Dark Slate Gray Preset Color
-     * 
-     */
-    @XmlEnumValue("dkSlateGray")
-    DK_SLATE_GRAY("dkSlateGray"),
-
-    /**
-     * Dark Turquoise Preset Color
-     * 
-     */
-    @XmlEnumValue("dkTurquoise")
-    DK_TURQUOISE("dkTurquoise"),
-
-    /**
-     * Dark Violet Preset Color
-     * 
-     */
-    @XmlEnumValue("dkViolet")
-    DK_VIOLET("dkViolet"),
-
-    /**
-     * Deep Pink Preset Color
-     * 
-     */
-    @XmlEnumValue("deepPink")
-    DEEP_PINK("deepPink"),
-
-    /**
-     * Deep Sky Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("deepSkyBlue")
-    DEEP_SKY_BLUE("deepSkyBlue"),
-
-    /**
-     * Dim Gray Preset Color
-     * 
-     */
-    @XmlEnumValue("dimGray")
-    DIM_GRAY("dimGray"),
-
-    /**
-     * Dodger Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("dodgerBlue")
-    DODGER_BLUE("dodgerBlue"),
-
-    /**
-     * Firebrick Preset Color
-     * 
-     */
-    @XmlEnumValue("firebrick")
-    FIREBRICK("firebrick"),
-
-    /**
-     * Floral White Preset Color
-     * 
-     */
-    @XmlEnumValue("floralWhite")
-    FLORAL_WHITE("floralWhite"),
-
-    /**
-     * Forest Green Preset Color
-     * 
-     */
-    @XmlEnumValue("forestGreen")
-    FOREST_GREEN("forestGreen"),
-
-    /**
-     * Fuchsia Preset Color
-     * 
-     */
-    @XmlEnumValue("fuchsia")
-    FUCHSIA("fuchsia"),
-
-    /**
-     * Gainsboro Preset Color
-     * 
-     */
-    @XmlEnumValue("gainsboro")
-    GAINSBORO("gainsboro"),
-
-    /**
-     * Ghost White Preset Color
-     * 
-     */
-    @XmlEnumValue("ghostWhite")
-    GHOST_WHITE("ghostWhite"),
-
-    /**
-     * Gold Preset Color
-     * 
-     */
-    @XmlEnumValue("gold")
-    GOLD("gold"),
-
-    /**
-     * Goldenrod Preset Color
-     * 
-     */
-    @XmlEnumValue("goldenrod")
-    GOLDENROD("goldenrod"),
-
-    /**
-     * Gray Preset Color
-     * 
-     */
-    @XmlEnumValue("gray")
-    GRAY("gray"),
-
-    /**
-     * Green Preset Color
-     * 
-     */
-    @XmlEnumValue("green")
-    GREEN("green"),
-
-    /**
-     * Green Yellow Preset Color
-     * 
-     */
-    @XmlEnumValue("greenYellow")
-    GREEN_YELLOW("greenYellow"),
-
-    /**
-     * Honeydew Preset Color
-     * 
-     */
-    @XmlEnumValue("honeydew")
-    HONEYDEW("honeydew"),
-
-    /**
-     * Hot Pink Preset Color
-     * 
-     */
-    @XmlEnumValue("hotPink")
-    HOT_PINK("hotPink"),
-
-    /**
-     * Indian Red Preset Color
-     * 
-     */
-    @XmlEnumValue("indianRed")
-    INDIAN_RED("indianRed"),
-
-    /**
-     * Indigo Preset Color
-     * 
-     */
-    @XmlEnumValue("indigo")
-    INDIGO("indigo"),
-
-    /**
-     * Ivory Preset Color
-     * 
-     */
-    @XmlEnumValue("ivory")
-    IVORY("ivory"),
-
-    /**
-     * Khaki Preset Color
-     * 
-     */
-    @XmlEnumValue("khaki")
-    KHAKI("khaki"),
-
-    /**
-     * Lavender Preset Color
-     * 
-     */
-    @XmlEnumValue("lavender")
-    LAVENDER("lavender"),
-
-    /**
-     * Lavender Blush Preset Color
-     * 
-     */
-    @XmlEnumValue("lavenderBlush")
-    LAVENDER_BLUSH("lavenderBlush"),
-
-    /**
-     * Lawn Green Preset Color
-     * 
-     */
-    @XmlEnumValue("lawnGreen")
-    LAWN_GREEN("lawnGreen"),
-
-    /**
-     * Lemon Chiffon Preset Color
-     * 
-     */
-    @XmlEnumValue("lemonChiffon")
-    LEMON_CHIFFON("lemonChiffon"),
-
-    /**
-     * Light Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("ltBlue")
-    LT_BLUE("ltBlue"),
-
-    /**
-     * Light Coral Preset Color
-     * 
-     */
-    @XmlEnumValue("ltCoral")
-    LT_CORAL("ltCoral"),
-
-    /**
-     * Light Cyan Preset Color
-     * 
-     */
-    @XmlEnumValue("ltCyan")
-    LT_CYAN("ltCyan"),
-
-    /**
-     * Light Goldenrod Yellow Preset Color
-     * 
-     */
-    @XmlEnumValue("ltGoldenrodYellow")
-    LT_GOLDENROD_YELLOW("ltGoldenrodYellow"),
-
-    /**
-     * Light Gray Preset Color
-     * 
-     */
-    @XmlEnumValue("ltGray")
-    LT_GRAY("ltGray"),
-
-    /**
-     * Light Green Preset Color
-     * 
-     */
-    @XmlEnumValue("ltGreen")
-    LT_GREEN("ltGreen"),
-
-    /**
-     * Light Pink Preset Color
-     * 
-     */
-    @XmlEnumValue("ltPink")
-    LT_PINK("ltPink"),
-
-    /**
-     * Light Salmon Preset Color
-     * 
-     */
-    @XmlEnumValue("ltSalmon")
-    LT_SALMON("ltSalmon"),
-
-    /**
-     * Light Sea Green Preset Color
-     * 
-     */
-    @XmlEnumValue("ltSeaGreen")
-    LT_SEA_GREEN("ltSeaGreen"),
-
-    /**
-     * Light Sky Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("ltSkyBlue")
-    LT_SKY_BLUE("ltSkyBlue"),
-
-    /**
-     * Light Slate Gray Preset Color
-     * 
-     */
-    @XmlEnumValue("ltSlateGray")
-    LT_SLATE_GRAY("ltSlateGray"),
-
-    /**
-     * Light Steel Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("ltSteelBlue")
-    LT_STEEL_BLUE("ltSteelBlue"),
-
-    /**
-     * Light Yellow Preset Color
-     * 
-     */
-    @XmlEnumValue("ltYellow")
-    LT_YELLOW("ltYellow"),
-
-    /**
-     * Lime Preset Color
-     * 
-     */
-    @XmlEnumValue("lime")
-    LIME("lime"),
-
-    /**
-     * Lime Green Preset Color
-     * 
-     */
-    @XmlEnumValue("limeGreen")
-    LIME_GREEN("limeGreen"),
-
-    /**
-     * Linen Preset Color
-     * 
-     */
-    @XmlEnumValue("linen")
-    LINEN("linen"),
-
-    /**
-     * Magenta Preset Color
-     * 
-     */
-    @XmlEnumValue("magenta")
-    MAGENTA("magenta"),
-
-    /**
-     * Maroon Preset Color
-     * 
-     */
-    @XmlEnumValue("maroon")
-    MAROON("maroon"),
-
-    /**
-     * Medium Aquamarine Preset Color
-     * 
-     */
-    @XmlEnumValue("medAquamarine")
-    MED_AQUAMARINE("medAquamarine"),
-
-    /**
-     * Medium Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("medBlue")
-    MED_BLUE("medBlue"),
-
-    /**
-     * Medium Orchid Preset Color
-     * 
-     */
-    @XmlEnumValue("medOrchid")
-    MED_ORCHID("medOrchid"),
-
-    /**
-     * Medium Purple Preset Color
-     * 
-     */
-    @XmlEnumValue("medPurple")
-    MED_PURPLE("medPurple"),
-
-    /**
-     * Medium Sea Green Preset Color
-     * 
-     */
-    @XmlEnumValue("medSeaGreen")
-    MED_SEA_GREEN("medSeaGreen"),
-
-    /**
-     * Medium Slate Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("medSlateBlue")
-    MED_SLATE_BLUE("medSlateBlue"),
-
-    /**
-     * Medium Spring Green Preset Color
-     * 
-     */
-    @XmlEnumValue("medSpringGreen")
-    MED_SPRING_GREEN("medSpringGreen"),
-
-    /**
-     * Medium Turquoise Preset Color
-     * 
-     */
-    @XmlEnumValue("medTurquoise")
-    MED_TURQUOISE("medTurquoise"),
-
-    /**
-     * Medium Violet Red Preset Color
-     * 
-     */
-    @XmlEnumValue("medVioletRed")
-    MED_VIOLET_RED("medVioletRed"),
-
-    /**
-     * Midnight Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("midnightBlue")
-    MIDNIGHT_BLUE("midnightBlue"),
-
-    /**
-     * Mint Cream Preset Color
-     * 
-     */
-    @XmlEnumValue("mintCream")
-    MINT_CREAM("mintCream"),
-
-    /**
-     * Misty Rose Preset Color
-     * 
-     */
-    @XmlEnumValue("mistyRose")
-    MISTY_ROSE("mistyRose"),
-
-    /**
-     * Moccasin Preset Color
-     * 
-     */
-    @XmlEnumValue("moccasin")
-    MOCCASIN("moccasin"),
-
-    /**
-     * Navajo White Preset Color
-     * 
-     */
-    @XmlEnumValue("navajoWhite")
-    NAVAJO_WHITE("navajoWhite"),
-
-    /**
-     * Navy Preset Color
-     * 
-     */
-    @XmlEnumValue("navy")
-    NAVY("navy"),
-
-    /**
-     * Old Lace Preset Color
-     * 
-     */
-    @XmlEnumValue("oldLace")
-    OLD_LACE("oldLace"),
-
-    /**
-     * Olive Preset Color
-     * 
-     */
-    @XmlEnumValue("olive")
-    OLIVE("olive"),
-
-    /**
-     * Olive Drab Preset Color
-     * 
-     */
-    @XmlEnumValue("oliveDrab")
-    OLIVE_DRAB("oliveDrab"),
-
-    /**
-     * Orange Preset Color
-     * 
-     */
-    @XmlEnumValue("orange")
-    ORANGE("orange"),
-
-    /**
-     * Orange Red Preset Color
-     * 
-     */
-    @XmlEnumValue("orangeRed")
-    ORANGE_RED("orangeRed"),
-
-    /**
-     * Orchid Preset Color
-     * 
-     */
-    @XmlEnumValue("orchid")
-    ORCHID("orchid"),
-
-    /**
-     * Pale Goldenrod Preset Color
-     * 
-     */
-    @XmlEnumValue("paleGoldenrod")
-    PALE_GOLDENROD("paleGoldenrod"),
-
-    /**
-     * Pale Green Preset Color
-     * 
-     */
-    @XmlEnumValue("paleGreen")
-    PALE_GREEN("paleGreen"),
-
-    /**
-     * Pale Turquoise Preset Color
-     * 
-     */
-    @XmlEnumValue("paleTurquoise")
-    PALE_TURQUOISE("paleTurquoise"),
-
-    /**
-     * Pale Violet Red Preset Color
-     * 
-     */
-    @XmlEnumValue("paleVioletRed")
-    PALE_VIOLET_RED("paleVioletRed"),
-
-    /**
-     * Papaya Whip Preset Color
-     * 
-     */
-    @XmlEnumValue("papayaWhip")
-    PAPAYA_WHIP("papayaWhip"),
-
-    /**
-     * Peach Puff Preset Color
-     * 
-     */
-    @XmlEnumValue("peachPuff")
-    PEACH_PUFF("peachPuff"),
-
-    /**
-     * Peru Preset Color
-     * 
-     */
-    @XmlEnumValue("peru")
-    PERU("peru"),
-
-    /**
-     * Pink Preset Color
-     * 
-     */
-    @XmlEnumValue("pink")
-    PINK("pink"),
-
-    /**
-     * Plum Preset Color
-     * 
-     */
-    @XmlEnumValue("plum")
-    PLUM("plum"),
-
-    /**
-     * Powder Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("powderBlue")
-    POWDER_BLUE("powderBlue"),
-
-    /**
-     * Purple Preset Color
-     * 
-     */
-    @XmlEnumValue("purple")
-    PURPLE("purple"),
-
-    /**
-     * Red Preset Color
-     * 
-     */
-    @XmlEnumValue("red")
-    RED("red"),
-
-    /**
-     * Rosy Brown Preset Color
-     * 
-     */
-    @XmlEnumValue("rosyBrown")
-    ROSY_BROWN("rosyBrown"),
-
-    /**
-     * Royal Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("royalBlue")
-    ROYAL_BLUE("royalBlue"),
-
-    /**
-     * Saddle Brown Preset Color
-     * 
-     */
-    @XmlEnumValue("saddleBrown")
-    SADDLE_BROWN("saddleBrown"),
-
-    /**
-     * Salmon Preset Color
-     * 
-     */
-    @XmlEnumValue("salmon")
-    SALMON("salmon"),
-
-    /**
-     * Sandy Brown Preset Color
-     * 
-     */
-    @XmlEnumValue("sandyBrown")
-    SANDY_BROWN("sandyBrown"),
-
-    /**
-     * Sea Green Preset Color
-     * 
-     */
-    @XmlEnumValue("seaGreen")
-    SEA_GREEN("seaGreen"),
-
-    /**
-     * Sea Shell Preset Color
-     * 
-     */
-    @XmlEnumValue("seaShell")
-    SEA_SHELL("seaShell"),
-
-    /**
-     * Sienna Preset Color
-     * 
-     */
-    @XmlEnumValue("sienna")
-    SIENNA("sienna"),
-
-    /**
-     * Silver Preset Color
-     * 
-     */
-    @XmlEnumValue("silver")
-    SILVER("silver"),
-
-    /**
-     * Sky Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("skyBlue")
-    SKY_BLUE("skyBlue"),
-
-    /**
-     * Slate Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("slateBlue")
-    SLATE_BLUE("slateBlue"),
-
-    /**
-     * Slate Gray Preset Color
-     * 
-     */
-    @XmlEnumValue("slateGray")
-    SLATE_GRAY("slateGray"),
-
-    /**
-     * Snow Preset Color
-     * 
-     */
-    @XmlEnumValue("snow")
-    SNOW("snow"),
-
-    /**
-     * Spring Green Preset Color
-     * 
-     */
-    @XmlEnumValue("springGreen")
-    SPRING_GREEN("springGreen"),
-
-    /**
-     * Steel Blue Preset Color
-     * 
-     */
-    @XmlEnumValue("steelBlue")
-    STEEL_BLUE("steelBlue"),
-
-    /**
-     * Tan Preset Color
-     * 
-     */
-    @XmlEnumValue("tan")
-    TAN("tan"),
-
-    /**
-     * Teal Preset Color
-     * 
-     */
-    @XmlEnumValue("teal")
-    TEAL("teal"),
-
-    /**
-     * Thistle Preset Color
-     * 
-     */
-    @XmlEnumValue("thistle")
-    THISTLE("thistle"),
-
-    /**
-     * Tomato Preset Color
-     * 
-     */
-    @XmlEnumValue("tomato")
-    TOMATO("tomato"),
-
-    /**
-     * Turquoise Preset Color
-     * 
-     */
-    @XmlEnumValue("turquoise")
-    TURQUOISE("turquoise"),
-
-    /**
-     * Violet Preset Color
-     * 
-     */
-    @XmlEnumValue("violet")
-    VIOLET("violet"),
-
-    /**
-     * Wheat Preset Color
-     * 
-     */
-    @XmlEnumValue("wheat")
-    WHEAT("wheat"),
-
-    /**
-     * White Preset Color
-     * 
-     */
-    @XmlEnumValue("white")
-    WHITE("white"),
-
-    /**
-     * White Smoke Preset Color
-     * 
-     */
-    @XmlEnumValue("whiteSmoke")
-    WHITE_SMOKE("whiteSmoke"),
-
-    /**
-     * Yellow Preset Color
-     * 
-     */
-    @XmlEnumValue("yellow")
-    YELLOW("yellow"),
-
-    /**
-     * Yellow Green Preset Color
-     * 
-     */
-    @XmlEnumValue("yellowGreen")
-    YELLOW_GREEN("yellowGreen");
-    private final String value;
-
-    STPresetColorVal(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static STPresetColorVal fromValue(String v) {
-        for (STPresetColorVal c: STPresetColorVal.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java b/trunk/src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java
deleted file mode 100644
index 688a166..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_RectAlignment.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_RectAlignment">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="tl"/>
- *     &lt;enumeration value="t"/>
- *     &lt;enumeration value="tr"/>
- *     &lt;enumeration value="l"/>
- *     &lt;enumeration value="ctr"/>
- *     &lt;enumeration value="r"/>
- *     &lt;enumeration value="bl"/>
- *     &lt;enumeration value="b"/>
- *     &lt;enumeration value="br"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "ST_RectAlignment", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-@XmlEnum
-public enum STRectAlignment {
-
-
-    /**
-     * Rectangle Alignment Enum ( Top Left )
-     * 
-     */
-    @XmlEnumValue("tl")
-    TL("tl"),
-
-    /**
-     * Rectangle Alignment Enum ( Top )
-     * 
-     */
-    @XmlEnumValue("t")
-    T("t"),
-
-    /**
-     * Rectangle Alignment Enum ( Top Right )
-     * 
-     */
-    @XmlEnumValue("tr")
-    TR("tr"),
-
-    /**
-     * Rectangle Alignment Enum ( Left )
-     * 
-     */
-    @XmlEnumValue("l")
-    L("l"),
-
-    /**
-     * Rectangle Alignment Enum ( Center )
-     * 
-     */
-    @XmlEnumValue("ctr")
-    CTR("ctr"),
-
-    /**
-     * Rectangle Alignment Enum ( Right )
-     * 
-     */
-    @XmlEnumValue("r")
-    R("r"),
-
-    /**
-     * Rectangle Alignment Enum ( Bottom Left )
-     * 
-     */
-    @XmlEnumValue("bl")
-    BL("bl"),
-
-    /**
-     * Rectangle Alignment Enum ( Bottom )
-     * 
-     */
-    @XmlEnumValue("b")
-    B("b"),
-
-    /**
-     * Rectangle Alignment Enum ( Bottom Right )
-     * 
-     */
-    @XmlEnumValue("br")
-    BR("br");
-    private final String value;
-
-    STRectAlignment(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static STRectAlignment fromValue(String v) {
-        for (STRectAlignment c: STRectAlignment.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java b/trunk/src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java
deleted file mode 100644
index 84b8807..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_SchemeColorVal.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_SchemeColorVal">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="bg1"/>
- *     &lt;enumeration value="tx1"/>
- *     &lt;enumeration value="bg2"/>
- *     &lt;enumeration value="tx2"/>
- *     &lt;enumeration value="accent1"/>
- *     &lt;enumeration value="accent2"/>
- *     &lt;enumeration value="accent3"/>
- *     &lt;enumeration value="accent4"/>
- *     &lt;enumeration value="accent5"/>
- *     &lt;enumeration value="accent6"/>
- *     &lt;enumeration value="hlink"/>
- *     &lt;enumeration value="folHlink"/>
- *     &lt;enumeration value="phClr"/>
- *     &lt;enumeration value="dk1"/>
- *     &lt;enumeration value="lt1"/>
- *     &lt;enumeration value="dk2"/>
- *     &lt;enumeration value="lt2"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "ST_SchemeColorVal", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-@XmlEnum
-public enum STSchemeColorVal {
-
-
-    /**
-     * Background Color 1
-     * 
-     */
-    @XmlEnumValue("bg1")
-    BG_1("bg1"),
-
-    /**
-     * Text Color 1
-     * 
-     */
-    @XmlEnumValue("tx1")
-    TX_1("tx1"),
-
-    /**
-     * Background Color 2
-     * 
-     */
-    @XmlEnumValue("bg2")
-    BG_2("bg2"),
-
-    /**
-     * Text Color 2
-     * 
-     */
-    @XmlEnumValue("tx2")
-    TX_2("tx2"),
-
-    /**
-     * Accent Color 1
-     * 
-     */
-    @XmlEnumValue("accent1")
-    ACCENT_1("accent1"),
-
-    /**
-     * Accent Color 2
-     * 
-     */
-    @XmlEnumValue("accent2")
-    ACCENT_2("accent2"),
-
-    /**
-     * Accent Color 3
-     * 
-     */
-    @XmlEnumValue("accent3")
-    ACCENT_3("accent3"),
-
-    /**
-     * Accent Color 4
-     * 
-     */
-    @XmlEnumValue("accent4")
-    ACCENT_4("accent4"),
-
-    /**
-     * Accent Color 5
-     * 
-     */
-    @XmlEnumValue("accent5")
-    ACCENT_5("accent5"),
-
-    /**
-     * Accent Color 6
-     * 
-     */
-    @XmlEnumValue("accent6")
-    ACCENT_6("accent6"),
-
-    /**
-     * Hyperlink Color
-     * 
-     */
-    @XmlEnumValue("hlink")
-    HLINK("hlink"),
-
-    /**
-     * Followed Hyperlink Color
-     * 
-     */
-    @XmlEnumValue("folHlink")
-    FOL_HLINK("folHlink"),
-
-    /**
-     * Style Color
-     * 
-     */
-    @XmlEnumValue("phClr")
-    PH_CLR("phClr"),
-
-    /**
-     * Dark Color 1
-     * 
-     */
-    @XmlEnumValue("dk1")
-    DK_1("dk1"),
-
-    /**
-     * Light Color 1
-     * 
-     */
-    @XmlEnumValue("lt1")
-    LT_1("lt1"),
-
-    /**
-     * Dark Color 2
-     * 
-     */
-    @XmlEnumValue("dk2")
-    DK_2("dk2"),
-
-    /**
-     * Light Color 2
-     * 
-     */
-    @XmlEnumValue("lt2")
-    LT_2("lt2");
-    private final String value;
-
-    STSchemeColorVal(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static STSchemeColorVal fromValue(String v) {
-        for (STSchemeColorVal c: STSchemeColorVal.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/STShapeType.java b/trunk/src/java/org/apache/poi/sl/draw/binding/STShapeType.java
deleted file mode 100644
index 559b0a1..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/STShapeType.java
+++ /dev/null
@@ -1,1557 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_ShapeType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_ShapeType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="line"/>
- *     &lt;enumeration value="lineInv"/>
- *     &lt;enumeration value="triangle"/>
- *     &lt;enumeration value="rtTriangle"/>
- *     &lt;enumeration value="rect"/>
- *     &lt;enumeration value="diamond"/>
- *     &lt;enumeration value="parallelogram"/>
- *     &lt;enumeration value="trapezoid"/>
- *     &lt;enumeration value="nonIsoscelesTrapezoid"/>
- *     &lt;enumeration value="pentagon"/>
- *     &lt;enumeration value="hexagon"/>
- *     &lt;enumeration value="heptagon"/>
- *     &lt;enumeration value="octagon"/>
- *     &lt;enumeration value="decagon"/>
- *     &lt;enumeration value="dodecagon"/>
- *     &lt;enumeration value="star4"/>
- *     &lt;enumeration value="star5"/>
- *     &lt;enumeration value="star6"/>
- *     &lt;enumeration value="star7"/>
- *     &lt;enumeration value="star8"/>
- *     &lt;enumeration value="star10"/>
- *     &lt;enumeration value="star12"/>
- *     &lt;enumeration value="star16"/>
- *     &lt;enumeration value="star24"/>
- *     &lt;enumeration value="star32"/>
- *     &lt;enumeration value="roundRect"/>
- *     &lt;enumeration value="round1Rect"/>
- *     &lt;enumeration value="round2SameRect"/>
- *     &lt;enumeration value="round2DiagRect"/>
- *     &lt;enumeration value="snipRoundRect"/>
- *     &lt;enumeration value="snip1Rect"/>
- *     &lt;enumeration value="snip2SameRect"/>
- *     &lt;enumeration value="snip2DiagRect"/>
- *     &lt;enumeration value="plaque"/>
- *     &lt;enumeration value="ellipse"/>
- *     &lt;enumeration value="teardrop"/>
- *     &lt;enumeration value="homePlate"/>
- *     &lt;enumeration value="chevron"/>
- *     &lt;enumeration value="pieWedge"/>
- *     &lt;enumeration value="pie"/>
- *     &lt;enumeration value="blockArc"/>
- *     &lt;enumeration value="donut"/>
- *     &lt;enumeration value="noSmoking"/>
- *     &lt;enumeration value="rightArrow"/>
- *     &lt;enumeration value="leftArrow"/>
- *     &lt;enumeration value="upArrow"/>
- *     &lt;enumeration value="downArrow"/>
- *     &lt;enumeration value="stripedRightArrow"/>
- *     &lt;enumeration value="notchedRightArrow"/>
- *     &lt;enumeration value="bentUpArrow"/>
- *     &lt;enumeration value="leftRightArrow"/>
- *     &lt;enumeration value="upDownArrow"/>
- *     &lt;enumeration value="leftUpArrow"/>
- *     &lt;enumeration value="leftRightUpArrow"/>
- *     &lt;enumeration value="quadArrow"/>
- *     &lt;enumeration value="leftArrowCallout"/>
- *     &lt;enumeration value="rightArrowCallout"/>
- *     &lt;enumeration value="upArrowCallout"/>
- *     &lt;enumeration value="downArrowCallout"/>
- *     &lt;enumeration value="leftRightArrowCallout"/>
- *     &lt;enumeration value="upDownArrowCallout"/>
- *     &lt;enumeration value="quadArrowCallout"/>
- *     &lt;enumeration value="bentArrow"/>
- *     &lt;enumeration value="uturnArrow"/>
- *     &lt;enumeration value="circularArrow"/>
- *     &lt;enumeration value="leftCircularArrow"/>
- *     &lt;enumeration value="leftRightCircularArrow"/>
- *     &lt;enumeration value="curvedRightArrow"/>
- *     &lt;enumeration value="curvedLeftArrow"/>
- *     &lt;enumeration value="curvedUpArrow"/>
- *     &lt;enumeration value="curvedDownArrow"/>
- *     &lt;enumeration value="swooshArrow"/>
- *     &lt;enumeration value="cube"/>
- *     &lt;enumeration value="can"/>
- *     &lt;enumeration value="lightningBolt"/>
- *     &lt;enumeration value="heart"/>
- *     &lt;enumeration value="sun"/>
- *     &lt;enumeration value="moon"/>
- *     &lt;enumeration value="smileyFace"/>
- *     &lt;enumeration value="irregularSeal1"/>
- *     &lt;enumeration value="irregularSeal2"/>
- *     &lt;enumeration value="foldedCorner"/>
- *     &lt;enumeration value="bevel"/>
- *     &lt;enumeration value="frame"/>
- *     &lt;enumeration value="halfFrame"/>
- *     &lt;enumeration value="corner"/>
- *     &lt;enumeration value="diagStripe"/>
- *     &lt;enumeration value="chord"/>
- *     &lt;enumeration value="arc"/>
- *     &lt;enumeration value="leftBracket"/>
- *     &lt;enumeration value="rightBracket"/>
- *     &lt;enumeration value="leftBrace"/>
- *     &lt;enumeration value="rightBrace"/>
- *     &lt;enumeration value="bracketPair"/>
- *     &lt;enumeration value="bracePair"/>
- *     &lt;enumeration value="straightConnector1"/>
- *     &lt;enumeration value="bentConnector2"/>
- *     &lt;enumeration value="bentConnector3"/>
- *     &lt;enumeration value="bentConnector4"/>
- *     &lt;enumeration value="bentConnector5"/>
- *     &lt;enumeration value="curvedConnector2"/>
- *     &lt;enumeration value="curvedConnector3"/>
- *     &lt;enumeration value="curvedConnector4"/>
- *     &lt;enumeration value="curvedConnector5"/>
- *     &lt;enumeration value="callout1"/>
- *     &lt;enumeration value="callout2"/>
- *     &lt;enumeration value="callout3"/>
- *     &lt;enumeration value="accentCallout1"/>
- *     &lt;enumeration value="accentCallout2"/>
- *     &lt;enumeration value="accentCallout3"/>
- *     &lt;enumeration value="borderCallout1"/>
- *     &lt;enumeration value="borderCallout2"/>
- *     &lt;enumeration value="borderCallout3"/>
- *     &lt;enumeration value="accentBorderCallout1"/>
- *     &lt;enumeration value="accentBorderCallout2"/>
- *     &lt;enumeration value="accentBorderCallout3"/>
- *     &lt;enumeration value="wedgeRectCallout"/>
- *     &lt;enumeration value="wedgeRoundRectCallout"/>
- *     &lt;enumeration value="wedgeEllipseCallout"/>
- *     &lt;enumeration value="cloudCallout"/>
- *     &lt;enumeration value="cloud"/>
- *     &lt;enumeration value="ribbon"/>
- *     &lt;enumeration value="ribbon2"/>
- *     &lt;enumeration value="ellipseRibbon"/>
- *     &lt;enumeration value="ellipseRibbon2"/>
- *     &lt;enumeration value="leftRightRibbon"/>
- *     &lt;enumeration value="verticalScroll"/>
- *     &lt;enumeration value="horizontalScroll"/>
- *     &lt;enumeration value="wave"/>
- *     &lt;enumeration value="doubleWave"/>
- *     &lt;enumeration value="plus"/>
- *     &lt;enumeration value="flowChartProcess"/>
- *     &lt;enumeration value="flowChartDecision"/>
- *     &lt;enumeration value="flowChartInputOutput"/>
- *     &lt;enumeration value="flowChartPredefinedProcess"/>
- *     &lt;enumeration value="flowChartInternalStorage"/>
- *     &lt;enumeration value="flowChartDocument"/>
- *     &lt;enumeration value="flowChartMultidocument"/>
- *     &lt;enumeration value="flowChartTerminator"/>
- *     &lt;enumeration value="flowChartPreparation"/>
- *     &lt;enumeration value="flowChartManualInput"/>
- *     &lt;enumeration value="flowChartManualOperation"/>
- *     &lt;enumeration value="flowChartConnector"/>
- *     &lt;enumeration value="flowChartPunchedCard"/>
- *     &lt;enumeration value="flowChartPunchedTape"/>
- *     &lt;enumeration value="flowChartSummingJunction"/>
- *     &lt;enumeration value="flowChartOr"/>
- *     &lt;enumeration value="flowChartCollate"/>
- *     &lt;enumeration value="flowChartSort"/>
- *     &lt;enumeration value="flowChartExtract"/>
- *     &lt;enumeration value="flowChartMerge"/>
- *     &lt;enumeration value="flowChartOfflineStorage"/>
- *     &lt;enumeration value="flowChartOnlineStorage"/>
- *     &lt;enumeration value="flowChartMagneticTape"/>
- *     &lt;enumeration value="flowChartMagneticDisk"/>
- *     &lt;enumeration value="flowChartMagneticDrum"/>
- *     &lt;enumeration value="flowChartDisplay"/>
- *     &lt;enumeration value="flowChartDelay"/>
- *     &lt;enumeration value="flowChartAlternateProcess"/>
- *     &lt;enumeration value="flowChartOffpageConnector"/>
- *     &lt;enumeration value="actionButtonBlank"/>
- *     &lt;enumeration value="actionButtonHome"/>
- *     &lt;enumeration value="actionButtonHelp"/>
- *     &lt;enumeration value="actionButtonInformation"/>
- *     &lt;enumeration value="actionButtonForwardNext"/>
- *     &lt;enumeration value="actionButtonBackPrevious"/>
- *     &lt;enumeration value="actionButtonEnd"/>
- *     &lt;enumeration value="actionButtonBeginning"/>
- *     &lt;enumeration value="actionButtonReturn"/>
- *     &lt;enumeration value="actionButtonDocument"/>
- *     &lt;enumeration value="actionButtonSound"/>
- *     &lt;enumeration value="actionButtonMovie"/>
- *     &lt;enumeration value="gear6"/>
- *     &lt;enumeration value="gear9"/>
- *     &lt;enumeration value="funnel"/>
- *     &lt;enumeration value="mathPlus"/>
- *     &lt;enumeration value="mathMinus"/>
- *     &lt;enumeration value="mathMultiply"/>
- *     &lt;enumeration value="mathDivide"/>
- *     &lt;enumeration value="mathEqual"/>
- *     &lt;enumeration value="mathNotEqual"/>
- *     &lt;enumeration value="cornerTabs"/>
- *     &lt;enumeration value="squareTabs"/>
- *     &lt;enumeration value="plaqueTabs"/>
- *     &lt;enumeration value="chartX"/>
- *     &lt;enumeration value="chartStar"/>
- *     &lt;enumeration value="chartPlus"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "ST_ShapeType", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-@XmlEnum
-public enum STShapeType {
-
-
-    /**
-     * Line Shape
-     * 
-     */
-    @XmlEnumValue("line")
-    LINE("line"),
-
-    /**
-     * Line Inverse Shape
-     * 
-     */
-    @XmlEnumValue("lineInv")
-    LINE_INV("lineInv"),
-
-    /**
-     * Triangle Shape
-     * 
-     */
-    @XmlEnumValue("triangle")
-    TRIANGLE("triangle"),
-
-    /**
-     * Right Triangle Shape
-     * 
-     */
-    @XmlEnumValue("rtTriangle")
-    RT_TRIANGLE("rtTriangle"),
-
-    /**
-     * Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("rect")
-    RECT("rect"),
-
-    /**
-     * Diamond Shape
-     * 
-     */
-    @XmlEnumValue("diamond")
-    DIAMOND("diamond"),
-
-    /**
-     * Parallelogram Shape
-     * 
-     */
-    @XmlEnumValue("parallelogram")
-    PARALLELOGRAM("parallelogram"),
-
-    /**
-     * Trapezoid Shape
-     * 
-     */
-    @XmlEnumValue("trapezoid")
-    TRAPEZOID("trapezoid"),
-
-    /**
-     * Non-Isosceles Trapezoid Shape
-     * 
-     */
-    @XmlEnumValue("nonIsoscelesTrapezoid")
-    NON_ISOSCELES_TRAPEZOID("nonIsoscelesTrapezoid"),
-
-    /**
-     * Pentagon Shape
-     * 
-     */
-    @XmlEnumValue("pentagon")
-    PENTAGON("pentagon"),
-
-    /**
-     * Hexagon Shape
-     * 
-     */
-    @XmlEnumValue("hexagon")
-    HEXAGON("hexagon"),
-
-    /**
-     * Heptagon Shape
-     * 
-     */
-    @XmlEnumValue("heptagon")
-    HEPTAGON("heptagon"),
-
-    /**
-     * Octagon Shape
-     * 
-     */
-    @XmlEnumValue("octagon")
-    OCTAGON("octagon"),
-
-    /**
-     * Decagon Shape
-     * 
-     */
-    @XmlEnumValue("decagon")
-    DECAGON("decagon"),
-
-    /**
-     * Dodecagon Shape
-     * 
-     */
-    @XmlEnumValue("dodecagon")
-    DODECAGON("dodecagon"),
-
-    /**
-     * Four Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star4")
-    STAR_4("star4"),
-
-    /**
-     * Five Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star5")
-    STAR_5("star5"),
-
-    /**
-     * Six Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star6")
-    STAR_6("star6"),
-
-    /**
-     * Seven Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star7")
-    STAR_7("star7"),
-
-    /**
-     * Eight Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star8")
-    STAR_8("star8"),
-
-    /**
-     * Ten Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star10")
-    STAR_10("star10"),
-
-    /**
-     * Twelve Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star12")
-    STAR_12("star12"),
-
-    /**
-     * Sixteen Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star16")
-    STAR_16("star16"),
-
-    /**
-     * Twenty Four Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star24")
-    STAR_24("star24"),
-
-    /**
-     * Thirty Two Pointed Star Shape
-     * 
-     */
-    @XmlEnumValue("star32")
-    STAR_32("star32"),
-
-    /**
-     * Round Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("roundRect")
-    ROUND_RECT("roundRect"),
-
-    /**
-     * One Round Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("round1Rect")
-    ROUND_1_RECT("round1Rect"),
-
-    /**
-     * Two Same-side Round Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("round2SameRect")
-    ROUND_2_SAME_RECT("round2SameRect"),
-
-    /**
-     * Two Diagonal Round Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("round2DiagRect")
-    ROUND_2_DIAG_RECT("round2DiagRect"),
-
-    /**
-     * One Snip One Round Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("snipRoundRect")
-    SNIP_ROUND_RECT("snipRoundRect"),
-
-    /**
-     * One Snip Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("snip1Rect")
-    SNIP_1_RECT("snip1Rect"),
-
-    /**
-     * Two Same-side Snip Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("snip2SameRect")
-    SNIP_2_SAME_RECT("snip2SameRect"),
-
-    /**
-     * Two Diagonal Snip Corner Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("snip2DiagRect")
-    SNIP_2_DIAG_RECT("snip2DiagRect"),
-
-    /**
-     * Plaque Shape
-     * 
-     */
-    @XmlEnumValue("plaque")
-    PLAQUE("plaque"),
-
-    /**
-     * Ellipse Shape
-     * 
-     */
-    @XmlEnumValue("ellipse")
-    ELLIPSE("ellipse"),
-
-    /**
-     * Teardrop Shape
-     * 
-     */
-    @XmlEnumValue("teardrop")
-    TEARDROP("teardrop"),
-
-    /**
-     * Home Plate Shape
-     * 
-     */
-    @XmlEnumValue("homePlate")
-    HOME_PLATE("homePlate"),
-
-    /**
-     * Chevron Shape
-     * 
-     */
-    @XmlEnumValue("chevron")
-    CHEVRON("chevron"),
-
-    /**
-     * Pie Wedge Shape
-     * 
-     */
-    @XmlEnumValue("pieWedge")
-    PIE_WEDGE("pieWedge"),
-
-    /**
-     * Pie Shape
-     * 
-     */
-    @XmlEnumValue("pie")
-    PIE("pie"),
-
-    /**
-     * Block Arc Shape
-     * 
-     */
-    @XmlEnumValue("blockArc")
-    BLOCK_ARC("blockArc"),
-
-    /**
-     * Donut Shape
-     * 
-     */
-    @XmlEnumValue("donut")
-    DONUT("donut"),
-
-    /**
-     * No Smoking Shape
-     * 
-     */
-    @XmlEnumValue("noSmoking")
-    NO_SMOKING("noSmoking"),
-
-    /**
-     * Right Arrow Shape
-     * 
-     */
-    @XmlEnumValue("rightArrow")
-    RIGHT_ARROW("rightArrow"),
-
-    /**
-     * Left Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftArrow")
-    LEFT_ARROW("leftArrow"),
-
-    /**
-     * Up Arrow Shape
-     * 
-     */
-    @XmlEnumValue("upArrow")
-    UP_ARROW("upArrow"),
-
-    /**
-     * Down Arrow Shape
-     * 
-     */
-    @XmlEnumValue("downArrow")
-    DOWN_ARROW("downArrow"),
-
-    /**
-     * Striped Right Arrow Shape
-     * 
-     */
-    @XmlEnumValue("stripedRightArrow")
-    STRIPED_RIGHT_ARROW("stripedRightArrow"),
-
-    /**
-     * Notched Right Arrow Shape
-     * 
-     */
-    @XmlEnumValue("notchedRightArrow")
-    NOTCHED_RIGHT_ARROW("notchedRightArrow"),
-
-    /**
-     * Bent Up Arrow Shape
-     * 
-     */
-    @XmlEnumValue("bentUpArrow")
-    BENT_UP_ARROW("bentUpArrow"),
-
-    /**
-     * Left Right Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftRightArrow")
-    LEFT_RIGHT_ARROW("leftRightArrow"),
-
-    /**
-     * Up Down Arrow Shape
-     * 
-     */
-    @XmlEnumValue("upDownArrow")
-    UP_DOWN_ARROW("upDownArrow"),
-
-    /**
-     * Left Up Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftUpArrow")
-    LEFT_UP_ARROW("leftUpArrow"),
-
-    /**
-     * Left Right Up Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftRightUpArrow")
-    LEFT_RIGHT_UP_ARROW("leftRightUpArrow"),
-
-    /**
-     * Quad-Arrow Shape
-     * 
-     */
-    @XmlEnumValue("quadArrow")
-    QUAD_ARROW("quadArrow"),
-
-    /**
-     * Callout Left Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftArrowCallout")
-    LEFT_ARROW_CALLOUT("leftArrowCallout"),
-
-    /**
-     * Callout Right Arrow Shape
-     * 
-     */
-    @XmlEnumValue("rightArrowCallout")
-    RIGHT_ARROW_CALLOUT("rightArrowCallout"),
-
-    /**
-     * Callout Up Arrow Shape
-     * 
-     */
-    @XmlEnumValue("upArrowCallout")
-    UP_ARROW_CALLOUT("upArrowCallout"),
-
-    /**
-     * Callout Down Arrow Shape
-     * 
-     */
-    @XmlEnumValue("downArrowCallout")
-    DOWN_ARROW_CALLOUT("downArrowCallout"),
-
-    /**
-     * Callout Left Right Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftRightArrowCallout")
-    LEFT_RIGHT_ARROW_CALLOUT("leftRightArrowCallout"),
-
-    /**
-     * Callout Up Down Arrow Shape
-     * 
-     */
-    @XmlEnumValue("upDownArrowCallout")
-    UP_DOWN_ARROW_CALLOUT("upDownArrowCallout"),
-
-    /**
-     * Callout Quad-Arrow Shape
-     * 
-     */
-    @XmlEnumValue("quadArrowCallout")
-    QUAD_ARROW_CALLOUT("quadArrowCallout"),
-
-    /**
-     * Bent Arrow Shape
-     * 
-     */
-    @XmlEnumValue("bentArrow")
-    BENT_ARROW("bentArrow"),
-
-    /**
-     * U-Turn Arrow Shape
-     * 
-     */
-    @XmlEnumValue("uturnArrow")
-    UTURN_ARROW("uturnArrow"),
-
-    /**
-     * Circular Arrow Shape
-     * 
-     */
-    @XmlEnumValue("circularArrow")
-    CIRCULAR_ARROW("circularArrow"),
-
-    /**
-     * Left Circular Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftCircularArrow")
-    LEFT_CIRCULAR_ARROW("leftCircularArrow"),
-
-    /**
-     * Left Right Circular Arrow Shape
-     * 
-     */
-    @XmlEnumValue("leftRightCircularArrow")
-    LEFT_RIGHT_CIRCULAR_ARROW("leftRightCircularArrow"),
-
-    /**
-     * Curved Right Arrow Shape
-     * 
-     */
-    @XmlEnumValue("curvedRightArrow")
-    CURVED_RIGHT_ARROW("curvedRightArrow"),
-
-    /**
-     * Curved Left Arrow Shape
-     * 
-     */
-    @XmlEnumValue("curvedLeftArrow")
-    CURVED_LEFT_ARROW("curvedLeftArrow"),
-
-    /**
-     * Curved Up Arrow Shape
-     * 
-     */
-    @XmlEnumValue("curvedUpArrow")
-    CURVED_UP_ARROW("curvedUpArrow"),
-
-    /**
-     * Curved Down Arrow Shape
-     * 
-     */
-    @XmlEnumValue("curvedDownArrow")
-    CURVED_DOWN_ARROW("curvedDownArrow"),
-
-    /**
-     * Swoosh Arrow Shape
-     * 
-     */
-    @XmlEnumValue("swooshArrow")
-    SWOOSH_ARROW("swooshArrow"),
-
-    /**
-     * Cube Shape
-     * 
-     */
-    @XmlEnumValue("cube")
-    CUBE("cube"),
-
-    /**
-     * Can Shape
-     * 
-     */
-    @XmlEnumValue("can")
-    CAN("can"),
-
-    /**
-     * Lightning Bolt Shape
-     * 
-     */
-    @XmlEnumValue("lightningBolt")
-    LIGHTNING_BOLT("lightningBolt"),
-
-    /**
-     * Heart Shape
-     * 
-     */
-    @XmlEnumValue("heart")
-    HEART("heart"),
-
-    /**
-     * Sun Shape
-     * 
-     */
-    @XmlEnumValue("sun")
-    SUN("sun"),
-
-    /**
-     * Moon Shape
-     * 
-     */
-    @XmlEnumValue("moon")
-    MOON("moon"),
-
-    /**
-     * Smiley Face Shape
-     * 
-     */
-    @XmlEnumValue("smileyFace")
-    SMILEY_FACE("smileyFace"),
-
-    /**
-     * Irregular Seal 1 Shape
-     * 
-     */
-    @XmlEnumValue("irregularSeal1")
-    IRREGULAR_SEAL_1("irregularSeal1"),
-
-    /**
-     * Irregular Seal 2 Shape
-     * 
-     */
-    @XmlEnumValue("irregularSeal2")
-    IRREGULAR_SEAL_2("irregularSeal2"),
-
-    /**
-     * Folded Corner Shape
-     * 
-     */
-    @XmlEnumValue("foldedCorner")
-    FOLDED_CORNER("foldedCorner"),
-
-    /**
-     * Bevel Shape
-     * 
-     */
-    @XmlEnumValue("bevel")
-    BEVEL("bevel"),
-
-    /**
-     * Frame Shape
-     * 
-     */
-    @XmlEnumValue("frame")
-    FRAME("frame"),
-
-    /**
-     * Half Frame Shape
-     * 
-     */
-    @XmlEnumValue("halfFrame")
-    HALF_FRAME("halfFrame"),
-
-    /**
-     * Corner Shape
-     * 
-     */
-    @XmlEnumValue("corner")
-    CORNER("corner"),
-
-    /**
-     * Diagonal Stripe Shape
-     * 
-     */
-    @XmlEnumValue("diagStripe")
-    DIAG_STRIPE("diagStripe"),
-
-    /**
-     * Chord Shape
-     * 
-     */
-    @XmlEnumValue("chord")
-    CHORD("chord"),
-
-    /**
-     * Curved Arc Shape
-     * 
-     */
-    @XmlEnumValue("arc")
-    ARC("arc"),
-
-    /**
-     * Left Bracket Shape
-     * 
-     */
-    @XmlEnumValue("leftBracket")
-    LEFT_BRACKET("leftBracket"),
-
-    /**
-     * Right Bracket Shape
-     * 
-     */
-    @XmlEnumValue("rightBracket")
-    RIGHT_BRACKET("rightBracket"),
-
-    /**
-     * Left Brace Shape
-     * 
-     */
-    @XmlEnumValue("leftBrace")
-    LEFT_BRACE("leftBrace"),
-
-    /**
-     * Right Brace Shape
-     * 
-     */
-    @XmlEnumValue("rightBrace")
-    RIGHT_BRACE("rightBrace"),
-
-    /**
-     * Bracket Pair Shape
-     * 
-     */
-    @XmlEnumValue("bracketPair")
-    BRACKET_PAIR("bracketPair"),
-
-    /**
-     * Brace Pair Shape
-     * 
-     */
-    @XmlEnumValue("bracePair")
-    BRACE_PAIR("bracePair"),
-
-    /**
-     * Straight Connector 1 Shape
-     * 
-     */
-    @XmlEnumValue("straightConnector1")
-    STRAIGHT_CONNECTOR_1("straightConnector1"),
-
-    /**
-     * Bent Connector 2 Shape
-     * 
-     */
-    @XmlEnumValue("bentConnector2")
-    BENT_CONNECTOR_2("bentConnector2"),
-
-    /**
-     * Bent Connector 3 Shape
-     * 
-     */
-    @XmlEnumValue("bentConnector3")
-    BENT_CONNECTOR_3("bentConnector3"),
-
-    /**
-     * Bent Connector 4 Shape
-     * 
-     */
-    @XmlEnumValue("bentConnector4")
-    BENT_CONNECTOR_4("bentConnector4"),
-
-    /**
-     * Bent Connector 5 Shape
-     * 
-     */
-    @XmlEnumValue("bentConnector5")
-    BENT_CONNECTOR_5("bentConnector5"),
-
-    /**
-     * Curved Connector 2 Shape
-     * 
-     */
-    @XmlEnumValue("curvedConnector2")
-    CURVED_CONNECTOR_2("curvedConnector2"),
-
-    /**
-     * Curved Connector 3 Shape
-     * 
-     */
-    @XmlEnumValue("curvedConnector3")
-    CURVED_CONNECTOR_3("curvedConnector3"),
-
-    /**
-     * Curved Connector 4 Shape
-     * 
-     */
-    @XmlEnumValue("curvedConnector4")
-    CURVED_CONNECTOR_4("curvedConnector4"),
-
-    /**
-     * Curved Connector 5 Shape
-     * 
-     */
-    @XmlEnumValue("curvedConnector5")
-    CURVED_CONNECTOR_5("curvedConnector5"),
-
-    /**
-     * Callout 1 Shape
-     * 
-     */
-    @XmlEnumValue("callout1")
-    CALLOUT_1("callout1"),
-
-    /**
-     * Callout 2 Shape
-     * 
-     */
-    @XmlEnumValue("callout2")
-    CALLOUT_2("callout2"),
-
-    /**
-     * Callout 3 Shape
-     * 
-     */
-    @XmlEnumValue("callout3")
-    CALLOUT_3("callout3"),
-
-    /**
-     * Callout 1 Shape
-     * 
-     */
-    @XmlEnumValue("accentCallout1")
-    ACCENT_CALLOUT_1("accentCallout1"),
-
-    /**
-     * Callout 2 Shape
-     * 
-     */
-    @XmlEnumValue("accentCallout2")
-    ACCENT_CALLOUT_2("accentCallout2"),
-
-    /**
-     * Callout 3 Shape
-     * 
-     */
-    @XmlEnumValue("accentCallout3")
-    ACCENT_CALLOUT_3("accentCallout3"),
-
-    /**
-     * Callout 1 with Border Shape
-     * 
-     */
-    @XmlEnumValue("borderCallout1")
-    BORDER_CALLOUT_1("borderCallout1"),
-
-    /**
-     * Callout 2 with Border Shape
-     * 
-     */
-    @XmlEnumValue("borderCallout2")
-    BORDER_CALLOUT_2("borderCallout2"),
-
-    /**
-     * Callout 3 with Border Shape
-     * 
-     */
-    @XmlEnumValue("borderCallout3")
-    BORDER_CALLOUT_3("borderCallout3"),
-
-    /**
-     * Callout 1 with Border and Accent Shape
-     * 
-     */
-    @XmlEnumValue("accentBorderCallout1")
-    ACCENT_BORDER_CALLOUT_1("accentBorderCallout1"),
-
-    /**
-     * Callout 2 with Border and Accent Shape
-     * 
-     */
-    @XmlEnumValue("accentBorderCallout2")
-    ACCENT_BORDER_CALLOUT_2("accentBorderCallout2"),
-
-    /**
-     * Callout 3 with Border and Accent Shape
-     * 
-     */
-    @XmlEnumValue("accentBorderCallout3")
-    ACCENT_BORDER_CALLOUT_3("accentBorderCallout3"),
-
-    /**
-     * Callout Wedge Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("wedgeRectCallout")
-    WEDGE_RECT_CALLOUT("wedgeRectCallout"),
-
-    /**
-     * Callout Wedge Round Rectangle Shape
-     * 
-     */
-    @XmlEnumValue("wedgeRoundRectCallout")
-    WEDGE_ROUND_RECT_CALLOUT("wedgeRoundRectCallout"),
-
-    /**
-     * Callout Wedge Ellipse Shape
-     * 
-     */
-    @XmlEnumValue("wedgeEllipseCallout")
-    WEDGE_ELLIPSE_CALLOUT("wedgeEllipseCallout"),
-
-    /**
-     * Callout Cloud Shape
-     * 
-     */
-    @XmlEnumValue("cloudCallout")
-    CLOUD_CALLOUT("cloudCallout"),
-
-    /**
-     * Cloud Shape
-     * 
-     */
-    @XmlEnumValue("cloud")
-    CLOUD("cloud"),
-
-    /**
-     * Ribbon Shape
-     * 
-     */
-    @XmlEnumValue("ribbon")
-    RIBBON("ribbon"),
-
-    /**
-     * Ribbon 2 Shape
-     * 
-     */
-    @XmlEnumValue("ribbon2")
-    RIBBON_2("ribbon2"),
-
-    /**
-     * Ellipse Ribbon Shape
-     * 
-     */
-    @XmlEnumValue("ellipseRibbon")
-    ELLIPSE_RIBBON("ellipseRibbon"),
-
-    /**
-     * Ellipse Ribbon 2 Shape
-     * 
-     */
-    @XmlEnumValue("ellipseRibbon2")
-    ELLIPSE_RIBBON_2("ellipseRibbon2"),
-
-    /**
-     * Left Right Ribbon Shape
-     * 
-     */
-    @XmlEnumValue("leftRightRibbon")
-    LEFT_RIGHT_RIBBON("leftRightRibbon"),
-
-    /**
-     * Vertical Scroll Shape
-     * 
-     */
-    @XmlEnumValue("verticalScroll")
-    VERTICAL_SCROLL("verticalScroll"),
-
-    /**
-     * Horizontal Scroll Shape
-     * 
-     */
-    @XmlEnumValue("horizontalScroll")
-    HORIZONTAL_SCROLL("horizontalScroll"),
-
-    /**
-     * Wave Shape
-     * 
-     */
-    @XmlEnumValue("wave")
-    WAVE("wave"),
-
-    /**
-     * Double Wave Shape
-     * 
-     */
-    @XmlEnumValue("doubleWave")
-    DOUBLE_WAVE("doubleWave"),
-
-    /**
-     * Plus Shape
-     * 
-     */
-    @XmlEnumValue("plus")
-    PLUS("plus"),
-
-    /**
-     * Process Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartProcess")
-    FLOW_CHART_PROCESS("flowChartProcess"),
-
-    /**
-     * Decision Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartDecision")
-    FLOW_CHART_DECISION("flowChartDecision"),
-
-    /**
-     * Input Output Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartInputOutput")
-    FLOW_CHART_INPUT_OUTPUT("flowChartInputOutput"),
-
-    /**
-     * Predefined Process Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartPredefinedProcess")
-    FLOW_CHART_PREDEFINED_PROCESS("flowChartPredefinedProcess"),
-
-    /**
-     * Internal Storage Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartInternalStorage")
-    FLOW_CHART_INTERNAL_STORAGE("flowChartInternalStorage"),
-
-    /**
-     * Document Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartDocument")
-    FLOW_CHART_DOCUMENT("flowChartDocument"),
-
-    /**
-     * Multi-Document Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartMultidocument")
-    FLOW_CHART_MULTIDOCUMENT("flowChartMultidocument"),
-
-    /**
-     * Terminator Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartTerminator")
-    FLOW_CHART_TERMINATOR("flowChartTerminator"),
-
-    /**
-     * Preparation Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartPreparation")
-    FLOW_CHART_PREPARATION("flowChartPreparation"),
-
-    /**
-     * Manual Input Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartManualInput")
-    FLOW_CHART_MANUAL_INPUT("flowChartManualInput"),
-
-    /**
-     * Manual Operation Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartManualOperation")
-    FLOW_CHART_MANUAL_OPERATION("flowChartManualOperation"),
-
-    /**
-     * Connector Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartConnector")
-    FLOW_CHART_CONNECTOR("flowChartConnector"),
-
-    /**
-     * Punched Card Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartPunchedCard")
-    FLOW_CHART_PUNCHED_CARD("flowChartPunchedCard"),
-
-    /**
-     * Punched Tape Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartPunchedTape")
-    FLOW_CHART_PUNCHED_TAPE("flowChartPunchedTape"),
-
-    /**
-     * Summing Junction Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartSummingJunction")
-    FLOW_CHART_SUMMING_JUNCTION("flowChartSummingJunction"),
-
-    /**
-     * Or Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartOr")
-    FLOW_CHART_OR("flowChartOr"),
-
-    /**
-     * Collate Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartCollate")
-    FLOW_CHART_COLLATE("flowChartCollate"),
-
-    /**
-     * Sort Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartSort")
-    FLOW_CHART_SORT("flowChartSort"),
-
-    /**
-     * Extract Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartExtract")
-    FLOW_CHART_EXTRACT("flowChartExtract"),
-
-    /**
-     * Merge Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartMerge")
-    FLOW_CHART_MERGE("flowChartMerge"),
-
-    /**
-     * Offline Storage Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartOfflineStorage")
-    FLOW_CHART_OFFLINE_STORAGE("flowChartOfflineStorage"),
-
-    /**
-     * Online Storage Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartOnlineStorage")
-    FLOW_CHART_ONLINE_STORAGE("flowChartOnlineStorage"),
-
-    /**
-     * Magnetic Tape Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartMagneticTape")
-    FLOW_CHART_MAGNETIC_TAPE("flowChartMagneticTape"),
-
-    /**
-     * Magnetic Disk Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartMagneticDisk")
-    FLOW_CHART_MAGNETIC_DISK("flowChartMagneticDisk"),
-
-    /**
-     * Magnetic Drum Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartMagneticDrum")
-    FLOW_CHART_MAGNETIC_DRUM("flowChartMagneticDrum"),
-
-    /**
-     * Display Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartDisplay")
-    FLOW_CHART_DISPLAY("flowChartDisplay"),
-
-    /**
-     * Delay Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartDelay")
-    FLOW_CHART_DELAY("flowChartDelay"),
-
-    /**
-     * Alternate Process Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartAlternateProcess")
-    FLOW_CHART_ALTERNATE_PROCESS("flowChartAlternateProcess"),
-
-    /**
-     * Off-Page Connector Flow Shape
-     * 
-     */
-    @XmlEnumValue("flowChartOffpageConnector")
-    FLOW_CHART_OFFPAGE_CONNECTOR("flowChartOffpageConnector"),
-
-    /**
-     * Blank Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonBlank")
-    ACTION_BUTTON_BLANK("actionButtonBlank"),
-
-    /**
-     * Home Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonHome")
-    ACTION_BUTTON_HOME("actionButtonHome"),
-
-    /**
-     * Help Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonHelp")
-    ACTION_BUTTON_HELP("actionButtonHelp"),
-
-    /**
-     * Information Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonInformation")
-    ACTION_BUTTON_INFORMATION("actionButtonInformation"),
-
-    /**
-     * Forward or Next Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonForwardNext")
-    ACTION_BUTTON_FORWARD_NEXT("actionButtonForwardNext"),
-
-    /**
-     * Back or Previous Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonBackPrevious")
-    ACTION_BUTTON_BACK_PREVIOUS("actionButtonBackPrevious"),
-
-    /**
-     * End Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonEnd")
-    ACTION_BUTTON_END("actionButtonEnd"),
-
-    /**
-     * Beginning Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonBeginning")
-    ACTION_BUTTON_BEGINNING("actionButtonBeginning"),
-
-    /**
-     * Return Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonReturn")
-    ACTION_BUTTON_RETURN("actionButtonReturn"),
-
-    /**
-     * Document Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonDocument")
-    ACTION_BUTTON_DOCUMENT("actionButtonDocument"),
-
-    /**
-     * Sound Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonSound")
-    ACTION_BUTTON_SOUND("actionButtonSound"),
-
-    /**
-     * Movie Button Shape
-     * 
-     */
-    @XmlEnumValue("actionButtonMovie")
-    ACTION_BUTTON_MOVIE("actionButtonMovie"),
-
-    /**
-     * Gear 6 Shape
-     * 
-     */
-    @XmlEnumValue("gear6")
-    GEAR_6("gear6"),
-
-    /**
-     * Gear 9 Shape
-     * 
-     */
-    @XmlEnumValue("gear9")
-    GEAR_9("gear9"),
-
-    /**
-     * Funnel Shape
-     * 
-     */
-    @XmlEnumValue("funnel")
-    FUNNEL("funnel"),
-
-    /**
-     * Plus Math Shape
-     * 
-     */
-    @XmlEnumValue("mathPlus")
-    MATH_PLUS("mathPlus"),
-
-    /**
-     * Minus Math Shape
-     * 
-     */
-    @XmlEnumValue("mathMinus")
-    MATH_MINUS("mathMinus"),
-
-    /**
-     * Multiply Math Shape
-     * 
-     */
-    @XmlEnumValue("mathMultiply")
-    MATH_MULTIPLY("mathMultiply"),
-
-    /**
-     * Divide Math Shape
-     * 
-     */
-    @XmlEnumValue("mathDivide")
-    MATH_DIVIDE("mathDivide"),
-
-    /**
-     * Equal Math Shape
-     * 
-     */
-    @XmlEnumValue("mathEqual")
-    MATH_EQUAL("mathEqual"),
-
-    /**
-     * Not Equal Math Shape
-     * 
-     */
-    @XmlEnumValue("mathNotEqual")
-    MATH_NOT_EQUAL("mathNotEqual"),
-
-    /**
-     * Corner Tabs Shape
-     * 
-     */
-    @XmlEnumValue("cornerTabs")
-    CORNER_TABS("cornerTabs"),
-
-    /**
-     * Square Tabs Shape
-     * 
-     */
-    @XmlEnumValue("squareTabs")
-    SQUARE_TABS("squareTabs"),
-
-    /**
-     * Plaque Tabs Shape
-     * 
-     */
-    @XmlEnumValue("plaqueTabs")
-    PLAQUE_TABS("plaqueTabs"),
-
-    /**
-     * Chart X Shape
-     * 
-     */
-    @XmlEnumValue("chartX")
-    CHART_X("chartX"),
-
-    /**
-     * Chart Star Shape
-     * 
-     */
-    @XmlEnumValue("chartStar")
-    CHART_STAR("chartStar"),
-
-    /**
-     * Chart Plus Shape
-     * 
-     */
-    @XmlEnumValue("chartPlus")
-    CHART_PLUS("chartPlus");
-    private final String value;
-
-    STShapeType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static STShapeType fromValue(String v) {
-        for (STShapeType c: STShapeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java b/trunk/src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java
deleted file mode 100644
index f3ed4b0..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_TextShapeType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_TextShapeType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="textNoShape"/>
- *     &lt;enumeration value="textPlain"/>
- *     &lt;enumeration value="textStop"/>
- *     &lt;enumeration value="textTriangle"/>
- *     &lt;enumeration value="textTriangleInverted"/>
- *     &lt;enumeration value="textChevron"/>
- *     &lt;enumeration value="textChevronInverted"/>
- *     &lt;enumeration value="textRingInside"/>
- *     &lt;enumeration value="textRingOutside"/>
- *     &lt;enumeration value="textArchUp"/>
- *     &lt;enumeration value="textArchDown"/>
- *     &lt;enumeration value="textCircle"/>
- *     &lt;enumeration value="textButton"/>
- *     &lt;enumeration value="textArchUpPour"/>
- *     &lt;enumeration value="textArchDownPour"/>
- *     &lt;enumeration value="textCirclePour"/>
- *     &lt;enumeration value="textButtonPour"/>
- *     &lt;enumeration value="textCurveUp"/>
- *     &lt;enumeration value="textCurveDown"/>
- *     &lt;enumeration value="textCanUp"/>
- *     &lt;enumeration value="textCanDown"/>
- *     &lt;enumeration value="textWave1"/>
- *     &lt;enumeration value="textWave2"/>
- *     &lt;enumeration value="textDoubleWave1"/>
- *     &lt;enumeration value="textWave4"/>
- *     &lt;enumeration value="textInflate"/>
- *     &lt;enumeration value="textDeflate"/>
- *     &lt;enumeration value="textInflateBottom"/>
- *     &lt;enumeration value="textDeflateBottom"/>
- *     &lt;enumeration value="textInflateTop"/>
- *     &lt;enumeration value="textDeflateTop"/>
- *     &lt;enumeration value="textDeflateInflate"/>
- *     &lt;enumeration value="textDeflateInflateDeflate"/>
- *     &lt;enumeration value="textFadeRight"/>
- *     &lt;enumeration value="textFadeLeft"/>
- *     &lt;enumeration value="textFadeUp"/>
- *     &lt;enumeration value="textFadeDown"/>
- *     &lt;enumeration value="textSlantUp"/>
- *     &lt;enumeration value="textSlantDown"/>
- *     &lt;enumeration value="textCascadeUp"/>
- *     &lt;enumeration value="textCascadeDown"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "ST_TextShapeType", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-@XmlEnum
-public enum STTextShapeType {
-
-
-    /**
-     * No Text Shape
-     * 
-     */
-    @XmlEnumValue("textNoShape")
-    TEXT_NO_SHAPE("textNoShape"),
-
-    /**
-     * Plain Text Shape
-     * 
-     */
-    @XmlEnumValue("textPlain")
-    TEXT_PLAIN("textPlain"),
-
-    /**
-     * Stop Sign Text Shape
-     * 
-     */
-    @XmlEnumValue("textStop")
-    TEXT_STOP("textStop"),
-
-    /**
-     * Triangle Text Shape
-     * 
-     */
-    @XmlEnumValue("textTriangle")
-    TEXT_TRIANGLE("textTriangle"),
-
-    /**
-     * Inverted Triangle Text Shape
-     * 
-     */
-    @XmlEnumValue("textTriangleInverted")
-    TEXT_TRIANGLE_INVERTED("textTriangleInverted"),
-
-    /**
-     * Chevron Text Shape
-     * 
-     */
-    @XmlEnumValue("textChevron")
-    TEXT_CHEVRON("textChevron"),
-
-    /**
-     * Inverted Chevron Text Shape
-     * 
-     */
-    @XmlEnumValue("textChevronInverted")
-    TEXT_CHEVRON_INVERTED("textChevronInverted"),
-
-    /**
-     * Inside Ring Text Shape
-     * 
-     */
-    @XmlEnumValue("textRingInside")
-    TEXT_RING_INSIDE("textRingInside"),
-
-    /**
-     * Outside Ring Text Shape
-     * 
-     */
-    @XmlEnumValue("textRingOutside")
-    TEXT_RING_OUTSIDE("textRingOutside"),
-
-    /**
-     * Upward Arch Text Shape
-     * 
-     */
-    @XmlEnumValue("textArchUp")
-    TEXT_ARCH_UP("textArchUp"),
-
-    /**
-     * Downward Arch Text Shape
-     * 
-     */
-    @XmlEnumValue("textArchDown")
-    TEXT_ARCH_DOWN("textArchDown"),
-
-    /**
-     * Circle Text Shape
-     * 
-     */
-    @XmlEnumValue("textCircle")
-    TEXT_CIRCLE("textCircle"),
-
-    /**
-     * Button Text Shape
-     * 
-     */
-    @XmlEnumValue("textButton")
-    TEXT_BUTTON("textButton"),
-
-    /**
-     * Upward Pour Arch Text Shape
-     * 
-     */
-    @XmlEnumValue("textArchUpPour")
-    TEXT_ARCH_UP_POUR("textArchUpPour"),
-
-    /**
-     * Downward Pour Arch Text Shape
-     * 
-     */
-    @XmlEnumValue("textArchDownPour")
-    TEXT_ARCH_DOWN_POUR("textArchDownPour"),
-
-    /**
-     * Circle Pour Text Shape
-     * 
-     */
-    @XmlEnumValue("textCirclePour")
-    TEXT_CIRCLE_POUR("textCirclePour"),
-
-    /**
-     * Button Pour Text Shape
-     * 
-     */
-    @XmlEnumValue("textButtonPour")
-    TEXT_BUTTON_POUR("textButtonPour"),
-
-    /**
-     * Upward Curve Text Shape
-     * 
-     */
-    @XmlEnumValue("textCurveUp")
-    TEXT_CURVE_UP("textCurveUp"),
-
-    /**
-     * Downward Curve Text Shape
-     * 
-     */
-    @XmlEnumValue("textCurveDown")
-    TEXT_CURVE_DOWN("textCurveDown"),
-
-    /**
-     * Upward Can Text Shape
-     * 
-     */
-    @XmlEnumValue("textCanUp")
-    TEXT_CAN_UP("textCanUp"),
-
-    /**
-     * Downward Can Text Shape
-     * 
-     */
-    @XmlEnumValue("textCanDown")
-    TEXT_CAN_DOWN("textCanDown"),
-
-    /**
-     * Wave 1 Text Shape
-     * 
-     */
-    @XmlEnumValue("textWave1")
-    TEXT_WAVE_1("textWave1"),
-
-    /**
-     * Wave 2 Text Shape
-     * 
-     */
-    @XmlEnumValue("textWave2")
-    TEXT_WAVE_2("textWave2"),
-
-    /**
-     * Double Wave 1 Text Shape
-     * 
-     */
-    @XmlEnumValue("textDoubleWave1")
-    TEXT_DOUBLE_WAVE_1("textDoubleWave1"),
-
-    /**
-     * Wave 4 Text Shape
-     * 
-     */
-    @XmlEnumValue("textWave4")
-    TEXT_WAVE_4("textWave4"),
-
-    /**
-     * Inflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textInflate")
-    TEXT_INFLATE("textInflate"),
-
-    /**
-     * Deflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textDeflate")
-    TEXT_DEFLATE("textDeflate"),
-
-    /**
-     * Bottom Inflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textInflateBottom")
-    TEXT_INFLATE_BOTTOM("textInflateBottom"),
-
-    /**
-     * Bottom Deflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textDeflateBottom")
-    TEXT_DEFLATE_BOTTOM("textDeflateBottom"),
-
-    /**
-     * Top Inflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textInflateTop")
-    TEXT_INFLATE_TOP("textInflateTop"),
-
-    /**
-     * Top Deflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textDeflateTop")
-    TEXT_DEFLATE_TOP("textDeflateTop"),
-
-    /**
-     * Deflate-Inflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textDeflateInflate")
-    TEXT_DEFLATE_INFLATE("textDeflateInflate"),
-
-    /**
-     * Deflate-Inflate-Deflate Text Shape
-     * 
-     */
-    @XmlEnumValue("textDeflateInflateDeflate")
-    TEXT_DEFLATE_INFLATE_DEFLATE("textDeflateInflateDeflate"),
-
-    /**
-     * Right Fade Text Shape
-     * 
-     */
-    @XmlEnumValue("textFadeRight")
-    TEXT_FADE_RIGHT("textFadeRight"),
-
-    /**
-     * Left Fade Text Shape
-     * 
-     */
-    @XmlEnumValue("textFadeLeft")
-    TEXT_FADE_LEFT("textFadeLeft"),
-
-    /**
-     * Upward Fade Text Shape
-     * 
-     */
-    @XmlEnumValue("textFadeUp")
-    TEXT_FADE_UP("textFadeUp"),
-
-    /**
-     * Downward Fade Text Shape
-     * 
-     */
-    @XmlEnumValue("textFadeDown")
-    TEXT_FADE_DOWN("textFadeDown"),
-
-    /**
-     * Upward Slant Text Shape
-     * 
-     */
-    @XmlEnumValue("textSlantUp")
-    TEXT_SLANT_UP("textSlantUp"),
-
-    /**
-     * Downward Slant Text Shape
-     * 
-     */
-    @XmlEnumValue("textSlantDown")
-    TEXT_SLANT_DOWN("textSlantDown"),
-
-    /**
-     * Upward Cascade Text Shape
-     * 
-     */
-    @XmlEnumValue("textCascadeUp")
-    TEXT_CASCADE_UP("textCascadeUp"),
-
-    /**
-     * Downward Cascade Text Shape
-     * 
-     */
-    @XmlEnumValue("textCascadeDown")
-    TEXT_CASCADE_DOWN("textCascadeDown");
-    private final String value;
-
-    STTextShapeType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static STTextShapeType fromValue(String v) {
-        for (STTextShapeType c: STTextShapeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/AbsExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/AbsExpression.java
deleted file mode 100644
index 0f94e14..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/AbsExpression.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Absolute Value Formula
- *
- * @author Yegor Kozlov
- */
-public class AbsExpression implements Expression {
-    private String arg;
-
-    AbsExpression(Matcher m){
-        arg = m.group(1);
-    }
-
-    public double evaluate(Context ctx){
-        double val = ctx.getValue(arg);
-        return Math.abs(val);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/AddDivideExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/AddDivideExpression.java
deleted file mode 100644
index 2a01de4..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/AddDivideExpression.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Add Divide Formula
- *
- * @author Yegor Kozlov
- */
-public class AddDivideExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    AddDivideExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        return (x + y ) / z;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/AddSubtractExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/AddSubtractExpression.java
deleted file mode 100644
index 5d5f1e6..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/AddSubtractExpression.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Add Subtract Formula
- *
- * @author Yegor Kozlov
- */
-public class AddSubtractExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    AddSubtractExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        return (x + y ) - z;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java b/trunk/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java
deleted file mode 100644
index 8a2f0a4..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import org.apache.poi.sl.draw.binding.CTGeomGuide;
-
-/**
- * Represents a shape adjust values (see section 20.1.9.5 in the spec)
- *
- * @author Yegor Kozlov
- */
-public class AdjustValue extends Guide {
-
-    public AdjustValue(CTGeomGuide gd) {
-        super(gd.getName(), gd.getFmla());
-    }
-
-    @Override
-    public double evaluate(Context ctx){
-        String name = getName();
-        Guide adj = ctx.getAdjustValue(name);
-        if(adj != null) {
-            return adj.evaluate(ctx);
-        }
-        return super.evaluate(ctx);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/ArcTanExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/ArcTanExpression.java
deleted file mode 100644
index 9044e8a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/ArcTanExpression.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public class ArcTanExpression implements Expression {
-    private String arg1, arg2;
-
-    ArcTanExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        return Math.atan(y / x);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java b/trunk/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
deleted file mode 100644
index 18531d7..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Arc2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Point2D;
-
-import org.apache.poi.sl.draw.binding.CTPath2DArcTo;
-
-/**
- * ArcTo command within a shape path in DrawingML:
- *
- * <arcTo wR="wr" hR="hr" stAng="stAng" swAng="swAng"/>
- *
- * Where <code>wr</code> and <code>wh</code> are the height and width radiuses
- * of the supposed circle being used to draw the arc.  This gives the circle
- * a total height of (2 * hR)  and a total width of (2 * wR)
- *
- * stAng is the <code>start</code> angle and <code></>swAng</code> is the swing angle
- *
- * @author Yegor Kozlov
- */
-public class ArcToCommand implements PathCommand {
-    private String hr, wr, stAng, swAng;
-
-    ArcToCommand(CTPath2DArcTo arc){
-        hr = arc.getHR().toString();
-        wr = arc.getWR().toString();
-        stAng = arc.getStAng().toString();
-        swAng = arc.getSwAng().toString();
-    }
-
-    public void execute(Path2D.Double path, Context ctx){
-        double rx = ctx.getValue(wr);
-        double ry = ctx.getValue(hr);
-        double start = ctx.getValue(stAng) / 60000;
-        double extent = ctx.getValue(swAng) / 60000;
-        Point2D pt = path.getCurrentPoint();
-        double x0 = pt.getX() - rx - rx * Math.cos(Math.toRadians(start));
-        double y0 = pt.getY() - ry - ry * Math.sin(Math.toRadians(start));
-
-        Arc2D arc = new Arc2D.Double(
-                         x0,
-                         y0,
-                         2 * rx, 2 * ry,
-                         -start, -extent, 
-                         Arc2D.OPEN);
-		path.append(arc, true);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java b/trunk/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
deleted file mode 100644
index 66b35ed..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Path2D;
-
-/**
- * Date: 10/25/11
- *
- * @author Yegor Kozlov
- */
-public class ClosePathCommand implements PathCommand {
-
-    ClosePathCommand(){
-    }
-
-    public void execute(Path2D.Double path, Context ctx){
-        path.closePath();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/Context.java b/trunk/src/java/org/apache/poi/sl/draw/geom/Context.java
deleted file mode 100644
index 8fd5147..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/Context.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public class Context {
-    final Map<String, Double> _ctx = new HashMap<String, Double>();
-    final IAdjustableShape _props;
-    final Rectangle2D _anchor;
-    
-    public Context(CustomGeometry geom, Rectangle2D anchor, IAdjustableShape props){
-        _props = props;
-        _anchor = anchor;
-        for(Guide gd : geom.adjusts) evaluate(gd);
-        for(Guide gd : geom.guides) evaluate(gd);
-    }
-
-    public Rectangle2D getShapeAnchor(){
-        return _anchor;
-    }
-
-    public Guide getAdjustValue(String name){
-        return _props.getAdjustValue(name);
-    }
-
-    public double getValue(String key){
-        if(key.matches("(\\+|-)?\\d+")){
-            return Double.parseDouble(key);
-        }
-
-        Formula builtIn = Formula.builtInFormulas.get(key);
-        if(builtIn != null){
-            return builtIn.evaluate(this);
-        }
-
-        if(!_ctx.containsKey(key)) {
-            throw new RuntimeException("undefined variable: " + key);
-        }
-
-        return _ctx.get(key);
-    }
-
-    public double evaluate(Formula fmla){
-        double result = fmla.evaluate(this);
-        String key = fmla.getName();
-        if(key != null) _ctx.put(key, result);
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/CosExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/CosExpression.java
deleted file mode 100644
index 56373d9..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/CosExpression.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public class CosExpression implements Expression {
-    private String arg1, arg2;
-
-    CosExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2)/ 60000;
-        return x * Math.cos(Math.toRadians(y));
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/CosineArcTanExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/CosineArcTanExpression.java
deleted file mode 100644
index 4bed9b7..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/CosineArcTanExpression.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public class CosineArcTanExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    CosineArcTanExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        return x*Math.cos(Math.atan(z / y));
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java b/trunk/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
deleted file mode 100644
index 6c6361a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Path2D;
-
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
-
-/**
- * Date: 10/25/11
- *
- * @author Yegor Kozlov
- */
-public class CurveToCommand implements PathCommand {
-    private String arg1, arg2, arg3, arg4, arg5, arg6;
-
-    CurveToCommand(CTAdjPoint2D pt1, CTAdjPoint2D pt2, CTAdjPoint2D pt3){
-        arg1 = pt1.getX().toString();
-        arg2 = pt1.getY().toString();
-        arg3 = pt2.getX().toString();
-        arg4 = pt2.getY().toString();
-        arg5 = pt3.getX().toString();
-        arg6 = pt3.getY().toString();
-    }
-
-    public void execute(Path2D.Double path, Context ctx){
-        double x1 = ctx.getValue(arg1);
-        double y1 = ctx.getValue(arg2);
-        double x2 = ctx.getValue(arg3);
-        double y2 = ctx.getValue(arg4);
-        double x3 = ctx.getValue(arg5);
-        double y3 = ctx.getValue(arg6);
-        path.curveTo(x1, y1, x2, y2, x3, y3);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java b/trunk/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
deleted file mode 100644
index ce1b26c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.*;
-
-import org.apache.poi.sl.draw.binding.*;
-
-/**
- * Definition of a custom geometric shape
- *
- * @author Yegor Kozlov
- */
-public class CustomGeometry implements Iterable<Path>{
-    List<Guide> adjusts = new ArrayList<Guide>();
-    List<Guide> guides = new ArrayList<Guide>();
-    List<Path> paths = new ArrayList<Path>();
-    Path textBounds;
-
-    public CustomGeometry(CTCustomGeometry2D geom) {
-        CTGeomGuideList avLst = geom.getAvLst();
-        if(avLst != null) {
-            for(CTGeomGuide gd : avLst.getGd()){
-                adjusts.add(new AdjustValue(gd));
-            }
-        }
-
-        CTGeomGuideList gdLst = geom.getGdLst();
-        if(gdLst != null) {
-            for(CTGeomGuide gd : gdLst.getGd()){
-                guides.add(new Guide(gd));
-            }
-        }
-
-        CTPath2DList pathLst = geom.getPathLst();
-        if(pathLst != null) {
-            for(CTPath2D spPath : pathLst.getPath()){
-                paths.add(new Path(spPath));
-            }
-        }
-
-        CTGeomRect rect = geom.getRect();
-        if(rect != null) {
-            textBounds = new Path();
-            textBounds.addCommand(
-                    new MoveToCommand(rect.getL().toString(), rect.getT().toString()));
-            textBounds.addCommand(
-                    new LineToCommand(rect.getR().toString(), rect.getT().toString()));
-            textBounds.addCommand(
-                    new LineToCommand(rect.getR().toString(), rect.getB().toString()));
-            textBounds.addCommand(
-                    new LineToCommand(rect.getL().toString(), rect.getB().toString()));
-            textBounds.addCommand(
-                    new ClosePathCommand());
-        }
-    }
-    
-    public Iterator<Path> iterator() {
-        return paths.iterator();
-    }
-
-    public Path getTextBounds(){
-        return textBounds;        
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/Expression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/Expression.java
deleted file mode 100644
index 2403c85..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/Expression.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public interface Expression {
-
-    double evaluate(Context ctx);
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/ExpressionParser.java b/trunk/src/java/org/apache/poi/sl/draw/geom/ExpressionParser.java
deleted file mode 100644
index 61ab98b..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/ExpressionParser.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * A simple regexp-based parser of shape guide formulas in DrawingML
- */
-public class ExpressionParser {
-    private static final Map<String, ExpressionEntry> impls =
-        new HashMap<String, ExpressionEntry>();
-    
-    private static class ExpressionEntry {
-        final Pattern regex;
-        final Constructor<? extends Expression> con;
-        ExpressionEntry(String regex, Class<? extends Expression> cls)
-        throws SecurityException, NoSuchMethodException {
-            this.regex = Pattern.compile(regex);
-            this.con = cls.getDeclaredConstructor(Matcher.class);
-            impls.put(op(regex), this);
-        }
-    }
-    
-    static {
-        try {
-            new ExpressionEntry("\\*/ +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)", MultiplyDivideExpression.class);
-            new ExpressionEntry("\\+- +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)( 0)?", AddSubtractExpression.class);
-            new ExpressionEntry("\\+/ +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)", AddDivideExpression.class);
-            new ExpressionEntry("\\?: +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)", IfElseExpression.class);
-            new ExpressionEntry("val +([\\-\\w]+)", LiteralValueExpression.class);
-            new ExpressionEntry("abs +([\\-\\w]+)", AbsExpression.class);
-            new ExpressionEntry("sqrt +([\\-\\w]+)", SqrtExpression.class);
-            new ExpressionEntry("max +([\\-\\w]+) +([\\-\\w]+)", MaxExpression.class);
-            new ExpressionEntry("min +([\\-\\w]+) +([\\-\\w]+)", MinExpression.class);
-            new ExpressionEntry("at2 +([\\-\\w]+) +([\\-\\w]+)", ArcTanExpression.class);
-            new ExpressionEntry("sin +([\\-\\w]+) +([\\-\\w]+)", SinExpression.class);
-            new ExpressionEntry("cos +([\\-\\w]+) +([\\-\\w]+)", CosExpression.class);
-            new ExpressionEntry("tan +([\\-\\w]+) +([\\-\\w]+)", TanExpression.class);
-            new ExpressionEntry("cat2 +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)", CosineArcTanExpression.class);
-            new ExpressionEntry("sat2 +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)", SinArcTanExpression.class);
-            new ExpressionEntry("pin +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)", PinExpression.class);
-            new ExpressionEntry("mod +([\\-\\w]+) +([\\-\\w]+) +([\\-\\w]+)", ModExpression.class);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static String op(String str) {
-        return (str == null || !str.contains(" "))
-            ? "" : str.substring(0, str.indexOf(" ")).replace("\\", "");
-    }
-    
-    public static Expression parse(String str) {
-        ExpressionEntry ee = impls.get(op(str));
-        Matcher m = (ee == null) ? null : ee.regex.matcher(str);
-        if (m == null || !m.matches()) {
-            throw new RuntimeException("Unsupported formula: " + str);
-        }
-        
-        try {
-            return ee.con.newInstance(m);
-        } catch (Exception e) {
-            throw new RuntimeException("Unsupported formula: " + str, e);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/Formula.java b/trunk/src/java/org/apache/poi/sl/draw/geom/Formula.java
deleted file mode 100644
index 4745347..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/Formula.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A guide formula in DrawingML.
- * This is a base class for adjust values, geometric guides and bilt-in guides
- *
- * @author Yegor Kozlov
- */
-public abstract class Formula {
-
-    String getName(){
-        return null;
-    }
-
-    abstract double evaluate(Context ctx);
-
-    static Map<String, Formula> builtInFormulas = new HashMap<String, Formula>();
-    static {
-        // 3 x 360 / 4 = 270
-        builtInFormulas.put("3cd4",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return 270 * 60000;
-            }
-
-         });
-
-        // 3 x 360 / 8 = 135
-        builtInFormulas.put("3cd8",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return 135 * 60000;
-            }
-
-         });
-
-        // 5 x 360 / 8 = 225
-        builtInFormulas.put("5cd8",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return 270 * 60000;
-            }
-
-         });
-
-        // 7 x 360 / 8 = 315
-        builtInFormulas.put("7cd8",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return 270 * 60000;
-            }
-
-         });
-
-        // bottom
-        builtInFormulas.put("b",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getY() + anchor.getHeight();
-            }
-
-         });
-
-        // 360 / 2 = 180
-        builtInFormulas.put("cd2",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return 180 * 60000;
-            }
-
-         });
-
-        // 360 / 4 = 90
-        builtInFormulas.put("cd4",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return 90 * 60000;
-            }
-
-         });
-
-        // 360 / 8 = 45
-        builtInFormulas.put("cd8",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return 45 * 60000;
-            }
-
-         });
-
-        // horizontal center
-        builtInFormulas.put("hc",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getX() + anchor.getWidth()/2;
-            }
-
-         });
-
-        // height
-        builtInFormulas.put("h",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getHeight();
-            }
-
-         });
-
-        // height / 2
-        builtInFormulas.put("hd2",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getHeight()/2;
-            }
-
-         });
-
-        // height / 3
-        builtInFormulas.put("hd3",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getHeight()/3;
-            }
-
-         });
-
-        // height / 4
-        builtInFormulas.put("hd4",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getHeight()/4;
-            }
-
-         });
-
-        // height / 5
-        builtInFormulas.put("hd5",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getHeight()/5;
-            }
-
-         });
-
-        // height / 6
-        builtInFormulas.put("hd6",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getHeight()/6;
-            }
-
-         });
-
-        // height / 8
-        builtInFormulas.put("hd8",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getHeight()/8;
-            }
-
-         });
-
-        // left
-        builtInFormulas.put("l",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getX();
-            }
-
-         });
-
-        // long side
-        builtInFormulas.put("ls",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return Math.max(anchor.getWidth(), anchor.getHeight());
-            }
-
-         });
-
-        // right
-        builtInFormulas.put("r",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getX() + anchor.getWidth();
-            }
-
-         });
-
-        // short side
-        builtInFormulas.put("ss",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return Math.min(anchor.getWidth(), anchor.getHeight());
-            }
-
-         });
-
-        // short side / 2
-        builtInFormulas.put("ssd2",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                double ss = Math.min(anchor.getWidth(), anchor.getHeight());
-                return ss / 2;
-            }
-         });
-
-        // short side / 4
-        builtInFormulas.put("ssd4",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                double ss = Math.min(anchor.getWidth(), anchor.getHeight());
-                return ss / 4;
-            }
-         });
-
-        // short side / 6
-        builtInFormulas.put("ssd6",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                double ss = Math.min(anchor.getWidth(), anchor.getHeight());
-                return ss / 6;
-            }
-         });
-
-        // short side / 8
-        builtInFormulas.put("ssd8",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                double ss = Math.min(anchor.getWidth(), anchor.getHeight());
-                return ss / 8;
-            }
-         });
-
-        // short side / 16
-        builtInFormulas.put("ssd16",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                double ss = Math.min(anchor.getWidth(), anchor.getHeight());
-                return ss / 16;
-            }
-         });
-
-        // short side / 32
-        builtInFormulas.put("ssd32",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                double ss = Math.min(anchor.getWidth(), anchor.getHeight());
-                return ss / 32;
-            }
-         });
-
-        // top
-        builtInFormulas.put("t",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getY();
-            }
-         });
-
-        // vertical center
-        builtInFormulas.put("vc",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                Rectangle2D anchor = ctx.getShapeAnchor();
-                return anchor.getY() + anchor.getHeight()/2;
-            }
-         });
-
-        // width
-        builtInFormulas.put("w",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth();
-            }
-         });
-
-        // width / 2
-        builtInFormulas.put("wd2",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/2;
-            }
-         });
-
-        // width / 3
-        builtInFormulas.put("wd3",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/3;
-            }
-         });
-
-        // width / 4
-        builtInFormulas.put("wd4",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/4;
-            }
-         });
-
-        // width / 5
-        builtInFormulas.put("wd5",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/5;
-            }
-         });
-
-        // width / 6
-        builtInFormulas.put("wd6",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/6;
-            }
-         });
-
-        // width / 8
-        builtInFormulas.put("wd8",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/8;
-            }
-         });
-
-        // width / 10
-        builtInFormulas.put("wd10",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/10;
-            }
-         });
-
-        // width / 32
-        builtInFormulas.put("wd32",  new Formula(){
-            @Override
-            double evaluate(Context ctx){
-                return ctx.getShapeAnchor().getWidth()/32;
-            }
-         });
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/Guide.java b/trunk/src/java/org/apache/poi/sl/draw/geom/Guide.java
deleted file mode 100644
index f142132..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/Guide.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import org.apache.poi.sl.draw.binding.CTGeomGuide;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public class Guide extends Formula {
-    private String name, fmla;
-    private Expression expr;
-
-    public Guide(CTGeomGuide gd) {
-        this(gd.getName(), gd.getFmla());
-    }
-
-    public Guide(String nm, String fm){
-        name = nm;
-        fmla = fm;
-        expr = ExpressionParser.parse(fm);
-    }
-
-
-    String getName(){
-        return name;
-    }
-
-    String getFormula(){
-        return fmla;
-    }
-
-    @Override
-    public double evaluate(Context ctx){
-        return expr.evaluate(ctx);
-    }
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java b/trunk/src/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
deleted file mode 100644
index 920acb8..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-
-/**
- * A bridge to the consumer application.
- *
- * To get a shape geometry one needs to pass shape bounds and adjust values.
- *
- * @author Yegor Kozlov
- */
-public interface IAdjustableShape {
-    /**
-     *
-     * @param  name name of a adjust value, e.g. adj1
-     * @return adjust guide defined in the shape or null
-     */
-    Guide getAdjustValue(String name);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/IfElseExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/IfElseExpression.java
deleted file mode 100644
index 443115a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/IfElseExpression.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * If Else Formula:
- * <p>
- *     Arguments: 3 (fmla="?: x y z")
- *     Usage: "?: x y z" = if (x > 0), then y = value of this guide,
- *     else z = value of this guide
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class IfElseExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    IfElseExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        return x > 0 ? y : z;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java b/trunk/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java
deleted file mode 100644
index 7f6e13c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Path2D;
-
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
-
-/**
- * Date: 10/25/11
- *
- * @author Yegor Kozlov
- */
-public class LineToCommand implements PathCommand {
-    private String arg1, arg2;
-
-    LineToCommand(CTAdjPoint2D pt){
-        arg1 = pt.getX().toString();
-        arg2 = pt.getY().toString();
-    }
-
-    LineToCommand(String s1, String s2){
-        arg1 = s1;
-        arg2 = s2;
-    }
-
-    public void execute(Path2D.Double path, Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        path.lineTo(x, y);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/LiteralValueExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/LiteralValueExpression.java
deleted file mode 100644
index ab3abc7..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/LiteralValueExpression.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public class LiteralValueExpression implements Expression {
-    private String arg;
-
-    LiteralValueExpression(Matcher m){
-        arg = m.group(1);
-    }
-
-    public double evaluate(Context ctx){
-        return ctx.getValue(arg);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/MaxExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/MaxExpression.java
deleted file mode 100644
index 88a9c60..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/MaxExpression.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Maximum Value Formula
- *
- * @author Yegor Kozlov
- */
-public class MaxExpression implements Expression {
-    private String arg1, arg2;
-
-    MaxExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        return Math.max(x, y);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/MinExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/MinExpression.java
deleted file mode 100644
index 8c1864c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/MinExpression.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Minimum Value Formula
- *
- * @author Yegor Kozlov
- */
-public class MinExpression implements Expression {
-    private String arg1, arg2;
-
-    MinExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        return Math.min(x, y);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/ModExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/ModExpression.java
deleted file mode 100644
index ff20fc2..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/ModExpression.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Modulo Formula:
- * <p>
- *     Arguments: 3 (fmla="mod x y z")
- *     Usage: "mod x y z" = sqrt(x^2 + b^2 + c^2) = value of this guide
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class ModExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    ModExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-   public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        return Math.sqrt(x*x + y*y + z*z);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java b/trunk/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
deleted file mode 100644
index 59c7a8a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Path2D;
-
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
-
-/**
- * Date: 10/25/11
- *
- * @author Yegor Kozlov
- */
-public class MoveToCommand implements PathCommand {
-    private String arg1, arg2;
-
-    MoveToCommand(CTAdjPoint2D pt){
-        arg1 = pt.getX().toString();
-        arg2 = pt.getY().toString();
-    }
-
-    MoveToCommand(String s1, String s2){
-        arg1 = s1;
-        arg2 = s2;
-    }
-
-    public void execute(Path2D.Double path, Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        path.moveTo(x, y);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/MultiplyDivideExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/MultiplyDivideExpression.java
deleted file mode 100644
index 5af0ff1..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/MultiplyDivideExpression.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Multiply Divide Formula
- *
- * @author Yegor Kozlov
- */
-public class MultiplyDivideExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    MultiplyDivideExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        return (x * y ) / z;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/Outline.java b/trunk/src/java/org/apache/poi/sl/draw/geom/Outline.java
deleted file mode 100644
index b4ffc42..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/Outline.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.Shape;
-
-/**
-* Date: 11/6/11
-*
-* @author Yegor Kozlov
-*/
-public class Outline {
-    private Shape shape;
-    private Path path;
-
-    public Outline(Shape shape, Path path){
-        this.shape = shape;
-        this.path = path;
-    }
-
-    public Path getPath(){
-        return path;
-    }
-
-    public Shape getOutline(){
-        return shape;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/Path.java b/trunk/src/java/org/apache/poi/sl/draw/geom/Path.java
deleted file mode 100644
index 78590fa..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/Path.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Path2D;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
-import org.apache.poi.sl.draw.binding.CTPath2D;
-import org.apache.poi.sl.draw.binding.CTPath2DArcTo;
-import org.apache.poi.sl.draw.binding.CTPath2DClose;
-import org.apache.poi.sl.draw.binding.CTPath2DCubicBezierTo;
-import org.apache.poi.sl.draw.binding.CTPath2DLineTo;
-import org.apache.poi.sl.draw.binding.CTPath2DMoveTo;
-import org.apache.poi.sl.draw.binding.CTPath2DQuadBezierTo;
-import org.apache.poi.sl.draw.binding.STPathFillMode;
-
-/**
- * Specifies a creation path consisting of a series of moves, lines and curves
- * that when combined forms a geometric shape
- *
- * @author Yegor Kozlov
- */
-public class Path {
-    private final List<PathCommand> commands;
-    boolean _fill, _stroke;
-    long _w, _h;
-
-    public Path(){
-        this(true, true);
-    }
-
-    public Path(boolean fill, boolean stroke){
-        commands = new ArrayList<PathCommand>();
-        _w = -1;
-        _h = -1;
-        _fill = fill;
-        _stroke = stroke;
-    }
-
-    public Path(CTPath2D spPath){
-        _fill = spPath.getFill() != STPathFillMode.NONE;
-        _stroke = spPath.isStroke();
-        _w = spPath.isSetW() ? spPath.getW() : -1;	
-        _h = spPath.isSetH() ? spPath.getH() : -1;	
-        
-        commands = new ArrayList<PathCommand>();
-        
-        for(Object ch : spPath.getCloseOrMoveToOrLnTo()){
-            if(ch instanceof CTPath2DMoveTo){
-                CTAdjPoint2D pt = ((CTPath2DMoveTo)ch).getPt();
-                commands.add(new MoveToCommand(pt));
-            } else if (ch instanceof CTPath2DLineTo){
-                CTAdjPoint2D pt = ((CTPath2DLineTo)ch).getPt();
-                commands.add(new LineToCommand(pt));
-            } else if (ch instanceof CTPath2DArcTo){
-                CTPath2DArcTo arc = (CTPath2DArcTo)ch;
-                commands.add(new ArcToCommand(arc));
-            } else if (ch instanceof CTPath2DQuadBezierTo){
-                CTPath2DQuadBezierTo bez = ((CTPath2DQuadBezierTo)ch);
-                CTAdjPoint2D pt1 = bez.getPt().get(0);
-                CTAdjPoint2D pt2 = bez.getPt().get(1);
-                commands.add(new QuadToCommand(pt1, pt2));
-            } else if (ch instanceof CTPath2DCubicBezierTo){
-                CTPath2DCubicBezierTo bez = ((CTPath2DCubicBezierTo)ch);
-                CTAdjPoint2D pt1 = bez.getPt().get(0);
-                CTAdjPoint2D pt2 = bez.getPt().get(1);
-                CTAdjPoint2D pt3 = bez.getPt().get(2);
-                commands.add(new CurveToCommand(pt1, pt2, pt3));
-            } else if (ch instanceof CTPath2DClose){
-                commands.add(new ClosePathCommand());
-            }  else {
-                throw new IllegalStateException("Unsupported path segment: " + ch);
-            }
-        }
-    }
-
-    public void addCommand(PathCommand cmd){
-        commands.add(cmd);
-    }
-
-    /**
-     * Convert the internal represenation to java.awt.geom.Path2D
-     */
-    public Path2D.Double getPath(Context ctx) {
-        Path2D.Double path = new Path2D.Double();
-        for(PathCommand cmd : commands)
-            cmd.execute(path, ctx);
-        return path;
-    }
-
-    public boolean isStroked(){
-        return _stroke;
-    }
-
-    public boolean isFilled(){
-        return _fill;
-    }
-    
-    public long getW(){
-    	return _w;
-    }
-
-    public long getH(){
-    	return _h;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/PathCommand.java b/trunk/src/java/org/apache/poi/sl/draw/geom/PathCommand.java
deleted file mode 100644
index 41fa21a..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/PathCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Path2D;
-
-/**
- * A path command in DrawingML. One of:
- *
- *  - arcTo
- *  - moveTo
- *  - lineTo
- *  - cubicBezTo
- *  - quadBezTo
- *  - close
- *
- *
- * @author Yegor Kozlov
- */
-public interface PathCommand {
-    /**
-     * Execute the command an append a segment to the specified path
-     *
-     * @param path  the path to append the result to
-     * @param ctx   the context to lookup variables
-     */
-    void execute(Path2D.Double path, Context ctx);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/PinExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/PinExpression.java
deleted file mode 100644
index ee0d4e5..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/PinExpression.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Pin To Formula:
- * <gd name="enAng" fmla="pin 0 adj2 21599999"/>
- *
- * <p>
- *     Usage: "pin x y z" = if (y < x), then x = value of this guide
- *     else if (y > z), then z = value of this guide
- *     else y = value of this guide
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class PinExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    PinExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-   public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        if(y < x) return x;
-        else if (y > z) return z;
-        else return y;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java b/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
deleted file mode 100644
index ad2553f..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.stream.EventFilter;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.events.StartElement;
-import javax.xml.stream.events.XMLEvent;
-
-import org.apache.poi.sl.draw.binding.CTCustomGeometry2D;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * 
- */
-public class PresetGeometries extends LinkedHashMap<String, CustomGeometry> {
-    private final static POILogger LOG = POILogFactory.getLogger(PresetGeometries.class);
-    protected final static String BINDING_PACKAGE = "org.apache.poi.sl.draw.binding";
-    
-    protected static PresetGeometries _inst;
-
-    protected PresetGeometries(){}
-
-    @SuppressWarnings("unused")
-    public void init(InputStream is) throws XMLStreamException, JAXBException {
-        // StAX:
-        EventFilter startElementFilter = new EventFilter() {
-            @Override
-            public boolean accept(XMLEvent event) {
-                return event.isStartElement();
-            }
-        };
-        
-        XMLInputFactory staxFactory = XMLInputFactory.newFactory();
-        XMLEventReader staxReader = staxFactory.createXMLEventReader(is);
-        XMLEventReader staxFiltRd = staxFactory.createFilteredReader(staxReader, startElementFilter);
-        // ignore StartElement:
-        /* XMLEvent evDoc = */ staxFiltRd.nextEvent();
-        // JAXB:
-        JAXBContext jaxbContext = JAXBContext.newInstance(BINDING_PACKAGE);
-        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-
-        long cntElem = 0;
-        while (staxFiltRd.peek() != null) {
-            StartElement evRoot = (StartElement)staxFiltRd.peek();
-            String name = evRoot.getName().getLocalPart();
-            JAXBElement<CTCustomGeometry2D> el = unmarshaller.unmarshal(staxReader, CTCustomGeometry2D.class);
-            CTCustomGeometry2D cus = el.getValue();
-            cntElem++;
-            
-            if(containsKey(name)) {
-                LOG.log(POILogger.WARN, "Duplicate definition of " + name);
-            }
-            put(name, new CustomGeometry(cus));
-        }       
-    }
-    
-    /**
-     * Convert a single CustomGeometry object, i.e. from xmlbeans
-     */
-    public static CustomGeometry convertCustomGeometry(XMLStreamReader staxReader) {
-        try {
-            JAXBContext jaxbContext = JAXBContext.newInstance(BINDING_PACKAGE);
-            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-            JAXBElement<CTCustomGeometry2D> el = unmarshaller.unmarshal(staxReader, CTCustomGeometry2D.class);
-            return new CustomGeometry(el.getValue());
-        } catch (JAXBException e) {
-            LOG.log(POILogger.ERROR, "Unable to parse single custom geometry", e);
-            return null;
-        }
-    }
-
-    public static synchronized PresetGeometries getInstance(){
-        if(_inst == null) {
-            // use a local object first to not assign a partly constructed object
-            // in case of failure
-            PresetGeometries lInst = new PresetGeometries();
-            try {
-                InputStream is = PresetGeometries.class.
-                    getResourceAsStream("presetShapeDefinitions.xml");
-                try {
-                    lInst.init(is);
-                } finally {
-                    is.close();
-                }
-            } catch (Exception e){
-                throw new RuntimeException(e);
-            }
-            _inst = lInst;
-        }
-
-        return _inst;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java b/trunk/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
deleted file mode 100644
index d5e848b..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.awt.geom.Path2D;
-
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
-
-/**
- * Date: 10/25/11
- *
- * @author Yegor Kozlov
- */
-public class QuadToCommand implements PathCommand {
-    private String arg1, arg2, arg3, arg4;
-
-    QuadToCommand(CTAdjPoint2D pt1, CTAdjPoint2D pt2){
-        arg1 = pt1.getX().toString();
-        arg2 = pt1.getY().toString();
-        arg3 = pt2.getX().toString();
-        arg4 = pt2.getY().toString();
-    }
-
-    public void execute(Path2D.Double path, Context ctx){
-        double x1 = ctx.getValue(arg1);
-        double y1 = ctx.getValue(arg2);
-        double x2 = ctx.getValue(arg3);
-        double y2 = ctx.getValue(arg4);
-        path.quadTo(x1, y1, x2, y2);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/SinArcTanExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/SinArcTanExpression.java
deleted file mode 100644
index e14acb9..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/SinArcTanExpression.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Sine ArcTan Formula:
- * <gd name="dy1" fmla="sat2 x y z"/>
- *
- * <p>
- *     Arguments: 3 (fmla="sat2 x y z")
- *     Usage: "sat2 x y z" = (x*sin(arctan(z / y))) = value of this guide
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class SinArcTanExpression implements Expression {
-    private String arg1, arg2, arg3;
-
-    SinArcTanExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-        arg3 = m.group(3);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        double z = ctx.getValue(arg3);
-        return x*Math.sin(Math.atan(z / y));
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/SinExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/SinExpression.java
deleted file mode 100644
index ca0c110..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/SinExpression.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Sine Formula:
- * <gd name="z" fmla="sin x y"/>
- *
- * <p>
- *     Arguments: 2 (fmla="sin x y")
- *     Usage: "sin x y" = (x * sin( y )) = value of this guide
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class SinExpression implements Expression {
-    private String arg1, arg2;
-
-    SinExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2) / 60000;
-        return x * Math.sin(Math.toRadians(y));
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/SqrtExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/SqrtExpression.java
deleted file mode 100644
index 5cdd67c..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/SqrtExpression.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Square Root Formula:
- * <gd name="x" fmla="sqrt y"/>
- *
- * <p>
- *     Arguments: 1 (fmla="sqrt x")
- *     Usage: "sqrt x" = sqrt(x) = value of this guide
- * </p>
- * @author Yegor Kozlov
- */
-public class SqrtExpression implements Expression {
-    private String arg;
-
-    SqrtExpression(Matcher m){
-        arg =m.group(1);
-    }
-
-    public double evaluate(Context ctx){
-        double val = ctx.getValue(arg);
-        return Math.sqrt(val);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/draw/geom/TanExpression.java b/trunk/src/java/org/apache/poi/sl/draw/geom/TanExpression.java
deleted file mode 100644
index 7eebdce..0000000
--- a/trunk/src/java/org/apache/poi/sl/draw/geom/TanExpression.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.draw.geom;
-
-import java.util.regex.Matcher;
-
-/**
- * Tangent Formula:
- *
- * <gd name="z" fmla="tan x y"/>
- *
- * <p>
- * Arguments: 2 (fmla="tan x y")
- * Usage: "tan x y" = (x * tan( y )) = value of this guide
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class TanExpression implements Expression {
-    private String arg1, arg2;
-
-    TanExpression(Matcher m){
-        arg1 = m.group(1);
-        arg2 = m.group(2);
-    }
-
-    public double evaluate(Context ctx){
-        double x = ctx.getValue(arg1);
-        double y = ctx.getValue(arg2);
-        return x * Math.tan(Math.toRadians(y / 60000));
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java b/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
deleted file mode 100644
index 1ba4f13..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.util.Locale;
-
-public enum AutoNumberingScheme {
-    /** Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ... */
-    alphaLcParenBoth(0x0008, 1),
-    /** Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ... */
-    alphaUcParenBoth(0x000A, 2),
-    /** Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ... */
-    alphaLcParenRight(0x0009, 3),
-    /** Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ... */
-    alphaUcParenRight(0x000B, 4),
-    /** Lowercase Latin character followed by a period. Example: a., b., c., ... */
-    alphaLcPeriod(0x0000, 5),
-    /** Uppercase Latin character followed by a period. Example: A., B., C., ... */
-    alphaUcPeriod(0x0001, 6),
-    /** Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ... */
-    arabicParenBoth(0x000C, 7),
-    /** Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ... */
-    arabicParenRight(0x0002, 8),
-    /** Arabic numeral followed by a period. Example: 1., 2., 3., ... */
-    arabicPeriod(0x0003, 9),
-    /** Arabic numeral. Example: 1, 2, 3, ... */
-    arabicPlain(0x000D, 10),
-    /** Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ... */
-    romanLcParenBoth(0x0004, 11),
-    /** Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ... */
-    romanUcParenBoth(0x000E, 12),
-    /** Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ... */
-    romanLcParenRight(0x0005, 13),
-    /** Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), .... */
-    romanUcParenRight(0x000F, 14),
-    /** Lowercase Roman numeral followed by a period. Example: i., ii., iii., ... */
-    romanLcPeriod(0x0006, 15),
-    /** Uppercase Roman numeral followed by a period. Example: I., II., III., ... */
-    romanUcPeriod(0x0007, 16),
-    /** Double byte circle numbers. */
-    circleNumDbPlain(0x0012, 17),
-    /** Wingdings black circle numbers. */
-    circleNumWdBlackPlain(0x0014, 18),
-    /** Wingdings white circle numbers. */
-    circleNumWdWhitePlain(0x0013, 19),
-    /** Double-byte Arabic numbers with double-byte period. */
-    arabicDbPeriod(0x001D, 20),
-    /** Double-byte Arabic numbers. */
-    arabicDbPlain(0x001C, 21),
-    /** Simplified Chinese with single-byte period. */
-    ea1ChsPeriod(0x0011, 22),
-    /** Simplified Chinese. */
-    ea1ChsPlain(0x0010, 23),
-    /** Traditional Chinese with single-byte period. */
-    ea1ChtPeriod(0x0015, 24),
-    /** Traditional Chinese. */
-    ea1ChtPlain(0x0014, 25),
-    /** Japanese with double-byte period. */
-    ea1JpnChsDbPeriod(0x0026, 26),
-    /** Japanese/Korean. */
-    ea1JpnKorPlain(0x001A, 27),
-    /** Japanese/Korean with single-byte period. */
-    ea1JpnKorPeriod(0x001B, 28),
-    /** Bidi Arabic 1 (AraAlpha) with ANSI minus symbol. */
-    arabic1Minus(0x0017, 29),
-    /** Bidi Arabic 2 (AraAbjad) with ANSI minus symbol. */
-    arabic2Minus(0x0018, 30),
-    /** Bidi Hebrew 2 with ANSI minus symbol. */
-    hebrew2Minus(0x0019, 31),
-    /** Thai alphabetic character followed by a period. */
-    thaiAlphaPeriod(0x001E, 32),
-    /** Thai alphabetic character followed by a closing parenthesis. */
-    thaiAlphaParenRight(0x001F, 33),
-    /** Thai alphabetic character enclosed by parentheses. */
-    thaiAlphaParenBoth(0x0020, 34),
-    /** Thai numeral followed by a period. */
-    thaiNumPeriod(0x0021, 35),
-    /** Thai numeral followed by a closing parenthesis. */
-    thaiNumParenRight(0x0022, 36),
-    /** Thai numeral enclosed in parentheses. */
-    thaiNumParenBoth(0x0023, 37),
-    /** Hindi alphabetic character followed by a period. */
-    hindiAlphaPeriod(0x0024, 38),
-    /** Hindi numeric character followed by a period. */
-    hindiNumPeriod(0x0025, 39),
-    /** Hindi numeric character followed by a closing parenthesis. */
-    hindiNumParenRight(0x0027, 40),
-    /** Hindi alphabetic character followed by a period. */
-    hindiAlpha1Period(0x0027, 41);
-
-    public final int nativeId, ooxmlId;
-
-    AutoNumberingScheme(int nativeId, int ooxmlId) {
-        this.nativeId = nativeId;
-        this.ooxmlId = ooxmlId;
-    }
-
-    public static AutoNumberingScheme forNativeID(int nativeId) {
-        for (AutoNumberingScheme ans : values()) {
-            if (ans.nativeId == nativeId) return ans;
-        }
-        return null;
-    }
-
-    public static AutoNumberingScheme forOoxmlID(int ooxmlId) {
-        for (AutoNumberingScheme ans : values()) {
-            if (ans.ooxmlId == ooxmlId) return ans;
-        }
-        return null;
-    }
-
-    public String getDescription() {
-        switch (this) {
-        case alphaLcPeriod          : return "Lowercase Latin character followed by a period. Example: a., b., c., ...";
-        case alphaUcPeriod          : return "Uppercase Latin character followed by a period. Example: A., B., C., ...";
-        case arabicParenRight       : return "Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ...";
-        case arabicPeriod           : return "Arabic numeral followed by a period. Example: 1., 2., 3., ...";
-        case romanLcParenBoth       : return "Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ...";
-        case romanLcParenRight      : return "Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ...";
-        case romanLcPeriod          : return "Lowercase Roman numeral followed by a period. Example: i., ii., iii., ...";
-        case romanUcPeriod          : return "Uppercase Roman numeral followed by a period. Example: I., II., III., ...";
-        case alphaLcParenBoth       : return "Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ...";
-        case alphaLcParenRight      : return "Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ...";
-        case alphaUcParenBoth       : return "Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ...";
-        case alphaUcParenRight      : return "Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ...";
-        case arabicParenBoth        : return "Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ...";
-        case arabicPlain            : return "Arabic numeral. Example: 1, 2, 3, ...";
-        case romanUcParenBoth       : return "Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ...";
-        case romanUcParenRight      : return "Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), ...";
-        case ea1ChsPlain            : return "Simplified Chinese.";
-        case ea1ChsPeriod           : return "Simplified Chinese with single-byte period.";
-        case circleNumDbPlain       : return "Double byte circle numbers.";
-        case circleNumWdWhitePlain  : return "Wingdings white circle numbers.";
-        case circleNumWdBlackPlain  : return "Wingdings black circle numbers.";
-        case ea1ChtPlain            : return "Traditional Chinese.";
-        case ea1ChtPeriod           : return "Traditional Chinese with single-byte period.";
-        case arabic1Minus           : return "Bidi Arabic 1 (AraAlpha) with ANSI minus symbol.";
-        case arabic2Minus           : return "Bidi Arabic 2 (AraAbjad) with ANSI minus symbol.";
-        case hebrew2Minus           : return "Bidi Hebrew 2 with ANSI minus symbol.";
-        case ea1JpnKorPlain         : return "Japanese/Korean.";
-        case ea1JpnKorPeriod        : return "Japanese/Korean with single-byte period.";
-        case arabicDbPlain          : return "Double-byte Arabic numbers.";
-        case arabicDbPeriod         : return "Double-byte Arabic numbers with double-byte period.";
-        case thaiAlphaPeriod        : return "Thai alphabetic character followed by a period.";
-        case thaiAlphaParenRight    : return "Thai alphabetic character followed by a closing parenthesis.";
-        case thaiAlphaParenBoth     : return "Thai alphabetic character enclosed by parentheses.";
-        case thaiNumPeriod          : return "Thai numeral followed by a period.";
-        case thaiNumParenRight      : return "Thai numeral followed by a closing parenthesis.";
-        case thaiNumParenBoth       : return "Thai numeral enclosed in parentheses.";
-        case hindiAlphaPeriod       : return "Hindi alphabetic character followed by a period.";
-        case hindiNumPeriod         : return "Hindi numeric character followed by a period.";
-        case ea1JpnChsDbPeriod      : return "Japanese with double-byte period.";
-        case hindiNumParenRight     : return "Hindi numeric character followed by a closing parenthesis.";
-        case hindiAlpha1Period      : return "Hindi alphabetic character followed by a period.";
-        default                     : return "Unknown Numbered Scheme";
-        }
-    }
-
-    public String format(int value) {
-        String index = formatIndex(value);
-        String cased = formatCase(index);
-        String seperated = formatSeperator(cased);
-        return seperated;
-    }
-
-    private String formatSeperator(String cased) {
-        String name = name().toLowerCase(Locale.ROOT);
-        if (name.contains("plain")) return cased;
-        if (name.contains("parenright")) return cased+")";
-        if (name.contains("parenboth")) return "("+cased+")";
-        if (name.contains("period")) return cased+".";
-        if (name.contains("minus")) return cased+"-"; // ???
-        return cased;
-    }
-
-    private String formatCase(String index) {
-        String name = name().toLowerCase(Locale.ROOT);
-        if (name.contains("lc")) return index.toLowerCase(Locale.ROOT);
-        if (name.contains("uc")) return index.toUpperCase(Locale.ROOT);
-        return index;
-    }
-
-    private static final String ARABIC_LIST = "0123456789";
-    private static final String ALPHA_LIST = "abcdefghijklmnopqrstuvwxyz";
-    private static final String WINGDINGS_WHITE_LIST =
-            "\u0080\u0081\u0082\u0083\u0084\u0085\u0086\u0087\u0088\u0089";
-    private static final String WINGDINGS_BLACK_LIST =
-            "\u008B\u008C\u008D\u008E\u008F\u0090\u0091\u0092\u0093\u0094";
-    private static final String CIRCLE_DB_LIST =
-            "\u2776\u2777\u2778\u2779\u277A\u277B\u277C\u277D\u277E";
-
-    private String formatIndex(int value) {
-        String name = name().toLowerCase(Locale.ROOT);
-        if (name.startsWith("roman")) {
-            return formatRomanIndex(value);
-        } else if (name.startsWith("arabic") && !name.contains("db")) {
-            return getIndexedList(value, ARABIC_LIST, false);
-        } else if (name.startsWith("alpha")) {
-            return getIndexedList(value, ALPHA_LIST, true);
-        } else if (name.contains("WdWhite")) {
-            return (value == 10) ? "\u008A"
-                : getIndexedList(value, WINGDINGS_WHITE_LIST, false);
-        } else if (name.contains("WdBlack")) {
-            return (value == 10) ? "\u0095"
-                : getIndexedList(value, WINGDINGS_BLACK_LIST, false);
-        } else if (name.contains("NumDb")) {
-            return (value == 10) ? "\u277F"
-                : getIndexedList(value, CIRCLE_DB_LIST, true);
-        } else {
-            return "?";
-        }
-    }
-
-    private static String getIndexedList(int val, String list, boolean oneBased) {
-        StringBuilder sb = new StringBuilder();
-        addIndexedChar(val, list, oneBased, sb);
-        return sb.toString();
-    }
-
-    private static void addIndexedChar(int val, String list, boolean oneBased, StringBuilder sb) {
-        if (oneBased) val -= 1;
-        final int len = list.length();
-        if (val >= len) {
-            addIndexedChar(val/len, list, oneBased, sb);
-        }
-        sb.append(list.charAt(val%len));
-    }
-
-
-    private String formatRomanIndex(int value) {
-        //M (1000), CM (900), D (500), CD (400), C (100), XC (90), L (50), XL (40), X (10), IX (9), V (5), IV (4) and I (1).
-        final int[] VALUES = new int[]{1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};
-        final String[] ROMAN = new String[]{"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"};
-        final String conciseList[][] = {
-            {"XLV", "VL"}, //45
-            {"XCV", "VC"}, //95
-            {"CDL", "LD"}, //450
-            {"CML", "LM"}, //950
-            {"CMVC", "LMVL"}, //995
-            {"CDXC", "LDXL"}, //490
-            {"CDVC", "LDVL"}, //495
-            {"CMXC", "LMXL"}, //990
-            {"XCIX", "VCIV"}, //99
-            {"XLIX", "VLIV"}, //49
-            {"XLIX", "IL"}, //49
-            {"XCIX", "IC"}, //99
-            {"CDXC", "XD"}, //490
-            {"CDVC", "XDV"}, //495
-            {"CDIC", "XDIX"}, //499
-            {"LMVL", "XMV"}, //995
-            {"CMIC", "XMIX"}, //999
-            {"CMXC", "XM"}, // 990
-            {"XDV", "VD"},  //495
-            {"XDIX", "VDIV"}, //499
-            {"XMV", "VM"}, // 995
-            {"XMIX", "VMIV"}, //999
-            {"VDIV", "ID"}, //499
-            {"VMIV", "IM"} //999
-        };
-
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < 13; i++) {
-            while (value >= VALUES[i]) {
-                value -= VALUES[i];
-                sb.append(ROMAN[i]);
-            }
-        }
-        String result = sb.toString();
-        for (String cc[] : conciseList) {
-            result = result.replace(cc[0], cc[1]);
-        }
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java
deleted file mode 100644
index 5a77bda..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface AutoShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends TextShape<S,P> {
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Background.java b/trunk/src/java/org/apache/poi/sl/usermodel/Background.java
deleted file mode 100644
index 64f3b36..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Background.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface Background<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Shape<S,P> {
-    FillStyle getFillStyle();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/ColorStyle.java b/trunk/src/java/org/apache/poi/sl/usermodel/ColorStyle.java
deleted file mode 100644
index fba7f5e..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/ColorStyle.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Color;
-
-
-public interface ColorStyle {
-    Color getColor();
-    
-    /**
-     * the opacity as expressed by a percentage value
-     *
-     * @return  opacity in percents in the range [0..100000]
-     * or -1 if the value is not set
-     */
-    int getAlpha();
-    
-    /**
-     * the hue shift as expressed by a percentage relative to the input color.
-     * Be aware that OOXML also returns values greater than 100%
-     * 
-     * @return  hue shift in percents in the range [0..100000] (usually ...)
-     * or -1 if the value is not set
-     */
-    int getHueOff();
-    
-    /**
-     * the hue as expressed by a percentage relative to the input color.
-     * Be aware that OOXML also returns values greater than 100%
-     * 
-     * @return  hue in percents in the range [0..100000] (usually ...)
-     * or -1 if the value is not set
-     */
-    int getHueMod();
-    
-    /**
-     * the saturation shift as expressed by a percentage relative to the input color.
-     * Be aware that OOXML also returns values greater than 100%
-     * 
-     * @return  saturation shift in percents in the range [0..100000] (usually ...)
-     * or -1 if the value is not set
-     */
-    int getSatOff();
-    
-    /**
-     * the saturation as expressed by a percentage relative to the input color.
-     * Be aware that OOXML also returns values greater than 100%
-     * 
-     * @return  saturation in percents in the range [0..100000] (usually ...)
-     * or -1 if the value is not set
-     */
-    int getSatMod();
-    
-    /**
-     * the luminance shift as expressed by a percentage relative to the input color.
-     * Be aware that OOXML also returns values greater than 100%
-     *
-     * @return  luminance shift in percents in the range [0..100000] (usually ...)
-     * or -1 if the value is not set
-     */
-    int getLumOff();
-    
-    /**
-     * the luminance as expressed by a percentage relative to the input color.
-     * Be aware that OOXML also returns values greater than 100%.
-     *
-     * @return  luminance in percents in the range [0..100000] (usually ...)
-     * or -1 if the value is not set
-     */
-    int getLumMod();
-    
-    /**
-     * specifies a darker version of its input color.
-     * A 10% shade is 10% of the input color combined with 90% black.
-     * Be aware that OOXML also returns values greater than 100%.
-     * 
-     * @return the value of the shade specified as percents in the range [0..100000] (usually ...)
-     * with 0% indicating minimal shade and 100% indicating maximum
-     * or -1 if the value is not set
-     */
-    int getShade();
-
-    /**
-     * specifies a lighter version of its input color.
-     * A 10% tint is 10% of the input color combined with 90% white.
-     * Be aware that OOXML also returns values greater than 100%
-     *
-     * @return the value of the tint specified as percents in the range [0..100000] (usually ...)
-     * with 0% indicating minimal tint and 100% indicating maximum
-     * or -1 if the value is not set
-     */
-    int getTint();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
deleted file mode 100644
index 39e34d2..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface ConnectorShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends SimpleShape<S,P> {
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/FillStyle.java b/trunk/src/java/org/apache/poi/sl/usermodel/FillStyle.java
deleted file mode 100644
index 8414000..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/FillStyle.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface FillStyle {
-    PaintStyle getPaint();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/FontCollection.java b/trunk/src/java/org/apache/poi/sl/usermodel/FontCollection.java
deleted file mode 100644
index 61278f4..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/FontCollection.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface FontCollection {
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
deleted file mode 100644
index 9536065..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.geom.Path2D;
-
-public interface FreeformShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends AutoShape<S,P> {
-    /**
-     * Gets the shape path.
-     * <p>
-     *     The path is translated in the shape's coordinate system, i.e.
-     *     freeform.getPath().getBounds2D() equals to freeform.getAnchor()
-     *     (small discrepancies are possible due to rounding errors)
-     * </p>
-     *
-     * @return the path
-     */
-    Path2D.Double getPath();
-
-    /**
-     * Set the shape path
-     *
-     * @param path  shape outline
-     * @return the number of points written
-     */
-    int setPath(Path2D.Double path);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java b/trunk/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
deleted file mode 100644
index 20621ef..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface GraphicalFrame<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Shape<S,P>, PlaceableShape<S,P> {
-
-    /**
-     * @return a fallback representation as picture shape
-     */
-    PictureShape<S,P> getFallbackPicture();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java
deleted file mode 100644
index a7545a4..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.geom.Rectangle2D;
-
-public interface GroupShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Shape<S,P>, ShapeContainer<S,P>, PlaceableShape<S,P> {
-
-    /**
-     * Gets the coordinate space of this group.  All children are constrained
-     * to these coordinates.
-     *
-     * @return the coordinate space of this group
-     */
-    Rectangle2D getInteriorAnchor();
-    
-    /**
-     * Sets the coordinate space of this group.  All children are constrained
-     * to these coordinates.
-     *
-     * @param anchor the coordinate space of this group
-     */
-    void setInteriorAnchor(Rectangle2D anchor);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Hyperlink.java b/trunk/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
deleted file mode 100644
index 3c2a9fc..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-/**
- * A PowerPoint hyperlink
- * @since POI 3.14 beta 2
- */
-public interface Hyperlink<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends org.apache.poi.common.usermodel.Hyperlink {
-    /**
-     * Link to an email
-     *
-     * @param emailAddress the email address
-     * @since POI 3.14-Beta2 
-     */
-    void linkToEmail(String emailAddress);
-    
-    /**
-     * Link to a web page / URL
-     *
-     * @param url the url
-     * @since POI 3.14-Beta2
-     */
-    void linkToUrl(String url);
-
-    /**
-     * Link to a slide in this slideshow
-     *
-     * @param slide the linked slide
-     * @since POI 3.14-Beta2
-     */
-    void linkToSlide(Slide<S,P> slide);
-
-    /**
-     * Link to the next slide (relative from the current)
-     * 
-     * @since POI 3.14-Beta2
-     */
-    void linkToNextSlide();
-
-    /**
-     * Link to the previous slide (relative from the current)
-     * 
-     * @since POI 3.14-Beta2
-     */
-    void linkToPreviousSlide();
-
-    /**
-     * Link to the first slide in this slideshow
-     * 
-     * @since POI 3.14-Beta2
-     */
-    void linkToFirstSlide();
-
-    /**
-     * Link to the last slide in this slideshow
-     * 
-     * @since POI 3.14-Beta2
-     */
-    void linkToLastSlide();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java b/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java
deleted file mode 100644
index c7e59c2..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-/**
- * This is a replacement for {@link java.awt.Insets} which works on doubles
- * instead of ints
- */
-public final class Insets2D implements Cloneable {
-
-    /**
-     * The inset from the top.
-     * This value is added to the Top of the rectangle
-     * to yield a new location for the Top.
-     */
-    public double top;
-
-    /**
-     * The inset from the left.
-     * This value is added to the Left of the rectangle
-     * to yield a new location for the Left edge.
-     */
-    public double left;
-
-    /**
-     * The inset from the bottom.
-     * This value is subtracted from the Bottom of the rectangle
-     * to yield a new location for the Bottom.
-     */
-    public double bottom;
-
-    /**
-     * The inset from the right.
-     * This value is subtracted from the Right of the rectangle
-     * to yield a new location for the Right edge.
-     */
-    public double right;
-    
-    /**
-     * Creates and initializes a new <code>Insets</code> object with the 
-     * specified top, left, bottom, and right insets. 
-     * @param       top   the inset from the top.
-     * @param       left   the inset from the left.
-     * @param       bottom   the inset from the bottom.
-     * @param       right   the inset from the right.
-     */
-    public Insets2D(double top, double left, double bottom, double right) {
-    this.top = top;
-    this.left = left;
-    this.bottom = bottom;
-    this.right = right;
-    }
-
-    /**
-     * Set top, left, bottom, and right to the specified values
-     *
-     * @param       top   the inset from the top.
-     * @param       left   the inset from the left.
-     * @param       bottom   the inset from the bottom.
-     * @param       right   the inset from the right.
-     * @since 1.5
-     */
-    public void set(double top, double left, double bottom, double right) {
-        this.top = top;
-        this.left = left;
-        this.bottom = bottom;
-        this.right = right;
-    }
-
-    /**
-     * Checks whether two insets objects are equal. Two instances 
-     * of <code>Insets</code> are equal if the four integer values
-     * of the fields <code>top</code>, <code>left</code>, 
-     * <code>bottom</code>, and <code>right</code> are all equal.
-     * @return      <code>true</code> if the two insets are equal;
-     *                          otherwise <code>false</code>.
-     * @since       JDK1.1
-     */
-    public boolean equals(Object obj) {
-    if (obj instanceof Insets2D) {
-        Insets2D insets = (Insets2D)obj;
-        return ((top == insets.top) && (left == insets.left) &&
-            (bottom == insets.bottom) && (right == insets.right));
-    }
-    return false;
-    }
-
-    /**
-     * Returns the hash code for this Insets.
-     *
-     * @return    a hash code for this Insets.
-     */
-    public int hashCode() {
-        double sum1 = left + bottom;
-        double sum2 = right + top;
-        double val1 = sum1 * (sum1 + 1)/2 + left;
-        double val2 = sum2 * (sum2 + 1)/2 + top;
-        double sum3 = val1 + val2;
-        return (int)(sum3 * (sum3 + 1)/2 + val2);
-    }
-
-    /**
-     * Returns a string representation of this <code>Insets</code> object. 
-     * This method is intended to be used only for debugging purposes, and 
-     * the content and format of the returned string may vary between 
-     * implementations. The returned string may be empty but may not be 
-     * <code>null</code>.
-     * 
-     * @return  a string representation of this <code>Insets</code> object.
-     */
-    public String toString() {
-    return getClass().getName() + "[top="  + top + ",left=" + left + ",bottom=" + bottom + ",right=" + right + "]";
-    }
-
-    /**
-     * Create a copy of this object.
-     * @return     a copy of this <code>Insets2D</code> object.
-     */
-    @Override
-    public Insets2D clone() {
-        return new Insets2D(top, left, bottom, right);
-    }
-    
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Line.java b/trunk/src/java/org/apache/poi/sl/usermodel/Line.java
deleted file mode 100644
index e9325c5..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Line.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Interface for Lines ... this will be eventually removed, 
- * so don't depend on it in user classes, but use AutoShape instead!
- */
-
-@Internal
-public interface Line<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends AutoShape<S,P> {
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/LineDecoration.java b/trunk/src/java/org/apache/poi/sl/usermodel/LineDecoration.java
deleted file mode 100644
index ad61e41..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/LineDecoration.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface LineDecoration {
-    /**
-     *  Represents the shape decoration that appears at the ends of lines.
-     */
-    enum DecorationShape {
-        NONE(0,1),
-        TRIANGLE(1,2),
-        STEALTH(2,3),
-        DIAMOND(3,4),
-        OVAL(4,5),
-        ARROW(5,6);
-
-        public final int nativeId;
-        public final int ooxmlId;
-
-        DecorationShape(int nativeId, int ooxmlId) {
-            this.nativeId = nativeId;
-            this.ooxmlId = ooxmlId;
-        }
-
-        public static DecorationShape fromNativeId(int nativeId) {
-            for (DecorationShape ld : values()) {
-                if (ld.nativeId == nativeId) return ld;
-            }
-            return null;
-        }
-
-        public static DecorationShape fromOoxmlId(int ooxmlId) {
-            for (DecorationShape ds : values()) {
-                if (ds.ooxmlId == ooxmlId) return ds;
-            }
-            return null;
-        }
-    }
-
-    enum DecorationSize {
-        SMALL(0, 1),
-        MEDIUM(1, 2),
-        LARGE(2, 3);
-
-        public final int nativeId;
-        public final int ooxmlId;
-
-        DecorationSize(int nativeId, int ooxmlId) {
-            this.nativeId = nativeId;
-            this.ooxmlId = ooxmlId;
-        }
-
-        public static DecorationSize fromNativeId(int nativeId) {
-            for (DecorationSize ld : values()) {
-                if (ld.nativeId == nativeId) return ld;
-            }
-            return null;
-        }
-
-        public static DecorationSize fromOoxmlId(int ooxmlId) {
-            for (DecorationSize ds : values()) {
-                if (ds.ooxmlId == ooxmlId) return ds;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * @return the line start shape
-     */
-    DecorationShape getHeadShape();
-
-    /**
-     * @return the width of the start shape
-     */
-    DecorationSize getHeadWidth();
-
-    /**
-     * @return the length of the start shape
-     */
-    DecorationSize getHeadLength();
-
-    /**
-     * @return the line end shape
-     */
-    DecorationShape getTailShape();
-
-    /**
-     * @return the width of the end shape
-     */
-    DecorationSize getTailWidth();
-
-    /**
-     * @return the length of the end shape
-     */
-    DecorationSize getTailLength();
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java b/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
deleted file mode 100644
index fdfcf43..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface MasterSheet<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Sheet<S,P> {
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java b/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java
deleted file mode 100644
index d156e98..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.util.List;
-
-public interface Notes<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Sheet<S,P> {
-	List<? extends List<P>> getTextParagraphs();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/PaintStyle.java b/trunk/src/java/org/apache/poi/sl/usermodel/PaintStyle.java
deleted file mode 100644
index 2565104..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/PaintStyle.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.io.InputStream;
-
-
-
-public interface PaintStyle {
-
-    public interface SolidPaint extends PaintStyle {
-        ColorStyle getSolidColor();
-    }
-
-    public interface GradientPaint extends PaintStyle {
-        enum GradientType { linear, circular, shape }
-        
-        /**
-         * @return the angle of the gradient
-         */
-        double getGradientAngle();
-        ColorStyle[] getGradientColors();
-        float[] getGradientFractions();
-        boolean isRotatedWithShape();
-        GradientType getGradientType();
-    }    
-    
-    public interface TexturePaint extends PaintStyle {
-        /**
-         * @return the raw image stream
-         */
-        InputStream getImageData();
-
-        /**
-         * @return the content type of the image data
-         */
-        String getContentType();
-        
-        /**
-         * @return the alpha mask in percents [0..100000]
-         */
-        int getAlpha();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/PictureData.java b/trunk/src/java/org/apache/poi/sl/usermodel/PictureData.java
deleted file mode 100644
index 60e6266..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/PictureData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Dimension;
-import java.io.IOException;
-
-public interface PictureData {
-    
-    enum PictureType {
-        /** Extended windows meta file */
-        EMF(2,2,"image/x-emf",".emf"),
-        /** Windows Meta File */
-        WMF(3,3,"image/x-wmf",".wmf"),
-        /** Mac PICT format */
-        PICT(4,4,"image/pict",".pict"), // or image/x-pict (for HSLF) ???
-        /** JPEG format */
-        JPEG(5,5,"image/jpeg",".jpg"),
-        /** PNG format */
-        PNG(6,6,"image/png",".png"),
-        /** Device independent bitmap */
-        DIB(7,7,"image/dib",".dib"),
-        /** GIF image format */
-        GIF(-1,8,"image/gif",".gif"),
-        /** Tag Image File (.tiff) */
-        TIFF(-1,9,"image/tiff",".tif"),
-        /** Encapsulated Postscript (.eps) */
-        EPS(-1,10,"image/x-eps",".eps"),
-        /** Windows Bitmap (.bmp) */
-        BMP(-1,11,"image/x-ms-bmp",".bmp"),
-        /** WordPerfect graphics (.wpg) */
-        WPG(-1,12,"image/x-wpg",".wpg"),
-        /** Microsoft Windows Media Photo image (.wdp) */
-        WDP(-1,13,"image/vnd.ms-photo",".wdp");
-        
-        public final int nativeId, ooxmlId;
-        public final String contentType,extension;
-
-        PictureType(int nativeId, int ooxmlId,String contentType,String extension) {
-            this.nativeId = nativeId;
-            this.ooxmlId = ooxmlId;
-            this.contentType = contentType;
-            this.extension = extension;
-        }
-        
-        public static PictureType forNativeID(int nativeId) {
-            for (PictureType ans : values()) {
-                if (ans.nativeId == nativeId) return ans;
-            }
-            return null;
-        }
-
-        public static PictureType forOoxmlID(int ooxmlId) {
-            for (PictureType ans : values()) {
-                if (ans.ooxmlId == ooxmlId) return ans;
-            }
-            return null;
-        }
-    }
-    
-    
-    /**
-     * Returns content type (mime type) of this picture.
-     *
-     * @return content type of this picture.
-     */
-	String getContentType();
-	
-	/**
-	 * @return the picture type
-	 */
-	PictureType getType();
-
-    /**
-     * Returns the binary data of this Picture
-     * @return picture data
-     */
-	byte[] getData();
-
-    /**
-     * Sets the binary picture data
-     * @param data picture data
-     */
-	void setData(byte[] data) throws IOException;
-	
-	/**
-	 * Gets the checksum - the checksum can be of various length -
-	 * mostly it's 8 (XSLF) or 16 (HSLF) bytes long.  
-	 * @return the checksum
-	 */
-	byte[] getChecksum();
-	
-    /**
-     * Return the original image dimensions in points
-     * (for formats supported by BufferedImage).
-     *
-     * Will return a Dimension with a default width of 200x200 if the format unsupported.
-     */
-	Dimension getImageDimension();
-	
-    /**
-     * Return the original image dimensions in pixels
-     * @see PictureData#getImageDimension()
-     */
-	Dimension getImageDimensionInPixels();
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java
deleted file mode 100644
index 671a439..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Insets;
-
-public interface PictureShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends SimpleShape<S,P> {
-    /**
-     * Returns the picture data for this picture.
-     *
-     * @return the picture data for this picture.
-     */
-    PictureData getPictureData();
-
-	/**
-	 * Returns the clipping values as percent ratio relatively to the image size.
-	 * The clipping are returned as insets converted/scaled to 100000 (=100%).
-	 * 
-	 * @return the clipping rectangle, which is given in percent in relation to the image width/height
-	 */
-	Insets getClipping();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
deleted file mode 100644
index 9fdcf91..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.geom.Rectangle2D;
-
-public interface PlaceableShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> {
-    ShapeContainer<S,P> getParent();
-    
-    /**
-     * @return the sheet this shape belongs to
-     */
-    Sheet<S,P> getSheet();
-    
-    /**
-     * @return the position of this shape within the drawing canvas.
-     *         The coordinates are expressed in points
-     */
-    Rectangle2D getAnchor();
-
-    /**
-     * @param anchor the position of this shape within the drawing canvas.
-     *               The coordinates are expressed in points
-     */
-    void setAnchor(Rectangle2D anchor);
-
-    /**
-     * Rotation angle in degrees
-     * <p>
-     * Positive angles are clockwise (i.e., towards the positive y axis);
-     * negative angles are counter-clockwise (i.e., towards the negative y axis).
-     * </p>
-     *
-     * @return rotation angle in degrees
-     */
-    double getRotation();
-
-    /**
-     * Rotate this shape.
-     * <p>
-     * Positive angles are clockwise (i.e., towards the positive y axis);
-     * negative angles are counter-clockwise (i.e., towards the negative y axis).
-     * </p>
-     *
-     * @param theta the rotation angle in degrees.
-     */
-    void setRotation(double theta);
-
-    /**
-     * @param flip whether the shape is horizontally flipped
-     */
-    void setFlipHorizontal(boolean flip);
-
-    /**
-     * Whether the shape is vertically flipped
-     *
-     * @param flip whether the shape is vertically flipped
-     */
-    void setFlipVertical(boolean flip);
-
-    /**
-     * Whether the shape is horizontally flipped
-     *
-     * @return whether the shape is horizontally flipped
-     */
-    boolean getFlipHorizontal();
-
-    /**
-     * Whether the shape is vertically flipped
-     *
-     * @return whether the shape is vertically flipped
-     */
-    boolean getFlipVertical();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Placeholder.java b/trunk/src/java/org/apache/poi/sl/usermodel/Placeholder.java
deleted file mode 100644
index a3bc9c7..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Placeholder.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public enum Placeholder {
-    /**
-     * No placeholder shape.
-     */
-    NONE(0,0,0,0,0),
-    /**
-     * Title text placeholder shape.
-     */
-    TITLE(13,1,1,1,1),
-    /**
-     * Body text placeholder shape.
-     */
-    BODY(14,2,12,6,2),
-    /**
-     * Center title text placeholder shape.
-     */
-    CENTERED_TITLE(15,3,3,3,3),
-    /**
-     * Sub-title text placeholder shape.
-     */
-    SUBTITLE(16,4,4,4,4),
-    /**
-     * Date placeholder shape.
-     */
-    DATETIME(7,7,7,7,5),
-    /**
-     * Slide number placeholder shape.
-     */
-    SLIDE_NUMBER(8,8,8,8,6),
-    /**
-     * Footer placeholder shape.
-     */
-    FOOTER(9,9,9,9,7),
-    /**
-     *  Header placeholder shape.
-     */
-    HEADER(10,10,10,10,8),
-    /**
-     * Object placeholder shape.
-     */
-    CONTENT(19,19,19,19,9),
-    /**
-     * Graph object placeholder shape.
-     */
-    CHART(20,20,20,20,10),
-    /**
-     * Table object placeholder shape.
-     */
-    TABLE(21,21,21,21,11),
-    /**
-     * Clipart object placeholder shape.
-     */
-    CLIP_ART(22,22,22,22,12),
-    /**
-     * Organization chart object placeholder shape.
-     */
-    DGM(23,23,23,23,13),
-    /**
-     * Media object placeholder shape.
-     */
-    MEDIA(24,24,24,24,14),
-    /**
-     * Slide image placeholder shape.
-     */
-    SLIDE_IMAGE(11,11,11,5,15),
-    /**
-     * Picture object placeholder shape.
-     */
-    PICTURE(26,26,26,26,16),
-    /**
-     * Vertical object placeholder shape.
-     */
-    VERTICAL_OBJECT(25,25,25,25,-2),
-    /**
-     * Vertical title text placeholder shape.
-     */
-    VERTICAL_TEXT_TITLE(17,17,17,17,-2),
-    /**
-     * Vertical body text placeholder shape.
-     */
-    VERTICAL_TEXT_BODY(18,18,18,18,-2)
-    ;
-    
-    public final int nativeSlideId;
-    public final int nativeSlideMasterId;
-    public final int nativeNotesId;
-    public final int nativeNotesMasterId;
-    public final int ooxmlId;
-    
-    Placeholder(int nativeSlideId, int nativeSlideMasterId, int nativeNotesId, int nativeNotesMasterId, int ooxmlId) {
-        this.nativeSlideId = nativeSlideId;
-        this.nativeSlideMasterId = nativeSlideMasterId;
-        this.nativeNotesId = nativeNotesId;
-        this.nativeNotesMasterId = nativeNotesMasterId;
-        this.ooxmlId = ooxmlId;
-    }
-    
-    public static Placeholder lookupNative(int nativeId) {
-        for (Placeholder ph : values()) {
-            if (ph.nativeSlideId == nativeId ||
-                ph.nativeSlideMasterId == nativeId || 
-                ph.nativeNotesId == nativeId ||
-                ph.nativeNotesMasterId == nativeId
-            ) {
-                return ph;
-            }
-        }
-        return null;
-    }
-    
-    public static Placeholder lookupOoxml(int ooxmlId) {
-        for (Placeholder ph : values()) {
-            if (ph.ooxmlId == ooxmlId) {
-                return ph;
-            }
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/PresetColor.java b/trunk/src/java/org/apache/poi/sl/usermodel/PresetColor.java
deleted file mode 100644
index f78dbca..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/PresetColor.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Color;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Preset colors defined in DrawingML aka known/system colors
- * 
- * @see <a href="https://msdn.microsoft.com/library/system.drawing.knowncolor.aspx">KnownColor Enumeration</a>
- * @see <a href="https://msdn.microsoft.com/library/system.windows.media.colors.aspx">Colors Class</a>
- */
-public enum PresetColor {
-    // the order of this enum can be found in the definition of .net System.Drawing.KnownColor enumeration
-    // or by running the the program in the linked documentation
-    
-    // default colors for theme-depending colors taken from ... (last post):
-    // https://social.technet.microsoft.com/Forums/windows/en-US/ac76cc56-6ff2-4778-b260-8141d7170a3b/windows-7-highlight-text-color-or-selected-text-color-in-aero
-    
-    // see ST_SystemColorVal for system color names
-    
-    /** The system-defined color of the active window's border. */
-    ActiveBorder            (0xffb4b4b4,   1, "activeBorder"),
-    /** The system-defined color of the background of the active window's title bar. */
-    ActiveCaption           (0xff99b4d1,   2, "activeCaption"),
-    /** The system-defined color of the text in the active window's title bar. */
-    ActiveCaptionText       (0xff000000,   3, "captionText"),
-    /** The application workspace is the area in a multiple-document view that is not being occupied by documents. */
-    AppWorkspace            (0xffababab,   4, "appWorkspace"),
-    /** The system-defined face color of a 3-D element. */
-    Control                 (0xfff0f0f0,   5, "btnFace"),
-    /** The system-defined shadow color of a 3-D element. The shadow color is applied to parts of a 3-D element that face away from the light source. */
-    ControlDark             (0xff696969,   6, "btnShadow"),
-    /** The system-defined color that is the dark shadow color of a 3-D element. The dark shadow color is applied to the parts of a 3-D element that are the darkest color. */
-    ControlDarkDark         (0xff000000,   7, "3dDkShadow"),
-    /** The system-defined color that is the light color of a 3-D element. The light color is applied to parts of a 3-D element that face the light source. */
-    ControlLight            (0xffe3e3e3,   8, "btnHighlight"),
-    /** The system-defined highlight color of a 3-D element. The highlight color is applied to the parts of a 3-D element that are the lightest color. */
-    ControlLightLight       (0xffe3e3e3,   9, "3dLight"),
-    /** The system-defined color of text in a 3-D element. */
-    ControlText             (0xff000000,  10, "btnText"),
-    /** The system-defined color of the desktop. */
-    Desktop                 (0xff000000,  11, "background"),
-    /** The system-defined color of dimmed text. Items in a list that are disabled are displayed in dimmed text. */
-    GrayText                (0xff6d6d6d,  12, "grayText"),
-    /** The system-defined color of the background of selected items. This includes selected menu items as well as selected text. */
-    Highlight               (0xff3399ff,  13, "highlight"),
-    /** The system-defined color of the text of selected items. */
-    HighlightText           (0xffffffff,  14, "highlightText"),
-    /** The system-defined color used to designate a hot-tracked item. Single-clicking a hot-tracked item executes the item. */
-    HotTrack                (0xff0066cc,  15, "hotLight"),
-    /** The system-defined color of an inactive window's border. */
-    InactiveBorder          (0xfff4f7fc,  16, "inactiveBorder"),
-    /** The system-defined color of the background of an inactive window's title bar. */
-    InactiveCaption         (0xffbfcddb,  17, "inactiveCaption"),
-    /** The system-defined color of the text in an inactive window's title bar. */
-    InactiveCaptionText     (0xff000000,  18, "inactiveCaptionText"),
-    /** The system-defined color of the background of a ToolTip. */
-    Info                    (0xffffffe1,  19, "infoBk"),
-    /** The system-defined color of the text of a ToolTip. */
-    InfoText                (0xff000000,  20, "infoText"),
-    /** The system-defined color of a menu's background. */
-    Menu                    (0xfff0f0f0,  21, "menu"),
-    /** The system-defined color of a menu's text. */
-    MenuText                (0xff000000,  22, "menuText"),
-    /** The system-defined color of the background of a scroll bar. */
-    ScrollBar               (0xffc8c8c8,  23, "scrollBar"),
-    /** The system-defined color of the background in the client area of a window. */
-    Window                  (0xffffffff,  24, "window"),
-    /** The system-defined color of a window frame. */
-    WindowFrame             (0xff646464,  25, "windowFrame"),
-    /** The system-defined color of the text in the client area of a window. */
-    WindowText              (0xff000000,  26, "windowText"),
-    Transparent             (0x00ffffff,  27, null),
-    AliceBlue               (0xfff0f8ff,  28, "aliceBlue"),
-    AntiqueWhite            (0xfffaebd7,  29, "antiqueWhite"),
-    Aqua                    (0xff00ffff,  30, "aqua"),
-    Aquamarine              (0xff7fffd4,  31, "aquamarine"),
-    Azure                   (0xfff0ffff,  32, "azure"),
-    Beige                   (0xfff5f5dc,  33, "beige"),
-    Bisque                  (0xffffe4c4,  34, "bisque"),
-    Black                   (0xff000000,  35, "black"),
-    BlanchedAlmond          (0xffffebcd,  36, "blanchedAlmond"),
-    Blue                    (0xff0000ff,  37, "blue"),
-    BlueViolet              (0xff8a2be2,  38, "blueViolet"),
-    Brown                   (0xffa52a2a,  39, "brown"),
-    BurlyWood               (0xffdeb887,  40, "burlyWood"),
-    CadetBlue               (0xff5f9ea0,  41, "cadetBlue"),
-    Chartreuse              (0xff7fff00,  42, "chartreuse"),
-    Chocolate               (0xffd2691e,  43, "chocolate"),
-    Coral                   (0xffff7f50,  44, "coral"),
-    CornflowerBlue          (0xff6495ed,  45, "cornflowerBlue"),
-    Cornsilk                (0xfffff8dc,  46, "cornsilk"),
-    Crimson                 (0xffdc143c,  47, "crimson"),
-    Cyan                    (0xff00ffff,  48, "cyan"),
-    DarkBlue                (0xff00008b,  49, "dkBlue"),
-    DarkCyan                (0xff008b8b,  50, "dkCyan"),
-    DarkGoldenrod           (0xffb8860b,  51, "dkGoldenrod"),
-    DarkGray                (0xffa9a9a9,  52, "dkGray"),
-    DarkGreen               (0xff006400,  53, "dkGreen"),
-    DarkKhaki               (0xffbdb76b,  54, "dkKhaki"),
-    DarkMagenta             (0xff8b008b,  55, "dkMagenta"),
-    DarkOliveGreen          (0xff556b2f,  56, "dkOliveGreen"),
-    DarkOrange              (0xffff8c00,  57, "dkOrange"),
-    DarkOrchid              (0xff9932cc,  58, "dkOrchid"),
-    DarkRed                 (0xff8b0000,  59, "dkRed"),
-    DarkSalmon              (0xffe9967a,  60, "dkSalmon"),
-    DarkSeaGreen            (0xff8fbc8b,  61, "dkSeaGreen"),
-    DarkSlateBlue           (0xff483d8b,  62, "dkSlateBlue"),
-    DarkSlateGray           (0xff2f4f4f,  63, "dkSlateGray"),
-    DarkTurquoise           (0xff00ced1,  64, "dkTurquoise"),
-    DarkViolet              (0xff9400d3,  65, "dkViolet"),
-    DeepPink                (0xffff1493,  66, "deepPink"),
-    DeepSkyBlue             (0xff00bfff,  67, "deepSkyBlue"),
-    DimGray                 (0xff696969,  68, "dimGray"),
-    DodgerBlue              (0xff1e90ff,  69, "dodgerBlue"),
-    Firebrick               (0xffb22222,  70, "firebrick"),
-    FloralWhite             (0xfffffaf0,  71, "floralWhite"),
-    ForestGreen             (0xff228b22,  72, "forestGreen"),
-    Fuchsia                 (0xffff00ff,  73, "fuchsia"),
-    Gainsboro               (0xffdcdcdc,  74, "gainsboro"),
-    GhostWhite              (0xfff8f8ff,  75, "ghostWhite"),
-    Gold                    (0xffffd700,  76, "gold"),
-    Goldenrod               (0xffdaa520,  77, "goldenrod"),
-    Gray                    (0xff808080,  78, "gray"),
-    Green                   (0xff008000,  79, "green"),
-    GreenYellow             (0xffadff2f,  80, "greenYellow"),
-    Honeydew                (0xfff0fff0,  81, "honeydew"),
-    HotPink                 (0xffff69b4,  82, "hotPink"),
-    IndianRed               (0xffcd5c5c,  83, "indianRed"),
-    Indigo                  (0xff4b0082,  84, "indigo"),
-    Ivory                   (0xfffffff0,  85, "ivory"),
-    Khaki                   (0xfff0e68c,  86, "khaki"),
-    Lavender                (0xffe6e6fa,  87, "lavender"),
-    LavenderBlush           (0xfffff0f5,  88, "lavenderBlush"),
-    LawnGreen               (0xff7cfc00,  89, "lawnGreen"),
-    LemonChiffon            (0xfffffacd,  90, "lemonChiffon"),
-    LightBlue               (0xffadd8e6,  91, "ltBlue"),
-    LightCoral              (0xfff08080,  92, "ltCoral"),
-    LightCyan               (0xffe0ffff,  93, "ltCyan"),
-    LightGoldenrodYellow    (0xfffafa78,  94, "ltGoldenrodYellow"),
-    LightGray               (0xffd3d3d3,  95, "ltGray"),
-    LightGreen              (0xff90ee90,  96, "ltGreen"),
-    LightPink               (0xffffb6c1,  97, "ltPink"),
-    LightSalmon             (0xffffa07a,  98, "ltSalmon"),
-    LightSeaGreen           (0xff20b2aa,  99, "ltSeaGreen"),
-    LightSkyBlue            (0xff87cefa, 100, "ltSkyBlue"),
-    LightSlateGray          (0xff778899, 101, "ltSlateGray"),
-    LightSteelBlue          (0xffb0c4de, 102, "ltSteelBlue"),
-    LightYellow             (0xffffffe0, 103, "ltYellow"),
-    Lime                    (0xff00ff00, 104, "lime"),
-    LimeGreen               (0xff32cd32, 105, "limeGreen"),
-    Linen                   (0xfffaf0e6, 106, "linen"),
-    Magenta                 (0xffff00ff, 107, "magenta"),
-    Maroon                  (0xff800000, 108, "maroon"),
-    MediumAquamarine        (0xff66cdaa, 109, "medAquamarine"),
-    MediumBlue              (0xff0000cd, 110, "medBlue"),
-    MediumOrchid            (0xffba55d3, 111, "medOrchid"),
-    MediumPurple            (0xff9370db, 112, "medPurple"),
-    MediumSeaGreen          (0xff3cb371, 113, "medSeaGreen"),
-    MediumSlateBlue         (0xff7b68ee, 114, "medSlateBlue"),
-    MediumSpringGreen       (0xff00fa9a, 115, "medSpringGreen"),
-    MediumTurquoise         (0xff48d1cc, 116, "medTurquoise"),
-    MediumVioletRed         (0xffc71585, 117, "medVioletRed"),
-    MidnightBlue            (0xff191970, 118, "midnightBlue"),
-    MintCream               (0xfff5fffa, 119, "mintCream"),
-    MistyRose               (0xffffe4e1, 120, "mistyRose"),
-    Moccasin                (0xffffe4b5, 121, "moccasin"),
-    NavajoWhite             (0xffffdead, 122, "navajoWhite"),
-    Navy                    (0xff000080, 123, "navy"),
-    OldLace                 (0xfffdf5e6, 124, "oldLace"),
-    Olive                   (0xff808000, 125, "olive"),
-    OliveDrab               (0xff6b8e23, 126, "oliveDrab"),
-    Orange                  (0xffffa500, 127, "orange"),
-    OrangeRed               (0xffff4500, 128, "orangeRed"),
-    Orchid                  (0xffda70d6, 129, "orchid"),
-    PaleGoldenrod           (0xffeee8aa, 130, "paleGoldenrod"),
-    PaleGreen               (0xff98fb98, 131, "paleGreen"),
-    PaleTurquoise           (0xffafeeee, 132, "paleTurquoise"),
-    PaleVioletRed           (0xffdb7093, 133, "paleVioletRed"),
-    PapayaWhip              (0xffffefd5, 134, "papayaWhip"),
-    PeachPuff               (0xffffdab9, 135, "peachPuff"),
-    Peru                    (0xffcd853f, 136, "peru"),
-    Pink                    (0xffffc0cb, 137, "pink"),
-    Plum                    (0xffdda0dd, 138, "plum"),
-    PowderBlue              (0xffb0e0e6, 139, "powderBlue"),
-    Purple                  (0xff800080, 140, "purple"),
-    Red                     (0xffff0000, 141, "red"),
-    RosyBrown               (0xffbc8f8f, 142, "rosyBrown"),
-    RoyalBlue               (0xff4169e1, 143, "royalBlue"),
-    SaddleBrown             (0xff8b4513, 144, "saddleBrown"),
-    Salmon                  (0xfffa8072, 145, "salmon"),
-    SandyBrown              (0xfff4a460, 146, "sandyBrown"),
-    SeaGreen                (0xff2e8b57, 147, "seaGreen"),
-    SeaShell                (0xfffff5ee, 148, "seaShell"),
-    Sienna                  (0xffa0522d, 149, "sienna"),
-    Silver                  (0xffc0c0c0, 150, "silver"),
-    SkyBlue                 (0xff87ceeb, 151, "skyBlue"),
-    SlateBlue               (0xff6a5acd, 152, "slateBlue"),
-    SlateGray               (0xff708090, 153, "slateGray"),
-    Snow                    (0xfffffafa, 154, "snow"),
-    SpringGreen             (0xff00ff7f, 155, "springGreen"),
-    SteelBlue               (0xff4682b4, 156, "steelBlue"),
-    Tan                     (0xffd2b48c, 157, "tan"),
-    Teal                    (0xff008080, 158, "teal"),
-    Thistle                 (0xffd8bfd8, 159, "thistle"),
-    Tomato                  (0xffff6347, 160, "tomato"),
-    Turquoise               (0xff40e0d0, 161, "turquoise"),
-    Violet                  (0xffee82ee, 162, "violet"),
-    Wheat                   (0xfff5deb3, 163, "wheat"),
-    White                   (0xffffffff, 164, "white"),
-    WhiteSmoke              (0xfff5f5f5, 165, "whiteSmoke"),
-    Yellow                  (0xffffff00, 166, "yellow"),
-    YellowGreen             (0xff9acd32, 167, "yellowGreen"),
-    /** The system-defined face color of a 3-D element. */
-    ButtonFace              (0xfff0f0f0, 168, null),
-    /** The system-defined color that is the highlight color of a 3-D element. This color is applied to parts of a 3-D element that face the light source. */
-    ButtonHighlight         (0xffffffff, 169, null),
-    /** The system-defined color that is the shadow color of a 3-D element. This color is applied to parts of a 3-D element that face away from the light source. */
-    ButtonShadow            (0xffa0a0a0, 170, null),
-    /** The system-defined color of the lightest color in the color gradient of an active window's title bar. */
-    GradientActiveCaption   (0xffb9d1ea, 171, "gradientActiveCaption"),
-    /** The system-defined color of the lightest color in the color gradient of an inactive window's title bar. */
-    GradientInactiveCaption (0xffd7e4f2, 172, "gradientInactiveCaption"),
-    /** The system-defined color of the background of a menu bar. */
-    MenuBar                 (0xfff0f0f0, 173, "menuBar"),
-    /** The system-defined color used to highlight menu items when the menu appears as a flat menu. */
-    MenuHighlight           (0xff3399ff, 174, "menuHighlight")
-    ;
-
-    public final Color color;
-    public final int nativeId;
-    public final String ooxmlId;
-
-    PresetColor(Integer rgb, int nativeId, String ooxmlId) {
-        this.color = (rgb == null) ? null : new Color(rgb, true);
-        this.nativeId = nativeId;
-        this.ooxmlId = ooxmlId;
-    }
-
-    private static final Map<String,PresetColor> lookupOoxmlId;
-
-    static {
-        lookupOoxmlId = new HashMap<String,PresetColor>();
-        for(PresetColor pc : PresetColor.values()) {
-            if (pc.ooxmlId != null) {
-                lookupOoxmlId.put(pc.ooxmlId, pc);
-            }
-        }
-    }
-    
-    public static PresetColor valueOfOoxmlId(String ooxmlId) {
-        return lookupOoxmlId.get(ooxmlId);
-    }
-    
-    public static PresetColor valueOfNativeId(int nativeId) {
-        PresetColor vals[] = values();
-        return (0 < nativeId && nativeId <= vals.length) ? vals[nativeId-1] : null;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/RectAlign.java b/trunk/src/java/org/apache/poi/sl/usermodel/RectAlign.java
deleted file mode 100644
index 471043f..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/RectAlign.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.sl.usermodel;
-
-/**
- * Specifies possible rectangle alignment types.
- * See org.openxmlformats.schemas.drawingml.x2006.main.STRectAlignment
- * 
- * @see org.apache.poi.sl.draw.binding.STRectAlignment
- */
-public enum RectAlign {
-    /** Top-Left rectangle alignment */
-    TOP_LEFT("tl"),
-
-    /** Top rectangle alignment */
-    TOP("t"),
-
-    /** Top-Right rectangle alignment */
-    TOP_RIGHT("tr"),
-
-    /** Left rectangle alignment */
-    LEFT("l"),
-
-    /** Center rectangle alignment */
-    CENTER("ctr"),
-
-    /** Right rectangle alignment */
-    RIGHT("r"),
-
-    /** Bottom-Left rectangle alignment */
-    BOTTOM_LEFT("bl"),
-
-    /** Bottom rectangle alignment */
-    BOTTOM("b"),
-
-    /** Bottom-Right rectangle alignment */
-    BOTTOM_RIGHT("br");
-
-    /** The corresponding xml enum value */
-    private final String dir;
-
-    private RectAlign(String dir) {
-        this.dir = dir;
-    }
-
-
-    /**
-     * The string representation,
-     * which corresponds to the internal XML enum value
-     */
-    @Override
-    public String toString() {
-        return dir;
-    }
-
-}
-
-/* ************************************************************************** */
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Resources.java b/trunk/src/java/org/apache/poi/sl/usermodel/Resources.java
deleted file mode 100644
index 96170e5..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Resources.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-/**
- * Common SlideShow resources, such as fonts, pictures
- *  and multimedia data
- */
-public interface Resources {
-	public FontCollection getFontCollection();
-
-	public PictureData[] getPictureData();
-	public int addPictureData(PictureData pict);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java b/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java
deleted file mode 100644
index 9afc4e6..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-
-
-
-public interface Shadow<
-S extends Shape<S,P>,
-P extends TextParagraph<S,P,?>
-> {
-    SimpleShape<S,P> getShadowParent();
-    
-    /**
-     * @return the offset of this shadow in points
-     */
-    double getDistance();
-    
-    /**
-     * 
-     * @return the direction to offset the shadow in angles
-     */
-    double getAngle();
-
-    /**
-     * 
-     * @return the blur radius of the shadow
-     * TODO: figure out how to make sense of this property when rendering shadows 
-     */
-    double getBlur();
-
-    /**
-     * @return the color of this shadow. 
-     * Depending whether the parent shape is filled or stroked, this color is used to fill or stroke this shadow
-     */
-    SolidPaint getFillStyle();    
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java b/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java
deleted file mode 100644
index 0115f8b..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-
-public interface Shape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> {
-	ShapeContainer<S,P> getParent();
-
-   /**
-    * @return the sheet this shape belongs to
-    */
-   Sheet<S,P> getSheet();
-
-   /**
-    * Returns the anchor (the bounding box rectangle) of this shape.
-    * All coordinates are expressed in points (72 dpi).
-    *
-    * @return the anchor of this shape
-    */
-   Rectangle2D getAnchor();
-   
-   /**
-    * Convenience method to draw a single shape
-    *
-    * @param graphics the graphics context
-    * @param bounds the rectangle to fit the shape to.
-    *   if null, the bounds of the shape are used.
-    */
-   void draw(Graphics2D graphics, Rectangle2D bounds);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java b/trunk/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
deleted file mode 100644
index 086501b..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.util.List;
-
-
-public interface ShapeContainer<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Iterable<S> {
-    /**
-     * Returns an list containing all of the elements in this container in proper
-     * sequence (from first to last element).
-     *
-     * @return an list containing all of the elements in this container in proper
-     *         sequence
-     */
-	List<S> getShapes();
-
-	void addShape(S shape);
-
-    /**
-     * Removes the specified shape from this sheet, if it is present
-     * (optional operation).  If this sheet does not contain the element,
-     * it is unchanged.
-     *
-     * @param shape the shape to be removed from this sheet, if present
-     * @return <tt>true</tt> if this sheet contained the specified element
-     * @throws IllegalArgumentException if the type of the specified shape
-     *         is incompatible with this sheet (optional)
-     */
-	boolean removeShape(S shape);
-
-    /**
-     * create a new shape with a predefined geometry and add it to this shape container
-     */
-    AutoShape<S,P> createAutoShape();
-
-    /**
-     * create a new shape with a custom geometry
-     */
-    FreeformShape<S,P> createFreeform();
-
-    /**
-     * create a text box
-     */
-	TextBox<S,P> createTextBox();
-	
-    /**
-     * create a connector
-     */
-	ConnectorShape<S,P> createConnector();
-	
-    /**
-     * create a group of shapes belonging to this container
-     */
-	GroupShape<S,P> createGroup();
-	
-    /**
-     * create a picture belonging to this container
-     */
-	PictureShape<S,P> createPicture(PictureData pictureData);
-	
-    /**
-     * Create a new Table of the given number of rows and columns
-     *
-     * @param numRows the number of rows
-     * @param numCols the number of columns
-     */
-	TableShape<S,P> createTable(int numRows, int numCols);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/ShapeType.java b/trunk/src/java/org/apache/poi/sl/usermodel/ShapeType.java
deleted file mode 100644
index b2cb73b..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/ShapeType.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-/**
- * known preset shape geometries in PresentationML
- */
-public enum ShapeType {
-    NOT_PRIMITIVE(-1, 0, "NotPrimitive"),
-    LINE(1, 20, "Line"),
-    LINE_INV(2, -1, null),
-    TRIANGLE(3, 5, "IsocelesTriangle"),
-    RT_TRIANGLE(4, 6, "RightTriangle"),
-    RECT(5, 1, "Rectangle"),
-    DIAMOND(6, 4, "Diamond"),
-    PARALLELOGRAM(7, 7, "Parallelogram"),
-    TRAPEZOID(8, 8, "Trapezoid"),
-    NON_ISOSCELES_TRAPEZOID(9, -1, null),
-    PENTAGON(10, 56, "Pentagon"),
-    HEXAGON(11, 9, "Hexagon"),
-    HEPTAGON(12, -1, null),
-    OCTAGON(13, 10, "Octagon"),
-    DECAGON(14, -1, null),
-    DODECAGON(15, -1, null),
-    STAR_4(16, 187, "Star4"),
-    STAR_5(17, 12, "Star"), // aka star in native
-    STAR_6(18, -1, null),
-    STAR_7(19, -1, null),
-    STAR_8(20, 58, "Star8"),
-    STAR_10(21, -1, null),
-    STAR_12(22, -1, null),
-    STAR_16(23, 59, "Star16"),
-    SEAL(23, 18, "Seal"), // same as star_16, but twice in native
-    STAR_24(24, 92, "Star24"),
-    STAR_32(25, 60, "Star32"),
-    ROUND_RECT(26, 2, "RoundRectangle"),
-    ROUND_1_RECT(27, -1, null),
-    ROUND_2_SAME_RECT(28, -1, null),
-    ROUND_2_DIAG_RECT(29, -1, null),
-    SNIP_ROUND_RECT(30, -1, null),
-    SNIP_1_RECT(31, -1, null),
-    SNIP_2_SAME_RECT(32, -1, null),
-    SNIP_2_DIAG_RECT(33, -1, null),
-    PLAQUE(34, 21, "Plaque"),
-    ELLIPSE(35, 3, "Ellipse"),
-    TEARDROP(36, -1, null),
-    HOME_PLATE(37, 15, "HomePlate"),
-    CHEVRON(38, 55, "Chevron"),
-    PIE_WEDGE(39, -1, null),
-    PIE(40, -1, null),
-    BLOCK_ARC(41, 95, "BlockArc"),
-    DONUT(42, 23, "Donut"),
-    NO_SMOKING(43, 57, "NoSmoking"),
-    RIGHT_ARROW(44, 13, "Arrow"), // aka arrow in native
-    LEFT_ARROW(45, 66, "LeftArrow"),
-    UP_ARROW(46, 68, "UpArrow"),
-    DOWN_ARROW(47, 67, "DownArrow"),
-    STRIPED_RIGHT_ARROW(48, 93, "StripedRightArrow"),
-    NOTCHED_RIGHT_ARROW(49, 94, "NotchedRightArrow"),
-    BENT_UP_ARROW(50, 90, "BentUpArrow"),
-    LEFT_RIGHT_ARROW(51, 69, "LeftRightArrow"),
-    UP_DOWN_ARROW(52, 70, "UpDownArrow"),
-    LEFT_UP_ARROW(53, 89, "LeftUpArrow"),
-    LEFT_RIGHT_UP_ARROW(54, 182, "LeftRightUpArrow"),
-    QUAD_ARROW(55, 76, "QuadArrow"),
-    LEFT_ARROW_CALLOUT(56, 77, "LeftArrowCallout"),
-    RIGHT_ARROW_CALLOUT(57, 78, "RightArrowCallout"),
-    UP_ARROW_CALLOUT(58, 79, "UpArrowCallout"),
-    DOWN_ARROW_CALLOUT(59, 80, "DownArrowCallout"),
-    LEFT_RIGHT_ARROW_CALLOUT(60, 81, "LeftRightArrowCallout"),
-    UP_DOWN_ARROW_CALLOUT(61, 82, "UpDownArrowCallout"),
-    QUAD_ARROW_CALLOUT(62, 83, "QuadArrowCallout"),
-    BENT_ARROW(63, 91, "BentArrow"),
-    UTURN_ARROW(64, 101, "UturnArrow"),
-    CIRCULAR_ARROW(65, 99, "CircularArrow"),
-    LEFT_CIRCULAR_ARROW(66, -1, null),
-    LEFT_RIGHT_CIRCULAR_ARROW(67, -1, null),
-    CURVED_RIGHT_ARROW(68, 102, "CurvedRightArrow"),
-    CURVED_LEFT_ARROW(69, 103, "CurvedLeftArrow"),
-    CURVED_UP_ARROW(70, 104, "CurvedUpArrow"),
-    CURVED_DOWN_ARROW(71, 105, "CurvedDownArrow"),
-    SWOOSH_ARROW(72, -1, null),
-    CUBE(73, 16, "Cube"),
-    CAN(74, 22, "Can"),
-    LIGHTNING_BOLT(75, 73, "LightningBolt"),
-    HEART(76, 74, "Heart"),
-    SUN(77, 183, "Sun"),
-    MOON(78, 184, "Moon"),
-    SMILEY_FACE(79, 96, "SmileyFace"),
-    IRREGULAR_SEAL_1(80, 71, "IrregularSeal1"),
-    IRREGULAR_SEAL_2(81, 72, "IrregularSeal2"),
-    FOLDED_CORNER(82, 65, "FoldedCorner"),
-    BEVEL(83, 84, "Bevel"),
-    FRAME(84, 75, "PictureFrame"),
-    HALF_FRAME(85, -1, null),
-    CORNER(86, -1, null),
-    DIAG_STRIPE(87, -1, null),
-    CHORD(88, -1, null),
-    ARC(89, 19, "Arc"),
-    LEFT_BRACKET(90, 85, "LeftBracket"),
-    RIGHT_BRACKET(91, 86, "RightBracket"),
-    LEFT_BRACE(92, 87, "LeftBrace"),
-    RIGHT_BRACE(93, 88, "RightBrace"),
-    BRACKET_PAIR(94, 185, "BracketPair"),
-    BRACE_PAIR(95, 186, "BracePair"),
-    STRAIGHT_CONNECTOR_1(96, 32, "StraightConnector1"),
-    BENT_CONNECTOR_2(97, 33, "BentConnector2"),
-    BENT_CONNECTOR_3(98, 34, "BentConnector3"),
-    BENT_CONNECTOR_4(99, 35, "BentConnector4"),
-    BENT_CONNECTOR_5(100, 36, "BentConnector5"),
-    CURVED_CONNECTOR_2(101, 37, "CurvedConnector2"),
-    CURVED_CONNECTOR_3(102, 38, "CurvedConnector3"),
-    CURVED_CONNECTOR_4(103, 39, "CurvedConnector4"),
-    CURVED_CONNECTOR_5(104, 40, "CurvedConnector5"),
-    CALLOUT_1(105, 41, "Callout1"),
-    CALLOUT_2(106, 42, "Callout2"),
-    CALLOUT_3(107, 43, "Callout3"),
-    ACCENT_CALLOUT_1(108, 44, "AccentCallout1"),
-    ACCENT_CALLOUT_2(109, 45, "AccentCallout2"),
-    ACCENT_CALLOUT_3(110, 46, "AccentCallout3"),
-    BORDER_CALLOUT_1(111, 47, "BorderCallout1"),
-    BORDER_CALLOUT_2(112, 48, "BorderCallout2"),
-    BORDER_CALLOUT_3(113, 49, "BorderCallout3"),
-    ACCENT_BORDER_CALLOUT_1(114, 50, "AccentBorderCallout1"),
-    ACCENT_BORDER_CALLOUT_2(115, 51, "AccentBorderCallout2"),
-    ACCENT_BORDER_CALLOUT_3(116, 52, "AccentBorderCallout3"),
-    WEDGE_RECT_CALLOUT(117, 61, "WedgeRectCallout"),
-    WEDGE_ROUND_RECT_CALLOUT(118, 62, "WedgeRRectCallout"),
-    WEDGE_ELLIPSE_CALLOUT(119, 63, "WedgeEllipseCallout"),
-    CLOUD_CALLOUT(120, 106, "CloudCallout"),
-    CLOUD(121, -1, null),
-    RIBBON(122, 53, "Ribbon"),
-    RIBBON_2(123, 54, "Ribbon2"),
-    ELLIPSE_RIBBON(124, 107, "EllipseRibbon"),
-    ELLIPSE_RIBBON_2(125, 108, "EllipseRibbon2"),
-    LEFT_RIGHT_RIBBON(126, -1, null),
-    VERTICAL_SCROLL(127, 97, "VerticalScroll"),
-    HORIZONTAL_SCROLL(128, 98, "HorizontalScroll"),
-    WAVE(129, 64, "Wave"),
-    DOUBLE_WAVE(130, 188, "DoubleWave"),
-    PLUS(131, 11, "Plus"),
-    FLOW_CHART_PROCESS(132, 109, "FlowChartProcess"),
-    FLOW_CHART_DECISION(133, 110, "FlowChartDecision"),
-    FLOW_CHART_INPUT_OUTPUT(134, 111, "FlowChartInputOutput"),
-    FLOW_CHART_PREDEFINED_PROCESS(135, 112, "FlowChartPredefinedProcess"),
-    FLOW_CHART_INTERNAL_STORAGE(136, 113, "FlowChartInternalStorage"),
-    FLOW_CHART_DOCUMENT(137, 114, "FlowChartDocument"),
-    FLOW_CHART_MULTIDOCUMENT(138, 115, "FlowChartMultidocument"),
-    FLOW_CHART_TERMINATOR(139, 116, "FlowChartTerminator"),
-    FLOW_CHART_PREPARATION(140, 117, "FlowChartPreparation"),
-    FLOW_CHART_MANUAL_INPUT(141, 118, "FlowChartManualInput"),
-    FLOW_CHART_MANUAL_OPERATION(142, 119, "FlowChartManualOperation"),
-    FLOW_CHART_CONNECTOR(143, 120, "FlowChartConnector"),
-    FLOW_CHART_PUNCHED_CARD(144, 121, "FlowChartPunchedCard"),
-    FLOW_CHART_PUNCHED_TAPE(145, 122, "FlowChartPunchedTape"),
-    FLOW_CHART_SUMMING_JUNCTION(146, 123, "FlowChartSummingJunction"),
-    FLOW_CHART_OR(147, 124, "FlowChartOr"),
-    FLOW_CHART_COLLATE(148, 125, "FlowChartCollate"),
-    FLOW_CHART_SORT(149, 126, "FlowChartSort"),
-    FLOW_CHART_EXTRACT(150, 127, "FlowChartExtract"),
-    FLOW_CHART_MERGE(151, 128, "FlowChartMerge"),
-    FLOW_CHART_OFFLINE_STORAGE(152, 129, "FlowChartOfflineStorage"),
-    FLOW_CHART_ONLINE_STORAGE(153, 130, "FlowChartOnlineStorage"),
-    FLOW_CHART_MAGNETIC_TAPE(154, 131, "FlowChartMagneticTape"),
-    FLOW_CHART_MAGNETIC_DISK(155, 132, "FlowChartMagneticDisk"),
-    FLOW_CHART_MAGNETIC_DRUM(156, 133, "FlowChartMagneticDrum"),
-    FLOW_CHART_DISPLAY(157, 134, "FlowChartDisplay"),
-    FLOW_CHART_DELAY(158, 135, "FlowChartDelay"),
-    FLOW_CHART_ALTERNATE_PROCESS(159, 176, "FlowChartAlternateProcess"),
-    FLOW_CHART_OFFPAGE_CONNECTOR(160, 177, "FlowChartOffpageConnector"),
-    ACTION_BUTTON_BLANK(161, 189, "ActionButtonBlank"),
-    ACTION_BUTTON_HOME(162, 190, "ActionButtonHome"),
-    ACTION_BUTTON_HELP(163, 191, "ActionButtonHelp"),
-    ACTION_BUTTON_INFORMATION(164, 192, "ActionButtonInformation"),
-    ACTION_BUTTON_FORWARD_NEXT(165, 193, "ActionButtonForwardNext"),
-    ACTION_BUTTON_BACK_PREVIOUS(166, 194, "ActionButtonBackPrevious"),
-    ACTION_BUTTON_END(167, 195, "ActionButtonEnd"),
-    ACTION_BUTTON_BEGINNING(168, 196, "ActionButtonBeginning"),
-    ACTION_BUTTON_RETURN(169, 197, "ActionButtonReturn"),
-    ACTION_BUTTON_DOCUMENT(170, 198, "ActionButtonDocument"),
-    ACTION_BUTTON_SOUND(171, 199, "ActionButtonSound"),
-    ACTION_BUTTON_MOVIE(172, 200, "ActionButtonMovie"),
-    GEAR_6(173, -1, null),
-    GEAR_9(174, -1, null),
-    FUNNEL(175, -1, null),
-    MATH_PLUS(176, -1, null),
-    MATH_MINUS(177, -1, null),
-    MATH_MULTIPLY(178, -1, null),
-    MATH_DIVIDE(179, -1, null),
-    MATH_EQUAL(180, -1, null),
-    MATH_NOT_EQUAL(181, -1, null),
-    CORNER_TABS(182, -1, null),
-    SQUARE_TABS(183, -1, null),
-    PLAQUE_TABS(184, -1, null),
-    CHART_X(185, -1, null),
-    CHART_STAR(186, -1, null),
-    CHART_PLUS(187, -1, null),
-    // below are shape types only found in native
-    NOTCHED_CIRCULAR_ARROW(-1, 100, "NotchedCircularArrow"),
-    THICK_ARROW(-1, 14, "ThickArrow"),
-    BALLOON(-1, 17, "Balloon"),
-    TEXT_SIMPLE(-1, 24, "TextSimple"),
-    TEXT_OCTAGON(-1, 25, "TextOctagon"),
-    TEXT_HEXAGON(-1, 26, "TextHexagon"),
-    TEXT_CURVE(-1, 27, "TextCurve"),
-    TEXT_WAVE(-1, 28, "TextWave"),
-    TEXT_RING(-1, 29, "TextRing"),
-    TEXT_ON_CURVE(-1, 30, "TextOnCurve"),
-    TEXT_ON_RING(-1, 31, "TextOnRing"),
-    TEXT_PLAIN_TEXT(-1, 136, "TextPlainText"),
-    TEXT_STOP(-1, 137, "TextStop"),
-    TEXT_TRIANGLE(-1, 138, "TextTriangle"),
-    TEXT_TRIANGLE_INVERTED(-1, 139, "TextTriangleInverted"),
-    TEXT_CHEVRON(-1, 140, "TextChevron"),
-    TEXT_CHEVRON_INVERTED(-1, 141, "TextChevronInverted"),
-    TEXT_RING_INSIDE(-1, 142, "TextRingInside"),
-    TEXT_RING_OUTSIDE(-1, 143, "TextRingOutside"),
-    TEXT_ARCH_UP_CURVE(-1, 144, "TextArchUpCurve"),
-    TEXT_ARCH_DOWN_CURVE(-1, 145, "TextArchDownCurve"),
-    TEXT_CIRCLE_CURVE(-1, 146, "TextCircleCurve"),
-    TEXT_BUTTON_CURVE(-1, 147, "TextButtonCurve"),
-    TEXT_ARCH_UP_POUR(-1, 148, "TextArchUpPour"),
-    TEXT_ARCH_DOWN_POUR(-1, 149, "TextArchDownPour"),
-    TEXT_CIRCLE_POUR(-1, 150, "TextCirclePour"),
-    TEXT_BUTTON_POUR(-1, 151, "TextButtonPour"),
-    TEXT_CURVE_UP(-1, 152, "TextCurveUp"),
-    TEXT_CURVE_DOWN(-1, 153, "TextCurveDown"),
-    TEXT_CASCADE_UP(-1, 154, "TextCascadeUp"),
-    TEXT_CASCADE_DOWN(-1, 155, "TextCascadeDown"),
-    TEXT_WAVE_1(-1, 156, "TextWave1"),
-    TEXT_WAVE_2(-1, 157, "TextWave2"),
-    TEXT_WAVE_3(-1, 158, "TextWave3"),
-    TEXT_WAVE_4(-1, 159, "TextWave4"),
-    TEXT_INFLATE(-1, 160, "TextInflate"),
-    TEXT_DEFLATE(-1, 161, "TextDeflate"),
-    TEXT_INFLATE_BOTTOM(-1, 162, "TextInflateBottom"),
-    TEXT_DEFLATE_BOTTOM(-1, 163, "TextDeflateBottom"),
-    TEXT_INFLATE_TOP(-1, 164, "TextInflateTop"),
-    TEXT_DEFLATE_TOP(-1, 165, "TextDeflateTop"),
-    TEXT_DEFLATE_INFLATE(-1, 166, "TextDeflateInflate"),
-    TEXT_DEFLATE_INFLATE_DEFLATE(-1, 167, "TextDeflateInflateDeflate"),
-    TEXT_FADE_RIGHT(-1, 168, "TextFadeRight"),
-    TEXT_FADE_LEFT(-1, 169, "TextFadeLeft"),
-    TEXT_FADE_UP(-1, 170, "TextFadeUp"),
-    TEXT_FADE_DOWN(-1, 171, "TextFadeDown"),
-    TEXT_SLANT_UP(-1, 172, "TextSlantUp"),
-    TEXT_SLANT_DOWN(-1, 173, "TextSlantDown"),
-    TEXT_CAN_UP(-1, 174, "TextCanUp"),
-    TEXT_CAN_DOWN(-1, 175, "TextCanDown"),
-    CALLOUT_90(-1, 178, "Callout90"),
-    ACCENT_CALLOUT_90(-1, 179, "AccentCallout90"),
-    BORDER_CALLOUT_90(-1, 180, "BorderCallout90"),
-    ACCENT_BORDER_CALLOUT_90(-1, 181, "AccentBorderCallout90"),
-    HOST_CONTROL(-1, 201, "HostControl"),
-    TEXT_BOX(-1, 202, "TextBox")
-    ;
-
-    /** Preset-ID for XML-based shapes */
-    public final int ooxmlId;
-    
-    /** Preset-ID for binary-based shapes */
-    public final int nativeId;
-    
-    /** POI-specific name for the binary-based type */
-    public final String nativeName;
-
-    ShapeType(int ooxmlId, int nativeId, String nativeName){
-        this.ooxmlId = ooxmlId;
-        this.nativeId = nativeId;
-        this.nativeName = nativeName;
-    }
-
-    /** name of the presetShapeDefinit(i)on entry */
-    public String getOoxmlName() {
-        if (this == SEAL) return STAR_16.getOoxmlName();
-        if (ooxmlId == -1) {
-            return (name().startsWith("TEXT")) ? RECT.getOoxmlName() : null;
-        }
-        
-        StringBuilder sb = new StringBuilder();
-        boolean toLower = true;
-        for (char ch : name().toCharArray()) {
-            if (ch == '_') {
-                toLower = false;
-                continue;
-            }
-            sb.append(toLower ? Character.toLowerCase(ch) : Character.toUpperCase(ch));
-            toLower = true;
-        }
-        
-        return sb.toString();
-    }
-    
-    public static ShapeType forId(int id, boolean isOoxmlId){
-        // exemption for #60294
-        if (!isOoxmlId && id == 0x0FFF) {
-            return NOT_PRIMITIVE;
-        }
-        
-        for(ShapeType t : values()){
-            if((isOoxmlId && t.ooxmlId == id) ||
-               (!isOoxmlId && t.nativeId == id)) return t;
-        }
-        throw new IllegalArgumentException("Unknown shape type: " + id);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java b/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java
deleted file mode 100644
index cd2a6f1..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Graphics2D;
-
-
-/**
- * Common parent of Slides, Notes and Masters
- */
-public interface Sheet<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends ShapeContainer<S,P> {
-	SlideShow<S,P> getSlideShow();
-
-    /**
-     * @return whether shapes on the master sheet should be shown. By default master graphics is turned off.
-     * Sheets that support the notion of master (slide, slideLayout) should override it and
-     * check this setting in the sheet XML
-     */
-	boolean getFollowMasterGraphics();
-	
-	MasterSheet<S,P> getMasterSheet();
-
-	Background<S,P> getBackground();
-	
-	/**
-	 * Convenience method to draw a sheet to a graphics context
-	 *
-	 * @param graphics
-	 */
-	void draw(Graphics2D graphics);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
deleted file mode 100644
index aee69fb..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Color;
-
-import org.apache.poi.sl.draw.geom.CustomGeometry;
-import org.apache.poi.sl.draw.geom.IAdjustableShape;
-
-
-public interface SimpleShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Shape<S,P>, IAdjustableShape, PlaceableShape<S,P> {
-
-    FillStyle getFillStyle();
-    
-    LineDecoration getLineDecoration();
-    
-    StrokeStyle getStrokeStyle();
-    
-    /**
-     * Sets the line attributes.
-     * Possible attributes are Double (width), LineCap, LineDash, LineCompound, Color
-     * (implementations of PaintStyle aren't yet supported ...)
-     * 
-     * If no styles are given, the line will be hidden
-     *
-     * @param styles the line attributes
-     */
-    void setStrokeStyle(Object... styles);
-
-    CustomGeometry getGeometry();
-
-    ShapeType getShapeType();
-    void setShapeType(ShapeType type);
-
-    /**
-     * @return the placeholder or null if none is assigned
-     * @see #setPlaceholder(Placeholder)
-     */
-    Placeholder getPlaceholder();
-    
-    /**
-     * Specifies that the corresponding shape should be represented by the generating application
-     * as a placeholder. When a shape is considered a placeholder by the generating application
-     * it can have special properties to alert the user that they may enter content into the shape.
-     * 
-     * @param placeholder the placeholder or null to remove the reference to the placeholder
-     */
-    void setPlaceholder(Placeholder placeholder);
-
-	Shadow<S,P> getShadow();
-
-    /**
-     * Returns the solid color fill.
-     *
-     * @return solid fill color of null if not set or fill color
-     * is not solid (pattern or gradient)
-     */
-	Color getFillColor();
-
-    /**
-     * Specifies a solid color fill. The shape is filled entirely with the
-     * specified color.
-     *
-     * @param color the solid color fill. The value of <code>null</code> unsets
-     *              the solid fill attribute from the underlying implementation
-     */
-	void setFillColor(Color color);
-
-    /**
-     * Returns the hyperlink assigned to this shape
-     *
-     * @return the hyperlink assigned to this shape
-     * or <code>null</code> if not found.
-     * 
-     * @since POI 3.14-Beta1
-     */
-	Hyperlink<S,P> getHyperlink();
-	
-	/**
-     * Creates a hyperlink and asigns it to this shape.
-     * If the shape has already a hyperlink assigned, return it instead
-     *
-     * @return the hyperlink assigned to this shape
-     * 
-     * @since POI 3.14-Beta1
-     */
-    Hyperlink<S,P> createHyperlink();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java b/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java
deleted file mode 100644
index dae2f42..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface Slide<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Sheet<S,P> {
-    Notes<S,P> getNotes();
-    void setNotes(Notes<S,P> notes);
-
-    boolean getFollowMasterBackground();
-    void setFollowMasterBackground(boolean follow);
-
-    boolean getFollowMasterColourScheme();
-    void setFollowMasterColourScheme(boolean follow);
-
-    boolean getFollowMasterObjects();
-    void setFollowMasterObjects(boolean follow);
-
-    /**
-     * @return the 1-based slide no.
-     */
-    int getSlideNumber();
-
-    /**
-     * @return title of this slide or null if title is not set
-     */
-    String getTitle();
-
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java b/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java
deleted file mode 100644
index 228925d..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Dimension;
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-
-public interface SlideShow<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Closeable {
-	Slide<S,P> createSlide() throws IOException;
-
-	List<? extends Slide<S,P>> getSlides();
-
-    MasterSheet<S,P> createMasterSheet() throws IOException;
-
-	/**
-     * Returns all slide masters.
-     * This doesn't include notes master and other arbitrary masters.
-     */
-	List<? extends MasterSheet<S,P>> getSlideMasters();
-
-	Resources getResources();
-
-    /**
-     * Returns the current page size
-     *
-     * @return the page size
-     */
-    Dimension getPageSize();
-
-    /**
-     * Change the current page size
-     *
-     * @param pgsize page size (in points)
-     */
-    void setPageSize(Dimension pgsize);
-    
-    /**
-     * Returns all Pictures of this slideshow.
-     * The returned {@link List} is unmodifiable. 
-     * @return a {@link List} of {@link PictureData}.
-     */
-    List<? extends PictureData> getPictureData();
-
-    /**
-     * Adds a picture to the presentation.
-     *
-     * @param pictureData       The bytes of the picture
-     * @param format            The format of the picture.
-     *
-     * @return the picture data reference.
-     */
-    PictureData addPicture(byte[] pictureData, PictureType format) throws IOException;
-
-    /**
-     * Adds a picture to the presentation.
-     *
-     * @param is	        The stream to read the image from
-     * @param format        The format of the picture.
-     *
-     * @return the picture data reference.
-     * @since 3.15 beta 1
-     */
-    PictureData addPicture(InputStream is, PictureType format) throws IOException;
-
-    /**
-     * Adds a picture to the presentation.
-     *
-     * @param pict              The file containing the image to add
-     * @param format            The format of the picture.
-     *
-     * @return the picture data reference
-     * @since 3.15 beta 1
-     */
-    PictureData addPicture(File pict, PictureType format) throws IOException;
-    
-    /**
-     * check if a picture with this picture data already exists in this presentation
-     * 
-     * @param pictureData The picture data to find in the SlideShow
-     * @return {@code null} if picture data is not found in this slideshow
-     * @since 3.15 beta 3
-     */
-    PictureData findPictureData(byte[] pictureData);
-
-    /**
-     * Writes out the slideshow file the is represented by an instance of this
-     * class
-     *
-     * @param out
-     *            The OutputStream to write to.
-     * @throws IOException
-     *             If there is an unexpected IOException from the passed in
-     *             OutputStream
-     */
-    void write(OutputStream out) throws IOException;
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java b/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
deleted file mode 100644
index db23e1d..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.sl.usermodel;
-
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.OldFileFormatException;
-import org.apache.poi.poifs.filesystem.DocumentFactoryHelper;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.util.IOUtils;
-
-public class SlideShowFactory {
-    /**
-     * Creates a SlideShow from the given NPOIFSFileSystem.
-     *
-     * @param fs The {@link NPOIFSFileSystem} to read the document from
-     *
-     * @return The created SlideShow
-     *
-     * @throws IOException if an error occurs while reading the data
-     */
-    public static SlideShow<?,?> create(NPOIFSFileSystem fs) throws IOException {
-        return create(fs, null);
-    }
-
-    /**
-     * Creates a SlideShow from the given NPOIFSFileSystem, which may
-     * be password protected
-     *
-     * @param fs The {@link NPOIFSFileSystem} to read the document from
-     * @param password The password that should be used or null if no password is necessary.
-     *
-     * @return The created SlideShow
-     *
-     * @throws IOException if an error occurs while reading the data
-     */
-    public static SlideShow<?,?> create(final NPOIFSFileSystem fs, String password) throws IOException {
-        DirectoryNode root = fs.getRoot();
-
-        // Encrypted OOXML files go inside OLE2 containers, is this one?
-        if (root.hasEntry(Decryptor.DEFAULT_POIFS_ENTRY)) {
-            InputStream stream = null;
-            try {
-                stream = DocumentFactoryHelper.getDecryptedStream(fs, password);
-
-                return createXSLFSlideShow(stream);
-            } finally {
-                if (stream != null) stream.close();
-            }
-        }
-
-        // If we get here, it isn't an encrypted PPTX file
-        // So, treat it as a regular HSLF PPT one
-        if (password != null) {
-            Biff8EncryptionKey.setCurrentUserPassword(password);
-        }
-        try {
-            return createHSLFSlideShow(fs);
-        } finally {
-            Biff8EncryptionKey.setCurrentUserPassword(null);
-        }
-    }
-
-    /**
-     * Creates the appropriate HSLFSlideShow / XMLSlideShow from
-     *  the given InputStream.
-     *
-     * <p>Your input stream MUST either support mark/reset, or
-     *  be wrapped as a {@link PushbackInputStream}! Note that
-     *  using an {@link InputStream} has a higher memory footprint
-     *  than using a {@link File}.</p>
-     *
-     * <p>Note that in order to properly release resources the
-     *  SlideShow should be closed after use. Note also that loading
-     *  from an InputStream requires more memory than loading
-     *  from a File, so prefer {@link #create(File)} where possible.
-     *
-     *  @param inp The {@link InputStream} to read data from.
-     *
-     *  @return The created SlideShow
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws EncryptedDocumentException If the SlideShow given is password protected
-     */
-    public static SlideShow<?,?> create(InputStream inp) throws IOException, EncryptedDocumentException {
-        return create(inp, null);
-    }
-
-    /**
-     * Creates the appropriate HSLFSlideShow / XMLSlideShow from
-     *  the given InputStream, which may be password protected.
-     * <p>Your input stream MUST either support mark/reset, or
-     *  be wrapped as a {@link PushbackInputStream}! Note that
-     *  using an {@link InputStream} has a higher memory footprint
-     *  than using a {@link File}.</p>
-     *
-     * <p>Note that in order to properly release resources the
-     *  SlideShow should be closed after use. Note also that loading
-     *  from an InputStream requires more memory than loading
-     *  from a File, so prefer {@link #create(File)} where possible.</p>
-     *
-     *  @param inp The {@link InputStream} to read data from.
-     *  @param password The password that should be used or null if no password is necessary.
-     *
-     *  @return The created SlideShow
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws EncryptedDocumentException If the wrong password is given for a protected file
-     */
-    public static SlideShow<?,?> create(InputStream inp, String password) throws IOException, EncryptedDocumentException {
-        // If clearly doesn't do mark/reset, wrap up
-        if (! inp.markSupported()) {
-            inp = new PushbackInputStream(inp, 8);
-        }
-
-        // Ensure that there is at least some data there
-        byte[] header8 = IOUtils.peekFirst8Bytes(inp);
-
-        // Try to create
-        if (NPOIFSFileSystem.hasPOIFSHeader(header8)) {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(inp);
-            return create(fs, password);
-        }
-        if (DocumentFactoryHelper.hasOOXMLHeader(inp)) {
-            return createXSLFSlideShow(inp);
-        }
-        throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream");
-    }
-
-    /**
-     * Creates the appropriate HSLFSlideShow / XMLSlideShow from
-     *  the given File, which must exist and be readable.
-     * <p>Note that in order to properly release resources the
-     *  SlideShow should be closed after use.
-     *
-     *  @param file The file to read data from.
-     *
-     *  @return The created SlideShow
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws EncryptedDocumentException If the SlideShow given is password protected
-     */
-    public static SlideShow<?,?> create(File file) throws IOException, EncryptedDocumentException {
-        return create(file, null);
-    }
-
-    /**
-     * Creates the appropriate HSLFSlideShow / XMLSlideShow from
-     *  the given File, which must exist and be readable, and
-     *  may be password protected
-     * <p>Note that in order to properly release resources the
-     *  SlideShow should be closed after use.
-     *
-     *  @param file The file to read data from.
-     *  @param password The password that should be used or null if no password is necessary.
-     *
-     *  @return The created SlideShow
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws EncryptedDocumentException If the wrong password is given for a protected file
-     */
-    public static SlideShow<?,?> create(File file, String password) throws IOException, EncryptedDocumentException {
-        return create(file, password, false);
-    }
-
-    /**
-     * Creates the appropriate HSLFSlideShow / XMLSlideShow from
-     *  the given File, which must exist and be readable, and
-     *  may be password protected
-     * <p>Note that in order to properly release resources the
-     *  SlideShow should be closed after use.
-     *
-     *  @param file The file to read data from.
-     *  @param password The password that should be used or null if no password is necessary.
-     *  @param readOnly If the SlideShow should be opened in read-only mode to avoid writing back
-     *      changes when the document is closed.
-     *
-     *  @return The created SlideShow
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws EncryptedDocumentException If the wrong password is given for a protected file
-     */
-    public static SlideShow<?,?> create(File file, String password, boolean readOnly) throws IOException, EncryptedDocumentException {
-        if (!file.exists()) {
-            throw new FileNotFoundException(file.toString());
-        }
-
-        NPOIFSFileSystem fs = null;
-        try {
-            fs = new NPOIFSFileSystem(file, readOnly);
-            return create(fs, password);
-        } catch(OfficeXmlFileException e) {
-            if(fs != null) {
-                fs.close();
-            }
-            return createXSLFSlideShow(file, readOnly);
-        } catch(RuntimeException e) {
-            if(fs != null) {
-                fs.close();
-            }
-            throw e;
-        }
-    }
-    
-    protected static SlideShow<?,?> createHSLFSlideShow(Object... args) throws IOException, EncryptedDocumentException {
-        return createSlideShow("org.apache.poi.hslf.usermodel.HSLFSlideShowFactory", args);
-    }
-    
-    protected static SlideShow<?,?> createXSLFSlideShow(Object... args) throws IOException, EncryptedDocumentException {
-        return createSlideShow("org.apache.poi.xslf.usermodel.XSLFSlideShowFactory", args);
-    }
-    
-    protected static SlideShow<?,?> createSlideShow(String factoryClass, Object args[]) throws IOException, EncryptedDocumentException {
-        try {
-            Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(factoryClass);
-            Class<?> argsClz[] = new Class<?>[args.length];
-            int i=0;
-            for (Object o : args) {
-                Class<?> c = o.getClass();
-                if (Boolean.class.isAssignableFrom(c)) {
-                    c = boolean.class;
-                } else if (InputStream.class.isAssignableFrom(c)) {
-                    c = InputStream.class;
-                }
-                argsClz[i++] = c;
-            }
-            Method m = clazz.getMethod("createSlideShow", argsClz);
-            return (SlideShow<?,?>)m.invoke(null, args);
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getCause();
-            if (t instanceof IOException) {
-                throw (IOException)t;
-            } else if (t instanceof EncryptedDocumentException) {
-                throw (EncryptedDocumentException)t;
-            } else if (t instanceof OldFileFormatException) {
-                throw (OldFileFormatException)t;
-            } else {
-                throw new IOException(t);
-            }
-        } catch (Exception e) {
-            throw new IOException(e);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java b/trunk/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java
deleted file mode 100644
index be93a99..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface StrokeStyle {
-    enum LineCap {
-        /** Rounded ends */
-        ROUND(0,1),
-        /** Square protrudes by half line width */
-        SQUARE(1,2),
-        /** Line ends at end point*/
-        FLAT(2,3);
-        
-        public final int nativeId;
-        public final int ooxmlId;
-        
-        LineCap(int nativeId, int ooxmlId) {
-            this.nativeId = nativeId;
-            this.ooxmlId = ooxmlId;
-        }
-
-        public static LineCap fromNativeId(int nativeId) {
-            for (LineCap ld : values()) {
-                if (ld.nativeId == nativeId) return ld;
-            }
-            return null;
-        }
-
-        public static LineCap fromOoxmlId(int ooxmlId) {
-            for (LineCap lc : values()) {
-                if (lc.ooxmlId == ooxmlId) return lc;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * The line dash with pattern.
-     * The pattern is derived empirically on PowerPoint 2010 and needs to be multiplied
-     * with actual line width
-     */
-    enum LineDash {
-        /** Solid (continuous) pen - native 1 */
-        SOLID(1, 1, null),
-        /** square dot style - native 6 */
-        DOT(6, 2, 1,1),
-        /** dash style - native 7 */
-        DASH(7, 3, 3,4),
-        /** dash short dash - native 9*/
-        DASH_DOT(9, 5, 4,3,1,3),
-        /** long dash style - native 8 */
-        LG_DASH(8, 4, 8,3),
-        /** long dash short dash - native 10 */
-        LG_DASH_DOT(10, 6, 8,3,1,3),
-        /** long dash short dash short dash - native 11 */
-        LG_DASH_DOT_DOT(11, 7, 8,3,1,3,1,3),
-        /** PS_DASH system dash style - native 2 */
-        SYS_DASH(2, 8, 2,2),
-        /** PS_DOT system dash style - native 3 */
-        SYS_DOT(3, 9, 1,1),
-        /** PS_DASHDOT system dash style - native 4 */
-        SYS_DASH_DOT(4, 10, 2,2,1,1),
-        /** PS_DASHDOTDOT system dash style / native 5 */
-        SYS_DASH_DOT_DOT(5, 11, 2,2,1,1,1,1);
-
-        public final int pattern[];
-        public final int nativeId;
-        public final int ooxmlId;
-
-        LineDash(int nativeId, int ooxmlId, int... pattern) {
-            this.nativeId = nativeId;
-            this.ooxmlId = ooxmlId;
-            this.pattern = (pattern == null || pattern.length == 0) ? null : pattern;
-        }
-
-        public static LineDash fromNativeId(int nativeId) {
-            for (LineDash ld : values()) {
-                if (ld.nativeId == nativeId) return ld;
-            }
-            return null;
-        }
-
-        public static LineDash fromOoxmlId(int ooxmlId) {
-            for (LineDash ld : values()) {
-                if (ld.ooxmlId == ooxmlId) return ld;
-            }
-            return null;
-        }
-    }
-
-    enum LineCompound {
-        /** Single line (of width lineWidth) - native 0 / ooxml default */
-        SINGLE(0, 1),
-        /** Double lines of equal width - native 1 / ooxml "dbl" */
-        DOUBLE(1, 2),
-        /** Double lines, one thick, one thin - native 2 / ooxml "thickThin" */
-        THICK_THIN(2, 3),
-        /** Double lines, reverse order - native 3 / ooxml "thinThick" */
-        THIN_THICK(3, 4),
-        /** Three lines, thin, thick, thin - native 4 / ooxml "tri" */
-        TRIPLE(4, 5);
-        
-        public final int nativeId;
-        public final int ooxmlId;
-        
-        LineCompound(int nativeId, int ooxmlId) {
-            this.nativeId = nativeId;
-            this.ooxmlId = ooxmlId;
-        }
-
-        public static LineCompound fromNativeId(int nativeId) {
-            for (LineCompound lc : values()) {
-                if (lc.nativeId == nativeId) return lc;
-            }
-            return null;
-        }
-
-        public static LineCompound fromOoxmlId(int ooxmlId) {
-            for (LineCompound lc : values()) {
-                if (lc.ooxmlId == ooxmlId) return lc;
-            }
-            return null;
-        }
-    }
-
-
-    PaintStyle getPaint();
-    LineCap getLineCap();
-    LineDash getLineDash();
-    LineCompound getLineCompound();
-    double getLineWidth();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/TableCell.java b/trunk/src/java/org/apache/poi/sl/usermodel/TableCell.java
deleted file mode 100644
index 9516196..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/TableCell.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Color;
-
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-
-public interface TableCell<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends TextShape<S,P> {
-    enum BorderEdge { bottom, left, top, right }
-
-    /**
-     * Return line style of given edge or {@code null} if border is not defined
-     *
-     * @param edge the border edge
-     * @return line style of given edge or {@code null} if border is not defined
-     */
-    StrokeStyle getBorderStyle(BorderEdge edge);
-    
-    /**
-     * Sets the {@link StrokeStyle} of the given border edge.
-     * A {@code null} property of the style is ignored.
-     *
-     * @param edge border edge
-     * @param style the new stroke style
-     */
-    void setBorderStyle(BorderEdge edge, StrokeStyle style);
-    
-    /**
-     * Convenience method for setting the border width.
-     *
-     * @param edge border edge
-     * @param width the new border width
-     */
-    void setBorderWidth(BorderEdge edge, double width);
-
-    /**
-     * Convenience method for setting the border color.
-     *
-     * @param edge border edge
-     * @param color the new border color
-     */
-    void setBorderColor(BorderEdge edge, Color color);
-
-    /**
-     * Convenience method for setting the border line compound.
-     *
-     * @param edge border edge
-     * @param compound the new border line compound
-     */
-    void setBorderCompound(BorderEdge edge, LineCompound compound);
-
-    /**
-     * Convenience method for setting the border line dash.
-     *
-     * @param edge border edge
-     * @param dash the new border line dash
-     */
-    void setBorderDash(BorderEdge edge, LineDash dash);
-    
-    /**
-     * Remove all line attributes of the given border edge
-     *
-     * @param edge the border edge to be cleared
-     */
-    void removeBorder(BorderEdge edge);
-
-    /**
-     * Get the number of columns to be spanned/merged
-     *
-     * @return the grid span
-     * 
-     * @since POI 3.15-beta2
-     */
-    int getGridSpan();
-    
-    /**
-     * Get the number of rows to be spanned/merged
-     *
-     * @return the row span
-     * 
-     * @since POI 3.15-beta2
-     */
-    int getRowSpan();
-
-    /**
-     * Return if this cell is part of a merged cell. The top/left cell of a merged region is not regarded as merged -
-     * its grid and/or row span is greater than one. 
-     *
-     * @return true if this a merged cell
-     * 
-     * @since POI 3.15-beta2
-     */
-    boolean isMerged();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java
deleted file mode 100644
index 13c5d0d..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-public interface TableShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends Shape<S,P>, PlaceableShape<S,P> {
-    /**
-     * Return the maximum number of columns.
-     * If the table contains merged cells, the number of columns might be less than the maximum.
-     *
-     * @return the maximum number of column
-     */
-    int getNumberOfColumns();
-    
-    /**
-     * Return the number of rows
-     *
-     * @return the row count
-     */
-    int getNumberOfRows();
-    
-    /**
-     * Gets a cell
-     *
-     * @param row the row index (0-based)
-     * @param col the column index (0-based)
-     * @return the cell or null if the cell doesn't exists, e.g. when accessing
-     *         a merged cell or if the index is out of bounds
-     */
-    TableCell<S,P> getCell(int row, int col);
-    
-    /**
-     * Gets the width (in points) of the n-th column
-     *
-     * @param idx the column index (0-based)
-     * @return the width (in points)
-     */
-    double getColumnWidth(int idx);
-    
-    /**
-     * Sets the width (in points) of the n-th column
-     *
-     * @param idx the column index (0-based)
-     * @param width the width (in points)
-     */
-    void setColumnWidth(int idx, double width);
-
-    /**
-     * Gets the row height
-     *
-     * @param row the row index (0-based)
-     * @return the height (in points)
-     */
-    double getRowHeight(int row);
-    
-    /**
-     * Sets the row height.
-     *
-     * @param row the row index (0-based)
-     * @param height the height to set (in points)
-     */
-    void setRowHeight(int row, double height);
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java b/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java
deleted file mode 100644
index bc69511..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-/**
- * Represents a TextFrame shape in PowerPoint.
- * <p>
- * Contains the text in a text frame as well as the properties and methods
- * that control alignment and anchoring of the text.
- * </p>
- */
-public interface TextBox<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends AutoShape<S,P> {
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/TextParagraph.java b/trunk/src/java/org/apache/poi/sl/usermodel/TextParagraph.java
deleted file mode 100644
index 881a71d..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/TextParagraph.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Color;
-import java.util.List;
-
-
-
-public interface TextParagraph<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,T>,
-    T extends TextRun
-> extends Iterable<T> {
-
-    /**
-     * Specifies a list of text alignment types
-     */
-    public enum TextAlign {
-        /**
-         * For horizontal text, left aligned.
-         * For vertical text, top aligned.
-         */
-        LEFT,
-
-        /**
-         * For horizontal text, centered.
-         * For vertical text, middle aligned.
-         */
-        CENTER,
-
-        /**
-         * For horizontal text, right aligned.
-         * For vertical text, bottom aligned.
-         */
-        RIGHT,
-
-        /**
-         * Align text so that it is justified across the whole line. It
-         * is smart in the sense that it will not justify sentences
-         * which are short
-         * 
-         * For horizontal text, flush left and right.
-         * For vertical text, flush top and bottom.
-         */
-        JUSTIFY,
-        
-        /**
-         * Kashida justify low.
-         */    
-        JUSTIFY_LOW,
-
-        /**
-         * Distribute space between characters.
-         */
-        DIST,
-        
-        /**
-         * Thai distribution justification.
-         */
-        THAI_DIST
-    }
-
-    /**
-     * 
-     */
-    public enum FontAlign {
-        AUTO,
-        
-        /**
-         * Characters hang from top of line height.
-         * Also known as "Hanging"
-         */
-        TOP,
-        
-        /**
-         * Characters centered within line height.
-         */
-        CENTER,
-        
-        /**
-         * Place characters on font baseline.
-         * Also known as "Roman" 
-         */
-        BASELINE,
-        
-        /**
-         * Characters are anchored to the very bottom of a single line.
-         * This is different than BASELINE because of letters such as "g", "q", and "y".
-         * Also known as "UpholdFixed"
-         */
-        BOTTOM
-    }
-    
-    public interface BulletStyle {
-        String getBulletCharacter();
-        String getBulletFont();
-        
-        /**
-         * The bullet point font size
-         * If bulletFontSize >= 0, then space is a percentage of normal line height.
-         * If bulletFontSize < 0, the absolute value in points
-         *
-         * @return the bullet point font size
-         */
-        Double getBulletFontSize();
-
-        /**
-         * Convenience function to set a solid color
-         */
-        void setBulletFontColor(Color color);
-        
-        void setBulletFontColor(PaintStyle color);
-
-        /**
-         *
-         * @return the color of bullet characters within a given paragraph.
-         * A {@code null} value means to use the text font color.
-         */
-        PaintStyle getBulletFontColor();
-        
-        AutoNumberingScheme getAutoNumberingScheme();
-        /**
-         * Index (1-based) of the first auto number value, or null if auto numbering scheme
-         * wasn't assigned.
-         */
-        Integer getAutoNumberingStartAt();
-    }
-
-    /**
-     * The amount of vertical white space before the paragraph
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If spaceBefore >= 0, then space is a percentage of normal line height.
-     * If spaceBefore < 0, the absolute value in points
-     * </p>
-     *
-     * @return the vertical white space before the paragraph, or null if unset
-     */
-    Double getSpaceBefore();
-
-    /**
-     * Set the amount of vertical white space that will be present before the paragraph.
-     * This space is specified in either percentage or points:
-     * <p>
-     * If spaceBefore >= 0, then space is a percentage of normal line height.
-     * If spaceBefore < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     * Examples:
-     * <pre><code>
-     *      // The paragraph will be formatted to have a spacing before the paragraph text.
-     *      // The spacing will be 200% of the size of the largest text on each line
-     *      paragraph.setSpaceBefore(200);
-     *
-     *      // The spacing will be a size of 48 points
-     *      paragraph.setSpaceBefore(-48.0);
-     * </code></pre>
-     *
-     * @param spaceBefore the vertical white space before the paragraph, null to unset
-     */
-    void setSpaceBefore(Double spaceBefore);    
-    
-    /**
-     * The amount of vertical white space after the paragraph
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If spaceBefore >= 0, then space is a percentage of normal line height.
-     * If spaceBefore < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     *
-     * @return the vertical white space after the paragraph or null, if unset
-     */
-    Double getSpaceAfter();    
-
-    /**
-     * Set the amount of vertical white space that will be present after the paragraph.
-     * This space is specified in either percentage or points:
-     * <p>
-     * If spaceAfter >= 0, then space is a percentage of normal line height.
-     * If spaceAfter < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     * Examples:
-     * <pre><code>
-     *      // The paragraph will be formatted to have a spacing after the paragraph text.
-     *      // The spacing will be 200% of the size of the largest text on each line
-     *      paragraph.setSpaceAfter(200);
-     *
-     *      // The spacing will be a size of 48 points
-     *      paragraph.setSpaceAfter(-48.0);
-     * </code></pre>
-     *
-     * @param spaceAfter the vertical white space after the paragraph, null to unset
-     */
-    public void setSpaceAfter(Double spaceAfter);
-    
-    /**
-     * @return the left margin (in points) of the paragraph or null, if unset
-     */
-    Double getLeftMargin();
-
-    /**
-     * Specifies the left margin of the paragraph. This is specified in addition to the text body
-     * inset and applies only to this text paragraph. That is the text body Inset and the LeftMargin
-     * attributes are additive with respect to the text position.
-     * 
-     * @param leftMargin the left margin (in points) or null to unset
-     */
-    void setLeftMargin(Double leftMargin);
-    
-    
-    /**
-     * Specifies the right margin of the paragraph. This is specified in addition to the text body
-     * inset and applies only to this text paragraph. That is the text body Inset and the RightMargin
-     * attributes are additive with respect to the text position.
-     * 
-     * The right margin is not support and therefore ignored by the HSLF implementation.
-     * 
-     * @return the right margin (in points) of the paragraph or null, if unset
-     */
-    Double getRightMargin();
-
-    /**
-     * @param rightMargin the right margin (in points) of the paragraph
-     */
-    void setRightMargin(Double rightMargin);
-    
-    /**
-     * @return the indent (in points) applied to the first line of text in the paragraph.
-     *  or null, if unset
-     */
-    Double getIndent();
-    
-    /**
-     * Specifies the indent size that will be applied to the first line of text in the paragraph.   
-     * 
-     * @param indent the indent (in points) applied to the first line of text in the paragraph
-     */
-    void setIndent(Double indent);
-
-
-    /**
-     * @return the text level of this paragraph (0-based). Default is 0.
-     */    
-    int getIndentLevel();
-
-    /**
-     * Specifies the particular level text properties that this paragraph will follow.
-     * The value for this attribute formats the text according to the corresponding level
-     * paragraph properties defined in the SlideMaster.
-     *
-     * @param level the level (0 ... 4)
-     */
-    void setIndentLevel(int level);
-    
-    /**
-     * Returns the vertical line spacing that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If linespacing >= 0, then linespacing is a percentage of normal line height.
-     * If linespacing < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     *
-     * @return the vertical line spacing or null, if unset
-     */
-    Double getLineSpacing();
-    
-    /**
-     * This element specifies the vertical line spacing that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If linespacing >= 0, then linespacing is a percentage of normal line height
-     * If linespacing < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     * Examples:
-     * <pre><code>
-     *      // spacing will be 120% of the size of the largest text on each line
-     *      paragraph.setLineSpacing(120);
-     *
-     *      // spacing will be 200% of the size of the largest text on each line
-     *      paragraph.setLineSpacing(200);
-     *
-     *      // spacing will be 48 points
-     *      paragraph.setLineSpacing(-48.0);
-     * </code></pre>
-     * 
-     * @param lineSpacing the vertical line spacing
-     */
-    void setLineSpacing(Double lineSpacing);
-
-    String getDefaultFontFamily();
-    
-    /**
-     * @return the default font size, in case its not set in the textrun or null, if unset
-     */
-    Double getDefaultFontSize();
-    
-    /**
-     * Returns the alignment that is applied to the paragraph.
-     *
-     * If this attribute is omitted, then null is returned.
-     * User code can imply the value {@link org.apache.poi.sl.usermodel.TextParagraph.TextAlign#LEFT} then.
-     *
-     * @return alignment that is applied to the paragraph
-     */
-    TextAlign getTextAlign();
-
-    /**
-     * Specifies the alignment that is to be applied to the paragraph.
-     * Possible values for this include left, right, centered, justified and distributed,
-     * see {@link org.apache.poi.sl.usermodel.TextParagraph.TextAlign}.
-     *
-     * @param align text align
-     */    
-    void setTextAlign(TextAlign align);
-    
-    /**
-     * Returns the font alignment that is applied to the paragraph.
-     *
-     * If this attribute is omitted, then null is return,
-     * user code can imply the a value of {@link FontAlign#AUTO}
-     * 
-     * @return alignment that is applied to the paragraph
-     */
-    FontAlign getFontAlign();
-    
-    /**
-     * @return the bullet style of the paragraph, if {@code null} then no bullets are used 
-     */
-    BulletStyle getBulletStyle();
-
-    /**
-     * Sets the bullet styles. If no styles are given, the bullets are omitted.
-     * Possible attributes are integer/double (bullet size), Color (bullet color),
-     * character (bullet character), string (bullet font), AutoNumberingScheme
-     *
-     * @param styles
-     */
-    void setBulletStyle(Object... styles);
-    
-    /**
-     * @return the default size for a tab character within this paragraph in points, null if unset
-     */
-    Double getDefaultTabSize();
-
-    
-    TextShape<S,P> getParentShape();
-    
-    /**
-     * Fetch the text runs that are contained within this block of text
-     */
-    List<T> getTextRuns();
-
-    /**
-     * Convenience method to determine if this text paragraph is part of
-     * the slide header or footer
-     * 
-     * @return true if this paragraph is part of a header or footer placeholder
-     * 
-     * @since POI 3.15-beta2
-     */
-    boolean isHeaderOrFooter();
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/TextRun.java b/trunk/src/java/org/apache/poi/sl/usermodel/TextRun.java
deleted file mode 100644
index 014d303..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/TextRun.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.awt.Color;
-
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-
-/**
- * Some text.
- */
-public interface TextRun {
-    enum TextCap {
-        NONE,
-        SMALL,
-        ALL
-    }
-
-    String getRawText();
-    void setText(String text);
-
-    TextCap getTextCap();
-
-    /**
-     * Returns the font color.
-     * This usually returns a {@link SolidPaint}, but but also other classes are possible
-     *
-     * @return the font color/paint
-     *
-     * @see org.apache.poi.sl.draw.DrawPaint#getPaint(java.awt.Graphics2D, PaintStyle)
-     * @see SolidPaint#getSolidColor()
-     * @see org.apache.poi.sl.draw.DrawPaint#applyColorTransform(ColorStyle)
-     */
-    PaintStyle getFontColor();
-
-    /**
-     * Sets the (solid) font color - convenience function
-     *
-     * @param color the color
-     */
-    void setFontColor(Color color);
-
-    /**
-     * Sets the font color
-     *
-     * @param color the color
-     *
-     * @see org.apache.poi.sl.draw.DrawPaint#createSolidPaint(Color)
-     */
-    void setFontColor(PaintStyle color);
-
-
-    /**
-     * Returns the font size which is either set directly on this text run or
-     * given from the slide layout
-     *
-     * @return font size in points or null if font size is not set.
-     */
-    Double getFontSize();
-
-    /**
-     * Sets the font size directly on this text run, if null is given, the
-     * font size defaults to the values given from the slide layout
-     *
-     * @param fontSize font size in points, if null the underlying fontsize will be unset
-     */
-    void setFontSize(Double fontSize);
-
-    /**
-     * @return  font family or null if not set
-     */
-    String getFontFamily();
-
-    /**
-     * Specifies the typeface, or name of the font that is to be used for this text run.
-     *
-     * @param typeface  the font to apply to this text run.
-     * The value of <code>null</code> unsets the Typeface attrubute from the underlying xml.
-     */
-    void setFontFamily(String typeface);
-
-    /**
-     * @return true, if text is bold
-     */
-    boolean isBold();
-
-    /**
-     * Sets the bold state
-     *
-     * @param bold set to true for bold text, false for normal weight
-     */
-    void setBold(boolean bold);
-    
-    /**
-     * @return true, if text is italic
-     */
-    boolean isItalic();
-
-    /**
-     * Sets the italic state
-     *
-     * @param italic set to true for italic text, false for non-italics
-     */
-    void setItalic(boolean italic);
-
-    /**
-     * @return true, if text is underlined
-     */
-    boolean isUnderlined();
-
-    /**
-     * Sets the underlined state
-     *
-     * @param underlined set to true for underlined text, false for no underlining
-     */
-    void setUnderlined(boolean underlined);
-
-    /**
-     * @return true, if text is stroked
-     */
-    boolean isStrikethrough();
-
-    /**
-     * Sets the strikethrough state
-     *
-     * @param stroked set to true for stroked text, false for no stroking
-     */
-    void setStrikethrough(boolean stroked);
-
-    /**
-     * @return true, if text is sub scripted
-     */
-    boolean isSubscript();
-
-    /**
-     * @return true, if text is super scripted
-     */
-    boolean isSuperscript();
-
-    /**
-     * @return the pitch and family id or -1 if not applicable
-     */
-    byte getPitchAndFamily();
-
-    /**
-     * Return the associated hyperlink
-     * 
-     * @return the associated hyperlink or null if no hyperlink was set
-     * 
-     * @since POI 3.14-Beta2
-     */
-    Hyperlink<?,?> getHyperlink();
-    
-    
-    /**
-     * Creates a new hyperlink and assigns it to this text run.
-     * If the text run has already a hyperlink assigned, return it instead
-     *
-     * @return the associated hyperlink
-     * 
-     * @since POI 3.14-Beta2
-     */
-    Hyperlink<?,?> createHyperlink();
-}
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java b/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java
deleted file mode 100644
index 45bd63e..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import java.util.List;
-
-public interface TextShape<
-    S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
-> extends SimpleShape<S,P>, Iterable<P>  {
-    /**
-     * Vertical Text Types
-     */
-    enum TextDirection {
-        /**
-         * Horizontal text. This should be default.
-         */
-        HORIZONTAL,
-        /**
-         * Vertical orientation.
-         * (each line is 90 degrees rotated clockwise, so it goes
-         * from top to bottom; each next line is to the left from
-         * the previous one).
-         */
-        VERTICAL,
-        /**
-         * Vertical orientation.
-         * (each line is 270 degrees rotated clockwise, so it goes
-         * from bottom to top; each next line is to the right from
-         * the previous one).
-         * For HSLF: always interpreted by Powerpoint as HORIZONTAL.
-         */
-        VERTICAL_270,
-        /**
-         * Determines if all of the text is vertical
-         * ("one letter on top of another").
-         * For HSLF: not supported
-         */
-        STACKED
-    }
-
-    /**
-     * Specifies alist of auto-fit types.
-     * <p>
-     * Autofit specofies that a shape should be auto-fit to fully contain the text described within it.
-     * Auto-fitting is when text within a shape is scaled in order to contain all the text inside
-     * </p>
-     */
-    enum TextAutofit {
-        /**
-         * Specifies that text within the text body should not be auto-fit to the bounding box.
-         * Auto-fitting is when text within a text box is scaled in order to remain inside
-         * the text box.
-         */
-        NONE,
-        /**
-         * Specifies that text within the text body should be normally auto-fit to the bounding box.
-         * Autofitting is when text within a text box is scaled in order to remain inside the text box.
-         *
-         * <p>
-         * <em>Example:</em> Consider the situation where a user is building a diagram and needs
-         * to have the text for each shape that they are using stay within the bounds of the shape.
-         * An easy way this might be done is by using NORMAL autofit
-         * </p>
-         */
-        NORMAL,
-        /**
-         * Specifies that a shape should be auto-fit to fully contain the text described within it.
-         * Auto-fitting is when text within a shape is scaled in order to contain all the text inside.
-         *
-         * <p>
-         * <em>Example:</em> Consider the situation where a user is building a diagram and needs to have
-         * the text for each shape that they are using stay within the bounds of the shape.
-         * An easy way this might be done is by using SHAPE autofit
-         * </p>
-         */
-        SHAPE
-    }
-
-    /**
-     * This enum represents a compromise for the handling of
-     * HSLF run types (see org.apache.poi.hslf.record.TextHeaderAtom) and
-     * XSLF placeholders (see org.apache.poi.xslf.usermodel.Placeholder).
-     * When a shape is considered a placeholder by the generating application
-     * it can have special properties to alert the user that they may enter content into the shape.
-     * 
-     * This enum and the handling around it may change significantly in future releases
-     */
-    enum TextPlaceholder {
-        /** Title placeholder shape text */
-        TITLE,
-        /** Body placeholder shape text */
-        BODY,
-        /** Center title placeholder shape text */
-        CENTER_TITLE,
-        /** Center body placeholder shape text */
-        CENTER_BODY,
-        /** Half-sized body placeholder shape text */
-        HALF_BODY,
-        /** Quarter-sized body placeholder shape text */
-        QUARTER_BODY,
-        /** Notes placeholder shape text */
-        NOTES,
-        /** Any other text */
-        OTHER
-    }
-
-    /**
-     * Returns the text contained in this text frame, which has been made safe
-     * for printing and other use.
-     * 
-     * @return the text string for this textbox.
-     * 
-     * @since POI 3.14-Beta2
-     */
-    String getText();
-    
-    /**
-     * Sets (overwrites) the current text.
-     * Uses the properties of the first paragraph / textrun.
-     * Text paragraphs are split by \\r or \\n.
-     * New lines within text run are split by \\u000b
-     * 
-     * @param text the text string used by this object.
-     * 
-     * @return the last text run of the - potential split - text
-     */
-    TextRun setText(String text);
-
-    /**
-     * Adds the supplied text onto the end of the TextParagraphs,
-     * creating a new RichTextRun for it to sit in.
-     *
-     * @param text the text string to be appended.
-     * @param newParagraph if true, a new paragraph will be added,
-     *        which will contain the added text
-     *
-     * @since POI 3.14-Beta1
-     */
-    TextRun appendText(String text, boolean newParagraph);
-    
-    /**
-     * @return the TextParagraphs for this text box
-     */
-    List<? extends TextParagraph<S,P,?>> getTextParagraphs();
-
-    /**
-     * @return text shape margin
-     */
-    Insets2D getInsets();
-    
-    /**
-     * Sets the shape margins
-     *
-     * @param insets the new shape margins
-     */
-    void setInsets(Insets2D insets);
-
-    /**
-     * Compute the cumulative height occupied by the text
-     */
-    double getTextHeight();
-    
-    /**
-     * Returns the type of vertical alignment for the text.
-     *
-     * @return the type of vertical alignment
-     */
-    VerticalAlignment getVerticalAlignment();
-
-    /**
-     * Sets the type of vertical alignment for the text.
-     *
-     * @param vAlign - the type of alignment.
-     * A {@code null} values unsets this property.
-     */
-    void setVerticalAlignment(VerticalAlignment vAlign);
-    
-    /**
-     * Returns if the text is centered.
-     * If true and if the individual paragraph settings allow it,
-     * the whole text block will be displayed centered, i.e. its left and right
-     * margin will be maximized while still keeping the alignment of the paragraphs
-     *
-     * @return true, if the text anchor is horizontal centered
-     */
-    boolean isHorizontalCentered();
-
-    /**
-     * Sets if the paragraphs are horizontal centered
-     *
-     * @param isCentered true, if the paragraphs are horizontal centered
-     * A {@code null} values unsets this property.
-     */
-    void setHorizontalCentered(Boolean isCentered);
-    
-    /**
-     * @return whether to wrap words within the bounding rectangle
-     */
-    boolean getWordWrap();
-
-    /**
-     * @param wrap whether to wrap words within the bounding rectangle
-     */
-    void setWordWrap(boolean wrap);
-    
-    /**
-     * @return vertical orientation of the text
-     */
-    TextDirection getTextDirection();
-
-    /**
-     * sets the vertical orientation
-     * @param orientation vertical orientation of the text
-     */
-    void setTextDirection(TextDirection orientation);
-
-    /**
-     * The text rotation can be independent specified from the shape rotation.
-     * For XSLF this can be an arbitrary degree, for HSLF the degree is given in steps of 90 degrees
-     * 
-     * @return text rotation in degrees, returns null if no rotation is given
-     */
-    Double getTextRotation();
-    
-    /**
-     * Sets the text rotation.
-     * For XSLF this can ben an arbitrary degree, for HSLF the rotation is rounded to next 90 degree step
-     * 
-     * @param rotation the text rotation, or null to unset the rotation
-     */
-    void setTextRotation(Double rotation);
-    
-    /**
-     * Sets the text placeholder
-     */
-    void setTextPlaceholder(TextPlaceholder placeholder);
-    
-    /**
-     * @return the text placeholder
-     */
-    TextPlaceholder getTextPlaceholder();
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java b/trunk/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
deleted file mode 100644
index a38da00..0000000
--- a/trunk/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.sl.usermodel;
-
-/**
- * Specifies a list of available anchoring types for text
- * 
- * <!-- FIXME: Identical to {@link org.apache.poi.ss.usermodel.VerticalAlignment}. Should merge these to
- * {@link org.apache.poi.common.usermodel}.VerticalAlignment in the future. -->
- * 
- * @author Yegor Kozlov
- */
-public enum VerticalAlignment {
-    /**
-     * Anchor the text at the top of the bounding rectangle
-     */
-    TOP,
-
-    /**
-     * Anchor the text at the middle of the bounding rectangle
-     */
-    MIDDLE,
-
-    /**
-     * Anchor the text at the bottom of the bounding rectangle.
-     */
-    BOTTOM,
-
-    /**
-     * Anchor the text so that it is justified vertically.
-     * <p>
-     * When text is horizontal, this spaces out the actual lines of
-     * text and is almost always identical in behavior to
-     * {@link #DISTRIBUTED} (special case: if only 1 line, then anchored at top).
-     * </p>
-     * <p>
-     * When text is vertical, then it justifies the letters
-     * vertically. This is different than {@link #DISTRIBUTED},
-     * because in some cases such as very little text in a line,
-     * it will not justify.
-     * </p>
-     */
-    JUSTIFIED,
-
-    /**
-     * Anchor the text so that it is distributed vertically.
-     * <p>
-     * When text is horizontal, this spaces out the actual lines
-     * of text and is almost always identical in behavior to
-     * {@link #JUSTIFIED} (special case: if only 1 line, then anchored in middle).
-     * </p>
-     * <p>
-     * When text is vertical, then it distributes the letters vertically.
-     * This is different than {@link #JUSTIFIED}, because it always forces distribution
-     * of the words, even if there are only one or two words in a line.
-     */
-    DISTRIBUTED
-}
diff --git a/trunk/src/java/org/apache/poi/ss/SpreadsheetVersion.java b/trunk/src/java/org/apache/poi/ss/SpreadsheetVersion.java
deleted file mode 100644
index 200175d..0000000
--- a/trunk/src/java/org/apache/poi/ss/SpreadsheetVersion.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss;
-
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * This enum allows spreadsheets from multiple Excel versions to be handled by the common code.
- * <p>Properties of this enum correspond to attributes of the <i>spreadsheet</i> that are easily
- * discernable to the user.  It is not intended to deal with low-level issues like file formats.
- */
-public enum SpreadsheetVersion {
-    /**
-     * Excel97 format aka BIFF8
-     * <ul>
-     * <li>The total number of available rows is 64k (2^16)</li>
-     * <li>The total number of available columns is 256 (2^8)</li>
-     * <li>The maximum number of arguments to a function is 30</li>
-     * <li>Number of conditional format conditions on a cell is 3</li>
-     * <li>Number of cell styles is 4000</li>
-     * <li>Length of text cell contents is 32767</li>
-     * </ul>
-     */
-    EXCEL97(0x10000, 0x0100, 30, 3, 4000, 32767),
-
-    /**
-     * Excel2007
-     *
-     * <ul>
-     * <li>The total number of available rows is 1M (2^20)</li>
-     * <li>The total number of available columns is 16K (2^14)</li>
-     * <li>The maximum number of arguments to a function is 255</li>
-     * <li>Number of conditional format conditions on a cell is unlimited
-     * (actually limited by available memory in Excel)</li>
-     * <li>Number of cell styles is 64000</li>
-     * <li>Length of text cell contents is 32767</li>
-     * <ul>
-     */
-    EXCEL2007(0x100000, 0x4000, 255, Integer.MAX_VALUE, 64000, 32767);
-
-    private final int _maxRows;
-    private final int _maxColumns;
-    private final int _maxFunctionArgs;
-    private final int _maxCondFormats;
-    private final int _maxCellStyles;
-    private final int _maxTextLength;
-
-    private SpreadsheetVersion(int maxRows, int maxColumns, int maxFunctionArgs, int maxCondFormats, int maxCellStyles, int maxText) {
-        _maxRows = maxRows;
-        _maxColumns = maxColumns;
-        _maxFunctionArgs = maxFunctionArgs;
-        _maxCondFormats = maxCondFormats;
-        _maxCellStyles = maxCellStyles;
-        _maxTextLength = maxText;
-    }
-
-    /**
-     * @return the maximum number of usable rows in each spreadsheet
-     */
-    public int getMaxRows() {
-        return _maxRows;
-    }
-
-    /**
-     * @return the last (maximum) valid row index, equals to <code> getMaxRows() - 1 </code>
-     */
-    public int getLastRowIndex() {
-        return _maxRows - 1;
-    }
-
-    /**
-     * @return the maximum number of usable columns in each spreadsheet
-     */
-    public int getMaxColumns() {
-        return _maxColumns;
-    }
-
-    /**
-     * @return the last (maximum) valid column index, equals to <code> getMaxColumns() - 1 </code>
-     */
-    public int getLastColumnIndex() {
-        return _maxColumns - 1;
-    }
-
-    /**
-     * @return the maximum number arguments that can be passed to a multi-arg function (e.g. COUNTIF)
-     */
-    public int getMaxFunctionArgs() {
-        return _maxFunctionArgs;
-    }
-
-    /**
-     * @return the maximum number of conditional format conditions on a cell
-     */
-    public int getMaxConditionalFormats() {
-        return _maxCondFormats;
-    }
-
-    /**
-     * @return the maximum number of cell styles per spreadsheet
-     */
-    public int getMaxCellStyles() {
-        return _maxCellStyles;
-    }
-
-    /**
-     *
-     * @return the last valid column index in a ALPHA-26 representation
-     *  (<code>IV</code> or <code>XFD</code>).
-     */
-    public String getLastColumnName() {
-        return CellReference.convertNumToColString(getLastColumnIndex());
-    }
-
-    /**
-     * @return the maximum length of a text cell
-     */
-    public int getMaxTextLength() {
-        return _maxTextLength;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java b/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
deleted file mode 100644
index 82a3159..0000000
--- a/trunk/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.extractor;
-
-/**
- * Common interface for Excel text extractors, covering
- *  HSSF and XSSF
- */
-public interface ExcelExtractor {
-    /**
-     * Should sheet names be included?
-     * Default is true
-     * 
-     * @param includeSheetNames {@code true} if the sheet names should be included
-     */
-    public void setIncludeSheetNames(boolean includeSheetNames);
-
-    /**
-     * Should we return the formula itself, and not the result it produces?
-     * Default is false
-     * 
-     * @param formulasNotResults {@code true} if the formula itself is returned
-     */
-    public void setFormulasNotResults(boolean formulasNotResults);
-
-    /**
-     * Should headers and footers be included in the output?
-     * Default is true
-     * 
-     * @param includeHeadersFooters {@code true} if headers and footers should be included
-     */
-    public void setIncludeHeadersFooters(boolean includeHeadersFooters);
-
-    /**
-     * Should cell comments be included?
-     * Default is false
-     * 
-     * @param includeCellComments {@code true} if cell comments should be included
-     */
-    public void setIncludeCellComments(boolean includeCellComments);
-
-    /**
-     * Retrieves the text contents of the file
-     * 
-     * @return the text contents of the file
-     */
-    public String getText();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellDateFormatter.java b/trunk/src/java/org/apache/poi/ss/format/CellDateFormatter.java
deleted file mode 100644
index 11c567c..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellDateFormatter.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.text.AttributedCharacterIterator;
-import java.text.CharacterIterator;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Formatter;
-import java.util.Locale;
-import java.util.regex.Matcher;
-
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Formats a date value.
- */
-public class CellDateFormatter extends CellFormatter {
-    private boolean amPmUpper;
-    private boolean showM;
-    private boolean showAmPm;
-    private final DateFormat dateFmt;
-    private String sFmt;
-
-    private final Calendar EXCEL_EPOCH_CAL =
-        LocaleUtil.getLocaleCalendar(1904, 0, 1);
-
-    private static /* final */ CellDateFormatter SIMPLE_DATE = null;
-
-    private class DatePartHandler implements CellFormatPart.PartHandler {
-        private int mStart = -1;
-        private int mLen;
-        private int hStart = -1;
-        private int hLen;
-
-        public String handlePart(Matcher m, String part, CellFormatType type,
-                StringBuffer desc) {
-
-            int pos = desc.length();
-            char firstCh = part.charAt(0);
-            switch (firstCh) {
-            case 's':
-            case 'S':
-                if (mStart >= 0) {
-                    for (int i = 0; i < mLen; i++)
-                        desc.setCharAt(mStart + i, 'm');
-                    mStart = -1;
-                }
-                return part.toLowerCase(Locale.ROOT);
-
-            case 'h':
-            case 'H':
-                mStart = -1;
-                hStart = pos;
-                hLen = part.length();
-                return part.toLowerCase(Locale.ROOT);
-
-            case 'd':
-            case 'D':
-                mStart = -1;
-                if (part.length() <= 2)
-                    return part.toLowerCase(Locale.ROOT);
-                else
-                    return part.toLowerCase(Locale.ROOT).replace('d', 'E');
-
-            case 'm':
-            case 'M':
-                mStart = pos;
-                mLen = part.length();
-                // For 'm' after 'h', output minutes ('m') not month ('M')
-                if (hStart >= 0)
-                    return part.toLowerCase(Locale.ROOT);
-                else
-                    return part.toUpperCase(Locale.ROOT);
-
-            case 'y':
-            case 'Y':
-                mStart = -1;
-                if (part.length() == 3)
-                    part = "yyyy";
-                return part.toLowerCase(Locale.ROOT);
-
-            case '0':
-                mStart = -1;
-                int sLen = part.length();
-                sFmt = "%0" + (sLen + 2) + "." + sLen + "f";
-                return part.replace('0', 'S');
-
-            case 'a':
-            case 'A':
-            case 'p':
-            case 'P':
-                if (part.length() > 1) {
-                    // am/pm marker
-                    mStart = -1;
-                    showAmPm = true;
-                    showM = Character.toLowerCase(part.charAt(1)) == 'm';
-                    // For some reason "am/pm" becomes AM or PM, but "a/p" becomes a or p
-                    amPmUpper = showM || Character.isUpperCase(part.charAt(0));
-
-                    return "a";
-                }
-                //noinspection fallthrough
-
-            default:
-                return null;
-            }
-        }
-
-        public void finish(StringBuffer toAppendTo) {
-            if (hStart >= 0 && !showAmPm) {
-                for (int i = 0; i < hLen; i++) {
-                    toAppendTo.setCharAt(hStart + i, 'H');
-                }
-            }
-        }
-    }
-
-    /**
-     * Creates a new date formatter with the given specification.
-     *
-     * @param format The format.
-     */
-    public CellDateFormatter(String format) {
-        super(format);
-        DatePartHandler partHandler = new DatePartHandler();
-        StringBuffer descBuf = CellFormatPart.parseFormat(format,
-                CellFormatType.DATE, partHandler);
-        partHandler.finish(descBuf);
-        // tweak the format pattern to pass tests on JDK 1.7,
-        // See https://issues.apache.org/bugzilla/show_bug.cgi?id=53369
-        String ptrn = descBuf.toString().replaceAll("((y)(?!y))(?<!yy)", "yy");
-        dateFmt = new SimpleDateFormat(ptrn, LocaleUtil.getUserLocale());
-        dateFmt.setTimeZone(LocaleUtil.getUserTimeZone());
-    }
-
-    /** {@inheritDoc} */
-    public void formatValue(StringBuffer toAppendTo, Object value) {
-        if (value == null)
-            value = 0.0;
-        if (value instanceof Number) {
-            Number num = (Number) value;
-            long v = num.longValue();
-            if (v == 0L) {
-                value = EXCEL_EPOCH_CAL.getTime();
-            } else {
-                Calendar c = (Calendar)EXCEL_EPOCH_CAL.clone();
-                c.add(Calendar.SECOND, (int)(v / 1000));
-                c.add(Calendar.MILLISECOND, (int)(v % 1000));
-                value = c.getTime();
-            }
-        }
-
-        AttributedCharacterIterator it = dateFmt.formatToCharacterIterator(value);
-        boolean doneAm = false;
-        boolean doneMillis = false;
-
-        it.first();
-        for (char ch = it.first();
-             ch != CharacterIterator.DONE;
-             ch = it.next()) {
-            if (it.getAttribute(DateFormat.Field.MILLISECOND) != null) {
-                if (!doneMillis) {
-                    Date dateObj = (Date) value;
-                    int pos = toAppendTo.length();
-                    Formatter formatter = new Formatter(toAppendTo, Locale.ROOT);
-                    try {
-                        long msecs = dateObj.getTime() % 1000;
-                        formatter.format(LocaleUtil.getUserLocale(), sFmt, msecs / 1000.0);
-                    } finally {
-                        formatter.close();
-                    }
-                    toAppendTo.delete(pos, pos + 2);
-                    doneMillis = true;
-                }
-            } else if (it.getAttribute(DateFormat.Field.AM_PM) != null) {
-                if (!doneAm) {
-                    if (showAmPm) {
-                        if (amPmUpper) {
-                            toAppendTo.append(Character.toUpperCase(ch));
-                            if (showM)
-                                toAppendTo.append('M');
-                        } else {
-                            toAppendTo.append(Character.toLowerCase(ch));
-                            if (showM)
-                                toAppendTo.append('m');
-                        }
-                    }
-                    doneAm = true;
-                }
-            } else {
-                toAppendTo.append(ch);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p/>
-     * For a date, this is <tt>"mm/d/y"</tt>.
-     */
-    public void simpleValue(StringBuffer toAppendTo, Object value) {
-        synchronized (CellDateFormatter.class) {
-            if (SIMPLE_DATE == null || !SIMPLE_DATE.EXCEL_EPOCH_CAL.equals(EXCEL_EPOCH_CAL)) {
-                SIMPLE_DATE = new CellDateFormatter("mm/d/y");
-            }
-        }
-        SIMPLE_DATE.formatValue(toAppendTo, value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java b/trunk/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java
deleted file mode 100644
index 9a90e8a..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.util.ArrayList;
-import java.util.Formatter;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * This class implements printing out an elapsed time format.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class CellElapsedFormatter extends CellFormatter {
-    private final List<TimeSpec> specs;
-    private TimeSpec topmost;
-    private final String printfFmt;
-
-    private static final Pattern PERCENTS = Pattern.compile("%");
-
-    private static final double HOUR__FACTOR = 1.0 / 24.0;
-    private static final double MIN__FACTOR = HOUR__FACTOR / 60.0;
-    private static final double SEC__FACTOR = MIN__FACTOR / 60.0;
-
-    private static class TimeSpec {
-        final char type;
-        final int pos;
-        final int len;
-        final double factor;
-        double modBy;
-
-        public TimeSpec(char type, int pos, int len, double factor) {
-            this.type = type;
-            this.pos = pos;
-            this.len = len;
-            this.factor = factor;
-            modBy = 0;
-        }
-
-        public long valueFor(double elapsed) {
-            double val;
-            if (modBy == 0)
-                val = elapsed / factor;
-            else
-                val = elapsed / factor % modBy;
-            if (type == '0')
-                return Math.round(val);
-            else
-                return (long) val;
-        }
-    }
-
-    private class ElapsedPartHandler implements CellFormatPart.PartHandler {
-        // This is the one class that's directly using printf, so it can't use
-        // the default handling for quoted strings and special characters.  The
-        // only special character for this is '%', so we have to handle all the
-        // quoting in this method ourselves.
-
-        public String handlePart(Matcher m, String part, CellFormatType type,
-                StringBuffer desc) {
-
-            int pos = desc.length();
-            char firstCh = part.charAt(0);
-            switch (firstCh) {
-            case '[':
-                if (part.length() < 3)
-                    break;
-                if (topmost != null)
-                    throw new IllegalArgumentException(
-                            "Duplicate '[' times in format");
-                part = part.toLowerCase(Locale.ROOT);
-                int specLen = part.length() - 2;
-                topmost = assignSpec(part.charAt(1), pos, specLen);
-                return part.substring(1, 1 + specLen);
-
-            case 'h':
-            case 'm':
-            case 's':
-            case '0':
-                part = part.toLowerCase(Locale.ROOT);
-                assignSpec(part.charAt(0), pos, part.length());
-                return part;
-
-            case '\n':
-                return "%n";
-
-            case '\"':
-                part = part.substring(1, part.length() - 1);
-                break;
-
-            case '\\':
-                part = part.substring(1);
-                break;
-
-            case '*':
-                if (part.length() > 1)
-                    part = CellFormatPart.expandChar(part);
-                break;
-
-            // An escape we can let it handle because it can't have a '%'
-            case '_':
-                return null;
-            }
-            // Replace ever "%" with a "%%" so we can use printf
-            return PERCENTS.matcher(part).replaceAll("%%");
-        }
-    }
-
-    /**
-     * Creates a elapsed time formatter.
-     *
-     * @param pattern The pattern to parse.
-     */
-    public CellElapsedFormatter(String pattern) {
-        super(pattern);
-
-        specs = new ArrayList<TimeSpec>();
-
-        StringBuffer desc = CellFormatPart.parseFormat(pattern,
-                CellFormatType.ELAPSED, new ElapsedPartHandler());
-
-        ListIterator<TimeSpec> it = specs.listIterator(specs.size());
-        while (it.hasPrevious()) {
-            TimeSpec spec = it.previous();
-            desc.replace(spec.pos, spec.pos + spec.len, "%0" + spec.len + "d");
-            if (spec.type != topmost.type) {
-                spec.modBy = modFor(spec.type, spec.len);
-            }
-        }
-
-        printfFmt = desc.toString();
-    }
-
-    private TimeSpec assignSpec(char type, int pos, int len) {
-        TimeSpec spec = new TimeSpec(type, pos, len, factorFor(type, len));
-        specs.add(spec);
-        return spec;
-    }
-
-    private static double factorFor(char type, int len) {
-        switch (type) {
-        case 'h':
-            return HOUR__FACTOR;
-        case 'm':
-            return MIN__FACTOR;
-        case 's':
-            return SEC__FACTOR;
-        case '0':
-            return SEC__FACTOR / Math.pow(10, len);
-        default:
-            throw new IllegalArgumentException(
-                    "Uknown elapsed time spec: " + type);
-        }
-    }
-
-    private static double modFor(char type, int len) {
-        switch (type) {
-        case 'h':
-            return 24;
-        case 'm':
-            return 60;
-        case 's':
-            return 60;
-        case '0':
-            return Math.pow(10, len);
-        default:
-            throw new IllegalArgumentException(
-                    "Uknown elapsed time spec: " + type);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void formatValue(StringBuffer toAppendTo, Object value) {
-        double elapsed = ((Number) value).doubleValue();
-
-        if (elapsed < 0) {
-            toAppendTo.append('-');
-            elapsed = -elapsed;
-        }
-
-        Object[] parts = new Long[specs.size()];
-        for (int i = 0; i < specs.size(); i++) {
-            parts[i] = specs.get(i).valueFor(elapsed);
-        }
-
-        Formatter formatter = new Formatter(toAppendTo, Locale.ROOT);
-        try {
-            formatter.format(printfFmt, parts);
-        } finally {
-            formatter.close();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p/>
-     * For a date, this is <tt>"mm/d/y"</tt>.
-     */
-    public void simpleValue(StringBuffer toAppendTo, Object value) {
-        formatValue(toAppendTo, value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellFormat.java b/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
deleted file mode 100644
index bad8497..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/* ====================================================================
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.format;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.swing.JLabel;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ConditionalFormatting;
-import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.util.DateFormatConverter;
-
-/**
- * Format a value according to the standard Excel behavior.  This "standard" is
- * not explicitly documented by Microsoft, so the behavior is determined by
- * experimentation; see the tests.
- * <p/>
- * An Excel format has up to four parts, separated by semicolons.  Each part
- * specifies what to do with particular kinds of values, depending on the number
- * of parts given:
- * <dl>
- * <dt>One part (example: <tt>[Green]#.##</tt>)</dt>
- * <dd>If the value is a number, display according to this one part (example: green text,
- * with up to two decimal points). If the value is text, display it as is.</dd>
- * 
- * <dt>Two parts (example: <tt>[Green]#.##;[Red]#.##</tt>)</dt>
- * <dd>If the value is a positive number or zero, display according to the first part (example: green
- * text, with up to two decimal points); if it is a negative number, display
- * according to the second part (example: red text, with up to two decimal
- * points). If the value is text, display it as is.</dd>
- * 
- * <dt>Three parts (example: <tt>[Green]#.##;[Black]#.##;[Red]#.##</tt>)</dt>
- * <dd>If the value is a positive
- * number, display according to the first part (example: green text, with up to
- * two decimal points); if it is zero, display according to the second part
- * (example: black text, with up to two decimal points); if it is a negative
- * number, display according to the third part (example: red text, with up to
- * two decimal points). If the value is text, display it as is.</dd>
- * 
- * <dt>Four parts (example: <tt>[Green]#.##;[Black]#.##;[Red]#.##;[@]</tt>)</dt>
- * <dd>If the value is a positive number, display according to the first part (example: green text,
- * with up to two decimal points); if it is zero, display according to the
- * second part (example: black text, with up to two decimal points); if it is a
- * negative number, display according to the third part (example: red text, with
- * up to two decimal points). If the value is text, display according to the
- * fourth part (example: text in the cell's usual color, with the text value
- * surround by brackets).</dd>
- * </dl>
- * <p/>
- * A given format part may specify a given Locale, by including something
- *  like <tt>[$$-409]</tt> or <tt>[$&pound;-809]</tt> or <tt>[$-40C]</tt>. These
- *  are (currently) largely ignored. You can use {@link DateFormatConverter}
- *  to look these up into Java Locales if desired.
- * <p/>
- * In addition to these, there is a general format that is used when no format
- * is specified.  This formatting is presented by the {@link #GENERAL_FORMAT}
- * object.
- * 
- * TODO Merge this with {@link DataFormatter} so we only have one set of
- *  code for formatting numbers.
- * TODO Re-use parts of this logic with {@link ConditionalFormatting} /
- *  {@link ConditionalFormattingRule} for reporting stylings which do/don't apply
- * TODO Support the full set of modifiers, including alternate calendars and
- *  native character numbers, as documented at https://help.libreoffice.org/Common/Number_Format_Codes
- */
-public class CellFormat {
-    private final String format;
-    private final CellFormatPart posNumFmt;
-    private final CellFormatPart zeroNumFmt;
-    private final CellFormatPart negNumFmt;
-    private final CellFormatPart textFmt;
-    private final int formatPartCount;
-
-    private static final Pattern ONE_PART = Pattern.compile(
-            CellFormatPart.FORMAT_PAT.pattern() + "(;|$)",
-            Pattern.COMMENTS | Pattern.CASE_INSENSITIVE);
-
-    private static final CellFormatPart DEFAULT_TEXT_FORMAT =
-            new CellFormatPart("@");
-
-    /*
-     * Cells that cannot be formatted, e.g. cells that have a date or time
-     * format and have an invalid date or time value, are displayed as 255
-     * pound signs ("#").
-     */
-    private static final String INVALID_VALUE_FOR_FORMAT =
-            "###################################################" +
-            "###################################################" +
-            "###################################################" +
-            "###################################################" +
-            "###################################################";
-
-    private static String QUOTE = "\"";
-
-    /**
-     * Format a value as it would be were no format specified.  This is also
-     * used when the format specified is <tt>General</tt>.
-     */
-    public static final CellFormat GENERAL_FORMAT = new CellFormat("General") {
-        @Override
-        public CellFormatResult apply(Object value) {
-            String text = (new CellGeneralFormatter()).format(value);
-            return new CellFormatResult(true, text, null);
-        }
-    };
-
-    /** Maps a format string to its parsed version for efficiencies sake. */
-    private static final Map<String, CellFormat> formatCache =
-            new WeakHashMap<String, CellFormat>();
-
-    /**
-     * Returns a {@link CellFormat} that applies the given format.  Two calls
-     * with the same format may or may not return the same object.
-     *
-     * @param format The format.
-     *
-     * @return A {@link CellFormat} that applies the given format.
-     */
-    public static CellFormat getInstance(String format) {
-        CellFormat fmt = formatCache.get(format);
-        if (fmt == null) {
-            if (format.equals("General") || format.equals("@"))
-                fmt = GENERAL_FORMAT;
-            else
-                fmt = new CellFormat(format);
-            formatCache.put(format, fmt);
-        }
-        return fmt;
-    }
-
-    /**
-     * Creates a new object.
-     *
-     * @param format The format.
-     */
-    private CellFormat(String format) {
-        this.format = format;
-        Matcher m = ONE_PART.matcher(format);
-        List<CellFormatPart> parts = new ArrayList<CellFormatPart>();
-
-        while (m.find()) {
-            try {
-                String valueDesc = m.group();
-
-                // Strip out the semicolon if it's there
-                if (valueDesc.endsWith(";"))
-                    valueDesc = valueDesc.substring(0, valueDesc.length() - 1);
-
-                parts.add(new CellFormatPart(valueDesc));
-            } catch (RuntimeException e) {
-                CellFormatter.logger.log(Level.WARNING,
-                        "Invalid format: " + CellFormatter.quote(m.group()), e);
-                parts.add(null);
-            }
-        }
-        
-        formatPartCount = parts.size();
-        
-        switch (formatPartCount) {
-        case 1:
-            posNumFmt = parts.get(0);
-            negNumFmt = null;
-            zeroNumFmt = null;
-            textFmt = DEFAULT_TEXT_FORMAT;
-            break;
-        case 2:
-            posNumFmt = parts.get(0);
-            negNumFmt = parts.get(1);
-            zeroNumFmt = null;
-            textFmt = DEFAULT_TEXT_FORMAT;
-            break;
-        case 3:
-            posNumFmt = parts.get(0);
-            negNumFmt = parts.get(1);
-            zeroNumFmt = parts.get(2);
-            textFmt = DEFAULT_TEXT_FORMAT;
-            break;
-        case 4:
-        default:
-            posNumFmt = parts.get(0);
-            negNumFmt = parts.get(1);
-            zeroNumFmt = parts.get(2);
-            textFmt = parts.get(3);
-            break;
-        }
-    }
-
-    /**
-     * Returns the result of applying the format to the given value.  If the
-     * value is a number (a type of {@link Number} object), the correct number
-     * format type is chosen; otherwise it is considered a text object.
-     *
-     * @param value The value
-     *
-     * @return The result, in a {@link CellFormatResult}.
-     */
-    public CellFormatResult apply(Object value) {
-        if (value instanceof Number) {
-            Number num = (Number) value;
-            double val = num.doubleValue();
-            if (val < 0 &&
-                    ((formatPartCount == 2
-                            && !posNumFmt.hasCondition() && !negNumFmt.hasCondition())
-                    || (formatPartCount == 3 && !negNumFmt.hasCondition())
-                    || (formatPartCount == 4 && !negNumFmt.hasCondition()))) {
-                // The negative number format has the negative formatting required,
-                // e.g. minus sign or brackets, so pass a positive value so that
-                // the default leading minus sign is not also output
-                return negNumFmt.apply(-val);
-            } else {
-                return getApplicableFormatPart(val).apply(val);
-            }
-        } else if (value instanceof java.util.Date) {
-            // Don't know (and can't get) the workbook date windowing (1900 or 1904)
-            // so assume 1900 date windowing
-            Double numericValue = DateUtil.getExcelDate((Date) value);
-            if (DateUtil.isValidExcelDate(numericValue)) {
-                return getApplicableFormatPart(numericValue).apply(value);
-            } else {
-                throw new IllegalArgumentException("value " + numericValue + " of date " + value + " is not a valid Excel date");
-            }
-        } else {
-            return textFmt.apply(value);
-        }
-    }
-
-    /**
-     * Returns the result of applying the format to the given date.
-     *
-     * @param date         The date.
-     * @param numericValue The numeric value for the date.
-     *
-     * @return The result, in a {@link CellFormatResult}.
-     */
-    private CellFormatResult apply(Date date, double numericValue) {
-        return getApplicableFormatPart(numericValue).apply(date);
-    }
-
-    /**
-     * Fetches the appropriate value from the cell, and returns the result of
-     * applying it to the appropriate format.  For formula cells, the computed
-     * value is what is used.
-     *
-     * @param c The cell.
-     *
-     * @return The result, in a {@link CellFormatResult}.
-     */
-    public CellFormatResult apply(Cell c) {
-        switch (ultimateTypeEnum(c)) {
-        case BLANK:
-            return apply("");
-        case BOOLEAN:
-            return apply(c.getBooleanCellValue());
-        case NUMERIC:
-            Double value = c.getNumericCellValue();
-            if (getApplicableFormatPart(value).getCellFormatType() == CellFormatType.DATE) {
-                if (DateUtil.isValidExcelDate(value)) {
-                    return apply(c.getDateCellValue(), value);
-                } else {
-                    return apply(INVALID_VALUE_FOR_FORMAT);
-                }
-            } else {
-                return apply(value);
-            }
-        case STRING:
-            return apply(c.getStringCellValue());
-        default:
-            return apply("?");
-        }
-    }
-
-    /**
-     * Uses the result of applying this format to the value, setting the text
-     * and color of a label before returning the result.
-     *
-     * @param label The label to apply to.
-     * @param value The value to process.
-     *
-     * @return The result, in a {@link CellFormatResult}.
-     */
-    public CellFormatResult apply(JLabel label, Object value) {
-        CellFormatResult result = apply(value);
-        label.setText(result.text);
-        if (result.textColor != null) {
-            label.setForeground(result.textColor);
-        }
-        return result;
-    }
-
-    /**
-     * Uses the result of applying this format to the given date, setting the text
-     * and color of a label before returning the result.
-     *
-     * @param label        The label to apply to.
-     * @param date         The date.
-     * @param numericValue The numeric value for the date.
-     *
-     * @return The result, in a {@link CellFormatResult}.
-     */
-    private CellFormatResult apply(JLabel label, Date date, double numericValue) {
-        CellFormatResult result = apply(date, numericValue);
-        label.setText(result.text);
-        if (result.textColor != null) {
-            label.setForeground(result.textColor);
-        }
-        return result;
-    }
-
-    /**
-     * Fetches the appropriate value from the cell, and uses the result, setting
-     * the text and color of a label before returning the result.
-     *
-     * @param label The label to apply to.
-     * @param c     The cell.
-     *
-     * @return The result, in a {@link CellFormatResult}.
-     */
-    public CellFormatResult apply(JLabel label, Cell c) {
-        switch (ultimateTypeEnum(c)) {
-            case BLANK:
-                return apply(label, "");
-            case BOOLEAN:
-                return apply(label, c.getBooleanCellValue());
-            case NUMERIC:
-                Double value = c.getNumericCellValue();
-                if (getApplicableFormatPart(value).getCellFormatType() == CellFormatType.DATE) {
-                    if (DateUtil.isValidExcelDate(value)) {
-                        return apply(label, c.getDateCellValue(), value);
-                    } else {
-                        return apply(label, INVALID_VALUE_FOR_FORMAT);
-                    }
-                } else {
-                    return apply(label, value);
-                }
-            case STRING:
-                return apply(label, c.getStringCellValue());
-            default:
-                return apply(label, "?");
-            }
-    }
-
-    /**
-     * Returns the {@link CellFormatPart} that applies to the value.  Result
-     * depends on how many parts the cell format has, the cell value and any
-     * conditions.  The value must be a {@link Number}.
-     * 
-     * @param value The value.
-     * @return The {@link CellFormatPart} that applies to the value.
-     */
-    private CellFormatPart getApplicableFormatPart(Object value) {
-        
-        if (value instanceof Number) {
-            
-            double val = ((Number) value).doubleValue();
-            
-            if (formatPartCount == 1) {
-                if (!posNumFmt.hasCondition()
-                        || (posNumFmt.hasCondition() && posNumFmt.applies(val))) {
-                    return posNumFmt;
-                } else {
-                    return new CellFormatPart("General");
-                }
-            } else if (formatPartCount == 2) {
-                if ((!posNumFmt.hasCondition() && val >= 0)
-                        || (posNumFmt.hasCondition() && posNumFmt.applies(val))) {
-                    return posNumFmt;
-                } else if (!negNumFmt.hasCondition()
-                        || (negNumFmt.hasCondition() && negNumFmt.applies(val))) {
-                    return negNumFmt;
-                } else {
-                    // Return ###...### (255 #s) to match Excel 2007 behaviour
-                    return new CellFormatPart(QUOTE + INVALID_VALUE_FOR_FORMAT + QUOTE);
-                }
-            } else {
-                if ((!posNumFmt.hasCondition() && val > 0)
-                        || (posNumFmt.hasCondition() && posNumFmt.applies(val))) {
-                    return posNumFmt;
-                } else if ((!negNumFmt.hasCondition() && val < 0)
-                        || (negNumFmt.hasCondition() && negNumFmt.applies(val))) {
-                    return negNumFmt;
-                // Only the first two format parts can have conditions
-                } else {
-                    return zeroNumFmt;
-                }
-            }
-        } else {
-            throw new IllegalArgumentException("value must be a Number");
-        }
-        
-    }
-    
-    /**
-     * Returns the ultimate cell type, following the results of formulas.  If
-     * the cell is a {@link CellType#FORMULA}, this returns the result of
-     * {@link Cell#getCachedFormulaResultTypeEnum()}.  Otherwise this returns the
-     * result of {@link Cell#getCellTypeEnum()}.
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     *
-     * @param cell The cell.
-     *
-     * @return The ultimate type of this cell.
-     * @deprecated POI 3.15. This will return a CellType enum in the future
-     */
-    public static int ultimateType(Cell cell) {
-        return ultimateTypeEnum(cell).getCode();
-    }
-
-    /**
-     * Returns the ultimate cell type, following the results of formulas.  If
-     * the cell is a {@link CellType#FORMULA}, this returns the result of
-     * {@link Cell#getCachedFormulaResultTypeEnum()}.  Otherwise this returns the
-     * result of {@link Cell#getCellTypeEnum()}.
-     *
-     * @param cell The cell.
-     *
-     * @return The ultimate type of this cell.
-     * @since POI 3.15 beta 3
-     * @deprecated POI 3.15 beta 3
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    public static CellType ultimateTypeEnum(Cell cell) {
-        CellType type = cell.getCellTypeEnum();
-        if (type == CellType.FORMULA)
-            return cell.getCachedFormulaResultTypeEnum();
-        else
-            return type;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the other object is a {@link CellFormat} object
-     * with the same format.
-     *
-     * @param obj The other object.
-     *
-     * @return <tt>true</tt> if the two objects are equal.
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj instanceof CellFormat) {
-            CellFormat that = (CellFormat) obj;
-            return format.equals(that.format);
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hash code for the format.
-     *
-     * @return A hash code for the format.
-     */
-    @Override
-    public int hashCode() {
-        return format.hashCode();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellFormatCondition.java b/trunk/src/java/org/apache/poi/ss/format/CellFormatCondition.java
deleted file mode 100644
index 23fd2f2..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellFormatCondition.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This object represents a condition in a cell format.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public abstract class CellFormatCondition {
-    private static final int LT = 0;
-    private static final int LE = 1;
-    private static final int GT = 2;
-    private static final int GE = 3;
-    private static final int EQ = 4;
-    private static final int NE = 5;
-
-    private static final Map<String, Integer> TESTS;
-
-    static {
-        TESTS = new HashMap<String, Integer>();
-        TESTS.put("<", LT);
-        TESTS.put("<=", LE);
-        TESTS.put(">", GT);
-        TESTS.put(">=", GE);
-        TESTS.put("=", EQ);
-        TESTS.put("==", EQ);
-        TESTS.put("!=", NE);
-        TESTS.put("<>", NE);
-    }
-
-    /**
-     * Returns an instance of a condition object.
-     *
-     * @param opString The operator as a string.  One of <tt>"&lt;"</tt>,
-     *                 <tt>"&lt;="</tt>, <tt>">"</tt>, <tt>">="</tt>,
-     *                 <tt>"="</tt>, <tt>"=="</tt>, <tt>"!="</tt>, or
-     *                 <tt>"&lt;>"</tt>.
-     * @param constStr The constant (such as <tt>"12"</tt>).
-     *
-     * @return A condition object for the given condition.
-     */
-    public static CellFormatCondition getInstance(String opString,
-            String constStr) {
-
-        if (!TESTS.containsKey(opString))
-            throw new IllegalArgumentException("Unknown test: " + opString);
-        int test = TESTS.get(opString);
-
-        final double c = Double.parseDouble(constStr);
-
-        switch (test) {
-        case LT:
-            return new CellFormatCondition() {
-                public boolean pass(double value) {
-                    return value < c;
-                }
-            };
-        case LE:
-            return new CellFormatCondition() {
-                public boolean pass(double value) {
-                    return value <= c;
-                }
-            };
-        case GT:
-            return new CellFormatCondition() {
-                public boolean pass(double value) {
-                    return value > c;
-                }
-            };
-        case GE:
-            return new CellFormatCondition() {
-                public boolean pass(double value) {
-                    return value >= c;
-                }
-            };
-        case EQ:
-            return new CellFormatCondition() {
-                public boolean pass(double value) {
-                    return value == c;
-                }
-            };
-        case NE:
-            return new CellFormatCondition() {
-                public boolean pass(double value) {
-                    return value != c;
-                }
-            };
-        default:
-            throw new IllegalArgumentException(
-                    "Cannot create for test number " + test + "(\"" + opString +
-                            "\")");
-        }
-    }
-
-    /**
-     * Returns <tt>true</tt> if the given value passes the constraint's test.
-     *
-     * @param value The value to compare against.
-     *
-     * @return <tt>true</tt> if the given value passes the constraint's test.
-     */
-    public abstract boolean pass(double value);
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java b/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java
deleted file mode 100644
index b4b508f..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import org.apache.poi.hssf.util.HSSFColor;
-
-import javax.swing.*;
-
-import java.awt.*;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.apache.poi.ss.format.CellFormatter.logger;
-import static org.apache.poi.ss.format.CellFormatter.quote;
-
-/**
- * Objects of this class represent a single part of a cell format expression.
- * Each cell can have up to four of these for positive, zero, negative, and text
- * values.
- * <p/>
- * Each format part can contain a color, a condition, and will always contain a
- * format specification.  For example <tt>"[Red][>=10]#"</tt> has a color
- * (<tt>[Red]</tt>), a condition (<tt>>=10</tt>) and a format specification
- * (<tt>#</tt>).
- * <p/>
- * This class also contains patterns for matching the subparts of format
- * specification.  These are used internally, but are made public in case other
- * code has use for them.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class CellFormatPart {
-    private final Color color;
-    private CellFormatCondition condition;
-    private final CellFormatter format;
-    private final CellFormatType type;
-
-    private static final Map<String, Color> NAMED_COLORS;
-
-    static {
-        NAMED_COLORS = new TreeMap<String, Color>(
-                String.CASE_INSENSITIVE_ORDER);
-
-        Map<Integer,HSSFColor> colors = HSSFColor.getIndexHash();
-        for (HSSFColor color : colors.values()) {
-            Class<? extends HSSFColor> type = color.getClass();
-            String name = type.getSimpleName();
-            if (name.equals(name.toUpperCase(Locale.ROOT))) {
-                short[] rgb = color.getTriplet();
-                Color c = new Color(rgb[0], rgb[1], rgb[2]);
-                NAMED_COLORS.put(name, c);
-                if (name.indexOf('_') > 0)
-                    NAMED_COLORS.put(name.replace('_', ' '), c);
-                if (name.indexOf("_PERCENT") > 0)
-                    NAMED_COLORS.put(name.replace("_PERCENT", "%").replace('_',
-                            ' '), c);
-            }
-        }
-    }
-
-    /** Pattern for the color part of a cell format part. */
-    public static final Pattern COLOR_PAT;
-    /** Pattern for the condition part of a cell format part. */
-    public static final Pattern CONDITION_PAT;
-    /** Pattern for the format specification part of a cell format part. */
-    public static final Pattern SPECIFICATION_PAT;
-    /** Pattern for the currency symbol part of a cell format part */
-    public static final Pattern CURRENCY_PAT;
-    /** Pattern for an entire cell single part. */
-    public static final Pattern FORMAT_PAT;
-
-    /** Within {@link #FORMAT_PAT}, the group number for the matched color. */
-    public static final int COLOR_GROUP;
-    /**
-     * Within {@link #FORMAT_PAT}, the group number for the operator in the
-     * condition.
-     */
-    public static final int CONDITION_OPERATOR_GROUP;
-    /**
-     * Within {@link #FORMAT_PAT}, the group number for the value in the
-     * condition.
-     */
-    public static final int CONDITION_VALUE_GROUP;
-    /**
-     * Within {@link #FORMAT_PAT}, the group number for the format
-     * specification.
-     */
-    public static final int SPECIFICATION_GROUP;
-
-    static {
-        // A condition specification
-        String condition = "([<>=]=?|!=|<>)    # The operator\n" +
-                "  \\s*([0-9]+(?:\\.[0-9]*)?)\\s*  # The constant to test against\n";
-        
-        // A currency symbol / string, in a specific locale
-        String currency = "(\\[\\$.{0,3}-[0-9a-f]{3}\\])";
-
-        String color =
-                "\\[(black|blue|cyan|green|magenta|red|white|yellow|color [0-9]+)\\]";
-
-        // A number specification
-        // Note: careful that in something like ##, that the trailing comma is not caught up in the integer part
-
-        // A part of a specification
-        String part = "\\\\.                 # Quoted single character\n" +
-                "|\"([^\\\\\"]|\\\\.)*\"         # Quoted string of characters (handles escaped quotes like \\\") \n" +
-                "|"+currency+"                   # Currency symbol in a given locale\n" +
-                "|_.                             # Space as wide as a given character\n" +
-                "|\\*.                           # Repeating fill character\n" +
-                "|@                              # Text: cell text\n" +
-                "|([0?\\#](?:[0?\\#,]*))         # Number: digit + other digits and commas\n" +
-                "|e[-+]                          # Number: Scientific: Exponent\n" +
-                "|m{1,5}                         # Date: month or minute spec\n" +
-                "|d{1,4}                         # Date: day/date spec\n" +
-                "|y{2,4}                         # Date: year spec\n" +
-                "|h{1,2}                         # Date: hour spec\n" +
-                "|s{1,2}                         # Date: second spec\n" +
-                "|am?/pm?                        # Date: am/pm spec\n" +
-                "|\\[h{1,2}\\]                   # Elapsed time: hour spec\n" +
-                "|\\[m{1,2}\\]                   # Elapsed time: minute spec\n" +
-                "|\\[s{1,2}\\]                   # Elapsed time: second spec\n" +
-                "|[^;]                           # A character\n" + "";
-
-        String format = "(?:" + color + ")?                 # Text color\n" +
-                "(?:\\[" + condition + "\\])?               # Condition\n" +
-                // see https://msdn.microsoft.com/en-ca/goglobal/bb964664.aspx and https://bz.apache.org/ooo/show_bug.cgi?id=70003
-                // we ignore these for now though
-                "(?:\\[\\$-[0-9a-fA-F]+\\])?                # Optional locale id, ignored currently\n" +
-                "((?:" + part + ")+)                        # Format spec\n";
-
-        int flags = Pattern.COMMENTS | Pattern.CASE_INSENSITIVE;
-        COLOR_PAT = Pattern.compile(color, flags);
-        CONDITION_PAT = Pattern.compile(condition, flags);
-        SPECIFICATION_PAT = Pattern.compile(part, flags);
-        CURRENCY_PAT = Pattern.compile(currency, flags);
-        FORMAT_PAT = Pattern.compile(format, flags);
-
-        // Calculate the group numbers of important groups.  (They shift around
-        // when the pattern is changed; this way we figure out the numbers by
-        // experimentation.)
-
-        COLOR_GROUP = findGroup(FORMAT_PAT, "[Blue]@", "Blue");
-        CONDITION_OPERATOR_GROUP = findGroup(FORMAT_PAT, "[>=1]@", ">=");
-        CONDITION_VALUE_GROUP = findGroup(FORMAT_PAT, "[>=1]@", "1");
-        SPECIFICATION_GROUP = findGroup(FORMAT_PAT, "[Blue][>1]\\a ?", "\\a ?");
-    }
-
-    interface PartHandler {
-        String handlePart(Matcher m, String part, CellFormatType type,
-                StringBuffer desc);
-    }
-
-    /**
-     * Create an object to represent a format part.
-     *
-     * @param desc The string to parse.
-     */
-    public CellFormatPart(String desc) {
-        Matcher m = FORMAT_PAT.matcher(desc);
-        if (!m.matches()) {
-            throw new IllegalArgumentException("Unrecognized format: " + quote(
-                    desc));
-        }
-        color = getColor(m);
-        condition = getCondition(m);
-        type = getCellFormatType(m);
-        format = getFormatter(m);
-    }
-
-    /**
-     * Returns <tt>true</tt> if this format part applies to the given value. If
-     * the value is a number and this is part has a condition, returns
-     * <tt>true</tt> only if the number passes the condition.  Otherwise, this
-     * always return <tt>true</tt>.
-     *
-     * @param valueObject The value to evaluate.
-     *
-     * @return <tt>true</tt> if this format part applies to the given value.
-     */
-    public boolean applies(Object valueObject) {
-        if (condition == null || !(valueObject instanceof Number)) {
-            if (valueObject == null)
-                throw new NullPointerException("valueObject");
-            return true;
-        } else {
-            Number num = (Number) valueObject;
-            return condition.pass(num.doubleValue());
-        }
-    }
-
-    /**
-     * Returns the number of the first group that is the same as the marker
-     * string. Starts from group 1.
-     *
-     * @param pat    The pattern to use.
-     * @param str    The string to match against the pattern.
-     * @param marker The marker value to find the group of.
-     *
-     * @return The matching group number.
-     *
-     * @throws IllegalArgumentException No group matches the marker.
-     */
-    private static int findGroup(Pattern pat, String str, String marker) {
-        Matcher m = pat.matcher(str);
-        if (!m.find())
-            throw new IllegalArgumentException(
-                    "Pattern \"" + pat.pattern() + "\" doesn't match \"" + str +
-                            "\"");
-        for (int i = 1; i <= m.groupCount(); i++) {
-            String grp = m.group(i);
-            if (grp != null && grp.equals(marker))
-                return i;
-        }
-        throw new IllegalArgumentException(
-                "\"" + marker + "\" not found in \"" + pat.pattern() + "\"");
-    }
-
-    /**
-     * Returns the color specification from the matcher, or <tt>null</tt> if
-     * there is none.
-     *
-     * @param m The matcher for the format part.
-     *
-     * @return The color specification or <tt>null</tt>.
-     */
-    private static Color getColor(Matcher m) {
-        String cdesc = m.group(COLOR_GROUP);
-        if (cdesc == null || cdesc.length() == 0)
-            return null;
-        Color c = NAMED_COLORS.get(cdesc);
-        if (c == null)
-            logger.warning("Unknown color: " + quote(cdesc));
-        return c;
-    }
-
-    /**
-     * Returns the condition specification from the matcher, or <tt>null</tt> if
-     * there is none.
-     *
-     * @param m The matcher for the format part.
-     *
-     * @return The condition specification or <tt>null</tt>.
-     */
-    private CellFormatCondition getCondition(Matcher m) {
-        String mdesc = m.group(CONDITION_OPERATOR_GROUP);
-        if (mdesc == null || mdesc.length() == 0)
-            return null;
-        return CellFormatCondition.getInstance(m.group(
-                CONDITION_OPERATOR_GROUP), m.group(CONDITION_VALUE_GROUP));
-    }
-
-    /**
-     * Returns the CellFormatType object implied by the format specification for
-     * the format part.
-     *
-     * @param matcher The matcher for the format part.
-     *
-     * @return The CellFormatType.
-     */
-    private CellFormatType getCellFormatType(Matcher matcher) {
-        String fdesc = matcher.group(SPECIFICATION_GROUP);
-        return formatType(fdesc);
-    }
-
-    /**
-     * Returns the formatter object implied by the format specification for the
-     * format part.
-     *
-     * @param matcher The matcher for the format part.
-     *
-     * @return The formatter.
-     */
-    private CellFormatter getFormatter(Matcher matcher) {
-        String fdesc = matcher.group(SPECIFICATION_GROUP);
-        
-        // For now, we don't support localised currencies, so simplify if there
-        Matcher currencyM = CURRENCY_PAT.matcher(fdesc);
-        if (currencyM.find()) {
-            String currencyPart = currencyM.group(1);
-            String currencyRepl;
-            if (currencyPart.startsWith("[$-")) {
-                // Default $ in a different locale
-                currencyRepl = "$";
-            } else {
-                currencyRepl = currencyPart.substring(2, currencyPart.lastIndexOf('-'));
-            }
-            fdesc = fdesc.replace(currencyPart, currencyRepl);
-        }
-        
-        // Build a formatter for this simplified string
-        return type.formatter(fdesc);
-    }
-
-    /**
-     * Returns the type of format.
-     *
-     * @param fdesc The format specification
-     *
-     * @return The type of format.
-     */
-    private CellFormatType formatType(String fdesc) {
-        fdesc = fdesc.trim();
-        if (fdesc.equals("") || fdesc.equalsIgnoreCase("General"))
-            return CellFormatType.GENERAL;
-
-        Matcher m = SPECIFICATION_PAT.matcher(fdesc);
-        boolean couldBeDate = false;
-        boolean seenZero = false;
-        while (m.find()) {
-            String repl = m.group(0);
-            
-            if (repl.length() > 0) {
-                char c1 = repl.charAt(0);
-                char c2 = 0;
-                if (repl.length() > 1)
-                    c2 = Character.toLowerCase(repl.charAt(1));
-                
-                switch (c1) {
-                case '@':
-                    return CellFormatType.TEXT;
-                case 'd':
-                case 'D':
-                case 'y':
-                case 'Y':
-                    return CellFormatType.DATE;
-                case 'h':
-                case 'H':
-                case 'm':
-                case 'M':
-                case 's':
-                case 'S':
-                    // These can be part of date, or elapsed
-                    couldBeDate = true;
-                    break;
-                case '0':
-                    // This can be part of date, elapsed, or number
-                    seenZero = true;
-                    break;
-                case '[':
-                    if (c2 == 'h' || c2 == 'm' || c2 == 's') {
-                        return CellFormatType.ELAPSED;
-                    }
-                    if (c2 == '$') {
-                        // Localised currency
-                        return CellFormatType.NUMBER;
-                    }
-                    // Something else inside [] which isn't supported!
-                    throw new IllegalArgumentException("Unsupported [] format block '" +
-                                                       repl + "' in '" + fdesc + "' with c2: " + c2);
-                case '#':
-                case '?':
-                    return CellFormatType.NUMBER;
-                }
-            }
-        }
-
-        // Nothing definitive was found, so we figure out it deductively
-        if (couldBeDate)
-            return CellFormatType.DATE;
-        if (seenZero)
-            return CellFormatType.NUMBER;
-        return CellFormatType.TEXT;
-    }
-
-    /**
-     * Returns a version of the original string that has any special characters
-     * quoted (or escaped) as appropriate for the cell format type.  The format
-     * type object is queried to see what is special.
-     *
-     * @param repl The original string.
-     * @param type The format type representation object.
-     *
-     * @return A version of the string with any special characters replaced.
-     *
-     * @see CellFormatType#isSpecial(char)
-     */
-    static String quoteSpecial(String repl, CellFormatType type) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < repl.length(); i++) {
-            char ch = repl.charAt(i);
-            if (ch == '\'' && type.isSpecial('\'')) {
-                sb.append('\u0000');
-                continue;
-            }
-
-            boolean special = type.isSpecial(ch);
-            if (special)
-                sb.append("'");
-            sb.append(ch);
-            if (special)
-                sb.append("'");
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Apply this format part to the given value.  This returns a {@link
-     * CellFormatResult} object with the results.
-     *
-     * @param value The value to apply this format part to.
-     *
-     * @return A {@link CellFormatResult} object containing the results of
-     *         applying the format to the value.
-     */
-    public CellFormatResult apply(Object value) {
-        boolean applies = applies(value);
-        String text;
-        Color textColor;
-        if (applies) {
-            text = format.format(value);
-            textColor = color;
-        } else {
-            text = format.simpleFormat(value);
-            textColor = null;
-        }
-        return new CellFormatResult(applies, text, textColor);
-    }
-
-    /**
-     * Apply this format part to the given value, applying the result to the
-     * given label.
-     *
-     * @param label The label
-     * @param value The value to apply this format part to.
-     *
-     * @return <tt>true</tt> if the
-     */
-    public CellFormatResult apply(JLabel label, Object value) {
-        CellFormatResult result = apply(value);
-        label.setText(result.text);
-        if (result.textColor != null) {
-            label.setForeground(result.textColor);
-        }
-        return result;
-    }
-
-    /**
-     * Returns the CellFormatType object implied by the format specification for
-     * the format part.
-     *
-     * @return The CellFormatType.
-     */
-    CellFormatType getCellFormatType() {
-        return type;
-    }
-
-    /**
-     * Returns <tt>true</tt> if this format part has a condition.
-     *
-     * @return <tt>true</tt> if this format part has a condition.
-     */
-    boolean hasCondition() {
-        return condition != null;
-    }
-
-    public static StringBuffer parseFormat(String fdesc, CellFormatType type,
-            PartHandler partHandler) {
-
-        // Quoting is very awkward.  In the Java classes, quoting is done
-        // between ' chars, with '' meaning a single ' char. The problem is that
-        // in Excel, it is legal to have two adjacent escaped strings.  For
-        // example, consider the Excel format "\a\b#".  The naive (and easy)
-        // translation into Java DecimalFormat is "'a''b'#".  For the number 17,
-        // in Excel you would get "ab17", but in Java it would be "a'b17" -- the
-        // '' is in the middle of the quoted string in Java.  So the trick we
-        // use is this: When we encounter a ' char in the Excel format, we
-        // output a \u0000 char into the string.  Now we know that any '' in the
-        // output is the result of two adjacent escaped strings.  So after the
-        // main loop, we have to do two passes: One to eliminate any ''
-        // sequences, to make "'a''b'" become "'ab'", and another to replace any
-        // \u0000 with '' to mean a quote char.  Oy.
-        //
-        // For formats that don't use "'" we don't do any of this
-        Matcher m = SPECIFICATION_PAT.matcher(fdesc);
-        StringBuffer fmt = new StringBuffer();
-        while (m.find()) {
-            String part = group(m, 0);
-            if (part.length() > 0) {
-                String repl = partHandler.handlePart(m, part, type, fmt);
-                if (repl == null) {
-                    switch (part.charAt(0)) {
-                    case '\"':
-                        repl = quoteSpecial(part.substring(1,
-                                part.length() - 1), type);
-                        break;
-                    case '\\':
-                        repl = quoteSpecial(part.substring(1), type);
-                        break;
-                    case '_':
-                        repl = " ";
-                        break;
-                    case '*': //!! We don't do this for real, we just put in 3 of them
-                        repl = expandChar(part);
-                        break;
-                    default:
-                        repl = part;
-                        break;
-                    }
-                }
-                m.appendReplacement(fmt, Matcher.quoteReplacement(repl));
-            }
-        }
-        m.appendTail(fmt);
-
-        if (type.isSpecial('\'')) {
-            // Now the next pass for quoted characters: Remove '' chars, making "'a''b'" into "'ab'"
-            int pos = 0;
-            while ((pos = fmt.indexOf("''", pos)) >= 0) {
-                fmt.delete(pos, pos + 2);
-            }
-
-            // Now the final pass for quoted chars: Replace any \u0000 with ''
-            pos = 0;
-            while ((pos = fmt.indexOf("\u0000", pos)) >= 0) {
-                fmt.replace(pos, pos + 1, "''");
-            }
-        }
-
-        return fmt;
-    }
-
-    /**
-     * Expands a character. This is only partly done, because we don't have the
-     * correct info.  In Excel, this would be expanded to fill the rest of the
-     * cell, but we don't know, in general, what the "rest of the cell" is.
-     *
-     * @param part The character to be repeated is the second character in this
-     *             string.
-     *
-     * @return The character repeated three times.
-     */
-    static String expandChar(String part) {
-        String repl;
-        char ch = part.charAt(1);
-        repl = "" + ch + ch + ch;
-        return repl;
-    }
-
-    /**
-     * Returns the string from the group, or <tt>""</tt> if the group is
-     * <tt>null</tt>.
-     *
-     * @param m The matcher.
-     * @param g The group number.
-     *
-     * @return The group or <tt>""</tt>.
-     */
-    public static String group(Matcher m, int g) {
-        String str = m.group(g);
-        return (str == null ? "" : str);
-    }
-
-    public String toString() {
-        return format.format;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java b/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java
deleted file mode 100644
index a22f77c..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.awt.Color;
-
-/**
- * This object contains the result of applying a cell format or cell format part
- * to a value.
- *
- * @author Ken Arnold, Industrious Media LLC
- * @see CellFormatPart#apply(Object)
- * @see CellFormat#apply(Object)
- */
-public class CellFormatResult {
-    /**
-     * This is <tt>true</tt> if no condition was given that applied to the
-     * value, or if the condition is satisfied.  If a condition is relevant, and
-     * when applied the value fails the test, this is <tt>false</tt>.
-     */
-    public final boolean applies;
-
-    /** The resulting text.  This will never be <tt>null</tt>. */
-    public final String text;
-
-    /**
-     * The color the format sets, or <tt>null</tt> if the format sets no color.
-     * This will always be <tt>null</tt> if {@link #applies} is <tt>false</tt>.
-     */
-    public final Color textColor;
-
-    /**
-     * Creates a new format result object.
-     *
-     * @param applies   The value for {@link #applies}.
-     * @param text      The value for {@link #text}.
-     * @param textColor The value for {@link #textColor}.
-     */
-    public CellFormatResult(boolean applies, String text, Color textColor) throws IllegalArgumentException {
-        this.applies = applies;
-        if (text == null)
-            throw new IllegalArgumentException("CellFormatResult text may not be null");
-        this.text = text;
-        this.textColor = (applies ? textColor : null);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellFormatType.java b/trunk/src/java/org/apache/poi/ss/format/CellFormatType.java
deleted file mode 100644
index e1f436b..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellFormatType.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.format;
-
-/**
- * The different kinds of formats that the formatter understands.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public enum CellFormatType {
-
-    /** The general (default) format; also used for <tt>"General"</tt>. */
-    GENERAL {
-        CellFormatter formatter(String pattern) {
-            return new CellGeneralFormatter();
-        }
-        boolean isSpecial(char ch) {
-            return false;
-        }
-    },
-    /** A numeric format. */
-    NUMBER {
-        boolean isSpecial(char ch) {
-            return false;
-        }
-        CellFormatter formatter(String pattern) {
-            return new CellNumberFormatter(pattern);
-        }
-    },
-    /** A date format. */
-    DATE {
-        boolean isSpecial(char ch) {
-            return ch == '\'' || (ch <= '\u007f' && Character.isLetter(ch));
-        }
-        CellFormatter formatter(String pattern) {
-            return new CellDateFormatter(pattern);
-        }
-    },
-    /** An elapsed time format. */
-    ELAPSED {
-        boolean isSpecial(char ch) {
-            return false;
-        }
-        CellFormatter formatter(String pattern) {
-            return new CellElapsedFormatter(pattern);
-        }
-    },
-    /** A text format. */
-    TEXT {
-        boolean isSpecial(char ch) {
-            return false;
-        }
-        CellFormatter formatter(String pattern) {
-            return new CellTextFormatter(pattern);
-        }
-    };
-
-    /**
-     * Returns <tt>true</tt> if the format is special and needs to be quoted.
-     *
-     * @param ch The character to test.
-     *
-     * @return <tt>true</tt> if the format is special and needs to be quoted.
-     */
-    abstract boolean isSpecial(char ch);
-
-    /**
-     * Returns a new formatter of the appropriate type, for the given pattern.
-     * The pattern must be appropriate for the type.
-     *
-     * @param pattern The pattern to use.
-     *
-     * @return A new formatter of the appropriate type, for the given pattern.
-     */
-    abstract CellFormatter formatter(String pattern);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java b/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java
deleted file mode 100644
index e529a90..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.util.logging.Logger;
-
-/**
- * This is the abstract supertype for the various cell formatters.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public abstract class CellFormatter {
-    /** The original specified format. */
-    protected final String format;
-
-    /**
-     * Creates a new formatter object, storing the format in {@link #format}.
-     *
-     * @param format The format.
-     */
-    public CellFormatter(String format) {
-        this.format = format;
-    }
-
-    /** The logger to use in the formatting code. */
-    static final Logger logger = Logger.getLogger(
-            CellFormatter.class.getName());
-
-    /**
-     * Format a value according the format string.
-     *
-     * @param toAppendTo The buffer to append to.
-     * @param value      The value to format.
-     */
-    public abstract void formatValue(StringBuffer toAppendTo, Object value);
-
-    /**
-     * Format a value according to the type, in the most basic way.
-     *
-     * @param toAppendTo The buffer to append to.
-     * @param value      The value to format.
-     */
-    public abstract void simpleValue(StringBuffer toAppendTo, Object value);
-
-    /**
-     * Formats the value, returning the resulting string.
-     *
-     * @param value The value to format.
-     *
-     * @return The value, formatted.
-     */
-    public String format(Object value) {
-        StringBuffer sb = new StringBuffer();
-        formatValue(sb, value);
-        return sb.toString();
-    }
-
-    /**
-     * Formats the value in the most basic way, returning the resulting string.
-     *
-     * @param value The value to format.
-     *
-     * @return The value, formatted.
-     */
-    public String simpleFormat(Object value) {
-        StringBuffer sb = new StringBuffer();
-        simpleValue(sb, value);
-        return sb.toString();
-    }
-
-    /**
-     * Returns the input string, surrounded by quotes.
-     *
-     * @param str The string to quote.
-     *
-     * @return The input string, surrounded by quotes.
-     */
-    static String quote(String str) {
-        return '"' + str + '"';
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java b/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java
deleted file mode 100644
index b890e02..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.util.Formatter;
-import java.util.Locale;
-
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * A formatter for the default "General" cell format.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class CellGeneralFormatter extends CellFormatter {
-    /** Creates a new general formatter. */
-    public CellGeneralFormatter() {
-        super("General");
-    }
-
-    /**
-     * The general style is not quite the same as any other, or any combination
-     * of others.
-     *
-     * @param toAppendTo The buffer to append to.
-     * @param value      The value to format.
-     */
-    public void formatValue(StringBuffer toAppendTo, Object value) {
-        if (value instanceof Number) {
-            double val = ((Number) value).doubleValue();
-            if (val == 0) {
-                toAppendTo.append('0');
-                return;
-            }
-
-            String fmt;
-            double exp = Math.log10(Math.abs(val));
-            boolean stripZeros = true;
-            if (exp > 10 || exp < -9)
-                fmt = "%1.5E";
-            else if ((long) val != val)
-                fmt = "%1.9f";
-            else {
-                fmt = "%1.0f";
-                stripZeros = false;
-            }
-
-            Formatter formatter = new Formatter(toAppendTo, LocaleUtil.getUserLocale());
-            try {
-                formatter.format(LocaleUtil.getUserLocale(), fmt, value);
-            } finally {
-                formatter.close();
-            }
-            if (stripZeros) {
-                // strip off trailing zeros
-                int removeFrom;
-                if (fmt.endsWith("E"))
-                    removeFrom = toAppendTo.lastIndexOf("E") - 1;
-                else
-                    removeFrom = toAppendTo.length() - 1;
-                while (toAppendTo.charAt(removeFrom) == '0') {
-                    toAppendTo.deleteCharAt(removeFrom--);
-                }
-                if (toAppendTo.charAt(removeFrom) == '.') {
-                    toAppendTo.deleteCharAt(removeFrom--);
-                }
-            }
-        } else if (value instanceof Boolean) {
-            toAppendTo.append(value.toString().toUpperCase(Locale.ROOT));
-        } else {
-            toAppendTo.append(value.toString());
-        }
-    }
-
-    /** Equivalent to {@link #formatValue(StringBuffer,Object)}. {@inheritDoc}. */
-    public void simpleValue(StringBuffer toAppendTo, Object value) {
-        formatValue(toAppendTo, value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java b/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
deleted file mode 100644
index 668149f..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
+++ /dev/null
@@ -1,819 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.FieldPosition;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.Formatter;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class implements printing out a value using a number format.
- */
-public class CellNumberFormatter extends CellFormatter {
-    private static final POILogger LOG = POILogFactory.getLogger(CellNumberFormatter.class);
-
-    private final String desc;
-    private final String printfFmt;
-    private final double scale;
-    private final Special decimalPoint;
-    private final Special slash;
-    private final Special exponent;
-    private final Special numerator;
-    private final Special afterInteger;
-    private final Special afterFractional;
-    private final boolean integerCommas;
-    private final List<Special> specials =  new ArrayList<Special>();
-    private final List<Special> integerSpecials = new ArrayList<Special>();
-    private final List<Special> fractionalSpecials = new ArrayList<Special>();
-    private final List<Special> numeratorSpecials = new ArrayList<Special>();
-    private final List<Special> denominatorSpecials = new ArrayList<Special>();
-    private final List<Special> exponentSpecials = new ArrayList<Special>();
-    private final List<Special> exponentDigitSpecials = new ArrayList<Special>();
-    private final int maxDenominator;
-    private final String numeratorFmt;
-    private final String denominatorFmt;
-    private final boolean improperFraction;
-    private final DecimalFormat decimalFmt;
-
-    // The CellNumberFormatter.simpleValue() method uses the SIMPLE_NUMBER
-    // CellFormatter defined here. The CellFormat.GENERAL_FORMAT CellFormat
-    // no longer uses the SIMPLE_NUMBER CellFormatter.
-    // Note that the simpleValue()/SIMPLE_NUMBER CellFormatter format
-    // ("#" for integer values, and "#.#" for floating-point values) is
-    // different from the 'General' format for numbers ("#" for integer
-    // values and "#.#########" for floating-point values).
-    private static final CellFormatter SIMPLE_NUMBER = new GeneralNumberFormatter();
-    private static final CellFormatter SIMPLE_INT = new CellNumberFormatter("#");
-    private static final CellFormatter SIMPLE_FLOAT = new CellNumberFormatter("#.#");
-
-    private static class GeneralNumberFormatter extends CellFormatter {
-        private GeneralNumberFormatter() {
-            super("General");
-        }
-
-        public void formatValue(StringBuffer toAppendTo, Object value) {
-            if (value == null) {
-                return;
-            }
-
-            CellFormatter cf;
-            if (value instanceof Number) {
-                Number num = (Number) value;
-                cf = (num.doubleValue() % 1.0 == 0) ? SIMPLE_INT : SIMPLE_FLOAT;
-            } else {
-                cf = CellTextFormatter.SIMPLE_TEXT;
-            }
-            cf.formatValue(toAppendTo, value);
-        }
-
-        public void simpleValue(StringBuffer toAppendTo, Object value) {
-            formatValue(toAppendTo, value);
-        }
-    }
-
-
-    /**
-     * This class is used to mark where the special characters in the format
-     * are, as opposed to the other characters that are simply printed.
-     */
-    /* package */ static class Special {
-        final char ch;
-        int pos;
-
-        Special(char ch, int pos) {
-            this.ch = ch;
-            this.pos = pos;
-        }
-
-        @Override
-        public String toString() {
-            return "'" + ch + "' @ " + pos;
-        }
-    }
-
-    /**
-     * Creates a new cell number formatter.
-     *
-     * @param format The format to parse.
-     */
-    public CellNumberFormatter(String format) {
-        super(format);
-
-        CellNumberPartHandler ph = new CellNumberPartHandler();
-        StringBuffer descBuf = CellFormatPart.parseFormat(format, CellFormatType.NUMBER, ph);
-
-        exponent = ph.getExponent();
-        specials.addAll(ph.getSpecials());
-        improperFraction = ph.isImproperFraction();
-
-        // These are inconsistent settings, so ditch 'em
-        if ((ph.getDecimalPoint() != null || ph.getExponent() != null) && ph.getSlash() != null) {
-            slash = null;
-            numerator = null;
-        } else {
-            slash = ph.getSlash();
-            numerator = ph.getNumerator();
-        }
-
-        final int precision = interpretPrecision(ph.getDecimalPoint(), specials);
-        int fractionPartWidth = 0;
-        if (ph.getDecimalPoint() != null) {
-            fractionPartWidth = 1 + precision;
-            if (precision == 0) {
-                // This means the format has a ".", but that output should have no decimals after it.
-                // We just stop treating it specially
-                specials.remove(ph.getDecimalPoint());
-                decimalPoint = null;
-            } else {
-                decimalPoint = ph.getDecimalPoint();
-            }
-        } else {
-            decimalPoint = null;
-        }
-
-        if (decimalPoint != null) {
-            afterInteger = decimalPoint;
-        } else if (exponent != null) {
-            afterInteger = exponent;
-        } else if (numerator != null) {
-            afterInteger = numerator;
-        } else {
-            afterInteger = null;
-        }
-
-        if (exponent != null) {
-            afterFractional = exponent;
-        } else if (numerator != null) {
-            afterFractional = numerator;
-        } else {
-            afterFractional = null;
-        }
-        
-        double scaleByRef[] = { ph.getScale() };
-        integerCommas = interpretIntegerCommas(descBuf, specials, decimalPoint, integerEnd(), fractionalEnd(), scaleByRef);
-        if (exponent == null) {
-            scale = scaleByRef[0];
-        } else {
-            // in "e" formats,% and trailing commas have no scaling effect
-            scale = 1;
-        }
-
-        if (precision != 0) {
-            // TODO: if decimalPoint is null (-> index == -1), return the whole list?
-            fractionalSpecials.addAll(specials.subList(specials.indexOf(decimalPoint) + 1, fractionalEnd()));
-        }
-
-        if (exponent != null) {
-            int exponentPos = specials.indexOf(exponent);
-            exponentSpecials.addAll(specialsFor(exponentPos, 2));
-            exponentDigitSpecials.addAll(specialsFor(exponentPos + 2));
-        }
-
-        if (slash != null) {
-            if (numerator != null) {
-                numeratorSpecials.addAll(specialsFor(specials.indexOf(numerator)));
-            }
-
-            denominatorSpecials.addAll(specialsFor(specials.indexOf(slash) + 1));
-            if (denominatorSpecials.isEmpty()) {
-                // no denominator follows the slash, drop the fraction idea
-                numeratorSpecials.clear();
-                maxDenominator = 1;
-                numeratorFmt = null;
-                denominatorFmt = null;
-            } else {
-                maxDenominator = maxValue(denominatorSpecials);
-                numeratorFmt = singleNumberFormat(numeratorSpecials);
-                denominatorFmt = singleNumberFormat(denominatorSpecials);
-            }
-        } else {
-            maxDenominator = 1;
-            numeratorFmt = null;
-            denominatorFmt = null;
-        }
-
-        integerSpecials.addAll(specials.subList(0, integerEnd()));
-
-        if (exponent == null) {
-            StringBuffer fmtBuf = new StringBuffer("%");
-
-            int integerPartWidth = calculateIntegerPartWidth();
-            int totalWidth = integerPartWidth + fractionPartWidth;
-
-            fmtBuf.append('0').append(totalWidth).append('.').append(precision);
-
-            fmtBuf.append("f");
-            printfFmt = fmtBuf.toString();
-            decimalFmt = null;
-        } else {
-            StringBuffer fmtBuf = new StringBuffer();
-            boolean first = true;
-            List<Special> specialList = integerSpecials;
-            if (integerSpecials.size() == 1) {
-                // If we don't do this, we get ".6e5" instead of "6e4"
-                fmtBuf.append("0");
-                first = false;
-            } else
-                for (Special s : specialList) {
-                    if (isDigitFmt(s)) {
-                        fmtBuf.append(first ? '#' : '0');
-                        first = false;
-                    }
-                }
-            if (fractionalSpecials.size() > 0) {
-                fmtBuf.append('.');
-                for (Special s : fractionalSpecials) {
-                    if (isDigitFmt(s)) {
-                        if (!first)
-                            fmtBuf.append('0');
-                        first = false;
-                    }
-                }
-            }
-            fmtBuf.append('E');
-            placeZeros(fmtBuf, exponentSpecials.subList(2, exponentSpecials.size()));
-            DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(LocaleUtil.getUserLocale());
-            decimalFmt = new DecimalFormat(fmtBuf.toString(), dfs);
-            printfFmt = null;
-        }
-
-        desc = descBuf.toString();
-    }
-
-    private static void placeZeros(StringBuffer sb, List<Special> specials) {
-        for (Special s : specials) {
-            if (isDigitFmt(s)) {
-                sb.append('0');
-            }
-        }
-    }
-
-    private static CellNumberStringMod insertMod(Special special, CharSequence toAdd, int where) {
-        return new CellNumberStringMod(special, toAdd, where);
-    }
-
-    private static CellNumberStringMod deleteMod(Special start, boolean startInclusive, Special end, boolean endInclusive) {
-        return new CellNumberStringMod(start, startInclusive, end, endInclusive);
-    }
-
-    private static CellNumberStringMod replaceMod(Special start, boolean startInclusive, Special end, boolean endInclusive, char withChar) {
-        return new CellNumberStringMod(start, startInclusive, end, endInclusive, withChar);
-    }
-
-    private static String singleNumberFormat(List<Special> numSpecials) {
-        return "%0" + numSpecials.size() + "d";
-    }
-
-    private static int maxValue(List<Special> s) {
-        return (int) Math.round(Math.pow(10, s.size()) - 1);
-    }
-
-    private List<Special> specialsFor(int pos, int takeFirst) {
-        if (pos >= specials.size()) {
-            return Collections.emptyList();
-        }
-        ListIterator<Special> it = specials.listIterator(pos + takeFirst);
-        Special last = it.next();
-        int end = pos + takeFirst;
-        while (it.hasNext()) {
-            Special s = it.next();
-            if (!isDigitFmt(s) || s.pos - last.pos > 1)
-                break;
-            end++;
-            last = s;
-        }
-        return specials.subList(pos, end + 1);
-    }
-
-    private List<Special> specialsFor(int pos) {
-        return specialsFor(pos, 0);
-    }
-
-    private static boolean isDigitFmt(Special s) {
-        return s.ch == '0' || s.ch == '?' || s.ch == '#';
-    }
-
-    private int calculateIntegerPartWidth() {
-        int digitCount = 0;
-        for (Special s : specials) {
-            //!! Handle fractions: The previous set of digits before that is the numerator, so we should stop short of that
-            if (s == afterInteger) {
-                break;
-            } else if (isDigitFmt(s)) {
-                digitCount++;
-            }
-        }
-        return digitCount;
-    }
-
-    private static int interpretPrecision(Special decimalPoint, List<Special> specials) {
-        int idx = specials.indexOf(decimalPoint);
-        int precision = 0;
-        if (idx != -1) {
-            // skip over the decimal point itself
-            ListIterator<Special> it = specials.listIterator(idx+1);
-            while (it.hasNext()) {
-                Special s = it.next();
-                if (!isDigitFmt(s)) {
-                    break;
-                }
-                precision++;
-            }
-        }
-        return precision;
-    }
-
-    private static boolean interpretIntegerCommas
-        (StringBuffer sb, List<Special> specials, Special decimalPoint, int integerEnd, int fractionalEnd, double[] scale) {
-        // In the integer part, commas at the end are scaling commas; other commas mean to show thousand-grouping commas
-        ListIterator<Special> it = specials.listIterator(integerEnd);
-
-        boolean stillScaling = true;
-        boolean integerCommas = false;
-        while (it.hasPrevious()) {
-            Special s = it.previous();
-            if (s.ch != ',') {
-                stillScaling = false;
-            } else {
-                if (stillScaling) {
-                    scale[0] /= 1000;
-                } else {
-                    integerCommas = true;
-                }
-            }
-        }
-
-        if (decimalPoint != null) {
-            it = specials.listIterator(fractionalEnd);
-            while (it.hasPrevious()) {
-                Special s = it.previous();
-                if (s.ch != ',') {
-                    break;
-                } else {
-                    scale[0] /= 1000;
-                }
-            }
-        }
-
-        // Now strip them out -- we only need their interpretation, not their presence
-        it = specials.listIterator();
-        int removed = 0;
-        while (it.hasNext()) {
-            Special s = it.next();
-            s.pos -= removed;
-            if (s.ch == ',') {
-                removed++;
-                it.remove();
-                sb.deleteCharAt(s.pos);
-            }
-        }
-
-        return integerCommas;
-    }
-
-    private int integerEnd() {
-        return (afterInteger == null) ? specials.size() : specials.indexOf(afterInteger);
-    }
-
-    private int fractionalEnd() {
-        return (afterFractional == null) ? specials.size() : specials.indexOf(afterFractional);
-    }
-
-    /** {@inheritDoc} */
-    public void formatValue(StringBuffer toAppendTo, Object valueObject) {
-        double value = ((Number) valueObject).doubleValue();
-        value *= scale;
-
-        // For negative numbers:
-        // - If the cell format has a negative number format, this method
-        // is called with a positive value and the number format has
-        // the negative formatting required, e.g. minus sign or brackets.
-        // - If the cell format does not have a negative number format,
-        // this method is called with a negative value and the number is
-        // formatted with a minus sign at the start.
-        boolean negative = value < 0;
-        if (negative)
-            value = -value;
-
-        // Split out the fractional part if we need to print a fraction
-        double fractional = 0;
-        if (slash != null) {
-            if (improperFraction) {
-                fractional = value;
-                value = 0;
-            } else {
-                fractional = value % 1.0;
-                //noinspection SillyAssignment
-                value = (long) value;
-            }
-        }
-
-        Set<CellNumberStringMod> mods = new TreeSet<CellNumberStringMod>();
-        StringBuffer output = new StringBuffer(desc);
-
-        if (exponent != null) {
-            writeScientific(value, output, mods);
-        } else if (improperFraction) {
-            writeFraction(value, null, fractional, output, mods);
-        } else {
-            StringBuffer result = new StringBuffer();
-            Formatter f = new Formatter(result, LocaleUtil.getUserLocale());
-            try {
-                f.format(LocaleUtil.getUserLocale(), printfFmt, value);
-            } finally {
-                f.close();
-            }
-
-            if (numerator == null) {
-                writeFractional(result, output);
-                writeInteger(result, output, integerSpecials, mods, integerCommas);
-            } else {
-                writeFraction(value, result, fractional, output, mods);
-            }
-        }
-
-        // Now strip out any remaining '#'s and add any pending text ...
-        Iterator<CellNumberStringMod> changes = mods.iterator();
-        CellNumberStringMod nextChange = (changes.hasNext() ? changes.next() : null);
-        // records chars already deleted
-        BitSet deletedChars = new BitSet();
-        int adjust = 0;
-        for (Special s : specials) {
-            int adjustedPos = s.pos + adjust;
-            if (!deletedChars.get(s.pos) && output.charAt(adjustedPos) == '#') {
-                output.deleteCharAt(adjustedPos);
-                adjust--;
-                deletedChars.set(s.pos);
-            }
-            while (nextChange != null && s == nextChange.getSpecial()) {
-                int lenBefore = output.length();
-                int modPos = s.pos + adjust;
-                switch (nextChange.getOp()) {
-                case CellNumberStringMod.AFTER:
-                    // ignore adding a comma after a deleted char (which was a '#')
-                    if (nextChange.getToAdd().equals(",") && deletedChars.get(s.pos)) {
-                        break;
-                    }
-                    output.insert(modPos + 1, nextChange.getToAdd());
-                    break;
-                case CellNumberStringMod.BEFORE:
-                    output.insert(modPos, nextChange.getToAdd());
-                    break;
-
-                case CellNumberStringMod.REPLACE:
-                    // delete starting pos in original coordinates
-                    int delPos = s.pos;
-                    if (!nextChange.isStartInclusive()) {
-                        delPos++;
-                        modPos++;
-                    }
-
-                    // Skip over anything already deleted
-                    while (deletedChars.get(delPos)) {
-                        delPos++;
-                        modPos++;
-                    }
-
-                    // delete end point in original
-                    int delEndPos = nextChange.getEnd().pos;
-                    if (nextChange.isEndInclusive()) {
-                        delEndPos++;
-                    }
-
-                    // delete end point in current
-                    int modEndPos = delEndPos + adjust;
-
-                    if (modPos < modEndPos) {
-                        if ("".equals(nextChange.getToAdd())) {
-                            output.delete(modPos, modEndPos);
-                        }
-                        else {
-                            char fillCh = nextChange.getToAdd().charAt(0);
-                            for (int i = modPos; i < modEndPos; i++) {
-                                output.setCharAt(i, fillCh);
-                            }
-                        }
-                        deletedChars.set(delPos, delEndPos);
-                    }
-                    break;
-
-                default:
-                    throw new IllegalStateException("Unknown op: " + nextChange.getOp());
-                }
-                adjust += output.length() - lenBefore;
-
-                nextChange = (changes.hasNext()) ? changes.next() : null;
-            }
-        }
-
-        // Finally, add it to the string
-        if (negative) {
-            toAppendTo.append('-');
-        }
-        toAppendTo.append(output);
-    }
-
-    private void writeScientific(double value, StringBuffer output, Set<CellNumberStringMod> mods) {
-
-        StringBuffer result = new StringBuffer();
-        FieldPosition fractionPos = new FieldPosition(DecimalFormat.FRACTION_FIELD);
-        decimalFmt.format(value, result, fractionPos);
-        writeInteger(result, output, integerSpecials, mods, integerCommas);
-        writeFractional(result, output);
-
-        /*
-        * Exponent sign handling is complex.
-        *
-        * In DecimalFormat, you never put the sign in the format, and the sign only
-        * comes out of the format if it is negative.
-        *
-        * In Excel, you always say whether to always show the sign ("e+") or only
-        * show negative signs ("e-").
-        *
-        * Also in Excel, where you put the sign in the format is NOT where it comes
-        * out in the result.  In the format, the sign goes with the "e"; in the
-        * output it goes with the exponent value.  That is, if you say "#e-|#" you
-        * get "1e|-5", not "1e-|5". This makes sense I suppose, but it complicates
-        * things.
-        *
-        * Finally, everything else in this formatting code assumes that the base of
-        * the result is the original format, and that starting from that situation,
-        * the indexes of the original special characters can be used to place the new
-        * characters.  As just described, this is not true for the exponent's sign.
-        * <p/>
-        * So here is how we handle it:
-        *
-        * (1) When parsing the format, remove the sign from after the 'e' and put it
-        * before the first digit of the exponent (where it will be shown).
-        *
-        * (2) Determine the result's sign.
-        *
-        * (3) If it's missing, put the sign into the output to keep the result
-        * lined up with the output. (In the result, "after the 'e'" and "before the
-        * first digit" are the same because the result has no extra chars to be in
-        * the way.)
-        *
-        * (4) In the output, remove the sign if it should not be shown ("e-" was used
-        * and the sign is negative) or set it to the correct value.
-        */
-
-        // (2) Determine the result's sign.
-        int ePos = fractionPos.getEndIndex();
-        int signPos = ePos + 1;
-        char expSignRes = result.charAt(signPos);
-        if (expSignRes != '-') {
-            // not a sign, so it's a digit, and therefore a positive exponent
-            expSignRes = '+';
-            // (3) If it's missing, put the sign into the output to keep the result
-            // lined up with the output.
-            result.insert(signPos, '+');
-        }
-
-        // Now the result lines up like it is supposed to with the specials' indexes
-        ListIterator<Special> it = exponentSpecials.listIterator(1);
-        Special expSign = it.next();
-        char expSignFmt = expSign.ch;
-
-        // (4) In the output, remove the sign if it should not be shown or set it to
-        // the correct value.
-        if (expSignRes == '-' || expSignFmt == '+') {
-            mods.add(replaceMod(expSign, true, expSign, true, expSignRes));
-        } else {
-            mods.add(deleteMod(expSign, true, expSign, true));
-        }
-
-        StringBuffer exponentNum = new StringBuffer(result.substring(signPos + 1));
-        writeInteger(exponentNum, output, exponentDigitSpecials, mods, false);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void writeFraction(double value, StringBuffer result,
-            double fractional, StringBuffer output, Set<CellNumberStringMod> mods) {
-
-        // Figure out if we are to suppress either the integer or fractional part.
-        // With # the suppressed part is removed; with ? it is replaced with spaces.
-        if (!improperFraction) {
-            // If fractional part is zero, and numerator doesn't have '0', write out
-            // only the integer part and strip the rest.
-            if (fractional == 0 && !hasChar('0', numeratorSpecials)) {
-                writeInteger(result, output, integerSpecials, mods, false);
-
-                Special start = lastSpecial(integerSpecials);
-                Special end = lastSpecial(denominatorSpecials);
-                if (hasChar('?', integerSpecials, numeratorSpecials, denominatorSpecials)) {
-                    //if any format has '?', then replace the fraction with spaces
-                    mods.add(replaceMod(start, false, end, true, ' '));
-                } else {
-                    // otherwise, remove the fraction
-                    mods.add(deleteMod(start, false, end, true));
-                }
-
-                // That's all, just return
-                return;
-            } else {
-                // New we check to see if we should remove the integer part
-                boolean numNoZero = !hasChar('0', numeratorSpecials);
-                boolean intNoZero = !hasChar('0', integerSpecials);
-                boolean intOnlyHash = integerSpecials.isEmpty() || (integerSpecials.size() == 1 && hasChar('#', integerSpecials));
-
-                boolean removeBecauseZero     = fractional == 0 && (intOnlyHash || numNoZero);
-                boolean removeBecauseFraction = fractional != 0 && intNoZero;
-
-                if (value == 0 && (removeBecauseZero || removeBecauseFraction)) {
-                    Special start = lastSpecial(integerSpecials);
-                    boolean hasPlaceHolder = hasChar('?', integerSpecials, numeratorSpecials);
-                    CellNumberStringMod sm = hasPlaceHolder
-                        ? replaceMod(start, true, numerator, false, ' ')
-                        : deleteMod(start, true, numerator, false);
-                    mods.add(sm);
-                } else {
-                    // Not removing the integer part -- print it out
-                    writeInteger(result, output, integerSpecials, mods, false);
-                }
-            }
-        }
-
-        // Calculate and print the actual fraction (improper or otherwise)
-        try {
-            int n;
-            int d;
-            // the "fractional % 1" captures integer values in improper fractions
-            if (fractional == 0 || (improperFraction && fractional % 1 == 0)) {
-                // 0 as a fraction is reported by excel as 0/1
-                n = (int) Math.round(fractional);
-                d = 1;
-            } else {
-                SimpleFraction frac = SimpleFraction.buildFractionMaxDenominator(fractional, maxDenominator);
-                n = frac.getNumerator();
-                d = frac.getDenominator();
-            }
-            if (improperFraction) {
-                n += Math.round(value * d);
-            }
-            writeSingleInteger(numeratorFmt, n, output, numeratorSpecials, mods);
-            writeSingleInteger(denominatorFmt, d, output, denominatorSpecials, mods);
-        } catch (RuntimeException ignored) {
-            LOG.log(POILogger.ERROR, "error while fraction evaluation", ignored);
-        }
-    }
-
-    private static boolean hasChar(char ch, List<Special>... numSpecials) {
-        for (List<Special> specials : numSpecials) {
-            for (Special s : specials) {
-                if (s.ch == ch) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private void writeSingleInteger(String fmt, int num, StringBuffer output, List<Special> numSpecials, Set<CellNumberStringMod> mods) {
-
-        StringBuffer sb = new StringBuffer();
-        Formatter formatter = new Formatter(sb, LocaleUtil.getUserLocale());
-        try {
-            formatter.format(LocaleUtil.getUserLocale(), fmt, num);
-        } finally {
-            formatter.close();
-        }
-        writeInteger(sb, output, numSpecials, mods, false);
-    }
-
-    private void writeInteger(StringBuffer result, StringBuffer output,
-            List<Special> numSpecials, Set<CellNumberStringMod> mods,
-            boolean showCommas) {
-
-        int pos = result.indexOf(".") - 1;
-        if (pos < 0) {
-            if (exponent != null && numSpecials == integerSpecials) {
-                pos = result.indexOf("E") - 1;
-            } else {
-                pos = result.length() - 1;
-            }
-        }
-
-        int strip;
-        for (strip = 0; strip < pos; strip++) {
-            char resultCh = result.charAt(strip);
-            if (resultCh != '0' && resultCh != ',') {
-                break;
-            }
-        }
-
-        ListIterator<Special> it = numSpecials.listIterator(numSpecials.size());
-        boolean followWithComma = false;
-        Special lastOutputIntegerDigit = null;
-        int digit = 0;
-        while (it.hasPrevious()) {
-            char resultCh;
-            if (pos >= 0) {
-                resultCh = result.charAt(pos);
-            } else {
-                // If result is shorter than field, pretend there are leading zeros
-                resultCh = '0';
-            }
-            Special s = it.previous();
-            followWithComma = showCommas && digit > 0 && digit % 3 == 0;
-            boolean zeroStrip = false;
-            if (resultCh != '0' || s.ch == '0' || s.ch == '?' || pos >= strip) {
-                zeroStrip = s.ch == '?' && pos < strip;
-                output.setCharAt(s.pos, (zeroStrip ? ' ' : resultCh));
-                lastOutputIntegerDigit = s;
-            }
-            if (followWithComma) {
-                mods.add(insertMod(s, zeroStrip ? " " : ",", CellNumberStringMod.AFTER));
-                followWithComma = false;
-            }
-            digit++;
-            --pos;
-        }
-        StringBuffer extraLeadingDigits = new StringBuffer();
-        if (pos >= 0) {
-            // We ran out of places to put digits before we ran out of digits; put this aside so we can add it later
-            // pos was decremented at the end of the loop above when the iterator was at its end
-            ++pos;
-            extraLeadingDigits = new StringBuffer(result.substring(0, pos));
-            if (showCommas) {
-                while (pos > 0) {
-                    if (digit > 0 && digit % 3 == 0) {
-                        extraLeadingDigits.insert(pos, ',');
-                    }
-                    digit++;
-                    --pos;
-                }
-            }
-            mods.add(insertMod(lastOutputIntegerDigit, extraLeadingDigits, CellNumberStringMod.BEFORE));
-        }
-    }
-
-    private void writeFractional(StringBuffer result, StringBuffer output) {
-        int digit;
-        int strip;
-        if (fractionalSpecials.size() > 0) {
-            digit = result.indexOf(".") + 1;
-            if (exponent != null) {
-                strip = result.indexOf("e") - 1;
-            } else {
-                strip = result.length() - 1;
-            }
-
-            while (strip > digit && result.charAt(strip) == '0') {
-                strip--;
-            }
-
-            for (Special s : fractionalSpecials) {
-                char resultCh = result.charAt(digit);
-                if (resultCh != '0' || s.ch == '0' || digit < strip) {
-                    output.setCharAt(s.pos, resultCh);
-                } else if (s.ch == '?') {
-                    // This is when we're in trailing zeros, and the format is '?'.
-                    // We still strip out remaining '#'s later
-                    output.setCharAt(s.pos, ' ');
-                }
-                digit++;
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p/>
-     * For a number, this is <tt>"#"</tt> for integer values, and <tt>"#.#"</tt>
-     * for floating-point values.
-     */
-    public void simpleValue(StringBuffer toAppendTo, Object value) {
-        SIMPLE_NUMBER.formatValue(toAppendTo, value);
-    }
-
-    private static Special lastSpecial(List<Special> s)  {
-        return s.get(s.size() - 1);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellNumberPartHandler.java b/trunk/src/java/org/apache/poi/ss/format/CellNumberPartHandler.java
deleted file mode 100644
index f563db2..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellNumberPartHandler.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.regex.Matcher;
-
-import org.apache.poi.ss.format.CellFormatPart.PartHandler;
-import org.apache.poi.ss.format.CellNumberFormatter.Special;
-import org.apache.poi.util.Internal;
-
-/**
- * Internal helper class for CellNumberFormatter
- */
-@Internal
-public class CellNumberPartHandler implements PartHandler {
-    private char insertSignForExponent;
-    private double scale = 1;
-    private Special decimalPoint;
-    private Special slash;
-    private Special exponent;
-    private Special numerator;
-    private final List<Special> specials = new LinkedList<Special>();
-    private boolean improperFraction;
-
-    public String handlePart(Matcher m, String part, CellFormatType type, StringBuffer descBuf) {
-        int pos = descBuf.length();
-        char firstCh = part.charAt(0);
-        switch (firstCh) {
-        case 'e':
-        case 'E':
-            // See comment in writeScientific -- exponent handling is complex.
-            // (1) When parsing the format, remove the sign from after the 'e' and
-            // put it before the first digit of the exponent.
-            if (exponent == null && specials.size() > 0) {
-                exponent = new Special('.', pos);
-                specials.add(exponent);
-                insertSignForExponent = part.charAt(1);
-                return part.substring(0, 1);
-            }
-            break;
-
-        case '0':
-        case '?':
-        case '#':
-            if (insertSignForExponent != '\0') {
-                specials.add(new Special(insertSignForExponent, pos));
-                descBuf.append(insertSignForExponent);
-                insertSignForExponent = '\0';
-                pos++;
-            }
-            for (int i = 0; i < part.length(); i++) {
-                char ch = part.charAt(i);
-                specials.add(new Special(ch, pos + i));
-            }
-            break;
-
-        case '.':
-            if (decimalPoint == null && specials.size() > 0) {
-                decimalPoint = new Special('.', pos);
-                specials.add(decimalPoint);
-            }
-            break;
-
-        case '/':
-            //!! This assumes there is a numerator and a denominator, but these are actually optional
-            if (slash == null && specials.size() > 0) {
-                numerator = previousNumber();
-                // If the first number in the whole format is the numerator, the
-                // entire number should be printed as an improper fraction
-                improperFraction |= (numerator == firstDigit(specials));
-                slash = new Special('.', pos);
-                specials.add(slash);
-            }
-            break;
-
-        case '%':
-            // don't need to remember because we don't need to do anything with these
-            scale *= 100;
-            break;
-
-        default:
-            return null;
-        }
-        return part;
-    }
-
-    public double getScale() {
-        return scale;
-    }
-
-    public Special getDecimalPoint() {
-        return decimalPoint;
-    }
-
-    public Special getSlash() {
-        return slash;
-    }
-
-    public Special getExponent() {
-        return exponent;
-    }
-
-    public Special getNumerator() {
-        return numerator;
-    }
-
-    public List<Special> getSpecials() {
-        return specials;
-    }
-
-    public boolean isImproperFraction() {
-        return improperFraction;
-    }
-
-    private Special previousNumber() {
-        ListIterator<Special> it = specials.listIterator(specials.size());
-        while (it.hasPrevious()) {
-            Special s = it.previous();
-            if (isDigitFmt(s)) {
-                Special last = s;
-                while (it.hasPrevious()) {
-                    s = it.previous();
-                    // it has to be continuous digits
-                    if (last.pos - s.pos > 1 || !isDigitFmt(s)) {
-                        break;
-                    }
-                    last = s;
-                }
-                return last;
-            }
-        }
-        return null;
-    }
-    
-    private static boolean isDigitFmt(Special s) {
-        return s.ch == '0' || s.ch == '?' || s.ch == '#';
-    }
-
-    private static Special firstDigit(List<Special> specials) {
-        for (Special s : specials) {
-            if (isDigitFmt(s)) {
-                return s;
-            }
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellNumberStringMod.java b/trunk/src/java/org/apache/poi/ss/format/CellNumberStringMod.java
deleted file mode 100644
index a053206..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellNumberStringMod.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import org.apache.poi.ss.format.CellNumberFormatter.Special;
-import org.apache.poi.util.Internal;
-
-/**
- * Internal helper class for CellNumberFormatter
- *
- * This class represents a single modification to a result string.  The way
- * this works is complicated, but so is numeric formatting.  In general, for
- * most formats, we use a DecimalFormat object that will put the string out
- * in a known format, usually with all possible leading and trailing zeros.
- * We then walk through the result and the original format, and note any
- * modifications that need to be made.  Finally, we go through and apply
- * them all, dealing with overlapping modifications.
- */
-@Internal
-public class CellNumberStringMod implements Comparable<CellNumberStringMod> {
-    public static final int BEFORE = 1;
-    public static final int AFTER = 2;
-    public static final int REPLACE = 3;
-
-    private final Special special;
-    private final int op;
-    private CharSequence toAdd;
-    private Special end;
-    private boolean startInclusive;
-    private boolean endInclusive;
-
-    public CellNumberStringMod(Special special, CharSequence toAdd, int op) {
-        this.special = special;
-        this.toAdd = toAdd;
-        this.op = op;
-    }
-
-    public CellNumberStringMod(Special start, boolean startInclusive, Special end, boolean endInclusive, char toAdd) {
-        this(start, startInclusive, end, endInclusive);
-        this.toAdd = toAdd + "";
-    }
-
-    public CellNumberStringMod(Special start, boolean startInclusive, Special end, boolean endInclusive) {
-        special = start;
-        this.startInclusive = startInclusive;
-        this.end = end;
-        this.endInclusive = endInclusive;
-        op = REPLACE;
-        toAdd = "";
-    }
-
-    public int compareTo(CellNumberStringMod that) {
-        int diff = special.pos - that.special.pos;
-        return (diff != 0) ? diff : (op - that.op);
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        try {
-            return compareTo((CellNumberStringMod) that) == 0;
-        } catch (RuntimeException ignored) {
-            // NullPointerException or CastException
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return special.hashCode() + op;
-    }
-
-    public Special getSpecial() {
-        return special;
-    }
-
-    public int getOp() {
-        return op;
-    }
-
-    public CharSequence getToAdd() {
-        return toAdd;
-    }
-
-    public Special getEnd() {
-        return end;
-    }
-
-    public boolean isStartInclusive() {
-        return startInclusive;
-    }
-
-    public boolean isEndInclusive() {
-        return endInclusive;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java b/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java
deleted file mode 100644
index bde29e2..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import org.apache.poi.ss.format.CellFormatPart.PartHandler;
-
-import java.util.Locale;
-import java.util.regex.Matcher;
-
-/**
- * This class implements printing out text.
- *
- * @author Ken Arnold, Industrious Media LLC
- */
-public class CellTextFormatter extends CellFormatter {
-    private final int[] textPos;
-    private final String desc;
-
-    static final CellFormatter SIMPLE_TEXT = new CellTextFormatter("@");
-
-    public CellTextFormatter(String format) {
-        super(format);
-
-        final int[] numPlaces = new int[1];
-
-        desc = CellFormatPart.parseFormat(format, CellFormatType.TEXT,
-                new PartHandler() {
-                    public String handlePart(Matcher m, String part,
-                            CellFormatType type, StringBuffer desc) {
-                        if (part.equals("@")) {
-                            numPlaces[0]++;
-                            return "\u0000";
-                        }
-                        return null;
-                    }
-                }).toString();
-
-        // Remember the "@" positions in last-to-first order (to make insertion easier)
-        textPos = new int[numPlaces[0]];
-        int pos = desc.length() - 1;
-        for (int i = 0; i < textPos.length; i++) {
-            textPos[i] = desc.lastIndexOf("\u0000", pos);
-            pos = textPos[i] - 1;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void formatValue(StringBuffer toAppendTo, Object obj) {
-        int start = toAppendTo.length();
-        String text = obj.toString();
-        if (obj instanceof Boolean) {
-            text = text.toUpperCase(Locale.ROOT);
-        }
-        toAppendTo.append(desc);
-        for (int i = 0; i < textPos.length; i++) {
-            int pos = start + textPos[i];
-            toAppendTo.replace(pos, pos + 1, text);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p/>
-     * For text, this is just printing the text.
-     */
-    public void simpleValue(StringBuffer toAppendTo, Object value) {
-        SIMPLE_TEXT.formatValue(toAppendTo, value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java b/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java
deleted file mode 100644
index dec5a27..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/SimpleFraction.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-package org.apache.poi.ss.format;
-
-public class SimpleFraction {
-
-
-    /** The denominator. */
-    private final int denominator;
-
-    /** The numerator. */
-    private final int numerator;
-    /**
-     * Create a fraction given a double value and a denominator.
-     * 
-     * @param val double value of fraction
-     * @param exactDenom the exact denominator
-     * @return a SimpleFraction with the given values set.
-     */
-    public static SimpleFraction buildFractionExactDenominator(double val, int exactDenom){
-        int num =  (int)Math.round(val*exactDenom);
-        return new SimpleFraction(num,exactDenom);
-    }
-    
-    /**
-     * Create a fraction given the double value and either the maximum error
-     * allowed or the maximum number of denominator digits.
-     *
-     * @param value the double value to convert to a fraction.
-     * @param maxDenominator maximum denominator value allowed.
-     * 
-     * @throws RuntimeException if the continued fraction failed to
-     *      converge.
-     * @throws IllegalArgumentException if value > Integer.MAX_VALUE
-     */
-    public static SimpleFraction buildFractionMaxDenominator(double value, int maxDenominator){
-        return buildFractionMaxDenominator(value, 0, maxDenominator, 100);
-    }
-    /**
-     * Create a fraction given the double value and either the maximum error
-     * allowed or the maximum number of denominator digits.
-     * <p>
-     * References:
-     * <ul>
-     * <li><a href="http://mathworld.wolfram.com/ContinuedFraction.html">
-     * Continued Fraction</a> equations (11) and (22)-(26)</li>
-     * </ul>
-     * </p>
-     *
-     *  Based on org.apache.commons.math.fraction.Fraction from Apache Commons-Math.
-     *  YK: The only reason of having this class is to avoid dependency on the Commons-Math jar.
-     *
-     * @param value the double value to convert to a fraction.
-     * @param epsilon maximum error allowed.  The resulting fraction is within
-     *        <code>epsilon</code> of <code>value</code>, in absolute terms.
-     * @param maxDenominator maximum denominator value allowed.
-     * @param maxIterations maximum number of convergents
-     * @throws RuntimeException if the continued fraction failed to
-     *         converge.
-     * @throws IllegalArgumentException if value > Integer.MAX_VALUE
-     */
-    private static SimpleFraction buildFractionMaxDenominator(double value, double epsilon, int maxDenominator, int maxIterations)
-    {
-        long overflow = Integer.MAX_VALUE;
-        double r0 = value;
-        long a0 = (long)Math.floor(r0);
-        if (a0 > overflow) {
-            throw new IllegalArgumentException("Overflow trying to convert "+value+" to fraction ("+a0+"/"+1l+")");
-        }
-
-        // check for (almost) integer arguments, which should not go
-        // to iterations.
-        if (Math.abs(a0 - value) < epsilon) {
-            return new SimpleFraction((int)a0, 1);
-        }
-
-        long p0 = 1;
-        long q0 = 0;
-        long p1 = a0;
-        long q1 = 1;
-
-        long p2;
-        long q2;
-
-        int n = 0;
-        boolean stop = false;
-        do {
-            ++n;
-            double r1 = 1.0 / (r0 - a0);
-            long a1 = (long)Math.floor(r1);
-            p2 = (a1 * p1) + p0;
-            q2 = (a1 * q1) + q0;
-            //MATH-996/POI-55419
-            if (epsilon == 0.0f && maxDenominator > 0 && Math.abs(q2) > maxDenominator &&
-                    Math.abs(q1) < maxDenominator){
-
-                return new SimpleFraction((int)p1, (int)q1);
-            }
-            if ((p2 > overflow) || (q2 > overflow)) {
-                throw new RuntimeException("Overflow trying to convert "+value+" to fraction ("+p2+"/"+q2+")");
-            }
-
-            double convergent = (double)p2 / (double)q2;
-            if (n < maxIterations && Math.abs(convergent - value) > epsilon && q2 < maxDenominator) {
-                p0 = p1;
-                p1 = p2;
-                q0 = q1;
-                q1 = q2;
-                a0 = a1;
-                r0 = r1;
-            } else {
-                stop = true;
-            }
-        } while (!stop);
-
-        if (n >= maxIterations) {
-            throw new RuntimeException("Unable to convert "+value+" to fraction after "+maxIterations+" iterations");
-        }
-
-        if (q2 < maxDenominator) {
-            return new SimpleFraction((int) p2, (int)q2);
-        } else {
-            return new SimpleFraction((int)p1, (int)q1);
-        }
-
-    }
-
-    /**
-     * Create a fraction given a numerator and denominator.
-     * @param numerator
-     * @param denominator maxDenominator The maximum allowed value for denominator
-     */
-    public SimpleFraction(int numerator, int denominator)
-    {
-        this.numerator = numerator;
-        this.denominator = denominator;
-    }
-
-    /**
-     * Access the denominator.
-     * @return the denominator.
-     */
-    public int getDenominator() {
-        return denominator;
-    }
-
-    /**
-     * Access the numerator.
-     * @return the numerator.
-     */
-    public int getNumerator() {
-        return numerator;
-    }
-
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/format/package.html b/trunk/src/java/org/apache/poi/ss/format/package.html
deleted file mode 100644
index 4c0096d..0000000
--- a/trunk/src/java/org/apache/poi/ss/format/package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body>
-This package contains classes that implement cell formatting
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
deleted file mode 100644
index 74872de..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * Common functionality across file formats for evaluating formula cells.<p/>
- */
-public abstract class BaseFormulaEvaluator implements FormulaEvaluator, WorkbookEvaluatorProvider {
-    protected final WorkbookEvaluator _bookEvaluator;
-
-    protected BaseFormulaEvaluator(WorkbookEvaluator bookEvaluator) {
-        this._bookEvaluator = bookEvaluator;
-    }
-
-    /**
-     * Coordinates several formula evaluators together so that formulas that involve external
-     * references can be evaluated.
-     * @param workbookNames the simple file names used to identify the workbooks in formulas
-     * with external links (for example "MyData.xls" as used in a formula "[MyData.xls]Sheet1!A1")
-     * @param evaluators all evaluators for the full set of workbooks required by the formulas.
-     */
-    public static void setupEnvironment(String[] workbookNames, BaseFormulaEvaluator[] evaluators) {
-        WorkbookEvaluator[] wbEvals = new WorkbookEvaluator[evaluators.length];
-        for (int i = 0; i < wbEvals.length; i++) {
-            wbEvals[i] = evaluators[i]._bookEvaluator;
-        }
-        CollaboratingWorkbooksEnvironment.setup(workbookNames, wbEvals);
-    }
-
-    @Override
-    public void setupReferencedWorkbooks(Map<String, FormulaEvaluator> evaluators) {
-        CollaboratingWorkbooksEnvironment.setupFormulaEvaluator(evaluators);
-    }
-
-    @Override
-    public WorkbookEvaluator _getWorkbookEvaluator() {
-        return _bookEvaluator;
-    }
-
-    /**
-     * Should be called whenever there are major changes (e.g. moving sheets) to input cells
-     * in the evaluated workbook.  If performance is not critical, a single call to this method
-     * may be used instead of many specific calls to the notify~ methods.
-     *
-     * Failure to call this method after changing cell values will cause incorrect behaviour
-     * of the evaluate~ methods of this class
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        _bookEvaluator.clearAllCachedResultValues();
-    }
-
-    /**
-     * If cell contains a formula, the formula is evaluated and returned,
-     * else the CellValue simply copies the appropriate cell value from
-     * the cell and also its cell type. This method should be preferred over
-     * evaluateInCell() when the call should not modify the contents of the
-     * original cell.
-     *
-     * @param cell may be <code>null</code> signifying that the cell is not present (or blank)
-     * @return <code>null</code> if the supplied cell is <code>null</code> or blank
-     */
-    @Override
-    public CellValue evaluate(Cell cell) {
-        if (cell == null) {
-            return null;
-        }
-
-        switch (cell.getCellTypeEnum()) {
-            case BOOLEAN:
-                return CellValue.valueOf(cell.getBooleanCellValue());
-            case ERROR:
-                return CellValue.getError(cell.getErrorCellValue());
-            case FORMULA:
-                return evaluateFormulaCellValue(cell);
-            case NUMERIC:
-                return new CellValue(cell.getNumericCellValue());
-            case STRING:
-                return new CellValue(cell.getRichStringCellValue().getString());
-            case BLANK:
-                return null;
-            default:
-                throw new IllegalStateException("Bad cell type (" + cell.getCellTypeEnum() + ")");
-        }
-    }
-    
-    /**
-     * If cell contains formula, it evaluates the formula, and
-     *  puts the formula result back into the cell, in place
-     *  of the old formula.
-     * Else if cell does not contain formula, this method leaves
-     *  the cell unchanged.
-     * Note that the same instance of HSSFCell is returned to
-     * allow chained calls like:
-     * <pre>
-     * int evaluatedCellType = evaluator.evaluateInCell(cell).getCellType();
-     * </pre>
-     * Be aware that your cell value will be changed to hold the
-     *  result of the formula. If you simply want the formula
-     *  value computed for you, use {@link #evaluateFormulaCellEnum(Cell)}}
-     * @param cell
-     * @return the {@code cell} that was passed in, allowing for chained calls
-     */
-    @Override
-    public Cell evaluateInCell(Cell cell) {
-        if (cell == null) {
-            return null;
-        }
-        Cell result = cell;
-        if (cell.getCellTypeEnum() == CellType.FORMULA) {
-            CellValue cv = evaluateFormulaCellValue(cell);
-            setCellValue(cell, cv);
-            setCellType(cell, cv); // cell will no longer be a formula cell
-        }
-        return result;
-    }
-
-    protected abstract CellValue evaluateFormulaCellValue(Cell cell);
-
-    /**
-     * If cell contains formula, it evaluates the formula, and saves the result of the formula. The
-     * cell remains as a formula cell. If the cell does not contain formula, this method returns -1
-     * and leaves the cell unchanged.
-     *
-     * Note that the type of the <em>formula result</em> is returned, so you know what kind of
-     * cached formula result is also stored with  the formula.
-     * <pre>
-     * int evaluatedCellType = evaluator.evaluateFormulaCell(cell);
-     * </pre>
-     * Be aware that your cell will hold both the formula, and the result. If you want the cell
-     * replaced with the result of the formula, use {@link #evaluateInCell(org.apache.poi.ss.usermodel.Cell)}
-     * @param cell The cell to evaluate
-     * @return -1 for non-formula cells, or the type of the <em>formula result</em>
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int evaluateFormulaCell(Cell cell) {
-        return evaluateFormulaCellEnum(cell).getCode();
-    }
-    
-    /**
-     * If cell contains formula, it evaluates the formula,
-     *  and saves the result of the formula. The cell
-     *  remains as a formula cell.
-     * Else if cell does not contain formula, this method leaves
-     *  the cell unchanged.
-     * Note that the type of the formula result is returned,
-     *  so you know what kind of value is also stored with
-     *  the formula.
-     * <pre>
-     * CellType evaluatedCellType = evaluator.evaluateFormulaCellEnum(cell);
-     * </pre>
-     * Be aware that your cell will hold both the formula,
-     *  and the result. If you want the cell replaced with
-     *  the result of the formula, use {@link #evaluate(org.apache.poi.ss.usermodel.Cell)} }
-     * @param cell The cell to evaluate
-     * @return The type of the formula result (the cell's type remains as CellType.FORMULA however)
-     *         If cell is not a formula cell, returns {@link CellType#_NONE} rather than throwing an exception.
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public CellType evaluateFormulaCellEnum(Cell cell) {
-        if (cell == null || cell.getCellTypeEnum() != CellType.FORMULA) {
-            return CellType._NONE;
-        }
-        CellValue cv = evaluateFormulaCellValue(cell);
-        // cell remains a formula cell, but the cached value is changed
-        setCellValue(cell, cv);
-        return cv.getCellTypeEnum();
-    }
-
-    protected static void setCellType(Cell cell, CellValue cv) {
-        CellType cellType = cv.getCellTypeEnum();
-        switch (cellType) {
-            case BOOLEAN:
-            case ERROR:
-            case NUMERIC:
-            case STRING:
-                cell.setCellType(cellType);
-                return;
-            case BLANK:
-                // never happens - blanks eventually get translated to zero
-                throw new IllegalArgumentException("This should never happen. Blanks eventually get translated to zero.");
-            case FORMULA:
-                // this will never happen, we have already evaluated the formula
-                throw new IllegalArgumentException("This should never happen. Formulas should have already been evaluated.");
-            default:
-                throw new IllegalStateException("Unexpected cell value type (" + cellType + ")");
-        }
-    }
-    
-    protected abstract RichTextString createRichTextString(String str);
-    
-    protected void setCellValue(Cell cell, CellValue cv) {
-        CellType cellType = cv.getCellTypeEnum();
-        switch (cellType) {
-            case BOOLEAN:
-                cell.setCellValue(cv.getBooleanValue());
-                break;
-            case ERROR:
-                cell.setCellErrorValue(cv.getErrorValue());
-                break;
-            case NUMERIC:
-                cell.setCellValue(cv.getNumberValue());
-                break;
-            case STRING:
-                cell.setCellValue(createRichTextString(cv.getStringValue()));
-                break;
-            case BLANK:
-                // never happens - blanks eventually get translated to zero
-            case FORMULA:
-                // this will never happen, we have already evaluated the formula
-            default:
-                throw new IllegalStateException("Unexpected cell value type (" + cellType + ")");
-        }
-    }
-    
-
-    /**
-     * Loops over all cells in all sheets of the supplied
-     *  workbook.
-     * For cells that contain formulas, their formulas are
-     *  evaluated, and the results are saved. These cells
-     *  remain as formula cells.
-     * For cells that do not contain formulas, no changes
-     *  are made.
-     * This is a helpful wrapper around looping over all
-     *  cells, and calling evaluateFormulaCell on each one.
-     */
-    public static void evaluateAllFormulaCells(Workbook wb) {
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        evaluateAllFormulaCells(wb, evaluator);
-    }
-    protected static void evaluateAllFormulaCells(Workbook wb, FormulaEvaluator evaluator) {
-        for(int i=0; i<wb.getNumberOfSheets(); i++) {
-            Sheet sheet = wb.getSheetAt(i);
-
-            for(Row r : sheet) {
-                for (Cell c : r) {
-                    if (c.getCellTypeEnum() == CellType.FORMULA) {
-                        evaluator.evaluateFormulaCellEnum(c);
-                    }
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setIgnoreMissingWorkbooks(boolean ignore){
-        _bookEvaluator.setIgnoreMissingWorkbooks(ignore);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setDebugEvaluationOutputForNextEval(boolean value){
-        _bookEvaluator.setDebugEvaluationOutputForNextEval(value);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/CellCacheEntry.java b/trunk/src/java/org/apache/poi/ss/formula/CellCacheEntry.java
deleted file mode 100644
index dbf89e9..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/CellCacheEntry.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.IEvaluationListener.ICacheEntry;
-
-/**
- * Stores the parameters that identify the evaluation of one cell.<br/>
- */
-abstract class CellCacheEntry implements ICacheEntry {
-	public static final CellCacheEntry[] EMPTY_ARRAY = { };
-
-	private final FormulaCellCacheEntrySet _consumingCells;
-	private ValueEval _value;
-
-
-	protected CellCacheEntry() {
-		_consumingCells = new FormulaCellCacheEntrySet();
-	}
-	protected final void clearValue() {
-		_value = null;
-	}
-
-	public final boolean updateValue(ValueEval value) {
-		if (value == null) {
-			throw new IllegalArgumentException("Did not expect to update to null");
-		}
-		boolean result = !areValuesEqual(_value, value);
-		_value = value;
-		return result;
-	}
-	public final ValueEval getValue() {
-		return _value;
-	}
-
-	private static boolean areValuesEqual(ValueEval a, ValueEval b) {
-		if (a == null) {
-			return false;
-		}
-		Class<? extends ValueEval> cls = a.getClass();
-		if (cls != b.getClass()) {
-			// value type is changing
-			return false;
-		}
-		if (a == BlankEval.instance) {
-			return b == a;
-		}
-		if (cls == NumberEval.class) {
-			return ((NumberEval)a).getNumberValue() == ((NumberEval)b).getNumberValue();
-		}
-		if (cls == StringEval.class) {
-			return ((StringEval)a).getStringValue().equals(((StringEval)b).getStringValue());
-		}
-		if (cls == BoolEval.class) {
-			return ((BoolEval)a).getBooleanValue() == ((BoolEval)b).getBooleanValue();
-		}
-		if (cls == ErrorEval.class) {
-			return ((ErrorEval)a).getErrorCode() == ((ErrorEval)b).getErrorCode();
-		}
-		throw new IllegalStateException("Unexpected value class (" + cls.getName() + ")");
-	}
-
-	public final void addConsumingCell(FormulaCellCacheEntry cellLoc) {
-		_consumingCells.add(cellLoc);
-
-	}
-	public final FormulaCellCacheEntry[] getConsumingCells() {
-		return _consumingCells.toArray();
-	}
-
-	public final void clearConsumingCell(FormulaCellCacheEntry cce) {
-		if(!_consumingCells.remove(cce)) {
-			throw new IllegalStateException("Specified formula cell is not consumed by this cell");
-		}
-	}
-	public final void recurseClearCachedFormulaResults(IEvaluationListener listener) {
-		if (listener == null) {
-			recurseClearCachedFormulaResults();
-		} else {
-			listener.onClearCachedValue(this);
-			recurseClearCachedFormulaResults(listener, 1);
-		}
-	}
-
-	/**
-	 * Calls formulaCell.setFormulaResult(null, null) recursively all the way up the tree of
-	 * dependencies. Calls usedCell.clearConsumingCell(fc) for each child of a cell that is
-	 * cleared along the way.
-	 * @param formulaCells
-	 */
-	protected final void recurseClearCachedFormulaResults() {
-		FormulaCellCacheEntry[] formulaCells = getConsumingCells();
-
-		for (int i = 0; i < formulaCells.length; i++) {
-			FormulaCellCacheEntry fc = formulaCells[i];
-			fc.clearFormulaEntry();
-			fc.recurseClearCachedFormulaResults();
-		}
-	}
-
-	/**
-	 * Identical to {@link #recurseClearCachedFormulaResults()} except for the listener call-backs
-	 */
-	protected final void recurseClearCachedFormulaResults(IEvaluationListener listener, int depth) {
-		FormulaCellCacheEntry[] formulaCells = getConsumingCells();
-
-		listener.sortDependentCachedValues(formulaCells);
-		for (int i = 0; i < formulaCells.length; i++) {
-			FormulaCellCacheEntry fc = formulaCells[i];
-			listener.onClearDependentCachedValue(fc, depth);
-			fc.clearFormulaEntry();
-			fc.recurseClearCachedFormulaResults(listener, depth+1);
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/CellEvaluationFrame.java b/trunk/src/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
deleted file mode 100644
index 2f9c952..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Stores details about the current evaluation of a cell.<br/>
- */
-final class CellEvaluationFrame {
-
-	private final FormulaCellCacheEntry _cce;
-	private final Set<CellCacheEntry> _sensitiveInputCells;
-	private FormulaUsedBlankCellSet _usedBlankCellGroup;
-
-	public CellEvaluationFrame(FormulaCellCacheEntry cce) {
-		_cce = cce;
-		_sensitiveInputCells = new HashSet<CellCacheEntry>();
-	}
-	public CellCacheEntry getCCE() {
-		return _cce;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append("]");
-		return sb.toString();
-	}
-	/**
-	 * @param inputCell a cell directly used by the formula of this evaluation frame
-	 */
-	public void addSensitiveInputCell(CellCacheEntry inputCell) {
-		_sensitiveInputCells.add(inputCell);
-	}
-	/**
-	 * @return never <code>null</code>, (possibly empty) array of all cells directly used while
-	 * evaluating the formula of this frame.
-	 */
-	private CellCacheEntry[] getSensitiveInputCells() {
-		int nItems = _sensitiveInputCells.size();
-		if (nItems < 1) {
-			return CellCacheEntry.EMPTY_ARRAY;
-		}
-		CellCacheEntry[] result = new CellCacheEntry[nItems];
-		_sensitiveInputCells.toArray(result);
-		return result;
-	}
-	public void addUsedBlankCell(int bookIndex, int sheetIndex, int rowIndex, int columnIndex) {
-		if (_usedBlankCellGroup == null) {
-			_usedBlankCellGroup = new FormulaUsedBlankCellSet();
-		}
-		_usedBlankCellGroup.addCell(bookIndex, sheetIndex, rowIndex, columnIndex);
-	}
-
-	public void updateFormulaResult(ValueEval result) {
-		_cce.updateFormulaResult(result, getSensitiveInputCells(), _usedBlankCellGroup);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java b/trunk/src/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
deleted file mode 100644
index 58ce3d9..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.util.Internal;
-
-/**
- * Manages a collection of {@link WorkbookEvaluator}s, in order to support 
- * evaluation of formulas across spreadsheets.
- *
- * <p>For POI internal use only - use</p> 
- */
-@Internal
-public final class CollaboratingWorkbooksEnvironment {
-
-    public static final class WorkbookNotFoundException extends Exception {
-        private static final long serialVersionUID = 8787784539811167941L;
-
-        WorkbookNotFoundException(String msg) {
-            super(msg);
-        }
-    }
-
-    public static final CollaboratingWorkbooksEnvironment EMPTY = new CollaboratingWorkbooksEnvironment();
-
-    private final Map<String, WorkbookEvaluator> _evaluatorsByName;
-    private final WorkbookEvaluator[] _evaluators;
-
-    private boolean _unhooked;
-    private CollaboratingWorkbooksEnvironment() {
-        _evaluatorsByName = Collections.emptyMap();
-        _evaluators = new WorkbookEvaluator[0];
-    }
-
-    public static void setup(String[] workbookNames, WorkbookEvaluator[] evaluators) {
-        int nItems = workbookNames.length;
-        if (evaluators.length != nItems) {
-            throw new IllegalArgumentException("Number of workbook names is " + nItems
-                    + " but number of evaluators is " + evaluators.length);
-        }
-        if (nItems < 1) {
-            throw new IllegalArgumentException("Must provide at least one collaborating worbook");
-        }
-        new CollaboratingWorkbooksEnvironment(workbookNames, evaluators, nItems);
-    }
-    public static void setup(Map<String,WorkbookEvaluator> evaluatorsByName) {
-        if (evaluatorsByName.size() < 1) {
-            throw new IllegalArgumentException("Must provide at least one collaborating worbook");
-        }
-        WorkbookEvaluator[] evaluators = 
-                evaluatorsByName.values().toArray(new WorkbookEvaluator[evaluatorsByName.size()]); 
-        new CollaboratingWorkbooksEnvironment(evaluatorsByName, evaluators);
-    }
-    public static void setupFormulaEvaluator(Map<String,FormulaEvaluator> evaluators) {
-        Map<String, WorkbookEvaluator> evaluatorsByName = new HashMap<String, WorkbookEvaluator>(evaluators.size());
-        for (Map.Entry<String,FormulaEvaluator> swb : evaluators.entrySet()) {
-            String wbName = swb.getKey();
-            FormulaEvaluator eval = swb.getValue();
-            if (eval instanceof WorkbookEvaluatorProvider) {
-                evaluatorsByName.put(wbName, ((WorkbookEvaluatorProvider)eval)._getWorkbookEvaluator());
-            } else {
-                throw new IllegalArgumentException("Formula Evaluator " + eval + 
-                                                   " provides no WorkbookEvaluator access");
-            }
-        }
-        setup(evaluatorsByName);
-    }
-
-    private CollaboratingWorkbooksEnvironment(String[] workbookNames, WorkbookEvaluator[] evaluators, int nItems) {
-        this(toUniqueMap(workbookNames, evaluators, nItems), evaluators);
-    }
-    private static Map<String, WorkbookEvaluator> toUniqueMap(String[] workbookNames, WorkbookEvaluator[] evaluators, int nItems) {
-        Map<String, WorkbookEvaluator> evaluatorsByName = new HashMap<String, WorkbookEvaluator>(nItems * 3 / 2);
-        for(int i=0; i<nItems; i++) {
-            String wbName = workbookNames[i];
-            WorkbookEvaluator wbEval = evaluators[i];
-            if (evaluatorsByName.containsKey(wbName)) {
-                throw new IllegalArgumentException("Duplicate workbook name '" + wbName + "'");
-            }
-            evaluatorsByName.put(wbName, wbEval);
-        }
-        return evaluatorsByName;
-    }
-    private CollaboratingWorkbooksEnvironment(Map<String, WorkbookEvaluator> evaluatorsByName, WorkbookEvaluator[] evaluators) {
-        IdentityHashMap<WorkbookEvaluator, String> uniqueEvals = new IdentityHashMap<WorkbookEvaluator, String>(evaluators.length);
-        for (Map.Entry<String, WorkbookEvaluator> me : evaluatorsByName.entrySet()) {
-            String uniEval = uniqueEvals.put(me.getValue(), me.getKey());
-            if (uniEval != null) {
-                String msg = "Attempted to register same workbook under names '" +
-                    uniEval + "' and '" + me.getKey() + "'";
-                throw new IllegalArgumentException(msg);
-            }
-        }
-        unhookOldEnvironments(evaluators);
-        hookNewEnvironment(evaluators, this);
-        _unhooked = false;
-        _evaluators = evaluators.clone();
-        _evaluatorsByName = evaluatorsByName;
-    }
-
-    private static void hookNewEnvironment(WorkbookEvaluator[] evaluators, CollaboratingWorkbooksEnvironment env) {
-        // All evaluators will need to share the same cache.
-        // but the cache takes an optional evaluation listener.
-        int nItems = evaluators.length;
-        IEvaluationListener evalListener = evaluators[0].getEvaluationListener();
-        // make sure that all evaluators have the same listener
-        for(int i=0; i<nItems; i++) {
-            if(evalListener != evaluators[i].getEvaluationListener()) {
-                // This would be very complex to support
-                throw new RuntimeException("Workbook evaluators must all have the same evaluation listener");
-            }
-        }
-        EvaluationCache cache = new EvaluationCache(evalListener);
-
-        for(int i=0; i<nItems; i++) {
-            evaluators[i].attachToEnvironment(env, cache, i);
-        }
-    }
-
-    /**
-     * Completely dismantles all workbook environments that the supplied evaluators are part of
-     */
-    private void unhookOldEnvironments(WorkbookEvaluator[] evaluators) {
-        Set<CollaboratingWorkbooksEnvironment> oldEnvs = new HashSet<CollaboratingWorkbooksEnvironment>();
-        for(int i=0; i<evaluators.length; i++) {
-            oldEnvs.add(evaluators[i].getEnvironment());
-        }
-        CollaboratingWorkbooksEnvironment[] oldCWEs = new CollaboratingWorkbooksEnvironment[oldEnvs.size()];
-        oldEnvs.toArray(oldCWEs);
-        for (int i = 0; i < oldCWEs.length; i++) {
-            oldCWEs[i].unhook();
-        }
-    }
-
-    /**
-     * Tell all contained evaluators that this environment should be discarded
-     */
-    private void unhook() {
-        if (_evaluators.length < 1) {
-            // Never dismantle the EMPTY environment
-            return;
-        }
-        for (int i = 0; i < _evaluators.length; i++) {
-            _evaluators[i].detachFromEnvironment();
-        }
-        _unhooked = true;
-    }
-
-    public WorkbookEvaluator getWorkbookEvaluator(String workbookName) throws WorkbookNotFoundException {
-        if (_unhooked) {
-            throw new IllegalStateException("This environment has been unhooked");
-        }
-        WorkbookEvaluator result = _evaluatorsByName.get(workbookName);
-        if (result == null) {
-            StringBuffer sb = new StringBuffer(256);
-            sb.append("Could not resolve external workbook name '").append(workbookName).append("'.");
-            if (_evaluators.length < 1) {
-                sb.append(" Workbook environment has not been set up.");
-            } else {
-                sb.append(" The following workbook names are valid: (");
-                Iterator<String> i = _evaluatorsByName.keySet().iterator();
-                int count=0;
-                while(i.hasNext()) {
-                    if (count++>0) {
-                        sb.append(", ");
-                    }
-                    sb.append("'").append(i.next()).append("'");
-                }
-                sb.append(")");
-            }
-            throw new WorkbookNotFoundException(sb.toString());
-        }
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/EvaluationCache.java b/trunk/src/java/org/apache/poi/ss/formula/EvaluationCache.java
deleted file mode 100644
index cd68db3..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/EvaluationCache.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.FormulaCellCache.IEntryOperation;
-import org.apache.poi.ss.formula.FormulaUsedBlankCellSet.BookSheetKey;
-import org.apache.poi.ss.formula.PlainCellCache.Loc;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.CellType;
-
-/**
- * Performance optimisation for {@link org.apache.poi.ss.usermodel.FormulaEvaluator}.
- * This class stores previously calculated values of already visited cells,
- * to avoid unnecessary re-calculation when the same cells are referenced multiple times
- *
- * @author Josh Micich
- */
-final class EvaluationCache {
-
-	private final PlainCellCache _plainCellCache;
-	private final FormulaCellCache _formulaCellCache;
-	/** only used for testing. <code>null</code> otherwise */
-	final IEvaluationListener _evaluationListener;
-
-	/* package */EvaluationCache(IEvaluationListener evaluationListener) {
-		_evaluationListener = evaluationListener;
-		_plainCellCache = new PlainCellCache();
-		_formulaCellCache = new FormulaCellCache();
-	}
-
-	public void notifyUpdateCell(int bookIndex, int sheetIndex, EvaluationCell cell) {
-		FormulaCellCacheEntry fcce = _formulaCellCache.get(cell);
-
-		int rowIndex = cell.getRowIndex();
-		int columnIndex = cell.getColumnIndex();
-		Loc loc = new Loc(bookIndex, sheetIndex, rowIndex, columnIndex);
-		PlainValueCellCacheEntry pcce = _plainCellCache.get(loc);
-
-		if (cell.getCellTypeEnum() == CellType.FORMULA) {
-			if (fcce == null) {
-				fcce = new FormulaCellCacheEntry();
-				if (pcce == null) {
-					if (_evaluationListener != null) {
-						_evaluationListener.onChangeFromBlankValue(sheetIndex, rowIndex,
-								columnIndex, cell, fcce);
-					}
-					updateAnyBlankReferencingFormulas(bookIndex, sheetIndex, rowIndex,
-							columnIndex);
-				}
-				_formulaCellCache.put(cell, fcce);
-			} else {
-				fcce.recurseClearCachedFormulaResults(_evaluationListener);
-				fcce.clearFormulaEntry();
-			}
-			if (pcce == null) {
-				// was formula cell before - no change of type
-			} else {
-				// changing from plain cell to formula cell
-				pcce.recurseClearCachedFormulaResults(_evaluationListener);
-				_plainCellCache.remove(loc);
-			}
-		} else {
-			ValueEval value = WorkbookEvaluator.getValueFromNonFormulaCell(cell);
-			if (pcce == null) {
-				if (value != BlankEval.instance) {
-					// only cache non-blank values in the plain cell cache
-					// (dependencies on blank cells are managed by
-					// FormulaCellCacheEntry._usedBlankCellGroup)
-					pcce = new PlainValueCellCacheEntry(value);
-					if (fcce == null) {
-						if (_evaluationListener != null) {
-							_evaluationListener.onChangeFromBlankValue(sheetIndex, rowIndex, columnIndex, cell, pcce);
-						}
-						updateAnyBlankReferencingFormulas(bookIndex, sheetIndex,
-								rowIndex, columnIndex);
-					}
-					_plainCellCache.put(loc, pcce);
-				}
-			} else {
-				if (pcce.updateValue(value)) {
-					pcce.recurseClearCachedFormulaResults(_evaluationListener);
-				}
-				if (value == BlankEval.instance) {
-					_plainCellCache.remove(loc);
-				}
-			}
-			if (fcce == null) {
-				// was plain cell before - no change of type
-			} else {
-				// was formula cell before - now a plain value
-				_formulaCellCache.remove(cell);
-				fcce.setSensitiveInputCells(null);
-				fcce.recurseClearCachedFormulaResults(_evaluationListener);
-			}
-		}
-	}
-
-	private void updateAnyBlankReferencingFormulas(int bookIndex, int sheetIndex,
-			final int rowIndex, final int columnIndex) {
-		final BookSheetKey bsk = new BookSheetKey(bookIndex, sheetIndex);
-		_formulaCellCache.applyOperation(new IEntryOperation() {
-
-			public void processEntry(FormulaCellCacheEntry entry) {
-				entry.notifyUpdatedBlankCell(bsk, rowIndex, columnIndex, _evaluationListener);
-			}
-		});
-	}
-
-	public PlainValueCellCacheEntry getPlainValueEntry(int bookIndex, int sheetIndex,
-			int rowIndex, int columnIndex, ValueEval value) {
-
-		Loc loc = new Loc(bookIndex, sheetIndex, rowIndex, columnIndex);
-		PlainValueCellCacheEntry result = _plainCellCache.get(loc);
-		if (result == null) {
-			result = new PlainValueCellCacheEntry(value);
-			_plainCellCache.put(loc, result);
-			if (_evaluationListener != null) {
-				_evaluationListener.onReadPlainValue(sheetIndex, rowIndex, columnIndex, result);
-			}
-		} else {
-			// TODO - if we are confident that this sanity check is not required, we can remove 'value' from plain value cache entry
-			if (!areValuesEqual(result.getValue(), value)) {
-				throw new IllegalStateException("value changed");
-			}
-			if (_evaluationListener != null) {
-				_evaluationListener.onCacheHit(sheetIndex, rowIndex, columnIndex, value);
-			}
-		}
-		return result;
-	}
-	private boolean areValuesEqual(ValueEval a, ValueEval b) {
-		if (a == null) {
-			return false;
-		}
-		Class<?> cls = a.getClass();
-		if (cls != b.getClass()) {
-			// value type is changing
-			return false;
-		}
-		if (a == BlankEval.instance) {
-			return b == a;
-		}
-		if (cls == NumberEval.class) {
-			return ((NumberEval)a).getNumberValue() == ((NumberEval)b).getNumberValue();
-		}
-		if (cls == StringEval.class) {
-			return ((StringEval)a).getStringValue().equals(((StringEval)b).getStringValue());
-		}
-		if (cls == BoolEval.class) {
-			return ((BoolEval)a).getBooleanValue() == ((BoolEval)b).getBooleanValue();
-		}
-		if (cls == ErrorEval.class) {
-			return ((ErrorEval)a).getErrorCode() == ((ErrorEval)b).getErrorCode();
-		}
-		throw new IllegalStateException("Unexpected value class (" + cls.getName() + ")");
-	}
-
-	public FormulaCellCacheEntry getOrCreateFormulaCellEntry(EvaluationCell cell) {
-		FormulaCellCacheEntry result = _formulaCellCache.get(cell);
-		if (result == null) {
-
-			result = new FormulaCellCacheEntry();
-			_formulaCellCache.put(cell, result);
-		}
-		return result;
-	}
-
-	/**
-	 * Should be called whenever there are changes to input cells in the evaluated workbook.
-	 */
-	public void clear() {
-		if(_evaluationListener != null) {
-			_evaluationListener.onClearWholeCache();
-		}
-		_plainCellCache.clear();
-		_formulaCellCache.clear();
-	}
-	public void notifyDeleteCell(int bookIndex, int sheetIndex, EvaluationCell cell) {
-
-		if (cell.getCellTypeEnum() == CellType.FORMULA) {
-			FormulaCellCacheEntry fcce = _formulaCellCache.remove(cell);
-			if (fcce == null) {
-				// formula cell has not been evaluated yet
-			} else {
-				fcce.setSensitiveInputCells(null);
-				fcce.recurseClearCachedFormulaResults(_evaluationListener);
-			}
-		} else {
-			Loc loc = new Loc(bookIndex, sheetIndex, cell.getRowIndex(), cell.getColumnIndex());
-			PlainValueCellCacheEntry pcce = _plainCellCache.get(loc);
-
-			if (pcce == null) {
-				// cache entry doesn't exist. nothing to do
-			} else {
-				pcce.recurseClearCachedFormulaResults(_evaluationListener);
-			}
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java b/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java
deleted file mode 100644
index a7e855c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.usermodel.CellType;
-
-/**
- * Abstracts a cell for the purpose of formula evaluation.  This interface represents both formula
- * and non-formula cells.<br/>
- * 
- * For POI internal use only
- * 
- * @author Josh Micich
- */
-public interface EvaluationCell {
-	/**
-	 * @return an Object that identifies the underlying cell,
-	 * suitable for use as a key in a {@link java.util.HashMap}
-	 */
-	Object getIdentityKey();
-
-	EvaluationSheet getSheet();
-	int getRowIndex();
-	int getColumnIndex();
-	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	int getCellType();
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	CellType getCellTypeEnum();
-
-	double getNumericCellValue();
-	String getStringCellValue();
-	boolean getBooleanCellValue();
-	int getErrorCellValue();
-
-	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	int getCachedFormulaResultType();
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	CellType getCachedFormulaResultTypeEnum();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/EvaluationName.java b/trunk/src/java/org/apache/poi/ss/formula/EvaluationName.java
deleted file mode 100644
index 2d1fbf5..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/EvaluationName.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-/**
- * Abstracts a name record for formula evaluation.<br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-public interface EvaluationName {
-
-	String getNameText();
-
-	boolean isFunctionName();
-
-	boolean hasFormula();
-
-	Ptg[] getNameDefinition();
-
-	boolean isRange();
-	NamePtg createPtg();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/EvaluationSheet.java b/trunk/src/java/org/apache/poi/ss/formula/EvaluationSheet.java
deleted file mode 100644
index 1d5b065..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/EvaluationSheet.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Abstracts a sheet for the purpose of formula evaluation.<br/>
- * 
- * For POI internal use only
- * 
- * @author Josh Micich
- */
-@Internal
-public interface EvaluationSheet {
-
-    /**
-     * @return <code>null</code> if there is no cell at the specified coordinates
-     */
-    EvaluationCell getCell(int rowIndex, int columnIndex);
-    
-    /**
-     * Propagated from {@link EvaluationWorkbook#clearAllCachedResultValues()} to clear locally cached data.
-     * 
-     * @see WorkbookEvaluator#clearAllCachedResultValues()
-     * @see EvaluationWorkbook#clearAllCachedResultValues()
-     * @since POI 3.15 beta 3
-     */
-    public void clearAllCachedResultValues();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/EvaluationTracker.java b/trunk/src/java/org/apache/poi/ss/formula/EvaluationTracker.java
deleted file mode 100644
index ef7cb11..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/EvaluationTracker.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Instances of this class keep track of multiple dependent cell evaluations due
- * to recursive calls to {@link WorkbookEvaluator#evaluate(EvaluationCell)}}
- * The main purpose of this class is to detect an attempt to evaluate a cell
- * that is already being evaluated. In other words, it detects circular
- * references in spreadsheet formulas.
- *
- * @author Josh Micich
- */
-final class EvaluationTracker {
-	// TODO - consider deleting this class and letting CellEvaluationFrame take care of itself
-	private final List<CellEvaluationFrame> _evaluationFrames;
-	private final Set<FormulaCellCacheEntry> _currentlyEvaluatingCells;
-	private final EvaluationCache _cache;
-
-	public EvaluationTracker(EvaluationCache cache) {
-		_cache = cache;
-		_evaluationFrames = new ArrayList<CellEvaluationFrame>();
-		_currentlyEvaluatingCells = new HashSet<FormulaCellCacheEntry>();
-	}
-
-	/**
-	 * Notifies this evaluation tracker that evaluation of the specified cell is
-	 * about to start.<br/>
-	 *
-	 * In the case of a <code>true</code> return code, the caller should
-	 * continue evaluation of the specified cell, and also be sure to call
-	 * <tt>endEvaluate()</tt> when complete.<br/>
-	 *
-	 * In the case of a <code>null</code> return code, the caller should
-	 * return an evaluation result of
-	 * <tt>ErrorEval.CIRCULAR_REF_ERROR<tt>, and not call <tt>endEvaluate()</tt>.
-	 * <br/>
-	 * @return <code>false</code> if the specified cell is already being evaluated
-	 */
-	public boolean startEvaluate(FormulaCellCacheEntry cce) {
-		if (cce == null) {
-			throw new IllegalArgumentException("cellLoc must not be null");
-		}
-		if (_currentlyEvaluatingCells.contains(cce)) {
-			return false;
-		}
-		_currentlyEvaluatingCells.add(cce);
-		_evaluationFrames.add(new CellEvaluationFrame(cce));
-		return true;
-	}
-
-	public void updateCacheResult(ValueEval result) {
-
-		int nFrames = _evaluationFrames.size();
-		if (nFrames < 1) {
-			throw new IllegalStateException("Call to endEvaluate without matching call to startEvaluate");
-		}
-		CellEvaluationFrame frame = _evaluationFrames.get(nFrames-1);
-		if (result == ErrorEval.CIRCULAR_REF_ERROR && nFrames > 1) {
-			// Don't cache a circular ref error result if this cell is not the top evaluated cell.
-			// A true circular ref error will propagate all the way around the loop.  However, it's
-			// possible to have parts of the formula tree (/ parts of the loop) to evaluate to
-			// CIRCULAR_REF_ERROR, and that value not get used in the final cell result (see the
-			// unit tests for a simple example). Thus, the only CIRCULAR_REF_ERROR result that can
-			// safely be cached is that of the top evaluated cell.
-			return;
-		}
-
-		frame.updateFormulaResult(result);
-	}
-
-	/**
-	 * Notifies this evaluation tracker that the evaluation of the specified cell is complete. <p/>
-	 *
-	 * Every successful call to <tt>startEvaluate</tt> must be followed by a call to <tt>endEvaluate</tt> (recommended in a finally block) to enable
-	 * proper tracking of which cells are being evaluated at any point in time.<p/>
-	 *
-	 * Assuming a well behaved client, parameters to this method would not be
-	 * required. However, they have been included to assert correct behaviour,
-	 * and form more meaningful error messages.
-	 */
-	public void endEvaluate(CellCacheEntry cce) {
-
-		int nFrames = _evaluationFrames.size();
-		if (nFrames < 1) {
-			throw new IllegalStateException("Call to endEvaluate without matching call to startEvaluate");
-		}
-
-		nFrames--;
-		CellEvaluationFrame frame = _evaluationFrames.get(nFrames);
-		if (cce != frame.getCCE()) {
-			throw new IllegalStateException("Wrong cell specified. ");
-		}
-		// else - no problems so pop current frame
-		_evaluationFrames.remove(nFrames);
-		_currentlyEvaluatingCells.remove(cce);
-	}
-
-	public void acceptFormulaDependency(CellCacheEntry cce) {
-		// Tell the currently evaluating cell frame that it has a dependency on the specified
-		int prevFrameIndex = _evaluationFrames.size()-1;
-		if (prevFrameIndex < 0) {
-			// Top level frame, there is no 'cell' above this frame that is using the current cell
-		} else {
-			CellEvaluationFrame consumingFrame = _evaluationFrames.get(prevFrameIndex);
-			consumingFrame.addSensitiveInputCell(cce);
-		}
-	}
-
-	public void acceptPlainValueDependency(int bookIndex, int sheetIndex,
-			int rowIndex, int columnIndex, ValueEval value) {
-		// Tell the currently evaluating cell frame that it has a dependency on the specified
-		int prevFrameIndex = _evaluationFrames.size() - 1;
-		if (prevFrameIndex < 0) {
-			// Top level frame, there is no 'cell' above this frame that is using the current cell
-		} else {
-			CellEvaluationFrame consumingFrame = _evaluationFrames.get(prevFrameIndex);
-			if (value == BlankEval.instance) {
-				consumingFrame.addUsedBlankCell(bookIndex, sheetIndex, rowIndex, columnIndex);
-			} else {
-				PlainValueCellCacheEntry cce = _cache.getPlainValueEntry(bookIndex, sheetIndex,
-						rowIndex, columnIndex, value);
-				consumingFrame.addSensitiveInputCell(cce);
-			}
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/EvaluationWorkbook.java b/trunk/src/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
deleted file mode 100644
index 6c4c17e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.util.Internal;
-
-/**
- * Abstracts a workbook for the purpose of formula evaluation.<br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-@Internal
-public interface EvaluationWorkbook {
-    String getSheetName(int sheetIndex);
-    /**
-     * @return -1 if the specified sheet is from a different book
-     */
-    int getSheetIndex(EvaluationSheet sheet);
-    /**
-     * Finds a sheet index by case insensitive name.
-     * @return the index of the sheet matching the specified name.  -1 if not found
-     */
-    int getSheetIndex(String sheetName);
-
-    EvaluationSheet getSheet(int sheetIndex);
-
-    /**
-     * HSSF Only - fetch the external-style sheet details
-     * <p>Return will have no workbook set if it's actually in our own workbook</p>
-     */
-    ExternalSheet getExternalSheet(int externSheetIndex);
-    /**
-     * XSSF Only - fetch the external-style sheet details
-     * <p>Return will have no workbook set if it's actually in our own workbook</p>
-     */
-    ExternalSheet getExternalSheet(String firstSheetName, String lastSheetName, int externalWorkbookNumber);
-    /**
-     * HSSF Only - convert an external sheet index to an internal sheet index,
-     *  for an external-style reference to one of this workbook's own sheets 
-     */
-    int convertFromExternSheetIndex(int externSheetIndex);
-
-    /**
-     * HSSF Only - fetch the external-style name details
-     */
-    ExternalName getExternalName(int externSheetIndex, int externNameIndex);
-    /**
-     * XSSF Only - fetch the external-style name details
-     */
-    ExternalName getExternalName(String nameName, String sheetName, int externalWorkbookNumber);
-    
-    EvaluationName getName(NamePtg namePtg);
-    EvaluationName getName(String name, int sheetIndex);
-    String resolveNameXText(NameXPtg ptg);
-    Ptg[] getFormulaTokens(EvaluationCell cell);
-    UDFFinder getUDFFinder();
-    
-    /**
-     * Propagated from {@link WorkbookEvaluator#clearAllCachedResultValues()} to clear locally cached data.
-     * Implementations must call the same method on all referenced {@link EvaluationSheet} instances, as well as clearing local caches.
-     * @see WorkbookEvaluator#clearAllCachedResultValues()
-     * 
-     * @since POI 3.15 beta 3
-     */
-    public void clearAllCachedResultValues();
-
-    class ExternalSheet {
-        private final String _workbookName;
-        private final String _sheetName;
-
-        public ExternalSheet(String workbookName, String sheetName) {
-            _workbookName = workbookName;
-            _sheetName = sheetName;
-        }
-        public String getWorkbookName() {
-            return _workbookName;
-        }
-        public String getSheetName() {
-            return _sheetName;
-        }
-    }
-    class ExternalSheetRange extends ExternalSheet {
-        private final String _lastSheetName;
-        public ExternalSheetRange(String workbookName, String firstSheetName, String lastSheetName) {
-            super(workbookName, firstSheetName);
-            this._lastSheetName = lastSheetName;
-        }
-        
-        public String getFirstSheetName() {
-            return getSheetName();
-        }
-        public String getLastSheetName() {
-            return _lastSheetName;
-        }
-    }
-    class ExternalName {
-        private final String _nameName;
-        private final int _nameNumber;
-        private final int _ix;
-
-        public ExternalName(String nameName, int nameNumber, int ix) {
-            _nameName = nameName;
-            _nameNumber = nameNumber;
-            _ix = ix;
-        }
-        public String getName() {
-            return _nameName;
-        }
-        public int getNumber() {
-            return _nameNumber;
-        }
-        public int getIx() {
-            return _ix;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java b/trunk/src/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
deleted file mode 100644
index ce67dad..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-/**
- * Should be implemented by any {@link org.apache.poi.ss.formula.ptg.Ptg} subclass that needs has an extern sheet index <br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-public interface ExternSheetReferenceToken {
-	int getExternSheetIndex();
-	/**
-	 * @return formula text for this reference token without the qualifying sheet name
-	 */
-	String format2DRefAsString();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/Formula.java b/trunk/src/java/org/apache/poi/ss/formula/Formula.java
deleted file mode 100644
index 9f4f25e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/Formula.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.Arrays;
-
-import org.apache.poi.ss.formula.ptg.ExpPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.TblPtg;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Encapsulates an encoded formula token array.
- *
- * @author Josh Micich
- */
-public class Formula {
-
-	private static final Formula EMPTY = new Formula(new byte[0], 0);
-
-	/** immutable */
-	private final byte[] _byteEncoding;
-	private final int _encodedTokenLen;
-
-	private Formula(byte[] byteEncoding, int encodedTokenLen) {
-		_byteEncoding = byteEncoding.clone();
-		_encodedTokenLen = encodedTokenLen;
-//		if (false) { // set to true to eagerly check Ptg decoding
-//			LittleEndianByteArrayInputStream in = new LittleEndianByteArrayInputStream(byteEncoding);
-//			Ptg.readTokens(encodedTokenLen, in);
-//			int nUnusedBytes = _byteEncoding.length - in.getReadIndex();
-//			if (nUnusedBytes > 0) {
-//				// TODO - this seems to occur when IntersectionPtg is present
-//				// This example file "IntersectionPtg.xls"
-//				// used by test: TestIntersectionPtg.testReading()
-//				// has 10 bytes unused at the end of the formula
-//				// 10 extra bytes are just 0x01 and 0x00
-//				System.out.println(nUnusedBytes + " unused bytes at end of formula");
-//			}
-//		}
-	}
-	/**
-	 * Convenience method for {@link #read(int, LittleEndianInput, int)}
-	 */
-	public static Formula read(int encodedTokenLen, LittleEndianInput in) {
-		return read(encodedTokenLen, in, encodedTokenLen);
-	}
-	/**
-	 * When there are no array constants present, <tt>encodedTokenLen</tt>==<tt>totalEncodedLen</tt>
-	 * @param encodedTokenLen number of bytes in the stream taken by the plain formula tokens
-	 * @param totalEncodedLen the total number of bytes in the formula (includes trailing encoding
-	 * for array constants, but does not include 2 bytes for initial <tt>ushort encodedTokenLen</tt> field.
-	 * @return A new formula object as read from the stream.  Possibly empty, never <code>null</code>.
-	 */
-	public static Formula read(int encodedTokenLen, LittleEndianInput in, int totalEncodedLen) {
-		byte[] byteEncoding = new byte[totalEncodedLen];
-		in.readFully(byteEncoding);
-		return new Formula(byteEncoding, encodedTokenLen);
-	}
-
-	public Ptg[] getTokens() {
-		LittleEndianInput in = new LittleEndianByteArrayInputStream(_byteEncoding);
-		return Ptg.readTokens(_encodedTokenLen, in);
-	}
-	/**
-	 * Writes  The formula encoding is includes:
-	 * <ul>
-	 * <li>ushort tokenDataLen</li>
-	 * <li>tokenData</li>
-	 * <li>arrayConstantData (if present)</li>
-	 * </ul>
-	 */
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(_encodedTokenLen);
-		out.write(_byteEncoding);
-	}
-
-	public void serializeTokens(LittleEndianOutput out) {
-		out.write(_byteEncoding, 0, _encodedTokenLen);
-	}
-	public void serializeArrayConstantData(LittleEndianOutput out) {
-		int len = _byteEncoding.length-_encodedTokenLen;
-		out.write(_byteEncoding, _encodedTokenLen, len);
-	}
-
-
-	/**
-	 * @return total formula encoding length.  The formula encoding includes:
-	 * <ul>
-	 * <li>ushort tokenDataLen</li>
-	 * <li>tokenData</li>
-	 * <li>arrayConstantData (optional)</li>
-	 * </ul>
-	 * Note - this value is different to <tt>tokenDataLength</tt>
-	 */
-	public int getEncodedSize() {
-		return 2 + _byteEncoding.length;
-	}
-	/**
-	 * This method is often used when the formula length does not appear immediately before
-	 * the encoded token data.
-	 *
-	 * @return the encoded length of the plain formula tokens.  This does <em>not</em> include
-	 * the leading ushort field, nor any trailing array constant data.
-	 */
-	public int getEncodedTokenSize() {
-		return _encodedTokenLen;
-	}
-
-	/**
-	 * Creates a {@link Formula} object from a supplied {@link Ptg} array.
-	 * Handles <code>null</code>s OK.
-	 * @param ptgs may be <code>null</code>
-	 * @return Never <code>null</code> (Possibly empty if the supplied <tt>ptgs</tt> is <code>null</code>)
-	 */
-	public static Formula create(Ptg[] ptgs) {
-		if (ptgs == null || ptgs.length < 1) {
-			return EMPTY;
-		}
-		int totalSize = Ptg.getEncodedSize(ptgs);
-		byte[] encodedData = new byte[totalSize];
-		Ptg.serializePtgs(ptgs, encodedData, 0);
-		int encodedTokenLen = Ptg.getEncodedSizeWithoutArrayData(ptgs);
-		return new Formula(encodedData, encodedTokenLen);
-	}
-	/**
-	 * Gets the {@link Ptg} array from the supplied {@link Formula}.
-	 * Handles <code>null</code>s OK.
-	 *
-	 * @param formula may be <code>null</code>
-	 * @return possibly <code>null</code> (if the supplied <tt>formula</tt> is <code>null</code>)
-	 */
-	public static Ptg[] getTokens(Formula formula) {
-		if (formula == null) {
-			return null;
-		}
-		return formula.getTokens();
-	}
-
-	public Formula copy() {
-		// OK to return this because immutable
-		return this;
-	}
-
-	/**
-	 * Gets the locator for the corresponding {@link org.apache.poi.hssf.record.SharedFormulaRecord},
-     * {@link org.apache.poi.hssf.record.ArrayRecord} or {@link org.apache.poi.hssf.record.TableRecord}
-     * if this formula belongs to such a grouping.  The {@link CellReference}
-	 * returned by this method will  match the top left corner of the range of that grouping.
-	 * The return value is usually not the same as the location of the cell containing this formula.
-	 *
-	 * @return the firstRow & firstColumn of an array formula or shared formula that this formula
-	 * belongs to.  <code>null</code> if this formula is not part of an array or shared formula.
-	 */
-	public CellReference getExpReference() {
-		byte[] data = _byteEncoding;
-		if (data.length != 5) {
-			// tExp and tTbl are always 5 bytes long, and the only ptg in the formula
-			return null;
-		}
-		switch (data[0]) {
-			case ExpPtg.sid:
-				break;
-			case TblPtg.sid:
-				break;
-			default:
-				return null;
-		}
-		int firstRow = LittleEndian.getUShort(data, 1);
-		int firstColumn = LittleEndian.getUShort(data, 3);
-		return new CellReference(firstRow, firstColumn);
-	}
-	public boolean isSame(Formula other) {
-		return Arrays.equals(_byteEncoding, other._byteEncoding);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCache.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCache.java
deleted file mode 100644
index 63a1da1..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCache.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * 
- * @author Josh Micich
- */
-final class FormulaCellCache {
-
-	static interface IEntryOperation {
-		void processEntry(FormulaCellCacheEntry entry);
-	}
-
-	private final Map<Object, FormulaCellCacheEntry> _formulaEntriesByCell;
-
-	public FormulaCellCache() {
-		// assumes the object returned by EvaluationCell.getIdentityKey() has a well behaved hashCode+equals
-		_formulaEntriesByCell = new HashMap<Object, FormulaCellCacheEntry>();
-	}
-
-	public CellCacheEntry[] getCacheEntries() {
-
-		FormulaCellCacheEntry[] result = new FormulaCellCacheEntry[_formulaEntriesByCell.size()];
-		_formulaEntriesByCell.values().toArray(result);
-		return result;
-	}
-
-	public void clear() {
-		_formulaEntriesByCell.clear();
-	}
-
-	/**
-	 * @return <code>null</code> if not found
-	 */
-	public FormulaCellCacheEntry get(EvaluationCell cell) {
-		return _formulaEntriesByCell.get(cell.getIdentityKey());
-	}
-
-	public void put(EvaluationCell cell, FormulaCellCacheEntry entry) {
-		_formulaEntriesByCell.put(cell.getIdentityKey(), entry);
-	}
-
-	public FormulaCellCacheEntry remove(EvaluationCell cell) {
-		return _formulaEntriesByCell.remove(cell.getIdentityKey());
-	}
-
-	public void applyOperation(IEntryOperation operation) {
-		Iterator<FormulaCellCacheEntry> i = _formulaEntriesByCell.values().iterator();
-		while (i.hasNext()) {
-			operation.processEntry(i.next());
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
deleted file mode 100644
index 0561956..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.FormulaUsedBlankCellSet.BookSheetKey;
-
-
-/**
- * Stores the cached result of a formula evaluation, along with the set of sensitive input cells
- */
-final class FormulaCellCacheEntry extends CellCacheEntry {
-	
-	/**
-	 * Cells 'used' in the current evaluation of the formula corresponding to this cache entry
-	 *
-	 * If any of the following cells change, this cache entry needs to be cleared
-	 */
-	private CellCacheEntry[] _sensitiveInputCells;
-
-	private FormulaUsedBlankCellSet _usedBlankCellGroup;
-
-	public FormulaCellCacheEntry() {
-		// leave fields un-set
-	}
-	
-	public boolean isInputSensitive() {
-		if (_sensitiveInputCells != null) {
-			if (_sensitiveInputCells.length > 0 ) {
-				return true;
-			}
-		}
-		return _usedBlankCellGroup == null ? false : !_usedBlankCellGroup.isEmpty();
-	}
-
-	public void setSensitiveInputCells(CellCacheEntry[] sensitiveInputCells) {
-		// need to tell all cells that were previously used, but no longer are, 
-		// that they are not consumed by this cell any more
-	    if (sensitiveInputCells == null) {
-            _sensitiveInputCells = null;
-	        changeConsumingCells(CellCacheEntry.EMPTY_ARRAY);
-	    } else {
-	        _sensitiveInputCells = sensitiveInputCells.clone();
-	        changeConsumingCells(_sensitiveInputCells);
-	    }
-	}
-
-	public void clearFormulaEntry() {
-		CellCacheEntry[] usedCells = _sensitiveInputCells;
-		if (usedCells != null) {
-			for (int i = usedCells.length-1; i>=0; i--) {
-				usedCells[i].clearConsumingCell(this);
-			}
-		}
-		_sensitiveInputCells = null;
-		clearValue();
-	}
-	
-	private void changeConsumingCells(CellCacheEntry[] usedCells) {
-
-		CellCacheEntry[] prevUsedCells = _sensitiveInputCells;
-		int nUsed = usedCells.length;
-		for (int i = 0; i < nUsed; i++) {
-			usedCells[i].addConsumingCell(this);
-		}
-		if (prevUsedCells == null) {
-			return;
-		}
-		int nPrevUsed = prevUsedCells.length;
-		if (nPrevUsed < 1) {
-			return;
-		}
-		Set<CellCacheEntry> usedSet;
-		if (nUsed < 1) {
-			usedSet = Collections.emptySet();
-		} else {
-			usedSet = new HashSet<CellCacheEntry>(nUsed * 3 / 2);
-			for (int i = 0; i < nUsed; i++) {
-				usedSet.add(usedCells[i]);
-			}
-		}
-		for (int i = 0; i < nPrevUsed; i++) {
-			CellCacheEntry prevUsed = prevUsedCells[i];
-			if (!usedSet.contains(prevUsed)) {
-				// previously was used by cellLoc, but not anymore
-				prevUsed.clearConsumingCell(this);
-			}
-		}
-	}
-
-	public void updateFormulaResult(ValueEval result, CellCacheEntry[] sensitiveInputCells, FormulaUsedBlankCellSet usedBlankAreas) {
-		updateValue(result);
-		setSensitiveInputCells(sensitiveInputCells);
-		_usedBlankCellGroup = usedBlankAreas;
-	}
-
-	public void notifyUpdatedBlankCell(BookSheetKey bsk, int rowIndex, int columnIndex, IEvaluationListener evaluationListener) {
-		if (_usedBlankCellGroup != null) {
-			if (_usedBlankCellGroup.containsCell(bsk, rowIndex, columnIndex)) {
-				clearFormulaEntry();
-				recurseClearCachedFormulaResults(evaluationListener);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
deleted file mode 100644
index 9a40cbc..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-/**
- * A custom implementation of {@link java.util.HashSet} in order to reduce memory consumption.
- *
- * Profiling tests (Oct 2008) have shown that each element {@link FormulaCellCacheEntry} takes
- * around 32 bytes to store in a HashSet, but around 6 bytes to store here.  For Spreadsheets with
- * thousands of formula cells with multiple interdependencies, the savings can be very significant.
- *
- * @author Josh Micich
- */
-final class FormulaCellCacheEntrySet {
-	private static final FormulaCellCacheEntry[] EMPTY_ARRAY = { };
-
-	private int _size;
-	private FormulaCellCacheEntry[] _arr;
-
-	public FormulaCellCacheEntrySet() {
-		_arr = EMPTY_ARRAY;
-	}
-
-	public FormulaCellCacheEntry[] toArray() {
-		int nItems = _size;
-		if (nItems < 1) {
-			return EMPTY_ARRAY;
-		}
-		FormulaCellCacheEntry[] result = new FormulaCellCacheEntry[nItems];
-		int j=0;
-		for(int i=0; i<_arr.length; i++) {
-			FormulaCellCacheEntry cce = _arr[i];
-			if (cce != null) {
-				result[j++] = cce;
-			}
-		}
-		if (j!= nItems) {
-			throw new IllegalStateException("size mismatch");
-		}
-		return result;
-	}
-
-
-	public void add(CellCacheEntry cce) {
-		if (_size * 3 >= _arr.length * 2) {
-			// re-hash
-			FormulaCellCacheEntry[] prevArr = _arr;
-			FormulaCellCacheEntry[] newArr = new FormulaCellCacheEntry[4 + _arr.length * 3 / 2]; // grow 50%
-			for(int i=0; i<prevArr.length; i++) {
-				FormulaCellCacheEntry prevCce = _arr[i];
-				if (prevCce != null) {
-					addInternal(newArr, prevCce);
-				}
-			}
-			_arr = newArr;
-		}
-		if (addInternal(_arr, cce)) {
-			_size++;
-		}
-	}
-
-
-	private static boolean addInternal(CellCacheEntry[] arr, CellCacheEntry cce) {
-		int startIx = Math.abs(cce.hashCode() % arr.length);
-
-		for(int i=startIx; i<arr.length; i++) {
-			CellCacheEntry item = arr[i];
-			if (item == cce) {
-				// already present
-				return false;
-			}
-			if (item == null) {
-				arr[i] = cce;
-				return true;
-			}
-		}
-		for(int i=0; i<startIx; i++) {
-			CellCacheEntry item = arr[i];
-			if (item == cce) {
-				// already present
-				return false;
-			}
-			if (item == null) {
-				arr[i] = cce;
-				return true;
-			}
-		}
-		throw new IllegalStateException("No empty space found");
-	}
-
-	public boolean remove(CellCacheEntry cce) {
-		FormulaCellCacheEntry[] arr = _arr;
-
-		if (_size * 3 < _arr.length && _arr.length > 8) {
-			// re-hash
-			boolean found = false;
-			FormulaCellCacheEntry[] prevArr = _arr;
-			FormulaCellCacheEntry[] newArr = new FormulaCellCacheEntry[_arr.length / 2]; // shrink 50%
-			for(int i=0; i<prevArr.length; i++) {
-				FormulaCellCacheEntry prevCce = _arr[i];
-				if (prevCce != null) {
-					if (prevCce == cce) {
-						found=true;
-						_size--;
-						// skip it
-						continue;
-					}
-					addInternal(newArr, prevCce);
-				}
-			}
-			_arr = newArr;
-			return found;
-		}
-		// else - usual case
-		// delete single element (without re-hashing)
-
-		int startIx = Math.abs(cce.hashCode() % arr.length);
-
-		// note - can't exit loops upon finding null because of potential previous deletes
-		for(int i=startIx; i<arr.length; i++) {
-			FormulaCellCacheEntry item = arr[i];
-			if (item == cce) {
-				// found it
-				arr[i] = null;
-				_size--;
-				return true;
-			}
-		}
-		for(int i=0; i<startIx; i++) {
-			FormulaCellCacheEntry item = arr[i];
-			if (item == cce) {
-				// found it
-				arr[i] = null;
-				_size--;
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaParseException.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaParseException.java
deleted file mode 100644
index 4b1040f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaParseException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-/**
- * This exception thrown when a supplied formula has incorrect syntax (or syntax currently not
- * supported by POI).  It  is primarily used by test code to confirm specific parsing exceptions.
- * Application code should also handle this exception if it potentially supplies formula text
- * that is not guaranteed to be well-formed.
- *
- * @author Josh Micich
- */
-public final class FormulaParseException extends RuntimeException {
-
-	FormulaParseException(String msg) {
-		super(msg);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java
deleted file mode 100644
index 6caf8e1..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java
+++ /dev/null
@@ -1,2012 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.constant.ErrorConstant;
-import org.apache.poi.ss.formula.function.FunctionMetadata;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.AddPtg;
-import org.apache.poi.ss.formula.ptg.Area3DPxg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.ArrayPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.BoolPtg;
-import org.apache.poi.ss.formula.ptg.ConcatPtg;
-import org.apache.poi.ss.formula.ptg.DividePtg;
-import org.apache.poi.ss.formula.ptg.EqualPtg;
-import org.apache.poi.ss.formula.ptg.ErrPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.GreaterEqualPtg;
-import org.apache.poi.ss.formula.ptg.GreaterThanPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.IntersectionPtg;
-import org.apache.poi.ss.formula.ptg.LessEqualPtg;
-import org.apache.poi.ss.formula.ptg.LessThanPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.MissingArgPtg;
-import org.apache.poi.ss.formula.ptg.MultiplyPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.NameXPxg;
-import org.apache.poi.ss.formula.ptg.NotEqualPtg;
-import org.apache.poi.ss.formula.ptg.NumberPtg;
-import org.apache.poi.ss.formula.ptg.OperandPtg;
-import org.apache.poi.ss.formula.ptg.OperationPtg;
-import org.apache.poi.ss.formula.ptg.ParenthesisPtg;
-import org.apache.poi.ss.formula.ptg.PercentPtg;
-import org.apache.poi.ss.formula.ptg.PowerPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RangePtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.apache.poi.ss.formula.ptg.SubtractPtg;
-import org.apache.poi.ss.formula.ptg.UnaryMinusPtg;
-import org.apache.poi.ss.formula.ptg.UnaryPlusPtg;
-import org.apache.poi.ss.formula.ptg.UnionPtg;
-import org.apache.poi.ss.formula.ptg.ValueOperatorPtg;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Table;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.CellReference.NameType;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class parses a formula string into a List of tokens in RPN order.
- * Inspired by
- *           Lets Build a Compiler, by Jack Crenshaw
- * BNF for the formula expression is :
- * <expression> ::= <term> [<addop> <term>]*
- * <term> ::= <factor>  [ <mulop> <factor> ]*
- * <factor> ::= <number> | (<expression>) | <cellRef> | <function>
- * <function> ::= <functionName> ([expression [, expression]*])
- * <p/>
- * For POI internal use only
- * <p/>
- */
-@Internal
-public final class FormulaParser {
-    private final static POILogger log = POILogFactory.getLogger(FormulaParser.class);
-    private final String _formulaString;
-    private final int _formulaLength;
-    /** points at the next character to be read (after the {@link #look} char) */
-    private int _pointer;
-
-    private ParseNode _rootNode;
-
-    private final static char TAB = '\t'; // HSSF + XSSF
-    private final static char CR = '\r';  // Normally just XSSF
-    private final static char LF = '\n';  // Normally just XSSF
-
-    /**
-     * Lookahead Character.
-     * gets value '\0' when the input string is exhausted
-     */
-    private char look;
-
-    /**
-     * Tracks whether the run of whitespace preceding "look" could be an
-     * intersection operator.  See GetChar.
-     */
-    private boolean _inIntersection = false;
-
-    private final FormulaParsingWorkbook _book;
-    private final SpreadsheetVersion _ssVersion;
-
-    private final int _sheetIndex;
-    private final int _rowIndex; // 0-based
-
-
-    /**
-     * Create the formula parser, with the string that is to be
-     *  parsed against the supplied workbook.
-     * A later call the parse() method to return ptg list in
-     *  rpn order, then call the getRPNPtg() to retrieve the
-     *  parse results.
-     * This class is recommended only for single threaded use.
-     *
-     * If you have a {@link org.apache.poi.hssf.usermodel.HSSFWorkbook}, and not a
-     *  {@link org.apache.poi.hssf.model.Workbook}, then use the convenience method on
-     *  {@link org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator}
-     */
-    private FormulaParser(String formula, FormulaParsingWorkbook book, int sheetIndex, int rowIndex) {
-        _formulaString = formula;
-        _pointer=0;
-        _book = book;
-        _ssVersion = book == null ? SpreadsheetVersion.EXCEL97 : book.getSpreadsheetVersion();
-        _formulaLength = _formulaString.length();
-        _sheetIndex = sheetIndex;
-        _rowIndex = rowIndex;
-    }
-
-    /**
-     * Parse a formula into an array of tokens
-     * Side effect: creates name ({@link org.apache.poi.ss.usermodel.Workbook#createName})
-     *     if formula contains unrecognized names (names are likely UDFs)
-     *
-     * @param formula     the formula to parse
-     * @param workbook    the parent workbook
-     * @param formulaType the type of the formula
-     * @param sheetIndex  the 0-based index of the sheet this formula belongs to.
-     *     The sheet index is required to resolve sheet-level names. <code>-1</code> means that
-     *     the scope of the name will be ignored and  the parser will match names only by name
-     * @param rowIndex  - the related cell's row index in 0-based form (-1 if the formula is not cell related)
-     *                     used to handle structured references that have the "#This Row" quantifier.
-     *                    Use rowIndex=-1 or {@link #parseStructuredReference(String, FormulaParsingWorkbook, int)} if formula
-     *                    does not contain structured references.
-     *
-     * @return array of parsed tokens
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     */
-    public static Ptg[] parse(String formula, FormulaParsingWorkbook workbook, FormulaType formulaType, int sheetIndex, int rowIndex) {
-        FormulaParser fp = new FormulaParser(formula, workbook, sheetIndex, rowIndex);
-        fp.parse();
-        return fp.getRPNPtg(formulaType);
-    }
-
-    /**
-     * Parse a formula into an array of tokens
-     * Side effect: creates name ({@link org.apache.poi.ss.usermodel.Workbook#createName})
-     *     if formula contains unrecognized names (names are likely UDFs)
-     *
-     * @param formula     the formula to parse
-     * @param workbook    the parent workbook
-     * @param formulaType the type of the formula
-     * @param sheetIndex  the 0-based index of the sheet this formula belongs to.
-     *     The sheet index is required to resolve sheet-level names. <code>-1</code> means that
-     *     the scope of the name will be ignored and  the parser will match names only by name
-     *
-     * @return array of parsed tokens
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     */
-    public static Ptg[] parse(String formula, FormulaParsingWorkbook workbook, FormulaType formulaType, int sheetIndex) {
-        return parse(formula, workbook, formulaType, sheetIndex, -1);
-    }
-
-    /**
-     * Parse a structured reference. Converts the structured
-     *  reference to the area that represent it.
-     *
-     * @param tableText - The structured reference text
-     * @param workbook - the parent workbook
-     * @param rowIndex - the 0-based cell's row index ( used to handle "#This Row" quantifiers )
-     * @return the area that being represented by the structured reference.
-     */
-    public static Area3DPxg parseStructuredReference(String tableText, FormulaParsingWorkbook workbook, int rowIndex) {
-        final int sheetIndex = -1; //don't care?
-        Ptg[] arr = FormulaParser.parse(tableText, workbook, FormulaType.CELL, sheetIndex, rowIndex);
-        if (arr.length != 1 || !(arr[0] instanceof Area3DPxg) ) {
-            throw new IllegalStateException("Illegal structured reference");
-        }
-        return (Area3DPxg) arr[0];
-    }
-    
-    /** Read New Character From Input Stream */
-    private void GetChar() {
-        // The intersection operator is a space.  We track whether the run of 
-        // whitespace preceeding "look" counts as an intersection operator.  
-        if (IsWhite(look)) {
-            if (look == ' ') {
-                _inIntersection = true;
-            }
-        }
-        else {
-            _inIntersection = false;
-        }
-        
-        // Check to see if we've walked off the end of the string.
-        if (_pointer > _formulaLength) {
-            throw new RuntimeException("too far");
-        }
-        if (_pointer < _formulaLength) {
-            look=_formulaString.charAt(_pointer);
-        } else {
-            // Just return if so and reset 'look' to something to keep
-            // SkipWhitespace from spinning
-            look = (char)0;
-            _inIntersection = false;
-        }
-        _pointer++;
-        //System.out.println("Got char: "+ look);
-    }
-    private void resetPointer(int ptr) {
-        _pointer = ptr;
-        if (_pointer <= _formulaLength) {
-            look=_formulaString.charAt(_pointer-1);
-        } else {
-            // Just return if so and reset 'look' to something to keep
-            // SkipWhitespace from spinning
-            look = (char)0;
-        }
-    }
-
-    /** Report What Was Expected */
-    private RuntimeException expected(String s) {
-        String msg;
-
-        if (look == '=' && _formulaString.substring(0, _pointer-1).trim().length() < 1) {
-            msg = "The specified formula '" + _formulaString
-                + "' starts with an equals sign which is not allowed.";
-        } else {
-            msg = "Parse error near char " + (_pointer-1) + " '" + look + "'"
-                + " in specified formula '" + _formulaString + "'. Expected "
-                + s;
-        }
-        return new FormulaParseException(msg);
-    }
-
-    /** Recognize an Alpha Character */
-    private static boolean IsAlpha(char c) {
-        return Character.isLetter(c) || c == '$' || c=='_';
-    }
-
-    /** Recognize a Decimal Digit */
-    private static boolean IsDigit(char c) {
-        return Character.isDigit(c);
-    }
-
-    /** Recognize White Space */
-    private static boolean IsWhite( char c) {
-        return  c ==' ' || c== TAB || c == CR || c == LF;
-    }
-
-    /** Skip Over Leading White Space */
-    private void SkipWhite() {
-        while (IsWhite(look)) {
-            GetChar();
-        }
-    }
-
-    /**
-     *  Consumes the next input character if it is equal to the one specified otherwise throws an
-     *  unchecked exception. This method does <b>not</b> consume whitespace (before or after the
-     *  matched character).
-     */
-    private void Match(char x) {
-        if (look != x) {
-            throw expected("'" + x + "'");
-        }
-        GetChar();
-    }
-
-    /** Get a Number */
-    private String GetNum() {
-        StringBuffer value = new StringBuffer();
-
-        while (IsDigit(this.look)){
-            value.append(this.look);
-            GetChar();
-        }
-        return value.length() == 0 ? null : value.toString();
-    }
-
-    private ParseNode parseRangeExpression() {
-        ParseNode result = parseRangeable();
-        boolean hasRange = false;
-        while (look == ':') {
-            int pos = _pointer;
-            GetChar();
-            ParseNode nextPart = parseRangeable();
-            // Note - no range simplification here. An expr like "A1:B2:C3:D4:E5" should be
-            // grouped into area ref pairs like: "(A1:B2):(C3:D4):E5"
-            // Furthermore, Excel doesn't seem to simplify
-            // expressions like "Sheet1!A1:Sheet1:B2" into "Sheet1!A1:B2"
-
-            checkValidRangeOperand("LHS", pos, result);
-            checkValidRangeOperand("RHS", pos, nextPart);
-
-            ParseNode[] children = { result, nextPart, };
-            result = new ParseNode(RangePtg.instance, children);
-            hasRange = true;
-        }
-        if (hasRange) {
-            return augmentWithMemPtg(result);
-        }
-        return result;
-    }
-
-    private static ParseNode augmentWithMemPtg(ParseNode root) {
-        Ptg memPtg;
-        if (needsMemFunc(root)) {
-            memPtg = new MemFuncPtg(root.getEncodedSize());
-        } else {
-            memPtg = new MemAreaPtg(root.getEncodedSize());
-        }
-        return new ParseNode(memPtg, root);
-    }
-    /**
-     * From OOO doc: "Whenever one operand of the reference subexpression is a function,
-     *  a defined name, a 3D reference, or an external reference (and no error occurs),
-     *  a tMemFunc token is used"
-     *
-     */
-    private static boolean needsMemFunc(ParseNode root) {
-        Ptg token = root.getToken();
-        if (token instanceof AbstractFunctionPtg) {
-            return true;
-        }
-        if (token instanceof ExternSheetReferenceToken) { // 3D refs
-            return true;
-        }
-        if (token instanceof NamePtg || token instanceof NameXPtg) { // 3D refs
-            return true;
-        }
-
-        if (token instanceof OperationPtg || token instanceof ParenthesisPtg) {
-            // expect RangePtg, but perhaps also UnionPtg, IntersectionPtg etc
-            for(ParseNode child : root.getChildren()) {
-                if (needsMemFunc(child)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        if (token instanceof OperandPtg) {
-            return false;
-        }
-        if (token instanceof OperationPtg) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param currentParsePosition used to format a potential error message
-     */
-    private static void checkValidRangeOperand(String sideName, int currentParsePosition, ParseNode pn) {
-        if (!isValidRangeOperand(pn)) {
-            throw new FormulaParseException("The " + sideName
-                    + " of the range operator ':' at position "
-                    + currentParsePosition + " is not a proper reference.");
-        }
-    }
-
-    /**
-     * @return <code>false</code> if sub-expression represented the specified ParseNode definitely
-     * cannot appear on either side of the range (':') operator
-     */
-    private static boolean isValidRangeOperand(ParseNode a) {
-        Ptg tkn = a.getToken();
-        // Note - order is important for these instance-of checks
-        if (tkn instanceof OperandPtg) {
-            // notably cell refs and area refs
-            return true;
-        }
-
-        // next 2 are special cases of OperationPtg
-        if (tkn instanceof AbstractFunctionPtg) {
-            AbstractFunctionPtg afp = (AbstractFunctionPtg) tkn;
-            byte returnClass = afp.getDefaultOperandClass();
-            return Ptg.CLASS_REF == returnClass;
-        }
-        if (tkn instanceof ValueOperatorPtg) {
-            return false;
-        }
-        if (tkn instanceof OperationPtg) {
-            return true;
-        }
-
-        // one special case of ControlPtg
-        if (tkn instanceof ParenthesisPtg) {
-            // parenthesis Ptg should have only one child
-            return isValidRangeOperand(a.getChildren()[0]);
-        }
-
-        // one special case of ScalarConstantPtg
-        if (tkn == ErrPtg.REF_INVALID) {
-            return true;
-        }
-
-        // All other ControlPtgs and ScalarConstantPtgs cannot be used with ':'
-        return false;
-    }
-
-    /**
-     * Parses area refs (things which could be the operand of ':') and simple factors
-     * Examples
-     * <pre>
-     *   A$1
-     *   $A$1 :  $B1
-     *   A1 .......    C2
-     *   Sheet1 !$A1
-     *   a..b!A1
-     *   'my sheet'!A1
-     *   .my.sheet!A1
-     *   'my sheet':'my alt sheet'!A1
-     *   .my.sheet1:.my.sheet2!$B$2
-     *   my.named..range.
-     *   'my sheet'!my.named.range
-     *   .my.sheet!my.named.range
-     *   foo.bar(123.456, "abc")
-     *   123.456
-     *   "abc"
-     *   true
-     *   [Foo.xls]!$A$1
-     *   [Foo.xls]'my sheet'!$A$1
-     *   [Foo.xls]!my.named.range
-     * </pre>
-     *
-     */
-    private ParseNode parseRangeable() {
-        SkipWhite();
-        int savePointer = _pointer;
-        SheetIdentifier sheetIden = parseSheetName();
-        
-        if (sheetIden == null) {
-            resetPointer(savePointer);
-        } else {
-            SkipWhite();
-            savePointer = _pointer;
-        }
-
-        SimpleRangePart part1 = parseSimpleRangePart();
-        if (part1 == null) {
-            if (sheetIden != null) {
-                if(look == '#'){  // error ref like MySheet!#REF!
-                    return new ParseNode(ErrPtg.valueOf(parseErrorLiteral()));  
-                } else {
-                    // Is it a named range?
-                    String name = parseAsName();
-                    if (name.length() == 0) {
-                        throw new FormulaParseException("Cell reference or Named Range "
-                                + "expected after sheet name at index " + _pointer + ".");
-                    }
-                    Ptg nameXPtg = _book.getNameXPtg(name, sheetIden);
-                    if (nameXPtg == null) {
-                        throw new FormulaParseException("Specified name '" + name +
-                                "' for sheet " + sheetIden.asFormulaString() + " not found");
-                    }
-                    return new ParseNode(nameXPtg);
-                }
-            }
-            return parseNonRange(savePointer);
-        }
-        boolean whiteAfterPart1 = IsWhite(look);
-        if (whiteAfterPart1) {
-            SkipWhite();
-        }
-
-        if (look == ':') {
-            int colonPos = _pointer;
-            GetChar();
-            SkipWhite();
-            SimpleRangePart part2 = parseSimpleRangePart();
-            if (part2 != null && !part1.isCompatibleForArea(part2)) {
-                // second part is not compatible with an area ref e.g. S!A1:S!B2
-                // where S might be a sheet name (that looks like a column name)
-
-                part2 = null;
-            }
-            if (part2 == null) {
-                // second part is not compatible with an area ref e.g. A1:OFFSET(B2, 1, 2)
-                // reset and let caller use explicit range operator
-                resetPointer(colonPos);
-                if (!part1.isCell()) {
-                    String prefix = "";
-                    if (sheetIden != null) {
-                        prefix = "'" + sheetIden.getSheetIdentifier().getName() + '!';
-                    }
-                    throw new FormulaParseException(prefix + part1.getRep() + "' is not a proper reference.");
-                }
-            }
-            return createAreaRefParseNode(sheetIden, part1, part2);
-        }
-
-        if (look == '.') {
-            GetChar();
-            int dotCount = 1;
-            while (look =='.') {
-                dotCount ++;
-                GetChar();
-            }
-            boolean whiteBeforePart2 = IsWhite(look);
-
-            SkipWhite();
-            SimpleRangePart part2 = parseSimpleRangePart();
-            String part1And2 = _formulaString.substring(savePointer-1, _pointer-1);
-            if (part2 == null) {
-                if (sheetIden != null) {
-                    throw new FormulaParseException("Complete area reference expected after sheet name at index "
-                            + _pointer + ".");
-                }
-                return parseNonRange(savePointer);
-            }
-
-
-            if (whiteAfterPart1 || whiteBeforePart2) {
-                if (part1.isRowOrColumn() || part2.isRowOrColumn()) {
-                    // "A .. B" not valid syntax for "A:B"
-                    // and there's no other valid expression that fits this grammar
-                    throw new FormulaParseException("Dotted range (full row or column) expression '"
-                            + part1And2 + "' must not contain whitespace.");
-                }
-                return createAreaRefParseNode(sheetIden, part1, part2);
-            }
-
-            if (dotCount == 1 && part1.isRow() && part2.isRow()) {
-                // actually, this is looking more like a number
-                return parseNonRange(savePointer);
-            }
-
-            if (part1.isRowOrColumn() || part2.isRowOrColumn()) {
-                if (dotCount != 2) {
-                    throw new FormulaParseException("Dotted range (full row or column) expression '" + part1And2
-                            + "' must have exactly 2 dots.");
-                }
-            }
-            return createAreaRefParseNode(sheetIden, part1, part2);
-        }
-        if (part1.isCell() && isValidCellReference(part1.getRep())) {
-            return createAreaRefParseNode(sheetIden, part1, null);
-        }
-        if (sheetIden != null) {
-            throw new FormulaParseException("Second part of cell reference expected after sheet name at index "
-                    + _pointer + ".");
-        }
-
-        return parseNonRange(savePointer);
-    }
-
-
-    
-    private final static String specHeaders = "Headers";
-    private final static String specAll = "All";
-    private final static String specData = "Data";
-    private final static String specTotals = "Totals";
-    private final static String specThisRow = "This Row";
-    
-    /**
-     * Parses a structured reference, returns it as area reference.
-     * Examples:
-     * <pre>
-     * Table1[col]
-     * Table1[[#Totals],[col]]
-     * Table1[#Totals]
-     * Table1[#All]
-     * Table1[#Data]
-     * Table1[#Headers]
-     * Table1[#Totals]
-     * Table1[#This Row]
-     * Table1[[#All],[col]]
-     * Table1[[#Headers],[col]]
-     * Table1[[#Totals],[col]]
-     * Table1[[#All],[col1]:[col2]]
-     * Table1[[#Data],[col1]:[col2]]
-     * Table1[[#Headers],[col1]:[col2]]
-     * Table1[[#Totals],[col1]:[col2]]
-     * Table1[[#Headers],[#Data],[col2]]
-     * Table1[[#This Row], [col1]]
-     * Table1[ [col1]:[col2] ]
-     * </pre>
-     * @param tableName
-     * @return Area Reference for the given table
-     */
-    private ParseNode parseStructuredReference(String tableName) {
-        
-        if ( ! (_ssVersion.equals(SpreadsheetVersion.EXCEL2007)) ) {
-            throw new FormulaParseException("Structured references work only on XSSF (Excel 2007+)!");
-        }
-        Table tbl = _book.getTable(tableName);
-        if (tbl == null) {
-           throw new FormulaParseException("Illegal table name: '" + tableName + "'");
-        }
-        String sheetName = tbl.getSheetName();
-        
-        int startCol = tbl.getStartColIndex();
-        int endCol = tbl.getEndColIndex();
-        int startRow = tbl.getStartRowIndex();
-        int endRow = tbl.getEndRowIndex();
-        
-        // Do NOT return before done reading all the structured reference tokens from the input stream.
-        // Throwing exceptions is okay.
-        int savePtr0 = _pointer;
-        GetChar();
-        
-        boolean isTotalsSpec = false;
-        boolean isThisRowSpec = false;
-        boolean isDataSpec = false;
-        boolean isHeadersSpec = false;
-        boolean isAllSpec = false;
-        int nSpecQuantifiers = 0; // The number of special quantifiers
-        while (true) {
-            int savePtr1 = _pointer;
-            String specName = parseAsSpecialQuantifier();
-            if (specName == null) {
-                resetPointer(savePtr1);
-                break;
-            }
-            if (specName.equals(specAll)) {
-                isAllSpec = true;
-            } else if (specName.equals(specData)) {
-                isDataSpec = true;
-            } else if (specName.equals(specHeaders)) {
-                isHeadersSpec = true;
-            } else if (specName.equals(specThisRow)) {
-                isThisRowSpec = true;
-            } else if (specName.equals(specTotals)) {
-                isTotalsSpec  = true;
-            } else {
-                throw new FormulaParseException("Unknown special quantifier "+ specName);
-            }
-            nSpecQuantifiers++;
-            if (look == ','){
-                GetChar();
-            } else {
-                break;
-            }
-        }
-        boolean isThisRow = false;
-        SkipWhite();
-        if (look == '@') {
-            isThisRow = true;
-            GetChar();
-        }
-        // parse column quantifier
-        String startColumnName = null;
-        String endColumnName = null;
-        int nColQuantifiers = 0;
-        int savePtr1 = _pointer;
-        startColumnName = parseAsColumnQuantifier();
-        if (startColumnName == null) {
-            resetPointer(savePtr1);
-        } else {
-            nColQuantifiers++;
-            if (look == ','){
-                throw new FormulaParseException("The formula "+ _formulaString + "is illegal: you should not use ',' with column quantifiers");
-            } else if (look == ':') {
-                GetChar();
-                endColumnName = parseAsColumnQuantifier();
-                nColQuantifiers++;
-                if (endColumnName == null) {
-                    throw new FormulaParseException("The formula "+ _formulaString + "is illegal: the string after ':' must be column quantifier");
-                }
-            }
-        }
-        
-        if(nColQuantifiers == 0 && nSpecQuantifiers == 0){
-            resetPointer(savePtr0);
-            savePtr0 = _pointer;
-            startColumnName = parseAsColumnQuantifier();
-            if (startColumnName != null) {
-                nColQuantifiers++;
-            } else {
-                resetPointer(savePtr0);
-                String name = parseAsSpecialQuantifier();
-                if (name!=null) {
-                    if (name.equals(specAll)) {
-                        isAllSpec = true;
-                    } else if (name.equals(specData)) {
-                        isDataSpec = true;
-                    } else if (name.equals(specHeaders)) {
-                        isHeadersSpec = true;
-                    } else if (name.equals(specThisRow)) {
-                        isThisRowSpec = true;
-                    } else if (name.equals(specTotals)) {
-                        isTotalsSpec  = true;
-                    } else {
-                        throw new FormulaParseException("Unknown special quantifier "+ name);
-                    }
-                    nSpecQuantifiers++;
-                } else {
-                    throw new FormulaParseException("The formula "+ _formulaString + " is illegal");
-                }
-            }
-        } else {
-            Match(']');
-        }
-        // Done reading from input stream
-        // Ok to return now
-
-        if (isTotalsSpec && !tbl.isHasTotalsRow()) {
-            return new ParseNode(ErrPtg.REF_INVALID);
-        }
-        if ((isThisRow || isThisRowSpec) && (_rowIndex < startRow || endRow < _rowIndex)) {
-            // structured reference is trying to reference a row above or below the table with [#This Row] or [@]
-            if (_rowIndex >= 0) {
-                return new ParseNode(ErrPtg.VALUE_INVALID);
-            } else {
-                throw new FormulaParseException(
-                        "Formula contained [#This Row] or [@] structured reference but this row < 0. " + 
-                        "Row index must be specified for row-referencing structured references.");
-            }
-        }
-        
-        int actualStartRow = startRow;
-        int actualEndRow = endRow;
-        int actualStartCol = startCol;
-        int actualEndCol = endCol; 
-        if (nSpecQuantifiers > 0) {
-        //Selecting rows
-            if (nSpecQuantifiers == 1 && isAllSpec) {
-                //do nothing
-            } else if (isDataSpec && isHeadersSpec) {
-                if (tbl.isHasTotalsRow()) {
-                    actualEndRow = endRow - 1;
-                }
-            } else if (isDataSpec && isTotalsSpec) {
-                actualStartRow = startRow + 1;
-            } else if (nSpecQuantifiers == 1 && isDataSpec) {
-                actualStartRow = startRow + 1;
-                if (tbl.isHasTotalsRow()) {
-                    actualEndRow = endRow - 1;
-                }
-            } else if (nSpecQuantifiers == 1 && isHeadersSpec) {
-                actualEndRow = actualStartRow;
-            } else if (nSpecQuantifiers == 1 && isTotalsSpec) {
-                actualStartRow = actualEndRow;
-            } else if ((nSpecQuantifiers == 1 && isThisRowSpec) || isThisRow) {
-                actualStartRow = _rowIndex; //The rowNum is 0 based
-                actualEndRow = _rowIndex; 
-            } else {
-                throw new FormulaParseException("The formula "+ _formulaString + " is illegal");
-            }
-        } else {
-            if (isThisRow) { // there is a @
-                actualStartRow = _rowIndex; //The rowNum is 0 based
-                actualEndRow = _rowIndex; 
-            } else { // Really no special quantifiers
-                actualStartRow++;
-            }
-        }
-
-        //Selecting cols
-
-        if (nColQuantifiers == 2) {
-            if (startColumnName == null || endColumnName == null) {
-                throw new IllegalStateException("Fatal error");
-            }
-            int startIdx = tbl.findColumnIndex(startColumnName);
-            int endIdx = tbl.findColumnIndex(endColumnName);
-            if (startIdx == -1 || endIdx == -1) {
-                throw new FormulaParseException("One of the columns "+ startColumnName +", "+ endColumnName +" doesn't exist in table "+ tbl.getName()); 
-            } 
-            actualStartCol = startCol+ startIdx;
-            actualEndCol = startCol + endIdx;
-                
-        } else if (nColQuantifiers == 1 && !isThisRow) {
-            if (startColumnName == null) {
-                throw new IllegalStateException("Fatal error");
-            }
-            int idx = tbl.findColumnIndex(startColumnName);
-            if (idx == -1) {
-                throw new FormulaParseException("The column "+ startColumnName + " doesn't exist in table "+ tbl.getName());
-            }
-            actualStartCol = startCol + idx;
-            actualEndCol = actualStartCol;
-        }
-        CellReference topLeft = new CellReference(actualStartRow, actualStartCol);
-        CellReference bottomRight = new CellReference(actualEndRow, actualEndCol);
-        SheetIdentifier sheetIden = new SheetIdentifier( null, new NameIdentifier(sheetName, true));
-        Ptg ptg = _book.get3DReferencePtg(new AreaReference(topLeft, bottomRight), sheetIden);
-        return new ParseNode(ptg);
-    }
-    
-    /**
-     * Tries to parse the next as column - can contain whitespace
-     * Caller should save pointer.
-    */
-    private String parseAsColumnQuantifier() {
-        if ( look != '[') {
-            return null;
-        }
-        GetChar();
-        if (look == '#') {
-            return null;
-        }
-        if (look == '@') {
-            GetChar();
-        }
-        StringBuilder name = new StringBuilder();
-        while (look!=']') {
-           name.append(look);
-           GetChar();
-        }
-        Match(']');
-        return name.toString();
-    }    
-    /**
-     * Tries to parse the next as special quantifier
-     * Caller should save pointer.
-     */
-    private String parseAsSpecialQuantifier(){
-        if ( look != '[') {
-            return null;
-        }
-        GetChar();
-        if( look != '#') {
-            return null;
-        }
-        GetChar();
-        String name = parseAsName();
-        if ( name.equals("This")) {
-            name = name + ' ' + parseAsName();
-        }
-        Match(']');
-        return name;
-    }
-
-
-    /**
-     * Parses simple factors that are not primitive ranges or range components
-     * i.e. '!', ':'(and equiv '...') do not appear
-     * Examples
-     * <pre>
-     *   my.named...range.
-     *   foo.bar(123.456, "abc")
-     *   123.456
-     *   "abc"
-     *   true
-     * </pre>
-     */
-    private ParseNode parseNonRange(int savePointer) {
-        resetPointer(savePointer);
-
-        if (Character.isDigit(look)) {
-            return new ParseNode(parseNumber());
-        }
-        if (look == '"') {
-            return new ParseNode(new StringPtg(parseStringLiteral()));
-        }
-        
-        // from now on we can only be dealing with non-quoted identifiers
-        // which will either be named ranges or functions
-        String name = parseAsName();
-
-        if (look == '(') {
-            return function(name);
-        }
-        if(look == '['){
-            return parseStructuredReference(name);
-        }
-        if (name.equalsIgnoreCase("TRUE") || name.equalsIgnoreCase("FALSE")) {
-            return  new ParseNode(BoolPtg.valueOf(name.equalsIgnoreCase("TRUE")));
-        }
-        if (_book == null) {
-            // Only test cases omit the book (expecting it not to be needed)
-            throw new IllegalStateException("Need book to evaluate name '" + name + "'");
-        }
-        EvaluationName evalName = _book.getName(name, _sheetIndex);
-        if (evalName == null) {
-            throw new FormulaParseException("Specified named range '"
-                    + name + "' does not exist in the current workbook.");
-        }
-        if (evalName.isRange()) {
-            return new ParseNode(evalName.createPtg());
-        }
-        // TODO - what about NameX ?
-        throw new FormulaParseException("Specified name '"
-                + name + "' is not a range as expected.");
-    }
-    
-    private String parseAsName() {
-        StringBuilder sb = new StringBuilder();
-
-        // defined names may begin with a letter or underscore or backslash
-        if (!Character.isLetter(look) && look != '_' && look != '\\') {
-            throw expected("number, string, defined name, or data table");
-        }
-        while (isValidDefinedNameChar(look)) {
-            sb.append(look);
-            GetChar();
-        }
-        SkipWhite();
-        
-        return sb.toString();
-    }
-
-    /**
-     *
-     * @return <code>true</code> if the specified character may be used in a defined name
-     */
-    private static boolean isValidDefinedNameChar(char ch) {
-        if (Character.isLetterOrDigit(ch)) {
-            return true;
-        }
-        switch (ch) {
-            case '.':
-            case '_':
-            case '?':
-            case '\\': // of all things
-                return true;
-        }
-        return false;
-    }
-    
-    /**
-     *
-     * @param sheetIden may be <code>null</code>
-     * @param part1
-     * @param part2 may be <code>null</code>
-     */
-    private ParseNode createAreaRefParseNode(SheetIdentifier sheetIden, SimpleRangePart part1,
-            SimpleRangePart part2) throws FormulaParseException {
-        Ptg ptg;
-        if (part2 == null) {
-            CellReference cr = part1.getCellReference();
-            if (sheetIden == null) {
-                ptg = new RefPtg(cr);
-            } else {
-                ptg = _book.get3DReferencePtg(cr, sheetIden);
-            }
-        } else {
-            AreaReference areaRef = createAreaRef(part1, part2);
-
-            if (sheetIden == null) {
-                ptg = new AreaPtg(areaRef);
-            } else {
-                ptg = _book.get3DReferencePtg(areaRef, sheetIden);
-            }
-        }
-        return new ParseNode(ptg);
-    }
-
-    private AreaReference createAreaRef(SimpleRangePart part1, SimpleRangePart part2) {
-        if (!part1.isCompatibleForArea(part2)) {
-            throw new FormulaParseException("has incompatible parts: '"
-                    + part1.getRep() + "' and '" + part2.getRep() + "'.");
-        }
-        if (part1.isRow()) {
-            return AreaReference.getWholeRow(_ssVersion, part1.getRep(), part2.getRep());
-        }
-        if (part1.isColumn()) {
-            return AreaReference.getWholeColumn(_ssVersion, part1.getRep(), part2.getRep());
-        }
-        return new AreaReference(part1.getCellReference(), part2.getCellReference());
-    }
-
-    /**
-     * Matches a zero or one letter-runs followed by zero or one digit-runs.
-     * Either or both runs man optionally be prefixed with a single '$'.
-     * (copied+modified from {@link org.apache.poi.ss.util.CellReference#CELL_REF_PATTERN})
-     */
-    private static final Pattern CELL_REF_PATTERN = Pattern.compile("(\\$?[A-Za-z]+)?(\\$?[0-9]+)?");
-
-    /**
-     * Parses out a potential LHS or RHS of a ':' intended to produce a plain AreaRef.  Normally these are
-     * proper cell references but they could also be row or column refs like "$AC" or "10"
-     * @return <code>null</code> (and leaves {@link #_pointer} unchanged if a proper range part does not parse out
-     */
-    private SimpleRangePart parseSimpleRangePart() {
-        int ptr = _pointer-1; // TODO avoid StringIndexOutOfBounds
-        boolean hasDigits = false;
-        boolean hasLetters = false;
-        while (ptr < _formulaLength) {
-            char ch = _formulaString.charAt(ptr);
-            if (Character.isDigit(ch)) {
-                hasDigits = true;
-            } else if (Character.isLetter(ch)) {
-                hasLetters = true;
-            } else if (ch =='$' || ch =='_') {
-                //
-            } else {
-                break;
-            }
-            ptr++;
-        }
-        if (ptr <= _pointer-1) {
-            return null;
-        }
-        String rep = _formulaString.substring(_pointer-1, ptr);
-        if (!CELL_REF_PATTERN.matcher(rep).matches()) {
-            return null;
-        }
-        // Check range bounds against grid max
-        if (hasLetters && hasDigits) {
-            if (!isValidCellReference(rep)) {
-                return null;
-            }
-        } else if (hasLetters) {
-            if (!CellReference.isColumnWithinRange(rep.replace("$", ""), _ssVersion)) {
-                return null;
-            }
-        } else if (hasDigits) {
-            int i;
-            try {
-                i = Integer.parseInt(rep.replace("$", ""));
-            } catch (NumberFormatException e) {
-                return null;
-            }
-            if (i<1 || i>_ssVersion.getMaxRows()) {
-                return null;
-            }
-        } else {
-            // just dollars ? can this happen?
-            return null;
-        }
-
-
-        resetPointer(ptr+1); // stepping forward
-        return new SimpleRangePart(rep, hasLetters, hasDigits);
-    }
-
-
-    /**
-     * A1, $A1, A$1, $A$1, A, 1
-     */
-    private static final class SimpleRangePart {
-        private enum Type {
-            CELL, ROW, COLUMN;
-
-            public static Type get(boolean hasLetters, boolean hasDigits) {
-                if (hasLetters) {
-                    return hasDigits ? CELL : COLUMN;
-                }
-                if (!hasDigits) {
-                    throw new IllegalArgumentException("must have either letters or numbers");
-                }
-                return ROW;
-            }
-        }
-
-        private final Type _type;
-        private final String _rep;
-
-        public SimpleRangePart(String rep, boolean hasLetters, boolean hasNumbers) {
-            _rep = rep;
-            _type = Type.get(hasLetters, hasNumbers);
-        }
-
-        public boolean isCell() {
-            return _type == Type.CELL;
-        }
-
-        public boolean isRowOrColumn() {
-            return _type != Type.CELL;
-        }
-
-        public CellReference getCellReference() {
-            if (_type != Type.CELL) {
-                throw new IllegalStateException("Not applicable to this type");
-            }
-            return new CellReference(_rep);
-        }
-
-        public boolean isColumn() {
-            return _type == Type.COLUMN;
-        }
-
-        public boolean isRow() {
-            return _type == Type.ROW;
-        }
-
-        public String getRep() {
-            return _rep;
-        }
-
-        /**
-         * @return <code>true</code> if the two range parts can be combined in an
-         * {@link AreaPtg} ( Note - the explicit range operator (:) may still be valid
-         * when this method returns <code>false</code> )
-         */
-        public boolean isCompatibleForArea(SimpleRangePart part2) {
-            return _type == part2._type;
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder(64);
-            sb.append(getClass().getName()).append(" [");
-            sb.append(_rep);
-            sb.append("]");
-            return sb.toString();
-        }
-    }
-
-    /**
-     * Note - caller should reset {@link #_pointer} upon <code>null</code> result
-     * @return The sheet name as an identifier <code>null</code> if '!' is not found in the right place
-     */
-    private SheetIdentifier parseSheetName() {
-        String bookName;
-        if (look == '[') {
-            StringBuilder sb = new StringBuilder();
-            GetChar();
-            while (look != ']') {
-                sb.append(look);
-                GetChar();
-            }
-            GetChar();
-            bookName = sb.toString();
-        } else {
-            bookName = null;
-        }
-
-        if (look == '\'') {
-            StringBuffer sb = new StringBuffer();
-
-            Match('\'');
-            boolean done = look == '\'';
-            while(!done) {
-                sb.append(look);
-                GetChar();
-                if(look == '\'')
-                {
-                    Match('\'');
-                    done = look != '\'';
-                }
-            }
-
-            NameIdentifier iden = new NameIdentifier(sb.toString(), true);
-            // quoted identifier - can't concatenate anything more
-            SkipWhite();
-            if (look == '!') {
-                GetChar();
-                return new SheetIdentifier(bookName, iden);
-            }
-            // See if it's a multi-sheet range, eg Sheet1:Sheet3!A1
-            if (look == ':') {
-                return parseSheetRange(bookName, iden);
-            }
-            return null;
-        }
-
-        // unquoted sheet names must start with underscore or a letter
-        if (look =='_' || Character.isLetter(look)) {
-            StringBuilder sb = new StringBuilder();
-            // can concatenate idens with dots
-            while (isUnquotedSheetNameChar(look)) {
-                sb.append(look);
-                GetChar();
-            }
-            NameIdentifier iden = new NameIdentifier(sb.toString(), false);
-            SkipWhite();
-            if (look == '!') {
-                GetChar();
-                return new SheetIdentifier(bookName, iden);
-            }
-            // See if it's a multi-sheet range, eg Sheet1:Sheet3!A1
-            if (look == ':') {
-                return parseSheetRange(bookName, iden);
-            }
-            return null;
-        }
-        if (look == '!' && bookName != null) {
-            // Raw book reference, without a sheet
-            GetChar();
-            return new SheetIdentifier(bookName, null);
-        }
-        return null;
-    }
-    
-    /**
-     * If we have something that looks like [book]Sheet1: or 
-     *  Sheet1, see if it's actually a range eg Sheet1:Sheet2!
-     */
-    private SheetIdentifier parseSheetRange(String bookname, NameIdentifier sheet1Name) {
-        GetChar();
-        SheetIdentifier sheet2 = parseSheetName();
-        if (sheet2 != null) {
-           return new SheetRangeIdentifier(bookname, sheet1Name, sheet2.getSheetIdentifier());
-        }
-        return null;
-    }
-
-    /**
-     * very similar to {@link SheetNameFormatter#isSpecialChar(char)}
-     */
-    private static boolean isUnquotedSheetNameChar(char ch) {
-        if(Character.isLetterOrDigit(ch)) {
-            return true;
-        }
-        switch(ch) {
-            case '.': // dot is OK
-            case '_': // underscore is OK
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return <code>true</code> if the specified name is a valid cell reference
-     */
-    private boolean isValidCellReference(String str) {
-        //check range bounds against grid max
-        boolean result = CellReference.classifyCellReference(str, _ssVersion) == NameType.CELL;
-
-        if(result){
-            /**
-             * Check if the argument is a function. Certain names can be either a cell reference or a function name
-             * depending on the contenxt. Compare the following examples in Excel 2007:
-             * (a) LOG10(100) + 1
-             * (b) LOG10 + 1
-             * In (a) LOG10 is a name of a built-in function. In (b) LOG10 is a cell reference
-             */
-            boolean isFunc = FunctionMetadataRegistry.getFunctionByName(str.toUpperCase(Locale.ROOT)) != null;
-            if(isFunc){
-                int savePointer = _pointer;
-                resetPointer(_pointer + str.length());
-                SkipWhite();
-                // open bracket indicates that the argument is a function,
-                // the returning value should be false, i.e. "not a valid cell reference"
-                result = look != '(';
-                resetPointer(savePointer);
-            }
-        }
-        return result;
-    }
-
-
-    /**
-     * Note - Excel function names are 'case aware but not case sensitive'.  This method may end
-     * up creating a defined name record in the workbook if the specified name is not an internal
-     * Excel function, and has not been encountered before.
-     * 
-     * Side effect: creates workbook name if name is not recognized (name is probably a UDF)
-     *
-     * @param name case preserved function name (as it was entered/appeared in the formula).
-     */
-    private ParseNode function(String name) {
-        Ptg nameToken = null;
-        if(!AbstractFunctionPtg.isBuiltInFunctionName(name)) {
-            // user defined function
-            // in the token tree, the name is more or less the first argument
-
-            if (_book == null) {
-                // Only test cases omit the book (expecting it not to be needed)
-                throw new IllegalStateException("Need book to evaluate name '" + name + "'");
-            }
-            // Check to see if name is a named range in the workbook
-            EvaluationName hName = _book.getName(name, _sheetIndex);
-            if (hName != null) {
-                if (!hName.isFunctionName()) {
-                    throw new FormulaParseException("Attempt to use name '" + name
-                            + "' as a function, but defined name in workbook does not refer to a function");
-                }
-    
-                // calls to user-defined functions within the workbook
-                // get a Name token which points to a defined name record
-                nameToken = hName.createPtg();
-            } else {
-                // Check if name is an external names table
-                nameToken = _book.getNameXPtg(name, null);
-                if (nameToken == null) {
-                    // name is not an internal or external name
-                    if (log.check(POILogger.WARN)) {
-                        log.log(POILogger.WARN,
-                                "FormulaParser.function: Name '" + name + "' is completely unknown in the current workbook.");
-                    }
-                    // name is probably the name of an unregistered User-Defined Function
-                    switch (_book.getSpreadsheetVersion()) {
-                        case EXCEL97:
-                            // HSSFWorkbooks require a name to be added to Workbook defined names table
-                            addName(name);
-                            hName = _book.getName(name, _sheetIndex);
-                            nameToken = hName.createPtg();
-                            break;
-                        case EXCEL2007:
-                            // XSSFWorkbooks store formula names as strings.
-                            nameToken = new NameXPxg(name);
-                            break;
-                        default:
-                            throw new IllegalStateException("Unexpected spreadsheet version: " + _book.getSpreadsheetVersion().name());
-                    }
-                }
-            }
-        }
-
-        Match('(');
-        ParseNode[] args = Arguments();
-        Match(')');
-
-        return getFunction(name, nameToken, args);
-    }
-    
-    /**
-     * Adds a name (named range or user defined function) to underlying workbook's names table
-     * @param functionName
-     */
-    private final void addName(String functionName) {
-        final Name name = _book.createName();
-        name.setFunction(true);
-        name.setNameName(functionName);
-        name.setSheetIndex(_sheetIndex);
-    }
-
-    /**
-     * Generates the variable function ptg for the formula.
-     * <p>
-     * For IF Formulas, additional PTGs are added to the tokens
-     * @param name a {@link NamePtg} or {@link NameXPtg} or <code>null</code>
-     * @return Ptg a null is returned if we're in an IF formula, it needs extreme manipulation and is handled in this function
-     */
-    private ParseNode getFunction(String name, Ptg namePtg, ParseNode[] args) {
-
-        FunctionMetadata fm = FunctionMetadataRegistry.getFunctionByName(name.toUpperCase(Locale.ROOT));
-        int numArgs = args.length;
-        if(fm == null) {
-            if (namePtg == null) {
-                throw new IllegalStateException("NamePtg must be supplied for external functions");
-            }
-            // must be external function
-            ParseNode[] allArgs = new ParseNode[numArgs+1];
-            allArgs[0] = new ParseNode(namePtg);
-            System.arraycopy(args, 0, allArgs, 1, numArgs);
-            return new ParseNode(FuncVarPtg.create(name, numArgs+1), allArgs);
-        }
-
-        if (namePtg != null) {
-            throw new IllegalStateException("NamePtg no applicable to internal functions");
-        }
-        boolean isVarArgs = !fm.hasFixedArgsLength();
-        int funcIx = fm.getIndex();
-        if (funcIx == FunctionMetadataRegistry.FUNCTION_INDEX_SUM && args.length == 1) {
-            // Excel encodes the sum of a single argument as tAttrSum
-            // POI does the same for consistency, but this is not critical
-            return new ParseNode(AttrPtg.getSumSingle(), args);
-            // The code below would encode tFuncVar(SUM) which seems to do no harm
-        }
-        validateNumArgs(args.length, fm);
-
-        AbstractFunctionPtg retval;
-        if(isVarArgs) {
-            retval = FuncVarPtg.create(name, numArgs);
-        } else {
-            retval = FuncPtg.create(funcIx);
-        }
-        return new ParseNode(retval, args);
-    }
-
-    private void validateNumArgs(int numArgs, FunctionMetadata fm) {
-        if(numArgs < fm.getMinParams()) {
-            String msg = "Too few arguments to function '" + fm.getName() + "'. ";
-            if(fm.hasFixedArgsLength()) {
-                msg += "Expected " + fm.getMinParams();
-            } else {
-                msg += "At least " + fm.getMinParams() + " were expected";
-            }
-            msg += " but got " + numArgs + ".";
-            throw new FormulaParseException(msg);
-        }
-        //the maximum number of arguments depends on the Excel version
-        int maxArgs;
-        if (fm.hasUnlimitedVarags()) {
-            if(_book != null) {
-                maxArgs = _book.getSpreadsheetVersion().getMaxFunctionArgs();
-            } else {
-                //_book can be omitted by test cases
-                maxArgs = fm.getMaxParams(); // just use BIFF8
-            }
-        } else {
-            maxArgs = fm.getMaxParams();
-        }
-
-        if(numArgs > maxArgs) {
-            String msg = "Too many arguments to function '" + fm.getName() + "'. ";
-            if(fm.hasFixedArgsLength()) {
-                msg += "Expected " + maxArgs;
-            } else {
-                msg += "At most " + maxArgs + " were expected";
-            }
-            msg += " but got " + numArgs + ".";
-            throw new FormulaParseException(msg);
-       }
-    }
-
-    private static boolean isArgumentDelimiter(char ch) {
-        return ch ==  ',' || ch == ')';
-    }
-
-    /** get arguments to a function */
-    private ParseNode[] Arguments() {
-        //average 2 args per function
-        List<ParseNode> temp = new ArrayList<ParseNode>(2);
-        SkipWhite();
-        if(look == ')') {
-            return ParseNode.EMPTY_ARRAY;
-        }
-
-        boolean missedPrevArg = true;
-        while (true) {
-            SkipWhite();
-            if (isArgumentDelimiter(look)) {
-                if (missedPrevArg) {
-                    temp.add(new ParseNode(MissingArgPtg.instance));
-                }
-                if (look == ')') {
-                    break;
-                }
-                Match(',');
-                missedPrevArg = true;
-                continue;
-            }
-            temp.add(comparisonExpression());
-            missedPrevArg = false;
-            SkipWhite();
-            if (!isArgumentDelimiter(look)) {
-                throw expected("',' or ')'");
-            }
-        }
-        ParseNode[] result = new ParseNode[temp.size()];
-        temp.toArray(result);
-        return result;
-    }
-
-   /** Parse and Translate a Math Factor  */
-    private ParseNode powerFactor() {
-        ParseNode result = percentFactor();
-        while(true) {
-            SkipWhite();
-            if(look != '^') {
-                return result;
-            }
-            Match('^');
-            ParseNode other = percentFactor();
-            result = new ParseNode(PowerPtg.instance, result, other);
-        }
-    }
-
-    private ParseNode percentFactor() {
-        ParseNode result = parseSimpleFactor();
-        while(true) {
-            SkipWhite();
-            if(look != '%') {
-                return result;
-            }
-            Match('%');
-            result = new ParseNode(PercentPtg.instance, result);
-        }
-    }
-
-
-    /**
-     * factors (without ^ or % )
-     */
-    private ParseNode parseSimpleFactor() {
-        SkipWhite();
-        switch(look) {
-            case '#':
-                return new ParseNode(ErrPtg.valueOf(parseErrorLiteral()));
-            case '-':
-                Match('-');
-                return parseUnary(false);
-            case '+':
-                Match('+');
-                return parseUnary(true);
-            case '(':
-                Match('(');
-                ParseNode inside = unionExpression();
-                Match(')');
-                return new ParseNode(ParenthesisPtg.instance, inside);
-            case '"':
-                return new ParseNode(new StringPtg(parseStringLiteral()));
-            case '{':
-                Match('{');
-                ParseNode arrayNode = parseArray();
-                Match('}');
-                return arrayNode;
-        }
-        // named ranges and tables can start with underscore or backslash
-        // see https://support.office.com/en-us/article/Define-and-use-names-in-formulas-4d0f13ac-53b7-422e-afd2-abd7ff379c64?ui=en-US&rs=en-US&ad=US#bmsyntax_rules_for_names
-        if (IsAlpha(look) || Character.isDigit(look) || look == '\'' || look == '[' || look == '_' || look == '\\' ) {
-            return parseRangeExpression();
-        }
-        if (look == '.') {
-            return new ParseNode(parseNumber());
-        }
-        throw expected("cell ref or constant literal");
-    }
-
-
-    private ParseNode parseUnary(boolean isPlus) {
-
-        boolean numberFollows = IsDigit(look) || look=='.';
-        ParseNode factor = powerFactor();
-
-        if (numberFollows) {
-            // + or - directly next to a number is parsed with the number
-
-            Ptg token = factor.getToken();
-            if (token instanceof NumberPtg) {
-                if (isPlus) {
-                    return factor;
-                }
-                token = new NumberPtg(-((NumberPtg)token).getValue());
-                return new ParseNode(token);
-            }
-            if (token instanceof IntPtg) {
-                if (isPlus) {
-                    return factor;
-                }
-                int intVal = ((IntPtg)token).getValue();
-                // note - cannot use IntPtg for negatives
-                token = new NumberPtg(-intVal);
-                return new ParseNode(token);
-            }
-        }
-        return new ParseNode(isPlus ? UnaryPlusPtg.instance : UnaryMinusPtg.instance, factor);
-    }
-
-    private ParseNode parseArray() {
-        List<Object[]> rowsData = new ArrayList<Object[]>();
-        while(true) {
-            Object[] singleRowData = parseArrayRow();
-            rowsData.add(singleRowData);
-            if (look == '}') {
-                break;
-            }
-            if (look != ';') {
-                throw expected("'}' or ';'");
-            }
-            Match(';');
-        }
-        int nRows = rowsData.size();
-        Object[][] values2d = new Object[nRows][];
-        rowsData.toArray(values2d);
-        int nColumns = values2d[0].length;
-        checkRowLengths(values2d, nColumns);
-
-        return new ParseNode(new ArrayPtg(values2d));
-    }
-    private void checkRowLengths(Object[][] values2d, int nColumns) {
-        for (int i = 0; i < values2d.length; i++) {
-            int rowLen = values2d[i].length;
-            if (rowLen != nColumns) {
-                throw new FormulaParseException("Array row " + i + " has length " + rowLen
-                        + " but row 0 has length " + nColumns);
-            }
-        }
-    }
-
-    private Object[] parseArrayRow() {
-        List<Object> temp = new ArrayList<Object>();
-        while (true) {
-            temp.add(parseArrayItem());
-            SkipWhite();
-            switch(look) {
-                case '}':
-                case ';':
-                    break;
-                case ',':
-                    Match(',');
-                    continue;
-                default:
-                    throw expected("'}' or ','");
-
-            }
-            break;
-        }
-
-        Object[] result = new Object[temp.size()];
-        temp.toArray(result);
-        return result;
-    }
-
-    private Object parseArrayItem() {
-        SkipWhite();
-        switch(look) {
-            case '"': return parseStringLiteral();
-            case '#': return ErrorConstant.valueOf(parseErrorLiteral());
-            case 'F': case 'f':
-            case 'T': case 't':
-                return parseBooleanLiteral();
-            case '-':
-                Match('-');
-                SkipWhite();
-                return convertArrayNumber(parseNumber(), false);
-        }
-        // else assume number
-        return convertArrayNumber(parseNumber(), true);
-    }
-
-    private Boolean parseBooleanLiteral() {
-        String iden = parseUnquotedIdentifier();
-        if ("TRUE".equalsIgnoreCase(iden)) {
-            return Boolean.TRUE;
-        }
-        if ("FALSE".equalsIgnoreCase(iden)) {
-            return Boolean.FALSE;
-        }
-        throw expected("'TRUE' or 'FALSE'");
-    }
-
-    private static Double convertArrayNumber(Ptg ptg, boolean isPositive) {
-        double value;
-        if (ptg instanceof IntPtg) {
-            value = ((IntPtg)ptg).getValue();
-        } else  if (ptg instanceof NumberPtg) {
-            value = ((NumberPtg)ptg).getValue();
-        } else {
-            throw new RuntimeException("Unexpected ptg (" + ptg.getClass().getName() + ")");
-        }
-        if (!isPositive) {
-            value = -value;
-        }
-        return new Double(value);
-    }
-
-    private Ptg parseNumber() {
-        String number2 = null;
-        String exponent = null;
-        String number1 = GetNum();
-
-        if (look == '.') {
-            GetChar();
-            number2 = GetNum();
-        }
-
-        if (look == 'E') {
-            GetChar();
-
-            String sign = "";
-            if (look == '+') {
-                GetChar();
-            } else if (look == '-') {
-                GetChar();
-                sign = "-";
-            }
-
-            String number = GetNum();
-            if (number == null) {
-                throw expected("Integer");
-            }
-            exponent = sign + number;
-        }
-
-        if (number1 == null && number2 == null) {
-            throw expected("Integer");
-        }
-
-        return getNumberPtgFromString(number1, number2, exponent);
-    }
-
-
-    private int parseErrorLiteral() {
-        Match('#');
-        String part1 = parseUnquotedIdentifier().toUpperCase(Locale.ROOT);
-        if (part1 == null) {
-            throw expected("remainder of error constant literal");
-        }
-
-        switch(part1.charAt(0)) {
-            case 'V': {
-                FormulaError fe = FormulaError.VALUE;
-                if(part1.equals(fe.name())) {
-                    Match('!');
-                    return fe.getCode();
-                }
-                throw expected(fe.getString());
-            }
-            case 'R': {
-                FormulaError fe = FormulaError.REF;
-                if(part1.equals(fe.name())) {
-                    Match('!');
-                    return fe.getCode();
-                }
-                throw expected(fe.getString());
-            }
-            case 'D': {
-                FormulaError fe = FormulaError.DIV0;
-                if(part1.equals("DIV")) {
-                    Match('/');
-                    Match('0');
-                    Match('!');
-                    return fe.getCode();
-                }
-                throw expected(fe.getString());
-            }
-            case 'N': {
-                FormulaError fe = FormulaError.NAME;
-                if(part1.equals(fe.name())) {
-                    // only one that ends in '?'
-                    Match('?');
-                    return fe.getCode();
-                }
-                fe = FormulaError.NUM;
-                if(part1.equals(fe.name())) {
-                    Match('!');
-                    return fe.getCode();
-                }
-                fe = FormulaError.NULL;
-                if(part1.equals(fe.name())) {
-                    Match('!');
-                    return fe.getCode();
-                }
-                fe = FormulaError.NA;
-                if(part1.equals("N")) {
-                    Match('/');
-                    if(look != 'A' && look != 'a') {
-                        throw expected(fe.getString());
-                    }
-                    Match(look);
-                    // Note - no '!' or '?' suffix
-                    return fe.getCode();
-                }
-                throw expected("#NAME?, #NUM!, #NULL! or #N/A");
-            }
-        }
-        throw expected("#VALUE!, #REF!, #DIV/0!, #NAME?, #NUM!, #NULL! or #N/A");
-    }
-
-    private String parseUnquotedIdentifier() {
-        if (look == '\'') {
-            throw expected("unquoted identifier");
-        }
-        StringBuilder sb = new StringBuilder();
-        while (Character.isLetterOrDigit(look) || look == '.') {
-            sb.append(look);
-            GetChar();
-        }
-        if (sb.length() < 1) {
-            return null;
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * Get a PTG for an integer from its string representation.
-     * return Int or Number Ptg based on size of input
-     */
-    private static Ptg getNumberPtgFromString(String number1, String number2, String exponent) {
-        StringBuffer number = new StringBuffer();
-
-        if (number2 == null) {
-            number.append(number1);
-
-            if (exponent != null) {
-                number.append('E');
-                number.append(exponent);
-            }
-
-            String numberStr = number.toString();
-            int intVal;
-            try {
-                intVal = Integer.parseInt(numberStr);
-            } catch (NumberFormatException e) {
-                return new NumberPtg(numberStr);
-            }
-            if (IntPtg.isInRange(intVal)) {
-                return new IntPtg(intVal);
-            }
-            return new NumberPtg(numberStr);
-        }
-
-        if (number1 != null) {
-            number.append(number1);
-        }
-
-        number.append('.');
-        number.append(number2);
-
-        if (exponent != null) {
-            number.append('E');
-            number.append(exponent);
-        }
-
-        return new NumberPtg(number.toString());
-    }
-
-
-    private String parseStringLiteral() {
-        Match('"');
-
-        StringBuffer token = new StringBuffer();
-        while (true) {
-            if (look == '"') {
-                GetChar();
-                if (look != '"') {
-                    break;
-                }
-             }
-            token.append(look);
-            GetChar();
-        }
-        return token.toString();
-    }
-
-    /** Parse and Translate a Math Term */
-    private ParseNode  Term() {
-        ParseNode result = powerFactor();
-        while(true) {
-            SkipWhite();
-            Ptg operator;
-            switch(look) {
-                case '*':
-                    Match('*');
-                    operator = MultiplyPtg.instance;
-                    break;
-                case '/':
-                    Match('/');
-                    operator = DividePtg.instance;
-                    break;
-                default:
-                    return result; // finished with Term
-            }
-            ParseNode other = powerFactor();
-            result = new ParseNode(operator, result, other);
-        }
-    }
-
-    private ParseNode unionExpression() {
-        ParseNode result = intersectionExpression();
-        boolean hasUnions = false;
-        while (true) {
-            SkipWhite();
-            switch(look) {
-                case ',':
-                    GetChar();
-                    hasUnions = true;
-                    ParseNode other = intersectionExpression();
-                    result = new ParseNode(UnionPtg.instance, result, other);
-                    continue;
-            }
-            if (hasUnions) {
-                return augmentWithMemPtg(result);
-            }
-            return result;
-        }
-    }
-
-   private ParseNode intersectionExpression() {
-        ParseNode result = comparisonExpression();
-        boolean hasIntersections = false;
-        while (true) {
-            SkipWhite();
-            if (_inIntersection) {
-                int savePointer = _pointer;
-
-                // Don't getChar() as the space has already been eaten and recorded by SkipWhite().
-                try {
-                    ParseNode other = comparisonExpression();
-                    result = new ParseNode(IntersectionPtg.instance, result, other);
-                    hasIntersections = true;
-                    continue;
-                } catch (FormulaParseException e) {
-                    // if parsing for intersection fails we assume that we actually had an arbitrary
-                    // whitespace and thus should simply skip this whitespace
-                    resetPointer(savePointer);
-                }
-            }
-            if (hasIntersections) {
-                return augmentWithMemPtg(result);
-            }
-            return result;
-        }
-    }
-    
-    private ParseNode comparisonExpression() {
-        ParseNode result = concatExpression();
-        while (true) {
-            SkipWhite();
-            switch(look) {
-                case '=':
-                case '>':
-                case '<':
-                    Ptg comparisonToken = getComparisonToken();
-                    ParseNode other = concatExpression();
-                    result = new ParseNode(comparisonToken, result, other);
-                    continue;
-            }
-            return result; // finished with predicate expression
-        }
-    }
-
-    private Ptg getComparisonToken() {
-        if(look == '=') {
-            Match(look);
-            return EqualPtg.instance;
-        }
-        boolean isGreater = look == '>';
-        Match(look);
-        if(isGreater) {
-            if(look == '=') {
-                Match('=');
-                return GreaterEqualPtg.instance;
-            }
-            return GreaterThanPtg.instance;
-        }
-        switch(look) {
-            case '=':
-                Match('=');
-                return LessEqualPtg.instance;
-            case '>':
-                Match('>');
-                return NotEqualPtg.instance;
-        }
-        return LessThanPtg.instance;
-    }
-
-
-    private ParseNode concatExpression() {
-        ParseNode result = additiveExpression();
-        while (true) {
-            SkipWhite();
-            if(look != '&') {
-                break; // finished with concat expression
-            }
-            Match('&');
-            ParseNode other = additiveExpression();
-            result = new ParseNode(ConcatPtg.instance, result, other);
-        }
-        return result;
-    }
-
-
-    /** Parse and Translate an Expression */
-    private ParseNode additiveExpression() {
-        ParseNode result = Term();
-        while (true) {
-            SkipWhite();
-            Ptg operator;
-            switch(look) {
-                case '+':
-                    Match('+');
-                    operator = AddPtg.instance;
-                    break;
-                case '-':
-                    Match('-');
-                    operator = SubtractPtg.instance;
-                    break;
-                default:
-                    return result; // finished with additive expression
-            }
-            ParseNode other = Term();
-            result = new ParseNode(operator, result, other);
-        }
-    }
-
-    //{--------------------------------------------------------------}
-    //{ Parse and Translate an Assignment Statement }
-    /**
-procedure Assignment;
-var Name: string[8];
-begin
-   Name := GetName;
-   Match('=');
-   Expression;
-
-end;
-     **/
-
-
-    /**
-     *  API call to execute the parsing of the formula
-     *
-     */
-    private void parse() {
-        _pointer=0;
-        GetChar();
-        _rootNode = unionExpression();
-
-        if(_pointer <= _formulaLength) {
-            String msg = "Unused input [" + _formulaString.substring(_pointer-1)
-                + "] after attempting to parse the formula [" + _formulaString + "]";
-            throw new FormulaParseException(msg);
-        }
-    }
-
-    private Ptg[] getRPNPtg(FormulaType formulaType) {
-        OperandClassTransformer oct = new OperandClassTransformer(formulaType);
-        // RVA is for 'operand class': 'reference', 'value', 'array'
-        oct.transformFormula(_rootNode);
-        return ParseNode.toTokenArray(_rootNode);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
deleted file mode 100644
index 7ddcc94..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Table;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Abstracts a workbook for the purpose of formula parsing.<br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-public interface FormulaParsingWorkbook {
-    /**
-     *  named range name matching is case insensitive
-     */
-    EvaluationName getName(String name, int sheetIndex);
-    
-    /**
-     * Return the underlying workbook
-     */
-    Name createName();
-
-    /**
-     * XSSF Only - gets a table that exists in the worksheet
-     */
-    Table getTable(String name);
-    
-    /**
-     * Return an external name (named range, function, user-defined function) Ptg
-     */
-    Ptg getNameXPtg(String name, SheetIdentifier sheet);
-    
-    /**
-     * Produce the appropriate Ptg for a 3d cell reference
-     */
-    Ptg get3DReferencePtg(CellReference cell, SheetIdentifier sheet);
-
-    /**
-     * Produce the appropriate Ptg for a 3d area reference
-     */
-    Ptg get3DReferencePtg(AreaReference area, SheetIdentifier sheet);
-
-    /**
-     * gets the externSheet index for a sheet from this workbook
-     */
-    int getExternalSheetIndex(String sheetName);
-    /**
-     * gets the externSheet index for a sheet from an external workbook
-     * @param workbookName e.g. "Budget.xls"
-     * @param sheetName a name of a sheet in that workbook
-     */
-    int getExternalSheetIndex(String workbookName, String sheetName);
-
-    /**
-     * Returns an enum holding spreadhseet properties specific to an Excel version (
-     * max column and row numbers, max arguments to a function, etc.)
-     */
-    SpreadsheetVersion getSpreadsheetVersion();
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java
deleted file mode 100644
index 78eb16d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.Stack;
-
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemErrPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.OperationPtg;
-import org.apache.poi.ss.formula.ptg.ParenthesisPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-
-/**
- * Common logic for rendering formulas.<br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-public class FormulaRenderer {
-
-    /**
-     * Static method to convert an array of {@link Ptg}s in RPN order
-     * to a human readable string format in infix mode.
-     * @param book  used for defined names and 3D references
-     * @param ptgs  must not be <code>null</code>
-     * @return a human readable String
-     */
-    public static String toFormulaString(FormulaRenderingWorkbook book, Ptg[] ptgs) {
-        if (ptgs == null || ptgs.length == 0) {
-            throw new IllegalArgumentException("ptgs must not be null");
-        }
-        Stack<String> stack = new Stack<String>();
-
-        for (Ptg ptg : ptgs) {
-            // TODO - what about MemNoMemPtg?
-            if(ptg instanceof MemAreaPtg || ptg instanceof MemFuncPtg || ptg instanceof MemErrPtg) {
-                // marks the start of a list of area expressions which will be naturally combined
-                // by their trailing operators (e.g. UnionPtg)
-                // TODO - put comment and throw exception in toFormulaString() of these classes
-                continue;
-            }
-            if (ptg instanceof ParenthesisPtg) {
-                String contents = stack.pop();
-                stack.push ("(" + contents + ")");
-                continue;
-            }
-            if (ptg instanceof AttrPtg) {
-                AttrPtg attrPtg = ((AttrPtg) ptg);
-                if (attrPtg.isOptimizedIf() || attrPtg.isOptimizedChoose() || attrPtg.isSkip()) {
-                    continue;
-                }
-                if (attrPtg.isSpace()) {
-                    // POI currently doesn't render spaces in formulas
-                    continue;
-                    // but if it ever did, care must be taken:
-                    // tAttrSpace comes *before* the operand it applies to, which may be consistent
-                    // with how the formula text appears but is against the RPN ordering assumed here
-                }
-                if (attrPtg.isSemiVolatile()) {
-                    // similar to tAttrSpace - RPN is violated
-                    continue;
-                }
-                if (attrPtg.isSum()) {
-                    String[] operands = getOperands(stack, attrPtg.getNumberOfOperands());
-                    stack.push(attrPtg.toFormulaString(operands));
-                    continue;
-                }
-                throw new RuntimeException("Unexpected tAttr: " + attrPtg.toString());
-            }
-
-            if (ptg instanceof WorkbookDependentFormula) {
-                WorkbookDependentFormula optg = (WorkbookDependentFormula) ptg;
-                stack.push(optg.toFormulaString(book));
-                continue;
-            }
-            if (! (ptg instanceof OperationPtg)) {
-                stack.push(ptg.toFormulaString());
-                continue;
-            }
-
-            OperationPtg o = (OperationPtg) ptg;
-            String[] operands = getOperands(stack, o.getNumberOfOperands());
-            stack.push(o.toFormulaString(operands));
-        }
-        if(stack.isEmpty()) {
-            // inspection of the code above reveals that every stack.pop() is followed by a
-            // stack.push(). So this is either an internal error or impossible.
-            throw new IllegalStateException("Stack underflow");
-        }
-        String result = stack.pop();
-        if(!stack.isEmpty()) {
-            // Might be caused by some tokens like AttrPtg and Mem*Ptg, which really shouldn't
-            // put anything on the stack
-            throw new IllegalStateException("too much stuff left on the stack");
-        }
-        return result;
-    }
-
-    private static String[] getOperands(Stack<String> stack, int nOperands) {
-        String[] operands = new String[nOperands];
-
-        for (int j = nOperands-1; j >= 0; j--) { // reverse iteration because args were pushed in-order
-            if(stack.isEmpty()) {
-               String msg = "Too few arguments supplied to operation. Expected (" + nOperands
-                    + ") operands but got (" + (nOperands - j - 1) + ")";
-                throw new IllegalStateException(msg);
-            }
-            operands[j] = stack.pop();
-        }
-        return operands;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
deleted file mode 100644
index f918be4..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheet;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-
-/**
- * Abstracts a workbook for the purpose of converting formula to text.<br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-public interface FormulaRenderingWorkbook {
-	/**
-	 * @return <code>null</code> if externSheetIndex refers to a sheet inside the current workbook
-	 */
-	ExternalSheet getExternalSheet(int externSheetIndex);
-	
-	/**
-	 * @return the name of the (first) sheet referred to by the given external sheet index
-	 */
-	String getSheetFirstNameByExternSheet(int externSheetIndex);
-    /**
-     * @return the name of the (last) sheet referred to by the given external sheet index
-     */
-    String getSheetLastNameByExternSheet(int externSheetIndex);
-	
-	String resolveNameXText(NameXPtg nameXPtg);
-	String getNameText(NamePtg namePtg);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaShifter.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaShifter.java
deleted file mode 100644
index 44e477f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaShifter.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.ptg.Area2DPtgBase;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.Area3DPxg;
-import org.apache.poi.ss.formula.ptg.AreaErrPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtgBase;
-import org.apache.poi.ss.formula.ptg.Deleted3DPxg;
-import org.apache.poi.ss.formula.ptg.DeletedArea3DPtg;
-import org.apache.poi.ss.formula.ptg.DeletedRef3DPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPxg;
-import org.apache.poi.ss.formula.ptg.RefErrorPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.ptg.RefPtgBase;
-
-
-/**
- * Updates Formulas as rows or sheets are shifted
- */
-public final class FormulaShifter {
-
-    private static enum ShiftMode {
-        RowMove,
-        RowCopy,
-        SheetMove,
-    }
-
-    /**
-     * Extern sheet index of sheet where moving is occurring,
-     *  used for updating HSSF style 3D references
-     */
-    private final int _externSheetIndex;
-    /**
-     * Sheet name of the sheet where moving is occurring, 
-     *  used for updating XSSF style 3D references on row shifts.
-     */
-    private final String _sheetName;
-
-    private final int _firstMovedIndex;
-    private final int _lastMovedIndex;
-    private final int _amountToMove;
-
-    private final int _srcSheetIndex;
-    private final int _dstSheetIndex;
-    private final SpreadsheetVersion _version;
-
-    private final ShiftMode _mode;
-
-    /**
-     * Create an instance for shifting row.
-     *
-     * For example, this will be called on {@link org.apache.poi.hssf.usermodel.HSSFSheet#shiftRows(int, int, int)} }
-     */
-    private FormulaShifter(int externSheetIndex, String sheetName, int firstMovedIndex, int lastMovedIndex, int amountToMove,
-            ShiftMode mode, SpreadsheetVersion version) {
-        if (amountToMove == 0) {
-            throw new IllegalArgumentException("amountToMove must not be zero");
-        }
-        if (firstMovedIndex > lastMovedIndex) {
-            throw new IllegalArgumentException("firstMovedIndex, lastMovedIndex out of order");
-        }
-        _externSheetIndex = externSheetIndex;
-        _sheetName = sheetName;
-        _firstMovedIndex = firstMovedIndex;
-        _lastMovedIndex = lastMovedIndex;
-        _amountToMove = amountToMove;
-        _mode = mode;
-        _version = version;
-
-        _srcSheetIndex = _dstSheetIndex = -1;
-    }
-
-    /**
-     * Create an instance for shifting sheets.
-     *
-     * For example, this will be called on {@link org.apache.poi.hssf.usermodel.HSSFWorkbook#setSheetOrder(String, int)}  
-     */
-    private FormulaShifter(int srcSheetIndex, int dstSheetIndex) {
-        _externSheetIndex = _firstMovedIndex = _lastMovedIndex = _amountToMove = -1;
-        _sheetName = null;
-        _version = null;
-
-        _srcSheetIndex = srcSheetIndex;
-        _dstSheetIndex = dstSheetIndex;
-        _mode = ShiftMode.SheetMove;
-    }
-    
-    public static FormulaShifter createForRowShift(int externSheetIndex, String sheetName, int firstMovedRowIndex, int lastMovedRowIndex, int numberOfRowsToMove,
-            SpreadsheetVersion version) {
-        return new FormulaShifter(externSheetIndex, sheetName, firstMovedRowIndex, lastMovedRowIndex, numberOfRowsToMove, ShiftMode.RowMove, version);
-    }
-    
-    public static FormulaShifter createForRowCopy(int externSheetIndex, String sheetName, int firstMovedRowIndex, int lastMovedRowIndex, int numberOfRowsToMove,
-            SpreadsheetVersion version) {
-        return new FormulaShifter(externSheetIndex, sheetName, firstMovedRowIndex, lastMovedRowIndex, numberOfRowsToMove, ShiftMode.RowCopy, version);
-    }
-
-    public static FormulaShifter createForSheetShift(int srcSheetIndex, int dstSheetIndex) {
-        return new FormulaShifter(srcSheetIndex, dstSheetIndex);
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append(getClass().getName());
-        sb.append(" [");
-        sb.append(_firstMovedIndex);
-        sb.append(_lastMovedIndex);
-        sb.append(_amountToMove);
-        return sb.toString();
-    }
-
-    /**
-     * @param ptgs - if necessary, will get modified by this method
-     * @param currentExternSheetIx - the extern sheet index of the sheet that contains the formula being adjusted
-     * @return <code>true</code> if a change was made to the formula tokens
-     */
-    public boolean adjustFormula(Ptg[] ptgs, int currentExternSheetIx) {
-        boolean refsWereChanged = false;
-        for(int i=0; i<ptgs.length; i++) {
-            Ptg newPtg = adjustPtg(ptgs[i], currentExternSheetIx);
-            if (newPtg != null) {
-                refsWereChanged = true;
-                ptgs[i] = newPtg;
-            }
-        }
-        return refsWereChanged;
-    }
-
-    private Ptg adjustPtg(Ptg ptg, int currentExternSheetIx) {
-        switch(_mode){
-            case RowMove:
-                return adjustPtgDueToRowMove(ptg, currentExternSheetIx);
-            case RowCopy:
-                // Covered Scenarios:
-                // * row copy on same sheet
-                // * row copy between different sheetsin the same workbook
-                return adjustPtgDueToRowCopy(ptg);
-            case SheetMove:
-                return adjustPtgDueToSheetMove(ptg);
-            default:
-                throw new IllegalStateException("Unsupported shift mode: " + _mode);
-        }
-    }
-    /**
-     * @return in-place modified ptg (if row move would cause Ptg to change),
-     * deleted ref ptg (if row move causes an error),
-     * or null (if no Ptg change is needed)
-     */
-    private Ptg adjustPtgDueToRowMove(Ptg ptg, int currentExternSheetIx) {
-        if(ptg instanceof RefPtg) {
-            if (currentExternSheetIx != _externSheetIndex) {
-                // local refs on other sheets are unaffected
-                return null;
-            }
-            RefPtg rptg = (RefPtg)ptg;
-            return rowMoveRefPtg(rptg);
-        }
-        if(ptg instanceof Ref3DPtg) {
-            Ref3DPtg rptg = (Ref3DPtg)ptg;
-            if (_externSheetIndex != rptg.getExternSheetIndex()) {
-                // only move 3D refs that refer to the sheet with cells being moved
-                // (currentExternSheetIx is irrelevant)
-                return null;
-            }
-            return rowMoveRefPtg(rptg);
-        }
-        if(ptg instanceof Ref3DPxg) {
-            Ref3DPxg rpxg = (Ref3DPxg)ptg;
-            if (rpxg.getExternalWorkbookNumber() > 0 ||
-                   ! _sheetName.equals(rpxg.getSheetName())) {
-                // only move 3D refs that refer to the sheet with cells being moved
-                return null;
-            }
-            return rowMoveRefPtg(rpxg);
-        }
-        if(ptg instanceof Area2DPtgBase) {
-            if (currentExternSheetIx != _externSheetIndex) {
-                // local refs on other sheets are unaffected
-                return ptg;
-            }
-            return rowMoveAreaPtg((Area2DPtgBase)ptg);
-        }
-        if(ptg instanceof Area3DPtg) {
-            Area3DPtg aptg = (Area3DPtg)ptg;
-            if (_externSheetIndex != aptg.getExternSheetIndex()) {
-                // only move 3D refs that refer to the sheet with cells being moved
-                // (currentExternSheetIx is irrelevant)
-                return null;
-            }
-            return rowMoveAreaPtg(aptg);
-        }
-        if(ptg instanceof Area3DPxg) {
-            Area3DPxg apxg = (Area3DPxg)ptg;
-            if (apxg.getExternalWorkbookNumber() > 0 ||
-                    ! _sheetName.equals(apxg.getSheetName())) {
-                // only move 3D refs that refer to the sheet with cells being moved
-                return null;
-            }
-            return rowMoveAreaPtg(apxg);
-        }
-        return null;
-    }
-    
-    /**
-     * Call this on any ptg reference contained in a row of cells that was copied.
-     * If the ptg reference is relative, the references will be shifted by the distance
-     * that the rows were copied.
-     * In the future similar functions could be written due to column copying or
-     * individual cell copying. Just make sure to only call adjustPtgDueToRowCopy on
-     * formula cells that are copied (unless row shifting, where references outside
-     * of the shifted region need to be updated to reflect the shift, a copy is self-contained).
-     * 
-     * @param ptg the ptg to shift
-     * @return deleted ref ptg, in-place modified ptg, or null
-     * If Ptg would be shifted off the first or last row of a sheet, return deleted ref
-     * If Ptg needs to be changed, modifies Ptg in-place
-     * If Ptg doesn't need to be changed, returns <code>null</code>
-     */
-    private Ptg adjustPtgDueToRowCopy(Ptg ptg) {
-        if(ptg instanceof RefPtg) {
-            RefPtg rptg = (RefPtg)ptg;
-            return rowCopyRefPtg(rptg);
-        }
-        if(ptg instanceof Ref3DPtg) {
-            Ref3DPtg rptg = (Ref3DPtg)ptg;
-            return rowCopyRefPtg(rptg);
-        }
-        if(ptg instanceof Ref3DPxg) {
-            Ref3DPxg rpxg = (Ref3DPxg)ptg;
-            return rowCopyRefPtg(rpxg);
-        }
-        if(ptg instanceof Area2DPtgBase) {
-            return rowCopyAreaPtg((Area2DPtgBase)ptg);
-        }
-        if(ptg instanceof Area3DPtg) {
-            Area3DPtg aptg = (Area3DPtg)ptg;
-            return rowCopyAreaPtg(aptg);
-        }
-        if(ptg instanceof Area3DPxg) {
-            Area3DPxg apxg = (Area3DPxg)ptg;
-            return rowCopyAreaPtg(apxg);
-        }
-        return null;
-    }
-
-
-    private Ptg adjustPtgDueToSheetMove(Ptg ptg) {
-        if(ptg instanceof Ref3DPtg) {
-            Ref3DPtg ref = (Ref3DPtg)ptg;
-            int oldSheetIndex = ref.getExternSheetIndex();
-            
-            // we have to handle a few cases here
-            
-            // 1. sheet is outside moved sheets, no change necessary
-            if(oldSheetIndex < _srcSheetIndex &&
-                    oldSheetIndex < _dstSheetIndex) {
-                return null;
-            }
-            if(oldSheetIndex > _srcSheetIndex &&
-                    oldSheetIndex > _dstSheetIndex) {
-                return null;
-            }
-            
-            // 2. ptg refers to the moved sheet
-            if(oldSheetIndex == _srcSheetIndex) {
-                ref.setExternSheetIndex(_dstSheetIndex);
-                return ref;
-            }
-
-            // 3. new index is lower than old one => sheets get moved up
-            if (_dstSheetIndex < _srcSheetIndex) {
-                ref.setExternSheetIndex(oldSheetIndex+1);
-                return ref;
-            }
-
-            // 4. new index is higher than old one => sheets get moved down
-            if (_dstSheetIndex > _srcSheetIndex) {
-                ref.setExternSheetIndex(oldSheetIndex-1);
-                return ref;
-            }
-        }
-
-        return null;
-    }
-
-    private Ptg rowMoveRefPtg(RefPtgBase rptg) {
-        int refRow = rptg.getRow();
-        if (_firstMovedIndex <= refRow && refRow <= _lastMovedIndex) {
-            // Rows being moved completely enclose the ref.
-            // - move the area ref along with the rows regardless of destination
-            rptg.setRow(refRow + _amountToMove);
-            return rptg;
-        }
-        // else rules for adjusting area may also depend on the destination of the moved rows
-
-        int destFirstRowIndex = _firstMovedIndex + _amountToMove;
-        int destLastRowIndex = _lastMovedIndex + _amountToMove;
-
-        // ref is outside source rows
-        // check for clashes with destination
-
-        if (destLastRowIndex < refRow || refRow < destFirstRowIndex) {
-            // destination rows are completely outside ref
-            return null;
-        }
-
-        if (destFirstRowIndex <= refRow && refRow <= destLastRowIndex) {
-            // destination rows enclose the area (possibly exactly)
-            return createDeletedRef(rptg);
-        }
-        throw new IllegalStateException("Situation not covered: (" + _firstMovedIndex + ", " +
-                    _lastMovedIndex + ", " + _amountToMove + ", " + refRow + ", " + refRow + ")");
-    }
-
-    private Ptg rowMoveAreaPtg(AreaPtgBase aptg) {
-        int aFirstRow = aptg.getFirstRow();
-        int aLastRow = aptg.getLastRow();
-        if (_firstMovedIndex <= aFirstRow && aLastRow <= _lastMovedIndex) {
-            // Rows being moved completely enclose the area ref.
-            // - move the area ref along with the rows regardless of destination
-            aptg.setFirstRow(aFirstRow + _amountToMove);
-            aptg.setLastRow(aLastRow + _amountToMove);
-            return aptg;
-        }
-        // else rules for adjusting area may also depend on the destination of the moved rows
-
-        int destFirstRowIndex = _firstMovedIndex + _amountToMove;
-        int destLastRowIndex = _lastMovedIndex + _amountToMove;
-
-        if (aFirstRow < _firstMovedIndex && _lastMovedIndex < aLastRow) {
-            // Rows moved were originally *completely* within the area ref
-
-            // If the destination of the rows overlaps either the top
-            // or bottom of the area ref there will be a change
-            if (destFirstRowIndex < aFirstRow && aFirstRow <= destLastRowIndex) {
-                // truncate the top of the area by the moved rows
-                aptg.setFirstRow(destLastRowIndex+1);
-                return aptg;
-            } else if (destFirstRowIndex <= aLastRow && aLastRow < destLastRowIndex) {
-                // truncate the bottom of the area by the moved rows
-                aptg.setLastRow(destFirstRowIndex-1);
-                return aptg;
-            }
-            // else - rows have moved completely outside the area ref,
-            // or still remain completely within the area ref
-            return null; // - no change to the area
-        }
-        if (_firstMovedIndex <= aFirstRow && aFirstRow <= _lastMovedIndex) {
-            // Rows moved include the first row of the area ref, but not the last row
-            // btw: (aLastRow > _lastMovedIndex)
-            if (_amountToMove < 0) {
-                // simple case - expand area by shifting top upward
-                aptg.setFirstRow(aFirstRow + _amountToMove);
-                return aptg;
-            }
-            if (destFirstRowIndex > aLastRow) {
-                // in this case, excel ignores the row move
-                return null;
-            }
-            int newFirstRowIx = aFirstRow + _amountToMove;
-            if (destLastRowIndex < aLastRow) {
-                // end of area is preserved (will remain exact same row)
-                // the top area row is moved simply
-                aptg.setFirstRow(newFirstRowIx);
-                return aptg;
-            }
-            // else - bottom area row has been replaced - both area top and bottom may move now
-            int areaRemainingTopRowIx = _lastMovedIndex + 1;
-            if (destFirstRowIndex > areaRemainingTopRowIx) {
-                // old top row of area has moved deep within the area, and exposed a new top row
-                newFirstRowIx = areaRemainingTopRowIx;
-            }
-            aptg.setFirstRow(newFirstRowIx);
-            aptg.setLastRow(Math.max(aLastRow, destLastRowIndex));
-            return aptg;
-        }
-        if (_firstMovedIndex <= aLastRow && aLastRow <= _lastMovedIndex) {
-            // Rows moved include the last row of the area ref, but not the first
-            // btw: (aFirstRow < _firstMovedIndex)
-            if (_amountToMove > 0) {
-                // simple case - expand area by shifting bottom downward
-                aptg.setLastRow(aLastRow + _amountToMove);
-                return aptg;
-            }
-            if (destLastRowIndex < aFirstRow) {
-                // in this case, excel ignores the row move
-                return null;
-            }
-            int newLastRowIx = aLastRow + _amountToMove;
-            if (destFirstRowIndex > aFirstRow) {
-                // top of area is preserved (will remain exact same row)
-                // the bottom area row is moved simply
-                aptg.setLastRow(newLastRowIx);
-                return aptg;
-            }
-            // else - top area row has been replaced - both area top and bottom may move now
-            int areaRemainingBottomRowIx = _firstMovedIndex - 1;
-            if (destLastRowIndex < areaRemainingBottomRowIx) {
-                // old bottom row of area has moved up deep within the area, and exposed a new bottom row
-                newLastRowIx = areaRemainingBottomRowIx;
-            }
-            aptg.setFirstRow(Math.min(aFirstRow, destFirstRowIndex));
-            aptg.setLastRow(newLastRowIx);
-            return aptg;
-        }
-        // else source rows include none of the rows of the area ref
-        // check for clashes with destination
-
-        if (destLastRowIndex < aFirstRow || aLastRow < destFirstRowIndex) {
-            // destination rows are completely outside area ref
-            return null;
-        }
-
-        if (destFirstRowIndex <= aFirstRow && aLastRow <= destLastRowIndex) {
-            // destination rows enclose the area (possibly exactly)
-            return createDeletedRef(aptg);
-        }
-
-        if (aFirstRow <= destFirstRowIndex && destLastRowIndex <= aLastRow) {
-            // destination rows are within area ref (possibly exact on top or bottom, but not both)
-            return null; // - no change to area
-        }
-
-        if (destFirstRowIndex < aFirstRow && aFirstRow <= destLastRowIndex) {
-            // dest rows overlap top of area
-            // - truncate the top
-            aptg.setFirstRow(destLastRowIndex+1);
-            return aptg;
-        }
-        if (destFirstRowIndex <= aLastRow && aLastRow < destLastRowIndex) {
-            // dest rows overlap bottom of area
-            // - truncate the bottom
-            aptg.setLastRow(destFirstRowIndex-1);
-            return aptg;
-        }
-        throw new IllegalStateException("Situation not covered: (" + _firstMovedIndex + ", " +
-                    _lastMovedIndex + ", " + _amountToMove + ", " + aFirstRow + ", " + aLastRow + ")");
-    }
-    
-    /**
-     * Modifies rptg in-place and return a reference to rptg if the cell reference
-     * would move due to a row copy operation
-     * Returns <code>null</code> or {@link #RefErrorPtg} if no change was made
-     *
-     * @param aptg
-     * @return The Ptg reference if the cell would move due to copy, otherwise null
-     */
-    private Ptg rowCopyRefPtg(RefPtgBase rptg) {
-        final int refRow = rptg.getRow();
-        if (rptg.isRowRelative()) {
-            final int destRowIndex = _firstMovedIndex + _amountToMove;
-            if (destRowIndex < 0 || _version.getLastRowIndex() < destRowIndex)
-                return createDeletedRef(rptg);
-            rptg.setRow(refRow + _amountToMove);
-            return rptg;
-        }
-        return null;
-    }
-
-    /**
-     * Modifies aptg in-place and return a reference to aptg if the first or last row of
-     * of the Area reference would move due to a row copy operation
-     * Returns <code>null</code> or {@link #AreaErrPtg} if no change was made
-     *
-     * @param aptg
-     * @return null, AreaErrPtg, or modified aptg
-     */
-    private Ptg rowCopyAreaPtg(AreaPtgBase aptg) {
-        boolean changed = false;
-    
-        final int aFirstRow = aptg.getFirstRow();
-        final int aLastRow = aptg.getLastRow();
-    
-        if (aptg.isFirstRowRelative()) {
-            final int destFirstRowIndex = aFirstRow + _amountToMove;
-            if (destFirstRowIndex < 0 || _version.getLastRowIndex() < destFirstRowIndex)
-                return createDeletedRef(aptg);
-            aptg.setFirstRow(destFirstRowIndex);
-            changed = true;
-        }
-        if (aptg.isLastRowRelative()) {
-            final int destLastRowIndex = aLastRow + _amountToMove;
-            if (destLastRowIndex < 0 || _version.getLastRowIndex() < destLastRowIndex)
-                return createDeletedRef(aptg);
-            aptg.setLastRow(destLastRowIndex);
-            changed = true;
-        }
-        if (changed) {
-            aptg.sortTopLeftToBottomRight();
-        }
-
-        return changed ? aptg : null;
-    }
-
-    private static Ptg createDeletedRef(Ptg ptg) {
-        if (ptg instanceof RefPtg) {
-            return new RefErrorPtg();
-        }
-        if (ptg instanceof Ref3DPtg) {
-            Ref3DPtg rptg = (Ref3DPtg) ptg;
-            return new DeletedRef3DPtg(rptg.getExternSheetIndex());
-        }
-        if (ptg instanceof AreaPtg) {
-            return new AreaErrPtg();
-        }
-        if (ptg instanceof Area3DPtg) {
-            Area3DPtg area3DPtg = (Area3DPtg) ptg;
-            return new DeletedArea3DPtg(area3DPtg.getExternSheetIndex());
-        }
-        if (ptg instanceof Ref3DPxg) {
-            Ref3DPxg pxg = (Ref3DPxg)ptg;
-            return new Deleted3DPxg(pxg.getExternalWorkbookNumber(), pxg.getSheetName());
-        }
-        if (ptg instanceof Area3DPxg) {
-            Area3DPxg pxg = (Area3DPxg)ptg;
-            return new Deleted3DPxg(pxg.getExternalWorkbookNumber(), pxg.getSheetName());
-        }
-
-        throw new IllegalArgumentException("Unexpected ref ptg class (" + ptg.getClass().getName() + ")");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaType.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaType.java
deleted file mode 100644
index 45d26ae..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaType.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Enumeration of various formula types.
- * 
- * See Sections 3 and 4.8 of https://www.openoffice.org/sc/excelfileformat.pdf
- */
-@Internal
-public enum FormulaType {
-    /** Regular cell formula */
-    CELL(0),
-    
-    /**
-     * A Shared Formula ("{=SUM(A1:E1*{1,2,3,4,5}}")
-     * 
-     * Similar to an array formula, but stored in a SHAREDFMLA instead of ARRAY record as a file size optimization.
-     * See Section 4.8 of https://www.openoffice.org/sc/excelfileformat.pdf
-     */
-    SHARED(1),
-    
-    /**
-     * An Array formula ("{=SUM(A1:E1*{1,2,3,4,5}}")
-     * https://support.office.com/en-us/article/Guidelines-and-examples-of-array-formulas-7D94A64E-3FF3-4686-9372-ECFD5CAA57C7
-     */
-    ARRAY(2),
-    
-    /** Conditional formatting */
-    CONDFORMAT(3),
-    
-    /** Named range */
-    NAMEDRANGE(4),
-    
-    /**
-     * This constant is currently very specific.  The exact differences from general data
-     * validation formulas or conditional format formulas is not known yet
-     */
-    DATAVALIDATION_LIST(5);
-    
-    /** @deprecated POI 3.15 beta 3. */
-    private final int code;
-    /**
-     * @since POI 3.15 beta 3.
-     * @deprecated POI 3.15 beta 3.
-     * Formula type code doesn't mean anything. Only in this class for transitioning from a class with int constants to a true enum.
-     * Remove hard-coded numbers from the enums above. */
-    private FormulaType(int code) {
-        this.code = code;
-    }
-    
-    /**
-     * @since POI 3.15 beta 3.
-     * @deprecated POI 3.15 beta 3. Used to transition code from <code>int</code>s to <code>FormulaType</code>s.
-     */
-    public static FormulaType forInt(int code) {
-        for (FormulaType type : values()) {
-            if (type.code == code) {
-                return type;
-            }
-        }
-        throw new IllegalArgumentException("Invalid FormulaType code: " + code);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java b/trunk/src/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
deleted file mode 100644
index e054f12..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Optimisation - compacts many blank cell references used by a single formula.
- *
- * @author Josh Micich
- */
-final class FormulaUsedBlankCellSet {
-	public static final class BookSheetKey {
-
-		private final int _bookIndex;
-		private final int _sheetIndex;
-
-		public BookSheetKey(int bookIndex, int sheetIndex) {
-			_bookIndex = bookIndex;
-			_sheetIndex = sheetIndex;
-		}
-		public int hashCode() {
-			return _bookIndex * 17 + _sheetIndex;
-		}
-		public boolean equals(Object obj) {
-			assert obj instanceof BookSheetKey : "these private cache key instances are only compared to themselves";
-			BookSheetKey other = (BookSheetKey) obj;
-			return _bookIndex == other._bookIndex && _sheetIndex == other._sheetIndex;
-		}
-	}
-
-	private static final class BlankCellSheetGroup {
-		private final List<BlankCellRectangleGroup> _rectangleGroups;
-		private int _currentRowIndex;
-		private int _firstColumnIndex;
-		private int _lastColumnIndex;
-		private BlankCellRectangleGroup _currentRectangleGroup;
-
-		public BlankCellSheetGroup() {
-			_rectangleGroups = new ArrayList<BlankCellRectangleGroup>();
-			_currentRowIndex = -1;
-		}
-
-		public void addCell(int rowIndex, int columnIndex) {
-			if (_currentRowIndex == -1) {
-				_currentRowIndex = rowIndex;
-				_firstColumnIndex = columnIndex;
-				_lastColumnIndex = columnIndex;
-			} else {
-				if (_currentRowIndex == rowIndex && _lastColumnIndex+1 == columnIndex) {
-					_lastColumnIndex = columnIndex;
-				} else {
-					// cell does not fit on end of current row
-					if (_currentRectangleGroup == null) {
-						_currentRectangleGroup = new BlankCellRectangleGroup(_currentRowIndex, _firstColumnIndex, _lastColumnIndex);
-					} else {
-						if (!_currentRectangleGroup.acceptRow(_currentRowIndex, _firstColumnIndex, _lastColumnIndex)) {
-							_rectangleGroups.add(_currentRectangleGroup);
-							_currentRectangleGroup = new BlankCellRectangleGroup(_currentRowIndex, _firstColumnIndex, _lastColumnIndex);
-						}
-					}
-					_currentRowIndex = rowIndex;
-					_firstColumnIndex = columnIndex;
-					_lastColumnIndex = columnIndex;
-				}
-			}
-		}
-
-		public boolean containsCell(int rowIndex, int columnIndex) {
-			for (int i=_rectangleGroups.size()-1; i>=0; i--) {
-				BlankCellRectangleGroup bcrg = _rectangleGroups.get(i);
-				if (bcrg.containsCell(rowIndex, columnIndex)) {
-					return true;
-				}
-			}
-			if(_currentRectangleGroup != null && _currentRectangleGroup.containsCell(rowIndex, columnIndex)) {
-				return true;
-			}
-			if (_currentRowIndex != -1 && _currentRowIndex == rowIndex) {
-				if (_firstColumnIndex <=  columnIndex && columnIndex <= _lastColumnIndex) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	private static final class BlankCellRectangleGroup {
-
-		private final int _firstRowIndex;
-		private final int _firstColumnIndex;
-		private final int _lastColumnIndex;
-		private int _lastRowIndex;
-
-		public BlankCellRectangleGroup(int firstRowIndex, int firstColumnIndex, int lastColumnIndex) {
-			_firstRowIndex = firstRowIndex;
-			_firstColumnIndex = firstColumnIndex;
-			_lastColumnIndex = lastColumnIndex;
-			_lastRowIndex = firstRowIndex;
-		}
-
-		public boolean containsCell(int rowIndex, int columnIndex) {
-			if (columnIndex < _firstColumnIndex) {
-				return false;
-			}
-			if (columnIndex > _lastColumnIndex) {
-				return false;
-			}
-			if (rowIndex < _firstRowIndex) {
-				return false;
-			}
-			if (rowIndex > _lastRowIndex) {
-				return false;
-			}
-			return true;
-		}
-
-		public boolean acceptRow(int rowIndex, int firstColumnIndex, int lastColumnIndex) {
-			if (firstColumnIndex != _firstColumnIndex) {
-				return false;
-			}
-			if (lastColumnIndex != _lastColumnIndex) {
-				return false;
-			}
-			if (rowIndex != _lastRowIndex+1) {
-				return false;
-			}
-			_lastRowIndex = rowIndex;
-			return true;
-		}
-		public String toString() {
-			StringBuffer sb = new StringBuffer(64);
-			CellReference crA = new CellReference(_firstRowIndex, _firstColumnIndex, false, false);
-			CellReference crB = new CellReference(_lastRowIndex, _lastColumnIndex, false, false);
-			sb.append(getClass().getName());
-			sb.append(" [").append(crA.formatAsString()).append(':').append(crB.formatAsString()).append("]");
-			return sb.toString();
-		}
-	}
-
-	private final Map<BookSheetKey, BlankCellSheetGroup> _sheetGroupsByBookSheet;
-
-	public FormulaUsedBlankCellSet() {
-		_sheetGroupsByBookSheet = new HashMap<BookSheetKey, BlankCellSheetGroup>();
-	}
-
-	public void addCell(int bookIndex, int sheetIndex, int rowIndex, int columnIndex) {
-		BlankCellSheetGroup sbcg = getSheetGroup(bookIndex, sheetIndex);
-		sbcg.addCell(rowIndex, columnIndex);
-	}
-
-	private BlankCellSheetGroup getSheetGroup(int bookIndex, int sheetIndex) {
-		BookSheetKey key = new BookSheetKey(bookIndex, sheetIndex);
-
-		BlankCellSheetGroup result = _sheetGroupsByBookSheet.get(key);
-		if (result == null) {
-			result = new BlankCellSheetGroup();
-			_sheetGroupsByBookSheet.put(key, result);
-		}
-		return result;
-	}
-
-	public boolean containsCell(BookSheetKey key, int rowIndex, int columnIndex) {
-		BlankCellSheetGroup bcsg = _sheetGroupsByBookSheet.get(key);
-		if (bcsg == null) {
-			return false;
-		}
-		return bcsg.containsCell(rowIndex, columnIndex);
-	}
-
-	public boolean isEmpty() {
-		return _sheetGroupsByBookSheet.isEmpty();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/IEvaluationListener.java b/trunk/src/java/org/apache/poi/ss/formula/IEvaluationListener.java
deleted file mode 100644
index bab3ba3..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/IEvaluationListener.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests can implement this class to track the internal working of the {@link WorkbookEvaluator}.<br/>
- *
- * For POI internal testing use only
- *
- * @author Josh Micich
- */
-interface IEvaluationListener {
-	/**
-	 * A (mostly) opaque interface to allow test clients to trace cache values
-	 * Each spreadsheet cell gets one unique cache entry instance.  These objects
-	 * are safe to use as keys in {@link java.util.HashMap}s
-	 */
-	interface ICacheEntry {
-		ValueEval getValue();
-	}
-
-	void onCacheHit(int sheetIndex, int rowIndex, int columnIndex, ValueEval result);
-	void onReadPlainValue(int sheetIndex, int rowIndex, int columnIndex, ICacheEntry entry);
-	void onStartEvaluate(EvaluationCell cell, ICacheEntry entry);
-	void onEndEvaluate(ICacheEntry entry, ValueEval result);
-	void onClearWholeCache();
-	void onClearCachedValue(ICacheEntry entry);
-	/**
-	 * Internally, formula {@link ICacheEntry}s are stored in sets which may change ordering due
-	 * to seemingly trivial changes.  This method is provided to make the order of call-backs to
-	 * {@link #onClearDependentCachedValue(ICacheEntry, int)} more deterministic.
-	 */
-	void sortDependentCachedValues(ICacheEntry[] formulaCells);
-	void onClearDependentCachedValue(ICacheEntry formulaCell, int depth);
-	void onChangeFromBlankValue(int sheetIndex, int rowIndex, int columnIndex,
-			EvaluationCell cell, ICacheEntry entry);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/IStabilityClassifier.java b/trunk/src/java/org/apache/poi/ss/formula/IStabilityClassifier.java
deleted file mode 100644
index 089469b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/IStabilityClassifier.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-/**
- * Used to help optimise cell evaluation result caching by allowing applications to specify which
- * parts of a workbook are <em>final</em>.<br/>
- * The term <b>final</b> is introduced here to denote immutability or 'having constant definition'.
- * This classification refers to potential actions (on the evaluated workbook) by the evaluating
- * application.  It does not refer to operations performed by the evaluator ({@link 
- * WorkbookEvaluator}).<br/>
- * <br/>
- * <b>General guidelines</b>:
- * <ul>
- * <li>a plain value cell can be marked as 'final' if it will not be changed after the first call
- * to {@link WorkbookEvaluator#evaluate(EvaluationCell)}.
- * </li>
- * <li>a formula cell can be marked as 'final' if its formula will not be changed after the first
- * call to {@link WorkbookEvaluator#evaluate(EvaluationCell)}.  This remains true even if changes 
- * in dependent values may cause the evaluated value to change.</li>
- * <li>plain value cells should be marked as 'not final' if their plain value value may change.
- * </li>  
- * <li>formula cells should be marked as 'not final' if their formula definition may change.</li>  
- * <li>cells which may switch between plain value and formula should also be marked as 'not final'.
- * </li>  
- * </ul>
- * <b>Notes</b>:
- * <ul>
- * <li>If none of the spreadsheet cells is expected to have its definition changed after evaluation
- * begins, every cell can be marked as 'final'. This is the most efficient / least resource 
- * intensive option.</li>
- * <li>To retain freedom to change any cell definition at any time, an application may classify all
- * cells as 'not final'.  This freedom comes at the expense of greater memory consumption.</li>
- * <li>For the purpose of these classifications, setting the cached formula result of a cell (for 
- * example in {@link org.apache.poi.ss.usermodel.FormulaEvaluator#evaluateFormulaCellEnum(org.apache.poi.ss.usermodel.Cell)})
- * does not constitute changing the definition of the cell.</li>
- * <li>Updating cells which have been classified as 'final' will cause the evaluator to behave 
- * unpredictably (typically ignoring the update).</li> 
- * </ul>
- * 
- * @author Josh Micich
- */
-public interface IStabilityClassifier {
-
-	/**
-	 * Convenience implementation for situations where all cell definitions remain fixed after
-	 * evaluation begins.
-	 */
-	IStabilityClassifier TOTALLY_IMMUTABLE = new IStabilityClassifier() {
-		public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
-			return true;
-		}
-	};
-
-	/**
-	 * Checks if a cell's value(/formula) is fixed - in other words - not expected to be modified
-	 * between calls to the evaluator. (Note - this is an independent concept from whether a 
-	 * formula cell's evaluated value may change during successive calls to the evaluator).
-	 * 
-	 * @param sheetIndex zero based index into workbook sheet list
-	 * @param rowIndex zero based row index of cell
-	 * @param columnIndex zero based column index of cell
-	 * @return <code>false</code> if the evaluating application may need to modify the specified 
-	 * cell between calls to the evaluator. 
-	 */
-	boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/LazyAreaEval.java b/trunk/src/java/org/apache/poi/ss/formula/LazyAreaEval.java
deleted file mode 100644
index 4bfbf41..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/LazyAreaEval.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.AreaEvalBase;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaI.OffsetArea;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Provides Lazy Evaluation to 3D Ranges
- */
-final class LazyAreaEval extends AreaEvalBase {
-	private final SheetRangeEvaluator _evaluator;
-
-	LazyAreaEval(AreaI ptg, SheetRangeEvaluator evaluator) {
-		super(ptg, evaluator);
-		_evaluator = evaluator;
-	}
-
-	public LazyAreaEval(int firstRowIndex, int firstColumnIndex, int lastRowIndex,
-			int lastColumnIndex, SheetRangeEvaluator evaluator) {
-		super(evaluator, firstRowIndex, firstColumnIndex, lastRowIndex, lastColumnIndex);
-		_evaluator = evaluator;
-	}
-
-    public ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex) {
-        return getRelativeValue(getFirstSheetIndex(), relativeRowIndex, relativeColumnIndex);
-    }
-    public ValueEval getRelativeValue(int sheetIndex, int relativeRowIndex, int relativeColumnIndex) {
-		int rowIx = (relativeRowIndex + getFirstRow() ) ;
-		int colIx = (relativeColumnIndex + getFirstColumn() ) ;
-
-		return _evaluator.getEvalForCell(sheetIndex, rowIx, colIx);
-	}
-
-	public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
-		AreaI area = new OffsetArea(getFirstRow(), getFirstColumn(),
-				relFirstRowIx, relLastRowIx, relFirstColIx, relLastColIx);
-
-		return new LazyAreaEval(area, _evaluator);
-	}
-	public LazyAreaEval getRow(int rowIndex) {
-		if (rowIndex >= getHeight()) {
-			throw new IllegalArgumentException("Invalid rowIndex " + rowIndex
-					+ ".  Allowable range is (0.." + getHeight() + ").");
-		}
-		int absRowIx = getFirstRow() + rowIndex;
-		return new LazyAreaEval(absRowIx, getFirstColumn(), absRowIx, getLastColumn(), _evaluator);
-	}
-	public LazyAreaEval getColumn(int columnIndex) {
-		if (columnIndex >= getWidth()) {
-			throw new IllegalArgumentException("Invalid columnIndex " + columnIndex
-					+ ".  Allowable range is (0.." + getWidth() + ").");
-		}
-		int absColIx = getFirstColumn() + columnIndex;
-		return new LazyAreaEval(getFirstRow(), absColIx, getLastRow(), absColIx, _evaluator);
-	}
-
-	public String toString() {
-		CellReference crA = new CellReference(getFirstRow(), getFirstColumn());
-		CellReference crB = new CellReference(getLastRow(), getLastColumn());
-		return getClass().getName() + "[" +
-				_evaluator.getSheetNameRange() +
-				'!' +
-				crA.formatAsString() +
-				':' +
-				crB.formatAsString() +
-				"]";
-	}
-
-    /**
-     * @return  whether cell at rowIndex and columnIndex is a subtotal
-    */
-    public boolean isSubTotal(int rowIndex, int columnIndex){
-        // delegate the query to the sheet evaluator which has access to internal ptgs
-        SheetRefEvaluator _sre = _evaluator.getSheetEvaluator(_evaluator.getFirstSheetIndex());
-        return _sre.isSubTotal(getFirstRow() + rowIndex, getFirstColumn() + columnIndex);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java b/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java
deleted file mode 100644
index c71b0e9..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.RefEvalBase;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaI.OffsetArea;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Provides Lazy Evaluation to a 3D Reference
- */
-public final class LazyRefEval extends RefEvalBase {
-	private final SheetRangeEvaluator _evaluator;
-
-	public LazyRefEval(int rowIndex, int columnIndex, SheetRangeEvaluator sre) {
-		super(sre, rowIndex, columnIndex);
-		_evaluator = sre;
-	}
-
-	public ValueEval getInnerValueEval(int sheetIndex) {
-		return _evaluator.getEvalForCell(sheetIndex, getRow(), getColumn());
-	}
-
-	public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
-
-		AreaI area = new OffsetArea(getRow(), getColumn(),
-				relFirstRowIx, relLastRowIx, relFirstColIx, relLastColIx);
-
-		return new LazyAreaEval(area, _evaluator);
-	}
-
-	public boolean isSubTotal() {
-		SheetRefEvaluator sheetEvaluator = _evaluator.getSheetEvaluator(getFirstSheetIndex());
-		return sheetEvaluator.isSubTotal(getRow(), getColumn());
-	}
-
-	public String toString() {
-		CellReference cr = new CellReference(getRow(), getColumn());
-		return getClass().getName() + "[" +
-				_evaluator.getSheetNameRange() +
-				'!' +
-				cr.formatAsString() +
-				"]";
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/NameIdentifier.java b/trunk/src/java/org/apache/poi/ss/formula/NameIdentifier.java
deleted file mode 100644
index 341a960..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/NameIdentifier.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-public class NameIdentifier {
-    private final String _name;
-    private final boolean _isQuoted;
-
-    public NameIdentifier(String name, boolean isQuoted) {
-        _name = name;
-        _isQuoted = isQuoted;
-    }
-    public String getName() {
-        return _name;
-    }
-    public boolean isQuoted() {
-        return _isQuoted;
-    }
-    public String toString() {
-        StringBuffer sb = new StringBuffer(64);
-        sb.append(getClass().getName());
-        sb.append(" [");
-        if (_isQuoted) {
-            sb.append("'").append(_name).append("'");
-        } else {
-            sb.append(_name);
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java b/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
deleted file mode 100644
index 8e438c9..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.ControlPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.IntersectionPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RangePtg;
-import org.apache.poi.ss.formula.ptg.UnionPtg;
-import org.apache.poi.ss.formula.ptg.ValueOperatorPtg;
-import org.apache.poi.util.Removal;
-
-/**
- * This class performs 'operand class' transformation. Non-base tokens are classified into three
- * operand classes:
- * <ul>
- * <li>reference</li>
- * <li>value</li>
- * <li>array</li>
- * </ul>
- * <p/>
- *
- * The final operand class chosen for each token depends on the formula type and the token's place
- * in the formula. If POI gets the operand class wrong, Excel <em>may</em> interpret the formula
- * incorrectly.  This condition is typically manifested as a formula cell that displays as '#VALUE!',
- * but resolves correctly when the user presses F2, enter.<p/>
- *
- * The logic implemented here was partially inspired by the description in
- * "OpenOffice.org's Documentation of the Microsoft Excel File Format".  The model presented there
- * seems to be inconsistent with observed Excel behaviour (These differences have not been fully
- * investigated). The implementation in this class has been heavily modified in order to satisfy
- * concrete examples of how Excel performs the same logic (see TestRVA).<p/>
- *
- * Hopefully, as additional important test cases are identified and added to the test suite,
- * patterns might become more obvious in this code and allow for simplification.
- *
- * @author Josh Micich
- */
-final class OperandClassTransformer {
-
-	private final FormulaType _formulaType;
-
-	/**
-	 * @deprecated POI 3.15 beta 3. Use {@code OperandClassTransformer(FormulaType)} instead.
-	 */
-	@Removal(version="3.17")
-	public OperandClassTransformer(int formulaType) {
-		this(FormulaType.forInt(formulaType));
-	}
-	public OperandClassTransformer(FormulaType formulaType) {
-		_formulaType = formulaType;
-	}
-
-	/**
-	 * Traverses the supplied formula parse tree, calling <tt>Ptg.setClass()</tt> for each non-base
-	 * token to set its operand class.
-	 */
-	public void transformFormula(ParseNode rootNode) {
-		byte rootNodeOperandClass;
-		switch (_formulaType) {
-			case CELL:
-				rootNodeOperandClass = Ptg.CLASS_VALUE;
-				break;
-			case ARRAY:
-				rootNodeOperandClass = Ptg.CLASS_ARRAY;
-				break;
-			case NAMEDRANGE:
-			case DATAVALIDATION_LIST:
-				rootNodeOperandClass = Ptg.CLASS_REF;
-				break;
-			default:
-				throw new RuntimeException("Incomplete code - formula type ("
-						+ _formulaType + ") not supported yet");
-
-		}
-		transformNode(rootNode, rootNodeOperandClass, false);
-	}
-
-	/**
-	 * @param callerForceArrayFlag <code>true</code> if one of the current node's parents is a
-	 * function Ptg which has been changed from default 'V' to 'A' type (due to requirements on
-	 * the function return value).
-	 */
-	private void transformNode(ParseNode node, byte desiredOperandClass,
-			boolean callerForceArrayFlag) {
-		Ptg token = node.getToken();
-		ParseNode[] children = node.getChildren();
-		boolean isSimpleValueFunc = isSimpleValueFunction(token);
-
-		if (isSimpleValueFunc) {
-			boolean localForceArray = desiredOperandClass == Ptg.CLASS_ARRAY;
-			for (int i = 0; i < children.length; i++) {
-				transformNode(children[i], desiredOperandClass, localForceArray);
-			}
-			setSimpleValueFuncClass((AbstractFunctionPtg) token, desiredOperandClass, callerForceArrayFlag);
-			return;
-		}
-
-		if (isSingleArgSum(token)) {
-			// Need to process the argument of SUM with transformFunctionNode below
-			// so make a dummy FuncVarPtg for that call.
-			token = FuncVarPtg.SUM;
-			// Note - the tAttrSum token (node.getToken()) is a base
-			// token so does not need to have its operand class set
-		}
-		if (token instanceof ValueOperatorPtg || token instanceof ControlPtg
-				|| token instanceof MemFuncPtg
-				|| token instanceof MemAreaPtg
-				|| token instanceof UnionPtg
-				|| token instanceof IntersectionPtg) {
-			// Value Operator Ptgs and Control are base tokens, so token will be unchanged
-			// but any child nodes are processed according to desiredOperandClass and callerForceArrayFlag
-
-			// As per OOO documentation Sec 3.2.4 "Token Class Transformation", "Step 1"
-			// All direct operands of value operators that are initially 'R' type will
-			// be converted to 'V' type.
-			byte localDesiredOperandClass = desiredOperandClass == Ptg.CLASS_REF ? Ptg.CLASS_VALUE : desiredOperandClass;
-			for (int i = 0; i < children.length; i++) {
-				transformNode(children[i], localDesiredOperandClass, callerForceArrayFlag);
-			}
-			return;
-		}
-		if (token instanceof AbstractFunctionPtg) {
-			transformFunctionNode((AbstractFunctionPtg) token, children, desiredOperandClass, callerForceArrayFlag);
-			return;
-		}
-		if (children.length > 0) {
-			if (token == RangePtg.instance) {
-				// TODO is any token transformation required under the various ref operators?
-				return;
-			}
-			throw new IllegalStateException("Node should not have any children");
-		}
-
-		if (token.isBaseToken()) {
-			// nothing to do
-			return;
-		}
-		token.setClass(transformClass(token.getPtgClass(), desiredOperandClass, callerForceArrayFlag));
-	}
-
-	private static boolean isSingleArgSum(Ptg token) {
-		if (token instanceof AttrPtg) {
-			AttrPtg attrPtg = (AttrPtg) token;
-			return attrPtg.isSum();
-		}
-		return false;
-	}
-
-	private static boolean isSimpleValueFunction(Ptg token) {
-		if (token instanceof AbstractFunctionPtg) {
-			AbstractFunctionPtg aptg = (AbstractFunctionPtg) token;
-			if (aptg.getDefaultOperandClass() != Ptg.CLASS_VALUE) {
-				return false;
-			}
-			int numberOfOperands = aptg.getNumberOfOperands();
-			for (int i=numberOfOperands-1; i>=0; i--) {
-				if (aptg.getParameterClass(i) != Ptg.CLASS_VALUE) {
-					return false;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-
-	private byte transformClass(byte currentOperandClass, byte desiredOperandClass,
-			boolean callerForceArrayFlag) {
-		switch (desiredOperandClass) {
-			case Ptg.CLASS_VALUE:
-				if (!callerForceArrayFlag) {
-					return Ptg.CLASS_VALUE;
-				}
-				// else fall through
-			case Ptg.CLASS_ARRAY:
-				return Ptg.CLASS_ARRAY;
-			case Ptg.CLASS_REF:
-				if (!callerForceArrayFlag) {
-					return currentOperandClass;
-				}
-				return Ptg.CLASS_REF;
-		}
-		throw new IllegalStateException("Unexpected operand class (" + desiredOperandClass + ")");
-	}
-
-	private void transformFunctionNode(AbstractFunctionPtg afp, ParseNode[] children,
-			byte desiredOperandClass, boolean callerForceArrayFlag) {
-
-		boolean localForceArrayFlag;
-		byte defaultReturnOperandClass = afp.getDefaultOperandClass();
-
-		if (callerForceArrayFlag) {
-			switch (defaultReturnOperandClass) {
-				case Ptg.CLASS_REF:
-					if (desiredOperandClass == Ptg.CLASS_REF) {
-						afp.setClass(Ptg.CLASS_REF);
-					} else {
-						afp.setClass(Ptg.CLASS_ARRAY);
-					}
-					localForceArrayFlag = false;
-					break;
-				case Ptg.CLASS_ARRAY:
-					afp.setClass(Ptg.CLASS_ARRAY);
-					localForceArrayFlag = false;
-					break;
-				case Ptg.CLASS_VALUE:
-					afp.setClass(Ptg.CLASS_ARRAY);
-					localForceArrayFlag = true;
-					break;
-				default:
-					throw new IllegalStateException("Unexpected operand class ("
-							+ defaultReturnOperandClass + ")");
-			}
-		} else {
-			if (defaultReturnOperandClass == desiredOperandClass) {
-				localForceArrayFlag = false;
-				// an alternative would have been to for non-base Ptgs to set their operand class
-				// from their default, but this would require the call in many subclasses because
-				// the default OC is not known until the end of the constructor
-				afp.setClass(defaultReturnOperandClass);
-			} else {
-				switch (desiredOperandClass) {
-					case Ptg.CLASS_VALUE:
-						// always OK to set functions to return 'value'
-						afp.setClass(Ptg.CLASS_VALUE);
-						localForceArrayFlag = false;
-						break;
-					case Ptg.CLASS_ARRAY:
-						switch (defaultReturnOperandClass) {
-							case Ptg.CLASS_REF:
-								afp.setClass(Ptg.CLASS_REF);
-//								afp.setClass(Ptg.CLASS_ARRAY);
-								break;
-							case Ptg.CLASS_VALUE:
-								afp.setClass(Ptg.CLASS_ARRAY);
-								break;
-							default:
-								throw new IllegalStateException("Unexpected operand class ("
-										+ defaultReturnOperandClass + ")");
-						}
-						localForceArrayFlag = (defaultReturnOperandClass == Ptg.CLASS_VALUE);
-						break;
-					case Ptg.CLASS_REF:
-						switch (defaultReturnOperandClass) {
-							case Ptg.CLASS_ARRAY:
-								afp.setClass(Ptg.CLASS_ARRAY);
-								break;
-							case Ptg.CLASS_VALUE:
-								afp.setClass(Ptg.CLASS_VALUE);
-								break;
-							default:
-								throw new IllegalStateException("Unexpected operand class ("
-										+ defaultReturnOperandClass + ")");
-						}
-						localForceArrayFlag = false;
-						break;
-					default:
-						throw new IllegalStateException("Unexpected operand class ("
-								+ desiredOperandClass + ")");
-				}
-
-			}
-		}
-
-		for (int i = 0; i < children.length; i++) {
-			ParseNode child = children[i];
-			byte paramOperandClass = afp.getParameterClass(i);
-			transformNode(child, paramOperandClass, localForceArrayFlag);
-		}
-	}
-
-	private void setSimpleValueFuncClass(AbstractFunctionPtg afp,
-			byte desiredOperandClass, boolean callerForceArrayFlag) {
-
-		if (callerForceArrayFlag  || desiredOperandClass == Ptg.CLASS_ARRAY) {
-			afp.setClass(Ptg.CLASS_ARRAY);
-		} else {
-			afp.setClass(Ptg.CLASS_VALUE);
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
deleted file mode 100644
index d7345f7..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.CollaboratingWorkbooksEnvironment.WorkbookNotFoundException;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalName;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheet;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheetRange;
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ExternalNameEval;
-import org.apache.poi.ss.formula.eval.FunctionNameEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.Area3DPxg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.NameXPxg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPxg;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.CellReference.NameType;
-
-/**
- * Contains all the contextual information required to evaluate an operation
- * within a formula
- *
- * For POI internal use only
- */
-public final class OperationEvaluationContext {
-    public static final FreeRefFunction UDF = UserDefinedFunction.instance;
-    private final EvaluationWorkbook _workbook;
-    private final int _sheetIndex;
-    private final int _rowIndex;
-    private final int _columnIndex;
-    private final EvaluationTracker _tracker;
-    private final WorkbookEvaluator _bookEvaluator;
-
-    public OperationEvaluationContext(WorkbookEvaluator bookEvaluator, EvaluationWorkbook workbook, int sheetIndex, int srcRowNum,
-            int srcColNum, EvaluationTracker tracker) {
-        _bookEvaluator = bookEvaluator;
-        _workbook = workbook;
-        _sheetIndex = sheetIndex;
-        _rowIndex = srcRowNum;
-        _columnIndex = srcColNum;
-        _tracker = tracker;
-    }
-
-    public EvaluationWorkbook getWorkbook() {
-        return _workbook;
-    }
-
-    public int getRowIndex() {
-        return _rowIndex;
-    }
-
-    public int getColumnIndex() {
-        return _columnIndex;
-    }
-
-    SheetRangeEvaluator createExternSheetRefEvaluator(ExternSheetReferenceToken ptg) {
-        return createExternSheetRefEvaluator(ptg.getExternSheetIndex());
-    }
-    SheetRangeEvaluator createExternSheetRefEvaluator(String firstSheetName, String lastSheetName, int externalWorkbookNumber) {
-        ExternalSheet externalSheet = _workbook.getExternalSheet(firstSheetName, lastSheetName, externalWorkbookNumber);
-        return createExternSheetRefEvaluator(externalSheet);
-    }
-    SheetRangeEvaluator createExternSheetRefEvaluator(int externSheetIndex) {
-        ExternalSheet externalSheet = _workbook.getExternalSheet(externSheetIndex);
-        return createExternSheetRefEvaluator(externalSheet);
-    }
-    SheetRangeEvaluator createExternSheetRefEvaluator(ExternalSheet externalSheet) {
-        WorkbookEvaluator targetEvaluator;
-        int otherFirstSheetIndex;
-        int otherLastSheetIndex = -1;
-        if (externalSheet == null || externalSheet.getWorkbookName() == null) {
-            // sheet is in same workbook
-            targetEvaluator = _bookEvaluator;
-            if(externalSheet == null) {
-                otherFirstSheetIndex = 0;
-            } else {
-                otherFirstSheetIndex = _workbook.getSheetIndex(externalSheet.getSheetName());
-            }
-            
-            if (externalSheet instanceof ExternalSheetRange) {
-                String lastSheetName = ((ExternalSheetRange)externalSheet).getLastSheetName();
-                otherLastSheetIndex = _workbook.getSheetIndex(lastSheetName);
-            }
-        } else {
-            // look up sheet by name from external workbook
-            String workbookName = externalSheet.getWorkbookName();
-            try {
-                targetEvaluator = _bookEvaluator.getOtherWorkbookEvaluator(workbookName);
-            } catch (WorkbookNotFoundException e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-            
-            otherFirstSheetIndex = targetEvaluator.getSheetIndex(externalSheet.getSheetName());
-            if (externalSheet instanceof ExternalSheetRange) {
-                String lastSheetName = ((ExternalSheetRange)externalSheet).getLastSheetName();
-                otherLastSheetIndex = targetEvaluator.getSheetIndex(lastSheetName);
-            }
-            
-            if (otherFirstSheetIndex < 0) {
-                throw new RuntimeException("Invalid sheet name '" + externalSheet.getSheetName()
-                        + "' in bool '" + workbookName + "'.");
-            }
-        }
-        
-        if (otherLastSheetIndex == -1) {
-            // Reference to just one sheet
-            otherLastSheetIndex = otherFirstSheetIndex;
-        }
-        
-        SheetRefEvaluator[] evals = new SheetRefEvaluator[otherLastSheetIndex-otherFirstSheetIndex+1];
-        for (int i=0; i<evals.length; i++) {
-            int otherSheetIndex = i+otherFirstSheetIndex;
-            evals[i] = new SheetRefEvaluator(targetEvaluator, _tracker, otherSheetIndex); 
-        }
-        return new SheetRangeEvaluator(otherFirstSheetIndex, otherLastSheetIndex, evals);
-    }
-
-    /**
-     * @return <code>null</code> if either workbook or sheet is not found
-     */
-    private SheetRefEvaluator createExternSheetRefEvaluator(String workbookName, String sheetName) {
-        WorkbookEvaluator targetEvaluator;
-        if (workbookName == null) {
-            targetEvaluator = _bookEvaluator;
-        } else {
-            if (sheetName == null) {
-                throw new IllegalArgumentException("sheetName must not be null if workbookName is provided");
-            }
-            try {
-                targetEvaluator = _bookEvaluator.getOtherWorkbookEvaluator(workbookName);
-            } catch (WorkbookNotFoundException e) {
-                return null;
-            }
-        }
-        int otherSheetIndex = sheetName == null ? _sheetIndex : targetEvaluator.getSheetIndex(sheetName);
-        if (otherSheetIndex < 0) {
-            return null;
-        }
-        return new SheetRefEvaluator(targetEvaluator, _tracker, otherSheetIndex);
-    }
-
-    public SheetRangeEvaluator getRefEvaluatorForCurrentSheet() {
-        SheetRefEvaluator sre = new SheetRefEvaluator(_bookEvaluator, _tracker, _sheetIndex);
-        return new SheetRangeEvaluator(_sheetIndex, sre);
-    }
-
-
-
-    /**
-     * Resolves a cell or area reference dynamically.
-     * @param workbookName the name of the workbook containing the reference.  If <code>null</code>
-     * the current workbook is assumed.  Note - to evaluate formulas which use multiple workbooks,
-     * a {@link CollaboratingWorkbooksEnvironment} must be set up.
-     * @param sheetName the name of the sheet containing the reference.  May be <code>null</code>
-     * (when <tt>workbookName</tt> is also null) in which case the current workbook and sheet is
-     * assumed.
-     * @param refStrPart1 the single cell reference or first part of the area reference.  Must not
-     * be <code>null</code>.
-     * @param refStrPart2 the second part of the area reference. For single cell references this
-     * parameter must be <code>null</code>
-     * @param isA1Style specifies the format for <tt>refStrPart1</tt> and <tt>refStrPart2</tt>.
-     * Pass <code>true</code> for 'A1' style and <code>false</code> for 'R1C1' style.
-     * TODO - currently POI only supports 'A1' reference style
-     * @return a {@link RefEval} or {@link AreaEval}
-     */
-    public ValueEval getDynamicReference(String workbookName, String sheetName, String refStrPart1,
-            String refStrPart2, boolean isA1Style) {
-        if (!isA1Style) {
-            throw new RuntimeException("R1C1 style not supported yet");
-        }
-        SheetRefEvaluator se = createExternSheetRefEvaluator(workbookName, sheetName);
-        if (se == null) {
-            return ErrorEval.REF_INVALID;
-        }
-        SheetRangeEvaluator sre = new SheetRangeEvaluator(_sheetIndex, se);
-        
-        // ugly typecast - TODO - make spreadsheet version more easily accessible
-        SpreadsheetVersion ssVersion = ((FormulaParsingWorkbook)_workbook).getSpreadsheetVersion();
-
-        NameType part1refType = classifyCellReference(refStrPart1, ssVersion);
-        switch (part1refType) {
-            case BAD_CELL_OR_NAMED_RANGE:
-                return ErrorEval.REF_INVALID;
-            case NAMED_RANGE:
-                EvaluationName nm = ((FormulaParsingWorkbook)_workbook).getName(refStrPart1, _sheetIndex);
-                if(!nm.isRange()){
-                    throw new RuntimeException("Specified name '" + refStrPart1 + "' is not a range as expected.");
-                }
-                return _bookEvaluator.evaluateNameFormula(nm.getNameDefinition(), this);
-        }
-        if (refStrPart2 == null) {
-            // no ':'
-            switch (part1refType) {
-                case COLUMN:
-                case ROW:
-                    return ErrorEval.REF_INVALID;
-                case CELL:
-                    CellReference cr = new CellReference(refStrPart1);
-                    return new LazyRefEval(cr.getRow(), cr.getCol(), sre);
-            }
-            throw new IllegalStateException("Unexpected reference classification of '" + refStrPart1 + "'.");
-        }
-        NameType part2refType = classifyCellReference(refStrPart1, ssVersion);
-        switch (part2refType) {
-            case BAD_CELL_OR_NAMED_RANGE:
-                return ErrorEval.REF_INVALID;
-            case NAMED_RANGE:
-                throw new RuntimeException("Cannot evaluate '" + refStrPart1
-                        + "'. Indirect evaluation of defined names not supported yet");
-        }
-
-        if (part2refType != part1refType) {
-            // LHS and RHS of ':' must be compatible
-            return ErrorEval.REF_INVALID;
-        }
-        int firstRow, firstCol, lastRow, lastCol;
-        switch (part1refType) {
-            case COLUMN:
-                firstRow =0;
-                if (part2refType.equals(NameType.COLUMN))
-                {
-                    lastRow = ssVersion.getLastRowIndex();
-                    firstCol = parseRowRef(refStrPart1);
-                    lastCol = parseRowRef(refStrPart2);
-                }
-                else {
-                    lastRow = ssVersion.getLastRowIndex();
-                    firstCol = parseColRef(refStrPart1);
-                    lastCol = parseColRef(refStrPart2);
-                }
-                break;
-            case ROW:
-                // support of cell range in the form of integer:integer
-                firstCol = 0;
-                if (part2refType.equals(NameType.ROW))
-                {
-                    firstRow = parseColRef(refStrPart1);
-                    lastRow = parseColRef(refStrPart2);
-                    lastCol = ssVersion.getLastColumnIndex();
-                } else {
-                    lastCol = ssVersion.getLastColumnIndex();
-                    firstRow = parseRowRef(refStrPart1);
-                    lastRow = parseRowRef(refStrPart2);
-                }
-                break;
-            case CELL:
-                CellReference cr;
-                cr = new CellReference(refStrPart1);
-                firstRow = cr.getRow();
-                firstCol = cr.getCol();
-                cr = new CellReference(refStrPart2);
-                lastRow = cr.getRow();
-                lastCol = cr.getCol();
-                break;
-            default:
-                throw new IllegalStateException("Unexpected reference classification of '" + refStrPart1 + "'.");
-        }
-        return new LazyAreaEval(firstRow, firstCol, lastRow, lastCol, sre);
-    }
-
-    private static int parseRowRef(String refStrPart) {
-        return CellReference.convertColStringToIndex(refStrPart);
-    }
-
-    private static int parseColRef(String refStrPart) {
-        return Integer.parseInt(refStrPart) - 1;
-    }
-
-    private static NameType classifyCellReference(String str, SpreadsheetVersion ssVersion) {
-        int len = str.length();
-        if (len < 1) {
-            return CellReference.NameType.BAD_CELL_OR_NAMED_RANGE;
-        }
-        return CellReference.classifyCellReference(str, ssVersion);
-    }
-
-    public FreeRefFunction findUserDefinedFunction(String functionName) {
-        return _bookEvaluator.findUserDefinedFunction(functionName);
-    }
-
-    public ValueEval getRefEval(int rowIndex, int columnIndex) {
-        SheetRangeEvaluator sre = getRefEvaluatorForCurrentSheet();
-        return new LazyRefEval(rowIndex, columnIndex, sre);
-    }
-    public ValueEval getRef3DEval(Ref3DPtg rptg) {
-        SheetRangeEvaluator sre = createExternSheetRefEvaluator(rptg.getExternSheetIndex());
-        return new LazyRefEval(rptg.getRow(), rptg.getColumn(), sre);
-    }
-    public ValueEval getRef3DEval(Ref3DPxg rptg) {
-        SheetRangeEvaluator sre = createExternSheetRefEvaluator(
-                rptg.getSheetName(), rptg.getLastSheetName(), rptg.getExternalWorkbookNumber());
-        return new LazyRefEval(rptg.getRow(), rptg.getColumn(), sre);
-    }
-    
-    public ValueEval getAreaEval(int firstRowIndex, int firstColumnIndex,
-            int lastRowIndex, int lastColumnIndex) {
-        SheetRangeEvaluator sre = getRefEvaluatorForCurrentSheet();
-        return new LazyAreaEval(firstRowIndex, firstColumnIndex, lastRowIndex, lastColumnIndex, sre);
-    }
-    public ValueEval getArea3DEval(Area3DPtg aptg) {
-        SheetRangeEvaluator sre = createExternSheetRefEvaluator(aptg.getExternSheetIndex());
-        return new LazyAreaEval(aptg.getFirstRow(), aptg.getFirstColumn(),
-                aptg.getLastRow(), aptg.getLastColumn(), sre);
-    }
-    public ValueEval getArea3DEval(Area3DPxg aptg) {
-        SheetRangeEvaluator sre = createExternSheetRefEvaluator(
-                aptg.getSheetName(), aptg.getLastSheetName(), aptg.getExternalWorkbookNumber());
-        return new LazyAreaEval(aptg.getFirstRow(), aptg.getFirstColumn(),
-                aptg.getLastRow(), aptg.getLastColumn(), sre);
-    }
-    
-    public ValueEval getNameXEval(NameXPtg nameXPtg) {
-        // Is the name actually on our workbook?
-        ExternalSheet externSheet = _workbook.getExternalSheet(nameXPtg.getSheetRefIndex());
-        if(externSheet == null || externSheet.getWorkbookName() == null) {
-            // External reference to our own workbook's name
-            return getLocalNameXEval(nameXPtg);
-        }
-        
-        // Look it up for the external workbook
-        String workbookName = externSheet.getWorkbookName();
-        ExternalName externName = _workbook.getExternalName(
-              nameXPtg.getSheetRefIndex(), 
-              nameXPtg.getNameIndex()
-        );
-        return getExternalNameXEval(externName, workbookName);
-    }
-    public ValueEval getNameXEval(NameXPxg nameXPxg) {
-        ExternalSheet externSheet = _workbook.getExternalSheet(nameXPxg.getSheetName(), null, nameXPxg.getExternalWorkbookNumber());
-        if(externSheet == null || externSheet.getWorkbookName() == null) {
-            // External reference to our own workbook's name
-            return getLocalNameXEval(nameXPxg);
-        }
-  
-        // Look it up for the external workbook
-        String workbookName = externSheet.getWorkbookName();
-        ExternalName externName = _workbook.getExternalName(
-              nameXPxg.getNameName(),
-              nameXPxg.getSheetName(),
-              nameXPxg.getExternalWorkbookNumber()
-        );
-        return getExternalNameXEval(externName, workbookName);
-    }
-    
-    private ValueEval getLocalNameXEval(NameXPxg nameXPxg) {
-        // Look up the sheet, if present
-        int sIdx = -1;
-        if (nameXPxg.getSheetName() != null) {
-            sIdx = _workbook.getSheetIndex(nameXPxg.getSheetName());
-        }
-        
-        // Is it a name or a function?
-        String name = nameXPxg.getNameName();
-        EvaluationName evalName = _workbook.getName(name, sIdx);
-        if (evalName != null) {
-            // Process it as a name
-            return new ExternalNameEval(evalName);
-        } else {
-            // Must be an external function
-            return new FunctionNameEval(name);
-        }
-    }
-    private ValueEval getLocalNameXEval(NameXPtg nameXPtg) {
-        String name = _workbook.resolveNameXText(nameXPtg);
-        
-        // Try to parse it as a name
-        int sheetNameAt = name.indexOf('!'); 
-        EvaluationName evalName = null;
-        if (sheetNameAt > -1) {
-            // Sheet based name
-            String sheetName = name.substring(0, sheetNameAt);
-            String nameName = name.substring(sheetNameAt+1);
-            evalName = _workbook.getName(nameName, _workbook.getSheetIndex(sheetName));
-        } else {
-            // Workbook based name
-            evalName = _workbook.getName(name, -1);
-        }
-        
-        if (evalName != null) {
-            // Process it as a name
-            return new ExternalNameEval(evalName);
-        } else {
-            // Must be an external function
-            return new FunctionNameEval(name);
-        }
-    }
-    public int getSheetIndex() {
-        return _sheetIndex;
-    }
-    
-    private ValueEval getExternalNameXEval(ExternalName externName, String workbookName) {
-        try {
-            // Fetch the workbook this refers to, and the name as defined with that
-            WorkbookEvaluator refWorkbookEvaluator = _bookEvaluator.getOtherWorkbookEvaluator(workbookName);
-            EvaluationName evaluationName = refWorkbookEvaluator.getName(externName.getName(),externName.getIx()-1);
-            if (evaluationName != null && evaluationName.hasFormula()){
-                if (evaluationName.getNameDefinition().length > 1) {
-                    throw new RuntimeException("Complex name formulas not supported yet");
-                }
-                
-                // Need to evaluate the reference in the context of the other book
-                OperationEvaluationContext refWorkbookContext = new OperationEvaluationContext(
-                        refWorkbookEvaluator, refWorkbookEvaluator.getWorkbook(), -1, -1, -1, _tracker);
-                
-                Ptg ptg = evaluationName.getNameDefinition()[0];
-                if (ptg instanceof Ref3DPtg){
-                    Ref3DPtg ref3D = (Ref3DPtg)ptg;
-                    return refWorkbookContext.getRef3DEval(ref3D);
-                } else if (ptg instanceof Ref3DPxg){
-                    Ref3DPxg ref3D = (Ref3DPxg)ptg;
-                    return refWorkbookContext.getRef3DEval(ref3D);
-                } else if(ptg instanceof Area3DPtg){
-                    Area3DPtg area3D = (Area3DPtg)ptg;
-                    return refWorkbookContext.getArea3DEval(area3D);
-                } else if(ptg instanceof Area3DPxg){
-                    Area3DPxg area3D = (Area3DPxg)ptg;
-                    return refWorkbookContext.getArea3DEval(area3D);
-                }
-            }
-            return ErrorEval.REF_INVALID;
-        } catch(WorkbookNotFoundException wnfe){
-            return ErrorEval.REF_INVALID;
-        }
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java b/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
deleted file mode 100644
index 31b86b1..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.AddPtg;
-import org.apache.poi.ss.formula.ptg.ConcatPtg;
-import org.apache.poi.ss.formula.ptg.DividePtg;
-import org.apache.poi.ss.formula.ptg.EqualPtg;
-import org.apache.poi.ss.formula.ptg.GreaterEqualPtg;
-import org.apache.poi.ss.formula.ptg.GreaterThanPtg;
-import org.apache.poi.ss.formula.ptg.IntersectionPtg;
-import org.apache.poi.ss.formula.ptg.LessEqualPtg;
-import org.apache.poi.ss.formula.ptg.LessThanPtg;
-import org.apache.poi.ss.formula.ptg.MultiplyPtg;
-import org.apache.poi.ss.formula.ptg.NotEqualPtg;
-import org.apache.poi.ss.formula.ptg.OperationPtg;
-import org.apache.poi.ss.formula.ptg.PercentPtg;
-import org.apache.poi.ss.formula.ptg.PowerPtg;
-import org.apache.poi.ss.formula.ptg.RangePtg;
-import org.apache.poi.ss.formula.ptg.SubtractPtg;
-import org.apache.poi.ss.formula.ptg.UnaryMinusPtg;
-import org.apache.poi.ss.formula.ptg.UnaryPlusPtg;
-import org.apache.poi.ss.formula.eval.ConcatEval;
-import org.apache.poi.ss.formula.eval.FunctionEval;
-import org.apache.poi.ss.formula.eval.IntersectionEval;
-import org.apache.poi.ss.formula.eval.PercentEval;
-import org.apache.poi.ss.formula.eval.RangeEval;
-import org.apache.poi.ss.formula.eval.RelationalOperationEval;
-import org.apache.poi.ss.formula.eval.TwoOperandNumericOperation;
-import org.apache.poi.ss.formula.eval.UnaryMinusEval;
-import org.apache.poi.ss.formula.eval.UnaryPlusEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.ss.formula.functions.Function;
-import org.apache.poi.ss.formula.functions.Indirect;
-
-/**
- * This class creates <tt>OperationEval</tt> instances to help evaluate <tt>OperationPtg</tt>
- * formula tokens.
- *
- * @author Josh Micich
- */
-final class OperationEvaluatorFactory {
-
-	private static final Map<OperationPtg, Function> _instancesByPtgClass = initialiseInstancesMap();
-
-	private OperationEvaluatorFactory() {
-		// no instances of this class
-	}
-
-	private static Map<OperationPtg, Function> initialiseInstancesMap() {
-		Map<OperationPtg, Function> m = new HashMap<OperationPtg, Function>(32);
-
-		put(m, EqualPtg.instance, RelationalOperationEval.EqualEval);
-		put(m, GreaterEqualPtg.instance, RelationalOperationEval.GreaterEqualEval);
-		put(m, GreaterThanPtg.instance, RelationalOperationEval.GreaterThanEval);
-		put(m, LessEqualPtg.instance, RelationalOperationEval.LessEqualEval);
-		put(m, LessThanPtg.instance, RelationalOperationEval.LessThanEval);
-		put(m, NotEqualPtg.instance, RelationalOperationEval.NotEqualEval);
-
-		put(m, ConcatPtg.instance, ConcatEval.instance);
-		put(m, AddPtg.instance, TwoOperandNumericOperation.AddEval);
-		put(m, DividePtg.instance, TwoOperandNumericOperation.DivideEval);
-		put(m, MultiplyPtg.instance, TwoOperandNumericOperation.MultiplyEval);
-		put(m, PercentPtg.instance, PercentEval.instance);
-		put(m, PowerPtg.instance, TwoOperandNumericOperation.PowerEval);
-		put(m, SubtractPtg.instance, TwoOperandNumericOperation.SubtractEval);
-		put(m, UnaryMinusPtg.instance, UnaryMinusEval.instance);
-		put(m, UnaryPlusPtg.instance, UnaryPlusEval.instance);
-		put(m, RangePtg.instance, RangeEval.instance);
-		put(m, IntersectionPtg.instance, IntersectionEval.instance);
-		return m;
-	}
-
-	private static void put(Map<OperationPtg, Function> m, OperationPtg ptgKey,
-			Function instance) {
-		// make sure ptg has single private constructor because map lookups assume singleton keys
-		Constructor<?>[] cc = ptgKey.getClass().getDeclaredConstructors();
-		if (cc.length > 1 || !Modifier.isPrivate(cc[0].getModifiers())) {
-			throw new RuntimeException("Failed to verify instance ("
-					+ ptgKey.getClass().getName() + ") is a singleton.");
-		}
-		m.put(ptgKey, instance);
-	}
-
-	/**
-	 * returns the OperationEval concrete impl instance corresponding
-	 * to the supplied operationPtg
-	 */
-	public static ValueEval evaluate(OperationPtg ptg, ValueEval[] args,
-			OperationEvaluationContext ec) {
-		if(ptg == null) {
-			throw new IllegalArgumentException("ptg must not be null");
-		}
-		Function result = _instancesByPtgClass.get(ptg);
-
-		if (result != null) {
-			return  result.evaluate(args, ec.getRowIndex(), (short) ec.getColumnIndex());
-		}
-
-		if (ptg instanceof AbstractFunctionPtg) {
-			AbstractFunctionPtg fptg = (AbstractFunctionPtg)ptg;
-			int functionIndex = fptg.getFunctionIndex();
-			switch (functionIndex) {
-				case FunctionMetadataRegistry.FUNCTION_INDEX_INDIRECT:
-					return Indirect.instance.evaluate(args, ec);
-				case FunctionMetadataRegistry.FUNCTION_INDEX_EXTERNAL:
-					return UserDefinedFunction.instance.evaluate(args, ec);
-			}
-
-			return FunctionEval.getBasicFunction(functionIndex).evaluate(args, ec.getRowIndex(), (short) ec.getColumnIndex());
-		}
-		throw new RuntimeException("Unexpected operation ptg class (" + ptg.getClass().getName() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ParseNode.java b/trunk/src/java/org/apache/poi/ss/formula/ParseNode.java
deleted file mode 100644
index a41ec26..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ParseNode.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.ptg.ArrayPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-/**
- * Represents a syntactic element from a formula by encapsulating the corresponding <tt>Ptg</tt>
- * token.  Each <tt>ParseNode</tt> may have child <tt>ParseNode</tt>s in the case when the wrapped
- * <tt>Ptg</tt> is non-atomic.
- */
-final class ParseNode {
-
-	public static final ParseNode[] EMPTY_ARRAY = { };
-	private final Ptg _token;
-	private final ParseNode[] _children;
-	private boolean _isIf;
-	private final int _tokenCount;
-
-	public ParseNode(Ptg token, ParseNode[] children) {
-		if (token == null) {
-			throw new IllegalArgumentException("token must not be null");
-		}
-		_token = token;
-		_children = children.clone();
-		_isIf = isIf(token);
-		int tokenCount = 1;
-		for (int i = 0; i < children.length; i++) {
-			tokenCount += children[i].getTokenCount();
-		}
-		if (_isIf) {
-			// there will be 2 or 3 extra tAttr tokens according to whether the false param is present
-			tokenCount += children.length;
-		}
-		_tokenCount = tokenCount;
-	}
-	public ParseNode(Ptg token) {
-		this(token, EMPTY_ARRAY);
-	}
-	public ParseNode(Ptg token, ParseNode child0) {
-		this(token, new ParseNode[] { child0, });
-	}
-	public ParseNode(Ptg token, ParseNode child0, ParseNode child1) {
-		this(token, new ParseNode[] { child0, child1, });
-	}
-	private int getTokenCount() {
-		return _tokenCount;
-	}
-	public int getEncodedSize() {
-		int result = _token instanceof ArrayPtg ? ArrayPtg.PLAIN_TOKEN_SIZE : _token.getSize();
-		for (int i = 0; i < _children.length; i++) {
-			result += _children[i].getEncodedSize();
-		}
-		return result;
-	}
-
-	/**
-	 * Collects the array of <tt>Ptg</tt> tokens for the specified tree.
-	 */
-	public static Ptg[] toTokenArray(ParseNode rootNode) {
-		TokenCollector temp = new TokenCollector(rootNode.getTokenCount());
-		rootNode.collectPtgs(temp);
-		return temp.getResult();
-	}
-	private void collectPtgs(TokenCollector temp) {
-		if (isIf(_token)) {
-			collectIfPtgs(temp);
-			return;
-		}
-		boolean isPreFixOperator = _token instanceof MemFuncPtg || _token instanceof MemAreaPtg;
-		if (isPreFixOperator) {
-			temp.add(_token);
-		}
-		for (int i=0; i< getChildren().length; i++) {
-			getChildren()[i].collectPtgs(temp);
-		}
-		if (!isPreFixOperator) {
-			temp.add(_token);
-		}
-	}
-	/**
-	 * The IF() function gets marked up with two or three tAttr tokens.
-	 * Similar logic will be required for CHOOSE() when it is supported
-	 *
-	 * See excelfileformat.pdf sec 3.10.5 "tAttr (19H)
-	 */
-	private void collectIfPtgs(TokenCollector temp) {
-
-		// condition goes first
-		getChildren()[0].collectPtgs(temp);
-
-		// placeholder for tAttrIf
-		int ifAttrIndex = temp.createPlaceholder();
-
-		// true parameter
-		getChildren()[1].collectPtgs(temp);
-
-		// placeholder for first skip attr
-		int skipAfterTrueParamIndex = temp.createPlaceholder();
-		int trueParamSize = temp.sumTokenSizes(ifAttrIndex+1, skipAfterTrueParamIndex);
-
-		AttrPtg attrIf = AttrPtg.createIf(trueParamSize + 4); // distance to start of false parameter/tFuncVar. +4 for tAttrSkip after true
-
-		if (getChildren().length > 2) {
-			// false param present
-
-			// false parameter
-			getChildren()[2].collectPtgs(temp);
-
-			int skipAfterFalseParamIndex = temp.createPlaceholder();
-
-			int falseParamSize =  temp.sumTokenSizes(skipAfterTrueParamIndex+1, skipAfterFalseParamIndex);
-
-			AttrPtg attrSkipAfterTrue = AttrPtg.createSkip(falseParamSize + 4 + 4 - 1); // 1 less than distance to end of if FuncVar(size=4). +4 for attr skip before
-			AttrPtg attrSkipAfterFalse = AttrPtg.createSkip(4 - 1); // 1 less than distance to end of if FuncVar(size=4).
-
-			temp.setPlaceholder(ifAttrIndex, attrIf);
-			temp.setPlaceholder(skipAfterTrueParamIndex, attrSkipAfterTrue);
-			temp.setPlaceholder(skipAfterFalseParamIndex, attrSkipAfterFalse);
-		} else {
-			// false parameter not present
-			AttrPtg attrSkipAfterTrue = AttrPtg.createSkip(4 - 1); // 1 less than distance to end of if FuncVar(size=4).
-
-			temp.setPlaceholder(ifAttrIndex, attrIf);
-			temp.setPlaceholder(skipAfterTrueParamIndex, attrSkipAfterTrue);
-		}
-		temp.add(_token);
-	}
-
-	private static boolean isIf(Ptg token) {
-		if (token instanceof FuncVarPtg) {
-			FuncVarPtg func = (FuncVarPtg) token;
-			if (FunctionMetadataRegistry.FUNCTION_NAME_IF.equals(func.getName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public Ptg getToken() {
-		return _token;
-	}
-
-	public ParseNode[] getChildren() {
-		return _children;
-	}
-
-	private static final class TokenCollector {
-
-		private final Ptg[] _ptgs;
-		private int _offset;
-
-		public TokenCollector(int tokenCount) {
-			_ptgs = new Ptg[tokenCount];
-			_offset = 0;
-		}
-
-		public int sumTokenSizes(int fromIx, int toIx) {
-			int result = 0;
-			for (int i=fromIx; i<toIx; i++) {
-				result += _ptgs[i].getSize();
-			}
-			return result;
-		}
-
-		public int createPlaceholder() {
-			return _offset++;
-		}
-
-		public void add(Ptg token) {
-			if (token == null) {
-				throw new IllegalArgumentException("token must not be null");
-			}
-			_ptgs[_offset] = token;
-			_offset++;
-		}
-
-		public void setPlaceholder(int index, Ptg token) {
-			if (_ptgs[index] != null) {
-				throw new IllegalStateException("Invalid placeholder index (" + index + ")");
-			}
-			_ptgs[index] = token;
-		}
-
-		public Ptg[] getResult() {
-			return _ptgs;
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/PlainCellCache.java b/trunk/src/java/org/apache/poi/ss/formula/PlainCellCache.java
deleted file mode 100644
index f422b96..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/PlainCellCache.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @author Josh Micich
- */
-final class PlainCellCache {
-
-	public static final class Loc {
-
-		private final long _bookSheetColumn;
-
-		private final int _rowIndex;
-
-		public Loc(int bookIndex, int sheetIndex, int rowIndex, int columnIndex) {
-			_bookSheetColumn = toBookSheetColumn(bookIndex, sheetIndex, columnIndex);
-			_rowIndex = rowIndex;
-		}
-
-		public static long toBookSheetColumn(int bookIndex, int sheetIndex, int columnIndex) {
-			return ((bookIndex   & 0xFFFFl) << 48)  +
-                   ((sheetIndex  & 0xFFFFl) << 32) +
-                   ((columnIndex & 0xFFFFl) << 0);
-		}
-
-		public Loc(long bookSheetColumn, int rowIndex) {
-			_bookSheetColumn = bookSheetColumn;
-			_rowIndex = rowIndex;
-		}
-
-		public int hashCode() {
-			return (int)(_bookSheetColumn ^ (_bookSheetColumn >>> 32)) + 17 * _rowIndex;
-		}
-
-		public boolean equals(Object obj) {
-			assert obj instanceof Loc : "these package-private cache key instances are only compared to themselves";
-			Loc other = (Loc) obj;
-			return _bookSheetColumn == other._bookSheetColumn && _rowIndex == other._rowIndex;
-		}
-
-		public int getRowIndex() {
-			return _rowIndex;
-		}
-
-		public int getColumnIndex() {
-            return (int)(_bookSheetColumn & 0x000FFFF);
-		}
-
-        public int getSheetIndex() {
-            return (int)((_bookSheetColumn >> 32) & 0xFFFF);
-        }
-
-        public int getBookIndex() {
-            return (int)((_bookSheetColumn >> 48) & 0xFFFF);
-        }
-	}
-
-	private Map<Loc, PlainValueCellCacheEntry> _plainValueEntriesByLoc;
-
-	public PlainCellCache() {
-		_plainValueEntriesByLoc = new HashMap<Loc, PlainValueCellCacheEntry>();
-	}
-	public void put(Loc key, PlainValueCellCacheEntry cce) {
-		_plainValueEntriesByLoc.put(key, cce);
-	}
-	public void clear() {
-		_plainValueEntriesByLoc.clear();
-	}
-	public PlainValueCellCacheEntry get(Loc key) {
-		return _plainValueEntriesByLoc.get(key);
-	}
-	public void remove(Loc key) {
-		_plainValueEntriesByLoc.remove(key);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java b/trunk/src/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
deleted file mode 100644
index 171b12e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Used for non-formula cells, primarily to keep track of the referencing (formula) cells.
- * 
- * @author Josh Micich
- */
-final class PlainValueCellCacheEntry extends CellCacheEntry {
-	public PlainValueCellCacheEntry(ValueEval value) {
-		updateValue(value);
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/SharedFormula.java b/trunk/src/java/org/apache/poi/ss/formula/SharedFormula.java
deleted file mode 100644
index 0cf492e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/SharedFormula.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.ptg.*;
-import org.apache.poi.ss.SpreadsheetVersion;
-
-/**
- *   Encapsulates logic to convert shared formulaa into non shared equivalent
- */
-public class SharedFormula {
-
-    private final int _columnWrappingMask;
-    private final int _rowWrappingMask;
-
-    public SharedFormula(SpreadsheetVersion ssVersion){
-        _columnWrappingMask = ssVersion.getLastColumnIndex(); //"IV" for .xls and  "XFD" for .xlsx
-        _rowWrappingMask = ssVersion.getLastRowIndex();
-    }
-
-    /**
-     * Creates a non shared formula from the shared formula counterpart, i.e.
-     * Converts the shared formula into the equivalent {@link org.apache.poi.ss.formula.ptg.Ptg} array that it would have,
-     * were it not shared.
-     *
-     * @param ptgs parsed tokens of the shared formula
-     * @param formulaRow
-     * @param formulaColumn
-     */
-    public Ptg[] convertSharedFormulas(Ptg[] ptgs, int formulaRow, int formulaColumn) {
-
-        Ptg[] newPtgStack = new Ptg[ptgs.length];
-
-        for (int k = 0; k < ptgs.length; k++) {
-            Ptg ptg = ptgs[k];
-            byte originalOperandClass = -1;
-            if (!ptg.isBaseToken()) {
-                originalOperandClass = ptg.getPtgClass();
-            }
-            if (ptg instanceof RefPtgBase) {
-                RefPtgBase refNPtg = (RefPtgBase)ptg;
-                ptg = new RefPtg(fixupRelativeRow(formulaRow,refNPtg.getRow(),refNPtg.isRowRelative()),
-                                     fixupRelativeColumn(formulaColumn,refNPtg.getColumn(),refNPtg.isColRelative()),
-                                     refNPtg.isRowRelative(),
-                                     refNPtg.isColRelative());
-                ptg.setClass(originalOperandClass);
-            } else if (ptg instanceof AreaPtgBase) {
-                AreaPtgBase areaNPtg = (AreaPtgBase)ptg;
-                ptg = new AreaPtg(fixupRelativeRow(formulaRow,areaNPtg.getFirstRow(),areaNPtg.isFirstRowRelative()),
-                                fixupRelativeRow(formulaRow,areaNPtg.getLastRow(),areaNPtg.isLastRowRelative()),
-                                fixupRelativeColumn(formulaColumn,areaNPtg.getFirstColumn(),areaNPtg.isFirstColRelative()),
-                                fixupRelativeColumn(formulaColumn,areaNPtg.getLastColumn(),areaNPtg.isLastColRelative()),
-                                areaNPtg.isFirstRowRelative(),
-                                areaNPtg.isLastRowRelative(),
-                                areaNPtg.isFirstColRelative(),
-                                areaNPtg.isLastColRelative());
-                ptg.setClass(originalOperandClass);
-            } else if (ptg instanceof OperandPtg) {
-                // Any subclass of OperandPtg is mutable, so it's safest to not share these instances.
-                ptg = ((OperandPtg) ptg).copy();
-            } else {
-            	// all other Ptgs are immutable and can be shared
-            }
-            newPtgStack[k] = ptg;
-        }
-        return newPtgStack;
-    }
-
-    private int fixupRelativeColumn(int currentcolumn, int column, boolean relative) {
-        if(relative) {
-            // mask out upper bits to produce 'wrapping' at the maximum column ("IV" for .xls and  "XFD" for .xlsx)
-            return (column + currentcolumn) & _columnWrappingMask;
-        }
-        return column;
-    }
-
-    private int fixupRelativeRow(int currentrow, int row, boolean relative) {
-        if(relative) {
-            return (row+currentrow) & _rowWrappingMask;
-        }
-        return row;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/SheetIdentifier.java b/trunk/src/java/org/apache/poi/ss/formula/SheetIdentifier.java
deleted file mode 100644
index 71c7cd0..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/SheetIdentifier.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-public class SheetIdentifier {
-    public String _bookName;
-    public NameIdentifier _sheetIdentifier;
-
-    public SheetIdentifier(String bookName, NameIdentifier sheetIdentifier) {
-        _bookName = bookName;
-        _sheetIdentifier = sheetIdentifier;
-    }
-    public String getBookName() {
-        return _bookName;
-    }
-    public NameIdentifier getSheetIdentifier() {
-        return _sheetIdentifier;
-    }
-    protected void asFormulaString(StringBuffer sb) {
-        if (_bookName != null) {
-            sb.append(" [").append(_sheetIdentifier.getName()).append("]");
-        }
-        if (_sheetIdentifier.isQuoted()) {
-            sb.append("'").append(_sheetIdentifier.getName()).append("'");
-        } else {
-            sb.append(_sheetIdentifier.getName());
-        }
-    }
-    public String asFormulaString() {
-        StringBuffer sb = new StringBuffer(32);
-        asFormulaString(sb);
-        return sb.toString();
-    }
-    public String toString() {
-        StringBuffer sb = new StringBuffer(64);
-        sb.append(getClass().getName());
-        sb.append(" [");
-        asFormulaString(sb);
-        sb.append("]");
-        return sb.toString();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java b/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java
deleted file mode 100644
index 4797048..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.SpreadsheetVersion;
-
-/**
- * Formats sheet names for use in formula expressions.
- * 
- * @author Josh Micich
- */
-public final class SheetNameFormatter {
-	
-	private static final char DELIMITER = '\'';
-	
-	/**
-	 * Matches a single cell ref with no absolute ('$') markers
-	 */
-	private static final Pattern CELL_REF_PATTERN = Pattern.compile("([A-Za-z]+)([0-9]+)");
-
-	private SheetNameFormatter() {
-		// no instances of this class
-	}
-	/**
-	 * Used to format sheet names as they would appear in cell formula expressions.
-	 * @return the sheet name unchanged if there is no need for delimiting.  Otherwise the sheet
-	 * name is enclosed in single quotes (').  Any single quotes which were already present in the 
-	 * sheet name will be converted to double single quotes ('').  
-	 */
-	public static String format(String rawSheetName) {
-		StringBuffer sb = new StringBuffer(rawSheetName.length() + 2);
-		appendFormat(sb, rawSheetName);
-		return sb.toString();
-	}
-	
-	/**
-	 * Convenience method for ({@link #format(String)}) when a StringBuffer is already available.
-	 * 
-	 * @param out - sheet name will be appended here possibly with delimiting quotes 
-	 */
-	public static void appendFormat(StringBuffer out, String rawSheetName) {
-		boolean needsQuotes = needsDelimiting(rawSheetName);
-		if(needsQuotes) {
-			out.append(DELIMITER);
-			appendAndEscape(out, rawSheetName);
-			out.append(DELIMITER);
-		} else {
-			out.append(rawSheetName);
-		}
-	}
-	public static void appendFormat(StringBuffer out, String workbookName, String rawSheetName) {
-		boolean needsQuotes = needsDelimiting(workbookName) || needsDelimiting(rawSheetName);
-		if(needsQuotes) {
-			out.append(DELIMITER);
-			out.append('[');
-			appendAndEscape(out, workbookName.replace('[', '(').replace(']', ')'));
-			out.append(']');
-			appendAndEscape(out, rawSheetName);
-			out.append(DELIMITER);
-		} else {
-			out.append('[');
-			out.append(workbookName);
-			out.append(']');
-			out.append(rawSheetName);
-		}
-	}
-
-	private static void appendAndEscape(StringBuffer sb, String rawSheetName) {
-		int len = rawSheetName.length();
-		for(int i=0; i<len; i++) {
-			char ch = rawSheetName.charAt(i);
-			if(ch == DELIMITER) {
-				// single quotes (') are encoded as ('')
-				sb.append(DELIMITER);
-			}
-			sb.append(ch);
-		}
-	}
-
-	private static boolean needsDelimiting(String rawSheetName) {
-		int len = rawSheetName.length();
-		if(len < 1) {
-			throw new RuntimeException("Zero length string is an invalid sheet name");
-		}
-		if(Character.isDigit(rawSheetName.charAt(0))) {
-			// sheet name with digit in the first position always requires delimiting
-			return true;
-		}
-		for(int i=0; i<len; i++) {
-			char ch = rawSheetName.charAt(i);
-			if(isSpecialChar(ch)) {
-				return true;
-			}
-		}
-		if(Character.isLetter(rawSheetName.charAt(0))
-				&& Character.isDigit(rawSheetName.charAt(len-1))) {
-			// note - values like "A$1:$C$20" don't get this far 
-			if(nameLooksLikePlainCellReference(rawSheetName)) {
-				return true;
-			}
-		}
-		if (nameLooksLikeBooleanLiteral(rawSheetName)) {
-			return true;
-		}
-		// Error constant literals all contain '#' and other special characters
-		// so they don't get this far
-		return false;
-	}
-	
-	private static boolean nameLooksLikeBooleanLiteral(String rawSheetName) {
-		switch(rawSheetName.charAt(0)) {
-			case 'T': case 't':
-				return "TRUE".equalsIgnoreCase(rawSheetName);
-			case 'F': case 'f':
-				return "FALSE".equalsIgnoreCase(rawSheetName);
-		}
-		return false;
-	}
-	/**
-	 * @return <code>true</code> if the presence of the specified character in a sheet name would 
-	 * require the sheet name to be delimited in formulas.  This includes every non-alphanumeric 
-	 * character besides underscore '_' and dot '.'.
-	 */
-	/* package */ static boolean isSpecialChar(char ch) {
-		// note - Character.isJavaIdentifierPart() would allow dollars '$'
-		if(Character.isLetterOrDigit(ch)) {
-			return false;
-		}
-		switch(ch) {
-			case '.': // dot is OK
-			case '_': // underscore is OK
-				return false;
-			case '\n':
-			case '\r':
-			case '\t':
-				throw new RuntimeException("Illegal character (0x" 
-						+ Integer.toHexString(ch) + ") found in sheet name");
-		}
-		return true;
-	}
-	
-
-	/**
-	 * Used to decide whether sheet names like 'AB123' need delimiting due to the fact that they 
-	 * look like cell references.
-	 * <p/>
-	 * This code is currently being used for translating formulas represented with <code>Ptg</code>
-	 * tokens into human readable text form.  In formula expressions, a sheet name always has a 
-	 * trailing '!' so there is little chance for ambiguity.  It doesn't matter too much what this 
-	 * method returns but it is worth noting the likely consumers of these formula text strings:
-	 * <ol>
-	 * <li>POI's own formula parser</li>
-	 * <li>Visual reading by human</li>
-	 * <li>VBA automation entry into Excel cell contents e.g.  ActiveCell.Formula = "=c64!A1"</li>
-	 * <li>Manual entry into Excel cell contents</li>
-	 * <li>Some third party formula parser</li>
-	 * </ol>
-	 * 
-	 * At the time of writing, POI's formula parser tolerates cell-like sheet names in formulas
-	 * with or without delimiters.  The same goes for Excel(2007), both manual and automated entry.  
-	 * <p/>
-	 * For better or worse this implementation attempts to replicate Excel's formula renderer.
-	 * Excel uses range checking on the apparent 'row' and 'column' components.  Note however that
-	 * the maximum sheet size varies across versions.
-	 * @see org.apache.poi.ss.util.CellReference
-	 */
-	/* package */ static boolean cellReferenceIsWithinRange(String lettersPrefix, String numbersSuffix) {
-		return CellReference.cellReferenceIsWithinRange(lettersPrefix, numbersSuffix, SpreadsheetVersion.EXCEL97);
-	}
-
-	/**
-	 * Note - this method assumes the specified rawSheetName has only letters and digits.  It 
-	 * cannot be used to match absolute or range references (using the dollar or colon char).
-	 * <p/>
-	 * Some notable cases:
-	 *    <blockquote><table border="0" cellpadding="1" cellspacing="0" 
-	 *                 summary="Notable cases.">
-	 *      <tr><th>Input&nbsp;</th><th>Result&nbsp;</th><th>Comments</th></tr>
-	 *      <tr><td>"A1"&nbsp;&nbsp;</td><td>true</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"a111"&nbsp;&nbsp;</td><td>true</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"AA"&nbsp;&nbsp;</td><td>false</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"aa1"&nbsp;&nbsp;</td><td>true</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"A1A"&nbsp;&nbsp;</td><td>false</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"A1A1"&nbsp;&nbsp;</td><td>false</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"A$1:$C$20"&nbsp;&nbsp;</td><td>false</td><td>Not a plain cell reference</td></tr>
-	 *      <tr><td>"SALES20080101"&nbsp;&nbsp;</td><td>true</td>
-	 *      		<td>Still needs delimiting even though well out of range</td></tr>
-	 *    </table></blockquote>
-	 *  
-	 * @return <code>true</code> if there is any possible ambiguity that the specified rawSheetName
-	 * could be interpreted as a valid cell name.
-	 */
-	/* package */ static boolean nameLooksLikePlainCellReference(String rawSheetName) {
-		Matcher matcher = CELL_REF_PATTERN.matcher(rawSheetName);
-		if(!matcher.matches()) {
-			return false;
-		}
-		
-		// rawSheetName == "Sheet1" gets this far.
-		String lettersPrefix = matcher.group(1);
-		String numbersSuffix = matcher.group(2);
-		return cellReferenceIsWithinRange(lettersPrefix, numbersSuffix);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java b/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java
deleted file mode 100644
index ab7ccab..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-public interface SheetRange {
-    public int getFirstSheetIndex();
-    public int getLastSheetIndex();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java b/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
deleted file mode 100644
index 68dbb9b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Evaluator for returning cells or sheets for a range of sheets
- */
-final class SheetRangeEvaluator implements SheetRange {
-	private final int _firstSheetIndex;
-    private final int _lastSheetIndex;
-	private SheetRefEvaluator[] _sheetEvaluators;
-
-	public SheetRangeEvaluator(int firstSheetIndex, int lastSheetIndex, SheetRefEvaluator[] sheetEvaluators) {
-		if (firstSheetIndex < 0) {
-			throw new IllegalArgumentException("Invalid firstSheetIndex: " + firstSheetIndex + ".");
-		}
-        if (lastSheetIndex < firstSheetIndex) {
-            throw new IllegalArgumentException("Invalid lastSheetIndex: " + lastSheetIndex + " for firstSheetIndex: " + firstSheetIndex + ".");
-        }
-        _firstSheetIndex = firstSheetIndex;
-        _lastSheetIndex = lastSheetIndex;
-        _sheetEvaluators = sheetEvaluators.clone();
-	}
-    public SheetRangeEvaluator(int onlySheetIndex, SheetRefEvaluator sheetEvaluator) {
-        this(onlySheetIndex, onlySheetIndex, new SheetRefEvaluator[] {sheetEvaluator});
-    }
-	
-	public SheetRefEvaluator getSheetEvaluator(int sheetIndex) {
-	    if (sheetIndex < _firstSheetIndex || sheetIndex > _lastSheetIndex) {
-            throw new IllegalArgumentException("Invalid SheetIndex: " + sheetIndex +
-                    " - Outside range " + _firstSheetIndex + " : " + _lastSheetIndex);
-	    }
-	    return _sheetEvaluators[sheetIndex-_firstSheetIndex];
-	}
-	
-	public int getFirstSheetIndex() {
-	    return _firstSheetIndex;
-	}
-    public int getLastSheetIndex() {
-        return _lastSheetIndex;
-    }
-
-	public String getSheetName(int sheetIndex) {
-	    return getSheetEvaluator(sheetIndex).getSheetName();
-	}
-	public String getSheetNameRange() {
-	    StringBuilder sb = new StringBuilder();
-	    sb.append(getSheetName(_firstSheetIndex));
-	    if (_firstSheetIndex != _lastSheetIndex) {
-	        sb.append(':');
-	        sb.append(getSheetName(_lastSheetIndex));
-	    }
-	    return sb.toString();
-	}
-
-	public ValueEval getEvalForCell(int sheetIndex, int rowIndex, int columnIndex) {
-        return getSheetEvaluator(sheetIndex).getEvalForCell(rowIndex, columnIndex);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java b/trunk/src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
deleted file mode 100644
index c0b851e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-public class SheetRangeIdentifier extends SheetIdentifier {
-    public NameIdentifier _lastSheetIdentifier;
-
-    public SheetRangeIdentifier(String bookName, NameIdentifier firstSheetIdentifier, NameIdentifier lastSheetIdentifier) {
-        super(bookName, firstSheetIdentifier);
-        _lastSheetIdentifier = lastSheetIdentifier;
-    }
-    public NameIdentifier getFirstSheetIdentifier() {
-        return super.getSheetIdentifier();
-    }
-    public NameIdentifier getLastSheetIdentifier() {
-        return _lastSheetIdentifier;
-    }
-    protected void asFormulaString(StringBuffer sb) {
-        super.asFormulaString(sb);
-        sb.append(':');
-        if (_lastSheetIdentifier.isQuoted()) {
-            sb.append("'").append(_lastSheetIdentifier.getName()).append("'");
-        } else {
-            sb.append(_lastSheetIdentifier.getName());
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java b/trunk/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
deleted file mode 100644
index cc27e66..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.CellType;
-
-/**
- * Evaluator for cells within a specific Sheet
- */
-final class SheetRefEvaluator {
-	private final WorkbookEvaluator _bookEvaluator;
-	private final EvaluationTracker _tracker;
-	private final int _sheetIndex;
-	private EvaluationSheet _sheet;
-
-	public SheetRefEvaluator(WorkbookEvaluator bookEvaluator, EvaluationTracker tracker, int sheetIndex) {
-		if (sheetIndex < 0) {
-			throw new IllegalArgumentException("Invalid sheetIndex: " + sheetIndex + ".");
-		}
-		_bookEvaluator = bookEvaluator;
-		_tracker = tracker;
-		_sheetIndex = sheetIndex;
-	}
-
-	public String getSheetName() {
-		return _bookEvaluator.getSheetName(_sheetIndex);
-	}
-
-	public ValueEval getEvalForCell(int rowIndex, int columnIndex) {
-		return _bookEvaluator.evaluateReference(getSheet(), _sheetIndex, rowIndex, columnIndex, _tracker);
-	}
-
-	private EvaluationSheet getSheet() {
-		if (_sheet == null) {
-			_sheet = _bookEvaluator.getSheet(_sheetIndex);
-		}
-		return _sheet;
-	}
-
-    /**
-     * @return  whether cell at rowIndex and columnIndex is a subtotal
-     * @see org.apache.poi.ss.formula.functions.Subtotal
-     */
-    public boolean isSubTotal(int rowIndex, int columnIndex){
-        boolean subtotal = false;
-        EvaluationCell cell = getSheet().getCell(rowIndex, columnIndex);
-        if(cell != null && cell.getCellTypeEnum() == CellType.FORMULA){
-            EvaluationWorkbook wb = _bookEvaluator.getWorkbook();
-            for(Ptg ptg : wb.getFormulaTokens(cell)){
-                if(ptg instanceof FuncVarPtg){
-                    FuncVarPtg f = (FuncVarPtg)ptg;
-                    if("SUBTOTAL".equals(f.getName())) {
-                        subtotal = true;
-                        break;
-                    }
-                }
-            }
-        }
-        return subtotal;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ThreeDEval.java b/trunk/src/java/org/apache/poi/ss/formula/ThreeDEval.java
deleted file mode 100644
index 0bda637..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ThreeDEval.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Optional Extension to the likes of {@link AreaEval} and 
- *  {@link org.apache.poi.ss.formula.eval.AreaEvalBase},
- *  which allows for looking up 3D (sheet+row+column) evaluations
- */
-public interface ThreeDEval extends TwoDEval, SheetRange {
-	/**
-	 * @param sheetIndex sheet index (zero based)
-	 * @param rowIndex relative row index (zero based)
-	 * @param columnIndex relative column index (zero based)
-	 * @return element at the specified row and column position
-	 */
-	ValueEval getValue(int sheetIndex, int rowIndex, int columnIndex);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/TwoDEval.java b/trunk/src/java/org/apache/poi/ss/formula/TwoDEval.java
deleted file mode 100644
index c52d0f3..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/TwoDEval.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Common interface of {@link AreaEval} and {@link org.apache.poi.ss.formula.eval.AreaEvalBase},
- * for 2D (row+column) evaluations
- */
-public interface TwoDEval extends ValueEval {
-
-	/**
-	 * @param rowIndex relative row index (zero based)
-	 * @param columnIndex relative column index (zero based)
-	 * @return element at the specified row and column position
-	 */
-	ValueEval getValue(int rowIndex, int columnIndex);
-
-	int getWidth();
-	int getHeight();
-
-	/**
-	 * @return <code>true</code> if the area has just a single row, this also includes
-	 * the trivial case when the area has just a single cell.
-	 */
-	boolean isRow();
-
-	/**
-	 * @return <code>true</code> if the area has just a single column, this also includes
-	 * the trivial case when the area has just a single cell.
-	 */
-	boolean isColumn();
-
-	/**
-	 * @param rowIndex relative row index (zero based)
-	 * @return a single row {@link TwoDEval}
-	 */
-	TwoDEval getRow(int rowIndex);
-	/**
-	 * @param columnIndex relative column index (zero based)
-	 * @return a single column {@link TwoDEval}
-	 */
-	TwoDEval getColumn(int columnIndex);
-
-
-    /**
-     * @return true if the  cell at row and col is a subtotal
-     */
-    boolean isSubTotal(int rowIndex, int columnIndex);
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/UserDefinedFunction.java b/trunk/src/java/org/apache/poi/ss/formula/UserDefinedFunction.java
deleted file mode 100644
index c526137..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/UserDefinedFunction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.FunctionNameEval;
-import org.apache.poi.ss.formula.eval.NotImplementedFunctionException;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-/**
- *
- * Common entry point for all user-defined (non-built-in) functions (where
- * <tt>AbstractFunctionPtg.field_2_fnc_index</tt> == 255)
- *
- * @author Josh Micich
- * @author Petr Udalau - Improved resolving of UDFs through the ToolPacks.
- */
-final class UserDefinedFunction implements FreeRefFunction {
-
-	public static final FreeRefFunction instance = new UserDefinedFunction();
-
-	private UserDefinedFunction() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-		int nIncomingArgs = args.length;
-		if(nIncomingArgs < 1) {
-			throw new RuntimeException("function name argument missing");
-		}
-
-		ValueEval nameArg = args[0];
-		String functionName;
-		if (nameArg instanceof FunctionNameEval) {
-			functionName = ((FunctionNameEval) nameArg).getFunctionName();
-		} else {
-			throw new RuntimeException("First argument should be a NameEval, but got ("
-					+ nameArg.getClass().getName() + ")");
-		}
-		FreeRefFunction targetFunc = ec.findUserDefinedFunction(functionName);
-		if (targetFunc == null) {
-			throw new NotImplementedFunctionException(functionName);
-		}
-		int nOutGoingArgs = nIncomingArgs -1;
-		ValueEval[] outGoingArgs = new ValueEval[nOutGoingArgs];
-		System.arraycopy(args, 1, outGoingArgs, 0, nOutGoingArgs);
-		return targetFunc.evaluate(outGoingArgs, ec);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java b/trunk/src/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
deleted file mode 100644
index 47dc952..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-/**
- * Should be implemented by any {@link org.apache.poi.ss.formula.ptg.Ptg} subclass that needs a workbook to render its formula.
- * <br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-public interface WorkbookDependentFormula {
-	String toFormulaString(FormulaRenderingWorkbook book);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java b/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
deleted file mode 100644
index 3fad35e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
+++ /dev/null
@@ -1,833 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Stack;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.formula.CollaboratingWorkbooksEnvironment.WorkbookNotFoundException;
-import org.apache.poi.ss.formula.atp.AnalysisToolPak;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.ExternalNameEval;
-import org.apache.poi.ss.formula.eval.FunctionEval;
-import org.apache.poi.ss.formula.eval.FunctionNameEval;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.ss.formula.functions.Choose;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.functions.Function;
-import org.apache.poi.ss.formula.functions.IfFunc;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.Area3DPxg;
-import org.apache.poi.ss.formula.ptg.AreaErrPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.BoolPtg;
-import org.apache.poi.ss.formula.ptg.ControlPtg;
-import org.apache.poi.ss.formula.ptg.DeletedArea3DPtg;
-import org.apache.poi.ss.formula.ptg.DeletedRef3DPtg;
-import org.apache.poi.ss.formula.ptg.ErrPtg;
-import org.apache.poi.ss.formula.ptg.ExpPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemErrPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.MissingArgPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.NameXPxg;
-import org.apache.poi.ss.formula.ptg.NumberPtg;
-import org.apache.poi.ss.formula.ptg.OperationPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPxg;
-import org.apache.poi.ss.formula.ptg.RefErrorPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.apache.poi.ss.formula.ptg.UnionPtg;
-import org.apache.poi.ss.formula.ptg.UnknownPtg;
-import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-/**
- * Evaluates formula cells.<p/>
- *
- * For performance reasons, this class keeps a cache of all previously calculated intermediate
- * cell values.  Be sure to call {@link #clearAllCachedResultValues()} if any workbook cells are changed between
- * calls to evaluate~ methods on this class.<br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- * @author Thies Wellpott (debug output enhancements)
- */
-@Internal
-public final class WorkbookEvaluator {
-    
-    private static final POILogger LOG = POILogFactory.getLogger(WorkbookEvaluator.class);
-
-    private final EvaluationWorkbook _workbook;
-    private EvaluationCache _cache;
-    /** part of cache entry key (useful when evaluating multiple workbooks) */
-    private int _workbookIx;
-
-    private final IEvaluationListener _evaluationListener;
-    private final Map<EvaluationSheet, Integer> _sheetIndexesBySheet;
-    private final Map<String, Integer> _sheetIndexesByName;
-    private CollaboratingWorkbooksEnvironment _collaboratingWorkbookEnvironment;
-    private final IStabilityClassifier _stabilityClassifier;
-    private final AggregatingUDFFinder _udfFinder;
-
-    private boolean _ignoreMissingWorkbooks = false;
-
-    /**
-     * whether print detailed messages about the next formula evaluation
-     */
-    private boolean dbgEvaluationOutputForNextEval = false;
-
-    // special logger for formula evaluation output (because of possibly very large output)
-    private final POILogger EVAL_LOG = POILogFactory.getLogger("POI.FormulaEval");
-    // current indent level for evalution; negative value for no output
-    private int dbgEvaluationOutputIndent = -1;
-
-    /**
-     * @param udfFinder pass <code>null</code> for default (AnalysisToolPak only)
-     */
-    public WorkbookEvaluator(EvaluationWorkbook workbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        this (workbook, null, stabilityClassifier, udfFinder);
-    }
-    /* package */ WorkbookEvaluator(EvaluationWorkbook workbook, IEvaluationListener evaluationListener,
-            IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        _workbook = workbook;
-        _evaluationListener = evaluationListener;
-        _cache = new EvaluationCache(evaluationListener);
-        _sheetIndexesBySheet = new IdentityHashMap<EvaluationSheet, Integer>();
-        _sheetIndexesByName = new IdentityHashMap<String, Integer>();
-        _collaboratingWorkbookEnvironment = CollaboratingWorkbooksEnvironment.EMPTY;
-        _workbookIx = 0;
-        _stabilityClassifier = stabilityClassifier;
-
-        AggregatingUDFFinder defaultToolkit = // workbook can be null in unit tests
-                workbook == null ? null : (AggregatingUDFFinder)workbook.getUDFFinder();
-        if(defaultToolkit != null && udfFinder != null) {
-            defaultToolkit.add(udfFinder);
-        }
-        _udfFinder = defaultToolkit;
-    }
-
-    /**
-     * also for debug use. Used in toString methods
-     */
-    /* package */ String getSheetName(int sheetIndex) {
-        return _workbook.getSheetName(sheetIndex);
-    }
-
-    /* package */ EvaluationSheet getSheet(int sheetIndex) {
-        return _workbook.getSheet(sheetIndex);
-    }
-    
-    /* package */ EvaluationWorkbook getWorkbook() {
-        return _workbook;
-    }
-
-    /* package */ EvaluationName getName(String name, int sheetIndex) {
-        EvaluationName evalName = _workbook.getName(name, sheetIndex);
-        return evalName;
-    }
-
-    private static boolean isDebugLogEnabled() {
-        return LOG.check(POILogger.DEBUG);
-    }
-    private static boolean isInfoLogEnabled() {
-        return LOG.check(POILogger.INFO);
-    }
-    private static void logDebug(String s) {
-        if (isDebugLogEnabled()) {
-            LOG.log(POILogger.DEBUG, s);
-        }
-    }
-    private static void logInfo(String s) {
-        if (isInfoLogEnabled()) {
-            LOG.log(POILogger.INFO, s);
-        }
-    }
-    /* package */ void attachToEnvironment(CollaboratingWorkbooksEnvironment collaboratingWorkbooksEnvironment, EvaluationCache cache, int workbookIx) {
-        _collaboratingWorkbookEnvironment = collaboratingWorkbooksEnvironment;
-        _cache = cache;
-        _workbookIx = workbookIx;
-    }
-    /* package */ CollaboratingWorkbooksEnvironment getEnvironment() {
-        return _collaboratingWorkbookEnvironment;
-    }
-
-    /**
-     * Discards the current workbook environment and attaches to the default 'empty' environment.
-     * Also resets evaluation cache.
-     */
-    /* package */ void detachFromEnvironment() {
-        _collaboratingWorkbookEnvironment = CollaboratingWorkbooksEnvironment.EMPTY;
-        _cache = new EvaluationCache(_evaluationListener);
-        _workbookIx = 0;
-    }
-    /**
-     * @return the evaluator for another workbook which is part of the same {@link CollaboratingWorkbooksEnvironment}
-     */
-    /* package */ WorkbookEvaluator getOtherWorkbookEvaluator(String workbookName) throws WorkbookNotFoundException {
-        return _collaboratingWorkbookEnvironment.getWorkbookEvaluator(workbookName);
-    }
-
-    /* package */ IEvaluationListener getEvaluationListener() {
-        return _evaluationListener;
-    }
-
-    /**
-     * Should be called whenever there are changes to input cells in the evaluated workbook.
-     * Failure to call this method after changing cell values will cause incorrect behaviour
-     * of the evaluate~ methods of this class
-     */
-    public void clearAllCachedResultValues() {
-        _cache.clear();
-        _sheetIndexesBySheet.clear();
-        _workbook.clearAllCachedResultValues();
-    }
-
-    /**
-     * Should be called to tell the cell value cache that the specified (value or formula) cell
-     * has changed.
-     */
-    public void notifyUpdateCell(EvaluationCell cell) {
-        int sheetIndex = getSheetIndex(cell.getSheet());
-        _cache.notifyUpdateCell(_workbookIx, sheetIndex, cell);
-    }
-    /**
-     * Should be called to tell the cell value cache that the specified cell has just been
-     * deleted.
-     */
-    public void notifyDeleteCell(EvaluationCell cell) {
-        int sheetIndex = getSheetIndex(cell.getSheet());
-        _cache.notifyDeleteCell(_workbookIx, sheetIndex, cell);
-    }
-    
-    private int getSheetIndex(EvaluationSheet sheet) {
-        Integer result = _sheetIndexesBySheet.get(sheet);
-        if (result == null) {
-            int sheetIndex = _workbook.getSheetIndex(sheet);
-            if (sheetIndex < 0) {
-                throw new RuntimeException("Specified sheet from a different book");
-            }
-            result = Integer.valueOf(sheetIndex);
-            _sheetIndexesBySheet.put(sheet, result);
-        }
-        return result.intValue();
-    }
-
-    public ValueEval evaluate(EvaluationCell srcCell) {
-        int sheetIndex = getSheetIndex(srcCell.getSheet());
-        return evaluateAny(srcCell, sheetIndex, srcCell.getRowIndex(), srcCell.getColumnIndex(), new EvaluationTracker(_cache));
-    }
-
-    /**
-     * Case-insensitive.
-     * @return -1 if sheet with specified name does not exist
-     */
-    /* package */ int getSheetIndex(String sheetName) {
-        Integer result = _sheetIndexesByName.get(sheetName);
-        if (result == null) {
-            int sheetIndex = _workbook.getSheetIndex(sheetName);
-            if (sheetIndex < 0) {
-                return -1;
-            }
-            result = Integer.valueOf(sheetIndex);
-            _sheetIndexesByName.put(sheetName, result);
-        }
-        return result.intValue();
-    }
-    
-    /* package */ int getSheetIndexByExternIndex(int externSheetIndex) {
-       return _workbook.convertFromExternSheetIndex(externSheetIndex);
-    }
-
-
-    /**
-     * @return never <code>null</code>, never {@link BlankEval}
-     */
-    private ValueEval evaluateAny(EvaluationCell srcCell, int sheetIndex,
-                int rowIndex, int columnIndex, EvaluationTracker tracker) {
-
-        // avoid tracking dependencies to cells that have constant definition
-        boolean shouldCellDependencyBeRecorded = _stabilityClassifier == null ? true
-                    : !_stabilityClassifier.isCellFinal(sheetIndex, rowIndex, columnIndex);
-        if (srcCell == null || srcCell.getCellTypeEnum() != CellType.FORMULA) {
-            ValueEval result = getValueFromNonFormulaCell(srcCell);
-            if (shouldCellDependencyBeRecorded) {
-                tracker.acceptPlainValueDependency(_workbookIx, sheetIndex, rowIndex, columnIndex, result);
-            }
-            return result;
-        }
-
-        FormulaCellCacheEntry cce = _cache.getOrCreateFormulaCellEntry(srcCell);
-        if (shouldCellDependencyBeRecorded || cce.isInputSensitive()) {
-            tracker.acceptFormulaDependency(cce);
-        }
-        IEvaluationListener evalListener = _evaluationListener;
-        ValueEval result;
-        if (cce.getValue() == null) {
-            if (!tracker.startEvaluate(cce)) {
-                return ErrorEval.CIRCULAR_REF_ERROR;
-            }
-            OperationEvaluationContext ec = new OperationEvaluationContext(this, _workbook, sheetIndex, rowIndex, columnIndex, tracker);
-
-            try {
-
-                Ptg[] ptgs = _workbook.getFormulaTokens(srcCell);
-                if (evalListener == null) {
-                    result = evaluateFormula(ec, ptgs);
-                } else {
-                    evalListener.onStartEvaluate(srcCell, cce);
-                    result = evaluateFormula(ec, ptgs);
-                    evalListener.onEndEvaluate(cce, result);
-                }
-
-                tracker.updateCacheResult(result);
-            }
-             catch (NotImplementedException e) {
-                throw addExceptionInfo(e, sheetIndex, rowIndex, columnIndex);
-             } catch (RuntimeException re) {
-                 if (re.getCause() instanceof WorkbookNotFoundException && _ignoreMissingWorkbooks) {
-                     logInfo(re.getCause().getMessage() + " - Continuing with cached value!");
-                     switch(srcCell.getCachedFormulaResultTypeEnum()) {
-                         case NUMERIC:
-                             result = new NumberEval(srcCell.getNumericCellValue());
-                             break;
-                         case STRING:
-                             result =  new StringEval(srcCell.getStringCellValue());
-                             break;
-                         case BLANK:
-                             result = BlankEval.instance;
-                             break;
-                         case BOOLEAN:
-                             result =  BoolEval.valueOf(srcCell.getBooleanCellValue());
-                             break;
-                         case ERROR:
-                            result =  ErrorEval.valueOf(srcCell.getErrorCellValue());
-                            break;
-                         case FORMULA:
-                        default:
-                            throw new RuntimeException("Unexpected cell type '" + srcCell.getCellTypeEnum()+"' found!");
-                     }
-                 } else {
-                     throw re;
-                 }
-             } finally {
-                tracker.endEvaluate(cce);
-            }
-        } else {
-            if(evalListener != null) {
-                evalListener.onCacheHit(sheetIndex, rowIndex, columnIndex, cce.getValue());
-            }
-            return cce.getValue();
-        }
-        if (isDebugLogEnabled()) {
-            String sheetName = getSheetName(sheetIndex);
-            CellReference cr = new CellReference(rowIndex, columnIndex);
-            logDebug("Evaluated " + sheetName + "!" + cr.formatAsString() + " to " + result.toString());
-        }
-        // Usually (result === cce.getValue())
-        // But sometimes: (result==ErrorEval.CIRCULAR_REF_ERROR, cce.getValue()==null)
-        // When circular references are detected, the cache entry is only updated for
-        // the top evaluation frame
-        return result;
-    }
-
-    /**
-     * Adds the current cell reference to the exception for easier debugging.
-     * Would be nice to get the formula text as well, but that seems to require
-     * too much digging around and casting to get the FormulaRenderingWorkbook.
-     */
-    private NotImplementedException addExceptionInfo(NotImplementedException inner, int sheetIndex, int rowIndex, int columnIndex) {
-
-        try {
-            String sheetName = _workbook.getSheetName(sheetIndex);
-            CellReference cr = new CellReference(sheetName, rowIndex, columnIndex, false, false);
-            String msg =  "Error evaluating cell " + cr.formatAsString();
-            return new NotImplementedException(msg, inner);
-        } catch (Exception e) {
-            // avoid bombing out during exception handling
-            LOG.log(POILogger.ERROR, "Can't add exception info", e);
-            return inner; // preserve original exception
-        }
-    }
-    /**
-     * Gets the value from a non-formula cell.
-     * @param cell may be <code>null</code>
-     * @return {@link BlankEval} if cell is <code>null</code> or blank, never <code>null</code>
-     */
-    /* package */ static ValueEval getValueFromNonFormulaCell(EvaluationCell cell) {
-        if (cell == null) {
-            return BlankEval.instance;
-        }
-        CellType cellType = cell.getCellTypeEnum();
-        switch (cellType) {
-            case NUMERIC:
-                return new NumberEval(cell.getNumericCellValue());
-            case STRING:
-                return new StringEval(cell.getStringCellValue());
-            case BOOLEAN:
-                return BoolEval.valueOf(cell.getBooleanCellValue());
-            case BLANK:
-                return BlankEval.instance;
-            case ERROR:
-                return ErrorEval.valueOf(cell.getErrorCellValue());
-            default:
-                throw new RuntimeException("Unexpected cell type (" + cellType + ")");
-        }
-        
-    }
-
-
-    // visibility raised for testing
-    @Internal
-    /* package */ ValueEval evaluateFormula(OperationEvaluationContext ec, Ptg[] ptgs) {
-
-        String dbgIndentStr = "";        // always init. to non-null just for defensive avoiding NPE
-        if (dbgEvaluationOutputForNextEval) {
-            // first evaluation call when ouput is desired, so iit. this evaluator instance
-            dbgEvaluationOutputIndent = 1;
-            dbgEvaluationOutputForNextEval = false;
-        }
-        if (dbgEvaluationOutputIndent > 0) {
-            // init. indent string to needed spaces (create as substring vom very long space-only string;
-            // limit indendation for deep recursions)
-            dbgIndentStr = "                                                                                                    ";
-            dbgIndentStr = dbgIndentStr.substring(0, Math.min(dbgIndentStr.length(), dbgEvaluationOutputIndent*2));
-            EVAL_LOG.log(POILogger.WARN, dbgIndentStr
-                               + "- evaluateFormula('" + ec.getRefEvaluatorForCurrentSheet().getSheetNameRange()
-                               + "'/" + new CellReference(ec.getRowIndex(), ec.getColumnIndex()).formatAsString()
-                               + "): " + Arrays.toString(ptgs).replaceAll("\\Qorg.apache.poi.ss.formula.ptg.\\E", ""));
-            dbgEvaluationOutputIndent++;
-        }
-
-        Stack<ValueEval> stack = new Stack<ValueEval>();
-        for (int i = 0, iSize = ptgs.length; i < iSize; i++) {
-
-            // since we don't know how to handle these yet :(
-            Ptg ptg = ptgs[i];
-            if (dbgEvaluationOutputIndent > 0) {
-                EVAL_LOG.log(POILogger.INFO, dbgIndentStr + "  * ptg " + i + ": " + ptg);
-            }
-            if (ptg instanceof AttrPtg) {
-                AttrPtg attrPtg = (AttrPtg) ptg;
-                if (attrPtg.isSum()) {
-                    // Excel prefers to encode 'SUM()' as a tAttr token, but this evaluator
-                    // expects the equivalent function token
-                    ptg = FuncVarPtg.SUM;
-                }
-                if (attrPtg.isOptimizedChoose()) {
-                    ValueEval arg0 = stack.pop();
-                    int[] jumpTable = attrPtg.getJumpTable();
-                    int dist;
-                    int nChoices = jumpTable.length;
-                    try {
-                        int switchIndex = Choose.evaluateFirstArg(arg0, ec.getRowIndex(), ec.getColumnIndex());
-                        if (switchIndex<1 || switchIndex > nChoices) {
-                            stack.push(ErrorEval.VALUE_INVALID);
-                            dist = attrPtg.getChooseFuncOffset() + 4; // +4 for tFuncFar(CHOOSE)
-                        } else {
-                            dist = jumpTable[switchIndex-1];
-                        }
-                    } catch (EvaluationException e) {
-                        stack.push(e.getErrorEval());
-                        dist = attrPtg.getChooseFuncOffset() + 4; // +4 for tFuncFar(CHOOSE)
-                    }
-                    // Encoded dist for tAttrChoose includes size of jump table, but
-                    // countTokensToBeSkipped() does not (it counts whole tokens).
-                    dist -= nChoices*2+2; // subtract jump table size
-                    i+= countTokensToBeSkipped(ptgs, i, dist);
-                    continue;
-                }
-                if (attrPtg.isOptimizedIf()) {
-                    ValueEval arg0 = stack.pop();
-                    boolean evaluatedPredicate;
-                    try {
-                        evaluatedPredicate = IfFunc.evaluateFirstArg(arg0, ec.getRowIndex(), ec.getColumnIndex());
-                    } catch (EvaluationException e) {
-                        stack.push(e.getErrorEval());
-                        int dist = attrPtg.getData();
-                        i+= countTokensToBeSkipped(ptgs, i, dist);
-                        attrPtg = (AttrPtg) ptgs[i];
-                        dist = attrPtg.getData()+1;
-                        i+= countTokensToBeSkipped(ptgs, i, dist);
-                        continue;
-                    }
-                    if (evaluatedPredicate) {
-                        // nothing to skip - true param follows
-                    } else {
-                        int dist = attrPtg.getData();
-                        i+= countTokensToBeSkipped(ptgs, i, dist);
-                        Ptg nextPtg = ptgs[i+1];
-                        if (ptgs[i] instanceof AttrPtg && nextPtg instanceof FuncVarPtg && 
-                                // in order to verify that there is no third param, we need to check 
-                                // if we really have the IF next or some other FuncVarPtg as third param, e.g. ROW()/COLUMN()!
-                                ((FuncVarPtg)nextPtg).getFunctionIndex() == FunctionMetadataRegistry.FUNCTION_INDEX_IF) {
-                            // this is an if statement without a false param (as opposed to MissingArgPtg as the false param)
-                            i++;
-                            stack.push(BoolEval.FALSE);
-                        }
-                    }
-                    continue;
-                }
-                if (attrPtg.isSkip()) {
-                    int dist = attrPtg.getData()+1;
-                    i+= countTokensToBeSkipped(ptgs, i, dist);
-                    if (stack.peek() == MissingArgEval.instance) {
-                        stack.pop();
-                        stack.push(BlankEval.instance);
-                    }
-                    continue;
-                }
-            }
-            if (ptg instanceof ControlPtg) {
-                // skip Parentheses, Attr, etc
-                continue;
-            }
-            if (ptg instanceof MemFuncPtg || ptg instanceof MemAreaPtg) {
-                // can ignore, rest of tokens for this expression are in OK RPN order
-                continue;
-            }
-            if (ptg instanceof MemErrPtg) {
-                continue;
-            }
-
-            ValueEval opResult;
-            if (ptg instanceof OperationPtg) {
-                OperationPtg optg = (OperationPtg) ptg;
-
-                if (optg instanceof UnionPtg) { continue; }
-
-
-                int numops = optg.getNumberOfOperands();
-                ValueEval[] ops = new ValueEval[numops];
-
-                // storing the ops in reverse order since they are popping
-                for (int j = numops - 1; j >= 0; j--) {
-                    ValueEval p = stack.pop();
-                    ops[j] = p;
-                }
-//                logDebug("invoke " + operation + " (nAgs=" + numops + ")");
-                opResult = OperationEvaluatorFactory.evaluate(optg, ops, ec);
-            } else {
-                opResult = getEvalForPtg(ptg, ec);
-            }
-            if (opResult == null) {
-                throw new RuntimeException("Evaluation result must not be null");
-            }
-//            logDebug("push " + opResult);
-            stack.push(opResult);
-            if (dbgEvaluationOutputIndent > 0) {
-                EVAL_LOG.log(POILogger.INFO, dbgIndentStr + "    = " + opResult);
-            }
-        }
-
-        ValueEval value = stack.pop();
-        if (!stack.isEmpty()) {
-            throw new IllegalStateException("evaluation stack not empty");
-        }
-        ValueEval result = dereferenceResult(value, ec.getRowIndex(), ec.getColumnIndex());
-        if (dbgEvaluationOutputIndent > 0) {
-            EVAL_LOG.log(POILogger.INFO, dbgIndentStr + "finshed eval of "
-                            + new CellReference(ec.getRowIndex(), ec.getColumnIndex()).formatAsString()
-                            + ": " + result);
-            dbgEvaluationOutputIndent--;
-            if (dbgEvaluationOutputIndent == 1) {
-                // this evaluation is done, reset indent to stop logging
-                dbgEvaluationOutputIndent = -1;
-            }
-        } // if
-        return result;
-
-    }
-
-    /**
-     * Calculates the number of tokens that the evaluator should skip upon reaching a tAttrSkip.
-     *
-     * @return the number of tokens (starting from <tt>startIndex+1</tt>) that need to be skipped
-     * to achieve the specified <tt>distInBytes</tt> skip distance.
-     */
-    private static int countTokensToBeSkipped(Ptg[] ptgs, int startIndex, int distInBytes) {
-        int remBytes = distInBytes;
-        int index = startIndex;
-        while (remBytes != 0) {
-            index++;
-            remBytes -= ptgs[index].getSize();
-            if (remBytes < 0) {
-                throw new RuntimeException("Bad skip distance (wrong token size calculation).");
-            }
-            if (index >= ptgs.length) {
-                throw new RuntimeException("Skip distance too far (ran out of formula tokens).");
-            }
-        }
-        return index-startIndex;
-    }
-
-    /**
-     * Dereferences a single value from any AreaEval or RefEval evaluation
-     * result. If the supplied evaluationResult is just a plain value, it is
-     * returned as-is.
-     *
-     * @return a {@link NumberEval}, {@link StringEval}, {@link BoolEval}, or
-     *         {@link ErrorEval}. Never <code>null</code>. {@link BlankEval} is
-     *         converted to {@link NumberEval#ZERO}
-     */
-    public static ValueEval dereferenceResult(ValueEval evaluationResult, int srcRowNum, int srcColNum) {
-        ValueEval value;
-        try {
-            value = OperandResolver.getSingleValue(evaluationResult, srcRowNum, srcColNum);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        if (value == BlankEval.instance) {
-            // Note Excel behaviour here. A blank final final value is converted to zero.
-            return NumberEval.ZERO;
-            // Formulas _never_ evaluate to blank.  If a formula appears to have evaluated to
-            // blank, the actual value is empty string. This can be verified with ISBLANK().
-        }
-        return value;
-    }
-
-
-    /**
-     * returns an appropriate Eval impl instance for the Ptg. The Ptg must be
-     * one of: Area3DPtg, AreaPtg, ReferencePtg, Ref3DPtg, IntPtg, NumberPtg,
-     * StringPtg, BoolPtg <br/>special Note: OperationPtg subtypes cannot be
-     * passed here!
-     */
-    private ValueEval getEvalForPtg(Ptg ptg, OperationEvaluationContext ec) {
-        //  consider converting all these (ptg instanceof XxxPtg) expressions to (ptg.getClass() == XxxPtg.class)
-
-        if (ptg instanceof NamePtg) {
-            // Named ranges, macro functions
-            NamePtg namePtg = (NamePtg) ptg;
-            EvaluationName nameRecord = _workbook.getName(namePtg);
-            return getEvalForNameRecord(nameRecord, ec);
-        }
-        if (ptg instanceof NameXPtg) {
-            // Externally defined named ranges or macro functions
-            return processNameEval(ec.getNameXEval((NameXPtg)ptg), ec);
-        }
-        if (ptg instanceof NameXPxg) {
-            // Externally defined named ranges or macro functions
-            return processNameEval(ec.getNameXEval((NameXPxg)ptg), ec);
-        }
-
-        if (ptg instanceof IntPtg) {
-           return new NumberEval(((IntPtg)ptg).getValue());
-        }
-        if (ptg instanceof NumberPtg) {
-            return new NumberEval(((NumberPtg)ptg).getValue());
-        }
-        if (ptg instanceof StringPtg) {
-           return new StringEval(((StringPtg) ptg).getValue());
-        }
-        if (ptg instanceof BoolPtg) {
-           return BoolEval.valueOf(((BoolPtg) ptg).getValue());
-        }
-        if (ptg instanceof ErrPtg) {
-           return ErrorEval.valueOf(((ErrPtg) ptg).getErrorCode());
-        }
-        if (ptg instanceof MissingArgPtg) {
-           return MissingArgEval.instance;
-        }
-        if (ptg instanceof AreaErrPtg ||ptg instanceof RefErrorPtg
-               || ptg instanceof DeletedArea3DPtg || ptg instanceof DeletedRef3DPtg) {
-           return ErrorEval.REF_INVALID;
-        }
-        if (ptg instanceof Ref3DPtg) {
-           return ec.getRef3DEval((Ref3DPtg)ptg);
-        }
-        if (ptg instanceof Ref3DPxg) {
-           return ec.getRef3DEval((Ref3DPxg)ptg);
-        }
-        if (ptg instanceof Area3DPtg) {
-           return ec.getArea3DEval((Area3DPtg)ptg);
-        }
-        if (ptg instanceof Area3DPxg) {
-           return ec.getArea3DEval((Area3DPxg)ptg);
-        }
-        if (ptg instanceof RefPtg) {
-           RefPtg rptg = (RefPtg) ptg;
-           return ec.getRefEval(rptg.getRow(), rptg.getColumn());
-        }
-        if (ptg instanceof AreaPtg) {
-           AreaPtg aptg = (AreaPtg) ptg;
-           return ec.getAreaEval(aptg.getFirstRow(), aptg.getFirstColumn(), aptg.getLastRow(), aptg.getLastColumn());
-        }
-
-        if (ptg instanceof UnknownPtg) {
-            // POI uses UnknownPtg when the encoded Ptg array seems to be corrupted.
-            // This seems to occur in very rare cases (e.g. unused name formulas in bug 44774, attachment 21790)
-            // In any case, formulas are re-parsed before execution, so UnknownPtg should not get here
-            throw new RuntimeException("UnknownPtg not allowed");
-        }
-        if (ptg instanceof ExpPtg) {
-            // ExpPtg is used for array formulas and shared formulas.
-            // it is currently unsupported, and may not even get implemented here
-            throw new RuntimeException("ExpPtg currently not supported");
-        }
-
-        throw new RuntimeException("Unexpected ptg class (" + ptg.getClass().getName() + ")");
-    }
-   
-    private ValueEval processNameEval(ValueEval eval, OperationEvaluationContext ec) {
-        if (eval instanceof ExternalNameEval) {
-            EvaluationName name = ((ExternalNameEval)eval).getName();
-            return getEvalForNameRecord(name, ec);
-        }
-        return eval;
-    }
-    
-    private ValueEval getEvalForNameRecord(EvaluationName nameRecord, OperationEvaluationContext ec) {
-        if (nameRecord.isFunctionName()) {
-            return new FunctionNameEval(nameRecord.getNameText());
-        }
-        if (nameRecord.hasFormula()) {
-            return evaluateNameFormula(nameRecord.getNameDefinition(), ec);
-        }
-
-        throw new RuntimeException("Don't now how to evalate name '" + nameRecord.getNameText() + "'");
-    }
-    
-    /**
-     * YK: Used by OperationEvaluationContext to resolve indirect names.
-     */
-    /*package*/ ValueEval evaluateNameFormula(Ptg[] ptgs, OperationEvaluationContext ec) {
-    if (ptgs.length == 1) {
-      return getEvalForPtg(ptgs[0], ec);
-    }
-      return evaluateFormula(ec, ptgs);
-    }
-
-    /**
-     * Used by the lazy ref evals whenever they need to get the value of a contained cell.
-     */
-    /* package */ ValueEval evaluateReference(
-            EvaluationSheet sheet, int sheetIndex, int rowIndex,
-            int columnIndex, EvaluationTracker tracker) {
-
-        EvaluationCell cell = sheet.getCell(rowIndex, columnIndex);
-        return evaluateAny(cell, sheetIndex, rowIndex, columnIndex, tracker);
-    }
-    public FreeRefFunction findUserDefinedFunction(String functionName) {
-        return _udfFinder.findFunction(functionName);
-    }
-
-    /**
-     * Whether to ignore missing references to external workbooks and
-     * use cached formula results in the main workbook instead.
-     * <p>
-     * In some cases exetrnal workbooks referenced by formulas in the main workbook are not avaiable.
-     * With this method you can control how POI handles such missing references:
-     * <ul>
-     *     <li>by default ignoreMissingWorkbooks=false and POI throws {@link WorkbookNotFoundException}
-     *     if an external reference cannot be resolved</li>
-     *     <li>if ignoreMissingWorkbooks=true then POI uses cached formula result
-     *     that already exists in the main workbook</li>
-     * </ul>
-     *
-     * @param ignore whether to ignore missing references to external workbooks
-     * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=52575">Bug 52575 for details</a>
-     */
-    public void setIgnoreMissingWorkbooks(boolean ignore){
-        _ignoreMissingWorkbooks = ignore;
-    }
-    public boolean isIgnoreMissingWorkbooks(){
-        return _ignoreMissingWorkbooks;
-    }
-
-    /**
-     * Return a collection of functions that POI can evaluate
-     *
-     * @return names of functions supported by POI
-     */
-    public static Collection<String> getSupportedFunctionNames(){
-        Collection<String> lst = new TreeSet<String>();
-        lst.addAll(FunctionEval.getSupportedFunctionNames());
-        lst.addAll(AnalysisToolPak.getSupportedFunctionNames());
-        return Collections.unmodifiableCollection(lst);
-    }
-
-    /**
-     * Return a collection of functions that POI does not support
-     *
-     * @return names of functions NOT supported by POI
-     */
-    public static Collection<String> getNotSupportedFunctionNames(){
-        Collection<String> lst = new TreeSet<String>();
-        lst.addAll(FunctionEval.getNotSupportedFunctionNames());
-        lst.addAll(AnalysisToolPak.getNotSupportedFunctionNames());
-        return Collections.unmodifiableCollection(lst);
-    }
-
-    /**
-     * Register a ATP function in runtime.
-     *
-     * @param name  the function name
-     * @param func  the functoin to register
-     * @throws IllegalArgumentException if the function is unknown or already registered.
-     * @since 3.8 beta6
-     */
-    public static void registerFunction(String name, FreeRefFunction func){
-        AnalysisToolPak.registerFunction(name, func);
-    }
-
-    /**
-     * Register a function in runtime.
-     *
-     * @param name  the function name
-     * @param func  the functoin to register
-     * @throws IllegalArgumentException if the function is unknown or already registered.
-     * @since 3.8 beta6
-     */
-    public static void registerFunction(String name, Function func){
-        FunctionEval.registerFunction(name, func);
-    }
-
-    public void setDebugEvaluationOutputForNextEval(boolean value){
-        dbgEvaluationOutputForNextEval = value;
-    }
-    public boolean isDebugEvaluationOutputForNextEval(){
-        return dbgEvaluationOutputForNextEval;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java b/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
deleted file mode 100644
index dd6f09b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Provides access to a {@link WorkbookEvaluator}, eg for use with
- *  {@link CollaboratingWorkbooksEnvironment}
- * 
- * <p>For POI internal use only
- */
-@Internal
-public interface WorkbookEvaluatorProvider {
-    /**
-     * Provide the underlying WorkbookEvaluator
-     */
-    WorkbookEvaluator _getWorkbookEvaluator();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java b/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
deleted file mode 100644
index a0da336..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or
- * agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.atp;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.NotImplementedFunctionException;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.function.FunctionMetadata;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.ss.formula.functions.Bin2Dec;
-import org.apache.poi.ss.formula.functions.Complex;
-import org.apache.poi.ss.formula.functions.Countifs;
-import org.apache.poi.ss.formula.functions.Dec2Bin;
-import org.apache.poi.ss.formula.functions.Dec2Hex;
-import org.apache.poi.ss.formula.functions.Delta;
-import org.apache.poi.ss.formula.functions.EDate;
-import org.apache.poi.ss.formula.functions.EOMonth;
-import org.apache.poi.ss.formula.functions.FactDouble;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.functions.Hex2Dec;
-import org.apache.poi.ss.formula.functions.ImReal;
-import org.apache.poi.ss.formula.functions.Imaginary;
-import org.apache.poi.ss.formula.functions.Oct2Dec;
-import org.apache.poi.ss.formula.functions.Quotient;
-import org.apache.poi.ss.formula.functions.Sumifs;
-import org.apache.poi.ss.formula.functions.WeekNum;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-
-/**
- * Analysis Toolpack Function Definitions
- */
-public final class AnalysisToolPak implements UDFFinder {
-
-    public static final UDFFinder instance = new AnalysisToolPak();
-
-    private static final class NotImplemented implements FreeRefFunction {
-        private final String _functionName;
-
-        public NotImplemented(String functionName) {
-            _functionName = functionName;
-        }
-
-        public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-            throw new NotImplementedFunctionException(_functionName);
-        }
-    }
-
-    private final Map<String, FreeRefFunction> _functionsByName = createFunctionsMap();
-
-    private AnalysisToolPak() {
-        // enforce singleton
-    }
-
-    public FreeRefFunction findFunction(String name) {
-        // functions that are available in Excel 2007+ have a prefix _xlfn.
-        // if you save such a .xlsx workbook as .xls
-        if(name.startsWith("_xlfn.")) name = name.substring(6);
-
-        // FIXME: inconsistent case-sensitivity
-        return _functionsByName.get(name.toUpperCase(Locale.ROOT));
-    }
-
-    private Map<String, FreeRefFunction> createFunctionsMap() {
-        Map<String, FreeRefFunction> m = new HashMap<String, FreeRefFunction>(108);
-
-        r(m, "ACCRINT", null);
-        r(m, "ACCRINTM", null);
-        r(m, "AMORDEGRC", null);
-        r(m, "AMORLINC", null);
-        r(m, "AVERAGEIF", null);
-        r(m, "AVERAGEIFS", null);
-        r(m, "BAHTTEXT", null);
-        r(m, "BESSELI", null);
-        r(m, "BESSELJ", null);
-        r(m, "BESSELK", null);
-        r(m, "BESSELY", null);
-        r(m, "BIN2DEC", Bin2Dec.instance);
-        r(m, "BIN2HEX", null);
-        r(m, "BIN2OCT", null);
-        r(m, "COMPLEX", Complex.instance);
-        r(m, "CONVERT", null);
-        r(m, "COUNTIFS", null);
-        r(m, "COUPDAYBS", null);
-        r(m, "COUPDAYS", null);
-        r(m, "COUPDAYSNC", null);
-        r(m, "COUPNCD", null);
-        r(m, "COUPNUM", null);
-        r(m, "COUPPCD", null);
-        r(m, "CUBEKPIMEMBER", null);
-        r(m, "CUBEMEMBER", null);
-        r(m, "CUBEMEMBERPROPERTY", null);
-        r(m, "CUBERANKEDMEMBER", null);
-        r(m, "CUBESET", null);
-        r(m, "CUBESETCOUNT", null);
-        r(m, "CUBEVALUE", null);
-        r(m, "CUMIPMT", null);
-        r(m, "CUMPRINC", null);
-        r(m, "DEC2BIN", Dec2Bin.instance);
-        r(m, "DEC2HEX", Dec2Hex.instance);
-        r(m, "DEC2OCT", null);
-        r(m, "DELTA", Delta.instance);
-        r(m, "DISC", null);
-        r(m, "DOLLARDE", null);
-        r(m, "DOLLARFR", null);
-        r(m, "DURATION", null);
-        r(m, "EDATE", EDate.instance);
-        r(m, "EFFECT", null);
-        r(m, "EOMONTH", EOMonth.instance);
-        r(m, "ERF", null);
-        r(m, "ERFC", null);
-        r(m, "FACTDOUBLE", FactDouble.instance);
-        r(m, "FVSCHEDULE", null);
-        r(m, "GCD", null);
-        r(m, "GESTEP", null);
-        r(m, "HEX2BIN", null);
-        r(m, "HEX2DEC", Hex2Dec.instance);
-        r(m, "HEX2OCT", null);
-        r(m, "IFERROR", IfError.instance);
-        r(m, "IMABS", null);
-        r(m, "IMAGINARY", Imaginary.instance);
-        r(m, "IMARGUMENT", null);
-        r(m, "IMCONJUGATE", null);
-        r(m, "IMCOS", null);
-        r(m, "IMDIV", null);
-        r(m, "IMEXP", null);
-        r(m, "IMLN", null);
-        r(m, "IMLOG10", null);
-        r(m, "IMLOG2", null);
-        r(m, "IMPOWER", null);
-        r(m, "IMPRODUCT", null);
-        r(m, "IMREAL", ImReal.instance);
-        r(m, "IMSIN", null);
-        r(m, "IMSQRT", null);
-        r(m, "IMSUB", null);
-        r(m, "IMSUM", null);
-        r(m, "INTRATE", null);
-        r(m, "ISEVEN", ParityFunction.IS_EVEN);
-        r(m, "ISODD", ParityFunction.IS_ODD);
-        r(m, "JIS", null);
-        r(m, "LCM", null);
-        r(m, "MDURATION", null);
-        r(m, "MROUND", MRound.instance);
-        r(m, "MULTINOMIAL", null);
-        r(m, "NETWORKDAYS", NetworkdaysFunction.instance);
-        r(m, "NOMINAL", null);
-        r(m, "OCT2BIN", null);
-        r(m, "OCT2DEC", Oct2Dec.instance);
-        r(m, "OCT2HEX", null);
-        r(m, "ODDFPRICE", null);
-        r(m, "ODDFYIELD", null);
-        r(m, "ODDLPRICE", null);
-        r(m, "ODDLYIELD", null);
-        r(m, "PRICE", null);
-        r(m, "PRICEDISC", null);
-        r(m, "PRICEMAT", null);
-        r(m, "QUOTIENT", Quotient.instance);
-        r(m, "RANDBETWEEN", RandBetween.instance);
-        r(m, "RECEIVED", null);
-        r(m, "RTD", null);
-        r(m, "SERIESSUM", null);
-        r(m, "SQRTPI", null);
-        r(m, "SUMIFS", Sumifs.instance);
-        r(m, "TBILLEQ", null);
-        r(m, "TBILLPRICE", null);
-        r(m, "TBILLYIELD", null);
-        r(m, "WEEKNUM", WeekNum.instance);
-        r(m, "WORKDAY", WorkdayFunction.instance);
-        r(m, "XIRR", null);
-        r(m, "XNPV", null);
-        r(m, "YEARFRAC", YearFrac.instance);
-        r(m, "YIELD", null);
-        r(m, "YIELDDISC", null);
-        r(m, "YIELDMAT", null);
-        r(m, "COUNTIFS", Countifs.instance);
-
-        return m;
-    }
-
-    private static void r(Map<String, FreeRefFunction> m, String functionName, FreeRefFunction pFunc) {
-        FreeRefFunction func = pFunc == null ? new NotImplemented(functionName) : pFunc;
-        m.put(functionName, func);
-    }
-
-    public static boolean isATPFunction(String name){
-        AnalysisToolPak inst = (AnalysisToolPak)instance;
-        // FIXME: inconsistent case-sensitivity
-        return inst._functionsByName.containsKey(name);
-    }
-
-    /**
-     * Returns a collection of ATP function names implemented by POI.
-     *
-     * @return an array of supported functions
-     * @since 3.8 beta6
-     */
-    public static Collection<String> getSupportedFunctionNames(){
-        AnalysisToolPak inst = (AnalysisToolPak)instance;
-        Collection<String> lst = new TreeSet<String>();
-        for(Map.Entry<String, FreeRefFunction> me : inst._functionsByName.entrySet()){
-            FreeRefFunction func = me.getValue();
-            if(func != null && !(func instanceof NotImplemented)){
-                lst.add(me.getKey());
-            }
-        }
-        return Collections.unmodifiableCollection(lst);
-    }
-
-    /**
-     * Returns a collection of ATP function names NOT implemented by POI.
-     *
-     * @return an array of not supported functions
-     * @since 3.8 beta6
-     */
-    public static Collection<String> getNotSupportedFunctionNames(){
-        AnalysisToolPak inst = (AnalysisToolPak)instance;
-        Collection<String> lst = new TreeSet<String>();
-        for(Map.Entry<String, FreeRefFunction> me : inst._functionsByName.entrySet()){
-            FreeRefFunction func = me.getValue();
-            if (func instanceof NotImplemented) {
-                lst.add(me.getKey());
-            }
-        }
-        return Collections.unmodifiableCollection(lst);
-    }
-
-    /**
-     * Register a ATP function in runtime.
-     *
-     * @param name  the function name
-     * @param func  the functoin to register
-     * @throws IllegalArgumentException if the function is unknown or already  registered.
-     * @since 3.8 beta6
-     */
-   public static void registerFunction(String name, FreeRefFunction func){
-        AnalysisToolPak inst = (AnalysisToolPak)instance;
-        if(!isATPFunction(name)) {
-            FunctionMetadata metaData = FunctionMetadataRegistry.getFunctionByName(name);
-            if(metaData != null) {
-                throw new IllegalArgumentException(name + " is a built-in Excel function. " +
-                        "Use FunctoinEval.registerFunction(String name, Function func) instead.");
-            }
-
-            throw new IllegalArgumentException(name + " is not a function from the Excel Analysis Toolpack.");
-        }
-        FreeRefFunction f = inst.findFunction(name);
-        if(f != null && !(f instanceof NotImplemented)) {
-            throw new IllegalArgumentException("POI already implememts " + name +
-                    ". You cannot override POI's implementations of Excel functions");
-        }
-
-        // FIXME: inconsistent case-sensitivity
-        inst._functionsByName.put(name, func);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java b/trunk/src/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
deleted file mode 100644
index fa5d50a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import org.apache.poi.ss.formula.eval.AreaEvalBase;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-
-/**
- * Evaluator for formula arguments.
- * 
- * @author jfaenomoto@gmail.com
- */
-final class ArgumentsEvaluator {
-
-    public static final ArgumentsEvaluator instance = new ArgumentsEvaluator();
-
-    private ArgumentsEvaluator() {
-        // enforces singleton
-    }
-
-    /**
-     * Evaluate a generic {@link ValueEval} argument to a double value that represents a date in POI.
-     * 
-     * @param arg {@link ValueEval} an argument.
-     * @param srcCellRow number cell row.
-     * @param srcCellCol number cell column.
-     * @return a double representing a date in POI.
-     * @throws EvaluationException exception upon argument evaluation.
-     */
-    public double evaluateDateArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-        ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, (short) srcCellCol);
-
-        if (ve instanceof StringEval) {
-            String strVal = ((StringEval) ve).getStringValue();
-            Double dVal = OperandResolver.parseDouble(strVal);
-            if (dVal != null) {
-                return dVal.doubleValue();
-            }
-            Calendar date = DateParser.parseDate(strVal);
-            return DateUtil.getExcelDate(date, false);
-        }
-        return OperandResolver.coerceValueToDouble(ve);
-    }
-
-    /**
-     * Evaluate a generic {@link ValueEval} argument to an array of double values that represents dates in POI.
-     * 
-     * @param arg {@link ValueEval} an argument.
-     * @param srcCellRow number cell row.
-     * @param srcCellCol number cell column.
-     * @return an array of doubles representing dates in POI.
-     * @throws EvaluationException exception upon argument evaluation.
-     */
-    public double[] evaluateDatesArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-        if (arg == null) {
-            return new double[0];
-        }
-
-        if (arg instanceof StringEval) {
-            return new double[]{ evaluateDateArg(arg, srcCellRow, srcCellCol) };
-        } else if (arg instanceof AreaEvalBase) {
-            List<Double> valuesList = new ArrayList<Double>();
-            AreaEvalBase area = (AreaEvalBase) arg;
-            for (int i = area.getFirstRow(); i <= area.getLastRow(); i++) {
-                for (int j = area.getFirstColumn(); j <= area.getLastColumn(); j++) {
-                    // getValue() is replaced with getAbsoluteValue() because loop variables i, j are
-                    // absolute indexes values, but getValue() works with relative indexes values
-                    valuesList.add(evaluateDateArg(area.getAbsoluteValue(i, j), i, j));
-                }
-            }
-            double[] values = new double[valuesList.size()];
-            for (int i = 0; i < valuesList.size(); i++) {
-                values[i] = valuesList.get(i).doubleValue();
-            }
-            return values;
-        }
-        return new double[]{ OperandResolver.coerceValueToDouble(arg) };
-    }
-
-    /**
-     * Evaluate a generic {@link ValueEval} argument to a double value.
-     * 
-     * @param arg {@link ValueEval} an argument.
-     * @param srcCellRow number cell row.
-     * @param srcCellCol number cell column.
-     * @return a double value.
-     * @throws EvaluationException exception upon argument evaluation.
-     */
-    public double evaluateNumberArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-        if (arg == null) {
-            return 0f;
-        }
-
-        return OperandResolver.coerceValueToDouble(arg);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/DateParser.java b/trunk/src/java/org/apache/poi/ss/formula/atp/DateParser.java
deleted file mode 100644
index 1cb2552..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/DateParser.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import java.util.Calendar;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Parser for java dates.
- */
-public class DateParser {
-    private DateParser() {
-        // enforcing singleton
-    }
-
-    /**
-     * Parses a date from a string.
-     * 
-     * @param strVal a string with a date pattern.
-     * @return a date parsed from argument.
-     * @throws EvaluationException exception upon parsing.
-     */
-    public static Calendar parseDate(String strVal) throws EvaluationException {
-        String[] parts = Pattern.compile("/").split(strVal);
-        if (parts.length != 3) {
-            throw new EvaluationException(ErrorEval.VALUE_INVALID);
-        }
-        String part2 = parts[2];
-        int spacePos = part2.indexOf(' ');
-        if (spacePos > 0) {
-            // drop time portion if present
-            part2 = part2.substring(0, spacePos);
-        }
-        int f0;
-        int f1;
-        int f2;
-        try {
-            f0 = Integer.parseInt(parts[0]);
-            f1 = Integer.parseInt(parts[1]);
-            f2 = Integer.parseInt(part2);
-        } catch (NumberFormatException e) {
-            throw new EvaluationException(ErrorEval.VALUE_INVALID);
-        }
-        if (f0 < 0 || f1 < 0 || f2 < 0 || (f0 > 12 && f1 > 12 && f2 > 12)) {
-            // easy to see this cannot be a valid date
-            throw new EvaluationException(ErrorEval.VALUE_INVALID);
-        }
-
-        if (f0 >= 1900 && f0 < 9999) {
-            // when 4 digit value appears first, the format is YYYY/MM/DD, regardless of OS settings
-            return makeDate(f0, f1, f2);
-        }
-        // otherwise the format seems to depend on OS settings (default date format)
-//        if (false) {
-//            // MM/DD/YYYY is probably a good guess, if the in the US
-//            return makeDate(f2, f0, f1);
-//        }
-        // TODO - find a way to choose the correct date format
-        throw new RuntimeException("Unable to determine date format for text '" + strVal + "'");
-    }
-
-    /**
-     * @param month 1-based
-     */
-    private static Calendar makeDate(int year, int month, int day) throws EvaluationException {
-        if (month < 1 || month > 12) {
-            throw new EvaluationException(ErrorEval.VALUE_INVALID);
-        }
-        Calendar cal = LocaleUtil.getLocaleCalendar(year, month - 1, 1, 0, 0, 0);
-        if (day < 1 || day > cal.getActualMaximum(Calendar.DAY_OF_MONTH)) {
-            throw new EvaluationException(ErrorEval.VALUE_INVALID);
-        }
-        cal.set(Calendar.DAY_OF_MONTH, day);
-        return cal;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/IfError.java b/trunk/src/java/org/apache/poi/ss/formula/atp/IfError.java
deleted file mode 100644
index d3a2266..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/IfError.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-/**
- * Implementation of 'Analysis Toolpak' Excel function IFERROR()<br/>
- *
- * Returns an error text if there is an error in the evaluation<p/>
- * 
- * <b>Syntax</b><br/>
- * <b>IFERROR</b>(<b>expression</b>, <b>string</b>)
- * 
- * @author Johan Karlsteen
- */
-final class IfError implements FreeRefFunction {
-
-	public static final FreeRefFunction instance = new IfError();
-
-	private IfError() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-		if (args.length != 2) {
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		ValueEval val;
-		try {
-			val = evaluateInternal(args[0], args[1], ec.getRowIndex(), ec.getColumnIndex());
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-
-		return val;
-	}
-
-	private static ValueEval evaluateInternal(ValueEval arg, ValueEval iferror, int srcCellRow, int srcCellCol) throws EvaluationException {
-		arg = WorkbookEvaluator.dereferenceResult(arg, srcCellRow, srcCellCol);
-		if(arg instanceof ErrorEval) {
-			return iferror;
-		} else {
-			return arg;
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/MRound.java b/trunk/src/java/org/apache/poi/ss/formula/atp/MRound.java
deleted file mode 100644
index 8ca8796..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/MRound.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.functions.NumericFunction;
-
-/**
- * Implementation of Excel 'Analysis ToolPak' function MROUND()<br/>
- *
- * Returns a number rounded to the desired multiple.<p/>
- *
- * <b>Syntax</b><br/>
- * <b>MROUND</b>(<b>number</b>, <b>multiple</b>)
- *
- * <p/>
- *
- * @author Yegor Kozlov
- */
-final class MRound implements FreeRefFunction {
-
-	public static final FreeRefFunction instance = new MRound();
-
-	private MRound() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        double number, multiple, result;
-
-        if (args.length != 2) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        try {
-            number = OperandResolver.coerceValueToDouble(OperandResolver.getSingleValue(args[0], ec.getRowIndex(), ec.getColumnIndex()));
-            multiple = OperandResolver.coerceValueToDouble(OperandResolver.getSingleValue(args[1], ec.getRowIndex(), ec.getColumnIndex()));
-
-            if( multiple == 0.0 ) {
-                result = 0.0;
-            } else {
-                if(number*multiple < 0) {
-                    // Returns #NUM! because the number and the multiple have different signs
-                    throw new EvaluationException(ErrorEval.NUM_ERROR);
-                }
-                result = multiple * Math.round( number / multiple );
-            }
-            NumericFunction.checkValue(result);
-            return new NumberEval(result);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java b/trunk/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
deleted file mode 100644
index 95e0548..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-
-/**
- * Implementation of Excel 'Analysis ToolPak' function NETWORKDAYS()<br/>
- * Returns the number of workdays given a starting and an ending date, considering an interval of holidays. A workday is any non
- * saturday/sunday date.
- * <p/>
- * <b>Syntax</b><br/>
- * <b>NETWORKDAYS</b>(<b>startDate</b>, <b>endDate</b>, holidays)
- * <p/>
- * 
- * @author jfaenomoto@gmail.com
- */
-final class NetworkdaysFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new NetworkdaysFunction(ArgumentsEvaluator.instance);
-
-    private ArgumentsEvaluator evaluator;
-
-    /**
-     * Constructor.
-     * 
-     * @param anEvaluator an injected {@link ArgumentsEvaluator}.
-     */
-    private NetworkdaysFunction(ArgumentsEvaluator anEvaluator) {
-        // enforces singleton
-        this.evaluator = anEvaluator;
-    }
-
-    /**
-     * Evaluate for NETWORKDAYS. Given two dates and a optional date or interval of holidays, determines how many working days are there
-     * between those dates.
-     * 
-     * @return {@link ValueEval} for the number of days between two dates.
-     */
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) { // NOSONAR
-        if (args.length < 2 || args.length > 3) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        int srcCellRow = ec.getRowIndex();
-        int srcCellCol = ec.getColumnIndex();
-
-        double start, end;
-        double[] holidays;
-        try {
-            start = this.evaluator.evaluateDateArg(args[0], srcCellRow, srcCellCol);
-            end = this.evaluator.evaluateDateArg(args[1], srcCellRow, srcCellCol);
-            if (start > end) {
-                return ErrorEval.NAME_INVALID;
-            }
-            ValueEval holidaysCell = args.length == 3 ? args[2] : null;
-            holidays = this.evaluator.evaluateDatesArg(holidaysCell, srcCellRow, srcCellCol);
-            return new NumberEval(WorkdayCalculator.instance.calculateWorkdays(start, end, holidays));
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java b/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java
deleted file mode 100644
index 04b5e92..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-/**
- * Implementation of Excel 'Analysis ToolPak' function ISEVEN() ISODD()<br/>
- *
- * @author Josh Micich
- */
-final class ParityFunction implements FreeRefFunction {
-
-	public static final FreeRefFunction IS_EVEN = new ParityFunction(0);
-	public static final FreeRefFunction IS_ODD = new ParityFunction(1);
-	private final int _desiredParity;
-
-	private ParityFunction(int desiredParity) {
-		_desiredParity = desiredParity;
-	}
-
-	public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-		if (args.length != 1) {
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		int val;
-		try {
-			val = evaluateArgParity(args[0], ec.getRowIndex(), ec.getColumnIndex());
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-
-		return BoolEval.valueOf(val == _desiredParity);
-	}
-
-	private static int evaluateArgParity(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, (short)srcCellCol);
-
-		double d = OperandResolver.coerceValueToDouble(ve);
-		if (d < 0) {
-			d = -d;
-		}
-		long v = (long) Math.floor(d);
-		return (int) (v & 0x0001);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java b/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java
deleted file mode 100644
index 4da7a53..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-
-/**
- * Implementation of Excel 'Analysis ToolPak' function RANDBETWEEN()<br/>
- *
- * Returns a random integer number between the numbers you specify.<p/>
- *
- * <b>Syntax</b><br/>
- * <b>RANDBETWEEN</b>(<b>bottom</b>, <b>top</b>)<p/>
- *
- * <b>bottom</b> is the smallest integer RANDBETWEEN will return.<br/>
- * <b>top</b> is the largest integer RANDBETWEEN will return.<br/>
-
- * @author Brendan Nolan
- */
-final class RandBetween implements FreeRefFunction{
-
-	public static final FreeRefFunction instance = new RandBetween();
-
-	private RandBetween() {
-		//enforces singleton
-	}
-
-	/**
-	 * Evaluate for RANDBETWEEN(). Must be given two arguments. Bottom must be greater than top.
-	 * Bottom is rounded up and top value is rounded down. After rounding top has to be set greater
-	 * than top.
-	 * 
-	 * @see org.apache.poi.ss.formula.functions.FreeRefFunction#evaluate(org.apache.poi.ss.formula.eval.ValueEval[], org.apache.poi.ss.formula.OperationEvaluationContext)
-	 */
-	public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-		
-		double bottom, top;
-
-		if (args.length != 2) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		
-		try {
-			bottom = OperandResolver.coerceValueToDouble(OperandResolver.getSingleValue(args[0], ec.getRowIndex(), ec.getColumnIndex()));
-			top = OperandResolver.coerceValueToDouble(OperandResolver.getSingleValue(args[1], ec.getRowIndex(), ec.getColumnIndex()));
-			if(bottom > top) {
-				return ErrorEval.NUM_ERROR;
-			}
-		} catch (EvaluationException e) {
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		bottom = Math.ceil(bottom);
-		top = Math.floor(top);
-
-		if(bottom > top) {
-			top = bottom;
-		}
-		
-		return new NumberEval((bottom + (int)(Math.random() * ((top - bottom) + 1))));
-		
-	}
-		
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java b/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
deleted file mode 100644
index 29b29fe..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * A calculator for workdays, considering dates as excel representations.
- */
-public class WorkdayCalculator {
-    public static final WorkdayCalculator instance = new WorkdayCalculator();
-
-    /**
-     * Constructor.
-     */
-    private WorkdayCalculator() {
-        // enforcing singleton
-    }
-
-    /**
-     * Calculate how many workdays are there between a start and an end date, as excel representations, considering a range of holidays.
-     * 
-     * @param start start date.
-     * @param end end date.
-     * @param holidays an array of holidays.
-     * @return number of workdays between start and end dates, including both dates.
-     */
-    public int calculateWorkdays(double start, double end, double[] holidays) {
-        int saturdaysPast = this.pastDaysOfWeek(start, end, Calendar.SATURDAY);
-        int sundaysPast = this.pastDaysOfWeek(start, end, Calendar.SUNDAY);
-        int nonWeekendHolidays = this.calculateNonWeekendHolidays(start, end, holidays);
-        return (int) (end - start + 1) - saturdaysPast - sundaysPast - nonWeekendHolidays;
-    }
-
-    /**
-     * Calculate the workday past x workdays from a starting date, considering a range of holidays.
-     * 
-     * @param start start date.
-     * @param workdays number of workdays to be past from starting date.
-     * @param holidays an array of holidays.
-     * @return date past x workdays.
-     */
-	public Date calculateWorkdays(double start, int workdays, double[] holidays) {
-		Date startDate = DateUtil.getJavaDate(start);
-		int direction = workdays < 0 ? -1 : 1;
-		Calendar endDate = LocaleUtil.getLocaleCalendar();
-		endDate.setTime(startDate);
-		double excelEndDate = DateUtil.getExcelDate(endDate.getTime());
-		while (workdays != 0) {
-			endDate.add(Calendar.DAY_OF_YEAR, direction);
-			excelEndDate += direction;
-			if (endDate.get(Calendar.DAY_OF_WEEK) != Calendar.SATURDAY
-					&& endDate.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY
-					&& !isHoliday(excelEndDate,	holidays)) {
-				workdays -= direction;
-			}
-		}
-		return endDate.getTime();
-	}
-    
-    /**
-     * Calculates how many days of week past between a start and an end date.
-     * 
-     * @param start start date.
-     * @param end end date.
-     * @param dayOfWeek a day of week as represented by {@link Calendar} constants.
-     * @return how many days of week past in this interval.
-     */
-    protected int pastDaysOfWeek(double start, double end, int dayOfWeek) {
-        int pastDaysOfWeek = 0;
-        int startDay = (int) Math.floor(start < end ? start : end);
-        int endDay = (int) Math.floor(end > start ? end : start);
-        for (; startDay <= endDay; startDay++) {
-            Calendar today = LocaleUtil.getLocaleCalendar();
-            today.setTime(DateUtil.getJavaDate(startDay));
-            if (today.get(Calendar.DAY_OF_WEEK) == dayOfWeek) {
-                pastDaysOfWeek++;
-            }
-        }
-        return start < end ? pastDaysOfWeek : -pastDaysOfWeek;
-    }
-
-    /**
-     * Calculates how many holidays in a list are workdays, considering an interval of dates.
-     * 
-     * @param start start date.
-     * @param end end date.
-     * @param holidays an array of holidays.
-     * @return number of holidays that occur in workdays, between start and end dates.
-     */
-    protected int calculateNonWeekendHolidays(double start, double end, double[] holidays) {
-        int nonWeekendHolidays = 0;
-        double startDay = start < end ? start : end;
-        double endDay = end > start ? end : start;
-        for (int i = 0; i < holidays.length; i++) {
-            if (isInARange(startDay, endDay, holidays[i])) {
-                if (!isWeekend(holidays[i])) {
-                    nonWeekendHolidays++;
-                }
-            }
-        }
-        return start < end ? nonWeekendHolidays : -nonWeekendHolidays;
-    }
-
-    /**
-     * @param aDate a given date.
-     * @return <code>true</code> if date is weekend, <code>false</code> otherwise.
-     */
-    protected boolean isWeekend(double aDate) {
-        Calendar date = LocaleUtil.getLocaleCalendar();
-        date.setTime(DateUtil.getJavaDate(aDate));
-        return date.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || date.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY;
-    }
-
-    /**
-     * @param aDate a given date.
-     * @param holidays an array of holidays.
-     * @return <code>true</code> if date is a holiday, <code>false</code> otherwise.
-     */
-    protected boolean isHoliday(double aDate, double[] holidays) {
-        for (int i = 0; i < holidays.length; i++) {
-            if (Math.round(holidays[i]) == Math.round(aDate)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param aDate a given date.
-     * @param holidays an array of holidays.
-     * @return <code>1</code> is not a workday, <code>0</code> otherwise.
-     */
-    protected int isNonWorkday(double aDate, double[] holidays) {
-        return isWeekend(aDate) || isHoliday(aDate, holidays) ? 1 : 0;
-    }
-
-    /**
-     * @param start start date.
-     * @param end end date.
-     * @param aDate a date to be analyzed.
-     * @return <code>true</code> if aDate is between start and end dates, <code>false</code> otherwise.
-     */
-    protected boolean isInARange(double start, double end, double aDate) {
-        return aDate >= start && aDate <= end;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java b/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
deleted file mode 100644
index e746bd1..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.usermodel.DateUtil;
-
-/**
- * Implementation of Excel 'Analysis ToolPak' function WORKDAY()<br/>
- * Returns the date past a number of workdays beginning at a start date, considering an interval of holidays. A workday is any non
- * saturday/sunday date.
- * <p/>
- * <b>Syntax</b><br/>
- * <b>WORKDAY</b>(<b>startDate</b>, <b>days</b>, holidays)
- * <p/>
- * 
- * @author jfaenomoto@gmail.com
- */
-final class WorkdayFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new WorkdayFunction(ArgumentsEvaluator.instance);
-
-    private ArgumentsEvaluator evaluator;
-
-    private WorkdayFunction(ArgumentsEvaluator anEvaluator) {
-        // enforces singleton
-        this.evaluator = anEvaluator;
-    }
-
-    /**
-     * Evaluate for WORKDAY. Given a date, a number of days and a optional date or interval of holidays, determines which date it is past
-     * number of parametrized workdays.
-     * 
-     * @return {@link ValueEval} with date as its value.
-     */
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length < 2 || args.length > 3) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        int srcCellRow = ec.getRowIndex();
-        int srcCellCol = ec.getColumnIndex();
-
-        double start;
-        int days;
-        double[] holidays;
-        try {
-            start = this.evaluator.evaluateDateArg(args[0], srcCellRow, srcCellCol);
-            days = (int) Math.floor(this.evaluator.evaluateNumberArg(args[1], srcCellRow, srcCellCol));
-            ValueEval holidaysCell = args.length == 3 ? args[2] : null;
-            holidays = this.evaluator.evaluateDatesArg(holidaysCell, srcCellRow, srcCellCol);
-            return new NumberEval(DateUtil.getExcelDate(WorkdayCalculator.instance.calculateWorkdays(start, days, holidays)));
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java b/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
deleted file mode 100644
index a44645f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.usermodel.DateUtil;
-/**
- * Implementation of Excel 'Analysis ToolPak' function YEARFRAC()<br/>
- *
- * Returns the fraction of the year spanned by two dates.<p/>
- *
- * <b>Syntax</b><br/>
- * <b>YEARFRAC</b>(<b>startDate</b>, <b>endDate</b>, basis)<p/>
- *
- * The <b>basis</b> optionally specifies the behaviour of YEARFRAC as follows:
- *
- * <table border="0" cellpadding="1" cellspacing="0" summary="basis parameter description">
- *   <tr><th>Value</th><th>Days per Month</th><th>Days per Year</th></tr>
- *   <tr align='center'><td>0 (default)</td><td>30</td><td>360</td></tr>
- *   <tr align='center'><td>1</td><td>actual</td><td>actual</td></tr>
- *   <tr align='center'><td>2</td><td>actual</td><td>360</td></tr>
- *   <tr align='center'><td>3</td><td>actual</td><td>365</td></tr>
- *   <tr align='center'><td>4</td><td>30</td><td>360</td></tr>
- * </table>
- *
- */
-final class YearFrac implements FreeRefFunction {
-
-	public static final FreeRefFunction instance = new YearFrac();
-
-	private YearFrac() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-		int srcCellRow = ec.getRowIndex();
-		int srcCellCol = ec.getColumnIndex();
-		double result;
-		try {
-			int basis = 0; // default
-			switch(args.length) {
-				case 3:
-					basis = evaluateIntArg(args[2], srcCellRow, srcCellCol);
-					// fall through
-				case 2:
-					break;
-				default:
-					return ErrorEval.VALUE_INVALID;
-			}
-			double startDateVal = evaluateDateArg(args[0], srcCellRow, srcCellCol);
-			double endDateVal = evaluateDateArg(args[1], srcCellRow, srcCellCol);
-			result = YearFracCalculator.calculate(startDateVal, endDateVal, basis);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-
-		return new NumberEval(result);
-	}
-
-	private static double evaluateDateArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, (short) srcCellCol);
-
-		if (ve instanceof StringEval) {
-			String strVal = ((StringEval) ve).getStringValue();
-			Double dVal = OperandResolver.parseDouble(strVal);
-			if (dVal != null) {
-				return dVal.doubleValue();
-			}
-			Calendar date = DateParser.parseDate(strVal);
-			return DateUtil.getExcelDate(date, false);
-		}
-		return OperandResolver.coerceValueToDouble(ve);
-	}
-
-	private static int evaluateIntArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, (short) srcCellCol);
-		return OperandResolver.coerceValueToInt(ve);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java b/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
deleted file mode 100644
index 42bd9ae..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-
-/**
- * Internal calculation methods for Excel 'Analysis ToolPak' function YEARFRAC()<br/>
- *  
- * Algorithm inspired by www.dwheeler.com/yearfrac
- * 
- * @author Josh Micich
- */
-final class YearFracCalculator {
-	private static final int MS_PER_HOUR = 60 * 60 * 1000;
-	private static final int MS_PER_DAY = 24 * MS_PER_HOUR;
-	private static final int DAYS_PER_NORMAL_YEAR = 365;
-	private static final int DAYS_PER_LEAP_YEAR = DAYS_PER_NORMAL_YEAR + 1;
-
-	/** the length of normal long months i.e. 31 */
-	private static final int LONG_MONTH_LEN = 31;
-	/** the length of normal short months i.e. 30 */
-	private static final int SHORT_MONTH_LEN = 30;
-	private static final int SHORT_FEB_LEN = 28;
-	private static final int LONG_FEB_LEN = SHORT_FEB_LEN + 1;
-
-	private YearFracCalculator() {
-		// no instances of this class
-	}
-
-
-	public static double calculate(double pStartDateVal, double pEndDateVal, int basis) throws EvaluationException {
-
-		if (basis < 0 || basis >= 5) {
-			// if basis is invalid the result is #NUM!
-			throw new EvaluationException(ErrorEval.NUM_ERROR);
-		}
-
-		// common logic for all bases
-
-		// truncate day values
-		int startDateVal = (int) Math.floor(pStartDateVal);
-		int endDateVal = (int) Math.floor(pEndDateVal);
-		if (startDateVal == endDateVal) {
-			// when dates are equal, result is zero 
-			return 0;
-		}
-		// swap start and end if out of order
-		if (startDateVal > endDateVal) {
-			int temp = startDateVal;
-			startDateVal = endDateVal;
-			endDateVal = temp;
-		}
-
-		switch (basis) {
-			case 0: return basis0(startDateVal, endDateVal);
-			case 1: return basis1(startDateVal, endDateVal);
-			case 2: return basis2(startDateVal, endDateVal);
-			case 3: return basis3(startDateVal, endDateVal);
-			case 4: return basis4(startDateVal, endDateVal);
-		}
-		throw new IllegalStateException("cannot happen");
-	}
-
-
-	/**
-	 * @param startDateVal assumed to be less than or equal to endDateVal
-	 * @param endDateVal assumed to be greater than or equal to startDateVal
-	 */
-	public static double basis0(int startDateVal, int endDateVal) {
-		SimpleDate startDate = createDate(startDateVal);
-		SimpleDate endDate = createDate(endDateVal);
-		int date1day = startDate.day;
-		int date2day = endDate.day;
-
-		// basis zero has funny adjustments to the day-of-month fields when at end-of-month 
-		if (date1day == LONG_MONTH_LEN && date2day == LONG_MONTH_LEN) {
-			date1day = SHORT_MONTH_LEN;
-			date2day = SHORT_MONTH_LEN;
-		} else if (date1day == LONG_MONTH_LEN) {
-			date1day = SHORT_MONTH_LEN;
-		} else if (date1day == SHORT_MONTH_LEN && date2day == LONG_MONTH_LEN) {
-			date2day = SHORT_MONTH_LEN;
-			// Note: If date2day==31, it STAYS 31 if date1day < 30.
-			// Special fixes for February:
-		} else if (startDate.month == 2 && isLastDayOfMonth(startDate)) {
-			// Note - these assignments deliberately set Feb 30 date.
-			date1day = SHORT_MONTH_LEN;
-			if (endDate.month == 2 && isLastDayOfMonth(endDate)) {
-				// only adjusted when first date is last day in Feb
-				date2day = SHORT_MONTH_LEN;
-			}
-		}
-		return calculateAdjusted(startDate, endDate, date1day, date2day);
-	}
-	/**
-	 * @param startDateVal assumed to be less than or equal to endDateVal
-	 * @param endDateVal assumed to be greater than or equal to startDateVal
-	 */
-	public static double basis1(int startDateVal, int endDateVal) {
-		SimpleDate startDate = createDate(startDateVal);
-		SimpleDate endDate = createDate(endDateVal);
-		double yearLength;
-		if (isGreaterThanOneYear(startDate, endDate)) {
-			yearLength = averageYearLength(startDate.year, endDate.year);
-		} else if (shouldCountFeb29(startDate, endDate)) {
-			yearLength = DAYS_PER_LEAP_YEAR;
-		} else {
-			yearLength = DAYS_PER_NORMAL_YEAR;
-		}
-		return dateDiff(startDate.tsMilliseconds, endDate.tsMilliseconds) / yearLength;
-	}
-
-	/**
-	 * @param startDateVal assumed to be less than or equal to endDateVal
-	 * @param endDateVal assumed to be greater than or equal to startDateVal
-	 */
-	public static double basis2(int startDateVal, int endDateVal) {
-		return (endDateVal - startDateVal) / 360.0;
-	}
-	/**
-	 * @param startDateVal assumed to be less than or equal to endDateVal
-	 * @param endDateVal assumed to be greater than or equal to startDateVal
-	 */
-	public static double basis3(double startDateVal, double endDateVal) {
-		return (endDateVal - startDateVal) / 365.0;
-	}
-	/**
-	 * @param startDateVal assumed to be less than or equal to endDateVal
-	 * @param endDateVal assumed to be greater than or equal to startDateVal
-	 */
-	public static double basis4(int startDateVal, int endDateVal) {
-		SimpleDate startDate = createDate(startDateVal);
-		SimpleDate endDate = createDate(endDateVal);
-		int date1day = startDate.day;
-		int date2day = endDate.day;
-
-
-		// basis four has funny adjustments to the day-of-month fields when at end-of-month 
-		if (date1day == LONG_MONTH_LEN) {
-			date1day = SHORT_MONTH_LEN;
-		}
-		if (date2day == LONG_MONTH_LEN) {
-			date2day = SHORT_MONTH_LEN;
-		}
-		// Note - no adjustments for end of Feb
-		return calculateAdjusted(startDate, endDate, date1day, date2day);
-	}
-
-
-	private static double calculateAdjusted(SimpleDate startDate, SimpleDate endDate, int date1day,
-			int date2day) {
-		double dayCount 
-			= (endDate.year - startDate.year) * 360
-			+ (endDate.month - startDate.month) * SHORT_MONTH_LEN
-			+ (date2day - date1day) * 1;
-		return dayCount / 360;
-	}
-
-	private static boolean isLastDayOfMonth(SimpleDate date) {
-		if (date.day < SHORT_FEB_LEN) {
-			return false;
-		}
-		return date.day == getLastDayOfMonth(date);
-	}
-
-	private static int getLastDayOfMonth(SimpleDate date) {
-		switch (date.month) {
-			case 1:
-			case 3:
-			case 5:
-			case 7:
-			case 8:
-			case 10:
-			case 12:
-				return LONG_MONTH_LEN;
-			case 4:
-			case 6:
-			case 9:
-			case 11:
-				return SHORT_MONTH_LEN;
-		}
-		if (isLeapYear(date.year)) {
-			return LONG_FEB_LEN;
-		}
-		return SHORT_FEB_LEN;
-	}
-
-	/**
-	 * Assumes dates are no more than 1 year apart.
-	 * @return <code>true</code> if dates both within a leap year, or span a period including Feb 29
-	 */
-	private static boolean shouldCountFeb29(SimpleDate start, SimpleDate end) {
-		boolean startIsLeapYear = isLeapYear(start.year);
-		if (startIsLeapYear && start.year == end.year) {
-			// note - dates may not actually span Feb-29, but it gets counted anyway in this case
-			return true;
-		}
-
-		boolean endIsLeapYear = isLeapYear(end.year);
-		if (!startIsLeapYear && !endIsLeapYear) {
-			return false;
-		}
-		if (startIsLeapYear) {
-			switch (start.month) {
-				case SimpleDate.JANUARY:
-				case SimpleDate.FEBRUARY:
-					return true;
-			}
-			return false;
-		}
-		if (endIsLeapYear) {
-			switch (end.month) {
-				case SimpleDate.JANUARY:
-					return false;
-				case SimpleDate.FEBRUARY:
-					break;
-				default:
-					return true;
-			}
-			return end.day == LONG_FEB_LEN;
-		}
-		return false;
-	}
-
-	/**
-	 * @return the whole number of days between the two time-stamps.  Both time-stamps are
-	 * assumed to represent 12:00 midnight on the respective day.
-	 */
-	private static int dateDiff(long startDateMS, long endDateMS) {
-		long msDiff = endDateMS - startDateMS;
-
-		// some extra checks to make sure we don't hide some other bug with the rounding 
-		int remainderHours = (int) ((msDiff % MS_PER_DAY) / MS_PER_HOUR);
-		switch (remainderHours) {
-			case 0:  // normal case
-				break;
-			case 1:  // transition from normal time to daylight savings adjusted
-			case 23: // transition from daylight savings adjusted to normal time
-				// Unexpected since we are using UTC_TIME_ZONE 
-			default:
-				throw new RuntimeException("Unexpected date diff between " + startDateMS + " and " + endDateMS);
-
-		}
-		return (int) (0.5 + ((double)msDiff / MS_PER_DAY));
-	}
-
-	private static double averageYearLength(int startYear, int endYear) {
-		int dayCount = 0;
-		for (int i=startYear; i<=endYear; i++) {
-			dayCount += DAYS_PER_NORMAL_YEAR;
-			if (isLeapYear(i)) {
-				dayCount++;
-			}
-		}
-		double numberOfYears = endYear-startYear+1;
-		return dayCount / numberOfYears;
-	}
-
-	private static boolean isLeapYear(int i) {
-		// leap years are always divisible by 4
-		if (i % 4 != 0) {
-			return false;
-		}
-		// each 4th century is a leap year
-		if (i % 400 == 0) {
-			return true;
-		}
-		// all other centuries are *not* leap years
-		if (i % 100 == 0) {
-			return false;
-		}
-		return true;
-	}
-
-	private static boolean isGreaterThanOneYear(SimpleDate start, SimpleDate end) {
-		if (start.year == end.year) {
-			return false;
-		}
-		if (start.year + 1 != end.year) {
-			return true;
-		}
-
-		if (start.month > end.month) {
-			return false;
-		}
-		if (start.month < end.month) {
-			return true;
-		}
-
-		return start.day < end.day;
-	}
-
-	private static SimpleDate createDate(int dayCount) {
-	    /** use UTC time-zone to avoid daylight savings issues */
-		Calendar cal = LocaleUtil.getLocaleCalendar(LocaleUtil.TIMEZONE_UTC);
-		DateUtil.setCalendar(cal, dayCount, 0, false, false);
-		return new SimpleDate(cal);
-	}
-
-	private static final class SimpleDate {
-
-		public static final int JANUARY = 1;
-		public static final int FEBRUARY = 2;
-
-		public final int year;
-		/** 1-based month */
-		public final int month;
-		/** day of month */
-		public final int day;
-		/** milliseconds since 1970 */
-		public long tsMilliseconds;
-
-		public SimpleDate(Calendar cal) {
-			year = cal.get(Calendar.YEAR);
-			month = cal.get(Calendar.MONTH) + 1;
-			day = cal.get(Calendar.DAY_OF_MONTH);
-			tsMilliseconds = cal.getTimeInMillis();
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java b/trunk/src/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
deleted file mode 100644
index aa5016b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.constant;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * To support Constant Values (2.5.7) as required by the CRN record.
- * This class is also used for two dimensional arrays which are encoded by 
- * EXTERNALNAME (5.39) records and Array tokens.<p/>
- * 
- * @author Josh Micich
- */
-public final class ConstantValueParser {
-	// note - these (non-combinable) enum values are sparse.
-	private static final int TYPE_EMPTY = 0;
-	private static final int TYPE_NUMBER = 1;
-	private static final int TYPE_STRING = 2;
-	private static final int TYPE_BOOLEAN = 4; 
-	private static final int TYPE_ERROR_CODE = 16; // TODO - update OOO document to include this value
-	
-	private static final int TRUE_ENCODING = 1; 
-	private static final int FALSE_ENCODING = 0;
-	
-	// TODO - is this the best way to represent 'EMPTY'?
-	private static final Object EMPTY_REPRESENTATION = null;
-
-	private ConstantValueParser() {
-		// no instances of this class
-	}
-
-	public static Object[] parse(LittleEndianInput in, int nValues) {
-		Object[] result = new Object[nValues];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = readAConstantValue(in);
-		}
-		return result;
-	}
-
-	private static Object readAConstantValue(LittleEndianInput in) {
-		byte grbit = in.readByte();
-		switch(grbit) {
-			case TYPE_EMPTY:
-				in.readLong(); // 8 byte 'not used' field
-				return EMPTY_REPRESENTATION; 
-			case TYPE_NUMBER:
-				return new Double(in.readDouble());
-			case TYPE_STRING:
-				return StringUtil.readUnicodeString(in);
-			case TYPE_BOOLEAN:
-				return readBoolean(in);
-			case TYPE_ERROR_CODE:
-				int errCode = in.readUShort();
-				// next 6 bytes are unused
-				in.readUShort();
-				in.readInt();
-				return ErrorConstant.valueOf(errCode);
-		}
-		throw new RuntimeException("Unknown grbit value (" + grbit + ")");
-	}
-
-	private static Object readBoolean(LittleEndianInput in) {
-		byte val = (byte)in.readLong(); // 7 bytes 'not used'
-		switch(val) {
-			case FALSE_ENCODING:
-				return Boolean.FALSE;
-			case TRUE_ENCODING:
-				return Boolean.TRUE;
-		}
-		// Don't tolerate unusual boolean encoded values (unless it becomes evident that they occur)
-		throw new RuntimeException("unexpected boolean encoding (" + val + ")");
-	}
-
-	public static int getEncodedSize(Object[] values) {
-		// start with one byte 'type' code for each value
-		int result = values.length * 1;
-		for (int i = 0; i < values.length; i++) {
-			result += getEncodedSize(values[i]);
-		}
-		return result;
-	}
-
-	/**
-	 * @return encoded size without the 'type' code byte
-	 */
-	private static int getEncodedSize(Object object) {
-		if(object == EMPTY_REPRESENTATION) {
-			return 8;
-		}
-		Class<?> cls = object.getClass();
-		
-		if(cls == Boolean.class || cls == Double.class || cls == ErrorConstant.class) {
-			return 8;
-		}
-		String strVal = (String)object;
-		return StringUtil.getEncodedSize(strVal);
-	}
-
-	public static void encode(LittleEndianOutput out, Object[] values) {
-		for (int i = 0; i < values.length; i++) {
-			encodeSingleValue(out, values[i]);
-		}
-	}
-
-	private static void encodeSingleValue(LittleEndianOutput out, Object value) {
-		if (value == EMPTY_REPRESENTATION) {
-			out.writeByte(TYPE_EMPTY);
-			out.writeLong(0L);
-			return;
-		}
-		if (value instanceof Boolean) {
-			Boolean bVal = ((Boolean)value);
-			out.writeByte(TYPE_BOOLEAN);
-			long longVal = bVal.booleanValue() ? 1L : 0L;
-			out.writeLong(longVal);
-			return;
-		}
-		if (value instanceof Double) {
-			Double dVal = (Double) value;
-			out.writeByte(TYPE_NUMBER);
-			out.writeDouble(dVal.doubleValue());
-			return;
-		}
-		if (value instanceof String) {
-			String val = (String) value;
-			out.writeByte(TYPE_STRING);
-			StringUtil.writeUnicodeString(out, val);
-			return;
-		}
-		if (value instanceof ErrorConstant) {
-			ErrorConstant ecVal = (ErrorConstant) value;
-			out.writeByte(TYPE_ERROR_CODE);
-			long longVal = ecVal.getErrorCode();
-			out.writeLong(longVal);
-			return;
-		}
-
-		throw new IllegalStateException("Unexpected value type (" + value.getClass().getName() + "'");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java b/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
deleted file mode 100644
index 9d3c898..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.constant;
-
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-/**
- * Represents a constant error code value as encoded in a constant values array. <p/>
- * 
- * This class is a type-safe wrapper for a 16-bit int value performing a similar job to 
- * <tt>ErrorEval</tt>.
- */
-public class ErrorConstant {
-	private static final POILogger logger = POILogFactory.getLogger(ErrorConstant.class);
-    private static final ErrorConstant NULL = new ErrorConstant(FormulaError.NULL.getCode());
-    private static final ErrorConstant DIV_0 = new ErrorConstant(FormulaError.DIV0.getCode());
-    private static final ErrorConstant VALUE = new ErrorConstant(FormulaError.VALUE.getCode());
-    private static final ErrorConstant REF = new ErrorConstant(FormulaError.REF.getCode());
-    private static final ErrorConstant NAME = new ErrorConstant(FormulaError.NAME.getCode());
-    private static final ErrorConstant NUM = new ErrorConstant(FormulaError.NUM.getCode());
-    private static final ErrorConstant NA = new ErrorConstant(FormulaError.NA.getCode());
-
-	private final int _errorCode;
-
-	private ErrorConstant(int errorCode) {
-		_errorCode = errorCode;
-	}
-	
-	public int getErrorCode() {
-		return _errorCode;
-	}
-
-	public String getText() {
-		if(FormulaError.isValidCode(_errorCode)) {
-			return FormulaError.forInt(_errorCode).getString();
-		}
-		return "unknown error code (" + _errorCode + ")";
-	}
-
-	public static ErrorConstant valueOf(int errorCode) {
-	    if (FormulaError.isValidCode(errorCode)) {
-    		switch (FormulaError.forInt(errorCode)) {
-    			case NULL:  return NULL;
-    			case DIV0:  return DIV_0;
-    			case VALUE: return VALUE;
-    			case REF:   return REF;
-    			case NAME:  return NAME;
-    			case NUM:   return NUM;
-    			case NA:	return NA;
-    			default:    break;
-    		}
-	    }
-		logger.log( POILogger.WARN, "Warning - unexpected error code (" + errorCode + ")");
-		return new ErrorConstant(errorCode);
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(getText());
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java
deleted file mode 100644
index c2ce411..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.ThreeDEval;
-import org.apache.poi.ss.formula.TwoDEval;
-/**
- * Evaluation of 2D (Row+Column) and 3D (Sheet+Row+Column) areas
- */
-public interface AreaEval extends TwoDEval, ThreeDEval {
-
-    /**
-     * returns the 0-based index of the first row in
-     * this area.
-     */
-    int getFirstRow();
-
-    /**
-     * returns the 0-based index of the last row in
-     * this area.
-     */
-    int getLastRow();
-
-    /**
-     * returns the 0-based index of the first col in
-     * this area.
-     */
-    int getFirstColumn();
-
-    /**
-     * returns the 0-based index of the last col in
-     * this area.
-     */
-    int getLastColumn();
-
-    /**
-     * @return the ValueEval from within this area at the specified row and col index. Never
-     * <code>null</code> (possibly {@link BlankEval}).  The specified indexes should be absolute
-     * indexes in the sheet and not relative indexes within the area.
-     */
-    ValueEval getAbsoluteValue(int row, int col);
-
-    /**
-     * returns true if the cell at row and col specified
-     * as absolute indexes in the sheet is contained in
-     * this area.
-     * @param row
-     * @param col
-     */
-    boolean contains(int row, int col);
-
-    /**
-     * returns true if the specified col is in range
-     * @param col
-     */
-    boolean containsColumn(int col);
-
-    /**
-     * returns true if the specified row is in range
-     * @param row
-     */
-    boolean containsRow(int row);
-
-    int getWidth();
-    int getHeight();
-    /**
-     * @return the ValueEval from within this area at the specified relativeRowIndex and
-     * relativeColumnIndex. Never <code>null</code> (possibly {@link BlankEval}). The
-     * specified indexes should relative to the top left corner of this area.
-     */
-    ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex);
-
-    /**
-     * Creates an {@link AreaEval} offset by a relative amount from from the upper left cell
-     * of this area
-     */
-    AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java b/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
deleted file mode 100644
index edb8af7..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.SheetRange;
-import org.apache.poi.ss.formula.ptg.AreaI;
-
-/**
- * @author Josh Micich
- */
-public abstract class AreaEvalBase implements AreaEval {
-
-    private final int _firstSheet;
-	private final int _firstColumn;
-	private final int _firstRow;
-    private final int _lastSheet;
-	private final int _lastColumn;
-	private final int _lastRow;
-	private final int _nColumns;
-	private final int _nRows;
-
-	protected AreaEvalBase(SheetRange sheets, int firstRow, int firstColumn, int lastRow, int lastColumn) {
-		_firstColumn = firstColumn;
-		_firstRow = firstRow;
-		_lastColumn = lastColumn;
-		_lastRow = lastRow;
-
-		_nColumns = _lastColumn - _firstColumn + 1;
-		_nRows = _lastRow - _firstRow + 1;
-		
-		if (sheets != null) {
-		    _firstSheet = sheets.getFirstSheetIndex();
-		    _lastSheet = sheets.getLastSheetIndex();
-		} else {
-		    _firstSheet = -1;
-		    _lastSheet = -1;
-		}
-	}
-    protected AreaEvalBase(int firstRow, int firstColumn, int lastRow, int lastColumn) {
-        this(null, firstRow, firstColumn, lastRow, lastColumn);
-    }
-
-	protected AreaEvalBase(AreaI ptg) {
-	    this(ptg, null);
-	}
-    protected AreaEvalBase(AreaI ptg, SheetRange sheets) {
-	    this(sheets, ptg.getFirstRow(), ptg.getFirstColumn(), ptg.getLastRow(), ptg.getLastColumn());
-	}
-
-	public final int getFirstColumn() {
-		return _firstColumn;
-	}
-
-	public final int getFirstRow() {
-		return _firstRow;
-	}
-
-	public final int getLastColumn() {
-		return _lastColumn;
-	}
-
-	public final int getLastRow() {
-		return _lastRow;
-	}
-	
-	public int getFirstSheetIndex() {
-	    return _firstSheet;
-    }
-    public int getLastSheetIndex() {
-        return _lastSheet;
-    }
-    
-    public final ValueEval getAbsoluteValue(int row, int col) {
-		int rowOffsetIx = row - _firstRow;
-		int colOffsetIx = col - _firstColumn;
-
-		if(rowOffsetIx < 0 || rowOffsetIx >= _nRows) {
-			throw new IllegalArgumentException("Specified row index (" + row
-					+ ") is outside the allowed range (" + _firstRow + ".." + _lastRow + ")");
-		}
-		if(colOffsetIx < 0 || colOffsetIx >= _nColumns) {
-			throw new IllegalArgumentException("Specified column index (" + col
-					+ ") is outside the allowed range (" + _firstColumn + ".." + col + ")");
-		}
-		return getRelativeValue(rowOffsetIx, colOffsetIx);
-	}
-
-	public final boolean contains(int row, int col) {
-		return _firstRow <= row && _lastRow >= row
-			&& _firstColumn <= col && _lastColumn >= col;
-	}
-
-	public final boolean containsRow(int row) {
-		return _firstRow <= row && _lastRow >= row;
-	}
-
-	public final boolean containsColumn(int col) {
-		return _firstColumn <= col && _lastColumn >= col;
-	}
-
-	public final boolean isColumn() {
-		return _firstColumn == _lastColumn;
-	}
-
-	public final boolean isRow() {
-		return _firstRow == _lastRow;
-	}
-	public int getHeight() {
-		return _lastRow-_firstRow+1;
-	}
-
-	public final ValueEval getValue(int row, int col) {
-		return getRelativeValue(row, col);
-	}
-    public final ValueEval getValue(int sheetIndex, int row, int col) {
-        return getRelativeValue(sheetIndex, row, col);
-    }
-
-	public abstract ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex);
-    public abstract ValueEval getRelativeValue(int sheetIndex, int relativeRowIndex, int relativeColumnIndex);
-
-	public int getWidth() {
-		return _lastColumn-_firstColumn+1;
-	}
-
-    /**
-     * @return  whether cell at rowIndex and columnIndex is a subtotal.
-     * By default return false which means 'don't care about subtotals'
-    */
-    public boolean isSubTotal(int rowIndex, int columnIndex) {
-        return false;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java
deleted file mode 100644
index 845e7de..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt; This class is a
- *         marker class. It is a special value for empty cells.
- */
-public final class BlankEval implements ValueEval {
-
-	public static final BlankEval instance = new BlankEval();
-
-	private BlankEval() {
-		// enforce singleton
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
deleted file mode 100644
index cab4105..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class BoolEval implements NumericValueEval, StringValueEval {
-
-	private boolean _value;
-
-	public static final BoolEval FALSE = new BoolEval(false);
-
-	public static final BoolEval TRUE = new BoolEval(true);
-
-	/**
-	 * Convenience method for the following:<br/>
-	 * <code>(b ? BoolEval.TRUE : BoolEval.FALSE)</code>
-	 *
-	 * @return the <tt>BoolEval</tt> instance representing <tt>b</tt>.
-	 */
-	public static final BoolEval valueOf(boolean b) {
-		return b ? TRUE : FALSE;
-	}
-
-	private BoolEval(boolean value) {
-		_value = value;
-	}
-
-	public boolean getBooleanValue() {
-		return _value;
-	}
-
-	public double getNumberValue() {
-		return _value ? 1 : 0;
-	}
-
-	public String getStringValue() {
-		return _value ? "TRUE" : "FALSE";
-	}
-
-	public String toString() {
-		StringBuilder sb = new StringBuilder(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(getStringValue());
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java
deleted file mode 100644
index 5622be8..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class ConcatEval  extends Fixed2ArgFunction {
-
-	public static final Function instance = new ConcatEval();
-
-	private ConcatEval() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-		ValueEval ve0;
-		ValueEval ve1;
-		try {
-			ve0 = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			ve1 = OperandResolver.getSingleValue(arg1, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		StringBuilder sb = new StringBuilder();
-		sb.append(getText(ve0));
-		sb.append(getText(ve1));
-		return new StringEval(sb.toString());
-	}
-
-	private Object getText(ValueEval ve) {
-		if (ve instanceof StringValueEval) {
-			StringValueEval sve = (StringValueEval) ve;
-			return sve.getStringValue();
-		}
-		if (ve == BlankEval.instance) {
-			return "";
-		}
-		throw new IllegalAccessError("Unexpected value type ("
-					+ ve.getClass().getName() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
deleted file mode 100644
index 8e119ea..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.poi.ss.formula.eval;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.FormulaError;
-
-/**
- * Evaluations for formula errors
- */
-public final class ErrorEval implements ValueEval {
-    private static final Map<FormulaError,ErrorEval> evals = new HashMap<FormulaError, ErrorEval>();
-    
-    /** <b>#NULL!</b>  - Intersection of two cell ranges is empty */
-    public static final ErrorEval NULL_INTERSECTION = new ErrorEval(FormulaError.NULL);
-    /** <b>#DIV/0!</b> - Division by zero */
-    public static final ErrorEval DIV_ZERO = new ErrorEval(FormulaError.DIV0);
-    /** <b>#VALUE!</b> - Wrong type of operand */
-    public static final ErrorEval VALUE_INVALID = new ErrorEval(FormulaError.VALUE);
-    /** <b>#REF!</b> - Illegal or deleted cell reference */
-    public static final ErrorEval REF_INVALID = new ErrorEval(FormulaError.REF);
-    /** <b>#NAME?</b> - Wrong function or range name */
-    public static final ErrorEval NAME_INVALID = new ErrorEval(FormulaError.NAME);
-    /** <b>#NUM!</b> - Value range overflow */
-    public static final ErrorEval NUM_ERROR = new ErrorEval(FormulaError.NUM);
-    /** <b>#N/A</b> - Argument or function not available */
-    public static final ErrorEval NA = new ErrorEval(FormulaError.NA);
-
-    // POI internal error codes
-    public static final ErrorEval FUNCTION_NOT_IMPLEMENTED = new ErrorEval(FormulaError.FUNCTION_NOT_IMPLEMENTED);
-
-    // Note - Excel does not seem to represent this condition with an error code
-    public static final ErrorEval CIRCULAR_REF_ERROR = new ErrorEval(FormulaError.CIRCULAR_REF);
-
-    /**
-     * Translates an Excel internal error code into the corresponding POI ErrorEval instance
-     * @param errorCode
-     */
-    public static ErrorEval valueOf(int errorCode) {
-        FormulaError error = FormulaError.forInt(errorCode);
-        ErrorEval eval = evals.get(error);
-        if (eval != null) {
-            return eval;
-        } else {
-            throw new RuntimeException("Unhandled error type for code " + errorCode);
-        }
-    }
-
-    /**
-     * Converts error codes to text.  Handles non-standard error codes OK.  
-     * For debug/test purposes (and for formatting error messages).
-     * @return the String representation of the specified Excel error code.
-     */
-    public static String getText(int errorCode) {
-        if(FormulaError.isValidCode(errorCode)) {
-            return FormulaError.forInt(errorCode).getString();
-        }
-        // Give a special string, based on ~, to make clear this isn't a standard Excel error
-        return "~non~std~err(" + errorCode + ")~";
-    }
-
-    private FormulaError _error;
-    private ErrorEval(FormulaError error) {
-        _error = error;
-        evals.put(error, this);
-    }
-
-    public int getErrorCode() {
-        return _error.getLongCode();
-    }
-    public String getErrorString() {
-        return _error.getString();
-    }
-    public String toString() {
-        StringBuffer sb = new StringBuffer(64);
-        sb.append(getClass().getName()).append(" [");
-        sb.append(_error.getString());
-        sb.append("]");
-        return sb.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java b/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java
deleted file mode 100644
index bb9d957..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-/**
- * This class is used to simplify error handling logic <i>within</i> operator and function
- * implementations.   Note - <tt>OperationEval.evaluate()</tt> and <tt>Function.evaluate()</tt>
- * method signatures do not throw this exception so it cannot propagate outside.<p/>
- * 
- * Here is an example coded without <tt>EvaluationException</tt>, to show how it can help:
- * <pre>
- * public Eval evaluate(Eval[] args, int srcRow, short srcCol) {
- *	// ...
- *	Eval arg0 = args[0];
- *	if(arg0 instanceof ErrorEval) {
- *		return arg0;
- *	}
- *	if(!(arg0 instanceof AreaEval)) {
- *		return ErrorEval.VALUE_INVALID;
- *	}
- *	double temp = 0;
- *	AreaEval area = (AreaEval)arg0;
- *	ValueEval[] values = area.getValues();
- *	for (int i = 0; i < values.length; i++) {
- *		ValueEval ve = values[i];
- *		if(ve instanceof ErrorEval) {
- *			return ve;
- *		}
- *		if(!(ve instanceof NumericValueEval)) {
- *			return ErrorEval.VALUE_INVALID;
- *		}
- *		temp += ((NumericValueEval)ve).getNumberValue();
- *	}
- *	// ...
- * }	 
- * </pre>
- * In this example, if any error is encountered while processing the arguments, an error is 
- * returned immediately. This code is difficult to refactor due to all the points where errors
- * are returned.<br/>
- * Using <tt>EvaluationException</tt> allows the error returning code to be consolidated to one
- * place.<p/>
- * <pre>
- * public Eval evaluate(Eval[] args, int srcRow, short srcCol) {
- *	try {
- *		// ...
- *		AreaEval area = getAreaArg(args[0]);
- *		double temp = sumValues(area.getValues());
- *		// ...
- *	} catch (EvaluationException e) {
- *		return e.getErrorEval();
- *	}
- *}
- *
- *private static AreaEval getAreaArg(Eval arg0) throws EvaluationException {
- *	if (arg0 instanceof ErrorEval) {
- *		throw new EvaluationException((ErrorEval) arg0);
- *	}
- *	if (arg0 instanceof AreaEval) {
- *		return (AreaEval) arg0;
- *	}
- *	throw EvaluationException.invalidValue();
- *}
- *
- *private double sumValues(ValueEval[] values) throws EvaluationException {
- *	double temp = 0;
- *	for (int i = 0; i < values.length; i++) {
- *		ValueEval ve = values[i];
- *		if (ve instanceof ErrorEval) {
- *			throw new EvaluationException((ErrorEval) ve);
- *		}
- *		if (!(ve instanceof NumericValueEval)) {
- *			throw EvaluationException.invalidValue();
- *		}
- *		temp += ((NumericValueEval) ve).getNumberValue();
- *	}
- *	return temp;
- *}
- * </pre>   
- * It is not mandatory to use EvaluationException, doing so might give the following advantages:<br/>
- *  - Methods can more easily be extracted, allowing for re-use.<br/>
- *  - Type management (typecasting etc) is simpler because error conditions have been separated from
- * intermediate calculation values.<br/>
- *  - Fewer local variables are required. Local variables can have stronger types.<br/>
- *  - It is easier to mimic common Excel error handling behaviour (exit upon encountering first 
- *  error), because exceptions conveniently propagate up the call stack regardless of execution 
- *  points or the number of levels of nested calls.<p/>
- *  
- * <b>Note</b> - Only standard evaluation errors are represented by <tt>EvaluationException</tt> (
- * i.e. conditions expected to be encountered when evaluating arbitrary Excel formulas). Conditions
- * that could never occur in an Excel spreadsheet should result in runtime exceptions. Care should
- * be taken to not translate any POI internal error into an Excel evaluation error code.   
- * 
- * @author Josh Micich
- */
-public final class EvaluationException extends Exception {
-	private final ErrorEval _errorEval;
-
-	public EvaluationException(ErrorEval errorEval) {
-		_errorEval = errorEval;
-	}
-	// some convenience factory methods
-
-    /** <b>#VALUE!</b> - Wrong type of operand */
-	public static EvaluationException invalidValue() {
-		return new EvaluationException(ErrorEval.VALUE_INVALID);
-	}
-    /** <b>#REF!</b> - Illegal or deleted cell reference */
-	public static EvaluationException invalidRef() {
-		return new EvaluationException(ErrorEval.REF_INVALID);
-	}
-    /** <b>#NUM!</b> - Value range overflow */
-	public static EvaluationException numberError() {
-		return new EvaluationException(ErrorEval.NUM_ERROR);
-	}
-	
-	public ErrorEval getErrorEval() {
-		return _errorEval;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
deleted file mode 100644
index f65a3f8..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.EvaluationName;
-
-/**
- * Evaluation of a Name defined in a Sheet or Workbook scope
- */
-public final class ExternalNameEval implements ValueEval {
-	private final EvaluationName _name;
-
-	public ExternalNameEval(EvaluationName name) {
-		_name = name;
-	}
-
-	public EvaluationName getName() {
-		return _name;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(_name.getNameText());
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java
deleted file mode 100644
index d2a4d39..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.formula.atp.AnalysisToolPak;
-import org.apache.poi.ss.formula.function.FunctionMetadata;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.ss.formula.functions.*;
-
-/**
- * Mappings from the Excel functions to our evaluation implementations
- *  (where available)
- */
-public final class FunctionEval {
-    private FunctionEval() {
-        // no instances of this class
-    }
-
-    /**
-     * Some function IDs that require special treatment
-     */
-    private static final class FunctionID {
-        /** 1 */
-        public static final int IF = FunctionMetadataRegistry.FUNCTION_INDEX_IF;
-        /** 4 */
-        public static final int SUM = FunctionMetadataRegistry.FUNCTION_INDEX_SUM;
-        /** 78 */
-        public static final int OFFSET = 78;
-        /** 100 */
-        public static final int CHOOSE = FunctionMetadataRegistry.FUNCTION_INDEX_CHOOSE;
-        /** 148 */
-        public static final int INDIRECT = FunctionMetadataRegistry.FUNCTION_INDEX_INDIRECT;
-        /** 255 */
-        public static final int EXTERNAL_FUNC = FunctionMetadataRegistry.FUNCTION_INDEX_EXTERNAL;
-    }
-
-    /**
-     * Array elements corresponding to unimplemented functions are <code>null</code>
-     */
-    protected static final Function[] functions = produceFunctions();
-
-    /**
-     * See <a href="https://www.openoffice.org/sc/excelfileformat.pdf">Apache Open Office Excel File Format,
-     * Section 3.11 Built-In Sheet Functions</a>
-     */
-    private static Function[] produceFunctions() {
-        Function[] retval = new Function[368];
-
-        retval[0] = new Count();
-        retval[FunctionID.IF] = new IfFunc(); //nominally 1
-        retval[2] = LogicalFunction.ISNA;
-        retval[3] = LogicalFunction.ISERROR;
-        retval[FunctionID.SUM] = AggregateFunction.SUM; //nominally 4
-        retval[5] = AggregateFunction.AVERAGE;
-        retval[6] = AggregateFunction.MIN;
-        retval[7] = AggregateFunction.MAX;
-        retval[8] = new RowFunc(); // ROW
-        retval[9] = new Column();
-        retval[10] = new Na();
-        retval[11] = new Npv();
-        retval[12] = AggregateFunction.STDEV;
-        retval[13] = NumericFunction.DOLLAR;
-        retval[14] = new Fixed();
-        retval[15] = NumericFunction.SIN;
-        retval[16] = NumericFunction.COS;
-        retval[17] = NumericFunction.TAN;
-        retval[18] = NumericFunction.ATAN;
-        retval[19] = NumericFunction.PI;
-        retval[20] = NumericFunction.SQRT;
-        retval[21] = NumericFunction.EXP;
-        retval[22] = NumericFunction.LN;
-        retval[23] = NumericFunction.LOG10;
-        retval[24] = NumericFunction.ABS;
-        retval[25] = NumericFunction.INT;
-        retval[26] = NumericFunction.SIGN;
-        retval[27] = NumericFunction.ROUND;
-        retval[28] = new Lookup();
-        retval[29] = new Index();
-        retval[30] = new Rept();
-        retval[31] = TextFunction.MID;
-        retval[32] = TextFunction.LEN;
-        retval[33] = new Value();
-        retval[34] = BooleanFunction.TRUE;
-        retval[35] = BooleanFunction.FALSE;
-        retval[36] = BooleanFunction.AND;
-        retval[37] = BooleanFunction.OR;
-        retval[38] = BooleanFunction.NOT;
-        retval[39] = NumericFunction.MOD;
-        // 40: DCOUNT
-        // 41: DSUM
-        // 42: DAVERAGE
-        retval[43] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DMIN);
-        // 44: DMAX
-        // 45: DSTDEV
-        retval[46] = AggregateFunction.VAR;
-        // 47: DVAR
-        retval[48] = TextFunction.TEXT;
-        // 49: LINEST
-        // 50: TREND
-        // 51: LOGEST
-        // 52: GROWTH
-
-        retval[56] = FinanceFunction.PV;
-        retval[57] = FinanceFunction.FV;
-        retval[58] = FinanceFunction.NPER;
-        retval[59] = FinanceFunction.PMT;
-        retval[60] = new Rate();
-        retval[61] = new Mirr();
-        retval[62] = new Irr();
-        retval[63] = NumericFunction.RAND;
-        retval[64] = new Match();
-        retval[65] = DateFunc.instance;
-        retval[66] = new TimeFunc();
-        retval[67] = CalendarFieldFunction.DAY;
-        retval[68] = CalendarFieldFunction.MONTH;
-        retval[69] = CalendarFieldFunction.YEAR;
-        retval[70] = WeekdayFunc.instance;
-        retval[71] = CalendarFieldFunction.HOUR;
-        retval[72] = CalendarFieldFunction.MINUTE;
-        retval[73] = CalendarFieldFunction.SECOND;
-        retval[74] = new Now();
-        // 75: AREAS
-        retval[76] = new Rows();
-        retval[77] = new Columns();
-        retval[FunctionID.OFFSET] = new Offset(); //nominally 78
-
-        retval[82] = TextFunction.SEARCH;
-        // 83: TRANSPOSE
-
-        // 86: TYPE
-
-        retval[97] = NumericFunction.ATAN2;
-        retval[98] = NumericFunction.ASIN;
-        retval[99] = NumericFunction.ACOS;
-        retval[FunctionID.CHOOSE] = new Choose(); //nominally 100
-        retval[101] = new Hlookup();
-        retval[102] = new Vlookup();
-
-        retval[105] = LogicalFunction.ISREF;
-
-        retval[109] = NumericFunction.LOG;
-
-        retval[111] = TextFunction.CHAR;
-        retval[112] = TextFunction.LOWER;
-        retval[113] = TextFunction.UPPER;
-        retval[114] = TextFunction.PROPER;
-        retval[115] = TextFunction.LEFT;
-        retval[116] = TextFunction.RIGHT;
-        retval[117] = TextFunction.EXACT;
-        retval[118] = TextFunction.TRIM;
-        retval[119] = new Replace();
-        retval[120] = new Substitute();
-        retval[121] = new Code();
-
-        retval[124] = TextFunction.FIND;
-
-        retval[126] = LogicalFunction.ISERR;
-        retval[127] = LogicalFunction.ISTEXT;
-        retval[128] = LogicalFunction.ISNUMBER;
-        retval[129] = LogicalFunction.ISBLANK;
-        retval[130] = new T();
-
-        retval[FunctionID.INDIRECT] = null; // Indirect.evaluate has different signature
-
-        retval[162] = TextFunction.CLEAN;
-
-        retval[167] = new IPMT();
-        retval[168] = new PPMT();
-        retval[169] = new Counta();
-
-        retval[183] = AggregateFunction.PRODUCT;
-        retval[184] = NumericFunction.FACT;
-
-        retval[190] = LogicalFunction.ISNONTEXT;
-
-        retval[194] = AggregateFunction.VARP;
-
-        retval[197] = NumericFunction.TRUNC;
-        retval[198] = LogicalFunction.ISLOGICAL;
-
-        //204: USDOLLAR (YEN in BIFF3)
-        //205: FINDB
-        //206: SEARCHB
-        //207: REPLACEB
-        //208: LEFTB
-        //209: RIGHTB
-        //210: MIDB
-        //211: LENB
-        retval[212] = NumericFunction.ROUNDUP;
-        retval[213] = NumericFunction.ROUNDDOWN;
-        //214: ASC
-        //215: DBCS (JIS in BIFF3)
-        retval[216] = new Rank();
-        retval[219] = new Address();
-        retval[220] = new Days360();
-        retval[221] = new Today();
-        //222: VBD
-
-        retval[227] = AggregateFunction.MEDIAN;
-        retval[228] = new Sumproduct();
-        retval[229] = NumericFunction.SINH;
-        retval[230] = NumericFunction.COSH;
-        retval[231] = NumericFunction.TANH;
-        retval[232] = NumericFunction.ASINH;
-        retval[233] = NumericFunction.ACOSH;
-        retval[234] = NumericFunction.ATANH;
-        retval[235] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DGET);
-
-        // 244: INFO
-
-        // 247: DB
-        
-        retval[FunctionID.EXTERNAL_FUNC] = null; // ExternalFunction is a FreeRefFunction, nominally 255
-
-        retval[261] = new Errortype();
-
-        retval[269] = AggregateFunction.AVEDEV;
-        // 270: BETADIST
-        // 271: GAMMALN
-        // 272: BETAINV
-        // 273: BINOMDIST
-        // 274: CHIDIST
-        // 275: CHIINV
-        retval[276] = NumericFunction.COMBIN;
-        // 277: CONFIDENCE
-        // 278:CRITBINOM
-        retval[279] = new Even();
-        // 280: EXPONDIST
-        // 281: FDIST
-        // 282: FINV
-        // 283: FISHER
-        // 284: FISHERINV
-        retval[285] = NumericFunction.FLOOR;
-        // 286: GAMMADIST
-        // 287: GAMMAINV
-        retval[288] = NumericFunction.CEILING;
-        // 289: HYPGEOMDIST
-        // 290: LOGNORMDIST
-        // 291: LOGINV
-        // 292: NEGBINOMDIST
-        // 293: NORMDIST
-        // 294: NORMSDIST
-        // 295: NORMINV
-        // 296: NORMSINV
-        // 297: STANDARDIZE
-        retval[298] = new Odd();
-        // 299: PERMUT
-        retval[300] = NumericFunction.POISSON;
-        // 301: TDIST
-        // 302: WEIBULL
-        retval[303] = new Sumxmy2();
-        retval[304] = new Sumx2my2();
-        retval[305] = new Sumx2py2();
-        // 306: CHITEST
-        // 307: CORREL
-        // 308: COVAR
-        // 309: FORECAST
-        // 310: FTEST
-        retval[311] = new Intercept();
-        // 312: PEARSON
-        // 313: RSQ
-        // 314: STEYX
-        retval[315] = new Slope();
-        // 316: TTEST
-        // 317: PROB
-        retval[318] = AggregateFunction.DEVSQ;
-        // 319: GEOMEAN
-        // 320: HARMEAN
-        retval[321] = AggregateFunction.SUMSQ;
-        // 322: KURT
-        // 323: SKEW
-        // 324: ZTEST
-        retval[325] = AggregateFunction.LARGE;
-        retval[326] = AggregateFunction.SMALL;
-        // 327: QUARTILE
-        retval[328] = AggregateFunction.PERCENTILE;
-        // 329: PERCENTRANK
-        retval[330] = new Mode();
-        // 331: TRIMMEAN
-        // 332: TINV
-
-        retval[336] = TextFunction.CONCATENATE;
-        retval[337] = NumericFunction.POWER;
-
-        retval[342] = NumericFunction.RADIANS;
-        retval[343] = NumericFunction.DEGREES;
-        retval[344] = new Subtotal();
-        retval[345] = new Sumif();
-        retval[346] = new Countif();
-        retval[347] = new Countblank();
-
-        // 350: ISPMT
-        // 351: DATEDIF
-        // 352: DATESTRING
-        // 353: NUMBERSTRING
-        retval[354] = new Roman();
-
-        // 358: GETPIVOTDATA
-        retval[359] = new Hyperlink();
-        // 360: PHONETIC
-        // 361: AVERAGEA
-        retval[362] = MinaMaxa.MAXA;
-        retval[363] = MinaMaxa.MINA;
-        // 364: STDEVPA
-        // 365: VARPA
-        // 366: STDEVA
-        // 367: VARA
-
-        for (int i = 0; i < retval.length; i++) {
-            Function f = retval[i];
-            if (f == null) {
-                FunctionMetadata fm = FunctionMetadataRegistry.getFunctionByIndex(i);
-                if (fm == null) {
-                    continue;
-                }
-                retval[i] = new NotImplementedFunction(fm.getName());
-            }
-        }
-        return retval;
-    }
-    /**
-     * @return <code>null</code> if the specified functionIndex is for INDIRECT() or any external (add-in) function.
-     */
-    public static Function getBasicFunction(int functionIndex) {
-        // check for 'free ref' functions first
-        switch (functionIndex) {
-        case FunctionID.INDIRECT:
-        case FunctionID.EXTERNAL_FUNC:
-            return null;
-        }
-        // else - must be plain function
-        Function result = functions[functionIndex];
-        if (result == null) {
-            throw new NotImplementedException("FuncIx=" + functionIndex);
-        }
-        return result;
-    }
-
-    /**
-     * Register a new function in runtime.
-     *
-     * @param name  the function name
-     * @param func  the functoin to register
-     * @throws IllegalArgumentException if the function is unknown or already  registered.
-     * @since 3.8 beta6
-     */
-    public static void registerFunction(String name, Function func){
-        FunctionMetadata metaData = FunctionMetadataRegistry.getFunctionByName(name);
-        if(metaData == null) {
-            if(AnalysisToolPak.isATPFunction(name)) {
-                throw new IllegalArgumentException(name + " is a function from the Excel Analysis Toolpack. " +
-                        "Use AnalysisToolpack.registerFunction(String name, FreeRefFunction func) instead.");
-            }
-
-            throw new IllegalArgumentException("Unknown function: " + name);
-        }
-
-        int idx = metaData.getIndex();
-        if(functions[idx] instanceof NotImplementedFunction) {
-            functions[idx] = func;
-        } else {
-            throw new IllegalArgumentException("POI already implememts " + name +
-                    ". You cannot override POI's implementations of Excel functions");
-        }
-    }
-
-    /**
-     * Returns a collection of function names implemented by POI.
-     *
-     * @return an array of supported functions
-     * @since 3.8 beta6
-     */
-    public static Collection<String> getSupportedFunctionNames() {
-        Collection<String> lst = new TreeSet<String>();
-        for (int i = 0; i < functions.length; i++) {
-            Function func = functions[i];
-            FunctionMetadata metaData = FunctionMetadataRegistry.getFunctionByIndex(i);
-            if (func != null && !(func instanceof NotImplementedFunction)) {
-                lst.add(metaData.getName());
-            }
-        }
-        lst.add("INDIRECT"); // INDIRECT is a special case
-        return Collections.unmodifiableCollection(lst);
-    }
-
-    /**
-     * Returns an array of function names NOT implemented by POI.
-     *
-     * @return an array of not supported functions
-     * @since 3.8 beta6
-     */
-    public static Collection<String> getNotSupportedFunctionNames() {
-        Collection<String> lst = new TreeSet<String>();
-        for (int i = 0; i < functions.length; i++) {
-            Function func = functions[i];
-            if (func != null && (func instanceof NotImplementedFunction)) {
-                FunctionMetadata metaData = FunctionMetadataRegistry.getFunctionByIndex(i);
-                lst.add(metaData.getName());
-            }
-        }
-        lst.remove("INDIRECT"); // INDIRECT is a special case
-        return Collections.unmodifiableCollection(lst);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
deleted file mode 100644
index 8a9e480..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-/**
- * @author Josh Micich
- */
-public final class FunctionNameEval implements ValueEval {
-
-	private final String _functionName;
-
-	/**
-	 * Creates a NameEval representing a function name
-	 */
-	public FunctionNameEval(String functionName) {
-		_functionName = functionName;
-	}
-
-
-	public String getFunctionName() {
-		return _functionName;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(_functionName);
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
deleted file mode 100644
index 4063790..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-
-/**
- * @author Josh Micich
- */
-public final class IntersectionEval  extends Fixed2ArgFunction {
-
-	public static final Function instance = new IntersectionEval();
-
-	private IntersectionEval() {
-		// enforces singleton
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-
-		try {
-			AreaEval reA = evaluateRef(arg0);
-			AreaEval reB = evaluateRef(arg1);
-			AreaEval result = resolveRange(reA, reB);
-			if (result == null) {
-				return ErrorEval.NULL_INTERSECTION;
-			}
-			return result;
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	/**
-	 * @return simple rectangular {@link AreaEval} which represents the intersection of areas
-	 * <tt>aeA</tt> and <tt>aeB</tt>. If the two areas do not intersect, the result is <code>null</code>.
-	 */
-	private static AreaEval resolveRange(AreaEval aeA, AreaEval aeB) {
-
-		int aeAfr = aeA.getFirstRow();
-		int aeAfc = aeA.getFirstColumn();
-		int aeBlc = aeB.getLastColumn();
-		if (aeAfc > aeBlc) {
-			return null;
-		}
-		int aeBfc = aeB.getFirstColumn();
-		if (aeBfc > aeA.getLastColumn()) {
-			return null;
-		}
-		int aeBlr = aeB.getLastRow();
-		if (aeAfr > aeBlr) {
-			return null;
-		}
-		int aeBfr = aeB.getFirstRow();
-		int aeAlr = aeA.getLastRow();
-		if (aeBfr > aeAlr) {
-			return null;
-		}
-
-
-		int top = Math.max(aeAfr, aeBfr);
-		int bottom = Math.min(aeAlr, aeBlr);
-		int left = Math.max(aeAfc, aeBfc);
-		int right = Math.min(aeA.getLastColumn(), aeBlc);
-
-		return aeA.offset(top-aeAfr, bottom-aeAfr, left-aeAfc, right-aeAfc);
-	}
-
-	private static AreaEval evaluateRef(ValueEval arg) throws EvaluationException {
-		if (arg instanceof AreaEval) {
-			return (AreaEval) arg;
-		}
-		if (arg instanceof RefEval) {
-			return ((RefEval) arg).offset(0, 0, 0, 0);
-		}
-		if (arg instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval)arg);
-		}
-		throw new IllegalArgumentException("Unexpected ref arg class (" + arg.getClass().getName() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
deleted file mode 100644
index 70d2504..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-/**
- * Represents the (intermediate) evaluated result of a missing function argument.  In most cases
- * this can be translated into {@link BlankEval} but there are some notable exceptions.  Functions
- * COUNT and COUNTA <em>do</em> count their missing args.  Note - the differences between
- * {@link MissingArgEval} and {@link BlankEval} have not been investigated fully, so the POI
- * evaluator may need to be updated to account for these as they are found.
- *
- * @author Josh Micich
- */
-public final class MissingArgEval implements ValueEval {
-
-	public static final MissingArgEval instance = new MissingArgEval();
-
-	private MissingArgEval() {
-		// enforce singleton
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/NotImplementedException.java b/trunk/src/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
deleted file mode 100644
index 9d81f8c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-
-/**
- * An exception thrown by implementors of {@link FormulaEvaluator},
- *  when attempting to evaluate a formula which requires features
- *   that POI does not (yet) support.
- * 
- * <p>Where possible, a subclass of this should be thrown, to provide
- *  more detail of what part of the formula couldn't be processed due
- *  to a missing implementation
- */
-public class NotImplementedException extends RuntimeException {
-    private static final long serialVersionUID = -5840703336495141301L;
-    
-    public NotImplementedException(String message) {
-		super(message);
-	}
-	public NotImplementedException(String message, NotImplementedException cause) {
-		super(message, cause);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java b/trunk/src/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
deleted file mode 100644
index 182e53b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-
-/**
- * An exception thrown by implementors of {@link FormulaEvaluator} when 
- *  attempting to evaluate a formula which requires a function that POI 
- *  does not (yet) support.
- */
-public final class NotImplementedFunctionException extends NotImplementedException {
-    private static final long serialVersionUID = 1208119411557559057L;
-    
-    private String functionName;
-    
-	public NotImplementedFunctionException(String functionName) {
-		super(functionName);
-		this.functionName = functionName;
-	}
-	public NotImplementedFunctionException(String functionName, NotImplementedException cause) {
-		super(functionName, cause);
-        this.functionName = functionName;
-	}
-	
-	public String getFunctionName() {
-	    return functionName;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java
deleted file mode 100644
index 87d4253..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * Created on May 8, 2005
- *
- */
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.NumberPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.util.NumberToTextConverter;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *  
- */
-public final class NumberEval implements NumericValueEval, StringValueEval {
-    
-    public static final NumberEval ZERO = new NumberEval(0);
-
-    private final double _value;
-    private String _stringValue;
-
-    public NumberEval(Ptg ptg) {
-        if (ptg == null) {
-            throw new IllegalArgumentException("ptg must not be null");
-        }
-        if (ptg instanceof IntPtg) {
-            _value = ((IntPtg) ptg).getValue();
-        } else if (ptg instanceof NumberPtg) {
-            _value = ((NumberPtg) ptg).getValue();
-        } else {
-            throw new IllegalArgumentException("bad argument type (" + ptg.getClass().getName() + ")");
-        }
-    }
-
-    public NumberEval(double value) {
-        _value = value;
-    }
-
-    public double getNumberValue() {
-        return _value;
-    }
-
-    public String getStringValue() {
-        if (_stringValue == null) {
-            _stringValue = NumberToTextConverter.toText(_value);
-        }
-        return _stringValue;
-    }
-    public final String toString() {
-        return getClass().getName() + " [" +
-                getStringValue() +
-                "]";
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
deleted file mode 100644
index 056f21c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * Created on May 8, 2005
- *
- */
-package org.apache.poi.ss.formula.eval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *  
- */
-public interface NumericValueEval extends ValueEval {
-
-    public abstract double getNumberValue();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java b/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
deleted file mode 100644
index d2b899d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import java.util.regex.Pattern;
-
-/**
- * Provides functionality for evaluating arguments to functions and operators.
- *
- * @author Josh Micich
- * @author Brendan Nolan
- */
-public final class OperandResolver {
-
-    // Based on regular expression defined in JavaDoc at {@link java.lang.Double#valueOf}
-    // modified to remove support for NaN, Infinity, Hexadecimal support and floating type suffixes
-    private static final String Digits    = "(\\p{Digit}+)";
-    private static final String Exp    = "[eE][+-]?"+Digits;
-    private static final String fpRegex    =
-                ("[\\x00-\\x20]*" +    
-                 "[+-]?(" +    
-                   "((("+Digits+"(\\.)?("+Digits+"?)("+Exp+")?)|"+        
-                 "(\\.("+Digits+")("+Exp+")?))))"+       
-                 "[\\x00-\\x20]*"); 
-            
-    
-    private OperandResolver() {
-        // no instances of this class
-    }
-
-    /**
-     * Retrieves a single value from a variety of different argument types according to standard
-     * Excel rules.  Does not perform any type conversion.
-     * @param arg the evaluated argument as passed to the function or operator.
-     * @param srcCellRow used when arg is a single column AreaRef
-     * @param srcCellCol used when arg is a single row AreaRef
-     * @return a <tt>NumberEval</tt>, <tt>StringEval</tt>, <tt>BoolEval</tt> or <tt>BlankEval</tt>.
-     * Never <code>null</code> or <tt>ErrorEval</tt>.
-     * @throws EvaluationException(#VALUE!) if srcCellRow or srcCellCol do not properly index into
-     *  an AreaEval.  If the actual value retrieved is an ErrorEval, a corresponding
-     *  EvaluationException is thrown.
-     */
-    public static ValueEval getSingleValue(ValueEval arg, int srcCellRow, int srcCellCol)
-            throws EvaluationException {
-        final ValueEval result;
-        if (arg instanceof RefEval) {
-            result = chooseSingleElementFromRef((RefEval) arg);
-        } else if (arg instanceof AreaEval) {
-            result = chooseSingleElementFromArea((AreaEval) arg, srcCellRow, srcCellCol);
-        } else {
-            result = arg;
-        }
-        if (result instanceof ErrorEval) {
-            throw new EvaluationException((ErrorEval) result);
-        }
-        return result;
-    }
-
-    /**
-     * Implements (some perhaps not well known) Excel functionality to select a single cell from an
-     * area depending on the coordinates of the calling cell.  Here is an example demonstrating
-     * both selection from a single row area and a single column area in the same formula.
-     *
-     *    <table border="1" cellpadding="1" cellspacing="1" summary="sample spreadsheet">
-     *      <tr><th>&nbsp;</th><th>&nbsp;A&nbsp;</th><th>&nbsp;B&nbsp;</th><th>&nbsp;C&nbsp;</th><th>&nbsp;D&nbsp;</th></tr>
-     *      <tr><th>1</th><td>15</td><td>20</td><td>25</td><td>&nbsp;</td></tr>
-     *      <tr><th>2</th><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>200</td></tr>
-     *      <tr><th>3</th><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>300</td></tr>
-     *      <tr><th>3</th><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>400</td></tr>
-     *    </table>
-     *
-     * If the formula "=1000+A1:B1+D2:D3" is put into the 9 cells from A2 to C4, the spreadsheet
-     * will look like this:
-     *
-     *    <table border="1" cellpadding="1" cellspacing="1" summary="sample spreadsheet">
-     *      <tr><th>&nbsp;</th><th>&nbsp;A&nbsp;</th><th>&nbsp;B&nbsp;</th><th>&nbsp;C&nbsp;</th><th>&nbsp;D&nbsp;</th></tr>
-     *      <tr><th>1</th><td>15</td><td>20</td><td>25</td><td>&nbsp;</td></tr>
-     *      <tr><th>2</th><td>1215</td><td>1220</td><td>#VALUE!</td><td>200</td></tr>
-     *      <tr><th>3</th><td>1315</td><td>1320</td><td>#VALUE!</td><td>300</td></tr>
-     *      <tr><th>4</th><td>#VALUE!</td><td>#VALUE!</td><td>#VALUE!</td><td>400</td></tr>
-     *    </table>
-     *
-     * Note that the row area (A1:B1) does not include column C and the column area (D2:D3) does
-     * not include row 4, so the values in C1(=25) and D4(=400) are not accessible to the formula
-     * as written, but in the 4 cells A2:B3, the row and column selection works ok.<p/>
-     *
-     * The same concept is extended to references across sheets, such that even multi-row,
-     * multi-column areas can be useful.<p/>
-     *
-     * Of course with carefully (or carelessly) chosen parameters, cyclic references can occur and
-     * hence this method <b>can</b> throw a 'circular reference' EvaluationException.  Note that
-     * this method does not attempt to detect cycles.  Every cell in the specified Area <tt>ae</tt>
-     * has already been evaluated prior to this method call.  Any cell (or cell<b>s</b>) part of
-     * <tt>ae</tt> that would incur a cyclic reference error if selected by this method, will
-     * already have the value <t>ErrorEval.CIRCULAR_REF_ERROR</tt> upon entry to this method.  It
-     * is assumed logic exists elsewhere to produce this behaviour.
-     *
-     * @return whatever the selected cell's evaluated value is.  Never <code>null</code>. Never
-     *  <tt>ErrorEval</tt>.
-     * @throws EvaluationException if there is a problem with indexing into the area, or if the
-     *  evaluated cell has an error.
-     */
-    public static ValueEval chooseSingleElementFromArea(AreaEval ae,
-            int srcCellRow, int srcCellCol) throws EvaluationException {
-        ValueEval result = chooseSingleElementFromAreaInternal(ae, srcCellRow, srcCellCol);
-        if (result instanceof ErrorEval) {
-            throw new EvaluationException((ErrorEval) result);
-        }
-        return result;
-    }
-
-    /**
-     * @return possibly <tt>ErrorEval</tt>, and <code>null</code>
-     */
-    private static ValueEval chooseSingleElementFromAreaInternal(AreaEval ae,
-            int srcCellRow, int srcCellCol) throws EvaluationException {
-
-//        if(false) {
-//            // this is too simplistic
-//            if(ae.containsRow(srcCellRow) && ae.containsColumn(srcCellCol)) {
-//                throw new EvaluationException(ErrorEval.CIRCULAR_REF_ERROR);
-//            }
-//        /*
-//        Circular references are not dealt with directly here, but it is worth noting some issues.
-//
-//        ANY one of the return statements in this method could return a cell that is identical
-//        to the one immediately being evaluated.  The evaluating cell is identified by srcCellRow,
-//        srcCellRow AND sheet.  The sheet is not available in any nearby calling method, so that's
-//        one reason why circular references are not easy to detect here. (The sheet of the returned
-//        cell can be obtained from ae if it is an Area3DEval.)
-//
-//        Another reason there's little value in attempting to detect circular references here is
-//        that only direct circular references could be detected.  If the cycle involved two or more
-//        cells this method could not detect it.
-//
-//        Logic to detect evaluation cycles of all kinds has been coded in EvaluationCycleDetector
-//        (and FormulaEvaluator).
-//         */
-//        }
-
-        if (ae.isColumn()) {
-            if(ae.isRow()) {
-                return ae.getRelativeValue(0, 0);
-            }
-            if(!ae.containsRow(srcCellRow)) {
-                throw EvaluationException.invalidValue();
-            }
-            return ae.getAbsoluteValue(srcCellRow, ae.getFirstColumn());
-        }
-        if(!ae.isRow()) {
-            // multi-column, multi-row area
-            if(ae.containsRow(srcCellRow) && ae.containsColumn(srcCellCol)) {
-                return ae.getAbsoluteValue(ae.getFirstRow(), ae.getFirstColumn());
-            }
-            throw EvaluationException.invalidValue();
-        }
-        if(!ae.containsColumn(srcCellCol)) {
-            throw EvaluationException.invalidValue();
-        }
-        return ae.getAbsoluteValue(ae.getFirstRow(), srcCellCol);
-    }
-    
-    private static ValueEval chooseSingleElementFromRef(RefEval ref) {
-        return ref.getInnerValueEval( ref.getFirstSheetIndex() );
-    }
-
-    /**
-     * Applies some conversion rules if the supplied value is not already an integer.<br/>
-     * Value is first coerced to a <tt>double</tt> ( See <tt>coerceValueToDouble()</tt> ).
-     * Note - <tt>BlankEval</tt> is converted to <code>0</code>.<p/>
-     *
-     * Excel typically converts doubles to integers by truncating toward negative infinity.<br/>
-     * The equivalent java code is:<br/>
-     * &nbsp;&nbsp;<code>return (int)Math.floor(d);</code><br/>
-     * <b>not</b>:<br/>
-     * &nbsp;&nbsp;<code>return (int)d; // wrong - rounds toward zero</code>
-     *
-     */
-    public static int coerceValueToInt(ValueEval ev) throws EvaluationException {
-        if (ev == BlankEval.instance) {
-            return 0;
-        }
-        double d = coerceValueToDouble(ev);
-        // Note - the standard java type conversion from double to int truncates toward zero.
-        // but Math.floor() truncates toward negative infinity
-        return (int)Math.floor(d);
-    }
-
-    /**
-     * Applies some conversion rules if the supplied value is not already a number.
-     * Note - <tt>BlankEval</tt> is converted to {@link NumberEval#ZERO}.
-     * @param ev must be a {@link NumberEval}, {@link StringEval}, {@link BoolEval} or
-     * {@link BlankEval}
-     * @return actual, parsed or interpreted double value (respectively).
-     * @throws EvaluationException(#VALUE!) only if a StringEval is supplied and cannot be parsed
-     * as a double (See <tt>parseDouble()</tt> for allowable formats).
-     * @throws RuntimeException if the supplied parameter is not {@link NumberEval},
-     * {@link StringEval}, {@link BoolEval} or {@link BlankEval}
-     */
-    public static double coerceValueToDouble(ValueEval ev) throws EvaluationException {
-
-        if (ev == BlankEval.instance) {
-            return 0.0;
-        }
-        if (ev instanceof NumericValueEval) {
-            // this also handles booleans
-            return ((NumericValueEval)ev).getNumberValue();
-        }
-        if (ev instanceof StringEval) {
-            Double dd = parseDouble(((StringEval) ev).getStringValue());
-            if (dd == null) {
-                throw EvaluationException.invalidValue();
-            }
-            return dd.doubleValue();
-        }
-        throw new RuntimeException("Unexpected arg eval type (" + ev.getClass().getName() + ")");
-    }
-
-    /**
-     * Converts a string to a double using standard rules that Excel would use.<br/>
-     * Tolerates leading and trailing spaces, <p/>
-     * 
-     * Doesn't support currency prefixes, commas, percentage signs or arithmetic operations strings.  
-     *
-     *  Some examples:<br/>
-     *  " 123 " -&gt; 123.0<br/>
-     *  ".123" -&gt; 0.123<br/>
-     *  "1E4" -&gt; 1000<br/>
-     *  "-123" -&gt; -123.0<br/>
-     *  These not supported yet:<br/>
-     *  " $ 1,000.00 " -&gt; 1000.0<br/>
-     *  "$1.25E4" -&gt; 12500.0<br/>
-     *  "5**2" -&gt; 500<br/>
-     *  "250%" -&gt; 2.5<br/>
-     *
-     * @return <code>null</code> if the specified text cannot be parsed as a number
-     */
-    public static Double parseDouble(String pText) {
-        
-        if (Pattern.matches(fpRegex, pText))
-            try {
-                return Double.parseDouble(pText);
-            } catch (NumberFormatException e) {
-                return null;
-            }
-        else {
-            return null;
-        }
-        
-    }
-
-    /**
-     * @param ve must be a <tt>NumberEval</tt>, <tt>StringEval</tt>, <tt>BoolEval</tt>, or <tt>BlankEval</tt>
-     * @return the converted string value. never <code>null</code>
-     */
-    public static String coerceValueToString(ValueEval ve) {
-        if (ve instanceof StringValueEval) {
-            StringValueEval sve = (StringValueEval) ve;
-            return sve.getStringValue();
-        }
-        if (ve == BlankEval.instance) {
-            return "";
-        }
-        throw new IllegalArgumentException("Unexpected eval class (" + ve.getClass().getName() + ")");
-    }
-
-    /**
-     * @return <code>null</code> to represent blank values
-     * @throws EvaluationException if ve is an ErrorEval, or if a string value cannot be converted
-     */
-    public static Boolean coerceValueToBoolean(ValueEval ve, boolean stringsAreBlanks) throws EvaluationException {
-
-        if (ve == null || ve == BlankEval.instance) {
-            // TODO - remove 've == null' condition once AreaEval is fixed
-            return null;
-        }
-        if (ve instanceof BoolEval) {
-            return Boolean.valueOf(((BoolEval) ve).getBooleanValue());
-        }
-
-        if (ve == BlankEval.instance) {
-            return null;
-        }
-
-        if (ve instanceof StringEval) {
-            if (stringsAreBlanks) {
-                return null;
-            }
-            String str = ((StringEval) ve).getStringValue();
-            if (str.equalsIgnoreCase("true")) {
-                return Boolean.TRUE;
-            }
-            if (str.equalsIgnoreCase("false")) {
-                return Boolean.FALSE;
-            }
-            // else - string cannot be converted to boolean
-            throw new EvaluationException(ErrorEval.VALUE_INVALID);
-        }
-
-        if (ve instanceof NumericValueEval) {
-            NumericValueEval ne = (NumericValueEval) ve;
-            double d = ne.getNumberValue();
-            if (Double.isNaN(d)) {
-                throw new EvaluationException(ErrorEval.VALUE_INVALID);
-            }
-            return Boolean.valueOf(d != 0);
-        }
-        if (ve instanceof ErrorEval) {
-            throw new EvaluationException((ErrorEval) ve);
-        }
-        throw new RuntimeException("Unexpected eval (" + ve.getClass().getName() + ")");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java
deleted file mode 100644
index 263574a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed1ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-
-
-/**
- * Implementation of Excel formula token '%'. <p/>
- * @author Josh Micich
- */
-public final class PercentEval extends Fixed1ArgFunction {
-
-	public static final Function instance = new PercentEval();
-
-	private PercentEval() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-		double d;
-		try {
-			ValueEval ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			d = OperandResolver.coerceValueToDouble(ve);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		if (d == 0.0) { // this '==' matches +0.0 and -0.0
-			return NumberEval.ZERO;
-		}
-		return new NumberEval(d / 100);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java
deleted file mode 100644
index 617d20a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-
-
-/**
- *
- * @author Josh Micich
- */
-public final class RangeEval extends Fixed2ArgFunction {
-
-	public static final Function instance = new RangeEval();
-
-	private RangeEval() {
-		// enforces singleton
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-
-		try {
-			AreaEval reA = evaluateRef(arg0);
-			AreaEval reB = evaluateRef(arg1);
-			return resolveRange(reA, reB);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	/**
-	 * @return simple rectangular {@link AreaEval} which fully encloses both areas
-	 * <tt>aeA</tt> and <tt>aeB</tt>
-	 */
-	private static AreaEval resolveRange(AreaEval aeA, AreaEval aeB) {
-		int aeAfr = aeA.getFirstRow();
-		int aeAfc = aeA.getFirstColumn();
-
-		int top = Math.min(aeAfr, aeB.getFirstRow());
-		int bottom = Math.max(aeA.getLastRow(), aeB.getLastRow());
-		int left = Math.min(aeAfc, aeB.getFirstColumn());
-		int right = Math.max(aeA.getLastColumn(), aeB.getLastColumn());
-
-		return aeA.offset(top-aeAfr, bottom-aeAfr, left-aeAfc, right-aeAfc);
-	}
-
-	private static AreaEval evaluateRef(ValueEval arg) throws EvaluationException {
-		if (arg instanceof AreaEval) {
-			return (AreaEval) arg;
-		}
-		if (arg instanceof RefEval) {
-			return ((RefEval) arg).offset(0, 0, 0, 0);
-		}
-		if (arg instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval)arg);
-		}
-		throw new IllegalArgumentException("Unexpected ref arg class (" + arg.getClass().getName() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java
deleted file mode 100644
index 46aa96c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.SheetRange;
-import org.apache.poi.ss.usermodel.CellType;
-
-/**
- * RefEval is the super interface for Ref2D and Ref3DEval. Basically a RefEval
- * impl should contain reference to the original ReferencePtg or Ref3DPtg as
- * well as the final "value" resulting from the evaluation of the cell
- * reference. Thus if the Cell has type {@link CellType#NUMERIC}, the contained
- * value object should be of type NumberEval; if cell type is {@link CellType#STRING},
- * contained value object should be of type StringEval
- */
-public interface RefEval extends ValueEval, SheetRange {
-    /**
-     * @return the evaluated value of the cell referred to by this RefEval on the given sheet
-     */
-    ValueEval getInnerValueEval(int sheetIndex);
-
-    /**
-     * returns the zero based column index.
-     */
-    int getColumn();
-
-    /**
-     * returns the zero based row index.
-     */
-    int getRow();
-    
-    /**
-     * returns the first sheet index this applies to
-     */
-    int getFirstSheetIndex();
-
-    /**
-     * returns the last sheet index this applies to, which
-     *  will be the same as the first for a 2D and many 3D references
-     */
-    int getLastSheetIndex();
-    
-    /**
-     * returns the number of sheets this applies to
-     */
-    int getNumberOfSheets();
-
-    /**
-     * Creates an {@link AreaEval} offset by a relative amount from this RefEval
-     */
-    AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java b/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
deleted file mode 100644
index bd96c4e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.SheetRange;
-
-/**
- * Common base class for implementors of {@link RefEval}
- */
-public abstract class RefEvalBase implements RefEval {
-    private final int _firstSheetIndex;
-    private final int _lastSheetIndex;
-	private final int _rowIndex;
-	private final int _columnIndex;
-
-    protected RefEvalBase(SheetRange sheetRange, int rowIndex, int columnIndex) {
-        if (sheetRange == null) {
-            throw new IllegalArgumentException("sheetRange must not be null");
-        }
-        _firstSheetIndex = sheetRange.getFirstSheetIndex();
-        _lastSheetIndex = sheetRange.getLastSheetIndex();
-        _rowIndex = rowIndex;
-        _columnIndex = columnIndex;
-    }
-	protected RefEvalBase(int firstSheetIndex, int lastSheetIndex, int rowIndex, int columnIndex) {
-	    _firstSheetIndex = firstSheetIndex;
-	    _lastSheetIndex = lastSheetIndex;
-		_rowIndex = rowIndex;
-		_columnIndex = columnIndex;
-	}
-    protected RefEvalBase(int onlySheetIndex, int rowIndex, int columnIndex) {
-        this(onlySheetIndex, onlySheetIndex, rowIndex, columnIndex);
-    }
-    
-	public int getNumberOfSheets() {
-	    return _lastSheetIndex-_firstSheetIndex+1;
-    }
-    public int getFirstSheetIndex() {
-        return _firstSheetIndex;
-    }
-    public int getLastSheetIndex() {
-        return _lastSheetIndex;
-    }
-    public final int getRow() {
-		return _rowIndex;
-	}
-	public final int getColumn() {
-		return _columnIndex;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
deleted file mode 100644
index 8b3be19..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-import org.apache.poi.ss.util.NumberComparer;
-
-/**
- * Base class for all comparison operator evaluators
- *
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public abstract class RelationalOperationEval extends Fixed2ArgFunction {
-
-	/**
-	 * Converts a standard compare result (-1, 0, 1) to <code>true</code> or <code>false</code>
-	 * according to subclass' comparison type.
-	 */
-	protected abstract boolean convertComparisonResult(int cmpResult);
-
-	/**
-	 * This is a description of how the relational operators apply in MS Excel.
-	 * Use this as a guideline when testing/implementing the evaluate methods
-	 * for the relational operators Evals.
-	 *
-	 * <pre>
-	 * Bool.TRUE > any number.
-	 * Bool > any string. ALWAYS
-	 * Bool.TRUE > Bool.FALSE
-	 * Bool.FALSE == Blank
-	 *
-	 * Strings are never converted to numbers or booleans
-	 * String > any number. ALWAYS
-	 * Non-empty String > Blank
-	 * Empty String == Blank
-	 * String are sorted dictionary wise
-	 *
-	 * Blank > Negative numbers
-	 * Blank == 0
-	 * Blank < Positive numbers
-	 * </pre>
-	 */
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-
-		ValueEval vA;
-		ValueEval vB;
-		try {
-			vA = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			vB = OperandResolver.getSingleValue(arg1, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		int cmpResult = doCompare(vA, vB);
-		boolean result = convertComparisonResult(cmpResult);
-		return BoolEval.valueOf(result);
-	}
-
-	private static int doCompare(ValueEval va, ValueEval vb) {
-		// special cases when one operand is blank
-		if (va == BlankEval.instance) {
-			return compareBlank(vb);
-		}
-		if (vb == BlankEval.instance) {
-			return -compareBlank(va);
-		}
-
-		if (va instanceof BoolEval) {
-			if (vb instanceof BoolEval) {
-				BoolEval bA = (BoolEval) va;
-				BoolEval bB = (BoolEval) vb;
-				if (bA.getBooleanValue() == bB.getBooleanValue()) {
-					return 0;
-				}
-				return bA.getBooleanValue() ? 1 : -1;
-			}
-			return 1;
-		}
-		if (vb instanceof BoolEval) {
-			return -1;
-		}
-		if (va instanceof StringEval) {
-			if (vb instanceof StringEval) {
-				StringEval sA = (StringEval) va;
-				StringEval sB = (StringEval) vb;
-				return sA.getStringValue().compareToIgnoreCase(sB.getStringValue());
-			}
-			return 1;
-		}
-		if (vb instanceof StringEval) {
-			return -1;
-		}
-		if (va instanceof NumberEval) {
-			if (vb instanceof NumberEval) {
-				NumberEval nA = (NumberEval) va;
-				NumberEval nB = (NumberEval) vb;
-				return NumberComparer.compare(nA.getNumberValue(), nB.getNumberValue());
-			}
-		}
-		throw new IllegalArgumentException("Bad operand types (" + va.getClass().getName() + "), ("
-				+ vb.getClass().getName() + ")");
-	}
-
-	private static int compareBlank(ValueEval v) {
-		if (v == BlankEval.instance) {
-			return 0;
-		}
-		if (v instanceof BoolEval) {
-			BoolEval boolEval = (BoolEval) v;
-			return boolEval.getBooleanValue() ? -1 : 0;
-		}
-		if (v instanceof NumberEval) {
-			NumberEval ne = (NumberEval) v;
-			return NumberComparer.compare(0.0, ne.getNumberValue());
-		}
-		if (v instanceof StringEval) {
-			StringEval se = (StringEval) v;
-			return se.getStringValue().length() < 1 ? 0 : -1;
-		}
-		throw new IllegalArgumentException("bad value class (" + v.getClass().getName() + ")");
-	}
-
-	public static final Function EqualEval = new RelationalOperationEval() {
-		protected boolean convertComparisonResult(int cmpResult) {
-			return cmpResult == 0;
-		}
-	};
-	public static final Function GreaterEqualEval = new RelationalOperationEval() {
-		protected boolean convertComparisonResult(int cmpResult) {
-			return cmpResult >= 0;
-		}
-	};
-	public static final Function GreaterThanEval = new RelationalOperationEval() {
-		protected boolean convertComparisonResult(int cmpResult) {
-			return cmpResult > 0;
-		}
-	};
-	public static final Function LessEqualEval = new RelationalOperationEval() {
-		protected boolean convertComparisonResult(int cmpResult) {
-			return cmpResult <= 0;
-		}
-	};
-	public static final Function LessThanEval = new RelationalOperationEval() {
-		protected boolean convertComparisonResult(int cmpResult) {
-			return cmpResult < 0;
-		}
-	};
-	public static final Function NotEqualEval = new RelationalOperationEval() {
-		protected boolean convertComparisonResult(int cmpResult) {
-			return cmpResult != 0;
-		}
-	};
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java
deleted file mode 100644
index 5d39761..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class StringEval implements StringValueEval {
-
-	public static final StringEval EMPTY_INSTANCE = new StringEval("");
-
-	private final String _value;
-
-	public StringEval(Ptg ptg) {
-		this(((StringPtg) ptg).getValue());
-	}
-
-	public StringEval(String value) {
-		if (value == null) {
-			throw new IllegalArgumentException("value must not be null");
-		}
-		_value = value;
-	}
-
-	public String getStringValue() {
-		return _value;
-	}
-
-	public String toString() {
-		StringBuilder sb = new StringBuilder(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(_value);
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java
deleted file mode 100644
index 4e1b712..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.poi.ss.formula.eval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *  
- */
-public interface StringValueEval extends ValueEval {
-
-    /**
-     * @return never <code>null</code>, possibly empty string.
-     */
-    String getStringValue();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java b/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
deleted file mode 100644
index a4c05d9..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-
-/**
- * @author Josh Micich
- */
-public abstract class TwoOperandNumericOperation extends Fixed2ArgFunction {
-
-	protected final double singleOperandEvaluate(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
-		return OperandResolver.coerceValueToDouble(ve);
-	}
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-		double result;
-		try {
-			double d0 = singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-			double d1 = singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-			result = evaluate(d0, d1);
-			if (result == 0.0) { // this '==' matches +0.0 and -0.0
-				// Excel converts -0.0 to +0.0 for '*', '/', '%', '+' and '^'
-				if (!(this instanceof SubtractEvalClass)) {
-					return NumberEval.ZERO;
-				}
-			}
-			if (Double.isNaN(result) || Double.isInfinite(result)) {
-				return ErrorEval.NUM_ERROR;
-			}
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new NumberEval(result);
-	}
-
-	protected abstract double evaluate(double d0, double d1) throws EvaluationException;
-
-	public static final Function AddEval = new TwoOperandNumericOperation() {
-		protected double evaluate(double d0, double d1) {
-			return d0+d1;
-		}
-	};
-	public static final Function DivideEval = new TwoOperandNumericOperation() {
-		protected double evaluate(double d0, double d1) throws EvaluationException {
-			if (d1 == 0.0) {
-				throw new EvaluationException(ErrorEval.DIV_ZERO);
-			}
-			return d0/d1;
-		}
-	};
-	public static final Function MultiplyEval = new TwoOperandNumericOperation() {
-		protected double evaluate(double d0, double d1) {
-			return d0*d1;
-		}
-	};
-	public static final Function PowerEval = new TwoOperandNumericOperation() {
-		protected double evaluate(double d0, double d1) {
-			return Math.pow(d0, d1);
-		}
-	};
-	private static final class SubtractEvalClass extends TwoOperandNumericOperation {
-		public SubtractEvalClass() {
-			//
-		}
-		protected double evaluate(double d0, double d1) {
-			return d0-d1;
-		}
-	}
-	public static final Function SubtractEval = new SubtractEvalClass();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
deleted file mode 100644
index 02d6d5e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed1ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class UnaryMinusEval extends Fixed1ArgFunction {
-
-	public static final Function instance = new UnaryMinusEval();
-
-	private UnaryMinusEval() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-		double d;
-		try {
-			ValueEval ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			d = OperandResolver.coerceValueToDouble(ve);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		if (d == 0.0) { // this '==' matches +0.0 and -0.0
-			return NumberEval.ZERO;
-		}
-		return new NumberEval(-d);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
deleted file mode 100644
index 9b10f2b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Fixed1ArgFunction;
-import org.apache.poi.ss.formula.functions.Function;
-
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class UnaryPlusEval extends Fixed1ArgFunction {
-
-	public static final Function instance = new UnaryPlusEval();
-
-	private UnaryPlusEval() {
-		// enforce singleton
-	}
-
-	public ValueEval evaluate(int srcCellRow, int srcCellCol, ValueEval arg0) {
-		double d;
-		try {
-			ValueEval ve = OperandResolver.getSingleValue(arg0, srcCellRow, srcCellCol);
-			if(ve instanceof StringEval) {
-				// Note - asymmetric with UnaryMinus
-				// -"hello" evaluates to #VALUE!
-				// but +"hello" evaluates to "hello"
-				return ve;
-			}
-			d = OperandResolver.coerceValueToDouble(ve);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new NumberEval(+d);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java b/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java
deleted file mode 100644
index c1309a7..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public interface ValueEval {
-	// no methods
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java b/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
deleted file mode 100644
index db01b06..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval.forked;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.util.Internal;
-
-/**
- * Represents a cell being used for forked evaluation that has had a value set different from the
- * corresponding cell in the shared master workbook.
- *
- * @author Josh Micich
- */
-final class ForkedEvaluationCell implements EvaluationCell {
-
-	private final EvaluationSheet _sheet;
-	/** corresponding cell from master workbook */
-	private final EvaluationCell _masterCell;
-	private boolean _booleanValue;
-	private CellType _cellType;
-	private int _errorValue;
-	private double _numberValue;
-	private String _stringValue;
-
-	public ForkedEvaluationCell(ForkedEvaluationSheet sheet, EvaluationCell masterCell) {
-		_sheet = sheet;
-		_masterCell = masterCell;
-		// start with value blank, but expect construction to be immediately
-		setValue(BlankEval.instance); // followed by a proper call to setValue()
-	}
-
-	@Override
-	public Object getIdentityKey() {
-		return _masterCell.getIdentityKey();
-	}
-
-	public void setValue(ValueEval value) {
-		Class<? extends ValueEval> cls = value.getClass();
-
-		if (cls == NumberEval.class) {
-			_cellType = CellType.NUMERIC;
-			_numberValue = ((NumberEval)value).getNumberValue();
-			return;
-		}
-		if (cls == StringEval.class) {
-			_cellType = CellType.STRING;
-			_stringValue = ((StringEval)value).getStringValue();
-			return;
-		}
-		if (cls == BoolEval.class) {
-			_cellType = CellType.BOOLEAN;
-			_booleanValue = ((BoolEval)value).getBooleanValue();
-			return;
-		}
-		if (cls == ErrorEval.class) {
-			_cellType = CellType.ERROR;
-			_errorValue = ((ErrorEval)value).getErrorCode();
-			return;
-		}
-		if (cls == BlankEval.class) {
-			_cellType = CellType.BLANK;
-			return;
-		}
-		throw new IllegalArgumentException("Unexpected value class (" + cls.getName() + ")");
-	}
-	public void copyValue(Cell destCell) {
-		switch (_cellType) {
-			case BLANK:   destCell.setCellType(CellType.BLANK);          return;
-			case NUMERIC: destCell.setCellValue(_numberValue);           return;
-			case BOOLEAN: destCell.setCellValue(_booleanValue);          return;
-			case STRING:  destCell.setCellValue(_stringValue);           return;
-			case ERROR:   destCell.setCellErrorValue((byte)_errorValue); return;
-			default: throw new IllegalStateException("Unexpected data type (" + _cellType + ")");
-		}
-	}
-
-	private void checkCellType(CellType expectedCellType) {
-		if (_cellType != expectedCellType) {
-			throw new RuntimeException("Wrong data type (" + _cellType + ")");
-		}
-	}
-	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	@Override
-	public int getCellType() {
-		return _cellType.getCode();
-	}
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	@Override
-	public CellType getCellTypeEnum() {
-		return _cellType;
-	}
-	@Override
-	public boolean getBooleanCellValue() {
-		checkCellType(CellType.BOOLEAN);
-		return _booleanValue;
-	}
-	@Override
-	public int getErrorCellValue() {
-		checkCellType(CellType.ERROR);
-		return _errorValue;
-	}
-	@Override
-	public double getNumericCellValue() {
-		checkCellType(CellType.NUMERIC);
-		return _numberValue;
-	}
-	@Override
-	public String getStringCellValue() {
-		checkCellType(CellType.STRING);
-		return _stringValue;
-	}
-	@Override
-	public EvaluationSheet getSheet() {
-		return _sheet;
-	}
-	@Override
-	public int getRowIndex() {
-		return _masterCell.getRowIndex();
-	}
-	@Override
-	public int getColumnIndex() {
-		return _masterCell.getColumnIndex();
-	}
-	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	@Override
-	public int getCachedFormulaResultType() {
-		return _masterCell.getCachedFormulaResultType();
-	}
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	@Override
-	public CellType getCachedFormulaResultTypeEnum() {
-		return _masterCell.getCachedFormulaResultTypeEnum();
-	}
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java b/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
deleted file mode 100644
index 072a777..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval.forked;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.formula.EvaluationWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Internal;
-
-/**
- * Represents a sheet being used for forked evaluation.  Initially, objects of this class contain
- * only the cells from the master workbook. By calling {@link #getOrCreateUpdatableCell(int, int)},
- * the master cell object is logically replaced with a {@link ForkedEvaluationCell} instance, which
- * will be used in all subsequent evaluations.<br/>
- *
- * For POI internal use only
- *
- * @author Josh Micich
- */
-@Internal
-final class ForkedEvaluationSheet implements EvaluationSheet {
-
-    private final EvaluationSheet _masterSheet;
-    /**
-     * Only cells which have been split are put in this map.  (This has been done to conserve memory).
-     */
-    private final Map<RowColKey, ForkedEvaluationCell> _sharedCellsByRowCol;
-
-    public ForkedEvaluationSheet(EvaluationSheet masterSheet) {
-        _masterSheet = masterSheet;
-        _sharedCellsByRowCol = new HashMap<RowColKey, ForkedEvaluationCell>();
-    }
-
-    @Override
-    public EvaluationCell getCell(int rowIndex, int columnIndex) {
-        RowColKey key = new RowColKey(rowIndex, columnIndex);
-
-        ForkedEvaluationCell result = _sharedCellsByRowCol.get(key);
-        if (result == null) {
-            return _masterSheet.getCell(rowIndex, columnIndex);
-        }
-        return result;
-    }
-
-    public ForkedEvaluationCell getOrCreateUpdatableCell(int rowIndex, int columnIndex) {
-        RowColKey key = new RowColKey(rowIndex, columnIndex);
-
-        ForkedEvaluationCell result = _sharedCellsByRowCol.get(key);
-        if (result == null) {
-            EvaluationCell mcell = _masterSheet.getCell(rowIndex, columnIndex);
-            if (mcell == null) {
-                CellReference cr = new CellReference(rowIndex, columnIndex);
-                throw new UnsupportedOperationException("Underlying cell '"
-                        + cr.formatAsString() + "' is missing in master sheet.");
-            }
-            result = new ForkedEvaluationCell(this, mcell);
-            _sharedCellsByRowCol.put(key, result);
-        }
-        return result;
-    }
-
-    public void copyUpdatedCells(Sheet sheet) {
-        RowColKey[] keys = new RowColKey[_sharedCellsByRowCol.size()];
-        _sharedCellsByRowCol.keySet().toArray(keys);
-        Arrays.sort(keys);
-        for (int i = 0; i < keys.length; i++) {
-            RowColKey key = keys[i];
-            Row row = sheet.getRow(key.getRowIndex());
-            if (row == null) {
-                row = sheet.createRow(key.getRowIndex());
-            }
-            Cell destCell = row.getCell(key.getColumnIndex());
-            if (destCell == null) {
-                destCell = row.createCell(key.getColumnIndex());
-            }
-
-            ForkedEvaluationCell srcCell = _sharedCellsByRowCol.get(key);
-            srcCell.copyValue(destCell);
-        }
-    }
-
-    public int getSheetIndex(EvaluationWorkbook mewb) {
-        return mewb.getSheetIndex(_masterSheet);
-    }
-
-    /* (non-Javadoc)
-     * leave the map alone, if it needs resetting, reusing this class is probably a bad idea.
-     * @see org.apache.poi.ss.formula.EvaluationSheet#clearAllCachedResultValues()
-     * 
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        _masterSheet.clearAllCachedResultValues();
-    }
-    
-    // FIXME: serves same purpose as org.apache.poi.xssf.usermodel.XSSFEvaluationSheet$CellKey
-    private static final class RowColKey implements Comparable<RowColKey>{
-        private final int _rowIndex;
-        private final int _columnIndex;
-
-        public RowColKey(int rowIndex, int columnIndex) {
-            _rowIndex = rowIndex;
-            _columnIndex = columnIndex;
-        }
-        @Override
-        public boolean equals(Object obj) {
-            assert obj instanceof RowColKey : "these private cache key instances are only compared to themselves";
-            RowColKey other = (RowColKey) obj;
-            return _rowIndex == other._rowIndex && _columnIndex == other._columnIndex;
-        }
-        @Override
-        public int hashCode() {
-            return _rowIndex ^ _columnIndex;
-        }
-        public int compareTo(RowColKey o) {
-            int cmp = _rowIndex - o._rowIndex;
-            if (cmp != 0) {
-                return cmp;
-            }
-            return _columnIndex - o._columnIndex;
-        }
-        public int getRowIndex() {
-            return _rowIndex;
-        }
-        public int getColumnIndex() {
-            return _columnIndex;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java b/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
deleted file mode 100644
index adc3e4f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval.forked;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationName;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.formula.EvaluationWorkbook;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.Internal;
-
-/**
- * Represents a workbook being used for forked evaluation. Most operations are delegated to the
- * shared master workbook, except those that potentially involve cell values that may have been
- * updated after a call to {@link #getOrCreateUpdatableCell(String, int, int)}.<br/>
- * 
- * For POI internal use only
- */
-@Internal
-final class ForkedEvaluationWorkbook implements EvaluationWorkbook {
-
-    private final EvaluationWorkbook _masterBook;
-    private final Map<String, ForkedEvaluationSheet> _sharedSheetsByName;
-
-    public ForkedEvaluationWorkbook(EvaluationWorkbook master) {
-        _masterBook = master;
-        _sharedSheetsByName = new HashMap<String, ForkedEvaluationSheet>();
-    }
-
-    public ForkedEvaluationCell getOrCreateUpdatableCell(String sheetName, int rowIndex,
-            int columnIndex) {
-        ForkedEvaluationSheet sheet = getSharedSheet(sheetName);
-        return sheet.getOrCreateUpdatableCell(rowIndex, columnIndex);
-    }
-
-    public EvaluationCell getEvaluationCell(String sheetName, int rowIndex, int columnIndex) {
-        ForkedEvaluationSheet sheet = getSharedSheet(sheetName);
-        return sheet.getCell(rowIndex, columnIndex);
-    }
-
-    private ForkedEvaluationSheet getSharedSheet(String sheetName) {
-        ForkedEvaluationSheet result = _sharedSheetsByName.get(sheetName);
-        if (result == null) {
-            result = new ForkedEvaluationSheet(_masterBook.getSheet(_masterBook
-                    .getSheetIndex(sheetName)));
-            _sharedSheetsByName.put(sheetName, result);
-        }
-        return result;
-    }
-
-    public void copyUpdatedCells(Workbook workbook) {
-        String[] sheetNames = new String[_sharedSheetsByName.size()];
-        _sharedSheetsByName.keySet().toArray(sheetNames);
-        for (String sheetName : sheetNames) {
-            ForkedEvaluationSheet sheet = _sharedSheetsByName.get(sheetName);
-            sheet.copyUpdatedCells(workbook.getSheet(sheetName));
-        }
-    }
-
-    @Override
-    public int convertFromExternSheetIndex(int externSheetIndex) {
-        return _masterBook.convertFromExternSheetIndex(externSheetIndex);
-    }
-
-    @Override
-    public ExternalSheet getExternalSheet(int externSheetIndex) {
-        return _masterBook.getExternalSheet(externSheetIndex);
-    }
-    @Override
-    public ExternalSheet getExternalSheet(String firstSheetName, String lastSheetName, int externalWorkbookNumber) {
-        return _masterBook.getExternalSheet(firstSheetName, lastSheetName, externalWorkbookNumber);
-    }
-
-    @Override
-    public Ptg[] getFormulaTokens(EvaluationCell cell) {
-        if (cell instanceof ForkedEvaluationCell) {
-            // doesn't happen yet because formulas cannot be modified from the master workbook
-            throw new RuntimeException("Updated formulas not supported yet");
-        }
-        return _masterBook.getFormulaTokens(cell);
-    }
-
-    @Override
-    public EvaluationName getName(NamePtg namePtg) {
-        return _masterBook.getName(namePtg);
-    }
-
-    @Override
-    public EvaluationName getName(String name, int sheetIndex){
-        return _masterBook.getName(name, sheetIndex);
-    }
-
-    @Override
-    public EvaluationSheet getSheet(int sheetIndex) {
-        return getSharedSheet(getSheetName(sheetIndex));
-    }
-    
-    @Override
-    public ExternalName getExternalName(int externSheetIndex, int externNameIndex) {
-       return _masterBook.getExternalName(externSheetIndex, externNameIndex);
-    }
-    @Override
-    public ExternalName getExternalName(String nameName, String sheetName, int externalWorkbookNumber) {
-           return _masterBook.getExternalName(nameName, sheetName, externalWorkbookNumber);
-    }
-
-    @Override
-    public int getSheetIndex(EvaluationSheet sheet) {
-        if (sheet instanceof ForkedEvaluationSheet) {
-            ForkedEvaluationSheet mes = (ForkedEvaluationSheet) sheet;
-            return mes.getSheetIndex(_masterBook);
-        }
-        return _masterBook.getSheetIndex(sheet);
-    }
-
-    @Override
-    public int getSheetIndex(String sheetName) {
-        return _masterBook.getSheetIndex(sheetName);
-    }
-
-    @Override
-    public String getSheetName(int sheetIndex) {
-        return _masterBook.getSheetName(sheetIndex);
-    }
-
-    @Override
-    public String resolveNameXText(NameXPtg ptg) {
-        return _masterBook.resolveNameXText(ptg);
-    }
-
-    @Override
-    public UDFFinder getUDFFinder() {
-        return _masterBook.getUDFFinder();
-    }
-    
-    /* (non-Javadoc)
-     * leave the map alone, if it needs resetting, reusing this class is probably a bad idea.
-     * @see org.apache.poi.ss.formula.EvaluationSheet#clearAllCachedResultValues()
-     * 
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        _masterBook.clearAllCachedResultValues();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java b/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
deleted file mode 100644
index c8beb37..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval.forked;
-
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-
-import java.lang.reflect.Method;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.CollaboratingWorkbooksEnvironment;
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * An alternative workbook evaluator that saves memory in situations where a single workbook is
- * concurrently and independently evaluated many times.  With standard formula evaluation, around
- * 90% of memory consumption is due to loading of the {@link HSSFWorkbook} or {@link org.apache.poi.xssf.usermodel.XSSFWorkbook}.
- * This class enables a 'master workbook' to be loaded just once and shared between many evaluation
- * clients.  Each evaluation client creates its own {@link ForkedEvaluator} and can set cell values
- * that will be used for local evaluations (and don't disturb evaluations on other evaluators).
- */
-public final class ForkedEvaluator {
-
-	private WorkbookEvaluator _evaluator;
-	private ForkedEvaluationWorkbook _sewb;
-
-	private ForkedEvaluator(EvaluationWorkbook masterWorkbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-		_sewb = new ForkedEvaluationWorkbook(masterWorkbook);
-		_evaluator = new WorkbookEvaluator(_sewb, stabilityClassifier, udfFinder);
-	}
-	private static EvaluationWorkbook createEvaluationWorkbook(Workbook wb) {
-		if (wb instanceof HSSFWorkbook) {
-			return HSSFEvaluationWorkbook.create((HSSFWorkbook) wb);
-		} else {
-		    try {
-		        // TODO: check if this is Java 9 compatible ...
-		        Class<?> evalWB = Class.forName("org.apache.poi.xssf.usermodel.XSSFEvaluationWorkbook");
-		        Class<?> xssfWB = Class.forName("org.apache.poi.xssf.usermodel.XSSFWorkbook");
-		        Method createM = evalWB.getDeclaredMethod("create", xssfWB);
-		        return (EvaluationWorkbook)createM.invoke(null, wb);
-		    } catch (Exception e) {
-		        throw new IllegalArgumentException("Unexpected workbook type (" + wb.getClass().getName() + ") - check for poi-ooxml and poi-ooxml schemas jar in the classpath", e);
-		    }
-		}
-	}
-
-	/**
-	 * @param udfFinder pass <code>null</code> for default (AnalysisToolPak only)
-	 */
-	public static ForkedEvaluator create(Workbook wb, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-		return new ForkedEvaluator(createEvaluationWorkbook(wb), stabilityClassifier, udfFinder);
-	}
-
-	/**
-	 * Sets the specified cell to the supplied <tt>value</tt>
-	 * @param sheetName the name of the sheet containing the cell
-	 * @param rowIndex zero based
-	 * @param columnIndex zero based
-	 */
-	public void updateCell(String sheetName, int rowIndex, int columnIndex, ValueEval value) {
-
-		ForkedEvaluationCell cell = _sewb.getOrCreateUpdatableCell(sheetName, rowIndex, columnIndex);
-		cell.setValue(value);
-		_evaluator.notifyUpdateCell(cell);
-	}
-	/**
-	 * Copies the values of all updated cells (modified by calls to {@link
-	 * #updateCell(String, int, int, ValueEval)}) to the supplied <tt>workbook</tt>.<br/>
-	 * Typically, the supplied <tt>workbook</tt> is a writable copy of the 'master workbook',
-	 * but at the very least it must contain sheets with the same names.
-	 */
-	public void copyUpdatedCells(Workbook workbook) {
-		_sewb.copyUpdatedCells(workbook);
-	}
-
-	/**
-	 * If cell contains a formula, the formula is evaluated and returned,
-	 * else the CellValue simply copies the appropriate cell value from
-	 * the cell and also its cell type. This method should be preferred over
-	 * evaluateInCell() when the call should not modify the contents of the
-	 * original cell.
-	 *
-     * @param sheetName the name of the sheet containing the cell
-     * @param rowIndex zero based
-     * @param columnIndex zero based
-	 * @return <code>null</code> if the supplied cell is <code>null</code> or blank
-	 */
-	public ValueEval evaluate(String sheetName, int rowIndex, int columnIndex) {
-		EvaluationCell cell = _sewb.getEvaluationCell(sheetName, rowIndex, columnIndex);
-
-		switch (cell.getCellTypeEnum()) {
-			case BOOLEAN:
-				return BoolEval.valueOf(cell.getBooleanCellValue());
-			case ERROR:
-				return ErrorEval.valueOf(cell.getErrorCellValue());
-			case FORMULA:
-				return _evaluator.evaluate(cell);
-			case NUMERIC:
-				return new NumberEval(cell.getNumericCellValue());
-			case STRING:
-				return new StringEval(cell.getStringCellValue());
-			case BLANK:
-				return null;
-			default:
-				throw new IllegalStateException("Bad cell type (" + cell.getCellTypeEnum() + ")");
-		}
-	}
-	/**
-	 * Coordinates several formula evaluators together so that formulas that involve external
-	 * references can be evaluated.
-	 * @param workbookNames the simple file names used to identify the workbooks in formulas
-	 * with external links (for example "MyData.xls" as used in a formula "[MyData.xls]Sheet1!A1")
-	 * @param evaluators all evaluators for the full set of workbooks required by the formulas.
-	 */
-	public static void setupEnvironment(String[] workbookNames, ForkedEvaluator[] evaluators) {
-		WorkbookEvaluator[] wbEvals = new WorkbookEvaluator[evaluators.length];
-		for (int i = 0; i < wbEvals.length; i++) {
-			wbEvals[i] = evaluators[i]._evaluator;
-		}
-		CollaboratingWorkbooksEnvironment.setup(workbookNames, wbEvals);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java b/trunk/src/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
deleted file mode 100644
index b44a03e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Temporarily collects <tt>FunctionMetadata</tt> instances for creation of a
- * <tt>FunctionMetadataRegistry</tt>.
- *
- * @author Josh Micich
- */
-final class FunctionDataBuilder {
-	private int _maxFunctionIndex;
-	private final Map<String,FunctionMetadata> _functionDataByName;
-	private final Map<Integer,FunctionMetadata> _functionDataByIndex;
-	/** stores indexes of all functions with footnotes (i.e. whose definitions might change) */
-	private final Set<Integer> _mutatingFunctionIndexes;
-
-	public FunctionDataBuilder(int sizeEstimate) {
-		_maxFunctionIndex = -1;
-		_functionDataByName = new HashMap<String,FunctionMetadata>(sizeEstimate * 3 / 2);
-		_functionDataByIndex = new HashMap<Integer,FunctionMetadata>(sizeEstimate * 3 / 2);
-		_mutatingFunctionIndexes = new HashSet<Integer>();
-	}
-
-	public void add(int functionIndex, String functionName, int minParams, int maxParams,
-			byte returnClassCode, byte[] parameterClassCodes, boolean hasFootnote) {
-		FunctionMetadata fm = new FunctionMetadata(functionIndex, functionName, minParams, maxParams,
-				returnClassCode, parameterClassCodes);
-
-		Integer indexKey = Integer.valueOf(functionIndex);
-
-
-		if(functionIndex > _maxFunctionIndex) {
-			_maxFunctionIndex = functionIndex;
-		}
-		// allow function definitions to change only if both previous and the new items have footnotes
-		FunctionMetadata prevFM;
-		prevFM = _functionDataByName.get(functionName);
-		if(prevFM != null) {
-			if(!hasFootnote || !_mutatingFunctionIndexes.contains(indexKey)) {
-				throw new RuntimeException("Multiple entries for function name '" + functionName + "'");
-			}
-			_functionDataByIndex.remove(Integer.valueOf(prevFM.getIndex()));
-		}
-		prevFM = _functionDataByIndex.get(indexKey);
-		if(prevFM != null) {
-			if(!hasFootnote || !_mutatingFunctionIndexes.contains(indexKey)) {
-				throw new RuntimeException("Multiple entries for function index (" + functionIndex + ")");
-			}
-			_functionDataByName.remove(prevFM.getName());
-		}
-		if(hasFootnote) {
-			_mutatingFunctionIndexes.add(indexKey);
-		}
-		_functionDataByIndex.put(indexKey, fm);
-		_functionDataByName.put(functionName, fm);
-	}
-
-	public FunctionMetadataRegistry build() {
-
-		FunctionMetadata[] jumbledArray =  new FunctionMetadata[_functionDataByName.size()];
-		_functionDataByName.values().toArray(jumbledArray);
-		FunctionMetadata[] fdIndexArray = new FunctionMetadata[_maxFunctionIndex+1];
-		for (int i = 0; i < jumbledArray.length; i++) {
-			FunctionMetadata fd = jumbledArray[i];
-			fdIndexArray[fd.getIndex()] = fd;
-		}
-
-		return new FunctionMetadataRegistry(fdIndexArray, _functionDataByName);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java b/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
deleted file mode 100644
index 6ab06f0..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-/**
- * Holds information about Excel built-in functions.
- *
- * @author Josh Micich
- */
-public final class FunctionMetadata {
-	/**
-	 * maxParams=30 in functionMetadata.txt means the maximum number arguments supported
-	 * by the given version of Excel. Validation routines should take the actual limit (Excel 97 or 2007)
-	 * from the SpreadsheetVersion enum.
-	 * Perhaps a value like 'M' should be used instead of '30' in functionMetadata.txt
-	 * to make that file more version neutral.
-	 * @see org.apache.poi.ss.formula.FormulaParser#validateNumArgs(int, FunctionMetadata)
-	 */
-	private static final short FUNCTION_MAX_PARAMS = 30;
-
-	private final int _index;
-	private final String _name;
-	private final int _minParams;
-	private final int _maxParams;
-	private final byte _returnClassCode;
-	private final byte[] _parameterClassCodes;
-
-	/* package */ FunctionMetadata(int index, String name, int minParams, int maxParams,
-			byte returnClassCode, byte[] parameterClassCodes) {
-		_index = index;
-		_name = name;
-		_minParams = minParams;
-		_maxParams = maxParams;
-		_returnClassCode = returnClassCode;
-		_parameterClassCodes = (parameterClassCodes == null) ? null : parameterClassCodes.clone();
-	}
-	public int getIndex() {
-		return _index;
-	}
-	public String getName() {
-		return _name;
-	}
-	public int getMinParams() {
-		return _minParams;
-	}
-	public int getMaxParams() {
-		return _maxParams;
-	}
-	public boolean hasFixedArgsLength() {
-		return _minParams == _maxParams;
-	}
-	public byte getReturnClassCode() {
-		return _returnClassCode;
-	}
-	public byte[] getParameterClassCodes() {
-		return _parameterClassCodes.clone();
-	}
-	/**
-	 * Some varags functions (like VLOOKUP) have a specific limit to the number of arguments that 
-	 * can be passed.  Other functions (like SUM) don't have such a limit.  For those functions,
-	 * the spreadsheet version determines the maximum number of arguments that can be passed.
-	 * @return <code>true</code> if this function can the maximum number of arguments allowable by
-	 * the {@link org.apache.poi.ss.SpreadsheetVersion}
-	 */
-	public boolean hasUnlimitedVarags() {
-		return FUNCTION_MAX_PARAMS == _maxParams;
-	}
-	public String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(_index).append(" ").append(_name);
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java b/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
deleted file mode 100644
index 02a9267..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.formula.ptg.Ptg;
-
-/**
- * Converts the text meta-data file into a <tt>FunctionMetadataRegistry</tt>
- *
- * @author Josh Micich
- */
-final class FunctionMetadataReader {
-
-	private static final String METADATA_FILE_NAME = "functionMetadata.txt";
-
-	/** plain ASCII text metadata file uses three dots for ellipsis */
-	private static final String ELLIPSIS = "...";
-
-	private static final Pattern TAB_DELIM_PATTERN = Pattern.compile("\t");
-	private static final Pattern SPACE_DELIM_PATTERN = Pattern.compile(" ");
-	private static final byte[] EMPTY_BYTE_ARRAY = { };
-
-	private static final String[] DIGIT_ENDING_FUNCTION_NAMES = {
-		// Digits at the end of a function might be due to a left-over footnote marker.
-		// except in these cases
-		"LOG10", "ATAN2", "DAYS360", "SUMXMY2", "SUMX2MY2", "SUMX2PY2",
-	};
-	private static final Set<String> DIGIT_ENDING_FUNCTION_NAMES_SET = new HashSet<String>(Arrays.asList(DIGIT_ENDING_FUNCTION_NAMES));
-
-	public static FunctionMetadataRegistry createRegistry() {
-	    try {
-    		InputStream is = FunctionMetadataReader.class.getResourceAsStream(METADATA_FILE_NAME);
-    		if (is == null) {
-    			throw new RuntimeException("resource '" + METADATA_FILE_NAME + "' not found");
-    		}
-    
-    		try {
-        		BufferedReader br;
-        		try {
-        			br = new BufferedReader(new InputStreamReader(is,"UTF-8"));
-        		} catch(UnsupportedEncodingException e) {
-        			throw new RuntimeException(e);
-        		}
-        		
-        		try {
-        		    FunctionDataBuilder fdb = new FunctionDataBuilder(400);
-        
-        			while (true) {
-        				String line = br.readLine();
-        				if (line == null) {
-        					break;
-        				}
-        				if (line.length() < 1 || line.charAt(0) == '#') {
-        					continue;
-        				}
-        				String trimLine = line.trim();
-        				if (trimLine.length() < 1) {
-        					continue;
-        				}
-        				processLine(fdb, line);
-        			}
-
-        			return fdb.build();
-        		} finally {
-        		    br.close();
-        		}
-    		} finally {
-    		    is.close();
-    		}
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-	    } 
-	}
-
-	private static void processLine(FunctionDataBuilder fdb, String line) {
-
-		String[] parts = TAB_DELIM_PATTERN.split(line, -2);
-		if(parts.length != 8) {
-			throw new RuntimeException("Bad line format '" + line + "' - expected 8 data fields");
-		}
-		int functionIndex = parseInt(parts[0]);
-		String functionName = parts[1];
-		int minParams = parseInt(parts[2]);
-		int maxParams = parseInt(parts[3]);
-		byte returnClassCode = parseReturnTypeCode(parts[4]);
-		byte[] parameterClassCodes = parseOperandTypeCodes(parts[5]);
-		// 6 isVolatile
-		boolean hasNote = parts[7].length() > 0;
-
-		validateFunctionName(functionName);
-		// TODO - make POI use isVolatile
-		fdb.add(functionIndex, functionName, minParams, maxParams,
-				returnClassCode, parameterClassCodes, hasNote);
-	}
-
-
-	private static byte parseReturnTypeCode(String code) {
-		if(code.length() == 0) {
-			return Ptg.CLASS_REF; // happens for GETPIVOTDATA
-		}
-		return parseOperandTypeCode(code);
-	}
-
-	private static byte[] parseOperandTypeCodes(String codes) {
-		if(codes.length() < 1) {
-			return EMPTY_BYTE_ARRAY; // happens for GETPIVOTDATA
-		}
-		if(isDash(codes)) {
-			// '-' means empty:
-			return EMPTY_BYTE_ARRAY;
-		}
-		String[] array = SPACE_DELIM_PATTERN.split(codes);
-		int nItems = array.length;
-		if(ELLIPSIS.equals(array[nItems-1])) {
-			// final ellipsis is optional, and ignored
-			// (all unspecified params are assumed to be the same as the last)
-			nItems --;
-		}
-		byte[] result = new byte[nItems];
-		for (int i = 0; i < nItems; i++) {
-			result[i] = parseOperandTypeCode(array[i]);
-		}
-		return result;
-	}
-
-	private static boolean isDash(String codes) {
-		if(codes.length() == 1) {
-			switch (codes.charAt(0)) {
-				case '-':
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private static byte parseOperandTypeCode(String code) {
-		if(code.length() != 1) {
-			throw new RuntimeException("Bad operand type code format '" + code  + "' expected single char");
-		}
-		switch(code.charAt(0)) {
-			case 'V': return Ptg.CLASS_VALUE;
-			case 'R': return Ptg.CLASS_REF;
-			case 'A': return Ptg.CLASS_ARRAY;
-		}
-		throw new IllegalArgumentException("Unexpected operand type code '" + code + "' (" + (int)code.charAt(0) + ")");
-	}
-
-	/**
-	 * Makes sure that footnote digits from the original OOO document have not been accidentally
-	 * left behind
-	 */
-	private static void validateFunctionName(String functionName) {
-		int len = functionName.length();
-		int ix = len - 1;
-		if (!Character.isDigit(functionName.charAt(ix))) {
-			return;
-		}
-		while(ix >= 0) {
-			if (!Character.isDigit(functionName.charAt(ix))) {
-				break;
-			}
-			ix--;
-		}
-		if(DIGIT_ENDING_FUNCTION_NAMES_SET.contains(functionName)) {
-			return;
-		}
-		throw new RuntimeException("Invalid function name '" + functionName
-				+ "' (is footnote number incorrectly appended)");
-	}
-
-	private static int parseInt(String valStr) {
-		try {
-			return Integer.parseInt(valStr);
-		} catch (NumberFormatException e) {
-			throw new RuntimeException("Value '" + valStr + "' could not be parsed as an integer");
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java b/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
deleted file mode 100644
index 34317fe..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import java.util.Map;
-import java.util.Set;
-/**
- * Allows clients to get {@link FunctionMetadata} instances for any built-in function of Excel.
- *
- * @author Josh Micich
- */
-public final class FunctionMetadataRegistry {
-	/**
-	 * The name of the IF function (i.e. "IF").  Extracted as a constant for clarity.
-	 */
-	public static final String FUNCTION_NAME_IF = "IF";
-
-	public static final int FUNCTION_INDEX_IF = 1;
-	public static final short FUNCTION_INDEX_SUM = 4;
-	public static final int FUNCTION_INDEX_CHOOSE = 100;
-	public static final short FUNCTION_INDEX_INDIRECT = 148;
-	public static final short FUNCTION_INDEX_EXTERNAL = 255;
-
-	private static FunctionMetadataRegistry _instance;
-
-	private final FunctionMetadata[] _functionDataByIndex;
-	private final Map<String, FunctionMetadata> _functionDataByName;
-
-	private static FunctionMetadataRegistry getInstance() {
-		if (_instance == null) {
-			_instance = FunctionMetadataReader.createRegistry();
-		}
-		return _instance;
-	}
-
-	/* package */ FunctionMetadataRegistry(FunctionMetadata[] functionDataByIndex, Map<String, FunctionMetadata> functionDataByName) {
-		_functionDataByIndex = (functionDataByIndex == null) ? null : functionDataByIndex.clone();
-		_functionDataByName = functionDataByName;
-	}
-
-	/* package */ Set<String> getAllFunctionNames() {
-		return _functionDataByName.keySet();
-	}
-
-
-	public static FunctionMetadata getFunctionByIndex(int index) {
-		return getInstance().getFunctionByIndexInternal(index);
-	}
-
-	private FunctionMetadata getFunctionByIndexInternal(int index) {
-		return _functionDataByIndex[index];
-	}
-	/**
-	 * Resolves a built-in function index.
-	 * @param name uppercase function name
-	 * @return a negative value if the function name is not found.
-	 * This typically occurs for external functions.
-	 */
-	public static short lookupIndexByName(String name) {
-		FunctionMetadata fd = getInstance().getFunctionByNameInternal(name);
-		if (fd == null) {
-			return -1;
-		}
-		return (short) fd.getIndex();
-	}
-
-	private FunctionMetadata getFunctionByNameInternal(String name) {
-		return _functionDataByName.get(name);
-	}
-
-
-	public static FunctionMetadata getFunctionByName(String name) {
-		return getInstance().getFunctionByNameInternal(name);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Address.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Address.java
deleted file mode 100644
index e0680df..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Address.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Creates a text reference as text, given specified row and column numbers.
- *
- * @author Aniket Banerjee (banerjee@google.com)
- */
-public class Address implements Function {
-    public static final int REF_ABSOLUTE = 1;
-    public static final int REF_ROW_ABSOLUTE_COLUMN_RELATIVE = 2;
-    public static final int REF_ROW_RELATIVE_RELATIVE_ABSOLUTE = 3;
-    public static final int REF_RELATIVE = 4;
-
-    public ValueEval evaluate(ValueEval[] args, int srcRowIndex,
-                              int srcColumnIndex) {
-        if(args.length < 2 || args.length > 5) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        try {
-            boolean pAbsRow, pAbsCol;
-
-            int row =  (int)NumericFunction.singleOperandEvaluate(args[0], srcRowIndex, srcColumnIndex);
-            int col =  (int)NumericFunction.singleOperandEvaluate(args[1], srcRowIndex, srcColumnIndex);
-
-            int refType;
-            if (args.length > 2  &&  args[2] != MissingArgEval.instance) {
-                refType = (int)NumericFunction.singleOperandEvaluate(args[2], srcRowIndex, srcColumnIndex);
-            } else {
-                refType = REF_ABSOLUTE;		// this is also the default if parameter is not given
-            }
-            switch (refType){
-                case REF_ABSOLUTE:
-                    pAbsRow = true;
-                    pAbsCol = true;
-                    break;
-                case REF_ROW_ABSOLUTE_COLUMN_RELATIVE:
-                    pAbsRow = true;
-                    pAbsCol = false;
-                    break;
-                case REF_ROW_RELATIVE_RELATIVE_ABSOLUTE:
-                    pAbsRow = false;
-                    pAbsCol = true;
-                    break;
-                case REF_RELATIVE:
-                    pAbsRow = false;
-                    pAbsCol = false;
-                    break;
-                default:
-                    throw new EvaluationException(ErrorEval.VALUE_INVALID);
-            }
-
-//            boolean a1;
-//            if(args.length > 3){
-//                ValueEval ve = OperandResolver.getSingleValue(args[3], srcRowIndex, srcColumnIndex);
-//                // TODO R1C1 style is not yet supported
-//                a1 = ve == MissingArgEval.instance ? true : OperandResolver.coerceValueToBoolean(ve, false);
-//            } else {
-//                a1 = true;
-//            }
-
-            String sheetName;
-            if(args.length == 5){
-                ValueEval ve = OperandResolver.getSingleValue(args[4], srcRowIndex, srcColumnIndex);
-                sheetName = ve == MissingArgEval.instance ? null : OperandResolver.coerceValueToString(ve);
-            } else {
-                sheetName = null;
-            }
-
-            CellReference ref = new CellReference(row - 1, col - 1, pAbsRow, pAbsCol);
-            StringBuffer sb = new StringBuffer(32);
-            if(sheetName != null) {
-                SheetNameFormatter.appendFormat(sb, sheetName);
-                sb.append('!');
-            }
-            sb.append(ref.formatAsString());
-
-            return new StringEval(sb.toString());
-
-        } catch (EvaluationException e){
-            return e.getErrorEval();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
deleted file mode 100644
index 644086d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public abstract class AggregateFunction extends MultiOperandNumericFunction {
-
-	private static final class LargeSmall extends Fixed2ArgFunction {
-		private final boolean _isLarge;
-		protected LargeSmall(boolean isLarge) {
-			_isLarge = isLarge;
-		}
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0,
-				ValueEval arg1) {
-			double dn;
-			try {
-				ValueEval ve1 = OperandResolver.getSingleValue(arg1, srcRowIndex, srcColumnIndex);
-				dn = OperandResolver.coerceValueToDouble(ve1);
-			} catch (EvaluationException e1) {
-				// all errors in the second arg translate to #VALUE!
-				return ErrorEval.VALUE_INVALID;
-			}
-			// weird Excel behaviour on second arg
-			if (dn < 1.0) {
-				// values between 0.0 and 1.0 result in #NUM!
-				return ErrorEval.NUM_ERROR;
-			}
-			// all other values are rounded up to the next integer
-			int k = (int) Math.ceil(dn);
-
-			double result;
-			try {
-				double[] ds = ValueCollector.collectValues(arg0);
-				if (k > ds.length) {
-					return ErrorEval.NUM_ERROR;
-				}
-				result = _isLarge ? StatsLib.kthLargest(ds, k) : StatsLib.kthSmallest(ds, k);
-				NumericFunction.checkValue(result);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-
-			return new NumberEval(result);
-		}
-	}
-
-    /**
-     *  Returns the k-th percentile of values in a range. You can use this function to establish a threshold of
-     *  acceptance. For example, you can decide to examine candidates who score above the 90th percentile.
-     *
-     *  PERCENTILE(array,k)
-     *  Array     is the array or range of data that defines relative standing.
-     *  K     is the percentile value in the range 0..1, inclusive.
-     *
-     * <strong>Remarks</strong>
-     * <ul>
-     *     <li>if array is empty or contains more than 8,191 data points, PERCENTILE returns the #NUM! error value.</li>
-     *     <li>If k is nonnumeric, PERCENTILE returns the #VALUE! error value.</li>
-     *     <li>If k is < 0 or if k > 1, PERCENTILE returns the #NUM! error value.</li>
-     *     <li>If k is not a multiple of 1/(n - 1), PERCENTILE interpolates to determine the value at the k-th percentile.</li>
-     * </ul>
-     */
-	private static final class Percentile extends Fixed2ArgFunction {
-		
-		protected Percentile() {
-		}
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0,
-				ValueEval arg1) {
-			double dn;
-			try {
-				ValueEval ve1 = OperandResolver.getSingleValue(arg1, srcRowIndex, srcColumnIndex);
-				dn = OperandResolver.coerceValueToDouble(ve1);
-			} catch (EvaluationException e1) {
-				// all errors in the second arg translate to #VALUE!
-				return ErrorEval.VALUE_INVALID;
-			}
-			if (dn < 0 || dn > 1) { // has to be percentage
-				return ErrorEval.NUM_ERROR;
-			}
-
-			double result;
-			try {
-				double[] ds = ValueCollector.collectValues(arg0);
-				int N = ds.length;
-
-			    if (N == 0 || N > 8191) {
-                    return ErrorEval.NUM_ERROR;
-                }
-
-				double n = (N - 1) * dn + 1;
-				if (n == 1d) {
-					result = StatsLib.kthSmallest(ds, 1);
-				} else if (Double.compare(n, N) == 0) {
-					result = StatsLib.kthLargest(ds, 1);
-				} else {
-					int k = (int) n;
-					double d = n - k;
-					result = StatsLib.kthSmallest(ds, k) + d
-							* (StatsLib.kthSmallest(ds, k + 1) - StatsLib.kthSmallest(ds, k));
-				}
-
-				NumericFunction.checkValue(result);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-
-			return new NumberEval(result);
-		}
-	}
-	
-	static final class ValueCollector extends MultiOperandNumericFunction {
-		private static final ValueCollector instance = new ValueCollector();
-		public ValueCollector() {
-			super(false, false);
-		}
-		public static double[] collectValues(ValueEval...operands) throws EvaluationException {
-			return instance.getNumberArray(operands);
-		}
-		protected double evaluate(double[] values) {
-			throw new IllegalStateException("should not be called");
-		}
-	}
-
-    protected AggregateFunction() {
-        super(false, false);
-    }
-
-    /**
-     * Create an instance to use in the {@link Subtotal} function.
-     *
-     * <p>
-     *     If there are other subtotals within argument refs (or nested subtotals),
-     *     these nested subtotals are ignored to avoid double counting.
-     * </p>
-     *
-     * @param   func  the function to wrap
-     * @return  wrapped instance. The actual math is delegated to the argument function.
-     */
-    /*package*/ static Function subtotalInstance(Function func) {
-        final AggregateFunction arg = (AggregateFunction)func;
-        return new AggregateFunction() {
-            @Override
-            protected double evaluate(double[] values) throws EvaluationException {
-                return arg.evaluate(values);
-            }
-
-            /**
-             *  ignore nested subtotals.
-             */
-            @Override
-            public boolean isSubtotalCounted(){
-                return false;
-            }
-
-        };
-    }
-
-    public static final Function AVEDEV = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return StatsLib.avedev(values);
-		}
-	};
-	public static final Function AVERAGE = new AggregateFunction() {
-		protected double evaluate(double[] values) throws EvaluationException {
-			if (values.length < 1) {
-				throw new EvaluationException(ErrorEval.DIV_ZERO);
-			}
-			return MathX.average(values);
-		}
-	};
-	public static final Function DEVSQ = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return StatsLib.devsq(values);
-		}
-	};
-	public static final Function LARGE = new LargeSmall(true);
-	public static final Function MAX = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return values.length > 0 ? MathX.max(values) : 0;
-		}
-	};
-	public static final Function MEDIAN = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return StatsLib.median(values);
-		}
-	};
-	public static final Function MIN = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return values.length > 0 ? MathX.min(values) : 0;
-		}
-	};
-	
-	public static final Function PERCENTILE = new Percentile();
-	
-	public static final Function PRODUCT = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return MathX.product(values);
-		}
-	};
-	public static final Function SMALL = new LargeSmall(false);
-	public static final Function STDEV = new AggregateFunction() {
-		protected double evaluate(double[] values) throws EvaluationException {
-			if (values.length < 1) {
-				throw new EvaluationException(ErrorEval.DIV_ZERO);
-			}
-			return StatsLib.stdev(values);
-		}
-	};
-	public static final Function SUM = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return MathX.sum(values);
-		}
-	};
-	public static final Function SUMSQ = new AggregateFunction() {
-		protected double evaluate(double[] values) {
-			return MathX.sumsq(values);
-		}
-	};
-    public static final Function VAR = new AggregateFunction() {
-        protected double evaluate(double[] values) throws EvaluationException {
-            if (values.length < 1) {
-                throw new EvaluationException(ErrorEval.DIV_ZERO);
-            }
-            return StatsLib.var(values);
-        }
-    };
-    public static final Function VARP = new AggregateFunction() {
-        protected double evaluate(double[] values) throws EvaluationException {
-            if (values.length < 1) {
-                throw new EvaluationException(ErrorEval.DIV_ZERO);
-            }
-            return StatsLib.varp(values);
-        }
-    };
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java b/trunk/src/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
deleted file mode 100644
index 6130311..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-/**
- * <p>Some utils for converting from and to any base<p/>
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class BaseNumberUtils {
-
-
-    public static double convertToDecimal(String value, int base, int maxNumberOfPlaces) throws IllegalArgumentException {
-        if (value == null || value.length() == 0) {
-            return 0.0;
-        }
-
-        long stringLength = value.length();
-        if (stringLength > maxNumberOfPlaces) {
-            throw new IllegalArgumentException();
-        }
-
-        double decimalValue = 0.0;
-
-        long signedDigit = 0;
-        boolean hasSignedDigit = true;
-        char[] characters = value.toCharArray();
-        for (char character : characters) {
-            long digit;
-
-            if ('0' <= character && character <= '9') {
-                digit = character - '0';
-            } else if ('A' <= character && character <= 'Z') {
-                digit = 10 + (character - 'A');
-            } else if ('a' <= character && character <= 'z') {
-                digit = 10 + (character - 'a');
-            } else {
-                digit = base;
-            }
-
-            if (digit < base) {
-                if (hasSignedDigit) {
-                    hasSignedDigit = false;
-                    signedDigit = digit;
-                }
-                decimalValue = decimalValue * base + digit;
-            } else {
-                throw new IllegalArgumentException("character not allowed");
-            }
-        }
-
-        boolean isNegative = (!hasSignedDigit && stringLength == maxNumberOfPlaces  && (signedDigit >= base / 2));
-        if (isNegative) {
-            decimalValue = getTwoComplement(base, maxNumberOfPlaces, decimalValue);
-            decimalValue = decimalValue * -1.0;
-        }
-
-        return decimalValue;
-    }
-
-    private static double getTwoComplement(double base, double maxNumberOfPlaces, double decimalValue) {
-        return (Math.pow(base, maxNumberOfPlaces) - decimalValue);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
deleted file mode 100644
index cb20605..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for Excel Bin2Dec() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>Bin2Dec  </b>(<b>number</b>)<br/>
- * <p/>
- * Converts a binary number to decimal.
- * <p/>
- * Number is the binary number you want to convert. Number cannot contain more than 10 characters (10 bits).
- * The most significant bit of number is the sign bit. The remaining 9 bits are magnitude bits.
- * Negative numbers are represented using two's-complement notation.
- * <p/>
- * Remark
- * If number is not a valid binary number, or if number contains more than 10 characters (10 bits),
- * BIN2DEC returns the #NUM! error value.
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Bin2Dec extends Fixed1ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Bin2Dec();
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
-        final String number;
-        if (numberVE instanceof RefEval) {
-            RefEval re = (RefEval) numberVE;
-            number = OperandResolver.coerceValueToString(re.getInnerValueEval(re.getFirstSheetIndex()));
-        } else {
-            number = OperandResolver.coerceValueToString(numberVE);
-        }
-        if (number.length() > 10) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        String unsigned;
-
-        //If the leftmost bit is 0 -- number is positive.
-        boolean isPositive;
-        if (number.length() < 10) {
-            unsigned = number;
-            isPositive = true;
-        } else {
-            unsigned = number.substring(1);
-            isPositive = number.startsWith("0");
-        }
-
-        String value;
-        try {
-            if (isPositive) {
-                //bit9*2^8 + bit8*2^7 + bit7*2^6 + bit6*2^5 + bit5*2^4+ bit3*2^2+ bit2*2^1+ bit1*2^0
-                int sum = getDecimalValue(unsigned);
-                value = String.valueOf(sum);
-            } else {
-                //The leftmost bit is 1 -- this is negative number
-                //Inverse bits [1-9]
-                String inverted = toggleBits(unsigned);
-                // Calculate decimal number
-                int sum = getDecimalValue(inverted);
-    
-                //Add 1 to obtained number
-                sum++;
-    
-                value = "-" + sum;
-            }
-        } catch (NumberFormatException e) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        return new NumberEval(Long.parseLong(value));
-    }
-
-    private int getDecimalValue(String unsigned) {
-        int sum = 0;
-        int numBits = unsigned.length();
-        int power = numBits - 1;
-
-        for (int i = 0; i < numBits; i++) {
-            int bit = Integer.parseInt(unsigned.substring(i, i + 1));
-            int term = (int) (bit * Math.pow(2, power));
-            sum += term;
-            power--;
-        }
-        return sum;
-    }
-
-    private static String toggleBits(String s) {
-        long i = Long.parseLong(s, 2);
-        long i2 = i ^ ((1L << s.length()) - 1);
-        String s2 = Long.toBinaryString(i2);
-        while (s2.length() < s.length()) s2 = '0' + s2;
-        return s2;
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 1) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
deleted file mode 100644
index 5d011e3..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Here are the general rules concerning Boolean functions:
- * <ol>
- * <li> Blanks are ignored (not either true or false) </li>
- * <li> Strings are ignored if part of an area ref or cell ref, otherwise they must be 'true' or 'false'</li>
- * <li> Numbers: 0 is false. Any other number is TRUE </li>
- * <li> Areas: *all* cells in area are evaluated according to the above rules</li>
- * </ol>
- *
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public abstract class BooleanFunction implements Function {
-
-	public final ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) {
-		if (args.length < 1) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		boolean boolResult;
-		try {
-			boolResult = calculate(args);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return BoolEval.valueOf(boolResult);
-	}
-
-	private boolean calculate(ValueEval[] args) throws EvaluationException {
-
-		boolean result = getInitialResultValue();
-		boolean atleastOneNonBlank = false;
-
-		/*
-		 * Note: no short-circuit boolean loop exit because any ErrorEvals will override the result
-		 */
-		for (final ValueEval arg : args) {
-            Boolean tempVe;
-			if (arg instanceof TwoDEval) {
-				TwoDEval ae = (TwoDEval) arg;
-				int height = ae.getHeight();
-				int width = ae.getWidth();
-				for (int rrIx=0; rrIx<height; rrIx++) {
-					for (int rcIx=0; rcIx<width; rcIx++) {
-						ValueEval ve = ae.getValue(rrIx, rcIx);
-						tempVe = OperandResolver.coerceValueToBoolean(ve, true);
-						if (tempVe != null) {
-							result = partialEvaluate(result, tempVe.booleanValue());
-							atleastOneNonBlank = true;
-						}
-					}
-				}
-				continue;
-			}
-            if (arg instanceof RefEval) {
-                RefEval re = (RefEval) arg;
-                final int firstSheetIndex = re.getFirstSheetIndex();
-                final int lastSheetIndex = re.getLastSheetIndex();
-                for (int sIx = firstSheetIndex; sIx <= lastSheetIndex; sIx++) {
-                    ValueEval ve = re.getInnerValueEval(sIx);
-                    tempVe = OperandResolver.coerceValueToBoolean(ve, true);
-                    if (tempVe != null) {
-                        result = partialEvaluate(result, tempVe.booleanValue());
-                        atleastOneNonBlank = true;
-                    }
-                }
-                continue;
-            }
-			
-			if (arg == MissingArgEval.instance) {
-				tempVe = null;		// you can leave out parameters, they are simply ignored
-			} else {
-				tempVe = OperandResolver.coerceValueToBoolean(arg, false);
-			}
-
-			if (tempVe != null) {
-				result = partialEvaluate(result, tempVe.booleanValue());
-				atleastOneNonBlank = true;
-			}
-		}
-
-		if (!atleastOneNonBlank) {
-			throw new EvaluationException(ErrorEval.VALUE_INVALID);
-		}
-		return result;
-	}
-
-
-	protected abstract boolean getInitialResultValue();
-	protected abstract boolean partialEvaluate(boolean cumulativeResult, boolean currentValue);
-
-
-	public static final Function AND = new BooleanFunction() {
-		protected boolean getInitialResultValue() {
-			return true;
-		}
-		protected boolean partialEvaluate(boolean cumulativeResult, boolean currentValue) {
-			return cumulativeResult && currentValue;
-		}
-	};
-	public static final Function OR = new BooleanFunction() {
-		protected boolean getInitialResultValue() {
-			return false;
-		}
-		protected boolean partialEvaluate(boolean cumulativeResult, boolean currentValue) {
-			return cumulativeResult || currentValue;
-		}
-	};
-	public static final Function FALSE = new Fixed0ArgFunction() {
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-			return BoolEval.FALSE;
-		}
-	};
-	public static final Function TRUE = new Fixed0ArgFunction() {
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-			return BoolEval.TRUE;
-		}
-	};
-	public static final Function NOT = new Fixed1ArgFunction() {
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			boolean boolArgVal;
-			try {
-				ValueEval ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-				Boolean b = OperandResolver.coerceValueToBoolean(ve, false);
-				boolArgVal = b == null ? false : b.booleanValue();
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-
-			return BoolEval.valueOf(!boolArgVal);
-		}
-	};
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
deleted file mode 100644
index 28af57a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-
-/**
- * Implementation of Excel functions Date parsing functions:
- *  Date - DAY, MONTH and YEAR
- *  Time - HOUR, MINUTE and SECOND
- *
- * @author Others (not mentioned in code)
- * @author Thies Wellpott
- */
-public final class CalendarFieldFunction extends Fixed1ArgFunction {
-	public static final Function YEAR = new CalendarFieldFunction(Calendar.YEAR);
-	public static final Function MONTH = new CalendarFieldFunction(Calendar.MONTH);
-	public static final Function DAY = new CalendarFieldFunction(Calendar.DAY_OF_MONTH);
-	public static final Function HOUR = new CalendarFieldFunction(Calendar.HOUR_OF_DAY);
-    public static final Function MINUTE = new CalendarFieldFunction(Calendar.MINUTE);
-    public static final Function SECOND = new CalendarFieldFunction(Calendar.SECOND);
-
-	private final int _dateFieldId;
-
-	private CalendarFieldFunction(int dateFieldId) {
-		_dateFieldId = dateFieldId;
-	}
-
-	public final ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-		double val;
-		try {
-			ValueEval ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			val = OperandResolver.coerceValueToDouble(ve);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		if (val < 0) {
-			return ErrorEval.NUM_ERROR;
-		}
-		return new NumberEval(getCalField(val));
-	}
-
-	private int getCalField(double serialDate) {
-	   // For some reason, a date of 0 in Excel gets shown
-	   //  as the non existant 1900-01-00
-		if (((int)serialDate) == 0) {
-			switch (_dateFieldId) {
-				case Calendar.YEAR: return 1900;
-				case Calendar.MONTH: return 1;
-				case Calendar.DAY_OF_MONTH: return 0;
-			}
-			// They want time, that's normal
-		}
-
-		// TODO Figure out if we're in 1900 or 1904
-		// EXCEL functions round up nearly a half second (probably to prevent floating point
-		// rounding issues); use UTC here to prevent daylight saving issues for HOUR
-		Calendar c = DateUtil.getJavaCalendarUTC(serialDate + 0.4995 / DateUtil.SECONDS_PER_DAY, false);
-		int result = c.get(_dateFieldId);
-		
-		// Month is a special case due to C semantics
-		if (_dateFieldId == Calendar.MONTH) {
-			result++;
-		}
-		
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Choose.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Choose.java
deleted file mode 100644
index 127ffd4..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Choose.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * @author Josh Micich
- */
-public final class Choose implements Function {
-
-	public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		if (args.length < 2) {
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		try {
-			int ix = evaluateFirstArg(args[0], srcRowIndex, srcColumnIndex);
-			if (ix < 1 || ix >= args.length) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			ValueEval result = OperandResolver.getSingleValue(args[ix], srcRowIndex, srcColumnIndex);
-			if (result == MissingArgEval.instance) {
-				return BlankEval.instance;
-			}
-			return result;
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	public static int evaluateFirstArg(ValueEval arg0, int srcRowIndex, int srcColumnIndex)
-			throws EvaluationException {
-		ValueEval ev = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-		return OperandResolver.coerceValueToInt(ev);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java
deleted file mode 100644
index ee1622f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Code.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * Implementation for Excel CODE () function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>CODE   </b>(<b>text</b> )<br/>
- * <p/>
- * Returns a numeric code for the first character in a text string. The returned code corresponds to the character set used by your computer.
- * <p/>
- * text The text for which you want the code of the first character.
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Code extends Fixed1ArgFunction {
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval textArg) {
-
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(textArg, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        String text = OperandResolver.coerceValueToString(veText1);
-
-        if (text.length() == 0) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        int code = text.charAt(0);
-
-        return new StringEval(String.valueOf(code));
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Column.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Column.java
deleted file mode 100644
index 06e629d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Column.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-public final class Column implements Function0Arg, Function1Arg {
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-        return new NumberEval(srcColumnIndex+1);
-    }
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-        int rnum;
-
-        if (arg0 instanceof AreaEval) {
-            rnum = ((AreaEval) arg0).getFirstColumn();
-        } else if (arg0 instanceof RefEval) {
-            rnum = ((RefEval) arg0).getColumn();
-        } else {
-            // anything else is not valid argument
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        return new NumberEval(rnum + 1);
-    }
-    public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-        switch (args.length) {
-            case 1:
-                return evaluate(srcRowIndex, srcColumnIndex, args[0]);
-            case 0:
-                return new NumberEval(srcColumnIndex+1);
-        }
-        return ErrorEval.VALUE_INVALID;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Columns.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Columns.java
deleted file mode 100644
index 3c1fdc5..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Columns.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
-
-/**
- * Implementation for Excel COLUMNS function.
- *
- * @author Josh Micich
- */
-public final class Columns extends Fixed1ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-
-		int result;
-		if (arg0 instanceof TwoDEval) {
-			result = ((TwoDEval) arg0).getWidth();
-		} else if (arg0 instanceof RefEval) {
-			result = 1;
-		} else { // anything else is not valid argument
-			return ErrorEval.VALUE_INVALID;
-		}
-		return new NumberEval(result);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java
deleted file mode 100644
index 628a267..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Locale;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for Excel COMPLEX () function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>COMPLEX   </b>(<b>real_num</b>,<b>i_num</b>,<b>suffix </b> )<br/>
- * <p/>
- * Converts real and imaginary coefficients into a complex number of the form x + yi or x + yj.
- * <p/>
- * <p/>
- * All complex number functions accept "i" and "j" for suffix, but neither "I" nor "J".
- * Using uppercase results in the #VALUE! error value. All functions that accept two
- * or more complex numbers require that all suffixes match.
- * <p/>
- * <b>real_num</b> The real coefficient of the complex number.
- * If this argument is nonnumeric, this function returns the #VALUE! error value.
- * <p/>
- * <p/>
- * <b>i_num</b> The imaginary coefficient of the complex number.
- * If this argument is nonnumeric, this function returns the #VALUE! error value.
- * <p/>
- * <p/>
- * <b>suffix</b> The suffix for the imaginary component of the complex number.
- * <ul>
- * <li>If omitted, suffix is assumed to be "i".</li>
- * <li>If suffix is neither "i" nor "j", COMPLEX returns the #VALUE! error value.</li>
- * </ul>
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Complex extends Var2or3ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Complex();
-
-    public static final String DEFAULT_SUFFIX = "i";
-    public static final String SUPPORTED_SUFFIX = "j";
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval real_num, ValueEval i_num) {
-        return this.evaluate(srcRowIndex, srcColumnIndex, real_num, i_num, new StringEval(DEFAULT_SUFFIX));
-    }
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval real_num, ValueEval i_num, ValueEval suffix) {
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(real_num, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        double realNum = 0;
-        try {
-            realNum = OperandResolver.coerceValueToDouble(veText1);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        ValueEval veINum;
-        try {
-            veINum = OperandResolver.getSingleValue(i_num, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        double realINum = 0;
-        try {
-            realINum = OperandResolver.coerceValueToDouble(veINum);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        String suffixValue = OperandResolver.coerceValueToString(suffix);
-        if (suffixValue.length() == 0) {
-            suffixValue = DEFAULT_SUFFIX;
-        }
-        if (suffixValue.equals(DEFAULT_SUFFIX.toUpperCase(Locale.ROOT)) || 
-                suffixValue.equals(SUPPORTED_SUFFIX.toUpperCase(Locale.ROOT))) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        if (!(suffixValue.equals(DEFAULT_SUFFIX) || suffixValue.equals(SUPPORTED_SUFFIX))) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        StringBuffer strb = new StringBuffer("");
-        if (realNum != 0) {
-            if (isDoubleAnInt(realNum)) {
-                strb.append((int)realNum);
-            } else {
-                strb.append(realNum);
-            }
-        }
-        if (realINum != 0) {
-            if (strb.length() != 0) {
-                if (realINum > 0) {
-                    strb.append("+");
-                }
-            }
-
-            if (realINum != 1 && realINum != -1) {
-                if (isDoubleAnInt(realINum)) {
-                    strb.append((int)realINum);
-                } else {
-                    strb.append(realINum);
-                }
-            }
-
-            strb.append(suffixValue);
-        }
-
-        return new StringEval(strb.toString());
-    }
-
-    private boolean isDoubleAnInt(double number) {
-        return (number == Math.floor(number)) && !Double.isInfinite(number);
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length == 2) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
-        }
-        if (args.length == 3) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1], args[2]);
-        }
-
-        return ErrorEval.VALUE_INVALID;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Count.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Count.java
deleted file mode 100644
index b8de432..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Count.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchAreaPredicate;
-
-/**
- * Counts the number of cells that contain numeric data within
- *  the list of arguments.
- *
- * Excel Syntax
- * COUNT(value1,value2,...)
- * Value1, value2, ...   are 1 to 30 arguments representing the values or ranges to be counted.
- *
- * TODO: Check this properly matches excel on edge cases
- *  like formula cells, error cells etc
- */
-public final class Count implements Function {
-    private final I_MatchPredicate _predicate;
-
-    public Count(){
-        _predicate = defaultPredicate;
-    }
-
-    private Count(I_MatchPredicate criteriaPredicate){
-        _predicate = criteriaPredicate;
-    }
-
-	public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-		int nArgs = args.length;
-		if (nArgs < 1) {
-			// too few arguments
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		if (nArgs > 30) {
-			// too many arguments
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		int temp = 0;
-
-		for(int i=0; i<nArgs; i++) {
-			temp += CountUtils.countArg(args[i], _predicate);
-
-		}
-		return new NumberEval(temp);
-	}
-
-	private static final I_MatchPredicate defaultPredicate = new I_MatchPredicate() {
-
-		public boolean matches(ValueEval valueEval) {
-
-			if(valueEval instanceof NumberEval) {
-				// only numbers are counted
-				return true;
-			}
-			if(valueEval == MissingArgEval.instance) {
-				// oh yeah, and missing arguments
-				return true;
-			}
-
-			// error values and string values not counted
-			return false;
-		}
-	};
-
-    private static final I_MatchPredicate subtotalPredicate = new I_MatchAreaPredicate() {
-        public boolean matches(ValueEval valueEval) {
-            return defaultPredicate.matches(valueEval);
-        }
-
-        /**
-         * don't count cells that are subtotals
-         */
-        public boolean matches(TwoDEval areEval, int rowIndex, int columnIndex) {
-            return !areEval.isSubTotal(rowIndex, columnIndex);
-        }
-    };
-
-    /**
-     *  Create an instance of Count to use in {@link Subtotal}
-     * <p>
-     *     If there are other subtotals within argument refs (or nested subtotals),
-     *     these nested subtotals are ignored to avoid double counting.
-     * </p>
-     *
-     *  @see Subtotal
-     */
-    public static Count subtotalInstance() {
-        return new Count(subtotalPredicate );
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java b/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java
deleted file mode 100644
index 5dae60f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.ThreeDEval;
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Common logic for COUNT, COUNTA and COUNTIF
- *
- * @author Josh Micich
- */
-final class CountUtils {
-
-	private CountUtils() {
-		// no instances of this class
-	}
-
-	/**
-	 * Common interface for the matching criteria.
-	 */
-	public interface I_MatchPredicate {
-		boolean matches(ValueEval x);
-	}
-    public interface I_MatchAreaPredicate extends I_MatchPredicate {
-        boolean matches(TwoDEval x, int rowIndex, int columnIndex);
-    }
-
-    /**
-     * @return the number of evaluated cells in the range that match the specified criteria
-     */
-    public static int countMatchingCellsInArea(ThreeDEval areaEval, I_MatchPredicate criteriaPredicate) {
-        int result = 0;
-
-        final int firstSheetIndex = areaEval.getFirstSheetIndex();
-        final int lastSheetIndex = areaEval.getLastSheetIndex();
-        for (int sIx = firstSheetIndex; sIx <= lastSheetIndex; sIx++) {
-            int height = areaEval.getHeight();
-            int width = areaEval.getWidth();
-            for (int rrIx=0; rrIx<height; rrIx++) {
-                for (int rcIx=0; rcIx<width; rcIx++) {
-                    ValueEval ve = areaEval.getValue(sIx, rrIx, rcIx);
-    
-                    if(criteriaPredicate instanceof I_MatchAreaPredicate){
-                        I_MatchAreaPredicate areaPredicate = (I_MatchAreaPredicate)criteriaPredicate;
-                        if(!areaPredicate.matches(areaEval, rrIx, rcIx)) continue;
-                    }
-    
-                    if(criteriaPredicate.matches(ve)) {
-                        result++;
-                    }
-                }
-            }
-        }
-        return result;
-    }
-	/**
-     * @return the number of evaluated cells in the range that match the specified criteria
-	 */
-	public static int countMatchingCellsInRef(RefEval refEval, I_MatchPredicate criteriaPredicate) {
-	    int result = 0;
-	    
-        final int firstSheetIndex = refEval.getFirstSheetIndex();
-        final int lastSheetIndex = refEval.getLastSheetIndex();
-        for (int sIx = firstSheetIndex; sIx <= lastSheetIndex; sIx++) {
-	        ValueEval ve = refEval.getInnerValueEval(sIx);
-            if(criteriaPredicate.matches(ve)) {
-                result++;
-            }
-	    }
-		return result;
-	}
-	public static int countArg(ValueEval eval, I_MatchPredicate criteriaPredicate) {
-		if (eval == null) {
-			throw new IllegalArgumentException("eval must not be null");
-		}
-        if (eval instanceof ThreeDEval) {
-            return countMatchingCellsInArea((ThreeDEval) eval, criteriaPredicate);
-        }
-		if (eval instanceof TwoDEval) {
-		    throw new IllegalArgumentException("Count requires 3D Evals, 2D ones aren't supported");
-		}
-		if (eval instanceof RefEval) {
-			return CountUtils.countMatchingCellsInRef((RefEval) eval, criteriaPredicate);
-		}
-		return criteriaPredicate.matches(eval) ? 1 : 0;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Counta.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Counta.java
deleted file mode 100644
index 5a106be..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Counta.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchAreaPredicate;
-
-/**
- * Counts the number of cells that contain data within the list of arguments.
- *
- * Excel Syntax
- * COUNTA(value1,value2,...)
- * Value1, value2, ...   are 1 to 30 arguments representing the values or ranges to be counted.
- *
- * @author Josh Micich
- */
-public final class Counta implements Function {
-    private final I_MatchPredicate _predicate;
-
-    public Counta(){
-        _predicate = defaultPredicate;
-    }
-
-    private Counta(I_MatchPredicate criteriaPredicate){
-        _predicate = criteriaPredicate;
-    }
-
-	public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-		int nArgs = args.length;
-		if (nArgs < 1) {
-			// too few arguments
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		if (nArgs > 30) {
-			// too many arguments
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		int temp = 0;
-
-		for(int i=0; i<nArgs; i++) {
-			temp += CountUtils.countArg(args[i], _predicate);
-
-		}
-		return new NumberEval(temp);
-	}
-
-	private static final I_MatchPredicate defaultPredicate = new I_MatchPredicate() {
-
-		public boolean matches(ValueEval valueEval) {
-			// Note - observed behavior of Excel:
-			// Error values like #VALUE!, #REF!, #DIV/0!, #NAME? etc don't cause this COUNTA to return an error
-			// in fact, they seem to get counted
-
-			if(valueEval == BlankEval.instance) {
-				return false;
-			}
-			// Note - everything but BlankEval counts
-			return true;
-		}
-	};
-    private static final I_MatchPredicate subtotalPredicate = new I_MatchAreaPredicate() {
-        public boolean matches(ValueEval valueEval) {
-            return defaultPredicate.matches(valueEval);
-        }
-
-        /**
-         * don't count cells that are subtotals
-         */
-        public boolean matches(TwoDEval areEval, int rowIndex, int columnIndex) {
-            return !areEval.isSubTotal(rowIndex, columnIndex);
-        }
-    };
-
-    public static Counta subtotalInstance() {
-        return new Counta(subtotalPredicate);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java
deleted file mode 100644
index 348a23e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.ThreeDEval;
-import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-
-/**
- * Implementation for the function COUNTBLANK
- * <p>
- *  Syntax: COUNTBLANK ( range )
- *    <table border="0" cellpadding="1" cellspacing="0" summary="Parameter descriptions">
- *      <tr><th>range&nbsp;&nbsp;&nbsp;</th><td>is the range of cells to count blanks</td></tr>
- *    </table>
- * </p>
- *
- * @author Mads Mohr Christensen
- */
-public final class Countblank extends Fixed1ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-
-		double result;
-		if (arg0 instanceof RefEval) {
-			result = CountUtils.countMatchingCellsInRef((RefEval) arg0, predicate);
-		} else if (arg0 instanceof ThreeDEval) {
-			result = CountUtils.countMatchingCellsInArea((ThreeDEval) arg0, predicate);
-		} else {
-			throw new IllegalArgumentException("Bad range arg type (" + arg0.getClass().getName() + ")");
-		}
-		return new NumberEval(result);
-	}
-
-	private static final I_MatchPredicate predicate = new I_MatchPredicate() {
-
-		public boolean matches(ValueEval valueEval) {
-			// Note - only BlankEval counts
-			return valueEval == BlankEval.instance ||
-					// see https://support.office.com/en-us/article/COUNTBLANK-function-6a92d772-675c-4bee-b346-24af6bd3ac22
-					// "Cells with formulas that return "" (empty text) are also counted."
-					(valueEval instanceof StringEval && "".equals(((StringEval)valueEval).getStringValue()));
-		}
-	};
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java
deleted file mode 100644
index f2a7ebe..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.formula.ThreeDEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-import org.apache.poi.ss.usermodel.FormulaError;
-
-/**
- * Implementation for the function COUNTIF
- * <p>
- *  Syntax: COUNTIF ( range, criteria )
- *    <table border="0" cellpadding="1" cellspacing="0" summary="Parameter descriptions">
- *      <tr><th>range&nbsp;&nbsp;&nbsp;</th><td>is the range of cells to be counted based on the criteria</td></tr>
- *      <tr><th>criteria</th><td>is used to determine which cells to count</td></tr>
- *    </table>
- * </p>
- */
-public final class Countif extends Fixed2ArgFunction {
-
-    private static final class CmpOp {
-        public static final int NONE = 0;
-        public static final int EQ = 1;
-        public static final int NE = 2;
-        public static final int LE = 3;
-        public static final int LT = 4;
-        public static final int GT = 5;
-        public static final int GE = 6;
-
-        public static final CmpOp OP_NONE = op("", NONE);
-        public static final CmpOp OP_EQ = op("=", EQ);
-        public static final CmpOp OP_NE = op("<>", NE);
-        public static final CmpOp OP_LE = op("<=", LE);
-        public static final CmpOp OP_LT = op("<", LT);
-        public static final CmpOp OP_GT = op(">", GT);
-        public static final CmpOp OP_GE = op(">=", GE);
-        private final String _representation;
-        private final int _code;
-
-        private static CmpOp op(String rep, int code) {
-            return new CmpOp(rep, code);
-        }
-        private CmpOp(String representation, int code) {
-            _representation = representation;
-            _code = code;
-        }
-        /**
-         * @return number of characters used to represent this operator
-         */
-        public int getLength() {
-            return _representation.length();
-        }
-        public int getCode() {
-            return _code;
-        }
-        public static CmpOp getOperator(String value) {
-            int len = value.length();
-            if (len < 1) {
-                return OP_NONE;
-            }
-
-            char firstChar = value.charAt(0);
-
-            switch(firstChar) {
-                case '=':
-                    return OP_EQ;
-                case '>':
-                    if (len > 1) {
-                        switch(value.charAt(1)) {
-                            case '=':
-                                return OP_GE;
-                        }
-                    }
-                    return OP_GT;
-                case '<':
-                    if (len > 1) {
-                        switch(value.charAt(1)) {
-                            case '=':
-                                return OP_LE;
-                            case '>':
-                                return OP_NE;
-                        }
-                    }
-                    return OP_LT;
-            }
-            return OP_NONE;
-        }
-        public boolean evaluate(boolean cmpResult) {
-            switch (_code) {
-                case NONE:
-                case EQ:
-                    return cmpResult;
-                case NE:
-                    return !cmpResult;
-            }
-            throw new RuntimeException("Cannot call boolean evaluate on non-equality operator '"
-                    + _representation + "'");
-        }
-        public boolean evaluate(int cmpResult) {
-            switch (_code) {
-                case NONE:
-                case EQ:
-                    return cmpResult == 0;
-                case NE: return cmpResult != 0;
-                case LT: return cmpResult <  0;
-                case LE: return cmpResult <= 0;
-                case GT: return cmpResult >  0;
-                case GE: return cmpResult >= 0;
-            }
-            throw new RuntimeException("Cannot call boolean evaluate on non-equality operator '"
-                    + _representation + "'");
-        }
-        public String toString() {
-            StringBuffer sb = new StringBuffer(64);
-            sb.append(getClass().getName());
-            sb.append(" [").append(_representation).append("]");
-            return sb.toString();
-        }
-        public String getRepresentation() {
-            return _representation;
-        }
-    }
-
-    private static abstract class MatcherBase implements I_MatchPredicate {
-        private final CmpOp _operator;
-
-        MatcherBase(CmpOp operator) {
-            _operator = operator;
-        }
-        protected final int getCode() {
-            return _operator.getCode();
-        }
-        protected final boolean evaluate(int cmpResult) {
-            return _operator.evaluate(cmpResult);
-        }
-        protected final boolean evaluate(boolean cmpResult) {
-            return _operator.evaluate(cmpResult);
-        }
-        @Override
-        public final String toString() {
-            StringBuffer sb = new StringBuffer(64);
-            sb.append(getClass().getName()).append(" [");
-            sb.append(_operator.getRepresentation());
-            sb.append(getValueText());
-            sb.append("]");
-            return sb.toString();
-        }
-        protected abstract String getValueText();
-    }
-
-    private static final class NumberMatcher extends MatcherBase {
-
-        private final double _value;
-
-        public NumberMatcher(double value, CmpOp operator) {
-            super(operator);
-            _value = value;
-        }
-        @Override
-        protected String getValueText() {
-            return String.valueOf(_value);
-        }
-
-        public boolean matches(ValueEval x) {
-            double testValue;
-            if(x instanceof StringEval) {
-                // if the target(x) is a string, but parses as a number
-                // it may still count as a match, only for the equality operator
-                switch (getCode()) {
-                    case CmpOp.EQ:
-                    case CmpOp.NONE:
-                        break;
-                    case CmpOp.NE:
-                        // Always matches (inconsistent with above two cases).
-                        // for example '<>123' matches '123', '4', 'abc', etc
-                        return true;
-                    default:
-                        // never matches (also inconsistent with above three cases).
-                        // for example '>5' does not match '6',
-                        return false;
-                }
-                StringEval se = (StringEval)x;
-                Double val = OperandResolver.parseDouble(se.getStringValue());
-                if(val == null) {
-                    // x is text that is not a number
-                    return false;
-                }
-                return _value == val.doubleValue();
-            } else if((x instanceof NumberEval)) {
-                NumberEval ne = (NumberEval) x;
-                testValue = ne.getNumberValue();
-            } else if((x instanceof BlankEval)) {
-                switch (getCode()) {
-                    case CmpOp.NE:
-                        // Excel counts blank values in range as not equal to any value. See Bugzilla 51498
-                        return true;
-                    default:
-                        return false;
-                }
-            } else {
-                return false;
-            }
-            return evaluate(Double.compare(testValue, _value));
-        }
-    }
-    private static final class BooleanMatcher extends MatcherBase {
-
-        private final int _value;
-
-        public BooleanMatcher(boolean value, CmpOp operator) {
-            super(operator);
-            _value = boolToInt(value);
-        }
-        @Override
-        protected String getValueText() {
-            return _value == 1 ? "TRUE" : "FALSE";
-        }
-
-        private static int boolToInt(boolean value) {
-            return value ? 1 : 0;
-        }
-
-        public boolean matches(ValueEval x) {
-            int testValue;
-            if(x instanceof StringEval) {
-                if (true) { // change to false to observe more intuitive behaviour
-                    // Note - Unlike with numbers, it seems that COUNTIF never matches
-                    // boolean values when the target(x) is a string
-                    return false;
-                }
-                @SuppressWarnings("unused")
-                StringEval se = (StringEval)x;
-                Boolean val = parseBoolean(se.getStringValue());
-                if(val == null) {
-                    // x is text that is not a boolean
-                    return false;
-                }
-                testValue = boolToInt(val.booleanValue());
-            } else if((x instanceof BoolEval)) {
-                BoolEval be = (BoolEval) x;
-                testValue = boolToInt(be.getBooleanValue());
-            } else if((x instanceof BlankEval)) {
-                switch (getCode()) {
-                    case CmpOp.NE:
-                        // Excel counts blank values in range as not equal to any value. See Bugzilla 51498
-                        return true;
-                    default:
-                        return false;
-                }
-            } else if((x instanceof NumberEval)) {
-                switch (getCode()) {
-                    case CmpOp.NE:
-                        // not-equals comparison of a number to boolean always returnes false
-                        return true;
-                    default:
-                        return false;
-                }
-            } else {
-                return false;
-            }
-            return evaluate(testValue - _value);
-        }
-    }
-    public static final class ErrorMatcher extends MatcherBase {
-
-        private final int _value;
-
-        public ErrorMatcher(int errorCode, CmpOp operator) {
-            super(operator);
-            _value = errorCode;
-        }
-        @Override
-        protected String getValueText() {
-            return FormulaError.forInt(_value).getString();
-        }
-
-        public boolean matches(ValueEval x) {
-            if(x instanceof ErrorEval) {
-                int testValue = ((ErrorEval)x).getErrorCode();
-                return evaluate(testValue - _value);
-            }
-            return false;
-        }
-        
-        public int getValue() {
-            return _value;
-        }
-    }
-    public static final class StringMatcher extends MatcherBase {
-
-        private final String _value;
-        private final Pattern _pattern;
-
-        public StringMatcher(String value, CmpOp operator) {
-            super(operator);
-            _value = value;
-            switch(operator.getCode()) {
-                case CmpOp.NONE:
-                case CmpOp.EQ:
-                case CmpOp.NE:
-                    _pattern = getWildCardPattern(value);
-                    break;
-                default:
-                    // pattern matching is never used for < > <= =>
-                    _pattern = null;
-            }
-        }
-        @Override
-        protected String getValueText() {
-            if (_pattern == null) {
-                return _value;
-            }
-            return _pattern.pattern();
-        }
-
-        public boolean matches(ValueEval x) {
-            if (x instanceof BlankEval) {
-                switch(getCode()) {
-                    case CmpOp.NONE:
-                    case CmpOp.EQ:
-                        return _value.length() == 0;
-                    case CmpOp.NE:
-                        // pred '<>' matches empty string but not blank cell
-                        // pred '<>ABC'  matches blank and 'not ABC'
-                        return _value.length() != 0;
-                }
-                // no other criteria matches a blank cell
-                return false;
-            }
-            if(!(x instanceof StringEval)) {
-                // must always be string
-                // even if match str is wild, but contains only digits
-                // e.g. '4*7', NumberEval(4567) does not match
-                return false;
-            }
-            String testedValue = ((StringEval) x).getStringValue();
-            if (testedValue.length() < 1 && _value.length() < 1) {
-                // odd case: criteria '=' behaves differently to criteria ''
-
-                switch(getCode()) {
-                    case CmpOp.NONE: return true;
-                    case CmpOp.EQ:   return false;
-                    case CmpOp.NE:   return true;
-                }
-                return false;
-            }
-            if (_pattern != null) {
-                return evaluate(_pattern.matcher(testedValue).matches());
-            }
-            // String criteria in COUNTIF are case insensitive:
-            // for example, the string "apples" and the string "APPLES" will match the same cells.
-            return evaluate(testedValue.compareToIgnoreCase(_value));
-        }
-        /**
-         * Translates Excel countif wildcard strings into java regex strings
-         * @return <code>null</code> if the specified value contains no special wildcard characters.
-         */
-        public static Pattern getWildCardPattern(String value) {
-            int len = value.length();
-            StringBuffer sb = new StringBuffer(len);
-            boolean hasWildCard = false;
-            for(int i=0; i<len; i++) {
-                char ch = value.charAt(i);
-                switch(ch) {
-                    case '?':  //Any single character
-                        hasWildCard = true;
-                        // match exactly one character
-                        sb.append('.');
-                        continue;
-                    case '*': //Zero or more characters
-                        hasWildCard = true;
-                        // match one or more occurrences of any character
-                        sb.append(".*");
-                        continue;
-                    case '~':
-                        if (i+1<len) {
-                            ch = value.charAt(i+1);
-                            switch (ch) {
-                                case '?':
-                                case '*':
-                                    hasWildCard = true;
-                                    sb.append('[').append(ch).append(']');
-                                    i++; // Note - incrementing loop variable here
-                                    continue;
-                            }
-                        }
-                        // else not '~?' or '~*'
-                        sb.append('~'); // just plain '~'
-                        continue;
-                    case '.':
-                    case '$':
-                    case '^':
-                    case '[':
-                    case ']':
-                    case '(':
-                    case ')':
-                        // escape literal characters that would have special meaning in regex
-                        sb.append("\\").append(ch);
-                        continue;
-                }
-                sb.append(ch);
-            }
-            if (hasWildCard) {
-                return Pattern.compile(sb.toString(), Pattern.CASE_INSENSITIVE);
-            }
-            return null;
-        }
-    }
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-
-        I_MatchPredicate mp = createCriteriaPredicate(arg1, srcRowIndex, srcColumnIndex);
-        if(mp == null) {
-            // If the criteria arg is a reference to a blank cell, countif always returns zero.
-            return NumberEval.ZERO;
-        }
-        double result = countMatchingCellsInArea(arg0, mp);
-        return new NumberEval(result);
-    }
-    /**
-     * @return the number of evaluated cells in the range that match the specified criteria
-     */
-    private double countMatchingCellsInArea(ValueEval rangeArg, I_MatchPredicate criteriaPredicate) {
-
-        if (rangeArg instanceof RefEval) {
-            return CountUtils.countMatchingCellsInRef((RefEval) rangeArg, criteriaPredicate);
-        } else if (rangeArg instanceof ThreeDEval) {
-            return CountUtils.countMatchingCellsInArea((ThreeDEval) rangeArg, criteriaPredicate);
-        } else {
-            throw new IllegalArgumentException("Bad range arg type (" + rangeArg.getClass().getName() + ")");
-        }
-    }
-
-    /**
-     * Creates a criteria predicate object for the supplied criteria arg
-     * @return <code>null</code> if the arg evaluates to blank.
-     */
-    /* package */ static I_MatchPredicate createCriteriaPredicate(ValueEval arg, int srcRowIndex, int srcColumnIndex) {
-
-        ValueEval evaluatedCriteriaArg = evaluateCriteriaArg(arg, srcRowIndex, srcColumnIndex);
-
-        if(evaluatedCriteriaArg instanceof NumberEval) {
-            return new NumberMatcher(((NumberEval)evaluatedCriteriaArg).getNumberValue(), CmpOp.OP_NONE);
-        }
-        if(evaluatedCriteriaArg instanceof BoolEval) {
-            return new BooleanMatcher(((BoolEval)evaluatedCriteriaArg).getBooleanValue(), CmpOp.OP_NONE);
-        }
-
-        if(evaluatedCriteriaArg instanceof StringEval) {
-            return createGeneralMatchPredicate((StringEval)evaluatedCriteriaArg);
-        }
-        if(evaluatedCriteriaArg instanceof ErrorEval) {
-            return new ErrorMatcher(((ErrorEval)evaluatedCriteriaArg).getErrorCode(), CmpOp.OP_NONE);
-        }
-        if(evaluatedCriteriaArg == BlankEval.instance) {
-            return null;
-        }
-        throw new RuntimeException("Unexpected type for criteria ("
-                + evaluatedCriteriaArg.getClass().getName() + ")");
-    }
-
-    /**
-     *
-     * @return the de-referenced criteria arg (possibly {@link ErrorEval})
-     */
-    private static ValueEval evaluateCriteriaArg(ValueEval arg, int srcRowIndex, int srcColumnIndex) {
-        try {
-            return OperandResolver.getSingleValue(arg, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-    /**
-     * When the second argument is a string, many things are possible
-     */
-    private static I_MatchPredicate createGeneralMatchPredicate(StringEval stringEval) {
-        String value = stringEval.getStringValue();
-        CmpOp operator = CmpOp.getOperator(value);
-        value = value.substring(operator.getLength());
-
-        Boolean booleanVal = parseBoolean(value);
-        if(booleanVal != null) {
-            return new BooleanMatcher(booleanVal.booleanValue(), operator);
-        }
-
-        Double doubleVal = OperandResolver.parseDouble(value);
-        if(doubleVal != null) {
-            return new NumberMatcher(doubleVal.doubleValue(), operator);
-        }
-        ErrorEval ee = parseError(value);
-        if (ee != null) {
-            return new ErrorMatcher(ee.getErrorCode(), operator);
-        }
-
-        //else - just a plain string with no interpretation.
-        return new StringMatcher(value, operator);
-    }
-    private static ErrorEval parseError(String value) {
-        if (value.length() < 4 || value.charAt(0) != '#') {
-            return null;
-        }
-        if (value.equals("#NULL!"))  return ErrorEval.NULL_INTERSECTION;
-        if (value.equals("#DIV/0!")) return ErrorEval.DIV_ZERO;
-        if (value.equals("#VALUE!")) return ErrorEval.VALUE_INVALID;
-        if (value.equals("#REF!"))   return ErrorEval.REF_INVALID;
-        if (value.equals("#NAME?"))  return ErrorEval.NAME_INVALID;
-        if (value.equals("#NUM!"))   return ErrorEval.NUM_ERROR;
-        if (value.equals("#N/A"))    return ErrorEval.NA;
-
-        return null;
-    }
-    /**
-     * Boolean literals ('TRUE', 'FALSE') treated similarly but NOT same as numbers.
-     * @return <code>null</code> to represent blank values
-     */
-    /* package */ static Boolean parseBoolean(String strRep) {
-        if (strRep.length() < 1) {
-            return null;
-        }
-        switch(strRep.charAt(0)) {
-            case 't':
-            case 'T':
-                if("TRUE".equalsIgnoreCase(strRep)) {
-                    return Boolean.TRUE;
-                }
-                break;
-            case 'f':
-            case 'F':
-                if("FALSE".equalsIgnoreCase(strRep)) {
-                    return Boolean.FALSE;
-                }
-                break;
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Countifs.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Countifs.java
deleted file mode 100644
index 15e6a15..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Countifs.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for the function COUNTIFS
- * <p>
- * Syntax: COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2])
- * </p>
- */
-
-public class Countifs implements FreeRefFunction {
-    public static final FreeRefFunction instance = new Countifs();
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        // https://support.office.com/en-us/article/COUNTIFS-function-dda3dc6e-f74e-4aee-88bc-aa8c2a866842?ui=en-US&rs=en-US&ad=US
-        // COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]...)
-        // need at least 2 arguments and need to have an even number of arguments (criteria_range1, criteria1 plus x*(criteria_range, criteria))
-        if (args.length < 2 || args.length % 2 != 0) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        
-        Double result = null;
-        // for each (criteria_range, criteria) pair
-        for (int i = 0; i < args.length; i += 2) {
-            ValueEval firstArg = args[i];
-            ValueEval secondArg = args[i + 1];
-            NumberEval evaluate = (NumberEval) new Countif().evaluate(
-                    new ValueEval[] {firstArg, secondArg},
-                    ec.getRowIndex(),
-                    ec.getColumnIndex());
-            if (result == null) {
-                result = evaluate.getNumberValue();
-            } else if (evaluate.getNumberValue() < result) {
-                result = evaluate.getNumberValue();
-            }
-        }
-        return new NumberEval(result == null ? 0 : result);
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java b/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java
deleted file mode 100644
index 0bf9cc2..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation of the DGet function:
- * Finds the value of a column in an area with given conditions.
- */
-public final class DGet implements IDStarAlgorithm {
-    private ValueEval result;
-
-    @Override
-    public boolean processMatch(ValueEval eval) {
-        if(result == null) // First match, just set the value.
-        {
-            result = eval;
-        }
-        else // There was a previous match, since there is only exactly one allowed, bail out.
-        {
-            result = ErrorEval.NUM_ERROR;
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public ValueEval getResult() {
-        if(result == null) {
-            return ErrorEval.VALUE_INVALID;
-        } else if(result instanceof BlankEval) {
-            return ErrorEval.VALUE_INVALID;
-        } else
-            try {
-                if(OperandResolver.coerceValueToString(OperandResolver.getSingleValue(result, 0, 0)).equals("")) {
-                    return ErrorEval.VALUE_INVALID;
-                }
-                else {
-                    return result;
-                }
-            } catch (EvaluationException e) {
-                return e.getErrorEval();
-            }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/DMin.java b/trunk/src/java/org/apache/poi/ss/formula/functions/DMin.java
deleted file mode 100644
index 61b7576..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/DMin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation of the DMin function:
- * Finds the minimum value of a column in an area with given conditions.
- * 
- * TODO:
- * - wildcards ? and * in string conditions
- * - functions as conditions
- */
-public final class DMin implements IDStarAlgorithm {
-    private ValueEval minimumValue;
-
-    @Override
-    public boolean processMatch(ValueEval eval) {
-        if(eval instanceof NumericValueEval) {
-            if(minimumValue == null) { // First match, just set the value.
-                minimumValue = eval;
-            } else { // There was a previous match, find the new minimum.
-                double currentValue = ((NumericValueEval)eval).getNumberValue();
-                double oldValue = ((NumericValueEval)minimumValue).getNumberValue();
-                if(currentValue < oldValue) {
-                    minimumValue = eval;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public ValueEval getResult() {
-        if(minimumValue == null) {
-            return NumberEval.ZERO;
-        } else {
-            return minimumValue;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java b/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
deleted file mode 100644
index 8418c4f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.StringValueEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.util.NumberComparer;
-
-/**
- * This class performs a D* calculation. It takes an {@link IDStarAlgorithm} object and
- * uses it for calculating the result value. Iterating a database and checking the
- * entries against the set of conditions is done here.
- *
- * TODO:
- * - wildcards ? and * in string conditions
- * - functions as conditions
- */
-public final class DStarRunner implements Function3Arg {
-    public enum DStarAlgorithmEnum {
-        DGET,
-        DMIN,
-        // DMAX, // DMAX is not yet implemented
-    }
-    private final DStarAlgorithmEnum algoType;
-
-    public DStarRunner(DStarAlgorithmEnum algorithm) {
-        this.algoType = algorithm;
-    }
-
-    public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-        if(args.length == 3) {
-            return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2]);
-        }
-        else {
-            return ErrorEval.VALUE_INVALID;
-        }
-    }
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex,
-            ValueEval database, ValueEval filterColumn, ValueEval conditionDatabase) {
-        // Input processing and error checks.
-        if(!(database instanceof AreaEval) || !(conditionDatabase instanceof AreaEval)) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        AreaEval db = (AreaEval)database;
-        AreaEval cdb = (AreaEval)conditionDatabase;
-        
-        try {
-            filterColumn = OperandResolver.getSingleValue(filterColumn, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-
-        int fc;
-        try {
-            fc = getColumnForName(filterColumn, db);
-        }
-        catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        if(fc == -1) { // column not found
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        // Create an algorithm runner.
-        IDStarAlgorithm algorithm = null;
-        switch(algoType) {
-            case DGET: algorithm = new DGet(); break;
-            case DMIN: algorithm = new DMin(); break;
-            default:
-                throw new IllegalStateException("Unexpected algorithm type " + algoType + " encountered.");
-        }
-
-        // Iterate over all DB entries.
-        final int height = db.getHeight();
-        for(int row = 1; row < height; ++row) {
-            boolean matches = true;
-            try {
-                matches = fullfillsConditions(db, row, cdb);
-            }
-            catch (EvaluationException e) {
-                return ErrorEval.VALUE_INVALID;
-            }
-            // Filter each entry.
-            if(matches) {
-                ValueEval currentValueEval = resolveReference(db, row, fc);
-                // Pass the match to the algorithm and conditionally abort the search.
-                boolean shouldContinue = algorithm.processMatch(currentValueEval);
-                if(! shouldContinue) {
-                    break;
-                }
-            }
-        }
-
-        // Return the result of the algorithm.
-        return algorithm.getResult();
-    }
-
-    private enum operator {
-        largerThan,
-        largerEqualThan,
-        smallerThan,
-        smallerEqualThan,
-        equal
-    }
-
-    /**
-     * 
-     *
-     * @param nameValueEval Must not be a RefEval or AreaEval. Thus make sure resolveReference() is called on the value first!
-     * @param db Database
-     * @return Corresponding column number.
-     * @throws EvaluationException
-     */
-    private static int getColumnForName(ValueEval nameValueEval, AreaEval db)
-            throws EvaluationException {
-        String name = OperandResolver.coerceValueToString(nameValueEval);
-        return getColumnForString(db, name);
-    }
-
-    /**
-     * For a given database returns the column number for a column heading.
-     *
-     * @param db Database.
-     * @param name Column heading.
-     * @return Corresponding column number.
-     * @throws EvaluationException If it's not possible to turn all headings into strings.
-     */
-    private static int getColumnForString(AreaEval db,String name)
-            throws EvaluationException {
-        int resultColumn = -1;
-        final int width = db.getWidth();
-        for(int column = 0; column < width; ++column) {
-            ValueEval columnNameValueEval = resolveReference(db, 0, column);
-            if(columnNameValueEval instanceof BlankEval) {
-                continue;
-            }
-            if(columnNameValueEval instanceof ErrorEval) {
-                continue;
-            }
-            String columnName = OperandResolver.coerceValueToString(columnNameValueEval);
-            if(name.equals(columnName)) {
-                resultColumn = column;
-                break;
-            }
-        }
-        return resultColumn;
-    }
-
-    /**
-     * Checks a row in a database against a condition database.
-     *
-     * @param db Database.
-     * @param row The row in the database to check.
-     * @param cdb The condition database to use for checking.
-     * @return Whether the row matches the conditions.
-     * @throws EvaluationException If references could not be resolved or comparison
-     * operators and operands didn't match.
-     */
-    private static boolean fullfillsConditions(AreaEval db, int row, AreaEval cdb)
-            throws EvaluationException {
-        // Only one row must match to accept the input, so rows are ORed.
-        // Each row is made up of cells where each cell is a condition,
-        // all have to match, so they are ANDed.
-        final int height = cdb.getHeight();
-        for(int conditionRow = 1; conditionRow < height; ++conditionRow) {
-            boolean matches = true;
-            final int width = cdb.getWidth();
-            for(int column = 0; column < width; ++column) { // columns are ANDed
-                // Whether the condition column matches a database column, if not it's a
-                // special column that accepts formulas.
-                boolean columnCondition = true;
-                ValueEval condition = null;
-                
-                // The condition to apply.
-                condition = resolveReference(cdb, conditionRow, column);
-                
-                // If the condition is empty it matches.
-                if(condition instanceof BlankEval)
-                    continue;
-                // The column in the DB to apply the condition to.
-                ValueEval targetHeader = resolveReference(cdb, 0, column);
-
-                if(!(targetHeader instanceof StringValueEval)) {
-                    throw new EvaluationException(ErrorEval.VALUE_INVALID);
-                }
-                
-                if (getColumnForName(targetHeader, db) == -1)
-                    // No column found, it's again a special column that accepts formulas.
-                    columnCondition = false;
-
-                if(columnCondition == true) { // normal column condition
-                    // Should not throw, checked above.
-                    ValueEval value = resolveReference(db, row, getColumnForName(targetHeader, db));
-                    if(!testNormalCondition(value, condition)) {
-                        matches = false;
-                        break;
-                    }
-                } else { // It's a special formula condition.
-                    // TODO: Check whether the condition cell contains a formula and return #VALUE! if it doesn't.
-                    if(OperandResolver.coerceValueToString(condition).isEmpty()) {
-                        throw new EvaluationException(ErrorEval.VALUE_INVALID);
-                    }
-                    throw new NotImplementedException(
-                            "D* function with formula conditions");
-                }
-            }
-            if (matches == true) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Test a value against a simple (< > <= >= = starts-with) condition string.
-     *
-     * @param value The value to check.
-     * @param condition The condition to check for.
-     * @return Whether the condition holds.
-     * @throws EvaluationException If comparison operator and operands don't match.
-     */
-    private static boolean testNormalCondition(ValueEval value, ValueEval condition)
-            throws EvaluationException {
-        if(condition instanceof StringEval) {
-            String conditionString = ((StringEval)condition).getStringValue();
-        
-            if(conditionString.startsWith("<")) { // It's a </<= condition.
-                String number = conditionString.substring(1);
-                if(number.startsWith("=")) {
-                    number = number.substring(1);
-                    return testNumericCondition(value, operator.smallerEqualThan, number);
-                } else {
-                    return testNumericCondition(value, operator.smallerThan, number);
-                }
-            }
-            else if(conditionString.startsWith(">")) { // It's a >/>= condition.
-                String number = conditionString.substring(1);
-                if(number.startsWith("=")) {
-                    number = number.substring(1);
-                    return testNumericCondition(value, operator.largerEqualThan, number);
-                } else {
-                    return testNumericCondition(value, operator.largerThan, number);
-                }
-            }
-            else if(conditionString.startsWith("=")) { // It's a = condition.
-                String stringOrNumber = conditionString.substring(1);
-
-                if(stringOrNumber.isEmpty()) {
-                    return value instanceof BlankEval;
-                }
-                // Distinguish between string and number.
-                boolean itsANumber = false;
-                try {
-                    Integer.parseInt(stringOrNumber);
-                    itsANumber = true;
-                } catch (NumberFormatException e) { // It's not an int.
-                    try {
-                        Double.parseDouble(stringOrNumber);
-                        itsANumber = true;
-                    } catch (NumberFormatException e2) { // It's a string.
-                        itsANumber = false;
-                    }
-                }
-                if(itsANumber) {
-                    return testNumericCondition(value, operator.equal, stringOrNumber);
-                } else { // It's a string.
-                    String valueString = value instanceof BlankEval ? "" : OperandResolver.coerceValueToString(value);
-                    return stringOrNumber.equals(valueString);
-                }
-            } else { // It's a text starts-with condition.
-                if(conditionString.isEmpty()) {
-                    return value instanceof StringEval;
-                }
-                else {
-                    String valueString = value instanceof BlankEval ? "" : OperandResolver.coerceValueToString(value);
-                    return valueString.startsWith(conditionString);
-                }
-            }
-        }
-        else if(condition instanceof NumericValueEval) {
-            double conditionNumber = ((NumericValueEval)condition).getNumberValue();
-            Double valueNumber = getNumberFromValueEval(value);
-            if(valueNumber == null) {
-                return false;
-            }
-            
-            return conditionNumber == valueNumber;
-        }
-        else if(condition instanceof ErrorEval) {
-            if(value instanceof ErrorEval) {
-                return ((ErrorEval)condition).getErrorCode() == ((ErrorEval)value).getErrorCode();
-            }
-            else {
-                return false;
-            }
-        }
-        else {
-            return false;
-        }
-    }
-
-    /**
-     * Test whether a value matches a numeric condition.
-     * @param valueEval Value to check.
-     * @param op Comparator to use.
-     * @param condition Value to check against.
-     * @return whether the condition holds.
-     * @throws EvaluationException If it's impossible to turn the condition into a number.
-     */
-    private static boolean testNumericCondition(
-            ValueEval valueEval, operator op, String condition)
-            throws EvaluationException {
-        // Construct double from ValueEval.
-        if(!(valueEval instanceof NumericValueEval))
-            return false;
-        double value = ((NumericValueEval)valueEval).getNumberValue();
-
-        // Construct double from condition.
-        double conditionValue = 0.0;
-        try {
-            int intValue = Integer.parseInt(condition);
-            conditionValue = intValue;
-        } catch (NumberFormatException e) { // It's not an int.
-            try {
-                conditionValue = Double.parseDouble(condition);
-            } catch (NumberFormatException e2) { // It's not a double.
-                throw new EvaluationException(ErrorEval.VALUE_INVALID);
-            }
-        }
-
-        int result = NumberComparer.compare(value, conditionValue);
-        switch(op) {
-        case largerThan:
-            return result > 0;
-        case largerEqualThan:
-            return result >= 0;
-        case smallerThan:
-            return result < 0;
-        case smallerEqualThan:
-            return result <= 0;
-        case equal:
-            return result == 0;
-        }
-        return false; // Can not be reached.
-    }
-    
-    private static Double getNumberFromValueEval(ValueEval value) {
-        if(value instanceof NumericValueEval) {
-            return ((NumericValueEval)value).getNumberValue();
-        }
-        else if(value instanceof StringValueEval) {
-            String stringValue = ((StringValueEval)value).getStringValue();
-            try {
-                return Double.parseDouble(stringValue);
-            } catch (NumberFormatException e2) {
-                return null;
-            }
-        }
-        else {
-            return null;
-        }
-    }
-    
-    /**
-     * Resolve a ValueEval that's in an AreaEval.
-     *
-     * @param db AreaEval from which the cell to resolve is retrieved. 
-     * @param dbRow Relative row in the AreaEval.
-     * @param dbCol Relative column in the AreaEval.
-     * @return A ValueEval that is a NumberEval, StringEval, BoolEval, BlankEval or ErrorEval.
-     */
-    private static ValueEval resolveReference(AreaEval db, int dbRow, int dbCol) {
-        try {
-            return OperandResolver.getSingleValue(db.getValue(dbRow, dbCol), db.getFirstRow()+dbRow, db.getFirstColumn()+dbCol);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/DateFunc.java b/trunk/src/java/org/apache/poi/ss/formula/functions/DateFunc.java
deleted file mode 100644
index 7068bea..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/DateFunc.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-
-/**
- * Implementation for the Excel function DATE
- */
-public final class DateFunc extends Fixed3ArgFunction {
-	public static final Function instance = new DateFunc();
-
-	private DateFunc() {
-		// no fields to initialise
-	}
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		double result;
-		try {
-			double d0 = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-			double d1 = NumericFunction.singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-			double d2 = NumericFunction.singleOperandEvaluate(arg2, srcRowIndex, srcColumnIndex);
-			result = evaluate(getYear(d0), (int) (d1 - 1), (int) d2);
-			NumericFunction.checkValue(result);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new NumberEval(result);
-	}
-
-	/**
-	 * Note - works with Java Calendar months, not Excel months
-	 */
-	private static double evaluate(int year, int month, int pDay) throws EvaluationException {
-	   // We don't support negative years yet
-		if (year < 0) {
-			throw new EvaluationException(ErrorEval.VALUE_INVALID);
-		}
-		// Negative months are fairly easy
-		while (month < 0) {
-		   year--;
-		   month += 12;
-		}
-		// Negative days are handled by the Java Calendar
-		
-		// Excel has bugs around leap years in 1900, handle them
-		// Special case for the non-existant 1900 leap year
-		if (year == 1900 && month == Calendar.FEBRUARY && pDay == 29) {
-			return 60.0;
-		}
-
-		// If they give a date in 1900 in Jan/Feb, with the days
-		//  putting it past the leap year, adjust
-		int day = pDay;
-		if (year == 1900) {
-			if ((month == Calendar.JANUARY && day >= 60) ||
-					(month == Calendar.FEBRUARY && day >= 30)) {
-				day--;
-			}
-		}
-
-		// Turn this into a Java date
-		Calendar c = LocaleUtil.getLocaleCalendar(year, month, day);
-		
-		// Handle negative days of the week, that pull us across
-		//  the 29th of Feb 1900
-		if (pDay < 0 && c.get(Calendar.YEAR) == 1900 &&
-		      month > Calendar.FEBRUARY && 
-		      c.get(Calendar.MONTH) < Calendar.MARCH) {
-		   c.add(Calendar.DATE, 1);
-		}
-
-		// TODO Identify if we're doing 1900 or 1904 date windowing
-		boolean use1904windowing = false;
-		
-		// Have this Java date turned back into an Excel one
-		return DateUtil.getExcelDate(c.getTime(), use1904windowing);
-	}
-
-	private static int getYear(double d) {
-		int year = (int)d;
-
-		if (year < 0) {
-			return -1;
-		}
-
-		return year < 1900 ? 1900 + year : year;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Days360.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Days360.java
deleted file mode 100644
index 087e16b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Days360.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * <p>Calculates the number of days between two dates based on a 360-day year
- * (twelve 30-day months), which is used in some accounting calculations. Use
- * this function to help compute payments if your accounting system is based on
- * twelve 30-day months.<p>
- * 
- * {@code DAYS360(start_date,end_date,[method])}
- * 
- * <ul>
- * <li>Start_date, end_date (required):<br/>
- * The two dates between which you want to know the number of days.<br/>
- * If start_date occurs after end_date, the DAYS360 function returns a negative number.</li>
- * 
- * <li>Method (optional):<br/>
- * A logical value that specifies whether to use the U.S. or European method in the calculation</li>
- * 
- * <li>Method set to false or omitted:<br/>
- * the DAYS360 function uses the U.S. (NASD) method. If the starting date is the 31st of a month,
- * it becomes equal to the 30th of the same month. If the ending date is the 31st of a month and
- * the starting date is earlier than the 30th of a month, the ending date becomes equal to the
- * 1st of the next month, otherwise the ending date becomes equal to the 30th of the same month.
- * The month February and leap years are handled in the following way:<br/>
- * On a non-leap year the function {@code =DAYS360("2/28/93", "3/1/93", FALSE)} returns 1 day
- * because the DAYS360 function ignores the extra days added to February.<br/>
- * On a leap year the function {@code =DAYS360("2/29/96","3/1/96", FALSE)} returns 1 day for
- * the same reason.</li>
- * 
- * <li>Method Set to true:<br/>
- * When you set the method parameter to TRUE, the DAYS360 function uses the European method.
- * Starting dates or ending dates that occur on the 31st of a month become equal to the 30th of
- * the same month. The month February and leap years are handled in the following way:<br/>
- * On a non-leap year the function {@code =DAYS360("2/28/93", "3/1/93", TRUE)} returns
- * 3 days because the DAYS360 function is counting the extra days added to February to give
- * February 30 days.<br/>
- * On a leap year the function {@code =DAYS360("2/29/96", "3/1/96", TRUE)} returns
- * 2 days for the same reason.</li>
- * </ul>
- * 
- * @see <a href="https://support.microsoft.com/en-us/kb/235575">DAYS360 Function Produces Different Values Depending on the Version of Excel</a>
- */
-public class Days360 extends Var2or3ArgFunction {
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-        try {
-            double d0 = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-            double d1 = NumericFunction.singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-            return new NumberEval(evaluate(d0, d1, false));
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-            ValueEval arg2) {
-        try {
-            double d0 = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-            double d1 = NumericFunction.singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-            ValueEval ve = OperandResolver.getSingleValue(arg2, srcRowIndex, srcColumnIndex);
-            Boolean method = OperandResolver.coerceValueToBoolean(ve, false);
-            return new NumberEval(evaluate(d0, d1, method != null && method.booleanValue()));
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-
-    private static double evaluate(double d0, double d1, boolean method) {
-        Calendar realStart = getDate(d0);
-        Calendar realEnd = getDate(d1);
-        int startingDate[] = getStartingDate(realStart, method);
-        int endingDate[] = getEndingDate(realEnd, startingDate, method);
-        return
-            (endingDate[0]*360+endingDate[1]*30+endingDate[2])-
-            (startingDate[0]*360+startingDate[1]*30+startingDate[2]);
-    }
-
-    private static Calendar getDate(double date) {
-        Calendar processedDate = LocaleUtil.getLocaleCalendar();
-        processedDate.setTime(DateUtil.getJavaDate(date, false));
-        return processedDate;
-    }
-
-    private static int[] getStartingDate(Calendar realStart, boolean method) {
-        int yyyy = realStart.get(Calendar.YEAR);
-        int mm = realStart.get(Calendar.MONTH);
-        int dd = Math.min(30, realStart.get(Calendar.DAY_OF_MONTH));
-        
-        if (!method && isLastDayOfMonth(realStart)) dd = 30;
-        
-        return new int[]{yyyy,mm,dd};
-    }
-
-    private static int[] getEndingDate(Calendar realEnd, int startingDate[], boolean method) {
-        int yyyy = realEnd.get(Calendar.YEAR);
-        int mm = realEnd.get(Calendar.MONTH);
-        int dd = Math.min(30, realEnd.get(Calendar.DAY_OF_MONTH));
-
-        if (!method && realEnd.get(Calendar.DAY_OF_MONTH) == 31) {
-            if (startingDate[2] < 30) {
-                realEnd.set(Calendar.DAY_OF_MONTH, 1);
-                realEnd.add(Calendar.MONTH, 1);
-                yyyy = realEnd.get(Calendar.YEAR);
-                mm = realEnd.get(Calendar.MONTH);
-                dd = 1;
-            } else {
-                dd = 30;
-            }
-        }
-
-        return new int[]{yyyy,mm,dd};
-    }
-    
-    private static boolean isLastDayOfMonth(Calendar date) {
-        int dayOfMonth = date.get(Calendar.DAY_OF_MONTH);
-        int lastDayOfMonth = date.getActualMaximum(Calendar.DAY_OF_MONTH);
-        return (dayOfMonth == lastDayOfMonth);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
deleted file mode 100644
index 21d8bcf..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for Excel Bin2Dec() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>Bin2Dec  </b>(<b>number</b>,<b>[places]</b> )<br/>
- * <p/>
- * Converts a decimal number to binary.
- * <p/>
- * The DEC2BIN function syntax has the following arguments:
- * <ul>
- * <li>Number    Required. The decimal integer you want to convert. If number is negative, valid place values are ignored and DEC2BIN returns a 10-character (10-bit) binary number in which the most significant bit is the sign bit. The remaining 9 bits are magnitude bits. Negative numbers are represented using two's-complement notation.</li>
- * <li>Places    Optional. The number of characters to use. If places is omitted, DEC2BIN uses the minimum number of characters necessary. Places is useful for padding the return value with leading 0s (zeros).</li>
- * </ul>
- * <p/>
- * Remarks
- * <ul>
- * <li>If number < -512 or if number > 511, DEC2BIN returns the #NUM! error value.</li>
- * <li>If number is nonnumeric, DEC2BIN returns the #VALUE! error value.</li>
- * <li>If DEC2BIN requires more than places characters, it returns the #NUM! error value.</li>
- * <li>If places is not an integer, it is truncated.</li>
- * <li>If places is nonnumeric, DEC2BIN returns the #VALUE! error value.</li>
- * <li>If places is zero or negative, DEC2BIN returns the #NUM! error value.</li>
- * </ul>
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Dec2Bin extends Var1or2ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Dec2Bin();
-
-    private final static long MIN_VALUE = -512;
-    private final static long MAX_VALUE =  511;
-    private final static int DEFAULT_PLACES_VALUE = 10;
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE, ValueEval placesVE) {
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(numberVE, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        String strText1 = OperandResolver.coerceValueToString(veText1);
-        Double number = OperandResolver.parseDouble(strText1);
-
-        //If this number argument is non numeric, this function returns the #VALUE! error value.
-        if (number == null) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        //If number < -512 or if number > 512, this function returns the #NUM! error value.
-        if (number.longValue() < MIN_VALUE || number.longValue() > MAX_VALUE) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        int placesNumber;
-        if (number < 0 || placesVE == null) {
-            placesNumber = DEFAULT_PLACES_VALUE;
-        } else {
-            ValueEval placesValueEval;
-            try {
-                placesValueEval = OperandResolver.getSingleValue(placesVE, srcRowIndex, srcColumnIndex);
-            } catch (EvaluationException e) {
-                return e.getErrorEval();
-            }
-            String placesStr = OperandResolver.coerceValueToString(placesValueEval);
-            Double placesNumberDouble = OperandResolver.parseDouble(placesStr);
-
-            //non numeric value
-            if (placesNumberDouble == null) {
-                return ErrorEval.VALUE_INVALID;
-            }
-
-            //If this argument contains a decimal value, this function ignores the numbers to the right side of the decimal point.
-            placesNumber = placesNumberDouble.intValue();
-
-            if (placesNumber < 0 || placesNumber == 0) {
-                return ErrorEval.NUM_ERROR;
-            }
-        }
-        String binary = Integer.toBinaryString(number.intValue());
-
-        if (binary.length() > DEFAULT_PLACES_VALUE) {
-            binary = binary.substring(binary.length() - DEFAULT_PLACES_VALUE, binary.length());
-        }
-        //If DEC2BIN requires more than places characters, it returns the #NUM! error value.
-        if (binary.length() > placesNumber) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        return new StringEval(binary);
-    }
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
-        return this.evaluate(srcRowIndex, srcColumnIndex, numberVE, null);
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length == 1) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-        }
-        if (args.length == 2) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
-        }
-
-        return ErrorEval.VALUE_INVALID;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
deleted file mode 100644
index 6318f98..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Locale;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * Implementation for Excel DELTA() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>DEC2HEX  </b>(<b>number</b>,<b>places</b> )<br/>
- * <p/>
- * Converts a decimal number to hexadecimal.
- *
- * The decimal integer you want to convert. If number is negative, places is ignored
- * and this function returns a 10-character (40-bit) hexadecimal number in which the
- * most significant bit is the sign bit. The remaining 39 bits are magnitude bits.
- * Negative numbers are represented using two's-complement notation.
- *
- * <ul>
- * <li>If number < -549,755,813,888 or if number > 549,755,813,887, this function returns the #NUM! error value.</li>
- * <li>If number is nonnumeric, this function returns the #VALUE! error value.</li>
- * </ul>
- *
- * <h2>places</h2>
- *
- * The number of characters to use. The places argument is useful for padding the
- * return value with leading 0s (zeros).
- *
- * <ul>
- * <li>If this argument is omitted, this function uses the minimum number of characters necessary.</li>
- * <li>If this function requires more than places characters, it returns the #NUM! error value.</li>
- * <li>If this argument is non numeric, this function returns the #VALUE! error value.</li>
- * <li>If this argument is negative, this function returns the #NUM! error value.</li>
- * <li>If this argument contains a decimal value, this function ignores the numbers to the right side of the decimal point.</li>
- * </ul>
- */
-public final class Dec2Hex extends Var1or2ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Dec2Hex();
-
-    private final static long MIN_VALUE = Long.parseLong("-549755813888");
-    private final static long MAX_VALUE = Long.parseLong("549755813887");
-    private final static int DEFAULT_PLACES_VALUE = 10;
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval number, ValueEval places) {
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(number, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        String strText1 = OperandResolver.coerceValueToString(veText1);
-        Double number1 = OperandResolver.parseDouble(strText1);
-
-        //If this number argument is non numeric, this function returns the #VALUE! error value.
-        if (number1 == null) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        //If number < -549,755,813,888 or if number > 549,755,813,887, this function returns the #NUM! error value.
-        if (number1.longValue() < MIN_VALUE || number1.longValue() > MAX_VALUE)  {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        int placesNumber = 0;
-        if (number1 < 0) {
-            placesNumber = DEFAULT_PLACES_VALUE;
-        }
-        else if (places != null) {
-            ValueEval placesValueEval;
-            try {
-                placesValueEval = OperandResolver.getSingleValue(places, srcRowIndex, srcColumnIndex);
-            } catch (EvaluationException e) {
-                return e.getErrorEval();
-            }
-            String placesStr = OperandResolver.coerceValueToString(placesValueEval);
-            Double placesNumberDouble = OperandResolver.parseDouble(placesStr);
-
-            //non numeric value
-            if (placesNumberDouble == null) {
-                return ErrorEval.VALUE_INVALID;
-            }
-
-            //If this argument contains a decimal value, this function ignores the numbers to the right side of the decimal point.
-            placesNumber = placesNumberDouble.intValue();
-
-            if (placesNumber < 0)  {
-                return ErrorEval.NUM_ERROR;
-            }
-        }
-
-        String hex;
-        if (placesNumber != 0) {
-            hex = String.format(Locale.ROOT, "%0"+placesNumber+"X", number1.intValue());
-        }
-        else {
-            hex = Long.toHexString(number1.longValue());
-        }
-
-        if (number1 < 0) {
-            hex =  "FF"+  hex.substring(2);
-        }
-
-        return new StringEval(hex.toUpperCase(Locale.ROOT));
-    }
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-        return this.evaluate(srcRowIndex, srcColumnIndex, arg0, null);
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length == 1) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-        }
-        if (args.length == 2) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
-        }
-        return ErrorEval.VALUE_INVALID;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java
deleted file mode 100644
index 2f1bd88..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
-import java.math.BigDecimal;
-
-/**
- * Implementation for Excel DELTA() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>DELTA </b>(<b>number1</b>,<b>number2</b> )<br/>
- * <p/>
- * Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
- * Use this function to filter a set of values. For example, by summing several DELTA functions
- * you calculate the count of equal pairs. This function is also known as the Kronecker Delta function.
- *
- * <ul>
- *     <li>If number1 is nonnumeric, DELTA returns the #VALUE! error value.</li>
- *     <li>If number2 is nonnumeric, DELTA returns the #VALUE! error value.</li>
- * </ul>
- *
- * @author cedric dot walter @ gmail dot com
- */
-public final class Delta extends Fixed2ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Delta();
-
-    private final static NumberEval ONE = new NumberEval(1);
-    private final static NumberEval ZERO = new NumberEval(0);
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg1, ValueEval arg2) {
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(arg1, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        String strText1 = OperandResolver.coerceValueToString(veText1);
-        Double number1 = OperandResolver.parseDouble(strText1);
-        if (number1 == null) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        ValueEval veText2;
-        try {
-            veText2 = OperandResolver.getSingleValue(arg2, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-
-        String strText2 = OperandResolver.coerceValueToString(veText2);
-        Double number2 = OperandResolver.parseDouble(strText2);
-        if (number2 == null) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        int result = new BigDecimal(number1.doubleValue()).compareTo(new BigDecimal(number2.doubleValue()));
-        return result == 0 ? ONE : ZERO;
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-         if (args.length == 2) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
-        }
-
-        return ErrorEval.VALUE_INVALID;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java b/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java
deleted file mode 100644
index d4998b8..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Implementation for Excel EDATE () function.
- */
-public class EDate implements FreeRefFunction {
-    public static final FreeRefFunction instance = new EDate();
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 2) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        try {
-            double startDateAsNumber = getValue(args[0]);
-            int offsetInMonthAsNumber = (int) getValue(args[1]);
-
-            Date startDate = DateUtil.getJavaDate(startDateAsNumber);
-            Calendar calendar = LocaleUtil.getLocaleCalendar();
-            calendar.setTime(startDate);
-            calendar.add(Calendar.MONTH, offsetInMonthAsNumber);
-            return new NumberEval(DateUtil.getExcelDate(calendar.getTime()));
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-
-    private double getValue(ValueEval arg) throws EvaluationException {
-        if (arg instanceof NumberEval) {
-            return ((NumberEval) arg).getNumberValue();
-        }
-        if(arg instanceof BlankEval) {
-            return 0;
-        }
-        if (arg instanceof RefEval) {
-            RefEval refEval = (RefEval)arg;
-            if (refEval.getNumberOfSheets() > 1) {
-                // Multi-Sheet references are not supported
-                throw new EvaluationException(ErrorEval.VALUE_INVALID);
-            }
-            
-            ValueEval innerValueEval = refEval.getInnerValueEval(refEval.getFirstSheetIndex());
-            if(innerValueEval instanceof NumberEval) {
-                return ((NumberEval) innerValueEval).getNumberValue();
-            }
-            if(innerValueEval instanceof BlankEval) {
-                return 0;
-            }
-        }
-        throw new EvaluationException(ErrorEval.VALUE_INVALID);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/EOMonth.java b/trunk/src/java/org/apache/poi/ss/formula/functions/EOMonth.java
deleted file mode 100644
index 63836e5..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/EOMonth.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Implementation for the Excel EOMONTH() function.<p/>
- * <p/>
- * EOMONTH() returns the date of the last day of a month..<p/>
- * <p/>
- * <b>Syntax</b>:<br/>
- * <b>EOMONTH</b>(<b>start_date</b>,<b>months</b>)<p/>
- * <p/>
- * <b>start_date</b> is the starting date of the calculation
- * <b>months</b> is the number of months to be added to <b>start_date</b>,
- * to give a new date. For this new date, <b>EOMONTH</b> returns the date of
- * the last day of the month. <b>months</b> may be positive (in the future),
- * zero or negative (in the past).
- */
-public class EOMonth implements FreeRefFunction {
-    public static final FreeRefFunction instance = new EOMonth();
-
-    @Override
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 2) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        try {
-            double startDateAsNumber = NumericFunction.singleOperandEvaluate(args[0], ec.getRowIndex(), ec.getColumnIndex());
-            int months = (int) NumericFunction.singleOperandEvaluate(args[1], ec.getRowIndex(), ec.getColumnIndex());
-
-            // Excel treats date 0 as 1900-01-00; EOMONTH results in 1900-01-31
-            if (startDateAsNumber >= 0.0 && startDateAsNumber < 1.0) {
-                startDateAsNumber = 1.0;
-            }
-
-            Date startDate = DateUtil.getJavaDate(startDateAsNumber, false);
-
-            Calendar cal = LocaleUtil.getLocaleCalendar();
-            cal.setTime(startDate);
-            cal.clear(Calendar.HOUR);
-            cal.set(Calendar.HOUR_OF_DAY, 0);
-            cal.clear(Calendar.MINUTE);
-            cal.clear(Calendar.SECOND);
-            cal.clear(Calendar.MILLISECOND);
-
-            cal.add(Calendar.MONTH, months + 1);
-            cal.set(Calendar.DAY_OF_MONTH, 1);
-            cal.add(Calendar.DAY_OF_MONTH, -1);
-
-            return new NumberEval(DateUtil.getExcelDate(cal.getTime()));
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Errortype.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Errortype.java
deleted file mode 100644
index 5dea7a3..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Errortype.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.FormulaError;
-
-/**
- * Implementation for the ERROR.TYPE() Excel function.
- * <p>
- * <b>Syntax:</b><br/>
- * <b>ERROR.TYPE</b>(<b>errorValue</b>)</p>
- * <p>
- * Returns a number corresponding to the error type of the supplied argument.<p/>
- * <p>
- *    <table border="1" cellpadding="1" cellspacing="1" summary="Return values for ERROR.TYPE()">
- *      <tr><td>errorValue</td><td>Return Value</td></tr>
- *      <tr><td>#NULL!</td><td>1</td></tr>
- *      <tr><td>#DIV/0!</td><td>2</td></tr>
- *      <tr><td>#VALUE!</td><td>3</td></tr>
- *      <tr><td>#REF!</td><td>4</td></tr>
- *      <tr><td>#NAME?</td><td>5</td></tr>
- *      <tr><td>#NUM!</td><td>6</td></tr>
- *      <tr><td>#N/A!</td><td>7</td></tr>
- *      <tr><td>everything else</td><td>#N/A!</td></tr>
- *    </table>
- *
- * Note - the results of ERROR.TYPE() are different to the constants defined in
- * <tt>ErrorConstants</tt>.
- * </p>
- *
- * @author Josh Micich
- */
-public final class Errortype extends Fixed1ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-
-		try {
-			OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			return ErrorEval.NA;
-		} catch (EvaluationException e) {
-			int result = translateErrorCodeToErrorTypeValue(e.getErrorEval().getErrorCode());
-			return new NumberEval(result);
-		}
-	}
-
-	private int translateErrorCodeToErrorTypeValue(int errorCode) {
-		switch (FormulaError.forInt(errorCode)) {
-			case NULL:  return 1;
-			case DIV0:  return 2;
-			case VALUE: return 3;
-			case REF:   return 4;
-			case NAME:  return 5;
-			case NUM:   return 6;
-			case NA:    return 7;
-			default:
-		        throw new IllegalArgumentException("Invalid error code (" + errorCode + ")");
-		}
-	}
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Even.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Even.java
deleted file mode 100644
index f691265..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Even.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- */
-public final class Even extends NumericFunction.OneArg {
-
-	private static final long PARITY_MASK = 0xFFFFFFFFFFFFFFFEL;
-
-	protected double evaluate(double d) {
-		if (d==0) {
-			return 0;
-		}
-		long result;
-		if (d>0) {
-			result = calcEven(d);
-		} else {
-			result = -calcEven(-d);
-		}
-		return result;
-	}
-
-	private static long calcEven(double d) {
-		long x = ((long) d) & PARITY_MASK;
-		if (x == d) {
-			return x;
-		}
-		return x + 2;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/FactDouble.java b/trunk/src/java/org/apache/poi/ss/formula/functions/FactDouble.java
deleted file mode 100644
index 28c2171..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/FactDouble.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
-import java.math.BigInteger;
-import java.util.HashMap;
-
-/**
- * Implementation for Excel FACTDOUBLE() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>FACTDOUBLE  </b>(<b>number</b>)<br/>
- * <p/>
- * Returns the double factorial of a number.
- * <p/>
- * Number is the value for which to return the double factorial. If number is not an integer, it is truncated.
- * <p/>
- * Remarks
- * <ul>
- * <li>If number is nonnumeric, FACTDOUBLE returns the #VALUE! error value.</li>
- * <li>If number is negative, FACTDOUBLE returns the #NUM! error value.</li>
- * </ul>
- * Use a cache for more speed of previously calculated factorial
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class FactDouble extends Fixed1ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new FactDouble();
-
-    //Caching of previously calculated factorial for speed
-    static HashMap<Integer, BigInteger> cache = new HashMap<Integer, BigInteger>();
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
-        int number;
-        try {
-            number = OperandResolver.coerceValueToInt(numberVE);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        if (number < 0) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        return new NumberEval(factorial(number).longValue());
-    }
-
-    public static BigInteger factorial(int n) {
-        if (n == 0 || n < 0) {
-            return BigInteger.ONE;
-        }
-
-        if (cache.containsKey(n))  {
-            return cache.get(n);
-        }
-
-        BigInteger result = BigInteger.valueOf(n).multiply(factorial(n - 2));
-        cache.put(n, result);
-        return result;
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 1) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java
deleted file mode 100644
index 367438b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-/**
-  * Implementation of the financial functions pmt, fv, ppmt, ipmt.
-  */
-public class Finance {
-
-	/**
-     * Emulates Excel/Calc's PMT(interest_rate, number_payments, PV, FV, Type)
-     * function, which calculates the payments for a loan or the future value of an investment
-     * 
-     * @param r
-     *            - periodic interest rate represented as a decimal.
-     * @param nper
-     *            - number of total payments / periods.
-     * @param pv
-     *            - present value -- borrowed or invested principal.
-     * @param fv
-     *            - future value of loan or annuity.
-     * @param type
-     *            - when payment is made: beginning of period is 1; end, 0.
-     * @return <code>double</code> representing periodic payment amount.
-     */
-	// http://arachnoid.com/lutusp/finance.html
-	static public double pmt(double r, int nper, double pv, double fv, int type) {
-	    double pmt = -r * (pv * Math.pow(1 + r, nper) + fv) / ((1 + r*type) * (Math.pow(1 + r, nper) - 1));
-	    return pmt;
-	}
-
-
-	/**
-     * Overloaded pmt() call omitting type, which defaults to 0.
-     * 
-     * @see #pmt(double, int, double, double, int)
-     */
-	static public double pmt(double r, int nper, double pv, double fv) {
-	    return pmt(r, nper, pv, fv, 0);
-	}
-	
-	/**
-     * Overloaded pmt() call omitting fv and type, which both default to 0.
-     * 
-     * @see #pmt(double, int, double, double, int)
-     */
-	static public double pmt(double r, int nper, double pv) {
-	    return pmt(r, nper, pv, 0);
-	}
-	
-	
-	/**
-     * Emulates Excel/Calc's IPMT(interest_rate, period, number_payments, PV,
-     * FV, Type) function, which calculates the portion of the payment at a
-     * given period that is the interest on previous balance.
-     * 
-     * @param r
-     *            - periodic interest rate represented as a decimal.
-     * @param per
-     *            - period (payment number) to check value at.
-     * @param nper
-     *            - number of total payments / periods.
-     * @param pv
-     *            - present value -- borrowed or invested principal.
-     * @param fv
-     *            - future value of loan or annuity.
-     * @param type
-     *            - when payment is made: beginning of period is 1; end, 0.
-     * @return <code>double</code> representing interest portion of payment.
-     * 
-     * @see #pmt(double, int, double, double, int)
-     * @see #fv(double, int, double, double, int)
-     */
-	// http://doc.optadata.com/en/dokumentation/application/expression/functions/financial.html
-	static public double ipmt(double r, int per, int nper, double pv, double fv, int type) {
-	    double ipmt = fv(r, per - 1, pmt(r, nper, pv, fv, type), pv, type) * r;
-	    if (type==1) ipmt /= (1 + r);
-	    return ipmt;
-	}
-	
-	static public double ipmt(double r, int per, int nper, double pv, double fv) {
-		return ipmt(r, per, nper, pv, fv, 0);
-	}
-	
-	static public double ipmt(double r, int per, int nper, double pv) {
-		return ipmt(r, per, nper, pv, 0);
-	}
-	 
-	/**
-     * Emulates Excel/Calc's PPMT(interest_rate, period, number_payments, PV,
-     * FV, Type) function, which calculates the portion of the payment at a
-     * given period that will apply to principal.
-     * 
-     * @param r
-     *            - periodic interest rate represented as a decimal.
-     * @param per
-     *            - period (payment number) to check value at.
-     * @param nper
-     *            - number of total payments / periods.
-     * @param pv
-     *            - present value -- borrowed or invested principal.
-     * @param fv
-     *            - future value of loan or annuity.
-     * @param type
-     *            - when payment is made: beginning of period is 1; end, 0.
-     * @return <code>double</code> representing principal portion of payment.
-     * 
-     * @see #pmt(double, int, double, double, int)
-     * @see #ipmt(double, int, int, double, double, int)
-     */
-	static public double ppmt(double r, int per, int nper, double pv, double fv, int type) {
-	    return pmt(r, nper, pv, fv, type) - ipmt(r, per, nper, pv, fv, type);
-	}
-	
-	static public double ppmt(double r, int per, int nper, double pv, double fv) {
-	    return pmt(r, nper, pv, fv) - ipmt(r, per, nper, pv, fv);
-	}
-	
-	static public double ppmt(double r, int per, int nper, double pv) {
-	    return pmt(r, nper, pv) - ipmt(r, per, nper, pv);
-	}
-	
-    /**
-     * Emulates Excel/Calc's FV(interest_rate, number_payments, payment, PV,
-     * Type) function, which calculates future value or principal at period N.
-     * 
-     * @param r
-     *            - periodic interest rate represented as a decimal.
-     * @param nper
-     *            - number of total payments / periods.
-     * @param pmt
-     *            - periodic payment amount.
-     * @param pv
-     *            - present value -- borrowed or invested principal.
-     * @param type
-     *            - when payment is made: beginning of period is 1; end, 0.
-     * @return <code>double</code> representing future principal value.
-     */
-	//http://en.wikipedia.org/wiki/Future_value
-	static public double fv(double r, int nper, double pmt, double pv, int type) {
-	    double fv = -(pv * Math.pow(1 + r, nper) + pmt * (1+r*type) * (Math.pow(1 + r, nper) - 1) / r);
-	    return fv;
-	}
-	
-	/**
-     * Overloaded fv() call omitting type, which defaults to 0.
-     * 
-     * @see #fv(double, int, double, double, int)
-     */
-	static public double fv(double r, int nper, double c, double pv) {
-		return fv(r, nper, c, pv, 0);
-	}
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
deleted file mode 100644
index 9880073..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public abstract class FinanceFunction implements Function3Arg, Function4Arg {
-    private static final ValueEval DEFAULT_ARG3 = NumberEval.ZERO;
-    private static final ValueEval DEFAULT_ARG4 = BoolEval.FALSE;
-
-
-    protected FinanceFunction() {
-        // no instance fields
-    }
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-            ValueEval arg2) {
-        return evaluate(srcRowIndex, srcColumnIndex, arg0, arg1, arg2, DEFAULT_ARG3);
-    }
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-            ValueEval arg2, ValueEval arg3) {
-        return evaluate(srcRowIndex, srcColumnIndex, arg0, arg1, arg2, arg3, DEFAULT_ARG4);
-    }
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-            ValueEval arg2, ValueEval arg3, ValueEval arg4) {
-        double result;
-        try {
-            double d0 = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-            double d1 = NumericFunction.singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-            double d2 = NumericFunction.singleOperandEvaluate(arg2, srcRowIndex, srcColumnIndex);
-            double d3 = NumericFunction.singleOperandEvaluate(arg3, srcRowIndex, srcColumnIndex);
-            double d4 = NumericFunction.singleOperandEvaluate(arg4, srcRowIndex, srcColumnIndex);
-            result = evaluate(d0, d1, d2, d3, d4 != 0.0);
-            NumericFunction.checkValue(result);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        return new NumberEval(result);
-    }
-    public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-        switch (args.length) {
-            case 3:
-                return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], DEFAULT_ARG3, DEFAULT_ARG4);
-            case 4: {
-                ValueEval arg3 = args[3];
-                if(arg3 == MissingArgEval.instance) {
-                    arg3 = DEFAULT_ARG3;
-                }
-                return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], arg3, DEFAULT_ARG4);
-            }
-            case 5: {
-                ValueEval arg3 = args[3];
-                if(arg3 == MissingArgEval.instance) {
-                    arg3 = DEFAULT_ARG3;
-                }
-                ValueEval arg4 = args[4];
-                if(arg4 == MissingArgEval.instance) {
-                    arg4 = DEFAULT_ARG4;
-                }
-                return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], arg3, arg4);
-            }
-            default:
-                return ErrorEval.VALUE_INVALID;
-        }
-    }
-
-    @SuppressWarnings("fallthrough")
-    protected double evaluate(double[] ds) throws EvaluationException {
-        // All finance functions have 3 to 5 args, first 4 are numbers, last is boolean
-        // default for last 2 args are 0.0 and false
-        // Text boolean literals are not valid for the last arg
-
-        double arg3 = 0.0;
-        double arg4 = 0.0;
-
-        switch(ds.length) {
-            case 5:
-                arg4 = ds[4];
-                // fall through
-            case 4:
-                arg3 = ds[3];
-                // fall through
-            case 3:
-                break;
-            default:
-                throw new IllegalStateException("Wrong number of arguments");
-        }
-        return evaluate(ds[0], ds[1], ds[2], arg3, arg4!=0.0);
-    }
-
-    protected abstract double evaluate(double rate, double arg1, double arg2, double arg3, boolean type) throws EvaluationException ;
-
-
-    public static final Function FV = new FinanceFunction() {
-        protected double evaluate(double rate, double arg1, double arg2, double arg3, boolean type) {
-            return FinanceLib.fv(rate, arg1, arg2, arg3, type);
-        }
-    };
-    public static final Function NPER = new FinanceFunction() {
-        protected double evaluate(double rate, double arg1, double arg2, double arg3, boolean type) {
-            return FinanceLib.nper(rate, arg1, arg2, arg3, type);
-        }
-    };
-    public static final Function PMT = new FinanceFunction() {
-        protected double evaluate(double rate, double arg1, double arg2, double arg3, boolean type) {
-            return FinanceLib.pmt(rate, arg1, arg2, arg3, type);
-        }
-    };
-    public static final Function PV = new FinanceFunction() {
-        protected double evaluate(double rate, double arg1, double arg2, double arg3, boolean type) {
-            return FinanceLib.pv(rate, arg1, arg2, arg3, type);
-        }
-    };
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceLib.java b/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceLib.java
deleted file mode 100644
index 2a10fc9..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceLib.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- *
- * This class is a functon library for common fiscal functions.
- * <b>Glossary of terms/abbreviations:</b>
- * <br/>
- * <ul>
- * <li><em>FV:</em> Future Value</li>
- * <li><em>PV:</em> Present Value</li>
- * <li><em>NPV:</em> Net Present Value</li>
- * <li><em>PMT:</em> (Periodic) Payment</li>
- *
- * </ul>
- * For more info on the terms/abbreviations please use the references below
- * (hyperlinks are subject to change):
- * </br>Online References:
- * <ol>
- * <li>GNU Emacs Calc 2.02 Manual: http://theory.uwinnipeg.ca/gnu/calc/calc_203.html</li>
- * <li>Yahoo Financial Glossary: http://biz.yahoo.com/f/g/nn.html#y</li>
- * <li>MS Excel function reference: http://office.microsoft.com/en-us/assistance/CH062528251033.aspx</li>
- * </ol>
- * <h3>Implementation Notes:</h3>
- * Symbols used in the formulae that follow:<br/>
- * <ul>
- * <li>p: present value</li>
- * <li>f: future value</li>
- * <li>n: number of periods</li>
- * <li>y: payment (in each period)</li>
- * <li>r: rate</li>
- * <li>^: the power operator (NOT the java bitwise XOR operator!)</li>
- * </ul>
- * [From MS Excel function reference] Following are some of the key formulas
- * that are used in this implementation:
- * <pre>
- * p(1+r)^n + y(1+rt)((1+r)^n-1)/r + f=0   ...{when r!=0}
- * ny + p + f=0                            ...{when r=0}
- * </pre>
- */
-public final class FinanceLib {
-
-    private FinanceLib() {
-        // no instances of this class
-    }
-
-    /**
-     * Future value of an amount given the number of payments, rate, amount
-     * of individual payment, present value and boolean value indicating whether
-     * payments are due at the beginning of period
-     * (false => payments are due at end of period)
-     * @param r rate
-     * @param n num of periods
-     * @param y pmt per period
-     * @param p future value
-     * @param t type (true=pmt at end of period, false=pmt at begining of period)
-     */
-    public static double fv(double r, double n, double y, double p, boolean t) {
-        double retval = 0;
-        if (r == 0) {
-            retval = -1*(p+(n*y));
-        }
-        else {
-            double r1 = r + 1;
-            retval =((1-Math.pow(r1, n)) * (t ? r1 : 1) * y ) / r
-                      -
-                   p*Math.pow(r1, n);
-        }
-        return retval;
-    }
-
-    /**
-     * Present value of an amount given the number of future payments, rate, amount
-     * of individual payment, future value and boolean value indicating whether
-     * payments are due at the beginning of period
-     * (false => payments are due at end of period)
-     * @param r
-     * @param n
-     * @param y
-     * @param f
-     * @param t
-     */
-    public static double pv(double r, double n, double y, double f, boolean t) {
-        double retval = 0;
-        if (r == 0) {
-            retval = -1*((n*y)+f);
-        }
-        else {
-            double r1 = r + 1;
-            retval =(( ( 1 - Math.pow(r1, n) ) / r ) * (t ? r1 : 1)  * y - f)
-                     /
-                    Math.pow(r1, n);
-        }
-        return retval;
-    }
-
-    /**
-     * calculates the Net Present Value of a principal amount
-     * given the discount rate and a sequence of cash flows
-     * (supplied as an array). If the amounts are income the value should
-     * be positive, else if they are payments and not income, the
-     * value should be negative.
-     * @param r
-     * @param cfs cashflow amounts
-     */
-    public static double npv(double r, double[] cfs) {
-        double npv = 0;
-        double r1 = r + 1;
-        double trate = r1;
-        for (int i=0, iSize=cfs.length; i<iSize; i++) {
-            npv += cfs[i] / trate;
-            trate *= r1;
-        }
-        return npv;
-    }
-
-    /**
-     *
-     * @param r
-     * @param n
-     * @param p
-     * @param f
-     * @param t
-     */
-    public static double pmt(double r, double n, double p, double f, boolean t) {
-        double retval = 0;
-        if (r == 0) {
-            retval = -1*(f+p)/n;
-        }
-        else {
-        double r1 = r + 1;
-        retval = ( f + p * Math.pow(r1, n) ) * r
-                  /
-               ((t ? r1 : 1) * (1 - Math.pow(r1, n)));
-        }
-        return retval;
-    }
-
-    /**
-     *
-     * @param r
-     * @param y
-     * @param p
-     * @param f
-     * @param t
-     */
-    public static double nper(double r, double y, double p, double f, boolean t) {
-        double retval = 0;
-        if (r == 0) {
-            retval = -1 * (f + p) / y;
-        } else {
-            double r1 = r + 1;
-            double ryr = (t ? r1 : 1) * y / r;
-            double a1 = ((ryr - f) < 0)
-                    ? Math.log(f - ryr)
-                    : Math.log(ryr - f);
-            double a2 = ((ryr - f) < 0)
-                    ? Math.log(-p - ryr)
-                    : Math.log(p + ryr);
-            double a3 = Math.log(r1);
-            retval = (a1 - a2) / a3;
-        }
-        return retval;
-    }
-
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed.java
deleted file mode 100644
index e18bb06..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.util.Locale;
-
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-public final class Fixed implements Function1Arg, Function2Arg, Function3Arg {
-    @Override
-    public ValueEval evaluate(
-            int srcRowIndex, int srcColumnIndex,
-            ValueEval arg0, ValueEval arg1, ValueEval arg2) {
-        return fixed(arg0, arg1, arg2, srcRowIndex, srcColumnIndex);
-    }
-
-    @Override
-    public ValueEval evaluate(
-            int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-        return fixed(arg0, arg1, BoolEval.FALSE, srcRowIndex, srcColumnIndex);
-    }
-
-    @Override
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-        return fixed(arg0, new NumberEval(2), BoolEval.FALSE, srcRowIndex, srcColumnIndex);
-    }
-
-    @Override
-    public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-        switch (args.length) {
-            case 1:
-                return fixed(args[0], new NumberEval(2), BoolEval.FALSE,
-                        srcRowIndex, srcColumnIndex);
-            case 2:
-                return fixed(args[0], args[1], BoolEval.FALSE,
-                        srcRowIndex, srcColumnIndex);
-            case 3:
-                return fixed(args[0], args[1], args[2], srcRowIndex, srcColumnIndex);
-        }
-        return ErrorEval.VALUE_INVALID;
-    }
-    
-    private ValueEval fixed(
-            ValueEval numberParam, ValueEval placesParam,
-            ValueEval skipThousandsSeparatorParam,
-            int srcRowIndex, int srcColumnIndex) {
-        try {
-            ValueEval numberValueEval =
-                    OperandResolver.getSingleValue(
-                    numberParam, srcRowIndex, srcColumnIndex);
-            BigDecimal number =
-                    new BigDecimal(OperandResolver.coerceValueToDouble(numberValueEval));
-            ValueEval placesValueEval =
-                    OperandResolver.getSingleValue(
-                    placesParam, srcRowIndex, srcColumnIndex);
-            int places = OperandResolver.coerceValueToInt(placesValueEval);
-            ValueEval skipThousandsSeparatorValueEval =
-                    OperandResolver.getSingleValue(
-                    skipThousandsSeparatorParam, srcRowIndex, srcColumnIndex);
-            Boolean skipThousandsSeparator =
-                    OperandResolver.coerceValueToBoolean(
-                    skipThousandsSeparatorValueEval, false);
-            
-            // Round number to respective places.
-            number = number.setScale(places, RoundingMode.HALF_UP);
-            
-            // Format number conditionally using a thousands separator.
-            NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
-            DecimalFormat formatter = (DecimalFormat)nf;
-            formatter.setGroupingUsed(!(skipThousandsSeparator != null && skipThousandsSeparator));
-            formatter.setMinimumFractionDigits(places >= 0 ? places : 0);
-            formatter.setMaximumFractionDigits(places >= 0 ? places : 0);
-            String numberString = formatter.format(number.doubleValue());
-
-            // Return the result as a StringEval.
-            return new StringEval(numberString);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
deleted file mode 100644
index dbb1695..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for functions that only take zero arguments.
- *
- * @author Josh Micich
- */
-public abstract class Fixed0ArgFunction implements Function0Arg {
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		if (args.length != 0) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		return evaluate(srcRowIndex, srcColumnIndex);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
deleted file mode 100644
index 0b3317d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for functions that must take exactly one argument.
- *
- * @author Josh Micich
- */
-public abstract class Fixed1ArgFunction implements Function1Arg {
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		if (args.length != 1) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		return evaluate(srcRowIndex, srcColumnIndex, args[0]);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
deleted file mode 100644
index 0ba3d40..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for functions that must take exactly two arguments.
- *
- * @author Josh Micich
- */
-public abstract class Fixed2ArgFunction implements Function2Arg {
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		if (args.length != 2) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1]);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
deleted file mode 100644
index 421a398..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for functions that must take exactly three arguments.
- *
- * @author Josh Micich
- */
-public abstract class Fixed3ArgFunction implements Function3Arg {
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		if (args.length != 3) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2]);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
deleted file mode 100644
index e3f8ace..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for functions that must take exactly four arguments.
- *
- * @author Josh Micich
- */
-public abstract class Fixed4ArgFunction implements Function4Arg {
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		if (args.length != 4) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], args[3]);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
deleted file mode 100644
index 1c0fe1a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-
-
-/**
- * For most Excel functions, involving references ((cell, area), (2d, 3d)), the references are
- * passed in as arguments, and the exact location remains fixed.  However, a select few Excel
- * functions have the ability to access cells that were not part of any reference passed as an
- * argument.<br/>
- * Two important functions with this feature are <b>INDIRECT</b> and <b>OFFSET</b><p/>
- *
- * When POI evaluates formulas, each reference argument is capable of evaluating any cell inside
- * its range.  Actually, even cells outside the reference range but on the same sheet can be
- * evaluated.  This allows <b>OFFSET</b> to be implemented like most other functions - taking only
- * the arguments, and source cell coordinates.
- *
- * For the moment this interface only exists to serve the <b>INDIRECT</b> which can decode
- * arbitrary text into cell references, and evaluate them..
- *
- * @author Josh Micich
- */
-public interface FreeRefFunction {
-	/**
-	 * @param args the pre-evaluated arguments for this function. args is never <code>null</code>,
-	 *             nor are any of its elements.
-	 * @param ec primarily used to identify the source cell containing the formula being evaluated.
-	 *             may also be used to dynamically create reference evals.
-	 * @return never <code>null</code>. Possibly an instance of <tt>ErrorEval</tt> in the case of
-	 * a specified Excel error (Exceptions are never thrown to represent Excel errors).
-	 */
-	ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Function.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Function.java
deleted file mode 100644
index 5f97b81..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Function.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Common interface for all implementations of Excel built-in functions.
- *
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public interface Function {
-
-	/**
-	 * @param args the evaluated function arguments.  Empty values are represented with
-	 * {@link BlankEval} or {@link MissingArgEval}, never <code>null</code>.
-	 * @param srcRowIndex row index of the cell containing the formula under evaluation
-	 * @param srcColumnIndex column index of the cell containing the formula under evaluation
-	 * @return The evaluated result, possibly an {@link ErrorEval}, never <code>null</code>.
-	 * <b>Note</b> - Excel uses the error code <i>#NUM!</i> instead of IEEE <i>NaN</i>, so when
-	 * numeric functions evaluate to {@link Double#NaN} be sure to translate the result to {@link
-	 * ErrorEval#NUM_ERROR}.
-	 */
-	ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Function0Arg.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Function0Arg.java
deleted file mode 100644
index 749053e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Function0Arg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implemented by all functions that can be called with zero arguments
- *
- * @author Josh Micich
- */
-public interface Function0Arg extends Function {
-	/**
-	 * see {@link Function#evaluate(ValueEval[], int, int)}
-	 */
-	ValueEval evaluate(int srcRowIndex, int srcColumnIndex);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Function1Arg.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Function1Arg.java
deleted file mode 100644
index ec214f4..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Function1Arg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implemented by all functions that can be called with one argument
- *
- * @author Josh Micich
- */
-public interface Function1Arg extends Function {
-	/**
-	 * see {@link Function#evaluate(ValueEval[], int, int)}
-	 */
-	ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Function2Arg.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Function2Arg.java
deleted file mode 100644
index bd395cc..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Function2Arg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implemented by all functions that can be called with two arguments
- *
- * @author Josh Micich
- */
-public interface Function2Arg extends Function {
-	/**
-	 * see {@link Function#evaluate(ValueEval[], int, int)}
-	 */
-	ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Function3Arg.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Function3Arg.java
deleted file mode 100644
index ad5eee1..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Function3Arg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implemented by all functions that can be called with three arguments
- *
- * @author Josh Micich
- */
-public interface Function3Arg extends Function {
-	/**
-	 * see {@link Function#evaluate(ValueEval[], int, int)}
-	 */
-	ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1, ValueEval arg2);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Function4Arg.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Function4Arg.java
deleted file mode 100644
index f0eee52..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Function4Arg.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implemented by all functions that can be called with four arguments
- *
- * @author Josh Micich
- */
-public interface Function4Arg extends Function {
-	/**
-	 * see {@link Function#evaluate(ValueEval[], int, int)}
-	 */
-	ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1, ValueEval arg2, ValueEval arg3);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Hex2Dec.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
deleted file mode 100644
index 907b629..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * Implementation for Excel HEX2DEC() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>HEX2DEC  </b>(<b>number</b>)<br/>
- * <p/>
- * Converts a hexadecimal number to decimal.
- * <p/>
- * Number     is the hexadecimal number you want to convert. Number cannot contain more than 10 characters (40 bits).
- * The most significant bit of number is the sign bit.
- * The remaining 39 bits are magnitude bits. Negative numbers are represented using two's-complement notation.
- * Remark
- * If number is not a valid hexadecimal number, HEX2DEC returns the #NUM! error value.
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Hex2Dec extends Fixed1ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Hex2Dec();
-
-    static final int HEXADECIMAL_BASE = 16;
-    static final int MAX_NUMBER_OF_PLACES = 10;
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
-        final String hex;
-        if (numberVE instanceof RefEval) {
-            RefEval re = (RefEval) numberVE;
-            hex = OperandResolver.coerceValueToString(re.getInnerValueEval(re.getFirstSheetIndex()));
-        } else {
-            hex = OperandResolver.coerceValueToString(numberVE);
-        }
-        try {
-            return new NumberEval(BaseNumberUtils.convertToDecimal(hex, HEXADECIMAL_BASE, MAX_NUMBER_OF_PLACES));
-        }  catch (IllegalArgumentException e) {
-            return ErrorEval.NUM_ERROR;
-        }
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 1) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Hlookup.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Hlookup.java
deleted file mode 100644
index c6190dc..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Hlookup.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-import org.apache.poi.ss.formula.TwoDEval;
-/**
- * Implementation of the HLOOKUP() function.<p/>
- *
- * HLOOKUP finds a column in a lookup table by the first row value and returns the value from another row.<br/>
- *
- * <b>Syntax</b>:<br/>
- * <b>HLOOKUP</b>(<b>lookup_value</b>, <b>table_array</b>, <b>row_index_num</b>, range_lookup)<p/>
- *
- * <b>lookup_value</b>  The value to be found in the first column of the table array.<br/>
- * <b>table_array</b> An area reference for the lookup data. <br/>
- * <b>row_index_num</b> a 1 based index specifying which row value of the lookup data will be returned.<br/>
- * <b>range_lookup</b> If TRUE (default), HLOOKUP finds the largest value less than or equal to
- * the lookup_value.  If FALSE, only exact matches will be considered<br/>
- *
- * @author Josh Micich
- */
-public final class Hlookup extends Var3or4ArgFunction  {
-	private static final ValueEval DEFAULT_ARG3 = BoolEval.TRUE;
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		return evaluate(srcRowIndex, srcColumnIndex, arg0, arg1, arg2, DEFAULT_ARG3);
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2, ValueEval arg3) {
-		try {
-			// Evaluation order:
-			// arg0 lookup_value, arg1 table_array, arg3 range_lookup, find lookup value, arg2 row_index, fetch result
-			ValueEval lookupValue = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			TwoDEval tableArray = LookupUtils.resolveTableArrayArg(arg1);
-			boolean isRangeLookup = LookupUtils.resolveRangeLookupArg(arg3, srcRowIndex, srcColumnIndex);
-			int colIndex = LookupUtils.lookupIndexOfValue(lookupValue, LookupUtils.createRowVector(tableArray, 0), isRangeLookup);
-			int rowIndex = LookupUtils.resolveRowOrColIndexArg(arg2, srcRowIndex, srcColumnIndex);
-			ValueVector resultCol = createResultColumnVector(tableArray, rowIndex);
-			return resultCol.getItem(colIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	/**
-	 * Returns one column from an <tt>AreaEval</tt>
-	 *
-	 * @param rowIndex assumed to be non-negative
-	 *
-	 * @throws EvaluationException (#REF!) if colIndex is too high
-	 */
-	private ValueVector createResultColumnVector(TwoDEval tableArray, int rowIndex) throws EvaluationException {
-		if(rowIndex >= tableArray.getHeight()) {
-			throw EvaluationException.invalidRef();
-		}
-		return LookupUtils.createRowVector(tableArray, rowIndex);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Hyperlink.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Hyperlink.java
deleted file mode 100644
index a43b040..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Hyperlink.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation of Excel HYPERLINK function.<p/>
- *
- * In Excel this function has special behaviour - it causes the displayed cell value to behave like
- * a hyperlink in the GUI. From an evaluation perspective however, it is very simple.<p/>
- *
- * <b>Syntax</b>:<br/>
- * <b>HYPERLINK</b>(<b>link_location</b>, friendly_name)<p/>
- *
- * <b>link_location</b> The URL of the hyperlink <br/>
- * <b>friendly_name</b> (optional) the value to display<p/>
- *
- *  Returns last argument.  Leaves type unchanged (does not convert to {@link org.apache.poi.ss.formula.eval.StringEval}).
- *
- * @author Wayne Clingingsmith
- */
-public final class Hyperlink extends Var1or2ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-		return arg0;
-	}
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-		// note - if last arg is MissingArgEval, result will be NumberEval.ZERO,
-		// but WorkbookEvaluator does that translation
-		return arg1;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java b/trunk/src/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
deleted file mode 100644
index 111964a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Interface specifying how an algorithm to be used by {@link DStarRunner} should look like.
- * Each implementing class should correspond to one of the D* functions.
- */
-public interface IDStarAlgorithm {
-    /**
-     * Process a match that is found during a run through a database.
-     * @param eval ValueEval of the cell in the matching row. References will already be resolved.
-     * @return Whether we should continue iterating through the database.
-     */
-    boolean processMatch(ValueEval eval);
-    /**
-     * Return a result ValueEval that will be the result of the calculation.
-     * This is always called at the end of a run through the database.
-     * @return a ValueEval
-     */
-    ValueEval getResult();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/IPMT.java b/trunk/src/java/org/apache/poi/ss/formula/functions/IPMT.java
deleted file mode 100644
index 35dca8a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/IPMT.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-public class IPMT extends NumericFunction {
-
-	@Override
-	public double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException {
-   		
-		if(args.length != 4)
-        		throw new EvaluationException(ErrorEval.VALUE_INVALID);
-
-		double result;
-
-		ValueEval v1 = OperandResolver.getSingleValue(args[0], srcCellRow, srcCellCol); 
-		ValueEval v2 = OperandResolver.getSingleValue(args[1], srcCellRow, srcCellCol); 
-		ValueEval v3 = OperandResolver.getSingleValue(args[2], srcCellRow, srcCellCol); 
-		ValueEval v4 = OperandResolver.getSingleValue(args[3], srcCellRow, srcCellCol); 
-
-		double interestRate = OperandResolver.coerceValueToDouble(v1);
-		int period = OperandResolver.coerceValueToInt(v2);
-		int numberPayments = OperandResolver.coerceValueToInt(v3);
-		double PV = OperandResolver.coerceValueToDouble(v4);
-
-		result = Finance.ipmt(interestRate, period, numberPayments, PV) ;
-
-		checkValue(result);
-		
-		return result;
-	}
-
-	
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/IfFunc.java b/trunk/src/java/org/apache/poi/ss/formula/functions/IfFunc.java
deleted file mode 100644
index d410350..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/IfFunc.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-
-/**
- * Implementation for the Excel function IF
- * <p>
- * Note that Excel is a bit picky about the arguments to this function,
- *  when serialised into {@link Ptg}s in a HSSF file. While most cases are
- *  pretty chilled about the R vs V state of {@link RefPtg} arguments,
- *  for IF special care is needed to avoid Excel showing #VALUE.
- * See bug numbers #55324 and #55747 for the full details on this.
- * TODO Fix this...
- */
-public final class IfFunc extends Var2or3ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-		boolean b;
-		try {
-			b = evaluateFirstArg(arg0, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		if (b) {
-			if (arg1 == MissingArgEval.instance) {
-				return BlankEval.instance;
-			}
-			return arg1;
-		}
-		return BoolEval.FALSE;
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		boolean b;
-		try {
-			b = evaluateFirstArg(arg0, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		if (b) {
-			if (arg1 == MissingArgEval.instance) {
-				return BlankEval.instance;
-			}
-			return arg1;
-		}
-		if (arg2 == MissingArgEval.instance) {
-			return BlankEval.instance;
-		}
-		return arg2;
-	}
-
-	public static boolean evaluateFirstArg(ValueEval arg, int srcCellRow, int srcCellCol)
-			throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
-		Boolean b = OperandResolver.coerceValueToBoolean(ve, false);
-		if (b == null) {
-			return false;
-		}
-		return b.booleanValue();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java b/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java
deleted file mode 100644
index f7c17ad..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/ImReal.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.regex.Matcher;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for Excel ImReal() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>ImReal  </b>(<b>Inumber</b>)<br/>
- * <p/>
- * Returns the real coefficient of a complex number in x + yi or x + yj text format.
- * <p/>
- * Inumber     A complex number for which you want the real coefficient.
- * <p/>
- * Remarks
- * <ul>
- * <li>If inumber is not in the form x + yi or x + yj, this function returns the #NUM! error value.</li>
- * <li>Use COMPLEX to convert real and imaginary coefficients into a complex number.</li>
- * </ul>
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class ImReal extends Fixed1ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new ImReal();
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval inumberVE) {
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(inumberVE, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        String iNumber = OperandResolver.coerceValueToString(veText1);
-
-        Matcher m = Imaginary.COMPLEX_NUMBER_PATTERN.matcher(iNumber);
-        boolean result = m.matches();
-
-        String real = "";
-        if (result == true) {
-            String realGroup = m.group(2);
-            boolean hasRealPart = realGroup.length() != 0;
-
-            if (realGroup.length() == 0) {
-                return new StringEval(String.valueOf(0));
-            }
-
-            if (hasRealPart) {
-                String sign = "";
-                String realSign = m.group(Imaginary.GROUP1_REAL_SIGN);
-                if (realSign.length() != 0 && !(realSign.equals("+"))) {
-                    sign = realSign;
-                }
-
-                String groupRealNumber = m.group(Imaginary.GROUP2_IMAGINARY_INTEGER_OR_DOUBLE);
-                if (groupRealNumber.length() != 0) {
-                    real = sign + groupRealNumber;
-                } else {
-                    real = sign + "1";
-                }
-            }
-        } else {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        return new StringEval(real);
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 1) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Imaginary.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Imaginary.java
deleted file mode 100644
index 2b13093..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Imaginary.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Implementation for Excel IMAGINARY() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>IMAGINARY  </b>(<b>Inumber</b>)<br/>
- * <p/>
- * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
- * <p/>
- * Inumber     is a complex number for which you want the imaginary coefficient.
- * <p/>
- * Remarks
- * <ul>
- * <li>Use COMPLEX to convert real and imaginary coefficients into a complex number.</li>
- * </ul>
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Imaginary extends Fixed1ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Imaginary();
-
-    public static final String GROUP1_REAL_SIGN_REGEX = "([+-]?)";
-    public static final String GROUP2_REAL_INTEGER_OR_DOUBLE_REGEX = "([0-9]+\\.[0-9]+|[0-9]*)";
-    public static final String GROUP3_IMAGINARY_SIGN_REGEX = "([+-]?)";
-    public static final String GROUP4_IMAGINARY_INTEGER_OR_DOUBLE_REGEX = "([0-9]+\\.[0-9]+|[0-9]*)";
-    public static final String GROUP5_IMAGINARY_GROUP_REGEX = "([ij]?)";
-
-    public static final Pattern COMPLEX_NUMBER_PATTERN
-            = Pattern.compile(GROUP1_REAL_SIGN_REGEX + GROUP2_REAL_INTEGER_OR_DOUBLE_REGEX +
-            GROUP3_IMAGINARY_SIGN_REGEX + GROUP4_IMAGINARY_INTEGER_OR_DOUBLE_REGEX + GROUP5_IMAGINARY_GROUP_REGEX);
-
-    public static final int GROUP1_REAL_SIGN = 1;
-    public static final int GROUP2_IMAGINARY_INTEGER_OR_DOUBLE = 2;
-    public static final int GROUP3_IMAGINARY_SIGN = 3;
-    public static final int GROUP4_IMAGINARY_INTEGER_OR_DOUBLE = 4;
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval inumberVE) {
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(inumberVE, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        String iNumber = OperandResolver.coerceValueToString(veText1);
-
-        Matcher m = COMPLEX_NUMBER_PATTERN.matcher(iNumber);
-        boolean result = m.matches();
-
-        String imaginary = "";
-        if (result == true) {
-            String imaginaryGroup = m.group(5);
-            boolean hasImaginaryPart = imaginaryGroup.equals("i") || imaginaryGroup.equals("j");
-
-            if (imaginaryGroup.length() == 0) {
-                return new StringEval(String.valueOf(0));
-            }
-
-            if (hasImaginaryPart) {
-                String sign = "";
-                String imaginarySign = m.group(GROUP3_IMAGINARY_SIGN);
-                if (imaginarySign.length() != 0 && !(imaginarySign.equals("+"))) {
-                    sign = imaginarySign;
-                }
-
-                String groupImaginaryNumber = m.group(GROUP4_IMAGINARY_INTEGER_OR_DOUBLE);
-                if (groupImaginaryNumber.length() != 0) {
-                    imaginary = sign + groupImaginaryNumber;
-                } else {
-                    imaginary = sign + "1";
-                }
-            }
-        } else {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        return new StringEval(imaginary);
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 1) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java
deleted file mode 100644
index e4884b2..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
-
-/**
- * Implementation for the Excel function INDEX
- * <p>
- *
- * Syntax : <br/>
- *  INDEX ( reference, row_num[, column_num [, area_num]])</br>
- *  INDEX ( array, row_num[, column_num])
- *    <table border="0" cellpadding="1" cellspacing="0" summary="Parameter descriptions">
- *      <tr><th>reference</th><td>typically an area reference, possibly a union of areas</td></tr>
- *      <tr><th>array</th><td>a literal array value (currently not supported)</td></tr>
- *      <tr><th>row_num</th><td>selects the row within the array or area reference</td></tr>
- *      <tr><th>column_num</th><td>selects column within the array or area reference. default is 1</td></tr>
- *      <tr><th>area_num</th><td>used when reference is a union of areas</td></tr>
- *    </table>
- * </p>
- *
- * @author Josh Micich
- */
-public final class Index implements Function2Arg, Function3Arg, Function4Arg {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-		TwoDEval reference = convertFirstArg(arg0);
-
-		int columnIx = 0;
-		try {
-			int rowIx = resolveIndexArg(arg1, srcRowIndex, srcColumnIndex);
-
-			if (!reference.isColumn()) {
-				if (!reference.isRow()) {
-					// always an error with 2-D area refs
-					// Note - the type of error changes if the pRowArg is negative
-					return ErrorEval.REF_INVALID;
-				}
-				// When the two-arg version of INDEX() has been invoked and the reference
-				// is a single column ref, the row arg seems to get used as the column index
-				columnIx = rowIx;
-				rowIx = 0;
-			}
-
-			return getValueFromArea(reference, rowIx, columnIx);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		TwoDEval reference = convertFirstArg(arg0);
-
-		try {
-			int columnIx = resolveIndexArg(arg2, srcRowIndex, srcColumnIndex);
-			int rowIx = resolveIndexArg(arg1, srcRowIndex, srcColumnIndex);
-			return getValueFromArea(reference, rowIx, columnIx);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2, ValueEval arg3) {
-		throw new RuntimeException("Incomplete code"
-				+ " - don't know how to support the 'area_num' parameter yet)");
-		// Excel expression might look like this "INDEX( (A1:B4, C3:D6, D2:E5 ), 1, 2, 3)
-		// In this example, the 3rd area would be used i.e. D2:E5, and the overall result would be E2
-		// Token array might be encoded like this: MemAreaPtg, AreaPtg, AreaPtg, UnionPtg, UnionPtg, ParenthesesPtg
-		// The formula parser doesn't seem to support this yet. Not sure if the evaluator does either
-	}
-
-	private static TwoDEval convertFirstArg(ValueEval arg0) {
-		ValueEval firstArg = arg0;
-		if (firstArg instanceof RefEval) {
-			// convert to area ref for simpler code in getValueFromArea()
-			return ((RefEval)firstArg).offset(0, 0, 0, 0);
-		}
-		if((firstArg instanceof TwoDEval)) {
-			return (TwoDEval) firstArg;
-		}
-		// else the other variation of this function takes an array as the first argument
-		// it seems like interface 'ArrayEval' does not even exist yet
-		throw new RuntimeException("Incomplete code - cannot handle first arg of type ("
-				+ firstArg.getClass().getName() + ")");
-
-	}
-
-	public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		switch (args.length) {
-			case 2:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1]);
-			case 3:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2]);
-			case 4:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], args[3]);
-		}
-		return ErrorEval.VALUE_INVALID;
-	}
-
-	private static ValueEval getValueFromArea(TwoDEval ae, int pRowIx, int pColumnIx)
-			throws EvaluationException {
-		assert pRowIx >= 0;
-		assert pColumnIx >= 0;
-
-		TwoDEval result = ae;
-
-		if (pRowIx != 0) {
-			// Slightly irregular logic for bounds checking errors
-			if (pRowIx > ae.getHeight()) {
-				// high bounds check fail gives #REF! if arg was explicitly passed
-				throw new EvaluationException(ErrorEval.REF_INVALID);
-			}
-			result = result.getRow(pRowIx-1);
-		}
-
-		if (pColumnIx != 0) {
-			// Slightly irregular logic for bounds checking errors
-			if (pColumnIx > ae.getWidth()) {
-				// high bounds check fail gives #REF! if arg was explicitly passed
-				throw new EvaluationException(ErrorEval.REF_INVALID);
-			}
-			result = result.getColumn(pColumnIx-1);
-		}
-		return result;
-	}
-
-
-	/**
-	 * @param arg a 1-based index.
-	 * @return the resolved 1-based index. Zero if the arg was missing or blank
-	 * @throws EvaluationException if the arg is an error value evaluates to a negative numeric value
-	 */
-	private static int resolveIndexArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-
-		ValueEval ev = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
-		if (ev == MissingArgEval.instance) {
-			return 0;
-		}
-		if (ev == BlankEval.instance) {
-			return 0;
-		}
-		int result = OperandResolver.coerceValueToInt(ev);
-		if (result < 0) {
-			throw new EvaluationException(ErrorEval.VALUE_INVALID);
-		}
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Indirect.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Indirect.java
deleted file mode 100644
index 1ea3dcd..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Indirect.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaParsingWorkbook;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.Area3DPxg;
-import org.apache.poi.ss.usermodel.Table;
-
-/**
- * Implementation for Excel function INDIRECT<p/>
- *
- * INDIRECT() returns the cell or area reference denoted by the text argument.<p/>
- *
- * <b>Syntax</b>:</br>
- * <b>INDIRECT</b>(<b>ref_text</b>,isA1Style)<p/>
- *
- * <b>ref_text</b> a string representation of the desired reference as it would
- * normally be written in a cell formula.<br/>
- * <b>isA1Style</b> (default TRUE) specifies whether the ref_text should be
- * interpreted as A1-style or R1C1-style.
- *
- * @author Josh Micich
- */
-public final class Indirect implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Indirect();
-
-    private Indirect() {
-        // enforce singleton
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length < 1) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        boolean isA1style;
-        String text;
-        try {
-            ValueEval ve = OperandResolver.getSingleValue(args[0], ec.getRowIndex(), ec
-                    .getColumnIndex());
-            text = OperandResolver.coerceValueToString(ve);
-            switch (args.length) {
-                case 1:
-                    isA1style = true;
-                    break;
-                case 2:
-                    isA1style = evaluateBooleanArg(args[1], ec);
-                    break;
-                default:
-                    return ErrorEval.VALUE_INVALID;
-            }
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-
-        return evaluateIndirect(ec, text, isA1style);
-    }
-
-    private static boolean evaluateBooleanArg(ValueEval arg, OperationEvaluationContext ec)
-            throws EvaluationException {
-        ValueEval ve = OperandResolver.getSingleValue(arg, ec.getRowIndex(), ec.getColumnIndex());
-
-        if (ve == BlankEval.instance || ve == MissingArgEval.instance) {
-            return false;
-        }
-        // numeric quantities follow standard boolean conversion rules
-        // for strings, only "TRUE" and "FALSE" (case insensitive) are valid
-        return OperandResolver.coerceValueToBoolean(ve, false).booleanValue();
-    }
-
-    private static ValueEval evaluateIndirect(final OperationEvaluationContext ec, String text,
-            boolean isA1style) {
-        
-        // Search backwards for '!' because sheet names can contain '!'
-        int plingPos = text.lastIndexOf('!');
-
-        String workbookName;
-        String sheetName;
-        String refText; // whitespace around this gets trimmed OK
-        if (plingPos < 0) {
-            workbookName = null;
-            sheetName = null;
-            refText = text;
-        } else {
-            String[] parts = parseWorkbookAndSheetName(text.subSequence(0, plingPos));
-            if (parts == null) {
-                return ErrorEval.REF_INVALID;
-            }
-            workbookName = parts[0];
-            sheetName = parts[1];
-            refText = text.substring(plingPos + 1);
-        }
-
-        if (Table.isStructuredReference.matcher(refText).matches()) {
-            // The argument is structured reference
-            Area3DPxg areaPtg = null;
-            try {
-                areaPtg = FormulaParser.parseStructuredReference(refText, (FormulaParsingWorkbook) ec.getWorkbook(), ec.getRowIndex());
-            } catch (FormulaParseException e) {
-                return ErrorEval.REF_INVALID;
-            }
-            return ec.getArea3DEval(areaPtg);
-        } else {
-            // The argument is regular reference
-            String refStrPart1;
-            String refStrPart2;
-            int colonPos = refText.indexOf(':');
-            if (colonPos < 0) {
-                 refStrPart1 = refText.trim();
-                 refStrPart2 = null;            
-            } else {
-                refStrPart1 = refText.substring(0, colonPos).trim();
-                refStrPart2 = refText.substring(colonPos + 1).trim();
-            }
-            return ec.getDynamicReference(workbookName, sheetName, refStrPart1, refStrPart2, isA1style);
-        }
-    }
-
-    /**
-     * @return array of length 2: {workbookName, sheetName,}.  Second element will always be
-     * present.  First element may be null if sheetName is unqualified.
-     * Returns <code>null</code> if text cannot be parsed.
-     */
-    private static String[] parseWorkbookAndSheetName(CharSequence text) {
-        int lastIx = text.length() - 1;
-        if (lastIx < 0) {
-            return null;
-        }
-        if (canTrim(text)) {
-            return null;
-        }
-        char firstChar = text.charAt(0);
-        if (Character.isWhitespace(firstChar)) {
-            return null;
-        }
-        if (firstChar == '\'') {
-            // workbookName or sheetName needs quoting
-            // quotes go around both
-            if (text.charAt(lastIx) != '\'') {
-                return null;
-            }
-            firstChar = text.charAt(1);
-            if (Character.isWhitespace(firstChar)) {
-                return null;
-            }
-            String wbName;
-            int sheetStartPos;
-            if (firstChar == '[') {
-                int rbPos = text.toString().lastIndexOf(']');
-                if (rbPos < 0) {
-                    return null;
-                }
-                wbName = unescapeString(text.subSequence(2, rbPos));
-                if (wbName == null || canTrim(wbName)) {
-                    return null;
-                }
-                sheetStartPos = rbPos + 1;
-            } else {
-                wbName = null;
-                sheetStartPos = 1;
-            }
-
-            // else - just sheet name
-            String sheetName = unescapeString(text.subSequence(sheetStartPos, lastIx));
-            if (sheetName == null) { // note - when quoted, sheetName can
-                                     // start/end with whitespace
-                return null;
-            }
-            return new String[] { wbName, sheetName, };
-        }
-
-        if (firstChar == '[') {
-            int rbPos = text.toString().lastIndexOf(']');
-            if (rbPos < 0) {
-                return null;
-            }
-            CharSequence wbName = text.subSequence(1, rbPos);
-            if (canTrim(wbName)) {
-                return null;
-            }
-            CharSequence sheetName = text.subSequence(rbPos + 1, text.length());
-            if (canTrim(sheetName)) {
-                return null;
-            }
-            return new String[] { wbName.toString(), sheetName.toString(), };
-        }
-        // else - just sheet name
-        return new String[] { null, text.toString(), };
-    }
-
-    /**
-     * @return <code>null</code> if there is a syntax error in any escape sequence
-     * (the typical syntax error is a single quote character not followed by another).
-     */
-    private static String unescapeString(CharSequence text) {
-        int len = text.length();
-        StringBuilder sb = new StringBuilder(len);
-        int i = 0;
-        while (i < len) {
-            char ch = text.charAt(i);
-            if (ch == '\'') {
-                // every quote must be followed by another
-                i++;
-                if (i >= len) {
-                    return null;
-                }
-                ch = text.charAt(i);
-                if (ch != '\'') {
-                    return null;
-                }
-            }
-            sb.append(ch);
-            i++;
-        }
-        return sb.toString();
-    }
-
-    private static boolean canTrim(CharSequence text) {
-        int lastIx = text.length() - 1;
-        if (lastIx < 0) {
-            return false;
-        }
-        if (Character.isWhitespace(text.charAt(0))) {
-            return true;
-        }
-        if (Character.isWhitespace(text.charAt(lastIx))) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Intercept.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Intercept.java
deleted file mode 100644
index f7a142a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Intercept.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LinearRegressionFunction.FUNCTION;
-
-/**
- * Implementation of Excel function INTERCEPT()<p/>
- *
- * Calculates the INTERCEPT of the linear regression line that is used to predict y values from x values<br/>
- * (http://introcs.cs.princeton.edu/java/97data/LinearRegression.java.html)
- * <b>Syntax</b>:<br/>
- * <b>INTERCEPT</b>(<b>arrayX</b>, <b>arrayY</b>)<p/>
- *
- *
- * @author Johan Karlsteen
- */
-public final class Intercept extends Fixed2ArgFunction {
-
-	private final LinearRegressionFunction func;
-	public Intercept() {
-		func = new LinearRegressionFunction(FUNCTION.INTERCEPT);
-	}
-	
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex,
-			ValueEval arg0, ValueEval arg1) {
-		return func.evaluate(srcRowIndex, srcColumnIndex, arg0, arg1);
-	}
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Irr.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Irr.java
deleted file mode 100644
index a2faf18..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Irr.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * Calculates the internal rate of return.
- *
- * Syntax is IRR(values) or IRR(values,guess)
- *
- * @author Marcel May
- * @author Yegor Kozlov
- *
- * @see <a href="http://en.wikipedia.org/wiki/Internal_rate_of_return#Numerical_solution">Wikipedia on IRR</a>
- * @see <a href="http://office.microsoft.com/en-us/excel-help/irr-HP005209146.aspx">Excel IRR</a>
- */
-public final class Irr implements Function {
-
-
-    public ValueEval evaluate(final ValueEval[] args, final int srcRowIndex, final int srcColumnIndex) {
-        if(args.length == 0 || args.length > 2) {
-            // Wrong number of arguments
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        try {
-            double[] values = AggregateFunction.ValueCollector.collectValues(args[0]);
-            double guess;
-            if(args.length == 2) {
-                guess = NumericFunction.singleOperandEvaluate(args[1], srcRowIndex, srcColumnIndex);
-            } else {
-                guess = 0.1d;
-            }
-            double result = irr(values, guess);
-            NumericFunction.checkValue(result);
-            return new NumberEval(result);
-        } catch (EvaluationException e){
-            return e.getErrorEval();
-        }
-    }
-
-    /**
-     * Computes the internal rate of return using an estimated irr of 10 percent.
-     *
-     * @param income the income values.
-     * @return the irr.
-     */
-    public static double irr(double[] income) {
-        return irr(income, 0.1d);
-    }
-
-
-    /**
-     * Calculates IRR using the Newton-Raphson Method.
-     * <p>
-     * Starting with the guess, the method cycles through the calculation until the result
-     * is accurate within 0.00001 percent. If IRR can't find a result that works
-     * after 20 tries, the Double.NaN<> is returned.
-     * </p>
-     * <p>
-     *   The implementation is inspired by the NewtonSolver from the Apache Commons-Math library,
-     *   @see <a href="http://commons.apache.org">http://commons.apache.org</a>
-     * </p>
-     *
-     * @param values        the income values.
-     * @param guess         the initial guess of irr.
-     * @return the irr value. The method returns <code>Double.NaN</code>
-     *  if the maximum iteration count is exceeded
-     *
-     * @see <a href="http://en.wikipedia.org/wiki/Internal_rate_of_return#Numerical_solution">
-     *     http://en.wikipedia.org/wiki/Internal_rate_of_return#Numerical_solution</a>
-     * @see <a href="http://en.wikipedia.org/wiki/Newton%27s_method">
-     *     http://en.wikipedia.org/wiki/Newton%27s_method</a>
-     */
-    public static double irr(double[] values, double guess) {
-        int maxIterationCount = 20;
-        double absoluteAccuracy = 1E-7;
-
-        double x0 = guess;
-        double x1;
-
-        int i = 0;
-        while (i < maxIterationCount) {
-
-            // the value of the function (NPV) and its derivate can be calculated in the same loop
-            double fValue = 0;
-            double fDerivative = 0;
-            for (int k = 0; k < values.length; k++) {
-                fValue += values[k] / Math.pow(1.0 + x0, k);
-                fDerivative += -k * values[k] / Math.pow(1.0 + x0, k + 1);
-            }
-
-            // the essense of the Newton-Raphson Method
-            x1 = x0 - fValue/fDerivative;
-
-            if (Math.abs(x1 - x0) <= absoluteAccuracy) {
-                return x1;
-            }
-
-            x0 = x1;
-            ++i;
-        }
-        // maximum number of iterations is exceeded
-        return Double.NaN;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
deleted file mode 100644
index 73a0204..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-
-/**
- * Base class for linear regression functions.
- *
- * Calculates the linear regression line that is used to predict y values from x values<br/>
- * (http://introcs.cs.princeton.edu/java/97data/LinearRegression.java.html)
- * <b>Syntax</b>:<br/>
- * <b>INTERCEPT</b>(<b>arrayX</b>, <b>arrayY</b>)<p/>
- * or
- * <b>SLOPE</b>(<b>arrayX</b>, <b>arrayY</b>)<p/>
- *
- *
- * @author Johan Karlsteen
- */
-public final class LinearRegressionFunction extends Fixed2ArgFunction {
-	
-	private static abstract class ValueArray implements ValueVector {
-		private final int _size;
-		protected ValueArray(int size) {
-			_size = size;
-		}
-
-		public ValueEval getItem(int index) {
-			if (index < 0 || index > _size) {
-				throw new IllegalArgumentException("Specified index " + index
-						+ " is outside range (0.." + (_size - 1) + ")");
-			}
-			return getItemInternal(index);
-		}
-		protected abstract ValueEval getItemInternal(int index);
-
-		public final int getSize() {
-			return _size;
-		}
-	}
-
-	private static final class SingleCellValueArray extends ValueArray {
-		private final ValueEval _value;
-		public SingleCellValueArray(ValueEval value) {
-			super(1);
-			_value = value;
-		}
-
-		protected ValueEval getItemInternal(int index) {
-			return _value;
-		}
-	}
-
-	private static final class RefValueArray extends ValueArray {
-		private final RefEval _ref;
-		private final int _width;
-		public RefValueArray(RefEval ref) {
-			super(ref.getNumberOfSheets());
-			_ref = ref;
-			_width = ref.getNumberOfSheets();
-		}
-
-		protected ValueEval getItemInternal(int index) {
-		    int sIx = (index % _width) + _ref.getFirstSheetIndex(); 
-			return _ref.getInnerValueEval(sIx);
-		}
-	}
-
-	private static final class AreaValueArray extends ValueArray {
-		private final TwoDEval _ae;
-		private final int _width;
-
-		public AreaValueArray(TwoDEval ae) {
-			super(ae.getWidth() * ae.getHeight());
-			_ae = ae;
-			_width = ae.getWidth();
-		}
-
-		protected ValueEval getItemInternal(int index) {
-			int rowIx = index / _width;
-			int colIx = index % _width;
-			return _ae.getValue(rowIx, colIx);
-		}
-	}
-
-	public enum FUNCTION {INTERCEPT, SLOPE}
-	public FUNCTION function;
-	
-	public LinearRegressionFunction(FUNCTION function) {
-		this.function = function;
-	}
-	
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex,
-			ValueEval arg0, ValueEval arg1) {
-		double result;
-		try {
-			ValueVector vvY = createValueVector(arg0);
-			ValueVector vvX = createValueVector(arg1);
-			int size = vvX.getSize();
-			if (size == 0 || vvY.getSize() != size) {
-				return ErrorEval.NA;
-			}
-			result = evaluateInternal(vvX, vvY, size);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		if (Double.isNaN(result) || Double.isInfinite(result)) {
-			return ErrorEval.NUM_ERROR;
-		}
-		return new NumberEval(result);
-	}
-	
-	private double evaluateInternal(ValueVector x, ValueVector y, int size)
-			throws EvaluationException {
-
-		// error handling is as if the x is fully evaluated before y
-		ErrorEval firstXerr = null;
-		ErrorEval firstYerr = null;
-		boolean accumlatedSome = false;
-        // first pass: read in data, compute xbar and ybar
-        double sumx = 0.0, sumy = 0.0;
-        
-		for (int i = 0; i < size; i++) {
-			ValueEval vx = x.getItem(i);
-			ValueEval vy = y.getItem(i);
-			if (vx instanceof ErrorEval) {
-				if (firstXerr == null) {
-					firstXerr = (ErrorEval) vx;
-					continue;
-				}
-			}
-			if (vy instanceof ErrorEval) {
-				if (firstYerr == null) {
-					firstYerr = (ErrorEval) vy;
-					continue;
-				}
-			}
-			// only count pairs if both elements are numbers
-			if (vx instanceof NumberEval && vy instanceof NumberEval) {
-				accumlatedSome = true;
-				NumberEval nx = (NumberEval) vx;
-				NumberEval ny = (NumberEval) vy;
-				sumx  += nx.getNumberValue();
-	            sumy  += ny.getNumberValue();
-			} else {
-				// all other combinations of value types are silently ignored
-			}
-		}
-		double xbar = sumx / size;
-        double ybar = sumy / size;
-		
-		 // second pass: compute summary statistics
-        double xxbar = 0.0, xybar = 0.0;
-        for (int i = 0; i < size; i++) {
-			ValueEval vx = x.getItem(i);
-			ValueEval vy = y.getItem(i);
-			
-			if (vx instanceof ErrorEval) {
-				if (firstXerr == null) {
-					firstXerr = (ErrorEval) vx;
-					continue;
-				}
-			}
-			if (vy instanceof ErrorEval) {
-				if (firstYerr == null) {
-					firstYerr = (ErrorEval) vy;
-					continue;
-				}
-			}
-			
-			// only count pairs if both elements are numbers
-			if (vx instanceof NumberEval && vy instanceof NumberEval) {
-				NumberEval nx = (NumberEval) vx;
-				NumberEval ny = (NumberEval) vy;
-	            xxbar += (nx.getNumberValue() - xbar) * (nx.getNumberValue() - xbar);
-	            xybar += (nx.getNumberValue() - xbar) * (ny.getNumberValue() - ybar);
-			} else {
-				// all other combinations of value types are silently ignored
-			}
-        }
-        double beta1 = xybar / xxbar;
-        double beta0 = ybar - beta1 * xbar;
-		
-		if (firstXerr != null) {
-			throw new EvaluationException(firstXerr);
-		}
-		if (firstYerr != null) {
-			throw new EvaluationException(firstYerr);
-		}
-		if (!accumlatedSome) {
-			throw new EvaluationException(ErrorEval.DIV_ZERO);
-		}
-		
-		if(function == FUNCTION.INTERCEPT) {
-			return beta0;
-		} else {
-			return beta1;
-		}
-	}
-
-	private static ValueVector createValueVector(ValueEval arg) throws EvaluationException {
-		if (arg instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval) arg);
-		}
-		if (arg instanceof TwoDEval) {
-			return new AreaValueArray((TwoDEval) arg);
-		}
-		if (arg instanceof RefEval) {
-			return new RefValueArray((RefEval) arg);
-		}
-		return new SingleCellValueArray(arg);
-	}
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
deleted file mode 100644
index a082577..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation of the various ISxxx Logical Functions, which
- *  take a single expression argument, and return True or False.
- */
-public abstract class LogicalFunction extends Fixed1ArgFunction {
-
-    @SuppressWarnings("unused")
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-		ValueEval ve;
-		try {
-			ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			// Note - it is more usual to propagate error codes straight to the result like this:
-            // but logical functions behave a little differently
-			// return e.getErrorEval();
-
-		    // this will usually cause a 'FALSE' result except for ISNONTEXT()
-			ve = e.getErrorEval();
-		}
-		return BoolEval.valueOf(evaluate(ve));
-
-	}
-	/**
-	 * @param arg any {@link ValueEval}, potentially {@link BlankEval} or {@link ErrorEval}.
-	 */
-	protected abstract boolean evaluate(ValueEval arg);
-
-	public static final Function ISLOGICAL = new LogicalFunction() {
-		protected boolean evaluate(ValueEval arg) {
-			return arg instanceof BoolEval;
-		}
-	};
-	public static final Function ISNONTEXT = new LogicalFunction() {
-		protected boolean evaluate(ValueEval arg) {
-			return !(arg instanceof StringEval);
-		}
-	};
-	public static final Function ISNUMBER = new LogicalFunction() {
-		protected boolean evaluate(ValueEval arg) {
-			return arg instanceof NumberEval;
-		}
-	};
-	public static final Function ISTEXT = new LogicalFunction() {
-		protected boolean evaluate(ValueEval arg) {
-			return arg instanceof StringEval;
-		}
-	};
-
-	public static final Function ISBLANK = new LogicalFunction() {
-
-		protected boolean evaluate(ValueEval arg) {
-			return arg instanceof BlankEval;
-		}
-	};
-
-	public static final Function ISERROR = new LogicalFunction() {
-
-		protected boolean evaluate(ValueEval arg) {
-			return arg instanceof ErrorEval;
-		}
-	};
-
-    /**
-     * Implementation of Excel <tt>ISERR()</tt> function.<p/>
-     *
-     * <b>Syntax</b>:<br/>
-     * <b>ISERR</b>(<b>value</b>)<p/>
-     *
-     * <b>value</b>  The value to be tested<p/>
-     *
-     * Returns the logical value <tt>TRUE</tt> if value refers to any error value except
-     * <tt>'#N/A'</tt>; otherwise, it returns <tt>FALSE</tt>.
-     */
-    public static final Function ISERR = new LogicalFunction() {
-        @Override
-        protected boolean evaluate(ValueEval arg) {
-            if (arg instanceof ErrorEval) {
-                return arg != ErrorEval.NA;
-            }
-            return false;
-        }
-    };
-
-	/**
-	 * Implementation for Excel ISNA() function.<p/>
-	 *
-	 * <b>Syntax</b>:<br/>
-	 * <b>ISNA</b>(<b>value</b>)<p/>
-	 *
-	 * <b>value</b>  The value to be tested<br/>
-	 * <br/>
-	 * Returns <tt>TRUE</tt> if the specified value is '#N/A', <tt>FALSE</tt> otherwise.
-	 */
-	public static final Function ISNA = new LogicalFunction() {
-
-		protected boolean evaluate(ValueEval arg) {
-			return arg == ErrorEval.NA;
-		}
-	};
-
-	public static final Function ISREF = new Fixed1ArgFunction() {
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			if (arg0 instanceof RefEval || arg0 instanceof AreaEval) {
-				return BoolEval.TRUE;
-			}
-			return BoolEval.FALSE;
-		}
-	};
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Lookup.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Lookup.java
deleted file mode 100644
index 10f8a09..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Lookup.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-import org.apache.poi.ss.formula.TwoDEval;
-
-/**
- * Implementation of Excel function LOOKUP.<p/>
- *
- * LOOKUP finds an index  row in a lookup table by the first column value and returns the value from another column.
- *
- * <b>Syntax</b>:<br/>
- * <b>VLOOKUP</b>(<b>lookup_value</b>, <b>lookup_vector</b>, result_vector)<p/>
- *
- * <b>lookup_value</b>  The value to be found in the lookup vector.<br/>
- * <b>lookup_vector</> An area reference for the lookup data. <br/>
- * <b>result_vector</b> Single row or single column area reference from which the result value is chosen.<br/>
- *
- * @author Josh Micich
- */
-public final class Lookup extends Var2or3ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-		// complex rules to choose lookupVector and resultVector from the single area ref
-		throw new RuntimeException("Two arg version of LOOKUP not supported yet");
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		try {
-			ValueEval lookupValue = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			TwoDEval aeLookupVector = LookupUtils.resolveTableArrayArg(arg1);
-			TwoDEval aeResultVector = LookupUtils.resolveTableArrayArg(arg2);
-
-			ValueVector lookupVector = createVector(aeLookupVector);
-			ValueVector resultVector = createVector(aeResultVector);
-			if(lookupVector.getSize() > resultVector.getSize()) {
-				// Excel seems to handle this by accessing past the end of the result vector.
-				throw new RuntimeException("Lookup vector and result vector of differing sizes not supported yet");
-			}
-			int index = LookupUtils.lookupIndexOfValue(lookupValue, lookupVector, true);
-
-			return resultVector.getItem(index);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	private static ValueVector createVector(TwoDEval ae) {
-		ValueVector result = LookupUtils.createVector(ae);
-		if (result != null) {
-			return result;
-		}
-		// extra complexity required to emulate the way LOOKUP can handles these abnormal cases.
-		throw new RuntimeException("non-vector lookup or result areas not supported yet");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java b/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
deleted file mode 100644
index fce2642..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
+++ /dev/null
@@ -1,660 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Common functionality used by VLOOKUP, HLOOKUP, LOOKUP and MATCH
- */
-final class LookupUtils {
-
-	/**
-	 * Represents a single row or column within an <tt>AreaEval</tt>.
-	 */
-	public interface ValueVector {
-		ValueEval getItem(int index);
-		int getSize();
-	}
-
-
-	private static final class RowVector implements ValueVector {
-
-		private final TwoDEval _tableArray;
-		private final int _size;
-		private final int _rowIndex;
-
-		public RowVector(TwoDEval tableArray, int rowIndex) {
-			_rowIndex = rowIndex;
-			int lastRowIx =  tableArray.getHeight() - 1;
-			if(rowIndex < 0 || rowIndex > lastRowIx) {
-				throw new IllegalArgumentException("Specified row index (" + rowIndex
-						+ ") is outside the allowed range (0.." + lastRowIx + ")");
-			}
-			_tableArray = tableArray;
-			_size = tableArray.getWidth();
-		}
-
-		public ValueEval getItem(int index) {
-			if(index > _size) {
-				throw new ArrayIndexOutOfBoundsException("Specified index (" + index
-						+ ") is outside the allowed range (0.." + (_size-1) + ")");
-			}
-			return _tableArray.getValue(_rowIndex, index);
-		}
-		public int getSize() {
-			return _size;
-		}
-	}
-
-	private static final class ColumnVector implements ValueVector {
-
-		private final TwoDEval _tableArray;
-		private final int _size;
-		private final int _columnIndex;
-
-		public ColumnVector(TwoDEval tableArray, int columnIndex) {
-			_columnIndex = columnIndex;
-			int lastColIx =  tableArray.getWidth()-1;
-			if(columnIndex < 0 || columnIndex > lastColIx) {
-				throw new IllegalArgumentException("Specified column index (" + columnIndex
-						+ ") is outside the allowed range (0.." + lastColIx + ")");
-			}
-			_tableArray = tableArray;
-			_size = _tableArray.getHeight();
-		}
-
-		public ValueEval getItem(int index) {
-			if(index > _size) {
-				throw new ArrayIndexOutOfBoundsException("Specified index (" + index
-						+ ") is outside the allowed range (0.." + (_size-1) + ")");
-			}
-			return _tableArray.getValue(index, _columnIndex);
-		}
-		public int getSize() {
-			return _size;
-		}
-	}
-
-    private static final class SheetVector implements ValueVector {
-        private final RefEval _re;
-        private final int _size;
-
-        public SheetVector(RefEval re) {
-            _size = re.getNumberOfSheets();
-            _re = re;
-        }
-
-        public ValueEval getItem(int index) {
-            if(index >= _size) {
-                throw new ArrayIndexOutOfBoundsException("Specified index (" + index
-                        + ") is outside the allowed range (0.." + (_size-1) + ")");
-            }
-            int sheetIndex = _re.getFirstSheetIndex() + index;
-            return _re.getInnerValueEval(sheetIndex);
-        }
-        public int getSize() {
-            return _size;
-        }
-    }
-
-	public static ValueVector createRowVector(TwoDEval tableArray, int relativeRowIndex) {
-		return new RowVector(tableArray, relativeRowIndex);
-	}
-	public static ValueVector createColumnVector(TwoDEval tableArray, int relativeColumnIndex) {
-		return new ColumnVector(tableArray, relativeColumnIndex);
-	}
-	/**
-	 * @return <code>null</code> if the supplied area is neither a single row nor a single colum
-	 */
-	public static ValueVector createVector(TwoDEval ae) {
-		if (ae.isColumn()) {
-			return createColumnVector(ae, 0);
-		}
-		if (ae.isRow()) {
-			return createRowVector(ae, 0);
-		}
-		return null;
-	}
-	
-	public static ValueVector createVector(RefEval re) {
-	    return new SheetVector(re);
-	}
-
-	/**
-	 * Enumeration to support <b>4</b> valued comparison results.<p/>
-	 * Excel lookup functions have complex behaviour in the case where the lookup array has mixed
-	 * types, and/or is unordered.  Contrary to suggestions in some Excel documentation, there
-	 * does not appear to be a universal ordering across types.  The binary search algorithm used
-	 * changes behaviour when the evaluated 'mid' value has a different type to the lookup value.<p/>
-	 *
-	 * A simple int might have done the same job, but there is risk in confusion with the well
-	 * known <tt>Comparable.compareTo()</tt> and <tt>Comparator.compare()</tt> which both use
-	 * a ubiquitous 3 value result encoding.
-	 */
-	public static final class CompareResult {
-		private final boolean _isTypeMismatch;
-		private final boolean _isLessThan;
-		private final boolean _isEqual;
-		private final boolean _isGreaterThan;
-
-		private CompareResult(boolean isTypeMismatch, int simpleCompareResult) {
-			if(isTypeMismatch) {
-				_isTypeMismatch = true;
-				_isLessThan = false;
-				_isEqual = false;
-				_isGreaterThan = false;
-			} else {
-				_isTypeMismatch = false;
-				_isLessThan = simpleCompareResult < 0;
-				_isEqual = simpleCompareResult == 0;
-				_isGreaterThan = simpleCompareResult > 0;
-			}
-		}
-		public static final CompareResult TYPE_MISMATCH = new CompareResult(true, 0);
-		public static final CompareResult LESS_THAN = new CompareResult(false, -1);
-		public static final CompareResult EQUAL = new CompareResult(false, 0);
-		public static final CompareResult GREATER_THAN = new CompareResult(false, +1);
-
-		public static final CompareResult valueOf(int simpleCompareResult) {
-			if(simpleCompareResult < 0) {
-				return LESS_THAN;
-			}
-			if(simpleCompareResult > 0) {
-				return GREATER_THAN;
-			}
-			return EQUAL;
-		}
-
-        public static final CompareResult valueOf(boolean matches) {
-            if(matches) {
-                return EQUAL ;
-            }
-            return LESS_THAN;
-        }
-
-
-		public boolean isTypeMismatch() {
-			return _isTypeMismatch;
-		}
-		public boolean isLessThan() {
-			return _isLessThan;
-		}
-		public boolean isEqual() {
-			return _isEqual;
-		}
-		public boolean isGreaterThan() {
-			return _isGreaterThan;
-		}
-		public String toString() {
-			StringBuffer sb = new StringBuffer(64);
-			sb.append(getClass().getName()).append(" [");
-			sb.append(formatAsString());
-			sb.append("]");
-			return sb.toString();
-		}
-
-		private String formatAsString() {
-			if(_isTypeMismatch) {
-				return "TYPE_MISMATCH";
-			}
-			if(_isLessThan) {
-				return "LESS_THAN";
-			}
-			if(_isEqual) {
-				return "EQUAL";
-			}
-			if(_isGreaterThan) {
-				return "GREATER_THAN";
-			}
-			// toString must be reliable
-			return "??error??";
-		}
-	}
-
-	public interface LookupValueComparer {
-		/**
-		 * @return one of 4 instances or <tt>CompareResult</tt>: <tt>LESS_THAN</tt>, <tt>EQUAL</tt>,
-		 * <tt>GREATER_THAN</tt> or <tt>TYPE_MISMATCH</tt>
-		 */
-		CompareResult compareTo(ValueEval other);
-	}
-
-	private static abstract class LookupValueComparerBase implements LookupValueComparer {
-
-		private final Class<? extends ValueEval> _targetClass;
-		protected LookupValueComparerBase(ValueEval targetValue) {
-			if(targetValue == null) {
-				throw new RuntimeException("targetValue cannot be null");
-			}
-			_targetClass = targetValue.getClass();
-		}
-		public final CompareResult compareTo(ValueEval other) {
-			if (other == null) {
-				throw new RuntimeException("compare to value cannot be null");
-			}
-			if (_targetClass != other.getClass()) {
-				return CompareResult.TYPE_MISMATCH;
-			}
-			return compareSameType(other);
-		}
-		public String toString() {
-			StringBuffer sb = new StringBuffer(64);
-			sb.append(getClass().getName()).append(" [");
-			sb.append(getValueAsString());
-			sb.append("]");
-			return sb.toString();
-		}
-		protected abstract CompareResult compareSameType(ValueEval other);
-		/** used only for debug purposes */
-		protected abstract String getValueAsString();
-	}
-
-
-    private static final class StringLookupComparer extends LookupValueComparerBase {
-		
-        private String _value;
-        private final Pattern _wildCardPattern;
-        private boolean _matchExact;
-        private boolean _isMatchFunction;
-
-        protected StringLookupComparer(StringEval se, boolean matchExact, boolean isMatchFunction) {
-			super(se);
-			_value = se.getStringValue();
-            _wildCardPattern = Countif.StringMatcher.getWildCardPattern(_value);
-            _matchExact = matchExact;
-            _isMatchFunction = isMatchFunction;
-		}
-
-		protected CompareResult compareSameType(ValueEval other) {
-            StringEval se = (StringEval) other;
-
-            String stringValue = se.getStringValue();
-            if (_wildCardPattern != null) {
-                Matcher matcher = _wildCardPattern.matcher(stringValue);
-                boolean matches = matcher.matches();
-
-                if (_isMatchFunction ||
-                    !_matchExact) {
-                  return CompareResult.valueOf(matches);
-                }
-            }
-
-            return CompareResult.valueOf(_value.compareToIgnoreCase(stringValue));
-		}
-		protected String getValueAsString() {
-			return _value;
-		}
-	}
-	private static final class NumberLookupComparer extends LookupValueComparerBase {
-		private double _value;
-
-		protected NumberLookupComparer(NumberEval ne) {
-			super(ne);
-			_value = ne.getNumberValue();
-		}
-		protected CompareResult compareSameType(ValueEval other) {
-			NumberEval ne = (NumberEval) other;
-			return CompareResult.valueOf(Double.compare(_value, ne.getNumberValue()));
-		}
-		protected String getValueAsString() {
-			return String.valueOf(_value);
-		}
-	}
-	private static final class BooleanLookupComparer extends LookupValueComparerBase {
-		private boolean _value;
-
-		protected BooleanLookupComparer(BoolEval be) {
-			super(be);
-			_value = be.getBooleanValue();
-		}
-		protected CompareResult compareSameType(ValueEval other) {
-			BoolEval be = (BoolEval) other;
-			boolean otherVal = be.getBooleanValue();
-			if(_value == otherVal) {
-				return CompareResult.EQUAL;
-			}
-			// TRUE > FALSE
-			if(_value) {
-				return CompareResult.GREATER_THAN;
-			}
-			return CompareResult.LESS_THAN;
-		}
-		protected String getValueAsString() {
-			return String.valueOf(_value);
-		}
-	}
-
-	/**
-	 * Processes the third argument to VLOOKUP, or HLOOKUP (<b>col_index_num</b>
-	 * or <b>row_index_num</b> respectively).<br>
-	 * Sample behaviour:
-	 *    <table border="0" cellpadding="1" cellspacing="2" summary="Sample behaviour">
-	 *      <tr><th>Input&nbsp;&nbsp;&nbsp;Return</th><th>Value&nbsp;&nbsp;</th><th>Thrown Error</th></tr>
-	 *      <tr><td>5</td><td>4</td><td>&nbsp;</td></tr>
-	 *      <tr><td>2.9</td><td>2</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"5"</td><td>4</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"2.18e1"</td><td>21</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"-$2"</td><td>-3</td><td>*</td></tr>
-	 *      <tr><td>FALSE</td><td>-1</td><td>*</td></tr>
-	 *      <tr><td>TRUE</td><td>0</td><td>&nbsp;</td></tr>
-	 *      <tr><td>"TRUE"</td><td>&nbsp;</td><td>#REF!</td></tr>
-	 *      <tr><td>"abc"</td><td>&nbsp;</td><td>#REF!</td></tr>
-	 *      <tr><td>""</td><td>&nbsp;</td><td>#REF!</td></tr>
-	 *      <tr><td>&lt;blank&gt;</td><td>&nbsp;</td><td>#VALUE!</td></tr>
-	 *    </table><br/>
-	 *
-	 * Note - out of range errors (result index too high) are handled by the caller.
-	 * @return column or row index as a zero-based value, never negative.
-	 * @throws EvaluationException when the specified arg cannot be coerced to a non-negative integer
-	 */
-	public static int resolveRowOrColIndexArg(ValueEval rowColIndexArg, int srcCellRow, int srcCellCol) throws EvaluationException {
-		if(rowColIndexArg == null) {
-			throw new IllegalArgumentException("argument must not be null");
-		}
-
-		ValueEval veRowColIndexArg;
-		try {
-			veRowColIndexArg = OperandResolver.getSingleValue(rowColIndexArg, srcCellRow, (short)srcCellCol);
-		} catch (EvaluationException e) {
-			// All errors get translated to #REF!
-			throw EvaluationException.invalidRef();
-		}
-		int oneBasedIndex;
-		if(veRowColIndexArg instanceof StringEval) {
-			StringEval se = (StringEval) veRowColIndexArg;
-			String strVal = se.getStringValue();
-			Double dVal = OperandResolver.parseDouble(strVal);
-			if(dVal == null) {
-				// String does not resolve to a number. Raise #REF! error.
-				throw EvaluationException.invalidRef();
-				// This includes text booleans "TRUE" and "FALSE".  They are not valid.
-			}
-			// else - numeric value parses OK
-		}
-		// actual BoolEval values get interpreted as FALSE->0 and TRUE->1
-		oneBasedIndex = OperandResolver.coerceValueToInt(veRowColIndexArg);
-		if (oneBasedIndex < 1) {
-			// note this is asymmetric with the errors when the index is too large (#REF!)
-			throw EvaluationException.invalidValue();
-		}
-		return oneBasedIndex - 1; // convert to zero based
-	}
-
-
-
-	/**
-	 * The second argument (table_array) should be an area ref, but can actually be a cell ref, in
-	 * which case it is interpreted as a 1x1 area ref.  Other scalar values cause #VALUE! error.
-	 */
-	public static TwoDEval resolveTableArrayArg(ValueEval eval) throws EvaluationException {
-		if (eval instanceof TwoDEval) {
-			return (TwoDEval) eval;
-		}
-
-		if(eval instanceof RefEval) {
-			RefEval refEval = (RefEval) eval;
-			// Make this cell ref look like a 1x1 area ref.
-
-			// It doesn't matter if eval is a 2D or 3D ref, because that detail is never asked of AreaEval.
-			return refEval.offset(0, 0, 0, 0);
-		}
-		throw EvaluationException.invalidValue();
-	}
-
-
-	/**
-	 * Resolves the last (optional) parameter (<b>range_lookup</b>) to the VLOOKUP and HLOOKUP functions.
-	 * @param rangeLookupArg must not be <code>null</code>
-	 */
-	public static boolean resolveRangeLookupArg(ValueEval rangeLookupArg, int srcCellRow, int srcCellCol) throws EvaluationException {
-
-		ValueEval valEval = OperandResolver.getSingleValue(rangeLookupArg, srcCellRow, srcCellCol);
-		if(valEval instanceof BlankEval) {
-			// Tricky:
-			// fourth arg supplied but evaluates to blank
-			// this does not get the default value
-			return false;
-		}
-		if(valEval instanceof BoolEval) {
-			// Happy day flow
-			BoolEval boolEval = (BoolEval) valEval;
-			return boolEval.getBooleanValue();
-		}
-
-		if (valEval instanceof StringEval) {
-			String stringValue = ((StringEval) valEval).getStringValue();
-			if(stringValue.length() < 1) {
-				// More trickiness:
-				// Empty string is not the same as BlankEval.  It causes #VALUE! error
-				throw EvaluationException.invalidValue();
-			}
-			// TODO move parseBoolean to OperandResolver
-			Boolean b = Countif.parseBoolean(stringValue);
-			if(b != null) {
-				// string converted to boolean OK
-				return b.booleanValue();
-			}
-			// Even more trickiness:
-			// Note - even if the StringEval represents a number value (for example "1"),
-			// Excel does not resolve it to a boolean.
-			throw EvaluationException.invalidValue();
-			// This is in contrast to the code below,, where NumberEvals values (for
-			// example 0.01) *do* resolve to equivalent boolean values.
-		}
-		if (valEval instanceof NumericValueEval) {
-			NumericValueEval nve = (NumericValueEval) valEval;
-			// zero is FALSE, everything else is TRUE
-			return 0.0 != nve.getNumberValue();
-		}
-		throw new RuntimeException("Unexpected eval type (" + valEval.getClass().getName() + ")");
-	}
-
-	public static int lookupIndexOfValue(ValueEval lookupValue, ValueVector vector, boolean isRangeLookup) throws EvaluationException {
-		LookupValueComparer lookupComparer = createLookupComparer(lookupValue, isRangeLookup, false);
-		int result;
-		if(isRangeLookup) {
-			result = performBinarySearch(vector, lookupComparer);
-		} else {
-			result = lookupIndexOfExactValue(lookupComparer, vector);
-		}
-		if(result < 0) {
-			throw new EvaluationException(ErrorEval.NA);
-		}
-		return result;
-	}
-
-
-	/**
-	 * Finds first (lowest index) exact occurrence of specified value.
-	 * @param lookupComparer the value to be found in column or row vector
-	 * @param vector the values to be searched. For VLOOKUP this is the first column of the
-	 * 	tableArray. For HLOOKUP this is the first row of the tableArray.
-	 * @return zero based index into the vector, -1 if value cannot be found
-	 */
-	private static int lookupIndexOfExactValue(LookupValueComparer lookupComparer, ValueVector vector) {
-
-		// find first occurrence of lookup value
-		int size = vector.getSize();
-		for (int i = 0; i < size; i++) {
-			if(lookupComparer.compareTo(vector.getItem(i)).isEqual()) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-
-	/**
-	 * Encapsulates some standard binary search functionality so the unusual Excel behaviour can
-	 * be clearly distinguished.
-	 */
-	private static final class BinarySearchIndexes {
-
-		private int _lowIx;
-		private int _highIx;
-
-		public BinarySearchIndexes(int highIx) {
-			_lowIx = -1;
-			_highIx = highIx;
-		}
-
-		/**
-		 * @return -1 if the search range is empty
-		 */
-		public int getMidIx() {
-			int ixDiff = _highIx - _lowIx;
-			if(ixDiff < 2) {
-				return -1;
-			}
-			return _lowIx + (ixDiff / 2);
-		}
-
-		public int getLowIx() {
-			return _lowIx;
-		}
-		public int getHighIx() {
-			return _highIx;
-		}
-		public void narrowSearch(int midIx, boolean isLessThan) {
-			if(isLessThan) {
-				_highIx = midIx;
-			} else {
-				_lowIx = midIx;
-			}
-		}
-	}
-	/**
-	 * Excel has funny behaviour when the some elements in the search vector are the wrong type.
-	 *
-	 */
-	private static int performBinarySearch(ValueVector vector, LookupValueComparer lookupComparer) {
-		// both low and high indexes point to values assumed too low and too high.
-		BinarySearchIndexes bsi = new BinarySearchIndexes(vector.getSize());
-
-		while(true) {
-			int midIx = bsi.getMidIx();
-
-			if(midIx < 0) {
-				return bsi.getLowIx();
-			}
-			CompareResult cr = lookupComparer.compareTo(vector.getItem(midIx));
-			if(cr.isTypeMismatch()) {
-				int newMidIx = handleMidValueTypeMismatch(lookupComparer, vector, bsi, midIx);
-				if(newMidIx < 0) {
-					continue;
-				}
-				midIx = newMidIx;
-				cr = lookupComparer.compareTo(vector.getItem(midIx));
-			}
-			if(cr.isEqual()) {
-				return findLastIndexInRunOfEqualValues(lookupComparer, vector, midIx, bsi.getHighIx());
-			}
-			bsi.narrowSearch(midIx, cr.isLessThan());
-		}
-	}
-	/**
-	 * Excel seems to handle mismatched types initially by just stepping 'mid' ix forward to the
-	 * first compatible value.
-	 * @param midIx 'mid' index (value which has the wrong type)
-	 * @return usually -1, signifying that the BinarySearchIndex has been narrowed to the new mid
-	 * index.  Zero or greater signifies that an exact match for the lookup value was found
-	 */
-	private static int handleMidValueTypeMismatch(LookupValueComparer lookupComparer, ValueVector vector,
-			BinarySearchIndexes bsi, int midIx) {
-		int newMid = midIx;
-		int highIx = bsi.getHighIx();
-
-		while(true) {
-			newMid++;
-			if(newMid == highIx) {
-				// every element from midIx to highIx was the wrong type
-				// move highIx down to the low end of the mid values
-				bsi.narrowSearch(midIx, true);
-				return -1;
-			}
-			CompareResult cr = lookupComparer.compareTo(vector.getItem(newMid));
-			if(cr.isLessThan() && newMid == highIx-1) {
-				// move highIx down to the low end of the mid values
-				bsi.narrowSearch(midIx, true);
-				return -1;
-				// but only when "newMid == highIx-1"? slightly weird.
-				// It would seem more efficient to always do this.
-			}
-			if(cr.isTypeMismatch()) {
-				// keep stepping over values until the right type is found
-				continue;
-			}
-			if(cr.isEqual()) {
-				return newMid;
-			}
-			// Note - if moving highIx down (due to lookup<vector[newMid]),
-			// this execution path only moves highIx it down as far as newMid, not midIx,
-			// which would be more efficient.
-			bsi.narrowSearch(newMid, cr.isLessThan());
-			return -1;
-		}
-	}
-	/**
-	 * Once the binary search has found a single match, (V/H)LOOKUP steps one by one over subsequent
-	 * values to choose the last matching item.
-	 */
-	private static int findLastIndexInRunOfEqualValues(LookupValueComparer lookupComparer, ValueVector vector,
-				int firstFoundIndex, int maxIx) {
-		for(int i=firstFoundIndex+1; i<maxIx; i++) {
-			if(!lookupComparer.compareTo(vector.getItem(i)).isEqual()) {
-				return i-1;
-			}
-		}
-		return maxIx - 1;
-	}
-
-	public static LookupValueComparer createLookupComparer(ValueEval lookupValue, boolean matchExact, boolean isMatchFunction) {
-
-		if (lookupValue == BlankEval.instance) {
-			// blank eval translates to zero
-			// Note - a blank eval in the lookup column/row never matches anything
-			// empty string in the lookup column/row can only be matched by explicit empty string
-			return new NumberLookupComparer(NumberEval.ZERO);
-		}
-		if (lookupValue instanceof StringEval) {
-            //TODO eventually here return a WildcardStringLookupComparer
-			return new StringLookupComparer((StringEval) lookupValue, matchExact, isMatchFunction);
-		}
-		if (lookupValue instanceof NumberEval) {
-			return new NumberLookupComparer((NumberEval) lookupValue);
-		}
-		if (lookupValue instanceof BoolEval) {
-			return new BooleanLookupComparer((BoolEval) lookupValue);
-		}
-		throw new IllegalArgumentException("Bad lookup value type (" + lookupValue.getClass().getName() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java
deleted file mode 100644
index 589079e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LookupUtils.CompareResult;
-import org.apache.poi.ss.formula.functions.LookupUtils.LookupValueComparer;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-
-/**
- * Implementation for the MATCH() Excel function.<p/>
- *
- * <b>Syntax:</b><br/>
- * <b>MATCH</b>(<b>lookup_value</b>, <b>lookup_array</b>, match_type)<p/>
- *
- * Returns a 1-based index specifying at what position in the <b>lookup_array</b> the specified
- * <b>lookup_value</b> is found.<p/>
- *
- * Specific matching behaviour can be modified with the optional <b>match_type</b> parameter.
- *
- *    <table border="0" cellpadding="1" cellspacing="0" summary="match_type parameter description">
- *      <tr><th>Value</th><th>Matching Behaviour</th></tr>
- *      <tr><td>1</td><td>(default) find the largest value that is less than or equal to lookup_value.
- *        The lookup_array must be in ascending <i>order</i>*.</td></tr>
- *      <tr><td>0</td><td>find the first value that is exactly equal to lookup_value.
- *        The lookup_array can be in any order.</td></tr>
- *      <tr><td>-1</td><td>find the smallest value that is greater than or equal to lookup_value.
- *        The lookup_array must be in descending <i>order</i>*.</td></tr>
- *    </table>
- *
- * * Note regarding <i>order</i> - For the <b>match_type</b> cases that require the lookup_array to
- *  be ordered, MATCH() can produce incorrect results if this requirement is not met.  Observed
- *  behaviour in Excel is to return the lowest index value for which every item after that index
- *  breaks the match rule.<br>
- *  The (ascending) sort order expected by MATCH() is:<br/>
- *  numbers (low to high), strings (A to Z), boolean (FALSE to TRUE)<br/>
- *  MATCH() ignores all elements in the lookup_array with a different type to the lookup_value.
- *  Type conversion of the lookup_array elements is never performed.
- */
-public final class Match extends Var2or3ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-		// default match_type is 1.0
-		return eval(srcRowIndex, srcColumnIndex, arg0, arg1, 1.0);
-	}
-
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-
-		double match_type;
-
-		try {
-			match_type = evaluateMatchTypeArg(arg2, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			// Excel/MATCH() seems to have slightly abnormal handling of errors with
-			// the last parameter.  Errors do not propagate up.  Every error gets
-			// translated into #REF!
-			return ErrorEval.REF_INVALID;
-		}
-
-		return eval(srcRowIndex, srcColumnIndex, arg0, arg1, match_type);
-	}
-
-	private static  ValueEval eval(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			double match_type) {
-		boolean matchExact = match_type == 0;
-		// Note - Excel does not strictly require -1 and +1
-		boolean findLargestLessThanOrEqual = match_type > 0;
-
-		try {
-			ValueEval lookupValue = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			ValueVector lookupRange = evaluateLookupRange(arg1);
-			int index = findIndexOfValue(lookupValue, lookupRange, matchExact, findLargestLessThanOrEqual);
-			return new NumberEval(index + 1); // +1 to convert to 1-based
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	private static final class SingleValueVector implements ValueVector {
-
-		private final ValueEval _value;
-
-		public SingleValueVector(ValueEval value) {
-			_value = value;
-		}
-
-		public ValueEval getItem(int index) {
-			if (index != 0) {
-				throw new RuntimeException("Invalid index ("
-						+ index + ") only zero is allowed");
-			}
-			return _value;
-		}
-
-		public int getSize() {
-			return 1;
-		}
-	}
-
-	private static ValueVector evaluateLookupRange(ValueEval eval) throws EvaluationException {
-		if (eval instanceof RefEval) {
-			RefEval re = (RefEval) eval;
-			if (re.getNumberOfSheets() == 1) {
-			    return new SingleValueVector(re.getInnerValueEval(re.getFirstSheetIndex()));
-			} else {
-			    return LookupUtils.createVector(re);
-			}
-		}
-		if (eval instanceof TwoDEval) {
-			ValueVector result = LookupUtils.createVector((TwoDEval)eval);
-			if (result == null) {
-				throw new EvaluationException(ErrorEval.NA);
-			}
-			return result;
-		}
-
-		// Error handling for lookup_range arg is also unusual
-		if(eval instanceof NumericValueEval) {
-			throw new EvaluationException(ErrorEval.NA);
-		}
-		if (eval instanceof StringEval) {
-			StringEval se = (StringEval) eval;
-			Double d = OperandResolver.parseDouble(se.getStringValue());
-			if(d == null) {
-				// plain string
-				throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			// else looks like a number
-			throw new EvaluationException(ErrorEval.NA);
-		}
-		throw new RuntimeException("Unexpected eval type (" + eval.getClass().getName() + ")");
-	}
-
-
-
-	private static double evaluateMatchTypeArg(ValueEval arg, int srcCellRow, int srcCellCol)
-			throws EvaluationException {
-		ValueEval match_type = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
-
-		if(match_type instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval)match_type);
-		}
-		if(match_type instanceof NumericValueEval) {
-			NumericValueEval ne = (NumericValueEval) match_type;
-			return ne.getNumberValue();
-		}
-		if (match_type instanceof StringEval) {
-			StringEval se = (StringEval) match_type;
-			Double d = OperandResolver.parseDouble(se.getStringValue());
-			if(d == null) {
-				// plain string
-				throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			// if the string parses as a number, it is OK
-			return d.doubleValue();
-		}
-		throw new RuntimeException("Unexpected match_type type (" + match_type.getClass().getName() + ")");
-	}
-
-	/**
-	 * @return zero based index
-	 */
-	private static int findIndexOfValue(ValueEval lookupValue, ValueVector lookupRange,
-			boolean matchExact, boolean findLargestLessThanOrEqual) throws EvaluationException {
-
-		LookupValueComparer lookupComparer = createLookupComparer(lookupValue, matchExact);
-
-		int size = lookupRange.getSize();
-		if(matchExact) {
-			for (int i = 0; i < size; i++) {
-				if(lookupComparer.compareTo(lookupRange.getItem(i)).isEqual()) {
-					return i;
-				}
-			}
-			throw new EvaluationException(ErrorEval.NA);
-		}
-
-		if(findLargestLessThanOrEqual) {
-			// Note - backward iteration
-			for (int i = size - 1; i>=0;  i--) {
-				CompareResult cmp = lookupComparer.compareTo(lookupRange.getItem(i));
-				if(cmp.isTypeMismatch()) {
-					continue;
-				}
-				if(!cmp.isLessThan()) {
-					return i;
-				}
-			}
-			throw new EvaluationException(ErrorEval.NA);
-		}
-
-		// else - find smallest greater than or equal to
-		// TODO - is binary search used for (match_type==+1) ?
-		for (int i = 0; i<size; i++) {
-			CompareResult cmp = lookupComparer.compareTo(lookupRange.getItem(i));
-			if(cmp.isEqual()) {
-				return i;
-			}
-			if(cmp.isGreaterThan()) {
-				if(i<1) {
-					throw new EvaluationException(ErrorEval.NA);
-				}
-				return i-1;
-			}
-		}
-		return size-1;
-	}
-
-	private static LookupValueComparer createLookupComparer(ValueEval lookupValue, boolean matchExact) {
-		return LookupUtils.createLookupComparer(lookupValue, matchExact, true);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java b/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java
deleted file mode 100644
index 710e611..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.util.NumberToTextConverter;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- * This class is an extension to the standard math library
- * provided by java.lang.Math class. It follows the Math class
- * in that it has a private constructor and all static methods.
- */
-final class MathX {
-
-    private MathX() {
-        // no instances of this class
-    }
-
-
-    /**
-     * Returns a value rounded to p digits after decimal.
-     * If p is negative, then the number is rounded to
-     * places to the left of the decimal point. eg.
-     * 10.23 rounded to -1 will give: 10. If p is zero,
-     * the returned value is rounded to the nearest integral
-     * value.
-     * <p>If n is negative, the resulting value is obtained
-     * as the round value of absolute value of n multiplied
-     * by the sign value of n (@see MathX.sign(double d)).
-     * Thus, -0.6666666 rounded to p=0 will give -1 not 0.
-     * <p>If n is NaN, returned value is NaN.
-     * @param n
-     * @param p
-     */
-    public static double round(double n, int p) {
-        double retval;
-
-        if (Double.isNaN(n) || Double.isInfinite(n)) {
-            retval = Double.NaN;
-        }
-        else {
-            retval = new java.math.BigDecimal(NumberToTextConverter.toText(n)).setScale(p, java.math.RoundingMode.HALF_UP).doubleValue();
-        }
-
-        return retval;
-    }
-
-    /**
-     * Returns a value rounded-up to p digits after decimal.
-     * If p is negative, then the number is rounded to
-     * places to the left of the decimal point. eg.
-     * 10.23 rounded to -1 will give: 20. If p is zero,
-     * the returned value is rounded to the nearest integral
-     * value.
-     * <p>If n is negative, the resulting value is obtained
-     * as the round-up value of absolute value of n multiplied
-     * by the sign value of n (@see MathX.sign(double d)).
-     * Thus, -0.2 rounded-up to p=0 will give -1 not 0.
-     * <p>If n is NaN, returned value is NaN.
-     * @param n
-     * @param p
-     */
-    public static double roundUp(double n, int p) {
-        double retval;
-
-        if (Double.isNaN(n) || Double.isInfinite(n)) {
-            retval = Double.NaN;
-        }
-        else {
-            retval = java.math.BigDecimal.valueOf(n).setScale(p, java.math.RoundingMode.UP).doubleValue();
-        }
-
-        return retval;
-    }
-
-    /**
-     * Returns a value rounded to p digits after decimal.
-     * If p is negative, then the number is rounded to
-     * places to the left of the decimal point. eg.
-     * 10.23 rounded to -1 will give: 10. If p is zero,
-     * the returned value is rounded to the nearest integral
-     * value.
-     * <p>If n is negative, the resulting value is obtained
-     * as the round-up value of absolute value of n multiplied
-     * by the sign value of n (@see MathX.sign(double d)).
-     * Thus, -0.8 rounded-down to p=0 will give 0 not -1.
-     * <p>If n is NaN, returned value is NaN.
-     * @param n
-     * @param p
-     */
-    public static double roundDown(double n, int p) {
-        double retval;
-
-        if (Double.isNaN(n) || Double.isInfinite(n)) {
-            retval = Double.NaN;
-        }
-        else {
-            retval = java.math.BigDecimal.valueOf(n).setScale(p, java.math.RoundingMode.DOWN).doubleValue();
-        }
-
-        return retval;
-    }
-
-
-    /**
-     * If d < 0, returns short -1
-     * <br/>
-     * If d > 0, returns short 1
-     * <br/>
-     * If d == 0, returns short 0
-     * <p> If d is NaN, then 1 will be returned. It is the responsibility
-     * of caller to check for d isNaN if some other value is desired.
-     * @param d
-     */
-    public static short sign(double d) {
-        return (short) ((d == 0)
-                ? 0
-                : (d < 0)
-                        ? -1
-                        : 1);
-    }
-
-    /**
-     * average of all values
-     * @param values
-     */
-    public static double average(double[] values) {
-        double ave = 0;
-        double sum = 0;
-        for (int i=0, iSize=values.length; i<iSize; i++) {
-            sum += values[i];
-        }
-        ave = sum / values.length;
-        return ave;
-    }
-
-
-    /**
-     * sum of all values
-     * @param values
-     */
-    public static double sum(double[] values) {
-        double sum = 0;
-        for (int i=0, iSize=values.length; i<iSize; i++) {
-            sum += values[i];
-        }
-        return sum;
-    }
-
-    /**
-     * sum of squares of all values
-     * @param values
-     */
-    public static double sumsq(double[] values) {
-        double sumsq = 0;
-        for (int i=0, iSize=values.length; i<iSize; i++) {
-            sumsq += values[i]*values[i];
-        }
-        return sumsq;
-    }
-
-
-    /**
-     * product of all values
-     * @param values
-     */
-    public static double product(double[] values) {
-        double product = 0;
-        if (values!=null && values.length > 0) {
-            product = 1;
-            for (int i=0, iSize=values.length; i<iSize; i++) {
-                product *= values[i];
-            }
-        }
-        return product;
-    }
-
-    /**
-     * min of all values. If supplied array is zero length,
-     * Double.POSITIVE_INFINITY is returned.
-     * @param values
-     */
-    public static double min(double[] values) {
-        double min = Double.POSITIVE_INFINITY;
-        for (int i=0, iSize=values.length; i<iSize; i++) {
-            min = Math.min(min, values[i]);
-        }
-        return min;
-    }
-
-    /**
-     * min of all values. If supplied array is zero length,
-     * Double.NEGATIVE_INFINITY is returned.
-     * @param values
-     */
-    public static double max(double[] values) {
-        double max = Double.NEGATIVE_INFINITY;
-        for (int i=0, iSize=values.length; i<iSize; i++) {
-            max = Math.max(max, values[i]);
-        }
-        return max;
-    }
-
-    /**
-     * Note: this function is different from java.lang.Math.floor(..).
-     * <p>
-     * When n and s are "valid" arguments, the returned value is: Math.floor(n/s) * s;
-     * <br/>
-     * n and s are invalid if any of following conditions are true:
-     * <ul>
-     * <li>s is zero</li>
-     * <li>n is negative and s is positive</li>
-     * <li>n is positive and s is negative</li>
-     * </ul>
-     * In all such cases, Double.NaN is returned.
-     * @param n
-     * @param s
-     */
-    public static double floor(double n, double s) {
-        double f;
-
-        if ((n<0 && s>0) || (n>0 && s<0) || (s==0 && n!=0)) {
-            f = Double.NaN;
-        }
-        else {
-            f = (n==0 || s==0) ? 0 : Math.floor(n/s) * s;
-        }
-
-        return f;
-    }
-
-    /**
-     * Note: this function is different from java.lang.Math.ceil(..).
-     * <p>
-     * When n and s are "valid" arguments, the returned value is: Math.ceiling(n/s) * s;
-     * <br/>
-     * n and s are invalid if any of following conditions are true:
-     * <ul>
-     * <li>s is zero</li>
-     * <li>n is negative and s is positive</li>
-     * <li>n is positive and s is negative</li>
-     * </ul>
-     * In all such cases, Double.NaN is returned.
-     * @param n
-     * @param s
-     */
-    public static double ceiling(double n, double s) {
-        double c;
-
-        if ((n<0 && s>0) || (n>0 && s<0)) {
-            c = Double.NaN;
-        }
-        else {
-            c = (n == 0 || s == 0) ? 0 : Math.ceil(n/s) * s;
-        }
-
-        return c;
-    }
-
-    /**
-     * <br/> for all n >= 1; factorial n = n * (n-1) * (n-2) * ... * 1
-     * <br/> else if n == 0; factorial n = 1
-     * <br/> else if n < 0; factorial n = Double.NaN
-     * <br/> Loss of precision can occur if n is large enough.
-     * If n is large so that the resulting value would be greater
-     * than Double.MAX_VALUE; Double.POSITIVE_INFINITY is returned.
-     * If n < 0, Double.NaN is returned.
-     * @param n
-     */
-    public static double factorial(int n) {
-        double d = 1;
-
-        if (n >= 0) {
-            if (n <= 170) {
-                for (int i=1; i<=n; i++) {
-                    d *= i;
-                }
-            }
-            else {
-                d = Double.POSITIVE_INFINITY;
-            }
-        }
-        else {
-            d = Double.NaN;
-        }
-        return d;
-    }
-
-
-    /**
-     * returns the remainder resulting from operation:
-     * n / d.
-     * <br/> The result has the sign of the divisor.
-     * <br/> Examples:
-     * <ul>
-     * <li>mod(3.4, 2) = 1.4</li>
-     * <li>mod(-3.4, 2) = 0.6</li>
-     * <li>mod(-3.4, -2) = -1.4</li>
-     * <li>mod(3.4, -2) = -0.6</li>
-     * </ul>
-     * If d == 0, result is NaN
-     * @param n
-     * @param d
-     */
-    public static double mod(double n, double d) {
-        double result = 0;
-
-        if (d == 0) {
-            result = Double.NaN;
-        }
-        else if (sign(n) == sign(d)) {
-            result = n % d;
-        }
-        else {
-            result = ((n % d) + d) % d;
-        }
-
-        return result;
-    }
-
-    /**
-     * inverse hyperbolic cosine
-     * @param d
-     */
-    public static double acosh(double d) {
-        return Math.log(Math.sqrt(Math.pow(d, 2) - 1) + d);
-    }
-
-    /**
-     * inverse hyperbolic sine
-     * @param d
-     */
-    public static double asinh(double d) {
-        return Math.log(Math.sqrt(d*d + 1) + d);
-    }
-
-    /**
-     * inverse hyperbolic tangent
-     * @param d
-     */
-    public static double atanh(double d) {
-        return Math.log((1 + d)/(1 - d)) / 2;
-    }
-
-    /**
-     * hyperbolic cosine
-     * @param d
-     */
-    public static double cosh(double d) {
-        double ePowX = Math.pow(Math.E, d);
-        double ePowNegX = Math.pow(Math.E, -d);
-        return (ePowX + ePowNegX) / 2;
-    }
-
-    /**
-     * hyperbolic sine
-     * @param d
-     */
-    public static double sinh(double d) {
-        double ePowX = Math.pow(Math.E, d);
-        double ePowNegX = Math.pow(Math.E, -d);
-        return (ePowX - ePowNegX) / 2;
-    }
-
-    /**
-     * hyperbolic tangent
-     * @param d
-     */
-    public static double tanh(double d) {
-        double ePowX = Math.pow(Math.E, d);
-        double ePowNegX = Math.pow(Math.E, -d);
-        return (ePowX - ePowNegX) / (ePowX + ePowNegX);
-    }
-
-
-    /**
-     * returns the total number of combinations possible when
-     * k items are chosen out of total of n items. If the number
-     * is too large, loss of precision may occur (since returned
-     * value is double). If the returned value is larger than
-     * Double.MAX_VALUE, Double.POSITIVE_INFINITY is returned.
-     * If either of the parameters is negative, Double.NaN is returned.
-     * @param n
-     * @param k
-     */
-    public static double nChooseK(int n, int k) {
-        double d = 1;
-        if (n<0 || k<0 || n<k) {
-            d= Double.NaN;
-        }
-        else {
-            int minnk = Math.min(n-k, k);
-            int maxnk = Math.max(n-k, k);
-            for (int i=maxnk; i<n; i++) {
-                d *= i+1;
-            }
-            d /= factorial(minnk);
-        }
-
-        return d;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/MinaMaxa.java b/trunk/src/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
deleted file mode 100644
index 2471922..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- */
-public abstract class MinaMaxa extends MultiOperandNumericFunction {
-
-	protected MinaMaxa() {
-		super(true, true);
-	}
-
-	public static final Function MAXA = new MinaMaxa() {
-		protected double evaluate(double[] values) {
-			return values.length > 0 ? MathX.max(values) : 0;
-		}
-	};
-	public static final Function MINA = new MinaMaxa() {
-		protected double evaluate(double[] values) {
-			return values.length > 0 ? MathX.min(values) : 0;
-		}
-	};
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Mirr.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Mirr.java
deleted file mode 100644
index 934f508..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Mirr.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-
-/**
- * Calculates Modified internal rate of return. Syntax is MIRR(cash_flow_values, finance_rate, reinvest_rate)
- *
- * <p>Returns the modified internal rate of return for a series of periodic cash flows. MIRR considers both the cost
- * of the investment and the interest received on reinvestment of cash.</p>
- *
- * Values is an array or a reference to cells that contain numbers. These numbers represent a series of payments (negative values) and income (positive values) occurring at regular periods.
- * <ul>
- *     <li>Values must contain at least one positive value and one negative value to calculate the modified internal rate of return. Otherwise, MIRR returns the #DIV/0! error value.</li>
- *     <li>If an array or reference argument contains text, logical values, or empty cells, those values are ignored; however, cells with the value zero are included.</li>
- * </ul>
- *
- * Finance_rate     is the interest rate you pay on the money used in the cash flows.
- * Reinvest_rate     is the interest rate you receive on the cash flows as you reinvest them.
- *
- * @author Carlos Delgado (carlos dot del dot est at gmail dot com)
- * @author Cedric Walter (cedric dot walter at gmail dot com)
- *
- * @see <a href="http://en.wikipedia.org/wiki/MIRR">Wikipedia on MIRR</a>
- * @see <a href="http://office.microsoft.com/en-001/excel-help/mirr-HP005209180.aspx">Excel MIRR</a>
- * @see Irr
- */
-public class Mirr extends MultiOperandNumericFunction {
-
-    public Mirr() {
-        super(false, false);
-    }
-
-    @Override
-    protected int getMaxNumOperands() {
-        return 3;
-    }
-
-    @Override
-    protected double evaluate(double[] values) throws EvaluationException {
-
-        double financeRate = values[values.length-1];
-        double reinvestRate = values[values.length-2];
-
-        double[] mirrValues = new double[values.length - 2];
-        System.arraycopy(values, 0, mirrValues, 0, mirrValues.length);
-
-        boolean mirrValuesAreAllNegatives = true;
-        for (double mirrValue : mirrValues) {
-            mirrValuesAreAllNegatives &= mirrValue < 0;
-        }
-         if (mirrValuesAreAllNegatives) {
-             return -1.0d;
-         }
-
-        boolean mirrValuesAreAllPositives = true;
-        for (double mirrValue : mirrValues) {
-            mirrValuesAreAllPositives &= mirrValue > 0;
-        }
-        if (mirrValuesAreAllPositives) {
-            throw new EvaluationException(ErrorEval.DIV_ZERO);
-        }
-
-        return mirr(mirrValues, financeRate, reinvestRate);
-    }
-
-    private static double mirr(double[] in, double financeRate, double reinvestRate) {
-        double value = 0;
-        int numOfYears = in.length - 1;
-        double pv = 0;
-        double fv = 0;
-
-        int indexN = 0;
-        for (double anIn : in) {
-            if (anIn < 0) {
-                pv += anIn / Math.pow(1 + financeRate + reinvestRate, indexN++);
-            }
-        }
-
-        for (double anIn : in) {
-            if (anIn > 0) {
-                fv += anIn * Math.pow(1 + financeRate, numOfYears - indexN++);
-            }
-        }
-
-        if (fv != 0 && pv != 0) {
-            value = Math.pow(-fv / pv, 1d / numOfYears) - 1;
-        }
-        return value;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java
deleted file mode 100644
index 5f21324..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- */
-public final class Mode implements Function {
-
-	/**
-	 * if v is zero length or contains no duplicates, return value is
-	 * Double.NaN. Else returns the value that occurs most times and if there is
-	 * a tie, returns the first such value.
-	 *
-	 * @param v
-	 */
-	public static double evaluate(double[] v) throws EvaluationException {
-		if (v.length < 2) {
-			throw new EvaluationException(ErrorEval.NA);
-		}
-
-		// very naive impl, may need to be optimized
-		int[] counts = new int[v.length];
-		Arrays.fill(counts, 1);
-		for (int i = 0, iSize = v.length; i < iSize; i++) {
-			for (int j = i + 1, jSize = v.length; j < jSize; j++) {
-				if (v[i] == v[j])
-					counts[i]++;
-			}
-		}
-		double maxv = 0;
-		int maxc = 0;
-		for (int i = 0, iSize = counts.length; i < iSize; i++) {
-			if (counts[i] > maxc) {
-				maxv = v[i];
-				maxc = counts[i];
-			}
-		}
-		if (maxc > 1) {
-			return maxv;
-		}
-		throw new EvaluationException(ErrorEval.NA);
-
-	}
-
-	public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-		double result;
-		try {
-			List<Double> temp = new ArrayList<Double>();
-			for (int i = 0; i < args.length; i++) {
-				collectValues(args[i], temp);
-			}
-			double[] values = new double[temp.size()];
-			for (int i = 0; i < values.length; i++) {
-				values[i] = temp.get(i).doubleValue();
-			}
-			result = evaluate(values);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new NumberEval(result);
-	}
-
-	private static void collectValues(ValueEval arg, List<Double> temp) throws EvaluationException {
-		if (arg instanceof TwoDEval) {
-			TwoDEval ae = (TwoDEval) arg;
-			int width = ae.getWidth();
-			int height = ae.getHeight();
-			for (int rrIx = 0; rrIx < height; rrIx++) {
-				for (int rcIx = 0; rcIx < width; rcIx++) {
-					ValueEval ve1 = ae.getValue(rrIx, rcIx);
-					collectValue(ve1, temp, false);
-				}
-			}
-			return;
-		}
-		if (arg instanceof RefEval) {
-			RefEval re = (RefEval) arg;
-			final int firstSheetIndex = re.getFirstSheetIndex();
-			final int lastSheetIndex = re.getLastSheetIndex();
-			for (int sIx = firstSheetIndex; sIx <= lastSheetIndex; sIx++) {
-			    collectValue(re.getInnerValueEval(sIx), temp, true);
-			}
-			return;
-		}
-		collectValue(arg, temp, true);
-
-	}
-
-	private static void collectValue(ValueEval arg, List<Double> temp, boolean mustBeNumber)
-			throws EvaluationException {
-		if (arg instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval) arg);
-		}
-		if (arg == BlankEval.instance || arg instanceof BoolEval || arg instanceof StringEval) {
-			if (mustBeNumber) {
-				throw EvaluationException.invalidValue();
-			}
-			return;
-		}
-		if (arg instanceof NumberEval) {
-			temp.add(new Double(((NumberEval) arg).getNumberValue()));
-			return;
-		}
-		throw new RuntimeException("Unexpected value type (" + arg.getClass().getName() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
deleted file mode 100644
index 6e0f364..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.ThreeDEval;
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringValueEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * This is the super class for all excel function evaluator
- * classes that take variable number of operands, and
- * where the order of operands does not matter
- */
-public abstract class MultiOperandNumericFunction implements Function {
-
-	private final boolean _isReferenceBoolCounted;
-	private final boolean _isBlankCounted;
-
-    protected MultiOperandNumericFunction(boolean isReferenceBoolCounted, boolean isBlankCounted) {
-        _isReferenceBoolCounted = isReferenceBoolCounted;
-        _isBlankCounted = isBlankCounted;
-    }
-
-	static final double[] EMPTY_DOUBLE_ARRAY = { };
-
-	private static class DoubleList {
-		private double[] _array;
-		private int _count;
-
-		public DoubleList() {
-			_array = new double[8];
-			_count = 0;
-		}
-
-		public double[] toArray() {
-			if(_count < 1) {
-				return EMPTY_DOUBLE_ARRAY;
-			}
-			double[] result = new double[_count];
-			System.arraycopy(_array, 0, result, 0, _count);
-			return result;
-		}
-
-		private void ensureCapacity(int reqSize) {
-			if(reqSize > _array.length) {
-				int newSize = reqSize * 3 / 2; // grow with 50% extra
-				double[] newArr = new double[newSize];
-				System.arraycopy(_array, 0, newArr, 0, _count);
-				_array = newArr;
-			}
-		}
-
-		public void add(double value) {
-			ensureCapacity(_count + 1);
-			_array[_count] = value;
-			_count++;
-		}
-	}
-
-	private static final int DEFAULT_MAX_NUM_OPERANDS = 30;
-
-	public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-
-		double d;
-		try {
-			double[] values = getNumberArray(args);
-			d = evaluate(values);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-
-		if (Double.isNaN(d) || Double.isInfinite(d))
-			return ErrorEval.NUM_ERROR;
-
-		return new NumberEval(d);
-	}
-
-	protected abstract double evaluate(double[] values) throws EvaluationException;
-
-	/**
-	 * Maximum number of operands accepted by this function.
-	 * Subclasses may override to change default value.
-	 */
-	protected int getMaxNumOperands() {
-		return DEFAULT_MAX_NUM_OPERANDS;
-	}
-
-	/**
-	 * Returns a double array that contains values for the numeric cells
-	 * from among the list of operands. Blanks and Blank equivalent cells
-	 * are ignored. Error operands or cells containing operands of type
-	 * that are considered invalid and would result in #VALUE! error in
-	 * excel cause this function to return <code>null</code>.
-	 *
-	 * @return never <code>null</code>
-	 */
-	protected final double[] getNumberArray(ValueEval[] operands) throws EvaluationException {
-		if (operands.length > getMaxNumOperands()) {
-			throw EvaluationException.invalidValue();
-		}
-		DoubleList retval = new DoubleList();
-
-		for (int i=0, iSize=operands.length; i<iSize; i++) {
-			collectValues(operands[i], retval);
-		}
-		return retval.toArray();
-	}
-
-    /**
-     *  Whether to count nested subtotals.
-     */
-    public boolean isSubtotalCounted(){
-        return true;
-    }
-
-	/**
-	 * Collects values from a single argument
-	 */
-	private void collectValues(ValueEval operand, DoubleList temp) throws EvaluationException {
-        if (operand instanceof ThreeDEval) {
-            ThreeDEval ae = (ThreeDEval) operand;
-            for (int sIx=ae.getFirstSheetIndex(); sIx <= ae.getLastSheetIndex(); sIx++) {
-                int width = ae.getWidth();
-                int height = ae.getHeight();
-                for (int rrIx=0; rrIx<height; rrIx++) {
-                    for (int rcIx=0; rcIx<width; rcIx++) {
-                        ValueEval ve = ae.getValue(sIx, rrIx, rcIx);
-                        if(!isSubtotalCounted() && ae.isSubTotal(rrIx, rcIx)) continue;
-                        collectValue(ve, true, temp);
-                    }
-                }
-            }
-            return;
-        }
-		if (operand instanceof TwoDEval) {
-			TwoDEval ae = (TwoDEval) operand;
-			int width = ae.getWidth();
-			int height = ae.getHeight();
-			for (int rrIx=0; rrIx<height; rrIx++) {
-				for (int rcIx=0; rcIx<width; rcIx++) {
-					ValueEval ve = ae.getValue(rrIx, rcIx);
-                    if(!isSubtotalCounted() && ae.isSubTotal(rrIx, rcIx)) continue;
-                    collectValue(ve, true, temp);
-				}
-			}
-			return;
-		}
-		if (operand instanceof RefEval) {
-			RefEval re = (RefEval) operand;
-			for (int sIx = re.getFirstSheetIndex(); sIx <= re.getLastSheetIndex(); sIx++) {
-			    collectValue(re.getInnerValueEval(sIx), true, temp);
-			}
-			return;
-		}
-		collectValue(operand, false, temp);
-	}
-	private void collectValue(ValueEval ve, boolean isViaReference, DoubleList temp)  throws EvaluationException {
-		if (ve == null) {
-			throw new IllegalArgumentException("ve must not be null");
-		}
-		if (ve instanceof BoolEval) {
-			if (!isViaReference || _isReferenceBoolCounted) {
-				BoolEval boolEval = (BoolEval) ve;
-				temp.add(boolEval.getNumberValue());
-			}
-			return;
-		}
-		if (ve instanceof NumericValueEval) {
-			NumericValueEval ne = (NumericValueEval) ve;
-			temp.add(ne.getNumberValue());
-			return;
-		}
-		if (ve instanceof StringValueEval) {
-			if (isViaReference) {
-				// ignore all ref strings
-				return;
-			}
-			String s = ((StringValueEval) ve).getStringValue();
-			Double d = OperandResolver.parseDouble(s);
-			if(d == null) {
-				throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			temp.add(d.doubleValue());
-			return;
-		}
-		if (ve instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval) ve);
-		}
-		if (ve == BlankEval.instance) {
-			if (_isBlankCounted) {
-				temp.add(0.0);
-			}
-			return;
-		}
-		throw new RuntimeException("Invalid ValueEval type passed for conversion: ("
-				+ ve.getClass() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Na.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Na.java
deleted file mode 100644
index 3224867..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Na.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation of Excel function NA()
- *
- * @author Josh Micich
- */
-public final class Na extends Fixed0ArgFunction {
-
-	public ValueEval evaluate(int srcCellRow, int srcCellCol) {
-		return ErrorEval.NA;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
deleted file mode 100644
index 50e6237..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.NotImplementedFunctionException;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * This is the default implementation of a Function class.
- * The default behaviour is to raise a POI internal error
- * ({@link NotImplementedFunctionException}). This error should alert
- * the user that the formula contained a function that is not
- * yet implemented.
- */
-public final class NotImplementedFunction implements Function {
-	private final String _functionName;
-	protected NotImplementedFunction() {
-		_functionName = getClass().getName();
-	}
-	public NotImplementedFunction(String name) {
-		_functionName = name;
-	}
-
-	public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
-		throw new NotImplementedFunctionException(_functionName);
-	}
-	public String getFunctionName() {
-		return _functionName;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Now.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Now.java
deleted file mode 100644
index e0fcf22..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Now.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Date;
-
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-
-/**
- * Implementation of Excel NOW() Function
- *
- * @author Frank Taffelt
- */
-public final class Now extends Fixed0ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-		Date now = new Date(System.currentTimeMillis());
-		return new NumberEval(DateUtil.getExcelDate(now));
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Npv.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Npv.java
deleted file mode 100644
index 760120f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Npv.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Calculates the net present value of an investment by using a discount rate
- * and a series of future payments (negative values) and income (positive
- * values). Minimum 2 arguments, first arg is the rate of discount over the
- * length of one period others up to 254 arguments representing the payments and
- * income.
- *
- * @author SPetrakovsky
- * @author Marcel May
- */
-public final class Npv implements Function {
-
-	public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		int nArgs = args.length;
-		if (nArgs < 2) {
-			return ErrorEval.VALUE_INVALID;
-		}
-
-        try {
-			double rate = NumericFunction.singleOperandEvaluate(args[0], srcRowIndex, srcColumnIndex);
-            // convert tail arguments into an array of doubles
-            ValueEval[] vargs = new ValueEval[args.length-1];
-            System.arraycopy(args, 1, vargs, 0, vargs.length);
-            double[] values = AggregateFunction.ValueCollector.collectValues(vargs);
-
-            double result = FinanceLib.npv(rate, values);
-			NumericFunction.checkValue(result);
-            return new NumberEval(result);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java
deleted file mode 100644
index 72be101..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- * @author Josh Micich
- * @author Stephen Wolke (smwolke at geistig.com)
- */
-public abstract class NumericFunction implements Function {
-
-	static final double ZERO = 0.0;
-	static final double TEN = 10.0;
-	static final double LOG_10_TO_BASE_e = Math.log(TEN);
-
-	protected static final double singleOperandEvaluate(ValueEval arg, int srcRowIndex, int srcColumnIndex) throws EvaluationException {
-		if (arg == null) {
-			throw new IllegalArgumentException("arg must not be null");
-		}
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcRowIndex, srcColumnIndex);
-		double result = OperandResolver.coerceValueToDouble(ve);
-		checkValue(result);
-		return result;
-	}
-
-	/**
-	 * @throws EvaluationException (#NUM!) if <tt>result</tt> is <tt>NaN</> or <tt>Infinity</tt>
-	 */
-	public static final void checkValue(double result) throws EvaluationException {
-		if (Double.isNaN(result) || Double.isInfinite(result)) {
-			throw new EvaluationException(ErrorEval.NUM_ERROR);
-		}
-	}
-
-	public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-		double result;
-		try {
-			result = eval(args, srcCellRow, srcCellCol);
-			checkValue(result);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new NumberEval(result);
-	}
-
-	protected abstract double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException;
-
-	/* -------------------------------------------------------------------------- */
-	// intermediate sub-classes (one-arg, two-arg and multi-arg)
-
-	public static abstract class OneArg extends Fixed1ArgFunction {
-		protected OneArg() {
-			// no fields to initialise
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			double result;
-			try {
-				double d = singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-				result = evaluate(d);
-				checkValue(result);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			return new NumberEval(result);
-		}
-		protected final double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException {
-			if (args.length != 1) {
-				throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			double d = singleOperandEvaluate(args[0], srcCellRow, srcCellCol);
-			return evaluate(d);
-		}
-		protected abstract double evaluate(double d) throws EvaluationException;
-	}
-
-	public static abstract class TwoArg extends Fixed2ArgFunction {
-		protected TwoArg() {
-			// no fields to initialise
-		}
-
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-			double result;
-			try {
-				double d0 = singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-				double d1 = singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-				result =  evaluate(d0, d1);
-				checkValue(result);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			return new NumberEval(result);
-		}
-
-		protected abstract double evaluate(double d0, double d1) throws EvaluationException;
-	}
-
-	/* -------------------------------------------------------------------------- */
-
-	public static final Function ABS = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.abs(d);
-		}
-	};
-	public static final Function ACOS = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.acos(d);
-		}
-	};
-	public static final Function ACOSH = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.acosh(d);
-		}
-	};
-	public static final Function ASIN = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.asin(d);
-		}
-	};
-	public static final Function ASINH = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.asinh(d);
-		}
-	};
-	public static final Function ATAN = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.atan(d);
-		}
-	};
-	public static final Function ATANH = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.atanh(d);
-		}
-	};
-	public static final Function COS = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.cos(d);
-		}
-	};
-	public static final Function COSH = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.cosh(d);
-		}
-	};
-	public static final Function DEGREES = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.toDegrees(d);
-		}
-	};
-	static final NumberEval DOLLAR_ARG2_DEFAULT = new NumberEval(2.0);
-	public static final Function DOLLAR = new Var1or2ArgFunction() {
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			return evaluate(srcRowIndex, srcColumnIndex, arg0, DOLLAR_ARG2_DEFAULT);
-		}
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0,
-				ValueEval arg1) {
-			double val;
-			double d1;
-			try {
-				val = singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-				d1 = singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			// second arg converts to int by truncating toward zero
-			int nPlaces = (int)d1;
-
-			if (nPlaces > 127) {
-				return ErrorEval.VALUE_INVALID;
-			}
-
-
-			// TODO - DOLLAR() function impl is NQR
-			// result should be StringEval, with leading '$' and thousands separators
-			// current junits are asserting incorrect behaviour
-			return new NumberEval(val);
-		}
-	};
-	public static final Function EXP = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.pow(Math.E, d);
-		}
-	};
-	public static final Function FACT = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.factorial((int)d);
-		}
-	};
-	public static final Function INT = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.round(d-0.5);
-		}
-	};
-	public static final Function LN = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.log(d);
-		}
-	};
-	public static final Function LOG10 = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.log(d) / LOG_10_TO_BASE_e;
-		}
-	};
-	public static final Function RADIANS = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.toRadians(d);
-		}
-	};
-	public static final Function SIGN = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.sign(d);
-		}
-	};
-	public static final Function SIN = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.sin(d);
-		}
-	};
-	public static final Function SINH = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.sinh(d);
-		}
-	};
-	public static final Function SQRT = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.sqrt(d);
-		}
-	};
-
-	public static final Function TAN = new OneArg() {
-		protected double evaluate(double d) {
-			return Math.tan(d);
-		}
-	};
-	public static final Function TANH = new OneArg() {
-		protected double evaluate(double d) {
-			return MathX.tanh(d);
-		}
-	};
-
-	/* -------------------------------------------------------------------------- */
-
-	public static final Function ATAN2 = new TwoArg() {
-		protected double evaluate(double d0, double d1) throws EvaluationException {
-			if (d0 == ZERO && d1 == ZERO) {
-				throw new EvaluationException(ErrorEval.DIV_ZERO);
-			}
-			return Math.atan2(d1, d0);
-		}
-	};
-	public static final Function CEILING = new TwoArg() {
-		protected double evaluate(double d0, double d1) {
-			return MathX.ceiling(d0, d1);
-		}
-	};
-	public static final Function COMBIN = new TwoArg() {
-		protected double evaluate(double d0, double d1) throws EvaluationException {
-			if (d0 > Integer.MAX_VALUE || d1 > Integer.MAX_VALUE) {
-				throw new EvaluationException(ErrorEval.NUM_ERROR);
-			}
-			return  MathX.nChooseK((int) d0, (int) d1);
-		}
-	};
-	public static final Function FLOOR = new TwoArg() {
-		protected double evaluate(double d0, double d1) throws EvaluationException {
-			if (d1 == ZERO) {
-				if (d0 == ZERO) {
-					return ZERO;
-				}
-				throw new EvaluationException(ErrorEval.DIV_ZERO);
-			}
-			return MathX.floor(d0, d1);
-		}
-	};
-	public static final Function MOD = new TwoArg() {
-		protected double evaluate(double d0, double d1) throws EvaluationException {
-			if (d1 == ZERO) {
-				throw new EvaluationException(ErrorEval.DIV_ZERO);
-			}
-			return MathX.mod(d0, d1);
-		}
-	};
-	public static final Function POWER = new TwoArg() {
-		protected double evaluate(double d0, double d1) {
-			return Math.pow(d0, d1);
-		}
-	};
-	public static final Function ROUND = new TwoArg() {
-		protected double evaluate(double d0, double d1) {
-			return MathX.round(d0, (int)d1);
-		}
-	};
-	public static final Function ROUNDDOWN = new TwoArg() {
-		protected double evaluate(double d0, double d1) {
-			return MathX.roundDown(d0, (int)d1);
-		}
-	};
-	public static final Function ROUNDUP = new TwoArg() {
-		protected double evaluate(double d0, double d1) {
-			return MathX.roundUp(d0, (int)d1);
-		}
-	};
-	static final NumberEval TRUNC_ARG2_DEFAULT = new NumberEval(0);
-	public static final Function TRUNC = new Var1or2ArgFunction() {
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			return evaluate(srcRowIndex, srcColumnIndex, arg0, TRUNC_ARG2_DEFAULT);
-		}
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-			double result;
-			try {
-				double d0 = singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-				double d1 = singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-				double multi = Math.pow(10d,d1);
-				if(d0 < 0) result = -Math.floor(-d0 * multi) / multi;
-                else result = Math.floor(d0 * multi) / multi;
-				checkValue(result);
-			}catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			return new NumberEval(result);
-		}
-	};
-
-	/* -------------------------------------------------------------------------- */
-
-	private static final class Log extends Var1or2ArgFunction {
-		public Log() {
-			// no instance fields
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			double result;
-			try {
-				double d0 = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-				result = Math.log(d0) / LOG_10_TO_BASE_e;
-				NumericFunction.checkValue(result);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			return new NumberEval(result);
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0,
-				ValueEval arg1) {
-			double result;
-			try {
-				double d0 = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-				double d1 = NumericFunction.singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-				double logE = Math.log(d0);
-				double base = d1;
-				if (Double.compare(base, Math.E) == 0) {
-					result = logE;
-				} else {
-					result = logE / Math.log(base);
-				}
-				NumericFunction.checkValue(result);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			return new NumberEval(result);
-		}
-	}
-
-	public static final Function LOG = new Log();
-
-	static final NumberEval PI_EVAL = new NumberEval(Math.PI);
-	public static final Function PI = new Fixed0ArgFunction() {
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-			return PI_EVAL;
-		}
-	};
-	public static final Function RAND = new Fixed0ArgFunction() {
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-			return new NumberEval(Math.random());
-		}
-	};
-    public static final Function POISSON = new Fixed3ArgFunction() {
-
-        private final static double DEFAULT_RETURN_RESULT =1;
-        
-        /**
-         * This checks is x = 0 and the mean = 0.
-         * Excel currently returns the value 1 where as the
-         * maths common implementation will error.
-         * @param x  The number.
-         * @param mean The mean.
-         * @return If a default value should be returned.
-         */
-        private boolean isDefaultResult(double x, double mean) {
-
-            if ( x == 0 && mean == 0 ) {
-                return true;
-            }
-            return false;
-        }
-
-        private boolean checkArgument(double aDouble) throws EvaluationException {
-
-            NumericFunction.checkValue(aDouble);
-
-            // make sure that the number is positive
-            if (aDouble < 0) {
-                throw new EvaluationException(ErrorEval.NUM_ERROR);
-            }
-            
-            return true;
-        }
-
-        private double probability(int k, double lambda) {
-            return Math.pow(lambda, k) * Math.exp(-lambda) / factorial(k);
-        }
-
-        private double cumulativeProbability(int x, double lambda) {
-            double result = 0;
-            for(int k = 0; k <= x; k++){
-                result += probability(k, lambda);
-            }
-            return result;
-        }
-
-        /** All long-representable factorials */
-        private final long[] FACTORIALS = new long[] {
-                           1l,                  1l,                   2l,
-                           6l,                 24l,                 120l,
-                         720l,               5040l,               40320l,
-                      362880l,            3628800l,            39916800l,
-                   479001600l,         6227020800l,         87178291200l,
-               1307674368000l,     20922789888000l,     355687428096000l,
-            6402373705728000l, 121645100408832000l, 2432902008176640000l };
-
-
-        public long factorial(final int n) {
-            if (n < 0 || n > 20) {
-                throw new IllegalArgumentException("Valid argument should be in the range [0..20]");
-            }
-            return FACTORIALS[n];
-        }
-
-        public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1, ValueEval arg2) {
-
-            // arguments/result for this function
-            double mean=0;
-            double x=0;
-            boolean cumulative = ((BoolEval)arg2).getBooleanValue();
-            double result=0;
-
-            try {
-				x = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex);
-				mean = NumericFunction.singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex);
-
-                // check for default result : excel implementation for 0,0
-                // is different to Math Common.
-                if (isDefaultResult(x,mean)) {
-                    return new NumberEval(DEFAULT_RETURN_RESULT); 
-                }
-                // check the arguments : as per excel function def
-                checkArgument(x);
-                checkArgument(mean);
-
-                // truncate x : as per excel function def
-                if ( cumulative ) {
-                    result = cumulativeProbability((int)x, mean);
-                } else {
-                    result = probability((int)x, mean);
-                }
-
-                // check the result
-                NumericFunction.checkValue(result);
-
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-            
-            return new NumberEval(result);
-
-        }
-    };
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Oct2Dec.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
deleted file mode 100644
index db9447d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * <p>Implementation for Excel Oct2Dec() function.<p/>
- * <p>
- * Converts an octal number to decimal.
- * </p>
- * <p>
- * <b>Syntax</b>:<br/> <b>Oct2Dec  </b>(<b>number</b> )
- * </p>
- * <p/>
- * Number     is the octal number you want to convert. Number may not contain more than 10 octal characters (30 bits).
- * The most significant bit of number is the sign bit. The remaining 29 bits are magnitude bits.
- * Negative numbers are represented using two's-complement notation..
- * <p/>
- * If number is not a valid octal number, OCT2DEC returns the #NUM! error value.
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Oct2Dec extends Fixed1ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Oct2Dec();
-
-    static final int MAX_NUMBER_OF_PLACES = 10;
-    static final int OCTAL_BASE = 8;
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
-        String octal = OperandResolver.coerceValueToString(numberVE);
-        try {
-           return new NumberEval(BaseNumberUtils.convertToDecimal(octal, OCTAL_BASE, MAX_NUMBER_OF_PLACES));
-        }  catch (IllegalArgumentException e) {
-            return ErrorEval.NUM_ERROR;
-        }
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 1) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Odd.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Odd.java
deleted file mode 100644
index 6762fcb..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Odd.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- */
-public final class Odd extends NumericFunction.OneArg {
-	private static final long PARITY_MASK = 0xFFFFFFFFFFFFFFFEL;
-
-	protected double evaluate(double d) {
-		if (d==0) {
-			return 1;
-		}
-		return (d>0) ? calcOdd(d) : -calcOdd(-d);
-	}
-
-	private static long calcOdd(double d) {
-		double dpm1 = d+1;
-		long x = ((long) dpm1) & PARITY_MASK;
-		return ( Double.compare(x, dpm1) == 0 ) ? x-1 : x+1;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java
deleted file mode 100644
index 37ae8e6..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Implementation for Excel function OFFSET()<p/>
- *
- * OFFSET returns an area reference that is a specified number of rows and columns from a
- * reference cell or area.<p/>
- *
- * <b>Syntax</b>:<br/>
- * <b>OFFSET</b>(<b>reference</b>, <b>rows</b>, <b>cols</b>, height, width)<p/>
- * <b>reference</b> is the base reference.<br/>
- * <b>rows</b> is the number of rows up or down from the base reference.<br/>
- * <b>cols</b> is the number of columns left or right from the base reference.<br/>
- * <b>height</b> (default same height as base reference) is the row count for the returned area reference.<br/>
- * <b>width</b> (default same width as base reference) is the column count for the returned area reference.<br/>
- *
- * @author Josh Micich
- */
-public final class Offset implements Function {
-	// These values are specific to BIFF8
-	private static final int LAST_VALID_ROW_INDEX = 0xFFFF;
-	private static final int LAST_VALID_COLUMN_INDEX = 0xFF;
-
-
-	/**
-	 * A one dimensional base + offset.  Represents either a row range or a column range.
-	 * Two instances of this class together specify an area range.
-	 */
-	/* package */ static final class LinearOffsetRange {
-
-		private final int _offset;
-		private final int _length;
-
-		public LinearOffsetRange(int offset, int length) {
-			if(length == 0) {
-				// handled that condition much earlier
-				throw new RuntimeException("length may not be zero");
-			}
-			_offset = offset;
-			_length = length;
-		}
-
-		public short getFirstIndex() {
-			return (short) _offset;
-		}
-		public short getLastIndex() {
-			return (short) (_offset + _length - 1);
-		}
-		/**
-		 * Moves the range by the specified translation amount.<p/>
-		 *
-		 * This method also 'normalises' the range: Excel specifies that the width and height
-		 * parameters (length field here) cannot be negative.  However, OFFSET() does produce
-		 * sensible results in these cases.  That behavior is replicated here. <p/>
-		 *
-		 * @param translationAmount may be zero negative or positive
-		 *
-		 * @return the equivalent <tt>LinearOffsetRange</tt> with a positive length, moved by the
-		 * specified translationAmount.
-		 */
-		public LinearOffsetRange normaliseAndTranslate(int translationAmount) {
-			if (_length > 0) {
-				if(translationAmount == 0) {
-					return this;
-				}
-				return new LinearOffsetRange(translationAmount + _offset, _length);
-			}
-			return new LinearOffsetRange(translationAmount + _offset + _length + 1, -_length);
-		}
-
-		public boolean isOutOfBounds(int lowValidIx, int highValidIx) {
-			if(_offset < lowValidIx) {
-				return true;
-			}
-			if(getLastIndex() > highValidIx) {
-				return true;
-			}
-			return false;
-		}
-		public String toString() {
-			StringBuffer sb = new StringBuffer(64);
-			sb.append(getClass().getName()).append(" [");
-			sb.append(_offset).append("...").append(getLastIndex());
-			sb.append("]");
-			return sb.toString();
-		}
-	}
-
-	/**
-	 * Encapsulates either an area or cell reference which may be 2d or 3d.
-	 */
-	private static final class BaseRef {
-		private final int _firstRowIndex;
-		private final int _firstColumnIndex;
-		private final int _width;
-		private final int _height;
-		private final RefEval _refEval;
-		private final AreaEval _areaEval;
-
-		public BaseRef(RefEval re) {
-			_refEval = re;
-			_areaEval = null;
-			_firstRowIndex = re.getRow();
-			_firstColumnIndex = re.getColumn();
-			_height = 1;
-			_width = 1;
-		}
-
-		public BaseRef(AreaEval ae) {
-			_refEval = null;
-			_areaEval = ae;
-			_firstRowIndex = ae.getFirstRow();
-			_firstColumnIndex = ae.getFirstColumn();
-			_height = ae.getLastRow() - ae.getFirstRow() + 1;
-			_width = ae.getLastColumn() - ae.getFirstColumn() + 1;
-		}
-
-		public int getWidth() {
-			return _width;
-		}
-		public int getHeight() {
-			return _height;
-		}
-		public int getFirstRowIndex() {
-			return _firstRowIndex;
-		}
-		public int getFirstColumnIndex() {
-			return _firstColumnIndex;
-		}
-
-		public AreaEval offset(int relFirstRowIx, int relLastRowIx,
-				int relFirstColIx, int relLastColIx) {
-			if (_refEval == null) {
-				return _areaEval.offset(relFirstRowIx, relLastRowIx, relFirstColIx, relLastColIx);
-			}
-			return _refEval.offset(relFirstRowIx, relLastRowIx, relFirstColIx, relLastColIx);
-		}
-	}
-
-	@SuppressWarnings("fallthrough")
-	public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-		if(args.length < 3 || args.length > 5) {
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		try {
-			BaseRef baseRef = evaluateBaseRef(args[0]);
-			int rowOffset = evaluateIntArg(args[1], srcCellRow, srcCellCol);
-			int columnOffset = evaluateIntArg(args[2], srcCellRow, srcCellCol);
-			int height = baseRef.getHeight();
-			int width = baseRef.getWidth();
-			// optional arguments
-			// If height or width is omitted, it is assumed to be the same height or width as reference.
-			switch(args.length) {
-				case 5:
-					if(!(args[4] instanceof MissingArgEval)) {
-						width = evaluateIntArg(args[4], srcCellRow, srcCellCol);
-					}
-					// fall-through to pick up height
-				case 4:
-					if(!(args[3] instanceof MissingArgEval)) {
-						height = evaluateIntArg(args[3], srcCellRow, srcCellCol);
-					}
-					break;
-				//case 3:
-					// nothing to do
-				default:
-					break;
-			}
-			// Zero height or width raises #REF! error
-			if(height == 0 || width == 0) {
-				return ErrorEval.REF_INVALID;
-			}
-			LinearOffsetRange rowOffsetRange = new LinearOffsetRange(rowOffset, height);
-			LinearOffsetRange colOffsetRange = new LinearOffsetRange(columnOffset, width);
-			return createOffset(baseRef, rowOffsetRange, colOffsetRange);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	private static AreaEval createOffset(BaseRef baseRef,
-			LinearOffsetRange orRow, LinearOffsetRange orCol) throws EvaluationException {
-		LinearOffsetRange absRows = orRow.normaliseAndTranslate(baseRef.getFirstRowIndex());
-		LinearOffsetRange absCols = orCol.normaliseAndTranslate(baseRef.getFirstColumnIndex());
-
-		if(absRows.isOutOfBounds(0, LAST_VALID_ROW_INDEX)) {
-			throw new EvaluationException(ErrorEval.REF_INVALID);
-		}
-		if(absCols.isOutOfBounds(0, LAST_VALID_COLUMN_INDEX)) {
-			throw new EvaluationException(ErrorEval.REF_INVALID);
-		}
-		return baseRef.offset(orRow.getFirstIndex(), orRow.getLastIndex(), orCol.getFirstIndex(), orCol.getLastIndex());
-	}
-
-	private static BaseRef evaluateBaseRef(ValueEval eval) throws EvaluationException {
-
-		if(eval instanceof RefEval) {
-			return new BaseRef((RefEval)eval);
-		}
-		if(eval instanceof AreaEval) {
-			return new BaseRef((AreaEval)eval);
-		}
-		if (eval instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval) eval);
-		}
-		throw new EvaluationException(ErrorEval.VALUE_INVALID);
-	}
-
-	/**
-	 * OFFSET's numeric arguments (2..5) have similar processing rules
-	 */
-	static int evaluateIntArg(ValueEval eval, int srcCellRow, int srcCellCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(eval, srcCellRow, srcCellCol);
-		return OperandResolver.coerceValueToInt(ve);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java b/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java
deleted file mode 100644
index 2df2304..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/PPMT.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.*;
-
-/**
-  * Compute the interest portion of a payment.
-  * 
-  * @author Mike Argyriou micharg@gmail.com
-  */
-public class PPMT extends NumericFunction {
-
-	@Override
-	public double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException {
-
-		if(args.length < 4)
-        		throw new EvaluationException(ErrorEval.VALUE_INVALID);
-
-		double result;
-
-		ValueEval v1 = OperandResolver.getSingleValue(args[0], srcCellRow, srcCellCol);
-                ValueEval v2 = OperandResolver.getSingleValue(args[1], srcCellRow, srcCellCol);
-                ValueEval v3 = OperandResolver.getSingleValue(args[2], srcCellRow, srcCellCol);
-                ValueEval v4 = OperandResolver.getSingleValue(args[3], srcCellRow, srcCellCol);
-
-		double interestRate = OperandResolver.coerceValueToDouble(v1);
-                int period = OperandResolver.coerceValueToInt(v2);
-                int numberPayments = OperandResolver.coerceValueToInt(v3);
-                double PV = OperandResolver.coerceValueToDouble(v4);
-
-		result = Finance.ppmt(interestRate, period, numberPayments, PV) ;
-
-		checkValue(result);
-		
-		return result;
-	}
-
-	
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Quotient.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Quotient.java
deleted file mode 100644
index 40d1deb..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Quotient.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * <p>Implementation for Excel QUOTIENT () function.<p/>
- * <p>
- * <b>Syntax</b>:<br/> <b>QUOTIENT</b>(<b>Numerator</b>,<b>Denominator</b>)<br/>
- * <p/>
- * <p>
- * Numerator     is the dividend.
- * Denominator     is the divisor.
- *
- * Returns the integer portion of a division. Use this function when you want to discard the remainder of a division.
- * <p/>
- *
- * If either enumerator/denominator is non numeric, QUOTIENT returns the #VALUE! error value.
- * If denominator is equals to zero, QUOTIENT returns the #DIV/0! error value.
- */
-public class Quotient extends Fixed2ArgFunction implements FreeRefFunction {
-
-    public static final FreeRefFunction instance = new Quotient();
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval venumerator, ValueEval vedenominator) {
-
-        double enumerator = 0;
-        try {
-            enumerator = OperandResolver.coerceValueToDouble(venumerator);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        double denominator = 0;
-        try {
-            denominator = OperandResolver.coerceValueToDouble(vedenominator);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        if (denominator == 0) {
-            return ErrorEval.DIV_ZERO;
-        }
-
-        return new NumberEval((int)(enumerator / denominator));
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length != 2) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Rank.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Rank.java
deleted file mode 100644
index c6ff860..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Rank.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-
-/**
- * Returns the rank of a number in a list of numbers. The rank of a number is its size relative to other values in a list.
-
- * Syntax:
- *    RANK(number,ref,order)
- *       Number   is the number whose rank you want to find.
- *       Ref     is an array of, or a reference to, a list of numbers. Nonnumeric values in ref are ignored.
- *       Order   is a number specifying how to rank number.
-
- * If order is 0 (zero) or omitted, Microsoft Excel ranks number as if ref were a list sorted in descending order.
- * If order is any nonzero value, Microsoft Excel ranks number as if ref were a list sorted in ascending order.
- * 
- * @author Rubin Wang
- */
-public class Rank extends Var2or3ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-
-		AreaEval aeRange;
-		double result;
-		try {
-			ValueEval ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			result = OperandResolver.coerceValueToDouble(ve);
-			if (Double.isNaN(result) || Double.isInfinite(result)) {
-				throw new EvaluationException(ErrorEval.NUM_ERROR);
-			}
-			aeRange = convertRangeArg(arg1);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return eval(srcRowIndex, srcColumnIndex, result, aeRange, true);
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1, ValueEval arg2) {
-
-		AreaEval aeRange;
-		double result;
-		boolean order=false;
-		try {
-			ValueEval ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-			result = OperandResolver.coerceValueToDouble(ve);
-			if (Double.isNaN(result) || Double.isInfinite(result)) {
-				throw new EvaluationException(ErrorEval.NUM_ERROR);
-			}
-			aeRange = convertRangeArg(arg1);
-			
-			ve = OperandResolver.getSingleValue(arg2, srcRowIndex, srcColumnIndex);
-			int order_value = OperandResolver.coerceValueToInt(ve);
-			if(order_value==0){
-				order=true;
-			}else if(order_value==1){
-				order=false;
-			}else throw new EvaluationException(ErrorEval.NUM_ERROR);
-			
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return eval(srcRowIndex, srcColumnIndex, result, aeRange, order);
-	}
-
-	private static ValueEval eval(int srcRowIndex, int srcColumnIndex, double arg0, AreaEval aeRange, boolean descending_order) {
-		
-		int rank = 1;
-		int height=aeRange.getHeight();
-		int width= aeRange.getWidth();
-		for (int r=0; r<height; r++) {
-			for (int c=0; c<width; c++) {
-				
-				Double value = getValue(aeRange, r, c);
-				if(value==null)continue;
-				if(descending_order && value>arg0 || !descending_order && value<arg0){
-					rank++;
-				}
-			}
-		}
-		return new NumberEval(rank);
-	}
-	
-	private static Double getValue(AreaEval aeRange, int relRowIndex, int relColIndex) {
-
-		ValueEval addend = aeRange.getRelativeValue(relRowIndex, relColIndex);
-		if (addend instanceof NumberEval) {
-			return ((NumberEval)addend).getNumberValue();
-		}
-		// everything else (including string and boolean values) counts as zero
-		return null;
-	}
-
-	private static AreaEval convertRangeArg(ValueEval eval) throws EvaluationException {
-		if (eval instanceof AreaEval) {
-			return (AreaEval) eval;
-		}
-		if (eval instanceof RefEval) {
-			return ((RefEval)eval).offset(0, 0, 0, 0);
-		}
-		throw new EvaluationException(ErrorEval.VALUE_INVALID);
-	}
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Rate.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Rate.java
deleted file mode 100644
index 2a28b95..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Rate.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Implements the Excel Rate function
- */
-public class Rate implements Function {
-    private static final POILogger LOG = POILogFactory.getLogger(Rate.class);
-    
-   public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-      if (args.length < 3) { //First 3 parameters are mandatory
-         return ErrorEval.VALUE_INVALID;
-      }
-
-      double periods, payment, present_val, future_val = 0, type = 0, estimate = 0.1, rate;
-
-      try {
-         ValueEval v1 = OperandResolver.getSingleValue(args[0], srcRowIndex, srcColumnIndex);
-         ValueEval v2 = OperandResolver.getSingleValue(args[1], srcRowIndex, srcColumnIndex);
-         ValueEval v3 = OperandResolver.getSingleValue(args[2], srcRowIndex, srcColumnIndex);
-         ValueEval v4 = null;
-         if (args.length >= 4)
-            v4 = OperandResolver.getSingleValue(args[3], srcRowIndex, srcColumnIndex);
-         ValueEval v5 = null;
-         if (args.length >= 5)
-            v5 = OperandResolver.getSingleValue(args[4], srcRowIndex, srcColumnIndex);
-         ValueEval v6 = null;
-         if (args.length >= 6)
-            v6 = OperandResolver.getSingleValue(args[5], srcRowIndex, srcColumnIndex);
-
-         periods = OperandResolver.coerceValueToDouble(v1); 
-         payment = OperandResolver.coerceValueToDouble(v2);
-         present_val = OperandResolver.coerceValueToDouble(v3);
-         if (args.length >= 4)
-            future_val = OperandResolver.coerceValueToDouble(v4);
-         if (args.length >= 5)
-            type = OperandResolver.coerceValueToDouble(v5);
-         if (args.length >= 6)
-            estimate = OperandResolver.coerceValueToDouble(v6);
-         rate = calculateRate(periods, payment, present_val, future_val, type, estimate) ;
-
-         checkValue(rate);
-      } catch (EvaluationException e) {
-          LOG.log(POILogger.ERROR, "Can't evaluate rate function", e);
-         return e.getErrorEval();
-      }
-
-      return new NumberEval( rate ) ;
-   }
-
-   private double calculateRate(double nper, double pmt, double pv, double fv, double type, double guess) {
-      //FROM MS http://office.microsoft.com/en-us/excel-help/rate-HP005209232.aspx
-      int FINANCIAL_MAX_ITERATIONS = 20;//Bet accuracy with 128
-      double FINANCIAL_PRECISION = 0.0000001;//1.0e-8
-
-      double y, y0, y1, x0, x1 = 0, f = 0, i = 0;
-      double rate = guess;
-      if (Math.abs(rate) < FINANCIAL_PRECISION) {
-         y = pv * (1 + nper * rate) + pmt * (1 + rate * type) * nper + fv;
-      } else {
-         f = Math.exp(nper * Math.log(1 + rate));
-         y = pv * f + pmt * (1 / rate + type) * (f - 1) + fv;
-      }
-      y0 = pv + pmt * nper + fv;
-      y1 = pv * f + pmt * (1 / rate + type) * (f - 1) + fv;
-
-      // find root by Newton secant method
-      i = x0 = 0.0;
-      x1 = rate;
-      while ((Math.abs(y0 - y1) > FINANCIAL_PRECISION) && (i < FINANCIAL_MAX_ITERATIONS)) {
-         rate = (y1 * x0 - y0 * x1) / (y1 - y0);
-         x0 = x1;
-         x1 = rate;
-
-         if (Math.abs(rate) < FINANCIAL_PRECISION) {
-            y = pv * (1 + nper * rate) + pmt * (1 + rate * type) * nper + fv;
-         } else {
-            f = Math.exp(nper * Math.log(1 + rate));
-            y = pv * f + pmt * (1 / rate + type) * (f - 1) + fv;
-         }
-
-         y0 = y1;
-         y1 = y;
-         ++i;
-      }
-      return rate;
-   }
-
-   /**
-    * Excel does not support infinities and NaNs, rather, it gives a #NUM! error in these cases
-    * 
-    * @throws EvaluationException (#NUM!) if <tt>result</tt> is <tt>NaN</> or <tt>Infinity</tt>
-    */
-   static final void checkValue(double result) throws EvaluationException {
-      if (Double.isNaN(result) || Double.isInfinite(result)) {
-         throw new EvaluationException(ErrorEval.NUM_ERROR);
-      }
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Replace.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Replace.java
deleted file mode 100644
index dd366db..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Replace.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * An implementation of the Excel REPLACE() function:<p/>
- * Replaces part of a text string based on the number of characters
- * you specify, with another text string.<br/>
- *
- * <b>Syntax</b>:<br/>
- * <b>REPLACE</b>(<b>oldText</b>, <b>startNum</b>, <b>numChars</b>, <b>newText</b>)<p/>
- *
- * <b>oldText</b>  The text string containing characters to replace<br/>
- * <b>startNum</b> The position of the first character to replace (1-based)<br/>
- * <b>numChars</b> The number of characters to replace<br/>
- * <b>newText</b> The new text value to replace the removed section<br/>
- *
- * @author Manda Wilson &lt; wilson at c bio dot msk cc dot org &gt;
- */
-public final class Replace extends Fixed4ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2, ValueEval arg3) {
-
-		String oldStr;
-		int startNum;
-		int numChars;
-		String newStr;
-		try {
-			oldStr = TextFunction.evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-			startNum = TextFunction.evaluateIntArg(arg1, srcRowIndex, srcColumnIndex);
-			numChars = TextFunction.evaluateIntArg(arg2, srcRowIndex, srcColumnIndex);
-			newStr = TextFunction.evaluateStringArg(arg3, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-
-		if (startNum < 1 || numChars < 0) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		StringBuffer strBuff = new StringBuffer(oldStr);
-		// remove any characters that should be replaced
-		if (startNum <= oldStr.length() && numChars != 0) {
-			strBuff.delete(startNum - 1, startNum - 1 + numChars);
-		}
-		// now insert (or append) newStr
-		if (startNum > strBuff.length()) {
-			strBuff.append(newStr);
-		} else {
-			strBuff.insert(startNum - 1, newStr);
-		}
-		return new StringEval(strBuff.toString());
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java
deleted file mode 100644
index 0c8a5f8..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Rept.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for Excel REPT () function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>REPT  </b>(<b>text</b>,<b>number_times</b> )<br/>
- * <p/>
- * Repeats text a given number of times. Use REPT to fill a cell with a number of instances of a text string.
- *
- * text : text The text that you want to repeat.
- * number_times:	A positive number specifying the number of times to repeat text.
- *
- * If number_times is 0 (zero), REPT returns "" (empty text).
- * If this argument contains a decimal value, this function ignores the numbers to the right side of the decimal point.
- *
- * The result of the REPT function cannot be longer than 32,767 characters, or REPT returns #VALUE!.
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Rept extends Fixed2ArgFunction  {
-
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval text, ValueEval number_times) {
-
-        ValueEval veText1;
-        try {
-            veText1 = OperandResolver.getSingleValue(text, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-        String strText1 = OperandResolver.coerceValueToString(veText1);
-        double numberOfTime = 0;
-        try {
-            numberOfTime = OperandResolver.coerceValueToDouble(number_times);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        int numberOfTimeInt = (int)numberOfTime;
-        StringBuffer strb = new StringBuffer(strText1.length() * numberOfTimeInt);
-        for(int i = 0; i < numberOfTimeInt; i++) {
-            strb.append(strText1);
-        }
-
-        if (strb.toString().length() > 32767) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        return new StringEval(strb.toString());
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Roman.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Roman.java
deleted file mode 100644
index 45b400e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Roman.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for Excel WeekNum() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>WeekNum  </b>(<b>Serial_num</b>,<b>Return_type</b>)<br/>
- * <p/>
- * Returns a number that indicates where the week falls numerically within a year.
- * <p/>
- * <p/>
- * Serial_num     is a date within the week. Dates should be entered by using the DATE function,
- * or as results of other formulas or functions. For example, use DATE(2008,5,23)
- * for the 23rd day of May, 2008. Problems can occur if dates are entered as text.
- * Return_type     is a number that determines on which day the week begins. The default is 1.
- * 1	Week begins on Sunday. Weekdays are numbered 1 through 7.
- * 2	Week begins on Monday. Weekdays are numbered 1 through 7.
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class Roman extends Fixed2ArgFunction {
-
-    //M (1000), CM (900), D (500), CD (400), C (100), XC (90), L (50), XL (40), X (10), IX (9), V (5), IV (4) and I (1).
-    public static final int[] VALUES = new int[]{1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};
-    public static final String[] ROMAN = new String[]
-            {"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"};
-
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE, ValueEval formVE) {
-        int number = 0;
-        try {
-            ValueEval ve = OperandResolver.getSingleValue(numberVE, srcRowIndex, srcColumnIndex);
-            number = OperandResolver.coerceValueToInt(ve);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        if (number < 0) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        if (number > 3999) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        if (number == 0) {
-            return new StringEval("");
-        }
-
-        int form = 0;
-        try {
-            ValueEval ve = OperandResolver.getSingleValue(formVE, srcRowIndex, srcColumnIndex);
-            form = OperandResolver.coerceValueToInt(ve);
-        } catch (EvaluationException e) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        if (form > 4 || form < 0) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        String result = this.integerToRoman(number);
-
-        if (form == 0) {
-            return new StringEval(result);
-        }
-
-        return new StringEval(makeConcise(result, form));
-    }
-
-    /**
-     * Classic conversion.
-     *
-     * @param number
-     */
-    private String integerToRoman(int number) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < 13; i++) {
-            while (number >= VALUES[i]) {
-                number -= VALUES[i];
-                result.append(ROMAN[i]);
-            }
-        }
-        return result.toString();
-    }
-
-    /**
-     * Use conversion rule to factor some parts and make them more concise
-     *
-     * @param result
-     * @param form
-     */
-    public String makeConcise(String result, int form) {
-        if (form > 0) {
-            result = result.replaceAll("XLV", "VL"); //45
-            result = result.replaceAll("XCV", "VC"); //95
-            result = result.replaceAll("CDL", "LD"); //450
-            result = result.replaceAll("CML", "LM"); //950
-            result = result.replaceAll("CMVC", "LMVL"); //995
-        }
-        if (form == 1) {
-            result = result.replaceAll("CDXC", "LDXL"); //490
-            result = result.replaceAll("CDVC", "LDVL"); //495
-            result = result.replaceAll("CMXC", "LMXL"); //990
-            result = result.replaceAll("XCIX", "VCIV"); //99
-            result = result.replaceAll("XLIX", "VLIV"); //49
-        }
-        if (form > 1) {
-            result = result.replaceAll("XLIX", "IL"); //49
-            result = result.replaceAll("XCIX", "IC"); //99
-            result = result.replaceAll("CDXC", "XD"); //490
-            result = result.replaceAll("CDVC", "XDV"); //495
-            result = result.replaceAll("CDIC", "XDIX"); //499
-            result = result.replaceAll("LMVL", "XMV"); //995
-            result = result.replaceAll("CMIC", "XMIX"); //999
-            result = result.replaceAll("CMXC", "XM"); // 990
-        }
-        if (form > 2) {
-            result = result.replaceAll("XDV", "VD");  //495
-            result = result.replaceAll("XDIX", "VDIV"); //499
-            result = result.replaceAll("XMV", "VM"); // 995
-            result = result.replaceAll("XMIX", "VMIV"); //999
-        }
-        if (form == 4) {
-            result = result.replaceAll("VDIV", "ID"); //499
-            result = result.replaceAll("VMIV", "IM"); //999
-        }
-
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/RowFunc.java b/trunk/src/java/org/apache/poi/ss/formula/functions/RowFunc.java
deleted file mode 100644
index f0d468f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/RowFunc.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for the Excel function ROW
- *
- * @author Josh Micich
- */
-public final class RowFunc implements Function0Arg, Function1Arg {
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-        return new NumberEval(srcRowIndex+1);
-    }
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-        int rnum;
-
-        if (arg0 instanceof AreaEval) {
-            rnum = ((AreaEval) arg0).getFirstRow();
-        } else if (arg0 instanceof RefEval) {
-            rnum = ((RefEval) arg0).getRow();
-        } else {
-            // anything else is not valid argument
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        return new NumberEval(rnum + 1);
-    }
-    public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-        switch (args.length) {
-            case 1:
-                return evaluate(srcRowIndex, srcColumnIndex, args[0]);
-            case 0:
-              return new NumberEval(srcRowIndex+1);
-        }
-        return ErrorEval.VALUE_INVALID;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Rows.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Rows.java
deleted file mode 100644
index 1e36322..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Rows.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
-
-/**
- * Implementation for Excel ROWS function.
- *
- * @author Josh Micich
- */
-public final class Rows extends Fixed1ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-
-		int result;
-		if (arg0 instanceof TwoDEval) {
-			result = ((TwoDEval) arg0).getHeight();
-		} else if (arg0 instanceof RefEval) {
-			result = 1;
-		} else { // anything else is not valid argument
-			return ErrorEval.VALUE_INVALID;
-		}
-		return new NumberEval(result);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Slope.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Slope.java
deleted file mode 100644
index 63449d5..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Slope.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LinearRegressionFunction.FUNCTION;
-
-/**
- * Implementation of Excel function SLOPE()<p/>
- *
- * Calculates the SLOPE of the linear regression line that is used to predict y values from x values<br/>
- * (http://introcs.cs.princeton.edu/java/97data/LinearRegression.java.html)
- * <b>Syntax</b>:<br/>
- * <b>SLOPE</b>(<b>arrayX</b>, <b>arrayY</b>)<p/>
- *
- *
- * @author Johan Karlsteen
- */
-public final class Slope extends Fixed2ArgFunction {
-	
-	private final LinearRegressionFunction func;
-	public Slope() {
-		func = new LinearRegressionFunction(FUNCTION.SLOPE);
-	}
-	
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex,
-			ValueEval arg0, ValueEval arg1) {
-		return func.evaluate(srcRowIndex, srcColumnIndex, arg0, arg1);
-	}
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/StatsLib.java b/trunk/src/java/org/apache/poi/ss/formula/functions/StatsLib.java
deleted file mode 100644
index ebef9d4..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/StatsLib.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Arrays;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- * Library for common statistics functions
- */
-final class StatsLib {
-
-    private StatsLib() {
-        // no instances of this class
-    }
-
-
-    /**
-     * returns the mean of deviations from mean.
-     * @param v
-     */
-    public static double avedev(double[] v) {
-        double r = 0;
-        double m = 0;
-        double s = 0;
-        for (int i=0, iSize=v.length; i<iSize; i++) {
-            s += v[i];
-        }
-        m = s / v.length;
-        s = 0;
-        for (int i=0, iSize=v.length; i<iSize; i++) {
-            s += Math.abs(v[i]-m);
-        }
-        r = s / v.length;
-        return r;
-    }
-
-    public static double stdev(double[] v) {
-        double r = Double.NaN;
-        if (v!=null && v.length > 1) {
-            r = Math.sqrt( devsq(v) / (v.length - 1) );
-        }
-        return r;
-    }
-
-    public static double var(double[] v) {
-        double r = Double.NaN;
-        if (v!=null && v.length > 1) {
-            r = devsq(v) / (v.length - 1);
-        }
-        return r;
-    }
-
-    public static double varp(double[] v) {
-        double r = Double.NaN;
-        if (v!=null && v.length > 1) {
-            r = devsq(v) /v.length;
-        }
-        return r;
-    }
-
-    public static double median(double[] v) {
-        double r = Double.NaN;
-
-        if (v!=null && v.length >= 1) {
-            int n = v.length;
-            Arrays.sort(v);
-            r = (n % 2 == 0)
-                ? (v[n / 2] + v[n / 2 - 1]) / 2
-                : v[n / 2];
-        }
-
-        return r;
-    }
-
-
-    public static double devsq(double[] v) {
-        double r = Double.NaN;
-        if (v!=null && v.length >= 1) {
-            double m = 0;
-            double s = 0;
-            int n = v.length;
-            for (int i=0; i<n; i++) {
-                s += v[i];
-            }
-            m = s / n;
-            s = 0;
-            for (int i=0; i<n; i++) {
-                s += (v[i]- m) * (v[i] - m);
-            }
-
-            r = (n == 1)
-                    ? 0
-                    : s;
-        }
-        return r;
-    }
-
-    /**
-     * returns the kth largest element in the array. Duplicates
-     * are considered as distinct values. Hence, eg.
-     * for array {1,2,4,3,3} & k=2, returned value is 3.
-     * <br/>
-     * k <= 0 & k >= v.length and null or empty arrays
-     * will result in return value Double.NaN
-     */
-    public static double kthLargest(double[] v, int k) {
-        double r = Double.NaN;
-        int index = k-1; // since arrays are 0-based
-        if (v!=null && v.length > index && index >= 0) {
-            Arrays.sort(v);
-            r = v[v.length-index-1];
-        }
-        return r;
-    }
-
-    /**
-     * returns the kth smallest element in the array. Duplicates
-     * are considered as distinct values. Hence, eg.
-     * for array {1,1,2,4,3,3} & k=2, returned value is 1.
-     * <br/>
-     * k <= 0 & k >= v.length or null array or empty array
-     * will result in return value Double.NaN
-     * @param v
-     * @param k
-     */
-    public static double kthSmallest(double[] v, int k) {
-        double r = Double.NaN;
-        int index = k-1; // since arrays are 0-based
-        if (v!=null && v.length > index && index >= 0) {
-            Arrays.sort(v);
-            r = v[index];
-        }
-        return r;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Substitute.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Substitute.java
deleted file mode 100644
index 23954b1..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Substitute.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * An implementation of the SUBSTITUTE function:<P/>
- * Substitutes text in a text string with new text, some number of times.
- * @author Manda Wilson &lt; wilson at c bio dot msk cc dot org &gt;
- */
-public final class Substitute extends Var3or4ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		String result;
-		try {
-			String oldStr = TextFunction.evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-			String searchStr = TextFunction.evaluateStringArg(arg1, srcRowIndex, srcColumnIndex);
-			String newStr = TextFunction.evaluateStringArg(arg2, srcRowIndex, srcColumnIndex);
-
-			result = replaceAllOccurrences(oldStr, searchStr, newStr);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new StringEval(result);
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2, ValueEval arg3) {
-		String result;
-		try {
-			String oldStr = TextFunction.evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-			String searchStr = TextFunction.evaluateStringArg(arg1, srcRowIndex, srcColumnIndex);
-			String newStr = TextFunction.evaluateStringArg(arg2, srcRowIndex, srcColumnIndex);
-
-			int instanceNumber = TextFunction.evaluateIntArg(arg3, srcRowIndex, srcColumnIndex);
-			if (instanceNumber < 1) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			result = replaceOneOccurrence(oldStr, searchStr, newStr, instanceNumber);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new StringEval(result);
-	}
-
-	private static String replaceAllOccurrences(String oldStr, String searchStr, String newStr) {
-		StringBuffer sb = new StringBuffer();
-		int startIndex = 0;
-		int nextMatch = -1;
-		while (true) {
-			nextMatch = oldStr.indexOf(searchStr, startIndex);
-			if (nextMatch < 0) {
-				// store everything from end of last match to end of string
-				sb.append(oldStr.substring(startIndex));
-				return sb.toString();
-			}
-			// store everything from end of last match to start of this match
-			sb.append(oldStr.substring(startIndex, nextMatch));
-			sb.append(newStr);
-			startIndex = nextMatch + searchStr.length();
-		}
-	}
-
-	private static String replaceOneOccurrence(String oldStr, String searchStr, String newStr, int instanceNumber) {
-		if (searchStr.length() < 1) {
-			return oldStr;
-		}
-		int startIndex = 0;
-		int nextMatch = -1;
-		int count=0;
-		while (true) {
-			nextMatch = oldStr.indexOf(searchStr, startIndex);
-			if (nextMatch < 0) {
-				// not enough occurrences found - leave unchanged
-				return oldStr;
-			}
-			count++;
-			if (count == instanceNumber) {
-				StringBuffer sb = new StringBuffer(oldStr.length() + newStr.length());
-				sb.append(oldStr.substring(0, nextMatch));
-				sb.append(newStr);
-				sb.append(oldStr.substring(nextMatch + searchStr.length()));
-				return sb.toString();
-			}
-			startIndex = nextMatch + searchStr.length();
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Subtotal.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Subtotal.java
deleted file mode 100644
index f3b24cd..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Subtotal.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.apache.poi.ss.formula.functions.AggregateFunction.subtotalInstance;
-
-import org.apache.poi.ss.formula.LazyRefEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.ss.formula.eval.NotImplementedFunctionException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Implementation for the Excel function SUBTOTAL<p>
- *
- * <b>Syntax :</b> <br/>
- *  SUBTOTAL ( <b>functionCode</b>, <b>ref1</b>, ref2 ... ) <br/>
- *    <table border="1" cellpadding="1" cellspacing="0" summary="Parameter descriptions">
- *      <tr><td><b>functionCode</b></td><td>(1-11) Selects the underlying aggregate function to be used (see table below)</td></tr>
- *      <tr><td><b>ref1</b>, ref2 ...</td><td>Arguments to be passed to the underlying aggregate function</td></tr>
- *    </table><br/>
- * </p>
- *
- *  <table border="1" cellpadding="1" cellspacing="0" summary="Parameter descriptions">
- *      <tr><th>functionCode</th><th>Aggregate Function</th></tr>
- *      <tr align='center'><td>1</td><td>AVERAGE</td></tr>
- *      <tr align='center'><td>2</td><td>COUNT</td></tr>
- *      <tr align='center'><td>3</td><td>COUNTA</td></tr>
- *      <tr align='center'><td>4</td><td>MAX</td></tr>
- *      <tr align='center'><td>5</td><td>MIN</td></tr>
- *      <tr align='center'><td>6</td><td>PRODUCT</td></tr>
- *      <tr align='center'><td>7</td><td>STDEV</td></tr>
- *      <tr align='center'><td>8</td><td>STDEVP *</td></tr>
- *      <tr align='center'><td>9</td><td>SUM</td></tr>
- *      <tr align='center'><td>10</td><td>VAR *</td></tr>
- *      <tr align='center'><td>11</td><td>VARP *</td></tr>
- *      <tr align='center'><td>101-111</td><td>*</td></tr>
- *  </table><br/>
- * * Not implemented in POI yet. Functions 101-111 are the same as functions 1-11 but with
- * the option 'ignore hidden values'.
- * <p/>
- *
- * @author Paul Tomlin &lt; pault at bulk sms dot com &gt;
- */
-public class Subtotal implements Function {
-
-	private static Function findFunction(int functionCode) throws EvaluationException {
-        switch (functionCode) {
-			case 1: return subtotalInstance(AggregateFunction.AVERAGE);
-			case 2: return Count.subtotalInstance();
-			case 3: return Counta.subtotalInstance();
-			case 4: return subtotalInstance(AggregateFunction.MAX);
-			case 5: return subtotalInstance(AggregateFunction.MIN);
-			case 6: return subtotalInstance(AggregateFunction.PRODUCT);
-			case 7: return subtotalInstance(AggregateFunction.STDEV);
-			case 8: throw new NotImplementedFunctionException("STDEVP");
-			case 9: return subtotalInstance(AggregateFunction.SUM);
-			case 10: throw new NotImplementedFunctionException("VAR");
-			case 11: throw new NotImplementedFunctionException("VARP");
-		}
-		if (functionCode > 100 && functionCode < 112) {
-			throw new NotImplementedException("SUBTOTAL - with 'exclude hidden values' option");
-		}
-		throw EvaluationException.invalidValue();
-	}
-
-	public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		int nInnerArgs = args.length-1; // -1: first arg is used to select from a basic aggregate function
-		if (nInnerArgs < 1) {
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		final Function innerFunc;
-		try {
-			ValueEval ve = OperandResolver.getSingleValue(args[0], srcRowIndex, srcColumnIndex);
-			int functionCode = OperandResolver.coerceValueToInt(ve);
-			innerFunc = findFunction(functionCode);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-
-		// ignore the first arg, this is the function-type, we check for the length above
-		final List<ValueEval> list = new ArrayList<ValueEval>(Arrays.asList(args).subList(1, args.length));
-
-		Iterator<ValueEval> it = list.iterator();
-
-		// See https://support.office.com/en-us/article/SUBTOTAL-function-7b027003-f060-4ade-9040-e478765b9939
-		// "If there are other subtotals within ref1, ref2,... (or nested subtotals), these nested subtotals are ignored to avoid double counting."
-		// For array references it is handled in other evaluation steps, but we need to handle this here for references to subtotal-functions
-		while(it.hasNext()) {
-			ValueEval eval = it.next();
-			if(eval instanceof LazyRefEval) {
-				LazyRefEval lazyRefEval = (LazyRefEval) eval;
-				if(lazyRefEval.isSubTotal()) {
-					it.remove();
-				}
-			}
-		}
-
-		return innerFunc.evaluate(list.toArray(new ValueEval[list.size()]), srcRowIndex, srcColumnIndex);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumif.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Sumif.java
deleted file mode 100644
index 977647f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumif.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-
-/**
- * Implementation for the Excel function SUMIF<p>
- *
- * Syntax : <br/>
- *  SUMIF ( <b>range</b>, <b>criteria</b>, sum_range ) <br/>
- *    <table border="0" cellpadding="1" cellspacing="0" summary="Parameter descriptions">
- *      <tr><th>range</th><td>The range over which criteria is applied.  Also used for addend values when the third parameter is not present</td></tr>
- *      <tr><th>criteria</th><td>The value or expression used to filter rows from <b>range</b></td></tr>
- *      <tr><th>sum_range</th><td>Locates the top-left corner of the corresponding range of addends - values to be added (after being selected by the criteria)</td></tr>
- *    </table><br/>
- * </p>
- * @author Josh Micich
- */
-public final class Sumif extends Var2or3ArgFunction {
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-
-		AreaEval aeRange;
-		try {
-			aeRange = convertRangeArg(arg0);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return eval(srcRowIndex, srcColumnIndex, arg1, aeRange, aeRange);
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-
-		AreaEval aeRange;
-		AreaEval aeSum;
-		try {
-			aeRange = convertRangeArg(arg0);
-			aeSum = createSumRange(arg2, aeRange);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return eval(srcRowIndex, srcColumnIndex, arg1, aeRange, aeSum);
-	}
-
-	private static ValueEval eval(int srcRowIndex, int srcColumnIndex, ValueEval arg1, AreaEval aeRange,
-			AreaEval aeSum) {
-		// TODO - junit to prove last arg must be srcColumnIndex and not srcRowIndex
-		I_MatchPredicate mp = Countif.createCriteriaPredicate(arg1, srcRowIndex, srcColumnIndex);
-		
-		// handle empty cells
-		if(mp == null) {
-		    return NumberEval.ZERO;
-		}
-
-		double result = sumMatchingCells(aeRange, mp, aeSum);
-		return new NumberEval(result);
-	}
-
-	private static double sumMatchingCells(AreaEval aeRange, I_MatchPredicate mp, AreaEval aeSum) {
-		int height=aeRange.getHeight();
-		int width= aeRange.getWidth();
-
-		double result = 0.0;
-		for (int r=0; r<height; r++) {
-			for (int c=0; c<width; c++) {
-				result += accumulate(aeRange, mp, aeSum, r, c);
-			}
-		}
-		return result;
-	}
-
-	private static double accumulate(AreaEval aeRange, I_MatchPredicate mp, AreaEval aeSum, int relRowIndex,
-			int relColIndex) {
-
-		if (!mp.matches(aeRange.getRelativeValue(relRowIndex, relColIndex))) {
-			return 0.0;
-		}
-		ValueEval addend = aeSum.getRelativeValue(relRowIndex, relColIndex);
-		if (addend instanceof NumberEval) {
-			return ((NumberEval)addend).getNumberValue();
-		}
-		// everything else (including string and boolean values) counts as zero
-		return 0.0;
-	}
-
-	/**
-	 * @return a range of the same dimensions as aeRange using eval to define the top left corner.
-	 * @throws EvaluationException if eval is not a reference
-	 */
-	private static AreaEval createSumRange(ValueEval eval, AreaEval aeRange) throws EvaluationException {
-		if (eval instanceof AreaEval) {
-			return ((AreaEval) eval).offset(0, aeRange.getHeight()-1, 0, aeRange.getWidth()-1);
-		}
-		if (eval instanceof RefEval) {
-			return ((RefEval)eval).offset(0, aeRange.getHeight()-1, 0, aeRange.getWidth()-1);
-		}
-		throw new EvaluationException(ErrorEval.VALUE_INVALID);
-	}
-
-	private static AreaEval convertRangeArg(ValueEval eval) throws EvaluationException {
-		if (eval instanceof AreaEval) {
-			return (AreaEval) eval;
-		}
-		if (eval instanceof RefEval) {
-			return ((RefEval)eval).offset(0, 0, 0, 0);
-		}
-		throw new EvaluationException(ErrorEval.VALUE_INVALID);
-	}
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumifs.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Sumifs.java
deleted file mode 100644
index 81d0003..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumifs.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-import org.apache.poi.ss.formula.functions.Countif.ErrorMatcher;
-
-/**
- * Implementation for the Excel function SUMIFS<p>
- *
- * Syntax : <br/>
- *  SUMIFS ( <b>sum_range</b>, <b>criteria_range1</b>, <b>criteria1</>,
- *  [<b>criteria_range2</b>,  <b>criteria2</b>], ...) <br/>
- *    <ul>
- *      <li><b>sum_range</b> Required. One or more cells to sum, including numbers or names, ranges,
- *      or cell references that contain numbers. Blank and text values are ignored.</li>
- *      <li><b>criteria1_range</b> Required. The first range in which
- *      to evaluate the associated criteria.</li>
- *      <li><b>criteria1</b> Required. The criteria in the form of a number, expression,
- *        cell reference, or text that define which cells in the criteria_range1
- *        argument will be added</li>
- *      <li><b> criteria_range2, criteria2, ...</b>    Optional. Additional ranges and their associated criteria.
- *      Up to 127 range/criteria pairs are allowed.
- *    </ul>
- * </p>
- *
- * @author Yegor Kozlov
- */
-public final class Sumifs implements FreeRefFunction {
-    public static final FreeRefFunction instance = new Sumifs();
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        // https://support.office.com/en-us/article/SUMIFS-function-c9e748f5-7ea7-455d-9406-611cebce642b
-        // COUNTIFS(sum_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...
-        // need at least 3 arguments and need to have an odd number of arguments (sum-range plus x*(criteria_range, criteria))
-        if(args.length < 3 || args.length % 2 == 0) {
-            return ErrorEval.VALUE_INVALID;
-        }
-
-        try {
-            AreaEval sumRange = convertRangeArg(args[0]);
-
-            // collect pairs of ranges and criteria
-            AreaEval[] ae = new AreaEval[(args.length - 1)/2];
-            I_MatchPredicate[] mp = new I_MatchPredicate[ae.length];
-            for(int i = 1, k=0; i < args.length; i += 2, k++){
-                ae[k] = convertRangeArg(args[i]);
-                
-                mp[k] = Countif.createCriteriaPredicate(args[i+1], ec.getRowIndex(), ec.getColumnIndex());
-            }
-
-            validateCriteriaRanges(ae, sumRange);
-            validateCriteria(mp);
-
-            double result = sumMatchingCells(ae, mp, sumRange);
-            return new NumberEval(result);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-
-    /**
-     * Verify that each <code>criteriaRanges</code> argument contains the same number of rows and columns
-     * as the <code>sumRange</code> argument
-     *
-     * @throws EvaluationException if the ranges do not match.
-     */
-    private void validateCriteriaRanges(AreaEval[] criteriaRanges, AreaEval sumRange) throws EvaluationException {
-        for(AreaEval r : criteriaRanges){
-            if(r.getHeight() != sumRange.getHeight() ||
-               r.getWidth() != sumRange.getWidth() ) {
-                throw EvaluationException.invalidValue();
-            }
-        }
-    }
-
-    /**
-     * Verify that each <code>criteria</code> predicate is valid, i.e. not an error
-     *
-     * @throws EvaluationException if there are criteria which resulted in Errors.
-     */
-    private void validateCriteria(I_MatchPredicate[] criteria) throws EvaluationException {
-        for(I_MatchPredicate predicate : criteria) {
-            
-            // check for errors in predicate and return immediately using this error code
-            if(predicate instanceof ErrorMatcher) {
-                throw new EvaluationException(ErrorEval.valueOf(((ErrorMatcher)predicate).getValue()));
-            }
-        }
-    }
-
-
-    /**
-     *
-     * @param ranges  criteria ranges, each range must be of the same dimensions as <code>aeSum</code>
-     * @param predicates  array of predicates, a predicate for each value in <code>ranges</code>
-     * @param aeSum  the range to sum
-     *
-     * @return the computed value
-     */
-    private static double sumMatchingCells(AreaEval[] ranges, I_MatchPredicate[] predicates, AreaEval aeSum) {
-        int height = aeSum.getHeight();
-        int width = aeSum.getWidth();
-
-        double result = 0.0;
-        for (int r = 0; r < height; r++) {
-            for (int c = 0; c < width; c++) {
-
-                boolean matches = true;
-                for(int i = 0; i < ranges.length; i++){
-                    AreaEval aeRange = ranges[i];
-                    I_MatchPredicate mp = predicates[i];
-
-                    if (!mp.matches(aeRange.getRelativeValue(r, c))) {
-                        matches = false;
-                        break;
-                    }
-
-                }
-
-                if(matches) { // sum only if all of the corresponding criteria specified are true for that cell.
-                    result += accumulate(aeSum, r, c);
-                }
-            }
-        }
-        return result;
-    }
-
-    private static double accumulate(AreaEval aeSum, int relRowIndex,
-            int relColIndex) {
-
-        ValueEval addend = aeSum.getRelativeValue(relRowIndex, relColIndex);
-        if (addend instanceof NumberEval) {
-            return ((NumberEval)addend).getNumberValue();
-        }
-        // everything else (including string and boolean values) counts as zero
-        return 0.0;
-    }
-
-    private static AreaEval convertRangeArg(ValueEval eval) throws EvaluationException {
-        if (eval instanceof AreaEval) {
-            return (AreaEval) eval;
-        }
-        if (eval instanceof RefEval) {
-            return ((RefEval)eval).offset(0, 0, 0, 0);
-        }
-        throw new EvaluationException(ErrorEval.VALUE_INVALID);
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java
deleted file mode 100644
index 8bae16e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-
-/**
- * Implementation for the Excel function SUMPRODUCT<p>
- *
- * Syntax : <br/>
- *  SUMPRODUCT ( array1[, array2[, array3[, ...]]])
- *    <table border="0" cellpadding="1" cellspacing="0" summary="Parameter descriptions">
- *      <tr><th>array1, ... arrayN&nbsp;&nbsp;</th><td>typically area references,
- *      possibly cell references or scalar values</td></tr>
- *    </table><br/>
- *
- * Let A<b>n</b><sub>(<b>i</b>,<b>j</b>)</sub> represent the element in the <b>i</b>th row <b>j</b>th column
- * of the <b>n</b>th array<br/>
- * Assuming each array has the same dimensions (W, H), the result is defined as:<br/>
- * SUMPRODUCT = &Sigma;<sub><b>i</b>: 1..H</sub> &nbsp;
- * 	(&nbsp; &Sigma;<sub><b>j</b>: 1..W</sub> &nbsp;
- * 	  (&nbsp; &Pi;<sub><b>n</b>: 1..N</sub>
- * 			A<b>n</b><sub>(<b>i</b>,<b>j</b>)</sub>&nbsp;
- *    )&nbsp;
- *  )
- * </p>
- * @author Josh Micich
- */
-public final class Sumproduct implements Function {
-
-
-	public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-
-		int maxN = args.length;
-
-		if(maxN < 1) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		ValueEval firstArg = args[0];
-		try {
-			if(firstArg instanceof NumericValueEval) {
-				return evaluateSingleProduct(args);
-			}
-			if(firstArg instanceof RefEval) {
-				return evaluateSingleProduct(args);
-			}
-			if (firstArg instanceof TwoDEval) {
-				TwoDEval ae = (TwoDEval) firstArg;
-				if(ae.isRow() && ae.isColumn()) {
-					return evaluateSingleProduct(args);
-				}
-				return evaluateAreaSumProduct(args);
-			}
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		throw new RuntimeException("Invalid arg type for SUMPRODUCT: ("
-				+ firstArg.getClass().getName() + ")");
-	}
-
-	private static ValueEval evaluateSingleProduct(ValueEval[] evalArgs) throws EvaluationException {
-		int maxN = evalArgs.length;
-
-		double term = 1D;
-		for(int n=0; n<maxN; n++) {
-			double val = getScalarValue(evalArgs[n]);
-			term *= val;
-		}
-		return new NumberEval(term);
-	}
-
-	private static double getScalarValue(ValueEval arg) throws EvaluationException {
-
-		ValueEval eval;
-		if (arg instanceof RefEval) {
-			RefEval re = (RefEval) arg;
-			if (re.getNumberOfSheets() > 1) {
-                throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			eval = re.getInnerValueEval(re.getFirstSheetIndex());
-		} else {
-			eval = arg;
-		}
-
-		if (eval == null) {
-			throw new RuntimeException("parameter may not be null");
-		}
-		if (eval instanceof AreaEval) {
-			AreaEval ae = (AreaEval) eval;
-			// an area ref can work as a scalar value if it is 1x1
-			if(!ae.isColumn() || !ae.isRow()) {
-				throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			eval = ae.getRelativeValue(0, 0);
-		}
-
-		return getProductTerm(eval, true);
-	}
-
-	private static ValueEval evaluateAreaSumProduct(ValueEval[] evalArgs) throws EvaluationException {
-		int maxN = evalArgs.length;
-		TwoDEval[] args = new TwoDEval[maxN];
-		try {
-			System.arraycopy(evalArgs, 0, args, 0, maxN);
-		} catch (ArrayStoreException e) {
-			// one of the other args was not an AreaRef
-			return ErrorEval.VALUE_INVALID;
-		}
-
-
-		TwoDEval firstArg = args[0];
-
-		int height = firstArg.getHeight();
-		int width = firstArg.getWidth(); // TODO - junit
-
-		// first check dimensions
-		if (!areasAllSameSize(args, height, width)) {
-			// normally this results in #VALUE!,
-			// but errors in individual cells take precedence
-			for (int i = 1; i < args.length; i++) {
-				throwFirstError(args[i]);
-			}
-			return ErrorEval.VALUE_INVALID;
-		}
-
-		double acc = 0;
-
-		for (int rrIx=0; rrIx<height; rrIx++) {
-			for (int rcIx=0; rcIx<width; rcIx++) {
-				double term = 1D;
-				for(int n=0; n<maxN; n++) {
-					double val = getProductTerm(args[n].getValue(rrIx, rcIx), false);
-					term *= val;
-				}
-				acc += term;
-			}
-		}
-
-		return new NumberEval(acc);
-	}
-
-	private static void throwFirstError(TwoDEval areaEval) throws EvaluationException {
-		int height = areaEval.getHeight();
-		int width = areaEval.getWidth();
-		for (int rrIx=0; rrIx<height; rrIx++) {
-			for (int rcIx=0; rcIx<width; rcIx++) {
-				ValueEval ve = areaEval.getValue(rrIx, rcIx);
-				if (ve instanceof ErrorEval) {
-					throw new EvaluationException((ErrorEval) ve);
-				}
-			}
-		}
-	}
-
-	private static boolean areasAllSameSize(TwoDEval[] args, int height, int width) {
-		for (int i = 0; i < args.length; i++) {
-			TwoDEval areaEval = args[i];
-			// check that height and width match
-			if(areaEval.getHeight() != height) {
-				return false;
-			}
-			if(areaEval.getWidth() != width) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-
-	/**
-	 * Determines a <code>double</code> value for the specified <code>ValueEval</code>.
-	 * @param isScalarProduct <code>false</code> for SUMPRODUCTs over area refs.
-	 * @throws EvaluationException if <code>ve</code> represents an error value.
-	 * <p/>
-	 * Note - string values and empty cells are interpreted differently depending on
-	 * <code>isScalarProduct</code>.  For scalar products, if any term is blank or a string, the
-	 * error (#VALUE!) is raised.  For area (sum)products, if any term is blank or a string, the
-	 * result is zero.
-	 */
-	private static double getProductTerm(ValueEval ve, boolean isScalarProduct) throws EvaluationException {
-
-		if(ve instanceof BlankEval || ve == null) {
-			// TODO - shouldn't BlankEval.INSTANCE be used always instead of null?
-			// null seems to occur when the blank cell is part of an area ref (but not reliably)
-			if(isScalarProduct) {
-				throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			return 0;
-		}
-
-		if(ve instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval)ve);
-		}
-		if(ve instanceof StringEval) {
-			if(isScalarProduct) {
-				throw new EvaluationException(ErrorEval.VALUE_INVALID);
-			}
-			// Note for area SUMPRODUCTs, string values are interpreted as zero
-			// even if they would parse as valid numeric values
-			return 0;
-		}
-		if(ve instanceof NumericValueEval) {
-			NumericValueEval nve = (NumericValueEval) ve;
-			return nve.getNumberValue();
-		}
-		throw new RuntimeException("Unexpected value eval class ("
-				+ ve.getClass().getName() + ")");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumx2my2.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
deleted file mode 100644
index 9c8c386..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-
-/**
- * Implementation of Excel function SUMX2MY2()<p/>
- *
- * Calculates the sum of differences of squares in two arrays of the same size.<br/>
- * <b>Syntax</b>:<br/>
- * <b>SUMX2MY2</b>(<b>arrayX</b>, <b>arrayY</b>)<p/>
- *
- * result = &Sigma;<sub>i: 0..n</sub>(x<sub>i</sub><sup>2</sup>-y<sub>i</sub><sup>2</sup>)
- *
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class Sumx2my2 extends XYNumericFunction {
-
-	private static final Accumulator XSquaredMinusYSquaredAccumulator = new Accumulator() {
-		public double accumulate(double x, double y) {
-			return x * x - y * y;
-		}
-	};
-
-	protected Accumulator createAccumulator() {
-		return XSquaredMinusYSquaredAccumulator;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumx2py2.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
deleted file mode 100644
index 6e40445..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-
-/**
- * Implementation of Excel function SUMX2PY2()<p/>
- *
- * Calculates the sum of squares in two arrays of the same size.<br/>
- * <b>Syntax</b>:<br/>
- * <b>SUMX2PY2</b>(<b>arrayX</b>, <b>arrayY</b>)<p/>
- *
- * result = &Sigma;<sub>i: 0..n</sub>(x<sub>i</sub><sup>2</sup>+y<sub>i</sub><sup>2</sup>)
- *
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class Sumx2py2 extends XYNumericFunction {
-
-	private static final Accumulator XSquaredPlusYSquaredAccumulator = new Accumulator() {
-		public double accumulate(double x, double y) {
-			return x * x + y * y;
-		}
-	};
-
-	protected Accumulator createAccumulator() {
-		return XSquaredPlusYSquaredAccumulator;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumxmy2.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
deleted file mode 100644
index 3955d06..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-/**
- * Implementation of Excel function SUMXMY2()<p/>
- *
- * Calculates the sum of squares of differences between two arrays of the same size.<br/>
- * <b>Syntax</b>:<br/>
- * <b>SUMXMY2</b>(<b>arrayX</b>, <b>arrayY</b>)<p/>
- *
- * result = &Sigma;<sub>i: 0..n</sub>(x<sub>i</sub>-y<sub>i</sub>)<sup>2</sup>
- *
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class Sumxmy2 extends XYNumericFunction {
-
-	private static final Accumulator XMinusYSquaredAccumulator = new Accumulator() {
-		public double accumulate(double x, double y) {
-			double xmy = x - y;
-			return xmy * xmy;
-		}
-	};
-
-	protected Accumulator createAccumulator() {
-		return XMinusYSquaredAccumulator;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/T.java b/trunk/src/java/org/apache/poi/ss/formula/functions/T.java
deleted file mode 100644
index 1e74c5b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/T.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation of Excel T() function
- * <p/>
- * If the argument is a text or error value it is returned unmodified.  All other argument types
- * cause an empty string result.  If the argument is an area, the first (top-left) cell is used
- * (regardless of the coordinates of the evaluating formula cell).
- */
-public final class T extends Fixed1ArgFunction {
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-        ValueEval arg = arg0;
-        if (arg instanceof RefEval) {
-            // always use the first sheet
-            RefEval re = (RefEval)arg;
-            arg = re.getInnerValueEval(re.getFirstSheetIndex());
-        } else if (arg instanceof AreaEval) {
-            // when the arg is an area, choose the top left cell
-            arg = ((AreaEval) arg).getRelativeValue(0, 0);
-        }
-
-        if (arg instanceof StringEval) {
-            // Text values are returned unmodified
-            return arg;
-        }
-
-        if (arg instanceof ErrorEval) {
-            // Error values also returned unmodified
-            return arg;
-        }
-        // for all other argument types the result is empty string
-        return StringEval.EMPTY_INSTANCE;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
deleted file mode 100644
index c8b4b3c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.usermodel.DataFormatter;
-
-import java.util.Locale;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- * @author Josh Micich
- * @author Stephen Wolke (smwolke at geistig.com)
- */
-public abstract class TextFunction implements Function {
-	protected static final DataFormatter formatter = new DataFormatter();
-
-	protected static String evaluateStringArg(ValueEval eval, int srcRow, int srcCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(eval, srcRow, srcCol);
-		return OperandResolver.coerceValueToString(ve);
-	}
-	protected static int evaluateIntArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
-		return OperandResolver.coerceValueToInt(ve);
-	}
-	
-	protected static double evaluateDoubleArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
-		ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
-		return OperandResolver.coerceValueToDouble(ve);
-	}
-
-	public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
-		try {
-			return evaluateFunc(args, srcCellRow, srcCellCol);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-	protected abstract ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException;
-
-	/* ---------------------------------------------------------------------- */
-
-	private static abstract class SingleArgTextFunc extends Fixed1ArgFunction {
-
-		protected SingleArgTextFunc() {
-			// no fields to initialise
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			String arg;
-			try {
-				arg = evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			return evaluate(arg);
-		}
-		protected abstract ValueEval evaluate(String arg);
-	}
-
-    /**
-     * Returns the character specified by a number.
-     */
-    public static final Function CHAR = new Fixed1ArgFunction() {
-        public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-            int arg;
-            try {
-                arg = evaluateIntArg(arg0, srcRowIndex, srcColumnIndex);
-                if (arg < 0 || arg >= 256) {
-                    throw new EvaluationException(ErrorEval.VALUE_INVALID);
-                }
-
-            } catch (EvaluationException e) {
-                return e.getErrorEval();
-            }
-            return new StringEval(String.valueOf((char)arg));
-        }
-    };
-
-	public static final Function LEN = new SingleArgTextFunc() {
-		protected ValueEval evaluate(String arg) {
-			return new NumberEval(arg.length());
-		}
-	};
-	public static final Function LOWER = new SingleArgTextFunc() {
-		protected ValueEval evaluate(String arg) {
-			return new StringEval(arg.toLowerCase(Locale.ROOT));
-		}
-	};
-	public static final Function UPPER = new SingleArgTextFunc() {
-		protected ValueEval evaluate(String arg) {
-			return new StringEval(arg.toUpperCase(Locale.ROOT));
-		}
-	};
-
-	/**
-	 * Implementation of the PROPER function:
-     * Normalizes all words (separated by non-word characters) by
-     * making the first letter upper and the rest lower case.
-     * 
-     * This is nearly equivalent to toTitleCase if the Java language had it
-	 */
-	public static final Function PROPER = new SingleArgTextFunc() {
-		protected ValueEval evaluate(String text) {
-			StringBuilder sb = new StringBuilder();
-			boolean shouldMakeUppercase = true;
-			for(final char ch : text.toCharArray()) {
-
-				// Note: we are using String.toUpperCase() here on purpose as it handles certain things
-				// better than Character.toUpperCase(), e.g. German "scharfes s" is translated
-				// to "SS" (i.e. two characters), if uppercased properly!
-				if (shouldMakeUppercase) {
-					sb.append(String.valueOf(ch).toUpperCase(Locale.ROOT));
-				}
-				else {
-					sb.append(String.valueOf(ch).toLowerCase(Locale.ROOT));
-				}
-				shouldMakeUppercase = !Character.isLetter(ch);
-			}
-			return new StringEval(sb.toString());
-		}
-	};
-
-	/**
-	 * An implementation of the TRIM function:
-	 * Removes leading and trailing spaces from value if evaluated operand
-	 *  value is string.
-	 * Author: Manda Wilson &lt; wilson at c bio dot msk cc dot org &gt;
-	 */
-	public static final Function TRIM = new SingleArgTextFunc() {
-		protected ValueEval evaluate(String arg) {
-			return new StringEval(arg.trim());
-		}
-	};
-	
-	/**
-	 * An implementation of the CLEAN function:
-	 * In Excel, the Clean function removes all non-printable characters from a string.
-     *
-	 * Author: Aniket Banerjee(banerjee@google.com)
-	 */
-    public static final Function CLEAN = new SingleArgTextFunc() {
-        protected ValueEval evaluate(String arg) {
-            StringBuilder result = new StringBuilder();
-            for (final char c : arg.toCharArray()) {
-                if (isPrintable(c)) {
-                    result.append(c);
-                }
-            }
-            return new StringEval(result.toString());
-        }
-
-        /**
-         * From Excel docs: The CLEAN function was designed to remove the first 32 nonprinting characters
-         * in the 7-bit ASCII code (values 0 through 31) from text. In the Unicode character set,
-         * there are additional nonprinting characters (values 127, 129, 141, 143, 144, and 157). By itself,
-         * the CLEAN function does not remove these additional  nonprinting characters. To do this task,
-         * use the SUBSTITUTE function to replace the higher value Unicode characters with the 7-bit ASCII
-         * characters for which the TRIM and CLEAN functions were designed.
-         *
-         * @param c the character to test
-         * @return  whether the character is printable
-         */
-        private boolean isPrintable(char c){
-			return c >= 32;
-        }
-    };
-
-    /**
-	 * An implementation of the MID function<br/>
-	 * MID returns a specific number of
-	 * characters from a text string, starting at the specified position.<p/>
-	 *
-	 * <b>Syntax<b>:<br/> <b>MID</b>(<b>text</b>, <b>start_num</b>,
-	 * <b>num_chars</b>)<br/>
-	 *
-	 * Author: Manda Wilson &lt; wilson at c bio dot msk cc dot org &gt;
-	 */
-	public static final Function MID = new Fixed3ArgFunction() {
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0,
-				ValueEval arg1, ValueEval arg2) {
-			String text;
-			int startCharNum;
-			int numChars;
-			try {
-				text = evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-				startCharNum = evaluateIntArg(arg1, srcRowIndex, srcColumnIndex);
-				numChars = evaluateIntArg(arg2, srcRowIndex, srcColumnIndex);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			int startIx = startCharNum - 1; // convert to zero-based
-
-			// Note - for start_num arg, blank/zero causes error(#VALUE!),
-			// but for num_chars causes empty string to be returned.
-			if (startIx < 0) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			if (numChars < 0) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			int len = text.length();
-			if (numChars < 0 || startIx > len) {
-				return new StringEval("");
-			}
-			int endIx = Math.min(startIx + numChars, len);
-			String result = text.substring(startIx, endIx);
-			return new StringEval(result);
-		}
-	};
-
-	private static final class LeftRight extends Var1or2ArgFunction {
-		private static final ValueEval DEFAULT_ARG1 = new NumberEval(1.0);
-		private final boolean _isLeft;
-		protected LeftRight(boolean isLeft) {
-			_isLeft = isLeft;
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-			return evaluate(srcRowIndex, srcColumnIndex, arg0, DEFAULT_ARG1);
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0,
-				ValueEval arg1) {
-			String arg;
-			int index;
-			try {
-				arg = evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-				index = evaluateIntArg(arg1, srcRowIndex, srcColumnIndex);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			
-			if(index < 0) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			
-			String result;
-			if (_isLeft) {
-				result = arg.substring(0, Math.min(arg.length(), index));
-			} else {
-				result = arg.substring(Math.max(0, arg.length()-index));
-			}
-			return new StringEval(result);
-		}
-	}
-
-	public static final Function LEFT = new LeftRight(true);
-	public static final Function RIGHT = new LeftRight(false);
-
-	public static final Function CONCATENATE = new Function() {
-
-		public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-			StringBuilder sb = new StringBuilder();
-			for (ValueEval arg : args) {
-				try {
-					sb.append(evaluateStringArg(arg, srcRowIndex, srcColumnIndex));
-				} catch (EvaluationException e) {
-					return e.getErrorEval();
-				}
-			}
-			return new StringEval(sb.toString());
-		}
-	};
-
-	public static final Function EXACT = new Fixed2ArgFunction() {
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0,
-				ValueEval arg1) {
-			String s0;
-			String s1;
-			try {
-				s0 = evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-				s1 = evaluateStringArg(arg1, srcRowIndex, srcColumnIndex);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			return BoolEval.valueOf(s0.equals(s1));
-		}
-	};
-
-	/**
-	 * An implementation of the TEXT function<br/>
-	 * TEXT returns a number value formatted with the given number formatting string. 
-	 * This function is not a complete implementation of the Excel function, but
-	 *  handles most of the common cases. All work is passed down to 
-	 *  {@link DataFormatter} to be done, as this works much the same as the
-	 *  display focused work that that does. 
-	 *
-	 * <b>Syntax<b>:<br/> <b>TEXT</b>(<b>value</b>, <b>format_text</b>)<br/>
-	 */
-	public static final Function TEXT = new Fixed2ArgFunction() {
-
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-			double s0;
-			String s1;
-			try {
-				s0 = evaluateDoubleArg(arg0, srcRowIndex, srcColumnIndex);
-				s1 = evaluateStringArg(arg1, srcRowIndex, srcColumnIndex);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-			
-			try {
-            // Ask DataFormatter to handle the String for us
-			   String formattedStr = formatter.formatRawCellContents(s0, -1, s1);
-				return new StringEval(formattedStr);
-			} catch (Exception e) {
-				return ErrorEval.VALUE_INVALID;
-			}
-		}
-	};
-	
-	private static final class SearchFind extends Var2or3ArgFunction {
-
-		private final boolean _isCaseSensitive;
-
-		public SearchFind(boolean isCaseSensitive) {
-			_isCaseSensitive = isCaseSensitive;
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-			try {
-				String needle = TextFunction.evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-				String haystack = TextFunction.evaluateStringArg(arg1, srcRowIndex, srcColumnIndex);
-				return eval(haystack, needle, 0);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-		}
-		public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-				ValueEval arg2) {
-			try {
-				String needle = TextFunction.evaluateStringArg(arg0, srcRowIndex, srcColumnIndex);
-				String haystack = TextFunction.evaluateStringArg(arg1, srcRowIndex, srcColumnIndex);
-				// evaluate third arg and convert from 1-based to 0-based index
-				int startpos = TextFunction.evaluateIntArg(arg2, srcRowIndex, srcColumnIndex) - 1;
-				if (startpos < 0) {
-					return ErrorEval.VALUE_INVALID;
-				}
-				return eval(haystack, needle, startpos);
-			} catch (EvaluationException e) {
-				return e.getErrorEval();
-			}
-		}
-		private ValueEval eval(String haystack, String needle, int startIndex) {
-			int result;
-			if (_isCaseSensitive) {
-				result = haystack.indexOf(needle, startIndex);
-			} else {
-				result = haystack.toUpperCase(Locale.ROOT)
-                       .indexOf(needle.toUpperCase(Locale.ROOT), startIndex);
-			}
-			if (result == -1) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			return new NumberEval(result + 1);
-		}
-	}
-	/**
-	 * Implementation of the FIND() function.<p/>
-	 *
-	 * <b>Syntax</b>:<br/>
-	 * <b>FIND</b>(<b>find_text</b>, <b>within_text</b>, start_num)<p/>
-	 *
-	 * FIND returns the character position of the first (case sensitive) occurrence of
-	 * <tt>find_text</tt> inside <tt>within_text</tt>.  The third parameter,
-	 * <tt>start_num</tt>, is optional (default=1) and specifies where to start searching
-	 * from.  Character positions are 1-based.<p/>
-	 *
-	 * Author: Torstein Tauno Svendsen (torstei@officenet.no)
-	 */
-	public static final Function FIND = new SearchFind(true);
-	/**
-	 * Implementation of the FIND() function.<p/>
-	 *
-	 * <b>Syntax</b>:<br/>
-	 * <b>SEARCH</b>(<b>find_text</b>, <b>within_text</b>, start_num)<p/>
-	 *
-	 * SEARCH is a case-insensitive version of FIND()
-	 */
-	public static final Function SEARCH = new SearchFind(false);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/TimeFunc.java b/trunk/src/java/org/apache/poi/ss/formula/functions/TimeFunc.java
deleted file mode 100644
index 8423919..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/TimeFunc.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for the Excel function TIME
- *
- * @author Steven Butler (sebutler @ gmail dot com)
- *
- * Based on POI {@link DateFunc}
- */
-public final class TimeFunc extends Fixed3ArgFunction {
-
-	private static final int SECONDS_PER_MINUTE = 60;
-	private static final int SECONDS_PER_HOUR = 3600;
-	private static final int HOURS_PER_DAY = 24;
-	private static final int SECONDS_PER_DAY = HOURS_PER_DAY * SECONDS_PER_HOUR;
-
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		double result;
-		try {
-			result = evaluate(evalArg(arg0, srcRowIndex, srcColumnIndex), evalArg(arg1, srcRowIndex, srcColumnIndex), evalArg(arg2, srcRowIndex, srcColumnIndex));
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		return new NumberEval(result);
-	}
-	private static int evalArg(ValueEval arg, int srcRowIndex, int srcColumnIndex) throws EvaluationException {
-		if (arg == MissingArgEval.instance) {
-			return 0;
-		}
-		ValueEval ev = OperandResolver.getSingleValue(arg, srcRowIndex, srcColumnIndex);
-		// Excel silently truncates double values to integers
-		return OperandResolver.coerceValueToInt(ev);
-	}
-	/**
-	 * Converts the supplied hours, minutes and seconds to an Excel time value.
-	 *
-	 *
-	 * @param ds array of 3 doubles containing hours, minutes and seconds.
-	 * Non-integer inputs are truncated to an integer before further calculation
-	 * of the time value.
-	 * @return An Excel representation of a time of day.
-	 * If the time value represents more than a day, the days are removed from
-	 * the result, leaving only the time of day component.
-	 * @throws org.apache.poi.ss.formula.eval.EvaluationException
-	 * If any of the arguments are greater than 32767 or the hours
-	 * minutes and seconds when combined form a time value less than 0, the function
-	 * evaluates to an error.
-	 */
-	private static double evaluate(int hours, int minutes, int seconds) throws EvaluationException {
-
-		if (hours > 32767 || minutes > 32767 || seconds > 32767) {
-			throw new EvaluationException(ErrorEval.VALUE_INVALID);
-		}
-		int totalSeconds = hours * SECONDS_PER_HOUR + minutes * SECONDS_PER_MINUTE + seconds;
-
-		if (totalSeconds < 0) {
-			throw new EvaluationException(ErrorEval.VALUE_INVALID);
-		}
-		return (totalSeconds % SECONDS_PER_DAY) / (double)SECONDS_PER_DAY;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Today.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Today.java
deleted file mode 100644
index d86844a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Today.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Implementation of Excel TODAY() Function<br/>
- */
-public final class Today extends Fixed0ArgFunction {
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex) {
-		Calendar now = LocaleUtil.getLocaleCalendar();
-		now.clear(Calendar.HOUR);
-        now.set(Calendar.HOUR_OF_DAY,0);
-		now.clear(Calendar.MINUTE);
-		now.clear(Calendar.SECOND);
-		now.clear(Calendar.MILLISECOND);
-		return new NumberEval(DateUtil.getExcelDate(now.getTime()));
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Value.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Value.java
deleted file mode 100644
index 056ec2f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Value.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Implementation for Excel VALUE() function.<p/>
- *
- * <b>Syntax</b>:<br/> <b>VALUE</b>(<b>text</b>)<br/>
- *
- * Converts the text argument to a number. Leading and/or trailing whitespace is
- * ignored. Currency symbols and thousands separators are stripped out.
- * Scientific notation is also supported. If the supplied text does not convert
- * properly the result is <b>#VALUE!</b> error. Blank string converts to zero.
- */
-public final class Value extends Fixed1ArgFunction {
-
-	/** "1,0000" is valid, "1,00" is not */
-	private static final int MIN_DISTANCE_BETWEEN_THOUSANDS_SEPARATOR = 4;
-	private static final Double ZERO = new Double(0.0);
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-		ValueEval veText;
-		try {
-			veText = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		String strText = OperandResolver.coerceValueToString(veText);
-		Double result = convertTextToNumber(strText);
-		if (result == null) {
-			return ErrorEval.VALUE_INVALID;
-		}
-		return new NumberEval(result.doubleValue());
-	}
-
-	/**
-	 * TODO see if the same functionality is needed in {@link OperandResolver#parseDouble(String)}
-	 *
-	 * @return <code>null</code> if there is any problem converting the text
-	 */
-	private static Double convertTextToNumber(String strText) {
-		boolean foundCurrency = false;
-		boolean foundUnaryPlus = false;
-		boolean foundUnaryMinus = false;
-		boolean foundPercentage = false;
-
-		int len = strText.length();
-		int i;
-		for (i = 0; i < len; i++) {
-			char ch = strText.charAt(i);
-			if (Character.isDigit(ch) || ch == '.') {
-				break;
-			}
-			switch (ch) {
-				case ' ':
-					// intervening spaces between '$', '-', '+' are OK
-					continue;
-				case '$':
-					if (foundCurrency) {
-						// only one currency symbols is allowed
-						return null;
-					}
-					foundCurrency = true;
-					continue;
-				case '+':
-					if (foundUnaryMinus || foundUnaryPlus) {
-						return null;
-					}
-					foundUnaryPlus = true;
-					continue;
-				case '-':
-					if (foundUnaryMinus || foundUnaryPlus) {
-						return null;
-					}
-					foundUnaryMinus = true;
-					continue;
-				default:
-					// all other characters are illegal
-					return null;
-			}
-		}
-		if (i >= len) {
-			// didn't find digits or '.'
-			if (foundCurrency || foundUnaryMinus || foundUnaryPlus) {
-				return null;
-			}
-			return ZERO;
-		}
-
-		// remove thousands separators
-
-		boolean foundDecimalPoint = false;
-		int lastThousandsSeparatorIndex = Short.MIN_VALUE;
-
-		StringBuffer sb = new StringBuffer(len);
-		for (; i < len; i++) {
-			char ch = strText.charAt(i);
-			if (Character.isDigit(ch)) {
-				sb.append(ch);
-				continue;
-			}
-			switch (ch) {
-				case ' ':
-					String remainingTextTrimmed = strText.substring(i).trim();
-                    // support for value[space]%
-                    if (remainingTextTrimmed.equals("%")) {
-                        foundPercentage= true;
-                        break;
-                    }
-                    if (remainingTextTrimmed.length() > 0) {
-						// intervening spaces not allowed once the digits start
-						return null;
-					}
-					break;
-				case '.':
-					if (foundDecimalPoint) {
-						return null;
-					}
-					if (i - lastThousandsSeparatorIndex < MIN_DISTANCE_BETWEEN_THOUSANDS_SEPARATOR) {
-						return null;
-					}
-					foundDecimalPoint = true;
-					sb.append('.');
-					continue;
-				case ',':
-					if (foundDecimalPoint) {
-						// thousands separators not allowed after '.' or 'E'
-						return null;
-					}
-					int distanceBetweenThousandsSeparators = i - lastThousandsSeparatorIndex;
-					// as long as there are 3 or more digits between
-					if (distanceBetweenThousandsSeparators < MIN_DISTANCE_BETWEEN_THOUSANDS_SEPARATOR) {
-						return null;
-					}
-					lastThousandsSeparatorIndex = i;
-					// don't append ','
-					continue;
-
-				case 'E':
-				case 'e':
-					if (i - lastThousandsSeparatorIndex < MIN_DISTANCE_BETWEEN_THOUSANDS_SEPARATOR) {
-						return null;
-					}
-					// append rest of strText and skip to end of loop
-					sb.append(strText.substring(i));
-					i = len;
-					break;
-                case '%':
-                    foundPercentage = true;
-                    break;
-				default:
-					// all other characters are illegal
-					return null;
-			}
-		}
-		if (!foundDecimalPoint) {
-			if (i - lastThousandsSeparatorIndex < MIN_DISTANCE_BETWEEN_THOUSANDS_SEPARATOR) {
-				return null;
-			}
-		}
-		double d;
-		try {
-			d = Double.parseDouble(sb.toString());
-		} catch (NumberFormatException e) {
-			// still a problem parsing the number - probably out of range
-			return null;
-		}
-        double result = foundUnaryMinus ? -d : d;
-        return foundPercentage ? result/100. : result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
deleted file mode 100644
index 1938b79..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for any function which must take two or three
- * arguments
- *
- * @author Josh Micich
- */
-abstract class Var1or2ArgFunction implements Function1Arg, Function2Arg {
-
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		switch (args.length) {
-			case 1:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0]);
-			case 2:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1]);
-		}
-		return ErrorEval.VALUE_INVALID;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
deleted file mode 100644
index cf3f350..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for any function which must take two or three
- * arguments
- *
- * @author Josh Micich
- */
-abstract class Var2or3ArgFunction implements Function2Arg, Function3Arg {
-
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		switch (args.length) {
-			case 2:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1]);
-			case 3:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2]);
-		}
-		return ErrorEval.VALUE_INVALID;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
deleted file mode 100644
index e701b2d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Convenience base class for any function which must take three or four
- * arguments
- *
- * @author Josh Micich
- */
-abstract class Var3or4ArgFunction implements Function3Arg, Function4Arg {
-
-	public final ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		switch (args.length) {
-			case 3:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2]);
-			case 4:
-				return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], args[3]);
-		}
-		return ErrorEval.VALUE_INVALID;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/Vlookup.java b/trunk/src/java/org/apache/poi/ss/formula/functions/Vlookup.java
deleted file mode 100644
index 2f21e21..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/Vlookup.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-import org.apache.poi.ss.formula.TwoDEval;
-/**
- * Implementation of the VLOOKUP() function.<p/>
- *
- * VLOOKUP finds a row in a lookup table by the first column value and returns the value from another column.<br/>
- *
- * <b>Syntax</b>:<br/>
- * <b>VLOOKUP</b>(<b>lookup_value</b>, <b>table_array</b>, <b>col_index_num</b>, range_lookup)<p/>
- *
- * <b>lookup_value</b>  The value to be found in the first column of the table array.<br/>
- * <b>table_array</b> An area reference for the lookup data. <br/>
- * <b>col_index_num</b> a 1 based index specifying which column value of the lookup data will be returned.<br/>
- * <b>range_lookup</b> If TRUE (default), VLOOKUP finds the largest value less than or equal to
- * the lookup_value.  If FALSE, only exact matches will be considered<br/>
- */
-public final class Vlookup extends Var3or4ArgFunction {
-	private static final ValueEval DEFAULT_ARG3 = BoolEval.TRUE;
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1,
-			ValueEval arg2) {
-		return evaluate(srcRowIndex, srcColumnIndex, arg0, arg1, arg2, DEFAULT_ARG3);
-	}
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval lookup_value, ValueEval table_array,
-			ValueEval col_index, ValueEval range_lookup) {
-		try {
-			// Evaluation order:
-			// lookup_value , table_array, range_lookup, find lookup value, col_index, fetch result
-			ValueEval lookupValue = OperandResolver.getSingleValue(lookup_value, srcRowIndex, srcColumnIndex);
-			TwoDEval tableArray = LookupUtils.resolveTableArrayArg(table_array);
-			boolean isRangeLookup = LookupUtils.resolveRangeLookupArg(range_lookup, srcRowIndex, srcColumnIndex);
-			int rowIndex = LookupUtils.lookupIndexOfValue(lookupValue, LookupUtils.createColumnVector(tableArray, 0), isRangeLookup);
-			int colIndex = LookupUtils.resolveRowOrColIndexArg(col_index, srcRowIndex, srcColumnIndex);
-			ValueVector resultCol = createResultColumnVector(tableArray, colIndex);
-			return resultCol.getItem(rowIndex);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	}
-
-
-	/**
-	 * Returns one column from an <tt>AreaEval</tt>
-	 *
-	 * @param colIndex assumed to be non-negative
-	 *
-	 * @throws EvaluationException (#REF!) if colIndex is too high
-	 */
-	private ValueVector createResultColumnVector(TwoDEval tableArray, int colIndex) throws EvaluationException {
-		if(colIndex >= tableArray.getWidth()) {
-			throw EvaluationException.invalidRef();
-		}
-		return LookupUtils.createColumnVector(tableArray, colIndex);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java b/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
deleted file mode 100644
index 888ad11..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Implementation for Excel WeekNum() function.<p/>
- * <p/>
- * <b>Syntax</b>:<br/> <b>WeekNum  </b>(<b>Serial_num</b>,<b>Return_type</b>)<br/>
- * <p/>
- * Returns a number that indicates where the week falls numerically within a year.
- * <p/>
- * <p/>
- * Serial_num     is a date within the week. Dates should be entered by using the DATE function,
- * or as results of other formulas or functions. For example, use DATE(2008,5,23)
- * for the 23rd day of May, 2008. Problems can occur if dates are entered as text.
- * Return_type     is a number that determines on which day the week begins. The default is 1.
- * 1	Week begins on Sunday. Weekdays are numbered 1 through 7.
- * 2	Week begins on Monday. Weekdays are numbered 1 through 7.
- */
-public class WeekNum extends Fixed2ArgFunction implements FreeRefFunction {
-    public static final FreeRefFunction instance = new WeekNum();
-
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval serialNumVE, ValueEval returnTypeVE) {
-        double serialNum = 0.0;
-        try {
-            serialNum = NumericFunction.singleOperandEvaluate(serialNumVE, srcRowIndex, srcColumnIndex);
-        } catch (EvaluationException e) {
-            return ErrorEval.VALUE_INVALID;
-        }
-        Calendar serialNumCalendar = LocaleUtil.getLocaleCalendar();
-        serialNumCalendar.setTime(DateUtil.getJavaDate(serialNum, false));
-
-        int returnType = 0;
-        try {
-            ValueEval ve = OperandResolver.getSingleValue(returnTypeVE, srcRowIndex, srcColumnIndex);
-            returnType = OperandResolver.coerceValueToInt(ve);
-        } catch (EvaluationException e) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        if (returnType != 1 && returnType != 2) {
-            return ErrorEval.NUM_ERROR;
-        }
-
-        return new NumberEval(this.getWeekNo(serialNumCalendar, returnType));
-    }
-
-    public int getWeekNo(Calendar cal, int weekStartOn) {
-        if (weekStartOn == 1) {
-            cal.setFirstDayOfWeek(Calendar.SUNDAY);
-        } else {
-            cal.setFirstDayOfWeek(Calendar.MONDAY);
-        }
-        return cal.get(Calendar.WEEK_OF_YEAR);
-    }
-
-    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-        if (args.length == 2) {
-            return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
-        }
-        return ErrorEval.VALUE_INVALID;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java b/trunk/src/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
deleted file mode 100644
index deab05b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-
-
-/**
- * Implementation for the Excel function WEEKDAY
- *
- * @author Thies Wellpott
- */
-public final class WeekdayFunc implements Function {
-//or:  extends Var1or2ArgFunction {
-
-	public static final Function instance = new WeekdayFunc();
-
-	private WeekdayFunc() {
-		// no fields to initialise
-	}
-
-	/* for Var1or2ArgFunction:
-	@Override
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
-	}
-
-	@Override
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-	}
-	*/
-
-
-	/**
-	 * Perform WEEKDAY(date, returnOption) function.
-	 * Note: Parameter texts are from German EXCEL-2010 help.
-	 * Parameters in args[]:
-	 *  args[0] serialDate
-	 * EXCEL-date value
-	 * Standardmaessig ist der 1. Januar 1900 die fortlaufende Zahl 1 und
-	 * der 1. Januar 2008 die fortlaufende Zahl 39.448, da dieser Tag nach 39.448 Tagen
-	 * auf den 01.01.1900 folgt.
-	 * @return Option (optional)
-	 * Bestimmt den Rueckgabewert:
-		1	oder nicht angegeben Zahl 1 (Sonntag) bis 7 (Samstag). Verhaelt sich wie fruehere Microsoft Excel-Versionen.
-		2	Zahl 1 (Montag) bis 7 (Sonntag).
-		3	Zahl 0 (Montag) bis 6 (Sonntag).
-		11	Die Zahlen 1 (Montag) bis 7 (Sonntag)
-		12	Die Zahlen 1 (Dienstag) bis 7 (Montag)
-		13	Die Zahlen 1 (Mittwoch) bis 7 (Dienstag)
-		14	Die Zahlen 1 (Donnerstag) bis 7 (Mittwoch)
-		15	Die Zahlen 1 (Freitag) bis 7 (Donnerstag)
-		16	Die Zahlen 1 (Samstag) bis 7 (Freitag)
-		17	Die Zahlen 1 (Sonntag) bis 7 (Samstag)
-	 */
-	public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-		try {
-			if (args.length < 1  ||  args.length > 2) {
-				return ErrorEval.VALUE_INVALID;
-			}
-
-			// extract first parameter
-			ValueEval serialDateVE = OperandResolver.getSingleValue(args[0], srcRowIndex, srcColumnIndex);
-			double serialDate = OperandResolver.coerceValueToDouble(serialDateVE);
-			if (!DateUtil.isValidExcelDate(serialDate)) {
-				return ErrorEval.NUM_ERROR;						// EXCEL uses this and no VALUE_ERROR
-			}
-			Calendar date = DateUtil.getJavaCalendar(serialDate, false);		// (XXX 1904-windowing not respected)
-			int weekday = date.get(Calendar.DAY_OF_WEEK);		// => sunday = 1, monday = 2, ..., saturday = 7
-
-			// extract second parameter
-			int returnOption = 1;					// default value
-			if (args.length == 2) {
-				ValueEval ve = OperandResolver.getSingleValue(args[1], srcRowIndex, srcColumnIndex);
-				if (ve == MissingArgEval.instance  ||  ve == BlankEval.instance) {
-					return ErrorEval.NUM_ERROR;		// EXCEL uses this and no VALUE_ERROR
-				}
-				returnOption = OperandResolver.coerceValueToInt(ve);
-				if (returnOption == 2) {
-					returnOption = 11;				// both mean the same
-				}
-			} // if
-
-			// perform calculation
-			double result;
-			if (returnOption == 1) {
-				result = weekday;
-			// value 2 is handled above (as value 11)
-			} else if (returnOption == 3) {
-				result = (weekday + 6 - 1) % 7;
-			} else if (returnOption >= 11  &&  returnOption <= 17) {
-				result = (weekday + 6 - (returnOption - 10)) % 7 + 1;		// rotate in the value range 1 to 7
-			} else {
-				return ErrorEval.NUM_ERROR;		// EXCEL uses this and no VALUE_ERROR
-			}
-
-			return new NumberEval(result);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-	} // evaluate()
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java b/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
deleted file mode 100644
index da2a0f3..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public abstract class XYNumericFunction extends Fixed2ArgFunction {
-
-	private static abstract class ValueArray implements ValueVector {
-		private final int _size;
-		protected ValueArray(int size) {
-			_size = size;
-		}
-		public ValueEval getItem(int index) {
-			if (index < 0 || index > _size) {
-				throw new IllegalArgumentException("Specified index " + index
-						+ " is outside range (0.." + (_size - 1) + ")");
-			}
-			return getItemInternal(index);
-		}
-		protected abstract ValueEval getItemInternal(int index);
-		public final int getSize() {
-			return _size;
-		}
-	}
-
-	private static final class SingleCellValueArray extends ValueArray {
-		private final ValueEval _value;
-		public SingleCellValueArray(ValueEval value) {
-			super(1);
-			_value = value;
-		}
-		protected ValueEval getItemInternal(int index) {
-			return _value;
-		}
-	}
-
-	private static final class RefValueArray extends ValueArray {
-		private final RefEval _ref;
-        private final int _width;
-        
-		public RefValueArray(RefEval ref) {
-			super(ref.getNumberOfSheets());
-			_ref = ref;
-			_width = ref.getNumberOfSheets();
-		}
-		protected ValueEval getItemInternal(int index) {
-		    int sIx = (index % _width) + _ref.getFirstSheetIndex(); 
-			return _ref.getInnerValueEval(sIx);
-		}
-	}
-
-	private static final class AreaValueArray extends ValueArray {
-		private final TwoDEval _ae;
-		private final int _width;
-
-		public AreaValueArray(TwoDEval ae) {
-			super(ae.getWidth() * ae.getHeight());
-			_ae = ae;
-			_width = ae.getWidth();
-		}
-		protected ValueEval getItemInternal(int index) {
-			int rowIx = index / _width;
-			int colIx = index % _width;
-			return _ae.getValue(rowIx, colIx);
-		}
-	}
-
-	protected static interface Accumulator {
-		double accumulate(double x, double y);
-	}
-
-	/**
-	 * Constructs a new instance of the Accumulator used to calculated this function
-	 */
-	protected abstract Accumulator createAccumulator();
-
-	public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-
-		double result;
-		try {
-			ValueVector vvX = createValueVector(arg0);
-			ValueVector vvY = createValueVector(arg1);
-			int size = vvX.getSize();
-			if (size == 0 || vvY.getSize() != size) {
-				return ErrorEval.NA;
-			}
-			result = evaluateInternal(vvX, vvY, size);
-		} catch (EvaluationException e) {
-			return e.getErrorEval();
-		}
-		if (Double.isNaN(result) || Double.isInfinite(result)) {
-			return ErrorEval.NUM_ERROR;
-		}
-		return new NumberEval(result);
-	}
-
-	private double evaluateInternal(ValueVector x, ValueVector y, int size)
-			throws EvaluationException {
-		Accumulator acc = createAccumulator();
-
-		// error handling is as if the x is fully evaluated before y
-		ErrorEval firstXerr = null;
-		ErrorEval firstYerr = null;
-		boolean accumlatedSome = false;
-		double result = 0.0;
-
-		for (int i = 0; i < size; i++) {
-			ValueEval vx = x.getItem(i);
-			ValueEval vy = y.getItem(i);
-			if (vx instanceof ErrorEval) {
-				if (firstXerr == null) {
-					firstXerr = (ErrorEval) vx;
-					continue;
-				}
-			}
-			if (vy instanceof ErrorEval) {
-				if (firstYerr == null) {
-					firstYerr = (ErrorEval) vy;
-					continue;
-				}
-			}
-			// only count pairs if both elements are numbers
-			if (vx instanceof NumberEval && vy instanceof NumberEval) {
-				accumlatedSome = true;
-				NumberEval nx = (NumberEval) vx;
-				NumberEval ny = (NumberEval) vy;
-				result += acc.accumulate(nx.getNumberValue(), ny.getNumberValue());
-			} else {
-				// all other combinations of value types are silently ignored
-			}
-		}
-		if (firstXerr != null) {
-			throw new EvaluationException(firstXerr);
-		}
-		if (firstYerr != null) {
-			throw new EvaluationException(firstYerr);
-		}
-		if (!accumlatedSome) {
-			throw new EvaluationException(ErrorEval.DIV_ZERO);
-		}
-		return result;
-	}
-
-	private static ValueVector createValueVector(ValueEval arg) throws EvaluationException {
-		if (arg instanceof ErrorEval) {
-			throw new EvaluationException((ErrorEval) arg);
-		}
-		if (arg instanceof TwoDEval) {
-			return new AreaValueArray((TwoDEval) arg);
-		}
-		if (arg instanceof RefEval) {
-			return new RefValueArray((RefEval) arg);
-		}
-		return new SingleCellValueArray(arg);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/package.html b/trunk/src/java/org/apache/poi/ss/formula/package.html
deleted file mode 100644
index 3296708..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/package.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-This package contains common internal POI code for manipulating formulas.
-Client applications should not refer to these classes directly.
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
deleted file mode 100644
index c3ae444..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import java.util.Locale;
-
-import org.apache.poi.ss.formula.function.FunctionMetadata;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-
-/**
- * This class provides the base functionality for Excel sheet functions
- * There are two kinds of function Ptgs - tFunc and tFuncVar
- * Therefore, this class will have ONLY two subclasses
- * @author  Avik Sengupta
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-public abstract class AbstractFunctionPtg extends OperationPtg {
-
-    /**
-     * The name of the IF function (i.e. "IF").  Extracted as a constant for clarity.
-     */
-    public static final String FUNCTION_NAME_IF = "IF";
-    /** All external functions have function index 255 */
-    private static final short FUNCTION_INDEX_EXTERNAL = 255;
-
-    private final byte returnClass;
-    private final byte[] paramClass;
-
-    private final byte _numberOfArgs;
-    private final short _functionIndex;
-
-    protected AbstractFunctionPtg(int functionIndex, int pReturnClass, byte[] paramTypes, int nParams) {
-        _numberOfArgs = (byte) nParams;
-        _functionIndex = (short) functionIndex;
-        returnClass = (byte) pReturnClass;
-        paramClass = paramTypes;
-    }
-    public final boolean isBaseToken() {
-        return false;
-    }
-
-    public final String toString() {
-        StringBuilder sb = new StringBuilder(64);
-        sb.append(getClass().getName()).append(" [");
-        sb.append(lookupName(_functionIndex));
-        sb.append(" nArgs=").append(_numberOfArgs);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public final short getFunctionIndex() {
-        return _functionIndex;
-    }
-    public final int getNumberOfOperands() {
-        return _numberOfArgs;
-    }
-
-    public final String getName() {
-        return lookupName(_functionIndex);
-    }
-    /**
-     * external functions get some special processing
-     * @return <code>true</code> if this is an external function
-     */
-    public final boolean isExternalFunction() {
-        return _functionIndex == FUNCTION_INDEX_EXTERNAL;
-    }
-
-    public final String toFormulaString() {
-        return getName();
-    }
-
-    public String toFormulaString(String[] operands) {
-        StringBuilder buf = new StringBuilder();
-
-        if(isExternalFunction()) {
-            buf.append(operands[0]); // first operand is actually the function name
-            appendArgs(buf, 1, operands);
-        } else {
-            buf.append(getName());
-            appendArgs(buf, 0, operands);
-        }
-        return buf.toString();
-    }
-
-    private static void appendArgs(StringBuilder buf, int firstArgIx, String[] operands) {
-        buf.append('(');
-        for (int i=firstArgIx;i<operands.length;i++) {
-            if (i>firstArgIx) {
-                buf.append(',');
-            }
-            buf.append(operands[i]);
-        }
-        buf.append(")");
-    }
-
-    public abstract int getSize();
-
-
-    /**
-     * Used to detect whether a function name found in a formula is one of the standard excel functions
-     * <p>
-     * The name matching is case insensitive.
-     * @return <code>true</code> if the name specifies a standard worksheet function,
-     *  <code>false</code> if the name should be assumed to be an external function.
-     */
-    public static final boolean isBuiltInFunctionName(String name) {
-        short ix = FunctionMetadataRegistry.lookupIndexByName(name.toUpperCase(Locale.ROOT));
-        return ix >= 0;
-    }
-
-    protected final String lookupName(short index) {
-        if(index == FunctionMetadataRegistry.FUNCTION_INDEX_EXTERNAL) {
-            return "#external#";
-        }
-        FunctionMetadata fm = FunctionMetadataRegistry.getFunctionByIndex(index);
-        if(fm == null) {
-            throw new RuntimeException("bad function index (" + index + ")");
-        }
-        return fm.getName();
-    }
-
-    /**
-     * Resolves internal function names into function indexes.
-     * <p>
-     * The name matching is case insensitive.
-     * @return the standard worksheet function index if found, otherwise <tt>FUNCTION_INDEX_EXTERNAL</tt>
-     */
-    protected static short lookupIndex(String name) {
-        short ix = FunctionMetadataRegistry.lookupIndexByName(name.toUpperCase(Locale.ROOT));
-        if (ix < 0) {
-            return FUNCTION_INDEX_EXTERNAL;
-        }
-        return ix;
-    }
-
-    public byte getDefaultOperandClass() {
-        return returnClass;
-    }
-
-    public final byte getParameterClass(int index) {
-        if (index >= paramClass.length) {
-            // For var-arg (and other?) functions, the metadata does not list all the parameter
-            // operand classes.  In these cases, all extra parameters are assumed to have the
-            // same operand class as the last one specified.
-            return paramClass[paramClass.length - 1];
-        }
-        return paramClass[index];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java
deleted file mode 100644
index e275d8c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Addition operator PTG the "+" binomial operator.  If you need more 
- * explanation than that then well...We really can't help you here.
- * @author  Andrew C. Oliver (acoliver@apache.org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class AddPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x03;
-    
-    private final static String ADD = "+";
-
-    public static final ValueOperatorPtg instance = new AddPtg();
-
-    private AddPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-       
-   /** implementation of method from OperationsPtg*/  
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-        buffer.append(ADD);
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
deleted file mode 100644
index 59324f8..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Common superclass of 2-D area refs
- */
-public abstract class Area2DPtgBase extends AreaPtgBase {
-	private final static int SIZE = 9;
-
-	protected Area2DPtgBase(int firstRow, int lastRow, int firstColumn, int lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
-		super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);
-	}
-	protected Area2DPtgBase(AreaReference ar) {
-		super(ar);
-	}
-
-	protected Area2DPtgBase(LittleEndianInput in)  {
-		readCoordinates(in);
-	}
-
-	protected abstract byte getSid();
-
-	public final void write(LittleEndianOutput out) {
-		out.writeByte(getSid() + getPtgClass());
-		writeCoordinates(out);
-	}
-
-	public final int getSize() {
-		return SIZE;
-	}
-
-	public final String toFormulaString() {
-		return formatReferenceAsString();
-	}
-
-	public final String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append(getClass().getName());
-		sb.append(" [");
-		sb.append(formatReferenceAsString());
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
deleted file mode 100644
index 7bf64c0..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.ExternSheetReferenceToken;
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.WorkbookDependentFormula;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * <p>Title:        Area 3D Ptg - 3D reference (Sheet + Area)</p>
- * <p>Description:  Defined an area in Extern Sheet. </p>
- * <p>REFERENCE:  </p>
- * 
- * <p>This is HSSF only, as it matches the HSSF file format way of
- *  referring to the sheet by an extern index. The XSSF equivalent
- *  is {@link Area3DPxg}
- */
-public final class Area3DPtg extends AreaPtgBase implements WorkbookDependentFormula, ExternSheetReferenceToken {
-	public final static byte sid = 0x3b;
-	private final static int SIZE = 11; // 10 + 1 for Ptg
-
-	private int field_1_index_extern_sheet;
-
-
-	public Area3DPtg(String arearef, int externIdx) {
-		super(new AreaReference(arearef));
-		setExternSheetIndex(externIdx);
-	}
-
-	public Area3DPtg(LittleEndianInput in)  {
-		field_1_index_extern_sheet = in.readShort();
-		readCoordinates(in);
-	}
-
-	public Area3DPtg(int firstRow, int lastRow, int firstColumn, int lastColumn,
-			boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative,
-			int externalSheetIndex) {
-		super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);
-		setExternSheetIndex(externalSheetIndex);
-	}
-
-	public Area3DPtg(AreaReference arearef, int externIdx) {
-		super(arearef);
-		setExternSheetIndex(externIdx);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append(getClass().getName());
-		sb.append(" [");
-		sb.append("sheetIx=").append(getExternSheetIndex());
-		sb.append(" ! ");
-		sb.append(formatReferenceAsString());
-		sb.append("]");
-		return sb.toString();
-	}
-
-	@Override
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeShort(field_1_index_extern_sheet);
-		writeCoordinates(out);
-	}
-
-	@Override
-	public int getSize() {
-		return SIZE;
-	}
-
-	public int getExternSheetIndex() {
-		return field_1_index_extern_sheet;
-	}
-
-	public void setExternSheetIndex(int index) {
-		field_1_index_extern_sheet = index;
-	}
-	public String format2DRefAsString() {
-		return formatReferenceAsString();
-	}
-	/**
-	 * @return text representation of this area reference that can be used in text
-	 *  formulas. The sheet name will get properly delimited if required.
-	 */
-	public String toFormulaString(FormulaRenderingWorkbook book) {
-		return ExternSheetNameResolver.prependSheetName(book, field_1_index_extern_sheet, formatReferenceAsString());
-	}
-	@Override
-	public String toFormulaString() {
-		throw new RuntimeException("3D references need a workbook to determine formula text");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
deleted file mode 100644
index 2916211..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.SheetIdentifier;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.formula.SheetRangeIdentifier;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * <p>Title:        XSSF Area 3D Reference (Sheet + Area)<P>
- * <p>Description:  Defined an area in an external or different sheet. <P>
- * <p>REFERENCE:  </p>
- * 
- * <p>This is XSSF only, as it stores the sheet / book references
- *  in String form. The HSSF equivalent using indexes is {@link Area3DPtg}</p>
- */
-public final class Area3DPxg extends AreaPtgBase implements Pxg3D {
-    private int externalWorkbookNumber = -1;
-    private String firstSheetName;
-    private String lastSheetName;
-
-    public Area3DPxg(int externalWorkbookNumber, SheetIdentifier sheetName, String arearef) {
-        this(externalWorkbookNumber, sheetName, new AreaReference(arearef));
-    }
-    public Area3DPxg(int externalWorkbookNumber, SheetIdentifier sheetName, AreaReference arearef) {
-        super(arearef);
-        this.externalWorkbookNumber = externalWorkbookNumber;
-        this.firstSheetName = sheetName.getSheetIdentifier().getName();
-        if (sheetName instanceof SheetRangeIdentifier) {
-            this.lastSheetName = ((SheetRangeIdentifier)sheetName).getLastSheetIdentifier().getName();
-        } else {
-            this.lastSheetName = null;
-        }
-    }
-
-    public Area3DPxg(SheetIdentifier sheetName, String arearef) {
-        this(sheetName, new AreaReference(arearef));
-    }
-    public Area3DPxg(SheetIdentifier sheetName, AreaReference arearef) {
-        this(-1, sheetName, arearef);
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(getClass().getName());
-        sb.append(" [");
-        if (externalWorkbookNumber >= 0) {
-            sb.append(" [");
-            sb.append("workbook=").append(getExternalWorkbookNumber());
-            sb.append("] ");
-        }
-        sb.append("sheet=").append(getSheetName());
-        if (lastSheetName != null) {
-            sb.append(" : ");
-            sb.append("sheet=").append(lastSheetName);
-        }
-        sb.append(" ! ");
-        sb.append(formatReferenceAsString());
-        sb.append("]");
-        return sb.toString();
-    }
-    
-    public int getExternalWorkbookNumber() {
-        return externalWorkbookNumber;
-    }
-    public String getSheetName() {
-        return firstSheetName;
-    }
-    public String getLastSheetName() {
-        return lastSheetName;
-    }
-    
-    public void setSheetName(String sheetName) {
-        this.firstSheetName = sheetName;
-    }
-    public void setLastSheetName(String sheetName) {
-        this.lastSheetName = sheetName;
-    }
-
-    public String format2DRefAsString() {
-        return formatReferenceAsString();
-    }
-    
-    public String toFormulaString() {
-        StringBuffer sb = new StringBuffer();
-        if (externalWorkbookNumber >= 0) {
-            sb.append('[');
-            sb.append(externalWorkbookNumber);
-            sb.append(']');
-        }
-        SheetNameFormatter.appendFormat(sb, firstSheetName);
-        if (lastSheetName != null) {
-            sb.append(':');
-            SheetNameFormatter.appendFormat(sb, lastSheetName);
-        }
-        sb.append('!');
-        sb.append(formatReferenceAsString());
-        return sb.toString();
-    }
-
-    public int getSize() {
-        return 1;
-    }
-    public void write(LittleEndianOutput out) {
-        throw new IllegalStateException("XSSF-only Ptg, should not be serialised");
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
deleted file mode 100644
index 0685e8e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * AreaErr - handles deleted cell area references.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class AreaErrPtg extends OperandPtg {
-	public final static byte sid = 0x2B;
-	private final int unused1;
-	private final int unused2;
-
-	public AreaErrPtg() {
-		unused1 = 0;
-		unused2 = 0;
-	}
-
-	public AreaErrPtg(LittleEndianInput in)  {
-		// 8 bytes unused:
-		unused1 = in.readInt();
-		unused2 = in.readInt();
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeInt(unused1);
-		out.writeInt(unused2);
-	}
-
-	public String toFormulaString() {
-		return FormulaError.REF.getString();
-	}
-
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_REF;
-	}
-
-	public int getSize() {
-		return 9;
-	}
-}
-
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaI.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaI.java
deleted file mode 100644
index 3610126..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaI.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Common interface for AreaPtg and Area3DPtg, and their child classes.
- */
-public interface AreaI {
-	/**
-	 * @return the first row in the area
-	 */
-	int getFirstRow();
-
-	/**
-	 * @return last row in the range (x2 in x1,y1-x2,y2)
-	 */
-	int getLastRow();
-
-	/**
-	 * @return the first column number in the area.
-	 */
-	int getFirstColumn();
-
-	/**
-	 * @return lastcolumn in the area
-	 */
-	int getLastColumn();
-
-	class OffsetArea implements AreaI {
-
-		private final int _firstColumn;
-		private final int _firstRow;
-		private final int _lastColumn;
-		private final int _lastRow;
-
-		public OffsetArea(int baseRow, int baseColumn, int relFirstRowIx, int relLastRowIx,
-				int relFirstColIx, int relLastColIx) {
-			_firstRow = baseRow + Math.min(relFirstRowIx, relLastRowIx);
-			_lastRow = baseRow + Math.max(relFirstRowIx, relLastRowIx);
-			_firstColumn = baseColumn + Math.min(relFirstColIx, relLastColIx);
-			_lastColumn = baseColumn + Math.max(relFirstColIx, relLastColIx);
-		}
-
-		public int getFirstColumn() {
-			return _firstColumn;
-		}
-
-		public int getFirstRow() {
-			return _firstRow;
-		}
-
-		public int getLastColumn() {
-			return _lastColumn;
-		}
-
-		public int getLastRow() {
-			return _lastRow;
-		}
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
deleted file mode 100644
index bc8f76e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * Specifies a rectangular area of cells A1:A4 for instance.
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class AreaNPtg extends Area2DPtgBase {
-	public final static short sid = 0x2D;
-
-	public AreaNPtg(LittleEndianInput in)  {
-		super(in);
-	}
-
-	protected byte getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
deleted file mode 100644
index a0bb8f6..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * Specifies a rectangular area of cells A1:A4 for instance.
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class AreaPtg extends Area2DPtgBase {
-	public final static short sid  = 0x25;
-
-	public AreaPtg(int firstRow, int lastRow, int firstColumn, int lastColumn, boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
-		super(firstRow, lastRow, firstColumn, lastColumn, firstRowRelative, lastRowRelative, firstColRelative, lastColRelative);
-	}
-	public AreaPtg(LittleEndianInput in)  {
-		super(in);
-	}
-	public AreaPtg(String arearef) {
-		super(new AreaReference(arearef));
-	}
-	public AreaPtg(AreaReference areaRef) {
-		super(areaRef);
-	}
-	@Override
-	protected byte getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
deleted file mode 100644
index 8162876..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Specifies a rectangular area of cells A1:A4 for instance.
- * @author  andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public abstract class AreaPtgBase extends OperandPtg implements AreaI {
-    /**
-     * TODO - (May-2008) fix subclasses of AreaPtg 'AreaN~' which are used in shared formulas.
-     * see similar comment in ReferencePtg
-     */
-    protected final RuntimeException notImplemented() {
-        return new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
-    }
-
-    /** zero based, unsigned 16 bit */
-    private int field_1_first_row;
-    /** zero based, unsigned 16 bit */
-    private int field_2_last_row;
-    /** zero based, unsigned 8 bit */
-    private int field_3_first_column; //BitFields: (first row relative, first col relative, first column number)
-    /** zero based, unsigned 8 bit */
-    private int field_4_last_column; //BitFields: (last row relative, last col relative, last column number)
-
-    private final static BitField rowRelative = BitFieldFactory.getInstance(0x8000);
-    private final static BitField colRelative = BitFieldFactory.getInstance(0x4000);
-    private final static BitField columnMask  = BitFieldFactory.getInstance(0x3FFF);
-
-    protected AreaPtgBase() {
-        // do nothing
-    }
-
-    protected AreaPtgBase(AreaReference ar) {
-        CellReference firstCell = ar.getFirstCell();
-        CellReference lastCell = ar.getLastCell();
-        setFirstRow(firstCell.getRow());
-        setFirstColumn(firstCell.getCol() == -1 ? 0 : firstCell.getCol());
-        setLastRow(lastCell.getRow());
-        setLastColumn(lastCell.getCol() == -1 ? 0xFF : lastCell.getCol());
-        setFirstColRelative(!firstCell.isColAbsolute());
-        setLastColRelative(!lastCell.isColAbsolute());
-        setFirstRowRelative(!firstCell.isRowAbsolute());
-        setLastRowRelative(!lastCell.isRowAbsolute());
-    }
-
-    protected AreaPtgBase(int firstRow, int lastRow, int firstColumn, int lastColumn,
-            boolean firstRowRelative, boolean lastRowRelative, boolean firstColRelative, boolean lastColRelative) {
-
-        if (lastRow >= firstRow) {
-            setFirstRow(firstRow);
-            setLastRow(lastRow);
-            setFirstRowRelative(firstRowRelative);
-            setLastRowRelative(lastRowRelative);
-        } else {
-            setFirstRow(lastRow);
-            setLastRow(firstRow);
-            setFirstRowRelative(lastRowRelative);
-            setLastRowRelative(firstRowRelative);
-        }
-
-        if (lastColumn >= firstColumn) {
-            setFirstColumn(firstColumn);
-            setLastColumn(lastColumn);
-            setFirstColRelative(firstColRelative);
-            setLastColRelative(lastColRelative);
-        } else {
-            setFirstColumn(lastColumn);
-            setLastColumn(firstColumn);
-            setFirstColRelative(lastColRelative);
-            setLastColRelative(firstColRelative);
-        }
-    }
-    
-    /**
-     * Sort the first and last row and columns in-place to the preferred (top left:bottom right) order
-     * Note: Sort only occurs when an instance is constructed or when this method is called.
-     * 
-     * <p>For example, <code>$E5:B$10</code> becomes <code>B5:$E$10</code></p>
-     */
-    public void sortTopLeftToBottomRight() {
-        if (getFirstRow() > getLastRow()) {
-            //swap first row and last row numbers and relativity
-            //Note: cannot just swap the fields because row relativity is stored in fields 3 and 4
-            final int firstRow = getFirstRow();
-            final boolean firstRowRel = isFirstRowRelative();
-            setFirstRow(getLastRow());
-            setFirstRowRelative(isLastRowRelative());
-            setLastRow(firstRow);
-            setLastRowRelative(firstRowRel);
-        }
-        if (getFirstColumn() > getLastColumn()) {
-            //swap first column and last column numbers and relativity
-            //Note: cannot just swap the fields because row relativity is stored in fields 3 and 4
-            final int firstCol = getFirstColumn();
-            final boolean firstColRel = isFirstColRelative();
-            setFirstColumn(getLastColumn());
-            setFirstColRelative(isLastColRelative());
-            setLastColumn(firstCol);
-            setLastColRelative(firstColRel);
-        }
-    }
-
-    protected final void readCoordinates(LittleEndianInput in)  {
-        field_1_first_row = in.readUShort();
-        field_2_last_row = in.readUShort();
-        field_3_first_column = in.readUShort();
-        field_4_last_column = in.readUShort();
-    }
-    protected final void writeCoordinates(LittleEndianOutput out) {
-        out.writeShort(field_1_first_row);
-        out.writeShort(field_2_last_row);
-        out.writeShort(field_3_first_column);
-        out.writeShort(field_4_last_column);
-    }
-
-    /**
-     * @return the first row in the area
-     */
-    public final int getFirstRow() {
-        return field_1_first_row;
-    }
-
-    /**
-     * sets the first row
-     * @param rowIx number (0-based)
-     */
-    public final void setFirstRow(int rowIx) {
-        field_1_first_row = rowIx;
-    }
-
-    /**
-     * @return last row in the range (x2 in x1,y1-x2,y2)
-     */
-    public final int getLastRow() {
-        return field_2_last_row;
-    }
-
-    /**
-     * @param rowIx last row number in the area
-     */
-    public final void setLastRow(int rowIx) {
-        field_2_last_row = rowIx;
-    }
-
-    /**
-     * @return the first column number in the area.
-     */
-    public final int getFirstColumn() {
-        return columnMask.getValue(field_3_first_column);
-    }
-
-    /**
-     * @return the first column number + the options bit settings unstripped
-     */
-    public final short getFirstColumnRaw() {
-        return (short) field_3_first_column; // TODO
-    }
-
-    /**
-     * @return whether or not the first row is a relative reference or not.
-     */
-    public final boolean isFirstRowRelative() {
-        return rowRelative.isSet(field_3_first_column);
-    }
-
-    /**
-     * sets the first row to relative or not
-     * @param rel is relative or not.
-     */
-    public final void setFirstRowRelative(boolean rel) {
-        field_3_first_column=rowRelative.setBoolean(field_3_first_column,rel);
-    }
-
-    /**
-     * @return isrelative first column to relative or not
-     */
-    public final boolean isFirstColRelative() {
-        return colRelative.isSet(field_3_first_column);
-    }
-
-    /**
-     * set whether the first column is relative
-     */
-    public final void setFirstColRelative(boolean rel) {
-        field_3_first_column=colRelative.setBoolean(field_3_first_column,rel);
-    }
-
-    /**
-     * set the first column in the area
-     */
-    public final void setFirstColumn(int colIx) {
-        field_3_first_column=columnMask.setValue(field_3_first_column, colIx);
-    }
-
-    /**
-     * set the first column irrespective of the bitmasks
-     */
-    public final void setFirstColumnRaw(int column) {
-        field_3_first_column = column;
-    }
-
-    /**
-     * @return lastcolumn in the area
-     */
-    public final int getLastColumn() {
-        return columnMask.getValue(field_4_last_column);
-    }
-
-    /**
-     * @return last column and bitmask (the raw field)
-     */
-    public final short getLastColumnRaw() {
-        return (short) field_4_last_column;
-    }
-
-    /**
-     * @return last row relative or not
-     */
-    public final boolean isLastRowRelative() {
-        return rowRelative.isSet(field_4_last_column);
-    }
-
-    /**
-     * set whether the last row is relative or not
-     * @param rel <code>true</code> if the last row relative, else
-     * <code>false</code>
-     */
-    public final void setLastRowRelative(boolean rel) {
-        field_4_last_column=rowRelative.setBoolean(field_4_last_column,rel);
-    }
-
-    /**
-     * @return lastcol relative or not
-     */
-    public final boolean isLastColRelative() {
-        return colRelative.isSet(field_4_last_column);
-    }
-
-    /**
-     * set whether the last column should be relative or not
-     */
-    public final void setLastColRelative(boolean rel) {
-        field_4_last_column=colRelative.setBoolean(field_4_last_column,rel);
-    }
-
-    /**
-     * set the last column in the area
-     */
-    public final void setLastColumn(int colIx) {
-        field_4_last_column=columnMask.setValue(field_4_last_column, colIx);
-    }
-
-    /**
-     * set the last column irrespective of the bitmasks
-     */
-    public final void setLastColumnRaw(short column) {
-        field_4_last_column = column;
-    }
-    protected final String formatReferenceAsString() {
-        CellReference topLeft = new CellReference(getFirstRow(),getFirstColumn(),!isFirstRowRelative(),!isFirstColRelative());
-        CellReference botRight = new CellReference(getLastRow(),getLastColumn(),!isLastRowRelative(),!isLastColRelative());
-
-        if(AreaReference.isWholeColumnReference(SpreadsheetVersion.EXCEL97, topLeft, botRight)) {
-            return (new AreaReference(topLeft, botRight)).formatAsString();
-        }
-        return topLeft.formatAsString() + ":" + botRight.formatAsString();
-    }
-
-    public String toFormulaString() {
-        return formatReferenceAsString();
-    }
-
-    public byte getDefaultOperandClass() {
-        return Ptg.CLASS_REF;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
deleted file mode 100644
index 1dcf023..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.constant.ConstantValueParser;
-import org.apache.poi.ss.formula.constant.ErrorConstant;
-import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ArrayPtg - handles arrays
- *
- * The ArrayPtg is a little weird, the size of the Ptg when parsing initially only
- * includes the Ptg sid and the reserved bytes. The next Ptg in the expression then follows.
- * It is only after the "size" of all the Ptgs is met, that the ArrayPtg data is actually
- * held after this. So Ptg.createParsedExpression keeps track of the number of
- * ArrayPtg elements and need to parse the data upto the FORMULA record size.
- *
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class ArrayPtg extends Ptg {
-	public static final byte sid  = 0x20;
-
-	private static final int RESERVED_FIELD_LEN = 7;
-	/**
-	 * The size of the plain tArray token written within the standard formula tokens
-	 * (not including the data which comes after all formula tokens)
-	 */
-	public static final int PLAIN_TOKEN_SIZE = 1+RESERVED_FIELD_LEN;
-
-	// 7 bytes of data (stored as an int, short and byte here)
-	private final int _reserved0Int;
-	private final int _reserved1Short;
-	private final int _reserved2Byte;
-
-	// data from these fields comes after the Ptg data of all tokens in current formula
-	private final int  _nColumns;
-	private final int _nRows;
-	private final Object[] _arrayValues;
-
-	ArrayPtg(int reserved0, int reserved1, int reserved2, int nColumns, int nRows, Object[] arrayValues) {
-		_reserved0Int = reserved0;
-		_reserved1Short = reserved1;
-		_reserved2Byte = reserved2;
-		_nColumns = nColumns;
-		_nRows = nRows;
-		_arrayValues = arrayValues.clone();
-	}
-	/**
-	 * @param values2d array values arranged in rows
-	 */
-	public ArrayPtg(Object[][] values2d) {
-		int nColumns = values2d[0].length;
-		int nRows = values2d.length;
-		// convert 2-d to 1-d array (row by row according to getValueIndex())
-		_nColumns = (short) nColumns;
-		_nRows = (short) nRows;
-
-		Object[] vv = new Object[_nColumns * _nRows];
-		for (int r=0; r<nRows; r++) {
-			Object[] rowData = values2d[r];
-			for (int c=0; c<nColumns; c++) {
-				vv[getValueIndex(c, r)] = rowData[c];
-			}
-		}
-
-		_arrayValues = vv;
-		_reserved0Int = 0;
-		_reserved1Short = 0;
-		_reserved2Byte = 0;
-	}
-	/**
-	 * @return 2-d array (inner index is rowIx, outer index is colIx)
-	 */
-	public Object[][] getTokenArrayValues() {
-		if (_arrayValues == null) {
-			throw new IllegalStateException("array values not read yet");
-		}
-		Object[][] result = new Object[_nRows][_nColumns];
-		for (int r = 0; r < _nRows; r++) {
-			Object[] rowData = result[r];
-			for (int c = 0; c < _nColumns; c++) {
-				rowData[c] = _arrayValues[getValueIndex(c, r)];
-			}
-		}
-		return result;
-	}
-
-	public boolean isBaseToken() {
-		return false;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer("[ArrayPtg]\n");
-
-		sb.append("nRows = ").append(getRowCount()).append("\n");
-		sb.append("nCols = ").append(getColumnCount()).append("\n");
-		if (_arrayValues == null) {
-			sb.append("  #values#uninitialised#\n");
-		} else {
-			sb.append("  ").append(toFormulaString());
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Note - (2D) array elements are stored row by row
-	 * @return the index into the internal 1D array for the specified column and row
-	 */
-	/* package */ int getValueIndex(int colIx, int rowIx) {
-		if(colIx < 0 || colIx >= _nColumns) {
-			throw new IllegalArgumentException("Specified colIx (" + colIx
-					+ ") is outside the allowed range (0.." + (_nColumns-1) + ")");
-		}
-		if(rowIx < 0 || rowIx >= _nRows) {
-			throw new IllegalArgumentException("Specified rowIx (" + rowIx
-					+ ") is outside the allowed range (0.." + (_nRows-1) + ")");
-		}
-		return rowIx * _nColumns + colIx;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeInt(_reserved0Int);
-		out.writeShort(_reserved1Short);
-		out.writeByte(_reserved2Byte);
-	}
-
-	public int writeTokenValueBytes(LittleEndianOutput out) {
-
-		out.writeByte(_nColumns-1);
-		out.writeShort(_nRows-1);
-		ConstantValueParser.encode(out, _arrayValues);
-		return 3 + ConstantValueParser.getEncodedSize(_arrayValues);
-	}
-
-	public int getRowCount() {
-		return _nRows;
-	}
-
-	public int getColumnCount() {
-		return _nColumns;
-	}
-
-	/** This size includes the size of the array Ptg plus the Array Ptg Token value size*/
-	public int getSize() {
-		return PLAIN_TOKEN_SIZE
-			// data written after the all tokens:
-			+ 1 + 2 // column, row
-			+ ConstantValueParser.getEncodedSize(_arrayValues);
-	}
-
-	public String toFormulaString() {
-		StringBuffer b = new StringBuffer();
-		b.append("{");
-		for (int y = 0; y < _nRows; y++) {
-			if (y > 0) {
-				b.append(";");
-			}
-			for (int x = 0; x < _nColumns; x++) {
-				if (x > 0) {
-					b.append(",");
-				}
-				Object o = _arrayValues[getValueIndex(x, y)];
-				b.append(getConstantText(o));
-			}
-		}
-		b.append("}");
-		return b.toString();
-	}
-
-	private static String getConstantText(Object o) {
-
-		if (o == null) {
-			throw new RuntimeException("Array item cannot be null");
-		}
-		if (o instanceof String) {
-			return "\"" + (String)o + "\"";
-		}
-		if (o instanceof Double) {
-			return NumberToTextConverter.toText(((Double)o).doubleValue());
-		}
-		if (o instanceof Boolean) {
-			return ((Boolean)o).booleanValue() ? "TRUE" : "FALSE";
-		}
-		if (o instanceof ErrorConstant) {
-			return ((ErrorConstant)o).getText();
-		}
-		throw new IllegalArgumentException("Unexpected constant class (" + o.getClass().getName() + ")");
-	}
-
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_ARRAY;
-	}
-
-	/**
-	 * Represents the initial plain tArray token (without the constant data that trails the whole
-	 * formula).  Objects of this class are only temporary and cannot be used as {@link Ptg}s.
-	 * These temporary objects get converted to {@link ArrayPtg} by the
-	 * {@link #finishReading(LittleEndianInput)} method.
-	 */
-	static final class Initial extends Ptg {
-		private final int _reserved0;
-		private final int _reserved1;
-		private final int _reserved2;
-
-		public Initial(LittleEndianInput in) {
-			_reserved0 = in.readInt();
-			_reserved1 = in.readUShort();
-			_reserved2 = in.readUByte();
-		}
-		private static RuntimeException invalid() {
-			throw new IllegalStateException("This object is a partially initialised tArray, and cannot be used as a Ptg");
-		}
-		public byte getDefaultOperandClass() {
-			throw invalid();
-		}
-		public int getSize() {
-			return PLAIN_TOKEN_SIZE;
-		}
-		public boolean isBaseToken() {
-			return false;
-		}
-		public String toFormulaString() {
-			throw invalid();
-		}
-		public void write(LittleEndianOutput out) {
-			throw invalid();
-		}
-		/**
-		 * Read in the actual token (array) values. This occurs
-		 * AFTER the last Ptg in the expression.
-		 * See page 304-305 of Excel97-2007BinaryFileFormat(xls)Specification.pdf
-		 */
-		public ArrayPtg finishReading(LittleEndianInput in) {
-			int nColumns = in.readUByte();
-			short nRows = in.readShort();
-			//The token_1_columns and token_2_rows do not follow the documentation.
-			//The number of physical rows and columns is actually +1 of these values.
-			//Which is not explicitly documented.
-			nColumns++;
-			nRows++;
-
-			int totalCount = nRows * nColumns;
-			Object[] arrayValues = ConstantValueParser.parse(in, totalCount);
-
-			ArrayPtg result = new ArrayPtg(_reserved0, _reserved1, _reserved2, nColumns, nRows, arrayValues);
-			result.setClass(getPtgClass());
-			return result;
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
deleted file mode 100644
index 96da294..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * "Special Attributes"
- * This seems to be a Misc Stuff and Junk record.  One function it serves is
- * in SUM functions (i.e. SUM(A1:A3) causes an area PTG then an ATTR with the SUM option set)
- * @author  andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class AttrPtg extends ControlPtg {
-    public final static byte sid  = 0x19;
-    private final static int  SIZE = 4;
-    private final byte _options;
-    private final short _data;
-
-    /** only used for tAttrChoose: table of offsets to starts of args */
-    private final int[] _jumpTable;
-    /** only used for tAttrChoose: offset to the tFuncVar for CHOOSE() */
-    private final int   _chooseFuncOffset;
-
-    // flags 'volatile' and 'space', can be combined.
-    // OOO spec says other combinations are theoretically possible but not likely to occur.
-    private static final BitField semiVolatile = BitFieldFactory.getInstance(0x01);
-    private static final BitField optiIf       = BitFieldFactory.getInstance(0x02);
-    private static final BitField optiChoose   = BitFieldFactory.getInstance(0x04);
-    private static final BitField optiSkip     = BitFieldFactory.getInstance(0x08);
-    private static final BitField optiSum      = BitFieldFactory.getInstance(0x10);
-    private static final BitField baxcel       = BitFieldFactory.getInstance(0x20); // 'assignment-style formula in a macro sheet'
-    private static final BitField space        = BitFieldFactory.getInstance(0x40);
-
-    public static final AttrPtg SUM = new AttrPtg(0x0010, 0, null, -1);
-
-    public static final class SpaceType {
-        private SpaceType() {
-            // no instances of this class
-        }
-
-        /** 00H = Spaces before the next token (not allowed before tParen token) */
-        public static final int SPACE_BEFORE = 0x00;
-        /** 01H = Carriage returns before the next token (not allowed before tParen token) */
-        public static final int CR_BEFORE = 0x01;
-        /** 02H = Spaces before opening parenthesis (only allowed before tParen token) */
-        public static final int SPACE_BEFORE_OPEN_PAREN = 0x02;
-        /** 03H = Carriage returns before opening parenthesis (only allowed before tParen token) */
-        public static final int CR_BEFORE_OPEN_PAREN = 0x03;
-        /** 04H = Spaces before closing parenthesis (only allowed before tParen, tFunc, and tFuncVar tokens) */
-        public static final int SPACE_BEFORE_CLOSE_PAREN = 0x04;
-        /** 05H = Carriage returns before closing parenthesis (only allowed before tParen, tFunc, and tFuncVar tokens) */
-        public static final int CR_BEFORE_CLOSE_PAREN = 0x05;
-        /** 06H = Spaces following the equality sign (only in macro sheets) */
-        public static final int SPACE_AFTER_EQUALITY = 0x06;
-    }
-
-    public AttrPtg(LittleEndianInput in) {
-        _options = in.readByte();
-        _data    = in.readShort();
-        if (isOptimizedChoose()) {
-            int nCases = _data;
-            int[] jumpTable = new int[nCases];
-            for (int i = 0; i < jumpTable.length; i++) {
-                jumpTable[i] = in.readUShort();
-            }
-            _jumpTable = jumpTable;
-            _chooseFuncOffset = in.readUShort();
-        } else {
-            _jumpTable = null;
-            _chooseFuncOffset = -1;
-        }
-
-    }
-    private AttrPtg(int options, int data, int[] jt, int chooseFuncOffset) {
-        _options = (byte) options;
-        _data = (short) data;
-        _jumpTable = jt;
-        _chooseFuncOffset = chooseFuncOffset;
-    }
-
-    /**
-     * @param type a constant from <tt>SpaceType</tt>
-     * @param count the number of space characters
-     */
-    public static AttrPtg createSpace(int type, int count) {
-        int data = type & 0x00FF | (count << 8) & 0x00FFFF;
-        return new AttrPtg(space.set(0), data, null, -1);
-    }
-
-    /**
-     * @param dist distance (in bytes) to start of either <ul><li>false parameter</li>
-     * <li>tFuncVar(IF) token (when false parameter is not present)</li></ul>
-     */
-    public static AttrPtg createIf(int dist) {
-        return new AttrPtg(optiIf.set(0), dist, null, -1);
-    }
-
-    /**
-     * @param dist distance (in bytes) to position behind tFuncVar(IF) token (minus 1)
-     */
-    public static AttrPtg createSkip(int dist) {
-        return new AttrPtg(optiSkip.set(0), dist, null, -1);
-    }
-
-    public static AttrPtg getSumSingle() {
-        return new AttrPtg(optiSum.set(0), 0, null, -1);
-    }
-
-
-    public boolean isSemiVolatile() {
-        return semiVolatile.isSet(_options);
-    }
-
-    public boolean isOptimizedIf() {
-        return optiIf.isSet(_options);
-    }
-
-    public boolean isOptimizedChoose() {
-        return optiChoose.isSet(_options);
-    }
-
-    public boolean isSum() {
-        return optiSum.isSet(_options);
-    }
-    public boolean isSkip() {
-        return optiSkip.isSet(_options);
-    }
-
-    // lets hope no one uses this anymore
-    private boolean isBaxcel() {
-        return baxcel.isSet(_options);
-    }
-
-    public boolean isSpace() {
-        return space.isSet(_options);
-    }
-
-    public short getData() {
-        return _data;
-    }
-    public int[] getJumpTable() {
-        return _jumpTable.clone();
-    }
-    public int getChooseFuncOffset() {
-        if (_jumpTable == null) {
-            throw new IllegalStateException("Not tAttrChoose");
-        }
-        return _chooseFuncOffset;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer(64);
-        sb.append(getClass().getName()).append(" [");
-
-        if(isSemiVolatile()) {
-            sb.append("volatile ");
-        }
-        if(isSpace()) {
-            sb.append("space count=").append((_data >> 8) & 0x00FF);
-            sb.append(" type=").append(_data & 0x00FF).append(" ");
-        }
-        // the rest seem to be mutually exclusive
-        if(isOptimizedIf()) {
-            sb.append("if dist=").append(_data);
-        } else if(isOptimizedChoose()) {
-            sb.append("choose nCases=").append(_data);
-        } else if(isSkip()) {
-            sb.append("skip dist=").append(_data);
-        } else if(isSum()) {
-            sb.append("sum ");
-        } else if(isBaxcel()) {
-            sb.append("assign ");
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeByte(_options);
-        out.writeShort(_data);
-        int[] jt = _jumpTable;
-        if (jt != null) {
-            for (int i = 0; i < jt.length; i++) {
-                out.writeShort(jt[i]);
-            }
-            out.writeShort(_chooseFuncOffset);
-        }
-    }
-
-    public int getSize() {
-        if (_jumpTable != null) {
-            return SIZE + (_jumpTable.length + 1) * LittleEndian.SHORT_SIZE;
-        }
-        return SIZE;
-    }
-
-    public String toFormulaString(String[] operands) {
-        if(space.isSet(_options)) {
-            return operands[ 0 ];
-        } else if (optiIf.isSet(_options)) {
-            return toFormulaString() + "(" + operands[0] + ")";
-        } else if (optiSkip.isSet(_options)) {
-            return toFormulaString() + operands[0];   //goto isn't a real formula element should not show up
-        } else {
-            return toFormulaString() + "(" + operands[0] + ")";
-        }
-    }
-
-
-    public int getNumberOfOperands() {
-        return 1;
-    }
-
-    public int getType() {
-        return -1;
-    }
-
-   public String toFormulaString() {
-      if(semiVolatile.isSet(_options)) {
-        return "ATTR(semiVolatile)";
-      }
-      if(optiIf.isSet(_options)) {
-        return "IF";
-      }
-      if( optiChoose.isSet(_options)) {
-        return "CHOOSE";
-      }
-      if(optiSkip.isSet(_options)) {
-        return "";
-      }
-      if(optiSum.isSet(_options)) {
-        return "SUM";
-      }
-      if(baxcel.isSet(_options)) {
-        return "ATTR(baxcel)";
-      }
-      if(space.isSet(_options)) {
-        return "";
-      }
-      return "UNKNOWN ATTRIBUTE";
-     }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/BoolPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
deleted file mode 100644
index 28b5619..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Boolean (boolean) Stores a (java) boolean value in a formula.
- *
- * @author Paul Krause (pkrause at soundbite dot com)
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class BoolPtg extends ScalarConstantPtg {
-	public static final int SIZE = 2;
-	public static final byte sid = 0x1D;
-
-	private static final BoolPtg FALSE = new BoolPtg(false);
-	private static final BoolPtg TRUE = new BoolPtg(true);
-
-	private final boolean _value;
-
-	private BoolPtg(boolean b) {
-		_value = b;
-	}
-
-	public static BoolPtg valueOf(boolean b) {
-		return b ? TRUE : FALSE;
-	}
-	public static BoolPtg read(LittleEndianInput in)  {
-		return valueOf(in.readByte() == 1);
-	}
-
-	public boolean getValue() {
-		return _value;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeByte(_value ? 1 : 0);
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString() {
-		return _value ? "TRUE" : "FALSE";
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
deleted file mode 100644
index eb11f8f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- *
- * @author  andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class ConcatPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x08;
-    
-    private final static String CONCAT = "&";
-    
-    public static final ValueOperatorPtg instance = new ConcatPtg();
-
-    private ConcatPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-       
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-        buffer.append(CONCAT);
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ControlPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
deleted file mode 100644
index 6e819da..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Common superclass for 
- * tExp
- * tTbl
- * tParen
- * tNlr
- * tAttr
- * tSheet
- * tEndSheet
- */
-public abstract class ControlPtg extends Ptg {
-
-	public boolean isBaseToken() {
-		return true;
-	}
-	public final byte getDefaultOperandClass() {
-		throw new IllegalStateException("Control tokens are not classified");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
deleted file mode 100644
index b1b58d6..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * An XSSF only representation of a reference to a deleted area
- */
-public final class Deleted3DPxg extends OperandPtg implements Pxg {
-    private int externalWorkbookNumber = -1;
-    private String sheetName;
-
-    public Deleted3DPxg(int externalWorkbookNumber, String sheetName) {
-        this.externalWorkbookNumber = externalWorkbookNumber;
-        this.sheetName = sheetName;
-    }
-    public Deleted3DPxg(String sheetName) {
-        this(-1, sheetName);
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(getClass().getName());
-        sb.append(" [");
-        if (externalWorkbookNumber >= 0) {
-            sb.append(" [");
-            sb.append("workbook=").append(getExternalWorkbookNumber());
-            sb.append("] ");
-        }
-        sb.append("sheet=").append(getSheetName());
-        sb.append(" ! ");
-        sb.append(FormulaError.REF.getString());
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public int getExternalWorkbookNumber() {
-        return externalWorkbookNumber;
-    }
-    public String getSheetName() {
-        return sheetName;
-    }
-    
-    public void setSheetName(String sheetName) {
-        this.sheetName = sheetName;
-    }
-
-    public String toFormulaString() {
-        StringBuffer sb = new StringBuffer();
-        if (externalWorkbookNumber >= 0) {
-            sb.append('[');
-            sb.append(externalWorkbookNumber);
-            sb.append(']');
-        }
-        if (sheetName != null) {
-            SheetNameFormatter.appendFormat(sb, sheetName);
-        }
-        sb.append('!');
-        sb.append(FormulaError.REF.getString());
-        return sb.toString();
-    }
-    
-    public byte getDefaultOperandClass() {
-        return Ptg.CLASS_VALUE;
-    }
-
-    public int getSize() {
-        return 1;
-    }
-    public void write(LittleEndianOutput out) {
-        throw new IllegalStateException("XSSF-only Ptg, should not be serialised");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
deleted file mode 100644
index 70dd6cb..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.WorkbookDependentFormula;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Deleted Area 3D Ptg - 3D referecnce (Sheet + Area)<P>
- * Description:  Defined a area in Extern Sheet. <P>
- * REFERENCE:  <P>
- * @author Patrick Luby
- * @version 1.0-pre
- */
-public final class DeletedArea3DPtg extends OperandPtg implements WorkbookDependentFormula {
-	public final static byte sid = 0x3d;
-	private final int field_1_index_extern_sheet;
-	private final int unused1;
-	private final int unused2;
-
-	public DeletedArea3DPtg(int externSheetIndex) {
-		field_1_index_extern_sheet = externSheetIndex;
-		unused1 = 0;
-		unused2 = 0;
-	}
-	
-	public DeletedArea3DPtg(LittleEndianInput in)  {
-		field_1_index_extern_sheet = in.readUShort();
-		unused1 = in.readInt();
-		unused2 = in.readInt();
-	}
-	public String toFormulaString(FormulaRenderingWorkbook book) {
-		return ExternSheetNameResolver.prependSheetName(book, field_1_index_extern_sheet, FormulaError.REF.getString());
-	}
-	public String toFormulaString() {
-		throw new RuntimeException("3D references need a workbook to determine formula text");
-	}
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_REF;
-	}
-	public int getSize() {
-		return 11;
-	}
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeShort(field_1_index_extern_sheet);
-		out.writeInt(unused1);
-		out.writeInt(unused2);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
deleted file mode 100644
index 6974def..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.WorkbookDependentFormula;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Title:        Deleted Reference 3D Ptg <P>
- * Description:  Defined a cell in extern sheet. <P>
- * @since 1.0-pre
- */
-public final class DeletedRef3DPtg extends OperandPtg implements WorkbookDependentFormula {
-	public final static byte sid  = 0x3c;
-	private final int field_1_index_extern_sheet;
-	private final int unused1;
-
-	/** Creates new DeletedRef3DPtg */
-	public DeletedRef3DPtg(LittleEndianInput in)  {
-		field_1_index_extern_sheet = in.readUShort();
-		unused1 = in.readInt();
-	}
-
-	public DeletedRef3DPtg(int externSheetIndex) {
-		field_1_index_extern_sheet = externSheetIndex;
-		unused1 = 0;
-	}
-
-	public String toFormulaString(FormulaRenderingWorkbook book) {
-		return ExternSheetNameResolver.prependSheetName(book, field_1_index_extern_sheet, FormulaError.REF.getString());
-	}
-	public String toFormulaString() {
-		throw new RuntimeException("3D references need a workbook to determine formula text");
-	}
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_REF;
-	}
-	public int getSize() {
-		return 7;
-	}
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeShort(field_1_index_extern_sheet);
-		out.writeInt(unused1);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java
deleted file mode 100644
index 66e6913..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * This PTG implements the standard binomial divide "/"
- * @author  Andrew C. Oliver acoliver at apache dot org
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class DividePtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x06;
-
-    public static final ValueOperatorPtg instance = new DividePtg();
-
-    private DividePtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-
-     public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-        buffer.append("/");
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }      
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
deleted file mode 100644
index 164ce98..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- *
- * @author  andy
- */
-public final class EqualPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x0b;
-
-    public static final ValueOperatorPtg instance = new EqualPtg();
-
-    private EqualPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
- 
-    public String toFormulaString(String[] operands) {
-         StringBuffer buffer = new StringBuffer();
-
-        
-        buffer.append(operands[ 0 ]);
-        buffer.append("=");
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }       
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ErrPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
deleted file mode 100644
index 36c276f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-public final class ErrPtg extends ScalarConstantPtg {
-
-    /** <b>#NULL!</b>  - Intersection of two cell ranges is empty */
-    public static final ErrPtg NULL_INTERSECTION = new ErrPtg(FormulaError.NULL.getCode());
-    /** <b>#DIV/0!</b> - Division by zero */
-    public static final ErrPtg DIV_ZERO = new ErrPtg(FormulaError.DIV0.getCode());
-    /** <b>#VALUE!</b> - Wrong type of operand */
-    public static final ErrPtg VALUE_INVALID = new ErrPtg(FormulaError.VALUE.getCode());
-    /** <b>#REF!</b> - Illegal or deleted cell reference */
-    public static final ErrPtg REF_INVALID = new ErrPtg(FormulaError.REF.getCode());
-    /** <b>#NAME?</b> - Wrong function or range name */
-    public static final ErrPtg NAME_INVALID = new ErrPtg(FormulaError.NAME.getCode());
-    /** <b>#NUM!</b> - Value range overflow */
-    public static final ErrPtg NUM_ERROR = new ErrPtg(FormulaError.NUM.getCode());
-    /** <b>#N/A</b> - Argument or function not available */
-    public static final ErrPtg N_A = new ErrPtg(FormulaError.NA.getCode());
-
-
-    public static final short sid  = 0x1c;
-    private static final int  SIZE = 2;
-    private final int field_1_error_code;
-
-    /** Creates new ErrPtg */
-
-    private ErrPtg(int errorCode) {
-        if(!FormulaError.isValidCode(errorCode)) {
-            throw new IllegalArgumentException("Invalid error code (" + errorCode + ")");
-        }
-        field_1_error_code = errorCode;
-    }
-
-    public static ErrPtg read(LittleEndianInput in)  {
-        return valueOf(in.readByte());
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeByte(field_1_error_code);
-    }
-
-    public String toFormulaString() {
-        return FormulaError.forInt(field_1_error_code).getString();
-    }
-
-    public int getSize() {
-        return SIZE;
-    }
-
-    public int getErrorCode() {
-        return field_1_error_code;
-    }
-
-    public static ErrPtg valueOf(int code) {
-        switch(FormulaError.forInt(code)) {
-            case DIV0: return DIV_ZERO;
-            case NA: return N_A;
-            case NAME: return NAME_INVALID;
-            case NULL: return NULL_INTERSECTION;
-            case NUM: return NUM_ERROR;
-            case REF: return REF_INVALID;
-            case VALUE: return VALUE_INVALID;
-            default:
-                throw new RuntimeException("Unexpected error code (" + code + ")");
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
deleted file mode 100644
index d128be9..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- *
- * @author  andy
- * @author Jason Height (jheight at chariot dot net dot au)
- * @author dmui (save existing implementation)
- */
-public final class ExpPtg extends ControlPtg {
-    private final static int  SIZE = 5;
-    public final static short sid  = 0x1;
-    private final int field_1_first_row;
-    private final int field_2_first_col;
-
-    public ExpPtg(LittleEndianInput in) {
-      field_1_first_row = in.readShort();
-      field_2_first_col = in.readShort();
-    }
-
-    public ExpPtg(int firstRow, int firstCol) {
-      this.field_1_first_row = firstRow;
-      this.field_2_first_col = firstCol;
-    }
-
-    @Override
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeShort(field_1_first_row);
-        out.writeShort(field_2_first_col);
-    }
-
-    @Override
-    public int getSize() {
-        return SIZE;
-    }
-
-    public int getRow() {
-      return field_1_first_row;
-    }
-
-    public int getColumn() {
-      return field_2_first_col;
-    }
-
-    @Override
-    public String toFormulaString() {
-        throw new RuntimeException("Coding Error: Expected ExpPtg to be converted from Shared to Non-Shared Formula by ValueRecordsAggregate, but it wasn't");
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer buffer = new StringBuffer("[Array Formula or Shared Formula]\n");
-        buffer.append("row = ").append(getRow()).append("\n");
-        buffer.append("col = ").append(getColumn()).append("\n");
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
deleted file mode 100644
index a61d1d5..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheet;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalSheetRange;
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-
-/**
- * @author Josh Micich
- */
-final class ExternSheetNameResolver {
-    private ExternSheetNameResolver() {
-        // no instances of this class
-    }
-
-    public static String prependSheetName(FormulaRenderingWorkbook book, int field_1_index_extern_sheet, String cellRefText) {
-        ExternalSheet externalSheet = book.getExternalSheet(field_1_index_extern_sheet);
-        StringBuffer sb;
-        if (externalSheet != null) {
-            String wbName = externalSheet.getWorkbookName();
-            String sheetName = externalSheet.getSheetName();
-            if (wbName != null) {
-                sb = new StringBuffer(wbName.length() + sheetName.length() + cellRefText.length() + 4);
-                SheetNameFormatter.appendFormat(sb, wbName, sheetName);
-            } else {
-                sb = new StringBuffer(sheetName.length() + cellRefText.length() + 4);
-                SheetNameFormatter.appendFormat(sb, sheetName);
-            }
-            if (externalSheet instanceof ExternalSheetRange) {
-                ExternalSheetRange r = (ExternalSheetRange)externalSheet;
-                if (! r.getFirstSheetName().equals(r.getLastSheetName())) {
-                    sb.append(':');
-                    SheetNameFormatter.appendFormat(sb, r.getLastSheetName());
-                }
-            }
-        } else {
-            String firstSheetName = book.getSheetFirstNameByExternSheet(field_1_index_extern_sheet);
-            String lastSheetName = book.getSheetLastNameByExternSheet(field_1_index_extern_sheet);
-            sb = new StringBuffer(firstSheetName.length() + cellRefText.length() + 4);
-            if (firstSheetName.length() < 1) {
-                // What excel does if sheet has been deleted
-                sb.append("#REF"); // note - '!' added just once below
-            } else {
-                SheetNameFormatter.appendFormat(sb, firstSheetName);
-                if (! firstSheetName.equals(lastSheetName)) {
-                    sb.append(':');
-                    sb.append(lastSheetName);
-                }
-            }
-        }
-        sb.append('!');
-        sb.append(cellRefText);
-        return sb.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
deleted file mode 100644
index ecfccb6..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.function.FunctionMetadata;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * @author aviks
- * @author Jason Height (jheight at chariot dot net dot au)
- * @author Danny Mui (dmui at apache dot org) (Leftover handling)
- */
-public final class FuncPtg extends AbstractFunctionPtg {
-
-    public final static byte sid  = 0x21;
-    public final static int  SIZE = 3;
-
-    public static FuncPtg create(LittleEndianInput in) {
-        return create(in.readUShort());
-    }
-
-    private FuncPtg(int funcIndex, FunctionMetadata fm) {
-        super(funcIndex, fm.getReturnClassCode(), fm.getParameterClassCodes(), fm.getMinParams());  // minParams same as max since these are not var-arg funcs
-    }
-
-    public static FuncPtg create(int functionIndex) {
-        FunctionMetadata fm = FunctionMetadataRegistry.getFunctionByIndex(functionIndex);
-        if(fm == null) {
-            throw new RuntimeException("Invalid built-in function index (" + functionIndex + ")");
-        }
-        return new FuncPtg(functionIndex, fm);
-    }
-
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeShort(getFunctionIndex());
-    }
-
-    public int getSize() {
-        return SIZE;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
deleted file mode 100644
index 3392d04..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-import org.apache.poi.ss.formula.function.FunctionMetadata;
-import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class FuncVarPtg extends AbstractFunctionPtg{
-
-    public final static byte sid  = 0x22;
-    private final static int  SIZE = 4;
-
-    /**
-     * Single instance of this token for 'sum() taking a single argument'
-     */
-    public static final OperationPtg SUM = FuncVarPtg.create("SUM", 1);
-
-    private FuncVarPtg(int functionIndex, int returnClass, byte[] paramClasses, int numArgs) {
-        super(functionIndex, returnClass, paramClasses, numArgs);
-    }
-
-    /**Creates new function pointer from a byte array
-     * usually called while reading an excel file.
-     */
-    public static FuncVarPtg create(LittleEndianInput in)  {
-        return create(in.readByte(), in.readShort());
-    }
-
-    /**
-     * Create a function ptg from a string tokenised by the parser
-     */
-    public static FuncVarPtg create(String pName, int numArgs) {
-        return create(numArgs, lookupIndex(pName));
-    }
-
-    private static FuncVarPtg create(int numArgs, int functionIndex) {
-        FunctionMetadata fm = FunctionMetadataRegistry.getFunctionByIndex(functionIndex);
-        if(fm == null) {
-            // Happens only as a result of a call to FormulaParser.parse(), with a non-built-in function name
-            return new FuncVarPtg(functionIndex, Ptg.CLASS_VALUE, new byte[] {Ptg.CLASS_VALUE}, numArgs);
-        }
-        return new FuncVarPtg(functionIndex, fm.getReturnClassCode(), fm.getParameterClassCodes(), numArgs);
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeByte(getNumberOfOperands());
-        out.writeShort(getFunctionIndex());
-    }
-
-    public int getSize() {
-        return SIZE;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
deleted file mode 100644
index eafbeba..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-
-/**
- * PTG class to implement greater or equal to
- *
- * @author  fred at stsci dot edu
- */
-public final class GreaterEqualPtg extends ValueOperatorPtg {
-    public final static int  SIZE = 1;
-    public final static byte sid  = 0x0c;
-
-    public static final ValueOperatorPtg instance = new GreaterEqualPtg();
-
-    private GreaterEqualPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-
-    public String toFormulaString(String[] operands) {
-         StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-
-        buffer.append(">=");
-        buffer.append(operands[ 1 ]);
-
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
deleted file mode 100644
index dabdab6..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-
-/**
- * Greater than operator PTG ">"
- * @author  Cameron Riley (criley at ekmail.com)
- */
-public final class GreaterThanPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x0D;    
-    private final static String GREATERTHAN = ">";
-
-    public static final ValueOperatorPtg instance = new GreaterThanPtg();
-
-    private GreaterThanPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    /**
-     * Get the number of operands for the Less than operator
-     * @return int the number of operands
-     */
-    public int getNumberOfOperands() {
-        return 2;
-    }
-    
-    /** 
-     * Implementation of method from OperationsPtg
-     * @param operands a String array of operands
-     * @return String the Formula as a String
-     */  
-    public String toFormulaString(String[] operands) 
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-        buffer.append(GREATERTHAN);
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java
deleted file mode 100644
index b91784e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Integer (unsigned short integer) Stores an unsigned short value (java int) in
- * a formula
- * 
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class IntPtg extends ScalarConstantPtg {
-	// 16 bit unsigned integer
-	private static final int MIN_VALUE = 0x0000;
-	private static final int MAX_VALUE = 0xFFFF;
-
-	/**
-	 * Excel represents integers 0..65535 with the tInt token.
-	 * 
-	 * @return <code>true</code> if the specified value is within the range of values 
-	 * <tt>IntPtg</tt> can represent.
-	 */
-	public static boolean isInRange(int i) {
-		return i >= MIN_VALUE && i <= MAX_VALUE;
-	}
-
-	public final static int SIZE = 3;
-	public final static byte sid = 0x1e;
-	private final int field_1_value;
-
-	public IntPtg(LittleEndianInput in)  {
-		this(in.readUShort());
-	}
-
-	public IntPtg(int value) {
-		if (!isInRange(value)) {
-			throw new IllegalArgumentException("value is out of range: " + value);
-		}
-		field_1_value = value;
-	}
-
-	public int getValue() {
-		return field_1_value;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeShort(getValue());
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString() {
-		return String.valueOf(getValue());
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
deleted file mode 100644
index ed2f327..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class IntersectionPtg extends OperationPtg {
-	public final static byte sid = 0x0f;
-
-	public static final OperationPtg instance = new IntersectionPtg();
-
-	private IntersectionPtg() {
-		// enforce singleton
-	}
-
-	public final boolean isBaseToken() {
-		return true;
-	}
-
-	public int getSize() {
-		return 1;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-	}
-
-	public String toFormulaString() {
-		return " ";
-	}
-
-	public String toFormulaString(String[] operands) {
-		StringBuffer buffer = new StringBuffer();
-
-		buffer.append(operands[0]);
-		buffer.append(" ");
-		buffer.append(operands[1]);
-		return buffer.toString();
-	}
-
-	public int getNumberOfOperands() {
-		return 2;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
deleted file mode 100644
index ce70ae7..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
+++ /dev/null
@@ -1,53 +0,0 @@
-        
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-
-
-
-/**
- * Ptg class to implement less than or equal
- *
- * @author fred at stsci dot edu
- */
-public final class LessEqualPtg extends ValueOperatorPtg {
-    public final static byte sid = 0x0a;
-
-    public static final ValueOperatorPtg instance = new LessEqualPtg();
-
-    private LessEqualPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append( operands[0] );
-        buffer.append("<=");
-        buffer.append( operands[1] );
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
deleted file mode 100644
index 51455c5..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Less than operator PTG "<". The SID is taken from the 
- * Openoffice.orgs Documentation of the Excel File Format,
- * Table 3.5.7
- * @author Cameron Riley (criley at ekmail.com)
- */
-public final class LessThanPtg extends ValueOperatorPtg {
-    /** the sid for the less than operator as hex */
-    public final static byte sid  = 0x09;    
-
-    /** identifier for LESS THAN char */
-    private final static String LESSTHAN = "<";
-
-    public static final ValueOperatorPtg instance = new LessThanPtg();
-
-    private LessThanPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    /**
-     * Get the number of operands for the Less than operator
-     * @return int the number of operands
-     */
-    public int getNumberOfOperands() {
-        return 2;
-    }
-    
-     /** 
-     * Implementation of method from OperationsPtg
-     * @param operands a String array of operands
-     * @return String the Formula as a String
-     */  
-    public String toFormulaString(String[] operands) 
-    {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(operands[ 0 ]);
-        buffer.append(LESSTHAN);
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
deleted file mode 100644
index 6c4568e..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class MemAreaPtg extends OperandPtg {
-	public final static short sid = 0x26;
-	private final static int SIZE = 7;
-	private final int field_1_reserved;
-	private final int field_2_subex_len;
-
-	/** Creates new MemAreaPtg */
-
-	public MemAreaPtg(int subexLen) {
-		field_1_reserved = 0;
-		field_2_subex_len = subexLen;
-	}
-
-	public MemAreaPtg(LittleEndianInput in)  {
-		field_1_reserved = in.readInt();
-		field_2_subex_len = in.readShort();
-	}
-
-	public int getLenRefSubexpression() {
-		return field_2_subex_len;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeInt(field_1_reserved);
-		out.writeShort(field_2_subex_len);
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString() {
-		return ""; // TODO: Not sure how to format this. -- DN
-	}
-
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_VALUE;
-	}
-
-	@Override
-	public final String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [len=");
-		sb.append(field_2_subex_len);
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
deleted file mode 100644
index 44f541d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * 
- * @author andy
- * @author Jason Height (jheight at chariot dot net dot au)
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class MemErrPtg extends OperandPtg {
-	public final static short sid = 0x27;
-	private final static int SIZE = 7;
-	private int field_1_reserved;
-	private short field_2_subex_len;
-
-	public MemErrPtg(LittleEndianInput in)  {
-		field_1_reserved = in.readInt();
-		field_2_subex_len = in.readShort();
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeInt(field_1_reserved);
-		out.writeShort(field_2_subex_len);
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString() {
-		return "ERR#";
-	}
-
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_VALUE;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
deleted file mode 100644
index 1837382..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class MemFuncPtg extends OperandPtg {
-
-	public final static byte sid = 0x29;
-	private final int field_1_len_ref_subexpression;
-
-	/**
-	 * Creates new function pointer from a byte array usually called while
-	 * reading an excel file.
-	 */
-	public MemFuncPtg(LittleEndianInput in)  {
-		this(in.readUShort());
-	}
-
-	public MemFuncPtg(int subExprLen) {
-		field_1_len_ref_subexpression = subExprLen;
-	}
-
-	public int getSize() {
-		return 3;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeShort(field_1_len_ref_subexpression);
-	}
-
-	public String toFormulaString() {
-		return "";
-	}
-
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_REF;
-	}
-
-	public int getNumberOfOperands() {
-		return field_1_len_ref_subexpression;
-	}
-
-	public int getLenRefSubexpression() {
-		return field_1_len_ref_subexpression;
-	}
-	@Override
-	public final String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [len=");
-		sb.append(field_1_len_ref_subexpression);
-		sb.append("]");
-		return sb.toString();
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
deleted file mode 100644
index 84e4412..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Missing Function Arguments
- * 
- * Avik Sengupta &lt;avik at apache.org&gt;
- * 
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class MissingArgPtg extends ScalarConstantPtg {
-
-	private final static int SIZE = 1;
-	public final static byte sid = 0x16;
-
-	public static final Ptg instance = new MissingArgPtg();
-
-	private MissingArgPtg() {
-		// enforce singleton
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString() {
-		return " ";
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
deleted file mode 100644
index ce251c8..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Implements the standard mathmatical multiplication - *
- * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class MultiplyPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x05;
-
-    public static final ValueOperatorPtg instance = new MultiplyPtg();
-
-    private MultiplyPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-    
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-        buffer.append("*");
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }                  
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
deleted file mode 100644
index 8218cbe..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.WorkbookDependentFormula;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * 
- * @author andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class NamePtg extends OperandPtg implements WorkbookDependentFormula {
-	public final static short sid = 0x23;
-	private final static int SIZE = 5;
-	/** one-based index to defined name record */
-	private int field_1_label_index;
-	private short field_2_zero; // reserved must be 0
-
-	/**
-	 * @param nameIndex zero-based index to name within workbook
-	 */
-	public NamePtg(int nameIndex) {
-		field_1_label_index = 1 + nameIndex; // convert to 1-based
-	}
-
-	/** Creates new NamePtg */
-
-	public NamePtg(LittleEndianInput in)  {
-		field_1_label_index = in.readShort();
-		field_2_zero = in.readShort();
-	}
-
-	/**
-	 * @return zero based index to a defined name record in the LinkTable
-	 */
-	public int getIndex() {
-		return field_1_label_index - 1; // convert to zero based
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeShort(field_1_label_index);
-		out.writeShort(field_2_zero);
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString(FormulaRenderingWorkbook book) {
-		return book.getNameText(this);
-	}
-
-	public String toFormulaString() {
-		throw new RuntimeException("3D references need a workbook to determine formula text");
-	}
-
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_REF;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
deleted file mode 100644
index de88d1b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.WorkbookDependentFormula;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * A Name, be that a Named Range or a Function / User Defined
- *  Function, addressed in the HSSF External Sheet style.
- *  
- * <p>This is HSSF only, as it matches the HSSF file format way of
- *  referring to the sheet by an extern index. The XSSF equivalent
- *  is {@link NameXPxg}
- */
-public final class NameXPtg extends OperandPtg implements WorkbookDependentFormula {
-	public final static short sid = 0x39;
-	private final static int SIZE = 7;
-
-	/** index to REF entry in externsheet record */
-	private final int _sheetRefIndex;
-	/** index to defined name or externname table(1 based) */
-	private final int _nameNumber;
-	/** reserved must be 0 */
-	private final int _reserved;
-
-	private NameXPtg(int sheetRefIndex, int nameNumber, int reserved) {
-		_sheetRefIndex = sheetRefIndex;
-		_nameNumber = nameNumber;
-		_reserved = reserved;
-	}
-
-	/**
-	 * @param sheetRefIndex index to REF entry in externsheet record
-	 * @param nameIndex index to defined name or externname table
-	 */
-	public NameXPtg(int sheetRefIndex, int nameIndex) {
-		this(sheetRefIndex, nameIndex + 1, 0);
-	}
-
-	public NameXPtg(LittleEndianInput in)  {
-		this(in.readUShort(), in.readUShort(), in.readUShort());
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeShort(_sheetRefIndex);
-		out.writeShort(_nameNumber);
-		out.writeShort(_reserved);
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString(FormulaRenderingWorkbook book) {
-		// -1 to convert definedNameIndex from 1-based to zero-based
-		return book.resolveNameXText(this);
-	}
-	public String toFormulaString() {
-		throw new RuntimeException("3D references need a workbook to determine formula text");
-	}
-	
-	public String toString(){
-	   String retValue = "NameXPtg:[sheetRefIndex:" + _sheetRefIndex + 
-	      " , nameNumber:" + _nameNumber + "]" ;
-	   return retValue;
-	}
-	
-	public byte getDefaultOperandClass() {
-		return Ptg.CLASS_VALUE;
-	}
-
-	public int getSheetRefIndex() {
-		return _sheetRefIndex;
-	}
-	public int getNameIndex() {
-		return _nameNumber - 1;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPxg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
deleted file mode 100644
index 8969ad4..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * A Name, be that a Named Range or a Function / User Defined
- *  Function, addressed in the HSSF External Sheet style.
- *  
- * <p>This is XSSF only, as it stores the sheet / book references
- *  in String form. The HSSF equivalent using indexes is {@link NameXPtg}</p>
- */
-public final class NameXPxg extends OperandPtg implements Pxg {
-    private int externalWorkbookNumber = -1;
-    private String sheetName;
-    private String nameName;
-
-    public NameXPxg(int externalWorkbookNumber, String sheetName, String nameName) {
-        this.externalWorkbookNumber = externalWorkbookNumber;
-        this.sheetName = sheetName;
-        this.nameName = nameName;
-    }
-    public NameXPxg(String sheetName, String nameName) {
-        this(-1, sheetName, nameName);
-    }
-    public NameXPxg(String nameName) {
-        this(-1, null, nameName);
-    }
-
-    public String toString(){
-        StringBuffer sb = new StringBuffer();
-        sb.append(getClass().getName());
-        sb.append(" [");
-        if (externalWorkbookNumber >= 0) {
-            sb.append(" [");
-            sb.append("workbook=").append(getExternalWorkbookNumber());
-            sb.append("] ");
-        }
-        sb.append("sheet=").append(getSheetName());
-        sb.append(" ! ");
-        sb.append("name=");
-        sb.append(nameName);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public int getExternalWorkbookNumber() {
-        return externalWorkbookNumber;
-    }
-    public String getSheetName() {
-        return sheetName;
-    }
-    public String getNameName() {
-        return nameName;
-    }
-    
-    public void setSheetName(String sheetName) {
-        this.sheetName = sheetName;
-    }
-
-    public String toFormulaString() {
-        StringBuffer sb = new StringBuffer();
-        boolean needsExclamation = false;
-        if (externalWorkbookNumber >= 0) {
-            sb.append('[');
-            sb.append(externalWorkbookNumber);
-            sb.append(']');
-            needsExclamation = true;
-        }
-        if (sheetName != null) {
-            SheetNameFormatter.appendFormat(sb, sheetName);
-            needsExclamation = true;
-        }
-        if (needsExclamation) {
-            sb.append('!');
-        }
-        sb.append(nameName);
-        return sb.toString();
-    }
-    
-    public byte getDefaultOperandClass() {
-        return Ptg.CLASS_VALUE;
-    }
-
-    public int getSize() {
-        return 1;
-    }
-    public void write(LittleEndianOutput out) {
-        throw new IllegalStateException("XSSF-only Ptg, should not be serialised");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
deleted file mode 100644
index 2c91b9c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Ptg class to implement not equal
- *
- * @author fred at stsci dot edu
- */
-public final class NotEqualPtg extends ValueOperatorPtg {
-    public final static byte sid = 0x0e;
-
-    public static final ValueOperatorPtg instance = new NotEqualPtg();
-
-    private NotEqualPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append( operands[0] );
-
-        buffer.append("<>");
-        buffer.append( operands[1] );
-
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
deleted file mode 100644
index 6cec236..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Number Stores a floating point value in a formula value stored in a 8 byte
- * field using IEEE notation
- * 
- * @author Avik Sengupta
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class NumberPtg extends ScalarConstantPtg {
-	public final static int SIZE = 9;
-	public final static byte sid = 0x1f;
-	private final double field_1_value;
-
-	public NumberPtg(LittleEndianInput in)  {
-		this(in.readDouble());
-	}
-
-	/**
-	 * Create a NumberPtg from a string representation of the number Number
-	 * format is not checked, it is expected to be validated in the parser that
-	 * calls this method.
-	 * 
-	 * @param value String representation of a floating point number
-	 */
-	public NumberPtg(String value) {
-		this(Double.parseDouble(value));
-	}
-
-	public NumberPtg(double value) {
-		field_1_value = value;
-	}
-
-	public double getValue() {
-		return field_1_value;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-		out.writeDouble(getValue());
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString() {
-		return NumberToTextConverter.toText(field_1_value);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/OperandPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
deleted file mode 100644
index 0c36a84..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * @author Josh Micich
- */
-public abstract class OperandPtg extends Ptg implements Cloneable {
-
-	/**
-	 * All Operand {@link Ptg}s are classified ('relative', 'value', 'array')
-	 */
-	public final boolean isBaseToken() {
-		return false;
-	}
-	public final OperandPtg copy() {
-		try {
-			return (OperandPtg) clone();
-		} catch (CloneNotSupportedException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
deleted file mode 100644
index 089d3c7..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * defines a Ptg that is an operation instead of an operand
- * @author  andy
- */
-public abstract class OperationPtg extends Ptg {
-    public final static int TYPE_UNARY    = 0;
-    public final static int TYPE_BINARY   = 1;
-    public final static int TYPE_FUNCTION = 2;
-
-    /**
-     *  returns a string representation of the operations
-     *  the length of the input array should equal the number returned by 
-     *  @see #getNumberOfOperands
-     *  
-     */
-    public abstract String toFormulaString(String[] operands);
-    
-    /**
-     * The number of operands expected by the operations
-     */
-    public abstract int getNumberOfOperands();
-    
-    public byte getDefaultOperandClass() {
-        return Ptg.CLASS_VALUE;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
deleted file mode 100644
index 1ea30ab..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * While formula tokens are stored in RPN order and thus do not need parenthesis
- * for precedence reasons, Parenthesis tokens ARE written to ensure that user
- * entered parenthesis are displayed as-is on reading back
- * 
- * Avik Sengupta &lt;lists@aviksengupta.com&gt; Andrew C. Oliver (acoliver at
- * apache dot org)
- * 
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class ParenthesisPtg extends ControlPtg {
-
-	private final static int SIZE = 1;
-	public final static byte sid = 0x15;
-
-	public static final ControlPtg instance = new ParenthesisPtg();
-
-	private ParenthesisPtg() {
-		// enforce singleton
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(sid + getPtgClass());
-	}
-
-	public int getSize() {
-		return SIZE;
-	}
-
-	public String toFormulaString() {
-		return "()";
-	}
-
-	public String toFormulaString(String[] operands) {
-		return "(" + operands[0] + ")";
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
deleted file mode 100644
index 12eabca..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Percent PTG.
- *
- * @author Daniel Noll (daniel at nuix.com.au)
- */
-public final class PercentPtg extends ValueOperatorPtg {
-    public final static int  SIZE = 1;
-    public final static byte sid  = 0x14;
-    
-    private final static String PERCENT = "%";
-
-    public static final ValueOperatorPtg instance = new PercentPtg();
-
-    private PercentPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 1;
-    }
-       
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-        buffer.append(PERCENT);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
deleted file mode 100644
index 3f240f4..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- *
- * @author  andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class PowerPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x07;
-
-    public static final ValueOperatorPtg instance = new PowerPtg();
-
-    private PowerPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2; // TODO - 2 seems wrong (Jun 2008).  Maybe this method is not relevant
-    }
- 
-    public String toFormulaString(String[] operands) {
-         StringBuffer buffer = new StringBuffer();
-
-        
-        buffer.append(operands[ 0 ]);
-        buffer.append("^");
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }       
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ptg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Ptg.java
deleted file mode 100644
index bb6fb64..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ptg.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * <tt>Ptg</tt> represents a syntactic token in a formula.  'PTG' is an acronym for
- * '<b>p</b>arse <b>t</b>hin<b>g</b>'.  Originally, the name referred to the single
- * byte identifier at the start of the token, but in POI, <tt>Ptg</tt> encapsulates
- * the whole formula token (initial byte + value data).
- * <p/>
- *
- * <tt>Ptg</tt>s are logically arranged in a tree representing the structure of the
- * parsed formula.  However, in BIFF files <tt>Ptg</tt>s are written/read in
- * <em>Reverse-Polish Notation</em> order. The RPN ordering also simplifies formula
- * evaluation logic, so POI mostly accesses <tt>Ptg</tt>s in the same way.
- *
- * @author  andy
- * @author avik
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public abstract class Ptg {
-	public static final Ptg[] EMPTY_PTG_ARRAY = { };
-
-	/**
-	 * Reads <tt>size</tt> bytes of the input stream, to create an array of <tt>Ptg</tt>s.
-	 * Extra data (beyond <tt>size</tt>) may be read if and <tt>ArrayPtg</tt>s are present.
-	 */
-	public static Ptg[] readTokens(int size, LittleEndianInput in) {
-		List<Ptg> temp = new ArrayList<Ptg>(4 + size / 2);
-		int pos = 0;
-		boolean hasArrayPtgs = false;
-		while (pos < size) {
-			Ptg ptg = Ptg.createPtg(in);
-			if (ptg instanceof ArrayPtg.Initial) {
-				hasArrayPtgs = true;
-			}
-			pos += ptg.getSize();
-			temp.add(ptg);
-		}
-		if(pos != size) {
-			throw new RuntimeException("Ptg array size mismatch");
-		}
-		if (hasArrayPtgs) {
-			Ptg[] result = toPtgArray(temp);
-			for (int i=0;i<result.length;i++) {
-				if (result[i] instanceof ArrayPtg.Initial) {
-					result[i] = ((ArrayPtg.Initial) result[i]).finishReading(in);
-				}
-			}
-			return result;
-		}
-		return toPtgArray(temp);
-	}
-
-	public static Ptg createPtg(LittleEndianInput in) {
-		byte id = in.readByte();
-
-		if (id < 0x20) {
-			return createBasePtg(id, in);
-		}
-
-		Ptg  retval = createClassifiedPtg(id, in);
-
-		if (id >= 0x60) {
-			retval.setClass(CLASS_ARRAY);
-		} else if (id >= 0x40) {
-			retval.setClass(CLASS_VALUE);
-		} else {
-			retval.setClass(CLASS_REF);
-		}
-		return retval;
-	}
-
-	private static Ptg createClassifiedPtg(byte id, LittleEndianInput in) {
-
-		int baseId = id & 0x1F | 0x20;
-
-		switch (baseId) {
-			case ArrayPtg.sid:    return new ArrayPtg.Initial(in);//0x20, 0x40, 0x60
-			case FuncPtg.sid:     return FuncPtg.create(in);  // 0x21, 0x41, 0x61
-			case FuncVarPtg.sid:  return FuncVarPtg.create(in);//0x22, 0x42, 0x62
-			case NamePtg.sid:     return new NamePtg(in);     // 0x23, 0x43, 0x63
-			case RefPtg.sid:      return new RefPtg(in);      // 0x24, 0x44, 0x64
-			case AreaPtg.sid:     return new AreaPtg(in);     // 0x25, 0x45, 0x65
-			case MemAreaPtg.sid:  return new MemAreaPtg(in);  // 0x26, 0x46, 0x66
-			case MemErrPtg.sid:   return new MemErrPtg(in);   // 0x27, 0x47, 0x67
-			case MemFuncPtg.sid:  return new MemFuncPtg(in);  // 0x29, 0x49, 0x69
-			case RefErrorPtg.sid: return new RefErrorPtg(in); // 0x2a, 0x4a, 0x6a
-			case AreaErrPtg.sid:  return new AreaErrPtg(in);  // 0x2b, 0x4b, 0x6b
-			case RefNPtg.sid:     return new RefNPtg(in);     // 0x2c, 0x4c, 0x6c
-			case AreaNPtg.sid:    return new AreaNPtg(in);    // 0x2d, 0x4d, 0x6d
-
-			case NameXPtg.sid:    return new NameXPtg(in);    // 0x39, 0x49, 0x79
-			case Ref3DPtg.sid:    return new Ref3DPtg(in);    // 0x3a, 0x5a, 0x7a
-			case Area3DPtg.sid:   return new Area3DPtg(in);   // 0x3b, 0x5b, 0x7b
-			case DeletedRef3DPtg.sid:  return new DeletedRef3DPtg(in);   // 0x3c, 0x5c, 0x7c
-			case DeletedArea3DPtg.sid: return  new DeletedArea3DPtg(in); // 0x3d, 0x5d, 0x7d
-		}
-		throw new UnsupportedOperationException(" Unknown Ptg in Formula: 0x"+
-					Integer.toHexString(id) + " (" + ( int ) id + ")");
-	}
-
-	private static Ptg createBasePtg(byte id, LittleEndianInput in) {
-		switch(id) {
-			case 0x00:                return new UnknownPtg(id); // TODO - not a real Ptg
-			case ExpPtg.sid:          return new ExpPtg(in);          // 0x01
-			case TblPtg.sid:          return new TblPtg(in);          // 0x02
-			case AddPtg.sid:          return AddPtg.instance;         // 0x03
-			case SubtractPtg.sid:     return SubtractPtg.instance;    // 0x04
-			case MultiplyPtg.sid:     return MultiplyPtg.instance;    // 0x05
-			case DividePtg.sid:       return DividePtg.instance;      // 0x06
-			case PowerPtg.sid:        return PowerPtg.instance;       // 0x07
-			case ConcatPtg.sid:       return ConcatPtg.instance;      // 0x08
-			case LessThanPtg.sid:     return LessThanPtg.instance;    // 0x09
-			case LessEqualPtg.sid:    return LessEqualPtg.instance;   // 0x0a
-			case EqualPtg.sid:        return EqualPtg.instance;       // 0x0b
-			case GreaterEqualPtg.sid: return GreaterEqualPtg.instance;// 0x0c
-			case GreaterThanPtg.sid:  return GreaterThanPtg.instance; // 0x0d
-			case NotEqualPtg.sid:     return NotEqualPtg.instance;    // 0x0e
-			case IntersectionPtg.sid: return IntersectionPtg.instance;// 0x0f
-			case UnionPtg.sid:        return UnionPtg.instance;       // 0x10
-			case RangePtg.sid:        return RangePtg.instance;       // 0x11
-			case UnaryPlusPtg.sid:    return UnaryPlusPtg.instance;   // 0x12
-			case UnaryMinusPtg.sid:   return UnaryMinusPtg.instance;  // 0x13
-			case PercentPtg.sid:      return PercentPtg.instance;     // 0x14
-			case ParenthesisPtg.sid:  return ParenthesisPtg.instance; // 0x15
-			case MissingArgPtg.sid:   return MissingArgPtg.instance;  // 0x16
-
-			case StringPtg.sid:       return new StringPtg(in);       // 0x17
-			case AttrPtg.sid:         return new AttrPtg(in);         // 0x19
-			case ErrPtg.sid:          return ErrPtg.read(in);         // 0x1c
-			case BoolPtg.sid:         return BoolPtg.read(in);        // 0x1d
-			case IntPtg.sid:          return new IntPtg(in);          // 0x1e
-			case NumberPtg.sid:       return new NumberPtg(in);       // 0x1f
-		}
-		throw new RuntimeException("Unexpected base token id (" + id + ")");
-	}
-
-	private static Ptg[] toPtgArray(List<Ptg> l) {
-		if (l.isEmpty()) {
-			return EMPTY_PTG_ARRAY;
-		}
-		Ptg[] result = new Ptg[l.size()];
-		l.toArray(result);
-		return result;
-	}
-	/**
-	 * This method will return the same result as {@link #getEncodedSizeWithoutArrayData(Ptg[])}
-	 * if there are no array tokens present.
-	 * @return the full size taken to encode the specified <tt>Ptg</tt>s
-	 */
-	public static int getEncodedSize(Ptg[] ptgs) {
-		int result = 0;
-		for (Ptg ptg : ptgs) {
-			result += ptg.getSize();
-		}
-		return result;
-	}
-	/**
-	 * Used to calculate value that should be encoded at the start of the encoded Ptg token array;
-	 * @return the size of the encoded Ptg tokens not including any trailing array data.
-	 */
-	public static int getEncodedSizeWithoutArrayData(Ptg[] ptgs) {
-		int result = 0;
-		for (Ptg ptg : ptgs) {
-			if (ptg instanceof ArrayPtg) {
-				result += ArrayPtg.PLAIN_TOKEN_SIZE;
-			} else {
-				result += ptg.getSize();
-			}
-		}
-		return result;
-	}
-	/**
-	 * Writes the ptgs to the data buffer, starting at the specified offset.
-	 *
-	 * <br/>
-	 * The 2 byte encode length field is <b>not</b> written by this method.
-	 * @return number of bytes written
-	 */
-	public static int serializePtgs(Ptg[] ptgs, byte[] array, int offset) {
-		LittleEndianByteArrayOutputStream out = new LittleEndianByteArrayOutputStream(array, offset);
-
-		List<Ptg> arrayPtgs = null;
-
-		for (Ptg ptg : ptgs) {
-			ptg.write(out);
-			if (ptg instanceof ArrayPtg) {
-				if (arrayPtgs == null) {
-					arrayPtgs = new ArrayList<Ptg>(5);
-				}
-				arrayPtgs.add(ptg);
-			}
-		}
-		if (arrayPtgs != null) {
-			for (Ptg arrayPtg : arrayPtgs) {
-				ArrayPtg p = (ArrayPtg) arrayPtg;
-				p.writeTokenValueBytes(out);
-			}
-		}
-		return out.getWriteIndex() - offset;
-	}
-
-	/**
-	 * @return the encoded length of this Ptg, including the initial Ptg type identifier byte.
-	 */
-	public abstract int getSize();
-
-	public abstract void write(LittleEndianOutput out);
-
-	/**
-	 * return a string representation of this token alone
-	 */
-	public abstract String toFormulaString();
-
-	/** Overridden toString method to ensure object hash is not printed.
-	 * This helps get rid of gratuitous diffs when comparing two dumps
-	 * Subclasses may output more relevant information by overriding this method
-	 **/
-	@Override
-	public String toString(){
-		return this.getClass().toString();
-	}
-
-	public static final byte CLASS_REF = 0x00;
-	public static final byte CLASS_VALUE = 0x20;
-	public static final byte CLASS_ARRAY = 0x40;
-
-	private byte ptgClass = CLASS_REF; //base ptg
-
-	public final void setClass(byte thePtgClass) {
-		if (isBaseToken()) {
-			throw new RuntimeException("setClass should not be called on a base token");
-		}
-		ptgClass = thePtgClass;
-	}
-
-	/**
-	 *  @return the 'operand class' (REF/VALUE/ARRAY) for this Ptg
-	 */
-	public final byte getPtgClass() {
-		return ptgClass;
-	}
-
-	/**
-	 * Debug / diagnostic method to get this token's 'operand class' type.
-	 * @return 'R' for 'reference', 'V' for 'value', 'A' for 'array' and '.' for base tokens
-	 */
-	public final char getRVAType() {
-		if (isBaseToken()) {
-			return '.';
-		}
-		switch (ptgClass) {
-			case Ptg.CLASS_REF:   return 'R';
-			case Ptg.CLASS_VALUE: return 'V';
-			case Ptg.CLASS_ARRAY: return 'A';
-		}
-		throw new RuntimeException("Unknown operand class (" + ptgClass + ")");
-	}
-
-	public abstract byte getDefaultOperandClass();
-
-	/**
-	 * @return <code>false</code> if this token is classified as 'reference', 'value', or 'array'
-	 */
-	public abstract boolean isBaseToken();
-
-	public static boolean doesFormulaReferToDeletedCell(Ptg[] ptgs) {
-		for (Ptg ptg : ptgs) {
-			if (isDeletedCellRef(ptg)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static boolean isDeletedCellRef(Ptg ptg) {
-		if (ptg == ErrPtg.REF_INVALID) {
-			return true;
-		}
-		if (ptg instanceof DeletedArea3DPtg) {
-			return true;
-		}
-		if (ptg instanceof DeletedRef3DPtg) {
-			return true;
-		}
-		if (ptg instanceof AreaErrPtg) {
-			return true;
-		}
-		if (ptg instanceof RefErrorPtg) {
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Pxg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Pxg.java
deleted file mode 100644
index fa1c4ff..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Pxg.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * An XSSF only special kind of Ptg, which stores the sheet / book 
- *  reference in string form.
- */
-public interface Pxg {
-    public int getExternalWorkbookNumber();
-    public String getSheetName();
-    public void setSheetName(String sheetName);
-    public String toFormulaString();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Pxg3D.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
deleted file mode 100644
index 49083fe..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * An XSSF only special kind of Ptg, which stores a range of 
- *  sheet / book references in string form.
- */
-public interface Pxg3D extends Pxg {
-    public String getLastSheetName();
-    public void setLastSheetName(String sheetName);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java
deleted file mode 100644
index 1ab4cf1..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class RangePtg  extends OperationPtg {
-    public final static int  SIZE = 1;
-    public final static byte sid  = 0x11;
-
-    public static final OperationPtg instance = new RangePtg();
-
-    private RangePtg() {
-    	// enforce singleton
-    }
-
-    public final boolean isBaseToken() {
-        return true;
-    }
-
-    public int getSize()
-    {
-        return SIZE;
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-    }
-
-    public String toFormulaString()
-    {
-        return ":";
-    }
-
-
-    /** implementation of method from OperationsPtg*/
-    public String toFormulaString(String[] operands)
-    {
-         StringBuffer buffer = new StringBuffer();
-
-         buffer.append(operands[ 0 ]);
-         buffer.append(":");
-         buffer.append(operands[ 1 ]);
-         return buffer.toString();
-     }
-
-    public int getNumberOfOperands()
-    {
-        return 2;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
deleted file mode 100644
index 06af02a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * @author Josh Micich
- */
-abstract class Ref2DPtgBase extends RefPtgBase {
-	private final static int SIZE = 5;
-
-
-	protected Ref2DPtgBase(int row, int column, boolean isRowRelative, boolean isColumnRelative) {
-		setRow(row);
-		setColumn(column);
-		setRowRelative(isRowRelative);
-		setColRelative(isColumnRelative);
-	}
-
-	protected Ref2DPtgBase(LittleEndianInput in)  {
-		readCoordinates(in);
-	}
-
-	protected Ref2DPtgBase(CellReference cr) {
-		super(cr);
-	}
-
-	@Override
-    public void write(LittleEndianOutput out) {
-		out.writeByte(getSid() + getPtgClass());
-		writeCoordinates(out);
-	}
-
-	@Override
-    public final String toFormulaString() {
-		return formatReferenceAsString();
-	}
-
-	protected abstract byte getSid();
-
-	@Override
-    public final int getSize() {
-		return SIZE;
-	}
-
-    @Override
-    public final String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(getClass().getName());
-        sb.append(" [");
-        sb.append(formatReferenceAsString());
-        sb.append("]");
-        return sb.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
deleted file mode 100644
index 1366d2d..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.ExternSheetReferenceToken;
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.WorkbookDependentFormula;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * <p>Title:        Reference 3D Ptg</p>
- * <p>Description:  Defined a cell in extern sheet.</p>
- * <p>REFERENCE: </p>
- * 
- * <p>This is HSSF only, as it matches the HSSF file format way of
- *  referring to the sheet by an extern index. The XSSF equivalent
- *  is {@link Ref3DPxg} 
- */
-public final class Ref3DPtg extends RefPtgBase implements WorkbookDependentFormula, ExternSheetReferenceToken {
-    public final static byte sid  = 0x3a;
-
-    private final static int  SIZE = 7; // 6 + 1 for Ptg
-    private int             field_1_index_extern_sheet;
-
-
-    public Ref3DPtg(LittleEndianInput in)  {
-        field_1_index_extern_sheet = in.readShort();
-        readCoordinates(in);
-    }
-
-    public Ref3DPtg(String cellref, int externIdx ) {
-        this(new CellReference(cellref), externIdx);
-    }
-
-    public Ref3DPtg(CellReference c, int externIdx) {
-        super(c);
-        setExternSheetIndex(externIdx);
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(getClass().getName());
-        sb.append(" [");
-        sb.append("sheetIx=").append(getExternSheetIndex());
-        sb.append(" ! ");
-        sb.append(formatReferenceAsString());
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeShort(getExternSheetIndex());
-        writeCoordinates(out);
-    }
-
-    public int getSize() {
-        return SIZE;
-    }
-
-    public int getExternSheetIndex() {
-        return field_1_index_extern_sheet;
-    }
-
-    public void setExternSheetIndex(int index) {
-        field_1_index_extern_sheet = index;
-    }
-    public String format2DRefAsString() {
-        return formatReferenceAsString();
-    }
-    /**
-     * @return text representation of this cell reference that can be used in text
-     * formulas. The sheet name will get properly delimited if required.
-     */
-    public String toFormulaString(FormulaRenderingWorkbook book) {
-        return ExternSheetNameResolver.prependSheetName(book, field_1_index_extern_sheet, formatReferenceAsString());
-    }
-    public String toFormulaString() {
-        throw new RuntimeException("3D references need a workbook to determine formula text");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
deleted file mode 100644
index 3b78c5a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.SheetIdentifier;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.formula.SheetRangeIdentifier;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * <p>Title:        XSSF 3D Reference</p>
- * <p>Description:  Defines a cell in an external or different sheet.</p>
- * <p>REFERENCE: </p>
- * 
- * <p>This is XSSF only, as it stores the sheet / book references
- *  in String form. The HSSF equivalent using indexes is {@link Ref3DPtg}</p>
- */
-public final class Ref3DPxg extends RefPtgBase implements Pxg3D {
-    private int externalWorkbookNumber = -1;
-    private String firstSheetName;
-    private String lastSheetName;
-
-    public Ref3DPxg(int externalWorkbookNumber, SheetIdentifier sheetName, String cellref) {
-        this(externalWorkbookNumber, sheetName, new CellReference(cellref));
-    }
-    public Ref3DPxg(int externalWorkbookNumber, SheetIdentifier sheetName, CellReference c) {
-        super(c);
-        this.externalWorkbookNumber = externalWorkbookNumber;
-        
-        this.firstSheetName = sheetName.getSheetIdentifier().getName();
-        if (sheetName instanceof SheetRangeIdentifier) {
-            this.lastSheetName = ((SheetRangeIdentifier)sheetName).getLastSheetIdentifier().getName();
-        } else {
-            this.lastSheetName = null;
-        }
-    }
-    
-    public Ref3DPxg(SheetIdentifier sheetName, String cellref) {
-        this(sheetName, new CellReference(cellref));
-    }
-    public Ref3DPxg(SheetIdentifier sheetName, CellReference c) {
-        this(-1, sheetName, c);
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(getClass().getName());
-        sb.append(" [");
-        if (externalWorkbookNumber >= 0) {
-            sb.append(" [");
-            sb.append("workbook=").append(getExternalWorkbookNumber());
-            sb.append("] ");
-        }
-        sb.append("sheet=").append(firstSheetName);
-        if (lastSheetName != null) {
-            sb.append(" : ");
-            sb.append("sheet=").append(lastSheetName);
-        }
-        sb.append(" ! ");
-        sb.append(formatReferenceAsString());
-        sb.append("]");
-        return sb.toString();
-    }
-    
-    public int getExternalWorkbookNumber() {
-        return externalWorkbookNumber;
-    }
-    public String getSheetName() {
-        return firstSheetName;
-    }
-    public String getLastSheetName() {
-        return lastSheetName;
-    }
-    
-    public void setSheetName(String sheetName) {
-        this.firstSheetName = sheetName;
-    }
-    public void setLastSheetName(String sheetName) {
-        this.lastSheetName = sheetName;
-    }
-    
-    public String format2DRefAsString() {
-        return formatReferenceAsString();
-    }
-
-    public String toFormulaString() {
-        StringBuffer sb = new StringBuffer();
-        if (externalWorkbookNumber >= 0) {
-            sb.append('[');
-            sb.append(externalWorkbookNumber);
-            sb.append(']');
-        }
-        if (firstSheetName != null) {
-            SheetNameFormatter.appendFormat(sb, firstSheetName);
-        }
-        if (lastSheetName != null) {
-            sb.append(':');
-            SheetNameFormatter.appendFormat(sb, lastSheetName);
-        }
-        sb.append('!');
-        sb.append(formatReferenceAsString());
-        return sb.toString();
-    }
-    
-    public int getSize() {
-        return 1;
-    }
-    public void write(LittleEndianOutput out) {
-        throw new IllegalStateException("XSSF-only Ptg, should not be serialised");
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
deleted file mode 100644
index e450644..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * RefError - handles deleted cell reference
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class RefErrorPtg extends OperandPtg {
-
-    private final static int SIZE = 5;
-    public final static byte sid  = 0x2A;
-    private int              field_1_reserved;
-
-    public RefErrorPtg() {
-        field_1_reserved = 0;
-    }
-    public RefErrorPtg(LittleEndianInput in)  {
-        field_1_reserved = in.readInt();
-    }
-
-    public String toString() {
-        return getClass().getName();
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeInt(field_1_reserved);
-    }
-
-    public int getSize()
-    {
-        return SIZE;
-    }
-
-    public String toFormulaString() {
-        return FormulaError.REF.getString();
-    }
-    
-    public byte getDefaultOperandClass() {
-        return Ptg.CLASS_REF;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
deleted file mode 100644
index 715836f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * RefNPtg
- * @author Jason Height (jheight at apache dot com)
- */
-public final class RefNPtg extends Ref2DPtgBase {
-	public final static byte sid = 0x2C;
-
-	public RefNPtg(LittleEndianInput in)  {
-		super(in);
-	}
-
-	protected byte getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java
deleted file mode 100644
index 297c0e7..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * ReferencePtg - handles references (such as A1, A2, IA4)
- * @author  Andrew C. Oliver (acoliver@apache.org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class RefPtg extends Ref2DPtgBase {
-	public final static byte sid = 0x24;
-
-	/**
-	 * Takes in a String representation of a cell reference and fills out the
-	 * numeric fields.
-	 */
-	public RefPtg(String cellref) {
-		super(new CellReference(cellref));
-	}
-
-	public RefPtg(int row, int column, boolean isRowRelative, boolean isColumnRelative) {
-		super(row, column, isRowRelative, isColumnRelative);
-	}
-
-	public RefPtg(LittleEndianInput in)  {
-		super(in);
-	}
-
-	public RefPtg(CellReference cr) {
-		super(cr);
-	}
-
-	protected byte getSid() {
-		return sid;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
deleted file mode 100644
index 5ff9a7a..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * ReferencePtgBase - handles references (such as A1, A2, IA4)
- *
- * @author Andrew C. Oliver (acoliver@apache.org)
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public abstract class RefPtgBase extends OperandPtg {
-
-	/** The row index - zero based unsigned 16 bit value */
-	private int field_1_row;
-	/**
-	 * Field 2 - lower 8 bits is the zero based unsigned byte column index - bit
-	 * 16 - isRowRelative - bit 15 - isColumnRelative
-	 */
-	private int field_2_col;
-	private static final BitField rowRelative = BitFieldFactory.getInstance(0x8000);
-	private static final BitField colRelative = BitFieldFactory.getInstance(0x4000);
-
-    /**
-     * YK: subclasses of RefPtgBase are used by the FormulaParser and FormulaEvaluator accross HSSF and XSSF.
-     * The bit mask should accomodate the maximum number of avaiable columns, i.e. 0x3FFF.
-     *
-     * @see org.apache.poi.ss.SpreadsheetVersion
-     */
-    private static final BitField column = BitFieldFactory.getInstance(0x3FFF);
-
-	protected RefPtgBase() {
-		// Required for clone methods
-	}
-
-	protected RefPtgBase(CellReference c) {
-		setRow(c.getRow());
-		setColumn(c.getCol());
-		setColRelative(!c.isColAbsolute());
-		setRowRelative(!c.isRowAbsolute());
-	}
-
-	protected final void readCoordinates(LittleEndianInput in) {
-		field_1_row = in.readUShort();
-		field_2_col = in.readUShort();
-	}
-
-	protected final void writeCoordinates(LittleEndianOutput out) {
-		out.writeShort(field_1_row);
-		out.writeShort(field_2_col);
-	}
-
-	public final void setRow(int rowIndex) {
-		field_1_row = rowIndex;
-	}
-
-	/**
-	 * @return the row number as an int
-	 */
-	public final int getRow() {
-		return field_1_row;
-	}
-
-	public final boolean isRowRelative() {
-		return rowRelative.isSet(field_2_col);
-	}
-
-	public final void setRowRelative(boolean rel) {
-		field_2_col = rowRelative.setBoolean(field_2_col, rel);
-	}
-
-	public final boolean isColRelative() {
-		return colRelative.isSet(field_2_col);
-	}
-
-	public final void setColRelative(boolean rel) {
-		field_2_col = colRelative.setBoolean(field_2_col, rel);
-	}
-
-	public final void setColumn(int col) {
-		field_2_col = column.setValue(field_2_col, col);
-	}
-
-	public final int getColumn() {
-		return column.getValue(field_2_col);
-	}
-
-	protected final String formatReferenceAsString() {
-		// Only make cell references as needed. Memory is an issue
-		CellReference cr = new CellReference(getRow(), getColumn(), !isRowRelative(), !isColRelative());
-		return cr.formatAsString();
-	}
-
-	@Override
-    public final byte getDefaultOperandClass() {
-		return Ptg.CLASS_REF;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
deleted file mode 100644
index f916c38..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-
-/**
- * Common superclass of all {@link Ptg}s that represent simple constant values.
- *
- * @author Josh Micich
- */
-public abstract class ScalarConstantPtg extends Ptg {
-	public final boolean isBaseToken() {
-		return true;
-	}
-
-	public final byte getDefaultOperandClass() {
-		return Ptg.CLASS_VALUE;
-	}
-
-	public final String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(toFormulaString());
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java
deleted file mode 100644
index 836ca0f..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.StringUtil;
-
-/**
- * String Stores a String value in a formula value stored in the format
- * &lt;length 2 bytes&gt;char[]
- * 
- * @author Werner Froidevaux
- * @author Jason Height (jheight at chariot dot net dot au)
- * @author Bernard Chesnoy
- */
-public final class StringPtg extends ScalarConstantPtg {
-     public final static byte sid = 0x17;
-    /** the character (") used in formulas to delimit string literals */
-    private static final char FORMULA_DELIMITER = '"';
-
-    private final boolean _is16bitUnicode;
-    /**
-     * NOTE: OO doc says 16bit length, but BiffViewer says 8 Book says something
-     * totally different, so don't look there!
-     */
-    private final String field_3_string;
-
-    /** Create a StringPtg from a stream */
-    public StringPtg(LittleEndianInput in)  {
-    	int nChars = in.readUByte(); // Note - nChars is 8-bit
-    	_is16bitUnicode = (in.readByte() & 0x01) != 0;
-    	if (_is16bitUnicode) {
-    		field_3_string = StringUtil.readUnicodeLE(in, nChars);
-    	} else {
-    		field_3_string = StringUtil.readCompressedUnicode(in, nChars);
-    	}
-    }
-
-    /**
-     * Create a StringPtg from a string representation of the number Number
-     * format is not checked, it is expected to be validated in the parser that
-     * calls this method.
-     * 
-     * @param value :
-     *            String representation of a floating point number
-     */
-    public StringPtg(String value) {
-        if (value.length() > 255) {
-            throw new IllegalArgumentException(
-                    "String literals in formulas can't be bigger than 255 characters ASCII");
-        }
-        _is16bitUnicode = StringUtil.hasMultibyte(value);
-        field_3_string = value;
-    }
-
-    public String getValue() {
-        return field_3_string;
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeByte(field_3_string.length()); // Note - nChars is 8-bit
-        out.writeByte(_is16bitUnicode ? 0x01 : 0x00);
-        if (_is16bitUnicode) {
-        	StringUtil.putUnicodeLE(field_3_string, out);
-        } else {
-        	StringUtil.putCompressedUnicode(field_3_string, out);
-        }
-    }
-
-    public int getSize() {
-    	return 3 +  field_3_string.length() * (_is16bitUnicode ? 2 : 1);
-    }
-
-    public String toFormulaString() {
-        String value = field_3_string;
-        int len = value.length();
-        StringBuffer sb = new StringBuffer(len + 4);
-        sb.append(FORMULA_DELIMITER);
-
-        for (int i = 0; i < len; i++) {
-            char c = value.charAt(i);
-            if (c == FORMULA_DELIMITER) {
-                sb.append(FORMULA_DELIMITER);
-            }
-            sb.append(c);
-        }
-
-        sb.append(FORMULA_DELIMITER);
-        return sb.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
deleted file mode 100644
index f06e604..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- *
- * @author  andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public final class SubtractPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x04;
-
-    public static final ValueOperatorPtg instance = new SubtractPtg();
-
-    private SubtractPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 2;
-    }
-       
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(operands[ 0 ]);
-        buffer.append("-");
-        buffer.append(operands[ 1 ]);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java
deleted file mode 100644
index 5ab5558..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * This ptg indicates a data table.
- * It only occurs in a FORMULA record, never in an
- *  ARRAY or NAME record.  When ptgTbl occurs in a
- *  formula, it is the only token in the formula.
- *
- * This indicates that the cell containing the
- *  formula is an interior cell in a data table;
- *  the table description is found in a TABLE
- *  record. Rows and columns which contain input
- *  values to be substituted in the table do
- *  not contain ptgTbl.
- * See page 811 of the june 08 binary docs.
- */
-public final class TblPtg extends ControlPtg {
-    private final static int  SIZE = 5;
-    public final static short sid  = 0x02;
-    /** The row number of the upper left corner */
-    private final int field_1_first_row;
-    /** The column number of the upper left corner */
-    private final int field_2_first_col;
-
-    public TblPtg(LittleEndianInput in)  {
-      field_1_first_row = in.readUShort();
-      field_2_first_col = in.readUShort();
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-        out.writeShort(field_1_first_row);
-        out.writeShort(field_2_first_col);
-    }
-
-    public int getSize() {
-        return SIZE;
-    }
-
-    public int getRow() {
-      return field_1_first_row;
-    }
-
-    public int getColumn() {
-      return field_2_first_col;
-    }
-
-    public String toFormulaString()
-    {
-        // table(....)[][]
-        throw new RuntimeException("Table and Arrays are not yet supported");
-    }
-
-    public String toString() {
-        StringBuffer buffer = new StringBuffer("[Data Table - Parent cell is an interior cell in a data table]\n");
-        buffer.append("top left row = ").append(getRow()).append("\n");
-        buffer.append("top left col = ").append(getColumn()).append("\n");
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
deleted file mode 100644
index 9079150..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Unary Plus operator
- * does not have any effect on the operand
- * @author Avik Sengupta
- */
-public final class UnaryMinusPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x13;
-    
-    private final static String MINUS = "-";
-
-    public static final ValueOperatorPtg instance = new UnaryMinusPtg();
-
-    private UnaryMinusPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 1;
-    }
-    
-   /** implementation of method from OperationsPtg*/  
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(MINUS);
-        buffer.append(operands[ 0]);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
deleted file mode 100644
index 1596c67..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-/**
- * Unary Plus operator
- * does not have any effect on the operand
- * @author Avik Sengupta
- */
-public final class UnaryPlusPtg extends ValueOperatorPtg {
-    public final static byte sid  = 0x12;
-    
-    private final static String ADD = "+";
-
-    public static final ValueOperatorPtg instance = new UnaryPlusPtg();
-
-    private UnaryPlusPtg() {
-    	// enforce singleton
-    }
-    
-    protected byte getSid() {
-    	return sid;
-    }
-
-    public int getNumberOfOperands() {
-        return 1;
-    }
-    
-   /** implementation of method from OperationsPtg*/  
-    public String toFormulaString(String[] operands) {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(ADD);
-        buffer.append(operands[ 0]);
-        return buffer.toString();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
deleted file mode 100644
index fcc2ae5..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-
-/**
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class UnionPtg extends OperationPtg {
-    public final static byte sid  = 0x10;
-
-    public static final OperationPtg instance = new UnionPtg();
-
-    private UnionPtg() {
-    	// enforce singleton
-    }
-
-    public final boolean isBaseToken() {
-        return true;
-    }
-
-    public int getSize()
-    {
-        return 1;
-    }
-
-    public void write(LittleEndianOutput out) {
-        out.writeByte(sid + getPtgClass());
-    }
-
-    public String toFormulaString()
-    {
-        return ",";
-    }
-
-
-    /** implementation of method from OperationsPtg*/
-    public String toFormulaString(String[] operands)
-    {
-         StringBuffer buffer = new StringBuffer();
-
-         buffer.append(operands[ 0 ]);
-         buffer.append(",");
-         buffer.append(operands[ 1 ]);
-         return buffer.toString();
-     }
-
-    public int getNumberOfOperands()
-    {
-        return 2;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
deleted file mode 100644
index 8eac212..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * @author andy
- * @author Jason Height (jheight at chariot dot net dot au)
- */
-public class UnknownPtg extends Ptg {
-    private short size = 1;
-    private final int _sid;
-
-    public UnknownPtg(int sid) {
-        _sid = sid;
-    }
-
-    public boolean isBaseToken() {
-        return true;
-    }
-    public void write(LittleEndianOutput out) {
-        out.writeByte(_sid);
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public String toFormulaString() {
-        return "UNKNOWN";
-    }
-    public byte getDefaultOperandClass() {
-        return Ptg.CLASS_VALUE;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java b/trunk/src/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
deleted file mode 100644
index 1194adf..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Common superclass of all value operators. Subclasses include all unary and
- * binary operators except for the reference operators (IntersectionPtg,
- * RangePtg, UnionPtg)
- * 
- * @author Josh Micich
- */
-public abstract class ValueOperatorPtg extends OperationPtg {
-
-	/**
-	 * All Operator <tt>Ptg</tt>s are base tokens (i.e. are not RVA classified)
-	 */
-	public final boolean isBaseToken() {
-		return true;
-	}
-
-	public final byte getDefaultOperandClass() {
-		return Ptg.CLASS_VALUE;
-	}
-
-	public void write(LittleEndianOutput out) {
-		out.writeByte(getSid());
-	}
-
-	protected abstract byte getSid();
-
-	public final int getSize() {
-		return 1;
-	}
-
-	public final String toFormulaString() {
-		// TODO - prune this method out of the hierarchy
-		throw new RuntimeException("toFormulaString(String[] operands) should be used for subclasses of OperationPtgs");
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/ptg/package.html b/trunk/src/java/org/apache/poi/ss/formula/ptg/package.html
deleted file mode 100644
index b0e899c..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/ptg/package.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-formula package contains binary PTG structures used in Formulas 
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-<!-- Put @see and @since tags down here. -->
-@see org.apache.poi.hssf.record
-@see org.apache.poi.hssf.record.FormulaRecord
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java b/trunk/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
deleted file mode 100644
index ece8034..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.udf;
-
-import org.apache.poi.ss.formula.atp.AnalysisToolPak;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * Collects add-in libraries and VB macro functions together into one UDF finder
- *
- * @author PUdalau
- */
-public class AggregatingUDFFinder implements UDFFinder {
-    
-    /**
-     * Default UDFFinder implementation
-     */ 
-    public static final UDFFinder DEFAULT = new AggregatingUDFFinder(AnalysisToolPak.instance);
-
-    private final Collection<UDFFinder> _usedToolPacks;
-
-    public AggregatingUDFFinder(UDFFinder ... usedToolPacks) {
-        _usedToolPacks = new ArrayList<UDFFinder>(usedToolPacks.length);
-        _usedToolPacks.addAll(Arrays.asList(usedToolPacks));
-    }
-
-    /**
-     * Returns executor by specified name. Returns <code>null</code> if
-     * function isn't contained by any registered tool pack.
-     *
-     * @param name Name of function.
-     * @return Function executor. <code>null</code> if not found
-     */
-    @Override
-    public FreeRefFunction findFunction(String name) {
-        FreeRefFunction evaluatorForFunction;
-        for (UDFFinder pack : _usedToolPacks) {
-            evaluatorForFunction = pack.findFunction(name);
-            if (evaluatorForFunction != null) {
-                return evaluatorForFunction;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Add a new toolpack
-     *
-     * @param toolPack the UDF toolpack to add
-     */
-    public void add(UDFFinder toolPack){
-        _usedToolPacks.add(toolPack);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java b/trunk/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
deleted file mode 100644
index 382820b..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.udf;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-
-/**
- * Default UDF finder - for adding your own user defined functions.
- *
- * @author PUdalau
- */
-public final class DefaultUDFFinder implements UDFFinder {
-    private final Map<String, FreeRefFunction> _functionsByName;
-
-    public DefaultUDFFinder(String[] functionNames, FreeRefFunction[] functionImpls) {
-        int nFuncs = functionNames.length;
-        if (functionImpls.length != nFuncs) {
-            throw new IllegalArgumentException(
-                    "Mismatch in number of function names and implementations");
-        }
-        HashMap<String, FreeRefFunction> m = new HashMap<String, FreeRefFunction>(nFuncs * 3 / 2);
-        for (int i = 0; i < functionImpls.length; i++) {
-            m.put(functionNames[i].toUpperCase(Locale.ROOT), functionImpls[i]);
-        }
-        _functionsByName = m;
-    }
-
-    @Override
-    public FreeRefFunction findFunction(String name) {
-        return _functionsByName.get(name.toUpperCase(Locale.ROOT));
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java b/trunk/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
deleted file mode 100644
index 27ceaef..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.udf;
-
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.util.Internal;
-
-import java.util.HashMap;
-
-/**
- * A UDFFinder that can retrieve functions both by name and by fake index.
- *
- * @author Yegor Kozlov
- */
-@Internal
-public class IndexedUDFFinder extends AggregatingUDFFinder {
-    private final HashMap<Integer, String> _funcMap;
-
-    public IndexedUDFFinder(UDFFinder... usedToolPacks) {
-        super(usedToolPacks);
-        _funcMap = new HashMap<Integer, String>();
-    }
-
-    @Override
-    public FreeRefFunction findFunction(String name) {
-        FreeRefFunction func = super.findFunction(name);
-        if (func != null) {
-            int idx = getFunctionIndex(name);
-            _funcMap.put(idx, name);
-        }
-        return func;
-    }
-
-    public String getFunctionName(int idx) {
-        return _funcMap.get(idx);
-    }
-
-    public int getFunctionIndex(String name) {
-        return name.hashCode();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java b/trunk/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java
deleted file mode 100644
index a434756..0000000
--- a/trunk/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.udf;
-
-import org.apache.poi.ss.formula.atp.AnalysisToolPak;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-
-/**
- * Common interface for "Add-in" libraries and user defined function libraries.
- */
-public interface UDFFinder {
-    // FIXME: Findbugs error: IC_SUPERCLASS_USES_SUBCLASS_DURING_INITIALIZATION
-    /**
-     * Default UDFFinder implementation
-     * 
-     * @deprecated use AggregatingUDFFinder.DEFAULT instead, deprecated in POI 3.15,
-     *     scheduled for removable in POI 3.17 
-     */
-    @Deprecated
-    public static final UDFFinder DEFAULT = new AggregatingUDFFinder(AnalysisToolPak.instance);
-
-    /**
-     * Returns executor by specified name. Returns <code>null</code> if the function name is unknown.
-     *
-     * @param name Name of function.
-     * @return Function executor.
-     */
-    FreeRefFunction findFunction(String name);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/AutoFilter.java b/trunk/src/java/org/apache/poi/ss/usermodel/AutoFilter.java
deleted file mode 100644
index 82c7a43..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/AutoFilter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-/**
- * Represents autofiltering for the specified worksheet.
- *
- * <p>
- * Filtering data is a quick and easy way to find and work with a subset of data in a range of cells or table.
- * For example, you can filter to see only the values that you specify, filter to see the top or bottom values,
- * or filter to quickly see duplicate values.
- * </p>
- *
- * TODO YK: For now (Aug 2010) POI only supports setting a basic autofilter on a range of cells.
- * In future, when we support more auto-filter functions like custom criteria, sort, etc. we will add
- * corresponding methods to this interface.
- */
-public interface AutoFilter {
-    /**
-     * Apply a custom filter
-     *
-     * <p>
-     * A custom AutoFilter specifies an operator and a value.
-     * There can be at most two customFilters specified, and in that case the parent element
-     * specifies whether the two conditions are joined by 'and' or 'or'. For any cells whose
-     * values do not meet the specified criteria, the corresponding rows shall be hidden from
-     * view when the filter is applied.
-     * </p>
-     *
-     * <p>
-     * Example:
-     * <blockquote><pre>
-     *  AutoFilter filter = sheet.setAutoFilter(CellRangeAddress.valueOf("A1:F200"));
-     *  filter.applyFilter(0, FilterOperator.GreaterThanOrEqual", "0.2");
-     *  filter.applyFilter(1, FilterOperator.LessThanOrEqual"", "0.5");
-     * </pre></blockquote>
-     * </p>
-     *
-     * @param columnIndex 0-based column index
-     * @param operator the operator to apply
-     * @param criteria top or bottom value used in the filter criteria.
-     *
-     * TODO YK: think how to combine AutoFilter with with DataValidationConstraint, they are really close relatives
-     * void applyFilter(int columnIndex, FilterOperator operator, String criteria);
-     */
-
-
-    /**
-     * Apply a filter against a list of values
-     *
-     * <p>
-     * Example:
-     * <blockquote><pre>
-     *  AutoFilter filter = sheet.setAutoFilter(CellRangeAddress.valueOf("A1:F200"));
-     *  filter.applyFilter(0, "apache", "poi", "java", "api");
-     * </pre></blockquote>
-     * </p>
-     *
-     * @param columnIndex 0-based column index
-     * @param values the filter values
-     *
-     * void applyFilter(int columnIndex, String ... values);
-     */
-    
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/BorderExtent.java b/trunk/src/java/org/apache/poi/ss/usermodel/BorderExtent.java
deleted file mode 100644
index 7115883..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/BorderExtent.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * The enumeration value indicating which borders to draw in a Property Template
- */
-public enum BorderExtent {
-    /**
-     * No properties defined. This can be used to remove existing properties
-     * from the PropertyTemplate.
-     */
-    NONE,
-
-    /**
-     * All borders, that is top, bottom, left and right, including interior
-     * borders for the range. Does not include diagonals which are different
-     * and not implemented here.
-     */
-    ALL,
-
-    /**
-     * All inside borders. This is top, bottom, left, and right borders, but
-     * restricted to the interior borders for the range. For a range of one
-     * cell, this will produce no borders.
-     */
-    INSIDE,
-
-    /**
-     * All outside borders. That is top, bottom, left and right borders that
-     * bound the range only.
-     */
-    OUTSIDE,
-
-    /**
-     * This is just the top border for the range. No interior borders will
-     * be produced.
-     */
-    TOP,
-
-    /**
-     * This is just the bottom border for the range. No interior borders
-     * will be produced.
-     */
-    BOTTOM,
-
-    /**
-     * This is just the left border for the range, no interior borders will
-     * be produced.
-     */
-    LEFT,
-
-    /**
-     * This is just the right border for the range, no interior borders will
-     * be produced.
-     */
-    RIGHT,
-
-    /**
-     * This is all horizontal borders for the range, including interior and
-     * outside borders.
-     */
-    HORIZONTAL,
-
-    /**
-     * This is just the interior horizontal borders for the range.
-     */
-    INSIDE_HORIZONTAL,
-
-    /**
-     * This is just the outside horizontal borders for the range.
-     */
-    OUTSIDE_HORIZONTAL,
-
-    /**
-     * This is all vertical borders for the range, including interior and
-     * outside borders.
-     */
-    VERTICAL,
-
-    /**
-     * This is just the interior vertical borders for the range.
-     */
-    INSIDE_VERTICAL,
-
-    /**
-     * This is just the outside vertical borders for the range.
-     */
-    OUTSIDE_VERTICAL
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
deleted file mode 100644
index 949cc3d..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.util.Removal;
-
-/**
- * High level representation for Border Formatting component
- * of Conditional Formatting settings
- */
-public interface BorderFormatting {
-    /** No border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#NONE}
-     */
-    @Removal(version="3.17")
-    short BORDER_NONE                = 0x0;
-    
-    /** Thin border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THIN}
-     */
-    @Removal(version="3.17")
-    short BORDER_THIN                = 0x1;
-    
-    /** Medium border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM              = 0x2;
-    
-    /** dash border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASHED}
-     */
-    @Removal(version="3.17")
-    short BORDER_DASHED              = 0x3;
-    
-    /** dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOTTED}
-     */
-    @Removal(version="3.17")
-    short BORDER_DOTTED              = 0x4;
-    
-    /** Thick border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THICK}
-     */
-    @Removal(version="3.17")
-    short BORDER_THICK               = 0x5;
-    
-    /** double-line border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOUBLE}
-     */
-    @Removal(version="3.17")
-    short BORDER_DOUBLE              = 0x6;
-    
-    /** hair-line border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#HAIR}
-     */
-    @Removal(version="3.17")
-    short BORDER_HAIR                = 0x7;
-    
-    /** Medium dashed border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASHED}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASHED       = 0x8;
-    
-    /** dash-dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_DASH_DOT            = 0x9;
-    
-    /** medium dash-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASH_DOT     = 0xA;
-    
-    /** dash-dot-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_DASH_DOT_DOT        = 0xB;
-    
-    /** medium dash-dot-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASH_DOT_DOT = 0xC;
-    
-    /** slanted dash-dot border 
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#SLANTED_DASH_DOT}
-     */
-    @Removal(version="3.17")
-    short BORDER_SLANTED_DASH_DOT    = 0xD;
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderBottomEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    short getBorderBottom();
-    /** @since POI 3.15 */
-    BorderStyle getBorderBottomEnum();
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderDiagonalEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    short getBorderDiagonal();
-    /** @since POI 3.15 */
-    BorderStyle getBorderDiagonalEnum();
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderLeftEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    short getBorderLeft();
-    /** @since POI 3.15 */
-    BorderStyle getBorderLeftEnum();
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderRightEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    short getBorderRight();
-    /** @since POI 3.15 */
-    BorderStyle getBorderRightEnum();
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderTopEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    short getBorderTop();
-    /** @since POI 3.15 */
-    BorderStyle getBorderTopEnum();
-
-    
-    short getBottomBorderColor();
-    Color getBottomBorderColorColor();
-
-    short getDiagonalBorderColor();
-    Color getDiagonalBorderColorColor();
-
-    short getLeftBorderColor();
-    Color getLeftBorderColorColor();
-
-    short getRightBorderColor();
-    Color getRightBorderColorColor();
-
-    short getTopBorderColor();
-    Color getTopBorderColorColor();
-
-    /**
-     * Set bottom border.
-     *
-     * @param border  MUST be a BORDER_* constant
-     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderBottom(BorderStyle)}
-     */
-    void setBorderBottom(short border);
-
-    /**
-     * Set bottom border.
-     *
-     * @param border
-     */
-    void setBorderBottom(BorderStyle border);
-    
-    /**
-     * Set diagonal border.
-     *
-     * @param border  MUST be a BORDER_* constant
-     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderDiagonal(BorderStyle)}
-     */
-    void setBorderDiagonal(short border);
-    
-    /**
-     * Set diagonal border.
-     *
-     * @param border
-     */
-    void setBorderDiagonal(BorderStyle border);
-
-    /**
-     * Set left border.
-     *
-     * @param border  MUST be a BORDER_* constant
-     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderLeft(BorderStyle)}
-     */
-    void setBorderLeft(short border);
-    
-    /**
-     * Set left border.
-     *
-     * @param border
-     */
-    void setBorderLeft(BorderStyle border);
-
-    /**
-     * Set right border.
-     *
-     * @param border  MUST be a BORDER_* constant
-     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderRight(BorderStyle)}
-     */
-    void setBorderRight(short border);
-    
-    /**
-     * Set right border.
-     *
-     * @param border
-     */
-    void setBorderRight(BorderStyle border);
-
-    /**
-     * Set top border.
-     *
-     * @param border  MUST be a BORDER_* constant
-     * @deprecated 3.15 beta 2. Use {@link BorderFormatting#setBorderTop(BorderStyle)}
-     */
-    void setBorderTop(short border);
-    
-    /**
-     * Set top border.
-     *
-     * @param border
-     */
-    void setBorderTop(BorderStyle border);
-
-    void setBottomBorderColor(short color);
-    void setBottomBorderColor(Color color);
-
-    void setDiagonalBorderColor(short color);
-    void setDiagonalBorderColor(Color color);
-
-    void setLeftBorderColor(short color);
-    void setLeftBorderColor(Color color);
-
-    void setRightBorderColor(short color);
-    void setRightBorderColor(Color color);
-
-    void setTopBorderColor(short color);
-    void setTopBorderColor(Color color);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/BorderStyle.java b/trunk/src/java/org/apache/poi/ss/usermodel/BorderStyle.java
deleted file mode 100644
index 9fd5d15..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/BorderStyle.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * The enumeration value indicating the line style of a border in a cell,
- * i.e., whether it is bordered dash dot, dash dot dot, dashed, dotted, double, hair, medium, 
- * medium dash dot, medium dash dot dot, medium dashed, none, slant dash dot, thick or thin.
- */
- public enum BorderStyle {
-
-    /**
-     * No border (default)
-     */
-    NONE(0x0),
-
-    /**
-     * Thin border
-     */
-    THIN(0x1),
-
-    /**
-     * Medium border
-     */
-    MEDIUM(0x2),
-
-    /**
-     * dash border
-     */
-    DASHED(0x3),
-
-    /**
-     * dot border
-     */
-    DOTTED(0x4),
-
-    /**
-     * Thick border
-     */
-    THICK(0x5),
-
-    /**
-     * double-line border
-     */
-    DOUBLE(0x6),
-
-    /**
-     * hair-line border
-     */
-    HAIR(0x7),
-
-    /**
-     * Medium dashed border
-     */
-    MEDIUM_DASHED(0x8),
-
-    /**
-     * dash-dot border
-     */
-    DASH_DOT(0x9),
-
-    /**
-     * medium dash-dot border
-     */
-    MEDIUM_DASH_DOT(0xA),
-
-    /**
-     * dash-dot-dot border
-     */
-    DASH_DOT_DOT(0xB),
-
-    /**
-     * medium dash-dot-dot border
-     */
-    MEDIUM_DASH_DOT_DOT(0xC),
-
-    /**
-     * slanted dash-dot border
-     */
-    SLANTED_DASH_DOT(0xD);
-    
-    private final short code;
-
-    private BorderStyle(int code) {
-        this.code = (short)code;
-    }
-
-    public short getCode() {
-        return code;
-    }
-    
-    private static final BorderStyle[] _table = new BorderStyle[0xD + 1];
-    static {
-        for (BorderStyle c : values()) {
-            _table[c.getCode()] = c;
-        }
-    }
-    
-    public static BorderStyle valueOf(short code) {
-        return _table[code];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java b/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
deleted file mode 100644
index 8d11881..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-/**
- * Utility to identify built-in formats.  The following is a list of the formats as
- * returned by this class.<p/>
- *<p/>
- *       0, "General"<br/>
- *       1, "0"<br/>
- *       2, "0.00"<br/>
- *       3, "#,##0"<br/>
- *       4, "#,##0.00"<br/>
- *       5, "$#,##0_);($#,##0)"<br/>
- *       6, "$#,##0_);[Red]($#,##0)"<br/>
- *       7, "$#,##0.00);($#,##0.00)"<br/>
- *       8, "$#,##0.00_);[Red]($#,##0.00)"<br/>
- *       9, "0%"<br/>
- *       0xa, "0.00%"<br/>
- *       0xb, "0.00E+00"<br/>
- *       0xc, "# ?/?"<br/>
- *       0xd, "# ??/??"<br/>
- *       0xe, "m/d/yy"<br/>
- *       0xf, "d-mmm-yy"<br/>
- *       0x10, "d-mmm"<br/>
- *       0x11, "mmm-yy"<br/>
- *       0x12, "h:mm AM/PM"<br/>
- *       0x13, "h:mm:ss AM/PM"<br/>
- *       0x14, "h:mm"<br/>
- *       0x15, "h:mm:ss"<br/>
- *       0x16, "m/d/yy h:mm"<br/>
- *<p/>
- *       // 0x17 - 0x24 reserved for international and undocumented
- *       0x25, "#,##0_);(#,##0)"<br/>
- *       0x26, "#,##0_);[Red](#,##0)"<br/>
- *       0x27, "#,##0.00_);(#,##0.00)"<br/>
- *       0x28, "#,##0.00_);[Red](#,##0.00)"<br/>
- *       0x29, "_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)"<br/>
- *       0x2a, "_($* #,##0_);_($* (#,##0);_($* \"-\"_);_(@_)"<br/>
- *       0x2b, "_(* #,##0.00_);_(* (#,##0.00);_(* \"-\"??_);_(@_)"<br/>
- *       0x2c, "_($* #,##0.00_);_($* (#,##0.00);_($* \"-\"??_);_(@_)"<br/>
- *       0x2d, "mm:ss"<br/>
- *       0x2e, "[h]:mm:ss"<br/>
- *       0x2f, "mm:ss.0"<br/>
- *       0x30, "##0.0E+0"<br/>
- *       0x31, "@" - This is text format.<br/>
- *       0x31  "text" - Alias for "@"<br/>
- * <p/>
- */
-public final class BuiltinFormats {
-	/**
-	 * The first user-defined number format starts at 164.
-	 */
-	public static final int FIRST_USER_DEFINED_FORMAT_INDEX = 164;
-
-	private final static String[] _formats = {
-        "General",
-        "0",
-        "0.00",
-        "#,##0",
-        "#,##0.00",
-        "\"$\"#,##0_);(\"$\"#,##0)",
-        "\"$\"#,##0_);[Red](\"$\"#,##0)",
-        "\"$\"#,##0.00_);(\"$\"#,##0.00)",
-        "\"$\"#,##0.00_);[Red](\"$\"#,##0.00)",
-        "0%",
-        "0.00%",
-        "0.00E+00",
-        "# ?/?",
-        "# ??/??",
-        "m/d/yy",
-        "d-mmm-yy",
-        "d-mmm",
-        "mmm-yy",
-        "h:mm AM/PM",
-        "h:mm:ss AM/PM",
-        "h:mm",
-        "h:mm:ss",
-        "m/d/yy h:mm",
-
-        // 0x17 - 0x24 reserved for international and undocumented
-        // TODO - one junit relies on these values which seems incorrect
-        "reserved-0x17",
-        "reserved-0x18",
-        "reserved-0x19",
-        "reserved-0x1A",
-        "reserved-0x1B",
-        "reserved-0x1C",
-        "reserved-0x1D",
-        "reserved-0x1E",
-        "reserved-0x1F",
-        "reserved-0x20",
-        "reserved-0x21",
-        "reserved-0x22",
-        "reserved-0x23",
-        "reserved-0x24",
-        
-        "#,##0_);(#,##0)",
-        "#,##0_);[Red](#,##0)",
-        "#,##0.00_);(#,##0.00)",
-        "#,##0.00_);[Red](#,##0.00)",
-        "_(\"$\"* #,##0_);_(\"$\"* (#,##0);_(\"$\"* \"-\"_);_(@_)",
-        "_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)",
-        "_(* #,##0.00_);_(* (#,##0.00);_(* \"-\"??_);_(@_)",
-        "_(\"$\"* #,##0.00_);_(\"$\"* (#,##0.00);_(\"$\"* \"-\"??_);_(@_)",
-        "mm:ss",
-        "[h]:mm:ss",
-        "mm:ss.0",
-        "##0.0E+0",
-        "@"
-	};
-
-	/**
-	 * @return array of built-in data formats
-	 */
-	public static String[] getAll() {
-		return _formats.clone();
-	}
-
-	/**
-	 * Get the format string that matches the given format index
-	 *
-	 * @param index of a built in format
-	 * @return string represented at index of format or <code>null</code> if there is not a built-in format at that index
-	 */
-	public static String getBuiltinFormat(int index) {
-		if (index < 0 || index >=_formats.length) {
-			return null;
-		}
-		return _formats[index];
-	}
-
-	/**
-	 * Get the format index that matches the given format string.<br/>
-	 * Automatically converts "text" to excel's format string to represent text.
-	 * 
-	 * @param pFmt string matching a built-in format
-	 * @return index of format or -1 if undefined.
-	 */
-	public static int getBuiltinFormat(String pFmt) {
-		String fmt = "TEXT".equalsIgnoreCase(pFmt) ? "@" : pFmt;
-
-		int i = -1;
-		for (String f : _formats) {
-		    i++;
-		    if (f.equals(fmt)) {
-		        return i; 
-		    }
-		}
-		
-		return -1;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java b/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java
deleted file mode 100644
index a6f4f63..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-
-/**
- * High level representation of a cell in a row of a spreadsheet.
- * <p>
- * Cells can be numeric, formula-based or string-based (text).  The cell type
- * specifies this.  String cells cannot conatin numbers and numeric cells cannot
- * contain strings (at least according to our model).  Client apps should do the
- * conversions themselves.  Formula cells have the formula string, as well as
- * the formula result, which can be numeric or string.
- * </p>
- * <p>
- * Cells should have their number (0 based) before being added to a row.
- * </p>
- */
-public interface Cell {
-
-    /**
-     * Numeric Cell type (0)
-     * @see #setCellType(int)
-     * @see #getCellType()
-     * @deprecated POI 3.15 beta 3. Use {@link CellType#NUMERIC} instead.
-     */
-    @Removal(version="4.0")
-    int CELL_TYPE_NUMERIC = 0; //CellType.NUMERIC.getCode();
-
-    /**
-     * String Cell type (1)
-     * @see #setCellType(int)
-     * @see #getCellType()
-     * @deprecated POI 3.15 beta 3. Use {@link CellType#STRING} instead.
-     */
-    @Removal(version="4.0")
-    int CELL_TYPE_STRING = 1; //CellType.STRING.getCode();
-
-    /**
-     * Formula Cell type (2)
-     * @see #setCellType(int)
-     * @see #getCellType()
-     * @deprecated POI 3.15 beta 3. Use {@link CellType#FORMULA} instead.
-     */
-    @Removal(version="4.0")
-    int CELL_TYPE_FORMULA = 2; //CellType.FORMULA.getCode();
-
-    /**
-     * Blank Cell type (3)
-     * @see #setCellType(int)
-     * @see #getCellType()
-     * @deprecated POI 3.15 beta 3. Use {@link CellType#BLANK} instead.
-     */
-    @Removal(version="4.0")
-    int CELL_TYPE_BLANK = 3; //CellType.BLANK.getCode();
-
-    /**
-     * Boolean Cell type (4)
-     * @see #setCellType(int)
-     * @see #getCellType()
-     * @deprecated POI 3.15 beta 3. Use {@link CellType#BOOLEAN} instead.
-     */
-    @Removal(version="4.0")
-    int CELL_TYPE_BOOLEAN = 4; //CellType.BOOLEAN.getCode();
-
-    /**
-     * Error Cell type (5)
-     * @see #setCellType(int)
-     * @see #getCellType()
-     * @deprecated POI 3.15 beta 3. Use {@link CellType#ERROR} instead.
-     */
-    @Removal(version="4.0")
-    int CELL_TYPE_ERROR = 5; //CellType.ERROR.getCode();
-
-    /**
-     * Returns column index of this cell
-     *
-     * @return zero-based column index of a column in a sheet.
-     */
-    int getColumnIndex();
-
-    /**
-     * Returns row index of a row in the sheet that contains this cell
-     *
-     * @return zero-based row index of a row in the sheet that contains this cell
-     */
-    int getRowIndex();
-
-    /**
-     * Returns the sheet this cell belongs to
-     *
-     * @return the sheet this cell belongs to
-     */
-    Sheet getSheet();
-
-    /**
-     * Returns the Row this cell belongs to
-     *
-     * @return the Row that owns this cell
-     */
-     Row getRow();
-
-    /**
-     * Set the cells type (numeric, formula or string).
-     * <p>If the cell currently contains a value, the value will
-     *  be converted to match the new type, if possible. Formatting
-     *  is generally lost in the process however.</p>
-     * <p>If what you want to do is get a String value for your
-     *  numeric cell, <i>stop!</i>. This is not the way to do it.
-     *  Instead, for fetching the string value of a numeric or boolean
-     *  or date cell, use {@link DataFormatter} instead.</p> 
-     *
-     * @throws IllegalArgumentException if the specified cell type is invalid
-     * @throws IllegalStateException if the current value cannot be converted to the new type
-     * @see CellType#NUMERIC
-     * @see CellType#STRING
-     * @see CellType#FORMULA
-     * @see CellType#BLANK
-     * @see CellType#BOOLEAN
-     * @see CellType#ERROR
-     * @deprecated POI 3.15 beta 3. Use {@link #setCellType(CellType)} instead.
-     */
-    @Removal(version="4.0")
-    void setCellType(int cellType);
-    /**
-     * Set the cells type (numeric, formula or string).
-     * <p>If the cell currently contains a value, the value will
-     *  be converted to match the new type, if possible. Formatting
-     *  is generally lost in the process however.</p>
-     * <p>If what you want to do is get a String value for your
-     *  numeric cell, <i>stop!</i>. This is not the way to do it.
-     *  Instead, for fetching the string value of a numeric or boolean
-     *  or date cell, use {@link DataFormatter} instead.</p> 
-     *
-     * @throws IllegalArgumentException if the specified cell type is invalid
-     * @throws IllegalStateException if the current value cannot be converted to the new type
-     */
-    void setCellType(CellType cellType);
-
-    /**
-     * Return the cell type.
-     * 
-     * Will return {@link CellType} in version 4.0 of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     *
-     * @return the cell type
-     * @deprecated POI 3.15. Will return a {@link CellType} enum in the future.
-     */
-    int getCellType();
-    
-    /**
-     * Return the cell type.
-     *
-     * @return the cell type
-     * @since POI 3.15 beta 3
-     * Will be renamed to <code>getCellType()</code> when we make the CellType enum transition in POI 4.0. See bug 59791.
-     */
-    @Removal(version="4.2")
-    CellType getCellTypeEnum();
-    
-    /**
-     * Only valid for formula cells
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     * 
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    int getCachedFormulaResultType();
-
-    /**
-     * Only valid for formula cells
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @since POI 3.15 beta 3
-     * Will be renamed to <code>getCachedFormulaResultType()</code> when we make the CellType enum transition in POI 4.0. See bug 59791.
-     */
-    CellType getCachedFormulaResultTypeEnum();
-
-    /**
-     * Set a numeric value for the cell
-     *
-     * @param value  the numeric value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    void setCellValue(double value);
-
-    /**
-     * <p>Converts the supplied date to its equivalent Excel numeric value and sets
-     * that into the cell.</p>
-     * 
-     * <p><b>Note</b> - There is actually no 'DATE' cell type in Excel. In many
-     * cases (when entering date values), Excel automatically adjusts the
-     * <i>cell style</i> to some date format, creating the illusion that the cell
-     * data type is now something besides {@link CellType#NUMERIC}.  POI
-     * does not attempt to replicate this behaviour.  To make a numeric cell
-     * display as a date, use {@link #setCellStyle(CellStyle)} etc.</p>
-     *
-     * @param value the numeric value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numerics cell and set its value.
-     */
-    void setCellValue(Date value);
-
-    /**
-     * <p>Set a date value for the cell. Excel treats dates as numeric so you will need to format the cell as
-     * a date.</p>
-     * <p>
-     * This will set the cell value based on the Calendar's timezone. As Excel
-     * does not support timezones this means that both 20:00+03:00 and
-     * 20:00-03:00 will be reported as the same value (20:00) even that there
-     * are 6 hours difference between the two times. This difference can be
-     * preserved by using <code>setCellValue(value.getTime())</code> which will
-     * automatically shift the times to the default timezone.
-     * </p>
-     *
-     * @param value  the date value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For othertypes we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    void setCellValue(Calendar value);
-
-    /**
-     * Set a rich string value for the cell.
-     *
-     * @param value  value to set the cell to.  For formulas we'll set the formula
-     * string, for String cells we'll set its value.  For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is null then we will change the cell to a Blank cell.
-     */
-    void setCellValue(RichTextString value);
-
-    /**
-     * Set a string value for the cell.
-     *
-     * @param value  value to set the cell to.  For formulas we'll set the formula
-     * string, for String cells we'll set its value.  For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is null then we will change the cell to a Blank cell.
-     */
-    void setCellValue(String value);
-
-
-    /**
-     * Sets formula for this cell.
-     * <p>
-     * Note, this method only sets the formula string and does not calculate the formula value.
-     * To set the precalculated value use {@link #setCellValue(double)} or {@link #setCellValue(String)}
-     * </p>
-     *
-     * @param formula the formula to set, e.g. <code>"SUM(C4:E4)"</code>.
-     *  If the argument is <code>null</code> then the current formula is removed.
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     */
-    void setCellFormula(String formula) throws FormulaParseException;
-
-    /**
-     * Return a formula for the cell, for example, <code>SUM(C4:E4)</code>
-     *
-     * @return a formula for the cell
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is not {@link CellType#FORMULA}
-     */
-    String getCellFormula();
-
-    /**
-     * Get the value of the cell as a number.
-     * <p>
-     * For strings we throw an exception. For blank cells we return a 0.
-     * For formulas or error cells we return the precalculated value;
-     * </p>
-     * @return the value of the cell as a number
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is {@link CellType#STRING}
-     * @exception NumberFormatException if the cell value isn't a parsable <code>double</code>.
-     * @see DataFormatter for turning this number into a string similar to that which Excel would render this number as.
-     */
-    double getNumericCellValue();
-
-    /**
-     * Get the value of the cell as a date.
-     * <p>
-     * For strings we throw an exception. For blank cells we return a null.
-     * </p>
-     * @return the value of the cell as a date
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is {@link CellType#STRING}
-     * @exception NumberFormatException if the cell value isn't a parsable <code>double</code>.
-     * @see DataFormatter for formatting  this date into a string similar to how excel does.
-     */
-    Date getDateCellValue();
-
-    /**
-     * Get the value of the cell as a XSSFRichTextString
-     * <p>
-     * For numeric cells we throw an exception. For blank cells we return an empty string.
-     * For formula cells we return the pre-calculated value if a string, otherwise an exception.
-     * </p>
-     * @return the value of the cell as a XSSFRichTextString
-     */
-    RichTextString getRichStringCellValue();
-
-    /**
-     * Get the value of the cell as a string
-     * <p>
-     * For numeric cells we throw an exception. For blank cells we return an empty string.
-     * For formulaCells that are not string Formulas, we throw an exception.
-     * </p>
-     * @return the value of the cell as a string
-     */
-    String getStringCellValue();
-
-    /**
-     * Set a boolean value for the cell
-     *
-     * @param value the boolean value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for booleans we'll set its value. For other types we
-     *        will change the cell to a boolean cell and set its value.
-     */
-     void setCellValue(boolean value);
-
-    /**
-     * Set a error value for the cell
-     *
-     * @param value the error value to set this cell to.  For formulas we'll set the
-     *        precalculated value , for errors we'll set
-     *        its value. For other types we will change the cell to an error
-     *        cell and set its value.
-     * @see FormulaError
-     */
-    void setCellErrorValue(byte value);
-
-    /**
-     * Get the value of the cell as a boolean.
-     * <p>
-     * For strings, numbers, and errors, we throw an exception. For blank cells we return a false.
-     * </p>
-     * @return the value of the cell as a boolean
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()}
-     *   is not {@link CellType#BOOLEAN}, {@link CellType#BLANK} or {@link CellType#FORMULA}
-     */
-    boolean getBooleanCellValue();
-
-    /**
-     * Get the value of the cell as an error code.
-     * <p>
-     * For strings, numbers, and booleans, we throw an exception.
-     * For blank cells we return a 0.
-     * </p>
-     *
-     * @return the value of the cell as an error code
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} isn't {@link CellType#ERROR}
-     * @see FormulaError for error codes
-     */
-    byte getErrorCellValue();
-
-    /**
-     * <p>Set the style for the cell.  The style should be an CellStyle created/retrieved from
-     * the Workbook.</p>
-     * 
-     * <p>To change the style of a cell without affecting other cells that use the same style,
-     * use {@link org.apache.poi.ss.util.CellUtil#setCellStyleProperties(Cell, Map)}</p>
-     *
-     * @param style  reference contained in the workbook.
-     * If the value is null then the style information is removed causing the cell to used the default workbook style.
-     * @see org.apache.poi.ss.usermodel.Workbook#createCellStyle()
-     */
-    void setCellStyle(CellStyle style);
-
-    /**
-     * Return the cell's style.
-     *
-     * @return the cell's style. Always not-null. Default cell style has zero index and can be obtained as
-     * <code>workbook.getCellStyleAt(0)</code>
-     * @see Workbook#getCellStyleAt(int)
-     */
-    CellStyle getCellStyle();
-
-    /**
-     * Sets this cell as the active cell for the worksheet
-     */
-    void setAsActiveCell();
-
-   /**
-     * Gets the address of this cell
-     *
-     * @return <code>A1</code> style address of this cell
-     * @since 3.14beta1
-     */
-    CellAddress getAddress();
-
-    /**
-     * Assign a comment to this cell
-     *
-     * @param comment comment associated with this cell
-     */
-    void setCellComment(Comment comment);
-
-    /**
-     * Returns comment associated with this cell
-     *
-     * @return comment associated with this cell or <code>null</code> if not found
-     */
-    Comment getCellComment();
-
-    /**
-     * Removes the comment for this cell, if there is one.
-     */
-    void removeCellComment();
-
-    /**
-     * @return hyperlink associated with this cell or <code>null</code> if not found
-     */
-    Hyperlink getHyperlink();
-
-    /**
-     * Assign a hyperlink to this cell
-     *
-     * @param link hyperlink associated with this cell
-     */
-    void setHyperlink(Hyperlink link);
-
-    /**
-     * Removes the hyperlink for this cell, if there is one.
-     */
-    void removeHyperlink();
-
-    /**
-     * Only valid for array formula cells
-     *
-     * @return range of the array formula group that the cell belongs to.
-     */
-    CellRangeAddress getArrayFormulaRange();
-
-    /**
-     * @return <code>true</code> if this cell is part of group of cells having a common array formula.
-     */
-    boolean isPartOfArrayFormulaGroup();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java b/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
deleted file mode 100644
index 8a0377b..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.util.Beta;
-
-@Beta
-public class CellCopyPolicy {
-    // cell-level policies
-    public static final boolean DEFAULT_COPY_CELL_VALUE_POLICY = true;
-    public static final boolean DEFAULT_COPY_CELL_STYLE_POLICY = true;
-    public static final boolean DEFAULT_COPY_CELL_FORMULA_POLICY = true;
-    public static final boolean DEFAULT_COPY_HYPERLINK_POLICY = true;
-    public static final boolean DEFAULT_MERGE_HYPERLINK_POLICY = false;
-    
-    // row-level policies
-    public static final boolean DEFAULT_COPY_ROW_HEIGHT_POLICY = true;
-    public static final boolean DEFAULT_CONDENSE_ROWS_POLICY = false;
-    
-    // sheet-level policies
-    public static final boolean DEFAULT_COPY_MERGED_REGIONS_POLICY = true;
-    
-    // cell-level policies
-    private boolean copyCellValue = DEFAULT_COPY_CELL_VALUE_POLICY;
-    private boolean copyCellStyle = DEFAULT_COPY_CELL_STYLE_POLICY;
-    private boolean copyCellFormula = DEFAULT_COPY_CELL_FORMULA_POLICY;
-    private boolean copyHyperlink = DEFAULT_COPY_HYPERLINK_POLICY;
-    private boolean mergeHyperlink = DEFAULT_MERGE_HYPERLINK_POLICY;
-    
-    // row-level policies
-    private boolean copyRowHeight = DEFAULT_COPY_ROW_HEIGHT_POLICY;
-    private boolean condenseRows = DEFAULT_CONDENSE_ROWS_POLICY;
-    
-    // sheet-level policies
-    private boolean copyMergedRegions = DEFAULT_COPY_MERGED_REGIONS_POLICY;
-    
-    /** 
-     * Default CellCopyPolicy, uses default policy
-     * For custom CellCopyPolicy, use {@link Builder} class
-     */
-    public CellCopyPolicy() { }
-    
-    /**
-     * Copy constructor
-     *
-     * @param other policy to copy
-     */
-    public CellCopyPolicy(CellCopyPolicy other) {
-        copyCellValue = other.isCopyCellValue();
-        copyCellStyle = other.isCopyCellStyle();
-        copyCellFormula = other.isCopyCellFormula();
-        copyHyperlink = other.isCopyHyperlink();
-        mergeHyperlink = other.isMergeHyperlink();
-        
-        copyRowHeight = other.isCopyRowHeight();
-        condenseRows = other.isCondenseRows();
-        
-        copyMergedRegions = other.isCopyMergedRegions();
-    }
-    
-    // should builder be replaced with CellCopyPolicy setters that return the object
-    // to allow setters to be chained together?
-    // policy.setCopyCellValue(true).setCopyCellStyle(true)
-    private CellCopyPolicy(Builder builder) {
-        copyCellValue = builder.copyCellValue;
-        copyCellStyle = builder.copyCellStyle;
-        copyCellFormula = builder.copyCellFormula;
-        copyHyperlink = builder.copyHyperlink;
-        mergeHyperlink = builder.mergeHyperlink;
-        
-        copyRowHeight = builder.copyRowHeight;
-        condenseRows = builder.condenseRows;
-        
-        copyMergedRegions = builder.copyMergedRegions;
-    }
-    
-    public static class Builder {
-        // cell-level policies
-        private boolean copyCellValue = DEFAULT_COPY_CELL_VALUE_POLICY;
-        private boolean copyCellStyle = DEFAULT_COPY_CELL_STYLE_POLICY;
-        private boolean copyCellFormula = DEFAULT_COPY_CELL_FORMULA_POLICY;
-        private boolean copyHyperlink = DEFAULT_COPY_HYPERLINK_POLICY;
-        private boolean mergeHyperlink = DEFAULT_MERGE_HYPERLINK_POLICY;
-        
-        // row-level policies
-        private boolean copyRowHeight = DEFAULT_COPY_ROW_HEIGHT_POLICY;
-        private boolean condenseRows = DEFAULT_CONDENSE_ROWS_POLICY;
-        
-        // sheet-level policies
-        private boolean copyMergedRegions = DEFAULT_COPY_MERGED_REGIONS_POLICY;
-        
-        /**
-         * Builder class for CellCopyPolicy
-         */
-        public Builder() {
-        }
-        
-        // cell-level policies
-        public Builder cellValue(boolean copyCellValue) {
-            this.copyCellValue = copyCellValue;
-            return this;
-        }
-        public Builder cellStyle(boolean copyCellStyle) {
-            this.copyCellStyle = copyCellStyle;
-            return this;
-        }
-        public Builder cellFormula(boolean copyCellFormula) {
-            this.copyCellFormula = copyCellFormula;
-            return this;
-        }
-        public Builder copyHyperlink(boolean copyHyperlink) {
-            this.copyHyperlink = copyHyperlink;
-            return this;
-        }
-        public Builder mergeHyperlink(boolean mergeHyperlink) {
-            this.mergeHyperlink = mergeHyperlink;
-            return this;
-        }
-        
-        // row-level policies
-        public Builder rowHeight(boolean copyRowHeight) {
-            this.copyRowHeight = copyRowHeight;
-            return this;
-        }
-        public Builder condenseRows(boolean condenseRows) {
-            this.condenseRows = condenseRows;
-            return this;
-        }
-        
-        // sheet-level policies
-        public Builder mergedRegions(boolean copyMergedRegions) {
-            this.copyMergedRegions = copyMergedRegions;
-            return this;
-        }
-        public CellCopyPolicy build() {
-            return new CellCopyPolicy(this);
-        }
-    }
-    
-    public Builder createBuilder() {
-        final Builder builder = new Builder()
-                .cellValue(copyCellValue)
-                .cellStyle(copyCellStyle)
-                .cellFormula(copyCellFormula)
-                .copyHyperlink(copyHyperlink)
-                .mergeHyperlink(mergeHyperlink)
-                .rowHeight(copyRowHeight)
-                .condenseRows(condenseRows)
-                .mergedRegions(copyMergedRegions);
-        return builder;
-    }
-
-/*
- * Cell-level policies 
- */
-    /**
-     * @return the copyCellValue
-     */
-    public boolean isCopyCellValue() {
-        return copyCellValue;
-    }
-
-    /**
-     * @param copyCellValue the copyCellValue to set
-     */
-    public void setCopyCellValue(boolean copyCellValue) {
-        this.copyCellValue = copyCellValue;
-    }
-
-    /**
-     * @return the copyCellStyle
-     */
-    public boolean isCopyCellStyle() {
-        return copyCellStyle;
-    }
-
-    /**
-     * @param copyCellStyle the copyCellStyle to set
-     */
-    public void setCopyCellStyle(boolean copyCellStyle) {
-        this.copyCellStyle = copyCellStyle;
-    }
-
-    /**
-     * @return the copyCellFormula
-     */
-    public boolean isCopyCellFormula() {
-        return copyCellFormula;
-    }
-
-    /**
-     * @param copyCellFormula the copyCellFormula to set
-     */
-    public void setCopyCellFormula(boolean copyCellFormula) {
-        this.copyCellFormula = copyCellFormula;
-    }
-    
-    /**
-     * @return the copyHyperlink
-     */
-    public boolean isCopyHyperlink() {
-        return copyHyperlink;
-    }
-
-    /**
-     * @param copyHyperlink the copyHyperlink to set
-     */
-    public void setCopyHyperlink(boolean copyHyperlink) {
-        this.copyHyperlink = copyHyperlink;
-    }
-    
-    /**
-     * @return the mergeHyperlink
-     */
-    public boolean isMergeHyperlink() {
-        return mergeHyperlink;
-    }
-
-    /**
-     * @param mergeHyperlink the mergeHyperlink to set
-     */
-    public void setMergeHyperlink(boolean mergeHyperlink) {
-        this.mergeHyperlink = mergeHyperlink;
-    }
-
-/*
- * Row-level policies 
- */
-    /**
-     * @return the copyRowHeight
-     */
-    public boolean isCopyRowHeight() {
-        return copyRowHeight;
-    }
-
-    /**
-     * @param copyRowHeight the copyRowHeight to set
-     */
-    public void setCopyRowHeight(boolean copyRowHeight) {
-        this.copyRowHeight = copyRowHeight;
-    }
-    
-    /**
-     * If condenseRows is true, a discontinuities in srcRows will be removed when copied to destination
-     * For example:
-     * Sheet.copyRows({Row(1), Row(2), Row(5)}, 11, policy) results in rows 1, 2, and 5
-     * being copied to rows 11, 12, and 13 if condenseRows is True, or rows 11, 11, 15 if condenseRows is false
-     * @return the condenseRows
-     */
-    public boolean isCondenseRows() {
-        return condenseRows;
-    }
-
-    /**
-     * @param condenseRows the condenseRows to set
-     */
-    public void setCondenseRows(boolean condenseRows) {
-        this.condenseRows = condenseRows;
-    }
-    
-    
-/*
- * Sheet-level policies 
- */
-    /**
-     * @return the copyMergedRegions
-     */
-    public boolean isCopyMergedRegions() {
-        return copyMergedRegions;
-    }
-
-    /**
-     * @param copyMergedRegions the copyMergedRegions to set
-     */
-    public void setCopyMergedRegions(boolean copyMergedRegions) {
-        this.copyMergedRegions = copyMergedRegions;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/CellRange.java b/trunk/src/java/org/apache/poi/ss/usermodel/CellRange.java
deleted file mode 100644
index 4868dd8..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/CellRange.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.Iterator;
-
-
-/**
- * Represents a rectangular region of a {@link Sheet}
- */
-public interface CellRange<C extends Cell> extends Iterable<C> {
-    int getWidth();
-    int getHeight();
-
-    /**
-     * Gets the number of cells in this range.
-     * @return <tt>height * width </tt>
-     */
-    int size();
-
-    /**
-     * @return the text format of this range.  Single cell ranges are formatted
-     *         like single cell references (e.g. 'A1' instead of 'A1:A1').
-     */
-    String getReferenceText();
-
-    /**
-     * @return the cell at relative coordinates (0,0).  Never <code>null</code>.
-     */
-    C getTopLeftCell();
-
-    /**
-     * @param relativeRowIndex must be between <tt>0</tt> and <tt>height-1</tt>
-     * @param relativeColumnIndex must be between <tt>0</tt> and <tt>width-1</tt>
-     * @return the cell at the specified coordinates.  Never <code>null</code>.
-     */
-    C getCell(int relativeRowIndex, int relativeColumnIndex);
-    /**
-     * @return a flattened array of all the cells in this {@link CellRange}
-     */
-    C[] getFlattenedCells();
-    /**
-     * @return a 2-D array of all the cells in this {@link CellRange}.  The first
-     * array dimension is the row index (values <tt>0...height-1</tt>)
-     * and the second dimension is the column index (values <tt>0...width-1</tt>)
-     */
-    C[][] getCells();
-
-    /**
-     * @return an {@link Iterator} over all cells in this range.  Iteration starts
-     * with all cells in the first row followed by all cells in the next row, etc.
-     */
-    Iterator<C> iterator();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java b/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java
deleted file mode 100644
index d16619c..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/CellStyle.java
+++ /dev/null
@@ -1,902 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.util.Removal;
-
-public interface CellStyle {
-
-    /**
-     * general (normal) horizontal alignment
-     * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#GENERAL} instead.
-     */
-    @Removal(version="3.17")
-    short ALIGN_GENERAL = 0x0; //HorizontalAlignment.GENERAL.getCode();
-
-    /**
-     * left-justified horizontal alignment
-     * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#LEFT} instead.
-     */
-    @Removal(version="3.17")
-    short ALIGN_LEFT = 0x1; //HorizontalAlignment.LEFT.getCode();
-
-    /**
-     * center horizontal alignment
-     * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#CENTER} instead.
-     */
-    @Removal(version="3.17")
-    short ALIGN_CENTER = 0x2; //HorizontalAlignment.CENTER.getCode();
-
-    /**
-     * right-justified horizontal alignment
-     * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#RIGHT} instead.
-     */
-    @Removal(version="3.17")
-    short ALIGN_RIGHT = 0x3; //HorizontalAlignment.RIGHT.getCode();
-
-    /**
-     * fill? horizontal alignment
-     * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#FILL} instead.
-     */
-    @Removal(version="3.17")
-    short ALIGN_FILL = 0x4; //HorizontalAlignment.FILL.getCode();
-
-    /**
-     * justified horizontal alignment
-     * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#JUSTIFY} instead.
-     */
-    @Removal(version="3.17")
-    short ALIGN_JUSTIFY = 0x5; //HorizontalAlignment.JUSTIFY.getCode();
-
-    /**
-     * center-selection? horizontal alignment
-     * @deprecated POI 3.15 beta 3. Use {@link HorizontalAlignment#CENTER_SELECTION} instead.
-     */
-    @Removal(version="3.17")
-    short ALIGN_CENTER_SELECTION = 0x6; //HorizontalAlignment.CENTER_SELECTION.getCode();
-
-    /**
-     * top-aligned vertical alignment
-     * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#TOP} instead.
-     */
-    @Removal(version="3.17")
-    short VERTICAL_TOP = 0x0; //VerticalAlignment.TOP.getCode();
-
-    /**
-     * center-aligned vertical alignment
-     * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#CENTER} instead.
-     */
-    @Removal(version="3.17")
-    short VERTICAL_CENTER = 0x1; //VerticalAlignment.CENTER.getCode();
-
-    /**
-     * bottom-aligned vertical alignment
-     * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#BOTTOM} instead.
-     */
-    @Removal(version="3.17")
-    short VERTICAL_BOTTOM = 0x2; //VerticalAlignment.BOTTOM.getCode();
-
-    /**
-     * vertically justified vertical alignment
-     * @deprecated POI 3.15 beta 3. Use {@link VerticalAlignment#JUSTIFY} instead.
-     */
-    @Removal(version="3.17")
-    short VERTICAL_JUSTIFY = 0x3; //VerticalAlignment.JUSTIFY.getCode();
-
-    /**
-     * No border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#NONE} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_NONE = 0x0; //BorderStyle.NONE.getCode();
-
-    /**
-     * Thin border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THIN} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_THIN = 0x1; //BorderStyle.THIN.getCode();
-
-    /**
-     * Medium border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM = 0x2; //BorderStyle.MEDIUM.getCode();
-
-    /**
-     * dash border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASHED} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_DASHED = 0x3; //BorderStyle.DASHED.getCode();
-
-    /**
-     * dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOTTED} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_DOTTED = 0x4; //BorderStyle.DOTTED.getCode();
-
-    /**
-     * Thick border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#THICK} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_THICK = 0x5; //BorderStyle.THICK.getCode();
-
-    /**
-     * double-line border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DOUBLE} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_DOUBLE = 0x6; //BorderStyle.DOUBLE.getCode();
-
-    /**
-     * hair-line border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#HAIR} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_HAIR = 0x7; //BorderStyle.HAIR.getCode();
-
-    /**
-     * Medium dashed border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASHED} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASHED = 0x8; //BorderStyle.MEDIUM_DASHED.getCode();
-
-    /**
-     * dash-dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_DASH_DOT = 0x9; //BorderStyle.DASH_DOT.getCode();
-
-    /**
-     * medium dash-dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASH_DOT = 0xA; //BorderStyle.MEDIUM_DASH_DOT.getCode();
-
-    /**
-     * dash-dot-dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#DASH_DOT_DOT} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_DASH_DOT_DOT = 0xB; //BorderStyle.DASH_DOT_DOT.getCode();
-
-    /**
-     * medium dash-dot-dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#MEDIUM_DASH_DOT_DOT} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_MEDIUM_DASH_DOT_DOT = 0xC; //BorderStyle.MEDIUM_DASH_DOT_DOT.getCode();
-
-    /**
-     * slanted dash-dot border
-     * @deprecated 3.15 beta 2. Use {@link BorderStyle#SLANTED_DASH_DOT} instead.
-     */
-    @Removal(version="3.17")
-    short BORDER_SLANTED_DASH_DOT = 0xD; //BorderStyle.SLANTED_DASH_DOT.getCode();
-
-    /** 
-     * Fill Pattern: No background
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#NO_FILL} instead.
-     */
-    @Removal(version="3.17")
-    short NO_FILL = 0; //FillPatternType.NO_FILL.getCode();
-
-    /**
-     * Fill Pattern: Solidly filled
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#SOLID_FOREGROUND} instead.
-     */
-    @Removal(version="3.17")
-    short SOLID_FOREGROUND = 1; //FillPatternType.SOLID_FOREGROUND.getCode();
-
-    /**
-     * Fill Pattern: Small fine dots
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#FINE_DOTS} instead.
-     */
-    @Removal(version="3.17")
-    short FINE_DOTS = 2; //FillPatternType.FINE_DOTS.getCode();
-
-    /**
-     * Fill Pattern: Wide dots
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#ALT_BARS} instead.
-     */
-    @Removal(version="3.17")
-    short ALT_BARS = 3; //FillPatternType.ALT_BARS.getCode();
-
-    /**
-     * Fill Pattern: Sparse dots
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#SPARSE_DOTS} instead.
-     */
-    @Removal(version="3.17")
-    short SPARSE_DOTS = 4; //FillPatternType.SPARSE_DOTS.getCode();
-
-    /**
-     * Fill Pattern: Thick horizontal bands
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_HORZ_BANDS} instead.
-     */
-    @Removal(version="3.17")
-    short THICK_HORZ_BANDS = 5; //FillPatternType.THICK_HORZ_BANDS.getCode();
-
-    /**
-     * Fill Pattern: Thick vertical bands
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_VERT_BANDS} instead.
-     */
-    @Removal(version="3.17")
-    short THICK_VERT_BANDS = 6; //FillPatternType.THICK_VERT_BANDS.getCode();
-
-    /**
-     * Fill Pattern: Thick backward facing diagonals
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_BACKWARD_DIAG} instead.
-     */
-    @Removal(version="3.17")
-    short THICK_BACKWARD_DIAG = 7; //FillPatternType.THICK_BACKWARD_DIAG.getCode();
-
-    /**
-     * Fill Pattern: Thick forward facing diagonals
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THICK_FORWARD_DIAG} instead.
-     */
-    @Removal(version="3.17")
-    short THICK_FORWARD_DIAG = 8; //FillPatternType.THICK_FORWARD_DIAG.getCode();
-
-    /**
-     * Fill Pattern: Large spots
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#BIG_SPOTS} instead.
-     */
-    @Removal(version="3.17")
-    short BIG_SPOTS = 9; //FillPatternType.BIG_SPOTS.getCode();
-
-    /**
-     * Fill Pattern: Brick-like layout
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#BRICKS} instead.
-     */
-    @Removal(version="3.17")
-    short BRICKS = 10; //FillPatternType.BRICKS.getCode();
-
-    /**
-     * Fill Pattern: Thin horizontal bands
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_HORZ_BANDS} instead.
-     */
-    @Removal(version="3.17")
-    short THIN_HORZ_BANDS = 11; //FillPatternType.THIN_HORZ_BANDS.getCode();
-
-    /**
-     * Fill Pattern: Thin vertical bands
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_VERT_BANDS} instead.
-     */
-    @Removal(version="3.17")
-    short THIN_VERT_BANDS = 12; //FillPatternType.THIN_VERT_BANDS.getCode();
-
-    /**
-     * Fill Pattern: Thin backward diagonal
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_BACKWARD_DIAG} instead.
-     */
-    @Removal(version="3.17")
-    short THIN_BACKWARD_DIAG = 13; //FillPatternType.THIN_BACKWARD_DIAG.getCode();
-
-    /**
-     * Fill Pattern: Thin forward diagonal
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#THIN_FORWARD_DIAG} instead.
-     */
-    @Removal(version="3.17")
-    short THIN_FORWARD_DIAG = 14; //FillPatternType.THIN_FORWARD_DIAG.getCode();
-
-    /**
-     * Fill Pattern: Squares
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#SQUARES} instead.
-     */
-    @Removal(version="3.17")
-    short SQUARES = 15; //FillPatternType.SQUARES.getCode();
-
-    /**
-     * Fill Pattern: Diamonds
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#DIAMONDS} instead.
-     */
-    @Removal(version="3.17")
-    short DIAMONDS = 16; //FillPatternType.DIAMONDS.getCode();
-
-    /**
-     * Fill Pattern: Less Dots
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#LESS_DOTS} instead.
-     */
-    @Removal(version="3.17")
-    short LESS_DOTS = 17; //FillPatternType.LESS_DOTS.getCode();
-
-    /**
-     * Fill Pattern: Least Dots
-     * @deprecated 3.15 beta 3. Use {@link FillPatternType#LEAST_DOTS} instead.
-     */
-    @Removal(version="3.17")
-    short LEAST_DOTS = 18; //FillPatternType.LEAST_DOTS.getCode();
-
-    /**
-     * get the index within the Workbook (sequence within the collection of ExtnededFormat objects)
-     * @return unique index number of the underlying record this style represents (probably you don't care
-     *  unless you're comparing which one is which)
-     */
-
-    short getIndex();
-
-    /**
-     * set the data format (must be a valid format)
-     * @see DataFormat
-     */
-
-    void setDataFormat(short fmt);
-
-    /**
-     * get the index of the format
-     * @see DataFormat
-     */
-    short getDataFormat();
-
-    /**
-     * Get the format string
-     */
-    String getDataFormatString();
-
-    /**
-     * set the font for this style
-     * @param font  a font object created or retrieved from the Workbook object
-     * @see Workbook#createFont()
-     * @see Workbook#getFontAt(short)
-     */
-
-    void setFont(Font font);
-
-    /**
-     * gets the index of the font for this style
-     * @see Workbook#getFontAt(short)
-     */
-    short getFontIndex();
-
-    /**
-     * set the cell's using this style to be hidden
-     * @param hidden - whether the cell using this style should be hidden
-     */
-
-    void setHidden(boolean hidden);
-
-    /**
-     * get whether the cell's using this style are to be hidden
-     * @return hidden - whether the cell using this style should be hidden
-     */
-
-    boolean getHidden();
-
-    /**
-     * set the cell's using this style to be locked
-     * @param locked - whether the cell using this style should be locked
-     */
-
-    void setLocked(boolean locked);
-
-    /**
-     * get whether the cell's using this style are to be locked
-     * @return hidden - whether the cell using this style should be locked
-     */
-
-    boolean getLocked();
-    
-    /**
-     * Turn on or off "Quote Prefix" or "123 Prefix" for the style,
-     *  which is used to tell Excel that the thing which looks like
-     *  a number or a formula shouldn't be treated as on.
-     * Turning this on is somewhat (but not completely, see {@link IgnoredErrorType})
-     *  like prefixing the cell value with a ' in Excel
-     */
-    void setQuotePrefixed(boolean quotePrefix);
-    
-    /**
-     * Is "Quote Prefix" or "123 Prefix" enabled for the cell?
-     * Having this on is somewhat (but not completely, see {@link IgnoredErrorType})
-     *  like prefixing the cell value with a ' in Excel
-     */
-    boolean getQuotePrefixed();
-
-    /**
-     * set the type of horizontal alignment for the cell
-     * @param align - the type of alignment
-     * @see #ALIGN_GENERAL
-     * @see #ALIGN_LEFT
-     * @see #ALIGN_CENTER
-     * @see #ALIGN_RIGHT
-     * @see #ALIGN_FILL
-     * @see #ALIGN_JUSTIFY
-     * @see #ALIGN_CENTER_SELECTION
-     * @deprecated POI 3.15 beta 3. Use {@link #setAlignment(HorizontalAlignment)} instead.
-     */
-    void setAlignment(short align);
-    /**
-     * set the type of horizontal alignment for the cell
-     * @param align - the type of alignment
-     */
-    void setAlignment(HorizontalAlignment align);
-
-    /**
-     * get the type of horizontal alignment for the cell
-     * @return align - the type of alignment
-     * @see #ALIGN_GENERAL
-     * @see #ALIGN_LEFT
-     * @see #ALIGN_CENTER
-     * @see #ALIGN_RIGHT
-     * @see #ALIGN_FILL
-     * @see #ALIGN_JUSTIFY
-     * @see #ALIGN_CENTER_SELECTION
-     * @deprecated POI 3.15 beta 3. Use {@link #getAlignmentEnum()} instead.
-     */
-    short getAlignment();
-    /**
-     * get the type of horizontal alignment for the cell
-     * @return align - the type of alignment
-     */
-    HorizontalAlignment getAlignmentEnum();
-
-    /**
-     * Set whether the text should be wrapped.
-     * Setting this flag to <code>true</code> make all content visible
-     * within a cell by displaying it on multiple lines
-     *
-     * @param wrapped  wrap text or not
-     */
-
-    void setWrapText(boolean wrapped);
-
-    /**
-     * get whether the text should be wrapped
-     * @return wrap text or not
-     */
-
-    boolean getWrapText();
-
-    /**
-     * set the type of vertical alignment for the cell
-     * @param align the type of alignment
-     * @see #VERTICAL_TOP
-     * @see #VERTICAL_CENTER
-     * @see #VERTICAL_BOTTOM
-     * @see #VERTICAL_JUSTIFY
-     * @deprecated POI 3.15 beta 3. Use {@link #setVerticalAlignment(VerticalAlignment)} instead.
-     */
-    void setVerticalAlignment(short align);
-    /**
-     * set the type of vertical alignment for the cell
-     * @param align the type of alignment
-     */
-    void setVerticalAlignment(VerticalAlignment align);
-
-    /**
-     * get the type of vertical alignment for the cell
-     * @return align the type of alignment
-     * @see #VERTICAL_TOP
-     * @see #VERTICAL_CENTER
-     * @see #VERTICAL_BOTTOM
-     * @see #VERTICAL_JUSTIFY
-     * @deprecated POI 3.15 beta 3. Use {@link #getVerticalAlignmentEnum()} instead.
-     */
-    short getVerticalAlignment();
-    /**
-     * get the type of vertical alignment for the cell
-     * @return align the type of alignment
-     */
-    VerticalAlignment getVerticalAlignmentEnum();
-
-    /**
-     * set the degree of rotation for the text in the cell.
-     *
-     * Note: HSSF uses values from -90 to 90 degrees, whereas XSSF 
-     * uses values from 0 to 180 degrees. The implementations of this method will map between these two value-ranges 
-     * accordingly, however the corresponding getter is returning values in the range mandated by the current type
-     * of Excel file-format that this CellStyle is applied to.
-     *
-     * @param rotation degrees (see note above)
-     */
-    void setRotation(short rotation);
-
-    /**
-     * get the degree of rotation for the text in the cell.
-     *
-     * Note: HSSF uses values from -90 to 90 degrees, whereas XSSF 
-     * uses values from 0 to 180 degrees. The implementations of this method will map between these two value-ranges 
-     * value-range as used by the type of Excel file-format that this CellStyle is applied to.
-     *
-     * @return rotation degrees (see note above)
-     */
-    short getRotation();
-
-    /**
-     * set the number of spaces to indent the text in the cell
-     * @param indent - number of spaces
-     */
-
-    void setIndention(short indent);
-
-    /**
-     * get the number of spaces to indent the text in the cell
-     * @return indent - number of spaces
-     */
-
-    short getIndention();
-
-    /**
-     * set the type of border to use for the left border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)} instead
-     */
-    @Removal(version="3.17")
-    void setBorderLeft(short border);
-    
-    /**
-     * set the type of border to use for the left border of the cell
-     * @param border type
-     * @since POI 3.15
-     */
-    void setBorderLeft(BorderStyle border);
-
-    /**
-     * get the type of border to use for the left border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Use {@link #getBorderLeftEnum()} instead.
-     * This will return a BorderStyle enum in the future.
-     */
-    short getBorderLeft();
-    /**
-     * get the type of border to use for the left border of the cell
-     * @return border type
-     * @since POI 3.15
-     */
-    BorderStyle getBorderLeftEnum();
-
-    /**
-     * set the type of border to use for the right border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)} instead
-     */
-    @Removal(version="3.17")
-    void setBorderRight(short border);
-    
-    /**
-     * set the type of border to use for the right border of the cell
-     * @param border type
-     * @since POI 3.15
-     */
-    void setBorderRight(BorderStyle border);
-
-    /**
-     * get the type of border to use for the right border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Use {@link #getBorderRightEnum()} instead.
-     * This will return a BorderStyle enum in the future.
-     */
-    short getBorderRight();
-    /**
-     * get the type of border to use for the right border of the cell
-     * @return border type
-     * @since POI 3.15
-     */
-    BorderStyle getBorderRightEnum();
-
-    /**
-     * set the type of border to use for the top border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)} instead
-     */
-    @Removal(version="3.17")
-    void setBorderTop(short border);
-    
-    /**
-     * set the type of border to use for the top border of the cell
-     * @param border type
-     * @since POI 3.15
-     */
-    void setBorderTop(BorderStyle border);
-
-    /**
-     * get the type of border to use for the top border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Use {@link #getBorderTopEnum()} instead.
-     * This will return a BorderStyle enum in the future.
-     */
-    short getBorderTop();
-    /**
-     * get the type of border to use for the top border of the cell
-     * @return border type
-     * @since POI 3.15
-     */
-    BorderStyle getBorderTopEnum();
-
-    /**
-     * set the type of border to use for the bottom border of the cell
-     * @param border type
-     * @see #BORDER_NONE
-     * @see #BORDER_THIN
-     * @see #BORDER_MEDIUM
-     * @see #BORDER_DASHED
-     * @see #BORDER_DOTTED
-     * @see #BORDER_THICK
-     * @see #BORDER_DOUBLE
-     * @see #BORDER_HAIR
-     * @see #BORDER_MEDIUM_DASHED
-     * @see #BORDER_DASH_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT
-     * @see #BORDER_DASH_DOT_DOT
-     * @see #BORDER_MEDIUM_DASH_DOT_DOT
-     * @see #BORDER_SLANTED_DASH_DOT
-     * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)} instead.
-     */
-    @Removal(version="3.17")
-    void setBorderBottom(short border);
-    
-    /**
-     * set the type of border to use for the bottom border of the cell
-     * @param border type
-     * @since POI 3.15
-     */
-    void setBorderBottom(BorderStyle border);
-
-    /**
-     * get the type of border to use for the bottom border of the cell
-     * @return border type
-     * @deprecated POI 3.15. Use {@link #getBorderBottomEnum()} instead.
-     * This will return a BorderStyle enum in the future.
-     */
-    short getBorderBottom();
-    /**
-     * get the type of border to use for the bottom border of the cell
-     * @return border type
-     * @since POI 3.15
-     */
-    BorderStyle getBorderBottomEnum();
-
-    /**
-     * set the color to use for the left border
-     * @param color The index of the color definition
-     */
-    void setLeftBorderColor(short color);
-
-    /**
-     * get the color to use for the left border
-     */
-    short getLeftBorderColor();
-
-    /**
-     * set the color to use for the right border
-     * @param color The index of the color definition
-     */
-    void setRightBorderColor(short color);
-
-    /**
-     * get the color to use for the left border
-     * @return the index of the color definition
-     */
-    short getRightBorderColor();
-
-    /**
-     * set the color to use for the top border
-     * @param color The index of the color definition
-     */
-    void setTopBorderColor(short color);
-
-    /**
-     * get the color to use for the top border
-     * @return the index of the color definition
-     */
-    short getTopBorderColor();
-
-    /**
-     * set the color to use for the bottom border
-     * @param color The index of the color definition
-     */
-    void setBottomBorderColor(short color);
-
-    /**
-     * get the color to use for the left border
-     * @return the index of the color definition
-     */
-    short getBottomBorderColor();
-
-    /**
-     * setting to one fills the cell with the foreground color... No idea about
-     * other values
-     *
-     * @see #NO_FILL
-     * @see #SOLID_FOREGROUND
-     * @see #FINE_DOTS
-     * @see #ALT_BARS
-     * @see #SPARSE_DOTS
-     * @see #THICK_HORZ_BANDS
-     * @see #THICK_VERT_BANDS
-     * @see #THICK_BACKWARD_DIAG
-     * @see #THICK_FORWARD_DIAG
-     * @see #BIG_SPOTS
-     * @see #BRICKS
-     * @see #THIN_HORZ_BANDS
-     * @see #THIN_VERT_BANDS
-     * @see #THIN_BACKWARD_DIAG
-     * @see #THIN_FORWARD_DIAG
-     * @see #SQUARES
-     * @see #DIAMONDS
-     *
-     * @param fp  fill pattern (set to 1 to fill w/foreground color)
-     * @deprecated POI 3.15 beta 3. Use {@link #setFillPattern(FillPatternType)} instead.
-     */
-    void setFillPattern(short fp);
-    /**
-     * setting to one fills the cell with the foreground color... No idea about
-     * other values
-     *
-     * @see #NO_FILL
-     * @see #SOLID_FOREGROUND
-     * @see #FINE_DOTS
-     * @see #ALT_BARS
-     * @see #SPARSE_DOTS
-     * @see #THICK_HORZ_BANDS
-     * @see #THICK_VERT_BANDS
-     * @see #THICK_BACKWARD_DIAG
-     * @see #THICK_FORWARD_DIAG
-     * @see #BIG_SPOTS
-     * @see #BRICKS
-     * @see #THIN_HORZ_BANDS
-     * @see #THIN_VERT_BANDS
-     * @see #THIN_BACKWARD_DIAG
-     * @see #THIN_FORWARD_DIAG
-     * @see #SQUARES
-     * @see #DIAMONDS
-     *
-     * @param fp  fill pattern (set to {@link FillPatternType#SOLID_FOREGROUND} to fill w/foreground color)
-     * @since POI 3.15 beta 3
-     */
-    void setFillPattern(FillPatternType fp);
-
-    /**
-     * get the fill pattern (??) - set to 1 to fill with foreground color
-     * @return fill pattern
-     * @deprecated POI 3.15 beta 3. This method will return {@link FillPatternType} in the future. Use {@link #setFillPattern(FillPatternType)} instead.
-     */
-    short getFillPattern();
-    /**
-     * get the fill pattern (??) - set to 1 to fill with foreground color
-     * @return fill pattern
-     * @since POI 3.15 beta 3
-     */
-    FillPatternType getFillPatternEnum();
-
-    /**
-     * set the background fill color.
-     *
-     * @param bg  color
-     */
-
-    void setFillBackgroundColor(short bg);
-
-    /**
-     * get the background fill color, if the fill
-     *  is defined with an indexed color.
-     * @return fill color index, or 0 if not indexed (XSSF only)
-     */
-    short getFillBackgroundColor();
-    
-    /**
-     * Gets the color object representing the current
-     *  background fill, resolving indexes using
-     *  the supplied workbook.
-     * This will work for both indexed and rgb
-     *  defined colors. 
-     */
-    Color getFillBackgroundColorColor();
-
-    /**
-     * set the foreground fill color
-     * <i>Note: Ensure Foreground color is set prior to background color.</i>
-     * @param bg  color
-     */
-    void setFillForegroundColor(short bg);
-
-    /**
-     * get the foreground fill color, if the fill  
-     *  is defined with an indexed color.
-     * @return fill color, or 0 if not indexed (XSSF only)
-     */
-    short getFillForegroundColor();
-    
-    /**
-     * Gets the color object representing the current
-     *  foreground fill, resolving indexes using
-     *  the supplied workbook.
-     * This will work for both indexed and rgb
-     *  defined colors. 
-     */
-    Color getFillForegroundColorColor();
-
-    /**
-     * Clones all the style information from another
-     *  CellStyle, onto this one. This 
-     *  CellStyle will then have all the same
-     *  properties as the source, but the two may
-     *  be edited independently.
-     * Any stylings on this CellStyle will be lost! 
-     *  
-     * The source CellStyle could be from another
-     *  Workbook if you like. This allows you to
-     *  copy styles from one Workbook to another.
-     *
-     * However, both of the CellStyles will need
-     *  to be of the same type (HSSFCellStyle or
-     *  XSSFCellStyle)
-     */
-    void cloneStyleFrom(CellStyle source);
-    
-    /**
-     * Controls if the Cell should be auto-sized
-     *  to shrink to fit if the text is too long
-     */
-    void setShrinkToFit(boolean shrinkToFit);
-
-    /**
-     * Should the Cell be auto-sized by Excel to shrink
-     *  it to fit if this text is too long?
-     */
-    boolean getShrinkToFit();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/CellType.java b/trunk/src/java/org/apache/poi/ss/usermodel/CellType.java
deleted file mode 100644
index c8e81c9..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/CellType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.util.Internal;
-
-/**
- * @since POI 3.15 beta 3
- */
-public enum CellType {
-    /**
-     * Unknown type, used to represent a state prior to initialization or the
-     * lack of a concrete type.
-     * For internal use only.
-     */
-    @Internal(since="POI 3.15 beta 3")
-    _NONE(-1),
-
-    /**
-     * Numeric cell type (whole numbers, fractional numbers, dates)
-     */
-    NUMERIC(0),
-    
-    /** String (text) cell type */
-    STRING(1),
-    
-    /**
-     * Formula cell type
-     * @see FormulaType
-     */
-    FORMULA(2),
-    
-    /**
-     * Blank cell type
-     */
-    BLANK(3),
-    
-    /**
-     * Boolean cell type
-     */
-    BOOLEAN(4),
-    
-    /**
-     * Error cell type
-     * @see FormulaError
-     */
-    ERROR(5);
-
-    /**
-     * @since POI 3.15 beta 3
-     * @deprecated POI 3.15 beta 3
-     */
-    private final int code;
-    
-    /**
-     * @since POI 3.15 beta 3
-     * @deprecated POI 3.15 beta 3
-     */
-    private CellType(int code) {
-        this.code = code;
-    }
-    
-    /**
-     * @since POI 3.15 beta 3.
-     * @deprecated POI 3.15 beta 3. Used to transition code from <code>int</code>s to <code>CellType</code>s.
-     */
-    public static CellType forInt(int code) {
-        for (CellType type : values()) {
-            if (type.code == code) {
-                return type;
-            }
-        }
-        throw new IllegalArgumentException("Invalid CellType code: " + code);
-    }
-    
-    /**
-     * @since POI 3.15 beta 3
-     * @deprecated POI 3.15 beta 3
-     */
-    public int getCode() {
-        return code;
-    }
-    
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java b/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java
deleted file mode 100644
index 78636d9..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-
-/**
- * Mimics the 'data view' of a cell. This allows formula evaluator
- * to return a CellValue instead of precasting the value to String
- * or Number or boolean type.
- */
-public final class CellValue {
-	public static final CellValue TRUE = new CellValue(CellType.BOOLEAN, 0.0, true,  null, 0);
-	public static final CellValue FALSE= new CellValue(CellType.BOOLEAN, 0.0, false, null, 0);
-
-	private final CellType _cellType;
-	private final double _numberValue;
-	private final boolean _booleanValue;
-	private final String _textValue;
-	private final int _errorCode;
-
-	private CellValue(CellType cellType, double numberValue, boolean booleanValue,
-			String textValue, int errorCode) {
-		_cellType = cellType;
-		_numberValue = numberValue;
-		_booleanValue = booleanValue;
-		_textValue = textValue;
-		_errorCode = errorCode;
-	}
-
-
-	public CellValue(double numberValue) {
-		this(CellType.NUMERIC, numberValue, false, null, 0);
-	}
-
-	public static CellValue valueOf(boolean booleanValue) {
-		return booleanValue ? TRUE : FALSE;
-	}
-
-	public CellValue(String stringValue) {
-		this(CellType.STRING, 0.0, false, stringValue, 0);
-	}
-
-	public static CellValue getError(int errorCode) {
-		return new CellValue(CellType.ERROR, 0.0, false, null, errorCode);
-	}
-
-
-	/**
-	 * @return Returns the booleanValue.
-	 */
-	public boolean getBooleanValue() {
-		return _booleanValue;
-	}
-
-	/**
-	 * @return Returns the numberValue.
-	 */
-	public double getNumberValue() {
-		return _numberValue;
-	}
-
-	/**
-	 * @return Returns the stringValue.
-	 */
-	public String getStringValue() {
-		return _textValue;
-	}
-
-    /**
-     * Return the cell type.
-     *
-     * @return the cell type
-     * @since POI 3.15
-     * Will be renamed to <code>getCellTypeEnum()</code> when we make the CellType enum transition in POI 4.0. See bug 59791.
-     */
-    @Removal(version="4.2")
-    public CellType getCellTypeEnum() {
-        return _cellType;
-    }
-
-	/**
-	 * Return the cell type.
-	 *
-	 * Will return {@link CellType} in version 4.0 of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return the cell type
-	 *
-	 * @deprecated POI 3.15. Use {@link #getCellTypeEnum()} instead.
-	 */
-	@Deprecated
-	public int getCellType() {
-		return _cellType.getCode();
-	}
-
-	/**
-	 * @return Returns the errorValue.
-	 */
-	public byte getErrorValue() {
-		return (byte) _errorCode;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer(64);
-		sb.append(getClass().getName()).append(" [");
-		sb.append(formatAsString());
-		sb.append("]");
-		return sb.toString();
-	}
-
-	public String formatAsString() {
-		switch (_cellType) {
-			case NUMERIC:
-				return String.valueOf(_numberValue);
-			case STRING:
-				return '"' + _textValue + '"';
-			case BOOLEAN:
-				return _booleanValue ? "TRUE" : "FALSE";
-			case ERROR:
-				return ErrorEval.getText(_errorCode);
-			default:
-			return "<error unexpected cell type " + _cellType + ">";
-		}
-		
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Chart.java b/trunk/src/java/org/apache/poi/ss/usermodel/Chart.java
deleted file mode 100644
index f8a55a2..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Chart.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.charts.ChartData;
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ChartLegend;
-import org.apache.poi.ss.usermodel.charts.ManuallyPositionable;
-import org.apache.poi.ss.usermodel.charts.ChartDataFactory;
-import org.apache.poi.ss.usermodel.charts.ChartAxisFactory;
-
-/**
- * High level representation of a chart.
- *
- * @author Roman Kashitsyn
- */
-public interface Chart extends ManuallyPositionable {
-	
-	/**
-	 * @return an appropriate ChartDataFactory implementation
-	 */
-	ChartDataFactory getChartDataFactory();
-
-	/**
-	 * @return an appropriate ChartAxisFactory implementation
-	 */
-	ChartAxisFactory getChartAxisFactory();
-
-	/**
-	 * @return chart legend instance
-	 */
-	ChartLegend getOrCreateLegend();
-
-	/**
-	 * Delete current chart legend.
-	 */
-	void deleteLegend();
-
-	/**
-	 * @return list of all chart axis
-	 */
-	List<? extends ChartAxis> getAxis();
-
-	/**
-	 * Plots specified data on the chart.
-	 *
-	 * @param data a data to plot
-	 */
-	void plot(ChartData data, ChartAxis... axis);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java b/trunk/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
deleted file mode 100644
index 702970c..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-
-/**
- * A client anchor is attached to an excel worksheet.  It anchors against a
- * top-left and bottom-right cell.
- *
- * @author Yegor Kozlov
- */
-public interface ClientAnchor {
-    
-    /**
-     * Move and Resize With Anchor Cells
-     * <p>
-     * Specifies that the current drawing shall move and
-     * resize to maintain its row and column anchors (i.e. the
-     * object is anchored to the actual from and to row and column)
-     * </p>
-     * @deprecated since POI 3.14beta1 (circa 2015-11-24). Use {@link AnchorType#MOVE_AND_RESIZE} instead.
-     */
-    @Removal(version="3.17")
-    public static final AnchorType MOVE_AND_RESIZE = AnchorType.MOVE_AND_RESIZE;
-    
-    /**
-     * Move With Cells but Do Not Resize
-     * <p>
-     * Specifies that the current drawing shall move with its
-     * row and column (i.e. the object is anchored to the
-     * actual from row and column), but that the size shall remain absolute.
-     * </p>
-     * <p>
-     * If additional rows/columns are added between the from and to locations of the drawing,
-     * the drawing shall move its to anchors as needed to maintain this same absolute size.
-     * </p>
-     * @deprecated since POI 3.14beta1 (circa 2015-11-24). Use {@link AnchorType#MOVE_DONT_RESIZE} instead.
-     */
-    @Removal(version="3.17")
-    public static final AnchorType MOVE_DONT_RESIZE = AnchorType.MOVE_DONT_RESIZE;
-
-    /**
-     * Do Not Move or Resize With Underlying Rows/Columns
-     * <p>
-     * Specifies that the current start and end positions shall
-     * be maintained with respect to the distances from the
-     * absolute start point of the worksheet.
-     * </p>
-     * <p>
-     * If additional rows/columns are added before the
-     * drawing, the drawing shall move its anchors as needed
-     * to maintain this same absolute position.
-     * </p>
-     * @deprecated since POI 3.14beta1 (circa 2015-11-24). Use {@link AnchorType#DONT_MOVE_AND_RESIZE} instead.
-     */
-    @Removal(version="3.17")
-    public static final AnchorType DONT_MOVE_AND_RESIZE = AnchorType.DONT_MOVE_AND_RESIZE;
-    
-    /**
-     * @since POI 3.14beta1
-     */
-    public static enum AnchorType {
-        /**
-         * Move and Resize With Anchor Cells (0)
-         * <p>
-         * Specifies that the current drawing shall move and
-         * resize to maintain its row and column anchors (i.e. the
-         * object is anchored to the actual from and to row and column)
-         * </p>
-         */
-        MOVE_AND_RESIZE(0),
-        
-        /**
-         * Don't Move but do Resize With Anchor Cells (1)
-         * <p>
-         * Specifies that the current drawing shall not move with its
-         * row and column, but should be resized. This option is not normally
-         * used, but is included for completeness.
-         * </p>
-         */
-        DONT_MOVE_DO_RESIZE(1),
-        
-        /**
-         * Move With Cells but Do Not Resize (2)
-         * <p>
-         * Specifies that the current drawing shall move with its
-         * row and column (i.e. the object is anchored to the
-         * actual from row and column), but that the size shall remain absolute.
-         * </p>
-         * <p>
-         * If additional rows/columns are added between the from and to locations of the drawing,
-         * the drawing shall move its to anchors as needed to maintain this same absolute size.
-         * </p>
-         */
-        MOVE_DONT_RESIZE(2),
-        
-        /**
-         * Do Not Move or Resize With Underlying Rows/Columns (3)
-         * <p>
-         * Specifies that the current start and end positions shall
-         * be maintained with respect to the distances from the
-         * absolute start point of the worksheet.
-         * </p>
-         * <p>
-         * If additional rows/columns are added before the
-         * drawing, the drawing shall move its anchors as needed
-         * to maintain this same absolute position.
-         * </p>
-         */
-        DONT_MOVE_AND_RESIZE(3);
-        
-        public final short value;
-
-        // disallow non-sequential enum instance creation
-        private AnchorType(int value) {
-            this.value = (short) value;
-        }
-        
-        /**
-         * return the AnchorType corresponding to the code
-         *
-         * @param value the anchor type code
-         * @return the anchor type enum
-         */
-        @Internal
-        public static AnchorType byId(int value) {
-            return values()[value];
-        }
-    }
-    
-    /**
-     * Returns the column (0 based) of the first cell.
-     *
-     * @return 0-based column of the first cell.
-     */
-    public short getCol1();
-
-    /**
-     * Sets the column (0 based) of the first cell.
-     *
-     * @param col1 0-based column of the first cell.
-     */
-    public void setCol1(int col1);
-
-    /**
-     * Returns the column (0 based) of the second cell.
-     *
-     * @return 0-based column of the second cell.
-     */
-    public short getCol2();
-
-    /**
-     * Returns the column (0 based) of the second cell.
-     *
-     * @param col2 0-based column of the second cell.
-     */
-    public void setCol2(int col2);
-
-    /**
-     * Returns the row (0 based) of the first cell.
-     *
-     * @return 0-based row of the first cell.
-     */
-    public int getRow1();
-
-    /**
-     * Returns the row (0 based) of the first cell.
-     *
-     * @param row1 0-based row of the first cell.
-     */
-    public void setRow1(int row1);
-
-    /**
-     * Returns the row (0 based) of the second cell.
-     *
-     * @return 0-based row of the second cell.
-     */
-    public int getRow2();
-
-    /**
-     * Returns the row (0 based) of the first cell.
-     *
-     * @param row2 0-based row of the first cell.
-     */
-    public void setRow2(int row2);
-
-    /**
-     * Returns the x coordinate within the first cell.
-     * 
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @return the x coordinate within the first cell
-     */
-    public int getDx1();
-
-    /**
-     * Sets the x coordinate within the first cell
-     *
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @param dx1 the x coordinate within the first cell
-     */
-    public void setDx1(int dx1);
-
-    /**
-     * Returns the y coordinate within the first cell
-     *
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @return the y coordinate within the first cell
-     */
-    public int getDy1();
-
-    /**
-     * Sets the y coordinate within the first cell
-     *
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @param dy1 the y coordinate within the first cell
-     */
-    public void setDy1(int dy1);
-
-    /**
-     * Sets the y coordinate within the second cell
-     *
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @return the y coordinate within the second cell
-     */
-    public int getDy2();
-
-    /**
-     * Sets the y coordinate within the second cell
-     *
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @param dy2 the y coordinate within the second cell
-     */
-    public void setDy2(int dy2);
-
-    /**
-     * Returns the x coordinate within the second cell
-     *
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @return the x coordinate within the second cell
-     */
-    public int getDx2();
-
-    /**
-     * Sets the x coordinate within the second cell
-     *
-     * Note - XSSF and HSSF have a slightly different coordinate
-     *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
-     *
-     * @param dx2 the x coordinate within the second cell
-     */
-    public void setDx2(int dx2);
-
-
-    /**
-     * Sets the anchor type
-     * @param anchorType the anchor type to set
-     * @since POI 3.14
-     */
-    public void setAnchorType( AnchorType anchorType );
-    /**
-     * Sets the anchor type
-     * @param anchorType the anchor type to set
-     * @deprecated POI 3.15. Use {@link #setAnchorType(AnchorType)} instead.
-     */
-    @Removal(version="3.17")
-    public void setAnchorType( int anchorType );
-
-    /**
-     * Gets the anchor type
-     * Changed from returning an int to an enum in POI 3.14 beta 1.
-     * @return the anchor type
-     */
-    public AnchorType getAnchorType();
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Color.java b/trunk/src/java/org/apache/poi/ss/usermodel/Color.java
deleted file mode 100644
index 29555a1..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Color.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-public interface Color {
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
deleted file mode 100644
index 4d6f58b..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.hssf.record.cf.Threshold;
-
-/**
- * High level representation for the Color Scale / Colour Scale /
- *  Color Gradient Formatting component of Conditional Formatting settings
- */
-public interface ColorScaleFormatting {
-    /**
-     * How many control points should be used to map 
-     *  the colours? Normally 2 or 3
-     */
-    int getNumControlPoints();
-    /**
-     * Sets the number of control points to use to map
-     *  the colours. Should normally be 2 or 3.
-     * <p>After updating, you need to ensure that the
-     *  {@link Threshold} count and Color count match
-     */
-    void setNumControlPoints(int num);
-
-    /**
-     * Gets the list of colours that are interpolated
-     *  between.
-     */
-    Color[] getColors();
-    /**
-     * Sets the list of colours that are interpolated
-     *  between. The number must match {@link #getNumControlPoints()}
-     */
-    void setColors(Color[] colors);
-    
-    /**
-     * Gets the list of thresholds
-     */
-    ConditionalFormattingThreshold[] getThresholds();
-    /**
-     * Sets the of thresholds. The number must match
-     *  {@link #getNumControlPoints()}
-     */
-    void setThresholds(ConditionalFormattingThreshold[] thresholds);
-    /**
-     * Creates a new, empty Threshold
-     */
-    ConditionalFormattingThreshold createThreshold();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Comment.java b/trunk/src/java/org/apache/poi/ss/usermodel/Comment.java
deleted file mode 100644
index c39040c..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Comment.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.util.CellAddress;
-
-public interface Comment {
-
-    /**
-     * Sets whether this comment is visible.
-     *
-     * @param visible <code>true</code> if the comment is visible, <code>false</code> otherwise
-     */
-    void setVisible(boolean visible);
-
-    /**
-     * Returns whether this comment is visible.
-     *
-     * @return <code>true</code> if the comment is visible, <code>false</code> otherwise
-     */
-    boolean isVisible();
-    
-    /**
-     * Get the address of the cell that this comment is attached to
-     *
-     * @return comment cell address
-     * @since 3.15-beta1
-     */
-    CellAddress getAddress();
-    
-    /**
-     * Set the address of the cell that this comment is attached to
-     *
-     * @param addr
-     * @since 3.15-beta1
-     */
-    void setAddress(CellAddress addr);
-    
-    /**
-     * Set the address of the cell that this comment is attached to
-     *
-     * @param row
-     * @param col
-     * @since 3.15-beta1
-     */
-    void setAddress(int row, int col);
-
-    /**
-     * Return the row of the cell that contains the comment
-     *
-     * @return the 0-based row of the cell that contains the comment
-     */
-    int getRow();
-
-    /**
-     * Set the row of the cell that contains the comment
-     *
-     * @param row the 0-based row of the cell that contains the comment
-     */
-    void setRow(int row);
-
-    /**
-     * Return the column of the cell that contains the comment
-     *
-     * @return the 0-based column of the cell that contains the comment
-     */
-    int getColumn();
-
-    /**
-     * Set the column of the cell that contains the comment
-     *
-     * @param col the 0-based column of the cell that contains the comment
-     */
-    void setColumn(int col);
-
-    /**
-     * Name of the original comment author
-     *
-     * @return the name of the original author of the comment
-     */
-    String getAuthor();
-
-    /**
-     * Name of the original comment author
-     *
-     * @param author the name of the original author of the comment
-     */
-    void setAuthor(String author);
-    
-    /**
-     * Fetches the rich text string of the comment
-     */
-    public RichTextString getString();
-
-    /**
-     * Sets the rich text string used by this comment.
-     *
-     * @param string    Sets the rich text string used by this object.
-     */
-    void setString(RichTextString string);
-
-    /**
-     * Return defines position of this anchor in the sheet.
-     * The anchor is the yellow box/balloon that is rendered on top of the sheets
-     * when the comment is visible.
-     * 
-     * To associate a comment with a different cell, use {@link #setAddress}.
-     *
-     * @return defines position of this anchor in the sheet
-     */
-    public ClientAnchor getClientAnchor();
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ComparisonOperator.java b/trunk/src/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
deleted file mode 100644
index 7eee789..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * The conditional format operators used for "Highlight Cells That Contain..." rules.
- * <p>
- * For example, "highlight cells that begin with "M2" and contain "Mountain Gear".
- * </p>
- */
-public final class ComparisonOperator {
-    public static final byte NO_COMPARISON = 0;
-
-    /**
-     * 'Between' operator
-     */
-    public static final byte BETWEEN       = 1;
-
-    /**
-     * 'Not between' operator
-     */
-    public static final byte NOT_BETWEEN   = 2;
-
-    /**
-     *  'Equal to' operator
-     */
-    public static final byte EQUAL         = 3;
-
-    /**
-     * 'Not equal to' operator
-     */
-    public static final byte NOT_EQUAL     = 4;
-
-    /**
-     * 'Greater than' operator
-     */
-    public static final byte GT            = 5;
-
-    /**
-     * 'Less than' operator
-     */
-    public static final byte LT            = 6;
-
-    /**
-     * 'Greater than or equal to' operator
-     */
-    public static final byte GE            = 7;
-
-    /**
-     * 'Less than or equal to' operator
-     */
-    public static final byte LE            = 8;
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java b/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java
deleted file mode 100644
index 8bd6141..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents a type of a conditional formatting rule
- */
-public class ConditionType {
-    private static Map<Integer,ConditionType> lookup = new HashMap<Integer, ConditionType>();
-    
-    /**
-     * This conditional formatting rule compares a cell value
-     * to a formula calculated result, using an operator
-     */
-    public static final ConditionType CELL_VALUE_IS = 
-            new ConditionType(1, "cellIs");
-
-    /**
-     * This conditional formatting rule contains a formula to evaluate.
-     * When the formula result is true, the cell is highlighted.
-     */
-    public static final ConditionType FORMULA = 
-            new ConditionType(2, "expression");
-    
-    /**
-     * This conditional formatting rule contains a color scale,
-     * with the cell background set according to a gradient.
-     */
-    public static final ConditionType COLOR_SCALE = 
-            new ConditionType(3, "colorScale");
-    
-    /**
-     * This conditional formatting rule sets a data bar, with the
-     *  cell populated with bars based on their values
-     */
-    public static final ConditionType DATA_BAR = 
-            new ConditionType(4, "dataBar");
-    
-    /**
-     * This conditional formatting rule that files the values
-     */
-    public static final ConditionType FILTER = 
-            new ConditionType(5, null);
-    
-    /**
-     * This conditional formatting rule sets a data bar, with the
-     *  cell populated with bars based on their values
-     */
-    public static final ConditionType ICON_SET = 
-            new ConditionType(6, "iconSet");
-    
-    
-    public final byte id;
-    public final String type;
-
-    public String toString() {
-        return id + " - " + type;
-    }
-    
-    
-    public static ConditionType forId(byte id) {
-        return forId((int)id);
-    }
-    public static ConditionType forId(int id) {
-        return lookup.get(id);
-    }
-        
-    private ConditionType(int id, String type) {
-        this.id = (byte)id; this.type = type;
-        lookup.put(id, this);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
deleted file mode 100644
index 09d63a4..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * The ConditionalFormatting class encapsulates all settings of Conditional Formatting.
- *
- * The class can be used
- *
- * <UL>
- * <LI>
- * to make a copy ConditionalFormatting settings.
- * </LI>
- *
- *
- * For example:
- * <PRE>
- * ConditionalFormatting cf = sheet.getConditionalFormattingAt(index);
- * newSheet.addConditionalFormatting(cf);
- * </PRE>
- *
- *  <LI>
- *  or to modify existing Conditional Formatting settings (formatting regions and/or rules).
- *  </LI>
- *  </UL>
- *
- * Use {@link org.apache.poi.ss.usermodel.Sheet#getSheetConditionalFormatting()}
- * to get access to an instance of this class.
- * <P>
- * To create a new Conditional Formatting set use the following approach:
- *
- * <PRE>
- *
- * // Define a Conditional Formatting rule, which triggers formatting
- * // when cell's value is greater or equal than 100.0 and
- * // applies patternFormatting defined below.
- * ConditionalFormattingRule rule = sheet.createConditionalFormattingRule(
- *     ComparisonOperator.GE,
- *     "100.0", // 1st formula
- *     null     // 2nd formula is not used for comparison operator GE
- * );
- *
- * // Create pattern with red background
- * PatternFormatting patternFmt = rule.cretePatternFormatting();
- * patternFormatting.setFillBackgroundColor(IndexedColor.RED.getIndex());
- *
- * // Define a region containing first column
- * Region [] regions =
- * {
- *     new Region(1,(short)1,-1,(short)1)
- * };
- *
- * // Apply Conditional Formatting rule defined above to the regions
- * sheet.addConditionalFormatting(regions, rule);
- * </PRE>
- */
-public interface ConditionalFormatting {
-
-    /**
-     * @return array of <tt>CellRangeAddress</tt>s. Never <code>null</code>
-     */
-    CellRangeAddress[] getFormattingRanges();
-
-    /**
-     * Sets the cell ranges the rule conditional formatting must be applied to.
-     * @param ranges non-null array of <tt>CellRangeAddress</tt>s
-     */
-    void setFormattingRanges(CellRangeAddress[] ranges);
-
-    /**
-     * Replaces an existing Conditional Formatting rule at position idx.
-     * Excel pre-2007 allows to create up to 3 Conditional Formatting rules,
-     *  2007 and later allow unlimited numbers.
-     * This method can be useful to modify existing  Conditional Formatting rules.
-     *
-     * @param idx position of the rule. Should be between 0 and 2 for Excel before 2007, otherwise 0+.
-     * @param cfRule - Conditional Formatting rule
-     */
-    void setRule(int idx, ConditionalFormattingRule cfRule);
-
-    /**
-     * Add a Conditional Formatting rule.
-     * Excel pre-2007 allows to create up to 3 Conditional Formatting rules.
-     *
-     * @param cfRule - Conditional Formatting rule
-     */
-    void addRule(ConditionalFormattingRule cfRule);
-
-    /**
-     * @return the Conditional Formatting rule at position idx.
-     */
-    ConditionalFormattingRule getRule(int idx);
-
-    /**
-     * @return number of Conditional Formatting rules.
-     */
-    int getNumberOfRules();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java b/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
deleted file mode 100644
index 28f5d22..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * Represents a description of a conditional formatting rule
- */
-public interface ConditionalFormattingRule {
-    /**
-     * Create a new border formatting structure if it does not exist,
-     * otherwise just return existing object.
-     *
-     * @return - border formatting object, never returns <code>null</code>.
-     */
-    BorderFormatting createBorderFormatting();
-
-    /**
-     * @return - border formatting object  if defined,  <code>null</code> otherwise
-     */
-    BorderFormatting getBorderFormatting();
-
-    /**
-     * Create a new font formatting structure if it does not exist,
-     * otherwise just return existing object.
-     *
-     * @return - font formatting object, never returns <code>null</code>.
-     */
-    FontFormatting createFontFormatting();
-
-    /**
-     * @return - font formatting object  if defined,  <code>null</code> otherwise
-     */
-    FontFormatting getFontFormatting();
-
-    /**
-     * Create a new pattern formatting structure if it does not exist,
-     * otherwise just return existing object.
-     *
-     * @return - pattern formatting object, never returns <code>null</code>.
-     */
-    PatternFormatting createPatternFormatting();
-
-    /**
-     * @return - pattern formatting object if defined, <code>null</code> otherwise
-     */
-    PatternFormatting getPatternFormatting();
-
-    /**
-     * @return - databar / data-bar formatting object if defined, <code>null</code> otherwise
-     */
-    DataBarFormatting getDataBarFormatting();
-    
-    /**
-     * @return - icon / multi-state formatting object if defined, <code>null</code> otherwise
-     */
-    IconMultiStateFormatting getMultiStateFormatting();
-    
-    /**
-     * @return color scale / color grate formatting object if defined, <code>null</code> otherwise
-     */
-    ColorScaleFormatting getColorScaleFormatting();
-    
-    /**
-     * Type of conditional formatting rule.
-     *
-     * @return the type of condition
-     */
-    ConditionType getConditionType();
-
-    /**
-     * The comparison function used when the type of conditional formatting is set to
-     * {@link ConditionType#CELL_VALUE_IS}
-     * <p>
-     *     MUST be a constant from {@link ComparisonOperator}
-     * </p>
-     *
-     * @return the conditional format operator
-     */
-    byte getComparisonOperation();
-
-    /**
-     * The formula used to evaluate the first operand for the conditional formatting rule.
-     * <p>
-     * If the condition type is {@link ConditionType#CELL_VALUE_IS},
-     * this field is the first operand of the comparison.
-     * If type is {@link ConditionType#FORMULA}, this formula is used
-     * to determine if the conditional formatting is applied.
-     * </p>
-     * <p>
-     * If comparison type is {@link ConditionType#FORMULA} the formula MUST be a Boolean function
-     * </p>
-     *
-     * @return  the first formula
-     */
-    String getFormula1();
-
-    /**
-     * The formula used to evaluate the second operand of the comparison when
-     * comparison type is  {@link ConditionType#CELL_VALUE_IS} and operator
-     * is either {@link ComparisonOperator#BETWEEN} or {@link ComparisonOperator#NOT_BETWEEN}
-     *
-     * @return  the second formula
-     */
-    String getFormula2();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java b/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
deleted file mode 100644
index a5e52b1..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-
-/**
- * The Threshold / CFVO / Conditional Formatting Value Object.
- * <p>This defines how to calculate the ranges for a conditional
- *  formatting rule, eg which values get a Green Traffic Light
- *  icon and which Yellow or Red.</p>
- */
-public interface ConditionalFormattingThreshold {
-    public enum RangeType {
-        /** Number / Parameter */
-        NUMBER(1, "num"),
-        /** The minimum value from the range */
-        MIN(2, "min"),
-        /** The maximum value from the range */
-        MAX(3, "max"),
-        /** Percent of the way from the mi to the max value in the range */
-        PERCENT(4, "percent"),
-        /** The minimum value of the cell that is in X percentile of the range */
-        PERCENTILE(5, "percentile"),
-        UNALLOCATED(6, null),
-        /** Formula result */
-        FORMULA(7, "formula");
-        
-        /** Numeric ID of the type */
-        public final int id;
-        /** Name (system) of the type */
-        public final String name;
-        
-        public String toString() {
-            return id + " - " + name;
-        }
-        
-        public static RangeType byId(int id) {
-            return values()[id-1]; // 1-based IDs
-        }
-        public static RangeType byName(String name) {
-            for (RangeType t : values()) {
-                if (t.name.equals(name)) return t;
-            }
-            return null;
-        }
-        
-        private RangeType(int id, String name) {
-            this.id = id; this.name = name;
-        }
-    }
-    
-    /**
-     * Get the Range Type used
-     */
-    RangeType getRangeType();
-    
-    /**
-     * Changes the Range Type used
-     * 
-     * <p>If you change the range type, you need to
-     *  ensure that the Formula and Value parameters
-     *  are compatible with it before saving</p>
-     */
-    void setRangeType(RangeType type);
-    
-    /**
-     * Formula to use to calculate the threshold,
-     *  or <code>null</code> if no formula 
-     */
-    String getFormula();
-
-    /**
-     * Sets the formula used to calculate the threshold,
-     *  or unsets it if <code>null</code> is given.
-     */
-    void setFormula(String formula);
-    
-    /**
-     * Gets the value used for the threshold, or 
-     *  <code>null</code> if there isn't one.
-     */
-    Double getValue();
-    
-    /**
-     * Sets the value used for the threshold. 
-     * <p>If the type is {@link RangeType#PERCENT} or 
-     *  {@link RangeType#PERCENTILE} it must be between 0 and 100.
-     * <p>If the type is {@link RangeType#MIN} or {@link RangeType#MAX}
-     *  or {@link RangeType#FORMULA} it shouldn't be set.
-     * <p>Use <code>null</code> to unset
-     */
-    void setValue(Double value);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/CreationHelper.java b/trunk/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
deleted file mode 100644
index 53462c1..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.util.Removal;
-
-/**
- * An object that handles instantiating concrete
- *  classes of the various instances one needs for
- *  HSSF and XSSF.
- * Works around a limitation in Java where we
- *  cannot have static methods on interfaces or abstract
- *  classes.
- * This allows you to get the appropriate class for
- *  a given interface, without you having to worry
- *  about if you're dealing with HSSF or XSSF.
- */
-public interface CreationHelper {
-    /**
-     * Creates a new RichTextString instance
-     * @param text The text to initialise the RichTextString with
-     */
-    RichTextString createRichTextString(String text);
-
-    /**
-     * Creates a new DataFormat instance
-     */
-    DataFormat createDataFormat();
-
-    /**
-     * Creates a new Hyperlink, of the given type
-     * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead.
-     */
-    @Removal(version="3.17")
-    @Deprecated
-    Hyperlink createHyperlink(int type);
-    
-    /**
-     * Creates a new Hyperlink, of the given type
-     */
-    Hyperlink createHyperlink(HyperlinkType type);
-
-    /**
-     * Creates FormulaEvaluator - an object that evaluates formula cells.
-     *
-     * @return a FormulaEvaluator instance
-     */
-    FormulaEvaluator createFormulaEvaluator();
-    
-    /**
-     * Creates a XSSF-style Color object, used for extended sheet
-     *  formattings and conditional formattings
-     */
-    ExtendedColor createExtendedColor();
-
-    /**
-     * Creates a ClientAnchor. Use this object to position drawing object in a sheet
-     *
-     * @return a ClientAnchor instance
-     * @see org.apache.poi.ss.usermodel.Drawing
-     */
-    ClientAnchor createClientAnchor();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DataBarFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
deleted file mode 100644
index df9a0fe..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * High level representation for the DataBar Formatting 
- *  component of Conditional Formatting settings
- */
-public interface DataBarFormatting {
-    /**
-     * Is the bar drawn from Left-to-Right, or from
-     *  Right-to-Left
-     */
-    boolean isLeftToRight();
-    /**
-     * Control if the bar is drawn from Left-to-Right,
-     *  or from Right-to-Left
-     */
-    void setLeftToRight(boolean ltr);
-    
-    /**
-     * Should Icon + Value be displayed, or only the Icon?
-     */
-    boolean isIconOnly();
-    /**
-     * Control if only the Icon is shown, or Icon + Value
-     */
-    void setIconOnly(boolean only);
-    
-    /**
-     * How much of the cell width, in %, should be given to
-     *  the min value?
-     */
-    int getWidthMin();
-    void setWidthMin(int width);
-    
-    /**
-     * How much of the cell width, in %, should be given to
-     *  the max value?
-     */
-    int getWidthMax();
-    void setWidthMax(int width);
-    
-    Color getColor();
-    void setColor(Color color);
-    
-    /**
-     * The threshold that defines "everything from here down is minimum"
-     */
-    ConditionalFormattingThreshold getMinThreshold();
-    /**
-     * The threshold that defines "everything from here up is maximum"
-     */
-    ConditionalFormattingThreshold getMaxThreshold();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java b/trunk/src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
deleted file mode 100644
index d40a8d1..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.util.Beta;
-
-/**
- * Enum mapping the values of STDataConsolidateFunction
- */
-@Beta
-public enum DataConsolidateFunction {
-    AVERAGE(1,"Average"),
-    COUNT(2, "Count"),
-    COUNT_NUMS(3, "Count"),
-    MAX(4, "Max"),
-    MIN(5, "Min"),
-    PRODUCT(6, "Product"),
-    STD_DEV(7, "StdDev"),
-    STD_DEVP(8, "StdDevp"),
-    SUM(9, "Sum"),
-    VAR(10, "Var"),
-    VARP(11, "Varp");
-
-    private final int value;
-    private final String name;
-
-    DataConsolidateFunction(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public int getValue() {
-        return this.value;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DataFormat.java b/trunk/src/java/org/apache/poi/ss/usermodel/DataFormat.java
deleted file mode 100644
index 3728541..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DataFormat.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-public interface DataFormat {
-    /**
-     * get the format index that matches the given format string.
-     * Creates a new format if one is not found.  Aliases text to the proper format.
-     * @param format string matching a built in format
-     * @return index of format.
-     */
-    short getFormat(String format);
-
-    /**
-     * get the format string that matches the given format index
-     * @param index of a format
-     * @return string represented at index of format or null if there is not a  format at that index
-     */
-    String getFormat(short index);
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java b/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
deleted file mode 100644
index 61a5092..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
+++ /dev/null
@@ -1,1197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   2012 - Alfresco Software, Ltd.
-   Alfresco Software has modified source of this file
-   The details of changes as svn diff can be found in svn at location root/projects/3rd-party/src 
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DateFormat;
-import java.text.DateFormatSymbols;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.FieldPosition;
-import java.text.Format;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Observable;
-import java.util.Observer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.format.CellFormat;
-import org.apache.poi.ss.format.CellFormatResult;
-import org.apache.poi.ss.util.DateFormatConverter;
-import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-
-/**
- * DataFormatter contains methods for formatting the value stored in an
- * Cell. This can be useful for reports and GUI presentations when you
- * need to display data exactly as it appears in Excel. Supported formats
- * include currency, SSN, percentages, decimals, dates, phone numbers, zip
- * codes, etc.
- * <p>
- * Internally, formats will be implemented using subclasses of {@link Format}
- * such as {@link DecimalFormat} and {@link java.text.SimpleDateFormat}. Therefore the
- * formats used by this class must obey the same pattern rules as these Format
- * subclasses. This means that only legal number pattern characters ("0", "#",
- * ".", "," etc.) may appear in number formats. Other characters can be
- * inserted <em>before</em> or <em> after</em> the number pattern to form a
- * prefix or suffix.
- * </p>
- * <p>
- * For example the Excel pattern <code>"$#,##0.00 "USD"_);($#,##0.00 "USD")"
- * </code> will be correctly formatted as "$1,000.00 USD" or "($1,000.00 USD)".
- * However the pattern <code>"00-00-00"</code> is incorrectly formatted by
- * DecimalFormat as "000000--". For Excel formats that are not compatible with
- * DecimalFormat, you can provide your own custom {@link Format} implementation
- * via <code>DataFormatter.addFormat(String,Format)</code>. The following
- * custom formats are already provided by this class:
- * </p>
- * <pre>
- * <ul><li>SSN "000-00-0000"</li>
- *     <li>Phone Number "(###) ###-####"</li>
- *     <li>Zip plus 4 "00000-0000"</li>
- * </ul>
- * </pre>
- * <p>
- * If the Excel format pattern cannot be parsed successfully, then a default
- * format will be used. The default number format will mimic the Excel General
- * format: "#" for whole numbers and "#.##########" for decimal numbers. You
- * can override the default format pattern with <code>
- * DataFormatter.setDefaultNumberFormat(Format)</code>. <b>Note:</b> the
- * default format will only be used when a Format cannot be created from the
- * cell's data format string.
- *
- * <p>
- * Note that by default formatted numeric values are trimmed.
- * Excel formats can contain spacers and padding and the default behavior is to strip them off.
- * </p>
- * <p>Example:</p>
- * <p>
- * Consider a numeric cell with a value <code>12.343</code> and format <code>"##.##_ "</code>.
- *  The trailing underscore and space ("_ ") in the format adds a space to the end and Excel formats this cell as <code>"12.34 "</code>,
- *  but <code>DataFormatter</code> trims the formatted value and returns <code>"12.34"</code>.
- * </p>
- * You can enable spaces by passing the <code>emulateCSV=true</code> flag in the <code>DateFormatter</code> cosntructor.
- * If set to true, then the output tries to conform to what you get when you take an xls or xlsx in Excel and Save As CSV file:
- * <ul>
- *  <li>returned values are not trimmed</li>
- *  <li>Invalid dates are formatted as  255 pound signs ("#")</li>
- *  <li>simulate Excel's handling of a format string of all # when the value is 0.
- *   Excel will output "", <code>DataFormatter</code> will output "0".
- * </ul>
- * <p>
- *  Some formats are automatically "localized" by Excel, eg show as mm/dd/yyyy when
- *   loaded in Excel in some Locales but as dd/mm/yyyy in others. These are always
- *   returned in the "default" (US) format, as stored in the file. 
- *  Some format strings request an alternate locale, eg 
- *   <code>[$-809]d/m/yy h:mm AM/PM</code> which explicitly requests UK locale.
- *   These locale directives are (currently) ignored.
- *  You can use {@link DateFormatConverter} to do some of this localisation if
- *   you need it. 
- */
-public class DataFormatter implements Observer {
-    private static final String defaultFractionWholePartFormat = "#";
-    private static final String defaultFractionFractionPartFormat = "#/##";
-    /** Pattern to find a number format: "0" or  "#" */
-    private static final Pattern numPattern = Pattern.compile("[0#]+");
-
-    /** Pattern to find days of week as text "ddd...." */
-    private static final Pattern daysAsText = Pattern.compile("([d]{3,})", Pattern.CASE_INSENSITIVE);
-
-    /** Pattern to find "AM/PM" marker */
-    private static final Pattern amPmPattern = Pattern.compile("((A|P)[M/P]*)", Pattern.CASE_INSENSITIVE);
-
-    /** 
-     * A regex to find locale patterns like [$$-1009] and [$?-452].
-     * Note that we don't currently process these into locales 
-     */
-    private static final Pattern localePatternGroup = Pattern.compile("(\\[\\$[^-\\]]*-[0-9A-Z]+\\])");
-
-    /**
-     * A regex to match the colour formattings rules.
-     * Allowed colours are: Black, Blue, Cyan, Green,
-     *  Magenta, Red, White, Yellow, "Color n" (1<=n<=56)
-     */
-    private static final Pattern colorPattern = 
-       Pattern.compile("(\\[BLACK\\])|(\\[BLUE\\])|(\\[CYAN\\])|(\\[GREEN\\])|" +
-       		"(\\[MAGENTA\\])|(\\[RED\\])|(\\[WHITE\\])|(\\[YELLOW\\])|" +
-       		"(\\[COLOR\\s*\\d\\])|(\\[COLOR\\s*[0-5]\\d\\])", Pattern.CASE_INSENSITIVE);
-
-    /**
-     * A regex to identify a fraction pattern.
-     * This requires that replaceAll("\\?", "#") has already been called 
-     */
-    private static final Pattern fractionPattern = Pattern.compile("(?:([#\\d]+)\\s+)?(#+)\\s*\\/\\s*([#\\d]+)");
-
-    /**
-     * A regex to strip junk out of fraction formats
-     */
-    private static final Pattern fractionStripper = Pattern.compile("(\"[^\"]*\")|([^ \\?#\\d\\/]+)");
-
-    /**
-     * A regex to detect if an alternate grouping character is used
-     *  in a numeric format 
-     */
-    private static final Pattern alternateGrouping = Pattern.compile("([#0]([^.#0])[#0]{3})");
-    
-    /**
-      * Cells formatted with a date or time format and which contain invalid date or time values
-     *  show 255 pound signs ("#").
-      */
-     private static final String invalidDateTimeString;
-     static {
-         StringBuilder buf = new StringBuilder();
-         for(int i = 0; i < 255; i++) buf.append('#');
-         invalidDateTimeString = buf.toString();
-     }
-
-    /**
-     * The decimal symbols of the locale used for formatting values.
-     */
-    private DecimalFormatSymbols decimalSymbols;
-
-    /**
-     * The date symbols of the locale used for formatting values.
-     */
-    private DateFormatSymbols dateSymbols;
-
-    /**
-     * A default date format, if no date format was given
-     */
-    private DateFormat defaultDateformat;
-    
-    /** <em>General</em> format for numbers. */
-    private Format generalNumberFormat;
-
-    /** A default format to use when a number pattern cannot be parsed. */
-    private Format defaultNumFormat;
-
-    /**
-     * A map to cache formats.
-     *  Map<String,Format> formats
-     */
-    private final Map<String,Format> formats = new HashMap<String,Format>();
-
-    private final boolean emulateCSV;
-
-    /** stores the locale valid it the last formatting call */
-    private Locale locale;
-    
-    /** stores if the locale should change according to {@link LocaleUtil#getUserLocale()} */
-    private boolean localeIsAdapting;
-    
-    private class LocaleChangeObservable extends Observable {
-        void checkForLocaleChange() {
-            checkForLocaleChange(LocaleUtil.getUserLocale());
-        }
-        void checkForLocaleChange(Locale newLocale) {
-            if (!localeIsAdapting) return;
-            if (newLocale.equals(locale)) return;
-            super.setChanged();
-            notifyObservers(newLocale);
-        }
-    }
-    
-    /** the Observable to notify, when the locale has been changed */
-    private final LocaleChangeObservable localeChangedObservable = new LocaleChangeObservable();
-    
-    /** For logging any problems we find */
-    private static POILogger logger = POILogFactory.getLogger(DataFormatter.class);
-    
-    /**
-     * Creates a formatter using the {@link Locale#getDefault() default locale}.
-     */
-    public DataFormatter() {
-        this(false);
-    }
-
-    /**
-     * Creates a formatter using the {@link Locale#getDefault() default locale}.
-     *
-     * @param  emulateCSV whether to emulate CSV output.
-     */
-    public DataFormatter(boolean emulateCSV) {
-        this(LocaleUtil.getUserLocale(), true, emulateCSV);
-    }
-
-    /**
-     * Creates a formatter using the given locale.
-     */
-    public DataFormatter(Locale locale) {
-        this(locale, false);
-    }
-
-    /**
-     * Creates a formatter using the given locale.
-     *
-     * @param  emulateCSV whether to emulate CSV output.
-     */
-    public DataFormatter(Locale locale, boolean emulateCSV) {
-        this(locale, false, emulateCSV);
-    }
-
-    /**
-     * Creates a formatter using the given locale.
-     * @param  localeIsAdapting (true only if locale is not user-specified)
-     * @param  emulateCSV whether to emulate CSV output.
-     */
-    private DataFormatter(Locale locale, boolean localeIsAdapting, boolean emulateCSV) {
-        this.localeIsAdapting = true;
-        localeChangedObservable.addObserver(this);
-        // localeIsAdapting must be true prior to this first checkForLocaleChange call.
-        localeChangedObservable.checkForLocaleChange(locale);
-        // set localeIsAdapting so subsequent checks perform correctly
-        // (whether a specific locale was provided to this DataFormatter or DataFormatter should
-        // adapt to the current user locale as the locale changes)
-        this.localeIsAdapting = localeIsAdapting;
-        this.emulateCSV = emulateCSV;
-    }
-
-    /**
-     * Return a Format for the given cell if one exists, otherwise try to
-     * create one. This method will return <code>null</code> if the any of the
-     * following is true:
-     * <ul>
-     * <li>the cell's style is null</li>
-     * <li>the style's data format string is null or empty</li>
-     * <li>the format string cannot be recognized as either a number or date</li>
-     * </ul>
-     *
-     * @param cell The cell to retrieve a Format for
-     * @return A Format for the format String
-     */
-    private Format getFormat(Cell cell) {
-        if ( cell.getCellStyle() == null) {
-            return null;
-        }
-
-        int formatIndex = cell.getCellStyle().getDataFormat();
-        String formatStr = cell.getCellStyle().getDataFormatString();
-        if(formatStr == null || formatStr.trim().length() == 0) {
-            return null;
-        }
-        return getFormat(cell.getNumericCellValue(), formatIndex, formatStr);
-    }
-
-    private Format getFormat(double cellValue, int formatIndex, String formatStrIn) {
-        localeChangedObservable.checkForLocaleChange();
-        
-//      // Might be better to separate out the n p and z formats, falling back to p when n and z are not set.
-//      // That however would require other code to be re factored.
-//      String[] formatBits = formatStrIn.split(";");
-//      int i = cellValue > 0.0 ? 0 : cellValue < 0.0 ? 1 : 2; 
-//      String formatStr = (i < formatBits.length) ? formatBits[i] : formatBits[0];
-
-        String formatStr = formatStrIn;
-        
-        // Excel supports 3+ part conditional data formats, eg positive/negative/zero,
-        //  or (>1000),(>0),(0),(negative). As Java doesn't handle these kinds
-        //  of different formats for different ranges, just +ve/-ve, we need to 
-        //  handle these ourselves in a special way.
-        // For now, if we detect 3+ parts, we call out to CellFormat to handle it
-        // TODO Going forward, we should really merge the logic between the two classes
-        if (formatStr.contains(";") &&
-                formatStr.indexOf(';') != formatStr.lastIndexOf(';')) {
-            try {
-                // Ask CellFormat to get a formatter for it
-                CellFormat cfmt = CellFormat.getInstance(formatStr);
-                // CellFormat requires callers to identify date vs not, so do so
-                Object cellValueO = Double.valueOf(cellValue);
-                if (DateUtil.isADateFormat(formatIndex, formatStr) && 
-                        // don't try to handle Date value 0, let a 3 or 4-part format take care of it 
-                        ((Double)cellValueO).doubleValue() != 0.0) {
-                    cellValueO = DateUtil.getJavaDate(cellValue);
-                }
-                // Wrap and return (non-cachable - CellFormat does that)
-                return new CellFormatResultWrapper( cfmt.apply(cellValueO) );
-            } catch (Exception e) {
-                logger.log(POILogger.WARN, "Formatting failed for format " + formatStr + ", falling back", e);
-            }
-        }
-        
-       // Excel's # with value 0 will output empty where Java will output 0. This hack removes the # from the format.
-       if (emulateCSV && cellValue == 0.0 && formatStr.contains("#") && !formatStr.contains("0")) {
-           formatStr = formatStr.replaceAll("#", "");
-       }
-       
-        // See if we already have it cached
-        Format format = formats.get(formatStr);
-        if (format != null) {
-            return format;
-        }
-        
-        // Is it one of the special built in types, General or @?
-        if ("General".equalsIgnoreCase(formatStr) || "@".equals(formatStr)) {
-            return generalNumberFormat;
-        }
-        
-        // Build a formatter, and cache it
-        format = createFormat(cellValue, formatIndex, formatStr);
-        formats.put(formatStr, format);
-        return format;
-    }
-
-    /**
-     * Create and return a Format based on the format string from a  cell's
-     * style. If the pattern cannot be parsed, return a default pattern.
-     *
-     * @param cell The Excel cell
-     * @return A Format representing the excel format. May return null.
-     */
-    public Format createFormat(Cell cell) {
-
-        int formatIndex = cell.getCellStyle().getDataFormat();
-        String formatStr = cell.getCellStyle().getDataFormatString();
-        return createFormat(cell.getNumericCellValue(), formatIndex, formatStr);
-    }
-
-    private Format createFormat(double cellValue, int formatIndex, String sFormat) {
-        localeChangedObservable.checkForLocaleChange();
-        
-        String formatStr = sFormat;
-        
-        // Remove colour formatting if present
-        Matcher colourM = colorPattern.matcher(formatStr);
-        while(colourM.find()) {
-           String colour = colourM.group();
-           
-           // Paranoid replacement...
-           int at = formatStr.indexOf(colour);
-           if(at == -1) break;
-           String nFormatStr = formatStr.substring(0,at) +
-              formatStr.substring(at+colour.length());
-           if(nFormatStr.equals(formatStr)) break;
-
-           // Try again in case there's multiple
-           formatStr = nFormatStr;
-           colourM = colorPattern.matcher(formatStr);
-        }
-
-        // Strip off the locale information, we use an instance-wide locale for everything
-        Matcher m = localePatternGroup.matcher(formatStr);
-        while(m.find()) {
-            String match = m.group();
-            String symbol = match.substring(match.indexOf('$') + 1, match.indexOf('-'));
-            if (symbol.indexOf('$') > -1) {
-                symbol = symbol.substring(0, symbol.indexOf('$')) +
-                        '\\' +
-                        symbol.substring(symbol.indexOf('$'), symbol.length());
-            }
-            formatStr = m.replaceAll(symbol);
-            m = localePatternGroup.matcher(formatStr);
-        }
-
-        // Check for special cases
-        if(formatStr == null || formatStr.trim().length() == 0) {
-            return getDefaultFormat(cellValue);
-        }
-        
-        if ("General".equalsIgnoreCase(formatStr) || "@".equals(formatStr)) {
-           return generalNumberFormat;
-        }
-
-        if(DateUtil.isADateFormat(formatIndex,formatStr) &&
-                DateUtil.isValidExcelDate(cellValue)) {
-            return createDateFormat(formatStr, cellValue);
-        }
-        // Excel supports fractions in format strings, which Java doesn't
-        if (formatStr.contains("#/") || formatStr.contains("?/")) {
-            String[] chunks = formatStr.split(";");
-            for (String chunk1 : chunks) {
-                String chunk = chunk1.replaceAll("\\?", "#");
-                Matcher matcher = fractionStripper.matcher(chunk);
-                chunk = matcher.replaceAll(" ");
-                chunk = chunk.replaceAll(" +", " ");
-                Matcher fractionMatcher = fractionPattern.matcher(chunk);
-                //take the first match
-                if (fractionMatcher.find()) {
-                    String wholePart = (fractionMatcher.group(1) == null) ? "" : defaultFractionWholePartFormat;
-                    return new FractionFormat(wholePart, fractionMatcher.group(3));
-                }
-            }
-            
-            // Strip custom text in quotes and escaped characters for now as it can cause performance problems in fractions.
-            //String strippedFormatStr = formatStr.replaceAll("\\\\ ", " ").replaceAll("\\\\.", "").replaceAll("\"[^\"]*\"", " ").replaceAll("\\?", "#");
-            //System.out.println("formatStr: "+strippedFormatStr);
-            return new FractionFormat(defaultFractionWholePartFormat, defaultFractionFractionPartFormat);
-        }
-        
-        if (numPattern.matcher(formatStr).find()) {
-            return createNumberFormat(formatStr, cellValue);
-        }
-
-        if (emulateCSV) {
-            return new ConstantStringFormat(cleanFormatForNumber(formatStr));
-        }
-        // TODO - when does this occur?
-        return null;
-    }
-    
- 
-
-    private Format createDateFormat(String pFormatStr, double cellValue) {
-        String formatStr = pFormatStr;
-        formatStr = formatStr.replaceAll("\\\\-","-");
-        formatStr = formatStr.replaceAll("\\\\,",",");
-        formatStr = formatStr.replaceAll("\\\\\\.","."); // . is a special regexp char
-        formatStr = formatStr.replaceAll("\\\\ "," ");
-        formatStr = formatStr.replaceAll("\\\\/","/"); // weird: m\\/d\\/yyyy 
-        formatStr = formatStr.replaceAll(";@", "");
-        formatStr = formatStr.replaceAll("\"/\"", "/"); // "/" is escaped for no reason in: mm"/"dd"/"yyyy
-        formatStr = formatStr.replace("\"\"", "'");	// replace Excel quoting with Java style quoting
-        formatStr = formatStr.replaceAll("\\\\T","'T'"); // Quote the T is iso8601 style dates
-
-
-        boolean hasAmPm = false;
-        Matcher amPmMatcher = amPmPattern.matcher(formatStr);
-        while (amPmMatcher.find()) {
-            formatStr = amPmMatcher.replaceAll("@");
-            hasAmPm = true;
-            amPmMatcher = amPmPattern.matcher(formatStr);
-        }
-        formatStr = formatStr.replaceAll("@", "a");
-
-
-        Matcher dateMatcher = daysAsText.matcher(formatStr);
-        if (dateMatcher.find()) {
-            String match = dateMatcher.group(0).toUpperCase(Locale.ROOT).replaceAll("D", "E");
-            formatStr = dateMatcher.replaceAll(match);
-        }
-
-        // Convert excel date format to SimpleDateFormat.
-        // Excel uses lower and upper case 'm' for both minutes and months.
-        // From Excel help:
-        /*
-            The "m" or "mm" code must appear immediately after the "h" or"hh"
-            code or immediately before the "ss" code; otherwise, Microsoft
-            Excel displays the month instead of minutes."
-          */
-
-        StringBuilder sb = new StringBuilder();
-        char[] chars = formatStr.toCharArray();
-        boolean mIsMonth = true;
-        List<Integer> ms = new ArrayList<Integer>();
-        boolean isElapsed = false;
-        for(int j=0; j<chars.length; j++) {
-            char c = chars[j];
-            if (c == '\'') {
-                sb.append(c);
-                j++;
-
-                // skip until the next quote
-                while(j<chars.length) {
-                    c = chars[j];
-                    sb.append(c);
-                    if(c == '\'') {
-                        break;
-                    }
-                    j++;
-                }
-            }
-            else if (c == '[' && !isElapsed) {
-                isElapsed = true;
-                mIsMonth = false;
-                sb.append(c);
-            }
-            else if (c == ']' && isElapsed) {
-                isElapsed = false;
-                sb.append(c);
-            }
-            else if (isElapsed) {
-            if (c == 'h' || c == 'H') {
-                    sb.append('H');
-                }
-                else if (c == 'm' || c == 'M') {
-                    sb.append('m');
-                }
-                else if (c == 's' || c == 'S') {
-                    sb.append('s');
-                }
-                else {
-                    sb.append(c);
-                }
-            }
-            else if (c == 'h' || c == 'H') {
-                mIsMonth = false;
-                if (hasAmPm) {
-                    sb.append('h');
-                } else {
-                    sb.append('H');
-                }
-            }
-            else if (c == 'm' || c == 'M') {
-                if(mIsMonth) {
-                    sb.append('M');
-                    ms.add(
-                            Integer.valueOf(sb.length() -1)
-                    );
-                } else {
-                    sb.append('m');
-                }
-            }
-            else if (c == 's' || c == 'S') {
-                sb.append('s');
-                // if 'M' precedes 's' it should be minutes ('m')
-                for (int index : ms) {
-                    if (sb.charAt(index) == 'M') {
-                        sb.replace(index, index + 1, "m");
-                    }
-                }
-                mIsMonth = true;
-                ms.clear();
-            }
-            else if (Character.isLetter(c)) {
-                mIsMonth = true;
-                ms.clear();
-                if (c == 'y' || c == 'Y') {
-                    sb.append('y');
-                }
-                else if (c == 'd' || c == 'D') {
-                    sb.append('d');
-                }
-                else {
-                    sb.append(c);
-                }
-            }
-            else {
-                sb.append(c);
-            }
-        }
-        formatStr = sb.toString();
-
-        try {
-            return new ExcelStyleDateFormatter(formatStr, dateSymbols);
-        } catch(IllegalArgumentException iae) {
-
-            // the pattern could not be parsed correctly,
-            // so fall back to the default number format
-            return getDefaultFormat(cellValue);
-        }
-
-    }
-
-    private String cleanFormatForNumber(String formatStr) {
-        StringBuilder sb = new StringBuilder(formatStr);
-
-        if (emulateCSV) {
-            // Requested spacers with "_" are replaced by a single space.
-            // Full-column-width padding "*" are removed.
-            // Not processing fractions at this time. Replace ? with space.
-            // This matches CSV output.
-            for (int i = 0; i < sb.length(); i++) {
-                char c = sb.charAt(i);
-                if (c == '_' || c == '*' || c == '?') {
-                    if (i > 0 && sb.charAt((i - 1)) == '\\') {
-                        // It's escaped, don't worry
-                        continue;
-                    }
-                    if (c == '?') {
-                        sb.setCharAt(i, ' ');
-                    } else if (i < sb.length() - 1) {
-                        // Remove the character we're supposed
-                        //  to match the space of / pad to the
-                        //  column width with
-                        if (c == '_') {
-                            sb.setCharAt(i + 1, ' ');
-                        } else {
-                            sb.deleteCharAt(i + 1);
-                        }
-                        // Remove the character too
-                        sb.deleteCharAt(i);
-                        i--;
-                    }
-                }
-            }
-        } else {
-            // If they requested spacers, with "_",
-            //  remove those as we don't do spacing
-            // If they requested full-column-width
-            //  padding, with "*", remove those too
-            for (int i = 0; i < sb.length(); i++) {
-                char c = sb.charAt(i);
-                if (c == '_' || c == '*') {
-                    if (i > 0 && sb.charAt((i - 1)) == '\\') {
-                        // It's escaped, don't worry
-                        continue;
-                    }
-                    if (i < sb.length() - 1) {
-                        // Remove the character we're supposed
-                        //  to match the space of / pad to the
-                        //  column width with
-                        sb.deleteCharAt(i + 1);
-                    }
-                    // Remove the _ too
-                    sb.deleteCharAt(i);
-                    i--;
-                }
-            }
-        }
-
-        // Now, handle the other aspects like 
-        //  quoting and scientific notation
-        for(int i = 0; i < sb.length(); i++) {
-           char c = sb.charAt(i);
-            // remove quotes and back slashes
-            if (c == '\\' || c == '"') {
-                sb.deleteCharAt(i);
-                i--;
-
-            // for scientific/engineering notation
-            } else if (c == '+' && i > 0 && sb.charAt(i - 1) == 'E') {
-                sb.deleteCharAt(i);
-                i--;
-            }
-        }
-
-        return sb.toString();
-    }
-
-    private Format createNumberFormat(String formatStr, double cellValue) {
-        String format = cleanFormatForNumber(formatStr);
-        DecimalFormatSymbols symbols = decimalSymbols;
-        
-        // Do we need to change the grouping character?
-        // eg for a format like #'##0 which wants 12'345 not 12,345
-        Matcher agm = alternateGrouping.matcher(format);
-        if (agm.find()) {
-            char grouping = agm.group(2).charAt(0);
-            // Only replace the grouping character if it is not the default
-            // grouping character for the US locale (',') in order to enable
-            // correct grouping for non-US locales.
-            if (grouping!=',') {
-                symbols = DecimalFormatSymbols.getInstance(locale);
-
-                symbols.setGroupingSeparator(grouping);
-                String oldPart = agm.group(1);
-                String newPart = oldPart.replace(grouping, ',');
-                format = format.replace(oldPart, newPart);
-            }
-        }
-        
-        try {
-            DecimalFormat df = new DecimalFormat(format, symbols);
-            setExcelStyleRoundingMode(df);
-            return df;
-        } catch(IllegalArgumentException iae) {
-
-            // the pattern could not be parsed correctly,
-            // so fall back to the default number format
-            return getDefaultFormat(cellValue);
-        }
-    }
-
-    /**
-     * Returns a default format for a cell.
-     * @param cell The cell
-     * @return a default format
-     */
-    public Format getDefaultFormat(Cell cell) {
-        return getDefaultFormat(cell.getNumericCellValue());
-    }
-    private Format getDefaultFormat(double cellValue) {
-        localeChangedObservable.checkForLocaleChange();
-        
-        // for numeric cells try user supplied default
-        if (defaultNumFormat != null) {
-            return defaultNumFormat;
-
-          // otherwise use general format
-        }
-        return generalNumberFormat;
-    }
-    
-    /**
-     * Performs Excel-style date formatting, using the
-     *  supplied Date and format
-     */
-    private String performDateFormatting(Date d, Format dateFormat) {
-       return (dateFormat != null ? dateFormat : defaultDateformat).format(d);
-    }
-
-    /**
-     * Returns the formatted value of an Excel date as a <tt>String</tt> based
-     * on the cell's <code>DataFormat</code>. i.e. "Thursday, January 02, 2003"
-     * , "01/02/2003" , "02-Jan" , etc.
-     *
-     * @param cell The cell
-     * @return a formatted date string
-     */
-    private String getFormattedDateString(Cell cell) {
-        Format dateFormat = getFormat(cell);
-        if(dateFormat instanceof ExcelStyleDateFormatter) {
-           // Hint about the raw excel value
-           ((ExcelStyleDateFormatter)dateFormat).setDateToBeFormatted(
-                 cell.getNumericCellValue()
-           );
-        }
-        Date d = cell.getDateCellValue();
-        return performDateFormatting(d, dateFormat);
-    }
-
-    /**
-     * Returns the formatted value of an Excel number as a <tt>String</tt>
-     * based on the cell's <code>DataFormat</code>. Supported formats include
-     * currency, percents, decimals, phone number, SSN, etc.:
-     * "61.54%", "$100.00", "(800) 555-1234".
-     *
-     * @param cell The cell
-     * @return a formatted number string
-     */
-    private String getFormattedNumberString(Cell cell) {
-
-        Format numberFormat = getFormat(cell);
-        double d = cell.getNumericCellValue();
-        if (numberFormat == null) {
-            return String.valueOf(d);
-        }
-        String formatted = numberFormat.format(new Double(d));
-        return formatted.replaceFirst("E(\\d)", "E+$1"); // to match Excel's E-notation
-    }
-
-    /**
-     * Formats the given raw cell value, based on the supplied
-     *  format index and string, according to excel style rules.
-     * @see #formatCellValue(Cell)
-     */
-    public String formatRawCellContents(double value, int formatIndex, String formatString) {
-        return formatRawCellContents(value, formatIndex, formatString, false);
-    }
-    /**
-     * Formats the given raw cell value, based on the supplied
-     *  format index and string, according to excel style rules.
-     * @see #formatCellValue(Cell)
-     */
-    public String formatRawCellContents(double value, int formatIndex, String formatString, boolean use1904Windowing) {
-        localeChangedObservable.checkForLocaleChange();
-        
-        // Is it a date?
-        if(DateUtil.isADateFormat(formatIndex,formatString)) {
-            if(DateUtil.isValidExcelDate(value)) {
-                Format dateFormat = getFormat(value, formatIndex, formatString);
-                if(dateFormat instanceof ExcelStyleDateFormatter) {
-                    // Hint about the raw excel value
-                    ((ExcelStyleDateFormatter)dateFormat).setDateToBeFormatted(value);
-                }
-                Date d = DateUtil.getJavaDate(value, use1904Windowing);
-                return performDateFormatting(d, dateFormat);
-            }
-            // RK: Invalid dates are 255 #s.
-            if (emulateCSV) {
-                return invalidDateTimeString;
-            }
-        }
-        
-        // else Number
-        Format numberFormat = getFormat(value, formatIndex, formatString);
-        if (numberFormat == null) {
-            return String.valueOf(value);
-        }
-        
-        // When formatting 'value', double to text to BigDecimal produces more
-        // accurate results than double to Double in JDK8 (as compared to
-        // previous versions). However, if the value contains E notation, this
-        // would expand the values, which we do not want, so revert to
-        // original method.
-        String result;
-        final String textValue = NumberToTextConverter.toText(value);
-        if (textValue.indexOf('E') > -1) {
-            result = numberFormat.format(new Double(value));
-        }
-        else {
-            result = numberFormat.format(new BigDecimal(textValue));
-        }
-        // Complete scientific notation by adding the missing +.
-        if (result.indexOf('E') > -1 && !result.contains("E-")) {
-            result = result.replaceFirst("E", "E+");
-        }
-        return result;
-    }
-
-    /**
-     * <p>
-     * Returns the formatted value of a cell as a <tt>String</tt> regardless
-     * of the cell type. If the Excel format pattern cannot be parsed then the
-     * cell value will be formatted using a default format.
-     * </p>
-     * <p>When passed a null or blank cell, this method will return an empty
-     * String (""). Formulas in formula type cells will not be evaluated.
-     * </p>
-     *
-     * @param cell The cell
-     * @return the formatted cell value as a String
-     */
-    public String formatCellValue(Cell cell) {
-        return formatCellValue(cell, null);
-    }
-
-    /**
-     * <p>
-     * Returns the formatted value of a cell as a <tt>String</tt> regardless
-     * of the cell type. If the Excel format pattern cannot be parsed then the
-     * cell value will be formatted using a default format.
-     * </p>
-     * <p>When passed a null or blank cell, this method will return an empty
-     * String (""). Formula cells will be evaluated using the given
-     * {@link FormulaEvaluator} if the evaluator is non-null. If the
-     * evaluator is null, then the formula String will be returned. The caller
-     * is responsible for setting the currentRow on the evaluator
-     *</p>
-     *
-     * @param cell The cell (can be null)
-     * @param evaluator The FormulaEvaluator (can be null)
-     * @return a string value of the cell
-     */
-    public String formatCellValue(Cell cell, FormulaEvaluator evaluator) {
-        localeChangedObservable.checkForLocaleChange();
-        
-        if (cell == null) {
-            return "";
-        }
-
-        CellType cellType = cell.getCellTypeEnum();
-        if (cellType == CellType.FORMULA) {
-            if (evaluator == null) {
-                return cell.getCellFormula();
-            }
-            cellType = evaluator.evaluateFormulaCellEnum(cell);
-        }
-        switch (cellType) {
-            case NUMERIC :
-
-                if (DateUtil.isCellDateFormatted(cell)) {
-                    return getFormattedDateString(cell);
-                }
-                return getFormattedNumberString(cell);
-
-            case STRING :
-                return cell.getRichStringCellValue().getString();
-
-            case BOOLEAN :
-                return cell.getBooleanCellValue() ? "TRUE" : "FALSE";
-            case BLANK :
-                return "";
-            case ERROR:
-                return FormulaError.forInt(cell.getErrorCellValue()).getString();
-            default:
-                throw new RuntimeException("Unexpected celltype (" + cellType + ")");
-        }
-    }
-
-
-    /**
-     * <p>
-     * Sets a default number format to be used when the Excel format cannot be
-     * parsed successfully. <b>Note:</b> This is a fall back for when an error
-     * occurs while parsing an Excel number format pattern. This will not
-     * affect cells with the <em>General</em> format.
-     * </p>
-     * <p>
-     * The value that will be passed to the Format's format method (specified
-     * by <code>java.text.Format#format</code>) will be a double value from a
-     * numeric cell. Therefore the code in the format method should expect a
-     * <code>Number</code> value.
-     * </p>
-     *
-     * @param format A Format instance to be used as a default
-     * @see java.text.Format#format
-     */
-    public void setDefaultNumberFormat(Format format) {
-        for (Map.Entry<String, Format> entry : formats.entrySet()) {
-            if (entry.getValue() == generalNumberFormat) {
-                entry.setValue(format);
-            }
-        }
-        defaultNumFormat = format;
-    }
-
-    /**
-     * Adds a new format to the available formats.
-     * <p>
-     * The value that will be passed to the Format's format method (specified
-     * by <code>java.text.Format#format</code>) will be a double value from a
-     * numeric cell. Therefore the code in the format method should expect a
-     * <code>Number</code> value.
-     * </p>
-     * @param excelFormatStr The data format string
-     * @param format A Format instance
-     */
-    public void addFormat(String excelFormatStr, Format format) {
-        formats.put(excelFormatStr, format);
-    }
-
-    // Some custom formats
-
-    /**
-     * @return a <tt>DecimalFormat</tt> with parseIntegerOnly set <code>true</code>
-     */
-    private static DecimalFormat createIntegerOnlyFormat(String fmt) {
-        DecimalFormatSymbols dsf = DecimalFormatSymbols.getInstance(Locale.ROOT);
-        DecimalFormat result = new DecimalFormat(fmt, dsf);
-        result.setParseIntegerOnly(true);
-        return result;
-    }
-    
-    /**
-     * Enables excel style rounding mode (round half up) on the 
-     *  Decimal Format given.
-     */
-    public static void setExcelStyleRoundingMode(DecimalFormat format) {
-        setExcelStyleRoundingMode(format, RoundingMode.HALF_UP);
-    }
-
-    /**
-     * Enables custom rounding mode on the given Decimal Format.
-     * @param format DecimalFormat
-     * @param roundingMode RoundingMode
-     */
-    public static void setExcelStyleRoundingMode(DecimalFormat format, RoundingMode roundingMode) {
-       format.setRoundingMode(roundingMode);
-    }
-
-    /**
-     * If the Locale has been changed via {@link LocaleUtil#setUserLocale(Locale)} the stored
-     * formats need to be refreshed. All formats which aren't originated from DataFormatter
-     * itself, i.e. all Formats added via {@link DataFormatter#addFormat(String, Format)} and
-     * {@link DataFormatter#setDefaultNumberFormat(Format)}, need to be added again.
-     * To notify callers, the returned {@link Observable} should be used.
-     * The Object in {@link Observer#update(Observable, Object)} is the new Locale.
-     *
-     * @return the listener object, where callers can register themselves
-     */
-    public Observable getLocaleChangedObservable() {
-        return localeChangedObservable;
-    }
-
-    /**
-     * Update formats when locale has been changed
-     *
-     * @param observable usually this is our own Observable instance
-     * @param localeObj only reacts on Locale objects
-     */
-    public void update(Observable observable, Object localeObj) {
-        if (!(localeObj instanceof Locale))  return;
-        Locale newLocale = (Locale)localeObj;
-        if (!localeIsAdapting || newLocale.equals(locale)) return;
-        
-        locale = newLocale;
-        
-        dateSymbols = DateFormatSymbols.getInstance(locale);
-        decimalSymbols = DecimalFormatSymbols.getInstance(locale);
-        generalNumberFormat = new ExcelGeneralNumberFormat(locale);
-
-        // taken from Date.toString()
-        defaultDateformat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dateSymbols);
-        defaultDateformat.setTimeZone(LocaleUtil.getUserTimeZone());       
-
-        // init built-in formats
-
-        formats.clear();
-        Format zipFormat = ZipPlusFourFormat.instance;
-        addFormat("00000\\-0000", zipFormat);
-        addFormat("00000-0000", zipFormat);
-
-        Format phoneFormat = PhoneFormat.instance;
-        // allow for format string variations
-        addFormat("[<=9999999]###\\-####;\\(###\\)\\ ###\\-####", phoneFormat);
-        addFormat("[<=9999999]###-####;(###) ###-####", phoneFormat);
-        addFormat("###\\-####;\\(###\\)\\ ###\\-####", phoneFormat);
-        addFormat("###-####;(###) ###-####", phoneFormat);
-
-        Format ssnFormat = SSNFormat.instance;
-        addFormat("000\\-00\\-0000", ssnFormat);
-        addFormat("000-00-0000", ssnFormat);
-    }
-
-
-
-    /**
-     * Format class for Excel's SSN format. This class mimics Excel's built-in
-     * SSN formatting.
-     *
-     * @author James May
-     */
-    @SuppressWarnings("serial")
-   private static final class SSNFormat extends Format {
-        public static final Format instance = new SSNFormat();
-        private static final DecimalFormat df = createIntegerOnlyFormat("000000000");
-        private SSNFormat() {
-            // enforce singleton
-        }
-
-        /** Format a number as an SSN */
-        public static String format(Number num) {
-            String result = df.format(num);
-            return result.substring(0, 3) + '-' +
-                    result.substring(3, 5) + '-' +
-                    result.substring(5, 9);
-        }
-
-        @Override
-        public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
-            return toAppendTo.append(format((Number)obj));
-        }
-
-        @Override
-        public Object parseObject(String source, ParsePosition pos) {
-            return df.parseObject(source, pos);
-        }
-    }
-
-    /**
-     * Format class for Excel Zip + 4 format. This class mimics Excel's
-     * built-in formatting for Zip + 4.
-     * @author James May
-     */
-    @SuppressWarnings("serial")
-   private static final class ZipPlusFourFormat extends Format {
-        public static final Format instance = new ZipPlusFourFormat();
-        private static final DecimalFormat df = createIntegerOnlyFormat("000000000");
-        private ZipPlusFourFormat() {
-            // enforce singleton
-        }
-
-        /** Format a number as Zip + 4 */
-        public static String format(Number num) {
-            String result = df.format(num);
-            return result.substring(0, 5) + '-' +
-                    result.substring(5, 9);
-        }
-
-        @Override
-        public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
-            return toAppendTo.append(format((Number)obj));
-        }
-
-        @Override
-        public Object parseObject(String source, ParsePosition pos) {
-            return df.parseObject(source, pos);
-        }
-    }
-
-    /**
-     * Format class for Excel phone number format. This class mimics Excel's
-     * built-in phone number formatting.
-     * @author James May
-     */
-    @SuppressWarnings("serial")
-   private static final class PhoneFormat extends Format {
-        public static final Format instance = new PhoneFormat();
-        private static final DecimalFormat df = createIntegerOnlyFormat("##########");
-        private PhoneFormat() {
-            // enforce singleton
-        }
-
-        /** Format a number as a phone number */
-        public static String format(Number num) {
-            String result = df.format(num);
-            StringBuilder sb = new StringBuilder();
-            String seg1, seg2, seg3;
-            int len = result.length();
-            if (len <= 4) {
-                return result;
-            }
-
-            seg3 = result.substring(len - 4, len);
-            seg2 = result.substring(Math.max(0, len - 7), len - 4);
-            seg1 = result.substring(Math.max(0, len - 10), Math.max(0, len - 7));
-
-            if(seg1.trim().length() > 0) {
-                sb.append('(').append(seg1).append(") ");
-            }
-            if(seg2.trim().length() > 0) {
-                sb.append(seg2).append('-');
-            }
-            sb.append(seg3);
-            return sb.toString();
-        }
-
-        @Override
-        public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
-            return toAppendTo.append(format((Number)obj));
-        }
-
-        @Override
-        public Object parseObject(String source, ParsePosition pos) {
-            return df.parseObject(source, pos);
-        }
-    }
-    
-
-    
-    
-    /**
-     * Format class that does nothing and always returns a constant string.
-     *
-     * This format is used to simulate Excel's handling of a format string
-     * of all # when the value is 0. Excel will output "", Java will output "0".
-     *
-     * @see DataFormatter#createFormat(double, int, String)
-     */
-    @SuppressWarnings("serial")
-   private static final class ConstantStringFormat extends Format {
-        private static final DecimalFormat df = createIntegerOnlyFormat("##########");
-        private final String str;
-        public ConstantStringFormat(String s) {
-            str = s;
-        }
-
-        @Override
-        public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
-            return toAppendTo.append(str);
-        }
-
-        @Override
-        public Object parseObject(String source, ParsePosition pos) {
-            return df.parseObject(source, pos);
-        }
-    }
-    /**
-     * Workaround until we merge {@link DataFormatter} with {@link CellFormat}.
-     * Constant, non-cachable wrapper around a {@link CellFormatResult} 
-     */
-    @SuppressWarnings("serial")
-    private final class CellFormatResultWrapper extends Format {
-        private final CellFormatResult result;
-        private CellFormatResultWrapper(CellFormatResult result) {
-            this.result = result;
-        }
-        public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
-            if (emulateCSV) {
-                return toAppendTo.append(result.text);
-            } else {
-                return toAppendTo.append(result.text.trim());
-            }
-        }
-        public Object parseObject(String source, ParsePosition pos) {
-            return null; // Not supported
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DataValidation.java b/trunk/src/java/org/apache/poi/ss/usermodel/DataValidation.java
deleted file mode 100644
index c80ed6a..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DataValidation.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.util.CellRangeAddressList;
-
-
-public interface DataValidation {
-	/**
-	 * Error style constants for error box
-	 */
-	public static final class ErrorStyle {
-    	/** STOP style */
-    	public static final int STOP    = 0x00;
-    	/** WARNING style */
-    	public static final int WARNING = 0x01;
-    	/** INFO style */
-    	public static final int INFO    = 0x02;
-	}    
-
-	public abstract DataValidationConstraint getValidationConstraint();
-
-	/**
-	 * Sets the error style for error box
-	 * @see ErrorStyle
-	 */
-	public abstract void setErrorStyle(int error_style);
-
-	/**o
-	 * @return the error style of error box
-	 * @see ErrorStyle
-	 */
-	public abstract int getErrorStyle();
-
-	/**
-	 * Sets if this object allows empty as a valid value
-	 * 
-	 * @param allowed <code>true</code> if this object should treats empty as valid value , <code>false</code>
-	 *            otherwise
-	 */
-	public abstract void setEmptyCellAllowed(boolean allowed);
-
-	/**
-	 * Retrieve the settings for empty cells allowed
-	 * 
-	 * @return True if this object should treats empty as valid value , false
-	 *         otherwise
-	 */
-	public abstract boolean getEmptyCellAllowed();
-
-	/**
-	 * Useful for list validation objects .
-	 * 
-	 * @param suppress
-	 *            True if a list should display the values into a drop down list ,
-	 *            false otherwise . In other words , if a list should display
-	 *            the arrow sign on its right side
-	 */
-	public abstract void setSuppressDropDownArrow(boolean suppress);
-
-	/**
-	 * Useful only list validation objects . This method always returns false if
-	 * the object isn't a list validation object
-	 * 
-	 * @return <code>true</code> if a list should display the values into a drop down list ,
-	 *         <code>false</code> otherwise .
-	 */
-	public abstract boolean getSuppressDropDownArrow();
-
-	/**
-	 * Sets the behaviour when a cell which belongs to this object is selected
-	 * 
-	 * @param show <code>true</code> if an prompt box should be displayed , <code>false</code> otherwise
-	 */
-	public abstract void setShowPromptBox(boolean show);
-
-	/**
-	 * @return <code>true</code> if an prompt box should be displayed , <code>false</code> otherwise
-	 */
-	public abstract boolean getShowPromptBox();
-
-	/**
-	 * Sets the behaviour when an invalid value is entered
-	 * 
-	 * @param show <code>true</code> if an error box should be displayed , <code>false</code> otherwise
-	 */
-	public abstract void setShowErrorBox(boolean show);
-
-	/**
-	 * @return <code>true</code> if an error box should be displayed , <code>false</code> otherwise
-	 */
-	public abstract boolean getShowErrorBox();
-
-	/**
-	 * Sets the title and text for the prompt box . Prompt box is displayed when
-	 * the user selects a cell which belongs to this validation object . In
-	 * order for a prompt box to be displayed you should also use method
-	 * setShowPromptBox( boolean show )
-	 * 
-	 * @param title The prompt box's title
-	 * @param text The prompt box's text
-	 */
-	public abstract void createPromptBox(String title, String text);
-
-	/**
-	 * @return Prompt box's title or <code>null</code>
-	 */
-	public abstract String getPromptBoxTitle();
-
-	/**
-	 * @return Prompt box's text or <code>null</code>
-	 */
-	public abstract String getPromptBoxText();
-
-	/**
-	 * Sets the title and text for the error box . Error box is displayed when
-	 * the user enters an invalid value int o a cell which belongs to this
-	 * validation object . In order for an error box to be displayed you should
-	 * also use method setShowErrorBox( boolean show )
-	 * 
-	 * @param title The error box's title
-	 * @param text The error box's text
-	 */
-	public abstract void createErrorBox(String title, String text);
-
-	/**
-	 * @return Error box's title or <code>null</code>
-	 */
-	public abstract String getErrorBoxTitle();
-
-	/**
-	 * @return Error box's text or <code>null</code>
-	 */
-	public abstract String getErrorBoxText();
-
-	public abstract CellRangeAddressList getRegions();
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java b/trunk/src/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
deleted file mode 100644
index 38f78e8..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-
-public interface DataValidationConstraint {
-
-	/**
-	 * @return data validation type of this constraint
-	 * @see ValidationType
-	 */
-	public abstract int getValidationType();
-
-	/**
-	 * @return the operator used for this constraint
-	 * @see OperatorType
-	 */
-	public abstract int getOperator();
-
-	/**
-	 * Sets the comparison operator for this constraint
-	 * @see OperatorType
-	 */
-	public abstract void setOperator(int operator);
-
-    /**
-	 * If validation type is {@link ValidationType#LIST}
-	 * and <code>formula1</code> was comma-separated literal values rather than a range or named range,
-	 * returns list of literal values.
-	 * Otherwise returns <code>null</code>.
-	 */
-	public abstract String[] getExplicitListValues();
-
-	public abstract void setExplicitListValues(String[] explicitListValues);
-
-	/**
-	 * @return the formula for expression 1. May be <code>null</code>
-	 */
-	public abstract String getFormula1();
-
-	/**
-	 * Sets a formula for expression 1.
-	 */
-	public abstract void setFormula1(String formula1);
-
-	/**
-	 * @return the formula for expression 2. May be <code>null</code>
-	 */
-	public abstract String getFormula2();
-
-	/**
-	 * Sets a formula for expression 2.
-	 */
-	public abstract void setFormula2(String formula2);
-	
-	/**
-	 * ValidationType enum
-	 */
-	public static final class ValidationType {
-		private ValidationType() {
-			// no instances of this class
-		}
-		/** 'Any value' type - value not restricted */
-		public static final int ANY         = 0x00;
-		/** Integer ('Whole number') type */
-		public static final int INTEGER     = 0x01;
-		/** Decimal type */
-		public static final int DECIMAL     = 0x02;
-		/** List type ( combo box type ) */
-		public static final int LIST        = 0x03;
-		/** Date type */
-		public static final int DATE        = 0x04;
-		/** Time type */
-		public static final int TIME        = 0x05;
-		/** String length type */
-		public static final int TEXT_LENGTH = 0x06;
-		/** Formula ( 'Custom' ) type */
-		public static final int FORMULA     = 0x07;
-	}
-	/**
-	 * Condition operator enum
-	 */
-	public static final class OperatorType {
-		private OperatorType() {
-			// no instances of this class
-		}
-
-		public static final int BETWEEN = 0x00;
-		public static final int NOT_BETWEEN = 0x01;
-		public static final int EQUAL = 0x02;
-		public static final int NOT_EQUAL = 0x03;
-		public static final int GREATER_THAN = 0x04;
-		public static final int LESS_THAN = 0x05;
-		public static final int GREATER_OR_EQUAL = 0x06;
-		public static final int LESS_OR_EQUAL = 0x07;
-		/** default value to supply when the operator type is not used */
-		public static final int IGNORED = BETWEEN;
-		
-		/* package */ public static void validateSecondArg(int comparisonOperator, String paramValue) {
-			switch (comparisonOperator) {
-				case BETWEEN:
-				case NOT_BETWEEN:
-					if (paramValue == null) {
-						throw new IllegalArgumentException("expr2 must be supplied for 'between' comparisons");
-					}
-				// all other operators don't need second arg
-			}
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DataValidationHelper.java b/trunk/src/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
deleted file mode 100644
index 2e74946..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.util.CellRangeAddressList;
-
-/**
- * @author <a href="rjankiraman@emptoris.com">Radhakrishnan J</a>
- * 
- */
-public interface DataValidationHelper {
-	
-	DataValidationConstraint createFormulaListConstraint(String listFormula);
-
-	DataValidationConstraint createExplicitListConstraint(String[] listOfValues);
-
-	DataValidationConstraint createNumericConstraint(int validationType,int operatorType, String formula1, String formula2);
-	
-	DataValidationConstraint createTextLengthConstraint(int operatorType, String formula1, String formula2);
-	
-	DataValidationConstraint createDecimalConstraint(int operatorType, String formula1, String formula2);
-	
-	DataValidationConstraint createIntegerConstraint(int operatorType, String formula1, String formula2);
-	
-	DataValidationConstraint createDateConstraint(int operatorType, String formula1, String formula2,String dateFormat);
-	
-	DataValidationConstraint createTimeConstraint(int operatorType, String formula1, String formula2);
-	
-	DataValidationConstraint createCustomConstraint(String formula);
-	
-	DataValidation createValidation(DataValidationConstraint constraint,CellRangeAddressList cellRangeAddressList);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java
deleted file mode 100644
index f4e4cc5..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java
+++ /dev/null
@@ -1,682 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.regex.Pattern;
-
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Contains methods for dealing with Excel dates.
- */
-public class DateUtil {
-    protected DateUtil() {
-        // no instances of this class
-    }
-
-    public static final int SECONDS_PER_MINUTE = 60;
-    public static final int MINUTES_PER_HOUR = 60;
-    public static final int HOURS_PER_DAY = 24;
-    public static final int SECONDS_PER_DAY = (HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
-
-    private static final int    BAD_DATE         = -1;   // used to specify that date is invalid
-    public static final long   DAY_MILLISECONDS = SECONDS_PER_DAY * 1000L;
-
-    private static final Pattern TIME_SEPARATOR_PATTERN = Pattern.compile(":");
-
-    /**
-     * The following patterns are used in {@link #isADateFormat(int, String)}
-     */
-    private static final Pattern date_ptrn1 = Pattern.compile("^\\[\\$\\-.*?\\]");
-    private static final Pattern date_ptrn2 = Pattern.compile("^\\[[a-zA-Z]+\\]");
-    private static final Pattern date_ptrn3a = Pattern.compile("[yYmMdDhHsS]");
-    private static final Pattern date_ptrn3b = Pattern.compile("^[\\[\\]yYmMdDhHsS\\-T/,. :\"\\\\]+0*[ampAMP/]*$");
-    //  elapsed time patterns: [h],[m] and [s]
-    private static final Pattern date_ptrn4 = Pattern.compile("^\\[([hH]+|[mM]+|[sS]+)\\]");
-
-    /**
-     * Given a Date, converts it into a double representing its internal Excel representation,
-     *   which is the number of days since 1/1/1900. Fractional days represent hours, minutes, and seconds.
-     *
-     * @return Excel representation of Date (-1 if error - test for error by checking for less than 0.1)
-     * @param  date the Date
-     */
-    public static double getExcelDate(Date date) {
-        return getExcelDate(date, false);
-    }
-    /**
-     * Given a Date, converts it into a double representing its internal Excel representation,
-     *   which is the number of days since 1/1/1900. Fractional days represent hours, minutes, and seconds.
-     *
-     * @return Excel representation of Date (-1 if error - test for error by checking for less than 0.1)
-     * @param date the Date
-     * @param use1904windowing Should 1900 or 1904 date windowing be used?
-     */
-    public static double getExcelDate(Date date, boolean use1904windowing) {
-        Calendar calStart = LocaleUtil.getLocaleCalendar();
-        calStart.setTime(date);   // If date includes hours, minutes, and seconds, set them to 0
-        return internalGetExcelDate(calStart, use1904windowing);
-    }
-    /**
-     * Given a Date in the form of a Calendar, converts it into a double
-     *  representing its internal Excel representation, which is the
-     *  number of days since 1/1/1900. Fractional days represent hours,
-     *  minutes, and seconds.
-     *
-     * @return Excel representation of Date (-1 if error - test for error by checking for less than 0.1)
-     * @param date the Calendar holding the date to convert
-     * @param use1904windowing Should 1900 or 1904 date windowing be used?
-     */
-    public static double getExcelDate(Calendar date, boolean use1904windowing) {
-        // Don't alter the supplied Calendar as we do our work
-        return internalGetExcelDate( (Calendar)date.clone(), use1904windowing );
-    }
-    private static double internalGetExcelDate(Calendar date, boolean use1904windowing) {
-        if ((!use1904windowing && date.get(Calendar.YEAR) < 1900) ||
-            (use1904windowing && date.get(Calendar.YEAR) < 1904))
-        {
-            return BAD_DATE;
-        }
-        // Because of daylight time saving we cannot use
-        //     date.getTime() - calStart.getTimeInMillis()
-        // as the difference in milliseconds between 00:00 and 04:00
-        // can be 3, 4 or 5 hours but Excel expects it to always
-        // be 4 hours.
-        // E.g. 2004-03-28 04:00 CEST - 2004-03-28 00:00 CET is 3 hours
-        // and 2004-10-31 04:00 CET - 2004-10-31 00:00 CEST is 5 hours
-        double fraction = (((date.get(Calendar.HOUR_OF_DAY) * 60
-                             + date.get(Calendar.MINUTE)
-                            ) * 60 + date.get(Calendar.SECOND)
-                           ) * 1000 + date.get(Calendar.MILLISECOND)
-                          ) / ( double ) DAY_MILLISECONDS;
-        Calendar calStart = dayStart(date);
-
-        double value = fraction + absoluteDay(calStart, use1904windowing);
-
-        if (!use1904windowing && value >= 60) {
-            value++;
-        } else if (use1904windowing) {
-            value--;
-        }
-
-        return value;
-    }
-
-    /**
-     *  Given an Excel date with using 1900 date windowing, and
-     *  converts it to a java.util.Date.
-     *  
-     *  Excel Dates and Times are stored without any timezone 
-     *  information. If you know (through other means) that your file 
-     *  uses a different TimeZone to the system default, you can use
-     *  this version of the getJavaDate() method to handle it.
-     *   
-     *  @param date  The Excel date.
-     *  @param tz The TimeZone to evaluate the date in
-     *  @return Java representation of the date, or null if date is not a valid Excel date
-     */
-    public static Date getJavaDate(double date, TimeZone tz) {
-       return getJavaDate(date, false, tz, false);
-    }
-    /**
-     *  Given an Excel date with using 1900 date windowing, and
-     *   converts it to a java.util.Date.
-     *
-     *  NOTE: If the default <code>TimeZone</code> in Java uses Daylight
-     *  Saving Time then the conversion back to an Excel date may not give
-     *  the same value, that is the comparison
-     *  <CODE>excelDate == getExcelDate(getJavaDate(excelDate,false))</CODE>
-     *  is not always true. For example if default timezone is
-     *  <code>Europe/Copenhagen</code>, on 2004-03-28 the minute after
-     *  01:59 CET is 03:00 CEST, if the excel date represents a time between
-     *  02:00 and 03:00 then it is converted to past 03:00 summer time
-     *
-     *  @param date  The Excel date.
-     *  @return Java representation of the date, or null if date is not a valid Excel date
-     *  @see java.util.TimeZone
-     */
-    public static Date getJavaDate(double date) {
-        return getJavaDate(date, false, null, false);
-    }
-
-    /**
-     *  Given an Excel date with either 1900 or 1904 date windowing,
-     *  converts it to a java.util.Date.
-     *  
-     *  Excel Dates and Times are stored without any timezone 
-     *  information. If you know (through other means) that your file 
-     *  uses a different TimeZone to the system default, you can use
-     *  this version of the getJavaDate() method to handle it.
-     *   
-     *  @param date  The Excel date.
-     *  @param tz The TimeZone to evaluate the date in
-     *  @param use1904windowing  true if date uses 1904 windowing,
-     *   or false if using 1900 date windowing.
-     *  @return Java representation of the date, or null if date is not a valid Excel date
-     */
-    public static Date getJavaDate(double date, boolean use1904windowing, TimeZone tz) {
-        return getJavaDate(date, use1904windowing, tz, false);
-    }
-    
-    /**
-     *  Given an Excel date with either 1900 or 1904 date windowing,
-     *  converts it to a java.util.Date.
-     *  
-     *  Excel Dates and Times are stored without any timezone 
-     *  information. If you know (through other means) that your file 
-     *  uses a different TimeZone to the system default, you can use
-     *  this version of the getJavaDate() method to handle it.
-     *   
-     *  @param date  The Excel date.
-     *  @param tz The TimeZone to evaluate the date in
-     *  @param use1904windowing  true if date uses 1904 windowing,
-     *   or false if using 1900 date windowing.
-     *  @param roundSeconds round to closest second
-     *  @return Java representation of the date, or null if date is not a valid Excel date
-     */
-    public static Date getJavaDate(double date, boolean use1904windowing, TimeZone tz, boolean roundSeconds) {
-        Calendar calendar = getJavaCalendar(date, use1904windowing, tz, roundSeconds);
-        return calendar == null ? null : calendar.getTime();
-    }
-    
-    /**
-     *  Given an Excel date with either 1900 or 1904 date windowing,
-     *  converts it to a java.util.Date.
-     *
-     *  NOTE: If the default <code>TimeZone</code> in Java uses Daylight
-     *  Saving Time then the conversion back to an Excel date may not give
-     *  the same value, that is the comparison
-     *  <CODE>excelDate == getExcelDate(getJavaDate(excelDate,false))</CODE>
-     *  is not always true. For example if default timezone is
-     *  <code>Europe/Copenhagen</code>, on 2004-03-28 the minute after
-     *  01:59 CET is 03:00 CEST, if the excel date represents a time between
-     *  02:00 and 03:00 then it is converted to past 03:00 summer time
-     *
-     *  @param date  The Excel date.
-     *  @param use1904windowing  true if date uses 1904 windowing,
-     *   or false if using 1900 date windowing.
-     *  @return Java representation of the date, or null if date is not a valid Excel date
-     *  @see java.util.TimeZone
-     */
-    public static Date getJavaDate(double date, boolean use1904windowing) {
-        return getJavaDate(date, use1904windowing, null, false);
-    }
-
-    public static void setCalendar(Calendar calendar, int wholeDays,
-            int millisecondsInDay, boolean use1904windowing, boolean roundSeconds) {
-        int startYear = 1900;
-        int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which it isn't
-        if (use1904windowing) {
-            startYear = 1904;
-            dayAdjust = 1; // 1904 date windowing uses 1/2/1904 as the first day
-        }
-        else if (wholeDays < 61) {
-            // Date is prior to 3/1/1900, so adjust because Excel thinks 2/29/1900 exists
-            // If Excel date == 2/29/1900, will become 3/1/1900 in Java representation
-            dayAdjust = 0;
-        }
-        calendar.set(startYear,0, wholeDays + dayAdjust, 0, 0, 0);
-        calendar.set(Calendar.MILLISECOND, millisecondsInDay);
-        if (calendar.get(Calendar.MILLISECOND) == 0) {
-            calendar.clear(Calendar.MILLISECOND);
-        }
-        if (roundSeconds) {
-            calendar.add(Calendar.MILLISECOND, 500);
-            calendar.clear(Calendar.MILLISECOND);
-        }
-    }
-
-
-    /**
-     * Get EXCEL date as Java Calendar (with default time zone).
-     * This is like {@link #getJavaDate(double)} but returns a Calendar object.
-     *  @param date  The Excel date.
-     *  @return Java representation of the date, or null if date is not a valid Excel date
-     */
-    public static Calendar getJavaCalendar(double date) {
-        return getJavaCalendar(date, false, (TimeZone)null, false);
-    }
-
-    /**
-     * Get EXCEL date as Java Calendar (with default time zone).
-     * This is like {@link #getJavaDate(double, boolean)} but returns a Calendar object.
-     *  @param date  The Excel date.
-     *  @param use1904windowing  true if date uses 1904 windowing,
-     *   or false if using 1900 date windowing.
-     *  @return Java representation of the date, or null if date is not a valid Excel date
-     */
-    public static Calendar getJavaCalendar(double date, boolean use1904windowing) {
-        return getJavaCalendar(date, use1904windowing, (TimeZone)null, false);
-    }
-
-    /**
-     * Get EXCEL date as Java Calendar with UTC time zone.
-     * This is similar to {@link #getJavaDate(double, boolean)} but returns a
-     * Calendar object that has UTC as time zone, so no daylight saving hassle.
-     * @param date  The Excel date.
-     * @param use1904windowing  true if date uses 1904 windowing,
-     *  or false if using 1900 date windowing.
-     * @return Java representation of the date in UTC, or null if date is not a valid Excel date
-     */
-    public static Calendar getJavaCalendarUTC(double date, boolean use1904windowing) {
-    	return getJavaCalendar(date, use1904windowing, LocaleUtil.TIMEZONE_UTC, false);
-    }
-
-
-    /**
-     * Get EXCEL date as Java Calendar with given time zone.
-     * @param date  The Excel date.
-     * @param use1904windowing  true if date uses 1904 windowing,
-     *  or false if using 1900 date windowing.
-     * @param timeZone The TimeZone to evaluate the date in
-     * @return Java representation of the date, or null if date is not a valid Excel date
-     */
-    public static Calendar getJavaCalendar(double date, boolean use1904windowing, TimeZone timeZone) {
-        return getJavaCalendar(date, use1904windowing, timeZone, false);
-    }
-        
-    /**
-     * Get EXCEL date as Java Calendar with given time zone.
-     * @param date  The Excel date.
-     * @param use1904windowing  true if date uses 1904 windowing,
-     *  or false if using 1900 date windowing.
-     * @param timeZone The TimeZone to evaluate the date in
-     * @param roundSeconds round to closest second
-     * @return Java representation of the date, or null if date is not a valid Excel date
-     */
-    public static Calendar getJavaCalendar(double date, boolean use1904windowing, TimeZone timeZone, boolean roundSeconds) {
-        if (!isValidExcelDate(date)) {
-            return null;
-        }
-        int wholeDays = (int)Math.floor(date);
-        int millisecondsInDay = (int)((date - wholeDays) * DAY_MILLISECONDS + 0.5);
-        Calendar calendar;
-        if (timeZone != null) {
-            calendar = LocaleUtil.getLocaleCalendar(timeZone);
-        } else {
-            calendar = LocaleUtil.getLocaleCalendar(); // using default time-zone
-        }
-        setCalendar(calendar, wholeDays, millisecondsInDay, use1904windowing, roundSeconds);
-        return calendar;
-    }
-
-    // variables for performance optimization:
-    // avoid re-checking DataUtil.isADateFormat(int, String) if a given format
-    // string represents a date format if the same string is passed multiple times.
-    // see https://issues.apache.org/bugzilla/show_bug.cgi?id=55611
-    private static ThreadLocal<Integer> lastFormatIndex = new ThreadLocal<Integer>() {
-        protected Integer initialValue() {
-            return -1;
-        }
-    };
-    private static ThreadLocal<String> lastFormatString = new ThreadLocal<String>();
-    private static ThreadLocal<Boolean> lastCachedResult = new ThreadLocal<Boolean>();
-    
-    private static boolean isCached(String formatString, int formatIndex) {
-        String cachedFormatString = lastFormatString.get();
-        return cachedFormatString != null && formatIndex == lastFormatIndex.get()
-                && formatString.equals(cachedFormatString);
-    }
-
-    private static void cache(String formatString, int formatIndex, boolean cached) {
-        lastFormatIndex.set(formatIndex);
-        lastFormatString.set(formatString);
-        lastCachedResult.set(Boolean.valueOf(cached));
-    }
-
-    /**
-     * Given a format ID and its format String, will check to see if the
-     *  format represents a date format or not.
-     * Firstly, it will check to see if the format ID corresponds to an
-     *  internal excel date format (eg most US date formats)
-     * If not, it will check to see if the format string only contains
-     *  date formatting characters (ymd-/), which covers most
-     *  non US date formats.
-     *
-     * @param formatIndex The index of the format, eg from ExtendedFormatRecord.getFormatIndex
-     * @param formatString The format string, eg from FormatRecord.getFormatString
-     * @see #isInternalDateFormat(int)
-     */
-
-    public static boolean isADateFormat(int formatIndex, String formatString) {
-        // First up, is this an internal date format?
-        if(isInternalDateFormat(formatIndex)) {
-            cache(formatString, formatIndex, true);
-            return true;
-        }
-
-        // If we didn't get a real string, don't even cache it as we can always find this out quickly
-        if(formatString == null || formatString.length() == 0) {
-            return false;
-        }
-
-        // check the cache first
-        if (isCached(formatString, formatIndex)) {
-            return lastCachedResult.get();
-        }
-
-        String fs = formatString;
-        /*if (false) {
-            // Normalize the format string. The code below is equivalent
-            // to the following consecutive regexp replacements:
-
-             // Translate \- into just -, before matching
-             fs = fs.replaceAll("\\\\-","-");
-             // And \, into ,
-             fs = fs.replaceAll("\\\\,",",");
-             // And \. into .
-             fs = fs.replaceAll("\\\\\\.",".");
-             // And '\ ' into ' '
-             fs = fs.replaceAll("\\\\ "," ");
-
-             // If it end in ;@, that's some crazy dd/mm vs mm/dd
-             //  switching stuff, which we can ignore
-             fs = fs.replaceAll(";@", "");
-
-             // The code above was reworked as suggested in bug 48425:
-             // simple loop is more efficient than consecutive regexp replacements.
-        }*/
-        final int length = fs.length();
-        StringBuilder sb = new StringBuilder(length);
-        for (int i = 0; i < length; i++) {
-            char c = fs.charAt(i);
-            if (i < length - 1) {
-                char nc = fs.charAt(i + 1);
-                if (c == '\\') {
-                    switch (nc) {
-                        case '-':
-                        case ',':
-                        case '.':
-                        case ' ':
-                        case '\\':
-                            // skip current '\' and continue to the next char
-                            continue;
-                    }
-                } else if (c == ';' && nc == '@') {
-                    i++;
-                    // skip ";@" duplets
-                    continue;
-                }
-            }
-            sb.append(c);
-        }
-        fs = sb.toString();
-
-        // short-circuit if it indicates elapsed time: [h], [m] or [s]
-        if(date_ptrn4.matcher(fs).matches()){
-            cache(formatString, formatIndex, true);
-            return true;
-        }
-
-        // If it starts with [$-...], then could be a date, but
-        //  who knows what that starting bit is all about
-        fs = date_ptrn1.matcher(fs).replaceAll("");
-        // If it starts with something like [Black] or [Yellow],
-        //  then it could be a date
-        fs = date_ptrn2.matcher(fs).replaceAll("");
-        // You're allowed something like dd/mm/yy;[red]dd/mm/yy
-        //  which would place dates before 1900/1904 in red
-        // For now, only consider the first one
-        final int separatorIndex = fs.indexOf(';');
-        if(0 < separatorIndex && separatorIndex < fs.length()-1) {
-           fs = fs.substring(0, separatorIndex);
-        }
-
-        // Ensure it has some date letters in it
-        // (Avoids false positives on the rest of pattern 3)
-        if (! date_ptrn3a.matcher(fs).find()) {
-           return false;
-        }
-        
-        // If we get here, check it's only made up, in any case, of:
-        //  y m d h s - \ / , . : [ ] T
-        // optionally followed by AM/PM
-
-        boolean result = date_ptrn3b.matcher(fs).matches();
-        cache(formatString, formatIndex, result);
-        return result;
-    }
-
-    /**
-     * Given a format ID this will check whether the format represents
-     *  an internal excel date format or not.
-     * @see #isADateFormat(int, java.lang.String)
-     */
-    public static boolean isInternalDateFormat(int format) {
-            switch(format) {
-                // Internal Date Formats as described on page 427 in
-                // Microsoft Excel Dev's Kit...
-                case 0x0e:
-                case 0x0f:
-                case 0x10:
-                case 0x11:
-                case 0x12:
-                case 0x13:
-                case 0x14:
-                case 0x15:
-                case 0x16:
-                case 0x2d:
-                case 0x2e:
-                case 0x2f:
-                    return true;
-            }
-       return false;
-    }
-
-    /**
-     *  Check if a cell contains a date
-     *  Since dates are stored internally in Excel as double values
-     *  we infer it is a date if it is formatted as such.
-     *  @see #isADateFormat(int, String)
-     *  @see #isInternalDateFormat(int)
-     */
-    public static boolean isCellDateFormatted(Cell cell) {
-        if (cell == null) return false;
-        boolean bDate = false;
-
-        double d = cell.getNumericCellValue();
-        if ( DateUtil.isValidExcelDate(d) ) {
-            CellStyle style = cell.getCellStyle();
-            if(style==null) return false;
-            int i = style.getDataFormat();
-            String f = style.getDataFormatString();
-            bDate = isADateFormat(i, f);
-        }
-        return bDate;
-    }
-    /**
-     *  Check if a cell contains a date, checking only for internal
-     *   excel date formats.
-     *  As Excel stores a great many of its dates in "non-internal"
-     *   date formats, you will not normally want to use this method.
-     *  @see #isADateFormat(int,String)
-     *  @see #isInternalDateFormat(int)
-     */
-    public static boolean isCellInternalDateFormatted(Cell cell) {
-        if (cell == null) return false;
-        boolean bDate = false;
-
-        double d = cell.getNumericCellValue();
-        if ( DateUtil.isValidExcelDate(d) ) {
-            CellStyle style = cell.getCellStyle();
-            int i = style.getDataFormat();
-            bDate = isInternalDateFormat(i);
-        }
-        return bDate;
-    }
-
-
-    /**
-     * Given a double, checks if it is a valid Excel date.
-     *
-     * @return true if valid
-     * @param  value the double value
-     */
-
-    public static boolean isValidExcelDate(double value)
-    {
-        return (value > -Double.MIN_VALUE);
-    }
-
-    /**
-     * Given a Calendar, return the number of days since 1900/12/31.
-     *
-     * @return days number of days since 1900/12/31
-     * @param  cal the Calendar
-     * @exception IllegalArgumentException if date is invalid
-     */
-    protected static int absoluteDay(Calendar cal, boolean use1904windowing)
-    {
-        return cal.get(Calendar.DAY_OF_YEAR)
-               + daysInPriorYears(cal.get(Calendar.YEAR), use1904windowing);
-    }
-
-    /**
-     * Return the number of days in prior years since 1900
-     *
-     * @return    days  number of days in years prior to yr.
-     * @param     yr    a year (1900 < yr < 4000)
-     * @param use1904windowing
-     * @exception IllegalArgumentException if year is outside of range.
-     */
-
-    private static int daysInPriorYears(int yr, boolean use1904windowing)
-    {
-        if ((!use1904windowing && yr < 1900) || (use1904windowing && yr < 1904)) {
-            throw new IllegalArgumentException("'year' must be 1900 or greater");
-        }
-
-        int yr1  = yr - 1;
-        int leapDays =   yr1 / 4   // plus julian leap days in prior years
-                       - yr1 / 100 // minus prior century years
-                       + yr1 / 400 // plus years divisible by 400
-                       - 460;      // leap days in previous 1900 years
-
-        return 365 * (yr - (use1904windowing ? 1904 : 1900)) + leapDays;
-    }
-
-    // set HH:MM:SS fields of cal to 00:00:00:000
-    private static Calendar dayStart(final Calendar cal)
-    {
-        cal.get(Calendar
-            .HOUR_OF_DAY);   // force recalculation of internal fields
-        cal.set(Calendar.HOUR_OF_DAY, 0);
-        cal.set(Calendar.MINUTE, 0);
-        cal.set(Calendar.SECOND, 0);
-        cal.set(Calendar.MILLISECOND, 0);
-        cal.get(Calendar
-            .HOUR_OF_DAY);   // force recalculation of internal fields
-        return cal;
-    }
-
-
-    @SuppressWarnings("serial")
-    private static final class FormatException extends Exception {
-        public FormatException(String msg) {
-            super(msg);
-        }
-    }
-
-    /**
-     * Converts a string of format "HH:MM" or "HH:MM:SS" to its (Excel) numeric equivalent
-     *
-     * @return a double between 0 and 1 representing the fraction of the day
-     */
-    public static double convertTime(String timeStr) {
-        try {
-            return convertTimeInternal(timeStr);
-        } catch (FormatException e) {
-            String msg = "Bad time format '" + timeStr
-                + "' expected 'HH:MM' or 'HH:MM:SS' - " + e.getMessage();
-            throw new IllegalArgumentException(msg);
-        }
-    }
-    private static double convertTimeInternal(String timeStr) throws FormatException {
-        int len = timeStr.length();
-        if (len < 4 || len > 8) {
-            throw new FormatException("Bad length");
-        }
-        String[] parts = TIME_SEPARATOR_PATTERN.split(timeStr);
-
-        String secStr;
-        switch (parts.length) {
-            case 2: secStr = "00"; break;
-            case 3: secStr = parts[2]; break;
-            default:
-                throw new FormatException("Expected 2 or 3 fields but got (" + parts.length + ")");
-        }
-        String hourStr = parts[0];
-        String minStr = parts[1];
-        int hours = parseInt(hourStr, "hour", HOURS_PER_DAY);
-        int minutes = parseInt(minStr, "minute", MINUTES_PER_HOUR);
-        int seconds = parseInt(secStr, "second", SECONDS_PER_MINUTE);
-
-        double totalSeconds = seconds + (minutes + (hours) * 60) * 60;
-        return totalSeconds / (SECONDS_PER_DAY);
-    }
-    /**
-     * Converts a string of format "YYYY/MM/DD" to its (Excel) numeric equivalent
-     *
-     * @return a double representing the (integer) number of days since the start of the Excel epoch
-     */
-    public static Date parseYYYYMMDDDate(String dateStr) {
-        try {
-            return parseYYYYMMDDDateInternal(dateStr);
-        } catch (FormatException e) {
-            String msg = "Bad time format " + dateStr
-                + " expected 'YYYY/MM/DD' - " + e.getMessage();
-            throw new IllegalArgumentException(msg);
-        }
-    }
-    private static Date parseYYYYMMDDDateInternal(String timeStr) throws FormatException {
-        if(timeStr.length() != 10) {
-            throw new FormatException("Bad length");
-        }
-
-        String yearStr = timeStr.substring(0, 4);
-        String monthStr = timeStr.substring(5, 7);
-        String dayStr = timeStr.substring(8, 10);
-        int year = parseInt(yearStr, "year", Short.MIN_VALUE, Short.MAX_VALUE);
-        int month = parseInt(monthStr, "month", 1, 12);
-        int day = parseInt(dayStr, "day", 1, 31);
-
-        Calendar cal = LocaleUtil.getLocaleCalendar(year, month-1, day);
-        return cal.getTime();
-    }
-    private static int parseInt(String strVal, String fieldName, int rangeMax) throws FormatException {
-        return parseInt(strVal, fieldName, 0, rangeMax-1);
-    }
-
-    private static int parseInt(String strVal, String fieldName, int lowerLimit, int upperLimit) throws FormatException {
-        int result;
-        try {
-            result = Integer.parseInt(strVal);
-        } catch (NumberFormatException e) {
-            throw new FormatException("Bad int format '" + strVal + "' for " + fieldName + " field");
-        }
-        if (result < lowerLimit || result > upperLimit) {
-            throw new FormatException(fieldName + " value (" + result
-                    + ") is outside the allowable range(0.." + upperLimit + ")");
-        }
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Drawing.java b/trunk/src/java/org/apache/poi/ss/usermodel/Drawing.java
deleted file mode 100644
index aaf5660..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Drawing.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-/**
- * High level representation of spreadsheet drawing.
- * @author Yegor Kozlov
- * @author Roman Kashitsyn
- */
-public interface Drawing {
-	/**
-	 * Creates a picture.
-	 * @param anchor       the client anchor describes how this picture is
-	 *                     attached to the sheet.
-	 * @param pictureIndex the index of the picture in the workbook collection
-	 *                     of pictures.
-	 *
-	 * @return the newly created picture.
-	 */
-	Picture createPicture(ClientAnchor anchor, int pictureIndex);
-
-	/**
-	 * Creates a comment.
-	 * @param anchor the client anchor describes how this comment is attached
-	 *               to the sheet.
-	 * @return the newly created comment.
-	 */
-	Comment createCellComment(ClientAnchor anchor);
-
-	/**
-	 * Creates a chart.
-	 * @param anchor the client anchor describes how this chart is attached to
-	 *               the sheet.
-	 * @return the newly created chart
-	 */
-	Chart createChart(ClientAnchor anchor);
-
-	/**
-	 * Creates a new client anchor and sets the top-left and bottom-right
-	 * coordinates of the anchor.
-	 *
-	 * @param dx1  the x coordinate in EMU within the first cell.
-	 * @param dy1  the y coordinate in EMU within the first cell.
-	 * @param dx2  the x coordinate in EMU within the second cell.
-	 * @param dy2  the y coordinate in EMU within the second cell.
-	 * @param col1 the column (0 based) of the first cell.
-	 * @param row1 the row (0 based) of the first cell.
-	 * @param col2 the column (0 based) of the second cell.
-	 * @param row2 the row (0 based) of the second cell.
-	 * @return the newly created client anchor
-	 */
-	ClientAnchor createAnchor(int dx1, int dy1, int dx2, int dy2, int col1, int row1, int col2, int row2);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java b/trunk/src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
deleted file mode 100644
index 2efbb3f..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   2012 - Alfresco Software, Ltd.
-   Alfresco Software has modified source of this file
-   The details of changes as svn diff can be found in svn at location root/projects/3rd-party/src 
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.FieldPosition;
-import java.text.Format;
-import java.text.ParsePosition;
-import java.util.Locale;
-
-/**
- * A format that formats a double as Excel would, ignoring FieldPosition.
- * All other operations are unsupported.
- **/
-public class ExcelGeneralNumberFormat extends Format {
-
-    private static final long serialVersionUID = 1L;
-
-    private static final MathContext TO_10_SF = new MathContext(10, RoundingMode.HALF_UP);
-
-    private final DecimalFormatSymbols decimalSymbols;
-    private final DecimalFormat integerFormat;
-    private final DecimalFormat decimalFormat;
-    private final DecimalFormat scientificFormat;
-
-    public ExcelGeneralNumberFormat(final Locale locale) {
-        decimalSymbols = DecimalFormatSymbols.getInstance(locale);
-        scientificFormat = new DecimalFormat("0.#####E0", decimalSymbols);
-        DataFormatter.setExcelStyleRoundingMode(scientificFormat);
-        integerFormat = new DecimalFormat("#", decimalSymbols);
-        DataFormatter.setExcelStyleRoundingMode(integerFormat);
-        decimalFormat = new DecimalFormat("#.##########", decimalSymbols);
-        DataFormatter.setExcelStyleRoundingMode(decimalFormat);
-    }
-
-    public StringBuffer format(Object number, StringBuffer toAppendTo, FieldPosition pos) {
-        final double value;
-        if (number instanceof Number) {
-            value = ((Number)number).doubleValue();
-            if (Double.isInfinite(value) || Double.isNaN(value)) {
-                return integerFormat.format(number, toAppendTo, pos);
-            }
-        } else {
-            // testBug54786 gets here with a date, so retain previous behaviour
-            return integerFormat.format(number, toAppendTo, pos);
-        }
-
-        final double abs = Math.abs(value);
-        if (abs >= 1E11 || (abs <= 1E-10 && abs > 0)) {
-            return scientificFormat.format(number, toAppendTo, pos);
-        } else if (Math.floor(value) == value || abs >= 1E10) {
-            // integer, or integer portion uses all 11 allowed digits
-            return integerFormat.format(number, toAppendTo, pos);
-        }
-        // Non-integers of non-scientific magnitude are formatted as "up to 11
-        // numeric characters, with the decimal point counting as a numeric
-        // character". We know there is a decimal point, so limit to 10 digits.
-        // https://support.microsoft.com/en-us/kb/65903
-        final double rounded = new BigDecimal(value).round(TO_10_SF).doubleValue();
-        return decimalFormat.format(rounded, toAppendTo, pos);
-    }
-
-    public Object parseObject(String source, ParsePosition pos) {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java b/trunk/src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
deleted file mode 100644
index 5f37bce..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import java.util.*;
-
-import org.apache.poi.util.LocaleUtil;
-
-import java.math.RoundingMode;
-import java.text.*;
-
-/**
- * A wrapper around a {@link SimpleDateFormat} instance,
- * which handles a few Excel-style extensions that
- * are not supported by {@link SimpleDateFormat}.
- * Currently, the extensions are around the handling
- * of elapsed time, eg rendering 1 day 2 hours
- * as 26 hours.
- */
-public class ExcelStyleDateFormatter extends SimpleDateFormat {
-    public static final char MMMMM_START_SYMBOL = '\ue001';
-    public static final char MMMMM_TRUNCATE_SYMBOL = '\ue002';
-    public static final char H_BRACKET_SYMBOL = '\ue010';
-    public static final char HH_BRACKET_SYMBOL = '\ue011';
-    public static final char M_BRACKET_SYMBOL = '\ue012';
-    public static final char MM_BRACKET_SYMBOL = '\ue013';
-    public static final char S_BRACKET_SYMBOL = '\ue014';
-    public static final char SS_BRACKET_SYMBOL = '\ue015';
-    public static final char L_BRACKET_SYMBOL = '\ue016';
-    public static final char LL_BRACKET_SYMBOL = '\ue017';
-
-    private static final DecimalFormat format1digit;
-    private static final DecimalFormat format2digits;
-
-    private static final DecimalFormat format3digit;
-    private static final DecimalFormat format4digits;
-
-    static {
-        DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(Locale.ROOT);
-        format1digit = new DecimalFormat("0", dfs);
-        format2digits = new DecimalFormat("00", dfs);
-        format3digit = new DecimalFormat("0", dfs);
-        format4digits = new DecimalFormat("00", dfs);
-        DataFormatter.setExcelStyleRoundingMode(format1digit, RoundingMode.DOWN);
-        DataFormatter.setExcelStyleRoundingMode(format2digits, RoundingMode.DOWN);
-        DataFormatter.setExcelStyleRoundingMode(format3digit);
-        DataFormatter.setExcelStyleRoundingMode(format4digits);
-    }
-    
-    {
-        setTimeZone(LocaleUtil.getUserTimeZone());
-    }
-
-    private double dateToBeFormatted = 0.0;
-
-    // no-arg constructor is private because of undefined super call with locale
-
-    public ExcelStyleDateFormatter(String pattern) {
-        super(processFormatPattern(pattern), LocaleUtil.getUserLocale());
-    }
-
-    public ExcelStyleDateFormatter(String pattern,
-                                   DateFormatSymbols formatSymbols) {
-        super(processFormatPattern(pattern), formatSymbols);
-    }
-
-    public ExcelStyleDateFormatter(String pattern, Locale locale) {
-        super(processFormatPattern(pattern), locale);
-    }
-
-    /**
-     * Takes a format String, and replaces Excel specific bits
-     * with our detection sequences
-     */
-    private static String processFormatPattern(String f) {
-        String t = f.replaceAll("MMMMM", MMMMM_START_SYMBOL + "MMM" + MMMMM_TRUNCATE_SYMBOL);
-        t = t.replaceAll("\\[H\\]", String.valueOf(H_BRACKET_SYMBOL));
-        t = t.replaceAll("\\[HH\\]", String.valueOf(HH_BRACKET_SYMBOL));
-        t = t.replaceAll("\\[m\\]", String.valueOf(M_BRACKET_SYMBOL));
-        t = t.replaceAll("\\[mm\\]", String.valueOf(MM_BRACKET_SYMBOL));
-        t = t.replaceAll("\\[s\\]", String.valueOf(S_BRACKET_SYMBOL));
-        t = t.replaceAll("\\[ss\\]", String.valueOf(SS_BRACKET_SYMBOL));
-        t = t.replaceAll("s.000", "s.SSS");
-        t = t.replaceAll("s.00", "s." + LL_BRACKET_SYMBOL);
-        t = t.replaceAll("s.0", "s." + L_BRACKET_SYMBOL);
-        return t;
-    }
-
-    /**
-     * Used to let us know what the date being
-     * formatted is, in Excel terms, which we
-     * may wish to use when handling elapsed
-     * times.
-     */
-    public void setDateToBeFormatted(double date) {
-        this.dateToBeFormatted = date;
-    }
-
-    @Override
-    public StringBuffer format(Date date, StringBuffer paramStringBuffer,
-                               FieldPosition paramFieldPosition) {
-        // Do the normal format
-        String s = super.format(date, paramStringBuffer, paramFieldPosition).toString();
-
-        // Now handle our special cases
-        if (s.indexOf(MMMMM_START_SYMBOL) != -1) {
-            s = s.replaceAll(
-                    MMMMM_START_SYMBOL + "(\\w)\\w+" + MMMMM_TRUNCATE_SYMBOL,
-                    "$1"
-            );
-        }
-
-        if (s.indexOf(H_BRACKET_SYMBOL) != -1 ||
-                s.indexOf(HH_BRACKET_SYMBOL) != -1) {
-            float hours = (float) dateToBeFormatted * 24;
-
-            s = s.replaceAll(
-                    String.valueOf(H_BRACKET_SYMBOL),
-                    format1digit.format(hours)
-            );
-            s = s.replaceAll(
-                    String.valueOf(HH_BRACKET_SYMBOL),
-                    format2digits.format(hours)
-            );
-        }
-
-        if (s.indexOf(M_BRACKET_SYMBOL) != -1 ||
-                s.indexOf(MM_BRACKET_SYMBOL) != -1) {
-            float minutes = (float) dateToBeFormatted * 24 * 60;
-            s = s.replaceAll(
-                    String.valueOf(M_BRACKET_SYMBOL),
-                    format1digit.format(minutes)
-            );
-            s = s.replaceAll(
-                    String.valueOf(MM_BRACKET_SYMBOL),
-                    format2digits.format(minutes)
-            );
-        }
-        if (s.indexOf(S_BRACKET_SYMBOL) != -1 ||
-                s.indexOf(SS_BRACKET_SYMBOL) != -1) {
-            float seconds = (float) (dateToBeFormatted * 24.0 * 60.0 * 60.0);
-            s = s.replaceAll(
-                    String.valueOf(S_BRACKET_SYMBOL),
-                    format1digit.format(seconds)
-            );
-            s = s.replaceAll(
-                    String.valueOf(SS_BRACKET_SYMBOL),
-                    format2digits.format(seconds)
-            );
-        }
-
-        if (s.indexOf(L_BRACKET_SYMBOL) != -1 ||
-                s.indexOf(LL_BRACKET_SYMBOL) != -1) {
-            float millisTemp = (float) ((dateToBeFormatted - Math.floor(dateToBeFormatted)) * 24.0 * 60.0 * 60.0);
-            float millis = (millisTemp - (int) millisTemp);
-            s = s.replaceAll(
-                    String.valueOf(L_BRACKET_SYMBOL),
-                    format3digit.format(millis * 10)
-            );
-            s = s.replaceAll(
-                    String.valueOf(LL_BRACKET_SYMBOL),
-                    format4digits.format(millis * 100)
-            );
-        }
-
-        return new StringBuffer(s);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof ExcelStyleDateFormatter)) {
-            return false;
-        }
-        
-        ExcelStyleDateFormatter other = (ExcelStyleDateFormatter) o;
-        return dateToBeFormatted == other.dateToBeFormatted;
-    }
-    
-    @Override
-    public int hashCode() {
-        return new Double(dateToBeFormatted).hashCode();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java b/trunk/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java
deleted file mode 100644
index 2259bbf..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import java.util.Locale;
-
-import org.apache.poi.hssf.util.HSSFColor;
-
-/**
- * Represents a XSSF-style color (based on either a
- *  {@link org.apache.poi.xssf.usermodel.XSSFColor} or a
- *  {@link org.apache.poi.hssf.record.common.ExtendedColor} 
- */
-public abstract class ExtendedColor implements Color {
-    protected void setColor(java.awt.Color clr) {
-        setRGB(new byte[]{(byte)clr.getRed(), (byte)clr.getGreen(), (byte)clr.getBlue()});
-    }
-
-    /**
-     * A boolean value indicating the color is automatic
-     */
-    public abstract boolean isAuto();
-
-    /**
-     * A boolean value indicating the color is indexed
-     */
-    public abstract boolean isIndexed();
-
-    /**
-     * A boolean value indicating the color is RGB / ARGB
-     */
-    public abstract boolean isRGB();
-    
-    /**
-     * A boolean value indicating the color is from a Theme
-     */
-    public abstract boolean isThemed();
-    
-    /**
-     * Indexed Color value, if {@link #isIndexed()} is true
-     */
-    public abstract short getIndex();
-    
-    /**
-     * Index of Theme color, if {@link #isThemed()} is true
-     */
-    public abstract int getTheme();
-
-    /**
-     * Standard Red Green Blue ctColor value (RGB).
-     * If there was an A (Alpha) value, it will be stripped.
-     */
-    public abstract byte[] getRGB();
-    /**
-     * Standard Alpha Red Green Blue ctColor value (ARGB).
-     */
-    public abstract byte[] getARGB();
-
-    /**
-     * RGB or ARGB or null
-     */
-    protected abstract byte[] getStoredRBG();
-    
-    /**
-     * Sets the Red Green Blue or Alpha Red Green Blue
-     */
-    public abstract void setRGB(byte[] rgb);
-
-    protected byte[] getRGBOrARGB() {
-        if (isIndexed() && getIndex() > 0) {
-            int indexNum = getIndex();
-            HSSFColor indexed = HSSFColor.getIndexHash().get(indexNum);
-            if (indexed != null) {
-                byte[] rgb = new byte[3];
-                rgb[0] = (byte) indexed.getTriplet()[0];
-                rgb[1] = (byte) indexed.getTriplet()[1];
-                rgb[2] = (byte) indexed.getTriplet()[2];
-                return rgb;
-            }
-        }
-
-        // Grab the colour
-        return getStoredRBG();
-    }
-
-    /**
-     * Standard Red Green Blue ctColor value (RGB) with applied tint.
-     * Alpha values are ignored.
-     */
-    public byte[] getRGBWithTint() {
-        byte[] rgb = getStoredRBG();
-        if (rgb != null) {
-            if(rgb.length == 4) {
-               byte[] tmp = new byte[3];
-               System.arraycopy(rgb, 1, tmp, 0, 3);
-               rgb = tmp;
-            }
-            double tint = getTint();
-            for (int i = 0; i < rgb.length; i++){
-                rgb[i] = applyTint(rgb[i] & 0xFF, tint);
-            }
-        }
-        return rgb;
-    }
-
-    /**
-     * Return the ARGB value in hex format, eg FF00FF00.
-     * Works for both regular and indexed colours.
-     */
-    public String getARGBHex() {
-       byte[] rgb = getARGB();
-        if(rgb == null) {
-            return null;
-        }
-
-        StringBuilder sb = new StringBuilder();
-        for(byte c : rgb) {
-          int i = c & 0xff;
-          String cs = Integer.toHexString(i);
-          if(cs.length() == 1) {
-             sb.append('0');
-          }
-          sb.append(cs);
-       }
-       return sb.toString().toUpperCase(Locale.ROOT);
-    }
-    
-    /**
-     * Sets the ARGB value from hex format, eg FF0077FF.
-     * Only works for regular (non-indexed) colours
-     */
-    public void setARGBHex(String argb) {
-        if (argb.length() == 6 || argb.length() == 8) {
-            byte[] rgb = new byte[argb.length()/2];
-            for (int i=0; i<rgb.length; i++) {
-                String part = argb.substring(i*2,(i+1)*2);
-                rgb[i] = (byte)Integer.parseInt(part, 16);
-            }
-            setRGB(rgb);
-        } else {
-            throw new IllegalArgumentException("Must be of the form 112233 or FFEEDDCC");
-        }
-    }
-
-    private static byte applyTint(int lum, double tint){
-        if(tint > 0){
-            return (byte)(lum * (1.0-tint) + (255 - 255 * (1.0-tint)));
-        } else if (tint < 0){
-            return (byte)(lum*(1+tint));
-        } else {
-            return (byte)lum;
-        }
-    }
-
-    /**
-     * Specifies the tint value applied to the ctColor.
-     *
-     * <p>
-     * If tint is supplied, then it is applied to the RGB value of the ctColor to determine the final
-     * ctColor applied.
-     * </p>
-     * <p>
-     * The tint value is stored as a double from -1.0 .. 1.0, where -1.0 means 100% darken and
-     * 1.0 means 100% lighten. Also, 0.0 means no change.
-     * </p>
-     * <p>
-     * In loading the RGB value, it is converted to HLS where HLS values are (0..HLSMAX), where
-     * HLSMAX is currently 255.
-     * </p>
-     * Here are some examples of how to apply tint to ctColor:
-     * <blockquote>
-     * <pre>
-     * If (tint &lt; 0)
-     * Lum' = Lum * (1.0 + tint)
-     *
-     * For example: Lum = 200; tint = -0.5; Darken 50%
-     * Lum' = 200 * (0.5) =&gt; 100
-     * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
-     * Lum' = 200 * (1.0-1.0) =&gt; 0
-     * If (tint &gt; 0)
-     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
-     * For example: Lum = 100; tint = 0.75; Lighten 75%
-     *
-     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
-     * = 100 * .25 + (255 - 255 * .25)
-     * = 25 + (255 - 63) = 25 + 192 = 217
-     * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
-     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
-     * = 100 * 0 + (255 - 255 * 0)
-     * = 0 + (255 - 0) = 255
-     * </pre>
-     * </blockquote>
-     *
-     * @return the tint value
-     */
-    public abstract double getTint();
-
-    /**
-     * Specifies the tint value applied to the ctColor.
-     *
-     * <p>
-     * If tint is supplied, then it is applied to the RGB value of the ctColor to determine the final
-     * ctColor applied.
-     * </p>
-     * <p>
-     * The tint value is stored as a double from -1.0 .. 1.0, where -1.0 means 100% darken and
-     * 1.0 means 100% lighten. Also, 0.0 means no change.
-     * </p>
-     * <p>
-     * In loading the RGB value, it is converted to HLS where HLS values are (0..HLSMAX), where
-     * HLSMAX is currently 255.
-     * </p>
-     * Here are some examples of how to apply tint to ctColor:
-     * <blockquote>
-     * <pre>
-     * If (tint &lt; 0)
-     * Lum' = Lum * (1.0 + tint)
-     *
-     * For example: Lum = 200; tint = -0.5; Darken 50%
-     * Lum' = 200 * (0.5) =&gt; 100
-     * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
-     * Lum' = 200 * (1.0-1.0) =&gt; 0
-     * If (tint &gt; 0)
-     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
-     * For example: Lum = 100; tint = 0.75; Lighten 75%
-     *
-     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
-     * = 100 * .25 + (255 - 255 * .25)
-     * = 25 + (255 - 63) = 25 + 192 = 217
-     * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
-     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
-     * = 100 * 0 + (255 - 255 * 0)
-     * = 0 + (255 - 0) = 255
-     * </pre>
-     * </blockquote>
-     *
-     * @param tint the tint value
-     */
-    public abstract void setTint(double tint);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java b/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java
deleted file mode 100644
index 705fd6d..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * The enumeration value indicating the style of fill pattern being used for a cell format.
- * 
- */
-public enum FillPatternType {
-    
-    /**  No background */
-     NO_FILL(0),
-
-    /**  Solidly filled */
-     SOLID_FOREGROUND(1),
-
-    /**  Small fine dots */
-     FINE_DOTS(2),
-
-    /**  Wide dots */
-     ALT_BARS(3),
-
-    /**  Sparse dots */
-     SPARSE_DOTS(4),
-
-    /**  Thick horizontal bands */
-     THICK_HORZ_BANDS(5),
-
-    /**  Thick vertical bands */
-     THICK_VERT_BANDS(6),
-
-    /**  Thick backward facing diagonals */
-     THICK_BACKWARD_DIAG(7),
-
-    /**  Thick forward facing diagonals */
-     THICK_FORWARD_DIAG(8),
-
-    /**  Large spots */
-     BIG_SPOTS(9),
-
-    /**  Brick-like layout */
-     BRICKS(10),
-
-    /**  Thin horizontal bands */
-     THIN_HORZ_BANDS(11),
-
-    /**  Thin vertical bands */
-     THIN_VERT_BANDS(12),
-
-    /**  Thin backward diagonal */
-     THIN_BACKWARD_DIAG(13),
-
-    /**  Thin forward diagonal */
-     THIN_FORWARD_DIAG(14),
-
-    /**  Squares */
-     SQUARES(15),
-
-    /**  Diamonds */
-     DIAMONDS(16),
-
-    /**  Less Dots */
-     LESS_DOTS(17),
-
-    /**  Least Dots */
-     LEAST_DOTS(18);
-     
-     /** Codes are used by ExtendedFormatRecord in HSSF */
-     private final short code;
-     private FillPatternType(int code) {
-         this.code = (short) code;
-     }
-     
-     public short getCode() {
-         return code;
-     }
-     
-     private final static int length = values().length;
-     public static FillPatternType forInt(int code) {
-         if (code < 0 || code > length) {
-             throw new IllegalArgumentException("Invalid FillPatternType code: " + code);
-         }
-         return values()[code];
-     }
-     // it may also make sense to have an @Internal method to convert STPatternType.Enum
-     // but may cause errors if poi-ooxml.jar is not on the classpath
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Font.java b/trunk/src/java/org/apache/poi/ss/usermodel/Font.java
deleted file mode 100644
index d4bcc11..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Font.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-
-public interface Font {
-    /**
-     * Normal boldness (not bold)
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17.
-     * Boldweight constants no longer needed due to {@link #getBold} and {@link #setBold(boolean)}
-     */
-    public final static short BOLDWEIGHT_NORMAL = 0x190;
-
-    /**
-     * Bold boldness (bold)
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17.
-     * Boldweight constants no longer needed due to {@link #getBold} and {@link #setBold(boolean)}
-     */
-    public final static short BOLDWEIGHT_BOLD = 0x2bc;
-
-    /**
-     * normal type of black color.
-     */
-
-    public final static short COLOR_NORMAL = 0x7fff;
-
-    /**
-     * Dark Red color
-     */
-
-    public final static short COLOR_RED = 0xa;
-
-    /**
-     * no type offsetting (not super or subscript)
-     */
-
-    public final static short SS_NONE = 0;
-
-    /**
-     * superscript
-     */
-
-    public final static short SS_SUPER = 1;
-
-    /**
-     * subscript
-     */
-
-    public final static short SS_SUB = 2;
-
-    /**
-     * not underlined
-     */
-
-    public final static byte U_NONE = 0;
-
-    /**
-     * single (normal) underline
-     */
-
-    public final static byte U_SINGLE = 1;
-
-    /**
-     * double underlined
-     */
-
-    public final static byte U_DOUBLE = 2;
-
-    /**
-     * accounting style single underline
-     */
-
-    public final static byte U_SINGLE_ACCOUNTING = 0x21;
-
-    /**
-     * accounting style double underline
-     */
-
-    public final static byte U_DOUBLE_ACCOUNTING = 0x22;
-
-    /**
-     * ANSI character set
-     */
-    public final static byte ANSI_CHARSET = 0;
-
-    /**
-     * Default character set.
-     */
-    public final static byte DEFAULT_CHARSET = 1;
-
-    /**
-     * Symbol character set
-     */
-    public final static byte SYMBOL_CHARSET = 2;
-
-    /**
-     * set the name for the font (i.e. Arial)
-     * @param name  String representing the name of the font to use
-     */
-
-    void setFontName(String name);
-
-    /**
-     * get the name for the font (i.e. Arial)
-     * @return String representing the name of the font to use
-     */
-
-    String getFontName();
-
-    /**
-     * set the font height in unit's of 1/20th of a point.  Maybe you might want to
-     * use the setFontHeightInPoints which matches to the familiar 10, 12, 14 etc..
-     * @param height height in 1/20ths of a point
-     * @see #setFontHeightInPoints(short)
-     */
-
-    void setFontHeight(short height);
-
-    /**
-     * set the font height
-     * @param height height in the familiar unit of measure - points
-     * @see #setFontHeight(short)
-     */
-
-    void setFontHeightInPoints(short height);
-
-    /**
-     * Get the font height in unit's of 1/20th of a point.
-     * <p>
-     * For many users, the related {@link #getFontHeightInPoints()}
-     *  will be more helpful, as that returns font heights in the
-     *  more familiar points units, eg 10, 12, 14.
-
-     * @return short - height in 1/20ths of a point
-     * @see #getFontHeightInPoints()
-     */
-    short getFontHeight();
-
-    /**
-     * Get the font height in points.
-     * <p>
-     * This will return the same font height that is shown in Excel,
-     *  such as 10 or 14 or 28.
-     * @return short - height in the familiar unit of measure - points
-     * @see #getFontHeight()
-     */
-    short getFontHeightInPoints();
-
-    /**
-     * set whether to use italics or not
-     * @param italic italics or not
-     */
-
-    void setItalic(boolean italic);
-
-    /**
-     * get whether to use italics or not
-     * @return italics or not
-     */
-
-    boolean getItalic();
-
-    /**
-     * set whether to use a strikeout horizontal line through the text or not
-     * @param strikeout or not
-     */
-
-    void setStrikeout(boolean strikeout);
-
-    /**
-     * get whether to use a strikeout horizontal line through the text or not
-     * @return strikeout or not
-     */
-
-    boolean getStrikeout();
-
-    /**
-     * set the color for the font
-     * @param color to use
-     * @see #COLOR_NORMAL Note: Use this rather than HSSFColor.AUTOMATIC for default font color
-     * @see #COLOR_RED
-     */
-
-    void setColor(short color);
-
-    /**
-     * get the color for the font
-     * @return color to use
-     * @see #COLOR_NORMAL
-     * @see #COLOR_RED
-     * @see org.apache.poi.hssf.usermodel.HSSFPalette#getColor(short)
-     */
-    short getColor();
-
-    /**
-     * set normal,super or subscript.
-     * @param offset type to use (none,super,sub)
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-
-    void setTypeOffset(short offset);
-
-    /**
-     * get normal,super or subscript.
-     * @return offset type to use (none,super,sub)
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-
-    short getTypeOffset();
-
-    /**
-     * set type of text underlining to use
-     * @param underline type
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-
-    void setUnderline(byte underline);
-
-    /**
-     * get type of text underlining to use
-     * @return underlining type
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-
-    byte getUnderline();
-
-    /**
-     * get character-set to use.
-     * @return character-set
-     * @see #ANSI_CHARSET
-     * @see #DEFAULT_CHARSET
-     * @see #SYMBOL_CHARSET
-     */
-    int getCharSet();
-
-    /**
-     * set character-set to use.
-     * @see #ANSI_CHARSET
-     * @see #DEFAULT_CHARSET
-     * @see #SYMBOL_CHARSET
-     */
-    void setCharSet(byte charset);
-    /**
-     * set character-set to use.
-     * @see #ANSI_CHARSET
-     * @see #DEFAULT_CHARSET
-     * @see #SYMBOL_CHARSET
-     */
-    void setCharSet(int charset);
-
-    /**
-     * get the index within the XSSFWorkbook (sequence within the collection of Font objects)
-     * 
-     * @return unique index number of the underlying record this Font represents (probably you don't care
-     *  unless you're comparing which one is which)
-     */
-    public short getIndex();
-
-    /**
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #setBold(boolean)}.
-     */
-    public void setBoldweight(short boldweight);
-    public void setBold(boolean bold);
-
-    /**
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #getBold()}.
-     */
-    public short getBoldweight();
-    public boolean getBold();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FontCharset.java b/trunk/src/java/org/apache/poi/ss/usermodel/FontCharset.java
deleted file mode 100644
index 90e4038..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FontCharset.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-
-/**
- * Charset represents the basic set of characters associated with a font (that it can display), and 
- * corresponds to the ANSI codepage (8-bit or DBCS) of that character set used by a given language. 
- * 
- * @author Gisella Bronzetti
- */
-public enum FontCharset {
-
-     ANSI(0),
-     DEFAULT(1),
-     SYMBOL(2),
-     MAC(77),
-     SHIFTJIS(128),
-     HANGEUL(129),
-     JOHAB(130),
-     GB2312(134),
-     CHINESEBIG5(136),
-     GREEK(161),
-     TURKISH(162),
-     VIETNAMESE(163),
-     HEBREW(177),
-     ARABIC(178),
-     BALTIC(186),
-     RUSSIAN(204),
-     THAI(222),
-     EASTEUROPE(238),
-     OEM(255);
-
-    
-    private int charset;
-
-    private FontCharset(int value){
-        charset = value;
-    }
-
-    /**
-     * Returns value of this charset
-     *
-     * @return value of this charset
-     */
-    public int getValue(){
-        return charset;
-    }
-
-    private static FontCharset[] _table = new FontCharset[256];
-    static {
-        for (FontCharset c : values()) {
-            _table[c.getValue()] = c;
-        }
-    }
-
-    public static FontCharset valueOf(int value){
-        if(value >= _table.length)
-           return null;
-        return _table[value];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FontFamily.java b/trunk/src/java/org/apache/poi/ss/usermodel/FontFamily.java
deleted file mode 100644
index 8292466..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FontFamily.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-
-/**
- * The font family this font belongs to. A font family is a set of fonts having common stroke width and serif
- * characteristics. The font name overrides when there are conflicting values.
- *
- * @author Gisella Bronzetti
- */
-public enum FontFamily {
-
-    NOT_APPLICABLE(0),
-    ROMAN(1),
-    SWISS(2),
-    MODERN(3),
-    SCRIPT(4),
-    DECORATIVE(5);
-
-    private int family;
-
-    private FontFamily(int value) {
-        family = value;
-    }
-
-    /**
-     * Returns index of this font family
-     *
-     * @return index of this font family
-     */
-    public int getValue() {
-        return family;
-    }
-
-    private static FontFamily[] _table = new FontFamily[6];
-
-    static {
-        for (FontFamily c : values()) {
-            _table[c.getValue()] = c;
-        }
-    }
-
-    public static FontFamily valueOf(int family) {
-        return _table[family];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FontFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/FontFormatting.java
deleted file mode 100644
index a6f21bd..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FontFormatting.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * High level representation for Font Formatting component
- * of Conditional Formatting settings
- */
-public interface FontFormatting {
-    /** Escapement type - None */
-    public final static short SS_NONE  = 0;
-    /** Escapement type - Superscript */
-    public final static short SS_SUPER = 1;
-    /** Escapement type - Subscript */
-    public final static short SS_SUB   = 2;
-
-    /** Underline type - None */
-    public final static byte U_NONE              = 0;
-    /** Underline type - Single */
-    public final static byte U_SINGLE            = 1;
-    /** Underline type - Double */
-    public final static byte U_DOUBLE            = 2;
-    /**  Underline type - Single Accounting */
-    public final static byte U_SINGLE_ACCOUNTING = 0x21;
-    /** Underline type - Double Accounting */
-    public final static byte U_DOUBLE_ACCOUNTING = 0x22;
-
-    /**
-     * get the type of super or subscript for the font
-     *
-     * @return super or subscript option
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-    short getEscapementType();
-
-    /**
-     * set the escapement type for the font
-     *
-     * @param escapementType  super or subscript option
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-    void setEscapementType(short escapementType);
-
-    /**
-     * @return font colour index, or 0 if not indexed (XSSF only)
-     */
-    short getFontColorIndex();
-
-    /**
-     * Sets the indexed colour to use
-     * @param color font colour index
-     */
-    void setFontColorIndex(short color);
-    
-    /**
-     * @return The colour of the font, or null if no colour applied
-     */
-    Color getFontColor();
-    
-    /**
-     * Sets the colour to use
-     * @param color font colour to use
-     */
-    void setFontColor(Color color);
-
-    /**
-     * gets the height of the font in 1/20th point units
-     *
-     * @return fontheight (in points/20); or -1 if not modified
-     */
-    int getFontHeight();
-
-    /**
-     * Sets the height of the font in 1/20th point units
-     *
-     * @param height the height in twips (in points/20)
-     */
-    void setFontHeight(int height);
-
-    /**
-     * get the type of underlining for the font
-     *
-     * @return font underlining type
-     *
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-    short getUnderlineType();
-
-    /**
-     * set the type of underlining type for the font
-     *
-     * @param underlineType  super or subscript option
-     *
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-    void setUnderlineType(short underlineType);
-
-    /**
-     * get whether the font weight is set to bold or not
-     *
-     * @return bold - whether the font is bold or not
-     */
-    boolean isBold();
-
-    /**
-     * @return true if font style was set to <i>italic</i>
-     */
-    boolean isItalic();
-
-    /**
-     * set font style options.
-     *
-     * @param italic - if true, set posture style to italic, otherwise to normal
-     * @param bold if true, set font weight to bold, otherwise to normal
-     */
-    void setFontStyle(boolean italic, boolean bold);
-
-    /**
-     * set font style options to default values (non-italic, non-bold)
-     */
-    void resetFontStyle();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FontScheme.java b/trunk/src/java/org/apache/poi/ss/usermodel/FontScheme.java
deleted file mode 100644
index e1b7712..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FontScheme.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-
-/**
- * Defines the font scheme to which this font belongs.
- * When a font definition is part of a theme definition, then the font is categorized as either a major or minor font scheme component.
- * When a new theme is chosen, every font that is part of a theme definition is updated to use the new major or minor font definition for that
- * theme.
- * Usually major fonts are used for styles like headings, and minor fonts are used for body & paragraph text.
- *
- * @author Gisella Bronzetti
- */
-public enum FontScheme {
-
-
-    NONE(1),
-    MAJOR(2),
-    MINOR(3);
-
-    private int value;
-
-    private FontScheme(int val) {
-        value = val;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    private static FontScheme[] _table = new FontScheme[4];
-    static {
-        for (FontScheme c : values()) {
-            _table[c.getValue()] = c;
-        }
-    }
-
-    public static FontScheme valueOf(int value){
-        return _table[value];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FontUnderline.java b/trunk/src/java/org/apache/poi/ss/usermodel/FontUnderline.java
deleted file mode 100644
index a78062b..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FontUnderline.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * the different types of possible underline formatting
- *
- * @author Gisella Bronzetti
- */
-public enum FontUnderline {
-
-    /**
-     * Single-line underlining under each character in the cell.
-     * The underline is drawn through the descenders of
-     * characters such as g and p..
-     */
-    SINGLE(1),
-
-    /**
-     * Double-line underlining under each character in the
-     * cell. underlines are drawn through the descenders of
-     * characters such as g and p.
-     */
-    DOUBLE(2),
-
-    /**
-     * Single-line accounting underlining under each
-     * character in the cell. The underline is drawn under the
-     * descenders of characters such as g and p.
-     */
-    SINGLE_ACCOUNTING(3),
-
-    /**
-     * Double-line accounting underlining under each
-     * character in the cell. The underlines are drawn under
-     * the descenders of characters such as g and p.
-     */
-    DOUBLE_ACCOUNTING(4),
-
-    /**
-     * No underline.
-     */
-    NONE(5);
-
-    private int value;
-
-
-    private FontUnderline(int val) {
-        value = val;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public byte getByteValue() {
-        switch (this) {
-            case DOUBLE:
-                return Font.U_DOUBLE;
-            case DOUBLE_ACCOUNTING:
-                return Font.U_DOUBLE_ACCOUNTING;
-            case SINGLE_ACCOUNTING:
-                return Font.U_SINGLE_ACCOUNTING;
-            case NONE:
-                return Font.U_NONE;
-            case SINGLE:
-                return Font.U_SINGLE;
-            default:
-                return Font.U_SINGLE;
-        }
-    }
-
-    private static FontUnderline[] _table = new FontUnderline[6];
-    static {
-        for (FontUnderline c : values()) {
-            _table[c.getValue()] = c;
-        }
-    }
-
-    public static FontUnderline valueOf(int value){
-        return _table[value];
-    }
-
-    public static FontUnderline valueOf(byte value){
-        FontUnderline val;
-        switch (value) {
-            case Font.U_DOUBLE:
-                val = FontUnderline.DOUBLE;
-                break;
-            case Font.U_DOUBLE_ACCOUNTING:
-                val = FontUnderline.DOUBLE_ACCOUNTING;
-                break;
-            case Font.U_SINGLE_ACCOUNTING:
-                val = FontUnderline.SINGLE_ACCOUNTING;
-                break;
-            case Font.U_SINGLE:
-                val = FontUnderline.SINGLE;
-                break;
-            default:
-                val = FontUnderline.NONE;
-                break;
-        }
-        return val;
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Footer.java b/trunk/src/java/org/apache/poi/ss/usermodel/Footer.java
deleted file mode 100644
index f982b71..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Footer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * Common definition of a HSSF or XSSF page footer.
- * For a list of all the different fields that can be
- *  placed into a footer, such as page number,
- *  bold, underline etc, see 
- *  {@link org.apache.poi.ss.usermodel.HeaderFooter}.
- */
-public interface Footer extends HeaderFooter {
-    /**
-     * Get the left side of the footer.
-     * @return The string representing the left side.
-     */
-    String getLeft();
-
-    /**
-     * Sets the left string.
-     * @param newLeft The string to set as the left side.
-     */
-    void setLeft(String newLeft);
-
-    /**
-     * Get the center of the footer.
-     * @return The string representing the center.
-     */
-    String getCenter();
-
-    /**
-     * Sets the center string.
-     * @param newCenter The string to set as the center.
-     */
-    void setCenter(String newCenter);
-
-    /**
-     * Get the right side of the footer.
-     * @return The string representing the right side.
-     */
-    String getRight();
-
-    /**
-     * Sets the right string.
-     * @param newRight The string to set as the right side.
-     */
-    void setRight(String newRight);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FormulaError.java b/trunk/src/java/org/apache/poi/ss/usermodel/FormulaError.java
deleted file mode 100644
index fa10229..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FormulaError.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import java.util.Map;
-
-import org.apache.poi.util.Internal;
-
-import java.util.HashMap;
-
-/**
- * Enumerates error values in SpreadsheetML formula calculations.
- * 
- * See also OOO's excelfileformat.pdf (2.5.6)
- */
-public enum FormulaError {
-    @Internal
-    _NO_ERROR(-1, "(no error)"),
-    
-    /**
-     * Intended to indicate when two areas are required to intersect, but do not.
-     * <p>Example:
-     * In the case of SUM(B1 C1), the space between B1 and C1 is treated as the binary
-     * intersection operator, when a comma was intended. end example]
-     * </p>
-     */
-    NULL(0x00, "#NULL!"),
-
-    /**
-     * Intended to indicate when any number, including zero, is divided by zero.
-     * Note: However, any error code divided by zero results in that error code.
-     */
-    DIV0(0x07, "#DIV/0!"),
-
-    /**
-     * Intended to indicate when an incompatible type argument is passed to a function, or
-     * an incompatible type operand is used with an operator.
-     * <p>Example:
-     * In the case of a function argument, text was expected, but a number was provided
-     * </p>
-     */
-    VALUE(0x0F, "#VALUE!"),
-
-    /**
-     * Intended to indicate when a cell reference is invalid.
-     * <p>Example:
-     * If a formula contains a reference to a cell, and then the row or column containing that cell is deleted,
-     * a #REF! error results. If a worksheet does not support 20,001 columns,
-     * OFFSET(A1,0,20000) will result in a #REF! error.
-     * </p>
-     */
-    REF(0x17, "#REF!"),
-
-    /**
-     * Intended to indicate when what looks like a name is used, but no such name has been defined.
-     * <p>Example:
-     * XYZ/3, where XYZ is not a defined name. Total is & A10,
-     * where neither Total nor is is a defined name. Presumably, "Total is " & A10
-     * was intended. SUM(A1C10), where the range A1:C10 was intended.
-     * </p>
-     */
-    NAME(0x1D, "#NAME?"),
-
-    /**
-     * Intended to indicate when an argument to a function has a compatible type, but has a
-     * value that is outside the domain over which that function is defined. (This is known as
-     * a domain error.)
-     * <p>Example:
-     * Certain calls to ASIN, ATANH, FACT, and SQRT might result in domain errors.
-     * </p>
-     * Intended to indicate that the result of a function cannot be represented in a value of
-     * the specified type, typically due to extreme magnitude. (This is known as a range
-     * error.)
-     * <p>Example: FACT(1000) might result in a range error. </p>
-     */
-    NUM(0x24, "#NUM!"),
-
-    /**
-     * Intended to indicate when a designated value is not available.
-     * <p>Example:
-     * Some functions, such as SUMX2MY2, perform a series of operations on corresponding
-     * elements in two arrays. If those arrays do not have the same number of elements, then
-     * for some elements in the longer array, there are no corresponding elements in the
-     * shorter one; that is, one or more values in the shorter array are not available.
-     * </p>
-     * This error value can be produced by calling the function NA
-     */
-    NA(0x2A, "#N/A"),
-    
-    // These are POI-specific error codes
-    // It is desirable to make these (arbitrary) strings look clearly different from any other
-    // value expression that might appear in a formula.  In addition these error strings should
-    // look unlike the standard Excel errors.  Hence tilde ('~') was used.
-    
-    /**
-     * POI specific code to indicate that there is a circular reference
-     *  in the formula
-     */
-    CIRCULAR_REF(0xFFFFFFC4, "~CIRCULAR~REF~"),
-    /**
-     * POI specific code to indicate that the funcition required is
-     *  not implemented in POI
-     */
-    FUNCTION_NOT_IMPLEMENTED(0xFFFFFFE2, "~FUNCTION~NOT~IMPLEMENTED~");
-
-    private final byte type;
-    private final int longType;
-    private final String repr;
-
-    private FormulaError(int type, String repr) {
-        this.type = (byte)type;
-        this.longType = type;
-        this.repr = repr;
-    }
-
-    /**
-     * @return numeric code of the error
-     */
-    public byte getCode() {
-        return type;
-    }
-    /**
-     * @return long (internal) numeric code of the error
-     */
-    public int getLongCode() {
-        return longType;
-    }
-
-    /**
-     * @return string representation of the error
-     */
-    public String getString() {
-        return repr;
-    }
-
-    private static final Map<String, FormulaError> smap = new HashMap<String, FormulaError>();
-    private static final Map<Byte, FormulaError> bmap = new HashMap<Byte, FormulaError>();
-    private static final Map<Integer, FormulaError> imap = new HashMap<Integer, FormulaError>();
-    static{
-        for (FormulaError error : values()) {
-            bmap.put(error.getCode(), error);
-            imap.put(error.getLongCode(), error);
-            smap.put(error.getString(), error);
-        }
-    }
-    
-    public static final boolean isValidCode(int errorCode) {
-        for (FormulaError error : values()) {
-            if (error.getCode() == errorCode) return true;
-            if (error.getLongCode() == errorCode) return true;
-        }
-        return false;
-    }
-
-    public static FormulaError forInt(byte type) throws IllegalArgumentException {
-        FormulaError err = bmap.get(type);
-        if(err == null) throw new IllegalArgumentException("Unknown error type: " + type);
-        return err;
-    }
-    public static FormulaError forInt(int type) throws IllegalArgumentException {
-        FormulaError err = imap.get(type);
-        if(err == null) err = bmap.get((byte)type);
-        if(err == null) throw new IllegalArgumentException("Unknown error type: " + type);
-        return err;
-    }
-
-    public static FormulaError forString(String code) throws IllegalArgumentException {
-        FormulaError err = smap.get(code);
-        if(err == null) throw new IllegalArgumentException("Unknown error code: " + code);
-        return err;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java b/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
deleted file mode 100644
index 44908e9..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.Map;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Evaluates formula cells.<p/>
- * 
- * For performance reasons, this class keeps a cache of all previously calculated intermediate
- * cell values.  Be sure to call {@link #clearAllCachedResultValues()} if any workbook cells are changed between
- * calls to evaluate~ methods on this class.
- * 
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- * @author Josh Micich
- */
-public interface FormulaEvaluator {
-
-    /**
-     * Should be called whenever there are changes to input cells in the evaluated workbook.
-     * Failure to call this method after changing cell values will cause incorrect behaviour
-     * of the evaluate~ methods of this class
-     */
-    void clearAllCachedResultValues();
-	/**
-	 * Should be called to tell the cell value cache that the specified (value or formula) cell 
-	 * has changed.
-	 * Failure to call this method after changing cell values will cause incorrect behaviour
-	 * of the evaluate~ methods of this class
-	 */
-    void notifySetFormula(Cell cell);
-	/**
-	 * Should be called to tell the cell value cache that the specified cell has just become a
-	 * formula cell, or the formula text has changed 
-	 */
-    void notifyDeleteCell(Cell cell);
-
-    /**
-     * Should be called to tell the cell value cache that the specified (value or formula) cell
-     * has changed.
-     * Failure to call this method after changing cell values will cause incorrect behaviour
-     * of the evaluate~ methods of this class
-     */
-    void notifyUpdateCell(Cell cell);
-
-    /**
-    * Loops over all cells in all sheets of the associated workbook.
-    * For cells that contain formulas, their formulas are evaluated, 
-    *  and the results are saved. These cells remain as formula cells.
-    * For cells that do not contain formulas, no changes are made.
-    * This is a helpful wrapper around looping over all cells, and 
-    *  calling evaluateFormulaCell on each one.
-     */
-    void evaluateAll();
-    
-    /**
-     * If cell contains a formula, the formula is evaluated and returned,
-     * else the CellValue simply copies the appropriate cell value from
-     * the cell and also its cell type. This method should be preferred over
-     * evaluateInCell() when the call should not modify the contents of the
-     * original cell.
-     * @param cell
-     */
-    CellValue evaluate(Cell cell);
-
-
-    /**
-     * If cell contains formula, it evaluates the formula,
-     *  and saves the result of the formula. The cell
-     *  remains as a formula cell.
-     * Else if cell does not contain formula, this method leaves
-     *  the cell unchanged.
-     * Note that the type of the formula result is returned,
-     *  so you know what kind of value is also stored with
-     *  the formula.
-     * <pre>
-     * int evaluatedCellType = evaluator.evaluateFormulaCell(cell);
-     * </pre>
-     * Be aware that your cell will hold both the formula,
-     *  and the result. If you want the cell replaced with
-     *  the result of the formula, use {@link #evaluateInCell(Cell)}
-     * @param cell The cell to evaluate
-     * @return The type of the formula result, i.e. -1 if the cell is not a formula, 
-     *      or one of {@link CellType#NUMERIC}, {@link CellType#STRING},
-     *      {@link CellType#BOOLEAN}, {@link CellType#ERROR}
-     *      Note: the cell's type remains as CellType.FORMULA however.
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future
-     */
-    int evaluateFormulaCell(Cell cell);
-    
-    /**
-     * If cell contains formula, it evaluates the formula,
-     *  and saves the result of the formula. The cell
-     *  remains as a formula cell.
-     * Else if cell does not contain formula, this method leaves
-     *  the cell unchanged.
-     * Note that the type of the formula result is returned,
-     *  so you know what kind of value is also stored with
-     *  the formula.
-     * <pre>
-     * CellType evaluatedCellType = evaluator.evaluateFormulaCellEnum(cell);
-     * </pre>
-     * Be aware that your cell will hold both the formula,
-     *  and the result. If you want the cell replaced with
-     *  the result of the formula, use {@link #evaluateInCell(Cell)}
-     * @param cell The cell to evaluate
-     * @return The type of the formula result, i.e. -1 if the cell is not a formula, 
-     *      or one of {@link CellType#NUMERIC}, {@link CellType#STRING},
-     *      {@link CellType#BOOLEAN}, {@link CellType#ERROR}
-     *      Note: the cell's type remains as CellType.FORMULA however.
-     */
-    CellType evaluateFormulaCellEnum(Cell cell);
-
-    /**
-     * If cell contains formula, it evaluates the formula, and
-     *  puts the formula result back into the cell, in place
-     *  of the old formula.
-     * Else if cell does not contain formula, this method leaves
-     *  the cell unchanged.
-     * Note that the same instance of Cell is returned to
-     * allow chained calls like:
-     * <pre>
-     * int evaluatedCellType = evaluator.evaluateInCell(cell).getCellType();
-     * </pre>
-     * Be aware that your cell value will be changed to hold the
-     *  result of the formula. If you simply want the formula
-     *  value computed for you, use {@link #evaluateFormulaCellEnum(Cell)}
-     * @param cell
-     */
-    Cell evaluateInCell(Cell cell);
-    
-    /**
-     * Sets up the Formula Evaluator to be able to reference and resolve
-     *  links to other workbooks, eg [Test.xls]Sheet1!A1.
-     * <p>For a workbook referenced as [Test.xls]Sheet1!A1, you should
-     *  supply a map containing the key Test.xls (no square brackets),
-     *  and an open FormulaEvaluator onto that Workbook.
-     * @param workbooks Map of workbook names (no square brackets) to an evaluator on that workbook
-     */
-    void setupReferencedWorkbooks(Map<String,FormulaEvaluator> workbooks);
-
-    /**
-     * Whether to ignore missing references to external workbooks and
-     * use cached formula results in the main workbook instead.
-     * <p>
-     * In some cases external workbooks referenced by formulas in the main workbook are not available.
-     * With this method you can control how POI handles such missing references:
-     * <ul>
-     *     <li>by default ignoreMissingWorkbooks=false and POI throws 
-     *     {@link org.apache.poi.ss.formula.CollaboratingWorkbooksEnvironment.WorkbookNotFoundException}
-     *     if an external reference cannot be resolved</li>
-     *     <li>if ignoreMissingWorkbooks=true then POI uses cached formula result
-     *     that already exists in the main workbook</li>
-     * </ul>
-     *
-     * @param ignore whether to ignore missing references to external workbooks
-     */
-    void setIgnoreMissingWorkbooks(boolean ignore);
-    
-    /**
-     * Perform detailed output of formula evaluation for next evaluation only?
-     * Is for developer use only (also developers using POI for their XLS files).
-     * Log-Level WARN is for basic info, INFO for detailed information. These quite
-     * high levels are used because you have to explicitly enable this specific logging.
-	 
-     * @param value whether to perform detailed output
-     */
-    void setDebugEvaluationOutputForNextEval(boolean value);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java b/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java
deleted file mode 100644
index bd5c8c8..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/FractionFormat.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.poi.ss.usermodel;
-import java.text.FieldPosition;
-import java.text.Format;
-import java.text.ParsePosition;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.format.SimpleFraction;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * <p>Format class that handles Excel style fractions, such as "# #/#" and "#/###"</p>
- * 
- * <p>As of this writing, this is still not 100% accurate, but it does a reasonable job
- * of trying to mimic Excel's fraction calculations.  It does not currently
- * maintain Excel's spacing.</p>
- * 
- * <p>This class relies on a method lifted nearly verbatim from org.apache.math.fraction.
- *  If further uses for Commons Math are found, we will consider adding it as a dependency.
- *  For now, we have in-lined the one method to keep things simple.</p>
- */
-
-@SuppressWarnings("serial")
-public class FractionFormat extends Format {
-    private static final POILogger LOGGER = POILogFactory.getLogger(FractionFormat.class); 
-    private static final Pattern DENOM_FORMAT_PATTERN = Pattern.compile("(?:(#+)|(\\d+))");
-
-    //this was chosen to match the earlier limitation of max denom power
-    //it can be expanded to get closer to Excel's calculations
-    //with custom formats # #/#########
-    //but as of this writing, the numerators and denominators
-    //with formats of that nature on very small values were quite
-    //far from Excel's calculations
-    private static final int MAX_DENOM_POW = 4;
-
-    //there are two options:
-    //a) an exact denominator is specified in the formatString
-    //b) the maximum denominator can be calculated from the formatString
-    private final int exactDenom;
-    private final int maxDenom;
-
-    private final String wholePartFormatString;
-    /**
-     * Single parameter ctor
-     * @param denomFormatString The format string for the denominator
-     */
-    public FractionFormat(String wholePartFormatString, String denomFormatString) {
-        this.wholePartFormatString = wholePartFormatString;
-        //init exactDenom and maxDenom
-        Matcher m = DENOM_FORMAT_PATTERN.matcher(denomFormatString);
-        int tmpExact = -1;
-        int tmpMax = -1;
-        if (m.find()){
-            if (m.group(2) != null){
-                try{
-                    tmpExact = Integer.parseInt(m.group(2));
-                    //if the denom is 0, fall back to the default: tmpExact=100
-                    
-                    if (tmpExact == 0){
-                        tmpExact = -1;
-                    }
-                } catch (NumberFormatException e){
-                    //should never happen
-                }
-            } else if (m.group(1) != null) {
-                int len = m.group(1).length();
-                len = len > MAX_DENOM_POW ? MAX_DENOM_POW : len;
-                tmpMax = (int)Math.pow(10, len);
-            } else {
-                tmpExact = 100;
-            }
-        }
-        if (tmpExact <= 0 && tmpMax <= 0){
-            //use 100 as the default denom if something went horribly wrong
-            tmpExact = 100;
-        }
-        exactDenom = tmpExact;
-        maxDenom = tmpMax;
-    }
-
-    public String format(Number num) {
-
-        final double doubleValue = num.doubleValue();
-        
-        final boolean isNeg = (doubleValue < 0.0f) ? true : false;
-        final double absDoubleValue = Math.abs(doubleValue);
-        
-        final double wholePart = Math.floor(absDoubleValue);
-        final double decPart = absDoubleValue - wholePart;
-        if (wholePart + decPart == 0) {
-            return "0";
-        }
-        
-        // if the absolute value is smaller than 1 over the exact or maxDenom
-        // you can stop here and return "0"
-        // reciprocal is result of an int devision ... and so it's nearly always 0
-        // double reciprocal = 1/Math.max(exactDenom,  maxDenom);
-        // if (absDoubleValue < reciprocal) {
-        //    return "0";
-        // }
-        
-        //this is necessary to prevent overflow in the maxDenom calculation
-        if (Double.compare(decPart, 0) == 0){
-            
-            StringBuilder sb = new StringBuilder();
-            if (isNeg){
-                sb.append("-");
-            }
-            sb.append((int)wholePart);
-            return sb.toString();
-        }
-        
-        SimpleFraction fract = null;
-        try{
-            //this should be the case because of the constructor
-            if (exactDenom > 0){
-                fract = SimpleFraction.buildFractionExactDenominator(decPart, exactDenom);
-            } else {
-                fract = SimpleFraction.buildFractionMaxDenominator(decPart, maxDenom);
-            }
-        } catch (RuntimeException e){
-            LOGGER.log(POILogger.WARN, "Can't format fraction", e);
-            return Double.toString(doubleValue);
-        }
-
-        StringBuilder sb = new StringBuilder();
-        
-        //now format the results
-        if (isNeg){
-            sb.append("-");
-        }
-        
-        //if whole part has to go into the numerator
-        if ("".equals(wholePartFormatString)){
-            int trueNum = (fract.getDenominator()*(int)wholePart)+fract.getNumerator();
-            sb.append(trueNum).append("/").append(fract.getDenominator());
-            return sb.toString();
-        }
-        
-        
-        //short circuit if fraction is 0 or 1
-        if (fract.getNumerator() == 0){
-            sb.append(Integer.toString((int)wholePart));
-            return sb.toString();
-        } else if (fract.getNumerator() == fract.getDenominator()){
-            sb.append(Integer.toString((int)wholePart+1));
-            return sb.toString();
-        }
-       //as mentioned above, this ignores the exact space formatting in Excel
-        if (wholePart > 0){
-            sb.append(Integer.toString((int)wholePart)).append(" ");
-        }
-        sb.append(fract.getNumerator()).append("/").append(fract.getDenominator());
-        return sb.toString();
-    }
-
-    public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
-        return toAppendTo.append(format((Number)obj));
-    }
-
-    public Object parseObject(String source, ParsePosition pos) {
-        throw new NotImplementedException("Reverse parsing not supported");
-    }
-   
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Header.java b/trunk/src/java/org/apache/poi/ss/usermodel/Header.java
deleted file mode 100644
index 22f38a6..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Header.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * Common definition of a HSSF or XSSF page header.
- * For a list of all the different fields that can be
- *  placed into a header, such as page number,
- *  bold, underline etc, see 
- *  {@link org.apache.poi.ss.usermodel.HeaderFooter}.
- */
-public interface Header extends HeaderFooter {
-    /**
-     * Get the left side of the header.
-     *
-     * @return The string representing the left side.
-     */
-    String getLeft();
-
-    /**
-     * Sets the left string.
-     *
-     * @param newLeft The string to set as the left side.
-     */
-    void setLeft(String newLeft);
-
-    /**
-     * Get the center of the header.
-     *
-     * @return The string representing the center.
-     */
-    String getCenter();
-
-    /**
-     * Sets the center string.
-     *
-     * @param newCenter The string to set as the center.
-     */
-    void setCenter(String newCenter);
-
-    /**
-     * Get the right side of the header.
-     *
-     * @return The string representing the right side.
-     */
-    String getRight();
-
-    /**
-     * Sets the right string.
-     *
-     * @param newRight The string to set as the right side.
-     */
-    void setRight(String newRight);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java b/trunk/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java
deleted file mode 100644
index 41c0e9e..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-/**
- * Common interface for {@link org.apache.poi.ss.usermodel.Header} and
- *  {@link org.apache.poi.ss.usermodel.Footer}.
- */
-public interface HeaderFooter {
-    /**
-     * Get the left side of the header or footer.
-     *
-     * @return The string representing the left side.
-     */
-    String getLeft();
-
-    /**
-     * Sets the left string.
-     *
-     * @param newLeft The string to set as the left side.
-     */
-    void setLeft(String newLeft);
-
-    /**
-     * Get the center of the header or footer.
-     *
-     * @return The string representing the center.
-     */
-    String getCenter();
-
-    /**
-     * Sets the center string.
-     *
-     * @param newCenter The string to set as the center.
-     */
-    void setCenter(String newCenter);
-
-    /**
-     * Get the right side of the header or footer.
-     *
-     * @return The string representing the right side.
-     */
-    String getRight();
-
-    /**
-     * Sets the right string or footer.
-     *
-     * @param newRight The string to set as the right side.
-     */
-    void setRight(String newRight);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java b/trunk/src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
deleted file mode 100644
index 6b9a313..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * The enumeration value indicating horizontal alignment of a cell,
- * i.e., whether it is aligned general, left, right, horizontally centered, filled (replicated),
- * justified, centered across multiple cells, or distributed.
- */
-public enum HorizontalAlignment {
-    /**
-     * The horizontal alignment is general-aligned. Text data is left-aligned.
-     * Numbers, dates, and times are rightaligned. Boolean types are centered.
-     * Changing the alignment does not change the type of data.
-     */
-    GENERAL,
-
-    /**
-     * The horizontal alignment is left-aligned, even in Rightto-Left mode.
-     * Aligns contents at the left edge of the cell. If an indent amount is specified, the contents of
-     * the cell is indented from the left by the specified number of character spaces. The character spaces are
-     * based on the default font and font size for the workbook.
-     */
-    LEFT,
-
-    /**
-     * The horizontal alignment is centered, meaning the text is centered across the cell.
-     */
-    CENTER,
-
-    /**
-     * The horizontal alignment is right-aligned, meaning that cell contents are aligned at the right edge of the cell,
-     * even in Right-to-Left mode.
-     */
-    RIGHT,
-
-    /**
-     * Indicates that the value of the cell should be filled
-     * across the entire width of the cell. If blank cells to the right also have the fill alignment,
-     * they are also filled with the value, using a convention similar to centerContinuous.
-     * <p>
-     * Additional rules:
-     * <ol>
-     * <li>Only whole values can be appended, not partial values.</li>
-     * <li>The column will not be widened to 'best fit' the filled value</li>
-     * <li>If appending an additional occurrence of the value exceeds the boundary of the cell
-     * left/right edge, don't append the additional occurrence of the value.</li>
-     * <li>The display value of the cell is filled, not the underlying raw number.</li>
-     * </ol>
-     * </p>
-     */
-    FILL,
-
-    /**
-     * The horizontal alignment is justified (flush left and right).
-     * For each line of text, aligns each line of the wrapped text in a cell to the right and left
-     * (except the last line). If no single line of text wraps in the cell, then the text is not justified.
-     */
-    JUSTIFY,
-
-    /**
-     * The horizontal alignment is centered across multiple cells.
-     * The information about how many cells to span is expressed in the Sheet Part,
-     * in the row of the cell in question. For each cell that is spanned in the alignment,
-     * a cell element needs to be written out, with the same style Id which references the centerContinuous alignment.
-     */
-    CENTER_SELECTION,
-
-    /**
-     * Indicates that each 'word' in each line of text inside the cell is evenly distributed
-     * across the width of the cell, with flush right and left margins.
-     * <p>
-     * When there is also an indent value to apply, both the left and right side of the cell
-     * are padded by the indent value.
-     * </p>
-     * <p> A 'word' is a set of characters with no space character in them. </p>
-     * <p> Two lines inside a cell are separated by a carriage return. </p>
-     */
-    DISTRIBUTED;
-    
-    public short getCode() {
-        return (short) ordinal();
-    }
-    public static HorizontalAlignment forInt(int code) {
-        if (code < 0 || code >= values().length) {
-            throw new IllegalArgumentException("Invalid HorizontalAlignment code: " + code);
-        }
-        return values()[code];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Hyperlink.java b/trunk/src/java/org/apache/poi/ss/usermodel/Hyperlink.java
deleted file mode 100644
index c067cc0..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Hyperlink.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-/**
- * Represents an Excel hyperlink.
- */
-public interface Hyperlink extends org.apache.poi.common.usermodel.Hyperlink {
-    /**
-     * Return the row of the first cell that contains the hyperlink
-     *
-     * @return the 0-based row of the cell that contains the hyperlink
-     */
-    public int getFirstRow();
-
-    /**
-     * Set the row of the first cell that contains the hyperlink
-     *
-     * @param row the 0-based row of the first cell that contains the hyperlink
-     */
-    public void setFirstRow(int row);
-
-    /**
-     * Return the row of the last cell that contains the hyperlink
-     *
-     * @return the 0-based row of the last cell that contains the hyperlink
-     */
-    public int getLastRow();
-
-    /**
-     * Set the row of the last cell that contains the hyperlink
-     *
-     * @param row the 0-based row of the last cell that contains the hyperlink
-     */
-    public void setLastRow(int row);
-
-    /**
-     * Return the column of the first cell that contains the hyperlink
-     *
-     * @return the 0-based column of the first cell that contains the hyperlink
-     */
-    public int getFirstColumn();
-
-    /**
-     * Set the column of the first cell that contains the hyperlink
-     *
-     * @param col the 0-based column of the first cell that contains the hyperlink
-     */
-    public void setFirstColumn(int col);
-
-    /**
-     * Return the column of the last cell that contains the hyperlink
-     *
-     * @return the 0-based column of the last cell that contains the hyperlink
-     */
-    public int getLastColumn();
-
-    /**
-     * Set the column of the last cell that contains the hyperlink
-     *
-     * @param col the 0-based column of the last cell that contains the hyperlink
-     */
-    public void setLastColumn(int col);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
deleted file mode 100644
index e7577c3..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * High level representation for the Icon / Multi-State Formatting 
- *  component of Conditional Formatting settings
- */
-public interface IconMultiStateFormatting {
-    public enum IconSet {
-        /** Green Up / Yellow Side / Red Down arrows */
-        GYR_3_ARROW(0, 3, "3Arrows"),
-        /** Grey Up / Side / Down arrows */
-        GREY_3_ARROWS(1, 3, "3ArrowsGray"),
-        /** Green / Yellow / Red flags */
-        GYR_3_FLAGS(2, 3, "3Flags"),
-        /** Green / Yellow / Red traffic lights (no background). Default */
-        GYR_3_TRAFFIC_LIGHTS(3, 3, "3TrafficLights1"),
-        /** Green / Yellow / Red traffic lights on a black square background. 
-         * Note, MS-XLS docs v20141018 say this is id=5 but seems to be id=4 */
-        GYR_3_TRAFFIC_LIGHTS_BOX(4, 3, "3TrafficLights2"),
-        /** Green Circle / Yellow Triangle / Red Diamond.
-         * Note, MS-XLS docs v20141018 say this is id=4 but seems to be id=5 */ 
-        GYR_3_SHAPES(5, 3, "3Signs"),
-        /** Green Tick / Yellow ! / Red Cross on a circle background */
-        GYR_3_SYMBOLS_CIRCLE(6, 3, "3Symbols"),
-        /** Green Tick / Yellow ! / Red Cross (no background) */
-        GYR_3_SYMBOLS(7, 3, "3Symbols2"),
-        /** Green Up / Yellow NE / Yellow SE / Red Down arrows */
-        GYR_4_ARROWS(8, 4, "4Arrows"),
-        /** Grey Up / NE / SE / Down arrows */
-        GREY_4_ARROWS(9, 4, "4ArrowsGray"),
-        /** Red / Light Red / Grey / Black traffic lights */
-        RB_4_TRAFFIC_LIGHTS(0xA, 4, "4RedToBlack"),
-        RATINGS_4(0xB, 4, "4Rating"),
-        /** Green / Yellow / Red / Black traffic lights */
-        GYRB_4_TRAFFIC_LIGHTS(0xC, 4, "4TrafficLights"),
-        GYYYR_5_ARROWS(0xD, 5, "5Arrows"),
-        GREY_5_ARROWS(0xE, 5, "5ArrowsGray"),
-        RATINGS_5(0xF, 5, "5Rating"),
-        QUARTERS_5(0x10, 5, "5Quarters");
-        
-        protected static final IconSet DEFAULT_ICONSET = IconSet.GYR_3_TRAFFIC_LIGHTS;
-        
-        /** Numeric ID of the icon set */
-        public final int id;
-        /** How many icons in the set */
-        public final int num;
-        /** Name (system) of the set */
-        public final String name;
-        
-        public String toString() {
-            return id + " - " + name;
-        }
-        
-        public static IconSet byId(int id) {
-            return values()[id];
-        }
-        public static IconSet byName(String name) {
-            for (IconSet set : values()) {
-                if (set.name.equals(name)) return set;
-            }
-            return null;
-        }
-        
-        private IconSet(int id, int num, String name) {
-            this.id = id; this.num = num; this.name = name;
-        }
-    }
-    
-    /**
-     * Get the Icon Set used
-     */
-    IconSet getIconSet();
-    
-    /**
-     * Changes the Icon Set used
-     * 
-     * <p>If the new Icon Set has a different number of
-     *  icons to the old one, you <em>must</em> update the
-     *  thresholds before saving!</p>
-     */
-    void setIconSet(IconSet set);
-    
-    /**
-     * Should Icon + Value be displayed, or only the Icon?
-     */
-    boolean isIconOnly();
-    /**
-     * Control if only the Icon is shown, or Icon + Value
-     */
-    void setIconOnly(boolean only);
-    
-    boolean isReversed();
-    void setReversed(boolean reversed);
-    
-    /**
-     * Gets the list of thresholds
-     */
-    ConditionalFormattingThreshold[] getThresholds();
-    /**
-     * Sets the of thresholds. The number must match
-     *  {@link IconSet#num} for the current {@link #getIconSet()}
-     */
-    void setThresholds(ConditionalFormattingThreshold[] thresholds);
-    /**
-     * Creates a new, empty Threshold
-     */
-    ConditionalFormattingThreshold createThreshold();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java b/trunk/src/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
deleted file mode 100644
index 2843de4..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * Types of ignored workbook and worksheet error.
- * 
- * TODO Implement these for HSSF too, using FeatFormulaErr2,
- *  see bugzilla bug #46136 for details
- */
-public enum IgnoredErrorType {
-    /**
-     * ????. Probably XSSF-only.
-     */
-    CALCULATED_COLUMN,
-    
-    /**
-     * Whether to check for references to empty cells.
-     * HSSF + XSSF.
-     */
-    EMPTY_CELL_REFERENCE,
-    
-    /**
-     * Whether to check for calculation/evaluation errors.
-     * HSSF + XSSF.
-     */
-    EVALUATION_ERROR,
-    
-    /**
-     * Whether to check formulas in the range of the shared feature 
-     *  that are inconsistent with formulas in neighbouring cells.
-     * HSSF + XSSF.
-     */
-    FORMULA,
-    
-    /**
-     * Whether to check formulas in the range of the shared feature 
-     * with references to less than the entirety of a range containing 
-     * continuous data.
-     * HSSF + XSSF.
-     */
-    FORMULA_RANGE,
-    
-    /**
-     * ????. Is this XSSF-specific the same as performDataValidation
-     *  in HSSF?
-     */
-    LIST_DATA_VALIDATION,
-    
-    /**
-     * Whether to check the format of string values and warn
-     *  if they look to actually be numeric values.
-     * HSSF + XSSF.
-     */
-    NUMBER_STORED_AS_TEXT,
-    
-    /**
-     * ????. Is this XSSF-specific the same as checkDateTimeFormats
-     *  in HSSF?
-     */
-    TWO_DIGIT_TEXT_YEAR,
-    
-    /**
-     * Whether to check for unprotected formulas.
-     * HSSF + XSSF.
-     */
-    UNLOCKED_FORMULA
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java b/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java
deleted file mode 100644
index 92ebc08..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * A deprecated indexing scheme for colours that is still required for some records, and for backwards
- *  compatibility with OLE2 formats.
- *
- * <p>
- * Each element corresponds to a color index (zero-based). When using the default indexed color palette,
- * the values are not written out, but instead are implied. When the color palette has been modified from default,
- * then the entire color palette is used.
- * </p>
- *
- * @author Yegor Kozlov
- */
-public enum IndexedColors {
-
-    // 0-7?
-    BLACK(8),
-    WHITE(9),
-    RED(10),
-    BRIGHT_GREEN(11),
-    BLUE(12),
-    YELLOW(13),
-    PINK(14),
-    TURQUOISE(15),
-    DARK_RED(16),
-    GREEN(17),
-    DARK_BLUE(18),
-    DARK_YELLOW(19),
-    VIOLET(20),
-    TEAL(21),
-    GREY_25_PERCENT(22),
-    GREY_50_PERCENT(23),
-    CORNFLOWER_BLUE(24),
-    MAROON(25),
-    LEMON_CHIFFON(26),
-    // 27?
-    ORCHID(28),
-    CORAL(29),
-    ROYAL_BLUE(30),
-    LIGHT_CORNFLOWER_BLUE(31),
-    SKY_BLUE(40),
-    LIGHT_TURQUOISE(41),
-    LIGHT_GREEN(42),
-    LIGHT_YELLOW(43),
-    PALE_BLUE(44),
-    ROSE(45),
-    LAVENDER(46),
-    TAN(47),
-    LIGHT_BLUE(48),
-    AQUA(49),
-    LIME(50),
-    GOLD(51),
-    LIGHT_ORANGE(52),
-    ORANGE(53),
-    BLUE_GREY(54),
-    GREY_40_PERCENT(55),
-    DARK_TEAL(56),
-    SEA_GREEN(57),
-    DARK_GREEN(58),
-    OLIVE_GREEN(59),
-    BROWN(60),
-    PLUM(61),
-    INDIGO(62),
-    GREY_80_PERCENT(63),
-    AUTOMATIC(64);
-
-    private final static IndexedColors[] _values = new IndexedColors[65];
-    static {
-        for (IndexedColors color : values()) {
-            _values[color.index] = color;
-        }
-    }
-    
-    public final short index;
-
-    IndexedColors(int idx){
-        index = (short)idx;
-    }
-
-    /**
-     * Returns index of this color
-     *
-     * @return index of this color
-     */
-    public short getIndex(){
-        return index;
-    }
-    
-    /**
-     * 
-     *
-     * @param index the index of the color
-     * @return the corresponding IndexedColors enum
-     * @throws IllegalArgumentException if index is not a valid IndexedColors
-     * @since 3.15-beta2
-     */
-    public static IndexedColors fromInt(int index) {
-        if (index < 0 || index >= _values.length) {
-            throw new IllegalArgumentException("Illegal IndexedColor index: " + index);
-        }
-        IndexedColors color = _values[index];
-        if (color == null) {
-            throw new IllegalArgumentException("Illegal IndexedColor index: " + index);
-        }
-        return color;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Name.java b/trunk/src/java/org/apache/poi/ss/usermodel/Name.java
deleted file mode 100644
index 983e438..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Name.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * Represents a defined name for a range of cells.
- * <p>
- * A name is a meaningful shorthand that makes it easier to understand the purpose of a
- * cell reference, constant or a formula.
- * </p>
- * Examples:
- * <pre><blockquote>
- *  Sheet sheet = workbook.createSheet("Loan Calculator");
- *  Name name;
- *
- *  name = workbook.createName();
- *  name.setNameName("Interest_Rate");
- *  name.setRefersToFormula("'Loan Calculator'!$E$5");
- *
- *  name = wb.createName();
- *  name.setNameName("Loan_Amount");
- *  name.setRefersToFormula("'Loan Calculator'!$E$4");
- *
- *  name = wb.createName();
- *  name.setNameName("Number_of_Payments");
- *  name.setRefersToFormula("'Loan Calculator'!$E$10");
- *
- *  name = wb.createName();
- *  name.setNameName("Monthly_Payment");
- *  name.setRefersToFormula("-PMT(Interest_Rate/12,Number_of_Payments,Loan_Amount)");
- *
- *  name = wb.createName();
- *  name.setNameName("Values_Entered");
- *  name.setRefersToFormula("IF(Loan_Amount*Interest_Rate>0,1,0)");
- *
- * </blockquote></pre>
- */
-public interface Name {
-
-    /**
-     * Get the sheets name which this named range is referenced to
-     *
-     * @return sheet name, which this named range referred to
-     */
-    String getSheetName();
-
-    /**
-     * Gets the name of the named range
-     *
-     * @return named range name
-     */
-    String getNameName();
-
-    /**
-     * Sets the name of the named range
-     *
-     * <p>The following is a list of syntax rules that you need to be aware of when you create and edit names.</p>
-     * <ul>
-     *   <li><strong>Valid characters</strong>
-     *   The first character of a name must be a letter, an underscore character (_), or a backslash (\).
-     *   Remaining characters in the name can be letters, numbers, periods, and underscore characters.
-     *   </li>
-     *   <li><strong>Cell references disallowed</strong>
-     *   Names cannot be the same as a cell reference, such as Z$100 or R1C1.</li>
-     *   <li><strong>Spaces are not valid</strong>
-     *   Spaces are not allowed as part of a name. Use the underscore character (_) and period (.) as word separators, such as, Sales_Tax or First.Quarter.
-     *   </li>
-     *   <li><strong>Name length</strong>
-     *    A name can contain up to 255 characters.
-     *   </li>
-     *   <li><strong>Case sensitivity</strong>
-     *   Names can contain uppercase and lowercase letters.
-     *   </li>
-     * </ul>
-     * <p>
-     * A name must always be unique within its scope. POI prevents you from defining a name that is not unique
-     * within its scope. However you can use the same name in different scopes. Example:
-     * <pre><blockquote>
-     * //by default names are workbook-global
-     * Name name;
-     * name = workbook.createName();
-     * name.setNameName("sales_08");
-     *
-     * name = workbook.createName();
-     * name.setNameName("sales_08"); //will throw an exception: "The workbook already contains this name (case-insensitive)"
-     *
-     * //create sheet-level name
-     * name = workbook.createName();
-     * name.setSheetIndex(0); //the scope of the name is the first sheet
-     * name.setNameName("sales_08");  //ok
-     *
-     * name = workbook.createName();
-     * name.setSheetIndex(0);
-     * name.setNameName("sales_08");  //will throw an exception: "The sheet already contains this name (case-insensitive)"
-     *
-     * </blockquote></pre>
-    * </p>
-     * @param name named range name to set
-     * @throws IllegalArgumentException if the name is invalid or the already exists within its scope (case-insensitive)
-     */
-    void setNameName(String name);
-
-    /**
-     * Returns the formula that the name is defined to refer to.
-     *
-     * @return the reference for this name, <code>null</code> if it has not been set yet. Never empty string
-     * @see #setRefersToFormula(String)
-     */
-    String getRefersToFormula();
-
-    /**
-     * Sets the formula that the name is defined to refer to. The following are representative examples:
-     *
-     * <ul>
-     *  <li><code>'My Sheet'!$A$3</code></li>
-     *  <li><code>8.3</code></li>
-     *  <li><code>HR!$A$1:$Z$345</code></li>
-     *  <li><code>SUM(Sheet1!A1,Sheet2!B2)</li>
-     *  <li><code>-PMT(Interest_Rate/12,Number_of_Payments,Loan_Amount)</li>
-     * </ul>
-     *
-     * @param formulaText the reference for this name
-     * @throws IllegalArgumentException if the specified formulaText is unparsable
-    */
-   void setRefersToFormula(String formulaText);
-
-    /**
-     * Checks if this name is a function name
-     *
-     * @return true if this name is a function name
-     */
-	boolean isFunctionName();
-
-    /**
-     * Checks if this name points to a cell that no longer exists
-     *
-     * @return <code>true</code> if the name refers to a deleted cell, <code>false</code> otherwise
-     */
-    boolean isDeleted();
-
-    /**
-     * Tell Excel that this name applies to the worksheet with the specified index instead of the entire workbook.
-     *
-     * @param sheetId the sheet index this name applies to, -1 unsets this property making the name workbook-global
-     * @throws IllegalArgumentException if the sheet index is invalid.
-     */
-    public void setSheetIndex(int sheetId);
-
-    /**
-     * Returns the sheet index this name applies to.
-     *
-     * @return the sheet index this name applies to, -1 if this name applies to the entire workbook
-     */
-    public int getSheetIndex();
-
-    /**
-     * Returns the comment the user provided when the name was created.
-     *
-     * @return the user comment for this named range
-     */
-    public String getComment();
-
-    /**
-     * Sets the comment the user provided when the name was created.
-     *
-     * @param comment the user comment for this named range
-     */
-    public void setComment(String comment);
-
-    /**
-     * Indicates that the defined name refers to a user-defined function.
-     * This attribute is used when there is an add-in or other code project associated with the file.
-     *
-     * @param value <code>true</code> indicates the name refers to a function.
-     */
-    void setFunction(boolean value);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/PageOrder.java b/trunk/src/java/org/apache/poi/ss/usermodel/PageOrder.java
deleted file mode 100644
index 341f2bf..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/PageOrder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * Specifies printed page order.
- *
- * @author Gisella Bronzetti
- */
-public enum PageOrder {
-
-    /**
-     * Order pages vertically first, then move horizontally.
-     */
-    DOWN_THEN_OVER(1),
-    /**
-     * Order pages horizontally first, then move vertically
-     */
-    OVER_THEN_DOWN(2);
-
-
-    private int order;
-
-
-    private PageOrder(int order) {
-        this.order = order;
-    }
-
-    public int getValue() {
-        return order;
-    }
-
-
-    private static PageOrder[] _table = new PageOrder[3];
-    static {
-        for (PageOrder c : values()) {
-            _table[c.getValue()] = c;
-        }
-    }
-
-    public static PageOrder valueOf(int value){
-        return _table[value];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/PaperSize.java b/trunk/src/java/org/apache/poi/ss/usermodel/PaperSize.java
deleted file mode 100644
index abd65f3..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/PaperSize.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- *  The enumeration value indicating the possible paper size for a sheet
- *
- * @author Daniele Montagni
- */
-public enum PaperSize {
-    LETTER_PAPER,
-    LETTER_SMALL_PAPER,
-    TABLOID_PAPER,
-    LEDGER_PAPER,
-    LEGAL_PAPER,
-    STATEMENT_PAPER,
-    EXECUTIVE_PAPER,
-    A3_PAPER,
-    A4_PAPER,
-    A4_SMALL_PAPER,
-    A5_PAPER,
-    B4_PAPER,
-    B5_PAPER,
-    FOLIO_PAPER,
-    QUARTO_PAPER,
-    STANDARD_PAPER_10_14,
-    STANDARD_PAPER_11_17
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java
deleted file mode 100644
index 0311ffb..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * @author Yegor Kozlov
- */
-public interface PatternFormatting {
-    /**  No background */
-    public final static short     NO_FILL             = 0  ;
-    /**  Solidly filled */
-    public final static short     SOLID_FOREGROUND    = 1  ;
-    /**  Small fine dots */
-    public final static short     FINE_DOTS           = 2  ;
-    /**  Wide dots */
-    public final static short     ALT_BARS            = 3  ;
-    /**  Sparse dots */
-    public final static short     SPARSE_DOTS         = 4  ;
-    /**  Thick horizontal bands */
-    public final static short     THICK_HORZ_BANDS    = 5  ;
-    /**  Thick vertical bands */
-    public final static short     THICK_VERT_BANDS    = 6  ;
-    /**  Thick backward facing diagonals */
-    public final static short     THICK_BACKWARD_DIAG = 7  ;
-    /**  Thick forward facing diagonals */
-    public final static short     THICK_FORWARD_DIAG  = 8  ;
-    /**  Large spots */
-    public final static short     BIG_SPOTS           = 9  ;
-    /**  Brick-like layout */
-    public final static short     BRICKS              = 10 ;
-    /**  Thin horizontal bands */
-    public final static short     THIN_HORZ_BANDS     = 11 ;
-    /**  Thin vertical bands */
-    public final static short     THIN_VERT_BANDS     = 12 ;
-    /**  Thin backward diagonal */
-    public final static short     THIN_BACKWARD_DIAG  = 13 ;
-    /**  Thin forward diagonal */
-    public final static short     THIN_FORWARD_DIAG   = 14 ;
-    /**  Squares */
-    public final static short     SQUARES             = 15 ;
-    /**  Diamonds */
-    public final static short     DIAMONDS            = 16 ;
-    /**  Less Dots */
-    public final static short     LESS_DOTS           = 17 ;
-    /**  Least Dots */
-    public final static short     LEAST_DOTS          = 18 ;
-
-    short getFillBackgroundColor();
-    short getFillForegroundColor();
-    Color getFillBackgroundColorColor();
-    Color getFillForegroundColorColor();
-
-    short getFillPattern();
-
-    void setFillBackgroundColor(short bg);
-    void setFillForegroundColor(short fg);
-    void setFillBackgroundColor(Color bg);
-    void setFillForegroundColor(Color fg);
-
-    void setFillPattern(short fp);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Picture.java b/trunk/src/java/org/apache/poi/ss/usermodel/Picture.java
deleted file mode 100644
index 58ad448..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Picture.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import java.awt.Dimension;
-
-
-/**
- * Repersents a picture in a SpreadsheetML document
- *
- * @author Yegor Kozlov
- */
-public interface Picture {
-
-    /**
-     * Reset the image to the dimension of the embedded image
-     *
-     * @see #resize(double, double)
-     */
-    void resize();
-
-    /**
-     * Resize the image proportionally.
-     *
-     * @see #resize(double, double)
-     */
-    void resize(double scale);
-    
-    /**
-     * Resize the image.
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with the default font size (Arial 10pt for .xls and Calibri 11pt for .xlsx).
-     * If the default font is changed the resized image can be streched vertically or horizontally.
-     * </p>
-     * <p>
-     * <code>resize(1.0,1.0)</code> keeps the original size,<br/>
-     * <code>resize(0.5,0.5)</code> resize to 50% of the original,<br/>
-     * <code>resize(2.0,2.0)</code> resizes to 200% of the original.<br/>
-     * <code>resize({@link Double#MAX_VALUE},{@link Double#MAX_VALUE})</code> resizes to the dimension of the embedded image. 
-     * </p>
-     *
-     * @param scaleX the amount by which the image width is multiplied relative to the original width.
-     * @param scaleY the amount by which the image height is multiplied relative to the original height.
-     */
-    void resize(double scaleX, double scaleY);
-
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @return XSSFClientAnchor with the preferred size for this image
-     */
-    ClientAnchor getPreferredSize();
-    
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @param scaleX the amount by which image width is multiplied relative to the original width.
-     * @param scaleY the amount by which image height is multiplied relative to the original height.
-     * @return ClientAnchor with the preferred size for this image
-     */
-    ClientAnchor getPreferredSize(double scaleX, double scaleY);
-
-    /**
-     * Return the dimension of the embedded image in pixel
-     *
-     * @return image dimension in pixels
-     */
-    Dimension getImageDimension();
-    
-    /**
-     * Return picture data for this picture
-     *
-     * @return picture data for this picture
-     */
-    PictureData getPictureData();
-
-    /**
-     * @return  the anchor that is used by this picture
-     */
-    ClientAnchor getClientAnchor();
-
-
-    /**
-     * @return the sheet which contains the picture
-     */
-    Sheet getSheet();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/PictureData.java b/trunk/src/java/org/apache/poi/ss/usermodel/PictureData.java
deleted file mode 100644
index 67d3cef..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/PictureData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-public interface PictureData {
-
-    /**
-     * Gets the picture data.
-     *
-     * @return the picture data.
-     */
-    byte[] getData();
-
-    /**
-     * Suggests a file extension for this image.
-     *
-     * @return the file extension.
-     */
-    String suggestFileExtension();
-
-    /**
-     * Returns the mime type for the image
-     */
-    String getMimeType();
-    
-    /**
-     * @return the POI internal image type, 0 if unknown image type
-     *
-     * @see Workbook#PICTURE_TYPE_DIB
-     * @see Workbook#PICTURE_TYPE_EMF
-     * @see Workbook#PICTURE_TYPE_JPEG
-     * @see Workbook#PICTURE_TYPE_PICT
-     * @see Workbook#PICTURE_TYPE_PNG
-     * @see Workbook#PICTURE_TYPE_WMF
-     */
-    int getPictureType();
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/PrintCellComments.java b/trunk/src/java/org/apache/poi/ss/usermodel/PrintCellComments.java
deleted file mode 100644
index ecbea6d..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/PrintCellComments.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * These enumerations specify how cell comments shall be displayed for paper printing purposes.
- *
- * @author Gisella Bronzetti
- */
-public enum PrintCellComments {
-
-    /**
-     * Do not print cell comments.
-     */
-    NONE(1),
-    /**
-     * Print cell comments as displayed.
-     */
-    AS_DISPLAYED(2),
-    /**
-     * Print cell comments at end of document.
-     */
-    AT_END(3);
-
-
-    private int comments;
-
-    private PrintCellComments(int comments) {
-        this.comments = comments;
-    }
-
-    public int getValue() {
-        return comments;
-    }
-
-    private static PrintCellComments[] _table = new PrintCellComments[4];
-    static {
-        for (PrintCellComments c : values()) {
-            _table[c.getValue()] = c;
-        }
-    }
-
-    public static PrintCellComments valueOf(int value){
-        return _table[value];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/PrintOrientation.java b/trunk/src/java/org/apache/poi/ss/usermodel/PrintOrientation.java
deleted file mode 100644
index 8d5716f..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/PrintOrientation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * The enumeration value indicating the print orientation for a sheet.
- *
- * @author Gisella Bronzetti
- */
-public enum PrintOrientation {
-
-    /**
-     * orientation not specified
-     */
-    DEFAULT(1),
-    /**
-     * portrait orientation
-     */
-    PORTRAIT(2),
-    /**
-     * landscape orientations
-     */
-    LANDSCAPE(3);
-
-
-    private int orientation;
-
-    private PrintOrientation(int orientation) {
-        this.orientation = orientation;
-    }
-
-
-    public int getValue() {
-        return orientation;
-    }
-
-
-    private static PrintOrientation[] _table = new PrintOrientation[4];
-    static {
-        for (PrintOrientation c : values()) {
-            _table[c.getValue()] = c;
-        }
-    }
-
-    public static PrintOrientation valueOf(int value){
-        return _table[value];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/PrintSetup.java b/trunk/src/java/org/apache/poi/ss/usermodel/PrintSetup.java
deleted file mode 100644
index bba72c3..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/PrintSetup.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-public interface PrintSetup {
-    /** Whatever the printer's default paper size is */
-    public static final short PRINTER_DEFAULT_PAPERSIZE = 0;
-    /** US Letter 8 1/2 x 11 in */
-    public static final short LETTER_PAPERSIZE = 1;
-    /** US Letter Small 8 1/2 x 11 in */
-    public static final short LETTER_SMALL_PAGESIZE = 2;
-    /** US Tabloid 11 x 17 in */
-    public static final short TABLOID_PAPERSIZE = 3;
-    /** US Ledger 17 x 11 in */
-    public static final short LEDGER_PAPERSIZE = 4;
-    /** US Legal 8 1/2 x 14 in */
-    public static final short LEGAL_PAPERSIZE = 5;
-    /** US Statement 5 1/2 x 8 1/2 in */
-    public static final short STATEMENT_PAPERSIZE = 6;
-    /** US Executive 7 1/4 x 10 1/2 in */
-    public static final short EXECUTIVE_PAPERSIZE = 7;
-    /** A3 - 297x420 mm */
-    public static final short A3_PAPERSIZE = 8;
-    /** A4 - 210x297 mm */
-    public static final short A4_PAPERSIZE = 9;
-    /** A4 Small - 210x297 mm */
-    public static final short A4_SMALL_PAPERSIZE = 10;
-    /** A5 - 148x210 mm */
-    public static final short A5_PAPERSIZE = 11;
-    /** B4 (JIS) 250x354 mm */
-    public static final short B4_PAPERSIZE = 12;
-    /** B5 (JIS) 182x257 mm */
-    public static final short B5_PAPERSIZE = 13;
-    /** Folio 8 1/2 x 13 in */
-    public static final short FOLIO8_PAPERSIZE = 14;
-    /** Quarto 215x275 mm */
-    public static final short QUARTO_PAPERSIZE = 15;
-    /** 10 x 14 in */
-    public static final short TEN_BY_FOURTEEN_PAPERSIZE = 16;
-    /** 11 x 17 in */
-    public static final short ELEVEN_BY_SEVENTEEN_PAPERSIZE = 17;
-    /** US Note 8 1/2 x 11 in */
-    public static final short NOTE8_PAPERSIZE = 18;
-    /** US Envelope #9 3 7/8 x 8 7/8 */
-    public static final short ENVELOPE_9_PAPERSIZE = 19;
-    /** US Envelope #10 4 1/8 x 9 1/2 */
-    public static final short ENVELOPE_10_PAPERSIZE = 20;
-    /** Envelope DL 110x220 mm */
-    public static final short ENVELOPE_DL_PAPERSIZE = 27;
-    /** Envelope C5 162x229 mm */
-    public static final short ENVELOPE_CS_PAPERSIZE = 28;
-    public static final short ENVELOPE_C5_PAPERSIZE = 28;
-    /** Envelope C3 324x458 mm */
-    public static final short ENVELOPE_C3_PAPERSIZE = 29;
-    /** Envelope C4 229x324 mm */
-    public static final short ENVELOPE_C4_PAPERSIZE = 30;
-    /** Envelope C6 114x162 mm */
-    public static final short ENVELOPE_C6_PAPERSIZE = 31;
-
-    public static final short ENVELOPE_MONARCH_PAPERSIZE = 37;
-    /** A4 Extra - 9.27 x 12.69 in */
-    public static final short A4_EXTRA_PAPERSIZE = 53;
-    /** A4 Transverse - 210x297 mm */
-    public static final short A4_TRANSVERSE_PAPERSIZE = 55;
-    /** A4 Plus - 210x330 mm */
-    public static final short A4_PLUS_PAPERSIZE = 60;
-    /** US Letter Rotated 11 x 8 1/2 in */
-    public static final short LETTER_ROTATED_PAPERSIZE = 75;
-    /** A4 Rotated - 297x210 mm */
-    public static final short A4_ROTATED_PAPERSIZE = 77;
-
-    /**    
-     * Set the paper size.    
-     * @param size the paper size.    
-     */
-    void setPaperSize(short size);
-
-    /**    
-     * Set the scale.    
-     * @param scale the scale to use    
-     */
-    void setScale(short scale);
-
-    /**    
-     * Set the page numbering start.    
-     * @param start the page numbering start    
-     */
-    void setPageStart(short start);
-
-    /**    
-     * Set the number of pages wide to fit the sheet in    
-     * @param width the number of pages    
-     */
-    void setFitWidth(short width);
-
-    /**    
-     * Set the number of pages high to fit the sheet in    
-     * @param height the number of pages    
-     */
-    void setFitHeight(short height);
-
-    /**
-     * Set whether to go left to right or top down in ordering    
-     * @param ltor left to right    
-     */
-    void setLeftToRight(boolean ltor);
-
-    /**    
-     * Set whether to print in landscape    
-     * @param ls landscape    
-     */
-    void setLandscape(boolean ls);
-
-    /**    
-     * Valid settings.  I'm not for sure.    
-     * @param valid Valid    
-     */
-    void setValidSettings(boolean valid);
-
-    /**    
-     * Set whether it is black and white    
-     * @param mono Black and white    
-     */
-    void setNoColor(boolean mono);
-
-    /**    
-     * Set whether it is in draft mode    
-     * @param d draft    
-     */
-    void setDraft(boolean d);
-
-    /**    
-     * Print the include notes    
-     * @param printnotes print the notes    
-     */
-    void setNotes(boolean printnotes);
-
-    /**    
-     * Set no orientation. ?    
-     * @param orientation Orientation.    
-     */
-    void setNoOrientation(boolean orientation);
-
-    /**    
-     * Set whether to use page start    
-     * @param page Use page start    
-     */
-    void setUsePage(boolean page);
-
-    /**    
-     * Sets the horizontal resolution.    
-     * @param resolution horizontal resolution    
-     */
-    void setHResolution(short resolution);
-
-    /**    
-     * Sets the vertical resolution.    
-     * @param resolution vertical resolution    
-     */
-    void setVResolution(short resolution);
-
-    /**    
-     * Sets the header margin.    
-     * @param headermargin header margin    
-     */
-    void setHeaderMargin(double headermargin);
-
-    /**    
-     * Sets the footer margin.    
-     * @param footermargin footer margin    
-     */
-    void setFooterMargin(double footermargin);
-
-    /**    
-     * Sets the number of copies.    
-     * @param copies number of copies    
-     */
-    void setCopies(short copies);
-
-    /**    
-     * Returns the paper size.    
-     * @return paper size    
-     */
-    short getPaperSize();
-
-    /**    
-     * Returns the scale.    
-     * @return scale    
-     */
-    short getScale();
-
-    /**    
-     * Returns the page start.    
-     * @return page start    
-     */
-    short getPageStart();
-
-    /**    
-     * Returns the number of pages wide to fit sheet in.    
-     * @return number of pages wide to fit sheet in    
-     */
-    short getFitWidth();
-
-    /**    
-     * Returns the number of pages high to fit the sheet in.    
-     * @return number of pages high to fit the sheet in    
-     */
-    short getFitHeight();
-
-    /**    
-     * Returns the left to right print order.    
-     * @return left to right print order    
-     */
-    boolean getLeftToRight();
-
-    /**    
-     * Returns the landscape mode.    
-     * @return landscape mode    
-     */
-    boolean getLandscape();
-
-    /**    
-     * Returns the valid settings.    
-     * @return valid settings    
-     */
-    boolean getValidSettings();
-
-    /**    
-     * Returns the black and white setting.    
-     * @return black and white setting    
-     */
-    boolean getNoColor();
-
-    /**    
-     * Returns the draft mode.    
-     * @return draft mode    
-     */
-    boolean getDraft();
-
-    /**    
-     * Returns the print notes.    
-     * @return print notes    
-     */
-    boolean getNotes();
-
-    /**    
-     * Returns the no orientation.    
-     * @return no orientation    
-     */
-    boolean getNoOrientation();
-
-    /**    
-     * Returns the use page numbers.    
-     * @return use page numbers    
-     */
-    boolean getUsePage();
-
-    /**    
-     * Returns the horizontal resolution.    
-     * @return horizontal resolution    
-     */
-    short getHResolution();
-
-    /**    
-     * Returns the vertical resolution.    
-     * @return vertical resolution    
-     */
-    short getVResolution();
-
-    /**    
-     * Returns the header margin.    
-     * @return header margin    
-     */
-    double getHeaderMargin();
-
-    /**    
-     * Returns the footer margin.    
-     * @return footer margin    
-     */
-    double getFooterMargin();
-
-    /**    
-     * Returns the number of copies.    
-     * @return number of copies    
-     */
-    short getCopies();
-
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/RichTextString.java b/trunk/src/java/org/apache/poi/ss/usermodel/RichTextString.java
deleted file mode 100644
index 551fede..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/RichTextString.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * Rich text unicode string.  These strings can have fonts 
- *  applied to arbitary parts of the string.
- *  
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Jason Height (jheight at apache.org)
- */
-public interface RichTextString {
-    
-    /**
-     * Applies a font to the specified characters of a string.
-     *
-     * @param startIndex    The start index to apply the font to (inclusive)
-     * @param endIndex      The end index to apply the font to (exclusive)
-     * @param fontIndex     The font to use.
-     */
-    void applyFont(int startIndex, int endIndex, short fontIndex);
-
-    /**
-     * Applies a font to the specified characters of a string.
-     *
-     * @param startIndex    The start index to apply the font to (inclusive)
-     * @param endIndex      The end index to apply to font to (exclusive)
-     * @param font          The index of the font to use.
-     */
-    void applyFont(int startIndex, int endIndex, Font font);
-
-    /**
-     * Sets the font of the entire string.
-     * @param font          The font to use.
-     */
-    void applyFont(Font font);
-
-    /**
-     * Removes any formatting that may have been applied to the string.
-     */
-    void clearFormatting();
-
-    /**
-     * Returns the plain string representation.
-     */
-    String getString();
-
-    /**
-     * @return  the number of characters in the font.
-     */
-    int length();
-
-    /**
-     * @return  The number of formatting runs used.
-     *
-     */
-    int numFormattingRuns();
-
-    /**
-     * The index within the string to which the specified formatting run applies.
-     * @param index     the index of the formatting run
-     * @return  the index within the string.
-     */
-    int getIndexOfFormattingRun(int index);
-
-    /**
-     * Applies the specified font to the entire string.
-     *
-     * @param fontIndex  the font to apply.
-     */
-    void applyFont(short fontIndex);
-
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Row.java b/trunk/src/java/org/apache/poi/ss/usermodel/Row.java
deleted file mode 100644
index f587757..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Row.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.Iterator;
-
-import org.apache.poi.util.Removal;
-
-/**
- * High level representation of a row of a spreadsheet.
- */
-public interface Row extends Iterable<Cell> {
-
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned is a {@link CellType#BLANK}. The type can be changed
-     * either through calling <code>setCellValue</code> or <code>setCellType</code>.
-     *
-     * @param column - the column number this cell represents
-     * @return Cell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex &lt; 0 or greater than the maximum number of supported columns
-     * (255 for *.xls, 1048576 for *.xlsx)
-     */
-    Cell createCell(int column);
-
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned will be of the requested type.
-     * The type can be changed either through calling setCellValue 
-     *  or setCellType, but there is a small overhead to doing this,
-     *  so it is best to create of the required type up front.
-     *
-     * @param column - the column number this cell represents
-     * @param type - the cell's data type
-     * @return Cell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex &lt; 0 or greater than a maximum number of supported columns
-     * (255 for *.xls, 1048576 for *.xlsx)
-     * @see CellType#BLANK
-     * @see CellType#BOOLEAN
-     * @see CellType#ERROR
-     * @see CellType#FORMULA
-     * @see CellType#NUMERIC
-     * @see CellType#STRING
-     * @deprecated POI 3.15 beta 3. Use {@link #createCell(int, CellType)} instead.
-     */
-    Cell createCell(int column, int type);
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned will be of the requested type.
-     * The type can be changed either through calling setCellValue 
-     *  or setCellType, but there is a small overhead to doing this,
-     *  so it is best to create of the required type up front.
-     *
-     * @param column - the column number this cell represents
-     * @param type - the cell's data type
-     * @return Cell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex &lt; 0 or greater than a maximum number of supported columns
-     * (255 for *.xls, 1048576 for *.xlsx)
-     */
-    Cell createCell(int column, CellType type);
-
-    /**
-     * Remove the Cell from this row.
-     *
-     * @param cell the cell to remove
-     */
-    void removeCell(Cell cell);
-
-    /**
-     * Set the row number of this row.
-     *
-     * @param rowNum  the row number (0-based)
-     * @throws IllegalArgumentException if rowNum &lt; 0
-     */
-    void setRowNum(int rowNum);
-
-    /**
-     * Get row number this row represents
-     *
-     * @return the row number (0 based)
-     */
-    int getRowNum();
-
-    /**
-     * Get the cell 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
-     * @return Cell representing that column or null if undefined.
-     * @see #getCell(int, org.apache.poi.ss.usermodel.Row.MissingCellPolicy)
-     */
-    Cell getCell(int cellnum);
-    
-    /**
-     * Returns the cell at the given (0 based) index, with the specified {@link org.apache.poi.ss.usermodel.Row.MissingCellPolicy}
-     *
-     * @return the cell at the given (0 based) index
-     * @throws IllegalArgumentException if cellnum &lt; 0 or the specified MissingCellPolicy is invalid
-     */
-    Cell getCell(int cellnum, MissingCellPolicy policy);
-
-    /**
-     * Get the number of the first cell contained in this row.
-     *
-     * @return short representing the first logical cell in the row,
-     *  or -1 if the row does not contain any cells.
-     */
-    short getFirstCellNum();
-
-    /**
-     * Gets the index of the last cell contained in this row <b>PLUS ONE</b>. The result also
-     * happens to be the 1-based column number of the last cell.  This value can be used as a
-     * standard upper bound when iterating over cells:
-     * <pre>
-     * short minColIx = row.getFirstCellNum();
-     * short maxColIx = row.getLastCellNum();
-     * for(short colIx=minColIx; colIx&lt;maxColIx; colIx++) {
-     *   Cell cell = row.getCell(colIx);
-     *   if(cell == null) {
-     *     continue;
-     *   }
-     *   //... do something with cell
-     * }
-     * </pre>
-     *
-     * @return short representing the last logical cell in the row <b>PLUS ONE</b>,
-     *   or -1 if the row does not contain any cells.
-     */
-    short getLastCellNum();
-
-    /**
-     * Gets the number of defined cells (NOT number of cells in the actual row!).
-     * That is to say if only columns 0,4,5 have values then there would be 3.
-     *
-     * @return int representing the number of defined cells in the row.
-     */
-    int getPhysicalNumberOfCells();
-
-    /**
-     * Set the row's height or set to ff (-1) for undefined/default-height.  Set the height in "twips" or
-     * 1/20th of a point.
-     *
-     * @param height  rowheight or 0xff for undefined (use sheet default)
-     */
-    void setHeight(short height);
-
-    /**
-     * Set whether or not to display this row with 0 height
-     *
-     * @param zHeight  height is zero or not.
-     */
-    void setZeroHeight(boolean zHeight);
-
-    /**
-     * Get whether or not to display this row with 0 height
-     *
-     * @return - zHeight height is zero or not.
-     */
-    boolean getZeroHeight();
-
-    /**
-     * Set the row's height in points.
-     *
-     * @param height the height in points. <code>-1</code>  resets to the default height
-     */
-    void setHeightInPoints(float height);
-
-    /**
-     * Get the row's height measured in twips (1/20th of a point). If the height is not set, the default worksheet value is returned,
-     * See {@link Sheet#getDefaultRowHeightInPoints()}
-     *
-     * @return row height measured in twips (1/20th of a point)
-     */
-    short getHeight();
-
-    /**
-     * Returns row height measured in point size. If the height is not set, the default worksheet value is returned,
-     * See {@link Sheet#getDefaultRowHeightInPoints()}
-     *
-     * @return row height measured in point size
-     * @see Sheet#getDefaultRowHeightInPoints()
-     */
-    float getHeightInPoints();
-
-    /**
-     * Is this row formatted? Most aren't, but some rows
-     *  do have whole-row styles. For those that do, you
-     *  can get the formatting from {@link #getRowStyle()}
-     */
-    boolean isFormatted();
-    
-    /**
-     * Returns the whole-row cell styles. Most rows won't
-     *  have one of these, so will return null. Call
-     *  {@link #isFormatted()} to check first.
-     */
-    CellStyle getRowStyle();
-    
-    /**
-     * Applies a whole-row cell styling to the row.
-     */
-    void setRowStyle(CellStyle style);
-    
-    /**
-     * @return Cell iterator of the physically defined cells.  Note element 4 may
-     * actually be row cell depending on how many are defined!
-     */
-    Iterator<Cell> cellIterator();
-
-    /**
-     * Returns the Sheet this row belongs to
-     *
-     * @return the Sheet that owns this row
-     */
-    Sheet getSheet();
-
-    /**
-     * Used to specify the different possible policies
-     *  if for the case of null and blank cells
-     */
-    public enum MissingCellPolicy {
-        RETURN_NULL_AND_BLANK(1),
-        RETURN_BLANK_AS_NULL(2),
-        CREATE_NULL_AS_BLANK(3);
-        
-        /**
-         * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - the id has no function and will be removed.
-         * The {@code id} is only kept only for backwards compatibility with applications that hard-coded the number
-         */
-        @Removal(version="3.17")
-        @Deprecated
-        public final int id;
-        private MissingCellPolicy(int id) {
-            this.id = id;
-        }
-    }
-
-    /**
-     * Missing cells are returned as null, Blank cells are returned as normal
-     * 
-     * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum
-     **/
-    @Removal(version="3.17")
-    @Deprecated
-    public static final MissingCellPolicy RETURN_NULL_AND_BLANK = MissingCellPolicy.RETURN_NULL_AND_BLANK;
-    /**
-     * Missing cells and blank cells are returned as null
-     * 
-     * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum
-     **/
-    @Removal(version="3.17")
-    @Deprecated
-    public static final MissingCellPolicy RETURN_BLANK_AS_NULL = MissingCellPolicy.RETURN_BLANK_AS_NULL;
-    /**
-     * A new, blank cell is created for missing cells. Blank cells are returned as normal
-     * 
-     * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum
-     **/
-    @Removal(version="3.17")
-    @Deprecated
-    public static final MissingCellPolicy CREATE_NULL_AS_BLANK = MissingCellPolicy.CREATE_NULL_AS_BLANK;
-    
-    /**
-     * Returns the rows outline level. Increased as you
-     *  put it into more groups (outlines), reduced as
-     *  you take it out of them.
-     */
-    public int getOutlineLevel();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/ShapeTypes.java b/trunk/src/java/org/apache/poi/ss/usermodel/ShapeTypes.java
deleted file mode 100644
index 3c5747e..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/ShapeTypes.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-/**
- * All known types of automatic shapes in DrawingML
- *
- * @author Yegor Kozlov
- */
-public class ShapeTypes {
-    public static final int LINE = 1;
-    public static final int LINE_INV = 2;
-    public static final int TRIANGLE = 3;
-    public static final int RT_TRIANGLE = 4;
-    public static final int RECT = 5;
-    public static final int DIAMOND = 6;
-    public static final int PARALLELOGRAM = 7;
-    public static final int TRAPEZOID = 8;
-    public static final int NON_ISOSCELES_TRAPEZOID = 9;
-    public static final int PENTAGON = 10;
-    public static final int HEXAGON = 11;
-    public static final int HEPTAGON = 12;
-    public static final int OCTAGON = 13;
-    public static final int DECAGON = 14;
-    public static final int DODECAGON = 15;
-    public static final int STAR_4 = 16;
-    public static final int STAR_5 = 17;
-    public static final int STAR_6 = 18;
-    public static final int STAR_7 = 19;
-    public static final int STAR_8 = 20;
-    public static final int STAR_10 = 21;
-    public static final int STAR_12 = 22;
-    public static final int STAR_16 = 23;
-    public static final int STAR_24 = 24;
-    public static final int STAR_32 = 25;
-    public static final int ROUND_RECT = 26;
-    public static final int ROUND_1_RECT = 27;
-    public static final int ROUND_2_SAME_RECT = 28;
-    public static final int ROUND_2_DIAG_RECT = 29;
-    public static final int SNIP_ROUND_RECT = 30;
-    public static final int SNIP_1_RECT = 31;
-    public static final int SNIP_2_SAME_RECT = 32;
-    public static final int SNIP_2_DIAG_RECT = 33;
-    public static final int PLAQUE = 34;
-    public static final int ELLIPSE = 35;
-    public static final int TEARDROP = 36;
-    public static final int HOME_PLATE = 37;
-    public static final int CHEVRON = 38;
-    public static final int PIE_WEDGE = 39;
-    public static final int PIE = 40;
-    public static final int BLOCK_ARC = 41;
-    public static final int DONUT = 42;
-    public static final int NO_SMOKING = 43;
-    public static final int RIGHT_ARROW = 44;
-    public static final int LEFT_ARROW = 45;
-    public static final int UP_ARROW = 46;
-    public static final int DOWN_ARROW = 47;
-    public static final int STRIPED_RIGHT_ARROW = 48;
-    public static final int NOTCHED_RIGHT_ARROW = 49;
-    public static final int BENT_UP_ARROW = 50;
-    public static final int LEFT_RIGHT_ARROW = 51;
-    public static final int UP_DOWN_ARROW = 52;
-    public static final int LEFT_UP_ARROW = 53;
-    public static final int LEFT_RIGHT_UP_ARROW = 54;
-    public static final int QUAD_ARROW = 55;
-    public static final int LEFT_ARROW_CALLOUT = 56;
-    public static final int RIGHT_ARROW_CALLOUT = 57;
-    public static final int UP_ARROW_CALLOUT = 58;
-    public static final int DOWN_ARROW_CALLOUT = 59;
-    public static final int LEFT_RIGHT_ARROW_CALLOUT = 60;
-    public static final int UP_DOWN_ARROW_CALLOUT = 61;
-    public static final int QUAD_ARROW_CALLOUT = 62;
-    public static final int BENT_ARROW = 63;
-    public static final int UTURN_ARROW = 64;
-    public static final int CIRCULAR_ARROW = 65;
-    public static final int LEFT_CIRCULAR_ARROW = 66;
-    public static final int LEFT_RIGHT_CIRCULAR_ARROW = 67;
-    public static final int CURVED_RIGHT_ARROW = 68;
-    public static final int CURVED_LEFT_ARROW = 69;
-    public static final int CURVED_UP_ARROW = 70;
-    public static final int CURVED_DOWN_ARROW = 71;
-    public static final int SWOOSH_ARROW = 72;
-    public static final int CUBE = 73;
-    public static final int CAN = 74;
-    public static final int LIGHTNING_BOLT = 75;
-    public static final int HEART = 76;
-    public static final int SUN = 77;
-    public static final int MOON = 78;
-    public static final int SMILEY_FACE = 79;
-    public static final int IRREGULAR_SEAL_1 = 80;
-    public static final int IRREGULAR_SEAL_2 = 81;
-    public static final int FOLDED_CORNER = 82;
-    public static final int BEVEL = 83;
-    public static final int FRAME = 84;
-    public static final int HALF_FRAME = 85;
-    public static final int CORNER = 86;
-    public static final int DIAG_STRIPE = 87;
-    public static final int CHORD = 88;
-    public static final int ARC = 89;
-    public static final int LEFT_BRACKET = 90;
-    public static final int RIGHT_BRACKET = 91;
-    public static final int LEFT_BRACE = 92;
-    public static final int RIGHT_BRACE = 93;
-    public static final int BRACKET_PAIR = 94;
-    public static final int BRACE_PAIR = 95;
-    public static final int STRAIGHT_CONNECTOR_1 = 96;
-    public static final int BENT_CONNECTOR_2 = 97;
-    public static final int BENT_CONNECTOR_3 = 98;
-    public static final int BENT_CONNECTOR_4 = 99;
-    public static final int BENT_CONNECTOR_5 = 100;
-    public static final int CURVED_CONNECTOR_2 = 101;
-    public static final int CURVED_CONNECTOR_3 = 102;
-    public static final int CURVED_CONNECTOR_4 = 103;
-    public static final int CURVED_CONNECTOR_5 = 104;
-    public static final int CALLOUT_1 = 105;
-    public static final int CALLOUT_2 = 106;
-    public static final int CALLOUT_3 = 107;
-    public static final int ACCENT_CALLOUT_1 = 108;
-    public static final int ACCENT_CALLOUT_2 = 109;
-    public static final int ACCENT_CALLOUT_3 = 110;
-    public static final int BORDER_CALLOUT_1 = 111;
-    public static final int BORDER_CALLOUT_2 = 112;
-    public static final int BORDER_CALLOUT_3 = 113;
-    public static final int ACCENT_BORDER_CALLOUT_1 = 114;
-    public static final int ACCENT_BORDER_CALLOUT_2 = 115;
-    public static final int ACCENT_BORDER_CALLOUT_3 = 116;
-    public static final int WEDGE_RECT_CALLOUT = 117;
-    public static final int WEDGE_ROUND_RECT_CALLOUT = 118;
-    public static final int WEDGE_ELLIPSE_CALLOUT = 119;
-    public static final int CLOUD_CALLOUT = 120;
-    public static final int CLOUD = 121;
-    public static final int RIBBON = 122;
-    public static final int RIBBON_2 = 123;
-    public static final int ELLIPSE_RIBBON = 124;
-    public static final int ELLIPSE_RIBBON_2 = 125;
-    public static final int LEFT_RIGHT_RIBBON = 126;
-    public static final int VERTICAL_SCROLL = 127;
-    public static final int HORIZONTAL_SCROLL = 128;
-    public static final int WAVE = 129;
-    public static final int DOUBLE_WAVE = 130;
-    public static final int PLUS = 131;
-    public static final int FLOW_CHART_PROCESS = 132;
-    public static final int FLOW_CHART_DECISION = 133;
-    public static final int FLOW_CHART_INPUT_OUTPUT = 134;
-    public static final int FLOW_CHART_PREDEFINED_PROCESS = 135;
-    public static final int FLOW_CHART_INTERNAL_STORAGE = 136;
-    public static final int FLOW_CHART_DOCUMENT = 137;
-    public static final int FLOW_CHART_MULTIDOCUMENT = 138;
-    public static final int FLOW_CHART_TERMINATOR = 139;
-    public static final int FLOW_CHART_PREPARATION = 140;
-    public static final int FLOW_CHART_MANUAL_INPUT = 141;
-    public static final int FLOW_CHART_MANUAL_OPERATION = 142;
-    public static final int FLOW_CHART_CONNECTOR = 143;
-    public static final int FLOW_CHART_PUNCHED_CARD = 144;
-    public static final int FLOW_CHART_PUNCHED_TAPE = 145;
-    public static final int FLOW_CHART_SUMMING_JUNCTION = 146;
-    public static final int FLOW_CHART_OR = 147;
-    public static final int FLOW_CHART_COLLATE = 148;
-    public static final int FLOW_CHART_SORT = 149;
-    public static final int FLOW_CHART_EXTRACT = 150;
-    public static final int FLOW_CHART_MERGE = 151;
-    public static final int FLOW_CHART_OFFLINE_STORAGE = 152;
-    public static final int FLOW_CHART_ONLINE_STORAGE = 153;
-    public static final int FLOW_CHART_MAGNETIC_TAPE = 154;
-    public static final int FLOW_CHART_MAGNETIC_DISK = 155;
-    public static final int FLOW_CHART_MAGNETIC_DRUM = 156;
-    public static final int FLOW_CHART_DISPLAY = 157;
-    public static final int FLOW_CHART_DELAY = 158;
-    public static final int FLOW_CHART_ALTERNATE_PROCESS = 159;
-    public static final int FLOW_CHART_OFFPAGE_CONNECTOR = 160;
-    public static final int ACTION_BUTTON_BLANK = 161;
-    public static final int ACTION_BUTTON_HOME = 162;
-    public static final int ACTION_BUTTON_HELP = 163;
-    public static final int ACTION_BUTTON_INFORMATION = 164;
-    public static final int ACTION_BUTTON_FORWARD_NEXT = 165;
-    public static final int ACTION_BUTTON_BACK_PREVIOUS = 166;
-    public static final int ACTION_BUTTON_END = 167;
-    public static final int ACTION_BUTTON_BEGINNING = 168;
-    public static final int ACTION_BUTTON_RETURN = 169;
-    public static final int ACTION_BUTTON_DOCUMENT = 170;
-    public static final int ACTION_BUTTON_SOUND = 171;
-    public static final int ACTION_BUTTON_MOVIE = 172;
-    public static final int GEAR_6 = 173;
-    public static final int GEAR_9 = 174;
-    public static final int FUNNEL = 175;
-    public static final int MATH_PLUS = 176;
-    public static final int MATH_MINUS = 177;
-    public static final int MATH_MULTIPLY = 178;
-    public static final int MATH_DIVIDE = 179;
-    public static final int MATH_EQUAL = 180;
-    public static final int MATH_NOT_EQUAL = 181;
-    public static final int CORNER_TABS = 182;
-    public static final int SQUARE_TABS = 183;
-    public static final int PLAQUE_TABS = 184;
-    public static final int CHART_X = 185;
-    public static final int CHART_STAR = 186;
-    public static final int CHART_PLUS = 187;
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java b/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java
deleted file mode 100644
index 4c171ff..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Sheet.java
+++ /dev/null
@@ -1,1192 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.PaneInformation;
-import org.apache.poi.util.Removal;
-
-/**
- * High level representation of a Excel worksheet.
- *
- * <p>
- * Sheets are the central structures within a workbook, and are where a user does most of his spreadsheet work.
- * The most common type of sheet is the worksheet, which is represented as a grid of cells. Worksheet cells can
- * contain text, numbers, dates, and formulas. Cells can also be formatted.
- * </p>
- */
-public interface Sheet extends Iterable<Row> {
-
-    /* Constants for margins */
-    public static final short LeftMargin = 0;
-
-    public static final short RightMargin = 1;
-
-    public static final short TopMargin = 2;
-
-    public static final short BottomMargin = 3;
-
-    public static final short HeaderMargin = 4;
-
-    public static final short FooterMargin = 5;
-
-    public static final byte PANE_LOWER_RIGHT = (byte) 0;
-
-    public static final byte PANE_UPPER_RIGHT = (byte) 1;
-
-    public static final byte PANE_LOWER_LEFT = (byte) 2;
-
-    public static final byte PANE_UPPER_LEFT = (byte) 3;
-
-    /**
-     * Create a new row within the sheet and return the high level representation
-     *
-     * @param rownum  row number
-     * @return high level Row object representing a row in the sheet
-     * @see #removeRow(Row)
-     */
-    Row createRow(int rownum);
-
-    /**
-     * Remove a row from this sheet.  All cells contained in the row are removed as well
-     *
-     * @param row   representing a row to remove.
-     */
-    void removeRow(Row row);
-
-    /**
-     * Returns the logical row (not physical) 0-based.  If you ask for a row that is not
-     * defined you get a null.  This is to say row 4 represents the fifth row on a sheet.
-     *
-     * @param rownum  row to get (0-based)
-     * @return Row representing the rownumber or null if its not defined on the sheet
-     */
-    Row getRow(int rownum);
-
-    /**
-     * Returns the number of physically defined rows (NOT the number of rows in the sheet)
-     *
-     * @return the number of physically defined rows in this sheet
-     */
-    int getPhysicalNumberOfRows();
-
-    /**
-     * Gets the first row on the sheet
-     *
-     * @return the number of the first logical row on the sheet (0-based)
-     */
-    int getFirstRowNum();
-
-    /**
-     * Gets the last row on the sheet
-     *
-     * @return last row contained n this sheet (0-based)
-     */
-    int getLastRowNum();
-
-    /**
-     * Get the visibility state for a given column
-     *
-     * @param columnIndex - the column to get (0-based)
-     * @param hidden - the visiblity state of the column
-     */
-    void setColumnHidden(int columnIndex, boolean hidden);
-
-    /**
-     * Get the hidden state for a given column
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @return hidden - <code>false</code> if the column is visible
-     */
-    boolean isColumnHidden(int columnIndex);
-
-    /**
-     * Sets whether the worksheet is displayed from right to left instead of from left to right.
-     *
-     * @param value true for right to left, false otherwise.
-     */
-    public void setRightToLeft(boolean value);
-
-    /**
-     * Whether the text is displayed in right-to-left mode in the window
-     *
-     * @return whether the text is displayed in right-to-left mode in the window
-     */
-    public boolean isRightToLeft();
-
-    /**
-     * Set the width (in units of 1/256th of a character width)<p>
-     *
-     * The maximum column width for an individual cell is 255 characters.
-     * This value represents the number of characters that can be displayed
-     * in a cell that is formatted with the standard font (first font in the workbook).<p>
-     *
-     * Character width is defined as the maximum digit width
-     * of the numbers <code>0, 1, 2, ... 9</code> as rendered
-     * using the default font (first font in the workbook).<p>
-     * 
-     * Unless you are using a very special font, the default character is '0' (zero),
-     * this is true for Arial (default font font in HSSF) and Calibri (default font in XSSF)<p>
-     *
-     * Please note, that the width set by this method includes 4 pixels of margin padding (two on each side),
-     * plus 1 pixel padding for the gridlines (Section 3.3.1.12 of the OOXML spec).
-     * This results is a slightly less value of visible characters than passed to this method (approx. 1/2 of a character).<p>
-     * 
-     * To compute the actual number of visible characters,
-     * Excel uses the following formula (Section 3.3.1.12 of the OOXML spec):<p>
-     * 
-     * <code>
-     *     width = Truncate([{Number of Visible Characters} *
-     *      {Maximum Digit Width} + {5 pixel padding}]/{Maximum Digit Width}*256)/256
-     * </code>
-     * 
-     * Using the Calibri font as an example, the maximum digit width of 11 point font size is 7 pixels (at 96 dpi).
-     * If you set a column width to be eight characters wide, e.g. <code>setColumnWidth(columnIndex, 8*256)</code>,
-     * then the actual value of visible characters (the value shown in Excel) is derived from the following equation:
-     *  <code>
-     *      Truncate([numChars*7+5]/7*256)/256 = 8;
-     *  </code>
-     *
-     * which gives <code>7.29</code>.
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @param width - the width in units of 1/256th of a character width
-     * @throws IllegalArgumentException if width &gt; 255*256 (the maximum column width in Excel is 255 characters)
-     */
-    void setColumnWidth(int columnIndex, int width);
-
-    /**
-     * get the width (in units of 1/256th of a character width )
-     *
-     * <p>
-     * Character width is defined as the maximum digit width
-     * of the numbers <code>0, 1, 2, ... 9</code> as rendered
-     * using the default font (first font in the workbook)
-     * </p>
-     *
-     * @param columnIndex - the column to get (0-based)
-     * @return width - the width in units of 1/256th of a character width
-     */
-    int getColumnWidth(int columnIndex);
-
-    /**
-     * get the width in pixel
-     * 
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with the default font size (Arial 10pt for .xls and Calibri 11pt for .xlsx).
-     * If the default font is changed the column width can be streched
-     * </p>
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @return width in pixels
-     */
-    float getColumnWidthInPixels(int columnIndex);
-    
-    
-    /**
-     * Set the default column width for the sheet (if the columns do not define their own width)
-     * in characters
-     *
-     * @param width default column width measured in characters
-     */
-    void setDefaultColumnWidth(int width);
-
-    /**
-     * Get the default column width for the sheet (if the columns do not define their own width)
-     * in characters
-     *
-     * @return default column width measured in characters
-     */
-    int getDefaultColumnWidth();
-
-    /**
-     * Get the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of  a point)
-     *
-     * @return  default row height measured in twips (1/20 of  a point)
-     */
-    short getDefaultRowHeight();
-    
-    /**
-     * Get the default row height for the sheet (if the rows do not define their own height) in
-     * points.
-     *
-     * @return  default row height in points
-     */
-    float getDefaultRowHeightInPoints();
-
-    /**
-     * Set the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of  a point)
-     *
-     * @param  height default row height measured in twips (1/20 of  a point)
-     */
-    void setDefaultRowHeight(short height);
-
-    /**
-     * Set the default row height for the sheet (if the rows do not define their own height) in
-     * points
-     * @param height default row height
-     */
-    void setDefaultRowHeightInPoints(float height);
-
-    /**
-     * Returns the CellStyle that applies to the given
-     *  (0 based) column, or null if no style has been
-     *  set for that column
-     */
-    public CellStyle getColumnStyle(int column);
-
-    /**
-     * Sets the CellStyle that applies to the given
-     *  (0 based) column.
-     */
-//    public CellStyle setColumnStyle(int column, CellStyle style);
-
-    /**
-     * Adds a merged region of cells (hence those cells form one)
-     *
-     * @param region (rowfrom/colfrom-rowto/colto) to merge
-     * @return index of this region
-     */
-    int addMergedRegion(CellRangeAddress region);
-
-    /**
-     * Adds a merged region of cells (hence those cells form one).
-     * Skips validation. It is possible to create overlapping merged regions
-     * or create a merged region that intersects a multi-cell array formula
-     * with this formula, which may result in a corrupt workbook.
-     *
-     * To check for merged regions overlapping array formulas or other merged regions
-     * after addMergedRegionUnsafe has been called, call {@link #validateMergedRegions()}, which runs in O(n^2) time.
-     *
-     * @param region to merge
-     * @return index of this region
-     * @throws IllegalArgumentException if region contains fewer than 2 cells
-     */
-    int addMergedRegionUnsafe(CellRangeAddress region);
-
-    /**
-     * Verify that merged regions do not intersect multi-cell array formulas and
-     * no merged regions intersect another merged region in this sheet.
-     *
-     * @throws IllegalStateException if region intersects with a multi-cell array formula
-     * @throws IllegalStateException if at least one region intersects with another merged region in this sheet
-     */
-    void validateMergedRegions();
-
-    /**
-     * Determines whether the output is vertically centered on the page.
-     *
-     * @param value true to vertically center, false otherwise.
-     */
-    void setVerticallyCenter(boolean value);
-
-    /**
-     * Determines whether the output is horizontally centered on the page.
-     *
-     * @param value true to horizontally center, false otherwise.
-     */
-    void setHorizontallyCenter(boolean value);
-
-    /**
-     * Determine whether printed output for this sheet will be horizontally centered.
-     */
-
-    boolean getHorizontallyCenter();
-
-    /**
-     * Determine whether printed output for this sheet will be vertically centered.
-     */
-    boolean getVerticallyCenter();
-
-    /**
-     * Removes a merged region of cells (hence letting them free)
-     *
-     * @param index of the region to unmerge
-     */
-    void removeMergedRegion(int index);
-    
-    /**
-     * Removes a number of merged regions of cells (hence letting them free)
-     *
-     * @param indices A set of the regions to unmerge
-     */
-    void removeMergedRegions(Collection<Integer> indices);
-
-    /**
-     * Returns the number of merged regions
-     *
-     * @return number of merged regions
-     */
-    int getNumMergedRegions();
-
-    /**
-     * Returns the merged region at the specified index
-     *
-     * @return the merged region at the specified index
-     */
-    public CellRangeAddress getMergedRegion(int index);
-
-    /**
-     * Returns the list of merged regions.
-     *
-     * @return the list of merged regions
-     */
-    public List<CellRangeAddress> getMergedRegions();
-
-    /**
-     *  Returns an iterator of the physical rows
-     *
-     * @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.
-     */
-    Iterator<Row> rowIterator();
-
-    /**
-     * Control if Excel should be asked to recalculate all formulas on this sheet
-     * when the workbook is opened.
-     *
-     *  <p>
-     *  Calculating the formula values with {@link FormulaEvaluator} is the
-     *  recommended solution, but this may be used for certain cases where
-     *  evaluation in POI is not possible.
-     *  </p>
-     *
-     *  To force recalcuation of formulas in the entire workbook
-     *  use {@link Workbook#setForceFormulaRecalculation(boolean)} instead.
-     *
-     * @param value true if the application will perform a full recalculation of
-     * this worksheet values when the workbook is opened
-     *
-     * @see Workbook#setForceFormulaRecalculation(boolean)
-     */
-    void setForceFormulaRecalculation(boolean value);
-
-    /**
-     * Whether Excel will be asked to recalculate all formulas in this sheet when the
-     *  workbook is opened.  
-     */
-    boolean getForceFormulaRecalculation();
-    
-    /**
-     * Flag indicating whether the sheet displays Automatic Page Breaks.
-     *
-     * @param value <code>true</code> if the sheet displays Automatic Page Breaks.
-     */
-    void setAutobreaks(boolean value);
-
-    /**
-     * Set whether to display the guts or not
-     *
-     * @param value - guts or no guts
-     */
-    void setDisplayGuts(boolean value);
-
-    /**
-     * Set whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     *
-     * @param value whether to display or hide all zero values on the worksheet
-     */
-    void setDisplayZeros(boolean value);
-
-
-    /**
-     * Gets the flag indicating whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     *
-     * @return whether all zero values on the worksheet are displayed
-     */
-    boolean isDisplayZeros();
-
-    /**
-     * Flag indicating whether the Fit to Page print option is enabled.
-     *
-     * @param value <code>true</code> if the Fit to Page print option is enabled.
-     */
-    void setFitToPage(boolean value);
-
-    /**
-     * Flag indicating whether summary rows appear below detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary row is inserted below the detailed data being summarized and a
-     * new outline level is established on that row.
-     * </p>
-     * <p>
-     * When false a summary row is inserted above the detailed data being summarized and a new outline level
-     * is established on that row.
-     * </p>
-     * @param value <code>true</code> if row summaries appear below detail in the outline
-     */
-    void setRowSumsBelow(boolean value);
-
-    /**
-     * Flag indicating whether summary columns appear to the right of detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary column is inserted to the right of the detailed data being summarized
-     * and a new outline level is established on that column.
-     * </p>
-     * <p>
-     * When false a summary column is inserted to the left of the detailed data being
-     * summarized and a new outline level is established on that column.
-     * </p>
-     * @param value <code>true</code> if col summaries appear right of the detail in the outline
-     */
-    void setRowSumsRight(boolean value);
-
-    /**
-     * Flag indicating whether the sheet displays Automatic Page Breaks.
-     *
-     * @return <code>true</code> if the sheet displays Automatic Page Breaks.
-     */
-    boolean getAutobreaks();
-
-    /**
-     * Get whether to display the guts or not,
-     * default value is true
-     *
-     * @return boolean - guts or no guts
-     */
-    boolean getDisplayGuts();
-
-    /**
-     * Flag indicating whether the Fit to Page print option is enabled.
-     *
-     * @return <code>true</code> if the Fit to Page print option is enabled.
-     */
-    boolean getFitToPage();
-
-    /**
-     * Flag indicating whether summary rows appear below detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary row is inserted below the detailed data being summarized and a
-     * new outline level is established on that row.
-     * </p>
-     * <p>
-     * When false a summary row is inserted above the detailed data being summarized and a new outline level
-     * is established on that row.
-     * </p>
-     * @return <code>true</code> if row summaries appear below detail in the outline
-     */
-    boolean getRowSumsBelow();
-
-    /**
-     * Flag indicating whether summary columns appear to the right of detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary column is inserted to the right of the detailed data being summarized
-     * and a new outline level is established on that column.
-     * </p>
-     * <p>
-     * When false a summary column is inserted to the left of the detailed data being
-     * summarized and a new outline level is established on that column.
-     * </p>
-     * @return <code>true</code> if col summaries appear right of the detail in the outline
-     */
-    boolean getRowSumsRight();
-
-    /**
-     * Gets the flag indicating whether this sheet displays the lines
-     * between rows and columns to make editing and reading easier.
-     *
-     * @return <code>true</code> if this sheet prints gridlines.
-     * @see #isDisplayGridlines() to check if gridlines are displayed on screen
-     */
-    boolean isPrintGridlines();
-
-    /**
-     * Sets the flag indicating whether this sheet should print the lines
-     * between rows and columns to make editing and reading easier.
-     *
-     * @param show <code>true</code> if this sheet should print gridlines.
-     * @see #setDisplayGridlines(boolean) to display gridlines on screen
-     */
-    void setPrintGridlines(boolean show);
-    
-    /**
-     * Gets the flag indicating whether this sheet prints the
-     * row and column headings when printing.
-     *
-     * @return <code>true</code> if this sheet prints row and column headings.
-     */
-    boolean isPrintRowAndColumnHeadings();
-
-    /**
-     * Sets the flag indicating whether this sheet should print
-     * row and columns headings when printing.
-     *
-     * @param show <code>true</code> if this sheet should print row and column headings.
-     */
-    void setPrintRowAndColumnHeadings(boolean show);
-
-    /**
-     * Gets the print setup object.
-     *
-     * @return The user model for the print setup object.
-     */
-    PrintSetup getPrintSetup();
-
-    /**
-     * Gets the user model for the default document header.<p>
-     * 
-     * Note that XSSF offers more kinds of document headers than HSSF does
-     * 
-     * @return the document header. Never <code>null</code>
-     */
-    Header getHeader();
-
-    /**
-     * Gets the user model for the default document footer.<p>
-     * 
-     * Note that XSSF offers more kinds of document footers than HSSF does.
-     *
-     * @return the document footer. Never <code>null</code>
-     */
-    Footer getFooter();
-
-    /**
-     * Sets a flag indicating whether this sheet is selected.<p>
-     * 
-     * Note: multiple sheets can be selected, but only one sheet can be active at one time.
-     *
-     * @param value <code>true</code> if this sheet is selected
-     * @see Workbook#setActiveSheet(int)
-     */
-    void setSelected(boolean value);
-
-    /**
-     * Gets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @return the size of the margin
-     */
-    double getMargin(short margin);
-
-    /**
-     * Sets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @param size the size of the margin
-     */
-    void setMargin(short margin, double size);
-
-    /**
-     * Answer whether protection is enabled or disabled
-     *
-     * @return true =&gt; protection enabled; false =&gt; protection disabled
-     */
-    boolean getProtect();
-    
-    /**
-     * Sets the protection enabled as well as the password
-     * @param password to set for protection. Pass <code>null</code> to remove protection
-     */
-    public void protectSheet(String password);
-    
-    /**
-     * Answer whether scenario protection is enabled or disabled
-     *
-     * @return true =&gt; protection enabled; false =&gt; protection disabled
-     */
-    boolean getScenarioProtect();
-
-    /**
-     * Sets the zoom magnication for the sheet.  The zoom is expressed as a
-     * fraction.  For example to express a zoom of 75% use 3 for the numerator
-     * and 4 for the denominator.
-     *
-     * @param numerator     The numerator for the zoom magnification.
-     * @param denominator   The denominator for the zoom magnification.
-     * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #setZoom(int)} instead.
-     */
-    @Removal(version="3.16")
-    @Deprecated
-    void setZoom(int numerator, int denominator);
-    
-    /**
-     * Window zoom magnification for current view representing percent values.
-     * Valid values range from 10 to 400. Horizontal &amp; Vertical scale together.
-     *
-     * For example:
-     * <pre>
-     * 10 - 10%
-     * 20 - 20%
-     * ...
-     * 100 - 100%
-     * ...
-     * 400 - 400%
-     * </pre>
-     *
-     * @param scale window zoom magnification
-     * @throws IllegalArgumentException if scale is invalid
-     */
-    public void setZoom(int scale);
-
-    /**
-     * The top row in the visible view when the sheet is
-     * first viewed after opening it in a viewer
-     *
-     * @return short indicating the rownum (0 based) of the top row
-     */
-    short getTopRow();
-
-    /**
-     * The left col in the visible view when the sheet is
-     * first viewed after opening it in a viewer
-     *
-     * @return short indicating the rownum (0 based) of the top row
-     */
-    short getLeftCol();
-
-    /**
-     * Sets desktop window pane display area, when the
-     * file is first opened in a viewer.
-     *
-     * @param toprow the top row to show in desktop window pane
-     * @param leftcol the left column to show in desktop window pane
-     */
-    void showInPane(int toprow, int leftcol);
-
-    /**
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around.
-     *
-     * Calls shiftRows(startRow, endRow, n, false, false);
-     *
-     * <p>
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted).
-     * @param startRow the row to start shifting
-     * @param endRow the row to end shifting
-     * @param n the number of rows to shift
-     */
-    void shiftRows(int startRow, int endRow, int n);
-
-    /**
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around
-     *
-     * <p>
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted). All merged regions that are
-     * completely overlaid by shifting will be deleted.
-     * <p>
-     * @param startRow the row to start shifting
-     * @param endRow the row to end shifting
-     * @param n the number of rows to shift
-     * @param copyRowHeight whether to copy the row height during the shift
-     * @param resetOriginalRowHeight whether to set the original row's height to the default
-     */
-    void shiftRows(int startRow, int endRow, int n, boolean copyRowHeight, boolean resetOriginalRowHeight);
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.
-     * <p>
-     *     If both colSplit and rowSplit are zero then the existing freeze pane is removed
-     * </p>
-     * @param colSplit      Horizonatal position of split.
-     * @param rowSplit      Vertical position of split.
-     * @param leftmostColumn   Left column visible in right pane.
-     * @param topRow        Top row visible in bottom pane
-     */
-    void createFreezePane(int colSplit, int rowSplit, int leftmostColumn, int topRow);
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.
-     * <p>
-     *     If both colSplit and rowSplit are zero then the existing freeze pane is removed
-     * </p>
-     * @param colSplit      Horizonatal position of split.
-     * @param rowSplit      Vertical position of split.
-     */
-    void createFreezePane(int colSplit, int rowSplit);
-
-    /**
-     * Creates a split pane. Any existing freezepane or split pane is overwritten.
-     * @param xSplitPos      Horizonatal position of split (in 1/20th of a point).
-     * @param ySplitPos      Vertical position of split (in 1/20th of a point).
-     * @param topRow        Top row visible in bottom pane
-     * @param leftmostColumn   Left column visible in right pane.
-     * @param activePane    Active pane.  One of: PANE_LOWER_RIGHT,
-     *                      PANE_UPPER_RIGHT, PANE_LOWER_LEFT, PANE_UPPER_LEFT
-     * @see #PANE_LOWER_LEFT
-     * @see #PANE_LOWER_RIGHT
-     * @see #PANE_UPPER_LEFT
-     * @see #PANE_UPPER_RIGHT
-     */
-    void createSplitPane(int xSplitPos, int ySplitPos, int leftmostColumn, int topRow, int activePane);
-
-    /**
-     * Returns the information regarding the currently configured pane (split or freeze)
-     *
-     * @return null if no pane configured, or the pane information.
-     */
-    PaneInformation getPaneInformation();
-
-    /**
-     * Sets whether the gridlines are shown in a viewer
-     *
-     * @param show whether to show gridlines or not
-     */
-    void setDisplayGridlines(boolean show);
-
-    /**
-     * Returns if gridlines are displayed
-     *
-     * @return whether gridlines are displayed
-     */
-    boolean isDisplayGridlines();
-
-    /**
-     * Sets whether the formulas are shown in a viewer
-     *
-     * @param show whether to show formulas or not
-     */
-    void setDisplayFormulas(boolean show);
-
-    /**
-     * Returns if formulas are displayed
-     *
-     * @return whether formulas are displayed
-     */
-    boolean isDisplayFormulas();
-
-    /**
-     * Sets whether the RowColHeadings are shown in a viewer
-     *
-     * @param show whether to show RowColHeadings or not
-     */
-    void setDisplayRowColHeadings(boolean show);
-
-    /**
-     * Returns if RowColHeadings are displayed.
-     * @return whether RowColHeadings are displayed
-     */
-    boolean isDisplayRowColHeadings();
-
-    /**
-     * Sets a page break at the indicated row
-     * Breaks occur above the specified row and left of the specified column inclusive.
-     *
-     * For example, <code>sheet.setColumnBreak(2);</code> breaks the sheet into two parts
-     * with columns A,B,C in the first and D,E,... in the second. Simuilar, <code>sheet.setRowBreak(2);</code>
-     * breaks the sheet into two parts with first three rows (rownum=1...3) in the first part
-     * and rows starting with rownum=4 in the second.
-     *
-     * @param row the row to break, inclusive
-     */
-    void setRowBreak(int row);
-
-    /**
-     * Determines if there is a page break at the indicated row
-     * @param row FIXME: Document this!
-     * @return FIXME: Document this!
-     */
-    boolean isRowBroken(int row);
-
-    /**
-     * Removes the page break at the indicated row
-     * @param row
-     */
-    void removeRowBreak(int row);
-
-    /**
-     * Retrieves all the horizontal page breaks
-     * @return all the horizontal page breaks, or null if there are no row page breaks
-     */
-    int[] getRowBreaks();
-
-    /**
-     * Retrieves all the vertical page breaks
-     * @return all the vertical page breaks, or null if there are no column page breaks
-     */
-    int[] getColumnBreaks();
-
-    /**
-     * Sets a page break at the indicated column.
-     * Breaks occur above the specified row and left of the specified column inclusive.
-     *
-     * For example, <code>sheet.setColumnBreak(2);</code> breaks the sheet into two parts
-     * with columns A,B,C in the first and D,E,... in the second. Simuilar, <code>sheet.setRowBreak(2);</code>
-     * breaks the sheet into two parts with first three rows (rownum=1...3) in the first part
-     * and rows starting with rownum=4 in the second.
-     *
-     * @param column the column to break, inclusive
-     */
-    void setColumnBreak(int column);
-
-    /**
-     * Determines if there is a page break at the indicated column
-     * @param column FIXME: Document this!
-     * @return FIXME: Document this!
-     */
-    boolean isColumnBroken(int column);
-
-    /**
-     * Removes a page break at the indicated column
-     * @param column
-     */
-    void removeColumnBreak(int column);
-
-    /**
-     * Expands or collapses a column group.
-     *
-     * @param columnNumber      One of the columns in the group.
-     * @param collapsed         true = collapse group, false = expand group.
-     */
-    void setColumnGroupCollapsed(int columnNumber, boolean collapsed);
-
-    /**
-     * Create an outline for the provided column range.
-     *
-     * @param fromColumn        beginning of the column range.
-     * @param toColumn          end of the column range.
-     */
-    void groupColumn(int fromColumn, int toColumn);
-
-    /**
-     * Ungroup a range of columns that were previously grouped
-     *
-     * @param fromColumn   start column (0-based)
-     * @param toColumn     end column (0-based)
-     */
-    void ungroupColumn(int fromColumn, int toColumn);
-
-    /**
-     * Tie a range of rows together so that they can be collapsed or expanded
-     *
-     * @param fromRow   start row (0-based)
-     * @param toRow     end row (0-based)
-     */
-    void groupRow(int fromRow, int toRow);
-
-    /**
-     * Ungroup a range of rows that were previously grouped
-     *
-     * @param fromRow   start row (0-based)
-     * @param toRow     end row (0-based)
-     */
-    void ungroupRow(int fromRow, int toRow);
-
-    /**
-     * Set view state of a grouped range of rows
-     *
-     * @param row   start row of a grouped range of rows (0-based)
-     * @param collapse whether to expand/collapse the detail rows
-     */
-    void setRowGroupCollapsed(int row, boolean collapse);
-
-    /**
-     * Sets the default column style for a given column.  POI will only apply this style to new cells added to the sheet.
-     *
-     * @param column the column index
-     * @param style the style to set
-     */
-    void setDefaultColumnStyle(int column, CellStyle style);
-
-    /**
-     * Adjusts the column width to fit the contents.
-     *
-     * <p>
-     * This process can be relatively slow on large sheets, so this should
-     *  normally only be called once per column, at the end of your
-     *  processing.
-     * </p>
-     * You can specify whether the content of merged cells should be considered or ignored.
-     *  Default is to ignore merged cells.
-     *
-     * @param column the column index
-     */
-    void autoSizeColumn(int column);
-
-    /**
-     * Adjusts the column width to fit the contents.
-     * <p>
-     * This process can be relatively slow on large sheets, so this should
-     *  normally only be called once per column, at the end of your
-     *  processing.
-     * </p>
-     * You can specify whether the content of merged cells should be considered or ignored.
-     *  Default is to ignore merged cells.
-     *
-     * @param column the column index
-     * @param useMergedCells whether to use the contents of merged cells when calculating the width of the column
-     */
-    void autoSizeColumn(int column, boolean useMergedCells);
-
-    /**
-     * Returns cell comment for the specified row and column
-     *
-     * @return cell comment or <code>null</code> if not found
-     * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead.
-     */
-    @Deprecated
-    Comment getCellComment(int row, int column);
-    
-    /**
-     * Returns cell comment for the specified location
-     *
-     * @return cell comment or <code>null</code> if not found
-     */
-    Comment getCellComment(CellAddress ref);
-
-    /**
-     * Returns all cell comments on this sheet.
-     * @return A map of each Comment in the sheet, keyed on the cell address where
-     * the comment is located.
-     */
-    Map<CellAddress, ? extends Comment> getCellComments();
-
-    /**
-     * Return the sheet's existing drawing, or null if there isn't yet one.
-     * 
-     * Use {@link #createDrawingPatriarch()} to get or create
-     *
-     * @return a SpreadsheetML drawing
-     */
-    Drawing getDrawingPatriarch();
-    
-    /**
-     * Creates the top-level drawing patriarch. 
-     * <p>This may then be used to add graphics or charts.</p>
-     * <p>Note that this will normally have the effect of removing 
-     *  any existing drawings on this sheet.</p>
-     *
-     * @return  The new drawing patriarch.
-     */
-    Drawing createDrawingPatriarch();
-
-
-    /**
-     * Return the parent workbook
-     *
-     * @return the parent workbook
-     */
-    Workbook getWorkbook();
-
-    /**
-     * Returns the name of this sheet
-     *
-     * @return the name of this sheet
-     */
-    String getSheetName();
-
-    /**
-     * Note - this is not the same as whether the sheet is focused (isActive)
-     * @return <code>true</code> if this sheet is currently selected
-     */
-    boolean isSelected();
-
-
-    /**
-     * Sets array formula to specified region for result.
-     *
-     * @param formula text representation of the formula
-     * @param range Region of array formula for result.
-     * @return the {@link CellRange} of cells affected by this change
-     */
-    CellRange<? extends Cell> setArrayFormula(String formula, CellRangeAddress range);
-
-    /**
-     * Remove a Array Formula from this sheet.  All cells contained in the Array Formula range are removed as well
-     *
-     * @param cell   any cell within Array Formula range
-     * @return the {@link CellRange} of cells affected by this change
-     */
-    CellRange<? extends Cell> removeArrayFormula(Cell cell);
-    
-    public DataValidationHelper getDataValidationHelper();
-
-    /**
-     * Returns the list of DataValidation in the sheet.
-     * @return list of DataValidation in the sheet
-     */
-    public List<? extends DataValidation> getDataValidations();
-
-    /**
-     * Creates a data validation object
-     * @param dataValidation The Data validation object settings
-     */
-    public void addValidationData(DataValidation dataValidation);
-
-    /**
-     * Enable filtering for a range of cells
-     * 
-     * @param range the range of cells to filter
-     */
-    AutoFilter setAutoFilter(CellRangeAddress range);
-
-    /**
-     * The 'Conditional Formatting' facet for this <tt>Sheet</tt>
-     *
-     * @return  conditional formatting rule for this sheet
-     */
-    SheetConditionalFormatting getSheetConditionalFormatting();
-
-
-    /**
-     * Gets the repeating rows used when printing the sheet, as found in 
-     * File-&gt;PageSetup-&gt;Sheet.<p>
-     * 
-     * Repeating rows cover a range of contiguous rows, e.g.:
-     * <pre>
-     * Sheet1!$1:$1
-     * Sheet2!$5:$8
-     * </pre>
-     * The {@link CellRangeAddress} returned contains a column part which spans 
-     * all columns, and a row part which specifies the contiguous range of 
-     * repeating rows.<p>
-     * 
-     * If the Sheet does not have any repeating rows defined, null is returned.
-     * 
-     * @return an {@link CellRangeAddress} containing the repeating rows for the 
-     *         Sheet, or null.
-     */
-    CellRangeAddress getRepeatingRows();
-
-
-    /**
-     * Gets the repeating columns used when printing the sheet, as found in 
-     * File-&gt;PageSetup-&gt;Sheet.<p>
-     * 
-     * Repeating columns cover a range of contiguous columns, e.g.:
-     * <pre>
-     * Sheet1!$A:$A
-     * Sheet2!$C:$F
-     * </pre>
-     * The {@link CellRangeAddress} returned contains a row part which spans all 
-     * rows, and a column part which specifies the contiguous range of 
-     * repeating columns.<p>
-     * 
-     * If the Sheet does not have any repeating columns defined, null is 
-     * returned.
-     * 
-     * @return an {@link CellRangeAddress} containing the repeating columns for 
-     *         the Sheet, or null.
-     */
-    CellRangeAddress getRepeatingColumns();
-
-
-    /**
-     * Sets the repeating rows used when printing the sheet, as found in 
-     * File-&gt;PageSetup-&gt;Sheet.<p>
-     * 
-     * Repeating rows cover a range of contiguous rows, e.g.:
-     * <pre>
-     * Sheet1!$1:$1
-     * Sheet2!$5:$8</pre>
-     * The parameter {@link CellRangeAddress} should specify a column part 
-     * which spans all columns, and a row part which specifies the contiguous 
-     * range of repeating rows, e.g.:
-     * <pre>
-     * sheet.setRepeatingRows(CellRangeAddress.valueOf("2:3"));</pre>
-     * A null parameter value indicates that repeating rows should be removed 
-     * from the Sheet:
-     * <pre>
-     * sheet.setRepeatingRows(null);</pre>
-     * 
-     * @param rowRangeRef a {@link CellRangeAddress} containing the repeating 
-     *        rows for the Sheet, or null.
-     */
-    void setRepeatingRows(CellRangeAddress rowRangeRef);
-
-
-    /**
-     * Sets the repeating columns used when printing the sheet, as found in 
-     * File-&gt;PageSetup-&gt;Sheet.<p>
-     * 
-     * Repeating columns cover a range of contiguous columns, e.g.:
-     * <pre>
-     * Sheet1!$A:$A
-     * Sheet2!$C:$F</pre>
-     * The parameter {@link CellRangeAddress} should specify a row part 
-     * which spans all rows, and a column part which specifies the contiguous 
-     * range of repeating columns, e.g.:
-     * <pre>
-     * sheet.setRepeatingColumns(CellRangeAddress.valueOf("B:C"));</pre>
-     * A null parameter value indicates that repeating columns should be removed 
-     * from the Sheet:
-     * <pre>
-     * sheet.setRepeatingColumns(null);</pre>
-     * 
-     * @param columnRangeRef a {@link CellRangeAddress} containing the repeating 
-     *        columns for the Sheet, or null.
-     */
-    void setRepeatingColumns(CellRangeAddress columnRangeRef);
-    
-    /**
-     * Returns the column outline level. Increased as you
-     *  put it into more groups (outlines), reduced as
-     *  you take it out of them.
-     */
-    int getColumnOutlineLevel(int columnIndex);
-    
-    /**
-     * Get a Hyperlink in this sheet anchored at row, column
-     *
-     * @param row
-     * @param column
-     * @return hyperlink if there is a hyperlink anchored at row, column; otherwise returns null
-     */
-    public Hyperlink getHyperlink(int row, int column);
-    
-    /**
-     * Get a Hyperlink in this sheet located in a cell specified by {code addr}
-     *
-     * @param addr The address of the cell containing the hyperlink
-     * @return hyperlink if there is a hyperlink anchored at {@code addr}; otherwise returns {@code null}
-     * @since POI 3.15 beta 3
-     */
-    public Hyperlink getHyperlink(CellAddress addr);
-    
-    /**
-     * Get a list of Hyperlinks in this sheet
-     *
-     * @return Hyperlinks for the sheet
-     */
-    public List<? extends Hyperlink> getHyperlinkList();
-
-    /**
-     * Return location of the active cell, e.g. <code>A1</code>.
-     *
-     * @return the location of the active cell.
-     * @since 3.14beta1
-     */
-    public CellAddress getActiveCell();
-
-    /**
-      * Sets location of the active cell
-      *
-      * @param address the location of the active cell, e.g. <code>A1</code>.
-      * @since 3.14beta1
-      */
-    public void setActiveCell(CellAddress address);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java b/trunk/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
deleted file mode 100644
index 853eec6..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * The 'Conditional Formatting' facet of <tt>Sheet</tt>
- *
- * @since 3.8
- */
-public interface SheetConditionalFormatting {
-    /**
-     * Add a new Conditional Formatting to the sheet.
-     *
-     * @param regions - list of rectangular regions to apply conditional formatting rules
-     * @param rule -  the rule to apply
-     *
-     * @return index of the newly created Conditional Formatting object
-     */
-    int addConditionalFormatting(CellRangeAddress[] regions,
-                                 ConditionalFormattingRule rule);
-
-    /**
-     * Add a new Conditional Formatting consisting of two rules.
-     *
-     * @param regions - list of rectangular regions to apply conditional formatting rules
-     * @param rule1 -  the first rule
-     * @param rule2 -  the second rule
-     *
-     * @return index of the newly created Conditional Formatting object
-     */
-    int addConditionalFormatting(CellRangeAddress[] regions,
-                                 ConditionalFormattingRule rule1,
-                                 ConditionalFormattingRule rule2);
-
-    /**
-     * Add a new Conditional Formatting set to the sheet.
-     *
-     * @param regions - list of rectangular regions to apply conditional formatting rules
-     * @param cfRules - set of up to conditional formatting rules (max 3 for Excel pre-2007)
-     *
-     * @return index of the newly created Conditional Formatting object
-     */
-    int addConditionalFormatting(CellRangeAddress[] regions, ConditionalFormattingRule[] cfRules);
-
-    /**
-     * Adds a copy of a ConditionalFormatting object to the sheet
-     * <p>
-     *     This method could be used to copy ConditionalFormatting object
-     *     from one sheet to another. For example:
-     * </p>
-     * <pre>
-     * ConditionalFormatting cf = sheet.getConditionalFormattingAt(index);
-     * newSheet.addConditionalFormatting(cf);
-     * </pre>
-     *
-     * @param cf the Conditional Formatting to clone
-     * @return index of the new Conditional Formatting object
-     */
-    int addConditionalFormatting(ConditionalFormatting cf);
-
-    /**
-     * A factory method allowing to create a conditional formatting rule
-     * with a cell comparison operator
-     * <p>
-     * The created conditional formatting rule compares a cell value
-     * to a formula calculated result, using the specified operator.
-     * The type  of the created condition is {@link ConditionType#CELL_VALUE_IS}
-     * </p>
-     *
-     * @param comparisonOperation - MUST be a constant value from
-     *		 <tt>{@link ComparisonOperator}</tt>: <p>
-     * <ul>
-     *		 <li>BETWEEN</li>
-     *		 <li>NOT_BETWEEN</li>
-     *		 <li>EQUAL</li>
-     *		 <li>NOT_EQUAL</li>
-     *		 <li>GT</li>
-     *		 <li>LT</li>
-     *		 <li>GE</li>
-     *		 <li>LE</li>
-     * </ul>
-     * </p>
-     * @param formula1 - formula for the valued, compared with the cell
-     * @param formula2 - second formula (only used with
-     * {@link ComparisonOperator#BETWEEN}) and {@link ComparisonOperator#NOT_BETWEEN} operations)
-     */
-    ConditionalFormattingRule createConditionalFormattingRule(
-            byte comparisonOperation,
-            String formula1,
-            String formula2);
-
-    /**
-     * Create a conditional formatting rule that compares a cell value
-     * to a formula calculated result, using an operator     *
-     * <p>
-      * The type  of the created condition is {@link ConditionType#CELL_VALUE_IS}
-     * </p>
-     *
-     * @param comparisonOperation  MUST be a constant value from
-     *		 <tt>{@link ComparisonOperator}</tt> except  BETWEEN and NOT_BETWEEN
-     *
-     * @param formula  the formula to determine if the conditional formatting is applied
-     */
-    ConditionalFormattingRule createConditionalFormattingRule(
-            byte comparisonOperation,
-            String formula);
-
-    /**
-     *  Create a conditional formatting rule based on a Boolean formula.
-     *  When the formula result is true, the cell is highlighted.
-     *
-     * <p>
-     *  The type of the created format condition is  {@link ConditionType#FORMULA}
-     * </p>
-     * @param formula   the formula to evaluate. MUST be a Boolean function.
-     */
-    ConditionalFormattingRule createConditionalFormattingRule(String formula);
-
-    /**
-     * Create a Databar conditional formatting rule.
-     * <p>The thresholds and colour for it will be created, but will be 
-     *  empty and require configuring with 
-     *  {@link ConditionalFormattingRule#getDataBarFormatting()}
-     *  then
-     *  {@link DataBarFormatting#getMinThreshold()}
-     *  and 
-     *  {@link DataBarFormatting#getMaxThreshold()}
-     */
-    ConditionalFormattingRule createConditionalFormattingRule(ExtendedColor color);
-    
-    /**
-     * Create an Icon Set / Multi-State conditional formatting rule.
-     * <p>The thresholds for it will be created, but will be empty
-     *  and require configuring with 
-     *  {@link ConditionalFormattingRule#getMultiStateFormatting()}
-     *  then
-     *  {@link IconMultiStateFormatting#getThresholds()}
-     */
-    ConditionalFormattingRule createConditionalFormattingRule(IconSet iconSet);
-
-    /**
-     * Create a Color Scale / Color Gradient conditional formatting rule.
-     * <p>The thresholds and colours for it will be created, but will be 
-     *  empty and require configuring with 
-     *  {@link ConditionalFormattingRule#getColorScaleFormatting()}
-     *  then
-     *  {@link ColorScaleFormatting#getThresholds()}
-     *  and
-     *  {@link ColorScaleFormatting#getColors()}
-     */
-    ConditionalFormattingRule createConditionalFormattingColorScaleRule();
-    
-    /**
-    * Gets Conditional Formatting object at a particular index
-    *
-    * @param index  0-based index of the Conditional Formatting object to fetch
-    * @return Conditional Formatting object or <code>null</code> if not found
-    * @throws IllegalArgumentException if the index is  outside of the allowable range (0 ... numberOfFormats-1)
-    */
-    ConditionalFormatting getConditionalFormattingAt(int index);
-
-    /**
-     *
-     * @return the number of conditional formats in this sheet
-     */
-    int getNumConditionalFormattings();
-
-    /**
-    * Removes a Conditional Formatting object by index
-    *
-    * @param index 0-based index of the Conditional Formatting object to remove
-    * @throws IllegalArgumentException if the index is  outside of the allowable range (0 ... numberOfFormats-1)
-    */
-    void removeConditionalFormatting(int index);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Table.java b/trunk/src/java/org/apache/poi/ss/usermodel/Table.java
deleted file mode 100644
index 8a189d6..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Table.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.util.regex.Pattern;
-
-/**
- * XSSF Only!
- * High level abstraction of table in a workbook.
- */
-public interface Table {
-    /**
-     * Regular expression matching a Structured Reference (Table syntax) for XSSF table expressions.
-     * Public for unit tests
-     * @see <a href="https://support.office.com/en-us/article/Using-structured-references-with-Excel-tables-F5ED2452-2337-4F71-BED3-C8AE6D2B276E">
-     *         Excel Structured Reference Syntax
-     *      </a>
-     */
-    Pattern isStructuredReference = Pattern.compile("[a-zA-Z_\\\\][a-zA-Z0-9._]*\\[.*\\]");
-    
-    /**
-     *  Get the top-left column index relative to the sheet
-     * @return table start column index on sheet
-     */
-    int getStartColIndex();
-    /**
-     *  Get the top-left row index on the sheet
-     * @return table start row index on sheet
-     */
-    int getStartRowIndex();
-    /**
-     *  Get the bottom-right column index on the sheet
-     * @return table end column index on sheet
-     */
-    int getEndColIndex();
-    /**
-     *  Get the bottom-right row index
-     * @return table end row index on sheet
-     */
-    int getEndRowIndex();
-    /**
-     * Get the name of the table.
-     * @return table name
-     */
-    String getName();
-    
-    /**
-     * Returns the index of a given named column in the table (names are case insensitive in XSSF).
-     * Note this list is lazily loaded and cached for performance. 
-     * Changes to the underlying table structure are not reflected in later calls
-     * unless <code>XSSFTable.updateHeaders()</code> is called to reset the cache.
-     * @param columnHeader the column header name to get the table column index of
-     * @return column index corresponding to <code>columnHeader</code>
-     */
-    int findColumnIndex(String columnHeader);
-    /**
-     * Returns the sheet name that the table belongs to.
-     */
-    String getSheetName();
-    /**
-     * Returns true iff the table has a 'Totals' row
-     */
-    boolean isHasTotalsRow();
-    
-    
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Textbox.java b/trunk/src/java/org/apache/poi/ss/usermodel/Textbox.java
deleted file mode 100644
index 21b7c7c..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Textbox.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-public interface Textbox {
-
-    public final static short OBJECT_TYPE_TEXT = 6;
-
-    /**
-     * @return  the rich text string for this textbox.
-     */
-    RichTextString getString();
-
-    /**
-     * @param string    Sets the rich text string used by this object.
-     */
-    void setString(RichTextString string);
-
-    /**
-     * @return  Returns the left margin within the textbox.
-     */
-    int getMarginLeft();
-
-    /**
-     * Sets the left margin within the textbox.
-     */
-    void setMarginLeft(int marginLeft);
-
-    /**
-     * @return    returns the right margin within the textbox.
-     */
-    int getMarginRight();
-
-    /**
-     * Sets the right margin within the textbox.
-     */
-    void setMarginRight(int marginRight);
-
-    /**
-     * @return  returns the top margin within the textbox.
-     */
-    int getMarginTop();
-
-    /**
-     * Sets the top margin within the textbox.
-     */
-    void setMarginTop(int marginTop);
-
-    /**
-     * Gets the bottom margin within the textbox.
-     */
-    int getMarginBottom();
-
-    /**
-     * Sets the bottom margin within the textbox.
-     */
-    void setMarginBottom(int marginBottom);
-
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java b/trunk/src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
deleted file mode 100644
index f8976d1..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-/**
- * This enumeration value indicates the type of vertical alignment for a cell, i.e.,
- * whether it is aligned top, bottom, vertically centered, justified or distributed.
- * 
- * <!-- FIXME: Identical to {@link org.apache.poi.ss.usermodel.VerticalAlignment}. Should merge these to
- * {@link org.apache.poi.common.usermodel}.VerticalAlignment in the future. -->
- */
-public enum VerticalAlignment {
-    /**
-     * The vertical alignment is aligned-to-top.
-     */
-    TOP,
-
-    /**
-     * The vertical alignment is centered across the height of the cell.
-     */
-    CENTER,
-
-    /**
-     * The vertical alignment is aligned-to-bottom. (typically the default value)
-     */
-    BOTTOM,
-
-    /**
-     * <p>
-     * When text direction is horizontal: the vertical alignment of lines of text is distributed vertically,
-     * where each line of text inside the cell is evenly distributed across the height of the cell,
-     * with flush top and bottom margins.
-     * </p>
-     * <p>
-     * When text direction is vertical: similar behavior as horizontal justification.
-     * The alignment is justified (flush top and bottom in this case). For each line of text, each
-     * line of the wrapped text in a cell is aligned to the top and bottom (except the last line).
-     * If no single line of text wraps in the cell, then the text is not justified.
-     *  </p>
-     */
-    JUSTIFY,
-
-    /**
-     * <p>
-     * When text direction is horizontal: the vertical alignment of lines of text is distributed vertically,
-     * where each line of text inside the cell is evenly distributed across the height of the cell,
-     * with flush top
-     * </p>
-     * <p>
-     * When text direction is vertical: behaves exactly as distributed horizontal alignment.
-     * The first words in a line of text (appearing at the top of the cell) are flush
-     * with the top edge of the cell, and the last words of a line of text are flush with the bottom edge of the cell,
-     * and the line of text is distributed evenly from top to bottom.
-     * </p>
-     */
-    DISTRIBUTED;
-    
-    public short getCode() {
-        return (short) ordinal();
-    }
-    public static VerticalAlignment forInt(int code) {
-        if (code < 0 || code >= values().length) {
-            throw new IllegalArgumentException("Invalid VerticalAlignment code: " + code);
-        }
-        return values()[code];
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java b/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java
deleted file mode 100644
index f5043b7..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java
+++ /dev/null
@@ -1,638 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-
-/**
- * High level representation of a Excel workbook.  This is the first object most users
- * will construct whether they are reading or writing a workbook.  It is also the
- * top level object for creating new sheets/etc.
- */
-public interface Workbook extends Closeable, Iterable<Sheet> {
-
-    /** Extended windows meta file */
-    int PICTURE_TYPE_EMF = 2;
-
-    /** Windows Meta File */
-    int PICTURE_TYPE_WMF = 3;
-
-    /** Mac PICT format */
-    int PICTURE_TYPE_PICT = 4;
-
-    /** JPEG format */
-    int PICTURE_TYPE_JPEG = 5;
-
-    /** PNG format */
-    int PICTURE_TYPE_PNG = 6;
-
-    /** Device independent bitmap */
-    int PICTURE_TYPE_DIB = 7;
-
-
-    /**
-     * Indicates the sheet is visible.
-     *
-     * @see #setSheetHidden(int, int)
-     */
-    int SHEET_STATE_VISIBLE = 0;
-
-    /**
-     * Indicates the book window is hidden, but can be shown by the user via the user interface.
-     *
-     * @see #setSheetHidden(int, int)
-     */
-    int SHEET_STATE_HIDDEN = 1;
-
-    /**
-     * Indicates the sheet is hidden and cannot be shown in the user interface (UI).
-     *
-     * <p>
-     * In Excel this state is only available programmatically in VBA:
-     * <code>ThisWorkbook.Sheets("MySheetName").Visible = xlSheetVeryHidden </code>
-     * </p>
-     *
-     * @see #setSheetHidden(int, int)
-     */
-    int SHEET_STATE_VERY_HIDDEN = 2;
-
-    /**
-     * Convenience method to get the active sheet.  The active sheet is is the sheet
-     * which is currently displayed when the workbook is viewed in Excel.
-     * 'Selected' sheet(s) is a distinct concept.
-     *
-     * @return the index of the active sheet (0-based)
-     */
-    int getActiveSheetIndex();
-
-    /**
-     * Convenience method to set the active sheet.  The active sheet is is the sheet
-     * which is currently displayed when the workbook is viewed in Excel.
-     * 'Selected' sheet(s) is a distinct concept.
-     *
-     * @param sheetIndex index of the active sheet (0-based)
-     */
-    void setActiveSheet(int sheetIndex);
-
-    /**
-     * Gets the first tab that is displayed in the list of tabs in excel.
-     *
-     * @return the first tab that to display in the list of tabs (0-based).
-     */
-    int getFirstVisibleTab();
-
-    /**
-     * Sets the first tab that is displayed in the list of tabs in excel.
-     *
-     * @param sheetIndex the first tab that to display in the list of tabs (0-based)
-     */
-    void setFirstVisibleTab(int sheetIndex);
-
-    /**
-     * Sets the order of appearance for a given sheet.
-     *
-     * @param sheetname the name of the sheet to reorder
-     * @param pos the position that we want to insert the sheet into (0 based)
-     */
-    void setSheetOrder(String sheetname, int pos);
-
-    /**
-     * Sets the tab whose data is actually seen when the sheet is opened.
-     * This may be different from the "selected sheet" since excel seems to
-     * allow you to show the data of one sheet when another is seen "selected"
-     * in the tabs (at the bottom).
-     *
-     * @see Sheet#setSelected(boolean)
-     * @param index the index of the sheet to select (0 based)
-     */
-    void setSelectedTab(int index);
-
-    /**
-     * Set the sheet name.
-     * <p>
-     * See {@link org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)}
-     *      for a safe way to create valid names
-     * </p>
-     * @param sheet number (0 based)
-     * @throws IllegalArgumentException if the name is null or invalid
-     *  or workbook already contains a sheet with this name
-     * @see #createSheet(String)
-     * @see org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)
-     */
-    void setSheetName(int sheet, String name);
-
-    /**
-     * Get the sheet name
-     *
-     * @param sheet sheet number (0 based)
-     * @return Sheet name
-     */
-    String getSheetName(int sheet);
-
-    /**
-     * Returns the index of the sheet by his name
-     *
-     * @param name the sheet name
-     * @return index of the sheet (0 based)
-     */
-    int getSheetIndex(String name);
-
-    /**
-     * Returns the index of the given sheet
-     *
-     * @param sheet the sheet to look up
-     * @return index of the sheet (0 based)
-     */
-    int getSheetIndex(Sheet sheet);
-
-    /**
-     * Create a Sheet for this Workbook, adds it to the sheets and returns
-     * the high level representation.  Use this to create new sheets.
-     *
-     * @return Sheet representing the new sheet.
-     */
-    Sheet createSheet();
-
-    /**
-     * Create a new sheet for this Workbook and return the high level representation.
-     * Use this to create new sheets.
-     *
-     * <p>
-     *     Note that Excel allows sheet names up to 31 chars in length but other applications
-     *     (such as OpenOffice) allow more. Some versions of Excel crash with names longer than 31 chars,
-     *     others - truncate such names to 31 character.
-     * </p>
-     * <p>
-     *     POI's SpreadsheetAPI silently truncates the input argument to 31 characters.
-     *     Example:
-     *
-     *     <pre><code>
-     *     Sheet sheet = workbook.createSheet("My very long sheet name which is longer than 31 chars"); // will be truncated
-     *     assert 31 == sheet.getSheetName().length();
-     *     assert "My very long sheet name which i" == sheet.getSheetName();
-     *     </code></pre>
-     * </p>
-     *
-     * Except the 31-character constraint, Excel applies some other rules:
-     * <p>
-     * Sheet name MUST be unique in the workbook and MUST NOT contain the any of the following characters:
-     * <ul>
-     * <li> 0x0000 </li>
-     * <li> 0x0003 </li>
-     * <li> colon (:) </li>
-     * <li> backslash (\) </li>
-     * <li> asterisk (*) </li>
-     * <li> question mark (?) </li>
-     * <li> forward slash (/) </li>
-     * <li> opening square bracket ([) </li>
-     * <li> closing square bracket (]) </li>
-     * </ul>
-     * The string MUST NOT begin or end with the single quote (') character.
-     * </p>
-     *
-     * <p>
-     * See {@link org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)}
-     *      for a safe way to create valid names
-     * </p>
-     * @param sheetname The name to set for the sheet.
-     * @return Sheet representing the new sheet.
-     * @throws IllegalArgumentException if the name is null or invalid
-     *  or workbook already contains a sheet with this name
-     * @see org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)
-     */
-    Sheet createSheet(String sheetname);
-
-    /**
-     * Create an Sheet from an existing sheet in the Workbook.
-     *
-     * @return Sheet representing the cloned sheet.
-     */
-    Sheet cloneSheet(int sheetNum);
-
-    
-    /**
-     *  Returns an iterator of the sheets in the workbook
-     *  in sheet order. Includes hidden and very hidden sheets.
-     *
-     * @return an iterator of the sheets.
-     */
-    Iterator<Sheet> sheetIterator();
-
-    /**
-     * Get the number of spreadsheets in the workbook
-     *
-     * @return the number of sheets
-     */
-    int getNumberOfSheets();
-
-    /**
-     * Get the Sheet object at the given index.
-     *
-     * @param index of the sheet number (0-based physical & logical)
-     * @return Sheet at the provided index
-     * @throws IllegalArgumentException if the index is out of range (index
-     *            &lt; 0 || index &gt;= getNumberOfSheets()).
-     */
-    Sheet getSheetAt(int index);
-
-    /**
-     * Get sheet with the given name
-     *
-     * @param name of the sheet
-     * @return Sheet with the name provided or <code>null</code> if it does not exist
-     */
-    Sheet getSheet(String name);
-
-    /**
-     * Removes sheet at the given index
-     *
-     * @param index of the sheet to remove (0-based)
-     */
-    void removeSheetAt(int index);
-
-    /**
-     * Create a new Font and add it to the workbook's font table
-     *
-     * @return new font object
-     */
-    Font createFont();
-
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     *
-     * @return the font with the matched attributes or <code>null</code>
-     * @deprecated POI 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead.
-     */
-    Font findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline);
-    
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     *
-     * @return the font with the matched attributes or <code>null</code>
-     */
-    Font findFont(boolean bold, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline);
-
-    /**
-     * Get the number of fonts in the font table
-     *
-     * @return number of fonts
-     */
-    short getNumberOfFonts();
-
-    /**
-     * Get the font at the given index number
-     *
-     * @param idx  index number (0-based)
-     * @return font at the index
-     */
-    Font getFontAt(short idx);
-
-    /**
-     * Create a new Cell style and add it to the workbook's style table
-     *
-     * @return the new Cell Style object
-     * @throws IllegalStateException if the number of cell styles exceeded the limit for this type of Workbook.
-     */
-    CellStyle createCellStyle();
-
-    /**
-     * Get the number of styles the workbook contains
-     *
-     * @return count of cell styles
-     */
-    int getNumCellStyles();
-
-    /**
-     * Get the cell style object at the given index
-     *
-     * @param idx  index within the set of styles (0-based)
-     * @return CellStyle object at the index
-     */
-    CellStyle getCellStyleAt(int idx);
-
-    /**
-     * Write out this workbook to an Outputstream.
-     *
-     * @param stream - the java OutputStream you wish to write to
-     * @exception IOException if anything can't be written.
-     */
-    void write(OutputStream stream) throws IOException;
-
-    /**
-     * Close the underlying input resource (File or Stream),
-     *  from which the Workbook was read.
-     *
-     * <p>Once this has been called, no further
-     *  operations, updates or reads should be performed on the
-     *  Workbook.
-     */
-    @Override
-    void close() throws IOException;
-
-    /**
-     * @return the total number of defined names in this workbook
-     */
-    int getNumberOfNames();
-
-    /**
-     * @param name the name of the defined name
-     * @return the defined name with the specified name. <code>null</code> if not found.
-     */
-    Name getName(String name);
-
-    /**
-     * Returns all defined names with the given name.
-     *
-     * @param name the name of the defined name
-     * @return a list of the defined names with the specified name. An empty list is returned if none is found.
-     */
-    List<? extends Name> getNames(String name);
-
-    /**
-     * Returns all defined names.
-     *
-     * @return a list of the defined names. An empty list is returned if none is found.
-     */
-    List<? extends Name> getAllNames();
-
-    /**
-     * @param nameIndex position of the named range (0-based)
-     * @return the defined name at the specified index
-     * @throws IllegalArgumentException if the supplied index is invalid
-     */
-    Name getNameAt(int nameIndex);
-
-    /**
-     * Creates a new (uninitialised) defined name in this workbook
-     *
-     * @return new defined name object
-     */
-    Name createName();
-
-    /**
-     * Gets the defined name index by name<br/>
-     * <i>Note:</i> Excel defined names are case-insensitive and
-     * this method performs a case-insensitive search.
-     *
-     * @param name the name of the defined name
-     * @return zero based index of the defined name. <tt>-1</tt> if not found.
-     */
-    int getNameIndex(String name);
-
-    /**
-     * Remove the defined name at the specified index
-     *
-     * @param index named range index (0 based)
-     */
-    void removeName(int index);
-
-    /**
-     * Remove a defined name by name
-     *
-      * @param name the name of the defined name
-     */
-    void removeName(String name);
-
-    /**
-     * Remove a defined name
-     *
-      * @param name the name of the defined name
-     */
-    void removeName(Name name);
-
-    /**
-     * Adds the linking required to allow formulas referencing
-     *  the specified external workbook to be added to this one.
-     * <p>In order for formulas such as "[MyOtherWorkbook]Sheet3!$A$5"
-     *  to be added to the file, some linking information must first
-     *  be recorded. Once a given external workbook has been linked,
-     *  then formulas using it can added. Each workbook needs linking
-     *  only once.
-     * <p>This linking only applies for writing formulas. To link things
-     *  for evaluation, see {@link FormulaEvaluator#setupReferencedWorkbooks(java.util.Map)}
-     *
-     * @param name The name the workbook will be referenced as in formulas
-     * @param workbook The open workbook to fetch the link required information from
-     */
-    int linkExternalWorkbook(String name, Workbook workbook);
-
-     /**
-     * Sets the printarea for the sheet provided
-     * <p>
-     * i.e. Reference = $A$1:$B$2
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @param reference Valid name Reference for the Print Area
-     */
-    void setPrintArea(int sheetIndex, String reference);
-
-    /**
-     * For the Convenience of Java Programmers maintaining pointers.
-     * @see #setPrintArea(int, String)
-     * @param sheetIndex Zero-based sheet index (0 = First Sheet)
-     * @param startColumn Column to begin printarea
-     * @param endColumn Column to end the printarea
-     * @param startRow Row to begin the printarea
-     * @param endRow Row to end the printarea
-     */
-    void setPrintArea(int sheetIndex, int startColumn, int endColumn, int startRow, int endRow);
-
-    /**
-     * Retrieves the reference for the printarea of the specified sheet,
-     * the sheet name is appended to the reference even if it was not specified.
-     *
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @return String Null if no print area has been defined
-     */
-    String getPrintArea(int sheetIndex);
-
-    /**
-     * Delete the printarea for the sheet specified
-     *
-     * @param sheetIndex Zero-based sheet index (0 = First Sheet)
-     */
-    void removePrintArea(int sheetIndex);
-
-	/**
-	 * Retrieves the current policy on what to do when
-	 *  getting missing or blank cells from a row.
-     * <p>
-	 * The default is to return blank and null cells.
-	 *  {@link MissingCellPolicy}
-     * </p>
-	 */
-	MissingCellPolicy getMissingCellPolicy();
-
-    /**
-	 * Sets the policy on what to do when
-	 *  getting missing or blank cells from a row.
-     *
-	 * This will then apply to all calls to
-	 *  {@link Row#getCell(int)} }. See
-	 *  {@link MissingCellPolicy}
-	 */
-	void setMissingCellPolicy(MissingCellPolicy missingCellPolicy);
-
-    /**
-     * Returns the instance of DataFormat for this workbook.
-     *
-     * @return the DataFormat object
-     */
-    DataFormat createDataFormat();
-
-    /**
-     * Adds a picture to the workbook.
-     *
-     * @param pictureData       The bytes of the picture
-     * @param format            The format of the picture.
-     *
-     * @return the index to this picture (1 based).
-     * @see #PICTURE_TYPE_EMF
-     * @see #PICTURE_TYPE_WMF
-     * @see #PICTURE_TYPE_PICT
-     * @see #PICTURE_TYPE_JPEG
-     * @see #PICTURE_TYPE_PNG
-     * @see #PICTURE_TYPE_DIB
-     */
-    int addPicture(byte[] pictureData, int format);
-
-    /**
-     * Gets all pictures from the Workbook.
-     *
-     * @return the list of pictures (a list of {@link PictureData} objects.)
-     */
-    List<? extends PictureData> getAllPictures();
-
-    /**
-     * Returns an object that handles instantiating concrete
-     * classes of the various instances one needs for  HSSF and XSSF.
-     */
-    CreationHelper getCreationHelper();
-
-    /**
-     * @return <code>false</code> if this workbook is not visible in the GUI
-     */
-    boolean isHidden();
-
-    /**
-     * @param hiddenFlag pass <code>false</code> to make the workbook visible in the GUI
-     */
-    void setHidden(boolean hiddenFlag);
-
-    /**
-     * Check whether a sheet is hidden.
-     * <p>
-     * Note that a sheet could instead be set to be very hidden, which is different
-     *  ({@link #isSheetVeryHidden(int)})
-     * </p>
-     * @param sheetIx Number
-     * @return <code>true</code> if sheet is hidden
-     */
-    boolean isSheetHidden(int sheetIx);
-
-    /**
-     * Check whether a sheet is very hidden.
-     * <p>
-     * This is different from the normal hidden status
-     *  ({@link #isSheetHidden(int)})
-     * </p>
-     * @param sheetIx sheet index to check
-     * @return <code>true</code> if sheet is very hidden
-     */
-    boolean isSheetVeryHidden(int sheetIx);
-
-    /**
-     * Hide or unhide a sheet.
-     * 
-     * Please note that the sheet currently set as active sheet (sheet 0 in a newly 
-     * created workbook or the one set via setActiveSheet()) cannot be hidden. 
-     *
-     * @param sheetIx the sheet index (0-based)
-     * @param hidden True to mark the sheet as hidden, false otherwise
-     */
-    void setSheetHidden(int sheetIx, boolean hidden);
-
-    /**
-     * Hide or unhide a sheet.
-     *
-     * <ul>
-     *  <li>0 - visible. </li>
-     *  <li>1 - hidden. </li>
-     *  <li>2 - very hidden.</li>
-     * </ul>
-     * 
-     * Please note that the sheet currently set as active sheet (sheet 0 in a newly 
-     * created workbook or the one set via setActiveSheet()) cannot be hidden.
-     *  
-     * @param sheetIx the sheet index (0-based)
-     * @param hidden one of the following <code>Workbook</code> constants:
-     *        <code>Workbook.SHEET_STATE_VISIBLE</code>,
-     *        <code>Workbook.SHEET_STATE_HIDDEN</code>, or
-     *        <code>Workbook.SHEET_STATE_VERY_HIDDEN</code>.
-     * @throws IllegalArgumentException if the supplied sheet index or state is invalid
-     */
-    void setSheetHidden(int sheetIx, int hidden);
-
-    /**
-     * Register a new toolpack in this workbook.
-     *
-     * @param toopack the toolpack to register
-     */
-    void addToolPack(UDFFinder toopack);
-
-    /**
-     * Whether the application shall perform a full recalculation when the workbook is opened.
-     * <p>
-     * Typically you want to force formula recalculation when you modify cell formulas or values
-     * of a workbook previously created by Excel. When set to true, this flag will tell Excel
-     * that it needs to recalculate all formulas in the workbook the next time the file is opened.
-     * </p>
-     * <p>
-     * Note, that recalculation updates cached formula results and, thus, modifies the workbook.
-     * Depending on the version, Excel may prompt you with "Do you want to save the changes in <em>filename</em>?"
-     * on close.
-     * </p>
-     *
-     * @param value true if the application will perform a full recalculation of
-     * workbook values when the workbook is opened
-     * @since 3.8
-     */
-    void setForceFormulaRecalculation(boolean value);
-
-    /**
-     * Whether Excel will be asked to recalculate all formulas when the  workbook is opened.
-     *
-     * @since 3.8
-     */
-    boolean getForceFormulaRecalculation();
-    
-    /**
-     * Returns the spreadsheet version of this workbook
-     * 
-     * @return SpreadsheetVersion enum
-     * @since 3.14 beta 2
-     */
-    SpreadsheetVersion getSpreadsheetVersion();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisCrossBetween.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisCrossBetween.java
deleted file mode 100644
index d470cf6..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisCrossBetween.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- *  Specifies the possible crossing states of an axis.
- *
- * @author Roman Kashitsyn
- */
-public enum AxisCrossBetween {
-	/**
-	 * Specifies the value axis shall cross the category axis
-	 * between data markers.
-	 */
-	BETWEEN,
-	/**
-	 * Specifies the value axis shall cross the category axis at
-	 * the midpoint of a category.
-	 */
-	MIDPOINT_CATEGORY
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisCrosses.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisCrosses.java
deleted file mode 100644
index 906198b..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisCrosses.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- * Specifies the possible crossing points for an axis.
- *
- * @author Roman Kashitsyn
- */
-public enum AxisCrosses {
-	/**
-	 * The category axis crosses at the zero point of the value axis (if
-	 * possible), or the minimum value (if the minimum is greater than zero) or
-	 * the maximum (if the maximum is less than zero).
-	 */
-	AUTO_ZERO,
-	/**
-	 * The axis crosses at the maximum value.
-	 */
-	MIN,
-	/**
-	 * Axis crosses at the minimum value of the chart.
-	 */
-	MAX
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisOrientation.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisOrientation.java
deleted file mode 100644
index e8c219b..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisOrientation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- * Specifies the possible ways to place a picture on a data point, series, wall, or floor.
- *
- * @author Roman Kashitsyn
- */
-public enum AxisOrientation {
-	/**
-	 * Specifies that the values on the axis shall be reversed
-	 * so they go from maximum to minimum.
-	 */
-	MAX_MIN,
-	/**
-	 * Specifies that the axis values shall be in the usual
-	 * order, minimum to maximum.
-	 */
-	MIN_MAX
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisPosition.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisPosition.java
deleted file mode 100644
index db189f9..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisPosition.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- * Enumeration of all possible axis positions.
- *
- * @author Roman Kashitsyn
- */
-public enum AxisPosition {
-	BOTTOM,
-	LEFT,
-	RIGHT,
-	TOP
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisTickMark.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisTickMark.java
deleted file mode 100644
index 5c7d16a..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/AxisTickMark.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- * Enumeration of possible axis tick marks.
- *
- * @author Martin Andersson
- */
-public enum AxisTickMark {
-    NONE,
-    CROSS,
-    IN,
-    OUT
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartAxis.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartAxis.java
deleted file mode 100644
index f3d9365..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartAxis.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * High level representation of chart axis.
- *
- * @author Roman Kashitsyn
- */
-@Beta
-public interface ChartAxis {
-
-	/**
-	 * @return axis id
-	 */
-	long getId();
-
-	/**
-	 * @return axis position
-	 */
-	AxisPosition getPosition();
-
-	/**
-	 * @param position new axis position
-	 */
-	void setPosition(AxisPosition position);
-
-	/**
-	 * @return axis number format
-	 */
-	String getNumberFormat();
-
-	/**
-	 * @param format axis number format
-	 */
-	void setNumberFormat(String format);
-
-	/**
-	 * @return true if log base is defined, false otherwise
-	 */
-	boolean isSetLogBase();
-
-	/**
-	 * @param logBase a number between 2 and 1000 (inclusive)
-	 * @throws IllegalArgumentException if log base not within allowed range
-	 */
-	void setLogBase(double logBase);
-
-	/**
-	 * @return axis log base or 0.0 if not set
-	 */
-	double getLogBase();
-
-	/**
-	 * @return true if minimum value is defined, false otherwise
-	 */
-	boolean isSetMinimum();
-
-	/**
-	 * @return axis minimum or 0.0 if not set
-	 */
-	double getMinimum();
-
-	/**
-	 * @param min axis minimum
-	 */
-	void setMinimum(double min);
-
-	/**
-	 * @return true if maximum value is defined, false otherwise
-	 */
-	boolean isSetMaximum();
-
-	/**
-	 * @return axis maximum or 0.0 if not set
-	 */
-	double getMaximum();
-
-	/**
-	 * @param max axis maximum
-	 */
-	void setMaximum(double max);
-
-	/**
-	 * @return axis orientation
-	 */
-	AxisOrientation getOrientation();
-
-	/**
-	 * @param orientation axis orientation
-	 */
-	void setOrientation(AxisOrientation orientation);
-
-	/**
-	 * @param crosses axis cross type
-	 */
-	void setCrosses(AxisCrosses crosses);
-
-	/**
-	 * @return axis cross type
-	 */
-	AxisCrosses getCrosses();
-
-	/**
-	 * Declare this axis cross another axis.
-	 * @param axis that this axis should cross
-	 */
-	void crossAxis(ChartAxis axis);
-
-    /**
-     * @return visibility of the axis.
-     */
-    boolean isVisible();
-
-    /**
-     * @param value visibility of the axis.
-     */
-    void setVisible(boolean value);
-
-    /**
-     * @return major tick mark.
-     */
-    AxisTickMark getMajorTickMark();
-
-    /**
-     * @param tickMark major tick mark type.
-     */
-    void setMajorTickMark(AxisTickMark tickMark);
-
-    /**
-     * @return minor tick mark.
-     */
-    AxisTickMark getMinorTickMark();
-
-    /**
-     * @param tickMark minor tick mark type.
-     */
-    void setMinorTickMark(AxisTickMark tickMark);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartAxisFactory.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartAxisFactory.java
deleted file mode 100644
index 87eff04..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartAxisFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * A factory for different chart axis.
- *
- * @author Roman Kashitsyn
- * @author Martin Andersson
- */
-@Beta
-public interface ChartAxisFactory {
-
-	/**
-	 * @return new value axis
-	 */
-	ValueAxis createValueAxis(AxisPosition pos);
-
-	/**
-	 * @return new category axis.
-	 */
-	ChartAxis createCategoryAxis(AxisPosition pos);
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartData.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartData.java
deleted file mode 100644
index 7a4aec5..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.util.Beta;
-
-/**
- * A base for all charts data types.
- *
- * @author Roman Kashitsyn
- */
-@Beta
-public interface ChartData {
-
-	/**
-	 * Fills a charts with data specified by implementation.
-	 *
-	 * @param chart a charts to fill in
-	 * @param axis charts axis to use
-	 */
-	void fillChart(Chart chart, ChartAxis... axis);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartDataFactory.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartDataFactory.java
deleted file mode 100644
index 675322d..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartDataFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * A factory for different charts data types.
- *
- * @author Roman Kashitsyn, Martin Andersson
- */
-@Beta
-public interface ChartDataFactory {
-
-	/**
-	 * @return an appropriate ScatterChartData instance
-	 */
-	ScatterChartData createScatterChartData();
-
-	/**
-	 * @return a LineChartData instance
-	 */
-	LineChartData createLineChartData();
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartDataSource.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartDataSource.java
deleted file mode 100644
index d843cac..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartDataSource.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * Represents data model of the charts.
- *
- * @param <T> type of points the data source contents
- * @author Roman Kashitsyn
- */
-@Beta
-public interface ChartDataSource<T> {
-
-    /**
-     * Return number of points contained by data source.
-     *
-     * @return number of points contained by data source
-     */
-    int getPointCount();
-
-    /**
-     * Returns point value at specified index.
-     *
-     * @param index index to value from
-     * @return point value at specified index.
-     * @throws {@code IndexOutOfBoundsException} if index
-     *                parameter not in range {@code 0 <= index <= pointCount}
-     */
-    T getPointAt(int index);
-
-    /**
-     * Returns {@code true} if charts data source is valid cell range.
-     *
-     * @return {@code true} if charts data source is valid cell range
-     */
-    boolean isReference();
-
-    /**
-     * Returns {@code true} if data source points should be treated as numbers.
-     *
-     * @return {@code true} if data source points should be treated as numbers
-     */
-    boolean isNumeric();
-
-    /**
-     * Returns formula representation of the data source. It is only applicable
-     * for data source that is valid cell range.
-     *
-     * @return formula representation of the data source
-     * @throws {@code UnsupportedOperationException} if the data source is not a
-     *                reference.
-     */
-    String getFormulaString();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartLegend.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartLegend.java
deleted file mode 100644
index f8ab5c9..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartLegend.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * High level representation of chart legend.
- *
- * @author Roman Kashitsyn
- * @author Martin Andersson
- */
-@Beta
-public interface ChartLegend extends ManuallyPositionable {
-
-	/**
-	 * @return legend position
-	 */
-	LegendPosition getPosition();
-
-	/**
-	 * @param position new legend position
-	 */
-	void setPosition(LegendPosition position);
-
-	/**
-	 * @return overlay value.
-	 */
-	boolean isOverlay();
-
-	/**
-	 * If true the legend is positioned over the chart area otherwise
-	 * the legend is displayed next to it.
-	 *
-	 * Default is no overlay.
-	 *
-	 * @param value
-	 */
-	void setOverlay(boolean value);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartSeries.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartSeries.java
deleted file mode 100644
index 05a39d4..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ChartSeries.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Basic settings for all chart series.
- */
-public interface ChartSeries {
-
-    /**
-     * Sets the title of the series as a string literal.
-     *
-     * @param title
-     */
-    void setTitle(String title);
-
-    /**
-     * Sets the title of the series as a cell reference.
-     *
-     * @param titleReference
-     */
-    void setTitle(CellReference titleReference);
-
-    /**
-     * @return title as string literal.
-     */
-    String getTitleString();
-
-    /**
-     * @return title as cell reference.
-     */
-    CellReference getTitleCellReference();
-
-    /**
-     * @return title type.
-     */
-    TitleType getTitleType();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/DataSources.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/DataSources.java
deleted file mode 100644
index 75e7fd9..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/DataSources.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Beta;
-
-/**
- * Class {@code DataSources} is a factory for {@link ChartDataSource} instances.
- *
- * @author Roman Kashitsyn
- */
-@Beta
-public class DataSources {
-
-    private DataSources() {
-    }
-
-    public static <T> ChartDataSource<T> fromArray(T[] elements) {
-        return new ArrayDataSource<T>(elements);
-    }
-
-    public static ChartDataSource<Number> fromNumericCellRange(Sheet sheet, CellRangeAddress cellRangeAddress) {
-        return new AbstractCellRangeDataSource<Number>(sheet, cellRangeAddress) {
-            public Number getPointAt(int index) {
-                CellValue cellValue = getCellValueAt(index);
-                if (cellValue != null && cellValue.getCellTypeEnum() == CellType.NUMERIC) {
-                    return Double.valueOf(cellValue.getNumberValue());
-                } else {
-                    return null;
-                }
-            }
-
-            public boolean isNumeric() {
-                return true;
-            }
-        };
-    }
-
-    public static ChartDataSource<String> fromStringCellRange(Sheet sheet, CellRangeAddress cellRangeAddress) {
-        return new AbstractCellRangeDataSource<String>(sheet, cellRangeAddress) {
-            public String getPointAt(int index) {
-                CellValue cellValue = getCellValueAt(index);
-                if (cellValue != null && cellValue.getCellTypeEnum() == CellType.STRING) {
-                    return cellValue.getStringValue();
-                } else {
-                    return null;
-                }
-            }
-
-            public boolean isNumeric() {
-                return false;
-            }
-        };
-    }
-
-    private static class ArrayDataSource<T> implements ChartDataSource<T> {
-
-        private final T[] elements;
-
-        public ArrayDataSource(T[] elements) {
-            this.elements = elements.clone();
-        }
-
-        public int getPointCount() {
-            return elements.length;
-        }
-
-        public T getPointAt(int index) {
-            return elements[index];
-        }
-
-        public boolean isReference() {
-            return false;
-        }
-
-        public boolean isNumeric() {
-            Class<?> arrayComponentType = elements.getClass().getComponentType();
-            return (Number.class.isAssignableFrom(arrayComponentType));
-        }
-
-        public String getFormulaString() {
-            throw new UnsupportedOperationException("Literal data source can not be expressed by reference.");
-        }
-    }
-
-    private abstract static class AbstractCellRangeDataSource<T> implements ChartDataSource<T> {
-        private final Sheet sheet;
-        private final CellRangeAddress cellRangeAddress;
-        private final int numOfCells;
-        private FormulaEvaluator evaluator;
-
-        protected AbstractCellRangeDataSource(Sheet sheet, CellRangeAddress cellRangeAddress) {
-            this.sheet = sheet;
-            // Make copy since CellRangeAddress is mutable.
-            this.cellRangeAddress = cellRangeAddress.copy();
-            this.numOfCells = this.cellRangeAddress.getNumberOfCells();
-            this.evaluator = sheet.getWorkbook().getCreationHelper().createFormulaEvaluator();
-        }
-
-        public int getPointCount() {
-            return numOfCells;
-        }
-
-        public boolean isReference() {
-            return true;
-        }
-
-        public String getFormulaString() {
-            return cellRangeAddress.formatAsString(sheet.getSheetName(), true);
-        }
-
-        protected CellValue getCellValueAt(int index) {
-            if (index < 0 || index >= numOfCells) {
-                throw new IndexOutOfBoundsException("Index must be between 0 and " +
-                        (numOfCells - 1) + " (inclusive), given: " + index);
-            }
-            int firstRow = cellRangeAddress.getFirstRow();
-            int firstCol = cellRangeAddress.getFirstColumn();
-            int lastCol = cellRangeAddress.getLastColumn();
-            int width = lastCol - firstCol + 1;
-            int rowIndex = firstRow + index / width;
-            int cellIndex = firstCol + index % width;
-            Row row = sheet.getRow(rowIndex);
-            return (row == null) ? null : evaluator.evaluate(row.getCell(cellIndex));
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LayoutMode.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/LayoutMode.java
deleted file mode 100644
index 8776970..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LayoutMode.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- *  Specifies the possible ways to store a chart element's position.
- * @author Roman Kashitsyn
- */
-public enum LayoutMode {
-	/**
-	 * Specifies that the Width or Height shall be interpreted as the
-	 * Right or Bottom of the chart element.
-	 */
-	EDGE,
-	/**
-	 * Specifies that the Width or Height shall be interpreted as the
-	 * Width or Height of the chart element.
-	 */
-	FACTOR
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LayoutTarget.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/LayoutTarget.java
deleted file mode 100644
index f95c537..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LayoutTarget.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- * Specifies whether to layout the plot area by its inside (not including axis
- * and axis labels) or outside (including axis and axis labels).
- *
- * @author Roman Kashitsyn
- */
-public enum LayoutTarget {
-	/**
-	 * Specifies that the plot area size shall determine the
-	 * size of the plot area, not including the tick marks and
-	 * axis labels.
-	 */
-	INNER,
-	/**
-	 * Specifies that the plot area size shall determine the
-	 * size of the plot area, the tick marks, and the axis
-	 * labels.
-	 */
-	OUTER
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LegendPosition.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/LegendPosition.java
deleted file mode 100644
index 7536168..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LegendPosition.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- * Enumeration of all possible chart legend positions.
- *
- * @author Roman Kashitsyn
- */
-public enum LegendPosition {
-	BOTTOM,
-	LEFT,
-	RIGHT,
-	TOP,
-	TOP_RIGHT
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LineChartData.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/LineChartData.java
deleted file mode 100644
index f3bf10f..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LineChartData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import java.util.List;
-
-import org.apache.poi.util.Beta;
-
-/**
- * Data for a Line Chart
- */
-@Beta
-public interface LineChartData extends ChartData {
-
-    /**
-     * @param categories data source for categories.
-     * @param values     data source for values.
-     * @return a new line chart serie.
-     */
-    LineChartSeries addSeries(ChartDataSource<?> categories, ChartDataSource<? extends Number> values);
-
-    /**
-     * @return list of all series.
-     */
-    List<? extends LineChartSeries> getSeries();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LineChartSeries.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/LineChartSeries.java
deleted file mode 100644
index d1c03a9..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/LineChartSeries.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * Represents a line chart series.
- */
-@Beta
-public interface LineChartSeries extends ChartSeries {
-
-    /**
-     * @return data source used for category axis data.
-     */
-    ChartDataSource<?> getCategoryAxisData();
-
-    /**
-     * @return data source used for value axis.
-     */
-    ChartDataSource<? extends Number> getValues();
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ManualLayout.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ManualLayout.java
deleted file mode 100644
index 2d8bfbd..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ManualLayout.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * High level representation of chart element manual layout.
- *
- * @author Roman Kashitsyn
- */
-@Beta
-public interface ManualLayout {
-
-	/**
-	 * Sets the layout target.
-	 * @param target new layout target.
-	 */
-	public void setTarget(LayoutTarget target);
-
-	/**
-	 * Returns current layout target.
-	 * @return current layout target
-	 */
-	public LayoutTarget getTarget();
-
-	/**
-	 * Sets the x-coordinate layout mode.
-	 * @param mode new x-coordinate layout mode.
-	 */
-	public void setXMode(LayoutMode mode);
-
-	/**
-	 * Returns current x-coordinnate layout mode.
-	 * @return current x-coordinate layout mode.
-	 */
-	public LayoutMode getXMode();
-
-	/**
-	 * Sets the y-coordinate layout mode.
-	 * @param mode new y-coordinate layout mode.
-	 */
-	public void setYMode(LayoutMode mode);
-
-	/**
-	 * Returns current y-coordinate layout mode.
-	 * @return current y-coordinate layout mode.
-	 */
-	public LayoutMode getYMode();
-
-	/**
-	 * Returns the x location of the chart element.
-	 * @return the x location (left) of the chart element or 0.0 if
-	 *         not set.
-	 */
-	public double getX();
-
-	/**
-	 * Specifies the x location (left) of the chart element as a
-	 * fraction of the width of the chart. If Left Mode is Factor,
-	 * then the position is relative to the default position for the
-	 * chart element.
-	 */
-	public void setX(double x);
-
-
-	/**
-	 * Returns current y location of the chart element.
-	 * @return the y location (top) of the chart element or 0.0 if not
-	 *         set.
-	 */
-	public double getY();
-
-	/**
-	 * Specifies the y location (top) of the chart element as a
-	 * fraction of the height of the chart. If Top Mode is Factor,
-	 * then the position is relative to the default position for the
-	 * chart element.
-	 */
-	public void setY(double y);
-
-
-	/**
-	 * Specifies how to interpret the Width element for this manual
-	 * layout.
-	 * @param mode new width layout mode of this manual layout.
-	 */
-	public void setWidthMode(LayoutMode mode);
-
-
-	/**
-	 * Returns current width mode of this manual layout.
-	 * @return width mode of this manual layout.
-	 */
-	public LayoutMode getWidthMode();
-
-	/**
-	 * Specifies how to interpret the Height element for this manual
-	 * layout.
-	 * @param mode new height mode of this manual layout.
-	 */
-	public void setHeightMode(LayoutMode mode);
-
-	/**
-	 * Returns current height mode of this 
-	 * @return height mode of this manual layout.
-	 */
-	public LayoutMode getHeightMode();
-
-	/**
-	 * Specifies the width (if Width Mode is Factor) or right (if
-	 * Width Mode is Edge) of the chart element as a fraction of the
-	 * width of the chart.
-	 * @param ratio a fraction of the width of the chart.
-	 */
-	public void setWidthRatio(double ratio);
-
-	/**
-	 * Returns current fraction of the width of the chart.
-	 * @return fraction of the width of the chart or 0.0 if not set.
-	 */
-	public double getWidthRatio();
-
-	/**
-	 * Specifies the height (if Height Mode is Factor) or bottom (if
-	 * Height Mode is edge) of the chart element as a fraction of the
-	 * height of the chart.
-	 * @param ratio a fraction of the height of the chart.
-	 */
-	public void setHeightRatio(double ratio);
-
-	/**
-	 * Returns current fraction of the height of the chart.
-	 * @return fraction of the height of the chart or 0.0 if not set.
-	 */
-	public double getHeightRatio();
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ManuallyPositionable.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ManuallyPositionable.java
deleted file mode 100644
index 0d749fb..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ManuallyPositionable.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * Abstraction of chart element that can be positioned with manual
- * layout.
- *
- * @author Roman Kashitsyn
- */
-@Beta
-public interface ManuallyPositionable {
-
-	/**
-	 * Returns manual layout for the chart element.
-	 * @return manual layout for the chart element.
-	 */
-	public ManualLayout getManualLayout();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ScatterChartData.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ScatterChartData.java
deleted file mode 100644
index 594b5bd..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ScatterChartData.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import java.util.List;
-
-/**
- * Data for a Scatter Chart
- */
-public interface ScatterChartData extends ChartData {
-	/**
-	 * @param xs data source to be used for X axis values
-	 * @param ys data source to be used for Y axis values
-	 * @return a new scatter charts series
-	 */
-	ScatterChartSeries addSerie(ChartDataSource<?> xs, ChartDataSource<? extends Number> ys);
-
-	/**
-	 * @return list of all series
-	 */
-	List<? extends ScatterChartSeries> getSeries();
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ScatterChartSeries.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ScatterChartSeries.java
deleted file mode 100644
index f200cb6..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ScatterChartSeries.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * Represents scatter charts series.
- */
-@Beta
-public interface ScatterChartSeries extends ChartSeries {
-
-    /**
-     * @return data source used for X axis values
-     */
-    ChartDataSource<?> getXValues();
-
-    /**
-     * @return data source used for Y axis values
-     */
-    ChartDataSource<? extends Number> getYValues();
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/TitleType.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/TitleType.java
deleted file mode 100644
index 6d93d61..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/TitleType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-/**
- * Title types for charts.
- *
- * @author Martin Andersson
- */
-public enum TitleType {
-    STRING,
-    CELL_REFERENCE
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ValueAxis.java b/trunk/src/java/org/apache/poi/ss/usermodel/charts/ValueAxis.java
deleted file mode 100644
index f6673da..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/charts/ValueAxis.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-
-/**
- * @author Roman Kashitsyn
- */
-@Beta
-public interface ValueAxis extends ChartAxis {
-
-	/**
-	 * @return cross between type
-	 */
-	AxisCrossBetween getCrossBetween();
-
-	/**
-	 * @param crossBetween cross between type
-	 */
-	void setCrossBetween(AxisCrossBetween crossBetween);
-}
diff --git a/trunk/src/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java b/trunk/src/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
deleted file mode 100644
index 680abff..0000000
--- a/trunk/src/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel.helpers;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Helper for shifting rows up or down
- * 
- * This abstract class exists to consolidate duplicated code between XSSFRowShifter and HSSFRowShifter (currently methods sprinkled throughout HSSFSheet)
- */
-public abstract class RowShifter {
-    protected final Sheet sheet;
-
-    public RowShifter(Sheet sh) {
-        sheet = sh;
-    }
-
-    /**
-     * Shifts, grows, or shrinks the merged regions due to a row shift.
-     * Merged regions that are completely overlaid by shifting will be deleted.
-     *
-     * @param startRow the row to start shifting
-     * @param endRow   the row to end shifting
-     * @param n        the number of rows to shift
-     * @return an array of affected merged regions, doesn't contain deleted ones
-     */
-    public List<CellRangeAddress> shiftMergedRegions(int startRow, int endRow, int n) {
-        List<CellRangeAddress> shiftedRegions = new ArrayList<CellRangeAddress>();
-        Set<Integer> removedIndices = new HashSet<Integer>();
-        //move merged regions completely if they fall within the new region boundaries when they are shifted
-        int size = sheet.getNumMergedRegions();
-        for (int i = 0; i < size; i++) {
-            CellRangeAddress merged = sheet.getMergedRegion(i);
-
-            // remove merged region that overlaps shifting
-            if (startRow + n <= merged.getFirstRow() && endRow + n >= merged.getLastRow()) {
-                removedIndices.add(i);
-                continue;
-            }
-
-            boolean inStart = (merged.getFirstRow() >= startRow || merged.getLastRow() >= startRow);
-            boolean inEnd = (merged.getFirstRow() <= endRow || merged.getLastRow() <= endRow);
-
-            //don't check if it's not within the shifted area
-            if (!inStart || !inEnd) {
-                continue;
-            }
-
-            //only shift if the region outside the shifted rows is not merged too
-            if (!merged.containsRow(startRow - 1) && !merged.containsRow(endRow + 1)) {
-                merged.setFirstRow(merged.getFirstRow() + n);
-                merged.setLastRow(merged.getLastRow() + n);
-                //have to remove/add it back
-                shiftedRegions.add(merged);
-                removedIndices.add(i);
-            }
-        }
-        
-        if(!removedIndices.isEmpty()) {
-            sheet.removeMergedRegions(removedIndices);
-        }
-
-        //read so it doesn't get shifted again
-        for (CellRangeAddress region : shiftedRegions) {
-            sheet.addMergedRegion(region);
-        }
-        return shiftedRegions;
-    }
-
-    /**
-     * Updated named ranges
-     */
-    public abstract void updateNamedRanges(FormulaShifter shifter);
-
-    /**
-     * Update formulas.
-     */
-    public abstract void updateFormulas(FormulaShifter shifter);
-
-    /**
-     * Update the formulas in specified row using the formula shifting policy specified by shifter
-     *
-     * @param row the row to update the formulas on
-     * @param shifter the formula shifting policy
-     */
-    @Internal
-    public abstract void updateRowFormulas(Row row, FormulaShifter shifter);
-
-    public abstract void updateConditionalFormatting(FormulaShifter shifter);
-    
-    /**
-     * Shift the Hyperlink anchors (not the hyperlink text, even if the hyperlink
-     * is of type LINK_DOCUMENT and refers to a cell that was shifted). Hyperlinks
-     * do not track the content they point to.
-     *
-     * @param shifter the formula shifting policy
-     */
-    public abstract void updateHyperlinks(FormulaShifter shifter);
-
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/AreaReference.java b/trunk/src/java/org/apache/poi/ss/util/AreaReference.java
deleted file mode 100644
index 8576511..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/AreaReference.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-
-public class AreaReference {
-
-    /** The character (!) that separates sheet names from cell references */ 
-    private static final char SHEET_NAME_DELIMITER = '!';
-    /** The character (:) that separates the two cell references in a multi-cell area reference */
-    private static final char CELL_DELIMITER = ':';
-    /** The character (') used to quote sheet names when they contain special characters */
-    private static final char SPECIAL_NAME_DELIMITER = '\'';
-    private static final SpreadsheetVersion DEFAULT_SPREADSHEET_VERSION = SpreadsheetVersion.EXCEL97;
-    
-    private final CellReference _firstCell;
-    private final CellReference _lastCell;
-    private final boolean _isSingleCell;
-    private final SpreadsheetVersion _version; // never null
-
-    /**
-     * @deprecated POI 3.13 beta 1. Prefer supplying a version.
-     */
-    @Deprecated
-    public AreaReference(String reference) {
-        this(reference, DEFAULT_SPREADSHEET_VERSION);
-        // generateContiguous must be updated before this can be deleted.
-    }
-    
-    /**
-     * Create an area ref from a string representation.  Sheet names containing special characters should be
-     * delimited and escaped as per normal syntax rules for formulas.<br/> 
-     * The area reference must be contiguous (i.e. represent a single rectangle, not a union of rectangles)
-     */
-    public AreaReference(String reference, SpreadsheetVersion version) {
-        _version = (null != version) ? version : DEFAULT_SPREADSHEET_VERSION;
-        if(! isContiguous(reference)) {
-            throw new IllegalArgumentException(
-                    "References passed to the AreaReference must be contiguous, " +
-                    "use generateContiguous(ref) if you have non-contiguous references");
-        }
-
-        String[] parts = separateAreaRefs(reference);
-        String part0 = parts[0];
-        if (parts.length == 1) {
-            // TODO - probably shouldn't initialize area ref when text is really a cell ref
-            // Need to fix some named range stuff to get rid of this
-            _firstCell = new CellReference(part0);
-            
-            _lastCell = _firstCell;
-            _isSingleCell = true;
-            return;
-        }
-        if (parts.length != 2) {
-            throw new IllegalArgumentException("Bad area ref '" + reference + "'");
-        }
-        
-        String part1 = parts[1];
-        if (isPlainColumn(part0)) {
-            if (!isPlainColumn(part1)) {
-                throw new RuntimeException("Bad area ref '" + reference + "'");
-            }
-            // Special handling for whole-column references
-            // Represented internally as x$1 to x$65536
-            //  which is the maximum range of rows
-
-            boolean firstIsAbs = CellReference.isPartAbsolute(part0);
-            boolean lastIsAbs = CellReference.isPartAbsolute(part1);
-            
-            int col0 = CellReference.convertColStringToIndex(part0);
-            int col1 = CellReference.convertColStringToIndex(part1);
-            
-            _firstCell = new CellReference(0, col0, true, firstIsAbs);
-            _lastCell = new CellReference(0xFFFF, col1, true, lastIsAbs);
-            _isSingleCell = false;
-            // TODO - whole row refs
-        } else {
-            _firstCell = new CellReference(part0);
-            _lastCell = new CellReference(part1);
-            _isSingleCell = part0.equals(part1);
-       }
-     }
-    
-    private static boolean isPlainColumn(String refPart) {
-        for(int i=refPart.length()-1; i>=0; i--) {
-            int ch = refPart.charAt(i);
-            if (ch == '$' && i==0) {
-                continue;
-            }
-            if (ch < 'A' || ch > 'Z') {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Creates an area ref from a pair of Cell References.
-     */
-    public AreaReference(CellReference topLeft, CellReference botRight) {
-        _version = DEFAULT_SPREADSHEET_VERSION;
-        boolean swapRows = topLeft.getRow() > botRight.getRow();
-        boolean swapCols = topLeft.getCol() > botRight.getCol();
-        if (swapRows || swapCols) {
-            int firstRow; 
-            int lastRow; 
-            int firstColumn; 
-            int lastColumn;
-            boolean firstRowAbs; 
-            boolean lastRowAbs; 
-            boolean firstColAbs;
-            boolean lastColAbs;   
-            if (swapRows) {
-                firstRow = botRight.getRow();
-                firstRowAbs = botRight.isRowAbsolute();
-                lastRow = topLeft.getRow();
-                lastRowAbs = topLeft.isRowAbsolute();
-            } else {
-                firstRow = topLeft.getRow();
-                firstRowAbs = topLeft.isRowAbsolute();
-                lastRow = botRight.getRow();
-                lastRowAbs = botRight.isRowAbsolute();
-            }
-            if (swapCols) {
-                firstColumn = botRight.getCol();
-                firstColAbs = botRight.isColAbsolute();
-                lastColumn = topLeft.getCol();
-                lastColAbs = topLeft.isColAbsolute();
-            } else {
-                firstColumn = topLeft.getCol();
-                firstColAbs = topLeft.isColAbsolute();
-                lastColumn = botRight.getCol();
-                lastColAbs = botRight.isColAbsolute();
-            }
-            _firstCell = new CellReference(firstRow, firstColumn, firstRowAbs, firstColAbs);
-            _lastCell = new CellReference(lastRow, lastColumn, lastRowAbs, lastColAbs);
-        } else {
-            _firstCell = topLeft;
-            _lastCell = botRight;
-        }
-        _isSingleCell = false;
-    }
-
-    /**
-     * Is the reference for a contiguous (i.e.
-     *  unbroken) area, or is it made up of
-     *  several different parts?
-     * (If it is, you will need to call
-     *  {@link #generateContiguous(String)})
-     */
-    public static boolean isContiguous(String reference) {
-       // If there's a sheet name, strip it off
-       int sheetRefEnd = reference.indexOf('!'); 
-       if(sheetRefEnd != -1) {
-          reference = reference.substring(sheetRefEnd);
-       }
-
-       // Check for the , as a sign of non-coniguous
-       if(reference.indexOf(',') == -1) {
-          return true;
-       }
-       return false;
-    }
-
-    public static AreaReference getWholeRow(SpreadsheetVersion version, String start, String end) {
-        if (null == version) {
-            version = DEFAULT_SPREADSHEET_VERSION;
-        }
-        return new AreaReference("$A" + start + ":$" + version.getLastColumnName() + end, version);
-    }
-
-    public static AreaReference getWholeColumn(SpreadsheetVersion version, String start, String end) {
-        if (null == version) {
-            version = DEFAULT_SPREADSHEET_VERSION;
-        }
-        return new AreaReference(start + "$1:" + end + "$" + version.getMaxRows(), version);
-    }
-
-    /**
-     * Is the reference for a whole-column reference,
-     *  such as C:C or D:G ?
-     */
-    public static boolean isWholeColumnReference(SpreadsheetVersion version, CellReference topLeft, CellReference botRight) {
-        if (null == version) {
-            version = DEFAULT_SPREADSHEET_VERSION; // how the code used to behave. 
-        }
-        
-        // These are represented as something like
-        //   C$1:C$65535 or D$1:F$0
-        // i.e. absolute from 1st row to 0th one
-        if(topLeft.getRow() == 0 && topLeft.isRowAbsolute() &&
-            botRight.getRow() == version.getLastRowIndex() && botRight.isRowAbsolute()) {
-            return true;
-        }
-        return false;
-    }
-    public boolean isWholeColumnReference() {
-        return isWholeColumnReference(_version, _firstCell, _lastCell);
-    }
-
-    /**
-     * Takes a non-contiguous area reference, and
-     *  returns an array of contiguous area references.
-     */
-    public static AreaReference[] generateContiguous(String reference) {
-        List<AreaReference> refs = new ArrayList<AreaReference>();
-        StringTokenizer st = new StringTokenizer(reference, ",");
-        while(st.hasMoreTokens()) {
-            refs.add(
-                    new AreaReference(st.nextToken())
-            );
-        }
-        return refs.toArray(new AreaReference[refs.size()]);
-    }
-
-    /**
-     * @return <code>false</code> if this area reference involves more than one cell
-     */
-    public boolean isSingleCell() {
-        return _isSingleCell;
-    }
-    
-    /**
-     * @return the first cell reference which defines this area. Usually this cell is in the upper
-     * left corner of the area (but this is not a requirement).
-     */
-   public CellReference getFirstCell() {
-        return _firstCell;
-    }
-    
-    /**
-     * Note - if this area reference refers to a single cell, the return value of this method will
-     * be identical to that of <tt>getFirstCell()</tt>
-     * @return the second cell reference which defines this area.  For multi-cell areas, this is 
-     * cell diagonally opposite the 'first cell'.  Usually this cell is in the lower right corner 
-     * of the area (but this is not a requirement).
-     */
-    public CellReference getLastCell() {
-        return _lastCell;
-    }
-    /**
-     * Returns a reference to every cell covered by this area
-     */
-    public CellReference[] getAllReferencedCells() {
-        // Special case for single cell reference
-        if(_isSingleCell) {
-            return  new CellReference[] { _firstCell, };
-        }
- 
-        // Interpolate between the two
-        int minRow = Math.min(_firstCell.getRow(), _lastCell.getRow());
-        int maxRow = Math.max(_firstCell.getRow(), _lastCell.getRow());
-        int minCol = Math.min(_firstCell.getCol(), _lastCell.getCol());
-        int maxCol = Math.max(_firstCell.getCol(), _lastCell.getCol());
-        String sheetName = _firstCell.getSheetName();
-        
-        List<CellReference> refs = new ArrayList<CellReference>();
-        for(int row=minRow; row<=maxRow; row++) {
-            for(int col=minCol; col<=maxCol; col++) {
-                CellReference ref = new CellReference(sheetName, row, col, _firstCell.isRowAbsolute(), _firstCell.isColAbsolute());
-                refs.add(ref);
-            }
-        }
-        return refs.toArray(new CellReference[refs.size()]);
-    }
-
-    /**
-     * Returns a text representation of this area reference.
-     * <p/>
-     *  Example return values:
-     *    <table border="0" cellpadding="1" cellspacing="0" summary="Example return values">
-     *      <tr><th align='left'>Result</th><th align='left'>Comment</th></tr>
-     *      <tr><td>A1:A1</td><td>Single cell area reference without sheet</td></tr>
-     *      <tr><td>A1:$C$1</td><td>Multi-cell area reference without sheet</td></tr>
-     *      <tr><td>Sheet1!A$1:B4</td><td>Standard sheet name</td></tr>
-     *      <tr><td>'O''Brien''s Sales'!B5:C6'&nbsp;</td><td>Sheet name with special characters</td></tr>
-     *    </table>
-     * @return the text representation of this area reference as it would appear in a formula.
-     */
-    public String formatAsString() {
-        // Special handling for whole-column references
-        if(isWholeColumnReference()) {
-            return
-                CellReference.convertNumToColString(_firstCell.getCol())
-                + ":" +
-                CellReference.convertNumToColString(_lastCell.getCol());
-        }
-        
-        StringBuffer sb = new StringBuffer(32);
-        sb.append(_firstCell.formatAsString());
-        if(!_isSingleCell) {
-            sb.append(CELL_DELIMITER);
-            if(_lastCell.getSheetName() == null) {
-                sb.append(_lastCell.formatAsString());
-            } else {
-                // don't want to include the sheet name twice
-                _lastCell.appendCellReference(sb);
-            }
-        }
-        return sb.toString();
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer(64);
-        sb.append(getClass().getName()).append(" [");
-        sb.append(formatAsString());
-        sb.append("]");
-        return sb.toString();
-    }
-
-    /**
-     * Separates Area refs in two parts and returns them as separate elements in a String array,
-     * each qualified with the sheet name (if present)
-     * 
-     * @return array with one or two elements. never <code>null</code>
-     */
-    private static String[] separateAreaRefs(String reference) {
-        // TODO - refactor cell reference parsing logic to one place.
-        // Current known incarnations: 
-        //   FormulaParser.GetName()
-        //   CellReference.separateRefParts() 
-        //   AreaReference.separateAreaRefs() (here)
-        //   SheetNameFormatter.format() (inverse)
-        
-        
-        int len = reference.length();
-        int delimiterPos = -1;
-        boolean insideDelimitedName = false;
-        for(int i=0; i<len; i++) {
-            switch(reference.charAt(i)) {
-                case CELL_DELIMITER:
-                    if(!insideDelimitedName) {
-                        if(delimiterPos >=0) {
-                            throw new IllegalArgumentException("More than one cell delimiter '" 
-                                    + CELL_DELIMITER + "' appears in area reference '" + reference + "'");
-                        }
-                        delimiterPos = i;
-                    }
-                    continue; //continue the for-loop
-                case SPECIAL_NAME_DELIMITER:
-                    break;
-                default:
-                    continue; //continue the for-loop
-            }
-            if(!insideDelimitedName) {
-                insideDelimitedName = true;
-                continue;
-            }
-            
-            if(i >= len-1) {
-                // reference ends with the delimited name. 
-                // Assume names like: "Sheet1!'A1'" are never legal.
-                throw new IllegalArgumentException("Area reference '" + reference 
-                        + "' ends with special name delimiter '"  + SPECIAL_NAME_DELIMITER + "'");
-            }
-            if(reference.charAt(i+1) == SPECIAL_NAME_DELIMITER) {
-                // two consecutive quotes is the escape sequence for a single one
-                i++; // skip this and keep parsing the special name
-            } else {
-                // this is the end of the delimited name
-                insideDelimitedName = false;
-            }
-        }
-        if(delimiterPos < 0) {
-            return new String[] { reference, };
-        }
-
-        String partA = reference.substring(0, delimiterPos);
-        String partB = reference.substring(delimiterPos+1);
-        if(partB.indexOf(SHEET_NAME_DELIMITER) >=0) {
-            // TODO - are references like "Sheet1!A1:Sheet1:B2" ever valid?  
-            // FormulaParser has code to handle that.
-            
-            throw new RuntimeException("Unexpected " + SHEET_NAME_DELIMITER 
-                    + " in second cell reference of '" + reference + "'");
-        }
-        
-        int plingPos = partA.lastIndexOf(SHEET_NAME_DELIMITER);
-        if(plingPos < 0) {
-            return new String [] { partA, partB, };
-        }
-        
-        String sheetName = partA.substring(0, plingPos + 1); // +1 to include delimiter
-        
-        return new String [] { partA, sheetName + partB, };
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/CellAddress.java b/trunk/src/java/org/apache/poi/ss/util/CellAddress.java
deleted file mode 100644
index 32c2711..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/CellAddress.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.Locale;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-/**
- * <p>This class is a container for POI usermodel row=0 column=0 cell references.
- * It is barely a container for these two coordinates. The implementation
- * of the Comparable interface sorts by "natural" order top left to bottom right.</p>
- * 
- * <p>Use <tt>CellAddress</tt> when you want to refer to the location of a cell in a sheet
- * when the concept of relative/absolute does not apply (such as the anchor location 
- * of a cell comment). Use {@link CellReference} when the concept of
- * relative/absolute does apply (such as a cell reference in a formula).
- * <tt>CellAddress</tt>es do not have a concept of "sheet", while <tt>CellReference</tt>s do.</p>
- */
-public class CellAddress implements Comparable<CellAddress> {
-    /** A constant for references to the first cell in a sheet. */
-    public static final CellAddress A1 = new CellAddress(0, 0);
-    
-    private final int _row;
-    private final int _col;
-    
-    /**
-     * Create a new CellAddress object.
-     *
-     * @param row Row index (first row is 0)
-     * @param column Column index (first column is 0)
-     */
-    public CellAddress(int row, int column) {
-        super();
-        this._row = row;
-        this._col = column;
-    }
-    
-    /**
-     * Create a new CellAddress object.
-     *
-     * @param address a cell address in A1 format. Address may not contain sheet name or dollar signs.
-     * (that is, address is not a cell reference. Use {@link #CellAddress(CellReference)} instead if
-     * starting with a cell reference.)
-     */
-    public CellAddress(String address) {
-        int length = address.length();
-
-        int loc = 0;
-        // step over column name chars until first digit for row number.
-        for (; loc < length; loc++) {
-            char ch = address.charAt(loc);
-            if (Character.isDigit(ch)) {
-                break;
-            }
-        }
-
-        String sCol = address.substring(0,loc).toUpperCase(Locale.ROOT);
-        String sRow = address.substring(loc);
-
-        // FIXME: breaks if address contains a sheet name or dollar signs from an absolute CellReference
-        this._row = Integer.parseInt(sRow)-1;
-        this._col = CellReference.convertColStringToIndex(sCol);
-    }
-    
-    /**
-     * Create a new CellAddress object.
-     *
-     * @param reference a reference to a cell
-     */
-    public CellAddress(CellReference reference) {
-        this(reference.getRow(), reference.getCol());
-    }
-    
-    /**
-     * Create a new CellAddress object
-     * 
-     * @param address a CellAddress
-     */
-    public CellAddress(CellAddress address) {
-        this(address.getRow(), address.getColumn());
-    }
-    
-    /**
-     * Create a new CellAddress object.
-     *
-     * @param cell the Cell to get the location of
-     */
-    public CellAddress(Cell cell) {
-        this(cell.getRowIndex(), cell.getColumnIndex());
-    }
-    
-    /**
-     * Get the cell address row
-     *
-     * @return row
-     */
-    public int getRow() {
-        return _row;
-    }
-
-    /**
-     * Get the cell address column
-     *
-     * @return column
-     */
-    public int getColumn() {
-        return _col;
-    }
-
-    /**
-     * Compare this CellAddress using the "natural" row-major, column-minor ordering.
-     * That is, top-left to bottom-right ordering.
-     * 
-     * @param other
-     * @return <ul>
-     * <li>-1 if this CellAddress is before (above/left) of other</li>
-     * <li>0 if addresses are the same</li>
-     * <li>1 if this CellAddress is after (below/right) of other</li>
-     * </ul>
-     */
-    @Override
-    public int compareTo(CellAddress other) {
-        int r = this._row-other._row;
-        if (r!=0) return r;
-
-        r = this._col-other._col;
-        if (r!=0) return r;
-
-        return 0;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if(!(o instanceof CellAddress)) {
-            return false;
-        }
-        
-        CellAddress other = (CellAddress) o;
-        return _row == other._row &&
-               _col == other._col;
-    }
-
-    @Override
-    public int hashCode() {
-        return this._row + this._col<<16;
-    }
-
-    @Override
-    public String toString() {
-        return formatAsString();
-    }
-    
-    /**
-     * Same as {@link #toString()}
-     * @return A1-style cell address string representation
-     */
-    public String formatAsString() {
-        return CellReference.convertNumToColString(this._col)+(this._row+1);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java b/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java
deleted file mode 100644
index aee9f82..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * See OOO documentation: excelfileformat.pdf sec 2.5.14 - 'Cell Range Address'<p/>
- * 
- * <p>In the Microsoft documentation, this is also known as a 
- *  Ref8U - see page 831 of version 1.0 of the documentation.
- *
- * Note - {@link SelectionRecord} uses the BIFF5 version of this structure
- * @author Dragos Buleandra (dragos.buleandra@trade2b.ro)
- */
-public class CellRangeAddress extends CellRangeAddressBase {
-	/*
-	 * TODO - replace  org.apache.poi.hssf.util.Region
-	 */
-	public static final int ENCODED_SIZE = 8;
-
-	/**
-	 * Creates new cell range. Indexes are zero-based.
-	 * 
-	 * @param firstRow Index of first row
-	 * @param lastRow Index of last row (inclusive), must be equal to or larger than {@code firstRow}
-	 * @param firstCol Index of first column
-	 * @param lastCol Index of last column (inclusive), must be equal to or larger than {@code firstCol}
-	 */
-	public CellRangeAddress(int firstRow, int lastRow, int firstCol, int lastCol) {
-		super(firstRow, lastRow, firstCol, lastCol);
-		
-		if (lastRow < firstRow || lastCol < firstCol)
-		    throw new IllegalArgumentException("lastRow < firstRow || lastCol < firstCol");
-	}
-
-	public void serialize(LittleEndianOutput out) {
-		out.writeShort(getFirstRow());
-		out.writeShort(getLastRow());
-		out.writeShort(getFirstColumn());
-		out.writeShort(getLastColumn());
-	}
-
-	public CellRangeAddress(RecordInputStream in) {
-		super(readUShortAndCheck(in), in.readUShort(), in.readUShort(), in.readUShort());
-	}
-
-	private static int readUShortAndCheck(RecordInputStream in) {
-		if (in.remaining() < ENCODED_SIZE) {
-			// Ran out of data
-			throw new RuntimeException("Ran out of data reading CellRangeAddress");
-		}
-		return in.readUShort();
-	}
-
-	public CellRangeAddress copy() {
-		return new CellRangeAddress(getFirstRow(), getLastRow(), getFirstColumn(), getLastColumn());
-	}
-
-	public static int getEncodedSize(int numberOfItems) {
-		return numberOfItems * ENCODED_SIZE;
-	}
-
-    /**
-     * @return the text format of this range.  Single cell ranges are formatted
-     *         like single cell references (e.g. 'A1' instead of 'A1:A1').
-     */
-    public String formatAsString() {
-        return formatAsString(null, false);
-    }
-
-    /**
-     * @return the text format of this range using specified sheet name.
-     */
-    public String formatAsString(String sheetName, boolean useAbsoluteAddress) {
-        StringBuffer sb = new StringBuffer();
-        if (sheetName != null) {
-            sb.append(SheetNameFormatter.format(sheetName));
-            sb.append("!");
-        }
-        CellReference cellRefFrom = new CellReference(getFirstRow(), getFirstColumn(),
-                useAbsoluteAddress, useAbsoluteAddress);
-        CellReference cellRefTo = new CellReference(getLastRow(), getLastColumn(),
-                useAbsoluteAddress, useAbsoluteAddress);
-        sb.append(cellRefFrom.formatAsString());
-
-        //for a single-cell reference return A1 instead of A1:A1
-        //for full-column ranges or full-row ranges return A:A instead of A,
-        //and 1:1 instead of 1         
-        if(!cellRefFrom.equals(cellRefTo)
-            || isFullColumnRange() || isFullRowRange()){
-            sb.append(':');
-            sb.append(cellRefTo.formatAsString());
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Creates a CellRangeAddress from a cell range reference string.
-     *  
-     * @param ref usually a standard area ref (e.g. "B1:D8").  May be a single 
-     *            cell ref (e.g. "B5") in which case the result is a 1 x 1 cell 
-     *            range. May also be a whole row range (e.g. "3:5"), or a whole 
-     *            column range (e.g. "C:F")
-     */
-    public static CellRangeAddress valueOf(String ref) {
-        int sep = ref.indexOf(":");
-        CellReference a;
-        CellReference b;
-        if (sep == -1) {
-            a = new CellReference(ref);
-            b = a;
-        } else {
-            a = new CellReference(ref.substring(0, sep));
-            b = new CellReference(ref.substring(sep + 1));
-        }
-        return new CellRangeAddress(a.getRow(), b.getRow(), a.getCol(), b.getCol());
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java b/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java
deleted file mode 100644
index f94444d..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-
-
-/**
- * See OOO documentation: excelfileformat.pdf sec 2.5.14 - 'Cell Range Address'<p/>
- *
- * Common superclass of 8-bit and 16-bit versions
- */
-public abstract class CellRangeAddressBase {
-
-	private int _firstRow;
-	private int _firstCol;
-	private int _lastRow;
-	private int _lastCol;
-
-	protected CellRangeAddressBase(int firstRow, int lastRow, int firstCol, int lastCol) {
-		_firstRow = firstRow;
-		_lastRow = lastRow;
-		_firstCol = firstCol;
-		_lastCol = lastCol;
-	}
-
-	/**
-	 * Validate the range limits against the supplied version of Excel
-	 *
-	 * @param ssVersion the version of Excel to validate against
-	 * @throws IllegalArgumentException if the range limits are outside of the allowed range
-	 */
-	public void validate(SpreadsheetVersion ssVersion) {
-		validateRow(_firstRow, ssVersion);
-		validateRow(_lastRow, ssVersion);
-		validateColumn(_firstCol, ssVersion);
-		validateColumn(_lastCol, ssVersion);
-	}
-	/**
-	 * Runs a bounds check for row numbers
-	 * @param row
-	 */
-	private static void validateRow(int row, SpreadsheetVersion ssVersion) {
-		int maxrow = ssVersion.getLastRowIndex();
-		if (row > maxrow) throw new IllegalArgumentException("Maximum row number is " + maxrow);
-		if (row < 0) throw new IllegalArgumentException("Minumum row number is 0");
-	}
-
-	/**
-	 * Runs a bounds check for column numbers
-	 * @param column
-	 */
-	private static void validateColumn(int column, SpreadsheetVersion ssVersion) {
-		int maxcol = ssVersion.getLastColumnIndex();
-		if (column > maxcol) throw new IllegalArgumentException("Maximum column number is " + maxcol);
-		if (column < 0)	throw new IllegalArgumentException("Minimum column number is 0");
-	}
-
-
-	//TODO use the correct SpreadsheetVersion
-	public final boolean isFullColumnRange() {
-		return (_firstRow == 0 && _lastRow == SpreadsheetVersion.EXCEL97.getLastRowIndex())
-		  || (_firstRow == -1 && _lastRow == -1);
-	}
-	//TODO use the correct SpreadsheetVersion
-	public final boolean isFullRowRange() {
-		return (_firstCol == 0 && _lastCol == SpreadsheetVersion.EXCEL97.getLastColumnIndex())
-		  || (_firstCol == -1 && _lastCol == -1);
-	}
-
-	/**
-	 * @return column number for the upper left hand corner
-	 */
-	public final int getFirstColumn() {
-		return _firstCol;
-	}
-
-	/**
-	 * @return row number for the upper left hand corner
-	 */
-	public final int getFirstRow() {
-		return _firstRow;
-	}
-
-	/**
-	 * @return column number for the lower right hand corner
-	 */
-	public final int getLastColumn() {
-		return _lastCol;
-	}
-
-	/**
-	 * @return row number for the lower right hand corner
-	 */
-	public final int getLastRow() {
-		return _lastRow;
-	}
-
-	/**
-	 * Determines if the given coordinates lie within the bounds 
-	 * of this range.
-	 *
-	 * @param rowInd The row, 0-based.
-	 * @param colInd The column, 0-based.
-	 * @return True if the coordinates lie within the bounds, false otherwise.
-	 * @see #intersects(CellRangeAddressBase) for checking if two ranges overlap
-	 */
-	public boolean isInRange(int rowInd, int colInd) {
-		return _firstRow <= rowInd && rowInd <= _lastRow && //containsRow
-				_firstCol <= colInd && colInd <= _lastCol; //containsColumn
-	}
-	
-	/**
-	 * Check if the row is in the specified cell range
-	 *
-	 * @param rowInd the row to check
-	 * @return true if the range contains the row [rowInd]
-	 */
-	public boolean containsRow(int rowInd) {
-		return _firstRow <= rowInd && rowInd <= _lastRow;
-	}
-	
-	/**
-	 * Check if the column is in the specified cell range
-	 *
-	 * @param colInd the column to check
-	 * @return true if the range contains the column [colInd]
-	 */
-	public boolean containsColumn(int colInd) {
-		return _firstCol <= colInd && colInd <= _lastCol;
-	}
-	
-	/**
-	 * Determines whether or not this CellRangeAddress and the specified CellRangeAddress intersect.
-	 *
-	 * @param other a candidate cell range address to check for intersection with this range
-	 * @return returns true if this range and other range have at least 1 cell in common
-	 * @see #isInRange(int, int) for checking if a single cell intersects
-	 */
-	public boolean intersects(CellRangeAddressBase other) {
-		return this._firstRow <= other._lastRow &&
-				this._firstCol <= other._lastCol &&
-				other._firstRow <= this._lastRow &&
-				other._firstCol <= this._lastCol;
-	}
-	
-	/**
-	 * @param firstCol column number for the upper left hand corner
-	 */
-	public final void setFirstColumn(int firstCol) {
-		_firstCol = firstCol;
-	}
-
-	/**
-	 * @param firstRow row number for the upper left hand corner
-	 */
-	public final void setFirstRow(int firstRow) {
-		_firstRow = firstRow;
-	}
-
-	/**
-	 * @param lastCol column number for the lower right hand corner
-	 */
-	public final void setLastColumn(int lastCol) {
-		_lastCol = lastCol;
-	}
-
-	/**
-	 * @param lastRow row number for the lower right hand corner
-	 */
-	public final void setLastRow(int lastRow) {
-		_lastRow = lastRow;
-	}
-	/**
-	 * @return the size of the range (number of cells in the area).
-	 */
-	public int getNumberOfCells() {
-		return (_lastRow - _firstRow + 1) * (_lastCol - _firstCol + 1);
-	}
-
-	@Override
-    public final String toString() {
-		CellReference crA = new CellReference(_firstRow, _firstCol);
-		CellReference crB = new CellReference(_lastRow, _lastCol);
-		return getClass().getName() + " [" + crA.formatAsString() + ":" + crB.formatAsString() +"]";
-	}
-	
-	// In case _firstRow > _lastRow or _firstCol > _lastCol
-	protected int getMinRow() {
-		return Math.min(_firstRow, _lastRow);
-	}
-	protected int getMaxRow() {
-		return Math.max(_firstRow, _lastRow);
-	}
-	protected int getMinColumn() {
-		return Math.min(_firstCol, _lastCol);
-	}
-	protected int getMaxColumn() {
-		return Math.max(_firstCol, _lastCol);
-	}
-	
-	@Override
-	public boolean equals(Object other) {
-		if (other instanceof CellRangeAddressBase) {
-			CellRangeAddressBase o = (CellRangeAddressBase) other;
-			return ((getMinRow() == o.getMinRow()) &&
-					(getMaxRow() == o.getMaxRow()) &&
-					(getMinColumn() == o.getMinColumn()) &&
-					(getMaxColumn() == o.getMaxColumn()));
-		}
-		return false;
-	}
-	
-	@Override
-	public int hashCode() {
-		int code = (getMinColumn() +
-		(getMaxColumn() << 8) +
-		(getMinRow() << 16) +
-		(getMaxRow() << 24));
-		return code;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressList.java b/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressList.java
deleted file mode 100644
index 8d99198..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressList.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianOutput;
-
-/**
- * Implementation of the cell range address lists,like is described
- * in OpenOffice.org's Excel Documentation: excelfileformat.pdf sec 2.5.14 -
- * 'Cell Range Address List'
- * 
- * In BIFF8 there is a common way to store absolute cell range address lists in
- * several records (not formulas). A cell range address list consists of a field
- * with the number of ranges and the list of the range addresses. Each cell
- * range address (called an ADDR structure) contains 4 16-bit-values.
- * </p>
- * 
- * @author Dragos Buleandra (dragos.buleandra@trade2b.ro)
- */
-public class CellRangeAddressList {
-
-	/**
-	 * List of <tt>CellRangeAddress</tt>es. Each structure represents a cell range
-	 */
-	protected final List<CellRangeAddress> _list;
-
-	public CellRangeAddressList() {
-		_list = new ArrayList<CellRangeAddress>();
-	}
-	/**
-	 * Convenience constructor for creating a <tt>CellRangeAddressList</tt> with a single 
-	 * <tt>CellRangeAddress</tt>.  Other <tt>CellRangeAddress</tt>es may be added later.
-	 */
-	public CellRangeAddressList(int firstRow, int lastRow, int firstCol, int lastCol) {
-		this();
-		addCellRangeAddress(firstRow, firstCol, lastRow, lastCol);
-	}
-	/**
-	 * @param in the RecordInputstream to read the record from
-	 */
-	public CellRangeAddressList(RecordInputStream in) {
-		this();
-		int nItems = in.readUShort();
-
-		for (int k = 0; k < nItems; k++) {
-			_list.add(new CellRangeAddress(in));
-		}
-	}
-	/**
-	 * Get the number of following ADDR structures. The number of this
-	 * structures is automatically set when reading an Excel file and/or
-	 * increased when you manually add a new ADDR structure . This is the reason
-	 * there isn't a set method for this field .
-	 * 
-	 * @return number of ADDR structures
-	 */
-	public int countRanges() {
-		return _list.size();
-	}
-
-	/**
-	 * Add a cell range structure.
-	 * 
-	 * @param firstRow - the upper left hand corner's row
-	 * @param firstCol - the upper left hand corner's col
-	 * @param lastRow - the lower right hand corner's row
-	 * @param lastCol - the lower right hand corner's col
-	 */
-	public void addCellRangeAddress(int firstRow, int firstCol, int lastRow, int lastCol) {
-		CellRangeAddress region = new CellRangeAddress(firstRow, lastRow, firstCol, lastCol);
-		addCellRangeAddress(region);
-	}
-	public void addCellRangeAddress(CellRangeAddress cra) {
-		_list.add(cra);
-	}
-	public CellRangeAddress remove(int rangeIndex) {
-		if (_list.isEmpty()) {
-			throw new RuntimeException("List is empty");
-		}
-		if (rangeIndex < 0 || rangeIndex >= _list.size()) {
-			throw new RuntimeException("Range index (" + rangeIndex 
-					+ ") is outside allowable range (0.." + (_list.size()-1) + ")");
-		}
-		return _list.remove(rangeIndex);
-	}
-
-	/**
-	 * @return <tt>CellRangeAddress</tt> at the given index
-	 */
-	public CellRangeAddress getCellRangeAddress(int index) {
-		return _list.get(index);
-	}
-
-	public int getSize() {
-		return getEncodedSize(_list.size());
-	}
-	/**
-	 * @return the total size of for the specified number of ranges,
-	 *  including the initial 2 byte range count
-	 */
-	public static int getEncodedSize(int numberOfRanges) {
-		return 2 + CellRangeAddress.getEncodedSize(numberOfRanges);
-	}
-
-	public int serialize(int offset, byte[] data) {
-		int totalSize = getSize();
-		serialize(new LittleEndianByteArrayOutputStream(data, offset, totalSize));
-		return totalSize;
-	}
-	public void serialize(LittleEndianOutput out) {
-		int nItems = _list.size();
-		out.writeShort(nItems);
-		for (int k = 0; k < nItems; k++) {
-			CellRangeAddress region = _list.get(k);
-			region.serialize(out);
-		}
-	}
-	
-
-	public CellRangeAddressList copy() {
-		CellRangeAddressList result = new CellRangeAddressList();
-		
-		int nItems = _list.size();
-		for (int k = 0; k < nItems; k++) {
-			CellRangeAddress region = _list.get(k);
-			result.addCellRangeAddress(region.copy());
-		}
-		return result;
-	}
-	public CellRangeAddress[] getCellRangeAddresses() {
-		CellRangeAddress[] result = new CellRangeAddress[_list.size()];
-		_list.toArray(result);
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/CellRangeUtil.java b/trunk/src/java/org/apache/poi/ss/util/CellRangeUtil.java
deleted file mode 100644
index 3fd0135..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/CellRangeUtil.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Utility class that builds on {@link CellRangeAddress}
- * 
- * Portions of this class may be moved to {@link CellRangeAddressBase}
- */
-public final class CellRangeUtil {
-    private CellRangeUtil() {
-        // no instance of this class
-    }
-
-    public static final int NO_INTERSECTION = 1;
-    public static final int OVERLAP = 2;
-    /** first range is within the second range */
-    public static final int INSIDE = 3;
-    /** first range encloses or is equal to the second */
-    public static final int ENCLOSES = 4;
-
-    /**
-     * Get the type of intersection between two cell ranges
-     * 
-     * @param crB - the specified range
-     * @return code which reflects how the specified range is related to this range.<br/>
-     * Possible return codes are:
-     * <ul>
-     *     <li>{@link #NO_INTERSECTION} - the specified range is outside of this range;</li> 
-     *     <li>{@link #OVERLAP} - both ranges partially overlap</li>
-     *     <li>{@link #INSIDE} - the specified range is inside of this one</li>
-     *     <li>{@link #ENCLOSES} - the specified range encloses (possibly exactly the same as) this range</li>
-     * </ul>
-     * @see CellRangeAddressBase#intersects(CellRangeAddressBase)
-     */
-    public static int intersect(CellRangeAddress crA, CellRangeAddress crB )
-    {
-
-        int firstRow = crB.getFirstRow();
-        int lastRow  = crB.getLastRow();
-        int firstCol = crB.getFirstColumn();
-        int lastCol  = crB.getLastColumn();
-
-        if ( 
-            gt(crA.getFirstRow(),    lastRow) || lt(crA.getLastRow(),    firstRow) ||
-            gt(crA.getFirstColumn(), lastCol) || lt(crA.getLastColumn(), firstCol) 
-        )
-        {
-            return NO_INTERSECTION;
-        }
-        else if( contains(crA, crB) )
-        {
-            return INSIDE;
-        }
-        else if( contains(crB, crA))
-        {
-            return ENCLOSES;
-        }
-        else
-        {
-            return OVERLAP;
-        }
-    }
-
-    /**
-     * Do all possible cell merges between cells of the list so that:<br/>
-     * <ul>
-     *   <li>if a cell range is completely inside of another cell range, it gets removed from the list</li>
-     *   <li>if two cells have a shared border, merge them into one bigger cell range</li>
-     * </ul>
-     * @param cellRanges the ranges to merge
-     * @return list of merged cell ranges
-     */
-    public static CellRangeAddress[] mergeCellRanges(CellRangeAddress[] cellRanges) {
-        if(cellRanges.length < 1) {
-            return new CellRangeAddress[] {};
-        }
-        List<CellRangeAddress> list = toList(cellRanges);
-        List<CellRangeAddress> temp = mergeCellRanges(list);
-        return toArray(temp);
-    }
-
-    private static List<CellRangeAddress> mergeCellRanges(List<CellRangeAddress> cellRangeList)
-    {
-        // loop until either only one item is left or we did not merge anything any more
-        while (cellRangeList.size() > 1) {
-            boolean somethingGotMerged = false;
-
-            // look at all cell-ranges
-            for (int i = 0; i < cellRangeList.size(); i++) {
-                CellRangeAddress range1 = cellRangeList.get(i);
-
-                // compare each cell range to all other cell-ranges
-                for (int j = i + 1; j < cellRangeList.size(); j++) {
-                    CellRangeAddress range2 = cellRangeList.get(j);
-
-                    CellRangeAddress[] mergeResult = mergeRanges(range1, range2);
-                    if (mergeResult == null) {
-                        continue;
-                    }
-                    somethingGotMerged = true;
-                    // overwrite range1 with first result
-                    cellRangeList.set(i, mergeResult[0]);
-                    // remove range2
-                    cellRangeList.remove(j--);
-                    // add any extra results beyond the first
-                    for (int k = 1; k < mergeResult.length; k++) {
-                        j++;
-                        cellRangeList.add(j, mergeResult[k]);
-                    }
-                }
-            }
-            if (!somethingGotMerged) {
-                break;
-            }
-        }
-
-        return cellRangeList;
-    }
-
-    /**
-     * @return the new range(s) to replace the supplied ones.  <code>null</code> if no merge is possible
-     */
-    private static CellRangeAddress[] mergeRanges(CellRangeAddress range1, CellRangeAddress range2) {
-        int x = intersect(range1, range2);
-        switch(x)
-        {
-            case CellRangeUtil.NO_INTERSECTION: 
-                // nothing in common: at most they could be adjacent to each other and thus form a single bigger area  
-                if(hasExactSharedBorder(range1, range2)) {
-                    return new CellRangeAddress[] { createEnclosingCellRange(range1, range2), };
-                }
-                // else - No intersection and no shared border: do nothing 
-                return null;
-            case CellRangeUtil.OVERLAP:
-                // commented out the cells overlap implementation, it caused endless loops, see Bug 55380
-                // disabled for now, the algorithm will not detect some border cases this way currently!
-                //return resolveRangeOverlap(range1, range2);
-                return null;
-            case CellRangeUtil.INSIDE:
-                // Remove range2, since it is completely inside of range1
-                return new CellRangeAddress[] { range1 };
-            case CellRangeUtil.ENCLOSES:
-                // range2 encloses range1, so replace it with the enclosing one
-                return new CellRangeAddress[] { range2 };
-        }
-        throw new RuntimeException("unexpected intersection result (" + x + ")");
-    }
-
-    private static CellRangeAddress[] toArray(List<CellRangeAddress> temp) {
-        CellRangeAddress[] result = new CellRangeAddress[temp.size()];
-        temp.toArray(result);
-        return result;
-    }
-    private static List<CellRangeAddress> toList(CellRangeAddress[] temp) {
-        List<CellRangeAddress> result = new ArrayList<CellRangeAddress>(temp.length);
-        for (CellRangeAddress range : temp) {
-            result.add(range);
-        }
-        return result;
-    }
-
-    /**
-     * Check if cell range A contains cell range B (B <= A)
-     * 
-     * TODO: move this into {@link CellRangeAddressBase}
-     * 
-     * @param crA cell range A
-     * @param crB cell range B
-     * @return true if cell range A contains cell range B
-     */
-    public static boolean contains(CellRangeAddress crA, CellRangeAddress crB)
-    {
-        return le(crA.getFirstRow(), crB.getFirstRow()) &&
-                ge(crA.getLastRow(), crB.getLastRow()) &&
-                le(crA.getFirstColumn(), crB.getFirstColumn()) &&
-                ge(crA.getLastColumn(), crB.getLastColumn());
-    }
-
-    /**
-     * Check if the two cell ranges have a shared border.
-     * 
-     * @return <code>true</code> if the ranges have a complete shared border (i.e.
-     * the two ranges together make a simple rectangular region.
-     */
-    public static boolean hasExactSharedBorder(CellRangeAddress crA, CellRangeAddress crB) {
-        int oFirstRow = crB.getFirstRow();
-        int oLastRow  = crB.getLastRow();
-        int oFirstCol = crB.getFirstColumn();
-        int oLastCol  = crB.getLastColumn();
-
-        if (crA.getFirstRow() > 0 && crA.getFirstRow()-1 == oLastRow || 
-                oFirstRow > 0 && oFirstRow-1 == crA.getLastRow()) {
-            // ranges have a horizontal border in common
-            // make sure columns are identical:
-            return crA.getFirstColumn() == oFirstCol && crA.getLastColumn() == oLastCol;
-        }
-
-        if (crA.getFirstColumn()>0 && crA.getFirstColumn() - 1 == oLastCol ||
-                oFirstCol>0 && crA.getLastColumn() == oFirstCol -1) {
-            // ranges have a vertical border in common
-            // make sure rows are identical:
-            return crA.getFirstRow() == oFirstRow && crA.getLastRow() == oLastRow;
-        }
-        return false;
-    }
-
-    /**
-     * Create an enclosing CellRange for the two cell ranges.
-     * 
-     * @return enclosing CellRange
-     */
-    public static CellRangeAddress createEnclosingCellRange(CellRangeAddress crA, CellRangeAddress crB) {
-        if( crB == null) {
-            return crA.copy();
-        }
-        
-        int minRow = lt(crB.getFirstRow(),   crA.getFirstRow())   ?crB.getFirstRow()   :crA.getFirstRow();
-        int maxRow = gt(crB.getLastRow(),    crA.getLastRow())    ?crB.getLastRow()    :crA.getLastRow();
-        int minCol = lt(crB.getFirstColumn(),crA.getFirstColumn())?crB.getFirstColumn():crA.getFirstColumn();
-        int maxCol = gt(crB.getLastColumn(), crA.getLastColumn()) ?crB.getLastColumn() :crA.getLastColumn();
-
-        return new CellRangeAddress(minRow, maxRow, minCol, maxCol);
-    }
-
-    /**
-     * @return true if a < b
-     */
-    private static boolean lt(int a, int b)
-    {
-        return a == -1 ? false : (b == -1 ? true : a < b);
-    }
-
-    /**
-     * @return true if a <= b
-     */
-    private static boolean le(int a, int b)
-    {
-        return a == b || lt(a,b);
-    }
-
-    /**
-     * @return true if a > b
-     */
-    private static boolean gt(int a, int b)
-    {
-        return lt(b,a);
-    }
-
-    /**
-     * @return true if a >= b
-     */
-    private static boolean ge(int a, int b)
-    {
-        return !lt(a,b);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/CellReference.java b/trunk/src/java/org/apache/poi/ss/util/CellReference.java
deleted file mode 100644
index 6adc530..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/CellReference.java
+++ /dev/null
@@ -1,572 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.usermodel.Cell;
-
-/**
- * <p>Common conversion functions between Excel style A1, C27 style
- *  cell references, and POI usermodel style row=0, column=0
- *  style references. Handles sheet-based and sheet-free references
- *  as well, eg "Sheet1!A1" and "$B$72"</p>
- *  
- *  <p>Use <tt>CellReference</tt> when the concept of
- * relative/absolute does apply (such as a cell reference in a formula).
- * Use {@link CellAddress} when you want to refer to the location of a cell in a sheet
- * when the concept of relative/absolute does not apply (such as the anchor location 
- * of a cell comment).
- * <tt>CellReference</tt>s have a concept of "sheet", while <tt>CellAddress</tt>es do not.</p>
- */
-public class CellReference {
-    /**
-     * Used to classify identifiers found in formulas as cell references or not.
-     */
-    public enum NameType {
-        CELL,
-        NAMED_RANGE,
-        COLUMN,
-        ROW,
-        BAD_CELL_OR_NAMED_RANGE
-    }
-
-    /** The character ($) that signifies a row or column value is absolute instead of relative */
-    private static final char ABSOLUTE_REFERENCE_MARKER = '$';
-    /** The character (!) that separates sheet names from cell references */
-    private static final char SHEET_NAME_DELIMITER = '!';
-    /** The character (') used to quote sheet names when they contain special characters */
-    private static final char SPECIAL_NAME_DELIMITER = '\'';
-
-    /**
-     * Matches a run of one or more letters followed by a run of one or more digits.
-     * Both the letter and number groups are optional.
-     * The run of letters is group 1 and the run of digits is group 2.
-     * Each group may optionally be prefixed with a single '$'.
-     */
-    private static final Pattern CELL_REF_PATTERN = Pattern.compile("(\\$?[A-Z]+)?" + "(\\$?[0-9]+)?", Pattern.CASE_INSENSITIVE);
-    /**
-     * Matches references only where row and column are included.
-     * Matches a run of one or more letters followed by a run of one or more digits.
-     * If a reference does not match this pattern, it might match COLUMN_REF_PATTERN or ROW_REF_PATTERN
-     * References may optionally include a single '$' before each group, but these are excluded from the Matcher.group(int).
-     */
-    private static final Pattern STRICTLY_CELL_REF_PATTERN = Pattern.compile("\\$?([A-Z]+)" + "\\$?([0-9]+)", Pattern.CASE_INSENSITIVE);
-    /**
-     * Matches a run of one or more letters.  The run of letters is group 1.
-     * References may optionally include a single '$' before the group, but these are excluded from the Matcher.group(int).
-     */
-    private static final Pattern COLUMN_REF_PATTERN = Pattern.compile("\\$?([A-Z]+)", Pattern.CASE_INSENSITIVE);
-    /**
-     * Matches a run of one or more letters.  The run of numbers is group 1.
-     * References may optionally include a single '$' before the group, but these are excluded from the Matcher.group(int).
-     */
-    private static final Pattern ROW_REF_PATTERN = Pattern.compile("\\$?([0-9]+)");
-    /**
-     * Named range names must start with a letter or underscore.  Subsequent characters may include
-     * digits or dot.  (They can even end in dot).
-     */
-    private static final Pattern NAMED_RANGE_NAME_PATTERN = Pattern.compile("[_A-Z][_.A-Z0-9]*", Pattern.CASE_INSENSITIVE);
-    //private static final String BIFF8_LAST_COLUMN = SpreadsheetVersion.EXCEL97.getLastColumnName();
-    //private static final int BIFF8_LAST_COLUMN_TEXT_LEN = BIFF8_LAST_COLUMN.length();
-    //private static final String BIFF8_LAST_ROW = String.valueOf(SpreadsheetVersion.EXCEL97.getMaxRows());
-    //private static final int BIFF8_LAST_ROW_TEXT_LEN = BIFF8_LAST_ROW.length();
-
-    // FIXME: _sheetName may be null, depending on the entry point.
-    // Perhaps it would be better to declare _sheetName is never null, using an empty string to represent a 2D reference.
-    private final String _sheetName;
-    private final int _rowIndex;
-    private final int _colIndex;
-    private final boolean _isRowAbs;
-    private final boolean _isColAbs;
-
-    /**
-     * Create an cell ref from a string representation.  Sheet names containing special characters should be
-     * delimited and escaped as per normal syntax rules for formulas.
-     */
-    public CellReference(String cellRef) {
-        if(cellRef.toUpperCase(Locale.ROOT).endsWith("#REF!")) {
-            throw new IllegalArgumentException("Cell reference invalid: " + cellRef);
-        }
-
-        CellRefParts parts = separateRefParts(cellRef);
-        _sheetName = parts.sheetName;
-
-        String colRef = parts.colRef;
-        _isColAbs = (colRef.length() > 0) && colRef.charAt(0) == '$';
-        if (_isColAbs) {
-            colRef = colRef.substring(1);
-        }
-        if (colRef.length() == 0) {
-            _colIndex = -1;
-        } else {
-            _colIndex = convertColStringToIndex(colRef);
-        }
-
-        String rowRef=parts.rowRef;
-        _isRowAbs = (rowRef.length() > 0) && rowRef.charAt(0) == '$';
-        if (_isRowAbs) {
-            rowRef = rowRef.substring(1);
-        }
-        if (rowRef.length() == 0) {
-            _rowIndex = -1;
-        } else {
-            _rowIndex = Integer.parseInt(rowRef)-1; // -1 to convert 1-based to zero-based
-        }
-    }
-
-    public CellReference(int pRow, int pCol) {
-        this(pRow, pCol, false, false);
-    }
-    public CellReference(int pRow, short pCol) {
-        this(pRow, pCol & 0xFFFF, false, false);
-    }
-
-    public CellReference(Cell cell) {
-        this(cell.getRowIndex(), cell.getColumnIndex(), false, false);
-    }
-
-    public CellReference(int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {
-        this(null, pRow, pCol, pAbsRow, pAbsCol);
-    }
-    public CellReference(String pSheetName, int pRow, int pCol, boolean pAbsRow, boolean pAbsCol) {
-        // TODO - "-1" is a special value being temporarily used for whole row and whole column area references.
-        // so these checks are currently N.Q.R.
-        if(pRow < -1) {
-            throw new IllegalArgumentException("row index may not be negative, but had " + pRow);
-        }
-        if(pCol < -1) {
-            throw new IllegalArgumentException("column index may not be negative, but had " + pCol);
-        }
-        _sheetName = pSheetName;
-        _rowIndex=pRow;
-        _colIndex=pCol;
-        _isRowAbs = pAbsRow;
-        _isColAbs=pAbsCol;
-    }
-
-    public int getRow(){return _rowIndex;}
-    public short getCol(){return (short) _colIndex;}
-    public boolean isRowAbsolute(){return _isRowAbs;}
-    public boolean isColAbsolute(){return _isColAbs;}
-    /**
-     * @return possibly <code>null</code> if this is a 2D reference.  Special characters are not
-     * escaped or delimited
-     */
-    public String getSheetName(){
-        return _sheetName;
-    }
-
-    public static boolean isPartAbsolute(String part) {
-        return part.charAt(0) == ABSOLUTE_REFERENCE_MARKER;
-    }
-    /**
-     * takes in a column reference portion of a CellRef and converts it from
-     * ALPHA-26 number format to 0-based base 10.
-     * 'A' -> 0
-     * 'Z' -> 25
-     * 'AA' -> 26
-     * 'IV' -> 255
-     * @return zero based column index
-     */
-    public static int convertColStringToIndex(String ref) {
-        int retval=0;
-        char[] refs = ref.toUpperCase(Locale.ROOT).toCharArray();
-        for (int k=0; k<refs.length; k++) {
-            char thechar = refs[k];
-            if (thechar == ABSOLUTE_REFERENCE_MARKER) {
-                if (k != 0) {
-                    throw new IllegalArgumentException("Bad col ref format '" + ref + "'");
-                }
-                continue;
-            }
-
-            // Character is uppercase letter, find relative value to A
-            retval = (retval * 26) + (thechar - 'A' + 1);
-        }
-        return retval-1;
-    }
-
-    /**
-     * Classifies an identifier as either a simple (2D) cell reference or a named range name
-     * @return one of the values from <tt>NameType</tt>
-     */
-    public static NameType classifyCellReference(String str, SpreadsheetVersion ssVersion) {
-        int len = str.length();
-        if (len < 1) {
-            throw new IllegalArgumentException("Empty string not allowed");
-        }
-        char firstChar = str.charAt(0);
-        switch (firstChar) {
-            case ABSOLUTE_REFERENCE_MARKER:
-            case '.':
-            case '_':
-                break;
-            default:
-                if (!Character.isLetter(firstChar) && !Character.isDigit(firstChar)) {
-                    throw new IllegalArgumentException("Invalid first char (" + firstChar
-                            + ") of cell reference or named range.  Letter expected");
-                }
-        }
-        if (!Character.isDigit(str.charAt(len-1))) {
-            // no digits at end of str
-            return validateNamedRangeName(str, ssVersion);
-        }
-        Matcher cellRefPatternMatcher = STRICTLY_CELL_REF_PATTERN.matcher(str);
-        if (!cellRefPatternMatcher.matches()) {
-            return validateNamedRangeName(str, ssVersion);
-        }
-        String lettersGroup = cellRefPatternMatcher.group(1);
-        String digitsGroup = cellRefPatternMatcher.group(2);
-        if (cellReferenceIsWithinRange(lettersGroup, digitsGroup, ssVersion)) {
-            // valid cell reference
-            return NameType.CELL;
-        }
-        // If str looks like a cell reference, but is out of (row/col) range, it is a valid
-        // named range name
-        // This behaviour is a little weird.  For example, "IW123" is a valid named range name
-        // because the column "IW" is beyond the maximum "IV".  Note - this behaviour is version
-        // dependent.  In BIFF12, "IW123" is not a valid named range name, but in BIFF8 it is.
-        if (str.indexOf(ABSOLUTE_REFERENCE_MARKER) >= 0) {
-            // Of course, named range names cannot have '$'
-            return NameType.BAD_CELL_OR_NAMED_RANGE;
-        }
-        return NameType.NAMED_RANGE;
-    }
-
-    private static NameType validateNamedRangeName(String str, SpreadsheetVersion ssVersion) {
-        Matcher colMatcher = COLUMN_REF_PATTERN.matcher(str);
-        if (colMatcher.matches()) {
-            String colStr = colMatcher.group(1);
-            if (isColumnWithinRange(colStr, ssVersion)) {
-                return NameType.COLUMN;
-            }
-        }
-        Matcher rowMatcher = ROW_REF_PATTERN.matcher(str);
-        if (rowMatcher.matches()) {
-            String rowStr = rowMatcher.group(1);
-            if (isRowWithinRange(rowStr, ssVersion)) {
-                return NameType.ROW;
-            }
-        }
-        if (!NAMED_RANGE_NAME_PATTERN.matcher(str).matches()) {
-            return NameType.BAD_CELL_OR_NAMED_RANGE;
-        }
-        return NameType.NAMED_RANGE;
-    }
-
-
-    /**
-     * Used to decide whether a name of the form "[A-Z]*[0-9]*" that appears in a formula can be
-     * interpreted as a cell reference.  Names of that form can be also used for sheets and/or
-     * named ranges, and in those circumstances, the question of whether the potential cell
-     * reference is valid (in range) becomes important.
-     * <p/>
-     * Note - that the maximum sheet size varies across Excel versions:
-     * <p/>
-     * <blockquote><table border="0" cellpadding="1" cellspacing="0"
-     *                 summary="Notable cases.">
-     *   <tr><th>Version&nbsp;&nbsp;</th><th>File Format&nbsp;&nbsp;</th>
-     *   	<th>Last Column&nbsp;&nbsp;</th><th>Last Row</th></tr>
-     *   <tr><td>97-2003</td><td>BIFF8</td><td>"IV" (2^8)</td><td>65536 (2^14)</td></tr>
-     *   <tr><td>2007</td><td>BIFF12</td><td>"XFD" (2^14)</td><td>1048576 (2^20)</td></tr>
-     * </table></blockquote>
-     * POI currently targets BIFF8 (Excel 97-2003), so the following behaviour can be observed for
-     * this method:
-     * <blockquote><table border="0" cellpadding="1" cellspacing="0"
-     *                 summary="Notable cases.">
-     *   <tr><th>Input&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-     *       <th>Result&nbsp;</th></tr>
-     *   <tr><td>"A", "1"</td><td>true</td></tr>
-     *   <tr><td>"a", "111"</td><td>true</td></tr>
-     *   <tr><td>"A", "65536"</td><td>true</td></tr>
-     *   <tr><td>"A", "65537"</td><td>false</td></tr>
-     *   <tr><td>"iv", "1"</td><td>true</td></tr>
-     *   <tr><td>"IW", "1"</td><td>false</td></tr>
-     *   <tr><td>"AAA", "1"</td><td>false</td></tr>
-     *   <tr><td>"a", "111"</td><td>true</td></tr>
-     *   <tr><td>"Sheet", "1"</td><td>false</td></tr>
-     * </table></blockquote>
-     *
-     * @param colStr a string of only letter characters
-     * @param rowStr a string of only digit characters
-     * @return <code>true</code> if the row and col parameters are within range of a BIFF8 spreadsheet.
-     */
-    public static boolean cellReferenceIsWithinRange(String colStr, String rowStr, SpreadsheetVersion ssVersion) {
-        if (!isColumnWithinRange(colStr, ssVersion)) {
-            return false;
-        }
-        return isRowWithinRange(rowStr, ssVersion);
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Use {@link #isColumnWithinRange}.
-     */
-    public static boolean isColumnWithnRange(String colStr, SpreadsheetVersion ssVersion) {
-        return isColumnWithinRange(colStr, ssVersion);
-    }
-
-    public static boolean isColumnWithinRange(String colStr, SpreadsheetVersion ssVersion) {
-        // Equivalent to 0 <= CellReference.convertColStringToIndex(colStr) <= ssVersion.getLastColumnIndex()
-
-        String lastCol = ssVersion.getLastColumnName();
-        int lastColLength = lastCol.length();
-
-        int numberOfLetters = colStr.length();
-        if(numberOfLetters > lastColLength) {
-            // "Sheet1" case etc
-            return false; // that was easy
-        }
-        if(numberOfLetters == lastColLength) {
-            if(colStr.toUpperCase(Locale.ROOT).compareTo(lastCol) > 0) {
-                return false;
-            }
-        } else {
-            // apparent column name has less chars than max
-            // no need to check range
-        }
-        return true;
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Use {@link #isRowWithinRange}
-     */
-    public static boolean isRowWithnRange(String rowStr, SpreadsheetVersion ssVersion) {
-        return isRowWithinRange(rowStr, ssVersion);
-    }
-
-    public static boolean isRowWithinRange(String rowStr, SpreadsheetVersion ssVersion) {
-        int rowNum = Integer.parseInt(rowStr) - 1;
-        return 0 <= rowNum && rowNum <= ssVersion.getLastRowIndex();
-    }
-
-    private static final class CellRefParts {
-        final String sheetName;
-        final String rowRef;
-        final String colRef; 
-
-        private CellRefParts(String sheetName, String rowRef, String colRef) {
-            this.sheetName = sheetName;
-            this.rowRef = (rowRef != null) ? rowRef : "";
-            this.colRef = (colRef != null) ? colRef : "";
-        }
-    }
-
-    /**
-     * Separates the sheet name, row, and columns from a cell reference string.
-     * 
-     * @param reference is a string that identifies a cell within the sheet or workbook
-     * reference may not refer to a cell in an external workbook
-     * reference may be absolute or relative.
-     * @return String array of sheetName, column (in ALPHA-26 format), and row
-     * output column or row elements will contain absolute reference markers if they
-     * existed in the input reference.
-     */
-    private static CellRefParts separateRefParts(String reference) {
-        int plingPos = reference.lastIndexOf(SHEET_NAME_DELIMITER);
-        final String sheetName = parseSheetName(reference, plingPos);
-        String cell = reference.substring(plingPos+1).toUpperCase(Locale.ROOT);
-        Matcher matcher = CELL_REF_PATTERN.matcher(cell);
-        if (!matcher.matches()) throw new IllegalArgumentException("Invalid CellReference: " + reference);
-        String col = matcher.group(1);
-        String row = matcher.group(2);
-
-        CellRefParts cellRefParts = new CellRefParts(sheetName, row, col);
-        return cellRefParts;
-    }
-
-    private static String parseSheetName(String reference, int indexOfSheetNameDelimiter) {
-        if(indexOfSheetNameDelimiter < 0) {
-            return null;
-        }
-
-        boolean isQuoted = reference.charAt(0) == SPECIAL_NAME_DELIMITER;
-        if(!isQuoted) {
-            // sheet names with spaces must be quoted
-            if (reference.indexOf(' ') == -1) {
-                return reference.substring(0, indexOfSheetNameDelimiter);
-            } else {
-                throw new IllegalArgumentException("Sheet names containing spaces must be quoted: (" + reference + ")");
-            }
-        }
-        int lastQuotePos = indexOfSheetNameDelimiter-1;
-        if(reference.charAt(lastQuotePos) != SPECIAL_NAME_DELIMITER) {
-            throw new IllegalArgumentException("Mismatched quotes: (" + reference + ")");
-        }
-
-        // TODO - refactor cell reference parsing logic to one place.
-        // Current known incarnations:
-        //   FormulaParser.GetName()
-        //   CellReference.parseSheetName() (here)
-        //   AreaReference.separateAreaRefs()
-        //   SheetNameFormatter.format() (inverse)
-
-        StringBuffer sb = new StringBuffer(indexOfSheetNameDelimiter);
-
-        for(int i=1; i<lastQuotePos; i++) { // Note boundaries - skip outer quotes
-            char ch = reference.charAt(i);
-            if(ch != SPECIAL_NAME_DELIMITER) {
-                sb.append(ch);
-                continue;
-            }
-            if(i < lastQuotePos) {
-                if(reference.charAt(i+1) == SPECIAL_NAME_DELIMITER) {
-                    // two consecutive quotes is the escape sequence for a single one
-                    i++; // skip this and keep parsing the special name
-                    sb.append(ch);
-                    continue;
-                }
-            }
-            throw new IllegalArgumentException("Bad sheet name quote escaping: (" + reference + ")");
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Takes in a 0-based base-10 column and returns a ALPHA-26
-     *  representation.
-     * eg column #3 -> D
-     */
-    public static String convertNumToColString(int col) {
-        // Excel counts column A as the 1st column, we
-        //  treat it as the 0th one
-        int excelColNum = col + 1;
-
-        StringBuilder colRef = new StringBuilder(2);
-        int colRemain = excelColNum;
-
-        while(colRemain > 0) {
-            int thisPart = colRemain % 26;
-            if(thisPart == 0) { thisPart = 26; }
-            colRemain = (colRemain - thisPart) / 26;
-
-            // The letter A is at 65
-            char colChar = (char)(thisPart+64);
-            colRef.insert(0, colChar);
-        }
-
-        return colRef.toString();
-    }
-
-    /**
-     * Returns a text representation of this cell reference.
-     * <p/>
-     *  Example return values:
-     *	<table border="0" cellpadding="1" cellspacing="0" summary="Example return values">
-     *	  <tr><th align='left'>Result</th><th align='left'>Comment</th></tr>
-     *	  <tr><td>A1</td><td>Cell reference without sheet</td></tr>
-     *	  <tr><td>Sheet1!A1</td><td>Standard sheet name</td></tr>
-     *	  <tr><td>'O''Brien''s Sales'!A1'&nbsp;</td><td>Sheet name with special characters</td></tr>
-     *	</table>
-     * @return the text representation of this cell reference as it would appear in a formula.
-     */
-    public String formatAsString() {
-        StringBuffer sb = new StringBuffer(32);
-        if(_sheetName != null) {
-            SheetNameFormatter.appendFormat(sb, _sheetName);
-            sb.append(SHEET_NAME_DELIMITER);
-        }
-        appendCellReference(sb);
-        return sb.toString();
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer(64);
-        sb.append(getClass().getName()).append(" [");
-        sb.append(formatAsString());
-        sb.append("]");
-        return sb.toString();
-    }
-
-    /**
-     * Returns the three parts of the cell reference, the
-     *  Sheet name (or null if none supplied), the 1 based
-     *  row number, and the A based column letter.
-     * This will not include any markers for absolute
-     *  references, so use {@link #formatAsString()}
-     *  to properly turn references into strings.
-     *  @return String array of { sheetName, rowString, colString }
-     */
-    public String[] getCellRefParts() {
-        return new String[] {
-                _sheetName,
-                Integer.toString(_rowIndex+1),
-                convertNumToColString(_colIndex)
-        };
-    }
-
-    /**
-     * Appends cell reference with '$' markers for absolute values as required.
-     * Sheet name is not included.
-     */
-    /* package */ void appendCellReference(StringBuffer sb) {
-        if (_colIndex != -1) {
-            if(_isColAbs) {
-                sb.append(ABSOLUTE_REFERENCE_MARKER);
-            }
-            sb.append( convertNumToColString(_colIndex));
-        }
-        if (_rowIndex != -1) {
-            if(_isRowAbs) {
-                sb.append(ABSOLUTE_REFERENCE_MARKER);
-            }
-            sb.append(_rowIndex+1);
-        }
-    }
-
-    /**
-     * Checks whether this cell reference is equal to another object.
-     * <p>
-     *  Two cells references are assumed to be equal if their string representations
-     *  ({@link #formatAsString()}  are equal.
-     * </p>
-     */
-    @Override
-    public boolean equals(Object o){
-        if (this == o) {
-            return true;
-        }
-        if(!(o instanceof CellReference)) {
-            return false;
-        }
-        CellReference cr = (CellReference) o;
-        return _rowIndex == cr._rowIndex
-                && _colIndex == cr._colIndex
-                && _isRowAbs == cr._isRowAbs
-                && _isColAbs == cr._isColAbs
-                && ((_sheetName == null)
-                        ? (cr._sheetName == null)
-                        : _sheetName.equals(cr._sheetName));
-    }
-
-    @Override
-    public int hashCode() {
-        int result = 17;
-        result = 31 * result + _rowIndex;
-        result = 31 * result + _colIndex;
-        result = 31 * result + (_isRowAbs ? 1 : 0);
-        result = 31 * result + (_isColAbs ? 1 : 0);
-        result = 31 * result + (_sheetName == null ? 0 : _sheetName.hashCode());
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/CellUtil.java b/trunk/src/java/org/apache/poi/ss/util/CellUtil.java
deleted file mode 100644
index 3dad83a..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/CellUtil.java
+++ /dev/null
@@ -1,749 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
-
-/**
- * Various utility functions that make working with a cells and rows easier. The various methods
- * that deal with style's allow you to create your CellStyles as you need them. When you apply a
- * style change to a cell, the code will attempt to see if a style already exists that meets your
- * needs. If not, then it will create a new style. This is to prevent creating too many styles.
- * there is an upper limit in Excel on the number of styles that can be supported.
- *
- *@author Eric Pugh epugh@upstate.com
- *@author (secondary) Avinash Kewalramani akewalramani@accelrys.com
- */
-public final class CellUtil {
-    
-    private static final POILogger log = POILogFactory.getLogger(CellUtil.class);
-
-    // FIXME: Move these constants into an enum
-    public static final String ALIGNMENT = "alignment";
-    public static final String BORDER_BOTTOM = "borderBottom";
-    public static final String BORDER_LEFT = "borderLeft";
-    public static final String BORDER_RIGHT = "borderRight";
-    public static final String BORDER_TOP = "borderTop";
-    public static final String BOTTOM_BORDER_COLOR = "bottomBorderColor";
-    public static final String LEFT_BORDER_COLOR = "leftBorderColor";
-    public static final String RIGHT_BORDER_COLOR = "rightBorderColor";
-    public static final String TOP_BORDER_COLOR = "topBorderColor";
-    public static final String DATA_FORMAT = "dataFormat";
-    public static final String FILL_BACKGROUND_COLOR = "fillBackgroundColor";
-    public static final String FILL_FOREGROUND_COLOR = "fillForegroundColor";
-    public static final String FILL_PATTERN = "fillPattern";
-    public static final String FONT = "font";
-    public static final String HIDDEN = "hidden";
-    public static final String INDENTION = "indention";
-    public static final String LOCKED = "locked";
-    public static final String ROTATION = "rotation";
-    public static final String VERTICAL_ALIGNMENT = "verticalAlignment";
-    public static final String WRAP_TEXT = "wrapText";
-    
-    private static final Set<String> shortValues = Collections.unmodifiableSet(
-            new HashSet<String>(Arrays.asList(
-                    BOTTOM_BORDER_COLOR,
-                    LEFT_BORDER_COLOR,
-                    RIGHT_BORDER_COLOR,
-                    TOP_BORDER_COLOR,
-                    FILL_FOREGROUND_COLOR,
-                    FILL_BACKGROUND_COLOR,
-                    INDENTION,
-                    DATA_FORMAT,
-                    FONT,
-                    ROTATION
-    )));
-    private static final Set<String> booleanValues = Collections.unmodifiableSet(
-            new HashSet<String>(Arrays.asList(
-                    LOCKED,
-                    HIDDEN,
-                    WRAP_TEXT
-    )));
-    private static final Set<String> borderTypeValues = Collections.unmodifiableSet(
-            new HashSet<String>(Arrays.asList(
-                    BORDER_BOTTOM,
-                    BORDER_LEFT,
-                    BORDER_RIGHT,
-                    BORDER_TOP
-    )));
-    
-
-
-    private static UnicodeMapping unicodeMappings[];
-
-    private static final class UnicodeMapping {
-
-        public final String entityName;
-        public final String resolvedValue;
-
-        public UnicodeMapping(String pEntityName, String pResolvedValue) {
-            entityName = "&" + pEntityName + ";";
-            resolvedValue = pResolvedValue;
-        }
-    }
-
-    private CellUtil() {
-        // no instances of this class
-    }
-
-    /**
-     * Get a row from the spreadsheet, and create it if it doesn't exist.
-     *
-     * @param rowIndex The 0 based row number
-     * @param sheet The sheet that the row is part of.
-     * @return The row indicated by the rowCounter
-     */
-    public static Row getRow(int rowIndex, Sheet sheet) {
-        Row row = sheet.getRow(rowIndex);
-        if (row == null) {
-            row = sheet.createRow(rowIndex);
-        }
-        return row;
-    }
-
-
-    /**
-     * Get a specific cell from a row. If the cell doesn't exist, then create it.
-     *
-     * @param row The row that the cell is part of
-     * @param columnIndex The column index that the cell is in.
-     * @return The cell indicated by the column.
-     */
-    public static Cell getCell(Row row, int columnIndex) {
-        Cell cell = row.getCell(columnIndex);
-
-        if (cell == null) {
-            cell = row.createCell(columnIndex);
-        }
-        return cell;
-    }
-
-
-    /**
-     * Creates a cell, gives it a value, and applies a style if provided
-     *
-     * @param  row     the row to create the cell in
-     * @param  column  the column index to create the cell in
-     * @param  value   The value of the cell
-     * @param  style   If the style is not null, then set
-     * @return         A new Cell
-     */
-    public static Cell createCell(Row row, int column, String value, CellStyle style) {
-        Cell cell = getCell(row, column);
-
-        cell.setCellValue(cell.getRow().getSheet().getWorkbook().getCreationHelper()
-                .createRichTextString(value));
-        if (style != null) {
-            cell.setCellStyle(style);
-        }
-        return cell;
-    }
-
-
-    /**
-     * Create a cell, and give it a value.
-     *
-     *@param  row     the row to create the cell in
-     *@param  column  the column index to create the cell in
-     *@param  value   The value of the cell
-     *@return         A new Cell.
-     */
-    public static Cell createCell(Row row, int column, String value) {
-        return createCell(row, column, value, null);
-    }
-
-    /**
-     * Take a cell, and align it.
-     * 
-     * This is superior to cell.getCellStyle().setAlignment(align) because
-     * this method will not modify the CellStyle object that may be referenced
-     * by multiple cells. Instead, this method will search for existing CellStyles
-     * that match the desired CellStyle, creating a new CellStyle with the desired
-     * style if no match exists.
-     *
-     * @param cell the cell to set the alignment for
-     * @param workbook The workbook that is being worked with.
-     * @param align the column alignment to use.
-     *
-     * @deprecated 3.15-beta2. Use {@link #setAlignment(Cell, HorizontalAlignment)} instead.
-     *
-     * @see CellStyle for alignment options
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    public static void setAlignment(Cell cell, Workbook workbook, short align) {
-        setAlignment(cell, HorizontalAlignment.forInt(align));
-    }
-
-    /**
-     * Take a cell, and align it.
-     * 
-     * This is superior to cell.getCellStyle().setAlignment(align) because
-     * this method will not modify the CellStyle object that may be referenced
-     * by multiple cells. Instead, this method will search for existing CellStyles
-     * that match the desired CellStyle, creating a new CellStyle with the desired
-     * style if no match exists.
-     *
-     * @param cell the cell to set the alignment for
-     * @param align the horizontal alignment to use.
-     *
-     * @see HorizontalAlignment for alignment options
-     * @since POI 3.15 beta 3
-     */
-    public static void setAlignment(Cell cell, HorizontalAlignment align) {
-        setCellStyleProperty(cell, ALIGNMENT, align);
-    }
-    
-    /**
-     * Take a cell, and vertically align it.
-     * 
-     * This is superior to cell.getCellStyle().setVerticalAlignment(align) because
-     * this method will not modify the CellStyle object that may be referenced
-     * by multiple cells. Instead, this method will search for existing CellStyles
-     * that match the desired CellStyle, creating a new CellStyle with the desired
-     * style if no match exists.
-     *
-     * @param cell the cell to set the alignment for
-     * @param align the vertical alignment to use.
-     *
-     * @see VerticalAlignment for alignment options
-     * @since POI 3.15 beta 3
-     */
-    public static void setVerticalAlignment(Cell cell, VerticalAlignment align) {
-        setCellStyleProperty(cell, VERTICAL_ALIGNMENT, align);
-    }
-    
-    /**
-     * Take a cell, and apply a font to it
-     *
-     * @param cell the cell to set the alignment for 
-     * @param workbook The workbook that is being worked with.
-     * @param font The Font that you want to set.
-     * @throws IllegalArgumentException if <tt>font</tt> and <tt>cell</tt> do not belong to the same workbook
-     *
-     * @deprecated 3.15-beta2. Use {@link #setFont(Cell, Font)} instead.
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    public static void setFont(Cell cell, Workbook workbook, Font font) {
-        setFont(cell, font);
-    }
-    
-    /**
-     * Take a cell, and apply a font to it
-     *
-     * @param cell the cell to set the alignment for
-     * @param font The Font that you want to set.
-     * @throws IllegalArgumentException if <tt>font</tt> and <tt>cell</tt> do not belong to the same workbook
-     */
-    public static void setFont(Cell cell, Font font) {
-        // Check if font belongs to workbook
-        Workbook wb = cell.getSheet().getWorkbook();
-        final short fontIndex = font.getIndex();
-        if (!wb.getFontAt(fontIndex).equals(font)) {
-            throw new IllegalArgumentException("Font does not belong to this workbook");
-        }
-
-        // Check if cell belongs to workbook
-        // (checked in setCellStyleProperty)
-
-        setCellStyleProperty(cell, FONT, fontIndex);
-    }
-
-    /**
-     * <p>This method attempts to find an existing CellStyle that matches the <code>cell</code>'s 
-     * current style plus styles properties in <code>properties</code>. A new style is created if the
-     * workbook does not contain a matching style.</p>
-     * 
-     * <p>Modifies the cell style of <code>cell</code> without affecting other cells that use the
-     * same style.</p>
-     * 
-     * <p>This is necessary because Excel has an upper limit on the number of styles that it supports.</p>
-     * 
-     * <p>This function is more efficient than multiple calls to
-     * {@link #setCellStyleProperty(org.apache.poi.ss.usermodel.Cell, org.apache.poi.ss.usermodel.Workbook, String, Object)}
-     * if adding multiple cell styles.</p>
-     * 
-     * <p>For performance reasons, if this is the only cell in a workbook that uses a cell style,
-     * this method does NOT remove the old style from the workbook.
-     * <!-- NOT IMPLEMENTED: Unused styles should be
-     * pruned from the workbook with [@link #removeUnusedCellStyles(Workbook)] or
-     * [@link #removeStyleFromWorkbookIfUnused(CellStyle, Workbook)]. -->
-     * </p>
-     *
-     * @param cell The cell to change the style of
-     * @param properties The properties to be added to a cell style, as {propertyName: propertyValue}.
-     * @since POI 3.14 beta 2
-     */
-    public static void setCellStyleProperties(Cell cell, Map<String, Object> properties) {
-        Workbook workbook = cell.getSheet().getWorkbook();
-        CellStyle originalStyle = cell.getCellStyle();
-        CellStyle newStyle = null;
-        Map<String, Object> values = getFormatProperties(originalStyle);
-        putAll(properties, values);
-
-        // index seems like what index the cellstyle is in the list of styles for a workbook.
-        // not good to compare on!
-        int numberCellStyles = workbook.getNumCellStyles();
-
-        for (int i = 0; i < numberCellStyles; i++) {
-            CellStyle wbStyle = workbook.getCellStyleAt(i);
-            Map<String, Object> wbStyleMap = getFormatProperties(wbStyle);
-
-            // the desired style already exists in the workbook. Use the existing style.
-            if (wbStyleMap.equals(values)) {
-                newStyle = wbStyle;
-                break;
-            }
-        }
-
-        // the desired style does not exist in the workbook. Create a new style with desired properties.
-        if (newStyle == null) {
-            newStyle = workbook.createCellStyle();
-            setFormatProperties(newStyle, workbook, values);
-        }
-
-        cell.setCellStyle(newStyle);
-    }
-
-    /**
-     * <p>This method attempts to find an existing CellStyle that matches the <code>cell</code>'s
-     * current style plus a single style property <code>propertyName</code> with value
-     * <code>propertyValue<code>.
-     * A new style is created if the workbook does not contain a matching style.</p>
-     * 
-     * <p>Modifies the cell style of <code>cell</code> without affecting other cells that use the
-     * same style.</p>
-     * 
-     * <p>If setting more than one cell style property on a cell, use
-     * {@link #setCellStyleProperties(org.apache.poi.ss.usermodel.Cell, Map)},
-     * which is faster and does not add unnecessary intermediate CellStyles to the workbook.</p>
-     * 
-     * @param cell The cell that is to be changed.
-     * @param workbook The workbook that is being worked with.
-     * @param propertyName The name of the property that is to be changed.
-     * @param propertyValue The value of the property that is to be changed.
-     * 
-     * @deprecated 3.15-beta2. Use {@link #setCellStyleProperty(Cell, String, Object)} instead.
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    public static void setCellStyleProperty(Cell cell, Workbook workbook, String propertyName,
-            Object propertyValue) {
-        setCellStyleProperty(cell, propertyName, propertyValue);
-    }
-
-    /**
-     * <p>This method attempts to find an existing CellStyle that matches the <code>cell</code>'s
-     * current style plus a single style property <code>propertyName</code> with value
-     * <code>propertyValue</code>.
-     * A new style is created if the workbook does not contain a matching style.</p>
-     * 
-     * <p>Modifies the cell style of <code>cell</code> without affecting other cells that use the
-     * same style.</p>
-     * 
-     * <p>If setting more than one cell style property on a cell, use
-     * {@link #setCellStyleProperties(org.apache.poi.ss.usermodel.Cell, Map)},
-     * which is faster and does not add unnecessary intermediate CellStyles to the workbook.</p>
-     * 
-     * @param cell The cell that is to be changed.
-     * @param propertyName The name of the property that is to be changed.
-     * @param propertyValue The value of the property that is to be changed.
-     */
-    public static void setCellStyleProperty(Cell cell, String propertyName, Object propertyValue) {
-        Map<String, Object> property = Collections.singletonMap(propertyName, propertyValue);
-        setCellStyleProperties(cell, property);
-    }
-
-    /**
-     * Returns a map containing the format properties of the given cell style.
-     * The returned map is not tied to <code>style</code>, so subsequent changes
-     * to <code>style</code> will not modify the map, and changes to the returned
-     * map will not modify the cell style. The returned map is mutable.
-     *
-     * @param style cell style
-     * @return map of format properties (String -> Object)
-     * @see #setFormatProperties(org.apache.poi.ss.usermodel.CellStyle, org.apache.poi.ss.usermodel.Workbook, java.util.Map)
-     */
-    private static Map<String, Object> getFormatProperties(CellStyle style) {
-        Map<String, Object> properties = new HashMap<String, Object>();
-        put(properties, ALIGNMENT, style.getAlignmentEnum());
-        put(properties, VERTICAL_ALIGNMENT, style.getVerticalAlignmentEnum());
-        put(properties, BORDER_BOTTOM, style.getBorderBottomEnum());
-        put(properties, BORDER_LEFT, style.getBorderLeftEnum());
-        put(properties, BORDER_RIGHT, style.getBorderRightEnum());
-        put(properties, BORDER_TOP, style.getBorderTopEnum());
-        put(properties, BOTTOM_BORDER_COLOR, style.getBottomBorderColor());
-        put(properties, DATA_FORMAT, style.getDataFormat());
-        put(properties, FILL_PATTERN, style.getFillPatternEnum());
-        put(properties, FILL_FOREGROUND_COLOR, style.getFillForegroundColor());
-        put(properties, FILL_BACKGROUND_COLOR, style.getFillBackgroundColor());
-        put(properties, FONT, style.getFontIndex());
-        put(properties, HIDDEN, style.getHidden());
-        put(properties, INDENTION, style.getIndention());
-        put(properties, LEFT_BORDER_COLOR, style.getLeftBorderColor());
-        put(properties, LOCKED, style.getLocked());
-        put(properties, RIGHT_BORDER_COLOR, style.getRightBorderColor());
-        put(properties, ROTATION, style.getRotation());
-        put(properties, TOP_BORDER_COLOR, style.getTopBorderColor());
-        put(properties, WRAP_TEXT, style.getWrapText());
-        return properties;
-    }
-    
-    /**
-     * Copies the entries in src to dest, using the preferential data type
-     * so that maps can be compared for equality
-     *
-     * @param src the property map to copy from (read-only)
-     * @param dest the property map to copy into
-     * @since POI 3.15 beta 3
-     */
-    private static void putAll(final Map<String, Object> src, Map<String, Object> dest) {
-        for (final String key : src.keySet()) {
-            if (shortValues.contains(key)) {
-                dest.put(key, getShort(src, key));
-            } else if (booleanValues.contains(key)) {
-                dest.put(key, getBoolean(src, key));
-            } else if (borderTypeValues.contains(key)) {
-                dest.put(key, getBorderStyle(src, key));
-            } else if (ALIGNMENT.equals(key)) {
-                dest.put(key, getHorizontalAlignment(src, key));
-            } else if (VERTICAL_ALIGNMENT.equals(key)) {
-                dest.put(key, getVerticalAlignment(src, key));
-            } else if (FILL_PATTERN.equals(key)) {
-                dest.put(key, getFillPattern(src, key));
-            } else {
-                if (log.check(POILogger.INFO)) {
-                    log.log(POILogger.INFO, "Ignoring unrecognized CellUtil format properties key: " + key);
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets the format properties of the given style based on the given map.
-     *
-     * @param style cell style
-     * @param workbook parent workbook
-     * @param properties map of format properties (String -> Object)
-     * @see #getFormatProperties(CellStyle)
-     */
-    private static void setFormatProperties(CellStyle style, Workbook workbook, Map<String, Object> properties) {
-        style.setAlignment(getHorizontalAlignment(properties, ALIGNMENT));
-        style.setVerticalAlignment(getVerticalAlignment(properties, VERTICAL_ALIGNMENT));
-        style.setBorderBottom(getBorderStyle(properties, BORDER_BOTTOM));
-        style.setBorderLeft(getBorderStyle(properties, BORDER_LEFT));
-        style.setBorderRight(getBorderStyle(properties, BORDER_RIGHT));
-        style.setBorderTop(getBorderStyle(properties, BORDER_TOP));
-        style.setBottomBorderColor(getShort(properties, BOTTOM_BORDER_COLOR));
-        style.setDataFormat(getShort(properties, DATA_FORMAT));
-        style.setFillPattern(getFillPattern(properties, FILL_PATTERN));
-        style.setFillForegroundColor(getShort(properties, FILL_FOREGROUND_COLOR));
-        style.setFillBackgroundColor(getShort(properties, FILL_BACKGROUND_COLOR));
-        style.setFont(workbook.getFontAt(getShort(properties, FONT)));
-        style.setHidden(getBoolean(properties, HIDDEN));
-        style.setIndention(getShort(properties, INDENTION));
-        style.setLeftBorderColor(getShort(properties, LEFT_BORDER_COLOR));
-        style.setLocked(getBoolean(properties, LOCKED));
-        style.setRightBorderColor(getShort(properties, RIGHT_BORDER_COLOR));
-        style.setRotation(getShort(properties, ROTATION));
-        style.setTopBorderColor(getShort(properties, TOP_BORDER_COLOR));
-        style.setWrapText(getBoolean(properties, WRAP_TEXT));
-    }
-
-    /**
-     * Utility method that returns the named short value form the given map.
-     *
-     * @param properties map of named properties (String -> Object)
-     * @param name property name
-     * @return zero if the property does not exist, or is not a {@link Short}
-     *         otherwise the property value
-     */
-    private static short getShort(Map<String, Object> properties, String name) {
-        Object value = properties.get(name);
-        if (value instanceof Short) {
-            return ((Short) value).shortValue();
-        }
-        return 0;
-    }
-    
-    /**
-     * Utility method that returns the named BorderStyle value form the given map.
-     *
-     * @param properties map of named properties (String -> Object)
-     * @param name property name
-     * @return Border style if set, otherwise {@link BorderStyle#NONE}
-     */
-    private static BorderStyle getBorderStyle(Map<String, Object> properties, String name) {
-        Object value = properties.get(name);
-        BorderStyle border;
-        if (value instanceof BorderStyle) {
-            border = (BorderStyle) value;
-        }
-        // @deprecated 3.15 beta 2. getBorderStyle will only work on BorderStyle enums instead of codes in the future.
-        else if (value instanceof Short) {
-            if (log.check(POILogger.WARN)) {
-                log.log(POILogger.WARN, "Deprecation warning: CellUtil properties map uses Short values for "
-                        + name + ". Should use BorderStyle enums instead.");
-            }
-            System.out.println("BorderStyle short usage");
-            short code = ((Short) value).shortValue();
-            border = BorderStyle.valueOf(code);
-        }
-        else if (value == null) {
-            border = BorderStyle.NONE;
-        }
-        else {
-            throw new RuntimeException("Unexpected border style class. Must be BorderStyle or Short (deprecated).");
-        }
-        return border;
-    }
-    
-    /**
-     * Utility method that returns the named FillPatternType value form the given map.
-     *
-     * @param properties map of named properties (String -> Object)
-     * @param name property name
-     * @return FillPatternType style if set, otherwise {@link FillPatternType#NO_FILL}
-     * @since POI 3.15 beta 3
-     */
-    private static FillPatternType getFillPattern(Map<String, Object> properties, String name) {
-        Object value = properties.get(name);
-        FillPatternType pattern;
-        if (value instanceof FillPatternType) {
-            pattern = (FillPatternType) value;
-        }
-        // @deprecated 3.15 beta 2. getFillPattern will only work on FillPatternType enums instead of codes in the future.
-        else if (value instanceof Short) {
-            if (log.check(POILogger.WARN)) {
-                log.log(POILogger.WARN, "Deprecation warning: CellUtil properties map uses Short values for "
-                        + name + ". Should use FillPatternType enums instead.");
-            }
-            System.out.println("FillPatternType short usage");
-            short code = ((Short) value).shortValue();
-            pattern = FillPatternType.forInt(code);
-        }
-        else if (value == null) {
-            pattern = FillPatternType.NO_FILL;
-        }
-        else {
-            throw new RuntimeException("Unexpected fill pattern style class. Must be FillPatternType or Short (deprecated).");
-        }
-        return pattern;
-    }
-    
-    /**
-     * Utility method that returns the named HorizontalAlignment value form the given map.
-     *
-     * @param properties map of named properties (String -> Object)
-     * @param name property name
-     * @return HorizontalAlignment style if set, otherwise {@link HorizontalAlignment#GENERAL}
-     * @since POI 3.15 beta 3
-     */
-    private static HorizontalAlignment getHorizontalAlignment(Map<String, Object> properties, String name) {
-        Object value = properties.get(name);
-        HorizontalAlignment align;
-        if (value instanceof HorizontalAlignment) {
-            align = (HorizontalAlignment) value;
-        }
-        // @deprecated 3.15 beta 2. getHorizontalAlignment will only work on HorizontalAlignment enums instead of codes in the future.
-        else if (value instanceof Short) {
-            if (log.check(POILogger.WARN)) {
-                log.log(POILogger.WARN, "Deprecation warning: CellUtil properties map used a Short value for "
-                        + name + ". Should use HorizontalAlignment enums instead.");
-            }
-            System.out.println("HorizontalAlignment short usage");
-            short code = ((Short) value).shortValue();
-            align = HorizontalAlignment.forInt(code);
-        }
-        else if (value == null) {
-            align = HorizontalAlignment.GENERAL;
-        }
-        else {
-            throw new RuntimeException("Unexpected horizontal alignment style class. Must be HorizontalAlignment or Short (deprecated).");
-        }
-        return align;
-    }
-    
-    /**
-     * Utility method that returns the named VerticalAlignment value form the given map.
-     *
-     * @param properties map of named properties (String -> Object)
-     * @param name property name
-     * @return VerticalAlignment style if set, otherwise {@link VerticalAlignment#BOTTOM}
-     * @since POI 3.15 beta 3
-     */
-    private static VerticalAlignment getVerticalAlignment(Map<String, Object> properties, String name) {
-        Object value = properties.get(name);
-        VerticalAlignment align;
-        if (value instanceof VerticalAlignment) {
-            align = (VerticalAlignment) value;
-        }
-        // @deprecated 3.15 beta 2. getVerticalAlignment will only work on VerticalAlignment enums instead of codes in the future.
-        else if (value instanceof Short) {
-            if (log.check(POILogger.WARN)) {
-                log.log(POILogger.WARN, "Deprecation warning: CellUtil properties map used a Short value for "
-                        + name + ". Should use VerticalAlignment enums instead.");
-            }
-            System.out.println("VerticalAlignment usage " + name + " " + value);
-            short code = ((Short) value).shortValue();
-            align = VerticalAlignment.forInt(code);
-        }
-        else if (value == null) {
-            align = VerticalAlignment.BOTTOM;
-        }
-        else {
-            throw new RuntimeException("Unexpected vertical alignment style class. Must be VerticalAlignment or Short (deprecated).");
-        }
-        return align;
-    }
-
-    /**
-     * Utility method that returns the named boolean value form the given map.
-     *
-     * @param properties map of properties (String -> Object)
-     * @param name property name
-     * @return false if the property does not exist, or is not a {@link Boolean},
-     *         true otherwise
-     */
-    private static boolean getBoolean(Map<String, Object> properties, String name) {
-        Object value = properties.get(name);
-        //noinspection SimplifiableIfStatement
-        if (value instanceof Boolean) {
-            return ((Boolean) value).booleanValue();
-        }
-        return false;
-    }
-    
-    /**
-     * Utility method that puts the given value to the given map.
-     *
-     * @param properties map of properties (String -> Object)
-     * @param name property name
-     * @param value property value
-     */
-    private static void put(Map<String, Object> properties, String name, Object value) {
-        properties.put(name, value);
-    }
-
-    /**
-     * Utility method that puts the named short value to the given map.
-     *
-     * @param properties map of properties (String -> Object)
-     * @param name property name
-     * @param value property value
-     */
-    private static void putShort(Map<String, Object> properties, String name, short value) {
-        properties.put(name, value);
-    }
-    
-    /**
-     * Utility method that puts the named BorderStyle, HorizontalAlignment, VerticalAlignment, etc
-     * value to the given map.
-     *
-     * @param properties map of properties (String -> Object)
-     * @param name property name
-     * @param value property value
-     */
-    private static void putEnum(Map<String, Object> properties, String name, Enum<?> value) {
-        properties.put(name, value);
-    }
-
-    /**
-     * Utility method that puts the named boolean value to the given map.
-     *
-     * @param properties map of properties (String -> Object)
-     * @param name property name
-     * @param value property value
-     */
-    private static void putBoolean(Map<String, Object> properties, String name, boolean value) {
-        properties.put(name, value);
-    }
-
-    /**
-     *  Looks for text in the cell that should be unicode, like &alpha; and provides the
-     *  unicode version of it.
-     *
-     *@param  cell  The cell to check for unicode values
-     *@return       translated to unicode
-     */
-    public static Cell translateUnicodeValues(Cell cell) {
-
-        String s = cell.getRichStringCellValue().getString();
-        boolean foundUnicode = false;
-        String lowerCaseStr = s.toLowerCase(Locale.ROOT);
-
-        for (UnicodeMapping entry : unicodeMappings) {
-            String key = entry.entityName;
-            if (lowerCaseStr.contains(key)) {
-                s = s.replaceAll(key, entry.resolvedValue);
-                foundUnicode = true;
-            }
-        }
-        if (foundUnicode) {
-            cell.setCellValue(cell.getRow().getSheet().getWorkbook().getCreationHelper()
-                    .createRichTextString(s));
-        }
-        return cell;
-    }
-
-    static {
-        unicodeMappings = new UnicodeMapping[] {
-            um("alpha",   "\u03B1" ),
-            um("beta",    "\u03B2" ),
-            um("gamma",   "\u03B3" ),
-            um("delta",   "\u03B4" ),
-            um("epsilon", "\u03B5" ),
-            um("zeta",    "\u03B6" ),
-            um("eta",     "\u03B7" ),
-            um("theta",   "\u03B8" ),
-            um("iota",    "\u03B9" ),
-            um("kappa",   "\u03BA" ),
-            um("lambda",  "\u03BB" ),
-            um("mu",      "\u03BC" ),
-            um("nu",      "\u03BD" ),
-            um("xi",      "\u03BE" ),
-            um("omicron", "\u03BF" ),
-        };
-    }
-
-    private static UnicodeMapping um(String entityName, String resolvedValue) {
-        return new UnicodeMapping(entityName, resolvedValue);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java b/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java
deleted file mode 100644
index 6339a6e..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.util;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- *  Convert java DateFormat patterns into Excel custom number formats.
- *  For example, to format a date in excel using the "dd MMMM, yyyy" pattern and Japanese
- *  locale, use the following code:
- *
- *  <pre><code>
- *      // returns "[$-0411]dd MMMM, yyyy;@" where the [$-0411] prefix tells Excel to use the Japanese locale
- *      String excelFormatPattern = DateFormatConverter.convert(Locale.JAPANESE, "dd MMMM, yyyy");
- *
- *      CellStyle cellStyle = workbook.createCellStyle();
- *
- *      DataFormat poiFormat = workbook.createDataFormat();
- *      cellStyle.setDataFormat(poiFormat.getFormat(excelFormatPattern));
- *      cell.setCellValue(new Date());
- *      cell.setCellStyle(cellStyle);  // formats date as '2012\u5e743\u670817\u65e5'
- *  </code></pre>
- *
- * TODO Generalise this for all Excel format strings
- */
-public class DateFormatConverter  {
-	private static POILogger logger = POILogFactory.getLogger(DateFormatConverter.class);
-	
-	public static class DateFormatTokenizer {
-		String format;
-		int pos;
-		
-		public DateFormatTokenizer(String format) {
-			this.format = format;
-		}
-		
-		public String getNextToken() {
-			if( pos >= format.length() ) {
-				return null;
-			}
-			int subStart = pos;
-			char curChar = format.charAt(pos);
-			++pos;
-			if( curChar == '\'' ) {
-				while( ( pos < format.length() ) && ( ( curChar = format.charAt(pos) ) != '\'' ) ) {
-					++pos;
-				}
-				if( pos < format.length() ) {
-					++pos;
-				}
-			} else {
-				char activeChar = curChar;
-				while( ( pos < format.length() ) && ( ( curChar = format.charAt(pos) ) == activeChar ) ) {
-					++pos;
-				}
-			}
-			return format.substring(subStart,pos);
-		}
-		
-		public static String[] tokenize( String format ) {
-			List<String> result = new ArrayList<String>();
-			
-			DateFormatTokenizer tokenizer = new DateFormatTokenizer(format);
-			String token;
-			while( ( token = tokenizer.getNextToken() ) != null ) {
-				result.add(token);
-			}
-			
-			return result.toArray(new String[0]);
-		}
-		
-		@Override
-		public String toString() {
-			StringBuilder result = new StringBuilder();
-			
-			DateFormatTokenizer tokenizer = new DateFormatTokenizer(format);
-			String token;
-			while( ( token = tokenizer.getNextToken() ) != null ) {
-				if( result.length() > 0 ) {
-					result.append( ", " );
-				}
-				result.append("[").append(token).append("]");
-			}
-			
-			return result.toString();
-		}		
-	}		
-	
-	private static Map<String,String> tokenConversions = prepareTokenConversions();
-	private static Map<String,String> localePrefixes = prepareLocalePrefixes();
-	
-	private static Map<String,String> prepareTokenConversions() {
-		Map<String,String> result = new HashMap<String,String>();
-		
-		result.put( "EEEE", "dddd" );
-		result.put( "EEE", "ddd" );
-		result.put( "EE", "ddd" );
-		result.put( "E", "d" );
-		result.put( "Z", "" );
-		result.put( "z", "" );
-		result.put( "a", "am/pm" );
-		result.put( "A", "AM/PM" );
-		result.put( "K", "H" );
-		result.put( "KK", "HH" );
-		result.put( "k", "h" );
-		result.put( "kk", "hh" );
-		result.put( "S", "0" );
-		result.put( "SS", "00" );
-		result.put( "SSS", "000" );
-		
-		return result;
-	}
-	
-	private static Map<String,String> prepareLocalePrefixes() {
-		Map<String,String> result = new HashMap<String,String>();
-		
-		result.put( "af", "[$-0436]" );
-		result.put( "am", "[$-45E]" );
-		result.put( "ar_ae", "[$-3801]" );
-		result.put( "ar_bh", "[$-3C01]" );
-		result.put( "ar_dz", "[$-1401]" );
-		result.put( "ar_eg", "[$-C01]" );
-		result.put( "ar_iq", "[$-0801]" );
-		result.put( "ar_jo", "[$-2C01]" );
-		result.put( "ar_kw", "[$-3401]" );
-		result.put( "ar_lb", "[$-3001]" );
-		result.put( "ar_ly", "[$-1001]" );
-		result.put( "ar_ma", "[$-1801]" );
-		result.put( "ar_om", "[$-2001]" );
-		result.put( "ar_qa", "[$-4001]" );
-		result.put( "ar_sa", "[$-0401]" );
-		result.put( "ar_sy", "[$-2801]" );
-		result.put( "ar_tn", "[$-1C01]" );
-		result.put( "ar_ye", "[$-2401]" );
-		result.put( "as", "[$-44D]" );
-		result.put( "az_az", "[$-82C]" );
-		result.put( "az_az", "[$-42C]" );
-		result.put( "be", "[$-0423]" );
-		result.put( "bg", "[$-0402]" );
-		result.put( "bn", "[$-0845]" );
-		result.put( "bn", "[$-0445]" );
-		result.put( "bo", "[$-0451]" );
-		result.put( "bs", "[$-141A]" );
-		result.put( "ca", "[$-0403]" );
-		result.put( "cs", "[$-0405]" );
-		result.put( "cy", "[$-0452]" );
-		result.put( "da", "[$-0406]" );
-		result.put( "de_at", "[$-C07]" );
-		result.put( "de_ch", "[$-0807]" );
-		result.put( "de_de", "[$-0407]" );
-		result.put( "de_li", "[$-1407]" );
-		result.put( "de_lu", "[$-1007]" );
-		result.put( "dv", "[$-0465]" );
-		result.put( "el", "[$-0408]" );
-		result.put( "en_au", "[$-C09]" );
-		result.put( "en_bz", "[$-2809]" );
-		result.put( "en_ca", "[$-1009]" );
-		result.put( "en_cb", "[$-2409]" );
-		result.put( "en_gb", "[$-0809]" );
-		result.put( "en_ie", "[$-1809]" );
-		result.put( "en_in", "[$-4009]" );
-		result.put( "en_jm", "[$-2009]" );
-		result.put( "en_nz", "[$-1409]" );
-		result.put( "en_ph", "[$-3409]" );
-		result.put( "en_tt", "[$-2C09]" );
-		result.put( "en_us", "[$-0409]" );
-		result.put( "en_za", "[$-1C09]" );
-		result.put( "es_ar", "[$-2C0A]" );
-		result.put( "es_bo", "[$-400A]" );
-		result.put( "es_cl", "[$-340A]" );
-		result.put( "es_co", "[$-240A]" );
-		result.put( "es_cr", "[$-140A]" );
-		result.put( "es_do", "[$-1C0A]" );
-		result.put( "es_ec", "[$-300A]" );
-		result.put( "es_es", "[$-40A]" );
-		result.put( "es_gt", "[$-100A]" );
-		result.put( "es_hn", "[$-480A]" );
-		result.put( "es_mx", "[$-80A]" );
-		result.put( "es_ni", "[$-4C0A]" );
-		result.put( "es_pa", "[$-180A]" );
-		result.put( "es_pe", "[$-280A]" );
-		result.put( "es_pr", "[$-500A]" );
-		result.put( "es_py", "[$-3C0A]" );
-		result.put( "es_sv", "[$-440A]" );
-		result.put( "es_uy", "[$-380A]" );
-		result.put( "es_ve", "[$-200A]" );
-		result.put( "et", "[$-0425]" );
-		result.put( "eu", "[$-42D]" );
-		result.put( "fa", "[$-0429]" );
-		result.put( "fi", "[$-40B]" );
-		result.put( "fo", "[$-0438]" );
-		result.put( "fr_be", "[$-80C]" );
-		result.put( "fr_ca", "[$-C0C]" );
-		result.put( "fr_ch", "[$-100C]" );
-		result.put( "fr_fr", "[$-40C]" );
-		result.put( "fr_lu", "[$-140C]" );
-		result.put( "gd", "[$-43C]" );
-		result.put( "gd_ie", "[$-83C]" );
-		result.put( "gn", "[$-0474]" );
-		result.put( "gu", "[$-0447]" );
-		result.put( "he", "[$-40D]" );
-		result.put( "hi", "[$-0439]" );
-		result.put( "hr", "[$-41A]" );
-		result.put( "hu", "[$-40E]" );
-		result.put( "hy", "[$-42B]" );
-		result.put( "id", "[$-0421]" );
-		result.put( "is", "[$-40F]" );
-		result.put( "it_ch", "[$-0810]" );
-		result.put( "it_it", "[$-0410]" );
-		result.put( "ja", "[$-0411]" );
-		result.put( "kk", "[$-43F]" );
-		result.put( "km", "[$-0453]" );
-		result.put( "kn", "[$-44B]" );
-		result.put( "ko", "[$-0412]" );
-		result.put( "ks", "[$-0460]" );
-		result.put( "la", "[$-0476]" );
-		result.put( "lo", "[$-0454]" );
-		result.put( "lt", "[$-0427]" );
-		result.put( "lv", "[$-0426]" );
-		result.put( "mi", "[$-0481]" );
-		result.put( "mk", "[$-42F]" );
-		result.put( "ml", "[$-44C]" );
-		result.put( "mn", "[$-0850]" );
-		result.put( "mn", "[$-0450]" );
-		result.put( "mr", "[$-44E]" );
-		result.put( "ms_bn", "[$-83E]" );
-		result.put( "ms_my", "[$-43E]" );
-		result.put( "mt", "[$-43A]" );
-		result.put( "my", "[$-0455]" );
-		result.put( "ne", "[$-0461]" );
-		result.put( "nl_be", "[$-0813]" );
-		result.put( "nl_nl", "[$-0413]" );
-		result.put( "no_no", "[$-0814]" );
-		result.put( "or", "[$-0448]" );
-		result.put( "pa", "[$-0446]" );
-		result.put( "pl", "[$-0415]" );
-		result.put( "pt_br", "[$-0416]" );
-		result.put( "pt_pt", "[$-0816]" );
-		result.put( "rm", "[$-0417]" );
-		result.put( "ro", "[$-0418]" );
-		result.put( "ro_mo", "[$-0818]" );
-		result.put( "ru", "[$-0419]" );
-		result.put( "ru_mo", "[$-0819]" );
-		result.put( "sa", "[$-44F]" );
-		result.put( "sb", "[$-42E]" );
-		result.put( "sd", "[$-0459]" );
-		result.put( "si", "[$-45B]" );
-		result.put( "sk", "[$-41B]" );
-		result.put( "sl", "[$-0424]" );
-		result.put( "so", "[$-0477]" );
-		result.put( "sq", "[$-41C]" );
-		result.put( "sr_sp", "[$-C1A]" );
-		result.put( "sr_sp", "[$-81A]" );
-		result.put( "sv_fi", "[$-81D]" );
-		result.put( "sv_se", "[$-41D]" );
-		result.put( "sw", "[$-0441]" );
-		result.put( "ta", "[$-0449]" );
-		result.put( "te", "[$-44A]" );
-		result.put( "tg", "[$-0428]" );
-		result.put( "th", "[$-41E]" );
-		result.put( "tk", "[$-0442]" );
-		result.put( "tn", "[$-0432]" );
-		result.put( "tr", "[$-41F]" );
-		result.put( "ts", "[$-0431]" );
-		result.put( "tt", "[$-0444]" );
-		result.put( "uk", "[$-0422]" );
-		result.put( "ur", "[$-0420]" );
-		result.put( "UTF_8", "[$-0000]" );
-		result.put( "uz_uz", "[$-0843]" );
-		result.put( "uz_uz", "[$-0443]" );
-		result.put( "vi", "[$-42A]" );
-		result.put( "xh", "[$-0434]" );
-		result.put( "yi", "[$-43D]" );
-		result.put( "zh_cn", "[$-0804]" );
-		result.put( "zh_hk", "[$-C04]" );
-		result.put( "zh_mo", "[$-1404]" );
-		result.put( "zh_sg", "[$-1004]" );
-		result.put( "zh_tw", "[$-0404]" );
-		result.put( "zu", "[$-0435]" );
-
-		result.put( "ar", "[$-0401]" );
-		result.put( "bn", "[$-0845]" );
-		result.put( "de", "[$-0407]" );
-		result.put( "en", "[$-0409]" );
-		result.put( "es", "[$-40A]" );
-		result.put( "fr", "[$-40C]" );
-		result.put( "it", "[$-0410]" );
-		result.put( "ms", "[$-43E]" );
-		result.put( "nl", "[$-0413]" );
-		result.put( "nn", "[$-0814]" );
-		result.put( "no", "[$-0414]" );
-		result.put( "pt", "[$-0816]" );
-		result.put( "sr", "[$-C1A]" );
-		result.put( "sv", "[$-41D]" );
-		result.put( "uz", "[$-0843]" );
-		result.put( "zh", "[$-0804]" );
-		
-		result.put( "ga", "[$-43C]" );
-		result.put( "ga_ie", "[$-83C]" );
-		result.put( "in", "[$-0421]" );
-		result.put( "iw", "[$-40D]" );
-		
-		// JDK 8 adds an empty locale-string, see also https://issues.apache.org/jira/browse/LANG-941
-		result.put( "", "[$-0409]" );
-		
-		return result;
-	}
-	
-	public static String getPrefixForLocale( Locale locale ) {
-		String localeString = locale.toString().toLowerCase(locale);
-		String result = localePrefixes.get( localeString );
-		if( result == null ) {
-			result = localePrefixes.get( localeString.substring( 0, 2 ) );
-			if( result ==  null ) {
-				Locale parentLocale = new Locale(localeString.substring( 0, 2 ));
-				logger.log( POILogger.ERROR, "Unable to find prefix for " + locale + "(" + locale.getDisplayName(Locale.ROOT) + ") or " 
-						+ localeString.substring( 0, 2 ) + "(" + parentLocale.getDisplayName(Locale.ROOT) + ")" );
-				return "";
-			}
-		}
-		return result;
-	}
-
-    public static String convert( Locale locale, DateFormat df ) {
-        String ptrn = ((SimpleDateFormat)df).toPattern();
-        return convert(locale, ptrn);
-    }
-
-    public static String convert( Locale locale, String format ) {
-		StringBuilder result = new StringBuilder();
-		
-		result.append(getPrefixForLocale(locale));
-		DateFormatTokenizer tokenizer = new DateFormatTokenizer(format);
-		String token;
-		while( ( token = tokenizer.getNextToken() ) != null ) {
-			if( token.startsWith("'") ) {
-				result.append( token.replaceAll("'", "\"") );
-			} else if( ! Character.isLetter( token.charAt( 0 ) ) ) {
-				result.append( token );
-			} else {
-				// It's a code, translate it if necessary
-				String mappedToken = tokenConversions.get(token);
-				result.append( mappedToken == null ? token : mappedToken );
-			}
-		}
-        result.append(";@");
-		return result.toString().trim();
-	}
-	
-	public static String getJavaDatePattern(int style, Locale locale) {
-    	DateFormat df = DateFormat.getDateInstance(style, locale);
-    	if( df instanceof SimpleDateFormat ) {
-    		return ((SimpleDateFormat)df).toPattern();
-    	} else {
-    		switch( style ) {
-    		case DateFormat.SHORT:
-    			return "d/MM/yy";
-    		case DateFormat.MEDIUM:
-    			return "MMM d, yyyy";
-    		case DateFormat.LONG:
-    			return "MMMM d, yyyy";
-    		case DateFormat.FULL:
-    			return "dddd, MMMM d, yyyy";
-    		default:
-    			return "MMM d, yyyy";
-    		}
-    	}
-	}
-	
-	public static String getJavaTimePattern(int style, Locale locale) {
-    	DateFormat df = DateFormat.getTimeInstance(style, locale);
-    	if( df instanceof SimpleDateFormat ) {
-    		return ((SimpleDateFormat)df).toPattern();
-    	} else {
-    		switch( style ) {
-    		case DateFormat.SHORT:
-    			return "h:mm a";
-    		case DateFormat.MEDIUM:
-    			return "h:mm:ss a";
-    		case DateFormat.LONG:
-    			return "h:mm:ss a";
-    		case DateFormat.FULL:
-    			return "h:mm:ss a";
-    		default:
-    			return "h:mm:ss a";
-    		}
-    	}
-	}
-	
-	public static String getJavaDateTimePattern(int style, Locale locale) {
-    	DateFormat df = DateFormat.getDateTimeInstance(style, style, locale);
-    	if( df instanceof SimpleDateFormat ) {
-    		return ((SimpleDateFormat)df).toPattern();
-    	} else {
-    		switch( style ) {
-    		case DateFormat.SHORT:
-    			return "M/d/yy h:mm a";
-    		case DateFormat.MEDIUM:
-    			return "MMM d, yyyy h:mm:ss a";
-    		case DateFormat.LONG:
-    			return "MMMM d, yyyy h:mm:ss a";
-    		case DateFormat.FULL:
-    			return "dddd, MMMM d, yyyy h:mm:ss a";
-    		default:
-    			return "MMM d, yyyy h:mm:ss a";
-    		}
-    	}
-	}
-		
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java b/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java
deleted file mode 100644
index 41827df..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.math.BigInteger;
-import static org.apache.poi.ss.util.IEEEDouble.*;
-
-/**
- * Represents a 64 bit IEEE double quantity expressed with both decimal and binary exponents
- * Does not handle negative numbers or zero
- * <p/>
- * The value of a {@link ExpandedDouble} is given by<br/>
- * <tt> a &times; 2<sup>b</sup></tt>
- * <br/>
- * where:<br/>
- *
- * <tt>a</tt> = <i>significand</i><br/>
- * <tt>b</tt> = <i>binaryExponent</i> - bitLength(significand) + 1<br/>
- *
- * @author Josh Micich
- */
-final class ExpandedDouble {
-	private static final BigInteger BI_FRAC_MASK = BigInteger.valueOf(FRAC_MASK);
-	private static final BigInteger BI_IMPLIED_FRAC_MSB = BigInteger.valueOf(FRAC_ASSUMED_HIGH_BIT);
-
-	private static BigInteger getFrac(long rawBits) {
-		return BigInteger.valueOf(rawBits).and(BI_FRAC_MASK).or(BI_IMPLIED_FRAC_MSB).shiftLeft(11);
-	}
-
-
-	public static ExpandedDouble fromRawBitsAndExponent(long rawBits, int exp) {
-		return new ExpandedDouble(getFrac(rawBits), exp);
-	}
-
-	/**
-	 * Always 64 bits long (MSB, bit-63 is '1')
-	 */
-	private final BigInteger _significand;
-	private final int _binaryExponent;
-
-	public ExpandedDouble(long rawBits) {
-		int biasedExp = (int) (rawBits >> 52);
-		if (biasedExp == 0) {
-			// sub-normal numbers
-			BigInteger frac = BigInteger.valueOf(rawBits).and(BI_FRAC_MASK);
-			int expAdj = 64 - frac.bitLength();
-			_significand = frac.shiftLeft(expAdj);
-			_binaryExponent = (biasedExp & 0x07FF) - 1023 - expAdj;
-		} else {
-			BigInteger frac = getFrac(rawBits);
-			_significand = frac;
-			_binaryExponent = (biasedExp & 0x07FF) - 1023;
-		}
-	}
-
-	ExpandedDouble(BigInteger frac, int binaryExp) {
-		if (frac.bitLength() != 64) {
-			throw new IllegalArgumentException("bad bit length");
-		}
-		_significand = frac;
-		_binaryExponent = binaryExp;
-	}
-
-
-	/**
-	 * Convert to an equivalent {@link NormalisedDecimal} representation having 15 decimal digits of precision in the
-	 * non-fractional bits of the significand.
-	 */
-	public NormalisedDecimal normaliseBaseTen() {
-		return NormalisedDecimal.create(_significand, _binaryExponent);
-	}
-
-	/**
-	 * @return the number of non-fractional bits after the MSB of the significand
-	 */
-	public int getBinaryExponent() {
-		return _binaryExponent;
-	}
-
-	public BigInteger getSignificand() {
-		return _significand;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/IEEEDouble.java b/trunk/src/java/org/apache/poi/ss/util/IEEEDouble.java
deleted file mode 100644
index f5a42ed..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/IEEEDouble.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-
-/**
- * For working with the internals of IEEE 754-2008 'binary64' (double precision) floating point numbers
- *
- * @author Josh Micich
- */
-final class IEEEDouble {
-	private static final long EXPONENT_MASK = 0x7FF0000000000000L;
-	private static final int  EXPONENT_SHIFT = 52;
-	public static final long FRAC_MASK = 0x000FFFFFFFFFFFFFL;
-	public static final int  EXPONENT_BIAS  = 1023;
-	public static final long FRAC_ASSUMED_HIGH_BIT = ( 1L<<EXPONENT_SHIFT );
-	/**
-	 * The value the exponent field gets for all <i>NaN</i> and <i>Infinity</i> values
-	 */
-	public static final int BIASED_EXPONENT_SPECIAL_VALUE = 0x07FF;
-
-	/**
-	 * @param rawBits the 64 bit binary representation of the double value
-	 * @return the top 12 bits (sign and biased exponent value)
-	 */
-	public static int getBiasedExponent(long rawBits) {
-		return (int) ((rawBits & EXPONENT_MASK) >> EXPONENT_SHIFT);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java b/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
deleted file mode 100644
index 991a2ef..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.util;
-
-import static org.apache.poi.util.Units.EMU_PER_PIXEL;
-
-import java.awt.Dimension;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Picture;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * @author Yegor Kozlov
- */
-public class ImageUtils {
-    private static final POILogger logger = POILogFactory.getLogger(ImageUtils.class);
-
-    public static final int PIXEL_DPI = 96;
-
-    /**
-     * Return the dimension of this image
-     *
-     * @param is the stream containing the image data
-     * @param type type of the picture: {@link org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_JPEG},
-     * {@link org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_PNG} or {@link org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_DIB}
-     *
-     * @return image dimension in pixels
-     */
-    public static Dimension getImageDimension(InputStream is, int type){
-        Dimension size = new Dimension();
-
-        switch (type){
-            //we can calculate the preferred size only for JPEG, PNG and BMP
-            //other formats like WMF, EMF and PICT are not supported in Java
-            case Workbook.PICTURE_TYPE_JPEG:
-            case Workbook.PICTURE_TYPE_PNG:
-            case Workbook.PICTURE_TYPE_DIB:
-                try {
-                    //read the image using javax.imageio.*
-                    ImageInputStream iis = ImageIO.createImageInputStream( is );
-                    try {
-                        Iterator<ImageReader> i = ImageIO.getImageReaders( iis );
-                        ImageReader r = i.next();
-                        try {
-                            r.setInput( iis );
-                            BufferedImage img = r.read(0);
-        
-                            int[] dpi = getResolution(r);
-        
-                            //if DPI is zero then assume standard 96 DPI
-                            //since cannot divide by zero
-                            if (dpi[0] == 0) dpi[0] = PIXEL_DPI;
-                            if (dpi[1] == 0) dpi[1] = PIXEL_DPI;
-        
-                            size.width = img.getWidth()*PIXEL_DPI/dpi[0];
-                            size.height = img.getHeight()*PIXEL_DPI/dpi[1];
-                        } finally {
-                            r.dispose();
-                        }
-                    } finally {
-                        iis.close();
-                    }
-
-                } catch (IOException e) {
-                    //silently return if ImageIO failed to read the image
-                    logger.log(POILogger.WARN, e);
-                }
-
-                break;
-            default:
-                logger.log(POILogger.WARN, "Only JPEG, PNG and DIB pictures can be automatically sized");
-        }
-        return size;
-    }
-
-    /**
-     * The metadata of PNG and JPEG can contain the width of a pixel in millimeters.
-     * Return the the "effective" dpi calculated as <code>25.4/HorizontalPixelSize</code>
-     * and <code>25.4/VerticalPixelSize</code>.  Where 25.4 is the number of mm in inch.
-     *
-     * @return array of two elements: <code>{horisontalPdi, verticalDpi}</code>.
-     * {96, 96} is the default.
-     */
-    public static int[] getResolution(ImageReader r) throws IOException {
-        int hdpi=96, vdpi=96;
-        double mm2inch = 25.4;
-
-        NodeList lst;
-        Element node = (Element)r.getImageMetadata(0).getAsTree("javax_imageio_1.0");
-        lst = node.getElementsByTagName("HorizontalPixelSize");
-        if(lst != null && lst.getLength() == 1) hdpi = (int)(mm2inch/Float.parseFloat(((Element)lst.item(0)).getAttribute("value")));
-
-        lst = node.getElementsByTagName("VerticalPixelSize");
-        if(lst != null && lst.getLength() == 1) vdpi = (int)(mm2inch/Float.parseFloat(((Element)lst.item(0)).getAttribute("value")));
-
-        return new int[]{hdpi, vdpi};
-    }
-
-    /**
-     * Calculate and set the preferred size (anchor) for this picture.
-     *
-     * @param scaleX the amount by which image width is multiplied relative to the original width.
-     * @param scaleY the amount by which image height is multiplied relative to the original height.
-     * @return the new Dimensions of the scaled picture in EMUs
-     */
-    public static Dimension setPreferredSize(Picture picture, double scaleX, double scaleY){
-        ClientAnchor anchor = picture.getClientAnchor();
-        boolean isHSSF = (anchor instanceof HSSFClientAnchor);
-        PictureData data = picture.getPictureData();
-        Sheet sheet = picture.getSheet();
-        
-        // in pixel
-        Dimension imgSize = getImageDimension(new ByteArrayInputStream(data.getData()), data.getPictureType());
-        // in emus
-        Dimension anchorSize = ImageUtils.getDimensionFromAnchor(picture);
-        final double scaledWidth = (scaleX == Double.MAX_VALUE)
-            ? imgSize.getWidth() : anchorSize.getWidth()/EMU_PER_PIXEL * scaleX;
-        final double scaledHeight = (scaleY == Double.MAX_VALUE)
-            ? imgSize.getHeight() : anchorSize.getHeight()/EMU_PER_PIXEL * scaleY;
-
-        double w = 0;
-        int col2 = anchor.getCol1();
-        int dx2 = 0;
-
-        //space in the leftmost cell
-        w = sheet.getColumnWidthInPixels(col2++);
-        if (isHSSF) {
-            w *= 1d - anchor.getDx1()/1024d;
-        } else {
-            w -= anchor.getDx1()/(double)EMU_PER_PIXEL;
-        }
-        
-        while(w < scaledWidth){
-            w += sheet.getColumnWidthInPixels(col2++);
-        }
-        
-        if(w > scaledWidth) {
-            //calculate dx2, offset in the rightmost cell
-            double cw = sheet.getColumnWidthInPixels(--col2);
-            double delta = w - scaledWidth;
-            if (isHSSF) {
-                dx2 = (int)((cw-delta)/cw*1024);
-            } else {
-                dx2 = (int)((cw-delta)*EMU_PER_PIXEL);
-            }
-            if (dx2 < 0) dx2 = 0;
-        }
-        anchor.setCol2(col2);
-        anchor.setDx2(dx2);
-
-        double h = 0;
-        int row2 = anchor.getRow1();
-        int dy2 = 0;
-        
-        h = getRowHeightInPixels(sheet,row2++);
-        if (isHSSF) {
-            h *= 1 - anchor.getDy1()/256d;
-        } else {
-            h -= anchor.getDy1()/(double)EMU_PER_PIXEL;
-        }
-
-        while(h < scaledHeight){
-            h += getRowHeightInPixels(sheet,row2++);
-        }
-        
-        if(h > scaledHeight) {
-            double ch = getRowHeightInPixels(sheet,--row2);
-            double delta = h - scaledHeight;
-            if (isHSSF) {
-                dy2 = (int)((ch-delta)/ch*256);
-            } else {
-                dy2 = (int)((ch-delta)*EMU_PER_PIXEL);
-            }
-            if (dy2 < 0) dy2 = 0;
-        }
-
-        anchor.setRow2(row2);
-        anchor.setDy2(dy2);
-
-        Dimension dim = new Dimension(
-            (int)Math.round(scaledWidth*EMU_PER_PIXEL),
-            (int)Math.round(scaledHeight*EMU_PER_PIXEL)
-        );
-        
-        return dim;
-    }
-
-    /**
-     * Calculates the dimensions in EMUs for the anchor of the given picture
-     *
-     * @param picture the picture containing the anchor
-     * @return the dimensions in EMUs
-     */
-    public static Dimension getDimensionFromAnchor(Picture picture) {
-        ClientAnchor anchor = picture.getClientAnchor();
-        boolean isHSSF = (anchor instanceof HSSFClientAnchor);
-        Sheet sheet = picture.getSheet();
-
-        double w = 0;
-        int col2 = anchor.getCol1();
-
-        //space in the leftmost cell
-        w = sheet.getColumnWidthInPixels(col2++);
-        if (isHSSF) {
-            w *= 1 - anchor.getDx1()/1024d;
-        } else {
-            w -= anchor.getDx1()/(double)EMU_PER_PIXEL;
-        }
-        
-        while(col2 < anchor.getCol2()){
-            w += sheet.getColumnWidthInPixels(col2++);
-        }
-        
-        if (isHSSF) {
-            w += sheet.getColumnWidthInPixels(col2) * anchor.getDx2()/1024d;
-        } else {
-            w += anchor.getDx2()/(double)EMU_PER_PIXEL;
-        }
-
-        double h = 0;
-        int row2 = anchor.getRow1();
-        
-        h = getRowHeightInPixels(sheet,row2++);
-        if (isHSSF) {
-            h *= 1 - anchor.getDy1()/256d;
-        } else {
-            h -= anchor.getDy1()/(double)EMU_PER_PIXEL;
-        }
-
-        while(row2 < anchor.getRow2()){
-            h += getRowHeightInPixels(sheet,row2++);
-        }
-        
-        if (isHSSF) {
-            h += getRowHeightInPixels(sheet,row2) * anchor.getDy2()/256;
-        } else {
-            h += anchor.getDy2()/(double)EMU_PER_PIXEL;
-        }
-
-        w *= EMU_PER_PIXEL;
-        h *= EMU_PER_PIXEL;
-        
-        return new Dimension((int)Math.rint(w), (int)Math.rint(h));
-    }
-    
-    
-    private static double getRowHeightInPixels(Sheet sheet, int rowNum) {
-        Row r = sheet.getRow(rowNum);
-        double points = (r == null) ? sheet.getDefaultRowHeightInPoints() : r.getHeightInPoints();
-        return Units.toEMU(points)/(double)EMU_PER_PIXEL;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/MutableFPNumber.java b/trunk/src/java/org/apache/poi/ss/util/MutableFPNumber.java
deleted file mode 100644
index 50d872f..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/MutableFPNumber.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.math.BigInteger;
-
-final class MutableFPNumber {
-
-
-	// TODO - what about values between (10<sup>14</sup>-0.5) and (10<sup>14</sup>-0.05) ?
-	/**
-	 * The minimum value in 'Base-10 normalised form'.<br/>
-	 * When {@link #_binaryExponent} == 46 this is the the minimum {@link #_frac} value
-	 *  (10<sup>14</sup>-0.05) * 2^17
-	 *  <br/>
-	 *  Values between (10<sup>14</sup>-0.05) and 10<sup>14</sup> will be represented as '1'
-	 *  followed by 14 zeros.
-	 *  Values less than (10<sup>14</sup>-0.05) will get shifted by one more power of 10
-	 *
-	 *  This frac value rounds to '1' followed by fourteen zeros with an incremented decimal exponent
-	 */
-	private static final BigInteger BI_MIN_BASE = new BigInteger("0B5E620F47FFFE666", 16);
-	/**
-	 * For 'Base-10 normalised form'<br/>
-	 * The maximum {@link #_frac} value when {@link #_binaryExponent} == 49
-	 * (10^15-0.5) * 2^14
-	 */
-	private static final BigInteger BI_MAX_BASE = new BigInteger("0E35FA9319FFFE000", 16);
-
-	/**
-	 * Width of a long
-	 */
-	private static final int C_64 = 64;
-
-	/**
-	 * Minimum precision after discarding whole 32-bit words from the significand
-	 */
-	private static final int MIN_PRECISION = 72;
-	private BigInteger _significand;
-	private int _binaryExponent;
-	public MutableFPNumber(BigInteger frac, int binaryExponent) {
-		_significand = frac;
-		_binaryExponent = binaryExponent;
-	}
-
-
-	public MutableFPNumber copy() {
-		return new MutableFPNumber(_significand, _binaryExponent);
-	}
-	public void normalise64bit() {
-		int oldBitLen = _significand.bitLength();
-		int sc = oldBitLen - C_64;
-		if (sc == 0) {
-			return;
-		}
-		if (sc < 0) {
-			throw new IllegalStateException("Not enough precision");
-		}
-		_binaryExponent += sc;
-		if (sc > 32) {
-			int highShift = (sc-1) & 0xFFFFE0;
-			_significand = _significand.shiftRight(highShift);
-			sc -= highShift;
-			oldBitLen -= highShift;
-		}
-		if (sc < 1) {
-			throw new IllegalStateException();
-		}
-		_significand = Rounder.round(_significand, sc);
-		if (_significand.bitLength() > oldBitLen) {
-			sc++;
-			_binaryExponent++;
-		}
-		_significand = _significand.shiftRight(sc);
-	}
-	public int get64BitNormalisedExponent() {
-		return _binaryExponent + _significand.bitLength() - C_64;
-
-	}
-
-	public boolean isBelowMaxRep() {
-		int sc = _significand.bitLength() - C_64;
-		return _significand.compareTo(BI_MAX_BASE.shiftLeft(sc)) < 0;
-	}
-	public boolean isAboveMinRep() {
-		int sc = _significand.bitLength() - C_64;
-		return _significand.compareTo(BI_MIN_BASE.shiftLeft(sc)) > 0;
-	}
-	public NormalisedDecimal createNormalisedDecimal(int pow10) {
-		// missingUnderBits is (0..3)
-		int missingUnderBits = _binaryExponent-39;
-		int fracPart = (_significand.intValue() << missingUnderBits) & 0xFFFF80;
-		long wholePart = _significand.shiftRight(C_64-_binaryExponent-1).longValue();
-		return new NormalisedDecimal(wholePart, fracPart, pow10);
-	}
-	public void multiplyByPowerOfTen(int pow10) {
-		TenPower tp = TenPower.getInstance(Math.abs(pow10));
-		if (pow10 < 0) {
-			mulShift(tp._divisor, tp._divisorShift);
-		} else {
-			mulShift(tp._multiplicand, tp._multiplierShift);
-		}
-	}
-	private void mulShift(BigInteger multiplicand, int multiplierShift) {
-		_significand = _significand.multiply(multiplicand);
-		_binaryExponent += multiplierShift;
-		// check for too much precision
-		int sc = (_significand.bitLength() - MIN_PRECISION) & 0xFFFFFFE0;
-		// mask makes multiples of 32 which optimises BigInteger.shiftRight
-		if (sc > 0) {
-			// no need to round because we have at least 8 bits of extra precision
-			_significand = _significand.shiftRight(sc);
-			_binaryExponent += sc;
-		}
-	}
-
-	private static final class Rounder {
-		private static final BigInteger[] HALF_BITS;
-
-		static {
-			BigInteger[] bis = new BigInteger[33];
-			long acc=1;
-			for (int i = 1; i < bis.length; i++) {
-				bis[i] = BigInteger.valueOf(acc);
-				acc <<=1;
-			}
-			HALF_BITS = bis;
-		}
-		/**
-		 * @param nBits number of bits to shift right
-		 */
-		public static BigInteger round(BigInteger bi, int nBits) {
-			if (nBits < 1) {
-				return bi;
-			}
-			return bi.add(HALF_BITS[nBits]);
-		}
-	}
-
-	/**
-	 * Holds values for quick multiplication and division by 10
-	 */
-	private static final class TenPower {
-		private static final BigInteger FIVE = new BigInteger("5");
-		private static final TenPower[] _cache = new TenPower[350];
-
-		public final BigInteger _multiplicand;
-		public final BigInteger _divisor;
-		public final int _divisorShift;
-		public final int _multiplierShift;
-
-		private TenPower(int index) {
-			BigInteger fivePowIndex = FIVE.pow(index);
-
-			int bitsDueToFiveFactors = fivePowIndex.bitLength();
-			int px = 80 + bitsDueToFiveFactors;
-			BigInteger fx = BigInteger.ONE.shiftLeft(px).divide(fivePowIndex);
-			int adj = fx.bitLength() - 80;
-			_divisor = fx.shiftRight(adj);
-			bitsDueToFiveFactors -= adj;
-
-			_divisorShift = -(bitsDueToFiveFactors+index+80);
-			int sc = fivePowIndex.bitLength() - 68;
-			if (sc > 0) {
-				_multiplierShift = index + sc;
-				_multiplicand = fivePowIndex.shiftRight(sc);
-			} else {
-				_multiplierShift = index;
-				_multiplicand = fivePowIndex;
-			}
-		}
-
-		static TenPower getInstance(int index) {
-			TenPower result = _cache[index];
-			if (result == null) {
-				result = new TenPower(index);
-				_cache[index] = result;
-			}
-			return result;
-		}
-	}
-
-	public ExpandedDouble createExpandedDouble() {
-		return new ExpandedDouble(_significand, _binaryExponent);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/NormalisedDecimal.java b/trunk/src/java/org/apache/poi/ss/util/NormalisedDecimal.java
deleted file mode 100644
index 84f4d72..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/NormalisedDecimal.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * Represents a transformation of a 64 bit IEEE double quantity having a decimal exponent and a
- * fixed point (15 decimal digit) significand.  Some quirks of Excel's calculation behaviour are
- * simpler to reproduce with numeric quantities in this format.  This class is currently used to
- * help:
- * <ol>
- * <li>Comparison operations</li>
- * <li>Conversions to text</li>
- * </ol>
- *
- * <p/>
- * This class does not handle negative numbers or zero.
- * <p/>
- * The value of a {@link NormalisedDecimal} is given by<br/>
- * <tt> significand &times; 10<sup>decimalExponent</sup></tt>
- * <br/>
- * where:<br/>
- *
- * <tt>significand</tt> = wholePart + fractionalPart / 2<sup>24</sup><br/>
- *
- * @author Josh Micich
- */
-final class NormalisedDecimal {
-	/**
-	 * Number of powers of ten contained in the significand
-	 */
-	private static final int EXPONENT_OFFSET = 14;
-
-	private static final BigDecimal BD_2_POW_24 = new BigDecimal(BigInteger.ONE.shiftLeft(24));
-
-	/**
-	 * log<sub>10</sub>(2)&times;2<sup>20</sup>
-	 */
-	private static final int LOG_BASE_10_OF_2_TIMES_2_POW_20 = 315653; // 315652.8287
-
-	/**
-	 * 2<sup>19</sup>
-	 */
-	private static final int C_2_POW_19 = 1 << 19;
-
-
-	/**
-	 * the value of {@link #_fractionalPart} that represents 0.5
-	 */
-	private static final int FRAC_HALF = 0x800000;
-
-	/**
-	 * 10<sup>15</sup>
-	 */
-	private static final long MAX_REP_WHOLE_PART = 0x38D7EA4C68000L;
-
-
-
-	public static NormalisedDecimal create(BigInteger frac, int binaryExponent) {
-		// estimate pow2&pow10 first, perform optional mulShift, then normalize
-		int pow10;
-		if (binaryExponent > 49 || binaryExponent < 46) {
-
-			// working with ints (left shifted 20) instead of doubles
-			// x = 14.5 - binaryExponent * log10(2);
-			int x = (29 << 19) - binaryExponent * LOG_BASE_10_OF_2_TIMES_2_POW_20;
-			x += C_2_POW_19; // round
-			pow10 = -(x >> 20);
-		} else {
-			pow10 = 0;
-		}
-		MutableFPNumber cc = new MutableFPNumber(frac, binaryExponent);
-		if (pow10 != 0) {
-			cc.multiplyByPowerOfTen(-pow10);
-		}
-
-		switch (cc.get64BitNormalisedExponent()) {
-			case 46:
-				if (cc.isAboveMinRep()) {
-					break;
-				}
-			case 44:
-			case 45:
-				cc.multiplyByPowerOfTen(1);
-				pow10--;
-				break;
-			case 47:
-			case 48:
-				break;
-			case 49:
-				if (cc.isBelowMaxRep()) {
-					break;
-				}
-			case 50:
-				cc.multiplyByPowerOfTen(-1);
-				pow10++;
-				break;
-
-			default:
-				throw new IllegalStateException("Bad binary exp " + cc.get64BitNormalisedExponent() + ".");
-		}
-		cc.normalise64bit();
-
-		return cc.createNormalisedDecimal(pow10);
-	}
-
-	/**
-	 * Rounds at the digit with value 10<sup>decimalExponent</sup>
-	 */
-	public NormalisedDecimal roundUnits() {
-		long wholePart = _wholePart;
-		if (_fractionalPart >= FRAC_HALF) {
-			wholePart++;
-		}
-
-		int de = _relativeDecimalExponent;
-
-		if (wholePart < MAX_REP_WHOLE_PART) {
-			return new NormalisedDecimal(wholePart, 0, de);
-		}
-		return new NormalisedDecimal(wholePart/10, 0, de+1);
-	}
-
-	/**
-	 * The decimal exponent increased by one less than the digit count of {@link #_wholePart}
-	 */
-	private final int _relativeDecimalExponent;
-	/**
-	 * The whole part of the significand (typically 15 digits).
-	 *
-	 * 47-50 bits long (MSB may be anywhere from bit 46 to 49)
-	 * LSB is units bit.
-	 */
-	private final long _wholePart;
-	/**
-	 * The fractional part of the significand.
-	 * 24 bits (only top 14-17 bits significant): a value between 0x000000 and 0xFFFF80
-	 */
-	private final int _fractionalPart;
-
-
-	NormalisedDecimal(long wholePart, int fracPart, int decimalExponent) {
-		_wholePart = wholePart;
-		_fractionalPart = fracPart;
-		_relativeDecimalExponent = decimalExponent;
-	}
-
-
-	/**
-	 * Convert to an equivalent {@link ExpandedDouble} representation (binary frac and exponent).
-	 * The resulting transformed object is easily converted to a 64 bit IEEE double:
-	 * <ul>
-	 * <li>bits 2-53 of the {@link #getSignificand()} become the 52 bit 'fraction'.</li>
-	 * <li>{@link #getBinaryExponent()} is biased by 1023 to give the 'exponent'.</li>
-	 * </ul>
-	 * The sign bit must be obtained from somewhere else.
-	 * @return a new {@link NormalisedDecimal} normalised to base 2 representation.
-	 */
-	public ExpandedDouble normaliseBaseTwo() {
-		MutableFPNumber cc = new MutableFPNumber(composeFrac(), 39);
-		cc.multiplyByPowerOfTen(_relativeDecimalExponent);
-		cc.normalise64bit();
-		return cc.createExpandedDouble();
-	}
-
-	/**
-	 * @return the significand as a fixed point number (with 24 fraction bits and 47-50 whole bits)
-	 */
-	BigInteger composeFrac() {
-		long wp = _wholePart;
-		int fp = _fractionalPart;
-		return new BigInteger(new byte[] {
-				(byte) (wp >> 56), // N.B. assuming sign bit is zero
-				(byte) (wp >> 48),
-				(byte) (wp >> 40),
-				(byte) (wp >> 32),
-				(byte) (wp >> 24),
-				(byte) (wp >> 16),
-				(byte) (wp >>  8),
-				(byte) (wp >>  0),
-				(byte) (fp >> 16),
-				(byte) (fp >> 8),
-				(byte) (fp >> 0),
-		});
-	}
-
-	public String getSignificantDecimalDigits() {
-		return Long.toString(_wholePart);
-	}
-	/**
-	 * Rounds the first whole digit position (considers only units digit, not frational part).
-	 * Caller should check total digit count of result to see whether the rounding operation caused
-	 * a carry out of the most significant digit
-	 */
-	public String getSignificantDecimalDigitsLastDigitRounded() {
-		long wp = _wholePart + 5; // rounds last digit
-		StringBuilder sb = new StringBuilder(24);
-		sb.append(wp);
-		sb.setCharAt(sb.length()-1, '0');
-		return sb.toString();
-	}
-
-	/**
-	 * @return the number of powers of 10 which have been extracted from the significand and binary exponent.
-	 */
-	public int getDecimalExponent() {
-		return _relativeDecimalExponent+EXPONENT_OFFSET;
-	}
-
-	/**
-	 * assumes both this and other are normalised
-	 */
-	public int compareNormalised(NormalisedDecimal other) {
-		int cmp = _relativeDecimalExponent - other._relativeDecimalExponent;
-		if (cmp != 0) {
-			return cmp;
-		}
-		if (_wholePart > other._wholePart) {
-			return 1;
-		}
-		if (_wholePart < other._wholePart) {
-			return -1;
-		}
-		return _fractionalPart - other._fractionalPart;
-	}
-	public BigDecimal getFractionalPart() {
-		return new BigDecimal(_fractionalPart).divide(BD_2_POW_24);
-	}
-
-	private String getFractionalDigits() {
-		if (_fractionalPart == 0) {
-			return "0";
-		}
-		return getFractionalPart().toString().substring(2);
-	}
-
-	@Override
-	public String toString() {
-
-		StringBuilder sb = new StringBuilder();
-		sb.append(getClass().getName());
-		sb.append(" [");
-		String ws = String.valueOf(_wholePart);
-		sb.append(ws.charAt(0));
-		sb.append('.');
-		sb.append(ws.substring(1));
-		sb.append(' ');
-		sb.append(getFractionalDigits());
-		sb.append("E");
-		sb.append(getDecimalExponent());
-		sb.append("]");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/NumberComparer.java b/trunk/src/java/org/apache/poi/ss/util/NumberComparer.java
deleted file mode 100644
index 1d7a8db..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/NumberComparer.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.Locale;
-
-import static org.apache.poi.ss.util.IEEEDouble.*;
-
-/**
- * Excel compares numbers using different rules to those of java, so
- *  {@link Double#compare(double, double)} won't do.
- *
- *
- * @author Josh Micich
- */
-public final class NumberComparer {
-
-	/**
-	 * This class attempts to reproduce Excel's behaviour for comparing numbers.  Results are
-	 * mostly the same as those from {@link Double#compare(double, double)} but with some
-	 * rounding.  For numbers that are very close, this code converts to a format having 15
-	 * decimal digits of precision and a decimal exponent, before completing the comparison.
-	 * <p/>
-	 * In Excel formula evaluation, expressions like "(0.06-0.01)=0.05" evaluate to "TRUE" even
-	 * though the equivalent java expression is <code>false</code>.  In examples like this,
-	 * Excel achieves the effect by having additional logic for comparison operations.
-	 * <p/>
-	 * <p/>
-	 * Note - Excel also gives special treatment to expressions like "0.06-0.01-0.05" which
-	 * evaluates to "0" (in java, rounding anomalies give a result of 6.9E-18).  The special
-	 * behaviour here is for different reasons to the example above:  If the last operator in a
-	 * cell formula is '+' or '-' and the result is less than 2<sup>50</sup> times smaller than
-	 * first operand, the result is rounded to zero.
-	 * Needless to say, the two rules are not consistent and it is relatively easy to find
-	 * examples that satisfy<br/>
-	 * "A=B" is "TRUE" but "A-B" is not "0"<br/>
-	 * and<br/>
-	 * "A=B" is "FALSE" but "A-B" is "0"<br/>
-	 * <br/>
-	 * This rule (for rounding the result of a final addition or subtraction), has not been
-	 * implemented in POI (as of Jul-2009).
-	 *
-	 * @return <code>negative, 0, or positive</code> according to the standard Excel comparison
-	 * of values <tt>a</tt> and <tt>b</tt>.
-	 */
-	public static int compare(double a, double b) {
-		long rawBitsA = Double.doubleToLongBits(a);
-		long rawBitsB = Double.doubleToLongBits(b);
-
-		int biasedExponentA = getBiasedExponent(rawBitsA);
-		int biasedExponentB = getBiasedExponent(rawBitsB);
-
-		if (biasedExponentA == BIASED_EXPONENT_SPECIAL_VALUE) {
-			throw new IllegalArgumentException("Special double values are not allowed: " + toHex(a));
-		}
-		if (biasedExponentB == BIASED_EXPONENT_SPECIAL_VALUE) {
-			throw new IllegalArgumentException("Special double values are not allowed: " + toHex(a));
-		}
-
-		int cmp;
-
-		// sign bit is in the same place for long and double:
-		boolean aIsNegative = rawBitsA < 0;
-		boolean bIsNegative = rawBitsB < 0;
-
-		// compare signs
-		if (aIsNegative != bIsNegative) {
-			// Excel seems to have 'normal' comparison behaviour around zero (no rounding)
-			// even -0.0 < +0.0 (which is not quite the initial conclusion of bug 47198)
-			return aIsNegative ? -1 : +1;
-		}
-
-		// then compare magnitudes (IEEE 754 has exponent bias specifically to allow this)
-		cmp = biasedExponentA - biasedExponentB;
-		int absExpDiff = Math.abs(cmp);
-		if (absExpDiff > 1) {
-			return aIsNegative ? -cmp : cmp;
-		}
-
-		if (absExpDiff == 1) {
-			// special case exponent differs by 1.  There is still a chance that with rounding the two quantities could end up the same
-
-		} else {
-			// else - sign and exponents equal
-			if (rawBitsA == rawBitsB) {
-				// fully equal - exit here
-				return 0;
-			}
-		}
-		if (biasedExponentA == 0) {
-			if (biasedExponentB == 0) {
-				return compareSubnormalNumbers(rawBitsA & FRAC_MASK, rawBitsB & FRAC_MASK, aIsNegative);
-			}
-			// else biasedExponentB is 1
-			return -compareAcrossSubnormalThreshold(rawBitsB, rawBitsA, aIsNegative);
-		}
-		if (biasedExponentB == 0) {
-			// else biasedExponentA is 1
-			return +compareAcrossSubnormalThreshold(rawBitsA, rawBitsB, aIsNegative);
-		}
-
-		// sign and exponents same, but fractional bits are different
-
-		ExpandedDouble edA = ExpandedDouble.fromRawBitsAndExponent(rawBitsA, biasedExponentA - EXPONENT_BIAS);
-		ExpandedDouble edB = ExpandedDouble.fromRawBitsAndExponent(rawBitsB, biasedExponentB - EXPONENT_BIAS);
-		NormalisedDecimal ndA = edA.normaliseBaseTen().roundUnits();
-		NormalisedDecimal ndB = edB.normaliseBaseTen().roundUnits();
-		cmp = ndA.compareNormalised(ndB);
-		if (aIsNegative) {
-			return -cmp;
-		}
-		return cmp;
-	}
-
-	/**
-	 * If both numbers are subnormal, Excel seems to use standard comparison rules
-	 */
-	private static int compareSubnormalNumbers(long fracA, long fracB, boolean isNegative) {
-		int cmp = fracA > fracB ? +1 : fracA < fracB ? -1 : 0;
-
-		return isNegative ? -cmp : cmp;
-	}
-
-
-
-	/**
-	 * Usually any normal number is greater (in magnitude) than any subnormal number.
-	 * However there are some anomalous cases around the threshold where Excel produces screwy results
-	 * @param isNegative both values are either negative or positive. This parameter affects the sign of the comparison result
-	 * @return usually <code>isNegative ? -1 : +1</code>
-	 */
-	private static int compareAcrossSubnormalThreshold(long normalRawBitsA, long subnormalRawBitsB, boolean isNegative) {
-		long fracB = subnormalRawBitsB & FRAC_MASK;
-		if (fracB == 0) {
-			// B is zero, so A is definitely greater than B
-			return isNegative ? -1 : +1;
-		}
-		long fracA = normalRawBitsA & FRAC_MASK;
-		if (fracA <= 0x0000000000000007L && fracB >= 0x000FFFFFFFFFFFFAL) {
-			// Both A and B close to threshold - weird results
-			if (fracA == 0x0000000000000007L && fracB == 0x000FFFFFFFFFFFFAL) {
-				// special case
-				return 0;
-			}
-			// exactly the opposite
-			return isNegative ? +1 : -1;
-		}
-		// else - typical case A and B is not close to threshold
-		return isNegative ? -1 : +1;
-	}
-
-
-
-	/**
-	 * for formatting double values in error messages
-	 */
-	private static String toHex(double a) {
-		return "0x" + Long.toHexString(Double.doubleToLongBits(a)).toUpperCase(Locale.ROOT);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/NumberToTextConverter.java b/trunk/src/java/org/apache/poi/ss/util/NumberToTextConverter.java
deleted file mode 100644
index c5b8d93..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/NumberToTextConverter.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-
-/**
- * Excel converts numbers to text with different rules to those of java, so
- *  <code>Double.toString(value)</tt> won't do.
- * <ul>
- * <li>No more than 15 significant figures are output (java does 18).</li>
- * <li>The sign char for the exponent is included even if positive</li>
- * <li>Special values (<tt>NaN</tt> and <tt>Infinity</tt>) get rendered like the ordinary
- * number that the bit pattern represents.</li>
- * <li>Denormalised values (between &plusmn;2<sup>-1074</sup> and &plusmn;2<sup>-1022</sup>
- *  are displayed as "0"</sup>
- * </ul>
- * IEEE 64-bit Double Rendering Comparison
- *
- * <table border="1" cellpadding="2" cellspacing="0" summary="IEEE 64-bit Double Rendering Comparison">
- * <tr><th>Raw bits</th><th>Java</th><th>Excel</th></tr>
- *
- * <tr><td>0x0000000000000000L</td><td>0.0</td><td>0</td></tr>
- * <tr><td>0x3FF0000000000000L</td><td>1.0</td><td>1</td></tr>
- * <tr><td>0x3FF00068DB8BAC71L</td><td>1.0001</td><td>1.0001</td></tr>
- * <tr><td>0x4087A00000000000L</td><td>756.0</td><td>756</td></tr>
- * <tr><td>0x401E3D70A3D70A3DL</td><td>7.56</td><td>7.56</td></tr>
- * <tr><td>0x405EDD3C07FB4C99L</td><td>123.45678901234568</td><td>123.456789012346</td></tr>
- * <tr><td>0x4132D687E3DF2180L</td><td>1234567.8901234567</td><td>1234567.89012346</td></tr>
- * <tr><td>0x3EE9E409302678BAL</td><td>1.2345678901234568E-5</td><td>1.23456789012346E-05</td></tr>
- * <tr><td>0x3F202E85BE180B74L</td><td>1.2345678901234567E-4</td><td>0.000123456789012346</td></tr>
- * <tr><td>0x3F543A272D9E0E51L</td><td>0.0012345678901234567</td><td>0.00123456789012346</td></tr>
- * <tr><td>0x3F8948B0F90591E6L</td><td>0.012345678901234568</td><td>0.0123456789012346</td></tr>
- * <tr><td>0x3EE9E409301B5A02L</td><td>1.23456789E-5</td><td>0.0000123456789</td></tr>
- * <tr><td>0x3E6E7D05BDABDE50L</td><td>5.6789012345E-8</td><td>0.000000056789012345</td></tr>
- * <tr><td>0x3E6E7D05BDAD407EL</td><td>5.67890123456E-8</td><td>5.67890123456E-08</td></tr>
- * <tr><td>0x3E6E7D06029F18BEL</td><td>5.678902E-8</td><td>0.00000005678902</td></tr>
- * <tr><td>0x2BCB5733CB32AE6EL</td><td>9.999999999999123E-98</td><td>9.99999999999912E-98</td></tr>
- * <tr><td>0x2B617F7D4ED8C59EL</td><td>1.0000000000001235E-99</td><td>1.0000000000001E-99</td></tr>
- * <tr><td>0x0036319916D67853L</td><td>1.2345678901234578E-307</td><td>1.2345678901235E-307</td></tr>
- * <tr><td>0x359DEE7A4AD4B81FL</td><td>2.0E-50</td><td>2E-50</td></tr>
- * <tr><td>0x41678C29DCD6E9E0L</td><td>1.2345678901234567E7</td><td>12345678.9012346</td></tr>
- * <tr><td>0x42A674E79C5FE523L</td><td>1.2345678901234568E13</td><td>12345678901234.6</td></tr>
- * <tr><td>0x42DC12218377DE6BL</td><td>1.2345678901234567E14</td><td>123456789012346</td></tr>
- * <tr><td>0x43118B54F22AEB03L</td><td>1.2345678901234568E15</td><td>1234567890123460</td></tr>
- * <tr><td>0x43E56A95319D63E1L</td><td>1.2345678901234567E19</td><td>12345678901234600000</td></tr>
- * <tr><td>0x441AC53A7E04BCDAL</td><td>1.2345678901234568E20</td><td>1.23456789012346E+20</td></tr>
- * <tr><td>0xC3E56A95319D63E1L</td><td>-1.2345678901234567E19</td><td>-12345678901234600000</td></tr>
- * <tr><td>0xC41AC53A7E04BCDAL</td><td>-1.2345678901234568E20</td><td>-1.23456789012346E+20</td></tr>
- * <tr><td>0x54820FE0BA17F46DL</td><td>1.2345678901234577E99</td><td>1.2345678901235E+99</td></tr>
- * <tr><td>0x54B693D8E89DF188L</td><td>1.2345678901234576E100</td><td>1.2345678901235E+100</td></tr>
- * <tr><td>0x4A611B0EC57E649AL</td><td>2.0E50</td><td>2E+50</td></tr>
- * <tr><td>0x7FEFFFFFFFFFFFFFL</td><td>1.7976931348623157E308</td><td>1.7976931348623E+308</td></tr>
- * <tr><td>0x0010000000000000L</td><td>2.2250738585072014E-308</td><td>2.2250738585072E-308</td></tr>
- * <tr><td>0x000FFFFFFFFFFFFFL</td><td>2.225073858507201E-308</td><td>0</td></tr>
- * <tr><td>0x0000000000000001L</td><td>4.9E-324</td><td>0</td></tr>
- * <tr><td>0x7FF0000000000000L</td><td>Infinity</td><td>1.7976931348623E+308</td></tr>
- * <tr><td>0xFFF0000000000000L</td><td>-Infinity</td><td>1.7976931348623E+308</td></tr>
- * <tr><td>0x441AC7A08EAD02F2L</td><td>1.234999999999999E20</td><td>1.235E+20</td></tr>
- * <tr><td>0x40FE26BFFFFFFFF9L</td><td>123499.9999999999</td><td>123500</td></tr>
- * <tr><td>0x3E4A857BFB2F2809L</td><td>1.234999999999999E-8</td><td>0.00000001235</td></tr>
- * <tr><td>0x3BCD291DEF868C89L</td><td>1.234999999999999E-20</td><td>1.235E-20</td></tr>
- * <tr><td>0x444B1AE4D6E2EF4FL</td><td>9.999999999999999E20</td><td>1E+21</td></tr>
- * <tr><td>0x412E847FFFFFFFFFL</td><td>999999.9999999999</td><td>1000000</td></tr>
- * <tr><td>0x3E45798EE2308C39L</td><td>9.999999999999999E-9</td><td>0.00000001</td></tr>
- * <tr><td>0x3C32725DD1D243ABL</td><td>9.999999999999999E-19</td><td>0.000000000000000001</td></tr>
- * <tr><td>0x3BFD83C94FB6D2ABL</td><td>9.999999999999999E-20</td><td>1E-19</td></tr>
- * <tr><td>0xC44B1AE4D6E2EF4FL</td><td>-9.999999999999999E20</td><td>-1E+21</td></tr>
- * <tr><td>0xC12E847FFFFFFFFFL</td><td>-999999.9999999999</td><td>-1000000</td></tr>
- * <tr><td>0xBE45798EE2308C39L</td><td>-9.999999999999999E-9</td><td>-0.00000001</td></tr>
- * <tr><td>0xBC32725DD1D243ABL</td><td>-9.999999999999999E-19</td><td>-0.000000000000000001</td></tr>
- * <tr><td>0xBBFD83C94FB6D2ABL</td><td>-9.999999999999999E-20</td><td>-1E-19</td></tr>
- * <tr><td>0xFFFF0420003C0000L</td><td>NaN</td><td>3.484840871308E+308</td></tr>
- * <tr><td>0x7FF8000000000000L</td><td>NaN</td><td>2.6965397022935E+308</td></tr>
- * <tr><td>0x7FFF0420003C0000L</td><td>NaN</td><td>3.484840871308E+308</td></tr>
- * <tr><td>0xFFF8000000000000L</td><td>NaN</td><td>2.6965397022935E+308</td></tr>
- * <tr><td>0xFFFF0AAAAAAAAAAAL</td><td>NaN</td><td>3.4877119413344E+308</td></tr>
- * <tr><td>0x7FF80AAAAAAAAAAAL</td><td>NaN</td><td>2.7012211948322E+308</td></tr>
- * <tr><td>0xFFFFFFFFFFFFFFFFL</td><td>NaN</td><td>3.5953862697246E+308</td></tr>
- * <tr><td>0x7FFFFFFFFFFFFFFFL</td><td>NaN</td><td>3.5953862697246E+308</td></tr>
- * <tr><td>0xFFF7FFFFFFFFFFFFL</td><td>NaN</td><td>2.6965397022935E+308</td></tr>
- * </table>
- *
- * <b>Note</b>:
- * Excel has inconsistent rules for the following numeric operations:
- * <ul>
- * <li>Conversion to string (as handled here)</li>
- * <li>Rendering numerical quantities in the cell grid.</li>
- * <li>Conversion from text</li>
- * <li>General arithmetic</li>
- * </ul>
- * Excel's text to number conversion is not a true <i>inverse</i> of this operation.  The
- * allowable ranges are different.  Some numbers that don't correctly convert to text actually
- * <b>do</b> get handled properly when used in arithmetic evaluations.
- *
- * @author Josh Micich
- */
-public final class NumberToTextConverter {
-
-	private static final long EXCEL_NAN_BITS = 0xFFFF0420003C0000L;
-	private static final int MAX_TEXT_LEN = 20;
-
-	private NumberToTextConverter() {
-		// no instances of this class
-	}
-
-	/**
-	 * Converts the supplied <tt>value</tt> to the text representation that Excel would give if
-	 * the value were to appear in an unformatted cell, or as a literal number in a formula.<br/>
-	 * Note - the results from this method differ slightly from those of <tt>Double.toString()</tt>
-	 * In some special cases Excel behaves quite differently.  This function attempts to reproduce
-	 * those results.
-	 */
-	public static String toText(double value) {
-		return rawDoubleBitsToText(Double.doubleToLongBits(value));
-	}
-	/* package */ static String rawDoubleBitsToText(long pRawBits) {
-
-		long rawBits = pRawBits;
-		boolean isNegative = rawBits < 0; // sign bit is in the same place for long and double
-		if (isNegative) {
-			rawBits &= 0x7FFFFFFFFFFFFFFFL;
-		}
-		if (rawBits == 0) {
-			return isNegative ? "-0" : "0";
-		}
-		ExpandedDouble ed = new ExpandedDouble(rawBits);
-		if (ed.getBinaryExponent() < -1022) {
-			// value is 'denormalised' which means it is less than 2^-1022
-			// excel displays all these numbers as zero, even though calculations work OK
-			return isNegative ? "-0" : "0";
-		}
-		if (ed.getBinaryExponent() == 1024) {
-			// Special number NaN /Infinity
-			// Normally one would not create HybridDecimal objects from these values
-			// except in these cases Excel really tries to render them as if they were normal numbers
-			if(rawBits == EXCEL_NAN_BITS) {
-				return "3.484840871308E+308";
-			}
-			// This is where excel really gets it wrong
-			// Special numbers like Infinity and NaN are interpreted according to
-			// the standard rules below.
-			isNegative = false; // except that the sign bit is ignored
-		}
-		NormalisedDecimal nd = ed.normaliseBaseTen();
-		StringBuilder sb = new StringBuilder(MAX_TEXT_LEN+1);
-		if (isNegative) {
-			sb.append('-');
-		}
-		convertToText(sb, nd);
-		return sb.toString();
-	}
-	private static void convertToText(StringBuilder sb, NormalisedDecimal pnd) {
-		NormalisedDecimal rnd = pnd.roundUnits();
-		int decExponent = rnd.getDecimalExponent();
-		String decimalDigits;
-		if (Math.abs(decExponent)>98) {
-			decimalDigits = rnd.getSignificantDecimalDigitsLastDigitRounded();
-			if (decimalDigits.length() == 16) {
-				// rounding caused carry
-				decExponent++;
-			}
-		} else {
-			decimalDigits = rnd.getSignificantDecimalDigits();
-		}
-		int countSigDigits = countSignifantDigits(decimalDigits);
-		if (decExponent < 0) {
-			formatLessThanOne(sb, decimalDigits, decExponent, countSigDigits);
-		} else {
-			formatGreaterThanOne(sb, decimalDigits, decExponent, countSigDigits);
-		}
-	}
-
-	private static void formatLessThanOne(StringBuilder sb, String decimalDigits, int decExponent,
-			int countSigDigits) {
-		int nLeadingZeros = -decExponent - 1;
-		int normalLength = 2 + nLeadingZeros + countSigDigits; // 2 == "0.".length()
-
-		if (needsScientificNotation(normalLength)) {
-			sb.append(decimalDigits.charAt(0));
-			if (countSigDigits > 1) {
-    			sb.append('.');
-    			sb.append(decimalDigits.subSequence(1, countSigDigits));
-			}
-			sb.append("E-");
-			appendExp(sb, -decExponent);
-			return;
-		}
-		sb.append("0.");
-		for (int i=nLeadingZeros; i>0; i--) {
-			sb.append('0');
-		}
-		sb.append(decimalDigits.subSequence(0, countSigDigits));
-	}
-
-	private static void formatGreaterThanOne(StringBuilder sb, String decimalDigits, int decExponent, int countSigDigits) {
-
-		if (decExponent > 19) {
-			// scientific notation
-			sb.append(decimalDigits.charAt(0));
-			if (countSigDigits>1) {
-				sb.append('.');
-				sb.append(decimalDigits.subSequence(1, countSigDigits));
-			}
-			sb.append("E+");
-			appendExp(sb, decExponent);
-			return;
-		}
-		int nFractionalDigits = countSigDigits - decExponent-1;
-		if (nFractionalDigits > 0) {
-			sb.append(decimalDigits.subSequence(0, decExponent+1));
-			sb.append('.');
-			sb.append(decimalDigits.subSequence(decExponent+1, countSigDigits));
-			return;
-		}
-		sb.append(decimalDigits.subSequence(0, countSigDigits));
-		for (int i=-nFractionalDigits; i>0; i--) {
-			sb.append('0');
-		}
-	}
-
-	private static boolean needsScientificNotation(int nDigits) {
-		return nDigits > MAX_TEXT_LEN;
-	}
-
-	private static int countSignifantDigits(String sb) {
-		int result=sb.length()-1;
-		while(sb.charAt(result) == '0') {
-			result--;
-			if(result < 0) {
-				throw new RuntimeException("No non-zero digits found");
-			}
-		}
-		return result + 1;
-	}
-
-	private static void appendExp(StringBuilder sb, int val) {
-		if(val < 10) {
-			sb.append('0');
-			sb.append((char)('0' + val));
-			return;
-		}
-		sb.append(val);
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java b/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java
deleted file mode 100644
index dc54b4c..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/PaneInformation.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-/**
- * Holds information regarding a split plane or freeze plane for a sheet.
- *
- */
-public class PaneInformation
-{
-    /** Constant for active pane being the lower right*/
-    public static final byte PANE_LOWER_RIGHT = (byte)0;
-    /** Constant for active pane being the upper right*/
-    public static final byte PANE_UPPER_RIGHT = (byte)1;
-    /** Constant for active pane being the lower left*/
-    public static final byte PANE_LOWER_LEFT = (byte)2;
-    /** Constant for active pane being the upper left*/
-    public static final byte PANE_UPPER_LEFT = (byte)3;
-    
-	private final short x;
-	private final short y;
-	private final short topRow;
-	private final short leftColumn;
-	private final byte activePane;
-	private final boolean frozen;
-	
-	public PaneInformation(short x, short y, short top, short left, byte active, boolean frozen) {
-		this.x = x;
-		this.y = y;
-		this.topRow = top;
-		this.leftColumn = left;
-		this.activePane = active;
-		this.frozen = frozen;
-	}
-
-
-	/**
-	 * Returns the vertical position of the split.
-	 * @return 0 if there is no vertical spilt,
-	 *         or for a freeze pane the number of columns in the TOP pane,
-	 *         or for a split plane the position of the split in 1/20th of a point.
-	 */
-	public short getVerticalSplitPosition() {
-	  return x;
-	}
-	
-	/**
-	 * Returns the horizontal position of the split.
-	 * @return 0 if there is no horizontal spilt,
-	 *         or for a freeze pane the number of rows in the LEFT pane,
-	 *         or for a split plane the position of the split in 1/20th of a point.
-	 */
-	public short getHorizontalSplitPosition() {
-	  return y;
-	}
-	
-	/**
-	 * For a horizontal split returns the top row in the BOTTOM pane.
-	 * @return 0 if there is no horizontal split, or the top row of the bottom pane.
-	 */
-	public short getHorizontalSplitTopRow() {
-	  return topRow;
-	}
-	
-	/**
-	 * For a vertical split returns the left column in the RIGHT pane.
-	 * @return 0 if there is no vertical split, or the left column in the RIGHT pane.
-	 */
-	public short getVerticalSplitLeftColumn() {
-	  return leftColumn;
-	}
-	
-	/**
-	 * Returns the active pane
-	 * @see #PANE_LOWER_RIGHT
-	 * @see #PANE_UPPER_RIGHT
-	 * @see #PANE_LOWER_LEFT
-	 * @see #PANE_UPPER_LEFT
-	 * @return the active pane.
-	 */
-	public byte getActivePane() {
-	  return activePane;
-	}
-	
-	/** Returns true if this is a Freeze pane, false if it is a split pane.
-	 */
-	public boolean isFreezePane() {
-		return frozen;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java b/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java
deleted file mode 100644
index 1b0e275..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/PropertyTemplate.java
+++ /dev/null
@@ -1,966 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.BorderExtent;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * <p>
- * A {@link PropertyTemplate} is a template that can be applied to any sheet in
- * a project. It contains all the border type and color attributes needed to
- * draw all the borders for a single sheet. That template can be applied to any
- * sheet in any workbook.
- * 
- * This class requires the full spreadsheet to be in memory, so 
- * {@link org.apache.poi.xssf.streaming.SXSSFWorkbook} Spreadsheets are not
- * supported. The same {@link PropertyTemplate} can, however, be applied to both
- * {@link HSSFWorkbook} and {@link org.apache.poi.xssf.usermodel.XSSFWorkbook}
- * objects if necessary. Portions of the border that fall outside the max range
- * of the {@link Workbook} sheet are ignored.
- * </p>
- * 
- * <p>
- * This would replace {@link RegionUtil}.
- * </p>
- */
-public final class PropertyTemplate {
-
-    /**
-     * This is a list of cell properties for one shot application to a range of
-     * cells at a later time.
-     */
-    private Map<CellAddress, Map<String, Object>> _propertyTemplate;
-
-    /**
-     * Create a PropertyTemplate object
-     */
-    public PropertyTemplate() {
-        _propertyTemplate = new HashMap<CellAddress, Map<String, Object>>();
-    }
-    
-    /**
-     * Create a PropertyTemplate object from another PropertyTemplate
-     *
-     * @param template a PropertyTemplate object
-     */
-    public PropertyTemplate(PropertyTemplate template) {
-        this();
-        for(Map.Entry<CellAddress, Map<String, Object>> entry : template.getTemplate().entrySet()) {
-            _propertyTemplate.put(new CellAddress(entry.getKey()), cloneCellProperties(entry.getValue()));
-        }
-    }
-    
-    private Map<CellAddress,Map<String, Object>> getTemplate() {
-        return _propertyTemplate;
-    }
-    
-    private static Map<String, Object> cloneCellProperties(Map<String, Object> properties) {
-        Map<String, Object> newProperties = new HashMap<String, Object>(); 
-        for(Map.Entry<String, Object> entry : properties.entrySet()) {
-            newProperties.put(entry.getKey(), entry.getValue());
-        }
-        return newProperties;
-    }
-    
-    /**
-     * Draws a group of cell borders for a cell range. The borders are not
-     * applied to the cells at this time, just the template is drawn. To apply
-     * the drawn borders to a sheet, use {@link #applyBorders}.
-     * 
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     * @param extent
-     *            - {@link BorderExtent} of the borders to be
-     *            applied.
-     */
-    public void drawBorders(CellRangeAddress range, BorderStyle borderType,
-            BorderExtent extent) {
-        switch (extent) {
-        case NONE:
-            removeBorders(range);
-            break;
-        case ALL:
-            drawHorizontalBorders(range, borderType, BorderExtent.ALL);
-            drawVerticalBorders(range, borderType, BorderExtent.ALL);
-            break;
-        case INSIDE:
-            drawHorizontalBorders(range, borderType, BorderExtent.INSIDE);
-            drawVerticalBorders(range, borderType, BorderExtent.INSIDE);
-            break;
-        case OUTSIDE:
-            drawOutsideBorders(range, borderType, BorderExtent.ALL);
-            break;
-        case TOP:
-            drawTopBorder(range, borderType);
-            break;
-        case BOTTOM:
-            drawBottomBorder(range, borderType);
-            break;
-        case LEFT:
-            drawLeftBorder(range, borderType);
-            break;
-        case RIGHT:
-            drawRightBorder(range, borderType);
-            break;
-        case HORIZONTAL:
-            drawHorizontalBorders(range, borderType, BorderExtent.ALL);
-            break;
-        case INSIDE_HORIZONTAL:
-            drawHorizontalBorders(range, borderType, BorderExtent.INSIDE);
-            break;
-        case OUTSIDE_HORIZONTAL:
-            drawOutsideBorders(range, borderType, BorderExtent.HORIZONTAL);
-            break;
-        case VERTICAL:
-            drawVerticalBorders(range, borderType, BorderExtent.ALL);
-            break;
-        case INSIDE_VERTICAL:
-            drawVerticalBorders(range, borderType, BorderExtent.INSIDE);
-            break;
-        case OUTSIDE_VERTICAL:
-            drawOutsideBorders(range, borderType, BorderExtent.VERTICAL);
-            break;
-        }
-    }
-
-    /**
-     * Draws a group of cell borders for a cell range. The borders are not
-     * applied to the cells at this time, just the template is drawn. To apply
-     * the drawn borders to a sheet, use {@link #applyBorders}.
-     * 
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     * @param extent
-     *            - {@link BorderExtent} of the borders to be
-     *            applied.
-     */
-    public void drawBorders(CellRangeAddress range, BorderStyle borderType,
-            short color, BorderExtent extent) {
-        drawBorders(range, borderType, extent);
-        if (borderType != BorderStyle.NONE) {
-            drawBorderColors(range, color, extent);
-        }
-    }
-
-    /**
-     * <p>
-     * Draws the top border for a range of cells
-     * </p>
-     * 
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     */
-    private void drawTopBorder(CellRangeAddress range, BorderStyle borderType) {
-        int row = range.getFirstRow();
-        int firstCol = range.getFirstColumn();
-        int lastCol = range.getLastColumn();
-        for (int i = firstCol; i <= lastCol; i++) {
-            addProperty(row, i, CellUtil.BORDER_TOP, borderType);
-            if (borderType == BorderStyle.NONE && row > 0) {
-                addProperty(row - 1, i, CellUtil.BORDER_BOTTOM, borderType);
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * Draws the bottom border for a range of cells
-     * </p>
-     * 
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     */
-    private void drawBottomBorder(CellRangeAddress range,
-            BorderStyle borderType) {
-        int row = range.getLastRow();
-        int firstCol = range.getFirstColumn();
-        int lastCol = range.getLastColumn();
-        for (int i = firstCol; i <= lastCol; i++) {
-            addProperty(row, i, CellUtil.BORDER_BOTTOM, borderType);
-            if (borderType == BorderStyle.NONE
-                    && row < SpreadsheetVersion.EXCEL2007.getMaxRows() - 1) {
-                addProperty(row + 1, i, CellUtil.BORDER_TOP, borderType);
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * Draws the left border for a range of cells
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     */
-    private void drawLeftBorder(CellRangeAddress range,
-            BorderStyle borderType) {
-        int firstRow = range.getFirstRow();
-        int lastRow = range.getLastRow();
-        int col = range.getFirstColumn();
-        for (int i = firstRow; i <= lastRow; i++) {
-            addProperty(i, col, CellUtil.BORDER_LEFT, borderType);
-            if (borderType == BorderStyle.NONE && col > 0) {
-                addProperty(i, col - 1, CellUtil.BORDER_RIGHT, borderType);
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * Draws the right border for a range of cells
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     */
-    private void drawRightBorder(CellRangeAddress range,
-            BorderStyle borderType) {
-        int firstRow = range.getFirstRow();
-        int lastRow = range.getLastRow();
-        int col = range.getLastColumn();
-        for (int i = firstRow; i <= lastRow; i++) {
-            addProperty(i, col, CellUtil.BORDER_RIGHT, borderType);
-            if (borderType == BorderStyle.NONE
-                    && col < SpreadsheetVersion.EXCEL2007.getMaxColumns() - 1) {
-                addProperty(i, col + 1, CellUtil.BORDER_LEFT, borderType);
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * Draws the outside borders for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     * @param extent
-     *            - {@link BorderExtent} of the borders to be
-     *            applied. Valid Values are:
-     *            <ul>
-     *            <li>BorderExtent.ALL</li>
-     *            <li>BorderExtent.HORIZONTAL</li>
-     *            <li>BorderExtent.VERTICAL</li>
-     *            </ul>
-     */
-    private void drawOutsideBorders(CellRangeAddress range,
-            BorderStyle borderType, BorderExtent extent) {
-        switch (extent) {
-        case ALL:
-        case HORIZONTAL:
-        case VERTICAL:
-            if (extent == BorderExtent.ALL || extent == BorderExtent.HORIZONTAL) {
-                drawTopBorder(range, borderType);
-                drawBottomBorder(range, borderType);
-            }
-            if (extent == BorderExtent.ALL || extent == BorderExtent.VERTICAL) {
-                drawLeftBorder(range, borderType);
-                drawRightBorder(range, borderType);
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(
-                    "Unsupported PropertyTemplate.Extent, valid Extents are ALL, HORIZONTAL, and VERTICAL");
-        }
-    }
-
-    /**
-     * <p>
-     * Draws the horizontal borders for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     * @param extent
-     *            - {@link BorderExtent} of the borders to be
-     *            applied. Valid Values are:
-     *            <ul>
-     *            <li>BorderExtent.ALL</li>
-     *            <li>BorderExtent.INSIDE</li>
-     *            </ul>
-     */
-    private void drawHorizontalBorders(CellRangeAddress range,
-            BorderStyle borderType, BorderExtent extent) {
-        switch (extent) {
-        case ALL:
-        case INSIDE:
-            int firstRow = range.getFirstRow();
-            int lastRow = range.getLastRow();
-            int firstCol = range.getFirstColumn();
-            int lastCol = range.getLastColumn();
-            for (int i = firstRow; i <= lastRow; i++) {
-                CellRangeAddress row = new CellRangeAddress(i, i, firstCol,
-                        lastCol);
-                if (extent == BorderExtent.ALL || i > firstRow) {
-                    drawTopBorder(row, borderType);
-                }
-                if (extent == BorderExtent.ALL || i < lastRow) {
-                    drawBottomBorder(row, borderType);
-                }
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(
-                    "Unsupported PropertyTemplate.Extent, valid Extents are ALL and INSIDE");
-        }
-    }
-
-    /**
-     * <p>
-     * Draws the vertical borders for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which borders are
-     *            drawn.
-     * @param borderType
-     *            - Type of border to draw. {@link BorderStyle}.
-     * @param extent
-     *            - {@link BorderExtent} of the borders to be
-     *            applied. Valid Values are:
-     *            <ul>
-     *            <li>BorderExtent.ALL</li>
-     *            <li>BorderExtent.INSIDE</li>
-     *            </ul>
-     */
-    private void drawVerticalBorders(CellRangeAddress range,
-            BorderStyle borderType, BorderExtent extent) {
-        switch (extent) {
-        case ALL:
-        case INSIDE:
-            int firstRow = range.getFirstRow();
-            int lastRow = range.getLastRow();
-            int firstCol = range.getFirstColumn();
-            int lastCol = range.getLastColumn();
-            for (int i = firstCol; i <= lastCol; i++) {
-                CellRangeAddress row = new CellRangeAddress(firstRow, lastRow,
-                        i, i);
-                if (extent == BorderExtent.ALL || i > firstCol) {
-                    drawLeftBorder(row, borderType);
-                }
-                if (extent == BorderExtent.ALL || i < lastCol) {
-                    drawRightBorder(row, borderType);
-                }
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(
-                    "Unsupported PropertyTemplate.Extent, valid Extents are ALL and INSIDE");
-        }
-    }
-
-    /**
-     * Removes all border properties from this {@link PropertyTemplate} for the
-     * specified range.
-     * 
-     * @parm range - {@link CellRangeAddress} range of cells to remove borders.
-     */
-    private void removeBorders(CellRangeAddress range) {
-        Set<String> properties = new HashSet<String>();
-        properties.add(CellUtil.BORDER_TOP);
-        properties.add(CellUtil.BORDER_BOTTOM);
-        properties.add(CellUtil.BORDER_LEFT);
-        properties.add(CellUtil.BORDER_RIGHT);
-        for (int row = range.getFirstRow(); row <= range.getLastRow(); row++) {
-            for (int col = range.getFirstColumn(); col <= range
-                    .getLastColumn(); col++) {
-                removeProperties(row, col, properties);
-            }
-        }
-        removeBorderColors(range);
-    }
-
-    /**
-     * Applies the drawn borders to a Sheet. The borders that are applied are
-     * the ones that have been drawn by the {@link #drawBorders} and
-     * {@link #drawBorderColors} methods.
-     *
-     * @param sheet
-     *            - {@link Sheet} on which to apply borders
-     */
-    public void applyBorders(Sheet sheet) {
-        Workbook wb = sheet.getWorkbook();
-        for (Map.Entry<CellAddress, Map<String, Object>> entry : _propertyTemplate
-                .entrySet()) {
-            CellAddress cellAddress = entry.getKey();
-            if (cellAddress.getRow() < wb.getSpreadsheetVersion().getMaxRows()
-                    && cellAddress.getColumn() < wb.getSpreadsheetVersion()
-                            .getMaxColumns()) {
-                Map<String, Object> properties = entry.getValue();
-                Row row = CellUtil.getRow(cellAddress.getRow(), sheet);
-                Cell cell = CellUtil.getCell(row, cellAddress.getColumn());
-                CellUtil.setCellStyleProperties(cell, properties);
-            }
-        }
-    }
-
-    /**
-     * Sets the color for a group of cell borders for a cell range. The borders
-     * are not applied to the cells at this time, just the template is drawn. If
-     * the borders do not exist, a BORDER_THIN border is used. To apply the
-     * drawn borders to a sheet, use {@link #applyBorders}.
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     * @param extent
-     *            - {@link BorderExtent} of the borders for which
-     *            colors are set.
-     */
-    public void drawBorderColors(CellRangeAddress range, short color,
-            BorderExtent extent) {
-        switch (extent) {
-        case NONE:
-            removeBorderColors(range);
-            break;
-        case ALL:
-            drawHorizontalBorderColors(range, color, BorderExtent.ALL);
-            drawVerticalBorderColors(range, color, BorderExtent.ALL);
-            break;
-        case INSIDE:
-            drawHorizontalBorderColors(range, color, BorderExtent.INSIDE);
-            drawVerticalBorderColors(range, color, BorderExtent.INSIDE);
-            break;
-        case OUTSIDE:
-            drawOutsideBorderColors(range, color, BorderExtent.ALL);
-            break;
-        case TOP:
-            drawTopBorderColor(range, color);
-            break;
-        case BOTTOM:
-            drawBottomBorderColor(range, color);
-            break;
-        case LEFT:
-            drawLeftBorderColor(range, color);
-            break;
-        case RIGHT:
-            drawRightBorderColor(range, color);
-            break;
-        case HORIZONTAL:
-            drawHorizontalBorderColors(range, color, BorderExtent.ALL);
-            break;
-        case INSIDE_HORIZONTAL:
-            drawHorizontalBorderColors(range, color, BorderExtent.INSIDE);
-            break;
-        case OUTSIDE_HORIZONTAL:
-            drawOutsideBorderColors(range, color, BorderExtent.HORIZONTAL);
-            break;
-        case VERTICAL:
-            drawVerticalBorderColors(range, color, BorderExtent.ALL);
-            break;
-        case INSIDE_VERTICAL:
-            drawVerticalBorderColors(range, color, BorderExtent.INSIDE);
-            break;
-        case OUTSIDE_VERTICAL:
-            drawOutsideBorderColors(range, color, BorderExtent.VERTICAL);
-            break;
-        }
-    }
-
-    /**
-     * <p>
-     * Sets the color of the top border for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     */
-    private void drawTopBorderColor(CellRangeAddress range, short color) {
-        int row = range.getFirstRow();
-        int firstCol = range.getFirstColumn();
-        int lastCol = range.getLastColumn();
-        for (int i = firstCol; i <= lastCol; i++) {
-            if (getBorderStyle(row, i,
-                    CellUtil.BORDER_TOP) == BorderStyle.NONE) {
-                drawTopBorder(new CellRangeAddress(row, row, i, i),
-                        BorderStyle.THIN);
-            }
-            addProperty(row, i, CellUtil.TOP_BORDER_COLOR, color);
-        }
-    }
-
-    /**
-     * <p>
-     * Sets the color of the bottom border for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     */
-    private void drawBottomBorderColor(CellRangeAddress range, short color) {
-        int row = range.getLastRow();
-        int firstCol = range.getFirstColumn();
-        int lastCol = range.getLastColumn();
-        for (int i = firstCol; i <= lastCol; i++) {
-            if (getBorderStyle(row, i,
-                    CellUtil.BORDER_BOTTOM) == BorderStyle.NONE) {
-                drawBottomBorder(new CellRangeAddress(row, row, i, i),
-                        BorderStyle.THIN);
-            }
-            addProperty(row, i, CellUtil.BOTTOM_BORDER_COLOR, color);
-        }
-    }
-
-    /**
-     * <p>
-     * Sets the color of the left border for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     */
-    private void drawLeftBorderColor(CellRangeAddress range, short color) {
-        int firstRow = range.getFirstRow();
-        int lastRow = range.getLastRow();
-        int col = range.getFirstColumn();
-        for (int i = firstRow; i <= lastRow; i++) {
-            if (getBorderStyle(i, col,
-                    CellUtil.BORDER_LEFT) == BorderStyle.NONE) {
-                drawLeftBorder(new CellRangeAddress(i, i, col, col),
-                        BorderStyle.THIN);
-            }
-            addProperty(i, col, CellUtil.LEFT_BORDER_COLOR, color);
-        }
-    }
-
-    /**
-     * <p>
-     * Sets the color of the right border for a range of cells. If the border is
-     * not drawn, it defaults to BORDER_THIN
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     */
-    private void drawRightBorderColor(CellRangeAddress range, short color) {
-        int firstRow = range.getFirstRow();
-        int lastRow = range.getLastRow();
-        int col = range.getLastColumn();
-        for (int i = firstRow; i <= lastRow; i++) {
-            if (getBorderStyle(i, col,
-                    CellUtil.BORDER_RIGHT) == BorderStyle.NONE) {
-                drawRightBorder(new CellRangeAddress(i, i, col, col),
-                        BorderStyle.THIN);
-            }
-            addProperty(i, col, CellUtil.RIGHT_BORDER_COLOR, color);
-        }
-    }
-
-    /**
-     * <p>
-     * Sets the color of the outside borders for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     * @param extent
-     *            - {@link BorderExtent} of the borders for which
-     *            colors are set. Valid Values are:
-     *            <ul>
-     *            <li>BorderExtent.ALL</li>
-     *            <li>BorderExtent.HORIZONTAL</li>
-     *            <li>BorderExtent.VERTICAL</li>
-     *            </ul>
-     */
-    private void drawOutsideBorderColors(CellRangeAddress range, short color,
-            BorderExtent extent) {
-        switch (extent) {
-        case ALL:
-        case HORIZONTAL:
-        case VERTICAL:
-            if (extent == BorderExtent.ALL || extent == BorderExtent.HORIZONTAL) {
-                drawTopBorderColor(range, color);
-                drawBottomBorderColor(range, color);
-            }
-            if (extent == BorderExtent.ALL || extent == BorderExtent.VERTICAL) {
-                drawLeftBorderColor(range, color);
-                drawRightBorderColor(range, color);
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(
-                    "Unsupported PropertyTemplate.Extent, valid Extents are ALL, HORIZONTAL, and VERTICAL");
-        }
-    }
-
-    /**
-     * <p>
-     * Sets the color of the horizontal borders for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     * @param extent
-     *            - {@link BorderExtent} of the borders for which
-     *            colors are set. Valid Values are:
-     *            <ul>
-     *            <li>BorderExtent.ALL</li>
-     *            <li>BorderExtent.INSIDE</li>
-     *            </ul>
-     */
-    private void drawHorizontalBorderColors(CellRangeAddress range, short color,
-            BorderExtent extent) {
-        switch (extent) {
-        case ALL:
-        case INSIDE:
-            int firstRow = range.getFirstRow();
-            int lastRow = range.getLastRow();
-            int firstCol = range.getFirstColumn();
-            int lastCol = range.getLastColumn();
-            for (int i = firstRow; i <= lastRow; i++) {
-                CellRangeAddress row = new CellRangeAddress(i, i, firstCol,
-                        lastCol);
-                if (extent == BorderExtent.ALL || i > firstRow) {
-                    drawTopBorderColor(row, color);
-                }
-                if (extent == BorderExtent.ALL || i < lastRow) {
-                    drawBottomBorderColor(row, color);
-                }
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(
-                    "Unsupported PropertyTemplate.Extent, valid Extents are ALL and INSIDE");
-        }
-    }
-
-    /**
-     * <p>
-     * Sets the color of the vertical borders for a range of cells.
-     * </p>
-     *
-     * @param range
-     *            - {@link CellRangeAddress} range of cells on which colors are
-     *            set.
-     * @param color
-     *            - Color index from {@link IndexedColors} used to draw the
-     *            borders.
-     * @param extent
-     *            - {@link BorderExtent} of the borders for which
-     *            colors are set. Valid Values are:
-     *            <ul>
-     *            <li>BorderExtent.ALL</li>
-     *            <li>BorderExtent.INSIDE</li>
-     *            </ul>
-     */
-    private void drawVerticalBorderColors(CellRangeAddress range, short color,
-            BorderExtent extent) {
-        switch (extent) {
-        case ALL:
-        case INSIDE:
-            int firstRow = range.getFirstRow();
-            int lastRow = range.getLastRow();
-            int firstCol = range.getFirstColumn();
-            int lastCol = range.getLastColumn();
-            for (int i = firstCol; i <= lastCol; i++) {
-                CellRangeAddress row = new CellRangeAddress(firstRow, lastRow,
-                        i, i);
-                if (extent == BorderExtent.ALL || i > firstCol) {
-                    drawLeftBorderColor(row, color);
-                }
-                if (extent == BorderExtent.ALL || i < lastCol) {
-                    drawRightBorderColor(row, color);
-                }
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(
-                    "Unsupported PropertyTemplate.Extent, valid Extents are ALL and INSIDE");
-        }
-    }
-
-    /**
-     * Removes all border properties from this {@link PropertyTemplate} for the
-     * specified range.
-     * 
-     * @parm range - {@link CellRangeAddress} range of cells to remove borders.
-     */
-    private void removeBorderColors(CellRangeAddress range) {
-        Set<String> properties = new HashSet<String>();
-        properties.add(CellUtil.TOP_BORDER_COLOR);
-        properties.add(CellUtil.BOTTOM_BORDER_COLOR);
-        properties.add(CellUtil.LEFT_BORDER_COLOR);
-        properties.add(CellUtil.RIGHT_BORDER_COLOR);
-        for (int row = range.getFirstRow(); row <= range.getLastRow(); row++) {
-            for (int col = range.getFirstColumn(); col <= range
-                    .getLastColumn(); col++) {
-                removeProperties(row, col, properties);
-            }
-        }
-    }
-
-    /**
-     * Adds a property to this {@link PropertyTemplate} for a given cell
-     *
-     * @param row
-     * @param col
-     * @param property
-     * @param value
-     */
-    private void addProperty(int row, int col, String property, short value) {
-        addProperty(row, col, property, Short.valueOf(value));
-    }
-
-    /**
-     * Adds a property to this {@link PropertyTemplate} for a given cell
-     *
-     * @param row
-     * @param col
-     * @param property
-     * @param value
-     */
-    private void addProperty(int row, int col, String property, Object value) {
-        CellAddress cell = new CellAddress(row, col);
-        Map<String, Object> cellProperties = _propertyTemplate.get(cell);
-        if (cellProperties == null) {
-            cellProperties = new HashMap<String, Object>();
-        }
-        cellProperties.put(property, value);
-        _propertyTemplate.put(cell, cellProperties);
-    }
-
-    /**
-     * Removes a set of properties from this {@link PropertyTemplate} for a
-     * given cell
-     *
-     * @param row
-     * @param col
-     * @param properties
-     */
-    private void removeProperties(int row, int col, Set<String> properties) {
-        CellAddress cell = new CellAddress(row, col);
-        Map<String, Object> cellProperties = _propertyTemplate.get(cell);
-        if (cellProperties != null) {
-            cellProperties.keySet().removeAll(properties);
-            if (cellProperties.isEmpty()) {
-                _propertyTemplate.remove(cell);
-            } else {
-                _propertyTemplate.put(cell, cellProperties);
-            }
-        }
-    }
-
-    /**
-     * Retrieves the number of borders assigned to a cell
-     *
-     * @param cell
-     */
-    public int getNumBorders(CellAddress cell) {
-        Map<String, Object> cellProperties = _propertyTemplate.get(cell);
-        if (cellProperties == null) {
-            return 0;
-        }
-
-        int count = 0;
-        for (String property : cellProperties.keySet()) {
-            if (property.equals(CellUtil.BORDER_TOP))
-                count += 1;
-            if (property.equals(CellUtil.BORDER_BOTTOM))
-                count += 1;
-            if (property.equals(CellUtil.BORDER_LEFT))
-                count += 1;
-            if (property.equals(CellUtil.BORDER_RIGHT))
-                count += 1;
-        }
-        return count;
-    }
-
-    /**
-     * Retrieves the number of borders assigned to a cell
-     *
-     * @param row
-     * @param col
-     */
-    public int getNumBorders(int row, int col) {
-        return getNumBorders(new CellAddress(row, col));
-    }
-
-    /**
-     * Retrieves the number of border colors assigned to a cell
-     *
-     * @param cell
-     */
-    public int getNumBorderColors(CellAddress cell) {
-        Map<String, Object> cellProperties = _propertyTemplate.get(cell);
-        if (cellProperties == null) {
-            return 0;
-        }
-
-        int count = 0;
-        for (String property : cellProperties.keySet()) {
-            if (property.equals(CellUtil.TOP_BORDER_COLOR))
-                count += 1;
-            if (property.equals(CellUtil.BOTTOM_BORDER_COLOR))
-                count += 1;
-            if (property.equals(CellUtil.LEFT_BORDER_COLOR))
-                count += 1;
-            if (property.equals(CellUtil.RIGHT_BORDER_COLOR))
-                count += 1;
-        }
-        return count;
-    }
-
-    /**
-     * Retrieves the number of border colors assigned to a cell
-     *
-     * @param row
-     * @param col
-     */
-    public int getNumBorderColors(int row, int col) {
-        return getNumBorderColors(new CellAddress(row, col));
-    }
-
-    /**
-     * Retrieves the border style for a given cell
-     * 
-     * @param cell
-     * @param property
-     */
-    public BorderStyle getBorderStyle(CellAddress cell, String property) {
-        BorderStyle value = BorderStyle.NONE;
-        Map<String, Object> cellProperties = _propertyTemplate.get(cell);
-        if (cellProperties != null) {
-            Object obj = cellProperties.get(property);
-            if (obj instanceof BorderStyle) {
-                value = (BorderStyle) obj;
-            }
-        }
-        return value;
-    }
-
-    /**
-     * Retrieves the border style for a given cell
-     * 
-     * @param row
-     * @param col
-     * @param property
-     */
-    public BorderStyle getBorderStyle(int row, int col, String property) {
-        return getBorderStyle(new CellAddress(row, col), property);
-    }
-
-    /**
-     * Retrieves the border style for a given cell
-     * 
-     * @param cell
-     * @param property
-     */
-    public short getTemplateProperty(CellAddress cell, String property) {
-        short value = 0;
-        Map<String, Object> cellProperties = _propertyTemplate.get(cell);
-        if (cellProperties != null) {
-            Object obj = cellProperties.get(property);
-            if (obj != null) {
-                value = getShort(obj);
-            }
-        }
-        return value;
-    }
-
-    /**
-     * Retrieves the border style for a given cell
-     * 
-     * @param row
-     * @param col
-     * @param property
-     */
-    public short getTemplateProperty(int row, int col, String property) {
-        return getTemplateProperty(new CellAddress(row, col), property);
-    }
-
-    /**
-     * Converts a Short object to a short value or 0 if the object is not a
-     * Short
-     *
-     * @param value Potentially short value to convert
-     * @return short value, or 0 if not a short
-     */
-    private static short getShort(Object value) {
-        if (value instanceof Short) {
-            return ((Short) value).shortValue();
-        }
-        return 0;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java b/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java
deleted file mode 100644
index caec5a0..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.Removal;
-
-/**
- * Various utility functions that make working with a region of cells easier.
- */
-public final class RegionUtil {
-
-    private RegionUtil() {
-        // no instances of this class
-    }
-
-    /**
-     * For setting the same property on many cells to the same value
-     */
-    private static final class CellPropertySetter {
-
-        private final String _propertyName;
-        private final Object _propertyValue;
-
-
-        public CellPropertySetter(String propertyName, int value) {
-            _propertyName = propertyName;
-            _propertyValue = Short.valueOf((short) value);
-        }
-        public CellPropertySetter(String propertyName, BorderStyle value) {
-            _propertyName = propertyName;
-            _propertyValue = value;
-        }
-
-        public void setProperty(Row row, int column) {
-            // create cell if it does not exist
-            Cell cell = CellUtil.getCell(row, column);
-            CellUtil.setCellStyleProperty(cell, _propertyName, _propertyValue);
-        }
-    }
-
-    /**
-     * Sets the left border style for a region of cells by manipulating the cell style of the individual
-     * cells on the left
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setBorderLeft(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setBorderLeft(border, region, sheet);
-    }
-    /**
-     * Sets the left border style for a region of cells by manipulating the cell style of the individual
-     * cells on the left
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     * @deprecated 3.16 beta 1. Use {@link #setBorderLeft(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.18")
-    public static void setBorderLeft(int border, CellRangeAddress region, Sheet sheet) {
-        int rowStart = region.getFirstRow();
-        int rowEnd = region.getLastRow();
-        int column = region.getFirstColumn();
-
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_LEFT, border);
-        for (int i = rowStart; i <= rowEnd; i++) {
-            cps.setProperty(CellUtil.getRow(i, sheet), column);
-        }
-    }
-    /**
-     * Sets the left border style for a region of cells by manipulating the cell style of the individual
-     * cells on the left
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.16 beta 1
-     */
-    public static void setBorderLeft(BorderStyle border, CellRangeAddress region, Sheet sheet) {
-        int rowStart = region.getFirstRow();
-        int rowEnd = region.getLastRow();
-        int column = region.getFirstColumn();
-
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_LEFT, border);
-        for (int i = rowStart; i <= rowEnd; i++) {
-            cps.setProperty(CellUtil.getRow(i, sheet), column);
-        }
-    }
-
-    /**
-     * Sets the left border color for a region of cells by manipulating the cell style of the individual
-     * cells on the left
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setLeftBorderColor(int, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setLeftBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setLeftBorderColor(color, region, sheet);
-    }
-    /**
-     * Sets the left border color for a region of cells by manipulating the cell style of the individual
-     * cells on the left
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     */
-    public static void setLeftBorderColor(int color, CellRangeAddress region, Sheet sheet) {
-        int rowStart = region.getFirstRow();
-        int rowEnd = region.getLastRow();
-        int column = region.getFirstColumn();
-
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.LEFT_BORDER_COLOR, color);
-        for (int i = rowStart; i <= rowEnd; i++) {
-            cps.setProperty(CellUtil.getRow(i, sheet), column);
-        }
-    }
-
-    /**
-     * Sets the right border style for a region of cells by manipulating the cell style of the individual
-     * cells on the right
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setBorderRight(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setBorderRight(border, region, sheet);
-    }
-    /**
-     * Sets the right border style for a region of cells by manipulating the cell style of the individual
-     * cells on the right
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     * @deprecated POI 3.16 beta 1. Use {@link #setBorderRight(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.18")
-    public static void setBorderRight(int border, CellRangeAddress region, Sheet sheet) {
-        int rowStart = region.getFirstRow();
-        int rowEnd = region.getLastRow();
-        int column = region.getLastColumn();
-
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_RIGHT, border);
-        for (int i = rowStart; i <= rowEnd; i++) {
-            cps.setProperty(CellUtil.getRow(i, sheet), column);
-        }
-    }
-    /**
-     * Sets the right border style for a region of cells by manipulating the cell style of the individual
-     * cells on the right
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.16 beta 1
-     */
-    public static void setBorderRight(BorderStyle border, CellRangeAddress region, Sheet sheet) {
-        int rowStart = region.getFirstRow();
-        int rowEnd = region.getLastRow();
-        int column = region.getLastColumn();
-
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_RIGHT, border);
-        for (int i = rowStart; i <= rowEnd; i++) {
-            cps.setProperty(CellUtil.getRow(i, sheet), column);
-        }
-    }
-
-    /**
-     * Sets the right border color for a region of cells by manipulating the cell style of the individual
-     * cells on the right
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setRightBorderColor(int, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setRightBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setRightBorderColor(color, region, sheet);
-    }
-    /**
-     * Sets the right border color for a region of cells by manipulating the cell style of the individual
-     * cells on the right
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     */
-    public static void setRightBorderColor(int color, CellRangeAddress region, Sheet sheet) {
-        int rowStart = region.getFirstRow();
-        int rowEnd = region.getLastRow();
-        int column = region.getLastColumn();
-
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.RIGHT_BORDER_COLOR, color);
-        for (int i = rowStart; i <= rowEnd; i++) {
-            cps.setProperty(CellUtil.getRow(i, sheet), column);
-        }
-    }
-
-    /**
-     * Sets the bottom border style for a region of cells by manipulating the cell style of the individual
-     * cells on the bottom
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setBorderBottom(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setBorderBottom(border, region, sheet);
-    }
-    /**
-     * Sets the bottom border style for a region of cells by manipulating the cell style of the individual
-     * cells on the bottom
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     * @deprecated POI 3.16 beta 1. Use {@link #setBorderBottom(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.18")
-    public static void setBorderBottom(int border, CellRangeAddress region, Sheet sheet) {
-        int colStart = region.getFirstColumn();
-        int colEnd = region.getLastColumn();
-        int rowIndex = region.getLastRow();
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_BOTTOM, border);
-        Row row = CellUtil.getRow(rowIndex, sheet);
-        for (int i = colStart; i <= colEnd; i++) {
-            cps.setProperty(row, i);
-        }
-    }
-    /**
-     * Sets the bottom border style for a region of cells by manipulating the cell style of the individual
-     * cells on the bottom
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.16 beta 1
-     */
-    public static void setBorderBottom(BorderStyle border, CellRangeAddress region, Sheet sheet) {
-        int colStart = region.getFirstColumn();
-        int colEnd = region.getLastColumn();
-        int rowIndex = region.getLastRow();
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_BOTTOM, border);
-        Row row = CellUtil.getRow(rowIndex, sheet);
-        for (int i = colStart; i <= colEnd; i++) {
-            cps.setProperty(row, i);
-        }
-    }
-
-    /**
-     * Sets the bottom border color for a region of cells by manipulating the cell style of the individual
-     * cells on the bottom
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setBottomBorderColor(int, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setBottomBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setBottomBorderColor(color, region, sheet);
-    }
-    /**
-     * Sets the bottom border color for a region of cells by manipulating the cell style of the individual
-     * cells on the bottom
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     */
-    public static void setBottomBorderColor(int color, CellRangeAddress region, Sheet sheet) {
-        int colStart = region.getFirstColumn();
-        int colEnd = region.getLastColumn();
-        int rowIndex = region.getLastRow();
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BOTTOM_BORDER_COLOR, color);
-        Row row = CellUtil.getRow(rowIndex, sheet);
-        for (int i = colStart; i <= colEnd; i++) {
-            cps.setProperty(row, i);
-        }
-    }
-
-    /**
-     * Sets the top border style for a region of cells by manipulating the cell style of the individual
-     * cells on the top
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setBorderTop(int border, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setBorderTop(border, region, sheet);
-    }
-    /**
-     * Sets the top border style for a region of cells by manipulating the cell style of the individual
-     * cells on the top
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     * @deprecated 3.16 beta 1. Use {@link #setBorderTop(BorderStyle, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.18")
-    public static void setBorderTop(int border, CellRangeAddress region, Sheet sheet) {
-        int colStart = region.getFirstColumn();
-        int colEnd = region.getLastColumn();
-        int rowIndex = region.getFirstRow();
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_TOP, border);
-        Row row = CellUtil.getRow(rowIndex, sheet);
-        for (int i = colStart; i <= colEnd; i++) {
-            cps.setProperty(row, i);
-        }
-    }
-    /**
-     * Sets the top border style for a region of cells by manipulating the cell style of the individual
-     * cells on the top
-     * 
-     * @param border The new border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.16 beta 1
-     */
-    public static void setBorderTop(BorderStyle border, CellRangeAddress region, Sheet sheet) {
-        int colStart = region.getFirstColumn();
-        int colEnd = region.getLastColumn();
-        int rowIndex = region.getFirstRow();
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.BORDER_TOP, border);
-        Row row = CellUtil.getRow(rowIndex, sheet);
-        for (int i = colStart; i <= colEnd; i++) {
-            cps.setProperty(row, i);
-        }
-    }
-
-    /**
-     * Sets the top border color for a region of cells by manipulating the cell style of the individual
-     * cells on the top
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param workbook The workbook that the region is on.
-     * @param sheet The sheet that the region is on.
-     * @deprecated 3.15 beta 2. Use {@link #setTopBorderColor(int, CellRangeAddress, Sheet)}.
-     */
-    @Removal(version="3.17")
-    public static void setTopBorderColor(int color, CellRangeAddress region, Sheet sheet, Workbook workbook) {
-        setTopBorderColor(color, region, sheet);
-    }
-    /**
-     * Sets the top border color for a region of cells by manipulating the cell style of the individual
-     * cells on the top
-     * 
-     * @param color The color of the border
-     * @param region The region that should have the border
-     * @param sheet The sheet that the region is on.
-     * @since POI 3.15 beta 2
-     */
-    public static void setTopBorderColor(int color, CellRangeAddress region, Sheet sheet) {
-        int colStart = region.getFirstColumn();
-        int colEnd = region.getLastColumn();
-        int rowIndex = region.getFirstRow();
-        CellPropertySetter cps = new CellPropertySetter(CellUtil.TOP_BORDER_COLOR, color);
-        Row row = CellUtil.getRow(rowIndex, sheet);
-        for (int i = colStart; i <= colEnd; i++) {
-            cps.setProperty(row, i);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/SSCellRange.java b/trunk/src/java/org/apache/poi/ss/util/SSCellRange.java
deleted file mode 100644
index f58a278..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/SSCellRange.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.lang.reflect.Array;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellRange;
-import org.apache.poi.util.Internal;
-
-/**
- * For POI internal use only
- *
- * @author Josh Micich
- */
-@Internal
-public final class SSCellRange<K extends Cell> implements CellRange<K> {
-
-	private final int _height;
-	private final int _width;
-	private final K[] _flattenedArray;
-	private final int _firstRow;
-	private final int _firstColumn;
-
-	private SSCellRange(int firstRow, int firstColumn, int height, int width, K[] flattenedArray) {
-		_firstRow = firstRow;
-		_firstColumn = firstColumn;
-		_height = height;
-		_width = width;
-		_flattenedArray = flattenedArray.clone();
-	}
-
-	public static <B extends Cell> SSCellRange<B> create(int firstRow, int firstColumn, int height, int width, List<B> flattenedList, Class<B> cellClass) {
-		int nItems = flattenedList.size();
-		if (height * width != nItems) {
-			throw new IllegalArgumentException("Array size mismatch.");
-		}
-
-		@SuppressWarnings("unchecked")
-		B[] flattenedArray = (B[]) Array.newInstance(cellClass, nItems);
-		flattenedList.toArray(flattenedArray);
-		return new SSCellRange<B>(firstRow, firstColumn, height, width, flattenedArray);
-	}
-
-	public int getHeight() {
-		return _height;
-	}
-	public int getWidth() {
-		return _width;
-	}
-	public int size() {
-		return _height*_width;
-	}
-
-	public String getReferenceText() {
-		CellRangeAddress cra = new CellRangeAddress(_firstRow, _firstRow+_height-1, _firstColumn, _firstColumn+_width-1);
-		return cra.formatAsString();
-	}
-
-	public K getTopLeftCell() {
-		return _flattenedArray[0];
-	}
-
-	public K getCell(int relativeRowIndex, int relativeColumnIndex) {
-		if (relativeRowIndex < 0 || relativeRowIndex >= _height) {
-			throw new ArrayIndexOutOfBoundsException("Specified row " + relativeRowIndex
-					+ " is outside the allowable range (0.." + (_height-1) + ").");
-		}
-		if (relativeColumnIndex < 0 || relativeColumnIndex >= _width) {
-			throw new ArrayIndexOutOfBoundsException("Specified colummn " + relativeColumnIndex
-					+ " is outside the allowable range (0.." + (_width-1) + ").");
-		}
-		int flatIndex = _width * relativeRowIndex + relativeColumnIndex;
-		return _flattenedArray[flatIndex];
-	}
-	public K[] getFlattenedCells() {
-		return _flattenedArray.clone();
-	}
-
-	public K[][] getCells() {
-		Class<?> itemCls = _flattenedArray.getClass();
-		@SuppressWarnings("unchecked")
-		K[][] result = (K[][]) Array.newInstance(itemCls, _height);
-		itemCls = itemCls.getComponentType();
-		for (int r=_height-1; r>=0; r--) {
-			@SuppressWarnings("unchecked")
-			K[] row = (K[]) Array.newInstance(itemCls, _width);
-			int flatIndex = _width * r;
-			System.arraycopy(_flattenedArray, flatIndex, row, 0, _width);
-		}
-		return result;
-	}
-	public Iterator<K> iterator() {
-		return new ArrayIterator<K>(_flattenedArray);
-	}
-	private static final class ArrayIterator<D> implements Iterator<D> {
-
-		private final D[] _array;
-		private int _index;
-
-		public ArrayIterator(D[] array) {
-			_array = array.clone();
-			_index = 0;
-		}
-		public boolean hasNext() {
-			return _index < _array.length;
-		}
-		public D next() {
-			if (_index >= _array.length) {
-				throw new NoSuchElementException(String.valueOf(_index));
-			}
-			return _array[_index++];
-		}
-
-		public void remove() {
-			throw new UnsupportedOperationException("Cannot remove cells from this CellRange.");
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/SheetBuilder.java b/trunk/src/java/org/apache/poi/ss/util/SheetBuilder.java
deleted file mode 100644
index 366d783..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/SheetBuilder.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-package org.apache.poi.ss.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Cell;
-
-/**
- * Class {@code SheetBuilder} provides an easy way of building workbook sheets
- * from 2D array of Objects. It can be used in test cases to improve code
- * readability or in Swing applications with tables.
- *
- * @author Roman Kashitsyn
- */
-public class SheetBuilder {
-
-    private final Workbook workbook;
-    private final Object[][] cells;
-    private boolean shouldCreateEmptyCells = false;
-    private String sheetName = null;
-
-    public SheetBuilder(Workbook workbook, Object[][] cells) {
-        this.workbook = workbook;
-        this.cells = cells.clone();
-    }
-
-    /**
-     * Returns {@code true} if null array elements should be treated as empty
-     * cells.
-     *
-     * @return {@code true} if null objects should be treated as empty cells
-     *         and {@code false} otherwise
-     */
-    public boolean getCreateEmptyCells() {
-        return shouldCreateEmptyCells;
-    }
-
-    /**
-     * Specifies if null array elements should be treated as empty cells.
-     *
-     * @param shouldCreateEmptyCells {@code true} if null array elements should be
-     *                               treated as empty cells
-     * @return {@code this}
-     */
-    public SheetBuilder setCreateEmptyCells(boolean shouldCreateEmptyCells) {
-        this.shouldCreateEmptyCells = shouldCreateEmptyCells;
-        return this;
-    }
-
-    /**
-     * Specifies name of the sheet to build. If not specified, default name (provided by
-     * workbook) will be used instead.
-     * @param sheetName sheet name to use
-     * @return {@code this}
-     */
-    public SheetBuilder setSheetName(String sheetName) {
-        this.sheetName = sheetName;
-        return this;
-    }
-
-    /**
-     * Builds sheet from parent workbook and 2D array with cell
-     * values. Creates rows anyway (even if row contains only null
-     * cells), creates cells if either corresponding array value is not
-     * null or createEmptyCells property is true.
-     * The conversion is performed in the following way:
-     * <p/>
-     * <ul>
-     * <li>Numbers become numeric cells.</li>
-     * <li><code>java.util.Date</code> or <code>java.util.Calendar</code>
-     * instances become date cells.</li>
-     * <li>String with leading '=' char become formulas (leading '='
-     * will be truncated).</li>
-     * <li>Other objects become strings via <code>Object.toString()</code>
-     * method call.</li>
-     * </ul>
-     *
-     * @return newly created sheet
-     */
-    public Sheet build() {
-        Sheet sheet = (sheetName == null) ? workbook.createSheet() : workbook.createSheet(sheetName);
-        Row currentRow = null;
-        Cell currentCell = null;
-
-        for (int rowIndex = 0; rowIndex < cells.length; ++rowIndex) {
-            Object[] rowArray = cells[rowIndex];
-            currentRow = sheet.createRow(rowIndex);
-
-            for (int cellIndex = 0; cellIndex < rowArray.length; ++cellIndex) {
-                Object cellValue = rowArray[cellIndex];
-                if (cellValue != null || shouldCreateEmptyCells) {
-                    currentCell = currentRow.createCell(cellIndex);
-                    setCellValue(currentCell, cellValue);
-                }
-            }
-        }
-        return sheet;
-    }
-
-    /**
-     * Sets the cell value using object type information.
-     *
-     * @param cell  cell to change
-     * @param value value to set
-     */
-    private void setCellValue(Cell cell, Object value) {
-        if (value == null || cell == null) {
-            return;
-        } else if (value instanceof Number) {
-            double doubleValue = ((Number) value).doubleValue();
-            cell.setCellValue(doubleValue);
-        } else if (value instanceof Date) {
-            cell.setCellValue((Date) value);
-        } else if (value instanceof Calendar) {
-            cell.setCellValue((Calendar) value);
-        } else if (isFormulaDefinition(value)) {
-            cell.setCellFormula(getFormula(value));
-        } else {
-            cell.setCellValue(value.toString());
-        }
-    }
-
-    private boolean isFormulaDefinition(Object obj) {
-        if (obj instanceof String) {
-            String str = (String) obj;
-            if (str.length() < 2) {
-                return false;
-            } else {
-                return ((String) obj).charAt(0) == '=';
-            }
-        } else {
-            return false;
-        }
-    }
-
-    private String getFormula(Object obj) {
-        return ((String) obj).substring(1);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java b/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java
deleted file mode 100644
index a754276..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/SheetReferences.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Holds a collection of Sheet names and their associated
- * reference numbers.
- *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- *
- */
-public class SheetReferences
-{
-    Map<Integer, String> map;
-    public SheetReferences()
-    {
-      map = new HashMap<Integer, String>(5);
-    }
-
-    public void addSheetReference(String sheetName, int number) {
-       map.put(number, sheetName);
-    }
-
-    public String getSheetName(int number) {
-       return map.get(number);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/SheetUtil.java b/trunk/src/java/org/apache/poi/ss/util/SheetUtil.java
deleted file mode 100644
index f234380..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextAttribute;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.text.AttributedString;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.Internal;
-
-
-/**
- * Helper methods for when working with Usermodel sheets
- *
- * @author Yegor Kozlov
- */
-public class SheetUtil {
-
-    /**
-     * Excel measures columns in units of 1/256th of a character width
-     * but the docs say nothing about what particular character is used.
-     * '0' looks to be a good choice.
-     */
-    private static final char defaultChar = '0';
-
-    /**
-     * This is the multiple that the font height is scaled by when determining the
-     * boundary of rotated text.
-     */
-    private static final double fontHeightMultiple = 2.0;
-
-    /**
-     *  Dummy formula evaluator that does nothing.
-     *  YK: The only reason of having this class is that
-     *  {@link org.apache.poi.ss.usermodel.DataFormatter#formatCellValue(org.apache.poi.ss.usermodel.Cell)}
-     *  returns formula string for formula cells. Dummy evaluator makes it to format the cached formula result.
-     *
-     *  See Bugzilla #50021
-     */
-    private static final FormulaEvaluator dummyEvaluator = new FormulaEvaluator(){
-        @Override
-        public void clearAllCachedResultValues(){}
-        @Override
-        public void notifySetFormula(Cell cell) {}
-        @Override
-        public void notifyDeleteCell(Cell cell) {}
-        @Override
-        public void notifyUpdateCell(Cell cell) {}
-        @Override
-        public CellValue evaluate(Cell cell) {return null;  }
-        @Override
-        public Cell evaluateInCell(Cell cell) { return null; }
-        @Override
-        public void setupReferencedWorkbooks(Map<String, FormulaEvaluator> workbooks) {}
-        @Override
-        public void setDebugEvaluationOutputForNextEval(boolean value) {}
-        @Override
-        public void setIgnoreMissingWorkbooks(boolean ignore) {}
-        @Override
-        public void evaluateAll() {}
-        @Override
-        public int evaluateFormulaCell(Cell cell) {
-            return cell.getCachedFormulaResultType();
-        }
-        /** 
-         * @since POI 3.15 beta 3
-         * @deprecated POI 3.15 beta 3. Will be deleted when we make the CellType enum transition. See bug 59791.
-         */
-        @Internal(since="POI 3.15 beta 3")
-        @Override
-        public CellType evaluateFormulaCellEnum(Cell cell) {
-            return cell.getCachedFormulaResultTypeEnum();
-        }
-    };
-
-    /**
-     * drawing context to measure text
-     */
-    private static final FontRenderContext fontRenderContext = new FontRenderContext(null, true, true);
-
-    /**
-     * Compute width of a single cell
-     *
-     * @param cell the cell whose width is to be calculated
-     * @param defaultCharWidth the width of a single character
-     * @param formatter formatter used to prepare the text to be measured
-     * @param useMergedCells    whether to use merged cells
-     * @return  the width in pixels or -1 if cell is empty
-     */
-    public static double getCellWidth(Cell cell, int defaultCharWidth, DataFormatter formatter, boolean useMergedCells) {
-        Sheet sheet = cell.getSheet();
-        Workbook wb = sheet.getWorkbook();
-        Row row = cell.getRow();
-        int column = cell.getColumnIndex();
-
-        // FIXME: this looks very similar to getCellWithMerges below. Consider consolidating.
-        // We should only be checking merged regions if useMergedCells is true. Why are we doing this for-loop?
-        int colspan = 1;
-        for (CellRangeAddress region : sheet.getMergedRegions()) {
-            if (region.isInRange(row.getRowNum(), column)) {
-                if (!useMergedCells) {
-                    // If we're not using merged cells, skip this one and move on to the next.
-                    return -1;
-                }
-                cell = row.getCell(region.getFirstColumn());
-                colspan = 1 + region.getLastColumn() - region.getFirstColumn();
-            }
-        }
-
-        CellStyle style = cell.getCellStyle();
-        CellType cellType = cell.getCellTypeEnum();
-
-        // for formula cells we compute the cell width for the cached formula result
-        if (cellType == CellType.FORMULA)
-            cellType = cell.getCachedFormulaResultTypeEnum();
-
-        Font font = wb.getFontAt(style.getFontIndex());
-
-        double width = -1;
-        if (cellType == CellType.STRING) {
-            RichTextString rt = cell.getRichStringCellValue();
-            String[] lines = rt.getString().split("\\n");
-            for (String line : lines) {
-                String txt = line + defaultChar;
-
-                AttributedString str = new AttributedString(txt);
-                copyAttributes(font, str, 0, txt.length());
-
-                if (rt.numFormattingRuns() > 0) {
-                    // TODO: support rich text fragments
-                }
-
-                width = getCellWidth(defaultCharWidth, colspan, style, width, str);
-            }
-        } else {
-            String sval = null;
-            if (cellType == CellType.NUMERIC) {
-                // Try to get it formatted to look the same as excel
-                try {
-                    sval = formatter.formatCellValue(cell, dummyEvaluator);
-                } catch (Exception e) {
-                    sval = String.valueOf(cell.getNumericCellValue());
-                }
-            } else if (cellType == CellType.BOOLEAN) {
-                sval = String.valueOf(cell.getBooleanCellValue()).toUpperCase(Locale.ROOT);
-            }
-            if(sval != null) {
-                String txt = sval + defaultChar;
-                AttributedString str = new AttributedString(txt);
-                copyAttributes(font, str, 0, txt.length());
-
-                width = getCellWidth(defaultCharWidth, colspan, style, width, str);
-            }
-        }
-        return width;
-    }
-
-    /**
-     * Calculate the best-fit width for a cell
-     * If a merged cell spans multiple columns, evenly distribute the column width among those columns
-     *
-     * @param defaultCharWidth the width of a character using the default font in a workbook
-     * @param colspan the number of columns that is spanned by the cell (1 if the cell is not part of a merged region)
-     * @param style the cell style, which contains text rotation and indention information needed to compute the cell width
-     * @param minWidth the minimum best-fit width. This algorithm will only return values greater than or equal to the minimum width.
-     * @param str the text contained in the cell
-     * @return the best fit cell width
-     */
-    private static double getCellWidth(int defaultCharWidth, int colspan,
-            CellStyle style, double minWidth, AttributedString str) {
-        TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
-        final Rectangle2D bounds;
-        if(style.getRotation() != 0){
-            /*
-             * Transform the text using a scale so that it's height is increased by a multiple of the leading,
-             * and then rotate the text before computing the bounds. The scale results in some whitespace around
-             * the unrotated top and bottom of the text that normally wouldn't be present if unscaled, but
-             * is added by the standard Excel autosize.
-             */
-            AffineTransform trans = new AffineTransform();
-            trans.concatenate(AffineTransform.getRotateInstance(style.getRotation()*2.0*Math.PI/360.0));
-            trans.concatenate(
-            AffineTransform.getScaleInstance(1, fontHeightMultiple)
-            );
-            bounds = layout.getOutline(trans).getBounds();
-        } else {
-            bounds = layout.getBounds();
-        }
-        // frameWidth accounts for leading spaces which is excluded from bounds.getWidth()
-        final double frameWidth = bounds.getX() + bounds.getWidth();
-        return Math.max(minWidth, ((frameWidth / colspan) / defaultCharWidth) + style.getIndention());
-    }
-
-    /**
-     * Compute width of a column and return the result
-     *
-     * @param sheet the sheet to calculate
-     * @param column    0-based index of the column
-     * @param useMergedCells    whether to use merged cells
-     * @return  the width in pixels or -1 if all cells are empty
-     */
-    public static double getColumnWidth(Sheet sheet, int column, boolean useMergedCells) {
-        return getColumnWidth(sheet, column, useMergedCells, sheet.getFirstRowNum(), sheet.getLastRowNum());
-    }
-    
-    /**
-     * Compute width of a column based on a subset of the rows and return the result
-     *
-     * @param sheet the sheet to calculate
-     * @param column    0-based index of the column
-     * @param useMergedCells    whether to use merged cells
-     * @param firstRow  0-based index of the first row to consider (inclusive)
-     * @param lastRow   0-based index of the last row to consider (inclusive)
-     * @return  the width in pixels or -1 if cell is empty
-     */
-    public static double getColumnWidth(Sheet sheet, int column, boolean useMergedCells, int firstRow, int lastRow){
-        DataFormatter formatter = new DataFormatter();
-        int defaultCharWidth = getDefaultCharWidth(sheet.getWorkbook());
-
-        double width = -1;
-        for (int rowIdx = firstRow; rowIdx <= lastRow; ++rowIdx) {
-            Row row = sheet.getRow(rowIdx);
-            if( row != null ) {
-                double cellWidth = getColumnWidthForRow(row, column, defaultCharWidth, formatter, useMergedCells);
-                width = Math.max(width, cellWidth);
-            }
-        }
-        return width;
-    }
-
-    /**
-     * Get default character width using the Workbook's default font
-     *
-     * @param wb the workbook to get the default character width from
-     * @return default character width in pixels
-     */
-    @Internal
-    public static int getDefaultCharWidth(final Workbook wb) {
-        Font defaultFont = wb.getFontAt((short) 0);
-
-        AttributedString str = new AttributedString(String.valueOf(defaultChar));
-        copyAttributes(defaultFont, str, 0, 1);
-        TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
-        return (int) layout.getAdvance();
-    }
-
-    /**
-     * Compute width of a single cell in a row
-     * Convenience method for {@link #getCellWidth}
-     *
-     * @param row the row that contains the cell of interest
-     * @param column the column number of the cell whose width is to be calculated
-     * @param defaultCharWidth the width of a single character
-     * @param formatter formatter used to prepare the text to be measured
-     * @param useMergedCells    whether to use merged cells
-     * @return  the width in pixels or -1 if cell is empty
-     */
-    private static double getColumnWidthForRow(
-            Row row, int column, int defaultCharWidth, DataFormatter formatter, boolean useMergedCells) {
-        if( row == null ) {
-            return -1;
-        }
-
-        Cell cell = row.getCell(column);
-
-        if (cell == null) {
-            return -1;
-        }
-
-        return getCellWidth(cell, defaultCharWidth, formatter, useMergedCells);
-    }
-
-    /**
-     * Check if the Fonts are installed correctly so that Java can compute the size of
-     * columns. 
-     * 
-     * If a Cell uses a Font which is not available on the operating system then Java may 
-     * fail to return useful Font metrics and thus lead to an auto-computed size of 0.
-     * 
-     *  This method allows to check if computing the sizes for a given Font will succeed or not.
-     *
-     * @param font The Font that is used in the Cell
-     * @return true if computing the size for this Font will succeed, false otherwise
-     */
-    public static boolean canComputeColumnWidth(Font font) {
-        // not sure what is the best value sample-here, only "1" did not work on some platforms...
-        AttributedString str = new AttributedString("1w");
-        copyAttributes(font, str, 0, "1w".length());
-
-        TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
-        if(layout.getBounds().getWidth() > 0) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Copy text attributes from the supplied Font to Java2D AttributedString
-     */
-    private static void copyAttributes(Font font, AttributedString str, int startIdx, int endIdx) {
-        str.addAttribute(TextAttribute.FAMILY, font.getFontName(), startIdx, endIdx);
-        str.addAttribute(TextAttribute.SIZE, (float)font.getFontHeightInPoints());
-        if (font.getBold()) str.addAttribute(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD, startIdx, endIdx);
-        if (font.getItalic() ) str.addAttribute(TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE, startIdx, endIdx);
-        if (font.getUnderline() == Font.U_SINGLE ) str.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON, startIdx, endIdx);
-    }
-
-    /**
-     * Check if the cell is in the specified cell range
-     *
-     * @param cr    the cell range to check in
-     * @param rowIx the row to check
-     * @param colIx the column to check
-     * @return true if the range contains the cell [rowIx, colIx]
-     * @deprecated 3.15 beta 2. Use {@link CellRangeAddressBase#isInRange(int, int)}.
-     */
-    @Deprecated
-    public static boolean containsCell(CellRangeAddress cr, int rowIx, int colIx) {
-        return cr.isInRange(rowIx,  colIx);
-    }
-
-    /**
-     * Return the cell, taking account of merged regions. Allows you to find the
-     *  cell who's contents are shown in a given position in the sheet.
-     * 
-     * <p>If the cell at the given co-ordinates is a merged cell, this will
-     *  return the primary (top-left) most cell of the merged region.
-     * <p>If the cell at the given co-ordinates is not in a merged region,
-     *  then will return the cell itself.
-     * <p>If there is no cell defined at the given co-ordinates, will return
-     *  null.
-     */
-    public static Cell getCellWithMerges(Sheet sheet, int rowIx, int colIx) {
-        Row r = sheet.getRow(rowIx);
-        if (r != null) {
-            Cell c = r.getCell(colIx);
-            if (c != null) {
-                // Normal, non-merged cell
-                return c;
-            }
-        }
-        
-        for (CellRangeAddress mergedRegion : sheet.getMergedRegions()) {
-            if (mergedRegion.isInRange(rowIx, colIx)) {
-                // The cell wanted is in this merged range
-                // Return the primary (top-left) cell for the range
-                r = sheet.getRow(mergedRegion.getFirstRow());
-                if (r != null) {
-                    return r.getCell(mergedRegion.getFirstColumn());
-                }
-            }
-        }
-        
-        // If we get here, then the cell isn't defined, and doesn't
-        //  live within any merged regions
-        return null;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java b/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java
deleted file mode 100644
index 6844348..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.ss.usermodel.Workbook;
-
-
-/**
- * Helper methods for when working with Usermodel Workbooks
- */
-public class WorkbookUtil {
-	
-	/**
-	 * Creates a valid sheet name, which is conform to the rules.
-	 * In any case, the result safely can be used for 
-	 * {@link org.apache.poi.ss.usermodel.Workbook#setSheetName(int, String)}.
-	 * <br>
-	 * Rules:
-	 * <ul>
-	 * <li>never null</li>
-	 * <li>minimum length is 1</li>
-	 * <li>maximum length is 31</li>
-	 * <li>doesn't contain special chars: : 0x0000, 0x0003, / \ ? * ] [ </li>
-	 * <li>Sheet names must not begin or end with ' (apostrophe)</li>
-	 * </ul>
-	 * Invalid characters are replaced by one space character ' '.
-	 * 
-	 * @param nameProposal can be any string, will be truncated if necessary,
-	 *        allowed to be null
-	 * @return a valid string, "empty" if to short, "null" if null         
-	 */
-	public final static String createSafeSheetName(final String nameProposal) {
-		return createSafeSheetName(nameProposal, ' ');
-	}
-
-    /**
-     * Creates a valid sheet name, which is conform to the rules.
-     * In any case, the result safely can be used for
-     * {@link org.apache.poi.ss.usermodel.Workbook#setSheetName(int, String)}.
-     * <br>
-     * Rules:
-     * <ul>
-     * <li>never null</li>
-     * <li>minimum length is 1</li>
-     * <li>maximum length is 31</li>
-     * <li>doesn't contain special chars: : 0x0000, 0x0003, / \ ? * ] [ </li>
-     * <li>Sheet names must not begin or end with ' (apostrophe)</li>
-     * </ul>
-     *
-     * @param nameProposal can be any string, will be truncated if necessary,
-     *        allowed to be null
-     * @param replaceChar the char to replace invalid characters.
-     * @return a valid string, "empty" if to short, "null" if null
-     */
-    public final static String createSafeSheetName(final String nameProposal, char replaceChar) {
-        if (nameProposal == null) {
-            return "null";
-        }
-        if (nameProposal.length() < 1) {
-            return "empty";
-        }
-        final int length = Math.min(31, nameProposal.length());
-        final String shortenname = nameProposal.substring(0, length);
-        final StringBuilder result = new StringBuilder(shortenname);
-        for (int i=0; i<length; i++) {
-            char ch = result.charAt(i);
-            switch (ch) {
-                case '\u0000':
-                case '\u0003':
-                case ':':
-                case '/':
-                case '\\':
-                case '?':
-                case '*':
-                case ']':
-                case '[':
-                    result.setCharAt(i, replaceChar);
-                    break;
-                case '\'':
-                    if (i==0 || i==length-1) {
-                        result.setCharAt(i, replaceChar);
-                    }
-                    break;
-                default:
-                    // all other chars OK
-            }
-        }
-        return result.toString();
-    }
-
-    /**
-     * Validates sheet name.
-     *
-     * <p>
-     * The character count <tt>MUST</tt> be greater than or equal to 1 and less than or equal to 31.
-     * The string MUST NOT contain the any of the following characters:
-     * <ul>
-     * <li> 0x0000 </li>
-     * <li> 0x0003 </li>
-     * <li> colon (:) </li>
-     * <li> backslash (\) </li>
-     * <li> asterisk (*) </li>
-     * <li> question mark (?) </li>
-     * <li> forward slash (/) </li>
-     * <li> opening square bracket ([) </li>
-     * <li> closing square bracket (]) </li>
-     * </ul>
-     * The string MUST NOT begin or end with the single quote (') character.
-     * </p>
-     *
-     * @param sheetName the name to validate
-     * @throws IllegalArgumentException if validation fails
-     */
-    public static void validateSheetName(String sheetName) {
-        if (sheetName == null) {
-            throw new IllegalArgumentException("sheetName must not be null");
-        }
-        int len = sheetName.length();
-        if (len < 1 || len > 31) {
-            throw new IllegalArgumentException("sheetName '" + sheetName
-                    + "' is invalid - character count MUST be greater than or equal to 1 and less than or equal to 31");
-        }
-
-        for (int i=0; i<len; i++) {
-            char ch = sheetName.charAt(i);
-            switch (ch) {
-                case '/':
-                case '\\':
-                case '?':
-                case '*':
-                case ']':
-                case '[':
-                case ':':
-                    break;
-                default:
-                    // all other chars OK
-                    continue;
-            }
-            throw new IllegalArgumentException("Invalid char (" + ch
-                    + ") found at index (" + i + ") in sheet name '" + sheetName + "'");
-        }
-        if (sheetName.charAt(0) == '\'' || sheetName.charAt(len-1) == '\'') {
-            throw new IllegalArgumentException("Invalid sheet name '" + sheetName
-                    + "'. Sheet names must not begin or end with (').");
-        }
-    }
-
-
-    /**
-     * Validates sheet state
-     *
-     * @param state the state to validate
-     * @throws IllegalArgumentException if state is not one of
-     *      {@link Workbook#SHEET_STATE_VISIBLE},
-     *      {@link Workbook#SHEET_STATE_HIDDEN} or
-     *      {@link Workbook#SHEET_STATE_VERY_HIDDEN}
-     */
-    public static void validateSheetState(int state) {
-        switch(state){
-            case Workbook.SHEET_STATE_VISIBLE: break;
-            case Workbook.SHEET_STATE_HIDDEN: break;
-            case Workbook.SHEET_STATE_VERY_HIDDEN: break;
-            default: throw new IllegalArgumentException("Ivalid sheet state : " + state + "\n" +
-                            "Sheet state must beone of the Workbook.SHEET_STATE_* constants");
-        }
-    }    
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellHandler.java b/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
deleted file mode 100644
index 9fb4542..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util.cellwalk;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-/**
- * Represents callback for CellWalk traverse method.  
- * @author Roman Kashitsyn
- */
-public interface CellHandler {
-
-    /**
-     * @param cell current cell
-     * @param ctx information about invokation context
-     */
-    void onCell(Cell cell, CellWalkContext ctx);
-
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java b/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
deleted file mode 100644
index b6fbbb3..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util.cellwalk;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * Traverse cell range.
- *
- * @author Roman Kashitsyn
- */
-public class CellWalk {
-
-    private Sheet sheet;
-    private CellRangeAddress range;
-    private boolean traverseEmptyCells;
-
-
-    public CellWalk(Sheet sheet, CellRangeAddress range) {
-        this.sheet = sheet;
-        this.range = range;
-        this.traverseEmptyCells = false;
-    }
-
-    /**
-     * Should we call handler on empty (blank) cells. Default is
-     * false.
-     *
-     * @return true if handler should be called on empty (blank)
-     *         cells, false otherwise.
-     */
-    public boolean isTraverseEmptyCells() {
-        return traverseEmptyCells;
-    }
-
-    /**
-     * Sets the traverseEmptyCells property.
-     *
-     * @param traverseEmptyCells new property value
-     */
-    public void setTraverseEmptyCells(boolean traverseEmptyCells) {
-        this.traverseEmptyCells = traverseEmptyCells;
-    }
-
-    /**
-     * Traverse cell range from top left to bottom right cell.
-     *
-     * @param handler handler to call on each appropriate cell
-     */
-    public void traverse(CellHandler handler) {
-        int firstRow = range.getFirstRow();
-        int lastRow = range.getLastRow();
-        int firstColumn = range.getFirstColumn();
-        int lastColumn = range.getLastColumn();
-        final int width = lastColumn - firstColumn + 1;
-        SimpleCellWalkContext ctx = new SimpleCellWalkContext();
-        Row currentRow = null;
-        Cell currentCell = null;
-
-        for (ctx.rowNumber = firstRow; ctx.rowNumber <= lastRow; ++ctx.rowNumber) {
-            currentRow = sheet.getRow(ctx.rowNumber);
-            if (currentRow == null) {
-                continue;
-            }
-            for (ctx.colNumber = firstColumn; ctx.colNumber <= lastColumn; ++ctx.colNumber) {
-                currentCell = currentRow.getCell(ctx.colNumber);
-
-                if (currentCell == null) {
-                    continue;
-                }
-                if (isEmpty(currentCell) && !traverseEmptyCells) {
-                    continue;
-                }
-
-                ctx.ordinalNumber =
-                        (ctx.rowNumber - firstRow) * width +
-                                (ctx.colNumber - firstColumn + 1);
-
-                handler.onCell(currentCell, ctx);
-            }
-        }
-    }
-
-    private boolean isEmpty(Cell cell) {
-        return (cell.getCellTypeEnum() == CellType.BLANK);
-    }
-
-    /**
-     * Inner class to hold walk context.
-     *
-     * @author Roman Kashitsyn
-     */
-    private static class SimpleCellWalkContext implements CellWalkContext {
-        public long ordinalNumber = 0;
-        public int rowNumber = 0;
-        public int colNumber = 0;
-
-        public long getOrdinalNumber() {
-            return ordinalNumber;
-        }
-
-        public int getRowNumber() {
-            return rowNumber;
-        }
-
-        public int getColumnNumber() {
-            return colNumber;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java b/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
deleted file mode 100644
index f22bd6f..0000000
--- a/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util.cellwalk;
-
-/**
- * @author Roman Kashitsyn
- */
-public interface CellWalkContext {
-
-    /**
-     * Returns ordinal number of cell in range.  Numeration starts
-     * from top left cell and ends at bottom right cell. Here is a
-     * brief example (number in cell is it's ordinal number):
-     *
-     * <table border="1">
-     *   <tbody>
-     *     <tr><td>1</td><td>2</td></tr>
-     *     <tr><td>3</td><td>4</td></tr>
-     *   </tbody>
-     * </table>
-     *
-     * @return ordinal number of current cell
-     */
-    long getOrdinalNumber();
-
-    /**
-     * Returns number of current row.
-     * @return number of current row
-     */
-    int getRowNumber();
-
-    /**
-     * Returns number of current column.
-     * @return number of current column
-     */
-    int getColumnNumber();
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/util/ArrayUtil.java b/trunk/src/java/org/apache/poi/util/ArrayUtil.java
deleted file mode 100644
index 17f6a29..0000000
--- a/trunk/src/java/org/apache/poi/util/ArrayUtil.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-
-/**
- * Utility classes for dealing with arrays.
- *
- * @author Glen Stampoultzis
- */
-public class ArrayUtil
-{
-    /**
-     * This is really a debugging version of <code>System.arraycopy()</code>.
-     * Use it to provide better exception messages when copying arrays around.
-     * For production use it's better to use the original for speed.
-     */
-    public static void arraycopy(byte[] src, int src_position, byte[] dst, int dst_position, int length)
-    {
-        if (src_position < 0)
-            throw new IllegalArgumentException("src_position was less than 0.  Actual value " + src_position);
-        if (src_position >= src.length)
-            throw new IllegalArgumentException( "src_position was greater than src array size.  Tried to write starting at position " + src_position + " but the array length is " + src.length );
-        if (src_position + length > src.length)
-            throw new IllegalArgumentException("src_position + length would overrun the src array.  Expected end at " + (src_position + length) + " actual end at " + src.length);
-        if (dst_position < 0)
-            throw new IllegalArgumentException("dst_position was less than 0.  Actual value " + dst_position);
-        if (dst_position >= dst.length)
-            throw new IllegalArgumentException( "dst_position was greater than dst array size.  Tried to write starting at position " + dst_position + " but the array length is " + dst.length );
-        if (dst_position + length > dst.length)
-            throw new IllegalArgumentException("dst_position + length would overrun the dst array.  Expected end at " + (dst_position + length) + " actual end at " + dst.length);
-
-        System.arraycopy( src, src_position, dst, dst_position, length);
-    }
-
-    /**
-     * Moves a number of entries in an array to another point in the array,
-     *  shifting those inbetween as required.
-     * @param array The array to alter
-     * @param moveFrom The (0 based) index of the first entry to move
-     * @param moveTo The (0 based) index of the positition to move to
-     * @param numToMove The number of entries to move
-     */
-    public static void arrayMoveWithin(Object[] array, int moveFrom, int moveTo, int numToMove) {
-    	// If we're not asked to do anything, return now
-    	if(numToMove <= 0) { return; }
-    	if(moveFrom == moveTo) { return; }
-    	
-    	// Check that the values supplied are valid
-    	if(moveFrom < 0 || moveFrom >= array.length) {
-    		throw new IllegalArgumentException("The moveFrom must be a valid array index");
-    	}
-    	if(moveTo < 0 || moveTo >= array.length) {
-    		throw new IllegalArgumentException("The moveTo must be a valid array index");
-    	}
-    	if(moveFrom+numToMove > array.length) {
-    		throw new IllegalArgumentException("Asked to move more entries than the array has");
-    	}
-    	if(moveTo+numToMove > array.length) {
-    		throw new IllegalArgumentException("Asked to move to a position that doesn't have enough space");
-    	}
-    	
-    	// Grab the bit to move 
-    	Object[] toMove = new Object[numToMove];
-    	System.arraycopy(array, moveFrom, toMove, 0, numToMove);
-    	
-    	// Grab the bit to be shifted
-    	Object[] toShift;
-    	int shiftTo;
-    	if(moveFrom > moveTo) {
-    		// Moving to an earlier point in the array
-    		// Grab everything between the two points
-    		toShift = new Object[(moveFrom-moveTo)];
-    		System.arraycopy(array, moveTo, toShift, 0, toShift.length);
-    		shiftTo = moveTo + numToMove;
-    	} else {
-    		// Moving to a later point in the array
-    		// Grab everything from after the toMove block, to the new point
-    		toShift = new Object[(moveTo-moveFrom)];
-    		System.arraycopy(array, moveFrom+numToMove, toShift, 0, toShift.length);
-    		shiftTo = moveFrom;
-    	}
-    	
-    	// Copy the moved block to its new location
-    	System.arraycopy(toMove, 0, array, moveTo, toMove.length);
-    	
-    	// And copy the shifted block to the shifted location
-    	System.arraycopy(toShift, 0, array, shiftTo, toShift.length);
-    	
-    	
-    	// We're done - array will now have everything moved as required
-    }
-
-}
diff --git a/trunk/src/java/org/apache/poi/util/Beta.java b/trunk/src/java/org/apache/poi/util/Beta.java
deleted file mode 100644
index 0f0d808..0000000
--- a/trunk/src/java/org/apache/poi/util/Beta.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-
-/**
- * Signifies that a public API (public class, method or field) is subject to
- * incompatible changes, or even removal, in a future release. An API bearing
- * this annotation is exempt from any compatibility guarantees made by its
- * containing library.
- */
-@Documented
-@Retention(RetentionPolicy.SOURCE)
-public @interface Beta {
-    // just an annotation, no code needed
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/util/BitField.java b/trunk/src/java/org/apache/poi/util/BitField.java
deleted file mode 100644
index 012e6ac..0000000
--- a/trunk/src/java/org/apache/poi/util/BitField.java
+++ /dev/null
@@ -1,321 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-/**
- * Manage operations dealing with bit-mapped fields.
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-@Internal(since="POI 3.15 beta 3")
-public class BitField
-{
-    private final int _mask;
-    private final int _shift_count;
-
-    /**
-     * Create a BitField instance
-     *
-     * @param mask the mask specifying which bits apply to this
-     *             BitField. Bits that are set in this mask are the
-     *             bits that this BitField operates on
-     */
-
-    public BitField(final int mask)
-    {
-        _mask = mask;
-        int count       = 0;
-        int bit_pattern = mask;
-
-        if (bit_pattern != 0)
-        {
-            while ((bit_pattern & 1) == 0)
-            {
-                count++;
-                bit_pattern >>= 1;
-            }
-        }
-        _shift_count = count;
-    }
-
-    /**
-     * Obtain the value for the specified BitField, appropriately
-     * shifted right. Many users of a BitField will want to treat the
-     * specified bits as an int value, and will not want to be aware
-     * that the value is stored as a BitField (and so shifted left so
-     * many bits)
-     *
-     * @param holder the int data containing the bits we're interested
-     *               in
-     *
-     * @return the selected bits, shifted right appropriately
-     */
-
-    public int getValue(final int holder)
-    {
-        return getRawValue(holder) >>> _shift_count;
-    }
-
-    /**
-     * Obtain the value for the specified BitField, appropriately
-     * shifted right, as a short. Many users of a BitField will want
-     * to treat the specified bits as an int value, and will not want
-     * to be aware that the value is stored as a BitField (and so
-     * shifted left so many bits)
-     *
-     * @param holder the short data containing the bits we're
-     *               interested in
-     *
-     * @return the selected bits, shifted right appropriately
-     */
-
-    public short getShortValue(final short holder)
-    {
-        return ( short ) getValue(holder);
-    }
-
-    /**
-     * Obtain the value for the specified BitField, unshifted
-     *
-     * @param holder the int data containing the bits we're interested
-     *               in
-     *
-     * @return the selected bits
-     */
-
-    public int getRawValue(final int holder)
-    {
-        return (holder & _mask);
-    }
-
-    /**
-     * Obtain the value for the specified BitField, unshifted
-     *
-     * @param holder the short data containing the bits we're
-     *               interested in
-     *
-     * @return the selected bits
-     */
-
-    public short getShortRawValue(final short holder)
-    {
-        return ( short ) getRawValue(holder);
-    }
-
-    /**
-     * Is the field set or not? This is most commonly used for a
-     * single-bit field, which is often used to represent a boolean
-     * value; the results of using it for a multi-bit field is to
-     * determine whether *any* of its bits are set
-     *
-     * @param holder the int data containing the bits we're interested in
-     *
-     * @return true if any of the bits are set, else false
-     */
-
-    public boolean isSet(final int holder)
-    {
-        return (holder & _mask) != 0;
-    }
-
-    /**
-     * Are all of the bits set or not? This is a stricter test than
-     * isSet, in that all of the bits in a multi-bit set must be set
-     * for this method to return true
-     *
-     * @param holder the int data containing the bits we're interested in
-     *
-     * @return true if all of the bits are set, else false
-     */
-
-    public boolean isAllSet(final int holder)
-    {
-        return (holder & _mask) == _mask;
-    }
-
-    /**
-     * Replace the bits with new values.
-     *
-     * @param holder the int data containing the bits we're interested in
-     * @param value the new value for the specified bits
-     *
-     * @return the value of holder with the bits from the value
-     *         parameter replacing the old bits
-     */
-
-    public int setValue(final int holder, final int value)
-    {
-        return (holder & ~_mask) | ((value << _shift_count) & _mask);
-    }
-
-    /**
-     * Replace the bits with new values.
-     *
-     * @param holder the short data containing the bits we're interested in
-     * @param value the new value for the specified bits
-     *
-     * @return the value of holder with the bits from the value
-     *         parameter replacing the old bits
-     */
-
-    public short setShortValue(final short holder, final short value)
-    {
-        return ( short ) setValue(holder, value);
-    }
-
-    /**
-     * Clear the bits.
-     *
-     * @param holder the int data containing the bits we're interested in
-     *
-     * @return the value of holder with the specified bits cleared
-     *         (set to 0)
-     */
-
-    public int clear(final int holder)
-    {
-        return holder & ~_mask;
-    }
-
-    /**
-     * Clear the bits.
-     *
-     * @param holder the short data containing the bits we're
-     *               interested in
-     *
-     * @return the value of holder with the specified bits cleared
-     *         (set to 0)
-     */
-
-    public short clearShort(final short holder)
-    {
-        return ( short ) clear(holder);
-    }
-
-    /**
-     * Clear the bits.
-     *
-     * @param holder the byte data containing the bits we're
-     *               interested in
-     *
-     * @return the value of holder with the specified bits cleared
-     *         (set to 0)
-     */
-
-    public byte clearByte(final byte holder)
-    {
-        return ( byte ) clear(holder);
-    }
-
-    /**
-     * Set the bits.
-     *
-     * @param holder the int data containing the bits we're interested
-     *               in
-     *
-     * @return the value of holder with the specified bits set to 1
-     */
-
-    public int set(final int holder)
-    {
-        return holder | _mask;
-    }
-
-    /**
-     * Set the bits.
-     *
-     * @param holder the short data containing the bits we're
-     *               interested in
-     *
-     * @return the value of holder with the specified bits set to 1
-     */
-
-    public short setShort(final short holder)
-    {
-        return ( short ) set(holder);
-    }
-
-    /**
-     * Set the bits.
-     *
-     * @param holder the byte data containing the bits we're
-     *               interested in
-     *
-     * @return the value of holder with the specified bits set to 1
-     */
-
-    public byte setByte(final byte holder)
-    {
-        return ( byte ) set(holder);
-    }
-
-    /**
-     * Set a boolean BitField
-     *
-     * @param holder the int data containing the bits we're interested
-     *               in
-     * @param flag indicating whether to set or clear the bits
-     *
-     * @return the value of holder with the specified bits set or
-     *         cleared
-     */
-
-    public int setBoolean(final int holder, final boolean flag)
-    {
-        return flag ? set(holder)
-                    : clear(holder);
-    }
-
-    /**
-     * Set a boolean BitField
-     *
-     * @param holder the short data containing the bits we're
-     *               interested in
-     * @param flag indicating whether to set or clear the bits
-     *
-     * @return the value of holder with the specified bits set or
-     *         cleared
-     */
-
-    public short setShortBoolean(final short holder, final boolean flag)
-    {
-        return flag ? setShort(holder)
-                    : clearShort(holder);
-    }
-
-    /**
-     * Set a boolean BitField
-     *
-     * @param holder the byte data containing the bits we're
-     *               interested in
-     * @param flag indicating whether to set or clear the bits
-     *
-     * @return the value of holder with the specified bits set or
-     *         cleared
-     */
-
-    public byte setByteBoolean(final byte holder, final boolean flag)
-    {
-        return flag ? setByte(holder)
-                    : clearByte(holder);
-    }
-}   // end public class BitField
-
diff --git a/trunk/src/java/org/apache/poi/util/BitFieldFactory.java b/trunk/src/java/org/apache/poi/util/BitFieldFactory.java
deleted file mode 100644
index 047d5cb..0000000
--- a/trunk/src/java/org/apache/poi/util/BitFieldFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.util.*;
-
-/**
- * Returns immutable Bitfield instances.
- */
-public class BitFieldFactory {
-    private static Map<Integer, BitField> instances = new HashMap<Integer, BitField>();
-
-    public static BitField getInstance(int mask) {
-      BitField f = instances.get(Integer.valueOf(mask));
-      if (f == null) {
-        f = new BitField(mask);
-        instances.put(Integer.valueOf(mask), f);
-      }
-      return f;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/BlockingInputStream.java b/trunk/src/java/org/apache/poi/util/BlockingInputStream.java
deleted file mode 100644
index 298c6aa..0000000
--- a/trunk/src/java/org/apache/poi/util/BlockingInputStream.java
+++ /dev/null
@@ -1,119 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * Implementation of a BlockingInputStream to provide data to 
- * RawDataBlock that expects data in 512 byte chunks.  Useful to read
- * data from slow (ie, non FileInputStream) sources, for example when 
- * reading an OLE2 Document over a network. 
- *
- * Possible extensions: add a timeout. Currently a call to read(byte[]) on this
- *    class is blocking, so use at your own peril if your underlying stream blocks. 
- *
- * @author Jens Gerhard
- * @author aviks - documentation cleanups. 
- */
-public class BlockingInputStream
-      extends InputStream
-{
-      protected InputStream is;
-
-      public BlockingInputStream(InputStream is)
-      {
-          this.is = is;
-      }
-
-      public int available()
-        throws IOException
-      {
-          return is.available();
-      }
-
-      public void close()
-        throws IOException
-      {
-          is.close();
-      }
-
-      public void mark(int readLimit)
-      {
-          is.mark(readLimit);
-      }
-
-      public boolean markSupported()
-      {
-          return is.markSupported();
-      }
-
-      public int read()
-        throws IOException
-      {
-          return is.read();
-      }
-      
-      /**
-       * We had to revert to byte per byte reading to keep
-       * with slow network connections on one hand, without
-       * missing the end-of-file. 
-       * This is the only method that does its own thing in this class
-       *    everything else is delegated to aggregated stream. 
-       * THIS IS A BLOCKING BLOCK READ!!!
-       */
-      public int read(byte[] bf)
-        throws IOException
-      {
-          
-          int i = 0;
-          int b = 4611;
-          while ( i < bf.length )
-          {
-              b = is.read();
-              if ( b == -1 )
-                  break;
-              bf[i++] = (byte) b;
-          }
-          if ( i == 0 && b == -1 )
-              return -1;
-          return i;
-      }
-
-      public int read(byte[] bf, int s, int l)
-        throws IOException
-      {
-          return is.read(bf, s, l);
-      }
-
-      public void reset()
-        throws IOException
-      {
-          is.reset();
-      }
-
-      public long skip(long n)
-        throws IOException
-      {
-          return is.skip(n);
-      }
-}
-
diff --git a/trunk/src/java/org/apache/poi/util/BoundedInputStream.java b/trunk/src/java/org/apache/poi/util/BoundedInputStream.java
deleted file mode 100644
index 7812116..0000000
--- a/trunk/src/java/org/apache/poi/util/BoundedInputStream.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.poi.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * This is a stream that will only supply bytes up to a certain length - if its
- * position goes above that, it will stop.
- * <p>
- * This is useful to wrap ServletInputStreams. The ServletInputStream will block
- * if you try to read content from it that isn't there, because it doesn't know
- * whether the content hasn't arrived yet or whether the content has finished.
- * So, one of these, initialized with the Content-length sent in the
- * ServletInputStream's header, will stop it blocking, providing it's been sent
- * with a correct content length.
- *
- * @version $Id$
- * @since Commons IO 2.0
- */
-public class BoundedInputStream extends InputStream {
-
-    /** the wrapped input stream */
-    private final InputStream in;
-
-    /** the max length to provide */
-    private final long max;
-
-    /** the number of bytes already returned */
-    private long pos = 0;
-
-    /** the marked position */
-    private long mark = -1;
-
-    /** flag if close shoud be propagated */
-    private boolean propagateClose = true;
-
-    /**
-     * Creates a new <code>BoundedInputStream</code> that wraps the given input
-     * stream and limits it to a certain size.
-     *
-     * @param in The wrapped input stream
-     * @param size The maximum number of bytes to return
-     */
-    public BoundedInputStream(InputStream in, long size) {
-        // Some badly designed methods - eg the servlet API - overload length
-        // such that "-1" means stream finished
-        this.max = size;
-        this.in = in;
-    }
-
-    /**
-     * Creates a new <code>BoundedInputStream</code> that wraps the given input
-     * stream and is unlimited.
-     *
-     * @param in The wrapped input stream
-     */
-    public BoundedInputStream(InputStream in) {
-        this(in, -1);
-    }
-
-    /**
-     * Invokes the delegate's <code>read()</code> method if
-     * the current position is less than the limit.
-     * @return the byte read or -1 if the end of stream or
-     * the limit has been reached.
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    public int read() throws IOException {
-        if (max>=0 && pos==max) {
-            return -1;
-        }
-        int result = in.read();
-        pos++;
-        return result;
-    }
-
-    /**
-     * Invokes the delegate's <code>read(byte[])</code> method.
-     * @param b the buffer to read the bytes into
-     * @return the number of bytes read or -1 if the end of stream or
-     * the limit has been reached.
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    public int read(byte[] b) throws IOException {
-        return this.read(b, 0, b.length);
-    }
-
-    /**
-     * Invokes the delegate's <code>read(byte[], int, int)</code> method.
-     * @param b the buffer to read the bytes into
-     * @param off The start offset
-     * @param len The number of bytes to read
-     * @return the number of bytes read or -1 if the end of stream or
-     * the limit has been reached.
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        if (max>=0 && pos>=max) {
-            return -1;
-        }
-        long maxRead = max>=0 ? Math.min(len, max-pos) : len;
-        int bytesRead = in.read(b, off, (int)maxRead);
-
-        if (bytesRead==-1) {
-            return -1;
-        }
-
-        pos+=bytesRead;
-        return bytesRead;
-    }
-
-    /**
-     * Invokes the delegate's <code>skip(long)</code> method.
-     * @param n the number of bytes to skip
-     * @return the actual number of bytes skipped
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    public long skip(long n) throws IOException {
-        long toSkip = max>=0 ? Math.min(n, max-pos) : n;
-        long skippedBytes = in.skip(toSkip);
-        pos+=skippedBytes;
-        return skippedBytes;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int available() throws IOException {
-        if (max>=0 && pos>=max) {
-            return 0;
-        }
-        return in.available();
-    }
-
-    /**
-     * Invokes the delegate's <code>toString()</code> method.
-     * @return the delegate's <code>toString()</code>
-     */
-    @Override
-    public String toString() {
-        return in.toString();
-    }
-
-    /**
-     * Invokes the delegate's <code>close()</code> method
-     * if {@link #isPropagateClose()} is <code>true</code>.
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    public void close() throws IOException {
-        if (propagateClose) {
-            in.close();
-        }
-    }
-
-    /**
-     * Invokes the delegate's <code>reset()</code> method.
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    public synchronized void reset() throws IOException {
-        in.reset();
-        pos = mark;
-    }
-
-    /**
-     * Invokes the delegate's <code>mark(int)</code> method.
-     * @param readlimit read ahead limit
-     */
-    @Override
-    public synchronized void mark(int readlimit) {
-        in.mark(readlimit);
-        mark = pos;
-    }
-
-    /**
-     * Invokes the delegate's <code>markSupported()</code> method.
-     * @return true if mark is supported, otherwise false
-     */
-    @Override
-    public boolean markSupported() {
-        return in.markSupported();
-    }
-
-    /**
-     * Indicates whether the {@link #close()} method
-     * should propagate to the underling {@link InputStream}.
-     *
-     * @return <code>true</code> if calling {@link #close()}
-     * propagates to the <code>close()</code> method of the
-     * underlying stream or <code>false</code> if it does not.
-     */
-    public boolean isPropagateClose() {
-        return propagateClose;
-    }
-
-    /**
-     * Set whether the {@link #close()} method
-     * should propagate to the underling {@link InputStream}.
-     *
-     * @param propagateClose <code>true</code> if calling
-     * {@link #close()} propagates to the <code>close()</code>
-     * method of the underlying stream or
-     * <code>false</code> if it does not.
-     */
-    public void setPropagateClose(boolean propagateClose) {
-        this.propagateClose = propagateClose;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/ByteField.java b/trunk/src/java/org/apache/poi/util/ByteField.java
deleted file mode 100644
index ca62277..0000000
--- a/trunk/src/java/org/apache/poi/util/ByteField.java
+++ /dev/null
@@ -1,225 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import org.apache.poi.util.LittleEndian.BufferUnderrunException;
-
-import java.io.*;
-import java.nio.BufferUnderflowException;
-
-/**
- * representation of a byte (8-bit) field at a fixed location within a
- * byte array
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public class ByteField
-    implements FixedField
-{
-    private static final byte _default_value = 0;
-    private byte              _value;
-    private final int         _offset;
-
-    /**
-     * construct the ByteField with its offset into its containing
-     * byte array and a default value of 0
-     *
-     * @param offset of the field within its byte array
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public ByteField(final int offset)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset, _default_value);
-    }
-
-    /**
-     * construct the ByteField with its offset into its containing
-     * byte array and initialize its value
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public ByteField(final int offset, final byte value)
-        throws ArrayIndexOutOfBoundsException
-    {
-        if (offset < 0)
-        {
-            throw new ArrayIndexOutOfBoundsException(
-                "offset cannot be negative");
-        }
-        _offset = offset;
-        set(value);
-    }
-
-    /**
-     * Construct the ByteField with its offset into its containing
-     * byte array and initialize its value from its byte array
-     *
-     * @param offset of the field within its byte array
-     * @param data the byte array to read the value from
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is not
-     *            within the range of 0..(data.length - 1)
-     */
-
-    public ByteField(final int offset, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        readFromBytes(data);
-    }
-
-    /**
-     * construct the ByteField with its offset into its containing
-     * byte array, initialize its value, and write its value to its
-     * byte array
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is not
-     *            within the range of 0..(data.length - 1)
-     */
-
-    public ByteField(final int offset, final byte value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset, value);
-        writeToBytes(data);
-    }
-
-    /**
-     * get the ByteField's current value
-     *
-     * @return current value
-     */
-
-    public byte get()
-    {
-        return _value;
-    }
-
-    /**
-     * set the ByteField's current value
-     *
-     * @param value to be set
-     */
-
-    public void set(final byte value)
-    {
-        _value = value;
-    }
-
-    /**
-     * set the ByteField's current value and write it to a byte array
-     *
-     * @param value to be set
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of the byte array's range
-     */
-
-    public void set(final byte value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        set(value);
-        writeToBytes(data);
-    }
-
-    /* ********** START implementation of FixedField ********** */
-
-    /**
-     * set the value from its offset into an array of bytes
-     *
-     * @param data the byte array from which the value is to be read
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of range of the bte array
-     */
-
-    public void readFromBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        _value = data[ _offset ];
-    }
-
-    /**
-     * set the value from an InputStream
-     *
-     * @param stream the InputStream from which the value is to be
-     *               read
-     *
-     * @exception BufferUnderrunException if there is not enough data
-     *            available from the InputStream
-     * @exception IOException if an IOException is thrown from reading
-     *            the InputStream
-     */
-
-    public void readFromStream(final InputStream stream)
-        throws IOException
-    {
-    	// TODO - are these ~Field used / necessary
-    	int ib = stream.read();
-    	if (ib < 0) {
-    		throw new BufferUnderflowException();
-    	}
-        _value = (byte) ib;
-    }
-
-    /**
-     * write the value out to an array of bytes at the appropriate
-     * offset
-     *
-     * @param data the array of bytes to which the value is to be
-     *             written
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of the byte array's range
-     */
-
-    public void writeToBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        data[ _offset ] = _value;
-    }
-
-    /**
-     * return the value as a String
-     *
-     * @return the value as a String
-     */
-
-    public String toString()
-    {
-        return String.valueOf(_value);
-    }
-
-    /* **********  END  implementation of FixedField ********** */
-}   // end public class ByteField
-
diff --git a/trunk/src/java/org/apache/poi/util/CloseIgnoringInputStream.java b/trunk/src/java/org/apache/poi/util/CloseIgnoringInputStream.java
deleted file mode 100644
index 82247b1..0000000
--- a/trunk/src/java/org/apache/poi/util/CloseIgnoringInputStream.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.FilterInputStream;
-import java.io.InputStream;
-
-/**
- * A wrapper around an {@link InputStream}, which 
- *  ignores close requests made to it.
- *
- * Useful with {@link org.apache.poi.poifs.filesystem.POIFSFileSystem}, where you want
- *  to control the close yourself.
- */
-public class CloseIgnoringInputStream extends FilterInputStream {
-   public CloseIgnoringInputStream(InputStream in) {
-      super(in);
-   }
-
-   public void close() {
-      // Does nothing and ignores closing the wrapped stream
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/util/CodePageUtil.java b/trunk/src/java/org/apache/poi/util/CodePageUtil.java
deleted file mode 100644
index 1459291..0000000
--- a/trunk/src/java/org/apache/poi/util/CodePageUtil.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.UnsupportedEncodingException;
-
-/**
- * Utilities for working with Microsoft CodePages.
- * 
- * <p>Provides constants for understanding numeric codepages,
- *  along with utilities to translate these into Java Character Sets.</p>
- */
-public class CodePageUtil
-{
-    /** <p>Codepage 037, a special case</p> */
-    public static final int CP_037 = 37;
-
-    /** <p>Codepage for SJIS</p> */
-    public static final int CP_SJIS = 932;
-
-    /** <p>Codepage for GBK, aka MS936</p> */
-    public static final int CP_GBK = 936;
-
-    /** <p>Codepage for MS949</p> */
-    public static final int CP_MS949 = 949;
-
-    /** <p>Codepage for UTF-16</p> */
-    public static final int CP_UTF16 = 1200;
-
-    /** <p>Codepage for UTF-16 big-endian</p> */
-    public static final int CP_UTF16_BE = 1201;
-
-    /** <p>Codepage for Windows 1250</p> */
-    public static final int CP_WINDOWS_1250 = 1250;
-
-    /** <p>Codepage for Windows 1251</p> */
-    public static final int CP_WINDOWS_1251 = 1251;
-
-    /** <p>Codepage for Windows 1252</p> */
-    public static final int CP_WINDOWS_1252 = 1252;
-    public static final int CP_WINDOWS_1252_BIFF23 = 32769;
-
-    /** <p>Codepage for Windows 1253</p> */
-    public static final int CP_WINDOWS_1253 = 1253;
-
-    /** <p>Codepage for Windows 1254</p> */
-    public static final int CP_WINDOWS_1254 = 1254;
-
-    /** <p>Codepage for Windows 1255</p> */
-    public static final int CP_WINDOWS_1255 = 1255;
-
-    /** <p>Codepage for Windows 1256</p> */
-    public static final int CP_WINDOWS_1256 = 1256;
-
-    /** <p>Codepage for Windows 1257</p> */
-    public static final int CP_WINDOWS_1257 = 1257;
-
-    /** <p>Codepage for Windows 1258</p> */
-    public static final int CP_WINDOWS_1258 = 1258;
-
-    /** <p>Codepage for Johab</p> */
-    public static final int CP_JOHAB = 1361;
-
-    /** <p>Codepage for Macintosh Roman (Java: MacRoman)</p> */
-    public static final int CP_MAC_ROMAN = 10000;
-    public static final int CP_MAC_ROMAN_BIFF23 = 32768;
-
-    /** <p>Codepage for Macintosh Japan (Java: unknown - use SJIS, cp942 or
-     * cp943)</p> */
-    public static final int CP_MAC_JAPAN = 10001;
-
-    /** <p>Codepage for Macintosh Chinese Traditional (Java: unknown - use Big5,
-     * MS950, or cp937)</p> */
-    public static final int CP_MAC_CHINESE_TRADITIONAL = 10002;
-
-    /** <p>Codepage for Macintosh Korean (Java: unknown - use EUC_KR or
-     * cp949)</p> */
-    public static final int CP_MAC_KOREAN = 10003;
-
-    /** <p>Codepage for Macintosh Arabic (Java: MacArabic)</p> */
-    public static final int CP_MAC_ARABIC = 10004;
-
-    /** <p>Codepage for Macintosh Hebrew (Java: MacHebrew)</p> */
-    public static final int CP_MAC_HEBREW = 10005;
-
-    /** <p>Codepage for Macintosh Greek (Java: MacGreek)</p> */
-    public static final int CP_MAC_GREEK = 10006;
-
-    /** <p>Codepage for Macintosh Cyrillic (Java: MacCyrillic)</p> */
-    public static final int CP_MAC_CYRILLIC = 10007;
-
-    /** <p>Codepage for Macintosh Chinese Simplified (Java: unknown - use
-     * EUC_CN, ISO2022_CN_GB, MS936 or cp935)</p> */
-    public static final int CP_MAC_CHINESE_SIMPLE = 10008;
-
-    /** <p>Codepage for Macintosh Romanian (Java: MacRomania)</p> */
-    public static final int CP_MAC_ROMANIA = 10010;
-
-    /** <p>Codepage for Macintosh Ukrainian (Java: MacUkraine)</p> */
-    public static final int CP_MAC_UKRAINE = 10017;
-
-    /** <p>Codepage for Macintosh Thai (Java: MacThai)</p> */
-    public static final int CP_MAC_THAI = 10021;
-
-    /** <p>Codepage for Macintosh Central Europe (Latin-2)
-     * (Java: MacCentralEurope)</p> */
-    public static final int CP_MAC_CENTRAL_EUROPE = 10029;
-
-    /** <p>Codepage for Macintosh Iceland (Java: MacIceland)</p> */
-    public static final int CP_MAC_ICELAND = 10079;
-
-    /** <p>Codepage for Macintosh Turkish (Java: MacTurkish)</p> */
-    public static final int CP_MAC_TURKISH = 10081;
-
-    /** <p>Codepage for Macintosh Croatian (Java: MacCroatian)</p> */
-    public static final int CP_MAC_CROATIAN = 10082;
-
-    /** <p>Codepage for US-ASCII</p> */
-    public static final int CP_US_ACSII = 20127;
-
-    /** <p>Codepage for KOI8-R</p> */
-    public static final int CP_KOI8_R = 20866;
-
-    /** <p>Codepage for ISO-8859-1</p> */
-    public static final int CP_ISO_8859_1 = 28591;
-
-    /** <p>Codepage for ISO-8859-2</p> */
-    public static final int CP_ISO_8859_2 = 28592;
-
-    /** <p>Codepage for ISO-8859-3</p> */
-    public static final int CP_ISO_8859_3 = 28593;
-
-    /** <p>Codepage for ISO-8859-4</p> */
-    public static final int CP_ISO_8859_4 = 28594;
-
-    /** <p>Codepage for ISO-8859-5</p> */
-    public static final int CP_ISO_8859_5 = 28595;
-
-    /** <p>Codepage for ISO-8859-6</p> */
-    public static final int CP_ISO_8859_6 = 28596;
-
-    /** <p>Codepage for ISO-8859-7</p> */
-    public static final int CP_ISO_8859_7 = 28597;
-
-    /** <p>Codepage for ISO-8859-8</p> */
-    public static final int CP_ISO_8859_8 = 28598;
-
-    /** <p>Codepage for ISO-8859-9</p> */
-    public static final int CP_ISO_8859_9 = 28599;
-
-    /** <p>Codepage for ISO-2022-JP</p> */
-    public static final int CP_ISO_2022_JP1 = 50220;
-
-    /** <p>Another codepage for ISO-2022-JP</p> */
-    public static final int CP_ISO_2022_JP2 = 50221;
-
-    /** <p>Yet another codepage for ISO-2022-JP</p> */
-    public static final int CP_ISO_2022_JP3 = 50222;
-
-    /** <p>Codepage for ISO-2022-KR</p> */
-    public static final int CP_ISO_2022_KR = 50225;
-
-    /** <p>Codepage for EUC-JP</p> */
-    public static final int CP_EUC_JP = 51932;
-
-    /** <p>Codepage for EUC-KR</p> */
-    public static final int CP_EUC_KR = 51949;
-
-    /** <p>Codepage for GB2312</p> */
-    public static final int CP_GB2312 = 52936;
-
-    /** <p>Codepage for GB18030</p> */
-    public static final int CP_GB18030 = 54936;
-
-    /** <p>Another codepage for US-ASCII</p> */
-    public static final int CP_US_ASCII2 = 65000;
-
-    /** <p>Codepage for UTF-8</p> */
-    public static final int CP_UTF8 = 65001;
-
-    /** <p>Codepage for Unicode</p> */
-    public static final int CP_UNICODE = CP_UTF16;
-    
-    /**
-     * Converts a string into bytes, in the equivalent character encoding
-     *  to the supplied codepage number.
-     * @param string The string to convert
-     * @param codepage The codepage number
-     */
-    public static byte[] getBytesInCodePage(final String string, final int codepage) 
-    throws UnsupportedEncodingException 
-    {
-        String encoding = codepageToEncoding(codepage);
-        return string.getBytes(encoding);
-    }
-
-    /**
-     * Converts the bytes into a String, based on the equivalent character encoding
-     *  to the supplied codepage number.
-     * @param string The byte of the string to convert
-     * @param codepage The codepage number
-     */
-    public static String getStringFromCodePage(final byte[] string, final int codepage)
-    throws UnsupportedEncodingException 
-    {
-        return getStringFromCodePage(string, 0, string.length, codepage);
-    }
-    
-    /**
-     * Converts the bytes into a String, based on the equivalent character encoding
-     *  to the supplied codepage number.
-     * @param string The byte of the string to convert
-     * @param codepage The codepage number
-     */
-    public static String getStringFromCodePage(final byte[] string, final int offset, 
-            final int length, final int codepage) throws UnsupportedEncodingException 
-    {
-        String encoding = codepageToEncoding(codepage);
-        return new String(string, offset, length, encoding);
-    }
-    
-    /**
-     * <p>Turns a codepage number into the equivalent character encoding's
-     * name (in Java NIO canonical naming format).</p>
-     *
-     * @param codepage The codepage number
-     *
-     * @return The character encoding's name. If the codepage number is 65001,
-     * the encoding name is "UTF-8". All other positive numbers are mapped to
-     * their Java NIO names, normally either "windows-" followed by the number, 
-     * eg "windows-1251", or "cp" followed by the number, e.g. if the codepage 
-     * number is 1252 the returned character encoding name will be "cp1252".
-     *
-     * @exception UnsupportedEncodingException if the specified codepage is
-     * less than zero.
-     */
-    public static String codepageToEncoding(final int codepage)
-    throws UnsupportedEncodingException
-    {
-        return codepageToEncoding(codepage, false);
-    }
-    
-    /**
-     * <p>Turns a codepage number into the equivalent character encoding's
-     * name, in either Java NIO or Java Lang canonical naming.</p>
-     *
-     * @param codepage The codepage number
-     * @param javaLangFormat Should Java Lang or Java NIO naming be used?
-     *
-     * @return The character encoding's name, in either Java Lang format 
-     *  (eg Cp1251, ISO8859_5) or Java NIO format (eg windows-1252, ISO-8859-9)
-     *  
-     * @see <a href="http://docs.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>
-     *
-     * @exception UnsupportedEncodingException if the specified codepage is
-     * less than zero.
-     */
-    public static String codepageToEncoding(final int codepage, boolean javaLangFormat)
-    throws UnsupportedEncodingException
-    {
-        if (codepage <= 0)
-            throw new UnsupportedEncodingException("Codepage number may not be " + codepage);
-        
-        switch (codepage) {
-            case CP_UTF16:
-                return "UTF-16";
-            case CP_UTF16_BE:
-                return "UTF-16BE";
-            case CP_UTF8:
-                return "UTF-8";
-            case CP_037:
-                return "cp037";
-            case CP_GBK:
-                return "GBK";
-            case CP_MS949:
-                return "ms949";
-            case CP_WINDOWS_1250:
-                if (javaLangFormat)
-                    return "Cp1250";
-                else
-                    return "windows-1250";
-            case CP_WINDOWS_1251:
-                if (javaLangFormat)
-                    return "Cp1251";
-                else
-                    return "windows-1251";
-            case CP_WINDOWS_1252:
-            case CP_WINDOWS_1252_BIFF23:
-                if (javaLangFormat)
-                    return "Cp1252";
-                else
-                    return "windows-1252";
-            case CP_WINDOWS_1253:
-                if (javaLangFormat)
-                    return "Cp1253";
-                else
-                    return "windows-1253";
-            case CP_WINDOWS_1254:
-                if (javaLangFormat)
-                    return "Cp1254";
-                else
-                    return "windows-1254";
-            case CP_WINDOWS_1255:
-                if (javaLangFormat)
-                    return "Cp1255";
-                else
-                    return "windows-1255";
-            case CP_WINDOWS_1256:
-                if (javaLangFormat)
-                    return "Cp1255";
-                else
-                    return "windows-1256";
-            case CP_WINDOWS_1257:
-                if (javaLangFormat)
-                    return "Cp1257";
-                else
-                    return "windows-1257";
-            case CP_WINDOWS_1258:
-                if (javaLangFormat)
-                    return "Cp1258";
-                else
-                    return "windows-1258";
-            case CP_JOHAB:
-                return "johab";
-            case CP_MAC_ROMAN:
-            case CP_MAC_ROMAN_BIFF23:
-                return "MacRoman";
-            case CP_MAC_JAPAN:
-                return "SJIS";
-            case CP_MAC_CHINESE_TRADITIONAL:
-                return "Big5";
-            case CP_MAC_KOREAN:
-                return "EUC-KR";
-            case CP_MAC_ARABIC:
-                return "MacArabic";
-            case CP_MAC_HEBREW:
-                return "MacHebrew";
-            case CP_MAC_GREEK:
-                return "MacGreek";
-            case CP_MAC_CYRILLIC:
-                return "MacCyrillic";
-            case CP_MAC_CHINESE_SIMPLE:
-                return "EUC_CN";
-            case CP_MAC_ROMANIA:
-                return "MacRomania";
-            case CP_MAC_UKRAINE:
-                return "MacUkraine";
-            case CP_MAC_THAI:
-                return "MacThai";
-            case CP_MAC_CENTRAL_EUROPE:
-                return "MacCentralEurope";
-            case CP_MAC_ICELAND:
-                  return "MacIceland";
-            case CP_MAC_TURKISH:
-                return "MacTurkish";
-            case CP_MAC_CROATIAN:
-                return "MacCroatian";
-            case CP_US_ACSII:
-            case CP_US_ASCII2:
-                return "US-ASCII";
-            case CP_KOI8_R:
-                return "KOI8-R";
-            case CP_ISO_8859_1:
-                if (javaLangFormat)
-                    return "ISO8859_1";
-                else
-                    return "ISO-8859-1";
-            case CP_ISO_8859_2:
-                if (javaLangFormat)
-                    return "ISO8859_2";
-                else
-                    return "ISO-8859-2";
-            case CP_ISO_8859_3:
-                if (javaLangFormat)
-                    return "ISO8859_3";
-                else
-                    return "ISO-8859-3";
-            case CP_ISO_8859_4:
-                if (javaLangFormat)
-                    return "ISO8859_4";
-                else
-                    return "ISO-8859-4";
-            case CP_ISO_8859_5:
-                if (javaLangFormat)
-                    return "ISO8859_5";
-                else
-                    return "ISO-8859-5";
-            case CP_ISO_8859_6:
-                if (javaLangFormat)
-                    return "ISO8859_6";
-                else
-                    return "ISO-8859-6";
-            case CP_ISO_8859_7:
-                if (javaLangFormat)
-                    return "ISO8859_7";
-                else
-                    return "ISO-8859-7";
-            case CP_ISO_8859_8:
-                if (javaLangFormat)
-                    return "ISO8859_8";
-                else
-                    return "ISO-8859-8";
-            case CP_ISO_8859_9:
-                if (javaLangFormat)
-                    return "ISO8859_9";
-                else
-                    return "ISO-8859-9";
-            case CP_ISO_2022_JP1:
-            case CP_ISO_2022_JP2:
-            case CP_ISO_2022_JP3:
-                return "ISO-2022-JP";
-            case CP_ISO_2022_KR:
-                return "ISO-2022-KR";
-            case CP_EUC_JP:
-                return "EUC-JP";
-            case CP_EUC_KR:
-                return "EUC-KR";
-            case CP_GB2312:
-                return "GB2312";
-            case CP_GB18030:
-                return "GB18030";
-            case CP_SJIS:
-                return "SJIS";
-            default:
-                return "cp" + codepage;
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/CommonsLogger.java b/trunk/src/java/org/apache/poi/util/CommonsLogger.java
deleted file mode 100644
index a204fde..0000000
--- a/trunk/src/java/org/apache/poi/util/CommonsLogger.java
+++ /dev/null
@@ -1,225 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A logger class that strives to make it as easy as possible for
- * developers to write log calls, while simultaneously making those
- * calls as cheap as possible by performing lazy evaluation of the log
- * message.<p>
- */
-public class CommonsLogger extends POILogger
-{
-    private static final LogFactory   _creator = LogFactory.getFactory();
-    private Log             log   = null;
-
-    @Override
-    public void initialize(final String cat)
-    {
-        this.log = _creator.getInstance(cat);
-    }   
-     
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.
-     */
-    @Override
-    protected void _log(final int level, final Object obj1)
-    {
-        // FIXME: What happens if level is in between two levels (an even number)?
-        // Should this be `if (level >= FATAL) ...`?
-        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);
-          }
-        }
-    }
-    
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.  This is converted to a string.
-     * @param exception An exception to be logged
-     */
-    @Override
-    protected void _log(final int level, final Object obj1,
-                    final Throwable exception) 
-    {
-        // FIXME: What happens if level is in between two levels (an even number)?
-        // Should this be `if (level >= FATAL) ...`?
-        if(level==FATAL)
-        {
-          if(log.isFatalEnabled())
-          {
-            if(obj1 != null)
-               log.fatal(obj1, exception);
-            else
-               log.fatal(exception);
-          }
-        }
-        else if(level==ERROR)
-        {
-          if(log.isErrorEnabled())
-          {
-            if(obj1 != null)
-               log.error(obj1, exception);
-            else
-               log.error(exception);
-          }
-        }
-        else if(level==WARN)
-        {
-          if(log.isWarnEnabled())
-          {
-            if(obj1 != null)
-               log.warn(obj1, exception);
-            else
-               log.warn(exception);
-          }
-        }
-        else if(level==INFO)
-        {
-          if(log.isInfoEnabled())
-          {
-        	if(obj1 != null)
-               log.info(obj1, exception);
-        	else
-        	   log.info(exception);
-          }
-        }
-        else if(level==DEBUG)
-        {
-          if(log.isDebugEnabled())
-          {
-        	if(obj1 != null)
-               log.debug(obj1, exception);
-        	else
-        	   log.debug(exception);
-          }
-        }
-        else
-        {
-          if(log.isTraceEnabled())
-          {
-        	if(obj1 != null)
-               log.trace(obj1, exception);
-        	else
-        	   log.trace(exception);
-          }
-        }
-
-    }
-
-    /**
-     * Check if a logger is enabled to log at the specified level
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     */
-    @Override
-    public boolean check(final int level)
-    {
-        // FIXME: What happens if level is in between two levels (an even number)?
-        // Should this be `if (level >= FATAL) ...`?
-        if(level==FATAL)
-        {
-          if(log.isFatalEnabled())
-          {
-            return true;
-          }
-        }
-        else if(level==ERROR)
-        {
-          if(log.isErrorEnabled())
-          {
-            return true;
-          }
-        }
-        else if(level==WARN)
-        {
-          if(log.isWarnEnabled())
-          {
-            return true;
-          }
-        }
-        else if(level==INFO)
-        {
-          if(log.isInfoEnabled())
-          {
-            return true;
-          }
-        }
-        else if(level==DEBUG)
-        {
-          if(log.isDebugEnabled())
-          {
-            return true;
-          }
-        }
-
-        return false;
-
-    }
-
- 
-}   // end package scope class POILogger
-
diff --git a/trunk/src/java/org/apache/poi/util/Configurator.java b/trunk/src/java/org/apache/poi/util/Configurator.java
deleted file mode 100644
index 4c9651f..0000000
--- a/trunk/src/java/org/apache/poi/util/Configurator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.poi.util;
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/**
- * Helper for fetching int values from system properties
- */
-public class Configurator {
-    private static POILogger logger = POILogFactory.getLogger(Configurator.class);
-
-    public static int getIntValue(String systemProperty, int defaultValue) {
-        int result = defaultValue;
-        String property = System.getProperty(systemProperty);
-        try {
-            result = Integer.parseInt(property);
-        } catch (Exception e) {
-            logger.log(POILogger.ERROR, "System property -D"+systemProperty +" do not contains a valid integer " + property);
-        }
-        return result;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java b/trunk/src/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
deleted file mode 100644
index 6f44752..0000000
--- a/trunk/src/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.security.SecureRandom;
-
-/**
- * Default implementation of the {@link TempFileCreationStrategy} used by {@link TempFile}:
- * Files are collected into one directory and by default are deleted on exit from the VM.
- * Files may be manually deleted by user prior to JVM exit.
- * Files can be kept by defining the system property {@link #KEEP_FILES}.
- * 
- * Each file is registered for deletion with the JVM and the temporary directory is not deleted
- * after the JVM exits. Files that are created in the poifiles directory outside
- * the control of DefaultTempFileCreationStrategy are not deleted.
- * See {@link TempFileCreationStrategy} for better strategies for long-running
- * processes or limited temporary storage.
- */
-public class DefaultTempFileCreationStrategy implements TempFileCreationStrategy {
-    /** Define a constant for this property as it is sometimes mistypes as "tempdir" otherwise
-     * This is private to avoid having two public-visible constants ({@link TempFile#JAVA_IO_TMPDIR}). */
-    private static final String JAVA_IO_TMPDIR = TempFile.JAVA_IO_TMPDIR;
-    /*package*/ static final String POIFILES = "poifiles";
-    
-    /** To keep files after JVM exit, set the <code>-Dpoi.keep.tmp.files</code> JVM property */
-    public static final String KEEP_FILES = "poi.keep.tmp.files";
-    
-    /** random number generator to generate unique filenames */
-    private static final SecureRandom random = new SecureRandom();
-    
-    /** The directory where the temporary files will be created (<code>null</code> to use the default directory). */
-    private File dir;
-    
-    /**
-     * Creates the strategy so that it creates the temporary files in the default directory.
-     * 
-     * @see File#createTempFile(String, String)
-     */
-    public DefaultTempFileCreationStrategy() {
-        this(null);
-    }
-    
-    /**
-     * Creates the strategy allowing to set the  
-     *
-     * @param dir The directory where the temporary files will be created (<code>null</code> to use the default directory).
-     * 
-     * @see File#createTempFile(String, String, File)
-     */
-    public DefaultTempFileCreationStrategy(File dir) {
-        this.dir = dir;
-    }
-    
-    private void createPOIFilesDirectory() throws IOException {
-        // Identify and create our temp dir, if needed
-        // The directory is not deleted, even if it was created by this TempFileCreationStrategy
-        if (dir == null) {
-            String tmpDir = System.getProperty(JAVA_IO_TMPDIR);
-            if (tmpDir == null) {
-                throw new IOException("Systems temporary directory not defined - set the -D"+JAVA_IO_TMPDIR+" jvm property!");
-            }
-            dir = new File(tmpDir, POIFILES);
-        }
-        
-        createTempDirectory(dir);
-    }
-    
-    /**
-     * Attempt to create a directory, including any necessary parent directories.
-     * Does nothing if directory already exists.
-     *
-     * @param directory  the directory to create
-     * @throws IOException if unable to create temporary directory or it is not a directory
-     */
-    private void createTempDirectory(File directory) throws IOException {
-        // create directory if it doesn't exist
-        final boolean dirExists = (directory.exists() || directory.mkdirs());
-        
-        if (!dirExists) {
-            throw new IOException("Could not create temporary directory '" + directory + "'");
-        }
-        else if (!directory.isDirectory()) {
-            throw new IOException("Could not create temporary directory. '" + directory + "' exists but is not a directory.");
-        }
-    }
-    
-    @Override
-    public File createTempFile(String prefix, String suffix) throws IOException {
-        // Identify and create our temp dir, if needed
-        createPOIFilesDirectory();
-        
-        // Generate a unique new filename 
-        File newFile = File.createTempFile(prefix, suffix, dir);
-
-        // Set the delete on exit flag, unless explicitly disabled
-        if (System.getProperty(KEEP_FILES) == null) {
-            newFile.deleteOnExit();
-        }
-
-        // All done
-        return newFile;
-    }
-
-    /* (non-JavaDoc) Created directory path is <JAVA_IO_TMPDIR>/poifiles/prefix0123456789 */
-    @Override
-    public File createTempDirectory(String prefix) throws IOException {
-        // Identify and create our temp dir, if needed
-        createPOIFilesDirectory();
-        
-        // Generate a unique new filename
-        // FIXME: Java 7+: use java.nio.Files#createTempDirectory
-        final long n = random.nextLong();
-        File newDirectory = new File(dir, prefix + Long.toString(n));
-        createTempDirectory(newDirectory);
-
-        // Set the delete on exit flag, unless explicitly disabled
-        if (System.getProperty(KEEP_FILES) == null) {
-            newDirectory.deleteOnExit();
-        }
-
-        // All done
-        return newDirectory;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/util/DelayableLittleEndianOutput.java b/trunk/src/java/org/apache/poi/util/DelayableLittleEndianOutput.java
deleted file mode 100644
index 13282ac..0000000
--- a/trunk/src/java/org/apache/poi/util/DelayableLittleEndianOutput.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-/**
- * Implementors of this interface allow client code to 'delay' writing to a certain section of a
- * data output stream.<br/>
- * A typical application is for writing BIFF records when the size is not known until well after
- * the header has been written.  The client code can call {@link #createDelayedOutput(int)}
- * to reserve two bytes of the output for the 'ushort size' header field.  The delayed output can
- * be written at any stage.
- *
- * @author Josh Micich
- */
-public interface DelayableLittleEndianOutput extends LittleEndianOutput {
-	/**
-	 * Creates an output stream intended for outputting a sequence of <tt>size</tt> bytes.
-	 */
-	LittleEndianOutput createDelayedOutput(int size);
-}
diff --git a/trunk/src/java/org/apache/poi/util/DrawingDump.java b/trunk/src/java/org/apache/poi/util/DrawingDump.java
deleted file mode 100644
index bc06bcf..0000000
--- a/trunk/src/java/org/apache/poi/util/DrawingDump.java
+++ /dev/null
@@ -1,57 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.nio.charset.Charset;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.ss.usermodel.Sheet;
-
-/**
- * Dump out the aggregated escher records
- */
-public class DrawingDump
-{
-    public static void main( String[] args ) throws IOException {
-        OutputStreamWriter osw = new OutputStreamWriter(System.out, Charset.defaultCharset());
-        PrintWriter pw = new PrintWriter(osw);
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(new File(args[0]));
-        HSSFWorkbook wb = new HSSFWorkbook(fs);
-        try {
-            pw.println( "Drawing group:" );
-            wb.dumpDrawingGroupRecords(true);
-    
-            int i = 1;
-            for (Sheet sheet : wb)
-            {
-                pw.println( "Sheet " + i + "(" + sheet.getSheetName() + "):" );
-                ((HSSFSheet) sheet).dumpDrawingRecords(true, pw);
-            }
-        } finally {
-            wb.close();
-            fs.close();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/FixedField.java b/trunk/src/java/org/apache/poi/util/FixedField.java
deleted file mode 100644
index 45d6c6f..0000000
--- a/trunk/src/java/org/apache/poi/util/FixedField.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import org.apache.poi.util.LittleEndian.BufferUnderrunException;
-
-import java.io.*;
-
-/**
- * behavior of a field at a fixed location within a byte array
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public interface FixedField
-{
-
-    /**
-     * set the value from its offset into an array of bytes
-     *
-     * @param data the byte array from which the value is to be read
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of the array's valid index range
-     */
-
-    void readFromBytes(byte [] data)
-        throws ArrayIndexOutOfBoundsException;
-
-    /**
-     * set the value from an InputStream
-     *
-     * @param stream the InputStream from which the value is to be
-     *               read
-     *
-     * @exception BufferUnderrunException if there is not enough data
-     *            available from the InputStream
-     * @exception IOException if an IOException is thrown from reading
-     *            the InputStream
-     */
-
-    void readFromStream(InputStream stream)
-        throws IOException;
-
-    /**
-     * write the value out to an array of bytes at the appropriate
-     * offset
-     *
-     * @param data the array of bytes to which the value is to be
-     *             written
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of the array's valid index range
-     */
-
-    void writeToBytes(byte [] data)
-        throws ArrayIndexOutOfBoundsException;
-
-    /**
-     * return the value as a String
-     *
-     * @return the value as a String
-     */
-
-    String toString();
-}   // end public interface FixedField
-
diff --git a/trunk/src/java/org/apache/poi/util/FontMetricsDumper.java b/trunk/src/java/org/apache/poi/util/FontMetricsDumper.java
deleted file mode 100644
index 5147646..0000000
--- a/trunk/src/java/org/apache/poi/util/FontMetricsDumper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.util;
-
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-@SuppressWarnings("deprecation")
-public class FontMetricsDumper
-{
-    @SuppressForbidden("command line tool")
-    public static void main( String[] args ) throws IOException
-    {
-
-        Properties props = new Properties();
-
-        Font[] allFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
-        for (Font allFont : allFonts) {
-            String fontName = allFont.getFontName();
-
-            Font font = new Font(fontName, Font.BOLD, 10);
-            FontMetrics fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics(font);
-            int fontHeight = fontMetrics.getHeight();
-
-            props.setProperty("font." + fontName + ".height", fontHeight + "");
-            StringBuilder characters = new StringBuilder();
-            for (char c = 'a'; c <= 'z'; c++) {
-                characters.append(c).append(", ");
-            }
-            for (char c = 'A'; c <= 'Z'; c++) {
-                characters.append(c).append(", ");
-            }
-            for (char c = '0'; c <= '9'; c++) {
-                characters.append(c).append(", ");
-            }
-            StringBuilder widths = new StringBuilder();
-            for (char c = 'a'; c <= 'z'; c++) {
-                widths.append(fontMetrics.getWidths()[c]).append(", ");
-            }
-            for (char c = 'A'; c <= 'Z'; c++) {
-                widths.append(fontMetrics.getWidths()[c]).append(", ");
-            }
-            for (char c = '0'; c <= '9'; c++) {
-                widths.append(fontMetrics.getWidths()[c]).append(", ");
-            }
-            props.setProperty("font." + fontName + ".characters", characters.toString());
-            props.setProperty("font." + fontName + ".widths", widths.toString());
-        }
-
-        FileOutputStream fileOut = new FileOutputStream("font_metrics.properties");
-        try
-        {
-            props.store(fileOut, "Font Metrics");
-        }
-        finally
-        {
-            fileOut.close();
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/HexDump.java b/trunk/src/java/org/apache/poi/util/HexDump.java
deleted file mode 100644
index 01a8f50..0000000
--- a/trunk/src/java/org/apache/poi/util/HexDump.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.nio.charset.Charset;
-
-import org.apache.commons.codec.CharEncoding;
-
-/**
- * dump data in hexadecimal format
- */
-@Internal
-public class HexDump {
-    public static final String EOL = System.getProperty("line.separator");
-    public static final Charset UTF8 = Charset.forName(CharEncoding.UTF_8);
-
-    private HexDump() {
-        // all static methods, so no need for a public constructor
-    }
-
-    /**
-     * 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
-     * @param length number of characters to output
-     *
-     * @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 static void dump(final byte [] data, final long offset,
-        final OutputStream stream, final int index, final int length)
-    throws IOException, ArrayIndexOutOfBoundsException, IllegalArgumentException {
-        if (stream == null) {
-            throw new IllegalArgumentException("cannot write to nullstream");
-        }
-
-        OutputStreamWriter osw = new OutputStreamWriter(stream, UTF8);
-        osw.write(dump(data, offset, index, length));
-        osw.flush();
-    }
-
-    /**
-     * 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, Integer.MAX_VALUE);
-    }
-
-    /**
-     * dump an array of bytes to a String
-     *
-     * @param data the byte array to be dumped
-     * @param offset its offset, whatever that might mean
-     * @param index initial index into the byte array
-     *
-     * @exception ArrayIndexOutOfBoundsException if the index is
-     *            outside the data array's bounds
-     * @return output string
-     */
-
-    public static String dump(final byte [] data, final long offset, final int index) {
-        return dump(data, offset, index, Integer.MAX_VALUE);
-    }    
-    
-    /**
-     * dump an array of bytes to a String
-     *
-     * @param data the byte array to be dumped
-     * @param offset its offset, whatever that might mean
-     * @param index initial index into the byte array
-     * @param length number of characters to output
-     *
-     * @exception ArrayIndexOutOfBoundsException if the index is
-     *            outside the data array's bounds
-     * @return output string
-     */
-
-    public static String dump(final byte [] data, final long offset, final int index, final int length) {
-        if (data == null || data.length == 0) {
-            return "No Data"+EOL;
-        }
-
-        int data_length = (length == Integer.MAX_VALUE || length < 0 || index+length < 0)
-            ? data.length
-            : Math.min(data.length,index+length);
-        
-        
-        if ((index < 0) || (index >= data.length)) {
-            String err = "illegal index: "+index+" into array of length "+data.length;
-            throw new ArrayIndexOutOfBoundsException(err);
-        }
-        
-        long  display_offset = offset + index;
-        StringBuilder buffer = new StringBuilder(74);
-        
-        for (int j = index; j < data_length; j += 16) {
-            int chars_read = data_length - j;
-
-            if (chars_read > 16) {
-                chars_read = 16;
-            }
-            
-            writeHex(buffer, display_offset, 8, "");
-            for (int k = 0; k < 16; k++) {
-                if (k < chars_read) {
-                    writeHex(buffer, data[ k + j ], 2, " ");
-                } else {
-                    buffer.append("   ");
-                }
-            }
-            buffer.append(' ');
-            for (int k = 0; k < chars_read; k++) {
-                buffer.append(toAscii(data[ k + j ]));
-            }
-            buffer.append(EOL);
-            display_offset += chars_read;
-        }
-        return buffer.toString();
-    }
-
-    public static char toAscii(int dataB) {
-        char charB = (char)(dataB & 0xFF);
-        if (Character.isISOControl(charB)) return '.';
-        
-        switch (charB) {
-            // printable, but not compilable with current compiler encoding
-            case 0xFF:
-            case 0xDD:
-                charB = '.';
-                break;
-            default:
-                break;
-        }
-        return charB;
-    }
-    
-    /**
-     * Converts the parameter to a hex value.
-     *
-     * @param value     The value to convert
-     * @return          A String representing the array of bytes
-     */
-    public static String toHex(final byte[] value)
-    {
-        StringBuilder retVal = new StringBuilder();
-        retVal.append('[');
-        if (value != null && value.length > 0)
-        {
-            for(int x = 0; x < value.length; x++)
-            {
-                if (x>0) {
-                    retVal.append(", ");
-                }
-                retVal.append(toHex(value[x]));
-            }
-        }
-        retVal.append(']');
-        return retVal.toString();
-    }
-
-    /**
-     * Converts the parameter to a hex value.
-     *
-     * @param value     The value to convert
-     * @return          A String representing the array of shorts
-     */
-    public static String toHex(final short[] value)
-    {
-        StringBuilder retVal = new StringBuilder();
-        retVal.append('[');
-        for(int x = 0; x < value.length; x++)
-        {
-            if (x>0) {
-                retVal.append(", ");
-            }
-            retVal.append(toHex(value[x]));
-        }
-        retVal.append(']');
-        return retVal.toString();
-    }
-
-    /**
-     * <p>Converts the parameter to a hex value breaking the results into
-     * lines.</p>
-     *
-     * @param value        The value to convert
-     * @param bytesPerLine The maximum number of bytes per line. The next byte
-     *                     will be written to a new line
-     * @return             A String representing the array of bytes
-     */
-    public static String toHex(final byte[] value, final int bytesPerLine) {
-        if (value.length == 0) {
-            return ": 0";
-        }
-        final int digits = (int) Math.round(Math.log(value.length) / Math.log(10) + 0.5);
-        StringBuilder retVal = new StringBuilder();
-        writeHex(retVal, 0, digits, "");
-        retVal.append(": ");
-        for(int x=0, i=-1; x < value.length; x++) {
-            if (++i == bytesPerLine) {
-                retVal.append('\n');
-                writeHex(retVal, x, digits, "");
-                retVal.append(": ");
-                i = 0;
-            } else if (x>0) {
-                retVal.append(", ");
-            }
-            retVal.append(toHex(value[x]));
-        }
-        return retVal.toString();
-    }
-
-    /**
-     * Converts the parameter to a hex value.
-     *
-     * @param value     The value to convert
-     * @return          The result right padded with 0
-     */
-    public static String toHex(short value) {
-        StringBuilder sb = new StringBuilder(4);
-        writeHex(sb, value & 0xFFFF, 4, "");
-        return sb.toString();
-    }
-
-    /**
-     * Converts the parameter to a hex value.
-     *
-     * @param value     The value to convert
-     * @return          The result right padded with 0
-     */
-    public static String toHex(byte value) {
-        StringBuilder sb = new StringBuilder(2);
-        writeHex(sb, value & 0xFF, 2, "");
-        return sb.toString();
-    }
-
-    /**
-     * Converts the parameter to a hex value.
-     *
-     * @param value     The value to convert
-     * @return          The result right padded with 0
-     */
-    public static String toHex(int value) {
-        StringBuilder sb = new StringBuilder(8);
-        writeHex(sb, value & 0xFFFFFFFFL, 8, "");
-        return sb.toString();
-    }
-
-    /**
-     * Converts the parameter to a hex value.
-     *
-     * @param value     The value to convert
-     * @return          The result right padded with 0
-     */
-    public static String toHex(long value) {
-        StringBuilder sb = new StringBuilder(16);
-        writeHex(sb, value, 16, "");
-        return sb.toString();
-    }
-
-    /**
-     * Converts the string to a string of hex values.
-     *
-     * @param value     The value to convert
-     * @return          The resulted hex string
-     */
-    public static String toHex(String value) {
-        return (value == null || value.length() == 0)
-            ? "[]"
-            : toHex(value.getBytes(LocaleUtil.CHARSET_1252));
-    }
-    
-    /**
-     * Dumps <code>bytesToDump</code> bytes to an output stream.
-     *
-     * @param in          The stream to read from
-     * @param out         The output stream
-     * @param start       The index to use as the starting position for the left hand side label
-     * @param bytesToDump The number of bytes to output.  Use -1 to read until the end of file.
-     */
-    public static void dump( InputStream in, PrintStream out, int start, int bytesToDump ) throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        if (bytesToDump == -1)
-        {
-            int c = in.read();
-            while (c != -1)
-            {
-                buf.write(c);
-                c = in.read();
-            }
-        }
-        else
-        {
-            int bytesRemaining = bytesToDump;
-            while (bytesRemaining-- > 0)
-            {
-                int c = in.read();
-                if (c == -1) {
-                    break;
-                }
-                buf.write(c);
-            }
-        }
-
-        byte[] data = buf.toByteArray();
-        dump(data, 0, out, start, data.length);
-    }
-
-    /**
-     * @return string of 16 (zero padded) uppercase hex chars and prefixed with '0x'
-     */
-    public static String longToHex(long value) {
-        StringBuilder sb = new StringBuilder(18);
-        writeHex(sb, value, 16, "0x");
-        return sb.toString();
-    }
-    
-    /**
-     * @return string of 8 (zero padded) uppercase hex chars and prefixed with '0x'
-     */
-    public static String intToHex(int value) {
-        StringBuilder sb = new StringBuilder(10);
-        writeHex(sb, value & 0xFFFFFFFFL, 8, "0x");
-        return sb.toString();
-    }
-    
-    /**
-     * @return string of 4 (zero padded) uppercase hex chars and prefixed with '0x'
-     */
-    public static String shortToHex(int value) {
-        StringBuilder sb = new StringBuilder(6);
-        writeHex(sb, value & 0xFFFFL, 4, "0x");
-        return sb.toString();
-    }
-    
-    /**
-     * @return string of 2 (zero padded) uppercase hex chars and prefixed with '0x'
-     */
-    public static String byteToHex(int value) {
-        StringBuilder sb = new StringBuilder(4);
-        writeHex(sb, value & 0xFFL, 2, "0x");
-        return sb.toString();
-    }
-    
-    /**
-     * @see Integer#toHexString(int)
-     * @see Long#toHexString(long)
-     */
-    private static void writeHex(StringBuilder sb, long value, int nDigits, String prefix) {
-        sb.append(prefix);
-        char[] buf = new char[nDigits];
-        long acc = value;
-        for(int i=nDigits-1; i>=0; i--) {
-            int digit = (int)(acc & 0x0F);
-            buf[i] = (char) (digit < 10 ? ('0' + digit) : ('A' + digit - 10));
-            acc >>>= 4;
-        }
-        sb.append(buf);
-    }    
-    
-    
-    public static void main(String[] args) throws Exception {
-        File file = new File(args[0]);
-        InputStream in = new BufferedInputStream(new FileInputStream(file));
-        byte[] b = new byte[(int)file.length()];
-        in.read(b);
-        System.out.println(HexDump.dump(b, 0, 0));
-        in.close();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/HexRead.java b/trunk/src/java/org/apache/poi/util/HexRead.java
deleted file mode 100644
index 4d9ac97..0000000
--- a/trunk/src/java/org/apache/poi/util/HexRead.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.*;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * Utilities to read hex from files.
- * TODO - move to test packages
- */
-public class HexRead
-{
-    /**
-     * This method reads hex data from a filename and returns a byte array.
-     * The file may contain line comments that are preceeded with a # symbol.
-     *
-     * @param filename  The filename to read
-     * @return The bytes read from the file.
-     * @throws IOException If there was a problem while reading the file.
-     */
-    public static byte[] readData( String filename ) throws IOException
-    {
-        File file = new File( filename );
-        FileInputStream stream = new FileInputStream( file );
-        try
-        {
-            return readData( stream, -1 );
-        }
-        finally
-        {
-            stream.close();
-        }
-    }
-
-    /**
-     * Same as readData(String) except that this method allows you to specify sections within
-     * a file.  Sections are referenced using section headers in the form:
-     * <pre>
-     *  [sectioname]
-     * </pre>
-     *
-     * @see #readData(String)
-     */
-    public static byte[] readData(InputStream stream, String section ) throws IOException {
-
-        try
-        {
-            StringBuffer sectionText = new StringBuffer();
-            boolean inSection = false;
-            int c = stream.read();
-            while ( c != -1 )
-            {
-                switch ( c )
-                {
-                    case '[':
-                        inSection = true;
-                        break;
-                    case '\n':
-                    case '\r':
-                        inSection = false;
-                        sectionText = new StringBuffer();
-                        break;
-                    case ']':
-                        inSection = false;
-                        if ( sectionText.toString().equals( section ) ) return readData( stream, '[' );
-                        sectionText = new StringBuffer();
-                        break;
-                    default:
-                        if ( inSection ) sectionText.append( (char) c );
-                }
-                c = stream.read();
-            }
-        }
-        finally
-        {
-            stream.close();
-        }
-        throw new IOException( "Section '" + section + "' not found" );
-    }
-    public static byte[] readData( String filename, String section ) throws IOException
-    {
-        File file = new File( filename );
-        FileInputStream stream = new FileInputStream( file );
-        return readData(stream, section);
-    }
-
-    @SuppressWarnings("fallthrough")
-    static public byte[] readData( InputStream stream, int eofChar )
-            throws IOException
-    {
-        int characterCount = 0;
-        byte b = (byte) 0;
-        List<Byte> bytes = new ArrayList<Byte>();
-        final char a = 'a' - 10;
-        final char A = 'A' - 10;
-        while ( true )
-        {
-            int count = stream.read();
-            int digitValue = -1;
-            if ( '0' <= count && count <= '9' ) {
-                digitValue = count - '0';
-            } else if ( 'A' <= count && count <= 'F' ) {
-                digitValue = count - A;
-            } else if ( 'a' <= count && count <= 'f' ) {
-                digitValue = count - a;
-            } else if ( '#' == count ) {
-                readToEOL( stream );
-            } else if ( -1 == count || eofChar == count ) {
-                break;
-            }
-            // else: ignore the character
-
-            if (digitValue != -1) {
-                b <<= 4;
-                b += (byte) digitValue;
-                characterCount++;
-                if ( characterCount == 2 )
-                {
-                    bytes.add( Byte.valueOf( b ) );
-                    characterCount = 0;
-                    b = (byte) 0;
-                }
-            }
-        }
-        Byte[] polished = bytes.toArray(new Byte[bytes.size()]);
-        byte[] rval = new byte[polished.length];
-        for ( int j = 0; j < polished.length; j++ )
-        {
-            rval[j] = polished[j].byteValue();
-        }
-        return rval;
-    }
-
-    static public byte[] readFromString(String data) {
-        try {
-            return readData(new ByteArrayInputStream( data.getBytes(StringUtil.UTF8) ), -1);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    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/trunk/src/java/org/apache/poi/util/IOUtils.java b/trunk/src/java/org/apache/poi/util/IOUtils.java
deleted file mode 100644
index 2f61fd1..0000000
--- a/trunk/src/java/org/apache/poi/util/IOUtils.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PushbackInputStream;
-import java.nio.ByteBuffer;
-import java.nio.channels.ReadableByteChannel;
-import java.util.zip.CRC32;
-import java.util.zip.Checksum;
-
-import org.apache.poi.EmptyFileException;
-
-public final class IOUtils {
-    private static final POILogger logger = POILogFactory.getLogger( IOUtils.class );
-
-    private IOUtils() {
-        // no instances of this class
-    }
-
-    /**
-     * Peeks at the first 8 bytes of the stream. Returns those bytes, but
-     *  with the stream unaffected. Requires a stream that supports mark/reset,
-     *  or a PushbackInputStream. If the stream has &gt;0 but &lt;8 bytes, 
-     *  remaining bytes will be zero.
-     * @throws EmptyFileException if the stream is empty
-     */
-    public static byte[] peekFirst8Bytes(InputStream stream) throws IOException, EmptyFileException {
-        // We want to peek at the first 8 bytes
-        stream.mark(8);
-
-        byte[] header = new byte[8];
-        int read = IOUtils.readFully(stream, header);
-
-        if (read < 1)
-            throw new EmptyFileException();
-
-        // Wind back those 8 bytes
-        if(stream instanceof PushbackInputStream) {
-            PushbackInputStream pin = (PushbackInputStream)stream;
-            pin.unread(header, 0, read);
-        } else {
-            stream.reset();
-        }
-
-        return header;
-    }
-
-    /**
-     * Reads all the data from the input stream, and returns the bytes read.
-     */
-    public static byte[] toByteArray(InputStream stream) throws IOException {
-        return toByteArray(stream, Integer.MAX_VALUE);
-    }
-
-    /**
-     * Reads up to {@code length} bytes from the input stream, and returns the bytes read.
-     */
-    public static byte[] toByteArray(InputStream stream, int length) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(length == Integer.MAX_VALUE ? 4096 : length);
-
-        byte[] buffer = new byte[4096];
-        int totalBytes = 0, readBytes;
-        do {
-            readBytes = stream.read(buffer, 0, Math.min(buffer.length, length-totalBytes));
-            totalBytes += Math.max(readBytes,0);
-            if (readBytes > 0) {
-                baos.write(buffer, 0, readBytes);
-            }
-        } while (totalBytes < length && readBytes > -1);
-
-        if (length != Integer.MAX_VALUE && totalBytes < length) {
-            throw new IOException("unexpected EOF");
-        }
-        
-        return baos.toByteArray();
-    }
-
-    
-    /**
-     * Returns an array (that shouldn't be written to!) of the
-     *  ByteBuffer. Will be of the requested length, or possibly
-     *  longer if that's easier.
-     */
-    public static byte[] toByteArray(ByteBuffer buffer, int length) {
-        if(buffer.hasArray() && buffer.arrayOffset() == 0) {
-            // The backing array should work out fine for us
-            return buffer.array();
-        }
-
-        byte[] data = new byte[length];
-        buffer.get(data);
-        return data;
-    }
-
-    /**
-     * Helper method, just calls <tt>readFully(in, b, 0, b.length)</tt>
-     */
-    public static int readFully(InputStream in, byte[] b) throws IOException {
-        return readFully(in, b, 0, b.length);
-    }
-
-    /**
-     * <p>Same as the normal {@link InputStream#read(byte[], int, int)}, but tries to ensure
-     * that the entire len number of bytes is read.</p>
-     * 
-     * <p>If the end of file is reached before any bytes are read, returns <tt>-1</tt>. If
-     * the end of the file is reached after some bytes are read, returns the
-     * number of bytes read. If the end of the file isn't reached before <tt>len</tt>
-     * bytes have been read, will return <tt>len</tt> bytes.</p>
-     * 
-     * @param in the stream from which the data is read.
-     * @param b the buffer into which the data is read.
-     * @param off the start offset in array <tt>b</tt> at which the data is written.
-     * @param len the maximum number of bytes to read.
-     */
-    public static int readFully(InputStream in, byte[] b, int off, int len) throws IOException {
-        int total = 0;
-        while (true) {
-            int got = in.read(b, off + total, len - total);
-            if (got < 0) {
-                return (total == 0) ? -1 : total;
-            }
-            total += got;
-            if (total == len) {
-                return total;
-            }
-        }
-    }
-
-    /**
-     * Same as the normal <tt>channel.read(b)</tt>, but tries to ensure
-     * that the buffer is filled completely if possible, i.e. b.remaining()
-     * returns 0.
-     * <p>
-     * If the end of file is reached before any bytes are read, returns -1. If
-     * the end of the file is reached after some bytes are read, returns the
-     * number of bytes read. If the end of the file isn't reached before the
-     * buffer has no more remaining capacity, will return the number of bytes
-     * that were read.
-     */
-    public static int readFully(ReadableByteChannel channel, ByteBuffer b) throws IOException {
-        int total = 0;
-        while (true) {
-            int got = channel.read(b);
-            if (got < 0) {
-                return (total == 0) ? -1 : total;
-            }
-            total += got;
-            if (total == b.capacity() || b.position() == b.capacity()) {
-                return total;
-            }
-        }
-    }
-
-    /**
-     * Copies all the data from the given InputStream to the OutputStream. It
-     * leaves both streams open, so you will still need to close them once done.
-     */
-    public static void copy(InputStream inp, OutputStream out) throws IOException {
-        byte[] buff = new byte[4096];
-        int count;
-        while ((count = inp.read(buff)) != -1) {
-            if (count > 0) {
-                out.write(buff, 0, count);
-            }
-        }
-    }
-
-    /**
-     * Calculate checksum on input data
-     */
-    public static long calculateChecksum(byte[] data) {
-        Checksum sum = new CRC32();
-        sum.update(data, 0, data.length);
-        return sum.getValue();
-    }
-
-    /**
-     * Calculate checksum on all the data read from input stream.
-     *
-     * This should be more efficient than the equivalent code
-     * {@code IOUtils.calculateChecksum(IOUtils.toByteArray(stream))}
-     */
-    public static long calculateChecksum(InputStream stream) throws IOException {
-        Checksum sum = new CRC32();
-
-        byte[] buf = new byte[4096];
-        int count;
-        while ((count = stream.read(buf)) != -1) {
-            if (count > 0) {
-                sum.update(buf, 0, count);
-            }
-        }
-        return sum.getValue();
-    }
-    
-    
-    /**
-     * Quietly (no exceptions) close Closable resource. In case of error it will
-     * be printed to {@link IOUtils} class logger.
-     * 
-     * @param closeable
-     *            resource to close
-     */
-    public static void closeQuietly( final Closeable closeable ) {
-        // no need to log a NullPointerException here
-        if(closeable == null) {
-            return;
-        }
-
-        try {
-            closeable.close();
-        } catch ( Exception exc ) {
-            logger.log( POILogger.ERROR, "Unable to close resource: " + exc,
-                    exc );
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/IntList.java b/trunk/src/java/org/apache/poi/util/IntList.java
deleted file mode 100644
index 08f0240..0000000
--- a/trunk/src/java/org/apache/poi/util/IntList.java
+++ /dev/null
@@ -1,662 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-/**
- * A List of int's; as full an implementation of the java.util.List
- * interface as possible, with an eye toward minimal creation of
- * objects
- *
- * the mimicry of List is as follows:
- * <ul>
- * <li> if possible, operations designated 'optional' in the List
- *      interface are attempted
- * <li> wherever the List interface refers to an Object, substitute
- *      int
- * <li> wherever the List interface refers to a Collection or List,
- *      substitute IntList
- * </ul>
- *
- * the mimicry is not perfect, however:
- * <ul>
- * <li> operations involving Iterators or ListIterators are not
- *      supported
- * <li> remove(Object) becomes removeValue to distinguish it from
- *      remove(int index)
- * <li> subList is not supported
- * </ul>
- *
- * @author Marc Johnson
- */
-public class IntList
-{
-    private int[]            _array;
-    private int              _limit;
-    private int              fillval = 0;
-    private static final int _default_size = 128;
-
-    /**
-     * create an IntList of default size
-     */
-
-    public IntList()
-    {
-        this(_default_size);
-    }
-
-    public IntList(final int initialCapacity)
-    {
-        this(initialCapacity,0);
-    }
-
-
-    /**
-     * create a copy of an existing IntList
-     *
-     * @param list the existing IntList
-     */
-
-    public IntList(final IntList list)
-    {
-        this(list._array.length);
-        System.arraycopy(list._array, 0, _array, 0, _array.length);
-        _limit = list._limit;
-    }
-
-    /**
-     * create an IntList with a predefined initial size
-     *
-     * @param initialCapacity the size for the internal array
-     */
-
-    public IntList(final int initialCapacity, int fillvalue)
-    {
-        _array = new int[ initialCapacity ];
-        if (fillval != 0) {
-            fillval = fillvalue;
-            fillArray(fillval, _array, 0);
-        }
-        _limit = 0;
-    }
-
-    private void fillArray(int val, int[] array, int index) {
-      for (int k = index; k < array.length; k++) {
-        array[k] = val;
-      }
-    }
-
-    /**
-     * add the specfied value at the specified index
-     *
-     * @param index the index where the new value is to be added
-     * @param value the new value
-     *
-     * @exception IndexOutOfBoundsException if the index is out of
-     *            range (index < 0 || index > size()).
-     */
-
-    public void add(final int index, final int value)
-    {
-        if (index > _limit)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        else if (index == _limit)
-        {
-            add(value);
-        }
-        else
-        {
-
-            // index < limit -- insert into the middle
-            if (_limit == _array.length)
-            {
-                growArray(_limit * 2);
-            }
-            System.arraycopy(_array, index, _array, index + 1,
-                             _limit - index);
-            _array[ index ] = value;
-            _limit++;
-        }
-    }
-
-    /**
-     * Appends the specified element to the end of this list
-     *
-     * @param value element to be appended to this list.
-     *
-     * @return true (as per the general contract of the Collection.add
-     *         method).
-     */
-
-    public boolean add(final int value)
-    {
-        if (_limit == _array.length)
-        {
-            growArray(_limit * 2);
-        }
-        _array[ _limit++ ] = value;
-        return true;
-    }
-
-    /**
-     * Appends all of the elements in the specified collection to the
-     * end of this list, in the order that they are returned by the
-     * specified collection's iterator.  The behavior of this
-     * operation is unspecified if the specified collection is
-     * modified while the operation is in progress.  (Note that this
-     * will occur if the specified collection is this list, and it's
-     * nonempty.)
-     *
-     * @param c collection whose elements are to be added to this
-     *          list.
-     *
-     * @return true if this list changed as a result of the call.
-     */
-
-    public boolean addAll(final IntList c)
-    {
-        if (c._limit != 0)
-        {
-            if ((_limit + c._limit) > _array.length)
-            {
-                growArray(_limit + c._limit);
-            }
-            System.arraycopy(c._array, 0, _array, _limit, c._limit);
-            _limit += c._limit;
-        }
-        return true;
-    }
-
-    /**
-     * Inserts all of the elements in the specified collection into
-     * this list at the specified position.  Shifts the element
-     * currently at that position (if any) and any subsequent elements
-     * to the right (increases their indices).  The new elements will
-     * appear in this list in the order that they are returned by the
-     * specified collection's iterator.  The behavior of this
-     * operation is unspecified if the specified collection is
-     * modified while the operation is in progress.  (Note that this
-     * will occur if the specified collection is this list, and it's
-     * nonempty.)
-     *
-     * @param index index at which to insert first element from the
-     *              specified collection.
-     * @param c elements to be inserted into this list.
-     *
-     * @return true if this list changed as a result of the call.
-     *
-     * @exception IndexOutOfBoundsException if the index is out of
-     *            range (index < 0 || index > size())
-     */
-
-    public boolean addAll(final int index, final IntList c)
-    {
-        if (index > _limit)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        if (c._limit != 0)
-        {
-            if ((_limit + c._limit) > _array.length)
-            {
-                growArray(_limit + c._limit);
-            }
-
-            // make a hole
-            System.arraycopy(_array, index, _array, index + c._limit,
-                             _limit - index);
-
-            // fill it in
-            System.arraycopy(c._array, 0, _array, index, c._limit);
-            _limit += c._limit;
-        }
-        return true;
-    }
-
-    /**
-     * Removes all of the elements from this list.  This list will be
-     * empty after this call returns (unless it throws an exception).
-     */
-
-    public void clear()
-    {
-        _limit = 0;
-    }
-
-    /**
-     * Returns true if this list contains the specified element.  More
-     * formally, returns true if and only if this list contains at
-     * least one element e such that o == e
-     *
-     * @param o element whose presence in this list is to be tested.
-     *
-     * @return true if this list contains the specified element.
-     */
-
-    public boolean contains(final int o)
-    {
-        boolean rval = false;
-
-        for (int j = 0; !rval && (j < _limit); j++)
-        {
-            if (_array[ j ] == o)
-            {
-                rval = true;
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Returns true if this list contains all of the elements of the
-     * specified collection.
-     *
-     * @param c collection to be checked for containment in this list.
-     *
-     * @return true if this list contains all of the elements of the
-     *         specified collection.
-     */
-
-    public boolean containsAll(final IntList c)
-    {
-        boolean rval = true;
-
-        if (this != c)
-        {
-            for (int j = 0; rval && (j < c._limit); j++)
-            {
-                if (!contains(c._array[ j ]))
-                {
-                    rval = false;
-                }
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Compares the specified object with this list for equality.
-     * Returns true if and only if the specified object is also a
-     * list, both lists have the same size, and all corresponding
-     * pairs of elements in the two lists are equal.  (Two elements e1
-     * and e2 are equal if e1 == e2.)  In other words, two lists are
-     * defined to be equal if they contain the same elements in the
-     * same order.  This definition ensures that the equals method
-     * works properly across different implementations of the List
-     * interface.
-     *
-     * @param o the object to be compared for equality with this list.
-     *
-     * @return true if the specified object is equal to this list.
-     */
-
-    public boolean equals(final Object o)
-    {
-        boolean rval = this == o;
-
-        if (!rval && (o != null) && (o.getClass() == this.getClass()))
-        {
-            IntList other = ( IntList ) o;
-
-            if (other._limit == _limit)
-            {
-
-                // assume match
-                rval = true;
-                for (int j = 0; rval && (j < _limit); j++)
-                {
-                    rval = _array[ j ] == other._array[ j ];
-                }
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Returns the element at the specified position in this list.
-     *
-     * @param index index of element to return.
-     *
-     * @return the element at the specified position in this list.
-     *
-     * @exception IndexOutOfBoundsException if the index is out of
-     *            range (index < 0 || index >= size()).
-     */
-
-    public int get(final int index)
-    {
-        if (index >= _limit)
-        {
-            throw new IndexOutOfBoundsException(
-                  index + " not accessible in a list of length " + _limit
-            );
-        }
-        return _array[ index ];
-    }
-
-    /**
-     * Returns the hash code value for this list.  The hash code of a
-     * list is defined to be the result of the following calculation:
-     *
-     * <code>
-     * hashCode = 1;
-     * Iterator i = list.iterator();
-     * while (i.hasNext()) {
-     *      Object obj = i.next();
-     *      hashCode = 31*hashCode + (obj==null ? 0 : obj.hashCode());
-     * }
-     * </code>
-     *
-     * This ensures that list1.equals(list2) implies that
-     * list1.hashCode()==list2.hashCode() for any two lists, list1 and
-     * list2, as required by the general contract of Object.hashCode.
-     *
-     * @return the hash code value for this list.
-     */
-
-    public int hashCode()
-    {
-        int hash = 0;
-
-        for (int j = 0; j < _limit; j++)
-        {
-            hash = (31 * hash) + _array[ j ];
-        }
-        return hash;
-    }
-
-    /**
-     * Returns the index in this list of the first occurrence of the
-     * specified element, or -1 if this list does not contain this
-     * element.  More formally, returns the lowest index i such that
-     * (o == get(i)), or -1 if there is no such index.
-     *
-     * @param o element to search for.
-     *
-     * @return the index in this list of the first occurrence of the
-     *         specified element, or -1 if this list does not contain
-     *         this element.
-     */
-
-    public int indexOf(final int o)
-    {
-        int rval = 0;
-
-        for (; rval < _limit; rval++)
-        {
-            if (o == _array[ rval ])
-            {
-                break;
-            }
-        }
-        if (rval == _limit)
-        {
-            rval = -1;   // didn't find it
-        }
-        return rval;
-    }
-
-    /**
-     * Returns true if this list contains no elements.
-     *
-     * @return true if this list contains no elements.
-     */
-
-    public boolean isEmpty()
-    {
-        return _limit == 0;
-    }
-
-    /**
-     * Returns the index in this list of the last occurrence of the
-     * specified element, or -1 if this list does not contain this
-     * element.  More formally, returns the highest index i such that
-     * (o == get(i)), or -1 if there is no such index.
-     *
-     * @param o element to search for.
-     *
-     * @return the index in this list of the last occurrence of the
-     *         specified element, or -1 if this list does not contain
-     *         this element.
-     */
-
-    public int lastIndexOf(final int o)
-    {
-        int rval = _limit - 1;
-
-        for (; rval >= 0; rval--)
-        {
-            if (o == _array[ rval ])
-            {
-                break;
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Removes the element at the specified position in this list.
-     * Shifts any subsequent elements to the left (subtracts one from
-     * their indices).  Returns the element that was removed from the
-     * list.
-     *
-     * @param index the index of the element to removed.
-     *
-     * @return the element previously at the specified position.
-     *
-     * @exception IndexOutOfBoundsException if the index is out of
-     *            range (index < 0 || index >= size()).
-     */
-
-    public int remove(final int index)
-    {
-        if (index >= _limit)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        int rval = _array[ index ];
-
-        System.arraycopy(_array, index + 1, _array, index, _limit - index);
-        _limit--;
-        return rval;
-    }
-
-    /**
-     * Removes the first occurrence in this list of the specified
-     * element (optional operation).  If this list does not contain
-     * the element, it is unchanged.  More formally, removes the
-     * element with the lowest index i such that (o.equals(get(i)))
-     * (if such an element exists).
-     *
-     * @param o element to be removed from this list, if present.
-     *
-     * @return true if this list contained the specified element.
-     */
-
-    public boolean removeValue(final int o)
-    {
-        boolean rval = false;
-
-        for (int j = 0; !rval && (j < _limit); j++)
-        {
-            if (o == _array[ j ])
-            {
-                if (j+1 < _limit) {
-                    System.arraycopy(_array, j + 1, _array, j, _limit - j);
-                }
-                _limit--;
-                rval = true;
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Removes from this list all the elements that are contained in
-     * the specified collection
-     *
-     * @param c collection that defines which elements will be removed
-     *          from this list.
-     *
-     * @return true if this list changed as a result of the call.
-     */
-
-    public boolean removeAll(final IntList c)
-    {
-        boolean rval = false;
-
-        for (int j = 0; j < c._limit; j++)
-        {
-            if (removeValue(c._array[ j ]))
-            {
-                rval = true;
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Retains only the elements in this list that are contained in
-     * the specified collection.  In other words, removes from this
-     * list all the elements that are not contained in the specified
-     * collection.
-     *
-     * @param c collection that defines which elements this set will
-     *          retain.
-     *
-     * @return true if this list changed as a result of the call.
-     */
-
-    public boolean retainAll(final IntList c)
-    {
-        boolean rval = false;
-
-        for (int j = 0; j < _limit; )
-        {
-            if (!c.contains(_array[ j ]))
-            {
-                remove(j);
-                rval = true;
-            }
-            else
-            {
-                j++;
-            }
-        }
-        return rval;
-    }
-
-    /**
-     * Replaces the element at the specified position in this list
-     * with the specified element
-     *
-     * @param index index of element to replace.
-     * @param element element to be stored at the specified position.
-     *
-     * @return the element previously at the specified position.
-     *
-     * @exception IndexOutOfBoundsException if the index is out of
-     *            range (index < 0 || index >= size()).
-     */
-
-    public int set(final int index, final int element)
-    {
-        if (index >= _limit)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        int rval = _array[ index ];
-
-        _array[ index ] = element;
-        return rval;
-    }
-
-    /**
-     * Returns the number of elements in this list. If this list
-     * contains more than Integer.MAX_VALUE elements, returns
-     * Integer.MAX_VALUE.
-     *
-     * @return the number of elements in this IntList
-     */
-
-    public int size()
-    {
-        return _limit;
-    }
-
-    /**
-     * Returns an array containing all of the elements in this list in
-     * proper sequence.  Obeys the general contract of the
-     * Collection.toArray method.
-     *
-     * @return an array containing all of the elements in this list in
-     *         proper sequence.
-     */
-
-    public int [] toArray()
-    {
-        int[] rval = new int[ _limit ];
-
-        System.arraycopy(_array, 0, rval, 0, _limit);
-        return rval;
-    }
-
-    /**
-     * Returns an array containing all of the elements in this list in
-     * proper sequence.  Obeys the general contract of the
-     * Collection.toArray(Object[]) method.
-     *
-     * @param a the array into which the elements of this list are to
-     *          be stored, if it is big enough; otherwise, a new array
-     *          is allocated for this purpose.
-     *
-     * @return an array containing the elements of this list.
-     */
-
-    public int [] toArray(final int [] a)
-    {
-        int[] rval;
-
-        if (a.length == _limit)
-        {
-            System.arraycopy(_array, 0, a, 0, _limit);
-            rval = a;
-        }
-        else
-        {
-            rval = toArray();
-        }
-        return rval;
-    }
-
-    private void growArray(final int new_size)
-    {
-        int   size      = (new_size == _array.length) ? new_size + 1
-                                                      : new_size;
-        int[] new_array = new int[ size ];
-
-        if (fillval != 0) {
-          fillArray(fillval, new_array, _array.length);
-        }
-
-        System.arraycopy(_array, 0, new_array, 0, _limit);
-        _array = new_array;
-    }
-}   // end public class IntList
-
diff --git a/trunk/src/java/org/apache/poi/util/IntMapper.java b/trunk/src/java/org/apache/poi/util/IntMapper.java
deleted file mode 100644
index d5cdc7b..0000000
--- a/trunk/src/java/org/apache/poi/util/IntMapper.java
+++ /dev/null
@@ -1,94 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.util;
-
-import java.util.*;
-
-/**
- * A List of objects that are indexed AND keyed by an int; also allows for getting
- * the index of a value in the list
- *
- * <p>I am happy is someone wants to re-implement this without using the
- * internal list and hashmap. If so could you please make sure that
- * you can add elements half way into the list and have the value-key mappings
- * update</p>
- *
- *
- * @author Jason Height
- */
-
-public class IntMapper<T>
-{
-  private List<T> elements;
-  private Map<T,Integer> valueKeyMap;
-
-  private static final int _default_size = 10;
-
-    /**
-     * create an IntMapper of default size
-     */
-
-    public IntMapper()
-    {
-        this(_default_size);
-    }
-
-    public IntMapper(final int initialCapacity)
-    {
-        elements = new ArrayList<T>(initialCapacity);
-        valueKeyMap = new HashMap<T,Integer>(initialCapacity);
-    }
-
-    /**
-     * Appends the specified element to the end of this list
-     *
-     * @param value element to be appended to this list.
-     *
-     * @return true (as per the general contract of the Collection.add
-     *         method).
-     */
-    public boolean add(final T value)
-    {
-      int index = elements.size();
-      elements.add(value);
-      valueKeyMap.put(value, index);
-      return true;
-    }
-
-    public int size() {
-      return elements.size();
-    }
-
-    public T get(int index) {
-      return elements.get(index);
-    }
-
-    public int getIndex(T o) {
-      Integer i = valueKeyMap.get(o);
-      if (i == null)
-        return -1;
-      return i.intValue();
-    }
-
-    public Iterator<T> iterator() {
-      return elements.iterator();
-    }
-}   // end public class IntMapper
-
diff --git a/trunk/src/java/org/apache/poi/util/IntegerField.java b/trunk/src/java/org/apache/poi/util/IntegerField.java
deleted file mode 100644
index c86a008..0000000
--- a/trunk/src/java/org/apache/poi/util/IntegerField.java
+++ /dev/null
@@ -1,220 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import org.apache.poi.util.LittleEndian.BufferUnderrunException;
-
-import java.io.*;
-
-/**
- * representation of an integer (32-bit) field at a fixed location
- * within a byte array
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public class IntegerField
-    implements FixedField
-{
-    private int       _value;
-    private final int _offset;
-
-    /**
-     * construct the IntegerField with its offset into its containing
-     * byte array
-     *
-     * @param offset of the field within its byte array
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is
-     *            negative
-     */
-
-    public IntegerField(final int offset)
-        throws ArrayIndexOutOfBoundsException
-    {
-        if (offset < 0)
-        {
-            throw new ArrayIndexOutOfBoundsException("negative offset");
-        }
-        _offset = offset;
-    }
-
-    /**
-     * construct the IntegerField with its offset into its containing
-     * byte array and initialize its value
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is
-     *            negative
-     */
-
-    public IntegerField(final int offset, final int value)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        set(value);
-    }
-
-    /**
-     * Construct the IntegerField with its offset into its containing
-     * byte array and initialize its value from its byte array
-     *
-     * @param offset of the field within its byte array
-     * @param data the byte array to read the value from
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is not
-     *            within the range of 0..(data.length - 1)
-     */
-
-    public IntegerField(final int offset, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        readFromBytes(data);
-    }
-
-    /**
-     * construct the IntegerField with its offset into its containing
-     * byte array, initialize its value, and write the value to a byte
-     * array
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is
-     *            negative or too large
-     */
-
-    public IntegerField(final int offset, final int value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        set(value, data);
-    }
-
-    /**
-     * get the IntegerField's current value
-     *
-     * @return current value
-     */
-
-    public int get()
-    {
-        return _value;
-    }
-
-    /**
-     * set the IntegerField's current value
-     *
-     * @param value to be set
-     */
-
-    public void set(final int value)
-    {
-        _value = value;
-    }
-
-    /**
-     * set the IntegerField's current value and write it to a byte
-     * array
-     *
-     * @param value to be set
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is too
-     *            large
-     */
-
-    public void set(final int value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        _value = value;
-        writeToBytes(data);
-    }
-
-    /* ********** START implementation of FixedField ********** */
-
-    /**
-     * set the value from its offset into an array of bytes
-     *
-     * @param data the byte array from which the value is to be read
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is too
-     *            large
-     */
-
-    public void readFromBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        _value = LittleEndian.getInt(data, _offset);
-    }
-
-    /**
-     * set the value from an InputStream
-     *
-     * @param stream the InputStream from which the value is to be
-     *               read
-     *
-     * @exception BufferUnderrunException if there is not enough data
-     *            available from the InputStream
-     * @exception IOException if an IOException is thrown from reading
-     *            the InputStream
-     */
-
-    public void readFromStream(final InputStream stream)
-        throws IOException
-    {
-        _value = LittleEndian.readInt(stream);
-    }
-
-    /**
-     * write the value out to an array of bytes at the appropriate
-     * offset
-     *
-     * @param data the array of bytes to which the value is to be
-     *             written
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is too
-     *            large
-     */
-
-    public void writeToBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        LittleEndian.putInt(data, _offset, _value);
-    }
-
-    /**
-     * return the value as a String
-     *
-     * @return the value as a String
-     */
-
-    public String toString()
-    {
-        return String.valueOf(_value);
-    }
-
-    /* **********  END  implementation of FixedField ********** */
-}   // end public class IntegerField
-
diff --git a/trunk/src/java/org/apache/poi/util/Internal.java b/trunk/src/java/org/apache/poi/util/Internal.java
deleted file mode 100644
index 565a908..0000000
--- a/trunk/src/java/org/apache/poi/util/Internal.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-
-
-/**
- * Program elements annotated &#64;Internal are intended for
- * POI internal use only.
- *
- * Such elements are not public by design and likely to be removed, have their
- * signature change, or have their access level decreased from public to
- * protected, package, or private in future versions of POI without notice.
- *
- * &#64;Internal elements are eligible for immediate modification or removal and are
- * not subject to the POI project policy of deprecating an element for 2 major
- * releases before removing.
- *
- * @author Yegor Kozlov
- * @since POI-3.6
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Internal {
-    String value() default "";
-    /**
-     * The POI version when an element was declared internal.
-     * This is not the same as an &#64;since javadoc annotation
-     * which specifies when the feature itself was added.
-     * A feature that was made internal after it was added may
-     * have a different since and Internal-since version numbers.
-     * */
-    String since() default "";
-}
diff --git a/trunk/src/java/org/apache/poi/util/JvmBugs.java b/trunk/src/java/org/apache/poi/util/JvmBugs.java
deleted file mode 100644
index 66e8468..0000000
--- a/trunk/src/java/org/apache/poi/util/JvmBugs.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.util;
-
-import java.util.Locale;
-
-public class JvmBugs {
-    private static final POILogger LOG = POILogFactory.getLogger(JvmBugs.class);
-    
-    /**
-     * The LineBreakMeasurer is used for calculating text bounds.
-     * The last official JDK 6 version (1.6.0_45) and also JDK 7 (1.7.0_21)
-     * for Windows are affected. For JDK 7 - update to a more recent version.
-     * For JDK 6 - replace the fontmanager.dll with the previous release.
-     * 
-     * For performance reasons, this method only checks for a windows jvm
-     * with version 1.6.0_45 and 1.7.0_21.
-     * 
-     * Set system property "org.apache.poi.JvmBugs.LineBreakMeasurer.ignore" to "true"
-     * to bypass this check and use the normal fonts.
-     * 
-     * @return true, if jvm is bugged, caller code should use Lucida Sans
-     * instead of Calibri and Lucida Bright instead of Cambria
-     *
-     * @see <a href="http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java?view=markup">Workaround for XSLF</a>
-     * @see <a href="http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java?view=markup">Workaround for XSSF and HSSF</a>
-     * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=54904">POI Bug #54904</a>
-     * @see <a href="http://bugs.java.com/view_bug.do?bug_id=6501991">JDK Bug #6501991</a>
-     * @see <a href="https://bitbucket.org/fakraemer/line-break-measurer-test">LineBreakMeasurerTest</a>
-     */
-    public static boolean hasLineBreakMeasurerBug() {
-        String version = System.getProperty("java.version");
-        String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
-        boolean ignore = Boolean.getBoolean("org.apache.poi.JvmBugs.LineBreakMeasurer.ignore");
-        boolean hasBug = (!ignore && (os.contains("win") && ("1.6.0_45".equals(version) || "1.7.0_21".equals(version))));
-        if (hasBug) {
-            LOG.log(POILogger.WARN, "JVM has LineBreakMeasurer bug - see POI bug #54904 - caller code might default to Lucida Sans");
-        }
-        return hasBug;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/LZWDecompresser.java b/trunk/src/java/org/apache/poi/util/LZWDecompresser.java
deleted file mode 100644
index 91aeb23..0000000
--- a/trunk/src/java/org/apache/poi/util/LZWDecompresser.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * This class provides common functionality for the
- *  various LZW implementations in the different file
- *  formats.
- * It's currently used by HDGF and HMEF.
- *
- * Two good resources on LZW are:
- *  http://en.wikipedia.org/wiki/LZW
- *  http://marknelson.us/1989/10/01/lzw-data-compression/
- */
-public abstract class LZWDecompresser {
-   /**
-    * Does the mask bit mean it's compressed or uncompressed?
-    */
-   private final boolean maskMeansCompressed;
-   /**
-    * How much to append to the code length in the stream
-    *  to get the real code length? Normally 2 or 3
-    */
-   private final int codeLengthIncrease;
-   /**
-    * Does the 12 bits of the position get stored in
-    *  Little Endian or Big Endian form?
-    * This controls whether a pos+length of 0x12 0x34
-    *  becomes a position of 0x123 or 0x312
-    */
-   private final boolean positionIsBigEndian;
-   
-   protected LZWDecompresser(boolean maskMeansCompressed, 
-            int codeLengthIncrease, boolean positionIsBigEndian) {
-      this.maskMeansCompressed = maskMeansCompressed;
-      this.codeLengthIncrease = codeLengthIncrease;
-      this.positionIsBigEndian = positionIsBigEndian;
-   }
-   
-   /**
-    * Populates the dictionary, and returns where in it
-    *  to begin writing new codes.
-    * Generally, if the dictionary is pre-populated, then new
-    *  codes should be placed at the end of that block.
-    * Equally, if the dictionary is left with all zeros, then
-    *  usually the new codes can go in at the start.
-    */
-   protected abstract int populateDictionary(byte[] dict);
-   
-   /**
-    * Adjusts the position offset if needed when looking
-    *  something up in the dictionary.
-    */
-   protected abstract int adjustDictionaryOffset(int offset);
-   
-   /**
-    * Decompresses the given input stream, returning the array of bytes
-    *  of the decompressed input.
-    */
-   public byte[] decompress(InputStream src) throws IOException {
-      ByteArrayOutputStream res = new ByteArrayOutputStream();
-      decompress(src,res);
-      return res.toByteArray();
-   }
-   
-   /**
-    * Perform a streaming decompression of the input.
-    * Works by:
-    * 1) Reading a flag byte, the 8 bits of which tell you if the
-    *     following 8 codes are compressed our un-compressed
-    * 2) Consider the 8 bits in turn
-    * 3) If the bit is set, the next code is un-compressed, so
-    *     add it to the dictionary and output it
-    * 4) If the bit isn't set, then read in the length and start
-    *     position in the dictionary, and output the bytes there
-    * 5) Loop until we've done all 8 bits, then read in the next
-    *     flag byte
-    */
-   public void decompress(InputStream src, OutputStream res) throws IOException {
-      // How far through the output we've got
-      // (This is normally used &4095, so it nicely wraps)
-      // The initial value is set when populating the dictionary
-      int pos;
-      // The flag byte is treated as its 8 individual
-      //  bits, which tell us if the following 8 codes
-      //  are compressed or un-compressed
-      int flag;
-      // The mask, between 1 and 255, which is used when
-      //  processing each bit of the flag byte in turn
-      int mask;
-
-      // We use 12 bit codes:
-      // * 0-255 are real bytes
-      // * 256-4095 are the substring codes
-      // Java handily initialises our buffer / dictionary
-      //  to all zeros
-      byte[] buffer = new byte[4096];
-      pos = populateDictionary(buffer);
-
-      // These are bytes as looked up in the dictionary
-      // It needs to be signed, as it'll get passed on to
-      //  the output stream
-      byte[] dataB = new byte[16+codeLengthIncrease];
-      // This is an unsigned byte read from the stream
-      // It needs to be unsigned, so that bit stuff works
-      int dataI;
-      // The compressed code sequence is held over 2 bytes
-      int dataIPt1, dataIPt2;
-      // How long a code sequence is, and where in the
-      //  dictionary to start at
-      int len, pntr;
-
-      while( (flag = src.read()) != -1 ) {
-         // Compare each bit in our flag byte in turn:
-         for(mask = 1; mask < 256 ; mask <<= 1) {
-            // Is this a new code (un-compressed), or
-            //  the use of existing codes (compressed)?
-            boolean isMaskSet = (flag & mask) > 0;
-            if( isMaskSet ^ maskMeansCompressed ) {
-               // Retrieve the un-compressed code
-               if( (dataI = src.read()) != -1) {
-                  // Save the byte into the dictionary
-                  buffer[(pos&4095)] = fromInt(dataI);
-                  pos++;
-                  // And output the byte
-                  res.write( new byte[] {fromInt(dataI)} );
-               }
-            } else {
-               // We have a compressed sequence
-               // Grab the next 16 bits of data
-               dataIPt1 = src.read();
-               dataIPt2 = src.read();
-               if(dataIPt1 == -1 || dataIPt2 == -1) break;
-
-               // Build up how long the code sequence is, and
-               //  what position of the code to start at
-               // (The position is the usually the first 12 bits, 
-               //  and the length is usually the last 4 bits)
-               len = (dataIPt2 & 15) + codeLengthIncrease;
-               if(positionIsBigEndian) {
-                  pntr = (dataIPt1<<4) + (dataIPt2>>4);
-               } else {
-                  pntr = dataIPt1 + ((dataIPt2&0xF0)<<4);
-               }
-               
-               // Adjust the pointer as needed
-               pntr = adjustDictionaryOffset(pntr);
-
-               // Loop over the codes, outputting what they correspond to
-               for(int i=0; i<len; i++) {
-                  dataB[i] = buffer[(pntr + i) & 4095];
-                  buffer[ (pos + i) & 4095 ] = dataB[i];
-               }
-               res.write(dataB, 0, len);
-
-               // Record how far along the stream we have moved
-               pos = pos + len;
-            }
-         }
-      }
-   }
-
-   /**
-    * Given an integer, turn it into a java byte, handling
-    *  the wrapping.
-    * This is a convenience method
-    */
-   public static byte fromInt(int b) {
-      if(b < 128) return (byte)b;
-      return (byte)(b - 256);
-   }
-   /**
-    * Given a java byte, turn it into an integer between 0
-    *  and 255 (i.e. handle the unwrapping).
-    * This is a convenience method
-    */
-   public static int fromByte(byte b) {
-      if(b >= 0) {
-         return b;
-      }
-      return b + 256;
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndian.java b/trunk/src/java/org/apache/poi/util/LittleEndian.java
deleted file mode 100644
index 45fc0eb..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndian.java
+++ /dev/null
@@ -1,765 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
-/**
- * a utility class for handling little-endian numbers, which the 80x86 world is
- * replete with. The methods are all static, and input/output is from/to byte
- * arrays, or from InputStreams.
- * 
- * @author Marc Johnson (mjohnson at apache dot org)
- * @author Andrew Oliver (acoliver at apache dot org)
- */
-public class LittleEndian implements LittleEndianConsts
-{
-
-    /**
-     * Exception to handle buffer underruns
-     * 
-     * @author Marc Johnson (mjohnson at apache dot org)
-     */
-    public static final class BufferUnderrunException extends IOException
-    {
-        /**
-         * Serial version UID
-         * 
-         * @see Serializable
-         */
-        private static final long serialVersionUID = 8736973884877006145L;
-
-        BufferUnderrunException()
-        {
-            super( "buffer underrun" );
-        }
-    }
-
-    /**
-     * Copy a portion of a byte array
-     * 
-     * @param data
-     *            the original byte array
-     * @param offset
-     *            Where to start copying from.
-     * @param size
-     *            Number of bytes to copy.
-     * @return The byteArray value
-     * @throws IndexOutOfBoundsException
-     *             - if copying would cause access of data outside array bounds.
-     */
-    public static byte[] getByteArray( byte[] data, int offset, int size )
-    {
-        byte[] copy = new byte[size];
-        System.arraycopy( data, offset, copy, 0, size );
-
-        return copy;
-    }
-
-    /**
-     * get a double value from a byte array, reads it in little endian format
-     * then converts the resulting revolting IEEE 754 (curse them) floating
-     * point number to a happy java double
-     * 
-     * @param data
-     *            the byte array
-     * @return the double (64-bit) value
-     */
-    public static double getDouble( byte[] data )
-    {
-        return Double.longBitsToDouble( getLong( data, 0 ) );
-    }
-
-    /**
-     * get a double value from a byte array, reads it in little endian format
-     * then converts the resulting revolting IEEE 754 (curse them) floating
-     * point number to a happy java double
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @return the double (64-bit) value
-     */
-    public static double getDouble( byte[] data, int offset )
-    {
-        return Double.longBitsToDouble( getLong( data, offset ) );
-    }
-
-    /**
-     * get a float value from a byte array, reads it in little endian format
-     * then converts the resulting revolting IEEE 754 (curse them) floating
-     * point number to a happy java float
-     * 
-     * @param data
-     *            the byte array
-     * @return the double (64-bit) value
-     */
-    public static float getFloat( byte[] data )
-    {
-        return getFloat( data, 0 );
-    }
-
-    /**
-     * get a float value from a byte array, reads it in little endian format
-     * then converts the resulting revolting IEEE 754 (curse them) floating
-     * point number to a happy java float
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @return the double (64-bit) value
-     */
-    public static float getFloat( byte[] data, int offset )
-    {
-        return Float.intBitsToFloat( getInt( data, offset ) );
-    }
-
-    /**
-     * get an int value from the beginning of a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @return the int (32-bit) value
-     */
-    public static int getInt( byte[] data )
-    {
-        return getInt( data, 0 );
-    }
-
-    /**
-     * get an int value from a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @return the int (32-bit) value
-     */
-    public static int getInt( byte[] data, int offset )
-    {
-        int i = offset;
-        int b0 = data[i++] & 0xFF;
-        int b1 = data[i++] & 0xFF;
-        int b2 = data[i++] & 0xFF;
-        int b3 = data[i++] & 0xFF;
-        return ( b3 << 24 ) + ( b2 << 16 ) + ( b1 << 8 ) + ( b0 << 0 );
-    }
-
-    /**
-     * get a long value from a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @return the long (64-bit) value
-     */
-    public static long getLong( byte[] data )
-    {
-        return getLong( data, 0 );
-    }
-
-    /**
-     * get a long value from a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @return the long (64-bit) value
-     */
-    public static long getLong( byte[] data, int offset )
-    {
-        long result = 0xff & data[offset + 7];
-
-        for ( int j = offset + LONG_SIZE - 1; j >= offset; j-- )
-        {
-            result <<= 8;
-            result |= 0xff & data[j];
-        }
-        return result;
-    }
-
-    /**
-     * get a short value from the beginning of a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @return the short (16-bit) value
-     */
-    public static short getShort( byte[] data )
-    {
-        return getShort( data, 0 );
-    }
-
-    /**
-     * get a short value from a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @return the short (16-bit) value
-     */
-    public static short getShort( byte[] data, int offset )
-    {
-        int b0 = data[offset] & 0xFF;
-        int b1 = data[offset + 1] & 0xFF;
-        return (short) ( ( b1 << 8 ) + ( b0 << 0 ) );
-    }
-
-    /**
-     * Read short array
-     * 
-     * @param data
-     *            the original byte array
-     * @param offset
-     *            Where to start copying from.
-     * @param size
-     *            Number of bytes to copy.
-     * @throws IndexOutOfBoundsException
-     *             - if read would cause access of data outside array bounds.
-     */
-    public static short[] getShortArray( byte[] data, int offset, int size )
-    {
-        short[] result = new short[size / SHORT_SIZE];
-        for ( int i = 0; i < result.length; i++ )
-        {
-            result[i] = getShort( data, offset + i * SHORT_SIZE );
-        }
-        return result;
-    }
-
-    /**
-     * get the unsigned value of a byte.
-     * 
-     * @param data
-     *            the byte array.
-     * @return the unsigned value of the byte as a 16 bit short
-     */
-    public static short getUByte( byte[] data )
-    {
-        return (short) ( data[0] & 0xFF );
-    }
-
-    /**
-     * get the unsigned value of a byte.
-     * 
-     * @param data
-     *            the byte array.
-     * @param offset
-     *            a starting offset into the byte array.
-     * @return the unsigned value of the byte as a 16 bit short
-     */
-    public static short getUByte( byte[] data, int offset )
-    {
-        return (short) ( data[offset] & 0xFF );
-    }
-
-    /**
-     * get an unsigned int value from a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @return the unsigned int (32-bit) value in a long
-     */
-    public static long getUInt( byte[] data )
-    {
-        return getUInt( data, 0 );
-    }
-
-    /**
-     * get an unsigned int value from a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @return the unsigned int (32-bit) value in a long
-     */
-    public static long getUInt( byte[] data, int offset )
-    {
-        long retNum = getInt( data, offset );
-        return retNum & 0x00FFFFFFFFl;
-    }
-
-    /**
-     * get an unsigned short value from the beginning of a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @return the unsigned short (16-bit) value in an int
-     */
-    public static int getUShort( byte[] data )
-    {
-        return getUShort( data, 0 );
-    }
-
-    /**
-     * get an unsigned short value from a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @return the unsigned short (16-bit) value in an integer
-     */
-    public static int getUShort( byte[] data, int offset )
-    {
-        int b0 = data[offset] & 0xFF;
-        int b1 = data[offset + 1] & 0xFF;
-        return ( b1 << 8 ) + ( b0 << 0 );
-    }
-
-    /**
-     * executes:
-     * <p/>
-     * <code>
-     * data[offset] = (byte)value;
-     * </code>
-     * </p>
-     * Added for consistency with other put~() methods
-     */
-    public static void putByte( byte[] data, int offset, int value )
-    {
-        data[offset] = (byte) value;
-    }
-
-    /**
-     * put a double value into a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @param value
-     *            the double (64-bit) value
-     */
-    public static void putDouble( byte[] data, int offset, double value )
-    {
-        putLong( data, offset, Double.doubleToLongBits( value ) );
-    }
-
-    /**
-     * put a double value into a byte array
-     * 
-     * @param value
-     *            the double (64-bit) value
-     * @param outputStream
-     *            output stream
-     * @throws IOException
-     *             if an I/O error occurs
-     */
-    public static void putDouble( double value, OutputStream outputStream )
-            throws IOException
-    {
-        putLong( Double.doubleToLongBits( value ), outputStream );
-    }
-
-    /**
-     * put a float value into a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @param value
-     *            the float (32-bit) value
-     */
-    public static void putFloat( byte[] data, int offset, float value )
-    {
-        putInt( data, offset, Float.floatToIntBits( value ) );
-    }
-
-    /**
-     * put a float value into a byte array
-     * 
-     * @param value
-     *            the float (32-bit) value
-     * @param outputStream
-     *            output stream
-     * @throws IOException
-     *             if an I/O error occurs
-     */
-    public static void putFloat( float value, OutputStream outputStream )
-            throws IOException
-    {
-        putInt( Float.floatToIntBits( value ), outputStream );
-    }
-
-    /**
-     * put an int value into a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @param value
-     *            the int (32-bit) value
-     */
-    public static void putInt( byte[] data, int offset, int value )
-    {
-        int i = offset;
-        data[i++] = (byte) ( ( value >>> 0 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 8 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 16 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 24 ) & 0xFF );
-    }
-
-    /**
-     * Put int into output stream
-     * 
-     * @param value
-     *            the int (32-bit) value
-     * @param outputStream
-     *            output stream
-     * @throws IOException
-     *             if an I/O error occurs
-     */
-    public static void putInt( int value, OutputStream outputStream )
-            throws IOException
-    {
-        outputStream.write( (byte) ( ( value >>> 0 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 8 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 16 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 24 ) & 0xFF ) );
-    }
-
-    /**
-     * put a long value into a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @param value
-     *            the long (64-bit) value
-     */
-    public static void putLong( byte[] data, int offset, long value )
-    {
-        data[offset + 0] = (byte) ( ( value >>> 0 ) & 0xFF );
-        data[offset + 1] = (byte) ( ( value >>> 8 ) & 0xFF );
-        data[offset + 2] = (byte) ( ( value >>> 16 ) & 0xFF );
-        data[offset + 3] = (byte) ( ( value >>> 24 ) & 0xFF );
-        data[offset + 4] = (byte) ( ( value >>> 32 ) & 0xFF );
-        data[offset + 5] = (byte) ( ( value >>> 40 ) & 0xFF );
-        data[offset + 6] = (byte) ( ( value >>> 48 ) & 0xFF );
-        data[offset + 7] = (byte) ( ( value >>> 56 ) & 0xFF );
-    }
-
-    /**
-     * Put long into output stream
-     * 
-     * @param value
-     *            the long (64-bit) value
-     * @param outputStream
-     *            output stream
-     * @throws IOException
-     *             if an I/O error occurs
-     */
-    public static void putLong( long value, OutputStream outputStream )
-            throws IOException
-    {
-        outputStream.write( (byte) ( ( value >>> 0 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 8 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 16 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 24 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 32 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 40 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 48 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 56 ) & 0xFF ) );
-    }
-
-    /**
-     * put a 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
-     */
-    public static void putShort( byte[] data, int offset, short value )
-    {
-        int i = offset;
-        data[i++] = (byte) ( ( value >>> 0 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 8 ) & 0xFF );
-    }
-
-    /**
-     * Put signed short into output stream
-     * 
-     * @param value
-     *            the short (16-bit) value
-     * @param outputStream
-     *            output stream
-     * @throws IOException
-     *             if an I/O error occurs
-     */
-    public static void putShort( OutputStream outputStream, short value )
-            throws IOException
-    {
-        outputStream.write( (byte) ( ( value >>> 0 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 8 ) & 0xFF ) );
-    }
-
-    /**
-     * Stores short array in buffer
-     * 
-     * @param data
-     *            the byte array
-     * @param startOffset
-     *            a starting offset into the byte array
-     * @param value
-     *            the short (16-bit) values
-     */
-    public static void putShortArray( byte[] data, int startOffset,
-            short[] value )
-    {
-        int offset = startOffset;
-        for ( short s : value )
-        {
-            putShort( data, offset, s );
-            offset += SHORT_SIZE;
-        }
-    }
-
-    /**
-     * put an unsigned byte 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 putUByte( byte[] data, int offset, short value )
-    {
-        data[offset] = (byte) ( value & 0xFF );
-    }
-
-    /**
-     * put an unsigned int value into a byte array
-     * 
-     * @param data
-     *            the byte array
-     * @param offset
-     *            a starting offset into the byte array
-     * @param value
-     *            the int (32-bit) value
-     * 
-     * @exception ArrayIndexOutOfBoundsException
-     *                may be thrown
-     */
-    public static void putUInt( byte[] data, int offset, long value )
-    {
-        int i = offset;
-        data[i++] = (byte) ( ( value >>> 0 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 8 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 16 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 24 ) & 0xFF );
-    }
-
-    /**
-     * Put unsigned int into output stream
-     * 
-     * @param value
-     *            the int (32-bit) value
-     * @param outputStream
-     *            output stream
-     * @throws IOException
-     *             if an I/O error occurs
-     */
-    public static void putUInt( long value, OutputStream outputStream )
-            throws IOException
-    {
-        outputStream.write( (byte) ( ( value >>> 0 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 8 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 16 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 24 ) & 0xFF ) );
-    }
-
-    /**
-     * 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( byte[] data, int offset, int value )
-    {
-        int i = offset;
-        data[i++] = (byte) ( ( value >>> 0 ) & 0xFF );
-        data[i++] = (byte) ( ( value >>> 8 ) & 0xFF );
-    }
-
-    /**
-     * Put unsigned short into output stream
-     * 
-     * @param value
-     *            the unsigned short (16-bit) value
-     * @param outputStream
-     *            output stream
-     * @throws IOException
-     *             if an I/O error occurs
-     */
-    public static void putUShort( int value, OutputStream outputStream )
-            throws IOException
-    {
-        outputStream.write( (byte) ( ( value >>> 0 ) & 0xFF ) );
-        outputStream.write( (byte) ( ( value >>> 8 ) & 0xFF ) );
-    }
-
-    /**
-     * get an int value from an InputStream
-     * 
-     * @param stream
-     *            the InputStream from which the int is to be read
-     * @return the int (32-bit) value
-     * @exception IOException
-     *                will be propagated back to the caller
-     * @exception BufferUnderrunException
-     *                if the stream cannot provide enough bytes
-     */
-    public static int readInt( InputStream stream ) throws IOException,
-            BufferUnderrunException
-    {
-        int ch1 = stream.read();
-        int ch2 = stream.read();
-        int ch3 = stream.read();
-        int ch4 = stream.read();
-        if ( ( ch1 | ch2 | ch3 | ch4 ) < 0 )
-        {
-            throw new BufferUnderrunException();
-        }
-        return ( ch4 << 24 ) + ( ch3 << 16 ) + ( ch2 << 8 ) + ( ch1 << 0 );
-    }
-    
-    /**
-     * get an unsigned int value from an InputStream
-     * 
-     * @param stream
-     *            the InputStream from which the int is to be read
-     * @return the unsigned int (32-bit) value
-     * @exception IOException
-     *                will be propagated back to the caller
-     * @exception BufferUnderrunException
-     *                if the stream cannot provide enough bytes
-     */
-    public static long readUInt( InputStream stream ) throws IOException,
-            BufferUnderrunException
-    {
-       long retNum = readInt(stream);
-       return retNum & 0x00FFFFFFFFl;
-    }
-
-    /**
-     * get a long value from an InputStream
-     * 
-     * @param stream
-     *            the InputStream from which the long is to be read
-     * @return the long (64-bit) value
-     * @exception IOException
-     *                will be propagated back to the caller
-     * @exception BufferUnderrunException
-     *                if the stream cannot provide enough bytes
-     */
-    public static long readLong( InputStream stream ) throws IOException,
-            BufferUnderrunException
-    {
-        int ch1 = stream.read();
-        int ch2 = stream.read();
-        int ch3 = stream.read();
-        int ch4 = stream.read();
-        int ch5 = stream.read();
-        int ch6 = stream.read();
-        int ch7 = stream.read();
-        int ch8 = stream.read();
-        if ( ( ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8 ) < 0 )
-        {
-            throw new BufferUnderrunException();
-        }
-
-        return ( (long) ch8 << 56 ) + ( (long) ch7 << 48 )
-                + ( (long) ch6 << 40 ) + ( (long) ch5 << 32 )
-                + ( (long) ch4 << 24 ) + // cast to long to preserve bit 31
-                                         // (sign bit for ints)
-                ( ch3 << 16 ) + ( ch2 << 8 ) + ( ch1 << 0 );
-    }
-
-    /**
-     * get a short value from an InputStream
-     * 
-     * @param stream
-     *            the InputStream from which the short is to be read
-     * @return the short (16-bit) value
-     * @exception IOException
-     *                will be propagated back to the caller
-     * @exception BufferUnderrunException
-     *                if the stream cannot provide enough bytes
-     */
-    public static short readShort( InputStream stream ) throws IOException,
-            BufferUnderrunException
-    {
-        return (short) readUShort( stream );
-    }
-
-    public static int readUShort( InputStream stream ) throws IOException,
-            BufferUnderrunException
-    {
-        int ch1 = stream.read();
-        int ch2 = stream.read();
-        if ( ( ch1 | ch2 ) < 0 )
-        {
-            throw new BufferUnderrunException();
-        }
-        return ( ch2 << 8 ) + ( ch1 << 0 );
-    }
-
-    /**
-     * Convert an 'unsigned' byte to an integer. ie, don't carry across the
-     * sign.
-     * 
-     * @param b
-     *            Description of the Parameter
-     * @return Description of the Return Value
-     */
-    public static int ubyteToInt( byte b )
-    {
-        return b & 0xFF;
-    }
-
-    private LittleEndian()
-    {
-        // no instances of this class
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java b/trunk/src/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
deleted file mode 100644
index 2c5fe70..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.ByteArrayInputStream;
-
-/**
- * Adapts a plain byte array to {@link LittleEndianInput}
- */
-public final class LittleEndianByteArrayInputStream extends ByteArrayInputStream implements LittleEndianInput {
-	public LittleEndianByteArrayInputStream(byte[] buf, int startOffset, int maxReadLen) { // NOSONAR
-	    super(buf, startOffset, maxReadLen);
-	}
-	
-	public LittleEndianByteArrayInputStream(byte[] buf, int startOffset) {
-	    super(buf, startOffset, buf.length - startOffset);
-	}
-	
-	public LittleEndianByteArrayInputStream(byte[] buf) {
-	    super(buf);
-	}
-
-	private void checkPosition(int i) {
-		if (i > count - pos) {
-			throw new RuntimeException("Buffer overrun");
-		}
-	}
-
-	public int getReadIndex() {
-		return pos;
-	}
-
-	@Override
-    public byte readByte() {
-		checkPosition(1);
-		return (byte)read();
-	}
-
-	@Override
-    public int readInt() {
-	    final int size = LittleEndianConsts.INT_SIZE;
-		checkPosition(size);
-		int le = LittleEndian.getInt(buf, pos);
-		super.skip(size);
-		return le;
-	}
-
-	@Override
-    public long readLong() {
-	    final int size = LittleEndianConsts.LONG_SIZE;
-		checkPosition(size);
-		long le = LittleEndian.getLong(buf, pos);
-		super.skip(size);
-		return le;
-	}
-
-	@Override
-    public short readShort() {
-		return (short)readUShort();
-	}
-
-	@Override
-    public int readUByte() {
-	    return readByte() & 0xFF;
-	}
-
-	@Override
-    public int readUShort() {
-        final int size = LittleEndianConsts.SHORT_SIZE;
-        checkPosition(size);
-        int le = LittleEndian.getUShort(buf, pos);
-        super.skip(size);
-        return le;
-	}
-
-    @Override
-    public double readDouble() {
-        return Double.longBitsToDouble(readLong());
-    }
-	
-	@Override
-    public void readFully(byte[] buffer, int off, int len) {
-		checkPosition(len);
-		read(buffer, off, len);
-	}
-
-	@Override
-    public void readFully(byte[] buffer) {
-        checkPosition(buffer.length);
-        read(buffer, 0, buffer.length);
-	}
-
-    @Override
-    public void readPlain(byte[] buf, int off, int len) {
-        readFully(buf, off, len);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java b/trunk/src/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
deleted file mode 100644
index fe9949f..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.OutputStream;
-
-/**
- * Adapts a plain byte array to {@link LittleEndianOutput}
- */
-public final class LittleEndianByteArrayOutputStream extends OutputStream implements LittleEndianOutput, DelayableLittleEndianOutput {
-	private final byte[] _buf;
-	private final int _endIndex;
-	private int _writeIndex;
-
-	public LittleEndianByteArrayOutputStream(byte[] buf, int startOffset, int maxWriteLen) { // NOSONAR
-		if (startOffset < 0 || startOffset > buf.length) {
-			throw new IllegalArgumentException("Specified startOffset (" + startOffset
-					+ ") is out of allowable range (0.." + buf.length + ")");
-		}
-		_buf = buf;
-		_writeIndex = startOffset;
-		_endIndex = startOffset + maxWriteLen;
-		if (_endIndex < startOffset ||  _endIndex > buf.length) {
-			throw new IllegalArgumentException("calculated end index (" + _endIndex
-					+ ") is out of allowable range (" + _writeIndex + ".." + buf.length + ")");
-		}
-	}
-	public LittleEndianByteArrayOutputStream(byte[] buf, int startOffset) {
-		this(buf, startOffset, buf.length - startOffset);
-	}
-
-	private void checkPosition(int i) {
-		if (i > _endIndex - _writeIndex) {
-			throw new RuntimeException("Buffer overrun");
-		}
-	}
-
-	@Override
-    public void writeByte(int v) {
-		checkPosition(1);
-		_buf[_writeIndex++] = (byte)v;
-	}
-
-	@Override
-    public void writeDouble(double v) {
-		writeLong(Double.doubleToLongBits(v));
-	}
-
-	@Override
-    public void writeInt(int v) {
-		checkPosition(4);
-		int i = _writeIndex;
-		_buf[i++] = (byte)((v >>>  0) & 0xFF);
-		_buf[i++] = (byte)((v >>>  8) & 0xFF);
-		_buf[i++] = (byte)((v >>> 16) & 0xFF);
-		_buf[i++] = (byte)((v >>> 24) & 0xFF);
-		_writeIndex = i;
-	}
-
-	@Override
-    public void writeLong(long v) {
-		writeInt((int)(v >>  0));
-		writeInt((int)(v >> 32));
-	}
-
-	@Override
-    public void writeShort(int v) {
-		checkPosition(2);
-		int i = _writeIndex;
-		_buf[i++] = (byte)((v >>>  0) & 0xFF);
-		_buf[i++] = (byte)((v >>>  8) & 0xFF);
-		_writeIndex = i;
-	}
-
-	@Override
-    public void write(int b) {
-	    writeByte(b);
-    }
-
-	@Override
-    public void write(byte[] b) {
-		int len = b.length;
-		checkPosition(len);
-		System.arraycopy(b, 0, _buf, _writeIndex, len);
-		_writeIndex += len;
-	}
-
-	@Override
-    public void write(byte[] b, int offset, int len) {
-		checkPosition(len);
-		System.arraycopy(b, offset, _buf, _writeIndex, len);
-		_writeIndex += len;
-	}
-
-	public int getWriteIndex() {
-		return _writeIndex;
-	}
-
-	@Override
-    public LittleEndianOutput createDelayedOutput(int size) {
-		checkPosition(size);
-		LittleEndianOutput result = new LittleEndianByteArrayOutputStream(_buf, _writeIndex, size);
-		_writeIndex += size;
-		return result;
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndianConsts.java b/trunk/src/java/org/apache/poi/util/LittleEndianConsts.java
deleted file mode 100644
index 9f7e4a2..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndianConsts.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-/**
- * a repository for constants shared by classes within this package
- *
- * @author Marc Johnson
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-
-public interface LittleEndianConsts {
-    // sizes of various numbers in this environment
-    int BYTE_SIZE   = 1;
-    int SHORT_SIZE  = 2;
-    int INT_SIZE    = 4;
-    int LONG_SIZE   = 8;
-    int DOUBLE_SIZE = 8;
-}   // end public interface LittleEndianConsts
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndianInput.java b/trunk/src/java/org/apache/poi/util/LittleEndianInput.java
deleted file mode 100644
index c140c27..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndianInput.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-public interface LittleEndianInput {
-	int available();
-	byte readByte();
-	int readUByte();
-	short readShort();
-	int readUShort();
-	int readInt();
-	long readLong();
-	double readDouble();
-	void readFully(byte[] buf);
-	void readFully(byte[] buf, int off, int len);
-
-	/**
-	 * Usually acts the same as {@link #readFully(byte[], int, int)}, but
-	 * for an encrypted stream the raw (unencrypted) data is filled 
-	 *
-	 * @param buf the byte array to receive the bytes
-	 * @param off the start offset into the byte array 
-	 * @param len the amount of bytes to fill
-	 */
-	void readPlain(byte[] buf, int off, int len);
-}
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndianInputStream.java b/trunk/src/java/org/apache/poi/util/LittleEndianInputStream.java
deleted file mode 100644
index 3062c50..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndianInputStream.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Wraps an {@link InputStream} providing {@link LittleEndianInput}<p/>
- *
- * This class does not buffer any input, so the stream read position maintained
- * by this class is consistent with that of the inner stream.
- *
- * @author Josh Micich
- */
-public class LittleEndianInputStream extends FilterInputStream implements LittleEndianInput {
-	public LittleEndianInputStream(InputStream is) {
-		super(is);
-	}
-	
-	@Override
-    public int available() {
-		try {
-			return super.available();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	
-	@Override
-    public byte readByte() {
-		return (byte)readUByte();
-	}
-	
-	@Override
-    public int readUByte() {
-		byte buf[] = new byte[1];
-		try {
-			checkEOF(read(buf), 1);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		return LittleEndian.getUByte(buf);
-	}
-	
-	@Override
-    public double readDouble() {
-		return Double.longBitsToDouble(readLong());
-	}
-	
-	@Override
-    public int readInt() {
-	    byte buf[] = new byte[LittleEndianConsts.INT_SIZE];
-		try {
-		    checkEOF(read(buf), buf.length);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		return LittleEndian.getInt(buf);
-	}
-	
-    /**
-     * get an unsigned int value from an InputStream
-     * 
-     * @return the unsigned int (32-bit) value
-     * @exception RuntimeException
-     *                wraps any IOException thrown from reading the stream.
-     */
-    public long readUInt() {
-       long retNum = readInt();
-       return retNum & 0x00FFFFFFFFL;
-    }
-	
-	@Override
-    public long readLong() {
-		byte buf[] = new byte[LittleEndianConsts.LONG_SIZE];
-		try {
-		    checkEOF(read(buf), LittleEndianConsts.LONG_SIZE);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		return LittleEndian.getLong(buf);
-	}
-	
-	@Override
-    public short readShort() {
-		return (short)readUShort();
-	}
-	
-	@Override
-    public int readUShort() {
-		byte buf[] = new byte[LittleEndianConsts.SHORT_SIZE];
-		try {
-		    checkEOF(read(buf), LittleEndianConsts.SHORT_SIZE);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		return LittleEndian.getUShort(buf);
-	}
-	
-	private static void checkEOF(int actualBytes, int expectedBytes) {
-		if (expectedBytes != 0 && (actualBytes == -1 || actualBytes != expectedBytes)) {
-			throw new RuntimeException("Unexpected end-of-file");
-		}
-	}
-
-	@Override
-    public void readFully(byte[] buf) {
-		readFully(buf, 0, buf.length);
-	}
-
-	@Override
-    public void readFully(byte[] buf, int off, int len) {
-	    try {
-	        checkEOF(read(buf, off, len), len);
-	    } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-	}
-
-    @Override
-    public void readPlain(byte[] buf, int off, int len) {
-        readFully(buf, off, len);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndianOutput.java b/trunk/src/java/org/apache/poi/util/LittleEndianOutput.java
deleted file mode 100644
index 708d97b..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndianOutput.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-/**
- *
- * @author Josh Micich
- */
-public interface LittleEndianOutput {
-	void writeByte(int v);
-	void writeShort(int v);
-	void writeInt(int v);
-	void writeLong(long v);
-	void writeDouble(double v);
-	void write(byte[] b);
-	void write(byte[] b, int offset, int len);
-}
diff --git a/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java b/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java
deleted file mode 100644
index 3e0daa3..0000000
--- a/trunk/src/java/org/apache/poi/util/LittleEndianOutputStream.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- *
- * @author Josh Micich
- */
-public final class LittleEndianOutputStream extends FilterOutputStream implements LittleEndianOutput {
-	public LittleEndianOutputStream(OutputStream out) {
-		super(out);
-	}
-
-	@Override
-    public void writeByte(int v) {
-		try {
-			out.write(v);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	@Override
-    public void writeDouble(double v) {
-		writeLong(Double.doubleToLongBits(v));
-	}
-
-	@Override
-    public void writeInt(int v) {
-		int b3 = (v >>> 24) & 0xFF;
-		int b2 = (v >>> 16) & 0xFF;
-		int b1 = (v >>>  8) & 0xFF;
-		int b0 = (v >>>  0) & 0xFF;
-		try {
-			out.write(b0);
-			out.write(b1);
-			out.write(b2);
-			out.write(b3);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	@Override
-    public void writeLong(long v) {
-		writeInt((int)(v >>  0));
-		writeInt((int)(v >> 32));
-	}
-
-	@Override
-    public void writeShort(int v) {
-		int b1 = (v >>>  8) & 0xFF;
-		int b0 = (v >>>  0) & 0xFF;
-		try {
-			out.write(b0);
-			out.write(b1);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	@Override
-    public void write(byte[] b) {
-		// suppress IOException for interface method
-		try {
-			super.write(b);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	@Override
-    public void write(byte[] b, int off, int len) {
-		// suppress IOException for interface method
-		try {
-			super.write(b, off, len);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}
diff --git a/trunk/src/java/org/apache/poi/util/LocaleUtil.java b/trunk/src/java/org/apache/poi/util/LocaleUtil.java
deleted file mode 100644
index 81bdd4a..0000000
--- a/trunk/src/java/org/apache/poi/util/LocaleUtil.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import java.nio.charset.Charset;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * This utility class is used to set locale and time zone settings beside
- * of the JDK internal {@link java.util.Locale#setDefault(Locale)} and
- * {@link java.util.TimeZone#setDefault(TimeZone)} methods, because
- * the locale/time zone specific handling of certain office documents -
- * maybe for different time zones / locales ... - shouldn't affect
- * other java components.
- * 
- * The settings are saved in a {@link java.lang.ThreadLocal},
- * so they only apply to the current thread and can't be set globally.
- */
-public final class LocaleUtil {
-    private LocaleUtil() {
-        // no instances of this class
-    }
-    
-    /**
-     * Excel doesn't store TimeZone information in the file, so if in doubt,
-     *  use UTC to perform calculations
-     */
-    public static final TimeZone TIMEZONE_UTC = TimeZone.getTimeZone("UTC");
-    
-    /**
-     * Default encoding for unknown byte encodings of native files
-     * (at least it's better than to rely on a platform dependent encoding
-     * for legacy stuff ...)
-     */
-    public static final Charset CHARSET_1252 = Charset.forName("CP1252");
-
-    private static final ThreadLocal<TimeZone> userTimeZone = new ThreadLocal<TimeZone>();
-    private static final ThreadLocal<Locale> userLocale = new ThreadLocal<Locale>();
-    
-    /**
-     * As time zone information is not stored in any format, it can be
-     * set before any date calculations take place.
-     * This setting is specific to the current thread.
-     *
-     * @param timezone the timezone under which date calculations take place
-     */
-    public static void setUserTimeZone(TimeZone timezone) {
-        userTimeZone.set(timezone);
-    }
-    
-    /**
-     * @return the time zone which is used for date calculations. If not set, returns {@link TimeZone#getDefault()}.
-     */
-    @SuppressForbidden("implementation around default locales in POI")
-    public static TimeZone getUserTimeZone() {
-        TimeZone timeZone = userTimeZone.get();
-        return (timeZone != null) ? timeZone : TimeZone.getDefault();
-    }
-
-    /**
-     * Clear the thread-local user time zone.
-     */    
-    public static void resetUserTimeZone() {
-        userTimeZone.remove();
-    }
-
-    /**
-     * Sets default user locale.
-     * This setting is specific to the current thread.
-     */
-    public static void setUserLocale(Locale locale) {
-        userLocale.set(locale);
-    }
-    
-    /**
-     * @return the default user locale. If not set, returns {@link Locale#getDefault()}.
-     */
-    @SuppressForbidden("implementation around default locales in POI")
-    public static Locale getUserLocale() {
-        Locale locale = userLocale.get();
-        return (locale != null) ? locale : Locale.getDefault();
-    }
-
-    public static void resetUserLocale() {
-        userLocale.remove();
-    }
-
-    /**
-     * @return a calendar for the user locale and time zone
-     */
-    public static Calendar getLocaleCalendar() {
-        return getLocaleCalendar(getUserTimeZone());
-    }
-
-    /**
-     * Convenience method - month is 0-based as in java.util.Calendar
-     *
-     * @param year
-     * @param month
-     * @param day
-     * @return a calendar for the user locale and time zone, and the given date
-     */
-    public static Calendar getLocaleCalendar(int year, int month, int day) {
-        return getLocaleCalendar(year, month, day, 0, 0, 0);
-    }
-
-    /**
-     * Convenience method - month is 0-based as in java.util.Calendar
-     *
-     * @param year
-     * @param month
-     * @param day
-     * @param hour
-     * @param minute
-     * @param second
-     * @return a calendar for the user locale and time zone, and the given date
-     */
-    public static Calendar getLocaleCalendar(int year, int month, int day, int hour, int minute, int second) {
-        Calendar cal = getLocaleCalendar();
-        cal.set(year,  month, day, hour, minute, second);
-        cal.clear(Calendar.MILLISECOND);
-        return cal;
-    }
-    
-    /**
-     * @return a calendar for the user locale and time zone
-     */
-    public static Calendar getLocaleCalendar(TimeZone timeZone) {
-        return Calendar.getInstance(timeZone, getUserLocale());
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/util/LongField.java b/trunk/src/java/org/apache/poi/util/LongField.java
deleted file mode 100644
index 9aeffb3..0000000
--- a/trunk/src/java/org/apache/poi/util/LongField.java
+++ /dev/null
@@ -1,217 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import org.apache.poi.util.LittleEndian.BufferUnderrunException;
-
-import java.io.*;
-
-/**
- * representation of a long (16-bit) field at a fixed location within
- * a byte array
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public class LongField
-    implements FixedField
-{
-    private long      _value;
-    private final int _offset;
-
-    /**
-     * construct the LongField with its offset into its containing
-     * byte array
-     *
-     * @param offset of the field within its byte array
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public LongField(final int offset)
-        throws ArrayIndexOutOfBoundsException
-    {
-        if (offset < 0)
-        {
-            throw new ArrayIndexOutOfBoundsException("Illegal offset: "
-                                                     + offset);
-        }
-        _offset = offset;
-    }
-
-    /**
-     * construct the LongField with its offset into its containing
-     * byte array and initialize its value
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public LongField(final int offset, final long value)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        set(value);
-    }
-
-    /**
-     * Construct the LongField with its offset into its containing
-     * byte array and initialize its value from its byte array
-     *
-     * @param offset of the field within its byte array
-     * @param data the byte array to read the value from
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is not
-     *            within the range of 0..(data.length - 1)
-     */
-
-    public LongField(final int offset, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        readFromBytes(data);
-    }
-
-    /**
-     * construct the LongField with its offset into its containing
-     * byte array, initialize its value, and write the value to a byte
-     * array
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public LongField(final int offset, final long value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        set(value, data);
-    }
-
-    /**
-     * get the LongField's current value
-     *
-     * @return current value
-     */
-
-    public long get()
-    {
-        return _value;
-    }
-
-    /**
-     * set the LongField's current value
-     *
-     * @param value to be set
-     */
-
-    public void set(final long value)
-    {
-        _value = value;
-    }
-
-    /**
-     * set the LongField's current value and write it to a byte array
-     *
-     * @param value to be set
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of range
-     */
-
-    public void set(final long value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        _value = value;
-        writeToBytes(data);
-    }
-
-    /* ********** START implementation of FixedField ********** */
-
-    /**
-     * set the value from its offset into an array of bytes
-     *
-     * @param data the byte array from which the value is to be read
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of range
-     */
-
-    public void readFromBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        _value = LittleEndian.getLong(data, _offset);
-    }
-
-    /**
-     * set the value from an InputStream
-     *
-     * @param stream the InputStream from which the value is to be
-     *               read
-     *
-     * @exception BufferUnderrunException if there is not enough data
-     *            available from the InputStream
-     * @exception IOException if an IOException is thrown from reading
-     *            the InputStream
-     */
-
-    public void readFromStream(final InputStream stream)
-        throws IOException
-    {
-        _value = LittleEndian.readLong(stream);
-    }
-
-    /**
-     * write the value out to an array of bytes at the appropriate
-     * offset
-     *
-     * @param data the array of bytes to which the value is to be
-     *             written
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of range
-     */
-
-    public void writeToBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        LittleEndian.putLong(data, _offset, _value);
-    }
-
-    /**
-     * return the value as a String
-     *
-     * @return the value as a String
-     */
-
-    public String toString()
-    {
-        return String.valueOf(_value);
-    }
-
-    /* **********  END  implementation of FixedField ********** */
-}   // end public class LongField
-
diff --git a/trunk/src/java/org/apache/poi/util/NotImplemented.java b/trunk/src/java/org/apache/poi/util/NotImplemented.java
deleted file mode 100644
index e815c5d..0000000
--- a/trunk/src/java/org/apache/poi/util/NotImplemented.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-
-
-/**
- * This feature has not been implemented yet.
- * Calling this method will result in a raised Exception
- * at runtime.
- *
- * @since POI-3.14beta1
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface NotImplemented {
-    String value() default "";
-}
diff --git a/trunk/src/java/org/apache/poi/util/NullLogger.java b/trunk/src/java/org/apache/poi/util/NullLogger.java
deleted file mode 100644
index e21adfa..0000000
--- a/trunk/src/java/org/apache/poi/util/NullLogger.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-/**
- * A logger class that strives to make it as easy as possible for
- * developers to write log calls, while simultaneously making those
- * calls as cheap as possible by performing lazy evaluation of the log
- * message.<p>
- */
-@Internal
-public class NullLogger extends POILogger {
-    @Override
-    public void initialize(final String cat) {
-       // do nothing
-    }
-
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.
-     */
-
-    @Override
-    protected void _log(final int level, final Object obj1) {
-        // do nothing
-    }
-
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.  This is converted to a string.
-     * @param exception An exception to be logged
-     */
-    @Override
-    protected void _log(int level, Object obj1, final Throwable exception) {
-        // do nothing
-    }
-
-    /**
-     * Log a message. Lazily appends Object parameters together.
-     * If the last parameter is a {@link Throwable} it is logged specially.
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param objs the objects to place in the message
-     */
-    @Override
-    public void log(int level, Object... objs) {
-        // do nothing
-    }
-
-    
-    /**
-     * Check if a logger is enabled to log at the specified level
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     */
-    @Override
-    public boolean check(final int level) {
-       return false;
-    }
-}
-
diff --git a/trunk/src/java/org/apache/poi/util/POILogFactory.java b/trunk/src/java/org/apache/poi/util/POILogFactory.java
deleted file mode 100644
index 1e34ccd..0000000
--- a/trunk/src/java/org/apache/poi/util/POILogFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Provides logging without clients having to mess with
- * configuration/initialization.
- *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Marc Johnson (mjohnson at apache dot org)
- * @author Nicola Ken Barozzi (nicolaken at apache.org)
- */
-@Internal
-public final class POILogFactory {
-    /**
-     * Map of POILogger instances, with classes as keys
-     */
-    private static final Map<String,POILogger> _loggers = new HashMap<String,POILogger>();
-
-    /**
-     * A common instance of NullLogger, as it does nothing
-     *  we only need the one
-     */
-    private static final POILogger _nullLogger = new NullLogger();
-    /**
-     * The name of the class to use. Initialised the
-     *  first time we need it
-     */
-    static String _loggerClassName = null;
-
-    /**
-     * Construct a POILogFactory.
-     */
-    private POILogFactory() {}
-
-    /**
-     * Get a logger, based on a class name
-     *
-     * @param theclass the class whose name defines the log
-     *
-     * @return a POILogger for the specified class
-     */
-    public static POILogger getLogger(final Class<?> theclass) {
-        return getLogger(theclass.getName());
-    }
-
-    /**
-     * Get a logger, based on a String
-     *
-     * @param cat the String that defines the log
-     *
-     * @return a POILogger for the specified class
-     */
-    public static POILogger getLogger(final String cat) {
-        // If we haven't found out what logger to use yet,
-        //  then do so now
-        // Don't look it up until we're first asked, so
-        //  that our users can set the system property
-        //  between class loading and first use
-        if(_loggerClassName == null) {
-        	try {
-        		_loggerClassName = System.getProperty("org.apache.poi.util.POILogger");
-        	} catch(Exception e) {
-                // ignore any exception here
-            }
-
-        	// Use the default logger if none specified,
-        	//  or none could be fetched
-        	if(_loggerClassName == null) {
-                _loggerClassName = _nullLogger.getClass().getName();
-        	}
-        }
-
-        // Short circuit for the null logger, which
-        //  ignores all categories
-        if(_loggerClassName.equals(_nullLogger.getClass().getName())) {
-        	return _nullLogger;
-        }
-
-
-        // Fetch the right logger for them, creating
-        //  it if that's required
-        POILogger logger = _loggers.get(cat);
-        if (logger == null) {
-            try {
-                @SuppressWarnings("unchecked")
-                Class<? extends POILogger> loggerClass =
-                    (Class<? extends POILogger>) Class.forName(_loggerClassName);
-                logger = loggerClass.newInstance();
-                logger.initialize(cat);
-            } catch(Exception e) {
-                // Give up and use the null logger
-                logger = _nullLogger;
-                _loggerClassName = _nullLogger.getClass().getName();
-            }
-
-            // Save for next time
-            _loggers.put(cat, logger);
-        }
-        return logger;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/java/org/apache/poi/util/POILogger.java b/trunk/src/java/org/apache/poi/util/POILogger.java
deleted file mode 100644
index c54c754..0000000
--- a/trunk/src/java/org/apache/poi/util/POILogger.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-/**
- * A logger interface that strives to make it as easy as possible for
- * developers to write log calls, while simultaneously making those
- * calls as cheap as possible by performing lazy evaluation of the log
- * message.<p>
- */
-@Internal
-public abstract class POILogger {
-
-    public static final int DEBUG = 1;
-    public static final int INFO  = 3;
-    public static final int WARN  = 5;
-    public static final int ERROR = 7;
-    public static final int FATAL = 9;
-
-    /** Short strings for numeric log level. Use level as array index. */
-    protected static final String LEVEL_STRINGS_SHORT[] = {"?", "D", "?", "I", "?", "W", "?", "E", "?", "F", "?"};
-    /** Long strings for numeric log level. Use level as array index. */
-    protected static final String LEVEL_STRINGS[] = {"?0?", "DEBUG", "?2?", "INFO", "?4?", "WARN", "?6?", "ERROR", "?8?", "FATAL", "?10+?"};
-
-
-    /**
-     * package scope so it cannot be instantiated outside of the util
-     * package. You need a POILogger? Go to the POILogFactory for one
-     */
-    POILogger() {
-        // no fields to initialize
-    }
-
-    abstract public void initialize(String cat);
-
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.  This is converted to a string.
-     */
-    abstract protected void _log(int level, Object obj1);
-
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.  This is converted to a string.
-     * @param exception An exception to be logged
-     */
-    abstract protected void _log(int level, Object obj1, final Throwable exception);
-
-
-    /**
-     * Check if a logger is enabled to log at the specified level
-     * This allows code to avoid building strings or evaluating functions in
-     * the arguments to log.
-     * 
-     * An example:
-     * <code><pre>
-     * if (logger.check(POILogger.INFO)) {
-     *     logger.log(POILogger.INFO, "Avoid concatenating " + " strings and evaluating " + functions());
-     * }
-     * </pre></code>
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     */
-    abstract public boolean check(int level);
-
-   /**
-     * Log a message. Lazily appends Object parameters together.
-     * If the last parameter is a {@link Throwable} it is logged specially.
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param objs the objects to place in the message
-     */
-    public void log(int level, Object... objs) {
-        if (!check(level)) return;
-        StringBuilder sb = new StringBuilder(32);
-        Throwable lastEx = null;
-        for (int i=0; i<objs.length; i++) {
-            if (i == objs.length-1 && objs[i] instanceof Throwable) {
-                lastEx = (Throwable)objs[i];
-            } else {
-                sb.append(objs[i]);
-            }
-        }
-        
-        String msg = sb.toString();
-        msg = msg.replaceAll("[\r\n]+", " ");  // log forging escape
-        
-        // somehow this ambiguity works and doesn't lead to a loop,
-        // but it's confusing ...
-        if (lastEx == null) {
-            _log(level, msg);
-        } else {
-            _log(level, msg, lastEx);
-        }
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/PngUtils.java b/trunk/src/java/org/apache/poi/util/PngUtils.java
deleted file mode 100644
index 4fed98e..0000000
--- a/trunk/src/java/org/apache/poi/util/PngUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-
-public final class PngUtils {
-
-    /**
-     * File header for PNG format.
-     */
-    private static final byte[] PNG_FILE_HEADER =
-        new byte[] { (byte) 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
-
-    private PngUtils() {
-        // no instances of this class
-    }
-
-    /**
-     * Checks if the offset matches the PNG header.
-     *
-     * @param data the data to check.
-     * @param offset the offset to check at.
-     * @return {@code true} if the offset matches.
-     */
-    public static boolean matchesPngHeader(byte[] data, int offset) {
-        if (data == null || data.length - offset < PNG_FILE_HEADER.length) {
-            return false;
-        }
-
-        for (int i = 0; i < PNG_FILE_HEADER.length; i++) {
-            if (PNG_FILE_HEADER[i] != data[i + offset]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/RLEDecompressingInputStream.java b/trunk/src/java/org/apache/poi/util/RLEDecompressingInputStream.java
deleted file mode 100644
index 471fdab..0000000
--- a/trunk/src/java/org/apache/poi/util/RLEDecompressingInputStream.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Wrapper of InputStream which provides Run Length Encoding (RLE) 
- *  decompression on the fly. Uses MS-OVBA decompression algorithm. See
- * http://download.microsoft.com/download/2/4/8/24862317-78F0-4C4B-B355-C7B2C1D997DB/[MS-OVBA].pdf
- */
-public class RLEDecompressingInputStream extends InputStream {
-
-    /**
-     * Bitmasks for performance
-     */
-    private static final int[] POWER2 = new int[] {
-            0x0001, // 2^0
-            0x0002, // 2^1
-            0x0004, // 2^2
-            0x0008, // 2^3
-            0x0010, // 2^4
-            0x0020, // 2^5
-            0x0040, // 2^6
-            0x0080, // 2^7
-            0x0100, // 2^8
-            0x0200, // 2^9
-            0x0400, // 2^10
-            0x0800, // 2^11
-            0x1000, // 2^12
-            0x2000, // 2^13
-            0x4000, // 2^14
-            0x8000  // 2^15
-    };
-
-    /** the wrapped inputstream */
-    private final InputStream in;
-
-    /** a byte buffer with size 4096 for storing a single chunk */
-    private final byte[] buf;
-
-    /** the current position in the byte buffer for reading */
-    private int pos;
-
-    /** the number of bytes in the byte buffer */
-    private int len;
-
-    /**
-     * Creates a new wrapper RLE Decompression InputStream.
-     * 
-     * @param in The stream to wrap with the RLE Decompression
-     * @throws IOException
-     */
-    public RLEDecompressingInputStream(InputStream in) throws IOException {
-        this.in = in;
-        buf = new byte[4096];
-        pos = 0;
-        int header = in.read();
-        if (header != 0x01) {
-            throw new IllegalArgumentException(String.format(Locale.ROOT, "Header byte 0x01 expected, received 0x%02X", header & 0xFF));
-        }
-        len = readChunk();
-    }
-
-    @Override
-    public int read() throws IOException {
-        if (len == -1) {
-            return -1;
-        }
-        if (pos >= len) {
-            if ((len = readChunk()) == -1) {
-                return -1;
-            }
-        }
-        return buf[pos++]& 0xFF;
-    }
-
-    @Override
-    public int read(byte[] b) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    @Override
-    public int read(byte[] b, int off, int l) throws IOException {
-        if (len == -1) {
-            return -1;
-        }
-        int offset = off;
-        int length = l;
-        while (length > 0) {
-            if (pos >= len) {
-                if ((len = readChunk()) == -1) {
-                    return offset > off ? offset - off : -1;
-                }
-            }
-            int c = Math.min(length, len - pos);
-            System.arraycopy(buf, pos, b, offset, c);
-            pos += c;
-            length -= c;
-            offset += c;
-        }
-        return l;
-    }
-
-    @Override
-    public long skip(long n) throws IOException {
-        long length = n;
-        while (length > 0) {
-            if (pos >= len) {
-                if ((len = readChunk()) == -1) {
-                    return -1;
-                }
-            }
-            int c = (int) Math.min(n, len - pos);
-            pos += c;
-            length -= c;
-        }
-        return n;
-    }
-
-    @Override
-    public int available() {
-        return (len > 0 ? len - pos : 0);
-    }
-
-    @Override
-    public void close() throws IOException {
-        in.close();
-    }
-
-    /**
-     * Reads a single chunk from the underlying inputstream.
-     * 
-     * @return number of bytes that were read, or -1 if the end of the stream was reached.
-     * @throws IOException
-     */
-    private int readChunk() throws IOException {
-        pos = 0;
-        int w = readShort(in);
-        if (w == -1) {
-            return -1;
-        }
-        int chunkSize = (w & 0x0FFF) + 1; // plus 3 bytes minus 2 for the length
-        if ((w & 0x7000) != 0x3000) {
-            throw new IllegalArgumentException(String.format(Locale.ROOT, "Chunksize header A should be 0x3000, received 0x%04X", w & 0xE000));
-        }
-        boolean rawChunk = (w & 0x8000) == 0;
-        if (rawChunk) {
-            if (in.read(buf, 0, chunkSize) < chunkSize) {
-                throw new IllegalStateException(String.format(Locale.ROOT, "Not enough bytes read, expected %d", chunkSize));
-            }
-            return chunkSize;
-        } else {
-            int inOffset = 0;
-            int outOffset = 0;
-            while (inOffset < chunkSize) {
-                int tokenFlags = in.read();
-                inOffset++;
-                if (tokenFlags == -1) {
-                    break;
-                }
-                for (int n = 0; n < 8; n++) {
-                    if (inOffset >= chunkSize) {
-                        break;
-                    }
-                    if ((tokenFlags & POWER2[n]) == 0) {
-                        // literal
-                        final int b = in.read();
-                        if (b == -1) {
-                            return -1;
-                        }
-                        buf[outOffset++] = (byte) b;
-                        inOffset++;
-                    } else {
-                        // compressed token
-                        int token = readShort(in);
-                        if (token == -1) {
-                            return -1;
-                        }
-                        inOffset += 2;
-                        int copyLenBits = getCopyLenBits(outOffset - 1);
-                        int copyOffset = (token >> (copyLenBits)) + 1;
-                        int copyLen = (token & (POWER2[copyLenBits] - 1)) + 3;
-                        int startPos = outOffset - copyOffset;
-                        int endPos = startPos + copyLen;
-                        for (int i = startPos; i < endPos; i++) {
-                            buf[outOffset++] = buf[i];
-                        }
-                    }
-                }
-            }
-            return outOffset;
-        }
-    }
-
-    /**
-     * Helper method to determine how many bits in the CopyToken are used for the CopyLength.
-     * 
-     * @param offset
-     * @return returns the number of bits in the copy token (a value between 4 and 12)
-     */
-    static int getCopyLenBits(int offset) {
-        for (int n = 11; n >= 4; n--) {
-            if ((offset & POWER2[n]) != 0) {
-                return 15 - n;
-            }
-        }
-        return 12;
-    }
-
-    /**
-     * Convenience method for read a 2-bytes short in little endian encoding.
-     * 
-     * @return short value from the stream, -1 if end of stream is reached
-     * @throws IOException
-     */
-    public int readShort() throws IOException {
-        return readShort(this);
-    }
-
-    /**
-     * Convenience method for read a 4-bytes int in little endian encoding.
-     * 
-     * @return integer value from the stream, -1 if end of stream is reached
-     * @throws IOException
-     */
-    public int readInt() throws IOException {
-        return readInt(this);
-    }
-
-    private int readShort(InputStream stream) throws IOException {
-        int b0, b1;
-        if ((b0 = stream.read()) == -1) {
-            return -1;
-        }
-        if ((b1 = stream.read()) == -1) {
-            return -1;
-        }
-        return (b0 & 0xFF) | ((b1 & 0xFF) << 8);
-    }
-
-    private int readInt(InputStream stream) throws IOException {
-        int b0, b1, b2, b3;
-        if ((b0 = stream.read()) == -1) {
-            return -1;
-        }
-        if ((b1 = stream.read()) == -1) {
-            return -1;
-        }
-        if ((b2 = stream.read()) == -1) {
-            return -1;
-        }
-        if ((b3 = stream.read()) == -1) {
-            return -1;
-        }
-        return (b0 & 0xFF) | ((b1 & 0xFF) << 8) | ((b2 & 0xFF) << 16) | ((b3 & 0xFF) << 24);
-    }
-
-    public static byte[] decompress(byte[] compressed) throws IOException {
-        return decompress(compressed, 0, compressed.length);
-    }
-    
-    public static byte[] decompress(byte[] compressed, int offset, int length) throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        InputStream instream = new ByteArrayInputStream(compressed, offset, length);
-        InputStream stream = new RLEDecompressingInputStream(instream);
-        IOUtils.copy(stream, out);
-        stream.close();
-        out.close();
-        return out.toByteArray();
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/RecordFormatException.java b/trunk/src/java/org/apache/poi/util/RecordFormatException.java
deleted file mode 100644
index d1643b8..0000000
--- a/trunk/src/java/org/apache/poi/util/RecordFormatException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-/**
- * A common exception thrown by our binary format parsers
- *  (especially HSSF and DDF), when they hit invalid
- *  format or data when processing a record.
- */
-public class RecordFormatException
-    extends RuntimeException
-{
-    public RecordFormatException(String exception)
-    {
-        super(exception);
-    }
-    
-    public RecordFormatException(String exception, Throwable thr) {
-      super(exception, thr);
-    }
-    
-    public RecordFormatException(Throwable thr) {
-      super(thr);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/Removal.java b/trunk/src/java/org/apache/poi/util/Removal.java
deleted file mode 100644
index a94be1e..0000000
--- a/trunk/src/java/org/apache/poi/util/Removal.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-
-
-/**
- * <p>Program elements annotated &#64;Removal track the earliest final release
- * when a deprecated feature will be removed. This is an internal decoration:
- * a feature may be removed in a release earlier or later than the release
- * number specified by this annotation.</p>
- *
- * <p>The POI project policy is to deprecate an element for 2 final releases
- * before removing. This annotation exists to make it easier to follow up on the
- * second step of the two-step deprecate and remove process.</p>
- *
- * <p>A deprecated feature may be removed in nightly and beta releases prior
- * to the final release for which it is eligible, but may be removed later for
- * various reasons. If it is known in advance that the feature will not be
- * removed in the n+2 release, a later version should be specified by this
- * annotation. The annotation version number should not include beta</p>
- *
- * <p>For example, a feature with a <code>&#64;deprecated POI 3.15 beta 3</code>
- * is deprecated in POI 3.15 and 3.16 and becomes eligible for deletion during
- * the POI 3.17 release series, and may be deleted immediately after POI 3.16 is
- * released. This would be annotated <code>&#64;Removal(version="3.17")</p>.
- * 
- * @since POI-3.15 beta 3
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Removal {
-    /**
-     * The POI version when this feature may be removed.
-     * 
-     * To ensure that the version number can be compared to the current version
-     * and a unit test can generate a warning if a removal-eligible feature has
-     * not been removed yet, the version number should adhere to the following format:
-     * Format: "(?<major>\d+)\.(?<minor>\d+)"
-     * Example: "3.15"
-     */
-    String version() default "";
-}
diff --git a/trunk/src/java/org/apache/poi/util/ShortField.java b/trunk/src/java/org/apache/poi/util/ShortField.java
deleted file mode 100644
index 29d91df..0000000
--- a/trunk/src/java/org/apache/poi/util/ShortField.java
+++ /dev/null
@@ -1,217 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.util;
-
-import org.apache.poi.util.LittleEndian.BufferUnderrunException;
-
-import java.io.*;
-
-/**
- * representation of a short (16-bit) field at a fixed location within
- * a byte array
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
-
-public class ShortField
-    implements FixedField
-{
-    private short     _value;
-    private final int _offset;
-
-    /**
-     * construct the ShortField with its offset into its containing
-     * byte array
-     *
-     * @param offset of the field within its byte array
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public ShortField(final int offset)
-        throws ArrayIndexOutOfBoundsException
-    {
-        if (offset < 0)
-        {
-            throw new ArrayIndexOutOfBoundsException("Illegal offset: "
-                                                     + offset);
-        }
-        _offset = offset;
-    }
-
-    /**
-     * construct the ShortField with its offset into its containing
-     * byte array and initialize its value
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public ShortField(final int offset, final short value)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        set(value);
-    }
-
-    /**
-     * Construct the ShortField with its offset into its containing
-     * byte array and initialize its value from its byte array
-     *
-     * @param offset of the field within its byte array
-     * @param data the byte array to read the value from
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is not
-     *            within the range of 0..(data.length - 1)
-     */
-
-    public ShortField(final int offset, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        readFromBytes(data);
-    }
-
-    /**
-     * construct the ShortField with its offset into its containing
-     * byte array, initialize its value, and write its value to its
-     * byte array
-     *
-     * @param offset of the field within its byte array
-     * @param value the initial value
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if offset is negative
-     */
-
-    public ShortField(final int offset, final short value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        this(offset);
-        set(value, data);
-    }
-
-    /**
-     * get the ShortField's current value
-     *
-     * @return current value
-     */
-
-    public short get()
-    {
-        return _value;
-    }
-
-    /**
-     * set the ShortField's current value
-     *
-     * @param value to be set
-     */
-
-    public void set(final short value)
-    {
-        _value = value;
-    }
-
-    /**
-     * set the ShortField's current value and write it to a byte array
-     *
-     * @param value to be set
-     * @param data the byte array to write the value to
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of range
-     */
-
-    public void set(final short value, final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        _value = value;
-        writeToBytes(data);
-    }
-
-    /* ********** START implementation of FixedField ********** */
-
-    /**
-     * set the value from its offset into an array of bytes
-     *
-     * @param data the byte array from which the value is to be read
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of range
-     */
-
-    public void readFromBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        _value = LittleEndian.getShort(data, _offset);
-    }
-
-    /**
-     * set the value from an InputStream
-     *
-     * @param stream the InputStream from which the value is to be
-     *               read
-     *
-     * @exception BufferUnderrunException if there is not enough data
-     *            available from the InputStream
-     * @exception IOException if an IOException is thrown from reading
-     *            the InputStream
-     */
-
-    public void readFromStream(final InputStream stream)
-        throws IOException
-    {
-        _value = LittleEndian.readShort(stream);
-    }
-
-    /**
-     * write the value out to an array of bytes at the appropriate
-     * offset
-     *
-     * @param data the array of bytes to which the value is to be
-     *             written
-     *
-     * @exception ArrayIndexOutOfBoundsException if the offset is out
-     *            of range
-     */
-
-    public void writeToBytes(final byte [] data)
-        throws ArrayIndexOutOfBoundsException
-    {
-        LittleEndian.putShort(data, _offset, _value);
-    }
-
-    /**
-     * return the value as a String
-     *
-     * @return the value as a String
-     */
-
-    public String toString()
-    {
-        return String.valueOf(_value);
-    }
-
-    /* **********  END  implementation of FixedField ********** */
-}   // end public class ShortField
-
diff --git a/trunk/src/java/org/apache/poi/util/StringUtil.java b/trunk/src/java/org/apache/poi/util/StringUtil.java
deleted file mode 100644
index 20a6824..0000000
--- a/trunk/src/java/org/apache/poi/util/StringUtil.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- *  Collection of string handling utilities
- */
-@Internal
-public class StringUtil {
-    protected static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
-    protected static final Charset UTF16LE = Charset.forName("UTF-16LE");
-    public static final Charset UTF8 = Charset.forName("UTF-8");
-
-    private static Map<Integer,Integer> msCodepointToUnicode;
-
-    private StringUtil() {
-        // no instances of this class
-    }
-
-    /**
-     *  Given a byte array of 16-bit unicode characters in Little Endian
-     *  format (most important byte last), return a Java String representation
-     *  of it.
-     *
-     * { 0x16, 0x00 } -0x16
-     *
-     * @param  string  the byte array to be converted
-     * @param  offset  the initial offset into the
-     *                 byte array. it is assumed that string[ offset ] and string[ offset +
-     *                 1 ] contain the first 16-bit unicode character
-     * @param len the length of the final string
-     * @return the converted string, never <code>null</code>.
-     * @exception  ArrayIndexOutOfBoundsException  if offset is out of bounds for
-     *      the byte array (i.e., is negative or is greater than or equal to
-     *      string.length)
-     * @exception  IllegalArgumentException        if len is too large (i.e.,
-     *      there is not enough data in string to create a String of that
-     *      length)
-     */
-    public static String getFromUnicodeLE(
-            final byte[] string,
-            final int offset,
-            final int len)
-            throws ArrayIndexOutOfBoundsException, IllegalArgumentException {
-        if ((offset < 0) || (offset >= string.length)) {
-            throw new ArrayIndexOutOfBoundsException("Illegal offset " + offset + " (String data is of length " + string.length + ")");
-        }
-        if ((len < 0) || (((string.length - offset) / 2) < len)) {
-            throw new IllegalArgumentException("Illegal length " + len);
-        }
-
-        return new String(string, offset, len * 2, UTF16LE);
-    }
-
-    /**
-     *  Given a byte array of 16-bit unicode characters in little endian
-     *  format (most important byte last), return a Java String representation
-     *  of it.
-     *
-     * { 0x16, 0x00 } -0x16
-     *
-     * @param  string  the byte array to be converted
-     * @return the converted string, never <code>null</code>
-     */
-    public static String getFromUnicodeLE(byte[] string) {
-        if(string.length == 0) { return ""; }
-        return getFromUnicodeLE(string, 0, string.length / 2);
-    }
-
-    /**
-     * Convert String to 16-bit unicode characters in little endian format
-     *
-     * @param string the string
-     * @return the byte array of 16-bit unicode characters
-     */
-    public static byte[] getToUnicodeLE(String string) {
-        return string.getBytes(UTF16LE);
-    }
-
-    /**
-     * Read 8 bit data (in ISO-8859-1 codepage) into a (unicode) Java
-     * String and return.
-     * (In Excel terms, read compressed 8 bit unicode as a string)
-     *
-     * @param string byte array to read
-     * @param offset offset to read byte array
-     * @param len    length to read byte array
-     * @return String generated String instance by reading byte array
-     */
-    public static String getFromCompressedUnicode(
-            final byte[] string,
-            final int offset,
-            final int len) {
-        int len_to_use = Math.min(len, string.length - offset);
-        return new String(string, offset, len_to_use, ISO_8859_1);
-    }
-
-    public static String readCompressedUnicode(LittleEndianInput in, int nChars) {
-        byte[] buf = new byte[nChars];
-        in.readFully(buf);
-        return new String(buf, ISO_8859_1);
-    }
-
-    /**
-     * InputStream <tt>in</tt> is expected to contain:
-     * <ol>
-     * <li>ushort nChars</li>
-     * <li>byte is16BitFlag</li>
-     * <li>byte[]/char[] characterData</li>
-     * </ol>
-     * For this encoding, the is16BitFlag is always present even if nChars==0.
-     * 
-     * This structure is also known as a XLUnicodeString.
-     */
-    public static String readUnicodeString(LittleEndianInput in) {
-
-        int nChars = in.readUShort();
-        byte flag = in.readByte();
-        if ((flag & 0x01) == 0) {
-            return readCompressedUnicode(in, nChars);
-        }
-        return readUnicodeLE(in, nChars);
-    }
-    /**
-     * InputStream <tt>in</tt> is expected to contain:
-     * <ol>
-     * <li>byte is16BitFlag</li>
-     * <li>byte[]/char[] characterData</li>
-     * </ol>
-     * For this encoding, the is16BitFlag is always present even if nChars==0.
-     * <br/>
-     * This method should be used when the nChars field is <em>not</em> stored
-     * as a ushort immediately before the is16BitFlag. Otherwise, {@link
-     * #readUnicodeString(LittleEndianInput)} can be used.
-     */
-    public static String readUnicodeString(LittleEndianInput in, int nChars) {
-        byte is16Bit = in.readByte();
-        if ((is16Bit & 0x01) == 0) {
-            return readCompressedUnicode(in, nChars);
-        }
-        return readUnicodeLE(in, nChars);
-    }
-    /**
-     * OutputStream <tt>out</tt> will get:
-     * <ol>
-     * <li>ushort nChars</li>
-     * <li>byte is16BitFlag</li>
-     * <li>byte[]/char[] characterData</li>
-     * </ol>
-     * For this encoding, the is16BitFlag is always present even if nChars==0.
-     */
-    public static void writeUnicodeString(LittleEndianOutput out, String value) {
-        int nChars = value.length();
-        out.writeShort(nChars);
-        boolean is16Bit = hasMultibyte(value);
-        out.writeByte(is16Bit ? 0x01 : 0x00);
-        if (is16Bit) {
-            putUnicodeLE(value, out);
-        } else {
-            putCompressedUnicode(value, out);
-        }
-    }
-	/**
-	 * OutputStream <tt>out</tt> will get:
-	 * <ol>
-	 * <li>byte is16BitFlag</li>
-	 * <li>byte[]/char[] characterData</li>
-	 * </ol>
-	 * For this encoding, the is16BitFlag is always present even if nChars==0.
-	 * <br/>
-	 * This method should be used when the nChars field is <em>not</em> stored
-	 * as a ushort immediately before the is16BitFlag. Otherwise, {@link
-	 * #writeUnicodeString(LittleEndianOutput, String)} can be used.
-	 */
-	public static void writeUnicodeStringFlagAndData(LittleEndianOutput out, String value) {
-		boolean is16Bit = hasMultibyte(value);
-		out.writeByte(is16Bit ? 0x01 : 0x00);
-		if (is16Bit) {
-			putUnicodeLE(value, out);
-		} else {
-			putCompressedUnicode(value, out);
-		}
-	}
-
-	/**
-	 * @return the number of bytes that would be written by {@link #writeUnicodeString(LittleEndianOutput, String)}
-	 */
-	public static int getEncodedSize(String value) {
-		int result = 2 + 1;
-		result += value.length() * (StringUtil.hasMultibyte(value) ? 2 : 1);
-		return result;
-	}
-
-	/**
-	 * Takes a unicode (java) string, and returns it as 8 bit data (in ISO-8859-1
-	 * codepage).
-	 * (In Excel terms, write compressed 8 bit unicode)
-	 *
-	 * @param  input   the String containing the data to be written
-	 * @param  output  the byte array to which the data is to be written
-	 * @param  offset  an offset into the byte arrat at which the data is start
-	 *      when written
-	 */
-	public static void putCompressedUnicode(String input, byte[] output, int offset) {
-		byte[] bytes = input.getBytes(ISO_8859_1);
-		System.arraycopy(bytes, 0, output, offset, bytes.length);
-	}
-
-	public static void putCompressedUnicode(String input, LittleEndianOutput out) {
-		byte[] bytes = input.getBytes(ISO_8859_1);
-		out.write(bytes);
-	}
-
-	/**
-	 * Takes a unicode string, and returns it as little endian (most
-	 * important byte last) bytes in the supplied byte array.
-	 * (In Excel terms, write uncompressed unicode)
-	 *
-	 * @param  input   the String containing the unicode data to be written
-	 * @param  output  the byte array to hold the uncompressed unicode, should be twice the length of the String
-	 * @param  offset  the offset to start writing into the byte array
-	 */
-	public static void putUnicodeLE(String input, byte[] output, int offset) {
-		byte[] bytes = input.getBytes(UTF16LE);
-		System.arraycopy(bytes, 0, output, offset, bytes.length);
-	}
-	public static void putUnicodeLE(String input, LittleEndianOutput out) {
-		byte[] bytes = input.getBytes(UTF16LE);
-		out.write(bytes);
-	}
-
-	public static String readUnicodeLE(LittleEndianInput in, int nChars) {
-        byte[] bytes = new byte[nChars*2];
-        in.readFully(bytes);
-        return new String(bytes, UTF16LE);
-	}
-
-	/**
-	 * @return the encoding we want to use, currently hardcoded to ISO-8859-1
-	 */
-	public static String getPreferredEncoding() {
-		return ISO_8859_1.name();
-	}
-
-	/**
-	 * check the parameter has multibyte character
-	 *
-	 * @param value string to check
-	 * @return boolean result true:string has at least one multibyte character
-	 */
-	public static boolean hasMultibyte(String value) {
-		if (value == null)
-			return false;
-		for (char c : value.toCharArray()) {
-			if (c > 0xFF) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks to see if a given String needs to be represented as Unicode
-	 *
-	 * @param value The string to look at.
-	 * @return true if string needs Unicode to be represented.
-	 */
-	public static boolean isUnicodeString(final String value) {
-        return !value.equals(new String(value.getBytes(ISO_8859_1), ISO_8859_1));
-	}
-
-    /**
-     * Tests if the string starts with the specified prefix, ignoring case consideration.
-     */
-    public static boolean startsWithIgnoreCase(String haystack, String prefix) {
-        return haystack.regionMatches(true, 0, prefix, 0, prefix.length());
-    }
-    
-    /**
-     * Tests if the string ends with the specified suffix, ignoring case consideration.
-     */
-    public static boolean endsWithIgnoreCase(String haystack, String suffix) {
-        int length = suffix.length();
-        int start = haystack.length() - length;
-        return haystack.regionMatches(true, start, suffix, 0, length);
-    }
-
-   /**
-    * An Iterator over an array of Strings.
-    */
-   public static class StringsIterator implements Iterator<String> {
-      private String[] strings = {};
-      private int position = 0;
-      public StringsIterator(String[] strings) {
-          if (strings != null) {
-              this.strings = strings.clone();
-         }
-      }
-
-      public boolean hasNext() {
-         return position < strings.length;
-      }
-      public String next() {
-         int ourPos = position++;
-         if(ourPos >= strings.length) {
-            throw new ArrayIndexOutOfBoundsException(ourPos);
-         }
-         return strings[ourPos];
-      }
-      public void remove() {}
-   }
-
-
-   /**
-    * Some strings may contain encoded characters of the unicode private use area.
-    * Currently the characters of the symbol fonts are mapped to the corresponding
-    * characters in the normal unicode range. 
-    *
-    * @param string the original string 
-    * @return the string with mapped characters
-    * 
-    * @see <a href="http://www.alanwood.net/unicode/private_use_area.html#symbol">Private Use Area (symbol)</a>
-    * @see <a href="http://www.alanwood.net/demos/symbol.html">Symbol font - Unicode alternatives for Greek and special characters in HTML</a>
-    */
-   public static String mapMsCodepointString(String string) {
-       if (string == null || "".equals(string)) return string;
-       initMsCodepointMap();
-       
-       StringBuilder sb = new StringBuilder();
-       final int length = string.length();
-       for (int offset = 0; offset < length; ) {
-          Integer msCodepoint = string.codePointAt(offset);
-          Integer uniCodepoint = msCodepointToUnicode.get(msCodepoint);
-          sb.appendCodePoint(uniCodepoint == null ? msCodepoint : uniCodepoint);
-          offset += Character.charCount(msCodepoint);
-       }
-       
-       return sb.toString();
-   }
-   
-   public static synchronized void mapMsCodepoint(int msCodepoint, int unicodeCodepoint) {
-       initMsCodepointMap();
-       msCodepointToUnicode.put(msCodepoint, unicodeCodepoint);
-   }
-   
-   private static synchronized void initMsCodepointMap() {
-       if (msCodepointToUnicode != null) return;
-       msCodepointToUnicode = new HashMap<Integer,Integer>();
-       int i=0xF020;
-       for (int ch : symbolMap_f020) {
-           msCodepointToUnicode.put(i++, ch);
-       }
-       i = 0xf0a0;
-       for (int ch : symbolMap_f0a0) {
-           msCodepointToUnicode.put(i++, ch);
-       }       
-   }
-   
-   private static final int symbolMap_f020[] = {
-       ' ', // 0xf020 space
-       '!', // 0xf021 exclam
-       8704, // 0xf022 universal
-       '#', // 0xf023 numbersign
-       8707, // 0xf024 existential
-       '%', // 0xf025 percent
-       '&', // 0xf026 ampersand
-       8717, // 0xf027 suchthat
-       '(', // 0xf028 parenleft
-       ')', // 0xf029 parentright
-       8727, // 0xf02a asteriskmath
-       '+', // 0xf02b plus
-       ',', // 0xf02c comma
-       8722, // 0xf02d minus sign (long -)
-       '.', // 0xf02e period
-       '/', // 0xf02f slash
-       '0', // 0xf030 0
-       '1', // 0xf031 1
-       '2', // 0xf032 2
-       '3', // 0xf033 3
-       '4', // 0xf034 4
-       '5', // 0xf035 5
-       '6', // 0xf036 6
-       '7', // 0xf037 7
-       '8', // 0xf038 8
-       '9', // 0xf039 9
-       ':', // 0xf03a colon
-       ';', // 0xf03b semicolon
-       '<', // 0xf03c less
-       '=', // 0xf03d equal
-       '>', // 0xf03e greater
-       '?', // 0xf03f question
-       8773, // 0xf040 congruent
-       913, // 0xf041 alpha (upper)
-       914, // 0xf042 beta (upper)
-       935, // 0xf043 chi (upper)
-       916, // 0xf044 delta (upper)
-       917, // 0xf045 epsilon (upper)
-       934, // 0xf046 phi (upper)
-       915, // 0xf047 gamma (upper)
-       919, // 0xf048 eta (upper)
-       921, // 0xf049 iota (upper)
-       977, // 0xf04a theta1 (lower)
-       922, // 0xf04b kappa (upper)
-       923, // 0xf04c lambda (upper)
-       924, // 0xf04d mu (upper)
-       925, // 0xf04e nu (upper)
-       927, // 0xf04f omicron (upper)
-       928, // 0xf050 pi (upper)
-       920, // 0xf051 theta (upper)
-       929, // 0xf052 rho (upper)
-       931, // 0xf053 sigma (upper)
-       932, // 0xf054 tau (upper)
-       933, // 0xf055 upsilon (upper)
-       962, // 0xf056 simga1 (lower)
-       937, // 0xf057 omega (upper)
-       926, // 0xf058 xi (upper)
-       936, // 0xf059 psi (upper)
-       918, // 0xf05a zeta (upper)
-       '[', // 0xf05b bracketleft
-       8765, // 0xf05c therefore
-       ']', // 0xf05d bracketright
-       8869, // 0xf05e perpendicular
-       '_', // 0xf05f underscore
-       ' ', // 0xf060 radicalex (doesn't exist in unicode)
-       945, // 0xf061 alpha (lower)
-       946, // 0xf062 beta (lower)
-       967, // 0xf063 chi (lower)
-       948, // 0xf064 delta (lower)
-       949, // 0xf065 epsilon (lower)
-       966, // 0xf066 phi (lower)
-       947, // 0xf067 gamma (lower)
-       951, // 0xf068 eta (lower)
-       953, // 0xf069 iota (lower)
-       981, // 0xf06a phi1 (lower)
-       954, // 0xf06b kappa (lower)
-       955, // 0xf06c lambda (lower)
-       956, // 0xf06d mu (lower)
-       957, // 0xf06e nu (lower)
-       959, // 0xf06f omnicron (lower)
-       960, // 0xf070 pi (lower)
-       952, // 0xf071 theta (lower)
-       961, // 0xf072 rho (lower)
-       963, // 0xf073 sigma (lower)
-       964, // 0xf074 tau (lower)
-       965, // 0xf075 upsilon (lower)
-       982, // 0xf076 piv (lower)
-       969, // 0xf077 omega (lower)
-       958, // 0xf078 xi (lower)
-       968, // 0xf079 psi (lower)
-       950, // 0xf07a zeta (lower)
-       '{', // 0xf07b braceleft
-       '|', // 0xf07c bar
-       '}', // 0xf07d braceright
-       8764, // 0xf07e similar '~'
-       ' ', // 0xf07f not defined
-   };
-
-   private static final int symbolMap_f0a0[] = {
-       8364, // 0xf0a0 not defined / euro symbol
-       978, // 0xf0a1 upsilon1 (upper)
-       8242, // 0xf0a2 minute
-       8804, // 0xf0a3 lessequal
-       8260, // 0xf0a4 fraction
-       8734, // 0xf0a5 infinity
-       402, // 0xf0a6 florin
-       9827, // 0xf0a7 club
-       9830, // 0xf0a8 diamond
-       9829, // 0xf0a9 heart
-       9824, // 0xf0aa spade
-       8596, // 0xf0ab arrowboth
-       8591, // 0xf0ac arrowleft
-       8593, // 0xf0ad arrowup
-       8594, // 0xf0ae arrowright
-       8595, // 0xf0af arrowdown
-       176, // 0xf0b0 degree
-       177, // 0xf0b1 plusminus
-       8243, // 0xf0b2 second
-       8805, // 0xf0b3 greaterequal
-       215, // 0xf0b4 multiply
-       181, // 0xf0b5 proportional
-       8706, // 0xf0b6 partialdiff
-       8729, // 0xf0b7 bullet
-       247, // 0xf0b8 divide
-       8800, // 0xf0b9 notequal
-       8801, // 0xf0ba equivalence
-       8776, // 0xf0bb approxequal
-       8230, // 0xf0bc ellipsis
-       9168, // 0xf0bd arrowvertex
-       9135, // 0xf0be arrowhorizex
-       8629, // 0xf0bf carriagereturn
-       8501, // 0xf0c0 aleph
-       8475, // 0xf0c1 Ifraktur
-       8476, // 0xf0c2 Rfraktur
-       8472, // 0xf0c3 weierstrass
-       8855, // 0xf0c4 circlemultiply
-       8853, // 0xf0c5 circleplus
-       8709, // 0xf0c6 emptyset
-       8745, // 0xf0c7 intersection
-       8746, // 0xf0c8 union
-       8835, // 0xf0c9 propersuperset
-       8839, // 0xf0ca reflexsuperset
-       8836, // 0xf0cb notsubset
-       8834, // 0xf0cc propersubset
-       8838, // 0xf0cd reflexsubset
-       8712, // 0xf0ce element
-       8713, // 0xf0cf notelement
-       8736, // 0xf0d0 angle
-       8711, // 0xf0d1 gradient
-       174, // 0xf0d2 registerserif
-       169, // 0xf0d3 copyrightserif
-       8482, // 0xf0d4 trademarkserif
-       8719, // 0xf0d5 product
-       8730, // 0xf0d6 radical
-       8901, // 0xf0d7 dotmath
-       172, // 0xf0d8 logicalnot
-       8743, // 0xf0d9 logicaland
-       8744, // 0xf0da logicalor
-       8660, // 0xf0db arrowdblboth
-       8656, // 0xf0dc arrowdblleft
-       8657, // 0xf0dd arrowdblup
-       8658, // 0xf0de arrowdblright
-       8659, // 0xf0df arrowdbldown
-       9674, // 0xf0e0 lozenge
-       9001, // 0xf0e1 angleleft
-       174, // 0xf0e2 registersans
-       169, // 0xf0e3 copyrightsans
-       8482, // 0xf0e4 trademarksans
-       8721, // 0xf0e5 summation
-       9115, // 0xf0e6 parenlefttp
-       9116, // 0xf0e7 parenleftex
-       9117, // 0xf0e8 parenleftbt
-       9121, // 0xf0e9 bracketlefttp
-       9122, // 0xf0ea bracketleftex
-       9123, // 0xf0eb bracketleftbt
-       9127, // 0xf0ec bracelefttp
-       9128, // 0xf0ed braceleftmid
-       9129, // 0xf0ee braceleftbt
-       9130, // 0xf0ef braceex
-       ' ', // 0xf0f0 not defined
-       9002, // 0xf0f1 angleright
-       8747, // 0xf0f2 integral
-       8992, // 0xf0f3 integraltp
-       9134, // 0xf0f4 integralex
-       8993, // 0xf0f5 integralbt
-       9118, // 0xf0f6 parenrighttp
-       9119, // 0xf0f7 parenrightex
-       9120, // 0xf0f8 parenrightbt
-       9124, // 0xf0f9 bracketrighttp
-       9125, // 0xf0fa bracketrightex
-       9126, // 0xf0fb bracketrightbt
-       9131, // 0xf0fc bracerighttp
-       9132, // 0xf0fd bracerightmid
-       9133, // 0xf0fe bracerightbt
-       ' ', // 0xf0ff not defined
-   };
-   
-   // Could be replaced with org.apache.commons.lang3.StringUtils#join
-   @Internal
-   public static String join(Object[] array, String separator) {
-       if (array == null || array.length == 0) return "";
-       StringBuilder sb = new StringBuilder();
-       sb.append(array[0]);
-       for (int i=1; i<array.length; i++) {
-           sb.append(separator).append(array[i]);
-       }
-       return sb.toString();
-   }
-   
-   @Internal
-   public static String join(Object[] array) {
-       if (array == null) return "";
-       StringBuilder sb = new StringBuilder();
-       for (Object o : array) {
-           sb.append(o);
-       }
-       return sb.toString();
-   }
-   
-   @Internal
-   public static String join(String separator, Object... array) {
-       return join(array, separator);
-   }
-   
-   /**
-    * Count number of occurrences of needle in haystack
-    * Has same signature as org.apache.commons.lang3.StringUtils#countMatches
-    *
-    * @param haystack  the CharSequence to check, may be null
-    * @param needle    the character to count the quantity of 
-    * @return the number of occurrences, 0 if the CharSequence is null
-    */
-   public static int countMatches(CharSequence haystack, char needle) {
-       if (haystack == null) return 0;
-       int count = 0;
-       final int length = haystack.length();
-       for (int i=0; i<length; i++) {
-           if (haystack.charAt(i) == needle) {
-               count++;
-           }
-       }
-       return count;
-   }
-}
diff --git a/trunk/src/java/org/apache/poi/util/SuppressForbidden.java b/trunk/src/java/org/apache/poi/util/SuppressForbidden.java
deleted file mode 100644
index c2b7657..0000000
--- a/trunk/src/java/org/apache/poi/util/SuppressForbidden.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marking class for elements to be ignored by the forbidden apis check
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface SuppressForbidden {
-    /** A reason for suppressing should always be given. */
-    String value() default "";
-}
diff --git a/trunk/src/java/org/apache/poi/util/SystemOutLogger.java b/trunk/src/java/org/apache/poi/util/SystemOutLogger.java
deleted file mode 100644
index 457f254..0000000
--- a/trunk/src/java/org/apache/poi/util/SystemOutLogger.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-
-
-/**
- * A logger class that strives to make it as easy as possible for
- * developers to write log calls, while simultaneously making those
- * calls as cheap as possible by performing lazy evaluation of the log
- * message.
- */
-public class SystemOutLogger extends POILogger
-{
-    private String _cat;
-
-    @Override
-    public void initialize(final String cat)
-    {
-       this._cat=cat;
-    }
-
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.
-     */
-    @Override
-    protected void _log(final int level, final Object obj1)
-    {
-    	_log(level, obj1, null);
-    }
-
-    /**
-     * Log a message
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @param obj1 The object to log.  This is converted to a string.
-     * @param exception An exception to be logged
-     */
-    @Override
-    @SuppressForbidden("uses printStackTrace")
-    protected void _log(final int level, final Object obj1,
-                    final Throwable exception) {
-        if (check(level)) {
-            System.out.println("[" + _cat + "]" + LEVEL_STRINGS_SHORT[Math.min(LEVEL_STRINGS_SHORT.length-1, level)] + " " + obj1);
-            if (exception != null) {
-            	exception.printStackTrace(System.out);
-            }
-        }
-    }
-
-    /**
-     * Check if a logger is enabled to log at the specified level
-     *
-     * @param level One of DEBUG, INFO, WARN, ERROR, FATAL
-     * @see #DEBUG
-     * @see #INFO
-     * @see #WARN
-     * @see #ERROR
-     * @see #FATAL
-     */
-    @Override
-    public boolean check(final int level)
-    {
-        int currentLevel;
-        try {
-            currentLevel = Integer.parseInt(System.getProperty("poi.log.level", WARN + ""));
-        } catch (SecurityException e) {
-            currentLevel = POILogger.DEBUG;
-        }
-
-        return level >= currentLevel;
-    }
-
-
-}   // end package scope class POILogger
-
diff --git a/trunk/src/java/org/apache/poi/util/TempFile.java b/trunk/src/java/org/apache/poi/util/TempFile.java
deleted file mode 100644
index ceb7c1d..0000000
--- a/trunk/src/java/org/apache/poi/util/TempFile.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Interface for creating temporary files. Collects them all into one directory by default.
- */
-public final class TempFile {
-    /** The strategy used by {@link #createTempFile(String, String)} to create the temporary files. */
-    private static TempFileCreationStrategy strategy = new DefaultTempFileCreationStrategy();
-
-    /** Define a constant for this property as it is sometimes mistypes as "tempdir" otherwise */
-    public static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
-    
-    private TempFile() {
-        // no instances of this class
-    }
-
-    /**
-     * Configures the strategy used by {@link #createTempFile(String, String)} to create the temporary files.
-     *
-     * @param strategy The new strategy to be used to create the temporary files.
-     * 
-     * @throws IllegalArgumentException When the given strategy is <code>null</code>.
-     */
-    public static void setTempFileCreationStrategy(TempFileCreationStrategy strategy) {
-        if (strategy == null) {
-            throw new IllegalArgumentException("strategy == null");
-        }
-        TempFile.strategy = strategy;
-    }
-    
-    /**
-     * Creates a new and empty temporary file. By default, files are collected into one directory and are
-     * deleted on exit from the VM, although they can be kept by defining the system property
-     * <code>poi.keep.tmp.files</code> (see {@link DefaultTempFileCreationStrategy}).
-     * <p>
-     * Don't forget to close all files or it might not be possible to delete them.
-     *
-     * @param prefix The prefix to be used to generate the name of the temporary file.
-     * @param suffix The suffix to be used to generate the name of the temporary file.
-     * 
-     * @return The path to the newly created and empty temporary file.
-     * 
-     * @throws IOException If no temporary file could be created.
-     */
-    public static File createTempFile(String prefix, String suffix) throws IOException {
-        return strategy.createTempFile(prefix, suffix);
-    }
-    
-    public static File createTempDirectory(String name) throws IOException {
-        return strategy.createTempDirectory(name);
-    }
-    
-    /**
-     * @deprecated POI 3.15 beta 3. Moved to {@link org.apache.poi.util.DefaultTempFileCreationStrategy}.
-     */
-    public static class DefaultTempFileCreationStrategy extends org.apache.poi.util.DefaultTempFileCreationStrategy {}
-}
diff --git a/trunk/src/java/org/apache/poi/util/TempFileCreationStrategy.java b/trunk/src/java/org/apache/poi/util/TempFileCreationStrategy.java
deleted file mode 100644
index d576f08..0000000
--- a/trunk/src/java/org/apache/poi/util/TempFileCreationStrategy.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Interface used by the {@link TempFile} utility class to create temporary files.
- * 
- * Classes that implement a TempFileCreationStrategy attempt to handle the cleanup
- * of temporary files.
- * 
- * Examples include:
- * <ul>
- *   <li>{@link DefaultTempFileCreationStrategy} deletes temporary files when
- *       the JVM exits.
- *       This may not be suitable for long-running applications that never
- *       shut down the JVM since the list of registered files and disk space
- *       usage would grow for as long as the JVM is running.
- *       You may wish to implement your own strategy that meets the needs of
- *       your situation.
- *   </li>
- *   <li>A strategy that keeps the <code>n</code> most-recent files, discarding
- *       older files on a first-in, first-out basis.
- *       A java.util.Deque or org.apache.commons.collections4.queue.CircularFifoQueue
- *       may be helpful for achieving this.
- *   </li>
- *   <li>A strategy that keeps track of every temporary file that has been
- *       created by the class or instance and provides a method to explicitly
- *       delete the temporary files in the reverse order that they were created.
- *       This is the same as DefaultTempFileCreationStrategy, except the strategy
- *       class would maintain the list of files to delete rather than or in
- *       addition to {@link java.io.DeleteOnExitHook} maintaining the list, and
- *       the files could be deleted before the JVM exit.
- *   </li>
- *   <li>A strategy that creates a directory that is deleted on JVM exit.
- *       Any files inside the directory do not need to be registered since the
- *       entire directory will be deleted at exit.
- *       This could be dangerous if files were added to the temporary directory
- *       outside of this TempFileCreationStrategy's control.
- *       This could be accomplished with {@link #createTempDirectory(String)} and
- *       creating regular (unregistered) files in the temp directory.
- *   </li>
- * </ul>
- * 
- */
-public interface TempFileCreationStrategy {
-    /**
-     * Creates a new and empty temporary file.
-     *
-     * @param prefix The prefix to be used to generate the name of the temporary file.
-     * @param suffix The suffix to be used to generate the name of the temporary file.
-     * 
-     * @return The path to the newly created and empty temporary file.
-     * 
-     * @throws IOException If no temporary file could be created.
-     */
-    File createTempFile(String prefix, String suffix) throws IOException;
-    
-    /**
-     * Creates a new and empty temporary directory.
-     *
-     * @param prefix The directory name to be used to generate the name of the temporary directory.
-     * 
-     * @return The path to the newly created and empty temporary directory.
-     * 
-     * @throws IOException If no temporary directory could be created.
-     * 
-     * @since POI 3.15 beta 3.
-     */
-    File createTempDirectory(String prefix) throws IOException;
-}
diff --git a/trunk/src/java/org/apache/poi/util/Units.java b/trunk/src/java/org/apache/poi/util/Units.java
deleted file mode 100644
index 4ee12cb..0000000
--- a/trunk/src/java/org/apache/poi/util/Units.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.util;
-
-/**
- * @author Yegor Kozlov
- */
-public class Units {
-    /**
-     * In Escher absolute distances are specified in
-     * English Metric Units (EMUs), occasionally referred to as A units;
-     * there are 360000 EMUs per centimeter, 914400 EMUs per inch, 12700 EMUs per point.
-     */
-    public static final int EMU_PER_PIXEL = 9525;
-    public static final int EMU_PER_POINT = 12700;
-    public static final int EMU_PER_CENTIMETER = 360000;
-
-    /**
-     * Master DPI (576 pixels per inch).
-     * Used by the reference coordinate system in PowerPoint (HSLF)
-     */
-    public static final int MASTER_DPI = 576;    
-
-    /**
-     * Pixels DPI (96 pixels per inch)
-     */
-    public static final int PIXEL_DPI = 96;
-
-    /**
-     * Points DPI (72 pixels per inch)
-     */
-    public static final int POINT_DPI = 72;    
-
-    /**
-     * Converts points to EMUs
-     * @param points points
-     * @return EMUs
-     */
-    public static int toEMU(double points){
-        return (int)Math.rint(EMU_PER_POINT*points);
-    }
-    
-    /**
-     * Converts pixels to EMUs
-     * @param pixels pixels
-     * @return EMUs
-     */
-    public static int pixelToEMU(int pixels) {
-        return pixels*EMU_PER_PIXEL;
-    }
-
-    /**
-     * Converts EMUs to points
-     * @param emu emu
-     * @return points
-     */
-    public static double toPoints(long emu){
-        return (double)emu/EMU_PER_POINT;
-    }
-    
-    /**
-     * Converts a value of type FixedPoint to a floating point
-     *
-     * @param fixedPoint value in fixed point notation
-     * @return floating point (double)
-     * 
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd910765(v=office.12).aspx">[MS-OSHARED] - 2.2.1.6 FixedPoint</a>
-     */
-    public static double fixedPointToDouble(int fixedPoint) {
-        int i = (fixedPoint >> 16);
-        int f = fixedPoint & 0xFFFF;
-        return (i + f/65536d);
-    }
-    
-    /**
-     * Converts a value of type floating point to a FixedPoint
-     *
-     * @param floatPoint value in floating point notation
-     * @return fixedPoint value in fixed points notation
-     * 
-     * @see <a href="http://msdn.microsoft.com/en-us/library/dd910765(v=office.12).aspx">[MS-OSHARED] - 2.2.1.6 FixedPoint</a>
-     */
-    public static int doubleToFixedPoint(double floatPoint) {
-        double fractionalPart = floatPoint % 1d;
-        double integralPart = floatPoint - fractionalPart;
-        int i = (int)Math.floor(integralPart);
-        int f = (int)Math.rint(fractionalPart*65536d);
-        return (i << 16) | (f & 0xFFFF);
-    }
-
-    public static double masterToPoints(int masterDPI) {
-        double points = masterDPI;
-        points *= POINT_DPI;
-        points /= MASTER_DPI;
-        return points;
-    }
-    
-    public static int pointsToMaster(double points) {
-        points *= MASTER_DPI;
-        points /= POINT_DPI;
-        return (int)Math.rint(points);
-    }
-    
-    public static int pointsToPixel(double points) {
-        points *= PIXEL_DPI;
-        points /= POINT_DPI;
-        return (int)Math.rint(points);
-    }
-
-    public static double pixelToPoints(int pixel) {
-        double points = pixel;
-        points *= POINT_DPI;
-        points /= PIXEL_DPI;
-        return points;
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/util/XMLHelper.java b/trunk/src/java/org/apache/poi/util/XMLHelper.java
deleted file mode 100644
index 8797475..0000000
--- a/trunk/src/java/org/apache/poi/util/XMLHelper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-/**
- * Helper methods for working with javax.xml classes.
- */
-public final class XMLHelper
-{
-    private static POILogger logger = POILogFactory.getLogger(XMLHelper.class);
-    
-    /**
-     * Creates a new DocumentBuilderFactory, with sensible defaults
-     */
-    public static DocumentBuilderFactory getDocumentBuilderFactory() {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setExpandEntityReferences(false);
-        trySetSAXFeature(factory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        trySetSAXFeature(factory, "http://xml.org/sax/features/external-general-entities", false);
-        trySetSAXFeature(factory, "http://xml.org/sax/features/external-parameter-entities", false);
-        trySetSAXFeature(factory, "http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-        trySetSAXFeature(factory, "http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
-        return factory;
-    }
-    
-    private static void trySetSAXFeature(DocumentBuilderFactory documentBuilderFactory, String feature, boolean enabled) {
-        try {
-            documentBuilderFactory.setFeature(feature, enabled);
-        } catch (Exception e) {
-            logger.log(POILogger.WARN, "SAX Feature unsupported", feature, e);
-        } catch (AbstractMethodError ame) {
-            logger.log(POILogger.WARN, "Cannot set SAX feature because outdated XML parser in classpath", feature, ame);
-        }
-    }
-    
-
-}
diff --git a/trunk/src/java/org/apache/poi/util/package.html b/trunk/src/java/org/apache/poi/util/package.html
deleted file mode 100644
index c8eeaab..0000000
--- a/trunk/src/java/org/apache/poi/util/package.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-Top-level util package are classes that are useful throughout the project.  These classes are
-generally generic enough to be useful in any project and should be contributed elsewhere!
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-<li><a href="http://poi.apache.org">Apache POI Project</a>
-</ul>
-
-</body>
-</html>
diff --git a/trunk/src/java/org/apache/poi/wp/usermodel/CharacterRun.java b/trunk/src/java/org/apache/poi/wp/usermodel/CharacterRun.java
deleted file mode 100644
index 549ef67..0000000
--- a/trunk/src/java/org/apache/poi/wp/usermodel/CharacterRun.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.wp.usermodel;
-
-/**
- * This class represents a run of text that share common properties.
- */
-public interface CharacterRun {
-    boolean isBold();
-    void setBold(boolean bold);
-
-    boolean isItalic();
-    void setItalic(boolean italic);
-
-    boolean isSmallCaps();
-    void setSmallCaps(boolean smallCaps);
-
-    boolean isCapitalized();
-    void setCapitalized(boolean caps);
-
-    boolean isStrikeThrough();
-    void setStrikeThrough(boolean strike);
-    boolean isDoubleStrikeThrough();
-    void setDoubleStrikethrough(boolean dstrike);
-
-    boolean isShadowed();
-    void setShadow(boolean shadow);
-
-    boolean isEmbossed();
-    void setEmbossed(boolean emboss);
-
-    boolean isImprinted();
-    void setImprinted(boolean imprint);
-
-    int getFontSize();
-    void setFontSize(int halfPoints);
-
-    int getCharacterSpacing();
-    void setCharacterSpacing(int twips);
-
-    int getKerning();
-    void setKerning(int kern);
-    
-    boolean isHighlighted();
-    
-    // HWPF has colour indexes, XWPF has a highlight enum with the colours in
-//    byte getHighlightedColor();
-//    void setHighlighted(byte color);
-    
-    // HWPF has colour indexes, XWPF colour names
-//  int getColor();
-//  void setColor(int color);
-
-
-    /**
-     * Gets the fonts which shall be used to display the text contents of
-     * this run. Specifies a font which shall be used to format all "normal"
-     * characters in the run
-     *
-     * @return a string representing the font
-     */
-    String getFontName();
-    
-    /**
-     * @return The text of the run, including any tabs/spaces/etc
-     */
-    String text();
-
-    // HWPF uses indexes, XWPF special
-//    int getUnderlineCode();
-//    void setUnderlineCode(int kul);
-
-    // HWPF uses indexes, XWPF special vertical alignments
-//    short getSubSuperScriptIndex();
-//    void setSubSuperScriptIndex(short iss);
-
-    // TODO Review these, and add to XWPFRun if possible
-/*
-    boolean isFldVanished();
-    void setFldVanish(boolean fldVanish);
-    
-    boolean isOutlined();
-    void setOutline(boolean outlined);
-    
-    boolean isVanished();
-    void setVanished(boolean vanish);
-
-    boolean isMarkedDeleted();
-    void markDeleted(boolean mark);
-
-    boolean isMarkedInserted();
-    void markInserted(boolean mark);
-*/
-}
diff --git a/trunk/src/java/org/apache/poi/wp/usermodel/HeaderFooterType.java b/trunk/src/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
deleted file mode 100644
index bca6b66..0000000
--- a/trunk/src/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.wp.usermodel;
-
-/**
- * @since POI v3.16 beta 1
- */
-public enum HeaderFooterType {
-
-    /**
-     * This is the default header or Footer, It is displayed on every page where
-     * a more specific header or footer is not specified. It is always displayed
-     * on ODD pages that are not the first page of the section.
-     */
-    DEFAULT(2),
-
-    /**
-     * This is an even page header or footer, it is displayed on even pages that
-     * are not the first page of the section.
-     */
-    EVEN(1),
-
-    /**
-     * This is a first page header or footer It is displayed on the first page
-     * of the section.
-     */
-    FIRST(3);
-    
-    private final int code;
-    
-    private HeaderFooterType(int i) {
-        code = i;
-    }
-    
-    public int toInt() {
-        return code;
-    }
-    
-    public static HeaderFooterType forInt(int i) {
-        for (HeaderFooterType type : values()) {
-            if (type.code == i) {
-                return type;
-            }
-        }
-        throw new IllegalArgumentException("Invalid HeaderFooterType code: " + i);
-    }
-}
diff --git a/trunk/src/java/org/apache/poi/wp/usermodel/Paragraph.java b/trunk/src/java/org/apache/poi/wp/usermodel/Paragraph.java
deleted file mode 100644
index be488a2..0000000
--- a/trunk/src/java/org/apache/poi/wp/usermodel/Paragraph.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.wp.usermodel;
-
-/**
- * This class represents a paragraph, made up of one or more
- *  runs of text.
- */
-public interface Paragraph {
-    // Tables work very differently between the formats
-//  public boolean isInTable();
-//  public boolean isTableRowEnd();
-//  public int getTableLevel();
-
-    // TODO Implement justifaction in XWPF
-//  public int getJustification();
-//  public void setJustification(byte jc);
-
-    // TODO Expose the different page break related things,
-    //  XWPF currently doesn't have the full set
-/*
-    public boolean keepOnPage();
-    public void setKeepOnPage(boolean fKeep);
-
-    public boolean keepWithNext();
-    public void setKeepWithNext(boolean fKeepFollow);
-
-    public boolean pageBreakBefore();
-    public void setPageBreakBefore(boolean fPageBreak);
-
-    public boolean isSideBySide();
-    public void setSideBySide(boolean fSideBySide);
-*/
-
-    public int getIndentFromRight();
-    public void setIndentFromRight(int dxaRight);
-
-    public int getIndentFromLeft();
-    public void setIndentFromLeft(int dxaLeft);
-
-    public int getFirstLineIndent();
-    public void setFirstLineIndent(int first);
-
-/*
-    public boolean isLineNotNumbered();
-    public void setLineNotNumbered(boolean fNoLnn);
-
-    public boolean isAutoHyphenated();
-    public void setAutoHyphenated(boolean autoHyph);
-
-    public boolean isWidowControlled();
-    public void setWidowControl(boolean widowControl);
-
-    public int getSpacingBefore();
-    public void setSpacingBefore(int before);
-
-    public int getSpacingAfter();
-    public void setSpacingAfter(int after);
-*/
-
-    //  public LineSpacingDescriptor getLineSpacing();
-    //  public void setLineSpacing(LineSpacingDescriptor lspd);
-
-    public int getFontAlignment();
-    public void setFontAlignment(int align);
-
-    public boolean isWordWrapped();
-    public void setWordWrapped(boolean wrap);
-
-/*
-    public boolean isVertical();
-    public void setVertical(boolean vertical);
-
-    public boolean isBackward();
-    public void setBackward(boolean bward);
-*/
-
-    // TODO Make the HWPF and XWPF interface wrappers compatible for these
-/*
-    public BorderCode getTopBorder();
-    public void setTopBorder(BorderCode top);
-    public BorderCode getLeftBorder();
-    public void setLeftBorder(BorderCode left);
-    public BorderCode getBottomBorder();
-    public void setBottomBorder(BorderCode bottom);
-    public BorderCode getRightBorder();
-    public void setRightBorder(BorderCode right);
-    public BorderCode getBarBorder();
-    public void setBarBorder(BorderCode bar);
-
-    public ShadingDescriptor getShading();
-    public void setShading(ShadingDescriptor shd);
-*/
-
-    /**
-     * Returns the ilfo, an index to the document's hpllfo, which
-     *  describes the automatic number formatting of the paragraph.
-     * A value of zero means it isn't numbered.
-     */
-//    public int getIlfo();
-
-    /**
-     * Returns the multi-level indent for the paragraph. Will be
-     *  zero for non-list paragraphs, and the first level of any
-     *  list. Subsequent levels in hold values 1-8.
-     */
-//    public int getIlvl();
-
-    /**
-     * Returns the heading level (1-8), or 9 if the paragraph
-     *  isn't in a heading style.
-     */
-//    public int getLvl();
-
-    /**
-     * Returns number of tabs stops defined for paragraph. Must be >= 0 and <=
-     * 64.
-     * 
-     * @return number of tabs stops defined for paragraph. Must be >= 0 and <=
-     *         64
-     */
-//    public int getTabStopsNumber();
-
-    /**
-     * Returns array of positions of itbdMac tab stops
-     * 
-     * @return array of positions of itbdMac tab stops
-     */
-//    public int[] getTabStopsPositions();
-}
diff --git a/trunk/src/models/BlockClassDiagram.pgml b/trunk/src/models/BlockClassDiagram.pgml
deleted file mode 100644
index 11d979a..0000000
--- a/trunk/src/models/BlockClassDiagram.pgml
+++ /dev/null
@@ -1,621 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffe"
-      name="BlockClassDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[336, 152, 254, 65]"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ffd"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="336"
-      y="152"
-      width="254"
-      height="64"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig0.2"
-      context=""
-      x="336"
-      y="152"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog.italic"
-      textsize="9"
-    >BigBlock</text>
-    <rectangle name="Fig0.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig0.4"
-      context=""
-      x="336"
-      y="172"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >#BIG_BLOCK_SIZE : int = 512</text>
-    <text name="Fig0.5"
-      context=""
-      x="336"
-      y="192"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+writeData(in stream:OutputStream)
-#doWriteData(in stream:OutputStream, in data[]:byte)</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[8, 128, 300, 139]"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ffc"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="8"
-      y="128"
-      width="300"
-      height="138"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.2"
-      context=""
-      x="8"
-      y="128"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HeaderBlock</text>
-    <rectangle name="Fig1.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig1.4"
-      context=""
-      x="8"
-      y="148"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_bat_count : IntegerField
--_property_start : IntegerField
--_sbat_start : IntegerField = -2
--_xbat_start : IntegerField = -2
--_xbat_count : IntegerField = 0
--_data[ 512 ] : byte</text>
-    <text name="Fig1.5"
-      context=""
-      x="8"
-      y="212"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+setBATBlocks(in blockCount:int, in startBlock:int) : BATBlock
-+setPropertyStart(in startBlock:int)
-+setXBATStart(in startBlock:int)
-+Header()
-+calculateXBATStorageRequirements(in blockCount:int) : int</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[296, 344, 293, 61]"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff6"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="296"
-      y="344"
-      width="293"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.2"
-      context=""
-      x="296"
-      y="344"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyBlock</text>
-    <rectangle name="Fig2.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig2.4"
-      context=""
-      x="296"
-      y="364"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_properties[ 4 ] : Property</text>
-    <text name="Fig2.5"
-      context=""
-      x="296"
-      y="384"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createPropertyBlockArray(in properties:List) : BlockWritable</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[8, 280, 265, 69]"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ffb"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="8"
-      y="280"
-      width="265"
-      height="68"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig3.2"
-      context=""
-      x="8"
-      y="280"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BATBlock</text>
-    <rectangle name="Fig3.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig3.4"
-      context=""
-      x="8"
-      y="300"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_fields[ 128 ] : IntegerField
--_data[ 512 ] : byte</text>
-    <text name="Fig3.5"
-      context=""
-      x="8"
-      y="324"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createBATBlocks(in entries[]:int) : BATBlock
-+calculateStorageRequirements(in entryCount:int) : int</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[392, 248, 197, 79]"
-       href="127-0-0-1-497f6:e8e9160e29:-7ff0"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="392"
-      y="248"
-      width="197"
-      height="78"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.2"
-      context=""
-      x="392"
-      y="248"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >DocumentBlock</text>
-    <rectangle name="Fig4.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig4.4"
-      context=""
-      x="392"
-      y="268"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_data[ 512 ] : byte
--_bytes_read : int</text>
-    <text name="Fig4.5"
-      context=""
-      x="392"
-      y="292"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+DocumentBlock(in stream:InputStream)
-+size() : int
-+partiallyRead() : boolean</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.static_structure.ui.FigInterface[336, 40, 185, 64]"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7ffd"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig5.0"
-      x="337"
-      y="41"
-      width="183"
-      height="62"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.1"
-      x="336"
-      y="40"
-      width="185"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="337"
-      y="41"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >&lt;&lt;Interface&gt;&gt;</text>
-    <text name="Fig5.3"
-      context=""
-      x="337"
-      y="51"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BlockWritable</text>
-    <text name="Fig5.4"
-      context=""
-      x="336"
-      y="63"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+writeBlocks(in stream:OutputStream)</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ffa"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig6.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="308"
-              y="176" />
-      <lineto x="336"
-              y="176" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ff7"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig7.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="384"
-              y="344" />
-      <lineto x="384"
-              y="216" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ff6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig3.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig3"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="273"
-              y="312" />
-      <lineto x="360"
-              y="312" />
-      <lineto x="360"
-              y="216" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-497f6:e8e9160e29:-7fed"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="480"
-              y="248" />
-      <lineto x="480"
-              y="216" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7ff6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="392"
-              y="152" />
-      <lineto x="392"
-              y="103" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/HSSFOperationalUseCases.pgml b/trunk/src/models/HSSFOperationalUseCases.pgml
deleted file mode 100644
index fe331fd..0000000
--- a/trunk/src/models/HSSFOperationalUseCases.pgml
+++ /dev/null
@@ -1,730 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.use_case.ui.UMLUseCaseDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffc"
-      name="HSSFOperationalUseCases"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.use_case.ui.FigActor[128, 376, 58, 75]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig0.0"
-      x="157"
-      y="391"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-8355712"
-      stroke="1"
-      strokecolor="-8355712"
-    />
-    <ellipse name="Fig0.1"
-      x="157"
-      y="391"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.2"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="157"
-              y="401" />
-      <lineto x="157"
-              y="421" />
-    </path>
-    <path name="Fig0.3"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="147"
-              y="411" />
-      <lineto x="167"
-              y="411" />
-    </path>
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="157"
-              y="421" />
-      <lineto x="152"
-              y="436" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="157"
-              y="421" />
-      <lineto x="162"
-              y="436" />
-    </path>
-    <text name="Fig0.6"
-      context=""
-      x="128"
-      y="437"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ClientApps</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[144, 136, 100, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig1.0"
-      x="194"
-      y="156"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig1.1"
-      x="194"
-      y="156"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="157"
-      y="149"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >create HSSF File</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[376, 144, 124, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7fed"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig2.0"
-      x="438"
-      y="164"
-      rx="62"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig2.1"
-      x="438"
-      y="164"
-      rx="62"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="401"
-      y="157"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >write Workbook Entry</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[384, 280, 104, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7fe8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig3.0"
-      x="436"
-      y="300"
-      rx="52"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig3.1"
-      x="436"
-      y="300"
-      rx="52"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="399"
-      y="293"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >write sheet entry</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[392, 360, 100, 40]"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig4.0"
-      x="442"
-      y="380"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig4.1"
-      x="442"
-      y="380"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="405"
-      y="373"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >new MUseCase</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[392, 448, 104, 40]"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig5.0"
-      x="444"
-      y="468"
-      rx="52"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig5.1"
-      x="444"
-      y="468"
-      rx="52"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="407"
-      y="461"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >new MUseCase</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[392, 528, 100, 40]"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig6.0"
-      x="442"
-      y="548"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig6.1"
-      x="442"
-      y="548"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="405"
-      y="541"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >new MUseCase</text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[384, 600, 100, 40]"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig7.0"
-      x="434"
-      y="620"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig7.1"
-      x="434"
-      y="620"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="397"
-      y="613"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >new MUseCase</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[376, 672, 100, 40]"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig8.0"
-      x="426"
-      y="692"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig8.1"
-      x="426"
-      y="692"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.2"
-      context=""
-      x="389"
-      y="685"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >new MUseCase</text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[376, 752, 100, 40]"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig9.0"
-      x="426"
-      y="772"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig9.1"
-      x="426"
-      y="772"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig9.2"
-      context=""
-      x="389"
-      y="765"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >new MUseCase</text>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="381" />
-      <lineto x="167"
-              y="176" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="244"
-              y="160" />
-      <lineto x="376"
-              y="160" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="381" />
-      <lineto x="384"
-              y="320" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig4.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="400" />
-      <lineto x="392"
-              y="400" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="406" />
-      <lineto x="392"
-              y="448" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig6.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig6"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="406" />
-      <lineto x="392"
-              y="528" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig7.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="406" />
-      <lineto x="384"
-              y="600" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig17"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig9.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig9"
-    </private>
-    <path name="Fig17.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="406" />
-      <lineto x="376"
-              y="752" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig18"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig8.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig8"
-    </private>
-    <path name="Fig18.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="167"
-              y="406" />
-      <lineto x="376"
-              y="672" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/HSSFSerializerClassDiagram.pgml b/trunk/src/models/HSSFSerializerClassDiagram.pgml
deleted file mode 100644
index 474a2bf..0000000
--- a/trunk/src/models/HSSFSerializerClassDiagram.pgml
+++ /dev/null
@@ -1,669 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffe"
-      name="HSSFSerializerClassDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[32, 24, 457, 329]"
-       href="127-0-0-1-2264da:e955aac0a4:-7ffd"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="32"
-      y="24"
-      width="457"
-      height="328"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig0.2"
-      context=""
-      x="32"
-      y="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog.italic"
-      textsize="9"
-    >POIFSSerializer</text>
-    <rectangle name="Fig0.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig0.4"
-      context=""
-      x="32"
-      y="44"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_output_stream : OutputStream = null
--_locator : Locator = null
--_open_elements : Stack = new Stack()
--_filesystem : Filesystem = new Filesystem()</text>
-    <text name="Fig0.5"
-      context=""
-      x="32"
-      y="88"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+startPrefixMapping(in ignoredPrefix:String, in ignoredUri:String)
-+endPrefixMapping(in ignoredPrefix:String)
-+processingInstruction(in ignoredTarget:String, in ignoredData:String)
-+skippedEntity(in ignoredName:String)
-+startDTD(in ignoredName:String, in ignoredPublicId:String, in ignoredSystemId:String)
-+endDTD()
-+startEntity(in ignoredName:String)
-+endEntity(in ignoredName:String)
-+startCDATA()
-+endCDATA()
-+comment(in ignoredCh[]:char, in ignoredStart:int, in ignoredLength:int)
-+shouldSetContentLength() : boolean
-+setOutputStream(in out:OutputStream)
-+setDocumentLocator(in locator:Locator)
-+startDocument()
-+endDocument()
-+startElement(in namespaceURI:String, in localName:String, in qName:String, in atts:Attributes)
-+endElement(in namespaceURI:String, in localName:String, in qName:String)
-+characters(in ch[]:char, in start:int, in length:int)
-+ignorableWhitespace(in ch[]:char, in start:int, in length:int)
-#getElementProcessorFactory() : ElementProcessorFactory
-#doLocalPreEndDocument()
-#doLocalPostEndDocument()
-#getFilesystem() : Filesystem
-#SAXExceptionFactory(in message:String, in e:Exception) : SAXException
-#SAXExceptionFactory(in message:String) : SAXException</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[32, 680, 203, 119]"
-       href="127-0-0-1-2264da:e957cbdec1:-7ffc"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="32"
-      y="680"
-      width="203"
-      height="118"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.2"
-      context=""
-      x="32"
-      y="680"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Attribute</text>
-    <rectangle name="Fig1.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig1.4"
-      context=""
-      x="32"
-      y="700"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_name : String
--_value : String</text>
-    <text name="Fig1.5"
-      context=""
-      x="32"
-      y="724"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getName() : String
-+getValue() : String
-+getValueAsInt() : int
-+getValueAsShort() : short
-+getValueAsLong() : long
-+getValueAsBoolean() : boolean
-+Attribute(in name:String, in value:String)</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigInterface[32, 600, 429, 67]"
-       href="127-0-0-1-2264da:e957cbdec1:-7fed"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="33"
-      y="601"
-      width="427"
-      height="65"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="32"
-      y="600"
-      width="429"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="33"
-      y="601"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >&lt;&lt;Interface&gt;&gt;</text>
-    <text name="Fig2.3"
-      context=""
-      x="33"
-      y="611"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ElementProcessor</text>
-    <text name="Fig2.4"
-      context=""
-      x="32"
-      y="623"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+initialize(in attributes[]:Attribute, in parent:ElementProcessor, in filesystem:Filesystem)
-+acceptCharacters(in data[]:char)
-+acceptWhitespaceCharacters(in data[]:char)
-+endProcessing()</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[112, 368, 376, 105]"
-       href="127-0-0-1-2264da:e957cbdec1:-7fde"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="112"
-      y="368"
-      width="376"
-      height="104"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.1"
-      context=""
-      x="10"
-      y="-30"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig3.2"
-      context=""
-      x="112"
-      y="368"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog.italic"
-      textsize="9"
-    >ElementProcessorFactory</text>
-    <rectangle name="Fig3.3"
-      x="10"
-      y="-25"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig3.4"
-      context=""
-      x="112"
-      y="388"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_element_processor_map : Map</text>
-    <text name="Fig3.5"
-      context=""
-      x="112"
-      y="408"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createElementProcessor(in name:String) : ElementProcessor
-#addElementProcessorProgenitor(in name:String, in progenitor:Object)
-#lookupElementProcessorProgenitor(in name:String) : Object
-#doCreateElementProcessor(in progenitor:Object) : ElementProcessor
-#constructElementProcessor(in progenitor:Constructor) : ElementProcessor
-#createNewElementProcessorInstance(in progenitor:Class) : ElementProcessor</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[32, 528, 293, 61]"
-       href="127-0-0-1-2264da:e95e6c79c6:-7ffb"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="32"
-      y="528"
-      width="293"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.2"
-      context=""
-      x="32"
-      y="528"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HSSFSerializer</text>
-    <rectangle name="Fig4.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig4.4"
-      context=""
-      x="32"
-      y="548"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_element_processor_factory : HSSFElementProcessorFactory</text>
-    <text name="Fig4.5"
-      context=""
-      x="32"
-      y="568"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getMimeType() : String</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[344, 552, 143, 20]"
-       href="127-0-0-1-32fb1e:e95f731f0f:-7ff7"
-       shown="1"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig5.0"
-      x="344"
-      y="552"
-      width="143"
-      height="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.2"
-      context=""
-      x="344"
-      y="552"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HSSFElementProcessorFactory</text>
-    <rectangle name="Fig5.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig5.4"
-      context=""
-      x="344"
-      y="572"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.5"
-      context=""
-      x="344"
-      y="572"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[88, 488, 322, 20]"
-       href="127-0-0-1-5780d9:e9ab5b05d8:-7fee"
-       shown="1"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig9.0"
-      x="88"
-      y="488"
-      width="322"
-      height="20"
-      fill="1"
-      fillcolor="-16711681"
-      stroke="1"
-      strokecolor="-16711681"
-    />
-    <text name="Fig9.1"
-      context=""
-      x="88"
-      y="488"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig9.2"
-      context=""
-      x="88"
-      y="488"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ElementProcessorFactory.CannotCreateElementProcessorException</text>
-    <rectangle name="Fig9.3"
-      x="88"
-      y="493"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig9.4"
-      context=""
-      x="88"
-      y="508"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig9.5"
-      context=""
-      x="88"
-      y="508"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-2264da:e95e6c79c6:-7ff9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig6.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="56"
-              y="528" />
-      <lineto x="56"
-              y="352" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-32fb1e:e95f731f0f:-7ff6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig5.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig5"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig7.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="447"
-              y="552" />
-      <lineto x="447"
-              y="472" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-32fb1e:e95f731f0f:-7ff5"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="325"
-              y="560" />
-      <lineto x="344"
-              y="560" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/HSSFSerializerUseCases.pgml b/trunk/src/models/HSSFSerializerUseCases.pgml
deleted file mode 100644
index e7dfc3f..0000000
--- a/trunk/src/models/HSSFSerializerUseCases.pgml
+++ /dev/null
@@ -1,1049 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.use_case.ui.UMLUseCaseDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffb"
-      name="HSSF Serializer Use Cases"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.use_case.ui.FigActor[648, 184, 50, 75]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ffe"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig0.0"
-      x="673"
-      y="199"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-8355712"
-      stroke="1"
-      strokecolor="-8355712"
-    />
-    <ellipse name="Fig0.1"
-      x="673"
-      y="199"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.2"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="673"
-              y="209" />
-      <lineto x="673"
-              y="229" />
-    </path>
-    <path name="Fig0.3"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="663"
-              y="219" />
-      <lineto x="683"
-              y="219" />
-    </path>
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="673"
-              y="229" />
-      <lineto x="668"
-              y="244" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="673"
-              y="229" />
-      <lineto x="678"
-              y="244" />
-    </path>
-    <text name="Fig0.6"
-      context=""
-      x="644"
-      y="245"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Cocoon</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[72, 184, 100, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ffd"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig1.0"
-      x="122"
-      y="204"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig1.1"
-      x="122"
-      y="204"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="85"
-      y="197"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends Sax Events</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[344, 296, 123, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ffb"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig2.0"
-      x="405"
-      y="316"
-      rx="61"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig2.1"
-      x="405"
-      y="316"
-      rx="61"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="369"
-      y="309"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends an Ignored Event</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[336, 0, 150, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ffa"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig3.0"
-      x="411"
-      y="20"
-      rx="75"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig3.1"
-      x="411"
-      y="20"
-      rx="75"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="374"
-      y="13"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends and Interrogative Event</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[352, 416, 103, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ff9"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig4.0"
-      x="403"
-      y="436"
-      rx="51"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig4.1"
-      x="403"
-      y="436"
-      rx="51"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="367"
-      y="429"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends Setup Event</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[336, 120, 145, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ff8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig5.0"
-      x="408"
-      y="140"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig5.1"
-      x="408"
-      y="140"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="372"
-      y="133"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends Start Document Event</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[336, 192, 141, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig6.0"
-      x="406"
-      y="212"
-      rx="70"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig6.1"
-      x="406"
-      y="212"
-      rx="70"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="370"
-      y="205"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends End Document Event</text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[336, 64, 136, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ff6"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig7.0"
-      x="404"
-      y="84"
-      rx="68"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig7.1"
-      x="404"
-      y="84"
-      rx="68"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="367"
-      y="77"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends Start Element Event</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[344, 240, 132, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ff5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig8.0"
-      x="410"
-      y="260"
-      rx="66"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig8.1"
-      x="410"
-      y="260"
-      rx="66"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.2"
-      context=""
-      x="373"
-      y="253"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends End Element Event</text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[344, 360, 120, 40]"
-       href="10-10-101-65-ab08f:e833388f1f:-7ff4"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig9.0"
-      x="404"
-      y="380"
-      rx="60"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig9.1"
-      x="404"
-      y="380"
-      rx="60"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig9.2"
-      context=""
-      x="367"
-      y="373"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Sends Raw Data Event</text>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fea"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig9.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig9"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="344"
-              y="360" />
-      <lineto x="172"
-              y="224" />
-    </path>
-    <annotations>
-        <text name="Fig10.1"
-          context="stereotype"
-          x="91"
-          y="187"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig7.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig7"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="336"
-              y="104" />
-      <lineto x="172"
-              y="184" />
-    </path>
-    <annotations>
-        <text name="Fig11.1"
-          context="stereotype"
-          x="227"
-          y="140"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig8.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig8"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="344"
-              y="240" />
-      <lineto x="172"
-              y="224" />
-    </path>
-    <annotations>
-        <text name="Fig12.1"
-          context="stereotype"
-          x="94"
-          y="164"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe7"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig6"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="336"
-              y="200" />
-      <lineto x="172"
-              y="200" />
-    </path>
-    <annotations>
-        <text name="Fig13.1"
-          context="stereotype"
-          x="227"
-          y="202"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig5.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig5"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="336"
-              y="160" />
-      <lineto x="172"
-              y="184" />
-    </path>
-    <annotations>
-        <text name="Fig14.1"
-          context="stereotype"
-          x="109"
-          y="118"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe5"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="352"
-              y="416" />
-      <lineto x="172"
-              y="224" />
-    </path>
-    <annotations>
-        <text name="Fig15.1"
-          context="stereotype"
-          x="100"
-          y="184"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig3.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig3"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="336"
-              y="40" />
-      <lineto x="172"
-              y="184" />
-    </path>
-    <annotations>
-        <text name="Fig16.1"
-          context="stereotype"
-          x="231"
-          y="108"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig17"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe3"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig17.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="344"
-              y="296" />
-      <lineto x="172"
-              y="224" />
-    </path>
-    <annotations>
-        <text name="Fig17.1"
-          context="stereotype"
-          x="78"
-          y="159"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig18"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig18.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="172"
-              y="184" />
-      <lineto x="663"
-              y="184" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig19"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig3.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig3"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig19.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="486"
-              y="40" />
-      <lineto x="663"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig20"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fe0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig7.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig7"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig20.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="472"
-              y="104" />
-      <lineto x="663"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig21"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fdf"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig5.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig5"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig21.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="481"
-              y="160" />
-      <lineto x="663"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig22"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fde"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig6"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig22.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="477"
-              y="192" />
-      <lineto x="663"
-              y="192" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig23"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fdd"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig8.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig8"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig23.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="476"
-              y="240" />
-      <lineto x="663"
-              y="209" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig24"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fdc"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig24.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="467"
-              y="296" />
-      <lineto x="663"
-              y="209" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig25"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fdb"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig9.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig9"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig25.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="464"
-              y="360" />
-      <lineto x="663"
-              y="209" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig26"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-ab08f:e833388f1f:-7fda"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig26.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="455"
-              y="416" />
-      <lineto x="663"
-              y="209" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/HSSFUseCases.pgml b/trunk/src/models/HSSFUseCases.pgml
deleted file mode 100644
index 0bca884..0000000
--- a/trunk/src/models/HSSFUseCases.pgml
+++ /dev/null
@@ -1,725 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.use_case.ui.UMLUseCaseDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffc"
-      name="HSSFUseCases"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.use_case.ui.FigActor[96, 128, 58, 75]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig0.0"
-      x="125"
-      y="143"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-8355712"
-      stroke="1"
-      strokecolor="-8355712"
-    />
-    <ellipse name="Fig0.1"
-      x="125"
-      y="143"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.2"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="125"
-              y="153" />
-      <lineto x="125"
-              y="173" />
-    </path>
-    <path name="Fig0.3"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="115"
-              y="163" />
-      <lineto x="135"
-              y="163" />
-    </path>
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="125"
-              y="173" />
-      <lineto x="120"
-              y="188" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="125"
-              y="173" />
-      <lineto x="130"
-              y="188" />
-    </path>
-    <text name="Fig0.6"
-      context=""
-      x="96"
-      y="189"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ClientApps</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[104, 336, 100, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig1.0"
-      x="154"
-      y="356"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig1.1"
-      x="154"
-      y="356"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="117"
-      y="349"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >create HSSF File</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[368, 136, 133, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7ff4"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig2.0"
-      x="434"
-      y="156"
-      rx="66"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig2.1"
-      x="434"
-      y="156"
-      rx="66"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="398"
-      y="149"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >read existing HSSF File</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[320, 304, 145, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7ff3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig3.0"
-      x="392"
-      y="324"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig3.1"
-      x="392"
-      y="324"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="356"
-      y="317"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >write HSSF File</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[528, 48, 121, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7ff2"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig4.0"
-      x="588"
-      y="68"
-      rx="60"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig4.1"
-      x="588"
-      y="68"
-      rx="60"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="552"
-      y="61"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >read Workbook Entry</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[496, 240, 124, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7fed"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig5.0"
-      x="558"
-      y="260"
-      rx="62"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig5.1"
-      x="558"
-      y="260"
-      rx="62"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="521"
-      y="253"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >write Workbook Entry</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[504, 368, 104, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7fe8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig6.0"
-      x="556"
-      y="388"
-      rx="52"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig6.1"
-      x="556"
-      y="388"
-      rx="52"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="519"
-      y="381"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >write sheet entry</text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[544, 160, 100, 40]"
-       href="-64--88-1-2-717d91:e7db573623:-7fe4"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig7.0"
-      x="594"
-      y="180"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig7.1"
-      x="594"
-      y="180"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="557"
-      y="173"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >read Sheet Entry</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="-64--88-1-2-717d91:e7db573623:-7ff5"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="135"
-              y="153" />
-      <lineto x="135"
-              y="336" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="-64--88-1-2-717d91:e7db573623:-7ff1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="135"
-              y="153" />
-      <lineto x="368"
-              y="153" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7db573623:-7fef"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="528"
-              y="88" />
-      <lineto x="501"
-              y="136" />
-    </path>
-    <annotations>
-        <text name="Fig10.1"
-          context="stereotype"
-          x="491"
-          y="97"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="-64--88-1-2-717d91:e7db573623:-7fee"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="135"
-              y="153" />
-      <lineto x="320"
-              y="304" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7db573623:-7fec"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig5.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig5"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="496"
-              y="280" />
-      <lineto x="465"
-              y="304" />
-    </path>
-    <annotations>
-        <text name="Fig12.1"
-          context="stereotype"
-          x="446"
-          y="281"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7db573623:-7fea"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig3.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig3"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="416"
-              y="304" />
-      <lineto x="416"
-              y="176" />
-    </path>
-    <annotations>
-        <text name="Fig13.1"
-          context="stereotype"
-          x="379"
-          y="232"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7db573623:-7fe7"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig6"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="504"
-              y="368" />
-      <lineto x="465"
-              y="344" />
-    </path>
-    <annotations>
-        <text name="Fig14.1"
-          context="stereotype"
-          x="247"
-          y="227"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7db573623:-7fe3"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig7.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig7"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="544"
-              y="176" />
-      <lineto x="501"
-              y="176" />
-    </path>
-    <annotations>
-        <text name="Fig15.1"
-          context="stereotype"
-          x="496"
-          y="178"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7db573623:-7fe1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig3.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig3"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="320"
-              y="344" />
-      <lineto x="204"
-              y="344" />
-    </path>
-    <annotations>
-        <text name="Fig16.1"
-          context="stereotype"
-          x="235"
-          y="346"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIFSAddDocument.pgml b/trunk/src/models/POIFSAddDocument.pgml
deleted file mode 100644
index 2117546..0000000
--- a/trunk/src/models/POIFSAddDocument.pgml
+++ /dev/null
@@ -1,1042 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-8000"
-      name="POIFSAddDocument"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 82, 344]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff8"
-       shown="0"
-       dynobjects="[a|0|6|false|false, b|0, b|3, b|4, b|5, b|6]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Filesystem : </text>
-    <rectangle name="Fig0.3"
-      x="47"
-      y="34"
-      width="10"
-      height="320"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="47"
-              y="353" />
-      <lineto x="56"
-              y="353" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="56"
-              y="353" />
-      <lineto x="47"
-              y="353" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="41"
-      y="69"
-      width="21"
-      height="240"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="41"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="41"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.9"
-      x="41"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.10"
-      x="41"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.11"
-      x="41"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[152, 10, 80, 344]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff7"
-       shown="0"
-       dynobjects="[a|0|3|false|false, b|0, b|1, b|2, b|3]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="152"
-      y="10"
-      width="80"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="152"
-      y="10"
-      width="80"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="152"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Document : </text>
-    <rectangle name="Fig1.3"
-      x="188"
-      y="34"
-      width="10"
-      height="320"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="188"
-              y="353" />
-      <lineto x="197"
-              y="353" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="197"
-              y="353" />
-      <lineto x="188"
-              y="353" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="182"
-      y="69"
-      width="21"
-      height="120"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="182"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="182"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.9"
-      x="182"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.10"
-      x="182"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[292, 140, 120, 214]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff4"
-       shown="0"
-       dynobjects="[a|2|2|false|false, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="292"
-      y="140"
-      width="120"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="292"
-      y="140"
-      width="120"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="292"
-      y="140"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >DocumentProperty : </text>
-    <rectangle name="Fig2.3"
-      x="348"
-      y="164"
-      width="10"
-      height="190"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="348"
-              y="353" />
-      <lineto x="357"
-              y="353" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="357"
-              y="353" />
-      <lineto x="348"
-              y="353" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="342"
-      y="164"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="292"
-      y="149"
-      width="120"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[472, 100, 106, 254]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff3"
-       shown="0"
-       dynobjects="[a|1|1|false|false, b|1]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="472"
-      y="100"
-      width="106"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.1"
-      x="472"
-      y="100"
-      width="106"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="472"
-      y="100"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >DocumentBlock : </text>
-    <rectangle name="Fig3.3"
-      x="521"
-      y="124"
-      width="10"
-      height="230"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig3.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="521"
-              y="353" />
-      <lineto x="530"
-              y="353" />
-    </path>
-    <path name="Fig3.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="530"
-              y="353" />
-      <lineto x="521"
-              y="353" />
-    </path>
-    <rectangle name="Fig3.6"
-      x="515"
-      y="124"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.7"
-      x="472"
-      y="109"
-      width="106"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[638, 10, 97, 344]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fec"
-       shown="0"
-       dynobjects="[a|4|5|false|false, b|4, b|5]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="638"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.1"
-      x="638"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="638"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTable : </text>
-    <rectangle name="Fig4.3"
-      x="682"
-      y="34"
-      width="10"
-      height="320"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig4.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="682"
-              y="353" />
-      <lineto x="691"
-              y="353" />
-    </path>
-    <path name="Fig4.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="691"
-              y="353" />
-      <lineto x="682"
-              y="353" />
-    </path>
-    <rectangle name="Fig4.6"
-      x="676"
-      y="229"
-      width="21"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.7"
-      x="676"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.8"
-      x="676"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[795, 10, 93, 344]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fe9"
-       shown="0"
-       dynobjects="[a|6|6|false|false, b|6]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig5.0"
-      x="795"
-      y="10"
-      width="93"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.1"
-      x="795"
-      y="10"
-      width="93"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="795"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >RootProperty : </text>
-    <rectangle name="Fig5.3"
-      x="837"
-      y="34"
-      width="10"
-      height="320"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig5.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="837"
-              y="353" />
-      <lineto x="846"
-              y="353" />
-    </path>
-    <path name="Fig5.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="846"
-              y="353" />
-      <lineto x="837"
-              y="353" />
-    </path>
-    <rectangle name="Fig5.6"
-      x="831"
-      y="309"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.7"
-      x="831"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig6.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[61, 52, 111, 14]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig6.1.0"
-      context=""
-      x="61"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create</text>
-  </group>
-  <group name="Fig7.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[269, 92, 111, 14]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff1"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig7.1.0"
-      context=""
-      x="269"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create (1 .. n)</text>
-  </group>
-  <group name="Fig8.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[188, 132, 111, 14]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fef"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig8.1.0"
-      context=""
-      x="188"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create</text>
-  </group>
-  <group name="Fig9.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[61, 172, 111, 14]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fed"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig9.1.0"
-      context=""
-      x="61"
-      y="172"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : getDocumentProperty</text>
-  </group>
-  <group name="Fig10.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[283, 212, 111, 14]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fea"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig10.1.0"
-      context=""
-      x="283"
-      y="212"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : addProperty</text>
-  </group>
-  <group name="Fig11.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[283, 252, 111, 14]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fe7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig11.1.0"
-      context=""
-      x="283"
-      y="252"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : getRoot</text>
-  </group>
-  <group name="Fig12.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[353, 292, 111, 14]"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fe5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig12.1.0"
-      context=""
-      x="353"
-      y="292"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : addChild</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig6.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="69" />
-      <lineto x="182"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.8"
-      destPortFig="Fig3.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig7.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="203"
-              y="109" />
-      <lineto x="472"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7ff0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.9"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="203"
-              y="149" />
-      <lineto x="292"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fee"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.8"
-      destPortFig="Fig1.10"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="189" />
-      <lineto x="182"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7feb"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.9"
-      destPortFig="Fig4.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="229" />
-      <lineto x="676"
-              y="229" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fe8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.10"
-      destPortFig="Fig4.8"
-      sourceFigNode="Fig0"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="269" />
-      <lineto x="676"
-              y="269" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f1a8b3bb:-7fe6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.11"
-      destPortFig="Fig5.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="309" />
-      <lineto x="831"
-              y="309" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIFSClassDiagram.pgml b/trunk/src/models/POIFSClassDiagram.pgml
deleted file mode 100644
index 0f20959..0000000
--- a/trunk/src/models/POIFSClassDiagram.pgml
+++ /dev/null
@@ -1,1125 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffe"
-      name="POIFSClassDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[288, 72, 276, 89]"
-       href="127-0-0-1-497f6:e8e9160e29:-7ffd"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="288"
-      y="72"
-      width="276"
-      height="88"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig0.2"
-      context=""
-      x="288"
-      y="72"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Filesystem</text>
-    <rectangle name="Fig0.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig0.4"
-      context=""
-      x="288"
-      y="92"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_property_table : PropertyTable
--_header_block : HeaderBlock
--_documents : List</text>
-    <text name="Fig0.5"
-      context=""
-      x="288"
-      y="126"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createDocument(in stream:InputStream, in name:String)
-+writeFilesystem(in stream:OutputStream)
-+Filesystem()</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[256, 200, 246, 69]"
-       href="127-0-0-1-497f6:e8e9160e29:-7ffc"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="256"
-      y="200"
-      width="246"
-      height="68"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.2"
-      context=""
-      x="256"
-      y="200"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Document</text>
-    <rectangle name="Fig1.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig1.4"
-      context=""
-      x="256"
-      y="220"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_property : DocumentProperty
--_blocks[] : DocumentBlock</text>
-    <text name="Fig1.5"
-      context=""
-      x="256"
-      y="244"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >#getDocumentProperty() : DocumentProperty
-#Document(in name:String, in stream:InputStream)</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[320, 312, 197, 79]"
-       href="127-0-0-1-497f6:e8e9160e29:-7ff0"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="320"
-      y="312"
-      width="197"
-      height="78"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.2"
-      context=""
-      x="320"
-      y="312"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >DocumentBlock</text>
-    <rectangle name="Fig2.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig2.4"
-      context=""
-      x="320"
-      y="332"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_data[ 512 ] : byte
--_bytes_read : int</text>
-    <text name="Fig2.5"
-      context=""
-      x="320"
-      y="356"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+DocumentBlock(in stream:InputStream)
-+size() : int
-+partiallyRead() : boolean</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[288, 568, 300, 139]"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ffc"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="288"
-      y="568"
-      width="300"
-      height="138"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig3.2"
-      context=""
-      x="288"
-      y="568"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HeaderBlock</text>
-    <rectangle name="Fig3.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig3.4"
-      context=""
-      x="288"
-      y="588"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_bat_count : IntegerField
--_property_start : IntegerField
--_sbat_start : IntegerField = -2
--_xbat_start : IntegerField = -2
--_xbat_count : IntegerField = 0
--_data[ 512 ] : byte</text>
-    <text name="Fig3.5"
-      context=""
-      x="288"
-      y="652"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+setBATBlocks(in blockCount:int, in startBlock:int) : BATBlock
-+setPropertyStart(in startBlock:int)
-+setXBATStart(in startBlock:int)
-+Header()
-+calculateXBATStorageRequirements(in blockCount:int) : int</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[24, 64, 169, 109]"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff1"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="24"
-      y="64"
-      width="169"
-      height="108"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.2"
-      context=""
-      x="24"
-      y="64"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTable</text>
-    <rectangle name="Fig4.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig4.4"
-      context=""
-      x="24"
-      y="84"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_properties : List
--_blocks[ ] : BlockWritable
--_start_block : int</text>
-    <text name="Fig4.5"
-      context=""
-      x="24"
-      y="118"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getRoot() : Directory
-+addProperty(in property:Property)
-+preWrite()
-+PropertyTable()
-+getStartBlock() : int</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[248, 416, 228, 40]"
-       href="127-0-0-1-497f6:e8c85b337f:-7ffa"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig5.0"
-      x="248"
-      y="416"
-      width="228"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.2"
-      context=""
-      x="248"
-      y="416"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >DocumentProperty</text>
-    <rectangle name="Fig5.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig5.4"
-      context=""
-      x="248"
-      y="436"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.5"
-      context=""
-      x="248"
-      y="436"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+DocumentProperty(in name:String, in size:int)</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.static_structure.ui.FigInterface[64, 224, 141, 64]"
-       href="127-0-0-1-497f6:e8e9160e29:-7fde"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig6.0"
-      x="65"
-      y="225"
-      width="139"
-      height="62"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.1"
-      x="64"
-      y="224"
-      width="141"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="65"
-      y="225"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >&lt;&lt;Interface&gt;&gt;</text>
-    <text name="Fig6.3"
-      context=""
-      x="65"
-      y="235"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BATManaged</text>
-    <text name="Fig6.4"
-      context=""
-      x="64"
-      y="247"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+countBlocks() : int
-+setStartBlock(in index:int)</text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.static_structure.ui.FigInterface[24, 368, 185, 64]"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7ffd"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig7.0"
-      x="25"
-      y="369"
-      width="183"
-      height="62"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.1"
-      x="24"
-      y="368"
-      width="185"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="25"
-      y="369"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >&lt;&lt;Interface&gt;&gt;</text>
-    <text name="Fig7.3"
-      context=""
-      x="25"
-      y="379"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BlockWritable</text>
-    <text name="Fig7.4"
-      context=""
-      x="24"
-      y="391"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+writeBlocks(in stream:OutputStream)</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[24, 464, 193, 89]"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7ff5"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig8.0"
-      x="24"
-      y="464"
-      width="193"
-      height="88"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig8.2"
-      context=""
-      x="24"
-      y="464"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BlockAllocationTable</text>
-    <rectangle name="Fig8.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig8.4"
-      context=""
-      x="24"
-      y="484"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_entries : IntList
--_blocks[] : BATBlock</text>
-    <text name="Fig8.5"
-      context=""
-      x="24"
-      y="508"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >#createBlocks()
-#allocateSpace(in blockCount:int) : int
-#BlockAllocationTable()
-#countBlocks() : int</text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[16, 600, 265, 69]"
-       href="127-0-0-1-32fb1e:e8c8d28c34:-7ffb"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig9.0"
-      x="16"
-      y="600"
-      width="265"
-      height="68"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig9.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig9.2"
-      context=""
-      x="16"
-      y="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BATBlock</text>
-    <rectangle name="Fig9.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig9.4"
-      context=""
-      x="16"
-      y="620"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_fields[ 128 ] : IntegerField
--_data[ 512 ] : byte</text>
-    <text name="Fig9.5"
-      context=""
-      x="16"
-      y="644"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createBATBlocks(in entries[]:int) : BATBlock
-+calculateStorageRequirements(in entryCount:int) : int</text>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8e9160e29:-7ff8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="360"
-              y="160" />
-      <lineto x="360"
-              y="200" />
-    </path>
-    <annotations>
-        <text name="Fig10.1"
-          context="destMult"
-          x="360"
-          y="178"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >0..*</text>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8e9160e29:-7fea"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="408"
-              y="268" />
-      <lineto x="408"
-              y="312" />
-    </path>
-    <annotations>
-        <text name="Fig11.1"
-          context="destMult"
-          x="408"
-          y="290"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >1..*</text>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8e9160e29:-7fe7"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="528"
-              y="160" />
-      <lineto x="528"
-              y="568" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8e9160e29:-7fe4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig4.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="288"
-              y="96" />
-      <lineto x="193"
-              y="96" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8e9160e29:-7fe1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="304"
-              y="268" />
-      <lineto x="304"
-              y="416" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-497f6:e8e9160e29:-7fd9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig6.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig6"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="112"
-              y="172" />
-      <lineto x="112"
-              y="225" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-497f6:e8e9160e29:-7fd8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig6.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig6"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="256"
-              y="225" />
-      <lineto x="204"
-              y="225" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig17"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7ff8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig7.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig17.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="288"
-              y="268" />
-      <lineto x="288"
-              y="392" />
-      <lineto x="208"
-              y="392" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig18"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7ff7"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig7.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig18.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="48"
-              y="172" />
-      <lineto x="48"
-              y="369" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig19"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7fef"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig8.0"
-      destPortFig="Fig7.0"
-      sourceFigNode="Fig8"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig19.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="120"
-              y="464" />
-      <lineto x="120"
-              y="431" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig20"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-b3e62:e8f3e6dcd2:-7fe9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig8.0"
-      destPortFig="Fig9.0"
-      sourceFigNode="Fig8"
-      destFigNode="Fig9"
-    </private>
-    <path name="Fig20.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="120"
-              y="552" />
-      <lineto x="120"
-              y="600" />
-    </path>
-    <annotations>
-        <text name="Fig20.1"
-          context="destMult"
-          x="120"
-          y="578"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >1..*</text>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIFSInitialization.pgml b/trunk/src/models/POIFSInitialization.pgml
deleted file mode 100644
index 3c48756..0000000
--- a/trunk/src/models/POIFSInitialization.pgml
+++ /dev/null
@@ -1,590 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-8000"
-      name="POIFSInitialization"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 82, 184]"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ffd"
-       shown="0"
-       dynobjects="[a|0|2|false|false, b|0, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig0"
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Filesystem : </text>
-    <rectangle name="Fig0.3"
-      x="47"
-      y="34"
-      width="10"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="47"
-              y="193" />
-      <lineto x="56"
-              y="193" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="56"
-              y="193" />
-      <lineto x="47"
-              y="193" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="41"
-      y="69"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="41"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="41"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[152, 140, 91, 54]"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ffc"
-       shown="0"
-       dynobjects="[a|2|2|false|false, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig1"
-    </private>
-    <rectangle name="Fig1.0"
-      x="152"
-      y="140"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="152"
-      y="140"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="152"
-      y="140"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HeaderBlock : </text>
-    <rectangle name="Fig1.3"
-      x="193"
-      y="164"
-      width="10"
-      height="30"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="193"
-              y="193" />
-      <lineto x="202"
-              y="193" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="202"
-              y="193" />
-      <lineto x="193"
-              y="193" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="187"
-      y="164"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="152"
-      y="149"
-      width="91"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[303, 10, 97, 184]"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff9"
-       shown="0"
-       dynobjects="[a|0|1|false|false, b|0, b|1]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig2"
-    </private>
-    <rectangle name="Fig2.0"
-      x="303"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="303"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="303"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTable : </text>
-    <rectangle name="Fig2.3"
-      x="347"
-      y="34"
-      width="10"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="347"
-              y="193" />
-      <lineto x="356"
-              y="193" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="356"
-              y="193" />
-      <lineto x="347"
-              y="193" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="341"
-      y="69"
-      width="21"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="341"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.8"
-      x="341"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[460, 100, 93, 94]"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff6"
-       shown="0"
-       dynobjects="[a|1|1|false|false, b|1]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig3"
-    </private>
-    <rectangle name="Fig3.0"
-      x="460"
-      y="100"
-      width="93"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.1"
-      x="460"
-      y="100"
-      width="93"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="460"
-      y="100"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >RootProperty : </text>
-    <rectangle name="Fig3.3"
-      x="502"
-      y="124"
-      width="10"
-      height="70"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig3.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="502"
-              y="193" />
-      <lineto x="511"
-              y="193" />
-    </path>
-    <path name="Fig3.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="511"
-              y="193" />
-      <lineto x="502"
-              y="193" />
-    </path>
-    <rectangle name="Fig3.6"
-      x="496"
-      y="124"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.7"
-      x="460"
-      y="109"
-      width="93"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig4.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[132, 52, 111, 14]"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig4.1.0"
-      context=""
-      x="132"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create</text>
-  </group>
-  <group name="Fig5.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[351, 92, 111, 14]"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff4"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig5.1.0"
-      context=""
-      x="351"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create</text>
-  </group>
-  <group name="Fig6.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[47, 132, 111, 14]"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff2"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig6.1.0"
-      context=""
-      x="47"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig4.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="69" />
-      <lineto x="341"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff5"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.8"
-      destPortFig="Fig3.7"
-      sourceFigNode="Fig2"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig5.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="362"
-              y="109" />
-      <lineto x="460"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-b3e62:e8ecfd4ea4:-7ff3"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.8"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig6.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="149" />
-      <lineto x="152"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIFSLifeCycle.pgml b/trunk/src/models/POIFSLifeCycle.pgml
deleted file mode 100644
index 88c4315..0000000
--- a/trunk/src/models/POIFSLifeCycle.pgml
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-8000"
-      name="POIFSLifeCycle"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 123, 184]"
-       href="127-0-0-1-497f6:e929957ff4:-7fca"
-       shown="0"
-       dynobjects="[a|0|2|false|false, b|0, b|1, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="123"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="123"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >(Client Application) : </text>
-    <rectangle name="Fig0.3"
-      x="67"
-      y="34"
-      width="10"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="67"
-              y="193" />
-      <lineto x="76"
-              y="193" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="76"
-              y="193" />
-      <lineto x="67"
-              y="193" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="61"
-      y="69"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="61"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="61"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.9"
-      x="61"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[193, 10, 82, 184]"
-       href="127-0-0-1-497f6:e929957ff4:-7fc9"
-       shown="0"
-       dynobjects="[a|0|2|false|false, b|0, b|1, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="193"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="193"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="193"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Filesystem : </text>
-    <rectangle name="Fig1.3"
-      x="230"
-      y="34"
-      width="10"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="230"
-              y="193" />
-      <lineto x="239"
-              y="193" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="239"
-              y="193" />
-      <lineto x="230"
-              y="193" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="224"
-      y="69"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="224"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="224"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.9"
-      x="224"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[90, 52, 111, 14]"
-       href="127-0-0-1-497f6:e929957ff4:-7fc7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig2.1.0"
-      context=""
-      x="90"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create</text>
-  </group>
-  <group name="Fig3.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[90, 92, 111, 14]"
-       href="127-0-0-1-497f6:e929957ff4:-7fc5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig3.1.0"
-      context=""
-      x="90"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : createDocument</text>
-  </group>
-  <group name="Fig4.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[90, 132, 111, 14]"
-       href="127-0-0-1-497f6:e929957ff4:-7fc3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig4.1.0"
-      context=""
-      x="90"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : writeFileSystem</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e929957ff4:-7fc8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig2.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="82"
-              y="69" />
-      <lineto x="224"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e929957ff4:-7fc6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.8"
-      destPortFig="Fig1.8"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig3.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="82"
-              y="109" />
-      <lineto x="224"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e929957ff4:-7fc4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.9"
-      destPortFig="Fig1.9"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig4.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="82"
-              y="149" />
-      <lineto x="224"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIFSPropertyTablePreWrite.pgml b/trunk/src/models/POIFSPropertyTablePreWrite.pgml
deleted file mode 100644
index dba9bb2..0000000
--- a/trunk/src/models/POIFSPropertyTablePreWrite.pgml
+++ /dev/null
@@ -1,814 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-8000"
-      name="POIFSPropertyTablePreWrite"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 97, 264]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ffd"
-       shown="0"
-       dynobjects="[a|0|4|false|false, b|0, b|1, b|4]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTable : </text>
-    <rectangle name="Fig0.3"
-      x="54"
-      y="34"
-      width="10"
-      height="240"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="54"
-              y="273" />
-      <lineto x="63"
-              y="273" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="63"
-              y="273" />
-      <lineto x="54"
-              y="273" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="48"
-      y="69"
-      width="21"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="48"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="48"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.9"
-      x="48"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[167, 10, 71, 264]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ffc"
-       shown="0"
-       dynobjects="[a|0|4|false|false, b|0, b|4]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="167"
-      y="10"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="167"
-      y="10"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="167"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Property : </text>
-    <rectangle name="Fig1.3"
-      x="198"
-      y="34"
-      width="10"
-      height="240"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="198"
-              y="273" />
-      <lineto x="207"
-              y="273" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="207"
-              y="273" />
-      <lineto x="198"
-              y="273" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="192"
-      y="69"
-      width="21"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="192"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="192"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[298, 10, 97, 264]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ffb"
-       shown="0"
-       dynobjects="[a|1|3|false|false, b|1, b|2, b|3]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="298"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="298"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="298"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyBlock : </text>
-    <rectangle name="Fig2.3"
-      x="342"
-      y="34"
-      width="10"
-      height="240"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="342"
-              y="273" />
-      <lineto x="351"
-              y="273" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="351"
-              y="273" />
-      <lineto x="342"
-              y="273" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="336"
-      y="109"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="336"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.8"
-      x="336"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.9"
-      x="336"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[455, 180, 97, 94]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ffa"
-       shown="0"
-       dynobjects="[a|3|3|false|false, b|3]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="455"
-      y="180"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.1"
-      x="455"
-      y="180"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="455"
-      y="180"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyBlock : </text>
-    <rectangle name="Fig3.3"
-      x="499"
-      y="204"
-      width="10"
-      height="70"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig3.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="499"
-              y="273" />
-      <lineto x="508"
-              y="273" />
-    </path>
-    <path name="Fig3.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="508"
-              y="273" />
-      <lineto x="499"
-              y="273" />
-    </path>
-    <rectangle name="Fig3.6"
-      x="493"
-      y="204"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.7"
-      x="455"
-      y="189"
-      width="97"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[612, 140, 71, 134]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff9"
-       shown="0"
-       dynobjects="[a|2|2|false|false, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="612"
-      y="140"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.1"
-      x="612"
-      y="140"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="612"
-      y="140"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Property : </text>
-    <rectangle name="Fig4.3"
-      x="643"
-      y="164"
-      width="10"
-      height="110"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig4.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="643"
-              y="273" />
-      <lineto x="652"
-              y="273" />
-    </path>
-    <path name="Fig4.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="652"
-              y="273" />
-      <lineto x="643"
-              y="273" />
-    </path>
-    <rectangle name="Fig4.6"
-      x="637"
-      y="164"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.7"
-      x="612"
-      y="149"
-      width="71"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig5.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[69, 52, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig5.1.0"
-      context=""
-      x="69"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : setIndex (for each Property)</text>
-  </group>
-  <group name="Fig6.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[134, 92, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig6.1.0"
-      context=""
-      x="134"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : createPropertyBlockArray</text>
-  </group>
-  <group name="Fig7.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[416, 132, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig7.1.0"
-      context=""
-      x="416"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create (enough so we have a multiple of 4 properties)</text>
-  </group>
-  <group name="Fig8.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[346, 172, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff1"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig8.1.0"
-      context=""
-      x="346"
-      y="172"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create (1 for every 4 properties)</text>
-  </group>
-  <group name="Fig9.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[69, 212, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7fef"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig9.1.0"
-      context=""
-      x="69"
-      y="212"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : preWrite (for each Property)</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig5.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="69"
-              y="69" />
-      <lineto x="192"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.8"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig6.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="69"
-              y="109" />
-      <lineto x="336"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.8"
-      destPortFig="Fig4.7"
-      sourceFigNode="Fig2"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig7.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="357"
-              y="149" />
-      <lineto x="612"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.9"
-      destPortFig="Fig3.7"
-      sourceFigNode="Fig2"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="357"
-              y="189" />
-      <lineto x="455"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7ff0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.9"
-      destPortFig="Fig1.8"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="69"
-              y="229" />
-      <lineto x="192"
-              y="229" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIFSRootPropertyPreWrite.pgml b/trunk/src/models/POIFSRootPropertyPreWrite.pgml
deleted file mode 100644
index 829e8d3..0000000
--- a/trunk/src/models/POIFSRootPropertyPreWrite.pgml
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-8000"
-      name="POIFSRootPropertyPreWrite"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 93, 184]"
-       href="127-0-0-1-497f6:e8f35b320f:-7fee"
-       shown="0"
-       dynobjects="[a|0|2|false|false, b|1, b|0, b|1, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig0"
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="93"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="93"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >RootProperty : </text>
-    <rectangle name="Fig0.3"
-      x="52"
-      y="34"
-      width="10"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="52"
-              y="193" />
-      <lineto x="61"
-              y="193" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="61"
-              y="193" />
-      <lineto x="52"
-              y="193" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="46"
-      y="69"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="46"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="46"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.9"
-      x="46"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.10"
-      x="46"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[163, 10, 71, 184]"
-       href="127-0-0-1-497f6:e8f35b320f:-7fed"
-       shown="0"
-       dynobjects="[a|1|2|false|false, b|1, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig1"
-    </private>
-    <rectangle name="Fig1.0"
-      x="163"
-      y="10"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="163"
-      y="10"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="163"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Property : </text>
-    <rectangle name="Fig1.3"
-      x="194"
-      y="34"
-      width="10"
-      height="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="194"
-              y="193" />
-      <lineto x="203"
-              y="193" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="203"
-              y="193" />
-      <lineto x="194"
-              y="193" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="188"
-      y="109"
-      width="21"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="188"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="188"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[66, 92, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7fe7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig2.1.0"
-      context=""
-      x="66"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : setNextFile</text>
-  </group>
-  <group name="Fig3.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[59, 54, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7fe5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig3.1.0"
-      context=""
-      x="59"
-      y="54"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : set _child_property</text>
-  </group>
-  <group name="Fig4.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[66, 132, 111, 14]"
-       href="127-0-0-1-497f6:e8f35b320f:-7fe3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig4.1.0"
-      context=""
-      x="66"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : setPreviousFile</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7fe8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig2.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="67"
-              y="109" />
-      <lineto x="188"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7fe6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.8"
-      destPortFig="Fig0.9"
-      sourceFigNode="Fig0"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig3.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="67"
-              y="69" />
-      <lineto x="104"
-              y="48" />
-      <lineto x="104"
-              y="88" />
-      <lineto x="67"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f35b320f:-7fe4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.10"
-      destPortFig="Fig1.8"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig4.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="67"
-              y="149" />
-      <lineto x="188"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIFSWriteFilesystem.pgml b/trunk/src/models/POIFSWriteFilesystem.pgml
deleted file mode 100644
index 1a01965..0000000
--- a/trunk/src/models/POIFSWriteFilesystem.pgml
+++ /dev/null
@@ -1,1258 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-8000"
-      name="POIFSWriteFilesystem"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 82, 464]"
-       href="127-0-0-1-497f6:e8f6657b00:-7ffa"
-       shown="0"
-       dynobjects="[a|0|9|false|false, b|0, b|2, b|3, b|4, b|5, b|6, b|8, b|9, b|1, b|7]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig0"
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="82"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Filesystem : </text>
-    <rectangle name="Fig0.3"
-      x="47"
-      y="34"
-      width="10"
-      height="440"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="47"
-              y="473" />
-      <lineto x="56"
-              y="473" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="56"
-              y="473" />
-      <lineto x="47"
-              y="473" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="41"
-      y="69"
-      width="21"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="41"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="41"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.9"
-      x="41"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.10"
-      x="41"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.11"
-      x="41"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.12"
-      x="41"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.13"
-      x="41"
-      y="389"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.14"
-      x="41"
-      y="429"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.15"
-      x="41"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.16"
-      x="41"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[152, 10, 97, 464]"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff9"
-       shown="0"
-       dynobjects="[a|0|0|false|false, b|0]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig1"
-    </private>
-    <rectangle name="Fig1.0"
-      x="152"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="152"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="152"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTable : </text>
-    <rectangle name="Fig1.3"
-      x="196"
-      y="34"
-      width="10"
-      height="440"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="196"
-              y="473" />
-      <lineto x="205"
-              y="473" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="205"
-              y="473" />
-      <lineto x="196"
-              y="473" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="190"
-      y="69"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="190"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[309, 10, 92, 464]"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff8"
-       shown="0"
-       dynobjects="[a|2|4|false|false, b|2, b|4]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig2"
-    </private>
-    <rectangle name="Fig2.0"
-      x="309"
-      y="10"
-      width="92"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="309"
-      y="10"
-      width="92"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="309"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BATManaged : </text>
-    <rectangle name="Fig2.3"
-      x="351"
-      y="34"
-      width="10"
-      height="440"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="351"
-              y="473" />
-      <lineto x="360"
-              y="473" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="360"
-              y="473" />
-      <lineto x="351"
-              y="473" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="345"
-      y="149"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="345"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.8"
-      x="345"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[461, 100, 131, 374]"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff7"
-       shown="0"
-       dynobjects="[a|1|5|false|false, b|3, b|5, b|1]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig3"
-    </private>
-    <rectangle name="Fig3.0"
-      x="461"
-      y="100"
-      width="131"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.1"
-      x="461"
-      y="100"
-      width="131"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="461"
-      y="100"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BlockAllocationTable : </text>
-    <rectangle name="Fig3.3"
-      x="522"
-      y="124"
-      width="10"
-      height="350"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig3.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="522"
-              y="473" />
-      <lineto x="531"
-              y="473" />
-    </path>
-    <path name="Fig3.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="531"
-              y="473" />
-      <lineto x="522"
-              y="473" />
-    </path>
-    <rectangle name="Fig3.6"
-      x="516"
-      y="124"
-      width="21"
-      height="145"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.7"
-      x="516"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.8"
-      x="516"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.9"
-      x="461"
-      y="109"
-      width="131"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[652, 10, 91, 464]"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff6"
-       shown="0"
-       dynobjects="[a|6|8|false|false, b|6, b|8, b|7]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig4"
-    </private>
-    <rectangle name="Fig4.0"
-      x="652"
-      y="10"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.1"
-      x="652"
-      y="10"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="652"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HeaderBlock : </text>
-    <rectangle name="Fig4.3"
-      x="693"
-      y="34"
-      width="10"
-      height="440"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig4.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="693"
-              y="473" />
-      <lineto x="702"
-              y="473" />
-    </path>
-    <path name="Fig4.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="702"
-              y="473" />
-      <lineto x="693"
-              y="473" />
-    </path>
-    <rectangle name="Fig4.6"
-      x="687"
-      y="309"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.7"
-      x="687"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.8"
-      x="687"
-      y="389"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.9"
-      x="687"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[803, 10, 96, 464]"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff5"
-       shown="0"
-       dynobjects="[a|9|9|false|false, b|9]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig5"
-    </private>
-    <rectangle name="Fig5.0"
-      x="803"
-      y="10"
-      width="96"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.1"
-      x="803"
-      y="10"
-      width="96"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="803"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BlockWritable : </text>
-    <rectangle name="Fig5.3"
-      x="847"
-      y="34"
-      width="10"
-      height="440"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig5.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="847"
-              y="473" />
-      <lineto x="856"
-              y="473" />
-    </path>
-    <path name="Fig5.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="856"
-              y="473" />
-      <lineto x="847"
-              y="473" />
-    </path>
-    <rectangle name="Fig5.6"
-      x="841"
-      y="429"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.7"
-      x="841"
-      y="429"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig6.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[64, 52, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig6.1.0"
-      context=""
-      x="64"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : preWrite</text>
-  </group>
-  <group name="Fig7.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[134, 132, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7fef"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig7.1.0"
-      context=""
-      x="134"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : countBlocks</text>
-  </group>
-  <group name="Fig8.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[211, 172, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7fed"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig8.1.0"
-      context=""
-      x="211"
-      y="172"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : allocateSpace</text>
-  </group>
-  <group name="Fig9.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[134, 212, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7feb"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig9.1.0"
-      context=""
-      x="134"
-      y="212"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : setStartBlock</text>
-  </group>
-  <group name="Fig10.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[211, 252, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7fe9"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig10.1.0"
-      context=""
-      x="211"
-      y="252"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : createBlocks</text>
-  </group>
-  <group name="Fig11.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[288, 292, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7fe7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig11.1.0"
-      context=""
-      x="288"
-      y="292"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : setBatBlocks</text>
-  </group>
-  <group name="Fig12.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[288, 372, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7fe5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig12.1.0"
-      context=""
-      x="288"
-      y="372"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : setPropertyStart</text>
-  </group>
-  <group name="Fig13.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[357, 412, 111, 14]"
-       href="127-0-0-1-497f6:e8f6657b00:-7fe3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig13.1.0"
-      context=""
-      x="357"
-      y="412"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : writeBlocks</text>
-  </group>
-  <group name="Fig14.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[186, 92, 111, 14]"
-       href="127-0-0-1-5b0da1:e8f6a416d0:-7ffc"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig14.1.0"
-      context=""
-      x="186"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create</text>
-  </group>
-  <group name="Fig15.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[288, 332, 111, 14]"
-       href="127-0-0-1-b3e62:e8fe06844b:-7ffc"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig15.1.0"
-      context=""
-      x="288"
-      y="332"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : setXBATStart</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig6.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="69" />
-      <lineto x="190"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7ff0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.8"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig7.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="149" />
-      <lineto x="345"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7fee"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.9"
-      destPortFig="Fig3.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="189" />
-      <lineto x="516"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7fec"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.10"
-      destPortFig="Fig2.8"
-      sourceFigNode="Fig0"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="229" />
-      <lineto x="345"
-              y="229" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7fea"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.11"
-      destPortFig="Fig3.8"
-      sourceFigNode="Fig0"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="269" />
-      <lineto x="516"
-              y="269" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7fe8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.12"
-      destPortFig="Fig4.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="309" />
-      <lineto x="687"
-              y="309" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7fe6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.13"
-      destPortFig="Fig4.8"
-      sourceFigNode="Fig0"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="389" />
-      <lineto x="687"
-              y="389" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-497f6:e8f6657b00:-7fe4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.14"
-      destPortFig="Fig5.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="429" />
-      <lineto x="841"
-              y="429" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-5b0da1:e8f6a416d0:-7ffd"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.15"
-      destPortFig="Fig3.9"
-      sourceFigNode="Fig0"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="109" />
-      <lineto x="461"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="127-0-0-1-b3e62:e8fe06844b:-7ffd"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.16"
-      destPortFig="Fig4.9"
-      sourceFigNode="Fig0"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="62"
-              y="349" />
-      <lineto x="687"
-              y="349" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/POIUseCases.pgml b/trunk/src/models/POIUseCases.pgml
deleted file mode 100644
index ee5a002..0000000
--- a/trunk/src/models/POIUseCases.pgml
+++ /dev/null
@@ -1,1006 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.use_case.ui.UMLUseCaseDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffd"
-      name="POIUseCases"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.use_case.ui.FigActor[40, 128, 58, 75]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig0.0"
-      x="69"
-      y="143"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-8355712"
-      stroke="1"
-      strokecolor="-8355712"
-    />
-    <ellipse name="Fig0.1"
-      x="69"
-      y="143"
-      rx="10"
-      ry="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.2"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="69"
-              y="153" />
-      <lineto x="69"
-              y="173" />
-    </path>
-    <path name="Fig0.3"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="59"
-              y="163" />
-      <lineto x="79"
-              y="163" />
-    </path>
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="69"
-              y="173" />
-      <lineto x="64"
-              y="188" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="69"
-              y="173" />
-      <lineto x="74"
-              y="188" />
-    </path>
-    <text name="Fig0.6"
-      context=""
-      x="40"
-      y="189"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ClientApps</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[224, 32, 164, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff6"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig1.0"
-      x="306"
-      y="52"
-      rx="82"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig1.1"
-      x="306"
-      y="52"
-      rx="82"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="269"
-      y="45"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >read existing filesystem</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[232, 192, 154, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig2.0"
-      x="309"
-      y="212"
-      rx="77"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig2.1"
-      x="309"
-      y="212"
-      rx="77"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="272"
-      y="205"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >write file system</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[224, 312, 132, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff4"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig3.0"
-      x="290"
-      y="332"
-      rx="66"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig3.1"
-      x="290"
-      y="332"
-      rx="66"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="253"
-      y="325"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >create new filesystem</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[464, 32, 145, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig4.0"
-      x="536"
-      y="52"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig4.1"
-      x="536"
-      y="52"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="500"
-      y="45"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >read file system directory</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[512, 136, 186, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff2"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig5.0"
-      x="605"
-      y="156"
-      rx="93"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig5.1"
-      x="605"
-      y="156"
-      rx="93"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="568"
-      y="149"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >read existing file from file system</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[560, 200, 156, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff1"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig6.0"
-      x="638"
-      y="220"
-      rx="78"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig6.1"
-      x="638"
-      y="220"
-      rx="78"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="601"
-      y="213"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >write new file to file system</text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[576, 272, 154, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff0"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig7.0"
-      x="653"
-      y="292"
-      rx="77"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig7.1"
-      x="653"
-      y="292"
-      rx="77"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="616"
-      y="285"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >delete file from file system</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[576, 352, 144, 40]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fef"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig8.0"
-      x="648"
-      y="372"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig8.1"
-      x="648"
-      y="372"
-      rx="72"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.2"
-      context=""
-      x="611"
-      y="365"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >replace file in file system</text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[712, 64, 100, 40]"
-       href="127-0-0-1-48570c:e828b4c428:-7ffe"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig9.0"
-      x="762"
-      y="84"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig9.1"
-      x="762"
-      y="84"
-      rx="50"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig9.2"
-      context=""
-      x="725"
-      y="77"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >read file</text>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.use_case.ui.FigUseCase[344, 392, 187, 40]"
-       href="127-0-0-1-48570c:e828b4c428:-7ffa"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <ellipse name="Fig10.0"
-      x="437"
-      y="412"
-      rx="93"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <ellipse name="Fig10.1"
-      x="437"
-      y="412"
-      rx="93"
-      ry="20"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig10.2"
-      context=""
-      x="401"
-      y="405"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >rename existing file in file system</text>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fee"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="79"
-              y="133" />
-      <lineto x="224"
-              y="72" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fed"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="79"
-              y="153" />
-      <lineto x="232"
-              y="192" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fec"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="79"
-              y="153" />
-      <lineto x="224"
-              y="312" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fe2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="312"
-              y="192" />
-      <lineto x="312"
-              y="72" />
-    </path>
-    <annotations>
-        <text name="Fig14.1"
-          context="stereotype"
-          x="274"
-          y="124"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;includes&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fe1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="464"
-              y="32" />
-      <lineto x="388"
-              y="32" />
-    </path>
-    <annotations>
-        <text name="Fig15.1"
-          context="stereotype"
-          x="399"
-          y="34"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fe0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig5.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig5"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="512"
-              y="136" />
-      <lineto x="388"
-              y="72" />
-    </path>
-    <annotations>
-        <text name="Fig16.1"
-          context="stereotype"
-          x="270"
-          y="11"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig17"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fdf"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig6"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig17.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="560"
-              y="232" />
-      <lineto x="386"
-              y="232" />
-    </path>
-    <annotations>
-        <text name="Fig17.1"
-          context="stereotype"
-          x="446"
-          y="234"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig18"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fde"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig7.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig7"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig18.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="576"
-              y="272" />
-      <lineto x="386"
-              y="232" />
-    </path>
-    <annotations>
-        <text name="Fig18.1"
-          context="stereotype"
-          x="309"
-          y="167"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig19"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fdd"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig8.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig8"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig19.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="576"
-              y="352" />
-      <lineto x="386"
-              y="232" />
-    </path>
-    <annotations>
-        <text name="Fig19.1"
-          context="stereotype"
-          x="426"
-          y="273"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig20"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="-64--88-1-2-717d91:e7db573623:-7fe0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig20.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="285"
-              y="232" />
-      <lineto x="285"
-              y="312" />
-    </path>
-    <annotations>
-        <text name="Fig20.1"
-          context="stereotype"
-          x="268"
-          y="264"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-  <group name="Fig21"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-48570c:e828b4c428:-7ffc"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig9.0"
-      destPortFig="Fig4.0"
-      sourceFigNode="Fig9"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig21.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="712"
-              y="72" />
-      <lineto x="609"
-              y="72" />
-    </path>
-    <annotations>
-        <text name="Fig21.1"
-          context="srcRole"
-          x="662"
-          y="49"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >uses</text>
-    </annotations>
-  </group>
-  <group name="Fig22"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-48570c:e828b4c428:-7ffb"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig9.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig9"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig22.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="712"
-              y="104" />
-      <lineto x="698"
-              y="136" />
-    </path>
-    <annotations>
-        <text name="Fig22.1"
-          context="srcRole"
-          x="700"
-          y="99"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >uses</text>
-    </annotations>
-  </group>
-  <group name="Fig23"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-48570c:e828b4c428:-7ff9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig10.0"
-      destPortFig="Fig2.0"
-      sourceFigNode="Fig10"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig23.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="386"
-              y="392" />
-      <lineto x="386"
-              y="232" />
-    </path>
-    <annotations>
-        <text name="Fig23.1"
-          context="stereotype"
-          x="349"
-          y="304"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >&lt;&lt;extends&gt;&gt;</text>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/PropertyTableClassDiagram.pgml b/trunk/src/models/PropertyTableClassDiagram.pgml
deleted file mode 100644
index de6ae19..0000000
--- a/trunk/src/models/PropertyTableClassDiagram.pgml
+++ /dev/null
@@ -1,818 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffe"
-      name="PropertyTableClassDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[56, 168, 192, 389]"
-       href="127-0-0-1-497f6:e8c840c12f:-7ffd"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="56"
-      y="168"
-      width="192"
-      height="388"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig0.2"
-      context=""
-      x="56"
-      y="168"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog.italic"
-      textsize="9"
-    >Property</text>
-    <rectangle name="Fig0.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig0.4"
-      context=""
-      x="56"
-      y="188"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_name : String
--_name_size : ShortField
--_property_type : ByteField
--_storage_type : ByteField
--_previous_property : IntegerField
--_next_property : IntegerField
--_child_property : IntegerField
--_seconds_1 : IntegerField
--_days_1 : IntegerField
--_seconds_2 : IntegerField
--_days_2 : IntegerField
--_start_block : IntegerField
--_size : IntegerField
--_raw_data[ 128 ] : byte
--_index : int
-+PROPERTY_SIZE : int = 128
-#_NO_INDEX : int = -1
-#_DIRECTORY_TYPE : byte = 1
-#_DOCUMENT_TYPE : byte = 2
-#_ROOT_TYPE : byte = 5
-#_BIG_BLOCK_STORAGE : byte = 1
-#_SMALL_BLOCK_STORAGE : byte = 0
--_next_file : File
--_previous_file : File</text>
-    <text name="Fig0.5"
-      context=""
-      x="56"
-      y="432"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >#setIndex(in index:int)
-#preWrite()
-#getIndex() : int
-+setStartBlock(in startBlock:int)
-#Property()
-#setName(in name:String)
-#setPropertyType(in propertyType:byte)
-#setStorageType(in storageType:byte)
-#setChildProperty(in child:int)
-#getChildProperty() : int
-#setSize(in size:int)
-#shouldUseSmallBlocks() : boolean</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[328, 288, 90, 40]"
-       href="127-0-0-1-497f6:e8c85b337f:-7ffb"
-       shown="3"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="328"
-      y="288"
-      width="90"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.2"
-      context=""
-      x="328"
-      y="288"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >RootProperty</text>
-    <rectangle name="Fig1.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig1.4"
-      context=""
-      x="328"
-      y="308"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_children : List</text>
-    <text name="Fig1.5"
-      context=""
-      x="328"
-      y="328"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[288, 240, 236, 40]"
-       href="127-0-0-1-497f6:e8c85b337f:-7ffa"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="288"
-      y="240"
-      width="236"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.2"
-      context=""
-      x="288"
-      y="240"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >DocumentProperty</text>
-    <rectangle name="Fig2.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig2.4"
-      context=""
-      x="288"
-      y="260"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.5"
-      context=""
-      x="288"
-      y="260"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+DocumentProperty(in name:String, in size:int)</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[288, 160, 293, 61]"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff6"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="288"
-      y="160"
-      width="293"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig3.2"
-      context=""
-      x="288"
-      y="160"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyBlock</text>
-    <rectangle name="Fig3.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig3.4"
-      context=""
-      x="288"
-      y="180"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_properties[ 4 ] : Property</text>
-    <text name="Fig3.5"
-      context=""
-      x="288"
-      y="200"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createPropertyBlockArray(in properties:List) : BlockWritable</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[96, 16, 169, 109]"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff1"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="96"
-      y="16"
-      width="169"
-      height="108"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.2"
-      context=""
-      x="96"
-      y="16"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTable</text>
-    <rectangle name="Fig4.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig4.4"
-      context=""
-      x="96"
-      y="36"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-_properties : List
--_blocks[ ] : BlockWritable
--_start_block : int</text>
-    <text name="Fig4.5"
-      context=""
-      x="96"
-      y="70"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getRoot() : Directory
-+addProperty(in property:Property)
-+preWrite()
-+PropertyTable()
-+getStartBlock() : int</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.static_structure.ui.FigInterface[288, 472, 144, 72]"
-       href="127-0-0-1-497f6:e8c85b337f:-7fe2"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig5.0"
-      x="289"
-      y="473"
-      width="142"
-      height="70"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.1"
-      x="288"
-      y="472"
-      width="144"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="289"
-      y="473"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >&lt;&lt;Interface&gt;&gt;</text>
-    <text name="Fig5.3"
-      context=""
-      x="289"
-      y="483"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >File</text>
-    <text name="Fig5.4"
-      context=""
-      x="288"
-      y="495"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getNextFile() : File
-+setNextFile(in file:File)
-+getPreviousFile() : File
-+setPreviousFile(in file:File)</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.static_structure.ui.FigInterface[288, 368, 154, 64]"
-       href="127-0-0-1-497f6:e8c85b337f:-7fd8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig6.0"
-      x="289"
-      y="369"
-      width="152"
-      height="62"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.1"
-      x="288"
-      y="368"
-      width="154"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="289"
-      y="369"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >&lt;&lt;Interface&gt;&gt;</text>
-    <text name="Fig6.3"
-      context=""
-      x="289"
-      y="379"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Directory</text>
-    <text name="Fig6.4"
-      context=""
-      x="288"
-      y="391"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getChildren() : Iterator
-+addChild(in property:Property)</text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig7.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="328"
-              y="304" />
-      <lineto x="248"
-              y="304" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff7"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="288"
-              y="256" />
-      <lineto x="248"
-              y="256" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig3.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig3"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="288"
-              y="192" />
-      <lineto x="248"
-              y="192" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8c85b337f:-7ff0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig3.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="265"
-              y="56" />
-      <lineto x="328"
-              y="56" />
-      <lineto x="328"
-              y="160" />
-    </path>
-    <annotations>
-        <text name="Fig10.1"
-          context="destMult"
-          x="262"
-          y="42"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >1..*</text>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-497f6:e8c85b337f:-7fec"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="176"
-              y="124" />
-      <lineto x="176"
-              y="168" />
-    </path>
-    <annotations>
-        <text name="Fig11.1"
-          context="destMult"
-          x="176"
-          y="141"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >1..*</text>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-497f6:e8c85b337f:-7fd3"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig6"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="409"
-              y="431" />
-      <lineto x="409"
-              y="473" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-497f6:e8c85b337f:-7fd2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig6.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig6"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="368"
-              y="328" />
-      <lineto x="368"
-              y="369" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-497f6:e8f35b320f:-7fe2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig0"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="248"
-              y="512" />
-      <lineto x="289"
-              y="512" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/analysismain.pgml b/trunk/src/models/analysismain.pgml
deleted file mode 100644
index 5e2ca17..0000000
--- a/trunk/src/models/analysismain.pgml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|-64--88-1-2-717d91:e7cd986e07:-7fff"
-      name="analysismain"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigPackage[128, 32, 140, 100]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ffd"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="129"
-      y="33"
-      width="138"
-      height="98"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.1"
-      context=""
-      x="128"
-      y="32"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >POI</text>
-    <text name="Fig0.2"
-      context=""
-      x="128"
-      y="47"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="serif"
-      textsize="10"
-    ></text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigPackage[120, 216, 140, 100]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ffc"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="121"
-      y="217"
-      width="138"
-      height="98"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="120"
-      y="216"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HSSF</text>
-    <text name="Fig1.2"
-      context=""
-      x="120"
-      y="231"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="serif"
-      textsize="10"
-    ></text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigPackage[408, 224, 151, 100]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ffb"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="409"
-      y="225"
-      width="149"
-      height="98"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.1"
-      context=""
-      x="408"
-      y="224"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HSSFSerializer</text>
-    <text name="Fig2.2"
-      context=""
-      x="408"
-      y="239"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="serif"
-      textsize="10"
-    ></text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.ui.FigDependency"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig3.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="472"
-              y="264" />
-      <lineto x="200"
-              y="264" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.ui.FigDependency"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ff8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig1"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig4.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="211"
-              y="217" />
-      <lineto x="211"
-              y="131" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/poi.argo b/trunk/src/models/poi.argo
deleted file mode 100644
index 80c189b..0000000
--- a/trunk/src/models/poi.argo
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version = "1.0" encoding = "ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE argo SYSTEM "argo.dtd" >
-<argo>
-  <documentation>
-    <authorname></authorname>
-    <version></version>
-    <description>
-      
-    </description>
-  </documentation>
-  
-  <searchpath href="PROJECT_DIR" />
-  <member
-    type="xmi"
-    name="poi.xmi"
-  />
-  <member
-    type="pgml"
-    name="POIFSClassDiagram.pgml"
-  />
-  <member
-    type="pgml"
-    name="projectmain.pgml"
-  />
-  <member
-    type="pgml"
-    name="readFileFromFilesystemSequenceDiagram.pgml"
-  />
-  <member
-    type="pgml"
-    name="readFileSystemDirectorySequenceDiagram.pgml"
-  />
-  <member
-    type="pgml"
-    name="writeFilesystemSequenceDiagram.pgml"
-  />
-  <member
-    type="pgml"
-    name="poifsAnalysisClasses.pgml"
-  />
-  <member
-    type="pgml"
-    name="POIFSInitialization.pgml"
-  />
-  <member
-    type="pgml"
-    name="HSSFOperationalUseCases.pgml"
-  />
-  <member
-    type="pgml"
-    name="HSSFSerializerUseCases.pgml"
-  />
-  <member
-    type="pgml"
-    name="HSSFUseCases.pgml"
-  />
-  <member
-    type="pgml"
-    name="POIUseCases.pgml"
-  />
-  <member
-    type="pgml"
-    name="analysismain.pgml"
-  />
-  <member
-    type="pgml"
-    name="readFilesystemSequenceDiagram.pgml"
-  />
-  <member
-    type="pgml"
-    name="PropertyTableClassDiagram.pgml"
-  />
-  <member
-    type="pgml"
-    name="utilClasses.pgml"
-  />
-  <member
-    type="pgml"
-    name="POIFSAddDocument.pgml"
-  />
-  <member
-    type="pgml"
-    name="BlockClassDiagram.pgml"
-  />
-  <member
-    type="pgml"
-    name="POIFSPropertyTablePreWrite.pgml"
-  />
-  <member
-    type="pgml"
-    name="POIFSRootPropertyPreWrite.pgml"
-  />
-  <member
-    type="pgml"
-    name="POIFSWriteFilesystem.pgml"
-  />
-  <member
-    type="pgml"
-    name="POIFSLifeCycle.pgml"
-  />
-  <member
-    type="pgml"
-    name="HSSFSerializerClassDiagram.pgml"
-  />
-  <historyfile name="" />
-  <stats>
-    {}
-  </stats>
-</argo>
diff --git a/trunk/src/models/poi.xmi b/trunk/src/models/poi.xmi
deleted file mode 100644
index 5feadac..0000000
--- a/trunk/src/models/poi.xmi
+++ /dev/null
@@ -1,19132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<XMI xmi.version="1.0">
-  <XMI.header>
-    <XMI.documentation>
-      <XMI.exporter>Novosoft UML Library</XMI.exporter>
-      <XMI.exporterVersion>0.4.19</XMI.exporterVersion>
-    </XMI.documentation>
-    <XMI.metamodel xmi.name="UML" xmi.version="1.3"/>
-  </XMI.header>
-  <XMI.content>
-    <Model_Management.Model xmi.id="xmi.1" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-8000">
-      <Foundation.Core.ModelElement.name>project</Foundation.Core.ModelElement.name>
-      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-      <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-      <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-      <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-      <Foundation.Core.Namespace.ownedElement>
-        <Model_Management.Package xmi.id="xmi.2" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fff">
-          <Foundation.Core.ModelElement.name>analysisModel</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Foundation.Core.Namespace.ownedElement>
-            <Model_Management.Package xmi.id="xmi.3" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ffd">
-              <Foundation.Core.ModelElement.name>POI</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.2"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.supplierDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.4"/>
-              </Foundation.Core.ModelElement.supplierDependency>
-              <Foundation.Core.Namespace.ownedElement>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.5" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff6">
-                  <Foundation.Core.ModelElement.name>read existing filesystem</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.6"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.7"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.8"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                  <Foundation.Core.Namespace.ownedElement>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.9">
-                      <Foundation.Core.ModelElement.name>create the filesystem</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.10"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.10" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7fd8">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.11"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.13"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.9"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.14">
-                      <Foundation.Core.ModelElement.name>read all bytes</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.15"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.15" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7ff0">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.16"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.17"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.14"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.18">
-                      <Foundation.Core.ModelElement.name>create a header block from first 512 bytes</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.19"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.19" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7fee">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.20"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.21"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.18"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.22">
-                      <Foundation.Core.ModelElement.name>create blocks from all blocks that are not header,bat or property blocks</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.23"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.23" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7fec">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.24"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.25"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.22"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.26">
-                      <Foundation.Core.ModelElement.name>create bat blocks from bytes that are in bat</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.27"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.27" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7fea">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.28"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.29"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.26"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.30">
-                      <Foundation.Core.ModelElement.name>create property table  blocks from bytes starting at header.rootstartblock</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.31"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.31" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7fe8">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.32"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.33"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.30"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.34">
-                      <Foundation.Core.ModelElement.name>assign BAT Blocks to the BAT</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.35"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.35" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd4">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.36"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.37"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.34"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.38">
-                      <Foundation.Core.ModelElement.name>derive property instances from the Property Table Blocks and add them to the property table</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.39"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.39" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd1">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.40"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.41"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.38"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.11" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7fda">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.43"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.10"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.12" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7fdb">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.44"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.45"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.46"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.47"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.48"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.49"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.50"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.51"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.52"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.15"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.19"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.23"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.27"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.31"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.35"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.39"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.10"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.16" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7fe0">
-                      <Foundation.Core.ModelElement.name>InputStream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.54"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.15"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.20" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7ffd">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.55"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.56"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.19"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.24" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7ff8">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.57"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.58"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.23"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.28" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7ff3">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.59"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.60"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.27"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.32" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7ff2">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.61"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.62"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.31"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.36" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd6">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.64"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.35"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.40" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd3">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.65"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.66"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.39"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.13" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7fd9">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.10"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.43">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.11"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.13"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.45">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.13"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.17" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7ff1">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.15"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.46">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.17"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.54">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.16"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.17"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.21" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7fef">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.19"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.47">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.21"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.56">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.20"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.21"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.25" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7fed">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.23"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.48">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.25"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.58">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.24"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.25"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.29" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7feb">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.27"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.49">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.29"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.60">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.28"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.29"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.33" xmi.uuid="-64--88-1-2-1d2066:e847bc33df:-7fe9">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.31"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.50">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.33"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.62">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.32"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.33"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.37" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd5">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.35"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.51">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.37"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.64">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.36"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.37"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.41" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd2">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.5"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.39"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.52">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.12"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.41"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.66">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.40"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.41"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                  </Foundation.Core.Namespace.ownedElement>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.67" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff5">
-                  <Foundation.Core.ModelElement.name>write file system</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.6"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.68"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.69"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.70"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.71"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.72"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                  <Foundation.Core.Namespace.ownedElement>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.73">
-                      <Foundation.Core.ModelElement.name>createFileSystem</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.74"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.74" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ff5">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.75"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.77"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.73"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.78">
-                      <Foundation.Core.ModelElement.name>createHeaderBlock</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.79"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.79" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ff3">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.80"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.81"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.78"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.82">
-                      <Foundation.Core.ModelElement.name>createBlock [until all files have blocks]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.83"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.83" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7feb">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.84"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.85"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.82"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.86">
-                      <Foundation.Core.ModelElement.name>create a record [until all files have records]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.87"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.87" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ff8">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.89"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.86"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.90">
-                      <Foundation.Core.ModelElement.name>create bat block [if need more]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.91"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.91" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ff4">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.92"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.93"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.90"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.94">
-                      <Foundation.Core.ModelElement.name>create a record [until all files have records]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.95"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.95" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ff2">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.97"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.94"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.98">
-                      <Foundation.Core.ModelElement.name>get the bat array info</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.99"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.99" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe7">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.100"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.98"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.101">
-                      <Foundation.Core.ModelElement.name>get the extended bat array info</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.102"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.102" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe5">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.103"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.101"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.104">
-                      <Foundation.Core.ModelElement.name>set the bat  info</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.105"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.105" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe3">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.80"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.106"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.104"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.107">
-                      <Foundation.Core.ModelElement.name>set the extended bat info</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.108"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.108" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe1">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.80"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.109"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.107"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.110">
-                      <Foundation.Core.ModelElement.name>create a block [if needed]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.111"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.111" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fdf">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.112"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.113"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.110"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.114">
-                      <Foundation.Core.ModelElement.name>create a property</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.115"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.115" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fdd">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.116"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.117"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.114"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.118">
-                      <Foundation.Core.ModelElement.name>add the propert to the block</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.119"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.119" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd9">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.112"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.120"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.118"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.121">
-                      <Foundation.Core.ModelElement.name>write all blocks to stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.122"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.122" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd7">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.75"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.123"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.124"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.121"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.75" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ffd">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.125"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.126"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.74"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.122"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.76" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ffc">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.44"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.127"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.128"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.129"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.130"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.131"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.132"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.133"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.134"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.135"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.79"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.83"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.87"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.95"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.99"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.102"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.105"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.108"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.74"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.80" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ffa">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.55"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.136"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.137"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.138"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.79"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.105"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.108"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.84" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ff9">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.57"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.139"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.83"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.88" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ffd">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.140"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.141"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.142"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.143"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.91"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.87"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.99"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.102"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.92" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ff8">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.59"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.144"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.91"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.96" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ffc">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.65"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.145"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.146"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.147"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.148"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.111"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.115"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.119"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.95"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.112" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ff7">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.61"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.149"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.150"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.111"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.119"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.116" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fef">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.151"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.152"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.115"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.123" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ffb">
-                      <Foundation.Core.ModelElement.name>OutputStream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.153"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.122"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.77" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ff6">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.74"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.125">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.75"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.77"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.127">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.77"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.81" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7ff4">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.79"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.128">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.81"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.136">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.80"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.81"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.85" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fec">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.83"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.129">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.85"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.139">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.84"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.85"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.89" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ff9">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.87"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.130">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.89"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.140">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.89"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.93" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ff5">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.91"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.141">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.93"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.144">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.92"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.93"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.97" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7ff3">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.95"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.131">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.97"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.145">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.97"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.100" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe8">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.99"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.132">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.100"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.142">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.100"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.103" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe6">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.102"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.133">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.103"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.143">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.88"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.103"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.106" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe4">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.105"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.134">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.106"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.137">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.80"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.106"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.109" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe2">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.108"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.135">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.76"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.109"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.138">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.80"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.109"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.113" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fe0">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.111"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.146">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.113"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.149">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.112"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.113"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.117" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fde">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.115"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.147">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.117"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.152">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.116"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.117"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.120" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fda">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.119"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.148">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.96"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.120"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.150">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.112"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.120"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.124" xmi.uuid="10-10-101-65-3b05de:e851e2ad5c:-7fd8">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.67"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.122"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.126">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.75"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.124"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.153">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.123"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.124"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                  </Foundation.Core.Namespace.ownedElement>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.154" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff3">
-                  <Foundation.Core.ModelElement.name>read file system directory</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.7"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                  <Foundation.Core.Namespace.ownedElement>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.155">
-                      <Foundation.Core.ModelElement.name>requests directory listing</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.156"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.156" xmi.uuid="10-10-101-65-3b05de:e8524685c9:-7ff9">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.157"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.158"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.159"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.155"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.160">
-                      <Foundation.Core.ModelElement.name>enumerates properties</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.161"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.161" xmi.uuid="10-10-101-65-3b05de:e8524685c9:-7ff7">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.158"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.162"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.163"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.160"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.157" xmi.uuid="10-10-101-65-3b05de:e8524685c9:-7ffd">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.164"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.156"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.158" xmi.uuid="10-10-101-65-3b05de:e8524685c9:-7ffc">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.44"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.165"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.166"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.161"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.156"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.162" xmi.uuid="10-10-101-65-3b05de:e8524685c9:-7ffb">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.65"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.167"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.161"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.159" xmi.uuid="10-10-101-65-3b05de:e8524685c9:-7ffa">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.156"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.164">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.157"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.159"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.165">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.158"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.159"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.163" xmi.uuid="10-10-101-65-3b05de:e8524685c9:-7ff8">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.154"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.161"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.166">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.158"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.163"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.167">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.162"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.163"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                  </Foundation.Core.Namespace.ownedElement>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.168" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff2">
-                  <Foundation.Core.ModelElement.name>read existing file from file system</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.8"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                  <Foundation.Core.Namespace.ownedElement>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.169">
-                      <Foundation.Core.ModelElement.name>gets property from</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.170"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.170" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ff5">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.172"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.173"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.169"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.174">
-                      <Foundation.Core.ModelElement.name>gets property from</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.175"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.175" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ff0">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.172"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.176"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.177"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.174"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.178">
-                      <Foundation.Core.ModelElement.name>gets BAT Chain from</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.179"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.179" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fed">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.180"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.181"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.178"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.182">
-                      <Foundation.Core.ModelElement.name>gets next bat chain element [until all are read]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.183"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.183" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe8">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.180"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.184"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.185"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.182"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.186">
-                      <Foundation.Core.ModelElement.name>gets bytes [from each block in bat chain]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.187"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.187" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe5">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.188"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.189"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.186"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.190">
-                      <Foundation.Core.ModelElement.name>constructs a byte array input stream with file bytes</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.191"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.CallAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.191" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe2">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.192"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.193"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.190"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.SendAction xmi.id="xmi.194">
-                      <Foundation.Core.ModelElement.name>requests file</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="true"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.195"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.SendAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.195" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fde">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.196"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.197"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.194"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.ReturnAction xmi.id="xmi.198">
-                      <Foundation.Core.ModelElement.name>returns input stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="true"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Action.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.199"/>
-                      </Behavioral_Elements.Common_Behavior.Action.stimulus>
-                    </Behavioral_Elements.Common_Behavior.ReturnAction>
-                    <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.199" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fdc">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                        <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.196"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                        <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.200"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-                      <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                        <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.198"/>
-                      </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-                    </Behavioral_Elements.Common_Behavior.Stimulus>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.196" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ffd">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.201"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.202"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.195"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.199"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.171" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ffc">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.44"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.203"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.204"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.205"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.206"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.207"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.208"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.170"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.179"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.187"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.191"/>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.199"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.195"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.172" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ff7">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.65"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.209"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.210"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.175"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.170"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.176" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ff4">
-                      <Foundation.Core.ModelElement.name>PropertyBlock</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.211"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.175"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.180" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fef">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.212"/>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.213"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.183"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.179"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.184" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fec">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.59"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.214"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.183"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.188" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe7">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.57"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.215"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.187"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.192" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe4">
-                      <Foundation.Core.ModelElement.name>ByteArrayInputStream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Instance.classifier>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.classifier>
-                      <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.216"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-                      <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.191"/>
-                      </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-                    </Behavioral_Elements.Common_Behavior.Object>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.173" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ff6">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.170"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.203">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.173"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.209">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.172"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.173"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.177" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7ff1">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.175"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.210">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.172"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.177"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.211">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.176"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.177"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.181" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fee">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.179"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.204">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.181"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.212">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.180"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.181"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.185" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe9">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.183"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.213">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.180"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.185"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.214">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.184"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.185"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.189" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe6">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.187"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.205">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.189"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.215">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.188"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.189"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.193" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fe3">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.191"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.206">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.193"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.216">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.192"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.193"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.197" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fdf">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.195"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.201">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.196"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.197"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.207">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.197"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                    <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.200" xmi.uuid="10-10-101-65-3b05de:e8524f6c3a:-7fdd">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.168"/>
-                      </Foundation.Core.ModelElement.namespace>
-                      <Behavioral_Elements.Common_Behavior.Link.stimulus>
-                        <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.199"/>
-                      </Behavioral_Elements.Common_Behavior.Link.stimulus>
-                      <Behavioral_Elements.Common_Behavior.Link.connection>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.208">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.171"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.200"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                        <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.202">
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.196"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                          <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.200"/>
-                          </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                        </Behavioral_Elements.Common_Behavior.LinkEnd>
-                      </Behavioral_Elements.Common_Behavior.Link.connection>
-                    </Behavioral_Elements.Common_Behavior.Link>
-                  </Foundation.Core.Namespace.ownedElement>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.217" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff0">
-                  <Foundation.Core.ModelElement.name>delete file from file system</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.70"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.218" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fef">
-                  <Foundation.Core.ModelElement.name>replace file in file system</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.71"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Association xmi.id="xmi.219" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fee">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.220" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fff">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.id="xmi.221">
-                          <Foundation.Data_Types.Multiplicity.range>
-                            <Foundation.Data_Types.MultiplicityRange xmi.id="xmi.222">
-                              <Foundation.Data_Types.MultiplicityRange.lower>1</Foundation.Data_Types.MultiplicityRange.lower>
-                              <Foundation.Data_Types.MultiplicityRange.upper>1</Foundation.Data_Types.MultiplicityRange.upper>
-                            </Foundation.Data_Types.MultiplicityRange>
-                          </Foundation.Data_Types.Multiplicity.range>
-                        </Foundation.Data_Types.Multiplicity>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.219"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.223" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ffe">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.219"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.5"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.224" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fed">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.225" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ffd">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.224"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.226" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ffc">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.224"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.67"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.227" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fec">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.228" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ffb">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.227"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.229" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ffa">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.227"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.230"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Generalization xmi.id="xmi.6" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fe2">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.67"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.5"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.7" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fe1">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.154"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.5"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.8" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fe0">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.168"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.5"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.69" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fdf">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.231"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.67"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.70" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fde">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.217"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.67"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.71" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7fdd">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.218"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.67"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.68" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe0">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.67"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.230"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.232" xmi.uuid="127-0-0-1-48570c:e828b4c428:-7ffe">
-                  <Foundation.Core.ModelElement.name>read file</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Association xmi.id="xmi.233" xmi.uuid="127-0-0-1-48570c:e828b4c428:-7ffc">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.234" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff9">
-                      <Foundation.Core.ModelElement.name>uses</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.233"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.232"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.235" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff8">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.233"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.154"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.236" xmi.uuid="127-0-0-1-48570c:e828b4c428:-7ffb">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.237" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff7">
-                      <Foundation.Core.ModelElement.name>uses</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.236"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.232"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.238" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff6">
-                      <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.236"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.168"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.239" xmi.uuid="127-0-0-1-48570c:e828b4c428:-7ffa">
-                  <Foundation.Core.ModelElement.name>rename existing file in file system</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.72"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Generalization xmi.id="xmi.72" xmi.uuid="127-0-0-1-48570c:e828b4c428:-7ff9">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.239"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.67"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Class xmi.id="xmi.44" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ffd">
-                  <Foundation.Core.ModelElement.name>POIFileSystem</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Classifier.feature>
-                    <Foundation.Core.Operation xmi.id="xmi.240" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7fe9">
-                      <Foundation.Core.ModelElement.name>readFileSystem(InputStream in)</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                      <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                      <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.44"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Operation.method>
-                        <Foundation.Core.Method xmi.idref="xmi.241"/>
-                      </Foundation.Core.Operation.method>
-                      <Foundation.Core.BehavioralFeature.parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.242" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7fe8">
-                          <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="return"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.240"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.44"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                      </Foundation.Core.BehavioralFeature.parameter>
-                    </Foundation.Core.Operation>
-                    <Foundation.Core.Method xmi.id="xmi.241">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.44"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Method.specification>
-                        <Foundation.Core.Operation xmi.idref="xmi.240"/>
-                      </Foundation.Core.Method.specification>
-                    </Foundation.Core.Method>
-                  </Foundation.Core.Classifier.feature>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.57" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ffc">
-                  <Foundation.Core.ModelElement.name>Block</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.243"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.244"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.245"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                  <Foundation.Core.Classifier.feature>
-                    <Foundation.Core.Operation xmi.id="xmi.246" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ff7">
-                      <Foundation.Core.ModelElement.name>createBlock(byte[] bytes, int offset, int length)</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                      <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                      <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.57"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Operation.method>
-                        <Foundation.Core.Method xmi.idref="xmi.247"/>
-                      </Foundation.Core.Operation.method>
-                      <Foundation.Core.BehavioralFeature.parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.248" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ff6">
-                          <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="return"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.246"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.57"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                      </Foundation.Core.BehavioralFeature.parameter>
-                    </Foundation.Core.Operation>
-                    <Foundation.Core.Method xmi.id="xmi.247">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.57"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Method.specification>
-                        <Foundation.Core.Operation xmi.idref="xmi.246"/>
-                      </Foundation.Core.Method.specification>
-                    </Foundation.Core.Method>
-                  </Foundation.Core.Classifier.feature>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.55" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ffb">
-                  <Foundation.Core.ModelElement.name>HeaderBlock</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.245"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.59" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ffa">
-                  <Foundation.Core.ModelElement.name>BATBlock</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.243"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.61" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ff9">
-                  <Foundation.Core.ModelElement.name>PropertyTableBlock</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.244"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.151" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ff8">
-                  <Foundation.Core.ModelElement.name>Property</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.249"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.250"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                </Foundation.Core.Class>
-                <Foundation.Core.Generalization xmi.id="xmi.243" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ff5">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.59"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.57"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.244" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ff4">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.61"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.57"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.245" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7ff2">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.55"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.57"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Class xmi.id="xmi.251" xmi.uuid="10-10-101-65-3dcd27:e83d77e2e6:-7feb">
-                  <Foundation.Core.ModelElement.name>RootProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.252"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.63" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fe4">
-                  <Foundation.Core.ModelElement.name>BAT</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Classifier.feature>
-                    <Foundation.Core.Operation xmi.id="xmi.253" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fe0">
-                      <Foundation.Core.ModelElement.name>createRecord</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                      <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                      <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Operation.method>
-                        <Foundation.Core.Method xmi.idref="xmi.254"/>
-                      </Foundation.Core.Operation.method>
-                      <Foundation.Core.BehavioralFeature.parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.255" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fdf">
-                          <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="return"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.253"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.257" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fd5">
-                          <Foundation.Core.ModelElement.name>bytes</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="inout"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.253"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.258"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                      </Foundation.Core.BehavioralFeature.parameter>
-                    </Foundation.Core.Operation>
-                    <Foundation.Core.Method xmi.id="xmi.254">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Method.specification>
-                        <Foundation.Core.Operation xmi.idref="xmi.253"/>
-                      </Foundation.Core.Method.specification>
-                    </Foundation.Core.Method>
-                    <Foundation.Core.Operation xmi.id="xmi.259" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fdd">
-                      <Foundation.Core.ModelElement.name>getBlocks</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                      <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                      <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Operation.method>
-                        <Foundation.Core.Method xmi.idref="xmi.260"/>
-                      </Foundation.Core.Operation.method>
-                      <Foundation.Core.BehavioralFeature.parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.261" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fdc">
-                          <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="return"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.259"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.258"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                      </Foundation.Core.BehavioralFeature.parameter>
-                    </Foundation.Core.Operation>
-                    <Foundation.Core.Method xmi.id="xmi.260">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Method.specification>
-                        <Foundation.Core.Operation xmi.idref="xmi.259"/>
-                      </Foundation.Core.Method.specification>
-                    </Foundation.Core.Method>
-                    <Foundation.Core.Attribute xmi.id="xmi.262" xmi.uuid="10-10-101-65-3dcd27:e851d28ed5:-7ffd">
-                      <Foundation.Core.ModelElement.name>blocks</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                      <Foundation.Core.StructuralFeature.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.id="xmi.263">
-                          <Foundation.Data_Types.Multiplicity.range>
-                            <Foundation.Data_Types.MultiplicityRange xmi.id="xmi.264">
-                              <Foundation.Data_Types.MultiplicityRange.lower>0</Foundation.Data_Types.MultiplicityRange.lower>
-                              <Foundation.Data_Types.MultiplicityRange.upper>-1</Foundation.Data_Types.MultiplicityRange.upper>
-                            </Foundation.Data_Types.MultiplicityRange>
-                          </Foundation.Data_Types.Multiplicity.range>
-                        </Foundation.Data_Types.Multiplicity>
-                      </Foundation.Core.StructuralFeature.multiplicity>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.StructuralFeature.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.59"/>
-                      </Foundation.Core.StructuralFeature.type>
-                    </Foundation.Core.Attribute>
-                  </Foundation.Core.Classifier.feature>
-                </Foundation.Core.Class>
-                <Foundation.Core.Association xmi.id="xmi.265" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fe3">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.266" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fe2">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.265"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.63"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.267" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fe1">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.263"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.265"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.57"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Class xmi.id="xmi.268">
-                  <Foundation.Core.ModelElement.name>void</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.65" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fdb">
-                  <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Classifier.feature>
-                    <Foundation.Core.Operation xmi.id="xmi.269" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fda">
-                      <Foundation.Core.ModelElement.name>createRecord</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                      <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                      <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.65"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Operation.method>
-                        <Foundation.Core.Method xmi.idref="xmi.270"/>
-                      </Foundation.Core.Operation.method>
-                      <Foundation.Core.BehavioralFeature.parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.271" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fd9">
-                          <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="return"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.269"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.268"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.272" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fd8">
-                          <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="inout"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.269"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.274" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fd7">
-                          <Foundation.Core.ModelElement.name>startBlock</Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="inout"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.269"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                          <Foundation.Core.Parameter.type>
-                            <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                          </Foundation.Core.Parameter.type>
-                        </Foundation.Core.Parameter>
-                        <Foundation.Core.Parameter xmi.id="xmi.275" xmi.uuid="10-10-101-65-3dcd27:e851a6400f:-7fd6">
-                          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-                          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                          <Foundation.Core.Parameter.kind xmi.value="inout"/>
-                          <Foundation.Core.Parameter.behavioralFeature>
-                            <Foundation.Core.BehavioralFeature xmi.idref="xmi.269"/>
-                          </Foundation.Core.Parameter.behavioralFeature>
-                        </Foundation.Core.Parameter>
-                      </Foundation.Core.BehavioralFeature.parameter>
-                    </Foundation.Core.Operation>
-                    <Foundation.Core.Method xmi.id="xmi.270">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                      <Foundation.Core.Feature.owner>
-                        <Foundation.Core.Classifier xmi.idref="xmi.65"/>
-                      </Foundation.Core.Feature.owner>
-                      <Foundation.Core.Method.specification>
-                        <Foundation.Core.Operation xmi.idref="xmi.269"/>
-                      </Foundation.Core.Method.specification>
-                    </Foundation.Core.Method>
-                  </Foundation.Core.Classifier.feature>
-                </Foundation.Core.Class>
-                <Foundation.Core.Association xmi.id="xmi.276" xmi.uuid="10-10-101-65-3dcd27:e851d7de74:-7ffd">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.277" xmi.uuid="10-10-101-65-3dcd27:e851d7de74:-7ffc">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                      <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.276"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.61"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.278" xmi.uuid="10-10-101-65-3dcd27:e851d7de74:-7ffb">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.263"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.276"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.151"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Class xmi.id="xmi.279" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7ffd">
-                  <Foundation.Core.ModelElement.name>DirectoryProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.249"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.252"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                </Foundation.Core.Class>
-                <Foundation.Core.Generalization xmi.id="xmi.249" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7ffc">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.279"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.151"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.252" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7ffb">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.251"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.279"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Class xmi.id="xmi.280" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7ffa">
-                  <Foundation.Core.ModelElement.name>FileProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.250"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Foundation.Core.Class>
-                <Foundation.Core.Generalization xmi.id="xmi.250" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7ff2">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.280"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.151"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Association xmi.id="xmi.281" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7ff1">
-                  <Foundation.Core.ModelElement.name>child</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.282" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7ff0">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.281"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.279"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.283" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7fef">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.281"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.151"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.284" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7fee">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.285" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7fed">
-                      <Foundation.Core.ModelElement.name>next</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.id="xmi.286">
-                          <Foundation.Data_Types.Multiplicity.range>
-                            <Foundation.Data_Types.MultiplicityRange xmi.id="xmi.287">
-                              <Foundation.Data_Types.MultiplicityRange.lower>0</Foundation.Data_Types.MultiplicityRange.lower>
-                              <Foundation.Data_Types.MultiplicityRange.upper>1</Foundation.Data_Types.MultiplicityRange.upper>
-                            </Foundation.Data_Types.MultiplicityRange>
-                          </Foundation.Data_Types.Multiplicity.range>
-                        </Foundation.Data_Types.Multiplicity>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.284"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.151"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.288" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7fec">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.284"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.151"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.289" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7feb">
-                  <Foundation.Core.ModelElement.name>previous</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.3"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.290" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7fea">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.286"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.289"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.151"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.291" xmi.uuid="127-0-0-1-5c2843:e8a9b10b99:-7fe9">
-                      <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.multiplicity>
-                        <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                      </Foundation.Core.AssociationEnd.multiplicity>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.289"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.151"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-              </Foundation.Core.Namespace.ownedElement>
-            </Model_Management.Package>
-            <Model_Management.Package xmi.id="xmi.292" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ffc">
-              <Foundation.Core.ModelElement.name>HSSF</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.2"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.4"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.ModelElement.supplierDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.293"/>
-              </Foundation.Core.ModelElement.supplierDependency>
-              <Foundation.Core.Namespace.ownedElement>
-                <Behavioral_Elements.Use_Cases.Actor xmi.id="xmi.42" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff7">
-                  <Foundation.Core.ModelElement.name>ClientApps</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Behavioral_Elements.Use_Cases.Actor>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.294" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7ff7">
-                  <Foundation.Core.ModelElement.name>create HSSF File</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.295"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.230" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff4">
-                  <Foundation.Core.ModelElement.name>create new filesystem</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.68"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Association xmi.id="xmi.296" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7ff6">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.297">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.296"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.294"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.298">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.296"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.230"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.299" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7ff5">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.300" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff5">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.299"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.301" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff4">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.299"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.294"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.302" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7ff4">
-                  <Foundation.Core.ModelElement.name>read existing HSSF File</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.303"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.304"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.305"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.306" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7ff3">
-                  <Foundation.Core.ModelElement.name>write HSSF File</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.304"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.295"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.307"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.308"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.309" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7ff2">
-                  <Foundation.Core.ModelElement.name>read Workbook Entry</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.303"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Association xmi.id="xmi.310" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7ff1">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.311" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff3">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.310"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.312" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff2">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.310"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.302"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Generalization xmi.id="xmi.303" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fef">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.309"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.302"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Association xmi.id="xmi.313" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fee">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.314" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff1">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.313"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.42"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.315" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7ff0">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.313"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.306"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.316" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fed">
-                  <Foundation.Core.ModelElement.name>write Workbook Entry</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.307"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Generalization xmi.id="xmi.307" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fec">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.316"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.306"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.304" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fea">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.306"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.302"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.317" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe8">
-                  <Foundation.Core.ModelElement.name>write sheet entry</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.308"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Generalization xmi.id="xmi.308" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe7">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.317"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.306"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.231" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff1">
-                  <Foundation.Core.ModelElement.name>write new file to file system</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.69"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Association xmi.id="xmi.318" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe6">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.319">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.318"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.316"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.320">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.318"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.231"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.321" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe5">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.322">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.321"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.317"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.323">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.321"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.231"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.324" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe4">
-                  <Foundation.Core.ModelElement.name>read Sheet Entry</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.305"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Generalization xmi.id="xmi.305" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe3">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.324"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.302"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.295" xmi.uuid="-64--88-1-2-717d91:e7db573623:-7fe1">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.292"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.306"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.294"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-              </Foundation.Core.Namespace.ownedElement>
-            </Model_Management.Package>
-            <Model_Management.Package xmi.id="xmi.325" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ffb">
-              <Foundation.Core.ModelElement.name>HSSFSerializer</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.2"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.293"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Namespace.ownedElement>
-                <Behavioral_Elements.Use_Cases.Actor xmi.id="xmi.326" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ffe">
-                  <Foundation.Core.ModelElement.name>Cocoon</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Behavioral_Elements.Use_Cases.Actor>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.327" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ffd">
-                  <Foundation.Core.ModelElement.name>Sends Sax Events</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.specialization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.328"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.329"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.330"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.331"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.332"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.333"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.334"/>
-                    <Foundation.Core.Generalization xmi.idref="xmi.335"/>
-                  </Foundation.Core.GeneralizableElement.specialization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.336" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ffb">
-                  <Foundation.Core.ModelElement.name>Sends an Ignored Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.335"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.337" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ffa">
-                  <Foundation.Core.ModelElement.name>Sends and Interrogative Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.334"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.338" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ff9">
-                  <Foundation.Core.ModelElement.name>Sends Setup Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.333"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.339" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ff8">
-                  <Foundation.Core.ModelElement.name>Sends Start Document Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.332"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.340" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ff7">
-                  <Foundation.Core.ModelElement.name>Sends End Document Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.331"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.341" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ff6">
-                  <Foundation.Core.ModelElement.name>Sends Start Element Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.329"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.342" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ff5">
-                  <Foundation.Core.ModelElement.name>Sends End Element Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.330"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Behavioral_Elements.Use_Cases.UseCase xmi.id="xmi.343" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7ff4">
-                  <Foundation.Core.ModelElement.name>Sends Raw Data Event</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.GeneralizableElement.generalization>
-                    <Foundation.Core.Generalization xmi.idref="xmi.328"/>
-                  </Foundation.Core.GeneralizableElement.generalization>
-                </Behavioral_Elements.Use_Cases.UseCase>
-                <Foundation.Core.Generalization xmi.id="xmi.328" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fea">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.343"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.329" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe9">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.341"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.330" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe8">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.342"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.331" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe7">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.340"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.332" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe6">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.339"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.333" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe5">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.338"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.334" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe4">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.337"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Generalization xmi.id="xmi.335" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe3">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Generalization.child>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.336"/>
-                  </Foundation.Core.Generalization.child>
-                  <Foundation.Core.Generalization.parent>
-                    <Foundation.Core.GeneralizableElement xmi.idref="xmi.327"/>
-                  </Foundation.Core.Generalization.parent>
-                </Foundation.Core.Generalization>
-                <Foundation.Core.Association xmi.id="xmi.344" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe2">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.345" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fef">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.344"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.327"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.346" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fee">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.344"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.347" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe1">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.348" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fed">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.347"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.337"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.349" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fec">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.347"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.350" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fe0">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.351" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7feb">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.350"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.341"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.352" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fea">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.350"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.353" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fdf">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.354" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe9">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.353"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.339"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.355" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe8">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.353"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.356" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fde">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.357" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe7">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.356"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.340"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.358" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe6">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.356"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.359" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fdd">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.360" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe5">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.359"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.342"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.361" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe4">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.359"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.362" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fdc">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.363" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe3">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.362"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.336"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.364" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe2">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.362"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.365" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fdb">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.366" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe1">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.365"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.343"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.367" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fe0">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.365"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-                <Foundation.Core.Association xmi.id="xmi.368" xmi.uuid="10-10-101-65-ab08f:e833388f1f:-7fda">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.325"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Association.connection>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.369" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fdf">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.368"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.338"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                    <Foundation.Core.AssociationEnd xmi.id="xmi.370" xmi.uuid="10-10-101-65-4693f9:e83d745d88:-7fde">
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                      <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                      <Foundation.Core.AssociationEnd.association>
-                        <Foundation.Core.Association xmi.idref="xmi.368"/>
-                      </Foundation.Core.AssociationEnd.association>
-                      <Foundation.Core.AssociationEnd.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.326"/>
-                      </Foundation.Core.AssociationEnd.type>
-                    </Foundation.Core.AssociationEnd>
-                  </Foundation.Core.Association.connection>
-                </Foundation.Core.Association>
-              </Foundation.Core.Namespace.ownedElement>
-            </Model_Management.Package>
-            <Foundation.Core.Dependency xmi.id="xmi.293" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff9">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.2"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.325"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.292"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Dependency>
-            <Foundation.Core.Dependency xmi.id="xmi.4" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ff8">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.2"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.292"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.3"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Dependency>
-          </Foundation.Core.Namespace.ownedElement>
-        </Model_Management.Package>
-        <Model_Management.Package xmi.id="xmi.371" xmi.uuid="-64--88-1-2-717d91:e7cd986e07:-7ffe">
-          <Foundation.Core.ModelElement.name>designModel</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Foundation.Core.Namespace.ownedElement>
-            <Foundation.Core.Class xmi.id="xmi.372" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ffd">
-              <Foundation.Core.ModelElement.name>Property</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="true"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.373"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.GeneralizableElement.specialization>
-                <Foundation.Core.Generalization xmi.idref="xmi.374"/>
-                <Foundation.Core.Generalization xmi.idref="xmi.375"/>
-              </Foundation.Core.GeneralizableElement.specialization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.376" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ffc">
-                  <Foundation.Core.ModelElement.name>_name</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.377" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ffb">
-                  <Foundation.Core.ModelElement.name>_name_size</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.378"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.379" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ffa">
-                  <Foundation.Core.ModelElement.name>_property_type</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.381" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff9">
-                  <Foundation.Core.ModelElement.name>_storage_type</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.382" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff8">
-                  <Foundation.Core.ModelElement.name>_previous_property</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.384" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff7">
-                  <Foundation.Core.ModelElement.name>_next_property</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.385" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff6">
-                  <Foundation.Core.ModelElement.name>_child_property</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.386" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff5">
-                  <Foundation.Core.ModelElement.name>_seconds_1</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.387" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff4">
-                  <Foundation.Core.ModelElement.name>_days_1</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.388" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff3">
-                  <Foundation.Core.ModelElement.name>_seconds_2</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.389" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff2">
-                  <Foundation.Core.ModelElement.name>_days_2</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.390" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff1">
-                  <Foundation.Core.ModelElement.name>_start_block</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.391" xmi.uuid="127-0-0-1-497f6:e8c840c12f:-7ff0">
-                  <Foundation.Core.ModelElement.name>_size</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.392" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ffd">
-                  <Foundation.Core.ModelElement.name>_raw_data[ 128 ]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.394" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ffd">
-                  <Foundation.Core.ModelElement.name>_index</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.395" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ffc">
-                  <Foundation.Core.ModelElement.name>setIndex</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.396"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.397" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ffb">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.395"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.396">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.395"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.398" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff5">
-                  <Foundation.Core.ModelElement.name>preWrite</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.399"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.399">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.398"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.400" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7fee">
-                  <Foundation.Core.ModelElement.name>getIndex</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.401"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.402" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7fed">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.400"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.401">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.400"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.403" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ffa">
-                  <Foundation.Core.ModelElement.name>setStartBlock</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.404"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.405" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff9">
-                      <Foundation.Core.ModelElement.name>startBlock</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.403"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.404">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.403"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.406" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff8">
-                  <Foundation.Core.ModelElement.name>PROPERTY_SIZE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.407">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>128</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.408" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff7">
-                  <Foundation.Core.ModelElement.name>_NO_INDEX</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.409">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>-1</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.410" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff6">
-                  <Foundation.Core.ModelElement.name>_DIRECTORY_TYPE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.411">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>1</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.412" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff5">
-                  <Foundation.Core.ModelElement.name>_DOCUMENT_TYPE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.413">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>2</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.414" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff4">
-                  <Foundation.Core.ModelElement.name>_ROOT_TYPE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.415">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>5</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.416" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff3">
-                  <Foundation.Core.ModelElement.name>_BIG_BLOCK_STORAGE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.417">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>1</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.418" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff2">
-                  <Foundation.Core.ModelElement.name>_SMALL_BLOCK_STORAGE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.419">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>0</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.420" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ff0">
-                  <Foundation.Core.ModelElement.name>Property</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.421"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.421">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.420"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.422" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fee">
-                  <Foundation.Core.ModelElement.name>setName</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="true"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.423"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.424" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fed">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.422"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.423">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.422"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.425" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fec">
-                  <Foundation.Core.ModelElement.name>setPropertyType</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.426"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.427" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7feb">
-                      <Foundation.Core.ModelElement.name>propertyType</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.425"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.426">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.425"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.428" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fea">
-                  <Foundation.Core.ModelElement.name>setStorageType</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.429"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.430" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe9">
-                      <Foundation.Core.ModelElement.name>storageType</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.428"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.429">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.428"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.431" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe8">
-                  <Foundation.Core.ModelElement.name>setChildProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.432"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.433" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe7">
-                      <Foundation.Core.ModelElement.name>child</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.431"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.432">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.431"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.434" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe6">
-                  <Foundation.Core.ModelElement.name>getChildProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.435"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.436" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.434"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.435">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.434"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.437" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe4">
-                  <Foundation.Core.ModelElement.name>setSize</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.438"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.439" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe3">
-                      <Foundation.Core.ModelElement.name>size</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.437"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.438">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.437"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.440" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe2">
-                  <Foundation.Core.ModelElement.name>shouldUseSmallBlocks</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.441"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.442" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe1">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.440"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.441">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.440"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.444" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fe0">
-                  <Foundation.Core.ModelElement.name>_next_file</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.446" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fdf">
-                  <Foundation.Core.ModelElement.name>_previous_file</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.447" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ffb">
-              <Foundation.Core.ModelElement.name>RootProperty</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.448"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.374"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.449" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ffa">
-                  <Foundation.Core.ModelElement.name>_children</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.447"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.450"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.451" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ffa">
-              <Foundation.Core.ModelElement.name>DocumentProperty</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.375"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.452" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ffd">
-                  <Foundation.Core.ModelElement.name>DocumentProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.451"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.453"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.454" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ffc">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.452"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.455" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7ffb">
-                      <Foundation.Core.ModelElement.name>size</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.452"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.453">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.451"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.452"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Generalization xmi.id="xmi.374" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff8">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.447"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.372"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Generalization xmi.id="xmi.375" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff7">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.451"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.372"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Class xmi.id="xmi.456" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff6">
-              <Foundation.Core.ModelElement.name>PropertyBlock</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.457"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.GeneralizableElement.specialization>
-                <Foundation.Core.Generalization xmi.idref="xmi.458"/>
-              </Foundation.Core.GeneralizableElement.specialization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.459" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff5">
-                  <Foundation.Core.ModelElement.name>_properties[ 4 ]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="changeable"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.456"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.460" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fe6">
-                  <Foundation.Core.ModelElement.name>createPropertyBlockArray</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.456"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.461"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.462" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fe5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.460"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.463"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.464" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fe4">
-                      <Foundation.Core.ModelElement.name>properties</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.460"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.450"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.461">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.456"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.460"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Association xmi.id="xmi.465" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff4">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.466" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff3">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.465"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.456"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.467" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff2">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.465"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Class xmi.id="xmi.468" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff1">
-              <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.469"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.470"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.471" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fed">
-                  <Foundation.Core.ModelElement.name>_properties</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.450"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.472" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fe9">
-                  <Foundation.Core.ModelElement.name>_blocks[ ]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.463"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.473" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fe4">
-                  <Foundation.Core.ModelElement.name>getRoot</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.474"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.475" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fe3">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.473"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.476"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.474">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.473"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.477" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7fed">
-                  <Foundation.Core.ModelElement.name>addProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.478"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.479" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7fec">
-                      <Foundation.Core.ModelElement.name>property</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.477"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.478">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.477"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.480" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff7">
-                  <Foundation.Core.ModelElement.name>preWrite</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.481"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.481">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.480"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.482" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fde">
-                  <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.483"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.483">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.482"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.484" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fdc">
-                  <Foundation.Core.ModelElement.name>getStartBlock</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.485"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.486" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fdb">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.484"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.485">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.484"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.487" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fda">
-                  <Foundation.Core.ModelElement.name>_start_block</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Association xmi.id="xmi.488" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7ff0">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.489" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fef">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.488"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.490" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fee">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.id="xmi.491">
-                      <Foundation.Data_Types.Multiplicity.range>
-                        <Foundation.Data_Types.MultiplicityRange xmi.id="xmi.492">
-                          <Foundation.Data_Types.MultiplicityRange.lower>1</Foundation.Data_Types.MultiplicityRange.lower>
-                          <Foundation.Data_Types.MultiplicityRange.upper>-1</Foundation.Data_Types.MultiplicityRange.upper>
-                        </Foundation.Data_Types.MultiplicityRange>
-                      </Foundation.Data_Types.Multiplicity.range>
-                    </Foundation.Data_Types.Multiplicity>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.488"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.456"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Association xmi.id="xmi.493" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fec">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.494" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7feb">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.493"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.495" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fea">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.491"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.493"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Interface xmi.id="xmi.445" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fe2">
-              <Foundation.Core.ModelElement.name>File</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.supplierDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.373"/>
-              </Foundation.Core.ModelElement.supplierDependency>
-              <Foundation.Core.GeneralizableElement.specialization>
-                <Foundation.Core.Generalization xmi.idref="xmi.496"/>
-              </Foundation.Core.GeneralizableElement.specialization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.497" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fe1">
-                  <Foundation.Core.ModelElement.name>getNextFile</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.498"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.499" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fe0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.497"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.498">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.497"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.500" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fdf">
-                  <Foundation.Core.ModelElement.name>setNextFile</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.501"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.502" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fde">
-                      <Foundation.Core.ModelElement.name>file</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.500"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.501">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.500"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.503" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fdd">
-                  <Foundation.Core.ModelElement.name>getPreviousFile</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.504"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.505" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fdc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.503"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.504">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.503"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.506" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fdb">
-                  <Foundation.Core.ModelElement.name>setPreviousFile</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.507"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.508" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fda">
-                      <Foundation.Core.ModelElement.name>file</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.506"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.507">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.445"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.506"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Interface>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.509">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Interface xmi.id="xmi.476" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fd8">
-              <Foundation.Core.ModelElement.name>Directory</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.supplierDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.448"/>
-              </Foundation.Core.ModelElement.supplierDependency>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.496"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.510" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fd7">
-                  <Foundation.Core.ModelElement.name>getChildren</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.476"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.511"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.512" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fd6">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.510"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.513"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.511">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.476"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.510"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.514" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fd5">
-                  <Foundation.Core.ModelElement.name>addChild</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.476"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.515"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.516" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fd4">
-                      <Foundation.Core.ModelElement.name>property</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.514"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.372"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.515">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.476"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.514"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Interface>
-            <Foundation.Core.Generalization xmi.id="xmi.496" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fd3">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.476"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.445"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Abstraction xmi.id="xmi.448" xmi.uuid="127-0-0-1-497f6:e8c85b337f:-7fd2">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.447"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.476"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.517">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.448"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Class xmi.id="xmi.518" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7ffd">
-              <Foundation.Core.ModelElement.name>BigBlock</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="true"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.519"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.GeneralizableElement.specialization>
-                <Foundation.Core.Generalization xmi.idref="xmi.520"/>
-                <Foundation.Core.Generalization xmi.idref="xmi.457"/>
-                <Foundation.Core.Generalization xmi.idref="xmi.521"/>
-                <Foundation.Core.Generalization xmi.idref="xmi.522"/>
-              </Foundation.Core.GeneralizableElement.specialization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.523" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fec">
-                  <Foundation.Core.ModelElement.name>writeData</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.518"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.524"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.525" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7feb">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.523"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.526"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.524">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.518"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.523"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.527" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff2">
-                  <Foundation.Core.ModelElement.name>BIG_BLOCK_SIZE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.528">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>512</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.518"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.529" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff1">
-                  <Foundation.Core.ModelElement.name>doWriteData</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.518"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.530"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.531" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fef">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.529"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.526"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.532" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fee">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.529"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.530">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.518"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.529"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.533" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7ffc">
-              <Foundation.Core.ModelElement.name>HeaderBlock</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.520"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.534" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7fe8">
-                  <Foundation.Core.ModelElement.name>_bat_count</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.535" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7fe7">
-                  <Foundation.Core.ModelElement.name>_property_start</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.536" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7fe4">
-                  <Foundation.Core.ModelElement.name>_sbat_start</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.537">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>-2</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.538" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7fe2">
-                  <Foundation.Core.ModelElement.name>_xbat_start</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.539">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>-2</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.540" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7fe1">
-                  <Foundation.Core.ModelElement.name>_xbat_count</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.541">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>0</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.542" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff2">
-                  <Foundation.Core.ModelElement.name>_data[ 512 ]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.543" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff3">
-                  <Foundation.Core.ModelElement.name>setBATBlocks</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.544"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.545" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff2">
-                      <Foundation.Core.ModelElement.name>blockCount</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.543"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.546" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff1">
-                      <Foundation.Core.ModelElement.name>startBlock</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.543"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.547" xmi.uuid="127-0-0-1-5b0da1:e8fdff80a6:-7ffd">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.543"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.544">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.543"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.549" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff0">
-                  <Foundation.Core.ModelElement.name>setPropertyStart</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.550"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.551" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7fef">
-                      <Foundation.Core.ModelElement.name>startBlock</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.549"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.550">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.549"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.552" xmi.uuid="127-0-0-1-b3e62:e8fe06844b:-7ffb">
-                  <Foundation.Core.ModelElement.name>setXBATStart</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.553"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.554" xmi.uuid="127-0-0-1-b3e62:e8fe06844b:-7ffa">
-                      <Foundation.Core.ModelElement.name>startBlock</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.552"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.553">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.552"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.555" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ffd">
-                  <Foundation.Core.ModelElement.name>Header</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.556"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.556">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.555"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.557" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ffb">
-                  <Foundation.Core.ModelElement.name>calculateXBATStorageRequirements</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.558"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.559" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ffa">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.557"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.560" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff9">
-                      <Foundation.Core.ModelElement.name>blockCount</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.557"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.558">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.557"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.548" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7ffb">
-              <Foundation.Core.ModelElement.name>BATBlock</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.521"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.561" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7ff5">
-                  <Foundation.Core.ModelElement.name>_fields[ 128 ]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.562" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff1">
-                  <Foundation.Core.ModelElement.name>_data[ 512 ]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.563" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff8">
-                  <Foundation.Core.ModelElement.name>createBATBlocks</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.564"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.565" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff7">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.563"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.566" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff6">
-                      <Foundation.Core.ModelElement.name>entries[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.563"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.564">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.563"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.567" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff5">
-                  <Foundation.Core.ModelElement.name>calculateStorageRequirements</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.568"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.569" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff4">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.567"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.570" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7ff3">
-                      <Foundation.Core.ModelElement.name>entryCount</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.567"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.568">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.567"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Generalization xmi.id="xmi.520" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7ffa">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.533"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.518"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Generalization xmi.id="xmi.457" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7ff7">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.456"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.518"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Generalization xmi.id="xmi.521" xmi.uuid="127-0-0-1-32fb1e:e8c8d28c34:-7ff6">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.548"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.518"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Class xmi.id="xmi.571" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ffd">
-              <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.572" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff5">
-                  <Foundation.Core.ModelElement.name>createDocument</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.573"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.574" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff4">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.572"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.576" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff3">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.572"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.573">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.572"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.577" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ff1">
-                  <Foundation.Core.ModelElement.name>writeFilesystem</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.578"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.579" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ff0">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.577"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.526"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.578">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.577"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.580" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fcf">
-                  <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.581"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.581">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.580"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.582" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fcd">
-                  <Foundation.Core.ModelElement.name>_property_table</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.583" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fcc">
-                  <Foundation.Core.ModelElement.name>_header_block</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.584" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fcb">
-                  <Foundation.Core.ModelElement.name>_documents</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.450"/>
-                  </Foundation.Core.StructuralFeature.type>
-                  <Foundation.Core.ModelElement.taggedValue>
-                    <Foundation.Extension_Mechanisms.TaggedValue xmi.id="xmi.585">
-                      <Foundation.Extension_Mechanisms.TaggedValue.tag>volatile</Foundation.Extension_Mechanisms.TaggedValue.tag>
-                      <Foundation.Extension_Mechanisms.TaggedValue.value>true</Foundation.Extension_Mechanisms.TaggedValue.value>
-                      <Foundation.Extension_Mechanisms.TaggedValue.modelElement>
-                        <Foundation.Core.ModelElement xmi.idref="xmi.584"/>
-                      </Foundation.Extension_Mechanisms.TaggedValue.modelElement>
-                    </Foundation.Extension_Mechanisms.TaggedValue>
-                  </Foundation.Core.ModelElement.taggedValue>
-                </Foundation.Core.Attribute>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.586" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ffc">
-              <Foundation.Core.ModelElement.name>Document</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.587"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.588"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.589" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fd7">
-                  <Foundation.Core.ModelElement.name>getDocumentProperty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.590"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.591" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fd6">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.589"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.451"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.590">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.589"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.592" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd4">
-                  <Foundation.Core.ModelElement.name>_property</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.451"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.593" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd3">
-                  <Foundation.Core.ModelElement.name>_blocks[]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.595" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd2">
-                  <Foundation.Core.ModelElement.name>Document</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.596"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.597" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd1">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.595"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.598" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd0">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.595"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.596">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.595"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Association xmi.id="xmi.599" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff8">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.600" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff7">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.599"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.601" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff6">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.263"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.599"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Class xmi.id="xmi.594" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7ff0">
-              <Foundation.Core.ModelElement.name>DocumentBlock</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.458"/>
-                <Foundation.Core.Generalization xmi.idref="xmi.522"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.602" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fef">
-                  <Foundation.Core.ModelElement.name>_data[ 512 ]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.603" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fed">
-                  <Foundation.Core.ModelElement.name>DocumentBlock</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.604"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.605" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fec">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.603"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.604">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.603"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.606" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7feb">
-                  <Foundation.Core.ModelElement.name>size</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.607"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.608" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fea">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.606"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.607">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.606"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.609" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fe9">
-                  <Foundation.Core.ModelElement.name>partiallyRead</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.610"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.611" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fe8">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.609"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.610">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.609"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.612" xmi.uuid="127-0-0-1-4b2185:e927a31140:-7fe7">
-                  <Foundation.Core.ModelElement.name>_bytes_read</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Generalization xmi.id="xmi.458" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fee">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.594"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.456"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Generalization xmi.id="xmi.522" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fed">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.594"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.518"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Association xmi.id="xmi.613" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fea">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.614" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe9">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.613"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.615" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe8">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.491"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.613"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.594"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Association xmi.id="xmi.616" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe7">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.617" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe6">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.616"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.618" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe5">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.616"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.533"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Association xmi.id="xmi.619" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe4">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.620" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe3">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.619"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.621" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe2">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.619"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.468"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Association xmi.id="xmi.622" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe1">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.623" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fe0">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.622"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.586"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.624" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fdf">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.622"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.451"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Interface xmi.id="xmi.625" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fde">
-              <Foundation.Core.ModelElement.name>BATManaged</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.supplierDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.469"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.587"/>
-              </Foundation.Core.ModelElement.supplierDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.626" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fdb">
-                  <Foundation.Core.ModelElement.name>countBlocks</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.625"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.627"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.628" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fda">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.626"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.627">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.625"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.626"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.629" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff9">
-                  <Foundation.Core.ModelElement.name>setStartBlock</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.625"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.630"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.631" xmi.uuid="127-0-0-1-2c97cc:e8f1f228f8:-7ff8">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.629"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.630">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.625"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.629"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Interface>
-            <Foundation.Core.Abstraction xmi.id="xmi.469" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fd9">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.468"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.625"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.632">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.469"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.587" xmi.uuid="127-0-0-1-497f6:e8e9160e29:-7fd8">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.586"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.625"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.633">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.587"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.634">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.373" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fe2">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.372"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.445"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.635">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.373"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Interface xmi.id="xmi.463" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ffd">
-              <Foundation.Core.ModelElement.name>BlockWritable</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.supplierDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.588"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.470"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.519"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.636"/>
-              </Foundation.Core.ModelElement.supplierDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.637" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ffc">
-                  <Foundation.Core.ModelElement.name>writeBlocks</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.463"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.638"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.639" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ffb">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.637"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.526"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.638">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.463"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.637"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Interface>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.640">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.641">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.588" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ff8">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.586"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.463"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.642">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.588"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.470" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ff7">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.468"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.463"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.643">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.470"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.519" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ff6">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.518"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.463"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.644">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.519"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Class xmi.id="xmi.645" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7ff5">
-              <Foundation.Core.ModelElement.name>BlockAllocationTable</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.636"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.646" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fee">
-                  <Foundation.Core.ModelElement.name>createBlocks</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.647"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.647">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.646"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.648" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fec">
-                  <Foundation.Core.ModelElement.name>allocateSpace</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.649"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.650" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7feb">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.648"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.651" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fea">
-                      <Foundation.Core.ModelElement.name>blockCount</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.648"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.649">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.648"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.652" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fe6">
-                  <Foundation.Core.ModelElement.name>_entries</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.654" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd9">
-                  <Foundation.Core.ModelElement.name>_blocks[]</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.655" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd8">
-                  <Foundation.Core.ModelElement.name>BlockAllocationTable</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.656"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.656">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.655"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.657" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd6">
-                  <Foundation.Core.ModelElement.name>countBlocks</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.658"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.659" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fd5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.657"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.658">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.657"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Abstraction xmi.id="xmi.636" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fef">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.645"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.463"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.660">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.636"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Association xmi.id="xmi.661" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fe9">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.662" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fe8">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.661"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.645"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.663" xmi.uuid="127-0-0-1-b3e62:e8f3e6dcd2:-7fe7">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="aggregate"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.491"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.661"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.548"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Class xmi.id="xmi.664" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ffd">
-              <Foundation.Core.ModelElement.name>POIFSSerializer</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="true"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.specialization>
-                <Foundation.Core.Generalization xmi.idref="xmi.665"/>
-              </Foundation.Core.GeneralizableElement.specialization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.666" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ffc">
-                  <Foundation.Core.ModelElement.name>startPrefixMapping</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.667"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.668" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ffb">
-                      <Foundation.Core.ModelElement.name>ignoredPrefix</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.666"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.669" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ffa">
-                      <Foundation.Core.ModelElement.name>ignoredUri</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.666"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.667">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.666"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.670" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff9">
-                  <Foundation.Core.ModelElement.name>endPrefixMapping</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.671"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.672" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff8">
-                      <Foundation.Core.ModelElement.name>ignoredPrefix</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.670"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.671">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.670"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.673" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff7">
-                  <Foundation.Core.ModelElement.name>processingInstruction</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.674"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.675" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff6">
-                      <Foundation.Core.ModelElement.name>ignoredTarget</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.673"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.676" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff5">
-                      <Foundation.Core.ModelElement.name>ignoredData</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.673"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.674">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.673"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.677" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff4">
-                  <Foundation.Core.ModelElement.name>skippedEntity</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.678"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.679" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff3">
-                      <Foundation.Core.ModelElement.name>ignoredName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.677"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.678">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.677"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.680" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff2">
-                  <Foundation.Core.ModelElement.name>startDTD</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.681"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.682" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff1">
-                      <Foundation.Core.ModelElement.name>ignoredName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.680"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.683" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7ff0">
-                      <Foundation.Core.ModelElement.name>ignoredPublicId</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.680"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.684" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fef">
-                      <Foundation.Core.ModelElement.name>ignoredSystemId</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.680"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.681">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.680"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.685" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fee">
-                  <Foundation.Core.ModelElement.name>endDTD</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.686"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.686">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.685"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.687" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fec">
-                  <Foundation.Core.ModelElement.name>startEntity</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.688"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.689" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7feb">
-                      <Foundation.Core.ModelElement.name>ignoredName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.687"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.688">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.687"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.690" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fea">
-                  <Foundation.Core.ModelElement.name>endEntity</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.691"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.692" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fe9">
-                      <Foundation.Core.ModelElement.name>ignoredName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.690"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.691">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.690"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.693" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fe8">
-                  <Foundation.Core.ModelElement.name>startCDATA</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.694"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.694">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.693"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.695" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fe6">
-                  <Foundation.Core.ModelElement.name>endCDATA</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.696"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.696">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.695"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.697" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fe4">
-                  <Foundation.Core.ModelElement.name>comment</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.698"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.699" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fe3">
-                      <Foundation.Core.ModelElement.name>ignoredCh[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.697"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.700"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.701" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fe2">
-                      <Foundation.Core.ModelElement.name>ignoredStart</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.697"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.702" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fe1">
-                      <Foundation.Core.ModelElement.name>ignoredLength</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.697"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.698">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.697"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.703" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fde">
-                  <Foundation.Core.ModelElement.name>shouldSetContentLength</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.704"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.705" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fdd">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.703"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.704">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.703"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.706" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fdc">
-                  <Foundation.Core.ModelElement.name>setOutputStream</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.707"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.708" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fdb">
-                      <Foundation.Core.ModelElement.name>out</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.706"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.526"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.707">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.706"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.709" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fda">
-                  <Foundation.Core.ModelElement.name>_output_stream</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.710">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>null</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.526"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.711" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fd8">
-                  <Foundation.Core.ModelElement.name>_locator</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.712">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>null</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.713"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.714" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fd7">
-                  <Foundation.Core.ModelElement.name>setDocumentLocator</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.715"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.716" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fd6">
-                      <Foundation.Core.ModelElement.name>locator</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.714"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.713"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.715">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.714"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.717" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fd5">
-                  <Foundation.Core.ModelElement.name>startDocument</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.718"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.718">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.717"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.719" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fd3">
-                  <Foundation.Core.ModelElement.name>endDocument</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.720"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.720">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.719"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.721" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fd1">
-                  <Foundation.Core.ModelElement.name>startElement</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.722"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.723" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fd0">
-                      <Foundation.Core.ModelElement.name>namespaceURI</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.721"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.724" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fcf">
-                      <Foundation.Core.ModelElement.name>localName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.721"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.725" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fce">
-                      <Foundation.Core.ModelElement.name>qName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.721"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.726" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fcd">
-                      <Foundation.Core.ModelElement.name>atts</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.721"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.727"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.722">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.721"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.728" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fcc">
-                  <Foundation.Core.ModelElement.name>endElement</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.729"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.730" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fcb">
-                      <Foundation.Core.ModelElement.name>namespaceURI</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.728"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.731" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fca">
-                      <Foundation.Core.ModelElement.name>localName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.728"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.732" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc9">
-                      <Foundation.Core.ModelElement.name>qName</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.728"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.729">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.728"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.733" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc8">
-                  <Foundation.Core.ModelElement.name>characters</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.734"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.735" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc7">
-                      <Foundation.Core.ModelElement.name>ch[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.733"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.700"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.736" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc6">
-                      <Foundation.Core.ModelElement.name>start</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.733"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.737" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc5">
-                      <Foundation.Core.ModelElement.name>length</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.733"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.734">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.733"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.738" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc4">
-                  <Foundation.Core.ModelElement.name>ignorableWhitespace</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.739"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.740" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc3">
-                      <Foundation.Core.ModelElement.name>ch[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.738"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.700"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.741" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc2">
-                      <Foundation.Core.ModelElement.name>start</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.738"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.742" xmi.uuid="127-0-0-1-2264da:e955aac0a4:-7fc1">
-                      <Foundation.Core.ModelElement.name>length</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.738"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.739">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.738"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Attribute xmi.id="xmi.743" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ffd">
-                  <Foundation.Core.ModelElement.name>_open_elements</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.744">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>new Stack()</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.745"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.746" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fdf">
-                  <Foundation.Core.ModelElement.name>_filesystem</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.747">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>new Filesystem()</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.748" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ffd">
-                  <Foundation.Core.ModelElement.name>getElementProcessorFactory</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.749"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.750" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ffc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.748"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.749">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.748"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.752" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ffb">
-                  <Foundation.Core.ModelElement.name>doLocalPreEndDocument</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.753"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.753">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.752"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.754" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff9">
-                  <Foundation.Core.ModelElement.name>doLocalPostEndDocument</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.755"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.755">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.754"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.756" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff7">
-                  <Foundation.Core.ModelElement.name>getFilesystem</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.757"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.758" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff6">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.756"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.757">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.756"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.759" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff5">
-                  <Foundation.Core.ModelElement.name>SAXExceptionFactory</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.760"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.761" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff4">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.759"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.762"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.763" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff3">
-                      <Foundation.Core.ModelElement.name>message</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.759"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.764" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff2">
-                      <Foundation.Core.ModelElement.name>e</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.759"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.765"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.760">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.759"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.766" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff1">
-                  <Foundation.Core.ModelElement.name>SAXExceptionFactory</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.767"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.768" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ff0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.766"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.762"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.769" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7fef">
-                      <Foundation.Core.ModelElement.name>message</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.766"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.767">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.664"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.766"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Model_Management.Package xmi.id="xmi.770">
-              <Foundation.Core.ModelElement.name>org.xml.sax</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Namespace.ownedElement>
-                <Foundation.Core.Interface xmi.id="xmi.713">
-                  <Foundation.Core.ModelElement.name>Locator</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.770"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Foundation.Core.Interface xmi.id="xmi.727">
-                  <Foundation.Core.ModelElement.name>Attributes</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.770"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Foundation.Core.Class xmi.id="xmi.762">
-                  <Foundation.Core.ModelElement.name>SAXException</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.770"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-              </Foundation.Core.Namespace.ownedElement>
-            </Model_Management.Package>
-            <Foundation.Core.Class xmi.id="xmi.771" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ffc">
-              <Foundation.Core.ModelElement.name>Attribute</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.772" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ffb">
-                  <Foundation.Core.ModelElement.name>_name</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.773" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ffa">
-                  <Foundation.Core.ModelElement.name>_value</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.774" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff9">
-                  <Foundation.Core.ModelElement.name>getName</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.775"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.776" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff8">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.774"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.775">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.774"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.777" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff7">
-                  <Foundation.Core.ModelElement.name>getValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.778"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.779" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff6">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.777"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.778">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.777"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.780" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff5">
-                  <Foundation.Core.ModelElement.name>getValueAsInt</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.781"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.782" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff4">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.780"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.781">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.780"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.783" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff3">
-                  <Foundation.Core.ModelElement.name>getValueAsShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.784"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.785" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff2">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.783"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.784">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.783"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.787" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff1">
-                  <Foundation.Core.ModelElement.name>getValueAsLong</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.788"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.789" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7ff0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.787"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.788">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.787"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.791" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fef">
-                  <Foundation.Core.ModelElement.name>getValueAsBoolean</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.792"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.793" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fee">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.791"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.792">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.791"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.794" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe4">
-                  <Foundation.Core.ModelElement.name>Attribute</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.795"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.796" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe3">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.794"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.797" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe2">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.794"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.795">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.794"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Interface xmi.id="xmi.798" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fed">
-              <Foundation.Core.ModelElement.name>ElementProcessor</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.799" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fec">
-                  <Foundation.Core.ModelElement.name>initialize</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.800"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.801" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7feb">
-                      <Foundation.Core.ModelElement.name>attributes[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.799"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.771"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.802" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe1">
-                      <Foundation.Core.ModelElement.name>parent</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.799"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.803" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe0">
-                      <Foundation.Core.ModelElement.name>filesystem</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.799"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.571"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.800">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.799"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.804" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fea">
-                  <Foundation.Core.ModelElement.name>acceptCharacters</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.805"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.806" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe9">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.804"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.700"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.805">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.804"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.807" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe8">
-                  <Foundation.Core.ModelElement.name>acceptWhitespaceCharacters</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.808"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.809" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe7">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.807"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.700"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.808">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.807"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.810" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fe6">
-                  <Foundation.Core.ModelElement.name>endProcessing</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.811"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.811">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.810"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Interface>
-            <Foundation.Core.Class xmi.id="xmi.751" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fde">
-              <Foundation.Core.ModelElement.name>ElementProcessorFactory</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="true"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.specialization>
-                <Foundation.Core.Generalization xmi.idref="xmi.812"/>
-              </Foundation.Core.GeneralizableElement.specialization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.813" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fdd">
-                  <Foundation.Core.ModelElement.name>_element_processor_map</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.814"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.815" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fdc">
-                  <Foundation.Core.ModelElement.name>createElementProcessor</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.816"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.817" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fdb">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.815"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.818" xmi.uuid="127-0-0-1-2264da:e957cbdec1:-7fda">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.815"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.816">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.815"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.819" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff8">
-                  <Foundation.Core.ModelElement.name>addElementProcessorProgenitor</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.820"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.821" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff7">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.819"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.822" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff6">
-                      <Foundation.Core.ModelElement.name>progenitor</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.819"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.820">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.819"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.823" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff5">
-                  <Foundation.Core.ModelElement.name>lookupElementProcessorProgenitor</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.824"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.825" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff4">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.823"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.826" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff3">
-                      <Foundation.Core.ModelElement.name>name</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.823"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.824">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.823"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.827" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff2">
-                  <Foundation.Core.ModelElement.name>doCreateElementProcessor</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.828"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.829" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff1">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.827"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.830" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff0">
-                      <Foundation.Core.ModelElement.name>progenitor</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.827"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.828">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.827"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.831" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ffa">
-                  <Foundation.Core.ModelElement.name>constructElementProcessor</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.832"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.833" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ff9">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.831"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.834" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ff8">
-                      <Foundation.Core.ModelElement.name>progenitor</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.831"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.835"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.832">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.831"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.836" xmi.uuid="127-0-0-1-32fb1e:e9654fc4fd:-7ffd">
-                  <Foundation.Core.ModelElement.name>createNewElementProcessorInstance</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="protected"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.837"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.838" xmi.uuid="127-0-0-1-32fb1e:e9654fc4fd:-7ffc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.836"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.798"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.839" xmi.uuid="127-0-0-1-32fb1e:e9654fc4fd:-7ffb">
-                      <Foundation.Core.ModelElement.name>progenitor</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.836"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.840"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.837">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.751"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.836"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.841" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ffb">
-              <Foundation.Core.ModelElement.name>HSSFSerializer</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.665"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.842" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ffa">
-                  <Foundation.Core.ModelElement.name>_element_processor_factory</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="private"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.841"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.843"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.844" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ffd">
-                  <Foundation.Core.ModelElement.name>getMimeType</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.841"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.845"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.846" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7ffc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.844"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.845">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.841"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.844"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Generalization xmi.id="xmi.665" xmi.uuid="127-0-0-1-2264da:e95e6c79c6:-7ff9">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.841"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.664"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Class xmi.id="xmi.843" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ff7">
-              <Foundation.Core.ModelElement.name>HSSFElementProcessorFactory</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.GeneralizableElement.generalization>
-                <Foundation.Core.Generalization xmi.idref="xmi.812"/>
-              </Foundation.Core.GeneralizableElement.generalization>
-            </Foundation.Core.Class>
-            <Foundation.Core.Generalization xmi.id="xmi.812" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ff6">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Generalization.child>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.843"/>
-              </Foundation.Core.Generalization.child>
-              <Foundation.Core.Generalization.parent>
-                <Foundation.Core.GeneralizableElement xmi.idref="xmi.751"/>
-              </Foundation.Core.Generalization.parent>
-            </Foundation.Core.Generalization>
-            <Foundation.Core.Association xmi.id="xmi.847" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ff5">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Association.connection>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.848" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ff4">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.ordering xmi.value="unordered"/>
-                  <Foundation.Core.AssociationEnd.aggregation xmi.value="none"/>
-                  <Foundation.Core.AssociationEnd.targetScope xmi.value="instance"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.changeability xmi.value="changeable"/>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.847"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.841"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-                <Foundation.Core.AssociationEnd xmi.id="xmi.849" xmi.uuid="127-0-0-1-32fb1e:e95f731f0f:-7ff3">
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.AssociationEnd.isNavigable xmi.value="true"/>
-                  <Foundation.Core.AssociationEnd.multiplicity>
-                    <Foundation.Data_Types.Multiplicity xmi.idref="xmi.221"/>
-                  </Foundation.Core.AssociationEnd.multiplicity>
-                  <Foundation.Core.AssociationEnd.association>
-                    <Foundation.Core.Association xmi.idref="xmi.847"/>
-                  </Foundation.Core.AssociationEnd.association>
-                  <Foundation.Core.AssociationEnd.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.843"/>
-                  </Foundation.Core.AssociationEnd.type>
-                </Foundation.Core.AssociationEnd>
-              </Foundation.Core.Association.connection>
-            </Foundation.Core.Association>
-            <Foundation.Core.Class xmi.id="xmi.850" xmi.uuid="127-0-0-1-5780d9:e9ab5b05d8:-7fee">
-              <Foundation.Core.ModelElement.name>ElementProcessorFactory.CannotCreateElementProcessorException</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.371"/>
-              </Foundation.Core.ModelElement.namespace>
-            </Foundation.Core.Class>
-          </Foundation.Core.Namespace.ownedElement>
-        </Model_Management.Package>
-        <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.851">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            <Foundation.Core.ModelElement xmi.idref="xmi.293"/>
-          </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-        </Foundation.Extension_Mechanisms.Stereotype>
-        <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.852">
-          <Foundation.Core.ModelElement.name>includes</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            <Foundation.Core.ModelElement xmi.idref="xmi.6"/>
-          </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-        </Foundation.Extension_Mechanisms.Stereotype>
-        <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.853">
-          <Foundation.Core.ModelElement.name>extends</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            <Foundation.Core.ModelElement xmi.idref="xmi.7"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.8"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.69"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.70"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.71"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.303"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.307"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.304"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.308"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.305"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.295"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.68"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.72"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.328"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.329"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.334"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.333"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.335"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.330"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.331"/>
-            <Foundation.Core.ModelElement xmi.idref="xmi.332"/>
-          </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-        </Foundation.Extension_Mechanisms.Stereotype>
-        <Model_Management.Package xmi.id="xmi.854">
-          <Foundation.Core.ModelElement.name>java</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Foundation.Core.Namespace.ownedElement>
-            <Model_Management.Package xmi.id="xmi.855">
-              <Foundation.Core.ModelElement.name>lang</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.854"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Namespace.ownedElement>
-                <Foundation.Core.Class xmi.id="xmi.53">
-                  <Foundation.Core.ModelElement.name>Object</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.856">
-                  <Foundation.Core.ModelElement.name>Integer</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.DataType xmi.id="xmi.256">
-                  <Foundation.Core.ModelElement.name>int</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.DataType>
-                <Foundation.Core.Class xmi.id="xmi.273">
-                  <Foundation.Core.ModelElement.name>String</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.857">
-                  <Foundation.Core.ModelElement.name>Char</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.DataType xmi.id="xmi.786">
-                  <Foundation.Core.ModelElement.name>short</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.DataType>
-                <Foundation.Core.DataType xmi.id="xmi.393">
-                  <Foundation.Core.ModelElement.name>byte</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.DataType>
-                <Foundation.Core.Class xmi.id="xmi.858">
-                  <Foundation.Core.ModelElement.name>Byte</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.859">
-                  <Foundation.Core.ModelElement.name>Short</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.DataType xmi.id="xmi.443">
-                  <Foundation.Core.ModelElement.name>boolean</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.DataType>
-                <Foundation.Core.DataType xmi.id="xmi.790">
-                  <Foundation.Core.ModelElement.name>long</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.DataType>
-                <Foundation.Core.DataType xmi.id="xmi.860">
-                  <Foundation.Core.ModelElement.name>double</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.DataType>
-                <Foundation.Core.DataType xmi.id="xmi.700">
-                  <Foundation.Core.ModelElement.name>char</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.DataType>
-                <Foundation.Core.Interface xmi.id="xmi.861">
-                  <Foundation.Core.ModelElement.name>Cloneable</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Model_Management.Package xmi.id="xmi.862">
-                  <Foundation.Core.ModelElement.name>reflect</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                  <Foundation.Core.Namespace.ownedElement>
-                    <Foundation.Core.Class xmi.id="xmi.835">
-                      <Foundation.Core.ModelElement.name>Constructor</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                      <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                      <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                      <Foundation.Core.Class.isActive xmi.value="false"/>
-                      <Foundation.Core.ModelElement.namespace>
-                        <Foundation.Core.Namespace xmi.idref="xmi.862"/>
-                      </Foundation.Core.ModelElement.namespace>
-                    </Foundation.Core.Class>
-                  </Foundation.Core.Namespace.ownedElement>
-                </Model_Management.Package>
-                <Foundation.Core.Class xmi.id="xmi.840">
-                  <Foundation.Core.ModelElement.name>Class</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.765">
-                  <Foundation.Core.ModelElement.name>Exception</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.855"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-              </Foundation.Core.Namespace.ownedElement>
-            </Model_Management.Package>
-            <Model_Management.Package xmi.id="xmi.863">
-              <Foundation.Core.ModelElement.name>util</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.854"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Namespace.ownedElement>
-                <Foundation.Core.Interface xmi.id="xmi.513">
-                  <Foundation.Core.ModelElement.name>Iterator</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Foundation.Core.Interface xmi.id="xmi.258">
-                  <Foundation.Core.ModelElement.name>Collection</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Foundation.Core.Interface xmi.id="xmi.450">
-                  <Foundation.Core.ModelElement.name>List</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Foundation.Core.Class xmi.id="xmi.864">
-                  <Foundation.Core.ModelElement.name>Vector</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Interface xmi.id="xmi.865">
-                  <Foundation.Core.ModelElement.name>SortedSet</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Foundation.Core.Interface xmi.id="xmi.866">
-                  <Foundation.Core.ModelElement.name>Set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-                <Foundation.Core.Class xmi.id="xmi.745">
-                  <Foundation.Core.ModelElement.name>Stack</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Interface xmi.id="xmi.814">
-                  <Foundation.Core.ModelElement.name>Map</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.863"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Interface>
-              </Foundation.Core.Namespace.ownedElement>
-            </Model_Management.Package>
-            <Model_Management.Package xmi.id="xmi.867">
-              <Foundation.Core.ModelElement.name>io</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.854"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Namespace.ownedElement>
-                <Foundation.Core.Class xmi.id="xmi.575">
-                  <Foundation.Core.ModelElement.name>InputStream</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.867"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-                <Foundation.Core.Class xmi.id="xmi.526">
-                  <Foundation.Core.ModelElement.name>OutputStream</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="true"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.867"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-              </Foundation.Core.Namespace.ownedElement>
-            </Model_Management.Package>
-          </Foundation.Core.Namespace.ownedElement>
-        </Model_Management.Package>
-        <Model_Management.Package xmi.id="xmi.868" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ffc">
-          <Foundation.Core.ModelElement.name>util</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-          <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Foundation.Core.Namespace.ownedElement>
-            <Foundation.Core.Interface xmi.id="xmi.869" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ffb">
-              <Foundation.Core.ModelElement.name>FixedField</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.supplierDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.870"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.871"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.872"/>
-                <Foundation.Core.Dependency xmi.idref="xmi.873"/>
-              </Foundation.Core.ModelElement.supplierDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.874" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ffa">
-                  <Foundation.Core.ModelElement.name>readFromBytes</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.875"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.876" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff9">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.874"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.268"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.877" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ffc">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.874"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.875">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.874"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.878" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff8">
-                  <Foundation.Core.ModelElement.name>readFromStream</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.879"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.880" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff7">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.878"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.268"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.881" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ffd">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.878"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.879">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.878"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.882" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff5">
-                  <Foundation.Core.ModelElement.name>writeToBytes</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.883"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.884" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff4">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.882"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.268"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.885" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff1">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.882"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.883">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.882"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.886" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff3">
-                  <Foundation.Core.ModelElement.name>toString</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.887"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.888" xmi.uuid="127-0-0-1-5b0da1:e8e6d2b713:-7ff2">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.886"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.887">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.869"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.886"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Interface>
-            <Foundation.Core.Class xmi.id="xmi.889" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ffb">
-              <Foundation.Core.ModelElement.name>BitField</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.890" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff0">
-                  <Foundation.Core.ModelElement.name>getValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.891"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.892" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fef">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.890"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.893" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fee">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.890"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.891">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.890"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.894" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fed">
-                  <Foundation.Core.ModelElement.name>getShortValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.895"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.896" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fec">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.894"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.897" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7feb">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.894"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.859"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.895">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.894"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.898" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fea">
-                  <Foundation.Core.ModelElement.name>getRawValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.899"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.900" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe9">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.898"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.901" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe8">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.898"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.899">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.898"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.902" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe7">
-                  <Foundation.Core.ModelElement.name>getShortRawValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.903"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.904" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe6">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.902"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.905" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe5">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.902"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.903">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.902"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.906" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe4">
-                  <Foundation.Core.ModelElement.name>isSet</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.907"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.908" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe3">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.906"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.909" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe2">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.906"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.907">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.906"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.910" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe1">
-                  <Foundation.Core.ModelElement.name>isAllSet</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.911"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.912" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fe0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.910"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.913" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fdf">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.910"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.911">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.910"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.914" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fde">
-                  <Foundation.Core.ModelElement.name>setValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.915"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.916" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fdd">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.914"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.917" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fdc">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.914"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.918" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fdb">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.914"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.915">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.914"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.919" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fda">
-                  <Foundation.Core.ModelElement.name>setShortValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.920"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.921" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd9">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.919"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.922" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd8">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.919"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.923" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd7">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.919"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.920">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.919"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.924" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd6">
-                  <Foundation.Core.ModelElement.name>clear</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.925"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.926" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.924"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.927" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd4">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.924"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.925">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.924"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.928" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd3">
-                  <Foundation.Core.ModelElement.name>clearShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.929"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.930" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd2">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.928"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.931" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd1">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.928"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.929">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.928"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.932" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fd0">
-                  <Foundation.Core.ModelElement.name>clearByte</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.933"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.934" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fcf">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.932"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.935" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fce">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.932"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.933">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.932"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.936" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fcd">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.937"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.938" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fcc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.936"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.939" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fcb">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.936"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.937">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.936"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.940" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fca">
-                  <Foundation.Core.ModelElement.name>setShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.941"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.942" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc9">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.940"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.943" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc8">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.940"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.941">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.940"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.944" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc7">
-                  <Foundation.Core.ModelElement.name>setByte</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.945"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.946" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc6">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.944"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.947" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc5">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.944"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.945">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.944"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.948" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc4">
-                  <Foundation.Core.ModelElement.name>setBoolean</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.949"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.950" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc3">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.948"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.951" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc2">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.948"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.952" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc1">
-                      <Foundation.Core.ModelElement.name>flag</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.948"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.949">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.948"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.953" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fc0">
-                  <Foundation.Core.ModelElement.name>setShortBoolean</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.954"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.955" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fbf">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.953"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.956" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fbe">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.953"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.957" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fbd">
-                      <Foundation.Core.ModelElement.name>flag</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.953"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.954">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.953"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.958" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fbc">
-                  <Foundation.Core.ModelElement.name>setByteBoolean</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.959"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.960" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fbb">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.958"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.961" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fba">
-                      <Foundation.Core.ModelElement.name>holder</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.958"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.962" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb9">
-                      <Foundation.Core.ModelElement.name>flag</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.958"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.959">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.889"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.958"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.380" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ffa">
-              <Foundation.Core.ModelElement.name>ByteField</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.870"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.963" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb8">
-                  <Foundation.Core.ModelElement.name>get</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.964"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.965" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb7">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.963"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.964">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.963"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.966" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb6">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.967"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.968" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb4">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.966"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.967">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.966"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.969" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb3">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.970"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.971" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb1">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.969"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.972" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fb0">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.969"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.970">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.380"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.969"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.973" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff9">
-              <Foundation.Core.ModelElement.name>HexDump</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.974" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fae">
-                  <Foundation.Core.ModelElement.name>EOL</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.973"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Operation xmi.id="xmi.975" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fad">
-                  <Foundation.Core.ModelElement.name>dump</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.973"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.976"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.977" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fab">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.975"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.978" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7faa">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.975"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.979" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa9">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.975"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.526"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.980" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa8">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.975"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.976">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.973"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.975"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.653" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff8">
-              <Foundation.Core.ModelElement.name>IntList</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.981" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa7">
-                  <Foundation.Core.ModelElement.name>add</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.982"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.983" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa5">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.981"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.984" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa4">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.981"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.982">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.981"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.985" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa3">
-                  <Foundation.Core.ModelElement.name>add</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.986"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.987" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa2">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.985"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.988" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa1">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.985"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.986">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.985"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.989" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7fa0">
-                  <Foundation.Core.ModelElement.name>addAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.990"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.991" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7f9f">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.989"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.992" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7f9e">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.989"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.990">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.989"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.993" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ffd">
-                  <Foundation.Core.ModelElement.name>addAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.994"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.995" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ffc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.993"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.996" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ffb">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.993"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.997" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ffa">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.993"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.994">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.993"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.998" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff9">
-                  <Foundation.Core.ModelElement.name>clear</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.999"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.999">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.998"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1000" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff7">
-                  <Foundation.Core.ModelElement.name>contains</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1001"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1002" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff6">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1000"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1003" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff5">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1000"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1001">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1000"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1004" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff4">
-                  <Foundation.Core.ModelElement.name>containsAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1005"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1006" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff3">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1004"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1007" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff2">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1004"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1005">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1004"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1008" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff1">
-                  <Foundation.Core.ModelElement.name>equals</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1009"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1010" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7ff0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1008"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1011" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fef">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1008"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1009">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1008"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1012" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fee">
-                  <Foundation.Core.ModelElement.name>get</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1013"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1014" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fed">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1012"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1015" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fec">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1012"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1013">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1012"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1016" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7feb">
-                  <Foundation.Core.ModelElement.name>hashCode</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1017"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1018" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fea">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1016"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1017">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1016"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1019" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe9">
-                  <Foundation.Core.ModelElement.name>indexOf</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1020"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1021" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe8">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1019"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1022" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe7">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1019"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1020">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1019"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1023" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe6">
-                  <Foundation.Core.ModelElement.name>isEmpty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1024"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1025" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1023"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1024">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1023"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1026" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe4">
-                  <Foundation.Core.ModelElement.name>lastIndexOf</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1027"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1028" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe3">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1026"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1029" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe2">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1026"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1027">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1026"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1030" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe1">
-                  <Foundation.Core.ModelElement.name>remove</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1031"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1032" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fe0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1030"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1033" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fdf">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1030"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1031">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1030"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1034" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fde">
-                  <Foundation.Core.ModelElement.name>removeValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1035"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1036" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fdd">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1034"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1037" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fdc">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1034"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1035">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1034"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1038" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fdb">
-                  <Foundation.Core.ModelElement.name>removeAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1039"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1040" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fda">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1038"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1041" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd9">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1038"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1039">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1038"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1042" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd8">
-                  <Foundation.Core.ModelElement.name>retainAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1043"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1044" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd7">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1042"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1045" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd6">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1042"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1043">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1042"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1046" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd5">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1047"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1048" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd4">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1046"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1049" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd3">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1046"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1050" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd2">
-                      <Foundation.Core.ModelElement.name>element</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1046"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1047">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1046"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1051" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd1">
-                  <Foundation.Core.ModelElement.name>size</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1052"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1053" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fd0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1051"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1052">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1051"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1054" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fcf">
-                  <Foundation.Core.ModelElement.name>toArray</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1055"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1056" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fce">
-                      <Foundation.Core.ModelElement.name>return[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1054"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1055">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1054"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1057" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fcd">
-                  <Foundation.Core.ModelElement.name>toArray</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1058"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1059" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fcc">
-                      <Foundation.Core.ModelElement.name>return[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1057"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1060" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fcb">
-                      <Foundation.Core.ModelElement.name>a[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1057"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1058">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.653"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1057"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.1061" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff7">
-              <Foundation.Core.ModelElement.name>LittleEndian</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Namespace.ownedElement>
-                <Foundation.Core.Class xmi.id="xmi.1062">
-                  <Foundation.Core.ModelElement.name>BufferUnderrunException</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-                  <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Class.isActive xmi.value="false"/>
-                  <Foundation.Core.ModelElement.namespace>
-                    <Foundation.Core.Namespace xmi.idref="xmi.1061"/>
-                  </Foundation.Core.ModelElement.namespace>
-                </Foundation.Core.Class>
-              </Foundation.Core.Namespace.ownedElement>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.1063" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc1">
-                  <Foundation.Core.ModelElement.name>getShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1064"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1065" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1063"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1066" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fbf">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1063"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1067" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fbe">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1063"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1064">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1063"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1068" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fbd">
-                  <Foundation.Core.ModelElement.name>getShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1069"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1070" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fbc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1068"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1071" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fbb">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1068"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1069">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1068"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1072" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fba">
-                  <Foundation.Core.ModelElement.name>getInt</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1073"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1074" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb9">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1072"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1075" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb8">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1072"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1076" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb7">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1072"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1073">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1072"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1077" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb6">
-                  <Foundation.Core.ModelElement.name>getInt</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1078"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1079" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1077"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1080" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb4">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1077"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1078">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1077"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1081" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb3">
-                  <Foundation.Core.ModelElement.name>getLong</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1082"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1083" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb2">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1081"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1084" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb1">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1081"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1085" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fb0">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1081"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1082">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1081"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1086" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7faf">
-                  <Foundation.Core.ModelElement.name>getDouble</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1087"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1088" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fae">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1086"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.860"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1089" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fad">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1086"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1090" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fac">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1086"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1087">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1086"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1091" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fab">
-                  <Foundation.Core.ModelElement.name>getDouble</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1092"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1093" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7faa">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1091"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.860"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1094" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa9">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1091"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1092">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1091"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1095" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa8">
-                  <Foundation.Core.ModelElement.name>putShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1096"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1097" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa7">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1095"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1098" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa6">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1095"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1099" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa5">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1095"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1096">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1095"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1100" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa4">
-                  <Foundation.Core.ModelElement.name>putShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1101"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1102" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa3">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1100"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1103" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f9f">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1100"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1101">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1100"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1104" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa2">
-                  <Foundation.Core.ModelElement.name>getLong</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1105"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1106" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa1">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1104"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1107" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fa0">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1104"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1105">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1104"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1108" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f9e">
-                  <Foundation.Core.ModelElement.name>putInt</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1109"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1110" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f9d">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1108"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1111" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f9c">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1108"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1112" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f9b">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1108"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1109">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1108"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1113" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f9a">
-                  <Foundation.Core.ModelElement.name>putInt</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1114"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1115" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f99">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1113"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1116" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f98">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1113"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1114">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1113"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1117" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f97">
-                  <Foundation.Core.ModelElement.name>putLong</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1118"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1119" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f96">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1117"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1120" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f95">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1117"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1121" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f94">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1117"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1118">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1117"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1122" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f93">
-                  <Foundation.Core.ModelElement.name>putLong</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1123"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1124" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f92">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1122"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1125" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f91">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1122"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1123">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1122"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1126" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f90">
-                  <Foundation.Core.ModelElement.name>readShort</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1127"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1128" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f8f">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1126"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1129" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f8e">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1126"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1127">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1126"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1130" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f8d">
-                  <Foundation.Core.ModelElement.name>readInt</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1131"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1132" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f8c">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1130"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1133" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f8b">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1130"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1131">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1130"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1134" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f8a">
-                  <Foundation.Core.ModelElement.name>readLong</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1135"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1136" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f89">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1134"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1137" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f88">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1134"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1135">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1134"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1138" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f87">
-                  <Foundation.Core.ModelElement.name>readFromStream</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1139"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1140" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f86">
-                      <Foundation.Core.ModelElement.name>return []</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1138"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1141" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f85">
-                      <Foundation.Core.ModelElement.name>stream</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1138"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.575"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1142" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f84">
-                      <Foundation.Core.ModelElement.name>size</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1138"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1139">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1061"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1138"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.1143" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff6">
-              <Foundation.Core.ModelElement.name>LittleEndianConsts</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Attribute xmi.id="xmi.1144" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f83">
-                  <Foundation.Core.ModelElement.name>SHORT_SIZE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.1145">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>2</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1143"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.1146" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f82">
-                  <Foundation.Core.ModelElement.name>INT_SIZE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.1147">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>4</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1143"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.1148" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f81">
-                  <Foundation.Core.ModelElement.name>LONG_SIZE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.1149">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>8</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1143"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                </Foundation.Core.Attribute>
-                <Foundation.Core.Attribute xmi.id="xmi.1150" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f80">
-                  <Foundation.Core.ModelElement.name>DOUBLE_SIZE</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.StructuralFeature.changeability xmi.value="frozen"/>
-                  <Foundation.Core.Attribute.initialValue>
-                    <Foundation.Data_Types.Expression xmi.id="xmi.1151">
-                      <Foundation.Data_Types.Expression.language>java</Foundation.Data_Types.Expression.language>
-                      <Foundation.Data_Types.Expression.body>8</Foundation.Data_Types.Expression.body>
-                    </Foundation.Data_Types.Expression>
-                  </Foundation.Core.Attribute.initialValue>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1143"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.StructuralFeature.type>
-                    <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                  </Foundation.Core.StructuralFeature.type>
-                  <Foundation.Core.ModelElement.taggedValue>
-                    <Foundation.Extension_Mechanisms.TaggedValue xmi.id="xmi.1152">
-                      <Foundation.Extension_Mechanisms.TaggedValue.tag>transient</Foundation.Extension_Mechanisms.TaggedValue.tag>
-                      <Foundation.Extension_Mechanisms.TaggedValue.value>false</Foundation.Extension_Mechanisms.TaggedValue.value>
-                      <Foundation.Extension_Mechanisms.TaggedValue.modelElement>
-                        <Foundation.Core.ModelElement xmi.idref="xmi.1150"/>
-                      </Foundation.Extension_Mechanisms.TaggedValue.modelElement>
-                    </Foundation.Extension_Mechanisms.TaggedValue>
-                  </Foundation.Core.ModelElement.taggedValue>
-                </Foundation.Core.Attribute>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.1153" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff5">
-              <Foundation.Core.ModelElement.name>LongField</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.872"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.1154" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f7f">
-                  <Foundation.Core.ModelElement.name>get</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1153"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1155"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1156" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f7e">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1154"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1155">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1153"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1154"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1157" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f7d">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1153"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1158"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1159" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f7c">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1157"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1158">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1153"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1157"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1160" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f7b">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1153"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1161"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1162" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f7a">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1160"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.790"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1163" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f79">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1160"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1161">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1153"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1160"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.378" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff4">
-              <Foundation.Core.ModelElement.name>ShortField</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.873"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.1164" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f77">
-                  <Foundation.Core.ModelElement.name>get</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.378"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1165"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1166" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f76">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1164"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1165">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.378"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1164"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1167" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f75">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.378"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1168"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1169" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f74">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1167"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1168">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.378"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1167"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1170" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f73">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.378"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1171"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1172" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f72">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1170"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1173" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f71">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1170"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1171">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.378"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1170"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.1174" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff3">
-              <Foundation.Core.ModelElement.name>ShortList</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.1175" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ffd">
-                  <Foundation.Core.ModelElement.name>add</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1176"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1177" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ffc">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1175"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1178" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ffb">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1175"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1176">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1175"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1179" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ffa">
-                  <Foundation.Core.ModelElement.name>add</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1180"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1181" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff9">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1179"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1180">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1179"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1182" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff8">
-                  <Foundation.Core.ModelElement.name>addAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1183"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1184" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff7">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1182"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1185" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff6">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1182"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1183">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1182"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1186" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff5">
-                  <Foundation.Core.ModelElement.name>addAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1187"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1188" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff4">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1186"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1189" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff3">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1186"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1190" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff2">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1186"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1187">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1186"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1191" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7ff1">
-                  <Foundation.Core.ModelElement.name>clear</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1192"/>
-                  </Foundation.Core.Operation.method>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1192">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1191"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1193" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fef">
-                  <Foundation.Core.ModelElement.name>contains</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1194"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1195" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fee">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1193"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1196" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fed">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1193"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1194">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1193"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1197" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fec">
-                  <Foundation.Core.ModelElement.name>containsAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1198"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1199" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7feb">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1197"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1200" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fea">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1197"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1198">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1197"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1201" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe9">
-                  <Foundation.Core.ModelElement.name>equals</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1202"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1203" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe8">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1201"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1204" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe7">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1201"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.53"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1202">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1201"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1205" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe6">
-                  <Foundation.Core.ModelElement.name>get</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1206"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1207" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1205"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1208" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe4">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1205"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1206">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1205"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1209" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe3">
-                  <Foundation.Core.ModelElement.name>hashCode</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1210"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1211" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe2">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1209"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1210">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1209"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1212" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe1">
-                  <Foundation.Core.ModelElement.name>indexOf</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1213"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1214" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fe0">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1212"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1215" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fdf">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1212"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1213">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1212"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1216" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fde">
-                  <Foundation.Core.ModelElement.name>isEmpty</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1217"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1218" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fdd">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1216"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1217">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1216"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1219" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fdc">
-                  <Foundation.Core.ModelElement.name>lastIndexof</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1220"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1221" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fdb">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1219"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1222" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fda">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1219"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1220">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1219"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1223" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd9">
-                  <Foundation.Core.ModelElement.name>remove</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1224"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1225" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd8">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1223"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1226" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd7">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1223"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1224">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1223"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1227" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd6">
-                  <Foundation.Core.ModelElement.name>removeValue</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1228"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1229" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd5">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1227"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1230" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd4">
-                      <Foundation.Core.ModelElement.name>o</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1227"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1228">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1227"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1231" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd3">
-                  <Foundation.Core.ModelElement.name>removeAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1232"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1233" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd2">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1231"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1234" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd1">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1231"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1232">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1231"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1235" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fd0">
-                  <Foundation.Core.ModelElement.name>retainAll</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1236"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1237" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fcf">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1235"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.443"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1238" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fce">
-                      <Foundation.Core.ModelElement.name>c</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1235"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1236">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1235"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1239" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fcd">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1240"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1241" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fcc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1239"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1242" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fcb">
-                      <Foundation.Core.ModelElement.name>index</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1239"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1243" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fca">
-                      <Foundation.Core.ModelElement.name>element</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1239"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1240">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1239"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1244" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc9">
-                  <Foundation.Core.ModelElement.name>size</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1245"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1246" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc8">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1244"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1245">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1244"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1247" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc7">
-                  <Foundation.Core.ModelElement.name>toArray</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1248"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1249" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc6">
-                      <Foundation.Core.ModelElement.name>return[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1247"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1248">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1247"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1250" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc5">
-                  <Foundation.Core.ModelElement.name>toArray</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1251"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1252" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc4">
-                      <Foundation.Core.ModelElement.name>return []</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1250"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1253" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc3">
-                      <Foundation.Core.ModelElement.name>a[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1250"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.786"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1251">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1174"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1250"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.383" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff2">
-              <Foundation.Core.ModelElement.name>IntegerField</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.ModelElement.clientDependency>
-                <Foundation.Core.Dependency xmi.idref="xmi.871"/>
-              </Foundation.Core.ModelElement.clientDependency>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.1254" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fca">
-                  <Foundation.Core.ModelElement.name>get</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1255"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1256" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc9">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1254"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1255">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1254"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1257" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc8">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1258"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1259" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc6">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1257"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1258">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1257"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1260" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc5">
-                  <Foundation.Core.ModelElement.name>set</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1261"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1262" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc4">
-                      <Foundation.Core.ModelElement.name>value</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1260"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1263" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc3">
-                      <Foundation.Core.ModelElement.name>data[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1260"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1261">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.383"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1260"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Class xmi.id="xmi.1264" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7ff1">
-              <Foundation.Core.ModelElement.name>StringUtil</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.Class.isActive xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Classifier.feature>
-                <Foundation.Core.Operation xmi.id="xmi.1265" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc2">
-                  <Foundation.Core.ModelElement.name>getFromUnicode</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="classifier"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1264"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1266"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1267" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc1">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1265"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1268" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fc0">
-                      <Foundation.Core.ModelElement.name>string[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1265"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1269" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fbf">
-                      <Foundation.Core.ModelElement.name>offset</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1265"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1270" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fbe">
-                      <Foundation.Core.ModelElement.name>len</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1265"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.256"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1266">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1264"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1265"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-                <Foundation.Core.Operation xmi.id="xmi.1271" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fbd">
-                  <Foundation.Core.ModelElement.name>getFromUnicode</Foundation.Core.ModelElement.name>
-                  <Foundation.Core.ModelElement.visibility xmi.value="public"/>
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.Feature.ownerScope xmi.value="instance"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Operation.isRoot xmi.value="false"/>
-                  <Foundation.Core.Operation.isLeaf xmi.value="false"/>
-                  <Foundation.Core.Operation.isAbstract xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1264"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Operation.method>
-                    <Foundation.Core.Method xmi.idref="xmi.1272"/>
-                  </Foundation.Core.Operation.method>
-                  <Foundation.Core.BehavioralFeature.parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1273" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fbc">
-                      <Foundation.Core.ModelElement.name>return</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="return"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1271"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.273"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                    <Foundation.Core.Parameter xmi.id="xmi.1274" xmi.uuid="127-0-0-1-b3e62:e8e7bd98ce:-7fbb">
-                      <Foundation.Core.ModelElement.name>string[]</Foundation.Core.ModelElement.name>
-                      <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                      <Foundation.Core.Parameter.kind xmi.value="in"/>
-                      <Foundation.Core.Parameter.behavioralFeature>
-                        <Foundation.Core.BehavioralFeature xmi.idref="xmi.1271"/>
-                      </Foundation.Core.Parameter.behavioralFeature>
-                      <Foundation.Core.Parameter.type>
-                        <Foundation.Core.Classifier xmi.idref="xmi.393"/>
-                      </Foundation.Core.Parameter.type>
-                    </Foundation.Core.Parameter>
-                  </Foundation.Core.BehavioralFeature.parameter>
-                </Foundation.Core.Operation>
-                <Foundation.Core.Method xmi.id="xmi.1272">
-                  <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-                  <Foundation.Core.BehavioralFeature.isQuery xmi.value="false"/>
-                  <Foundation.Core.Feature.owner>
-                    <Foundation.Core.Classifier xmi.idref="xmi.1264"/>
-                  </Foundation.Core.Feature.owner>
-                  <Foundation.Core.Method.specification>
-                    <Foundation.Core.Operation xmi.idref="xmi.1271"/>
-                  </Foundation.Core.Method.specification>
-                </Foundation.Core.Method>
-              </Foundation.Core.Classifier.feature>
-            </Foundation.Core.Class>
-            <Foundation.Core.Abstraction xmi.id="xmi.870" xmi.uuid="127-0-0-1-b3e62:e8e6e8d8ef:-7faf">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.380"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.869"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.1275">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.870"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.871" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7fc2">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.383"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.869"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.1276">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.871"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.872" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f78">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.1153"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.869"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.1277">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.872"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-            <Foundation.Core.Abstraction xmi.id="xmi.873" xmi.uuid="127-0-0-1-b3e62:e8e77b88e1:-7f70">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Core.Dependency.client>
-                <Foundation.Core.ModelElement xmi.idref="xmi.378"/>
-              </Foundation.Core.Dependency.client>
-              <Foundation.Core.Dependency.supplier>
-                <Foundation.Core.ModelElement xmi.idref="xmi.869"/>
-              </Foundation.Core.Dependency.supplier>
-            </Foundation.Core.Abstraction>
-            <Foundation.Extension_Mechanisms.Stereotype xmi.id="xmi.1278">
-              <Foundation.Core.ModelElement.name>realize</Foundation.Core.ModelElement.name>
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isRoot xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isLeaf xmi.value="false"/>
-              <Foundation.Core.GeneralizableElement.isAbstract xmi.value="false"/>
-              <Foundation.Core.ModelElement.namespace>
-                <Foundation.Core.Namespace xmi.idref="xmi.868"/>
-              </Foundation.Core.ModelElement.namespace>
-              <Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-                <Foundation.Core.ModelElement xmi.idref="xmi.873"/>
-              </Foundation.Extension_Mechanisms.Stereotype.extendedElement>
-            </Foundation.Extension_Mechanisms.Stereotype>
-          </Foundation.Core.Namespace.ownedElement>
-        </Model_Management.Package>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1279">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1280"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1280" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fd4">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1282"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1283"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1279"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1284">
-          <Foundation.Core.ModelElement.name>addProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1285"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1285" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fcd">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1287"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1288"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1284"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1289">
-          <Foundation.Core.ModelElement.name>addChild</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1290"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1290" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fca">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1291"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1292"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1289"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1293" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fc9">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1294"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1295">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1296"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1293"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1297">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1298"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1293"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1294" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fc8">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1296"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1298"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1293"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1299"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1299">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1294"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1300">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1301"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1301" xmi.uuid="127-0-0-1-b3e62:e8ec1c9a02:-7ffc">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1296"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1298"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1302"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1300"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1303" xmi.uuid="127-0-0-1-b3e62:e8ec275d67:-7ff3">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1296"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1304"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1305"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1306"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1307">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1308"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1308" xmi.uuid="127-0-0-1-b3e62:e8ec275d67:-7ff0">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1304"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1309"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1310"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1307"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1296" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7ffd">
-          <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1295"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1311"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1312"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1294"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1301"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1303"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1298" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7ff5">
-          <Foundation.Core.ModelElement.name>HeaderBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1297"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1313"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1294"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1301"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1304" xmi.uuid="127-0-0-1-b3e62:e8ec275d67:-7ff5">
-          <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1314"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1315"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1308"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1303"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1309" xmi.uuid="127-0-0-1-b3e62:e8ec275d67:-7ff2">
-          <Foundation.Core.ModelElement.name>RootProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1316"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1308"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1302" xmi.uuid="127-0-0-1-b3e62:e8ec1c9a02:-7ffd">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1301"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1311">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1296"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1302"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1313">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1298"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1302"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1305" xmi.uuid="127-0-0-1-b3e62:e8ec275d67:-7ff4">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1303"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1312">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1296"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1305"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1314">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1304"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1305"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1310" xmi.uuid="127-0-0-1-b3e62:e8ec275d67:-7ff1">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1308"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1315">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1304"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1310"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1316">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1309"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1310"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1306">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1303"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1317" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff7">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1318"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1319"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1320"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1321"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1322">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1323"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1323" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff4">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1319"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1324"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1325"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1322"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1321">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1317"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1326">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1327"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1327" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff2">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1318"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1328"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1329"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1326"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1330">
-          <Foundation.Core.ModelElement.name>getDocumentProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1331"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1331" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7fe8">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1332"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1330"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1333">
-          <Foundation.Core.ModelElement.name>getRoot</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1334"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1334" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7fe6">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1287"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1335"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1333"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1336">
-          <Foundation.Core.ModelElement.name>create (multiple)</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1337"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1337" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ffb">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1338"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1339"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1336"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1340">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1341"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1341" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff9">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1342"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1340"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1286" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fe7">
-          <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1343"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1344"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1345"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1346"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1347"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1285"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1290"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1331"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1334"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1341"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1281" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fe6">
-          <Foundation.Core.ModelElement.name>Document</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1348"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1349"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1350"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1351"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1280"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1337"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1331"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1341"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1338" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ffd">
-          <Foundation.Core.ModelElement.name>DocumentBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1352"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1337"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1282" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fe3">
-          <Foundation.Core.ModelElement.name>DocumentProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1353"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1280"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1287" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fcf">
-          <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1354"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1355"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1285"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1334"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1291" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fcc">
-          <Foundation.Core.ModelElement.name>RootProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1356"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1290"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1283" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fd5">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1280"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1348">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1283"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1353">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1282"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1283"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1288" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fce">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1285"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1343">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1288"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1354">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1287"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1288"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1292" xmi.uuid="127-0-0-1-5b0da1:e8ebb17784:-7fcb">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1290"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1344">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1292"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1356">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1291"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1292"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1332" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7fe9">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1331"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1345">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1332"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1349">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1332"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1335" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7fe7">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1334"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1346">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1335"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1355">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1287"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1335"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1339" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ffc">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1337"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1350">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1339"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1352">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1338"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1339"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1342" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ffa">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1341"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1347">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1286"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1342"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1351">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1281"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1342"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1357" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff5">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1360"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1361"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1362">
-          <Foundation.Core.ModelElement.name>create (1 .. n)</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1363"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1363" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff1">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1364"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1365"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1362"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1366">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1367"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1367" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fef">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1368"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1369"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1366"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1370">
-          <Foundation.Core.ModelElement.name>getDocumentProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1371"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1371" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fed">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1372"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1370"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1373">
-          <Foundation.Core.ModelElement.name>addProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1374"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1374" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fea">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1375"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1376"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1373"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1377">
-          <Foundation.Core.ModelElement.name>getRoot</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1378"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1378" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fe7">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1375"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1379"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1377"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1380">
-          <Foundation.Core.ModelElement.name>addChild</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1381"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1381" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fe5">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1382"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1383"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1380"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1361">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1357"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1384">
-          <Foundation.Core.ModelElement.name>setIndex (for each Property)</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1385"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1385" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff7">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1386"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1387"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1388"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1384"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1389">
-          <Foundation.Core.ModelElement.name>createPropertyBlockArray</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1390"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1390" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff5">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1386"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1391"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1392"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1389"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1393">
-          <Foundation.Core.ModelElement.name>create (enough so we have a multiple of 4 properties)</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1394"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1394" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff3">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1391"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1395"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1396"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1393"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1397">
-          <Foundation.Core.ModelElement.name>create (1 for every 4 properties)</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1398"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1398" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff1">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1391"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1399"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1400"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1397"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1401">
-          <Foundation.Core.ModelElement.name>preWrite (for each Property)</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1402"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1402" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fef">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1386"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1387"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1403"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1401"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1404">
-          <Foundation.Core.ModelElement.name>setNextFile</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1405"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1405" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fe7">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1407"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1408"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1404"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1409">
-          <Foundation.Core.ModelElement.name>set _child_property</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1410"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1410" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fe5">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1411"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1409"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1412">
-          <Foundation.Core.ModelElement.name>setPreviousFile</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1413"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1413" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fe3">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1407"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1414"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1412"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1415">
-          <Foundation.Core.ModelElement.name>preWrite</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1416"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1416" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff3">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1418"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1419"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1415"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1420">
-          <Foundation.Core.ModelElement.name>countBlocks</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1421"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1421" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fef">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1422"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1423"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1420"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1424">
-          <Foundation.Core.ModelElement.name>allocateSpace</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1425"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1425" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fed">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1426"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1427"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1424"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1428">
-          <Foundation.Core.ModelElement.name>setStartBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1429"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1429" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7feb">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1422"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1430"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1428"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1431">
-          <Foundation.Core.ModelElement.name>createBlocks</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1432"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1432" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fe9">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1426"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1433"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1431"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1434">
-          <Foundation.Core.ModelElement.name>setBatBlocks</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1435"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1435" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fe7">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1436"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1437"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1434"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1438">
-          <Foundation.Core.ModelElement.name>setPropertyStart</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1439"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1439" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fe5">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1436"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1440"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1438"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1441">
-          <Foundation.Core.ModelElement.name>writeBlocks</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1442"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1442" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fe3">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1443"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1444"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1441"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CreateAction xmi.id="xmi.1445">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1446"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CreateAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1446" xmi.uuid="127-0-0-1-5b0da1:e8f6a416d0:-7ffc">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1426"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1447"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1445"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1448">
-          <Foundation.Core.ModelElement.name>setXBATStart</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1449"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1449" xmi.uuid="127-0-0-1-b3e62:e8fe06844b:-7ffc">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1436"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1450"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1448"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1451" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fc7">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1452"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1453"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1454"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1455"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1456">
-          <Foundation.Core.ModelElement.name>createDocument</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1457"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1457" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fc5">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1452"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1453"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1458"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1456"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1459">
-          <Foundation.Core.ModelElement.name>writeFileSystem</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1460"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Stimulus xmi.id="xmi.1460" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fc3">
-          <Foundation.Core.ModelElement.name></Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Stimulus.sender>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1452"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.sender>
-          <Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-            <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1453"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.receiver>
-          <Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-            <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1461"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.communicationLink>
-          <Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-            <Behavioral_Elements.Common_Behavior.Action xmi.idref="xmi.1459"/>
-          </Behavioral_Elements.Common_Behavior.Stimulus.dispatchAction>
-        </Behavioral_Elements.Common_Behavior.Stimulus>
-        <Behavioral_Elements.Common_Behavior.CallAction xmi.id="xmi.1455">
-          <Foundation.Core.ModelElement.name>create</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Behavioral_Elements.Common_Behavior.Action.isAsynchronous xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Action.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1451"/>
-          </Behavioral_Elements.Common_Behavior.Action.stimulus>
-        </Behavioral_Elements.Common_Behavior.CallAction>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1318" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ffd">
-          <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1462"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1463"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1317"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1327"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1328" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ffc">
-          <Foundation.Core.ModelElement.name>HeaderBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1464"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1327"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1319" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff9">
-          <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1465"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1466"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1323"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1317"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1324" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff6">
-          <Foundation.Core.ModelElement.name>RootProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1467"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1323"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1320" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff8">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1317"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1462">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1318"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1320"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1465">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1319"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1320"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1325" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff5">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1323"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1466">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1319"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1325"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1467">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1324"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1325"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1329" xmi.uuid="127-0-0-1-b3e62:e8ecfd4ea4:-7ff3">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1327"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1463">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1318"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1329"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1464">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1328"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1329"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1358" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff8">
-          <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1468"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1469"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1470"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1471"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1472"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1357"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1371"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1374"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1378"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1381"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1359" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff7">
-          <Foundation.Core.ModelElement.name>Document</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1473"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1474"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1475"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1476"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1363"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1367"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1357"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1371"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1368" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff4">
-          <Foundation.Core.ModelElement.name>DocumentProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1477"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1367"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1364" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff3">
-          <Foundation.Core.ModelElement.name>DocumentBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1478"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1363"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1375" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fec">
-          <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1479"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1480"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1374"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1378"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1382" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fe9">
-          <Foundation.Core.ModelElement.name>RootProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1481"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1381"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1360" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff6">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1357"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1468">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1360"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1473">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1360"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1365" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff2">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1363"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1474">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1365"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1478">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1364"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1365"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1369" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7ff0">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1367"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1475">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1369"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1477">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1368"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1369"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1372" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fee">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1371"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1469">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1372"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1476">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1359"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1372"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1376" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7feb">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1374"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1470">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1376"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1479">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1375"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1376"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1379" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fe8">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1378"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1471">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1379"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1480">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1375"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1379"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1383" xmi.uuid="127-0-0-1-497f6:e8f1a8b3bb:-7fe6">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1381"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1472">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1358"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1383"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1481">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1382"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1383"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1386" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ffd">
-          <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1482"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1483"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1484"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1385"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1390"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1402"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1387" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ffc">
-          <Foundation.Core.ModelElement.name>Property</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1485"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1486"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1385"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1402"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1391" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ffb">
-          <Foundation.Core.ModelElement.name>PropertyBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1487"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1488"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1489"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1394"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1398"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1390"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1399" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ffa">
-          <Foundation.Core.ModelElement.name>PropertyBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1490"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1398"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1395" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff9">
-          <Foundation.Core.ModelElement.name>Property</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1491"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1394"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1388" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff8">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1385"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1482">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1386"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1388"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1485">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1387"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1388"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1392" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff6">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1390"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1483">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1386"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1392"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1487">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1391"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1392"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1396" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff4">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1394"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1488">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1391"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1396"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1491">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1395"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1396"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1400" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff2">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1398"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1489">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1391"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1400"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1490">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1399"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1400"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1403" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7ff0">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1402"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1484">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1386"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1403"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1486">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1387"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1403"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1406" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fee">
-          <Foundation.Core.ModelElement.name>RootProperty</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1492"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1493"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1494"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1495"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1405"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1410"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1413"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1410"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1407" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fed">
-          <Foundation.Core.ModelElement.name>Property</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1496"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1497"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1405"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1413"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1408" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fe8">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1405"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1492">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1408"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1496">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1407"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1408"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1411" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fe6">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1410"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1493">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1411"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1494">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1411"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1414" xmi.uuid="127-0-0-1-497f6:e8f35b320f:-7fe4">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1413"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1495">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1406"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1414"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1497">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1407"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1414"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1417" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ffa">
-          <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1498"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1499"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1500"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1501"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1502"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1503"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1504"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1505"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1506"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1507"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1416"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1421"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1425"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1429"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1432"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1435"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1439"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1442"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1446"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1449"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1418" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff9">
-          <Foundation.Core.ModelElement.name>PropertyTable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1508"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1416"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1422" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff8">
-          <Foundation.Core.ModelElement.name>BATManaged</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1509"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1510"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1421"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1429"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1426" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff7">
-          <Foundation.Core.ModelElement.name>BlockAllocationTable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1511"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1512"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1513"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1425"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1432"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1446"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1436" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff6">
-          <Foundation.Core.ModelElement.name>HeaderBlock</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1514"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1515"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1516"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1435"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1439"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1449"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1443" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff5">
-          <Foundation.Core.ModelElement.name>BlockWritable</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1517"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1442"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1419" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff4">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1416"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1498">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1419"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1508">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1418"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1419"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1423" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7ff0">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1421"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1499">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1423"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1509">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1422"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1423"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1427" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fee">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1425"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1500">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1427"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1511">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1426"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1427"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1430" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fec">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1429"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1501">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1430"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1510">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1422"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1430"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1433" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fea">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1432"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1502">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1433"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1512">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1426"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1433"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1437" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fe8">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1435"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1503">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1437"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1514">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1436"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1437"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1440" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fe6">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1439"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1504">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1440"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1515">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1436"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1440"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1444" xmi.uuid="127-0-0-1-497f6:e8f6657b00:-7fe4">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1442"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1505">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1444"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1517">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1443"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1444"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1447" xmi.uuid="127-0-0-1-5b0da1:e8f6a416d0:-7ffd">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1446"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1506">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1447"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1513">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1426"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1447"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1450" xmi.uuid="127-0-0-1-b3e62:e8fe06844b:-7ffd">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1449"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1507">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1417"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1450"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1516">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1436"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1450"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1452" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fca">
-          <Foundation.Core.ModelElement.name>(Client Application)</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1518"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1519"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1520"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1451"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1457"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1460"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus3>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Object xmi.id="xmi.1453" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fc9">
-          <Foundation.Core.ModelElement.name>Filesystem</Foundation.Core.ModelElement.name>
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1521"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1522"/>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.idref="xmi.1523"/>
-          </Behavioral_Elements.Common_Behavior.Instance.linkEnd>
-          <Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1451"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1457"/>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1460"/>
-          </Behavioral_Elements.Common_Behavior.Instance.stimulus2>
-        </Behavioral_Elements.Common_Behavior.Object>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1454" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fc8">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1451"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1518">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1452"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1454"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1521">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1453"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1454"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1458" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fc6">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1457"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1519">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1452"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1458"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1522">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1453"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1458"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-        <Behavioral_Elements.Common_Behavior.Link xmi.id="xmi.1461" xmi.uuid="127-0-0-1-497f6:e929957ff4:-7fc4">
-          <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-          <Foundation.Core.ModelElement.namespace>
-            <Foundation.Core.Namespace xmi.idref="xmi.1"/>
-          </Foundation.Core.ModelElement.namespace>
-          <Behavioral_Elements.Common_Behavior.Link.stimulus>
-            <Behavioral_Elements.Common_Behavior.Stimulus xmi.idref="xmi.1460"/>
-          </Behavioral_Elements.Common_Behavior.Link.stimulus>
-          <Behavioral_Elements.Common_Behavior.Link.connection>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1520">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1452"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1461"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-            <Behavioral_Elements.Common_Behavior.LinkEnd xmi.id="xmi.1523">
-              <Foundation.Core.ModelElement.isSpecification xmi.value="false"/>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-                <Behavioral_Elements.Common_Behavior.Instance xmi.idref="xmi.1453"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.instance>
-              <Behavioral_Elements.Common_Behavior.LinkEnd.link>
-                <Behavioral_Elements.Common_Behavior.Link xmi.idref="xmi.1461"/>
-              </Behavioral_Elements.Common_Behavior.LinkEnd.link>
-            </Behavioral_Elements.Common_Behavior.LinkEnd>
-          </Behavioral_Elements.Common_Behavior.Link.connection>
-        </Behavioral_Elements.Common_Behavior.Link>
-      </Foundation.Core.Namespace.ownedElement>
-    </Model_Management.Model>
-  </XMI.content>
-</XMI>
diff --git a/trunk/src/models/poifsAnalysisClasses.pgml b/trunk/src/models/poifsAnalysisClasses.pgml
deleted file mode 100644
index 91ae564..0000000
--- a/trunk/src/models/poifsAnalysisClasses.pgml
+++ /dev/null
@@ -1,1243 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|-64--88-1-2-717d91:e7cd986e07:-7ffd"
-      name="poifsAnalysisClasses"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[40, 24, 239, 61]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ffd"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="40"
-      y="24"
-      width="239"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig0.2"
-      context=""
-      x="40"
-      y="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >POIFileSystem</text>
-    <rectangle name="Fig0.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig0.4"
-      context=""
-      x="40"
-      y="44"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig0.5"
-      context=""
-      x="40"
-      y="64"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+readFileSystem(InputStream in)() : POIFileSystem</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[312, 144, 273, 61]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ffc"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="312"
-      y="144"
-      width="273"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.2"
-      context=""
-      x="312"
-      y="144"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Block</text>
-    <rectangle name="Fig1.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig1.4"
-      context=""
-      x="312"
-      y="164"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.5"
-      context=""
-      x="312"
-      y="184"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createBlock(byte[] bytes, int offset, int length)() : Block</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[488, 288, 90, 61]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ffb"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="488"
-      y="288"
-      width="90"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.2"
-      context=""
-      x="488"
-      y="288"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HeaderBlock</text>
-    <rectangle name="Fig2.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig2.4"
-      context=""
-      x="488"
-      y="308"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.5"
-      context=""
-      x="488"
-      y="328"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[328, 32, 90, 61]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ffa"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="328"
-      y="32"
-      width="90"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig3.2"
-      context=""
-      x="328"
-      y="32"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BATBlock</text>
-    <rectangle name="Fig3.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig3.4"
-      context=""
-      x="328"
-      y="52"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig3.5"
-      context=""
-      x="328"
-      y="72"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[64, 144, 94, 61]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ff9"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="64"
-      y="144"
-      width="94"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.2"
-      context=""
-      x="64"
-      y="144"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTableBlock</text>
-    <rectangle name="Fig4.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig4.4"
-      context=""
-      x="64"
-      y="164"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.5"
-      context=""
-      x="64"
-      y="184"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[56, 288, 90, 61]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ff8"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig5.0"
-      x="56"
-      y="288"
-      width="90"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.2"
-      context=""
-      x="56"
-      y="288"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >Property</text>
-    <rectangle name="Fig5.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig5.4"
-      context=""
-      x="56"
-      y="308"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.5"
-      context=""
-      x="56"
-      y="328"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[64, 488, 90, 61]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7feb"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig6.0"
-      x="64"
-      y="488"
-      width="90"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig6.2"
-      context=""
-      x="64"
-      y="488"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >RootProperty</text>
-    <rectangle name="Fig6.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig6.4"
-      context=""
-      x="64"
-      y="508"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig6.5"
-      context=""
-      x="64"
-      y="528"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[568, 32, 179, 65]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7fe4"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig7.0"
-      x="568"
-      y="32"
-      width="179"
-      height="64"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig7.2"
-      context=""
-      x="568"
-      y="32"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BAT</text>
-    <rectangle name="Fig7.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig7.4"
-      context=""
-      x="568"
-      y="52"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >-blocks[0..*] : BATBlock</text>
-    <text name="Fig7.5"
-      context=""
-      x="568"
-      y="72"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createRecord(bytes:Collection) : int
-+getBlocks() : Collection</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[248, 224, 216, 61]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7fdb"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig8.0"
-      x="248"
-      y="224"
-      width="216"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig8.2"
-      context=""
-      x="248"
-      y="224"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyTable</text>
-    <rectangle name="Fig8.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig8.4"
-      context=""
-      x="248"
-      y="244"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig8.5"
-      context=""
-      x="248"
-      y="264"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+createRecord(name:String, startBlock:int, :)</text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[56, 392, 90, 61]"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7ffd"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig9.0"
-      x="56"
-      y="392"
-      width="90"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig9.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig9.2"
-      context=""
-      x="56"
-      y="392"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >DirectoryProperty</text>
-    <rectangle name="Fig9.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig9.4"
-      context=""
-      x="56"
-      y="412"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig9.5"
-      context=""
-      x="56"
-      y="432"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[176, 392, 90, 61]"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7ffa"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig10.0"
-      x="176"
-      y="392"
-      width="90"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig10.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig10.2"
-      context=""
-      x="176"
-      y="392"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >FileProperty</text>
-    <rectangle name="Fig10.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig10.4"
-      context=""
-      x="176"
-      y="412"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig10.5"
-      context=""
-      x="176"
-      y="432"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ff5"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig3.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig3"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="418"
-              y="92" />
-      <lineto x="418"
-              y="144" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ff4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="158"
-              y="168" />
-      <lineto x="312"
-              y="168" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7ff2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="553"
-              y="288" />
-      <lineto x="553"
-              y="204" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-3dcd27:e851a6400f:-7fe3"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig7.0"
-      destPortFig="Fig1.0"
-      sourceFigNode="Fig7"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="585"
-              y="96" />
-      <lineto x="585"
-              y="144" />
-    </path>
-    <annotations>
-        <text name="Fig14.1"
-          context="destMult"
-          x="585"
-          y="122"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >0..*</text>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="10-10-101-65-3dcd27:e851d7de74:-7ffd"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig4"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="104"
-              y="204" />
-      <lineto x="104"
-              y="288" />
-    </path>
-    <annotations>
-        <text name="Fig15.1"
-          context="destMult"
-          x="99"
-          y="271"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >0..*</text>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7ffc"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig9.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig9"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="120"
-              y="392" />
-      <lineto x="120"
-              y="348" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig17"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7ffb"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.0"
-      destPortFig="Fig9.0"
-      sourceFigNode="Fig6"
-      destFigNode="Fig9"
-    </private>
-    <path name="Fig17.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="128"
-              y="488" />
-      <lineto x="128"
-              y="452" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig18"
-       description="org.argouml.uml.diagram.ui.FigGeneralization"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7ff2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig10.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig10"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig18.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="176"
-              y="392" />
-      <lineto x="146"
-              y="348" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig19"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7ff1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig9.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig9"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig19.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="72"
-              y="392" />
-      <lineto x="72"
-              y="348" />
-    </path>
-    <annotations>
-        <text name="Fig19.1"
-          context="name"
-          x="47"
-          y="363"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >child</text>
-    </annotations>
-  </group>
-  <group name="Fig20"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7fee"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig5.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig5"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig20.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="146"
-              y="296" />
-      <lineto x="192"
-              y="296" />
-      <lineto x="192"
-              y="336" />
-      <lineto x="146"
-              y="336" />
-    </path>
-    <annotations>
-        <text name="Fig20.1"
-          context="srcRole"
-          x="165"
-          y="304"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >+next</text>
-        <text name="Fig20.1"
-          context="srcMult"
-          x="146"
-          y="304"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >0..1</text>
-    </annotations>
-  </group>
-  <group name="Fig21"
-       description="org.argouml.uml.diagram.ui.FigAssociation"
-       href="127-0-0-1-5c2843:e8a9b10b99:-7feb"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig5.0"
-      destPortFig="Fig5.0"
-      sourceFigNode="Fig5"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig21.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="56"
-              y="296" />
-      <lineto x="16"
-              y="296" />
-      <lineto x="16"
-              y="336" />
-      <lineto x="56"
-              y="336" />
-    </path>
-    <annotations>
-        <text name="Fig21.1"
-          context="srcMult"
-          x="51"
-          y="293"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >0..1</text>
-        <text name="Fig21.1"
-          context="name"
-          x="45"
-          y="309"
-          fill="0"
-          fillcolor="-1"
-          stroke="0"
-          strokecolor="-16777216"
-          font="dialog"
-          textsize="9"
-        >previous</text>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/projectmain.pgml b/trunk/src/models/projectmain.pgml
deleted file mode 100644
index e385871..0000000
--- a/trunk/src/models/projectmain.pgml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|-64--88-1-2-717d91:e7cd986e07:-8000"
-      name="projectmain"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigPackage[96, 88, 140, 100]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7fff"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="97"
-      y="89"
-      width="138"
-      height="98"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.1"
-      context=""
-      x="96"
-      y="88"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >analysisModel</text>
-    <text name="Fig0.2"
-      context=""
-      x="96"
-      y="103"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="serif"
-      textsize="10"
-    ></text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigPackage[336, 88, 140, 100]"
-       href="-64--88-1-2-717d91:e7cd986e07:-7ffe"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="337"
-      y="89"
-      width="138"
-      height="98"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="336"
-      y="88"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >designModel</text>
-    <text name="Fig1.2"
-      context=""
-      x="336"
-      y="103"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="serif"
-      textsize="10"
-    ></text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigPackage[120, 232, 140, 100]"
-       href="127-0-0-1-5b0da1:e8e6d2b713:-7ffc"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="121"
-      y="233"
-      width="138"
-      height="98"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.1"
-      context=""
-      x="120"
-      y="232"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >util</text>
-    <text name="Fig2.2"
-      context=""
-      x="120"
-      y="247"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="serif"
-      textsize="10"
-    ></text>
-  </group>
-</pgml>
diff --git a/trunk/src/models/readFileFromFilesystemSequenceDiagram.pgml b/trunk/src/models/readFileFromFilesystemSequenceDiagram.pgml
deleted file mode 100644
index e2af740..0000000
--- a/trunk/src/models/readFileFromFilesystemSequenceDiagram.pgml
+++ /dev/null
@@ -1,1296 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-7ff2"
-      name="readFileFromFilesystemSequenceDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 84, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ffd"
-       shown="0"
-       dynobjects="[a|0|7|false|false, b|0, b|7]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig0"
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : ClientApps</text>
-    <rectangle name="Fig0.3"
-      x="48"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="48"
-              y="393" />
-      <lineto x="57"
-              y="393" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="57"
-              y="393" />
-      <lineto x="48"
-              y="393" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="42"
-      y="69"
-      width="21"
-      height="280"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="42"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="42"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[154, 10, 97, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ffc"
-       shown="0"
-       dynobjects="[a|0|7|false|false, b|1, b|3, b|5, b|6, b|0, b|7]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig1"
-    </private>
-    <rectangle name="Fig1.0"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="154"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : POIFileSystem</text>
-    <rectangle name="Fig1.3"
-      x="198"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="198"
-              y="393" />
-      <lineto x="207"
-              y="393" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="207"
-              y="393" />
-      <lineto x="198"
-              y="393" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="192"
-      y="69"
-      width="21"
-      height="280"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="192"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="192"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.9"
-      x="192"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.10"
-      x="192"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.11"
-      x="192"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.12"
-      x="192"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[311, 10, 97, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ff7"
-       shown="0"
-       dynobjects="[a|1|2|false|false, b|1, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig2"
-    </private>
-    <rectangle name="Fig2.0"
-      x="311"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="311"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="311"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : PropertyTable</text>
-    <rectangle name="Fig2.3"
-      x="355"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="355"
-              y="393" />
-      <lineto x="364"
-              y="393" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="364"
-              y="393" />
-      <lineto x="355"
-              y="393" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="349"
-      y="109"
-      width="21"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="349"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.8"
-      x="349"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[468, 10, 97, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ff4"
-       shown="0"
-       dynobjects="[a|2|2|false|false, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig3"
-    </private>
-    <rectangle name="Fig3.0"
-      x="468"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.1"
-      x="468"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="468"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >PropertyBlock : </text>
-    <rectangle name="Fig3.3"
-      x="512"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig3.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="512"
-              y="393" />
-      <lineto x="521"
-              y="393" />
-    </path>
-    <path name="Fig3.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="521"
-              y="393" />
-      <lineto x="512"
-              y="393" />
-    </path>
-    <rectangle name="Fig3.6"
-      x="506"
-      y="149"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.7"
-      x="506"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[625, 10, 50, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fef"
-       shown="0"
-       dynobjects="[a|3|4|false|false, b|3, b|4]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig4"
-    </private>
-    <rectangle name="Fig4.0"
-      x="625"
-      y="10"
-      width="50"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.1"
-      x="625"
-      y="10"
-      width="50"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="625"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : BAT</text>
-    <rectangle name="Fig4.3"
-      x="646"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig4.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="646"
-              y="393" />
-      <lineto x="655"
-              y="393" />
-    </path>
-    <path name="Fig4.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="655"
-              y="393" />
-      <lineto x="646"
-              y="393" />
-    </path>
-    <rectangle name="Fig4.6"
-      x="640"
-      y="189"
-      width="21"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.7"
-      x="640"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.8"
-      x="640"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[735, 10, 76, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fec"
-       shown="0"
-       dynobjects="[a|4|4|false|false, b|4]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig5"
-    </private>
-    <rectangle name="Fig5.0"
-      x="735"
-      y="10"
-      width="76"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.1"
-      x="735"
-      y="10"
-      width="76"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="735"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : BATBlock</text>
-    <rectangle name="Fig5.3"
-      x="769"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig5.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="769"
-              y="393" />
-      <lineto x="778"
-              y="393" />
-    </path>
-    <path name="Fig5.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="778"
-              y="393" />
-      <lineto x="769"
-              y="393" />
-    </path>
-    <rectangle name="Fig5.6"
-      x="763"
-      y="229"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.7"
-      x="763"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[871, 10, 57, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe7"
-       shown="0"
-       dynobjects="[a|5|5|false|false, b|5]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig6"
-    </private>
-    <rectangle name="Fig6.0"
-      x="871"
-      y="10"
-      width="57"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.1"
-      x="871"
-      y="10"
-      width="57"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="871"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : Block</text>
-    <rectangle name="Fig6.3"
-      x="895"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig6.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="895"
-              y="393" />
-      <lineto x="904"
-              y="393" />
-    </path>
-    <path name="Fig6.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="904"
-              y="393" />
-      <lineto x="895"
-              y="393" />
-    </path>
-    <rectangle name="Fig6.6"
-      x="889"
-      y="269"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.7"
-      x="889"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[988, 10, 166, 384]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe4"
-       shown="0"
-       dynobjects="[a|6|6|false|false, b|6]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig7"
-    </private>
-    <rectangle name="Fig7.0"
-      x="988"
-      y="10"
-      width="166"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.1"
-      x="988"
-      y="10"
-      width="166"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="988"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ByteArrayInputStream : Object</text>
-    <rectangle name="Fig7.3"
-      x="1067"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig7.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1067"
-              y="393" />
-      <lineto x="1076"
-              y="393" />
-    </path>
-    <path name="Fig7.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1076"
-              y="393" />
-      <lineto x="1067"
-              y="393" />
-    </path>
-    <rectangle name="Fig7.6"
-      x="1061"
-      y="309"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.7"
-      x="1061"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig8.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[219, 92, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ff5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig8.1.0"
-      context=""
-      x="219"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : gets property from</text>
-  </group>
-  <group name="Fig9.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[376, 132, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ff0"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig9.1.0"
-      context=""
-      x="376"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : gets property from</text>
-  </group>
-  <group name="Fig10.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[350, 172, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fed"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig10.1.0"
-      context=""
-      x="350"
-      y="172"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : gets BAT Chain from</text>
-  </group>
-  <group name="Fig11.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[651, 212, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig11.1.0"
-      context=""
-      x="651"
-      y="212"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : gets next bat chain element [until all are read]</text>
-  </group>
-  <group name="Fig12.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[462, 252, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig12.1.0"
-      context=""
-      x="462"
-      y="252"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : gets bytes [from each block in bat chain]</text>
-  </group>
-  <group name="Fig13.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[539, 292, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe2"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig13.1.0"
-      context=""
-      x="539"
-      y="292"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : constructs a byte array input stream with file bytes</text>
-  </group>
-  <group name="Fig14.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[66, 52, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fde"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig14.1.0"
-      context=""
-      x="66"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : requests file</text>
-  </group>
-  <group name="Fig15.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[79, 352, 111, 14]"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fdc"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig15.1.0"
-      context=""
-      x="79"
-      y="352"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : returns input stream</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ff6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.7"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig8.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="109" />
-      <lineto x="349"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7ff1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.8"
-      destPortFig="Fig3.7"
-      sourceFigNode="Fig2"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="370"
-              y="149" />
-      <lineto x="506"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fee"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.8"
-      destPortFig="Fig4.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="189" />
-      <lineto x="640"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.8"
-      destPortFig="Fig5.7"
-      sourceFigNode="Fig4"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="661"
-              y="229" />
-      <lineto x="763"
-              y="229" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.9"
-      destPortFig="Fig6.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig6"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="269" />
-      <lineto x="889"
-              y="269" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fe3"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.10"
-      destPortFig="Fig7.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="309" />
-      <lineto x="1061"
-              y="309" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fdf"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.11"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="63"
-              y="69" />
-      <lineto x="192"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524f6c3a:-7fdd"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.12"
-      destPortFig="Fig0.8"
-      sourceFigNode="Fig1"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="192"
-              y="349" />
-      <lineto x="63"
-              y="349" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/readFileSystemDirectorySequenceDiagram.pgml b/trunk/src/models/readFileSystemDirectorySequenceDiagram.pgml
deleted file mode 100644
index 5456e96..0000000
--- a/trunk/src/models/readFileSystemDirectorySequenceDiagram.pgml
+++ /dev/null
@@ -1,428 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-7ff3"
-      name="readFileSystemDirectorySequenceDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 84, 144]"
-       href="10-10-101-65-3b05de:e8524685c9:-7ffd"
-       shown="0"
-       dynobjects="[a|0|0|false|false, b|0]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : ClientApps</text>
-    <rectangle name="Fig0.3"
-      x="48"
-      y="34"
-      width="10"
-      height="120"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="48"
-              y="153" />
-      <lineto x="57"
-              y="153" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="57"
-              y="153" />
-      <lineto x="48"
-              y="153" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="42"
-      y="69"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="42"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[154, 10, 97, 144]"
-       href="10-10-101-65-3b05de:e8524685c9:-7ffc"
-       shown="0"
-       dynobjects="[a|0|1|false|false, b|0, b|1]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="154"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : POIFileSystem</text>
-    <rectangle name="Fig1.3"
-      x="198"
-      y="34"
-      width="10"
-      height="120"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="198"
-              y="153" />
-      <lineto x="207"
-              y="153" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="207"
-              y="153" />
-      <lineto x="198"
-              y="153" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="192"
-      y="69"
-      width="21"
-      height="40"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="192"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="192"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[311, 10, 97, 144]"
-       href="10-10-101-65-3b05de:e8524685c9:-7ffb"
-       shown="0"
-       dynobjects="[a|1|1|false|false, b|1]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="311"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="311"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="311"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : PropertyTable</text>
-    <rectangle name="Fig2.3"
-      x="355"
-      y="34"
-      width="10"
-      height="120"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="355"
-              y="153" />
-      <lineto x="364"
-              y="153" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="364"
-              y="153" />
-      <lineto x="355"
-              y="153" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="349"
-      y="109"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="349"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[66, 52, 111, 14]"
-       href="10-10-101-65-3b05de:e8524685c9:-7ff9"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig3.1.0"
-      context=""
-      x="66"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : requests directory listing</text>
-  </group>
-  <group name="Fig4.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[219, 92, 111, 14]"
-       href="10-10-101-65-3b05de:e8524685c9:-7ff7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig4.1.0"
-      context=""
-      x="219"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : enumerates properties</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524685c9:-7ffa"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig3.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="63"
-              y="69" />
-      <lineto x="192"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e8524685c9:-7ff8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.8"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig4.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="109" />
-      <lineto x="349"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/readFilesystemSequenceDiagram.pgml b/trunk/src/models/readFilesystemSequenceDiagram.pgml
deleted file mode 100644
index 5c72dad..0000000
--- a/trunk/src/models/readFilesystemSequenceDiagram.pgml
+++ /dev/null
@@ -1,1382 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-7ff6"
-      name="readFilesystemSequenceDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 84, 384]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7fda"
-       shown="0"
-       dynobjects="[a|0|0|false|false, b|0]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig0"
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : ClientApps</text>
-    <rectangle name="Fig0.3"
-      x="48"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="48"
-              y="393" />
-      <lineto x="57"
-              y="393" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="57"
-              y="393" />
-      <lineto x="48"
-              y="393" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="42"
-      y="69"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="42"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[154, 10, 97, 384]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7fdb"
-       shown="0"
-       dynobjects="[a|0|7|false|false, b|0, b|1, b|2, b|3, b|4, b|5, b|6, b|7]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig1"
-    </private>
-    <rectangle name="Fig1.0"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="154"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : POIFileSystem</text>
-    <rectangle name="Fig1.3"
-      x="198"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="198"
-              y="393" />
-      <lineto x="207"
-              y="393" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="207"
-              y="393" />
-      <lineto x="198"
-              y="393" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="192"
-      y="69"
-      width="21"
-      height="280"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="192"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="192"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.9"
-      x="192"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.10"
-      x="192"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.11"
-      x="192"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.12"
-      x="192"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.13"
-      x="192"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.14"
-      x="192"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[311, 10, 120, 384]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7fe0"
-       shown="0"
-       dynobjects="[a|1|1|false|false, b|1]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="311"
-      y="10"
-      width="120"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="311"
-      y="10"
-      width="120"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="311"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >InputStream : Object</text>
-    <rectangle name="Fig2.3"
-      x="367"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="367"
-              y="393" />
-      <lineto x="376"
-              y="393" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="376"
-              y="393" />
-      <lineto x="367"
-              y="393" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="361"
-      y="109"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="361"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[491, 10, 91, 384]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7ffd"
-       shown="0"
-       dynobjects="[a|2|2|false|false, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig3"
-    </private>
-    <rectangle name="Fig3.0"
-      x="491"
-      y="10"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.1"
-      x="491"
-      y="10"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="491"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : HeaderBlock</text>
-    <rectangle name="Fig3.3"
-      x="532"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig3.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="532"
-              y="393" />
-      <lineto x="541"
-              y="393" />
-    </path>
-    <path name="Fig3.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="541"
-              y="393" />
-      <lineto x="532"
-              y="393" />
-    </path>
-    <rectangle name="Fig3.6"
-      x="526"
-      y="149"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.7"
-      x="526"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[642, 10, 57, 384]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7ff8"
-       shown="0"
-       dynobjects="[a|3|3|false|false, b|3]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig4"
-    </private>
-    <rectangle name="Fig4.0"
-      x="642"
-      y="10"
-      width="57"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.1"
-      x="642"
-      y="10"
-      width="57"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="642"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : Block</text>
-    <rectangle name="Fig4.3"
-      x="666"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig4.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="666"
-              y="393" />
-      <lineto x="675"
-              y="393" />
-    </path>
-    <path name="Fig4.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="675"
-              y="393" />
-      <lineto x="666"
-              y="393" />
-    </path>
-    <rectangle name="Fig4.6"
-      x="660"
-      y="189"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.7"
-      x="660"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[759, 10, 76, 384]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7ff3"
-       shown="0"
-       dynobjects="[a|4|4|false|false, b|4]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig5"
-    </private>
-    <rectangle name="Fig5.0"
-      x="759"
-      y="10"
-      width="76"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.1"
-      x="759"
-      y="10"
-      width="76"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="759"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : BATBlock</text>
-    <rectangle name="Fig5.3"
-      x="793"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig5.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="793"
-              y="393" />
-      <lineto x="802"
-              y="393" />
-    </path>
-    <path name="Fig5.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="802"
-              y="393" />
-      <lineto x="793"
-              y="393" />
-    </path>
-    <rectangle name="Fig5.6"
-      x="787"
-      y="229"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.7"
-      x="787"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[895, 10, 123, 384]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7ff2"
-       shown="0"
-       dynobjects="[a|5|5|false|false, b|5]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig6.0"
-      x="895"
-      y="10"
-      width="123"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.1"
-      x="895"
-      y="10"
-      width="123"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="895"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : PropertyTableBlock</text>
-    <rectangle name="Fig6.3"
-      x="952"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig6.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="952"
-              y="393" />
-      <lineto x="961"
-              y="393" />
-    </path>
-    <path name="Fig6.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="961"
-              y="393" />
-      <lineto x="952"
-              y="393" />
-    </path>
-    <rectangle name="Fig6.6"
-      x="946"
-      y="269"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.7"
-      x="946"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[1078, 10, 50, 384]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd6"
-       shown="0"
-       dynobjects="[a|6|6|false|false, b|6]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig7"
-    </private>
-    <rectangle name="Fig7.0"
-      x="1078"
-      y="10"
-      width="50"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.1"
-      x="1078"
-      y="10"
-      width="50"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="1078"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : BAT</text>
-    <rectangle name="Fig7.3"
-      x="1099"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig7.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1099"
-              y="393" />
-      <lineto x="1108"
-              y="393" />
-    </path>
-    <path name="Fig7.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1108"
-              y="393" />
-      <lineto x="1099"
-              y="393" />
-    </path>
-    <rectangle name="Fig7.6"
-      x="1093"
-      y="309"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.7"
-      x="1093"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[1188, 10, 97, 384]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd3"
-       shown="0"
-       dynobjects="[a|7|7|false|false, b|7]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig8.0"
-      x="1188"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig8.1"
-      x="1188"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.2"
-      context=""
-      x="1188"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : PropertyTable</text>
-    <rectangle name="Fig8.3"
-      x="1232"
-      y="34"
-      width="10"
-      height="360"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig8.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1232"
-              y="393" />
-      <lineto x="1241"
-              y="393" />
-    </path>
-    <path name="Fig8.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1241"
-              y="393" />
-      <lineto x="1232"
-              y="393" />
-    </path>
-    <rectangle name="Fig8.6"
-      x="1226"
-      y="349"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig8.7"
-      x="1226"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig9.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[66, 52, 111, 14]"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7fd8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig9.1.0"
-      context=""
-      x="66"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create the filesystem</text>
-  </group>
-  <group name="Fig10.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[224, 92, 111, 14]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7ff0"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig10.1.0"
-      context=""
-      x="224"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : read all bytes</text>
-  </group>
-  <group name="Fig11.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[298, 132, 111, 14]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7fee"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig11.1.0"
-      context=""
-      x="298"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create a header block from first 512 bytes</text>
-  </group>
-  <group name="Fig12.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[359, 172, 111, 14]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7fec"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig12.1.0"
-      context=""
-      x="359"
-      y="172"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create blocks from all blocks that are not header,bat or property blocks</text>
-  </group>
-  <group name="Fig13.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[416, 212, 111, 14]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7fea"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig13.1.0"
-      context=""
-      x="416"
-      y="212"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create bat blocks from bytes that are in bat</text>
-  </group>
-  <group name="Fig14.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[487, 252, 111, 14]"
-       href="-64--88-1-2-1d2066:e847bc33df:-7fe8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig14.1.0"
-      context=""
-      x="487"
-      y="252"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create property table  blocks from bytes starting at header.rootstartblock</text>
-  </group>
-  <group name="Fig15.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[554, 292, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd4"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig15.1.0"
-      context=""
-      x="554"
-      y="292"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : assign BAT Blocks to the BAT</text>
-  </group>
-  <group name="Fig16.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[613, 332, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd1"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig16.1.0"
-      context=""
-      x="613"
-      y="332"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : derive property instances from the Property Table Blocks and add them to the property table</text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3dcd27:e83d77e2e6:-7fd9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig9.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="63"
-              y="69" />
-      <lineto x="192"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="-64--88-1-2-1d2066:e847bc33df:-7ff1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.8"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="109" />
-      <lineto x="361"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="-64--88-1-2-1d2066:e847bc33df:-7fef"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.9"
-      destPortFig="Fig3.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="149" />
-      <lineto x="526"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="-64--88-1-2-1d2066:e847bc33df:-7fed"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.10"
-      destPortFig="Fig4.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="189" />
-      <lineto x="660"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="-64--88-1-2-1d2066:e847bc33df:-7feb"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.11"
-      destPortFig="Fig5.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="229" />
-      <lineto x="787"
-              y="229" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="-64--88-1-2-1d2066:e847bc33df:-7fe9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.12"
-      destPortFig="Fig6.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig6"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="269" />
-      <lineto x="946"
-              y="269" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd5"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.13"
-      destPortFig="Fig7.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="309" />
-      <lineto x="1093"
-              y="309" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.14"
-      destPortFig="Fig8.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig8"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="349" />
-      <lineto x="1226"
-              y="349" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/utilClasses.pgml b/trunk/src/models/utilClasses.pgml
deleted file mode 100644
index d70dec5..0000000
--- a/trunk/src/models/utilClasses.pgml
+++ /dev/null
@@ -1,1123 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram|127-0-0-1-5b0da1:e8e6d2b713:-7ffc"
-      name="utilClasses"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.static_structure.ui.FigInterface[16, 24, 300, 67]"
-       href="127-0-0-1-5b0da1:e8e6d2b713:-7ffb"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="17"
-      y="25"
-      width="298"
-      height="65"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="16"
-      y="24"
-      width="300"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="17"
-      y="25"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >&lt;&lt;Interface&gt;&gt;</text>
-    <text name="Fig0.3"
-      context=""
-      x="17"
-      y="35"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >FixedField</text>
-    <text name="Fig0.4"
-      context=""
-      x="16"
-      y="47"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+readFromBytes(in data[]:byte)
-+readFromStream(in stream:InputStream)
-+writeToBytes(in data[]:byte)
-+toString() : String</text>
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[16, 264, 276, 194]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ffb"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig1.0"
-      x="16"
-      y="264"
-      width="276"
-      height="194"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.2"
-      context=""
-      x="16"
-      y="264"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >BitField</text>
-    <rectangle name="Fig1.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig1.4"
-      context=""
-      x="16"
-      y="284"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig1.5"
-      context=""
-      x="16"
-      y="284"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getValue(in holder:int) : int
-+getShortValue(in holder:Short) : short
-+getRawValue(in holder:int) : int
-+getShortRawValue(in holder:short) : short
-+isSet(in holder:int) : boolean
-+isAllSet(in holder:int) : boolean
-+setValue(in holder:int, in value:int) : int
-+setShortValue(in holder:short, in value:short) : short
-+clear(in holder:int) : int
-+clearShort(in holder:short) : short
-+clearByte(in holder:byte) : byte
-+set(in holder:int) : int
-+setShort(in holder:short) : short
-+setByte(in holder:byte) : byte
-+setBoolean(in holder:int, in flag:boolean) : int
-+setShortBoolean(in holder:short, in flag:boolean) : short
-+setByteBoolean(in holder:byte, in flag:boolean) : byte</text>
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[400, 24, 160, 54]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ffa"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig2.0"
-      x="400"
-      y="24"
-      width="160"
-      height="54"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.2"
-      context=""
-      x="400"
-      y="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ByteField</text>
-    <rectangle name="Fig2.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig2.4"
-      context=""
-      x="400"
-      y="44"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig2.5"
-      context=""
-      x="400"
-      y="44"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+get() : byte
-+set(in value:byte)
-+set(in value:byte, in data[]:byte)</text>
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[16, 192, 357, 61]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff9"
-       shown="7"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig3.0"
-      x="16"
-      y="192"
-      width="357"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig3.2"
-      context=""
-      x="16"
-      y="192"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >HexDump</text>
-    <rectangle name="Fig3.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig3.4"
-      context=""
-      x="16"
-      y="212"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+EOL : String</text>
-    <text name="Fig3.5"
-      context=""
-      x="16"
-      y="232"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+dump(in data[]:byte, in offset:long, in stream:OutputStream, in index:int)</text>
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[8, 480, 204, 234]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff8"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig4.0"
-      x="8"
-      y="480"
-      width="204"
-      height="234"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.2"
-      context=""
-      x="8"
-      y="480"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >IntList</text>
-    <rectangle name="Fig4.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig4.4"
-      context=""
-      x="8"
-      y="500"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig4.5"
-      context=""
-      x="8"
-      y="500"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+add(in index:int, in value:int)
-+add(in value:int) : boolean
-+addAll(in c:IntList) : boolean
-+addAll(in index:int, in c:IntList) : boolean
-+clear()
-+contains(in o:int) : boolean
-+containsAll(in c:IntList) : boolean
-+equals(in o:Object) : boolean
-+get(in index:int) : int
-+hashCode() : int
-+indexOf(in o:int) : int
-+isEmpty() : boolean
-+lastIndexOf(in o:int) : int
-+remove(in index:int) : int
-+removeValue(in o:int) : boolean
-+removeAll(in c:IntList) : boolean
-+retainAll(in c:IntList) : boolean
-+set(in index:int, in element:int) : int
-+size() : int
-+toArray() : int
-+toArray(in a[]:int) : int</text>
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[304, 264, 284, 204]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff7"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig5.0"
-      x="304"
-      y="264"
-      width="284"
-      height="204"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.2"
-      context=""
-      x="304"
-      y="264"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >LittleEndian</text>
-    <rectangle name="Fig5.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig5.4"
-      context=""
-      x="304"
-      y="284"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig5.5"
-      context=""
-      x="304"
-      y="284"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getShort(in data[]:byte, in offset:int) : short
-+getShort(in data[]:byte) : short
-+getInt(in data[]:byte, in offset:int) : int
-+getInt(in data[]:byte) : int
-+getLong(in data[]:byte, in offset:int) : long
-+getDouble(in data[]:byte, in offset:int) : double
-+getDouble(in data[]:byte) : double
-+putShort(in data[]:byte, in offset:int, in value:short)
-+putShort(in data[]:byte, in value:short)
-+getLong(in data[]:byte) : long
-+putInt(in data[]:byte, in offset:int, in value:int)
-+putInt(in data[]:byte, in value:int)
-+putLong(in data[]:byte, in offset:int, in value:long)
-+putLong(in data[]:byte, in value:long)
-+readShort(in stream:InputStream) : short
-+readInt(in stream:InputStream) : int
-+readLong(in stream:InputStream) : long
-+readFromStream(in stream:InputStream, in size:int) : byte</text>
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[384, 192, 113, 64]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff6"
-       shown="3"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig6.0"
-      x="384"
-      y="192"
-      width="113"
-      height="64"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig6.2"
-      context=""
-      x="384"
-      y="192"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >LittleEndianConsts</text>
-    <rectangle name="Fig6.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig6.4"
-      context=""
-      x="384"
-      y="212"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+SHORT_SIZE : int = 2
-+INT_SIZE : int = 4
-+LONG_SIZE : int = 8
-+DOUBLE_SIZE : int = 8</text>
-    <text name="Fig6.5"
-      context=""
-      x="384"
-      y="256"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[200, 128, 160, 54]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff5"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig7.0"
-      x="200"
-      y="128"
-      width="160"
-      height="54"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig7.2"
-      context=""
-      x="200"
-      y="128"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >LongField</text>
-    <rectangle name="Fig7.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig7.4"
-      context=""
-      x="200"
-      y="148"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig7.5"
-      context=""
-      x="200"
-      y="148"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+get() : long
-+set(in value:long)
-+set(in value:long, in data[]:byte)</text>
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[24, 128, 164, 54]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff4"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig8.0"
-      x="24"
-      y="128"
-      width="164"
-      height="54"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig8.2"
-      context=""
-      x="24"
-      y="128"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ShortField</text>
-    <rectangle name="Fig8.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig8.4"
-      context=""
-      x="24"
-      y="148"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig8.5"
-      context=""
-      x="24"
-      y="148"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+get() : short
-+set(in value:short)
-+set(in value:short, in data[]:byte)</text>
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[232, 480, 216, 234]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff3"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig9.0"
-      x="232"
-      y="480"
-      width="216"
-      height="234"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig9.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig9.2"
-      context=""
-      x="232"
-      y="480"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >ShortList</text>
-    <rectangle name="Fig9.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig9.4"
-      context=""
-      x="232"
-      y="500"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig9.5"
-      context=""
-      x="232"
-      y="500"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+add(in index:int, in value:short)
-+add(in value:short)
-+addAll(in c:ShortList) : boolean
-+addAll(in index:int, in c:ShortList) : boolean
-+clear()
-+contains(in o:short) : boolean
-+containsAll(in c:ShortList) : boolean
-+equals(in o:Object) : boolean
-+get(in index:int) : short
-+hashCode() : int
-+indexOf(in o:short) : int
-+isEmpty() : boolean
-+lastIndexof(in o:short) : int
-+remove(in index:int) : short
-+removeValue(in o:short) : boolean
-+removeAll(in c:ShortList) : boolean
-+retainAll(in return:boolean, in c:ShortList)
-+set(in index:int, in element:short) : short
-+size() : int
-+toArray() : short
-+toArray(in a[]:short) : short</text>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[376, 128, 152, 54]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff2"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig10.0"
-      x="376"
-      y="128"
-      width="152"
-      height="54"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig10.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig10.2"
-      context=""
-      x="376"
-      y="128"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >IntegerField</text>
-    <rectangle name="Fig10.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig10.4"
-      context=""
-      x="376"
-      y="148"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig10.5"
-      context=""
-      x="376"
-      y="148"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+get() : int
-+set(in value:int)
-+set(in value:int, in data[]:byte)</text>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.static_structure.ui.FigClass[8, 720, 314, 44]"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7ff1"
-       shown="5"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig11.0"
-      x="8"
-      y="720"
-      width="314"
-      height="44"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig11.1"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig11.2"
-      context=""
-      x="8"
-      y="720"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >StringUtil</text>
-    <rectangle name="Fig11.3"
-      x="10"
-      y="15"
-      width="2"
-      height="60"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-1"
-    />
-    <text name="Fig11.4"
-      context=""
-      x="8"
-      y="740"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    ></text>
-    <text name="Fig11.5"
-      context=""
-      x="8"
-      y="740"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >+getFromUnicode(in string[]:byte, in offset:int, in len:int) : String
-+getFromUnicode(in string[]:byte) : String</text>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8e6e8d8ef:-7faf"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig2.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig2"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="400"
-              y="56" />
-      <lineto x="315"
-              y="56" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8e77b88e1:-7fc2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig10.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig10"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="392"
-              y="128" />
-      <lineto x="392"
-              y="72" />
-      <lineto x="315"
-              y="72" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8e77b88e1:-7f78"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig7.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig7"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="296"
-              y="128" />
-      <lineto x="296"
-              y="90" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.ui.FigRealization"
-       href="127-0-0-1-b3e62:e8e77b88e1:-7f70"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig8.0"
-      destPortFig="Fig0.0"
-      sourceFigNode="Fig8"
-      destFigNode="Fig0"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="96"
-              y="128" />
-      <lineto x="96"
-              y="90" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/models/writeFilesystemSequenceDiagram.pgml b/trunk/src/models/writeFilesystemSequenceDiagram.pgml
deleted file mode 100644
index fc5746c..0000000
--- a/trunk/src/models/writeFilesystemSequenceDiagram.pgml
+++ /dev/null
@@ -1,1892 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<!DOCTYPE pgml SYSTEM "pgml.dtd">
-<pgml description="org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram|-64--88-1-2-717d91:e7cd986e07:-7ff5"
-      name="writeFilesystemSequenceDiagram"
->
-  <group name="Fig0"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[10, 10, 84, 624]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ffd"
-       shown="0"
-       dynobjects="[a|0|13|false|false, b|0, b|13]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig0.0"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.1"
-      x="10"
-      y="10"
-      width="84"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig0.2"
-      context=""
-      x="10"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : ClientApps</text>
-    <rectangle name="Fig0.3"
-      x="48"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig0.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="48"
-              y="633" />
-      <lineto x="57"
-              y="633" />
-    </path>
-    <path name="Fig0.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="57"
-              y="633" />
-      <lineto x="48"
-              y="633" />
-    </path>
-    <rectangle name="Fig0.6"
-      x="42"
-      y="69"
-      width="21"
-      height="520"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.7"
-      x="42"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig0.8"
-      x="42"
-      y="589"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[154, 10, 97, 624]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ffc"
-       shown="0"
-       dynobjects="[a|0|12|false|false, b|0, b|1, b|2, b|3, b|5, b|9, b|10, b|11, b|12]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig1"
-    </private>
-    <rectangle name="Fig1.0"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.1"
-      x="154"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig1.2"
-      context=""
-      x="154"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : POIFileSystem</text>
-    <rectangle name="Fig1.3"
-      x="198"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig1.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="198"
-              y="633" />
-      <lineto x="207"
-              y="633" />
-    </path>
-    <path name="Fig1.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="207"
-              y="633" />
-      <lineto x="198"
-              y="633" />
-    </path>
-    <rectangle name="Fig1.6"
-      x="192"
-      y="69"
-      width="21"
-      height="480"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.7"
-      x="192"
-      y="69"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.8"
-      x="192"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.9"
-      x="192"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.10"
-      x="192"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.11"
-      x="192"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.12"
-      x="192"
-      y="429"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.13"
-      x="192"
-      y="469"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.14"
-      x="192"
-      y="509"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig1.15"
-      x="192"
-      y="549"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig2"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[311, 10, 91, 624]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ffa"
-       shown="0"
-       dynobjects="[a|1|12|false|false, b|1, b|11, b|12]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig2"
-    </private>
-    <rectangle name="Fig2.0"
-      x="311"
-      y="10"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.1"
-      x="311"
-      y="10"
-      width="91"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig2.2"
-      context=""
-      x="311"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : HeaderBlock</text>
-    <rectangle name="Fig2.3"
-      x="352"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig2.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="352"
-              y="633" />
-      <lineto x="361"
-              y="633" />
-    </path>
-    <path name="Fig2.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="361"
-              y="633" />
-      <lineto x="352"
-              y="633" />
-    </path>
-    <rectangle name="Fig2.6"
-      x="346"
-      y="109"
-      width="21"
-      height="440"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.7"
-      x="346"
-      y="109"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.8"
-      x="346"
-      y="509"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig2.9"
-      x="346"
-      y="549"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig3"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[462, 10, 57, 624]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ff9"
-       shown="0"
-       dynobjects="[a|2|2|false|false, b|2]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig3"
-    </private>
-    <rectangle name="Fig3.0"
-      x="462"
-      y="10"
-      width="57"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.1"
-      x="462"
-      y="10"
-      width="57"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig3.2"
-      context=""
-      x="462"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : Block</text>
-    <rectangle name="Fig3.3"
-      x="486"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig3.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="486"
-              y="633" />
-      <lineto x="495"
-              y="633" />
-    </path>
-    <path name="Fig3.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="495"
-              y="633" />
-      <lineto x="486"
-              y="633" />
-    </path>
-    <rectangle name="Fig3.6"
-      x="480"
-      y="149"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig3.7"
-      x="480"
-      y="149"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig4"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[579, 10, 50, 624]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ffd"
-       shown="0"
-       dynobjects="[a|3|10|false|false, b|3, b|4, b|9, b|10]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig4"
-    </private>
-    <rectangle name="Fig4.0"
-      x="579"
-      y="10"
-      width="50"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.1"
-      x="579"
-      y="10"
-      width="50"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig4.2"
-      context=""
-      x="579"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : BAT</text>
-    <rectangle name="Fig4.3"
-      x="600"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig4.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="600"
-              y="633" />
-      <lineto x="609"
-              y="633" />
-    </path>
-    <path name="Fig4.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="609"
-              y="633" />
-      <lineto x="600"
-              y="633" />
-    </path>
-    <rectangle name="Fig4.6"
-      x="594"
-      y="189"
-      width="21"
-      height="280"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.7"
-      x="594"
-      y="189"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.8"
-      x="594"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.9"
-      x="594"
-      y="429"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig4.10"
-      x="594"
-      y="469"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig5"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[689, 10, 76, 624]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ff8"
-       shown="0"
-       dynobjects="[a|4|4|false|false, b|4]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig5"
-    </private>
-    <rectangle name="Fig5.0"
-      x="689"
-      y="10"
-      width="76"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.1"
-      x="689"
-      y="10"
-      width="76"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig5.2"
-      context=""
-      x="689"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : BATBlock</text>
-    <rectangle name="Fig5.3"
-      x="723"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig5.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="723"
-              y="633" />
-      <lineto x="732"
-              y="633" />
-    </path>
-    <path name="Fig5.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="732"
-              y="633" />
-      <lineto x="723"
-              y="633" />
-    </path>
-    <rectangle name="Fig5.6"
-      x="717"
-      y="229"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig5.7"
-      x="717"
-      y="229"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig6"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[825, 10, 97, 624]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ffc"
-       shown="0"
-       dynobjects="[a|5|8|false|false, b|5, b|6, b|7, b|8]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <rectangle name="Fig6.0"
-      x="825"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.1"
-      x="825"
-      y="10"
-      width="97"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig6.2"
-      context=""
-      x="825"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : PropertyTable</text>
-    <rectangle name="Fig6.3"
-      x="869"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig6.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="869"
-              y="633" />
-      <lineto x="878"
-              y="633" />
-    </path>
-    <path name="Fig6.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="878"
-              y="633" />
-      <lineto x="869"
-              y="633" />
-    </path>
-    <rectangle name="Fig6.6"
-      x="863"
-      y="269"
-      width="21"
-      height="120"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.7"
-      x="863"
-      y="269"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.8"
-      x="863"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.9"
-      x="863"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig6.10"
-      x="863"
-      y="389"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig7"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[982, 10, 123, 624]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ff7"
-       shown="0"
-       dynobjects="[a|6|8|false|false, b|6, b|8]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig7"
-    </private>
-    <rectangle name="Fig7.0"
-      x="982"
-      y="10"
-      width="123"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.1"
-      x="982"
-      y="10"
-      width="123"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig7.2"
-      context=""
-      x="982"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : PropertyTableBlock</text>
-    <rectangle name="Fig7.3"
-      x="1039"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig7.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1039"
-              y="633" />
-      <lineto x="1048"
-              y="633" />
-    </path>
-    <path name="Fig7.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1048"
-              y="633" />
-      <lineto x="1039"
-              y="633" />
-    </path>
-    <rectangle name="Fig7.6"
-      x="1033"
-      y="309"
-      width="21"
-      height="80"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.7"
-      x="1033"
-      y="309"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig7.8"
-      x="1033"
-      y="389"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig8"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[1165, 10, 71, 624]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fef"
-       shown="0"
-       dynobjects="[a|7|7|false|false, b|7]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig8"
-    </private>
-    <rectangle name="Fig8.0"
-      x="1165"
-      y="10"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig8.1"
-      x="1165"
-      y="10"
-      width="71"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig8.2"
-      context=""
-      x="1165"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : Property</text>
-    <rectangle name="Fig8.3"
-      x="1196"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig8.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1196"
-              y="633" />
-      <lineto x="1205"
-              y="633" />
-    </path>
-    <path name="Fig8.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1205"
-              y="633" />
-      <lineto x="1196"
-              y="633" />
-    </path>
-    <rectangle name="Fig8.6"
-      x="1190"
-      y="349"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig8.7"
-      x="1190"
-      y="349"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig9"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqObject[1296, 10, 128, 624]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ffb"
-       shown="0"
-       dynobjects="[a|13|13|false|false, b|13]"
-       fill="1"
-       fillcolor="-1"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      enclosingFig="Fig9"
-    </private>
-    <rectangle name="Fig9.0"
-      x="1296"
-      y="10"
-      width="128"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig9.1"
-      x="1296"
-      y="10"
-      width="128"
-      height="24"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <text name="Fig9.2"
-      context=""
-      x="1296"
-      y="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    >OutputStream : Object</text>
-    <rectangle name="Fig9.3"
-      x="1356"
-      y="34"
-      width="10"
-      height="600"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <path name="Fig9.4"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1356"
-              y="633" />
-      <lineto x="1365"
-              y="633" />
-    </path>
-    <path name="Fig9.5"
-      description="org.tigris.gef.presentation.FigLine"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="1365"
-              y="633" />
-      <lineto x="1356"
-              y="633" />
-    </path>
-    <rectangle name="Fig9.6"
-      x="1350"
-      y="589"
-      width="21"
-      height="10"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-    <rectangle name="Fig9.7"
-      x="1350"
-      y="589"
-      width="21"
-      height="0"
-      fill="1"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    />
-  </group>
-  <group name="Fig10.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[66, 52, 111, 14]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ff5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig10.1.0"
-      context=""
-      x="66"
-      y="52"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : createFileSystem</text>
-  </group>
-  <group name="Fig11.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[217, 92, 111, 14]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ff3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig11.1.0"
-      context=""
-      x="217"
-      y="92"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : createHeaderBlock</text>
-  </group>
-  <group name="Fig12.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[278, 132, 111, 14]"
-       href="10-10-101-65-3dcd27:e851a6400f:-7feb"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig12.1.0"
-      context=""
-      x="278"
-      y="132"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : createBlock [until all files have blocks]</text>
-  </group>
-  <group name="Fig13.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[329, 172, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ff8"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig13.1.0"
-      context=""
-      x="329"
-      y="172"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create a record [until all files have records]</text>
-  </group>
-  <group name="Fig14.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[605, 212, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ff4"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig14.1.0"
-      context=""
-      x="605"
-      y="212"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create bat block [if need more]</text>
-  </group>
-  <group name="Fig15.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[450, 252, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ff2"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig15.1.0"
-      context=""
-      x="450"
-      y="252"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create a record [until all files have records]</text>
-  </group>
-  <group name="Fig16.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[329, 412, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig16.1.0"
-      context=""
-      x="329"
-      y="412"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : get the bat array info</text>
-  </group>
-  <group name="Fig17.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[329, 452, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe5"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig17.1.0"
-      context=""
-      x="329"
-      y="452"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : get the extended bat array info</text>
-  </group>
-  <group name="Fig18.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[217, 492, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe3"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig18.1.0"
-      context=""
-      x="217"
-      y="492"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : set the bat  info</text>
-  </group>
-  <group name="Fig19.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[217, 532, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe1"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig19.1.0"
-      context=""
-      x="217"
-      y="532"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : set the extended bat info</text>
-  </group>
-  <group name="Fig20.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[896, 292, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fdf"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig20.1.0"
-      context=""
-      x="896"
-      y="292"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create a block [if needed]</text>
-  </group>
-  <group name="Fig21.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[966, 332, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fdd"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig21.1.0"
-      context=""
-      x="966"
-      y="332"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : create a property</text>
-  </group>
-  <group name="Fig22.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[896, 372, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd9"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig22.1.0"
-      context=""
-      x="896"
-      y="372"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : add the propert to the block</text>
-  </group>
-  <group name="Fig23.1"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqStimulus[587, 572, 111, 14]"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd7"
-       shown="0"
-       fill="1"
-       fillcolor="-1"
-       stroke="0"
-       strokecolor="-16777216"
-  >
-    <private>
-    </private>
-    <text name="Fig23.1.0"
-      context=""
-      x="587"
-      y="572"
-      fill="0"
-      fillcolor="-1"
-      stroke="0"
-      strokecolor="-16777216"
-      font="dialog"
-      textsize="9"
-    > : write all blocks to stream</text>
-  </group>
-  <group name="Fig10"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ff6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.7"
-      destPortFig="Fig1.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig1"
-    </private>
-    <path name="Fig10.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="63"
-              y="69" />
-      <lineto x="192"
-              y="69" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig11"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3dcd27:e851a6400f:-7ff4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.8"
-      destPortFig="Fig2.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig11.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="109" />
-      <lineto x="346"
-              y="109" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig12"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3dcd27:e851a6400f:-7fec"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.9"
-      destPortFig="Fig3.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig3"
-    </private>
-    <path name="Fig12.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="149" />
-      <lineto x="480"
-              y="149" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig13"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ff9"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.10"
-      destPortFig="Fig4.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig13.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="189" />
-      <lineto x="594"
-              y="189" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig14"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ff5"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig4.8"
-      destPortFig="Fig5.7"
-      sourceFigNode="Fig4"
-      destFigNode="Fig5"
-    </private>
-    <path name="Fig14.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="615"
-              y="229" />
-      <lineto x="717"
-              y="229" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig15"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7ff3"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.11"
-      destPortFig="Fig6.7"
-      sourceFigNode="Fig1"
-      destFigNode="Fig6"
-    </private>
-    <path name="Fig15.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="269" />
-      <lineto x="863"
-              y="269" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig16"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.12"
-      destPortFig="Fig4.9"
-      sourceFigNode="Fig1"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig16.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="429" />
-      <lineto x="594"
-              y="429" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig17"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe6"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.13"
-      destPortFig="Fig4.10"
-      sourceFigNode="Fig1"
-      destFigNode="Fig4"
-    </private>
-    <path name="Fig17.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="469" />
-      <lineto x="594"
-              y="469" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig18"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe4"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.14"
-      destPortFig="Fig2.8"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig18.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="509" />
-      <lineto x="346"
-              y="509" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig19"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe2"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig1.15"
-      destPortFig="Fig2.9"
-      sourceFigNode="Fig1"
-      destFigNode="Fig2"
-    </private>
-    <path name="Fig19.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="213"
-              y="549" />
-      <lineto x="346"
-              y="549" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig20"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fe0"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.8"
-      destPortFig="Fig7.7"
-      sourceFigNode="Fig6"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig20.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="884"
-              y="309" />
-      <lineto x="1033"
-              y="309" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig21"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fde"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.9"
-      destPortFig="Fig8.7"
-      sourceFigNode="Fig6"
-      destFigNode="Fig8"
-    </private>
-    <path name="Fig21.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="884"
-              y="349" />
-      <lineto x="1190"
-              y="349" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig22"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fda"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig6.10"
-      destPortFig="Fig7.8"
-      sourceFigNode="Fig6"
-      destFigNode="Fig7"
-    </private>
-    <path name="Fig22.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="884"
-              y="389" />
-      <lineto x="1033"
-              y="389" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-  <group name="Fig23"
-       description="org.argouml.uml.diagram.sequence.ui.FigSeqLink"
-       href="10-10-101-65-3b05de:e851e2ad5c:-7fd8"
-       stroke="1"
-       strokecolor="-16777216"
-  >
-    <private>
-      sourcePortFig="Fig0.8"
-      destPortFig="Fig9.7"
-      sourceFigNode="Fig0"
-      destFigNode="Fig9"
-    </private>
-    <path name="Fig23.1"
-      description="org.tigris.gef.presentation.FigPoly"
-      fill="0"
-      fillcolor="-1"
-      stroke="1"
-      strokecolor="-16777216"
-    >
-      <moveto x="63"
-              y="589" />
-      <lineto x="1350"
-              y="589" />
-    </path>
-    <annotations>
-    </annotations>
-  </group>
-</pgml>
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLDocument.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLDocument.java
deleted file mode 100644
index 93afa61..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLDocument.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.poifs.filesystem.DocumentFactoryHelper;
-import org.apache.xmlbeans.impl.common.SystemCache;
-
-/**
- * This holds the common functionality for all POI OOXML Document classes.
- */
-// TODO: implements AutoCloseable in Java 7+ when POI drops support for Java 6.
-public abstract class POIXMLDocument extends POIXMLDocumentPart implements Closeable {
-    public static final String DOCUMENT_CREATOR = "Apache POI";
-
-    // OLE embeddings relation name
-    public static final String OLE_OBJECT_REL_TYPE="http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
-
-    // Embedded OPC documents relation name
-    public static final String PACK_OBJECT_REL_TYPE="http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
-
-    /** The OPC Package */
-    private OPCPackage pkg;
-
-    /**
-     * The properties of the OPC package, opened as needed
-     */
-    private POIXMLProperties properties;
-
-    protected POIXMLDocument(OPCPackage pkg) {
-        super(pkg);
-        init(pkg);
-    }
-    
-    protected POIXMLDocument(OPCPackage pkg, String coreDocumentRel) {
-        super(pkg, coreDocumentRel);
-        init(pkg);
-    }
-    
-    private void init(OPCPackage p) {
-        this.pkg = p;
-        
-        // Workaround for XMLBEANS-512 - ensure that when we parse
-        //  the file, we start with a fresh XML Parser each time,
-        //  and avoid the risk of getting a SaxHandler that's in error
-        SystemCache.get().setSaxLoader(null);
-    }
-
-    /**
-     * Wrapper to open a package, which works around shortcomings in java's this() constructor calls
-     * 
-     * @param path the path to the document
-     * @return the new OPCPackage
-     * 
-     * @exception IOException if there was a problem opening the document
-     */
-    public static OPCPackage openPackage(String path) throws IOException {
-        try {
-            return OPCPackage.open(path);
-        } catch (InvalidFormatException e) {
-            throw new IOException(e.toString(), e);
-        }
-    }
-
-    /**
-     * Get the assigned OPCPackage
-     *
-     * @return the assigned OPCPackage
-     */
-    public OPCPackage getPackage() {
-        return this.pkg;
-    }
-
-    protected PackagePart getCorePart() {
-        return getPackagePart();
-    }
-
-    /**
-     * Retrieves all the PackageParts which are defined as relationships of the base document with the
-     * specified content type.
-     * 
-     * @param contentType the content type
-     * 
-     * @return all the base document PackageParts which match the content type
-     * 
-     * @throws InvalidFormatException when the relationships or the parts contain errors
-     * 
-     * @see org.apache.poi.xssf.usermodel.XSSFRelation
-     * @see org.apache.poi.xslf.usermodel.XSLFRelation
-     * @see org.apache.poi.xwpf.usermodel.XWPFRelation
-     * @see org.apache.poi.xdgf.usermodel.XDGFRelation
-     */
-    protected PackagePart[] getRelatedByType(String contentType) throws InvalidFormatException {
-        PackageRelationshipCollection partsC =
-            getPackagePart().getRelationshipsByType(contentType);
-
-        PackagePart[] parts = new PackagePart[partsC.size()];
-        int count = 0;
-        for (PackageRelationship rel : partsC) {
-            parts[count] = getPackagePart().getRelatedPart(rel);
-            count++;
-        }
-        return parts;
-    }
-
-    /**
-     * Checks that the supplied InputStream (which MUST
-     *  support mark and reset, or be a PushbackInputStream)
-     *  has a OOXML (zip) header at the start of it.
-     * If your InputStream does not support mark / reset,
-     *  then wrap it in a PushBackInputStream, then be
-     *  sure to always use that, and not the original!
-     *  
-     * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
-     * @return true, if the InputStream is an ooxml document
-     * 
-     * @throws IOException if the InputStream can't be read
-     *
-     * @deprecated use the method from DocumentFactoryHelper, deprecated as of 3.15-beta1, therefore eligible for removal in 3.17
-     */
-    @Deprecated
-    public static boolean hasOOXMLHeader(InputStream inp) throws IOException {
-        return DocumentFactoryHelper.hasOOXMLHeader(inp);
-    }
-
-    /**
-     * Get the document properties. This gives you access to the
-     *  core ooxml properties, and the extended ooxml properties.
-     *  
-     * @return the document properties
-     */
-    public POIXMLProperties getProperties() {
-        if(properties == null) {
-            try {
-                properties = new POIXMLProperties(pkg);
-            } catch (Exception e){
-                throw new POIXMLException(e);
-            }
-        }
-        return properties;
-    }
-
-    /**
-     * Get the document's embedded files.
-     * 
-     * @return the document's embedded files
-     * 
-     * @throws OpenXML4JException if the embedded parts can't be determined
-     */
-    public abstract List<PackagePart> getAllEmbedds() throws OpenXML4JException;
-
-    protected final void load(POIXMLFactory factory) throws IOException {
-        Map<PackagePart, POIXMLDocumentPart> context = new HashMap<PackagePart, POIXMLDocumentPart>();
-        try {
-            read(factory, context);
-        } catch (OpenXML4JException e){
-            throw new POIXMLException(e);
-        }
-        onDocumentRead();
-        context.clear();
-    }
-    
-    /**
-     * Closes the underlying {@link OPCPackage} from which this
-     *  document was read, if there is one
-     *
-     * <p>Once this has been called, no further
-     *  operations, updates or reads should be performed on the
-     *  document.
-     *
-     * @throws IOException for writable packages, if an IO exception occur during the saving process.
-     */
-    @Override
-    public void close() throws IOException {
-        if (pkg != null) {
-            if (pkg.getPackageAccess() == PackageAccess.READ) {
-                pkg.revert();
-            } else {
-                pkg.close();
-            }
-            pkg = null;
-        }
-    }
-
-    /**
-     * Write out this document to an Outputstream.
-     *
-     * Note - if the Document was opened from a {@link File} rather
-     *  than an {@link InputStream}, you <b>must</b> write out to
-     *  a different file, overwriting via an OutputStream isn't possible.
-     *  
-     * If {@code stream} is a {@link java.io.FileOutputStream} on a networked drive
-     * or has a high cost/latency associated with each written byte,
-     * consider wrapping the OutputStream in a {@link java.io.BufferedOutputStream}
-     * to improve write performance.
-     * 
-     * @param stream - the java OutputStream you wish to write the file to
-     *
-     * @exception IOException if anything can't be written.
-     */
-    @SuppressWarnings("resource")
-    public final void write(OutputStream stream) throws IOException {
-        OPCPackage p = getPackage();
-        if(p == null) {
-            throw new IOException("Cannot write data, document seems to have been closed already");
-        }
-        
-        //force all children to commit their changes into the underlying OOXML Package
-        // TODO Shouldn't they be committing to the new one instead?
-        Set<PackagePart> context = new HashSet<PackagePart>();
-        onSave(context);
-        context.clear();
-
-        //save extended and custom properties
-        getProperties().commit();
-
-        p.save(stream);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
deleted file mode 100644
index e1b94b6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
+++ /dev/null
@@ -1,770 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-
-/**
- * Represents an entry of a OOXML package.
- *
- * <p>
- * Each POIXMLDocumentPart keeps a reference to the underlying a {@link org.apache.poi.openxml4j.opc.PackagePart}.
- * </p>
- */
-public class POIXMLDocumentPart {
-    private static final POILogger logger = POILogFactory.getLogger(POIXMLDocumentPart.class);
-
-    private String coreDocumentRel = PackageRelationshipTypes.CORE_DOCUMENT;
-    private PackagePart packagePart;
-    private POIXMLDocumentPart parent;
-    private Map<String,RelationPart> relations = new LinkedHashMap<String,RelationPart>();
-
-    /**
-     * The RelationPart is a cached relationship between the document, which contains the RelationPart,
-     * and one of its referenced child document parts.
-     * The child document parts may only belong to one parent, but it's often referenced by other
-     * parents too, having varying {@link PackageRelationship#getId() relationship ids} pointing to it.
-     */
-    public static class RelationPart {
-        private final PackageRelationship relationship;
-        private final POIXMLDocumentPart documentPart;
-        
-        RelationPart(PackageRelationship relationship, POIXMLDocumentPart documentPart) {
-            this.relationship = relationship;
-            this.documentPart = documentPart;
-        }
-        
-        /**
-         * @return the cached relationship, which uniquely identifies this child document part within the parent 
-         */
-        public PackageRelationship getRelationship() {
-            return relationship;
-        }
-        
-        /**
-         * @param <T> the cast of the caller to a document sub class
-         * 
-         * @return the child document part
-         */
-        @SuppressWarnings("unchecked")
-        public <T extends POIXMLDocumentPart> T getDocumentPart() {
-            return (T)documentPart;
-        }
-    }
-
-    /**
-     * Counter that provides the amount of incoming relations from other parts
-     * to this part.
-     */
-    private int relationCounter = 0;
-
-    int incrementRelationCounter() {
-        relationCounter++;
-        return relationCounter;
-    }
-
-    int decrementRelationCounter() {
-        relationCounter--;
-        return relationCounter;
-    }
-
-    int getRelationCounter() {
-        return relationCounter;
-    }
-
-    /**
-     * Construct POIXMLDocumentPart representing a "core document" package part.
-     * 
-     * @param pkg the OPCPackage containing this document
-     */
-    public POIXMLDocumentPart(OPCPackage pkg) {
-        this(pkg, PackageRelationshipTypes.CORE_DOCUMENT);
-    }
-
-    /**
-     * Construct POIXMLDocumentPart representing a custom "core document" package part.
-     * 
-     * @param pkg the OPCPackage containing this document
-     * @param coreDocumentRel the relation type of this document 
-     */
-    public POIXMLDocumentPart(OPCPackage pkg, String coreDocumentRel) {
-        this(getPartFromOPCPackage(pkg, coreDocumentRel));
-        this.coreDocumentRel = coreDocumentRel;
-    }
-    
-    /**
-     * Creates new POIXMLDocumentPart   - called by client code to create new parts from scratch.
-     *
-     * @see #createRelationship(POIXMLRelation, POIXMLFactory, int, boolean)
-     */
-    public POIXMLDocumentPart() {
-    }
-
-    /**
-     * Creates an POIXMLDocumentPart representing the given package part and relationship.
-     * Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an existing file.
-     *
-     * @param part - The package part that holds xml data representing this sheet.
-     * @see #read(POIXMLFactory, java.util.Map)
-     *
-     * @since POI 3.14-Beta1
-     */
-    public POIXMLDocumentPart(PackagePart part) {
-        this(null, part);
-    }
-
-    /**
-     * Creates an POIXMLDocumentPart representing the given package part, relationship and parent
-     * Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an existing file.
-     *
-     * @param parent - Parent part
-     * @param part - The package part that holds xml data representing this sheet.
-     * @see #read(POIXMLFactory, java.util.Map)
-     *
-     * @since POI 3.14-Beta1
-     */
-    public POIXMLDocumentPart(POIXMLDocumentPart parent, PackagePart part) {
-        this.packagePart = part;
-        this.parent = parent;
-    }
-
-    /**
-     * Creates an POIXMLDocumentPart representing the given package part and relationship.
-     * Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an existing file.
-     *
-     * @param part - The package part that holds xml data representing this sheet.
-     * @param rel - the relationship of the given package part
-     * @see #read(POIXMLFactory, java.util.Map)
-     * 
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public POIXMLDocumentPart(PackagePart part, PackageRelationship rel){
-        this(null, part);
-    }
-
-    /**
-     * Creates an POIXMLDocumentPart representing the given package part, relationship and parent
-     * Called by {@link #read(POIXMLFactory, java.util.Map)} when reading in an exisiting file.
-     *
-     * @param parent - Parent part
-     * @param part - The package part that holds xml data represenring this sheet.
-     * @param rel - the relationship of the given package part
-     * @see #read(POIXMLFactory, java.util.Map)
-     *
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public POIXMLDocumentPart(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel){
-        this(parent, part);
-    }
-
-    /**
-     * When you open something like a theme, call this to
-     *  re-base the XML Document onto the core child of the
-     *  current core document
-     * 
-     * @param pkg the package to be rebased
-     * 
-     * @throws InvalidFormatException if there was an error in the core document relation 
-     * @throws IllegalStateException if there are more than one core document relations
-     */
-    protected final void rebase(OPCPackage pkg) throws InvalidFormatException {
-        PackageRelationshipCollection cores =
-            packagePart.getRelationshipsByType(coreDocumentRel);
-        if(cores.size() != 1) {
-            throw new IllegalStateException(
-                "Tried to rebase using " + coreDocumentRel +
-                " but found " + cores.size() + " parts of the right type"
-            );
-        }
-        packagePart = packagePart.getRelatedPart(cores.getRelationship(0));
-    }
-
-    /**
-     * Provides access to the underlying PackagePart
-     *
-     * @return the underlying PackagePart
-     */
-    public final PackagePart getPackagePart(){
-        return packagePart;
-    }
-
-    /**
-     * Provides access to the PackageRelationship that identifies this POIXMLDocumentPart
-     *
-     * @return the PackageRelationship that identifies this POIXMLDocumentPart
-     *
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    @SuppressWarnings("resource")
-    public final PackageRelationship getPackageRelationship() {
-        if (this.parent != null) {
-            for (RelationPart rp : parent.getRelationParts()) {
-                if (rp.getDocumentPart() == this) {
-                    return rp.getRelationship();
-                }
-            }
-        } else {
-            OPCPackage pkg = getPackagePart().getPackage();
-            String partName = getPackagePart().getPartName().getName();
-            for (PackageRelationship rel : pkg.getRelationships()) {
-                if (rel.getTargetURI().toASCIIString().equals(partName)) {
-                    return rel;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the list of child relations for this POIXMLDocumentPart
-     *
-     * @return child relations
-     */
-    public final List<POIXMLDocumentPart> getRelations(){
-        List<POIXMLDocumentPart> l = new ArrayList<POIXMLDocumentPart>();
-        for (RelationPart rp : relations.values()) {
-            l.add(rp.getDocumentPart());
-        }
-        return Collections.unmodifiableList(l);
-    }
-
-    /**
-     * Returns the list of child relations for this POIXMLDocumentPart
-     *
-     * @return child relations
-     */
-    public final List<RelationPart> getRelationParts() {
-        List<RelationPart> l = new ArrayList<RelationPart>(relations.values());
-        return Collections.unmodifiableList(l);
-    }
-
-    /**
-     * Returns the target {@link POIXMLDocumentPart}, where a
-     * {@link PackageRelationship} is set from the {@link PackagePart} of this
-     * {@link POIXMLDocumentPart} to the {@link PackagePart} of the target
-     * {@link POIXMLDocumentPart} with a {@link PackageRelationship#getId()}
-     * matching the given parameter value.
-     *
-     * @param id
-     *            The relation id to look for
-     * @return the target part of the relation, or null, if none exists
-     */
-    public final POIXMLDocumentPart getRelationById(String id) {
-        RelationPart rp = relations.get(id);
-        return (rp == null) ? null : rp.getDocumentPart();
-    }
-
-    /**
-     * Returns the {@link PackageRelationship#getId()} of the
-     * {@link PackageRelationship}, that sources from the {@link PackagePart} of
-     * this {@link POIXMLDocumentPart} to the {@link PackagePart} of the given
-     * parameter value.
-     *
-     * @param part
-     *            The {@link POIXMLDocumentPart} for which the according
-     *            relation-id shall be found.
-     * @return The value of the {@link PackageRelationship#getId()} or null, if
-     *         parts are not related.
-     */
-    public final String getRelationId(POIXMLDocumentPart part) {
-        for (RelationPart rp : relations.values()) {
-            if (rp.getDocumentPart() == part) {
-                return rp.getRelationship().getId();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Add a new child POIXMLDocumentPart
-     *
-     * @param id the id of an existing child to replace
-     * @param part the child to add
-     * 
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public final void addRelation(String id, POIXMLDocumentPart part) {
-        PackageRelationship pr = part.getPackagePart().getRelationship(id);
-        addRelation(pr, part);
-    }
-
-    /**
-     * Add a new child POIXMLDocumentPart
-     *
-     * @param relId the preferred relation id, when null the next free relation id will be used
-     * @param relationshipType the package relationship type
-     * @param part the child to add
-     * 
-     * @return the new RelationPart
-     *
-     * @since 3.14-Beta1
-     */
-    public final RelationPart addRelation(String relId, POIXMLRelation relationshipType, POIXMLDocumentPart part) {
-        PackageRelationship pr = findExistingRelation(part);
-        if (pr == null) {
-            PackagePartName ppn = part.getPackagePart().getPartName();
-            String relType = relationshipType.getRelation();
-            pr = packagePart.addRelationship(ppn, TargetMode.INTERNAL, relType, relId);
-        }
-        addRelation(pr, part);
-        return new RelationPart(pr, part);
-    }
-
-    /**
-     * Add a new child POIXMLDocumentPart
-     *
-     * @param pr the relationship of the child
-     * @param part the child to add
-     */
-    private void addRelation(PackageRelationship pr, POIXMLDocumentPart part) {
-        relations.put(pr.getId(), new RelationPart(pr,part));
-        part.incrementRelationCounter();
-
-    }
-
-    /**
-     * Check if the new part was already added before via PackagePart.addRelationship()
-     *
-     * @param part to find the relationship for
-     * @return The existing relationship, or null if there isn't yet one
-     */
-    private PackageRelationship findExistingRelation(POIXMLDocumentPart part) {
-        String ppn = part.getPackagePart().getPartName().getName();
-        try {
-            for (PackageRelationship pr : packagePart.getRelationships()) {
-                if (pr.getTargetMode() == TargetMode.EXTERNAL) {
-                    continue;
-                }
-                PackagePart pp = packagePart.getRelatedPart(pr);
-                if (ppn.equals(pp.getPartName().getName())) {
-                    return pr;
-                }
-            }
-        } catch (InvalidFormatException e) {
-            throw new POIXMLException("invalid package relationships", e);
-        }
-        return null;
-    }
-
-    /**
-     * Remove the relation to the specified part in this package and remove the
-     * part, if it is no longer needed.
-     * 
-     * @param part the part which relation is to be removed from this document
-     */
-    protected final void removeRelation(POIXMLDocumentPart part){
-        removeRelation(part,true);
-    }
-
-    /**
-     * Remove the relation to the specified part in this package and remove the
-     * part, if it is no longer needed and flag is set to true.
-     *
-     * @param part
-     *            The related part, to which the relation shall be removed.
-     * @param removeUnusedParts
-     *            true, if the part shall be removed from the package if not
-     *            needed any longer.
-     * @return true, if the relation was removed
-     */
-    protected final boolean removeRelation(POIXMLDocumentPart part, boolean removeUnusedParts){
-        String id = getRelationId(part);
-        if (id == null) {
-            // part is not related with this POIXMLDocumentPart
-            return false;
-        }
-        /* decrement usage counter */
-        part.decrementRelationCounter();
-        /* remove packagepart relationship */
-        getPackagePart().removeRelationship(id);
-        /* remove POIXMLDocument from relations */
-        relations.remove(id);
-
-        if (removeUnusedParts) {
-            /* if last relation to target part was removed, delete according target part */
-            if (part.getRelationCounter() == 0) {
-                try {
-                    part.onDocumentRemove();
-                } catch (IOException e) {
-                    throw new POIXMLException(e);
-                }
-                getPackagePart().getPackage().removePart(part.getPackagePart());
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Returns the parent POIXMLDocumentPart. All parts except root have not-null parent.
-     *
-     * @return the parent POIXMLDocumentPart or <code>null</code> for the root element.
-     */
-    public final POIXMLDocumentPart getParent(){
-        return parent;
-    }
-
-    @Override
-    public String toString(){
-        return packagePart == null ? "" : packagePart.toString();
-    }
-
-    /**
-     * Save the content in the underlying package part.
-     * Default implementation is empty meaning that the package part is left unmodified.
-     *
-     * Sub-classes should override and add logic to marshal the "model" into Ooxml4J.
-     *
-     * For example, the code saving a generic XML entry may look as follows:
-     * <pre>
-     * protected void commit() throws IOException {
-     *   PackagePart part = getPackagePart();
-     *   OutputStream out = part.getOutputStream();
-     *   XmlObject bean = getXmlBean(); //the "model" which holds changes in memory
-     *   bean.save(out, DEFAULT_XML_OPTIONS);
-     *   out.close();
-     * }
-     * </pre>
-     * 
-     * @throws IOException a subclass may throw an IOException if the changes can't be committed
-     */
-    protected void commit() throws IOException {
-
-    }
-
-    /**
-     * Save changes in the underlying OOXML package.
-     * Recursively fires {@link #commit()} for each package part
-     *
-     * @param alreadySaved    context set containing already visited nodes
-     * 
-     * @throws IOException a related part may throw an IOException if the changes can't be saved
-     */
-    protected final void onSave(Set<PackagePart> alreadySaved) throws IOException{
-        // this usually clears out previous content in the part...
-        prepareForCommit();
-
-        commit();
-        alreadySaved.add(this.getPackagePart());
-        for(RelationPart rp : relations.values()){
-            POIXMLDocumentPart p = rp.getDocumentPart();
-            if (!alreadySaved.contains(p.getPackagePart())) {
-                p.onSave(alreadySaved);
-            }
-        }
-    }
-
-    /**
-     * Ensure that a memory based package part does not have lingering data from previous
-     * commit() calls.
-     *
-     * Note: This is overwritten for some objects, as *PictureData seem to store the actual content
-     * in the part directly without keeping a copy like all others therefore we need to handle them differently.
-     */
-    protected void prepareForCommit() {
-        PackagePart part = this.getPackagePart();
-        if(part != null) {
-            part.clear();
-        }
-    }
-
-    /**
-     * Create a new child POIXMLDocumentPart
-     *
-     * @param descriptor the part descriptor
-     * @param factory the factory that will create an instance of the requested relation
-     * @return the created child POIXMLDocumentPart
-     * @throws PartAlreadyExistsException
-     *             If rule M1.12 is not verified : Packages shall not contain
-     *             equivalent part names and package implementers shall neither
-     *             create nor recognize packages with equivalent part names.
-     */
-    public final POIXMLDocumentPart createRelationship(POIXMLRelation descriptor, POIXMLFactory factory){
-        return createRelationship(descriptor, factory, -1, false).getDocumentPart();
-    }
-
-    /**
-     * Create a new child POIXMLDocumentPart
-     *
-     * @param descriptor the part descriptor
-     * @param factory the factory that will create an instance of the requested relation
-     * @param idx part number
-     * @return the created child POIXMLDocumentPart
-     * @throws PartAlreadyExistsException
-     *             If rule M1.12 is not verified : Packages shall not contain
-     *             equivalent part names and package implementers shall neither
-     *             create nor recognize packages with equivalent part names.
-     */
-    public final POIXMLDocumentPart createRelationship(POIXMLRelation descriptor, POIXMLFactory factory, int idx){
-        return createRelationship(descriptor, factory, idx, false).getDocumentPart();
-    }
-    
-    /**
-     * Identifies the next available part number for a part of the given type,
-     *  if possible, otherwise -1 if none are available.
-     * The found (valid) index can then be safely given to
-     *  {@link #createRelationship(POIXMLRelation, POIXMLFactory, int)} or
-     *  {@link #createRelationship(POIXMLRelation, POIXMLFactory, int, boolean)}
-     *  without naming clashes.
-     * If parts with other types are already claiming a name for this relationship
-     *  type (eg a {@link XSSFRelation#CHART} using the drawing part namespace 
-     *  normally used by {@link XSSFRelation#DRAWINGS}), those will be considered
-     *  when finding the next spare number.
-     *
-     * @param descriptor The relationship type to find the part number for
-     * @param minIdx The minimum free index to assign, use -1 for any
-     * @return The next free part number, or -1 if none available
-     */
-    protected final int getNextPartNumber(POIXMLRelation descriptor, int minIdx) {
-        OPCPackage pkg = packagePart.getPackage();
-        
-        try {
-            String name = descriptor.getDefaultFileName();
-            if (name.equals(descriptor.getFileName(9999))) {
-                // Non-index based, check if default is free
-                PackagePartName ppName = PackagingURIHelper.createPartName(name);
-                if (pkg.containPart(ppName)) {
-                    // Default name already taken, not index based, nothing free
-                    return -1;
-                } else {
-                    // Default name free
-                    return 0;
-                }
-            }
-            
-            // Default to searching from 1, unless they asked for 0+
-            int idx = (minIdx < 0) ? 1 : minIdx;
-            int maxIdx = minIdx + pkg.getParts().size();
-            while (idx <= maxIdx) {
-                name = descriptor.getFileName(idx);
-                PackagePartName ppName = PackagingURIHelper.createPartName(name);
-                if (!pkg.containPart(ppName)) {
-                    return idx;
-                }
-                idx++;
-            }
-        } catch (InvalidFormatException e) {
-            // Give a general wrapped exception for the problem
-            throw new POIXMLException(e);
-        }
-        return -1;
-    }
-
-    /**
-     * Create a new child POIXMLDocumentPart
-     *
-     * @param descriptor the part descriptor
-     * @param factory the factory that will create an instance of the requested relation
-     * @param idx part number
-     * @param noRelation if true, then no relationship is added.
-     * @return the created child POIXMLDocumentPart
-     * @throws PartAlreadyExistsException
-     *             If rule M1.12 is not verified : Packages shall not contain
-     *             equivalent part names and package implementers shall neither
-     *             create nor recognize packages with equivalent part names.
-     */
-    protected final RelationPart createRelationship(POIXMLRelation descriptor, POIXMLFactory factory, int idx, boolean noRelation){
-        try {
-            PackagePartName ppName = PackagingURIHelper.createPartName(descriptor.getFileName(idx));
-            PackageRelationship rel = null;
-            PackagePart part = packagePart.getPackage().createPart(ppName, descriptor.getContentType());
-            if(!noRelation) {
-                /* only add to relations, if according relationship is being created. */
-                rel = packagePart.addRelationship(ppName, TargetMode.INTERNAL, descriptor.getRelation());
-            }
-            POIXMLDocumentPart doc = factory.newDocumentPart(descriptor);
-            doc.packagePart = part;
-            doc.parent = this;
-            if (!noRelation) {
-                /* only add to relations, if according relationship is being created. */
-                addRelation(rel,doc);
-            }
-
-            return new RelationPart(rel,doc);
-        } catch (PartAlreadyExistsException pae) {
-           // Return the specific exception so the user knows
-           //  that the name is already taken
-           throw pae;
-        } catch (Exception e){
-           // Give a general wrapped exception for the problem
-           throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Iterate through the underlying PackagePart and create child POIXMLFactory instances
-     * using the specified factory
-     *
-     * @param factory   the factory object that creates POIXMLFactory instances
-     * @param context   context map containing already visited noted keyed by targetURI
-     * 
-     * @throws OpenXML4JException thrown when a related part can't be read
-     */
-    protected void read(POIXMLFactory factory, Map<PackagePart, POIXMLDocumentPart> context) throws OpenXML4JException {
-        PackagePart pp = getPackagePart();
-        // add mapping a second time, in case of initial caller hasn't done so
-        POIXMLDocumentPart otherChild = context.put(pp, this);
-        if (otherChild != null && otherChild != this) {
-            throw new POIXMLException("Unique PackagePart-POIXMLDocumentPart relation broken!");
-        }
-
-        if (!pp.hasRelationships()) return;
-
-        PackageRelationshipCollection rels = packagePart.getRelationships();
-        List<POIXMLDocumentPart> readLater = new ArrayList<POIXMLDocumentPart>();
-
-        // scan breadth-first, so parent-relations are hopefully the shallowest element
-        for (PackageRelationship rel : rels) {
-            if(rel.getTargetMode() == TargetMode.INTERNAL){
-                URI uri = rel.getTargetURI();
-
-                // check for internal references (e.g. '#Sheet1!A1')
-                PackagePartName relName;
-                if(uri.getRawFragment() != null) {
-                    relName = PackagingURIHelper.createPartName(uri.getPath());
-                } else {
-                    relName = PackagingURIHelper.createPartName(uri);
-                }
-
-                final PackagePart p = packagePart.getPackage().getPart(relName);
-                if (p == null) {
-                    logger.log(POILogger.ERROR, "Skipped invalid entry " + rel.getTargetURI());
-                    continue;
-                }
-
-                POIXMLDocumentPart childPart = context.get(p);
-                if (childPart == null) {
-                    childPart = factory.createDocumentPart(this, p);
-                    childPart.parent = this;
-                    // already add child to context, so other children can reference it
-                    context.put(p, childPart);
-                    readLater.add(childPart);
-                }
-
-                addRelation(rel,childPart);
-            }
-        }
-
-        for (POIXMLDocumentPart childPart : readLater) {
-            childPart.read(factory, context);
-        }
-    }
-
-    /**
-     * Get the PackagePart that is the target of a relationship from this Part.
-     *
-     * @param rel The relationship
-     * @return The target part
-     * @throws InvalidFormatException thrown if the related part has is erroneous
-     */
-    protected PackagePart getTargetPart(PackageRelationship rel) throws InvalidFormatException {
-        return getPackagePart().getRelatedPart(rel);
-    }
-
-
-    /**
-     * Fired when a new package part is created
-     * 
-     * @throws IOException a subclass may throw an IOException on document creation
-     */
-    protected void onDocumentCreate() throws IOException {
-
-    }
-
-    /**
-     * Fired when a package part is read
-     * 
-     * @throws IOException a subclass may throw an IOException when a document is read
-     */
-    protected void onDocumentRead() throws IOException {
-
-    }
-
-    /**
-     * Fired when a package part is about to be removed from the package
-     * 
-     * @throws IOException a subclass may throw an IOException when a document is removed
-     */
-    protected void onDocumentRemove() throws IOException {
-
-    }
-
-    /**
-     * Internal method, do not use!
-     * <p>
-     * This method only exists to allow access to protected {@link POIXMLDocumentPart#onDocumentRead()}
-     * from {@link org.apache.poi.xwpf.usermodel.XWPFDocument} without reflection. It should be removed.
-     * 
-     * @param part the part which is to be read
-     * 
-     * @throws IOException if the part can't be read
-     */
-    @Internal @Deprecated
-    public static void _invokeOnDocumentRead(POIXMLDocumentPart part) throws IOException {
-        part.onDocumentRead();
-    }
-
-    /**
-     * Retrieves the core document part
-     * 
-     * @since POI 3.14-Beta1
-     */
-    private static PackagePart getPartFromOPCPackage(OPCPackage pkg, String coreDocumentRel) {
-        PackageRelationship coreRel = pkg.getRelationshipsByType(coreDocumentRel).getRelationship(0);
-
-        if (coreRel != null) {
-            PackagePart pp = pkg.getPart(coreRel);
-            if (pp == null) {
-                throw new POIXMLException("OOXML file structure broken/invalid - core document '"+coreRel.getTargetURI()+"' not found.");
-            }
-            return pp;
-        }
-        
-        coreRel = pkg.getRelationshipsByType(PackageRelationshipTypes.STRICT_CORE_DOCUMENT).getRelationship(0);
-        if (coreRel != null) {
-            throw new POIXMLException("Strict OOXML isn't currently supported, please see bug #57699");
-        }
-
-        throw new POIXMLException("OOXML file structure broken/invalid - no core document found!");
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLException.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLException.java
deleted file mode 100644
index 82832ec..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLException.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-/**
- * Indicates a generic OOXML error.
- *
- * @author Yegor Kozlov
- */
-@SuppressWarnings("serial")
-public final class POIXMLException extends RuntimeException{
-    /**
-     * Create a new <code>POIXMLException</code> with no
-     * detail mesage.
-     */
-    public POIXMLException() {
-        super();
-    }
-
-    /**
-     * Create a new <code>POIXMLException</code> with
-     * the <code>String</code> specified as an error message.
-     *
-     * @param msg The error message for the exception.
-     */
-   public POIXMLException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Create a new <code>POIXMLException</code> with
-     * the <code>String</code> specified as an error message and the cause.
-     *
-     * @param msg The error message for the exception.
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     */
-    public POIXMLException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-
-    /**
-     * Create a new <code>POIXMLException</code> with
-     * the specified cause.
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     */
-     public POIXMLException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java
deleted file mode 100644
index aabe964..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLFactory.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Defines a factory API that enables sub-classes to create instances of <code>POIXMLDocumentPart</code>
- */
-public abstract class POIXMLFactory {
-    private static final POILogger LOGGER = POILogFactory.getLogger(POIXMLFactory.class);
-
-    private static final Class<?>[] PARENT_PART = {POIXMLDocumentPart.class, PackagePart.class};
-    private static final Class<?>[] ORPHAN_PART = {PackagePart.class};
-    
-    /**
-     * Create a POIXMLDocumentPart from existing package part and relation. This method is called
-     * from {@link POIXMLDocument#load(POIXMLFactory)} when parsing a document
-     *
-     * @param parent parent part
-     * @param part  the PackagePart representing the created instance
-     * @return A new instance of a POIXMLDocumentPart.
-     * 
-     * @since by POI 3.14-Beta1
-     */
-    public POIXMLDocumentPart createDocumentPart(POIXMLDocumentPart parent, PackagePart part) {
-        PackageRelationship rel = getPackageRelationship(parent, part);
-        POIXMLRelation descriptor = getDescriptor(rel.getRelationshipType());
-        
-        if (descriptor == null || descriptor.getRelationClass() == null) {
-            LOGGER.log(POILogger.DEBUG, "using default POIXMLDocumentPart for " + rel.getRelationshipType());
-            return new POIXMLDocumentPart(parent, part);
-        }
-
-        Class<? extends POIXMLDocumentPart> cls = descriptor.getRelationClass();
-        try {
-            try {
-                return createDocumentPart(cls, PARENT_PART, new Object[]{parent, part});
-            } catch (NoSuchMethodException e) {
-                return createDocumentPart(cls, ORPHAN_PART, new Object[]{part});
-            }
-        } catch (Exception e) {
-            throw new POIXMLException(e);
-        }
-    }
-    
-    /**
-     * Need to delegate instantiation to sub class because of constructor visibility
-     *
-     * @param cls the document class to be instantiated
-     * @param classes the classes of the constructor arguments
-     * @param values the values of the constructor arguments
-     * @return the new document / part
-     * @throws SecurityException thrown if the object can't be instantiated
-     * @throws NoSuchMethodException thrown if there is no constructor found for the given arguments
-     * @throws InstantiationException thrown if the object can't be instantiated
-     * @throws IllegalAccessException thrown if the object can't be instantiated
-     * @throws InvocationTargetException thrown if the object can't be instantiated
-     * 
-     * @since POI 3.14-Beta1
-     */
-    protected abstract POIXMLDocumentPart createDocumentPart
-        (Class<? extends POIXMLDocumentPart> cls, Class<?>[] classes, Object[] values)
-    throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException;
-    
-    /**
-     * returns the descriptor for the given relationship type 
-     *
-     * @param relationshipType the relationship type of the descriptor
-     * @return the descriptor or null if type is unknown
-     * 
-     * @since POI 3.14-Beta1
-     */
-    protected abstract POIXMLRelation getDescriptor(String relationshipType);
-     
-    /**
-     * Create a POIXMLDocumentPart from existing package part and relation. This method is called
-     * from {@link POIXMLDocument#load(POIXMLFactory)} when parsing a document
-     *
-     * @param parent parent part
-     * @param rel   the package part relationship
-     * @param part  the PackagePart representing the created instance
-     * @return A new instance of a POIXMLDocumentPart.
-     * 
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-     @Deprecated
-     public final POIXMLDocumentPart createDocumentPart(POIXMLDocumentPart parent, PackageRelationship rel, PackagePart part) {
-         return createDocumentPart(parent, part);
-     }
-
-    /**
-     * Create a new POIXMLDocumentPart using the supplied descriptor. This method is used when adding new parts
-     * to a document, for example, when adding a sheet to a workbook, slide to a presentation, etc.
-     *
-     * @param descriptor  describes the object to create
-     * @return A new instance of a POIXMLDocumentPart.
-     */
-     public POIXMLDocumentPart newDocumentPart(POIXMLRelation descriptor) {
-         Class<? extends POIXMLDocumentPart> cls = descriptor.getRelationClass();
-         try {
-             return createDocumentPart(cls, null, null);
-         } catch (Exception e) {
-             throw new POIXMLException(e);
-         }
-     }
-
-     /**
-      * Retrieves the package relationship of the child part within the parent
-      * 
-      * @param parent the parent to search for the part
-      * @param part the part to look for
-      * 
-      * @return the relationship
-      * 
-      * @throws POIXMLException if the relations are erroneous or the part is not related
-      * 
-      * @since POI 3.14-Beta1
-      */
-     protected PackageRelationship getPackageRelationship(POIXMLDocumentPart parent, PackagePart part) {
-         try {
-             String partName = part.getPartName().getName();
-             for (PackageRelationship pr : parent.getPackagePart().getRelationships()) {
-                 String packName = pr.getTargetURI().toASCIIString();
-                 if (packName.equalsIgnoreCase(partName)) {
-                     return pr;
-                 }
-             }
-         } catch (InvalidFormatException e) {
-             throw new POIXMLException("error while determining package relations", e);
-         }
-         
-         throw new POIXMLException("package part isn't a child of the parent document.");
-     }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java
deleted file mode 100644
index b956b7e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java
+++ /dev/null
@@ -1,611 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Date;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.StreamHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.openxml4j.util.Nullable;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty;
-
-/**
- * Wrapper around the three different kinds of OOXML properties
- *  and metadata a document can have (Core, Extended and Custom), 
- *  as well Thumbnails.
- */
-public class POIXMLProperties {
-    private OPCPackage pkg;
-    private CoreProperties core;
-    private ExtendedProperties ext;
-    private CustomProperties cust;
-
-    private PackagePart extPart;
-    private PackagePart custPart;
-
-
-    private static final org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument NEW_EXT_INSTANCE;
-    private static final org.openxmlformats.schemas.officeDocument.x2006.customProperties.PropertiesDocument NEW_CUST_INSTANCE;
-    static {
-        NEW_EXT_INSTANCE = org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument.Factory.newInstance();
-        NEW_EXT_INSTANCE.addNewProperties();
-
-        NEW_CUST_INSTANCE = org.openxmlformats.schemas.officeDocument.x2006.customProperties.PropertiesDocument.Factory.newInstance();
-        NEW_CUST_INSTANCE.addNewProperties();
-    }
-
-    public POIXMLProperties(OPCPackage docPackage) throws IOException, OpenXML4JException, XmlException {
-        this.pkg = docPackage;
-
-        // Core properties
-        core = new CoreProperties((PackagePropertiesPart)pkg.getPackageProperties() );
-
-        // Extended properties
-        PackageRelationshipCollection extRel =
-                pkg.getRelationshipsByType(PackageRelationshipTypes.EXTENDED_PROPERTIES);
-        if(extRel.size() == 1) {
-            extPart = pkg.getPart( extRel.getRelationship(0));
-            org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument props = org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument.Factory.parse(
-                    extPart.getInputStream(), DEFAULT_XML_OPTIONS
-            );
-            ext = new ExtendedProperties(props);
-        } else {
-            extPart = null;
-            ext = new ExtendedProperties((org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument)NEW_EXT_INSTANCE.copy());
-        }
-
-        // Custom properties
-        PackageRelationshipCollection custRel =
-                pkg.getRelationshipsByType(PackageRelationshipTypes.CUSTOM_PROPERTIES);
-        if(custRel.size() == 1) {
-            custPart = pkg.getPart( custRel.getRelationship(0));
-            org.openxmlformats.schemas.officeDocument.x2006.customProperties.PropertiesDocument props = org.openxmlformats.schemas.officeDocument.x2006.customProperties.PropertiesDocument.Factory.parse(
-                    custPart.getInputStream(), DEFAULT_XML_OPTIONS
-            );
-            cust = new CustomProperties(props);
-        } else {
-            custPart = null;
-            cust = new CustomProperties((org.openxmlformats.schemas.officeDocument.x2006.customProperties.PropertiesDocument)NEW_CUST_INSTANCE.copy());
-        }
-    }
-
-    /**
-     * Returns the core document properties
-     * 
-     * @return the core document properties
-     */
-    public CoreProperties getCoreProperties() {
-        return core;
-    }
-
-    /**
-     * Returns the extended document properties
-     * 
-     * @return the extended document properties
-     */
-    public ExtendedProperties getExtendedProperties() {
-        return ext;
-    }
-
-    /**
-     * Returns the custom document properties
-     * 
-     * @return the custom document properties
-     */
-    public CustomProperties getCustomProperties() {
-        return cust;
-    }
-
-    /**
-     * Returns the {@link PackagePart} for the Document
-     *  Thumbnail, or <code>null</code> if there isn't one
-     *
-     * @return The Document Thumbnail part or null
-     */
-    protected PackagePart getThumbnailPart() {
-        PackageRelationshipCollection rels =
-                pkg.getRelationshipsByType(PackageRelationshipTypes.THUMBNAIL);
-        if(rels.size() == 1) {
-            return pkg.getPart(rels.getRelationship(0));
-        }
-        return null;
-    }
-    /**
-     * Returns the name of the Document thumbnail, eg 
-     *  <code>thumbnail.jpeg</code>, or <code>null</code> if there
-     *  isn't one.
-     *
-     * @return The thumbnail filename, or null
-     */
-    public String getThumbnailFilename() {
-        PackagePart tPart = getThumbnailPart();
-        if (tPart == null) return null;
-        String name = tPart.getPartName().getName();
-        return name.substring(name.lastIndexOf('/'));
-    }
-    /**
-     * Returns the Document thumbnail image data, or {@code null} if there isn't one.
-     *
-     * @return The thumbnail data, or null
-     * 
-     * @throws IOException if the thumbnail can't be read
-     */
-    public InputStream getThumbnailImage() throws IOException {
-        PackagePart tPart = getThumbnailPart();
-        if (tPart == null) return null;
-        return tPart.getInputStream();
-    }
-
-    /**
-     * Sets the Thumbnail for the document, replacing any existing one.
-     *
-     * @param filename The filename for the thumbnail image, eg {@code thumbnail.jpg}
-     * @param imageData The inputstream to read the thumbnail image from
-     * 
-     * @throws IOException if the thumbnail can't be written
-     */
-    public void setThumbnail(String filename, InputStream imageData) throws IOException {
-        PackagePart tPart = getThumbnailPart();
-        if (tPart == null) {
-            // New thumbnail
-            pkg.addThumbnail(filename, imageData);
-        } else {
-            // Change existing
-            String newType = ContentTypes.getContentTypeFromFileExtension(filename); 
-            if (! newType.equals(tPart.getContentType())) {
-                throw new IllegalArgumentException("Can't set a Thumbnail of type " + 
-                        newType + " when existing one is of a different type " +
-                        tPart.getContentType());
-            }
-            StreamHelper.copyStream(imageData, tPart.getOutputStream());
-        }
-    }
-
-    /**
-     * Commit changes to the underlying OPC package
-     * 
-     * @throws IOException if the properties can't be saved
-     * @throws POIXMLException if the properties are erroneous
-     */
-    public void commit() throws IOException{
-
-        if(extPart == null && !NEW_EXT_INSTANCE.toString().equals(ext.props.toString())){
-            try {
-                PackagePartName prtname = PackagingURIHelper.createPartName("/docProps/app.xml");
-                pkg.addRelationship(prtname, TargetMode.INTERNAL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties");
-                extPart = pkg.createPart(prtname, "application/vnd.openxmlformats-officedocument.extended-properties+xml");
-            } catch (InvalidFormatException e){
-                throw new POIXMLException(e);
-            }
-        }
-        if(custPart == null && !NEW_CUST_INSTANCE.toString().equals(cust.props.toString())){
-            try {
-                PackagePartName prtname = PackagingURIHelper.createPartName("/docProps/custom.xml");
-                pkg.addRelationship(prtname, TargetMode.INTERNAL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties");
-                custPart = pkg.createPart(prtname, "application/vnd.openxmlformats-officedocument.custom-properties+xml");
-            } catch (InvalidFormatException e){
-                throw new POIXMLException(e);
-            }
-        }
-        if(extPart != null){
-            OutputStream out = extPart.getOutputStream();
-            if (extPart.getSize() > 0) {
-                extPart.clear();
-            }
-            ext.props.save(out, DEFAULT_XML_OPTIONS);
-            out.close();
-        }
-        if(custPart != null){
-            OutputStream out = custPart.getOutputStream();
-            cust.props.save(out, DEFAULT_XML_OPTIONS);
-            out.close();
-        }
-    }
-
-    /**
-     * The core document properties
-     */
-    public static class CoreProperties {
-        private PackagePropertiesPart part;
-        private CoreProperties(PackagePropertiesPart part) {
-            this.part = part;
-        }
-
-        public String getCategory() {
-            return part.getCategoryProperty().getValue();
-        }
-        public void setCategory(String category) {
-            part.setCategoryProperty(category);
-        }
-        public String getContentStatus() {
-            return part.getContentStatusProperty().getValue();
-        }
-        public void setContentStatus(String contentStatus) {
-            part.setContentStatusProperty(contentStatus);
-        }
-        public String getContentType() {
-            return part.getContentTypeProperty().getValue();
-        }
-        public void setContentType(String contentType) {
-            part.setContentTypeProperty(contentType);
-        }
-        public Date getCreated() {
-            return part.getCreatedProperty().getValue();
-        }
-        public void setCreated(Nullable<Date> date) {
-            part.setCreatedProperty(date);
-        }
-        public void setCreated(String date) {
-            part.setCreatedProperty(date);
-        }
-        public String getCreator() {
-            return part.getCreatorProperty().getValue();
-        }
-        public void setCreator(String creator) {
-            part.setCreatorProperty(creator);
-        }
-        public String getDescription() {
-            return part.getDescriptionProperty().getValue();
-        }
-        public void setDescription(String description) {
-            part.setDescriptionProperty(description);
-        }
-        public String getIdentifier() {
-            return part.getIdentifierProperty().getValue();
-        }
-        public void setIdentifier(String identifier) {
-            part.setIdentifierProperty(identifier);
-        }
-        public String getKeywords() {
-            return part.getKeywordsProperty().getValue();
-        }
-        public void setKeywords(String keywords) {
-            part.setKeywordsProperty(keywords);
-        }
-        public Date getLastPrinted() {
-            return part.getLastPrintedProperty().getValue();
-        }
-        public void setLastPrinted(Nullable<Date> date) {
-            part.setLastPrintedProperty(date);
-        }
-        public void setLastPrinted(String date) {
-            part.setLastPrintedProperty(date);
-        }
-        /** @since POI 3.15 beta 3 */
-        public String getLastModifiedByUser() {
-            return part.getLastModifiedByProperty().getValue();
-        }
-        /** @since POI 3.15 beta 3 */
-        public void setLastModifiedByUser(String user) {
-            part.setLastModifiedByProperty(user);
-        }
-        public Date getModified() {
-            return part.getModifiedProperty().getValue();
-        }
-        public void setModified(Nullable<Date> date) {
-            part.setModifiedProperty(date);
-        }
-        public void setModified(String date) {
-            part.setModifiedProperty(date);
-        }
-        public String getSubject() {
-            return part.getSubjectProperty().getValue();
-        }
-        public void setSubjectProperty(String subject) {
-            part.setSubjectProperty(subject);
-        }
-        public void setTitle(String title) {
-            part.setTitleProperty(title);
-        }
-        public String getTitle() {
-            return part.getTitleProperty().getValue();
-        }
-        public String getRevision() {
-            return part.getRevisionProperty().getValue();
-        }
-        public void setRevision(String revision) {
-            try {
-                Long.valueOf(revision);
-                part.setRevisionProperty(revision);
-            }
-            catch (NumberFormatException e) {}
-        }
-
-        public PackagePropertiesPart getUnderlyingProperties() {
-            return part;
-        }
-    }
-
-    /**
-     * Extended document properties
-     */
-    public static class ExtendedProperties {
-        private org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument props;
-        private ExtendedProperties(org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument props) {
-            this.props = props;
-        }
-
-        public org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties getUnderlyingProperties() {
-            return props.getProperties();
-        }
-
-        public String getTemplate() {
-            if (props.getProperties().isSetTemplate()) {
-                return props.getProperties().getTemplate();
-            }
-            return null;
-        }
-        public String getManager() {
-            if (props.getProperties().isSetManager()) {
-                return props.getProperties().getManager();
-            }
-            return null;
-        }
-        public String getCompany() {
-            if (props.getProperties().isSetCompany()) {
-                return props.getProperties().getCompany();
-            }
-            return null;
-        }
-        public String getPresentationFormat() {
-            if (props.getProperties().isSetPresentationFormat()) {
-                return props.getProperties().getPresentationFormat();
-            }
-            return null;
-        }
-        public String getApplication() {
-            if (props.getProperties().isSetApplication()) {
-                return props.getProperties().getApplication();
-            }
-            return null;
-        }
-        public String getAppVersion() {
-            if (props.getProperties().isSetAppVersion()) {
-                return props.getProperties().getAppVersion();
-            }
-            return null;
-        }
-
-        public int getPages() {
-            if (props.getProperties().isSetPages()) {
-                return props.getProperties().getPages();
-            }
-            return -1;
-        }
-        public int getWords() {
-            if (props.getProperties().isSetWords()) {
-                return props.getProperties().getWords();
-            }
-            return -1;
-        }
-        public int getCharacters() {
-            if (props.getProperties().isSetCharacters()) {
-                return props.getProperties().getCharacters();
-            }
-            return -1;
-        }
-        public int getCharactersWithSpaces() {
-            if (props.getProperties().isSetCharactersWithSpaces()) {
-                return props.getProperties().getCharactersWithSpaces();
-            }
-            return -1;
-        }
-        public int getLines() {
-            if (props.getProperties().isSetLines()) {
-                return props.getProperties().getLines();
-            }
-            return -1;
-        }
-        public int getParagraphs() {
-            if (props.getProperties().isSetParagraphs()) {
-                return props.getProperties().getParagraphs();
-            }
-            return -1;
-        }
-        public int getSlides() {
-            if (props.getProperties().isSetSlides()) {
-                return props.getProperties().getSlides();
-            }
-            return -1;
-        }
-        public int getNotes() {
-            if (props.getProperties().isSetNotes()) {
-                return props.getProperties().getNotes();
-            }
-            return -1;
-        }
-        public int getTotalTime()  {
-            if (props.getProperties().isSetTotalTime()) {
-                return props.getProperties().getTotalTime();
-            }
-            return -1;
-        }
-        public int getHiddenSlides()  {
-            if (props.getProperties().isSetHiddenSlides()) {
-                return props.getProperties().getHiddenSlides();
-            }
-            return -1;
-        }
-        public int getMMClips() {
-            if (props.getProperties().isSetMMClips()) {
-                return props.getProperties().getMMClips();
-            }
-            return -1;
-        }
-
-        public String getHyperlinkBase() {
-            if (props.getProperties().isSetHyperlinkBase()) {
-                return props.getProperties().getHyperlinkBase();
-            }
-            return null;
-        }
-    }
-
-    /**
-     *  Custom document properties
-     */
-    public static class CustomProperties {
-        /**
-         *  Each custom property element contains an fmtid attribute
-         *  with the same GUID value ({D5CDD505-2E9C-101B-9397-08002B2CF9AE}).
-         */
-        public static final String FORMAT_ID = "{D5CDD505-2E9C-101B-9397-08002B2CF9AE}";
-
-        private org.openxmlformats.schemas.officeDocument.x2006.customProperties.PropertiesDocument props;
-        private CustomProperties(org.openxmlformats.schemas.officeDocument.x2006.customProperties.PropertiesDocument props) {
-            this.props = props;
-        }
-
-        public org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties getUnderlyingProperties() {
-            return props.getProperties();
-        }
-
-        /**
-         * Add a new property
-         *
-         * @param name the property name
-         * @throws IllegalArgumentException if a property with this name already exists
-         */
-        private CTProperty add(String name) {
-            if(contains(name)) {
-                throw new IllegalArgumentException("A property with this name " +
-                        "already exists in the custom properties");
-            }
-
-            CTProperty p = props.getProperties().addNewProperty();
-            int pid = nextPid();
-            p.setPid(pid);
-            p.setFmtid(FORMAT_ID);
-            p.setName(name);
-            return p;
-        }
-
-        /**
-         * Add a new string property
-         * 
-         * @param name the property name
-         * @param value the property value
-         *
-         * @throws IllegalArgumentException if a property with this name already exists
-         */
-        public void addProperty(String name, String value){
-            CTProperty p = add(name);
-            p.setLpwstr(value);
-        }
-
-        /**
-         * Add a new double property
-         *
-         * @param name the property name
-         * @param value the property value
-         *
-         * @throws IllegalArgumentException if a property with this name already exists
-         */
-        public void addProperty(String name, double value){
-            CTProperty p = add(name);
-            p.setR8(value);
-        }
-
-        /**
-         * Add a new integer property
-         *
-         * @param name the property name
-         * @param value the property value
-         *
-         * @throws IllegalArgumentException if a property with this name already exists
-         */
-        public void addProperty(String name, int value){
-            CTProperty p = add(name);
-            p.setI4(value);
-        }
-
-        /**
-         * Add a new boolean property
-         *
-         * @param name the property name
-         * @param value the property value
-         *
-         * @throws IllegalArgumentException if a property with this name already exists
-         */
-        public void addProperty(String name, boolean value){
-            CTProperty p = add(name);
-            p.setBool(value);
-        }
-
-        /**
-         * Generate next id that uniquely relates a custom property
-         *
-         * @return next property id starting with 2
-         */
-        protected int nextPid() {
-            int propid = 1;
-            for(CTProperty p : props.getProperties().getPropertyArray()){
-                if(p.getPid() > propid) propid = p.getPid();
-            }
-            return propid + 1;
-        }
-
-        /**
-         * Check if a property with this name already exists in the collection of custom properties
-         *
-         * @param name the name to check
-         * @return whether a property with the given name exists in the custom properties
-         */
-        public boolean contains(String name) {
-            for(CTProperty p : props.getProperties().getPropertyArray()){
-                if(p.getName().equals(name)) return true;
-            }
-            return false;
-        }
-
-        /**
-         * Retrieve the custom property with this name, or null if none exists.
-         *
-         * You will need to test the various isSetX methods to work out
-         *  what the type of the property is, before fetching the 
-         *  appropriate value for it.
-         *
-         * @param name the name of the property to fetch
-         * 
-         * @return the custom property with this name, or null if none exists
-         */
-        public CTProperty getProperty(String name) {
-            for(CTProperty p : props.getProperties().getPropertyArray()){
-                if(p.getName().equals(name)) {
-                    return p;
-                }
-            }
-            return null;
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
deleted file mode 100644
index b2621eb..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.util.LocaleUtil;
-import org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty;
-
-/**
- * A {@link POITextExtractor} for returning the textual
- *  content of the OOXML file properties, eg author
- *  and title.
- */
-public class POIXMLPropertiesTextExtractor extends POIXMLTextExtractor {
-    
-    private final DateFormat dateFormat;
-    
-	/**
-	 * Creates a new POIXMLPropertiesTextExtractor for the given open document.
-	 * 
-	 * @param doc the given open document
-	 */
-	public POIXMLPropertiesTextExtractor(POIXMLDocument doc) {
-		super(doc);
-        DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ROOT);
-        dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dfs);
-        dateFormat.setTimeZone(LocaleUtil.TIMEZONE_UTC);       
-	}
-	
-	/**
-	 * Creates a new POIXMLPropertiesTextExtractor, for the
-	 *  same file that another TextExtractor is already
-	 *  working on.
-	 * 
-	 * @param otherExtractor the extractor referencing the given file
-	 */
-	public POIXMLPropertiesTextExtractor(POIXMLTextExtractor otherExtractor) {
-		this(otherExtractor.getDocument());
-	}
-	
-   private void appendIfPresent(StringBuffer text, String thing, boolean value) {
-      appendIfPresent(text, thing, Boolean.toString(value));
-   }
-   private void appendIfPresent(StringBuffer text, String thing, int value) {
-      appendIfPresent(text, thing, Integer.toString(value));
-   }
-   private void appendIfPresent(StringBuffer text, String thing, Date value) {
-      if(value == null) { return; }
-      appendIfPresent(text, thing, dateFormat.format(value));
-   }
-	private void appendIfPresent(StringBuffer text, String thing, String value) {
-	   if(value == null) { return; }
-	   text.append(thing);
-	   text.append(" = ");
-	   text.append(value);
-	   text.append("\n");
-	}
-
-	/**
-	 * Returns the core document properties, eg author
-	 * 
-	 * @return the core document properties
-	 */
-	@SuppressWarnings("resource")
-    public String getCorePropertiesText() {
-	    POIXMLDocument document = getDocument();
-        if(document == null) {  // event based extractor does not have a document
-            return "";
-        }
-
-		StringBuffer text = new StringBuffer();
-        PackagePropertiesPart props =
-			document.getProperties().getCoreProperties().getUnderlyingProperties();
-
-		appendIfPresent(text, "Category", props.getCategoryProperty().getValue());
-		appendIfPresent(text, "Category", props.getCategoryProperty().getValue());
-		appendIfPresent(text, "ContentStatus", props.getContentStatusProperty().getValue());
-		appendIfPresent(text, "ContentType", props.getContentTypeProperty().getValue());
-		appendIfPresent(text, "Created", props.getCreatedProperty().getValue());
-		appendIfPresent(text, "CreatedString", props.getCreatedPropertyString());
-		appendIfPresent(text, "Creator", props.getCreatorProperty().getValue());
-		appendIfPresent(text, "Description", props.getDescriptionProperty().getValue());
-		appendIfPresent(text, "Identifier", props.getIdentifierProperty().getValue());
-		appendIfPresent(text, "Keywords", props.getKeywordsProperty().getValue());
-		appendIfPresent(text, "Language", props.getLanguageProperty().getValue());
-		appendIfPresent(text, "LastModifiedBy", props.getLastModifiedByProperty().getValue());
-		appendIfPresent(text, "LastPrinted", props.getLastPrintedProperty().getValue());
-		appendIfPresent(text, "LastPrintedString", props.getLastPrintedPropertyString());
-		appendIfPresent(text, "Modified", props.getModifiedProperty().getValue());
-		appendIfPresent(text, "ModifiedString", props.getModifiedPropertyString());
-		appendIfPresent(text, "Revision", props.getRevisionProperty().getValue());
-		appendIfPresent(text, "Subject", props.getSubjectProperty().getValue());
-		appendIfPresent(text, "Title", props.getTitleProperty().getValue());
-		appendIfPresent(text, "Version", props.getVersionProperty().getValue());
-
-		return text.toString();
-	}
-	/**
-	 * Returns the extended document properties, eg application
-	 * 
-	 * @return the extended document properties
-	 */
-	@SuppressWarnings("resource")
-    public String getExtendedPropertiesText() {
-        POIXMLDocument document = getDocument();
-        if(document == null) {  // event based extractor does not have a document
-            return "";
-        }
-
-		StringBuffer text = new StringBuffer();
-		org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
-			props = document.getProperties().getExtendedProperties().getUnderlyingProperties();
-
-		appendIfPresent(text, "Application", props.getApplication());
-		appendIfPresent(text, "AppVersion", props.getAppVersion());
-		appendIfPresent(text, "Characters", props.getCharacters());
-		appendIfPresent(text, "CharactersWithSpaces", props.getCharactersWithSpaces());
-		appendIfPresent(text, "Company", props.getCompany());
-		appendIfPresent(text, "HyperlinkBase", props.getHyperlinkBase());
-		appendIfPresent(text, "HyperlinksChanged", props.getHyperlinksChanged());
-		appendIfPresent(text, "Lines", props.getLines());
-		appendIfPresent(text, "LinksUpToDate", props.getLinksUpToDate());
-		appendIfPresent(text, "Manager", props.getManager());
-		appendIfPresent(text, "Pages", props.getPages());
-		appendIfPresent(text, "Paragraphs", props.getParagraphs());
-		appendIfPresent(text, "PresentationFormat", props.getPresentationFormat());
-		appendIfPresent(text, "Template", props.getTemplate());
-		appendIfPresent(text, "TotalTime", props.getTotalTime());
-
-		return text.toString();
-	}
-   /**
-    * Returns the custom document properties, if there are any
-    * 
-    * @return the custom document properties
-    */
-   @SuppressWarnings({ "resource" })
-   public String getCustomPropertiesText() {
-       POIXMLDocument document = getDocument();
-       if(document == null) {  // event based extractor does not have a document
-           return "";
-       }
-
-      StringBuilder text = new StringBuilder();
-      org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
-      props = document.getProperties().getCustomProperties().getUnderlyingProperties();
-
-       for(CTProperty property : props.getPropertyArray()) {
-         String val = "(not implemented!)";
-
-         if (property.isSetLpwstr()) {
-            val = property.getLpwstr(); 
-         }
-         else if (property.isSetLpstr()) {
-            val = property.getLpstr(); 
-         }
-         else if (property.isSetDate()) {
-            val = property.getDate().toString(); 
-         }
-         else if (property.isSetFiletime()) {
-            val = property.getFiletime().toString(); 
-         }
-         else if (property.isSetBool()) {
-            val = Boolean.toString( property.getBool() );
-         }
-
-         // Integers
-         else if (property.isSetI1()) {
-            val = Integer.toString(property.getI1()); 
-         }
-         else if (property.isSetI2()) {
-            val = Integer.toString(property.getI2()); 
-         }
-         else if (property.isSetI4()) {
-            val = Integer.toString(property.getI4()); 
-         }
-         else if (property.isSetI8()) {
-            val = Long.toString(property.getI8()); 
-         }
-         else if (property.isSetInt()) {
-            val = Integer.toString( property.getInt() ); 
-         }
-
-         // Unsigned Integers
-         else if (property.isSetUi1()) {
-            val = Integer.toString(property.getUi1()); 
-         }
-         else if (property.isSetUi2()) {
-            val = Integer.toString(property.getUi2()); 
-         }
-         else if (property.isSetUi4()) {
-            val = Long.toString(property.getUi4()); 
-         }
-         else if (property.isSetUi8()) {
-            val = property.getUi8().toString(); 
-         }
-         else if (property.isSetUint()) {
-            val = Long.toString(property.getUint()); 
-         }
-
-         // Reals
-         else if (property.isSetR4()) {
-            val = Float.toString( property.getR4() ); 
-         }
-         else if (property.isSetR8()) {
-            val = Double.toString( property.getR8() ); 
-         }
-         else if (property.isSetDecimal()) {
-            BigDecimal d = property.getDecimal();
-            if (d == null) {
-               val = null;
-            } else {
-               val = d.toPlainString();
-            }
-         }
-
-         /*else if (property.isSetArray()) {
-            // TODO Fetch the array values and output 
-         }
-         else if (property.isSetVector()) {
-            // TODO Fetch the vector values and output
-         }
-
-         else if (property.isSetBlob() || property.isSetOblob()) {
-            // TODO Decode, if possible
-         }
-         else if (property.isSetStream() || property.isSetOstream() ||
-                  property.isSetVstream()) {
-            // TODO Decode, if possible
-         }
-         else if (property.isSetStorage() || property.isSetOstorage()) {
-            // TODO Decode, if possible
-         }*/
-
-         text.append(property.getName()).append(" = ").append(val).append("\n");
-      }
-
-      return text.toString();
-   }
-
-	@Override
-    public String getText() {
-		try {
-			return
-				getCorePropertiesText() +
-				getExtendedPropertiesText() +
-				getCustomPropertiesText();
-		} catch(Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	@Override
-    public POIXMLPropertiesTextExtractor getMetadataTextExtractor() {
-		throw new IllegalStateException("You already have the Metadata Text Extractor, not recursing!");
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLRelation.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLRelation.java
deleted file mode 100644
index 8578f80..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLRelation.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-/**
- * Represents a descriptor of a OOXML relation.
- */
-public abstract class POIXMLRelation {
-
-    /**
-     * Describes the content stored in a part.
-     */
-    protected String _type;
-
-    /**
-     * The kind of connection between a source part and a target part in a package.
-     */
-    protected String _relation;
-
-    /**
-     * The path component of a pack URI.
-     */
-    protected String _defaultName;
-
-    /**
-     * Defines what object is used to construct instances of this relationship
-     */
-    private Class<? extends POIXMLDocumentPart> _cls;
-
-    /**
-     * Instantiates a POIXMLRelation.
-     *
-     * @param type content type
-     * @param rel  relationship
-     * @param defaultName default item name
-     * @param cls defines what object is used to construct instances of this relationship
-     */
-    public POIXMLRelation(String type, String rel, String defaultName, Class<? extends POIXMLDocumentPart> cls) {
-        _type = type;
-        _relation = rel;
-        _defaultName = defaultName;
-        _cls = cls;
-    }
-
-    /**
-     * Instantiates a POIXMLRelation.
-     *
-     * @param type content type
-     * @param rel  relationship
-     * @param defaultName default item name
-     */
-    public POIXMLRelation(String type, String rel, String defaultName) {
-        this(type, rel, defaultName, null);
-    }
-    /**
-     * Return the content type. Content types define a media type, a subtype, and an
-     * optional set of parameters, as defined in RFC 2616.
-     *
-     * @return the content type
-     */
-    public String getContentType() {
-        return _type;
-    }
-
-    /**
-     * Return the relationship, the kind of connection between a source part and a target part in a package.
-     * Relationships make the connections between parts directly discoverable without looking at the content
-     * in the parts, and without altering the parts themselves.
-     *
-     * @return the relationship
-     */
-    public String getRelation() {
-        return _relation;
-    }
-
-    /**
-     * Return the default part name. Part names are used to refer to a part in the context of a
-     * package, typically as part of a URI.
-     *
-     * @return the default part name
-     */
-    public String getDefaultFileName() {
-        return _defaultName;
-    }
-
-    /**
-     * Returns the filename for the nth one of these, e.g. /xl/comments4.xml
-     * 
-     * @param index the suffix for the document type
-     * @return the filename including the suffix
-     */
-    public String getFileName(int index) {
-        if(_defaultName.indexOf("#") == -1) {
-            // Generic filename in all cases
-            return getDefaultFileName();
-        }
-        return _defaultName.replace("#", Integer.toString(index));
-    }
-    
-    /**
-     * Returns the index of the filename within the package for the given part.
-     *  e.g. 4 for /xl/comments4.xml
-     *  
-     * @param part the part to read the suffix from
-     * @return the suffix
-     */
-    public Integer getFileNameIndex(POIXMLDocumentPart part) {
-        String regex = _defaultName.replace("#", "(\\d+)");
-        return Integer.valueOf(part.getPackagePart().getPartName().getName().replaceAll(regex, "$1"));
-    }
-    
-    /**
-     * Return type of the object used to construct instances of this relationship
-     *
-     * @return the class of the object used to construct instances of this relation
-     */
-    public Class<? extends POIXMLDocumentPart> getRelationClass(){
-        return _cls;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
deleted file mode 100644
index 954feb8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLProperties.CoreProperties;
-import org.apache.poi.POIXMLProperties.CustomProperties;
-import org.apache.poi.POIXMLProperties.ExtendedProperties;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
-
-public abstract class POIXMLTextExtractor extends POITextExtractor {
-	/** The POIXMLDocument that's open */
-	private final POIXMLDocument _document;
-
-	/**
-	 * Creates a new text extractor for the given document
-	 * 
-	 * @param document the document to extract from
-	 */
-	public POIXMLTextExtractor(POIXMLDocument document) {
-		_document = document;
-	}
-
-	/**
-	 * Returns the core document properties
-	 * 
-	 * @return the core document properties
-	 */
-	public CoreProperties getCoreProperties() {
-		 return _document.getProperties().getCoreProperties();
-	}
-	/**
-	 * Returns the extended document properties
-	 * 
-	 * @return the extended document properties
-	 */
-	public ExtendedProperties getExtendedProperties() {
-		return _document.getProperties().getExtendedProperties();
-	}
-	/**
-	 * Returns the custom document properties
-	 * 
-	 * @return the custom document properties
-	 */
-	public CustomProperties getCustomProperties() {
-		return _document.getProperties().getCustomProperties();
-	}
-
-	/**
-	 * Returns opened document
-	 * 
-	 * @return the opened document
-	 */
-	public final POIXMLDocument getDocument() {
-		return _document;
-	}
-
-	/**
-	 * Returns the opened OPCPackage that contains the document
-	 * 
-	 * @return the opened OPCPackage
-	 */
-	public OPCPackage getPackage() {
-	   return _document.getPackage();
-	}
-
-	/**
-	 * Returns an OOXML properties text extractor for the
-	 *  document properties metadata, such as title and author.
-	 */
-	@Override
-    public POIXMLPropertiesTextExtractor getMetadataTextExtractor() {
-		return new POIXMLPropertiesTextExtractor(_document);
-	}
-
-	@Override
-	public void close() throws IOException {
-		// e.g. XSSFEventBaseExcelExtractor passes a null-document
-		if(_document != null) {
-			@SuppressWarnings("resource")
-            OPCPackage pkg = _document.getPackage();
-			if(pkg != null) {
-			    // revert the package to not re-write the file, which is very likely not wanted for a TextExtractor!
-				pkg.revert();
-			}
-		}
-		super.close();
-	}
-
-	protected void checkMaxTextSize(StringBuffer text, String string) {
-        if(string == null) {
-            return;
-        }
-
-        int size = text.length() + string.length();
-        if(size > ZipSecureFile.getMaxTextSize()) {
-            throw new IllegalStateException("The text would exceed the max allowed overall size of extracted text. "
-                    + "By default this is prevented as some documents may exhaust available memory and it may indicate that the file is used to inflate memory usage and thus could pose a security risk. "
-                    + "You can adjust this limit via ZipSecureFile.setMaxTextSize() if you need to work with files which have a lot of text. "
-                    + "Size: " + size + ", limit: MAX_TEXT_SIZE: " + ZipSecureFile.getMaxTextSize());
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java b/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
deleted file mode 100644
index eeed5f7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.lang.ref.WeakReference;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.poi.util.DocumentHelper;
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.SchemaTypeLoader;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.xml.stream.XMLInputStream;
-import org.apache.xmlbeans.xml.stream.XMLStreamException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-@SuppressWarnings("deprecation")
-public class POIXMLTypeLoader {
-
-    private static ThreadLocal<ClassLoader> classLoader = new ThreadLocal<ClassLoader>();
-    
-    public static final XmlOptions DEFAULT_XML_OPTIONS;
-    static {
-        DEFAULT_XML_OPTIONS = new XmlOptions();
-        DEFAULT_XML_OPTIONS.setSaveOuter();
-        DEFAULT_XML_OPTIONS.setUseDefaultNamespace();
-        DEFAULT_XML_OPTIONS.setSaveAggressiveNamespaces();
-        DEFAULT_XML_OPTIONS.setCharacterEncoding("UTF-8");
-        // Piccolo is disabled for POI builts, i.e. JAXP is used for parsing
-        // so only user code using XmlObject/XmlToken.Factory.parse
-        // directly can bypass the entity check, which is probably unlikely (... and not within our responsibility :)) 
-        // DEFAULT_XML_OPTIONS.setLoadEntityBytesLimit(4096);
-
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("http://schemas.openxmlformats.org/drawingml/2006/main", "a");
-        map.put("http://schemas.openxmlformats.org/drawingml/2006/chart", "c");
-        map.put("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing", "wp");
-        map.put("http://schemas.openxmlformats.org/markup-compatibility/2006", "ve");
-        map.put("http://schemas.openxmlformats.org/officeDocument/2006/math", "m");
-        map.put("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "r");
-        map.put("http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes", "vt");
-        map.put("http://schemas.openxmlformats.org/presentationml/2006/main", "p");
-        map.put("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w");
-        map.put("http://schemas.microsoft.com/office/word/2006/wordml", "wne");
-        map.put("urn:schemas-microsoft-com:office:office", "o");
-        map.put("urn:schemas-microsoft-com:office:excel", "x");
-        map.put("urn:schemas-microsoft-com:office:word", "w10");
-        map.put("urn:schemas-microsoft-com:vml", "v");
-        DEFAULT_XML_OPTIONS.setSaveSuggestedPrefixes(Collections.unmodifiableMap(map));
-    }
-    
-    private static XmlOptions getXmlOptions(XmlOptions options) {
-        return options == null ? DEFAULT_XML_OPTIONS : options;
-    }
-
-    /**
-     * Sets the {@link ClassLoader} which is used, when XmlBeans are dynamically instantiated -
-     * opposed to being loaded by the factory class which is accompanied by each generated XmlBeans interface.
-     * <p>
-     * This is especially necessary in a context which doesn't guarantee that the current (thread) context
-     * cassloader has access to all XmlBeans schema definitions (*.xsb) - which is typically in OSGI the case.
-     * <p>
-     * The classloader will be only set for the current thread in a {@link ThreadLocal}. Although the
-     * ThreadLocal is implemented via a {@link WeakReference}, it's good style to {@code null} the classloader
-     * when the user code is finalized.
-     * 
-     * @param cl the classloader to be used when XmlBeans classes and definitions are looked up
-     */
-    public static void setClassLoader(ClassLoader cl) {
-        classLoader.set(cl);
-    }
-    
-    private static SchemaTypeLoader getTypeLoader() {
-        ClassLoader cl = classLoader.get();
-        return (cl == null)
-            ? XmlBeans.getContextTypeLoader()
-            : XmlBeans.typeLoaderForClassLoader(cl);
-    }
-    
-    public static XmlObject newInstance(SchemaType type, XmlOptions options) {
-        return getTypeLoader().newInstance(type, getXmlOptions(options));
-    }
-
-    public static XmlObject parse(String xmlText, SchemaType type, XmlOptions options) throws XmlException {
-        try {
-            return parse(new StringReader(xmlText), type, options);
-        } catch (IOException e) {
-            throw new XmlException("Unable to parse xml bean", e);
-        }
-    }
-
-    public static XmlObject parse(File file, SchemaType type, XmlOptions options) throws XmlException, IOException {
-        InputStream is = new FileInputStream(file);
-        try {
-            return parse(is, type, options);
-        } finally {
-            is.close();
-        }
-    }
-
-    public static XmlObject parse(URL file, SchemaType type, XmlOptions options) throws XmlException, IOException {
-        InputStream is = file.openStream();
-        try {
-            return parse(is, type, options);
-        } finally {
-            is.close();
-        }
-    }
-
-    public static XmlObject parse(InputStream jiois, SchemaType type, XmlOptions options) throws XmlException, IOException {
-        try {
-            Document doc = DocumentHelper.readDocument(jiois);
-            return getTypeLoader().parse(doc.getDocumentElement(), type, getXmlOptions(options));
-        } catch (SAXException e) {
-            throw new IOException("Unable to parse xml bean", e);
-        }
-    }
-
-    public static XmlObject parse(XMLStreamReader xsr, SchemaType type, XmlOptions options) throws XmlException {
-        return getTypeLoader().parse(xsr, type, getXmlOptions(options));
-    }
-
-    public static XmlObject parse(Reader jior, SchemaType type, XmlOptions options) throws XmlException, IOException {
-        try {
-            Document doc = DocumentHelper.readDocument(new InputSource(jior));
-            return getTypeLoader().parse(doc.getDocumentElement(), type, getXmlOptions(options));
-        } catch (SAXException e) {
-            throw new XmlException("Unable to parse xml bean", e);
-        }
-    }
-
-    public static XmlObject parse(Node node, SchemaType type, XmlOptions options) throws XmlException {
-        return getTypeLoader().parse(node, type, getXmlOptions(options));
-    }
-
-    public static XmlObject parse(XMLInputStream xis, SchemaType type, XmlOptions options) throws XmlException, XMLStreamException {
-        return getTypeLoader().parse(xis, type, getXmlOptions(options));
-    }
-    
-    public static XMLInputStream newValidatingXMLInputStream ( XMLInputStream xis, SchemaType type, XmlOptions options ) throws XmlException, XMLStreamException {
-        return getTypeLoader().newValidatingXMLInputStream(xis, type, getXmlOptions(options));
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java b/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
deleted file mode 100644
index 2e5f339..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-
-/**
- * Prints out the contents of a OOXML container.
- * Useful for seeing what parts are defined, and how
- *  they're all related to each other.
- */
-public class OOXMLLister {
-	private final OPCPackage container;
-	private final PrintStream disp;
-	
-	public OOXMLLister(OPCPackage container) {
-		this(container, System.out);
-	}
-	public OOXMLLister(OPCPackage container, PrintStream disp) {
-		this.container = container;
-		this.disp = disp;
-	}
-	
-	/**
-	 * Figures out how big a given PackagePart is.
-	 * 
-	 * @param part the PackagePart
-	 * @return the size of the PackagePart
-	 * 
-	 * @throws IOException if the part can't be read
-	 */
-	public static long getSize(PackagePart part) throws IOException {
-		InputStream in = part.getInputStream();
-		try {
-    		byte[] b = new byte[8192];
-    		long size = 0;
-    		int read = 0;
-    		
-    		while(read > -1) {
-    			read = in.read(b);
-    			if(read > 0) {
-    				size += read;
-    			}
-    		}
-    		
-    		return size;
-		} finally {
-		    in.close();
-		}
-	}
-	
-	/**
-	 * Displays information on all the different
-	 *  parts of the OOXML file container.
-	 * @throws InvalidFormatException if the package relations are invalid
-	 * @throws IOException if the package can't be read 
-	 */
-	public void displayParts() throws InvalidFormatException, IOException {
-		ArrayList<PackagePart> parts = container.getParts();
-		for (PackagePart part : parts) {
-			disp.println(part.getPartName());
-			disp.println("\t" + part.getContentType());
-			
-			if(! part.getPartName().toString().equals("/docProps/core.xml")) {
-				disp.println("\t" + getSize(part) + " bytes");
-			}
-			
-			if(! part.isRelationshipPart()) {
-				disp.println("\t" + part.getRelationships().size() + " relations");
-				for(PackageRelationship rel : part.getRelationships()) {
-					displayRelation(rel, "\t  ");
-				}
-			}
-		}
-	}
-	/**
-	 * Displays information on all the different
-	 *  relationships between different parts
-	 *  of the OOXML file container.
-	 */
-	public void displayRelations() {
-		PackageRelationshipCollection rels = 
-			container.getRelationships();
-		for (PackageRelationship rel : rels) {
-			displayRelation(rel, "");
-		}
-	}
-	private void displayRelation(PackageRelationship rel, String indent) {
-		disp.println(indent+"Relationship:");
-		disp.println(indent+"\tFrom: "+ rel.getSourceURI());
-		disp.println(indent+"\tTo:   " + rel.getTargetURI());
-		disp.println(indent+"\tID:   " + rel.getId());
-		disp.println(indent+"\tMode: " + rel.getTargetMode());
-		disp.println(indent+"\tType: " + rel.getRelationshipType());
-	}
-	
-	public static void main(String[] args) throws Exception {
-		if(args.length == 0) {
-			System.err.println("Use:");
-			System.err.println("\tjava OOXMLLister <filename>");
-			System.exit(1);
-		}
-		
-		File f = new File(args[0]);
-		if(! f.exists()) {
-			System.err.println("Error, file not found!");
-			System.err.println("\t" + f.toString());
-			System.exit(2);
-		}
-		
-		OOXMLLister lister = new OOXMLLister(
-				OPCPackage.open(f.toString(), PackageAccess.READ)
-		);
-		
-		lister.disp.println(f.toString() + "\n");
-		lister.displayParts();
-		lister.disp.println();
-		lister.displayRelations();
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java b/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java
deleted file mode 100644
index 1a7a9d6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.dev;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.util.IOUtils;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-/**
- * Reads a zipped OOXML file and produces a copy with the included 
- * pretty-printed XML files.
- * 
- *  This is useful for comparing OOXML files produced by different tools as the often 
- *  use different formatting of the XML.
- */
-public class OOXMLPrettyPrint {
-    private final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-    private final DocumentBuilder documentBuilder;
-
-    public OOXMLPrettyPrint() throws ParserConfigurationException {
-        // allow files with much lower inflation rate here as there is no risk of Zip Bomb attacks in this developer tool
-        ZipSecureFile.setMinInflateRatio(0.00001);
-        
-        documentBuilder = documentBuilderFactory.newDocumentBuilder();
-    }
-
-    public static void main(String[] args) throws Exception {
-		if(args.length <= 1 || args.length % 2 != 0) {
-			System.err.println("Use:");
-			System.err.println("\tjava OOXMLPrettyPrint [<filename> <outfilename>] ...");
-			System.exit(1);
-		}
-		
-		for(int i = 0;i < args.length;i+=2) {
-    		File f = new File(args[i]);
-    		if(! f.exists()) {
-    			System.err.println("Error, file not found!");
-    			System.err.println("\t" + f.toString());
-    			System.exit(2);
-    		}
-
-    		handleFile(f, new File(args[i+1]));
-		}
-		System.out.println("Done.");
-	}
-
-    private static void handleFile(File file, File outFile) throws ZipException,
-            IOException, TransformerException, ParserConfigurationException {
-        System.out.println("Reading zip-file " + file + " and writing pretty-printed XML to " + outFile);
-
-        ZipFile zipFile = ZipHelper.openZipFile(file);
-		try {
-		    ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(outFile)));
-		    try {
-		        new OOXMLPrettyPrint().handle(zipFile, out);
-		    } finally {
-		        out.close();
-		    }
-		} finally {
-		    zipFile.close();
-
-		    System.out.println();
-		}
-    }
-
-	private void handle(ZipFile file, ZipOutputStream out) throws IOException, TransformerException {
-        Enumeration<? extends ZipEntry> entries = file.entries();
-        while(entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-
-            String name = entry.getName();
-            out.putNextEntry(new ZipEntry(name));
-            try {
-                if(name.endsWith(".xml") || name.endsWith(".rels")) {
-                    Document document = documentBuilder.parse(new InputSource(file.getInputStream(entry)));
-                    document.setXmlStandalone(true);
-                    pretty(document, out, 2);
-                } else {
-                    System.out.println("Not pretty-printing non-XML file " + name);
-                    IOUtils.copy(file.getInputStream(entry), out);
-                }
-            } catch (Exception e) {
-                throw new IOException("While handling entry " + name, e);
-            } finally {
-                out.closeEntry();
-            }
-            System.out.print(".");
-        }
-    }
-
-    private static void pretty(Document document, OutputStream outputStream, int indent) throws TransformerException {
-	    TransformerFactory transformerFactory = TransformerFactory.newInstance();
-	    Transformer transformer = transformerFactory.newTransformer();
-	    transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-	    if (indent > 0) {
-	        // set properties to indent the resulting XML nicely
-	        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-	        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", Integer.toString(indent));
-	    }
-	    Result result = new StreamResult(outputStream);
-	    Source source = new DOMSource(document);
-	    transformer.transform(source, result);
-	}	
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/extractor/CommandLineTextExtractor.java b/trunk/src/ooxml/java/org/apache/poi/extractor/CommandLineTextExtractor.java
deleted file mode 100644
index 264daa0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/extractor/CommandLineTextExtractor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.extractor;
-
-import java.io.File;
-
-import org.apache.poi.POITextExtractor;
-
-/**
- * A command line wrapper around {@link ExtractorFactory}, useful
- *  for when debugging.
- */
-public class CommandLineTextExtractor {
-   public static final String DIVIDER = "=======================";
-   
-   public static void main(String[] args) throws Exception {
-      if(args.length < 1) {
-         System.err.println("Use:");
-         System.err.println("   CommandLineTextExtractor <filename> [filename] [filename]");
-         System.exit(1);
-      }
-
-       for (String arg : args) {
-           System.out.println(DIVIDER);
-
-           File f = new File(arg);
-           System.out.println(f);
-
-           POITextExtractor extractor =
-                   ExtractorFactory.createExtractor(f);
-           try {
-               POITextExtractor metadataExtractor =
-                       extractor.getMetadataTextExtractor();
-
-               System.out.println("   " + DIVIDER);
-               String metaData = metadataExtractor.getText();
-               System.out.println(metaData);
-               System.out.println("   " + DIVIDER);
-               String text = extractor.getText();
-               System.out.println(text);
-               System.out.println(DIVIDER);
-               System.out.println("Had " + metaData.length() + " characters of metadata and " + text.length() + " characters of text");
-           } finally {
-               extractor.close();
-           }
-       }
-   }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
deleted file mode 100644
index cdd35b3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.extractor;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.extractor.OutlookTextExtactor;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentFactoryHelper;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.NotOLE2FileException;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xdgf.extractor.XDGFVisioExtractor;
-import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
-import org.apache.poi.xslf.usermodel.XSLFRelation;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.apache.poi.xssf.extractor.XSSFEventBasedExcelExtractor;
-import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-import org.apache.xmlbeans.XmlException;
-
-/**
- * Figures out the correct POITextExtractor for your supplied
- *  document, and returns it.
- *  
- * <p>Note 1 - will fail for many file formats if the POI Scratchpad jar is
- *  not present on the runtime classpath</p>
- * <p>Note 2 - rather than using this, for most cases you would be better
- *  off switching to <a href="http://tika.apache.org">Apache Tika</a> instead!</p>
- */
-@SuppressWarnings("WeakerAccess")
-public class ExtractorFactory {
-    private static final POILogger logger = POILogFactory.getLogger(ExtractorFactory.class);
-    
-    public static final String CORE_DOCUMENT_REL = PackageRelationshipTypes.CORE_DOCUMENT;
-    protected static final String VISIO_DOCUMENT_REL = PackageRelationshipTypes.VISIO_CORE_DOCUMENT;
-    protected static final String STRICT_DOCUMENT_REL = PackageRelationshipTypes.STRICT_CORE_DOCUMENT;
-
-    /**
-     * Should this thread prefer event based over usermodel based extractors?
-     * (usermodel extractors tend to be more accurate, but use more memory)
-     * Default is false.
-     */
-    public static boolean getThreadPrefersEventExtractors() {
-        return OLE2ExtractorFactory.getThreadPrefersEventExtractors();
-    }
-
-    /**
-     * Should all threads prefer event based over usermodel based extractors?
-     * (usermodel extractors tend to be more accurate, but use more memory)
-     * Default is to use the thread level setting, which defaults to false.
-     */
-    public static Boolean getAllThreadsPreferEventExtractors() {
-        return OLE2ExtractorFactory.getAllThreadsPreferEventExtractors();
-    }
-
-    /**
-     * Should this thread prefer event based over usermodel based extractors?
-     * Will only be used if the All Threads setting is null.
-     */
-    public static void setThreadPrefersEventExtractors(boolean preferEventExtractors) {
-         OLE2ExtractorFactory.setThreadPrefersEventExtractors(preferEventExtractors);
-    }
-
-    /**
-     * Should all threads prefer event based over usermodel based extractors?
-     * If set, will take preference over the Thread level setting.
-     */
-    public static void setAllThreadsPreferEventExtractors(Boolean preferEventExtractors) {
-         OLE2ExtractorFactory.setAllThreadsPreferEventExtractors(preferEventExtractors);
-    }
-
-    /**
-     * Should this thread use event based extractors is available?
-     * Checks the all-threads one first, then thread specific.
-     */
-    protected static boolean getPreferEventExtractor() {
-         return OLE2ExtractorFactory.getPreferEventExtractor();
-    }
-
-    public static POITextExtractor createExtractor(File f) throws IOException, OpenXML4JException, XmlException {
-        NPOIFSFileSystem fs = null;
-        try {
-            fs = new NPOIFSFileSystem(f);
-            POIOLE2TextExtractor extractor = createExtractor(fs);
-            extractor.setFilesystem(fs);
-            return extractor;
-
-        } catch (OfficeXmlFileException e) {
-            // ensure file-handle release
-            IOUtils.closeQuietly(fs);
-            return createExtractor(OPCPackage.open(f.toString(), PackageAccess.READ));
-
-        } catch (NotOLE2FileException ne) {
-            // ensure file-handle release
-            IOUtils.closeQuietly(fs);
-            throw new IllegalArgumentException("Your File was neither an OLE2 file, nor an OOXML file");
-
-        } catch (OpenXML4JException e) {
-            // ensure file-handle release
-            IOUtils.closeQuietly(fs);
-            throw e;
-
-        } catch (XmlException e) {
-            // ensure file-handle release
-            IOUtils.closeQuietly(fs);
-            throw e;
-
-        } catch (IOException e) {
-            // ensure file-handle release
-            IOUtils.closeQuietly(fs);
-            throw e;
-
-        } catch (RuntimeException e) {
-            // ensure file-handle release
-            IOUtils.closeQuietly(fs);
-            throw e;
-        }
-     }
-
-    public static POITextExtractor createExtractor(InputStream inp) throws IOException, OpenXML4JException, XmlException {
-        // Figure out the kind of stream
-        // If clearly doesn't do mark/reset, wrap up
-        if (! inp.markSupported()) {
-            inp = new PushbackInputStream(inp, 8);
-        }
-
-        if (NPOIFSFileSystem.hasPOIFSHeader(inp)) {
-            return createExtractor(new NPOIFSFileSystem(inp));
-        }
-        if (DocumentFactoryHelper.hasOOXMLHeader(inp)) {
-            return createExtractor(OPCPackage.open(inp));
-        }
-        throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream");
-    }
-
-    /**
-     * Tries to determine the actual type of file and produces a matching text-extractor for it.
-     *
-     * @param pkg An {@link OPCPackage}.
-     * @return A {@link POIXMLTextExtractor} for the given file.
-     * @throws IOException If an error occurs while reading the file 
-     * @throws OpenXML4JException If an error parsing the OpenXML file format is found. 
-     * @throws XmlException If an XML parsing error occurs.
-     * @throws IllegalArgumentException If no matching file type could be found.
-     */
-    public static POIXMLTextExtractor createExtractor(OPCPackage pkg) throws IOException, OpenXML4JException, XmlException {
-        try {
-            // Check for the normal Office core document
-            PackageRelationshipCollection core;
-            core = pkg.getRelationshipsByType(CORE_DOCUMENT_REL);
-              
-            // If nothing was found, try some of the other OOXML-based core types
-            if (core.size() == 0) {
-                // Could it be an OOXML-Strict one?
-                core = pkg.getRelationshipsByType(STRICT_DOCUMENT_REL);
-            }
-            if (core.size() == 0) {
-                // Could it be a visio one?
-                core = pkg.getRelationshipsByType(VISIO_DOCUMENT_REL);
-                if (core.size() == 1)
-                    return new XDGFVisioExtractor(pkg);
-            }
-              
-            // Should just be a single core document, complain if not
-            if (core.size() != 1) {
-                throw new IllegalArgumentException("Invalid OOXML Package received - expected 1 core document, found " + core.size());
-            }
-     
-            // Grab the core document part, and try to identify from that
-            final PackagePart corePart = pkg.getPart(core.getRelationship(0));
-            final String contentType = corePart.getContentType();
-     
-            // Is it XSSF?
-            for (XSSFRelation rel : XSSFExcelExtractor.SUPPORTED_TYPES) {
-                if ( rel.getContentType().equals( contentType ) ) {
-                    if (getPreferEventExtractor()) {
-                        return new XSSFEventBasedExcelExtractor(pkg);
-                    }
-                    return new XSSFExcelExtractor(pkg);
-                }
-            }
-     
-            // Is it XWPF?
-            for (XWPFRelation rel : XWPFWordExtractor.SUPPORTED_TYPES) {
-                if ( rel.getContentType().equals( contentType ) ) {
-                    return new XWPFWordExtractor(pkg);
-                }
-            }
-     
-            // Is it XSLF?
-            for (XSLFRelation rel : XSLFPowerPointExtractor.SUPPORTED_TYPES) {
-                if ( rel.getContentType().equals( contentType ) ) {
-                    return new XSLFPowerPointExtractor(pkg);
-                }
-            }
-     
-            // special handling for SlideShow-Theme-files, 
-            if (XSLFRelation.THEME_MANAGER.getContentType().equals(contentType)) {
-                return new XSLFPowerPointExtractor(new XSLFSlideShow(pkg));
-            }
-
-            throw new IllegalArgumentException("No supported documents found in the OOXML package (found "+contentType+")");
-
-        } catch (IOException e) {
-            // ensure that we close the package again if there is an error opening it, however
-            // we need to revert the package to not re-write the file via close(), which is very likely not wanted for a TextExtractor!
-            pkg.revert();
-            throw e;
-        } catch (OpenXML4JException e) {
-            // ensure that we close the package again if there is an error opening it, however
-            // we need to revert the package to not re-write the file via close(), which is very likely not wanted for a TextExtractor!
-            pkg.revert();
-            throw e;
-        } catch (XmlException e) {
-            // ensure that we close the package again if there is an error opening it, however
-            // we need to revert the package to not re-write the file via close(), which is very likely not wanted for a TextExtractor!
-            pkg.revert();
-            throw e;
-        } catch (RuntimeException e) {
-            // ensure that we close the package again if there is an error opening it, however
-            // we need to revert the package to not re-write the file via close(), which is very likely not wanted for a TextExtractor!
-            pkg.revert();
-            throw e;
-        }
-    }
-
-    public static POIOLE2TextExtractor createExtractor(POIFSFileSystem fs) throws IOException, OpenXML4JException, XmlException {
-        return OLE2ExtractorFactory.createExtractor(fs);
-    }
-    public static POIOLE2TextExtractor createExtractor(NPOIFSFileSystem fs) throws IOException, OpenXML4JException, XmlException {
-        return OLE2ExtractorFactory.createExtractor(fs);
-    }
-    public static POIOLE2TextExtractor createExtractor(OPOIFSFileSystem fs) throws IOException, OpenXML4JException, XmlException {
-        return OLE2ExtractorFactory.createExtractor(fs);
-    }
-
-    public static POITextExtractor createExtractor(DirectoryNode poifsDir) throws IOException, OpenXML4JException, XmlException
-    {
-        // First, check for OOXML
-        for (String entryName : poifsDir.getEntryNames()) {
-            if (entryName.equals("Package")) {
-                OPCPackage pkg = OPCPackage.open(poifsDir.createDocumentInputStream("Package"));
-                return createExtractor(pkg);
-            }
-        }
-
-        // If not, ask the OLE2 code to check, with Scratchpad if possible
-        return OLE2ExtractorFactory.createExtractor(poifsDir);
-    }
-
-    /**
-     * Returns an array of text extractors, one for each of
-     *  the embedded documents in the file (if there are any).
-     * If there are no embedded documents, you'll get back an
-     *  empty array. Otherwise, you'll get one open
-     *  {@link POITextExtractor} for each embedded file.
-     */
-    public static POITextExtractor[] getEmbededDocsTextExtractors(POIOLE2TextExtractor ext) throws IOException, OpenXML4JException, XmlException {
-        // All the embedded directories we spotted
-        ArrayList<Entry> dirs = new ArrayList<Entry>();
-        // For anything else not directly held in as a POIFS directory
-        ArrayList<InputStream> nonPOIFS = new ArrayList<InputStream>();
-
-        // Find all the embedded directories
-        DirectoryEntry root = ext.getRoot();
-        if (root == null) {
-            throw new IllegalStateException("The extractor didn't know which POIFS it came from!");
-        }
-
-        if (ext instanceof ExcelExtractor) {
-            // These are in MBD... under the root
-            Iterator<Entry> it = root.getEntries();
-            while (it.hasNext()) {
-                Entry entry = it.next();
-                if (entry.getName().startsWith("MBD")) {
-                    dirs.add(entry);
-                }
-            }
-        } else if (ext instanceof WordExtractor) {
-            // These are in ObjectPool -> _... under the root
-            try {
-                DirectoryEntry op = (DirectoryEntry) root.getEntry("ObjectPool");
-                Iterator<Entry> it = op.getEntries();
-                while (it.hasNext()) {
-                    Entry entry = it.next();
-                    if (entry.getName().startsWith("_")) {
-                        dirs.add(entry);
-                    }
-                }
-            } catch (FileNotFoundException e) {
-                logger.log(POILogger.INFO, "Ignoring FileNotFoundException while extracting Word document", e.getLocalizedMessage());
-                // ignored here
-            }
-        //} else if(ext instanceof PowerPointExtractor) {
-            // Tricky, not stored directly in poifs
-            // TODO
-        } else if (ext instanceof OutlookTextExtactor) {
-            // Stored in the Attachment blocks
-            MAPIMessage msg = ((OutlookTextExtactor)ext).getMAPIMessage();
-            for (AttachmentChunks attachment : msg.getAttachmentFiles()) {
-                if (attachment.attachData != null) {
-                    byte[] data = attachment.attachData.getValue();
-                    nonPOIFS.add( new ByteArrayInputStream(data) );
-                } else if (attachment.attachmentDirectory != null) {
-                    dirs.add(attachment.attachmentDirectory.getDirectory());
-                }
-            }
-        }
-
-        // Create the extractors
-        if (dirs.size() == 0 && nonPOIFS.size() == 0){
-            return new POITextExtractor[0];
-        }
-
-        ArrayList<POITextExtractor> textExtractors = new ArrayList<POITextExtractor>();
-        for (Entry dir : dirs) {
-            textExtractors.add(createExtractor((DirectoryNode) dir));
-        }
-        for (InputStream nonPOIF : nonPOIFS) {
-            try {
-                 textExtractors.add(createExtractor(nonPOIF));
-            } catch (IllegalArgumentException e) {
-                // Ignore, just means it didn't contain
-                //  a format we support as yet
-                logger.log(POILogger.INFO, "Format not supported yet", e.getLocalizedMessage());
-            } catch (XmlException e) {
-                throw new IOException(e.getMessage(), e);
-            } catch (OpenXML4JException e) {
-                throw new IOException(e.getMessage(), e);
-            }
-        }
-        return textExtractors.toArray(new POITextExtractor[textExtractors.size()]);
-    }
-
-    /**
-     * Returns an array of text extractors, one for each of
-     *  the embedded documents in the file (if there are any).
-     * If there are no embedded documents, you'll get back an
-     *  empty array. Otherwise, you'll get one open
-     *  {@link POITextExtractor} for each embedded file.
-     */
-    @NotImplemented
-    @SuppressWarnings("UnusedParameters")
-    public static POITextExtractor[] getEmbededDocsTextExtractors(POIXMLTextExtractor ext) {
-        throw new IllegalStateException("Not yet supported");
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
deleted file mode 100644
index 832d476..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.exceptions;
-
-@SuppressWarnings("serial")
-public final class InvalidFormatException extends OpenXML4JException{
-
-	public InvalidFormatException(String message){
-		super(message);
-	}
-
-    public InvalidFormatException(String message, Throwable cause){
-        super(message,cause);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
deleted file mode 100644
index 7a8338e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.exceptions;
-
-/**
- * Throw when an invalid operation is done.
- */
-@SuppressWarnings("serial")
-public class InvalidOperationException extends OpenXML4JRuntimeException{
-	public InvalidOperationException(String message){
-		super(message);
-	}
-
-    public InvalidOperationException(String message, Throwable reason){
-   		super(message, reason);
-   	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
deleted file mode 100644
index 901967e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.exceptions;
-
-import org.apache.poi.UnsupportedFileFormatException;
-
-/**
- * This exception is thrown when we try to open a file that doesn't
- *  seem to actually be an OOXML (Office Open XML) file after all
- */
-public class NotOfficeXmlFileException extends UnsupportedFileFormatException {
-    public NotOfficeXmlFileException(String message) {
-        super(message);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
deleted file mode 100644
index 61d8c8c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.exceptions;
-
-/**
- * This exception is thrown when we are given an ODF-based file
- *  (eg OpenOffice .ods) instead of an actually OOXML (Office Open XML) file
- */
-public class ODFNotOfficeXmlFileException extends NotOfficeXmlFileException {
-    public ODFNotOfficeXmlFileException(String message) {
-        super(message);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
deleted file mode 100644
index 2f82d11..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.exceptions;
-
-/**
- * This exception is thrown when we are given an OLE2-based file
- *  (eg Excel .xls) instead of an actually OOXML (Office Open XML) file
- */
-public class OLE2NotOfficeXmlFileException extends NotOfficeXmlFileException {
-    public OLE2NotOfficeXmlFileException(String message) {
-        super(message);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
deleted file mode 100644
index 4c7430d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.exceptions;
-
-/**
- * Global exception throws when a critical error occurs. (this exception is not
- * set as Runtime in order to force user to manage the exception in a
- * try/catch).
- */
-@SuppressWarnings("serial")
-public class OpenXML4JException extends Exception {
-
-	public OpenXML4JException(String msg) {
-		super(msg);
-	}
-
-    public OpenXML4JException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
deleted file mode 100644
index 40086aa..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.exceptions;
-
-/**
- * Global exception throws when a critical error occurs (this exception is
- * set as Runtime in order not to force the user to manage the exception in a
- * try/catch).
- *
- * @author Julien Chable
- * @version 1.0
- */
-@SuppressWarnings("serial")
-public class OpenXML4JRuntimeException extends RuntimeException {
-
-	public OpenXML4JRuntimeException(String msg) {
-		super(msg);
-	}
-
-    public OpenXML4JRuntimeException(String msg, Throwable reason) {
-        super(msg, reason);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
deleted file mode 100644
index e469ace..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.exceptions;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-
-/**
- * Throw when trying to create a {@link PackagePart} but one
- *  already exists with that name.
- */
-@SuppressWarnings("serial")
-public final class PartAlreadyExistsException extends InvalidOperationException {
-	public PartAlreadyExistsException(String message){
-		super(message);
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
deleted file mode 100644
index cd7b456..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-/**
- * Specifies the location where the X.509 certificate that is used in signing is stored.
- *
- * @author Julien Chable
- */
-public enum CertificateEmbeddingOption {
-	/** The certificate is embedded in its own PackagePart. */
-	IN_CERTIFICATE_PART,
-	/** The certificate is embedded in the SignaturePart that is created for the signature being added. */
-	IN_SIGNATURE_PART,
-	/** The certificate in not embedded in the package. */
-	NOT_EMBEDDED
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/CompressionOption.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/CompressionOption.java
deleted file mode 100644
index 583b5c5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/CompressionOption.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.util.zip.Deflater;
-
-/**
- * Specifies the compression level for content that is stored in a PackagePart.
- *
- * @author Julien Chable
- * @version 1.0
- */
-public enum CompressionOption {
-	/** Compression is optimized for performance. */
-	FAST(Deflater.BEST_SPEED),
-	/** Compression is optimized for size. */
-	MAXIMUM(Deflater.BEST_COMPRESSION),
-	/** Compression is optimized for a balance between size and performance. */
-	NORMAL(Deflater.DEFAULT_COMPRESSION),
-	/** Compression is turned off. */
-	NOT_COMPRESSED(Deflater.NO_COMPRESSION);
-
-	private final int value;
-
-	CompressionOption(int value) {
-		this.value = value;
-	}
-
-	public int value() {
-		return this.value;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/Configuration.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/Configuration.java
deleted file mode 100644
index 9109f28..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/Configuration.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.File;
-
-/**
- * Storage class for configuration storage parameters.
- * TODO xml syntax checking is not done with JAXP by default -> remove the schema or do it ?
- *
- * @author CDubettier, Julen Chable
- * @version 1.0
- */
-public final class Configuration {
-	// TODO configuration by default. should be clearly stated that it should be
-	// changed to match installation path
-	// as schemas dir is needed in runtime
-	static private String pathForXmlSchema = System.getProperty("user.dir")
-			+ File.separator + "src" + File.separator + "schemas";
-
-	public static String getPathForXmlSchema() {
-		return pathForXmlSchema;
-	}
-
-	public static void setPathForXmlSchema(String pathForXmlSchema) {
-		Configuration.pathForXmlSchema = pathForXmlSchema;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java
deleted file mode 100644
index 805a517..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.util.Locale;
-
-/**
- * Open Packaging Convention content types (see Annex F : Standard Namespaces
- * and Content Types).
- *
- * @author CDubettier define some constants, Julien Chable
- */
-public final class ContentTypes {
-
-	/*
-	 * Open Packaging Convention (Annex F : Standard Namespaces and Content
-	 * Types)
-	 */
-
-	/**
-	 * Core Properties part.
-	 */
-	public static final String CORE_PROPERTIES_PART = "application/vnd.openxmlformats-package.core-properties+xml";
-
-	/**
-	 * Digital Signature Certificate part.
-	 */
-	public static final String DIGITAL_SIGNATURE_CERTIFICATE_PART = "application/vnd.openxmlformats-package.digital-signature-certificate";
-
-	/**
-	 * Digital Signature Origin part.
-	 */
-	public static final String DIGITAL_SIGNATURE_ORIGIN_PART = "application/vnd.openxmlformats-package.digital-signature-origin";
-
-	/**
-	 * Digital Signature XML Signature part.
-	 */
-	public static final String DIGITAL_SIGNATURE_XML_SIGNATURE_PART = "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml";
-
-	/**
-	 * Relationships part.
-	 */
-	public static final String RELATIONSHIPS_PART = "application/vnd.openxmlformats-package.relationships+xml";
-
-	/**
-	 * Custom XML part.
-	 */
-	public static final String CUSTOM_XML_PART = "application/vnd.openxmlformats-officedocument.customXmlProperties+xml";
-
-	/**
-	 * Plain old xml. Note - OOXML uses application/xml, and not text/xml!
-	 */
-	public static final String PLAIN_OLD_XML = "application/xml";
-
-	public static final String IMAGE_JPEG = "image/jpeg";
-
-	public static final String EXTENSION_JPG_1 = "jpg";
-
-	public static final String EXTENSION_JPG_2 = "jpeg";
-
-	// image/png ISO/IEC 15948:2003 http://www.libpng.org/pub/png/spec/
-	public static final String IMAGE_PNG = "image/png";
-
-	public static final String EXTENSION_PNG = "png";
-
-	// image/gif http://www.w3.org/Graphics/GIF/spec-gif89a.txt
-	public static final String IMAGE_GIF = "image/gif";
-
-	public static final String EXTENSION_GIF = "gif";
-
-	/**
-	 * TIFF image format.
-	 *
-	 * @see <a href="http://partners.adobe.com/public/developer/tiff/index.html#spec">
-	 * http://partners.adobe.com/public/developer/tiff/index.html#spec</a>
-	 */
-	public static final String IMAGE_TIFF = "image/tiff";
-
-	public static final String EXTENSION_TIFF = "tiff";
-
-	/**
-	 * Pict image format.
-	 *
-	 * @see <a href="http://developer.apple.com/documentation/mac/QuickDraw/QuickDraw-2.html">
-	 * http://developer.apple.com/documentation/mac/QuickDraw/QuickDraw-2.html</a>
-	 */
-	public static final String IMAGE_PICT = "image/pict";
-
-	public static final String EXTENSION_PICT = "tiff";
-
-	/**
-	 * XML file.
-	 */
-	public static final String XML = "text/xml";
-
-	public static final String EXTENSION_XML = "xml";
-
-	public static String getContentTypeFromFileExtension(String filename) {
-		String extension = filename.substring(filename.lastIndexOf(".") + 1)
-				.toLowerCase(Locale.ROOT);
-		if (extension.equals(EXTENSION_JPG_1)
-				|| extension.equals(EXTENSION_JPG_2))
-			return IMAGE_JPEG;
-		else if (extension.equals(EXTENSION_GIF))
-			return IMAGE_GIF;
-		else if (extension.equals(EXTENSION_PICT))
-			return IMAGE_PICT;
-		else if (extension.equals(EXTENSION_PNG))
-			return IMAGE_PNG;
-		else if (extension.equals(EXTENSION_TIFF))
-			return IMAGE_TIFF;
-		else if (extension.equals(EXTENSION_XML))
-			return XML;
-		else
-			return null;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/EncryptionOption.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/EncryptionOption.java
deleted file mode 100644
index bc994e0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/EncryptionOption.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-/**
- * Specifies the encryption option for parts in a Package.
- *
- * @author Julien Chable
- * @version 0.1
- */
-public enum EncryptionOption {
-    /** No encryption. */
-    NONE
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
deleted file mode 100644
index 5220529..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
+++ /dev/null
@@ -1,1695 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
-import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
-import org.apache.poi.openxml4j.opc.internal.ContentType;
-import org.apache.poi.openxml4j.opc.internal.ContentTypeManager;
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.openxml4j.opc.internal.PartMarshaller;
-import org.apache.poi.openxml4j.opc.internal.PartUnmarshaller;
-import org.apache.poi.openxml4j.opc.internal.ZipContentTypeManager;
-import org.apache.poi.openxml4j.opc.internal.marshallers.DefaultMarshaller;
-import org.apache.poi.openxml4j.opc.internal.marshallers.ZipPackagePropertiesMarshaller;
-import org.apache.poi.openxml4j.opc.internal.unmarshallers.PackagePropertiesUnmarshaller;
-import org.apache.poi.openxml4j.opc.internal.unmarshallers.UnmarshallContext;
-import org.apache.poi.openxml4j.util.Nullable;
-import org.apache.poi.openxml4j.util.ZipEntrySource;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Represents a container that can store multiple data objects.
- */
-public abstract class OPCPackage implements RelationshipSource, Closeable {
-
-	/**
-	 * Logger.
-	 */
-    private static final POILogger logger = POILogFactory.getLogger(OPCPackage.class);
-
-	/**
-	 * Default package access.
-	 */
-	protected static final PackageAccess defaultPackageAccess = PackageAccess.READ_WRITE;
-
-	/**
-	 * Package access.
-	 */
-	private PackageAccess packageAccess;
-
-	/**
-	 * Package parts collection.
-	 */
-	protected PackagePartCollection partList;
-
-	/**
-	 * Package relationships.
-	 */
-	protected PackageRelationshipCollection relationships;
-
-	/**
-	 * Part marshallers by content type.
-	 */
-	protected Map<ContentType, PartMarshaller> partMarshallers;
-
-	/**
-	 * Default part marshaller.
-	 */
-	protected PartMarshaller defaultPartMarshaller;
-
-	/**
-	 * Part unmarshallers by content type.
-	 */
-	protected Map<ContentType, PartUnmarshaller> partUnmarshallers;
-
-	/**
-	 * Core package properties.
-	 */
-	protected PackagePropertiesPart packageProperties;
-
-	/**
-	 * Manage parts content types of this package.
-	 */
-	protected ContentTypeManager contentTypeManager;
-
-	/**
-	 * Flag if a modification is done to the document.
-	 */
-	protected boolean isDirty = false;
-
-	/**
-	 * File path of this package.
-	 */
-	protected String originalPackagePath;
-
-	/**
-	 * Output stream for writing this package.
-	 */
-	protected OutputStream output;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param access
-	 *            Package access.
-	 */
-	OPCPackage(PackageAccess access) {
-		if (getClass() != ZipPackage.class) {
-			throw new IllegalArgumentException("PackageBase may not be subclassed");
-		}
-		init();
-		this.packageAccess = access;
-	}
-
-	/**
-	 * Initialize the package instance.
-	 */
-	private void init() {
-		this.partMarshallers = new HashMap<ContentType, PartMarshaller>(5);
-		this.partUnmarshallers = new HashMap<ContentType, PartUnmarshaller>(2);
-
-		try {
-			// Add 'default' unmarshaller
-			this.partUnmarshallers.put(new ContentType(
-					ContentTypes.CORE_PROPERTIES_PART),
-					new PackagePropertiesUnmarshaller());
-
-			// Add default marshaller
-			this.defaultPartMarshaller = new DefaultMarshaller();
-			// TODO Delocalize specialized marshallers
-			this.partMarshallers.put(new ContentType(
-					ContentTypes.CORE_PROPERTIES_PART),
-					new ZipPackagePropertiesMarshaller());
-		} catch (InvalidFormatException e) {
-			// Should never happen
-			throw new OpenXML4JRuntimeException(
-					"Package.init() : this exception should never happen, " +
-					"if you read this message please send a mail to the developers team. : " +
-					e.getMessage(),
-					e
-			);
-		}
-	}
-
-
-	/**
-	 * Open a package with read/write permission.
-	 *
-	 * @param path
-	 *            The document path.
-	 * @return A Package object, else <b>null</b>.
-	 * @throws InvalidFormatException
-	 *             If the specified file doesn't exist, and a parsing error
-	 *             occur.
-	 */
-	public static OPCPackage open(String path) throws InvalidFormatException {
-		return open(path, defaultPackageAccess);
-	}
-
-   /**
-    * Open a package with read/write permission.
-    *
-    * @param file
-    *            The file to open.
-    * @return A Package object, else <b>null</b>.
-    * @throws InvalidFormatException
-    *             If the specified file doesn't exist, and a parsing error
-    *             occur.
-    */
-   public static OPCPackage open(File file) throws InvalidFormatException {
-      return open(file, defaultPackageAccess);
-   }
-
-   /**
-    * Open an user provided {@link ZipEntrySource} with read-only permission.
-    * This method can be used to stream data into POI.
-    * Opposed to other open variants, the data is read as-is, e.g. there aren't
-    * any zip-bomb protection put in place.
-    *
-    * @param zipEntry the custom source
-    * @return A Package object
-    * @throws InvalidFormatException if a parsing error occur.
-    */
-   public static OPCPackage open(ZipEntrySource zipEntry)
-   throws InvalidFormatException {
-       OPCPackage pack = new ZipPackage(zipEntry, PackageAccess.READ);
-       try {
-           if (pack.partList == null) {
-               pack.getParts();
-           }
-           // pack.originalPackagePath = file.getAbsolutePath();
-           return pack;
-       } catch (InvalidFormatException e) {
-		   IOUtils.closeQuietly(pack);
-           throw e;
-       } catch (RuntimeException e) {
-		   IOUtils.closeQuietly(pack);
-           throw e;
-       }
-   }
-   
-	/**
-	 * Open a package.
-	 *
-	 * @param path
-	 *            The document path.
-	 * @param access
-	 *            PackageBase access.
-	 * @return A PackageBase object, else <b>null</b>.
-	 * @throws InvalidFormatException
-	 *             If the specified file doesn't exist, and a parsing error
-	 *             occur.
-	 * @throws InvalidOperationException
-	 */
-	public static OPCPackage open(String path, PackageAccess access)
-			throws InvalidFormatException, InvalidOperationException {
-		if (path == null || "".equals(path.trim())) {
-			throw new IllegalArgumentException("'path' must be given");
-		}
-		
-		File file = new File(path);
-		if (file.exists() && file.isDirectory()) {
-			throw new IllegalArgumentException("path must not be a directory");
-		}
-
-		OPCPackage pack = new ZipPackage(path, access);
-		boolean success = false;
-		if (pack.partList == null && access != PackageAccess.WRITE) {
-			try {
-				pack.getParts();
-				success = true;
-			} finally {
-				if (! success) {
-					try {
-						pack.close();
-					} catch (final IOException e) {
-						throw new InvalidOperationException("Could not close OPCPackage while cleaning up", e);
-					}
-				}
-			}
-		}
-
-		pack.originalPackagePath = new File(path).getAbsolutePath();
-		return pack;
-	}
-
-   /**
-    * Open a package.
-    *
-    * @param file
-    *            The file to open.
-    * @param access
-    *            PackageBase access.
-    * @return A PackageBase object, else <b>null</b>.
-    * @throws InvalidFormatException
-    *             If the specified file doesn't exist, and a parsing error
-    *             occur.
-    */
-   public static OPCPackage open(File file, PackageAccess access)
-         throws InvalidFormatException {
-      if (file == null) {
-          throw new IllegalArgumentException("'file' must be given");
-      }
-      if (file.exists() && file.isDirectory()) {
-          throw new IllegalArgumentException("file must not be a directory");
-      }
-
-      OPCPackage pack = new ZipPackage(file, access);
-	   try {
-		   if (pack.partList == null && access != PackageAccess.WRITE) {
-			   pack.getParts();
-		   }
-		   pack.originalPackagePath = file.getAbsolutePath();
-		   return pack;
-	   } catch (InvalidFormatException e) {
-		   IOUtils.closeQuietly(pack);
-		   throw e;
-	   } catch (RuntimeException e) {
-		   IOUtils.closeQuietly(pack);
-		   throw e;
-	   }
-   }
-
-	/**
-	 * Open a package.
-	 *
-	 * Note - uses quite a bit more memory than {@link #open(String)}, which
-	 * doesn't need to hold the whole zip file in memory, and can take advantage
-	 * of native methods
-	 *
-	 * @param in
-	 *            The InputStream to read the package from
-	 * @return A PackageBase object
-	 */
-	public static OPCPackage open(InputStream in) throws InvalidFormatException,
-			IOException {
-		OPCPackage pack = new ZipPackage(in, PackageAccess.READ_WRITE);
-		try {
-			if (pack.partList == null) {
-				pack.getParts();
-			}
-		} catch (InvalidFormatException e) {
-			IOUtils.closeQuietly(pack);
-			throw e;
-		} catch (RuntimeException e) {
-			IOUtils.closeQuietly(pack);
-			throw e;
-		}
-		return pack;
-	}
-
-	/**
-	 * Opens a package if it exists, else it creates one.
-	 *
-	 * @param file
-	 *            The file to open or to create.
-	 * @return A newly created package if the specified file does not exist,
-	 *         else the package extract from the file.
-	 * @throws InvalidFormatException
-	 *             Throws if the specified file exist and is not valid.
-	 */
-	public static OPCPackage openOrCreate(File file) throws InvalidFormatException {
-		if (file.exists()) {
-			return open(file.getAbsolutePath());
-		} else {
-			return create(file);
-		}
-	}
-
-	/**
-	 * Creates a new package.
-	 *
-	 * @param path
-	 *            Path of the document.
-	 * @return A newly created PackageBase ready to use.
-	 */
-	public static OPCPackage create(String path) {
-		return create(new File(path));
-	}
-
-	/**
-	 * Creates a new package.
-	 *
-	 * @param file
-	 *            Path of the document.
-	 * @return A newly created PackageBase ready to use.
-	 */
-	public static OPCPackage create(File file) {
-		if (file == null || (file.exists() && file.isDirectory())) {
-			throw new IllegalArgumentException("file");
-		}
-
-		if (file.exists()) {
-			throw new InvalidOperationException(
-					"This package (or file) already exists : use the open() method or delete the file.");
-		}
-
-		// Creates a new package
-		OPCPackage pkg = new ZipPackage();
-		pkg.originalPackagePath = file.getAbsolutePath();
-
-		configurePackage(pkg);
-		return pkg;
-	}
-
-	public static OPCPackage create(OutputStream output) {
-		OPCPackage pkg = new ZipPackage();
-		pkg.originalPackagePath = null;
-		pkg.output = output;
-
-		configurePackage(pkg);
-		return pkg;
-	}
-
-	/**
-	 * Configure the package.
-	 *
-	 * @param pkg
-	 */
-	private static void configurePackage(OPCPackage pkg) {
-		try {
-			// Content type manager
-			pkg.contentTypeManager = new ZipContentTypeManager(null, pkg);
-			
-			// Add default content types for .xml and .rels
-			pkg.contentTypeManager.addContentType(
-					PackagingURIHelper.createPartName(
-							PackagingURIHelper.PACKAGE_RELATIONSHIPS_ROOT_URI),
-					ContentTypes.RELATIONSHIPS_PART);
-			pkg.contentTypeManager.addContentType(
-					PackagingURIHelper.createPartName("/default.xml"),
-					ContentTypes.PLAIN_OLD_XML);
-
-			// Initialise some PackageBase properties
-			pkg.packageProperties = new PackagePropertiesPart(pkg,
-					PackagingURIHelper.CORE_PROPERTIES_PART_NAME);
-			pkg.packageProperties.setCreatorProperty("Generated by Apache POI OpenXML4J");
-			pkg.packageProperties.setCreatedProperty(new Nullable<Date>(new Date()));
-		} catch (InvalidFormatException e) {
-			// Should never happen
-			throw new IllegalStateException(e);
-		}
-	}
-
-	/**
-	 * Flush the package : save all.
-	 *
-	 * @see #close()
-	 */
-	public void flush() {
-		throwExceptionIfReadOnly();
-
-		if (this.packageProperties != null) {
-			this.packageProperties.flush();
-		}
-
-		this.flushImpl();
-	}
-
-	/**
-	 * Close the open, writable package and save its content.
-	 * 
-	 * If your package is open read only, then you should call {@link #revert()}
-	 *  when finished with the package.
-	 *
-	 * @throws IOException
-	 *             If an IO exception occur during the saving process.
-	 */
-	@Override
-    public void close() throws IOException {
-		if (this.packageAccess == PackageAccess.READ) {
-			logger.log(POILogger.WARN, 
-			        "The close() method is intended to SAVE a package. This package is open in READ ONLY mode, use the revert() method instead !");
-			revert();
-			return;
-		}
-		if (this.contentTypeManager == null) {
-		    logger.log(POILogger.WARN,
-		            "Unable to call close() on a package that hasn't been fully opened yet");
-			revert();
-		    return;
-		}
-
-		// Save the content
-		ReentrantReadWriteLock l = new ReentrantReadWriteLock();
-		try {
-			l.writeLock().lock();
-			if (this.originalPackagePath != null
-					&& !"".equals(this.originalPackagePath.trim())) {
-				File targetFile = new File(this.originalPackagePath);
-				if (!targetFile.exists()
-						|| !(this.originalPackagePath
-								.equalsIgnoreCase(targetFile.getAbsolutePath()))) {
-					// Case of a package created from scratch
-					save(targetFile);
-				} else {
-					closeImpl();
-				}
-			} else if (this.output != null) {
-				save(this.output);
-				output.close();
-			}
-		} finally {
-			l.writeLock().unlock();
-		}
-
-		// Clear
-		this.contentTypeManager.clearAll();
-	}
-
-    /**
-     * Close the package WITHOUT saving its content. Reinitialize this package
-     * and cancel all changes done to it.
-     */
-    public void revert() {
-        revertImpl();
-    }
-
-    /**
-     * Add a thumbnail to the package. This method is provided to make easier
-     * the addition of a thumbnail in a package. You can do the same work by
-     * using the traditionnal relationship and part mechanism.
-     *
-     * @param path The full path to the image file.
-     */
-    public void addThumbnail(String path) throws IOException {
-        // Check parameter
-        if (path == null || path.isEmpty()) {
-            throw new IllegalArgumentException("path");
-        }
-        String name = path.substring(path.lastIndexOf(File.separatorChar) + 1);
-
-        FileInputStream is = new FileInputStream(path);
-        try {
-            addThumbnail(name, is);
-        } finally {
-            is.close();
-        }
-    }
-    /**
-     * Add a thumbnail to the package. This method is provided to make easier
-     * the addition of a thumbnail in a package. You can do the same work by
-     * using the traditionnal relationship and part mechanism.
-     *
-     * @param filename The full path to the image file.
-     * @param data the image data
-     */
-    public void addThumbnail(String filename, InputStream data) throws IOException {
-        // Check parameter
-        if (filename == null || filename.isEmpty()) {
-            throw new IllegalArgumentException("filename");
-        }
-
-        // Create the thumbnail part name
-        String contentType = ContentTypes
-                .getContentTypeFromFileExtension(filename);
-        PackagePartName thumbnailPartName;
-        try {
-            thumbnailPartName = PackagingURIHelper.createPartName("/docProps/"
-                    + filename);
-        } catch (InvalidFormatException e) {
-            String partName = "/docProps/thumbnail" +
-                    filename.substring(filename.lastIndexOf(".") + 1);
-            try {
-                thumbnailPartName = PackagingURIHelper.createPartName(partName);
-            } catch (InvalidFormatException e2) {
-                throw new InvalidOperationException(
-                        "Can't add a thumbnail file named '" + filename + "'", e2);
-            }
-        }
-
-        // Check if part already exist
-        if (this.getPart(thumbnailPartName) != null)
-            throw new InvalidOperationException(
-                    "You already add a thumbnail named '" + filename + "'");
-
-        // Add the thumbnail part to this package.
-        PackagePart thumbnailPart = this.createPart(thumbnailPartName,
-                contentType, false);
-
-        // Add the relationship between the package and the thumbnail part
-        this.addRelationship(thumbnailPartName, TargetMode.INTERNAL,
-                PackageRelationshipTypes.THUMBNAIL);
-
-        // Copy file data to the newly created part
-        StreamHelper.copyStream(data, thumbnailPart.getOutputStream());
-    }
-
-    /**
-     * Throws an exception if the package access mode is in read only mode
-     * (PackageAccess.Read).
-     *
-     * @throws InvalidOperationException
-     *             Throws if a writing operation is done on a read only package.
-     * @see org.apache.poi.openxml4j.opc.PackageAccess
-     */
-    void throwExceptionIfReadOnly() throws InvalidOperationException {
-        if (packageAccess == PackageAccess.READ) {
-            throw new InvalidOperationException(
-                    "Operation not allowed, document open in read only mode!");
-        }
-    }
-
-	/**
-	 * Throws an exception if the package access mode is in write only mode
-	 * (PackageAccess.Write). This method is call when other methods need write
-	 * right.
-	 *
-	 * @throws InvalidOperationException
-	 *             Throws if a read operation is done on a write only package.
-	 * @see org.apache.poi.openxml4j.opc.PackageAccess
-	 */
-	void throwExceptionIfWriteOnly() throws InvalidOperationException {
-		if (packageAccess == PackageAccess.WRITE) {
-			throw new InvalidOperationException(
-					"Operation not allowed, document open in write only mode!");
-		}
-	}
-
-	/**
-	 * Retrieves or creates if none exists, core package property part.
-	 *
-	 * @return The PackageProperties part of this package.
-	 */
-	public PackageProperties getPackageProperties()
-			throws InvalidFormatException {
-		this.throwExceptionIfWriteOnly();
-		// If no properties part has been found then we create one
-		if (this.packageProperties == null) {
-			this.packageProperties = new PackagePropertiesPart(this,
-					PackagingURIHelper.CORE_PROPERTIES_PART_NAME);
-		}
-		return this.packageProperties;
-	}
-
-	/**
-	 * Retrieve a part identified by its name.
-	 *
-	 * @param partName
-	 *            Part name of the part to retrieve.
-	 * @return The part with the specified name, else <code>null</code>.
-	 */
-	public PackagePart getPart(PackagePartName partName) {
-		throwExceptionIfWriteOnly();
-
-		if (partName == null) {
-			throw new IllegalArgumentException("partName");
-		}
-
-		// If the partlist is null, then we parse the package.
-		if (partList == null) {
-			try {
-				getParts();
-			} catch (InvalidFormatException e) {
-				return null;
-			}
-		}
-		return getPartImpl(partName);
-	}
-
-	/**
-	 * Retrieve parts by content type.
-	 *
-	 * @param contentType
-	 *            The content type criteria.
-	 * @return All part associated to the specified content type.
-	 */
-	public ArrayList<PackagePart> getPartsByContentType(String contentType) {
-		ArrayList<PackagePart> retArr = new ArrayList<PackagePart>();
-		for (PackagePart part : partList.values()) {
-			if (part.getContentType().equals(contentType)) {
-				retArr.add(part);
-			}
-		}
-		Collections.sort(retArr);
-		return retArr;
-	}
-
-	/**
-	 * Retrieve parts by relationship type.
-	 *
-	 * @param relationshipType
-	 *            Relationship type.
-	 * @return All parts which are the target of a relationship with the
-	 *         specified type, if the method can't retrieve relationships from
-	 *         the package, then return <code>null</code>.
-	 */
-	public ArrayList<PackagePart> getPartsByRelationshipType(
-			String relationshipType) {
-		if (relationshipType == null) {
-			throw new IllegalArgumentException("relationshipType");
-		}
-		ArrayList<PackagePart> retArr = new ArrayList<PackagePart>();
-		for (PackageRelationship rel : getRelationshipsByType(relationshipType)) {
-			PackagePart part = getPart(rel);
-			if (part != null) {
-			    retArr.add(part);
-			}
-		}
-		Collections.sort(retArr);
-		return retArr;
-	}
-
-	/**
-	 * Retrieve parts by name
-	 *
-	 * @param namePattern
-	 *            The pattern for matching the names
-	 * @return All parts associated to the specified content type, sorted
-	 * in alphanumerically by the part-name
-	 */
-	public List<PackagePart> getPartsByName(final Pattern namePattern) {
-	    if (namePattern == null) {
-	        throw new IllegalArgumentException("name pattern must not be null");
-	    }
-	    Matcher matcher = namePattern.matcher("");
-	    ArrayList<PackagePart> result = new ArrayList<PackagePart>();
-	    for (PackagePart part : partList.values()) {
-	        PackagePartName partName = part.getPartName();
-	        if (matcher.reset(partName.getName()).matches()) {
-	            result.add(part);
-	        }
-	    }
-	    Collections.sort(result);
-	    return result;
-	}
-
-	/**
-	 * Get the target part from the specified relationship.
-	 *
-	 * @param partRel
-	 *            The part relationship uses to retrieve the part.
-	 */
-	public PackagePart getPart(PackageRelationship partRel) {
-		PackagePart retPart = null;
-		ensureRelationships();
-		for (PackageRelationship rel : relationships) {
-			if (rel.getRelationshipType().equals(partRel.getRelationshipType())) {
-				try {
-					retPart = getPart(PackagingURIHelper.createPartName(rel
-							.getTargetURI()));
-				} catch (InvalidFormatException e) {
-					continue;
-				}
-				break;
-			}
-		}
-		return retPart;
-	}
-
-	/**
-	 * Load the parts of the archive if it has not been done yet. The
-	 * relationships of each part are not loaded.
-	 * 
-	 * Note - Rule M4.1 states that there may only ever be one Core
-	 *  Properties Part, but Office produced files will sometimes
-	 *  have multiple! As Office ignores all but the first, we relax
-	 *  Compliance with Rule M4.1, and ignore all others silently too. 
-	 *
-	 * @return All this package's parts.
-	 */
-	public ArrayList<PackagePart> getParts() throws InvalidFormatException {
-		throwExceptionIfWriteOnly();
-
-		// If the part list is null, we parse the package to retrieve all parts.
-		if (partList == null) {
-			/* Variables use to validate OPC Compliance */
-
-			// Check rule M4.1 -> A format consumer shall consider more than
-			// one core properties relationship for a package to be an error
-		   // (We just log it and move on, as real files break this!)
-			boolean hasCorePropertiesPart = false;
-			boolean needCorePropertiesPart = true;
-
-			PackagePart[] parts = this.getPartsImpl();
-			this.partList = new PackagePartCollection();
-			for (PackagePart part : parts) {
-				if (partList.containsKey(part._partName)) {
-					throw new InvalidFormatException(
-							"A part with the name '" +
-							part._partName +
-						        "' already exist : Packages shall not contain equivalent " +
-						        "part names and package implementers shall neither create " +
-					        	"nor recognize packages with equivalent part names. [M1.12]");
-				}
-
-				// Check OPC compliance rule M4.1
-				if (part.getContentType().equals(
-						ContentTypes.CORE_PROPERTIES_PART)) {
-					if (!hasCorePropertiesPart) {
-						hasCorePropertiesPart = true;
-					} else {
-					   logger.log(POILogger.WARN, "OPC Compliance error [M4.1]: " +
-					   		"there is more than one core properties relationship in the package! " +
-					   		"POI will use only the first, but other software may reject this file.");
-					}
-				}
-
-				PartUnmarshaller partUnmarshaller = partUnmarshallers.get(part._contentType);
-
-				if (partUnmarshaller != null) {
-					UnmarshallContext context = new UnmarshallContext(this,
-							part._partName);
-					try {
-						PackagePart unmarshallPart = partUnmarshaller
-								.unmarshall(context, part.getInputStream());
-						partList.put(unmarshallPart._partName, unmarshallPart);
-
-						// Core properties case-- use first CoreProperties part we come across
-						// and ignore any subsequent ones
-						if (unmarshallPart instanceof PackagePropertiesPart &&
-								hasCorePropertiesPart &&
-								needCorePropertiesPart) {
-							this.packageProperties = (PackagePropertiesPart) unmarshallPart;
-							needCorePropertiesPart = false;
-						}
-					} catch (IOException ioe) {
-						logger.log(POILogger.WARN, "Unmarshall operation : IOException for "
-								+ part._partName);
-						continue;
-					} catch (InvalidOperationException invoe) {
-						throw new InvalidFormatException(invoe.getMessage(), invoe);
-					}
-				} else {
-					try {
-						partList.put(part._partName, part);
-					} catch (InvalidOperationException e) {
-						throw new InvalidFormatException(e.getMessage(), e);
-					}
-				}
-			}
-		}
-		ArrayList<PackagePart> result = new ArrayList<PackagePart>(partList.values());
-		java.util.Collections.sort(result);
-		return result;
-	}
-
-	/**
-	 * Create and add a part, with the specified name and content type, to the
-	 * package.
-	 *
-	 * @param partName
-	 *            Part name.
-	 * @param contentType
-	 *            Part content type.
-	 * @return The newly created part.
-	 * @throws PartAlreadyExistsException
-	 *             If rule M1.12 is not verified : Packages shall not contain
-	 *             equivalent part names and package implementers shall neither
-	 *             create nor recognize packages with equivalent part names.
-	 * @see #createPartImpl(PackagePartName, String, boolean)
-	 */
-	public PackagePart createPart(PackagePartName partName, String contentType) {
-		return this.createPart(partName, contentType, true);
-	}
-
-	/**
-	 * Create and add a part, with the specified name and content type, to the
-	 * package. For general purpose, prefer the overload version of this method
-	 * without the 'loadRelationships' parameter.
-	 *
-	 * @param partName
-	 *            Part name.
-	 * @param contentType
-	 *            Part content type.
-	 * @param loadRelationships
-	 *            Specify if the existing relationship part, if any, logically
-	 *            associated to the newly created part will be loaded.
-	 * @return The newly created part.
-	 * @throws PartAlreadyExistsException
-	 *             If rule M1.12 is not verified : Packages shall not contain
-	 *             equivalent part names and package implementers shall neither
-	 *             create nor recognize packages with equivalent part names.
-	 * @see #createPartImpl(PackagePartName, String, boolean)
-	 */
-	PackagePart createPart(PackagePartName partName, String contentType,
-			boolean loadRelationships) {
-		throwExceptionIfReadOnly();
-		if (partName == null) {
-			throw new IllegalArgumentException("partName");
-		}
-
-		if (contentType == null || contentType.equals("")) {
-			throw new IllegalArgumentException("contentType");
-		}
-
-		// Check if the specified part name already exists
-		if (partList.containsKey(partName)
-				&& !partList.get(partName).isDeleted()) {
-			throw new PartAlreadyExistsException(
-					"A part with the name '" + partName.getName() + "'" +
-					" already exists : Packages shall not contain equivalent part names and package" +
-					" implementers shall neither create nor recognize packages with equivalent part names. [M1.12]");
-		}
-
-		/* Check OPC compliance */
-
-		// Rule [M4.1]: The format designer shall specify and the format producer
-		// shall create at most one core properties relationship for a package.
-		// A format consumer shall consider more than one core properties
-		// relationship for a package to be an error. If present, the
-		// relationship shall target the Core Properties part.
-		// Note - POI will read files with more than one Core Properties, which
-		//  Office sometimes produces, but is strict on generation
-		if (contentType.equals(ContentTypes.CORE_PROPERTIES_PART)) {
-			if (this.packageProperties != null) {
-				throw new InvalidOperationException(
-						"OPC Compliance error [M4.1]: you try to add more than one core properties relationship in the package !");
-			}
-		}
-
-		/* End check OPC compliance */
-
-		PackagePart part = this.createPartImpl(partName, contentType,
-				loadRelationships);
-		this.contentTypeManager.addContentType(partName, contentType);
-		this.partList.put(partName, part);
-		this.isDirty = true;
-		return part;
-	}
-
-	/**
-	 * Add a part to the package.
-	 *
-	 * @param partName
-	 *            Part name of the part to create.
-	 * @param contentType
-	 *            type associated with the file
-	 * @param content
-	 *            the contents to add. In order to have faster operation in
-	 *            document merge, the data are stored in memory not on a hard
-	 *            disk
-	 *
-	 * @return The new part.
-	 * @see #createPart(PackagePartName, String)
-	 */
-	public PackagePart createPart(PackagePartName partName, String contentType,
-			ByteArrayOutputStream content) {
-		PackagePart addedPart = this.createPart(partName, contentType);
-		if (addedPart == null) {
-			return null;
-		}
-		// Extract the zip entry content to put it in the part content
-		if (content != null) {
-			try {
-				OutputStream partOutput = addedPart.getOutputStream();
-				if (partOutput == null) {
-					return null;
-				}
-
-				partOutput.write(content.toByteArray(), 0, content.size());
-				partOutput.close();
-
-			} catch (IOException ioe) {
-				return null;
-			}
-		} else {
-			return null;
-		}
-		return addedPart;
-	}
-
-	/**
-	 * Add the specified part to the package. If a part already exists in the
-	 * package with the same name as the one specified, then we replace the old
-	 * part by the specified part.
-	 *
-	 * @param part
-	 *            The part to add (or replace).
-	 * @return The part added to the package, the same as the one specified.
-	 * @throws InvalidFormatException
-	 *             If rule M1.12 is not verified : Packages shall not contain
-	 *             equivalent part names and package implementers shall neither
-	 *             create nor recognize packages with equivalent part names.
-	 */
-	protected PackagePart addPackagePart(PackagePart part) {
-		throwExceptionIfReadOnly();
-		if (part == null) {
-			throw new IllegalArgumentException("part");
-		}
-
-		if (partList.containsKey(part._partName)) {
-			if (!partList.get(part._partName).isDeleted()) {
-				throw new InvalidOperationException(
-						"A part with the name '"
-								+ part._partName.getName()
-								+ "' already exists : Packages shall not contain equivalent part names and package implementers shall neither create nor recognize packages with equivalent part names. [M1.12]");
-			}
-			// If the specified partis flagged as deleted, we make it
-			// available
-			part.setDeleted(false);
-			// and delete the old part to replace it thereafeter
-			this.partList.remove(part._partName);
-		}
-		this.partList.put(part._partName, part);
-		this.isDirty = true;
-		return part;
-	}
-
-	/**
-	 * Remove the specified part in this package. If this part is relationship
-	 * part, then delete all relationships in the source part.
-	 *
-	 * @param part
-	 *            The part to remove. If <code>null</code>, skip the action.
-	 * @see #removePart(PackagePartName)
-	 */
-	public void removePart(PackagePart part) {
-		if (part != null) {
-			removePart(part.getPartName());
-		}
-	}
-
-	/**
-	 * Remove a part in this package. If this part is relationship part, then
-	 * delete all relationships in the source part.
-	 *
-	 * @param partName
-	 *            The part name of the part to remove.
-	 */
-	public void removePart(PackagePartName partName) {
-		throwExceptionIfReadOnly();
-		if (partName == null || !this.containPart(partName)) {
-			throw new IllegalArgumentException("partName");
-		}
-
-		// Delete the specified part from the package.
-		if (this.partList.containsKey(partName)) {
-			this.partList.get(partName).setDeleted(true);
-			this.removePartImpl(partName);
-			this.partList.remove(partName);
-		} else {
-			this.removePartImpl(partName);
-		}
-
-		// Delete content type
-		this.contentTypeManager.removeContentType(partName);
-
-		// If this part is a relationship part, then delete all relationships of
-		// the source part.
-		if (partName.isRelationshipPartURI()) {
-			URI sourceURI = PackagingURIHelper
-					.getSourcePartUriFromRelationshipPartUri(partName.getURI());
-			PackagePartName sourcePartName;
-			try {
-				sourcePartName = PackagingURIHelper.createPartName(sourceURI);
-			} catch (InvalidFormatException e) {
-				logger
-						.log(POILogger.ERROR, "Part name URI '"
-								+ sourceURI
-								+ "' is not valid ! This message is not intended to be displayed !");
-				return;
-			}
-			if (sourcePartName.getURI().equals(
-					PackagingURIHelper.PACKAGE_ROOT_URI)) {
-				clearRelationships();
-			} else if (containPart(sourcePartName)) {
-				PackagePart part = getPart(sourcePartName);
-				if (part != null) {
-					part.clearRelationships();
-				}
-			}
-		}
-
-		this.isDirty = true;
-	}
-
-	/**
-	 * Remove a part from this package as well as its relationship part, if one
-	 * exists, and all parts listed in the relationship part. Be aware that this
-	 * do not delete relationships which target the specified part.
-	 *
-	 * @param partName
-	 *            The name of the part to delete.
-	 * @throws InvalidFormatException
-	 *             Throws if the associated relationship part of the specified
-	 *             part is not valid.
-	 */
-	public void removePartRecursive(PackagePartName partName)
-			throws InvalidFormatException {
-		// Retrieves relationship part, if one exists
-		PackagePart relPart = this.partList.get(PackagingURIHelper
-				.getRelationshipPartName(partName));
-		// Retrieves PackagePart object from the package
-		PackagePart partToRemove = this.partList.get(partName);
-
-		if (relPart != null) {
-			PackageRelationshipCollection partRels = new PackageRelationshipCollection(
-					partToRemove);
-			for (PackageRelationship rel : partRels) {
-				PackagePartName partNameToRemove = PackagingURIHelper
-						.createPartName(PackagingURIHelper.resolvePartUri(rel
-								.getSourceURI(), rel.getTargetURI()));
-				removePart(partNameToRemove);
-			}
-
-			// Finally delete its relationship part if one exists
-			this.removePart(relPart._partName);
-		}
-
-		// Delete the specified part
-		this.removePart(partToRemove._partName);
-	}
-
-	/**
-	 * Delete the part with the specified name and its associated relationships
-	 * part if one exists. Prefer the use of this method to delete a part in the
-	 * package, compare to the remove() methods that don't remove associated
-	 * relationships part.
-	 *
-	 * @param partName
-	 *            Name of the part to delete
-	 */
-	public void deletePart(PackagePartName partName) {
-		if (partName == null) {
-			throw new IllegalArgumentException("partName");
-		}
-
-		// Remove the part
-		this.removePart(partName);
-		// Remove the relationships part
-		this.removePart(PackagingURIHelper.getRelationshipPartName(partName));
-	}
-
-	/**
-	 * Delete the part with the specified name and all part listed in its
-	 * associated relationships part if one exists. This process is recursively
-	 * apply to all parts in the relationships part of the specified part.
-	 * Prefer the use of this method to delete a part in the package, compare to
-	 * the remove() methods that don't remove associated relationships part.
-	 *
-	 * @param partName
-	 *            Name of the part to delete
-	 */
-	public void deletePartRecursive(PackagePartName partName) {
-		if (partName == null || !this.containPart(partName)) {
-			throw new IllegalArgumentException("partName");
-		}
-
-		PackagePart partToDelete = this.getPart(partName);
-		// Remove the part
-		this.removePart(partName);
-		// Remove all relationship parts associated
-		try {
-			for (PackageRelationship relationship : partToDelete
-					.getRelationships()) {
-				PackagePartName targetPartName = PackagingURIHelper
-						.createPartName(PackagingURIHelper.resolvePartUri(
-								partName.getURI(), relationship.getTargetURI()));
-				this.deletePartRecursive(targetPartName);
-			}
-		} catch (InvalidFormatException e) {
-			logger.log(POILogger.WARN, "An exception occurs while deleting part '"
-					+ partName.getName()
-					+ "'. Some parts may remain in the package. - "
-					+ e.getMessage());
-			return;
-		}
-		// Remove the relationships part
-		PackagePartName relationshipPartName = PackagingURIHelper
-				.getRelationshipPartName(partName);
-		if (relationshipPartName != null && containPart(relationshipPartName)) {
-			this.removePart(relationshipPartName);
-		}
-	}
-
-	/**
-	 * Check if a part already exists in this package from its name.
-	 *
-	 * @param partName
-	 *            Part name to check.
-	 * @return <i>true</i> if the part is logically added to this package, else
-	 *         <i>false</i>.
-	 */
-	public boolean containPart(PackagePartName partName) {
-		return (this.getPart(partName) != null);
-	}
-
-	/**
-	 * Add a relationship to the package (except relationships part).
-	 *
-	 * Check rule M4.1 : The format designer shall specify and the format
-	 * producer shall create at most one core properties relationship for a
-	 * package. A format consumer shall consider more than one core properties
-	 * relationship for a package to be an error. If present, the relationship
-	 * shall target the Core Properties part.
-	 *
-	 * Check rule M1.25: The Relationships part shall not have relationships to
-	 * any other part. Package implementers shall enforce this requirement upon
-	 * the attempt to create such a relationship and shall treat any such
-	 * relationship as invalid.
-	 *
-	 * @param targetPartName
-	 *            Target part name.
-	 * @param targetMode
-	 *            Target mode, either Internal or External.
-	 * @param relationshipType
-	 *            Relationship type.
-	 * @param relID
-	 *            ID of the relationship.
-	 * @see PackageRelationshipTypes
-	 */
-	@Override
-    public PackageRelationship addRelationship(PackagePartName targetPartName,
-			TargetMode targetMode, String relationshipType, String relID) {
-		/* Check OPC compliance */
-
-		// Check rule M4.1 : The format designer shall specify and the format
-		// producer
-		// shall create at most one core properties relationship for a package.
-		// A format consumer shall consider more than one core properties
-		// relationship for a package to be an error. If present, the
-		// relationship shall target the Core Properties part.
-		if (relationshipType.equals(PackageRelationshipTypes.CORE_PROPERTIES)
-				&& this.packageProperties != null) {
-			throw new InvalidOperationException(
-					"OPC Compliance error [M4.1]: can't add another core properties part ! Use the built-in package method instead.");
-		}
-
-		/*
-		 * Check rule M1.25: The Relationships part shall not have relationships
-		 * to any other part. Package implementers shall enforce this
-		 * requirement upon the attempt to create such a relationship and shall
-		 * treat any such relationship as invalid.
-		 */
-		if (targetPartName.isRelationshipPartURI()) {
-			throw new InvalidOperationException(
-					"Rule M1.25: The Relationships part shall not have relationships to any other part.");
-		}
-
-		/* End OPC compliance */
-
-		ensureRelationships();
-		PackageRelationship retRel = relationships.addRelationship(
-				targetPartName.getURI(), targetMode, relationshipType, relID);
-		this.isDirty = true;
-		return retRel;
-	}
-
-	/**
-	 * Add a package relationship.
-	 *
-	 * @param targetPartName
-	 *            Target part name.
-	 * @param targetMode
-	 *            Target mode, either Internal or External.
-	 * @param relationshipType
-	 *            Relationship type.
-	 * @see PackageRelationshipTypes
-	 */
-	@Override
-    public PackageRelationship addRelationship(PackagePartName targetPartName,
-			TargetMode targetMode, String relationshipType) {
-		return this.addRelationship(targetPartName, targetMode,
-				relationshipType, null);
-	}
-
-	/**
-	 * Adds an external relationship to a part (except relationships part).
-	 *
-	 * The targets of external relationships are not subject to the same
-	 * validity checks that internal ones are, as the contents is potentially
-	 * any file, URL or similar.
-	 *
-	 * @param target
-	 *            External target of the relationship
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addExternalRelationship(java.lang.String,
-	 *      java.lang.String)
-	 */
-	@Override
-    public PackageRelationship addExternalRelationship(String target,
-			String relationshipType) {
-		return addExternalRelationship(target, relationshipType, null);
-	}
-
-	/**
-	 * Adds an external relationship to a part (except relationships part).
-	 *
-	 * The targets of external relationships are not subject to the same
-	 * validity checks that internal ones are, as the contents is potentially
-	 * any file, URL or similar.
-	 *
-	 * @param target
-	 *            External target of the relationship
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @param id
-	 *            Relationship unique id.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addExternalRelationship(java.lang.String,
-	 *      java.lang.String)
-	 */
-	@Override
-    public PackageRelationship addExternalRelationship(String target,
-			String relationshipType, String id) {
-		if (target == null) {
-			throw new IllegalArgumentException("target");
-		}
-		if (relationshipType == null) {
-			throw new IllegalArgumentException("relationshipType");
-		}
-
-		URI targetURI;
-		try {
-			targetURI = new URI(target);
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException("Invalid target - " + e);
-		}
-
-		ensureRelationships();
-		PackageRelationship retRel = relationships.addRelationship(targetURI,
-				TargetMode.EXTERNAL, relationshipType, id);
-		this.isDirty = true;
-		return retRel;
-	}
-
-	/**
-	 * Delete a relationship from this package.
-	 *
-	 * @param id
-	 *            Id of the relationship to delete.
-	 */
-	@Override
-    public void removeRelationship(String id) {
-		if (relationships != null) {
-			relationships.removeRelationship(id);
-			this.isDirty = true;
-		}
-	}
-
-	/**
-	 * Retrieves all package relationships.
-	 *
-	 * @return All package relationships of this package.
-	 * @throws OpenXML4JException
-	 * @see #getRelationshipsHelper(String)
-	 */
-	@Override
-    public PackageRelationshipCollection getRelationships() {
-		return getRelationshipsHelper(null);
-	}
-
-	/**
-	 * Retrieves all relationships with the specified type.
-	 *
-	 * @param relationshipType
-	 *            The filter specifying the relationship type.
-	 * @return All relationships with the specified relationship type.
-	 */
-	@Override
-    public PackageRelationshipCollection getRelationshipsByType(
-			String relationshipType) {
-		throwExceptionIfWriteOnly();
-		if (relationshipType == null) {
-			throw new IllegalArgumentException("relationshipType");
-		}
-		return getRelationshipsHelper(relationshipType);
-	}
-
-	/**
-	 * Retrieves all relationships with specified id (normally just ine because
-	 * a relationship id is supposed to be unique).
-	 *
-	 * @param id
-	 *            Id of the wanted relationship.
-	 */
-	private PackageRelationshipCollection getRelationshipsHelper(String id) {
-		throwExceptionIfWriteOnly();
-		ensureRelationships();
-		return this.relationships.getRelationships(id);
-	}
-
-	/**
-	 * Clear package relationships.
-	 */
-	@Override
-    public void clearRelationships() {
-		if (relationships != null) {
-			relationships.clear();
-			this.isDirty = true;
-		}
-	}
-
-	/**
-	 * Ensure that the relationships collection is not null.
-	 */
-	public void ensureRelationships() {
-		if (this.relationships == null) {
-			try {
-				this.relationships = new PackageRelationshipCollection(this);
-			} catch (InvalidFormatException e) {
-				this.relationships = new PackageRelationshipCollection();
-			}
-		}
-	}
-
-	/**
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#getRelationship(java.lang.String)
-	 */
-	@Override
-    public PackageRelationship getRelationship(String id) {
-		return this.relationships.getRelationshipByID(id);
-	}
-
-	/**
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#hasRelationships()
-	 */
-	@Override
-    public boolean hasRelationships() {
-		return (relationships.size() > 0);
-	}
-
-	/**
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#isRelationshipExists(org.apache.poi.openxml4j.opc.PackageRelationship)
-	 */
-	@Override
-    public boolean isRelationshipExists(PackageRelationship rel) {
-        for (PackageRelationship r : relationships) {
-            if (r == rel) {
-                return true;
-            }
-        }
-        return false;
-	}
-
-	/**
-	 * Add a marshaller.
-	 *
-	 * @param contentType
-	 *            The content type to bind to the specified marshaller.
-	 * @param marshaller
-	 *            The marshaller to register with the specified content type.
-	 */
-	public void addMarshaller(String contentType, PartMarshaller marshaller) {
-		try {
-			partMarshallers.put(new ContentType(contentType), marshaller);
-		} catch (InvalidFormatException e) {
-			logger.log(POILogger.WARN, "The specified content type is not valid: '"
-					+ e.getMessage() + "'. The marshaller will not be added !");
-		}
-	}
-
-	/**
-	 * Add an unmarshaller.
-	 *
-	 * @param contentType
-	 *            The content type to bind to the specified unmarshaller.
-	 * @param unmarshaller
-	 *            The unmarshaller to register with the specified content type.
-	 */
-	public void addUnmarshaller(String contentType,
-			PartUnmarshaller unmarshaller) {
-		try {
-			partUnmarshallers.put(new ContentType(contentType), unmarshaller);
-		} catch (InvalidFormatException e) {
-			logger.log(POILogger.WARN, "The specified content type is not valid: '"
-					+ e.getMessage()
-					+ "'. The unmarshaller will not be added !");
-		}
-	}
-
-	/**
-	 * Remove a marshaller by its content type.
-	 *
-	 * @param contentType
-	 *            The content type associated with the marshaller to remove.
-	 */
-	public void removeMarshaller(String contentType) {
-		try {
-            partMarshallers.remove(new ContentType(contentType));
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
-        }
-	}
-
-	/**
-	 * Remove an unmarshaller by its content type.
-	 *
-	 * @param contentType
-	 *            The content type associated with the unmarshaller to remove.
-	 */
-	public void removeUnmarshaller(String contentType) {
-        try {
-            partUnmarshallers.remove(new ContentType(contentType));
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
-        }
-	}
-
-	/* Accesseurs */
-
-	/**
-	 * Get the package access mode.
-	 *
-	 * @return the packageAccess The current package access.
-	 */
-	public PackageAccess getPackageAccess() {
-		return packageAccess;
-	}
-
-	/**
-	 * Validates the package compliance with the OPC specifications.
-	 *
-	 * @return <b>true</b> if the package is valid else <b>false</b>
-	 */
-	@NotImplemented
-	public boolean validatePackage(OPCPackage pkg) throws InvalidFormatException {
-		throw new InvalidOperationException("Not implemented yet !!!");
-	}
-
-	/**
-	 * Save the document in the specified file.
-	 *
-	 * @param targetFile
-	 *            Destination file.
-	 * @throws IOException
-	 *             Throws if an IO exception occur.
-	 * @see #save(OutputStream)
-	 */
-	public void save(File targetFile) throws IOException {
-		if (targetFile == null) {
-			throw new IllegalArgumentException("targetFile");
-		}
-
-		this.throwExceptionIfReadOnly();
-		
-		// You shouldn't save the the same file, do a close instead
-		if(targetFile.exists() && 
-		        targetFile.getAbsolutePath().equals(this.originalPackagePath)) {
-		    throw new InvalidOperationException(
-		            "You can't call save(File) to save to the currently open " +
-		            "file. To save to the current file, please just call close()"
-		    );
-		}
-		
-		// Do the save
-		FileOutputStream fos = null;
-		try {
-			fos = new FileOutputStream(targetFile);
-			this.save(fos);
-		} finally {
-			if (fos != null) fos.close();
-		}
-	}
-
-	/**
-	 * Save the document in the specified output stream.
-	 *
-	 * @param outputStream
-	 *            The stream to save the package.
-	 * @see #saveImpl(OutputStream)
-	 */
-	public void save(OutputStream outputStream) throws IOException {
-		throwExceptionIfReadOnly();
-		this.saveImpl(outputStream);
-	}
-
-	/**
-	 * Core method to create a package part. This method must be implemented by
-	 * the subclass.
-	 *
-	 * @param partName
-	 *            URI of the part to create.
-	 * @param contentType
-	 *            Content type of the part to create.
-	 * @return The newly created package part.
-	 */
-	protected abstract PackagePart createPartImpl(PackagePartName partName,
-			String contentType, boolean loadRelationships);
-
-	/**
-	 * Core method to delete a package part. This method must be implemented by
-	 * the subclass.
-	 *
-	 * @param partName
-	 *            The URI of the part to delete.
-	 */
-	protected abstract void removePartImpl(PackagePartName partName);
-
-	/**
-	 * Flush the package but not save.
-	 */
-	protected abstract void flushImpl();
-
-	/**
-	 * Close the package and cause a save of the package.
-	 *
-	 */
-	protected abstract void closeImpl() throws IOException;
-
-	/**
-	 * Close the package without saving the document. Discard all changes made
-	 * to this package.
-	 */
-	protected abstract void revertImpl();
-
-	/**
-	 * Save the package into the specified output stream.
-	 *
-	 * @param outputStream
-	 *            The output stream use to save this package.
-	 */
-	protected abstract void saveImpl(OutputStream outputStream)
-			throws IOException;
-
-	/**
-	 * Get the package part mapped to the specified URI.
-	 *
-	 * @param partName
-	 *            The URI of the part to retrieve.
-	 * @return The package part located by the specified URI, else <b>null</b>.
-	 */
-	protected abstract PackagePart getPartImpl(PackagePartName partName);
-
-	/**
-	 * Get all parts link to the package.
-	 *
-	 * @return A list of the part owned by the package.
-	 */
-	protected abstract PackagePart[] getPartsImpl()
-			throws InvalidFormatException;
-
-    /**
-     * Replace a content type in this package.
-     *
-     * <p>
-     *     A typical scneario to call this method is to rename a template file to the main format, e.g.
-     *     ".dotx" to ".docx"
-     *     ".dotm" to ".docm"
-     *     ".xltx" to ".xlsx"
-     *     ".xltm" to ".xlsm"
-     *     ".potx" to ".pptx"
-     *     ".potm" to ".pptm"
-     * </p>
-     * For example, a code converting  a .xlsm macro workbook to .xlsx would look as follows:
-     * <p>
-     *    <pre><code>
-     *
-     *     OPCPackage pkg = OPCPackage.open(new FileInputStream("macro-workbook.xlsm"));
-     *     pkg.replaceContentType(
-     *         "application/vnd.ms-excel.sheet.macroEnabled.main+xml",
-     *         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml");
-     *
-     *     FileOutputStream out = new FileOutputStream("workbook.xlsx");
-     *     pkg.save(out);
-     *     out.close();
-     *
-     *    </code></pre>
-     * </p>
-     *
-     * @param oldContentType  the content type to be replaced
-     * @param newContentType  the replacement
-     * @return whether replacement was succesfull
-     * @since POI-3.8
-     */
-    public boolean replaceContentType(String oldContentType, String newContentType){
-        boolean success = false;
-        ArrayList<PackagePart> list = getPartsByContentType(oldContentType);
-        for (PackagePart packagePart : list) {
-            if (packagePart.getContentType().equals(oldContentType)) {
-                PackagePartName partName = packagePart.getPartName();
-                contentTypeManager.addContentType(partName, newContentType);
-                try {
-                    packagePart.setContentType(newContentType);
-                } catch (InvalidFormatException e) {
-                    throw new OpenXML4JRuntimeException("invalid content type - "+newContentType, e);
-                }
-                success = true;
-                this.isDirty = true;
-            }
-        }
-        return success;
-    }
-
-    /**
-    * Add the specified part, and register its content type with the content
-    * type manager.
-    *
-    * @param part
-    *            The part to add.
-    */
-    public void registerPartAndContentType(PackagePart part) {
-        addPackagePart(part);
-        this.contentTypeManager.addContentType(part.getPartName(), part.getContentType());
-        this.isDirty = true;
-    }
-
-    /**
-     * Remove the specified part, and clear its content type from the content
-     * type manager.
-     *
-     * @param partName
-     *            The part name of the part to remove.
-     */
-    public void unregisterPartAndContentType(PackagePartName partName) {
-        removePart(partName);
-        this.contentTypeManager.removeContentType(partName);
-        this.isDirty = true;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java
deleted file mode 100644
index 2568822..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-/**
- * Specifies package access.
- *
- * @author Julien Chable
- * @version 1.0
- */
-public enum PackageAccess {
-    /** Read only. Write not authorized. */
-    READ,
-    /** Write only. Read not authorized. */
-    WRITE,
-    /** Read and Write mode. */
-    READ_WRITE
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
deleted file mode 100644
index d1adc51..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-/**
- * Open Packaging Convention namespaces URI.
- *
- * @author Julien Chable
- * @version 1.0
- */
-public interface PackageNamespaces {
-
-	/**
-	 * Content Types.
-	 */
-	public static final String CONTENT_TYPES = "http://schemas.openxmlformats.org/package/2006/content-types";
-
-	/**
-	 * Core Properties.
-	 */
-	public static final String CORE_PROPERTIES = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties";
-
-	/**
-	 * Digital Signatures.
-	 */
-	public static final String DIGITAL_SIGNATURE = "http://schemas.openxmlformats.org/package/2006/digital-signature";
-
-	/**
-	 * Relationships.
-	 */
-	public static final String RELATIONSHIPS = "http://schemas.openxmlformats.org/package/2006/relationships";
-
-	/**
-	 * Markup Compatibility.
-	 */
-	public static final String MARKUP_COMPATIBILITY = "http://schemas.openxmlformats.org/markup-compatibility/2006";
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java
deleted file mode 100644
index 23969fa..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java
+++ /dev/null
@@ -1,720 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.internal.ContentType;
-
-/**
- * Provides a base class for parts stored in a Package.
- */
-public abstract class PackagePart implements RelationshipSource, Comparable<PackagePart> {
-
-	/**
-	 * This part's container.
-	 */
-	protected OPCPackage _container;
-
-	/**
-	 * The part name. (required by the specification [M1.1])
-	 */
-	protected PackagePartName _partName;
-
-	/**
-	 * The type of content of this part. (required by the specification [M1.2])
-	 */
-	protected ContentType _contentType;
-
-	/**
-	 * Flag to know if this part is a relationship.
-	 */
-	private boolean _isRelationshipPart;
-
-	/**
-	 * Flag to know if this part has been logically deleted.
-	 */
-	private boolean _isDeleted;
-
-	/**
-	 * This part's relationships.
-	 */
-	private PackageRelationshipCollection _relationships;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param pack
-	 *            Parent package.
-	 * @param partName
-	 *            The part name, relative to the parent Package root.
-	 * @param contentType
-	 *            The content type.
-	 * @throws InvalidFormatException
-	 *             If the specified URI is not valid.
-	 */
-	protected PackagePart(OPCPackage pack, PackagePartName partName,
-			ContentType contentType) throws InvalidFormatException {
-		this(pack, partName, contentType, true);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param pack
-	 *            Parent package.
-	 * @param partName
-	 *            The part name, relative to the parent Package root.
-	 * @param contentType
-	 *            The content type.
-	 * @param loadRelationships
-	 *            Specify if the relationships will be loaded
-	 * @throws InvalidFormatException
-	 *             If the specified URI is not valid.
-	 */
-	protected PackagePart(OPCPackage pack, PackagePartName partName,
-			ContentType contentType, boolean loadRelationships)
-			throws InvalidFormatException {
-		_partName = partName;
-		_contentType = contentType;
-		_container = pack;
-
-		// Check if this part is a relationship part
-		_isRelationshipPart = this._partName.isRelationshipPartURI();
-
-		// Load relationships if any
-		if (loadRelationships)
-			loadRelationships();
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param pack
-	 *            Parent package.
-	 * @param partName
-	 *            The part name, relative to the parent Package root.
-	 * @param contentType
-	 *            The Multipurpose Internet Mail Extensions (MIME) content type
-	 *            of the part's data stream.
-	 */
-	public PackagePart(OPCPackage pack, PackagePartName partName,
-			String contentType) throws InvalidFormatException {
-		this(pack, partName, new ContentType(contentType));
-	}
-
-	/**
-	 * Adds an external relationship to a part (except relationships part).
-	 *
-	 * The targets of external relationships are not subject to the same
-	 * validity checks that internal ones are, as the contents is potentially
-	 * any file, URL or similar.
-	 *
-	 * @param target
-	 *            External target of the relationship
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addExternalRelationship(java.lang.String,
-	 *      java.lang.String)
-	 */
-	public PackageRelationship addExternalRelationship(String target,
-			String relationshipType) {
-		return addExternalRelationship(target, relationshipType, null);
-	}
-
-	/**
-	 * Adds an external relationship to a part (except relationships part).
-	 *
-	 * The targets of external relationships are not subject to the same
-	 * validity checks that internal ones are, as the contents is potentially
-	 * any file, URL or similar.
-	 *
-	 * @param target
-	 *            External target of the relationship
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @param id
-	 *            Relationship unique id.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addExternalRelationship(java.lang.String,
-	 *      java.lang.String)
-	 */
-	public PackageRelationship addExternalRelationship(String target,
-			String relationshipType, String id) {
-		if (target == null) {
-			throw new IllegalArgumentException("target is null for type " + relationshipType);
-		}
-		if (relationshipType == null) {
-			throw new IllegalArgumentException("relationshipType");
-		}
-
-		if (_relationships == null) {
-			_relationships = new PackageRelationshipCollection();
-		}
-
-		URI targetURI;
-		try {
-			targetURI = new URI(target);
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException("Invalid target - " + e);
-		}
-
-		return _relationships.addRelationship(targetURI, TargetMode.EXTERNAL,
-				relationshipType, id);
-	}
-
-	/**
-	 * Add a relationship to a part (except relationships part).
-	 *
-	 * @param targetPartName
-	 *            Name of the target part. This one must be relative to the
-	 *            source root directory of the part.
-	 * @param targetMode
-	 *            Mode [Internal|External].
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addRelationship(org.apache.poi.openxml4j.opc.PackagePartName,
-	 *      org.apache.poi.openxml4j.opc.TargetMode, java.lang.String)
-	 */
-	public PackageRelationship addRelationship(PackagePartName targetPartName,
-			TargetMode targetMode, String relationshipType) {
-		return addRelationship(targetPartName, targetMode, relationshipType,
-				null);
-	}
-
-	/**
-	 * Add a relationship to a part (except relationships part).
-	 * <p>
-	 * Check rule M1.25: The Relationships part shall not have relationships to
-	 * any other part. Package implementers shall enforce this requirement upon
-	 * the attempt to create such a relationship and shall treat any such
-	 * relationship as invalid.
-	 * </p>
-	 * @param targetPartName
-	 *            Name of the target part. This one must be relative to the
-	 *            source root directory of the part.
-	 * @param targetMode
-	 *            Mode [Internal|External].
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @param id
-	 *            Relationship unique id.
-	 * @return The newly created and added relationship
-	 *
-	 * @throws InvalidOperationException
-	 *             If a writing operation is done on a read only package or 
-	 *             invalid nested relations are created.
-	 * @throws InvalidFormatException
-	 *             If the URI point to a relationship part URI.
-	 * @throws IllegalArgumentException if targetPartName, targetMode 
-	 *             or relationshipType are passed as null
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addRelationship(org.apache.poi.openxml4j.opc.PackagePartName,
-	 *      org.apache.poi.openxml4j.opc.TargetMode, java.lang.String, java.lang.String)
-	 */
-	public PackageRelationship addRelationship(PackagePartName targetPartName,
-			TargetMode targetMode, String relationshipType, String id) {
-		_container.throwExceptionIfReadOnly();
-
-		if (targetPartName == null) {
-			throw new IllegalArgumentException("targetPartName");
-		}
-		if (targetMode == null) {
-			throw new IllegalArgumentException("targetMode");
-		}
-		if (relationshipType == null) {
-			throw new IllegalArgumentException("relationshipType");
-		}
-
-		if (this._isRelationshipPart || targetPartName.isRelationshipPartURI()) {
-			throw new InvalidOperationException(
-					"Rule M1.25: The Relationships part shall not have relationships to any other part.");
-		}
-
-		if (_relationships == null) {
-			_relationships = new PackageRelationshipCollection();
-		}
-
-		return _relationships.addRelationship(targetPartName.getURI(),
-				targetMode, relationshipType, id);
-	}
-
-	/**
-	 * Add a relationship to a part (except relationships part).
-	 *
-	 * @param targetURI
-	 *            URI the target part. Must be relative to the source root
-	 *            directory of the part.
-	 * @param targetMode
-	 *            Mode [Internal|External].
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addRelationship(org.apache.poi.openxml4j.opc.PackagePartName,
-	 *      org.apache.poi.openxml4j.opc.TargetMode, java.lang.String)
-	 */
-	public PackageRelationship addRelationship(URI targetURI,
-			TargetMode targetMode, String relationshipType) {
-		return addRelationship(targetURI, targetMode, relationshipType, null);
-	}
-
-	/**
-	 * Add a relationship to a part (except relationships part).
-	 * <p>
-	 * Check rule M1.25: The Relationships part shall not have relationships to
-	 * any other part. Package implementers shall enforce this requirement upon
-	 * the attempt to create such a relationship and shall treat any such
-	 * relationship as invalid.
-	 * </p>
-	 * @param targetURI
-	 *            URI of the target part. Must be relative to the source root
-	 *            directory of the part.
-	 * @param targetMode
-	 *            Mode [Internal|External].
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @param id
-	 *            Relationship unique id.
-	 * @return The newly created and added relationship
-	 *
-	 * @throws InvalidFormatException
-	 *             If the URI point to a relationship part URI.
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addRelationship(org.apache.poi.openxml4j.opc.PackagePartName,
-	 *      org.apache.poi.openxml4j.opc.TargetMode, java.lang.String, java.lang.String)
-	 */
-	public PackageRelationship addRelationship(URI targetURI,
-			TargetMode targetMode, String relationshipType, String id) {
-		_container.throwExceptionIfReadOnly();
-
-		if (targetURI == null) {
-			throw new IllegalArgumentException("targetPartName");
-		}
-		if (targetMode == null) {
-			throw new IllegalArgumentException("targetMode");
-		}
-		if (relationshipType == null) {
-			throw new IllegalArgumentException("relationshipType");
-		}
-
-		// Try to retrieve the target part
-
-		if (this._isRelationshipPart
-				|| PackagingURIHelper.isRelationshipPartURI(targetURI)) {
-			throw new InvalidOperationException(
-					"Rule M1.25: The Relationships part shall not have relationships to any other part.");
-		}
-
-		if (_relationships == null) {
-			_relationships = new PackageRelationshipCollection();
-		}
-
-		return _relationships.addRelationship(targetURI,
-				targetMode, relationshipType, id);
-	}
-
-	/**
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#clearRelationships()
-	 */
-	public void clearRelationships() {
-		if (_relationships != null) {
-			_relationships.clear();
-		}
-	}
-
-	/**
-	 * Delete the relationship specified by its id.
-	 *
-	 * @param id
-	 *            The ID identified the part to delete.
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#removeRelationship(java.lang.String)
-	 */
-	public void removeRelationship(String id) {
-		this._container.throwExceptionIfReadOnly();
-		if (this._relationships != null)
-			this._relationships.removeRelationship(id);
-	}
-
-	/**
-	 * Retrieve all the relationships attached to this part.
-	 *
-	 * @return This part's relationships.
-	 * @throws OpenXML4JException
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#getRelationships()
-	 */
-	public PackageRelationshipCollection getRelationships()
-			throws InvalidFormatException {
-		return getRelationshipsCore(null);
-	}
-
-	/**
-	 * Retrieves a package relationship from its id.
-	 *
-	 * @param id
-	 *            ID of the package relationship to retrieve.
-	 * @return The package relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#getRelationship(java.lang.String)
-	 */
-	public PackageRelationship getRelationship(String id) {
-		return this._relationships.getRelationshipByID(id);
-	}
-
-	/**
-	 * Retrieve all relationships attached to this part which have the specified
-	 * type.
-	 *
-	 * @param relationshipType
-	 *            Relationship type filter.
-	 * @return All relationships from this part that have the specified type.
-	 * @throws InvalidFormatException
-	 *             If an error occurs while parsing the part.
-	 * @throws InvalidOperationException
-	 *             If the package is open in write only mode.
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#getRelationshipsByType(java.lang.String)
-	 */
-	public PackageRelationshipCollection getRelationshipsByType(
-			String relationshipType) throws InvalidFormatException {
-		_container.throwExceptionIfWriteOnly();
-
-		return getRelationshipsCore(relationshipType);
-	}
-
-	/**
-	 * Implementation of the getRelationships method().
-	 *
-	 * @param filter
-	 *            Relationship type filter. If <i>null</i> then the filter is
-	 *            disabled and return all the relationships.
-	 * @return All relationships from this part that have the specified type.
-	 * @throws InvalidFormatException
-	 *             Throws if an error occurs during parsing the relationships
-	 *             part.
-	 * @throws InvalidOperationException
-	 *             Throws if the package is open en write only mode.
-	 * @see #getRelationshipsByType(String)
-	 */
-	private PackageRelationshipCollection getRelationshipsCore(String filter)
-			throws InvalidFormatException {
-		this._container.throwExceptionIfWriteOnly();
-		if (_relationships == null) {
-			this.throwExceptionIfRelationship();
-			_relationships = new PackageRelationshipCollection(this);
-		}
-		return new PackageRelationshipCollection(_relationships, filter);
-	}
-
-	/**
-	 * Knows if the part have any relationships.
-	 *
-	 * @return <b>true</b> if the part have at least one relationship else
-	 *         <b>false</b>.
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#hasRelationships()
-	 */
-	public boolean hasRelationships() {
-		return (!this._isRelationshipPart && (_relationships != null && _relationships
-				.size() > 0));
-	}
-
-	/**
-	 * Checks if the specified relationship is part of this package part.
-	 *
-	 * @param rel
-	 *            The relationship to check.
-	 * @return <b>true</b> if the specified relationship exists in this part,
-	 *         else returns <b>false</b>
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#isRelationshipExists(org.apache.poi.openxml4j.opc.PackageRelationship)
-	 */
-	public boolean isRelationshipExists(PackageRelationship rel) {
-		for (PackageRelationship r : _relationships) {
-			if (r == rel)
-				return true;
-		}
-        return false;
-	}
-
-   /**
-    * Get the PackagePart that is the target of a relationship.
-    *
-    * @param rel A relationship from this part to another one 
-    * @return The target part of the relationship
-    */
-   public PackagePart getRelatedPart(PackageRelationship rel) throws InvalidFormatException {
-       // Ensure this is one of ours
-       if(! isRelationshipExists(rel)) {
-          throw new IllegalArgumentException("Relationship " + rel + " doesn't start with this part " + _partName);
-       }
-       
-       // Get the target URI, excluding any relative fragments
-       URI target = rel.getTargetURI();
-       if(target.getFragment() != null) {
-          String t = target.toString();
-          try {
-             target = new URI( t.substring(0, t.indexOf('#')) );
-          } catch(URISyntaxException e) {
-             throw new InvalidFormatException("Invalid target URI: " + target);
-          }
-       }
-   
-       // Turn that into a name, and fetch
-       PackagePartName relName = PackagingURIHelper.createPartName(target);
-       PackagePart part = _container.getPart(relName);
-       if (part == null) {
-           throw new IllegalArgumentException("No part found for relationship " + rel);
-       }
-       return part;
-   }
-   
-	/**
-	 * Get the input stream of this part to read its content.
-	 *
-	 * @return The input stream of the content of this part, else
-	 *         <code>null</code>.
-	 */
-	public InputStream getInputStream() throws IOException {
-		InputStream inStream = this.getInputStreamImpl();
-		if (inStream == null) {
-			throw new IOException("Can't obtain the input stream from "
-					+ _partName.getName());
-		}
-		return inStream;
-	}
-
-	/**
-	 * Get the output stream of this part. If the part is originally embedded in
-	 * Zip package, it'll be transform intot a <i>MemoryPackagePart</i> in
-	 * order to write inside (the standard Java API doesn't allow to write in
-	 * the file)
-	 *
-	 * @see org.apache.poi.openxml4j.opc.internal.MemoryPackagePart
-	 */
-	public OutputStream getOutputStream() {
-		OutputStream outStream;
-		// If this part is a zip package part (read only by design) we convert
-		// this part into a MemoryPackagePart instance for write purpose.
-		if (this instanceof ZipPackagePart) {
-			// Delete logically this part
-			_container.removePart(this._partName);
-
-			// Create a memory part
-			PackagePart part = _container.createPart(this._partName,
-					this._contentType.toString(), false);
-			if (part == null) {
-			    throw new InvalidOperationException(
-			            "Can't create a temporary part !");
-			}
-			part._relationships = this._relationships;
-			outStream = part.getOutputStreamImpl();
-		} else {
-			outStream = this.getOutputStreamImpl();
-		}
-		return outStream;
-	}
-
-	/**
-	 * Throws an exception if this package part is a relationship part.
-	 *
-	 * @throws InvalidOperationException
-	 *             If this part is a relationship part.
-	 */
-	private void throwExceptionIfRelationship()
-			throws InvalidOperationException {
-		if (this._isRelationshipPart)
-			throw new InvalidOperationException(
-					"Can do this operation on a relationship part !");
-	}
-
-	/**
-	 * Ensure the package relationships collection instance is built.
-	 *
-	 * @throws InvalidFormatException
-	 *             Throws if
-	 */
-	private void loadRelationships() throws InvalidFormatException {
-		if (this._relationships == null && !this._isRelationshipPart) {
-			this.throwExceptionIfRelationship();
-			_relationships = new PackageRelationshipCollection(this);
-		}
-	}
-
-	/*
-	 * Accessors
-	 */
-
-	/**
-	 * @return the uri
-	 */
-	public PackagePartName getPartName() {
-		return _partName;
-	}
-
-	/**
-	 * @return The Content Type of the part
-	 */
-	public String getContentType() {
-		return _contentType.toString();
-	}
-
-    /**
-     * @return The Content Type, including parameters, of the part
-     */
-    public ContentType getContentTypeDetails() {
-        return _contentType;
-    }
-
-	/**
-	 * Set the content type.
-	 *
-	 * @param contentType
-	 *            the contentType to set
-	 *
-	 * @throws InvalidFormatException
-	 *             Throws if the content type is not valid.
-	 * @throws InvalidOperationException
-	 *             Throws if you try to change the content type whereas this
-	 *             part is already attached to a package.
-	 */
-	public void setContentType(String contentType)
-			throws InvalidFormatException {
-		if (_container == null) {
-			_contentType = new ContentType(contentType);
-		}
-		else {
-		    _container.unregisterPartAndContentType(_partName);
-		    _contentType = new ContentType(contentType);
-		    _container.registerPartAndContentType(this);
-		}
-	}
-
-	public OPCPackage getPackage() {
-		return _container;
-	}
-
-	/**
-	 * @return true if this part is a relationship
-	 */
-	public boolean isRelationshipPart() {
-		return this._isRelationshipPart;
-	}
-
-	/**
-	 * @return true if this part has been logically deleted
-	 */
-	public boolean isDeleted() {
-		return _isDeleted;
-	}
-
-	/**
-	 * @param isDeleted
-	 *            the isDeleted to set
-	 */
-	public void setDeleted(boolean isDeleted) {
-		this._isDeleted = isDeleted;
-	}
-	
-	/**
-	 * @return The length of the part in bytes, or -1 if not known
-	 */
-	public long getSize() {
-	   return -1;
-	}
-
-	@Override
-	public String toString() {
-		return "Name: " + this._partName + " - Content Type: "
-				+ this._contentType.toString();
-	}
-
-	/**
-	 * Compare based on the package part name, using a natural sort order
-	 */
-	@Override
-	public int compareTo(PackagePart other)
-	{
-	    // NOTE could also throw a NullPointerException() if desired
-	    if (other == null)
-	        return -1;
-
-	    return PackagePartName.compare(this._partName, other._partName);
-	}
-
-	/*-------------- Abstract methods ------------- */
-
-	/**
-	 * Abtract method that get the input stream of this part.
-	 *
-	 * @exception IOException
-	 *                Throws if an IO Exception occur in the implementation
-	 *                method.
-	 */
-	protected abstract InputStream getInputStreamImpl() throws IOException;
-
-	/**
-	 * Abstract method that get the output stream of this part.
-	 */
-	protected abstract OutputStream getOutputStreamImpl();
-
-	/**
-	 * Save the content of this part and the associated relationships part (if
-	 * this part own at least one relationship) into the specified output
-	 * stream.
-	 *
-	 * @param zos
-	 *            Output stream to save this part.
-	 * @throws OpenXML4JException
-	 *             If any exception occur.
-	 */
-	public abstract boolean save(OutputStream zos) throws OpenXML4JException;
-
-	/**
-	 * Load the content of this part.
-	 *
-	 * @param ios
-	 *            The input stream of the content to load.
-	 * @return <b>true</b> if the content has been successfully loaded, else
-	 *         <b>false</b>.
-	 * @throws InvalidFormatException
-	 *             Throws if the content format is invalid.
-	 */
-	public abstract boolean load(InputStream ios) throws InvalidFormatException;
-
-	/**
-	 * Close this part : flush this part, close the input stream and output
-	 * stream. After this method call, the part must be available for packaging.
-	 */
-	public abstract void close();
-
-	/**
-	 * Flush the content of this part. If the input stream and/or output stream
-	 * as in a waiting state to read or write, the must to empty their
-	 * respective buffer.
-	 */
-	public abstract void flush();
-
-	/**
-	 * Allows sub-classes to clean up before new data is added.
-	 */
-	public void clear() {
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
deleted file mode 100644
index e4ecbd4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.util.ArrayList;
-import java.util.TreeMap;
-
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-
-/**
- * A package part collection.
- *
- * @author Julien Chable
- * @version 0.1
- */
-public final class PackagePartCollection extends
-		TreeMap<PackagePartName, PackagePart> {
-
-	private static final long serialVersionUID = 2515031135957635515L;
-
-	/**
-	 * Arraylist use to store this collection part names as string for rule
-	 * M1.11 optimized checking.
-	 */
-	private ArrayList<String> registerPartNameStr = new ArrayList<String>();
-
-	@Override
-	public Object clone() {
-		return super.clone();
-	}
-
-	/**
-	 * Check rule [M1.11]: a package implementer shall neither create nor
-	 * recognize a part with a part name derived from another part name by
-	 * appending segments to it.
-	 *
-	 * @exception InvalidOperationException
-	 *                Throws if you try to add a part with a name derived from
-	 *                another part name.
-	 */
-	@Override
-	public PackagePart put(PackagePartName partName, PackagePart part) {
-		String[] segments = partName.getURI().toASCIIString().split(
-				PackagingURIHelper.FORWARD_SLASH_STRING);
-		StringBuffer concatSeg = new StringBuffer();
-		for (String seg : segments) {
-			if (!seg.equals(""))
-				concatSeg.append(PackagingURIHelper.FORWARD_SLASH_CHAR);
-			concatSeg.append(seg);
-			if (this.registerPartNameStr.contains(concatSeg.toString())) {
-				throw new InvalidOperationException(
-						"You can't add a part with a part name derived from another part ! [M1.11]");
-			}
-		}
-		this.registerPartNameStr.add(partName.getName());
-		return super.put(partName, part);
-	}
-
-	@Override
-	public PackagePart remove(Object key) {
-		if (key instanceof PackagePartName) {
-			this.registerPartNameStr.remove(((PackagePartName) key).getName());
-		}
-		return super.remove(key);
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
deleted file mode 100644
index 37ee631..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Locale;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
-
-/**
- * An immutable Open Packaging Convention compliant part name.
- *
- * @author Julien Chable
- *
- * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">http://www.ietf.org/rfc/rfc3986.txt</a>
- */
-public final class PackagePartName implements Comparable<PackagePartName> {
-
-	/**
-	 * Part name stored as an URI.
-	 */
-	private URI partNameURI;
-
-	/*
-	 * URI Characters definition (RFC 3986)
-	 */
-
-	/**
-	 * Reserved characters for sub delimitations.
-	 */
-	private static String[] RFC3986_PCHAR_SUB_DELIMS = { "!", "$", "&", "'",
-			"(", ")", "*", "+", ",", ";", "=" };
-
-	/**
-	 * Unreserved character (+ ALPHA & DIGIT).
-	 */
-	private static String[] RFC3986_PCHAR_UNRESERVED_SUP = { "-", ".", "_", "~" };
-
-	/**
-	 * Authorized reserved characters for pChar.
-	 */
-	private static String[] RFC3986_PCHAR_AUTHORIZED_SUP = { ":", "@" };
-
-	/**
-	 * Flag to know if this part name is from a relationship part name.
-	 */
-	private boolean isRelationship;
-
-	/**
-	 * Constructor. Makes a ValidPartName object from a java.net.URI
-	 *
-	 * @param uri
-	 *            The URI to validate and to transform into ValidPartName.
-	 * @param checkConformance
-	 *            Flag to specify if the contructor have to validate the OPC
-	 *            conformance. Must be always <code>true</code> except for
-	 *            special URI like '/' which is needed for internal use by
-	 *            OpenXML4J but is not valid.
-	 * @throws InvalidFormatException
-	 *             Throw if the specified part name is not conform to Open
-	 *             Packaging Convention specifications.
-	 * @see java.net.URI
-	 */
-	PackagePartName(URI uri, boolean checkConformance)
-			throws InvalidFormatException {
-		if (checkConformance) {
-			throwExceptionIfInvalidPartUri(uri);
-		} else {
-			if (!PackagingURIHelper.PACKAGE_ROOT_URI.equals(uri)) {
-				throw new OpenXML4JRuntimeException(
-						"OCP conformance must be check for ALL part name except special cases : ['/']");
-			}
-		}
-		this.partNameURI = uri;
-		this.isRelationship = isRelationshipPartURI(this.partNameURI);
-	}
-
-	/**
-	 * Constructor. Makes a ValidPartName object from a String part name.
-	 *
-	 * @param partName
-	 *            Part name to valid and to create.
-	 * @param checkConformance
-	 *            Flag to specify if the contructor have to validate the OPC
-	 *            conformance. Must be always <code>true</code> except for
-	 *            special URI like '/' which is needed for internal use by
-	 *            OpenXML4J but is not valid.
-	 * @throws InvalidFormatException
-	 *             Throw if the specified part name is not conform to Open
-	 *             Packaging Convention specifications.
-	 */
-	PackagePartName(String partName, boolean checkConformance)
-			throws InvalidFormatException {
-		URI partURI;
-		try {
-			partURI = new URI(partName);
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException(
-					"partName argmument is not a valid OPC part name !");
-		}
-
-		if (checkConformance) {
-			throwExceptionIfInvalidPartUri(partURI);
-		} else {
-			if (!PackagingURIHelper.PACKAGE_ROOT_URI.equals(partURI)) {
-				throw new OpenXML4JRuntimeException(
-						"OCP conformance must be check for ALL part name except special cases : ['/']");
-			}
-		}
-		this.partNameURI = partURI;
-		this.isRelationship = isRelationshipPartURI(this.partNameURI);
-	}
-
-	/**
-	 * Check if the specified part name is a relationship part name.
-	 *
-	 * @param partUri
-	 *            The URI to check.
-	 * @return <code>true</code> if this part name respect the relationship
-	 *         part naming convention else <code>false</code>.
-	 */
-	private boolean isRelationshipPartURI(URI partUri) {
-		if (partUri == null)
-			throw new IllegalArgumentException("partUri");
-
-		return partUri.getPath().matches(
-				"^.*/" + PackagingURIHelper.RELATIONSHIP_PART_SEGMENT_NAME + "/.*\\"
-						+ PackagingURIHelper.RELATIONSHIP_PART_EXTENSION_NAME
-						+ "$");
-	}
-
-	/**
-	 * Know if this part name is a relationship part name.
-	 *
-	 * @return <code>true</code> if this part name respect the relationship
-	 *         part naming convention else <code>false</code>.
-	 */
-	public boolean isRelationshipPartURI() {
-		return this.isRelationship;
-	}
-
-	/**
-	 * Throws an exception (of any kind) if the specified part name does not
-	 * follow the Open Packaging Convention specifications naming rules.
-	 *
-	 * @param partUri
-	 *            The part name to check.
-	 * @throws Exception
-	 *             Throws if the part name is invalid.
-	 */
-	private static void throwExceptionIfInvalidPartUri(URI partUri)
-			throws InvalidFormatException {
-		if (partUri == null)
-			throw new IllegalArgumentException("partUri");
-		// Check if the part name URI is empty [M1.1]
-		throwExceptionIfEmptyURI(partUri);
-
-		// Check if the part name URI is absolute
-		throwExceptionIfAbsoluteUri(partUri);
-
-		// Check if the part name URI starts with a forward slash [M1.4]
-		throwExceptionIfPartNameNotStartsWithForwardSlashChar(partUri);
-
-		// Check if the part name URI ends with a forward slash [M1.5]
-		throwExceptionIfPartNameEndsWithForwardSlashChar(partUri);
-
-		// Check if the part name does not have empty segments. [M1.3]
-		// Check if a segment ends with a dot ('.') character. [M1.9]
-		throwExceptionIfPartNameHaveInvalidSegments(partUri);
-	}
-
-	/**
-	 * Throws an exception if the specified URI is empty. [M1.1]
-	 *
-	 * @param partURI
-	 *            Part URI to check.
-	 * @throws InvalidFormatException
-	 *             If the specified URI is empty.
-	 */
-	private static void throwExceptionIfEmptyURI(URI partURI)
-			throws InvalidFormatException {
-		if (partURI == null)
-			throw new IllegalArgumentException("partURI");
-
-		String uriPath = partURI.getPath();
-		if (uriPath.length() == 0
-				|| ((uriPath.length() == 1) && (uriPath.charAt(0) == PackagingURIHelper.FORWARD_SLASH_CHAR)))
-			throw new InvalidFormatException(
-					"A part name shall not be empty [M1.1]: "
-							+ partURI.getPath());
-	}
-
-	/**
-	 * Throws an exception if the part name has empty segments. [M1.3]
-	 *
-	 * Throws an exception if a segment any characters other than pchar
-	 * characters. [M1.6]
-	 *
-	 * Throws an exception if a segment contain percent-encoded forward slash
-	 * ('/'), or backward slash ('\') characters. [M1.7]
-	 *
-	 * Throws an exception if a segment contain percent-encoded unreserved
-	 * characters. [M1.8]
-	 *
-	 * Throws an exception if the specified part name's segments end with a dot
-	 * ('.') character. [M1.9]
-	 *
-	 * Throws an exception if a segment doesn't include at least one non-dot
-	 * character. [M1.10]
-	 *
-	 * @param partUri
-	 *            The part name to check.
-	 * @throws InvalidFormatException
-	 *             if the specified URI contain an empty segments or if one the
-	 *             segments contained in the part name, ends with a dot ('.')
-	 *             character.
-	 */
-	private static void throwExceptionIfPartNameHaveInvalidSegments(URI partUri)
-			throws InvalidFormatException {
-		if (partUri == null) {
-			throw new IllegalArgumentException("partUri");
-		}
-
-		// Split the URI into several part and analyze each
-		String[] segments = partUri.toASCIIString().split("/");
-		if (segments.length <= 1 || !segments[0].equals(""))
-			throw new InvalidFormatException(
-					"A part name shall not have empty segments [M1.3]: "
-							+ partUri.getPath());
-
-		for (int i = 1; i < segments.length; ++i) {
-			String seg = segments[i];
-			if (seg == null || "".equals(seg)) {
-				throw new InvalidFormatException(
-						"A part name shall not have empty segments [M1.3]: "
-								+ partUri.getPath());
-			}
-
-			if (seg.endsWith(".")) {
-				throw new InvalidFormatException(
-						"A segment shall not end with a dot ('.') character [M1.9]: "
-								+ partUri.getPath());
-			}
-
-			if ("".equals(seg.replaceAll("\\\\.", ""))) {
-				// Normally will never been invoked with the previous
-				// implementation rule [M1.9]
-				throw new InvalidFormatException(
-						"A segment shall include at least one non-dot character. [M1.10]: "
-								+ partUri.getPath());
-			}
-
-			// Check for rule M1.6, M1.7, M1.8
-			checkPCharCompliance(seg);
-		}
-	}
-
-	/**
-	 * Throws an exception if a segment any characters other than pchar
-	 * characters. [M1.6]
-	 *
-	 * Throws an exception if a segment contain percent-encoded forward slash
-	 * ('/'), or backward slash ('\') characters. [M1.7]
-	 *
-	 * Throws an exception if a segment contain percent-encoded unreserved
-	 * characters. [M1.8]
-	 *
-	 * @param segment
-	 *            The segment to check
-	 */
-	private static void checkPCharCompliance(String segment)
-			throws InvalidFormatException {
-		boolean errorFlag;
-		final int length = segment.length();
-		for (int i = 0; i < length; ++i) {
-			char c = segment.charAt(i);
-			errorFlag = true;
-
-			/* Check rule M1.6 */
-
-			// Check for digit or letter
-			if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')
-					|| (c >= '0' && c <= '9')) {
-				errorFlag = false;
-			} else {
-				// Check "-", ".", "_", "~"
-				for (int j = 0; j < RFC3986_PCHAR_UNRESERVED_SUP.length; ++j) {
-					if (c == RFC3986_PCHAR_UNRESERVED_SUP[j].charAt(0)) {
-						errorFlag = false;
-						break;
-					}
-				}
-
-				// Check ":", "@"
-				for (int j = 0; errorFlag
-						&& j < RFC3986_PCHAR_AUTHORIZED_SUP.length; ++j) {
-					if (c == RFC3986_PCHAR_AUTHORIZED_SUP[j].charAt(0)) {
-						errorFlag = false;
-					}
-				}
-
-				// Check "!", "$", "&", "'", "(", ")", "*", "+", ",", ";", "="
-				for (int j = 0; errorFlag
-						&& j < RFC3986_PCHAR_SUB_DELIMS.length; ++j) {
-					if (c == RFC3986_PCHAR_SUB_DELIMS[j].charAt(0)) {
-						errorFlag = false;
-					}
-				}
-			}
-
-			if (errorFlag && c == '%') {
-				// We certainly found an encoded character, check for length
-				// now ( '%' HEXDIGIT HEXDIGIT)
-				if (((length - i) < 2)) {
-					throw new InvalidFormatException("The segment " + segment
-							+ " contain invalid encoded character !");
-				}
-
-				// If not percent encoded character error occur then reset the
-				// flag -> the character is valid
-				errorFlag = false;
-
-				// Decode the encoded character
-				char decodedChar = (char) Integer.parseInt(segment.substring(
-						i + 1, i + 3), 16);
-				i += 2;
-
-				/* Check rule M1.7 */
-				if (decodedChar == '/' || decodedChar == '\\')
-					throw new InvalidFormatException(
-							"A segment shall not contain percent-encoded forward slash ('/'), or backward slash ('\') characters. [M1.7]");
-
-				/* Check rule M1.8 */
-
-				// Check for unreserved character like define in RFC3986
-				if ((decodedChar >= 'A' && decodedChar <= 'Z')
-						|| (decodedChar >= 'a' && decodedChar <= 'z')
-						|| (decodedChar >= '0' && decodedChar <= '9'))
-					errorFlag = true;
-
-				// Check for unreserved character "-", ".", "_", "~"
-				for (int j = 0; !errorFlag
-						&& j < RFC3986_PCHAR_UNRESERVED_SUP.length; ++j) {
-					if (c == RFC3986_PCHAR_UNRESERVED_SUP[j].charAt(0)) {
-						errorFlag = true;
-						break;
-					}
-				}
-				if (errorFlag)
-					throw new InvalidFormatException(
-							"A segment shall not contain percent-encoded unreserved characters. [M1.8]");
-			}
-
-			if (errorFlag)
-				throw new InvalidFormatException(
-						"A segment shall not hold any characters other than pchar characters. [M1.6]");
-		}
-	}
-
-	/**
-	 * Throws an exception if the specified part name doesn't start with a
-	 * forward slash character '/'. [M1.4]
-	 *
-	 * @param partUri
-	 *            The part name to check.
-	 * @throws InvalidFormatException
-	 *             If the specified part name doesn't start with a forward slash
-	 *             character '/'.
-	 */
-	private static void throwExceptionIfPartNameNotStartsWithForwardSlashChar(
-			URI partUri) throws InvalidFormatException {
-		String uriPath = partUri.getPath();
-		if (uriPath.length() > 0
-				&& uriPath.charAt(0) != PackagingURIHelper.FORWARD_SLASH_CHAR)
-			throw new InvalidFormatException(
-					"A part name shall start with a forward slash ('/') character [M1.4]: "
-							+ partUri.getPath());
-	}
-
-	/**
-	 * Throws an exception if the specified part name ends with a forwar slash
-	 * character '/'. [M1.5]
-	 *
-	 * @param partUri
-	 *            The part name to check.
-	 * @throws InvalidFormatException
-	 *             If the specified part name ends with a forwar slash character
-	 *             '/'.
-	 */
-	private static void throwExceptionIfPartNameEndsWithForwardSlashChar(
-			URI partUri) throws InvalidFormatException {
-		String uriPath = partUri.getPath();
-		if (uriPath.length() > 0
-				&& uriPath.charAt(uriPath.length() - 1) == PackagingURIHelper.FORWARD_SLASH_CHAR)
-			throw new InvalidFormatException(
-					"A part name shall not have a forward slash as the last character [M1.5]: "
-							+ partUri.getPath());
-	}
-
-	/**
-	 * Throws an exception if the specified URI is absolute.
-	 *
-	 * @param partUri
-	 *            The URI to check.
-	 * @throws InvalidFormatException
-	 *             Throws if the specified URI is absolute.
-	 */
-	private static void throwExceptionIfAbsoluteUri(URI partUri)
-			throws InvalidFormatException {
-		if (partUri.isAbsolute())
-			throw new InvalidFormatException("Absolute URI forbidden: "
-					+ partUri);
-	}
-
-	/**
-	 * Compare two part names following the rule M1.12 :
-	 *
-	 * Part name equivalence is determined by comparing part names as
-	 * case-insensitive ASCII strings. Packages shall not contain equivalent
-	 * part names and package implementers shall neither create nor recognize
-	 * packages with equivalent part names. [M1.12]
-	 */
-        @Override
-        public int compareTo(PackagePartName other)
-        {
-            // compare with natural sort order
-            return compare(this, other);
-        }
-
-
-	/**
-	 * Retrieves the extension of the part name if any. If there is no extension
-	 * returns an empty String. Example : '/document/content.xml' => 'xml'
-	 *
-	 * @return The extension of the part name.
-	 */
-	public String getExtension() {
-		String fragment = this.partNameURI.getPath();
-		if (fragment.length() > 0) {
-			int i = fragment.lastIndexOf(".");
-			if (i > -1)
-				return fragment.substring(i + 1);
-		}
-		return "";
-	}
-
-	/**
-	 * Get this part name.
-	 *
-	 * @return The name of this part name.
-	 */
-	public String getName() {
-		return this.partNameURI.toASCIIString();
-	}
-
-	/**
-	 * Part name equivalence is determined by comparing part names as
-	 * case-insensitive ASCII strings. Packages shall not contain equivalent
-	 * part names and package implementers shall neither create nor recognize
-	 * packages with equivalent part names. [M1.12]
-	 */
-	@Override
-	public boolean equals(Object other) {
-            if (other instanceof PackagePartName) {
-                // String.equals() is compatible with our compareTo(), but cheaper
-                return this.partNameURI.toASCIIString().toLowerCase(Locale.ROOT).equals
-                (
-                    ((PackagePartName) other).partNameURI.toASCIIString().toLowerCase(Locale.ROOT)
-                );
-            } else {
-                return false;
-            }
-        }
-
-	@Override
-	public int hashCode() {
-		return this.partNameURI.toASCIIString().toLowerCase(Locale.ROOT).hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return getName();
-	}
-
-	/* Getters and setters */
-
-	/**
-	 * Part name property getter.
-	 *
-	 * @return This part name URI.
-	 */
-	public URI getURI() {
-		return this.partNameURI;
-	}
-
-
-    /**
-     * A natural sort order for package part names, consistent with the
-     * requirements of {@code java.util.Comparator}, but simply implemented
-     * as a static method.
-     * <p>
-     * For example, this sorts "file10.png" after "file2.png" (comparing the
-     * numerical portion), but sorts "File10.png" before "file2.png"
-     * (lexigraphical sort)
-     *
-     * <p>
-     * When comparing part names, the rule M1.12 is followed:
-     *
-     * Part name equivalence is determined by comparing part names as
-     * case-insensitive ASCII strings. Packages shall not contain equivalent
-     * part names and package implementers shall neither create nor recognize
-     * packages with equivalent part names. [M1.12]
-     */
-    public static int compare(PackagePartName obj1, PackagePartName obj2)
-    {
-        // NOTE could also throw a NullPointerException() if desired
-        if (obj1 == null)
-        {
-            // (null) == (null), (null) < (non-null)
-            return (obj2 == null ? 0 : -1);
-        }
-        else if (obj2 == null)
-        {
-            // (non-null) > (null)
-            return 1;
-        }
-
-        return compare
-        (
-            obj1.getURI().toASCIIString().toLowerCase(Locale.ROOT),
-            obj2.getURI().toASCIIString().toLowerCase(Locale.ROOT)
-        );
-    }
-
-
-    /**
-     * A natural sort order for strings, consistent with the
-     * requirements of {@code java.util.Comparator}, but simply implemented
-     * as a static method.
-     * <p>
-     * For example, this sorts "file10.png" after "file2.png" (comparing the
-     * numerical portion), but sorts "File10.png" before "file2.png"
-     * (lexigraphical sort)
-     */
-    public static int compare(String str1, String str2)
-    {
-        if (str1 == null)
-        {
-            // (null) == (null), (null) < (non-null)
-            return (str2 == null ? 0 : -1);
-        }
-        else if (str2 == null)
-        {
-            // (non-null) > (null)
-            return 1;
-        }
-
-        int len1 = str1.length();
-        int len2 = str2.length();
-        for (int idx1 = 0, idx2 = 0; idx1 < len1 && idx2 < len2; /*nil*/)
-        {
-            char c1 = str1.charAt(idx1++);
-            char c2 = str2.charAt(idx2++);
-
-            if (Character.isDigit(c1) && Character.isDigit(c2))
-            {
-                int beg1 = idx1 - 1;  // undo previous increment
-                while (idx1 < len1 && Character.isDigit(str1.charAt(idx1)))
-                {
-                    ++idx1;
-                }
-
-                int beg2 = idx2 - 1;  // undo previous increment
-                while (idx2 < len2 && Character.isDigit(str2.charAt(idx2)))
-                {
-                    ++idx2;
-                }
-
-                // note: BigInteger for extra safety
-                int cmp = new BigInteger(str1.substring(beg1, idx1)).compareTo
-                (
-                    new BigInteger(str2.substring(beg2, idx2))
-                );
-                if (cmp != 0) return cmp;
-            }
-            else if (c1 != c2)
-            {
-                return (c1 - c2);
-            }
-        }
-
-        return (len1 - len2);
-    }
-
-}
-
-/* ************************************************************************** */
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageProperties.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageProperties.java
deleted file mode 100644
index 3013af4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageProperties.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.util.Date;
-
-import org.apache.poi.openxml4j.util.Nullable;
-
-/**
- * Represents the core properties of an OPC package.
- * 
- * @author Julien Chable
- * @version 1.0
- * @see org.apache.poi.openxml4j.opc.OPCPackage
- */
-public interface PackageProperties {
-	
-	/**
-	 * Dublin Core Terms URI.
-	 */
-	public final static String NAMESPACE_DCTERMS = "http://purl.org/dc/terms/";
-	
-	/**
-	 * Dublin Core namespace URI.
-	 */
-	public final static String NAMESPACE_DC = "http://purl.org/dc/elements/1.1/";
-
-	/* Getters and setters */
-
-	/**
-	 * Set the category of the content of this package.
-	 */
-	public abstract Nullable<String> getCategoryProperty();
-
-	/**
-	 * Set the category of the content of this package.
-	 */
-	public abstract void setCategoryProperty(String category);
-
-	/**
-	 * Set the status of the content.
-	 */
-	public abstract Nullable<String> getContentStatusProperty();
-
-	/**
-	 * Get the status of the content.
-	 */
-	public abstract void setContentStatusProperty(String contentStatus);
-
-	/**
-	 * Get the type of content represented, generally defined by a specific use
-	 * and intended audience.
-	 */
-	public abstract Nullable<String> getContentTypeProperty();
-
-	/**
-	 * Set the type of content represented, generally defined by a specific use
-	 * and intended audience.
-	 */
-	public abstract void setContentTypeProperty(String contentType);
-
-	/**
-	 * Get the date of creation of the resource.
-	 */
-	public abstract Nullable<Date> getCreatedProperty();
-
-	/**
-	 * Set the date of creation of the resource.
-	 */
-	public abstract void setCreatedProperty(String created);
-	
-	/**
-	 * Set the date of creation of the resource.
-	 */
-	public abstract void setCreatedProperty(Nullable<Date> created);
-
-	/**
-	 * Get the entity primarily responsible for making the content of the
-	 * resource.
-	 */
-	public abstract Nullable<String> getCreatorProperty();
-
-	/**
-	 * Set the entity primarily responsible for making the content of the
-	 * resource.
-	 */
-	public abstract void setCreatorProperty(String creator);
-
-	/**
-	 * Get the explanation of the content of the resource.
-	 */
-	public abstract Nullable<String> getDescriptionProperty();
-
-	/**
-	 * Set the explanation of the content of the resource.
-	 */
-	public abstract void setDescriptionProperty(String description);
-
-	/**
-	 * Get an unambiguous reference to the resource within a given context.
-	 */
-	public abstract Nullable<String> getIdentifierProperty();
-
-	/**
-	 * Set an unambiguous reference to the resource within a given context.
-	 */
-	public abstract void setIdentifierProperty(String identifier);
-
-	/**
-	 * Get a delimited set of keywords to support searching and indexing. This
-	 * is typically a list of terms that are not available elsewhere in the
-	 * properties
-	 */
-	public abstract Nullable<String> getKeywordsProperty();
-
-	/**
-	 * Set a delimited set of keywords to support searching and indexing. This
-	 * is typically a list of terms that are not available elsewhere in the
-	 * properties
-	 */
-	public abstract void setKeywordsProperty(String keywords);
-
-	/**
-	 * Get the language of the intellectual content of the resource.
-	 */
-	public abstract Nullable<String> getLanguageProperty();
-
-	/**
-	 * Set the language of the intellectual content of the resource.
-	 */
-	public abstract void setLanguageProperty(String language);
-
-	/**
-	 * Get the user who performed the last modification.
-	 */
-	public abstract Nullable<String> getLastModifiedByProperty();
-
-	/**
-	 * Set the user who performed the last modification.
-	 */
-	public abstract void setLastModifiedByProperty(String lastModifiedBy);
-
-	/**
-	 * Get the date and time of the last printing.
-	 */
-	public abstract Nullable<Date> getLastPrintedProperty();
-
-	/**
-	 * Set the date and time of the last printing.
-	 */
-	public abstract void setLastPrintedProperty(String lastPrinted);
-	
-	/**
-	 * Set the date and time of the last printing.
-	 */
-	public abstract void setLastPrintedProperty(Nullable<Date> lastPrinted);
-
-	/**
-	 * Get the date on which the resource was changed.
-	 */
-	public abstract Nullable<Date> getModifiedProperty();
-
-	/**
-	 * Set the date on which the resource was changed.
-	 */
-	public abstract void setModifiedProperty(String modified);
-	
-	/**
-	 * Set the date on which the resource was changed.
-	 */
-	public abstract void setModifiedProperty(Nullable<Date> modified);
-
-	/**
-	 * Get the revision number.
-	 */
-	public abstract Nullable<String> getRevisionProperty();
-
-	/**
-	 * Set the revision number.
-	 */
-	public abstract void setRevisionProperty(String revision);
-
-	/**
-	 * Get the topic of the content of the resource.
-	 */
-	public abstract Nullable<String> getSubjectProperty();
-
-	/**
-	 * Set the topic of the content of the resource.
-	 */
-	public abstract void setSubjectProperty(String subject);
-
-	/**
-	 * Get the name given to the resource.
-	 */
-	public abstract Nullable<String> getTitleProperty();
-
-	/**
-	 * Set the name given to the resource.
-	 */
-	public abstract void setTitleProperty(String title);
-
-	/**
-	 * Get the version number.
-	 */
-	public abstract Nullable<String> getVersionProperty();
-
-	/**
-	 * Set the version number.
-	 */
-	public abstract void setVersionProperty(String version);
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
deleted file mode 100644
index 90ee15e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * A part relationship.
- *
- * @author Julien Chable
- * @version 1.0
- */
-public final class PackageRelationship {
-
-	private static URI containerRelationshipPart;
-
-	static {
-		try {
-			containerRelationshipPart = new URI("/_rels/.rels");
-		} catch (URISyntaxException e) {
-			// Do nothing
-		}
-	}
-
-	/* XML markup */
-
-	public static final String ID_ATTRIBUTE_NAME = "Id";
-
-	public static final String RELATIONSHIPS_TAG_NAME = "Relationships";
-
-	public static final String RELATIONSHIP_TAG_NAME = "Relationship";
-
-	public static final String TARGET_ATTRIBUTE_NAME = "Target";
-
-	public static final String TARGET_MODE_ATTRIBUTE_NAME = "TargetMode";
-
-	public static final String TYPE_ATTRIBUTE_NAME = "Type";
-
-	/* End XML markup */
-
-	/**
-	 * Relation id.
-	 */
-	private String id;
-
-	/**
-	 * Reference to the package.
-	 */
-	private OPCPackage container;
-
-	/**
-	 * Relationship type
-	 */
-	private String relationshipType;
-
-	/**
-	 * Part of this relationship source
-	 */
-	private PackagePart source;
-
-	/**
-	 * Targeting mode [Internal|External]
-	 */
-	private TargetMode targetMode;
-
-	/**
-	 * Target URI
-	 */
-	private URI targetUri;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param pkg
-	 * @param sourcePart
-	 * @param targetUri
-	 * @param targetMode
-	 * @param relationshipType
-	 * @param id
-	 */
-	public PackageRelationship(OPCPackage pkg, PackagePart sourcePart,
-			URI targetUri, TargetMode targetMode, String relationshipType,
-			String id) {
-		if (pkg == null)
-			throw new IllegalArgumentException("pkg");
-		if (targetUri == null)
-			throw new IllegalArgumentException("targetUri");
-		if (relationshipType == null)
-			throw new IllegalArgumentException("relationshipType");
-		if (id == null)
-			throw new IllegalArgumentException("id");
-
-		this.container = pkg;
-		this.source = sourcePart;
-		this.targetUri = targetUri;
-		this.targetMode = targetMode;
-		this.relationshipType = relationshipType;
-		this.id = id;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (!(obj instanceof PackageRelationship)) {
-			return false;
-		}
-		PackageRelationship rel = (PackageRelationship) obj;
-		return (this.id.equals(rel.id)
-				&& this.relationshipType.equals(rel.relationshipType)
-				&& (rel.source != null ? rel.source.equals(this.source) : true)
-				&& this.targetMode == rel.targetMode && this.targetUri
-				.equals(rel.targetUri));
-	}
-
-	@Override
-	public int hashCode() {
-		return this.id.hashCode()
-                + this.relationshipType.hashCode()
-				+ (this.source == null ? 0 : this.source.hashCode())
-                + this.targetMode.hashCode()
-				+ this.targetUri.hashCode();
-	}
-
-	/* Getters */
-
-	public static URI getContainerPartRelationship() {
-		return containerRelationshipPart;
-	}
-
-	/**
-	 * @return the container
-	 */
-	public OPCPackage getPackage() {
-		return container;
-	}
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @return the relationshipType
-	 */
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	/**
-	 * @return the source
-	 */
-	public PackagePart getSource() {
-		return source;
-	}
-
-	/**
-	 *
-	 * @return URL of the source part of this relationship
-	 */
-	public URI getSourceURI() {
-		if (source == null) {
-			return PackagingURIHelper.PACKAGE_ROOT_URI;
-		}
-		return source._partName.getURI();
-	}
-
-	/**
-	 * @return the targetMode
-	 */
-	public TargetMode getTargetMode() {
-		return targetMode;
-	}
-
-	/**
-	 * @return the targetUri
-	 */
-	public URI getTargetURI() {
-		// If it's an external target, we don't
-		//  need to apply our normal validation rules
-		if(targetMode == TargetMode.EXTERNAL) {
-			return targetUri;
-		}
-
-		// Internal target
-		// If it isn't absolute, resolve it relative
-		//  to ourselves
-		if (!targetUri.toASCIIString().startsWith("/")) {
-			// So it's a relative part name, try to resolve it
-			return PackagingURIHelper.resolvePartUri(getSourceURI(), targetUri);
-		}
-		return targetUri;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(id == null ? "id=null" : "id=" + id);
-		sb.append(container == null ? " - container=null" : " - container="
-				+ container.toString());
-		sb.append(relationshipType == null ? " - relationshipType=null"
-				: " - relationshipType=" + relationshipType);
-		sb.append(source == null ? " - source=null" : " - source="
-				+ getSourceURI().toASCIIString());
-		sb.append(targetUri == null ? " - target=null" : " - target="
-				+ getTargetURI().toASCIIString());
-		sb.append(targetMode == null ? ",targetMode=null" : ",targetMode="
-				+ targetMode.toString());
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
deleted file mode 100644
index 665c51f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.opc;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.TreeMap;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * Represents a collection of PackageRelationship elements that are owned by a
- * given PackagePart or the Package.
- *
- * @author Julien Chable, CDubettier
- * @version 0.1
- */
-public final class PackageRelationshipCollection implements
-        Iterable<PackageRelationship> {
-
-    private static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class);
-
-    /**
-     * Package relationships ordered by ID.
-     */
-    private TreeMap<String, PackageRelationship> relationshipsByID;
-
-    /**
-     * Package relationships ordered by type.
-     */
-    private TreeMap<String, PackageRelationship> relationshipsByType;
-
-    /**
-     * This relationshipPart.
-     */
-    private PackagePart relationshipPart;
-
-    /**
-     * Source part.
-     */
-    private PackagePart sourcePart;
-
-    /**
-     * This part name.
-     */
-    private PackagePartName partName;
-
-    /**
-     * Reference to the package.
-     */
-    private OPCPackage container;
-    
-    /**
-     * The ID number of the next rID# to generate, or -1
-     *  if that is still to be determined.
-     */
-    private int nextRelationshipId = -1;
-
-    /**
-     * Constructor.
-     */
-    PackageRelationshipCollection() {
-        relationshipsByID = new TreeMap<String, PackageRelationship>();
-        relationshipsByType = new TreeMap<String, PackageRelationship>();
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * This collection will contain only elements from the specified collection
-     * for which the type is compatible with the specified relationship type
-     * filter.
-     *
-     * @param coll
-     *            Collection to import.
-     * @param filter
-     *            Relationship type filter.
-     */
-    public PackageRelationshipCollection(PackageRelationshipCollection coll,
-            String filter) {
-        this();
-        for (PackageRelationship rel : coll.relationshipsByID.values()) {
-            if (filter == null || rel.getRelationshipType().equals(filter))
-                addRelationship(rel);
-        }
-    }
-
-    /**
-     * Constructor.
-     */
-    public PackageRelationshipCollection(OPCPackage container)
-            throws InvalidFormatException {
-        this(container, null);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @throws InvalidFormatException
-     *             Throws if the format of the content part is invalid.
-     *
-     * @throws InvalidOperationException
-     *             Throws if the specified part is a relationship part.
-     */
-    public PackageRelationshipCollection(PackagePart part)
-            throws InvalidFormatException {
-        this(part._container, part);
-    }
-
-    /**
-     * Constructor. Parse the existing package relationship part if one exists.
-     *
-     * @param container
-     *            The parent package.
-     * @param part
-     *            The part that own this relationships collection. If <b>null</b>
-     *            then this part is considered as the package root.
-     * @throws InvalidFormatException
-     *             If an error occurs during the parsing of the relatinships
-     *             part fo the specified part.
-     */
-    public PackageRelationshipCollection(OPCPackage container, PackagePart part)
-            throws InvalidFormatException {
-        this();
-
-        if (container == null)
-            throw new IllegalArgumentException("container");
-
-        // Check if the specified part is not a relationship part
-        if (part != null && part.isRelationshipPart())
-            throw new IllegalArgumentException("part");
-
-        this.container = container;
-        this.sourcePart = part;
-        this.partName = getRelationshipPartName(part);
-        if ((container.getPackageAccess() != PackageAccess.WRITE)
-                && container.containPart(this.partName)) {
-            relationshipPart = container.getPart(this.partName);
-            parseRelationshipsPart(relationshipPart);
-        }
-    }
-
-    /**
-     * Get the relationship part name of the specified part.
-     *
-     * @param part
-     *            The part .
-     * @return The relationship part name of the specified part. Be careful,
-     *         only the correct name is returned, this method does not check if
-     *         the part really exist in a package !
-     * @throws InvalidOperationException
-     *             Throws if the specified part is a relationship part.
-     */
-    private static PackagePartName getRelationshipPartName(PackagePart part)
-            throws InvalidOperationException {
-        PackagePartName partName;
-        if (part == null) {
-            partName = PackagingURIHelper.PACKAGE_ROOT_PART_NAME;
-        } else {
-            partName = part.getPartName();
-        }
-        return PackagingURIHelper.getRelationshipPartName(partName);
-    }
-
-    /**
-     * Add the specified relationship to the collection.
-     *
-     * @param relPart
-     *            The relationship to add.
-     */
-    public void addRelationship(PackageRelationship relPart) {
-        relationshipsByID.put(relPart.getId(), relPart);
-        relationshipsByType.put(relPart.getRelationshipType(), relPart);
-    }
-
-    /**
-     * Add a relationship to the collection.
-     *
-     * @param targetUri
-     *            Target URI.
-     * @param targetMode
-     *            The target mode : INTERNAL or EXTERNAL
-     * @param relationshipType
-     *            Relationship type.
-     * @param id
-     *            Relationship ID.
-     * @return The newly created relationship.
-     * @see PackageAccess
-     */
-    public PackageRelationship addRelationship(URI targetUri,
-            TargetMode targetMode, String relationshipType, String id) {
-      if (id == null) {
-         // Generate a unique ID is id parameter is null.
-         if (nextRelationshipId == -1) {
-            nextRelationshipId = size() + 1;
-         }
-
-         // Work up until we find a unique number (there could be gaps etc)
-         do {
-            id = "rId" + nextRelationshipId++;
-         } while (relationshipsByID.get(id) != null);
-      }
-
-        PackageRelationship rel = new PackageRelationship(container,
-                sourcePart, targetUri, targetMode, relationshipType, id);
-        relationshipsByID.put(rel.getId(), rel);
-        relationshipsByType.put(rel.getRelationshipType(), rel);
-        return rel;
-    }
-
-    /**
-     * Remove a relationship by its ID.
-     *
-     * @param id
-     *            The relationship ID to remove.
-     */
-    public void removeRelationship(String id) {
-        if (relationshipsByID != null && relationshipsByType != null) {
-            PackageRelationship rel = relationshipsByID.get(id);
-            if (rel != null) {
-                relationshipsByID.remove(rel.getId());
-                relationshipsByType.values().remove(rel);
-            }
-        }
-    }
-
-    /**
-     * Remove a relationship by its reference.
-     *
-     * @param rel
-     *            The relationship to delete.
-     */
-    public void removeRelationship(PackageRelationship rel) {
-        if (rel == null)
-            throw new IllegalArgumentException("rel");
-
-        relationshipsByID.values().remove(rel);
-        relationshipsByType.values().remove(rel);
-    }
-
-    /**
-     * Retrieves a relationship by its index in the collection.
-     *
-     * @param index
-     *            Must be a value between [0-relationships_count-1]
-     */
-    public PackageRelationship getRelationship(int index) {
-        if (index < 0 || index > relationshipsByID.values().size())
-            throw new IllegalArgumentException("index");
-
-        int i = 0;
-        for (PackageRelationship rel : relationshipsByID.values()) {
-            if (index == i++)
-                return rel;
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieves a package relationship based on its id.
-     *
-     * @param id
-     *            ID of the package relationship to retrieve.
-     * @return The package relationship identified by the specified id.
-     */
-    public PackageRelationship getRelationshipByID(String id) {
-        return relationshipsByID.get(id);
-    }
-
-    /**
-     * Get the numbe rof relationships in the collection.
-     */
-    public int size() {
-        return relationshipsByID.values().size();
-    }
-
-    /**
-     * Parse the relationship part and add all relationship in this collection.
-     *
-     * @param relPart
-     *            The package part to parse.
-     * @throws InvalidFormatException
-     *             Throws if the relationship part is invalid.
-     */
-    public void parseRelationshipsPart(PackagePart relPart)
-            throws InvalidFormatException {
-        try {
-            logger.log(POILogger.DEBUG, "Parsing relationship: " + relPart.getPartName());
-            Document xmlRelationshipsDoc = DocumentHelper.readDocument(relPart.getInputStream());
-
-            // Browse default types
-            Element root = xmlRelationshipsDoc.getDocumentElement();
-
-            // Check OPC compliance M4.1 rule
-            boolean fCorePropertiesRelationship = false;
-
-            NodeList nodeList = root.getElementsByTagNameNS(PackageNamespaces.RELATIONSHIPS, PackageRelationship.RELATIONSHIP_TAG_NAME);
-            int nodeCount = nodeList.getLength();
-            for (int i = 0; i < nodeCount; i++) {
-                Element element = (Element)nodeList.item(i);
-                // Relationship ID
-                String id = element.getAttribute(PackageRelationship.ID_ATTRIBUTE_NAME);
-                // Relationship type
-                String type = element.getAttribute(PackageRelationship.TYPE_ATTRIBUTE_NAME);
-
-                /* Check OPC Compliance */
-                // Check Rule M4.1
-                if (type.equals(PackageRelationshipTypes.CORE_PROPERTIES))
-                    if (!fCorePropertiesRelationship)
-                        fCorePropertiesRelationship = true;
-                    else
-                        throw new InvalidFormatException(
-                                "OPC Compliance error [M4.1]: there is more than one core properties relationship in the package !");
-
-                /* End OPC Compliance */
-
-                // TargetMode (default value "Internal")
-                Attr targetModeAttr = element.getAttributeNode(PackageRelationship.TARGET_MODE_ATTRIBUTE_NAME);
-                TargetMode targetMode = TargetMode.INTERNAL;
-                if (targetModeAttr != null) {
-                    targetMode = targetModeAttr.getValue().toLowerCase(Locale.ROOT)
-                            .equals("internal") ? TargetMode.INTERNAL
-                            : TargetMode.EXTERNAL;
-                }
-
-                // Target converted in URI
-                URI target = PackagingURIHelper.toURI("http://invalid.uri"); // dummy url
-                String value = element.getAttribute(PackageRelationship.TARGET_ATTRIBUTE_NAME);
-                try {
-                    // when parsing of the given uri fails, we can either
-                    // ignore this relationship, which leads to IllegalStateException
-                    // later on, or use a dummy value and thus enable processing of the
-                    // package
-                    target = PackagingURIHelper.toURI(value);
-                } catch (URISyntaxException e) {
-                    logger.log(POILogger.ERROR, "Cannot convert " + value
-                            + " in a valid relationship URI-> dummy-URI used", e);
-                }
-                addRelationship(target, targetMode, type, id);
-            }
-        } catch (Exception e) {
-            logger.log(POILogger.ERROR, e);
-            throw new InvalidFormatException(e.getMessage());
-        }
-    }
-
-    /**
-     * Retrieves all relations with the specified type.
-     *
-     * @param typeFilter
-     *            Relationship type filter. If <b>null</b> then all
-     *            relationships are returned.
-     * @return All relationships of the type specified by the filter.
-     */
-    public PackageRelationshipCollection getRelationships(String typeFilter) {
-        PackageRelationshipCollection coll = new PackageRelationshipCollection(
-                this, typeFilter);
-        return coll;
-    }
-
-    /**
-     * Get this collection's iterator.
-     */
-    public Iterator<PackageRelationship> iterator() {
-        return relationshipsByID.values().iterator();
-    }
-
-    /**
-     * Get an iterator of a collection with all relationship with the specified
-     * type.
-     *
-     * @param typeFilter
-     *            Type filter.
-     * @return An iterator to a collection containing all relationships with the
-     *         specified type contain in this collection.
-     */
-    public Iterator<PackageRelationship> iterator(String typeFilter) {
-        ArrayList<PackageRelationship> retArr = new ArrayList<PackageRelationship>();
-        for (PackageRelationship rel : relationshipsByID.values()) {
-            if (rel.getRelationshipType().equals(typeFilter))
-                retArr.add(rel);
-        }
-        return retArr.iterator();
-    }
-
-    /**
-     * Clear all relationships.
-     */
-    public void clear() {
-        relationshipsByID.clear();
-        relationshipsByType.clear();
-    }
-
-    @Override
-    public String toString() {
-        String str;
-        if (relationshipsByID == null) {
-            str = "relationshipsByID=null";
-        } else {
-            str = relationshipsByID.size() + " relationship(s) = [";
-        }
-        if ((relationshipPart != null) && (relationshipPart._partName != null)) {
-            str = str + "," + relationshipPart._partName;
-        } else {
-            str = str + ",relationshipPart=null";
-        }
-
-        // Source of this relationship
-        if ((sourcePart != null) && (sourcePart._partName != null)) {
-            str = str + "," + sourcePart._partName;
-        } else {
-            str = str + ",sourcePart=null";
-        }
-        if (partName != null) {
-            str = str + "," + partName;
-        } else {
-            str = str + ",uri=null)";
-        }
-        return str + "]";
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
deleted file mode 100644
index 5d9801c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-/**
- * Relationship types.
- */
-public interface PackageRelationshipTypes {
-    /**
-     * Core properties relationship type.
-     *
-     *  <p>
-     *  The standard specifies a source relations ship for the Core File Properties part as follows:
-     *  <code>http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties.</code>
-     *  </p>
-     *  <p>
-     *   Office uses the following source relationship for the Core File Properties part:
-     *   <code>http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties.</code>
-     * </p>
-     * See 2.1.33 Part 1 Section 15.2.11.1, Core File Properties Part in [MS-OE376].pdf
-     */
-    String CORE_PROPERTIES = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
-
-    /**
-     * Core properties relationship type as defiend in ECMA 376.
-     */
-    String CORE_PROPERTIES_ECMA376 = "http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties";
-
-    /**
-     * Digital signature relationship type.
-     */
-    String DIGITAL_SIGNATURE = "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/signature";
-
-    /**
-     * Digital signature certificate relationship type.
-     */
-    String DIGITAL_SIGNATURE_CERTIFICATE = "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/certificate";
-
-    /**
-     * Digital signature origin relationship type.
-     */
-    String DIGITAL_SIGNATURE_ORIGIN = "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin";
-
-    /**
-     * Thumbnail relationship type.
-     */
-    String THUMBNAIL = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail";
-
-    /**
-     * Extended properties relationship type.
-     */
-    String EXTENDED_PROPERTIES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
-
-    /**
-     * Extended properties relationship type for strict ooxml.
-     */
-    String STRICT_EXTENDED_PROPERTIES = "http://purl.oclc.org/ooxml/officeDocument/relationships/extendedProperties";
-
-    /**
-     * Custom properties relationship type.
-     */
-    String CUSTOM_PROPERTIES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties";
-
-    /**
-     * Core document relationship type.
-     */
-    String CORE_DOCUMENT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
-
-    /**
-     * Core document relationship type for strict ooxml.
-     */
-    String STRICT_CORE_DOCUMENT = "http://purl.oclc.org/ooxml/officeDocument/relationships/officeDocument";
-
-    /**
-     * Custom XML relationship type.
-     */
-    String CUSTOM_XML = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";
-
-    /**
-     * Image type.
-     */
-    String IMAGE_PART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
-
-    /**
-     * Hyperlink type.
-     */
-    String HYPERLINK_PART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
-
-    /**
-     * Style type.
-     */
-    String STYLE_PART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";
-
-    /**
-     * External Link to another Document
-     */
-    String EXTERNAL_LINK_PATH = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLinkPath";
-
-    /**
-     * Visio 2010 VSDX equivalent of package {@link #CORE_DOCUMENT}
-     */
-    String VISIO_CORE_DOCUMENT = "http://schemas.microsoft.com/visio/2010/relationships/document";
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
deleted file mode 100644
index f44bf73..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.regex.Pattern;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Helper for part and pack URI.
- *
- * @author Julien Chable, CDubet, Kim Ung
- * @version 0.1
- */
-public final class PackagingURIHelper {
-    private final static POILogger _logger = POILogFactory.getLogger(PackagingURIHelper.class);
-
-	/**
-	 * Package root URI.
-	 */
-	private static URI packageRootUri;
-
-	/**
-	 * Extension name of a relationship part.
-	 */
-	public static final String RELATIONSHIP_PART_EXTENSION_NAME;
-
-	/**
-	 * Segment name of a relationship part.
-	 */
-	public static final String RELATIONSHIP_PART_SEGMENT_NAME;
-
-	/**
-	 * Segment name of the package properties folder.
-	 */
-	public static final String PACKAGE_PROPERTIES_SEGMENT_NAME;
-
-	/**
-	 * Core package properties art name.
-	 */
-	public static final String PACKAGE_CORE_PROPERTIES_NAME;
-
-	/**
-	 * Forward slash URI separator.
-	 */
-	public static final char FORWARD_SLASH_CHAR;
-
-	/**
-	 * Forward slash URI separator.
-	 */
-	public static final String FORWARD_SLASH_STRING;
-
-	/**
-	 * Package relationships part URI
-	 */
-	public static final URI PACKAGE_RELATIONSHIPS_ROOT_URI;
-
-	/**
-	 * Package relationships part name.
-	 */
-	public static final PackagePartName PACKAGE_RELATIONSHIPS_ROOT_PART_NAME;
-
-	/**
-	 * Core properties part URI.
-	 */
-	public static final URI CORE_PROPERTIES_URI;
-
-	/**
-	 * Core properties partname.
-	 */
-	public static final PackagePartName CORE_PROPERTIES_PART_NAME;
-
-	/**
-	 * Root package URI.
-	 */
-	public static final URI PACKAGE_ROOT_URI;
-
-	/**
-	 * Root package part name.
-	 */
-	public static final PackagePartName PACKAGE_ROOT_PART_NAME;
-
-	/* Static initialization */
-	static {
-		RELATIONSHIP_PART_SEGMENT_NAME = "_rels";
-		RELATIONSHIP_PART_EXTENSION_NAME = ".rels";
-		FORWARD_SLASH_CHAR = '/';
-		FORWARD_SLASH_STRING = "/";
-		PACKAGE_PROPERTIES_SEGMENT_NAME = "docProps";
-		PACKAGE_CORE_PROPERTIES_NAME = "core.xml";
-
-		// Make URI
-		URI uriPACKAGE_ROOT_URI = null;
-		URI uriPACKAGE_RELATIONSHIPS_ROOT_URI = null;
-		URI uriPACKAGE_PROPERTIES_URI = null;
-		try {
-			uriPACKAGE_ROOT_URI = new URI("/");
-			uriPACKAGE_RELATIONSHIPS_ROOT_URI = new URI(FORWARD_SLASH_CHAR
-					+ RELATIONSHIP_PART_SEGMENT_NAME + FORWARD_SLASH_CHAR
-					+ RELATIONSHIP_PART_EXTENSION_NAME);
-			packageRootUri = new URI("/");
-			uriPACKAGE_PROPERTIES_URI = new URI(FORWARD_SLASH_CHAR
-					+ PACKAGE_PROPERTIES_SEGMENT_NAME + FORWARD_SLASH_CHAR
-					+ PACKAGE_CORE_PROPERTIES_NAME);
-		} catch (URISyntaxException e) {
-			// Should never happen in production as all data are fixed
-		}
-		PACKAGE_ROOT_URI = uriPACKAGE_ROOT_URI;
-		PACKAGE_RELATIONSHIPS_ROOT_URI = uriPACKAGE_RELATIONSHIPS_ROOT_URI;
-		CORE_PROPERTIES_URI = uriPACKAGE_PROPERTIES_URI;
-
-		// Make part name from previous URI
-		PackagePartName tmpPACKAGE_ROOT_PART_NAME = null;
-		PackagePartName tmpPACKAGE_RELATIONSHIPS_ROOT_PART_NAME = null;
-		PackagePartName tmpCORE_PROPERTIES_URI = null;
-		try {
-			tmpPACKAGE_RELATIONSHIPS_ROOT_PART_NAME = createPartName(PACKAGE_RELATIONSHIPS_ROOT_URI);
-			tmpCORE_PROPERTIES_URI = createPartName(CORE_PROPERTIES_URI);
-			tmpPACKAGE_ROOT_PART_NAME = new PackagePartName(PACKAGE_ROOT_URI,
-					false);
-		} catch (InvalidFormatException e) {
-			// Should never happen in production as all data are fixed
-		}
-		PACKAGE_RELATIONSHIPS_ROOT_PART_NAME = tmpPACKAGE_RELATIONSHIPS_ROOT_PART_NAME;
-		CORE_PROPERTIES_PART_NAME = tmpCORE_PROPERTIES_URI;
-		PACKAGE_ROOT_PART_NAME = tmpPACKAGE_ROOT_PART_NAME;
-	}
-
-    private static final Pattern missingAuthPattern = Pattern.compile("\\w+://");
-
-	/**
-	 * Gets the URI for the package root.
-	 *
-	 * @return URI of the package root.
-	 */
-	public static URI getPackageRootUri() {
-		return packageRootUri;
-	}
-
-	/**
-	 * Know if the specified URI is a relationship part name.
-	 *
-	 * @param partUri
-	 *            URI to check.
-	 * @return <i>true</i> if the URI <i>false</i>.
-	 */
-	public static boolean isRelationshipPartURI(URI partUri) {
-		if (partUri == null)
-			throw new IllegalArgumentException("partUri");
-
-		return partUri.getPath().matches(
-				".*" + RELATIONSHIP_PART_SEGMENT_NAME + ".*"
-						+ RELATIONSHIP_PART_EXTENSION_NAME + "$");
-	}
-
-	/**
-	 * Get file name from the specified URI.
-	 */
-	public static String getFilename(URI uri) {
-		if (uri != null) {
-			String path = uri.getPath();
-			int len = path.length();
-			int num2 = len;
-			while (--num2 >= 0) {
-				char ch1 = path.charAt(num2);
-				if (ch1 == PackagingURIHelper.FORWARD_SLASH_CHAR)
-					return path.substring(num2 + 1, len);
-			}
-		}
-		return "";
-	}
-
-	/**
-	 * Get the file name without the trailing extension.
-	 */
-	public static String getFilenameWithoutExtension(URI uri) {
-		String filename = getFilename(uri);
-		int dotIndex = filename.lastIndexOf(".");
-		if (dotIndex == -1)
-			return filename;
-		return filename.substring(0, dotIndex);
-	}
-
-	/**
-	 * Get the directory path from the specified URI.
-	 */
-	public static URI getPath(URI uri) {
-		if (uri != null) {
-			String path = uri.getPath();
-			int len = path.length();
-			int num2 = len;
-			while (--num2 >= 0) {
-				char ch1 = path.charAt(num2);
-				if (ch1 == PackagingURIHelper.FORWARD_SLASH_CHAR) {
-					try {
-						return new URI(path.substring(0, num2));
-					} catch (URISyntaxException e) {
-						return null;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Combine two URIs.
-	 *
-	 * @param prefix the prefix URI
-	 * @param suffix the suffix URI
-	 *
-	 * @return the combined URI
-	 */
-	public static URI combine(URI prefix, URI suffix) {
-		URI retUri = null;
-		try {
-			retUri = new URI(combine(prefix.getPath(), suffix.getPath()));
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException(
-					"Prefix and suffix can't be combine !");
-		}
-		return retUri;
-	}
-
-	/**
-	 * Combine a string URI with a prefix and a suffix.
-	 */
-	public static String combine(String prefix, String suffix) {
-		if (!prefix.endsWith("" + FORWARD_SLASH_CHAR)
-				&& !suffix.startsWith("" + FORWARD_SLASH_CHAR))
-			return prefix + FORWARD_SLASH_CHAR + suffix;
-		else if ((!prefix.endsWith("" + FORWARD_SLASH_CHAR)
-				&& suffix.startsWith("" + FORWARD_SLASH_CHAR) || (prefix
-				.endsWith("" + FORWARD_SLASH_CHAR) && !suffix.startsWith(""
-				+ FORWARD_SLASH_CHAR))))
-			return prefix + suffix;
-		else
-			return "";
-	}
-
-	/**
-	 * Fully relativize the source part URI against the target part URI.
-	 *
-	 * @param sourceURI
-	 *            The source part URI.
-	 * @param targetURI
-	 *            The target part URI.
-     * @param  msCompatible if true then remove leading slash from the relativized URI.
-     *         This flag violates [M1.4]: A part name shall start with a forward slash ('/') character, but
-     *         allows generating URIs compatible with MS Office and OpenOffice.
-	 * @return A fully relativize part name URI ('word/media/image1.gif',
-	 *         '/word/document.xml' => 'media/image1.gif') else
-	 *         <code>null</code>.
-	 */
-	public static URI relativizeURI(URI sourceURI, URI targetURI, boolean msCompatible) {
-		StringBuilder retVal = new StringBuilder();
-		String[] segmentsSource = sourceURI.getPath().split("/", -1);
-		String[] segmentsTarget = targetURI.getPath().split("/", -1);
-
-		// If the source URI is empty
-		if (segmentsSource.length == 0) {
-			throw new IllegalArgumentException(
-					"Can't relativize an empty source URI !");
-		}
-
-		// If target URI is empty
-		if (segmentsTarget.length == 0) {
-			throw new IllegalArgumentException(
-					"Can't relativize an empty target URI !");
-		}
-
-		// If the source is the root, then the relativized
-		//  form must actually be an absolute URI
-		if(sourceURI.toString().equals("/")) {
-            String path = targetURI.getPath();
-            if(msCompatible && path.length() > 0 && path.charAt(0) == '/') {
-                try {
-                    targetURI = new URI(path.substring(1));
-                } catch (Exception e) {
-                    _logger.log(POILogger.WARN, e);
-                    return null;
-                }
-            }
-			return targetURI;
-		}
-
-
-		// Relativize the source URI against the target URI.
-		// First up, figure out how many steps along we can go
-		// and still have them be the same
-		int segmentsTheSame = 0;
-		for (int i = 0; i < segmentsSource.length && i < segmentsTarget.length; i++) {
-			if (segmentsSource[i].equals(segmentsTarget[i])) {
-				// Match so far, good
-				segmentsTheSame++;
-			} else {
-				break;
-			}
-		}
-
-		// If we didn't have a good match or at least except a first empty element
-		if ((segmentsTheSame == 0 || segmentsTheSame == 1) &&
-				segmentsSource[0].equals("") && segmentsTarget[0].equals("")) {
-			for (int i = 0; i < segmentsSource.length - 2; i++) {
-				retVal.append("../");
-			}
-			for (int i = 0; i < segmentsTarget.length; i++) {
-				if (segmentsTarget[i].equals(""))
-					continue;
-				retVal.append(segmentsTarget[i]);
-				if (i != segmentsTarget.length - 1)
-					retVal.append("/");
-			}
-
-			try {
-				return new URI(retVal.toString());
-			} catch (Exception e) {
-				_logger.log(POILogger.WARN, e);
-				return null;
-			}
-		}
-
-		// Special case for where the two are the same
-		if (segmentsTheSame == segmentsSource.length
-				&& segmentsTheSame == segmentsTarget.length) {
-            if(sourceURI.equals(targetURI)){
-                // if source and target are the same they should be resolved to the last segment,
-                // Example: if a slide references itself, e.g. the source URI is
-                // "/ppt/slides/slide1.xml" and the targetURI is "slide1.xml" then
-                // this it should be relativized as "slide1.xml", i.e. the last segment.
-                retVal.append(segmentsSource[segmentsSource.length - 1]);
-            } else {
-                retVal.append("");
-            }
-
-		} else {
-			// Matched for so long, but no more
-
-			// Do we need to go up a directory or two from
-			// the source to get here?
-			// (If it's all the way up, then don't bother!)
-			if (segmentsTheSame == 1) {
-				retVal.append("/");
-			} else {
-				for (int j = segmentsTheSame; j < segmentsSource.length - 1; j++) {
-					retVal.append("../");
-				}
-			}
-
-			// Now go from here on down
-			for (int j = segmentsTheSame; j < segmentsTarget.length; j++) {
-				if (retVal.length() > 0
-						&& retVal.charAt(retVal.length() - 1) != '/') {
-					retVal.append("/");
-				}
-				retVal.append(segmentsTarget[j]);
-			}
-		}
-
-        // if the target had a fragment then append it to the result
-        String fragment = targetURI.getRawFragment();
-        if (fragment != null) {
-            retVal.append("#").append(fragment);
-        }
-
-		try {
-			return new URI(retVal.toString());
-		} catch (Exception e) {
-			_logger.log(POILogger.WARN, e);
-			return null;
-		}
-	}
-
-    /**
-     * Fully relativize the source part URI against the target part URI.
-     *
-     * @param sourceURI
-     *            The source part URI.
-     * @param targetURI
-     *            The target part URI.
-     * @return A fully relativize part name URI ('word/media/image1.gif',
-     *         '/word/document.xml' => 'media/image1.gif') else
-     *         <code>null</code>.
-     */
-    public static URI relativizeURI(URI sourceURI, URI targetURI) {
-        return relativizeURI(sourceURI, targetURI, false);        
-    }
-
-    /**
-	 * Resolve a source uri against a target.
-	 *
-	 * @param sourcePartUri
-	 *            The source URI.
-	 * @param targetUri
-	 *            The target URI.
-	 * @return The resolved URI.
-	 */
-	public static URI resolvePartUri(URI sourcePartUri, URI targetUri) {
-		if (sourcePartUri == null || sourcePartUri.isAbsolute()) {
-			throw new IllegalArgumentException("sourcePartUri invalid - "
-					+ sourcePartUri);
-		}
-
-		if (targetUri == null || targetUri.isAbsolute()) {
-			throw new IllegalArgumentException("targetUri invalid - "
-					+ targetUri);
-		}
-
-		return sourcePartUri.resolve(targetUri);
-	}
-
-	/**
-	 * Get URI from a string path.
-	 */
-	public static URI getURIFromPath(String path) {
-		URI retUri;
-		try {
-			retUri = toURI(path);
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException("path");
-		}
-		return retUri;
-	}
-
-	/**
-	 * Get the source part URI from a specified relationships part.
-	 *
-	 * @param relationshipPartUri
-	 *            The relationship part use to retrieve the source part.
-	 * @return The source part URI from the specified relationships part.
-	 */
-	public static URI getSourcePartUriFromRelationshipPartUri(
-			URI relationshipPartUri) {
-		if (relationshipPartUri == null)
-			throw new IllegalArgumentException(
-					"Must not be null");
-
-		if (!isRelationshipPartURI(relationshipPartUri))
-			throw new IllegalArgumentException(
-					"Must be a relationship part");
-
-		if (relationshipPartUri.compareTo(PACKAGE_RELATIONSHIPS_ROOT_URI) == 0)
-			return PACKAGE_ROOT_URI;
-
-		String filename = relationshipPartUri.getPath();
-		String filenameWithoutExtension = getFilenameWithoutExtension(relationshipPartUri);
-		filename = filename
-				.substring(0, ((filename.length() - filenameWithoutExtension
-						.length()) - RELATIONSHIP_PART_EXTENSION_NAME.length()));
-		filename = filename.substring(0, filename.length()
-				- RELATIONSHIP_PART_SEGMENT_NAME.length() - 1);
-		filename = combine(filename, filenameWithoutExtension);
-		return getURIFromPath(filename);
-	}
-
-	/**
-	 * Create an OPC compliant part name by throwing an exception if the URI is
-	 * not valid.
-	 *
-	 * @param partUri
-	 *            The part name URI to validate.
-	 * @return A valid part name object, else <code>null</code>.
-	 * @throws InvalidFormatException
-	 *             Throws if the specified URI is not OPC compliant.
-	 */
-	public static PackagePartName createPartName(URI partUri)
-			throws InvalidFormatException {
-		if (partUri == null)
-			throw new IllegalArgumentException("partName");
-
-		return new PackagePartName(partUri, true);
-	}
-
-	/**
-	 * Create an OPC compliant part name.
-	 *
-	 * @param partName
-	 *            The part name to validate.
-	 * @return The correspondant part name if valid, else <code>null</code>.
-	 * @throws InvalidFormatException
-	 *             Throws if the specified part name is not OPC compliant.
-	 * @see #createPartName(URI)
-	 */
-	public static PackagePartName createPartName(String partName)
-			throws InvalidFormatException {
-		URI partNameURI;
-		try {
-			partNameURI = toURI(partName);
-		} catch (URISyntaxException e) {
-			throw new InvalidFormatException(e.getMessage());
-		}
-		return createPartName(partNameURI);
-	}
-
-	/**
-	 * Create an OPC compliant part name by resolving it using a base part.
-	 *
-	 * @param partName
-	 *            The part name to validate.
-	 * @param relativePart
-	 *            The relative base part.
-	 * @return The correspondant part name if valid, else <code>null</code>.
-	 * @throws InvalidFormatException
-	 *             Throws if the specified part name is not OPC compliant.
-	 * @see #createPartName(URI)
-	 */
-	public static PackagePartName createPartName(String partName,
-			PackagePart relativePart) throws InvalidFormatException {
-		URI newPartNameURI;
-		try {
-			newPartNameURI = resolvePartUri(
-					relativePart.getPartName().getURI(), new URI(partName));
-		} catch (URISyntaxException e) {
-			throw new InvalidFormatException(e.getMessage());
-		}
-		return createPartName(newPartNameURI);
-	}
-
-	/**
-	 * Create an OPC compliant part name by resolving it using a base part.
-	 *
-	 * @param partName
-	 *            The part name URI to validate.
-	 * @param relativePart
-	 *            The relative base part.
-	 * @return The correspondant part name if valid, else <code>null</code>.
-	 * @throws InvalidFormatException
-	 *             Throws if the specified part name is not OPC compliant.
-	 * @see #createPartName(URI)
-	 */
-	public static PackagePartName createPartName(URI partName,
-			PackagePart relativePart) throws InvalidFormatException {
-		URI newPartNameURI = resolvePartUri(
-				relativePart.getPartName().getURI(), partName);
-		return createPartName(newPartNameURI);
-	}
-
-	/**
-	 * Validate a part URI by returning a boolean.
-	 * ([M1.1],[M1.3],[M1.4],[M1.5],[M1.6])
-	 *
-	 * (OPC Specifications 8.1.1 Part names) :
-	 *
-	 * Part Name Syntax
-	 *
-	 * The part name grammar is defined as follows:
-	 *
-	 * <i>part_name = 1*( "/" segment )
-	 *
-	 * segment = 1*( pchar )</i>
-	 *
-	 *
-	 * (pchar is defined in RFC 3986)
-	 *
-	 * @param partUri
-	 *            The URI to validate.
-	 * @return <b>true</b> if the URI is valid to the OPC Specifications, else
-	 *         <b>false</b>
-	 *
-	 * @see #createPartName(URI)
-	 */
-	public static boolean isValidPartName(URI partUri) {
-		if (partUri == null)
-			throw new IllegalArgumentException("partUri");
-
-		try {
-			createPartName(partUri);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Decode a URI by converting all percent encoded character into a String
-	 * character.
-	 *
-	 * @param uri
-	 *            The URI to decode.
-	 * @return The specified URI in a String with converted percent encoded
-	 *         characters.
-	 */
-	public static String decodeURI(URI uri) {
-		StringBuffer retVal = new StringBuffer();
-		String uriStr = uri.toASCIIString();
-		char c;
-		final int length = uriStr.length();
-		for (int i = 0; i < length; ++i) {
-			c = uriStr.charAt(i);
-			if (c == '%') {
-				// We certainly found an encoded character, check for length
-				// now ( '%' HEXDIGIT HEXDIGIT)
-				if (((length - i) < 2)) {
-					throw new IllegalArgumentException("The uri " + uriStr
-							+ " contain invalid encoded character !");
-				}
-
-				// Decode the encoded character
-				char decodedChar = (char) Integer.parseInt(uriStr.substring(
-						i + 1, i + 3), 16);
-				retVal.append(decodedChar);
-				i += 2;
-				continue;
-			}
-			retVal.append(c);
-		}
-		return retVal.toString();
-	}
-
-	/**
-	 * Build a part name where the relationship should be stored ((ex
-	 * /word/document.xml -> /word/_rels/document.xml.rels)
-	 *
-	 * @param partName
-	 *            Source part URI
-	 * @return the full path (as URI) of the relation file
-	 * @throws InvalidOperationException
-	 *             Throws if the specified URI is a relationshp part.
-	 */
-	public static PackagePartName getRelationshipPartName(
-			PackagePartName partName) {
-		if (partName == null)
-			throw new IllegalArgumentException("partName");
-
-		if (PackagingURIHelper.PACKAGE_ROOT_URI.getPath().equals(
-                partName.getURI().getPath()) )
-			return PackagingURIHelper.PACKAGE_RELATIONSHIPS_ROOT_PART_NAME;
-
-		if (partName.isRelationshipPartURI())
-			throw new InvalidOperationException("Can't be a relationship part");
-
-		String fullPath = partName.getURI().getPath();
-		String filename = getFilename(partName.getURI());
-		fullPath = fullPath.substring(0, fullPath.length() - filename.length());
-		fullPath = combine(fullPath,
-				PackagingURIHelper.RELATIONSHIP_PART_SEGMENT_NAME);
-		fullPath = combine(fullPath, filename);
-		fullPath = fullPath
-				+ PackagingURIHelper.RELATIONSHIP_PART_EXTENSION_NAME;
-
-		PackagePartName retPartName;
-		try {
-			retPartName = createPartName(fullPath);
-		} catch (InvalidFormatException e) {
-			// Should never happen in production as all data are fixed but in
-			// case of return null:
-			return null;
-		}
-		return retPartName;
-	}
-
-    /**
-     * Convert a string to {@link java.net.URI}
-     *
-     * If  part name is not a valid URI, it is resolved as follows:
-     * <p>
-     * 1. Percent-encode each open bracket ([) and close bracket (]).</li>
-     * 2. Percent-encode each percent (%) character that is not followed by a hexadecimal notation of an octet value.</li>
-     * 3. Un-percent-encode each percent-encoded unreserved character.
-     * 4. Un-percent-encode each forward slash (/) and back slash (\).
-     * 5. Convert all back slashes to forward slashes.
-     * 6. If present in a segment containing non-dot (?.?) characters, remove trailing dot (?.?) characters from each segment.
-     * 7. Replace each occurrence of multiple consecutive forward slashes (/) with a single forward slash.
-     * 8. If a single trailing forward slash (/) is present, remove that trailing forward slash.
-     * 9. Remove complete segments that consist of three or more dots.
-     * 10. Resolve the relative reference against the base URI of the part holding the Unicode string, as it is defined
-     * in ?5.2 of RFC 3986. The path component of the resulting absolute URI is the part name.
-     *</p>
-     *
-     * @param   value   the string to be parsed into a URI
-     * @return  the resolved part name that should be OK to construct a URI
-     *
-     * TODO YK: for now this method does only (5). Finish the rest.
-     */
-    public static URI toURI(String value) throws URISyntaxException  {
-        //5. Convert all back slashes to forward slashes
-        if (value.indexOf("\\") != -1) {
-             value = value.replace('\\', '/');
-        }
-
-        // URI fragemnts (those starting with '#') are not encoded
-        // and may contain white spaces and raw unicode characters
-        int fragmentIdx = value.indexOf('#');
-        if(fragmentIdx != -1){
-            String path = value.substring(0, fragmentIdx);
-            String fragment = value.substring(fragmentIdx + 1);
-
-            value = path + "#" + encode(fragment);
-        }
-
-        // trailing white spaces must be url-encoded, see Bugzilla 53282
-        if(value.length() > 0 ){
-            StringBuilder b = new StringBuilder();
-            int idx = value.length() - 1;
-            for(; idx >= 0; idx--){
-                char c = value.charAt(idx);
-                if(Character.isWhitespace(c) || c == '\u00A0') {
-                    b.append(c);
-                } else {
-                    break;
-                }
-            }
-            if(b.length() > 0){
-                value = value.substring(0, idx+1) + encode(b.reverse().toString());
-            }
-        }
-
-        // MS Office can insert URIs with missing authority, e.g. "http://" or "javascript://"
-        // append a forward slash to avoid parse exception
-        if(missingAuthPattern.matcher(value).matches()){
-            value += "/";
-        }
-        return new URI(value);
-    }
-
-    /**
-     * percent-encode white spaces and characters above 0x80.
-     * <p>
-     *   Examples:
-     *   'Apache POI' --> 'Apache%20POI'
-     *   'Apache\u0410POI' --> 'Apache%04%10POI'
-     *
-     * @param s the string to encode
-     * @return  the encoded string
-     */
-    public static String encode(String s) {
-        int n = s.length();
-        if (n == 0) return s;
-
-        ByteBuffer bb  = ByteBuffer.wrap(s.getBytes(Charset.forName("UTF-8")));
-        StringBuilder sb = new StringBuilder();
-        while (bb.hasRemaining()) {
-            int b = bb.get() & 0xff;
-            if (isUnsafe(b)) {
-                sb.append('%');
-                sb.append(hexDigits[(b >> 4) & 0x0F]);
-                sb.append(hexDigits[(b >> 0) & 0x0F]);
-            } else {
-                sb.append((char)b);
-            }
-        }
-        return sb.toString();
-    }
-
-    private final static char[] hexDigits = {
-        '0', '1', '2', '3', '4', '5', '6', '7',
-        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-    };
-
-    private static boolean isUnsafe(int ch) {
-        return ch > 0x80 || Character.isWhitespace(ch);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/RelationshipSource.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
deleted file mode 100644
index 87c424d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.opc;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-
-public interface RelationshipSource {
-
-	/**
-	 * Add a relationship to a part (except relationships part).
-	 *
-	 * @param targetPartName
-	 *            Name of the target part. This one must be relative to the
-	 *            source root directory of the part.
-	 * @param targetMode
-	 *            Mode [Internal|External].
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @return The newly created and added relationship
-	 */
-	public abstract PackageRelationship addRelationship(
-			PackagePartName targetPartName, TargetMode targetMode,
-			String relationshipType);
-
-	/**
-	 * Add a relationship to a part (except relationships part).
-	 * <p>
-	 * Check rule M1.25: The Relationships part shall not have relationships to
-	 * any other part. Package implementers shall enforce this requirement upon
-	 * the attempt to create such a relationship and shall treat any such
-	 * relationship as invalid.
-	 * </p>
-	 * @param targetPartName
-	 *            Name of the target part. This one must be relative to the
-	 *            source root directory of the part.
-	 * @param targetMode
-	 *            Mode [Internal|External].
-	 * @param relationshipType
-	 *            Type of relationship.
-	 * @param id
-	 *            Relationship unique id.
-	 * @return The newly created and added relationship
-	 *
-	 * @throws InvalidFormatException
-	 *             If the URI point to a relationship part URI.
-	 */
-	public abstract PackageRelationship addRelationship(
-			PackagePartName targetPartName, TargetMode targetMode,
-			String relationshipType, String id);
-
-	/**
-	 * Adds an external relationship to a part
-	 *  (except relationships part).
-	 *
-	 * The targets of external relationships are not
-	 *  subject to the same validity checks that internal
-	 *  ones are, as the contents is potentially
-	 *  any file, URL or similar.
-	 *
-	 * @param target External target of the relationship
-	 * @param relationshipType Type of relationship.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addExternalRelationship(java.lang.String, java.lang.String)
-	 */
-	public PackageRelationship addExternalRelationship(String target, String relationshipType);
-
-	/**
-	 * Adds an external relationship to a part
-	 *  (except relationships part).
-	 *
-	 * The targets of external relationships are not
-	 *  subject to the same validity checks that internal
-	 *  ones are, as the contents is potentially
-	 *  any file, URL or similar.
-	 *
-	 * @param target External target of the relationship
-	 * @param relationshipType Type of relationship.
-	 * @param id Relationship unique id.
-	 * @return The newly created and added relationship
-	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#addExternalRelationship(java.lang.String, java.lang.String)
-	 */
-	public PackageRelationship addExternalRelationship(String target, String relationshipType, String id);
-
-	/**
-	 * Delete all the relationships attached to this.
-	 */
-	public abstract void clearRelationships();
-
-	/**
-	 * Delete the relationship specified by its id.
-	 *
-	 * @param id
-	 *            The ID identified the part to delete.
-	 */
-	public abstract void removeRelationship(String id);
-
-	/**
-	 * Retrieve all the relationships attached to this.
-	 *
-	 * @return This part's relationships.
-	 * @throws OpenXML4JException
-	 */
-	public abstract PackageRelationshipCollection getRelationships()
-			throws InvalidFormatException, OpenXML4JException;
-
-	/**
-	 * Retrieves a package relationship from its id.
-	 *
-	 * @param id
-	 *            ID of the package relationship to retrieve.
-	 * @return The package relationship
-	 */
-	public abstract PackageRelationship getRelationship(String id);
-
-	/**
-	 * Retrieve all relationships attached to this part which have the specified
-	 * type.
-	 *
-	 * @param relationshipType
-	 *            Relationship type filter.
-	 * @return All relationships from this part that have the specified type.
-	 * @throws InvalidFormatException
-	 *             If an error occurs while parsing the part.
-	 * @throws InvalidOperationException
-	 *             If the package is open in write only mode.
-	 */
-	public abstract PackageRelationshipCollection getRelationshipsByType(
-			String relationshipType) throws InvalidFormatException,
-			IllegalArgumentException, OpenXML4JException;
-
-	/**
-	 * Knows if the part have any relationships.
-	 *
-	 * @return <b>true</b> if the part have at least one relationship else
-	 *         <b>false</b>.
-	 */
-	public abstract boolean hasRelationships();
-
-	/**
-	 * Checks if the specified relationship is part of this package part.
-	 *
-	 * @param rel
-	 *            The relationship to check.
-	 * @return <b>true</b> if the specified relationship exists in this part,
-	 *         else returns <b>false</b>
-	 */
-	public abstract boolean isRelationshipExists(PackageRelationship rel);
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java
deleted file mode 100644
index 860d711..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-
-public final class StreamHelper {
-
-	private StreamHelper() {
-		// Do nothing
-	}
-  
-  private static final TransformerFactory transformerFactory = TransformerFactory.newInstance();
-  
-  private static synchronized Transformer getIdentityTransformer() throws TransformerException {
-    return transformerFactory.newTransformer();
-  }
-
-	/**
-	 * Save the document object in the specified output stream.
-	 *
-	 * @param xmlContent
-	 *            The XML document.
-	 * @param outStream
-	 *            The OutputStream in which the XML document will be written.
-	 * @return <b>true</b> if the xml is successfully written in the stream,
-	 *         else <b>false</b>.
-	 */
-    public static boolean saveXmlInStream(Document xmlContent,
-            OutputStream outStream) {
-        try {
-            Transformer trans = getIdentityTransformer();
-            Source xmlSource = new DOMSource(xmlContent);
-            // prevent close of stream by transformer:
-            Result outputTarget = new StreamResult(new FilterOutputStream(
-                    outStream) {
-                @Override
-                public void write(byte b[], int off, int len)
-                        throws IOException {
-                    out.write(b, off, len);
-                }
-
-                @Override
-                public void close() throws IOException {
-                    out.flush(); // only flush, don't close!
-                }
-            });
-            trans.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            trans.setOutputProperty(OutputKeys.INDENT, "yes");
-            trans.setOutputProperty(OutputKeys.STANDALONE, "yes");
-            trans.transform(xmlSource, outputTarget);
-        } catch (TransformerException e) {
-            return false;
-        }
-        return true;
-    }
-
-	/**
-	 * Copy the input stream into the output stream.
-	 *
-	 * @param inStream
-	 *            The source stream.
-	 * @param outStream
-	 *            The destination stream.
-	 * @return <b>true</b> if the operation succeed, else return <b>false</b>.
-	 */
-	public static boolean copyStream(InputStream inStream, OutputStream outStream) {
-		try {
-			byte[] buffer = new byte[1024];
-			int bytesRead;
-			while ((bytesRead = inStream.read(buffer)) >= 0) {
-				outStream.write(buffer, 0, bytesRead);
-			}
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/TargetMode.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/TargetMode.java
deleted file mode 100644
index 59f45f5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/TargetMode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-/**
- * Specifies whether the target of a PackageRelationship is inside or outside a
- * Package.
- *
- * @author Julien Chable
- * @version 1.0
- */
-public enum TargetMode {
-    /** The relationship references a part that is inside the package. */
-	INTERNAL,
-    /** The relationship references a resource that is external to the package. */
-	EXTERNAL
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
deleted file mode 100644
index 33333c3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.ODFNotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
-import org.apache.poi.openxml4j.opc.internal.ContentTypeManager;
-import org.apache.poi.openxml4j.opc.internal.FileHelper;
-import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart;
-import org.apache.poi.openxml4j.opc.internal.PartMarshaller;
-import org.apache.poi.openxml4j.opc.internal.ZipContentTypeManager;
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-import org.apache.poi.openxml4j.opc.internal.marshallers.ZipPartMarshaller;
-import org.apache.poi.openxml4j.util.ZipEntrySource;
-import org.apache.poi.openxml4j.util.ZipFileZipEntrySource;
-import org.apache.poi.openxml4j.util.ZipInputStreamZipEntrySource;
-import org.apache.poi.openxml4j.util.ZipSecureFile.ThresholdInputStream;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-
-/**
- * Physical zip package.
- */
-public final class ZipPackage extends OPCPackage {
-    private static final String MIMETYPE = "mimetype";
-    private static final String SETTINGS_XML = "settings.xml";
-
-    private static final POILogger logger = POILogFactory.getLogger(ZipPackage.class);
-
-    /**
-     * Zip archive, as either a file on disk,
-     *  or a stream
-     */
-    private final ZipEntrySource zipArchive;
-
-    /**
-     * Constructor. Creates a new, empty ZipPackage.
-     */
-    public ZipPackage() {
-        super(defaultPackageAccess);
-        this.zipArchive = null;
-
-        try {
-            this.contentTypeManager = new ZipContentTypeManager(null, this);
-        } catch (InvalidFormatException e) {
-            logger.log(POILogger.WARN,"Could not parse ZipPackage", e);
-        }
-    }
-
-    /**
-     * Constructor. Opens a Zip based Open XML document from
-     *  an InputStream.
-     *
-     * @param in
-     *            Zip input stream to load.
-     * @param access
-     *            The package access mode.
-     * @throws IllegalArgumentException
-     *             If the specified input stream not an instance of
-     *             ZipInputStream.
-     * @throws IOException
-     *            if input stream cannot be opened, read, or closed
-     */
-    ZipPackage(InputStream in, PackageAccess access) throws IOException {
-        super(access);
-        ThresholdInputStream zis = ZipHelper.openZipStream(in);
-        try {
-            this.zipArchive = new ZipInputStreamZipEntrySource(zis);
-        } catch (final IOException e) {
-            try {
-                zis.close();
-            } catch (final IOException e2) {
-                throw new IOException("Failed to close zip input stream while cleaning up. " + e.getMessage(), e2);
-            }
-            throw new IOException("Failed to read zip entry source", e);
-        }
-    }
-
-    /**
-     * Constructor. Opens a Zip based Open XML document from a file.
-     *
-     * @param path
-     *            The path of the file to open or create.
-     * @param access
-     *            The package access mode.
-     * @throws InvalidOperationException
-     */
-    ZipPackage(String path, PackageAccess access) throws InvalidOperationException {
-        this(new File(path), access);
-    }
-
-    /**
-     * Constructor. Opens a Zip based Open XML document from a File.
-     *
-     * @param file
-     *            The file to open or create.
-     * @param access
-     *            The package access mode.
-     * @throws InvalidOperationException
-     */
-    ZipPackage(File file, PackageAccess access) throws InvalidOperationException {
-        super(access);
-
-        ZipEntrySource ze;
-        try {
-            final ZipFile zipFile = ZipHelper.openZipFile(file);
-            ze = new ZipFileZipEntrySource(zipFile);
-        } catch (IOException e) {
-            // probably not happening with write access - not sure how to handle the default read-write access ...
-            if (access == PackageAccess.WRITE) {
-                throw new InvalidOperationException("Can't open the specified file: '" + file + "'", e);
-            }
-            logger.log(POILogger.ERROR, "Error in zip file "+file+" - falling back to stream processing (i.e. ignoring zip central directory)");
-            ze = openZipEntrySourceStream(file);
-        }
-        this.zipArchive = ze;
-    }
-    
-    private static ZipEntrySource openZipEntrySourceStream(File file) throws InvalidOperationException {
-        final FileInputStream fis;
-        // Acquire a resource that is needed to read the next level of openZipEntrySourceStream
-        try {
-            // open the file input stream
-            fis = new FileInputStream(file);
-        } catch (final FileNotFoundException e) {
-            // If the source cannot be acquired, abort (no resources to free at this level)
-            throw new InvalidOperationException("Can't open the specified file input stream from file: '" + file + "'", e);
-        }
-        
-        // If an error occurs while reading the next level of openZipEntrySourceStream, free the acquired resource
-        try {
-            // read from the file input stream
-            return openZipEntrySourceStream(fis);
-        } catch (final Exception e) {
-            try {
-                // abort: close the file input stream
-                fis.close();
-            } catch (final IOException e2) {
-                throw new InvalidOperationException("Could not close the specified file input stream from file: '" + file + "'", e2);
-            }
-            throw new InvalidOperationException("Failed to read the file input stream from file: '" + file + "'", e);
-        }
-    }
-    
-    private static ZipEntrySource openZipEntrySourceStream(FileInputStream fis) throws InvalidOperationException {
-        final ThresholdInputStream zis;
-        // Acquire a resource that is needed to read the next level of openZipEntrySourceStream
-        try {
-            // open the zip input stream
-            zis = ZipHelper.openZipStream(fis);
-        } catch (final IOException e) {
-            // If the source cannot be acquired, abort (no resources to free at this level)
-            throw new InvalidOperationException("Could not open the file input stream", e);
-        }
-        
-        // If an error occurs while reading the next level of openZipEntrySourceStream, free the acquired resource
-        try {
-            // read from the zip input stream
-            return openZipEntrySourceStream(zis);
-        } catch (final Exception e) {
-            try {
-                // abort: close the zip input stream
-                zis.close();
-            } catch (final IOException e2) {
-                throw new InvalidOperationException("Failed to read the zip entry source stream and could not close the zip input stream", e2);
-            }
-            throw new InvalidOperationException("Failed to read the zip entry source stream", e);
-        }
-    }
-    
-    private static ZipEntrySource openZipEntrySourceStream(ThresholdInputStream zis) throws InvalidOperationException {
-        // Acquire the final level resource. If this is acquired successfully, the zip package was read successfully from the input stream
-        try {
-            // open the zip entry source stream
-            return new ZipInputStreamZipEntrySource(zis);
-        } catch (IOException e) {
-            throw new InvalidOperationException("Could not open the specified zip entry source stream", e);
-        }
-    }
-
-    /**
-     * Constructor. Opens a Zip based Open XML document from
-     *  a custom ZipEntrySource, typically an open archive
-     *  from another system
-     *
-     * @param zipEntry
-     *            Zip data to load.
-     * @param access
-     *            The package access mode.
-     */
-    ZipPackage(ZipEntrySource zipEntry, PackageAccess access) {
-        super(access);
-        this.zipArchive = zipEntry;
-    }
-
-    /**
-     * Retrieves the parts from this package. We assume that the package has not
-     * been yet inspect to retrieve all the parts, this method will open the
-     * archive and look for all parts contain inside it. If the package part
-     * list is not empty, it will be emptied.
-     *
-     * @return All parts contain in this package.
-     * @throws InvalidFormatException
-     *             Throws if the package is not valid.
-     */
-    @Override
-    protected PackagePart[] getPartsImpl() throws InvalidFormatException {
-        if (this.partList == null) {
-            // The package has just been created, we create an empty part
-            // list.
-            this.partList = new PackagePartCollection();
-        }
-
-        if (this.zipArchive == null) {
-            return this.partList.values().toArray(
-                    new PackagePart[this.partList.values().size()]);
-        }
-
-        // First we need to parse the content type part
-        Enumeration<? extends ZipEntry> entries = this.zipArchive.getEntries();
-        while (entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            if (entry.getName().equalsIgnoreCase(
-                    ContentTypeManager.CONTENT_TYPES_PART_NAME)) {
-                try {
-                    this.contentTypeManager = new ZipContentTypeManager(
-                            getZipArchive().getInputStream(entry), this);
-                } catch (IOException e) {
-                    throw new InvalidFormatException(e.getMessage(), e);
-                }
-                break;
-            }
-        }
-
-        // At this point, we should have loaded the content type part
-        if (this.contentTypeManager == null) {
-            // Is it a different Zip-based format?
-            int numEntries = 0;
-            boolean hasMimetype = false;
-            boolean hasSettingsXML = false;
-            entries = this.zipArchive.getEntries();
-            while (entries.hasMoreElements()) {
-                final ZipEntry entry = entries.nextElement();
-                final String name = entry.getName();
-                if (MIMETYPE.equals(name)) {
-                    hasMimetype = true;
-                }
-                if (SETTINGS_XML.equals(name)) {
-                    hasSettingsXML = true;
-                }
-                numEntries++;
-            }
-            if (hasMimetype && hasSettingsXML) {
-                throw new ODFNotOfficeXmlFileException(
-                   "The supplied data appears to be in ODF (Open Document) Format. " +
-                   "Formats like these (eg ODS, ODP) are not supported, try Apache ODFToolkit");
-            }
-            if (numEntries == 0) {
-                throw new NotOfficeXmlFileException(
-                   "No valid entries or contents found, this is not a valid OOXML " +
-                   "(Office Open XML) file");
-            }
-
-            // Fallback exception
-            throw new InvalidFormatException(
-                    "Package should contain a content type part [M1.13]");
-        }
-
-        // Now create all the relationships
-        // (Need to create relationships before other
-        //  parts, otherwise we might create a part before
-        //  its relationship exists, and then it won't tie up)
-        entries = this.zipArchive.getEntries();
-        while (entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            PackagePartName partName = buildPartName(entry);
-            if(partName == null) continue;
-
-            // Only proceed for Relationships at this stage
-            String contentType = contentTypeManager.getContentType(partName);
-            if (contentType != null && contentType.equals(ContentTypes.RELATIONSHIPS_PART)) {
-                try {
-                    PackagePart part = new ZipPackagePart(this, entry, partName, contentType);
-                    partList.put(partName, part);
-                } catch (InvalidOperationException e) {
-                    throw new InvalidFormatException(e.getMessage(), e);
-                }
-            }
-        }
-
-        // Then we can go through all the other parts
-        entries = this.zipArchive.getEntries();
-        while (entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            PackagePartName partName = buildPartName(entry);
-            if(partName == null) continue;
-
-            String contentType = contentTypeManager.getContentType(partName);
-            if (contentType != null && contentType.equals(ContentTypes.RELATIONSHIPS_PART)) {
-                // Already handled
-            }
-            else if (contentType != null) {
-                try {
-                    PackagePart part = new ZipPackagePart(this, entry, partName, contentType);
-                    partList.put(partName, part);
-                } catch (InvalidOperationException e) {
-                    throw new InvalidFormatException(e.getMessage(), e);
-                }
-            } else {
-                throw new InvalidFormatException(
-                        "The part "
-                                + partName.getURI().getPath()
-                                + " does not have any content type ! Rule: Package require content types when retrieving a part from a package. [M.1.14]");
-            }
-        }
-
-        return partList.values().toArray(new ZipPackagePart[partList.size()]);
-    }
-
-    /**
-     * Builds a PackagePartName for the given ZipEntry,
-     *  or null if it's the content types / invalid part
-     */
-    private PackagePartName buildPartName(ZipEntry entry) {
-        try {
-            // We get an error when we parse [Content_Types].xml
-            // because it's not a valid URI.
-            if (entry.getName().equalsIgnoreCase(
-                    ContentTypeManager.CONTENT_TYPES_PART_NAME)) {
-                return null;
-            }
-            return PackagingURIHelper.createPartName(ZipHelper
-                    .getOPCNameFromZipItemName(entry.getName()));
-        } catch (Exception e) {
-            // We assume we can continue, even in degraded mode ...
-            logger.log(POILogger.WARN,"Entry "
-                                      + entry.getName()
-                                      + " is not valid, so this part won't be add to the package.", e);
-            return null;
-        }
-    }
-
-    /**
-     * Create a new MemoryPackagePart from the specified URI and content type
-     *
-     *
-     * aram partName The part URI.
-     *
-     * @param contentType
-     *            The part content type.
-     * @return The newly created zip package part, else <b>null</b>.
-     */
-    @Override
-    protected PackagePart createPartImpl(PackagePartName partName,
-            String contentType, boolean loadRelationships) {
-        if (contentType == null)
-            throw new IllegalArgumentException("contentType");
-
-        if (partName == null)
-            throw new IllegalArgumentException("partName");
-
-        try {
-            return new MemoryPackagePart(this, partName, contentType,
-                    loadRelationships);
-        } catch (InvalidFormatException e) {
-            logger.log(POILogger.WARN, e);
-            return null;
-        }
-    }
-
-    /**
-     * Delete a part from the package
-     *
-     * @throws IllegalArgumentException
-     *             Throws if the part URI is nulll or invalid.
-     */
-    @Override
-    protected void removePartImpl(PackagePartName partName) {
-        if (partName == null)
-            throw new IllegalArgumentException("partUri");
-    }
-
-    /**
-     * Flush the package. Do nothing.
-     */
-    @Override
-    protected void flushImpl() {
-        // Do nothing
-    }
-
-    /**
-     * Close and save the package.
-     *
-     * @see #close()
-     */
-    @Override
-    protected void closeImpl() throws IOException {
-        // Flush the package
-        flush();
-
-		// Save the content
-		if (this.originalPackagePath != null
-				&& !"".equals(this.originalPackagePath)) {
-			File targetFile = new File(this.originalPackagePath);
-			if (targetFile.exists()) {
-				// Case of a package previously open
-
-				File tempFile = TempFile.createTempFile(
-						generateTempFileName(FileHelper
-								.getDirectory(targetFile)), ".tmp");
-
-				// Save the final package to a temporary file
-				try {
-					save(tempFile);
-				} finally {
-					try {
-						// Close the current zip file, so we can
-						//  overwrite it on all platforms
-						this.zipArchive.close();
-						// Copy the new file over the old one
-						FileHelper.copyFile(tempFile, targetFile);
-					} finally {
-						// Either the save operation succeed or not, we delete the
-						// temporary file
-						if (!tempFile.delete()) {
-							logger
-									.log(POILogger.WARN,"The temporary file: '"
-											+ targetFile.getAbsolutePath()
-											+ "' cannot be deleted ! Make sure that no other application use it.");
-						}
-					}
-				}
-			} else {
-				throw new InvalidOperationException(
-						"Can't close a package not previously open with the open() method !");
-			}
-		} 
-	}
-
-	/**
-	 * Create a unique identifier to be use as a temp file name.
-	 *
-	 * @return A unique identifier use to be use as a temp file name.
-	 */
-	private synchronized String generateTempFileName(File directory) {
-		File tmpFilename;
-		do {
-			tmpFilename = new File(directory.getAbsoluteFile() + File.separator
-					+ "OpenXML4J" + System.nanoTime());
-		} while (tmpFilename.exists());
-		return FileHelper.getFilename(tmpFilename.getAbsoluteFile());
-	}
-
-	/**
-	 * Close the package without saving the document. Discard all the changes
-	 * made to this package.
-	 */
-	@Override
-	protected void revertImpl() {
-		try {
-			if (this.zipArchive != null)
-				this.zipArchive.close();
-		} catch (IOException e) {
-			// Do nothing, user dont have to know
-		}
-	}
-
-    /**
-     * Implement the getPart() method to retrieve a part from its URI in the
-     * current package
-     *
-     *
-     * @see #getPart(PackageRelationship)
-     */
-    @Override
-    protected PackagePart getPartImpl(PackagePartName partName) {
-        if (partList.containsKey(partName)) {
-            return partList.get(partName);
-        }
-        return null;
-    }
-
-	/**
-	 * Save this package into the specified stream
-	 *
-	 *
-	 * @param outputStream
-	 *            The stream use to save this package.
-	 *
-	 * @see #save(OutputStream)
-	 */
-	@Override
-	public void saveImpl(OutputStream outputStream) {
-		// Check that the document was open in write mode
-		throwExceptionIfReadOnly();
-
-		final ZipOutputStream zos;
-		try {
-			if (!(outputStream instanceof ZipOutputStream))
-				zos = new ZipOutputStream(outputStream);
-			else
-				zos = (ZipOutputStream) outputStream;
-
-			// If the core properties part does not exist in the part list,
-			// we save it as well
-			if (this.getPartsByRelationshipType(PackageRelationshipTypes.CORE_PROPERTIES).size() == 0 &&
-                this.getPartsByRelationshipType(PackageRelationshipTypes.CORE_PROPERTIES_ECMA376).size() == 0    ) {
-				logger.log(POILogger.DEBUG,"Save core properties part");
-				
-				// Ensure that core properties are added if missing
-				getPackageProperties();
-				// Add core properties to part list ...
-				addPackagePart(this.packageProperties);
-				// ... and to add its relationship ...
-				this.relationships.addRelationship(this.packageProperties
-						.getPartName().getURI(), TargetMode.INTERNAL,
-						PackageRelationshipTypes.CORE_PROPERTIES, null);
-				// ... and the content if it has not been added yet.
-				if (!this.contentTypeManager
-						.isContentTypeRegister(ContentTypes.CORE_PROPERTIES_PART)) {
-					this.contentTypeManager.addContentType(
-							this.packageProperties.getPartName(),
-							ContentTypes.CORE_PROPERTIES_PART);
-				}
-			}
-
-			// Save package relationships part.
-			logger.log(POILogger.DEBUG,"Save package relationships");
-			ZipPartMarshaller.marshallRelationshipPart(this.getRelationships(),
-					PackagingURIHelper.PACKAGE_RELATIONSHIPS_ROOT_PART_NAME,
-					zos);
-
-			// Save content type part.
-			logger.log(POILogger.DEBUG,"Save content types part");
-			this.contentTypeManager.save(zos);
-
-			// Save parts.
-			for (PackagePart part : getParts()) {
-				// If the part is a relationship part, we don't save it, it's
-				// the source part that will do the job.
-				if (part.isRelationshipPart())
-					continue;
-
-				logger.log(POILogger.DEBUG,"Save part '"
-						+ ZipHelper.getZipItemNameFromOPCName(part
-								.getPartName().getName()) + "'");
-				PartMarshaller marshaller = partMarshallers
-						.get(part._contentType);
-				if (marshaller != null) {
-					if (!marshaller.marshall(part, zos)) {
-						throw new OpenXML4JException(
-								"The part "
-										+ part.getPartName().getURI()
-										+ " fail to be saved in the stream with marshaller "
-										+ marshaller);
-					}
-				} else {
-					if (!defaultPartMarshaller.marshall(part, zos))
-						throw new OpenXML4JException(
-								"The part "
-										+ part.getPartName().getURI()
-										+ " fail to be saved in the stream with marshaller "
-										+ defaultPartMarshaller);
-				}
-			}
-			zos.close();
-		} catch (OpenXML4JRuntimeException e) {
-			// no need to wrap this type of Exception
-			throw e;
-		} catch (Exception e) {
-            throw new OpenXML4JRuntimeException(
-                    "Fail to save: an error occurs while saving the package : "
-							+ e.getMessage(), e);
-		}
-    }
-
-    /**
-     * Get the zip archive
-     *
-     * @return The zip archive.
-     */
-    public ZipEntrySource getZipArchive() {
-        return zipArchive;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
deleted file mode 100644
index 58bbbfe..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.ZipEntry;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.internal.marshallers.ZipPartMarshaller;
-import org.apache.poi.util.NotImplemented;
-
-/**
- * Zip implementation of a PackagePart.
- *
- * @author Julien Chable
- * @version 1.0
- * @see PackagePart
- */
-public class ZipPackagePart extends PackagePart {
-
-	/**
-	 * The zip entry corresponding to this part.
-	 */
-	private ZipEntry zipEntry;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param container
-	 *            The container package.
-	 * @param partName
-	 *            Part name.
-	 * @param contentType
-	 *            Content type.
-	 * @throws InvalidFormatException
-	 *             Throws if the content of this part invalid.
-	 */
-	public ZipPackagePart(OPCPackage container, PackagePartName partName,
-			String contentType) throws InvalidFormatException {
-		super(container, partName, contentType);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param container
-	 *            The container package.
-	 * @param zipEntry
-	 *            The zip entry corresponding to this part.
-	 * @param partName
-	 *            The part name.
-	 * @param contentType
-	 *            Content type.
-	 * @throws InvalidFormatException
-	 *             Throws if the content of this part is invalid.
-	 */
-	public ZipPackagePart(OPCPackage container, ZipEntry zipEntry,
-			PackagePartName partName, String contentType)
-			throws InvalidFormatException {
-		super(container, partName, contentType);
-		this.zipEntry = zipEntry;
-	}
-
-	/**
-	 * Get the zip entry of this part.
-	 *
-	 * @return The zip entry in the zip structure coresponding to this part.
-	 */
-	public ZipEntry getZipArchive() {
-		return zipEntry;
-	}
-
-	/**
-	 * Implementation of the getInputStream() which return the inputStream of
-	 * this part zip entry.
-	 *
-	 * @return Input stream of this part zip entry.
-	 */
-	@Override
-	protected InputStream getInputStreamImpl() throws IOException {
-		// We use the getInputStream() method from java.util.zip.ZipFile
-		// class which return an InputStream to this part zip entry.
-		return ((ZipPackage) _container).getZipArchive()
-				.getInputStream(zipEntry);
-	}
-
-	/**
-	 * Implementation of the getOutputStream(). Return <b>null</b>. Normally
-	 * will never be called since the MemoryPackage is use instead.
-	 *
-	 * @return <b>null</b>
-	 */
-	@Override
-	protected OutputStream getOutputStreamImpl() {
-		return null;
-	}
-
-	@Override
-	public long getSize() {
-		return zipEntry.getSize();
-	}
-
-	@Override
-	public boolean save(OutputStream os) throws OpenXML4JException {
-		return new ZipPartMarshaller().marshall(this, os);
-	}
-
-	@Override
-	@NotImplemented
-	public boolean load(InputStream ios) {
-		throw new InvalidOperationException("Method not implemented !");
-	}
-
-	@Override
-	@NotImplemented
-	public void close() {
-		throw new InvalidOperationException("Method not implemented !");
-	}
-
-	@Override
-	@NotImplemented
-	public void flush() {
-		throw new InvalidOperationException("Method not implemented !");
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
deleted file mode 100644
index a56e0cd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-
-/**
- * Represents a immutable MIME ContentType value (RFC 2616 &#167;3.7)
- * <p>
- * media-type = type "/" subtype *( ";" parameter ) type = token<br>
- * subtype = token<br>
- * </p><p>
- * Rule M1.13 : Package implementers shall only create and only recognize parts
- * with a content type; format designers shall specify a content type for each
- * part included in the format. Content types for package parts shall fit the
- * definition and syntax for media types as specified in RFC 2616, \&#167;3.7.
- * </p><p>
- * Rule M1.14: Content types shall not use linear white space either between the
- * type and subtype or between an attribute and its value. Content types also
- * shall not have leading or trailing white spaces. Package implementers shall
- * create only such content types and shall require such content types when
- * retrieving a part from a package; format designers shall specify only such
- * content types for inclusion in the format.
- * </p>
- * @author Julien Chable
- * @version 0.1
- *
- * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">http://www.ietf.org/rfc/rfc2045.txt</a>
- * @see <a href="http://www.ietf.org/rfc/rfc2616.txt">http://www.ietf.org/rfc/rfc2616.txt</a>
- */
-public final class ContentType {
-
-	/**
-	 * Type in Type/Subtype.
-	 */
-	private final String type;
-
-	/**
-	 * Subtype
-	 */
-	private final String subType;
-
-	/**
-	 * Parameters
-	 */
-	private final Map<String, String> parameters;
-
-	/**
-	 * Media type compiled pattern, without parameters
-	 */
-	private final static Pattern patternTypeSubType;
-    /**
-     * Media type compiled pattern, with parameters.
-     */
-    private final static Pattern patternTypeSubTypeParams;
-    /**
-     * Pattern to match on just the parameters part, to work
-     * around the Java Regexp group capture behaviour
-     */
-    private final static Pattern patternParams;
-
-	static {
-		/*
-		 * token = 1*<any CHAR except CTLs or separators>
-		 *
-		 * separators = "(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\" |
-		 * <"> | "/" | "[" | "]" | "?" | "=" | "{" | "}" | SP | HT
-		 *
-		 * CTL = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
-		 *
-		 * CHAR = <any US-ASCII character (octets 0 - 127)>
-		 */
-		String token = "[\\x21-\\x7E&&[^\\(\\)<>@,;:\\\\/\"\\[\\]\\?={}\\x20\\x09]]";
-
-		/*
-		 * parameter = attribute "=" value
-		 *
-		 * attribute = token
-		 *
-		 * value = token | quoted-string
-		 */
-		String parameter = "(" + token + "+)=(\"?" + token + "+\"?)";
-		/*
-		 * Pattern for media type.
-		 *
-		 * Don't allow comment, rule M1.15: The package implementer shall
-		 * require a content type that does not include comments and the format
-		 * designer shall specify such a content type.
-		 *
-		 * comment = "(" *( ctext | quoted-pair | comment ) ")"
-		 *
-		 * ctext = <any TEXT excluding "(" and ")">
-		 *
-		 * TEXT = <any OCTET except CTLs, but including LWS>
-		 *
-		 * LWS = [CRLF] 1*( SP | HT )
-		 *
-		 * CR = <US-ASCII CR, carriage return (13)>
-		 *
-		 * LF = <US-ASCII LF, linefeed (10)>
-		 *
-		 * SP = <US-ASCII SP, space (32)>
-		 *
-		 * HT = <US-ASCII HT, horizontal-tab (9)>
-		 *
-		 * quoted-pair = "\" CHAR
-		 */
-
-		patternTypeSubType       = Pattern.compile("^(" + token + "+)/(" + 
-		                                           token + "+)$");
-		patternTypeSubTypeParams = Pattern.compile("^(" + token + "+)/(" + 
-		                                           token + "+)(;" + parameter + ")*$");
-		patternParams            = Pattern.compile(";" + parameter);
-	}
-
-	/**
-	 * Constructor. Check the input with the RFC 2616 grammar.
-	 *
-	 * @param contentType
-	 *            The content type to store.
-	 * @throws InvalidFormatException
-	 *             If the specified content type is not valid with RFC 2616.
-	 */
-	public ContentType(String contentType) throws InvalidFormatException {
-		Matcher mMediaType = patternTypeSubType.matcher(contentType);
-		if (!mMediaType.matches()) {
-			// How about with parameters?
-			mMediaType = patternTypeSubTypeParams.matcher(contentType);
-		}
-		if (!mMediaType.matches()) {
-			throw new InvalidFormatException(
-					"The specified content type '"
-					+ contentType
-					+ "' is not compliant with RFC 2616: malformed content type.");
-		}
-
-		// Type/subtype
-		if (mMediaType.groupCount() >= 2) {
-			this.type = mMediaType.group(1);
-			this.subType = mMediaType.group(2);
-			
-			// Parameters
-			this.parameters = new HashMap<String, String>();
-			// Java RegExps are unhelpful, and won't do multiple group captures
-			// See http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html#cg
-			if (mMediaType.groupCount() >= 5) {
-				Matcher mParams = patternParams.matcher(contentType.substring(mMediaType.end(2)));
-				while (mParams.find()) {
-					this.parameters.put(mParams.group(1), mParams.group(2));
-				}
-			}
-		} else {
-			// missing media type and subtype
-			this.type = "";
-			this.subType = "";
-			this.parameters = Collections.emptyMap(); 
-		}
-	}
-
-    /**
-     * Returns the content type as a string, including parameters
-     */
-	@Override
-	public final String toString() {
-	    return toString(true);
-	}
-
-	public final String toString(boolean withParameters) {
-	    StringBuffer retVal = new StringBuffer();
-	    retVal.append(this.getType());
-	    retVal.append("/");
-	    retVal.append(this.getSubType());
-
-	    if (withParameters) {
-	        for (Entry<String, String> me : parameters.entrySet()) {
-	            retVal.append(";");
-	            retVal.append(me.getKey());
-	            retVal.append("=");
-	            retVal.append(me.getValue());
-	        }
-	    }
-	    return retVal.toString();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return (!(obj instanceof ContentType))
-				|| (this.toString().equalsIgnoreCase(obj.toString()));
-	}
-
-	@Override
-	public int hashCode() {
-		return this.toString().hashCode();
-	}
-
-	/* Getters */
-
-	/**
-	 * Get the subtype.
-	 *
-	 * @return The subtype of this content type.
-	 */
-	public String getSubType() {
-		return this.subType;
-	}
-
-	/**
-	 * Get the type.
-	 *
-	 * @return The type of this content type.
-	 */
-	public String getType() {
-		return this.type;
-	}
-	
-	/**
-	 * Does this content type have any parameters associated with it?
-	 */
-	public boolean hasParameters() {
-	    return (parameters != null) && !parameters.isEmpty();
-	}
-	
-	/**
-	 * Return the parameter keys
-	 */
-	public String[] getParameterKeys() {
-	    if (parameters == null)
-	        return new String[0];
-	    return parameters.keySet().toArray(new String[parameters.size()]);
-	}
-
-	/**
-	 * Gets the value associated to the specified key.
-	 *
-	 * @param key
-	 *            The key of the key/value pair.
-	 * @return The value associated to the specified key.
-	 */
-	public String getParameter(String key) {
-		return parameters.get(key);
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
deleted file mode 100644
index 750f9cd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Locale;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
-import org.apache.poi.openxml4j.opc.*;
-import org.apache.poi.util.DocumentHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Manage package content types ([Content_Types].xml part).
- *
- * @author Julien Chable
- */
-public abstract class ContentTypeManager {
-
-	/**
-	 * Content type part name.
-	 */
-	public static final String CONTENT_TYPES_PART_NAME = "[Content_Types].xml";
-
-	/**
-	 * Content type namespace
-	 */
-	public static final String TYPES_NAMESPACE_URI = PackageNamespaces.CONTENT_TYPES;
-
-	/* Xml elements in content type part */
-
-	private static final String TYPES_TAG_NAME = "Types";
-
-	private static final String DEFAULT_TAG_NAME = "Default";
-
-	private static final String EXTENSION_ATTRIBUTE_NAME = "Extension";
-
-	private static final String CONTENT_TYPE_ATTRIBUTE_NAME = "ContentType";
-
-	private static final String OVERRIDE_TAG_NAME = "Override";
-
-	private static final String PART_NAME_ATTRIBUTE_NAME = "PartName";
-
-	/**
-	 * Reference to the package using this content type manager.
-	 */
-	protected OPCPackage container;
-
-	/**
-	 * Default content type tree. <Extension, ContentType>
-	 */
-	private TreeMap<String, String> defaultContentType;
-
-	/**
-	 * Override content type tree.
-	 */
-	private TreeMap<PackagePartName, String> overrideContentType;
-
-	/**
-	 * Constructor. Parses the content of the specified input stream.
-	 *
-	 * @param in
-	 *            If different of <i>null</i> then the content types part is
-	 *            retrieve and parse.
-	 * @throws InvalidFormatException
-	 *             If the content types part content is not valid.
-	 */
-	public ContentTypeManager(InputStream in, OPCPackage pkg)
-			throws InvalidFormatException {
-		this.container = pkg;
-		this.defaultContentType = new TreeMap<String, String>();
-		if (in != null) {
-			try {
-				parseContentTypesFile(in);
-			} catch (InvalidFormatException e) {
-			    InvalidFormatException ex = new InvalidFormatException("Can't read content types part !");
-
-                // here it is useful to add the cause to not loose the original stack-trace
-                ex.initCause(e);
-		        
-                throw ex;
-			}
-		}
-	}
-
-	/**
-	 * Build association extention-> content type (will be stored in
-	 * [Content_Types].xml) for example ContentType="image/png" Extension="png"
-	 * <p>
-	 * [M2.8]: When adding a new part to a package, the package implementer
-	 * shall ensure that a content type for that part is specified in the
-	 * Content Types stream; the package implementer shall perform the steps
-	 * described in &#167;9.1.2.3:
-	 * </p><p>
-	 * 1. Get the extension from the part name by taking the substring to the
-	 * right of the rightmost occurrence of the dot character (.) from the
-	 * rightmost segment.
-	 * </p><p>
-	 * 2. If a part name has no extension, a corresponding Override element
-	 * shall be added to the Content Types stream.
-	 * </p><p>
-	 * 3. Compare the resulting extension with the values specified for the
-	 * Extension attributes of the Default elements in the Content Types stream.
-	 * The comparison shall be case-insensitive ASCII.
-	 * </p><p>
-	 * 4. If there is a Default element with a matching Extension attribute,
-	 * then the content type of the new part shall be compared with the value of
-	 * the ContentType attribute. The comparison might be case-sensitive and
-	 * include every character regardless of the role it plays in the
-	 * content-type grammar of RFC 2616, or it might follow the grammar of RFC
-	 * 2616.
-	 * </p><p>
-	 * a. If the content types match, no further action is required.
-	 * </p><p>
-	 * b. If the content types do not match, a new Override element shall be
-	 * added to the Content Types stream. .
-	 * </p><p>
-	 * 5. If there is no Default element with a matching Extension attribute, a
-	 * new Default element or Override element shall be added to the Content
-	 * Types stream.
-	 * </p>
-	 */
-	public void addContentType(PackagePartName partName, String contentType) {
-		boolean defaultCTExists = this.defaultContentType.containsValue(contentType);
-		String extension = partName.getExtension().toLowerCase(Locale.ROOT);
-		if ((extension.length() == 0)
-				|| (this.defaultContentType.containsKey(extension) && !defaultCTExists))
-			this.addOverrideContentType(partName, contentType);
-		else if (!defaultCTExists)
-			this.addDefaultContentType(extension, contentType);
-	}
-
-	/**
-	 * Add an override content type for a specific part.
-	 *
-	 * @param partName
-	 *            Name of the part.
-	 * @param contentType
-	 *            Content type of the part.
-	 */
-	private void addOverrideContentType(PackagePartName partName,
-			String contentType) {
-		if (overrideContentType == null)
-			overrideContentType = new TreeMap<PackagePartName, String>();
-		overrideContentType.put(partName, contentType);
-	}
-
-	/**
-	 * Add a content type associated with the specified extension.
-	 *
-	 * @param extension
-	 *            The part name extension to bind to a content type.
-	 * @param contentType
-	 *            The content type associated with the specified extension.
-	 */
-	private void addDefaultContentType(String extension, String contentType) {
-		// Remark : Originally the latest parameter was :
-		// contentType.toLowerCase(). Change due to a request ID 1996748.
-		defaultContentType.put(extension.toLowerCase(Locale.ROOT), contentType);
-	}
-
-	/**
-     * <p>
-	 * Delete a content type based on the specified part name. If the specified
-	 * part name is register with an override content type, then this content
-	 * type is remove, else the content type is remove in the default content
-	 * type list if it exists and if no part is associated with it yet.
-	 * </p><p>
-	 * Check rule M2.4: The package implementer shall require that the Content
-	 * Types stream contain one of the following for every part in the package:
-	 * One matching Default element One matching Override element Both a
-	 * matching Default element and a matching Override element, in which case
-	 * the Override element takes precedence.
-	 * </p>
-	 * @param partName
-	 *            The part URI associated with the override content type to
-	 *            delete.
-	 * @exception InvalidOperationException
-	 *                Throws if
-	 */
-	public void removeContentType(PackagePartName partName)
-			throws InvalidOperationException {
-		if (partName == null)
-			throw new IllegalArgumentException("partName");
-
-		/* Override content type */
-		if (this.overrideContentType != null
-				&& (this.overrideContentType.get(partName) != null)) {
-			// Remove the override definition for the specified part.
-			this.overrideContentType.remove(partName);
-			return;
-		}
-
-		/* Default content type */
-		String extensionToDelete = partName.getExtension();
-		boolean deleteDefaultContentTypeFlag = true;
-		if (this.container != null) {
-			try {
-				for (PackagePart part : this.container.getParts()) {
-					if (!part.getPartName().equals(partName)
-							&& part.getPartName().getExtension()
-									.equalsIgnoreCase(extensionToDelete)) {
-						deleteDefaultContentTypeFlag = false;
-						break;
-					}
-				}
-			} catch (InvalidFormatException e) {
-				throw new InvalidOperationException(e.getMessage());
-			}
-		}
-
-		// Remove the default content type, no other part use this content type.
-		if (deleteDefaultContentTypeFlag) {
-			this.defaultContentType.remove(extensionToDelete);
-		}
-
-		/*
-		 * Check rule 2.4: The package implementer shall require that the
-		 * Content Types stream contain one of the following for every part in
-		 * the package: One matching Default element One matching Override
-		 * element Both a matching Default element and a matching Override
-		 * element, in which case the Override element takes precedence.
-		 */
-		if (this.container != null) {
-			try {
-				for (PackagePart part : this.container.getParts()) {
-					if (!part.getPartName().equals(partName)
-							&& this.getContentType(part.getPartName()) == null)
-						throw new InvalidOperationException(
-								"Rule M2.4 is not respected: Nor a default element or override element is associated with the part: "
-										+ part.getPartName().getName());
-				}
-			} catch (InvalidFormatException e) {
-				throw new InvalidOperationException(e.getMessage());
-			}
-		}
-	}
-
-	/**
-	 * Check if the specified content type is already register.
-	 *
-	 * @param contentType
-	 *            The content type to check.
-	 * @return <code>true</code> if the specified content type is already
-	 *         register, then <code>false</code>.
-	 */
-	public boolean isContentTypeRegister(String contentType) {
-		if (contentType == null)
-			throw new IllegalArgumentException("contentType");
-
-		return (this.defaultContentType.values().contains(contentType) || (this.overrideContentType != null && this.overrideContentType
-				.values().contains(contentType)));
-	}
-
-	/**
-	 * Get the content type for the specified part, if any.
-	 * <p>
-	 * Rule [M2.9]: To get the content type of a part, the package implementer
-	 * shall perform the steps described in &#167;9.1.2.4:
-	 * </p><p>
-	 * 1. Compare the part name with the values specified for the PartName
-	 * attribute of the Override elements. The comparison shall be
-	 * case-insensitive ASCII.
-	 * </p><p>
-	 * 2. If there is an Override element with a matching PartName attribute,
-	 * return the value of its ContentType attribute. No further action is
-	 * required.
-	 * </p><p>
-	 * 3. If there is no Override element with a matching PartName attribute,
-	 * then a. Get the extension from the part name by taking the substring to
-	 * the right of the rightmost occurrence of the dot character (.) from the
-	 * rightmost segment. b. Check the Default elements of the Content Types
-	 * stream, comparing the extension with the value of the Extension
-	 * attribute. The comparison shall be case-insensitive ASCII.
-	 * </p><p>
-	 * 4. If there is a Default element with a matching Extension attribute,
-	 * return the value of its ContentType attribute. No further action is
-	 * required.
-	 * </p><p>
-	 * 5. If neither Override nor Default elements with matching attributes are
-	 * found for the specified part name, the implementation shall not map this
-	 * part name to a part.
-	 * </p>
-	 * @param partName
-	 *            The URI part to check.
-	 * @return The content type associated with the URI (in case of an override
-	 *         content type) or the extension (in case of default content type),
-	 *         else <code>null</code>.
-	 *
-	 * @exception OpenXML4JRuntimeException
-	 *                Throws if the content type manager is not able to find the
-	 *                content from an existing part.
-	 */
-	public String getContentType(PackagePartName partName) {
-		if (partName == null)
-			throw new IllegalArgumentException("partName");
-
-		if ((this.overrideContentType != null)
-				&& this.overrideContentType.containsKey(partName))
-			return this.overrideContentType.get(partName);
-
-		String extension = partName.getExtension().toLowerCase(Locale.ROOT);
-		if (this.defaultContentType.containsKey(extension))
-			return this.defaultContentType.get(extension);
-
-		/*
-		 * [M2.4] : The package implementer shall require that the Content Types
-		 * stream contain one of the following for every part in the package:
-		 * One matching Default element, One matching Override element, Both a
-		 * matching Default element and a matching Override element, in which
-		 * case the Override element takes precedence.
-		 */
-		if (this.container != null && this.container.getPart(partName) != null) {
-			throw new OpenXML4JRuntimeException(
-					"Rule M2.4 exception : this error should NEVER happen! If you can provide the triggering file, then please raise a bug at https://bz.apache.org/bugzilla/enter_bug.cgi?product=POI and attach the file that triggers it, thanks!");
-		}
-		return null;
-	}
-
-	/**
-	 * Clear all content types.
-	 */
-	public void clearAll() {
-		this.defaultContentType.clear();
-		if (this.overrideContentType != null)
-			this.overrideContentType.clear();
-	}
-
-	/**
-	 * Clear all override content types.
-	 *
-	 */
-	public void clearOverrideContentTypes() {
-		if (this.overrideContentType != null)
-			this.overrideContentType.clear();
-	}
-
-	/**
-	 * Parse the content types part.
-	 *
-	 * @throws InvalidFormatException
-	 *             Throws if the content type doesn't exist or the XML format is
-	 *             invalid.
-	 */
-	private void parseContentTypesFile(InputStream in)
-			throws InvalidFormatException {
-		try {
-			Document xmlContentTypetDoc = DocumentHelper.readDocument(in);
-
-			// Default content types
-			NodeList defaultTypes = xmlContentTypetDoc.getDocumentElement().getElementsByTagNameNS(TYPES_NAMESPACE_URI, DEFAULT_TAG_NAME);
-			int defaultTypeCount = defaultTypes.getLength();
-			for (int i = 0; i < defaultTypeCount; i++) {
-                Element element = (Element) defaultTypes.item(i);
-				String extension = element.getAttribute(EXTENSION_ATTRIBUTE_NAME);
-				String contentType = element.getAttribute(CONTENT_TYPE_ATTRIBUTE_NAME);
-				addDefaultContentType(extension, contentType);
-			}
-
-			// Overriden content types
-            NodeList overrideTypes = xmlContentTypetDoc.getDocumentElement().getElementsByTagNameNS(TYPES_NAMESPACE_URI, OVERRIDE_TAG_NAME);
-            int overrideTypeCount = overrideTypes.getLength();
-            for (int i = 0; i < overrideTypeCount; i++) {
-				Element element = (Element) overrideTypes.item(i);
-				URI uri = new URI(element.getAttribute(PART_NAME_ATTRIBUTE_NAME));
-				PackagePartName partName = PackagingURIHelper.createPartName(uri);
-				String contentType = element.getAttribute(CONTENT_TYPE_ATTRIBUTE_NAME);
-				addOverrideContentType(partName, contentType);
-			}
-		} catch (URISyntaxException urie) {
-			throw new InvalidFormatException(urie.getMessage());
-        } catch (SAXException e) {
-            throw new InvalidFormatException(e.getMessage());
-        } catch (IOException e) {
-            throw new InvalidFormatException(e.getMessage());
-        }
-    }
-
-	/**
-	 * Save the contents type part.
-	 *
-	 * @param outStream
-	 *            The output stream use to save the XML content of the content
-	 *            types part.
-	 * @return <b>true</b> if the operation success, else <b>false</b>.
-	 */
-	public boolean save(OutputStream outStream) {
-		Document xmlOutDoc = DocumentHelper.createDocument();
-
-		// Building namespace
-		Element typesElem = xmlOutDoc.createElementNS(TYPES_NAMESPACE_URI, TYPES_TAG_NAME);
-        xmlOutDoc.appendChild(typesElem);
-
-		// Adding default types
-		for (Entry<String, String> entry : defaultContentType.entrySet()) {
-			appendDefaultType(typesElem, entry);
-		}
-
-		// Adding specific types if any exist
-		if (overrideContentType != null) {
-			for (Entry<PackagePartName, String> entry : overrideContentType
-					.entrySet()) {
-				appendSpecificTypes(typesElem, entry);
-			}
-		}
-		xmlOutDoc.normalize();
-
-		// Save content in the specified output stream
-		return this.saveImpl(xmlOutDoc, outStream);
-	}
-
-	/**
-	 * Use to append specific type XML elements, use by the save() method.
-	 *
-	 * @param root
-	 *            XML parent element use to append this override type element.
-	 * @param entry
-	 *            The values to append.
-	 * @see #save(java.io.OutputStream)
-	 */
-	private void appendSpecificTypes(Element root,
-			Entry<PackagePartName, String> entry) {
-        Element specificType = root.getOwnerDocument().createElementNS(TYPES_NAMESPACE_URI, OVERRIDE_TAG_NAME);
-        specificType.setAttribute(PART_NAME_ATTRIBUTE_NAME, entry.getKey().getName());
-        specificType.setAttribute(CONTENT_TYPE_ATTRIBUTE_NAME, entry.getValue());
-        root.appendChild(specificType);
-	}
-
-	/**
-	 * Use to append default types XML elements, use by the save() method.
-	 *
-	 * @param root
-	 *            XML parent element use to append this default type element.
-	 * @param entry
-	 *            The values to append.
-	 * @see #save(java.io.OutputStream)
-	 */
-	private void appendDefaultType(Element root, Entry<String, String> entry) {
-        Element defaultType = root.getOwnerDocument().createElementNS(TYPES_NAMESPACE_URI, DEFAULT_TAG_NAME);
-        defaultType.setAttribute(EXTENSION_ATTRIBUTE_NAME, entry.getKey());
-        defaultType.setAttribute(CONTENT_TYPE_ATTRIBUTE_NAME, entry.getValue());
-        root.appendChild(defaultType);
-	}
-
-	/**
-	 * Specific implementation of the save method. Call by the save() method,
-	 * call before exiting.
-	 *
-	 * @param out
-	 *            The output stream use to write the content type XML.
-	 */
-	public abstract boolean saveImpl(Document content, OutputStream out);
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
deleted file mode 100644
index cc41e43..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-
-/**
- * Provide useful method to manage file.
- *
- * @author Julien Chable
- * @version 0.1
- */
-public final class FileHelper {
-
-	/**
-	 * Get the directory part of the specified file path.
-	 *
-	 * @param f
-	 *            File to process.
-	 * @return The directory path from the specified
-	 */
-	public static File getDirectory(File f) {
-		if (f != null) {
-			String path = f.getPath();
-			int len = path.length();
-			int num2 = len;
-			while (--num2 >= 0) {
-				char ch1 = path.charAt(num2);
-				if (ch1 == File.separatorChar) {
-					return new File(path.substring(0, num2));
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Copy a file.
-	 *
-	 * @param in
-	 *            The source file.
-	 * @param out
-	 *            The target location.
-	 * @throws IOException
-	 *             If an I/O error occur.
-	 */
-	public static void copyFile(File in, File out) throws IOException {
-		FileChannel sourceChannel = new FileInputStream(in).getChannel();
-		FileChannel destinationChannel = new FileOutputStream(out).getChannel();
-		sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel);
-		sourceChannel.close();
-		destinationChannel.close();
-	}
-
-	/**
-	 * Get file name from the specified File object.
-	 */
-	public static String getFilename(File file) {
-		if (file != null) {
-			String path = file.getPath();
-			int len = path.length();
-			int num2 = len;
-			while (--num2 >= 0) {
-				char ch1 = path.charAt(num2);
-				if (ch1 == File.separatorChar)
-					return path.substring(num2 + 1, len);
-			}
-		}
-		return "";
-	}
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
deleted file mode 100644
index f2d8c31..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.internal.marshallers.ZipPartMarshaller;
-import org.apache.poi.util.IOUtils;
-
-/**
- * Memory version of a package part. Use to
- * 
- * @author Julien Chable
- * @version 1.0
- */
-public final class MemoryPackagePart extends PackagePart {
-
-	/**
-	 * Storage for the part data.
-	 */
-	protected byte[] data;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param pack
-	 *            The owner package.
-	 * @param partName
-	 *            The part name.
-	 * @param contentType
-	 *            The content type.
-	 * @throws InvalidFormatException
-	 *             If the specified URI is not OPC compliant.
-	 */
-	public MemoryPackagePart(OPCPackage pack, PackagePartName partName,
-			String contentType) throws InvalidFormatException {
-		super(pack, partName, contentType);
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param pack
-	 *            The owner package.
-	 * @param partName
-	 *            The part name.
-	 * @param contentType
-	 *            The content type.
-	 * @param loadRelationships
-	 *            Specify if the relationships will be loaded.
-	 * @throws InvalidFormatException
-	 *             If the specified URI is not OPC compliant.
-	 */
-	public MemoryPackagePart(OPCPackage pack, PackagePartName partName,
-			String contentType, boolean loadRelationships)
-			throws InvalidFormatException {
-		super(pack, partName, new ContentType(contentType), loadRelationships);
-	}
-
-	@Override
-	protected InputStream getInputStreamImpl() {
-		// If this part has been created from scratch and/or the data buffer is
-		// not
-		// initialize, so we do it now.
-		if (data == null) {
-			data = new byte[0];
-		}
-		return new ByteArrayInputStream(data);
-	}
-
-	@Override
-	protected OutputStream getOutputStreamImpl() {
-		return new MemoryPackagePartOutputStream(this);
-	}
-
-	@Override
-	public long getSize() {
-		return data == null ? 0 : data.length;
-	}
-
-    @Override
-    public void clear() {
-		data = null;
-	}
-
-	@Override
-	public boolean save(OutputStream os) throws OpenXML4JException {
-		return new ZipPartMarshaller().marshall(this, os);
-	}
-
-	@Override
-	public boolean load(InputStream ios) throws InvalidFormatException {
-	   // Grab the data
-	   ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	   try {
-	      IOUtils.copy(ios, baos);
-	   } catch(IOException e) {
-	      throw new InvalidFormatException(e.getMessage());
-	   }
-	   
-	   // Save it
-	   data = baos.toByteArray();
-	   
-	   // All done
-	   return true;
-	}
-
-	@Override
-	public void close() {
-		// Do nothing
-	}
-
-	@Override
-	public void flush() {
-		// Do nothing
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
deleted file mode 100644
index cf809d6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Build an output stream for MemoryPackagePart.
- *
- * @author Julien Chable
- */
-public final class MemoryPackagePartOutputStream extends OutputStream {
-
-	private MemoryPackagePart _part;
-
-	private ByteArrayOutputStream _buff;
-
-	public MemoryPackagePartOutputStream(MemoryPackagePart part) {
-		this._part = part;
-		_buff = new ByteArrayOutputStream();
-	}
-
-	@Override
-	public void write(int b) {
-		_buff.write(b);
-	}
-
-	/**
-	 * Close this stream and flush the content.
-	 * @see #flush()
-	 */
-	@Override
-	public void close() throws IOException {
-		this.flush();
-	}
-
-	/**
-	 * Flush this output stream. This method is called by the close() method.
-	 * Warning : don't call this method for output consistency.
-	 * @see #close()
-	 */
-	@Override
-	public void flush() throws IOException {
-		_buff.flush();
-		if (_part.data != null) {
-			byte[] newArray = new byte[_part.data.length + _buff.size()];
-			// copy the previous contents of part.data in newArray
-			System.arraycopy(_part.data, 0, newArray, 0, _part.data.length);
-
-			// append the newly added data
-			byte[] buffArr = _buff.toByteArray();
-			System.arraycopy(buffArr, 0, newArray, _part.data.length,
-					buffArr.length);
-
-			// save the result as new data
-			_part.data = newArray;
-		} else {
-			// was empty, just fill it
-			_part.data = _buff.toByteArray();
-		}
-
-		/*
-		 * Clear this streams buffer, in case flush() is called a second time
-		 * Fix bug 1921637 - provided by Rainer Schwarze
-		 */
-		_buff.reset();
-	}
-
-	@Override
-	public void write(byte[] b, int off, int len) {
-		_buff.write(b, off, len);
-	}
-
-	@Override
-	public void write(byte[] b) throws IOException {
-		_buff.write(b);
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
deleted file mode 100644
index 6fb7f65..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
+++ /dev/null
@@ -1,675 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageProperties;
-import org.apache.poi.openxml4j.util.Nullable;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Represents the core properties part of a package.
- *
- * @author Julien Chable
- */
-public final class PackagePropertiesPart extends PackagePart implements
-		PackageProperties {
-
-	public final static String NAMESPACE_DC_URI = "http://purl.org/dc/elements/1.1/";
-
-	public final static String NAMESPACE_CP_URI = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties";
-
-	public final static String NAMESPACE_DCTERMS_URI = "http://purl.org/dc/terms/";
-
-	private final static String DEFAULT_DATEFORMAT =   "yyyy-MM-dd'T'HH:mm:ss'Z'";
-
-	private final static String[] DATE_FORMATS = new String[]{
-			DEFAULT_DATEFORMAT,
-			"yyyy-MM-dd'T'HH:mm:ss.SS'Z'",
-            "yyyy-MM-dd"
-	};
-
-	//Had to add this and TIME_ZONE_PAT to handle tz with colons.
-	//When we move to Java 7, we should be able to add another
-	//date format to DATE_FORMATS that uses XXX and get rid of this
-	//and TIME_ZONE_PAT
-	// TODO Fix this after the Java 7 upgrade
-	private final String[] TZ_DATE_FORMATS = new String[]{
-			"yyyy-MM-dd'T'HH:mm:ssz",
-            "yyyy-MM-dd'T'HH:mm:ss.Sz",
-            "yyyy-MM-dd'T'HH:mm:ss.SSz",
-			"yyyy-MM-dd'T'HH:mm:ss.SSSz",
-	};
-
-	private final Pattern TIME_ZONE_PAT = Pattern.compile("([-+]\\d\\d):?(\\d\\d)");
-	/**
-	 * Constructor.
-	 *
-	 * @param pack
-	 *            Container package.
-	 * @param partName
-	 *            Name of this part.
-	 * @throws InvalidFormatException
-	 *             Throws if the content is invalid.
-	 */
-	public PackagePropertiesPart(OPCPackage pack, PackagePartName partName)
-			throws InvalidFormatException {
-		super(pack, partName, ContentTypes.CORE_PROPERTIES_PART);
-	}
-
-	/**
-	 * A categorization of the content of this package.
-	 *
-	 * [Example: Example values for this property might include: Resume, Letter,
-	 * Financial Forecast, Proposal, Technical Presentation, and so on. This
-	 * value might be used by an application's user interface to facilitate
-	 * navigation of a large set of documents. end example]
-	 */
-	protected Nullable<String> category = new Nullable<String>();
-
-	/**
-	 * The status of the content.
-	 *
-	 * [Example: Values might include "Draft", "Reviewed", and "Final". end
-	 * example]
-	 */
-	protected Nullable<String> contentStatus = new Nullable<String>();
-
-	/**
-	 * The type of content represented, generally defined by a specific use and
-	 * intended audience.
-	 *
-	 * [Example: Values might include "Whitepaper", "Security Bulletin", and
-	 * "Exam". end example] [Note: This property is distinct from MIME content
-	 * types as defined in RFC 2616. end note]
-	 */
-	protected Nullable<String> contentType = new Nullable<String>();
-
-	/**
-	 * Date of creation of the resource.
-	 */
-	protected Nullable<Date> created = new Nullable<Date>();
-
-	/**
-	 * An entity primarily responsible for making the content of the resource.
-	 */
-	protected Nullable<String> creator = new Nullable<String>();
-
-	/**
-	 * An explanation of the content of the resource.
-	 *
-	 * [Example: Values might include an abstract, table of contents, reference
-	 * to a graphical representation of content, and a free-text account of the
-	 * content. end example]
-	 */
-	protected Nullable<String> description = new Nullable<String>();
-
-	/**
-	 * An unambiguous reference to the resource within a given context.
-	 */
-	protected Nullable<String> identifier = new Nullable<String>();
-
-	/**
-	 * A delimited set of keywords to support searching and indexing. This is
-	 * typically a list of terms that are not available elsewhere in the
-	 * properties.
-	 */
-	protected Nullable<String> keywords = new Nullable<String>();
-
-	/**
-	 * The language of the intellectual content of the resource.
-	 *
-	 * [Note: IETF RFC 3066 provides guidance on encoding to represent
-	 * languages. end note]
-	 */
-	protected Nullable<String> language = new Nullable<String>();
-
-	/**
-	 * The user who performed the last modification. The identification is
-	 * environment-specific.
-	 *
-	 * [Example: A name, email address, or employee ID. end example] It is
-	 * recommended that this value be as concise as possible.
-	 */
-	protected Nullable<String> lastModifiedBy = new Nullable<String>();
-
-	/**
-	 * The date and time of the last printing.
-	 */
-	protected Nullable<Date> lastPrinted = new Nullable<Date>();
-
-	/**
-	 * Date on which the resource was changed.
-	 */
-	protected Nullable<Date> modified = new Nullable<Date>();
-
-	/**
-	 * The revision number.
-	 *
-	 * [Example: This value might indicate the number of saves or revisions,
-	 * provided the application updates it after each revision. end example]
-	 */
-	protected Nullable<String> revision = new Nullable<String>();
-
-	/**
-	 * The topic of the content of the resource.
-	 */
-	protected Nullable<String> subject = new Nullable<String>();
-
-	/**
-	 * The name given to the resource.
-	 */
-	protected Nullable<String> title = new Nullable<String>();
-
-	/**
-	 * The version number. This value is set by the user or by the application.
-	 */
-	protected Nullable<String> version = new Nullable<String>();
-
-	/*
-	 * Getters and setters
-	 */
-
-	/**
-	 * Get the category property.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getCategoryProperty()
-	 */
-	public Nullable<String> getCategoryProperty() {
-		return category;
-	}
-
-	/**
-	 * Get content status.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getContentStatusProperty()
-	 */
-	public Nullable<String> getContentStatusProperty() {
-		return contentStatus;
-	}
-
-	/**
-	 * Get content type.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getContentTypeProperty()
-	 */
-	public Nullable<String> getContentTypeProperty() {
-		return contentType;
-	}
-
-	/**
-	 * Get created date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getCreatedProperty()
-	 */
-	public Nullable<Date> getCreatedProperty() {
-		return created;
-	}
-
-	/**
-	 * Get created date formated into a String.
-	 *
-	 * @return A string representation of the created date.
-	 */
-	public String getCreatedPropertyString() {
-		return getDateValue(created);
-	}
-
-	/**
-	 * Get creator.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getCreatorProperty()
-	 */
-	public Nullable<String> getCreatorProperty() {
-		return creator;
-	}
-
-	/**
-	 * Get description.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getDescriptionProperty()
-	 */
-	public Nullable<String> getDescriptionProperty() {
-		return description;
-	}
-
-	/**
-	 * Get identifier.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getIdentifierProperty()
-	 */
-	public Nullable<String> getIdentifierProperty() {
-		return identifier;
-	}
-
-	/**
-	 * Get keywords.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getKeywordsProperty()
-	 */
-	public Nullable<String> getKeywordsProperty() {
-		return keywords;
-	}
-
-	/**
-	 * Get the language.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getLanguageProperty()
-	 */
-	public Nullable<String> getLanguageProperty() {
-		return language;
-	}
-
-	/**
-	 * Get the author of last modifications.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getLastModifiedByProperty()
-	 */
-	public Nullable<String> getLastModifiedByProperty() {
-		return lastModifiedBy;
-	}
-
-	/**
-	 * Get last printed date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getLastPrintedProperty()
-	 */
-	public Nullable<Date> getLastPrintedProperty() {
-		return lastPrinted;
-	}
-
-	/**
-	 * Get last printed date formated into a String.
-	 *
-	 * @return A string representation of the last printed date.
-	 */
-	public String getLastPrintedPropertyString() {
-		return getDateValue(lastPrinted);
-	}
-
-	/**
-	 * Get modified date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getModifiedProperty()
-	 */
-	public Nullable<Date> getModifiedProperty() {
-		return modified;
-	}
-
-	/**
-	 * Get modified date formated into a String.
-	 *
-	 * @return A string representation of the modified date.
-	 */
-	public String getModifiedPropertyString() {
-		if (modified.hasValue()) {
-			return getDateValue(modified);
-		}
-		return getDateValue(new Nullable<Date>(new Date()));
-	}
-
-	/**
-	 * Get revision.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getRevisionProperty()
-	 */
-	public Nullable<String> getRevisionProperty() {
-		return revision;
-	}
-
-	/**
-	 * Get subject.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getSubjectProperty()
-	 */
-	public Nullable<String> getSubjectProperty() {
-		return subject;
-	}
-
-	/**
-	 * Get title.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getTitleProperty()
-	 */
-	public Nullable<String> getTitleProperty() {
-		return title;
-	}
-
-	/**
-	 * Get version.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#getVersionProperty()
-	 */
-	public Nullable<String> getVersionProperty() {
-		return version;
-	}
-
-	/**
-	 * Set the category.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setCategoryProperty(java.lang.String)
-	 */
-	public void setCategoryProperty(String category) {
-		this.category = setStringValue(category);
-	}
-
-	/**
-	 * Set the content status.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setContentStatusProperty(java.lang.String)
-	 */
-	public void setContentStatusProperty(String contentStatus) {
-		this.contentStatus = setStringValue(contentStatus);
-	}
-
-	/**
-	 * Set the content type.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setContentTypeProperty(java.lang.String)
-	 */
-	public void setContentTypeProperty(String contentType) {
-		this.contentType = setStringValue(contentType);
-	}
-
-	/**
-	 * Set the created date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setCreatedProperty(org.apache.poi.openxml4j.util.Nullable)
-	 */
-	public void setCreatedProperty(String created) {
-		try {
-			this.created = setDateValue(created);
-		} catch (InvalidFormatException e) {
-			throw new IllegalArgumentException("Date for created could not be parsed: " + created, e);
-		}
-	}
-
-	/**
-	 * Set the created date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setCreatedProperty(org.apache.poi.openxml4j.util.Nullable)
-	 */
-	public void setCreatedProperty(Nullable<Date> created) {
-		if (created.hasValue())
-			this.created = created;
-	}
-
-	/**
-	 * Set the creator.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setCreatorProperty(java.lang.String)
-	 */
-	public void setCreatorProperty(String creator) {
-		this.creator = setStringValue(creator);
-	}
-
-	/**
-	 * Set the description.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setDescriptionProperty(java.lang.String)
-	 */
-	public void setDescriptionProperty(String description) {
-		this.description = setStringValue(description);
-	}
-
-	/**
-	 * Set identifier.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setIdentifierProperty(java.lang.String)
-	 */
-	public void setIdentifierProperty(String identifier) {
-		this.identifier = setStringValue(identifier);
-	}
-
-	/**
-	 * Set keywords.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setKeywordsProperty(java.lang.String)
-	 */
-	public void setKeywordsProperty(String keywords) {
-		this.keywords = setStringValue(keywords);
-	}
-
-	/**
-	 * Set language.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setLanguageProperty(java.lang.String)
-	 */
-	public void setLanguageProperty(String language) {
-		this.language = setStringValue(language);
-	}
-
-	/**
-	 * Set last modifications author.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setLastModifiedByProperty(java.lang.String)
-	 */
-	public void setLastModifiedByProperty(String lastModifiedBy) {
-		this.lastModifiedBy = setStringValue(lastModifiedBy);
-	}
-
-	/**
-	 * Set last printed date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setLastPrintedProperty(org.apache.poi.openxml4j.util.Nullable)
-	 */
-	public void setLastPrintedProperty(String lastPrinted) {
-		try {
-			this.lastPrinted = setDateValue(lastPrinted);
-		} catch (InvalidFormatException e) {
-			throw new IllegalArgumentException("lastPrinted  : "
-					+ e.getLocalizedMessage(), e);
-		}
-	}
-
-	/**
-	 * Set last printed date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setLastPrintedProperty(org.apache.poi.openxml4j.util.Nullable)
-	 */
-	public void setLastPrintedProperty(Nullable<Date> lastPrinted) {
-		if (lastPrinted.hasValue())
-			this.lastPrinted = lastPrinted;
-	}
-
-	/**
-	 * Set last modification date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setModifiedProperty(org.apache.poi.openxml4j.util.Nullable)
-	 */
-	public void setModifiedProperty(String modified) {
-		try {
-			this.modified = setDateValue(modified);
-		} catch (InvalidFormatException e) {
-			throw new IllegalArgumentException("modified  : "
-					+ e.getLocalizedMessage(), e);
-		}
-	}
-
-	/**
-	 * Set last modification date.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setModifiedProperty(org.apache.poi.openxml4j.util.Nullable)
-	 */
-	public void setModifiedProperty(Nullable<Date> modified) {
-		if (modified.hasValue())
-			this.modified = modified;
-	}
-
-	/**
-	 * Set revision.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setRevisionProperty(java.lang.String)
-	 */
-	public void setRevisionProperty(String revision) {
-		this.revision = setStringValue(revision);
-	}
-
-	/**
-	 * Set subject.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setSubjectProperty(java.lang.String)
-	 */
-	public void setSubjectProperty(String subject) {
-		this.subject = setStringValue(subject);
-	}
-
-	/**
-	 * Set title.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setTitleProperty(java.lang.String)
-	 */
-	public void setTitleProperty(String title) {
-		this.title = setStringValue(title);
-	}
-
-	/**
-	 * Set version.
-	 *
-	 * @see org.apache.poi.openxml4j.opc.PackageProperties#setVersionProperty(java.lang.String)
-	 */
-	public void setVersionProperty(String version) {
-		this.version = setStringValue(version);
-	}
-
-	/**
-	 * Convert a strig value into a Nullable<String>
-	 */
-	private Nullable<String> setStringValue(String s) {
-		if (s == null || s.equals("")) {
-			return new Nullable<String>();
-		}
-		return new Nullable<String>(s);
-	}
-
-	/**
-	 * Convert a string value represented a date into a Nullable<Date>.
-	 *
-	 * @throws InvalidFormatException
-	 *             Throws if the date format isnot valid.
-	 */
-	private Nullable<Date> setDateValue(String dateStr) throws InvalidFormatException {
-		if (dateStr == null || dateStr.equals("")) {
-			return new Nullable<Date>();
-		}
-
-		Matcher m = TIME_ZONE_PAT.matcher(dateStr);
-		if (m.find()) {
-			String dateTzStr = dateStr.substring(0, m.start())+
-					m.group(1)+m.group(2);
-			for (String fStr : TZ_DATE_FORMATS) {
-				SimpleDateFormat df = new SimpleDateFormat(fStr, Locale.ROOT);
-				df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-				Date d = df.parse(dateTzStr, new ParsePosition(0));
-				if (d != null) {
-					return new Nullable<Date>(d);
-				}
-			}
-		}
-		String dateTzStr = dateStr.endsWith("Z") ? dateStr : (dateStr + "Z");
-		for (String fStr : DATE_FORMATS) {
-			SimpleDateFormat df = new SimpleDateFormat(fStr, Locale.ROOT);
-			df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-			Date d = df.parse(dateTzStr, new ParsePosition(0));
-			if (d != null) {
-				return new Nullable<Date>(d);
-			}
-		}
-		//if you're here, no pattern matched, throw exception
-		StringBuilder sb = new StringBuilder();
-		int i = 0;
-		for (String fStr : TZ_DATE_FORMATS) {
-			if (i++ > 0) {
-				sb.append(", ");
-			}
-			sb.append(fStr);
-		}
-		for (String fStr : DATE_FORMATS) {
-			sb.append(", ").append(fStr);
-		}
-		throw new InvalidFormatException("Date " + dateStr + " not well formatted, "
-		        + "expected format in: "+sb.toString());
-	}
-
-	/**
-	 * Convert a Nullable<Date> into a String.
-	 *
-	 * @param d
-	 *            The Date to convert.
-	 * @return The formated date or null.
-	 * @see java.text.SimpleDateFormat
-	 */
-	private String getDateValue(Nullable<Date> d) {
-		if (d == null) {
-			return "";
-		}
-		Date date = d.getValue();
-		if (date == null) {
-		   return "";
-		}
-
-		SimpleDateFormat df = new SimpleDateFormat(DEFAULT_DATEFORMAT, Locale.ROOT);
-		df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-		return df.format(date);
-	}
-
-	@Override
-	protected InputStream getInputStreamImpl() {
-		throw new InvalidOperationException("Operation not authorized. This part may only be manipulated using the getters and setters on PackagePropertiesPart");
-	}
-
-	@Override
-	protected OutputStream getOutputStreamImpl() {
-		throw new InvalidOperationException(
-				"Can't use output stream to set properties !");
-	}
-
-	@Override
-	public boolean save(OutputStream zos) {
-		throw new InvalidOperationException("Operation not authorized. This part may only be manipulated using the getters and setters on PackagePropertiesPart");
-	}
-
-	@Override
-	public boolean load(InputStream ios) {
-		throw new InvalidOperationException("Operation not authorized. This part may only be manipulated using the getters and setters on PackagePropertiesPart");
-	}
-
-	@Override
-	public void close() {
-		// Do nothing
-	}
-
-	@Override
-	public void flush() {
-		// Do nothing
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
deleted file mode 100644
index e30d717..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.OutputStream;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-
-/**
- * Object implemented this interface are considered as part marshaller. A part
- * marshaller is responsible to marshall a part in order to be save in a
- * package.
- *
- * @author Julien Chable
- * @version 0.1
- */
-public interface PartMarshaller {
-
-	/**
-	 * Save the content of the package in the stream
-	 *
-	 * @param part
-	 *            Part to marshall.
-	 * @param out
-	 *            The output stream into which the part will be marshall.
-	 * @return <b>false</b> if any marshall error occurs, else <b>true</b>
-	 * @throws OpenXML4JException
-	 *             Throws only if any other exceptions are thrown by inner
-	 *             methods.
-	 */
-	public boolean marshall(PackagePart part, OutputStream out)
-			throws OpenXML4JException;
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
deleted file mode 100644
index e5487a6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.internal.unmarshallers.UnmarshallContext;
-
-/**
- * Object implemented this interface are considered as part unmarshaller. A part
- * unmarshaller is responsible to unmarshall a part in order to load it from a
- * package.
- *
- * @author Julien Chable
- * @version 0.1
- */
-public interface PartUnmarshaller {
-
-	/**
-	 * Save the content of the package in the stream
-	 *
-	 * @param in
-	 *            The input stream from which the part will be unmarshall.
-	 * @return The part freshly unmarshall from the input stream.
-	 * @throws OpenXML4JException
-	 *             Throws only if any other exceptions are thrown by inner
-	 *             methods.
-	 */
-	public PackagePart unmarshall(UnmarshallContext context, InputStream in)
-			throws InvalidFormatException, IOException;
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
deleted file mode 100644
index 1e00d93..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.StreamHelper;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.w3c.dom.Document;
-
-/**
- * Zip implementation of the ContentTypeManager.
- *
- * @author Julien Chable
- * @version 1.0
- * @see ContentTypeManager
- */
-public class ZipContentTypeManager extends ContentTypeManager {
-    private static POILogger logger = POILogFactory.getLogger(ZipContentTypeManager.class);
-
-	/**
-	 * Delegate constructor to the super constructor.
-	 *
-	 * @param in
-	 *            The input stream to parse to fill internal content type
-	 *            collections.
-	 * @throws InvalidFormatException
-	 *             If the content types part content is not valid.
-	 */
-	public ZipContentTypeManager(InputStream in, OPCPackage pkg)
-			throws InvalidFormatException {
-		super(in, pkg);
-	}
-
-	@SuppressWarnings("resource")
-    @Override
-	public boolean saveImpl(Document content, OutputStream out) {
-		ZipOutputStream zos = null;
-		if (out instanceof ZipOutputStream)
-			zos = (ZipOutputStream) out;
-		else
-			zos = new ZipOutputStream(out);
-
-		ZipEntry partEntry = new ZipEntry(CONTENT_TYPES_PART_NAME);
-		try {
-			// Referenced in ZIP
-			zos.putNextEntry(partEntry);
-			// Saving data in the ZIP file
-			if (!StreamHelper.saveXmlInStream(content, zos)) {
-			    return false;
-			}
-			zos.closeEntry();
-		} catch (IOException ioe) {
-			logger.log(POILogger.ERROR, "Cannot write: " + CONTENT_TYPES_PART_NAME
-					+ " in Zip !", ioe);
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
deleted file mode 100644
index b674b3a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-
-import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.OLE2NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.ZipPackage;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.openxml4j.util.ZipSecureFile.ThresholdInputStream;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.storage.HeaderBlockConstants;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-
-public final class ZipHelper {
-    /**
-     * Forward slash use to convert part name between OPC and zip item naming
-     * conventions.
-     */
-    private final static String FORWARD_SLASH = "/";
-
-    /**
-     * Buffer to read data from file. Use big buffer to improve performaces. the
-     * InputStream class is reading only 8192 bytes per read call (default value
-     * set by sun)
-     */
-    public static final int READ_WRITE_FILE_BUFFER_SIZE = 8192;
-
-    /**
-     * Prevent this class to be instancied.
-     */
-    private ZipHelper() {
-        // Do nothing
-    }
-
-    /**
-     * Retrieve the zip entry of the core properties part.
-     *
-     * @throws OpenXML4JException
-     *             Throws if internal error occurs.
-     */
-    public static ZipEntry getCorePropertiesZipEntry(ZipPackage pkg) {
-        PackageRelationship corePropsRel = pkg.getRelationshipsByType(
-                PackageRelationshipTypes.CORE_PROPERTIES).getRelationship(0);
-
-        if (corePropsRel == null)
-            return null;
-
-        return new ZipEntry(corePropsRel.getTargetURI().getPath());
-    }
-
-    /**
-     * Retrieve the Zip entry of the content types part.
-     */
-    public static ZipEntry getContentTypeZipEntry(ZipPackage pkg) {
-        Enumeration<? extends ZipEntry> entries = pkg.getZipArchive().getEntries();
-
-        // Enumerate through the Zip entries until we find the one named
-        // '[Content_Types].xml'.
-        while (entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            if (entry.getName().equals(
-                    ContentTypeManager.CONTENT_TYPES_PART_NAME))
-                return entry;
-        }
-        return null;
-    }
-
-    /**
-     * Convert a zip name into an OPC name by adding a leading forward slash to
-     * the specified item name.
-     *
-     * @param zipItemName
-     *            Zip item name to convert.
-     * @return An OPC compliant name.
-     */
-    public static String getOPCNameFromZipItemName(String zipItemName) {
-        if (zipItemName == null)
-            throw new IllegalArgumentException("zipItemName");
-        if (zipItemName.startsWith(FORWARD_SLASH)) {
-            return zipItemName;
-        }
-        return FORWARD_SLASH + zipItemName;
-    }
-
-    /**
-     * Convert an OPC item name into a zip item name by removing any leading
-     * forward slash if it exist.
-     *
-     * @param opcItemName
-     *            The OPC item name to convert.
-     * @return A zip item name without any leading slashes.
-     */
-    public static String getZipItemNameFromOPCName(String opcItemName) {
-        if (opcItemName == null)
-            throw new IllegalArgumentException("opcItemName");
-
-        String retVal = opcItemName;
-        while (retVal.startsWith(FORWARD_SLASH))
-            retVal = retVal.substring(1);
-        return retVal;
-    }
-
-    /**
-     * Convert an OPC item name into a zip URI by removing any leading forward
-     * slash if it exist.
-     *
-     * @param opcItemName
-     *            The OPC item name to convert.
-     * @return A zip URI without any leading slashes.
-     */
-    public static URI getZipURIFromOPCName(String opcItemName) {
-        if (opcItemName == null)
-            throw new IllegalArgumentException("opcItemName");
-
-        String retVal = opcItemName;
-        while (retVal.startsWith(FORWARD_SLASH))
-            retVal = retVal.substring(1);
-        try {
-            return new URI(retVal);
-        } catch (URISyntaxException e) {
-            return null;
-        }
-    }
-    
-    /**
-     * Verifies that the given stream starts with a Zip structure.
-     * 
-     * Warning - this will consume the first few bytes of the stream,
-     *  you should push-back or reset the stream after use!
-     */
-    public static void verifyZipHeader(InputStream stream) 
-            throws NotOfficeXmlFileException, IOException {
-        // Grab the first 8 bytes
-        byte[] data = new byte[8];
-        IOUtils.readFully(stream, data);
-        
-        // OLE2?
-        long signature = LittleEndian.getLong(data);
-        if (signature == HeaderBlockConstants._signature) {
-            throw new OLE2NotOfficeXmlFileException(
-                "The supplied data appears to be in the OLE2 Format. " +
-                "You are calling the part of POI that deals with OOXML "+
-                "(Office Open XML) Documents. You need to call a different " +
-                "part of POI to process this data (eg HSSF instead of XSSF)");
-        }
-        
-        // Raw XML?
-        byte[] RAW_XML_FILE_HEADER = POIFSConstants.RAW_XML_FILE_HEADER;
-        if (data[0] == RAW_XML_FILE_HEADER[0] &&
-            data[1] == RAW_XML_FILE_HEADER[1] &&
-            data[2] == RAW_XML_FILE_HEADER[2] &&
-            data[3] == RAW_XML_FILE_HEADER[3] &&
-            data[4] == RAW_XML_FILE_HEADER[4]) {
-            throw new NotOfficeXmlFileException(
-                "The supplied data appears to be a raw XML file. " +
-                "Formats such as Office 2003 XML are not supported");
-        }
-
-        // Don't check for a Zip header, as to maintain backwards
-        //  compatibility we need to let them seek over junk at the
-        //  start before beginning processing.
-        
-        // Put things back
-        if (stream instanceof PushbackInputStream) {
-            ((PushbackInputStream)stream).unread(data);
-        } else if (stream.markSupported()) {
-            stream.reset();
-        } else if (stream instanceof FileInputStream) {
-            // File open check, about to be closed, nothing to do
-        } else {
-            // Oh dear... I hope you know what you're doing!
-        }
-    }
-    
-    private static InputStream prepareToCheckHeader(InputStream stream) {
-        if (stream instanceof PushbackInputStream) {
-            return stream;
-        }
-        if (stream.markSupported()) {
-            stream.mark(8);
-            return stream;
-        }
-        return new PushbackInputStream(stream, 8);
-    }
-
-    /**
-     * Opens the specified stream as a secure zip
-     *
-     * @param stream
-     *            The stream to open.
-     * @return The zip stream freshly open.
-     */
-    @SuppressWarnings("resource")
-    public static ThresholdInputStream openZipStream(InputStream stream) throws IOException {
-        // Peek at the first few bytes to sanity check
-        InputStream checkedStream = prepareToCheckHeader(stream);
-        verifyZipHeader(checkedStream);
-        
-        // Open as a proper zip stream
-        InputStream zis = new ZipInputStream(checkedStream);
-        return ZipSecureFile.addThreshold(zis);
-    }
-
-    /**
-     * Opens the specified file as a secure zip, or returns null if no 
-     *  such file exists
-     *
-     * @param file
-     *            The file to open.
-     * @return The zip archive freshly open.
-     * @throws IOException if the zip file cannot be opened or closed to read the header signature
-     * @throws NotOfficeXmlFileException if stream does not start with zip header signature
-     */
-    public static ZipFile openZipFile(File file) throws IOException, NotOfficeXmlFileException {
-        if (!file.exists()) {
-            throw new FileNotFoundException("File does not exist");
-        }
-        if (file.isDirectory()) {
-            throw new IOException("File is a directory");
-        }
-        
-        // Peek at the first few bytes to sanity check
-        FileInputStream input = new FileInputStream(file);
-        try {
-            verifyZipHeader(input);
-        } finally {
-            input.close();
-        }
-
-        // Open as a proper zip file
-        return new ZipSecureFile(file);
-    }
-
-    /**
-     * Retrieve and open as a secure zip file with the specified path.
-     *
-     * @param path
-     *            The file path.
-     * @return The zip archive freshly open.
-     */
-    public static ZipFile openZipFile(String path) throws IOException {
-        return openZipFile(new File(path));
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
deleted file mode 100644
index 8cd2f7d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal.marshallers;
-
-import java.io.OutputStream;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.internal.PartMarshaller;
-
-/**
- * Default marshaller that specified that the part is responsible to marshall its content.
- *
- * @author Julien Chable
- * @version 1.0
- * @see PartMarshaller
- */
-public final class DefaultMarshaller implements PartMarshaller {
-
-	/**
-	 * Save part in the output stream by using the save() method of the part.
-	 *
-	 * @throws OpenXML4JException
-	 *             If any error occur.
-	 */
-	public boolean marshall(PackagePart part, OutputStream out)
-			throws OpenXML4JException {
-		return part.save(out);
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
deleted file mode 100644
index 7a8f400..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal.marshallers;
-
-import java.io.OutputStream;
-
-import javax.xml.XMLConstants;
-import javax.xml.stream.XMLEventFactory;
-import javax.xml.stream.events.Namespace;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.openxml4j.opc.internal.PartMarshaller;
-import org.apache.poi.openxml4j.util.Nullable;
-import org.apache.poi.util.DocumentHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Package properties marshaller.
- */
-public class PackagePropertiesMarshaller implements PartMarshaller {
-    private final static Namespace namespaceDC, namespaceCoreProperties, namespaceDcTerms, namespaceXSI;
-	static {
-	    final XMLEventFactory f = XMLEventFactory.newInstance();
-	    namespaceDC = f.createNamespace("dc", PackagePropertiesPart.NAMESPACE_DC_URI);
-	    namespaceCoreProperties = f.createNamespace("cp", PackagePropertiesPart.NAMESPACE_CP_URI);
-	    namespaceDcTerms = f.createNamespace("dcterms", PackagePropertiesPart.NAMESPACE_DCTERMS_URI);
-	    namespaceXSI = f.createNamespace("xsi", XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);
-	}
-
-	protected static final String KEYWORD_CATEGORY = "category";
-
-	protected static final String KEYWORD_CONTENT_STATUS = "contentStatus";
-
-	protected static final String KEYWORD_CONTENT_TYPE = "contentType";
-
-	protected static final String KEYWORD_CREATED = "created";
-
-	protected static final String KEYWORD_CREATOR = "creator";
-
-	protected static final String KEYWORD_DESCRIPTION = "description";
-
-	protected static final String KEYWORD_IDENTIFIER = "identifier";
-
-	protected static final String KEYWORD_KEYWORDS = "keywords";
-
-	protected static final String KEYWORD_LANGUAGE = "language";
-
-	protected static final String KEYWORD_LAST_MODIFIED_BY = "lastModifiedBy";
-
-	protected static final String KEYWORD_LAST_PRINTED = "lastPrinted";
-
-	protected static final String KEYWORD_MODIFIED = "modified";
-
-	protected static final String KEYWORD_REVISION = "revision";
-
-	protected static final String KEYWORD_SUBJECT = "subject";
-
-	protected static final String KEYWORD_TITLE = "title";
-
-	protected static final String KEYWORD_VERSION = "version";
-
-	PackagePropertiesPart propsPart;
-
-	// The document
-	Document xmlDoc = null;
-
-	/**
-	 * Marshall package core properties to an XML document. Always return
-	 * <code>true</code>.
-	 */
-	@Override
-	public boolean marshall(PackagePart part, OutputStream out)
-			throws OpenXML4JException {
-		if (!(part instanceof PackagePropertiesPart))
-			throw new IllegalArgumentException(
-					"'part' must be a PackagePropertiesPart instance.");
-		propsPart = (PackagePropertiesPart) part;
-
-		// Configure the document
-		xmlDoc = DocumentHelper.createDocument();
-        Element rootElem = xmlDoc.createElementNS(namespaceCoreProperties.getNamespaceURI(),
-                getQName("coreProperties", namespaceCoreProperties));
-        DocumentHelper.addNamespaceDeclaration(rootElem, namespaceCoreProperties);
-        DocumentHelper.addNamespaceDeclaration(rootElem, namespaceDC);
-        DocumentHelper.addNamespaceDeclaration(rootElem, namespaceDcTerms);
-        DocumentHelper.addNamespaceDeclaration(rootElem, namespaceXSI);
-        xmlDoc.appendChild(rootElem);
-
-		addCategory();
-		addContentStatus();
-		addContentType();
-		addCreated();
-		addCreator();
-		addDescription();
-		addIdentifier();
-		addKeywords();
-		addLanguage();
-		addLastModifiedBy();
-		addLastPrinted();
-		addModified();
-		addRevision();
-		addSubject();
-		addTitle();
-		addVersion();
-		return true;
-	}
-
-    /**
-     * Sets the given element's text content, creating it if necessary.
-     */
-    private Element setElementTextContent(String localName, Namespace namespace, Nullable<String> property) {
-        return setElementTextContent(localName, namespace, property, property.getValue());
-    }
-    
-    private String getQName(String localName, Namespace namespace) {
-        return namespace.getPrefix().isEmpty() ? localName : namespace.getPrefix() + ':' + localName;
-    }
-
-    private Element setElementTextContent(String localName, Namespace namespace, Nullable<?> property, String propertyValue) {
-        if (!property.hasValue())
-            return null;
-
-        Element root = xmlDoc.getDocumentElement();
-        Element elem = (Element) root.getElementsByTagNameNS(namespace.getNamespaceURI(), localName).item(0);
-        if (elem == null) {
-            // missing, we add it
-            elem = xmlDoc.createElementNS(namespace.getNamespaceURI(), getQName(localName, namespace));
-            root.appendChild(elem);
-        }
-        elem.setTextContent(propertyValue);
-        return elem;
-    }
-
-    private Element setElementTextContent(String localName, Namespace namespace, Nullable<?> property, String propertyValue, String xsiType) {
-        Element element = setElementTextContent(localName, namespace, property, propertyValue);
-        if (element != null) {
-            element.setAttributeNS(namespaceXSI.getNamespaceURI(), getQName("type", namespaceXSI), xsiType);
-        }
-        return element;
-    }
-
-
-    /**
-	 * Add category property element if needed.
-	 */
-	private void addCategory() {
-        setElementTextContent(KEYWORD_CATEGORY, namespaceCoreProperties, propsPart.getCategoryProperty());
-	}
-
-	/**
-	 * Add content status property element if needed.
-	 */
-	private void addContentStatus() {
-        setElementTextContent(KEYWORD_CONTENT_STATUS, namespaceCoreProperties, propsPart.getContentStatusProperty());
-	}
-
-	/**
-	 * Add content type property element if needed.
-	 */
-	private void addContentType() {
-        setElementTextContent(KEYWORD_CONTENT_TYPE, namespaceCoreProperties, propsPart.getContentTypeProperty());
-	}
-
-	/**
-	 * Add created property element if needed.
-	 */
-	private void addCreated() {
-        setElementTextContent(KEYWORD_CREATED, namespaceDcTerms, propsPart.getCreatedProperty(),
-                propsPart.getCreatedPropertyString(), "dcterms:W3CDTF");
-	}
-
-	/**
-	 * Add creator property element if needed.
-	 */
-	private void addCreator() {
-        setElementTextContent(KEYWORD_CREATOR, namespaceDC, propsPart.getCreatorProperty());
-	}
-
-	/**
-	 * Add description property element if needed.
-	 */
-	private void addDescription() {
-        setElementTextContent(KEYWORD_DESCRIPTION, namespaceDC, propsPart.getDescriptionProperty());
-	}
-
-	/**
-	 * Add identifier property element if needed.
-	 */
-	private void addIdentifier() {
-        setElementTextContent(KEYWORD_IDENTIFIER, namespaceDC, propsPart.getIdentifierProperty());
-	}
-
-    /**
-	 * Add keywords property element if needed.
-	 */
-	private void addKeywords() {
-        setElementTextContent(KEYWORD_KEYWORDS, namespaceCoreProperties, propsPart.getKeywordsProperty());
-	}
-
-	/**
-	 * Add language property element if needed.
-	 */
-	private void addLanguage() {
-        setElementTextContent(KEYWORD_LANGUAGE, namespaceDC, propsPart.getLanguageProperty());
-	}
-
-	/**
-	 * Add 'last modified by' property if needed.
-	 */
-	private void addLastModifiedBy() {
-        setElementTextContent(KEYWORD_LAST_MODIFIED_BY, namespaceCoreProperties, propsPart.getLastModifiedByProperty());
-	}
-
-	/**
-	 * Add 'last printed' property if needed.
-	 *
-	 */
-	private void addLastPrinted() {
-        setElementTextContent(KEYWORD_LAST_PRINTED, namespaceCoreProperties, propsPart.getLastPrintedProperty(), propsPart.getLastPrintedPropertyString());
-	}
-
-	/**
-	 * Add modified property element if needed.
-	 */
-	private void addModified() {
-        setElementTextContent(KEYWORD_MODIFIED, namespaceDcTerms, propsPart.getModifiedProperty(),
-                propsPart.getModifiedPropertyString(), "dcterms:W3CDTF");
-    }
-
-	/**
-	 * Add revision property if needed.
-	 */
-	private void addRevision() {
-        setElementTextContent(KEYWORD_REVISION, namespaceCoreProperties, propsPart.getRevisionProperty());
-	}
-
-	/**
-	 * Add subject property if needed.
-	 */
-	private void addSubject() {
-        setElementTextContent(KEYWORD_SUBJECT, namespaceDC, propsPart.getSubjectProperty());
-	}
-
-	/**
-	 * Add title property if needed.
-	 */
-	private void addTitle() {
-        setElementTextContent(KEYWORD_TITLE, namespaceDC, propsPart.getTitleProperty());
-	}
-
-	private void addVersion() {
-        setElementTextContent(KEYWORD_VERSION, namespaceCoreProperties, propsPart.getVersionProperty());
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
deleted file mode 100644
index 6b4b215..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal.marshallers;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.StreamHelper;
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-
-/**
- * Package core properties marshaller specialized for zipped package.
- *
- * @author Julien Chable
- */
-public final class ZipPackagePropertiesMarshaller extends PackagePropertiesMarshaller {
-
-	@Override
-	public boolean marshall(PackagePart part, OutputStream out)
-			throws OpenXML4JException {
-		if (!(out instanceof ZipOutputStream)) {
-			throw new IllegalArgumentException("ZipOutputStream expected!");
-		}
-		ZipOutputStream zos = (ZipOutputStream) out;
-
-		// Saving the part in the zip file
-		ZipEntry ctEntry = new ZipEntry(ZipHelper
-				.getZipItemNameFromOPCName(part.getPartName().getURI()
-						.toString()));
-		try {
-			// Save in ZIP
-			zos.putNextEntry(ctEntry); // Add entry in ZIP
-			super.marshall(part, out); // Marshall the properties inside a XML
-			// Document
-			if (!StreamHelper.saveXmlInStream(xmlDoc, out)) {
-				return false;
-			}
-			zos.closeEntry();
-		} catch (IOException e) {
-			throw new OpenXML4JException(e.getLocalizedMessage(), e);
-		}
-		return true;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
deleted file mode 100644
index 8860ae3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal.marshallers;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackageNamespaces;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.StreamHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.openxml4j.opc.internal.PartMarshaller;
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Zip part marshaller. This marshaller is use to save any part in a zip stream.
- *
- * @author Julien Chable
- */
-public final class ZipPartMarshaller implements PartMarshaller {
-	private static POILogger logger = POILogFactory.getLogger(ZipPartMarshaller.class);
-
-	/**
-	 * Save the specified part.
-	 *
-	 * @throws OpenXML4JException
-	 *             Throws if an internal exception is thrown.
-	 */
-	public boolean marshall(PackagePart part, OutputStream os)
-			throws OpenXML4JException {
-		if (!(os instanceof ZipOutputStream)) {
-			logger.log(POILogger.ERROR,"Unexpected class " + os.getClass().getName());
-			throw new OpenXML4JException("ZipOutputStream expected !");
-			// Normally should happen only in developement phase, so just throw
-			// exception
-		}
-		
-		// check if there is anything to save for some parts. We don't do this for all parts as some code
-		// might depend on empty parts being saved, e.g. some unit tests verify this currently.
-		if(part.getSize() == 0 && part.getPartName().getName().equals(XSSFRelation.SHARED_STRINGS.getDefaultFileName())) {
-		    return true;
-		}
-
-		ZipOutputStream zos = (ZipOutputStream) os;
-		ZipEntry partEntry = new ZipEntry(ZipHelper
-				.getZipItemNameFromOPCName(part.getPartName().getURI()
-						.getPath()));
-		try {
-			// Create next zip entry
-			zos.putNextEntry(partEntry);
-
-			// Saving data in the ZIP file
-			InputStream ins = part.getInputStream();
-			byte[] buff = new byte[ZipHelper.READ_WRITE_FILE_BUFFER_SIZE];
-			while (ins.available() > 0) {
-				int resultRead = ins.read(buff);
-				if (resultRead == -1) {
-					// End of file reached
-					break;
-				}
-				zos.write(buff, 0, resultRead);
-			}
-			zos.closeEntry();
-		} catch (IOException ioe) {
-			logger.log(POILogger.ERROR,"Cannot write: " + part.getPartName() + ": in ZIP",
-					ioe);
-			return false;
-		}
-
-		// Saving relationship part
-		if (part.hasRelationships()) {
-			PackagePartName relationshipPartName = PackagingURIHelper
-					.getRelationshipPartName(part.getPartName());
-
-			marshallRelationshipPart(part.getRelationships(),
-					relationshipPartName, zos);
-
-		}
-		return true;
-	}
-
-	/**
-	 * Save relationships into the part.
-	 *
-	 * @param rels
-	 *            The relationships collection to marshall.
-	 * @param relPartName
-	 *            Part name of the relationship part to marshall.
-	 * @param zos
-	 *            Zip output stream in which to save the XML content of the
-	 *            relationships serialization.
-	 */
-	public static boolean marshallRelationshipPart(
-			PackageRelationshipCollection rels, PackagePartName relPartName,
-			ZipOutputStream zos) {
-		// Building xml
-		Document xmlOutDoc = DocumentHelper.createDocument();
-		// make something like <Relationships
-		// xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-		Element root = xmlOutDoc.createElementNS(PackageNamespaces.RELATIONSHIPS, PackageRelationship.RELATIONSHIPS_TAG_NAME);
-        xmlOutDoc.appendChild(root);
-
-		// <Relationship
-		// TargetMode="External"
-		// Id="rIdx"
-		// Target="http://www.custom.com/images/pic1.jpg"
-		// Type="http://www.custom.com/external-resource"/>
-
-		URI sourcePartURI = PackagingURIHelper
-				.getSourcePartUriFromRelationshipPartUri(relPartName.getURI());
-
-		for (PackageRelationship rel : rels) {
-			// the relationship element
-            Element relElem = xmlOutDoc.createElementNS(PackageNamespaces.RELATIONSHIPS, PackageRelationship.RELATIONSHIP_TAG_NAME);
-            root.appendChild(relElem);
-
-			// the relationship ID
-			relElem.setAttribute(PackageRelationship.ID_ATTRIBUTE_NAME, rel.getId());
-
-			// the relationship Type
-			relElem.setAttribute(PackageRelationship.TYPE_ATTRIBUTE_NAME, rel.getRelationshipType());
-
-			// the relationship Target
-			String targetValue;
-			URI uri = rel.getTargetURI();
-			if (rel.getTargetMode() == TargetMode.EXTERNAL) {
-				// Save the target as-is - we don't need to validate it,
-				//  alter it etc
-				targetValue = uri.toString();
-
-				// add TargetMode attribute (as it is external link external)
-				relElem.setAttribute(PackageRelationship.TARGET_MODE_ATTRIBUTE_NAME, "External");
-			} else {
-                URI targetURI = rel.getTargetURI();
-                targetValue = PackagingURIHelper.relativizeURI(
-						sourcePartURI, targetURI, true).toString();
-			}
-			relElem.setAttribute(PackageRelationship.TARGET_ATTRIBUTE_NAME, targetValue);
-		}
-
-		xmlOutDoc.normalize();
-
-		// String schemaFilename = Configuration.getPathForXmlSchema()+
-		// File.separator + "opc-relationships.xsd";
-
-		// Save part in zip
-		ZipEntry ctEntry = new ZipEntry(ZipHelper.getZipURIFromOPCName(
-				relPartName.getURI().toASCIIString()).getPath());
-		try {
-			zos.putNextEntry(ctEntry);
-			if (!StreamHelper.saveXmlInStream(xmlOutDoc, zos)) {
-				return false;
-			}
-			zos.closeEntry();
-		} catch (IOException e) {
-			logger.log(POILogger.ERROR,"Cannot create zip entry " + relPartName, e);
-			return false;
-		}
-		return true; // success
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
deleted file mode 100644
index 0ccbf30..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal.unmarshallers;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.ZipEntry;
-
-import javax.xml.XMLConstants;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackageNamespaces;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageProperties;
-import org.apache.poi.openxml4j.opc.ZipPackage;
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.openxml4j.opc.internal.PartUnmarshaller;
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-import org.apache.poi.util.DocumentHelper;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Package properties unmarshaller.
- *
- * @author Julien Chable
- */
-public final class PackagePropertiesUnmarshaller implements PartUnmarshaller {
-
-	protected static final String KEYWORD_CATEGORY = "category";
-
-	protected static final String KEYWORD_CONTENT_STATUS = "contentStatus";
-
-	protected static final String KEYWORD_CONTENT_TYPE = "contentType";
-
-	protected static final String KEYWORD_CREATED = "created";
-
-	protected static final String KEYWORD_CREATOR = "creator";
-
-	protected static final String KEYWORD_DESCRIPTION = "description";
-
-	protected static final String KEYWORD_IDENTIFIER = "identifier";
-
-	protected static final String KEYWORD_KEYWORDS = "keywords";
-
-	protected static final String KEYWORD_LANGUAGE = "language";
-
-	protected static final String KEYWORD_LAST_MODIFIED_BY = "lastModifiedBy";
-
-	protected static final String KEYWORD_LAST_PRINTED = "lastPrinted";
-
-	protected static final String KEYWORD_MODIFIED = "modified";
-
-	protected static final String KEYWORD_REVISION = "revision";
-
-	protected static final String KEYWORD_SUBJECT = "subject";
-
-	protected static final String KEYWORD_TITLE = "title";
-
-	protected static final String KEYWORD_VERSION = "version";
-
-	// TODO Load element with XMLBeans or dynamic table
-	// TODO Check every element/namespace for compliance
-	public PackagePart unmarshall(UnmarshallContext context, InputStream in)
-			throws InvalidFormatException, IOException {
-		PackagePropertiesPart coreProps = new PackagePropertiesPart(context
-				.getPackage(), context.getPartName());
-
-		// If the input stream is null then we try to get it from the
-		// package.
-		if (in == null) {
-			if (context.getZipEntry() != null) {
-				in = ((ZipPackage) context.getPackage()).getZipArchive()
-						.getInputStream(context.getZipEntry());
-			} else if (context.getPackage() != null) {
-				// Try to retrieve the part inputstream from the URI
-				ZipEntry zipEntry = ZipHelper
-						.getCorePropertiesZipEntry((ZipPackage) context
-								.getPackage());
-				in = ((ZipPackage) context.getPackage()).getZipArchive()
-						.getInputStream(zipEntry);
-			} else
-				throw new IOException(
-						"Error while trying to get the part input stream.");
-		}
-
-		Document xmlDoc;
-		try {
-			xmlDoc = DocumentHelper.readDocument(in);
-
-			/* Check OPC compliance */
-
-			// Rule M4.2, M4.3, M4.4 and M4.5/
-			checkElementForOPCCompliance(xmlDoc.getDocumentElement());
-
-			/* End OPC compliance */
-
-        } catch (SAXException e) {
-            throw new IOException(e.getMessage());
-        }
-
-        coreProps.setCategoryProperty(loadCategory(xmlDoc));
-		coreProps.setContentStatusProperty(loadContentStatus(xmlDoc));
-		coreProps.setContentTypeProperty(loadContentType(xmlDoc));
-		coreProps.setCreatedProperty(loadCreated(xmlDoc));
-		coreProps.setCreatorProperty(loadCreator(xmlDoc));
-		coreProps.setDescriptionProperty(loadDescription(xmlDoc));
-		coreProps.setIdentifierProperty(loadIdentifier(xmlDoc));
-		coreProps.setKeywordsProperty(loadKeywords(xmlDoc));
-		coreProps.setLanguageProperty(loadLanguage(xmlDoc));
-		coreProps.setLastModifiedByProperty(loadLastModifiedBy(xmlDoc));
-		coreProps.setLastPrintedProperty(loadLastPrinted(xmlDoc));
-		coreProps.setModifiedProperty(loadModified(xmlDoc));
-		coreProps.setRevisionProperty(loadRevision(xmlDoc));
-		coreProps.setSubjectProperty(loadSubject(xmlDoc));
-		coreProps.setTitleProperty(loadTitle(xmlDoc));
-		coreProps.setVersionProperty(loadVersion(xmlDoc));
-
-		return coreProps;
-	}
-
-    private String readElement(Document xmlDoc, String localName, String namespaceURI) {
-        Element el = (Element)xmlDoc.getDocumentElement().getElementsByTagNameNS(namespaceURI, localName).item(0);
-        if (el == null) {
-            return null;
-        }
-        return el.getTextContent();
-    }
-
-	private String loadCategory(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_CATEGORY, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-    private String loadContentStatus(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_CONTENT_STATUS, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-	private String loadContentType(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_CONTENT_TYPE, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-	private String loadCreated(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_CREATED, PackageProperties.NAMESPACE_DCTERMS);
-	}
-
-	private String loadCreator(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_CREATOR, PackageProperties.NAMESPACE_DC);
-	}
-
-	private String loadDescription(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_DESCRIPTION, PackageProperties.NAMESPACE_DC);
-	}
-
-	private String loadIdentifier(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_IDENTIFIER, PackageProperties.NAMESPACE_DC);
-	}
-
-	private String loadKeywords(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_KEYWORDS, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-	private String loadLanguage(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_LANGUAGE, PackageProperties.NAMESPACE_DC);
-	}
-
-	private String loadLastModifiedBy(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_LAST_MODIFIED_BY, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-	private String loadLastPrinted(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_LAST_PRINTED, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-	private String loadModified(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_MODIFIED, PackageProperties.NAMESPACE_DCTERMS);
-	}
-
-	private String loadRevision(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_REVISION, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-	private String loadSubject(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_SUBJECT, PackageProperties.NAMESPACE_DC);
-	}
-
-	private String loadTitle(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_TITLE, PackageProperties.NAMESPACE_DC);
-	}
-
-	private String loadVersion(Document xmlDoc) {
-        return readElement(xmlDoc, KEYWORD_VERSION, PackageNamespaces.CORE_PROPERTIES);
-	}
-
-	/* OPC Compliance methods */
-
-	/**
-	 * Check the element for the following OPC compliance rules:
-	 * <p>
-	 * Rule M4.2: A format consumer shall consider the use of the Markup
-	 * Compatibility namespace to be an error.
-	 * </p><p>
-	 * Rule M4.3: Producers shall not create a document element that contains
-	 * refinements to the Dublin Core elements, except for the two specified in
-	 * the schema: <dcterms:created> and <dcterms:modified> Consumers shall
-	 * consider a document element that violates this constraint to be an error.
-	 * </p><p>
-	 * Rule M4.4: Producers shall not create a document element that contains
-	 * the xml:lang attribute. Consumers shall consider a document element that
-	 * violates this constraint to be an error.
-	 *  </p><p>
-	 * Rule M4.5: Producers shall not create a document element that contains
-	 * the xsi:type attribute, except for a <dcterms:created> or
-	 * <dcterms:modified> element where the xsi:type attribute shall be present
-	 * and shall hold the value dcterms:W3CDTF, where dcterms is the namespace
-	 * prefix of the Dublin Core namespace. Consumers shall consider a document
-	 * element that violates this constraint to be an error.
-	 * </p>
-	 */
-	public void checkElementForOPCCompliance(Element el)
-			throws InvalidFormatException {
-		// Check the current element
-        NamedNodeMap namedNodeMap = el.getAttributes();
-        int namedNodeCount = namedNodeMap.getLength();
-        for (int i = 0; i < namedNodeCount; i++) {
-            Attr attr = (Attr)namedNodeMap.item(0);
-
-            if (attr.getNamespaceURI().equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)) {
-                // Rule M4.2
-                if (attr.getValue().equals(PackageNamespaces.MARKUP_COMPATIBILITY))
-                    throw new InvalidFormatException(
-                            "OPC Compliance error [M4.2]: A format consumer shall consider the use of the Markup Compatibility namespace to be an error.");
-
-            }
-        }
-
-		// Rule M4.3
-        String elName = el.getLocalName();
-        if (el.getNamespaceURI().equals(PackageProperties.NAMESPACE_DCTERMS))
-            if (!(elName.equals(KEYWORD_CREATED) || elName.equals(KEYWORD_MODIFIED)))
-                throw new InvalidFormatException(
-                        "OPC Compliance error [M4.3]: Producers shall not create a document element that contains refinements to the Dublin Core elements, except for the two specified in the schema: <dcterms:created> and <dcterms:modified> Consumers shall consider a document element that violates this constraint to be an error.");
-
-		// Rule M4.4
-		if (el.getAttributeNodeNS(XMLConstants.XML_NS_URI, "lang") != null)
-			throw new InvalidFormatException(
-					"OPC Compliance error [M4.4]: Producers shall not create a document element that contains the xml:lang attribute. Consumers shall consider a document element that violates this constraint to be an error.");
-
-		// Rule M4.5
-		if (el.getNamespaceURI().equals(PackageProperties.NAMESPACE_DCTERMS)) {
-			// DCTerms namespace only use with 'created' and 'modified' elements
-			if (!(elName.equals(KEYWORD_CREATED) || elName.equals(KEYWORD_MODIFIED)))
-				throw new InvalidFormatException("Namespace error : " + elName
-						+ " shouldn't have the following naemspace -> "
-						+ PackageProperties.NAMESPACE_DCTERMS);
-
-			// Check for the 'xsi:type' attribute
-			Attr typeAtt = el.getAttributeNodeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "type");
-			if (typeAtt == null)
-				throw new InvalidFormatException("The element '" + elName
-						+ "' must have the 'xsi:type' attribute present !");
-
-			// Check for the attribute value => 'dcterms:W3CDTF'
-			if (!typeAtt.getValue().equals(el.getPrefix() + ":W3CDTF"))
-				throw new InvalidFormatException("The element '" + elName
-						+ "' must have the 'xsi:type' attribute with the value '" + el.getPrefix() + ":W3CDTF', but had '" + typeAtt.getValue() + "' !");
-		}
-
-		// Check its children
-        NodeList childElements = el.getElementsByTagName("*");
-        int childElementCount = childElements.getLength();
-        for (int i = 0; i < childElementCount; i++)
-            checkElementForOPCCompliance((Element)childElements.item(i));
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
deleted file mode 100644
index c4e01ca..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal.unmarshallers;
-
-import java.util.zip.ZipEntry;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-
-/**
- * Context needed for the unmarshall process of a part. This class is immutable.
- * 
- * @author Julien Chable
- * @version 1.0
- */
-public final class UnmarshallContext {
-
-	private OPCPackage _package;
-
-	private PackagePartName partName;
-
-	private ZipEntry zipEntry;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param targetPackage
-	 *            Container.
-	 * @param partName
-	 *            Name of the part to unmarshall.
-	 */
-	public UnmarshallContext(OPCPackage targetPackage, PackagePartName partName) {
-		this._package = targetPackage;
-		this.partName = partName;
-	}
-
-	/**
-	 * @return the container
-	 */
-	OPCPackage getPackage() {
-		return _package;
-	}
-
-	/**
-	 * @param container
-	 *            the container to set
-	 */
-	public void setPackage(OPCPackage container) {
-		this._package = container;
-	}
-
-	/**
-	 * @return the partName
-	 */
-	PackagePartName getPartName() {
-		return partName;
-	}
-
-	/**
-	 * @param partName
-	 *            the partName to set
-	 */
-	public void setPartName(PackagePartName partName) {
-		this.partName = partName;
-	}
-
-	/**
-	 * @return the zipEntry
-	 */
-	ZipEntry getZipEntry() {
-		return zipEntry;
-	}
-
-	/**
-	 * @param zipEntry
-	 *            the zipEntry to set
-	 */
-	public void setZipEntry(ZipEntry zipEntry) {
-		this.zipEntry = zipEntry;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/Nullable.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/Nullable.java
deleted file mode 100644
index 8c1a24c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/Nullable.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.util;
-
-/**
- * An immutable object that could be defined as null.
- *
- * @author Julien Chable
- * @version 0.9
- */
-public final class Nullable<E> {
-
-	private E value;
-
-	/**
-	 * Constructor.
-	 */
-	public Nullable() {
-		// Do nothing
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param value
-	 *            The value to set to this nullable.
-	 */
-	public Nullable(E value) {
-		this.value = value;
-	}
-
-	/**
-	 * Get the store value if any.
-	 *
-	 * @return the store value
-	 */
-	public E getValue() {
-		return value;
-	}
-
-	/**
-	 * Get the status of this nullable.
-	 *
-	 * @return <b>true</b> if the nullable store a value (empty string is
-	 *         considered to be a value) else <b>false</>.
-	 */
-	public boolean hasValue() {
-		return value != null;
-	}
-
-	/**
-	 * Set the stored value to <i>null</i>.
-	 */
-	public void nullify() {
-		value = null;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
deleted file mode 100644
index 8ce8232..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.util;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-
-/**
- * An Interface to make getting the different bits
- *  of a Zip File easy.
- * Allows you to get at the ZipEntries, without
- *  needing to worry about ZipFile vs ZipInputStream
- *  being annoyingly very different.
- */
-public interface ZipEntrySource extends Closeable {
-	/**
-	 * Returns an Enumeration of all the Entries
-	 */
-	public Enumeration<? extends ZipEntry> getEntries();
-	
-	/**
-	 * Returns an InputStream of the decompressed 
-	 *  data that makes up the entry
-	 */
-	public InputStream getInputStream(ZipEntry entry) throws IOException;
-	
-	/**
-	 * Indicates we are done with reading, and 
-	 *  resources may be freed
-	 */
-	@Override
-	public void close() throws IOException;
-	
-	/**
-	 * Has close been called already?
-	 */
-	public boolean isClosed();
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
deleted file mode 100644
index 09317d3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- * A ZipEntrySource wrapper around a ZipFile.
- * Should be as low in terms of memory as a
- *  normal ZipFile implementation is.
- */
-public class ZipFileZipEntrySource implements ZipEntrySource {
-   private ZipFile zipArchive;
-   public ZipFileZipEntrySource(ZipFile zipFile) {
-      this.zipArchive = zipFile;
-   }
-
-   public void close() throws IOException {
-      if(zipArchive != null) {
-         zipArchive.close();
-      }
-      zipArchive = null;
-   }
-   public boolean isClosed() {
-       return (zipArchive == null);
-   }
-
-   public Enumeration<? extends ZipEntry> getEntries() {
-      if (zipArchive == null)
-         throw new IllegalStateException("Zip File is closed");
-      
-      return zipArchive.entries();
-   }
-
-   public InputStream getInputStream(ZipEntry entry) throws IOException {
-      if (zipArchive == null)
-         throw new IllegalStateException("Zip File is closed");
-      
-      return zipArchive.getInputStream(entry);
-   }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
deleted file mode 100644
index 4c2b9df..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.zip.ZipEntry;
-
-import org.apache.poi.openxml4j.util.ZipSecureFile.ThresholdInputStream;
-
-/**
- * Provides a way to get at all the ZipEntries
- *  from a ZipInputStream, as many times as required.
- * Allows a ZipInputStream to be treated much like
- *  a ZipFile, for a price in terms of memory.
- * Be sure to call {@link #close()} as soon as you're
- *  done, to free up that memory!
- */
-public class ZipInputStreamZipEntrySource implements ZipEntrySource {
-	private ArrayList<FakeZipEntry> zipEntries;
-	
-	/**
-	 * Reads all the entries from the ZipInputStream 
-	 *  into memory, and closes the source stream.
-	 * We'll then eat lots of memory, but be able to
-	 *  work with the entries at-will.
-	 */
-	public ZipInputStreamZipEntrySource(ThresholdInputStream inp) throws IOException {
-		zipEntries = new ArrayList<FakeZipEntry>();
-		
-		boolean going = true;
-		while(going) {
-			ZipEntry zipEntry = inp.getNextEntry();
-			if(zipEntry == null) {
-				going = false;
-			} else {
-				FakeZipEntry entry = new FakeZipEntry(zipEntry, inp);
-				inp.closeEntry();
-				
-				zipEntries.add(entry);
-			}
-		}
-		inp.close();
-	}
-
-	public Enumeration<? extends ZipEntry> getEntries() {
-		return new EntryEnumerator();
-	}
-	
-	public InputStream getInputStream(ZipEntry zipEntry) {
-	    assert (zipEntry instanceof FakeZipEntry);
-		FakeZipEntry entry = (FakeZipEntry)zipEntry;
-		return entry.getInputStream();
-	}
-	
-	public void close() {
-		// Free the memory
-		zipEntries = null;
-	}
-	public boolean isClosed() {
-	    return (zipEntries == null);
-	}
-	
-	/**
-	 * Why oh why oh why are Iterator and Enumeration
-	 *  still not compatible?
-	 */
-	private class EntryEnumerator implements Enumeration<ZipEntry> {
-		private Iterator<? extends ZipEntry> iterator;
-		
-		private EntryEnumerator() {
-			iterator = zipEntries.iterator();
-		}
-		
-		public boolean hasMoreElements() {
-			return iterator.hasNext();
-		}
-
-		public ZipEntry nextElement() {
-			return iterator.next();
-		}
-	}
-
-	/**
-	 * So we can close the real zip entry and still
-	 *  effectively work with it.
-	 * Holds the (decompressed!) data in memory, so
-	 *  close this as soon as you can! 
-	 */
-	public static class FakeZipEntry extends ZipEntry {
-		private byte[] data;
-		
-		public FakeZipEntry(ZipEntry entry, InputStream inp) throws IOException {
-			super(entry.getName());
-			
-			// Grab the de-compressed contents for later
-            ByteArrayOutputStream baos;
-
-            long entrySize = entry.getSize();
-
-            if (entrySize !=-1) {
-                if (entrySize>=Integer.MAX_VALUE) {
-                    throw new IOException("ZIP entry size is too large");
-                }
-
-                baos = new ByteArrayOutputStream((int) entrySize);
-            } else {
-    			baos = new ByteArrayOutputStream();
-            }
-
-			byte[] buffer = new byte[4096];
-			int read = 0;
-			while( (read = inp.read(buffer)) != -1 ) {
-				baos.write(buffer, 0, read);
-			}
-			
-			data = baos.toByteArray();
-		}
-		
-		public InputStream getInputStream() {
-			return new ByteArrayInputStream(data);
-		}
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java b/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
deleted file mode 100644
index 9000656..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.util;
-
-import java.io.File;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.zip.InflaterInputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.SuppressForbidden;
-
-/**
- * This class wraps a {@link ZipFile} in order to check the
- * entries for <a href="https://en.wikipedia.org/wiki/Zip_bomb">zip bombs</a>
- * while reading the archive.
- * If a {@link ZipInputStream} is directly used, the wrapper
- * can be applied via {@link #addThreshold(InputStream)}.
- * The alert limits can be globally defined via {@link #setMaxEntrySize(long)}
- * and {@link #setMinInflateRatio(double)}.
- */
-public class ZipSecureFile extends ZipFile {
-    private static POILogger logger = POILogFactory.getLogger(ZipSecureFile.class);
-    
-    private static double MIN_INFLATE_RATIO = 0.01d;
-    private static long MAX_ENTRY_SIZE = 0xFFFFFFFFL;
-    
-    // don't alert for expanded sizes smaller than 100k
-    private final static long GRACE_ENTRY_SIZE = 100*1024;
-
-    // The default maximum size of extracted text 
-    private static long MAX_TEXT_SIZE = 10*1024*1024;
-    
-    /**
-     * Sets the ratio between de- and inflated bytes to detect zipbomb.
-     * It defaults to 1% (= 0.01d), i.e. when the compression is better than
-     * 1% for any given read package part, the parsing will fail indicating a 
-     * Zip-Bomb.
-     *
-     * @param ratio the ratio between de- and inflated bytes to detect zipbomb
-     */
-    public static void setMinInflateRatio(double ratio) {
-        MIN_INFLATE_RATIO = ratio;
-    }
-    
-    /**
-     * Returns the current minimum compression rate that is used.
-     * 
-     * See setMinInflateRatio() for details.
-     *
-     * @return The min accepted compression-ratio.  
-     */
-    public static double getMinInflateRatio() {
-        return MIN_INFLATE_RATIO;
-    }
-
-    /**
-     * Sets the maximum file size of a single zip entry. It defaults to 4GB,
-     * i.e. the 32-bit zip format maximum.
-     * 
-     * This can be used to limit memory consumption and protect against 
-     * security vulnerabilities when documents are provided by users.
-     *
-     * @param maxEntrySize the max. file size of a single zip entry
-     */
-    public static void setMaxEntrySize(long maxEntrySize) {
-        if (maxEntrySize < 0 || maxEntrySize > 0xFFFFFFFFL) {   // don't use MAX_ENTRY_SIZE here!
-            throw new IllegalArgumentException("Max entry size is bounded [0-4GB], but had " + maxEntrySize);
-        }
-        MAX_ENTRY_SIZE = maxEntrySize;
-    }
-
-    /**
-     * Returns the current maximum allowed uncompressed file size.
-     * 
-     * See setMaxEntrySize() for details.
-     *
-     * @return The max accepted uncompressed file size. 
-     */
-    public static long getMaxEntrySize() {
-        return MAX_ENTRY_SIZE;
-    }
-
-    /**
-     * Sets the maximum number of characters of text that are
-     * extracted before an exception is thrown during extracting
-     * text from documents.
-     * 
-     * This can be used to limit memory consumption and protect against 
-     * security vulnerabilities when documents are provided by users.
-     *
-     * @param maxTextSize the max. file size of a single zip entry
-     */
-    public static void setMaxTextSize(long maxTextSize) {
-        if (maxTextSize < 0 || maxTextSize > 0xFFFFFFFFL) {     // don't use MAX_ENTRY_SIZE here!
-            throw new IllegalArgumentException("Max text size is bounded [0-4GB], but had " + maxTextSize);
-        }
-        MAX_TEXT_SIZE = maxTextSize;
-    }
-
-    /**
-     * Returns the current maximum allowed text size.
-     * 
-     * See setMaxTextSize() for details.
-     *
-     * @return The max accepted text size. 
-     */
-    public static long getMaxTextSize() {
-        return MAX_TEXT_SIZE;
-    }
-
-    public ZipSecureFile(File file, int mode) throws ZipException, IOException {
-        super(file, mode);
-    }
-
-    public ZipSecureFile(File file) throws ZipException, IOException {
-        super(file);
-    }
-
-    public ZipSecureFile(String name) throws ZipException, IOException {
-        super(name);
-    }
-
-    /**
-     * Returns an input stream for reading the contents of the specified
-     * zip file entry.
-     *
-     * <p> Closing this ZIP file will, in turn, close all input
-     * streams that have been returned by invocations of this method.
-     *
-     * @param entry the zip file entry
-     * @return the input stream for reading the contents of the specified
-     * zip file entry.
-     * @throws ZipException if a ZIP format error has occurred
-     * @throws IOException if an I/O error has occurred
-     * @throws IllegalStateException if the zip file has been closed
-     */
-    @SuppressWarnings("resource")
-    public InputStream getInputStream(ZipEntry entry) throws IOException {
-        InputStream zipIS = super.getInputStream(entry);
-        return addThreshold(zipIS);
-    }
-
-    public static ThresholdInputStream addThreshold(final InputStream zipIS) throws IOException {
-        ThresholdInputStream newInner;
-        if (zipIS instanceof InflaterInputStream) {
-            newInner = AccessController.doPrivileged(new PrivilegedAction<ThresholdInputStream>() {
-                @SuppressForbidden("TODO: Fix this to not use reflection (it will break in Java 9)! " +
-                        "Better would be to wrap *before* instead of tyring to insert wrapper afterwards.")
-                public ThresholdInputStream run() {
-                    try {
-                        Field f = FilterInputStream.class.getDeclaredField("in");
-                        f.setAccessible(true);
-                        InputStream oldInner = (InputStream)f.get(zipIS);
-                        ThresholdInputStream newInner = new ThresholdInputStream(oldInner, null);
-                        f.set(zipIS, newInner);
-                        return newInner;
-                    } catch (Exception ex) {
-                        logger.log(POILogger.WARN, "SecurityManager doesn't allow manipulation via reflection for zipbomb detection - continue with original input stream", ex);
-                    }
-                    return null;
-                }
-            });
-        } else {
-            // the inner stream is a ZipFileInputStream, i.e. the data wasn't compressed
-            newInner = null;
-        }
-
-        return new ThresholdInputStream(zipIS, newInner);
-    }
-
-    public static class ThresholdInputStream extends PushbackInputStream {
-        long counter = 0;
-        ThresholdInputStream cis;
-
-        public ThresholdInputStream(InputStream is, ThresholdInputStream cis) {
-            super(is,1);
-            this.cis = cis;
-        }
-
-        public int read() throws IOException {
-            int b = in.read();
-            if (b > -1) advance(1);
-            return b;
-        }
-
-        public int read(byte b[], int off, int len) throws IOException {
-            int cnt = in.read(b, off, len);
-            if (cnt > -1) advance(cnt);
-            return cnt;
-
-        }
-
-        public long skip(long n) throws IOException {
-            counter = 0;
-            return in.skip(n);
-        }
-
-        public synchronized void reset() throws IOException {
-            counter = 0;
-            in.reset();
-        }
-
-        public void advance(int advance) throws IOException {
-            counter += advance;
-            
-            // check the file size first, in case we are working on uncompressed streams
-            if(counter > MAX_ENTRY_SIZE) {
-                throw new IOException("Zip bomb detected! The file would exceed the max size of the expanded data in the zip-file. "
-                        + "This may indicates that the file is used to inflate memory usage and thus could pose a security risk. "
-                        + "You can adjust this limit via ZipSecureFile.setMaxEntrySize() if you need to work with files which are very large. "
-                        + "Counter: " + counter + ", cis.counter: " + (cis == null ? 0 : cis.counter)
-                        + "Limits: MAX_ENTRY_SIZE: " + MAX_ENTRY_SIZE);
-            }
-
-            // no expanded size?
-            if (cis == null) {
-                return;
-            }
-            
-            // don't alert for small expanded size
-            if (counter <= GRACE_ENTRY_SIZE) {
-                return;
-            }
-
-            double ratio = (double)cis.counter/(double)counter;
-            if (ratio >= MIN_INFLATE_RATIO) {
-                return;
-            }
-
-            // one of the limits was reached, report it
-            throw new IOException("Zip bomb detected! The file would exceed the max. ratio of compressed file size to the size of the expanded data. "
-                    + "This may indicate that the file is used to inflate memory usage and thus could pose a security risk. "
-                    + "You can adjust this limit via ZipSecureFile.setMinInflateRatio() if you need to work with files which exceed this limit. "
-                    + "Counter: " + counter + ", cis.counter: " + cis.counter + ", ratio: " + (((double)cis.counter)/counter)
-                    + "Limits: MIN_INFLATE_RATIO: " + MIN_INFLATE_RATIO);
-        }
-
-        public ZipEntry getNextEntry() throws IOException {
-            if (!(in instanceof ZipInputStream)) {
-                throw new UnsupportedOperationException("underlying stream is not a ZipInputStream");
-            }
-            counter = 0;
-            return ((ZipInputStream)in).getNextEntry();
-        }
-
-        public void closeEntry() throws IOException {
-            if (!(in instanceof ZipInputStream)) {
-                throw new UnsupportedOperationException("underlying stream is not a ZipInputStream");
-            }
-            counter = 0;
-            ((ZipInputStream)in).closeEntry();
-        }
-
-        public void unread(int b) throws IOException {
-            if (!(in instanceof PushbackInputStream)) {
-                throw new UnsupportedOperationException("underlying stream is not a PushbackInputStream");
-            }
-            if (--counter < 0) counter = 0;
-            ((PushbackInputStream)in).unread(b);
-        }
-
-        public void unread(byte[] b, int off, int len) throws IOException {
-            if (!(in instanceof PushbackInputStream)) {
-                throw new UnsupportedOperationException("underlying stream is not a PushbackInputStream");
-            }
-            counter -= len;
-            if (--counter < 0) counter = 0;
-            ((PushbackInputStream)in).unread(b, off, len);
-        }
-
-        public int available() throws IOException {
-            return in.available();
-        }
-
-        public boolean markSupported() {
-            return in.markSupported();
-        }
-
-        public synchronized void mark(int readlimit) {
-            in.mark(readlimit);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
deleted file mode 100644
index 0263790..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.agile;
-
-import static org.apache.poi.poifs.crypt.CryptoFunctions.generateIv;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.generateKey;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.getBlock0;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.getCipher;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.getMessageDigest;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.hashPassword;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.cert.X509Certificate;
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.Arrays;
-
-import javax.crypto.Cipher;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.ChunkedCipherInputStream;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionHeader;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.agile.AgileEncryptionVerifier.AgileCertificateEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Decryptor implementation for Agile Encryption
- */
-public class AgileDecryptor extends Decryptor implements Cloneable {
-    private long _length = -1;
-
-    /* package */ static final byte[] kVerifierInputBlock;
-    /* package */ static final byte[] kHashedVerifierBlock;
-    /* package */ static final byte[] kCryptoKeyBlock;
-    /* package */ static final byte[] kIntegrityKeyBlock;
-    /* package */ static final byte[] kIntegrityValueBlock;
-
-    static {
-        kVerifierInputBlock =
-            new byte[] { (byte)0xfe, (byte)0xa7, (byte)0xd2, (byte)0x76,
-                         (byte)0x3b, (byte)0x4b, (byte)0x9e, (byte)0x79 };
-        kHashedVerifierBlock =
-            new byte[] { (byte)0xd7, (byte)0xaa, (byte)0x0f, (byte)0x6d,
-                         (byte)0x30, (byte)0x61, (byte)0x34, (byte)0x4e };
-        kCryptoKeyBlock =
-            new byte[] { (byte)0x14, (byte)0x6e, (byte)0x0b, (byte)0xe7,
-                         (byte)0xab, (byte)0xac, (byte)0xd0, (byte)0xd6 };
-        kIntegrityKeyBlock =
-            new byte[] { (byte)0x5f, (byte)0xb2, (byte)0xad, (byte)0x01, 
-                         (byte)0x0c, (byte)0xb9, (byte)0xe1, (byte)0xf6 };
-        kIntegrityValueBlock =
-            new byte[] { (byte)0xa0, (byte)0x67, (byte)0x7f, (byte)0x02,
-                         (byte)0xb2, (byte)0x2c, (byte)0x84, (byte)0x33 };
-    }
-
-    protected AgileDecryptor() {
-    }
-    
-    /**
-     * set decryption password
-     */
-    @Override
-    public boolean verifyPassword(String password) throws GeneralSecurityException {
-        AgileEncryptionVerifier ver = (AgileEncryptionVerifier)getEncryptionInfo().getVerifier();
-        AgileEncryptionHeader header = (AgileEncryptionHeader)getEncryptionInfo().getHeader(); 
-
-        int blockSize = header.getBlockSize();
-
-        byte[] pwHash = hashPassword(password, ver.getHashAlgorithm(), ver.getSalt(), ver.getSpinCount());
-
-        /**
-         * encryptedVerifierHashInput: This attribute MUST be generated by using the following steps:
-         * 1. Generate a random array of bytes with the number of bytes used specified by the saltSize
-         *    attribute.
-         * 2. Generate an encryption key as specified in section 2.3.4.11 by using the user-supplied password,
-         *    the binary byte array used to create the saltValue attribute, and a blockKey byte array
-         *    consisting of the following bytes: 0xfe, 0xa7, 0xd2, 0x76, 0x3b, 0x4b, 0x9e, and 0x79.
-         * 3. Encrypt the random array of bytes generated in step 1 by using the binary form of the saltValue
-         *    attribute as an initialization vector as specified in section 2.3.4.12. If the array of bytes is not an
-         *    integral multiple of blockSize bytes, pad the array with 0x00 to the next integral multiple of
-         *    blockSize bytes.
-         * 4. Use base64 to encode the result of step 3.
-         */
-        byte verfierInputEnc[] = hashInput(ver, pwHash, kVerifierInputBlock, ver.getEncryptedVerifier(), Cipher.DECRYPT_MODE);
-        setVerifier(verfierInputEnc);
-        MessageDigest hashMD = getMessageDigest(ver.getHashAlgorithm());
-        byte[] verifierHash = hashMD.digest(verfierInputEnc);
-
-        /**
-         * encryptedVerifierHashValue: This attribute MUST be generated by using the following steps:
-         * 1. Obtain the hash value of the random array of bytes generated in step 1 of the steps for
-         *    encryptedVerifierHashInput.
-         * 2. Generate an encryption key as specified in section 2.3.4.11 by using the user-supplied password,
-         *    the binary byte array used to create the saltValue attribute, and a blockKey byte array
-         *    consisting of the following bytes: 0xd7, 0xaa, 0x0f, 0x6d, 0x30, 0x61, 0x34, and 0x4e.
-         * 3. Encrypt the hash value obtained in step 1 by using the binary form of the saltValue attribute as
-         *    an initialization vector as specified in section 2.3.4.12. If hashSize is not an integral multiple of
-         *    blockSize bytes, pad the hash value with 0x00 to an integral multiple of blockSize bytes.
-         * 4. Use base64 to encode the result of step 3.
-         */
-        byte verifierHashDec[] = hashInput(ver, pwHash, kHashedVerifierBlock, ver.getEncryptedVerifierHash(), Cipher.DECRYPT_MODE);
-        verifierHashDec = getBlock0(verifierHashDec, ver.getHashAlgorithm().hashSize);
-        
-        /**
-         * encryptedKeyValue: This attribute MUST be generated by using the following steps:
-         * 1. Generate a random array of bytes that is the same size as specified by the
-         *    Encryptor.KeyData.keyBits attribute of the parent element.
-         * 2. Generate an encryption key as specified in section 2.3.4.11, using the user-supplied password,
-         *    the binary byte array used to create the saltValue attribute, and a blockKey byte array
-         *    consisting of the following bytes: 0x14, 0x6e, 0x0b, 0xe7, 0xab, 0xac, 0xd0, and 0xd6.
-         * 3. Encrypt the random array of bytes generated in step 1 by using the binary form of the saltValue
-         *    attribute as an initialization vector as specified in section 2.3.4.12. If the array of bytes is not an
-         *    integral multiple of blockSize bytes, pad the array with 0x00 to an integral multiple of
-         *    blockSize bytes.
-         * 4. Use base64 to encode the result of step 3.
-         */
-        byte keyspec[] = hashInput(ver, pwHash, kCryptoKeyBlock, ver.getEncryptedKey(), Cipher.DECRYPT_MODE);
-        keyspec = getBlock0(keyspec, header.getKeySize()/8);
-        SecretKeySpec secretKey = new SecretKeySpec(keyspec, header.getCipherAlgorithm().jceId);
-
-        /**
-         * 1. Obtain the intermediate key by decrypting the encryptedKeyValue from a KeyEncryptor
-         *    contained within the KeyEncryptors sequence. Use this key for encryption operations in the
-         *    remaining steps of this section.
-         * 2. Generate a random array of bytes, known as Salt, of the same length as the value of the
-         *    KeyData.hashSize attribute.
-         * 3. Encrypt the random array of bytes generated in step 2 by using the binary form of the
-         *    KeyData.saltValue attribute and a blockKey byte array consisting of the following bytes: 0x5f,
-         *    0xb2, 0xad, 0x01, 0x0c, 0xb9, 0xe1, and 0xf6 used to form an initialization vector as specified in
-         *    section 2.3.4.12. If the array of bytes is not an integral multiple of blockSize bytes, pad the
-         *    array with 0x00 to the next integral multiple of blockSize bytes.
-         * 4. Assign the encryptedHmacKey attribute to the base64-encoded form of the result of step 3.
-         */
-        byte vec[] = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityKeyBlock, blockSize);
-        CipherAlgorithm cipherAlgo = header.getCipherAlgorithm();
-        Cipher cipher = getCipher(secretKey, cipherAlgo, header.getChainingMode(), vec, Cipher.DECRYPT_MODE);
-        byte hmacKey[] = cipher.doFinal(header.getEncryptedHmacKey());
-        hmacKey = getBlock0(hmacKey, header.getHashAlgorithm().hashSize);
-
-        /**
-         * 5. Generate an HMAC, as specified in [RFC2104], of the encrypted form of the data (message),
-         *    which the DataIntegrity element will verify by using the Salt generated in step 2 as the key.
-         *    Note that the entire EncryptedPackage stream (1), including the StreamSize field, MUST be
-         *    used as the message.
-         * 6. Encrypt the HMAC as in step 3 by using a blockKey byte array consisting of the following bytes:
-         *    0xa0, 0x67, 0x7f, 0x02, 0xb2, 0x2c, 0x84, and 0x33.
-         * 7. Assign the encryptedHmacValue attribute to the base64-encoded form of the result of step 6.
-         */
-        vec = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityValueBlock, blockSize);
-        cipher = getCipher(secretKey, cipherAlgo, ver.getChainingMode(), vec, Cipher.DECRYPT_MODE);
-        byte hmacValue[] = cipher.doFinal(header.getEncryptedHmacValue());
-        hmacValue = getBlock0(hmacValue, header.getHashAlgorithm().hashSize);
-        
-        if (Arrays.equals(verifierHashDec, verifierHash)) {
-            setSecretKey(secretKey);
-            setIntegrityHmacKey(hmacKey);
-            setIntegrityHmacValue(hmacValue);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * instead of a password, it's also possible to decrypt via certificate.
-     * Warning: this code is experimental and hasn't been validated
-     * 
-     * @see <a href="http://social.msdn.microsoft.com/Forums/en-US/cc9092bb-0c82-4b5b-ae21-abf643bdb37c/agile-encryption-with-certificates">Agile encryption with certificates</a>
-     *
-     * @param keyPair
-     * @param x509
-     * @return true, when the data can be successfully decrypted with the given private key
-     * @throws GeneralSecurityException
-     */
-    public boolean verifyPassword(KeyPair keyPair, X509Certificate x509) throws GeneralSecurityException {
-        AgileEncryptionVerifier ver = (AgileEncryptionVerifier)getEncryptionInfo().getVerifier();
-        AgileEncryptionHeader header = (AgileEncryptionHeader)getEncryptionInfo().getHeader();
-        HashAlgorithm hashAlgo = header.getHashAlgorithm();
-        CipherAlgorithm cipherAlgo = header.getCipherAlgorithm();
-        int blockSize = header.getBlockSize();
-        
-        AgileCertificateEntry ace = null;
-        for (AgileCertificateEntry aceEntry : ver.getCertificates()) {
-            if (x509.equals(aceEntry.x509)) {
-                ace = aceEntry;
-                break;
-            }
-        }
-        if (ace == null) {
-            return false;
-        }
-        
-        Cipher cipher = Cipher.getInstance("RSA");
-        cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
-        byte keyspec[] = cipher.doFinal(ace.encryptedKey);
-        SecretKeySpec secretKey = new SecretKeySpec(keyspec, ver.getCipherAlgorithm().jceId);
-        
-        Mac x509Hmac = CryptoFunctions.getMac(hashAlgo);
-        x509Hmac.init(secretKey);
-        byte certVerifier[] = x509Hmac.doFinal(ace.x509.getEncoded());
-
-        byte vec[] = CryptoFunctions.generateIv(hashAlgo, header.getKeySalt(), kIntegrityKeyBlock, blockSize); 
-        cipher = getCipher(secretKey, cipherAlgo, header.getChainingMode(), vec, Cipher.DECRYPT_MODE);
-        byte hmacKey[] = cipher.doFinal(header.getEncryptedHmacKey());
-        hmacKey = getBlock0(hmacKey, hashAlgo.hashSize);
-
-        vec = CryptoFunctions.generateIv(hashAlgo, header.getKeySalt(), kIntegrityValueBlock, blockSize);
-        cipher = getCipher(secretKey, cipherAlgo, header.getChainingMode(), vec, Cipher.DECRYPT_MODE);
-        byte hmacValue[] = cipher.doFinal(header.getEncryptedHmacValue());
-        hmacValue = getBlock0(hmacValue, hashAlgo.hashSize);
-        
-        
-        if (Arrays.equals(ace.certVerifier, certVerifier)) {
-            setSecretKey(secretKey);
-            setIntegrityHmacKey(hmacKey);
-            setIntegrityHmacValue(hmacValue);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    protected static int getNextBlockSize(int inputLen, int blockSize) {
-        int fillSize;
-        for (fillSize=blockSize; fillSize<inputLen; fillSize+=blockSize);
-        return fillSize;
-    }
-
-    /* package */ static byte[] hashInput(AgileEncryptionVerifier ver, byte pwHash[], byte blockKey[], byte inputKey[], int cipherMode) {
-        CipherAlgorithm cipherAlgo = ver.getCipherAlgorithm();
-        ChainingMode chainMode = ver.getChainingMode();
-        int keySize = ver.getKeySize()/8;
-        int blockSize = ver.getBlockSize();
-        HashAlgorithm hashAlgo = ver.getHashAlgorithm();
-        
-        byte intermedKey[] = generateKey(pwHash, hashAlgo, blockKey, keySize);
-        SecretKey skey = new SecretKeySpec(intermedKey, cipherAlgo.jceId);
-        byte[] iv = generateIv(hashAlgo, ver.getSalt(), null, blockSize);
-        Cipher cipher = getCipher(skey, cipherAlgo, chainMode, iv, cipherMode);
-        byte[] hashFinal;
-        
-        try {
-            inputKey = getBlock0(inputKey, getNextBlockSize(inputKey.length, blockSize));
-            hashFinal = cipher.doFinal(inputKey);
-            return hashFinal;
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException(e);
-        }
-    }
-
-    @Override
-    public InputStream getDataStream(DirectoryNode dir) throws IOException, GeneralSecurityException {
-        DocumentInputStream dis = dir.createDocumentInputStream(DEFAULT_POIFS_ENTRY);
-        _length = dis.readLong();
-        return new AgileCipherInputStream(dis, _length);
-    }
-
-    @Override
-    public long getLength(){
-        if(_length == -1) {
-            throw new IllegalStateException("EcmaDecryptor.getDataStream() was not called");
-        }
-        return _length;
-    }
-
-
-    protected static Cipher initCipherForBlock(Cipher existing, int block, boolean lastChunk, EncryptionInfo encryptionInfo, SecretKey skey, int encryptionMode)
-    throws GeneralSecurityException {
-        EncryptionHeader header = encryptionInfo.getHeader();
-        String padding = (lastChunk ? "PKCS5Padding" : "NoPadding");
-        if (existing == null || !existing.getAlgorithm().endsWith(padding)) {
-            existing = getCipher(skey, header.getCipherAlgorithm(), header.getChainingMode(), header.getKeySalt(), encryptionMode, padding);
-        }
-
-        byte[] blockKey = new byte[4];
-        LittleEndian.putInt(blockKey, 0, block);
-        byte[] iv = generateIv(header.getHashAlgorithm(), header.getKeySalt(), blockKey, header.getBlockSize());
-
-        AlgorithmParameterSpec aps;
-        if (header.getCipherAlgorithm() == CipherAlgorithm.rc2) {
-            aps = new RC2ParameterSpec(skey.getEncoded().length*8, iv);
-        } else {
-            aps = new IvParameterSpec(iv);
-        }
-
-        existing.init(encryptionMode, skey, aps);
-        
-        return existing;
-    }
-
-    /**
-     * 2.3.4.15 Data Encryption (Agile Encryption)
-     * 
-     * The EncryptedPackage stream (1) MUST be encrypted in 4096-byte segments to facilitate nearly
-     * random access while allowing CBC modes to be used in the encryption process.
-     * The initialization vector for the encryption process MUST be obtained by using the zero-based
-     * segment number as a blockKey and the binary form of the KeyData.saltValue as specified in
-     * section 2.3.4.12. The block number MUST be represented as a 32-bit unsigned integer.
-     * Data blocks MUST then be encrypted by using the initialization vector and the intermediate key
-     * obtained by decrypting the encryptedKeyValue from a KeyEncryptor contained within the
-     * KeyEncryptors sequence as specified in section 2.3.4.10. The final data block MUST be padded to
-     * the next integral multiple of the KeyData.blockSize value. Any padding bytes can be used. Note
-     * that the StreamSize field of the EncryptedPackage field specifies the number of bytes of
-     * unencrypted data as specified in section 2.3.4.4.
-     */
-    private class AgileCipherInputStream extends ChunkedCipherInputStream {
-        public AgileCipherInputStream(DocumentInputStream stream, long size)
-        throws GeneralSecurityException {
-            super(stream, size, 4096);
-        }
-
-        // TODO: calculate integrity hmac while reading the stream
-        // for a post-validation of the data
-        
-        @Override
-        protected Cipher initCipherForBlock(Cipher cipher, int block)
-        throws GeneralSecurityException {
-            return AgileDecryptor.initCipherForBlock(cipher, block, false, getEncryptionInfo(), getSecretKey(), Cipher.DECRYPT_MODE);
-        }
-    }
-    
-    @Override
-    public AgileDecryptor clone() throws CloneNotSupportedException {
-        return (AgileDecryptor)super.clone();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
deleted file mode 100644
index ebb64cb..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.agile;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.EncryptionHeader;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-
-import com.microsoft.schemas.office.x2006.encryption.CTDataIntegrity;
-import com.microsoft.schemas.office.x2006.encryption.CTKeyData;
-import com.microsoft.schemas.office.x2006.encryption.EncryptionDocument;
-import com.microsoft.schemas.office.x2006.encryption.STCipherChaining;
-
-public class AgileEncryptionHeader extends EncryptionHeader implements Cloneable {
-    private byte encryptedHmacKey[], encryptedHmacValue[];
-    
-    public AgileEncryptionHeader(String descriptor) {
-        this(AgileEncryptionInfoBuilder.parseDescriptor(descriptor));
-    }
-    
-    protected AgileEncryptionHeader(EncryptionDocument ed) {
-        CTKeyData keyData;
-        try {
-            keyData = ed.getEncryption().getKeyData();
-            if (keyData == null) {
-                throw new NullPointerException("keyData not set");
-            }
-        } catch (Exception e) {
-            throw new EncryptedDocumentException("Unable to parse keyData");
-        }
-
-        int keyBits = (int)keyData.getKeyBits();
-        
-        CipherAlgorithm ca = CipherAlgorithm.fromXmlId(keyData.getCipherAlgorithm().toString(), keyBits);
-        setCipherAlgorithm(ca);
-        setCipherProvider(ca.provider);
-
-        setKeySize(keyBits);
-        setFlags(0);
-        setSizeExtra(0);
-        setCspName(null);
-        setBlockSize(keyData.getBlockSize());
-
-        switch (keyData.getCipherChaining().intValue()) {
-        case STCipherChaining.INT_CHAINING_MODE_CBC:
-            setChainingMode(ChainingMode.cbc);
-            break;
-        case STCipherChaining.INT_CHAINING_MODE_CFB:
-            setChainingMode(ChainingMode.cfb);
-            break;
-        default:
-            throw new EncryptedDocumentException("Unsupported chaining mode - "+keyData.getCipherChaining().toString());
-        }
-    
-        int hashSize = keyData.getHashSize();
-        
-        HashAlgorithm ha = HashAlgorithm.fromEcmaId(keyData.getHashAlgorithm().toString());
-        setHashAlgorithm(ha);
-
-        if (getHashAlgorithm().hashSize != hashSize) {
-            throw new EncryptedDocumentException("Unsupported hash algorithm: " + 
-                    keyData.getHashAlgorithm() + " @ " + hashSize + " bytes");
-        }
-
-        int saltLength = keyData.getSaltSize();
-        setKeySalt(keyData.getSaltValue());
-        if (getKeySalt().length != saltLength) {
-            throw new EncryptedDocumentException("Invalid salt length");
-        }
-        
-        CTDataIntegrity di = ed.getEncryption().getDataIntegrity();
-        setEncryptedHmacKey(di.getEncryptedHmacKey());
-        setEncryptedHmacValue(di.getEncryptedHmacValue());
-    }
-    
-    
-    public AgileEncryptionHeader(CipherAlgorithm algorithm, HashAlgorithm hashAlgorithm, int keyBits, int blockSize, ChainingMode chainingMode) {
-        setCipherAlgorithm(algorithm);
-        setHashAlgorithm(hashAlgorithm);
-        setKeySize(keyBits);
-        setBlockSize(blockSize);
-        setChainingMode(chainingMode);
-    }
-
-    // make method visible for this package
-    @Override
-    protected void setKeySalt(byte salt[]) {
-        if (salt == null || salt.length != getBlockSize()) {
-            throw new EncryptedDocumentException("invalid verifier salt");
-        }
-        super.setKeySalt(salt);
-    }
-
-    public byte[] getEncryptedHmacKey() {
-        return encryptedHmacKey;
-    }
-
-    protected void setEncryptedHmacKey(byte[] encryptedHmacKey) {
-        this.encryptedHmacKey = (encryptedHmacKey == null) ? null : encryptedHmacKey.clone();
-    }
-
-    public byte[] getEncryptedHmacValue() {
-        return encryptedHmacValue;
-    }
-
-    protected void setEncryptedHmacValue(byte[] encryptedHmacValue) {
-        this.encryptedHmacValue = (encryptedHmacValue == null) ? null : encryptedHmacValue.clone();
-    }
-
-    @Override
-    public AgileEncryptionHeader clone() throws CloneNotSupportedException {
-        AgileEncryptionHeader other = (AgileEncryptionHeader)super.clone();
-        other.encryptedHmacKey = (encryptedHmacKey == null) ? null : encryptedHmacKey.clone();
-        other.encryptedHmacValue = (encryptedHmacValue == null) ? null : encryptedHmacValue.clone();
-        return other;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
deleted file mode 100644
index acfa015..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.agile;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionInfoBuilder;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.xmlbeans.XmlException;
-
-import com.microsoft.schemas.office.x2006.encryption.EncryptionDocument;
-
-public class AgileEncryptionInfoBuilder implements EncryptionInfoBuilder {
-    
-    @Override
-    public void initialize(EncryptionInfo info, LittleEndianInput dis) throws IOException {
-        EncryptionDocument ed = parseDescriptor((InputStream)dis);
-        info.setHeader(new AgileEncryptionHeader(ed));
-        info.setVerifier(new AgileEncryptionVerifier(ed));
-        if (info.getVersionMajor() == EncryptionMode.agile.versionMajor
-            && info.getVersionMinor() == EncryptionMode.agile.versionMinor) {
-            AgileDecryptor dec = new AgileDecryptor();
-            dec.setEncryptionInfo(info);
-            info.setDecryptor(dec);
-            AgileEncryptor enc = new AgileEncryptor();
-            enc.setEncryptionInfo(info);
-            info.setEncryptor(enc);
-        }
-    }
-
-    @Override
-    public void initialize(EncryptionInfo info, CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm, int keyBits, int blockSize, ChainingMode chainingMode) {
-        if (cipherAlgorithm == null) {
-            cipherAlgorithm = CipherAlgorithm.aes128;
-        }
-        if (cipherAlgorithm == CipherAlgorithm.rc4) {
-            throw new EncryptedDocumentException("RC4 must not be used with agile encryption.");
-        }
-        if (hashAlgorithm == null) {
-            hashAlgorithm = HashAlgorithm.sha1;
-        }
-        if (chainingMode == null) {
-            chainingMode = ChainingMode.cbc;
-        }
-        if (!(chainingMode == ChainingMode.cbc || chainingMode == ChainingMode.cfb)) {
-            throw new EncryptedDocumentException("Agile encryption only supports CBC/CFB chaining.");
-        }
-        if (keyBits == -1) {
-            keyBits = cipherAlgorithm.defaultKeySize;
-        }
-        if (blockSize == -1) {
-            blockSize = cipherAlgorithm.blockSize;
-        }
-        boolean found = false;
-        for (int ks : cipherAlgorithm.allowedKeySize) {
-            found |= (ks == keyBits);
-        }
-        if (!found) {
-            throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for Cipher "+cipherAlgorithm.toString());
-        }
-        info.setHeader(new AgileEncryptionHeader(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
-        info.setVerifier(new AgileEncryptionVerifier(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
-        AgileDecryptor dec = new AgileDecryptor();
-        dec.setEncryptionInfo(info);
-        info.setDecryptor(dec);
-        AgileEncryptor enc = new AgileEncryptor();
-        enc.setEncryptionInfo(info);
-        info.setEncryptor(enc);
-    }
-    
-    protected static EncryptionDocument parseDescriptor(String descriptor) {
-        try {
-            return EncryptionDocument.Factory.parse(descriptor, DEFAULT_XML_OPTIONS);
-        } catch (XmlException e) {
-            throw new EncryptedDocumentException("Unable to parse encryption descriptor", e);
-        }
-    }
-
-    protected static EncryptionDocument parseDescriptor(InputStream descriptor) {
-        try {
-            return EncryptionDocument.Factory.parse(descriptor, DEFAULT_XML_OPTIONS);
-        } catch (Exception e) {
-            throw new EncryptedDocumentException("Unable to parse encryption descriptor", e);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
deleted file mode 100644
index 186b27d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.agile;
-
-import java.io.ByteArrayInputStream;
-import java.security.GeneralSecurityException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.EncryptionVerifier;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-
-import com.microsoft.schemas.office.x2006.encryption.CTKeyEncryptor;
-import com.microsoft.schemas.office.x2006.encryption.EncryptionDocument;
-import com.microsoft.schemas.office.x2006.encryption.STCipherChaining;
-import com.microsoft.schemas.office.x2006.keyEncryptor.certificate.CTCertificateKeyEncryptor;
-import com.microsoft.schemas.office.x2006.keyEncryptor.password.CTPasswordKeyEncryptor;
-
-/**
- * Used when checking if a key is valid for a document 
- */
-public class AgileEncryptionVerifier extends EncryptionVerifier implements Cloneable {
-
-    public static class AgileCertificateEntry {
-        X509Certificate x509;
-        byte encryptedKey[];
-        byte certVerifier[];
-    }
-    
-    private List<AgileCertificateEntry> certList = new ArrayList<AgileCertificateEntry>();
-    private int keyBits = -1;
-    private int blockSize = -1;
-
-    public AgileEncryptionVerifier(String descriptor) {
-        this(AgileEncryptionInfoBuilder.parseDescriptor(descriptor));
-    }
-    
-    protected AgileEncryptionVerifier(EncryptionDocument ed) {
-        Iterator<CTKeyEncryptor> encList = ed.getEncryption().getKeyEncryptors().getKeyEncryptorList().iterator();
-        CTPasswordKeyEncryptor keyData;
-        try {
-            keyData = encList.next().getEncryptedPasswordKey();
-            if (keyData == null) {
-                throw new NullPointerException("encryptedKey not set");
-            }
-        } catch (Exception e) {
-            throw new EncryptedDocumentException("Unable to parse keyData", e);
-        }
-        
-        int kb = (int)keyData.getKeyBits();
-        CipherAlgorithm ca = CipherAlgorithm.fromXmlId(keyData.getCipherAlgorithm().toString(), kb);
-        setCipherAlgorithm(ca);
-
-        setKeySize(kb);
-        
-        int blockSize = keyData.getBlockSize();
-        setBlockSize(blockSize);
-        
-        int hashSize = keyData.getHashSize();
-
-        HashAlgorithm ha = HashAlgorithm.fromEcmaId(keyData.getHashAlgorithm().toString());
-        setHashAlgorithm(ha);
-
-        if (getHashAlgorithm().hashSize != hashSize) {
-            throw new EncryptedDocumentException("Unsupported hash algorithm: " + 
-                    keyData.getHashAlgorithm() + " @ " + hashSize + " bytes");
-        }
-
-        setSpinCount(keyData.getSpinCount());
-        setEncryptedVerifier(keyData.getEncryptedVerifierHashInput());
-        setSalt(keyData.getSaltValue());
-        setEncryptedKey(keyData.getEncryptedKeyValue()); 
-        setEncryptedVerifierHash(keyData.getEncryptedVerifierHashValue());
-
-        int saltSize = keyData.getSaltSize();
-        if (saltSize != getSalt().length) {
-            throw new EncryptedDocumentException("Invalid salt size");
-        }
-        
-        switch (keyData.getCipherChaining().intValue()) {
-            case STCipherChaining.INT_CHAINING_MODE_CBC:
-                setChainingMode(ChainingMode.cbc);
-                break;
-            case STCipherChaining.INT_CHAINING_MODE_CFB:
-                setChainingMode(ChainingMode.cfb);
-                break;
-            default:
-                throw new EncryptedDocumentException("Unsupported chaining mode - "+keyData.getCipherChaining().toString());
-        }
-        
-        if (!encList.hasNext()) {
-            return;
-        }
-        
-        try {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            while (encList.hasNext()) {
-                CTCertificateKeyEncryptor certKey = encList.next().getEncryptedCertificateKey();
-                AgileCertificateEntry ace = new AgileCertificateEntry();
-                ace.certVerifier = certKey.getCertVerifier();
-                ace.encryptedKey = certKey.getEncryptedKeyValue();
-                ace.x509 = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(certKey.getX509Certificate()));
-                certList.add(ace);
-            }
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException("can't parse X509 certificate", e);
-        }
-    }
-    
-    public AgileEncryptionVerifier(CipherAlgorithm cipherAlgorithm, HashAlgorithm hashAlgorithm, int keyBits, int blockSize, ChainingMode chainingMode) {
-        setCipherAlgorithm(cipherAlgorithm);
-        setHashAlgorithm(hashAlgorithm);
-        setChainingMode(chainingMode);
-        setKeySize(keyBits);
-        setBlockSize(blockSize);
-        setSpinCount(100000); // TODO: use parameter
-    }
-    
-    @Override
-    protected void setSalt(byte salt[]) {
-        if (salt == null || salt.length != getCipherAlgorithm().blockSize) {
-            throw new EncryptedDocumentException("invalid verifier salt");
-        }
-        super.setSalt(salt);
-    }
-    
-    // make method visible for this package
-    @Override
-    protected void setEncryptedVerifier(byte encryptedVerifier[]) {
-        super.setEncryptedVerifier(encryptedVerifier);
-    }
-
-    // make method visible for this package
-    @Override
-    protected void setEncryptedVerifierHash(byte encryptedVerifierHash[]) {
-        super.setEncryptedVerifierHash(encryptedVerifierHash);
-    }
-
-    // make method visible for this package
-    @Override
-    protected void setEncryptedKey(byte[] encryptedKey) {
-        super.setEncryptedKey(encryptedKey);
-    }
-    
-    public void addCertificate(X509Certificate x509) {
-        AgileCertificateEntry ace = new AgileCertificateEntry();
-        ace.x509 = x509;
-        certList.add(ace);
-    }
-    
-    public List<AgileCertificateEntry> getCertificates() {
-        return certList;
-    }
-
-    @Override
-    public AgileEncryptionVerifier clone() throws CloneNotSupportedException {
-        AgileEncryptionVerifier other = (AgileEncryptionVerifier)super.clone();
-        // TODO: deep copy of certList
-        other.certList = new ArrayList<AgileCertificateEntry>(certList);
-        return other;
-    }
-    
-    
-    /**
-     * The keysize (in bits) of the verifier data. This usually equals the keysize of the header,
-     * but only on a few exceptions, like files generated by Office for Mac, can be
-     * different.
-     *
-     * @return the keysize (in bits) of the verifier.
-     */
-    public int getKeySize() {
-        return keyBits;
-    }
-
-    
-    /**
-     * The blockSize (in bytes) of the verifier data.
-     * This usually equals the blocksize of the header.
-     *
-     * @return the blockSize (in bytes) of the verifier,
-     */
-    public int getBlockSize() {
-        return blockSize;
-    }
-    
-    /**
-     * Sets the keysize (in bits) of the verifier
-     *
-     * @param keyBits the keysize (in bits)
-     */
-    protected void setKeySize(int keyBits) {
-        this.keyBits = keyBits;
-        for (int allowedBits : getCipherAlgorithm().allowedKeySize) {
-            if (allowedBits == keyBits) {
-                return;
-            }
-        }
-        throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for cipher "+getCipherAlgorithm());
-    }
-
-    
-    /**
-     * Sets the blockSize (in bytes) of the verifier
-     *
-     * @param blockSize the blockSize (in bytes)
-     */
-    protected void setBlockSize(int blockSize) {
-        this.blockSize = blockSize;
-    }
-
-    @Override
-    protected final void setCipherAlgorithm(CipherAlgorithm cipherAlgorithm) {
-        super.setCipherAlgorithm(cipherAlgorithm);
-        if (cipherAlgorithm.allowedKeySize.length == 1) {
-            setKeySize(cipherAlgorithm.defaultKeySize);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
deleted file mode 100644
index 96aa9b5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt.agile;
-
-import static org.apache.poi.poifs.crypt.CryptoFunctions.getBlock0;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.getCipher;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.getMessageDigest;
-import static org.apache.poi.poifs.crypt.CryptoFunctions.hashPassword;
-import static org.apache.poi.poifs.crypt.DataSpaceMapUtils.createEncryptionEntry;
-import static org.apache.poi.poifs.crypt.agile.AgileDecryptor.getNextBlockSize;
-import static org.apache.poi.poifs.crypt.agile.AgileDecryptor.hashInput;
-import static org.apache.poi.poifs.crypt.agile.AgileDecryptor.kCryptoKeyBlock;
-import static org.apache.poi.poifs.crypt.agile.AgileDecryptor.kHashedVerifierBlock;
-import static org.apache.poi.poifs.crypt.agile.AgileDecryptor.kIntegrityKeyBlock;
-import static org.apache.poi.poifs.crypt.agile.AgileDecryptor.kIntegrityValueBlock;
-import static org.apache.poi.poifs.crypt.agile.AgileDecryptor.kVerifierInputBlock;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.security.cert.CertificateEncodingException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-import javax.crypto.Cipher;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.crypt.ChunkedCipherOutputStream;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.DataSpaceMapUtils;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.agile.AgileEncryptionVerifier.AgileCertificateEntry;
-import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.xmlbeans.XmlOptions;
-
-import com.microsoft.schemas.office.x2006.encryption.CTDataIntegrity;
-import com.microsoft.schemas.office.x2006.encryption.CTEncryption;
-import com.microsoft.schemas.office.x2006.encryption.CTKeyData;
-import com.microsoft.schemas.office.x2006.encryption.CTKeyEncryptor;
-import com.microsoft.schemas.office.x2006.encryption.CTKeyEncryptors;
-import com.microsoft.schemas.office.x2006.encryption.EncryptionDocument;
-import com.microsoft.schemas.office.x2006.encryption.STCipherAlgorithm;
-import com.microsoft.schemas.office.x2006.encryption.STCipherChaining;
-import com.microsoft.schemas.office.x2006.encryption.STHashAlgorithm;
-import com.microsoft.schemas.office.x2006.keyEncryptor.certificate.CTCertificateKeyEncryptor;
-import com.microsoft.schemas.office.x2006.keyEncryptor.password.CTPasswordKeyEncryptor;
-
-public class AgileEncryptor extends Encryptor implements Cloneable {
-    private byte integritySalt[];
-	private byte pwHash[];
-    
-	protected AgileEncryptor() {
-	}
-
-    @Override
-    public void confirmPassword(String password) {
-        // see [MS-OFFCRYPTO] - 2.3.3 EncryptionVerifier
-        Random r = new SecureRandom();
-        AgileEncryptionHeader header = (AgileEncryptionHeader)getEncryptionInfo().getHeader();
-        int blockSize = header.getBlockSize();
-        int keySize = header.getKeySize()/8;
-        int hashSize = header.getHashAlgorithm().hashSize;
-        
-        byte[] newVerifierSalt = new byte[blockSize]
-             , newVerifier = new byte[blockSize]
-             , newKeySalt = new byte[blockSize]
-             , newKeySpec = new byte[keySize]
-             , newIntegritySalt = new byte[hashSize];
-        r.nextBytes(newVerifierSalt); // blocksize
-        r.nextBytes(newVerifier); // blocksize
-        r.nextBytes(newKeySalt); // blocksize
-        r.nextBytes(newKeySpec); // keysize
-        r.nextBytes(newIntegritySalt); // hashsize
-        
-        confirmPassword(password, newKeySpec, newKeySalt, newVerifierSalt, newVerifier, newIntegritySalt);
-    }
-	
-	@Override
-    public void confirmPassword(String password, byte keySpec[], byte keySalt[], byte verifier[], byte verifierSalt[], byte integritySalt[]) {
-        AgileEncryptionVerifier ver = (AgileEncryptionVerifier)getEncryptionInfo().getVerifier();
-        AgileEncryptionHeader header = (AgileEncryptionHeader)getEncryptionInfo().getHeader();
-
-        ver.setSalt(verifierSalt);
-        header.setKeySalt(keySalt);
-
-        int blockSize = header.getBlockSize();
-	    
-        pwHash = hashPassword(password, ver.getHashAlgorithm(), verifierSalt, ver.getSpinCount());
-        
-        /**
-         * encryptedVerifierHashInput: This attribute MUST be generated by using the following steps:
-         * 1. Generate a random array of bytes with the number of bytes used specified by the saltSize
-         *    attribute.
-         * 2. Generate an encryption key as specified in section 2.3.4.11 by using the user-supplied password,
-         *    the binary byte array used to create the saltValue attribute, and a blockKey byte array
-         *    consisting of the following bytes: 0xfe, 0xa7, 0xd2, 0x76, 0x3b, 0x4b, 0x9e, and 0x79.
-         * 3. Encrypt the random array of bytes generated in step 1 by using the binary form of the saltValue
-         *    attribute as an initialization vector as specified in section 2.3.4.12. If the array of bytes is not an
-         *    integral multiple of blockSize bytes, pad the array with 0x00 to the next integral multiple of
-         *    blockSize bytes.
-         * 4. Use base64 to encode the result of step 3.
-         */
-        byte encryptedVerifier[] = hashInput(ver, pwHash, kVerifierInputBlock, verifier, Cipher.ENCRYPT_MODE);
-        ver.setEncryptedVerifier(encryptedVerifier);
-	    
-
-        /**
-         * encryptedVerifierHashValue: This attribute MUST be generated by using the following steps:
-         * 1. Obtain the hash value of the random array of bytes generated in step 1 of the steps for
-         *    encryptedVerifierHashInput.
-         * 2. Generate an encryption key as specified in section 2.3.4.11 by using the user-supplied password,
-         *    the binary byte array used to create the saltValue attribute, and a blockKey byte array
-         *    consisting of the following bytes: 0xd7, 0xaa, 0x0f, 0x6d, 0x30, 0x61, 0x34, and 0x4e.
-         * 3. Encrypt the hash value obtained in step 1 by using the binary form of the saltValue attribute as
-         *    an initialization vector as specified in section 2.3.4.12. If hashSize is not an integral multiple of
-         *    blockSize bytes, pad the hash value with 0x00 to an integral multiple of blockSize bytes.
-         * 4. Use base64 to encode the result of step 3.
-         */
-        MessageDigest hashMD = getMessageDigest(ver.getHashAlgorithm());
-        byte[] hashedVerifier = hashMD.digest(verifier);
-        byte encryptedVerifierHash[] = hashInput(ver, pwHash, kHashedVerifierBlock, hashedVerifier, Cipher.ENCRYPT_MODE);
-        ver.setEncryptedVerifierHash(encryptedVerifierHash);
-        
-        /**
-         * encryptedKeyValue: This attribute MUST be generated by using the following steps:
-         * 1. Generate a random array of bytes that is the same size as specified by the
-         *    Encryptor.KeyData.keyBits attribute of the parent element.
-         * 2. Generate an encryption key as specified in section 2.3.4.11, using the user-supplied password,
-         *    the binary byte array used to create the saltValue attribute, and a blockKey byte array
-         *    consisting of the following bytes: 0x14, 0x6e, 0x0b, 0xe7, 0xab, 0xac, 0xd0, and 0xd6.
-         * 3. Encrypt the random array of bytes generated in step 1 by using the binary form of the saltValue
-         *    attribute as an initialization vector as specified in section 2.3.4.12. If the array of bytes is not an
-         *    integral multiple of blockSize bytes, pad the array with 0x00 to an integral multiple of
-         *    blockSize bytes.
-         * 4. Use base64 to encode the result of step 3.
-         */
-        byte encryptedKey[] = hashInput(ver, pwHash, kCryptoKeyBlock, keySpec, Cipher.ENCRYPT_MODE);
-        ver.setEncryptedKey(encryptedKey);
-        
-        SecretKey secretKey = new SecretKeySpec(keySpec, header.getCipherAlgorithm().jceId);
-        setSecretKey(secretKey);
-        
-        /*
-         * 2.3.4.14 DataIntegrity Generation (Agile Encryption)
-         * 
-         * The DataIntegrity element contained within an Encryption element MUST be generated by using
-         * the following steps:
-         * 1. Obtain the intermediate key by decrypting the encryptedKeyValue from a KeyEncryptor
-         *    contained within the KeyEncryptors sequence. Use this key for encryption operations in the
-         *    remaining steps of this section.
-         * 2. Generate a random array of bytes, known as Salt, of the same length as the value of the
-         *    KeyData.hashSize attribute.
-         * 3. Encrypt the random array of bytes generated in step 2 by using the binary form of the
-         *    KeyData.saltValue attribute and a blockKey byte array consisting of the following bytes:
-         *    0x5f, 0xb2, 0xad, 0x01, 0x0c, 0xb9, 0xe1, and 0xf6 used to form an initialization vector as
-         *    specified in section 2.3.4.12. If the array of bytes is not an integral multiple of blockSize
-         *    bytes, pad the array with 0x00 to the next integral multiple of blockSize bytes.
-         * 4. Assign the encryptedHmacKey attribute to the base64-encoded form of the result of step 3.
-         * 5. Generate an HMAC, as specified in [RFC2104], of the encrypted form of the data (message),
-         *    which the DataIntegrity element will verify by using the Salt generated in step 2 as the key.
-         *    Note that the entire EncryptedPackage stream (1), including the StreamSize field, MUST be
-         *    used as the message.
-         * 6. Encrypt the HMAC as in step 3 by using a blockKey byte array consisting of the following bytes:
-         *    0xa0, 0x67, 0x7f, 0x02, 0xb2, 0x2c, 0x84, and 0x33.
-         * 7.  Assign the encryptedHmacValue attribute to the base64-encoded form of the result of step 6. 
-         */
-        this.integritySalt = integritySalt.clone();
-
-        try {
-            byte vec[] = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityKeyBlock, header.getBlockSize());
-            Cipher cipher = getCipher(secretKey, header.getCipherAlgorithm(), header.getChainingMode(), vec, Cipher.ENCRYPT_MODE);
-            byte hmacKey[] = getBlock0(this.integritySalt, getNextBlockSize(this.integritySalt.length, blockSize));
-            byte encryptedHmacKey[] = cipher.doFinal(hmacKey);
-            header.setEncryptedHmacKey(encryptedHmacKey);
-
-            cipher = Cipher.getInstance("RSA");
-            for (AgileCertificateEntry ace : ver.getCertificates()) {
-                cipher.init(Cipher.ENCRYPT_MODE, ace.x509.getPublicKey());
-                ace.encryptedKey = cipher.doFinal(getSecretKey().getEncoded());
-                Mac x509Hmac = CryptoFunctions.getMac(header.getHashAlgorithm());
-                x509Hmac.init(getSecretKey());
-                ace.certVerifier = x509Hmac.doFinal(ace.x509.getEncoded());
-            }
-        } catch (GeneralSecurityException e) {
-            throw new EncryptedDocumentException(e);
-        }
-	}
-	
-    @Override
-    public OutputStream getDataStream(DirectoryNode dir)
-            throws IOException, GeneralSecurityException {
-        // TODO: initialize headers
-        AgileCipherOutputStream countStream = new AgileCipherOutputStream(dir);
-    	return countStream;
-    }
-
-    /**
-     * Generate an HMAC, as specified in [RFC2104], of the encrypted form of the data (message), 
-     * which the DataIntegrity element will verify by using the Salt generated in step 2 as the key. 
-     * Note that the entire EncryptedPackage stream (1), including the StreamSize field, MUST be 
-     * used as the message.
-     * 
-     * Encrypt the HMAC as in step 3 by using a blockKey byte array consisting of the following bytes:
-     * 0xa0, 0x67, 0x7f, 0x02, 0xb2, 0x2c, 0x84, and 0x33.
-     **/
-    protected void updateIntegrityHMAC(File tmpFile, int oleStreamSize) throws GeneralSecurityException, IOException {
-        // as the integrity hmac needs to contain the StreamSize,
-        // it's not possible to calculate it on-the-fly while buffering
-        // TODO: add stream size parameter to getDataStream()
-        AgileEncryptionHeader header = (AgileEncryptionHeader)getEncryptionInfo().getHeader();
-        int blockSize = header.getBlockSize();
-        HashAlgorithm hashAlgo = header.getHashAlgorithm();
-        Mac integrityMD = CryptoFunctions.getMac(hashAlgo);
-        byte hmacKey[] = getBlock0(this.integritySalt, getNextBlockSize(this.integritySalt.length, blockSize));
-        integrityMD.init(new SecretKeySpec(hmacKey, hashAlgo.jceHmacId));
-
-        byte buf[] = new byte[1024];
-        LittleEndian.putLong(buf, 0, oleStreamSize);
-        integrityMD.update(buf, 0, LittleEndianConsts.LONG_SIZE);
-        
-        InputStream fis = new FileInputStream(tmpFile);
-        try {
-            int readBytes;
-            while ((readBytes = fis.read(buf)) != -1) {
-                integrityMD.update(buf, 0, readBytes);
-            }
-        } finally {
-        	fis.close();
-        }
-        
-        byte hmacValue[] = integrityMD.doFinal();
-        byte hmacValueFilled[] = getBlock0(hmacValue, getNextBlockSize(hmacValue.length, blockSize));
-        
-        byte iv[] = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityValueBlock, blockSize);
-        Cipher cipher = CryptoFunctions.getCipher(getSecretKey(), header.getCipherAlgorithm(), header.getChainingMode(), iv, Cipher.ENCRYPT_MODE);
-        byte encryptedHmacValue[] = cipher.doFinal(hmacValueFilled);
-        
-        header.setEncryptedHmacValue(encryptedHmacValue);
-    }
-    
-    private final CTKeyEncryptor.Uri.Enum passwordUri = 
-        CTKeyEncryptor.Uri.HTTP_SCHEMAS_MICROSOFT_COM_OFFICE_2006_KEY_ENCRYPTOR_PASSWORD;
-    private final CTKeyEncryptor.Uri.Enum certificateUri = 
-        CTKeyEncryptor.Uri.HTTP_SCHEMAS_MICROSOFT_COM_OFFICE_2006_KEY_ENCRYPTOR_CERTIFICATE;
-    
-    protected EncryptionDocument createEncryptionDocument() {
-        AgileEncryptionVerifier ver = (AgileEncryptionVerifier)getEncryptionInfo().getVerifier();
-        AgileEncryptionHeader header = (AgileEncryptionHeader)getEncryptionInfo().getHeader(); 
-        
-        EncryptionDocument ed = EncryptionDocument.Factory.newInstance();
-        CTEncryption edRoot = ed.addNewEncryption();
-        
-        CTKeyData keyData = edRoot.addNewKeyData();
-        CTKeyEncryptors keyEncList = edRoot.addNewKeyEncryptors();
-        CTKeyEncryptor keyEnc = keyEncList.addNewKeyEncryptor();
-        keyEnc.setUri(passwordUri);
-        CTPasswordKeyEncryptor keyPass = keyEnc.addNewEncryptedPasswordKey();
-
-        keyPass.setSpinCount(ver.getSpinCount());
-        
-        keyData.setSaltSize(header.getBlockSize());
-        keyPass.setSaltSize(ver.getBlockSize());
-        
-        keyData.setBlockSize(header.getBlockSize());
-        keyPass.setBlockSize(ver.getBlockSize());
-
-        keyData.setKeyBits(header.getKeySize());
-        keyPass.setKeyBits(ver.getKeySize());
-
-        keyData.setHashSize(header.getHashAlgorithm().hashSize);
-        keyPass.setHashSize(ver.getHashAlgorithm().hashSize);
-
-        // header and verifier have to have the same cipher algorithm
-        if (!header.getCipherAlgorithm().xmlId.equals(ver.getCipherAlgorithm().xmlId)) {
-            throw new EncryptedDocumentException("Cipher algorithm of header and verifier have to match");
-        }
-        STCipherAlgorithm.Enum xmlCipherAlgo = STCipherAlgorithm.Enum.forString(header.getCipherAlgorithm().xmlId);
-        if (xmlCipherAlgo == null) {
-            throw new EncryptedDocumentException("CipherAlgorithm "+header.getCipherAlgorithm()+" not supported.");
-        }
-        keyData.setCipherAlgorithm(xmlCipherAlgo);
-        keyPass.setCipherAlgorithm(xmlCipherAlgo);
-        
-        switch (header.getChainingMode()) {
-        case cbc: 
-            keyData.setCipherChaining(STCipherChaining.CHAINING_MODE_CBC);
-            keyPass.setCipherChaining(STCipherChaining.CHAINING_MODE_CBC);
-            break;
-        case cfb:
-            keyData.setCipherChaining(STCipherChaining.CHAINING_MODE_CFB);
-            keyPass.setCipherChaining(STCipherChaining.CHAINING_MODE_CFB);
-            break;
-        default:
-            throw new EncryptedDocumentException("ChainingMode "+header.getChainingMode()+" not supported.");
-        }
-        
-        keyData.setHashAlgorithm(mapHashAlgorithm(header.getHashAlgorithm()));
-        keyPass.setHashAlgorithm(mapHashAlgorithm(ver.getHashAlgorithm()));
-
-        keyData.setSaltValue(header.getKeySalt());
-        keyPass.setSaltValue(ver.getSalt());
-        keyPass.setEncryptedVerifierHashInput(ver.getEncryptedVerifier());
-        keyPass.setEncryptedVerifierHashValue(ver.getEncryptedVerifierHash());
-        keyPass.setEncryptedKeyValue(ver.getEncryptedKey());
-        
-        CTDataIntegrity hmacData = edRoot.addNewDataIntegrity();
-        hmacData.setEncryptedHmacKey(header.getEncryptedHmacKey());
-        hmacData.setEncryptedHmacValue(header.getEncryptedHmacValue());
-        
-        for (AgileCertificateEntry ace : ver.getCertificates()) {
-            keyEnc = keyEncList.addNewKeyEncryptor();
-            keyEnc.setUri(certificateUri);
-            CTCertificateKeyEncryptor certData = keyEnc.addNewEncryptedCertificateKey();
-            try {
-                certData.setX509Certificate(ace.x509.getEncoded());
-            } catch (CertificateEncodingException e) {
-                throw new EncryptedDocumentException(e);
-            }
-            certData.setEncryptedKeyValue(ace.encryptedKey);
-            certData.setCertVerifier(ace.certVerifier);
-        }
-        
-        return ed;
-    }
-
-    private static STHashAlgorithm.Enum mapHashAlgorithm(HashAlgorithm hashAlgo) {
-        STHashAlgorithm.Enum xmlHashAlgo = STHashAlgorithm.Enum.forString(hashAlgo.ecmaString);
-        if (xmlHashAlgo == null) {
-            throw new EncryptedDocumentException("HashAlgorithm "+hashAlgo+" not supported.");
-        }
-        return xmlHashAlgo;
-    }
-    
-    protected void marshallEncryptionDocument(EncryptionDocument ed, LittleEndianByteArrayOutputStream os) {
-        XmlOptions xo = new XmlOptions();
-        xo.setCharacterEncoding("UTF-8");
-        Map<String,String> nsMap = new HashMap<String,String>();
-        nsMap.put(passwordUri.toString(),"p");
-        nsMap.put(certificateUri.toString(), "c");
-        xo.setUseDefaultNamespace();
-        xo.setSaveSuggestedPrefixes(nsMap);
-        xo.setSaveNamespacesFirst();
-        xo.setSaveAggressiveNamespaces();
-
-        // setting standalone doesn't work with xmlbeans-2.3 & 2.6
-        // ed.documentProperties().setStandalone(true);
-        xo.setSaveNoXmlDecl();
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        try {
-            bos.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\r\n".getBytes("UTF-8"));
-            ed.save(bos, xo);
-            bos.writeTo(os);
-        } catch (IOException e) {
-            throw new EncryptedDocumentException("error marshalling encryption info document", e);
-        }
-    }
-
-    protected void createEncryptionInfoEntry(DirectoryNode dir, File tmpFile)
-    throws IOException, GeneralSecurityException {
-        DataSpaceMapUtils.addDefaultDataSpace(dir);
-
-        final EncryptionInfo info = getEncryptionInfo();
-
-        EncryptionRecord er = new EncryptionRecord(){
-            @Override
-            public void write(LittleEndianByteArrayOutputStream bos) {
-                // EncryptionVersionInfo (4 bytes): A Version structure (section 2.1.4), where 
-                // Version.vMajor MUST be 0x0004 and Version.vMinor MUST be 0x0004
-                bos.writeShort(info.getVersionMajor());
-                bos.writeShort(info.getVersionMinor());
-                // Reserved (4 bytes): A value that MUST be 0x00000040
-                bos.writeInt(info.getEncryptionFlags());
-
-                EncryptionDocument ed = createEncryptionDocument();
-                marshallEncryptionDocument(ed, bos);
-            }
-        };
-        
-        createEncryptionEntry(dir, "EncryptionInfo", er);
-    }
-    
-    
-    /**
-     * 2.3.4.15 Data Encryption (Agile Encryption)
-     * 
-     * The EncryptedPackage stream (1) MUST be encrypted in 4096-byte segments to facilitate nearly
-     * random access while allowing CBC modes to be used in the encryption process.
-     * The initialization vector for the encryption process MUST be obtained by using the zero-based
-     * segment number as a blockKey and the binary form of the KeyData.saltValue as specified in
-     * section 2.3.4.12. The block number MUST be represented as a 32-bit unsigned integer.
-     * Data blocks MUST then be encrypted by using the initialization vector and the intermediate key
-     * obtained by decrypting the encryptedKeyValue from a KeyEncryptor contained within the
-     * KeyEncryptors sequence as specified in section 2.3.4.10. The final data block MUST be padded to
-     * the next integral multiple of the KeyData.blockSize value. Any padding bytes can be used. Note
-     * that the StreamSize field of the EncryptedPackage field specifies the number of bytes of
-     * unencrypted data as specified in section 2.3.4.4.
-     */
-    private class AgileCipherOutputStream extends ChunkedCipherOutputStream {
-        public AgileCipherOutputStream(DirectoryNode dir) throws IOException, GeneralSecurityException {
-            super(dir, 4096);
-        }
-        
-        @Override
-        protected Cipher initCipherForBlock(Cipher existing, int block, boolean lastChunk)
-        throws GeneralSecurityException {
-            return AgileDecryptor.initCipherForBlock(existing, block, lastChunk, getEncryptionInfo(), getSecretKey(), Cipher.ENCRYPT_MODE);
-        }
-
-        @Override
-        protected void calculateChecksum(File fileOut, int oleStreamSize)
-        throws GeneralSecurityException, IOException {
-            // integrityHMAC needs to be updated before the encryption document is created
-            updateIntegrityHMAC(fileOut, oleStreamSize); 
-        }
-        
-        @Override
-        protected void createEncryptionInfoEntry(DirectoryNode dir, File tmpFile)
-        throws IOException, GeneralSecurityException {
-            AgileEncryptor.this.createEncryptionInfoEntry(dir, tmpFile);
-        }
-    }
-
-    @Override
-    public AgileEncryptor clone() throws CloneNotSupportedException {
-        AgileEncryptor other = (AgileEncryptor)super.clone();
-        other.integritySalt = (integritySalt == null) ? null : integritySalt.clone();
-        other.pwHash = (pwHash == null) ? null : pwHash.clone();
-        return other;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/CertificateSecurityException.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/CertificateSecurityException.java
deleted file mode 100644
index 707ad75..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/CertificateSecurityException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-/**
- * Exception thrown in case there is something wrong with the incoming eID
- * certificate.
- * 
- * @author Frank Cornelis
- * 
- */
-public class CertificateSecurityException extends SecurityException {
-
-    private static final long serialVersionUID = 1L;
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DigestInfo.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DigestInfo.java
deleted file mode 100644
index 33ae03c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DigestInfo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-import java.io.Serializable;
-
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-
-/**
- * Digest Information data transfer class.
- */
-public class DigestInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Main constructor.
-     * 
-     * @param digestValue
-     * @param hashAlgo
-     * @param description
-     */
-    public DigestInfo(byte[] digestValue, HashAlgorithm hashAlgo, String description) {
-        this.digestValue = digestValue.clone();
-        this.hashAlgo = hashAlgo;
-        this.description = description;
-    }
-
-    public final byte[] digestValue;
-
-    public final String description;
-
-    public final HashAlgorithm hashAlgo;
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/ExpiredCertificateSecurityException.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/ExpiredCertificateSecurityException.java
deleted file mode 100644
index adbcfdb..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/ExpiredCertificateSecurityException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-/**
- * Exception thrown in case the incoming eID certificate is expired.
- * 
- * @author Frank Cornelis
- * 
- */
-public class ExpiredCertificateSecurityException extends
-        CertificateSecurityException {
-
-    private static final long serialVersionUID = 1L;
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
deleted file mode 100644
index 9029410..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-import java.security.Key;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.crypto.AlgorithmMethod;
-import javax.xml.crypto.KeySelector;
-import javax.xml.crypto.KeySelectorException;
-import javax.xml.crypto.KeySelectorResult;
-import javax.xml.crypto.XMLCryptoContext;
-import javax.xml.crypto.XMLStructure;
-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
-import javax.xml.crypto.dsig.keyinfo.X509Data;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * JSR105 key selector implementation using the ds:KeyInfo data of the signature
- * itself.
- */
-public class KeyInfoKeySelector extends KeySelector implements KeySelectorResult {
-
-    private static final POILogger LOG = POILogFactory.getLogger(KeyInfoKeySelector.class);
-
-    private List<X509Certificate> certChain = new ArrayList<X509Certificate>();
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public KeySelectorResult select(KeyInfo keyInfo, Purpose purpose, AlgorithmMethod method, XMLCryptoContext context) throws KeySelectorException {
-        LOG.log(POILogger.DEBUG, "select key");
-        if (null == keyInfo) {
-            throw new KeySelectorException("no ds:KeyInfo present");
-        }
-        List<XMLStructure> keyInfoContent = keyInfo.getContent();
-        certChain.clear();
-        for (XMLStructure keyInfoStructure : keyInfoContent) {
-            if (!(keyInfoStructure instanceof X509Data)) {
-                continue;
-            }
-            X509Data x509Data = (X509Data) keyInfoStructure;
-            List<?> x509DataList = x509Data.getContent();
-            for (Object x509DataObject : x509DataList) {
-                if (!(x509DataObject instanceof X509Certificate)) {
-                    continue;
-                }
-                X509Certificate certificate = (X509Certificate) x509DataObject;
-                LOG.log(POILogger.DEBUG, "certificate", certificate.getSubjectX500Principal());
-                certChain.add(certificate);
-            }
-        }
-        if (certChain.isEmpty()) {
-            throw new KeySelectorException("No key found!");
-        }
-        return this;
-    }
-
-    public Key getKey() {
-        // The first certificate is presumably the signer.
-        return certChain.isEmpty() ? null : certChain.get(0).getPublicKey();
-    }
-
-    /**
-     * Gives back the X509 certificate used during the last signature
-     * verification operation.
-     * 
-     * @return the certificate which was used to sign the xml content
-     */
-    public X509Certificate getSigner() {
-        // The first certificate is presumably the signer.
-        return certChain.isEmpty() ? null : certChain.get(0);
-    }
-    
-    public List<X509Certificate> getCertChain() {
-        return certChain;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
deleted file mode 100644
index 64eb53d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.xml.crypto.Data;
-import javax.xml.crypto.OctetStreamData;
-import javax.xml.crypto.URIDereferencer;
-import javax.xml.crypto.URIReference;
-import javax.xml.crypto.URIReferenceException;
-import javax.xml.crypto.XMLCryptoContext;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig.SignatureConfigurable;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * JSR105 URI dereferencer for Office Open XML documents.
- */
-public class OOXMLURIDereferencer implements URIDereferencer, SignatureConfigurable {
-
-    private static final POILogger LOG = POILogFactory.getLogger(OOXMLURIDereferencer.class);
-
-    private SignatureConfig signatureConfig;
-    private URIDereferencer baseUriDereferencer;
-
-    public void setSignatureConfig(SignatureConfig signatureConfig) {
-        this.signatureConfig = signatureConfig;
-    }
-
-    public Data dereference(URIReference uriReference, XMLCryptoContext context) throws URIReferenceException {
-        if (baseUriDereferencer == null) {
-            baseUriDereferencer = signatureConfig.getSignatureFactory().getURIDereferencer();
-        }
-        
-        if (null == uriReference) {
-            throw new NullPointerException("URIReference cannot be null");
-        }
-        if (null == context) {
-            throw new NullPointerException("XMLCrytoContext cannot be null");
-        }
-
-        URI uri;
-        try {
-            uri = new URI(uriReference.getURI());
-        } catch (URISyntaxException e) {
-            throw new URIReferenceException("could not URL decode the uri: "+uriReference.getURI(), e);
-        }
-
-        PackagePart part = findPart(uri);
-        if (part == null) {
-            LOG.log(POILogger.DEBUG, "cannot resolve, delegating to base DOM URI dereferencer", uri);
-            return this.baseUriDereferencer.dereference(uriReference, context);
-        }
-
-        InputStream dataStream;
-        try {
-            dataStream = part.getInputStream();
-
-            // workaround for office 2007 pretty-printed .rels files
-            if (part.getPartName().toString().endsWith(".rels")) {
-                // although xmlsec has an option to ignore line breaks, currently this
-                // only affects .rels files, so we only modify these
-                // http://stackoverflow.com/questions/4728300
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                for (int ch; (ch = dataStream.read()) != -1; ) {
-                    if (ch == 10 || ch == 13) continue;
-                    bos.write(ch);
-                }
-                dataStream = new ByteArrayInputStream(bos.toByteArray());
-            }
-        } catch (IOException e) {
-            throw new URIReferenceException("I/O error: " + e.getMessage(), e);
-        }
-        
-        return new OctetStreamData(dataStream, uri.toString(), null);
-    }
-
-    private PackagePart findPart(URI uri) {
-        LOG.log(POILogger.DEBUG, "dereference", uri);
-
-        String path = uri.getPath();
-        if (path == null || "".equals(path)) {
-            LOG.log(POILogger.DEBUG, "illegal part name (expected)", uri);
-            return null;
-        }
-        
-        PackagePartName ppn;
-        try {
-            ppn = PackagingURIHelper.createPartName(path);
-        } catch (InvalidFormatException e) {
-            LOG.log(POILogger.WARN, "illegal part name (not expected)", uri);
-            return null;
-        }
-        
-        return signatureConfig.getOpcPackage().getPart(ppn);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/RevokedCertificateSecurityException.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/RevokedCertificateSecurityException.java
deleted file mode 100644
index fa4fee7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/RevokedCertificateSecurityException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-/**
- * Exception thrown in case the incoming eID certificate has been revoked.
- * 
- * @author Frank Cornelis
- * 
- */
-public class RevokedCertificateSecurityException extends
-        CertificateSecurityException {
-
-    private static final long serialVersionUID = 1L;
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
deleted file mode 100644
index 6779d8a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
+++ /dev/null
@@ -1,897 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.dsig;
-
-import static org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet.OO_DIGSIG_NS;
-import static org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet.XADES_132_NS;
-
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.xml.crypto.URIDereferencer;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.DigestMethod;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.dsig.facets.KeyInfoSignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.facets.OOXMLSignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.facets.Office2010SignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.facets.XAdESSignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.services.RevocationDataService;
-import org.apache.poi.poifs.crypt.dsig.services.SignaturePolicyService;
-import org.apache.poi.poifs.crypt.dsig.services.TSPTimeStampService;
-import org.apache.poi.poifs.crypt.dsig.services.TimeStampService;
-import org.apache.poi.poifs.crypt.dsig.services.TimeStampServiceValidator;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.xml.security.signature.XMLSignature;
-import org.w3c.dom.events.EventListener;
-
-/**
- * This class bundles the configuration options used for the existing
- * signature facets.
- * Apart of the thread local members (e.g. opc-package) most values will probably be constant, so
- * it might be configured centrally (e.g. by spring) 
- */
-public class SignatureConfig {
-
-    private static final POILogger LOG = POILogFactory.getLogger(SignatureConfig.class);
-    
-    public interface SignatureConfigurable {
-        void setSignatureConfig(SignatureConfig signatureConfig);        
-    }
-
-    private ThreadLocal<OPCPackage> opcPackage = new ThreadLocal<OPCPackage>();
-    private ThreadLocal<XMLSignatureFactory> signatureFactory = new ThreadLocal<XMLSignatureFactory>();
-    private ThreadLocal<KeyInfoFactory> keyInfoFactory = new ThreadLocal<KeyInfoFactory>();
-    private ThreadLocal<Provider> provider = new ThreadLocal<Provider>();
-    
-    private List<SignatureFacet> signatureFacets = new ArrayList<SignatureFacet>();
-    private HashAlgorithm digestAlgo = HashAlgorithm.sha1;
-    private Date executionTime = new Date();
-    private PrivateKey key;
-    private List<X509Certificate> signingCertificateChain;
-
-    /**
-     * the optional signature policy service used for XAdES-EPES.
-     */
-    private SignaturePolicyService signaturePolicyService;
-    private URIDereferencer uriDereferencer = null;
-    private String canonicalizationMethod = CanonicalizationMethod.INCLUSIVE;
-    
-    private boolean includeEntireCertificateChain = true;
-    private boolean includeIssuerSerial = false;
-    private boolean includeKeyValue = false;
-    
-    /**
-     * the time-stamp service used for XAdES-T and XAdES-X.
-     */
-    private TimeStampService tspService = new TSPTimeStampService();
-    /**
-     * timestamp service provider URL
-     */
-    private String tspUrl;
-    private boolean tspOldProtocol = false;
-    /**
-     * if not defined, it's the same as the main digest
-     */
-    private HashAlgorithm tspDigestAlgo = null;
-    private String tspUser;
-    private String tspPass;
-    private TimeStampServiceValidator tspValidator;
-    /**
-     * the optional TSP request policy OID.
-     */
-    private String tspRequestPolicy = "1.3.6.1.4.1.13762.3";
-    private String userAgent = "POI XmlSign Service TSP Client";
-    private String proxyUrl;
-    
-    /**
-     * the optional revocation data service used for XAdES-C and XAdES-X-L.
-     * When <code>null</code> the signature will be limited to XAdES-T only.
-     */
-    private RevocationDataService revocationDataService;
-    /**
-     * if not defined, it's the same as the main digest
-     */
-    private HashAlgorithm xadesDigestAlgo = null;
-    private String xadesRole = null;
-    private String xadesSignatureId = "idSignedProperties";
-    private boolean xadesSignaturePolicyImplied = true;
-    private String xadesCanonicalizationMethod = CanonicalizationMethod.EXCLUSIVE;
-
-    /**
-     * Work-around for Office 2010 IssuerName encoding.
-     */
-    private boolean xadesIssuerNameNoReverseOrder = true;
-
-    /**
-     * The signature Id attribute value used to create the XML signature. A
-     * <code>null</code> value will trigger an automatically generated signature Id.
-     */
-    private String packageSignatureId = "idPackageSignature";
-    
-    /**
-     * Gives back the human-readable description of what the citizen will be
-     * signing. The default value is "Office OpenXML Document".
-     */
-    private String signatureDescription = "Office OpenXML Document";
-    
-    /**
-     * The process of signing includes the marshalling of xml structures.
-     * This also includes the canonicalization. Currently this leads to problems 
-     * with certain namespaces, so this EventListener is used to interfere
-     * with the marshalling process.
-     */
-    EventListener signatureMarshalListener = null;
-
-    /**
-     * Map of namespace uris to prefix
-     * If a mapping is specified, the corresponding elements will be prefixed
-     */
-    Map<String,String> namespacePrefixes = new HashMap<String,String>();
-    
-    /**
-     * Inits and checks the config object.
-     * If not set previously, complex configuration properties also get 
-     * created/initialized via this initialization call.
-     *
-     * @param onlyValidation if true, only a subset of the properties
-     * is initialized, which are necessary for validation. If false,
-     * also the other properties needed for signing are been taken care of
-     */
-    protected void init(boolean onlyValidation) {
-        if (opcPackage == null) {
-            throw new EncryptedDocumentException("opcPackage is null");
-        }
-        if (uriDereferencer == null) {
-            uriDereferencer = new OOXMLURIDereferencer();
-        }
-        if (uriDereferencer instanceof SignatureConfigurable) {
-            ((SignatureConfigurable)uriDereferencer).setSignatureConfig(this);
-        }
-        if (namespacePrefixes.isEmpty()) {
-            /*
-             * OOo doesn't like ds namespaces so per default prefixing is off.
-             */
-            // namespacePrefixes.put(XML_DIGSIG_NS, "");
-            namespacePrefixes.put(OO_DIGSIG_NS, "mdssi");
-            namespacePrefixes.put(XADES_132_NS, "xd");
-        }
-        
-        if (onlyValidation) return;
-
-        if (signatureMarshalListener == null) {
-            signatureMarshalListener = new SignatureMarshalListener();
-        }
-        
-        if (signatureMarshalListener instanceof SignatureConfigurable) {
-            ((SignatureConfigurable)signatureMarshalListener).setSignatureConfig(this);
-        }
-        
-        if (tspService != null) {
-            tspService.setSignatureConfig(this);
-        }
-        
-        if (signatureFacets.isEmpty()) {
-            addSignatureFacet(new OOXMLSignatureFacet());
-            addSignatureFacet(new KeyInfoSignatureFacet());
-            addSignatureFacet(new XAdESSignatureFacet());
-            addSignatureFacet(new Office2010SignatureFacet());
-        }
-
-        for (SignatureFacet sf : signatureFacets) {
-            sf.setSignatureConfig(this);
-        }
-    }
-    
-    /**
-     * @param signatureFacet the signature facet is appended to facet list 
-     */
-    public void addSignatureFacet(SignatureFacet signatureFacet) {
-        signatureFacets.add(signatureFacet);
-    }
-    
-    /**
-     * @return the list of facets, may be empty when the config object is not initialized
-     */
-    public List<SignatureFacet> getSignatureFacets() {
-        return signatureFacets;
-    }
-
-    /**
-     * @param signatureFacets the new list of facets
-     */
-    public void setSignatureFacets(List<SignatureFacet> signatureFacets) {
-        this.signatureFacets = signatureFacets;
-    }
-
-    /**
-     * @return the main digest algorithm, defaults to sha-1
-     */
-    public HashAlgorithm getDigestAlgo() {
-        return digestAlgo;
-    }
-
-    /**
-     * @param digestAlgo the main digest algorithm
-     */
-    public void setDigestAlgo(HashAlgorithm digestAlgo) {
-        this.digestAlgo = digestAlgo;
-    }
-    
-    /**
-     * @return the opc package to be used by this thread, stored as thread-local
-     */
-    public OPCPackage getOpcPackage() {
-        return opcPackage.get();
-    }
-    
-    /**
-     * @param opcPackage the opc package to be handled by this thread, stored as thread-local
-     */
-    public void setOpcPackage(OPCPackage opcPackage) {
-        this.opcPackage.set(opcPackage);
-    }
-
-    /**
-     * @return the private key
-     */
-    public PrivateKey getKey() {
-        return key;
-    }
-
-    /**
-     * @param key the private key
-     */
-    public void setKey(PrivateKey key) {
-        this.key = key;
-    }
-
-    /**
-     * @return the certificate chain, index 0 is usually the certificate matching
-     * the private key
-     */
-    public List<X509Certificate> getSigningCertificateChain() {
-        return signingCertificateChain;
-    }
-
-    /**
-     * @param signingCertificateChain the certificate chain, index 0 should be
-     * the certificate matching the private key
-     */
-    public void setSigningCertificateChain(
-            List<X509Certificate> signingCertificateChain) {
-        this.signingCertificateChain = signingCertificateChain;
-    }
-
-    /**
-     * @return the time at which the document is signed, also used for the timestamp service.
-     * defaults to now
-     */
-    public Date getExecutionTime() {
-        return executionTime;
-    }
-
-    /**
-     * @param executionTime sets the time at which the document ought to be signed
-     */
-    public void setExecutionTime(Date executionTime) {
-        this.executionTime = executionTime;
-    }
-    
-    /**
-     * @return the service to be used for XAdES-EPES properties. There's no default implementation
-     */
-    public SignaturePolicyService getSignaturePolicyService() {
-        return signaturePolicyService;
-    }
-
-    /**
-     * @param signaturePolicyService the service to be used for XAdES-EPES properties
-     */
-    public void setSignaturePolicyService(SignaturePolicyService signaturePolicyService) {
-        this.signaturePolicyService = signaturePolicyService;
-    }
-
-    /**
-     * @return the dereferencer used for Reference/@URI attributes, defaults to {@link OOXMLURIDereferencer}
-     */
-    public URIDereferencer getUriDereferencer() {
-        return uriDereferencer;
-    }
-
-    /**
-     * @param uriDereferencer the dereferencer used for Reference/@URI attributes
-     */
-    public void setUriDereferencer(URIDereferencer uriDereferencer) {
-        this.uriDereferencer = uriDereferencer;
-    }
-
-    /**
-     * @return Gives back the human-readable description of what the citizen
-     * will be signing. The default value is "Office OpenXML Document".
-     */
-    public String getSignatureDescription() {
-        return signatureDescription;
-    }
-
-    /**
-     * @param signatureDescription the human-readable description of
-     * what the citizen will be signing.
-     */
-    public void setSignatureDescription(String signatureDescription) {
-        this.signatureDescription = signatureDescription;
-    }
-    
-    /**
-     * @return the default canonicalization method, defaults to INCLUSIVE
-     */
-    public String getCanonicalizationMethod() {
-        return canonicalizationMethod;
-    }
-    
-    /**
-     * @param canonicalizationMethod the default canonicalization method
-     */
-    public void setCanonicalizationMethod(String canonicalizationMethod) {
-        this.canonicalizationMethod = canonicalizationMethod;
-    }
-
-    /**
-     * @return The signature Id attribute value used to create the XML signature.
-     * Defaults to "idPackageSignature"
-     */
-    public String getPackageSignatureId() {
-        return packageSignatureId;
-    }
-
-    /**
-     * @param packageSignatureId The signature Id attribute value used to create the XML signature.
-     * A <code>null</code> value will trigger an automatically generated signature Id.
-     */
-    public void setPackageSignatureId(String packageSignatureId) {
-        this.packageSignatureId = nvl(packageSignatureId,"xmldsig-"+UUID.randomUUID());
-    }
-
-    /**
-     * @return the url of the timestamp provider (TSP)
-     */
-    public String getTspUrl() {
-        return tspUrl;
-    }
-
-    /**
-     * @param tspUrl the url of the timestamp provider (TSP)
-     */
-    public void setTspUrl(String tspUrl) {
-        this.tspUrl = tspUrl;
-    }
-    
-    /**
-     * @return if true, uses timestamp-request/response mimetype,
-     * if false, timestamp-query/reply mimetype 
-     */
-    public boolean isTspOldProtocol() {
-        return tspOldProtocol;
-    }
-    
-    /**
-     * @param tspOldProtocol defines the timestamp-protocol mimetype
-     * @see #isTspOldProtocol
-     */
-    public void setTspOldProtocol(boolean tspOldProtocol) {
-        this.tspOldProtocol = tspOldProtocol;
-    }
-    
-    /**
-     * @return the hash algorithm to be used for the timestamp entry.
-     * Defaults to the hash algorithm of the main entry
-     */
-    public HashAlgorithm getTspDigestAlgo() {
-        return nvl(tspDigestAlgo,digestAlgo);
-    }
-    
-    /**
-     * @param tspDigestAlgo the algorithm to be used for the timestamp entry.
-     * if <code>null</code>, the hash algorithm of the main entry
-     */
-    public void setTspDigestAlgo(HashAlgorithm tspDigestAlgo) {
-        this.tspDigestAlgo = tspDigestAlgo;
-    }
-
-    /**
-     * @return the proxy url to be used for all communications.
-     * Currently this affects the timestamp service
-     */
-    public String getProxyUrl() {
-        return proxyUrl;
-    }
-    
-    /**
-     * @param proxyUrl the proxy url to be used for all communications.
-     * Currently this affects the timestamp service
-     */
-    public void setProxyUrl(String proxyUrl) {
-        this.proxyUrl = proxyUrl;
-    }
-    
-    /**
-     * @return the timestamp service. Defaults to {@link TSPTimeStampService}
-     */
-    public TimeStampService getTspService() {
-        return tspService;
-    }
-    
-    /**
-     * @param tspService the timestamp service
-     */
-    public void setTspService(TimeStampService tspService) {
-        this.tspService = tspService;
-    }
-    
-    /**
-     * @return the user id for the timestamp service - currently only basic authorization is supported
-     */
-    public String getTspUser() {
-        return tspUser;
-    }
-    
-    /**
-     * @param tspUser the user id for the timestamp service - currently only basic authorization is supported
-     */
-    public void setTspUser(String tspUser) {
-        this.tspUser = tspUser;
-    }
-    
-    /**
-     * @return the password for the timestamp service
-     */
-    public String getTspPass() {
-        return tspPass;
-    }
-    
-    /**
-     * @param tspPass the password for the timestamp service
-     */
-    public void setTspPass(String tspPass) {
-        this.tspPass = tspPass;
-    }
-    
-    /**
-     * @return the validator for the timestamp service (certificate)
-     */
-    public TimeStampServiceValidator getTspValidator() {
-        return tspValidator;
-    }
-    
-    /**
-     * @param tspValidator the validator for the timestamp service (certificate)
-     */
-    public void setTspValidator(TimeStampServiceValidator tspValidator) {
-        this.tspValidator = tspValidator;
-    }
-
-    /**
-     * @return the optional revocation data service used for XAdES-C and XAdES-X-L.
-     * When <code>null</code> the signature will be limited to XAdES-T only.
-     */
-    public RevocationDataService getRevocationDataService() {
-        return revocationDataService;
-    }
-
-    /**
-     * @param revocationDataService the optional revocation data service used for XAdES-C and XAdES-X-L.
-     * When <code>null</code> the signature will be limited to XAdES-T only.
-     */
-    public void setRevocationDataService(RevocationDataService revocationDataService) {
-        this.revocationDataService = revocationDataService;
-    }
-
-    /**
-     * @return hash algorithm used for XAdES. Defaults to the {@link #getDigestAlgo()}
-     */
-    public HashAlgorithm getXadesDigestAlgo() {
-        return nvl(xadesDigestAlgo,digestAlgo);
-    }
-    
-    /**
-     * @param xadesDigestAlgo hash algorithm used for XAdES.
-     * When <code>null</code>, defaults to {@link #getDigestAlgo()}
-     */
-    public void setXadesDigestAlgo(HashAlgorithm xadesDigestAlgo) {
-        this.xadesDigestAlgo = xadesDigestAlgo;
-    }
-
-    /**
-     * @return the user agent used for http communication (e.g. to the TSP)
-     */
-    public String getUserAgent() {
-        return userAgent;
-    }
-    
-    /**
-     * @param userAgent the user agent used for http communication (e.g. to the TSP)
-     */
-    public void setUserAgent(String userAgent) {
-        this.userAgent = userAgent;
-    }
-
-    /**
-     * @return the asn.1 object id for the tsp request policy.
-     * Defaults to <code>1.3.6.1.4.1.13762.3</code>
-     */
-    public String getTspRequestPolicy() {
-        return tspRequestPolicy;
-    }
-    
-    /**
-     * @param tspRequestPolicy the asn.1 object id for the tsp request policy.
-     */
-    public void setTspRequestPolicy(String tspRequestPolicy) {
-        this.tspRequestPolicy = tspRequestPolicy;
-    }
-
-    /**
-     * @return true, if the whole certificate chain is included in the signature.
-     * When false, only the signer cert will be included 
-     */
-    public boolean isIncludeEntireCertificateChain() {
-        return includeEntireCertificateChain;
-    }
-
-    /**
-     * @param includeEntireCertificateChain if true, include the whole certificate chain.
-     * If false, only include the signer cert
-     */
-    public void setIncludeEntireCertificateChain(boolean includeEntireCertificateChain) {
-        this.includeEntireCertificateChain = includeEntireCertificateChain;
-    }
-
-    /**
-     * @return if true, issuer serial number is included
-     */
-    public boolean isIncludeIssuerSerial() {
-        return includeIssuerSerial;
-    }
-
-    /**
-     * @param includeIssuerSerial if true, issuer serial number is included
-     */
-    public void setIncludeIssuerSerial(boolean includeIssuerSerial) {
-        this.includeIssuerSerial = includeIssuerSerial;
-    }
-
-    /**
-     * @return if true, the key value of the public key (certificate) is included
-     */
-    public boolean isIncludeKeyValue() {
-        return includeKeyValue;
-    }
-
-    /**
-     * @param includeKeyValue if true, the key value of the public key (certificate) is included
-     */
-    public void setIncludeKeyValue(boolean includeKeyValue) {
-        this.includeKeyValue = includeKeyValue;
-    }
-
-    /**
-     * @return the xades role element. If <code>null</code> the claimed role element is omitted.
-     * Defaults to <code>null</code>
-     */
-    public String getXadesRole() {
-        return xadesRole;
-    }
-
-    /**
-     * @param xadesRole the xades role element. If <code>null</code> the claimed role element is omitted.
-     */
-    public void setXadesRole(String xadesRole) {
-        this.xadesRole = xadesRole;
-    }
-
-    /**
-     * @return the Id for the XAdES SignedProperties element.
-     * Defaults to <code>idSignedProperties</code>
-     */
-    public String getXadesSignatureId() {
-        return nvl(xadesSignatureId, "idSignedProperties");
-    }
-
-    /**
-     * @param xadesSignatureId the Id for the XAdES SignedProperties element.
-     * When <code>null</code> defaults to <code>idSignedProperties</code>
-     */
-    public void setXadesSignatureId(String xadesSignatureId) {
-        this.xadesSignatureId = xadesSignatureId;
-    }
-
-    /**
-     * @return when true, include the policy-implied block.
-     * Defaults to <code>true</code>
-     */
-    public boolean isXadesSignaturePolicyImplied() {
-        return xadesSignaturePolicyImplied;
-    }
-
-    /**
-     * @param xadesSignaturePolicyImplied when true, include the policy-implied block
-     */
-    public void setXadesSignaturePolicyImplied(boolean xadesSignaturePolicyImplied) {
-        this.xadesSignaturePolicyImplied = xadesSignaturePolicyImplied;
-    }
-
-    /**
-     * Make sure the DN is encoded using the same order as present
-     * within the certificate. This is an Office2010 work-around.
-     * Should be reverted back.
-     * 
-     * XXX: not correct according to RFC 4514.
-     *
-     * @return when true, the issuer DN is used instead of the issuer X500 principal
-     */
-    public boolean isXadesIssuerNameNoReverseOrder() {
-        return xadesIssuerNameNoReverseOrder;
-    }
-
-    /**
-     * @param xadesIssuerNameNoReverseOrder when true, the issuer DN instead of the issuer X500 prinicpal is used
-     */
-    public void setXadesIssuerNameNoReverseOrder(boolean xadesIssuerNameNoReverseOrder) {
-        this.xadesIssuerNameNoReverseOrder = xadesIssuerNameNoReverseOrder;
-    }
-
-    
-    /**
-     * @return the event listener which is active while xml structure for
-     * the signature is created.
-     * Defaults to {@link SignatureMarshalListener}
-     */
-    public EventListener getSignatureMarshalListener() {
-        return signatureMarshalListener;
-    }
-
-    /**
-     * @param signatureMarshalListener the event listener watching the xml structure
-     * generation for the signature
-     */
-    public void setSignatureMarshalListener(EventListener signatureMarshalListener) {
-        this.signatureMarshalListener = signatureMarshalListener;
-    }
-
-    /**
-     * @return the map of namespace uri (key) to prefix (value)
-     */
-    public Map<String, String> getNamespacePrefixes() {
-        return namespacePrefixes;
-    }
-
-    /**
-     * @param namespacePrefixes the map of namespace uri (key) to prefix (value)
-     */
-    public void setNamespacePrefixes(Map<String, String> namespacePrefixes) {
-        this.namespacePrefixes = namespacePrefixes;
-    }
-
-    /**
-     * helper method for null/default value handling
-     * @param value
-     * @param defaultValue
-     * @return if value is not null, return value otherwise defaultValue
-     */
-    protected static <T> T nvl(T value, T defaultValue)  {
-        return value == null ? defaultValue : value;
-    }
-
-    /**
-     * Each digest method has its own IV (initial vector)
-     *
-     * @return the IV depending on the main digest method
-     */
-    public byte[] getHashMagic() {
-        // see https://www.ietf.org/rfc/rfc3110.txt
-        // RSA/SHA1 SIG Resource Records
-        byte result[];
-        switch (getDigestAlgo()) {
-        case sha1: result = new byte[]
-            { 0x30, 0x1f, 0x30, 0x07, 0x06, 0x05, 0x2b, 0x0e
-            , 0x03, 0x02, 0x1a, 0x04, 0x14 };
-            break;
-        case sha224: result = new byte[] 
-            { 0x30, 0x2b, 0x30, 0x0b, 0x06, 0x09, 0x60, (byte) 0x86
-            , 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x04, 0x1c };
-            break;
-        case sha256: result = new byte[]
-            { 0x30, 0x2f, 0x30, 0x0b, 0x06, 0x09, 0x60, (byte) 0x86
-            , 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x04, 0x20 };
-            break;
-        case sha384: result = new byte[]
-            { 0x30, 0x3f, 0x30, 0x0b, 0x06, 0x09, 0x60, (byte) 0x86
-            , 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x04, 0x30 };
-            break;
-        case sha512: result  = new byte[]
-            { 0x30, 0x4f, 0x30, 0x0b, 0x06, 0x09, 0x60, (byte) 0x86
-            , 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x04, 0x40 };
-            break;
-        case ripemd128: result = new byte[]
-            { 0x30, 0x1b, 0x30, 0x07, 0x06, 0x05, 0x2b, 0x24
-            , 0x03, 0x02, 0x02, 0x04, 0x10 };
-            break;
-        case ripemd160: result = new byte[]
-            { 0x30, 0x1f, 0x30, 0x07, 0x06, 0x05, 0x2b, 0x24
-            , 0x03, 0x02, 0x01, 0x04, 0x14 };
-            break;
-        // case ripemd256: result = new byte[]
-        //    { 0x30, 0x2b, 0x30, 0x07, 0x06, 0x05, 0x2b, 0x24
-        //    , 0x03, 0x02, 0x03, 0x04, 0x20 };
-        //    break;
-        default: throw new EncryptedDocumentException("Hash algorithm "
-            +getDigestAlgo()+" not supported for signing.");
-        }
-        
-        return result;
-    }
-
-    /**
-     * @return the uri for the signature method, i.e. currently only rsa is
-     * supported, so it's the rsa variant of the main digest
-     */
-    public String getSignatureMethodUri() {
-        switch (getDigestAlgo()) {
-        case sha1:   return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
-        case sha224: return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA224;
-        case sha256: return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256;
-        case sha384: return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384;
-        case sha512: return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512;
-        case ripemd160: return XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160;
-        default: throw new EncryptedDocumentException("Hash algorithm "
-            +getDigestAlgo()+" not supported for signing.");
-        }
-    }
-    
-    /**
-     * @return the uri for the main digest
-     */
-    public String getDigestMethodUri() {
-        return getDigestMethodUri(getDigestAlgo());
-    }
-    
-    /**
-     * @param digestAlgo the digest algo, currently only sha* and ripemd160 is supported 
-     * @return the uri for the given digest
-     */
-    public static String getDigestMethodUri(HashAlgorithm digestAlgo) {
-        switch (digestAlgo) {
-        case sha1:   return DigestMethod.SHA1;
-        case sha224: return "http://www.w3.org/2001/04/xmldsig-more#sha224";
-        case sha256: return DigestMethod.SHA256;
-        case sha384: return "http://www.w3.org/2001/04/xmldsig-more#sha384";
-        case sha512: return DigestMethod.SHA512;
-        case ripemd160: return DigestMethod.RIPEMD160;
-        default: throw new EncryptedDocumentException("Hash algorithm "
-            +digestAlgo+" not supported for signing.");
-        }
-    }
-    
-    /**
-     * @param signatureFactory the xml signature factory, saved as thread-local
-     */
-    public void setSignatureFactory(XMLSignatureFactory signatureFactory) {
-        this.signatureFactory.set(signatureFactory);
-    }
-    
-    /**
-     * @return the xml signature factory (thread-local)
-     */
-    public XMLSignatureFactory getSignatureFactory() {
-        XMLSignatureFactory sigFac = signatureFactory.get();
-        if (sigFac == null) {
-            sigFac = XMLSignatureFactory.getInstance("DOM", getProvider());
-            setSignatureFactory(sigFac);
-        }
-        return sigFac;
-    }
-
-    /**
-     * @param keyInfoFactory the key factory, saved as thread-local
-     */
-    public void setKeyInfoFactory(KeyInfoFactory keyInfoFactory) {
-        this.keyInfoFactory.set(keyInfoFactory);
-    }
-    
-    /**
-     * @return the key factory (thread-local)
-     */
-    public KeyInfoFactory getKeyInfoFactory() {
-        KeyInfoFactory keyFac = keyInfoFactory.get();
-        if (keyFac == null) {
-            keyFac = KeyInfoFactory.getInstance("DOM", getProvider());
-            setKeyInfoFactory(keyFac);
-        }
-        return keyFac;
-    }
-
-    /**
-     * This method tests the existence of xml signature provider in the following order:
-     * <ul>
-     * <li>the class pointed to by the system property "jsr105Provider"</li>
-     * <li>the Santuario xmlsec provider</li>
-     * <li>the JDK xmlsec provider</li>
-     * </ul>
-     * 
-     * For signing the classes are linked against the Santuario xmlsec, so this might
-     * only work for validation (not tested).
-     *  
-     * @return the xml dsig provider
-     */
-    public Provider getProvider() {
-        Provider prov = provider.get();
-        if (prov == null) {
-            String dsigProviderNames[] = {
-                System.getProperty("jsr105Provider"),
-                "org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI", // Santuario xmlsec
-                "org.jcp.xml.dsig.internal.dom.XMLDSigRI"         // JDK xmlsec
-            };
-            for (String pn : dsigProviderNames) {
-                if (pn == null) continue;
-                try {
-                    prov = (Provider)Class.forName(pn).newInstance();
-                    break;
-                } catch (Exception e) {
-                    LOG.log(POILogger.DEBUG, "XMLDsig-Provider '"+pn+"' can't be found - trying next.");
-                }
-            }
-        }
-
-        if (prov == null) {
-            throw new RuntimeException("JRE doesn't support default xml signature provider - set jsr105Provider system property!");
-        }
-        
-        return prov;
-    }
-
-    /**
-     * @return the cannonicalization method for XAdES-XL signing.
-     * Defaults to <code>EXCLUSIVE</code>
-     * @see <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/crypto/dsig/CanonicalizationMethod.html">javax.xml.crypto.dsig.CanonicalizationMethod</a>
-     */
-    public String getXadesCanonicalizationMethod() {
-        return xadesCanonicalizationMethod;
-    }
-
-    /**
-     * @param xadesCanonicalizationMethod the cannonicalization method for XAdES-XL signing
-     * @see <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/crypto/dsig/CanonicalizationMethod.html">javax.xml.crypto.dsig.CanonicalizationMethod</a>
-     */
-    public void setXadesCanonicalizationMethod(String xadesCanonicalizationMethod) {
-        this.xadesCanonicalizationMethod = xadesCanonicalizationMethod;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
deleted file mode 100644
index d7f648f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ /dev/null
@@ -1,701 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-import static org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet.XML_DIGSIG_NS;
-
-import javax.crypto.Cipher;
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.URIDereferencer;
-import javax.xml.crypto.XMLStructure;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.Manifest;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.SignatureMethod;
-import javax.xml.crypto.dsig.SignedInfo;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.XMLSignContext;
-import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.XMLSignatureException;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.XMLValidateContext;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.Provider;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import org.apache.jcp.xml.dsig.internal.dom.DOMReference;
-import org.apache.jcp.xml.dsig.internal.dom.DOMSignedInfo;
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig.SignatureConfigurable;
-import org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.services.RelationshipTransformService;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.xml.security.Init;
-import org.apache.xml.security.utils.Base64;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.w3.x2000.x09.xmldsig.SignatureDocument;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
-import org.xml.sax.SAXException;
-
-
-/**
- * <p>This class is the default entry point for XML signatures and can be used for
- * validating an existing signed office document and signing a office document.</p>
- * 
- * <p><b>Validating a signed office document</b></p>
- * 
- * <pre>
- * OPCPackage pkg = OPCPackage.open(..., PackageAccess.READ);
- * SignatureConfig sic = new SignatureConfig();
- * sic.setOpcPackage(pkg);
- * SignatureInfo si = new SignatureInfo();
- * si.setSignatureConfig(sic);
- * boolean isValid = si.validate();
- * ...
- * </pre>
- * 
- * <p><b>Signing an office document</b></p>
- * 
- * <pre>
- * // loading the keystore - pkcs12 is used here, but of course jks &amp; co are also valid
- * // the keystore needs to contain a private key and it's certificate having a
- * // 'digitalSignature' key usage
- * char password[] = "test".toCharArray();
- * File file = new File("test.pfx");
- * KeyStore keystore = KeyStore.getInstance("PKCS12");
- * FileInputStream fis = new FileInputStream(file);
- * keystore.load(fis, password);
- * fis.close();
- * 
- * // extracting private key and certificate
- * String alias = "xyz"; // alias of the keystore entry
- * Key key = keystore.getKey(alias, password);
- * X509Certificate x509 = (X509Certificate)keystore.getCertificate(alias);
- * 
- * // filling the SignatureConfig entries (minimum fields, more options are available ...)
- * SignatureConfig signatureConfig = new SignatureConfig();
- * signatureConfig.setKey(keyPair.getPrivate());
- * signatureConfig.setSigningCertificateChain(Collections.singletonList(x509));
- * OPCPackage pkg = OPCPackage.open(..., PackageAccess.READ_WRITE);
- * signatureConfig.setOpcPackage(pkg);
- * 
- * // adding the signature document to the package
- * SignatureInfo si = new SignatureInfo();
- * si.setSignatureConfig(signatureConfig);
- * si.confirmSignature();
- * // optionally verify the generated signature
- * boolean b = si.verifySignature();
- * assert (b);
- * // write the changes back to disc
- * pkg.close();
- * </pre>
- * 
- * <p><b>Implementation notes:</b></p>
- * 
- * <p>Although there's a XML signature implementation in the Oracle JDKs 6 and higher,
- * compatibility with IBM JDKs is also in focus (... but maybe not thoroughly tested ...).
- * Therefore we are using the Apache Santuario libs (xmlsec) instead of the built-in classes,
- * as the compatibility seems to be provided there.</p>
- * 
- * <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs
- * in the classpath:</p>
- * <ul>
- * <li>BouncyCastle bcpkix and bcprov (tested against 1.54)</li>
- * <li>Apache Santuario "xmlsec" (tested against 2.0.5)</li>
- * <li>and slf4j-api (tested against 1.7.12)</li>
- * </ul>
- */
-public class SignatureInfo implements SignatureConfigurable {
-
-    private static final POILogger LOG = POILogFactory.getLogger(SignatureInfo.class);
-    private static boolean isInitialized = false;
-    
-    private SignatureConfig signatureConfig;
-
-    public class SignaturePart {
-        private final PackagePart signaturePart;
-        private X509Certificate signer;
-        private List<X509Certificate> certChain;
-        
-        private SignaturePart(PackagePart signaturePart) {
-            this.signaturePart = signaturePart;
-        }
-        
-        /**
-         * @return the package part containing the signature
-         */
-        public PackagePart getPackagePart() {
-            return signaturePart;
-        }
-        
-        /**
-         * @return the signer certificate
-         */
-        public X509Certificate getSigner() {
-            return signer;
-        }
-        
-        /**
-         * @return the certificate chain of the signer
-         */
-        public List<X509Certificate> getCertChain() {
-            return certChain;
-        }
-        
-        /**
-         * Helper method for examining the xml signature
-         *
-         * @return the xml signature document
-         * @throws IOException if the xml signature doesn't exist or can't be read
-         * @throws XmlException if the xml signature is malformed
-         */
-        public SignatureDocument getSignatureDocument() throws IOException, XmlException {
-            // TODO: check for XXE
-            return SignatureDocument.Factory.parse(signaturePart.getInputStream(), DEFAULT_XML_OPTIONS);
-        }
-        
-        /**
-         * @return true, when the xml signature is valid, false otherwise
-         * 
-         * @throws EncryptedDocumentException if the signature can't be extracted or if its malformed
-         */
-        @SuppressWarnings("unchecked")
-        public boolean validate() {
-            KeyInfoKeySelector keySelector = new KeyInfoKeySelector();
-            try {
-                Document doc = DocumentHelper.readDocument(signaturePart.getInputStream());
-                XPath xpath = XPathFactory.newInstance().newXPath();
-                NodeList nl = (NodeList)xpath.compile("//*[@Id]").evaluate(doc, XPathConstants.NODESET);
-                final int length = nl.getLength();
-                for (int i=0; i<length; i++) {
-                    ((Element)nl.item(i)).setIdAttribute("Id", true);
-                }
-                
-                DOMValidateContext domValidateContext = new DOMValidateContext(keySelector, doc);
-                domValidateContext.setProperty("org.jcp.xml.dsig.validateManifests", Boolean.TRUE);
-                domValidateContext.setURIDereferencer(signatureConfig.getUriDereferencer());
-                brokenJvmWorkaround(domValidateContext);
-    
-                XMLSignatureFactory xmlSignatureFactory = signatureConfig.getSignatureFactory();
-                XMLSignature xmlSignature = xmlSignatureFactory.unmarshalXMLSignature(domValidateContext);
-                
-                // TODO: replace with property when xml-sec patch is applied
-                // workaround added in r1637283 2014-11-07
-                for (Reference ref : (List<Reference>)xmlSignature.getSignedInfo().getReferences()) {
-                    SignatureFacet.brokenJvmWorkaround(ref);
-                }
-                for (XMLObject xo : (List<XMLObject>)xmlSignature.getObjects()) {
-                    for (XMLStructure xs : (List<XMLStructure>)xo.getContent()) {
-                        if (xs instanceof Manifest) {
-                           for (Reference ref : (List<Reference>)((Manifest)xs).getReferences()) {
-                               SignatureFacet.brokenJvmWorkaround(ref);
-                           }
-                        }
-                    }
-                }
-                
-                boolean valid = xmlSignature.validate(domValidateContext);
-
-                if (valid) {
-                    signer = keySelector.getSigner();
-                    certChain = keySelector.getCertChain();
-                }
-                
-                return valid;
-            } catch (IOException e) {
-                String s = "error in reading document";
-                LOG.log(POILogger.ERROR, s, e);
-                throw new EncryptedDocumentException(s, e);
-            } catch (SAXException e) {
-                String s = "error in parsing document";
-                LOG.log(POILogger.ERROR, s, e);
-                throw new EncryptedDocumentException(s, e);
-            } catch (XPathExpressionException e) {
-                String s = "error in searching document with xpath expression";
-                LOG.log(POILogger.ERROR, s, e);
-                throw new EncryptedDocumentException(s, e);
-            } catch (MarshalException e) {
-                String s = "error in unmarshalling the signature";
-                LOG.log(POILogger.ERROR, s, e);
-                throw new EncryptedDocumentException(s, e);
-            } catch (XMLSignatureException e) {
-                String s = "error in validating the signature";
-                LOG.log(POILogger.ERROR, s, e);
-                throw new EncryptedDocumentException(s, e);
-            }
-        }
-    }
-    
-    /**
-     * Constructor initializes xml signature environment, if it hasn't been initialized before
-     */
-    public SignatureInfo() {
-        initXmlProvider();        
-    }
-    
-    /**
-     * @return the signature config
-     */
-    public SignatureConfig getSignatureConfig() {
-        return signatureConfig;
-    }
-
-    /**
-     * @param signatureConfig the signature config, needs to be set before a SignatureInfo object is used
-     */
-    public void setSignatureConfig(SignatureConfig signatureConfig) {
-        this.signatureConfig = signatureConfig;
-    }
-
-    /**
-     * @return true, if first signature part is valid
-     */
-    public boolean verifySignature() {
-        // http://www.oracle.com/technetwork/articles/javase/dig-signature-api-140772.html
-        for (SignaturePart sp : getSignatureParts()){
-            // only validate first part
-            return sp.validate();
-        }
-        return false;
-    }
-
-    /**
-     * add the xml signature to the document
-     *
-     * @throws XMLSignatureException
-     * @throws MarshalException
-     */
-    public void confirmSignature() throws XMLSignatureException, MarshalException {
-        Document document = DocumentHelper.createDocument();
-        
-        // operate
-        DigestInfo digestInfo = preSign(document, null);
-
-        // setup: key material, signature value
-        byte[] signatureValue = signDigest(digestInfo.digestValue);
-        
-        // operate: postSign
-        postSign(document, signatureValue);
-    }
-
-    /**
-     * Sign (encrypt) the digest with the private key.
-     * Currently only rsa is supported.
-     *
-     * @param digest the hashed input
-     * @return the encrypted hash
-     */
-    public byte[] signDigest(byte digest[]) {
-        Cipher cipher = CryptoFunctions.getCipher(signatureConfig.getKey(), CipherAlgorithm.rsa
-            , ChainingMode.ecb, null, Cipher.ENCRYPT_MODE, "PKCS1Padding");
-            
-        try {
-            ByteArrayOutputStream digestInfoValueBuf = new ByteArrayOutputStream();
-            digestInfoValueBuf.write(signatureConfig.getHashMagic());
-            digestInfoValueBuf.write(digest);
-            byte[] digestInfoValue = digestInfoValueBuf.toByteArray();
-            byte[] signatureValue = cipher.doFinal(digestInfoValue);
-            return signatureValue;
-        } catch (Exception e) {
-            throw new EncryptedDocumentException(e);
-        }
-    }
-    
-    /**
-     * @return a signature part for each signature document.
-     * the parts can be validated independently.
-     */
-    public Iterable<SignaturePart> getSignatureParts() {
-        signatureConfig.init(true);
-        return new Iterable<SignaturePart>() {
-            public Iterator<SignaturePart> iterator() {
-                return new Iterator<SignaturePart>() {
-                    OPCPackage pkg = signatureConfig.getOpcPackage();
-                    Iterator<PackageRelationship> sigOrigRels = 
-                        pkg.getRelationshipsByType(PackageRelationshipTypes.DIGITAL_SIGNATURE_ORIGIN).iterator();
-                    Iterator<PackageRelationship> sigRels = null;
-                    PackagePart sigPart = null;
-                    
-                    public boolean hasNext() {
-                        while (sigRels == null || !sigRels.hasNext()) {
-                            if (!sigOrigRels.hasNext()) return false;
-                            sigPart = pkg.getPart(sigOrigRels.next());
-                            LOG.log(POILogger.DEBUG, "Digital Signature Origin part", sigPart);
-                            try {
-                                sigRels = sigPart.getRelationshipsByType(PackageRelationshipTypes.DIGITAL_SIGNATURE).iterator();
-                            } catch (InvalidFormatException e) {
-                                LOG.log(POILogger.WARN, "Reference to signature is invalid.", e);
-                            }
-                        }
-                        return true;
-                    }
-                    
-                    public SignaturePart next() {
-                        PackagePart sigRelPart = null;
-                        do {
-                            try {
-                                if (!hasNext()) throw new NoSuchElementException();
-                                sigRelPart = sigPart.getRelatedPart(sigRels.next()); 
-                                LOG.log(POILogger.DEBUG, "XML Signature part", sigRelPart);
-                            } catch (InvalidFormatException e) {
-                                LOG.log(POILogger.WARN, "Reference to signature is invalid.", e);
-                            }
-                        } while (sigPart == null);
-                        return new SignaturePart(sigRelPart);
-                    }
-                    
-                    public void remove() {
-                        throw new UnsupportedOperationException();
-                    }
-                };
-            }
-        };
-    }
-    
-    /**
-     * Initialize the xml signing environment and the bouncycastle provider 
-     */
-    protected static synchronized void initXmlProvider() {
-        if (isInitialized) return;
-        isInitialized = true;
-        
-        try {
-            Init.init();
-            RelationshipTransformService.registerDsigProvider();
-            CryptoFunctions.registerBouncyCastle();
-        } catch (Exception e) {
-            throw new RuntimeException("Xml & BouncyCastle-Provider initialization failed", e);
-        }
-    }
-    
-    /**
-     * Helper method for adding informations before the signing.
-     * Normally {@link #confirmSignature()} is sufficient to be used.
-     */
-    @SuppressWarnings("unchecked")
-    public DigestInfo preSign(Document document, List<DigestInfo> digestInfos)
-    throws XMLSignatureException, MarshalException {
-        signatureConfig.init(false);
-        
-        // it's necessary to explicitly set the mdssi namespace, but the sign() method has no
-        // normal way to interfere with, so we need to add the namespace under the hand ...
-        EventTarget target = (EventTarget)document;
-        EventListener creationListener = signatureConfig.getSignatureMarshalListener();
-        if (creationListener != null) {
-            if (creationListener instanceof SignatureMarshalListener) {
-                ((SignatureMarshalListener)creationListener).setEventTarget(target);
-            }
-            SignatureMarshalListener.setListener(target, creationListener, true);
-        }
-        
-        /*
-         * Signature context construction.
-         */
-        XMLSignContext xmlSignContext = new DOMSignContext(signatureConfig.getKey(), document);
-        URIDereferencer uriDereferencer = signatureConfig.getUriDereferencer();
-        if (null != uriDereferencer) {
-            xmlSignContext.setURIDereferencer(uriDereferencer);
-        }
-
-        for (Map.Entry<String,String> me : signatureConfig.getNamespacePrefixes().entrySet()) {
-            xmlSignContext.putNamespacePrefix(me.getKey(), me.getValue());
-        }
-        xmlSignContext.setDefaultNamespacePrefix("");
-        // signatureConfig.getNamespacePrefixes().get(XML_DIGSIG_NS));
-        
-        brokenJvmWorkaround(xmlSignContext);
-        
-        XMLSignatureFactory signatureFactory = signatureConfig.getSignatureFactory();
-
-        /*
-         * Add ds:References that come from signing client local files.
-         */
-        List<Reference> references = new ArrayList<Reference>();
-        for (DigestInfo digestInfo : safe(digestInfos)) {
-            byte[] documentDigestValue = digestInfo.digestValue;
-
-            String uri = new File(digestInfo.description).getName();
-            Reference reference = SignatureFacet.newReference
-                (uri, null, null, null, documentDigestValue, signatureConfig);
-            references.add(reference);
-        }
-
-        /*
-         * Invoke the signature facets.
-         */
-        List<XMLObject> objects = new ArrayList<XMLObject>();
-        for (SignatureFacet signatureFacet : signatureConfig.getSignatureFacets()) {
-            LOG.log(POILogger.DEBUG, "invoking signature facet: " + signatureFacet.getClass().getSimpleName());
-            signatureFacet.preSign(document, references, objects);
-        }
-
-        /*
-         * ds:SignedInfo
-         */
-        SignedInfo signedInfo;
-        try {
-            SignatureMethod signatureMethod = signatureFactory.newSignatureMethod
-                (signatureConfig.getSignatureMethodUri(), null);
-            CanonicalizationMethod canonicalizationMethod = signatureFactory
-                .newCanonicalizationMethod(signatureConfig.getCanonicalizationMethod(),
-                (C14NMethodParameterSpec) null);
-            signedInfo = signatureFactory.newSignedInfo(
-                canonicalizationMethod, signatureMethod, references);
-        } catch (GeneralSecurityException e) {
-            throw new XMLSignatureException(e);
-        }
-
-        /*
-         * JSR105 ds:Signature creation
-         */
-        String signatureValueId = signatureConfig.getPackageSignatureId() + "-signature-value";
-        javax.xml.crypto.dsig.XMLSignature xmlSignature = signatureFactory
-            .newXMLSignature(signedInfo, null, objects, signatureConfig.getPackageSignatureId(),
-            signatureValueId);
-
-        /*
-         * ds:Signature Marshalling.
-         */
-        xmlSignature.sign(xmlSignContext);
-
-        /*
-         * Completion of undigested ds:References in the ds:Manifests.
-         */
-        for (XMLObject object : objects) {
-            LOG.log(POILogger.DEBUG, "object java type: " + object.getClass().getName());
-            List<XMLStructure> objectContentList = object.getContent();
-            for (XMLStructure objectContent : objectContentList) {
-                LOG.log(POILogger.DEBUG, "object content java type: " + objectContent.getClass().getName());
-                if (!(objectContent instanceof Manifest)) continue;
-                Manifest manifest = (Manifest) objectContent;
-                List<Reference> manifestReferences = manifest.getReferences();
-                for (Reference manifestReference : manifestReferences) {
-                    if (manifestReference.getDigestValue() != null) continue;
-
-                    DOMReference manifestDOMReference = (DOMReference)manifestReference;
-                    manifestDOMReference.digest(xmlSignContext);
-                }
-            }
-        }
-
-        /*
-         * Completion of undigested ds:References.
-         */
-        List<Reference> signedInfoReferences = signedInfo.getReferences();
-        for (Reference signedInfoReference : signedInfoReferences) {
-            DOMReference domReference = (DOMReference)signedInfoReference;
-
-            // ds:Reference with external digest value
-            if (domReference.getDigestValue() != null) continue;
-            
-            domReference.digest(xmlSignContext);
-        }
-
-        /*
-         * Calculation of XML signature digest value.
-         */
-        DOMSignedInfo domSignedInfo = (DOMSignedInfo)signedInfo;
-        ByteArrayOutputStream dataStream = new ByteArrayOutputStream();
-        domSignedInfo.canonicalize(xmlSignContext, dataStream);
-        byte[] octets = dataStream.toByteArray();
-
-        /*
-         * TODO: we could be using DigestOutputStream here to optimize memory
-         * usage.
-         */
-
-        MessageDigest md = CryptoFunctions.getMessageDigest(signatureConfig.getDigestAlgo());
-        byte[] digestValue = md.digest(octets);
-        
-        
-        String description = signatureConfig.getSignatureDescription();
-        return new DigestInfo(digestValue, signatureConfig.getDigestAlgo(), description);
-    }
-
-    /**
-     * Helper method for adding informations after the signing.
-     * Normally {@link #confirmSignature()} is sufficient to be used.
-     */
-    public void postSign(Document document, byte[] signatureValue)
-    throws MarshalException {
-        LOG.log(POILogger.DEBUG, "postSign");
-
-        /*
-         * Check ds:Signature node.
-         */
-        String signatureId = signatureConfig.getPackageSignatureId();
-        if (!signatureId.equals(document.getDocumentElement().getAttribute("Id"))) {
-            throw new RuntimeException("ds:Signature not found for @Id: " + signatureId);
-        }
-
-        /*
-         * Insert signature value into the ds:SignatureValue element
-         */
-        NodeList sigValNl = document.getElementsByTagNameNS(XML_DIGSIG_NS, "SignatureValue");
-        if (sigValNl.getLength() != 1) {
-            throw new RuntimeException("preSign has to be called before postSign");
-        }
-        sigValNl.item(0).setTextContent(Base64.encode(signatureValue));
-
-        /*
-         * Allow signature facets to inject their own stuff.
-         */
-        for (SignatureFacet signatureFacet : signatureConfig.getSignatureFacets()) {
-            signatureFacet.postSign(document);
-        }
-
-        writeDocument(document);
-    }
-
-    /**
-     * Write XML signature into the OPC package
-     *
-     * @param document the xml signature document
-     * @throws MarshalException
-     */
-    protected void writeDocument(Document document) throws MarshalException {
-        XmlOptions xo = new XmlOptions();
-        Map<String,String> namespaceMap = new HashMap<String,String>();
-        for(Map.Entry<String,String> entry : signatureConfig.getNamespacePrefixes().entrySet()){
-            namespaceMap.put(entry.getValue(), entry.getKey());
-        }        
-        xo.setSaveSuggestedPrefixes(namespaceMap);
-        xo.setUseDefaultNamespace();
-
-        LOG.log(POILogger.DEBUG, "output signed Office OpenXML document");
-
-        /*
-         * Copy the original OOXML content to the signed OOXML package. During
-         * copying some files need to changed.
-         */
-        OPCPackage pkg = signatureConfig.getOpcPackage();
-
-        PackagePartName sigPartName, sigsPartName;
-        try {
-            // <Override PartName="/_xmlsignatures/sig1.xml" ContentType="application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml"/>
-            sigPartName = PackagingURIHelper.createPartName("/_xmlsignatures/sig1.xml");
-            // <Default Extension="sigs" ContentType="application/vnd.openxmlformats-package.digital-signature-origin"/>
-            sigsPartName = PackagingURIHelper.createPartName("/_xmlsignatures/origin.sigs");
-        } catch (InvalidFormatException e) {
-            throw new MarshalException(e);
-        }
-        
-        PackagePart sigPart = pkg.getPart(sigPartName);
-        if (sigPart == null) {
-            sigPart = pkg.createPart(sigPartName, ContentTypes.DIGITAL_SIGNATURE_XML_SIGNATURE_PART);
-        }
-        
-        try {
-            OutputStream os = sigPart.getOutputStream();
-            SignatureDocument sigDoc = SignatureDocument.Factory.parse(document, DEFAULT_XML_OPTIONS);
-            sigDoc.save(os, xo);
-            os.close();
-        } catch (Exception e) {
-            throw new MarshalException("Unable to write signature document", e);
-        }
-        
-        PackagePart sigsPart = pkg.getPart(sigsPartName);
-        if (sigsPart == null) {
-            // touch empty marker file
-            sigsPart = pkg.createPart(sigsPartName, ContentTypes.DIGITAL_SIGNATURE_ORIGIN_PART);
-        }
-        
-        PackageRelationshipCollection relCol = pkg.getRelationshipsByType(PackageRelationshipTypes.DIGITAL_SIGNATURE_ORIGIN);
-        for (PackageRelationship pr : relCol) {
-            pkg.removeRelationship(pr.getId());
-        }
-        pkg.addRelationship(sigsPartName, TargetMode.INTERNAL, PackageRelationshipTypes.DIGITAL_SIGNATURE_ORIGIN);
-        
-        sigsPart.addRelationship(sigPartName, TargetMode.INTERNAL, PackageRelationshipTypes.DIGITAL_SIGNATURE);
-    }
-    
-    /**
-     * Helper method for null lists, which are converted to empty lists
-     *
-     * @param other the reference to wrap, if null
-     * @return if other is null, an empty lists is returned, otherwise other is returned
-     */
-    private static <T> List<T> safe(List<T> other) {
-        List<T> emptyList = Collections.emptyList();
-        return other == null ? emptyList : other;
-    }
-
-    private void brokenJvmWorkaround(XMLSignContext context) {
-        // workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1155012
-        Provider bcProv = Security.getProvider("BC");
-        if (bcProv != null) {
-            context.setProperty("org.jcp.xml.dsig.internal.dom.SignatureProvider", bcProv);
-        }        
-    }
-
-    private void brokenJvmWorkaround(XMLValidateContext context) {
-        // workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1155012
-        Provider bcProv = Security.getProvider("BC");
-        if (bcProv != null) {
-            context.setProperty("org.jcp.xml.dsig.internal.dom.SignatureProvider", bcProv);
-        }        
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
deleted file mode 100644
index f0f43c6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.dsig;
-
-import static org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet.OO_DIGSIG_NS;
-import static org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet.XML_NS;
-
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig.SignatureConfigurable;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
-import org.w3c.dom.events.MutationEvent;
-
-/**
- * This listener class is used, to modify the to be digested xml document,
- * e.g. to register id attributes or set prefixes for registered namespaces
- */
-public class SignatureMarshalListener implements EventListener, SignatureConfigurable {
-    ThreadLocal<EventTarget> target = new ThreadLocal<EventTarget>();
-    SignatureConfig signatureConfig;
-    public void setEventTarget(EventTarget target) {
-        this.target.set(target);
-    }
-    
-    public void handleEvent(Event e) {
-        if (!(e instanceof MutationEvent)) return;
-        MutationEvent mutEvt = (MutationEvent)e;
-        EventTarget et = mutEvt.getTarget();
-        if (!(et instanceof Element)) return;
-        handleElement((Element)et);
-    }
-
-    public void handleElement(Element el) {
-        EventTarget target = this.target.get();
-        String packageId = signatureConfig.getPackageSignatureId();
-        if (el.hasAttribute("Id")) {
-            el.setIdAttribute("Id", true);
-        }
-
-        setListener(target, this, false);
-        if (packageId.equals(el.getAttribute("Id"))) {
-            el.setAttributeNS(XML_NS, "xmlns:mdssi", OO_DIGSIG_NS);
-        }
-        setPrefix(el);
-        setListener(target, this, true);
-    }
-
-    // helper method to keep it in one place
-    public static void setListener(EventTarget target, EventListener listener, boolean enabled) {
-        String type = "DOMSubtreeModified";
-        boolean useCapture = false;
-        if (enabled) {
-            target.addEventListener(type, listener, useCapture);
-        } else {
-            target.removeEventListener(type, listener, useCapture);
-        }
-    }
-    
-    protected void setPrefix(Node el) {
-        String prefix = signatureConfig.getNamespacePrefixes().get(el.getNamespaceURI());
-        if (prefix != null && el.getPrefix() == null) {
-            el.setPrefix(prefix);
-        }
-        
-        NodeList nl = el.getChildNodes();
-        for (int i=0; i<nl.getLength(); i++) {
-            setPrefix(nl.item(i));
-        }
-    }
-    
-    public void setSignatureConfig(SignatureConfig signatureConfig) {
-        this.signatureConfig = signatureConfig;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/TrustCertificateSecurityException.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/TrustCertificateSecurityException.java
deleted file mode 100644
index b99b5eb..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/TrustCertificateSecurityException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig;
-
-/**
- * Exception thrown in case the incoming eID certificate is not trusted.
- * 
- * @author Frank Cornelis
- * 
- */
-public class TrustCertificateSecurityException extends
-        CertificateSecurityException {
-
-    private static final long serialVersionUID = 1L;
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
deleted file mode 100644
index 28b09eb..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.facets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.XMLSignatureException;
-
-import org.w3c.dom.Document;
-
-/**
- * Signature Facet implementation to create enveloped signatures.
- * 
- * @author Frank Cornelis
- * 
- */
-public class EnvelopedSignatureFacet extends SignatureFacet {
-
-    @Override
-    public void preSign(Document document
-        , List<Reference> references
-        , List<XMLObject> objects)
-    throws XMLSignatureException {
-        List<Transform> transforms = new ArrayList<Transform>();
-        Transform envelopedTransform = newTransform(CanonicalizationMethod.ENVELOPED);
-        transforms.add(envelopedTransform);
-        Transform exclusiveTransform = newTransform(CanonicalizationMethod.EXCLUSIVE);
-        transforms.add(exclusiveTransform);
-
-        Reference reference = newReference("", transforms, null, null, null);
-        references.add(reference);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
deleted file mode 100644
index 93f0f5b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.facets;
-
-import java.security.Key;
-import java.security.KeyException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.XMLStructure;
-import javax.xml.crypto.dom.DOMStructure;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
-import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
-import javax.xml.crypto.dsig.keyinfo.KeyValue;
-import javax.xml.crypto.dsig.keyinfo.X509Data;
-
-import org.apache.jcp.xml.dsig.internal.dom.DOMKeyInfo;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Signature Facet implementation that adds ds:KeyInfo to the XML signature.
- * 
- * @author Frank Cornelis
- * 
- */
-public class KeyInfoSignatureFacet extends SignatureFacet {
-
-    private static final POILogger LOG = POILogFactory.getLogger(KeyInfoSignatureFacet.class);
-    
-    @Override
-    public void postSign(Document document) 
-    throws MarshalException {
-        LOG.log(POILogger.DEBUG, "postSign");
-
-        NodeList nl = document.getElementsByTagNameNS(XML_DIGSIG_NS, "Object");
-        
-        /*
-         * Make sure we insert right after the ds:SignatureValue element, just
-         * before the first ds:Object element.
-         */
-        Node nextSibling = (nl.getLength() == 0) ? null : nl.item(0);
-
-        /*
-         * Construct the ds:KeyInfo element using JSR 105.
-         */
-        KeyInfoFactory keyInfoFactory = signatureConfig.getKeyInfoFactory();
-        List<Object> x509DataObjects = new ArrayList<Object>();
-        X509Certificate signingCertificate = signatureConfig.getSigningCertificateChain().get(0);
-
-        List<XMLStructure> keyInfoContent = new ArrayList<XMLStructure>();
-
-        if (signatureConfig.isIncludeKeyValue()) {
-            KeyValue keyValue;
-            try {
-                keyValue = keyInfoFactory.newKeyValue(signingCertificate.getPublicKey());
-            } catch (KeyException e) {
-                throw new RuntimeException("key exception: " + e.getMessage(), e);
-            }
-            keyInfoContent.add(keyValue);
-        }
-
-        if (signatureConfig.isIncludeIssuerSerial()) {
-            x509DataObjects.add(keyInfoFactory.newX509IssuerSerial(
-                signingCertificate.getIssuerX500Principal().toString(),
-                signingCertificate.getSerialNumber()));
-        }
-
-        if (signatureConfig.isIncludeEntireCertificateChain()) {
-            x509DataObjects.addAll(signatureConfig.getSigningCertificateChain());
-        } else {
-            x509DataObjects.add(signingCertificate);
-        }
-
-        if (!x509DataObjects.isEmpty()) {
-            X509Data x509Data = keyInfoFactory.newX509Data(x509DataObjects);
-            keyInfoContent.add(x509Data);
-        }
-        KeyInfo keyInfo = keyInfoFactory.newKeyInfo(keyInfoContent);
-        DOMKeyInfo domKeyInfo = (DOMKeyInfo)keyInfo; 
-
-        Key key = new Key() {
-            private static final long serialVersionUID = 1L;
-
-            public String getAlgorithm() {
-                return null;
-            }
-
-            public byte[] getEncoded() {
-                return null;
-            }
-
-            public String getFormat() {
-                return null;
-            }
-        };
-
-        Element n = document.getDocumentElement();
-        DOMSignContext domSignContext = (nextSibling == null)
-            ? new DOMSignContext(key, n)
-            : new DOMSignContext(key, n, nextSibling);
-        for (Map.Entry<String,String> me : signatureConfig.getNamespacePrefixes().entrySet()) {
-            domSignContext.putNamespacePrefix(me.getKey(), me.getValue());
-        }
-        
-        DOMStructure domStructure = new DOMStructure(n);
-        domKeyInfo.marshal(domStructure, domSignContext);
-        
-        // move keyinfo into the right place
-        if (nextSibling != null) {
-            NodeList kiNl = document.getElementsByTagNameNS(XML_DIGSIG_NS, "KeyInfo");
-            if (kiNl.getLength() != 1) {
-                throw new RuntimeException("KeyInfo wasn't set");
-            }
-            nextSibling.getParentNode().insertBefore(kiNl.item(0), nextSibling);
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
deleted file mode 100644
index 9e094a6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.facets;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import javax.xml.XMLConstants;
-import javax.xml.crypto.XMLStructure;
-import javax.xml.crypto.dom.DOMStructure;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.Manifest;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.SignatureProperties;
-import javax.xml.crypto.dsig.SignatureProperty;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.XMLSignatureException;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.poifs.crypt.dsig.services.RelationshipTransformService;
-import org.apache.poi.poifs.crypt.dsig.services.RelationshipTransformService.RelationshipTransformParameterSpec;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.openxmlformats.schemas.xpackage.x2006.digitalSignature.CTSignatureTime;
-import org.openxmlformats.schemas.xpackage.x2006.digitalSignature.SignatureTimeDocument;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import com.microsoft.schemas.office.x2006.digsig.CTSignatureInfoV1;
-import com.microsoft.schemas.office.x2006.digsig.SignatureInfoV1Document;
-
-/**
- * Office OpenXML Signature Facet implementation.
- * 
- * @author fcorneli
- * @see <a href="http://msdn.microsoft.com/en-us/library/cc313071.aspx">[MS-OFFCRYPTO]: Office Document Cryptography Structure</a>
- */
-public class OOXMLSignatureFacet extends SignatureFacet {
-
-    private static final POILogger LOG = POILogFactory.getLogger(OOXMLSignatureFacet.class);
-
-    @Override
-    public void preSign(
-        Document document
-        , List<Reference> references
-        , List<XMLObject> objects)
-    throws XMLSignatureException {
-        LOG.log(POILogger.DEBUG, "pre sign");
-        addManifestObject(document, references, objects);
-        addSignatureInfo(document, references, objects);
-    }
-
-    protected void addManifestObject(
-        Document document
-        , List<Reference> references
-        , List<XMLObject> objects)
-    throws XMLSignatureException {
-
-        List<Reference> manifestReferences = new ArrayList<Reference>();
-        addManifestReferences(manifestReferences);
-        Manifest manifest =  getSignatureFactory().newManifest(manifestReferences);
-        
-        String objectId = "idPackageObject"; // really has to be this value.
-        List<XMLStructure> objectContent = new ArrayList<XMLStructure>();
-        objectContent.add(manifest);
-
-        addSignatureTime(document, objectContent);
-
-        XMLObject xo = getSignatureFactory().newXMLObject(objectContent, objectId, null, null);
-        objects.add(xo);
-
-        Reference reference = newReference("#" + objectId, null, XML_DIGSIG_NS+"Object", null, null);
-        references.add(reference);
-    }
-
-    @SuppressWarnings("resource")
-    protected void addManifestReferences(List<Reference> manifestReferences)
-    throws XMLSignatureException {
-
-        OPCPackage ooxml = signatureConfig.getOpcPackage();
-        List<PackagePart> relsEntryNames = ooxml.getPartsByContentType(ContentTypes.RELATIONSHIPS_PART);
-
-        Set<String> digestedPartNames = new HashSet<String>();
-        for (PackagePart pp : relsEntryNames) {
-            String baseUri = pp.getPartName().getName().replaceFirst("(.*)/_rels/.*", "$1");
-
-            PackageRelationshipCollection prc;
-            try {
-                prc = new PackageRelationshipCollection(ooxml);
-                prc.parseRelationshipsPart(pp);
-            } catch (InvalidFormatException e) {
-                throw new XMLSignatureException("Invalid relationship descriptor: "+pp.getPartName().getName(), e);
-            }
-            
-            RelationshipTransformParameterSpec parameterSpec = new RelationshipTransformParameterSpec();
-            for (PackageRelationship relationship : prc) {
-                String relationshipType = relationship.getRelationshipType();
-                
-                /*
-                 * ECMA-376 Part 2 - 3rd edition
-                 * 13.2.4.16 Manifest Element
-                 * "The producer shall not create a Manifest element that references any data outside of the package."
-                 */
-                if (TargetMode.EXTERNAL == relationship.getTargetMode()) {
-                    continue;
-                }
-
-                if (!isSignedRelationship(relationshipType)) continue;
-
-                parameterSpec.addRelationshipReference(relationship.getId());
-
-                // TODO: find a better way ...
-                String partName = relationship.getTargetURI().toString();
-                if (!partName.startsWith(baseUri)) {
-                    partName = baseUri + partName;
-                }
-                try {
-                    partName = new URI(partName).normalize().getPath().replace('\\', '/');
-                    LOG.log(POILogger.DEBUG, "part name: " + partName);
-                } catch (URISyntaxException e) {
-                    throw new XMLSignatureException(e);
-                }
-                
-                String contentType;
-                try {
-                    PackagePartName relName = PackagingURIHelper.createPartName(partName);
-                    PackagePart pp2 = ooxml.getPart(relName);
-                    contentType = pp2.getContentType();
-                } catch (InvalidFormatException e) {
-                    throw new XMLSignatureException(e);
-                }
-                
-                if (relationshipType.endsWith("customXml")
-                    && !(contentType.equals("inkml+xml") || contentType.equals("text/xml"))) {
-                    LOG.log(POILogger.DEBUG, "skipping customXml with content type: " + contentType);
-                    continue;
-                }
-                
-                if (!digestedPartNames.contains(partName)) {
-                    // We only digest a part once.
-                    String uri = partName + "?ContentType=" + contentType;
-                    Reference reference = newReference(uri, null, null, null, null);
-                    manifestReferences.add(reference);
-                    digestedPartNames.add(partName);
-                }
-            }
-            
-            if (parameterSpec.hasSourceIds()) {
-                List<Transform> transforms = new ArrayList<Transform>();
-                transforms.add(newTransform(RelationshipTransformService.TRANSFORM_URI, parameterSpec));
-                transforms.add(newTransform(CanonicalizationMethod.INCLUSIVE));
-                String uri = pp.getPartName().getName()
-                    + "?ContentType=application/vnd.openxmlformats-package.relationships+xml";
-                Reference reference = newReference(uri, transforms, null, null, null);
-                manifestReferences.add(reference);
-            }
-        }
-    }
-
-
-    protected void addSignatureTime(Document document, List<XMLStructure> objectContent) {
-        /*
-         * SignatureTime
-         */
-        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
-        fmt.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-        String nowStr = fmt.format(signatureConfig.getExecutionTime());
-        LOG.log(POILogger.DEBUG, "now: " + nowStr);
-
-        SignatureTimeDocument sigTime = SignatureTimeDocument.Factory.newInstance();
-        CTSignatureTime ctTime = sigTime.addNewSignatureTime();
-        ctTime.setFormat("YYYY-MM-DDThh:mm:ssTZD");
-        ctTime.setValue(nowStr);
-
-        Element n = (Element)document.importNode(ctTime.getDomNode(),true);
-        List<XMLStructure> signatureTimeContent = new ArrayList<XMLStructure>();
-        signatureTimeContent.add(new DOMStructure(n));
-        SignatureProperty signatureTimeSignatureProperty = getSignatureFactory()
-            .newSignatureProperty(signatureTimeContent, "#" + signatureConfig.getPackageSignatureId(),
-            "idSignatureTime");
-        List<SignatureProperty> signaturePropertyContent = new ArrayList<SignatureProperty>();
-        signaturePropertyContent.add(signatureTimeSignatureProperty);
-        SignatureProperties signatureProperties = getSignatureFactory()
-            .newSignatureProperties(signaturePropertyContent,
-            "id-signature-time-" + signatureConfig.getExecutionTime());
-        objectContent.add(signatureProperties);
-    }
-
-    protected void addSignatureInfo(Document document,
-        List<Reference> references,
-        List<XMLObject> objects)
-    throws XMLSignatureException {
-        List<XMLStructure> objectContent = new ArrayList<XMLStructure>();
-
-        SignatureInfoV1Document sigV1 = SignatureInfoV1Document.Factory.newInstance();
-        CTSignatureInfoV1 ctSigV1 = sigV1.addNewSignatureInfoV1();
-        ctSigV1.setManifestHashAlgorithm(signatureConfig.getDigestMethodUri());
-        Element n = (Element)document.importNode(ctSigV1.getDomNode(), true);
-        n.setAttributeNS(XML_NS, XMLConstants.XMLNS_ATTRIBUTE, MS_DIGSIG_NS);
-        
-        List<XMLStructure> signatureInfoContent = new ArrayList<XMLStructure>();
-        signatureInfoContent.add(new DOMStructure(n));
-        SignatureProperty signatureInfoSignatureProperty = getSignatureFactory()
-            .newSignatureProperty(signatureInfoContent, "#" + signatureConfig.getPackageSignatureId(),
-            "idOfficeV1Details");
-
-        List<SignatureProperty> signaturePropertyContent = new ArrayList<SignatureProperty>();
-        signaturePropertyContent.add(signatureInfoSignatureProperty);
-        SignatureProperties signatureProperties = getSignatureFactory()
-            .newSignatureProperties(signaturePropertyContent, null);
-        objectContent.add(signatureProperties);
-
-        String objectId = "idOfficeObject";
-        objects.add(getSignatureFactory().newXMLObject(objectContent, objectId, null, null));
-
-        Reference reference = newReference("#" + objectId, null, XML_DIGSIG_NS+"Object", null, null);
-        references.add(reference);
-    }
-
-    protected static String getRelationshipReferenceURI(String zipEntryName) {
-        return "/"
-            + zipEntryName
-            + "?ContentType=application/vnd.openxmlformats-package.relationships+xml";
-    }
-
-    protected static String getResourceReferenceURI(String resourceName, String contentType) {
-        return "/" + resourceName + "?ContentType=" + contentType;
-    }
-
-    protected static boolean isSignedRelationship(String relationshipType) {
-        LOG.log(POILogger.DEBUG, "relationship type: " + relationshipType);
-        for (String signedTypeExtension : signed) {
-            if (relationshipType.endsWith(signedTypeExtension)) {
-                return true;
-            }
-        }
-        if (relationshipType.endsWith("customXml")) {
-            LOG.log(POILogger.DEBUG, "customXml relationship type");
-            return true;
-        }
-        return false;
-    }
-    
-    public static final String[] contentTypes = {
-        /*
-         * Word
-         */
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml",
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml",
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml",
-        "application/vnd.openxmlformats-officedocument.theme+xml",
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml",
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml",
-
-        /*
-         * Word 2010
-         */
-        "application/vnd.ms-word.stylesWithEffects+xml",
-
-        /*
-         * Excel
-         */
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml",
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
-
-        /*
-         * Powerpoint
-         */
-        "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml",
-        "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml",
-        "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml",
-        "application/vnd.openxmlformats-officedocument.presentationml.slide+xml",
-        "application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml",
-
-        /*
-         * Powerpoint 2010
-         */
-        "application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml",
-        "application/vnd.openxmlformats-officedocument.presentationml.presProps+xml"
-    };
-
-    /**
-     * Office 2010 list of signed types (extensions).
-     */
-    public static final String[] signed = {
-        "powerPivotData", //
-        "activeXControlBinary", //
-        "attachedToolbars", //
-        "connectorXml", //
-        "downRev", //
-        "functionPrototypes", //
-        "graphicFrameDoc", //
-        "groupShapeXml", //
-        "ink", //
-        "keyMapCustomizations", //
-        "legacyDiagramText", //
-        "legacyDocTextInfo", //
-        "officeDocument", //
-        "pictureXml", //
-        "shapeXml", //
-        "smartTags", //
-        "ui/altText", //
-        "ui/buttonSize", //
-        "ui/controlID", //
-        "ui/description", //
-        "ui/enabled", //
-        "ui/extensibility", //
-        "ui/helperText", //
-        "ui/imageID", //
-        "ui/imageMso", //
-        "ui/keyTip", //
-        "ui/label", //
-        "ui/lcid", //
-        "ui/loud", //
-        "ui/pressed", //
-        "ui/progID", //
-        "ui/ribbonID", //
-        "ui/showImage", //
-        "ui/showLabel", //
-        "ui/supertip", //
-        "ui/target", //
-        "ui/text", //
-        "ui/title", //
-        "ui/tooltip", //
-        "ui/userCustomization", //
-        "ui/visible", //
-        "userXmlData", //
-        "vbaProject", //
-        "wordVbaData", //
-        "wsSortMap", //
-        "xlBinaryIndex", //
-        "xlExternalLinkPath/xlAlternateStartup", //
-        "xlExternalLinkPath/xlLibrary", //
-        "xlExternalLinkPath/xlPathMissing", //
-        "xlExternalLinkPath/xlStartup", //
-        "xlIntlMacrosheet", //
-        "xlMacrosheet", //
-        "customData", //
-        "diagramDrawing", //
-        "hdphoto", //
-        "inkXml", //
-        "media", //
-        "slicer", //
-        "slicerCache", //
-        "stylesWithEffects", //
-        "ui/extensibility", //
-        "chartColorStyle", //
-        "chartLayout", //
-        "chartStyle", //
-        "dictionary", //
-        "timeline", //
-        "timelineCache", //
-        "aFChunk", //
-        "attachedTemplate", //
-        "audio", //
-        "calcChain", //
-        "chart", //
-        "chartsheet", //
-        "chartUserShapes", //
-        "commentAuthors", //
-        "comments", //
-        "connections", //
-        "control", //
-        "customProperty", //
-        "customXml", //
-        "diagramColors", //
-        "diagramData", //
-        "diagramLayout", //
-        "diagramQuickStyle", //
-        "dialogsheet", //
-        "drawing", //
-        "endnotes", //
-        "externalLink", //
-        "externalLinkPath", //
-        "font", //
-        "fontTable", //
-        "footer", //
-        "footnotes", //
-        "glossaryDocument", //
-        "handoutMaster", //
-        "header", //
-        "hyperlink", //
-        "image", //
-        "mailMergeHeaderSource", //
-        "mailMergeRecipientData", //
-        "mailMergeSource", //
-        "notesMaster", //
-        "notesSlide", //
-        "numbering", //
-        "officeDocument", //
-        "oleObject", //
-        "package", //
-        "pivotCacheDefinition", //
-        "pivotCacheRecords", //
-        "pivotTable", //
-        "presProps", //
-        "printerSettings", //
-        "queryTable", //
-        "recipientData", //
-        "settings", //
-        "sharedStrings", //
-        "sheetMetadata", //
-        "slide", //
-        "slideLayout", //
-        "slideMaster", //
-        "slideUpdateInfo", //
-        "slideUpdateUrl", //
-        "styles", //
-        "table", //
-        "tableSingleCells", //
-        "tableStyles", //
-        "tags", //
-        "theme", //
-        "themeOverride", //
-        "transform", //
-        "video", //
-        "viewProps", //
-        "volatileDependencies", //
-        "webSettings", //
-        "worksheet", //
-        "xmlMaps", //
-        "ctrlProp", //
-        "customData", //
-        "diagram", //
-        "diagramColorsHeader", //
-        "diagramLayoutHeader", //
-        "diagramQuickStyleHeader", //
-        "documentParts", //
-        "slicer", //
-        "slicerCache", //
-        "vmlDrawing" //
-    };
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
deleted file mode 100644
index c6dc249..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.facets;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import javax.xml.crypto.MarshalException;
-
-import org.apache.xmlbeans.XmlException;
-import org.etsi.uri.x01903.v13.QualifyingPropertiesType;
-import org.etsi.uri.x01903.v13.UnsignedPropertiesType;
-import org.etsi.uri.x01903.v13.UnsignedSignaturePropertiesType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Work-around for Office2010 to accept the XAdES-BES/EPES signature.
- * 
- * xades:UnsignedProperties/xades:UnsignedSignatureProperties needs to be
- * present.
- * 
- * @author Frank Cornelis
- * 
- */
-public class Office2010SignatureFacet extends SignatureFacet {
-
-    @Override
-    public void postSign(Document document)
-    throws MarshalException {
-        // check for XAdES-BES
-        NodeList nl = document.getElementsByTagNameNS(XADES_132_NS, "QualifyingProperties");
-        if (nl.getLength() != 1) {
-            throw new MarshalException("no XAdES-BES extension present");
-        }
-
-        QualifyingPropertiesType qualProps;
-        try {
-            qualProps = QualifyingPropertiesType.Factory.parse(nl.item(0), DEFAULT_XML_OPTIONS);
-        } catch (XmlException e) {
-            throw new MarshalException(e);
-        }
-        
-        // create basic XML container structure
-        UnsignedPropertiesType unsignedProps = qualProps.getUnsignedProperties();
-        if (unsignedProps == null) {
-            unsignedProps = qualProps.addNewUnsignedProperties();
-        }
-        UnsignedSignaturePropertiesType unsignedSigProps = unsignedProps.getUnsignedSignatureProperties();
-        if (unsignedSigProps == null) {
-            /* unsignedSigProps = */ unsignedProps.addNewUnsignedSignatureProperties();
-        }
-        
-        Node n = document.importNode(qualProps.getDomNode().getFirstChild(), true);
-        nl.item(0).getParentNode().replaceChild(n, nl.item(0));
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
deleted file mode 100644
index 43bef87..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.facets;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.PrivilegedAction;
-import java.security.Provider;
-import java.security.Security;
-import java.util.List;
-
-import javax.xml.XMLConstants;
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.dsig.DigestMethod;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.XMLSignatureException;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-
-import org.apache.jcp.xml.dsig.internal.dom.DOMDigestMethod;
-import org.apache.jcp.xml.dsig.internal.dom.DOMReference;
-import org.apache.poi.openxml4j.opc.PackageNamespaces;
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig;
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig.SignatureConfigurable;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.SuppressForbidden;
-import org.w3c.dom.Document;
-
-/**
- * JSR105 Signature Facet base class.
- */
-public abstract class SignatureFacet implements SignatureConfigurable {
-
-    private static final POILogger LOG = POILogFactory.getLogger(SignatureFacet.class);
-    
-    public static final String XML_NS = XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-    public static final String XML_DIGSIG_NS = XMLSignature.XMLNS;
-    public static final String OO_DIGSIG_NS = PackageNamespaces.DIGITAL_SIGNATURE;
-    public static final String MS_DIGSIG_NS = "http://schemas.microsoft.com/office/2006/digsig";
-    public static final String XADES_132_NS = "http://uri.etsi.org/01903/v1.3.2#";
-    public static final String XADES_141_NS = "http://uri.etsi.org/01903/v1.4.1#";
-
-    protected SignatureConfig signatureConfig;
-
-    public void setSignatureConfig(SignatureConfig signatureConfig) {
-        this.signatureConfig = signatureConfig;
-    }
-
-    /**
-     * This method is being invoked by the XML signature service engine during
-     * pre-sign phase. Via this method a signature facet implementation can add
-     * signature facets to an XML signature.
-     * 
-     * @param document the signature document to be used for imports
-     * @param references list of reference definitions
-     * @param objects objects to be signed/included in the signature document
-     * @throws XMLSignatureException
-     */
-    public void preSign(
-          Document document
-        , List<Reference> references
-        , List<XMLObject> objects
-    ) throws XMLSignatureException {
-        // empty
-    }
-
-    /**
-     * This method is being invoked by the XML signature service engine during
-     * the post-sign phase. Via this method a signature facet can extend the XML
-     * signatures with for example key information.
-     *
-     * @param document the signature document to be modified
-     * @throws MarshalException
-     */
-    public void postSign(Document document) throws MarshalException {
-        // empty
-    }
-
-    protected XMLSignatureFactory getSignatureFactory() {
-        return signatureConfig.getSignatureFactory();
-    }
-    
-    protected Transform newTransform(String canonicalizationMethod) throws XMLSignatureException {
-        return newTransform(canonicalizationMethod, null);
-    }
-    
-    protected Transform newTransform(String canonicalizationMethod, TransformParameterSpec paramSpec)
-    throws XMLSignatureException {
-        try {
-            return getSignatureFactory().newTransform(canonicalizationMethod, paramSpec);
-        } catch (GeneralSecurityException e) {
-            throw new XMLSignatureException("unknown canonicalization method: "+canonicalizationMethod, e);
-        }
-    }
-    
-    protected Reference newReference(String uri, List<Transform> transforms, String type, String id, byte digestValue[])
-    throws XMLSignatureException {
-        return newReference(uri, transforms, type, id, digestValue, signatureConfig);
-    }
-
-    public static Reference newReference(
-          String uri
-        , List<Transform> transforms
-        , String type
-        , String id
-        , byte digestValue[]
-        , SignatureConfig signatureConfig)
-    throws XMLSignatureException {
-        // the references appear in the package signature or the package object
-        // so we can use the default digest algorithm
-        String digestMethodUri = signatureConfig.getDigestMethodUri();
-        XMLSignatureFactory sigFac = signatureConfig.getSignatureFactory();
-        DigestMethod digestMethod;
-        try {
-            digestMethod = sigFac.newDigestMethod(digestMethodUri, null);
-        } catch (GeneralSecurityException e) {
-            throw new XMLSignatureException("unknown digest method uri: "+digestMethodUri, e);
-        }
-
-        Reference reference;
-        if (digestValue == null) {
-            reference = sigFac.newReference(uri, digestMethod, transforms, type, id);
-        } else {
-            reference = sigFac.newReference(uri, digestMethod, transforms, type, id, digestValue);
-        }
-        
-        brokenJvmWorkaround(reference);
-
-        return reference;
-    }
-    
-    // helper method ... will be removed soon
-    public static void brokenJvmWorkaround(final Reference reference) {
-        final DigestMethod digestMethod = reference.getDigestMethod();
-        final String digestMethodUri = digestMethod.getAlgorithm();
-        
-        final Provider bcProv = Security.getProvider("BC");
-        if (bcProv != null && !DigestMethod.SHA1.equals(digestMethodUri)) {
-            // workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1155012
-            // overwrite standard message digest, if a digest <> SHA1 is used
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                @Override
-                @SuppressForbidden("Workaround for a bug, needs access to private JDK members (may fail in Java 9): https://bugzilla.redhat.com/show_bug.cgi?id=1155012")
-                public Void run() {
-                    try {
-                        Method m = DOMDigestMethod.class.getDeclaredMethod("getMessageDigestAlgorithm");
-                        m.setAccessible(true);
-                        String mdAlgo = (String)m.invoke(digestMethod);
-                        MessageDigest md = MessageDigest.getInstance(mdAlgo, bcProv);
-                        Field f = DOMReference.class.getDeclaredField("md");
-                        f.setAccessible(true);
-                        f.set(reference, md);
-                    } catch (Exception e) {
-                        LOG.log(POILogger.WARN, "Can't overwrite message digest (workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1155012)", e);
-                    }
-                    return null; // Void
-                }
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
deleted file mode 100644
index 5441d58..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.facets;
-
-import java.security.MessageDigest;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
-import javax.xml.crypto.XMLStructure;
-import javax.xml.crypto.dom.DOMStructure;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.XMLSignatureException;
-
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig;
-import org.apache.poi.poifs.crypt.dsig.services.SignaturePolicyService;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlString;
-import org.etsi.uri.x01903.v13.AnyType;
-import org.etsi.uri.x01903.v13.CertIDListType;
-import org.etsi.uri.x01903.v13.CertIDType;
-import org.etsi.uri.x01903.v13.ClaimedRolesListType;
-import org.etsi.uri.x01903.v13.DataObjectFormatType;
-import org.etsi.uri.x01903.v13.DigestAlgAndValueType;
-import org.etsi.uri.x01903.v13.IdentifierType;
-import org.etsi.uri.x01903.v13.ObjectIdentifierType;
-import org.etsi.uri.x01903.v13.QualifyingPropertiesDocument;
-import org.etsi.uri.x01903.v13.QualifyingPropertiesType;
-import org.etsi.uri.x01903.v13.SigPolicyQualifiersListType;
-import org.etsi.uri.x01903.v13.SignaturePolicyIdType;
-import org.etsi.uri.x01903.v13.SignaturePolicyIdentifierType;
-import org.etsi.uri.x01903.v13.SignedDataObjectPropertiesType;
-import org.etsi.uri.x01903.v13.SignedPropertiesType;
-import org.etsi.uri.x01903.v13.SignedSignaturePropertiesType;
-import org.etsi.uri.x01903.v13.SignerRoleType;
-import org.w3.x2000.x09.xmldsig.DigestMethodType;
-import org.w3.x2000.x09.xmldsig.X509IssuerSerialType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * XAdES Signature Facet. Implements XAdES v1.4.1 which is compatible with XAdES
- * v1.3.2. The implemented XAdES format is XAdES-BES/EPES. It's up to another
- * part of the signature service to upgrade the XAdES-BES to a XAdES-X-L.
- * 
- * This implementation has been tested against an implementation that
- * participated multiple ETSI XAdES plugtests.
- * 
- * @author Frank Cornelis
- * @see <a href="http://en.wikipedia.org/wiki/XAdES">XAdES</a>
- * 
- */
-public class XAdESSignatureFacet extends SignatureFacet {
-
-    private static final POILogger LOG = POILogFactory.getLogger(XAdESSignatureFacet.class);
-
-    private static final String XADES_TYPE = "http://uri.etsi.org/01903#SignedProperties";
-    
-    private Map<String, String> dataObjectFormatMimeTypes = new HashMap<String, String>();
-
-
-    @Override
-    public void preSign(
-          Document document
-        , List<Reference> references
-        , List<XMLObject> objects)
-    throws XMLSignatureException {
-        LOG.log(POILogger.DEBUG, "preSign");
-
-        // QualifyingProperties
-        QualifyingPropertiesDocument qualDoc = QualifyingPropertiesDocument.Factory.newInstance();
-        QualifyingPropertiesType qualifyingProperties = qualDoc.addNewQualifyingProperties();
-        qualifyingProperties.setTarget("#" + signatureConfig.getPackageSignatureId());
-        
-        // SignedProperties
-        SignedPropertiesType signedProperties = qualifyingProperties.addNewSignedProperties();
-        signedProperties.setId(signatureConfig.getXadesSignatureId());
-
-        // SignedSignatureProperties
-        SignedSignaturePropertiesType signedSignatureProperties = signedProperties.addNewSignedSignatureProperties();
-
-        // SigningTime
-        Calendar xmlGregorianCalendar = Calendar.getInstance(TimeZone.getTimeZone("Z"), Locale.ROOT);
-        xmlGregorianCalendar.setTime(signatureConfig.getExecutionTime());
-        xmlGregorianCalendar.clear(Calendar.MILLISECOND);
-        signedSignatureProperties.setSigningTime(xmlGregorianCalendar);
-
-        // SigningCertificate
-        if (signatureConfig.getSigningCertificateChain() == null
-            || signatureConfig.getSigningCertificateChain().isEmpty()) {
-            throw new RuntimeException("no signing certificate chain available");
-        }
-        CertIDListType signingCertificates = signedSignatureProperties.addNewSigningCertificate();
-        CertIDType certId = signingCertificates.addNewCert();
-        X509Certificate certificate = signatureConfig.getSigningCertificateChain().get(0);
-        setCertID(certId, signatureConfig, signatureConfig.isXadesIssuerNameNoReverseOrder(), certificate);
-
-        // ClaimedRole
-        String role = signatureConfig.getXadesRole();
-        if (role != null && !role.isEmpty()) {
-            SignerRoleType signerRole = signedSignatureProperties.addNewSignerRole();
-            signedSignatureProperties.setSignerRole(signerRole);
-            ClaimedRolesListType claimedRolesList = signerRole.addNewClaimedRoles();
-            AnyType claimedRole = claimedRolesList.addNewClaimedRole();
-            XmlString roleString = XmlString.Factory.newInstance();
-            roleString.setStringValue(role);
-            insertXChild(claimedRole, roleString);
-        }
-
-        // XAdES-EPES
-        SignaturePolicyService policyService = signatureConfig.getSignaturePolicyService();
-        if (policyService != null) {
-            SignaturePolicyIdentifierType signaturePolicyIdentifier =
-                signedSignatureProperties.addNewSignaturePolicyIdentifier();
-            
-            SignaturePolicyIdType signaturePolicyId = signaturePolicyIdentifier.addNewSignaturePolicyId();
-
-            ObjectIdentifierType objectIdentifier = signaturePolicyId.addNewSigPolicyId();
-            objectIdentifier.setDescription(policyService.getSignaturePolicyDescription());
-            
-            IdentifierType identifier = objectIdentifier.addNewIdentifier();
-            identifier.setStringValue(policyService.getSignaturePolicyIdentifier());
-
-            byte[] signaturePolicyDocumentData = policyService.getSignaturePolicyDocument();
-            DigestAlgAndValueType sigPolicyHash = signaturePolicyId.addNewSigPolicyHash();
-            setDigestAlgAndValue(sigPolicyHash, signaturePolicyDocumentData, signatureConfig.getDigestAlgo());
-
-            String signaturePolicyDownloadUrl = policyService.getSignaturePolicyDownloadUrl();
-            if (null != signaturePolicyDownloadUrl) {
-                SigPolicyQualifiersListType sigPolicyQualifiers = signaturePolicyId.addNewSigPolicyQualifiers(); 
-                AnyType sigPolicyQualifier = sigPolicyQualifiers.addNewSigPolicyQualifier();
-                XmlString spUriElement = XmlString.Factory.newInstance();
-                spUriElement.setStringValue(signaturePolicyDownloadUrl);
-                insertXChild(sigPolicyQualifier, spUriElement);
-            }
-        } else if (signatureConfig.isXadesSignaturePolicyImplied()) {
-            SignaturePolicyIdentifierType signaturePolicyIdentifier = 
-                    signedSignatureProperties.addNewSignaturePolicyIdentifier();
-            signaturePolicyIdentifier.addNewSignaturePolicyImplied();
-        }
-
-        // DataObjectFormat
-        if (!dataObjectFormatMimeTypes.isEmpty()) {
-            SignedDataObjectPropertiesType signedDataObjectProperties =
-                signedProperties.addNewSignedDataObjectProperties();
-
-            List<DataObjectFormatType> dataObjectFormats = signedDataObjectProperties
-                    .getDataObjectFormatList();
-            for (Map.Entry<String, String> dataObjectFormatMimeType : this.dataObjectFormatMimeTypes
-                    .entrySet()) {
-                DataObjectFormatType dataObjectFormat = DataObjectFormatType.Factory.newInstance();
-                dataObjectFormat.setObjectReference("#" + dataObjectFormatMimeType.getKey());
-                dataObjectFormat.setMimeType(dataObjectFormatMimeType.getValue());
-                dataObjectFormats.add(dataObjectFormat);
-            }
-        }
-
-        // add XAdES ds:Object
-        List<XMLStructure> xadesObjectContent = new ArrayList<XMLStructure>();
-        Element qualDocElSrc = (Element)qualifyingProperties.getDomNode();
-        Element qualDocEl = (Element)document.importNode(qualDocElSrc, true);
-        xadesObjectContent.add(new DOMStructure(qualDocEl));
-        XMLObject xadesObject = getSignatureFactory().newXMLObject(xadesObjectContent, null, null, null);
-        objects.add(xadesObject);
-
-        // add XAdES ds:Reference
-        List<Transform> transforms = new ArrayList<Transform>();
-        Transform exclusiveTransform = newTransform(CanonicalizationMethod.INCLUSIVE);
-        transforms.add(exclusiveTransform);
-        Reference reference = newReference
-            ("#"+signatureConfig.getXadesSignatureId(), transforms, XADES_TYPE, null, null);
-        references.add(reference);
-    }
-
-    /**
-     * Gives back the JAXB DigestAlgAndValue data structure.
-     *
-     * @param digestAlgAndValue the parent for the new digest element 
-     * @param data the data to be digested
-     * @param digestAlgo the digest algorithm
-     */
-    protected static void setDigestAlgAndValue(
-            DigestAlgAndValueType digestAlgAndValue,
-            byte[] data,
-            HashAlgorithm digestAlgo) {
-        DigestMethodType digestMethod = digestAlgAndValue.addNewDigestMethod();
-        digestMethod.setAlgorithm(SignatureConfig.getDigestMethodUri(digestAlgo));
-        
-        MessageDigest messageDigest = CryptoFunctions.getMessageDigest(digestAlgo);
-        byte[] digestValue = messageDigest.digest(data);
-        digestAlgAndValue.setDigestValue(digestValue);
-    }
-
-    /**
-     * Gives back the JAXB CertID data structure.
-     */
-    protected static void setCertID
-        (CertIDType certId, SignatureConfig signatureConfig, boolean issuerNameNoReverseOrder, X509Certificate certificate) {
-        X509IssuerSerialType issuerSerial = certId.addNewIssuerSerial();
-        String issuerName;
-        if (issuerNameNoReverseOrder) {
-            /*
-             * Make sure the DN is encoded using the same order as present
-             * within the certificate. This is an Office2010 work-around.
-             * Should be reverted back.
-             * 
-             * XXX: not correct according to RFC 4514.
-             */
-            // TODO: check if issuerName is different on getTBSCertificate
-            // issuerName = PrincipalUtil.getIssuerX509Principal(certificate).getName().replace(",", ", ");
-            issuerName = certificate.getIssuerDN().getName().replace(",", ", ");
-        } else {
-            issuerName = certificate.getIssuerX500Principal().toString();
-        }
-        issuerSerial.setX509IssuerName(issuerName);
-        issuerSerial.setX509SerialNumber(certificate.getSerialNumber());
-
-        byte[] encodedCertificate;
-        try {
-            encodedCertificate = certificate.getEncoded();
-        } catch (CertificateEncodingException e) {
-            throw new RuntimeException("certificate encoding error: "
-                    + e.getMessage(), e);
-        }
-        DigestAlgAndValueType certDigest = certId.addNewCertDigest(); 
-        setDigestAlgAndValue(certDigest, encodedCertificate, signatureConfig.getXadesDigestAlgo());
-    }
-
-    /**
-     * Adds a mime-type for the given ds:Reference (referred via its @URI). This
-     * information is added via the xades:DataObjectFormat element.
-     * 
-     * @param dsReferenceUri
-     * @param mimetype
-     */
-    public void addMimeType(String dsReferenceUri, String mimetype) {
-        this.dataObjectFormatMimeTypes.put(dsReferenceUri, mimetype);
-    }
-
-    protected static void insertXChild(XmlObject root, XmlObject child) {
-        XmlCursor rootCursor = root.newCursor();
-        rootCursor.toEndToken();
-        XmlCursor childCursor = child.newCursor();
-        childCursor.toNextToken();
-        childCursor.moveXml(rootCursor);
-        childCursor.dispose();
-        rootCursor.dispose();
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
deleted file mode 100644
index d25bd7d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.facets;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-import static org.apache.poi.poifs.crypt.dsig.facets.XAdESSignatureFacet.insertXChild;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import javax.xml.crypto.MarshalException;
-
-import org.apache.poi.poifs.crypt.dsig.services.RevocationData;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.xml.security.c14n.Canonicalizer;
-import org.apache.xmlbeans.XmlException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.ocsp.ResponderID;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.cert.ocsp.BasicOCSPResp;
-import org.bouncycastle.cert.ocsp.OCSPResp;
-import org.bouncycastle.cert.ocsp.RespID;
-import org.etsi.uri.x01903.v13.CRLIdentifierType;
-import org.etsi.uri.x01903.v13.CRLRefType;
-import org.etsi.uri.x01903.v13.CRLRefsType;
-import org.etsi.uri.x01903.v13.CRLValuesType;
-import org.etsi.uri.x01903.v13.CertIDListType;
-import org.etsi.uri.x01903.v13.CertIDType;
-import org.etsi.uri.x01903.v13.CertificateValuesType;
-import org.etsi.uri.x01903.v13.CompleteCertificateRefsType;
-import org.etsi.uri.x01903.v13.CompleteRevocationRefsType;
-import org.etsi.uri.x01903.v13.DigestAlgAndValueType;
-import org.etsi.uri.x01903.v13.EncapsulatedPKIDataType;
-import org.etsi.uri.x01903.v13.OCSPIdentifierType;
-import org.etsi.uri.x01903.v13.OCSPRefType;
-import org.etsi.uri.x01903.v13.OCSPRefsType;
-import org.etsi.uri.x01903.v13.OCSPValuesType;
-import org.etsi.uri.x01903.v13.QualifyingPropertiesDocument;
-import org.etsi.uri.x01903.v13.QualifyingPropertiesType;
-import org.etsi.uri.x01903.v13.ResponderIDType;
-import org.etsi.uri.x01903.v13.RevocationValuesType;
-import org.etsi.uri.x01903.v13.UnsignedPropertiesType;
-import org.etsi.uri.x01903.v13.UnsignedSignaturePropertiesType;
-import org.etsi.uri.x01903.v13.XAdESTimeStampType;
-import org.etsi.uri.x01903.v14.ValidationDataType;
-import org.w3.x2000.x09.xmldsig.CanonicalizationMethodType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * XAdES-X-L v1.4.1 signature facet. This signature facet implementation will
- * upgrade a given XAdES-BES/EPES signature to XAdES-X-L.
- * 
- * We don't inherit from XAdESSignatureFacet as we also want to be able to use
- * this facet out of the context of a signature creation. This signature facet
- * assumes that the signature is already XAdES-BES/EPES compliant.
- * 
- * This implementation has been tested against an implementation that
- * participated multiple ETSI XAdES plugtests.
- * 
- * @author Frank Cornelis
- * @see XAdESSignatureFacet
- */
-public class XAdESXLSignatureFacet extends SignatureFacet {
-
-    private static final POILogger LOG = POILogFactory.getLogger(XAdESXLSignatureFacet.class);
-
-    private final CertificateFactory certificateFactory;
-
-    public XAdESXLSignatureFacet() {
-        try {
-            this.certificateFactory = CertificateFactory.getInstance("X.509");
-        } catch (CertificateException e) {
-            throw new RuntimeException("X509 JCA error: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void postSign(Document document) throws MarshalException {
-        LOG.log(POILogger.DEBUG, "XAdES-X-L post sign phase");
-
-        QualifyingPropertiesDocument qualDoc = null;
-        QualifyingPropertiesType qualProps = null;
-
-        // check for XAdES-BES
-        NodeList qualNl = document.getElementsByTagNameNS(XADES_132_NS, "QualifyingProperties");
-        if (qualNl.getLength() == 1) {
-            try {
-                qualDoc = QualifyingPropertiesDocument.Factory.parse(qualNl.item(0), DEFAULT_XML_OPTIONS);
-            } catch (XmlException e) {
-                throw new MarshalException(e);
-            }
-            qualProps = qualDoc.getQualifyingProperties();
-        } else {
-            throw new MarshalException("no XAdES-BES extension present");
-        }
-
-        // create basic XML container structure
-        UnsignedPropertiesType unsignedProps = qualProps.getUnsignedProperties();
-        if (unsignedProps == null) {
-            unsignedProps = qualProps.addNewUnsignedProperties();
-        }
-        UnsignedSignaturePropertiesType unsignedSigProps = unsignedProps.getUnsignedSignatureProperties();
-        if (unsignedSigProps == null) {
-            unsignedSigProps = unsignedProps.addNewUnsignedSignatureProperties();
-        }
-        
-
-        // create the XAdES-T time-stamp
-        NodeList nlSigVal = document.getElementsByTagNameNS(XML_DIGSIG_NS, "SignatureValue");
-        if (nlSigVal.getLength() != 1) {
-            throw new IllegalArgumentException("SignatureValue is not set.");
-        }
-        
-        RevocationData tsaRevocationDataXadesT = new RevocationData();
-        LOG.log(POILogger.DEBUG, "creating XAdES-T time-stamp");
-        XAdESTimeStampType signatureTimeStamp = createXAdESTimeStamp
-            (Collections.singletonList(nlSigVal.item(0)), tsaRevocationDataXadesT);
-
-        // marshal the XAdES-T extension
-        unsignedSigProps.addNewSignatureTimeStamp().set(signatureTimeStamp);
-
-        // xadesv141::TimeStampValidationData
-        if (tsaRevocationDataXadesT.hasRevocationDataEntries()) {
-            ValidationDataType validationData = createValidationData(tsaRevocationDataXadesT);
-            insertXChild(unsignedSigProps, validationData);
-        }
-
-        if (signatureConfig.getRevocationDataService() == null) {
-            /*
-             * Without revocation data service we cannot construct the XAdES-C
-             * extension.
-             */
-            return;
-        }
-
-        // XAdES-C: complete certificate refs
-        CompleteCertificateRefsType completeCertificateRefs = 
-            unsignedSigProps.addNewCompleteCertificateRefs();
-
-        CertIDListType certIdList = completeCertificateRefs.addNewCertRefs();
-        /*
-         * We skip the signing certificate itself according to section
-         * 4.4.3.2 of the XAdES 1.4.1 specification.
-         */
-        List<X509Certificate> certChain = signatureConfig.getSigningCertificateChain();
-        int chainSize = certChain.size();
-        if (chainSize > 1) {
-            for (X509Certificate cert : certChain.subList(1, chainSize)) {
-                CertIDType certId = certIdList.addNewCert();
-                XAdESSignatureFacet.setCertID(certId, signatureConfig, false, cert);
-            }
-        }
-
-        // XAdES-C: complete revocation refs
-        CompleteRevocationRefsType completeRevocationRefs = 
-            unsignedSigProps.addNewCompleteRevocationRefs();
-        RevocationData revocationData = signatureConfig.getRevocationDataService()
-            .getRevocationData(certChain);
-        if (revocationData.hasCRLs()) {
-            CRLRefsType crlRefs = completeRevocationRefs.addNewCRLRefs();
-            completeRevocationRefs.setCRLRefs(crlRefs);
-
-            for (byte[] encodedCrl : revocationData.getCRLs()) {
-                CRLRefType crlRef = crlRefs.addNewCRLRef();
-                X509CRL crl;
-                try {
-                    crl = (X509CRL) this.certificateFactory
-                            .generateCRL(new ByteArrayInputStream(encodedCrl));
-                } catch (CRLException e) {
-                    throw new RuntimeException("CRL parse error: "
-                            + e.getMessage(), e);
-                }
-
-                CRLIdentifierType crlIdentifier = crlRef.addNewCRLIdentifier();
-                String issuerName = crl.getIssuerDN().getName().replace(",", ", ");
-                crlIdentifier.setIssuer(issuerName);
-                Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("Z"), Locale.ROOT);
-                cal.setTime(crl.getThisUpdate());
-                crlIdentifier.setIssueTime(cal);
-                crlIdentifier.setNumber(getCrlNumber(crl));
-
-                DigestAlgAndValueType digestAlgAndValue = crlRef.addNewDigestAlgAndValue();
-                XAdESSignatureFacet.setDigestAlgAndValue(digestAlgAndValue, encodedCrl, signatureConfig.getDigestAlgo());
-            }
-        }
-        if (revocationData.hasOCSPs()) {
-            OCSPRefsType ocspRefs = completeRevocationRefs.addNewOCSPRefs();
-            for (byte[] ocsp : revocationData.getOCSPs()) {
-                try {
-                    OCSPRefType ocspRef = ocspRefs.addNewOCSPRef();
-    
-                    DigestAlgAndValueType digestAlgAndValue = ocspRef.addNewDigestAlgAndValue();
-                    XAdESSignatureFacet.setDigestAlgAndValue(digestAlgAndValue, ocsp, signatureConfig.getDigestAlgo());
-    
-                    OCSPIdentifierType ocspIdentifier = ocspRef.addNewOCSPIdentifier();
-                    
-                    OCSPResp ocspResp = new OCSPResp(ocsp);
-                    
-                    BasicOCSPResp basicOcspResp = (BasicOCSPResp)ocspResp.getResponseObject();
-                    
-                    Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("Z"), Locale.ROOT);
-                    cal.setTime(basicOcspResp.getProducedAt());
-                    ocspIdentifier.setProducedAt(cal);
-    
-                    ResponderIDType responderId = ocspIdentifier.addNewResponderID();
-    
-                    RespID respId = basicOcspResp.getResponderId();
-                    ResponderID ocspResponderId = respId.toASN1Primitive();
-                    DERTaggedObject derTaggedObject = (DERTaggedObject)ocspResponderId.toASN1Primitive();
-                    if (2 == derTaggedObject.getTagNo()) {
-                        ASN1OctetString keyHashOctetString = (ASN1OctetString)derTaggedObject.getObject();
-                        byte key[] = keyHashOctetString.getOctets();
-                        responderId.setByKey(key);
-                    } else {
-                        X500Name name = X500Name.getInstance(derTaggedObject.getObject());
-                        String nameStr = name.toString();
-                        responderId.setByName(nameStr);
-                    }
-                } catch (Exception e) {
-                    throw new RuntimeException("OCSP decoding error: " + e.getMessage(), e);
-                }
-            }
-        }
-
-        // marshal XAdES-C
-        
-        // XAdES-X Type 1 timestamp
-        List<Node> timeStampNodesXadesX1 = new ArrayList<Node>();
-        timeStampNodesXadesX1.add(nlSigVal.item(0));
-        timeStampNodesXadesX1.add(signatureTimeStamp.getDomNode());
-        timeStampNodesXadesX1.add(completeCertificateRefs.getDomNode());
-        timeStampNodesXadesX1.add(completeRevocationRefs.getDomNode());
-
-        RevocationData tsaRevocationDataXadesX1 = new RevocationData();
-        LOG.log(POILogger.DEBUG, "creating XAdES-X time-stamp");
-        XAdESTimeStampType timeStampXadesX1 = createXAdESTimeStamp
-            (timeStampNodesXadesX1, tsaRevocationDataXadesX1);
-        if (tsaRevocationDataXadesX1.hasRevocationDataEntries()) {
-            ValidationDataType timeStampXadesX1ValidationData = createValidationData(tsaRevocationDataXadesX1);
-            insertXChild(unsignedSigProps, timeStampXadesX1ValidationData);
-        }
-
-        // marshal XAdES-X
-        unsignedSigProps.addNewSigAndRefsTimeStamp().set(timeStampXadesX1);
-
-        // XAdES-X-L
-        CertificateValuesType certificateValues = unsignedSigProps.addNewCertificateValues();
-        for (X509Certificate certificate : certChain) {
-            EncapsulatedPKIDataType encapsulatedPKIDataType = certificateValues.addNewEncapsulatedX509Certificate();
-            try {
-                encapsulatedPKIDataType.setByteArrayValue(certificate.getEncoded());
-            } catch (CertificateEncodingException e) {
-                throw new RuntimeException("certificate encoding error: " + e.getMessage(), e);
-            }
-        }
-        
-        RevocationValuesType revocationValues = unsignedSigProps.addNewRevocationValues();
-        createRevocationValues(revocationValues, revocationData);
-
-        // marshal XAdES-X-L
-        Node n = document.importNode(qualProps.getDomNode(), true);
-        qualNl.item(0).getParentNode().replaceChild(n, qualNl.item(0));
-    }
-
-    public static byte[] getC14nValue(List<Node> nodeList, String c14nAlgoId) {
-        ByteArrayOutputStream c14nValue = new ByteArrayOutputStream();
-        try {
-            for (Node node : nodeList) {
-                /*
-                 * Re-initialize the c14n else the namespaces will get cached
-                 * and will be missing from the c14n resulting nodes.
-                 */
-                Canonicalizer c14n = Canonicalizer.getInstance(c14nAlgoId);
-                c14nValue.write(c14n.canonicalizeSubtree(node));
-            }
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException("c14n error: " + e.getMessage(), e);
-        }
-        return c14nValue.toByteArray();
-    }
-
-    private BigInteger getCrlNumber(X509CRL crl) {
-        byte[] crlNumberExtensionValue = crl.getExtensionValue(Extension.cRLNumber.getId());
-        if (null == crlNumberExtensionValue) {
-            return null;
-        }
-
-        try {
-            ASN1InputStream asn1IS1 = null, asn1IS2 = null;
-            try {
-                asn1IS1 = new ASN1InputStream(crlNumberExtensionValue);
-                ASN1OctetString octetString = (ASN1OctetString)asn1IS1.readObject();
-                byte[] octets = octetString.getOctets();
-                asn1IS2 = new ASN1InputStream(octets);
-                ASN1Integer integer = (ASN1Integer)asn1IS2.readObject();
-                return integer.getPositiveValue();
-            } finally {
-                asn1IS2.close();
-                asn1IS1.close();
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("I/O error: " + e.getMessage(), e);
-        }
-    }
-
-    private XAdESTimeStampType createXAdESTimeStamp(
-            List<Node> nodeList,
-            RevocationData revocationData) {
-        byte[] c14nSignatureValueElement = getC14nValue(nodeList, signatureConfig.getXadesCanonicalizationMethod());
-
-        return createXAdESTimeStamp(c14nSignatureValueElement, revocationData);
-    }
-
-    private XAdESTimeStampType createXAdESTimeStamp(byte[] data, RevocationData revocationData) {
-        // create the time-stamp
-        byte[] timeStampToken;
-        try {
-            timeStampToken = signatureConfig.getTspService().timeStamp(data, revocationData);
-        } catch (Exception e) {
-            throw new RuntimeException("error while creating a time-stamp: "
-                    + e.getMessage(), e);
-        }
-
-        // create a XAdES time-stamp container
-        XAdESTimeStampType xadesTimeStamp = XAdESTimeStampType.Factory.newInstance();
-        xadesTimeStamp.setId("time-stamp-" + UUID.randomUUID().toString());
-        CanonicalizationMethodType c14nMethod = xadesTimeStamp.addNewCanonicalizationMethod();
-        c14nMethod.setAlgorithm(signatureConfig.getXadesCanonicalizationMethod());
-
-        // embed the time-stamp
-        EncapsulatedPKIDataType encapsulatedTimeStamp = xadesTimeStamp.addNewEncapsulatedTimeStamp();
-        encapsulatedTimeStamp.setByteArrayValue(timeStampToken);
-        encapsulatedTimeStamp.setId("time-stamp-token-" + UUID.randomUUID().toString());
-
-        return xadesTimeStamp;
-    }
-
-    private ValidationDataType createValidationData(
-            RevocationData revocationData) {
-        ValidationDataType validationData = ValidationDataType.Factory.newInstance();
-        RevocationValuesType revocationValues = validationData.addNewRevocationValues();
-        createRevocationValues(revocationValues, revocationData);
-        return validationData;
-    }
-
-    private void createRevocationValues(
-            RevocationValuesType revocationValues, RevocationData revocationData) {
-        if (revocationData.hasCRLs()) {
-            CRLValuesType crlValues = revocationValues.addNewCRLValues();
-            for (byte[] crl : revocationData.getCRLs()) {
-                EncapsulatedPKIDataType encapsulatedCrlValue = crlValues.addNewEncapsulatedCRLValue();
-                encapsulatedCrlValue.setByteArrayValue(crl);
-            }
-        }
-        if (revocationData.hasOCSPs()) {
-            OCSPValuesType ocspValues = revocationValues.addNewOCSPValues();
-            for (byte[] ocsp : revocationData.getOCSPs()) {
-                EncapsulatedPKIDataType encapsulatedOcspValue = ocspValues.addNewEncapsulatedOCSPValue();
-                encapsulatedOcspValue.setByteArrayValue(ocsp);
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
deleted file mode 100644
index 495d843..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.services;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.Provider;
-import java.security.Security;
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.crypto.Data;
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.OctetStreamData;
-import javax.xml.crypto.XMLCryptoContext;
-import javax.xml.crypto.XMLStructure;
-import javax.xml.crypto.dom.DOMStructure;
-import javax.xml.crypto.dsig.TransformException;
-import javax.xml.crypto.dsig.TransformService;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.XmlSort;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.xpackage.x2006.digitalSignature.CTRelationshipReference;
-import org.openxmlformats.schemas.xpackage.x2006.digitalSignature.RelationshipReferenceDocument;
-import org.openxmlformats.schemas.xpackage.x2006.relationships.CTRelationship;
-import org.openxmlformats.schemas.xpackage.x2006.relationships.CTRelationships;
-import org.openxmlformats.schemas.xpackage.x2006.relationships.RelationshipsDocument;
-import org.openxmlformats.schemas.xpackage.x2006.relationships.STTargetMode;
-import org.w3.x2000.x09.xmldsig.TransformDocument;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * JSR105 implementation of the RelationshipTransform transformation.
- * 
- * <p>
- * Specs: http://openiso.org/Ecma/376/Part2/12.2.4#26
- * </p>
- */
-public class RelationshipTransformService extends TransformService {
-
-    public static final String TRANSFORM_URI = "http://schemas.openxmlformats.org/package/2006/RelationshipTransform";
-
-    private final List<String> sourceIds;
-
-    private static final POILogger LOG = POILogFactory.getLogger(RelationshipTransformService.class);
-    
-    /**
-     * Relationship Transform parameter specification class.
-     */
-    public static class RelationshipTransformParameterSpec implements TransformParameterSpec {
-        List<String> sourceIds = new ArrayList<String>();
-        public void addRelationshipReference(String relationshipId) {
-            sourceIds.add(relationshipId);
-        }
-        public boolean hasSourceIds() {
-            return !sourceIds.isEmpty();
-        }
-    }
-    
-    
-    public RelationshipTransformService() {
-        super();
-        LOG.log(POILogger.DEBUG, "constructor");
-        this.sourceIds = new ArrayList<String>();
-    }
-
-    /**
-     * Register the provider for this TransformService
-     * 
-     * @see javax.xml.crypto.dsig.TransformService
-     */
-    public static synchronized void registerDsigProvider() {
-        // the xml signature classes will try to find a special TransformerService,
-        // which is ofcourse unknown to JCE before ...
-        final String dsigProvider = "POIXmlDsigProvider";
-        if (Security.getProperty(dsigProvider) == null) {
-            Provider p = new Provider(dsigProvider, 1.0, dsigProvider){
-                static final long serialVersionUID = 1L;
-            };
-            p.put("TransformService." + TRANSFORM_URI, RelationshipTransformService.class.getName());
-            p.put("TransformService." + TRANSFORM_URI + " MechanismType", "DOM");
-            Security.addProvider(p);
-        }
-    }
-    
-    
-    @Override
-    public void init(TransformParameterSpec params) throws InvalidAlgorithmParameterException {
-        LOG.log(POILogger.DEBUG, "init(params)");
-        if (!(params instanceof RelationshipTransformParameterSpec)) {
-            throw new InvalidAlgorithmParameterException();
-        }
-        RelationshipTransformParameterSpec relParams = (RelationshipTransformParameterSpec) params;
-        for (String sourceId : relParams.sourceIds) {
-            this.sourceIds.add(sourceId);
-        }
-    }
-
-    @Override
-    public void init(XMLStructure parent, XMLCryptoContext context) throws InvalidAlgorithmParameterException {
-        LOG.log(POILogger.DEBUG, "init(parent,context)");
-        LOG.log(POILogger.DEBUG, "parent java type: " + parent.getClass().getName());
-        DOMStructure domParent = (DOMStructure) parent;
-        Node parentNode = domParent.getNode();
-        
-        try {
-            TransformDocument transDoc = TransformDocument.Factory.parse(parentNode, DEFAULT_XML_OPTIONS);
-            XmlObject xoList[] = transDoc.getTransform().selectChildren(RelationshipReferenceDocument.type.getDocumentElementName());
-            if (xoList.length == 0) {
-                LOG.log(POILogger.WARN, "no RelationshipReference/@SourceId parameters present");
-            }
-            for (XmlObject xo : xoList) {
-                String sourceId = ((CTRelationshipReference)xo).getSourceId();
-                LOG.log(POILogger.DEBUG, "sourceId: ", sourceId);
-                this.sourceIds.add(sourceId);
-            }
-        } catch (XmlException e) {
-            throw new InvalidAlgorithmParameterException(e);
-        }
-    }
-
-    @Override
-    public void marshalParams(XMLStructure parent, XMLCryptoContext context) throws MarshalException {
-        LOG.log(POILogger.DEBUG, "marshallParams(parent,context)");
-        DOMStructure domParent = (DOMStructure) parent;
-        Element parentNode = (Element)domParent.getNode();
-        // parentNode.setAttributeNS(XML_NS, "xmlns:mdssi", XML_DIGSIG_NS);
-        Document doc = parentNode.getOwnerDocument();
-        
-        for (String sourceId : this.sourceIds) {
-            RelationshipReferenceDocument relRef = RelationshipReferenceDocument.Factory.newInstance();
-            relRef.addNewRelationshipReference().setSourceId(sourceId);
-            Node n = relRef.getRelationshipReference().getDomNode();
-            n = doc.importNode(n, true);
-            parentNode.appendChild(n);
-        }
-    }
-    
-    public AlgorithmParameterSpec getParameterSpec() {
-        LOG.log(POILogger.DEBUG, "getParameterSpec");
-        return null;
-    }
-
-    public Data transform(Data data, XMLCryptoContext context) throws TransformException {
-        LOG.log(POILogger.DEBUG, "transform(data,context)");
-        LOG.log(POILogger.DEBUG, "data java type: " + data.getClass().getName());
-        OctetStreamData octetStreamData = (OctetStreamData) data;
-        LOG.log(POILogger.DEBUG, "URI: " + octetStreamData.getURI());
-        InputStream octetStream = octetStreamData.getOctetStream();
-        
-        RelationshipsDocument relDoc;
-        try {
-            relDoc = RelationshipsDocument.Factory.parse(octetStream, DEFAULT_XML_OPTIONS);
-        } catch (Exception e) {
-            throw new TransformException(e.getMessage(), e);
-        }
-        LOG.log(POILogger.DEBUG, "relationships document", relDoc);
-        
-        CTRelationships rels = relDoc.getRelationships();
-        List<CTRelationship> relList = rels.getRelationshipList();
-        Iterator<CTRelationship> relIter = rels.getRelationshipList().iterator();
-        while (relIter.hasNext()) {
-            CTRelationship rel = relIter.next();
-            /*
-             * See: ISO/IEC 29500-2:2008(E) - 13.2.4.24 Relationships Transform
-             * Algorithm.
-             */
-            if (!this.sourceIds.contains(rel.getId())) {
-                LOG.log(POILogger.DEBUG, "removing element: " + rel.getId());
-                relIter.remove();
-            } else {
-                if (!rel.isSetTargetMode()) {
-                    rel.setTargetMode(STTargetMode.INTERNAL);
-                }
-            }
-        }
-        
-        // TODO: remove non element nodes ???
-        LOG.log(POILogger.DEBUG, "# Relationship elements", relList.size());
-        
-        XmlSort.sort(rels, new Comparator<XmlCursor>(){
-            public int compare(XmlCursor c1, XmlCursor c2) {
-                String id1 = ((CTRelationship)c1.getObject()).getId();
-                String id2 = ((CTRelationship)c2.getObject()).getId();
-                return id1.compareTo(id2);
-            }
-        });
-
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            XmlOptions xo = new XmlOptions();
-            xo.setSaveNoXmlDecl();
-            relDoc.save(bos, xo);
-            return new OctetStreamData(new ByteArrayInputStream(bos.toByteArray()));
-        } catch (IOException e) {
-            throw new TransformException(e.getMessage(), e);
-        }
-    }
-
-    public Data transform(Data data, XMLCryptoContext context, OutputStream os) throws TransformException {
-        LOG.log(POILogger.DEBUG, "transform(data,context,os)");
-        return null;
-    }
-
-    public boolean isFeatureSupported(String feature) {
-        LOG.log(POILogger.DEBUG, "isFeatureSupported(feature)");
-        return false;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
deleted file mode 100644
index 22e667b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.services;
-
-import java.security.cert.CRLException;
-import java.security.cert.X509CRL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Container class for PKI revocation data.
- * 
- * @author Frank Cornelis
- * 
- */
-public class RevocationData {
-
-    private final List<byte[]> crls;
-
-    private final List<byte[]> ocsps;
-
-    /**
-     * Default constructor.
-     */
-    public RevocationData() {
-        this.crls = new ArrayList<byte[]>();
-        this.ocsps = new ArrayList<byte[]>();
-    }
-
-    /**
-     * Adds a CRL to this revocation data set.
-     * 
-     * @param encodedCrl
-     */
-    public void addCRL(byte[] encodedCrl) {
-        this.crls.add(encodedCrl);
-    }
-
-    /**
-     * Adds a CRL to this revocation data set.
-     * 
-     * @param crl
-     */
-    public void addCRL(X509CRL crl) {
-        byte[] encodedCrl;
-        try {
-            encodedCrl = crl.getEncoded();
-        } catch (CRLException e) {
-            throw new IllegalArgumentException("CRL coding error: "
-                    + e.getMessage(), e);
-        }
-        addCRL(encodedCrl);
-    }
-
-    /**
-     * Adds an OCSP response to this revocation data set.
-     * 
-     * @param encodedOcsp
-     */
-    public void addOCSP(byte[] encodedOcsp) {
-        this.ocsps.add(encodedOcsp);
-    }
-
-    /**
-     * Gives back a list of all CRLs.
-     * 
-     * @return a list of all CRLs
-     */
-    public List<byte[]> getCRLs() {
-        return this.crls;
-    }
-
-    /**
-     * Gives back a list of all OCSP responses.
-     * 
-     * @return a list of all OCSP response
-     */
-    public List<byte[]> getOCSPs() {
-        return this.ocsps;
-    }
-
-    /**
-     * Returns <code>true</code> if this revocation data set holds OCSP
-     * responses.
-     * 
-     * @return <code>true</code> if this revocation data set holds OCSP
-     * responses.
-     */
-    public boolean hasOCSPs() {
-        return false == this.ocsps.isEmpty();
-    }
-
-    /**
-     * Returns <code>true</code> if this revocation data set holds CRLs.
-     * 
-     * @return <code>true</code> if this revocation data set holds CRLs.
-     */
-    public boolean hasCRLs() {
-        return false == this.crls.isEmpty();
-    }
-
-    /**
-     * Returns <code>true</code> if this revocation data is not empty.
-     * 
-     * @return <code>true</code> if this revocation data is not empty.
-     */
-    public boolean hasRevocationDataEntries() {
-        return hasOCSPs() || hasCRLs();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
deleted file mode 100644
index 02bd6a0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.services;
-
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-/**
- * Interface for a service that retrieves revocation data about some given
- * certificate chain.
- * 
- * @author Frank Cornelis
- * 
- */
-public interface RevocationDataService {
-
-    /**
-     * Gives back the revocation data corresponding with the given certificate
-     * chain.
-     * 
-     * @param certificateChain the certificate chain
-     * @return the revocation data corresponding with the given certificate chain.
-     */
-    RevocationData getRevocationData(List<X509Certificate> certificateChain);
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
deleted file mode 100644
index 9716e63..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.services;
-
-/**
- * Interface for the signature policy service.
- * 
- * @author Frank Cornelis
- * 
- */
-public interface SignaturePolicyService {
-
-    /**
-     * Gives back the signature policy identifier URI.
-     * 
-     * @return the signature policy identifier URI.
-     */
-    String getSignaturePolicyIdentifier();
-
-    /**
-     * Gives back the short description of the signature policy or
-     * <code>null</code> if a description is not available.
-     * 
-     * @return the description, or <code>null</code>.
-     */
-    String getSignaturePolicyDescription();
-
-    /**
-     * Gives back the download URL where the signature policy document can be
-     * found. Can be <code>null</code> in case such a download location does not
-     * exist.
-     * 
-     * @return the download URL, or <code>null</code>.
-     */
-    String getSignaturePolicyDownloadUrl();
-
-    /**
-     * Gives back the signature policy document.
-     * 
-     * @return the bytes of the signature policy document.
-     */
-    byte[] getSignaturePolicyDocument();
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
deleted file mode 100644
index cc1c4c4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.services;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.DatatypeConverter;
-
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cms.DefaultCMSSignatureAlgorithmNameGenerator;
-import org.bouncycastle.cms.SignerId;
-import org.bouncycastle.cms.SignerInformationVerifier;
-import org.bouncycastle.cms.bc.BcRSASignerInfoVerifierBuilder;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
-import org.bouncycastle.tsp.TimeStampRequest;
-import org.bouncycastle.tsp.TimeStampRequestGenerator;
-import org.bouncycastle.tsp.TimeStampResponse;
-import org.bouncycastle.tsp.TimeStampToken;
-
-/**
- * A TSP time-stamp service implementation.
- * 
- * @author Frank Cornelis
- * 
- */
-public class TSPTimeStampService implements TimeStampService {
-
-    private static final POILogger LOG = POILogFactory.getLogger(TSPTimeStampService.class);
-
-    private SignatureConfig signatureConfig;
-
-    /**
-     * Maps the digest algorithm to corresponding OID value.
-     */
-    public ASN1ObjectIdentifier mapDigestAlgoToOID(HashAlgorithm digestAlgo) {
-        switch (digestAlgo) {
-        case sha1:   return X509ObjectIdentifiers.id_SHA1;
-        case sha256: return NISTObjectIdentifiers.id_sha256;
-        case sha384: return NISTObjectIdentifiers.id_sha384;
-        case sha512: return NISTObjectIdentifiers.id_sha512;
-        default:
-            throw new IllegalArgumentException("unsupported digest algo: " + digestAlgo);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public byte[] timeStamp(byte[] data, RevocationData revocationData)
-            throws Exception {
-        // digest the message
-        MessageDigest messageDigest = CryptoFunctions.getMessageDigest(signatureConfig.getTspDigestAlgo());
-        byte[] digest = messageDigest.digest(data);
-
-        // generate the TSP request
-        BigInteger nonce = new BigInteger(128, new SecureRandom());
-        TimeStampRequestGenerator requestGenerator = new TimeStampRequestGenerator();
-        requestGenerator.setCertReq(true);
-        String requestPolicy = signatureConfig.getTspRequestPolicy();
-        if (requestPolicy != null) {
-            requestGenerator.setReqPolicy(new ASN1ObjectIdentifier(requestPolicy));
-        }
-        ASN1ObjectIdentifier digestAlgoOid = mapDigestAlgoToOID(signatureConfig.getTspDigestAlgo());
-        TimeStampRequest request = requestGenerator.generate(digestAlgoOid, digest, nonce);
-        byte[] encodedRequest = request.getEncoded();
-
-        // create the HTTP POST request
-        Proxy proxy = Proxy.NO_PROXY;
-        if (signatureConfig.getProxyUrl() != null) {
-            URL proxyUrl = new URL(signatureConfig.getProxyUrl());
-            String host = proxyUrl.getHost();
-            int port = proxyUrl.getPort();
-            proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(InetAddress.getByName(host), (port == -1 ? 80 : port)));
-        }
-        
-        HttpURLConnection huc = (HttpURLConnection)new URL(signatureConfig.getTspUrl()).openConnection(proxy);
-        
-        if (signatureConfig.getTspUser() != null) {
-            String userPassword = signatureConfig.getTspUser() + ":" + signatureConfig.getTspPass();
-            String encoding = DatatypeConverter.printBase64Binary(userPassword.getBytes(Charset.forName("iso-8859-1")));
-            huc.setRequestProperty("Authorization", "Basic " + encoding);
-        }
-
-        huc.setRequestMethod("POST");
-        huc.setConnectTimeout(20000);
-        huc.setReadTimeout(20000);
-        huc.setDoOutput(true); // also sets method to POST.
-        huc.setRequestProperty("User-Agent", signatureConfig.getUserAgent());
-        huc.setRequestProperty("Content-Type", signatureConfig.isTspOldProtocol()
-            ? "application/timestamp-request"
-            : "application/timestamp-query"); // "; charset=ISO-8859-1");
-        
-        OutputStream hucOut = huc.getOutputStream();
-        hucOut.write(encodedRequest);
-        
-        // invoke TSP service
-        huc.connect();
-        
-        int statusCode = huc.getResponseCode();
-        if (statusCode != 200) {
-            LOG.log(POILogger.ERROR, "Error contacting TSP server ", signatureConfig.getTspUrl() +
-                    ", had status code " + statusCode + "/" + huc.getResponseMessage());
-            throw new IOException("Error contacting TSP server " + signatureConfig.getTspUrl() +
-                    ", had status code " + statusCode + "/" + huc.getResponseMessage());
-        }
-
-        // HTTP input validation
-        String contentType = huc.getHeaderField("Content-Type");
-        if (null == contentType) {
-            throw new RuntimeException("missing Content-Type header");
-        }
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        IOUtils.copy(huc.getInputStream(), bos);
-        LOG.log(POILogger.DEBUG, "response content: ", HexDump.dump(bos.toByteArray(), 0, 0));
-        
-        if (!contentType.startsWith(signatureConfig.isTspOldProtocol() 
-            ? "application/timestamp-response"
-            : "application/timestamp-reply"
-        )) {
-            throw new RuntimeException("invalid Content-Type: " + contentType +
-                    // dump the first few bytes
-                    ": " + HexDump.dump(bos.toByteArray(), 0, 0, 200));
-        }
-        
-        if (bos.size() == 0) {
-            throw new RuntimeException("Content-Length is zero");
-        }
-
-        // TSP response parsing and validation
-        TimeStampResponse timeStampResponse = new TimeStampResponse(bos.toByteArray());
-        timeStampResponse.validate(request);
-
-        if (0 != timeStampResponse.getStatus()) {
-            LOG.log(POILogger.DEBUG, "status: " + timeStampResponse.getStatus());
-            LOG.log(POILogger.DEBUG, "status string: " + timeStampResponse.getStatusString());
-            PKIFailureInfo failInfo = timeStampResponse.getFailInfo();
-            if (null != failInfo) {
-                LOG.log(POILogger.DEBUG, "fail info int value: " + failInfo.intValue());
-                if (/*PKIFailureInfo.unacceptedPolicy*/(1 << 8) == failInfo.intValue()) {
-                    LOG.log(POILogger.DEBUG, "unaccepted policy");
-                }
-            }
-            throw new RuntimeException("timestamp response status != 0: "
-                    + timeStampResponse.getStatus());
-        }
-        TimeStampToken timeStampToken = timeStampResponse.getTimeStampToken();
-        SignerId signerId = timeStampToken.getSID();
-        BigInteger signerCertSerialNumber = signerId.getSerialNumber();
-        X500Name signerCertIssuer = signerId.getIssuer();
-        LOG.log(POILogger.DEBUG, "signer cert serial number: " + signerCertSerialNumber);
-        LOG.log(POILogger.DEBUG, "signer cert issuer: " + signerCertIssuer);
-
-        // TSP signer certificates retrieval
-        Collection<X509CertificateHolder> certificates = timeStampToken.getCertificates().getMatches(null);
-        
-        X509CertificateHolder signerCert = null;
-        Map<X500Name, X509CertificateHolder> certificateMap = new HashMap<X500Name, X509CertificateHolder>();
-        for (X509CertificateHolder certificate : certificates) {
-            if (signerCertIssuer.equals(certificate.getIssuer())
-                && signerCertSerialNumber.equals(certificate.getSerialNumber())) {
-                signerCert = certificate;
-            }
-            certificateMap.put(certificate.getSubject(), certificate);
-        }
-
-        // TSP signer cert path building
-        if (signerCert == null) {
-            throw new RuntimeException("TSP response token has no signer certificate");
-        }
-        List<X509Certificate> tspCertificateChain = new ArrayList<X509Certificate>();
-        JcaX509CertificateConverter x509converter = new JcaX509CertificateConverter();
-        x509converter.setProvider("BC");
-        X509CertificateHolder certificate = signerCert;
-        do {
-            LOG.log(POILogger.DEBUG, "adding to certificate chain: " + certificate.getSubject());
-            tspCertificateChain.add(x509converter.getCertificate(certificate));
-            if (certificate.getSubject().equals(certificate.getIssuer())) {
-                break;
-            }
-            certificate = certificateMap.get(certificate.getIssuer());
-        } while (null != certificate);
-
-        // verify TSP signer signature
-        X509CertificateHolder holder = new X509CertificateHolder(tspCertificateChain.get(0).getEncoded());
-        DefaultCMSSignatureAlgorithmNameGenerator nameGen = new DefaultCMSSignatureAlgorithmNameGenerator();
-        DefaultSignatureAlgorithmIdentifierFinder sigAlgoFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-        DefaultDigestAlgorithmIdentifierFinder hashAlgoFinder = new DefaultDigestAlgorithmIdentifierFinder();
-        BcDigestCalculatorProvider calculator = new BcDigestCalculatorProvider();
-        BcRSASignerInfoVerifierBuilder verifierBuilder = new BcRSASignerInfoVerifierBuilder(nameGen, sigAlgoFinder, hashAlgoFinder, calculator);
-        SignerInformationVerifier verifier = verifierBuilder.build(holder);
-        
-        timeStampToken.validate(verifier);
-
-        // verify TSP signer certificate
-        if (signatureConfig.getTspValidator() != null) {
-            signatureConfig.getTspValidator().validate(tspCertificateChain, revocationData);
-        }
-
-        LOG.log(POILogger.DEBUG, "time-stamp token time: "
-                + timeStampToken.getTimeStampInfo().getGenTime());
-
-        return timeStampToken.getEncoded();
-    }
-
-    public void setSignatureConfig(SignatureConfig signatureConfig) {
-        this.signatureConfig = signatureConfig;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
deleted file mode 100644
index 84cde92..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.services;
-
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig.SignatureConfigurable;
-
-
-/**
- * Interface for a time-stamp service.
- * 
- * @author Frank Cornelis
- * 
- */
-public interface TimeStampService extends SignatureConfigurable {
-
-    /**
-     * Gives back the encoded time-stamp token for the given array of data
-     * bytes. We assume that the time-stamp token itself contains its full
-     * certificate chain required for proper validation.
-     * 
-     * @param data
-     *            the data to be time-stamped.
-     * @param revocationData
-     *            the optional container that needs to be filled up with the
-     *            revocation data used to validate the TSA certificate chain.
-     * @return the DER encoded time-stamp token.
-     * @throws Exception
-     *             in case something went wrong.
-     */
-    byte[] timeStamp(byte[] data, RevocationData revocationData)
-            throws Exception;
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
deleted file mode 100644
index 4d36be9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-
-package org.apache.poi.poifs.crypt.dsig.services;
-
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-/**
- * Interface for trust validator of a TSP.
- * 
- * @author Frank Cornelis
- * 
- */
-public interface TimeStampServiceValidator {
-
-    /**
-     * Validates the given certificate chain.
-     * 
-     * @param certificateChain
-     * @param revocationData
-     *            the optional data container that should be filled with
-     *            revocation data that was used to validate the given
-     *            certificate chain.
-     * @throws Exception
-     *             in case the certificate chain is invalid.
-     */
-    void validate(List<X509Certificate> certificateChain,
-            RevocationData revocationData) throws Exception;
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
deleted file mode 100644
index 5e1f4b3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.poifs.crypt.temp;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.SecureRandom;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.openxml4j.util.ZipEntrySource;
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-
-/**
- * An example <code>ZipEntrySource</code> that has encrypted temp files to ensure that
- * sensitive data is not stored in raw format on disk.
- */
-@Beta
-public class AesZipFileZipEntrySource implements ZipEntrySource {
-    private static POILogger LOG = POILogFactory.getLogger(AesZipFileZipEntrySource.class);
-    
-    private final File tmpFile;
-    private final ZipFile zipFile;
-    private final Cipher ci;
-    private boolean closed;
-    
-    public AesZipFileZipEntrySource(File tmpFile, Cipher ci) throws IOException {
-        this.tmpFile = tmpFile;
-        this.zipFile = new ZipFile(tmpFile);
-        this.ci = ci;
-        this.closed = false;
-    }
-    
-    /**
-     * Note: the file sizes are rounded up to the next cipher block size,
-     * so don't rely on file sizes of these custom encrypted zip file entries!
-     */
-    @Override
-    public Enumeration<? extends ZipEntry> getEntries() {
-        return zipFile.entries();
-    }
-    
-    @Override
-    public InputStream getInputStream(ZipEntry entry) throws IOException {
-        InputStream is = zipFile.getInputStream(entry);
-        return new CipherInputStream(is, ci);
-    }
-    
-    @Override
-    public void close() throws IOException {
-        if(!closed) {
-            zipFile.close();
-            if (!tmpFile.delete()) {
-                LOG.log(POILogger.WARN, tmpFile.getAbsolutePath()+" can't be removed (or was already removed.");
-            };
-        }
-        closed = true;
-    }
-
-    @Override
-    public boolean isClosed() {
-        return closed;
-    }
-
-    public static AesZipFileZipEntrySource createZipEntrySource(InputStream is) throws IOException, GeneralSecurityException {
-        // generate session key
-        SecureRandom sr = new SecureRandom();
-        byte[] ivBytes = new byte[16], keyBytes = new byte[16];
-        sr.nextBytes(ivBytes);
-        sr.nextBytes(keyBytes);
-        final File tmpFile = TempFile.createTempFile("protectedXlsx", ".zip");
-        copyToFile(is, tmpFile, CipherAlgorithm.aes128, keyBytes, ivBytes);
-        IOUtils.closeQuietly(is);
-        return fileToSource(tmpFile, CipherAlgorithm.aes128, keyBytes, ivBytes);
-    }
-
-    private static void copyToFile(InputStream is, File tmpFile, CipherAlgorithm cipherAlgorithm, byte keyBytes[], byte ivBytes[]) throws IOException, GeneralSecurityException {
-        SecretKeySpec skeySpec = new SecretKeySpec(keyBytes, cipherAlgorithm.jceId);
-        Cipher ciEnc = CryptoFunctions.getCipher(skeySpec, cipherAlgorithm, ChainingMode.cbc, ivBytes, Cipher.ENCRYPT_MODE, "PKCS5Padding");
-        
-        ZipInputStream zis = new ZipInputStream(is);
-        FileOutputStream fos = new FileOutputStream(tmpFile);
-        ZipOutputStream zos = new ZipOutputStream(fos);
-        
-        ZipEntry ze;
-        while ((ze = zis.getNextEntry()) != null) {
-            // the cipher output stream pads the data, therefore we can't reuse the ZipEntry with set sizes
-            // as those will be validated upon close()
-            ZipEntry zeNew = new ZipEntry(ze.getName());
-            zeNew.setComment(ze.getComment());
-            zeNew.setExtra(ze.getExtra());
-            zeNew.setTime(ze.getTime());
-            // zeNew.setMethod(ze.getMethod());
-            zos.putNextEntry(zeNew);
-            FilterOutputStream fos2 = new FilterOutputStream(zos){
-                // don't close underlying ZipOutputStream
-                @Override
-                public void close() {}
-            };
-            CipherOutputStream cos = new CipherOutputStream(fos2, ciEnc);
-            IOUtils.copy(zis, cos);
-            cos.close();
-            fos2.close();
-            zos.closeEntry();
-            zis.closeEntry();
-        }
-        zos.close();
-        fos.close();
-        zis.close();
-    }
-
-    private static AesZipFileZipEntrySource fileToSource(File tmpFile, CipherAlgorithm cipherAlgorithm, byte keyBytes[], byte ivBytes[]) throws ZipException, IOException {
-        SecretKeySpec skeySpec = new SecretKeySpec(keyBytes, cipherAlgorithm.jceId);
-        Cipher ciDec = CryptoFunctions.getCipher(skeySpec, cipherAlgorithm, ChainingMode.cbc, ivBytes, Cipher.DECRYPT_MODE, "PKCS5Padding");
-        return new AesZipFileZipEntrySource(tmpFile, ciDec);
-    }
-    
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
deleted file mode 100644
index 7a3981d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.poifs.crypt.temp;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-
-/**
- * EncryptedTempData can be used to buffer binary data in a secure way, by using encrypted temp files.
- */
-@Beta
-public class EncryptedTempData {
-    private static POILogger LOG = POILogFactory.getLogger(EncryptedTempData.class);
- 
-    private final static CipherAlgorithm cipherAlgorithm = CipherAlgorithm.aes128;
-    private final SecretKeySpec skeySpec;
-    private final byte[] ivBytes;
-    private final File tempFile;
-    
-    public EncryptedTempData() throws IOException {
-        SecureRandom sr = new SecureRandom();
-        ivBytes = new byte[16];
-        byte[] keyBytes = new byte[16];
-        sr.nextBytes(ivBytes);
-        sr.nextBytes(keyBytes);
-        skeySpec = new SecretKeySpec(keyBytes, cipherAlgorithm.jceId);
-        tempFile = TempFile.createTempFile("poi-temp-data", ".tmp");
-    }
-
-    public OutputStream getOutputStream() throws IOException {
-        Cipher ciEnc = CryptoFunctions.getCipher(skeySpec, cipherAlgorithm, ChainingMode.cbc, ivBytes, Cipher.ENCRYPT_MODE, null);
-        return new CipherOutputStream(new FileOutputStream(tempFile), ciEnc);
-    }
-
-    public InputStream getInputStream() throws IOException {
-        Cipher ciDec = CryptoFunctions.getCipher(skeySpec, cipherAlgorithm, ChainingMode.cbc, ivBytes, Cipher.DECRYPT_MODE, null);
-        return new CipherInputStream(new FileInputStream(tempFile), ciDec);
-    }
-    
-    public void dispose() {
-        if (!tempFile.delete()) {
-            LOG.log(POILogger.WARN, tempFile.getAbsolutePath()+" can't be removed (or was already removed.");
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
deleted file mode 100644
index 5460068..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.poifs.crypt.temp;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-
-import org.apache.poi.openxml4j.util.ZipEntrySource;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.streaming.SheetDataWriter;
-
-@Beta
-public class SXSSFWorkbookWithCustomZipEntrySource extends SXSSFWorkbook {
-    private static final POILogger LOG = POILogFactory.getLogger(SXSSFWorkbookWithCustomZipEntrySource.class);
-
-    public SXSSFWorkbookWithCustomZipEntrySource() {
-        super(20);
-        setCompressTempFiles(true);
-    }
-    
-    @Override
-    public void write(OutputStream stream) throws IOException {
-        flushSheets();
-        EncryptedTempData tempData = new EncryptedTempData();
-        ZipEntrySource source = null;
-        try {
-            OutputStream os = tempData.getOutputStream();
-            try {
-                getXSSFWorkbook().write(os);
-            } finally {
-                IOUtils.closeQuietly(os);
-            }
-            // provide ZipEntrySource to poi which decrypts on the fly
-            source = AesZipFileZipEntrySource.createZipEntrySource(tempData.getInputStream());
-            injectData(source, stream);
-        } catch (GeneralSecurityException e) {
-            throw new IOException(e);
-        } finally {
-            tempData.dispose();
-            IOUtils.closeQuietly(source);
-        }
-    }
-    
-    @Override
-    protected SheetDataWriter createSheetDataWriter() throws IOException {
-        //log values to ensure these values are accessible to subclasses
-        LOG.log(POILogger.INFO, "isCompressTempFiles: " + isCompressTempFiles());
-        LOG.log(POILogger.INFO, "SharedStringSource: " + getSharedStringSource());
-        return new SheetDataWriterWithDecorator();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java b/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
deleted file mode 100644
index 08163ea..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.poifs.crypt.temp;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.poifs.crypt.ChainingMode;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.util.Beta;
-import org.apache.poi.xssf.streaming.SheetDataWriter;
-
-@Beta
-public class SheetDataWriterWithDecorator extends SheetDataWriter {
-    final static CipherAlgorithm cipherAlgorithm = CipherAlgorithm.aes128;
-    SecretKeySpec skeySpec;
-    byte[] ivBytes;
-    
-    public SheetDataWriterWithDecorator() throws IOException {
-        super();
-    }
-    
-    void init() {
-        if(skeySpec == null) {
-            SecureRandom sr = new SecureRandom();
-            ivBytes = new byte[16];
-            byte[] keyBytes = new byte[16];
-            sr.nextBytes(ivBytes);
-            sr.nextBytes(keyBytes);
-            skeySpec = new SecretKeySpec(keyBytes, cipherAlgorithm.jceId);
-        }
-    }
-
-    @Override
-    protected OutputStream decorateOutputStream(FileOutputStream fos) {
-        init();
-        Cipher ciEnc = CryptoFunctions.getCipher(skeySpec, cipherAlgorithm, ChainingMode.cbc, ivBytes, Cipher.ENCRYPT_MODE, "PKCS5Padding");
-        return new CipherOutputStream(fos, ciEnc);
-    }
-    
-    @Override
-    protected InputStream decorateInputStream(FileInputStream fis) {
-        Cipher ciDec = CryptoFunctions.getCipher(skeySpec, cipherAlgorithm, ChainingMode.cbc, ivBytes, Cipher.DECRYPT_MODE, "PKCS5Padding");
-        return new CipherInputStream(fis, ciDec);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
deleted file mode 100644
index 621e71d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel;
-
-import java.io.*;
-
-import org.apache.poi.EmptyFileException;
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.poifs.filesystem.DocumentFactoryHelper;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Factory for creating the appropriate kind of Workbook
- *  (be it {@link HSSFWorkbook} or {@link XSSFWorkbook}),
- *  by auto-detecting from the supplied input.
- */
-public class WorkbookFactory {
-    /**
-     * Creates a HSSFWorkbook from the given POIFSFileSystem
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use.
-     */
-    public static Workbook create(POIFSFileSystem fs) throws IOException {
-        return new HSSFWorkbook(fs);
-    }
-
-    /**
-     * Creates a HSSFWorkbook from the given NPOIFSFileSystem
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use.
-     */
-    public static Workbook create(NPOIFSFileSystem fs) throws IOException {
-        try {
-            return create(fs, null);
-        } catch (InvalidFormatException e) {
-            // Special case of OOXML-in-POIFS which is broken
-            throw new IOException(e);
-        }
-    }
-
-    /**
-     * Creates a Workbook from the given NPOIFSFileSystem, which may
-     *  be password protected
-     *
-     *  @param fs The {@link NPOIFSFileSystem} to read the document from
-     *  @param password The password that should be used or null if no password is necessary.
-     *
-     *  @return The created Workbook
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws InvalidFormatException if the contents of the file cannot be parsed into a {@link Workbook}
-     */
-    private static Workbook create(final NPOIFSFileSystem fs, String password) throws IOException, InvalidFormatException {
-        DirectoryNode root = fs.getRoot();
-
-        // Encrypted OOXML files go inside OLE2 containers, is this one?
-        if (root.hasEntry(Decryptor.DEFAULT_POIFS_ENTRY)) {
-            InputStream stream = DocumentFactoryHelper.getDecryptedStream(fs, password);
-
-            OPCPackage pkg = OPCPackage.open(stream);
-            return create(pkg);
-        }
-
-        // If we get here, it isn't an encrypted XLSX file
-        // So, treat it as a regular HSSF XLS one
-        if (password != null) {
-            Biff8EncryptionKey.setCurrentUserPassword(password);
-        }
-        try {
-            return new HSSFWorkbook(root, true);
-        } finally {
-            Biff8EncryptionKey.setCurrentUserPassword(null);
-        }
-    }
-
-    /**
-     * Creates a XSSFWorkbook from the given OOXML Package
-     *
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use.</p>
-     *
-     *  @param pkg The {@link OPCPackage} opened for reading data.
-     *
-     *  @return The created Workbook
-     *
-     *  @throws IOException if an error occurs while reading the data
-     */
-    public static Workbook create(OPCPackage pkg) throws IOException {
-        return new XSSFWorkbook(pkg);
-    }
-
-    /**
-     * Creates the appropriate HSSFWorkbook / XSSFWorkbook from
-     *  the given InputStream.
-     *
-     * <p>Your input stream MUST either support mark/reset, or
-     *  be wrapped as a {@link PushbackInputStream}! Note that
-     *  using an {@link InputStream} has a higher memory footprint
-     *  than using a {@link File}.</p>
-     *
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use. Note also that loading
-     *  from an InputStream requires more memory than loading
-     *  from a File, so prefer {@link #create(File)} where possible.
-     *
-     *  @param inp The {@link InputStream} to read data from.
-     *
-     *  @return The created Workbook
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws InvalidFormatException if the contents of the file cannot be parsed into a {@link Workbook}
-     *  @throws EncryptedDocumentException If the workbook given is password protected
-     */
-    public static Workbook create(InputStream inp) throws IOException, InvalidFormatException, EncryptedDocumentException {
-        return create(inp, null);
-    }
-
-    /**
-     * Creates the appropriate HSSFWorkbook / XSSFWorkbook from
-     *  the given InputStream, which may be password protected.
-     * <p>Your input stream MUST either support mark/reset, or
-     *  be wrapped as a {@link PushbackInputStream}! Note that
-     *  using an {@link InputStream} has a higher memory footprint
-     *  than using a {@link File}.</p>
-     *
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use. Note also that loading
-     *  from an InputStream requires more memory than loading
-     *  from a File, so prefer {@link #create(File)} where possible.</p>
-     *
-     *  @param inp The {@link InputStream} to read data from.
-     *  @param password The password that should be used or null if no password is necessary.
-     *
-     *  @return The created Workbook
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws InvalidFormatException if the contents of the file cannot be parsed into a {@link Workbook}
-     *  @throws EncryptedDocumentException If the wrong password is given for a protected file
-     *  @throws EmptyFileException If an empty stream is given
-     */
-    public static Workbook create(InputStream inp, String password) throws IOException, InvalidFormatException, EncryptedDocumentException {
-        // If clearly doesn't do mark/reset, wrap up
-        if (! inp.markSupported()) {
-            inp = new PushbackInputStream(inp, 8);
-        }
-
-        // Ensure that there is at least some data there
-        byte[] header8 = IOUtils.peekFirst8Bytes(inp);
-
-        // Try to create
-        if (NPOIFSFileSystem.hasPOIFSHeader(header8)) {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(inp);
-            return create(fs, password);
-        }
-        if (DocumentFactoryHelper.hasOOXMLHeader(inp)) {
-            return new XSSFWorkbook(OPCPackage.open(inp));
-        }
-        throw new InvalidFormatException("Your InputStream was neither an OLE2 stream, nor an OOXML stream");
-    }
-
-    /**
-     * Creates the appropriate HSSFWorkbook / XSSFWorkbook from
-     *  the given File, which must exist and be readable.
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use.
-     *
-     *  @param file The file to read data from.
-     *
-     *  @return The created Workbook
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws InvalidFormatException if the contents of the file cannot be parsed into a {@link Workbook}
-     *  @throws EncryptedDocumentException If the workbook given is password protected
-     */
-    public static Workbook create(File file) throws IOException, InvalidFormatException, EncryptedDocumentException {
-        return create(file, null);
-    }
-
-    /**
-     * Creates the appropriate HSSFWorkbook / XSSFWorkbook from
-     *  the given File, which must exist and be readable, and
-     *  may be password protected
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use.
-     *
-     *  @param file The file to read data from.
-     *  @param password The password that should be used or null if no password is necessary.
-     *
-     *  @return The created Workbook
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws InvalidFormatException if the contents of the file cannot be parsed into a {@link Workbook}
-     *  @throws EncryptedDocumentException If the wrong password is given for a protected file
-     *  @throws EmptyFileException If an empty stream is given
-     */
-    public static Workbook create(File file, String password) throws IOException, InvalidFormatException, EncryptedDocumentException {
-    	return create(file, password, false);
-    }
-
-    /**
-     * Creates the appropriate HSSFWorkbook / XSSFWorkbook from
-     *  the given File, which must exist and be readable, and
-     *  may be password protected
-     * <p>Note that in order to properly release resources the
-     *  Workbook should be closed after use.
-     *
-     *  @param file The file to read data from.
-     *  @param password The password that should be used or null if no password is necessary.
-     *  @param readOnly If the Workbook should be opened in read-only mode to avoid writing back
-     *  	changes when the document is closed.
-     *
-     *  @return The created Workbook
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws InvalidFormatException if the contents of the file cannot be parsed into a {@link Workbook}
-     *  @throws EncryptedDocumentException If the wrong password is given for a protected file
-     *  @throws EmptyFileException If an empty stream is given
-     */
-    public static Workbook create(File file, String password, boolean readOnly) throws IOException, InvalidFormatException, EncryptedDocumentException {
-        if (! file.exists()) {
-            throw new FileNotFoundException(file.toString());
-        }
-
-        try {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(file, readOnly);
-            try {
-                return create(fs, password);
-            } catch (RuntimeException e) {
-                // ensure that the file-handle is closed again
-                fs.close();
-                
-                throw e;
-            }
-        } catch(OfficeXmlFileException e) {
-            // opening as .xls failed => try opening as .xlsx
-            OPCPackage pkg = OPCPackage.open(file, readOnly ? PackageAccess.READ : PackageAccess.READ_WRITE);
-            try {
-                return new XSSFWorkbook(pkg);
-            } catch (IOException ioe) {
-                // ensure that file handles are closed (use revert() to not re-write the file)
-                pkg.revert();
-                //pkg.close();
-
-                // rethrow exception
-                throw ioe;
-            } catch (RuntimeException ioe) {
-                // ensure that file handles are closed (use revert() to not re-write the file)
-                pkg.revert();
-                //pkg.close();
-
-                // rethrow exception
-                throw ioe;
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/util/DocumentHelper.java b/trunk/src/ooxml/java/org/apache/poi/util/DocumentHelper.java
deleted file mode 100644
index 3b7d68a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/util/DocumentHelper.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.events.Namespace;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public final class DocumentHelper {
-    private static POILogger logger = POILogFactory.getLogger(DocumentHelper.class);
-
-    private DocumentHelper() {}
-
-    private static class DocHelperErrorHandler implements ErrorHandler {
-
-        public void warning(SAXParseException exception) throws SAXException {
-            printError(POILogger.WARN, exception);
-        }
-
-        public void error(SAXParseException exception) throws SAXException {
-            printError(POILogger.ERROR, exception);
-        }
-
-        public void fatalError(SAXParseException exception) throws SAXException {
-            printError(POILogger.FATAL, exception);
-            throw exception;
-        }
-
-        /** Prints the error message. */
-        private void printError(int type, SAXParseException ex) {
-            StringBuilder sb = new StringBuilder();
-            
-            String systemId = ex.getSystemId();
-            if (systemId != null) {
-                int index = systemId.lastIndexOf('/');
-                if (index != -1)
-                    systemId = systemId.substring(index + 1);
-                sb.append(systemId);
-            }
-            sb.append(':');
-            sb.append(ex.getLineNumber());
-            sb.append(':');
-            sb.append(ex.getColumnNumber());
-            sb.append(": ");
-            sb.append(ex.getMessage());
-
-            logger.log(type, sb.toString(), ex);
-        }
-    }
-    
-    /**
-     * Creates a new document builder, with sensible defaults
-     */
-    public static synchronized DocumentBuilder newDocumentBuilder() {
-        try {
-            DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-            documentBuilder.setEntityResolver(SAXHelper.IGNORING_ENTITY_RESOLVER);
-            documentBuilder.setErrorHandler(new DocHelperErrorHandler());
-            return documentBuilder;
-        } catch (ParserConfigurationException e) {
-            throw new IllegalStateException("cannot create a DocumentBuilder", e);
-        }
-    }
-
-    private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-    static {
-        documentBuilderFactory.setNamespaceAware(true);
-        documentBuilderFactory.setValidating(false);
-        trySetSAXFeature(documentBuilderFactory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        trySetXercesSecurityManager(documentBuilderFactory);
-    }
-
-    private static void trySetSAXFeature(DocumentBuilderFactory dbf, String feature, boolean enabled) {
-        try {
-            dbf.setFeature(feature, enabled);
-        } catch (Exception e) {
-            logger.log(POILogger.WARN, "SAX Feature unsupported", feature, e);
-        } catch (AbstractMethodError ame) {
-            logger.log(POILogger.WARN, "Cannot set SAX feature because outdated XML parser in classpath", feature, ame);
-        }
-    }
-    
-    private static void trySetXercesSecurityManager(DocumentBuilderFactory dbf) {
-        // Try built-in JVM one first, standalone if not
-        for (String securityManagerClassName : new String[] {
-                "com.sun.org.apache.xerces.internal.util.SecurityManager",
-                "org.apache.xerces.util.SecurityManager"
-        }) {
-            try {
-                Object mgr = Class.forName(securityManagerClassName).newInstance();
-                Method setLimit = mgr.getClass().getMethod("setEntityExpansionLimit", Integer.TYPE);
-                setLimit.invoke(mgr, 4096);
-                dbf.setAttribute("http://apache.org/xml/properties/security-manager", mgr);
-                // Stop once one can be setup without error
-                return;
-            } catch (Throwable t) {
-                logger.log(POILogger.WARN, "SAX Security Manager could not be setup", t);
-            }
-        }
-    }
-
-    /**
-     * Parses the given stream via the default (sensible)
-     * DocumentBuilder
-     * @param inp Stream to read the XML data from
-     * @return the parsed Document 
-     */
-    public static Document readDocument(InputStream inp) throws IOException, SAXException {
-        return newDocumentBuilder().parse(inp);
-    }
-
-    /**
-     * Parses the given stream via the default (sensible)
-     * DocumentBuilder
-     * @param inp sax source to read the XML data from
-     * @return the parsed Document 
-     */
-    public static Document readDocument(InputSource inp) throws IOException, SAXException {
-        return newDocumentBuilder().parse(inp);
-    }
-
-    // must only be used to create empty documents, do not use it for parsing!
-    private static final DocumentBuilder documentBuilderSingleton = newDocumentBuilder();
-
-    /**
-     * Creates a new DOM Document
-     */
-    public static synchronized Document createDocument() {
-        return documentBuilderSingleton.newDocument();
-    }
-
-    /**
-     * Adds a namespace declaration attribute to the given element.
-     */
-    public static void addNamespaceDeclaration(Element element, String namespacePrefix, String namespaceURI) {
-        element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
-                XMLConstants.XMLNS_ATTRIBUTE + ':' + namespacePrefix,
-                namespaceURI);
-    }
-
-    /**
-     * Adds a namespace declaration attribute to the given element.
-     */
-    public static void addNamespaceDeclaration(Element element, Namespace namespace) {
-        addNamespaceDeclaration(element, namespace.getPrefix(), namespace.getNamespaceURI());
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/util/IdentifierManager.java b/trunk/src/ooxml/java/org/apache/poi/util/IdentifierManager.java
deleted file mode 100644
index 4b57e77..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/util/IdentifierManager.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.util;
-
-import java.util.LinkedList;
-import java.util.ListIterator;
-
-/**
- * <p>
- * 24.08.2009<br>
- * </p>
- * 
- * @author Stefan Stern<br>
- */
-
-public class IdentifierManager {
-
-    public static final long MAX_ID = Long.MAX_VALUE - 1;
-
-    public static final long MIN_ID = 0L;
-
-    /**
-	 * 
-	 */
-    private final long upperbound;
-
-    /**
-	 * 
-	 */
-    private final long lowerbound;
-
-    /**
-	 * List of segments of available identifiers
-	 */
-    private LinkedList<Segment> segments;
-
-    /**
-     * @param lowerbound the lower limit of the id-range to manage. Must be greater than or equal to {@link #MIN_ID}.
-     * @param upperbound the upper limit of the id-range to manage. Must be less then or equal {@link #MAX_ID}.
-     */
-    public IdentifierManager(long lowerbound, long upperbound) {
-        if (lowerbound > upperbound) {
-            throw new IllegalArgumentException("lowerbound must not be greater than upperbound, had " + lowerbound + " and " + upperbound);
-        }
-        else if (lowerbound < MIN_ID) { 
-            String message = "lowerbound must be greater than or equal to " + Long.toString(MIN_ID);
-            throw new IllegalArgumentException(message);
-        }
-        else if (upperbound > MAX_ID) {
-            /*
-             * while MAX_ID is Long.MAX_VALUE, this check is pointless. But if
-             * someone subclasses / tweaks the limits, this check is fine.
-             */
-            throw new IllegalArgumentException("upperbound must be less than or equal to " + Long.toString(MAX_ID) + " but had " + upperbound);
-        }
-        this.lowerbound = lowerbound;
-        this.upperbound = upperbound;
-        this.segments = new LinkedList<Segment>();
-        segments.add(new Segment(lowerbound, upperbound));
-    }
-
-    public long reserve(long id) {
-        if (id < lowerbound || id > upperbound) {
-            throw new IllegalArgumentException("Value for parameter 'id' was out of bounds, had " + id + ", but should be within [" + lowerbound + ":" + upperbound + "]");
-        }
-        verifyIdentifiersLeft();
-        
-        if (id == upperbound) {
-            Segment lastSegment = segments.getLast();
-            if (lastSegment.end == upperbound) {
-                lastSegment.end = upperbound - 1;
-                if (lastSegment.start > lastSegment.end) {
-                    segments.removeLast();
-                }
-                return id;
-            }
-            return reserveNew();
-        }
-
-        if (id == lowerbound) {
-            Segment firstSegment = segments.getFirst();
-            if (firstSegment.start == lowerbound) {
-                firstSegment.start = lowerbound + 1;
-                if (firstSegment.end < firstSegment.start) {
-                    segments.removeFirst();
-                }
-                return id;
-            }
-            return reserveNew();
-        }
-
-        ListIterator<Segment> iter = segments.listIterator();
-        while (iter.hasNext()) {
-            Segment segment = iter.next();
-            if (segment.end < id) {
-                continue;
-            }
-            else if (segment.start > id) {
-                break;
-            }
-            else if (segment.start == id) {
-                segment.start = id + 1;
-                if (segment.end < segment.start) {
-                    iter.remove();
-                }
-                return id;
-            }
-            else if (segment.end == id) {
-                segment.end = id - 1;
-                if (segment.start > segment.end) {
-                    iter.remove();
-                }
-                return id;
-            }
-            else {
-                iter.add(new Segment(id + 1, segment.end));
-                segment.end = id - 1;
-                return id;
-            }
-        }
-        return reserveNew();
-    }
-
-    /**
-     * @return a new identifier. 
-     * @throws IllegalStateException if no more identifiers are available, then an Exception is raised.
-     */
-    public long reserveNew() {
-        verifyIdentifiersLeft();
-        Segment segment = segments.getFirst();
-        long result = segment.start;
-        segment.start += 1;
-        if (segment.start > segment.end) {
-            segments.removeFirst();
-        }
-        return result;
-    }
-
-    /**
-     * @param id
-     * the identifier to release. Must be greater than or equal to
-     * {@link #lowerbound} and must be less than or equal to {@link #upperbound}
-     * @return true, if the identifier was reserved and has been successfully
-     * released, false, if the identifier was not reserved.
-     */
-    public boolean release(long id) {
-        if (id < lowerbound || id > upperbound) {
-            throw new IllegalArgumentException("Value for parameter 'id' was out of bounds, had " + id + ", but should be within [" + lowerbound + ":" + upperbound + "]");
-        }
-
-        if (id == upperbound) {
-            Segment lastSegment = segments.getLast();
-            if (lastSegment.end == upperbound - 1) {
-                lastSegment.end = upperbound;
-                return true;
-            } else if (lastSegment.end == upperbound) {
-                return false;
-            } else {
-                segments.add(new Segment(upperbound, upperbound));
-                return true;
-            }
-        }
-
-        if (id == lowerbound) {
-            Segment firstSegment = segments.getFirst();
-            if (firstSegment.start == lowerbound + 1) {
-                firstSegment.start = lowerbound;
-                return true;
-            } else if (firstSegment.start == lowerbound) {
-                return false;
-            } else {
-                segments.addFirst(new Segment(lowerbound, lowerbound));
-                return true;
-            }
-        }
-
-        long higher = id + 1;
-        long lower = id - 1;
-        ListIterator<Segment> iter = segments.listIterator();
-
-        while (iter.hasNext()) {
-            Segment segment = iter.next();
-            if (segment.end < lower) {
-                continue;
-            }
-            if (segment.start > higher) {
-                iter.previous();
-                iter.add(new Segment(id, id));
-                return true;
-            }
-            if (segment.start == higher) {
-                segment.start = id;
-                return true;
-            }
-            else if (segment.end == lower) {
-                segment.end = id;
-                /* check if releasing this elements glues two segments into one */
-                if (iter.hasNext()) {
-                  Segment next = iter.next();
-                    if (next.start == segment.end + 1) {
-                        segment.end = next.end;
-                        iter.remove();
-                    }
-                }
-                return true;
-            }
-            else {
-                /* id was not reserved, return false */
-                break;
-            }
-        }
-        return false;
-    }
-
-    public long getRemainingIdentifiers() {
-        long result = 0;
-        for (Segment segment : segments) {
-            result = result - segment.start;
-            result = result + segment.end + 1;
-        }
-        return result;
-    }
-
-    /**
-	 * 
-	 */
-    private void verifyIdentifiersLeft() {
-        if (segments.isEmpty()) {
-            throw new IllegalStateException("No identifiers left");
-        }
-    }
-
-    private static class Segment {
-
-        public Segment(long start, long end) {
-            this.start = start;
-            this.end = end;
-        }
-
-        public long start;
-        public long end;
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see java.lang.Object#toString()
-         */
-        public String toString() {
-            return "[" + start + "; " + end + "]";
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java b/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
deleted file mode 100644
index c42ba5e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-import org.junit.internal.TextListener;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-
-/**
- * Build a 'lite' version of the ooxml-schemas.jar
- *
- * @author Yegor Kozlov
- */
-public final class OOXMLLite {
-
-    /**
-     * Destination directory to copy filtered classes
-     */
-    private File _destDest;
-
-    /**
-     * Directory with the compiled ooxml tests
-     */
-    private File _testDir;
-
-    /**
-     * Reference to the ooxml-schemas.jar
-     */
-    private File _ooxmlJar;
-
-
-    OOXMLLite(String dest, String test, String ooxmlJar) {
-        _destDest = new File(dest);
-        _testDir = new File(test);
-        _ooxmlJar = new File(ooxmlJar);
-    }
-
-    public static void main(String[] args) throws IOException, ClassNotFoundException {
-
-        String dest = null, test = null, ooxml = null;
-
-        for (int i = 0; i < args.length; i++) {
-            if (args[i].equals("-dest")) dest = args[++i];
-            else if (args[i].equals("-test")) test = args[++i];
-            else if (args[i].equals("-ooxml")) ooxml = args[++i];
-        }
-        OOXMLLite builder = new OOXMLLite(dest, test, ooxml);
-        builder.build();
-    }
-
-    void build() throws IOException, ClassNotFoundException {
-        List<Class<?>> lst = new ArrayList<Class<?>>();
-        //collect unit tests
-        String exclude = StringUtil.join("|",
-                "BaseTestXWorkbook",
-                "BaseTestXSheet",
-                "BaseTestXRow",
-                "BaseTestXCell",
-                "BaseTestXSSFPivotTable",
-                "TestSXSSFWorkbook\\$\\d",
-                "TestUnfixedBugs",
-                "MemoryUsage",
-                "TestDataProvider",
-                "TestDataSamples",
-                "All.+Tests",
-                "ZipFileAssert",
-                "AesZipFileZipEntrySource",
-                "TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource",
-                "PkiTestUtils",
-                "TestCellFormatPart\\$\\d",
-                "TestSignatureInfo\\$\\d",
-                "TestCertificateEncryption\\$CertData",
-                "TestPOIXMLDocument\\$OPCParser",
-                "TestPOIXMLDocument\\$TestFactory",
-                "TestXSLFTextParagraph\\$DrawTextParagraphProxy",
-                "TestXSSFExportToXML\\$\\d",
-                "TestXSSFExportToXML\\$DummyEntityResolver",
-                "TestFormulaEvaluatorOnXSSF\\$Result",
-                "TestFormulaEvaluatorOnXSSF\\$SS",
-                "TestMultiSheetFormulaEvaluatorOnXSSF\\$Result",
-                "TestMultiSheetFormulaEvaluatorOnXSSF\\$SS",
-                "TestXSSFBugs\\$\\d"
-        );
-        System.out.println("Collecting unit tests from " + _testDir);
-        collectTests(_testDir, _testDir, lst, ".+.class$", ".+(" + exclude + ").class");
-        System.out.println("Found " + lst.size() + " classes");
-        
-        //run tests
-        JUnitCore jUnitCore = new JUnitCore();
-        jUnitCore.addListener(new TextListener(System.out));
-        Result result = jUnitCore.run(lst.toArray(new Class<?>[lst.size()]));
-        if (!result.wasSuccessful()) {
-            throw new RuntimeException("Tests did not succeed, cannot build ooxml-lite jar");
-        }
-
-        //see what classes from the ooxml-schemas.jar are loaded
-        System.out.println("Copying classes to " + _destDest);
-        Map<String, Class<?>> classes = getLoadedClasses(_ooxmlJar.getName());
-        for (Class<?> cls : classes.values()) {
-            String className = cls.getName();
-            String classRef = className.replace('.', '/') + ".class";
-            File destFile = new File(_destDest, classRef);
-            copyFile(cls.getResourceAsStream('/' + classRef), destFile);
-
-            if(cls.isInterface()){
-                /**
-                 * Copy classes and interfaces declared as members of this class
-                 */
-                for(Class<?> fc : cls.getDeclaredClasses()){
-                    className = fc.getName();
-                    classRef = className.replace('.', '/') + ".class";
-                    destFile = new File(_destDest, classRef);
-                    copyFile(fc.getResourceAsStream('/' + classRef), destFile);
-                }
-            }
-        }
-
-        //finally copy the compiled .xsb files
-        System.out.println("Copying .xsb resources");
-        JarFile jar = new  JarFile(_ooxmlJar);
-        Pattern p = Pattern.compile("schemaorg_apache_xmlbeans/(system|element)/.*\\.xsb");
-        try {
-            for(Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ){
-                JarEntry je = e.nextElement();
-                if(p.matcher(je.getName()).matches()) {
-                     File destFile = new File(_destDest, je.getName());
-                     copyFile(jar.getInputStream(je), destFile);
-                }
-            }
-        } finally {
-            jar.close();
-        }
-    }
-
-    private static boolean checkForTestAnnotation(Class<?> testclass) {
-        for (Method m : testclass.getDeclaredMethods()) {
-            if(m.isAnnotationPresent(Test.class)) {
-                return true;
-            }
-        }
-        
-        // also check super classes
-        if(testclass.getSuperclass() != null) {
-            for (Method m : testclass.getSuperclass().getDeclaredMethods()) {
-                if(m.isAnnotationPresent(Test.class)) {
-                    return true;
-                }
-            }
-        }
-        
-        System.out.println("Class " + testclass.getName() + " does not derive from TestCase and does not have a @Test annotation");
-
-        // Should we also look at superclasses to find cases
-        // where we have abstract base classes with derived tests?
-        // if(checkForTestAnnotation(testclass.getSuperclass())) return true;
-
-        return false;
-    }
-
-    /**
-     * Recursively collect classes from the supplied directory
-     *
-     * @param arg   the directory to search in
-     * @param out   output
-     * @param ptrn  the pattern (regexp) to filter found files
-     */
-    private static void collectTests(File root, File arg, List<Class<?>> out, String ptrn, String exclude)
-    throws ClassNotFoundException {
-        if (arg.isDirectory()) {
-            File files[] = arg.listFiles();
-            if (files != null) {
-                for (File f : files) {
-                    collectTests(root, f, out, ptrn, exclude);
-                }
-            }
-        } else {
-            String path = arg.getAbsolutePath();
-            String prefix = root.getAbsolutePath();
-            String cls = path.substring(prefix.length() + 1).replace(File.separator, ".");
-            if(!cls.matches(ptrn)) return;
-            if (cls.matches(exclude)) return;
-            //ignore inner classes defined in tests
-            if (cls.indexOf('$') != -1) {
-                System.out.println("Inner class " + cls + " not included");
-                return;
-            }
-
-            cls = cls.replace(".class", "");
-
-            Class<?> testclass = Class.forName(cls);
-            if (TestCase.class.isAssignableFrom(testclass)
-                || checkForTestAnnotation(testclass)) {
-                out.add(testclass);
-            }
-        }
-    }
-
-    /**
-     *
-     * @param ptrn the pattern to filter output
-     * @return the classes loaded by the system class loader keyed by class name
-     */
-    @SuppressWarnings("unchecked")
-    private static Map<String, Class<?>> getLoadedClasses(String ptrn) {
-        // make the field accessible, we defer this from static initialization to here to 
-        // allow JDKs which do not have this field (e.g. IBM JDK) to at least load the class
-        // without failing, see https://issues.apache.org/bugzilla/show_bug.cgi?id=56550
-        final Field _classes = AccessController.doPrivileged(new PrivilegedAction<Field>() {
-            @SuppressForbidden("TODO: Reflection works until Java 8 on Oracle/Sun JDKs, but breaks afterwards (different classloader types, access checks)")
-            public Field run() {
-                try {
-                    Field fld = ClassLoader.class.getDeclaredField("classes");
-                    fld.setAccessible(true);
-                    return fld;
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-
-            }
-        });
-
-        ClassLoader appLoader = ClassLoader.getSystemClassLoader();
-        try {
-            Vector<Class<?>> classes = (Vector<Class<?>>) _classes.get(appLoader);
-            Map<String, Class<?>> map = new HashMap<String, Class<?>>();
-            for (Class<?> cls : classes) {
-                // e.g. proxy-classes, ...
-                ProtectionDomain pd = cls.getProtectionDomain();
-                if (pd == null) continue;
-                CodeSource cs = pd.getCodeSource();
-                if (cs == null) continue;
-                URL loc = cs.getLocation();
-                if (loc == null) continue;
-                
-                String jar = loc.toString();
-                if(jar.indexOf(ptrn) != -1) map.put(cls.getName(), cls);
-            }
-            return map;
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static void copyFile(InputStream srcStream, File destFile) throws IOException {
-        File destDirectory = destFile.getParentFile();
-        if (!(destDirectory.exists() || destDirectory.mkdirs())) {
-            throw new RuntimeException("Can't create destination directory: "+destDirectory);
-        }
-        ;
-        OutputStream destStream = new FileOutputStream(destFile);
-        try {
-            IOUtils.copy(srcStream, destStream);
-        } finally {
-            destStream.close();
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/util/PackageHelper.java b/trunk/src/ooxml/java/org/apache/poi/util/PackageHelper.java
deleted file mode 100644
index 884868f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/util/PackageHelper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import org.apache.poi.openxml4j.opc.*;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.POIXMLException;
-
-import java.io.*;
-import java.net.URI;
-
-/**
- * Provides handy methods to work with OOXML packages
- */
-public final class PackageHelper {
-
-    public static OPCPackage open(InputStream is) throws IOException {
-        try {
-            return OPCPackage.open(is);
-        } catch (InvalidFormatException e){
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Clone the specified package.
-     *
-     * @param   pkg   the package to clone
-     * @param   file  the destination file
-     * @return  the cloned package
-     */
-    public static OPCPackage clone(OPCPackage pkg, File file) throws OpenXML4JException, IOException {
-
-        String path = file.getAbsolutePath();
-
-        OPCPackage dest = OPCPackage.create(path);
-        PackageRelationshipCollection rels = pkg.getRelationships();
-        for (PackageRelationship rel : rels) {
-            PackagePart part = pkg.getPart(rel);
-            PackagePart part_tgt;
-            if (rel.getRelationshipType().equals(PackageRelationshipTypes.CORE_PROPERTIES)) {
-                copyProperties(pkg.getPackageProperties(), dest.getPackageProperties());
-                continue;
-            }
-            dest.addRelationship(part.getPartName(), rel.getTargetMode(), rel.getRelationshipType());
-            part_tgt = dest.createPart(part.getPartName(), part.getContentType());
-
-            OutputStream out = part_tgt.getOutputStream();
-            IOUtils.copy(part.getInputStream(), out);
-            out.close();
-
-            if(part.hasRelationships()) {
-                copy(pkg, part, dest, part_tgt);
-            }
-        }
-        dest.close();
-
-        //the temp file will be deleted when JVM terminates
-        new File(path).deleteOnExit();
-        return OPCPackage.open(path);
-    }
-
-    /**
-     * Recursively copy package parts to the destination package
-     */
-    private static void copy(OPCPackage pkg, PackagePart part, OPCPackage tgt, PackagePart part_tgt) throws OpenXML4JException, IOException {
-        PackageRelationshipCollection rels = part.getRelationships();
-        if(rels != null) for (PackageRelationship rel : rels) {
-            PackagePart p;
-            if(rel.getTargetMode() == TargetMode.EXTERNAL){
-                part_tgt.addExternalRelationship(rel.getTargetURI().toString(), rel.getRelationshipType(), rel.getId());
-                //external relations don't have associated package parts
-                continue;
-            }
-            URI uri = rel.getTargetURI();
-
-            if(uri.getRawFragment() != null) {
-                part_tgt.addRelationship(uri, rel.getTargetMode(), rel.getRelationshipType(), rel.getId());
-                continue;
-            }
-            PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
-            p = pkg.getPart(relName);
-            part_tgt.addRelationship(p.getPartName(), rel.getTargetMode(), rel.getRelationshipType(), rel.getId());
-
-
-
-
-            PackagePart dest;
-            if(!tgt.containPart(p.getPartName())){
-                dest = tgt.createPart(p.getPartName(), p.getContentType());
-                OutputStream out = dest.getOutputStream();
-                IOUtils.copy(p.getInputStream(), out);
-                out.close();
-                copy(pkg, p, tgt, dest);
-            }
-        }
-    }
-
-    /**
-     * Copy core package properties
-     *
-     * @param src source properties
-     * @param tgt target properties
-     */
-    private static void copyProperties(PackageProperties src, PackageProperties tgt){
-        tgt.setCategoryProperty(src.getCategoryProperty().getValue());
-        tgt.setContentStatusProperty(src.getContentStatusProperty().getValue());
-        tgt.setContentTypeProperty(src.getContentTypeProperty().getValue());
-        tgt.setCreatorProperty(src.getCreatorProperty().getValue());
-        tgt.setDescriptionProperty(src.getDescriptionProperty().getValue());
-        tgt.setIdentifierProperty(src.getIdentifierProperty().getValue());
-        tgt.setKeywordsProperty(src.getKeywordsProperty().getValue());
-        tgt.setLanguageProperty(src.getLanguageProperty().getValue());
-        tgt.setRevisionProperty(src.getRevisionProperty().getValue());
-        tgt.setSubjectProperty(src.getSubjectProperty().getValue());
-        tgt.setTitleProperty(src.getTitleProperty().getValue());
-        tgt.setVersionProperty(src.getVersionProperty().getValue());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/util/SAXHelper.java b/trunk/src/ooxml/java/org/apache/poi/util/SAXHelper.java
deleted file mode 100644
index 1fbe744..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/util/SAXHelper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.reflect.Method;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-
-/**
- * Provides handy methods for working with SAX parsers and readers
- */
-public final class SAXHelper {
-    private static POILogger logger = POILogFactory.getLogger(SAXHelper.class);
-
-    private SAXHelper() {}
-
-    /**
-     * Creates a new SAX XMLReader, with sensible defaults
-     */
-    public static synchronized XMLReader newXMLReader() throws SAXException, ParserConfigurationException {
-        XMLReader xmlReader = saxFactory.newSAXParser().getXMLReader();
-        xmlReader.setEntityResolver(IGNORING_ENTITY_RESOLVER);
-        trySetSAXFeature(xmlReader, XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        trySetXercesSecurityManager(xmlReader);
-        return xmlReader;
-    }
-    
-    static final EntityResolver IGNORING_ENTITY_RESOLVER = new EntityResolver() {
-        @Override
-        public InputSource resolveEntity(String publicId, String systemId)
-                throws SAXException, IOException {
-            return new InputSource(new StringReader(""));
-        }
-    };
-    
-    private static final SAXParserFactory saxFactory;
-    static {
-        saxFactory = SAXParserFactory.newInstance();
-        saxFactory.setValidating(false);
-        saxFactory.setNamespaceAware(true);
-    }
-            
-    private static void trySetSAXFeature(XMLReader xmlReader, String feature, boolean enabled) {
-        try {
-            xmlReader.setFeature(feature, enabled);
-        } catch (Exception e) {
-            logger.log(POILogger.WARN, "SAX Feature unsupported", feature, e);
-        } catch (AbstractMethodError ame) {
-            logger.log(POILogger.WARN, "Cannot set SAX feature because outdated XML parser in classpath", feature, ame);
-        }
-    }
-    
-    private static void trySetXercesSecurityManager(XMLReader xmlReader) {
-        // Try built-in JVM one first, standalone if not
-        for (String securityManagerClassName : new String[] {
-                "com.sun.org.apache.xerces.internal.util.SecurityManager",
-                "org.apache.xerces.util.SecurityManager"
-        }) {
-            try {
-                Object mgr = Class.forName(securityManagerClassName).newInstance();
-                Method setLimit = mgr.getClass().getMethod("setEntityExpansionLimit", Integer.TYPE);
-                setLimit.invoke(mgr, 4096);
-                xmlReader.setProperty("http://apache.org/xml/properties/security-manager", mgr);
-                // Stop once one can be setup without error
-                return;
-            } catch (Exception e) {
-                logger.log(POILogger.WARN, "SAX Security Manager could not be setup", e);
-            } catch (Error err) {
-                logger.log(POILogger.WARN, "SAX Security Manager could not be setup", err);
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/util/XmlSort.java b/trunk/src/ooxml/java/org/apache/poi/util/XmlSort.java
deleted file mode 100644
index e6be797..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/util/XmlSort.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.util.Comparator;
-
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-
-public final class XmlSort {
-    /**
-     * Sorts the children of <code>element</code> according to the order indicated by the
-     * comparator.
-     * @param element the element whose content is to be sorted. Only element children are sorted,
-     * attributes are not touched. When elements are reordered, all the text, comments and PIs
-     * follow the element that they come immediately after.
-     * @param comp a comparator that is to be used when comparing the <code>QName</code>s of two
-     * elements. 
-     * @throws IllegalArgumentException if the input <code>XmlObject</code> does not represent
-     * an element
-     */
-    public static void sort(XmlObject element, Comparator<XmlCursor> comp) {
-        XmlCursor headCursor = element.newCursor();
-        if (!headCursor.isStart()) {
-            throw new IllegalStateException("The element parameter must point to a STARTDOC");
-        }
-        // We use insertion sort to minimize the number of swaps, because each swap means
-        // moving a part of the document
-        /* headCursor points to the beginning of the list of the already sorted items and
-           listCursor points to the beginning of the list of unsorted items
-           At the beginning, headCursor points to the first element and listCursor points to the
-           second element. The algorithm ends when listCursor cannot be moved to the "next"
-           element in the unsorted list, i.e. the unsorted list becomes empty */
-        boolean moved = headCursor.toFirstChild();
-        if (!moved) {
-            // Cursor was not moved, which means that the given element has no children and
-            // therefore there is nothing to sort
-            return;
-        }
-        XmlCursor listCursor = headCursor.newCursor();
-        boolean moreElements = listCursor.toNextSibling();
-        while (moreElements) {
-            moved = false;
-            // While we can move the head of the unsorted list, it means that there are still
-            // items (elements) that need to be sorted
-            while (headCursor.comparePosition(listCursor) < 0) {
-                if (comp.compare(headCursor, listCursor) > 0) {
-                    // We have found the position in the sorted list, insert the element and the
-                    // text following the element in the current position
-                    // Move the element
-                    listCursor.moveXml(headCursor);
-                    // Move the text following the element
-                    while (!listCursor.isStart() && !listCursor.isEnd())
-                        listCursor.moveXml(headCursor);
-                    moreElements = listCursor.isStart();
-                    moved = true;
-                    break;
-                }
-                headCursor.toNextSibling();
-            }
-            if (!moved) {
-                // Because during the move of a fragment of XML, the listCursor is also moved, in
-                // case we didn't need to move XML (the new element to be inserted happened to
-                // be the last one in order), we need to move this cursor
-                moreElements = listCursor.toNextSibling();
-            }
-            // Reposition the head of the sorted list
-            headCursor.toParent();
-            headCursor.toFirstChild();
-        }
-    }
-}
- 
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
deleted file mode 100644
index 379877e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.exceptions;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-
-public class XDGFException {
-
-    /**
-     * Creates an error message to be thrown
-     */
-    public static POIXMLException error(String message, Object o) {
-        return new POIXMLException(o.toString() + ": " + message);
-    }
-
-    public static POIXMLException error(String message, Object o, Throwable t) {
-        return new POIXMLException(o.toString() + ": " + message, t);
-    }
-
-    //
-    // Use these to wrap error messages coming up so that we have at least
-    // some idea where the error was located
-    //
-
-    public static POIXMLException wrap(POIXMLDocumentPart part,
-            POIXMLException e) {
-        return new POIXMLException(part.getPackagePart().getPartName()
-                .toString()
-                + ": " + e.getMessage(), e.getCause() == null ? e
-                        : e.getCause());
-    }
-
-    public static POIXMLException wrap(String where, POIXMLException e) {
-        return new POIXMLException(where + ": " + e.getMessage(),
-                e.getCause() == null ? e : e.getCause());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
deleted file mode 100644
index 5f474fc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xdgf.extractor;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xdgf.usermodel.XDGFPage;
-import org.apache.poi.xdgf.usermodel.XmlVisioDocument;
-import org.apache.poi.xdgf.usermodel.shape.ShapeTextVisitor;
-
-/**
- * Helper class to extract text from an OOXML Visio File
- */
-public class XDGFVisioExtractor extends POIXMLTextExtractor {
-
-    protected final XmlVisioDocument document;
-    
-    public XDGFVisioExtractor(XmlVisioDocument document) {
-        super(document);
-        this.document = document;
-    }
-
-    public XDGFVisioExtractor(OPCPackage openPackage) throws IOException {
-        this(new XmlVisioDocument(openPackage));
-    }
-
-    public String getText() {
-        ShapeTextVisitor visitor = new ShapeTextVisitor();
-        
-        for (XDGFPage page: document.getPages()) {
-            page.getContent().visitShapes(visitor);
-        }
-        
-        return visitor.getText().toString();
-    }
-    
-    public static void main(String [] args) throws IOException {
-        if (args.length < 1) {
-            System.err.println("Use:");
-            System.err.println("  XDGFVisioExtractor <filename.vsdx>");
-            System.exit(1);
-        }
-        POIXMLTextExtractor extractor =
-                new XDGFVisioExtractor(POIXMLDocument.openPackage(
-                        args[0]
-                ));
-        System.out.println(extractor.getText());
-        extractor.close();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/Dimension2dDouble.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/Dimension2dDouble.java
deleted file mode 100644
index 94b887e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/Dimension2dDouble.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.geom;
-
-import java.awt.geom.Dimension2D;
-
-public class Dimension2dDouble extends Dimension2D {
-
-    double width;
-    double height;
-
-    public Dimension2dDouble() {
-        width = 0d;
-        height = 0d;
-    }
-
-    public Dimension2dDouble(double width, double height) {
-        this.width = width;
-        this.height = height;
-    }
-
-    @Override
-    public double getWidth() {
-        return width;
-    }
-
-    @Override
-    public double getHeight() {
-        return height;
-    }
-
-    @Override
-    public void setSize(double width, double height) {
-        this.width = width;
-        this.height = height;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof Dimension2dDouble) {
-            Dimension2dDouble other = (Dimension2dDouble) obj;
-            return width == other.width && height == other.height;
-        }
-
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        double sum = width + height;
-        return (int) Math.ceil(sum * (sum + 1) / 2 + width);
-    }
-
-    @Override
-    public String toString() {
-        return "Dimension2dDouble[" + width + ", " + height + "]";
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
deleted file mode 100644
index a977cb6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.geom;
-
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-import org.apache.poi.xdgf.usermodel.section.geometry.SplineKnot;
-import org.apache.poi.xdgf.usermodel.section.geometry.SplineStart;
-
-import com.graphbuilder.curve.ControlPath;
-import com.graphbuilder.curve.ShapeMultiPath;
-import com.graphbuilder.curve.ValueVector;
-import com.graphbuilder.geom.PointFactory;
-
-public class SplineCollector {
-
-    SplineStart _start;
-    ArrayList<SplineKnot> _knots = new ArrayList<SplineKnot>();
-
-    public SplineCollector(SplineStart start) {
-        _start = start;
-    }
-
-    public void addKnot(SplineKnot knot) {
-        if (!knot.getDel())
-            _knots.add(knot);
-    }
-
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        // ok, we have the start, and all knots... do something with this
-
-        Point2D last = path.getCurrentPoint();
-
-        // create a control path and knots
-        ControlPath controlPath = new ControlPath();
-        ValueVector knots = new ValueVector(_knots.size() + 3);
-
-        double firstKnot = _start.getB();
-        double lastKnot = _start.getC();
-        int degree = _start.getD();
-
-        // first/second knot
-        knots.add(firstKnot);
-        knots.add(_start.getA());
-
-        // first/second control point
-        controlPath.addPoint(PointFactory.create(last.getX(), last.getY()));
-        controlPath.addPoint(PointFactory.create(_start.getX(), _start.getY()));
-
-        // middle knots/control points
-        for (SplineKnot knot: _knots) {
-            knots.add(knot.getA());
-            controlPath.addPoint(PointFactory.create(knot.getX(), knot.getY()));
-        }
-
-        // last knot
-        knots.add(lastKnot);
-
-        ShapeMultiPath shape = SplineRenderer.createNurbsSpline(controlPath, knots, null, degree);
-        path.append(shape, true);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
deleted file mode 100644
index c168356..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.geom;
-
-import com.graphbuilder.curve.ControlPath;
-import com.graphbuilder.curve.GroupIterator;
-import com.graphbuilder.curve.NURBSpline;
-import com.graphbuilder.curve.ShapeMultiPath;
-import com.graphbuilder.curve.ValueVector;
-
-
-public class SplineRenderer {
-
-    public static ShapeMultiPath createNurbsSpline(ControlPath controlPoints,
-            ValueVector knots, ValueVector weights, int degree) {
-
-        double firstKnot = knots.get(0);
-        final int count = knots.size();
-        double lastKnot = knots.get(count - 1);
-
-        // scale knots to [0, 1] based on first/last knots
-        for (int i = 0; i < count; i++) {
-            knots.set((knots.get(i) - firstKnot) / lastKnot, i);
-        }
-
-        // if we don't have enough knots, duplicate the last knot until we do
-        final int  knotsToAdd = controlPoints.numPoints() + degree + 1;
-        for (int i = count; i < knotsToAdd; i++) {
-            knots.add(1);
-        }
-
-        GroupIterator gi = new GroupIterator("0:n-1", controlPoints.numPoints());
-
-        NURBSpline spline = new NURBSpline(controlPoints, gi);
-
-        spline.setDegree(degree);
-        spline.setKnotVectorType(NURBSpline.NON_UNIFORM);
-        spline.setKnotVector(knots);
-
-        if (weights == null) {
-            spline.setUseWeightVector(false);
-        } else {
-            spline.setWeightVector(weights);
-        }
-
-        // now that this is done, add it to the path
-        ShapeMultiPath shape = new ShapeMultiPath();
-        shape.setFlatness(0.01);
-
-        spline.appendTo(shape);
-        return shape;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
deleted file mode 100644
index 4ee9ee5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xdgf.usermodel;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xdgf.exceptions.XDGFException;
-import org.apache.poi.xdgf.usermodel.shape.ShapeRenderer;
-import org.apache.poi.xdgf.usermodel.shape.ShapeVisitor;
-import org.apache.poi.xdgf.usermodel.shape.exceptions.StopVisiting;
-import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
-
-import com.microsoft.schemas.office.visio.x2012.main.ConnectType;
-import com.microsoft.schemas.office.visio.x2012.main.PageContentsType;
-import com.microsoft.schemas.office.visio.x2012.main.ShapeSheetType;
-
-/**
- * Container of shapes for a page in a Visio diagram. Shapes are not
- * necessarily literal shapes in the diagram, but is the term that is
- * used to describe the basic elements that make up a Visio diagram.
- */
-public class XDGFBaseContents extends XDGFXMLDocumentPart {
-
-    protected PageContentsType _pageContents;
-
-    // shapes without parents
-    protected List<XDGFShape> _toplevelShapes = new ArrayList<XDGFShape>();
-    protected Map<Long, XDGFShape> _shapes = new HashMap<Long, XDGFShape>();
-    protected List<XDGFConnection> _connections = new ArrayList<XDGFConnection>();
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XDGFBaseContents(PackagePart part, XDGFDocument document) {
-        super(part, document);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XDGFBaseContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
-        this(part, document);
-    }
-    
-    @Internal
-    public PageContentsType getXmlObject() {
-        return _pageContents;
-    }
-
-
-    @Override
-    protected void onDocumentRead() {
-
-        if (_pageContents.isSetShapes()) {
-            for (ShapeSheetType shapeSheet: _pageContents.getShapes().getShapeArray()) {
-                XDGFShape shape = new XDGFShape(shapeSheet, this, _document);
-                _toplevelShapes.add(shape);
-                addToShapeIndex(shape);
-            }
-        }
-
-        if (_pageContents.isSetConnects()) {
-            for (ConnectType connect: _pageContents.getConnects().getConnectArray()) {
-
-                XDGFShape from = _shapes.get(connect.getFromSheet());
-                XDGFShape to = _shapes.get(connect.getToSheet());
-
-                if (from == null)
-                    throw new POIXMLException(this.toString() + "; Connect; Invalid from id: " + connect.getFromSheet());
-
-                if (to == null)
-                    throw new POIXMLException(this.toString() + "; Connect; Invalid to id: " + connect.getToSheet());
-
-                _connections.add(new XDGFConnection(connect, from, to));
-            }
-        }
-    }
-
-    protected void addToShapeIndex(XDGFShape shape) {
-        _shapes.put(shape.getID(), shape);
-
-        List<XDGFShape> shapes = shape.getShapes();
-        if (shapes == null)
-            return;
-
-        for (XDGFShape subshape: shapes)
-            addToShapeIndex(subshape);
-    }
-
-    //
-    // API
-    //
-
-    /**
-     * Draws the contents of a page onto a Graphics2D object
-     *
-     * @param graphics
-     */
-    public void draw(Graphics2D graphics) {
-        visitShapes(new ShapeRenderer(graphics));
-    }
-
-
-    public XDGFShape getShapeById(long id) {
-        return _shapes.get(id);
-    }
-
-    public Map<Long, XDGFShape> getShapesMap() {
-        return Collections.unmodifiableMap(_shapes);
-    }
-
-    public Collection<XDGFShape> getShapes() {
-        return _shapes.values();
-    }
-
-    public List<XDGFShape> getTopLevelShapes() {
-        return Collections.unmodifiableList(_toplevelShapes);
-    }
-    
-    public List<XDGFConnection> getConnections() {
-        return Collections.unmodifiableList(_connections);
-    }
-
-    @Override
-    public String toString() {
-        return getPackagePart().getPartName().toString();
-    }
-
-
-    /**
-     * Provides iteration over the shapes using the visitor pattern, and provides
-     * an easy way to convert shape coordinates into global coordinates
-     */
-    public void visitShapes(ShapeVisitor visitor) {
-        try {
-            for (XDGFShape shape: _toplevelShapes) {
-                shape.visitShapes(visitor, new AffineTransform(), 0);
-            }
-        } catch (StopVisiting e) {
-            // intentionally empty
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this, e);
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
deleted file mode 100644
index f7f3291..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.util.Map;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.Internal;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-
-/**
- * There are a lot of different cell types. Cell is really just an attribute of
- * the thing that it's attached to. Will probably refactor this once I figure
- * out a better way to use them
- *
- * The various attributes of a Cell are constrained, and are better defined in
- * the XSD 1.1 visio schema
- * 
- * Values of a cell are often the result of a formula computation. Luckily for
- * you, Visio seems to always write the result to the document file, so unless
- * the values change we don't need to recompute the values.
- */
-public class XDGFCell {
-
-    public static Boolean maybeGetBoolean(Map<String, XDGFCell> cells,
-            String name) {
-        XDGFCell cell = cells.get(name);
-        if (cell == null)
-            return null;
-
-        if (cell.getValue().equals("0"))
-            return false;
-        if (cell.getValue().equals("1"))
-            return true;
-
-        throw new POIXMLException("Invalid boolean value for '"
-                + cell.getName() + "'");
-    }
-
-    public static Double maybeGetDouble(Map<String, XDGFCell> cells, String name) {
-        XDGFCell cell = cells.get(name);
-        if (cell != null)
-            return parseDoubleValue(cell._cell);
-        return null;
-    }
-
-    public static Integer maybeGetInteger(Map<String, XDGFCell> cells,
-            String name) {
-        XDGFCell cell = cells.get(name);
-        if (cell != null)
-            return parseIntegerValue(cell._cell);
-        return null;
-    }
-
-    public static String maybeGetString(Map<String, XDGFCell> cells, String name) {
-        XDGFCell cell = cells.get(name);
-        if (cell != null) {
-            String v = cell._cell.getV();
-            if (v.equals("Themed"))
-                return null;
-            return v;
-        }
-        return null;
-    }
-
-    public static Double parseDoubleValue(CellType cell) {
-        try {
-            return Double.parseDouble(cell.getV());
-        } catch (NumberFormatException e) {
-            if (cell.getV().equals("Themed"))
-                return null;
-            throw new POIXMLException("Invalid float value for '" + cell.getN()
-                    + "': " + e);
-        }
-    }
-
-    public static Integer parseIntegerValue(CellType cell) {
-        try {
-            return Integer.parseInt(cell.getV());
-        } catch (NumberFormatException e) {
-            if (cell.getV().equals("Themed"))
-                return null;
-            throw new POIXMLException("Invalid integer value for '"
-                    + cell.getN() + "': " + e);
-        }
-    }
-
-    /**
-     * @param cell
-     * @return A value converted to inches
-     */
-    public static Double parseVLength(CellType cell) {
-        try {
-            return Double.parseDouble(cell.getV());
-        } catch (NumberFormatException e) {
-            if (cell.getV().equals("Themed"))
-                return null;
-            throw new POIXMLException("Invalid float value for '" + cell.getN()
-                    + "': " + e);
-        }
-    }
-
-    CellType _cell;
-
-    public XDGFCell(CellType cell) {
-        _cell = cell;
-    }
-
-    @Internal
-    protected CellType getXmlObject() {
-        return _cell;
-    }
-
-    /**
-     * Represents the name of the ShapeSheet cell.
-     */
-    public String getName() {
-        return _cell.getN();
-    }
-
-    /**
-     * Represents the value of the cell.
-     */
-    public String getValue() {
-        return _cell.getV();
-    }
-
-    /**
-     * Represents the element's formula. This attribute can contain one of the
-     * following strings: - '(some formula)' if the formula exists locally - No
-     * Formula if the formula is locally deleted or blocked - Inh if the formula
-     * is inherited.
-     */
-    public String getFormula() {
-        return _cell.getF();
-    }
-
-    /*
-     * Indicates that the formula evaluates to an error. The value of E is the
-     * current value (an error message string); the value of the V attribute is
-     * the last valid value.
-     */
-    public String getError() {
-        return _cell.getE();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
deleted file mode 100644
index cc24a41..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import com.microsoft.schemas.office.visio.x2012.main.ConnectType;
-
-/**
- * Represents connections in a Visio diagram.
- * 
- * Note that just because something appears to be visually connected in a
- * document does not mean that the user actually connected the elements. It
- * turns out there are a lot of ways that a careless user can neglect to
- * properly make connections that will not be recorded in the diagram
- * in a machine readable way.
- */
-public class XDGFConnection {
-
-    // comments on frompart/topart taken from pkgVisio
-
-    // https://msdn.microsoft.com/en-us/library/ms367611(v=office.12).aspx
-
-    // The following constants declared by the Microsoft Office Visio type
-    // library show return values for the FromPart property.
-    // Constant Value
-    // visConnectFromError -1
-    // visFromNone 0
-    // visLeftEdge 1
-    // visCenterEdge 2
-    // visRightEdge 3
-    // visBottomEdge 4
-    // visMiddleEdge 5
-    // visTopEdge 6
-    // visBeginX 7
-    // visBeginY 8
-    // visBegin 9
-    // visEndX 10
-    // visEndY 11
-    // visEnd 12
-    // visFromAngle 13
-    // visFromPin 14
-    // visControlPoint 100 + zero-based row index (for example, visControlPoint
-    // = 100 if the control point is in row 0; visControlPoint = 101 if the
-    // control point is in row 1)
-
-    public static final int visConnectFromError = -1;
-    public static final int visFromNone = 0;
-    public static final int visLeftEdge = 1;
-    public static final int visCenterEdge = 2;
-    public static final int visRightEdge = 3;
-    public static final int visBottomEdge = 4;
-    public static final int visMiddleEdge = 5;
-    public static final int visTopEdge = 6;
-    public static final int visBeginX = 7;
-    public static final int visBeginY = 8;
-    public static final int visBegin = 9;
-    public static final int visEndX = 10;
-    public static final int visEndY = 11;
-    public static final int visEnd = 12;
-    public static final int visFromAngle = 13;
-    public static final int visFromPin = 14;
-
-    // The ToPart property identifies the part of a shape to which another
-    // shape is glued, such as its begin point or endpoint, one of its edges,
-    // or a connection point. The following constants declared by the Visio type
-    // library in member VisToParts show possible return values for the ToPart
-    // property.
-    // Constant Value
-    // visConnectToError -1
-    // visToNone 0
-    // visGuideX 1
-    // visGuideY 2
-    // visWholeShape 3
-    // visGuideIntersect 4
-    // visToAngle 7
-    // visConnectionPoint 100 + row index of connection point
-
-    public static final int visConnectToError = -1;
-    public static final int visToNone = 0;
-    public static final int visGuideX = 1;
-    public static final int visGuideY = 2;
-    public static final int visWholeShape = 3;
-    public static final int visGuideIntersect = 4;
-    public static final int visToAngle = 7;
-
-    private ConnectType _connect;
-    private XDGFShape _from;
-    private XDGFShape _to;
-
-    public XDGFConnection(ConnectType connect, XDGFShape from, XDGFShape to) {
-        _connect = connect;
-        _from = from;
-        _to = to;
-    }
-
-    public XDGFShape getFromShape() {
-        return _from;
-    }
-
-    public XDGFCell getFromCell() {
-        return _from.getCell(_connect.getFromCell());
-    }
-
-    public String getFromCellName() {
-        return _connect.getFromCell();
-    }
-
-    public XDGFShape getToShape() {
-        return _to;
-    }
-
-    public String getToCellName() {
-        return _connect.getToCell();
-    }
-
-    // see constants above
-    public Integer getFromPart() {
-        if (_connect.isSetFromPart())
-            return _connect.getFromPart();
-        else
-            return null;
-    }
-
-    /**
-     * The ToPart property identifies the part of a shape to which another
-     * shape is glued, such as its begin point or endpoint, one of its edges,
-     * or a connection point.
-     */
-    public Integer getToPart() {
-        if (_connect.isSetToPart())
-            return _connect.getToPart();
-        else
-            return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
deleted file mode 100644
index ba460cc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.Internal;
-
-import com.microsoft.schemas.office.visio.x2012.main.DocumentSettingsType;
-import com.microsoft.schemas.office.visio.x2012.main.StyleSheetType;
-import com.microsoft.schemas.office.visio.x2012.main.VisioDocumentType;
-
-/**
- * Represents the root document: /visio/document.xml
- * 
- * You're probably actually looking for {@link XmlVisioDocument}, this
- * only contains metadata about the root document in the OOXML package.
- */
-public class XDGFDocument {
-
-    protected VisioDocumentType _document;
-
-    Map<Long, XDGFStyleSheet> _styleSheets = new HashMap<Long, XDGFStyleSheet>();
-
-    // defaults
-    long _defaultFillStyle = 0;
-    long _defaultGuideStyle = 0;
-    long _defaultLineStyle = 0;
-    long _defaultTextStyle = 0;
-
-
-    public XDGFDocument(VisioDocumentType document) {
-        
-        _document = document;
-
-        if (!_document.isSetDocumentSettings())
-            throw new POIXMLException("Document settings not found");
-
-        DocumentSettingsType docSettings = _document.getDocumentSettings();
-
-        if (docSettings.isSetDefaultFillStyle())
-            _defaultFillStyle = docSettings.getDefaultFillStyle();
-
-        if (docSettings.isSetDefaultGuideStyle())
-            _defaultGuideStyle = docSettings.getDefaultGuideStyle();
-
-        if (docSettings.isSetDefaultLineStyle())
-            _defaultLineStyle = docSettings.getDefaultLineStyle();
-
-        if (docSettings.isSetDefaultTextStyle())
-            _defaultTextStyle = docSettings.getDefaultTextStyle();
-
-        if (_document.isSetStyleSheets()) {
-
-            for (StyleSheetType styleSheet: _document.getStyleSheets().getStyleSheetArray()) {
-                _styleSheets.put(styleSheet.getID(), new XDGFStyleSheet(styleSheet, this));
-            }
-        }
-    }
-
-
-    @Internal
-    public VisioDocumentType getXmlObject() {
-        return _document;
-    }
-
-
-    public XDGFStyleSheet getStyleById(long id) {
-        return _styleSheets.get(id);
-    }
-
-
-    public XDGFStyleSheet getDefaultFillStyle() {
-        XDGFStyleSheet style = getStyleById(_defaultFillStyle);
-        if (style == null)
-            throw new POIXMLException("No default fill style found!");
-        return style;
-    }
-
-    public XDGFStyleSheet getDefaultGuideStyle() {
-        XDGFStyleSheet style = getStyleById(_defaultGuideStyle);
-        if (style == null)
-            throw new POIXMLException("No default guide style found!");
-        return style;
-    }
-
-    public XDGFStyleSheet getDefaultLineStyle() {
-        XDGFStyleSheet style = getStyleById(_defaultLineStyle);
-        if (style == null)
-            throw new POIXMLException("No default line style found!");
-        return style;
-    }
-
-    public XDGFStyleSheet getDefaultTextStyle() {
-        XDGFStyleSheet style = getStyleById(_defaultTextStyle);
-        if (style == null)
-            throw new POIXMLException("No default text style found!");
-        return style;
-    }
-
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
deleted file mode 100644
index 83ac58c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLFactory;
-import org.apache.poi.POIXMLRelation;
-
-/**
- * Instantiates sub-classes of POIXMLDocumentPart depending on their relationship type
- */
-public class XDGFFactory extends POIXMLFactory {
-
-    private final XDGFDocument document;
-
-    public XDGFFactory(XDGFDocument document) {
-        this.document = document;
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    protected POIXMLRelation getDescriptor(String relationshipType) {
-        return XDGFRelation.getInstance(relationshipType);
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    @Override
-    protected POIXMLDocumentPart createDocumentPart
-        (Class<? extends POIXMLDocumentPart> cls, Class<?>[] classes, Object[] values)
-    throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
-        Class<?>[] cl;
-        Object[] vals;
-        if (classes == null) {
-            cl = new Class<?>[]{XDGFDocument.class};
-            vals = new Object[]{document};
-        } else {
-            cl = new Class<?>[classes.length+1];
-            System.arraycopy(classes, 0, cl, 0, classes.length);
-            cl[classes.length] = XDGFDocument.class;
-            vals = new Object[values.length+1];
-            System.arraycopy(values, 0, vals, 0, values.length);
-            vals[values.length] = document;
-        }
-        
-        Constructor<? extends POIXMLDocumentPart> constructor = cls.getDeclaredConstructor(cl);
-        return constructor.newInstance(vals);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
deleted file mode 100644
index 68c2c86..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import org.apache.poi.util.Internal;
-
-import com.microsoft.schemas.office.visio.x2012.main.MasterType;
-
-/**
- * Provides the API to work with an underlying master. Typically, each set of
- * stencils used in a Visio diagram are found in a separate master for each.
- */
-public class XDGFMaster {
-
-    private MasterType _master;
-    protected XDGFMasterContents _content;
-    protected XDGFSheet _pageSheet = null;
-
-    public XDGFMaster(MasterType master, XDGFMasterContents content,
-            XDGFDocument document) {
-        _master = master;
-        _content = content;
-        content.setMaster(this);
-
-        if (master.isSetPageSheet())
-            _pageSheet = new XDGFPageSheet(master.getPageSheet(), document);
-    }
-
-    @Internal
-    protected MasterType getXmlObject() {
-        return _master;
-    }
-
-    @Override
-    public String toString() {
-        return "<Master ID=\"" + getID() + "\" " + _content + ">";
-    }
-
-    public long getID() {
-        return _master.getID();
-    }
-
-    public String getName() {
-        return _master.getName();
-    }
-
-    public XDGFMasterContents getContent() {
-        return _content;
-    }
-
-    public XDGFSheet getPageSheet() {
-        return _pageSheet;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
deleted file mode 100644
index 335a322..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.xdgf.exceptions.XDGFException;
-import org.apache.xmlbeans.XmlException;
-
-import com.microsoft.schemas.office.visio.x2012.main.MasterContentsDocument;
-
-/**
- * Contains the actual contents of the master/stencil
- */
-public class XDGFMasterContents extends XDGFBaseContents {
-
-    protected XDGFMaster _master;
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XDGFMasterContents(PackagePart part, XDGFDocument document) {
-        super(part, document);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XDGFMasterContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
-        this(part, document);
-    }
-
-    
-    @Override
-    protected void onDocumentRead() {
-
-        try {
-
-            try {
-                _pageContents = MasterContentsDocument.Factory.parse(getPackagePart().getInputStream()).getMasterContents();
-            } catch (XmlException e) {
-                throw new POIXMLException(e);
-            } catch (IOException e) {
-                throw new POIXMLException(e);
-            }
-
-            super.onDocumentRead();
-
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this, e);
-        }
-    }
-
-    public XDGFMaster getMaster() {
-        return _master;
-    }
-
-    protected void setMaster(XDGFMaster master) {
-        _master = master;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
deleted file mode 100644
index 9fa90b8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xdgf.exceptions.XDGFException;
-import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
-import org.apache.xmlbeans.XmlException;
-
-import com.microsoft.schemas.office.visio.x2012.main.MasterType;
-import com.microsoft.schemas.office.visio.x2012.main.MastersDocument;
-import com.microsoft.schemas.office.visio.x2012.main.MastersType;
-
-/**
- * A collection of masters (typically stencils) in a Visio document
- */
-public class XDGFMasters extends XDGFXMLDocumentPart {
-
-    MastersType _mastersObject;
-
-    // key: id of master
-    protected Map<Long, XDGFMaster> _masters = new HashMap<Long, XDGFMaster>();
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XDGFMasters(PackagePart part, XDGFDocument document) {
-        super(part, document);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XDGFMasters(PackagePart part, PackageRelationship rel, XDGFDocument document) {
-        this(part, document);
-    }
-    
-    @Internal
-    protected MastersType getXmlObject() {
-        return _mastersObject;
-    }
-
-    @Override
-    protected void onDocumentRead() {
-        try {
-            try {
-                _mastersObject = MastersDocument.Factory.parse(getPackagePart().getInputStream()).getMasters();
-            } catch (XmlException e) {
-                throw new POIXMLException(e);
-            } catch (IOException e) {
-                throw new POIXMLException(e);
-            }
-
-            Map<String, MasterType> masterSettings = new HashMap<String, MasterType>();
-            for (MasterType master: _mastersObject.getMasterArray()) {
-                masterSettings.put(master.getRel().getId(), master);
-            }
-
-            // create the masters
-            for (RelationPart rp : getRelationParts()) {
-                POIXMLDocumentPart part = rp.getDocumentPart();
-
-                String relId = rp.getRelationship().getId();
-                MasterType settings = masterSettings.get(relId);
-
-                if (settings == null) {
-                    throw new POIXMLException("Master relationship for " + relId + " not found");
-                }
-
-                if (!(part instanceof XDGFMasterContents)) {
-                    throw new POIXMLException("Unexpected masters relationship for " + relId + ": " + part);
-                }
-
-                XDGFMasterContents contents = (XDGFMasterContents)part;
-                contents.onDocumentRead();
-
-                XDGFMaster master = new XDGFMaster(settings, contents, _document);
-                _masters.put(master.getID(), master);
-            }
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this, e);
-        }
-    }
-
-    public Collection<XDGFMaster> getMastersList() {
-        return Collections.unmodifiableCollection(_masters.values());
-    }
-
-    public XDGFMaster getMasterById(long masterId) {
-        return _masters.get(masterId);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
deleted file mode 100644
index 3bdbd2e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xdgf.geom.Dimension2dDouble;
-
-import com.microsoft.schemas.office.visio.x2012.main.PageType;
-
-/**
- * Provides the API to work with an underlying page
- */
-public class XDGFPage {
-
-    private PageType _page;
-    protected XDGFPageContents _content;
-    protected XDGFPages _pages;
-    protected XDGFSheet _pageSheet = null;
-
-    public XDGFPage(PageType page, XDGFPageContents content,
-            XDGFDocument document, XDGFPages pages) {
-        _page = page;
-        _content = content;
-        _pages = pages;
-        content.setPage(this);
-
-        if (page.isSetPageSheet())
-            _pageSheet = new XDGFPageSheet(page.getPageSheet(), document);
-    }
-
-    @Internal
-    protected PageType getXmlObject() {
-        return _page;
-    }
-
-    public long getID() {
-        return _page.getID();
-    }
-
-    public String getName() {
-        return _page.getName();
-    }
-
-    public XDGFPageContents getContent() {
-        return _content;
-    }
-
-    public XDGFSheet getPageSheet() {
-        return _pageSheet;
-    }
-
-    public long getPageNumber() {
-        return _pages.getPageList().indexOf(this) + 1;
-    }
-
-    /**
-     * @return width/height of page
-     */
-    public Dimension2dDouble getPageSize() {
-        XDGFCell w = _pageSheet.getCell("PageWidth");
-        XDGFCell h = _pageSheet.getCell("PageHeight");
-
-        if (w == null || h == null)
-            throw new POIXMLException("Cannot determine page size");
-
-        return new Dimension2dDouble(Double.parseDouble(w.getValue()),
-                Double.parseDouble(h.getValue()));
-    }
-
-    /**
-     * @return origin of coordinate system
-     */
-    public Point2D.Double getPageOffset() {
-        XDGFCell xoffcell = _pageSheet.getCell("XRulerOrigin");
-        XDGFCell yoffcell = _pageSheet.getCell("YRulerOrigin");
-
-        double xoffset = 0;
-        double yoffset = 0;
-
-        if (xoffcell != null)
-            xoffset = Double.parseDouble(xoffcell.getValue());
-
-        if (xoffcell != null)
-            yoffset = Double.parseDouble(yoffcell.getValue());
-
-        return new Point2D.Double(xoffset, yoffset);
-    }
-
-    /**
-     * @return bounding box of page
-     */
-    public Rectangle2D getBoundingBox() {
-        Dimension2dDouble sz = getPageSize();
-        Point2D.Double offset = getPageOffset();
-
-        return new Rectangle2D.Double(-offset.getX(), -offset.getY(),
-                sz.getWidth(), sz.getHeight());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
deleted file mode 100644
index e1965f3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.xdgf.exceptions.XDGFException;
-import org.apache.xmlbeans.XmlException;
-
-import com.microsoft.schemas.office.visio.x2012.main.PageContentsDocument;
-
-public class XDGFPageContents extends XDGFBaseContents {
-
-    protected Map<Long, XDGFMaster> _masters = new HashMap<Long, XDGFMaster>();
-    protected XDGFPage _page;
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XDGFPageContents(PackagePart part, XDGFDocument document) {
-        super(part, document);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XDGFPageContents(PackagePart part, PackageRelationship rel, XDGFDocument document) {
-        this(part, document);
-    }
-    
-    @Override
-    protected void onDocumentRead() {
-        try {
-            try {
-                _pageContents = PageContentsDocument.Factory.parse(getPackagePart().getInputStream()).getPageContents();
-            } catch (XmlException e) {
-                throw new POIXMLException(e);
-            } catch (IOException e) {
-                throw new POIXMLException(e);
-            }
-
-            for (POIXMLDocumentPart part: getRelations()) {
-                if (!(part instanceof XDGFMasterContents))
-                    continue;
-                //throw new POIXMLException("Unexpected page relation: " + part);
-
-                XDGFMaster master = ((XDGFMasterContents)part).getMaster();
-                _masters.put(master.getID(), master);
-            }
-
-            super.onDocumentRead();
-
-            for (XDGFShape shape: _shapes.values()) {
-                if (shape.isTopmost())
-                    shape.setupMaster(this, null);
-            }
-
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this, e);
-        }
-    }
-
-    /**
-     * @return Parent page
-     */
-    public XDGFPage getPage() {
-        return _page;
-    }
-
-    protected void setPage(XDGFPage page) {
-        _page = page;
-    }
-
-    public XDGFMaster getMasterById(long id) {
-        return _masters.get(id);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
deleted file mode 100644
index 1d27969..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import com.microsoft.schemas.office.visio.x2012.main.PageSheetType;
-
-public class XDGFPageSheet extends XDGFSheet {
-
-    PageSheetType _pageSheet;
-
-    public XDGFPageSheet(PageSheetType sheet, XDGFDocument document) {
-        super(sheet, document);
-        _pageSheet = sheet;
-    }
-
-    @Override
-    PageSheetType getXmlObject() {
-        return _pageSheet;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
deleted file mode 100644
index a2fc4c7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xdgf.usermodel;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xdgf.exceptions.XDGFException;
-import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
-import org.apache.xmlbeans.XmlException;
-
-import com.microsoft.schemas.office.visio.x2012.main.PageType;
-import com.microsoft.schemas.office.visio.x2012.main.PagesDocument;
-import com.microsoft.schemas.office.visio.x2012.main.PagesType;
-
-
-/**
- * Contains a list of Page objects (not page content!)
- */
-public class XDGFPages extends XDGFXMLDocumentPart {
-
-    PagesType _pagesObject;
-
-    // ordered by page number
-    List<XDGFPage> _pages = new ArrayList<XDGFPage>();
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XDGFPages(PackagePart part, XDGFDocument document) {
-        super(part, document);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XDGFPages(PackagePart part, PackageRelationship rel, XDGFDocument document) {
-        this(part, document);
-    }
-    
-    @Internal
-    PagesType getXmlObject() {
-        return _pagesObject;
-    }
-
-    @Override
-    protected void onDocumentRead() {
-        try {
-            try {
-                _pagesObject = PagesDocument.Factory.parse(getPackagePart().getInputStream()).getPages();
-            } catch (XmlException e) {
-                throw new POIXMLException(e);
-            } catch (IOException e) {
-                throw new POIXMLException(e);
-            }
-
-            // this iteration is ordered by page number
-            for (PageType pageSettings: _pagesObject.getPageArray()) {
-
-                String relId = pageSettings.getRel().getId();
-
-                POIXMLDocumentPart pageContentsPart = getRelationById(relId);
-                if (pageContentsPart == null)
-                    throw new POIXMLException("PageSettings relationship for " + relId + " not found");
-
-                if (!(pageContentsPart instanceof XDGFPageContents))
-                    throw new POIXMLException("Unexpected pages relationship for " + relId + ": " + pageContentsPart);
-
-                XDGFPageContents contents = (XDGFPageContents)pageContentsPart;
-                XDGFPage page = new XDGFPage(pageSettings, contents, _document, this);
-
-                contents.onDocumentRead();
-
-                _pages.add(page);
-            }
-
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this, e);
-        }
-    }
-
-    /**
-     * @return A list of pages ordered by page number
-     */
-    public List<XDGFPage> getPageList() {
-        return Collections.unmodifiableList(_pages);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
deleted file mode 100644
index 3ab1f91..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLRelation;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.xdgf.xml.XDGFXMLDocumentPart;
-
-public class XDGFRelation extends POIXMLRelation {
-
-    /**
-     * A map to lookup POIXMLRelation by its relation type
-     */
-    private static final Map<String, XDGFRelation> _table = new HashMap<String, XDGFRelation>();
-
-    public static final XDGFRelation DOCUMENT = new XDGFRelation(
-            "application/vnd.ms-visio.drawing.main+xml",
-            PackageRelationshipTypes.VISIO_CORE_DOCUMENT,
-            "/visio/document.xml", null);
-
-    public static final XDGFRelation MASTERS = new XDGFRelation(
-            "application/vnd.ms-visio.masters+xml",
-            "http://schemas.microsoft.com/visio/2010/relationships/masters",
-            "/visio/masters/masters.xml", XDGFMasters.class);
-
-    public static final XDGFRelation MASTER = new XDGFRelation(
-            "application/vnd.ms-visio.master+xml",
-            "http://schemas.microsoft.com/visio/2010/relationships/master",
-            "/visio/masters/master#.xml", XDGFMasterContents.class);
-
-    public static final XDGFRelation IMAGES = new XDGFRelation(null,
-            PackageRelationshipTypes.IMAGE_PART, null, null // XSSFPictureData.class
-            );
-
-    public static final XDGFRelation PAGES = new XDGFRelation(
-            "application/vnd.ms-visio.pages+xml",
-            "http://schemas.microsoft.com/visio/2010/relationships/pages",
-            "/visio/pages/pages.xml", XDGFPages.class);
-
-    public static final XDGFRelation PAGE = new XDGFRelation(
-            "application/vnd.ms-visio.page+xml",
-            "http://schemas.microsoft.com/visio/2010/relationships/page",
-            "/visio/pages/page#.xml", XDGFPageContents.class);
-
-    public static final XDGFRelation WINDOW = new XDGFRelation(
-            "application/vnd.ms-visio.windows+xml",
-            "http://schemas.microsoft.com/visio/2010/relationships/windows",
-            "/visio/windows.xml", null);
-
-    private XDGFRelation(String type, String rel, String defaultName, Class<? extends XDGFXMLDocumentPart> cls) {
-        super(type, rel, defaultName, cls);
-        _table.put(rel, this);
-    }
-
-    /**
-     * Get POIXMLRelation by relation type
-     *
-     * @param rel
-     *            relation type, for example,
-     *            <code>http://schemas.openxmlformats.org/officeDocument/2006/relationships/image</code>
-     * @return registered POIXMLRelation or null if not found
-     */
-    public static XDGFRelation getInstance(String rel) {
-        return _table.get(rel);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
deleted file mode 100644
index 42deac4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
+++ /dev/null
@@ -1,932 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xdgf.exceptions.XDGFException;
-import org.apache.poi.xdgf.usermodel.section.CombinedIterable;
-import org.apache.poi.xdgf.usermodel.section.GeometrySection;
-import org.apache.poi.xdgf.usermodel.section.XDGFSection;
-import org.apache.poi.xdgf.usermodel.shape.ShapeVisitor;
-import org.apache.poi.xdgf.usermodel.shape.exceptions.StopVisitingThisBranch;
-
-import com.microsoft.schemas.office.visio.x2012.main.ShapeSheetType;
-import com.microsoft.schemas.office.visio.x2012.main.TextType;
-
-/**
- * A shape is a collection of Geometry Visualization, Format, Text, Images, and
- * Shape Data in a Drawing Page.
- */
-public class XDGFShape extends XDGFSheet {
-
-    XDGFBaseContents _parentPage;
-    XDGFShape _parent; // only non-null if a subshape
-
-    XDGFMaster _master = null;
-    XDGFShape _masterShape = null;
-
-    XDGFText _text = null;
-
-    // subshapes if they exist
-    List<XDGFShape> _shapes = null;
-
-    // properties specific to shapes
-
-    // center of rotation relative to origin of parent
-    Double _pinX = null;
-    Double _pinY = null;
-
-    Double _width = null;
-    Double _height = null;
-
-    // center of rotation relative to self
-    Double _locPinX = null;
-    Double _locPinY = null;
-
-    // start x coordinate, relative to parent
-    // -> one dimensional shapes only
-    Double _beginX = null;
-    Double _beginY = null;
-
-    // end x coordinate, relative to parent
-    // -> one dimensional shapes only
-    Double _endX = null;
-    Double _endY = null;
-
-    Double _angle = null;
-    Double _rotationXAngle = null;
-    Double _rotationYAngle = null;
-    Double _rotationZAngle = null;
-
-    // end x coordinate, relative to parent
-    Boolean _flipX = null;
-    Boolean _flipY = null;
-
-    // center of text relative to this shape
-    Double _txtPinX = null;
-    Double _txtPinY = null;
-
-    // center of text relative to text block
-    Double _txtLocPinX = null;
-    Double _txtLocPinY = null;
-
-    Double _txtAngle = null;
-
-    Double _txtWidth = null;
-    Double _txtHeight = null;
-
-    public XDGFShape(ShapeSheetType shapeSheet, XDGFBaseContents parentPage,
-            XDGFDocument document) {
-        this(null, shapeSheet, parentPage, document);
-    }
-
-    public XDGFShape(XDGFShape parent, ShapeSheetType shapeSheet,
-            XDGFBaseContents parentPage, XDGFDocument document) {
-
-        super(shapeSheet, document);
-
-        _parent = parent;
-        _parentPage = parentPage;
-
-        TextType text = shapeSheet.getText();
-        if (text != null)
-            _text = new XDGFText(text, this);
-
-        if (shapeSheet.isSetShapes()) {
-            _shapes = new ArrayList<XDGFShape>();
-            for (ShapeSheetType shape : shapeSheet.getShapes().getShapeArray())
-                _shapes.add(new XDGFShape(this, shape, parentPage, document));
-        }
-
-        readProperties();
-    }
-
-    @Override
-    public String toString() {
-        if (_parentPage instanceof XDGFMasterContents)
-            return _parentPage + ": <Shape ID=\"" + getID() + "\">";
-        else
-            return "<Shape ID=\"" + getID() + "\">";
-    }
-
-    protected void readProperties() {
-
-        _pinX = XDGFCell.maybeGetDouble(_cells, "PinX");
-        _pinY = XDGFCell.maybeGetDouble(_cells, "PinY");
-        _width = XDGFCell.maybeGetDouble(_cells, "Width");
-        _height = XDGFCell.maybeGetDouble(_cells, "Height");
-        _locPinX = XDGFCell.maybeGetDouble(_cells, "LocPinX");
-        _locPinY = XDGFCell.maybeGetDouble(_cells, "LocPinY");
-        _beginX = XDGFCell.maybeGetDouble(_cells, "BeginX");
-        _beginY = XDGFCell.maybeGetDouble(_cells, "BeginY");
-        _endX = XDGFCell.maybeGetDouble(_cells, "EndX");
-        _endY = XDGFCell.maybeGetDouble(_cells, "EndY");
-
-        _angle = XDGFCell.maybeGetDouble(_cells, "Angle");
-        _rotationXAngle = XDGFCell.maybeGetDouble(_cells, "RotationXAngle");
-        _rotationYAngle = XDGFCell.maybeGetDouble(_cells, "RotationYAngle");
-        _rotationZAngle = XDGFCell.maybeGetDouble(_cells, "RotationZAngle");
-
-        _flipX = XDGFCell.maybeGetBoolean(_cells, "FlipX");
-        _flipY = XDGFCell.maybeGetBoolean(_cells, "FlipY");
-
-        _txtPinX = XDGFCell.maybeGetDouble(_cells, "TxtPinX");
-        _txtPinY = XDGFCell.maybeGetDouble(_cells, "TxtPinY");
-        _txtLocPinX = XDGFCell.maybeGetDouble(_cells, "TxtLocPinX");
-        _txtLocPinY = XDGFCell.maybeGetDouble(_cells, "TxtLocPinY");
-        _txtWidth = XDGFCell.maybeGetDouble(_cells, "TxtWidth");
-        _txtHeight = XDGFCell.maybeGetDouble(_cells, "TxtHeight");
-
-        _txtAngle = XDGFCell.maybeGetDouble(_cells, "TxtAngle");
-    }
-
-    /**
-     * Setup top level shapes
-     *
-     * Shapes that have a 'Master' attribute refer to a specific master in the
-     * page, whereas shapes with a 'MasterShape' attribute refer to a subshape
-     * of a Master.
-     */
-    protected void setupMaster(XDGFPageContents pageContents,
-            XDGFMasterContents master) {
-
-        ShapeSheetType obj = getXmlObject();
-
-        if (obj.isSetMaster()) {
-            _master = pageContents.getMasterById(obj.getMaster());
-            if (_master == null)
-                throw XDGFException.error("refers to non-existant master "
-                        + obj.getMaster(), this);
-
-            /*
-             * If a master has one top-level shape, a shape that inherits from
-             * that master inherits the descendant elements of that master
-             * shape. If a master has more than one master shape, a shape that
-             * inherits from that master inherits those master shapes as
-             * subshapes.
-             */
-
-            Collection<XDGFShape> masterShapes = _master.getContent()
-                    .getTopLevelShapes();
-
-            switch (masterShapes.size()) {
-            case 0:
-                throw XDGFException
-                .error("Could not retrieve master shape from "
-                        + _master, this);
-            case 1:
-                _masterShape = masterShapes.iterator().next();
-                break;
-            default:
-                break;
-            }
-
-        } else if (obj.isSetMasterShape()) {
-            _masterShape = master.getShapeById(obj.getMasterShape());
-            if (_masterShape == null)
-                throw XDGFException.error(
-                        "refers to non-existant master shape "
-                                + obj.getMasterShape(), this);
-
-        }
-
-        setupSectionMasters();
-
-        if (_shapes != null) {
-            for (XDGFShape shape : _shapes) {
-                shape.setupMaster(pageContents, _master == null ? master
-                        : _master.getContent());
-            }
-        }
-    }
-
-    protected void setupSectionMasters() {
-
-        if (_masterShape == null)
-            return;
-
-        try {
-            for (Entry<String, XDGFSection> section : _sections.entrySet()) {
-                XDGFSection master = _masterShape.getSection(section.getKey());
-                if (master != null)
-                    section.getValue().setupMaster(master);
-            }
-
-            for (Entry<Long, GeometrySection> section : _geometry.entrySet()) {
-                GeometrySection master = _masterShape.getGeometryByIdx(section
-                        .getKey());
-                if (master != null)
-                    section.getValue().setupMaster(master);
-            }
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this.toString(), e);
-        }
-    }
-
-    @Override
-    @Internal
-    public ShapeSheetType getXmlObject() {
-        return (ShapeSheetType) _sheet;
-    }
-
-    public long getID() {
-        return getXmlObject().getID();
-    }
-
-    public String getType() {
-        return getXmlObject().getType();
-    }
-
-    public String getTextAsString() {
-        XDGFText text = getText();
-        if (text == null)
-            return "";
-
-        return text.getTextContent();
-    }
-
-    public boolean hasText() {
-        return _text != null
-                || (_masterShape != null && _masterShape._text != null);
-    }
-
-    @Override
-    public XDGFCell getCell(String cellName) {
-        XDGFCell _cell = super.getCell(cellName);
-
-        // if not found, ask the master
-        if (_cell == null && _masterShape != null) {
-            _cell = _masterShape.getCell(cellName);
-        }
-
-        return _cell;
-    }
-
-    public GeometrySection getGeometryByIdx(long idx) {
-        return _geometry.get(idx);
-    }
-
-    /**
-     * Only available if this shape is a shape group, may be null 
-     */
-    // -> May be null
-    public List<XDGFShape> getShapes() {
-        return _shapes;
-    }
-
-    // unique to this shape on the page?
-    public String getName() {
-        String name = getXmlObject().getName();
-        if (name == null)
-            return "";
-        return name;
-    }
-
-    // unique to this shape on the page?
-    public String getShapeType() {
-        String type = getXmlObject().getType();
-        if (type == null)
-            return "";
-        return type;
-    }
-
-    // name of the symbol that this was derived from
-    public String getSymbolName() {
-
-        if (_master == null)
-            return "";
-
-        String name = _master.getName();
-        if (name == null)
-            return "";
-
-        return name;
-    }
-
-    public XDGFShape getMasterShape() {
-        return _masterShape;
-    }
-
-    /**
-     * @return The parent shape if this is a subshape, null otherwise
-     */
-    public XDGFShape getParentShape() {
-        return _parent;
-    }
-
-    public XDGFShape getTopmostParentShape() {
-        XDGFShape top = null;
-        if (_parent != null) {
-            top = _parent.getTopmostParentShape();
-            if (top == null)
-                top = _parent;
-        }
-
-        return top;
-    }
-
-    public boolean hasMaster() {
-        return _master != null;
-    }
-
-    public boolean hasMasterShape() {
-        return _masterShape != null;
-    }
-
-    public boolean hasParent() {
-        return _parent != null;
-    }
-
-    public boolean hasShapes() {
-        return _shapes != null;
-    }
-
-    public boolean isTopmost() {
-        return _parent == null;
-    }
-
-    public boolean isShape1D() {
-        return getBeginX() != null;
-    }
-
-    public boolean isDeleted() {
-        return getXmlObject().isSetDel() ? getXmlObject().getDel() : false;
-    }
-
-    public XDGFText getText() {
-        if (_text == null && _masterShape != null)
-            return _masterShape.getText();
-
-        return _text;
-    }
-
-    public Double getPinX() {
-        if (_pinX == null && _masterShape != null)
-            return _masterShape.getPinX();
-
-        if (_pinX == null)
-            throw XDGFException.error("PinX not set!", this);
-
-        return _pinX;
-    }
-
-    public Double getPinY() {
-        if (_pinY == null && _masterShape != null)
-            return _masterShape.getPinY();
-
-        if (_pinY == null)
-            throw XDGFException.error("PinY not specified!", this);
-
-        return _pinY;
-    }
-
-    public Double getWidth() {
-        if (_width == null && _masterShape != null)
-            return _masterShape.getWidth();
-
-        if (_width == null)
-            throw XDGFException.error("Width not specified!", this);
-
-        return _width;
-    }
-
-    public Double getHeight() {
-        if (_height == null && _masterShape != null)
-            return _masterShape.getHeight();
-
-        if (_height == null)
-            throw XDGFException.error("Height not specified!", this);
-
-        return _height;
-    }
-
-    public Double getLocPinX() {
-        if (_locPinX == null && _masterShape != null)
-            return _masterShape.getLocPinX();
-
-        if (_locPinX == null)
-            throw XDGFException.error("LocPinX not specified!", this);
-
-        return _locPinX;
-    }
-
-    public Double getLocPinY() {
-        if (_locPinY == null && _masterShape != null)
-            return _masterShape.getLocPinY();
-
-        if (_locPinY == null)
-            throw XDGFException.error("LocPinY not specified!", this);
-
-        return _locPinY;
-    }
-
-    public Double getBeginX() {
-        if (_beginX == null && _masterShape != null)
-            return _masterShape.getBeginX();
-
-        return _beginX;
-    }
-
-    public Double getBeginY() {
-        if (_beginY == null && _masterShape != null)
-            return _masterShape.getBeginY();
-
-        return _beginY;
-    }
-
-    public Double getEndX() {
-        if (_endX == null && _masterShape != null)
-            return _masterShape.getEndX();
-
-        return _endX;
-    }
-
-    public Double getEndY() {
-        if (_endY == null && _masterShape != null)
-            return _masterShape.getEndY();
-
-        return _endY;
-    }
-
-    public Double getAngle() {
-        if (_angle == null && _masterShape != null)
-            return _masterShape.getAngle();
-
-        return _angle;
-    }
-
-    public Boolean getFlipX() {
-        if (_flipX == null && _masterShape != null)
-            return _masterShape.getFlipX();
-
-        return _flipX;
-    }
-
-    public Boolean getFlipY() {
-        if (_flipY == null && _masterShape != null)
-            return _masterShape.getFlipY();
-
-        return _flipY;
-    }
-
-    public Double getTxtPinX() {
-        if (_txtPinX == null && _masterShape != null
-                && _masterShape._txtPinX != null)
-            return _masterShape._txtPinX;
-
-        if (_txtPinX == null)
-            return getWidth() * 0.5;
-
-        return _txtPinX;
-    }
-
-    public Double getTxtPinY() {
-        if (_txtLocPinY == null && _masterShape != null
-                && _masterShape._txtLocPinY != null)
-            return _masterShape._txtLocPinY;
-
-        if (_txtPinY == null)
-            return getHeight() * 0.5;
-
-        return _txtPinY;
-    }
-
-    public Double getTxtLocPinX() {
-        if (_txtLocPinX == null && _masterShape != null
-                && _masterShape._txtLocPinX != null)
-            return _masterShape._txtLocPinX;
-
-        if (_txtLocPinX == null)
-            return getTxtWidth() * 0.5;
-
-        return _txtLocPinX;
-    }
-
-    public Double getTxtLocPinY() {
-        if (_txtLocPinY == null && _masterShape != null
-                && _masterShape._txtLocPinY != null)
-            return _masterShape._txtLocPinY;
-
-        if (_txtLocPinY == null)
-            return getTxtHeight() * 0.5;
-
-        return _txtLocPinY;
-    }
-
-    public Double getTxtAngle() {
-        if (_txtAngle == null && _masterShape != null)
-            return _masterShape.getTxtAngle();
-
-        return _txtAngle;
-    }
-
-    public Double getTxtWidth() {
-        if (_txtWidth == null && _masterShape != null
-                && _masterShape._txtWidth != null)
-            return _masterShape._txtWidth;
-
-        if (_txtWidth == null)
-            return getWidth();
-
-        return _txtWidth;
-    }
-
-    public Double getTxtHeight() {
-        if (_txtHeight == null && _masterShape != null
-                && _masterShape._txtHeight != null)
-            return _masterShape._txtHeight;
-
-        if (_txtHeight == null)
-            return getHeight();
-
-        return _txtHeight;
-    }
-
-    @Override
-    public Integer getLineCap() {
-
-        Integer lineCap = super.getLineCap();
-        if (lineCap != null)
-            return lineCap;
-
-        // get from master
-        if (_masterShape != null) {
-            return _masterShape.getLineCap();
-        }
-
-        // get default
-        return _document.getDefaultLineStyle().getLineCap();
-    }
-
-    @Override
-    public Color getLineColor() {
-
-        Color lineColor = super.getLineColor();
-        if (lineColor != null)
-            return lineColor;
-
-        // get from master
-        if (_masterShape != null) {
-            return _masterShape.getLineColor();
-        }
-
-        // get default
-        return _document.getDefaultLineStyle().getLineColor();
-    }
-
-    @Override
-    public Integer getLinePattern() {
-
-        Integer linePattern = super.getLinePattern();
-        if (linePattern != null)
-            return linePattern;
-
-        // get from master
-        if (_masterShape != null) {
-            return _masterShape.getLinePattern();
-        }
-
-        // get default
-        return _document.getDefaultLineStyle().getLinePattern();
-    }
-
-    @Override
-    public Double getLineWeight() {
-
-        Double lineWeight = super.getLineWeight();
-        if (lineWeight != null)
-            return lineWeight;
-
-        // get from master
-        if (_masterShape != null) {
-            return _masterShape.getLineWeight();
-        }
-
-        // get default
-        return _document.getDefaultLineStyle().getLineWeight();
-    }
-
-    @Override
-    public Color getFontColor() {
-
-        Color fontColor = super.getFontColor();
-        if (fontColor != null)
-            return fontColor;
-
-        // get from master
-        if (_masterShape != null) {
-            return _masterShape.getFontColor();
-        }
-
-        // get default
-        return _document.getDefaultTextStyle().getFontColor();
-    }
-
-    @Override
-    public Double getFontSize() {
-
-        Double fontSize = super.getFontSize();
-        if (fontSize != null)
-            return fontSize;
-
-        // get from master
-        if (_masterShape != null) {
-            return _masterShape.getFontSize();
-        }
-
-        // get default
-        return _document.getDefaultTextStyle().getFontSize();
-    }
-
-    public Stroke getStroke() {
-
-        float lineWeight = getLineWeight().floatValue();
-        int cap;
-        int join = BasicStroke.JOIN_MITER;
-        float miterlimit = 10.0f;
-
-        switch (getLineCap()) {
-        case 0:
-            cap = BasicStroke.CAP_ROUND;
-            break;
-        case 1:
-            cap = BasicStroke.CAP_SQUARE;
-            break;
-        case 2:
-            cap = BasicStroke.CAP_BUTT; // TODO: what does extended mean?
-            break;
-        default:
-            throw new POIXMLException("Invalid line cap specified");
-        }
-
-        float[] dash = null;
-
-        // these line patterns are just approximations
-        switch (getLinePattern()) {
-        case 0: // transparent
-            break;
-        case 1: // solid
-            break;
-        case 2:
-            dash = new float[] { 5, 3 };
-            break;
-        case 3:
-            dash = new float[] { 1, 4 };
-            break;
-        case 4:
-            dash = new float[] { 6, 3, 1, 3 };
-            break;
-        case 5:
-            dash = new float[] { 6, 3, 1, 3, 1, 3 };
-            break;
-        case 6:
-            dash = new float[] { 1, 3, 6, 3, 6, 3 };
-            break;
-        case 7:
-            dash = new float[] { 15, 3, 6, 3 };
-            break;
-        case 8:
-            dash = new float[] { 6, 3, 6, 3 };
-            break;
-        case 9:
-            dash = new float[] { 3, 2 };
-            break;
-        case 10:
-            dash = new float[] { 1, 2 };
-            break;
-        case 11:
-            dash = new float[] { 3, 2, 1, 2 };
-            break;
-        case 12:
-            dash = new float[] { 3, 2, 1, 2, 1 };
-            break;
-        case 13:
-            dash = new float[] { 1, 2, 3, 2, 3, 2 };
-            break;
-        case 14:
-            dash = new float[] { 3, 2, 7, 2 };
-            break;
-        case 15:
-            dash = new float[] { 7, 2, 3, 2, 3, 2 };
-            break;
-        case 16:
-            dash = new float[] { 12, 6 };
-            break;
-        case 17:
-            dash = new float[] { 1, 6 };
-            break;
-        case 18:
-            dash = new float[] { 1, 6, 12, 6 };
-            break;
-        case 19:
-            dash = new float[] { 1, 6, 1, 6, 12, 6 };
-            break;
-        case 20:
-            dash = new float[] { 1, 6, 12, 6, 12, 6 };
-            break;
-        case 21:
-            dash = new float[] { 30, 6, 12, 6 };
-            break;
-        case 22:
-            dash = new float[] { 30, 6, 12, 6, 12, 6 };
-            break;
-        case 23:
-            dash = new float[] { 1 };
-            break;
-        case 254:
-            throw new POIXMLException("Unsupported line pattern value");
-        default:
-            throw new POIXMLException("Invalid line pattern value");
-        }
-
-        // dashes are in units of line width
-        if (dash != null) {
-            for (int i = 0; i < dash.length; i++) {
-                dash[i] *= lineWeight;
-            }
-        }
-
-        return new BasicStroke(lineWeight, cap, join, miterlimit, dash, 0);
-    }
-
-    //
-    // Geometry
-    //
-
-    public Iterable<GeometrySection> getGeometrySections() {
-        return new CombinedIterable<GeometrySection>(_geometry,
-                _masterShape != null ? _masterShape._geometry : null);
-    }
-
-    /**
-     * @return rectangle in local coordinates
-     */
-    public Rectangle2D.Double getBounds() {
-        return new Rectangle2D.Double(0, 0, getWidth(), getHeight());
-    }
-    
-    /**
-     * @return returns bounds as a path in local coordinates, which is
-     *         userful if you need to transform to global coordinates
-     *         
-     * Warning: Don't use this for 1d objects, and will fail for
-     *          infinite line objects
-     */
-    public Path2D.Double getBoundsAsPath() {
-
-        Double w = getWidth();
-        Double h = getHeight();
-
-        Path2D.Double bounds = new Path2D.Double();
-        bounds.moveTo(0, 0);
-        bounds.lineTo(w, 0);
-        bounds.lineTo(w, h);
-        bounds.lineTo(0, h);
-        bounds.lineTo(0, 0);
-
-        return bounds;
-    }
-
-    /**
-     * @return The outline of the shape in local coordinates
-     */
-    public Path2D.Double getPath() {
-        for (GeometrySection geoSection : getGeometrySections()) {
-            if (geoSection.getNoShow() == true)
-                continue;
-
-            return geoSection.getPath(this);
-        }
-
-        return null;
-    }
-
-    /*
-     * Returns true if the shape has a drawable geometry associated with it
-     */
-    public boolean hasGeometry() {
-        for (GeometrySection geoSection : getGeometrySections()) {
-            if (geoSection.getNoShow() == false)
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns a transform that can translate shape-local coordinates to the
-     * coordinates of its parent shape
-     */
-    protected AffineTransform getParentTransform() {
-        // TODO: There's probably a better way to do this
-        AffineTransform tr = new AffineTransform();
-
-        Double locX = getLocPinX();
-        Double locY = getLocPinY();
-        Boolean flipX = getFlipX();
-        Boolean flipY = getFlipY();
-        Double angle = getAngle();
-
-        tr.translate(-locX, -locY);
-
-        tr.translate(getPinX(), getPinY());
-
-        // rotate about the origin
-        if (angle != null && Math.abs(angle) > 0.001) {
-            tr.rotate(angle, locX, locY);
-        }
-
-        // flip if necessary
-
-        if (flipX != null && flipX) {
-            tr.scale(-1, 1);
-            tr.translate(-getWidth(), 0);
-        }
-
-        if (flipY != null && flipY) {
-            tr.scale(1, -1);
-            tr.translate(0, -getHeight());
-        }
-
-        return tr;
-    }
-
-    /**
-     * The visitor will first visit this shape, then it's children
-     *
-     * This is useful because exceptions will be marked with the shapes as it
-     * propagates up the shape hierarchy.
-     */
-    public void visitShapes(ShapeVisitor visitor, AffineTransform tr, int level) {
-
-        tr = (AffineTransform) tr.clone();
-        tr.concatenate(getParentTransform());
-
-        try {
-            if (visitor.accept(this))
-                visitor.visit(this, tr, level);
-
-            if (_shapes != null) {
-                for (XDGFShape shape : _shapes) {
-                    shape.visitShapes(visitor, tr, level + 1);
-                }
-            }
-        } catch (StopVisitingThisBranch e) {
-            // intentionally empty
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this.toString(), e);
-        }
-    }
-
-    /**
-     * The visitor will first visit this shape, then it's children. No transform
-     * is calculated for this visit
-     *
-     * This is useful because exceptions will be marked with the shapes as it
-     * propagates up the shape hierarchy.
-     */
-    public void visitShapes(ShapeVisitor visitor, int level) {
-
-        try {
-            if (visitor.accept(this))
-                visitor.visit(this, null, level);
-
-            if (_shapes != null) {
-                for (XDGFShape shape : _shapes) {
-                    shape.visitShapes(visitor, level + 1);
-                }
-            }
-        } catch (StopVisitingThisBranch e) {
-            // intentionally empty
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this.toString(), e);
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
deleted file mode 100644
index 1cc807f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.awt.Color;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.exceptions.XDGFException;
-import org.apache.poi.xdgf.usermodel.section.CharacterSection;
-import org.apache.poi.xdgf.usermodel.section.GeometrySection;
-import org.apache.poi.xdgf.usermodel.section.XDGFSection;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.SectionType;
-import com.microsoft.schemas.office.visio.x2012.main.SheetType;
-
-/**
- * A sheet is a collection of properties that specify information for a shape,
- * master, drawing page, style, or web drawing.
- */
-public abstract class XDGFSheet {
-
-    protected XDGFDocument _document;
-    protected SheetType _sheet;
-
-    // cells
-    protected Map<String, XDGFCell> _cells = new HashMap<String, XDGFCell>();
-
-    // sections
-    protected Map<String, XDGFSection> _sections = new HashMap<String, XDGFSection>();
-
-    // special: geometry sections (key: index, value: section)
-    protected SortedMap<Long, GeometrySection> _geometry = new TreeMap<Long, GeometrySection>();
-
-    // special: character section
-    protected CharacterSection _character = null;
-
-    public XDGFSheet(SheetType sheet, XDGFDocument document) {
-        try {
-            _sheet = sheet;
-            _document = document;
-
-            for (CellType cell: sheet.getCellArray()) {
-                if (_cells.containsKey(cell.getN()))
-                    throw new POIXMLException("Unexpected duplicate cell " + cell.getN()); // this shouldn't happen
-
-                _cells.put(cell.getN(), new XDGFCell(cell));
-            }
-
-            // only geometry sections can have duplicate names
-            // sections can be found in the master too, if there are no attributes here!
-
-            // no idea if I have a master in this space. go figure.
-
-            for (SectionType section: sheet.getSectionArray()) {
-                String name = section.getN();
-                if (name.equals("Geometry")) {
-                    _geometry.put(section.getIX(), new GeometrySection(section, this));
-                } else if (name.equals("Character")) {
-                    _character = new CharacterSection(section, this);
-                } else {
-                    _sections.put(name, XDGFSection.load(section, this));
-                }
-            }
-        } catch (POIXMLException e) {
-            throw XDGFException.wrap(this.toString(), e);
-        }
-    }
-
-    abstract SheetType getXmlObject();
-
-    public XDGFDocument getDocument() {
-        return _document;
-    }
-
-    /**
-     * A cell is really just a setting
-     *
-     * @param cellName The particular setting you want
-     */
-    public XDGFCell getCell(String cellName) {
-        return _cells.get(cellName);
-    }
-
-    public XDGFSection getSection(String sectionName) {
-        return _sections.get(sectionName);
-    }
-
-    public XDGFStyleSheet getLineStyle() {
-        if (!_sheet.isSetLineStyle())
-            return null;
-
-        return _document.getStyleById(_sheet.getLineStyle());
-    }
-
-    public XDGFStyleSheet getFillStyle() {
-        if (!_sheet.isSetFillStyle())
-            return null;
-
-        return _document.getStyleById(_sheet.getFillStyle());
-    }
-
-    public XDGFStyleSheet getTextStyle() {
-        if (!_sheet.isSetTextStyle())
-            return null;
-
-        return _document.getStyleById(_sheet.getTextStyle());
-    }
-
-    public Color getFontColor() {
-        Color fontColor = null;
-
-        if (_character != null) {
-            fontColor = _character.getFontColor();
-            if (fontColor != null)
-                return fontColor;
-        }
-
-        XDGFStyleSheet style = getTextStyle();
-        if (style != null)
-            return style.getFontColor();
-
-        return null;
-    }
-
-    public Double getFontSize() {
-        Double fontSize = null;
-
-        if (_character != null) {
-            fontSize = _character.getFontSize();
-            if (fontSize != null)
-                return fontSize;
-        }
-
-        XDGFStyleSheet style = getTextStyle();
-        if (style != null)
-            return style.getFontSize();
-
-        return null;
-    }
-
-    public Integer getLineCap() {
-        Integer lineCap = XDGFCell.maybeGetInteger(_cells, "LineCap");
-        if (lineCap != null)
-            return lineCap;
-
-        XDGFStyleSheet style = getLineStyle();
-        if (style != null)
-            return style.getLineCap();
-
-        return null;
-    }
-
-    public Color getLineColor() {
-        String lineColor = XDGFCell.maybeGetString(_cells, "LineColor");
-        if (lineColor != null)
-            return Color.decode(lineColor);
-
-        XDGFStyleSheet style = getLineStyle();
-        if (style != null)
-            return style.getLineColor();
-
-        return null;
-    }
-
-    public Integer getLinePattern() {
-        Integer linePattern = XDGFCell.maybeGetInteger(_cells, "LinePattern");
-        if (linePattern != null)
-            return linePattern;
-
-        XDGFStyleSheet style = getLineStyle();
-        if (style != null)
-            return style.getLinePattern();
-
-        return null;
-    }
-
-    public Double getLineWeight() {
-        Double lineWeight = XDGFCell.maybeGetDouble(_cells, "LineWeight");
-        if (lineWeight != null)
-            return lineWeight;
-
-        XDGFStyleSheet style = getLineStyle();
-        if (style != null)
-            return style.getLineWeight();
-
-        return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
deleted file mode 100644
index 50f6184..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import org.apache.poi.util.Internal;
-
-import com.microsoft.schemas.office.visio.x2012.main.StyleSheetType;
-
-public class XDGFStyleSheet extends XDGFSheet {
-
-    public XDGFStyleSheet(StyleSheetType styleSheet, XDGFDocument document) {
-        super(styleSheet, document);
-    }
-
-    @Override
-    @Internal
-    public StyleSheetType getXmlObject() {
-        return (StyleSheetType) _sheet;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFText.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFText.java
deleted file mode 100644
index f3b24f9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFText.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Path2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.util.Internal;
-
-import com.microsoft.schemas.office.visio.x2012.main.TextType;
-import com.microsoft.schemas.office.visio.x2012.main.impl.TextTypeImpl;
-
-public class XDGFText {
-
-    TextType _text;
-    XDGFShape _parent;
-
-    public XDGFText(TextType text, XDGFShape parent) {
-        _text = text;
-        _parent = parent;
-    }
-
-    @Internal
-    TextType getXmlObject() {
-        return _text;
-    }
-
-    public String getTextContent() {
-        // casting here is wrong, but there's no other way of getting the value,
-        // as it doesn't seem to be exposed by complex types (even though this
-        // is a mixed type)
-        return ((TextTypeImpl) _text).getStringValue();
-    }
-    
-    /**
-     * These are in the shape coordinate system
-     *
-     * @see <a href="https://msdn.microsoft.com/en-us/library/hh644132(v=office.12).aspx">Text Block Coordinate System docs</a>
-     */
-    public Rectangle2D.Double getTextBounds() {
-
-        double txtPinX = _parent.getTxtPinX();
-        double txtPinY = _parent.getTxtPinY();
-
-        double txtLocPinX = _parent.getTxtLocPinX();
-        double txtLocPinY = _parent.getTxtLocPinY();
-
-        double txtWidth = _parent.getTxtWidth();
-        double txtHeight = _parent.getTxtHeight();
-
-        double x = txtPinX - txtLocPinX;
-        double y = txtPinY - txtLocPinY;
-
-        return new Rectangle2D.Double(x, y, txtWidth, txtHeight);
-    }
-
-    /**
-     * @return Text bounds as a path in local coordinates, which is useful
-     *         if you need to transform to global coordinates
-     */
-    public Path2D.Double getBoundsAsPath() {
-
-        Rectangle2D.Double rect = getTextBounds();
-        Double w = rect.getWidth();
-        Double h = rect.getHeight();
-
-        Path2D.Double bounds = new Path2D.Double();
-        bounds.moveTo(0, 0);
-        bounds.lineTo(w, 0);
-        bounds.lineTo(w, h);
-        bounds.lineTo(0, h);
-        bounds.lineTo(0, 0);
-
-        return bounds;
-    }
-    
-    /**
-     * @return Center of text in local coordinates
-     */
-    public Point2D.Double getTextCenter() {
-        return new Point2D.Double(_parent.getTxtLocPinX(),
-                _parent.getTxtLocPinY());
-    }
-
-    /**
-     * When calling this to draw text, it assumes graphics is set properly
-     * to draw in the right style.
-     */
-    public void draw(Graphics2D graphics) {
-
-        String textContent = getTextContent();
-        if (textContent.length() == 0)
-            return;
-
-        Rectangle2D.Double bounds = getTextBounds();
-
-        String[] lines = textContent.trim().split("\n");
-        FontRenderContext frc = graphics.getFontRenderContext();
-        Font font = graphics.getFont();
-
-        AffineTransform oldTr = graphics.getTransform();
-
-        // visio is in flipped coordinates, so translate the text to be in the
-        // right place
-        Boolean flipX = _parent.getFlipX();
-        Boolean flipY = _parent.getFlipY();
-
-        if (flipY == null || !_parent.getFlipY()) {
-            graphics.translate(bounds.x, bounds.y);
-            graphics.scale(1, -1);
-            graphics.translate(0, -bounds.height
-                    + graphics.getFontMetrics().getMaxCharBounds(graphics)
-                    .getHeight());
-        }
-
-        if (flipX != null && _parent.getFlipX()) {
-            graphics.scale(-1, 1);
-            graphics.translate(-bounds.width, 0);
-        }
-
-        Double txtAngle = _parent.getTxtAngle();
-        if (txtAngle != null && Math.abs(txtAngle) > 0.01)
-            graphics.rotate(txtAngle);
-
-        float nextY = 0;
-        for (String line : lines) {
-
-            if (line.length() == 0)
-                continue;
-
-            TextLayout layout = new TextLayout(line, font, frc);
-
-            if (layout.isLeftToRight())
-                layout.draw(graphics, 0, nextY);
-            else
-                layout.draw(graphics,
-                        (float) (bounds.width - layout.getAdvance()), nextY);
-
-            nextY += layout.getAscent() + layout.getDescent()
-                    + layout.getLeading();
-        }
-
-        graphics.setTransform(oldTr);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
deleted file mode 100644
index 8794874..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.util.PackageHelper;
-import org.apache.xmlbeans.XmlException;
-
-import com.microsoft.schemas.office.visio.x2012.main.VisioDocumentDocument1;
-import com.microsoft.schemas.office.visio.x2012.main.VisioDocumentType;
-
-/**
- * This is your high-level starting point for working with Visio XML
- * documents (.vsdx).
- * 
- * Currently, only read support has been implemented, and the API is
- * not mature and is subject to change.
- * 
- * For more information about the visio XML format (with an XSD 1.0
- * schema), you can find documentation at
- * https://msdn.microsoft.com/en-us/library/hh645006(v=office.12).aspx
- * 
- * That document lacks in some areas, but you can find additional
- * documentation and an updated XSD 1.1 schema at
- * https://msdn.microsoft.com/en-us/library/office/jj684209(v=office.15).aspx
- * 
- * Each provides different details, but the SharePoint reference
- * has better documentation and is more useful.
- */
-public class XmlVisioDocument extends POIXMLDocument {
-
-    protected XDGFPages _pages;
-    protected XDGFMasters _masters;
-    protected XDGFDocument _document;
-
-    public XmlVisioDocument(OPCPackage pkg) throws IOException {
-        super(pkg, PackageRelationshipTypes.VISIO_CORE_DOCUMENT);
-
-        VisioDocumentType document;
-
-        try {
-            document = VisioDocumentDocument1.Factory.parse(getPackagePart().getInputStream()).getVisioDocument();
-        } catch (XmlException e) {
-            throw new POIXMLException(e);
-        } catch (IOException e) {
-            throw new POIXMLException(e);
-        }
-
-        _document = new XDGFDocument(document);
-
-        //build a tree of POIXMLDocumentParts, this document being the root
-        load(new XDGFFactory(_document));
-    }
-
-    public XmlVisioDocument(InputStream is) throws IOException {
-        this(PackageHelper.open(is));
-    }
-
-    @Override
-    protected void onDocumentRead() throws IOException {
-
-        // by the time this gets called, all other document parts should
-        // have been loaded, so it's safe to build the document structure
-
-        // note that in other onDocumentRead(), relations/etc may not have
-        // loaded yet, so it's not quite safe
-
-        for (POIXMLDocumentPart part : getRelations()) {
-
-            // organize the document pieces
-            if (part instanceof XDGFPages)
-                _pages = (XDGFPages) part;
-
-            else if (part instanceof XDGFMasters)
-                _masters = (XDGFMasters) part;
-        }
-
-        if (_masters != null)
-            _masters.onDocumentRead();
-
-        _pages.onDocumentRead();
-    }
-
-    /**
-     * Not currently implemented
-     */
-    @Override
-    public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
-        return new ArrayList<PackagePart>();
-    }
-
-    //
-    // Useful public API goes here
-    //
-    
-    /**
-     * @return pages ordered by page number
-     */
-    public Collection<XDGFPage> getPages() {
-        return _pages.getPageList();
-    }
-
-    public XDGFStyleSheet getStyleById(long id) {
-        return _document.getStyleById(id);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
deleted file mode 100644
index 7c1aa3f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section;
-
-import java.awt.Color;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFSheet;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-import com.microsoft.schemas.office.visio.x2012.main.SectionType;
-
-public class CharacterSection extends XDGFSection {
-
-    Double _fontSize = null;
-    Color _fontColor = null;
-
-    Map<String, XDGFCell> _characterCells = new HashMap<String, XDGFCell>();
-
-    public CharacterSection(SectionType section, XDGFSheet containingSheet) {
-        super(section, containingSheet);
-
-        // there aren't cells for this, just a single row
-        RowType row = section.getRowArray(0);
-
-        for (CellType cell: row.getCellArray()) {
-            _characterCells.put(cell.getN(), new XDGFCell(cell));
-        }
-
-        _fontSize = XDGFCell.maybeGetDouble(_characterCells, "Size");
-
-        String tmpColor = XDGFCell.maybeGetString(_characterCells, "Color");
-        if (tmpColor != null)
-            _fontColor = Color.decode(tmpColor);
-    }
-
-    public Double getFontSize() {
-        return _fontSize;
-    }
-
-    public Color getFontColor() {
-        return _fontColor;
-    }
-
-    @Override
-    public void setupMaster(XDGFSection section) {
-
-    }
-
-}
-
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
deleted file mode 100644
index bca48bc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.SortedMap;
-
-/**
- * An iterator used to iterate over the base and master items
- *
- * @param <T>
- */
-public class CombinedIterable<T> implements Iterable<T> {
-
-    final SortedMap<Long, T> _baseItems;
-    final SortedMap<Long, T> _masterItems;
-
-    public CombinedIterable(SortedMap<Long, T> baseItems,
-            SortedMap<Long, T> masterItems) {
-        _baseItems = baseItems;
-        _masterItems = masterItems;
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-
-        final Iterator<Entry<Long, T>> vmasterI;
-
-        if (_masterItems != null) {
-            vmasterI = _masterItems.entrySet().iterator();
-        } else {
-            final Set<Entry<Long, T>> empty = Collections.emptySet();
-            vmasterI = empty.iterator();
-        }
-
-        return new Iterator<T>() {
-
-            Long lastI = Long.MIN_VALUE;
-
-            Entry<Long, T> currentBase = null;
-            Entry<Long, T> currentMaster = null;
-
-            // grab the iterator for both
-            Iterator<Entry<Long, T>> baseI = _baseItems.entrySet().iterator();
-            Iterator<Entry<Long, T>> masterI = vmasterI;
-
-            @Override
-            public boolean hasNext() {
-                return currentBase != null || currentMaster != null
-                        || baseI.hasNext() || masterI.hasNext();
-            }
-
-            @Override
-            public T next() {
-
-                // TODO: This seems far more complex than it needs to be
-
-                long baseIdx = Long.MAX_VALUE;
-                long masterIdx = Long.MAX_VALUE;
-
-                if (currentBase == null) {
-                    while (baseI.hasNext()) {
-                        currentBase = baseI.next();
-                        if (currentBase.getKey() > lastI) {
-                            baseIdx = currentBase.getKey();
-                            break;
-                        }
-                    }
-                } else {
-                    baseIdx = currentBase.getKey();
-                }
-
-                if (currentMaster == null) {
-                    while (masterI.hasNext()) {
-                        currentMaster = masterI.next();
-                        if (currentMaster.getKey() > lastI) {
-                            masterIdx = currentMaster.getKey();
-                            break;
-                        }
-                    }
-                } else {
-                    masterIdx = currentMaster.getKey();
-                }
-
-                T val;
-
-                if (currentBase != null) {
-
-                    if (baseIdx <= masterIdx) {
-                        lastI = baseIdx;
-                        val = currentBase.getValue();
-
-                        // discard master if same as base
-                        if (masterIdx == baseIdx) {
-                            currentMaster = null;
-                        }
-
-                        currentBase = null;
-
-                    } else {
-                        lastI = masterIdx;
-                        val = currentMaster.getValue();
-                        currentMaster = null;
-                    }
-
-                } else if (currentMaster != null) {
-                    lastI = currentMaster.getKey();
-                    val = currentMaster.getValue();
-
-                    currentMaster = null;
-                } else {
-                    throw new NoSuchElementException();
-                }
-
-                return val;
-            }
-
-            @Override
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
deleted file mode 100644
index b0ecf20..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section;
-
-import org.apache.poi.xdgf.usermodel.XDGFSheet;
-
-import com.microsoft.schemas.office.visio.x2012.main.SectionType;
-
-public class GenericSection extends XDGFSection {
-
-    public GenericSection(SectionType section, XDGFSheet containingSheet) {
-        super(section, containingSheet);
-    }
-
-    @Override
-    public void setupMaster(XDGFSection section) {
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
deleted file mode 100644
index bc7cdf6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section;
-
-import java.awt.geom.Path2D;
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.geom.SplineCollector;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-import org.apache.poi.xdgf.usermodel.XDGFSheet;
-import org.apache.poi.xdgf.usermodel.section.geometry.Ellipse;
-import org.apache.poi.xdgf.usermodel.section.geometry.GeometryRow;
-import org.apache.poi.xdgf.usermodel.section.geometry.GeometryRowFactory;
-import org.apache.poi.xdgf.usermodel.section.geometry.InfiniteLine;
-import org.apache.poi.xdgf.usermodel.section.geometry.SplineKnot;
-import org.apache.poi.xdgf.usermodel.section.geometry.SplineStart;
-
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-import com.microsoft.schemas.office.visio.x2012.main.SectionType;
-
-public class GeometrySection extends XDGFSection {
-
-    GeometrySection _master = null;
-
-    // rows
-    SortedMap<Long, GeometryRow> _rows = new TreeMap<Long, GeometryRow>();
-
-    public GeometrySection(SectionType section, XDGFSheet containingSheet) {
-        super(section, containingSheet);
-
-        for (RowType row: section.getRowArray()) {
-            if (_rows.containsKey(row.getIX()))
-                throw new POIXMLException("Index element '" + row.getIX() + "' already exists");
-
-            _rows.put(row.getIX(), GeometryRowFactory.load(row));
-        }
-    }
-
-    @Override
-    public void setupMaster(XDGFSection master) {
-
-        _master = (GeometrySection)master;
-
-        for (Entry<Long, GeometryRow> entry : _rows.entrySet()) {
-            GeometryRow masterRow = _master._rows.get(entry.getKey());
-            if (masterRow != null) {
-                try {
-                    entry.getValue().setupMaster(masterRow);
-                } catch (ClassCastException e) {
-                    // this can happen when a dynamic connector overrides its master's geometry
-                    // .. probably can happen elsewhere too, I imagine.
-                    //throw XDGFException.error("Mismatched geometry section '" + entry.getKey() + "' in master", this, e);
-                }
-            }
-        }
-    }
-
-    // returns True if this row shouldn't be displayed
-    public Boolean getNoShow() {
-        Boolean noShow = XDGFCell.maybeGetBoolean(_cells, "NoShow");
-        if (noShow == null) {
-            if (_master != null)
-                return _master.getNoShow();
-
-            return false;
-        }
-
-        return noShow;
-    }
-
-    public Iterable<GeometryRow> getCombinedRows() {
-        return new CombinedIterable<GeometryRow>(_rows,
-                _master == null ? null : _master._rows);
-    }
-
-    public Path2D.Double getPath(XDGFShape parent) {
-
-        Iterator<GeometryRow> rows = getCombinedRows().iterator();
-
-        // special cases
-        GeometryRow first = rows.next();
-
-        if (first instanceof Ellipse) {
-            return ((Ellipse)first).getPath();
-        } else if (first instanceof InfiniteLine) {
-            return ((InfiniteLine)first).getPath();
-        } else if (first instanceof SplineStart) {
-            throw new POIXMLException("SplineStart must be preceded by another type");
-        } else {
-
-            // everything else is a path
-            Path2D.Double path = new Path2D.Double();
-
-            // dealing with splines makes this more complex
-            SplineCollector renderer = null;
-            GeometryRow row;
-
-            while (true) {
-
-                if (first != null) {
-                    row = first;
-                    first = null;
-                } else {
-                    if (!rows.hasNext())
-                        break;
-                    row = rows.next();
-                }
-
-                if (row instanceof SplineStart) {
-                    if (renderer != null)
-                        throw new POIXMLException("SplineStart found multiple times!");
-                    renderer = new SplineCollector((SplineStart) row);
-                } else if (row instanceof SplineKnot) {
-                    if (renderer == null)
-                        throw new POIXMLException("SplineKnot found without SplineStart!");
-                    renderer.addKnot((SplineKnot) row);
-                } else {
-                    if (renderer != null) {
-                        renderer.addToPath(path, parent);
-                        renderer = null;
-                    }
-
-                    row.addToPath(path, parent);
-                }
-            }
-
-            // just in case we end iteration
-            if (renderer != null)
-                renderer.addToPath(path, parent);
-
-            return path;
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
deleted file mode 100644
index 1448a60..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFSheet;
-import org.apache.poi.xdgf.util.ObjectFactory;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.SectionType;
-
-public abstract class XDGFSection {
-
-    static final ObjectFactory<XDGFSection, SectionType> _sectionTypes;
-
-    static {
-        _sectionTypes = new ObjectFactory<XDGFSection, SectionType>();
-        try {
-            _sectionTypes.put("LineGradient", 	GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("FillGradient", 	GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Character", 		CharacterSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Paragraph", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Tabs", 			GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Scratch", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Connection", 	GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("ConnectionABCD", GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Field", 			GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Control", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Geometry", 		GeometrySection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Actions", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Layer", 			GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("User", 			GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Property", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Hyperlink", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Reviewer", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("Annotation", 	GenericSection.class, SectionType.class, XDGFSheet.class);
-            _sectionTypes.put("ActionTag", 		GenericSection.class, SectionType.class, XDGFSheet.class);
-        } catch (NoSuchMethodException e) {
-            throw new POIXMLException("Internal error");
-        } catch (SecurityException e) {
-            throw new POIXMLException("Internal error");
-        }
-
-    }
-
-    public static XDGFSection load(SectionType section, XDGFSheet containingSheet) {
-        return _sectionTypes.load(section.getN(), section, containingSheet);
-    }
-
-
-    protected SectionType _section;
-    protected XDGFSheet _containingSheet;
-
-    protected Map<String, XDGFCell> _cells = new HashMap<String, XDGFCell>();
-
-
-    public XDGFSection(SectionType section, XDGFSheet containingSheet) {
-        _section = section;
-        _containingSheet = containingSheet;
-
-        // only store cells in the base, not rows -- because rows are handled
-        // specially for geometry sections
-        for (CellType cell: section.getCellArray()) {
-            _cells.put(cell.getN(), new XDGFCell(cell));
-        }
-    }
-
-    @Internal
-    public SectionType getXmlObject() {
-        return _section;
-    }
-
-    @Override
-    public String toString() {
-        return "<Section type=" + _section.getN() + " from " + _containingSheet + ">";
-    }
-
-    public abstract void setupMaster(XDGFSection section);
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
deleted file mode 100644
index fdcce80..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Point2D;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class ArcTo implements GeometryRow {
-
-    ArcTo _master = null;
-
-    // The x-coordinate of the ending vertex of an arc.
-    Double x = null;
-
-    // The y-coordinate of the ending vertex of an arc.
-    Double y = null;
-
-    // The distance from the arc's midpoint to the midpoint of its chord.
-    Double a = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public ArcTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in ArcTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (ArcTo) row;
-    }
-
-    @Override
-    public void addToPath(Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        Point2D last = path.getCurrentPoint();
-
-        // intentionally shadowing variables here
-        double x = getX();
-        double y = getY();
-        double a = getA();
-
-        if (a == 0) {
-            path.lineTo(x, y);
-            return;
-        }
-
-        double x0 = last.getX();
-        double y0 = last.getY();
-
-        double chordLength = Math.hypot(y - y0, x - x0);
-        double radius = (4 * a * a + chordLength * chordLength)
-                / (8 * Math.abs(a));
-
-        // center point
-        double cx = x0 + (x - x0) / 2.0;
-        double cy = y0 + (y - y0) / 2.0;
-
-        double rotate = Math.atan2(y - cy, x - cx);
-
-        Arc2D arc = new Arc2D.Double(x0, y0 - radius, chordLength, 2 * radius,
-                180, x0 < x ? 180 : -180, Arc2D.OPEN);
-
-        path.append(AffineTransform.getRotateInstance(rotate, x0, y0)
-                .createTransformedShape(arc), true);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
deleted file mode 100644
index 01eecdd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Path2D;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class Ellipse implements GeometryRow {
-
-    Ellipse _master = null;
-
-    // x coordinate of center point
-    Double x = null;
-    // y coordinate of center point
-    Double y = null;
-
-    // x coordinate of first point on ellipse
-    Double a = null;
-    // y coordinate of first point on ellipse
-    Double b = null;
-
-    // x coordinate of second point on ellipse
-    Double c = null;
-    // y coordinate of second point on ellipse
-    Double d = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public Ellipse(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("C")) {
-                c = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("D")) {
-                d = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in Ellipse row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    public Double getC() {
-        return c == null ? _master.c : c;
-    }
-
-    public Double getD() {
-        return d == null ? _master.d : d;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (Ellipse) row;
-    }
-
-    public Path2D.Double getPath() {
-
-        if (getDel())
-            return null;
-
-        // intentionally shadowing variables here
-        double cx = getX(); // center
-        double cy = getY();
-        double a = getA(); // left
-        double b = getB();
-        double c = getC(); // top
-        double d = getD();
-
-        // compute radius
-        double rx = Math.hypot(a - cx, b - cy);
-        double ry = Math.hypot(c - cx, d - cy);
-
-        // compute angle of ellipse
-        double angle = (2.0 * Math.PI + (cy > b ? 1.0 : -1.0)
-                * Math.acos((cx - a) / rx))
-                % (2.0 * Math.PI);
-
-        // create ellipse
-        Ellipse2D.Double ellipse = new Ellipse2D.Double(cx - rx, cy - ry,
-                rx * 2, ry * 2);
-
-        // create a path, rotate it about its center
-        Path2D.Double path = new Path2D.Double(ellipse);
-
-        AffineTransform tr = new AffineTransform();
-        tr.rotate(angle, cx, cy);
-        path.transform(tr);
-
-        return path;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        throw new POIXMLException("Ellipse elements cannot be part of a path");
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
deleted file mode 100644
index 02fc5ae..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Point2D;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class EllipticalArcTo implements GeometryRow {
-
-    EllipticalArcTo _master = null;
-
-    // The x-coordinate of the ending vertex on an arc.
-    Double x = null;
-
-    // The y-coordinate of the ending vertex on an arc.
-    Double y = null;
-
-    // The x-coordinate of the arc's control point; a point on the arc. The
-    // control point is best located about halfway between the beginning and
-    // ending vertices of the arc. Otherwise, the arc may grow to an extreme
-    // size in order to pass through the control point, with unpredictable
-    // results.
-    Double a = null;
-
-    // The y-coordinate of an arc's control point.
-    Double b = null;
-
-    // The angle of an arc's major axis relative to the x-axis of its parent
-    // shape.
-    Double c = null;
-
-    // The ratio of an arc's major axis to its minor axis. Despite the usual
-    // meaning of these words, the "major" axis does not have to be greater than
-    // the "minor" axis, so this ratio does not have to be greater than 1.
-    // Setting this cell to a value less than or equal to 0 or greater than 1000
-    // can lead to unpredictable results.
-    Double d = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public EllipticalArcTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("C")) {
-                c = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("D")) {
-                d = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in EllipticalArcTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    public Double getC() {
-        return c == null ? _master.c : c;
-    }
-
-    public Double getD() {
-        return d == null ? _master.d : d;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (EllipticalArcTo) row;
-    }
-
-    public static int draw = 0;
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        // intentionally shadowing variables here
-        double x = getX();
-        double y = getY();
-        double a = getA();
-        double b = getB();
-        double c = getC();
-        double d = getD();
-
-        createEllipticalArc(x, y, a, b, c, d, path);
-    }
-
-    public static void createEllipticalArc(double x, double y, double a,
-            double b, double c, double d, java.awt.geom.Path2D.Double path) {
-
-        // Formula for center of ellipse by Junichi Yoda & nashwaan:
-        // -> From http://visguy.com/vgforum/index.php?topic=2464.0
-        //
-        // x1,y1 = start; x2,y2 = end; x3,y3 = control point
-        //
-        // x0 =
-        // ((x1-x2)*(x1+x2)*(y2-y3)-(x2-x3)*(x2+x3)*(y1-y2)+D^2*(y1-y2)*(y2-y3)*(y1-y3))/(2*((x1-x2)*(y2-y3)-(x2-x3)*(y1-y2)))
-        // y0 =
-        // ((x1-x2)*(x2-x3)*(x1-x3)/D^2+(x2-x3)*(y1-y2)*(y1+y2)-(x1-x2)*(y2-y3)*(y2+y3))/(2*((x2-x3)*(y1-y2)-(x1-x2)*(y2-y3)))
-        // radii along axis: a = sqrt{ (x1-x0)^2 + (y1-y0)^2 * D^2 }
-        //
-
-        Point2D last = path.getCurrentPoint();
-        double x0 = last.getX();
-        double y0 = last.getY();
-
-        // translate all of the points to the same angle as the ellipse
-        AffineTransform at = AffineTransform.getRotateInstance(-c);
-        double[] pts = new double[] { x0, y0, x, y, a, b };
-        at.transform(pts, 0, pts, 0, 3);
-
-        x0 = pts[0];
-        y0 = pts[1];
-        x = pts[2];
-        y = pts[3];
-        a = pts[4];
-        b = pts[5];
-
-        // nasty math time
-
-        double d2 = d * d;
-        double cx = ((x0 - x) * (x0 + x) * (y - b) - (x - a) * (x + a)
-                * (y0 - y) + d2 * (y0 - y) * (y - b) * (y0 - b))
-                / (2.0 * ((x0 - x) * (y - b) - (x - a) * (y0 - y)));
-        double cy = ((x0 - x) * (x - a) * (x0 - a) / d2 + (x - a) * (y0 - y)
-                * (y0 + y) - (x0 - x) * (y - b) * (y + b))
-                / (2.0 * ((x - a) * (y0 - y) - (x0 - x) * (y - b)));
-
-        // calculate radii of ellipse
-        double rx = Math.sqrt(Math.pow(x0 - cx, 2) + Math.pow(y0 - cy, 2) * d2);
-        double ry = rx / d;
-
-        // Arc2D requires us to draw an arc from one point to another, so we
-        // need to calculate the angle of the start point and end point along
-        // the ellipse
-        // - Derived from parametric form of ellipse: x = h + a*cos(t); y = k +
-        // b*sin(t)
-
-        double ctrlAngle = Math.toDegrees(Math.atan2((b - cy) / ry, (a - cx)
-                / rx));
-        double startAngle = Math.toDegrees(Math.atan2((y0 - cy) / ry, (x0 - cx)
-                / rx));
-        double endAngle = Math.toDegrees(Math.atan2((y - cy) / ry, (x - cx)
-                / rx));
-
-        double sweep = computeSweep(startAngle, endAngle, ctrlAngle);
-
-        // Now we have enough information to go on. Create the arc.
-        Arc2D arc = new Arc2D.Double(cx - rx, cy - ry, rx * 2, ry * 2,
-                -startAngle, sweep, Arc2D.OPEN);
-
-        // rotate the arc back to the original coordinate system
-        at.setToRotation(c);
-        path.append(at.createTransformedShape(arc), false);
-    }
-
-    protected static double computeSweep(double startAngle, double endAngle,
-            double ctrlAngle) {
-        double sweep;
-
-        startAngle = (360.0 + startAngle) % 360.0;
-        endAngle = (360.0 + endAngle) % 360.0;
-        ctrlAngle = (360.0 + ctrlAngle) % 360.0;
-
-        // different sweeps depending on where the control point is
-
-        if (startAngle < endAngle) {
-            if (startAngle < ctrlAngle && ctrlAngle < endAngle) {
-                sweep = startAngle - endAngle;
-            } else {
-                sweep = 360 + (startAngle - endAngle);
-            }
-        } else {
-            if (endAngle < ctrlAngle && ctrlAngle < startAngle) {
-                sweep = startAngle - endAngle;
-            } else {
-                sweep = -(360 - (startAngle - endAngle));
-            }
-        }
-
-        return sweep;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
deleted file mode 100644
index 8ffaef2..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import java.awt.geom.Path2D;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-public interface GeometryRow {
-
-    public void setupMaster(GeometryRow row);
-
-    public void addToPath(Path2D.Double path, XDGFShape parent);
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
deleted file mode 100644
index 50e85e8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.util.ObjectFactory;
-
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class GeometryRowFactory {
-
-    static final ObjectFactory<GeometryRow, RowType> _rowTypes;
-
-    static {
-        _rowTypes = new ObjectFactory<GeometryRow, RowType>();
-        try {
-            _rowTypes.put("ArcTo", ArcTo.class, RowType.class);
-            _rowTypes.put("Ellipse", Ellipse.class, RowType.class);
-            _rowTypes.put("EllipticalArcTo", EllipticalArcTo.class,
-                    RowType.class);
-            _rowTypes.put("InfiniteLine", InfiniteLine.class, RowType.class);
-            _rowTypes.put("LineTo", LineTo.class, RowType.class);
-            _rowTypes.put("MoveTo", MoveTo.class, RowType.class);
-            _rowTypes.put("NURBSTo", NURBSTo.class, RowType.class);
-            _rowTypes.put("PolyLineTo", PolyLineTo.class, RowType.class);
-            _rowTypes.put("RelCubBezTo", RelCubBezTo.class, RowType.class);
-            _rowTypes.put("RelEllipticalArcTo", RelEllipticalArcTo.class,
-                    RowType.class);
-            _rowTypes.put("RelLineTo", RelLineTo.class, RowType.class);
-            _rowTypes.put("RelMoveTo", RelMoveTo.class, RowType.class);
-            _rowTypes.put("RelQuadBezTo", RelQuadBezTo.class, RowType.class);
-            _rowTypes.put("SplineKnot", SplineKnot.class, RowType.class);
-            _rowTypes.put("SplineStart", SplineStart.class, RowType.class);
-        } catch (NoSuchMethodException e) {
-            throw new POIXMLException("Internal error", e);
-        } catch (SecurityException e) {
-            throw new POIXMLException("Internal error", e);
-        }
-
-    }
-
-    public static GeometryRow load(RowType row) {
-        return _rowTypes.load(row.getT(), row);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
deleted file mode 100644
index 6965c1b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import java.awt.geom.Path2D;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-/**
- * Contains the x- and y-coordinates of two points on an infinite line.
- */
-public class InfiniteLine implements GeometryRow {
-
-    InfiniteLine _master = null;
-
-    // An x-coordinate of a point on the infinite line; paired with y-coordinate
-    // represented by the Y cell.
-    Double x = null;
-
-    // A y-coordinate of a point on the infinite line; paired with x-coordinate
-    // represented by the X cell.
-    Double y = null;
-
-    // An x-coordinate of a point on the infinite line; paired with y-coordinate
-    // represented by the B cell.
-    Double a = null;
-
-    // A y-coordinate of a point on an infinite line; paired with x-coordinate
-    // represented by the A cell.
-    Double b = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public InfiniteLine(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in InfiniteLine row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (InfiniteLine) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        throw new POIXMLException(
-                "InfiniteLine elements cannot be part of a path");
-    }
-
-    // returns this object as a line that extends between the boundaries of
-    // the document
-    public Path2D.Double getPath() {
-        Path2D.Double path = new Path2D.Double();
-
-        // this is a bit of a hack, but it works
-        double max_val = 100000;
-
-        // compute slope..
-        double x0 = getX();
-        double y0 = getY();
-        double x1 = getA(); // second x
-        double y1 = getB(); // second y
-
-        if (x0 == x1) {
-            path.moveTo(x0, -max_val);
-            path.lineTo(x0, max_val);
-        } else if (y0 == y1) {
-            path.moveTo(-max_val, y0);
-            path.lineTo(max_val, y0);
-        } else {
-
-            // normal case: compute slope/intercept
-            double m = (y1 - y0) / (x1 - x0);
-            double c = y0 - m * x0;
-
-            // y = mx + c
-
-            path.moveTo(max_val, m * max_val + c);
-            path.lineTo(max_val, (max_val - c) / m);
-        }
-
-        return path;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
deleted file mode 100644
index 93857f0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class LineTo implements GeometryRow {
-
-    LineTo _master = null;
-
-    Double x = null;
-    Double y = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public LineTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in LineTo row");
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "LineTo: x=" + getX() + "; y=" + getY();
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (LineTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        if (getDel())
-            return;
-        path.lineTo(getX(), getY());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
deleted file mode 100644
index 6dca12b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-/**
- * Contains the x- and y-coordinates of the first vertex of a shape or the x-
- * and y-coordinates of the first vertex after a break in a path, relative to
- * the height and width of the shape.
- */
-public class MoveTo implements GeometryRow {
-
-    MoveTo _master = null;
-
-    Double x = null;
-    Double y = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public MoveTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in MoveTo row");
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "MoveTo: x=" + getX() + "; y=" + getY();
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (MoveTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        if (getDel())
-            return;
-        path.moveTo(getX(), getY());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
deleted file mode 100644
index 353d694..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import java.awt.geom.Point2D;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.geom.SplineRenderer;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.graphbuilder.curve.ControlPath;
-import com.graphbuilder.curve.ShapeMultiPath;
-import com.graphbuilder.curve.ValueVector;
-import com.graphbuilder.geom.PointFactory;
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class NURBSTo implements GeometryRow {
-
-    NURBSTo _master = null;
-
-    // The x-coordinate of the last control point of a NURBS.
-    Double x = null;
-
-    // The y-coordinate of the last control point of a NURBS.
-    Double y = null;
-
-    // The second to the last knot of the NURBS.
-    Double a = null;
-
-    // The last weight of the NURBS.
-    Double b = null;
-
-    // The first knot of the NURBS.
-    Double c = null;
-
-    // The first weight of the NURBS.
-    Double d = null;
-
-    // A NURBS formula.
-    String e = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public NURBSTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("C")) {
-                c = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("D")) {
-                d = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("E")) {
-                e = cell.getV();
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in NURBS row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    public Double getC() {
-        return c == null ? _master.c : c;
-    }
-
-    public Double getD() {
-        return d == null ? _master.d : d;
-    }
-
-    public String getE() {
-        return e == null ? _master.e : e;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (NURBSTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        if (getDel())
-            return;
-
-        Point2D last = path.getCurrentPoint();
-
-        // A NURBS formula: knotLast, degree, xType, yType, x1, y1, knot1,
-        // weight1, ..
-        String formula = getE().trim();
-        if (!formula.startsWith("NURBS(") || !formula.endsWith(")"))
-            throw new POIXMLException("Invalid NURBS formula: " + formula);
-
-        String[] components = formula.substring(6, formula.length() - 1).split(
-                ",");
-
-        if (components.length < 8)
-            throw new POIXMLException(
-                    "Invalid NURBS formula (not enough arguments)");
-
-        if ((components.length - 4) % 4 != 0)
-            throw new POIXMLException(
-                    "Invalid NURBS formula -- need 4 + n*4 arguments, got "
-                            + components.length);
-
-        double lastControlX = getX();
-        double lastControlY = getY();
-        double secondToLastKnot = getA();
-        double lastWeight = getB();
-        double firstKnot = getC();
-        double firstWeight = getD();
-
-        double lastKnot = Double.parseDouble(components[0].trim());
-        int degree = Integer.parseInt(components[1].trim());
-        int xType = Integer.parseInt(components[2].trim());
-        int yType = Integer.parseInt(components[3].trim());
-
-        double xScale = 1;
-        double yScale = 1;
-
-        if (xType == 0)
-            xScale = parent.getWidth();
-        if (yType == 0)
-            yScale = parent.getHeight();
-
-        // setup first knots/weights/control point
-        ControlPath controlPath = new ControlPath();
-        ValueVector knots = new ValueVector();
-        ValueVector weights = new ValueVector();
-
-        knots.add(firstKnot);
-        weights.add(firstWeight);
-        controlPath.addPoint(PointFactory.create(last.getX(), last.getY()));
-
-        // iterate get knots/weights
-        int sets = (components.length - 4) / 4;
-        for (int i = 0; i < sets; i++) {
-            double x1 = Double.parseDouble(components[4 + i * 4 + 0].trim());
-            double y1 = Double.parseDouble(components[4 + i * 4 + 1].trim());
-            double k = Double.parseDouble(components[4 + i * 4 + 2].trim());
-            double w = Double.parseDouble(components[4 + i * 4 + 3].trim());
-
-            controlPath.addPoint(PointFactory.create(x1 * xScale, y1 * yScale));
-            knots.add(k);
-            weights.add(w);
-        }
-
-        // last knots/weights/control point
-        knots.add(secondToLastKnot);
-        knots.add(lastKnot);
-
-        weights.add(lastWeight);
-
-        controlPath.addPoint(PointFactory.create(lastControlX, lastControlY));
-
-        ShapeMultiPath shape = SplineRenderer.createNurbsSpline(controlPath,
-                knots, weights, degree);
-        path.append(shape, true);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
deleted file mode 100644
index c5f1ba0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class PolyLineTo implements GeometryRow {
-
-    PolyLineTo _master = null;
-
-    // The x-coordinate of the ending vertex of a polyline.
-    Double x = null;
-
-    // The y-coordinate of the ending vertex of a polyline.
-    Double y = null;
-
-    // The polyline formula
-    String a = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public PolyLineTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = cell.getV();
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in ArcTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public String getA() {
-        return a == null ? _master.a : a;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (PolyLineTo) row;
-    }
-
-    @Override
-    @NotImplemented
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        if (getDel())
-            return;
-        throw new POIXMLException("Polyline support not implemented");
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
deleted file mode 100644
index 3a419bb..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class RelCubBezTo implements GeometryRow {
-
-    RelCubBezTo _master = null;
-
-    // The x-coordinate of the ending vertex of a cubic Bezier curve relative to
-    // the width of the shape.
-    Double x = null;
-
-    // The y-coordinate of the ending vertex of a cubic Bezier curve relative to
-    // the height of the shape.
-    Double y = null;
-
-    // The x-coordinate of the curve's beginning control point relative to the
-    // shape's width; a point on the arc. The control point is best located
-    // between the beginning and ending vertices of the arc.
-    Double a = null;
-
-    // The y-coordinate of a curve's beginning control point relative to the
-    // shape's height.
-    Double b = null;
-
-    // The x-coordinate of the curve's ending control point relative to the
-    // shape's width; a point on the arc. The control point is best located
-    // between the beginning control point and ending vertices of the arc.
-    Double c = null;
-
-    // The y-coordinate of a curve's ending control point relative to the
-    // shape's height.
-    Double d = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public RelCubBezTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("C")) {
-                c = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("D")) {
-                d = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in RelCubBezTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    public Double getC() {
-        return c == null ? _master.c : c;
-    }
-
-    public Double getD() {
-        return d == null ? _master.d : d;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (RelCubBezTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        double w = parent.getWidth();
-        double h = parent.getHeight();
-
-        path.curveTo(getA() * w, getB() * h, getC() * w, getD() * h,
-                getX() * w, getY() * h);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
deleted file mode 100644
index 9b58406..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class RelEllipticalArcTo implements GeometryRow {
-
-    RelEllipticalArcTo _master = null;
-
-    // The x-coordinate of the ending vertex on an arc relative to the width of
-    // the shape.
-    Double x = null;
-
-    // The y-coordinate of the ending vertex on an arc relative to the height of
-    // the shape.
-    Double y = null;
-
-    // The x-coordinate of the arc's control point relative to the shape's
-    // width; a point on the arc.
-    Double a = null;
-
-    // The y-coordinate of an arc's control point relative to the shape's width.
-    Double b = null;
-
-    // The angle of an arc's major axis relative to the x-axis of its parent.
-    Double c = null;
-
-    // The ratio of an arc's major axis to its minor axis. Despite the usual
-    // meaning of these words, the "major" axis does not have to be greater than
-    // the "minor" axis, so this ratio does not have to be greater than 1.
-    Double d = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public RelEllipticalArcTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("C")) {
-                c = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("D")) {
-                d = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in RelEllipticalArcTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    public Double getC() {
-        return c == null ? _master.c : c;
-    }
-
-    public Double getD() {
-        return d == null ? _master.d : d;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (RelEllipticalArcTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        double w = parent.getWidth();
-        double h = parent.getHeight();
-
-        // intentionally shadowing variables here
-        double x = getX() * w;
-        double y = getY() * h;
-        double a = getA() * w;
-        double b = getB() * h;
-        double c = getC();
-        double d = getD();
-
-        EllipticalArcTo.createEllipticalArc(x, y, a, b, c, d, path);
-
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
deleted file mode 100644
index 1886f20..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-/**
- * Contains x-and y-coordinates of the ending vertex of a straight line segment
- * relative to a shape's width and height.
- */
-public class RelLineTo implements GeometryRow {
-
-    RelLineTo _master = null;
-
-    Double x = null;
-    Double y = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public RelLineTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in RelLineTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (RelLineTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        path.lineTo(getX() * parent.getWidth(), getY() * parent.getHeight());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
deleted file mode 100644
index 0b6f51c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-public class RelMoveTo implements GeometryRow {
-
-    RelMoveTo _master = null;
-
-    Double x = null;
-    Double y = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public RelMoveTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in RelMoveTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (RelMoveTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        path.moveTo(getX() * parent.getWidth(), getY() * parent.getHeight());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
deleted file mode 100644
index ecb4a3a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-/**
- * Contains the x- and y-coordinates of the endpoint of a quadratic Bezier curve
- * relative to the shape's width and height and the x- and y-coordinates of the
- * control point of the curve relative shape's width and height.
- */
-public class RelQuadBezTo implements GeometryRow {
-
-    RelQuadBezTo _master = null;
-
-    // The x-coordinate of the ending vertex of a quadratic Bezier curve
-    // relative to the width of the shape.
-    Double x = null;
-
-    // The y-coordinate of the ending vertex of a quadratic Bezier curve
-    // relative to the height of the shape.
-    Double y = null;
-
-    // The x-coordinate of the curve's control point relative to the shape's
-    // width; a point on the arc. The control point is best located about
-    // halfway between the beginning and ending vertices of the arc.
-    Double a = null;
-
-    // The y-coordinate of a curve's control point relative to the shape's
-    // height.
-    Double b = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public RelQuadBezTo(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in RelQuadBezTo row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (RelQuadBezTo) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-
-        if (getDel())
-            return;
-
-        double w = parent.getWidth();
-        double h = parent.getHeight();
-
-        path.quadTo(getA() * w, getB() * h, getX() * w, getY() * h);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
deleted file mode 100644
index f75490b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-/**
- * Contains x- and y-coordinates for a spline's control point and a spline's
- * knot.
- */
-public class SplineKnot implements GeometryRow {
-
-    SplineKnot _master = null;
-
-    // The x-coordinate of a control point.
-    Double x = null;
-
-    // The y-coordinate of a control point.
-    Double y = null;
-
-    // One of the spline's knots (other than the last one or the first two).
-    Double a = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public SplineKnot(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in SplineKnot row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (SplineKnot) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        throw new POIXMLException("Error: Use SplineRenderer!");
-    }
-
-    @Override
-    public String toString() {
-        return "{SplineKnot x=" + getX() + " y=" + getY() + " a=" + getA()
-                + "}";
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
deleted file mode 100644
index 224a36c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xdgf.usermodel.section.geometry;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.xdgf.usermodel.XDGFCell;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-import com.microsoft.schemas.office.visio.x2012.main.CellType;
-import com.microsoft.schemas.office.visio.x2012.main.RowType;
-
-/**
- * Contains x- and y-coordinates for a spline's second control point, its second
- * knot, its first knot, the last knot, and the degree of the spline.
- */
-public class SplineStart implements GeometryRow {
-
-    SplineStart _master = null;
-
-    // The x-coordinate of a spline's second control point.
-    Double x = null;
-
-    // The y-coordinate of a spline's second control point.
-    Double y = null;
-
-    // The second knot of the spline.
-    Double a = null;
-
-    // The first knot of a spline.
-    Double b = null;
-
-    // The last knot of a spline.
-    Double c = null;
-
-    // The degree of a spline (an integer from 1 to 25).
-    Integer d = null;
-
-    Boolean deleted = null;
-
-    // TODO: support formulas
-
-    public SplineStart(RowType row) {
-
-        if (row.isSetDel())
-            deleted = row.getDel();
-
-        for (CellType cell : row.getCellArray()) {
-            String cellName = cell.getN();
-
-            if (cellName.equals("X")) {
-                x = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("Y")) {
-                y = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("A")) {
-                a = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("B")) {
-                b = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("C")) {
-                c = XDGFCell.parseDoubleValue(cell);
-            } else if (cellName.equals("D")) {
-                d = XDGFCell.parseIntegerValue(cell);
-            } else {
-                throw new POIXMLException("Invalid cell '" + cellName
-                        + "' in SplineStart row");
-            }
-        }
-    }
-
-    public boolean getDel() {
-        if (deleted != null)
-            return deleted;
-
-        if (_master != null)
-            return _master.getDel();
-
-        return false;
-    }
-
-    public Double getX() {
-        return x == null ? _master.x : x;
-    }
-
-    public Double getY() {
-        return y == null ? _master.y : y;
-    }
-
-    public Double getA() {
-        return a == null ? _master.a : a;
-    }
-
-    public Double getB() {
-        return b == null ? _master.b : b;
-    }
-
-    public Double getC() {
-        return c == null ? _master.c : c;
-    }
-
-    public Integer getD() {
-        return d == null ? _master.d : d;
-    }
-
-    @Override
-    public void setupMaster(GeometryRow row) {
-        _master = (SplineStart) row;
-    }
-
-    @Override
-    public void addToPath(java.awt.geom.Path2D.Double path, XDGFShape parent) {
-        throw new POIXMLException("Error: Use SplineRenderer!");
-    }
-
-    @Override
-    public String toString() {
-        return "{SplineStart x=" + getX() + " y=" + getY() + " a=" + getA()
-                + " b=" + getB() + " c=" + getC() + " d=" + getD() + "}";
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
deleted file mode 100644
index 57c9cde..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.shape;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-/**
- * This acceptor only allows traversal to shapes that have useful data
- * associated with them, and tries to elide details that aren't useful when
- * analyzing the content of a document.
- *
- * Useful is subjective of course, and is defined as any of:
- *
- * - Has non-empty text - Is a 1d shape, such as a line - User specified shapes
- * - The outline of stencil objects - TODO
- */
-public class ShapeDataAcceptor implements ShapeVisitorAcceptor {
-
-    @Override
-    public boolean accept(XDGFShape shape) {
-
-        if (shape.isDeleted())
-            return false;
-
-        // text is interesting
-        if (shape.hasText() && shape.getTextAsString().length() != 0)
-            return true;
-
-        // 1d shapes are interesting, they create connections
-        if (shape.isShape1D())
-            return true;
-
-        // User specified shapes are interesting
-        if (!shape.hasMaster() && !shape.hasMasterShape())
-            return true;
-
-        if (shape.hasMaster() && !shape.hasMasterShape())
-            return true;
-
-        // include stencil content, but try to elide stencil interiors
-        // if (shape.getXmlObject().isSetMaster())
-        // return true;
-
-        if (shape.hasMasterShape() && shape.getMasterShape().isTopmost())
-            return true;
-
-        return false;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
deleted file mode 100644
index d4a010b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.shape;
-
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.geom.Path2D;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-public class ShapeDebuggerRenderer extends ShapeRenderer {
-
-    ShapeVisitorAcceptor _debugAcceptor = null;
-
-    public ShapeDebuggerRenderer() {
-        super();
-    }
-
-    public ShapeDebuggerRenderer(Graphics2D g) {
-        super(g);
-    }
-
-    public void setDebugAcceptor(ShapeVisitorAcceptor acceptor) {
-        _debugAcceptor = acceptor;
-    }
-
-    @Override
-    protected Path2D drawPath(XDGFShape shape) {
-
-        Path2D path = super.drawPath(shape);
-        if (_debugAcceptor == null || _debugAcceptor.accept(shape)) {
-
-            // show numbers to associate shapes with ids.. doesn't always work
-            Font f = _graphics.getFont();
-            _graphics.scale(1, -1);
-            _graphics.setFont(f.deriveFont(0.05F));
-
-            String shapeId = "" + shape.getID();
-            float shapeOffset = -0.1F;
-
-            if (shape.hasMasterShape()) {
-                shapeId += " MS:" + shape.getMasterShape().getID();
-                shapeOffset -= 0.15F;
-            }
-
-            _graphics.drawString(shapeId, shapeOffset, 0);
-            _graphics.setFont(f);
-            _graphics.scale(1, -1);
-        }
-
-        return path;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
deleted file mode 100644
index a6a7664..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.shape;
-
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Path2D;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-import org.apache.poi.xdgf.usermodel.XDGFText;
-
-/**
- * To use this to render only particular shapes, override it and provide an
- * appropriate implementation of getAcceptor() or accept()
- */
-public class ShapeRenderer extends ShapeVisitor {
-
-    protected Graphics2D _graphics;
-
-    public ShapeRenderer() {
-        _graphics = null;
-    }
-
-    public ShapeRenderer(Graphics2D g) {
-        _graphics = g;
-    }
-
-    public void setGraphics(Graphics2D g) {
-        _graphics = g;
-    }
-
-    @Override
-    public void visit(XDGFShape shape, AffineTransform globalTransform,
-            int level) {
-
-        AffineTransform savedTr = _graphics.getTransform();
-        _graphics.transform(globalTransform);
-
-        drawPath(shape);
-        drawText(shape);
-
-        // we're done, undo the transforms
-        _graphics.setTransform(savedTr);
-    }
-
-    protected Path2D drawPath(XDGFShape shape) {
-        Path2D.Double path = shape.getPath();
-        if (path != null) {
-
-            // setup the stroke for this line
-
-            _graphics.setColor(shape.getLineColor());
-            _graphics.setStroke(shape.getStroke());
-            _graphics.draw(path);
-        }
-
-        return path;
-    }
-
-    protected void drawText(XDGFShape shape) {
-        XDGFText text = shape.getText();
-        if (text != null) {
-
-            if (text.getTextContent().equals("Header"))
-                text.getTextBounds();
-
-            Font oldFont = _graphics.getFont();
-
-            _graphics.setFont(oldFont.deriveFont(shape.getFontSize()
-                    .floatValue()));
-            _graphics.setColor(shape.getFontColor());
-
-            text.draw(_graphics);
-            _graphics.setFont(oldFont);
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
deleted file mode 100644
index 9a0f28c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xdgf.usermodel.shape;
-
-import java.awt.geom.AffineTransform;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-/**
- * Only visits text nodes, accumulates text content into a string
- * 
- * The text is returned in arbitrary order, with no regards to
- * the location of the text on the page. This may change in the
- * future.
- */
-public class ShapeTextVisitor extends ShapeVisitor {
-
-    protected StringBuilder text = new StringBuilder();
-    
-    public static class TextAcceptor implements ShapeVisitorAcceptor {
-        public boolean accept(XDGFShape shape) {
-            return shape.hasText();
-        }
-    }
-    
-    protected ShapeVisitorAcceptor getAcceptor() {
-        return new TextAcceptor();
-    }
-
-    public void visit(XDGFShape shape, AffineTransform globalTransform,
-            int level) {
-        text.append(shape.getText().getTextContent().trim());
-        text.append('\n');
-    }
-
-    /**
-     * Call this after visitation has completed
-     */
-    public String getText() {
-        return text.toString();
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
deleted file mode 100644
index 2e4d896..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.shape;
-
-import java.awt.geom.AffineTransform;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-/**
- * Used to iterate through shapes
- *
- * To change the behavior of a particular visitor, you can override either
- * accept() or getAcceptor() [preferred]
- *
- * If accept() or visit() throw StopVisitingThisBranch, the iteration will not
- * visit subshapes of the shape.
- */
-public abstract class ShapeVisitor {
-
-    protected ShapeVisitorAcceptor _acceptor;
-
-    public ShapeVisitor() {
-        _acceptor = getAcceptor();
-    }
-    
-    /**
-     * Is only called on construction of the visitor, allows
-     * mixing visitors and acceptors
-     */
-    protected ShapeVisitorAcceptor getAcceptor() {
-        return new ShapeVisitorAcceptor() {
-            @Override
-            public boolean accept(XDGFShape shape) {
-                return !shape.isDeleted();
-            }
-        };
-    }
-
-    public void setAcceptor(ShapeVisitorAcceptor acceptor) {
-        _acceptor = acceptor;
-    }
-
-    public boolean accept(XDGFShape shape) {
-        return _acceptor.accept(shape);
-    }
-
-    /**
-     * @param shape
-     *            Current shape
-     * @param globalTransform
-     *            A transform that can convert the shapes points to global
-     *            coordinates
-     * @param level
-     *            Level in the tree (0 is topmost, 1 is next level...
-     */
-    public abstract void visit(XDGFShape shape,
-            AffineTransform globalTransform, int level);
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
deleted file mode 100644
index e50ce11..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.shape;
-
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-
-public interface ShapeVisitorAcceptor {
-
-    public boolean accept(XDGFShape shape);
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
deleted file mode 100644
index 2a33c43..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.shape.exceptions;
-
-public class StopVisiting extends RuntimeException {
-
-    private static final long serialVersionUID = -4651207777092840750L;
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
deleted file mode 100644
index eb9e4a6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.shape.exceptions;
-
-public class StopVisitingThisBranch extends RuntimeException {
-
-    private static final long serialVersionUID = 5262319077534717862L;
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
deleted file mode 100644
index eb9aa97..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.util;
-
-import java.awt.geom.AffineTransform;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.poi.xdgf.usermodel.XDGFPage;
-import org.apache.poi.xdgf.usermodel.XDGFShape;
-import org.apache.poi.xdgf.usermodel.XmlVisioDocument;
-import org.apache.poi.xdgf.usermodel.shape.ShapeVisitor;
-
-/**
- * Debugging tool useful when trying to figure out the hierarchy of the
- * shapes in a Visio diagram
- */
-public class HierarchyPrinter {
-
-    public static void printHierarchy(XDGFPage page, File outDir)
-            throws FileNotFoundException, UnsupportedEncodingException {
-
-        File pageFile = new File(outDir, "page" + page.getPageNumber() + "-"
-                + Util.sanitizeFilename(page.getName()) + ".txt");
-
-        OutputStream os = new FileOutputStream(pageFile);
-        PrintStream pos = new PrintStream(os, false, "utf-8");
-
-        printHierarchy(page, pos);
-
-        pos.close();
-    }
-
-    public static void printHierarchy(XDGFPage page, final PrintStream os) {
-
-        page.getContent().visitShapes(new ShapeVisitor() {
-
-            @Override
-            public void visit(XDGFShape shape, AffineTransform globalTransform,
-                    int level) {
-                for (int i = 0; i < level; i++) {
-                    os.append("  ");
-                }
-                // TODO: write text?
-                os.println(shape.toString() + " [" + shape.getShapeType()
-                        + ", " + shape.getSymbolName() + "] "
-                        + shape.getMasterShape() + " "
-                        + shape.getTextAsString().trim());
-            }
-        });
-    }
-
-    public static void printHierarchy(XmlVisioDocument document,
-            String outDirname) throws FileNotFoundException, UnsupportedEncodingException {
-
-        File outDir = new File(outDirname);
-
-        for (XDGFPage page : document.getPages()) {
-            printHierarchy(page, outDir);
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length != 2) {
-            System.err.println("Usage: in.vsdx outdir");
-            System.exit(1);
-        }
-
-        String inFilename = args[0];
-        String outDir = args[1];
-
-        XmlVisioDocument doc = new XmlVisioDocument(new FileInputStream(
-                inFilename));
-        printHierarchy(doc, outDir);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/ObjectFactory.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/util/ObjectFactory.java
deleted file mode 100644
index af0253f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/ObjectFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.util;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLException;
-import org.apache.xmlbeans.XmlObject;
-
-
-public class ObjectFactory<T, X extends XmlObject> {
-
-    Map<String, Constructor<? extends T>> _types = new HashMap<String, Constructor<? extends T>>();
-
-    public void put(String typeName, Class<? extends T> cls, Class<?>... varargs) throws NoSuchMethodException, SecurityException {
-        _types.put(typeName, cls.getDeclaredConstructor(varargs));
-    }
-
-    public T load(String name, Object... varargs) {
-        Constructor<? extends T> constructor = _types.get(name);
-        if (constructor == null) {
-
-            @SuppressWarnings("unchecked")
-            X xmlObject = (X) varargs[0];
-
-            String typeName = xmlObject.schemaType().getName().getLocalPart();
-            throw new POIXMLException("Invalid '" + typeName + "' name '" + name + "'");
-        }
-
-        try {
-            return constructor.newInstance(varargs);
-        } catch (InvocationTargetException e) {
-            throw new POIXMLException(e.getCause());
-        } catch (Exception e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java
deleted file mode 100644
index 0e08294..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.util;
-
-public class Util {
-
-    public static int countLines(String str) {
-        int lines = 1;
-        int pos = 0;
-        while ((pos = str.indexOf("\n", pos) + 1) != 0) {
-            lines++;
-        }
-        return lines;
-    }
-
-    // this probably isn't 100% correct, so don't use it in security-sensitive
-    // applications!
-    // from: http://www.rgagnon.com/javadetails/java-0662.html
-    public static String sanitizeFilename(String name) {
-        return name.replaceAll("[:\\\\/*\"?|<>]", "_");
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java
deleted file mode 100644
index 9ab71ea..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.util;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.xdgf.geom.Dimension2dDouble;
-import org.apache.poi.xdgf.usermodel.XDGFPage;
-import org.apache.poi.xdgf.usermodel.XmlVisioDocument;
-import org.apache.poi.xdgf.usermodel.shape.ShapeDebuggerRenderer;
-import org.apache.poi.xdgf.usermodel.shape.ShapeRenderer;
-
-/**
- * Converts a Visio diagram to a PNG file.
- * 
- * As more elements and styles are added/supported the output will get
- * better, but it's very rough right now.
- */
-public class VsdxToPng {
-
-    public static void renderToPng(XDGFPage page, String outFilename,
-            double scale, ShapeRenderer renderer) throws IOException {
-        renderToPng(page, new File(outFilename), scale, renderer);
-    }
-
-    public static void renderToPngDir(XDGFPage page, File outDir, double scale,
-            ShapeRenderer renderer) throws IOException {
-
-        File pageFile = new File(outDir, "page" + page.getPageNumber() + "-"
-                + Util.sanitizeFilename(page.getName()) + ".png");
-        System.out.println("** Writing image to " + pageFile);
-
-        renderToPng(page, pageFile, scale, renderer);
-
-    }
-
-    public static void renderToPng(XDGFPage page, File outFile, double scale,
-            ShapeRenderer renderer) throws IOException {
-
-        Dimension2dDouble sz = page.getPageSize();
-
-        int width = (int) (scale * sz.getWidth());
-        int height = (int) (scale * sz.getHeight());
-
-        BufferedImage img = new BufferedImage(width, height,
-                BufferedImage.TYPE_INT_RGB);
-        final Graphics2D graphics = img.createGraphics();
-
-        // default rendering options
-        graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                RenderingHints.VALUE_ANTIALIAS_ON);
-        graphics.setRenderingHint(RenderingHints.KEY_RENDERING,
-                RenderingHints.VALUE_RENDER_QUALITY);
-        graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-                RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-        graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
-                RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-
-        graphics.setColor(Color.black);
-        graphics.setBackground(Color.white);
-        graphics.clearRect(0, 0, width, height);
-
-        // Visio's coordinate system is flipped, so flip the image vertically
-        graphics.translate(0, img.getHeight());
-        graphics.scale(scale, -scale);
-
-        // toplevel shapes only
-        renderer.setGraphics(graphics);
-        page.getContent().visitShapes(renderer);
-
-        graphics.dispose();
-
-        FileOutputStream out = new FileOutputStream(outFile);
-        ImageIO.write(img, "png", out);
-        out.close();
-    }
-
-    public static void renderToPng(XmlVisioDocument document,
-            String outDirname, double scale, ShapeRenderer renderer)
-                    throws IOException {
-
-        File outDir = new File(outDirname);
-
-        for (XDGFPage page : document.getPages()) {
-            renderToPngDir(page, outDir, scale, renderer);
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length > 2) {
-            System.err.println("Usage: [--debug] in.vsdx outdir");
-            System.exit(1);
-        }
-
-        ShapeRenderer renderer = new ShapeRenderer();
-
-        String inFilename = args[0];
-        String pngDir = args[1];
-
-        if (args[0].equals("--debug")) {
-            inFilename = args[1];
-            pngDir = args[2];
-            renderer = new ShapeDebuggerRenderer();
-        }
-
-        XmlVisioDocument doc = new XmlVisioDocument(new FileInputStream(
-                inFilename));
-        renderToPng(doc, pngDir, 2000 / 11.0, renderer);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java b/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
deleted file mode 100644
index 5e52646..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xdgf.xml;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.xdgf.usermodel.XDGFDocument;
-
-public class XDGFXMLDocumentPart extends POIXMLDocumentPart {
-
-    protected XDGFDocument _document;
-    
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XDGFXMLDocumentPart(PackagePart part, XDGFDocument document) {
-        super(part);
-        _document = document;
-    }
-    
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XDGFXMLDocumentPart(PackagePart part, PackageRelationship rel, XDGFDocument document) {
-        this(part, document);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java b/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
deleted file mode 100644
index 5f757d0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.extractor;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFCommentAuthors;
-import org.apache.poi.xslf.usermodel.XSLFComments;
-import org.apache.poi.xslf.usermodel.XSLFNotes;
-import org.apache.poi.xslf.usermodel.XSLFRelation;
-import org.apache.poi.xslf.usermodel.XSLFShape;
-import org.apache.poi.xslf.usermodel.XSLFShapeContainer;
-import org.apache.poi.xslf.usermodel.XSLFSlide;
-import org.apache.poi.xslf.usermodel.XSLFSlideLayout;
-import org.apache.poi.xslf.usermodel.XSLFSlideMaster;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFTable;
-import org.apache.poi.xslf.usermodel.XSLFTableCell;
-import org.apache.poi.xslf.usermodel.XSLFTableRow;
-import org.apache.poi.xslf.usermodel.XSLFTextShape;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTComment;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentAuthor;
-
-public class XSLFPowerPointExtractor extends POIXMLTextExtractor {
-   public static final XSLFRelation[] SUPPORTED_TYPES = new XSLFRelation[] {
-      XSLFRelation.MAIN, XSLFRelation.MACRO, XSLFRelation.MACRO_TEMPLATE,
-      XSLFRelation.PRESENTATIONML, XSLFRelation.PRESENTATIONML_TEMPLATE,
-      XSLFRelation.PRESENTATION_MACRO
-   };
-   
-	private XMLSlideShow slideshow;
-	private boolean slidesByDefault = true;
-	private boolean notesByDefault = false;
-   private boolean masterByDefault = false;
-	
-	public XSLFPowerPointExtractor(XMLSlideShow slideshow) {
-		super(slideshow);
-		this.slideshow = slideshow;
-	}
-	public XSLFPowerPointExtractor(XSLFSlideShow slideshow) throws XmlException, IOException {
-		this(new XMLSlideShow(slideshow.getPackage()));
-	}
-	public XSLFPowerPointExtractor(OPCPackage container) throws XmlException, OpenXML4JException, IOException {
-		this(new XSLFSlideShow(container));
-	}
-
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Use:");
-			System.err.println("  XSLFPowerPointExtractor <filename.pptx>");
-			System.exit(1);
-		}
-		POIXMLTextExtractor extractor = 
-			new XSLFPowerPointExtractor(
-					new XSLFSlideShow(args[0]));
-		System.out.println(extractor.getText());
-		extractor.close();
-	}
-
-	/**
-	 * Should a call to getText() return slide text?
-	 * Default is yes
-	 */
-	public void setSlidesByDefault(boolean slidesByDefault) {
-		this.slidesByDefault = slidesByDefault;
-	}
-	/**
-	 * Should a call to getText() return notes text?
-	 * Default is no
-	 */
-	public void setNotesByDefault(boolean notesByDefault) {
-		this.notesByDefault = notesByDefault;
-	}
-	
-   /**
-    * Should a call to getText() return text from master? Default is no
-    */
-   public void setMasterByDefault(boolean masterByDefault) {
-       this.masterByDefault = masterByDefault;
-   }
-	
-	/**
-	 * Gets the slide text, but not the notes text
-	 */
-	public String getText() {
-		return getText(slidesByDefault, notesByDefault);
-	}
-	
-   /**
-    * Gets the requested text from the file
-    * @param slideText Should we retrieve text from slides?
-    * @param notesText Should we retrieve text from notes?
-    */
-   public String getText(boolean slideText, boolean notesText) {
-      return getText(slideText, notesText, masterByDefault);
-   }
-   
-   /**
-    * Gets the requested text from the file
-    * 
-    * @param slideText Should we retrieve text from slides?
-    * @param notesText Should we retrieve text from notes?
-    * @param masterText Should we retrieve text from master slides?
-    * 
-    * @return the extracted text
-    */
-   public String getText(boolean slideText, boolean notesText, boolean masterText) {
-      StringBuilder text = new StringBuilder();
-
-      for (XSLFSlide slide : slideshow.getSlides()) {
-          text.append(getText(slide, slideText, notesText, masterText));
-      }
-
-      return text.toString();
-   }
-
-   /**
-    * Gets the requested text from the slide
-    * 
-    * @param slide the slide to retrieve the text from
-    * @param slideText Should we retrieve text from slides?
-    * @param notesText Should we retrieve text from notes?
-    * @param masterText Should we retrieve text from master slides?
-    * 
-    * @return the extracted text
-    */
-   public static String getText(XSLFSlide slide, boolean slideText, boolean notesText, boolean masterText) {
-       StringBuilder text = new StringBuilder();
-
-       XSLFCommentAuthors commentAuthors = slide.getSlideShow().getCommentAuthors();
-
-       XSLFNotes notes = slide.getNotes();
-       XSLFComments comments = slide.getComments();
-       XSLFSlideLayout layout = slide.getSlideLayout();
-       XSLFSlideMaster master = layout.getSlideMaster();
-
-       // TODO Do the slide's name
-       // (Stored in docProps/app.xml)
-
-       // Do the slide's text if requested
-       if (slideText) {
-          extractText(slide, false, text);
-          
-          // If requested, get text from the master and it's layout 
-          if(masterText) {
-             if(layout != null) {
-                extractText(layout, true, text);
-             }
-             if(master != null) {
-                extractText(master, true, text);
-             }
-          }
-
-          // If the slide has comments, do those too
-          if (comments != null) {
-             for (CTComment comment : comments.getCTCommentsList().getCmArray()) {
-                // Do the author if we can
-                if (commentAuthors != null) {
-                   CTCommentAuthor author = commentAuthors.getAuthorById(comment.getAuthorId());
-                   if(author != null) {
-                      text.append(author.getName() + ": ");
-                   }
-                }
-                
-                // Then the comment text, with a new line afterwards
-                text.append(comment.getText());
-                text.append("\n");
-             }
-          }
-       }
-
-       // Do the notes if requested
-       if (notesText && notes != null) {
-          extractText(notes, false, text);
-       }
-       
-       return text.toString();
-   }
-   
-    private static void extractText(XSLFShapeContainer data, boolean skipPlaceholders, StringBuilder text) {
-       for (XSLFShape s : data) {
-           if (s instanceof XSLFShapeContainer) {
-               extractText((XSLFShapeContainer)s, skipPlaceholders, text);
-           } else if (s instanceof XSLFTextShape) {
-               XSLFTextShape ts = (XSLFTextShape)s;
-               // Skip non-customised placeholder text
-               if (!(skipPlaceholders && ts.isPlaceholder())) {
-                   text.append(ts.getText());
-                   text.append("\n");
-               }
-           } else if (s instanceof XSLFTable) {
-               XSLFTable ts = (XSLFTable)s;
-               // Skip non-customised placeholder text
-               for (XSLFTableRow r : ts) {
-                   for (XSLFTableCell c : r) {
-                       text.append(c.getText());
-                       text.append("\t");
-                   }
-                   text.append("\n");
-               }
-           }
-       }
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java b/trunk/src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
deleted file mode 100644
index 3358a72..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.model;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-
-public abstract class CharacterPropertyFetcher<T> extends ParagraphPropertyFetcher<T> {
-    public CharacterPropertyFetcher(int level) {
-        super(level);
-    }
-
-    public boolean fetch(CTTextParagraphProperties props) {
-        if (props != null && props.isSetDefRPr()) {
-            return fetch(props.getDefRPr());
-        }
-
-        return false;
-    }
-
-    public abstract boolean fetch(CTTextCharacterProperties props);
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java b/trunk/src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
deleted file mode 100644
index c6c5836..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.model;
-
-import org.apache.poi.xslf.usermodel.XSLFShape;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-
-/**
- *
- * @author Yegor Kozlov
- */
-public abstract class ParagraphPropertyFetcher<T> extends PropertyFetcher<T> {
-    int _level;
-
-    public ParagraphPropertyFetcher(int level) {
-        _level = level;
-    }
-
-    public boolean fetch(XSLFShape shape) {
-
-        XmlObject[] o = shape.getXmlObject().selectPath(
-                "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' " +
-                "declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' " +
-                ".//p:txBody/a:lstStyle/a:lvl" + (_level + 1) + "pPr"
-        );
-        if (o.length == 1) {
-            CTTextParagraphProperties props = (CTTextParagraphProperties) o[0];
-            return fetch(props);
-        }
-        return false;
-    }
-
-    public abstract boolean fetch(CTTextParagraphProperties props);
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java b/trunk/src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java
deleted file mode 100644
index f9e8a78..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.model;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.xslf.usermodel.XSLFShape;
-
-/**
- *  Used internally to navigate the PresentationML text style hierarchy and fetch properties
- *
- * @author Yegor Kozlov
-*/
-@Internal
-public abstract class PropertyFetcher<T> {
-    private T _value;
-
-    /**
-     *
-     * @param shape the shape being examined
-     * @return true if the desired property was fetched
-     */
-    public abstract boolean fetch(XSLFShape shape);
-
-    public T getValue(){
-        return _value;
-    }
-
-    public void setValue(T val){
-        _value = val;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java b/trunk/src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
deleted file mode 100644
index cc8486a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.model;
-
-import org.apache.poi.xslf.usermodel.XSLFShape;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties;
-
-/**
- * Created by IntelliJ IDEA.
- * User: yegor
- * Date: Oct 21, 2011
- * Time: 1:18:52 PM
- * To change this template use File | Settings | File Templates.
- */
-public abstract class TextBodyPropertyFetcher<T> extends PropertyFetcher<T> {
-
-    public boolean fetch(XSLFShape shape) {
-
-        XmlObject[] o = shape.getXmlObject().selectPath(
-                "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' " +
-                "declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' " +
-                ".//p:txBody/a:bodyPr"
-        );
-        if (o.length == 1) {
-            CTTextBodyProperties props = (CTTextBodyProperties) o[0];
-            return fetch(props);
-        }
-
-        return false;
-    }
-
-    public abstract boolean fetch(CTTextBodyProperties props);
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
deleted file mode 100644
index 6a6ee38..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Removal;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextLineBreak;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-
-/*
- * @deprecated POI 3.16 beta 1. Instead iterate over the shapes/notes of the slides
- */
-@Removal(version="3.18")
-public class DrawingParagraph {
-    private final CTTextParagraph p;
-
-    public DrawingParagraph(CTTextParagraph p) {
-        this.p = p;
-    }
-
-    public CharSequence getText() {
-        StringBuilder text = new StringBuilder();
-
-        XmlCursor c = p.newCursor();
-        c.selectPath("./*");
-        while (c.toNextSelection()) {
-            XmlObject o = c.getObject();
-            if (o instanceof CTRegularTextRun) {
-                CTRegularTextRun txrun = (CTRegularTextRun) o;
-                text.append(txrun.getT());
-            } else if (o instanceof CTTextLineBreak) {
-                text.append('\n');
-            }
-        }
-
-        c.dispose();
-        
-        return text;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
deleted file mode 100644
index b59a5bb..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Removal;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTable;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
-
-/*
- * @deprecated POI 3.16 beta 1. use {@link XSLFTable} instead
- */
-@Removal(version="3.18")
-public class DrawingTable {
-    private final CTTable table;
-
-    public DrawingTable(CTTable table) {
-        this.table = table;
-    }
-
-    public DrawingTableRow[] getRows() {
-        CTTableRow[] ctTableRows = table.getTrArray();
-        DrawingTableRow[] o = new DrawingTableRow[ctTableRows.length];
-
-        for (int i=0; i<o.length; i++) {
-            o[i] = new DrawingTableRow(ctTableRows[i]);
-        }
-
-        return o;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableCell.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableCell.java
deleted file mode 100644
index 2924fbc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableCell.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Removal;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
-
-/*
- * @deprecated POI 3.16 beta 1. use {@link XSLFTable} instead
- */
-@Removal(version="3.18")
-public class DrawingTableCell {
-    private final CTTableCell cell;
-    private final DrawingTextBody drawingTextBody;
-
-    public DrawingTableCell(CTTableCell cell) {
-        this.cell = cell;
-        drawingTextBody = new DrawingTextBody(this.cell.getTxBody());
-    }
-
-    public DrawingTextBody getTextBody() {
-        return drawingTextBody;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
deleted file mode 100644
index 08a6939..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Removal;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
-
-/*
- * @deprecated POI 3.16 beta 1. use {@link XSLFTable} instead
- */
-@Removal(version="3.18")
-public class DrawingTableRow {
-    private final CTTableRow row;
-
-    public DrawingTableRow(CTTableRow row) {
-        this.row = row;
-    }
-
-    public DrawingTableCell[] getCells() {
-        CTTableCell[] ctTableCells = row.getTcArray();
-        DrawingTableCell[] o = new DrawingTableCell[ctTableCells.length];
-
-        for (int i=0; i<o.length; i++) {
-            o[i] = new DrawingTableCell(ctTableCells[i]);
-        }
-
-        return o;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
deleted file mode 100644
index d297e3b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Removal;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-
-/*
- * @deprecated POI 3.16 beta 1. use {@link XSLFTextShape} instead
- */
-@Removal(version="3.18")
-public class DrawingTextBody {
-    private final CTTextBody textBody;
-
-    public DrawingTextBody(CTTextBody textBody) {
-       this.textBody = textBody;
-    }
-
-    public DrawingParagraph[] getParagraphs() {
-        CTTextParagraph[] paragraphs = textBody.getPArray();
-        DrawingParagraph[] o = new DrawingParagraph[paragraphs.length];
-
-        for (int i=0; i<o.length; i++) {
-            o[i] = new DrawingParagraph(paragraphs[i]);
-        }
-
-        return o;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextPlaceholder.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextPlaceholder.java
deleted file mode 100644
index e22aa52..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextPlaceholder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Removal;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
-
-/**
- * A {@link DrawingTextBody} which is a placeholder
- * @author nick
- *
- */
-/*
- * @deprecated POI 3.16 beta 1. use {@link XSLFSimpleShape#isPlaceholder} instead
- */
-@Removal(version="3.18")
-public class DrawingTextPlaceholder extends DrawingTextBody {
-    private final CTPlaceholder placeholder;
-
-    public DrawingTextPlaceholder(CTTextBody textBody, CTPlaceholder placeholder) {
-       super(textBody);
-       this.placeholder = placeholder;
-    }
-    
-    /**
-     * What kind of placeholder is this?
-     */
-    public String getPlaceholderType() {
-       return placeholder.getType().toString();
-    }
-
-    /**
-     * What kind of placeholder is this?
-     */
-    public STPlaceholderType.Enum getPlaceholderTypeEnum() {
-       return placeholder.getType();
-    }
-
-    /**
-     * Is the PlaceHolder text customised?
-     */
-    public boolean isPlaceholderCustom() {
-       return placeholder.getHasCustomPrompt();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java
deleted file mode 100644
index 729057b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-/**
- * Date: 11/5/11
- *
- * @author Yegor Kozlov
- */
-public enum SlideLayout {
-    /**
-     * Title layout with centered title and subtitle placeholders
-     */
-    TITLE,
-    /**
-     * Title and text
-     */
-    TEXT,
-
-    TWO_COL_TX,
-    TBL,
-    TEXT_AND_CHART,
-
-    /**
-     * Title, chart on left and text on right
-     */
-    CHART_AND_TEXT,
-
-    DGM,
-
-    /**
-     * Title and chart
-     */
-    CHART,
-
-    TX_AND_CLIP_ART,
-    /**
-     * Title, clipart on left, text on right
-     */
-    CLIP_ART_AND_TEXT,
-
-    /**
-     * Title only
-     */
-    TITLE_ONLY,
-
-    /**
-     * Blank
-     */
-    BLANK,
-
-    TX_AND_OBJ,
-    OBJ_AND_TX,
-    OBJ_ONLY,
-    /**
-     * title and content
-     */
-    TITLE_AND_CONTENT,
-    TX_AND_MEDIA,
-    MEDIA_AND_TX,
-    OBJ_OVER_TX,
-    TX_OVER_OBJ,
-    TX_AND_TWO_OBJ,
-    TWO_OBJ_AND_TX,
-    TWO_OBJ_OVER_TX,
-    FOUR_OBJ,
-    VERT_TX,
-    CLIP_ART_AND_VERT_TX,
-    VERT_TITLE_AND_TX,
-    VERT_TITLE_AND_TX_OVER_CHART,
-    TWO_OBJ,
-    OBJ_AND_TWO_OBJ,
-    TWO_OBJ_AND_OBJ,
-    CUST,
-    /**
-     * Section Header
-     */
-    SECTION_HEADER,
-    TWO_TX_TWO_OBJ,
-    OBJ_TX,
-    PIC_TX,
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
deleted file mode 100644
index 14b656b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.awt.Dimension;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.sl.usermodel.MasterSheet;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.Resources;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.PackageHelper;
-import org.apache.poi.util.Units;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdList;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPresentation;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdList;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideSize;
-import org.openxmlformats.schemas.presentationml.x2006.main.PresentationDocument;
-
-/**
- * High level representation of a ooxml slideshow.
- * This is the first object most users will construct whether
- *  they are reading or writing a slideshow. It is also the
- *  top level object for creating new slides/etc.
- */
-@Beta
-public class XMLSlideShow extends POIXMLDocument
-implements SlideShow<XSLFShape,XSLFTextParagraph> {
-    private static POILogger _logger = POILogFactory.getLogger(XMLSlideShow.class);
-
-    private CTPresentation _presentation;
-    private List<XSLFSlide> _slides;
-    private List<XSLFSlideMaster> _masters;
-    private List<XSLFPictureData> _pictures;
-    private XSLFTableStyles _tableStyles;
-    private XSLFNotesMaster _notesMaster;
-    private XSLFCommentAuthors _commentAuthors;
-
-    public XMLSlideShow() {
-        this(empty());
-    }
-
-    public XMLSlideShow(OPCPackage pkg) {
-        super(pkg);
-
-        try {
-            if(getCorePart().getContentType().equals(XSLFRelation.THEME_MANAGER.getContentType())) {
-               rebase(getPackage());
-            }
-
-            //build a tree of POIXMLDocumentParts, this presentation being the root
-            load(XSLFFactory.getInstance());
-        } catch (Exception e){
-            throw new POIXMLException(e);
-        }
-    }
-
-    public XMLSlideShow(InputStream is) throws IOException {
-        this(PackageHelper.open(is));
-    }
-
-    static OPCPackage empty() {
-        InputStream is = XMLSlideShow.class.getResourceAsStream("empty.pptx");
-        if (is == null) {
-            throw new POIXMLException("Missing resource 'empty.pptx'");
-        }
-        try {
-            return OPCPackage.open(is);
-        } catch (Exception e){
-            throw new POIXMLException(e);
-        } finally {
-            try {
-                is.close();
-            } catch (Exception e) {
-                throw new POIXMLException(e);
-            }
-        }
-    }
-
-    @Override
-    protected void onDocumentRead() throws IOException {
-        try {
-            PresentationDocument doc =
-                    PresentationDocument.Factory.parse(getCorePart().getInputStream(), DEFAULT_XML_OPTIONS);
-            _presentation = doc.getPresentation();
-
-            Map<String, XSLFSlideMaster> masterMap = new HashMap<String, XSLFSlideMaster>();
-            Map<String, XSLFSlide> shIdMap = new HashMap<String, XSLFSlide>();
-            for (RelationPart rp : getRelationParts()) {
-                POIXMLDocumentPart p = rp.getDocumentPart();
-                if (p instanceof XSLFSlide) {
-                    shIdMap.put(rp.getRelationship().getId(), (XSLFSlide) p);
-                } else if (p instanceof XSLFSlideMaster) {
-                    masterMap.put(getRelationId(p), (XSLFSlideMaster) p);
-                } else if (p instanceof XSLFTableStyles){
-                    _tableStyles = (XSLFTableStyles)p;
-                } else if (p instanceof XSLFNotesMaster) {
-                    _notesMaster = (XSLFNotesMaster)p;
-                } else if (p instanceof XSLFCommentAuthors) {
-                    _commentAuthors = (XSLFCommentAuthors)p;
-                }
-            }
-
-            _masters = new ArrayList<XSLFSlideMaster>(masterMap.size());
-            for (CTSlideMasterIdListEntry masterId : _presentation.getSldMasterIdLst().getSldMasterIdList()) {
-                XSLFSlideMaster master = masterMap.get(masterId.getId2());
-                _masters.add(master);
-            }
-
-            _slides = new ArrayList<XSLFSlide>(shIdMap.size());
-            if (_presentation.isSetSldIdLst()) {
-                for (CTSlideIdListEntry slId : _presentation.getSldIdLst().getSldIdList()) {
-                    XSLFSlide sh = shIdMap.get(slId.getId2());
-                    if (sh == null) {
-                        _logger.log(POILogger.WARN, "Slide with r:id " + slId.getId() + " was defined, but didn't exist in package, skipping");
-                        continue;
-                    }
-                    _slides.add(sh);
-                }
-            }
-        } catch (XmlException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        _presentation.save(out, DEFAULT_XML_OPTIONS);
-        out.close();
-    }
-
-    /**
-     * Get the document's embedded files.
-     */
-    @Override
-    public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
-        return Collections.unmodifiableList(
-                getPackage().getPartsByName(Pattern.compile("/ppt/embeddings/.*?"))
-        );
-    }
-
-    @Override
-    public List<XSLFPictureData> getPictureData() {
-        if(_pictures == null){
-            List<PackagePart> mediaParts = getPackage().getPartsByName(Pattern.compile("/ppt/media/.*?"));
-            _pictures = new ArrayList<XSLFPictureData>(mediaParts.size());
-            for(PackagePart part : mediaParts){
-                XSLFPictureData pd = new XSLFPictureData(part);
-                pd.setIndex(_pictures.size());
-                _pictures.add(pd);
-            }
-        }
-        return Collections.unmodifiableList(_pictures);
-    }
-
-    /**
-     * Create a slide and initialize it from the specified layout.
-     *
-     * @param layout The layout to use for the new slide.
-     * @return created slide
-     */
-    public XSLFSlide createSlide(XSLFSlideLayout layout) {
-        int slideNumber = 256, cnt = 1;
-        CTSlideIdList slideList;
-        if (!_presentation.isSetSldIdLst()) slideList = _presentation.addNewSldIdLst();
-        else {
-            slideList = _presentation.getSldIdLst();
-            for(CTSlideIdListEntry slideId : slideList.getSldIdArray()){
-                slideNumber = (int)Math.max(slideId.getId() + 1, slideNumber);
-                cnt++;
-            }
-
-            // Bug 55791: We also need to check that the resulting file name is not already taken
-            // this can happen when removing/adding slides
-            while(true) {
-                String slideName = XSLFRelation.SLIDE.getFileName(cnt);
-                boolean found = false;
-                for (POIXMLDocumentPart relation : getRelations()) {
-                    if (relation.getPackagePart() != null &&
-                            slideName.equals(relation.getPackagePart().getPartName().getName())) {
-                        // name is taken => try next one
-                        found = true;
-                        break;
-                    }
-                }
-
-                if(!found &&
-                        getPackage().getPartsByName(Pattern.compile(Pattern.quote(slideName))).size() > 0) {
-                    // name is taken => try next one
-                    found = true;
-                }
-
-                if (!found) {
-                    break;
-                }
-                cnt++;
-            }
-        }
-
-        RelationPart rp = createRelationship(
-                XSLFRelation.SLIDE, XSLFFactory.getInstance(), cnt, false);
-        XSLFSlide slide = rp.getDocumentPart();
-
-        CTSlideIdListEntry slideId = slideList.addNewSldId();
-        slideId.setId(slideNumber);
-        slideId.setId2(rp.getRelationship().getId());
-
-        layout.copyLayout(slide);
-        slide.addRelation(null, XSLFRelation.SLIDE_LAYOUT, layout);
-
-        _slides.add(slide);
-        return slide;
-    }
-    
-    /**
-     * Create a blank slide using the default (first) master.
-     */
-    @Override
-    public XSLFSlide createSlide() {
-        XSLFSlideLayout layout = _masters.get(0).getLayout(SlideLayout.BLANK);
-        if(layout == null) throw new IllegalArgumentException("Blank layout was not found");
-
-        return createSlide(layout);
-    }
-    
-    /**
-     * Return notes slide for the specified slide or create new if it does not exist yet.
-     */
-    public XSLFNotes getNotesSlide(XSLFSlide slide) {
-        
-        XSLFNotes notesSlide = slide.getNotes();
-        if (notesSlide == null) {
-            notesSlide = createNotesSlide(slide);
-        }
-        
-        return notesSlide;
-    }    
-    
-    /**
-     * Create a blank notes slide.
-     */
-    private XSLFNotes createNotesSlide(XSLFSlide slide) {
-
-        if (_notesMaster == null) {
-            createNotesMaster();
-        }
-        
-        Integer slideIndex = XSLFRelation.SLIDE.getFileNameIndex(slide);
-        
-        // add notes slide to presentation 
-        XSLFNotes notesSlide = (XSLFNotes) createRelationship
-            (XSLFRelation.NOTES, XSLFFactory.getInstance(), slideIndex);
-        // link slide and notes slide with each other
-        slide.addRelation(null, XSLFRelation.NOTES, notesSlide);
-        notesSlide.addRelation(null, XSLFRelation.NOTES_MASTER, _notesMaster);
-        notesSlide.addRelation(null, XSLFRelation.SLIDE, slide);
-
-        notesSlide.importContent(_notesMaster);
-        
-        return notesSlide;
-    }
-
-    /**
-     * Create a notes master.
-     */ 
-    public void createNotesMaster() {
-        RelationPart rp = createRelationship
-            (XSLFRelation.NOTES_MASTER, XSLFFactory.getInstance(), 1, false);
-        _notesMaster = rp.getDocumentPart();
-        
-        CTNotesMasterIdList notesMasterIdList = _presentation.addNewNotesMasterIdLst();
-        CTNotesMasterIdListEntry notesMasterId = notesMasterIdList.addNewNotesMasterId();
-        notesMasterId.setId(rp.getRelationship().getId());
-        
-        Integer themeIndex = 1;
-        // TODO: check if that list can be replaced by idx = Math.max(idx,themeIdx)
-        List<Integer> themeIndexList = new ArrayList<Integer>();
-        for (POIXMLDocumentPart p : getRelations()) {
-            if (p instanceof XSLFTheme) {
-                themeIndexList.add(XSLFRelation.THEME.getFileNameIndex(p));
-            }
-        }
-         
-        if (!themeIndexList.isEmpty()) {
-            Boolean found = false;
-            for (Integer i = 1; i <= themeIndexList.size(); i++) {
-                if (!themeIndexList.contains(i)) {
-                    found = true;
-                    themeIndex = i;
-                }
-            }
-            if (!found) {
-                themeIndex = themeIndexList.size() + 1;
-            }
-        }
-        
-        XSLFTheme theme = (XSLFTheme) createRelationship
-            (XSLFRelation.THEME, XSLFFactory.getInstance(), themeIndex);
-        theme.importTheme(getSlides().get(0).getTheme());
-        
-        _notesMaster.addRelation(null, XSLFRelation.THEME, theme);
-    }
-    
-    /**
-     * Return the Notes Master, if there is one.
-     * (May not be present if no notes exist)  
-     */
-    public XSLFNotesMaster getNotesMaster() {
-        return _notesMaster; 
-    }
-
-    @Override
-    public List<XSLFSlideMaster> getSlideMasters() {
-        return _masters;
-    }
-
-    /**
-     * Return all the slides in the slideshow
-     */
-    public List<XSLFSlide> getSlides() {
-        return _slides;
-    }
-    
-    /**
-     * Returns the list of comment authors, if there is one.
-     * Will only be present if at least one slide has comments on it.
-     */
-    public XSLFCommentAuthors getCommentAuthors() {
-        return _commentAuthors;
-    }
-
-    /**
-     *
-     * @param newIndex 0-based index of the slide
-     */
-    public void setSlideOrder(XSLFSlide slide, int newIndex){
-        int oldIndex = _slides.indexOf(slide);
-        if(oldIndex == -1) throw new IllegalArgumentException("Slide not found");
-        if (oldIndex == newIndex) return;
-
-        // fix the usermodel container
-        _slides.add(newIndex, _slides.remove(oldIndex));
-
-        // fix ordering in the low-level xml
-        CTSlideIdList sldIdLst = _presentation.getSldIdLst();
-        CTSlideIdListEntry[] entries = sldIdLst.getSldIdArray();
-        CTSlideIdListEntry oldEntry = entries[oldIndex];
-        if (oldIndex < newIndex) {
-            System.arraycopy(entries, oldIndex + 1, entries, oldIndex, newIndex - oldIndex);
-        } else {
-            System.arraycopy(entries, newIndex, entries, newIndex + 1, oldIndex - newIndex);
-        }
-        entries[newIndex] = oldEntry;
-        sldIdLst.setSldIdArray(entries);
-    }
-
-    public XSLFSlide removeSlide(int index){
-        XSLFSlide slide = _slides.remove(index);
-        removeRelation(slide);
-         _presentation.getSldIdLst().removeSldId(index);
-        return slide;
-    }
-    
-    @Override
-    public Dimension getPageSize(){
-        CTSlideSize sz = _presentation.getSldSz();
-        int cx = sz.getCx();
-        int cy = sz.getCy();
-        return new Dimension((int)Units.toPoints(cx), (int)Units.toPoints(cy));
-    }
-
-    @Override
-    public void setPageSize(Dimension pgSize){
-        CTSlideSize sz = CTSlideSize.Factory.newInstance();
-        sz.setCx(Units.toEMU(pgSize.getWidth()));
-        sz.setCy(Units.toEMU(pgSize.getHeight()));
-        _presentation.setSldSz(sz);
-    }
-
-
-    @Internal
-    public CTPresentation getCTPresentation(){
-        return _presentation;        
-    }
-
-    /**
-     * Adds a picture to the workbook.
-     *
-     * @param pictureData       The bytes of the picture
-     * @param format            The format of the picture.
-     *
-     * @return the picture data
-     */
-    public XSLFPictureData addPicture(byte[] pictureData, PictureType format) {
-        XSLFPictureData img = findPictureData(pictureData);
-
-        if (img != null) return img;
-        
-        int imageNumber = _pictures.size();
-        XSLFRelation relType = XSLFPictureData.getRelationForType(format);
-        if (relType == null) {
-            throw new IllegalArgumentException("Picture type "+format+" is not supported.");
-        }
-        img = (XSLFPictureData) createRelationship(relType, XSLFFactory.getInstance(), imageNumber + 1, true).getDocumentPart();
-        img.setIndex(imageNumber);
-        _pictures.add(img);
-        try {
-            OutputStream out = img.getPackagePart().getOutputStream();
-            out.write(pictureData);
-            out.close();
-        } catch (IOException e) {
-            throw new POIXMLException(e);
-        }
-        
-        return img;
-    }
-
-
-    /**
-     * Adds a picture to the slideshow.
-     *
-     * @param is                The stream to read image from
-     * @param format              The format of the picture
-     *
-     * @return the picture data
-     * @since 3.15 beta 2
-     */
-    @Override
-    public XSLFPictureData addPicture(InputStream is, PictureType format) throws IOException
-    {
-        return addPicture(IOUtils.toByteArray(is), format);
-    }
-
-
-    /**
-     * Adds a picture to the presentation.
-     *
-     * @param pict             The file containing the image to add
-     * @param format           The format of the picture.
-     *
-     * @return the picture data
-     * @since 3.15 beta 2
-     */
-    @Override
-    public XSLFPictureData addPicture(File pict, PictureType format) throws IOException
-    {
-        int length = (int) pict.length();
-        byte[] data = new byte[length];
-        FileInputStream is = new FileInputStream(pict);
-        try {
-            IOUtils.readFully(is, data);
-        } finally {
-            is.close();
-        }
-        return addPicture(data, format);
-    }
-
-
-    /**
-     * check if a picture with this picture data already exists in this presentation
-     * 
-     * @param pictureData The picture data to find in the SlideShow
-     * @return {@code null} if picture data is not found in this slideshow
-     * @since 3.15 beta 2
-     */
-    @Override
-    public XSLFPictureData findPictureData(byte[] pictureData) {
-        long checksum = IOUtils.calculateChecksum(pictureData);
-        byte cs[] = new byte[LittleEndianConsts.LONG_SIZE];
-        LittleEndian.putLong(cs,0,checksum);
-
-        for(XSLFPictureData pic : getPictureData()){
-            if(Arrays.equals(pic.getChecksum(), cs)) {
-                return pic;
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * Scan the master slides for the first slide layout with the given name.
-     *
-     * @param name  The layout name (case-insensitive). Cannot be null.
-     * @return the first layout found or null on failure
-     */
-    public XSLFSlideLayout findLayout(String name) {
-        for (XSLFSlideMaster master : getSlideMasters()) {
-            XSLFSlideLayout layout = master.getLayout(name);
-            if (layout != null) {
-                return layout;
-            }
-        }
-        return null;
-    }
-
-
-    public XSLFTableStyles getTableStyles(){
-        return _tableStyles;
-    }
-
-    CTTextParagraphProperties getDefaultParagraphStyle(int level) {
-        XmlObject[] o = _presentation.selectPath(
-                "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' " +
-                "declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' " +
-                ".//p:defaultTextStyle/a:lvl" +(level+1)+ "pPr");
-        if(o.length == 1){
-            return (CTTextParagraphProperties)o[0];
-        }
-        return null;
-    }
-
-    @Override
-    public MasterSheet<XSLFShape,XSLFTextParagraph> createMasterSheet() throws IOException {
-        // TODO: implement!
-        throw new UnsupportedOperationException();
-    }
-
-    public Resources getResources() {
-        // TODO: implement!
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
deleted file mode 100644
index e45df5e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.sl.usermodel.AutoShape;
-import org.apache.poi.util.Beta;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextAlignType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextAnchoringType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShapeNonVisual;
-
-
-/**
- * Represents a shape with a preset geometry.
- *
- * @author Yegor Kozlov
- */
-@Beta
-public class XSLFAutoShape extends XSLFTextShape
-    implements AutoShape<XSLFShape,XSLFTextParagraph> {
-
-    /*package*/ XSLFAutoShape(CTShape shape, XSLFSheet sheet) {
-        super(shape, sheet);
-    }
-
-    /*package*/
-    static XSLFAutoShape create(CTShape shape, XSLFSheet sheet) {
-        if (shape.getSpPr().isSetCustGeom()) {
-            return new XSLFFreeformShape(shape, sheet);
-        } else if (shape.getNvSpPr().getCNvSpPr().isSetTxBox()) {
-            return new XSLFTextBox(shape, sheet);
-        } else {
-            return new XSLFAutoShape(shape, sheet);
-        }
-    }
-
-    /**
-     * @param shapeId 1-based shapeId
-     */
-    static CTShape prototype(int shapeId) {
-        CTShape ct = CTShape.Factory.newInstance();
-        CTShapeNonVisual nvSpPr = ct.addNewNvSpPr();
-        CTNonVisualDrawingProps cnv = nvSpPr.addNewCNvPr();
-        cnv.setName("AutoShape " + shapeId);
-        cnv.setId(shapeId + 1);
-        nvSpPr.addNewCNvSpPr();
-        nvSpPr.addNewNvPr();
-        CTShapeProperties spPr = ct.addNewSpPr();
-        CTPresetGeometry2D prst = spPr.addNewPrstGeom();
-        prst.setPrst(STShapeType.RECT);
-        prst.addNewAvLst();
-        return ct;
-    }
-    
-    protected static void initTextBody(CTTextBody txBody) {
-        CTTextBodyProperties bodypr = txBody.addNewBodyPr();
-        bodypr.setAnchor(STTextAnchoringType.T);
-        bodypr.setRtlCol(false);
-        CTTextParagraph p = txBody.addNewP();
-        p.addNewPPr().setAlgn(STTextAlignType.L);
-        CTTextCharacterProperties endPr = p.addNewEndParaRPr();
-        endPr.setLang("en-US");
-        endPr.setSz(1100);   
-        p.addNewR().setT("");
-        txBody.addNewLstStyle();
-    }
-
-    protected CTTextBody getTextBody(boolean create){
-        CTShape shape = (CTShape)getXmlObject();
-        CTTextBody txBody = shape.getTxBody();
-        if (txBody == null && create) {
-            txBody = shape.addNewTxBody();
-            initTextBody(txBody);
-        }
-        return txBody;
-    }
-
-    @Override
-    public String toString(){
-        return "[" + getClass().getSimpleName() + "] " + getShapeName();
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
deleted file mode 100644
index 1eac4b2..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.sl.usermodel.Background;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTBackground;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTBackgroundProperties;
-
-/**
- * Background shape
- */
-public class XSLFBackground extends XSLFSimpleShape
-    implements Background<XSLFShape,XSLFTextParagraph> {
-
-    /* package */XSLFBackground(CTBackground shape, XSLFSheet sheet) {
-        super(shape, sheet);
-    }
-
-    @Override
-    public Rectangle2D getAnchor(){
-        Dimension pg = getSheet().getSlideShow().getPageSize();
-        return new Rectangle2D.Double(0, 0, pg.getWidth(), pg.getHeight());
-    }
-
-    /**
-     * background does not have a associated transform, therefore we return null
-     * 
-     * @param create ignored
-     *
-     * @return null
-     */
-    @Override
-    protected CTTransform2D getXfrm(boolean create) {
-        return null;
-    }
-    
-    @Override
-    public void setPlaceholder(Placeholder placeholder) {
-        // extending XSLFSimpleShape is a bit unlucky ...
-        throw new POIXMLException("Can't set a placeholder for a background");
-    }
-
-    protected CTBackgroundProperties getBgPr(boolean create) {
-        CTBackground bg = (CTBackground)getXmlObject();
-        if (!bg.isSetBgPr() && create) {
-            if (bg.isSetBgRef()) {
-                bg.unsetBgRef();
-            }
-            return bg.addNewBgPr();
-        }
-        return bg.getBgPr();
-    }
-    
-    public void setFillColor(Color color) {
-        CTBackgroundProperties bgPr = getBgPr(true);
-        
-        if (color == null) {
-            if (bgPr.isSetSolidFill()) {
-                bgPr.unsetSolidFill();
-            }
-
-            if (!bgPr.isSetNoFill()) {
-                bgPr.addNewNoFill();
-            }
-        } else {
-            if (bgPr.isSetNoFill()) {
-                bgPr.unsetNoFill();
-            }
-
-            CTSolidColorFillProperties fill = bgPr.isSetSolidFill() ? bgPr.getSolidFill() : bgPr.addNewSolidFill();
-                    
-            XSLFColor col = new XSLFColor(fill, getSheet().getTheme(), fill.getSchemeClr());
-            col.setColor(color);
-        }
-    }
-
-    @Override
-    protected XmlObject getShapeProperties() {
-        CTBackground bg = (CTBackground)getXmlObject();
-        if (bg.isSetBgPr()) {
-            return bg.getBgPr();
-        } else if (bg.isSetBgRef()) {
-            return bg.getBgRef();
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java
deleted file mode 100644
index 40b254c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTChartSpace;
-import org.openxmlformats.schemas.drawingml.x2006.chart.ChartSpaceDocument;
-
-/**
- * Represents a Chart in a .pptx presentation
- *
- *
- */
-@Beta
-public final class XSLFChart extends POIXMLDocumentPart {
-
-	/**
-	 * Root element of the Chart part
-	 */
-	private CTChartSpace chartSpace;
-
-    /**
-	 * The Chart within that
-	 */
-	private CTChart chart;
-
-    /**
-     * Construct a chart from a package part.
-     *
-     * @param part the package part holding the chart data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.drawingml.chart+xml</code>
-     * 
-     * @since POI 3.14-Beta1
-     */
-    protected XSLFChart(PackagePart part) throws IOException, XmlException {
-        super(part);
-
-        chartSpace = ChartSpaceDocument.Factory.parse(part.getInputStream(), DEFAULT_XML_OPTIONS).getChartSpace(); 
-        chart = chartSpace.getChart();
-    }
-
-    /**
-     * Construct a chart from a package part.
-     *
-     * @param part the package part holding the chart data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.drawingml.chart+xml</code>
-     * @param rel  the package relationship holding this chart,
-     * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart
-     * 
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSLFChart(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-
-	/**
-	 * Return the underlying CTChartSpace bean, the root element of the Chart part.
-	 *
-	 * @return the underlying CTChartSpace bean
-	 */
-	@Internal
-	public CTChartSpace getCTChartSpace(){
-		return chartSpace;
-	}
-
-	/**
-	 * Return the underlying CTChart bean, within the Chart Space
-	 *
-	 * @return the underlying CTChart bean
-	 */
-	@Internal
-	public CTChart getCTChart(){
-		return chart;
-	}
-
-	@Override
-	protected void commit() throws IOException {
-		XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-		xmlOptions.setSaveSyntheticDocumentElement(new QName(CTChartSpace.type.getName().getNamespaceURI(), "chartSpace", "c"));
-
-		PackagePart part = getPackagePart();
-		OutputStream out = part.getOutputStream();
-		chartSpace.save(out, xmlOptions);
-		out.close();
-	}
-
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java
deleted file mode 100644
index f519f7e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.ColorStyle;
-import org.apache.poi.sl.usermodel.PresetColor;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTFontReference;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTHslColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveFixedPercentage;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTScRgbColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSystemColor;
-import org.w3c.dom.Node;
-
-/**
- * Encapsulates logic to read color definitions from DrawingML and convert them to java.awt.Color
- */
-@Beta
-@Internal
-public class XSLFColor {
-    private static POILogger LOGGER = POILogFactory.getLogger(XSLFColor.class);
-    
-    private XmlObject _xmlObject;
-    private Color _color;
-    private CTSchemeColor _phClr;
-
-    public XSLFColor(XmlObject obj, XSLFTheme theme, CTSchemeColor phClr) {
-        _xmlObject = obj;
-        _phClr = phClr;
-        _color = toColor(obj, theme);
-    }
-
-    @Internal
-    public XmlObject getXmlObject() {
-        return _xmlObject;
-    }
-
-    /**
-     *
-     * @return  the displayed color as a Java Color.
-     * If not color information was found in the supplied xml object then a null is returned.
-     */
-    public Color getColor() {
-        return DrawPaint.applyColorTransform(getColorStyle());
-    }
-
-    public ColorStyle getColorStyle() {
-        return new ColorStyle() {
-            public Color getColor() {
-                return _color;
-            }
-
-            public int getAlpha() {
-                return getRawValue("alpha");
-            }
-
-            public int getHueOff() {
-                return getRawValue("hueOff");
-            }
-
-            public int getHueMod() {
-                return getRawValue("hueMod");
-            }
-
-            public int getSatOff() {
-                return getRawValue("satOff");
-            }
-
-            public int getSatMod() {
-                return getRawValue("satMod");
-            }
-
-            public int getLumOff() {
-                return getRawValue("lumOff");
-            }
-
-            public int getLumMod() {
-                return getRawValue("lumMod");
-            }
-
-            public int getShade() {
-                return getRawValue("shade");
-            }
-
-            public int getTint() {
-                return getRawValue("tint");
-            }
-        };
-    }
-    
-    Color toColor(XmlObject obj, XSLFTheme theme) {
-        Color color = null;
-        for (XmlObject ch : obj.selectPath("*")) {
-            if (ch instanceof CTHslColor) {
-                CTHslColor hsl = (CTHslColor)ch;
-                int h = hsl.getHue2();
-                int s = hsl.getSat2();
-                int l = hsl.getLum2();
-                color = DrawPaint.HSL2RGB(h / 60000d, s / 1000d, l / 1000d, 1d);
-            } else if (ch instanceof CTPresetColor) {
-                CTPresetColor prst = (CTPresetColor)ch;
-                String colorName = prst.getVal().toString();
-                PresetColor pc = PresetColor.valueOfOoxmlId(colorName);
-                if (pc != null) {
-                    color = pc.color;
-                }
-            } else if (ch instanceof CTSchemeColor) {
-                CTSchemeColor schemeColor = (CTSchemeColor)ch;
-                String colorRef = schemeColor.getVal().toString();
-                if(_phClr != null) {
-                    // context color overrides the theme
-                    colorRef = _phClr.getVal().toString();
-                }
-                // find referenced CTColor in the theme and convert it to java.awt.Color via a recursive call
-                CTColor ctColor = theme.getCTColor(colorRef);
-                if(ctColor != null) color = toColor(ctColor, null);
-            } else if (ch instanceof CTScRgbColor) {
-                // color in percentage is in linear RGB color space, i.e. needs to be gamma corrected for AWT color
-                CTScRgbColor scrgb = (CTScRgbColor)ch;
-                color = new Color(DrawPaint.lin2srgb(scrgb.getR()), DrawPaint.lin2srgb(scrgb.getG()), DrawPaint.lin2srgb(scrgb.getB()));
-            } else if (ch instanceof CTSRgbColor) {
-                // color in sRGB color space, i.e. same as AWT Color
-                CTSRgbColor srgb = (CTSRgbColor)ch;
-                byte[] val = srgb.getVal();
-                color = new Color(0xFF & val[0], 0xFF & val[1], 0xFF & val[2]);
-            } else if (ch instanceof CTSystemColor) {
-                CTSystemColor sys = (CTSystemColor)ch;
-                if(sys.isSetLastClr()) {
-                    byte[] val = sys.getLastClr();
-                    color = new Color(0xFF & val[0], 0xFF & val[1], 0xFF & val[2]);
-                } else {
-                    String colorName = sys.getVal().toString();
-                    PresetColor pc = PresetColor.valueOfOoxmlId(colorName);
-                    if (pc != null) {
-                        color = pc.color;
-                    }
-                    if (color == null) {
-                        color = Color.black;
-                    }
-                }
-            } else if (ch instanceof CTFontReference) {
-                // try next ...
-                continue;
-            } else {
-                throw new IllegalArgumentException("Unexpected color choice: " + ch.getClass());
-            }
-        }
-        return color;
-    }
-
-    /**
-     * Sets the solid color
-     *
-     * @param color solid color
-     */
-    @Internal
-    protected void setColor(Color color) {
-        if (!(_xmlObject instanceof CTSolidColorFillProperties)) {
-            LOGGER.log(POILogger.ERROR, "XSLFColor.setColor currently only supports CTSolidColorFillProperties");
-            return;
-        }
-        CTSolidColorFillProperties fill = (CTSolidColorFillProperties)_xmlObject;
-        if (fill.isSetSrgbClr()) {
-            fill.unsetSrgbClr();
-        }
-
-        if (fill.isSetScrgbClr()) {
-            fill.unsetScrgbClr();
-        }
-        
-        if (fill.isSetHslClr()) {
-            fill.unsetHslClr();
-        }
-        
-        if (fill.isSetPrstClr()) {
-            fill.unsetPrstClr();
-        }
-        
-        if (fill.isSetSchemeClr()) {
-            fill.unsetSchemeClr();
-        }
-        
-        if (fill.isSetSysClr()) {
-            fill.unsetSysClr();
-        }
-
-        float[] rgbaf = color.getRGBComponents(null);
-        boolean addAlpha = (rgbaf.length == 4 && rgbaf[3] < 1f);
-        CTPositiveFixedPercentage alphaPct;
-        
-        // see office open xml part 4 - 5.1.2.2.30 and 5.1.2.2.32
-        if (isInt(rgbaf[0]) && isInt(rgbaf[1]) && isInt(rgbaf[2])) {
-            // sRGB has a gamma of 2.2
-            CTSRgbColor rgb = fill.addNewSrgbClr();
-            
-            byte rgbBytes[] = { (byte)color.getRed(), (byte)color.getGreen(), (byte)color.getBlue() };
-            rgb.setVal(rgbBytes);
-            alphaPct = (addAlpha) ? rgb.addNewAlpha() : null;
-        } else {
-            CTScRgbColor rgb = fill.addNewScrgbClr();
-            rgb.setR(DrawPaint.srgb2lin(rgbaf[0]));
-            rgb.setG(DrawPaint.srgb2lin(rgbaf[1]));
-            rgb.setB(DrawPaint.srgb2lin(rgbaf[2]));
-            alphaPct = (addAlpha) ? rgb.addNewAlpha() : null;
-        }
-
-        // alpha (%)
-        if (alphaPct != null) {
-            alphaPct.setVal((int)(100000 * rgbaf[3]));
-        }
-    }
-    
-    /**
-     * @return true, if this is an integer color value
-     */
-    private static boolean isInt(float f) {
-        return Math.abs((f*255f) - Math.rint(f*255f)) < 0.00001f;
-    }
-    
-    private int getRawValue(String elem) {
-        String query = "declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' $this//a:" + elem;
-
-        XmlObject[] obj;
-
-        // first ask the context color and if not found, ask the actual color bean
-        if (_phClr != null){
-            obj = _phClr.selectPath(query);
-            if (obj.length == 1){
-                Node attr = obj[0].getDomNode().getAttributes().getNamedItem("val");
-                if(attr != null) {
-                    return Integer.parseInt(attr.getNodeValue());
-                }
-            }
-        }
-
-        obj = _xmlObject.selectPath(query);
-        if (obj.length == 1){
-            Node attr = obj[0].getDomNode().getAttributes().getNamedItem("val");
-            if(attr != null) {
-                return Integer.parseInt(attr.getNodeValue());
-            }
-        }
-
-        return -1;        
-    }
-    
-    /**
-     * Read a perecentage value from the supplied xml bean.
-     * Example:
-     *   <a:tint val="45000"/>
-     *
-     * the returned value is 45
-     *
-     * @return  the percentage value in the range [0 .. 100]
-     */
-    private int getPercentageValue(String elem){
-        int val = getRawValue(elem);
-        return (val == -1) ? val : (val / 1000);
-    }
-
-    private int getAngleValue(String elem){
-        int val = getRawValue(elem);
-        return (val == -1) ? val : (val / 60000);
-    }
-
-    /**
-     * the opacity as expressed by a percentage value
-     *
-     * @return  opacity in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getAlpha(){
-        return getPercentageValue("alpha");        
-    }
-
-    /**
-     * the opacity as expressed by a percentage relative to the input color
-     *
-     * @return  opacity in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getAlphaMod(){
-        return getPercentageValue("alphaMod");
-    }
-
-    /**
-     * the opacity as expressed by a percentage offset increase or decrease relative to
-     * the input color. Increases will never increase the opacity beyond 100%, decreases will
-     * never decrease the opacity below 0%.
-     *
-     * @return  opacity shift in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getAlphaOff(){
-        return getPercentageValue("alphaOff");
-    }
-
-
-    int getHue(){
-        return getAngleValue("hue");
-    }
-
-    int getHueMod(){
-        return getPercentageValue("hueMod");
-    }
-
-    int getHueOff(){
-        return getPercentageValue("hueOff");
-    }
-
-    /**
-     * specifies the input color with the specified luminance,
-     * but with its hue and saturation unchanged.
-     *
-     * @return  luminance in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getLum(){
-        return getPercentageValue("lum");
-    }
-
-    /**
-     * the luminance as expressed by a percentage relative to the input color
-     *
-     * @return  luminance in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getLumMod(){
-        return getPercentageValue("lumMod");
-    }
-
-    /**
-     * the luminance shift as expressed by a percentage relative to the input color
-     *
-     * @return  luminance shift in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getLumOff(){
-        return getPercentageValue("lumOff");
-    }
-
-    /**
-     * specifies the input color with the specified saturation,
-     * but with its hue and luminance unchanged.
-     *
-     * @return  saturation in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getSat(){
-        return getPercentageValue("sat");
-    }
-
-    /**
-     * the saturation as expressed by a percentage relative to the input color
-     *
-     * @return  saturation in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getSatMod(){
-        return getPercentageValue("satMod");
-    }
-
-    /**
-     * the saturation shift as expressed by a percentage relative to the input color
-     *
-     * @return  saturation shift in percents in the range [0..100]
-     * or -1 if the value is not set
-     */
-    int getSatOff(){
-        return getPercentageValue("satOff");
-    }
-
-    /**
-     * specifies the input color with the specific red component, but with the blue and green color
-     * components unchanged
-     * 
-     * @return the value of the red component specified as a
-     * percentage with 0% indicating minimal blue and 100% indicating maximum
-     * or -1 if the value is not set
-     */
-    int getRed(){
-        return getPercentageValue("red");
-    }
-
-    int getRedMod(){
-        return getPercentageValue("redMod");
-    }
-
-    int getRedOff(){
-        return getPercentageValue("redOff");
-    }
-
-    /**
-     * specifies the input color with the specific green component, but with the red and blue color
-     * components unchanged
-     *
-     * @return the value of the green component specified as a
-     * percentage with 0% indicating minimal blue and 100% indicating maximum
-     * or -1 if the value is not set
-     */
-    int getGreen(){
-        return getPercentageValue("green");
-    }
-
-    int getGreenMod(){
-        return getPercentageValue("greenMod");
-    }
-
-    int getGreenOff(){
-        return getPercentageValue("greenOff");
-    }
-
-    /**
-     * specifies the input color with the specific blue component, but with the red and green color
-     * components unchanged
-     *
-     * @return the value of the blue component specified as a
-     * percentage with 0% indicating minimal blue and 100% indicating maximum
-     * or -1 if the value is not set
-     */
-    int getBlue(){
-        return getPercentageValue("blue");
-    }
-
-    int getBlueMod(){
-        return getPercentageValue("blueMod");
-    }
-
-    int getBlueOff(){
-        return getPercentageValue("blueOff");
-    }
-
-    /**
-     * specifies a darker version of its input color.
-     * A 10% shade is 10% of the input color combined with 90% black.
-     * 
-     * @return the value of the shade specified as a
-     * percentage with 0% indicating minimal shade and 100% indicating maximum
-     * or -1 if the value is not set
-     */
-    public int getShade(){
-        return getPercentageValue("shade");
-    }
-
-    /**
-     * specifies a lighter version of its input color.
-     * A 10% tint is 10% of the input color combined with 90% white.
-     *
-     * @return the value of the tint specified as a
-     * percentage with 0% indicating minimal tint and 100% indicating maximum
-     * or -1 if the value is not set
-     */
-    public int getTint(){
-        return getPercentageValue("tint");
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
deleted file mode 100644
index 52aa0f6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentAuthor;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentAuthorList;
-import org.openxmlformats.schemas.presentationml.x2006.main.CmAuthorLstDocument;
-
-@Beta
-public class XSLFCommentAuthors extends POIXMLDocumentPart {
-    private final CTCommentAuthorList _authors;
-    
-    /**
-     * Create a new set of slide comments
-     */
-    XSLFCommentAuthors() {
-       super();
-       CmAuthorLstDocument doc = CmAuthorLstDocument.Factory.newInstance();
-       _authors = doc.addNewCmAuthorLst();
-    }
-
-    /**
-     * Construct a SpreadsheetML slide authors from a package part
-     *
-     * @param part the package part holding the comment authors data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.commentAuthors+xml</code>
-     * 
-     * @since POI 3.14-Beta1
-     */
-    XSLFCommentAuthors(PackagePart part) throws IOException, XmlException {
-        super(part);
-        CmAuthorLstDocument doc =
-           CmAuthorLstDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-        _authors = doc.getCmAuthorLst();
-    }
-
-    /**
-     * Construct a SpreadsheetML slide authors from a package part
-     *
-     * @param part the package part holding the comment authors data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.commentAuthors+xml</code>
-     * @param rel  the package relationship holding this comment authors,
-     * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors
-     * 
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    XSLFCommentAuthors(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }    
-    
-    public CTCommentAuthorList getCTCommentAuthorsList() {
-       return _authors;
-    }
-    
-    public CTCommentAuthor getAuthorById(long id) {
-       // TODO Have a map
-       for (CTCommentAuthor author : _authors.getCmAuthorArray()) {
-          if (author.getId() == id) {
-             return author;
-          }
-       }
-       return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java
deleted file mode 100644
index c2e1c73..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTComment;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentList;
-import org.openxmlformats.schemas.presentationml.x2006.main.CmLstDocument;
-
-@Beta
-public class XSLFComments extends POIXMLDocumentPart {
-    private final CTCommentList _comments;
-    
-    /**
-     * Create a new set of slide comments
-     */
-    XSLFComments() {
-       super();
-       CmLstDocument doc = CmLstDocument.Factory.newInstance();
-       _comments = doc.addNewCmLst();
-    }
-
-    /**
-     * Construct a SpreadsheetML slide comments from a package part
-     *
-     * @param part the package part holding the comments data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.comments+xml</code>
-     * 
-     * @since POI 3.14-Beta1
-     */
-    XSLFComments(PackagePart part) throws IOException, XmlException {
-        super(part);
-
-        CmLstDocument doc =
-           CmLstDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-        _comments = doc.getCmLst();
-    }
-
-    /**
-     * Construct a SpreadsheetML slide comments from a package part
-     *
-     * @param part the package part holding the comments data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.comments+xml</code>
-     * @param rel  the package relationship holding this comments,
-     * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments
-     * 
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    XSLFComments(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    public CTCommentList getCTCommentsList() {
-       return _comments;
-    }
-    
-    public int getNumberOfComments() {
-       return _comments.sizeOfCmArray();
-    }
-    
-    public CTComment getCommentAt(int pos) {
-       return _comments.getCmArray(pos);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
deleted file mode 100644
index 2fd3365..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Removal;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObjectData;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTable;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommonSlideData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-
-/*
- * @deprecated POI 3.16 beta 1. - iterate over the shapes of a slide instead
- */
-@Removal(version="3.18")
-@Beta
-public class XSLFCommonSlideData {
-    private final CTCommonSlideData data;
-
-    public XSLFCommonSlideData(CTCommonSlideData data) {
-        this.data = data;
-    }
-    
-    public List<DrawingTextBody> getDrawingText() {
-        CTGroupShape gs = data.getSpTree();
-
-        List<DrawingTextBody> out = new ArrayList<DrawingTextBody>();
-
-        processShape(gs, out);
-
-        for (CTGroupShape shape : gs.getGrpSpArray()) {
-            processShape(shape, out);
-        }
-
-        for (CTGraphicalObjectFrame frame: gs.getGraphicFrameArray()) {
-            CTGraphicalObjectData data = frame.getGraphic().getGraphicData();
-            XmlCursor c = data.newCursor();
-            c.selectPath("declare namespace pic='"+CTTable.type.getName().getNamespaceURI()+"' .//pic:tbl");
-
-            while (c.toNextSelection()) {
-                XmlObject o = c.getObject();
-
-                if (o instanceof XmlAnyTypeImpl) {
-                    // Pesky XmlBeans bug - see Bugzilla #49934
-                    try {
-                        o = CTTable.Factory.parse(o.toString(), DEFAULT_XML_OPTIONS);
-                    } catch (XmlException e) {
-                        throw new POIXMLException(e);
-                    }
-                }
-
-                if (o instanceof CTTable) {
-                    DrawingTable table = new DrawingTable((CTTable) o);
-
-                    for (DrawingTableRow row : table.getRows()) {
-                        for (DrawingTableCell cell : row.getCells()) {
-                            DrawingTextBody textBody = cell.getTextBody();
-                            out.add(textBody);
-                        }
-                    }
-                }
-            }
-
-            c.dispose();
-        }
-
-        return out;
-    }
-    public List<DrawingParagraph> getText() {
-       List<DrawingParagraph> paragraphs = new ArrayList<DrawingParagraph>();
-       for(DrawingTextBody textBody : getDrawingText()) {
-          paragraphs.addAll(Arrays.asList(textBody.getParagraphs()));
-       }
-       return paragraphs;
-    }
-
-    private void processShape(CTGroupShape gs, List<DrawingTextBody> out) {
-        for (CTShape shape : gs.getSpArray()) {
-            CTTextBody ctTextBody = shape.getTxBody();
-            if (ctTextBody==null) {
-                continue;
-            }
-            
-            DrawingTextBody textBody;
-            CTApplicationNonVisualDrawingProps nvpr = shape.getNvSpPr().getNvPr(); 
-            if(nvpr.isSetPh()) {
-               textBody = new DrawingTextPlaceholder(ctTextBody, nvpr.getPh());
-            } else {
-               textBody = new DrawingTextBody(ctTextBody);
-            }
-
-            out.add(textBody);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
deleted file mode 100644
index 0ca895e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.sl.usermodel.ConnectorShape;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.util.Beta;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnectorNonVisual;
-
-/**
- * Specifies a connection shape.
- *
- * @author Yegor Kozlov
- */
-@Beta
-public class XSLFConnectorShape extends XSLFSimpleShape
-    implements ConnectorShape<XSLFShape,XSLFTextParagraph> {
-
-    /*package*/ XSLFConnectorShape(CTConnector shape, XSLFSheet sheet) {
-        super(shape, sheet);
-    }
-
-    /**
-     * @param shapeId 1-based shapeId
-     */
-    static CTConnector prototype(int shapeId) {
-        CTConnector ct = CTConnector.Factory.newInstance();
-        CTConnectorNonVisual nvSpPr = ct.addNewNvCxnSpPr();
-        CTNonVisualDrawingProps cnv = nvSpPr.addNewCNvPr();
-        cnv.setName("Connector " + shapeId);
-        cnv.setId(shapeId + 1);
-        nvSpPr.addNewCNvCxnSpPr();
-        nvSpPr.addNewNvPr();
-        CTShapeProperties spPr = ct.addNewSpPr();
-        CTPresetGeometry2D prst = spPr.addNewPrstGeom();
-        prst.setPrst(STShapeType.LINE);
-        prst.addNewAvLst();
-        /* CTLineProperties ln = */ spPr.addNewLn();
-        return ct;
-    }
-
-
-    /**
-     * YK: shadows of lines are suppressed for now.
-     */
-    @Override
-    public XSLFShadow getShadow() {
-        return null;
-    }
-
-    @Override
-    public void setPlaceholder(Placeholder placeholder) {
-        throw new POIXMLException("A connector shape can't be a placeholder.");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
deleted file mode 100644
index ccf0c7b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-
-
-/**
- * @author Yegor Kozlov
- */
-@Beta
-public class XSLFDrawing {
-    private XSLFSheet _sheet;
-    private int _shapeId = 1;
-    private CTGroupShape _spTree;
-
-    /*package*/ XSLFDrawing(XSLFSheet sheet, CTGroupShape spTree){
-        _sheet = sheet;
-        _spTree = spTree;
-        XmlObject[] cNvPr = sheet.getSpTree().selectPath(
-                "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:cNvPr");
-        for(XmlObject o : cNvPr) {
-            // powerpoint generates AlternateContent elements which cNvPr elements aren't recognized
-            // ignore them for now
-            if (o instanceof CTNonVisualDrawingProps) {
-                CTNonVisualDrawingProps p = (CTNonVisualDrawingProps)o;
-                _shapeId = (int)Math.max(_shapeId, p.getId());
-            }
-        }
-    }
-
-    public XSLFAutoShape createAutoShape(){
-        CTShape sp = _spTree.addNewSp();
-        sp.set(XSLFAutoShape.prototype(_shapeId++));
-        XSLFAutoShape shape = new XSLFAutoShape(sp, _sheet);
-        shape.setAnchor(new Rectangle2D.Double());
-        return shape;
-    }
-
-    public XSLFFreeformShape createFreeform(){
-        CTShape sp = _spTree.addNewSp();
-        sp.set(XSLFFreeformShape.prototype(_shapeId++));
-        XSLFFreeformShape shape = new XSLFFreeformShape(sp, _sheet);
-        shape.setAnchor(new Rectangle2D.Double());
-        return shape;
-    }
-
-    public XSLFTextBox createTextBox(){
-        CTShape sp = _spTree.addNewSp();
-        sp.set(XSLFTextBox.prototype(_shapeId++));
-        XSLFTextBox shape = new XSLFTextBox(sp, _sheet);
-        shape.setAnchor(new Rectangle2D.Double());
-        return shape;
-    }
-
-    public XSLFConnectorShape createConnector(){
-        CTConnector sp = _spTree.addNewCxnSp();
-        sp.set(XSLFConnectorShape.prototype(_shapeId++));
-        XSLFConnectorShape shape = new XSLFConnectorShape(sp, _sheet);
-        shape.setAnchor(new Rectangle2D.Double());
-        shape.setLineColor(Color.black);
-        shape.setLineWidth(0.75);
-        return shape;
-    }
-
-    public XSLFGroupShape createGroup(){
-        CTGroupShape obj = _spTree.addNewGrpSp();
-        obj.set(XSLFGroupShape.prototype(_shapeId++));
-        XSLFGroupShape shape = new XSLFGroupShape(obj, _sheet);
-        shape.setAnchor(new Rectangle2D.Double());
-        return shape;
-    }
-
-    public XSLFPictureShape createPicture(String rel){
-        CTPicture obj = _spTree.addNewPic();
-        obj.set(XSLFPictureShape.prototype(_shapeId++, rel));
-        XSLFPictureShape shape = new XSLFPictureShape(obj, _sheet);
-        shape.setAnchor(new Rectangle2D.Double());
-        return shape;
-    }
-
-    public XSLFTable createTable(){
-        CTGraphicalObjectFrame obj = _spTree.addNewGraphicFrame();
-        obj.set(XSLFTable.prototype(_shapeId++));
-        XSLFTable shape = new XSLFTable(obj, _sheet);
-        shape.setAnchor(new Rectangle2D.Double());
-        return shape;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFactory.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
deleted file mode 100644
index 897ebae..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLFactory;
-import org.apache.poi.POIXMLRelation;
-
-/**
- * Instantiates sub-classes of POIXMLDocumentPart depending on their relationship type
- */
-public final class XSLFFactory extends POIXMLFactory  {
-    private XSLFFactory(){
-
-    }
-
-    private static final XSLFFactory inst = new XSLFFactory();
-
-    public static XSLFFactory getInstance(){
-        return inst;
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    @Override
-    protected POIXMLRelation getDescriptor(String relationshipType) {
-        return XSLFRelation.getInstance(relationshipType);
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    @Override
-    protected POIXMLDocumentPart createDocumentPart
-        (Class<? extends POIXMLDocumentPart> cls, Class<?>[] classes, Object[] values)
-    throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
-        Constructor<? extends POIXMLDocumentPart> constructor = cls.getDeclaredConstructor(classes);
-        return constructor.newInstance(values);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontManager.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontManager.java
deleted file mode 100644
index cc5fc6c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontManager.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-/**
- * Manages fonts when rendering slides.
- *
- * Use this class to handle unknown / missing fonts or to substitute fonts
- */
-public interface XSLFFontManager {
-
-    /**
-     * select a font to be used to paint text
-     *
-     * @param typeface the font family as defined in the .pptx file.
-     * This can be unknown or missing in the graphic environment.
-     *
-     * @return the font to be used to paint text
-     */
-
-    String getRendererableFont(String typeface, int pitchFamily);
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
deleted file mode 100644
index 3e482d3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Path2D;
-import java.awt.geom.PathIterator;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.sl.usermodel.FreeformShape;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Units;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTAdjPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTCustomGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGeomRect;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DClose;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DCubicBezierTo;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DLineTo;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DMoveTo;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DQuadBezierTo;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShapeNonVisual;
-
-/**
- * Represents a custom geometric shape.
- * This shape will consist of a series of lines and curves described within a creation path.
- */
-@Beta
-public class XSLFFreeformShape extends XSLFAutoShape
-    implements FreeformShape<XSLFShape,XSLFTextParagraph> {
-
-    /*package*/ XSLFFreeformShape(CTShape shape, XSLFSheet sheet) {
-        super(shape, sheet);
-    }
-
-    @Override
-    public int setPath(Path2D.Double path) {
-        CTPath2D ctPath = CTPath2D.Factory.newInstance();
-
-        Rectangle2D bounds = path.getBounds2D();
-        int x0 = Units.toEMU(bounds.getX());
-        int y0 = Units.toEMU(bounds.getY());
-        PathIterator it = path.getPathIterator(new AffineTransform());
-        int numPoints = 0;
-        ctPath.setH(Units.toEMU(bounds.getHeight()));
-        ctPath.setW(Units.toEMU(bounds.getWidth()));
-        while (!it.isDone()) {
-            double[] vals = new double[6];
-            int type = it.currentSegment(vals);
-            switch (type) {
-                case PathIterator.SEG_MOVETO:
-                    CTAdjPoint2D mv = ctPath.addNewMoveTo().addNewPt();
-                    mv.setX(Units.toEMU(vals[0]) - x0);
-                    mv.setY(Units.toEMU(vals[1]) - y0);
-                    numPoints++;
-                    break;
-                case PathIterator.SEG_LINETO:
-                    CTAdjPoint2D ln = ctPath.addNewLnTo().addNewPt();
-                    ln.setX(Units.toEMU(vals[0]) - x0);
-                    ln.setY(Units.toEMU(vals[1]) - y0);
-                    numPoints++;
-                    break;
-                case PathIterator.SEG_QUADTO:
-                    CTPath2DQuadBezierTo qbez = ctPath.addNewQuadBezTo();
-                    CTAdjPoint2D qp1 = qbez.addNewPt();
-                    qp1.setX(Units.toEMU(vals[0]) - x0);
-                    qp1.setY(Units.toEMU(vals[1]) - y0);
-                    CTAdjPoint2D qp2 = qbez.addNewPt();
-                    qp2.setX(Units.toEMU(vals[2]) - x0);
-                    qp2.setY(Units.toEMU(vals[3]) - y0);
-                    numPoints += 2;
-                    break;
-                case PathIterator.SEG_CUBICTO:
-                    CTPath2DCubicBezierTo bez = ctPath.addNewCubicBezTo();
-                    CTAdjPoint2D p1 = bez.addNewPt();
-                    p1.setX(Units.toEMU(vals[0]) - x0);
-                    p1.setY(Units.toEMU(vals[1]) - y0);
-                    CTAdjPoint2D p2 = bez.addNewPt();
-                    p2.setX(Units.toEMU(vals[2]) - x0);
-                    p2.setY(Units.toEMU(vals[3]) - y0);
-                    CTAdjPoint2D p3 = bez.addNewPt();
-                    p3.setX(Units.toEMU(vals[4]) - x0);
-                    p3.setY(Units.toEMU(vals[5]) - y0);
-                    numPoints += 3;
-                    break;
-                case PathIterator.SEG_CLOSE:
-                    numPoints++;
-                    ctPath.addNewClose();
-                    break;
-                default:
-                    throw new IllegalStateException("Unrecognized path segment type: " + type);
-            }
-            it.next();
-        }
-        
-        XmlObject xo = getShapeProperties();
-        if (!(xo instanceof CTShapeProperties)) {
-            return -1;
-        }
-
-        ((CTShapeProperties)xo).getCustGeom().getPathLst().setPathArray(new CTPath2D[]{ctPath});
-        setAnchor(bounds);
-        return numPoints;
-    }
-
-    @Override
-    public Path2D.Double getPath() {
-        Path2D.Double path = new Path2D.Double();
-        Rectangle2D bounds = getAnchor();
-
-        XmlObject xo = getShapeProperties();
-        if (!(xo instanceof CTShapeProperties)) {
-            return null;
-        }
-        
-        CTCustomGeometry2D geom = ((CTShapeProperties)xo).getCustGeom();
-        for(CTPath2D spPath : geom.getPathLst().getPathArray()){
-            double scaleW = bounds.getWidth() / Units.toPoints(spPath.getW());
-            double scaleH = bounds.getHeight() / Units.toPoints(spPath.getH());
-            for(XmlObject ch : spPath.selectPath("*")){
-                if(ch instanceof CTPath2DMoveTo){
-                    CTAdjPoint2D pt = ((CTPath2DMoveTo)ch).getPt();
-                    path.moveTo(
-                            (float) (Units.toPoints((Long) pt.getX()) * scaleW),
-                            (float) (Units.toPoints((Long) pt.getY()) * scaleH));
-                } else if (ch instanceof CTPath2DLineTo){
-                    CTAdjPoint2D pt = ((CTPath2DLineTo)ch).getPt();
-                    path.lineTo((float)Units.toPoints((Long)pt.getX()),
-                                (float)Units.toPoints((Long)pt.getY()));
-                } else if (ch instanceof CTPath2DQuadBezierTo){
-                    CTPath2DQuadBezierTo bez = ((CTPath2DQuadBezierTo)ch);
-                    CTAdjPoint2D pt1 = bez.getPtArray(0);
-                    CTAdjPoint2D pt2 = bez.getPtArray(1);
-                    path.quadTo(
-                            (float) (Units.toPoints((Long) pt1.getX()) * scaleW),
-                            (float) (Units.toPoints((Long) pt1.getY()) * scaleH),
-                            (float) (Units.toPoints((Long) pt2.getX()) * scaleW),
-                            (float) (Units.toPoints((Long) pt2.getY()) * scaleH));
-                } else if (ch instanceof CTPath2DCubicBezierTo){
-                    CTPath2DCubicBezierTo bez = ((CTPath2DCubicBezierTo)ch);
-                    CTAdjPoint2D pt1 = bez.getPtArray(0);
-                    CTAdjPoint2D pt2 = bez.getPtArray(1);
-                    CTAdjPoint2D pt3 = bez.getPtArray(2);
-                    path.curveTo(
-                            (float) (Units.toPoints((Long) pt1.getX()) * scaleW),
-                            (float) (Units.toPoints((Long) pt1.getY()) * scaleH),
-                            (float) (Units.toPoints((Long) pt2.getX()) * scaleW),
-                            (float) (Units.toPoints((Long) pt2.getY()) * scaleH),
-                            (float) (Units.toPoints((Long) pt3.getX()) * scaleW),
-                            (float) (Units.toPoints((Long) pt3.getY()) * scaleH));
-                } else if (ch instanceof CTPath2DClose){
-                    path.closePath();
-                }
-            }
-        }
-
-        // the created path starts at (x=0, y=0).
-        // The returned path should fit in the bounding rectangle
-        AffineTransform at = new AffineTransform();
-        at.translate(bounds.getX(), bounds.getY());
-        return new Path2D.Double(at.createTransformedShape(path));
-    }
-    /**
-     * @param shapeId 1-based shapeId
-     */
-    static CTShape prototype(int shapeId) {
-        CTShape ct = CTShape.Factory.newInstance();
-        CTShapeNonVisual nvSpPr = ct.addNewNvSpPr();
-        CTNonVisualDrawingProps cnv = nvSpPr.addNewCNvPr();
-        cnv.setName("Freeform " + shapeId);
-        cnv.setId(shapeId + 1);
-        nvSpPr.addNewCNvSpPr();
-        nvSpPr.addNewNvPr();
-        CTShapeProperties spPr = ct.addNewSpPr();
-        CTCustomGeometry2D geom = spPr.addNewCustGeom();
-        geom.addNewAvLst();
-        geom.addNewGdLst();
-        geom.addNewAhLst();
-        geom.addNewCxnLst();
-        CTGeomRect rect = geom.addNewRect();
-        rect.setR("r");
-        rect.setB("b");
-        rect.setT("t");
-        rect.setL("l");
-        geom.addNewPathLst();
-        return ct;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
deleted file mode 100644
index 1b5a9dc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.geom.Rectangle2D;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.usermodel.GraphicalFrame;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObjectData;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-
-@Beta
-public class XSLFGraphicFrame extends XSLFShape implements GraphicalFrame<XSLFShape, XSLFTextParagraph> {
-    private static final POILogger LOG = POILogFactory.getLogger(XSLFGraphicFrame.class);
-
-    /*package*/ XSLFGraphicFrame(CTGraphicalObjectFrame shape, XSLFSheet sheet){
-        super(shape,sheet);
-    }
-
-    public ShapeType getShapeType(){
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Rectangle2D getAnchor(){
-        CTTransform2D xfrm = ((CTGraphicalObjectFrame)getXmlObject()).getXfrm();
-        CTPoint2D off = xfrm.getOff();
-        double x = Units.toPoints(off.getX());
-        double y = Units.toPoints(off.getY());
-        CTPositiveSize2D ext = xfrm.getExt();
-        double cx = Units.toPoints(ext.getCx());
-        double cy = Units.toPoints(ext.getCy());
-        return new Rectangle2D.Double(x, y, cx, cy);
-    }
-
-    @Override
-    public void setAnchor(Rectangle2D anchor){
-        CTTransform2D xfrm = ((CTGraphicalObjectFrame)getXmlObject()).getXfrm();
-        CTPoint2D off = xfrm.isSetOff() ? xfrm.getOff() : xfrm.addNewOff();
-        long x = Units.toEMU(anchor.getX());
-        long y = Units.toEMU(anchor.getY());
-        off.setX(x);
-        off.setY(y);
-        CTPositiveSize2D ext = xfrm.isSetExt() ? xfrm.getExt() : xfrm
-                .addNewExt();
-        long cx = Units.toEMU(anchor.getWidth());
-        long cy = Units.toEMU(anchor.getHeight());
-        ext.setCx(cx);
-        ext.setCy(cy);
-    }
-
-
-    static XSLFGraphicFrame create(CTGraphicalObjectFrame shape, XSLFSheet sheet){
-        String uri = shape.getGraphic().getGraphicData().getUri();
-        if(XSLFTable.TABLE_URI.equals(uri)){
-            return new XSLFTable(shape, sheet);
-        } else {
-            return new XSLFGraphicFrame(shape, sheet);
-        }
-    }
-
-    /**
-     * Rotate this shape.
-     * <p>
-     * Positive angles are clockwise (i.e., towards the positive y axis);
-     * negative angles are counter-clockwise (i.e., towards the negative y axis).
-     * </p>
-     *
-     * @param theta the rotation angle in degrees.
-     */
-    public void setRotation(double theta){
-    	throw new IllegalArgumentException("Operation not supported");
-    }
-
-    /**
-     * Rotation angle in degrees
-     * <p>
-     * Positive angles are clockwise (i.e., towards the positive y axis);
-     * negative angles are counter-clockwise (i.e., towards the negative y axis).
-     * </p>
-     *
-     * @return rotation angle in degrees
-     */
-    public double getRotation(){
-    	return 0;
-    }
-
-    public void setFlipHorizontal(boolean flip){
-    	throw new IllegalArgumentException("Operation not supported");
-    }
-
-    public void setFlipVertical(boolean flip){
-    	throw new IllegalArgumentException("Operation not supported");
-    }
-
-    /**
-     * Whether the shape is horizontally flipped
-     *
-     * @return whether the shape is horizontally flipped
-     */
-    public boolean getFlipHorizontal(){
-    	return false;
-    }
-
-    public boolean getFlipVertical(){
-    	return false;
-    }
-
-    @Override
-    void copy(XSLFShape sh){
-        super.copy(sh);
-
-        CTGraphicalObjectData data = ((CTGraphicalObjectFrame)getXmlObject()).getGraphic().getGraphicData();
-        String uri = data.getUri();
-        if(uri.equals("http://schemas.openxmlformats.org/drawingml/2006/diagram")){
-            copyDiagram(data, (XSLFGraphicFrame)sh);
-        } else {
-            // TODO  support other types of objects
-
-        }
-    }
-
-    // TODO should be moved to a sub-class
-    private void copyDiagram(CTGraphicalObjectData objData, XSLFGraphicFrame srcShape){
-        String xpath = "declare namespace dgm='http://schemas.openxmlformats.org/drawingml/2006/diagram' $this//dgm:relIds";
-        XmlObject[] obj = objData.selectPath(xpath);
-        if(obj != null && obj.length == 1){
-            XmlCursor c = obj[0].newCursor();
-
-            XSLFSheet sheet = srcShape.getSheet();
-            try {
-                String dm = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "dm"));
-                PackageRelationship dmRel = sheet.getPackagePart().getRelationship(dm);
-                PackagePart dmPart = sheet.getPackagePart().getRelatedPart(dmRel);
-                getSheet().importPart(dmRel, dmPart);
-
-                String lo = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "lo"));
-                PackageRelationship loRel = sheet.getPackagePart().getRelationship(lo);
-                PackagePart loPart = sheet.getPackagePart().getRelatedPart(loRel);
-                getSheet().importPart(loRel, loPart);
-
-                String qs = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "qs"));
-                PackageRelationship qsRel = sheet.getPackagePart().getRelationship(qs);
-                PackagePart qsPart = sheet.getPackagePart().getRelatedPart(qsRel);
-                getSheet().importPart(qsRel, qsPart);
-
-                String cs = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "cs"));
-                PackageRelationship csRel = sheet.getPackagePart().getRelationship(cs);
-                PackagePart csPart = sheet.getPackagePart().getRelatedPart(csRel);
-                getSheet().importPart(csRel, csPart);
-
-            } catch (InvalidFormatException e){
-                throw new POIXMLException(e);
-            }
-            c.dispose();
-        }
-    }
-
-    @Override
-    public XSLFPictureShape getFallbackPicture() {
-        String xquery =
-                  "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main'; "
-                + "declare namespace mc='http://schemas.openxmlformats.org/markup-compatibility/2006' "
-                + ".//mc:Fallback/*/p:pic"
-                ;
-        XmlObject xo = selectProperty(XmlObject.class, xquery);
-        if (xo == null) {
-            return null;
-        }
-
-        CTGroupShape gs;
-        try {
-            gs = CTGroupShape.Factory.parse(xo.newDomNode());
-        } catch (XmlException e) {
-            LOG.log(POILogger.WARN, "Can't parse fallback picture stream of graphical frame", e);
-            return null;
-        }
-
-        if (gs.sizeOfPicArray() == 0) {
-            return null;
-        }
-
-        return new XSLFPictureShape(gs.getPicArray(0), getSheet());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
deleted file mode 100644
index 08022e9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.sl.draw.DrawPictureShape;
-import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShapeNonVisual;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-
-/**
- * Represents a group shape that consists of many shapes grouped together.
- * 
- * @author Yegor Kozlov
- */
-@Beta
-public class XSLFGroupShape extends XSLFShape
-implements XSLFShapeContainer, GroupShape<XSLFShape,XSLFTextParagraph> {
-    private static POILogger _logger = POILogFactory.getLogger(XSLFGroupShape.class);
-    
-    private final List<XSLFShape> _shapes;
-    private final CTGroupShapeProperties _grpSpPr;
-    private XSLFDrawing _drawing;
-
-    protected XSLFGroupShape(CTGroupShape shape, XSLFSheet sheet){
-        super(shape,sheet);
-        _shapes = XSLFSheet.buildShapes(shape, sheet);
-        _grpSpPr = shape.getGrpSpPr();
-    }
-
-    protected CTGroupShapeProperties getGrpSpPr() {
-        return _grpSpPr;
-    }
-    
-    protected CTGroupTransform2D getSafeXfrm() {
-        CTGroupTransform2D xfrm = getXfrm();
-        return (xfrm == null ? getGrpSpPr().addNewXfrm() : xfrm);
-    }
-    
-    protected CTGroupTransform2D getXfrm() {
-        return getGrpSpPr().getXfrm();
-    }
-
-    @Override
-    public Rectangle2D getAnchor(){
-        CTGroupTransform2D xfrm = getXfrm();
-        CTPoint2D off = xfrm.getOff();
-        double x = Units.toPoints(off.getX());
-        double y = Units.toPoints(off.getY());
-        CTPositiveSize2D ext = xfrm.getExt();
-        double cx = Units.toPoints(ext.getCx());
-        double cy = Units.toPoints(ext.getCy());
-        return new Rectangle2D.Double(x,y,cx,cy);
-    }
-
-    @Override
-    public void setAnchor(Rectangle2D anchor){
-        CTGroupTransform2D xfrm = getSafeXfrm();
-        CTPoint2D off = xfrm.isSetOff() ? xfrm.getOff() : xfrm.addNewOff();
-        long x = Units.toEMU(anchor.getX());
-        long y = Units.toEMU(anchor.getY());
-        off.setX(x);
-        off.setY(y);
-        CTPositiveSize2D ext = xfrm.isSetExt() ? xfrm.getExt() : xfrm.addNewExt();
-        long cx = Units.toEMU(anchor.getWidth());
-        long cy = Units.toEMU(anchor.getHeight());
-        ext.setCx(cx);
-        ext.setCy(cy);
-    }
-
-    /**
-     *
-     * @return the coordinates of the child extents rectangle
-     * used for calculations of grouping, scaling, and rotation
-     * behavior of shapes placed within a group.
-     */
-    @Override
-    public Rectangle2D getInteriorAnchor(){
-        CTGroupTransform2D xfrm = getXfrm();
-        CTPoint2D off = xfrm.getChOff();
-        double x = Units.toPoints(off.getX());
-        double y = Units.toPoints(off.getY());
-        CTPositiveSize2D ext = xfrm.getChExt();
-        double cx = Units.toPoints(ext.getCx());
-        double cy = Units.toPoints(ext.getCy());
-        return new Rectangle2D.Double(x, y, cx, cy);
-    }
-
-    /**
-     *
-     * @param anchor the coordinates of the child extents rectangle
-     * used for calculations of grouping, scaling, and rotation
-     * behavior of shapes placed within a group.
-     */
-    @Override
-    public void setInteriorAnchor(Rectangle2D anchor) {
-        CTGroupTransform2D xfrm = getSafeXfrm();
-        CTPoint2D off = xfrm.isSetChOff() ? xfrm.getChOff() : xfrm.addNewChOff();
-        long x = Units.toEMU(anchor.getX());
-        long y = Units.toEMU(anchor.getY());
-        off.setX(x);
-        off.setY(y);
-        CTPositiveSize2D ext = xfrm.isSetChExt() ? xfrm.getChExt() : xfrm.addNewChExt();
-        long cx = Units.toEMU(anchor.getWidth());
-        long cy = Units.toEMU(anchor.getHeight());
-        ext.setCx(cx);
-        ext.setCy(cy);
-    }
-
-    /**
-     * @return child shapes contained within this group
-     */
-    @Override
-    public List<XSLFShape> getShapes(){
-        return _shapes;
-    }
-
-    /**
-     * Returns an iterator over the shapes in this sheet
-     *
-     * @return an iterator over the shapes in this sheet
-     */
-    public Iterator<XSLFShape> iterator(){
-        return _shapes.iterator();
-    }
-
-    /**
-     * Remove the specified shape from this group
-     */
-    public boolean removeShape(XSLFShape xShape) {
-        XmlObject obj = xShape.getXmlObject();
-        CTGroupShape grpSp = (CTGroupShape)getXmlObject();
-        if(obj instanceof CTShape){
-            grpSp.getSpList().remove(obj);
-        } else if (obj instanceof CTGroupShape){
-            grpSp.getGrpSpList().remove(obj);
-        } else if (obj instanceof CTConnector){
-            grpSp.getCxnSpList().remove(obj);
-        } else if (obj instanceof CTGraphicalObjectFrame) {
-            grpSp.getGraphicFrameList().remove(obj);
-        } else if (obj instanceof CTPicture) {
-            XSLFPictureShape ps = (XSLFPictureShape)xShape;
-            XSLFSheet sh = getSheet();
-            if (sh != null) {
-                sh.removePictureRelation(ps);
-            }
-            grpSp.getPicList().remove(obj);
-        } else {
-            throw new IllegalArgumentException("Unsupported shape: " + xShape);
-        }
-        return _shapes.remove(xShape);
-    }
-
-    /**
-     * @param shapeId 1-based shapeId
-     */
-    static CTGroupShape prototype(int shapeId) {
-        CTGroupShape ct = CTGroupShape.Factory.newInstance();
-        CTGroupShapeNonVisual nvSpPr = ct.addNewNvGrpSpPr();
-        CTNonVisualDrawingProps cnv = nvSpPr.addNewCNvPr();
-        cnv.setName("Group " + shapeId);
-        cnv.setId(shapeId + 1);
-
-        nvSpPr.addNewCNvGrpSpPr();
-        nvSpPr.addNewNvPr();
-        ct.addNewGrpSpPr();
-        return ct;
-    }
-
-    // shape factory methods
-    private XSLFDrawing getDrawing(){
-        if(_drawing == null) {
-            _drawing = new XSLFDrawing(getSheet(), (CTGroupShape)getXmlObject());
-        }
-        return _drawing;
-    }
-
-    public XSLFAutoShape createAutoShape(){
-        XSLFAutoShape sh = getDrawing().createAutoShape();
-        _shapes.add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    public XSLFFreeformShape createFreeform(){
-        XSLFFreeformShape sh = getDrawing().createFreeform();
-        _shapes.add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    public XSLFTextBox createTextBox(){
-        XSLFTextBox sh = getDrawing().createTextBox();
-        _shapes.add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    public XSLFConnectorShape createConnector(){
-        XSLFConnectorShape sh = getDrawing().createConnector();
-        _shapes.add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    public XSLFGroupShape createGroup(){
-        XSLFGroupShape sh = getDrawing().createGroup();
-        _shapes.add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    public XSLFPictureShape createPicture(PictureData pictureData){
-        if (!(pictureData instanceof XSLFPictureData)) {
-            throw new IllegalArgumentException("pictureData needs to be of type XSLFPictureData");
-        }
-        XSLFPictureData xPictureData = (XSLFPictureData)pictureData;
-        PackagePart pic = xPictureData.getPackagePart();
-
-        PackageRelationship rel = getSheet().getPackagePart().addRelationship(
-                pic.getPartName(), TargetMode.INTERNAL, XSLFRelation.IMAGES.getRelation());
-
-        XSLFPictureShape sh = getDrawing().createPicture(rel.getId());
-        new DrawPictureShape(sh).resize();
-        _shapes.add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    public XSLFTable createTable(){
-        XSLFTable sh = getDrawing().createTable();
-        _shapes.add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-    
-    @Override
-    public XSLFTable createTable(int numRows, int numCols){
-        if (numRows < 1 || numCols < 1) {
-            throw new IllegalArgumentException("numRows and numCols must be greater than 0");
-        }
-        XSLFTable sh = getDrawing().createTable();
-        _shapes.add(sh);
-        sh.setParent(this);
-        for (int r=0; r<numRows; r++) {
-            XSLFTableRow row = sh.addRow();
-            for (int c=0; c<numCols; c++) {
-                row.addCell();
-            }
-        }
-        return sh;
-    }
-
-    
-    @Override
-    public void setFlipHorizontal(boolean flip){
-        getSafeXfrm().setFlipH(flip);
-    }
-
-    @Override
-    public void setFlipVertical(boolean flip){
-        getSafeXfrm().setFlipV(flip);
-    }
-
-    @Override
-    public boolean getFlipHorizontal(){
-        CTGroupTransform2D xfrm = getXfrm();
-        return !(xfrm == null || !xfrm.isSetFlipH()) && xfrm.getFlipH();
-    }
-
-    @Override
-    public boolean getFlipVertical(){
-        CTGroupTransform2D xfrm = getXfrm();
-        return !(xfrm == null || !xfrm.isSetFlipV()) && xfrm.getFlipV();
-    }
-
-    @Override
-    public void setRotation(double theta){
-        getSafeXfrm().setRot((int) (theta * 60000));
-    }
-
-    @Override
-    public double getRotation(){
-        CTGroupTransform2D xfrm = getXfrm();
-        return (xfrm == null || !xfrm.isSetRot()) ? 0 : (xfrm.getRot() / 60000.d);
-    }
-
-    @Override
-    void copy(XSLFShape src){
-        XSLFGroupShape gr = (XSLFGroupShape)src;
-        
-        // clear shapes
-        clear();
-        
-        // recursively update each shape
-        for(XSLFShape shape : gr.getShapes()) {
-            XSLFShape newShape;
-            if (shape instanceof XSLFTextBox) {
-                newShape = createTextBox();
-            } else if (shape instanceof XSLFAutoShape) {
-                newShape = createAutoShape();
-            } else if (shape instanceof XSLFConnectorShape) {
-                newShape = createConnector();
-            } else if (shape instanceof XSLFFreeformShape) {
-                newShape = createFreeform();
-            } else if (shape instanceof XSLFPictureShape) {
-                XSLFPictureShape p = (XSLFPictureShape)shape;
-                XSLFPictureData pd = p.getPictureData();
-                XSLFPictureData pdNew = getSheet().getSlideShow().addPicture(pd.getData(), pd.getType());
-                newShape = createPicture(pdNew);
-            } else if (shape instanceof XSLFGroupShape) {
-                newShape = createGroup();
-            } else if (shape instanceof XSLFTable) {
-                newShape = createTable();
-            } else {
-                _logger.log(POILogger.WARN, "copying of class "+shape.getClass()+" not supported.");
-                continue;
-            }
-
-            newShape.copy(shape);
-        }
-    }
-
-    /**
-     * Removes all of the elements from this container (optional operation).
-     * The container will be empty after this call returns.
-     */
-    public void clear() {
-        List<XSLFShape> shapes = new ArrayList<XSLFShape>(getShapes());
-        for(XSLFShape shape : shapes){
-            removeShape(shape);
-        }
-    }
-
-    public void addShape(XSLFShape shape) {
-        throw new UnsupportedOperationException(
-            "Adding a shape from a different container is not supported -"
-            + " create it from scratch with XSLFGroupShape.create* methods");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
deleted file mode 100644
index 2f30062..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import java.net.URI;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.sl.usermodel.Hyperlink;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTHyperlink;
-
-public class XSLFHyperlink implements Hyperlink<XSLFShape,XSLFTextParagraph> {
-    final XSLFSheet _sheet;
-    final CTHyperlink _link;
-
-    XSLFHyperlink(CTHyperlink link, XSLFSheet sheet){
-        _sheet = sheet;
-        _link = link;
-    }
-
-    @Internal
-    public CTHyperlink getXmlObject(){
-        return _link;
-    }
-
-    @Override
-    public void setAddress(String address) {
-        linkToUrl(address);
-    }
-
-    @Override
-    public String getAddress() {
-        String id = _link.getId();
-        if (id == null || "".equals(id)) {
-            return _link.getAction();
-        }
-
-        URI targetURI = _sheet.getPackagePart().getRelationship(id).getTargetURI();
-        
-        return targetURI.toASCIIString();
-    }
-
-    @Override
-    public String getLabel() {
-        return _link.getTooltip();
-    }
-
-    @Override
-    public void setLabel(String label) {
-        _link.setTooltip(label);
-    }
-
-    /* (non-Javadoc)
-     * @deprecated POI 3.15. Use {@link #getTypeEnum()} instead.
-     * Will return a HyperlinkType enum in the future
-     */
-    @Override
-    public int getType() {
-        return getTypeEnum().getCode();
-    }
-    
-    @Override
-    public HyperlinkType getTypeEnum() {
-        String action = _link.getAction();
-        if (action == null) {
-            action = "";
-        }
-        if (action.equals("ppaction://hlinksldjump") || action.startsWith("ppaction://hlinkshowjump")) {
-            return HyperlinkType.DOCUMENT;
-        }
-        
-        String address = getAddress();
-        if (address == null) {
-            address = "";
-        }
-        if (address.startsWith("mailto:")) {
-            return HyperlinkType.EMAIL;
-        } else {
-            return HyperlinkType.URL;
-        }
-    }
-
-    @Override
-    public void linkToEmail(String emailAddress) {
-        linkToExternal("mailto:"+emailAddress);
-        setLabel(emailAddress);
-    }
-
-    @Override
-    public void linkToUrl(String url) {
-        linkToExternal(url);
-        setLabel(url);
-    }
-
-    private void linkToExternal(String url) {
-        PackagePart thisPP = _sheet.getPackagePart();
-        if (_link.isSetId() && !_link.getId().isEmpty()) {
-            thisPP.removeRelationship(_link.getId());
-        }
-        PackageRelationship rel = thisPP.addExternalRelationship(url, XSLFRelation.HYPERLINK.getRelation());
-        _link.setId(rel.getId());
-        if (_link.isSetAction()) {
-            _link.unsetAction();
-        }
-    }
-
-    @Override
-    public void linkToSlide(Slide<XSLFShape,XSLFTextParagraph> slide) {
-        PackagePart thisPP = _sheet.getPackagePart();
-        PackagePartName otherPPN = ((XSLFSheet)slide).getPackagePart().getPartName();
-        if (_link.isSetId() && !_link.getId().isEmpty()) {
-            thisPP.removeRelationship(_link.getId());
-        }
-        PackageRelationship rel =
-            thisPP.addRelationship(otherPPN, TargetMode.INTERNAL, XSLFRelation.SLIDE.getRelation());
-        _link.setId(rel.getId());
-        _link.setAction("ppaction://hlinksldjump");
-    }
-
-    @Override
-    public void linkToNextSlide() {
-        linkToRelativeSlide("nextslide");
-    }
-
-    @Override
-    public void linkToPreviousSlide() {
-        linkToRelativeSlide("previousslide");
-    }
-
-    @Override
-    public void linkToFirstSlide() {
-        linkToRelativeSlide("firstslide");
-    }
-
-    @Override
-    public void linkToLastSlide() {
-        linkToRelativeSlide("lastslide");
-    }
-    
-    private void linkToRelativeSlide(String jump) {
-        PackagePart thisPP = _sheet.getPackagePart();
-        if (_link.isSetId() && !_link.getId().isEmpty()) {
-            thisPP.removeRelationship(_link.getId());
-        }
-        _link.setId("");
-        _link.setAction("ppaction://hlinkshowjump?jump="+jump);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFImageRenderer.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFImageRenderer.java
deleted file mode 100644
index 7153bc8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFImageRenderer.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.util.Beta;
-
-/**
- * For now this class renders only images supported by the javax.imageio.ImageIO
- * framework. Subclasses can override this class to support other formats, for
- * example, Use Apache batik to render WMF:
- * 
- * <pre>
- * <code>
- * public class MyImageRendener extends XSLFImageRendener{
- * public boolean drawImage(Graphics2D graphics, XSLFPictureData data, Rectangle2D anchor){
- * 	boolean ok = super.drawImage(graphics, data, anchor);
- * 	if(!ok){
- * 		// see what type of image we are
- * 		String contentType = data.getPackagePart().getContentType();
- * 		if(contentType.equals("image/wmf")){
- * 			// use Apache Batik to handle WMF
- * 			// see http://xmlgraphics.apache.org/batik/
- * 		}
- * 		
- * 	}
- * 	return ok;
- * }
- * }
- * </code>
- * </pre>
- * 
- * and then pass this class to your instance of java.awt.Graphics2D:
- * 
- * <pre>
- * <code>
- * graphics.setRenderingHint(XSLFRenderingHint.IMAGE_RENDERER, new MyImageRendener());
- * </code>
- * </pre>
- * 
- * @author Yegor Kozlov
- */
-@Beta
-public class XSLFImageRenderer {
-
-	/**
-	 * Render picture data into the supplied graphics
-	 * 
-	 * @return true if the picture data was successfully rendered
-	 */
-    public boolean drawImage(Graphics2D graphics, XSLFPictureData data,
-            Rectangle2D anchor) {
-        return drawImage(graphics, data, anchor, null);
-    }
-    
-    /**
-     * Render picture data into the supplied graphics
-     * 
-     * @return true if the picture data was successfully rendered
-     */
-    public boolean drawImage(Graphics2D graphics, XSLFPictureData data,
-			Rectangle2D anchor, Insets clip) {
-        boolean isClipped = true;
-        if (clip == null) {
-            isClipped = false;
-            clip = new Insets(0,0,0,0);
-        }
-        
-        BufferedImage img;
-        try {
-            img = ImageIO.read(data.getPackagePart().getInputStream());
-        } catch (Exception e) {
-            return false;
-        }
-        
-        if(img == null) {
-        	return false;
-        }
-
-        int iw = img.getWidth();
-		int ih = img.getHeight();
-
-        double cw = (100000-clip.left-clip.right) / 100000.0;
-        double ch = (100000-clip.top-clip.bottom) / 100000.0;
-        double sx = anchor.getWidth()/(iw*cw);
-        double sy = anchor.getHeight()/(ih*ch);
-        double tx = anchor.getX()-(iw*sx*clip.left/100000.0);
-        double ty = anchor.getY()-(ih*sy*clip.top/100000.0);
-        AffineTransform at = new AffineTransform(sx, 0, 0, sy, tx, ty) ;
-
-        Shape clipOld = graphics.getClip();
-        if (isClipped) graphics.clip(anchor.getBounds2D());
-        graphics.drawRenderedImage(img, at);
-        graphics.setClip(clipOld);
-
-		return true;
-	}
-
-    /**
-     * Create a buffered image from the supplied package part.
-     * This method is called to create texture paints.
-     *
-     * @return a <code>BufferedImage</code> containing the decoded
-     * contents of the input, or <code>null</code>.
-     */
-    public BufferedImage readImage(PackagePart packagePart) throws IOException {
-        return ImageIO.read(packagePart.getInputStream());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
deleted file mode 100644
index bdbc461..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-
-class XSLFLineBreak extends XSLFTextRun {
-    private final CTTextCharacterProperties _brProps;
-
-    XSLFLineBreak(CTRegularTextRun r, XSLFTextParagraph p, CTTextCharacterProperties brProps){
-        super(r, p);
-        _brProps = brProps;
-    }
-
-    @Override
-    protected CTTextCharacterProperties getRPr(boolean create){
-        return _brProps;
-    }
-
-    public void setText(String text){
-        throw new IllegalStateException("You cannot change text of a line break, it is always '\\n'");
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
deleted file mode 100644
index 652cedc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-
-/**
- * Experimental class for metro blobs, i.e. an alternative escher property
- * containing an ooxml representation of the shape.
- * This is the helper class for HSLFMetroShape to dive into OOXML classes
- */
-@Internal
-public class XSLFMetroShape {
-    /*
-     * parses the metro bytes to a XSLF shape
-     */
-    public static Shape<?,?> parseShape(byte metroBytes[])
-    throws InvalidFormatException, IOException, XmlException {
-        PackagePartName shapePN = PackagingURIHelper.createPartName("/drs/shapexml.xml");
-        OPCPackage pkg = null;
-        try {
-            pkg = OPCPackage.open(new ByteArrayInputStream(metroBytes));
-            PackagePart shapePart = pkg.getPart(shapePN);
-            CTGroupShape gs = CTGroupShape.Factory.parse(shapePart.getInputStream(), DEFAULT_XML_OPTIONS);
-            XSLFGroupShape xgs = new XSLFGroupShape(gs, null);
-            return xgs.getShapes().get(0);               
-        } finally {
-            if (pkg != null) {
-                pkg.close();
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
deleted file mode 100644
index 5c0ec58..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.usermodel.Notes;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommonSlideData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesSlide;
-import org.openxmlformats.schemas.presentationml.x2006.main.NotesDocument;
-
-@Beta
-public final class XSLFNotes extends XSLFSheet
-implements Notes<XSLFShape,XSLFTextParagraph> {
-   private CTNotesSlide _notes;
-
-    /**
-     * Create a new notes
-     */
-    XSLFNotes() {
-        super();
-        _notes = prototype();
-        setCommonSlideData(_notes.getCSld());
-    }
-
-    /**
-     * Construct a SpreadsheetML notes from a package part
-     *
-     * @param part the package part holding the notes data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.notes+xml</code>
-     * @param rel  the package relationship holding this notes,
-     * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/notes
-     * 
-     * @since POI 3.14-Beta1
-     */
-    XSLFNotes(PackagePart part) throws IOException, XmlException {
-        super(part);
-
-        NotesDocument doc =
-            NotesDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-        _notes = doc.getNotes();
-        setCommonSlideData(_notes.getCSld());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    XSLFNotes(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    private static CTNotesSlide prototype(){
-        CTNotesSlide ctNotes = CTNotesSlide.Factory.newInstance();
-        CTCommonSlideData cSld = ctNotes.addNewCSld();
-        cSld.addNewSpTree();
-
-        return ctNotes;
-    }
-
-    @Override
-    public CTNotesSlide getXmlObject() {
-       return _notes;
-    }
-
-    @Override
-    protected String getRootElementName(){
-        return "notes";        
-    }
-
-    @Override
-    public XSLFTheme getTheme(){
-    	return getMasterSheet().getTheme();
-    }
-
-    @Override
-    public XSLFNotesMaster getMasterSheet() {
-        for (POIXMLDocumentPart p : getRelations()) {
-           if (p instanceof XSLFNotesMaster){
-              return (XSLFNotesMaster)p;
-           }
-        }
-        return null;
-    }
-
-    @Override
-    public List<List<XSLFTextParagraph>> getTextParagraphs() {
-        List<List<XSLFTextParagraph>> tp = new ArrayList<List<XSLFTextParagraph>>();
-        for (XSLFShape sh : super.getShapes()) {
-            if (sh instanceof XSLFTextShape) {
-                XSLFTextShape txt = (XSLFTextShape)sh;
-                tp.add(txt.getTextParagraphs());
-            }
-        }
-        return tp;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
deleted file mode 100644
index 6f955a4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.usermodel.MasterSheet;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColorMapping;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMaster;
-import org.openxmlformats.schemas.presentationml.x2006.main.NotesMasterDocument;
-
-/**
-* Notes master object associated with this layout.
-* <p>
-*  Within a notes master slide are contained all elements
-* that describe the objects and their corresponding formatting
-* for within a presentation slide.
-* </p>
-* <p>
-* Within a nodes master slide are two main elements.
-* The cSld element specifies the common slide elements such as shapes and
-* their attached text bodies. Then the notesStyles element specifies the
-* formatting for the text within each of these shapes.
-* </p>
- *
- * @author Yegor Kozlov
-*/
-@Beta
- public class XSLFNotesMaster extends XSLFSheet
-     implements MasterSheet<XSLFShape,XSLFTextParagraph> {
-	 private CTNotesMaster _slide;
-     private XSLFTheme _theme;
-
-    XSLFNotesMaster() {
-        super();
-        _slide = prototype();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    protected XSLFNotesMaster(PackagePart part) throws IOException, XmlException {
-        super(part);
-        NotesMasterDocument doc =
-            NotesMasterDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-        _slide = doc.getNotesMaster();
-        setCommonSlideData(_slide.getCSld());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSLFNotesMaster(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    private static CTNotesMaster prototype() {
-        InputStream is = XSLFNotesMaster.class.getResourceAsStream("notesMaster.xml");
-        if (is == null) {
-            throw new POIXMLException("Missing resource 'notesMaster.xml'");
-        }        
-
-        try {
-            try {
-                NotesMasterDocument doc = NotesMasterDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-                CTNotesMaster slide =  doc.getNotesMaster();
-                return slide;
-            } finally {
-                is.close();
-            }            
-        } catch (Exception e) {
-            throw new POIXMLException("Can't initialize NotesMaster", e);
-        }
-    }
-    
-    @Override
-    public CTNotesMaster getXmlObject() {
-       return _slide;
-    }
-
-    @Override
-    protected String getRootElementName(){
-        return "notesMaster";
-    }
-
-    @Override
-    public MasterSheet<XSLFShape,XSLFTextParagraph> getMasterSheet() {
-        return null;
-    }
-    
-    @Override
-    public XSLFTheme getTheme() {
-        if (_theme == null) {
-            for (POIXMLDocumentPart p : getRelations()) {
-                if (p instanceof XSLFTheme) {
-                    _theme = (XSLFTheme) p;
-                    CTColorMapping cmap = _slide.getClrMap();
-                    if (cmap != null) {
-                        _theme.initColorMap(cmap);
-                    }
-                    break;
-                }
-            }
-        }
-        return _theme;
-    }    
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
deleted file mode 100644
index 9f705e0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Dimension;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.hslf.blip.EMF;
-import org.apache.poi.hslf.blip.PICT;
-import org.apache.poi.hslf.blip.WMF;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- * Instantiates sub-classes of POIXMLDocumentPart depending on their relationship type
- */
-@Beta
-public final class XSLFPictureData extends POIXMLDocumentPart implements PictureData {
-    private static final POILogger logger = POILogFactory.getLogger(XSLFPictureData.class);
-    
-    private Long checksum = null;
-
-    // original image dimensions (for formats supported by BufferedImage)
-    private Dimension origSize = null;
-    private int index = -1;
-
-    /**
-     * Create a new XSLFGraphicData node
-     */
-    protected XSLFPictureData() {
-        super();
-    }
-
-    /**
-     * Construct XSLFPictureData from a package part
-     *
-     * @param part the package part holding the drawing data
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public XSLFPictureData(PackagePart part) {
-        super(part);
-    }    
-    
-    /**
-     * Construct XSLFPictureData from a package part
-     *
-     * @param part the package part holding the drawing data,
-     * @param rel  the package relationship holding this drawing,
-     *             the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/image
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XSLFPictureData(PackagePart part, PackageRelationship rel) {
-        this(part);
-    }
-
-    /**
-     * An InputStream to read the picture data directly
-     * from the underlying package part
-     *
-     * @return InputStream
-     */
-    public InputStream getInputStream() throws IOException {
-        return getPackagePart().getInputStream();
-    }
-
-    /**
-     * Gets the picture data as a byte array.
-     *
-     * You can grab the picture data directly from the underlying package part with the {@link #getInputStream()} method
-     *
-     * @return the Picture data.
-     */
-    public byte[] getData() {
-        try {
-            return IOUtils.toByteArray(getInputStream());
-        } catch (IOException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Returns the file name of the image, eg image7.jpg . The original filename
-     * isn't always available, but if it can be found it's likely to be in the
-     * CTDrawing
-     */
-    public String getFileName() {
-        String name = getPackagePart().getPartName().getName();
-        return name.substring(name.lastIndexOf('/') + 1);
-    }
-
-    /**
-     * Suggests a file extension for this image.
-     *
-     * @return the file extension.
-     */
-    public String suggestFileExtension() {
-        return getPackagePart().getPartName().getExtension();
-    }
-
-    @Override
-    public byte[] getChecksum() {
-        cacheProperties();
-        byte cs[] = new byte[LittleEndianConsts.LONG_SIZE];
-        LittleEndian.putLong(cs,0,checksum);
-        return cs;
-    }
-
-    @Override
-    public Dimension getImageDimension() {
-        cacheProperties();
-        return origSize;
-    }
-
-    @Override
-    public Dimension getImageDimensionInPixels() {
-        Dimension dim = getImageDimension();
-        return new Dimension(
-            Units.pointsToPixel(dim.getWidth()),
-            Units.pointsToPixel(dim.getHeight())
-        );
-    }
-    
-    /**
-     * Determine and cache image properties
-     */
-    protected void cacheProperties() {
-        if (origSize == null || checksum == null) {
-            byte data[] = getData();
-            checksum = IOUtils.calculateChecksum(data);
-            
-            PictureType pt = getType();
-            if (pt == null) {
-                origSize = new Dimension(1,1);
-                return;
-            }
-            
-            switch (pt) {
-            case EMF:
-                origSize = new EMF.NativeHeader(data, 0).getSize();
-                break;
-            case WMF:
-                // wmf files in pptx usually have their placeable header 
-                // stripped away, so this returns only the dummy size
-                origSize = new WMF.NativeHeader(data, 0).getSize();
-                break;
-            case PICT:
-                origSize = new PICT.NativeHeader(data, 0).getSize();
-                break;
-            default:
-                BufferedImage img = null;
-                try {
-                    img = ImageIO.read(new ByteArrayInputStream(data));
-                } catch (IOException e) {
-                    logger.log(POILogger.WARN, "Can't determine image dimensions", e);
-                }
-                // set dummy size, in case of dummy dimension can't be set
-                origSize = (img == null)
-                    ? new Dimension(200,200)
-                    : new Dimension(
-                        (int)Units.pixelToPoints(img.getWidth()),
-                        (int)Units.pixelToPoints(img.getHeight())
-                    );
-                break;
-            }
-        }
-    }
-
-    /**
-     * *PictureData objects store the actual content in the part directly without keeping a
-     * copy like all others therefore we need to handle them differently.
-     */
-    @Override
-    protected void prepareForCommit() {
-        // do not clear the part here
-    }
-
-    @Override
-    public String getContentType() {
-        return getPackagePart().getContentType();
-    }
-
-    public void setData(byte[] data) throws IOException {
-        OutputStream os = getPackagePart().getOutputStream();
-        os.write(data);
-        os.close();
-        // recalculate now since we already have the data bytes available anyhow
-        checksum = IOUtils.calculateChecksum(data);
-
-        origSize = null; // need to recalculate image size
-    }
-
-    @Override
-    public PictureType getType() {
-        String ct = getContentType();
-        if (XSLFRelation.IMAGE_EMF.getContentType().equals(ct)) {
-            return PictureType.EMF;
-        } else if (XSLFRelation.IMAGE_WMF.getContentType().equals(ct)) {
-            return PictureType.WMF;
-        } else if (XSLFRelation.IMAGE_PICT.getContentType().equals(ct)) {
-            return PictureType.PICT;
-        } else if (XSLFRelation.IMAGE_JPEG.getContentType().equals(ct)) {
-            return PictureType.JPEG;
-        } else if (XSLFRelation.IMAGE_PNG.getContentType().equals(ct)) {
-            return PictureType.PNG;
-        } else if (XSLFRelation.IMAGE_DIB.getContentType().equals(ct)) {
-            return PictureType.DIB;
-        } else if (XSLFRelation.IMAGE_GIF.getContentType().equals(ct)) {
-            return PictureType.GIF;
-        } else if (XSLFRelation.IMAGE_EPS.getContentType().equals(ct)) {
-            return PictureType.EPS;
-        } else if (XSLFRelation.IMAGE_BMP.getContentType().equals(ct)) {
-            return PictureType.BMP;
-        } else if (XSLFRelation.IMAGE_WPG.getContentType().equals(ct)) {
-            return PictureType.WPG;
-        } else if (XSLFRelation.IMAGE_WDP.getContentType().equals(ct)) {
-            return PictureType.WDP;
-        } else if (XSLFRelation.IMAGE_TIFF.getContentType().equals(ct)) {
-            return PictureType.TIFF;
-        } else {
-            return null;
-        }
-    }
-    
-    /* package */ static XSLFRelation getRelationForType(PictureType pt) {
-        switch (pt) {
-            case EMF: return XSLFRelation.IMAGE_EMF;
-            case WMF: return XSLFRelation.IMAGE_WMF;
-            case PICT: return XSLFRelation.IMAGE_PICT;
-            case JPEG: return XSLFRelation.IMAGE_JPEG;
-            case PNG: return XSLFRelation.IMAGE_PNG;
-            case DIB: return XSLFRelation.IMAGE_DIB;
-            case GIF: return XSLFRelation.IMAGE_GIF;
-            case EPS: return XSLFRelation.IMAGE_EPS;
-            case BMP: return XSLFRelation.IMAGE_BMP;
-            case WPG: return XSLFRelation.IMAGE_WPG;
-            case WDP: return XSLFRelation.IMAGE_WDP;
-            case TIFF: return XSLFRelation.IMAGE_TIFF;
-            default: return null;
-        }
-    }
-
-    /**
-     * @return the 0-based index of this pictures within the picture parts
-     */
-    public int getIndex() {
-        return index;
-    }
-
-    /**
-     * @param index sets the 0-based index of this pictures within the picture parts
-     */
-    public void setIndex(int index) {
-        this.index = index;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
deleted file mode 100644
index c2428bc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Insets;
-import java.net.URI;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.usermodel.PictureShape;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOfficeArtExtension;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOfficeArtExtensionList;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRelativeRect;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPictureNonVisual;
-
-/**
- * Represents a picture shape
- */
-@Beta
-public class XSLFPictureShape extends XSLFSimpleShape
-    implements PictureShape<XSLFShape,XSLFTextParagraph> {
-    private XSLFPictureData _data;
-
-    /*package*/ XSLFPictureShape(CTPicture shape, XSLFSheet sheet) {
-        super(shape, sheet);
-    }
-
-
-    /**
-     * @param shapeId 1-based shapeId
-     * @param rel     relationship to the picture data in the ooxml package
-     */
-    static CTPicture prototype(int shapeId, String rel) {
-        CTPicture ct = CTPicture.Factory.newInstance();
-        CTPictureNonVisual nvSpPr = ct.addNewNvPicPr();
-        CTNonVisualDrawingProps cnv = nvSpPr.addNewCNvPr();
-        cnv.setName("Picture " + shapeId);
-        cnv.setId(shapeId + 1);
-        nvSpPr.addNewCNvPicPr().addNewPicLocks().setNoChangeAspect(true);
-        nvSpPr.addNewNvPr();
-
-        CTBlipFillProperties blipFill = ct.addNewBlipFill();
-        CTBlip blip = blipFill.addNewBlip();
-        blip.setEmbed(rel);
-        blipFill.addNewStretch().addNewFillRect();
-
-        CTShapeProperties spPr = ct.addNewSpPr();
-        CTPresetGeometry2D prst = spPr.addNewPrstGeom();
-        prst.setPrst(STShapeType.RECT);
-        prst.addNewAvLst();
-        return ct;
-    }
-
-
-    /**
-     * Is this an internal picture (image data included within
-     *  the PowerPoint file), or an external linked picture
-     *  (image lives outside)?
-     */
-    public boolean isExternalLinkedPicture() {
-        if (getBlipId() == null && getBlipLink() != null) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Return the data on the (internal) picture.
-     * For an external linked picture, will return null
-     */
-    public XSLFPictureData getPictureData() {
-        if(_data == null){
-            String blipId = getBlipId();
-            if (blipId == null) return null;
-
-            PackagePart p = getSheet().getPackagePart();
-            PackageRelationship rel = p.getRelationship(blipId);
-            if (rel != null) {
-                try {
-                    PackagePart imgPart = p.getRelatedPart(rel);
-                    _data = new XSLFPictureData(imgPart);
-                }
-                catch (Exception e) {
-                    throw new POIXMLException(e);
-                }
-            }
-        }
-        return _data;
-    }
-
-    @Override
-    public void setPlaceholder(Placeholder placeholder) {
-        super.setPlaceholder(placeholder);
-    }
-    
-    
-    /**
-     * For an external linked picture, return the last-seen
-     *  path to the picture.
-     * For an internal picture, returns null.
-     */
-    public URI getPictureLink() {
-        if (getBlipId() != null) {
-            // Internal picture, nothing to return
-            return null;
-        }
-        
-        String rId = getBlipLink();
-        if (rId == null) {
-            // No link recorded, nothing we can do
-            return null;
-        }
-        
-        PackagePart p = getSheet().getPackagePart();
-        PackageRelationship rel = p.getRelationship(rId);
-        if (rel != null) {
-            return rel.getTargetURI();
-        }
-        return null;
-    }
-
-    protected CTBlipFillProperties getBlipFill() {
-        CTPicture ct = (CTPicture)getXmlObject();
-        CTBlipFillProperties bfp = ct.getBlipFill();
-        if (bfp != null) {
-            return bfp;
-        }
-                    
-        String xquery =
-                "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main'; "
-              + "declare namespace mc='http://schemas.openxmlformats.org/markup-compatibility/2006' "
-              + ".//mc:Fallback/p:blipFill"
-              ;
-        XmlObject xo = selectProperty(XmlObject.class, xquery);
-        try {
-            xo = CTPicture.Factory.parse(xo.getDomNode());
-        } catch (XmlException xe) {
-            return null;
-        }
-        return ((CTPicture)xo).getBlipFill();
-    }
-    
-    protected CTBlip getBlip(){
-        return getBlipFill().getBlip();
-    }
-    
-    protected String getBlipLink(){
-        String link = getBlip().getLink();
-        if (link.isEmpty()) return null;
-        return link;
-    }
-    
-    protected String getBlipId(){
-        String id = getBlip().getEmbed();
-        if (id.isEmpty()) return null;
-        return id;
-    }
-
-    @Override
-    public Insets getClipping(){
-        CTRelativeRect r = getBlipFill().getSrcRect();
-        return (r == null) ? null : new Insets(r.getT(), r.getL(), r.getB(), r.getR());
-    }
-
-    @Override
-    void copy(XSLFShape sh){
-        super.copy(sh);
-
-        XSLFPictureShape p = (XSLFPictureShape)sh;
-        String blipId = p.getBlipId();
-        String relId = getSheet().importBlip(blipId, p.getSheet().getPackagePart());
-
-        CTPicture ct = (CTPicture)getXmlObject();
-        CTBlip blip = getBlipFill().getBlip();
-        blip.setEmbed(relId);
-
-        CTApplicationNonVisualDrawingProps nvPr = ct.getNvPicPr().getNvPr();
-        if(nvPr.isSetCustDataLst()) {
-            // discard any custom tags associated with the picture being copied
-            nvPr.unsetCustDataLst();
-        }
-        if(blip.isSetExtLst()) {
-
-            CTOfficeArtExtensionList extLst = blip.getExtLst();
-            for(CTOfficeArtExtension ext : extLst.getExtArray()){
-                String xpath = "declare namespace a14='http://schemas.microsoft.com/office/drawing/2010/main' $this//a14:imgProps/a14:imgLayer";
-                XmlObject[] obj = ext.selectPath(xpath);
-                if(obj != null && obj.length == 1){
-                    XmlCursor c = obj[0].newCursor();
-                    String id = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "embed"));//selectPath("declare namespace r='http://schemas.openxmlformats.org/officeDocument/2006/relationships' $this//[@embed]");
-                    String newId = getSheet().importBlip(id, p.getSheet().getPackagePart());
-                    c.setAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "embed"), newId);
-                    c.dispose();
-                }
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
deleted file mode 100644
index f6e5ad0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
+++ /dev/null
@@ -1,1830 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTCustomGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectContainer;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectList;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGradientFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTLineProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNoFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPatternFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTStyleMatrixReference;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCellProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTBackgroundProperties;
-
-/**
- * Internal helper class to unify property access.
- * 
- * This class is experimental and not (yet) supposed for public usage.
- * Maybe the xml schemas might be enhanced with interfaces to make this class superfluous
- * 
- * @since POI 3.15-beta2
- */
-@Internal
-/* package */ class XSLFPropertiesDelegate {
-    private static final POILogger LOG = POILogFactory.getLogger(XSLFPropertiesDelegate.class);
-
-    
-    public static XSLFFillProperties getFillDelegate(XmlObject props) {
-        return getDelegate(XSLFFillProperties.class, props);
-    }
-
-    public static XSLFGeometryProperties getGeometryDelegate(XmlObject props) {
-        return getDelegate(XSLFGeometryProperties.class, props);
-    }
-    
-    public static XSLFEffectProperties getEffectDelegate(XmlObject props) {
-        return getDelegate(XSLFEffectProperties.class, props);
-    }
-    
-    public interface XSLFFillProperties {
-        /**
-         * Gets the "noFill" element
-         */
-        CTNoFillProperties getNoFill();
-        
-        /**
-         * True if has "noFill" element
-         */
-        boolean isSetNoFill();
-        
-        /**
-         * Sets the "noFill" element
-         */
-        void setNoFill(CTNoFillProperties noFill);
-        
-        /**
-         * Appends and returns a new empty "noFill" element
-         */
-        CTNoFillProperties addNewNoFill();
-        
-        /**
-         * Unsets the "noFill" element
-         */
-        void unsetNoFill();
-        
-        /**
-         * Gets the "solidFill" element
-         */
-        CTSolidColorFillProperties getSolidFill();
-        
-        /**
-         * True if has "solidFill" element
-         */
-        boolean isSetSolidFill();
-        
-        /**
-         * Sets the "solidFill" element
-         */
-        void setSolidFill(CTSolidColorFillProperties solidFill);
-        
-        /**
-         * Appends and returns a new empty "solidFill" element
-         */
-        CTSolidColorFillProperties addNewSolidFill();
-        
-        /**
-         * Unsets the "solidFill" element
-         */
-        void unsetSolidFill();
-        
-        /**
-         * Gets the "gradFill" element
-         */
-        CTGradientFillProperties getGradFill();
-        
-        /**
-         * True if has "gradFill" element
-         */
-        boolean isSetGradFill();
-        
-        /**
-         * Sets the "gradFill" element
-         */
-        void setGradFill(CTGradientFillProperties gradFill);
-        
-        /**
-         * Appends and returns a new empty "gradFill" element
-         */
-        CTGradientFillProperties addNewGradFill();
-        
-        /**
-         * Unsets the "gradFill" element
-         */
-        void unsetGradFill();
-        
-        /**
-         * Gets the "blipFill" element
-         */
-        CTBlipFillProperties getBlipFill();
-        
-        /**
-         * True if has "blipFill" element
-         */
-        boolean isSetBlipFill();
-        
-        /**
-         * Sets the "blipFill" element
-         */
-        void setBlipFill(CTBlipFillProperties blipFill);
-        
-        /**
-         * Appends and returns a new empty "blipFill" element
-         */
-        CTBlipFillProperties addNewBlipFill();
-        
-        /**
-         * Unsets the "blipFill" element
-         */
-        void unsetBlipFill();
-        
-        /**
-         * Gets the "pattFill" element
-         */
-        CTPatternFillProperties getPattFill();
-        
-        /**
-         * True if has "pattFill" element
-         */
-        boolean isSetPattFill();
-        
-        /**
-         * Sets the "pattFill" element
-         */
-        void setPattFill(CTPatternFillProperties pattFill);
-        
-        /**
-         * Appends and returns a new empty "pattFill" element
-         */
-        CTPatternFillProperties addNewPattFill();
-        
-        /**
-         * Unsets the "pattFill" element
-         */
-        void unsetPattFill();
-        
-        /**
-         * Gets the "grpFill" element
-         */
-        CTGroupFillProperties getGrpFill();
-        
-        /**
-         * True if has "grpFill" element
-         */
-        boolean isSetGrpFill();
-        
-        /**
-         * Sets the "grpFill" element
-         */
-        void setGrpFill(CTGroupFillProperties grpFill);
-        
-        /**
-         * Appends and returns a new empty "grpFill" element
-         */
-        CTGroupFillProperties addNewGrpFill();
-        
-        /**
-         * Unsets the "grpFill" element
-         */
-        void unsetGrpFill();
-        
-        /**
-         * Helper method to unify other properties with style matrix references
-         * @return true, if this is a matrix style delegate
-         */
-        boolean isSetMatrixStyle();
-        
-        /**
-         * Helper method to unify other properties with style matrix references
-         */
-        CTStyleMatrixReference getMatrixStyle();
-        
-        /**
-         * Helper method to choose between fill and line style
-         *
-         * @return true, if this applies to a line
-         */
-        boolean isLineStyle();
-    }
-
-    public interface XSLFGeometryProperties {
-        /**
-         * Gets the "custGeom" element
-         */
-        CTCustomGeometry2D getCustGeom();
-        
-        /**
-         * True if has "custGeom" element
-         */
-        boolean isSetCustGeom();
-        
-        /**
-         * Sets the "custGeom" element
-         */
-        void setCustGeom(CTCustomGeometry2D custGeom);
-        
-        /**
-         * Appends and returns a new empty "custGeom" element
-         */
-        CTCustomGeometry2D addNewCustGeom();
-        
-        /**
-         * Unsets the "custGeom" element
-         */
-        void unsetCustGeom();
-        
-        /**
-         * Gets the "prstGeom" element
-         */
-        CTPresetGeometry2D getPrstGeom();
-        
-        /**
-         * True if has "prstGeom" element
-         */
-        boolean isSetPrstGeom();
-        
-        /**
-         * Sets the "prstGeom" element
-         */
-        void setPrstGeom(CTPresetGeometry2D prstGeom);
-        
-        /**
-         * Appends and returns a new empty "prstGeom" element
-         */
-        CTPresetGeometry2D addNewPrstGeom();
-        
-        /**
-         * Unsets the "prstGeom" element
-         */
-        void unsetPrstGeom();
-    }
-
-    public interface XSLFEffectProperties {
-        /**
-         * Gets the "effectLst" element
-         */
-        CTEffectList getEffectLst();
-        
-        /**
-         * True if has "effectLst" element
-         */
-        boolean isSetEffectLst();
-        
-        /**
-         * Sets the "effectLst" element
-         */
-        void setEffectLst(CTEffectList effectLst);
-        
-        /**
-         * Appends and returns a new empty "effectLst" element
-         */
-        CTEffectList addNewEffectLst();
-        
-        /**
-         * Unsets the "effectLst" element
-         */
-        void unsetEffectLst();
-        
-        /**
-         * Gets the "effectDag" element
-         */
-        CTEffectContainer getEffectDag();
-        
-        /**
-         * True if has "effectDag" element
-         */
-        boolean isSetEffectDag();
-        
-        /**
-         * Sets the "effectDag" element
-         */
-        void setEffectDag(CTEffectContainer effectDag);
-        
-        /**
-         * Appends and returns a new empty "effectDag" element
-         */
-        CTEffectContainer addNewEffectDag();
-        
-        /**
-         * Unsets the "effectDag" element
-         */
-        void unsetEffectDag();
-    }
-    
-    private static class ShapeDelegate implements XSLFFillProperties, XSLFGeometryProperties, XSLFEffectProperties {
-        final CTShapeProperties props;
-        
-        ShapeDelegate(CTShapeProperties props) {
-            this.props = props;
-        }
-
-        @Override
-        public CTNoFillProperties getNoFill() {
-            return props.getNoFill();
-        }
-
-        @Override
-        public boolean isSetNoFill() {
-            return props.isSetNoFill();
-        }
-
-        @Override
-        public void setNoFill(CTNoFillProperties noFill) {
-            props.setNoFill(noFill);
-        }
-
-        @Override
-        public CTNoFillProperties addNewNoFill() {
-            return props.addNewNoFill();
-        }
-
-        @Override
-        public void unsetNoFill() {
-            props.unsetNoFill();
-        }
-
-        @Override
-        public CTSolidColorFillProperties getSolidFill() {
-            return props.getSolidFill();
-        }
-
-        @Override
-        public boolean isSetSolidFill() {
-            return props.isSetSolidFill();
-        }
-
-        @Override
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {
-            props.setSolidFill(solidFill);
-        }
-
-        @Override
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return props.addNewSolidFill();
-        }
-
-        @Override
-        public void unsetSolidFill() {
-            props.unsetSolidFill();
-        }
-
-        @Override
-        public CTGradientFillProperties getGradFill() {
-            return props.getGradFill();
-        }
-
-        @Override
-        public boolean isSetGradFill() {
-            return props.isSetGradFill();
-        }
-
-        @Override
-        public void setGradFill(CTGradientFillProperties gradFill) {
-            props.setGradFill(gradFill);
-        }
-
-        @Override
-        public CTGradientFillProperties addNewGradFill() {
-            return props.addNewGradFill();
-        }
-
-        @Override
-        public void unsetGradFill() {
-            props.unsetGradFill();
-        }
-
-        @Override
-        public CTBlipFillProperties getBlipFill() {
-            return props.getBlipFill();
-        }
-
-        @Override
-        public boolean isSetBlipFill() {
-            return props.isSetBlipFill();
-        }
-
-        @Override
-        public void setBlipFill(CTBlipFillProperties blipFill) {
-            props.setBlipFill(blipFill);
-        }
-
-        @Override
-        public CTBlipFillProperties addNewBlipFill() {
-            return props.addNewBlipFill();
-        }
-
-        @Override
-        public void unsetBlipFill() {
-            props.unsetBlipFill();
-        }
-
-        @Override
-        public CTPatternFillProperties getPattFill() {
-            return props.getPattFill();
-        }
-
-        @Override
-        public boolean isSetPattFill() {
-            return props.isSetPattFill();
-        }
-
-        @Override
-        public void setPattFill(CTPatternFillProperties pattFill) {
-            props.setPattFill(pattFill);
-        }
-
-        @Override
-        public CTPatternFillProperties addNewPattFill() {
-            return props.addNewPattFill();
-        }
-
-        @Override
-        public void unsetPattFill() {
-            props.unsetPattFill();
-        }
-
-        @Override
-        public CTGroupFillProperties getGrpFill() {
-            return props.getGrpFill();
-        }
-
-        @Override
-        public boolean isSetGrpFill() {
-            return props.isSetGrpFill();
-        }
-
-        @Override
-        public void setGrpFill(CTGroupFillProperties grpFill) {
-            props.setGrpFill(grpFill);
-        }
-
-        @Override
-        public CTGroupFillProperties addNewGrpFill() {
-            return props.addNewGrpFill();
-        }
-
-        @Override
-        public void unsetGrpFill() {
-            props.unsetGrpFill();
-        }
-
-        @Override
-        public CTCustomGeometry2D getCustGeom() {
-            return props.getCustGeom();
-        }
-
-        @Override
-        public boolean isSetCustGeom() {
-            return props.isSetCustGeom();
-        }
-
-        @Override
-        public void setCustGeom(CTCustomGeometry2D custGeom) {
-            props.setCustGeom(custGeom);
-        }
-
-        @Override
-        public CTCustomGeometry2D addNewCustGeom() {
-            return props.addNewCustGeom();
-        }
-
-        @Override
-        public void unsetCustGeom() {
-            props.unsetCustGeom();
-        }
-
-        @Override
-        public CTPresetGeometry2D getPrstGeom() {
-            return props.getPrstGeom();
-        }
-
-        @Override
-        public boolean isSetPrstGeom() {
-            return props.isSetPrstGeom();
-        }
-
-        @Override
-        public void setPrstGeom(CTPresetGeometry2D prstGeom) {
-            props.setPrstGeom(prstGeom);
-        }
-
-        @Override
-        public CTPresetGeometry2D addNewPrstGeom() {
-            return props.addNewPrstGeom();
-        }
-
-        @Override
-        public void unsetPrstGeom() {
-            props.unsetPrstGeom();
-        }
-
-        @Override
-        public CTEffectList getEffectLst() {
-            return props.getEffectLst();
-        }
-
-        @Override
-        public boolean isSetEffectLst() {
-            return props.isSetEffectLst();
-        }
-
-        @Override
-        public void setEffectLst(CTEffectList effectLst) {
-            props.setEffectLst(effectLst);
-        }
-
-        @Override
-        public CTEffectList addNewEffectLst() {
-            return props.addNewEffectLst();
-        }
-
-        @Override
-        public void unsetEffectLst() {
-            props.unsetEffectLst();
-        }
-
-        @Override
-        public CTEffectContainer getEffectDag() {
-            return props.getEffectDag();
-        }
-
-        @Override
-        public boolean isSetEffectDag() {
-            return props.isSetEffectDag();
-        }
-
-        @Override
-        public void setEffectDag(CTEffectContainer effectDag) {
-            props.setEffectDag(effectDag);
-        }
-
-        @Override
-        public CTEffectContainer addNewEffectDag() {
-            return props.addNewEffectDag();
-        }
-
-        @Override
-        public void unsetEffectDag() {
-            props.unsetEffectDag();
-        }
-
-        @Override
-        public boolean isSetMatrixStyle() {
-            return false;
-        }
-
-        @Override
-        public CTStyleMatrixReference getMatrixStyle() {
-            return null;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            return false;
-        }
-    }
-
-    private static class BackgroundDelegate implements XSLFFillProperties, XSLFEffectProperties {
-        final CTBackgroundProperties props;
-        
-        BackgroundDelegate(CTBackgroundProperties props) {
-            this.props = props;
-        }
-
-        @Override
-        public CTNoFillProperties getNoFill() {
-            return props.getNoFill();
-        }
-
-        @Override
-        public boolean isSetNoFill() {
-            return props.isSetNoFill();
-        }
-
-        @Override
-        public void setNoFill(CTNoFillProperties noFill) {
-            props.setNoFill(noFill);
-        }
-
-        @Override
-        public CTNoFillProperties addNewNoFill() {
-            return props.addNewNoFill();
-        }
-
-        @Override
-        public void unsetNoFill() {
-            props.unsetNoFill();
-        }
-
-        @Override
-        public CTSolidColorFillProperties getSolidFill() {
-            return props.getSolidFill();
-        }
-
-        @Override
-        public boolean isSetSolidFill() {
-            return props.isSetSolidFill();
-        }
-
-        @Override
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {
-            props.setSolidFill(solidFill);
-        }
-
-        @Override
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return props.addNewSolidFill();
-        }
-
-        @Override
-        public void unsetSolidFill() {
-            props.unsetSolidFill();
-        }
-
-        @Override
-        public CTGradientFillProperties getGradFill() {
-            return props.getGradFill();
-        }
-
-        @Override
-        public boolean isSetGradFill() {
-            return props.isSetGradFill();
-        }
-
-        @Override
-        public void setGradFill(CTGradientFillProperties gradFill) {
-            props.setGradFill(gradFill);
-        }
-
-        @Override
-        public CTGradientFillProperties addNewGradFill() {
-            return props.addNewGradFill();
-        }
-
-        @Override
-        public void unsetGradFill() {
-            props.unsetGradFill();
-        }
-
-        @Override
-        public CTBlipFillProperties getBlipFill() {
-            return props.getBlipFill();
-        }
-
-        @Override
-        public boolean isSetBlipFill() {
-            return props.isSetBlipFill();
-        }
-
-        @Override
-        public void setBlipFill(CTBlipFillProperties blipFill) {
-            props.setBlipFill(blipFill);
-        }
-
-        @Override
-        public CTBlipFillProperties addNewBlipFill() {
-            return props.addNewBlipFill();
-        }
-
-        @Override
-        public void unsetBlipFill() {
-            props.unsetBlipFill();
-        }
-
-        @Override
-        public CTPatternFillProperties getPattFill() {
-            return props.getPattFill();
-        }
-
-        @Override
-        public boolean isSetPattFill() {
-            return props.isSetPattFill();
-        }
-
-        @Override
-        public void setPattFill(CTPatternFillProperties pattFill) {
-            props.setPattFill(pattFill);
-        }
-
-        @Override
-        public CTPatternFillProperties addNewPattFill() {
-            return props.addNewPattFill();
-        }
-
-        @Override
-        public void unsetPattFill() {
-            props.unsetPattFill();
-        }
-
-        @Override
-        public CTGroupFillProperties getGrpFill() {
-            return props.getGrpFill();
-        }
-
-        @Override
-        public boolean isSetGrpFill() {
-            return props.isSetGrpFill();
-        }
-
-        @Override
-        public void setGrpFill(CTGroupFillProperties grpFill) {
-            props.setGrpFill(grpFill);
-        }
-
-        @Override
-        public CTGroupFillProperties addNewGrpFill() {
-            return props.addNewGrpFill();
-        }
-
-        @Override
-        public void unsetGrpFill() {
-            props.unsetGrpFill();
-        }
-
-        @Override
-        public CTEffectList getEffectLst() {
-            return props.getEffectLst();
-        }
-
-        @Override
-        public boolean isSetEffectLst() {
-            return props.isSetEffectLst();
-        }
-
-        @Override
-        public void setEffectLst(CTEffectList effectLst) {
-            props.setEffectLst(effectLst);
-        }
-
-        @Override
-        public CTEffectList addNewEffectLst() {
-            return props.addNewEffectLst();
-        }
-
-        @Override
-        public void unsetEffectLst() {
-            props.unsetEffectLst();
-        }
-
-        @Override
-        public CTEffectContainer getEffectDag() {
-            return props.getEffectDag();
-        }
-
-        @Override
-        public boolean isSetEffectDag() {
-            return props.isSetEffectDag();
-        }
-
-        @Override
-        public void setEffectDag(CTEffectContainer effectDag) {
-            props.setEffectDag(effectDag);
-        }
-
-        @Override
-        public CTEffectContainer addNewEffectDag() {
-            return props.addNewEffectDag();
-        }
-
-        @Override
-        public void unsetEffectDag() {
-            props.unsetEffectDag();
-        }
-
-        @Override
-        public boolean isSetMatrixStyle() {
-            return false;
-        }
-
-        @Override
-        public CTStyleMatrixReference getMatrixStyle() {
-            return null;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            return false;
-        }
-    }
-
-    private static class TableCellDelegate implements XSLFFillProperties {
-        final CTTableCellProperties props;
-        
-        TableCellDelegate(CTTableCellProperties props) {
-            this.props = props;
-        }
-
-        @Override
-        public CTNoFillProperties getNoFill() {
-            return props.getNoFill();
-        }
-
-        @Override
-        public boolean isSetNoFill() {
-            return props.isSetNoFill();
-        }
-
-        @Override
-        public void setNoFill(CTNoFillProperties noFill) {
-            props.setNoFill(noFill);
-        }
-
-        @Override
-        public CTNoFillProperties addNewNoFill() {
-            return props.addNewNoFill();
-        }
-
-        @Override
-        public void unsetNoFill() {
-            props.unsetNoFill();
-        }
-
-        @Override
-        public CTSolidColorFillProperties getSolidFill() {
-            return props.getSolidFill();
-        }
-
-        @Override
-        public boolean isSetSolidFill() {
-            return props.isSetSolidFill();
-        }
-
-        @Override
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {
-            props.setSolidFill(solidFill);
-        }
-
-        @Override
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return props.addNewSolidFill();
-        }
-
-        @Override
-        public void unsetSolidFill() {
-            props.unsetSolidFill();
-        }
-
-        @Override
-        public CTGradientFillProperties getGradFill() {
-            return props.getGradFill();
-        }
-
-        @Override
-        public boolean isSetGradFill() {
-            return props.isSetGradFill();
-        }
-
-        @Override
-        public void setGradFill(CTGradientFillProperties gradFill) {
-            props.setGradFill(gradFill);
-        }
-
-        @Override
-        public CTGradientFillProperties addNewGradFill() {
-            return props.addNewGradFill();
-        }
-
-        @Override
-        public void unsetGradFill() {
-            props.unsetGradFill();
-        }
-
-        @Override
-        public CTBlipFillProperties getBlipFill() {
-            return props.getBlipFill();
-        }
-
-        @Override
-        public boolean isSetBlipFill() {
-            return props.isSetBlipFill();
-        }
-
-        @Override
-        public void setBlipFill(CTBlipFillProperties blipFill) {
-            props.setBlipFill(blipFill);
-        }
-
-        @Override
-        public CTBlipFillProperties addNewBlipFill() {
-            return props.addNewBlipFill();
-        }
-
-        @Override
-        public void unsetBlipFill() {
-            props.unsetBlipFill();
-        }
-
-        @Override
-        public CTPatternFillProperties getPattFill() {
-            return props.getPattFill();
-        }
-
-        @Override
-        public boolean isSetPattFill() {
-            return props.isSetPattFill();
-        }
-
-        @Override
-        public void setPattFill(CTPatternFillProperties pattFill) {
-            props.setPattFill(pattFill);
-        }
-
-        @Override
-        public CTPatternFillProperties addNewPattFill() {
-            return props.addNewPattFill();
-        }
-
-        @Override
-        public void unsetPattFill() {
-            props.unsetPattFill();
-        }
-
-        @Override
-        public CTGroupFillProperties getGrpFill() {
-            return props.getGrpFill();
-        }
-
-        @Override
-        public boolean isSetGrpFill() {
-            return props.isSetGrpFill();
-        }
-
-        @Override
-        public void setGrpFill(CTGroupFillProperties grpFill) {
-            props.setGrpFill(grpFill);
-        }
-
-        @Override
-        public CTGroupFillProperties addNewGrpFill() {
-            return props.addNewGrpFill();
-        }
-
-        @Override
-        public void unsetGrpFill() {
-            props.unsetGrpFill();
-        }
-
-        @Override
-        public boolean isSetMatrixStyle() {
-            return false;
-        }
-
-        @Override
-        public CTStyleMatrixReference getMatrixStyle() {
-            return null;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            return false;
-        }
-    }
-
-    private static class StyleMatrixDelegate implements XSLFFillProperties {
-        final CTStyleMatrixReference props;
-        
-        StyleMatrixDelegate(CTStyleMatrixReference props) {
-            this.props = props;
-        }
-
-        @Override
-        public CTNoFillProperties getNoFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetNoFill() {
-            return false;
-        }
-
-        @Override
-        public void setNoFill(CTNoFillProperties noFill) {}
-
-        @Override
-        public CTNoFillProperties addNewNoFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetNoFill() {}
-
-        @Override
-        public CTSolidColorFillProperties getSolidFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetSolidFill() {
-            return false;
-        }
-
-        @Override
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {}
-
-        @Override
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetSolidFill() {}
-
-        @Override
-        public CTGradientFillProperties getGradFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetGradFill() {
-            return false;
-        }
-
-        @Override
-        public void setGradFill(CTGradientFillProperties gradFill) {}
-
-        @Override
-        public CTGradientFillProperties addNewGradFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetGradFill() {}
-
-        @Override
-        public CTBlipFillProperties getBlipFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetBlipFill() {
-            return false;
-        }
-
-        @Override
-        public void setBlipFill(CTBlipFillProperties blipFill) {}
-
-        @Override
-        public CTBlipFillProperties addNewBlipFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetBlipFill() {}
-
-        @Override
-        public CTPatternFillProperties getPattFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetPattFill() {
-            return false;
-        }
-
-        @Override
-        public void setPattFill(CTPatternFillProperties pattFill) {}
-
-        @Override
-        public CTPatternFillProperties addNewPattFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetPattFill() {}
-
-        @Override
-        public CTGroupFillProperties getGrpFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetGrpFill() {
-            return false;
-        }
-
-        @Override
-        public void setGrpFill(CTGroupFillProperties grpFill) {}
-
-        @Override
-        public CTGroupFillProperties addNewGrpFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetGrpFill() {}
-
-    
-        @Override
-        public boolean isSetMatrixStyle() {
-            return true;
-        }
-
-        @Override
-        public CTStyleMatrixReference getMatrixStyle() {
-            return props;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            XmlCursor cur = props.newCursor();
-            String name = cur.getName().getLocalPart();
-            cur.dispose();
-            return "lnRef".equals(name);
-        }
-    }
-
-    private static class FillDelegate implements XSLFFillProperties {
-        final CTFillProperties props;
-        
-        FillDelegate(CTFillProperties props) {
-            this.props = props;
-        }
-
-        @Override
-        public CTNoFillProperties getNoFill() {
-            return props.getNoFill();
-        }
-
-        @Override
-        public boolean isSetNoFill() {
-            return props.isSetNoFill();
-        }
-
-        @Override
-        public void setNoFill(CTNoFillProperties noFill) {
-            props.setNoFill(noFill);
-        }
-
-        @Override
-        public CTNoFillProperties addNewNoFill() {
-            return props.addNewNoFill();
-        }
-
-        @Override
-        public void unsetNoFill() {
-            props.unsetNoFill();
-        }
-
-        @Override
-        public CTSolidColorFillProperties getSolidFill() {
-            return props.getSolidFill();
-        }
-
-        @Override
-        public boolean isSetSolidFill() {
-            return props.isSetSolidFill();
-        }
-
-        @Override
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {
-            props.setSolidFill(solidFill);
-        }
-
-        @Override
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return props.addNewSolidFill();
-        }
-
-        @Override
-        public void unsetSolidFill() {
-            props.unsetSolidFill();
-        }
-
-        @Override
-        public CTGradientFillProperties getGradFill() {
-            return props.getGradFill();
-        }
-
-        @Override
-        public boolean isSetGradFill() {
-            return props.isSetGradFill();
-        }
-
-        @Override
-        public void setGradFill(CTGradientFillProperties gradFill) {
-            props.setGradFill(gradFill);
-        }
-
-        @Override
-        public CTGradientFillProperties addNewGradFill() {
-            return props.addNewGradFill();
-        }
-
-        @Override
-        public void unsetGradFill() {
-            props.unsetGradFill();
-        }
-
-        @Override
-        public CTBlipFillProperties getBlipFill() {
-            return props.getBlipFill();
-        }
-
-        @Override
-        public boolean isSetBlipFill() {
-            return props.isSetBlipFill();
-        }
-
-        @Override
-        public void setBlipFill(CTBlipFillProperties blipFill) {
-            props.setBlipFill(blipFill);
-        }
-
-        @Override
-        public CTBlipFillProperties addNewBlipFill() {
-            return props.addNewBlipFill();
-        }
-
-        @Override
-        public void unsetBlipFill() {
-            props.unsetBlipFill();
-        }
-
-        @Override
-        public CTPatternFillProperties getPattFill() {
-            return props.getPattFill();
-        }
-
-        @Override
-        public boolean isSetPattFill() {
-            return props.isSetPattFill();
-        }
-
-        @Override
-        public void setPattFill(CTPatternFillProperties pattFill) {
-            props.setPattFill(pattFill);
-        }
-
-        @Override
-        public CTPatternFillProperties addNewPattFill() {
-            return props.addNewPattFill();
-        }
-
-        @Override
-        public void unsetPattFill() {
-            props.unsetPattFill();
-        }
-
-        @Override
-        public CTGroupFillProperties getGrpFill() {
-            return props.getGrpFill();
-        }
-
-        @Override
-        public boolean isSetGrpFill() {
-            return props.isSetGrpFill();
-        }
-
-        @Override
-        public void setGrpFill(CTGroupFillProperties grpFill) {
-            props.setGrpFill(grpFill);
-        }
-
-        @Override
-        public CTGroupFillProperties addNewGrpFill() {
-            return props.addNewGrpFill();
-        }
-
-        @Override
-        public void unsetGrpFill() {
-            props.unsetGrpFill();
-        }
-
-        @Override
-        public boolean isSetMatrixStyle() {
-            return false;
-        }
-
-        @Override
-        public CTStyleMatrixReference getMatrixStyle() {
-            return null;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            return false;
-        }
-    }
-
-    private static class FillPartDelegate implements XSLFFillProperties {
-        final XmlObject props;
-        
-        FillPartDelegate(XmlObject props) {
-            this.props = props;
-        }
-
-        public CTNoFillProperties getNoFill() {
-            return isSetNoFill() ? (CTNoFillProperties)props : null;
-        }
-
-        public boolean isSetNoFill() {
-            return (props instanceof CTNoFillProperties);
-        }
-
-        public void setNoFill(CTNoFillProperties noFill) {}
-
-        public CTNoFillProperties addNewNoFill() {
-            return null;
-        }
-
-        public void unsetNoFill() {}
-
-        public CTSolidColorFillProperties getSolidFill() {
-            return isSetSolidFill() ? (CTSolidColorFillProperties)props : null;
-        }
-
-        public boolean isSetSolidFill() {
-            return (props instanceof CTSolidColorFillProperties);
-        }
-
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {}
-
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return null;
-        }
-
-        public void unsetSolidFill() {}
-
-        public CTGradientFillProperties getGradFill() {
-            return isSetGradFill() ? (CTGradientFillProperties)props : null;
-        }
-
-        public boolean isSetGradFill() {
-            return (props instanceof CTGradientFillProperties);
-        }
-
-        public void setGradFill(CTGradientFillProperties gradFill) {}
-
-        public CTGradientFillProperties addNewGradFill() {
-            return null;
-        }
-
-        public void unsetGradFill() {}
-
-        public CTBlipFillProperties getBlipFill() {
-            return isSetBlipFill() ? (CTBlipFillProperties)props : null;
-        }
-
-        public boolean isSetBlipFill() {
-            return (props instanceof CTBlipFillProperties);
-        }
-
-        public void setBlipFill(CTBlipFillProperties blipFill) {}
-
-        public CTBlipFillProperties addNewBlipFill() {
-            return null;
-        }
-
-        public void unsetBlipFill() {}
-
-        public CTPatternFillProperties getPattFill() {
-            return isSetPattFill() ? (CTPatternFillProperties)props : null;
-        }
-
-        public boolean isSetPattFill() {
-            return (props instanceof CTPatternFillProperties);
-        }
-
-        public void setPattFill(CTPatternFillProperties pattFill) {}
-
-        public CTPatternFillProperties addNewPattFill() {
-            return null;
-        }
-
-        public void unsetPattFill() {}
-
-        public CTGroupFillProperties getGrpFill() {
-            return isSetGrpFill() ? (CTGroupFillProperties)props : null;
-        }
-
-        public boolean isSetGrpFill() {
-            return (props instanceof CTGroupFillProperties);
-        }
-
-        public void setGrpFill(CTGroupFillProperties grpFill) {}
-
-        public CTGroupFillProperties addNewGrpFill() {
-            return null;
-        }
-
-        public void unsetGrpFill() {}
-
-        public boolean isSetMatrixStyle() {
-            return false;
-        }
-
-        public CTStyleMatrixReference getMatrixStyle() {
-            return null;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            return false;
-        }
-    }
-    
-    private static class LineStyleDelegate implements XSLFFillProperties {
-        final CTLineProperties props;
-        
-        LineStyleDelegate(CTLineProperties props) {
-            this.props = props;
-        }
-
-        @Override
-        public CTNoFillProperties getNoFill() {
-            return props.getNoFill();
-        }
-
-        @Override
-        public boolean isSetNoFill() {
-            return props.isSetNoFill();
-        }
-
-        @Override
-        public void setNoFill(CTNoFillProperties noFill) {
-            props.setNoFill(noFill);
-        }
-
-        @Override
-        public CTNoFillProperties addNewNoFill() {
-            return props.addNewNoFill();
-        }
-
-        @Override
-        public void unsetNoFill() {
-            props.unsetNoFill();
-        }
-
-        @Override
-        public CTSolidColorFillProperties getSolidFill() {
-            return props.getSolidFill();
-        }
-
-        @Override
-        public boolean isSetSolidFill() {
-            return props.isSetSolidFill();
-        }
-
-        @Override
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {
-            props.setSolidFill(solidFill);
-        }
-
-        @Override
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return props.addNewSolidFill();
-        }
-
-        @Override
-        public void unsetSolidFill() {
-            props.unsetSolidFill();
-        }
-
-        @Override
-        public CTGradientFillProperties getGradFill() {
-            return props.getGradFill();
-        }
-
-        @Override
-        public boolean isSetGradFill() {
-            return props.isSetGradFill();
-        }
-
-        @Override
-        public void setGradFill(CTGradientFillProperties gradFill) {
-            props.setGradFill(gradFill);
-        }
-
-        @Override
-        public CTGradientFillProperties addNewGradFill() {
-            return props.addNewGradFill();
-        }
-
-        @Override
-        public void unsetGradFill() {
-            props.unsetGradFill();
-        }
-
-        @Override
-        public CTBlipFillProperties getBlipFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetBlipFill() {
-            return false;
-        }
-
-        @Override
-        public void setBlipFill(CTBlipFillProperties blipFill) {}
-
-        @Override
-        public CTBlipFillProperties addNewBlipFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetBlipFill() {}
-
-        @Override
-        public CTPatternFillProperties getPattFill() {
-            return props.getPattFill();
-        }
-
-        @Override
-        public boolean isSetPattFill() {
-            return props.isSetPattFill();
-        }
-
-        @Override
-        public void setPattFill(CTPatternFillProperties pattFill) {
-            props.setPattFill(pattFill);
-        }
-
-        @Override
-        public CTPatternFillProperties addNewPattFill() {
-            return props.addNewPattFill();
-        }
-
-        @Override
-        public void unsetPattFill() {
-            props.unsetPattFill();
-        }
-
-        @Override
-        public CTGroupFillProperties getGrpFill() {
-            return null;
-        }
-
-        @Override
-        public boolean isSetGrpFill() {
-            return false;
-        }
-
-        @Override
-        public void setGrpFill(CTGroupFillProperties grpFill) {}
-
-        @Override
-        public CTGroupFillProperties addNewGrpFill() {
-            return null;
-        }
-
-        @Override
-        public void unsetGrpFill() {}
-
-        @Override
-        public boolean isSetMatrixStyle() {
-            return false;
-        }
-
-        @Override
-        public CTStyleMatrixReference getMatrixStyle() {
-            return null;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            return true;
-        }
-    }
-    
-    private static class TextCharDelegate implements XSLFFillProperties {
-        final CTTextCharacterProperties props;
-        
-        TextCharDelegate(CTTextCharacterProperties props) {
-            this.props = props;
-        }
-
-        @Override
-        public CTNoFillProperties getNoFill() {
-            return props.getNoFill();
-        }
-
-        @Override
-        public boolean isSetNoFill() {
-            return props.isSetNoFill();
-        }
-
-        @Override
-        public void setNoFill(CTNoFillProperties noFill) {
-            props.setNoFill(noFill);
-        }
-
-        @Override
-        public CTNoFillProperties addNewNoFill() {
-            return props.addNewNoFill();
-        }
-
-        @Override
-        public void unsetNoFill() {
-            props.unsetNoFill();
-        }
-
-        @Override
-        public CTSolidColorFillProperties getSolidFill() {
-            return props.getSolidFill();
-        }
-
-        @Override
-        public boolean isSetSolidFill() {
-            return props.isSetSolidFill();
-        }
-
-        @Override
-        public void setSolidFill(CTSolidColorFillProperties solidFill) {
-            props.setSolidFill(solidFill);
-        }
-
-        @Override
-        public CTSolidColorFillProperties addNewSolidFill() {
-            return props.addNewSolidFill();
-        }
-
-        @Override
-        public void unsetSolidFill() {
-            props.unsetSolidFill();
-        }
-
-        @Override
-        public CTGradientFillProperties getGradFill() {
-            return props.getGradFill();
-        }
-
-        @Override
-        public boolean isSetGradFill() {
-            return props.isSetGradFill();
-        }
-
-        @Override
-        public void setGradFill(CTGradientFillProperties gradFill) {
-            props.setGradFill(gradFill);
-        }
-
-        @Override
-        public CTGradientFillProperties addNewGradFill() {
-            return props.addNewGradFill();
-        }
-
-        @Override
-        public void unsetGradFill() {
-            props.unsetGradFill();
-        }
-
-        @Override
-        public CTBlipFillProperties getBlipFill() {
-            return props.getBlipFill();
-        }
-
-        @Override
-        public boolean isSetBlipFill() {
-            return props.isSetBlipFill();
-        }
-
-        @Override
-        public void setBlipFill(CTBlipFillProperties blipFill) {
-            props.setBlipFill(blipFill);
-        }
-
-        @Override
-        public CTBlipFillProperties addNewBlipFill() {
-            return props.addNewBlipFill();
-        }
-
-        @Override
-        public void unsetBlipFill() {
-            props.unsetBlipFill();
-        }
-
-        @Override
-        public CTPatternFillProperties getPattFill() {
-            return props.getPattFill();
-        }
-
-        @Override
-        public boolean isSetPattFill() {
-            return props.isSetPattFill();
-        }
-
-        @Override
-        public void setPattFill(CTPatternFillProperties pattFill) {
-            props.setPattFill(pattFill);
-        }
-
-        @Override
-        public CTPatternFillProperties addNewPattFill() {
-            return props.addNewPattFill();
-        }
-
-        @Override
-        public void unsetPattFill() {
-            props.unsetPattFill();
-        }
-
-        @Override
-        public CTGroupFillProperties getGrpFill() {
-            return props.getGrpFill();
-        }
-
-        @Override
-        public boolean isSetGrpFill() {
-            return props.isSetGrpFill();
-        }
-
-        @Override
-        public void setGrpFill(CTGroupFillProperties grpFill) {
-            props.setGrpFill(grpFill);
-        }
-
-        @Override
-        public CTGroupFillProperties addNewGrpFill() {
-            return props.addNewGrpFill();
-        }
-
-        @Override
-        public void unsetGrpFill() {
-            props.unsetGrpFill();
-        }
-
-        @Override
-        public boolean isSetMatrixStyle() {
-            return false;
-        }
-
-        @Override
-        public CTStyleMatrixReference getMatrixStyle() {
-            return null;
-        }
-        
-        @Override
-        public boolean isLineStyle() {
-            return false;
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    private static <T> T getDelegate(Class<T> clazz, XmlObject props) {
-        Object obj = null;
-        if (props == null) {
-            return null;
-        } else if (props instanceof CTShapeProperties) {
-            obj = new ShapeDelegate((CTShapeProperties)props);
-        } else if (props instanceof CTBackgroundProperties) {
-            obj = new BackgroundDelegate((CTBackgroundProperties)props);
-        } else if (props instanceof CTStyleMatrixReference) {
-            obj = new StyleMatrixDelegate((CTStyleMatrixReference)props);
-        } else if (props instanceof CTTableCellProperties) {
-            obj = new TableCellDelegate((CTTableCellProperties)props);
-        } else if (props instanceof CTNoFillProperties
-            || props instanceof CTSolidColorFillProperties
-            || props instanceof CTGradientFillProperties
-            || props instanceof CTBlipFillProperties
-            || props instanceof CTPatternFillProperties
-            || props instanceof CTGroupFillProperties) {
-            obj = new FillPartDelegate(props);
-        } else if (props instanceof CTFillProperties) {
-            obj = new FillDelegate((CTFillProperties)props);
-        } else if (props instanceof CTLineProperties) {
-            obj = new LineStyleDelegate((CTLineProperties)props);
-        } else if (props instanceof CTTextCharacterProperties) {
-            obj = new TextCharDelegate((CTTextCharacterProperties)props);
-        } else {
-            LOG.log(POILogger.ERROR, props.getClass().toString()+" is an unknown properties type");
-            return null;
-        }
-
-        if (clazz.isInstance(obj)) {
-            return (T)obj;
-        }
-        
-        LOG.log(POILogger.WARN, obj.getClass().toString()+" doesn't implement "+clazz.toString());
-        return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
deleted file mode 100644
index f3f59b9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLRelation;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.util.Beta;
-
-@Beta
-public class XSLFRelation extends POIXMLRelation {
-
-   /**
-    * A map to lookup POIXMLRelation by its relation type
-    */
-   private static final Map<String, XSLFRelation> _table = new HashMap<String, XSLFRelation>();
-   
-   public static final XSLFRelation MAIN = new XSLFRelation(
-           "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml",
-           null, null, null
-   );
-   
-   public static final XSLFRelation MACRO = new XSLFRelation(
-           "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml",
-           null, null, null
-   );
-   
-   public static final XSLFRelation MACRO_TEMPLATE = new XSLFRelation(
-           "application/vnd.ms-powerpoint.template.macroEnabled.main+xml",
-           null, null, null
-   );
-   
-   public static final XSLFRelation PRESENTATIONML = new XSLFRelation(
-           "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml",
-           null, null, null
-   );
-   
-   public static final XSLFRelation PRESENTATIONML_TEMPLATE = new XSLFRelation(
-           "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml",
-           null, null, null
-   );
-   
-   public static final XSLFRelation PRESENTATION_MACRO = new XSLFRelation(
-           "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml",
-           null, null, null
-   );
-   
-   public static final XSLFRelation THEME_MANAGER = new XSLFRelation(
-           "application/vnd.openxmlformats-officedocument.themeManager+xml",
-           null, null, null
-   );
-   
-   public static final XSLFRelation NOTES = new XSLFRelation(
-           "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml",
-           "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide", 
-           "/ppt/notesSlides/notesSlide#.xml",
-           XSLFNotes.class
-   );
-   
-   public static final XSLFRelation SLIDE = new XSLFRelation(
-           "application/vnd.openxmlformats-officedocument.presentationml.slide+xml",
-           "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide", 
-           "/ppt/slides/slide#.xml", 
-           XSLFSlide.class
-   );
-   
-   public static final XSLFRelation SLIDE_LAYOUT = new XSLFRelation(
-         "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml",
-         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout",
-         "/ppt/slideLayouts/slideLayout#.xml", 
-         XSLFSlideLayout.class
-   );
-   
-   public static final XSLFRelation SLIDE_MASTER = new XSLFRelation(
-         "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml",
-         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster",
-         "/ppt/slideMasters/slideMaster#.xml",
-         XSLFSlideMaster.class
-   );
-
-   public static final XSLFRelation NOTES_MASTER = new XSLFRelation(
-         "application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml",
-         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster",
-         "/ppt/notesMasters/notesMaster#.xml",
-         XSLFNotesMaster.class
-   );
-
-   public static final XSLFRelation COMMENTS = new XSLFRelation(
-         "application/vnd.openxmlformats-officedocument.presentationml.comments+xml",
-         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
-         "/ppt/comments/comment#.xml",
-         XSLFComments.class
-   );
-   
-   public static final XSLFRelation COMMENT_AUTHORS = new XSLFRelation(
-         "application/vnd.openxmlformats-officedocument.presentationml.commentAuthors+xml",
-         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors",
-         "/ppt/commentAuthors.xml",
-         XSLFCommentAuthors.class
-   );
-   
-    public static final XSLFRelation HYPERLINK = new XSLFRelation(
-            null,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
-            null,
-            null
-    );
-
-   public static final XSLFRelation THEME = new XSLFRelation(
-         "application/vnd.openxmlformats-officedocument.theme+xml",
-         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",
-         "/ppt/theme/theme#.xml", 
-         XSLFTheme.class
-   );
-   
-   public static final XSLFRelation VML_DRAWING = new XSLFRelation(
-         "application/vnd.openxmlformats-officedocument.vmlDrawing",
-         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing",
-         "/ppt/drawings/vmlDrawing#.vml", 
-         null
-   );
-
-    public static final XSLFRelation CHART = new XSLFRelation(
-            "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart",
-            "/ppt/charts/chart#.xml",
-            XSLFChart.class
-    );
-
-    public static final XSLFRelation IMAGE_EMF = new XSLFRelation(
-          PictureType.EMF.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.emf",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_WMF = new XSLFRelation(
-          PictureType.WMF.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.wmf",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_PICT = new XSLFRelation(
-          PictureType.PICT.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.pict",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_JPEG = new XSLFRelation(
-          PictureType.JPEG.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.jpeg",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_PNG = new XSLFRelation(
-          PictureType.PNG.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.png",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_DIB = new XSLFRelation(
-          PictureType.DIB.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.dib",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_GIF = new XSLFRelation(
-          PictureType.GIF.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.gif",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_TIFF = new XSLFRelation(
-          PictureType.TIFF.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.tiff",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_EPS = new XSLFRelation(
-          PictureType.EPS.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.eps",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_BMP = new XSLFRelation(
-          PictureType.BMP.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.bmp",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_WPG = new XSLFRelation(
-          PictureType.WPG.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.wpg",
-          XSLFPictureData.class
-    );
-    public static final XSLFRelation IMAGE_WDP = new XSLFRelation(
-          PictureType.WDP.contentType,
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-          "/ppt/media/image#.wdp",
-          XSLFPictureData.class
-    );
-
-    public static final XSLFRelation IMAGES = new XSLFRelation(
-            null,
-     		"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-    		null,
-    		XSLFPictureData.class
-    );
-
-    public static final XSLFRelation TABLE_STYLES = new XSLFRelation(
-          "application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml",
-          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableStyles",
-          "/ppt/tableStyles.xml",
-          XSLFTableStyles.class
-    );
-
-   private XSLFRelation(String type, String rel, String defaultName, Class<? extends POIXMLDocumentPart> cls) {
-      super(type, rel, defaultName, cls);
-      _table.put(rel, this);
-   }
-
-   /**
-    * Get POIXMLRelation by relation type
-    *
-    * @param rel relation type, for example,
-    *    <code>http://schemas.openxmlformats.org/officeDocument/2006/relationships/image</code>
-    * @return registered POIXMLRelation or null if not found
-    */
-   public static XSLFRelation getInstance(String rel){
-       return _table.get(rel);
-   }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRenderingHint.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRenderingHint.java
deleted file mode 100644
index fe68385..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRenderingHint.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.util.Internal;
-
-import java.awt.RenderingHints;
-
-/**
- *
- * @author Yegor Kozlov
- */
-public class XSLFRenderingHint extends RenderingHints.Key {
-
-    public XSLFRenderingHint(int i){
-        super(i);
-    }
-
-    @Override
-    public boolean isCompatibleValue(Object val) {
-        return true;
-    }
-
-    public static final XSLFRenderingHint GSAVE = new XSLFRenderingHint(1);
-    public static final XSLFRenderingHint GRESTORE = new XSLFRenderingHint(2);
-
-    /**
-     * Use a custom image rendener
-     *
-     * @see XSLFImageRenderer
-     */
-    public static final XSLFRenderingHint IMAGE_RENDERER = new XSLFRenderingHint(3);
-
-    /**
-     *  how to render text:
-     *
-     *  {@link #TEXT_AS_CHARACTERS} (default) means to draw via
-     *   {@link java.awt.Graphics2D#drawString(java.text.AttributedCharacterIterator, float, float)}.
-     *   This mode draws text as characters. Use it if the target graphics writes the actual
-     *   character codes instead of glyph outlines (PDFGraphics2D, SVGGraphics2D, etc.)
-     *
-     *   {@link #TEXT_AS_SHAPES} means to render via
-     *   {@link java.awt.font.TextLayout#draw(java.awt.Graphics2D, float, float)}.
-     *   This mode draws glyphs as shapes and provides some advanced capabilities such as
-     *   justification and font substitution. Use it if the target graphics is an image.
-     *
-     */
-    public static final XSLFRenderingHint TEXT_RENDERING_MODE = new XSLFRenderingHint(4);
-
-    /**
-     * draw text via {@link java.awt.Graphics2D#drawString(java.text.AttributedCharacterIterator, float, float)}
-     */
-    public static final int TEXT_AS_CHARACTERS = 1;
-
-    /**
-     * draw text via {@link java.awt.font.TextLayout#draw(java.awt.Graphics2D, float, float)}
-     */
-    public static final int TEXT_AS_SHAPES = 2;
-
-    @Internal
-    static final XSLFRenderingHint GROUP_TRANSFORM = new XSLFRenderingHint(5);
-
-    /**
-     * Use this object to resolve unknown / missing fonts when rendering slides
-     */
-    public static final XSLFRenderingHint FONT_HANDLER = new XSLFRenderingHint(6);
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
deleted file mode 100644
index 4adeba3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.Shadow;
-import org.apache.poi.util.Units;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOuterShadowEffect;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-
-/**
- * Represents a shadow of a shape. For now supports only outer shadows.
- *
- * @author Yegor Kozlov
- */
-public class XSLFShadow extends XSLFShape implements Shadow<XSLFShape,XSLFTextParagraph> {
-
-    private XSLFSimpleShape _parent;
-
-    /* package */XSLFShadow(CTOuterShadowEffect shape, XSLFSimpleShape parentShape) {
-        super(shape, parentShape.getSheet());
-
-        _parent = parentShape;
-    }
-
-    @Override
-    public XSLFSimpleShape getShadowParent() {
-        return _parent;
-    }
-
-    @Override
-    public Rectangle2D getAnchor(){
-        return _parent.getAnchor();
-    }
-
-    public void setAnchor(Rectangle2D anchor){
-        throw new IllegalStateException("You can't set anchor of a shadow");
-    }
-
-    /**
-     * @return the offset of this shadow in points
-     */
-    public double getDistance(){
-        CTOuterShadowEffect ct = (CTOuterShadowEffect)getXmlObject();
-        return ct.isSetDist() ? Units.toPoints(ct.getDist()) : 0;        
-    }
-
-    /**
-     * 
-     * @return the direction to offset the shadow in angles
-     */
-    public double getAngle(){
-        CTOuterShadowEffect ct = (CTOuterShadowEffect)getXmlObject();
-        return ct.isSetDir() ? (double)ct.getDir() / 60000 : 0;
-    }
-
-    /**
-     * 
-     * @return the blur radius of the shadow
-     * TODO: figure out how to make sense of this property when rendering shadows 
-     */
-    public double getBlur(){
-        CTOuterShadowEffect ct = (CTOuterShadowEffect)getXmlObject();
-        return ct.isSetBlurRad() ? Units.toPoints(ct.getBlurRad()) : 0;
-    }
-
-    /**
-     * @return the color of this shadow. 
-     * Depending whether the parent shape is filled or stroked, this color is used to fill or stroke this shadow
-     */
-    public Color getFillColor() {
-        SolidPaint ps = getFillStyle();
-        if (ps == null) return null;
-        Color col = DrawPaint.applyColorTransform(ps.getSolidColor());
-        return col;
-    }
-
-    @Override
-    public SolidPaint getFillStyle() {
-        XSLFTheme theme = getSheet().getTheme();
-        CTOuterShadowEffect ct = (CTOuterShadowEffect)getXmlObject();
-        if(ct == null) return null;
-            
-        CTSchemeColor phClr = ct.getSchemeClr();
-        final XSLFColor xc = new XSLFColor(ct, theme, phClr);
-        return DrawPaint.createSolidPaint(xc.getColorStyle());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
deleted file mode 100644
index 70df3f8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.ColorStyle;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.GradientPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.TexturePaint;
-import org.apache.poi.sl.usermodel.PlaceableShape;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xslf.model.PropertyFetcher;
-import org.apache.poi.xslf.usermodel.XSLFPropertiesDelegate.XSLFFillProperties;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGradientFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGradientStop;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTStyleMatrix;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTStyleMatrixReference;
-import org.openxmlformats.schemas.drawingml.x2006.main.STPathShadeType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTBackgroundProperties;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
-
-/**
- * Base super-class class for all shapes in PresentationML
- */
-@Beta
-public abstract class XSLFShape implements Shape<XSLFShape,XSLFTextParagraph> {
-    protected static final String PML_NS = "http://schemas.openxmlformats.org/presentationml/2006/main";
-    
-    private final XmlObject _shape;
-    private final XSLFSheet _sheet;
-    private XSLFShapeContainer _parent;
-
-    private CTShapeStyle _spStyle;
-    private CTNonVisualDrawingProps _nvPr;
-    private CTPlaceholder _ph;
-
-    protected XSLFShape(XmlObject shape, XSLFSheet sheet) {
-        _shape = shape;
-        _sheet = sheet;
-    }
-    
-    /**
-     * @return the xml bean holding this shape's data
-     */
-    public final XmlObject getXmlObject() {
-        // it's final because the xslf inheritance hierarchy is not necessary the same as
-        // the (not existing) xmlbeans hierarchy and subclasses shouldn't narrow it's return value
-        return _shape;
-    }
-    
-    public XSLFSheet getSheet() {
-        return _sheet;
-    }
-    
-    /**
-     * @return human-readable name of this shape, e.g. "Rectange 3"
-     */
-    public String getShapeName(){
-        return getCNvPr().getName();
-    }
-
-    /**
-     * Returns a unique identifier for this shape within the current document.
-     * This ID may be used to assist in uniquely identifying this object so that it can
-     * be referred to by other parts of the document.
-     * <p>
-     * If multiple objects within the same document share the same id attribute value,
-     * then the document shall be considered non-conformant.
-     * </p>
-     *
-     * @return unique id of this shape
-     */
-    public int getShapeId() {
-        return (int)getCNvPr().getId();
-    }
-
-    /**
-     * Set the contents of this shape to be a copy of the source shape.
-     * This method is called recursively for each shape when merging slides
-     *
-     * @param  sh the source shape
-     * @see org.apache.poi.xslf.usermodel.XSLFSlide#importContent(XSLFSheet)
-     */
-    @Internal
-    void copy(XSLFShape sh) {
-        if (!getClass().isInstance(sh)) {
-            throw new IllegalArgumentException(
-                    "Can't copy " + sh.getClass().getSimpleName() + " into " + getClass().getSimpleName());
-        }
-
-        if (this instanceof PlaceableShape) {
-            PlaceableShape<?,?> ps = (PlaceableShape<?,?>)this;
-            ps.setAnchor(sh.getAnchor());
-        }
-        
-        
-    }
-    
-    public void setParent(XSLFShapeContainer parent) {
-        this._parent = parent;
-    }
-    
-    public XSLFShapeContainer getParent() {
-        return this._parent;
-    }
-    
-    protected PaintStyle getFillPaint() {
-        final XSLFTheme theme = getSheet().getTheme();
-        PropertyFetcher<PaintStyle> fetcher = new PropertyFetcher<PaintStyle>() {
-            public boolean fetch(XSLFShape shape) {
-                XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(shape.getShapeProperties());
-                if (fp == null) {
-                    return false;
-                }
-
-                if (fp.isSetNoFill()) {
-                    setValue(null);
-                    return true;
-                }
-                
-                PackagePart pp = shape.getSheet().getPackagePart();
-                PaintStyle paint = selectPaint(fp, null, pp, theme);
-                if (paint != null) {
-                    setValue(paint);
-                    return true;
-                }
-
-                CTShapeStyle style = shape.getSpStyle();
-                if (style != null) {
-                    fp = XSLFPropertiesDelegate.getFillDelegate(style.getFillRef());
-                    paint = selectPaint(fp, null, pp, theme);
-                }
-                if (paint != null) {
-                    setValue(paint);
-                    return true;
-                }
-                
-                
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-
-        return fetcher.getValue();
-    }
-
-    protected CTBackgroundProperties getBgPr() {
-        return getChild(CTBackgroundProperties.class, PML_NS, "bgPr");
-    }
-    
-    protected CTStyleMatrixReference getBgRef() {
-        return getChild(CTStyleMatrixReference.class, PML_NS, "bgRef");
-    }
-    
-    protected CTGroupShapeProperties getGrpSpPr() {
-        return getChild(CTGroupShapeProperties.class, PML_NS, "grpSpPr");
-    }
-    
-    protected CTNonVisualDrawingProps getCNvPr() {
-        if (_nvPr == null) {
-            String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:cNvPr";
-            _nvPr = selectProperty(CTNonVisualDrawingProps.class, xquery);
-        }
-        return _nvPr;
-    }
-
-    protected CTShapeStyle getSpStyle() {
-        if (_spStyle == null) {
-            _spStyle = getChild(CTShapeStyle.class, PML_NS, "style");
-        }
-        return _spStyle;
-    }
-
-    /**
-     * Return direct child objects of this shape
-     *
-     * @param childClass the class to cast the properties to
-     * @param namespace the namespace - usually it is {@code "http://schemas.openxmlformats.org/presentationml/2006/main"}
-     * @param nodename the node name, without prefix
-     * @return the properties object or null if it can't be found
-     */
-    @SuppressWarnings("unchecked")
-    protected <T extends XmlObject> T getChild(Class<T> childClass, String namespace, String nodename) {
-        XmlCursor cur = getXmlObject().newCursor();
-        T child = null;
-        if (cur.toChild(namespace, nodename)) {
-            child = (T)cur.getObject();
-        }
-        cur.dispose();
-        return child;
-    }
-    
-    protected CTPlaceholder getCTPlaceholder() {
-        if (_ph == null) {
-            String xquery = "declare namespace p='"+PML_NS+"' .//*/p:nvPr/p:ph";
-            _ph = selectProperty(CTPlaceholder.class, xquery);
-        }
-        return _ph;
-    }
-
-    public Placeholder getPlaceholder() {
-        CTPlaceholder ph = getCTPlaceholder();
-        if (ph == null || !(ph.isSetType() || ph.isSetIdx())) {
-            return null;
-        }
-        return Placeholder.lookupOoxml(ph.getType().intValue());
-    }
-    
-    /**
-     * Specifies that the corresponding shape should be represented by the generating application
-     * as a placeholder. When a shape is considered a placeholder by the generating application
-     * it can have special properties to alert the user that they may enter content into the shape.
-     * Different types of placeholders are allowed and can be specified by using the placeholder
-     * type attribute for this element
-     *
-     * @param placeholder The shape to use as placeholder or null if no placeholder should be set.
-     */
-    protected void setPlaceholder(Placeholder placeholder) {
-        String xquery = "declare namespace p='"+PML_NS+"' .//*/p:nvPr";
-        CTApplicationNonVisualDrawingProps nv = selectProperty(CTApplicationNonVisualDrawingProps.class, xquery);
-        if (nv == null) return;
-        if(placeholder == null) {
-            if (nv.isSetPh()) nv.unsetPh();
-            _ph = null;
-        } else {
-            nv.addNewPh().setType(STPlaceholderType.Enum.forInt(placeholder.ooxmlId));
-        }
-    }
-    
-    
-    /**
-     * As there's no xmlbeans hierarchy, but XSLF works with subclassing, not all
-     * child classes work with a {@link CTShape} object, but often contain the same
-     * properties. This method is the generalized form of selecting and casting those
-     * properties.
-     *
-     * @param resultClass the requested result class
-     * @param xquery the simple (xmlbean) xpath expression to the property
-     * @return the xml object at the xpath location, or null if not found
-     */
-    @SuppressWarnings("unchecked")
-    protected <T extends XmlObject> T selectProperty(Class<T> resultClass, String xquery) {
-        XmlObject[] rs = getXmlObject().selectPath(xquery);
-        if (rs.length == 0) return null;
-        return (resultClass.isInstance(rs[0])) ? (T)rs[0] : null;
-    }
-
-    /**
-     * Walk up the inheritance tree and fetch shape properties.
-     *
-     * The following order of inheritance is assumed:
-     * <p>
-     * slide <-- slideLayout <-- slideMaster
-     * </p>
-     *
-     * @param visitor the object that collects the desired property
-     * @return true if the property was fetched
-     */
-    protected boolean fetchShapeProperty(PropertyFetcher<?> visitor) {
-        boolean ok = visitor.fetch(this);
-
-        XSLFSimpleShape masterShape;
-        XSLFSheet masterSheet = (XSLFSheet)getSheet().getMasterSheet();
-        CTPlaceholder ph = getCTPlaceholder();
-
-        if (masterSheet != null && ph != null) {
-            if (!ok) {
-                masterShape = masterSheet.getPlaceholder(ph);
-                if (masterShape != null) {
-                    ok = visitor.fetch(masterShape);
-                }
-            }
-
-            // try slide master
-            if (!ok ) {
-                int textType;
-                if ( !ph.isSetType()) textType = STPlaceholderType.INT_BODY;
-                else {
-                    switch (ph.getType().intValue()) {
-                        case STPlaceholderType.INT_TITLE:
-                        case STPlaceholderType.INT_CTR_TITLE:
-                            textType = STPlaceholderType.INT_TITLE;
-                            break;
-                        case STPlaceholderType.INT_FTR:
-                        case STPlaceholderType.INT_SLD_NUM:
-                        case STPlaceholderType.INT_DT:
-                            textType = ph.getType().intValue();
-                            break;
-                        default:
-                            textType = STPlaceholderType.INT_BODY;
-                            break;
-                    }
-                }
-                XSLFSheet master = (XSLFSheet)masterSheet.getMasterSheet();
-                if (master != null) {
-                    masterShape = master.getPlaceholderByType(textType);
-                    if (masterShape != null) {
-                        ok = visitor.fetch(masterShape);
-                    }
-                }
-            }
-        }
-        return ok;
-    }
-
-    /**
-     * Convert shape fill into java.awt.Paint. The result is either Color or
-     * TexturePaint or GradientPaint or null
-     *
-     * @param fp          a properties handler specific to the underlying shape properties
-     * @param phClr       context color
-     * @param parentPart  the parent package part. Any external references (images, etc.) are resolved relative to it.
-     * @param theme       the theme for the shape/sheet
-     *
-     * @return  the applied Paint or null if none was applied
-     */
-    protected static PaintStyle selectPaint(XSLFFillProperties fp, final CTSchemeColor phClr, final PackagePart parentPart, final XSLFTheme theme) {
-        if (fp == null || fp.isSetNoFill()) {
-            return null;
-        } else if (fp.isSetSolidFill()) {
-            return selectPaint(fp.getSolidFill(), phClr, theme);
-        } else if (fp.isSetBlipFill()) {
-            return selectPaint(fp.getBlipFill(), parentPart);
-        } else if (fp.isSetGradFill()) {
-            return selectPaint(fp.getGradFill(), phClr, theme);
-        } else if (fp.isSetMatrixStyle()) {
-            return selectPaint(fp.getMatrixStyle(), theme, fp.isLineStyle());
-        } else {
-            return null;
-        }
-    }
-
-    protected static PaintStyle selectPaint(CTSolidColorFillProperties solidFill, CTSchemeColor phClr, final XSLFTheme theme) {
-        if (phClr == null && solidFill.isSetSchemeClr()) {
-            phClr = solidFill.getSchemeClr();
-        }
-        final XSLFColor c = new XSLFColor(solidFill, theme, phClr);
-        return DrawPaint.createSolidPaint(c.getColorStyle());
-    }
-    
-    protected static PaintStyle selectPaint(final CTBlipFillProperties blipFill, final PackagePart parentPart) {
-        final CTBlip blip = blipFill.getBlip();
-        return new TexturePaint() {
-            private PackagePart getPart() {
-                try {
-                    String blipId = blip.getEmbed();
-                    PackageRelationship rel = parentPart.getRelationship(blipId);
-                    return parentPart.getRelatedPart(rel);
-                } catch (InvalidFormatException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            
-            public InputStream getImageData() {
-                try {
-                    return getPart().getInputStream();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-            public String getContentType() {
-                /* TOOD: map content-type */
-                return getPart().getContentType();
-            }
-
-            public int getAlpha() {
-                return (blip.sizeOfAlphaModFixArray() > 0)
-                    ? blip.getAlphaModFixArray(0).getAmt()
-                    : 100000;
-            }
-        };        
-    }
-    
-    protected static PaintStyle selectPaint(final CTGradientFillProperties gradFill, CTSchemeColor phClr, final XSLFTheme theme) {
-
-        final CTGradientStop[] gs = gradFill.getGsLst().getGsArray();
-
-        Arrays.sort(gs, new Comparator<CTGradientStop>() {
-            public int compare(CTGradientStop o1, CTGradientStop o2) {
-                Integer pos1 = o1.getPos();
-                Integer pos2 = o2.getPos();
-                return pos1.compareTo(pos2);
-            }
-        });
-
-        final ColorStyle cs[] = new ColorStyle[gs.length];
-        final float fractions[] = new float[gs.length];
-        
-        int i=0;
-        for (CTGradientStop cgs : gs) {
-            CTSchemeColor phClrCgs = phClr;
-            if (phClrCgs == null && cgs.isSetSchemeClr()) {
-                phClrCgs = cgs.getSchemeClr();
-            }
-            cs[i] = new XSLFColor(cgs, theme, phClrCgs).getColorStyle();
-            fractions[i] = cgs.getPos() / 100000.f;
-            i++;
-        }
-        
-        return new GradientPaint() {
-
-            public double getGradientAngle() {
-                return (gradFill.isSetLin())
-                    ? gradFill.getLin().getAng() / 60000.d
-                    : 0;
-            }
-
-            public ColorStyle[] getGradientColors() {
-                return cs;
-            }
-
-            public float[] getGradientFractions() {
-                return fractions;
-            }
-
-            public boolean isRotatedWithShape() {
-                // TODO: is this correct???
-                return (gradFill.isSetRotWithShape() || !gradFill.getRotWithShape());
-            }
-
-            public GradientType getGradientType() {
-                if (gradFill.isSetLin()) {
-                    return GradientType.linear;
-                }
-                
-                if (gradFill.isSetPath()) {
-                    /* TODO: handle rect path */
-                    STPathShadeType.Enum ps = gradFill.getPath().getPath();
-                    if (ps == STPathShadeType.CIRCLE) {
-                        return GradientType.circular;
-                    } else if (ps == STPathShadeType.SHAPE) {
-                        return GradientType.shape;
-                    }
-                }
-                
-                return GradientType.linear;
-            }
-        };        
-    }
-    
-    protected static PaintStyle selectPaint(CTStyleMatrixReference fillRef, final XSLFTheme theme, boolean isLineStyle) {
-        if (fillRef == null) return null;
-        
-        // The idx attribute refers to the index of a fill style or
-        // background fill style within the presentation's style matrix, defined by the fmtScheme element.
-        // value of 0 or 1000 indicates no background,
-        // values 1-999 refer to the index of a fill style within the fillStyleLst element
-        // values 1001 and above refer to the index of a background fill style within the bgFillStyleLst element.
-        int idx = (int)fillRef.getIdx();
-        CTSchemeColor phClr = fillRef.getSchemeClr();
-        CTStyleMatrix matrix = theme.getXmlObject().getThemeElements().getFmtScheme();
-        final XmlObject styleLst;
-        int childIdx;
-        if (idx >= 1 && idx <= 999) {
-            childIdx = idx-1;
-            styleLst = (isLineStyle) ? matrix.getLnStyleLst() : matrix.getFillStyleLst();
-        } else if (idx >= 1001 ){
-            childIdx = idx - 1001;
-            styleLst = matrix.getBgFillStyleLst();
-        } else {
-            return null;
-        }
-        XmlCursor cur = styleLst.newCursor();
-        XSLFFillProperties fp = null;
-        if (cur.toChild(childIdx)) {
-            fp = XSLFPropertiesDelegate.getFillDelegate(cur.getObject());
-        }
-        cur.dispose();
-        
-        return selectPaint(fp, phClr, theme.getPackagePart(), theme);
-    }
-    
-    @Override
-    public void draw(Graphics2D graphics, Rectangle2D bounds) {
-        DrawFactory.getInstance(graphics).drawShape(graphics, this, bounds);
-    }
-    
-    /**
-     * Return the shape specific (visual) properties
-     *
-     * @return the shape specific properties
-     */
-    protected XmlObject getShapeProperties() {
-        return getChild(CTShapeProperties.class, PML_NS, "spPr");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
deleted file mode 100644
index ddf832d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-
-/**
- * Common interface for shape containers, e.g. sheets or groups of shapes
- */
-public interface XSLFShapeContainer
-    extends ShapeContainer<XSLFShape,XSLFTextParagraph> {
-
-    @Override
-    XSLFAutoShape createAutoShape();
-
-    @Override
-    XSLFFreeformShape createFreeform();
-
-    @Override
-    XSLFTextBox createTextBox();
-
-    @Override
-    XSLFConnectorShape createConnector();
-
-    @Override
-    XSLFGroupShape createGroup();
-
-    @Override
-    XSLFPictureShape createPicture(PictureData pictureData);
-
-    /**
-     * Removes all of the elements from this container (optional operation).
-     * The container will be empty after this call returns.
-     */
-    void clear();
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
deleted file mode 100644
index 1edfff7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
+++ /dev/null
@@ -1,618 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.DrawPictureShape;
-import org.apache.poi.sl.draw.Drawable;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.Sheet;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommonSlideData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-
-@Beta
-public abstract class XSLFSheet extends POIXMLDocumentPart
-implements XSLFShapeContainer, Sheet<XSLFShape,XSLFTextParagraph> {
-    private XSLFCommonSlideData _commonSlideData;
-    private XSLFDrawing _drawing;
-    private List<XSLFShape> _shapes;
-    private CTGroupShape _spTree;
-
-    private List<XSLFTextShape>_placeholders;
-    private Map<Integer, XSLFSimpleShape> _placeholderByIdMap;
-    private Map<Integer, XSLFSimpleShape> _placeholderByTypeMap;
-
-    public XSLFSheet() {
-        super();
-    }
-    
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XSLFSheet(PackagePart part) {
-        super(part);
-    }    
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XSLFSheet(PackagePart part, PackageRelationship rel){
-        this(part);
-    }
-
-    /**
-     * @return the XMLSlideShow this sheet belongs to
-     */
-    @Override
-    public XMLSlideShow getSlideShow() {
-        POIXMLDocumentPart p = getParent();
-        while(p != null) {
-            if(p instanceof XMLSlideShow){
-                return (XMLSlideShow)p;
-            }
-            p = p.getParent();
-        }
-        throw new IllegalStateException("SlideShow was not found");
-    }
-
-    protected static List<XSLFShape> buildShapes(CTGroupShape spTree, XSLFSheet sheet){
-        List<XSLFShape> shapes = new ArrayList<XSLFShape>();
-        for(XmlObject ch : spTree.selectPath("*")){
-            if(ch instanceof CTShape){ // simple shape
-                XSLFAutoShape shape = XSLFAutoShape.create((CTShape)ch, sheet);
-                shapes.add(shape);
-            } else if (ch instanceof CTGroupShape){
-                shapes.add(new XSLFGroupShape((CTGroupShape)ch, sheet));
-            } else if (ch instanceof CTConnector){
-                shapes.add(new XSLFConnectorShape((CTConnector)ch, sheet));
-            } else if (ch instanceof CTPicture){
-                shapes.add(new XSLFPictureShape((CTPicture)ch, sheet));
-            } else if (ch instanceof CTGraphicalObjectFrame){
-                XSLFGraphicFrame shape = XSLFGraphicFrame.create((CTGraphicalObjectFrame)ch, sheet);
-                shapes.add(shape);
-            }
-        }
-        return shapes;
-    }
-
-    /**
-     * @return top-level Xml bean representing this sheet
-     */
-    public abstract XmlObject getXmlObject();
-
-    /*
-     * @deprecated POI 3.16 beta 1. use {@link XSLFTable} instead
-     */
-    @Removal(version="3.18")
-    @Internal
-    public XSLFCommonSlideData getCommonSlideData() {
-       return _commonSlideData;
-    }
-
-    /*
-     * @deprecated POI 3.16 beta 1. use {@link XSLFTable} instead
-     */
-    @Removal(version="3.18")
-    protected void setCommonSlideData(CTCommonSlideData data) {
-       if(data == null) {
-          _commonSlideData = null;
-       } else {
-          _commonSlideData = new XSLFCommonSlideData(data);
-       }
-    }
-
-    private XSLFDrawing getDrawing(){
-        initDrawingAndShapes();
-        return _drawing;
-    }
-
-    /**
-     * Returns an array containing all of the shapes in this sheet
-     *
-     * @return an array of all shapes in this sheet
-     */
-    @Override
-    public List<XSLFShape> getShapes(){
-        initDrawingAndShapes();
-        return _shapes;
-    }
-    
-    /**
-     * Helper method for initializing drawing and shapes in one go.
-     * If they are initialized separately, there's a risk that shapes
-     * get added twice, e.g. a shape is added to the drawing, then
-     * buildShapes is called and at last the shape is added to shape list
-     */
-    private void initDrawingAndShapes() {
-        CTGroupShape cgs = getSpTree();
-        if(_drawing == null) {
-            _drawing = new XSLFDrawing(this, cgs);
-        }
-        if (_shapes == null) {
-            _shapes = buildShapes(cgs, this);
-        }
-    }
-
-    // shape factory methods
-
-    @Override
-    public XSLFAutoShape createAutoShape(){
-        XSLFAutoShape sh = getDrawing().createAutoShape();
-        getShapes().add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    @Override
-    public XSLFFreeformShape createFreeform(){
-        XSLFFreeformShape sh = getDrawing().createFreeform();
-        getShapes().add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    @Override
-    public XSLFTextBox createTextBox(){
-        XSLFTextBox sh = getDrawing().createTextBox();
-        getShapes().add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    @Override
-    public XSLFConnectorShape createConnector(){
-        XSLFConnectorShape sh = getDrawing().createConnector();
-        getShapes().add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    @Override
-    public XSLFGroupShape createGroup(){
-        XSLFGroupShape sh = getDrawing().createGroup();
-        getShapes().add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    @Override
-    public XSLFPictureShape createPicture(PictureData pictureData){
-        if (!(pictureData instanceof XSLFPictureData)) {
-            throw new IllegalArgumentException("pictureData needs to be of type XSLFPictureData");
-        }
-        XSLFPictureData xPictureData = (XSLFPictureData)pictureData;
-        PackagePart pic = xPictureData.getPackagePart();
-
-        RelationPart rp = addRelation(null, XSLFRelation.IMAGES, new XSLFPictureData(pic));
-
-        XSLFPictureShape sh = getDrawing().createPicture(rp.getRelationship().getId());
-        new DrawPictureShape(sh).resize();
-        getShapes().add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    public XSLFTable createTable(){
-        XSLFTable sh = getDrawing().createTable();
-        getShapes().add(sh);
-        sh.setParent(this);
-        return sh;
-    }
-
-    @Override
-    public XSLFTable createTable(int numRows, int numCols){
-        if (numRows < 1 || numCols < 1) {
-            throw new IllegalArgumentException("numRows and numCols must be greater than 0");
-        }
-        XSLFTable sh = getDrawing().createTable();
-        getShapes().add(sh);
-        sh.setParent(this);
-        for (int r=0; r<numRows; r++) {
-            XSLFTableRow row = sh.addRow();
-            for (int c=0; c<numCols; c++) {
-                row.addCell();
-            }
-        }
-        return sh;
-    }
-
-    
-    /**
-     * Returns an iterator over the shapes in this sheet
-     *
-     * @return an iterator over the shapes in this sheet
-     */
-    public Iterator<XSLFShape> iterator(){
-        return getShapes().iterator();
-    }
-
-    public void addShape(XSLFShape shape) {
-        throw new UnsupportedOperationException(
-            "Adding a shape from a different container is not supported -"
-            + " create it from scratch witht XSLFSheet.create* methods");
-    }
-    
-    /**
-     * Removes the specified shape from this sheet, if it is present
-     * (optional operation).  If this sheet does not contain the element,
-     * it is unchanged.
-     *
-     * @param xShape shape to be removed from this sheet, if present
-     * @return <tt>true</tt> if this sheet contained the specified element
-     * @throws IllegalArgumentException if the type of the specified shape
-     *         is incompatible with this sheet (optional)
-     */
-    public boolean removeShape(XSLFShape xShape) {
-        XmlObject obj = xShape.getXmlObject();
-        CTGroupShape spTree = getSpTree();
-        if(obj instanceof CTShape){
-            spTree.getSpList().remove(obj);
-        } else if (obj instanceof CTGroupShape) {
-            spTree.getGrpSpList().remove(obj);
-        } else if (obj instanceof CTConnector) {
-            spTree.getCxnSpList().remove(obj);
-        } else if (obj instanceof CTGraphicalObjectFrame) {
-            spTree.getGraphicFrameList().remove(obj);
-        } else if (obj instanceof CTPicture) {
-            XSLFPictureShape ps = (XSLFPictureShape)xShape;
-            removePictureRelation(ps);
-            spTree.getPicList().remove(obj);
-        } else {
-            throw new IllegalArgumentException("Unsupported shape: " + xShape);
-        }
-        return getShapes().remove(xShape);
-    }
-
-    /**
-     * Removes all of the elements from this container (optional operation).
-     * The container will be empty after this call returns.
-     */
-    public void clear() {
-        List<XSLFShape> shapes = new ArrayList<XSLFShape>(getShapes());
-        for(XSLFShape shape : shapes){
-            removeShape(shape);
-        }
-    }
-
-    protected abstract String getRootElementName();
-
-    protected CTGroupShape getSpTree(){
-        if(_spTree == null) {
-            XmlObject root = getXmlObject();
-            XmlObject[] sp = root.selectPath(
-                    "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:spTree");
-            if(sp.length == 0) throw new IllegalStateException("CTGroupShape was not found");
-            _spTree = (CTGroupShape)sp[0];
-        }
-        return _spTree;
-    }
-
-    protected final void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        String docName = getRootElementName();
-        if(docName != null) {
-            xmlOptions.setSaveSyntheticDocumentElement(
-                    new QName("http://schemas.openxmlformats.org/presentationml/2006/main", docName));
-        }
-
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        getXmlObject().save(out, xmlOptions);
-        out.close();
-    }
-
-    /**
-     * Set the contents of this sheet to be a copy of the source sheet.
-     * This method erases any existing shapes and replaces them with
-     * object from the source sheet.
-     *
-     * @param src the source sheet to copy data from
-     * @return modified 'this'
-     */
-    public XSLFSheet importContent(XSLFSheet src){
-        _shapes = null;
-        _spTree = null;
-        _drawing = null;
-        _spTree = null;
-        _placeholders = null;
-
-        // fix-me: wth would this ever happen to work ...
-        
-        
-        // first copy the source xml
-        getSpTree().set(src.getSpTree());
-
-        // recursively update each shape
-        List<XSLFShape> tgtShapes = getShapes();
-        List<XSLFShape> srcShapes = src.getShapes();
-        for(int i = 0; i < tgtShapes.size(); i++){
-            XSLFShape s1 = srcShapes.get(i);
-            XSLFShape s2 = tgtShapes.get(i);
-
-            s2.copy(s1);
-        }
-        return this;
-    }
-
-    /**
-     * Append content to this sheet.
-     *
-     * @param src the source sheet
-     * @return modified <code>this</code>.
-     */
-    public XSLFSheet appendContent(XSLFSheet src){
-        CTGroupShape spTree = getSpTree();
-        int numShapes = getShapes().size();
-
-        CTGroupShape srcTree = src.getSpTree();
-        for(XmlObject ch : srcTree.selectPath("*")){
-            if(ch instanceof CTShape){ // simple shape
-                spTree.addNewSp().set(ch);
-            } else if (ch instanceof CTGroupShape){
-                spTree.addNewGrpSp().set(ch);
-            } else if (ch instanceof CTConnector){
-                spTree.addNewCxnSp().set(ch);
-            } else if (ch instanceof CTPicture){
-                spTree.addNewPic().set(ch);
-            } else if (ch instanceof CTGraphicalObjectFrame){
-                spTree.addNewGraphicFrame().set(ch);
-            }
-        }
-
-        _shapes = null;
-        _spTree = null;
-        _drawing = null;
-        _spTree = null;
-        _placeholders = null;
-
-        // recursively update each shape
-        List<XSLFShape> tgtShapes = getShapes();
-        List<XSLFShape> srcShapes = src.getShapes();
-        for(int i = 0; i < srcShapes.size(); i++){
-            XSLFShape s1 = srcShapes.get(i);
-            XSLFShape s2 = tgtShapes.get(numShapes + i);
-
-            s2.copy(s1);
-        }
-        return this;
-    }
-
-   /**
-     * @return theme (shared styles) associated with this theme.
-     *  By default returns <code>null</code> which means that this sheet is theme-less.
-     *  Sheets that support the notion of themes (slides, masters, layouts, etc.) should override this
-     *  method and return the corresponding package part.
-     */
-    XSLFTheme getTheme(){
-    	return null;
-    }
-
-    protected XSLFTextShape getTextShapeByType(Placeholder type){
-        for(XSLFShape shape : this.getShapes()){
-            if(shape instanceof XSLFTextShape) {
-               XSLFTextShape txt = (XSLFTextShape)shape;
-                if(txt.getTextType() == type) {
-                    return txt;
-                }
-            }
-        }
-        return null;
-    }
-
-    XSLFSimpleShape getPlaceholder(CTPlaceholder ph) {
-        XSLFSimpleShape shape = null;
-        if(ph.isSetIdx()) shape = getPlaceholderById((int)ph.getIdx());
-
-        if (shape == null && ph.isSetType()) {
-            shape = getPlaceholderByType(ph.getType().intValue());
-        }
-        return shape;
-    }
-
-    void initPlaceholders() {
-        if(_placeholders == null) {
-            _placeholders = new ArrayList<XSLFTextShape>();
-            _placeholderByIdMap = new HashMap<Integer, XSLFSimpleShape>();
-            _placeholderByTypeMap = new HashMap<Integer, XSLFSimpleShape>();
-
-            for(XSLFShape sh : getShapes()){
-                if(sh instanceof XSLFTextShape){
-                    XSLFTextShape sShape = (XSLFTextShape)sh;
-                    CTPlaceholder ph = sShape.getCTPlaceholder();
-                    if(ph != null) {
-                        _placeholders.add(sShape);
-                        if(ph.isSetIdx()) {
-                            int idx = (int)ph.getIdx();
-                            _placeholderByIdMap.put(idx, sShape);
-                        }
-                        if(ph.isSetType()){
-                            _placeholderByTypeMap.put(ph.getType().intValue(), sShape);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    XSLFSimpleShape getPlaceholderById(int id) {
-        initPlaceholders();
-        return _placeholderByIdMap.get(id);
-    }
-
-    XSLFSimpleShape getPlaceholderByType(int ordinal) {
-        initPlaceholders();
-        return _placeholderByTypeMap.get(ordinal);
-    }
-
-    /**
-     *
-     * @param idx 0-based index of a placeholder in the sheet
-     * @return placeholder
-     */
-    public XSLFTextShape getPlaceholder(int idx) {
-        initPlaceholders();
-        return _placeholders.get(idx);
-    }
-
-    /**
-     *
-     * @return all placeholder shapes in this sheet
-     */
-    public XSLFTextShape[] getPlaceholders() {
-        initPlaceholders();
-        return _placeholders.toArray(new XSLFTextShape[_placeholders.size()]);
-    }
-
-    /**
-     * Checks if this <code>sheet</code> displays the specified shape.
-     *
-     * Subclasses can override it and skip certain shapes from drawings,
-     * for instance, slide masters and layouts don't display placeholders
-     */
-    protected boolean canDraw(XSLFShape shape){
-        return true;
-    }
-
-    /**
-     *
-     * @return whether shapes on the master sheet should be shown. By default master graphics is turned off.
-     * Sheets that support the notion of master (slide, slideLayout) should override it and
-     * check this setting in the sheet XML
-     */
-    public boolean getFollowMasterGraphics(){
-        return false;
-    }
-
-    /**
-     * @return  background for this sheet
-     */
-    @Override
-    public XSLFBackground getBackground() {
-        return null;
-    }
-
-    /**
-     * Render this sheet into the supplied graphics object
-     *
-     * @param graphics
-     */
-    @Override
-    public void draw(Graphics2D graphics){
-        DrawFactory drawFact = DrawFactory.getInstance(graphics);
-        Drawable draw = drawFact.getDrawable(this);
-        draw.draw(graphics);
-    }
-
-    /**
-     * Import a picture data from another document.
-     *
-     * @param blipId        ID of the package relationship to retrieve.
-     * @param packagePart   package part containing the data to import
-     * @return ID of the created relationship
-     */
-    String importBlip(String blipId, PackagePart packagePart) {
-        PackageRelationship blipRel = packagePart.getRelationship(blipId);
-        PackagePart blipPart;
-        try {
-            blipPart = packagePart.getRelatedPart(blipRel);
-        } catch (InvalidFormatException e){
-            throw new POIXMLException(e);
-        }
-        XSLFPictureData data = new XSLFPictureData(blipPart);
-
-        XMLSlideShow ppt = getSlideShow();
-        XSLFPictureData pictureData = ppt.addPicture(data.getData(), data.getType());
-        PackagePart pic = pictureData.getPackagePart();
-
-        RelationPart rp = addRelation(blipId, XSLFRelation.IMAGES, new XSLFPictureData(pic));
-        
-        return rp.getRelationship().getId();
-    }
-
-    /**
-     * Import a package part into this sheet.
-     */
-    PackagePart importPart(PackageRelationship srcRel, PackagePart srcPafrt) {
-        PackagePart destPP = getPackagePart();
-        PackagePartName srcPPName = srcPafrt.getPartName();
-        
-        OPCPackage pkg = destPP.getPackage();
-        if(pkg.containPart(srcPPName)){
-            // already exists
-            return pkg.getPart(srcPPName);
-        }            
-            
-        destPP.addRelationship(srcPPName, TargetMode.INTERNAL, srcRel.getRelationshipType());
-
-        PackagePart part = pkg.createPart(srcPPName, srcPafrt.getContentType());
-        try {
-            OutputStream out = part.getOutputStream();
-            InputStream is = srcPafrt.getInputStream();
-            IOUtils.copy(is, out);
-            is.close();
-            out.close();
-        } catch (IOException e){
-            throw new POIXMLException(e);
-        }
-        return part;
-    }
-    
-    /**
-     * Helper method for sheet and group shapes
-     *
-     * @param pictureShape the picture shapes whose relation is to be removed
-     */
-    void removePictureRelation(XSLFPictureShape pictureShape) {
-        POIXMLDocumentPart pd = getRelationById(pictureShape.getBlipId());
-        removeRelation(pd);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
deleted file mode 100644
index ce058f1..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
+++ /dev/null
@@ -1,1090 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.draw.geom.CustomGeometry;
-import org.apache.poi.sl.draw.geom.Guide;
-import org.apache.poi.sl.draw.geom.PresetGeometries;
-import org.apache.poi.sl.usermodel.FillStyle;
-import org.apache.poi.sl.usermodel.LineDecoration;
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape;
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.SimpleShape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCap;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-import org.apache.poi.xslf.model.PropertyFetcher;
-import org.apache.poi.xslf.usermodel.XSLFPropertiesDelegate.XSLFEffectProperties;
-import org.apache.poi.xslf.usermodel.XSLFPropertiesDelegate.XSLFFillProperties;
-import org.apache.poi.xslf.usermodel.XSLFPropertiesDelegate.XSLFGeometryProperties;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBaseStyles;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectStyleItem;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGeomGuide;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTLineEndProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTLineProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTLineStyleList;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOuterShadowEffect;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetLineDashProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTStyleMatrix;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTStyleMatrixReference;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.STCompoundLine;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineCap;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndLength;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndWidth;
-import org.openxmlformats.schemas.drawingml.x2006.main.STPresetLineDashVal;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-
-/**
- * Represents a single (non-group) shape in a .pptx slide show
- */
-@Beta
-public abstract class XSLFSimpleShape extends XSLFShape
-    implements SimpleShape<XSLFShape,XSLFTextParagraph> {
-    private static CTOuterShadowEffect NO_SHADOW = CTOuterShadowEffect.Factory.newInstance();
-    private static final POILogger LOG = POILogFactory.getLogger(XSLFSimpleShape.class);
-
-    /* package */XSLFSimpleShape(XmlObject shape, XSLFSheet sheet) {
-        super(shape,sheet);
-    }
-
-    @Override
-    public void setShapeType(ShapeType type) {
-        XSLFGeometryProperties gp = XSLFPropertiesDelegate.getGeometryDelegate(getShapeProperties());
-        if (gp == null) {
-            return;
-        }
-        if (gp.isSetCustGeom()) {
-            gp.unsetCustGeom();
-        }
-        CTPresetGeometry2D prst = (gp.isSetPrstGeom()) ? gp.getPrstGeom() : gp.addNewPrstGeom();
-        prst.setPrst(STShapeType.Enum.forInt(type.ooxmlId));
-    }
-
-    @Override
-    public ShapeType getShapeType(){
-        XSLFGeometryProperties gp = XSLFPropertiesDelegate.getGeometryDelegate(getShapeProperties());
-        if (gp != null && gp.isSetPrstGeom()) {
-            STShapeType.Enum geom = gp.getPrstGeom().getPrst();
-            if (geom != null) {
-                return ShapeType.forId(geom.intValue(), true);
-            }
-        }
-        return null;
-    }
-
-    protected CTTransform2D getXfrm(boolean create) {
-        PropertyFetcher<CTTransform2D> fetcher = new PropertyFetcher<CTTransform2D>() {
-            public boolean fetch(XSLFShape shape) {
-                XmlObject xo = shape.getShapeProperties();
-                if (xo instanceof CTShapeProperties && ((CTShapeProperties)xo).isSetXfrm()) {
-                    setValue(((CTShapeProperties)xo).getXfrm());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        
-        CTTransform2D xfrm = fetcher.getValue();
-        if (!create || xfrm != null) {
-            return xfrm;
-        } else {
-            XmlObject xo = getShapeProperties();
-            if (xo instanceof CTShapeProperties) {
-                return ((CTShapeProperties)xo).addNewXfrm();
-            } else {
-                // ... group shapes have their own getXfrm()
-                LOG.log(POILogger.WARN, getClass().toString()+" doesn't have xfrm element.");
-                return null;
-            }
-        }
-    }
-
-    @Override
-    public Rectangle2D getAnchor() {
-
-        CTTransform2D xfrm = getXfrm(false);
-        if (xfrm == null) {
-            return null;
-        }
-
-        CTPoint2D off = xfrm.getOff();
-        double x = Units.toPoints(off.getX());
-        double y = Units.toPoints(off.getY());
-        CTPositiveSize2D ext = xfrm.getExt();
-        double cx = Units.toPoints(ext.getCx());
-        double cy = Units.toPoints(ext.getCy());
-        return new Rectangle2D.Double(x, y, cx, cy);
-    }
-
-    @Override
-    public void setAnchor(Rectangle2D anchor) {
-        CTTransform2D xfrm = getXfrm(true);
-        if (xfrm == null) {
-            return;
-        }
-        CTPoint2D off = xfrm.isSetOff() ? xfrm.getOff() : xfrm.addNewOff();
-        long x = Units.toEMU(anchor.getX());
-        long y = Units.toEMU(anchor.getY());
-        off.setX(x);
-        off.setY(y);
-        CTPositiveSize2D ext = xfrm.isSetExt() ? xfrm.getExt() : xfrm
-                .addNewExt();
-        long cx = Units.toEMU(anchor.getWidth());
-        long cy = Units.toEMU(anchor.getHeight());
-        ext.setCx(cx);
-        ext.setCy(cy);
-    }
-
-    @Override
-    public void setRotation(double theta) {
-        CTTransform2D xfrm = getXfrm(true);
-        if (xfrm != null) {
-            xfrm.setRot((int) (theta * 60000));
-        }
-    }
-
-    @Override
-    public double getRotation() {
-        CTTransform2D xfrm = getXfrm(false);
-        return (xfrm == null || !xfrm.isSetRot()) ? 0 : (xfrm.getRot() / 60000.d);
-    }
-
-    @Override
-    public void setFlipHorizontal(boolean flip) {
-        CTTransform2D xfrm = getXfrm(true);
-        if (xfrm != null) {
-            xfrm.setFlipH(flip);
-        }
-    }
-
-    @Override
-    public void setFlipVertical(boolean flip) {
-        CTTransform2D xfrm = getXfrm(true);
-        if (xfrm != null) {
-            xfrm.setFlipV(flip);
-        }
-    }
-
-    @Override
-    public boolean getFlipHorizontal() {
-        CTTransform2D xfrm = getXfrm(false);
-        return (xfrm == null || !xfrm.isSetFlipH()) ? false : xfrm.getFlipH();
-    }
-
-    @Override
-    public boolean getFlipVertical() {
-        CTTransform2D xfrm = getXfrm(false);
-        return (xfrm == null || !xfrm.isSetFlipV()) ? false : xfrm.getFlipV();
-    }
-
-
-    /**
-     * Get default line properties defined in the theme (if any).
-     * Used internally to resolve shape properties.
-     *
-     * @return line properties from the theme of null
-     */
-    CTLineProperties getDefaultLineProperties() {
-        CTShapeStyle style = getSpStyle();
-        if (style == null) return null;
-        CTStyleMatrixReference lnRef = style.getLnRef();
-        if (lnRef == null) return null;
-        // 1-based index of a line style within the style matrix
-        int idx = (int)lnRef.getIdx();
-
-        XSLFTheme theme = getSheet().getTheme();
-        if (theme == null) return null;
-        CTBaseStyles styles = theme.getXmlObject().getThemeElements();
-        if (styles == null) return null;
-        CTStyleMatrix styleMatrix = styles.getFmtScheme();
-        if (styleMatrix == null) return null;
-        CTLineStyleList lineStyles = styleMatrix.getLnStyleLst();
-        if (lineStyles == null || lineStyles.sizeOfLnArray() < idx) return null;
-
-        return lineStyles.getLnArray(idx - 1);
-    }
-
-    /**
-    * @param color  the color to paint the shape outline.
-     * A <code>null</code> value turns off the shape outline.
-     */
-    public void setLineColor(Color color) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-
-        if (ln.isSetSolidFill()) {
-            ln.unsetSolidFill();
-        }
-        if (ln.isSetGradFill()) {
-            ln.unsetGradFill();
-        }
-        if (ln.isSetPattFill()) {
-            ln.unsetPattFill();
-        }
-        if (ln.isSetNoFill()) {
-            ln.unsetNoFill();
-        }
-
-        
-        if (color == null) {
-            ln.addNewNoFill();
-        } else {
-            CTSolidColorFillProperties fill = ln.addNewSolidFill();
-            XSLFColor col = new XSLFColor(fill, getSheet().getTheme(), fill.getSchemeClr());
-            col.setColor(color);
-        }
-    }
-
-    /**
-     *
-     * @return the color of the shape outline or <code>null</code>
-     * if outline is turned off
-     */
-    public Color getLineColor() {
-        PaintStyle ps = getLinePaint();
-        if (ps instanceof SolidPaint) {
-            return ((SolidPaint)ps).getSolidColor().getColor();
-        }
-        return null;
-    }
-
-    protected PaintStyle getLinePaint() {
-        XSLFSheet sheet = getSheet();
-        final XSLFTheme theme = sheet.getTheme();
-        PropertyFetcher<PaintStyle> fetcher = new PropertyFetcher<PaintStyle>() {
-            public boolean fetch(XSLFShape shape) {
-                CTLineProperties spPr = getLn(shape, false);
-                XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(spPr);
-                PackagePart pp = shape.getSheet().getPackagePart();
-                PaintStyle paint = selectPaint(fp, null, pp, theme);
-                if (paint != null) {
-                    setValue(paint);
-                    return true;
-                }
-
-                CTShapeStyle style = shape.getSpStyle();
-                if (style != null) {
-                    fp = XSLFPropertiesDelegate.getFillDelegate(style.getLnRef());
-                    paint = selectPaint(fp, null, pp, theme);
-                }
-                if (paint != null) {
-                    setValue(paint);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-
-        PaintStyle paint = fetcher.getValue();
-        if (paint != null) return paint;
-
-        // line color was not found, check if it is defined in the theme
-        CTShapeStyle style = getSpStyle();
-        if (style == null) return null;
-
-        // get a reference to a line style within the style matrix.
-        CTStyleMatrixReference lnRef = style.getLnRef();
-        int idx = (int)lnRef.getIdx();
-        CTSchemeColor phClr = lnRef.getSchemeClr();
-        if(idx > 0){
-            CTLineProperties props = theme.getXmlObject().getThemeElements().getFmtScheme().getLnStyleLst().getLnArray(idx - 1);
-            XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(props);
-            PackagePart pp = sheet.getPackagePart();
-            paint = selectPaint(fp, phClr, pp, theme);
-        }
-
-        return paint;
-    }
-
-    /**
-     *
-     * @param width line width in points. <code>0</code> means no line
-     */
-    public void setLineWidth(double width) {
-        CTLineProperties lnPr = getLn(this, true);
-        if (lnPr == null) {
-            return;
-        }
-        
-        if (width == 0.) {
-            if (lnPr.isSetW()) {
-                lnPr.unsetW();
-            }
-            if (!lnPr.isSetNoFill()) {
-                lnPr.addNewNoFill();
-            }
-            if (lnPr.isSetSolidFill()) {
-                lnPr.unsetSolidFill();
-            }
-            if (lnPr.isSetGradFill()) {
-                lnPr.unsetGradFill();
-            }
-            if (lnPr.isSetPattFill()) {
-                lnPr.unsetPattFill();
-            }
-        } else {
-            if (lnPr.isSetNoFill()) {
-                lnPr.unsetNoFill();
-            }
-
-            lnPr.setW(Units.toEMU(width));
-        }
-    }
-
-    /**
-     * @return line width in points. <code>0</code> means no line.
-     */
-    public double getLineWidth() {
-        PropertyFetcher<Double> fetcher = new PropertyFetcher<Double>() {
-            public boolean fetch(XSLFShape shape) {
-                CTLineProperties ln = getLn(shape, false);
-                if (ln != null) {
-                    if (ln.isSetNoFill()) {
-                        setValue(0.);
-                        return true;
-                    }
-
-                    if (ln.isSetW()) {
-                        setValue(Units.toPoints(ln.getW()));
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-
-        double lineWidth = 0;
-        if (fetcher.getValue() == null) {
-            CTLineProperties defaultLn = getDefaultLineProperties();
-            if (defaultLn != null) {
-                if (defaultLn.isSetW()) lineWidth = Units.toPoints(defaultLn.getW());
-            }
-        } else {
-            lineWidth = fetcher.getValue();
-        }
-
-        return lineWidth;
-    }
-
-
-    /**
-     * @param compound set the line compound style
-     */
-    public void setLineCompound(LineCompound compound) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        if (compound == null) {
-            if (ln.isSetCmpd()) {
-                ln.unsetCmpd();
-            }
-        } else {
-            STCompoundLine.Enum xCmpd;
-            switch (compound) {
-                default:
-                case SINGLE:
-                    xCmpd = STCompoundLine.SNG;
-                    break;
-                case DOUBLE:
-                    xCmpd = STCompoundLine.DBL;
-                    break;
-                case THICK_THIN:
-                    xCmpd = STCompoundLine.THICK_THIN;
-                    break;
-                case THIN_THICK:
-                    xCmpd = STCompoundLine.THIN_THICK;
-                    break;
-                case TRIPLE:
-                    xCmpd = STCompoundLine.TRI;
-                    break;
-            }
-            ln.setCmpd(xCmpd);
-        }
-    }
-
-    /**
-     * @return the line compound
-     */
-    public LineCompound getLineCompound() {
-        PropertyFetcher<Integer> fetcher = new PropertyFetcher<Integer>() {
-            public boolean fetch(XSLFShape shape) {
-                CTLineProperties ln = getLn(shape, false);
-                if (ln != null) {
-                    STCompoundLine.Enum stCmpd = ln.getCmpd();
-                    if (stCmpd != null) {
-                        setValue(stCmpd.intValue());
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-
-        Integer cmpd = fetcher.getValue();
-        if (cmpd == null) {
-            CTLineProperties defaultLn = getDefaultLineProperties();
-            if (defaultLn != null && defaultLn.isSetCmpd()) {
-                switch (defaultLn.getCmpd().intValue()) {
-                default:
-                case STCompoundLine.INT_SNG:
-                    return LineCompound.SINGLE;
-                case STCompoundLine.INT_DBL:
-                    return LineCompound.DOUBLE;
-                case STCompoundLine.INT_THICK_THIN:
-                    return LineCompound.THICK_THIN;
-                case STCompoundLine.INT_THIN_THICK:
-                    return LineCompound.THIN_THICK;
-                case STCompoundLine.INT_TRI:
-                    return LineCompound.TRIPLE;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     *
-     * @param dash a preset line dashing scheme to stroke thr shape outline
-     */
-    public void setLineDash(LineDash dash) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        if (dash == null) {
-            if (ln.isSetPrstDash()) {
-                ln.unsetPrstDash();
-            }
-        } else {
-            CTPresetLineDashProperties ldp = ln.isSetPrstDash() ? ln.getPrstDash() : ln.addNewPrstDash();
-            ldp.setVal(STPresetLineDashVal.Enum.forInt(dash.ooxmlId));
-        }
-    }
-
-    /**
-     * @return  a preset line dashing scheme to stroke the shape outline
-     */
-    public LineDash getLineDash() {
-
-        PropertyFetcher<LineDash> fetcher = new PropertyFetcher<LineDash>() {
-            public boolean fetch(XSLFShape shape) {
-                CTLineProperties ln = getLn(shape, false);
-                if (ln == null || !ln.isSetPrstDash()) {
-                    return false;
-                }
-
-                setValue(LineDash.fromOoxmlId(ln.getPrstDash().getVal().intValue()));
-                return true;
-            }
-        };
-        fetchShapeProperty(fetcher);
-
-        LineDash dash = fetcher.getValue();
-        if (dash == null) {
-            CTLineProperties defaultLn = getDefaultLineProperties();
-            if (defaultLn != null && defaultLn.isSetPrstDash()) {
-                dash = LineDash.fromOoxmlId(defaultLn.getPrstDash().getVal().intValue());
-            }
-        }
-        return dash;
-    }
-
-    /**
-     *
-     * @param cap the line end cap style
-     */
-    public void setLineCap(LineCap cap) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        
-        if (cap == null) {
-            if (ln.isSetCap()) {
-                ln.unsetCap();
-            }
-        } else {
-            ln.setCap(STLineCap.Enum.forInt(cap.ooxmlId));
-        }
-    }
-
-    /**
-     *
-     * @return the line end cap style
-     */
-    public LineCap getLineCap() {
-        PropertyFetcher<LineCap> fetcher = new PropertyFetcher<LineCap>() {
-            public boolean fetch(XSLFShape shape) {
-                CTLineProperties ln = getLn(shape, false);
-                if (ln != null && ln.isSetCap()) {
-                    setValue(LineCap.fromOoxmlId(ln.getCap().intValue()));
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-
-        LineCap cap = fetcher.getValue();
-        if (cap == null) {
-            CTLineProperties defaultLn = getDefaultLineProperties();
-            if (defaultLn != null && defaultLn.isSetCap()) {
-                cap = LineCap.fromOoxmlId(defaultLn.getCap().intValue());
-            }
-        }
-        return cap;
-    }
-
-    @Override
-    public void setFillColor(Color color) {
-        XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(getShapeProperties());
-        if (fp == null) {
-            return;
-        }
-        if (color == null) {
-            if (fp.isSetSolidFill()) {
-                fp.unsetSolidFill();
-            }
-            
-            if (fp.isSetGradFill()) {
-                fp.unsetGradFill();
-            }
-
-            if (fp.isSetPattFill()) {
-                fp.unsetGradFill();
-            }
-            
-            if (fp.isSetBlipFill()) {
-                fp.unsetBlipFill();
-            }
-            
-            if (!fp.isSetNoFill()) {
-                fp.addNewNoFill();
-            }
-        } else {
-            if (fp.isSetNoFill()) {
-                fp.unsetNoFill();
-            }
-
-            CTSolidColorFillProperties fill = fp.isSetSolidFill() ? fp.getSolidFill() : fp.addNewSolidFill();
-                    
-            XSLFColor col = new XSLFColor(fill, getSheet().getTheme(), fill.getSchemeClr());
-            col.setColor(color);
-        }
-    }
-
-    @Override
-    public Color getFillColor() {
-        PaintStyle ps = getFillPaint();
-        if (ps instanceof SolidPaint) {
-            return DrawPaint.applyColorTransform(((SolidPaint)ps).getSolidColor());
-        }
-        return null;
-    }
-
-    /**
-     * @return shadow of this shape or null if shadow is disabled
-     */
-    public XSLFShadow getShadow() {
-        PropertyFetcher<CTOuterShadowEffect> fetcher = new PropertyFetcher<CTOuterShadowEffect>() {
-            public boolean fetch(XSLFShape shape) {
-                XSLFEffectProperties ep = XSLFPropertiesDelegate.getEffectDelegate(shape.getShapeProperties());
-                if (ep != null && ep.isSetEffectLst()) {
-                    CTOuterShadowEffect obj = ep.getEffectLst().getOuterShdw();
-                    setValue(obj == null ? NO_SHADOW : obj);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-
-        CTOuterShadowEffect obj = fetcher.getValue();
-        if (obj == null) {
-            // fill color was not found, check if it is defined in the theme
-            CTShapeStyle style = getSpStyle();
-            if (style != null && style.getEffectRef() != null) {
-                // 1-based index of a shadow style within the style matrix
-                int idx = (int) style.getEffectRef().getIdx();
-                if(idx != 0) {
-                    CTStyleMatrix styleMatrix = getSheet().getTheme().getXmlObject().getThemeElements().getFmtScheme();
-                    CTEffectStyleItem ef = styleMatrix.getEffectStyleLst().getEffectStyleArray(idx - 1);
-                    obj = ef.getEffectLst().getOuterShdw();
-                }
-            }
-        }
-        return (obj == null || obj == NO_SHADOW) ? null : new XSLFShadow(obj, this);
-    }
-
-    /**
-     *
-     * @return definition of the shape geometry
-     */
-    public CustomGeometry getGeometry() {
-        XSLFGeometryProperties gp = XSLFPropertiesDelegate.getGeometryDelegate(getShapeProperties());
-        
-        if (gp == null) {
-            return null;
-        }
-        
-        CustomGeometry geom;
-        PresetGeometries dict = PresetGeometries.getInstance();
-        if(gp.isSetPrstGeom()){
-            String name = gp.getPrstGeom().getPrst().toString();
-            geom = dict.get(name);
-            if(geom == null) {
-                throw new IllegalStateException("Unknown shape geometry: " + name + ", available geometries are: " + dict.keySet());
-            }
-        } else if (gp.isSetCustGeom()){
-            XMLStreamReader staxReader = gp.getCustGeom().newXMLStreamReader();
-            geom = PresetGeometries.convertCustomGeometry(staxReader);
-            try {
-                staxReader.close();
-            }
-            catch (XMLStreamException e) {
-                LOG.log(POILogger.WARN,
-                        "An error occurred while closing a Custom Geometry XML Stream Reader: " + e.getMessage());
-            }
-        } else {
-            geom = dict.get("rect");
-        }
-        return geom;
-    }
-
-    @Override
-    void copy(XSLFShape sh){
-        super.copy(sh);
-
-        XSLFSimpleShape s = (XSLFSimpleShape)sh;
-
-        Color srsSolidFill = s.getFillColor();
-        Color tgtSoliFill = getFillColor();
-        if(srsSolidFill != null && !srsSolidFill.equals(tgtSoliFill)){
-            setFillColor(srsSolidFill);
-        }
-
-        XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(getShapeProperties());
-        if(fp != null && fp.isSetBlipFill()){
-            CTBlip blip = fp.getBlipFill().getBlip();
-            String blipId = blip.getEmbed();
-
-            String relId = getSheet().importBlip(blipId, s.getSheet().getPackagePart());
-            blip.setEmbed(relId);
-        }
-
-        Color srcLineColor = s.getLineColor();
-        Color tgtLineColor = getLineColor();
-        if(srcLineColor != null && !srcLineColor.equals(tgtLineColor)) {
-            setLineColor(srcLineColor);
-        }
-
-        double srcLineWidth = s.getLineWidth();
-        double tgtLineWidth = getLineWidth();
-        if(srcLineWidth != tgtLineWidth) {
-            setLineWidth(srcLineWidth);
-        }
-
-        LineDash srcLineDash = s.getLineDash();
-        LineDash tgtLineDash = getLineDash();
-        if(srcLineDash != null && srcLineDash != tgtLineDash) {
-            setLineDash(srcLineDash);
-        }
-
-        LineCap srcLineCap = s.getLineCap();
-        LineCap tgtLineCap = getLineCap();
-        if(srcLineCap != null && srcLineCap != tgtLineCap) {
-            setLineCap(srcLineCap);
-        }
-
-    }
-
-    /**
-     * Specifies the line end decoration, such as a triangle or arrowhead.
-     * 
-     * @param style the line end docoration style
-     */
-    public void setLineHeadDecoration(DecorationShape style) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        CTLineEndProperties lnEnd = ln.isSetHeadEnd() ? ln.getHeadEnd() : ln.addNewHeadEnd();
-        if (style == null) {
-            if (lnEnd.isSetType()) {
-                lnEnd.unsetType();
-            }
-        } else {
-            lnEnd.setType(STLineEndType.Enum.forInt(style.ooxmlId));
-        }
-    }
-
-    /**
-     * @return the line end decoration shape
-     */
-    public DecorationShape getLineHeadDecoration() {
-        CTLineProperties ln = getLn(this, false);
-        DecorationShape ds = DecorationShape.NONE;
-        if (ln != null && ln.isSetHeadEnd() && ln.getHeadEnd().isSetType()) {
-            ds = DecorationShape.fromOoxmlId(ln.getHeadEnd().getType().intValue());
-        }
-        return ds;
-    }
-
-    /**
-     * specifies decoration width of the head of a line.
-     * 
-     * @param style the decoration width 
-     */
-    public void setLineHeadWidth(DecorationSize style) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        CTLineEndProperties lnEnd = ln.isSetHeadEnd() ? ln.getHeadEnd() : ln.addNewHeadEnd();
-        if (style == null) {
-            if (lnEnd.isSetW()) {
-                lnEnd.unsetW();
-            }
-        } else {
-            lnEnd.setW(STLineEndWidth.Enum.forInt(style.ooxmlId));
-        }
-    }
-
-    /**
-     * @return the line end decoration width
-     */
-    public DecorationSize getLineHeadWidth() {
-        CTLineProperties ln = getLn(this, false);
-        DecorationSize ds = DecorationSize.MEDIUM;
-        if (ln != null && ln.isSetHeadEnd() && ln.getHeadEnd().isSetW()) {
-            ds = DecorationSize.fromOoxmlId(ln.getHeadEnd().getW().intValue());
-        }
-        return ds;
-    }
-
-    /**
-     * Specifies the line end width in relation to the line width.
-     */
-    public void setLineHeadLength(DecorationSize style) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        
-        CTLineEndProperties lnEnd = ln.isSetHeadEnd() ? ln.getHeadEnd() : ln.addNewHeadEnd();
-        if (style == null) {
-            if (lnEnd.isSetLen()) {
-                lnEnd.unsetLen();
-            }
-        } else {
-            lnEnd.setLen(STLineEndLength.Enum.forInt(style.ooxmlId));
-        }
-    }
-
-    /**
-     * @return the line end decoration length
-     */
-    public DecorationSize getLineHeadLength() {
-        CTLineProperties ln = getLn(this, false);
-        
-        DecorationSize ds = DecorationSize.MEDIUM;
-        if (ln != null && ln.isSetHeadEnd() && ln.getHeadEnd().isSetLen()) {
-            ds = DecorationSize.fromOoxmlId(ln.getHeadEnd().getLen().intValue());
-        }
-        return ds; 
-    }
-
-    /**
-     * Specifies the line end decoration, such as a triangle or arrowhead.
-     */
-    public void setLineTailDecoration(DecorationShape style) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-
-        CTLineEndProperties lnEnd = ln.isSetTailEnd() ? ln.getTailEnd() : ln.addNewTailEnd();
-        if (style == null) {
-            if (lnEnd.isSetType()) {
-                lnEnd.unsetType();
-            }
-        } else {
-            lnEnd.setType(STLineEndType.Enum.forInt(style.ooxmlId));
-        }
-    }
-
-    /**
-     * @return the line end decoration shape
-     */
-    public DecorationShape getLineTailDecoration() {
-        CTLineProperties ln = getLn(this, false);
-        
-        DecorationShape ds = DecorationShape.NONE;
-        if (ln != null && ln.isSetTailEnd() && ln.getTailEnd().isSetType()) {
-            ds = DecorationShape.fromOoxmlId(ln.getTailEnd().getType().intValue());
-        }
-        return ds;
-    }
-
-    /**
-     * specifies decorations which can be added to the tail of a line.
-     */
-    public void setLineTailWidth(DecorationSize style) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        
-        CTLineEndProperties lnEnd = ln.isSetTailEnd() ? ln.getTailEnd() : ln.addNewTailEnd();
-        if (style == null) {
-            if (lnEnd.isSetW()) {
-                lnEnd.unsetW();
-            }
-        } else {
-            lnEnd.setW(STLineEndWidth.Enum.forInt(style.ooxmlId));
-        }
-    }
-
-    /**
-     * @return the line end decoration width
-     */
-    public DecorationSize getLineTailWidth() {
-        CTLineProperties ln = getLn(this, false);
-        DecorationSize ds = DecorationSize.MEDIUM;
-        if (ln != null && ln.isSetTailEnd() && ln.getTailEnd().isSetW()) {
-            ds = DecorationSize.fromOoxmlId(ln.getTailEnd().getW().intValue());
-        }
-        return ds;
-    }
-
-    /**
-     * Specifies the line end width in relation to the line width.
-     */
-    public void setLineTailLength(DecorationSize style) {
-        CTLineProperties ln = getLn(this, true);
-        if (ln == null) {
-            return;
-        }
-        
-        CTLineEndProperties lnEnd = ln.isSetTailEnd() ? ln.getTailEnd() : ln.addNewTailEnd();
-        if (style == null) {
-            if (lnEnd.isSetLen()) {
-                lnEnd.unsetLen();
-            }
-        } else {
-            lnEnd.setLen(STLineEndLength.Enum.forInt(style.ooxmlId));
-        }
-    }
-
-    /**
-     * @return the line end decoration length
-     */
-    public DecorationSize getLineTailLength() {
-        CTLineProperties ln = getLn(this, false);
-        
-        DecorationSize ds = DecorationSize.MEDIUM;
-        if (ln != null && ln.isSetTailEnd() && ln.getTailEnd().isSetLen()) {
-            ds = DecorationSize.fromOoxmlId(ln.getTailEnd().getLen().intValue());
-        }
-        return ds; 
-    }
-
-    public boolean isPlaceholder() {
-        CTPlaceholder ph = getCTPlaceholder();
-        return ph != null;
-    }
-
-    public Guide getAdjustValue(String name) {
-        XSLFGeometryProperties gp = XSLFPropertiesDelegate.getGeometryDelegate(getShapeProperties());
-        
-        if (gp != null && gp.isSetPrstGeom() && gp.getPrstGeom().isSetAvLst()) {
-            for (CTGeomGuide g : gp.getPrstGeom().getAvLst().getGdArray()) {
-                if (g.getName().equals(name)) {
-                    return new Guide(g.getName(), g.getFmla());
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public LineDecoration getLineDecoration() {
-        return new LineDecoration() {
-            public DecorationShape getHeadShape() {
-                return getLineHeadDecoration();
-            }
-
-            public DecorationSize getHeadWidth() {
-                return getLineHeadWidth();
-            }
-
-            public DecorationSize getHeadLength() {
-                return getLineHeadLength();
-            }
-
-            public DecorationShape getTailShape() {
-                return getLineTailDecoration();
-            }
-
-            public DecorationSize getTailWidth() {
-                return getLineTailWidth();
-            }
-
-            public DecorationSize getTailLength() {
-                return getLineTailLength();
-            }
-        };
-    }
-
-    /**
-     * fetch shape fill as a java.awt.Paint
-     *
-     * @return either Color or GradientPaint or TexturePaint or null
-     */
-    public FillStyle getFillStyle() {
-        return new FillStyle() {
-            public PaintStyle getPaint() {
-                return XSLFSimpleShape.this.getFillPaint();
-            }
-        };
-    }
-
-    public StrokeStyle getStrokeStyle() {
-        return new StrokeStyle() {
-            public PaintStyle getPaint() {
-                return XSLFSimpleShape.this.getLinePaint();
-            }
-
-            public LineCap getLineCap() {
-                return XSLFSimpleShape.this.getLineCap();
-            }
-
-            public LineDash getLineDash() {
-                return XSLFSimpleShape.this.getLineDash();
-            }
-
-            public double getLineWidth() {
-                return XSLFSimpleShape.this.getLineWidth();
-            }
-
-            public LineCompound getLineCompound() {
-                return XSLFSimpleShape.this.getLineCompound();
-            }
-
-        };
-    }
-
-    @Override
-    public void setStrokeStyle(Object... styles) {
-        if (styles.length == 0) {
-            // remove stroke
-            setLineColor(null);
-            return;
-        }
-        
-        // TODO: handle PaintStyle
-        for (Object st : styles) {
-            if (st instanceof Number) {
-                setLineWidth(((Number)st).doubleValue());
-            } else if (st instanceof LineCap) {
-                setLineCap((LineCap)st);
-            } else if (st instanceof LineDash) {
-                setLineDash((LineDash)st);
-            } else if (st instanceof LineCompound) {
-                setLineCompound((LineCompound)st);
-            } else if (st instanceof Color) {
-                setLineColor((Color)st);
-            }
-        }
-    }
-    
-    @Override
-    public void setPlaceholder(Placeholder placeholder) {
-        super.setPlaceholder(placeholder);
-    }
-    
-    @Override
-    public XSLFHyperlink getHyperlink() {
-        CTNonVisualDrawingProps cNvPr = getCNvPr();
-        if (!cNvPr.isSetHlinkClick()) {
-            return null;
-        }
-        return new XSLFHyperlink(cNvPr.getHlinkClick(), getSheet());
-    }
-    
-    @Override
-    public XSLFHyperlink createHyperlink() {
-        XSLFHyperlink hl = getHyperlink();
-        if (hl == null) {
-            CTNonVisualDrawingProps cNvPr = getCNvPr();
-            hl = new XSLFHyperlink(cNvPr.addNewHlinkClick(), getSheet());
-        }
-        return hl;
-    }
-
-    private static CTLineProperties getLn(XSLFShape shape, boolean create) {
-        XmlObject pr = shape.getShapeProperties();
-        if (!(pr instanceof CTShapeProperties)) {
-            LOG.log(POILogger.WARN, shape.getClass().toString()+" doesn't have line properties");
-            return null;
-        }
-        
-        CTShapeProperties spr = (CTShapeProperties)pr;
-        return (spr.isSetLn() || !create) ? spr.getLn() : spr.addNewLn();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
deleted file mode 100644
index 66ec5e1..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.Drawable;
-import org.apache.poi.sl.usermodel.Notes;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.NotImplemented;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTBackground;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommonSlideData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShapeNonVisual;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlide;
-import org.openxmlformats.schemas.presentationml.x2006.main.SldDocument;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-@Beta
-public final class XSLFSlide extends XSLFSheet
-implements Slide<XSLFShape,XSLFTextParagraph> {
-   private final CTSlide _slide;
-   private XSLFSlideLayout _layout;
-   private XSLFComments _comments;
-   private XSLFNotes _notes;
-
-    /**
-     * Create a new slide
-     */
-    XSLFSlide() {
-        super();
-        _slide = prototype();
-        setCommonSlideData(_slide.getCSld());
-    }
-
-    /**
-     * Construct a SpreadsheetML slide from a package part
-     *
-     * @param part the package part holding the slide data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.slide+xml</code>
-     * 
-     * @since POI 3.14-Beta1
-     */
-    XSLFSlide(PackagePart part) throws IOException, XmlException {
-        super(part);
-
-        Document _doc;
-        try {
-            _doc = DocumentHelper.readDocument(getPackagePart().getInputStream());
-        } catch (SAXException e) {
-            throw new IOException(e);
-        }
-        
-        SldDocument doc = SldDocument.Factory.parse(_doc, DEFAULT_XML_OPTIONS);
-        _slide = doc.getSld();
-        setCommonSlideData(_slide.getCSld());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    XSLFSlide(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    
-    private static CTSlide prototype(){
-        CTSlide ctSlide = CTSlide.Factory.newInstance();
-        CTCommonSlideData cSld = ctSlide.addNewCSld();
-        CTGroupShape spTree = cSld.addNewSpTree();
-
-        CTGroupShapeNonVisual nvGrpSpPr = spTree.addNewNvGrpSpPr();
-        CTNonVisualDrawingProps cnvPr = nvGrpSpPr.addNewCNvPr();
-        cnvPr.setId(1);
-        cnvPr.setName("");
-        nvGrpSpPr.addNewCNvGrpSpPr();
-        nvGrpSpPr.addNewNvPr();
-
-        CTGroupShapeProperties grpSpr = spTree.addNewGrpSpPr();
-        CTGroupTransform2D xfrm = grpSpr.addNewXfrm();
-        CTPoint2D off = xfrm.addNewOff();
-        off.setX(0);
-        off.setY(0);
-        CTPositiveSize2D ext = xfrm.addNewExt();
-        ext.setCx(0);
-        ext.setCy(0);
-        CTPoint2D choff = xfrm.addNewChOff();
-        choff.setX(0);
-        choff.setY(0);
-        CTPositiveSize2D chExt = xfrm.addNewChExt();
-        chExt.setCx(0);
-        chExt.setCy(0);
-        ctSlide.addNewClrMapOvr().addNewMasterClrMapping();
-        return ctSlide;
-    }
-
-    @Override
-	public CTSlide getXmlObject() {
-		return _slide;
-	}
-
-    @Override
-    protected String getRootElementName(){
-        return "sld";        
-    }
-
-    public XSLFSlideLayout getMasterSheet(){
-        return getSlideLayout();
-    }
-
-    public XSLFSlideLayout getSlideLayout(){
-        if(_layout == null){
-             for (POIXMLDocumentPart p : getRelations()) {
-                if (p instanceof XSLFSlideLayout){
-                   _layout = (XSLFSlideLayout)p;
-                }
-            }
-        }
-        if(_layout == null) {
-            throw new IllegalArgumentException("SlideLayout was not found for " + this.toString());
-        }
-        return _layout;
-    }
-
-    public XSLFSlideMaster getSlideMaster(){
-        return getSlideLayout().getSlideMaster();
-    }
-
-    public XSLFComments getComments() {
-       if(_comments == null) {
-          for (POIXMLDocumentPart p : getRelations()) {
-             if (p instanceof XSLFComments) {
-                _comments = (XSLFComments)p;
-             }
-          }
-       }
-       if(_comments == null) {
-          // This slide lacks comments
-          // Not all have them, sorry...
-          return null;
-       }
-       return _comments;
-    }
-
-    public XSLFNotes getNotes() {
-       if(_notes == null) {
-          for (POIXMLDocumentPart p : getRelations()) {
-             if (p instanceof XSLFNotes){
-                _notes = (XSLFNotes)p;
-             }
-          }
-       }
-       if(_notes == null) {
-          // This slide lacks notes
-          // Not all have them, sorry...
-          return null;
-       }
-       return _notes;
-    }
-
-    @Override
-    public String getTitle(){
-        XSLFTextShape txt = getTextShapeByType(Placeholder.TITLE);
-        return txt == null ? null : txt.getText();
-    }
-    
-    @Override
-    public XSLFTheme getTheme(){
-    	return getSlideLayout().getSlideMaster().getTheme();
-    }
-
-    /**
-     *
-     * @return the information about background appearance of this slide
-     */
-    @Override
-    public XSLFBackground getBackground() {
-        CTBackground bg = _slide.getCSld().getBg();
-        if(bg != null) {
-            return new XSLFBackground(bg, this);
-        } else {
-            return getMasterSheet().getBackground();
-        }
-    }
-
-    @Override
-    public boolean getFollowMasterGraphics(){
-        return _slide.isSetShowMasterSp() && _slide.getShowMasterSp();
-    }
-
-    /**
-     *
-     * @param value whether shapes on the master slide should be shown or not.
-     */
-    public void setFollowMasterGraphics(boolean value){
-        _slide.setShowMasterSp(value);
-    }
-
-
-    public boolean getFollowMasterObjects() {
-        return getFollowMasterGraphics();
-    }
-    
-    public void setFollowMasterObjects(boolean follow) {
-        setFollowMasterGraphics(follow);
-    }
-
-    @Override
-    public XSLFSlide importContent(XSLFSheet src){
-        super.importContent(src);
-        if (!(src instanceof XSLFSlide)) {
-            return this;
-        }
-
-        // only copy direct backgrounds - not backgrounds of master sheet
-        CTBackground bgOther = ((XSLFSlide)src)._slide.getCSld().getBg();
-        if (bgOther == null) {
-            return this;
-        }
-        
-        CTBackground bgThis = _slide.getCSld().getBg();
-        // remove existing background
-        if (bgThis != null) {
-            if (bgThis.isSetBgPr() && bgThis.getBgPr().isSetBlipFill()) {
-                String oldId = bgThis.getBgPr().getBlipFill().getBlip().getEmbed();
-                removeRelation(getRelationById(oldId));
-            }
-            _slide.getCSld().unsetBg();
-        }
-            
-        bgThis = (CTBackground)_slide.getCSld().addNewBg().set(bgOther);
-            
-        if(bgOther.isSetBgPr() && bgOther.getBgPr().isSetBlipFill()){
-            String idOther = bgOther.getBgPr().getBlipFill().getBlip().getEmbed();
-            String idThis = importBlip(idOther, src.getPackagePart());
-            bgThis.getBgPr().getBlipFill().getBlip().setEmbed(idThis);
-            
-        }
-
-        return this;
-    }
-
-    public boolean getFollowMasterBackground() {
-        return false;
-    }
-    
-    @NotImplemented
-    public void setFollowMasterBackground(boolean follow) {
-        // not implemented ... also not in the specs
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean getFollowMasterColourScheme() {
-        return false;
-    }
-    
-    @NotImplemented
-    public void setFollowMasterColourScheme(boolean follow) {
-        // not implemented ... only for OLE objects in the specs
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    @NotImplemented
-    public void setNotes(Notes<XSLFShape,XSLFTextParagraph> notes) {
-        assert(notes instanceof XSLFNotes);
-        // TODO Auto-generated method stub
-    }
-    
-    @Override
-    public int getSlideNumber() {
-        int idx = getSlideShow().getSlides().indexOf(this);
-        return (idx == -1) ? idx : idx+1;
-    }
-
-    /**
-     * Render this sheet into the supplied graphics object
-     *
-     * @param graphics
-     */
-    @Override
-    public void draw(Graphics2D graphics){
-        DrawFactory drawFact = DrawFactory.getInstance(graphics);
-        Drawable draw = drawFact.getDrawable(this);
-        draw.draw(graphics);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
deleted file mode 100644
index 15a4a16..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.usermodel.MasterSheet;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTBackground;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideLayout;
-import org.openxmlformats.schemas.presentationml.x2006.main.SldLayoutDocument;
-
-@Beta
-public class XSLFSlideLayout extends XSLFSheet
-implements MasterSheet<XSLFShape,XSLFTextParagraph> {
-    private CTSlideLayout _layout;
-    private XSLFSlideMaster _master;
-
-    XSLFSlideLayout() {
-        super();
-        _layout = CTSlideLayout.Factory.newInstance();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XSLFSlideLayout(PackagePart part) throws IOException, XmlException {
-        super(part);
-        SldLayoutDocument doc =
-                SldLayoutDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-        _layout = doc.getSldLayout();
-        setCommonSlideData(_layout.getCSld());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XSLFSlideLayout(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-
-    public String getName() {
-        return _layout.getCSld().getName();
-    }
-
-    /**
-     * While developing only!
-     */
-    @Internal
-    public CTSlideLayout getXmlObject() {
-        return _layout;
-    }
-
-    @Override
-    protected String getRootElementName() {
-        return "sldLayout";
-    }
-
-    /**
-     * Slide master object associated with this layout.
-     *
-     * @return slide master. Never null.
-     * @throws IllegalStateException if slide master was not found
-     */
-    public XSLFSlideMaster getSlideMaster() {
-        if (_master == null) {
-            for (POIXMLDocumentPart p : getRelations()) {
-                if (p instanceof XSLFSlideMaster) {
-                    _master = (XSLFSlideMaster) p;
-                }
-            }
-        }
-        if (_master == null) {
-            throw new IllegalStateException("SlideMaster was not found for " + this.toString());
-        }
-        return _master;
-    }
-
-    @Override
-    public XSLFSlideMaster getMasterSheet() {
-        return getSlideMaster();
-    }
-
-    @Override
-    public XSLFTheme getTheme() {
-        return getSlideMaster().getTheme();
-    }
-
-
-    @Override
-    public boolean getFollowMasterGraphics() {
-        return _layout.isSetShowMasterSp() && _layout.getShowMasterSp();
-    }
-
-    /**
-     * Render this sheet into the supplied graphics object
-     */
-    @Override
-    protected boolean canDraw(XSLFShape shape) {
-        if (shape instanceof XSLFSimpleShape) {
-            XSLFSimpleShape txt = (XSLFSimpleShape) shape;
-            CTPlaceholder ph = txt.getCTPlaceholder();
-            if (ph != null) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    @Override
-    public XSLFBackground getBackground() {
-        CTBackground bg = _layout.getCSld().getBg();
-        if(bg != null) {
-            return new XSLFBackground(bg, this);
-        } else {
-            return getMasterSheet().getBackground();
-        }
-    }
-
-    /**
-     * Copy placeholders from this layout to the destination slide
-     *
-     * @param slide destination slide
-     */
-    public void copyLayout(XSLFSlide slide) {
-        for (XSLFShape sh : getShapes()) {
-            if (sh instanceof XSLFTextShape) {
-                XSLFTextShape tsh = (XSLFTextShape) sh;
-                Placeholder ph = tsh.getTextType();
-                if (ph == null) continue;
-
-                switch (ph) {
-                    // these are special and not copied by default
-                    case DATETIME:
-                    case SLIDE_NUMBER:
-                    case FOOTER:
-                        break;
-                    default:
-                        slide.getSpTree().addNewSp().set(tsh.getXmlObject().copy());
-                }
-            }
-        }
-    }
-
-    /**
-     *
-     * @return type of this layout
-     */
-    public SlideLayout getType(){
-        int ordinal = _layout.getType().intValue() - 1;
-        return SlideLayout.values()[ordinal];
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
deleted file mode 100644
index ae6c409..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.usermodel.MasterSheet;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColorMapping;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextListStyle;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTBackground;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMaster;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterTextStyles;
-import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument;
-
-/**
-* Slide master object associated with this layout.
-* <p>
-*  Within a slide master slide are contained all elements
-* that describe the objects and their corresponding formatting
-* for within a presentation slide.
-* </p>
-* <p>
-* Within a slide master slide are two main elements.
-* The cSld element specifies the common slide elements such as shapes and
-* their attached text bodies. Then the txStyles element specifies the
-* formatting for the text within each of these shapes. The other properties
-* within a slide master slide specify other properties for within a presentation slide
-* such as color information, headers and footers, as well as timing and
-* transition information for all corresponding presentation slides.
-* </p>
- *
- * @author Yegor Kozlov
-*/
-@Beta
- public class XSLFSlideMaster extends XSLFSheet
- implements MasterSheet<XSLFShape,XSLFTextParagraph> {
-	private CTSlideMaster _slide;
-    private Map<String, XSLFSlideLayout> _layouts;
-    private XSLFTheme _theme;
-
-    XSLFSlideMaster() {
-        super();
-        _slide = CTSlideMaster.Factory.newInstance();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    protected XSLFSlideMaster(PackagePart part) throws IOException, XmlException {
-        super(part);
-        SldMasterDocument doc =
-            SldMasterDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-        _slide = doc.getSldMaster();
-        setCommonSlideData(_slide.getCSld());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSLFSlideMaster(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    @Override
-	public CTSlideMaster getXmlObject() {
-		return _slide;
-	}
-
-    @Override
-    protected String getRootElementName(){
-        return "sldMaster";
-    }
-
-    @Override
-    public XSLFSlideMaster getMasterSheet() {
-        return null;
-    }
-
-    private Map<String, XSLFSlideLayout> getLayouts(){
-        if(_layouts == null){
-            _layouts = new HashMap<String, XSLFSlideLayout>();
-            for (POIXMLDocumentPart p : getRelations()) {
-                if (p instanceof XSLFSlideLayout){
-                    XSLFSlideLayout layout = (XSLFSlideLayout)p;
-                    _layouts.put(layout.getName().toLowerCase(Locale.ROOT), layout);
-                }
-            }
-        }
-        return _layouts;
-    }
-
-    /**
-     *
-     * @return all slide layouts referencing this master
-     */
-    public XSLFSlideLayout[] getSlideLayouts() {
-        return getLayouts().values().toArray(new XSLFSlideLayout[_layouts.size()]);
-    }
-
-    /**
-     * Get the slide layout by type.
-     *
-     * @param  type     The layout type. Cannot be null.
-     *
-     * @return the layout found or null on failure
-     */
-    public XSLFSlideLayout getLayout(SlideLayout type){
-        for(XSLFSlideLayout layout : getLayouts().values()){
-            if(layout.getType() == type) {
-                return layout;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the slide layout by name.
-     *
-     * @param name  The layout name (case-insensitive). Cannot be null.
-     *
-     * @return the layout found or null on failure
-     */
-    public XSLFSlideLayout getLayout(String name) {
-        return getLayouts().get(name.toLowerCase(Locale.ROOT));
-    }
-
-
-    @Override
-    public XSLFTheme getTheme(){
-        if(_theme == null){
-            for (POIXMLDocumentPart p : getRelations()) {
-                if (p instanceof XSLFTheme){
-                    _theme = (XSLFTheme)p;
-                    CTColorMapping cmap = _slide.getClrMap();
-                    if(cmap != null){
-                        _theme.initColorMap(cmap);
-                    }
-                    break;
-                }
-            }
-        }
-        return _theme;
-    }
-
-    protected CTTextListStyle getTextProperties(Placeholder textType) {
-        CTTextListStyle props;
-        CTSlideMasterTextStyles txStyles = getXmlObject().getTxStyles();
-        switch (textType){
-            case TITLE:
-            case CENTERED_TITLE:
-            case SUBTITLE:
-                props = txStyles.getTitleStyle();
-                break;
-            case BODY:
-                props = txStyles.getBodyStyle();
-                break;
-            default:
-                props = txStyles.getOtherStyle();
-                break;
-        }
-        return props;
-    }
-
-    /**
-     * Render this sheet into the supplied graphics object
-     *
-     */
-    @Override
-    protected boolean canDraw(XSLFShape shape){
-        if(shape instanceof XSLFSimpleShape){
-            XSLFSimpleShape txt = (XSLFSimpleShape)shape;
-            CTPlaceholder ph = txt.getCTPlaceholder();
-            if(ph != null) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public XSLFBackground getBackground() {
-        CTBackground bg = _slide.getCSld().getBg();
-        if(bg != null) {
-            return new XSLFBackground(bg, this);
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
deleted file mode 100644
index 8a49e39..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentList;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesSlide;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPresentation;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlide;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdList;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMaster;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdList;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CmLstDocument;
-import org.openxmlformats.schemas.presentationml.x2006.main.NotesDocument;
-import org.openxmlformats.schemas.presentationml.x2006.main.PresentationDocument;
-import org.openxmlformats.schemas.presentationml.x2006.main.SldDocument;
-import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument;
-
-/**
- * Experimental class to do low level processing of pptx files.
- *
- * Most users should use the higher level {@link XMLSlideShow} instead.
- *
- * If you are using these low level classes, then you
- *  will almost certainly need to refer to the OOXML
- *  specifications from
- *  http://www.ecma-international.org/publications/standards/Ecma-376.htm
- *
- * WARNING - APIs expected to change rapidly
- */
-public class XSLFSlideShow extends POIXMLDocument {
-
-	private PresentationDocument presentationDoc;
-	/**
-	 * The embedded OLE2 files in the OPC package
-	 */
-	private List<PackagePart> embedds;
-
-	public XSLFSlideShow(OPCPackage container) throws OpenXML4JException, IOException, XmlException {
-		super(container);
-
-		if(getCorePart().getContentType().equals(XSLFRelation.THEME_MANAGER.getContentType())) {
-			rebase(getPackage());
-		}
-
-		presentationDoc =
-			PresentationDocument.Factory.parse(getCorePart().getInputStream(), DEFAULT_XML_OPTIONS);
-
-		embedds = new LinkedList<PackagePart>();
-		for (CTSlideIdListEntry ctSlide : getSlideReferences().getSldIdArray()) {
-			PackagePart corePart = getCorePart();
-			PackagePart slidePart = corePart.getRelatedPart(corePart.getRelationship(ctSlide.getId2()));
-
-			for(PackageRelationship rel : slidePart.getRelationshipsByType(OLE_OBJECT_REL_TYPE)) {
-			    if (TargetMode.EXTERNAL == rel.getTargetMode()) {
-			        continue;
-			    }
-				// TODO: Add this reference to each slide as well
-				embedds.add(slidePart.getRelatedPart(rel));
-			}
-
-			for (PackageRelationship rel : slidePart.getRelationshipsByType(PACK_OBJECT_REL_TYPE)) {
-				embedds.add(slidePart.getRelatedPart(rel));
-			}
-		}
-	}
-	public XSLFSlideShow(String file) throws OpenXML4JException, IOException, XmlException {
-		this(openPackage(file));
-	}
-
-	/**
-	 * Returns the low level presentation base object
-	 */
-	@Internal
-	public CTPresentation getPresentation() {
-		return presentationDoc.getPresentation();
-	}
-
-	/**
-	 * Returns the references from the presentation to its
-	 *  slides.
-	 * You'll need these to figure out the slide ordering,
-	 *  and to get at the actual slides themselves
-	 */
-	@Internal
-	public CTSlideIdList getSlideReferences() {
-		if(! getPresentation().isSetSldIdLst()) {
-			getPresentation().setSldIdLst(CTSlideIdList.Factory.newInstance());
-		}
-		return getPresentation().getSldIdLst();
-	}
-
-	/**
-	 * Returns the references from the presentation to its
-	 *  slide masters.
-	 * You'll need these to get at the actual slide
-	 *  masters themselves
-	 */
-	@Internal
-	public CTSlideMasterIdList getSlideMasterReferences() {
-		return getPresentation().getSldMasterIdLst();
-	}
-
-	public PackagePart getSlideMasterPart(CTSlideMasterIdListEntry master) throws IOException, XmlException {
-		try {
-		   PackagePart corePart = getCorePart();
-			return corePart.getRelatedPart(
-				corePart.getRelationship(master.getId2())
-			);
-		} catch(InvalidFormatException e) {
-			throw new XmlException(e);
-		}
-	}
-	/**
-	 * Returns the low level slide master object from
-	 *  the supplied slide master reference
-	 */
-	@Internal
-	public CTSlideMaster getSlideMaster(CTSlideMasterIdListEntry master) throws IOException, XmlException {
-		PackagePart masterPart = getSlideMasterPart(master);
-		SldMasterDocument masterDoc =
-			SldMasterDocument.Factory.parse(masterPart.getInputStream(), DEFAULT_XML_OPTIONS);
-		return masterDoc.getSldMaster();
-	}
-
-	public PackagePart getSlidePart(CTSlideIdListEntry slide) throws IOException, XmlException {
-		try {
-			PackagePart corePart = getCorePart();
-			return corePart.getRelatedPart(corePart.getRelationship(slide.getId2()));
-		} catch(InvalidFormatException e) {
-			throw new XmlException(e);
-		}
-	}
-	/**
-	 * Returns the low level slide object from
-	 *  the supplied slide reference
-	 */
-	@Internal
-	public CTSlide getSlide(CTSlideIdListEntry slide) throws IOException, XmlException {
-		PackagePart slidePart = getSlidePart(slide);
-		SldDocument slideDoc =
-			SldDocument.Factory.parse(slidePart.getInputStream(), DEFAULT_XML_OPTIONS);
-		return slideDoc.getSld();
-	}
-
-	/**
-	 * Gets the PackagePart of the notes for the
-	 *  given slide, or null if there isn't one.
-	 */
-	public PackagePart getNodesPart(CTSlideIdListEntry parentSlide) throws IOException, XmlException {
-		PackageRelationshipCollection notes;
-		PackagePart slidePart = getSlidePart(parentSlide);
-
-		try {
-			notes = slidePart.getRelationshipsByType(XSLFRelation.NOTES.getRelation());
-		} catch(InvalidFormatException e) {
-			throw new IllegalStateException(e);
-		}
-
-		if(notes.size() == 0) {
-			// No notes for this slide
-			return null;
-		}
-		if(notes.size() > 1) {
-			throw new IllegalStateException("Expecting 0 or 1 notes for a slide, but found " + notes.size());
-		}
-
-		try {
-			return slidePart.getRelatedPart(notes.getRelationship(0));
-		} catch(InvalidFormatException e) {
-			throw new IllegalStateException(e);
-		}
-	}
-	/**
-	 * Returns the low level notes object for the given
-	 *  slide, as found from the supplied slide reference
-	 */
-	@Internal
-	public CTNotesSlide getNotes(CTSlideIdListEntry slide) throws IOException, XmlException {
-		PackagePart notesPart = getNodesPart(slide);
-		if(notesPart == null)
-			return null;
-
-		NotesDocument notesDoc =
-			NotesDocument.Factory.parse(notesPart.getInputStream(), DEFAULT_XML_OPTIONS);
-
-		return notesDoc.getNotes();
-	}
-
-	/**
-	 * Returns all the comments for the given slide
-	 */
-	@Internal
-	public CTCommentList getSlideComments(CTSlideIdListEntry slide) throws IOException, XmlException {
-		PackageRelationshipCollection commentRels;
-		PackagePart slidePart = getSlidePart(slide);
-
-		try {
-			commentRels = slidePart.getRelationshipsByType(XSLFRelation.COMMENTS.getRelation());
-		} catch(InvalidFormatException e) {
-			throw new IllegalStateException(e);
-		}
-
-		if(commentRels.size() == 0) {
-			// No comments for this slide
-			return null;
-		}
-		if(commentRels.size() > 1) {
-			throw new IllegalStateException("Expecting 0 or 1 comments for a slide, but found " + commentRels.size());
-		}
-
-		try {
-			PackagePart cPart = slidePart.getRelatedPart(
-					commentRels.getRelationship(0)
-			);
-			CmLstDocument commDoc =
-				CmLstDocument.Factory.parse(cPart.getInputStream(), DEFAULT_XML_OPTIONS);
-			return commDoc.getCmLst();
-		} catch(InvalidFormatException e) {
-			throw new IllegalStateException(e);
-		}
-	}
-
-	/**
-	 * Get the document's embedded files.
-	 */
-	@Override
-	public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
-		return embedds;
-	}
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
deleted file mode 100644
index 346d81b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.util.Internal;
-
-@Internal
-public class XSLFSlideShowFactory extends SlideShowFactory {
-
-    /**
-     * Creates a XMLSlideShow from the given OOXML Package
-     *
-     * <p>Note that in order to properly release resources the
-     *  SlideShow should be closed after use.</p>
-     *
-     *  @param pkg The {@link OPCPackage} opened for reading data.
-     *
-     *  @return The created SlideShow
-     *
-     *  @throws IOException if an error occurs while reading the data
-     * @throws InvalidFormatException 
-     */
-    public static SlideShow<?,?> createSlideShow(OPCPackage pkg) throws IOException {
-        try {
-            return new XMLSlideShow(pkg);
-        } catch (IllegalArgumentException ioe) {
-            // ensure that file handles are closed (use revert() to not re-write the file)
-            pkg.revert();
-            //pkg.close();
-
-            // rethrow exception
-            throw ioe;
-        }
-    }
-    
-    /**
-     * Creates the XMLSlideShow from the given File, which must exist and be readable.
-     * <p>Note that in order to properly release resources theSlideShow should be closed after use.
-     *
-     *  @param file The file to read data from.
-     *  @param readOnly If the SlideShow should be opened in read-only mode to avoid writing back
-     *      changes when the document is closed.
-     *
-     *  @return The created SlideShow
-     *
-     *  @throws IOException if an error occurs while reading the data
-     *  @throws EncryptedDocumentException If the wrong password is given for a protected file
-     */
-    @SuppressWarnings("resource")
-    public static SlideShow<?,?> createSlideShow(File file, boolean readOnly)
-    throws IOException, InvalidFormatException {
-        OPCPackage pkg = OPCPackage.open(file, readOnly ? PackageAccess.READ : PackageAccess.READ_WRITE);
-        return createSlideShow(pkg);
-    }
-
-    /**
-     * Creates a XMLSlideShow from the given InputStream
-     *
-     * <p>Note that in order to properly release resources the
-     * SlideShow should be closed after use.</p>
-     *
-     * @param stream The {@link InputStream} to read data from.
-     *
-     * @return The created SlideShow
-     *
-     * @throws IOException if an error occurs while reading the data
-     * @throws InvalidFormatException 
-     */
-    @SuppressWarnings("resource")
-    public static SlideShow<?,?> createSlideShow(InputStream stream) throws IOException, InvalidFormatException {
-        OPCPackage pkg = OPCPackage.open(stream);
-        return createSlideShow(pkg);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
deleted file mode 100644
index 61ab6b4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.DrawTableShape;
-import org.apache.poi.sl.draw.DrawTextShape;
-import org.apache.poi.sl.usermodel.TableShape;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Units;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObjectData;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTable;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrameNonVisual;
-
-/**
- * Represents a table in a .pptx presentation
- */
-public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow>,
-    TableShape<XSLFShape,XSLFTextParagraph> {
-    /* package */ static final String TABLE_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
-    /* package */ static final String DRAWINGML_URI = "http://schemas.openxmlformats.org/drawingml/2006/main";
-
-    private CTTable _table;
-    private List<XSLFTableRow> _rows;
-
-    /*package*/ XSLFTable(CTGraphicalObjectFrame shape, XSLFSheet sheet){
-        super(shape, sheet);
-
-        CTGraphicalObjectData god = shape.getGraphic().getGraphicData();
-        XmlCursor xc = god.newCursor();
-        if (!xc.toChild(DRAWINGML_URI, "tbl")) {
-            throw new IllegalStateException("a:tbl element was not found in\n " + god);
-        }
-
-        XmlObject xo = xc.getObject();
-        // Pesky XmlBeans bug - see Bugzilla #49934
-        // it never happens when using the full ooxml-schemas jar but may happen with the abridged poi-ooxml-schemas
-        if (xo instanceof XmlAnyTypeImpl){
-            String errStr =
-                "Schemas (*.xsb) for CTTable can't be loaded - usually this happens when OSGI " +
-                "loading is used and the thread context classloader has no reference to " +
-                "the xmlbeans classes - use POIXMLTypeLoader.setClassLoader() to set the loader, " +
-                "e.g. with CTTable.class.getClassLoader()"
-            ;
-            throw new IllegalStateException(errStr);
-        }
-        _table = (CTTable)xo;
-        xc.dispose();
-
-        _rows = new ArrayList<XSLFTableRow>(_table.sizeOfTrArray());
-        for(CTTableRow row : _table.getTrArray()) {
-            _rows.add(new XSLFTableRow(row, this));
-        }
-        updateRowColIndexes();
-    }
-
-    @Override
-    public XSLFTableCell getCell(int row, int col) {
-        List<XSLFTableRow> rows = getRows();
-        if (row < 0 || rows.size() <= row) {
-            return null;
-        }
-        XSLFTableRow r = rows.get(row);
-        if (r == null) {
-            // empty row
-            return null;
-        }
-        List<XSLFTableCell> cells = r.getCells();
-        if (col < 0 || cells.size() <= col) {
-            return null;
-        }
-        // cell can be potentially empty ...
-        return cells.get(col);
-    }
-    
-    @Internal
-    public CTTable getCTTable(){
-        return _table;
-    }
-
-    @Override
-    public int getNumberOfColumns() {
-        return _table.getTblGrid().sizeOfGridColArray();
-    }
-
-    @Override
-    public int getNumberOfRows() {
-        return _table.sizeOfTrArray();
-    }
-
-    @Override
-    public double getColumnWidth(int idx){
-        return Units.toPoints(
-                _table.getTblGrid().getGridColArray(idx).getW());
-    }
-
-    @Override
-    public void setColumnWidth(int idx, double width) {
-        _table.getTblGrid().getGridColArray(idx).setW(Units.toEMU(width));
-    }
-
-    @Override
-    public double getRowHeight(int row) {
-        return Units.toPoints(_table.getTrArray(row).getH());
-    }
-    
-    @Override
-    public void setRowHeight(int row, double height) {
-        _table.getTrArray(row).setH(Units.toEMU(height));
-    }
-    
-    public Iterator<XSLFTableRow> iterator(){
-        return _rows.iterator();
-    }
-
-    public List<XSLFTableRow> getRows(){
-        return Collections.unmodifiableList(_rows);
-    }
-
-    public XSLFTableRow addRow(){
-        CTTableRow tr = _table.addNewTr();
-        XSLFTableRow row = new XSLFTableRow(tr, this);
-        // default height is 20 points
-        row.setHeight(20.0);    
-        _rows.add(row);
-        updateRowColIndexes();
-        return row;
-    }
-
-    static CTGraphicalObjectFrame prototype(int shapeId){
-        CTGraphicalObjectFrame frame = CTGraphicalObjectFrame.Factory.newInstance();
-        CTGraphicalObjectFrameNonVisual nvGr = frame.addNewNvGraphicFramePr();
-
-        CTNonVisualDrawingProps cnv = nvGr.addNewCNvPr();
-        cnv.setName("Table " + shapeId);
-        cnv.setId(shapeId + 1);
-        nvGr.addNewCNvGraphicFramePr().addNewGraphicFrameLocks().setNoGrp(true);
-        nvGr.addNewNvPr();
-
-        frame.addNewXfrm();
-        CTGraphicalObjectData gr = frame.addNewGraphic().addNewGraphicData();
-        XmlCursor grCur = gr.newCursor();
-        grCur.toNextToken();
-        grCur.beginElement(new QName(DRAWINGML_URI, "tbl"));
-        
-        CTTable tbl = CTTable.Factory.newInstance();
-        tbl.addNewTblPr();
-        tbl.addNewTblGrid();
-        XmlCursor tblCur = tbl.newCursor();
-        
-        tblCur.moveXmlContents(grCur);
-        tblCur.dispose();
-        grCur.dispose();
-        gr.setUri(TABLE_URI);
-        return frame;
-    }
-
-    /**
-     * Merge cells of a table
-     */
-    public void mergeCells(int firstRow, int lastRow, int firstCol, int lastCol) {
-
-    	if(firstRow > lastRow) {
-    		throw new IllegalArgumentException(
-    			"Cannot merge, first row > last row : "
-    			+ firstRow + " > " + lastRow
-    		);
-    	}
-
-    	if(firstCol > lastCol) {
-    		throw new IllegalArgumentException(
-    			"Cannot merge, first column > last column : "
-    			+ firstCol + " > " + lastCol
-    		);
-    	}
-
-    	int rowSpan = (lastRow - firstRow) + 1;
-    	boolean mergeRowRequired = rowSpan > 1;
-
-    	int colSpan = (lastCol - firstCol) + 1;
-    	boolean mergeColumnRequired = colSpan > 1;
-
-    	for(int i = firstRow; i <= lastRow; i++) {
-
-    		XSLFTableRow row = _rows.get(i);
-
-    		for(int colPos = firstCol; colPos <= lastCol; colPos++) {
-
-    			XSLFTableCell cell = row.getCells().get(colPos);
-
-    			if(mergeRowRequired) {
-	    			if(i == firstRow) {
-	    				cell.setRowSpan(rowSpan);
-	    			} else {
-	    				cell.setVMerge(true);
-	    			}
-    			}
-    			if(mergeColumnRequired) {
-    				if(colPos == firstCol) {
-    					cell.setGridSpan(colSpan);
-    				} else {
-    					cell.setHMerge(true);
-    				}
-    			}
-    		}
-    	}
-    }
-    
-    /**
-     * Get assigned TableStyle
-     *
-     * @return the assigned TableStyle
-     * 
-     * @since POI 3.15-beta2
-     */
-    protected XSLFTableStyle getTableStyle() {
-        CTTable tab = getCTTable();
-        // TODO: support inline table style
-        if (!tab.isSetTblPr() || !tab.getTblPr().isSetTableStyleId()) {
-            return null;
-        }
-        
-        String styleId = tab.getTblPr().getTableStyleId();
-        XSLFTableStyles styles = getSheet().getSlideShow().getTableStyles();
-        for (XSLFTableStyle style : styles.getStyles()) {
-            if (style.getStyleId().equals(styleId)) {
-                return style;
-            }
-        }
-        return null;
-    }
-    
-    /* package */ void updateRowColIndexes() {
-        int rowIdx = 0;
-        for (XSLFTableRow xr : this) {
-            int colIdx = 0;
-            for (XSLFTableCell tc : xr) {
-                tc.setRowColIndex(rowIdx, colIdx);
-                colIdx++;
-            }
-            rowIdx++;
-        }
-    }
-
-    /* package */ void updateCellAnchor() {
-        int rows = getNumberOfRows();
-        int cols = getNumberOfColumns();
-
-        double colWidths[] = new double[cols];
-        double rowHeights[] = new double[rows];
-
-        for (int row=0; row<rows; row++) {
-            rowHeights[row] = getRowHeight(row);
-        }
-        for (int col=0; col<cols; col++) {
-            colWidths[col] = getColumnWidth(col);
-        }
-
-        Rectangle2D tblAnc = getAnchor();
-        DrawFactory df = DrawFactory.getInstance(null);
-        
-        double newY = tblAnc.getY();
-
-        // #1 pass - determine row heights, the height values might be too low or 0 ...
-        for (int row=0; row<rows; row++) {
-            double maxHeight = 0;
-            for (int col=0; col<cols; col++) {
-                XSLFTableCell tc = getCell(row, col);
-                if (tc.getGridSpan() != 1 || tc.getRowSpan() != 1) {
-                    continue;
-                }
-                // need to set the anchor before height calculation
-                tc.setAnchor(new Rectangle2D.Double(0,0,colWidths[col],0));
-                DrawTextShape dts = df.getDrawable(tc);
-                maxHeight = Math.max(maxHeight, dts.getTextHeight());
-            }
-            rowHeights[row] = Math.max(rowHeights[row],maxHeight);
-        }
-        
-        // #2 pass - init properties
-        for (int row=0; row<rows; row++) {
-            double newX = tblAnc.getX();
-            for (int col=0; col<cols; col++) {
-                Rectangle2D bounds = new Rectangle2D.Double(newX, newY, colWidths[col], rowHeights[row]);
-                XSLFTableCell tc = getCell(row, col);
-                tc.setAnchor(bounds);
-                newX += colWidths[col]+DrawTableShape.borderSize;
-            }
-            newY += rowHeights[row]+DrawTableShape.borderSize;
-        }
-        
-        // #3 pass - update merge info
-        for (int row=0; row<rows; row++) {
-            for (int col=0; col<cols; col++) {
-                XSLFTableCell tc = getCell(row, col);
-                Rectangle2D mergedBounds = tc.getAnchor();
-                for (int col2=col+1; col2<col+tc.getGridSpan(); col2++) {
-                    assert(col2 < cols);
-                    XSLFTableCell tc2 = getCell(row, col2);
-                    assert(tc2.getGridSpan() == 1 && tc2.getRowSpan() == 1);
-                    mergedBounds.add(tc2.getAnchor());
-                }
-                for (int row2=row+1; row2<row+tc.getRowSpan(); row2++) {
-                    assert(row2 < rows);
-                    XSLFTableCell tc2 = getCell(row2, col);
-                    assert(tc2.getGridSpan() == 1 && tc2.getRowSpan() == 1);
-                    mergedBounds.add(tc2.getAnchor());
-                }
-                tc.setAnchor(mergedBounds);
-            }
-        }
-        
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
deleted file mode 100644
index 7b13e58..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
+++ /dev/null
@@ -1,759 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.ColorStyle;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCap;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.apache.poi.sl.usermodel.TableCell;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.util.Units;
-import org.apache.poi.xslf.usermodel.XSLFPropertiesDelegate.XSLFFillProperties;
-import org.apache.poi.xslf.usermodel.XSLFTableStyle.TablePartStyle;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTFontReference;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTLineEndProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTLineProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTable;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCellProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTablePartStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyleCellStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyleTextStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.STCompoundLine;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineCap;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndLength;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndWidth;
-import org.openxmlformats.schemas.drawingml.x2006.main.STOnOffStyleType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STPenAlignment;
-import org.openxmlformats.schemas.drawingml.x2006.main.STPresetLineDashVal;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextAnchoringType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextVerticalType;
-
-/**
- * Represents a cell of a table in a .pptx presentation
- */
-public class XSLFTableCell extends XSLFTextShape implements TableCell<XSLFShape,XSLFTextParagraph> {
-    private CTTableCellProperties _tcPr = null;
-    private final XSLFTable table;
-    private int row = 0, col = 0;
-
-    /**
-     * Volatile/temporary anchor - e.g. for rendering
-     */
-    private Rectangle2D anchor = null;
-
-    /*package*/ XSLFTableCell(CTTableCell cell, XSLFTable table){
-        super(cell, table.getSheet());
-        this.table = table;
-    }
-
-    @Override
-    protected CTTextBody getTextBody(boolean create){
-        CTTableCell cell = getCell();
-        CTTextBody txBody = cell.getTxBody();
-        if (txBody == null && create) {
-            txBody = cell.addNewTxBody();
-            XSLFAutoShape.initTextBody(txBody);
-        }
-        return txBody;
-    }
-
-    static CTTableCell prototype() {
-        CTTableCell cell = CTTableCell.Factory.newInstance();
-        CTTableCellProperties pr = cell.addNewTcPr();
-        pr.addNewLnL().addNewNoFill();
-        pr.addNewLnR().addNewNoFill();
-        pr.addNewLnT().addNewNoFill();
-        pr.addNewLnB().addNewNoFill();
-        return cell;
-    }
-
-    protected CTTableCellProperties getCellProperties(boolean create) {
-        if (_tcPr == null) {
-            CTTableCell cell = getCell();
-            _tcPr = cell.getTcPr();
-            if (_tcPr == null && create) {
-                _tcPr = cell.addNewTcPr();
-            }
-        }
-        return _tcPr;
-    }
-
-    @Override
-    public void setLeftInset(double margin){
-        CTTableCellProperties pr = getCellProperties(true);
-        pr.setMarL(Units.toEMU(margin));
-    }
-
-    @Override
-    public void setRightInset(double margin){
-        CTTableCellProperties pr = getCellProperties(true);
-        pr.setMarR(Units.toEMU(margin));
-    }
-
-    @Override
-    public void setTopInset(double margin){
-        CTTableCellProperties pr = getCellProperties(true);
-        pr.setMarT(Units.toEMU(margin));
-    }
-
-    @Override
-    public void setBottomInset(double margin){
-        CTTableCellProperties pr = getCellProperties(true);
-        pr.setMarB(Units.toEMU(margin));
-    }
-
-    private CTLineProperties getCTLine(BorderEdge edge, boolean create) {
-        if (edge == null) {
-            throw new IllegalArgumentException("BorderEdge needs to be specified.");
-        }
-
-        CTTableCellProperties pr = getCellProperties(create);
-        if (pr == null) return null;
-
-        switch (edge) {
-            case bottom:
-                return (pr.isSetLnB()) ? pr.getLnB() : (create ? pr.addNewLnB() : null);
-            case left:
-                return (pr.isSetLnL()) ? pr.getLnL() : (create ? pr.addNewLnL() : null);
-            case top:
-                return (pr.isSetLnT()) ? pr.getLnT() : (create ? pr.addNewLnT() : null);
-            case right:
-                return (pr.isSetLnR()) ? pr.getLnR() : (create ? pr.addNewLnR() : null);
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void removeBorder(BorderEdge edge) {
-        CTTableCellProperties pr = getCellProperties(false);
-        if (pr == null) return;
-        switch (edge) {
-            case bottom:
-                if (pr.isSetLnB()) {
-                    pr.unsetLnB();
-                }
-                break;
-            case left:
-                if (pr.isSetLnL()) {
-                    pr.unsetLnL();
-                }
-                break;
-            case top:
-                if (pr.isSetLnT()) {
-                    pr.unsetLnT();
-                }
-                break;
-            case right:
-                if (pr.isSetLnR()) {
-                    pr.unsetLnB();
-                }
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    @Override
-    public StrokeStyle getBorderStyle(final BorderEdge edge) {
-        final Double width = getBorderWidth(edge);
-        return (width == null) ? null : new StrokeStyle() {
-            public PaintStyle getPaint() {
-                return DrawPaint.createSolidPaint(getBorderColor(edge));
-            }
-
-            public LineCap getLineCap() {
-                return getBorderCap(edge);
-            }
-
-            public LineDash getLineDash() {
-                return getBorderDash(edge);
-            }
-
-            public LineCompound getLineCompound() {
-                return getBorderCompound(edge);
-            }
-
-            public double getLineWidth() {
-                return width;
-            }
-        };
-    }
-
-    @Override
-    public void setBorderStyle(BorderEdge edge, StrokeStyle style) {
-        if (style == null) {
-            throw new IllegalArgumentException("StrokeStyle needs to be specified.");
-        }
-
-        LineCap cap = style.getLineCap();
-        if (cap != null) {
-            setBorderCap(edge, cap);
-        }
-
-        LineCompound compound = style.getLineCompound();
-        if (compound != null) {
-            setBorderCompound(edge, compound);
-        }
-
-        LineDash dash = style.getLineDash();
-        if (dash != null) {
-            setBorderDash(edge, dash);
-        }
-
-        double width = style.getLineWidth();
-        setBorderWidth(edge, width);
-    }
-
-    public Double getBorderWidth(BorderEdge edge) {
-        CTLineProperties ln = getCTLine(edge, false);
-        return (ln == null || !ln.isSetW()) ? null : Units.toPoints(ln.getW());
-    }
-
-    @Override
-    public void setBorderWidth(BorderEdge edge, double width) {
-        CTLineProperties ln = getCTLine(edge, true);
-        ln.setW(Units.toEMU(width));
-    }
-
-    private CTLineProperties setBorderDefaults(BorderEdge edge) {
-        CTLineProperties ln = getCTLine(edge, true);
-        if (ln.isSetNoFill()) {
-            ln.unsetNoFill();
-        }
-
-        if(!ln.isSetPrstDash()) {
-            ln.addNewPrstDash().setVal(STPresetLineDashVal.SOLID);
-        }
-        if (!ln.isSetCmpd()) {
-            ln.setCmpd(STCompoundLine.SNG);
-        }
-        if (!ln.isSetAlgn()) {
-            ln.setAlgn(STPenAlignment.CTR);
-        }
-        if (!ln.isSetCap()) {
-            ln.setCap(STLineCap.FLAT);
-        }
-        if (!ln.isSetRound()) {
-            ln.addNewRound();
-        }
-
-        if (!ln.isSetHeadEnd()) {
-            CTLineEndProperties hd = ln.addNewHeadEnd();
-            hd.setType(STLineEndType.NONE);
-            hd.setW(STLineEndWidth.MED);
-            hd.setLen(STLineEndLength.MED);
-        }
-
-        if (!ln.isSetTailEnd()) {
-            CTLineEndProperties tl = ln.addNewTailEnd();
-            tl.setType(STLineEndType.NONE);
-            tl.setW(STLineEndWidth.MED);
-            tl.setLen(STLineEndLength.MED);
-        }
-
-        return ln;
-    }
-
-    @Override
-    public void setBorderColor(BorderEdge edge, Color color) {
-        if (color == null) {
-            throw new IllegalArgumentException("Colors need to be specified.");
-        }
-
-        CTLineProperties ln = setBorderDefaults(edge);
-        CTSolidColorFillProperties fill = ln.addNewSolidFill();
-        XSLFColor c = new XSLFColor(fill, getSheet().getTheme(), fill.getSchemeClr());
-        c.setColor(color);
-    }
-
-    public Color getBorderColor(BorderEdge edge) {
-        CTLineProperties ln = getCTLine(edge, false);
-        if (ln == null || ln.isSetNoFill() || !ln.isSetSolidFill()) return null;
-
-        CTSolidColorFillProperties fill = ln.getSolidFill();
-        XSLFColor c = new XSLFColor(fill, getSheet().getTheme(), fill.getSchemeClr());
-        return c.getColor();
-    }
-
-    public LineCompound getBorderCompound(BorderEdge edge) {
-        CTLineProperties ln = getCTLine(edge, false);
-        if (ln == null || ln.isSetNoFill() || !ln.isSetSolidFill() || !ln.isSetCmpd()) {
-            return null;
-        }
-
-        return LineCompound.fromOoxmlId(ln.getCmpd().intValue());
-    }
-
-    @Override
-    public void setBorderCompound(BorderEdge edge, LineCompound compound) {
-        if (compound == null) {
-            throw new IllegalArgumentException("LineCompound need to be specified.");
-        }
-
-        CTLineProperties ln = setBorderDefaults(edge);
-        ln.setCmpd(STCompoundLine.Enum.forInt(compound.ooxmlId));
-    }
-
-    public LineDash getBorderDash(BorderEdge edge) {
-        CTLineProperties ln = getCTLine(edge, false);
-        if (ln == null || ln.isSetNoFill() || !ln.isSetSolidFill() || !ln.isSetPrstDash()) {
-            return null;
-        }
-
-        return LineDash.fromOoxmlId(ln.getPrstDash().getVal().intValue());
-    }
-
-    @Override
-    public void setBorderDash(BorderEdge edge, LineDash dash) {
-        if (dash == null) {
-            throw new IllegalArgumentException("LineDash need to be specified.");
-        }
-
-        CTLineProperties ln = setBorderDefaults(edge);
-        ln.getPrstDash().setVal(STPresetLineDashVal.Enum.forInt(dash.ooxmlId));
-    }
-
-    public LineCap getBorderCap(BorderEdge edge) {
-        CTLineProperties ln = getCTLine(edge, false);
-        if (ln == null || ln.isSetNoFill() || !ln.isSetSolidFill() || !ln.isSetCap()) {
-            return null;
-        }
-
-        return LineCap.fromOoxmlId(ln.getCap().intValue());
-    }
-
-    public void setBorderCap(BorderEdge edge, LineCap cap) {
-        if (cap == null) {
-            throw new IllegalArgumentException("LineCap need to be specified.");
-        }
-
-        CTLineProperties ln = setBorderDefaults(edge);
-        ln.setCap(STLineCap.Enum.forInt(cap.ooxmlId));
-    }
-
-
-
-    /**
-     * Specifies a solid color fill. The shape is filled entirely with the specified color.
-     *
-     * @param color the solid color fill.
-     * The value of <code>null</code> unsets the solidFIll attribute from the underlying xml
-     */
-    @Override
-    public void setFillColor(Color color) {
-        CTTableCellProperties spPr = getCellProperties(true);
-        if (color == null) {
-            if(spPr.isSetSolidFill()) spPr.unsetSolidFill();
-        } else {
-            CTSolidColorFillProperties fill = spPr.isSetSolidFill() ? spPr.getSolidFill() : spPr.addNewSolidFill();
-            XSLFColor c = new XSLFColor(fill, getSheet().getTheme(), fill.getSchemeClr());
-            c.setColor(color);
-        }
-    }
-
-    /**
-     *
-     * @return solid fill color of null if not set
-     */
-    @Override
-    public Color getFillColor(){
-        PaintStyle ps = getFillPaint();
-        if (ps instanceof SolidPaint) {
-            ColorStyle cs = ((SolidPaint)ps).getSolidColor();
-            return DrawPaint.applyColorTransform(cs);
-        }
-        
-        return null;
-    }
-
-    @SuppressWarnings("resource")
-    @Override
-    public PaintStyle getFillPaint() {
-        XSLFSheet sheet = getSheet();
-        XSLFTheme theme = sheet.getTheme();
-        XmlObject props = getCellProperties(false);
-        XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(props);
-        if (fp != null) {
-            PaintStyle paint = selectPaint(fp, null, sheet.getPackagePart(), theme);
-            if (paint != null) {
-                return paint;
-            }
-        }
-
-        CTTablePartStyle tps = getTablePartStyle(null);
-        if (tps == null || !tps.isSetTcStyle()) {
-            tps = getTablePartStyle(TablePartStyle.wholeTbl);
-            if (tps == null || !tps.isSetTcStyle()) {
-                return null;
-            }
-        }
-
-        XMLSlideShow slideShow = sheet.getSlideShow();
-        CTTableStyleCellStyle tcStyle = tps.getTcStyle();
-        if (tcStyle.isSetFill()) {
-            props = tcStyle.getFill();
-        } else if (tcStyle.isSetFillRef()) {
-            props = tcStyle.getFillRef();
-        } else {
-            return null;
-        }
-        
-        fp = XSLFPropertiesDelegate.getFillDelegate(props);
-        if (fp != null)  {
-            PaintStyle paint = XSLFShape.selectPaint(fp, null, slideShow.getPackagePart(), theme);
-            if (paint != null) {
-                return paint;
-            }
-        }
-        
-        return null;
-    }
-
-    /**
-     * Retrieves the part style depending on the location of this cell
-     *
-     * @param tablePartStyle the part to be returned, usually this is null
-     *  and only set when used as a helper method
-     * @return the table part style
-     */
-    private CTTablePartStyle getTablePartStyle(TablePartStyle tablePartStyle) {
-        CTTable ct = table.getCTTable();
-        if (!ct.isSetTblPr()) {
-            return null;
-        }
-
-        CTTableProperties pr = ct.getTblPr();
-        boolean bandRow = (pr.isSetBandRow() && pr.getBandRow());
-        boolean firstRow = (pr.isSetFirstRow() && pr.getFirstRow());
-        boolean lastRow = (pr.isSetLastRow() && pr.getLastRow());
-        boolean bandCol = (pr.isSetBandCol() && pr.getBandCol());
-        boolean firstCol = (pr.isSetFirstCol() && pr.getFirstCol());
-        boolean lastCol = (pr.isSetLastCol() && pr.getLastCol());
-
-        TablePartStyle tps;
-        if (tablePartStyle != null) {
-            tps = tablePartStyle;
-        } else if (row == 0 && firstRow) {
-            tps = TablePartStyle.firstRow;
-        } else if (row == table.getNumberOfRows()-1 && lastRow) {
-            tps = TablePartStyle.lastRow;
-        } else if (col == 0 && firstCol) {
-            tps = TablePartStyle.firstCol;
-        } else if (col == table.getNumberOfColumns()-1 && lastCol) {
-            tps = TablePartStyle.lastCol;
-        } else {
-            tps = TablePartStyle.wholeTbl;
-
-            int br = row + (firstRow ? 1 : 0);
-            int bc = col + (firstCol ? 1 : 0);
-            if (bandRow && (br & 1) == 0) {
-                tps = TablePartStyle.band1H;
-            } else if (bandCol && (bc & 1) == 0) {
-                tps = TablePartStyle.band1V;
-            }
-        }
-
-        XSLFTableStyle tabStyle = table.getTableStyle();
-        if (tabStyle == null) {
-            return null;
-        }
-
-        CTTablePartStyle part = tabStyle.getTablePartStyle(tps);
-        return (part == null) ? tabStyle.getTablePartStyle(TablePartStyle.wholeTbl) : part;
-    }
-
-    void setGridSpan(int gridSpan_) {
-        getCell().setGridSpan(gridSpan_);
-    }
-
-    @Override
-    public int getGridSpan() {
-        CTTableCell c = getCell();
-        return (c.isSetGridSpan()) ? c.getGridSpan() : 1;
-    }
-
-    void setRowSpan(int rowSpan_) {
-        getCell().setRowSpan(rowSpan_);
-    }
-
-    @Override
-    public int getRowSpan() {
-        CTTableCell c = getCell();
-        return (c.isSetRowSpan()) ? c.getRowSpan() : 1;
-    }
-
-    void setHMerge(boolean merge_) {
-        getCell().setHMerge(merge_);
-    }
-
-    void setVMerge(boolean merge_) {
-        getCell().setVMerge(merge_);
-    }
-
-    @Override
-    public void setVerticalAlignment(VerticalAlignment anchor){
-    	CTTableCellProperties cellProps = getCellProperties(true);
-		if(anchor == null) {
-			if(cellProps.isSetAnchor()) {
-				cellProps.unsetAnchor();
-			}
-		} else {
-			cellProps.setAnchor(STTextAnchoringType.Enum.forInt(anchor.ordinal() + 1));
-		}
-    }
-
-    @Override
-    public VerticalAlignment getVerticalAlignment(){
-        CTTableCellProperties cellProps = getCellProperties(false);
-
-        VerticalAlignment align = VerticalAlignment.TOP;
-        if(cellProps != null && cellProps.isSetAnchor()) {
-            int ival = cellProps.getAnchor().intValue();
-            align = VerticalAlignment.values()[ival - 1];
-        }
-        return align;
-     }
-
-    /**
-     * @since POI 3.15-beta2
-     */
-    @Override
-    public void setTextDirection(TextDirection orientation) {
-        CTTableCellProperties cellProps = getCellProperties(true);
-        if(orientation == null) {
-            if (cellProps.isSetVert()) {
-                cellProps.unsetVert();
-            }
-        } else {
-            STTextVerticalType.Enum vt;
-            switch (orientation) {
-            default:
-            case HORIZONTAL:
-                vt = STTextVerticalType.HORZ;
-                break;
-            case VERTICAL:
-                vt = STTextVerticalType.VERT;
-                break;
-            case VERTICAL_270:
-                vt = STTextVerticalType.VERT_270;
-                break;
-            case STACKED:
-                vt = STTextVerticalType.WORD_ART_VERT;
-                break;
-            }
-
-            cellProps.setVert(vt);
-        }
-    }
-
-    /**
-     * @since POI 3.15-beta2
-     */
-    @Override
-    public TextDirection getTextDirection() {
-        CTTableCellProperties cellProps = getCellProperties(false);
-
-        STTextVerticalType.Enum orientation;
-        if (cellProps != null && cellProps.isSetVert()) {
-            orientation = cellProps.getVert();
-        } else {
-            orientation = STTextVerticalType.HORZ;
-        }
-
-        switch (orientation.intValue()) {
-            default:
-            case STTextVerticalType.INT_HORZ:
-                return TextDirection.HORIZONTAL;
-            case STTextVerticalType.INT_VERT:
-            case STTextVerticalType.INT_EA_VERT:
-            case STTextVerticalType.INT_MONGOLIAN_VERT:
-                return TextDirection.VERTICAL;
-            case STTextVerticalType.INT_VERT_270:
-                return TextDirection.VERTICAL_270;
-            case STTextVerticalType.INT_WORD_ART_VERT:
-            case STTextVerticalType.INT_WORD_ART_VERT_RTL:
-                return TextDirection.STACKED;
-        }
-    }
-
-    private CTTableCell getCell() {
-        return (CTTableCell)getXmlObject();
-    }
-
-    /* package */ void setRowColIndex(int row, int col) {
-        this.row = row;
-        this.col = col;
-    }
-
-    /**
-     * Return a fake-xfrm which is used for calculating the text height
-     */
-    protected CTTransform2D getXfrm() {
-        Rectangle2D anc = getAnchor();
-        CTTransform2D xfrm = CTTransform2D.Factory.newInstance();
-        CTPoint2D off = xfrm.addNewOff();
-        off.setX(Units.toEMU(anc.getX()));
-        off.setY(Units.toEMU(anc.getY()));
-        CTPositiveSize2D size = xfrm.addNewExt();
-        size.setCx(Units.toEMU(anc.getWidth()));
-        size.setCy(Units.toEMU(anc.getHeight()));
-        return xfrm;
-    }
-
-    /**
-     * There's no real anchor for table cells - this method is used to temporarily store the location
-     * of the cell for a later retrieval, e.g. for rendering
-     *
-     * @since POI 3.15-beta2
-     */
-    @Override
-    public void setAnchor(Rectangle2D anchor) {
-        if (this.anchor == null) {
-            this.anchor = (Rectangle2D)anchor.clone();
-        } else {
-            this.anchor.setRect(anchor);
-        }
-    }
-
-    /**
-     * @since POI 3.15-beta2
-     */
-    @Override
-    public Rectangle2D getAnchor() {
-        if (anchor == null) {
-            table.updateCellAnchor();
-        }
-        // anchor should be set, after updateCellAnchor is through
-        assert(anchor != null);
-        return anchor;
-    }
-
-    /**
-     * @since POI 3.15-beta2
-     */
-    @Override
-    public boolean isMerged() {
-        CTTableCell c = getCell();
-        return (c.isSetHMerge() && c.getHMerge()) || (c.isSetVMerge() && c.getVMerge());
-    }
-
-    /**
-     * @since POI 3.15-beta2
-     */
-    @Override
-    protected XSLFCellTextParagraph newTextParagraph(CTTextParagraph p) {
-        return new XSLFCellTextParagraph(p, this);
-    }
-
-    @Override
-    protected XmlObject getShapeProperties() {
-        return getCellProperties(false);
-    }
-    
-    /**
-     * @since POI 3.15-beta2
-     */
-    private class XSLFCellTextParagraph extends XSLFTextParagraph {
-        protected XSLFCellTextParagraph(CTTextParagraph p, XSLFTextShape shape) {
-            super(p, shape);
-        }
-
-        @Override
-        protected XSLFCellTextRun newTextRun(CTRegularTextRun r) {
-            return new XSLFCellTextRun(r, this);
-        }
-    }
-
-    /**
-     * @since POI 3.15-beta2
-     */
-    private class XSLFCellTextRun extends XSLFTextRun {
-        protected XSLFCellTextRun(CTRegularTextRun r, XSLFTextParagraph p) {
-            super(r, p);
-        }
-
-        @Override
-        public PaintStyle getFontColor(){
-            CTTableStyleTextStyle txStyle = getTextStyle();
-            if (txStyle == null) {
-                return super.getFontColor();
-            }
-
-            CTSchemeColor phClr = null;
-            CTFontReference fontRef = txStyle.getFontRef();
-            if (fontRef != null) {
-                phClr = fontRef.getSchemeClr();
-            }
-            
-            XSLFTheme theme = getSheet().getTheme();
-            final XSLFColor c = new XSLFColor(txStyle, theme, phClr);
-            return DrawPaint.createSolidPaint(c.getColorStyle());
-        }
-
-        @Override
-        public boolean isBold() {
-            CTTableStyleTextStyle txStyle = getTextStyle();
-            if (txStyle == null) {
-                return super.isBold();
-            } else {
-                return txStyle.isSetB() && txStyle.getB().intValue() == STOnOffStyleType.INT_ON;
-            }
-        }
-
-        @Override
-        public boolean isItalic() {
-            CTTableStyleTextStyle txStyle = getTextStyle();
-            if (txStyle == null) {
-                return super.isItalic();
-            } else {
-                return txStyle.isSetI() && txStyle.getI().intValue() == STOnOffStyleType.INT_ON;
-            }
-        }
- 
-        private CTTableStyleTextStyle getTextStyle() {
-            CTTablePartStyle tps = getTablePartStyle(null);
-            if (tps == null || !tps.isSetTcTxStyle()) {
-                tps = getTablePartStyle(TablePartStyle.wholeTbl);
-            }
-            return (tps == null) ? null : tps.getTcTxStyle();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
deleted file mode 100644
index c4529c4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.util.Units;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
-
-/**
- * Represents a table in a .pptx presentation
- */
-public class XSLFTableRow implements Iterable<XSLFTableCell> {
-    private final CTTableRow _row;
-    private final List<XSLFTableCell> _cells;
-    private final XSLFTable _table;
-
-    /*package*/ XSLFTableRow(CTTableRow row, XSLFTable table){
-        _row = row;
-        _table = table;
-        CTTableCell[] tcArray = _row.getTcArray();
-        _cells = new ArrayList<XSLFTableCell>(tcArray.length);
-        for(CTTableCell cell : tcArray) {
-            _cells.add(new XSLFTableCell(cell, table));
-        }
-    }
-
-    public CTTableRow getXmlObject(){
-        return _row;
-    }
-
-    public Iterator<XSLFTableCell> iterator(){
-        return _cells.iterator();
-    }
-
-    public List<XSLFTableCell> getCells(){
-        return Collections.unmodifiableList(_cells);
-    }
-
-    public double getHeight(){
-        return Units.toPoints(_row.getH());
-    }
-
-    public void setHeight(double height){
-        _row.setH(Units.toEMU(height));
-    }
-
-    public XSLFTableCell addCell(){
-        CTTableCell c = _row.addNewTc();
-        c.set(XSLFTableCell.prototype());
-        XSLFTableCell cell = new XSLFTableCell(c, _table);
-        _cells.add(cell);
-
-        if(_table.getNumberOfColumns() < _row.sizeOfTcArray()) {
-            _table.getCTTable().getTblGrid().addNewGridCol().setW(Units.toEMU(100.0));    
-        }
-        _table.updateRowColIndexes();
-        return cell;
-    }
-    
-    /**
-     * Merge cells of a table row, inclusive.
-     * Indices are 0-based.
-     *
-     * @param firstCol 0-based index of first column to merge, inclusive
-     * @param lastCol 0-based index of last column to merge, inclusive
-     */
-    public void mergeCells(int firstCol, int lastCol)
-    {
-        if (firstCol >= lastCol) {
-            throw new IllegalArgumentException(
-                "Cannot merge, first column >= last column : "
-                + firstCol + " >= " + lastCol
-            );
-        }
-
-        final int colSpan = (lastCol - firstCol) + 1;
-
-        _cells.get(firstCol).setGridSpan(colSpan);
-        for (final XSLFTableCell cell : _cells.subList(firstCol+1, lastCol+1)) {
-            cell.setHMerge(true);
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
deleted file mode 100644
index b3bcdfa..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTablePartStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyle;
-
-/**
- * Represents a table style in a .pptx presentation
- */
-public class XSLFTableStyle {
-    private CTTableStyle _tblStyle;
-
-    public enum TablePartStyle {
-        wholeTbl, band1H, band2H, band1V, band2V, firstCol, lastCol, firstRow, lastRow, seCell, swCell, neCell, nwCell;
-    }
-    
-    /*package*/ XSLFTableStyle(CTTableStyle style){
-        _tblStyle = style;
-    }
-
-    public CTTableStyle getXmlObject(){
-        return _tblStyle;
-    }
-
-    public String getStyleName(){
-        return _tblStyle.getStyleName();
-    }
-
-    public String getStyleId(){
-        return _tblStyle.getStyleId();
-    }
-
-    /**
-     * @since POI 3.15-beta2
-     */
-    protected CTTablePartStyle getTablePartStyle(TablePartStyle tps) {
-        switch (tps) {
-        default:
-        case wholeTbl:
-            return _tblStyle.getWholeTbl();
-        case band1H:
-            return _tblStyle.getBand1H();
-        case band2H:
-            return _tblStyle.getBand2H();
-        case band1V:
-            return _tblStyle.getBand1V();
-        case band2V:
-            return _tblStyle.getBand2V();
-        case firstCol:
-            return _tblStyle.getFirstCol();
-        case lastCol:
-            return _tblStyle.getLastCol();
-        case firstRow:
-            return _tblStyle.getFirstRow();
-        case lastRow:
-            return _tblStyle.getLastRow();
-        case seCell:
-            return _tblStyle.getSeCell();
-        case swCell:
-            return _tblStyle.getSwCell();
-        case neCell:
-            return _tblStyle.getNeCell();
-        case nwCell:
-            return _tblStyle.getNwCell();
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
deleted file mode 100644
index 410f841..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyleList;
-import org.openxmlformats.schemas.drawingml.x2006.main.TblStyleLstDocument;
-
-@Beta
-public class XSLFTableStyles extends POIXMLDocumentPart implements Iterable<XSLFTableStyle>{
-    private CTTableStyleList _tblStyleLst;
-    private List<XSLFTableStyle> _styles;
-
-    public XSLFTableStyles(){
-        super();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XSLFTableStyles(PackagePart part) throws IOException, XmlException {
-        super(part);
-
-        InputStream is = getPackagePart().getInputStream();
-        TblStyleLstDocument styleDoc = TblStyleLstDocument.Factory.parse(is);
-        is.close();
-        _tblStyleLst = styleDoc.getTblStyleLst();
-        CTTableStyle[] tblStyleArray = _tblStyleLst.getTblStyleArray();
-        _styles = new ArrayList<XSLFTableStyle>(tblStyleArray.length);
-        for(CTTableStyle c : tblStyleArray){
-            _styles.add(new XSLFTableStyle(c));
-        }
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XSLFTableStyles(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    public CTTableStyleList getXmlObject(){
-        return _tblStyleLst;
-    }
-
-    public Iterator<XSLFTableStyle> iterator(){
-        return _styles.iterator();
-    }
-
-    public List<XSLFTableStyle> getStyles(){
-        return Collections.unmodifiableList(_styles);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
deleted file mode 100644
index bb5bd42..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import org.apache.poi.sl.usermodel.TextBox;
-import org.apache.poi.util.Beta;
-import org.openxmlformats.schemas.drawingml.x2006.main.*;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShapeNonVisual;
-
-
-/**
- * @author Yegor Kozlov
- */
-@Beta
-public class XSLFTextBox extends XSLFAutoShape
-    implements TextBox<XSLFShape,XSLFTextParagraph> {
-
-    /*package*/ XSLFTextBox(CTShape shape, XSLFSheet sheet){
-        super(shape, sheet);
-    }
-
-    /**
-     *
-     * @param shapeId   1-based shapeId
-     */
-    static CTShape prototype(int shapeId){
-        CTShape ct = CTShape.Factory.newInstance();
-        CTShapeNonVisual nvSpPr = ct.addNewNvSpPr();
-        CTNonVisualDrawingProps cnv = nvSpPr.addNewCNvPr();
-        cnv.setName("TextBox " + shapeId);
-        cnv.setId(shapeId + 1);
-        nvSpPr.addNewCNvSpPr().setTxBox(true);
-        nvSpPr.addNewNvPr();
-        CTShapeProperties spPr = ct.addNewSpPr();
-        CTPresetGeometry2D prst = spPr.addNewPrstGeom();
-        prst.setPrst(STShapeType.RECT);
-        prst.addNewAvLst();
-        CTTextBody txBody = ct.addNewTxBody();
-        XSLFAutoShape.initTextBody(txBody);
-
-        return ct;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
deleted file mode 100644
index 38c2982..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
+++ /dev/null
@@ -1,1079 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Units;
-import org.apache.poi.xslf.model.ParagraphPropertyFetcher;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextAutonumberBullet;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletSizePercent;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBulletSizePoint;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharBullet;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextField;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextFont;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextLineBreak;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextNormalAutofit;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextSpacing;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextTabStop;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextTabStopList;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextAlignType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextAutonumberScheme;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextFontAlignType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
-
-/**
- * Represents a paragraph of text within the containing text body.
- * The paragraph is the highest level text separation mechanism.
- *
- * @since POI-3.8
- */
-@Beta
-public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagraph,XSLFTextRun> {
-    private final CTTextParagraph _p;
-    private final List<XSLFTextRun> _runs;
-    private final XSLFTextShape _shape;
-
-    XSLFTextParagraph(CTTextParagraph p, XSLFTextShape shape){
-        _p = p;
-        _runs = new ArrayList<XSLFTextRun>();
-        _shape = shape;
-
-        for(XmlObject ch : _p.selectPath("*")){
-            if(ch instanceof CTRegularTextRun){
-                CTRegularTextRun r = (CTRegularTextRun)ch;
-                _runs.add(newTextRun(r));
-            } else if (ch instanceof CTTextLineBreak){
-                CTTextLineBreak br = (CTTextLineBreak)ch;
-                CTRegularTextRun r = CTRegularTextRun.Factory.newInstance();
-                r.setRPr(br.getRPr());
-                r.setT("\n");
-                _runs.add(newTextRun(r));
-            } else if (ch instanceof CTTextField){
-                CTTextField f = (CTTextField)ch;
-                CTRegularTextRun r = CTRegularTextRun.Factory.newInstance();
-                r.setRPr(f.getRPr());
-                r.setT(f.getT());
-                _runs.add(newTextRun(r));
-            }
-        }
-    }
-
-    public String getText(){
-        StringBuilder out = new StringBuilder();
-        for (XSLFTextRun r : _runs) {
-            out.append(r.getRawText());
-        }
-        return out.toString();
-    }
-
-    String getRenderableText(){
-        StringBuilder out = new StringBuilder();
-        for (XSLFTextRun r : _runs) {
-            out.append(r.getRenderableText());
-        }
-        return out.toString();
-    }
-
-    @Internal
-    public CTTextParagraph getXmlObject(){
-        return _p;
-    }
-
-    public XSLFTextShape getParentShape() {
-        return _shape;
-
-    }
-
-    @Override
-    public List<XSLFTextRun> getTextRuns(){
-        return _runs;
-    }
-
-    public Iterator<XSLFTextRun> iterator(){
-        return _runs.iterator();
-    }
-
-    /**
-     * Add a new run of text
-     *
-     * @return a new run of text
-     */
-    public XSLFTextRun addNewTextRun(){
-        CTRegularTextRun r = _p.addNewR();
-        CTTextCharacterProperties rPr = r.addNewRPr();
-        rPr.setLang("en-US");
-        XSLFTextRun run = newTextRun(r);
-        _runs.add(run);
-        return run;
-    }
-
-    /**
-     * Insert a line break
-     *
-     * @return text run representing this line break ('\n')
-     */
-    public XSLFTextRun addLineBreak(){
-        CTTextLineBreak br = _p.addNewBr();
-        CTTextCharacterProperties brProps = br.addNewRPr();
-        if(_runs.size() > 0){
-            // by default line break has the font size of the last text run
-            CTTextCharacterProperties prevRun = _runs.get(_runs.size() - 1).getRPr(true);
-            brProps.set(prevRun);
-        }
-        CTRegularTextRun r = CTRegularTextRun.Factory.newInstance();
-        r.setRPr(brProps);
-        r.setT("\n");
-        XSLFTextRun run = new XSLFLineBreak(r, this, brProps);
-        _runs.add(run);
-        return run;
-    }
-
-    @Override
-    public TextAlign getTextAlign(){
-        ParagraphPropertyFetcher<TextAlign> fetcher = new ParagraphPropertyFetcher<TextAlign>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetAlgn()){
-                    TextAlign val = TextAlign.values()[props.getAlgn().intValue() - 1];
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    @Override
-    public void setTextAlign(TextAlign align) {
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(align == null) {
-            if(pr.isSetAlgn()) pr.unsetAlgn();
-        } else {
-            pr.setAlgn(STTextAlignType.Enum.forInt(align.ordinal() + 1));
-        }
-    }
-
-    @Override
-    public FontAlign getFontAlign(){
-        ParagraphPropertyFetcher<FontAlign> fetcher = new ParagraphPropertyFetcher<FontAlign>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetFontAlgn()){
-                    FontAlign val = FontAlign.values()[props.getFontAlgn().intValue() - 1];
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    /**
-     * Specifies the font alignment that is to be applied to the paragraph.
-     * Possible values for this include auto, top, center, baseline and bottom.
-     * see {@link org.apache.poi.sl.usermodel.TextParagraph.FontAlign}.
-     *
-     * @param align font align
-     */
-    public void setFontAlign(FontAlign align){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(align == null) {
-            if(pr.isSetFontAlgn()) pr.unsetFontAlgn();
-        } else {
-            pr.setFontAlgn(STTextFontAlignType.Enum.forInt(align.ordinal() + 1));
-        }
-    }
-
-    
-
-    /**
-     * @return the font to be used on bullet characters within a given paragraph
-     */
-    public String getBulletFont(){
-        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuFont()){
-                    setValue(props.getBuFont().getTypeface());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    public void setBulletFont(String typeface){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextFont font = pr.isSetBuFont() ? pr.getBuFont() : pr.addNewBuFont();
-        font.setTypeface(typeface);
-    }
-
-    /**
-     * @return the character to be used in place of the standard bullet point
-     */
-    public String getBulletCharacter(){
-        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuChar()){
-                    setValue(props.getBuChar().getChar());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    public void setBulletCharacter(String str){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextCharBullet c = pr.isSetBuChar() ? pr.getBuChar() : pr.addNewBuChar();
-        c.setChar(str);
-    }
-
-    /**
-     *
-     * @return the color of bullet characters within a given paragraph.
-     * A <code>null</code> value means to use the text font color.
-     */
-    public PaintStyle getBulletFontColor(){
-        final XSLFTheme theme = getParentShape().getSheet().getTheme();
-        ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuClr()){
-                    XSLFColor c = new XSLFColor(props.getBuClr(), theme, null);
-                    setValue(c.getColor());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        Color col = fetcher.getValue();
-        return (col == null) ? null : DrawPaint.createSolidPaint(col);
-    }
-
-    public void setBulletFontColor(Color color) {
-        setBulletFontColor(DrawPaint.createSolidPaint(color));
-    }
-    
-    
-    /**
-     * Set the color to be used on bullet characters within a given paragraph.
-     *
-     * @param color the bullet color
-     */
-    public void setBulletFontColor(PaintStyle color) {
-        if (!(color instanceof SolidPaint)) {
-            throw new IllegalArgumentException("Currently XSLF only supports SolidPaint");
-        }
-
-        // TODO: implement setting bullet color to null
-        SolidPaint sp = (SolidPaint)color;
-        Color col = DrawPaint.applyColorTransform(sp.getSolidColor());
-        
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTColor c = pr.isSetBuClr() ? pr.getBuClr() : pr.addNewBuClr();
-        CTSRgbColor clr = c.isSetSrgbClr() ? c.getSrgbClr() : c.addNewSrgbClr();
-        clr.setVal(new byte[]{(byte) col.getRed(), (byte) col.getGreen(), (byte) col.getBlue()});
-    }
-
-    /**
-     * Returns the bullet size that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If bulletSize >= 0, then bulletSize is a percentage of the font size.
-     * If bulletSize < 0, then it specifies the size in points
-     * </p>
-     *
-     * @return the bullet size
-     */
-    public Double getBulletFontSize(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuSzPct()){
-                    setValue(props.getBuSzPct().getVal() * 0.001);
-                    return true;
-                }
-                if(props.isSetBuSzPts()){
-                    setValue( - props.getBuSzPts().getVal() * 0.01);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    /**
-     * Sets the bullet size that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If bulletSize >= 0, then bulletSize is a percentage of the font size.
-     * If bulletSize < 0, then it specifies the size in points
-     * </p>
-     */
-    public void setBulletFontSize(double bulletSize){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-
-        if(bulletSize >= 0) {
-            CTTextBulletSizePercent pt = pr.isSetBuSzPct() ? pr.getBuSzPct() : pr.addNewBuSzPct();
-            pt.setVal((int)(bulletSize*1000));
-            if(pr.isSetBuSzPts()) pr.unsetBuSzPts();
-        } else {
-            CTTextBulletSizePoint pt = pr.isSetBuSzPts() ? pr.getBuSzPts() : pr.addNewBuSzPts();
-            pt.setVal((int)(-bulletSize*100));
-            if(pr.isSetBuSzPct()) pr.unsetBuSzPct();
-        }
-   }
-
-    /**
-     * @return the auto numbering scheme, or null if not defined
-     */
-    public AutoNumberingScheme getAutoNumberingScheme() {
-        ParagraphPropertyFetcher<AutoNumberingScheme> fetcher = new ParagraphPropertyFetcher<AutoNumberingScheme>(getIndentLevel()) {
-            public boolean fetch(CTTextParagraphProperties props) {
-                if (props.isSetBuAutoNum()) {
-                    AutoNumberingScheme ans = AutoNumberingScheme.forOoxmlID(props.getBuAutoNum().getType().intValue());
-                    if (ans != null) {
-                        setValue(ans);
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    /**
-     * @return the auto numbering starting number, or null if not defined
-     */
-    public Integer getAutoNumberingStartAt() {
-        ParagraphPropertyFetcher<Integer> fetcher = new ParagraphPropertyFetcher<Integer>(getIndentLevel()) {
-            public boolean fetch(CTTextParagraphProperties props) {
-                if (props.isSetBuAutoNum()) {
-                    if (props.getBuAutoNum().isSetStartAt()) {
-                        setValue(props.getBuAutoNum().getStartAt());
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-    
-    
-    @Override
-    public void setIndent(Double indent){
-        if ((indent == null) && !_p.isSetPPr()) return;
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(indent == null) {
-            if(pr.isSetIndent()) pr.unsetIndent();
-        } else {
-            pr.setIndent(Units.toEMU(indent));
-        }
-    }
-
-    @Override
-    public Double getIndent() {
-
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetIndent()){
-                    setValue(Units.toPoints(props.getIndent()));
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-
-        return fetcher.getValue();
-    }
-
-    @Override
-    public void setLeftMargin(Double leftMargin){
-        if (leftMargin == null && !_p.isSetPPr()) return;
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if (leftMargin == null) {
-            if(pr.isSetMarL()) pr.unsetMarL();
-        } else {
-            pr.setMarL(Units.toEMU(leftMargin));
-        }
-
-    }
-
-    /**
-     * @return the left margin (in points) of the paragraph, null if unset
-     */
-    @Override
-    public Double getLeftMargin(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetMarL()){
-                    double val = Units.toPoints(props.getMarL());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        // if the marL attribute is omitted, then a value of 347663 is implied
-        return fetcher.getValue();
-    }
-
-    @Override
-    public void setRightMargin(Double rightMargin){
-        if (rightMargin == null && !_p.isSetPPr()) return;
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(rightMargin == null) {
-            if(pr.isSetMarR()) pr.unsetMarR();
-        } else {
-            pr.setMarR(Units.toEMU(rightMargin));
-        }
-    }
-
-    /**
-     *
-     * @return the right margin of the paragraph, null if unset
-     */
-    @Override
-    public Double getRightMargin(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetMarR()){
-                    double val = Units.toPoints(props.getMarR());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    @Override
-    public Double getDefaultTabSize(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetDefTabSz()){
-                    double val = Units.toPoints(props.getDefTabSz());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    public double getTabStop(final int idx){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetTabLst()){
-                    CTTextTabStopList tabStops = props.getTabLst();
-                    if(idx < tabStops.sizeOfTabArray() ) {
-                        CTTextTabStop ts = tabStops.getTabArray(idx);
-                        double val = Units.toPoints(ts.getPos());
-                        setValue(val);
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? 0. : fetcher.getValue();
-    }
-
-    public void addTabStop(double value){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextTabStopList tabStops = pr.isSetTabLst() ? pr.getTabLst() : pr.addNewTabLst();
-        tabStops.addNewTab().setPos(Units.toEMU(value));
-    }
-
-    @Override
-    public void setLineSpacing(Double lineSpacing){
-        if (lineSpacing == null && !_p.isSetPPr()) return;
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(lineSpacing == null) {
-            if (pr.isSetLnSpc()) pr.unsetLnSpc();
-        } else {
-            CTTextSpacing spc = (pr.isSetLnSpc()) ? pr.getLnSpc() : pr.addNewLnSpc();
-            if (lineSpacing >= 0) {
-                (spc.isSetSpcPct() ? spc.getSpcPct() : spc.addNewSpcPct()).setVal((int)(lineSpacing*1000));
-                if (spc.isSetSpcPts()) spc.unsetSpcPts();
-            } else {
-                (spc.isSetSpcPts() ? spc.getSpcPts() : spc.addNewSpcPts()).setVal((int)(-lineSpacing*100));
-                if (spc.isSetSpcPct()) spc.unsetSpcPct();
-            }
-        }
-    }
-
-    @Override
-    public Double getLineSpacing(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetLnSpc()){
-                    CTTextSpacing spc = props.getLnSpc();
-
-                    if(spc.isSetSpcPct()) setValue( spc.getSpcPct().getVal()*0.001 );
-                    else if (spc.isSetSpcPts()) setValue( -spc.getSpcPts().getVal()*0.01 );
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-
-        Double lnSpc = fetcher.getValue();
-        if (lnSpc != null && lnSpc > 0) {
-            // check if the percentage value is scaled
-            CTTextNormalAutofit normAutofit = getParentShape().getTextBodyPr().getNormAutofit();
-            if(normAutofit != null) {
-                double scale = 1 - (double)normAutofit.getLnSpcReduction() / 100000;
-                lnSpc *= scale;
-            }
-        }
-        
-        return lnSpc;
-    }
-
-    @Override
-    public void setSpaceBefore(Double spaceBefore){
-        if (spaceBefore == null && !_p.isSetPPr()) {
-            return;
-        }
-
-        // unset the space before on null input
-        if (spaceBefore == null) {
-            if(_p.getPPr().isSetSpcBef()) {
-                _p.getPPr().unsetSpcBef();
-            }
-            return;
-        }
-
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextSpacing spc = CTTextSpacing.Factory.newInstance();
-
-        if(spaceBefore >= 0) {
-            spc.addNewSpcPct().setVal((int)(spaceBefore*1000));
-        } else {
-            spc.addNewSpcPts().setVal((int)(-spaceBefore*100));
-        }
-        pr.setSpcBef(spc);
-    }
-
-    @Override
-    public Double getSpaceBefore(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetSpcBef()){
-                    CTTextSpacing spc = props.getSpcBef();
-
-                    if(spc.isSetSpcPct()) setValue( spc.getSpcPct().getVal()*0.001 );
-                    else if (spc.isSetSpcPts()) setValue( -spc.getSpcPts().getVal()*0.01 );
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-
-        return fetcher.getValue();
-    }
-
-    @Override
-    public void setSpaceAfter(Double spaceAfter){
-        if (spaceAfter == null && !_p.isSetPPr()) {
-            return;
-        }
-
-        // unset the space before on null input
-        if (spaceAfter == null) {
-            if(_p.getPPr().isSetSpcAft()) {
-                _p.getPPr().unsetSpcAft();
-            }
-            return;
-        }
-
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextSpacing spc = CTTextSpacing.Factory.newInstance();
-
-        if(spaceAfter >= 0) {
-            spc.addNewSpcPct().setVal((int)(spaceAfter*1000));
-        } else {
-            spc.addNewSpcPts().setVal((int)(-spaceAfter*100));
-        }
-        pr.setSpcAft(spc);
-    }
-
-    @Override
-    public Double getSpaceAfter(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetSpcAft()){
-                    CTTextSpacing spc = props.getSpcAft();
-
-                    if(spc.isSetSpcPct()) setValue( spc.getSpcPct().getVal()*0.001 );
-                    else if (spc.isSetSpcPts()) setValue( -spc.getSpcPts().getVal()*0.01 );
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    @Override
-    public void setIndentLevel(int level){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        pr.setLvl(level);
-    }
-
-    @Override
-    public int getIndentLevel() {
-        CTTextParagraphProperties pr = _p.getPPr();
-        return (pr == null || !pr.isSetLvl()) ? 0 : pr.getLvl();
-    }
-
-    /**
-     * Returns whether this paragraph has bullets
-     */
-    public boolean isBullet() {
-        ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getIndentLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuNone()) {
-                    setValue(false);
-                    return true;
-                }
-                if(props.isSetBuFont() || props.isSetBuChar()){
-                    setValue(true);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    /**
-     *
-     * @param flag whether text in this paragraph has bullets
-     */
-    public void setBullet(boolean flag) {
-        if(isBullet() == flag) return;
-
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(flag) {
-            pr.addNewBuFont().setTypeface("Arial");
-            pr.addNewBuChar().setChar("\u2022");
-        } else {
-            if (pr.isSetBuFont()) pr.unsetBuFont();
-            if (pr.isSetBuChar()) pr.unsetBuChar();
-            if (pr.isSetBuAutoNum()) pr.unsetBuAutoNum();
-            if (pr.isSetBuBlip()) pr.unsetBuBlip();
-            if (pr.isSetBuClr()) pr.unsetBuClr();
-            if (pr.isSetBuClrTx()) pr.unsetBuClrTx();
-            if (pr.isSetBuFont()) pr.unsetBuFont();
-            if (pr.isSetBuFontTx()) pr.unsetBuFontTx();
-            if (pr.isSetBuSzPct()) pr.unsetBuSzPct();
-            if (pr.isSetBuSzPts()) pr.unsetBuSzPts();
-            if (pr.isSetBuSzTx()) pr.unsetBuSzTx();
-            pr.addNewBuNone();
-        }
-    }
-
-    /**
-     * Specifies that automatic numbered bullet points should be applied to this paragraph
-     *
-     * @param scheme type of auto-numbering
-     * @param startAt the number that will start number for a given sequence of automatically
-    numbered bullets (1-based).
-     */
-    public void setBulletAutoNumber(AutoNumberingScheme scheme, int startAt) {
-        if(startAt < 1) throw new IllegalArgumentException("Start Number must be greater or equal that 1") ;
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextAutonumberBullet lst = pr.isSetBuAutoNum() ? pr.getBuAutoNum() : pr.addNewBuAutoNum();
-        lst.setType(STTextAutonumberScheme.Enum.forInt(scheme.ooxmlId));
-        lst.setStartAt(startAt);
-    }
-
-    @Override
-    public String toString(){
-        return "[" + getClass() + "]" + getText();
-    }
-
-
-    /**
-     * @return master style text paragraph properties, or <code>null</code> if 
-     * there are no master slides or the master slides do not contain a text paragraph
-     */
-    /* package */ CTTextParagraphProperties getDefaultMasterStyle(){
-        CTPlaceholder ph = _shape.getCTPlaceholder();
-        String defaultStyleSelector;  
-        switch(ph == null ? -1 : ph.getType().intValue()) {
-            case STPlaceholderType.INT_TITLE:
-            case STPlaceholderType.INT_CTR_TITLE:
-                defaultStyleSelector = "titleStyle";
-                break;
-            case -1: // no placeholder means plain text box
-            case STPlaceholderType.INT_FTR:
-            case STPlaceholderType.INT_SLD_NUM:
-            case STPlaceholderType.INT_DT:
-                defaultStyleSelector = "otherStyle";
-                break;
-            default:
-                defaultStyleSelector = "bodyStyle";
-                break;
-        }
-        int level = getIndentLevel();
-
-        // wind up and find the root master sheet which must be slide master
-        final String nsPML = "http://schemas.openxmlformats.org/presentationml/2006/main";
-        final String nsDML = "http://schemas.openxmlformats.org/drawingml/2006/main";
-        XSLFSheet masterSheet = _shape.getSheet();
-        for (XSLFSheet m = masterSheet; m != null; m = (XSLFSheet)m.getMasterSheet()) {
-            masterSheet = m;
-            XmlObject xo = masterSheet.getXmlObject();
-            XmlCursor cur = xo.newCursor();
-            try {
-                cur.push();
-                if ((cur.toChild(nsPML, "txStyles") && cur.toChild(nsPML, defaultStyleSelector)) ||
-            		(cur.pop() && cur.toChild(nsPML, "notesStyle"))) {
-                    while (level >= 0) {
-                        cur.push();
-                    	if (cur.toChild(nsDML, "lvl" +(level+1)+ "pPr")) {
-                    		return (CTTextParagraphProperties)cur.getObject();
-                    	}
-                    	cur.pop();
-                    	level--;
-                    }
-                }
-            } finally {
-            	cur.dispose();
-            }
-        }
-        
-        return null;
-    }
-
-    private <T> boolean fetchParagraphProperty(ParagraphPropertyFetcher<T> visitor){
-        boolean ok = false;
-        XSLFTextShape shape = getParentShape();
-        XSLFSheet sheet = shape.getSheet();
-        
-        if(_p.isSetPPr()) ok = visitor.fetch(_p.getPPr());
-        if (ok) return true;
-
-        ok = shape.fetchShapeProperty(visitor);
-        if (ok) return true;
-                
-        
-        CTPlaceholder ph = shape.getCTPlaceholder();
-        if(ph == null){
-            // if it is a plain text box then take defaults from presentation.xml
-            @SuppressWarnings("resource")
-            XMLSlideShow ppt = sheet.getSlideShow();
-            CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(getIndentLevel());
-            if (themeProps != null) ok = visitor.fetch(themeProps);
-        }
-        if (ok) return true;
-
-        // defaults for placeholders are defined in the slide master
-        CTTextParagraphProperties defaultProps = getDefaultMasterStyle();
-        // TODO: determine master shape
-        if(defaultProps != null) ok = visitor.fetch(defaultProps);
-        if (ok) return true;
-
-        return false;
-    }
-
-    void copy(XSLFTextParagraph other){
-        if (other == this) return;
-        
-        CTTextParagraph thisP = getXmlObject();
-        CTTextParagraph otherP = other.getXmlObject();
-        
-        if (thisP.isSetPPr()) thisP.unsetPPr();
-        if (thisP.isSetEndParaRPr()) thisP.unsetEndParaRPr();
-        
-        _runs.clear();
-        for (int i=thisP.sizeOfBrArray(); i>0; i--) {
-            thisP.removeBr(i-1);
-        }
-        for (int i=thisP.sizeOfRArray(); i>0; i--) {
-            thisP.removeR(i-1);
-        }
-        for (int i=thisP.sizeOfFldArray(); i>0; i--) {
-            thisP.removeFld(i-1);
-        }
-
-        XmlCursor thisC = thisP.newCursor();
-        thisC.toEndToken();
-        XmlCursor otherC = otherP.newCursor();
-        otherC.copyXmlContents(thisC);
-        otherC.dispose();
-        thisC.dispose();
-        
-        List<XSLFTextRun> otherRs = other.getTextRuns();
-        int i=0;
-        for(CTRegularTextRun rtr : thisP.getRArray()) {
-            XSLFTextRun run = newTextRun(rtr);
-            run.copy(otherRs.get(i++));
-            _runs.add(run);
-        }
-        
-        
-        // set properties again, in case we are based on a different
-        // template
-        TextAlign srcAlign = other.getTextAlign();
-        if(srcAlign != getTextAlign()){
-            setTextAlign(srcAlign);
-        }
-
-        boolean isBullet = other.isBullet();
-        if(isBullet != isBullet()){
-            setBullet(isBullet);
-            if(isBullet) {
-                String buFont = other.getBulletFont();
-                if(buFont != null && !buFont.equals(getBulletFont())){
-                    setBulletFont(buFont);
-                }
-                String buChar = other.getBulletCharacter();
-                if(buChar != null && !buChar.equals(getBulletCharacter())){
-                    setBulletCharacter(buChar);
-                }
-                PaintStyle buColor = other.getBulletFontColor();
-                if(buColor != null && !buColor.equals(getBulletFontColor())){
-                    setBulletFontColor(buColor);
-                }
-                Double buSize = other.getBulletFontSize();
-                if(!doubleEquals(buSize, getBulletFontSize())){
-                    setBulletFontSize(buSize);
-                }
-            }
-        }
-
-        Double leftMargin = other.getLeftMargin();
-        if (!doubleEquals(leftMargin, getLeftMargin())){
-            setLeftMargin(leftMargin);
-        }
-
-        Double indent = other.getIndent();
-        if (!doubleEquals(indent, getIndent())) {
-            setIndent(indent);
-        }
-
-        Double spaceAfter = other.getSpaceAfter();
-        if (!doubleEquals(spaceAfter, getSpaceAfter())) {
-            setSpaceAfter(spaceAfter);
-        }
-        
-        Double spaceBefore = other.getSpaceBefore();
-        if (!doubleEquals(spaceBefore, getSpaceBefore())) {
-            setSpaceBefore(spaceBefore);
-        }
-        
-        Double lineSpacing = other.getLineSpacing();
-        if (!doubleEquals(lineSpacing, getLineSpacing())) {
-            setLineSpacing(lineSpacing);
-        }
-    }
-
-    private static boolean doubleEquals(Double d1, Double d2) {
-        return (d1 == d2 || (d1 != null && d1.equals(d2)));
-    }
-    
-    @Override
-    public Double getDefaultFontSize() {
-        CTTextCharacterProperties endPr = _p.getEndParaRPr();
-        if (endPr == null || !endPr.isSetSz()) {
-            // inherit the font size from the master style
-            CTTextParagraphProperties masterStyle = getDefaultMasterStyle();
-            if (masterStyle != null) {
-                endPr = masterStyle.getDefRPr();
-            }
-        }
-        return (endPr == null || !endPr.isSetSz()) ? 12 : (endPr.getSz() / 100.);
-    }
-
-    @Override
-    public String getDefaultFontFamily() {
-        return (_runs.isEmpty() ? "Arial" : _runs.get(0).getFontFamily());
-    }
-
-    @Override
-    public BulletStyle getBulletStyle() {
-        if (!isBullet()) return null;
-        return new BulletStyle(){
-            @Override
-            public String getBulletCharacter() {
-                return XSLFTextParagraph.this.getBulletCharacter();
-            }
-
-            @Override
-            public String getBulletFont() {
-                return XSLFTextParagraph.this.getBulletFont();
-            }
-
-            @Override
-            public Double getBulletFontSize() {
-                return XSLFTextParagraph.this.getBulletFontSize();
-            }
-
-            @Override
-            public PaintStyle getBulletFontColor() {
-                return XSLFTextParagraph.this.getBulletFontColor();
-            }
-            
-            @Override
-            public void setBulletFontColor(Color color) {
-                setBulletFontColor(DrawPaint.createSolidPaint(color));
-            }
-
-            @Override
-            public void setBulletFontColor(PaintStyle color) {
-                XSLFTextParagraph.this.setBulletFontColor(color);
-            }
-            
-            @Override
-            public AutoNumberingScheme getAutoNumberingScheme() {
-                return XSLFTextParagraph.this.getAutoNumberingScheme();
-            }
-
-            @Override
-            public Integer getAutoNumberingStartAt() {
-                return XSLFTextParagraph.this.getAutoNumberingStartAt();
-            }
-
-        };
-    }
-
-    @Override
-    public void setBulletStyle(Object... styles) {
-        if (styles.length == 0) {
-            setBullet(false);
-        } else {
-            setBullet(true);
-            for (Object ostyle : styles) {
-                if (ostyle instanceof Number) {
-                    setBulletFontSize(((Number)ostyle).doubleValue());
-                } else if (ostyle instanceof Color) {
-                    setBulletFontColor((Color)ostyle);
-                } else if (ostyle instanceof Character) {
-                    setBulletCharacter(ostyle.toString());
-                } else if (ostyle instanceof String) {
-                    setBulletFont((String)ostyle);
-                } else if (ostyle instanceof AutoNumberingScheme) {
-                    setBulletAutoNumber((AutoNumberingScheme)ostyle, 0);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Helper method for appending text and keeping paragraph and character properties.
-     * The character properties are moved to the end paragraph marker
-     */
-    /* package */ void clearButKeepProperties() {
-        CTTextParagraph thisP = getXmlObject();
-        for (int i=thisP.sizeOfBrArray(); i>0; i--) {
-            thisP.removeBr(i-1);
-        }
-        for (int i=thisP.sizeOfFldArray(); i>0; i--) {
-            thisP.removeFld(i-1);
-        }
-        if (!_runs.isEmpty()) {
-            int size = _runs.size();
-            XSLFTextRun lastRun = _runs.get(size-1);
-            CTTextCharacterProperties cpOther = lastRun.getRPr(false);
-            if (cpOther != null) {
-                if (thisP.isSetEndParaRPr()) {
-                    thisP.unsetEndParaRPr();
-                }
-                CTTextCharacterProperties cp = thisP.addNewEndParaRPr();
-                cp.set(cpOther);
-            }
-            for (int i=size; i>0; i--) {
-                thisP.removeR(i-1);
-            }
-            _runs.clear();
-        }
-    }
-
-    @Override
-    public boolean isHeaderOrFooter() {
-        CTPlaceholder ph = _shape.getCTPlaceholder();
-        int phId = (ph == null ? -1 : ph.getType().intValue());
-        switch (phId) {
-            case STPlaceholderType.INT_SLD_NUM:
-            case STPlaceholderType.INT_DT:
-            case STPlaceholderType.INT_FTR:
-            case STPlaceholderType.INT_HDR:
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Helper method to allow subclasses to provide their own text run
-     *
-     * @param r the xml reference
-     * 
-     * @return a new text paragraph
-     * 
-     * @since POI 3.15-beta2
-     */
-    protected XSLFTextRun newTextRun(CTRegularTextRun r) {
-        return new XSLFTextRun(r, this);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
deleted file mode 100644
index b0bbd45..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Color;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.util.Beta;
-import org.apache.poi.xslf.model.CharacterPropertyFetcher;
-import org.apache.poi.xslf.usermodel.XSLFPropertiesDelegate.XSLFFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTHyperlink;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextFont;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextNormalAutofit;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextStrikeType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-
-/**
- * Represents a run of text within the containing text body. The run element is the
- * lowest level text separation mechanism within a text body.
- */
-@Beta
-public class XSLFTextRun implements TextRun {
-    private final CTRegularTextRun _r;
-    private final XSLFTextParagraph _p;
-
-    protected XSLFTextRun(CTRegularTextRun r, XSLFTextParagraph p){
-        _r = r;
-        _p = p;
-    }
-
-    XSLFTextParagraph getParentParagraph(){
-        return _p;
-    }
-
-    public String getRawText(){
-        return _r.getT();
-    }
-
-    String getRenderableText(){
-        String txt = _r.getT();
-        TextCap cap = getTextCap();
-        StringBuffer buf = new StringBuffer();
-        for(int i = 0; i < txt.length(); i++) {
-            char c = txt.charAt(i);
-            if(c == '\t') {
-                // TODO: finish support for tabs
-                buf.append("  ");
-            } else {
-                switch (cap){
-                    case ALL:
-                        buf.append(Character.toUpperCase(c));
-                        break;
-                    case SMALL:
-                        buf.append(Character.toLowerCase(c));
-                        break;
-                    default:
-                        buf.append(c);
-                }
-            }
-        }
-
-        return buf.toString();
-    }
-
-    public void setText(String text){
-        _r.setT(text);
-    }
-
-    public CTRegularTextRun getXmlObject(){
-        return _r;
-    }
-
-    @Override
-    public void setFontColor(Color color) {
-        setFontColor(DrawPaint.createSolidPaint(color));
-    }
-    
-    @Override
-    public void setFontColor(PaintStyle color) {
-        if (!(color instanceof SolidPaint)) {
-            throw new IllegalArgumentException("Currently only SolidPaint is supported!");
-        }
-        SolidPaint sp = (SolidPaint)color;
-        Color c = DrawPaint.applyColorTransform(sp.getSolidColor());
-        
-        CTTextCharacterProperties rPr = getRPr(true);
-        CTSolidColorFillProperties fill = rPr.isSetSolidFill() ? rPr.getSolidFill() : rPr.addNewSolidFill();
-        
-        XSLFColor col = new XSLFColor(fill, getParentParagraph().getParentShape().getSheet().getTheme(), fill.getSchemeClr());
-        col.setColor(c);
-    }
-
-    @Override
-    public PaintStyle getFontColor(){
-        CharacterPropertyFetcher<PaintStyle> fetcher = new CharacterPropertyFetcher<PaintStyle>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props == null) {
-                    return false;
-                }
-                
-                XSLFShape shape = _p.getParentShape();
-                CTShapeStyle style = shape.getSpStyle();
-                CTSchemeColor phClr = null;
-                if (style != null && style.getFontRef() != null) {
-                    phClr = style.getFontRef().getSchemeClr();
-                }
-
-                XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(props);
-                XSLFSheet sheet = shape.getSheet();
-                PackagePart pp = sheet.getPackagePart();
-                XSLFTheme theme = sheet.getTheme();
-                PaintStyle ps = XSLFShape.selectPaint(fp, phClr, pp, theme);
-                
-                if (ps != null)  {
-                    setValue(ps);
-                    return true;
-                }
-                
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    @Override
-    public void setFontSize(Double fontSize){
-        CTTextCharacterProperties rPr = getRPr(true);
-        if(fontSize == null) {
-            if (rPr.isSetSz()) rPr.unsetSz();
-        } else {
-            if (fontSize < 1.0) {
-                throw new IllegalArgumentException("Minimum font size is 1pt but was " + fontSize);
-            }
-
-            rPr.setSz((int)(100*fontSize));
-        }
-    }
-
-    @Override
-    public Double getFontSize(){
-        double scale = 1;
-        CTTextNormalAutofit afit = getParentParagraph().getParentShape().getTextBodyPr().getNormAutofit();
-        if(afit != null) scale = (double)afit.getFontScale() / 100000;
-
-        CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetSz()) {
-                    setValue(props.getSz()*0.01);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? null : fetcher.getValue()*scale;
-    }
-
-    /**
-     *
-     * @return the spacing between characters within a text run,
-     * If this attribute is omitted than a value of 0 or no adjustment is assumed.
-     */
-    public double getCharacterSpacing(){
-
-        CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetSpc()) {
-                    setValue(props.getSpc()*0.01);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? 0 : fetcher.getValue();
-    }
-
-    /**
-     * Set the spacing between characters within a text run.
-     * <p>
-     * The spacing is specified in points. Positive values will cause the text to expand,
-     * negative values to condense.
-     * </p>
-     *
-     * @param spc  character spacing in points.
-     */
-    public void setCharacterSpacing(double spc){
-        CTTextCharacterProperties rPr = getRPr(true);
-        if(spc == 0.0) {
-            if(rPr.isSetSpc()) rPr.unsetSpc();
-        } else {
-            rPr.setSpc((int)(100*spc));
-        }
-    }
-
-    @Override
-    public void setFontFamily(String typeface){
-        setFontFamily(typeface, (byte)-1, (byte)-1, false);
-    }
-
-    public void setFontFamily(String typeface, byte charset, byte pictAndFamily, boolean isSymbol){
-        CTTextCharacterProperties rPr = getRPr(true);
-
-        if(typeface == null){
-            if(rPr.isSetLatin()) rPr.unsetLatin();
-            if(rPr.isSetCs()) rPr.unsetCs();
-            if(rPr.isSetSym()) rPr.unsetSym();
-        } else {
-            if(isSymbol){
-                CTTextFont font = rPr.isSetSym() ? rPr.getSym() : rPr.addNewSym();
-                font.setTypeface(typeface);
-            } else {
-                CTTextFont latin = rPr.isSetLatin() ? rPr.getLatin() : rPr.addNewLatin();
-                latin.setTypeface(typeface);
-                if(charset != -1) latin.setCharset(charset);
-                if(pictAndFamily != -1) latin.setPitchFamily(pictAndFamily);
-            }
-        }
-    }
-
-    @Override
-    public String getFontFamily(){
-        final XSLFTheme theme = _p.getParentShape().getSheet().getTheme();
-
-        CharacterPropertyFetcher<String> visitor = new CharacterPropertyFetcher<String>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null) {
-                    CTTextFont font = props.getLatin();
-                    if (font != null) {
-                        String typeface = font.getTypeface();
-                        if("+mj-lt".equals(typeface)) {
-                            typeface = theme.getMajorFont();
-                        } else if ("+mn-lt".equals(typeface)){
-                            typeface = theme.getMinorFont();
-                        }
-                        setValue(typeface);
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(visitor);
-
-        return  visitor.getValue();
-    }
-
-    public byte getPitchAndFamily(){
-        // final XSLFTheme theme = _p.getParentShape().getSheet().getTheme();
-
-        CharacterPropertyFetcher<Byte> visitor = new CharacterPropertyFetcher<Byte>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null) {
-                    CTTextFont font = props.getLatin();
-                    if (font != null) {
-                        setValue(font.getPitchFamily());
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(visitor);
-
-        return  visitor.getValue() == null ? 0 : visitor.getValue();
-    }
-
-    @Override
-    public void setStrikethrough(boolean strike) {
-        getRPr(true).setStrike(strike ? STTextStrikeType.SNG_STRIKE : STTextStrikeType.NO_STRIKE);
-    }
-
-    @Override
-    public boolean isStrikethrough() {
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if(props != null && props.isSetStrike()) {
-                    setValue(props.getStrike() != STTextStrikeType.NO_STRIKE);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    @Override
-    public boolean isSuperscript() {
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetBaseline()) {
-                    setValue(props.getBaseline() > 0);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    /**
-     *  Set the baseline for both the superscript and subscript fonts.
-     *  <p>
-     *     The size is specified using a percentage.
-     *     Positive values indicate superscript, negative values indicate subscript.
-     *  </p>
-     *
-     * @param baselineOffset
-     */
-    public void setBaselineOffset(double baselineOffset){
-       getRPr(true).setBaseline((int) baselineOffset * 1000);
-    }
-
-    /**
-     * Set whether the text in this run is formatted as superscript.
-     * Default base line offset is 30%
-     *
-     * @see #setBaselineOffset(double)
-     */
-    public void setSuperscript(boolean flag){
-        setBaselineOffset(flag ? 30. : 0.);
-    }
-
-    /**
-     * Set whether the text in this run is formatted as subscript.
-     * Default base line offset is -25%.
-     *
-     * @see #setBaselineOffset(double)
-     */
-    public void setSubscript(boolean flag){
-        setBaselineOffset(flag ? -25.0 : 0.);
-    }
-
-    @Override
-    public boolean isSubscript() {
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetBaseline()) {
-                    setValue(props.getBaseline() < 0);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    /**
-     * @return whether a run of text will be formatted as a superscript text. Default is false.
-     */
-    public TextCap getTextCap() {
-        CharacterPropertyFetcher<TextCap> fetcher = new CharacterPropertyFetcher<TextCap>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetCap()) {
-                    int idx = props.getCap().intValue() - 1;
-                    setValue(TextCap.values()[idx]);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? TextCap.NONE : fetcher.getValue();
-    }
-
-    @Override
-    public void setBold(boolean bold){
-        getRPr(true).setB(bold);
-    }
-
-    @Override
-    public boolean isBold(){
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetB()) {
-                    setValue(props.getB());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    @Override
-    public void setItalic(boolean italic){
-        getRPr(true).setI(italic);
-    }
-
-    @Override
-    public boolean isItalic(){
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetI()) {
-                    setValue(props.getI());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    @Override
-    public void setUnderlined(boolean underline) {
-        getRPr(true).setU(underline ? STTextUnderlineType.SNG : STTextUnderlineType.NONE);
-    }
-
-    @Override
-    public boolean isUnderlined(){
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
-            public boolean fetch(CTTextCharacterProperties props){
-                if (props != null && props.isSetU()) {
-                    setValue(props.getU() != STTextUnderlineType.NONE);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchCharacterProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    /**
-     * Return the character properties
-     *
-     * @param create if true, create an empty character properties object if it doesn't exist
-     * @return the character properties or null if create was false and the properties haven't exist
-     */
-    protected CTTextCharacterProperties getRPr(boolean create) {
-        if (_r.isSetRPr()) {
-            return _r.getRPr();
-        } else if (create) {
-            return _r.addNewRPr();
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String toString(){
-        return "[" + getClass() + "]" + getRawText();
-    }
-
-    @Override
-    public XSLFHyperlink createHyperlink(){
-        XSLFHyperlink hl = getHyperlink();
-        if (hl == null) {
-            hl = new XSLFHyperlink(_r.getRPr().addNewHlinkClick(), _p.getParentShape().getSheet());
-        }
-        return hl;
-    }
-
-    @Override
-    public XSLFHyperlink getHyperlink(){
-        CTTextCharacterProperties rPr = _r.getRPr();
-        if (rPr == null) { 
-            return null;
-        }
-        CTHyperlink hl = rPr.getHlinkClick();
-        if (hl == null) {
-            return null;
-        }
-        return new XSLFHyperlink(hl, _p.getParentShape().getSheet());
-    }
-
-    private boolean fetchCharacterProperty(CharacterPropertyFetcher<?> fetcher){
-        XSLFTextShape shape = _p.getParentShape();
-        XSLFSheet sheet = shape.getSheet();
-        boolean ok = false;
-
-        if (_r.isSetRPr()) ok = fetcher.fetch(getRPr(false));
-        if (ok) return true;
-        
-        ok = shape.fetchShapeProperty(fetcher);
-        if (ok) return true;
-        
-        CTPlaceholder ph = shape.getCTPlaceholder();
-        if (ph == null){
-            // if it is a plain text box then take defaults from presentation.xml
-            @SuppressWarnings("resource")
-            XMLSlideShow ppt = sheet.getSlideShow();
-            CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(_p.getIndentLevel());
-            if (themeProps != null) {
-                // TODO: determine master shape
-                ok = fetcher.fetch(themeProps);
-            }
-        }
-        if (ok) return true;
-
-        CTTextParagraphProperties defaultProps =  _p.getDefaultMasterStyle();
-        if(defaultProps != null) {
-            // TODO: determine master shape
-            ok = fetcher.fetch(defaultProps);
-        }
-        if (ok) return true;
-
-        return false;
-    }
-
-    void copy(XSLFTextRun r){
-        String srcFontFamily = r.getFontFamily();
-        if(srcFontFamily != null && !srcFontFamily.equals(getFontFamily())){
-            setFontFamily(srcFontFamily);
-        }
-
-        PaintStyle srcFontColor = r.getFontColor();
-        if(srcFontColor != null && !srcFontColor.equals(getFontColor())){
-            setFontColor(srcFontColor);
-        }
-
-        double srcFontSize = r.getFontSize();
-        if(srcFontSize  != getFontSize()){
-            setFontSize(srcFontSize);
-        }
-
-        boolean bold = r.isBold();
-        if(bold != isBold()) setBold(bold);
-
-        boolean italic = r.isItalic();
-        if(italic != isItalic()) setItalic(italic);
-
-        boolean underline = r.isUnderlined();
-        if(underline != isUnderlined()) setUnderlined(underline);
-
-        boolean strike = r.isStrikethrough();
-        if(strike != isStrikethrough()) setStrikethrough(strike);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
deleted file mode 100644
index 91b0869..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.DrawTextShape;
-import org.apache.poi.sl.usermodel.Insets2D;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.TextShape;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Units;
-import org.apache.poi.xslf.model.PropertyFetcher;
-import org.apache.poi.xslf.model.TextBodyPropertyFetcher;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextListStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextAnchoringType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextVerticalType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextWrappingType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-
-/**
- * Represents a shape that can hold text.
- */
-@Beta
-public abstract class XSLFTextShape extends XSLFSimpleShape
-    implements TextShape<XSLFShape,XSLFTextParagraph> {
-    private final List<XSLFTextParagraph> _paragraphs;
-
-    /*package*/ XSLFTextShape(XmlObject shape, XSLFSheet sheet) {
-        super(shape, sheet);
-
-        _paragraphs = new ArrayList<XSLFTextParagraph>();
-        CTTextBody txBody = getTextBody(false);
-        if (txBody != null) {
-            for (CTTextParagraph p : txBody.getPArray()) {
-                _paragraphs.add(newTextParagraph(p));
-            }
-        }
-    }
-
-    public Iterator<XSLFTextParagraph> iterator(){
-        return getTextParagraphs().iterator();
-    }
-
-    @Override
-    public String getText() {
-        StringBuilder out = new StringBuilder();
-        for (XSLFTextParagraph p : _paragraphs) {
-            if (out.length() > 0) out.append('\n');
-            out.append(p.getText());
-        }
-        return out.toString();
-    }
-
-    /**
-     * unset text from this shape
-     */
-    public void clearText(){
-        _paragraphs.clear();
-        CTTextBody txBody = getTextBody(true);
-        txBody.setPArray(null); // remove any existing paragraphs
-    }
-
-    @Override
-    public XSLFTextRun setText(String text) {
-        // calling clearText or setting to a new Array leads to a XmlValueDisconnectedException
-        if (!_paragraphs.isEmpty()) {
-            CTTextBody txBody = getTextBody(false);
-            int cntPs = txBody.sizeOfPArray();
-            for (int i = cntPs; i > 1; i--) {
-                txBody.removeP(i-1);
-                _paragraphs.remove(i-1);
-            }
-
-            _paragraphs.get(0).clearButKeepProperties();
-        }
-
-        return appendText(text, false);
-    }
-
-    @Override
-    public XSLFTextRun appendText(String text, boolean newParagraph) {
-        if (text == null) return null;
-
-        // copy properties from last paragraph / textrun or paragraph end marker
-        CTTextParagraphProperties otherPPr = null;
-        CTTextCharacterProperties otherRPr = null;
-
-        boolean firstPara;
-        XSLFTextParagraph para;
-        if (_paragraphs.isEmpty()) {
-            firstPara = false;
-            para = null;
-        } else {
-            firstPara = !newParagraph;
-            para = _paragraphs.get(_paragraphs.size()-1);
-            CTTextParagraph ctp = para.getXmlObject();
-            otherPPr = ctp.getPPr();
-            List<XSLFTextRun> runs = para.getTextRuns();
-            if (!runs.isEmpty()) {
-                XSLFTextRun r0 = runs.get(runs.size()-1);
-                otherRPr = r0.getRPr(false);
-                if (otherRPr == null) {
-                    otherRPr = ctp.getEndParaRPr();
-                }
-            }
-            // don't copy endParaRPr to the run in case there aren't any other runs
-            // this is the case when setText() was called initially
-            // otherwise the master style will be overridden/ignored
-        }
-
-        XSLFTextRun run = null;
-        for (String lineTxt : text.split("\\r\\n?|\\n")) {
-            if (!firstPara) {
-                if (para != null) {
-                    CTTextParagraph ctp = para.getXmlObject();
-                    CTTextCharacterProperties unexpectedRPr = ctp.getEndParaRPr();
-                    if (unexpectedRPr != null && unexpectedRPr != otherRPr) {
-                        ctp.unsetEndParaRPr();
-                    }
-                }
-                para = addNewTextParagraph();
-                if (otherPPr != null) {
-                    para.getXmlObject().setPPr(otherPPr);
-                }
-            }
-            boolean firstRun = true;
-            for (String runText : lineTxt.split("[\u000b]")) {
-                if (!firstRun) {
-                    para.addLineBreak();
-                }
-                run = para.addNewTextRun();
-                run.setText(runText);
-                if (otherRPr != null) {
-                    run.getRPr(true).set(otherRPr);
-                }
-                firstRun = false;
-            }
-            firstPara = false;
-        }
-
-        assert(run != null);
-        return run;
-    }
-
-    @Override
-    public List<XSLFTextParagraph> getTextParagraphs() {
-        return _paragraphs;
-    }
-
-    /**
-     * add a new paragraph run to this shape
-     *
-     * @return created paragraph run
-     */
-    public XSLFTextParagraph addNewTextParagraph() {
-        CTTextBody txBody = getTextBody(false);
-        CTTextParagraph p;
-        if (txBody == null) {
-            txBody = getTextBody(true);
-            p = txBody.getPArray(0);
-            p.removeR(0);
-        } else {
-            p = txBody.addNewP();
-        }
-        XSLFTextParagraph paragraph = newTextParagraph(p);
-        _paragraphs.add(paragraph);
-        return paragraph;
-    }
-
-    @Override
-    public void setVerticalAlignment(VerticalAlignment anchor){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-             if(anchor == null) {
-                if(bodyPr.isSetAnchor()) bodyPr.unsetAnchor();
-            } else {
-                bodyPr.setAnchor(STTextAnchoringType.Enum.forInt(anchor.ordinal() + 1));
-            }
-        }
-    }
-
-    @Override
-    public VerticalAlignment getVerticalAlignment(){
-        PropertyFetcher<VerticalAlignment> fetcher = new TextBodyPropertyFetcher<VerticalAlignment>(){
-            public boolean fetch(CTTextBodyProperties props){
-                if(props.isSetAnchor()){
-                    int val = props.getAnchor().intValue();
-                    setValue(VerticalAlignment.values()[val - 1]);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        return fetcher.getValue() == null ? VerticalAlignment.TOP : fetcher.getValue();
-    }
-
-    @Override
-    public void setHorizontalCentered(Boolean isCentered){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-             if (isCentered == null) {
-                if (bodyPr.isSetAnchorCtr()) bodyPr.unsetAnchorCtr();
-            } else {
-                bodyPr.setAnchorCtr(isCentered);
-            }
-        }
-    }
-
-    @Override
-    public boolean isHorizontalCentered(){
-        PropertyFetcher<Boolean> fetcher = new TextBodyPropertyFetcher<Boolean>(){
-            public boolean fetch(CTTextBodyProperties props){
-                if(props.isSetAnchorCtr()){
-                    setValue(props.getAnchorCtr());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-
-    @Override
-    public void setTextDirection(TextDirection orientation){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            if(orientation == null) {
-                if(bodyPr.isSetVert()) bodyPr.unsetVert();
-            } else {
-                bodyPr.setVert(STTextVerticalType.Enum.forInt(orientation.ordinal() + 1));
-            }
-        }
-    }
-
-    @Override
-    public TextDirection getTextDirection(){
-        CTTextBodyProperties bodyPr = getTextBodyPr();
-        if (bodyPr != null) {
-            STTextVerticalType.Enum val = bodyPr.getVert();
-            if(val != null) {
-                switch (val.intValue()) {
-                    default:
-                    case STTextVerticalType.INT_HORZ:
-                        return TextDirection.HORIZONTAL;
-                    case STTextVerticalType.INT_EA_VERT:
-                    case STTextVerticalType.INT_MONGOLIAN_VERT:
-                    case STTextVerticalType.INT_VERT:
-                        return TextDirection.VERTICAL;
-                    case STTextVerticalType.INT_VERT_270:
-                        return TextDirection.VERTICAL_270;
-                    case STTextVerticalType.INT_WORD_ART_VERT_RTL:
-                    case STTextVerticalType.INT_WORD_ART_VERT:
-                        return TextDirection.STACKED;
-                }
-            }
-        }
-        return TextDirection.HORIZONTAL;
-    }
-
-    @Override
-    public Double getTextRotation() {
-        CTTextBodyProperties bodyPr = getTextBodyPr();
-        if (bodyPr != null && bodyPr.isSetRot()) {
-            return bodyPr.getRot() / 60000.;
-        }
-        return null;
-    }
-
-    @Override
-    public void setTextRotation(Double rotation) {
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            bodyPr.setRot((int)(rotation * 60000.));
-        }
-    }
-
-
-    /**
-     * Returns the distance (in points) between the bottom of the text frame
-     * and the bottom of the inscribed rectangle of the shape that contains the text.
-     *
-     * @return the bottom inset in points
-     */
-    public double getBottomInset(){
-        PropertyFetcher<Double> fetcher = new TextBodyPropertyFetcher<Double>(){
-            public boolean fetch(CTTextBodyProperties props){
-                if(props.isSetBIns()){
-                    double val = Units.toPoints(props.getBIns());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        // If this attribute is omitted, then a value of 0.05 inches is implied
-        return fetcher.getValue() == null ? 3.6 : fetcher.getValue();
-    }
-
-    /**
-     *  Returns the distance (in points) between the left edge of the text frame
-     *  and the left edge of the inscribed rectangle of the shape that contains
-     *  the text.
-     *
-     * @return the left inset in points
-     */
-    public double getLeftInset(){
-        PropertyFetcher<Double> fetcher = new TextBodyPropertyFetcher<Double>(){
-            public boolean fetch(CTTextBodyProperties props){
-                if(props.isSetLIns()){
-                    double val = Units.toPoints(props.getLIns());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        // If this attribute is omitted, then a value of 0.1 inches is implied
-        return fetcher.getValue() == null ? 7.2 : fetcher.getValue();
-    }
-
-    /**
-     *  Returns the distance (in points) between the right edge of the
-     *  text frame and the right edge of the inscribed rectangle of the shape
-     *  that contains the text.
-     *
-     * @return the right inset in points
-     */
-    public double getRightInset(){
-        PropertyFetcher<Double> fetcher = new TextBodyPropertyFetcher<Double>(){
-            public boolean fetch(CTTextBodyProperties props){
-                if(props.isSetRIns()){
-                    double val = Units.toPoints(props.getRIns());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        // If this attribute is omitted, then a value of 0.1 inches is implied
-        return fetcher.getValue() == null ? 7.2 : fetcher.getValue();
-    }
-
-    /**
-     *  Returns the distance (in points) between the top of the text frame
-     *  and the top of the inscribed rectangle of the shape that contains the text.
-     *
-     * @return the top inset in points
-     */
-    public double getTopInset(){
-        PropertyFetcher<Double> fetcher = new TextBodyPropertyFetcher<Double>(){
-            public boolean fetch(CTTextBodyProperties props){
-                if(props.isSetTIns()){
-                    double val = Units.toPoints(props.getTIns());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        // If this attribute is omitted, then a value of 0.05 inches is implied
-        return fetcher.getValue() == null ? 3.6 : fetcher.getValue();
-    }
-
-    /**
-     * Sets the bottom margin.
-     * @see #getBottomInset()
-     *
-     * @param margin    the bottom margin
-     */
-    public void setBottomInset(double margin){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            if(margin == -1) bodyPr.unsetBIns();
-            else bodyPr.setBIns(Units.toEMU(margin));
-        }
-    }
-
-    /**
-     * Sets the left margin.
-     * @see #getLeftInset()
-     *
-     * @param margin    the left margin
-     */
-    public void setLeftInset(double margin){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            if(margin == -1) bodyPr.unsetLIns();
-            else bodyPr.setLIns(Units.toEMU(margin));
-        }
-    }
-
-    /**
-     * Sets the right margin.
-     * @see #getRightInset()
-     *
-     * @param margin    the right margin
-     */
-    public void setRightInset(double margin){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            if(margin == -1) bodyPr.unsetRIns();
-            else bodyPr.setRIns(Units.toEMU(margin));
-        }
-    }
-
-    /**
-     * Sets the top margin.
-     * @see #getTopInset()
-     *
-     * @param margin    the top margin
-     */
-    public void setTopInset(double margin){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            if(margin == -1) bodyPr.unsetTIns();
-            else bodyPr.setTIns(Units.toEMU(margin));
-        }
-    }
-
-    @Override
-    public Insets2D getInsets() {
-        Insets2D insets = new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset());
-        return insets;
-    }
-
-    @Override
-    public void setInsets(Insets2D insets) {
-        setTopInset(insets.top);
-        setLeftInset(insets.left);
-        setBottomInset(insets.bottom);
-        setRightInset(insets.right);
-    }
-
-    @Override
-    public boolean getWordWrap(){
-        PropertyFetcher<Boolean> fetcher = new TextBodyPropertyFetcher<Boolean>(){
-            public boolean fetch(CTTextBodyProperties props){
-               if(props.isSetWrap()){
-                    setValue(props.getWrap() == STTextWrappingType.SQUARE);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchShapeProperty(fetcher);
-        return fetcher.getValue() == null ? true : fetcher.getValue();
-    }
-
-    @Override
-    public void setWordWrap(boolean wrap){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            bodyPr.setWrap(wrap ? STTextWrappingType.SQUARE : STTextWrappingType.NONE);
-        }
-    }
-
-    /**
-     *
-     * Specifies that a shape should be auto-fit to fully contain the text described within it.
-     * Auto-fitting is when text within a shape is scaled in order to contain all the text inside
-     *
-     * @param value type of autofit
-     */
-    public void setTextAutofit(TextAutofit value){
-        CTTextBodyProperties bodyPr = getTextBodyPr(true);
-        if (bodyPr != null) {
-            if(bodyPr.isSetSpAutoFit()) bodyPr.unsetSpAutoFit();
-            if(bodyPr.isSetNoAutofit()) bodyPr.unsetNoAutofit();
-            if(bodyPr.isSetNormAutofit()) bodyPr.unsetNormAutofit();
-
-            switch(value){
-                case NONE: bodyPr.addNewNoAutofit(); break;
-                case NORMAL: bodyPr.addNewNormAutofit(); break;
-                case SHAPE: bodyPr.addNewSpAutoFit(); break;
-            }
-        }
-    }
-
-    /**
-     *
-     * @return type of autofit
-     */
-    public TextAutofit getTextAutofit(){
-        CTTextBodyProperties bodyPr = getTextBodyPr();
-        if (bodyPr != null) {
-            if(bodyPr.isSetNoAutofit()) return TextAutofit.NONE;
-            else if (bodyPr.isSetNormAutofit()) return TextAutofit.NORMAL;
-            else if (bodyPr.isSetSpAutoFit()) return TextAutofit.SHAPE;
-        }
-        return TextAutofit.NORMAL;
-    }
-
-    protected CTTextBodyProperties getTextBodyPr(){
-        return getTextBodyPr(false);
-    }
-
-    protected CTTextBodyProperties getTextBodyPr(boolean create) {
-        CTTextBody textBody = getTextBody(create);
-        if (textBody == null) {
-            return null;
-        }
-        CTTextBodyProperties textBodyPr = textBody.getBodyPr();
-        if (textBodyPr == null && create) {
-            textBodyPr = textBody.addNewBodyPr();
-        }
-        return textBodyPr;
-    }
-
-    protected abstract CTTextBody getTextBody(boolean create);
-
-    @Override
-    public void setPlaceholder(Placeholder placeholder) {
-        super.setPlaceholder(placeholder);
-    }
-
-    public Placeholder getTextType(){
-        CTPlaceholder ph = getCTPlaceholder();
-        if (ph == null) return null;
-
-        int val = ph.getType().intValue();
-        return Placeholder.lookupOoxml(val);
-    }
-
-    @Override
-    public double getTextHeight(){
-        DrawFactory drawFact = DrawFactory.getInstance(null);
-        DrawTextShape dts = drawFact.getDrawable(this);
-        return dts.getTextHeight();
-    }
-
-    /**
-     * Adjust the size of the shape so it encompasses the text inside it.
-     *
-     * @return a <code>Rectangle2D</code> that is the bounds of this shape.
-     */
-    public Rectangle2D resizeToFitText(){
-        Rectangle2D anchor = getAnchor();
-        if(anchor.getWidth() == 0.)  throw new POIXMLException(
-                "Anchor of the shape was not set.");
-        double height = getTextHeight();
-        height += 1; // add a pixel to compensate rounding errors
-
-        anchor.setRect(anchor.getX(), anchor.getY(), anchor.getWidth(), height);
-        setAnchor(anchor);
-
-        return anchor;
-    }
-
-
-    @Override
-    void copy(XSLFShape other){
-        super.copy(other);
-
-        XSLFTextShape otherTS = (XSLFTextShape)other;
-        CTTextBody otherTB = otherTS.getTextBody(false);
-        CTTextBody thisTB = getTextBody(true);
-        if (otherTB == null) {
-            return;
-        }
-
-        thisTB.setBodyPr((CTTextBodyProperties)otherTB.getBodyPr().copy());
-
-        if (thisTB.isSetLstStyle()) thisTB.unsetLstStyle();
-        if (otherTB.isSetLstStyle()) {
-            thisTB.setLstStyle((CTTextListStyle)otherTB.getLstStyle().copy());
-        }
-
-        boolean srcWordWrap = otherTS.getWordWrap();
-        if(srcWordWrap != getWordWrap()){
-            setWordWrap(srcWordWrap);
-        }
-
-        double leftInset = otherTS.getLeftInset();
-        if(leftInset != getLeftInset()) {
-            setLeftInset(leftInset);
-        }
-        double rightInset = otherTS.getRightInset();
-        if(rightInset != getRightInset()) {
-            setRightInset(rightInset);
-        }
-        double topInset = otherTS.getTopInset();
-        if(topInset != getTopInset()) {
-            setTopInset(topInset);
-        }
-        double bottomInset = otherTS.getBottomInset();
-        if(bottomInset != getBottomInset()) {
-            setBottomInset(bottomInset);
-        }
-
-        VerticalAlignment vAlign = otherTS.getVerticalAlignment();
-        if(vAlign != getVerticalAlignment()) {
-            setVerticalAlignment(vAlign);
-        }
-
-        clearText();
-
-        for (XSLFTextParagraph srcP : otherTS.getTextParagraphs()) {
-            XSLFTextParagraph tgtP = addNewTextParagraph();
-            tgtP.copy(srcP);
-        }
-    }
-
-    @Override
-    public void setTextPlaceholder(TextPlaceholder placeholder) {
-        switch (placeholder) {
-            default:
-            case NOTES:
-            case HALF_BODY:
-            case QUARTER_BODY:
-            case BODY:
-                setPlaceholder(Placeholder.BODY);
-                break;
-            case TITLE:
-                setPlaceholder(Placeholder.TITLE);
-                break;
-            case CENTER_BODY:
-                setPlaceholder(Placeholder.BODY);
-                setHorizontalCentered(true);
-                break;
-            case CENTER_TITLE:
-                setPlaceholder(Placeholder.CENTERED_TITLE);
-                break;
-            case OTHER:
-                setPlaceholder(Placeholder.CONTENT);
-                break;
-        }
-    }
-
-    @Override
-    public TextPlaceholder getTextPlaceholder() {
-        Placeholder ph = getTextType();
-        if (ph == null) return TextPlaceholder.BODY;
-        switch (ph) {
-        case BODY: return TextPlaceholder.BODY;
-        case TITLE: return TextPlaceholder.TITLE;
-        case CENTERED_TITLE: return TextPlaceholder.CENTER_TITLE;
-        default:
-        case CONTENT: return TextPlaceholder.OTHER;
-        }
-    }
-
-    /**
-     * Helper method to allow subclasses to provide their own text paragraph
-     *
-     * @param p the xml reference
-     * 
-     * @return a new text paragraph
-     * 
-     * @since POI 3.15-beta2
-     */
-    protected XSLFTextParagraph newTextParagraph(CTTextParagraph p) {
-        return new XSLFTextParagraph(p, this);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java b/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
deleted file mode 100644
index 37bc34d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBaseStyles;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColorMapping;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColorScheme;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOfficeStyleSheet;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.ThemeDocument;
-
-/**
- * A shared style sheet in a .pptx slide show
- *
- * @author Yegor Kozlov
- */
-@Beta
-public class XSLFTheme extends POIXMLDocumentPart {
-    private CTOfficeStyleSheet _theme;
-    private Map<String, CTColor> _schemeColors;
-    
-    XSLFTheme() {
-        super();
-        _theme = CTOfficeStyleSheet.Factory.newInstance();
-    }
-    
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XSLFTheme(PackagePart part) throws IOException, XmlException {
-        super(part);
-        ThemeDocument doc =
-            ThemeDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-        _theme = doc.getTheme();
-        initialize();
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XSLFTheme(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    public void importTheme(XSLFTheme theme) {
-        _theme = theme.getXmlObject();
-        _schemeColors = theme._schemeColors;
-    }
-
-    private void initialize(){
-    	CTBaseStyles elems = _theme.getThemeElements();
-    	CTColorScheme scheme = elems.getClrScheme();
-    	// The color scheme is responsible for defining a list of twelve colors. 
-    	_schemeColors = new HashMap<String, CTColor>(12);
-    	for(XmlObject o : scheme.selectPath("*")){
-    		CTColor c = (CTColor)o;
-    		String name = c.getDomNode().getLocalName();
-    		_schemeColors.put(name, c);
-    	}
-     }
-
-    /**
-     * re-map colors
-     *
-     * @param cmap color map defined in the master slide referencing this theme
-     */
-    void initColorMap(CTColorMapping cmap) {
-        _schemeColors.put("bg1", _schemeColors.get(cmap.getBg1().toString()));
-        _schemeColors.put("bg2", _schemeColors.get(cmap.getBg2().toString()));
-        _schemeColors.put("tx1", _schemeColors.get(cmap.getTx1().toString()));
-        _schemeColors.put("tx2", _schemeColors.get(cmap.getTx2().toString()));
-    }
-
-    /**
-     *
-     * @return name of this theme, e.g. "Office Theme"
-     */
-    public String getName(){
-        return _theme.getName();
-    }
-
-    /**
-     * Set name of this theme
-     *
-     * @param name name of this theme
-     */
-    public void setName(String name){
-        _theme.setName(name);
-    }
-
-    /**
-     * Get a color from the theme's color scheme by name
-     * 
-     * @return a theme color or <code>null</code> if not found
-     */
-    CTColor getCTColor(String name){
-    	return _schemeColors.get(name);
-    }
-    
-    /**
-     * While developing only!
-     */
-    @Internal
-    public CTOfficeStyleSheet getXmlObject() {
-        return _theme;
-    }
-
-    protected final void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(
-            new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "theme"));
-
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        getXmlObject().save(out, xmlOptions);
-        out.close();
-    }
-
-    /**
-     * @return typeface of the major font to use in a document.
-     * Typically the major font is used for heading areas of a document.
-     *
-     */
-    public String getMajorFont(){
-        return _theme.getThemeElements().getFontScheme().getMajorFont().getLatin().getTypeface();
-    }
-
-    /**
-     * @return typeface of the minor font to use in a document.
-     * Typically the monor font is used for normal text or paragraph areas.
-     *
-     */
-    public String getMinorFont(){
-        return _theme.getThemeElements().getFontScheme().getMinorFont().getLatin().getTypeface();
-    }
-
-
-    CTTextParagraphProperties getDefaultParagraphStyle(){
-        XmlObject[] o = _theme.selectPath(
-                "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' " +
-                "declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' " +
-                ".//a:objectDefaults/a:spDef/a:lstStyle/a:defPPr");
-        if(o.length == 1){
-            return (CTTextParagraphProperties)o[0];
-        }
-        return null;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
deleted file mode 100644
index 76d1b59..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.util;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-
-/**
- * An utility to convert slides of a .pptx slide show to a PNG image
- *
- * @author Yegor Kozlov
- */
-public class PPTX2PNG {
-
-    static void usage(String error){
-        String msg =
-            "Usage: PPTX2PNG [options] <ppt or pptx file>\n" +
-            (error == null ? "" : ("Error: "+error+"\n")) +
-            "Options:\n" +
-            "    -scale <float>   scale factor\n" +
-            "    -slide <integer> 1-based index of a slide to render\n" +
-            "    -format <type>   png,gif,jpg (,null for testing)" +
-            "    -outdir <dir>    output directory, defaults to origin of the ppt/pptx file" +
-            "    -quiet           do not write to console (for normal processing)";
-
-        System.out.println(msg);
-        // no System.exit here, as we also run in junit tests!
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0) {
-            usage(null);
-            return;
-        }
-
-        String slidenumStr = "-1";
-        float scale = 1;
-        File file = null;
-        String format = "png";
-        File outdir = null;
-        boolean quiet = false;
-
-        for (int i = 0; i < args.length; i++) {
-            if (args[i].startsWith("-")) {
-                if ("-scale".equals(args[i])) {
-                    scale = Float.parseFloat(args[++i]);
-                } else if ("-slide".equals(args[i])) {
-                    slidenumStr = args[++i];
-                } else if ("-format".equals(args[i])) {
-                    format = args[++i];
-                } else if ("-outdir".equals(args[i])) {
-                    outdir = new File(args[++i]);
-                } else if ("-quiet".equals(args[i])) {
-                    quiet = true;
-                }
-            } else {
-                file = new File(args[i]);
-            }
-        }
-
-        if (file == null || !file.exists()) {
-            usage("File not specified or it doesn't exist");
-            return;
-        }
-
-        if (format == null || !format.matches("^(png|gif|jpg|null)$")) {
-            usage("Invalid format given");
-            return;
-        }
-    
-        if (outdir == null) {
-            outdir = file.getParentFile();
-        }
-        
-        if (!"null".equals(format) && (outdir == null || !outdir.exists() || !outdir.isDirectory())) {
-            usage("Output directory doesn't exist");
-            return;
-        }
-
-        if (scale < 0) {
-            usage("Invalid scale given");
-            return;
-        }
-        
-        if (!quiet) {
-            System.out.println("Processing " + file);
-        }
-        SlideShow<?,?> ss = SlideShowFactory.create(file, null, true);
-        try {
-            List<? extends Slide<?, ?>> slides = ss.getSlides();
-
-            Set<Integer> slidenum = slideIndexes(slides.size(), slidenumStr);
-
-            if (slidenum.isEmpty()) {
-                usage("slidenum must be either -1 (for all) or within range: [1.." + slides.size() + "] for " + file);
-                return;
-            }
-
-            Dimension pgsize = ss.getPageSize();
-            int width = (int) (pgsize.width * scale);
-            int height = (int) (pgsize.height * scale);
-
-            for (Integer slideNo : slidenum) {
-                Slide<?, ?> slide = slides.get(slideNo);
-                String title = slide.getTitle();
-                if (!quiet) {
-                    System.out.println("Rendering slide " + slideNo + (title == null ? "" : ": " + title));
-                }
-
-                BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-                Graphics2D graphics = img.createGraphics();
-                DrawFactory.getInstance(graphics).fixFonts(graphics);
-
-                // default rendering options
-                graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-                graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-                graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-
-                graphics.scale(scale, scale);
-
-                // draw stuff
-                slide.draw(graphics);
-
-                // save the result
-                if (!"null".equals(format)) {
-                    String outname = file.getName().replaceFirst(".pptx?", "");
-                    outname = String.format(Locale.ROOT, "%1$s-%2$04d.%3$s", outname, slideNo, format);
-                    File outfile = new File(outdir, outname);
-                    ImageIO.write(img, format, outfile);
-                }
-                
-                graphics.dispose();
-                img.flush();
-            }
-        } finally {
-            ss.close();
-        }
-
-        if (!quiet) {
-            System.out.println("Done");
-        }
-    }
-    
-    private static Set<Integer> slideIndexes(final int slideCount, String range) {
-        Set<Integer> slideIdx = new TreeSet<Integer>();
-        if ("-1".equals(range)) {
-            for (int i=0; i<slideCount; i++) {
-                slideIdx.add(i);
-            }
-        } else {
-            for (String subrange : range.split(",")) {
-                String idx[] = subrange.split("-");
-                switch (idx.length) {
-                default:
-                case 0: break;
-                case 1: {
-                    int subidx = Integer.parseInt(idx[0]);
-                    if (subrange.contains("-")) {
-                        int startIdx = subrange.startsWith("-") ? 0 : subidx;
-                        int endIdx = subrange.endsWith("-") ? slideCount : Math.min(subidx,slideCount);
-                        for (int i=Math.max(startIdx,1); i<endIdx; i++) {
-                            slideIdx.add(i-1);
-                        }
-                    } else {
-                        slideIdx.add(Math.max(subidx,1)-1);
-                    }
-                    break;
-                }
-                case 2: {
-                    int startIdx = Math.min(Integer.parseInt(idx[0]), slideCount);
-                    int endIdx = Math.min(Integer.parseInt(idx[1]), slideCount);
-                    for (int i=Math.max(startIdx,1); i<endIdx; i++) {
-                        slideIdx.add(i-1);
-                    }
-                    break;
-                }
-                }
-            }
-        }
-        return slideIdx;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/XLSBUnsupportedException.java b/trunk/src/ooxml/java/org/apache/poi/xssf/XLSBUnsupportedException.java
deleted file mode 100644
index 6326027..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/XLSBUnsupportedException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf;
-
-import org.apache.poi.UnsupportedFileFormatException;
-
-/**
- * We don't support .xlsb files, sorry
- */
-public class XLSBUnsupportedException extends UnsupportedFileFormatException {
-    private static final long serialVersionUID = 7849681804154571175L;
-    public static final String MESSAGE = ".XLSB Binary Workbooks are not supported"; 
-
-    public XLSBUnsupportedException() {
-		super(MESSAGE);
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java b/trunk/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java
deleted file mode 100644
index ffe9d2a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.dev;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.IOUtils;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.w3c.dom.Document;
-
-/**
- * Utility class which dumps the contents of a *.xlsx file into file system.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFDump {
-
-    public static void main(String[] args) throws Exception {
-        for (int i = 0; i < args.length; i++) {
-            System.out.println("Dumping " + args[i]);
-            ZipFile zip = ZipHelper.openZipFile(args[i]);
-            try {
-                dump(zip);
-            } finally {
-                zip.close();
-            }
-        }
-    }
-    
-    private static void createDirIfMissing(File directory) throws RuntimeException {
-        if (!directory.exists()) {
-            boolean dirWasCreated = directory.mkdir();
-            if (!dirWasCreated) {
-                throw new RuntimeException("Unable to create directory: " + directory);
-            }
-        }
-    }
-    
-    private static void recursivelyCreateDirIfMissing(File directory) throws RuntimeException {
-        if (!directory.exists()) {
-            boolean dirsWereCreated = directory.mkdirs();
-            if (!dirsWereCreated) {
-                throw new RuntimeException("Unable to recursively create directory: " + directory);
-            }
-        }
-    }
-    
-
-    public static void dump(ZipFile zip) throws Exception {
-        String zipname = zip.getName();
-        int sep = zipname.lastIndexOf('.');
-        File root = new File(zipname.substring(0, sep));
-        createDirIfMissing(root);
-        System.out.println("Dumping to directory " + root);
-
-        Enumeration<? extends ZipEntry> en = zip.entries();
-        while (en.hasMoreElements()) {
-            ZipEntry entry = en.nextElement();
-            String name = entry.getName();
-            int idx = name.lastIndexOf('/');
-            if (idx != -1) {
-                File bs = new File(root, name.substring(0, idx));
-                recursivelyCreateDirIfMissing(bs);
-            }
-
-            File f = new File(root, entry.getName());
-            OutputStream out = new FileOutputStream(f);
-            try {
-                if (entry.getName().endsWith(".xml") || entry.getName().endsWith(".vml") || entry.getName().endsWith(".rels")) {
-                    try {
-                        Document doc = DocumentHelper.readDocument(zip.getInputStream(entry));
-                        XmlObject xml = XmlObject.Factory.parse(doc, DEFAULT_XML_OPTIONS);
-                        XmlOptions options = new XmlOptions();
-                        options.setSavePrettyPrint();
-                        xml.save(out, options);
-                    } catch (XmlException e) {
-                        System.err.println("Failed to parse " + entry.getName() + ", dumping raw content");
-                        IOUtils.copy(zip.getInputStream(entry), out);
-                    }
-                } else {
-                    IOUtils.copy(zip.getInputStream(entry), out);
-                }
-            } finally {
-                out.close();
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/dev/XSSFSave.java b/trunk/src/ooxml/java/org/apache/poi/xssf/dev/XSSFSave.java
deleted file mode 100644
index 1660f45..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/dev/XSSFSave.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.dev;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.FileOutputStream;
-
-/**
- * Utility which loads a SpreadsheetML file and saves it back.
- * This is a handy tool to investigate read-write round trip safety.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFSave {
-    public static void main(String[] args) throws Exception {
-        for (int i = 0; i < args.length; i++) {
-            OPCPackage pkg = OPCPackage.open(args[i]);
-            XSSFWorkbook wb = new XSSFWorkbook(pkg);
-
-            int sep = args[i].lastIndexOf('.');
-            String outfile = args[i].substring(0, sep) + "-save.xls" + (wb.isMacroEnabled() ? "m" : "x");
-            FileOutputStream out = new FileOutputStream(outfile);
-            wb.write(out);
-            out.close();
-
-            pkg.close();
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
deleted file mode 100644
index f2554e6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.eventusermodel;
-
-import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.SAXHelper;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * <p>This is a lightweight way to process the Shared Strings
- *  table. Most of the text cells will reference something
- *  from in here.
- * <p>Note that each SI entry can have multiple T elements, if the
- *  string is made up of bits with different formatting.
- * <p>Example input:
- * <pre>
-&lt;?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-&lt;sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="2" uniqueCount="2">
- &lt;si>
-   &lt;r>
-     &lt;rPr>
-       &lt;b />
-       &lt;sz val="11" />
-       &lt;color theme="1" />
-       &lt;rFont val="Calibri" />
-       &lt;family val="2" />
-       &lt;scheme val="minor" />
-     &lt;/rPr>
-     &lt;t>This:&lt;/t>
-   &lt;/r>
-   &lt;r>
-     &lt;rPr>
-       &lt;sz val="11" />
-       &lt;color theme="1" />
-       &lt;rFont val="Calibri" />
-       &lt;family val="2" />
-       &lt;scheme val="minor" />
-     &lt;/rPr>
-     &lt;t xml:space="preserve">Causes Problems&lt;/t>
-   &lt;/r>
- &lt;/si>
- &lt;si>
-   &lt;t>This does not&lt;/t>
- &lt;/si>
-&lt;/sst>
-* </pre>
- *
- */
-public class ReadOnlySharedStringsTable extends DefaultHandler {
-    /**
-     * An integer representing the total count of strings in the workbook. This count does not
-     * include any numbers, it counts only the total of text strings in the workbook.
-     */
-    private int count;
-
-    /**
-     * An integer representing the total count of unique strings in the Shared String Table.
-     * A string is unique even if it is a copy of another string, but has different formatting applied
-     * at the character level.
-     */
-    private int uniqueCount;
-
-    /**
-     * The shared strings table.
-     */
-    private List<String> strings;
-
-    /**
-     * @param pkg
-     * @throws IOException
-     * @throws SAXException
-     * @throws ParserConfigurationException
-     */
-    public ReadOnlySharedStringsTable(OPCPackage pkg)
-            throws IOException, SAXException {
-        ArrayList<PackagePart> parts =
-                pkg.getPartsByContentType(XSSFRelation.SHARED_STRINGS.getContentType());
-
-        // Some workbooks have no shared strings table.
-        if (parts.size() > 0) {
-            PackagePart sstPart = parts.get(0);
-            readFrom(sstPart.getInputStream());
-        }
-    }
-
-    /**
-     * Like POIXMLDocumentPart constructor
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public ReadOnlySharedStringsTable(PackagePart part) throws IOException, SAXException {
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public ReadOnlySharedStringsTable(PackagePart part, PackageRelationship rel_ignored)
-    throws IOException, SAXException {
-        this(part);
-    }
-    
-    /**
-     * Read this shared strings table from an XML file.
-     *
-     * @param is The input stream containing the XML document.
-     * @throws IOException                  if an error occurs while reading.
-     * @throws SAXException
-     * @throws ParserConfigurationException
-     */
-    public void readFrom(InputStream is) throws IOException, SAXException {
-        // test if the file is empty, otherwise parse it
-        PushbackInputStream pis = new PushbackInputStream(is, 1);
-        int emptyTest = pis.read();
-        if (emptyTest > -1) {
-            pis.unread(emptyTest);
-            InputSource sheetSource = new InputSource(pis);
-            try {
-                XMLReader sheetParser = SAXHelper.newXMLReader();
-                sheetParser.setContentHandler(this);
-                sheetParser.parse(sheetSource);
-            } catch(ParserConfigurationException e) {
-                throw new RuntimeException("SAX parser appears to be broken - " + e.getMessage());
-            }
-        }
-    }
-
-    /**
-     * Return an integer representing the total count of strings in the workbook. This count does not
-     * include any numbers, it counts only the total of text strings in the workbook.
-     *
-     * @return the total count of strings in the workbook
-     */
-    public int getCount() {
-        return this.count;
-    }
-
-    /**
-     * Returns an integer representing the total count of unique strings in the Shared String Table.
-     * A string is unique even if it is a copy of another string, but has different formatting applied
-     * at the character level.
-     *
-     * @return the total count of unique strings in the workbook
-     */
-    public int getUniqueCount() {
-        return this.uniqueCount;
-    }
-
-    /**
-     * Return the string at a given index.
-     * Formatting is ignored.
-     *
-     * @param idx index of item to return.
-     * @return the item at the specified position in this Shared String table.
-     */
-    public String getEntryAt(int idx) {
-        return strings.get(idx);
-    }
-
-    public List<String> getItems() {
-        return strings;
-    }
-
-    //// ContentHandler methods ////
-
-    private StringBuffer characters;
-    private boolean tIsOpen;
-
-    public void startElement(String uri, String localName, String name,
-                             Attributes attributes) throws SAXException {
-        if (uri != null && ! uri.equals(NS_SPREADSHEETML)) {
-            return;
-        }
-        
-        if ("sst".equals(localName)) {
-            String count = attributes.getValue("count");
-            if(count != null) this.count = Integer.parseInt(count);
-            String uniqueCount = attributes.getValue("uniqueCount");
-            if(uniqueCount != null) this.uniqueCount = Integer.parseInt(uniqueCount);
-
-            this.strings = new ArrayList<String>(this.uniqueCount);
-
-            characters = new StringBuffer();
-        } else if ("si".equals(localName)) {
-            characters.setLength(0);
-        } else if ("t".equals(localName)) {
-            tIsOpen = true;
-        }
-    }
-
-    public void endElement(String uri, String localName, String name)
-            throws SAXException {
-        if (uri != null && ! uri.equals(NS_SPREADSHEETML)) {
-            return;
-        }
-        
-        if ("si".equals(localName)) {
-            strings.add(characters.toString());
-        } else if ("t".equals(localName)) {
-           tIsOpen = false;
-        }
-    }
-
-    /**
-     * Captures characters only if a t(ext) element is open.
-     */
-    public void characters(char[] ch, int start, int length)
-            throws SAXException {
-        if (tIsOpen)
-            characters.append(ch, start, length);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
deleted file mode 100644
index 71942a1..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.eventusermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.model.ThemesTable;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STSheetState;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.WorkbookDocument;
-
-/**
- * This class makes it easy to get at individual parts
- *  of an OOXML .xlsx file, suitable for low memory sax
- *  parsing or similar.
- * It makes up the core part of the EventUserModel support
- *  for XSSF.
- */
-public class XSSFReader {
-    private OPCPackage pkg;
-    private PackagePart workbookPart;
-
-    /**
-     * Creates a new XSSFReader, for the given package
-     */
-    public XSSFReader(OPCPackage pkg) throws IOException, OpenXML4JException {
-        this.pkg = pkg;
-
-        PackageRelationship coreDocRelationship = this.pkg.getRelationshipsByType(
-                PackageRelationshipTypes.CORE_DOCUMENT).getRelationship(0);
-
-        // strict OOXML likely not fully supported, see #57699
-        // this code is similar to POIXMLDocumentPart.getPartFromOPCPackage(), but I could not combine it
-        // easily due to different return values
-        if(coreDocRelationship == null) {
-            if (this.pkg.getRelationshipsByType(
-                    PackageRelationshipTypes.STRICT_CORE_DOCUMENT).getRelationship(0) != null) {
-                throw new POIXMLException("Strict OOXML isn't currently supported, please see bug #57699");
-            }
-
-            throw new POIXMLException("OOXML file structure broken/invalid - no core document found!");
-        }
-
-        // Get the part that holds the workbook
-        workbookPart = this.pkg.getPart(coreDocRelationship);
-    }
-
-
-    /**
-     * Opens up the Shared Strings Table, parses it, and
-     *  returns a handy object for working with
-     *  shared strings.
-     */
-    public SharedStringsTable getSharedStringsTable() throws IOException, InvalidFormatException {
-        ArrayList<PackagePart> parts = pkg.getPartsByContentType( XSSFRelation.SHARED_STRINGS.getContentType());
-        return parts.size() == 0 ? null : new SharedStringsTable(parts.get(0), null);
-    }
-
-    /**
-     * Opens up the Styles Table, parses it, and
-     *  returns a handy object for working with cell styles
-     */
-    public StylesTable getStylesTable() throws IOException, InvalidFormatException {
-        ArrayList<PackagePart> parts = pkg.getPartsByContentType( XSSFRelation.STYLES.getContentType());
-        if(parts.size() == 0) return null;
-        
-        // Create the Styles Table, and associate the Themes if present
-        StylesTable styles = new StylesTable(parts.get(0), null);
-        parts = pkg.getPartsByContentType( XSSFRelation.THEME.getContentType());
-        if(parts.size() != 0) {
-           styles.setTheme(new ThemesTable(parts.get(0), null));
-        }
-        return styles;
-    }
-
-
-
-    /**
-     * Returns an InputStream to read the contents of the
-     *  shared strings table.
-     */
-    public InputStream getSharedStringsData() throws IOException, InvalidFormatException {
-        return XSSFRelation.SHARED_STRINGS.getContents(workbookPart);
-    }
-
-    /**
-     * Returns an InputStream to read the contents of the
-     *  styles table.
-     */
-    public InputStream getStylesData() throws IOException, InvalidFormatException {
-        return XSSFRelation.STYLES.getContents(workbookPart);
-    }
-
-    /**
-     * Returns an InputStream to read the contents of the
-     *  themes table.
-     */
-    public InputStream getThemesData() throws IOException, InvalidFormatException {
-        return XSSFRelation.THEME.getContents(workbookPart);
-    }
-
-    /**
-     * Returns an InputStream to read the contents of the
-     *  main Workbook, which contains key overall data for
-     *  the file, including sheet definitions.
-     */
-    public InputStream getWorkbookData() throws IOException, InvalidFormatException {
-        return workbookPart.getInputStream();
-    }
-
-    /**
-     * Returns an InputStream to read the contents of the
-     *  specified Sheet.
-     * @param relId The relationId of the sheet, from a r:id on the workbook
-     */
-    public InputStream getSheet(String relId) throws IOException, InvalidFormatException {
-        PackageRelationship rel = workbookPart.getRelationship(relId);
-        if(rel == null) {
-            throw new IllegalArgumentException("No Sheet found with r:id " + relId);
-        }
-
-        PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
-        PackagePart sheet = pkg.getPart(relName);
-        if(sheet == null) {
-            throw new IllegalArgumentException("No data found for Sheet with r:id " + relId);
-        }
-        return sheet.getInputStream();
-    }
-
-    /**
-     * Returns an Iterator which will let you get at all the
-     *  different Sheets in turn.
-     * Each sheet's InputStream is only opened when fetched
-     *  from the Iterator. It's up to you to close the
-     *  InputStreams when done with each one.
-     */
-    public Iterator<InputStream> getSheetsData() throws IOException, InvalidFormatException {
-        return new SheetIterator(workbookPart);
-    }
-
-    /**
-     * Iterator over sheet data.
-     */
-    public static class SheetIterator implements Iterator<InputStream> {
-
-        /**
-         *  Maps relId and the corresponding PackagePart
-         */
-        private final Map<String, PackagePart> sheetMap;
-
-        /**
-         * Current CTSheet bean
-         */
-        private CTSheet ctSheet;
-        
-        /**
-         * Iterator over CTSheet objects, returns sheets in <tt>logical</tt> order.
-         * We can't rely on the Ooxml4J's relationship iterator because it returns objects in physical order,
-         * i.e. as they are stored in the underlying package
-         */
-        private final Iterator<CTSheet> sheetIterator;
-
-        /**
-         * Construct a new SheetIterator
-         *
-         * @param wb package part holding workbook.xml
-         */
-        private SheetIterator(PackagePart wb) throws IOException {
-
-            /**
-             * The order of sheets is defined by the order of CTSheet elements in workbook.xml
-             */
-            try {
-                //step 1. Map sheet's relationship Id and the corresponding PackagePart
-                sheetMap = new HashMap<String, PackagePart>();
-                OPCPackage pkg = wb.getPackage();
-                String REL_WORKSHEET = XSSFRelation.WORKSHEET.getRelation();
-                String REL_CHARTSHEET = XSSFRelation.CHARTSHEET.getRelation();
-                for(PackageRelationship rel : wb.getRelationships()){
-                    String relType = rel.getRelationshipType();
-                    if (relType.equals(REL_WORKSHEET) || relType.equals(REL_CHARTSHEET)) {
-                        PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
-                        sheetMap.put(rel.getId(), pkg.getPart(relName));
-                    }
-                }
-                //step 2. Read array of CTSheet elements, wrap it in a ArayList and construct an iterator
-                //Note, using XMLBeans might be expensive, consider refactoring to use SAX or a plain regexp search
-                CTWorkbook wbBean = WorkbookDocument.Factory.parse(wb.getInputStream(), DEFAULT_XML_OPTIONS).getWorkbook();
-                List<CTSheet> validSheets = new ArrayList<CTSheet>();
-                for (CTSheet ctSheet : wbBean.getSheets().getSheetList()) {
-                    //if there's no relationship id, silently skip the sheet
-                    String sheetId = ctSheet.getId();
-                    if (sheetId != null && sheetId.length() > 0) {
-                        validSheets.add(ctSheet);
-                    }
-                }
-                sheetIterator = validSheets.iterator();
-            } catch (InvalidFormatException e){
-                throw new POIXMLException(e);
-            } catch (XmlException e){
-                throw new POIXMLException(e);
-            }
-        }
-
-        /**
-         * Returns <tt>true</tt> if the iteration has more elements.
-         *
-         * @return <tt>true</tt> if the iterator has more elements.
-         */
-        @Override
-        public boolean hasNext() {
-            return sheetIterator.hasNext();
-        }
-
-        /**
-         * Returns input stream of the next sheet in the iteration
-         *
-         * @return input stream of the next sheet in the iteration
-         */
-        @Override
-        public InputStream next() {
-            ctSheet = sheetIterator.next();
-
-            String sheetId = ctSheet.getId();
-            try {
-                PackagePart sheetPkg = sheetMap.get(sheetId);
-                return sheetPkg.getInputStream();
-            } catch(IOException e) {
-                throw new POIXMLException(e);
-            }
-        }
-
-        /**
-         * Returns name of the current sheet
-         *
-         * @return name of the current sheet
-         */
-        public String getSheetName() {
-            return ctSheet.getName();
-        }
-        
-        /**
-         * Returns the comments associated with this sheet,
-         *  or null if there aren't any
-         */
-        public CommentsTable getSheetComments() {
-           PackagePart sheetPkg = getSheetPart();
-           
-           // Do we have a comments relationship? (Only ever one if so)
-           try {
-              PackageRelationshipCollection commentsList = 
-                   sheetPkg.getRelationshipsByType(XSSFRelation.SHEET_COMMENTS.getRelation());
-              if(commentsList.size() > 0) {
-                 PackageRelationship comments = commentsList.getRelationship(0);
-                 PackagePartName commentsName = PackagingURIHelper.createPartName(comments.getTargetURI());
-                 PackagePart commentsPart = sheetPkg.getPackage().getPart(commentsName);
-                 return new CommentsTable(commentsPart, comments);
-              }
-           } catch (InvalidFormatException e) {
-              return null;
-           } catch (IOException e) {
-              return null;
-           }
-           return null;
-        }
-        
-        /**
-         * Returns the shapes associated with this sheet,
-         * an empty list or null if there is an exception
-         */
-        public List<XSSFShape> getShapes() {
-            PackagePart sheetPkg = getSheetPart();
-            List<XSSFShape> shapes= new LinkedList<XSSFShape>();
-           // Do we have a comments relationship? (Only ever one if so)
-           try {
-              PackageRelationshipCollection drawingsList = sheetPkg.getRelationshipsByType(XSSFRelation.DRAWINGS.getRelation());
-              for (int i = 0; i < drawingsList.size(); i++){
-                  PackageRelationship drawings = drawingsList.getRelationship(i);
-                  PackagePartName drawingsName = PackagingURIHelper.createPartName(drawings.getTargetURI());
-                  PackagePart drawingsPart = sheetPkg.getPackage().getPart(drawingsName);
-                  XSSFDrawing drawing = new XSSFDrawing(drawingsPart, drawings);
-                  for (XSSFShape shape : drawing.getShapes()){
-                      shapes.add(shape);
-                  }
-              }
-           } catch (XmlException e){
-               return null;
-           } catch (InvalidFormatException e) {  
-              return null;
-           } catch (IOException e) {
-              return null;
-           }
-           return shapes;
-        }
-        
-        public PackagePart getSheetPart() {
-           String sheetId = ctSheet.getId();
-           return sheetMap.get(sheetId);
-        }
-
-        /**
-         * We're read only, so remove isn't supported
-         */
-        @Override
-        public void remove() {
-            throw new IllegalStateException("Not supported");
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java b/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
deleted file mode 100644
index 49c966a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.eventusermodel;
-
-import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
-
-import java.util.LinkedList;
-import java.util.Queue;
-
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComment;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * This class handles the processing of a sheet#.xml 
- *  sheet part of a XSSF .xlsx file, and generates
- *  row and cell events for it.
- */
-public class XSSFSheetXMLHandler extends DefaultHandler {
-    private static final POILogger logger = POILogFactory.getLogger(XSSFSheetXMLHandler.class);
-
-    /**
-    * These are the different kinds of cells we support.
-    * We keep track of the current one between
-    *  the start and end.
-    */
-   enum xssfDataType {
-       BOOLEAN,
-       ERROR,
-       FORMULA,
-       INLINE_STRING,
-       SST_STRING,
-       NUMBER,
-   }
-   
-   /**
-    * Table with the styles used for formatting
-    */
-   private StylesTable stylesTable;
-
-   /**
-    * Table with cell comments
-    */
-   private CommentsTable commentsTable;
-
-   /**
-    * Read only access to the shared strings table, for looking
-    *  up (most) string cell's contents
-    */
-   private ReadOnlySharedStringsTable sharedStringsTable;
-
-   /**
-    * Where our text is going
-    */
-   private final SheetContentsHandler output;
-
-   // Set when V start element is seen
-   private boolean vIsOpen;
-   // Set when F start element is seen
-   private boolean fIsOpen;
-   // Set when an Inline String "is" is seen
-   private boolean isIsOpen;
-   // Set when a header/footer element is seen
-   private boolean hfIsOpen;
-
-   // Set when cell start element is seen;
-   // used when cell close element is seen.
-   private xssfDataType nextDataType;
-
-   // Used to format numeric cell values.
-   private short formatIndex;
-   private String formatString;
-   private final DataFormatter formatter;
-   private int rowNum;
-   private int nextRowNum;      // some sheets do not have rowNums, Excel can read them so we should try to handle them correctly as well
-   private String cellRef;
-   private boolean formulasNotResults;
-
-   // Gathers characters as they are seen.
-   private StringBuffer value = new StringBuffer();
-   private StringBuffer formula = new StringBuffer();
-   private StringBuffer headerFooter = new StringBuffer();
-
-   private Queue<CellAddress> commentCellRefs;
-
-   /**
-    * Accepts objects needed while parsing.
-    *
-    * @param styles  Table of styles
-    * @param strings Table of shared strings
-    */
-   public XSSFSheetXMLHandler(
-           StylesTable styles,
-           CommentsTable comments,
-           ReadOnlySharedStringsTable strings,
-           SheetContentsHandler sheetContentsHandler,
-           DataFormatter dataFormatter,
-           boolean formulasNotResults) {
-       this.stylesTable = styles;
-       this.commentsTable = comments;
-       this.sharedStringsTable = strings;
-       this.output = sheetContentsHandler;
-       this.formulasNotResults = formulasNotResults;
-       this.nextDataType = xssfDataType.NUMBER;
-       this.formatter = dataFormatter;
-       init();
-   }
-   
-   /**
-    * Accepts objects needed while parsing.
-    *
-    * @param styles  Table of styles
-    * @param strings Table of shared strings
-    */
-   public XSSFSheetXMLHandler(
-           StylesTable styles,
-           ReadOnlySharedStringsTable strings,
-           SheetContentsHandler sheetContentsHandler,
-           DataFormatter dataFormatter,
-           boolean formulasNotResults) {
-       this(styles, null, strings, sheetContentsHandler, dataFormatter, formulasNotResults);
-   }
-   
-   /**
-    * Accepts objects needed while parsing.
-    *
-    * @param styles  Table of styles
-    * @param strings Table of shared strings
-    */
-   public XSSFSheetXMLHandler(
-           StylesTable styles,
-           ReadOnlySharedStringsTable strings,
-           SheetContentsHandler sheetContentsHandler,
-           boolean formulasNotResults) {
-       this(styles, strings, sheetContentsHandler, new DataFormatter(), formulasNotResults);
-   }
-   
-   private void init() {
-       if (commentsTable != null) {
-           commentCellRefs = new LinkedList<CellAddress>();
-           for (CTComment comment : commentsTable.getCTComments().getCommentList().getCommentArray()) {
-               commentCellRefs.add(new CellAddress(comment.getRef()));
-           }
-       }   
-   }
-
-   private boolean isTextTag(String name) {
-      if("v".equals(name)) {
-         // Easy, normal v text tag
-         return true;
-      }
-      if("inlineStr".equals(name)) {
-         // Easy inline string
-         return true;
-      }
-      if("t".equals(name) && isIsOpen) {
-         // Inline string <is><t>...</t></is> pair
-         return true;
-      }
-      // It isn't a text tag
-      return false;
-   }
-   
-   @Override
-   @SuppressWarnings("unused")
-   public void startElement(String uri, String localName, String qName,
-                            Attributes attributes) throws SAXException {
-
-       if (uri != null && ! uri.equals(NS_SPREADSHEETML)) {
-           return;
-       }
-
-       if (isTextTag(localName)) {
-           vIsOpen = true;
-           // Clear contents cache
-           value.setLength(0);
-       } else if ("is".equals(localName)) {
-          // Inline string outer tag
-          isIsOpen = true;
-       } else if ("f".equals(localName)) {
-          // Clear contents cache
-          formula.setLength(0);
-          
-          // Mark us as being a formula if not already
-          if(nextDataType == xssfDataType.NUMBER) {
-             nextDataType = xssfDataType.FORMULA;
-          }
-          
-          // Decide where to get the formula string from
-          String type = attributes.getValue("t");
-          if(type != null && type.equals("shared")) {
-             // Is it the one that defines the shared, or uses it?
-             String ref = attributes.getValue("ref");
-             String si = attributes.getValue("si");
-             
-             if(ref != null) {
-                // This one defines it
-                // TODO Save it somewhere
-                fIsOpen = true;
-             } else {
-                // This one uses a shared formula
-                // TODO Retrieve the shared formula and tweak it to 
-                //  match the current cell
-                if(formulasNotResults) {
-                    logger.log(POILogger.WARN, "shared formulas not yet supported!");
-                } else {
-                   // It's a shared formula, so we can't get at the formula string yet
-                   // However, they don't care about the formula string, so that's ok!
-                }
-             }
-          } else {
-             fIsOpen = true;
-          }
-       }
-       else if("oddHeader".equals(localName) || "evenHeader".equals(localName) ||
-             "firstHeader".equals(localName) || "firstFooter".equals(localName) ||
-             "oddFooter".equals(localName) || "evenFooter".equals(localName)) {
-          hfIsOpen = true;
-          // Clear contents cache
-          headerFooter.setLength(0);
-       }
-       else if("row".equals(localName)) {
-           String rowNumStr = attributes.getValue("r");
-           if(rowNumStr != null) {
-               rowNum = Integer.parseInt(rowNumStr) - 1;
-           } else {
-               rowNum = nextRowNum;
-           }
-           output.startRow(rowNum);
-       }
-       // c => cell
-       else if ("c".equals(localName)) {
-           // Set up defaults.
-           this.nextDataType = xssfDataType.NUMBER;
-           this.formatIndex = -1;
-           this.formatString = null;
-           cellRef = attributes.getValue("r");
-           String cellType = attributes.getValue("t");
-           String cellStyleStr = attributes.getValue("s");
-           if ("b".equals(cellType))
-               nextDataType = xssfDataType.BOOLEAN;
-           else if ("e".equals(cellType))
-               nextDataType = xssfDataType.ERROR;
-           else if ("inlineStr".equals(cellType))
-               nextDataType = xssfDataType.INLINE_STRING;
-           else if ("s".equals(cellType))
-               nextDataType = xssfDataType.SST_STRING;
-           else if ("str".equals(cellType))
-               nextDataType = xssfDataType.FORMULA;
-           else {
-               // Number, but almost certainly with a special style or format
-               XSSFCellStyle style = null;
-               if (stylesTable != null) {
-                   if (cellStyleStr != null) {
-                       int styleIndex = Integer.parseInt(cellStyleStr);
-                       style = stylesTable.getStyleAt(styleIndex);
-                   } else if (stylesTable.getNumCellStyles() > 0) {
-                       style = stylesTable.getStyleAt(0);
-                   }
-               }
-               if (style != null) {
-                   this.formatIndex = style.getDataFormat();
-                   this.formatString = style.getDataFormatString();
-                   if (this.formatString == null)
-                       this.formatString = BuiltinFormats.getBuiltinFormat(this.formatIndex);
-               }
-           }
-       }
-   }
-
-   @Override
-   public void endElement(String uri, String localName, String qName)
-           throws SAXException {
-
-       if (uri != null && ! uri.equals(NS_SPREADSHEETML)) {
-           return;
-       }
-
-       String thisStr = null;
-
-       // v => contents of a cell
-       if (isTextTag(localName)) {
-           vIsOpen = false;
-           
-           // Process the value contents as required, now we have it all
-           switch (nextDataType) {
-               case BOOLEAN:
-                   char first = value.charAt(0);
-                   thisStr = first == '0' ? "FALSE" : "TRUE";
-                   break;
-
-               case ERROR:
-                   thisStr = "ERROR:" + value.toString();
-                   break;
-
-               case FORMULA:
-                   if(formulasNotResults) {
-                      thisStr = formula.toString();
-                   } else {
-                      String fv = value.toString();
-                      
-                      if (this.formatString != null) {
-                         try {
-                            // Try to use the value as a formattable number
-                            double d = Double.parseDouble(fv);
-                            thisStr = formatter.formatRawCellContents(d, this.formatIndex, this.formatString);
-                         } catch(NumberFormatException e) {
-                            // Formula is a String result not a Numeric one
-                            thisStr = fv;
-                         }
-                      } else {
-                         // No formating applied, just do raw value in all cases
-                         thisStr = fv;
-                      }
-                   }
-                   break;
-
-               case INLINE_STRING:
-                   // TODO: Can these ever have formatting on them?
-                   XSSFRichTextString rtsi = new XSSFRichTextString(value.toString());
-                   thisStr = rtsi.toString();
-                   break;
-
-               case SST_STRING:
-                   String sstIndex = value.toString();
-                   try {
-                       int idx = Integer.parseInt(sstIndex);
-                       XSSFRichTextString rtss = new XSSFRichTextString(sharedStringsTable.getEntryAt(idx));
-                       thisStr = rtss.toString();
-                   }
-                   catch (NumberFormatException ex) {
-                       logger.log(POILogger.ERROR, "Failed to parse SST index '" + sstIndex, ex);
-                   }
-                   break;
-
-               case NUMBER:
-                   String n = value.toString();
-                   if (this.formatString != null && n.length() > 0)
-                       thisStr = formatter.formatRawCellContents(Double.parseDouble(n), this.formatIndex, this.formatString);
-                   else
-                       thisStr = n;
-                   break;
-
-               default:
-                   thisStr = "(TODO: Unexpected type: " + nextDataType + ")";
-                   break;
-           }
-           
-           // Do we have a comment for this cell?
-           checkForEmptyCellComments(EmptyCellCommentsCheckType.CELL);
-           XSSFComment comment = commentsTable != null ? commentsTable.findCellComment(new CellAddress(cellRef)) : null;
-           
-           // Output
-           output.cell(cellRef, thisStr, comment);
-       } else if ("f".equals(localName)) {
-          fIsOpen = false;
-       } else if ("is".equals(localName)) {
-          isIsOpen = false;
-       } else if ("row".equals(localName)) {
-          // Handle any "missing" cells which had comments attached
-          checkForEmptyCellComments(EmptyCellCommentsCheckType.END_OF_ROW);
-          
-          // Finish up the row
-          output.endRow(rowNum);
-          
-          // some sheets do not have rowNum set in the XML, Excel can read them so we should try to read them as well
-          nextRowNum = rowNum + 1;
-       } else if ("sheetData".equals(localName)) {
-           // Handle any "missing" cells which had comments attached
-           checkForEmptyCellComments(EmptyCellCommentsCheckType.END_OF_SHEET_DATA);
-       }
-       else if("oddHeader".equals(localName) || "evenHeader".equals(localName) ||
-             "firstHeader".equals(localName)) {
-          hfIsOpen = false;
-          output.headerFooter(headerFooter.toString(), true, localName);
-       }
-       else if("oddFooter".equals(localName) || "evenFooter".equals(localName) ||
-             "firstFooter".equals(localName)) {
-          hfIsOpen = false;
-          output.headerFooter(headerFooter.toString(), false, localName);
-       }
-   }
-
-   /**
-    * Captures characters only if a suitable element is open.
-    * Originally was just "v"; extended for inlineStr also.
-    */
-   @Override
-   public void characters(char[] ch, int start, int length)
-           throws SAXException {
-       if (vIsOpen) {
-           value.append(ch, start, length);
-       }
-       if (fIsOpen) {
-          formula.append(ch, start, length);
-       }
-       if (hfIsOpen) {
-          headerFooter.append(ch, start, length);
-       }
-   }
-   
-   /**
-    * Do a check for, and output, comments in otherwise empty cells.
-    */
-   private void checkForEmptyCellComments(EmptyCellCommentsCheckType type) {
-       if (commentCellRefs != null && !commentCellRefs.isEmpty()) {
-           // If we've reached the end of the sheet data, output any
-           //  comments we haven't yet already handled
-           if (type == EmptyCellCommentsCheckType.END_OF_SHEET_DATA) {
-               while (!commentCellRefs.isEmpty()) {
-                   outputEmptyCellComment(commentCellRefs.remove());
-               }
-               return;
-           }
-
-           // At the end of a row, handle any comments for "missing" rows before us
-           if (this.cellRef == null) {
-               if (type == EmptyCellCommentsCheckType.END_OF_ROW) {
-                   while (!commentCellRefs.isEmpty()) {
-                       if (commentCellRefs.peek().getRow() == rowNum) {
-                           outputEmptyCellComment(commentCellRefs.remove());
-                       } else {
-                           return;
-                       }
-                   }
-                   return;
-               } else {
-                   throw new IllegalStateException("Cell ref should be null only if there are only empty cells in the row; rowNum: " + rowNum);
-               }
-           }
-
-           CellAddress nextCommentCellRef;
-           do {
-               CellAddress cellRef = new CellAddress(this.cellRef);
-               CellAddress peekCellRef = commentCellRefs.peek();
-               if (type == EmptyCellCommentsCheckType.CELL && cellRef.equals(peekCellRef)) {
-                   // remove the comment cell ref from the list if we're about to handle it alongside the cell content
-                   commentCellRefs.remove();
-                   return;
-               } else {
-                   // fill in any gaps if there are empty cells with comment mixed in with non-empty cells
-                   int comparison = peekCellRef.compareTo(cellRef);
-                   if (comparison > 0 && type == EmptyCellCommentsCheckType.END_OF_ROW && peekCellRef.getRow() <= rowNum) {
-                       nextCommentCellRef = commentCellRefs.remove();
-                       outputEmptyCellComment(nextCommentCellRef);
-                   } else if (comparison < 0 && type == EmptyCellCommentsCheckType.CELL && peekCellRef.getRow() <= rowNum) {
-                       nextCommentCellRef = commentCellRefs.remove();
-                       outputEmptyCellComment(nextCommentCellRef);
-                   } else {
-                       nextCommentCellRef = null;
-                   }
-               }
-           } while (nextCommentCellRef != null && !commentCellRefs.isEmpty());
-       }
-   }
-
-
-   /**
-    * Output an empty-cell comment.
-    */
-   private void outputEmptyCellComment(CellAddress cellRef) {
-       XSSFComment comment = commentsTable.findCellComment(cellRef);
-       output.cell(cellRef.formatAsString(), null, comment);
-   }
-   
-   private enum EmptyCellCommentsCheckType {
-       CELL,
-       END_OF_ROW,
-       END_OF_SHEET_DATA
-   }
-
-   /**
-    * You need to implement this to handle the results
-    *  of the sheet parsing.
-    */
-   public interface SheetContentsHandler {
-      /** A row with the (zero based) row number has started */
-      public void startRow(int rowNum);
-      /** A row with the (zero based) row number has ended */
-      public void endRow(int rowNum);
-      /** 
-       * A cell, with the given formatted value (may be null), 
-       *  and possibly a comment (may be null), was encountered */
-      public void cell(String cellReference, String formattedValue, XSSFComment comment);
-      /** A header or footer has been encountered */
-      public void headerFooter(String text, boolean isHeader, String tagName);
-   }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java b/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
deleted file mode 100644
index 18db97f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.extractor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.poi.POIXMLProperties;
-import org.apache.poi.POIXMLProperties.CoreProperties;
-import org.apache.poi.POIXMLProperties.CustomProperties;
-import org.apache.poi.POIXMLProperties.ExtendedProperties;
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.util.SAXHelper;
-import org.apache.poi.xssf.eventusermodel.ReadOnlySharedStringsTable;
-import org.apache.poi.xssf.eventusermodel.XSSFReader;
-import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler;
-import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler.SheetContentsHandler;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.poi.xssf.usermodel.XSSFSimpleShape;
-import org.apache.xmlbeans.XmlException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-/**
- * Implementation of a text extractor from OOXML Excel
- *  files that uses SAX event based parsing.
- */
-public class XSSFEventBasedExcelExtractor extends POIXMLTextExtractor 
-       implements org.apache.poi.ss.extractor.ExcelExtractor {
-    private OPCPackage container;
-    private POIXMLProperties properties;
-
-    private Locale locale;
-    private boolean includeTextBoxes = true;
-    private boolean includeSheetNames = true;
-    private boolean includeCellComments = false;
-    private boolean includeHeadersFooters = true;
-    private boolean formulasNotResults = false;
-
-    public XSSFEventBasedExcelExtractor(String path) throws XmlException, OpenXML4JException, IOException {
-        this(OPCPackage.open(path));
-    }
-    public XSSFEventBasedExcelExtractor(OPCPackage container) throws XmlException, OpenXML4JException, IOException {
-        super(null);
-        this.container = container;
-
-        properties = new POIXMLProperties(container);
-    }
-
-    public static void main(String[] args) throws Exception {
-        if(args.length < 1) {
-            System.err.println("Use:");
-            System.err.println("  XSSFEventBasedExcelExtractor <filename.xlsx>");
-            System.exit(1);
-        }
-        POIXMLTextExtractor extractor =
-            new XSSFEventBasedExcelExtractor(args[0]);
-        System.out.println(extractor.getText());
-        extractor.close();
-    }
-
-    /**
-     * Should sheet names be included? Default is true
-     */
-    public void setIncludeSheetNames(boolean includeSheetNames) {
-        this.includeSheetNames = includeSheetNames;
-    }
-    /**
-     * Should we return the formula itself, and not
-     *  the result it produces? Default is false
-     */
-    public void setFormulasNotResults(boolean formulasNotResults) {
-        this.formulasNotResults = formulasNotResults;
-    }
-    /**
-     * Should headers and footers be included? Default is true
-     */
-    public void setIncludeHeadersFooters(boolean includeHeadersFooters) {
-        this.includeHeadersFooters = includeHeadersFooters;
-    }
-    /**
-     * Should text from textboxes be included? Default is true
-     */
-    public void setIncludeTextBoxes(boolean includeTextBoxes) {
-        this.includeTextBoxes = includeTextBoxes;
-    }
-
-    /**
-     * Should cell comments be included? Default is false
-     */
-    public void setIncludeCellComments(boolean includeCellComments) {
-        this.includeCellComments = includeCellComments;
-    }
-
-    public void setLocale(Locale locale) {
-        this.locale = locale;
-    }
-
-    /**
-     * Returns the opened OPCPackage container.
-     */
-    @Override
-    public OPCPackage getPackage() {
-        return container;
-    }
-
-    /**
-     * Returns the core document properties
-     */
-    @Override
-    public CoreProperties getCoreProperties() {
-        return properties.getCoreProperties();
-    }
-    /**
-     * Returns the extended document properties
-     */
-    @Override
-    public ExtendedProperties getExtendedProperties() {
-        return properties.getExtendedProperties();
-    }
-    /**
-     * Returns the custom document properties
-     */
-    @Override
-    public CustomProperties getCustomProperties() {
-        return properties.getCustomProperties();
-    }
-
-    /**
-     * Processes the given sheet
-     */
-    public void processSheet(
-            SheetContentsHandler sheetContentsExtractor,
-            StylesTable styles,
-            CommentsTable comments,
-            ReadOnlySharedStringsTable strings,
-            InputStream sheetInputStream)
-            throws IOException, SAXException {
-
-       DataFormatter formatter;
-       if(locale == null) {
-          formatter = new DataFormatter();
-       } else  {
-          formatter = new DataFormatter(locale);
-       }
-      
-       InputSource sheetSource = new InputSource(sheetInputStream);
-       try {
-          XMLReader sheetParser = SAXHelper.newXMLReader();
-          ContentHandler handler = new XSSFSheetXMLHandler(
-                styles, comments, strings, sheetContentsExtractor, formatter, formulasNotResults);
-          sheetParser.setContentHandler(handler);
-          sheetParser.parse(sheetSource);
-       } catch(ParserConfigurationException e) {
-          throw new RuntimeException("SAX parser appears to be broken - " + e.getMessage());
-       }
-   }
-
-   /**
-    * Processes the file and returns the text
-    */
-   public String getText() {
-       try {
-          ReadOnlySharedStringsTable strings = new ReadOnlySharedStringsTable(container);
-          XSSFReader xssfReader = new XSSFReader(container);
-          StylesTable styles = xssfReader.getStylesTable();
-          XSSFReader.SheetIterator iter = (XSSFReader.SheetIterator) xssfReader.getSheetsData();
-   
-          StringBuffer text = new StringBuffer();
-          SheetTextExtractor sheetExtractor = new SheetTextExtractor();
-          
-          while (iter.hasNext()) {
-              InputStream stream = iter.next();
-              if(includeSheetNames) {
-                 text.append(iter.getSheetName());
-                 text.append('\n');
-              }
-              CommentsTable comments = includeCellComments ? iter.getSheetComments() : null;
-              processSheet(sheetExtractor, styles, comments, strings, stream);
-              if (includeHeadersFooters) {
-                  sheetExtractor.appendHeaderText(text);
-              }
-              sheetExtractor.appendCellText(text);
-              if (includeTextBoxes){
-                  processShapes(iter.getShapes(), text);
-              }
-              if (includeHeadersFooters) {
-                  sheetExtractor.appendFooterText(text);
-              }
-              sheetExtractor.reset();
-              stream.close();
-          }
-          
-          return text.toString();
-       } catch(IOException e) {
-          System.err.println(e);
-          return null;
-       } catch(SAXException se) {
-          System.err.println(se);
-          return null;
-       } catch(OpenXML4JException o4je) {
-          System.err.println(o4je);
-          return null;
-       }
-   }
-   
-    private void processShapes(List<XSSFShape> shapes, StringBuffer text) {
-        if (shapes == null){
-            return;
-        }
-        for (XSSFShape shape : shapes){
-            if (shape instanceof XSSFSimpleShape){
-                String sText = ((XSSFSimpleShape)shape).getText();
-                if (sText != null && sText.length() > 0){
-                    text.append(sText).append('\n');
-                }
-            }
-        }
-    }
-    @Override
-	public void close() throws IOException {
-		if (container != null) {
-			container.close();
-			container = null;
-		}
-		super.close();
-	}
-
-    protected class SheetTextExtractor implements SheetContentsHandler {
-        private final StringBuffer output;
-        private boolean firstCellOfRow;
-        private final Map<String, String> headerFooterMap;
-
-        protected SheetTextExtractor() {
-            this.output = new StringBuffer();
-            this.firstCellOfRow = true;
-            this.headerFooterMap = includeHeadersFooters ? new HashMap<String, String>() : null;
-        }
-
-        @Override
-        public void startRow(int rowNum) {
-            firstCellOfRow = true;
-        }
-
-        @Override
-        public void endRow(int rowNum) {
-            output.append('\n');
-        }
-
-        @Override
-        public void cell(String cellRef, String formattedValue, XSSFComment comment) {
-            if(firstCellOfRow) {
-                firstCellOfRow = false;
-            } else {
-                output.append('\t');
-            }
-            if (formattedValue != null) {
-                checkMaxTextSize(output, formattedValue);
-                output.append(formattedValue);
-            }
-            if (includeCellComments && comment != null) {
-                String commentText = comment.getString().getString().replace('\n', ' ');
-                output.append(formattedValue != null ? " Comment by " : "Comment by ");
-                checkMaxTextSize(output, commentText);
-                if (commentText.startsWith(comment.getAuthor() + ": ")) {
-                    output.append(commentText);
-                } else {
-                    output.append(comment.getAuthor()).append(": ").append(commentText);
-                }
-            }
-        }
-
-        @Override
-        public void headerFooter(String text, boolean isHeader, String tagName) {
-            if (headerFooterMap != null) {
-                headerFooterMap.put(tagName, text);
-            }
-        }
-
-        /**
-         * Append the text for the named header or footer if found.
-         */
-        private void appendHeaderFooterText(StringBuffer buffer, String name) {
-            String text = headerFooterMap.get(name);
-            if (text != null && text.length() > 0) {
-                // this is a naive way of handling the left, center, and right
-                // header and footer delimiters, but it seems to be as good as
-                // the method used by XSSFExcelExtractor
-                text = handleHeaderFooterDelimiter(text, "&L");
-                text = handleHeaderFooterDelimiter(text, "&C");
-                text = handleHeaderFooterDelimiter(text, "&R");
-                buffer.append(text).append('\n');
-            }
-        }
-        /**
-         * Remove the delimiter if its found at the beginning of the text,
-         * or replace it with a tab if its in the middle.
-         */
-        private String handleHeaderFooterDelimiter(String text, String delimiter) {
-            int index = text.indexOf(delimiter);
-            if (index == 0) {
-                text = text.substring(2);
-            } else if (index > 0) {
-                text = text.substring(0, index) + "\t" + text.substring(index + 2);
-            }
-            return text;
-        }
-
-
-        /**
-         * Append the text for each header type in the same order
-         * they are appended in XSSFExcelExtractor.
-         * @see XSSFExcelExtractor#getText()
-         * @see org.apache.poi.hssf.extractor.ExcelExtractor#_extractHeaderFooter(org.apache.poi.ss.usermodel.HeaderFooter)
-         */
-        private void appendHeaderText(StringBuffer buffer) {
-            appendHeaderFooterText(buffer, "firstHeader");
-            appendHeaderFooterText(buffer, "oddHeader");
-            appendHeaderFooterText(buffer, "evenHeader");
-        }
-
-        /**
-         * Append the text for each footer type in the same order
-         * they are appended in XSSFExcelExtractor.
-         * @see XSSFExcelExtractor#getText()
-         * @see org.apache.poi.hssf.extractor.ExcelExtractor#_extractHeaderFooter(org.apache.poi.ss.usermodel.HeaderFooter)
-         */
-        private void appendFooterText(StringBuffer buffer) {
-            // append the text for each footer type in the same order
-            // they are appended in XSSFExcelExtractor
-            appendHeaderFooterText(buffer, "firstFooter");
-            appendHeaderFooterText(buffer, "oddFooter");
-            appendHeaderFooterText(buffer, "evenFooter");
-        }
-
-        /**
-         * Append the cell contents we have collected.
-         */
-        private void appendCellText(StringBuffer buffer) {
-            checkMaxTextSize(buffer, output.toString());
-            buffer.append(output);
-        }
-
-        /**
-         * Reset this <code>SheetTextExtractor</code> for the next sheet.
-         */
-        private void reset() {
-            output.setLength(0);
-            firstCellOfRow = true;
-            if (headerFooterMap != null) {
-                headerFooterMap.clear();
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java b/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
deleted file mode 100644
index 192d60d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.extractor;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Locale;
-
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.HeaderFooter;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFSimpleShape;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.XmlException;
-
-/**
- * Helper class to extract text from an OOXML Excel file
- */
-public class XSSFExcelExtractor extends POIXMLTextExtractor 
-       implements org.apache.poi.ss.extractor.ExcelExtractor {
-    public static final XSSFRelation[] SUPPORTED_TYPES = new XSSFRelation[] {
-        XSSFRelation.WORKBOOK, XSSFRelation.MACRO_TEMPLATE_WORKBOOK,
-        XSSFRelation.MACRO_ADDIN_WORKBOOK, XSSFRelation.TEMPLATE_WORKBOOK,
-        XSSFRelation.MACROS_WORKBOOK
-    };
-
-    private Locale locale;
-    private XSSFWorkbook workbook;
-    private boolean includeSheetNames = true;
-    private boolean formulasNotResults = false;
-    private boolean includeCellComments = false;
-    private boolean includeHeadersFooters = true;
-    private boolean includeTextBoxes = true;
-
-    public XSSFExcelExtractor(OPCPackage container) throws XmlException, OpenXML4JException, IOException {
-        this(new XSSFWorkbook(container));
-    }
-    public XSSFExcelExtractor(XSSFWorkbook workbook) {
-        super(workbook);
-        this.workbook = workbook;
-    }
-
-    public static void main(String[] args) throws Exception {
-        if(args.length < 1) {
-            System.err.println("Use:");
-            System.err.println("  XSSFExcelExtractor <filename.xlsx>");
-            System.exit(1);
-        }
-        OPCPackage pkg = OPCPackage.create(args[0]);
-        POIXMLTextExtractor extractor = new XSSFExcelExtractor(pkg);
-        try {
-            System.out.println(extractor.getText());
-        } finally {
-            extractor.close();
-        }
-    }
-
-    /**
-     * Should sheet names be included? Default is true
-     */
-    public void setIncludeSheetNames(boolean includeSheetNames) {
-        this.includeSheetNames = includeSheetNames;
-    }
-    /**
-     * Should we return the formula itself, and not
-     *  the result it produces? Default is false
-     */
-    public void setFormulasNotResults(boolean formulasNotResults) {
-        this.formulasNotResults = formulasNotResults;
-    }
-    /**
-     * Should cell comments be included? Default is false
-     */
-    public void setIncludeCellComments(boolean includeCellComments) {
-        this.includeCellComments = includeCellComments;
-    }
-    /**
-     * Should headers and footers be included? Default is true
-     */
-    public void setIncludeHeadersFooters(boolean includeHeadersFooters) {
-        this.includeHeadersFooters = includeHeadersFooters;
-    }
-    /**
-     * Should text within textboxes be included? Default is true
-     * @param includeTextBoxes
-     */
-    public void setIncludeTextBoxes(boolean includeTextBoxes){
-        this.includeTextBoxes = includeTextBoxes;
-    }
-    /**
-     * What Locale should be used for formatting numbers (based
-     *  on the styles applied to the cells)
-     */
-    public void setLocale(Locale locale) {
-        this.locale = locale;
-    }
-
-
-    /**
-     * Retrieves the text contents of the file
-     */
-    public String getText() {
-        DataFormatter formatter;
-        if(locale == null) {
-            formatter = new DataFormatter();
-        } else  {
-            formatter = new DataFormatter(locale);
-        }
-
-        StringBuffer text = new StringBuffer();
-        for(Sheet sh : workbook) {
-            XSSFSheet sheet = (XSSFSheet) sh;
-            if(includeSheetNames) {
-                text.append(sheet.getSheetName()).append("\n");
-            }
-
-            // Header(s), if present
-            if(includeHeadersFooters) {
-                text.append(
-                        extractHeaderFooter(sheet.getFirstHeader())
-                        );
-                text.append(
-                        extractHeaderFooter(sheet.getOddHeader())
-                        );
-                text.append(
-                        extractHeaderFooter(sheet.getEvenHeader())
-                        );
-            }
-
-            // Rows and cells
-            for (Object rawR : sheet) {
-                Row row = (Row)rawR;
-                for(Iterator<Cell> ri = row.cellIterator(); ri.hasNext();) {
-                    Cell cell = ri.next();
-
-                    // Is it a formula one?
-                    if(cell.getCellTypeEnum() == CellType.FORMULA) {
-                        if (formulasNotResults) {
-                            String contents = cell.getCellFormula();
-                            checkMaxTextSize(text, contents);
-                            text.append(contents);
-                        } else {
-                            if (cell.getCachedFormulaResultTypeEnum() == CellType.STRING) {
-                                handleStringCell(text, cell);
-                            } else {
-                                handleNonStringCell(text, cell, formatter);
-                            }
-                        }
-                    } else if(cell.getCellTypeEnum() == CellType.STRING) {
-                        handleStringCell(text, cell);
-                    } else {
-                        handleNonStringCell(text, cell, formatter);
-                    }
-
-                    // Output the comment, if requested and exists
-                    Comment comment = cell.getCellComment();
-                    if(includeCellComments && comment != null) {
-                        // Replace any newlines with spaces, otherwise it
-                        //  breaks the output
-                        String commentText = comment.getString().getString().replace('\n', ' ');
-                        checkMaxTextSize(text, commentText);
-                        text.append(" Comment by ").append(comment.getAuthor()).append(": ").append(commentText);
-                    }
-
-                    if(ri.hasNext()) {
-                        text.append("\t");
-                    }
-                }
-                text.append("\n");
-            }
-            
-            // add textboxes
-            if (includeTextBoxes){
-                XSSFDrawing drawing = sheet.getDrawingPatriarch();
-                if (drawing != null) {
-                    for (XSSFShape shape : drawing.getShapes()){
-                        if (shape instanceof XSSFSimpleShape){
-                            String boxText = ((XSSFSimpleShape)shape).getText();
-                            if (boxText.length() > 0){
-                                text.append(boxText);
-                                text.append('\n');
-                            }
-                        }
-                    }
-                }
-            }
-            // Finally footer(s), if present
-            if(includeHeadersFooters) {
-                text.append(
-                        extractHeaderFooter(sheet.getFirstFooter())
-                        );
-                text.append(
-                        extractHeaderFooter(sheet.getOddFooter())
-                        );
-                text.append(
-                        extractHeaderFooter(sheet.getEvenFooter())
-                        );
-            }
-        }
-
-        return text.toString();
-    }
-
-    private void handleStringCell(StringBuffer text, Cell cell) {
-        String contents = cell.getRichStringCellValue().getString();
-        checkMaxTextSize(text, contents);
-        text.append(contents);
-    }
-
-    private void handleNonStringCell(StringBuffer text, Cell cell, DataFormatter formatter) {
-        CellType type = cell.getCellTypeEnum();
-        if (type == CellType.FORMULA) {
-            type = cell.getCachedFormulaResultTypeEnum();
-        }
-
-        if (type == CellType.NUMERIC) {
-            CellStyle cs = cell.getCellStyle();
-
-            if (cs != null && cs.getDataFormatString() != null) {
-                String contents = formatter.formatRawCellContents(
-                        cell.getNumericCellValue(), cs.getDataFormat(), cs.getDataFormatString());
-                checkMaxTextSize(text, contents);
-                text.append(contents);
-                return;
-            }
-        }
-
-        // No supported styling applies to this cell
-        String contents = ((XSSFCell)cell).getRawValue();
-        checkMaxTextSize(text, contents);
-        text.append( contents );
-    }
-
-    private String extractHeaderFooter(HeaderFooter hf) {
-        return ExcelExtractor._extractHeaderFooter(hf);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java b/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
deleted file mode 100644
index 7febd23..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.extractor;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFTable;
-import org.apache.poi.xssf.usermodel.helpers.XSSFSingleXmlCell;
-import org.apache.poi.xssf.usermodel.helpers.XSSFXmlColumnPr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- *
- * Maps an XLSX to an XML according to one of the mapping defined.
- *
- *
- * The output XML Schema must respect this limitations:
- *
- * <ul>
- * <li> all mandatory elements and attributes must be mapped (enable validation to check this)</li>
- *
- * <li> no &lt;any&gt; in complex type/element declaration </li>
- * <li> no &lt;anyAttribute&gt; attributes declaration </li>
- * <li> no recursive structures: recursive structures can't be nested more than one level </li>
- * <li> no abstract elements: abstract complex types can be declared but must not be used in elements. </li>
- * <li> no mixed content: an element can't contain simple text and child element(s) together </li>
- * <li> no &lt;substitutionGroup&gt; in complex type/element declaration </li>
- * </ul>
- */
-public class XSSFExportToXml implements Comparator<String>{
-    private static final POILogger LOG = POILogFactory.getLogger(XSSFExportToXml.class);
-
-    private XSSFMap map;
-
-    /**
-     * Creates a new exporter and sets the mapping to be used when generating the XML output document
-     *
-     * @param map the mapping rule to be used
-     */
-    public XSSFExportToXml(XSSFMap map) {
-        this.map = map;
-    }
-
-    /**
-     *
-     * Exports the data in an XML stream
-     *
-     * @param os OutputStream in which will contain the output XML
-     * @param validate if true, validates the XML against the XML Schema
-     * @throws SAXException If validating the document fails
-     * @throws TransformerException If transforming the document fails
-     */
-    public void exportToXML(OutputStream os, boolean validate) throws SAXException, TransformerException {
-        exportToXML(os, "UTF-8", validate);
-    }
-
-    /**
-     * Exports the data in an XML stream
-     *
-     * @param os OutputStream in which will contain the output XML
-     * @param encoding the output charset encoding
-     * @param validate if true, validates the XML against the XML Schema
-     * @throws SAXException If validating the document fails
-     * @throws TransformerException If transforming the document fails
-     */
-    public void exportToXML(OutputStream os, String encoding, boolean validate) throws SAXException, TransformerException{
-        List<XSSFSingleXmlCell> singleXMLCells = map.getRelatedSingleXMLCell();
-        List<XSSFTable> tables = map.getRelatedTables();
-
-        String rootElement = map.getCtMap().getRootElement();
-
-        Document doc = DocumentHelper.createDocument();
-
-        final Element root;
-
-        if (isNamespaceDeclared()) {
-            root = doc.createElementNS(getNamespace(),rootElement);
-        } else {
-            root = doc.createElementNS("", rootElement);
-        }
-        doc.appendChild(root);
-
-
-        List<String> xpaths = new Vector<String>();
-        Map<String,XSSFSingleXmlCell> singleXmlCellsMappings = new HashMap<String,XSSFSingleXmlCell>();
-        Map<String,XSSFTable> tableMappings = new HashMap<String,XSSFTable>();
-
-        for(XSSFSingleXmlCell simpleXmlCell : singleXMLCells) {
-            xpaths.add(simpleXmlCell.getXpath());
-            singleXmlCellsMappings.put(simpleXmlCell.getXpath(), simpleXmlCell);
-        }
-        for(XSSFTable table : tables) {
-            String commonXPath = table.getCommonXpath();
-            xpaths.add(commonXPath);
-            tableMappings.put(commonXPath, table);
-        }
-
-        Collections.sort(xpaths,this);
-
-        for(String xpath : xpaths) {
-
-            XSSFSingleXmlCell simpleXmlCell = singleXmlCellsMappings.get(xpath);
-            XSSFTable table = tableMappings.get(xpath);
-
-            if (!xpath.matches(".*\\[.*")) {
-
-                // Exports elements and attributes mapped with simpleXmlCell
-                if (simpleXmlCell!=null) {
-                    XSSFCell cell = simpleXmlCell.getReferencedCell();
-                    if (cell!=null) {
-                        Node currentNode = getNodeByXPath(xpath,doc.getFirstChild(),doc,false);
-                        mapCellOnNode(cell,currentNode);
-                        
-                        //remove nodes which are empty in order to keep the output xml valid
-                        if("".equals(currentNode.getTextContent()) && currentNode.getParentNode() != null) {
-                        	currentNode.getParentNode().removeChild(currentNode);
-                        }
-                    }
-                }
-
-                // Exports elements and attributes mapped with tables
-                if (table!=null) {
-
-                    List<XSSFXmlColumnPr> tableColumns = table.getXmlColumnPrs();
-
-                    XSSFSheet sheet = table.getXSSFSheet();
-
-                    int startRow = table.getStartCellReference().getRow();
-                    // In mappings created with Microsoft Excel the first row contains the table header and must be skipped
-                    startRow +=1;
-
-                    int endRow = table.getEndCellReference().getRow();
-
-                    for(int i = startRow; i<= endRow; i++) {
-                        XSSFRow row = sheet.getRow(i);
-
-                        Node tableRootNode = getNodeByXPath(table.getCommonXpath(),doc.getFirstChild(),doc,true);
-
-                        short startColumnIndex = table.getStartCellReference().getCol();
-                        for(int j = startColumnIndex; j<= table.getEndCellReference().getCol();j++) {
-                            XSSFCell cell = row.getCell(j);
-                            if (cell!=null) {
-                                XSSFXmlColumnPr pointer = tableColumns.get(j-startColumnIndex);
-                                String localXPath = pointer.getLocalXPath();
-                                Node currentNode = getNodeByXPath(localXPath,tableRootNode,doc,false);
-
-                                mapCellOnNode(cell,currentNode);
-                            }
-                        }
-                    }
-                }
-            } /*else {
-                // TODO:  implement filtering management in xpath
-            }*/
-        }
-
-        boolean isValid = true;
-        if (validate) {
-            isValid =isValid(doc);
-        }
-
-        if (isValid) {
-
-            /////////////////
-            //Output the XML
-
-            //set up a transformer
-            TransformerFactory transfac = TransformerFactory.newInstance();
-            Transformer trans = transfac.newTransformer();
-            trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-            trans.setOutputProperty(OutputKeys.INDENT, "yes");
-            trans.setOutputProperty(OutputKeys.ENCODING, encoding);
-
-            //create string from xml tree
-
-            StreamResult result = new StreamResult(os);
-            DOMSource source = new DOMSource(doc);
-            trans.transform(source, result);
-
-        }
-    }
-
-
-    /**
-     * Validate the generated XML against the XML Schema associated with the XSSFMap
-     *
-     * @param xml the XML to validate
-     * @return true, if document is valid
-     * @throws SAXException If validating the document fails
-     */
-    private boolean isValid(Document xml) throws SAXException{
-        try{
-            String language = "http://www.w3.org/2001/XMLSchema";
-            SchemaFactory factory = SchemaFactory.newInstance(language);
-
-            Source source = new DOMSource(map.getSchema());
-            Schema schema = factory.newSchema(source);
-            Validator validator = schema.newValidator();
-            validator.validate(new DOMSource(xml));
-            
-            //if no exceptions where raised, the document is valid
-            return true;
-        } catch(IOException e) {
-            LOG.log(POILogger.ERROR, "document is not valid", e);
-        }
-
-        return false;
-    }
-
-
-    private void mapCellOnNode(XSSFCell cell, Node node) {
-
-        String value ="";
-        switch (cell.getCellTypeEnum()) {
-
-        case STRING: value = cell.getStringCellValue(); break;
-        case BOOLEAN: value += cell.getBooleanCellValue(); break;
-        case ERROR: value = cell.getErrorCellString();  break;
-        case FORMULA:
-           if (cell.getCachedFormulaResultTypeEnum() == CellType.STRING) {
-               value = cell.getStringCellValue();
-           } else {
-               if (DateUtil.isCellDateFormatted(cell)) {
-                  value = getFormattedDate(cell);
-               } else {
-                  value += cell.getNumericCellValue();
-               }
-           }
-           break;
-        
-        case NUMERIC: 
-             if (DateUtil.isCellDateFormatted(cell)) {
-                  value = getFormattedDate(cell);
-              } else {
-                 value += cell.getRawValue();
-              }
-            break;
-
-        default:
-
-        }
-        if (node instanceof Element) {
-            Element currentElement = (Element) node;
-            currentElement.setTextContent(value);
-        } else {
-            node.setNodeValue(value);
-        }
-    }
-
-    private String removeNamespace(String elementName) {
-        return elementName.matches(".*:.*")?elementName.split(":")[1]:elementName;
-    }
-
-    private String getFormattedDate(XSSFCell cell) {
-        DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
-        sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-        return sdf.format(cell.getDateCellValue());
-    }
-
-    private Node getNodeByXPath(String xpath,Node rootNode,Document doc,boolean createMultipleInstances) {
-        String[] xpathTokens = xpath.split("/");
-
-
-        Node currentNode =rootNode;
-        // The first token is empty, the second is the root node
-        for(int i =2; i<xpathTokens.length;i++) {
-
-            String axisName = removeNamespace(xpathTokens[i]);
-
-
-            if (!axisName.startsWith("@")) {
-
-                NodeList list =currentNode.getChildNodes();
-
-                Node selectedNode = null;
-                if (!(createMultipleInstances && i==xpathTokens.length-1) ) {
-                    // select the last child node only if we need to map to a single cell
-                    selectedNode = selectNode(axisName, list);
-                }
-                if (selectedNode==null) {
-                    selectedNode = createElement(doc, currentNode, axisName);
-                }
-                currentNode = selectedNode;
-            } else {
-                currentNode = createAttribute(doc, currentNode, axisName);
-            }
-        }
-        return currentNode;
-    }
-
-    private Node createAttribute(Document doc, Node currentNode, String axisName) {
-        String attributeName = axisName.substring(1);
-        NamedNodeMap attributesMap = currentNode.getAttributes();
-        Node attribute = attributesMap.getNamedItem(attributeName);
-        if (attribute==null) {
-            attribute = doc.createAttributeNS("", attributeName);
-            attributesMap.setNamedItem(attribute);
-        }
-        return attribute;
-    }
-
-    private Node createElement(Document doc, Node currentNode, String axisName) {
-        Node selectedNode;
-        if (isNamespaceDeclared()) {
-            selectedNode =doc.createElementNS(getNamespace(),axisName);
-        } else {
-            selectedNode = doc.createElementNS("", axisName);
-        }
-        currentNode.appendChild(selectedNode);
-        return selectedNode;
-    }
-
-    private Node selectNode(String axisName, NodeList list) {
-        Node selectedNode = null;
-        for(int j=0;j<list.getLength();j++) {
-            Node node = list.item(j);
-            if (node.getNodeName().equals(axisName)) {
-                selectedNode=node;
-                break;
-            }
-        }
-        return selectedNode;
-    }
-
-
-    private boolean isNamespaceDeclared() {
-        String schemaNamespace = getNamespace();
-        return schemaNamespace!=null && !schemaNamespace.equals("");
-    }
-
-    private String getNamespace() {
-        return map.getCTSchema().getNamespace();
-    }
-
-
-    /**
-     * Compares two xpaths to define an ordering according to the XML Schema
-     *
-     */
-    @Override
-    public int compare(String leftXpath, String rightXpath) {
-        Node xmlSchema = map.getSchema();
-
-        String[] leftTokens = leftXpath.split("/");
-        String[] rightTokens = rightXpath.split("/");
-
-        int minLength = leftTokens.length< rightTokens.length? leftTokens.length : rightTokens.length;
-
-        Node localComplexTypeRootNode = xmlSchema;
-
-        for(int i =1;i <minLength; i++) {
-
-            String leftElementName = leftTokens[i];
-            String rightElementName = rightTokens[i];
-
-            if (leftElementName.equals(rightElementName)) {
-                localComplexTypeRootNode = getComplexTypeForElement(leftElementName, xmlSchema, localComplexTypeRootNode);
-            } else {
-                int leftIndex = indexOfElementInComplexType(leftElementName,localComplexTypeRootNode);
-                int rightIndex = indexOfElementInComplexType(rightElementName,localComplexTypeRootNode);
-                if (leftIndex!=-1 && rightIndex!=-1) {
-                    if ( leftIndex < rightIndex) {
-                        return -1;
-                    }if ( leftIndex > rightIndex) {
-                        return 1;
-                    }
-                } /*else {
-                    // NOTE: the xpath doesn't match correctly in the schema
-                }*/
-            }
-        }
-
-        return 0;
-    }
-
-    private int indexOfElementInComplexType(String elementName,Node complexType) {
-        if(complexType == null) {
-            return -1;
-        }
-
-        NodeList list  = complexType.getChildNodes();
-        int indexOf = -1;
-
-        for(int i=0; i< list.getLength();i++) {
-            Node node = list.item(i);
-            if (node instanceof Element) {
-                if (node.getLocalName().equals("element")) {
-                    Node element = getNameOrRefElement(node);
-                    if (element.getNodeValue().equals(removeNamespace(elementName))) {
-                        indexOf = i;
-                        break;
-                    }
-
-                }
-            }
-        }
-        return indexOf;
-    }
-
-	private Node getNameOrRefElement(Node node) {
-		Node returnNode = node.getAttributes().getNamedItem("name");
-        if(returnNode != null) {
-            return returnNode;
-		}
-		
-        return node.getAttributes().getNamedItem("ref");
-	}
-
-    private Node getComplexTypeForElement(String elementName,Node xmlSchema,Node localComplexTypeRootNode) {
-        String elementNameWithoutNamespace = removeNamespace(elementName);
-
-        String complexTypeName = getComplexTypeNameFromChildren(localComplexTypeRootNode, elementNameWithoutNamespace);
-
-        // Note: we expect that all the complex types are defined at root level
-        Node complexTypeNode = null;
-        if (!"".equals(complexTypeName)) {
-            complexTypeNode = getComplexTypeNodeFromSchemaChildren(xmlSchema, null, complexTypeName);
-        }
-
-        return complexTypeNode;
-    }
-
-    private String getComplexTypeNameFromChildren(Node localComplexTypeRootNode,
-            String elementNameWithoutNamespace) {
-        if(localComplexTypeRootNode == null) {
-            return "";
-        }
-
-        NodeList  list  = localComplexTypeRootNode.getChildNodes();
-        String complexTypeName = "";
-
-        for(int i=0; i< list.getLength();i++) {
-            Node node = list.item(i);
-            if ( node instanceof Element) {
-                if (node.getLocalName().equals("element")) {
-                    Node nameAttribute = getNameOrRefElement(node);
-                    if (nameAttribute.getNodeValue().equals(elementNameWithoutNamespace)) {
-                        Node complexTypeAttribute = node.getAttributes().getNamedItem("type");
-                        if (complexTypeAttribute!=null) {
-                            complexTypeName = complexTypeAttribute.getNodeValue();
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return complexTypeName;
-    }
-
-    private Node getComplexTypeNodeFromSchemaChildren(Node xmlSchema, Node complexTypeNode,
-            String complexTypeName) {
-        NodeList  complexTypeList  = xmlSchema.getChildNodes();
-        for(int i=0; i< complexTypeList.getLength();i++) {
-            Node node = complexTypeList.item(i);
-            if ( node instanceof Element) {
-                if (node.getLocalName().equals("complexType")) {
-                    Node nameAttribute = getNameOrRefElement(node);
-                    if (nameAttribute.getNodeValue().equals(complexTypeName)) {
-
-                        NodeList complexTypeChildList  =node.getChildNodes();
-                        for(int j=0; j<complexTypeChildList.getLength();j++) {
-                            Node sequence = complexTypeChildList.item(j);
-
-                            if ( sequence instanceof Element) {
-                                if (sequence.getLocalName().equals("sequence") || sequence.getLocalName().equals("all")) {
-                                    complexTypeNode = sequence;
-                                    break;
-                                }
-                            }
-                        }
-                        if (complexTypeNode!=null) {
-                            break;
-                        }
-
-                    }
-                }
-            }
-        }
-        return complexTypeNode;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
deleted file mode 100644
index 0ffbd0b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.extractor;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFTable;
-import org.apache.poi.xssf.usermodel.helpers.XSSFSingleXmlCell;
-import org.apache.poi.xssf.usermodel.helpers.XSSFXmlColumnPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXmlDataType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * Imports data from an external XML to an XLSX according to one of the mappings
- * defined.The output XML Schema must respect this limitations:
- * <ul>
- * <li>the input XML must be valid according to the XML Schema used in the mapping</li>
- * <li>denormalized table mapping is not supported (see OpenOffice part 4: chapter 3.5.1.7)</li>
- * <li>all the namespaces used in the document must be declared in the root node</li>
- * </ul>
- */
-public class XSSFImportFromXML {
-
-    private final XSSFMap _map;
-
-    private static POILogger logger = POILogFactory.getLogger(XSSFImportFromXML.class);
-
-    public XSSFImportFromXML(XSSFMap map) {
-        _map = map;
-    }
-
-    /**
-     * Imports an XML into the XLSX using the Custom XML mapping defined
-     *
-     * @param xmlInputString the XML to import
-     * @throws SAXException if error occurs during XML parsing
-     * @throws XPathExpressionException if error occurs during XML navigation
-     * @throws ParserConfigurationException if there are problems with XML parser configuration
-     * @throws IOException  if there are problems reading the input string
-     */
-    public void importFromXML(String xmlInputString) throws SAXException, XPathExpressionException, IOException {
-
-        DocumentBuilder builder = DocumentHelper.newDocumentBuilder();
-
-        Document doc = builder.parse(new InputSource(new StringReader(xmlInputString.trim())));
-
-        List<XSSFSingleXmlCell> singleXmlCells = _map.getRelatedSingleXMLCell();
-
-        List<XSSFTable> tables = _map.getRelatedTables();
-
-        XPathFactory xpathFactory = XPathFactory.newInstance();
-        XPath xpath = xpathFactory.newXPath();
-
-        // Setting namespace context to XPath
-        // Assuming that the namespace prefix in the mapping xpath is the
-        // same as the one used in the document
-        xpath.setNamespaceContext(new DefaultNamespaceContext(doc));
-
-        for (XSSFSingleXmlCell singleXmlCell : singleXmlCells) {
-
-            STXmlDataType.Enum xmlDataType = singleXmlCell.getXmlDataType();
-            String xpathString = singleXmlCell.getXpath();
-            Node result = (Node) xpath.evaluate(xpathString, doc, XPathConstants.NODE);
-            // result can be null if value is optional (xsd:minOccurs=0), see bugzilla 55864
-            if (result != null) {
-                String textContent = result.getTextContent();
-                logger.log(POILogger.DEBUG, "Extracting with xpath " + xpathString + " : value is '" + textContent + "'");
-                XSSFCell cell = singleXmlCell.getReferencedCell();
-                logger.log(POILogger.DEBUG, "Setting '" + textContent + "' to cell " + cell.getColumnIndex() + "-" + cell.getRowIndex() + " in sheet "
-                                                + cell.getSheet().getSheetName());
-                setCellValue(textContent, cell, xmlDataType);
-            }
-        }
-
-        for (XSSFTable table : tables) {
-
-            String commonXPath = table.getCommonXpath();
-            NodeList result = (NodeList) xpath.evaluate(commonXPath, doc, XPathConstants.NODESET);
-            int rowOffset = table.getStartCellReference().getRow() + 1;// the first row contains the table header
-            int columnOffset = table.getStartCellReference().getCol() - 1;
-
-            for (int i = 0; i < result.getLength(); i++) {
-
-                // TODO: implement support for denormalized XMLs (see
-                // OpenOffice part 4: chapter 3.5.1.7)
-
-                for (XSSFXmlColumnPr xmlColumnPr : table.getXmlColumnPrs()) {
-
-                    int localColumnId = (int) xmlColumnPr.getId();
-                    int rowId = rowOffset + i;
-                    int columnId = columnOffset + localColumnId;
-                    String localXPath = xmlColumnPr.getLocalXPath();
-                    localXPath = localXPath.substring(localXPath.substring(1).indexOf('/') + 1);
-
-                    // Build an XPath to select the right node (assuming
-                    // that the commonXPath != "/")
-                    String nodeXPath = commonXPath + "[" + (i + 1) + "]" + localXPath;
-
-                    // TODO: convert the data to the cell format
-                    String value = (String) xpath.evaluate(nodeXPath, result.item(i), XPathConstants.STRING);
-                    logger.log(POILogger.DEBUG, "Extracting with xpath " + nodeXPath + " : value is '" + value + "'");
-                    XSSFRow row = table.getXSSFSheet().getRow(rowId);
-                    if (row == null) {
-                        row = table.getXSSFSheet().createRow(rowId);
-                    }
-
-                    XSSFCell cell = row.getCell(columnId);
-                    if (cell == null) {
-                        cell = row.createCell(columnId);
-                    }
-                    logger.log(POILogger.DEBUG, "Setting '" + value + "' to cell " + cell.getColumnIndex() + "-" + cell.getRowIndex() + " in sheet "
-                                                    + table.getXSSFSheet().getSheetName());
-                    setCellValue(value, cell, xmlColumnPr.getXmlDataType());
-                }
-            }
-        }
-    }
-
-    private static enum DataType {
-        BOOLEAN(STXmlDataType.BOOLEAN), //
-        DOUBLE(STXmlDataType.DOUBLE), //
-        INTEGER(STXmlDataType.INT, STXmlDataType.UNSIGNED_INT, STXmlDataType.INTEGER), //
-        STRING(STXmlDataType.STRING), //
-        DATE(STXmlDataType.DATE);
-
-        private Set<STXmlDataType.Enum> xmlDataTypes;
-
-        private DataType(STXmlDataType.Enum... xmlDataTypes) {
-            this.xmlDataTypes = new HashSet<STXmlDataType.Enum>(Arrays.asList(xmlDataTypes));
-        }
-
-        public static DataType getDataType(STXmlDataType.Enum xmlDataType) {
-            for (DataType dataType : DataType.values()) {
-                if (dataType.xmlDataTypes.contains(xmlDataType)) {
-                    return dataType;
-                }
-            }
-            return null;
-        }
-    }
-
-    private void setCellValue(String value, XSSFCell cell, STXmlDataType.Enum xmlDataType) {
-        DataType type = DataType.getDataType(xmlDataType);
-        try {
-            if (value.isEmpty() || type == null) {
-                cell.setCellValue((String) null);
-            } else {
-                switch (type) {
-                case BOOLEAN:
-                    cell.setCellValue(Boolean.parseBoolean(value));
-                    break;
-                case DOUBLE:
-                    cell.setCellValue(Double.parseDouble(value));
-                    break;
-                case INTEGER:
-                    cell.setCellValue(Integer.parseInt(value));
-                    break;
-                case DATE:
-                    DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", LocaleUtil.getUserLocale());
-                    Date date = sdf.parse(value);
-                    cell.setCellValue(date);
-                    if (!DateUtil.isValidExcelDate(cell.getNumericCellValue())) {
-                        cell.setCellValue(value);
-                    }
-                    break;
-                case STRING:
-                default:
-                    cell.setCellValue(value.trim());
-                    break;
-                }
-            }
-        } catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException(String.format(LocaleUtil.getUserLocale(), "Unable to format value '%s' as %s for cell %s", value,
-                    type, new CellReference(cell).formatAsString()));
-        } catch (ParseException e) {
-            throw new IllegalArgumentException(String.format(LocaleUtil.getUserLocale(), "Unable to format value '%s' as %s for cell %s", value,
-                    type, new CellReference(cell).formatAsString()));
-        }
-    }
-
-    private static final class DefaultNamespaceContext implements NamespaceContext {
-        /**
-         * Node from which to start searching for a xmlns attribute that binds a
-         * prefix to a namespace.
-         */
-        private final Element _docElem;
-
-        public DefaultNamespaceContext(Document doc) {
-            _docElem = doc.getDocumentElement();
-        }
-
-        @Override
-        public String getNamespaceURI(String prefix) {
-            return getNamespaceForPrefix(prefix);
-        }
-
-        /**
-         * @param prefix Prefix to resolve.
-         * @return uri of Namespace that prefix resolves to, or
-         *         <code>null</code> if specified prefix is not bound.
-         */
-        private String getNamespaceForPrefix(String prefix) {
-
-            // Code adapted from Xalan's org.apache.xml.utils.PrefixResolverDefault.getNamespaceForPrefix()
-
-            if (prefix.equals("xml")) {
-                return "http://www.w3.org/XML/1998/namespace";
-            }
-
-            Node parent = _docElem;
-
-            while (parent != null) {
-
-                int type = parent.getNodeType();
-                if (type == Node.ELEMENT_NODE) {
-                    if (parent.getNodeName().startsWith(prefix + ":")) {
-                        return parent.getNamespaceURI();
-                    }
-                    NamedNodeMap nnm = parent.getAttributes();
-
-                    for (int i = 0; i < nnm.getLength(); i++) {
-                        Node attr = nnm.item(i);
-                        String aname = attr.getNodeName();
-                        boolean isPrefix = aname.startsWith("xmlns:");
-
-                        if (isPrefix || aname.equals("xmlns")) {
-                            int index = aname.indexOf(':');
-                            String p = isPrefix ? aname.substring(index + 1) : "";
-
-                            if (p.equals(prefix)) {
-                                return attr.getNodeValue();
-                            }
-                        }
-                    }
-                } else if (type == Node.ENTITY_REFERENCE_NODE) {
-                    continue;
-                } else {
-                    break;
-                }
-                parent = parent.getParentNode();
-            }
-
-            return null;
-        }
-
-        // Dummy implementation - not used!
-        @Override
-        public Iterator<?> getPrefixes(String val) {
-            return null;
-        }
-
-        // Dummy implementation - not used!
-        @Override
-        public String getPrefix(String uri) {
-            return null;
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java
deleted file mode 100644
index 6f254b3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcChain;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CalcChainDocument;
-
-/**
- * The cells in a workbook can be calculated in different orders depending on various optimizations and
- * dependencies. The calculation chain object specifies the order in which the cells in a workbook were last calculated.
- *
- * @author Yegor Kozlov
- */
-public class CalculationChain extends POIXMLDocumentPart {
-    private CTCalcChain chain;
-
-    public CalculationChain() {
-        super();
-        chain = CTCalcChain.Factory.newInstance();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public CalculationChain(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public CalculationChain(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    public void readFrom(InputStream is) throws IOException {
-        try {
-            CalcChainDocument doc = CalcChainDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            chain = doc.getCalcChain();
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-    public void writeTo(OutputStream out) throws IOException {
-        CalcChainDocument doc = CalcChainDocument.Factory.newInstance();
-        doc.setCalcChain(chain);
-        doc.save(out, DEFAULT_XML_OPTIONS);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        writeTo(out);
-        out.close();
-    }
-
-
-    public CTCalcChain getCTCalcChain(){
-        return chain;
-    }
-
-    /**
-     * Remove a formula reference from the calculation chain
-     * 
-     * @param sheetId  the sheet Id of a sheet the formula belongs to.
-     * @param ref  A1 style reference to the cell containing the formula.
-     */
-    public void removeItem(int sheetId, String ref){
-        //sheet Id of a sheet the cell belongs to
-        int id = -1;
-        CTCalcCell[] c = chain.getCArray();
-
-        for (int i = 0; i < c.length; i++){
-            //If sheet Id  is omitted, it is assumed to be the same as the value of the previous cell.
-            if(c[i].isSetI()) id = c[i].getI();
-
-            if(id == sheetId && c[i].getR().equals(ref)){
-                if(c[i].isSetI() && i < c.length - 1 && !c[i+1].isSetI()) {
-                    c[i+1].setI(id);
-                }
-                chain.removeC(i);
-                break;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java
deleted file mode 100644
index 4dfd4bc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCommentList;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CommentsDocument;
-
-@Internal
-public class CommentsTable extends POIXMLDocumentPart {
-    public static final String DEFAULT_AUTHOR = "";
-    public static final int DEFAULT_AUTHOR_ID = 0;
-    /**
-     * Underlying XML Beans CTComment list.
-     */
-    private CTComments comments;
-    /**
-     * XML Beans uses a list, which is very slow
-     *  to search, so we wrap things with our own
-     *  map for fast lookup.
-     */
-    private Map<CellAddress, CTComment> commentRefs;
-
-    public CommentsTable() {
-        super();
-        comments = CTComments.Factory.newInstance();
-        comments.addNewCommentList();
-        comments.addNewAuthors().addAuthor(DEFAULT_AUTHOR);
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public CommentsTable(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public CommentsTable(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    public void readFrom(InputStream is) throws IOException {
-        try {
-            CommentsDocument doc = CommentsDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            comments = doc.getComments();
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-    public void writeTo(OutputStream out) throws IOException {
-        CommentsDocument doc = CommentsDocument.Factory.newInstance();
-        doc.setComments(comments);
-        doc.save(out, DEFAULT_XML_OPTIONS);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        writeTo(out);
-        out.close();
-    }
-    
-    /**
-     * Called after the reference is updated, so that
-     *  we can reflect that in our cache
-     *  @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #referenceUpdated(CellAddress, CTComment)} instead
-     */
-    public void referenceUpdated(String oldReference, CTComment comment) {
-       referenceUpdated(new CellAddress(oldReference), comment);
-    }
-    
-    /**
-     * Called after the reference is updated, so that
-     *  we can reflect that in our cache
-     *  @param oldReference the comment to remove from the commentRefs map
-     *  @param comment the comment to replace in the commentRefs map
-     */
-    public void referenceUpdated(CellAddress oldReference, CTComment comment) {
-       if(commentRefs != null) {
-          commentRefs.remove(oldReference);
-          commentRefs.put(new CellAddress(comment.getRef()), comment);
-       }
-    }
-
-    public int getNumberOfComments() {
-        return comments.getCommentList().sizeOfCommentArray();
-    }
-
-    public int getNumberOfAuthors() {
-        return comments.getAuthors().sizeOfAuthorArray();
-    }
-
-    public String getAuthor(long authorId) {
-        return comments.getAuthors().getAuthorArray((int)authorId);
-    }
-
-    public int findAuthor(String author) {
-        String[] authorArray = comments.getAuthors().getAuthorArray();
-        for (int i = 0 ; i < authorArray.length; i++) {
-            if (authorArray[i].equals(author)) {
-                return i;
-            }
-        }
-        return addNewAuthor(author);
-    }
-
-    /**
-     * Finds the cell comment at cellAddress, if one exists
-     *
-     * @param cellRef the address of the cell to find a comment
-     * @return cell comment if one exists, otherwise returns null
-     * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #findCellComment(CellAddress)} instead
-     */
-    public XSSFComment findCellComment(String cellRef) {
-        return findCellComment(new CellAddress(cellRef));
-    }
-
-    /**
-     * Finds the cell comment at cellAddress, if one exists
-     *
-     * @param cellAddress the address of the cell to find a comment
-     * @return cell comment if one exists, otherwise returns null
-     */
-    public XSSFComment findCellComment(CellAddress cellAddress) {
-        CTComment ct = getCTComment(cellAddress);
-        return ct == null ? null : new XSSFComment(this, ct, null);
-    }
-    
-
-    /**
-     * Get the underlying CTComment xmlbean for a comment located at cellRef, if it exists
-     *
-     * @param ref the location of the cell comment
-     * @return CTComment xmlbean if comment exists, otherwise return null.
-     * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link CommentsTable#getCTComment(CellAddress)} instead
-     */
-    @Internal
-    public CTComment getCTComment(String ref) {
-        return getCTComment(new CellAddress(ref));
-    }
-    
-    /**
-     * Get the underlying CTComment xmlbean for a comment located at cellRef, if it exists
-     *
-     * @param cellRef the location of the cell comment
-     * @return CTComment xmlbean if comment exists, otherwise return null.
-     */
-    @Internal
-    public CTComment getCTComment(CellAddress cellRef) {
-        // Create the cache if needed
-        prepareCTCommentCache();
-
-        // Return the comment, or null if not known
-        return commentRefs.get(cellRef);
-    }
-    
-    /**
-     * Returns all cell comments on this sheet.
-     * @return A map of each Comment in this sheet, keyed on the cell address where
-     * the comment is located.
-     */
-    public Map<CellAddress, XSSFComment> getCellComments() {
-        prepareCTCommentCache();
-        final TreeMap<CellAddress, XSSFComment> map = new TreeMap<CellAddress, XSSFComment>();
-        
-        for (final Entry<CellAddress, CTComment> e: commentRefs.entrySet()) {
-            map.put(e.getKey(), new XSSFComment(this, e.getValue(), null));
-        }
-        
-        return map;
-    }
-
-    /**
-     * Refresh Map<CellAddress, CTComment> commentRefs cache,
-     * Calls that use the commentRefs cache will perform in O(1)
-     * time rather than O(n) lookup time for List<CTComment> comments.
-     */
-    private void prepareCTCommentCache() {
-        // Create the cache if needed
-        if(commentRefs == null) {
-           commentRefs = new HashMap<CellAddress, CTComment>();
-           for (CTComment comment : comments.getCommentList().getCommentArray()) {
-              commentRefs.put(new CellAddress(comment.getRef()), comment);
-           }
-        }
-    }
-    
-    /**
-     * Create a new comment located at cell address
-     *
-     * @param ref the location to add the comment
-     * @return a new CTComment located at ref with default author
-     * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #newComment(CellAddress)} instead
-     */
-    @Internal
-    public CTComment newComment(String ref) {
-        return newComment(new CellAddress(ref));
-    }
-    
-    /**
-     * Create a new comment located` at cell address
-     *
-     * @param ref the location to add the comment
-     * @return a new CTComment located at ref with default author
-     */
-    @Internal
-    public CTComment newComment(CellAddress ref) {
-        CTComment ct = comments.getCommentList().addNewComment();
-        ct.setRef(ref.formatAsString());
-        ct.setAuthorId(DEFAULT_AUTHOR_ID);
-        
-        if(commentRefs != null) {
-           commentRefs.put(ref, ct);
-        }
-        return ct;
-    }
-    
-    /**
-     * Remove the comment at cellRef location, if one exists
-     *
-     * @param cellRef the location of the comment to remove
-     * @return returns true if a comment was removed
-     * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #removeComment(CellAddress)} instead
-     */
-    public boolean removeComment(String cellRef) {
-        return removeComment(new CellAddress(cellRef));
-    }
-
-    /**
-     * Remove the comment at cellRef location, if one exists
-     *
-     * @param cellRef the location of the comment to remove
-     * @return returns true if a comment was removed
-     */
-    public boolean removeComment(CellAddress cellRef) {
-        final String stringRef = cellRef.formatAsString();
-        CTCommentList lst = comments.getCommentList();
-        if(lst != null) {
-            CTComment[] commentArray = lst.getCommentArray();
-            for (int i = 0; i < commentArray.length; i++) {
-                CTComment comment = commentArray[i];
-                if (stringRef.equals(comment.getRef())) {
-                    lst.removeComment(i);
-
-                    if(commentRefs != null) {
-                       commentRefs.remove(cellRef);
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Add a new author to the CommentsTable.
-     * This does not check if the author already exists.
-     *
-     * @param author the name of the comment author
-     * @return the index of the new author
-     */
-    private int addNewAuthor(String author) {
-        int index = comments.getAuthors().sizeOfAuthorArray();
-        comments.getAuthors().insertAuthor(index, author);
-        return index;
-    }
-
-    /**
-     * Returns the underlying CTComments list xmlbean
-     *
-     * @return underlying comments list xmlbean
-     */
-    @Internal
-    public CTComments getCTComments(){
-        return comments;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java
deleted file mode 100644
index 55762f6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTExternalDefinedName;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTExternalLink;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTExternalSheetName;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.ExternalLinkDocument;
-
-/**
- * Holds details of links to parts of other workbooks (eg named ranges),
- *  along with the most recently seen values for what they point to.
- */
-public class ExternalLinksTable extends POIXMLDocumentPart {
-    private CTExternalLink link;
-
-    public ExternalLinksTable() {
-        super();
-        link = CTExternalLink.Factory.newInstance();
-        link.addNewExternalBook();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public ExternalLinksTable(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public ExternalLinksTable(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    public void readFrom(InputStream is) throws IOException {
-        try {
-            ExternalLinkDocument doc = ExternalLinkDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            link = doc.getExternalLink();
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-    public void writeTo(OutputStream out) throws IOException {
-        ExternalLinkDocument doc = ExternalLinkDocument.Factory.newInstance();
-        doc.setExternalLink(link);
-        doc.save(out, DEFAULT_XML_OPTIONS);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        writeTo(out);
-        out.close();
-    }
-
-    /**
-     * Returns the underlying xmlbeans object for the external
-     *  link table
-     */
-    public CTExternalLink getCTExternalLink(){
-        return link;
-    }
-    
-    /**
-     * Returns the last recorded name of the file that this
-     *  is linked to
-     */
-    public String getLinkedFileName() {
-        String rId = link.getExternalBook().getId();
-        PackageRelationship rel = getPackagePart().getRelationship(rId);
-        if (rel != null && rel.getTargetMode() == TargetMode.EXTERNAL) {
-            return rel.getTargetURI().toString();
-        } else {
-            return null;
-        }
-    }
-    /**
-     * Updates the last recorded name for the file that this links to
-     */
-    public void setLinkedFileName(String target) {
-        String rId = link.getExternalBook().getId();
-        
-        if (rId == null || rId.isEmpty()) {
-            // We're a new External Link Table, so nothing to remove
-        } else {
-            // Relationships can't be changed, so remove the old one
-            getPackagePart().removeRelationship(rId);
-        }
-        
-        // Have a new one added
-        PackageRelationship newRel = getPackagePart().addExternalRelationship(
-                                target, PackageRelationshipTypes.EXTERNAL_LINK_PATH);
-        link.getExternalBook().setId(newRel.getId());
-    }
-
-    public List<String> getSheetNames() {
-        CTExternalSheetName[] sheetNames = 
-                link.getExternalBook().getSheetNames().getSheetNameArray();
-        List<String> names = new ArrayList<String>(sheetNames.length);
-        for (CTExternalSheetName name : sheetNames) {
-            names.add(name.getVal());
-        }
-        return names;
-    }
-    
-    public List<Name> getDefinedNames() {
-        CTExternalDefinedName[] extNames = 
-                link.getExternalBook().getDefinedNames().getDefinedNameArray();
-        List<Name> names = new ArrayList<Name>(extNames.length);
-        for (CTExternalDefinedName extName : extNames) {
-            names.add(new ExternalName(extName));
-        }
-        return names;
-    }
-    
-    
-    // TODO Last seen data
-
-    
-    protected class ExternalName implements Name {
-        private CTExternalDefinedName name;
-        protected ExternalName(CTExternalDefinedName name) {
-            this.name = name;
-        }
-
-        public String getNameName() {
-            return name.getName();
-        }
-        public void setNameName(String name) {
-            this.name.setName(name);
-        }
-
-        public String getSheetName() {
-            int sheetId = getSheetIndex();
-            if (sheetId >= 0) {
-                return getSheetNames().get(sheetId);
-            } else {
-                return null;
-            }
-        }
-        public int getSheetIndex() {
-            if (name.isSetSheetId()) {
-                return (int)name.getSheetId();
-            }
-            return -1;
-        }
-        public void setSheetIndex(int sheetId) {
-            name.setSheetId(sheetId);
-        }
-
-        public String getRefersToFormula() {
-            // Return, without the leading =
-            return name.getRefersTo().substring(1);
-        }
-        public void setRefersToFormula(String formulaText) {
-            // Save with leading =
-            name.setRefersTo('=' + formulaText);
-        }
-
-        public boolean isFunctionName() {
-            return false;
-        }
-        public boolean isDeleted() {
-            return false;
-        }
-
-        public String getComment() {
-            return null;
-        }
-        public void setComment(String comment) {
-            throw new IllegalStateException("Not Supported");
-        }
-        public void setFunction(boolean value) {
-            throw new IllegalStateException("Not Supported");
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java
deleted file mode 100644
index e639591..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMap;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMapInfo;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSchema;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.MapInfoDocument;
-
-/**
- * 
- * This class implements the Custom XML Mapping Part (Open Office XML Part 1:
- * chapter 12.3.6)
- * 
- * An instance of this part type contains a schema for an XML file, and
- * information on the behavior that is used when allowing this custom XML schema
- * to be mapped into the spreadsheet.
- * 
- * @author Roberto Manicardi
- */
-
-public class MapInfo extends POIXMLDocumentPart {
-
-	private CTMapInfo mapInfo;
-	
-	private Map<Integer, XSSFMap> maps ;
-
-	public MapInfo() {
-		super();
-		mapInfo = CTMapInfo.Factory.newInstance();
-
-	}
-
-	/**
-     * @since POI 3.14-Beta1
-     */
-	public MapInfo(PackagePart part) throws IOException {
-	    super(part);
-	    readFrom(part.getInputStream());
-    }	
-	
-   /**
-    * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-    */
-	public MapInfo(PackagePart part, PackageRelationship rel) throws IOException {
-		this(part);
-	}
-
-	public void readFrom(InputStream is) throws IOException {
-		try {
-			MapInfoDocument doc = MapInfoDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-			mapInfo = doc.getMapInfo();
-
-            maps= new HashMap<Integer, XSSFMap>();
-            for(CTMap map :mapInfo.getMapArray()){
-                maps.put((int)map.getID(), new XSSFMap(map,this));
-            }
-
-		} catch (XmlException e) {
-			throw new IOException(e.getLocalizedMessage());
-		}
-	}
-	
-	/**
-     * Returns the parent XSSFWorkbook
-     *
-     * @return the parent XSSFWorkbook
-     */
-    public XSSFWorkbook getWorkbook() {
-        return (XSSFWorkbook)getParent();
-    }
-	
-	/**
-	 * 
-	 * @return the internal data object
-	 */
-	public CTMapInfo getCTMapInfo(){
-		return mapInfo;
-		
-	}
-
-	/**
-	 * Gets the
-	 * @param schemaId the schema ID
-	 * @return CTSchema by it's ID
-	 */
-	public CTSchema getCTSchemaById(String schemaId){
-		CTSchema xmlSchema = null;
-
-		for(CTSchema schema: mapInfo.getSchemaArray()){
-			if(schema.getID().equals(schemaId)){
-				xmlSchema = schema;
-				break;
-			}
-		}
-		return xmlSchema;
-	}
-	
-	
-	public XSSFMap getXSSFMapById(int id){
-		return maps.get(id);
-	}
-	
-	public XSSFMap getXSSFMapByName(String name){
-		
-		XSSFMap matchedMap = null;
-		
-		for(XSSFMap map :maps.values()){
-			if(map.getCtMap().getName()!=null && map.getCtMap().getName().equals(name)){
-				matchedMap = map;
-			}
-		}		
-		
-		return matchedMap;
-	}
-	
-	/**
-	 * 
-	 * @return all the mappings configured in this document
-	 */
-	public Collection<XSSFMap> getAllXSSFMaps(){
-		return maps.values();
-	}
-
-	protected void writeTo(OutputStream out) throws IOException {
-		MapInfoDocument doc = MapInfoDocument.Factory.newInstance();
-		doc.setMapInfo(mapInfo);
-		doc.save(out, DEFAULT_XML_OPTIONS);
-	}
-
-	@Override
-	protected void commit() throws IOException {
-		PackagePart part = getPackagePart();
-		OutputStream out = part.getOutputStream();
-		writeTo(out);
-		out.close();
-	}
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
deleted file mode 100644
index 00f40f7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.model;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShape;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.poi.util.Internal;
-
-/**
- *  Used internally to navigate the paragraph text style hierarchy within a shape and fetch properties
-*/
-@Internal
-public abstract class ParagraphPropertyFetcher<T> {
-
-    private T _value;
-    private int _level;
-    
-    public T getValue(){
-        return _value;
-    }
-
-    public void setValue(T val){
-        _value = val;
-    }
-
-    public ParagraphPropertyFetcher(int level) {
-        _level = level;
-    }
-
-    /**
-    *
-    * @param shape the shape being examined
-    * @return true if the desired property was fetched
-    */    
-    public boolean fetch(CTShape shape) {
-
-        XmlObject[] o = shape.selectPath(
-                "declare namespace xdr='http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing' " +
-                "declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' " +
-                ".//xdr:txBody/a:lstStyle/a:lvl" + (_level + 1) + "pPr"
-        );
-        if (o.length == 1) {
-            CTTextParagraphProperties props = (CTTextParagraphProperties) o[0];
-            return fetch(props);
-        }
-        return false;
-    }
-
-    public abstract boolean fetch(CTTextParagraphProperties props);
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
deleted file mode 100644
index 8ade04f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSst;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.SstDocument;
-
-/**
- * Table of strings shared across all sheets in a workbook.
- * <p>
- * A workbook may contain thousands of cells containing string (non-numeric) data. Furthermore this data is very
- * likely to be repeated across many rows or columns. The goal of implementing a single string table that is shared
- * across the workbook is to improve performance in opening and saving the file by only reading and writing the
- * repetitive information once.
- * </p>
- * <p>
- * Consider for example a workbook summarizing information for cities within various countries. There may be a
- * column for the name of the country, a column for the name of each city in that country, and a column
- * containing the data for each city. In this case the country name is repetitive, being duplicated in many cells.
- * In many cases the repetition is extensive, and a tremendous savings is realized by making use of a shared string
- * table when saving the workbook. When displaying text in the spreadsheet, the cell table will just contain an
- * index into the string table as the value of a cell, instead of the full string.
- * </p>
- * <p>
- * The shared string table contains all the necessary information for displaying the string: the text, formatting
- * properties, and phonetic properties (for East Asian languages).
- * </p>
- */
-public class SharedStringsTable extends POIXMLDocumentPart {
-
-    /**
-     *  Array of individual string items in the Shared String table.
-     */
-    private final List<CTRst> strings = new ArrayList<CTRst>();
-
-    /**
-     *  Maps strings and their indexes in the <code>strings</code> arrays
-     */
-    private final Map<String, Integer> stmap = new HashMap<String, Integer>();
-
-    /**
-     * An integer representing the total count of strings in the workbook. This count does not
-     * include any numbers, it counts only the total of text strings in the workbook.
-     */
-    private int count;
-
-    /**
-     * An integer representing the total count of unique strings in the Shared String Table.
-     * A string is unique even if it is a copy of another string, but has different formatting applied
-     * at the character level.
-     */
-    private int uniqueCount;
-
-    private SstDocument _sstDoc;
-
-    private final static XmlOptions options = new XmlOptions();
-    static {
-        options.put( XmlOptions.SAVE_INNER );
-     	options.put( XmlOptions.SAVE_AGGRESSIVE_NAMESPACES );
-     	options.put( XmlOptions.SAVE_USE_DEFAULT_NAMESPACE );
-        options.setSaveImplicitNamespaces(Collections.singletonMap("", NS_SPREADSHEETML));
-    }
-
-    public SharedStringsTable() {
-        super();
-        _sstDoc = SstDocument.Factory.newInstance();
-        _sstDoc.addNewSst();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public SharedStringsTable(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }    
-    
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    public SharedStringsTable(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-
-    /**
-     * Read this shared strings table from an XML file.
-     * 
-     * @param is The input stream containing the XML document.
-     * @throws IOException if an error occurs while reading.
-     */
-    public void readFrom(InputStream is) throws IOException {
-        try {
-            int cnt = 0;
-            _sstDoc = SstDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            CTSst sst = _sstDoc.getSst();
-            count = (int)sst.getCount();
-            uniqueCount = (int)sst.getUniqueCount();
-            for (CTRst st : sst.getSiArray()) {
-                stmap.put(getKey(st), cnt);
-                strings.add(st);
-                cnt++;
-            }
-        } catch (XmlException e) {
-            throw new IOException("unable to parse shared strings table", e);
-        }
-    }
-
-    private String getKey(CTRst st) {
-        return st.xmlText(options);
-    }
-
-    /**
-     * Return a string item by index
-     *
-     * @param idx index of item to return.
-     * @return the item at the specified position in this Shared String table.
-     */
-    public CTRst getEntryAt(int idx) {
-        return strings.get(idx);
-    }
-
-    /**
-     * Return an integer representing the total count of strings in the workbook. This count does not
-     * include any numbers, it counts only the total of text strings in the workbook.
-     *
-     * @return the total count of strings in the workbook
-     */
-    public int getCount(){
-        return count;
-    }
-
-    /**
-     * Returns an integer representing the total count of unique strings in the Shared String Table.
-     * A string is unique even if it is a copy of another string, but has different formatting applied
-     * at the character level.
-     *
-     * @return the total count of unique strings in the workbook
-     */
-    public int getUniqueCount(){
-        return uniqueCount;
-    }
-
-    /**
-     * Add an entry to this Shared String table (a new value is appened to the end).
-     *
-     * <p>
-     * If the Shared String table already contains this <code>CTRst</code> bean, its index is returned.
-     * Otherwise a new entry is aded.
-     * </p>
-     *
-     * @param st the entry to add
-     * @return index the index of added entry
-     */
-    public int addEntry(CTRst st) {
-        String s = getKey(st);
-        count++;
-        if (stmap.containsKey(s)) {
-            return stmap.get(s);
-        }
-
-        uniqueCount++;
-        //create a CTRst bean attached to this SstDocument and copy the argument CTRst into it
-        CTRst newSt = _sstDoc.getSst().addNewSi();
-        newSt.set(st);
-        int idx = strings.size();
-        stmap.put(s, idx);
-        strings.add(newSt);
-        return idx;
-    }
-    /**
-     * Provide low-level access to the underlying array of CTRst beans
-     *
-     * @return array of CTRst beans
-     */
-    public List<CTRst> getItems() {
-        return Collections.unmodifiableList(strings);
-    }
-
-    /**
-     * Write this table out as XML.
-     * 
-     * @param out The stream to write to.
-     * @throws IOException if an error occurs while writing.
-     */
-    public void writeTo(OutputStream out) throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        // the following two lines turn off writing CDATA
-        // see Bugzilla 48936
-        xmlOptions.setSaveCDataLengthThreshold(1000000);
-        xmlOptions.setSaveCDataEntityCountThreshold(-1);
-
-        //re-create the sst table every time saving a workbook
-        CTSst sst = _sstDoc.getSst();
-        sst.setCount(count);
-        sst.setUniqueCount(uniqueCount);
-
-        _sstDoc.save(out, xmlOptions);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        writeTo(out);
-        out.close();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java
deleted file mode 100644
index 4b66143..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.helpers.XSSFSingleXmlCell;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSingleXmlCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSingleXmlCells;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.SingleXmlCellsDocument;
-
-
-/**
- * 
- * This class implements the Single Cell Tables Part (Open Office XML Part 4:
- * chapter 3.5.2)
- * 
- *
- * @author Roberto Manicardi
- */
-public class SingleXmlCells extends POIXMLDocumentPart {
-	
-	
-	private CTSingleXmlCells singleXMLCells;
-
-	public SingleXmlCells() {
-		super();
-		singleXMLCells = CTSingleXmlCells.Factory.newInstance();
-
-	}
-
-	/**
-	 * @since POI 3.14-Beta1
-	 */
-	public SingleXmlCells(PackagePart part) throws IOException {
-		super(part);
-		readFrom(part.getInputStream());
-	}
-
-	/**
-	 * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-	 */
-	@Deprecated
-	public SingleXmlCells(PackagePart part, PackageRelationship rel) throws IOException {
-	    this(part);
-	}
-
-	public void readFrom(InputStream is) throws IOException {
-		try {
-			SingleXmlCellsDocument doc = SingleXmlCellsDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-			singleXMLCells = doc.getSingleXmlCells();
-		} catch (XmlException e) {
-			throw new IOException(e.getLocalizedMessage());
-		}
-	}
-	
-	public XSSFSheet getXSSFSheet(){
-		return (XSSFSheet) getParent();
-	}
-
-	protected void writeTo(OutputStream out) throws IOException {
-		SingleXmlCellsDocument doc = SingleXmlCellsDocument.Factory.newInstance();
-		doc.setSingleXmlCells(singleXMLCells);
-		doc.save(out, DEFAULT_XML_OPTIONS);
-	}
-
-	@Override
-	protected void commit() throws IOException {
-		PackagePart part = getPackagePart();
-		OutputStream out = part.getOutputStream();
-		writeTo(out);
-		out.close();
-	}
-	
-	public CTSingleXmlCells getCTSingleXMLCells(){
-		return singleXMLCells;
-	}
-	
-	/**
-	 * 
-	 * @return all the SimpleXmlCell contained in this SingleXmlCells element
-	 */
-	public List<XSSFSingleXmlCell> getAllSimpleXmlCell(){
-		List<XSSFSingleXmlCell> list = new Vector<XSSFSingleXmlCell>();
-		
-		for(CTSingleXmlCell singleXmlCell: singleXMLCells.getSingleXmlCellArray()){
-			list.add(new XSSFSingleXmlCell(singleXmlCell,this));
-		}		
-		return list;
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
deleted file mode 100644
index 18b8820..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
+++ /dev/null
@@ -1,833 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.FontFamily;
-import org.apache.poi.ss.usermodel.FontScheme;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFFactory;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellFill;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorders;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellStyleXfs;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellXfs;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDxf;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDxfs;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFills;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFonts;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTNumFmt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTNumFmts;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.StyleSheetDocument;
-
-/**
- * Table of styles shared across all sheets in a workbook.
- */
-public class StylesTable extends POIXMLDocumentPart {
-    private final SortedMap<Short, String> numberFormats = new TreeMap<Short,String>();
-    private final List<XSSFFont> fonts = new ArrayList<XSSFFont>();
-    private final List<XSSFCellFill> fills = new ArrayList<XSSFCellFill>();
-    private final List<XSSFCellBorder> borders = new ArrayList<XSSFCellBorder>();
-    private final List<CTXf> styleXfs = new ArrayList<CTXf>();
-    private final List<CTXf> xfs = new ArrayList<CTXf>();
-
-    private final List<CTDxf> dxfs = new ArrayList<CTDxf>();
-
-    /**
-     * The first style id available for use as a custom style
-     */
-    public static final int FIRST_CUSTOM_STYLE_ID = BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX + 1;
-    // Is this right? Number formats (XSSFDataFormat) and cell styles (XSSFCellStyle) are different. What's up with the plus 1?
-    private static final int MAXIMUM_STYLE_ID = SpreadsheetVersion.EXCEL2007.getMaxCellStyles();
-    
-    private static final short FIRST_USER_DEFINED_NUMBER_FORMAT_ID = BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX;
-    /**
-     * Depending on the version of Excel, the maximum number of number formats in a workbook is between 200 and 250
-     * See https://support.office.com/en-us/article/excel-specifications-and-limits-1672b34d-7043-467e-8e27-269d656771c3
-     * POI defaults this limit to 250, but can be increased or decreased on a per-StylesTable basis with
-     * {@link #setMaxNumberOfDataFormats(int)} if needed.
-     */
-    private int MAXIMUM_NUMBER_OF_DATA_FORMATS = 250;
-    
-    /**
-     * Changes the maximum number of data formats that may be in a style table
-     *
-     * @param num the upper limit on number of data formats in the styles table when adding new data formats
-     * @throws IllegalArgumentException if <code>num</code> < 0
-     * @throws IllegalStateException if <code>num</code> < current number of data formats in the style table.
-     * Data formats must be explicitly removed before the limit can be decreased.
-     */
-    public void setMaxNumberOfDataFormats(int num) {
-        if (num < getNumDataFormats()) {
-            if (num < 0) {
-                throw new IllegalArgumentException("Maximum Number of Data Formats must be greater than or equal to 0");
-            } else {
-                throw new IllegalStateException("Cannot set the maximum number of data formats less than the current quantity." +
-                        "Data formats must be explicitly removed (via StylesTable.removeNumberFormat) before the limit can be decreased.");
-            }
-        }
-        MAXIMUM_NUMBER_OF_DATA_FORMATS = num;
-    }
-    
-    /**
-     * Get the upper limit on the number of data formats that has been set for the style table.
-     * To get the current number of data formats in use, use {@link #getNumDataFormats()}.
-     *
-     * @return the maximum number of data formats allowed in the workbook
-     */
-    public int getMaxNumberOfDataFormats() {
-        return MAXIMUM_NUMBER_OF_DATA_FORMATS;
-    }
-
-    private StyleSheetDocument doc;
-    private XSSFWorkbook workbook;
-    private ThemesTable theme;
-
-    /**
-     * Create a new, empty StylesTable
-     */
-    public StylesTable() {
-        super();
-        doc = StyleSheetDocument.Factory.newInstance();
-        doc.addNewStyleSheet();
-        // Initialization required in order to make the document readable by MSExcel
-        initialize();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public StylesTable(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public StylesTable(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    public void setWorkbook(XSSFWorkbook wb) {
-        this.workbook = wb;
-    }
-
-    /**
-     * Get the current Workbook's theme table, or null if the
-     *  Workbook lacks any themes.
-     * <p>Use {@link #ensureThemesTable()} to have a themes table
-     *  created if needed
-     */
-    public ThemesTable getTheme() {
-        return theme;
-    }
-
-    public void setTheme(ThemesTable theme) {
-        this.theme = theme;
-
-        // Pass the themes table along to things which need to 
-        //  know about it, but have already been created by now
-        for(XSSFFont font : fonts) {
-            font.setThemesTable(theme);
-        }
-        for(XSSFCellBorder border : borders) {
-            border.setThemesTable(theme);
-        }
-    }
-    
-    /**
-     * If there isn't currently a {@link ThemesTable} for the
-     *  current Workbook, then creates one and sets it up.
-     * After this, calls to {@link #getTheme()} won't give null
-     */
-    public void ensureThemesTable() {
-        if (theme != null) return;
-
-        theme = (ThemesTable)workbook.createRelationship(XSSFRelation.THEME, XSSFFactory.getInstance());
-    }
-
-    /**
-     * Read this shared styles table from an XML file.
-     *
-     * @param is The input stream containing the XML document.
-     * @throws IOException if an error occurs while reading.
-     */
-    protected void readFrom(InputStream is) throws IOException {
-        try {
-            doc = StyleSheetDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-
-            CTStylesheet styleSheet = doc.getStyleSheet();
-
-            // Grab all the different bits we care about
-            CTNumFmts ctfmts = styleSheet.getNumFmts();
-            if( ctfmts != null){
-                for (CTNumFmt nfmt : ctfmts.getNumFmtArray()) {
-                    short formatId = (short)nfmt.getNumFmtId();
-                    numberFormats.put(formatId, nfmt.getFormatCode());
-                }
-            }
-
-            CTFonts ctfonts = styleSheet.getFonts();
-            if(ctfonts != null){
-                int idx = 0;
-                for (CTFont font : ctfonts.getFontArray()) {
-                    // Create the font and save it. Themes Table supplied later
-                    XSSFFont f = new XSSFFont(font, idx);
-                    fonts.add(f);
-                    idx++;
-                }
-            }
-            CTFills ctfills = styleSheet.getFills();
-            if(ctfills != null){
-                for (CTFill fill : ctfills.getFillArray()) {
-                    fills.add(new XSSFCellFill(fill));
-                }
-            }
-
-            CTBorders ctborders = styleSheet.getBorders();
-            if(ctborders != null) {
-                for (CTBorder border : ctborders.getBorderArray()) {
-                    borders.add(new XSSFCellBorder(border));
-                }
-            }
-
-            CTCellXfs cellXfs = styleSheet.getCellXfs();
-            if(cellXfs != null) xfs.addAll(Arrays.asList(cellXfs.getXfArray()));
-
-            CTCellStyleXfs cellStyleXfs = styleSheet.getCellStyleXfs();
-            if(cellStyleXfs != null) styleXfs.addAll(Arrays.asList(cellStyleXfs.getXfArray()));
-
-            CTDxfs styleDxfs = styleSheet.getDxfs();
-            if(styleDxfs != null) dxfs.addAll(Arrays.asList(styleDxfs.getDxfArray()));
-
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-
-    // ===========================================================
-    //  Start of style related getters and setters
-    // ===========================================================
-
-    /**
-     * Get number format string given its id
-     * 
-     * @param fmtId number format id
-     * @return number format code
-     */
-    public String getNumberFormatAt(short fmtId) {
-        return numberFormats.get(fmtId);
-    }
-    
-    private short getNumberFormatId(String fmt) {
-     // Find the key, and return that
-        for (Entry<Short,String> numFmt : numberFormats.entrySet()) {
-            if(numFmt.getValue().equals(fmt)) {
-                return numFmt.getKey();
-            }
-        }
-        throw new IllegalStateException("Number format not in style table: " + fmt);
-    }
-
-    /**
-     * Puts <code>fmt</code> in the numberFormats map if the format is not
-     * already in the the number format style table.
-     * Does nothing if <code>fmt</code> is already in number format style table.
-     *
-     * @param fmt the number format to add to number format style table
-     * @return the index of <code>fmt</code> in the number format style table
-     * @throws IllegalStateException if adding the number format to the styles table
-     * would exceed the {@link #MAXIMUM_NUMBER_OF_DATA_FORMATS} allowed.
-     */
-    public int putNumberFormat(String fmt) {
-        // Check if number format already exists
-        if (numberFormats.containsValue(fmt)) {
-            try {
-                return getNumberFormatId(fmt);
-            } catch (final IllegalStateException e) {
-                throw new IllegalStateException("Found the format, but couldn't figure out where - should never happen!");
-            }
-        }
-        
-        
-        if (numberFormats.size() >= MAXIMUM_NUMBER_OF_DATA_FORMATS) {
-            throw new IllegalStateException("The maximum number of Data Formats was exceeded. " +
-                    "You can define up to " + MAXIMUM_NUMBER_OF_DATA_FORMATS + " formats in a .xlsx Workbook.");
-        }
-
-        // Find a spare key, and add that
-        final short formatIndex;
-        if (numberFormats.isEmpty()) {
-            formatIndex = FIRST_USER_DEFINED_NUMBER_FORMAT_ID;
-        }
-        else {
-            // get next-available numberFormat index.
-            // Assumption: gaps in number format ids are acceptable
-            // to catch arithmetic overflow, nextKey's data type
-            // must match numberFormat's key data type
-            short nextKey = (short) (numberFormats.lastKey() + 1);
-            if (nextKey < 0) {
-                throw new IllegalStateException(
-                        "Cowardly avoiding creating a number format with a negative id." +
-                        "This is probably due to arithmetic overflow.");
-            }
-            formatIndex = (short) Math.max(nextKey, FIRST_USER_DEFINED_NUMBER_FORMAT_ID);
-        }
-        
-        numberFormats.put(formatIndex, fmt);
-        return formatIndex;
-    }
-    
-    
-    /**
-     * Add a number format with a specific ID into the numberFormats map.
-     * If a format with the same ID already exists, overwrite the format code
-     * with <code>fmt</code>
-     * This may be used to override built-in number formats.
-     *
-     * @param index the number format ID
-     * @param fmt the number format code
-     */
-    public void putNumberFormat(short index, String fmt) {
-        numberFormats.put(index, fmt);
-    }
-    
-    /**
-     * Remove a number format from the style table if it exists.
-     * All cell styles with this number format will be modified to use the default number format.
-     * 
-     * @param index the number format id to remove
-     * @return true if the number format was removed
-     */
-    public boolean removeNumberFormat(short index) {
-        String fmt = numberFormats.remove(index);
-        boolean removed = (fmt != null);
-        if (removed) {
-            for (final CTXf style : xfs) {
-                if (style.isSetNumFmtId() && style.getNumFmtId() == index) {
-                    style.unsetApplyNumberFormat();
-                    style.unsetNumFmtId();
-                }
-            }
-        }
-        return removed;
-    }
-    
-    /**
-     * Remove a number format from the style table if it exists
-     * All cell styles with this number format will be modified to use the default number format
-     * 
-     * @param fmt the number format to remove
-     * @return true if the number format was removed
-     */
-    public boolean removeNumberFormat(String fmt) {
-        short id = getNumberFormatId(fmt);
-        return removeNumberFormat(id);
-    }
-
-    public XSSFFont getFontAt(int idx) {
-        return fonts.get(idx);
-    }
-
-    /**
-     * Records the given font in the font table.
-     * Will re-use an existing font index if this
-     *  font matches another, EXCEPT if forced
-     *  registration is requested.
-     * This allows people to create several fonts
-     *  then customise them later.
-     * Note - End Users probably want to call
-     *  {@link XSSFFont#registerTo(StylesTable)}
-     */
-    public int putFont(XSSFFont font, boolean forceRegistration) {
-        int idx = -1;
-        if(!forceRegistration) {
-            idx = fonts.indexOf(font);
-        }
-
-        if (idx != -1) {
-            return idx;
-        }
-
-        idx = fonts.size();
-        fonts.add(font);
-        return idx;
-    }
-    public int putFont(XSSFFont font) {
-        return putFont(font, false);
-    }
-
-    public XSSFCellStyle getStyleAt(int idx) {
-        int styleXfId = 0;
-
-        // 0 is the empty default
-        if(xfs.get(idx).getXfId() > 0) {
-            styleXfId = (int) xfs.get(idx).getXfId();
-        }
-
-        return new XSSFCellStyle(idx, styleXfId, this, theme);
-    }
-    public int putStyle(XSSFCellStyle style) {
-        CTXf mainXF = style.getCoreXf();
-
-        if(! xfs.contains(mainXF)) {
-            xfs.add(mainXF);
-        }
-        return xfs.indexOf(mainXF);
-    }
-
-    public XSSFCellBorder getBorderAt(int idx) {
-        return borders.get(idx);
-    }
-
-    /**
-     * Adds a border to the border style table if it isn't already in the style table
-     * Does nothing if border is already in borders style table
-     *
-     * @param border border to add
-     * @return the index of the added border
-     */
-    public int putBorder(XSSFCellBorder border) {
-        int idx = borders.indexOf(border);
-        if (idx != -1) {
-            return idx;
-        }
-        borders.add(border);
-        border.setThemesTable(theme);
-        return borders.size() - 1;
-    }
-
-    public XSSFCellFill getFillAt(int idx) {
-        return fills.get(idx);
-    }
-
-    public List<XSSFCellBorder> getBorders(){
-        return Collections.unmodifiableList(borders);
-    }
-
-    public List<XSSFCellFill> getFills(){
-        return Collections.unmodifiableList(fills);
-    }
-
-    public List<XSSFFont> getFonts(){
-        return Collections.unmodifiableList(fonts);
-    }
-
-    public Map<Short, String> getNumberFormats(){
-        return Collections.unmodifiableMap(numberFormats);
-    }
-
-    /**
-     * Adds a fill to the fill style table if it isn't already in the style table
-     * Does nothing if fill is already in fill style table
-     *
-     * @param fill fill to add
-     * @return the index of the added fill
-     */
-    public int putFill(XSSFCellFill fill) {
-        int idx = fills.indexOf(fill);
-        if (idx != -1) {
-            return idx;
-        }
-        fills.add(fill);
-        return fills.size() - 1;
-    }
-
-    @Internal
-    public CTXf getCellXfAt(int idx) {
-        return xfs.get(idx);
-    }
-    
-    /**
-     * Adds a cell to the styles table.
-     * Does not check for duplicates.
-     * 
-     * @param cellXf the cell to add to the styles table
-     * @return the added cell ID in the style table
-     */
-    @Internal
-    public int putCellXf(CTXf cellXf) {
-        xfs.add(cellXf);
-        return xfs.size();
-    }
-    
-    @Internal
-    public void replaceCellXfAt(int idx, CTXf cellXf) {
-        xfs.set(idx, cellXf);
-    }
-
-    @Internal
-    public CTXf getCellStyleXfAt(int idx) {
-        try {
-            return styleXfs.get(idx);
-        }
-        catch (final IndexOutOfBoundsException e) {
-            return null;
-        }
-    }
-    
-    /**
-     * Adds a cell style to the styles table.
-     * Does not check for duplicates.
-     * 
-     * @param cellStyleXf the cell style to add to the styles table
-     * @return the cell style ID in the style table
-     */
-    @Internal
-    public int putCellStyleXf(CTXf cellStyleXf) {
-        styleXfs.add(cellStyleXf);
-        // TODO: check for duplicate
-        return styleXfs.size();
-    }
-    
-    @Internal
-    protected void replaceCellStyleXfAt(int idx, CTXf cellStyleXf) {
-        styleXfs.set(idx, cellStyleXf);
-    }
-
-    /**
-     * get the size of cell styles
-     */
-    public int getNumCellStyles(){
-        // Each cell style has a unique xfs entry
-        // Several might share the same styleXfs entry
-        return xfs.size();
-    }
-
-    /**
-     * @return number of data formats in the styles table
-     */
-    public int getNumDataFormats() {
-        return numberFormats.size();
-    }
-    
-    /**
-     * For unit testing only
-     * @deprecated POI 3.14 beta 2. Use {@link #getNumDataFormats()} instead.
-     */
-    @Internal
-    public int _getNumberFormatSize() {
-        return getNumDataFormats();
-    }
-
-    /**
-     * For unit testing only
-     */
-    @Internal
-    /*package*/ int _getXfsSize() {
-        return xfs.size();
-    }
-    /**
-     * For unit testing only
-     */
-    @Internal
-    public int _getStyleXfsSize() {
-        return styleXfs.size();
-    }
-    
-    /**
-     * For unit testing only!
-     */
-    @Internal
-    public CTStylesheet getCTStylesheet() {
-        return doc.getStyleSheet();
-    }
-    
-    @Internal
-    public int _getDXfsSize() {
-        return dxfs.size();
-    }
-
-
-    /**
-     * Write this table out as XML.
-     *
-     * @param out The stream to write to.
-     * @throws IOException if an error occurs while writing.
-     */
-    public void writeTo(OutputStream out) throws IOException {
-        // Work on the current one
-        // Need to do this, as we don't handle
-        //  all the possible entries yet
-        CTStylesheet styleSheet = doc.getStyleSheet();
-
-        // Formats
-        CTNumFmts formats = CTNumFmts.Factory.newInstance();
-        formats.setCount(numberFormats.size());
-        for (final Entry<Short, String> entry : numberFormats.entrySet()) {
-            CTNumFmt ctFmt = formats.addNewNumFmt();
-            ctFmt.setNumFmtId(entry.getKey());
-            ctFmt.setFormatCode(entry.getValue());
-        }
-        styleSheet.setNumFmts(formats);
-
-        int idx;
-        // Fonts
-        CTFonts ctFonts = styleSheet.getFonts();
-        if (ctFonts == null) {
-            ctFonts = CTFonts.Factory.newInstance();
-        }
-        ctFonts.setCount(fonts.size());
-        CTFont[] ctfnt = new CTFont[fonts.size()];
-        idx = 0;
-        for(XSSFFont f : fonts) ctfnt[idx++] = f.getCTFont();
-        ctFonts.setFontArray(ctfnt);
-        styleSheet.setFonts(ctFonts);
-
-        // Fills
-        CTFills ctFills = styleSheet.getFills();
-        if (ctFills == null) {
-            ctFills = CTFills.Factory.newInstance();
-        }
-        ctFills.setCount(fills.size());
-        CTFill[] ctf = new CTFill[fills.size()];
-        idx = 0;
-        for(XSSFCellFill f : fills) ctf[idx++] = f.getCTFill();
-        ctFills.setFillArray(ctf);
-        styleSheet.setFills(ctFills);
-
-        // Borders
-        CTBorders ctBorders = styleSheet.getBorders();
-        if (ctBorders == null) {
-            ctBorders = CTBorders.Factory.newInstance();
-        }
-        ctBorders.setCount(borders.size());
-        CTBorder[] ctb = new CTBorder[borders.size()];
-        idx = 0;
-        for(XSSFCellBorder b : borders) ctb[idx++] = b.getCTBorder();
-        ctBorders.setBorderArray(ctb);
-        styleSheet.setBorders(ctBorders);
-
-        // Xfs
-        if(xfs.size() > 0) {
-            CTCellXfs ctXfs = styleSheet.getCellXfs();
-            if (ctXfs == null) {
-                ctXfs = CTCellXfs.Factory.newInstance();
-            }
-            ctXfs.setCount(xfs.size());
-            ctXfs.setXfArray(
-                    xfs.toArray(new CTXf[xfs.size()])
-            );
-            styleSheet.setCellXfs(ctXfs);
-        }
-
-        // Style xfs
-        if(styleXfs.size() > 0) {
-            CTCellStyleXfs ctSXfs = styleSheet.getCellStyleXfs();
-            if (ctSXfs == null) {
-                ctSXfs = CTCellStyleXfs.Factory.newInstance();
-            }
-            ctSXfs.setCount(styleXfs.size());
-            ctSXfs.setXfArray(
-                    styleXfs.toArray(new CTXf[styleXfs.size()])
-            );
-            styleSheet.setCellStyleXfs(ctSXfs);
-        }
-
-        // Style dxfs
-        if(dxfs.size() > 0) {
-            CTDxfs ctDxfs = styleSheet.getDxfs();
-            if (ctDxfs == null) {
-                ctDxfs = CTDxfs.Factory.newInstance();
-            }
-            ctDxfs.setCount(dxfs.size());
-            ctDxfs.setDxfArray(dxfs.toArray(new CTDxf[dxfs.size()]));
-            styleSheet.setDxfs(ctDxfs);
-        }
-
-        // Save
-        doc.save(out, DEFAULT_XML_OPTIONS);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        writeTo(out);
-        out.close();
-    }
-
-    private void initialize() {
-        //CTFont ctFont = createDefaultFont();
-        XSSFFont xssfFont = createDefaultFont();
-        fonts.add(xssfFont);
-
-        CTFill[] ctFill = createDefaultFills();
-        fills.add(new XSSFCellFill(ctFill[0]));
-        fills.add(new XSSFCellFill(ctFill[1]));
-
-        CTBorder ctBorder = createDefaultBorder();
-        borders.add(new XSSFCellBorder(ctBorder));
-
-        CTXf styleXf = createDefaultXf();
-        styleXfs.add(styleXf);
-        CTXf xf = createDefaultXf();
-        xf.setXfId(0);
-        xfs.add(xf);
-    }
-
-    private static CTXf createDefaultXf() {
-        CTXf ctXf = CTXf.Factory.newInstance();
-        ctXf.setNumFmtId(0);
-        ctXf.setFontId(0);
-        ctXf.setFillId(0);
-        ctXf.setBorderId(0);
-        return ctXf;
-    }
-    private static CTBorder createDefaultBorder() {
-        CTBorder ctBorder = CTBorder.Factory.newInstance();
-        ctBorder.addNewBottom();
-        ctBorder.addNewTop();
-        ctBorder.addNewLeft();
-        ctBorder.addNewRight();
-        ctBorder.addNewDiagonal();
-        return ctBorder;
-    }
-
-
-    private static CTFill[] createDefaultFills() {
-        CTFill[] ctFill = new CTFill[]{CTFill.Factory.newInstance(),CTFill.Factory.newInstance()};
-        ctFill[0].addNewPatternFill().setPatternType(STPatternType.NONE);
-        ctFill[1].addNewPatternFill().setPatternType(STPatternType.DARK_GRAY);
-        return ctFill;
-    }
-
-    private static XSSFFont createDefaultFont() {
-        CTFont ctFont = CTFont.Factory.newInstance();
-        XSSFFont xssfFont=new XSSFFont(ctFont, 0);
-        xssfFont.setFontHeightInPoints(XSSFFont.DEFAULT_FONT_SIZE);
-        xssfFont.setColor(XSSFFont.DEFAULT_FONT_COLOR);//setTheme
-        xssfFont.setFontName(XSSFFont.DEFAULT_FONT_NAME);
-        xssfFont.setFamily(FontFamily.SWISS);
-        xssfFont.setScheme(FontScheme.MINOR);
-        return xssfFont;
-    }
-
-    @Internal
-    public CTDxf getDxfAt(int idx) {
-        return dxfs.get(idx);
-    }
-
-    /**
-     * Adds a Dxf to the style table
-     * Does not check for duplicates.
-     *
-     * @param dxf the Dxf to add
-     * @return added dxf ID in the style table
-     */
-    @Internal
-    public int putDxf(CTDxf dxf) {
-        this.dxfs.add(dxf);
-        return this.dxfs.size();
-    }
-
-    /**
-     * Create a cell style in this style table.
-     * Note - End users probably want to call {@link XSSFWorkbook#createCellStyle()}
-     * rather than working with the styles table directly.
-     * @throws IllegalStateException if the maximum number of cell styles has been reached. 
-     */
-    public XSSFCellStyle createCellStyle() {
-        if (getNumCellStyles() > MAXIMUM_STYLE_ID) {
-            throw new IllegalStateException("The maximum number of Cell Styles was exceeded. " +
-                      "You can define up to " + MAXIMUM_STYLE_ID + " style in a .xlsx Workbook");
-        }
-
-        int xfSize = styleXfs.size();
-        CTXf xf = CTXf.Factory.newInstance();
-        xf.setNumFmtId(0);
-        xf.setFontId(0);
-        xf.setFillId(0);
-        xf.setBorderId(0);
-        xf.setXfId(0);
-        int indexXf = putCellXf(xf);
-        return new XSSFCellStyle(indexXf - 1, xfSize - 1, this, theme);
-    }
-
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     * @deprecated POI 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead.
-     */
-    public XSSFFont findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline) {
-        for (XSSFFont font : fonts) {
-            if (	(font.getBoldweight() == boldWeight)
-                    && font.getColor() == color
-                    && font.getFontHeight() == fontHeight
-                    && font.getFontName().equals(name)
-                    && font.getItalic() == italic
-                    && font.getStrikeout() == strikeout
-                    && font.getTypeOffset() == typeOffset
-                    && font.getUnderline() == underline)
-            {
-                return font;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     */
-    public XSSFFont findFont(boolean bold, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline) {
-        for (XSSFFont font : fonts) {
-            if (    (font.getBold() == bold)
-                    && font.getColor() == color
-                    && font.getFontHeight() == fontHeight
-                    && font.getFontName().equals(name)
-                    && font.getItalic() == italic
-                    && font.getStrikeout() == strikeout
-                    && font.getTypeOffset() == typeOffset
-                    && font.getUnderline() == underline)
-            {
-                return font;
-            }
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java
deleted file mode 100644
index 0fe4abf..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.model;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColorScheme;
-import org.openxmlformats.schemas.drawingml.x2006.main.ThemeDocument;
-
-/**
- * Class that represents theme of XLSX document. The theme includes specific
- * colors and fonts.
- */
-public class ThemesTable extends POIXMLDocumentPart {
-   public enum ThemeElement {
-       LT1(0, "Lt1"),
-       DK1(1,"Dk1"),
-       LT2(2,"Lt2"),
-       DK2(3,"Dk2"),
-       ACCENT1(4,"Accent1"),
-       ACCENT2(5,"Accent2"),
-       ACCENT3(6,"Accent3"),
-       ACCENT4(7,"Accent4"),
-       ACCENT5(8,"Accent5"),
-       ACCENT6(9,"Accent6"),
-       HLINK(10,"Hlink"),
-       FOLHLINK(11,"FolHlink"),
-       UNKNOWN(-1,null);
-       
-       public static ThemeElement byId(int idx) {
-           if (idx >= values().length || idx < 0) return UNKNOWN;
-           return values()[idx];
-       }
-       private ThemeElement(int idx, String name) {
-           this.idx = idx; this.name = name;
-       }
-       public final int idx;
-       public final String name;
-   }
-
-    private ThemeDocument theme;
-
-    /**
-     * Create a new, empty ThemesTable
-     */
-    public ThemesTable() {
-        super();
-        theme = ThemeDocument.Factory.newInstance();
-        theme.addNewTheme().addNewThemeElements();
-    }
-    
-    /**
-     * Construct a ThemesTable.
-     * @param part A PackagePart.
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public ThemesTable(PackagePart part) throws IOException {
-        super(part);
-        
-        try {
-           theme = ThemeDocument.Factory.parse(part.getInputStream(), DEFAULT_XML_OPTIONS);
-        } catch(XmlException e) {
-           throw new IOException(e.getLocalizedMessage(), e);
-        }
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public ThemesTable(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    /**
-     * Construct a ThemesTable from an existing ThemeDocument.
-     * @param theme A ThemeDocument.
-     */
-    public ThemesTable(ThemeDocument theme) {
-        this.theme = theme;
-    }
-
-    /**
-     * Convert a theme "index" (as used by fonts etc) into a color.
-     * @param idx A theme "index"
-     * @return The mapped XSSFColor, or null if not mapped.
-     */
-    public XSSFColor getThemeColor(int idx) {
-        // Theme color references are NOT positional indices into the color scheme,
-        // i.e. these keys are NOT the same as the order in which theme colors appear
-        // in theme1.xml. They are keys to a mapped color.
-        CTColorScheme colorScheme = theme.getTheme().getThemeElements().getClrScheme();
-        CTColor ctColor;
-        switch (ThemeElement.byId(idx)) {
-            case LT1: ctColor = colorScheme.getLt1(); break;
-            case DK1: ctColor = colorScheme.getDk1(); break;
-            case LT2: ctColor = colorScheme.getLt2(); break;
-            case DK2: ctColor = colorScheme.getDk2(); break;
-            case ACCENT1: ctColor = colorScheme.getAccent1(); break;
-            case ACCENT2: ctColor = colorScheme.getAccent2(); break;
-            case ACCENT3: ctColor = colorScheme.getAccent3(); break;
-            case ACCENT4: ctColor = colorScheme.getAccent4(); break;
-            case ACCENT5: ctColor = colorScheme.getAccent5(); break;
-            case ACCENT6: ctColor = colorScheme.getAccent6(); break;
-            case HLINK:   ctColor = colorScheme.getHlink();   break;
-            case FOLHLINK:ctColor = colorScheme.getFolHlink();break;
-            default: return null;
-        }
-
-        byte[] rgb = null;
-        if (ctColor.isSetSrgbClr()) {
-            // Color is a regular one
-            rgb = ctColor.getSrgbClr().getVal();
-        } else if (ctColor.isSetSysClr()) {
-            // Color is a tint of white or black
-            rgb = ctColor.getSysClr().getLastClr();
-        } else {
-            return null;
-        }
-        return new XSSFColor(rgb);        
-    }
-    
-    /**
-     * If the colour is based on a theme, then inherit
-     *  information (currently just colours) from it as
-     *  required.
-     */
-    public void inheritFromThemeAsRequired(XSSFColor color) {
-       if(color == null) {
-          // Nothing for us to do
-          return;
-       }
-       if(! color.getCTColor().isSetTheme()) {
-          // No theme set, nothing to do
-          return;
-       }
-
-       // Get the theme colour
-       XSSFColor themeColor = getThemeColor(color.getTheme());
-       // Set the raw colour, not the adjusted one
-       // Do a raw set, no adjusting at the XSSFColor layer either
-       color.getCTColor().setRgb(themeColor.getCTColor().getRgb());
-
-       // All done
-    }
-    
-    /**
-     * Write this table out as XML.
-     * 
-     * @param out The stream to write to.
-     * @throws IOException if an error occurs while writing.
-     */
-    public void writeTo(OutputStream out) throws IOException {
-        theme.save(out, DEFAULT_XML_OPTIONS);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        writeTo(out);
-        out.close();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
deleted file mode 100644
index 03a29a3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.SheetUtil;
-import org.apache.poi.util.Internal;
-
-/**
- * Tracks best fit column width for rows of an {@link SXSSFSheet},
- * to be able to correctly calculate auto-sized column widths even
- * if some rows are already flushed to disk.
- * This is an auxiliary data structure that uses a TreeMap containing
- * one entry per tracked column, where the key is the column index and
- * the value is a pair of doubles. This data structure's memory footprint
- * is linear with the number of *tracked* columns and invariant with
- * the number of rows or columns in the sheet.
- * @since 3.14beta1
-*/
-@Internal
-/*package*/ class AutoSizeColumnTracker {
-    private final int defaultCharWidth;
-    private final DataFormatter dataFormatter = new DataFormatter();
-
-    // map of tracked columns, with values containing the best-fit width for the column
-    // Using a HashMap instead of a TreeMap because insertion (trackColumn), removal (untrackColumn), and membership (everything)
-    // will be called more frequently than getTrackedColumns(). The O(1) cost of insertion, removal, and membership operations
-    // outweigh the infrequent O(n*log n) cost of sorting getTrackedColumns().
-    // Memory consumption for a HashMap and TreeMap is about the same
-    private final Map<Integer, ColumnWidthPair> maxColumnWidths = new HashMap<Integer, ColumnWidthPair>();
-    // untrackedColumns stores columns have been explicitly untracked so they aren't implicitly re-tracked by trackAllColumns
-    // Using a HashSet instead of a TreeSet because we don't care about order.
-    private final Set<Integer> untrackedColumns = new HashSet<Integer>();
-    private boolean trackAllColumns = false;
-
-    /**
-     * Tuple to store the column widths considering and not considering merged cells
-     * If more permutations are needed, it may be prudent to require the user to specify
-     * how they intend to auto-size a column when they track the column, so calculations
-     * are limited to the desired intentions. Unless this proves to be a performance problem,
-     * it's probably better to let the user defer how they want to auto-size to SXSSFSheet.autoSizeColumn,
-     * rather than twice (via SXSSFSheet.trackColumn(int column, boolean useMergedCells) and again at
-     * SXSFSheet.autoSizeColumn(int column, boolean useMergedCells))
-     * @since 3.14beta1
-     */
-    private static class ColumnWidthPair {
-        private double withSkipMergedCells;
-        private double withUseMergedCells;
-        
-        public ColumnWidthPair() {
-            this(-1.0, -1.0);
-        }
-        
-        public ColumnWidthPair(final double columnWidthSkipMergedCells, final double columnWidthUseMergedCells) {
-            withSkipMergedCells = columnWidthSkipMergedCells;
-            withUseMergedCells = columnWidthUseMergedCells;
-        }
-        
-        /**
-         * Gets the current best-fit column width for the provided settings
-         *
-         * @param useMergedCells true if merged cells are considered into the best-fit column width calculation
-         * @return best fit column width, measured in default character widths.
-         */
-        public double getMaxColumnWidth(final boolean useMergedCells) {
-            return useMergedCells ? withUseMergedCells : withSkipMergedCells;
-        }
-        
-        /**
-         * Sets the best-fit column width to the maximum of the current width and the provided width
-         *
-         * @param unmergedWidth the best-fit column width calculated with useMergedCells=False
-         * @param mergedWidth the best-fit column width calculated with useMergedCells=True
-         */
-        public void setMaxColumnWidths(double unmergedWidth, double mergedWidth) {
-            withUseMergedCells = Math.max(withUseMergedCells, mergedWidth);
-            withSkipMergedCells = Math.max(withUseMergedCells, unmergedWidth);
-        }
-    }
-    
-    /**
-     * AutoSizeColumnTracker constructor. Holds no reference to <code>sheet</code>
-     *
-     * @param sheet the sheet associated with this auto-size column tracker
-     * @since 3.14beta1
-     */
-    public AutoSizeColumnTracker(final Sheet sheet) {
-        // If sheet needs to be saved, use a java.lang.ref.WeakReference to avoid garbage collector gridlock.
-        defaultCharWidth = SheetUtil.getDefaultCharWidth(sheet.getWorkbook());
-    }
-    
-    /**
-     * Get the currently tracked columns, naturally ordered.
-     * Note if all columns are tracked, this will only return the columns that have been explicitly or implicitly tracked,
-     * which is probably only columns containing 1 or more non-blank values
-     *
-     * @return a set of the indices of all tracked columns
-     * @since 3.14beta1
-     */
-    public SortedSet<Integer> getTrackedColumns() {
-        SortedSet<Integer> sorted = new TreeSet<Integer>(maxColumnWidths.keySet());
-        return Collections.unmodifiableSortedSet(sorted);
-    }
-    
-    /**
-     * Returns true if column is currently tracked for auto-sizing.
-     *
-     * @param column the index of the column to check
-     * @return true if column is tracked
-     * @since 3.14beta1
-     */
-    public boolean isColumnTracked(int column) {
-        return trackAllColumns || maxColumnWidths.containsKey(column);
-    }
-    
-    /**
-     * Returns true if all columns are implicitly tracked.
-     *
-     * @return true if all columns are implicitly tracked
-     * @since 3.14beta1
-     */
-    public boolean isAllColumnsTracked() {
-        return trackAllColumns;
-    }
-    
-    /**
-     * Tracks all non-blank columns
-     * Allows columns that have been explicitly untracked to be tracked
-     * @since 3.14beta1
-     */
-    public void trackAllColumns() {
-        trackAllColumns = true;
-        untrackedColumns.clear();
-    }
-    
-    /**
-     * Untrack all columns that were previously tracked for auto-sizing.
-     * All best-fit column widths are forgotten.
-     * @since 3.14beta1
-     */
-    public void untrackAllColumns() {
-        trackAllColumns = false;
-        maxColumnWidths.clear();
-        untrackedColumns.clear();
-    }
-    
-    /**
-     * Marks multiple columns for inclusion in auto-size column tracking.
-     * Note this has undefined behavior if columns are tracked after one or more rows are written to the sheet.
-     * Any column in <code>columns</code> that are already tracked are ignored by this call. 
-     *
-     * @param columns the indices of the columns to track
-     * @since 3.14beta1
-     */
-    public void trackColumns(Collection<Integer> columns)
-    {
-        for (final int column : columns) {
-            trackColumn(column);
-        }
-    }
-
-    /**
-     * Marks a column for inclusion in auto-size column tracking.
-     * Note this has undefined behavior if a column is tracked after one or more rows are written to the sheet.
-     * If <code>column</code> is already tracked, this call does nothing.
-     *
-     * @param column the index of the column to track for auto-sizing
-     * @return if column is already tracked, the call does nothing and returns false
-     * @since 3.14beta1
-     */
-    public boolean trackColumn(int column) {
-        untrackedColumns.remove(column);
-        if (!maxColumnWidths.containsKey(column)) {
-            maxColumnWidths.put(column, new ColumnWidthPair());
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     * Implicitly track a column if it has not been explicitly untracked
-     * If it has been explicitly untracked, this call does nothing and returns false.
-     * Otherwise return true
-     *
-     * @param column the column to implicitly track
-     * @return false if column has been explicitly untracked, otherwise return true
-     */
-    private boolean implicitlyTrackColumn(int column) {
-        if (!untrackedColumns.contains(column)) {
-            trackColumn(column);
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     * Removes columns that were previously marked for inclusion in auto-size column tracking.
-     * When a column is untracked, the best-fit width is forgotten.
-     * Any column in <code>columns</code> that is not tracked will be ignored by this call.
-     *
-     * @param columns the indices of the columns to track for auto-sizing
-     * @return true if one or more columns were untracked as a result of this call
-     * @since 3.14beta1
-     */
-    public boolean untrackColumns(Collection<Integer> columns)
-    {
-        untrackedColumns.addAll(columns);
-        return maxColumnWidths.keySet().removeAll(columns);
-    }
-    
-    /**
-     * Removes a column that was previously marked for inclusion in auto-size column tracking.
-     * When a column is untracked, the best-fit width is forgotten.
-     * If <code>column</code> is not tracked, it will be ignored by this call.
-     *
-     * @param column the index of the column to track for auto-sizing
-     * @return true if column was tracked prior this call, false if no action was taken
-     * @since 3.14beta1
-     */
-    public boolean untrackColumn(int column) {
-        untrackedColumns.add(column);
-        return maxColumnWidths.keySet().remove(column);
-    }
-
-    /**
-     * Get the best-fit width of a tracked column
-     *
-     * @param column the index of the column to get the current best-fit width of
-     * @param useMergedCells true if merged cells should be considered when computing the best-fit width
-     * @return best-fit column width, measured in number of characters
-     * @throws IllegalStateException if column is not tracked and trackAllColumns is false
-     * @since 3.14beta1
-     */
-    public int getBestFitColumnWidth(int column, boolean useMergedCells) {
-        if (!maxColumnWidths.containsKey(column)) {
-            // if column is not tracked, implicitly track the column if trackAllColumns is True and column has not been explicitly untracked
-            if (trackAllColumns) {
-                if (!implicitlyTrackColumn(column)) {
-                    final Throwable reason = new IllegalStateException(
-                            "Column was explicitly untracked after trackAllColumns() was called.");
-                    throw new IllegalStateException(
-                            "Cannot get best fit column width on explicitly untracked column " + column + ". " +
-                            "Either explicitly track the column or track all columns.", reason);
-                }
-            }
-            else {
-                final Throwable reason = new IllegalStateException(
-                        "Column was never explicitly tracked and isAllColumnsTracked() is false " +
-                        "(trackAllColumns() was never called or untrackAllColumns() was called after trackAllColumns() was called).");
-                throw new IllegalStateException(
-                        "Cannot get best fit column width on untracked column " + column + ". " +
-                        "Either explicitly track the column or track all columns.", reason);
-            }
-        }
-        final double width = maxColumnWidths.get(column).getMaxColumnWidth(useMergedCells);
-        return (int) (256*width);
-    }
-    
-
-    
-    /**
-     * Calculate the best fit width for each tracked column in row
-     *
-     * @param row the row to get the cells
-     * @since 3.14beta1
-     */
-    public void updateColumnWidths(Row row) {
-        // track new columns
-        implicitlyTrackColumnsInRow(row);
-        
-        // update the widths
-        // for-loop over the shorter of the number of cells in the row and the number of tracked columns
-        // these two for-loops should do the same thing
-        if (maxColumnWidths.size() < row.getPhysicalNumberOfCells()) {
-            // loop over the tracked columns, because there are fewer tracked columns than cells in this row
-            for (final Entry<Integer, ColumnWidthPair> e : maxColumnWidths.entrySet()) {
-                final int column = e.getKey();
-                final Cell cell = row.getCell(column); //is MissingCellPolicy=Row.RETURN_NULL_AND_BLANK needed?
-
-                // FIXME: if cell belongs to a merged region, some of the merged region may have fallen outside of the random access window
-                // In this case, getting the column width may result in an error. Need to gracefully handle this.
-
-                // FIXME: Most cells are not merged, so calling getCellWidth twice re-computes the same value twice.
-                // Need to rewrite this to avoid unnecessary computation if this proves to be a performance bottleneck.
-
-                if (cell != null) {
-                    final ColumnWidthPair pair = e.getValue();
-                    updateColumnWidth(cell, pair);
-                }
-            }
-        }
-        else {
-            // loop over the cells in this row, because there are fewer cells in this row than tracked columns
-            for (final Cell cell : row) {
-                final int column = cell.getColumnIndex();
-
-                // FIXME: if cell belongs to a merged region, some of the merged region may have fallen outside of the random access window
-                // In this case, getting the column width may result in an error. Need to gracefully handle this.
-
-                // FIXME: Most cells are not merged, so calling getCellWidth twice re-computes the same value twice.
-                // Need to rewrite this to avoid unnecessary computation if this proves to be a performance bottleneck.
-
-                if (maxColumnWidths.containsKey(column)) {
-                    final ColumnWidthPair pair = maxColumnWidths.get(column);
-                    updateColumnWidth(cell, pair);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Helper for {@link #updateColumnWidths(Row)}.
-     * Implicitly track the columns corresponding to the cells in row.
-     * If all columns in the row are already tracked, this call does nothing.
-     * Explicitly untracked columns will not be tracked.
-     *
-     * @param row the row containing cells to implicitly track the columns
-     * @since 3.14beta1
-     */
-    private void implicitlyTrackColumnsInRow(Row row) {
-        // track new columns
-        if (trackAllColumns) {
-            // if column is not tracked, implicitly track the column if trackAllColumns is True and column has not been explicitly untracked 
-            for (final Cell cell : row) {
-                final int column = cell.getColumnIndex();
-                implicitlyTrackColumn(column);
-            }
-        }
-    }
-    
-    /**
-     * Helper for {@link #updateColumnWidths(Row)}.
-     *
-     * @param cell the cell to compute the best fit width on
-     * @param pair the column width pair to update
-     * @since 3.14beta1
-     */
-    private void updateColumnWidth(final Cell cell, final ColumnWidthPair pair) {
-        final double unmergedWidth = SheetUtil.getCellWidth(cell, defaultCharWidth, dataFormatter, false);
-        final double mergedWidth = SheetUtil.getCellWidth(cell, defaultCharWidth, dataFormatter, true);
-        pair.setMaxColumnWidths(unmergedWidth, mergedWidth);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
deleted file mode 100644
index 45ce381..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.model.SharedStringsTable;
-
-/**
- * Sheet writer that supports gzip compression of the temp files.
- */
-public class GZIPSheetDataWriter extends SheetDataWriter {
-
-    public GZIPSheetDataWriter() throws IOException {
-        super();
-    }
-	
-	/**
-     * @param sharedStringsTable the shared strings table, or null if inline text is used
-     */
-	public GZIPSheetDataWriter(SharedStringsTable sharedStringsTable) throws IOException {
-        super(sharedStringsTable);
-    }
-
-    /**
-     * @return temp file to write sheet data
-     */
-    @Override
-    public File createTempFile() throws IOException {
-        return TempFile.createTempFile("poi-sxssf-sheet-xml", ".gz");
-    }
-
-    @Override
-    protected InputStream decorateInputStream(FileInputStream fis) throws IOException {
-        return new GZIPInputStream(fis);
-    }
-
-    @Override
-    protected OutputStream decorateOutputStream(FileOutputStream fos) throws IOException {
-        return new GZIPOutputStream(fos);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
deleted file mode 100644
index 3a1d85c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
+++ /dev/null
@@ -1,1306 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
-import org.apache.poi.xssf.usermodel.XSSFHyperlink;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-
-/**
- * Streaming version of XSSFRow implementing the "BigGridDemo" strategy.
-*/
-public class SXSSFCell implements Cell {
-    private static final POILogger logger = POILogFactory.getLogger(SXSSFCell.class);
-
-    private final SXSSFRow _row;
-    private Value _value;
-    private CellStyle _style;
-    private Property _firstProperty;
-    
-    /**
-     * @deprecated POI 3.15 beta 3.
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Removal(version="3.17")
-    @Deprecated
-    public SXSSFCell(SXSSFRow row, int cellType)
-    {
-        this(row, CellType.forInt((cellType)));
-    }
-
-    public SXSSFCell(SXSSFRow row,CellType cellType)
-    {
-        _row=row;
-        setType(cellType);
-    }
-
-//start of interface implementation
-
-    /**
-     * Returns column index of this cell
-     *
-     * @return zero-based column index of a column in a sheet.
-     */
-    @Override
-    public int getColumnIndex()
-    {
-        return _row.getCellIndex(this);
-    }
-
-    /**
-     * Returns row index of a row in the sheet that contains this cell
-     *
-     * @return zero-based row index of a row in the sheet that contains this cell
-     */
-    @Override
-    public int getRowIndex()
-    {
-        return _row.getRowNum();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public CellAddress getAddress() {
-        return new CellAddress(this);
-    }
-
-    /**
-     * Returns the sheet this cell belongs to
-     *
-     * @return the sheet this cell belongs to
-     */
-    @Override
-    public SXSSFSheet getSheet()
-    {
-        return _row.getSheet();
-    }
-
-    /**
-     * Returns the Row this cell belongs to
-     *
-     * @return the Row that owns this cell
-     */
-    @Override
-    public Row getRow()
-    {
-        return _row;
-    }
-
-    /**
-     * Set the cells type (numeric, formula or string)
-     *
-     * @throws IllegalArgumentException if the specified cell type is invalid
-     * @see CellType#NUMERIC
-     * @see CellType#STRING
-     * @see CellType#FORMULA
-     * @see CellType#BLANK
-     * @see CellType#BOOLEAN
-     * @see CellType#ERROR
-     * @deprecated POI 3.15 beta 3. Use {@link #setCellType(CellType)} instead.
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Override
-    public void setCellType(int cellType)
-    {
-        ensureType(CellType.forInt(cellType));
-    }
-    /**
-     * Set the cells type (numeric, formula or string)
-     *
-     * @throws IllegalArgumentException if the specified cell type is invalid
-     */
-    @Override
-    public void setCellType(CellType cellType)
-    {
-        ensureType(cellType);
-    }
-
-    /**
-     * Return the cell type.
-     *
-     * @return the cell type
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCellType()
-    {
-        return getCellTypeEnum().getCode();
-    }
-    
-    /**
-     * Return the cell type.
-     *
-     * @return the cell type
-     * @since POI 3.15 beta 3
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Override
-    public CellType getCellTypeEnum()
-    {
-        return _value.getType();
-    }
-
-    /**
-     * Only valid for formula cells
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCachedFormulaResultType()
-    {
-        return getCachedFormulaResultTypeEnum().getCode();
-    }
-
-    /**
-     * Only valid for formula cells
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @since POI 3.15 beta 3
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Override
-    public CellType getCachedFormulaResultTypeEnum()
-    {
-        if (_value.getType() != CellType.FORMULA) {
-            throw new IllegalStateException("Only formula cells have cached results");
-        }
-
-        return ((FormulaValue)_value).getFormulaType();
-    }
-
-    /**
-     * Set a numeric value for the cell
-     *
-     * @param value  the numeric value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    @Override
-    public void setCellValue(double value)
-    {
-        if(Double.isInfinite(value)) {
-            // Excel does not support positive/negative infinities,
-            // rather, it gives a #DIV/0! error in these cases.
-            setCellErrorValue(FormulaError.DIV0.getCode());
-        } else if (Double.isNaN(value)){
-            setCellErrorValue(FormulaError.NUM.getCode());
-        } else {
-            ensureTypeOrFormulaType(CellType.NUMERIC);
-            if(_value.getType()==CellType.FORMULA)
-                ((NumericFormulaValue)_value).setPreEvaluatedValue(value);
-            else
-                ((NumericValue)_value).setValue(value);
-        }
-    }
-
-    /**
-     * Converts the supplied date to its equivalent Excel numeric value and sets
-     * that into the cell.
-     * <p/>
-     * <b>Note</b> - There is actually no 'DATE' cell type in Excel. In many
-     * cases (when entering date values), Excel automatically adjusts the
-     * <i>cell style</i> to some date format, creating the illusion that the cell
-     * data type is now something besides {@link CellType#NUMERIC}.  POI
-     * does not attempt to replicate this behaviour.  To make a numeric cell
-     * display as a date, use {@link #setCellStyle(CellStyle)} etc.
-     *
-     * @param value the numeric value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numerics cell and set its value.
-     */
-    @Override
-    public void setCellValue(Date value) {
-        if(value == null) {
-            setCellType(CellType.BLANK);
-            return;
-        }
-
-        boolean date1904 = getSheet().getWorkbook().isDate1904();
-        setCellValue(DateUtil.getExcelDate(value, date1904));
-    }
-
-    /**
-     * Set a date value for the cell. Excel treats dates as numeric so you will need to format the cell as
-     * a date.
-     * <p>
-     * This will set the cell value based on the Calendar's timezone. As Excel
-     * does not support timezones this means that both 20:00+03:00 and
-     * 20:00-03:00 will be reported as the same value (20:00) even that there
-     * are 6 hours difference between the two times. This difference can be
-     * preserved by using <code>setCellValue(value.getTime())</code> which will
-     * automatically shift the times to the default timezone.
-     * </p>
-     *
-     * @param value  the date value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For othertypes we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    @Override
-    public void setCellValue(Calendar value) {
-        if(value == null) {
-            setCellType(CellType.BLANK);
-            return;
-        }
-
-        boolean date1904 = getSheet().getWorkbook().isDate1904();
-        setCellValue( DateUtil.getExcelDate(value, date1904 ));
-    }
-
-    /**
-     * Set a rich string value for the cell.
-     *
-     * @param value  value to set the cell to.  For formulas we'll set the formula
-     * string, for String cells we'll set its value.  For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is null then we will change the cell to a Blank cell.
-     */
-    @Override
-    public void setCellValue(RichTextString value)
-    {
-        XSSFRichTextString xvalue = (XSSFRichTextString)value;
-        
-        if (xvalue != null && xvalue.getString() != null) {
-            ensureRichTextStringType();
-            
-            if (xvalue.length() > SpreadsheetVersion.EXCEL2007.getMaxTextLength()) {
-                throw new IllegalArgumentException("The maximum length of cell contents (text) is 32,767 characters");
-            }
-            if (xvalue.hasFormatting())
-                logger.log(POILogger.WARN, "SXSSF doesn't support Shared Strings, rich text formatting information has be lost");
-            
-            ((RichTextValue)_value).setValue(xvalue);
-        } else {
-            setCellType(CellType.BLANK);
-        }
-    }
-
-    /**
-     * Set a string value for the cell.
-     *
-     * @param value  value to set the cell to.  For formulas we'll set the formula
-     * string, for String cells we'll set its value.  For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is null then we will change the cell to a Blank cell.
-     */
-    @Override
-    public void setCellValue(String value)
-    {
-        if (value != null) {
-            ensureTypeOrFormulaType(CellType.STRING);
-            
-            if (value.length() > SpreadsheetVersion.EXCEL2007.getMaxTextLength()) {
-                throw new IllegalArgumentException("The maximum length of cell contents (text) is 32,767 characters");
-            }
-    
-            if(_value.getType()==CellType.FORMULA)
-                if(_value instanceof NumericFormulaValue) {
-                    ((NumericFormulaValue) _value).setPreEvaluatedValue(Double.parseDouble(value));
-                } else {
-                    ((StringFormulaValue) _value).setPreEvaluatedValue(value);
-                }
-            else
-                ((PlainStringValue)_value).setValue(value);
-        } else {
-            setCellType(CellType.BLANK);
-        }
-    }
-
-    /**
-     * Sets formula for this cell.
-     * <p>
-     * Note, this method only sets the formula string and does not calculate the formula value.
-     * To set the precalculated value use {@link #setCellValue(double)} or {@link #setCellValue(String)}
-     * </p>
-     *
-     * @param formula the formula to set, e.g. <code>"SUM(C4:E4)"</code>.
-     *  If the argument is <code>null</code> then the current formula is removed.
-     * @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     */
-    @Override
-    public void setCellFormula(String formula) throws FormulaParseException
-    {
-        if(formula == null) {
-            setType(CellType.BLANK);
-            return;
-        }
-
-        ensureFormulaType(computeTypeFromFormula(formula));
-        ((FormulaValue)_value).setValue(formula);
-    }
-    /**
-     * Return a formula for the cell, for example, <code>SUM(C4:E4)</code>
-     *
-     * @return a formula for the cell
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is not CellType.FORMULA
-     */
-    @Override
-    public String getCellFormula()
-    {
-       if(_value.getType()!=CellType.FORMULA)
-           throw typeMismatch(CellType.FORMULA,_value.getType(),false);
-        return ((FormulaValue)_value).getValue();
-    }
-
-    /**
-     * Get the value of the cell as a number.
-     * <p>
-     * For strings we throw an exception. For blank cells we return a 0.
-     * For formulas or error cells we return the precalculated value;
-     * </p>
-     * @return the value of the cell as a number
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is CellType.STRING
-     * @exception NumberFormatException if the cell value isn't a parsable <code>double</code>.
-     * @see org.apache.poi.ss.usermodel.DataFormatter for turning this number into a string similar to that which Excel would render this number as.
-     */
-    @Override
-    public double getNumericCellValue()
-    {
-        CellType cellType = getCellTypeEnum();
-        switch(cellType) 
-        {
-            case BLANK:
-                return 0.0;
-            case FORMULA:
-            {
-                FormulaValue fv=(FormulaValue)_value;
-                if(fv.getFormulaType()!=CellType.NUMERIC)
-                      throw typeMismatch(CellType.NUMERIC, CellType.FORMULA, false);
-                return ((NumericFormulaValue)_value).getPreEvaluatedValue();
-            }
-            case NUMERIC:
-                return ((NumericValue)_value).getValue();
-            default:
-                throw typeMismatch(CellType.NUMERIC, cellType, false);
-        }
-    }
-
-    /**
-     * Get the value of the cell as a date.
-     * <p>
-     * For strings we throw an exception. For blank cells we return a null.
-     * </p>
-     * @return the value of the cell as a date
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is CellType.STRING
-     * @exception NumberFormatException if the cell value isn't a parsable <code>double</code>.
-     * @see org.apache.poi.ss.usermodel.DataFormatter for formatting  this date into a string similar to how excel does.
-     */
-    @Override
-    public Date getDateCellValue()
-    {
-        CellType cellType = getCellTypeEnum();
-        if (cellType == CellType.BLANK) 
-        {
-            return null;
-        }
-
-        double value = getNumericCellValue();
-        boolean date1904 = getSheet().getWorkbook().isDate1904();
-        return DateUtil.getJavaDate(value, date1904);
-    }
-
-    /**
-     * Get the value of the cell as a XSSFRichTextString
-     * <p>
-     * For numeric cells we throw an exception. For blank cells we return an empty string.
-     * For formula cells we return the pre-calculated value if a string, otherwise an exception.
-     * </p>
-     * @return the value of the cell as a XSSFRichTextString
-     */
-    @Override
-    public RichTextString getRichStringCellValue()
-    {
-        CellType cellType = getCellTypeEnum();
-        if(getCellTypeEnum() != CellType.STRING)
-            throw typeMismatch(CellType.STRING, cellType, false);
-
-        StringValue sval = (StringValue)_value;
-        if(sval.isRichText())
-            return ((RichTextValue)_value).getValue();
-        else {
-            String plainText = getStringCellValue();
-            return getSheet().getWorkbook().getCreationHelper().createRichTextString(plainText);
-        }
-    }
-
-
-    /**
-     * Get the value of the cell as a string
-     * <p>
-     * For numeric cells we throw an exception. For blank cells we return an empty string.
-     * For formulaCells that are not string Formulas, we throw an exception.
-     * </p>
-     * @return the value of the cell as a string
-     */
-    @Override
-    public String getStringCellValue()
-    {
-        CellType cellType = getCellTypeEnum();
-        switch(cellType) 
-        {
-            case BLANK:
-                return "";
-            case FORMULA:
-            {
-                FormulaValue fv=(FormulaValue)_value;
-                if(fv.getFormulaType()!=CellType.STRING)
-                      throw typeMismatch(CellType.STRING, CellType.FORMULA, false);
-                return ((StringFormulaValue)_value).getPreEvaluatedValue();
-            }
-            case STRING:
-            {
-                if(((StringValue)_value).isRichText())
-                    return ((RichTextValue)_value).getValue().getString();
-                else
-                    return ((PlainStringValue)_value).getValue();
-            }
-            default:
-                throw typeMismatch(CellType.STRING, cellType, false);
-        }
-    }
-
-    /**
-     * Set a boolean value for the cell
-     *
-     * @param value the boolean value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for booleans we'll set its value. For other types we
-     *        will change the cell to a boolean cell and set its value.
-     */
-    @Override
-    public void setCellValue(boolean value)
-    {
-        ensureTypeOrFormulaType(CellType.BOOLEAN);
-        if(_value.getType()==CellType.FORMULA)
-            ((BooleanFormulaValue)_value).setPreEvaluatedValue(value);
-        else
-            ((BooleanValue)_value).setValue(value);
-    }
-
-    /**
-     * Set a error value for the cell
-     *
-     * @param value the error value to set this cell to.  For formulas we'll set the
-     *        precalculated value , for errors we'll set
-     *        its value. For other types we will change the cell to an error
-     *        cell and set its value.
-     * @see org.apache.poi.ss.usermodel.FormulaError
-     */
-    @Override
-    public void setCellErrorValue(byte value)
-    {
-        ensureType(CellType.ERROR);
-        if(_value.getType()==CellType.FORMULA)
-            ((ErrorFormulaValue)_value).setPreEvaluatedValue(value);
-        else
-            ((ErrorValue)_value).setValue(value);
-    }
-
-    /**
-     * Get the value of the cell as a boolean.
-     * <p>
-     * For strings, numbers, and errors, we throw an exception. For blank cells we return a false.
-     * </p>
-     * @return the value of the cell as a boolean
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()}
-     *   is not CellType.BOOLEAN, CellType.BLANK or CellType.FORMULA
-     */
-    @Override
-    public boolean getBooleanCellValue()
-    {
-        CellType cellType = getCellTypeEnum();
-        switch(cellType) 
-        {
-            case BLANK:
-                return false;
-            case FORMULA:
-            {
-                FormulaValue fv=(FormulaValue)_value;
-                if(fv.getFormulaType()!=CellType.BOOLEAN)
-                      throw typeMismatch(CellType.BOOLEAN, CellType.FORMULA, false);
-                return ((BooleanFormulaValue)_value).getPreEvaluatedValue();
-            }
-            case BOOLEAN:
-            {
-                return ((BooleanValue)_value).getValue();
-            }
-            default:
-                throw typeMismatch(CellType.BOOLEAN, cellType, false);
-        }
-    }
-
-    /**
-     * Get the value of the cell as an error code.
-     * <p>
-     * For strings, numbers, and booleans, we throw an exception.
-     * For blank cells we return a 0.
-     * </p>
-     *
-     * @return the value of the cell as an error code
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} isn't CellType.ERROR
-     * @see org.apache.poi.ss.usermodel.FormulaError for error codes
-     */
-    @Override
-    public byte getErrorCellValue()
-    {
-        CellType cellType = getCellTypeEnum();
-        switch(cellType) 
-        {
-            case BLANK:
-                return 0;
-            case FORMULA:
-            {
-                FormulaValue fv=(FormulaValue)_value;
-                if(fv.getFormulaType()!=CellType.ERROR)
-                      throw typeMismatch(CellType.ERROR, CellType.FORMULA, false);
-                return ((ErrorFormulaValue)_value).getPreEvaluatedValue();
-            }
-            case ERROR:
-            {
-                return ((ErrorValue)_value).getValue();
-            }
-            default:
-                throw typeMismatch(CellType.ERROR, cellType, false);
-        }
-    }
-
-    /**
-     * <p>Set the style for the cell.  The style should be an CellStyle created/retreived from
-     * the Workbook.</p>
-     * 
-     * <p>To change the style of a cell without affecting other cells that use the same style,
-     * use {@link org.apache.poi.ss.util.CellUtil#setCellStyleProperties(Cell, Map)}</p>
-     * 
-     * @param style  reference contained in the workbook.
-     * If the value is null then the style information is removed causing the cell to used the default workbook style.
-     * @see org.apache.poi.ss.usermodel.Workbook#createCellStyle
-     */
-    @Override
-    public void setCellStyle(CellStyle style)
-    {
-        _style=style;
-    }
-
-    /**
-     * Return the cell's style.
-     *
-     * @return the cell's style. Always not-null. Default cell style has zero index and can be obtained as
-     * <code>workbook.getCellStyleAt(0)</code>
-     * @see org.apache.poi.ss.usermodel.Workbook#getCellStyleAt(int)
-     */
-    @Override
-    public CellStyle getCellStyle()
-    {
-        if(_style == null){
-            SXSSFWorkbook wb = (SXSSFWorkbook)getRow().getSheet().getWorkbook();
-            return wb.getCellStyleAt((short)0);
-        } else {
-            return _style;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setAsActiveCell()
-    {
-        getSheet().setActiveCell(getAddress());
-    }
-
-    /**
-     * Assign a comment to this cell
-     *
-     * @param comment comment associated with this cell
-     */
-    @Override
-    public void setCellComment(Comment comment)
-    {
-        setProperty(Property.COMMENT,comment);
-    }
-
-    /**
-     * Returns comment associated with this cell
-     *
-     * @return comment associated with this cell or <code>null</code> if not found
-     */
-    @Override
-    public Comment getCellComment()
-    {
-        return (Comment)getPropertyValue(Property.COMMENT);
-    }
-
-    /**
-     * Removes the comment for this cell, if there is one.
-     */
-    @Override
-    public void removeCellComment()
-    {
-        removeProperty(Property.COMMENT);
-    }
-
-    /**
-     * @return hyperlink associated with this cell or <code>null</code> if not found
-     */
-    @Override
-    public Hyperlink getHyperlink()
-    {
-        return (Hyperlink)getPropertyValue(Property.HYPERLINK);
-    }
-
-    /**
-     * Assign a hyperlink to this cell. If the supplied hyperlink is null, the
-     * hyperlink for this cell will be removed.
-     *
-     * @param link hyperlink associated with this cell
-     */
-    @Override
-    public void setHyperlink(Hyperlink link)
-    {
-        if (link == null) {
-            removeHyperlink();
-            return;
-        }
-
-        setProperty(Property.HYPERLINK,link);
-
-        XSSFHyperlink xssfobj = (XSSFHyperlink)link;
-        // Assign to us
-        CellReference ref = new CellReference(getRowIndex(), getColumnIndex());
-        xssfobj.getCTHyperlink().setRef( ref.formatAsString()  );
-
-        // Add to the lists
-        getSheet()._sh.addHyperlink(xssfobj);
-    }
-
-    /**
-     * Removes the hyperlink for this cell, if there is one.
-     */
-    @Override
-    public void removeHyperlink()
-    {
-        removeProperty(Property.HYPERLINK);
-
-        getSheet()._sh.removeHyperlink(getRowIndex(), getColumnIndex());
-    }
-
-    /**
-     * Only valid for array formula cells
-     *
-     * @return range of the array formula group that the cell belongs to.
-     */
-// TODO: What is this?
-    @NotImplemented
-    public CellRangeAddress getArrayFormulaRange()
-    {
-        return null;
-    }
-
-    /**
-     * @return <code>true</code> if this cell is part of group of cells having a common array formula.
-     */
-//TODO: What is this?
-    @NotImplemented
-    public boolean isPartOfArrayFormulaGroup()
-    {
-        return false;
-    }
-//end of interface implementation
-
-    /**
-     * Returns a string representation of the cell
-     * <p>
-     * Formula cells return the formula string, rather than the formula result.
-     * Dates are displayed in dd-MMM-yyyy format
-     * Errors are displayed as #ERR&lt;errIdx&gt;
-     * </p>
-     */
-    @Override
-    public String toString() {
-        switch (getCellTypeEnum()) {
-            case BLANK:
-                return "";
-            case BOOLEAN:
-                return getBooleanCellValue() ? "TRUE" : "FALSE";
-            case ERROR:
-                return ErrorEval.getText(getErrorCellValue());
-            case FORMULA:
-                return getCellFormula();
-            case NUMERIC:
-                if (DateUtil.isCellDateFormatted(this)) {
-                    DateFormat sdf = new SimpleDateFormat("dd-MMM-yyyy", LocaleUtil.getUserLocale());
-                    sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-                    return sdf.format(getDateCellValue());
-                }
-                return getNumericCellValue() + "";
-            case STRING:
-                return getRichStringCellValue().toString();
-            default:
-                return "Unknown Cell Type: " + getCellTypeEnum();
-        }
-    }
-
-    /*package*/ void removeProperty(int type)
-    {
-        Property current=_firstProperty;
-        Property previous=null;
-        while(current!=null&&current.getType()!=type)
-        {
-            previous=current;
-            current=current._next;
-        }
-        if(current!=null)
-        {
-            if(previous!=null)
-            {
-                previous._next=current._next;
-            }
-            else
-            {
-                _firstProperty=current._next;
-            }
-        }
-    }
-    /*package*/ void setProperty(int type,Object value)
-    {
-        Property current=_firstProperty;
-        Property previous=null;
-        while(current!=null&&current.getType()!=type)
-        {
-            previous=current;
-            current=current._next;
-        }
-        if(current!=null)
-        {
-            current.setValue(value);
-        }
-        else
-        {
-            switch(type)
-            {
-                case Property.COMMENT:
-                {
-                    current=new CommentProperty(value);
-                    break;
-                }
-                case Property.HYPERLINK:
-                {
-                    current=new HyperlinkProperty(value);
-                    break;
-                }
-                default:
-                {
-                    throw new IllegalArgumentException("Invalid type: " + type);
-                }
-            }
-            if(previous!=null)
-            {
-                previous._next=current;
-            }
-            else
-            {
-                _firstProperty=current;
-            }
-        }
-    }
-    /*package*/ Object getPropertyValue(int type)
-    {
-        return getPropertyValue(type,null);
-    }
-    /*package*/ Object getPropertyValue(int type,String defaultValue)
-    {
-        Property current=_firstProperty;
-        while(current!=null&&current.getType()!=type) current=current._next;
-        return current==null?defaultValue:current.getValue();
-    }
-    /*package*/ void ensurePlainStringType()
-    {
-        if(_value.getType()!=CellType.STRING
-           ||((StringValue)_value).isRichText())
-            _value=new PlainStringValue();
-    }
-    /*package*/ void ensureRichTextStringType()
-    {
-        if(_value.getType()!=CellType.STRING
-           ||!((StringValue)_value).isRichText())
-            _value=new RichTextValue();
-    }
-    /*package*/ void ensureType(CellType type)
-    {
-        if(_value.getType()!=type)
-            setType(type);
-    }
-    /*package*/ void ensureFormulaType(CellType type)
-    {
-        if(_value.getType()!=CellType.FORMULA
-           ||((FormulaValue)_value).getFormulaType()!=type)
-            setFormulaType(type);
-    }
-    /*
-     * Sets the cell type to type if it is different
-     */
-    /*package*/ void ensureTypeOrFormulaType(CellType type)
-    {
-        if(_value.getType()==type)
-        {
-            if(type==CellType.STRING&&((StringValue)_value).isRichText())
-                setType(CellType.STRING);
-            return;
-        }
-        if(_value.getType()==CellType.FORMULA)
-        {
-            if(((FormulaValue)_value).getFormulaType()==type)
-                return;
-            setFormulaType(type); // once a formula, always a formula
-            return;
-        }
-        setType(type);
-    }
-    /**
-     * changes the cell type to the specified type, and resets the value to the default value for that type
-     * If cell type is the same as specified type, this will reset the value to the default value for that type
-     *
-     * @param type the cell type to set
-     * @throws IllegalArgumentException if type is not a recognized type
-     */
-    /*package*/ void setType(CellType type)
-    {
-        switch(type)
-        {
-            case NUMERIC:
-            {
-                _value=new NumericValue();
-                break;
-            }
-            case STRING:
-            {
-                PlainStringValue sval = new PlainStringValue();
-                if(_value != null){
-                    // if a cell is not blank then convert the old value to string
-                    String str = convertCellValueToString();
-                    sval.setValue(str);
-                }
-                _value = sval;
-                break;
-            }
-            case FORMULA:
-            {
-                _value=new NumericFormulaValue();
-                break;
-            }
-            case BLANK:
-            {
-                _value=new BlankValue();
-                break;
-            }
-            case BOOLEAN:
-            {
-                BooleanValue bval = new BooleanValue();
-                if(_value != null){
-                    // if a cell is not blank then convert the old value to string
-                    boolean val = convertCellValueToBoolean();
-                    bval.setValue(val);
-                }
-                _value = bval;
-                break;
-            }
-            case ERROR:
-            {
-                _value=new ErrorValue();
-                break;
-            }
-            default:
-            {
-                throw new IllegalArgumentException("Illegal type " + type);
-            }
-        }
-    }
-    /*package*/ void setFormulaType(CellType type)
-    {
-        Value prevValue = _value;
-        switch(type)
-        {
-            case NUMERIC:
-            {
-                _value=new NumericFormulaValue();
-                break;
-            }
-            case STRING:
-            {
-                _value=new StringFormulaValue();
-                break;
-            }
-            case BOOLEAN:
-            {
-                _value=new BooleanFormulaValue();
-                break;
-            }
-            case ERROR:
-            {
-                _value=new ErrorFormulaValue();
-                break;
-            }
-            default:
-            {
-                throw new IllegalArgumentException("Illegal type " + type);
-            }
-        }
-
-        // if we had a Formula before, we should copy over the _value of the formula
-        if(prevValue instanceof FormulaValue) {
-            ((FormulaValue)_value)._value = ((FormulaValue)prevValue)._value;
-        }
-    }
-
-//TODO: implement this correctly
-    @NotImplemented
-    /*package*/ CellType computeTypeFromFormula(String formula)
-    {
-        return CellType.NUMERIC;
-    }
-//COPIED FROM https://svn.apache.org/repos/asf/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java since the functions are declared private there
-    /**
-     * Used to help format error messages
-     */
-    private static RuntimeException typeMismatch(CellType expectedTypeCode, CellType actualTypeCode, boolean isFormulaCell) {
-        String msg = "Cannot get a " + expectedTypeCode + " value from a " + actualTypeCode
-                + " " + (isFormulaCell ? "formula " : "") + "cell";
-        return new IllegalStateException(msg);
-    }
-
-    private boolean convertCellValueToBoolean() {
-        CellType cellType = getCellTypeEnum();
-
-        if (cellType == CellType.FORMULA) {
-            cellType = getCachedFormulaResultTypeEnum();
-        }
-
-        switch (cellType) {
-            case BOOLEAN:
-                return getBooleanCellValue();
-            case STRING:
-
-                String text = getStringCellValue();
-                return Boolean.parseBoolean(text);
-            case NUMERIC:
-                return getNumericCellValue() != 0;
-            case ERROR:
-            case BLANK:
-                return false;
-            default: throw new RuntimeException("Unexpected cell type (" + cellType + ")");
-        }
-        
-    }
-    private String convertCellValueToString() {
-        CellType cellType = getCellTypeEnum();
-        return convertCellValueToString(cellType);
-    }
-    private String convertCellValueToString(CellType cellType) {
-        switch (cellType) {
-            case BLANK:
-                return "";
-            case BOOLEAN:
-                return getBooleanCellValue() ? "TRUE" : "FALSE";
-            case STRING:
-                return getStringCellValue();
-            case NUMERIC:
-                return Double.toString( getNumericCellValue() );
-            case ERROR:
-                byte errVal = getErrorCellValue();
-                return FormulaError.forInt(errVal).getString();
-            case FORMULA:
-                if (_value != null) {
-                    FormulaValue fv = (FormulaValue)_value;
-                    if (fv.getFormulaType() != CellType.FORMULA) {
-                        return convertCellValueToString(fv.getFormulaType());
-                    }
-                }
-                return "";
-            default:
-                throw new IllegalStateException("Unexpected cell type (" + cellType + ")");
-        }
-    }
-
-//END OF COPIED CODE
-
-    static abstract class Property
-    {
-        final static int COMMENT=1;
-        final static int HYPERLINK=2;
-        Object _value;
-        Property _next;
-        public Property(Object value)
-        {
-            _value=value;
-        }
-        abstract int getType();
-        void setValue(Object value)
-        {
-            _value=value;
-        }
-        Object getValue()
-        {
-            return _value;
-        }
-    }
-    static class CommentProperty extends Property
-    {
-        public CommentProperty(Object value)
-        {
-            super(value);
-        }
-        @Override
-        public int getType()
-        {
-            return COMMENT;
-        }
-    }
-    static class HyperlinkProperty extends Property
-    {
-        public HyperlinkProperty(Object value)
-        {
-            super(value);
-        }
-        @Override
-        public int getType()
-        {
-            return HYPERLINK;
-        }
-    }
-    interface Value
-    {
-        CellType getType();
-    }
-    static class NumericValue implements Value
-    {
-        double _value;
-        public CellType getType()
-        {
-            return CellType.NUMERIC;
-        }
-        void setValue(double value)
-        {
-            _value=value;
-        }
-        double getValue()
-        {
-            return _value;
-        }
-    }
-    static abstract class StringValue implements Value
-    {
-        public CellType getType()
-        {
-            return CellType.STRING;
-        }
-//We cannot introduce a new type CellType.RICH_TEXT because the types are public so we have to make rich text as a type of string
-        abstract boolean isRichText(); // using the POI style which seems to avoid "instanceof".
-    }
-    static class PlainStringValue extends StringValue
-    {
-        String _value;
-        void setValue(String value)
-        {
-            _value=value;
-        }
-        String getValue()
-        {
-            return _value;
-        }
-        @Override
-        boolean isRichText()
-        {
-            return false;
-        }
-    }
-    static class RichTextValue extends StringValue
-    {
-        RichTextString _value;
-        @Override
-        public CellType getType()
-        {
-            return CellType.STRING;
-        }
-        void setValue(RichTextString value)
-        {
-            _value=value;
-        }
-        RichTextString getValue()
-        {
-            return _value;
-        }
-        @Override
-        boolean isRichText()
-        {
-            return true;
-        }
-    }
-    static abstract class FormulaValue implements Value
-    {
-        String _value;
-        public CellType getType()
-        {
-            return CellType.FORMULA;
-        }
-        void setValue(String value)
-        {
-            _value=value;
-        }
-        String getValue()
-        {
-            return _value;
-        }
-        abstract CellType getFormulaType();
-    }
-    static class NumericFormulaValue extends FormulaValue
-    {
-        double _preEvaluatedValue;
-        @Override
-        CellType getFormulaType()
-        {
-            return CellType.NUMERIC;
-        }
-        void setPreEvaluatedValue(double value)
-        {
-            _preEvaluatedValue=value;
-        }
-        double getPreEvaluatedValue()
-        {
-            return _preEvaluatedValue;
-        }
-    }
-    static class StringFormulaValue extends FormulaValue
-    {
-        String _preEvaluatedValue;
-        @Override
-        CellType getFormulaType()
-        {
-            return CellType.STRING;
-        }
-        void setPreEvaluatedValue(String value)
-        {
-            _preEvaluatedValue=value;
-        }
-        String getPreEvaluatedValue()
-        {
-            return _preEvaluatedValue;
-        }
-    }
-    static class BooleanFormulaValue extends FormulaValue
-    {
-        boolean _preEvaluatedValue;
-        @Override
-        CellType getFormulaType()
-        {
-            return CellType.BOOLEAN;
-        }
-        void setPreEvaluatedValue(boolean value)
-        {
-            _preEvaluatedValue=value;
-        }
-        boolean getPreEvaluatedValue()
-        {
-            return _preEvaluatedValue;
-        }
-    }
-    static class ErrorFormulaValue extends FormulaValue
-    {
-        byte _preEvaluatedValue;
-        @Override
-        CellType getFormulaType()
-        {
-            return CellType.ERROR;
-        }
-        void setPreEvaluatedValue(byte value)
-        {
-            _preEvaluatedValue=value;
-        }
-        byte getPreEvaluatedValue()
-        {
-            return _preEvaluatedValue;
-        }
-    }
-    static class BlankValue implements Value
-    {
-        public CellType getType()
-        {
-            return CellType.BLANK;
-        }
-    }
-    static class BooleanValue implements Value
-    {
-        boolean _value;
-        public CellType getType()
-        {
-            return CellType.BOOLEAN;
-        }
-        void setValue(boolean value)
-        {
-            _value=value;
-        }
-        boolean getValue()
-        {
-            return _value;
-        }
-    }
-    static class ErrorValue implements Value
-    {
-        byte _value;
-        public CellType getType()
-        {
-            return CellType.ERROR;
-        }
-        void setValue(byte value)
-        {
-            _value=value;
-        }
-        byte getValue()
-        {
-            return _value;
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
deleted file mode 100644
index f2687ff..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.ss.usermodel.ExtendedColor;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
-import org.apache.poi.xssf.usermodel.XSSFCreationHelper;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-
-/**
- * Streaming Creation Helper, which performs some actions
- *  based on the Streaming Workbook, and some on the related
- *  regular XSSF Workbook
- */
-public class SXSSFCreationHelper implements CreationHelper {
-    private static final POILogger logger = POILogFactory.getLogger(SXSSFCreationHelper.class);
-    
-    private final SXSSFWorkbook wb;
-    private final XSSFCreationHelper helper;
-    
-    /**
-     * Should only be called by {@link SXSSFWorkbook#getCreationHelper()}
-     *
-     * @param workbook the workbook to create objects for
-     */
-    @Internal
-    public SXSSFCreationHelper(SXSSFWorkbook workbook) {
-        this.helper = new XSSFCreationHelper(workbook.getXSSFWorkbook());
-        this.wb = workbook;
-    }
-
-    @Override
-    public XSSFRichTextString createRichTextString(String text) {
-        logger.log(POILogger.INFO, "SXSSF doesn't support Rich Text Strings, any formatting information will be lost");
-        return new XSSFRichTextString(text);
-    }
-
-    @Override
-    public SXSSFFormulaEvaluator createFormulaEvaluator() {
-        return new SXSSFFormulaEvaluator(wb);
-    }
-
-    // Pass-through methods
-    @Override
-    public DataFormat createDataFormat() {
-        return helper.createDataFormat();
-    }
-    /**
-     * {@inheritDoc}
-     * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead.
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    @Override
-    public Hyperlink createHyperlink(int type) {
-        return helper.createHyperlink(type);
-    }
-    @Override
-    public Hyperlink createHyperlink(HyperlinkType type) {
-        return helper.createHyperlink(type);
-    }
-    @Override
-    public ExtendedColor createExtendedColor() {
-        return helper.createExtendedColor();
-    }
-    @Override
-    public ClientAnchor createClientAnchor() {
-        return helper.createClientAnchor();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
deleted file mode 100644
index 2bb226c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFPicture;
-
-/**
- * Streaming version of Drawing.
- * Delegates most tasks to the non-streaming XSSF code.
- * TODO: Potentially, Comment and Chart need a similar streaming wrapper like Picture.
- */
-public class SXSSFDrawing implements Drawing {
-    private final SXSSFWorkbook _wb;
-    private final XSSFDrawing _drawing;
-
-    public SXSSFDrawing(SXSSFWorkbook workbook, XSSFDrawing drawing) {
-        this._wb = workbook;
-        this._drawing = drawing;
-    }
-
-    @Override
-    public SXSSFPicture createPicture(ClientAnchor anchor, int pictureIndex) {
-        XSSFPicture pict = _drawing.createPicture(anchor, pictureIndex);
-        return new SXSSFPicture(_wb, pict);
-    }
-
-    @Override
-    public Comment createCellComment(ClientAnchor anchor) {
-        return _drawing.createCellComment(anchor);
-    }
-
-    @Override
-    public Chart createChart(ClientAnchor anchor) {
-        return _drawing.createChart(anchor);
-    }
-
-    @Override
-    public ClientAnchor createAnchor(int dx1, int dy1, int dx2, int dy2, int col1, int row1, int col2, int row2) {
-        return _drawing.createAnchor(dx1, dy1, dx2, dy2, col1, row1, col2, row2);
-    }
-}
-
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
deleted file mode 100644
index 8c11e8b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.util.Internal;
-
-/**
- * SXSSF wrapper for a cell under evaluation
- */
-final class SXSSFEvaluationCell implements EvaluationCell {
-    private final EvaluationSheet _evalSheet;
-    private final SXSSFCell _cell;
-
-    public SXSSFEvaluationCell(SXSSFCell cell, SXSSFEvaluationSheet evaluationSheet) {
-        _cell = cell;
-        _evalSheet = evaluationSheet;
-    }
-
-    public SXSSFEvaluationCell(SXSSFCell cell) {
-        this(cell, new SXSSFEvaluationSheet(cell.getSheet()));
-    }
-
-    @Override
-    public Object getIdentityKey() {
-        // save memory by just using the cell itself as the identity key
-        // Note - this assumes SXSSFCell has not overridden hashCode and equals
-        return _cell;
-    }
-
-    public SXSSFCell getSXSSFCell() {
-        return _cell;
-    }
-    @Override
-    public boolean getBooleanCellValue() {
-        return _cell.getBooleanCellValue();
-    }
-    /**
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     *
-     * @return cell type
-     */
-    @Override
-    public int getCellType() {
-        return _cell.getCellType();
-    }
-    /**
-     * @since POI 3.15 beta 3
-     * @deprecated POI 3.15 beta 3.
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Internal(since="POI 3.15 beta 3")
-    @Override
-    public CellType getCellTypeEnum() {
-        return _cell.getCellTypeEnum();
-    }
-    @Override
-    public int getColumnIndex() {
-        return _cell.getColumnIndex();
-    }
-    @Override
-    public int getErrorCellValue() {
-        return _cell.getErrorCellValue();
-    }
-    @Override
-    public double getNumericCellValue() {
-        return _cell.getNumericCellValue();
-    }
-    @Override
-    public int getRowIndex() {
-        return _cell.getRowIndex();
-    }
-    @Override
-    public EvaluationSheet getSheet() {
-        return _evalSheet;
-    }
-    @Override
-    public String getStringCellValue() {
-        return _cell.getRichStringCellValue().getString();
-    }
-    /**
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     *
-     * @return cell type of cached formula result
-     */
-    @Override
-    public int getCachedFormulaResultType() {
-        return _cell.getCachedFormulaResultType();
-    }
-    /**
-     * @since POI 3.15 beta 3
-     * @deprecated POI 3.15 beta 3.
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Internal(since="POI 3.15 beta 3")
-    @Override
-    public CellType getCachedFormulaResultTypeEnum() {
-        return _cell.getCachedFormulaResultTypeEnum();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
deleted file mode 100644
index 57d7cc5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.util.Internal;
-
-/**
- * SXSSF wrapper for a sheet under evaluation
- */
-@Internal
-final class SXSSFEvaluationSheet implements EvaluationSheet {
-    private final SXSSFSheet _xs;
-
-    public SXSSFEvaluationSheet(SXSSFSheet sheet) {
-        _xs = sheet;
-    }
-
-    public SXSSFSheet getSXSSFSheet() {
-        return _xs;
-    }
-    @Override
-    public EvaluationCell getCell(int rowIndex, int columnIndex) {
-        SXSSFRow row = _xs.getRow(rowIndex);
-        if (row == null) {
-            if (rowIndex <= _xs.getLastFlushedRowNum()) {
-                throw new SXSSFFormulaEvaluator.RowFlushedException(rowIndex);
-            }
-            return null;
-        }
-        SXSSFCell cell = row.getCell(columnIndex);
-        if (cell == null) {
-            return null;
-        }
-        return new SXSSFEvaluationCell(cell, this);
-    }
-    
-    /* (non-JavaDoc), inherit JavaDoc from EvaluationSheet
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        // nothing to do
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
deleted file mode 100644
index e9040c9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.xssf.usermodel.BaseXSSFEvaluationWorkbook;
-import org.apache.poi.util.Internal;
-
-/**
- * SXSSF wrapper around the SXSSF and XSSF workbooks
- */
-@Internal
-public final class SXSSFEvaluationWorkbook extends BaseXSSFEvaluationWorkbook {
-    private final SXSSFWorkbook _uBook;
-    
-    public static SXSSFEvaluationWorkbook create(SXSSFWorkbook book) {
-        if (book == null) {
-            return null;
-        }
-        return new SXSSFEvaluationWorkbook(book);
-    }
-    
-    private SXSSFEvaluationWorkbook(SXSSFWorkbook book) {
-        super(book.getXSSFWorkbook());
-        _uBook = book;
-    }
-
-    @Override
-    public int getSheetIndex(EvaluationSheet evalSheet) {
-        SXSSFSheet sheet = ((SXSSFEvaluationSheet)evalSheet).getSXSSFSheet();
-        return _uBook.getSheetIndex(sheet);
-    }
-
-    @Override
-    public EvaluationSheet getSheet(int sheetIndex) {
-        return new SXSSFEvaluationSheet(_uBook.getSheetAt(sheetIndex));
-    }
-
-    @Override
-    public Ptg[] getFormulaTokens(EvaluationCell evalCell) {
-        SXSSFCell cell = ((SXSSFEvaluationCell)evalCell).getSXSSFCell();
-        return FormulaParser.parse(cell.getCellFormula(), this, FormulaType.CELL, _uBook.getSheetIndex(cell.getSheet()));
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
deleted file mode 100644
index 0ac776f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.usermodel.BaseXSSFFormulaEvaluator;
-
-/**
- * Streaming-specific Formula Evaluator, which is able to 
- *  lookup cells within the current Window.
- */
-public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator {
-    private static POILogger logger = POILogFactory.getLogger(SXSSFFormulaEvaluator.class);
-    
-    private SXSSFWorkbook wb;
-    
-    public SXSSFFormulaEvaluator(SXSSFWorkbook workbook) {
-        this(workbook, null, null);
-    }
-    private SXSSFFormulaEvaluator(SXSSFWorkbook workbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        this(workbook, new WorkbookEvaluator(SXSSFEvaluationWorkbook.create(workbook), stabilityClassifier, udfFinder));
-    }
-    private SXSSFFormulaEvaluator(SXSSFWorkbook workbook, WorkbookEvaluator bookEvaluator) {
-        super(bookEvaluator);
-        this.wb = workbook;
-    }
-    
-    /**
-     * @param stabilityClassifier used to optimise caching performance. Pass <code>null</code>
-     * for the (conservative) assumption that any cell may have its definition changed after
-     * evaluation begins.
-     * @param udfFinder pass <code>null</code> for default (AnalysisToolPak only)
-     */
-    public static SXSSFFormulaEvaluator create(SXSSFWorkbook workbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        return new SXSSFFormulaEvaluator(workbook, stabilityClassifier, udfFinder);
-    }
-    
-    /**
-     * Turns a SXSSFCell into a SXSSFEvaluationCell
-     */
-    @Override
-    protected EvaluationCell toEvaluationCell(Cell cell) {
-        if (!(cell instanceof SXSSFCell)){
-            throw new IllegalArgumentException("Unexpected type of cell: " + cell.getClass() + "." +
-                    " Only SXSSFCells can be evaluated.");
-        }
-
-        return new SXSSFEvaluationCell((SXSSFCell)cell);
-    }
-    
-    @Override
-    public SXSSFCell evaluateInCell(Cell cell) {
-        return (SXSSFCell) super.evaluateInCell(cell);
-    }
-    
-    /**
-     * For active worksheets only, will loop over rows and
-     *  cells, evaluating formula cells there.
-     * If formula cells are outside the window for that sheet,
-     *  it can either skip them silently, or give an exception
-     */
-    public static void evaluateAllFormulaCells(SXSSFWorkbook wb, boolean skipOutOfWindow) {
-        SXSSFFormulaEvaluator eval = new SXSSFFormulaEvaluator(wb);
-        
-        // Check they're all available
-        for (Sheet sheet : wb) {
-            if (((SXSSFSheet)sheet).areAllRowsFlushed()) {
-                throw new SheetsFlushedException();
-            }
-        }
-        
-        // Process the sheets as best we can
-        for (Sheet sheet : wb) {
-            
-            // Check if any rows have already been flushed out
-            int lastFlushedRowNum = ((SXSSFSheet) sheet).getLastFlushedRowNum();
-            if (lastFlushedRowNum > -1) {
-                if (! skipOutOfWindow) throw new RowFlushedException(0);
-                logger.log(POILogger.INFO, "Rows up to " + lastFlushedRowNum + " have already been flushed, skipping");
-            }
-            
-            // Evaluate what we have
-            for (Row r : sheet) {
-                for (Cell c : r) {
-                    if (c.getCellTypeEnum() == CellType.FORMULA) {
-                        eval.evaluateFormulaCellEnum(c);
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * Loops over rows and cells, evaluating formula cells there.
-     * If any sheets are inactive, or any cells outside of the window,
-     *  will give an Exception.
-     * For SXSSF, you generally don't want to use this method, instead
-     *  evaluate your formulas as you go before they leave the window.
-     */
-    public void evaluateAll() {
-        // Have the evaluation done, with exceptions
-        evaluateAllFormulaCells(wb, false);
-    }
-    
-    public static class SheetsFlushedException extends IllegalStateException {
-        protected SheetsFlushedException() {
-            super("One or more sheets have been flushed, cannot evaluate all cells");
-        }
-    }
-    public static class RowFlushedException extends IllegalStateException {
-        protected RowFlushedException(int rowNum) {
-            super("Row " + rowNum + " has been flushed, cannot evaluate all cells");
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
deleted file mode 100644
index 631d0e3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.ss.usermodel.Picture;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.ImageUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.usermodel.*;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTPicture;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
-
-import java.awt.Dimension;
-import java.io.IOException;
-
-/**
- * Streaming version of Picture.
- * Most of the code is a copy of the non-streaming XSSFPicture code.
- * This is necessary as a private method getRowHeightInPixels of that class needs to be changed, which is called by a method call chain nested several levels.
- *
- * The main change is to access the rows in the SXSSF sheet, not the always empty rows in the XSSF sheet when checking the row heights.
- */
-public final class SXSSFPicture implements Picture {
-    private static final POILogger logger = POILogFactory.getLogger(SXSSFPicture.class);
-    /**
-     * Column width measured as the number of characters of the maximum digit width of the
-     * numbers 0, 1, 2, ..., 9 as rendered in the normal style's font. There are 4 pixels of margin
-     * padding (two on each side), plus 1 pixel padding for the gridlines.
-     *
-     * This value is the same for default font in Office 2007 (Calibry) and Office 2003 and earlier (Arial)
-     */
-    private static float DEFAULT_COLUMN_WIDTH = 9.140625f;
-
-    private final SXSSFWorkbook _wb;
-    private final XSSFPicture _picture;
-
-    SXSSFPicture(SXSSFWorkbook _wb, XSSFPicture _picture) {
-        this._wb = _wb;
-        this._picture = _picture;
-    }
-
-    /**
-     * Return the underlying CTPicture bean that holds all properties for this picture
-     *
-     * @return the underlying CTPicture bean
-     */
-    @Internal
-    public CTPicture getCTPicture(){
-        return _picture.getCTPicture();
-    }
-
-    /**
-     * Reset the image to the original size.
-     *
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with the default font size (Calibri 11pt for .xlsx).
-     * If the default font is changed the resized image can be streched vertically or horizontally.
-     * </p>
-     */
-    @Override
-    public void resize(){
-        resize(1.0);
-    }
-
-    /**
-     * Reset the image to the original size.
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with the default font size (Calibri 11pt for .xlsx).
-     * If the default font is changed the resized image can be streched vertically or horizontally.
-     * </p>
-     *
-     * @param scale the amount by which image dimensions are multiplied relative to the original size.
-     * <code>resize(1.0)</code> sets the original size, <code>resize(0.5)</code> resize to 50% of the original,
-     * <code>resize(2.0)</code> resizes to 200% of the original.
-     */
-    @Override
-    public void resize(double scale){
-        XSSFClientAnchor anchor = getClientAnchor();
-
-        XSSFClientAnchor pref = getPreferredSize(scale);
-
-        int row2 = anchor.getRow1() + (pref.getRow2() - pref.getRow1());
-        int col2 = anchor.getCol1() + (pref.getCol2() - pref.getCol1());
-
-        anchor.setCol2(col2);
-        anchor.setDx1(0);
-        anchor.setDx2(pref.getDx2());
-
-        anchor.setRow2(row2);
-        anchor.setDy1(0);
-        anchor.setDy2(pref.getDy2());
-    }
-
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @return XSSFClientAnchor with the preferred size for this image
-     */
-    @Override
-    public XSSFClientAnchor getPreferredSize(){
-        return getPreferredSize(1.0);
-    }
-
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @param scale the amount by which image dimensions are multiplied relative to the original size.
-     * @return XSSFClientAnchor with the preferred size for this image
-     */
-    public XSSFClientAnchor getPreferredSize(double scale){
-        XSSFClientAnchor anchor = getClientAnchor();
-
-        XSSFPictureData data = getPictureData();
-        Dimension size = getImageDimension(data.getPackagePart(), data.getPictureType());
-        double scaledWidth = size.getWidth() * scale;
-        double scaledHeight = size.getHeight() * scale;
-
-        float w = 0;
-        int col2 = anchor.getCol1();
-        int dx2 = 0;
-
-        for (;;) {
-            w += getColumnWidthInPixels(col2);
-            if(w > scaledWidth) break;
-            col2++;
-        }
-
-        if(w > scaledWidth) {
-            double cw = getColumnWidthInPixels(col2 );
-            double delta = w - scaledWidth;
-            dx2 = (int)(XSSFShape.EMU_PER_PIXEL * (cw - delta));
-        }
-        anchor.setCol2(col2);
-        anchor.setDx2(dx2);
-
-        double h = 0;
-        int row2 = anchor.getRow1();
-        int dy2 = 0;
-
-        for (;;) {
-            h += getRowHeightInPixels(row2);
-            if(h > scaledHeight) break;
-            row2++;
-        }
-
-        if(h > scaledHeight) {
-            double ch = getRowHeightInPixels(row2);
-            double delta = h - scaledHeight;
-            dy2 = (int)(XSSFShape.EMU_PER_PIXEL * (ch - delta));
-        }
-        anchor.setRow2(row2);
-        anchor.setDy2(dy2);
-
-        CTPositiveSize2D size2d =  getCTPicture().getSpPr().getXfrm().getExt();
-        size2d.setCx((long)(scaledWidth * XSSFShape.EMU_PER_PIXEL));
-        size2d.setCy((long)(scaledHeight * XSSFShape.EMU_PER_PIXEL));
-
-        return anchor;
-    }
-
-    private float getColumnWidthInPixels(int columnIndex){
-        XSSFSheet sheet = getParent();
-
-        CTCol col = sheet.getColumnHelper().getColumn(columnIndex, false);
-        double numChars = col == null || !col.isSetWidth() ? DEFAULT_COLUMN_WIDTH : col.getWidth();
-
-        return (float)numChars*XSSFWorkbook.DEFAULT_CHARACTER_WIDTH;
-    }
-
-    private float getRowHeightInPixels(int rowIndex) {
-        // THE FOLLOWING THREE LINES ARE THE MAIN CHANGE compared to the non-streaming version: use the SXSSF sheet,
-		// not the XSSF sheet (which never contais rows when using SXSSF)
-        XSSFSheet xssfSheet = getParent();
-        SXSSFSheet sheet = _wb.getSXSSFSheet(xssfSheet);
-        Row row = sheet.getRow(rowIndex);
-        float height = row != null ?  row.getHeightInPoints() : sheet.getDefaultRowHeightInPoints();
-        return height * XSSFShape.PIXEL_DPI / XSSFShape.POINT_DPI;
-    }
-    /**
-     * Return the dimension of this image
-     *
-     * @param part the package part holding raw picture data
-     * @param type type of the picture: {@link Workbook#PICTURE_TYPE_JPEG},
-     * {@link Workbook#PICTURE_TYPE_PNG} or {@link Workbook#PICTURE_TYPE_DIB}
-     *
-     * @return image dimension in pixels
-     */
-    protected static Dimension getImageDimension(PackagePart part, int type){
-        try {
-            return ImageUtils.getImageDimension(part.getInputStream(), type);
-        } catch (IOException e){
-            //return a "singulariry" if ImageIO failed to read the image
-            logger.log(POILogger.WARN, e);
-            return new Dimension();
-        }
-    }
-
-    /**
-     * Return picture data for this shape
-     *
-     * @return picture data for this shape
-     */
-    @Override
-    public XSSFPictureData getPictureData() {
-        return _picture.getPictureData();
-    }
-
-    protected CTShapeProperties getShapeProperties(){
-        return getCTPicture().getSpPr();
-    }
-
-    private XSSFSheet getParent() {
-        return (XSSFSheet)_picture.getDrawing().getParent();
-    }
-
-    private XSSFAnchor getAnchor() {
-        return _picture.getAnchor();
-    }
-
-    @Override
-    public void resize(double scaleX, double scaleY) {
-        _picture.resize(scaleX, scaleY);
-    }
-
-    @Override
-    public XSSFClientAnchor getPreferredSize(double scaleX, double scaleY) {
-        return _picture.getPreferredSize(scaleX, scaleY);
-    }
-
-    @Override
-    public Dimension getImageDimension() {
-        return _picture.getImageDimension();
-    }
-
-    @Override
-    public XSSFClientAnchor getClientAnchor() {
-        XSSFAnchor a = getAnchor();
-        return (a instanceof XSSFClientAnchor) ? (XSSFClientAnchor)a : null;
-    }
-    
-    public XSSFDrawing getDrawing() {
-        return _picture.getDrawing();
-    }
-
-    @Override
-    public XSSFSheet getSheet() {
-        return _picture.getSheet();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
deleted file mode 100644
index 7aaacdd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.Internal;
-
-/**
- * Streaming version of XSSFRow implementing the "BigGridDemo" strategy.
- */
-public class SXSSFRow implements Row, Comparable<SXSSFRow>
-{
-    private static final Boolean UNDEFINED = null;
-    
-    private final SXSSFSheet _sheet; // parent sheet
-    private final SortedMap<Integer, SXSSFCell> _cells = new TreeMap<Integer, SXSSFCell>();
-    private short _style = -1; // index of cell style in style table
-    private short _height = -1; // row height in twips (1/20 point)
-    private boolean _zHeight = false; // row zero-height (this is somehow different than being hidden)
-    private int _outlineLevel = 0;   // Outlining level of the row, when outlining is on
-    // use Boolean to have a tri-state for on/off/undefined 
-    private Boolean _hidden = UNDEFINED;
-    private Boolean _collapsed = UNDEFINED;
-
-    /**
-     *
-     * @param sheet the parent sheet the row belongs to
-     * @param initialSize - no longer needed
-     * @deprecated 2015-11-30 (circa POI 3.14beta1). Use {@link #SXSSFRow(SXSSFSheet)} instead.
-     */
-    @Deprecated
-    public SXSSFRow(SXSSFSheet sheet, @SuppressWarnings("UnusedParameters") int initialSize)
-    {
-        this(sheet);
-    }
-    
-    public SXSSFRow(SXSSFSheet sheet)
-    {
-        _sheet=sheet;
-    }
-    
-    public Iterator<Cell> allCellsIterator()
-    {
-        return new CellIterator();
-    }
-    public boolean hasCustomHeight()
-    {
-        return _height!=-1;
-    }
-
-    @Override
-    public int getOutlineLevel(){
-        return _outlineLevel;
-    }
-    void setOutlineLevel(int level){
-        _outlineLevel = level;
-    }
-    
-    /**
-     * get row hidden state: Hidden (true), Unhidden (false), Undefined (null)
-     *
-     * @return row hidden state
-     */
-    public Boolean getHidden() {
-        return _hidden;
-    }
-
-    /**
-     * set row hidden state: Hidden (true), Unhidden (false), Undefined (null)
-     *
-     * @param hidden row hidden state
-     */
-    public void setHidden(Boolean hidden) {
-        this._hidden = hidden;
-    }
-
-    public Boolean getCollapsed() {
-        return _collapsed;
-    }
-
-    public void setCollapsed(Boolean collapsed) {
-        this._collapsed = collapsed;
-    }
-//begin of interface implementation
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Iterator<Cell> iterator()
-    {
-        return new FilledCellIterator();
-    }
-
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned is a {@link CellType#BLANK}. The type can be changed
-     * either through calling <code>setCellValue</code> or <code>setCellType</code>.
-     *
-     * @param column - the column number this cell represents
-     * @return Cell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex < 0 or greater than the maximum number of supported columns
-     * (255 for *.xls, 1048576 for *.xlsx)
-     */
-    @Override
-    public SXSSFCell createCell(int column)
-    {
-        return createCell(column, CellType.BLANK);
-    }
-
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned is a {@link CellType#BLANK}. The type can be changed
-     * either through calling setCellValue or setCellType.
-     *
-     * @param column - the column number this cell represents
-     * @return Cell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex < 0 or greate than a maximum number of supported columns
-     * (255 for *.xls, 1048576 for *.xlsx)
-     * @deprecated POI 3.15 beta 3. Use {@link #createCell(int, CellType)} instead.
-     */
-    @Override
-    public SXSSFCell createCell(int column, int type)
-    {
-        return createCell(column, CellType.forInt(type));
-    }
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned is a {@link CellType#BLANK}. The type can be changed
-     * either through calling setCellValue or setCellType.
-     *
-     * @param column - the column number this cell represents
-     * @return Cell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex < 0 or greate than a maximum number of supported columns
-     * (255 for *.xls, 1048576 for *.xlsx)
-     */
-    @Override
-    public SXSSFCell createCell(int column, CellType type)
-    {
-        checkBounds(column);
-        SXSSFCell cell = new SXSSFCell(this, type);
-        _cells.put(column, cell);
-        return cell;
-    }
-
-    /**
-     * @throws RuntimeException if the bounds are exceeded.
-     */
-    private static void checkBounds(int cellIndex) {
-        SpreadsheetVersion v = SpreadsheetVersion.EXCEL2007;
-        int maxcol = SpreadsheetVersion.EXCEL2007.getLastColumnIndex();
-        if (cellIndex < 0 || cellIndex > maxcol) {
-            throw new IllegalArgumentException("Invalid column index (" + cellIndex
-                    + ").  Allowable column range for " + v.name() + " is (0.."
-                    + maxcol + ") or ('A'..'" + v.getLastColumnName() + "')");
-        }
-    }
-
-    /**
-     * Remove the Cell from this row.
-     *
-     * @param cell the cell to remove
-     */
-    @Override
-    public void removeCell(Cell cell)
-    {
-        int index = getCellIndex((SXSSFCell) cell);
-        _cells.remove(index);
-    }
-
-    /**
-     * Return the column number of a cell if it is in this row
-     * Otherwise return -1
-     *
-     * @param cell the cell to get the index of
-     * @return cell column index if it is in this row, -1 otherwise
-     */
-    /*package*/ int getCellIndex(SXSSFCell cell)
-    {
-        for (Entry<Integer, SXSSFCell> entry : _cells.entrySet()) {
-            if (entry.getValue()==cell) {
-                return entry.getKey();
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Set the row number of this row.
-     *
-     * @param rowNum  the row number (0-based)
-     * @throws IllegalArgumentException if rowNum < 0
-     */
-    @Override
-    public void setRowNum(int rowNum)
-    {
-        _sheet.changeRowNum(this,rowNum);
-    }
-
-    /**
-     * Get row number this row represents
-     *
-     * @return the row number (0 based)
-     */
-    @Override
-    public int getRowNum()
-    {
-        return _sheet.getRowNum(this);
-    }
-
-    /**
-     * Get the cell representing a given column (logical cell) 0-based.
-     * If cell is missing or blank, uses the workbook's MissingCellPolicy
-     * to determine the return value.
-     *
-     * @param cellnum  0 based column number
-     * @return Cell representing that column or null if undefined.
-     * @see #getCell(int, org.apache.poi.ss.usermodel.Row.MissingCellPolicy)
-     * @throws RuntimeException if cellnum is out of bounds
-     */
-    @Override
-    public SXSSFCell getCell(int cellnum) {
-        MissingCellPolicy policy = _sheet.getWorkbook().getMissingCellPolicy();
-        return getCell(cellnum, policy);
-    }
-
-    /**
-     * Returns the cell at the given (0 based) index, with the specified {@link org.apache.poi.ss.usermodel.Row.MissingCellPolicy}
-     *
-     * @return the cell at the given (0 based) index
-     * @throws IllegalArgumentException if cellnum < 0 or the specified MissingCellPolicy is invalid
-     */
-    @Override
-    public SXSSFCell getCell(int cellnum, MissingCellPolicy policy)
-    {
-        checkBounds(cellnum);
-        
-        final SXSSFCell cell = _cells.get(cellnum);
-        switch (policy) {
-            case RETURN_NULL_AND_BLANK:
-                return cell;
-            case RETURN_BLANK_AS_NULL:
-                boolean isBlank = (cell != null && cell.getCellTypeEnum() == CellType.BLANK);
-                return (isBlank) ? null : cell;
-            case CREATE_NULL_AS_BLANK:
-                return (cell == null) ? createCell(cellnum, CellType.BLANK) : cell;
-            default:
-                throw new IllegalArgumentException("Illegal policy " + policy + " (" + policy.id + ")");
-        }
-    }
-
-    /**
-     * Get the number of the first cell contained in this row.
-     *
-     * @return short representing the first logical cell in the row,
-     *  or -1 if the row does not contain any cells.
-     */
-    @Override
-    public short getFirstCellNum()
-    {
-        try {
-            return _cells.firstKey().shortValue();
-        } catch (final NoSuchElementException e) {
-            return -1;
-        }
-    }
-
-    /**
-     * Gets the index of the last cell contained in this row <b>PLUS ONE</b>. The result also
-     * happens to be the 1-based column number of the last cell.  This value can be used as a
-     * standard upper bound when iterating over cells:
-     * <pre>
-     * short minColIx = row.getFirstCellNum();
-     * short maxColIx = row.getLastCellNum();
-     * for(short colIx=minColIx; colIx&lt;maxColIx; colIx++) {
-     *   Cell cell = row.getCell(colIx);
-     *   if(cell == null) {
-     *     continue;
-     *   }
-     *   //... do something with cell
-     * }
-     * </pre>
-     *
-     * @return short representing the last logical cell in the row <b>PLUS ONE</b>,
-     *   or -1 if the row does not contain any cells.
-     */
-    @Override
-    public short getLastCellNum()
-    {
-        return _cells.isEmpty() ? -1 : (short)(_cells.lastKey() + 1);
-    }
-
-    /**
-     * Gets the number of defined cells (NOT number of cells in the actual row!).
-     * That is to say if only columns 0,4,5 have values then there would be 3.
-     *
-     * @return int representing the number of defined cells in the row.
-     */
-    @Override
-    public int getPhysicalNumberOfCells()
-    {
-        return _cells.size();
-    }
-
-    /**
-     * Set the row's height or set to ff (-1) for undefined/default-height.  Set the height in "twips" or
-     * 1/20th of a point.
-     *
-     * @param height  rowheight or 0xff for undefined (use sheet default)
-     */
-    @Override
-    public void setHeight(short height)
-    {
-        _height=height;
-    }
-
-    /**
-     * Set whether or not to display this row with 0 height
-     *
-     * @param zHeight  height is zero or not.
-     */
-    @Override
-    public void setZeroHeight(boolean zHeight)
-    {
-        _zHeight=zHeight;
-    }
-
-    /**
-     * Get whether or not to display this row with 0 height
-     *
-     * @return - zHeight height is zero or not.
-     */
-    @Override
-    public boolean getZeroHeight()
-    {
-        return _zHeight;
-    }
-
-    /**
-     * Set the row's height in points.
-     *
-     * @param height the height in points. <code>-1</code>  resets to the default height
-     */
-    @Override
-    public void setHeightInPoints(float height)
-    {
-        if(height==-1)
-            _height=-1;
-        else
-            _height=(short)(height*20);
-    }
-
-    /**
-     * Get the row's height measured in twips (1/20th of a point). If the height is not set, the default worksheet value is returned,
-     * See {@link Sheet#getDefaultRowHeightInPoints()}
-     *
-     * @return row height measured in twips (1/20th of a point)
-     */
-    @Override
-    public short getHeight()
-    {
-        return (short)(_height==-1?getSheet().getDefaultRowHeightInPoints()*20:_height);
-    }
-
-    /**
-     * Returns row height measured in point size. If the height is not set, the default worksheet value is returned,
-     * See {@link Sheet#getDefaultRowHeightInPoints()}
-     *
-     * @return row height measured in point size
-     * @see Sheet#getDefaultRowHeightInPoints()
-     */
-    @Override
-    public float getHeightInPoints()
-    {
-        return (float)(_height==-1?getSheet().getDefaultRowHeightInPoints():_height/20.0);
-    }
-    
-    /**
-     * Is this row formatted? Most aren't, but some rows
-     *  do have whole-row styles. For those that do, you
-     *  can get the formatting from {@link #getRowStyle()}
-     */
-    @Override
-    public boolean isFormatted() {
-        return _style > -1;
-    }
-    /**
-     * Returns the whole-row cell style. Most rows won't
-     *  have one of these, so will return null. Call
-     *  {@link #isFormatted()} to check first.
-     */
-    @Override
-    public CellStyle getRowStyle() {
-       if(!isFormatted()) return null;
-       
-       return getSheet().getWorkbook().getCellStyleAt(_style);
-    }
-    
-    @Internal
-    /*package*/ int getRowStyleIndex() {
-        return _style;
-    }
-    
-    /**
-     * Applies a whole-row cell styling to the row.
-     * The row style can be cleared by passing in <code>null</code>.
-     */
-    @Override
-    public void setRowStyle(CellStyle style) {
-       if(style == null) {
-          _style = -1;
-       } else {
-          _style = style.getIndex();
-       }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Iterator<Cell> cellIterator()
-    {
-        return iterator();
-    }
-
-    /**
-     * Returns the Sheet this row belongs to
-     *
-     * @return the Sheet that owns this row
-     */
-    @Override
-    public SXSSFSheet getSheet()
-    {
-        return _sheet;
-    }
-//end of interface implementation
-
-
-    /**
-     * Create an iterator over the cells from [0, getLastCellNum()).
-     * Includes blank cells, excludes empty cells
-     * 
-     * Returns an iterator over all filled cells (created via Row.createCell())
-     * Throws ConcurrentModificationException if cells are added, moved, or
-     * removed after the iterator is created.
-     */
-    public class FilledCellIterator implements Iterator<Cell>
-    {
-        private final Iterator<SXSSFCell> iter = _cells.values().iterator();
-
-        @Override
-        public boolean hasNext()
-        {
-            return iter.hasNext();
-        }
-        @Override
-        public Cell next() throws NoSuchElementException
-        {
-            return iter.next();
-        }
-        @Override
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-    /**
-     * returns all cells including empty cells (<code>null</code> values are returned
-     * for empty cells).
-     * This method is not synchronized. This iterator should not be used after
-     * cells are added, moved, or removed, though a ConcurrentModificationException
-     * is NOT thrown.
-     */
-    public class CellIterator implements Iterator<Cell>
-    {
-        final int maxColumn = getLastCellNum(); //last column PLUS ONE
-        int pos = 0;
-
-        @Override
-        public boolean hasNext()
-        {
-            return pos < maxColumn;
-        }
-        @Override
-        public Cell next() throws NoSuchElementException
-        {
-            if (hasNext())
-                return _cells.get(pos++);
-            else
-                throw new NoSuchElementException();
-        }
-        @Override
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-    
-    /**
-     * Compares two <code>SXSSFRow</code> objects.  Two rows are equal if they belong to the same worksheet and
-     * their row indexes are equal.
-     *
-     * @param   other   the <code>SXSSFRow</code> to be compared.
-     * @return  <ul>
-     *      <li>
-     *      the value <code>0</code> if the row number of this <code>SXSSFRow</code> is
-     *      equal to the row number of the argument <code>SXSSFRow</code>
-     *      </li>
-     *      <li>
-     *      a value less than <code>0</code> if the row number of this this <code>SXSSFRow</code> is
-     *      numerically less than the row number of the argument <code>SXSSFRow</code>
-     *      </li>
-     *      <li>
-     *      a value greater than <code>0</code> if the row number of this this <code>SXSSFRow</code> is
-     *      numerically greater than the row number of the argument <code>SXSSFRow</code>
-     *      </li>
-     *      </ul>
-     * @throws IllegalArgumentException if the argument row belongs to a different worksheet
-     */
-    @Override
-    public int compareTo(SXSSFRow other) {
-        if (this.getSheet() != other.getSheet()) {
-            throw new IllegalArgumentException("The compared rows must belong to the same sheet");
-        }
-
-        Integer thisRow = this.getRowNum();
-        Integer otherRow = other.getRowNum();
-        return thisRow.compareTo(otherRow);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (!(obj instanceof SXSSFRow))
-        {
-            return false;
-        }
-        SXSSFRow other = (SXSSFRow) obj;
-
-        return (this.getRowNum() == other.getRowNum()) &&
-               (this.getSheet() == other.getSheet());
-    }
-
-    @Override
-    public int hashCode() {
-        return _cells.hashCode();
-    }
-
-
-}
-
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
deleted file mode 100644
index 2c9fb6e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
+++ /dev/null
@@ -1,1953 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.AutoFilter;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellRange;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.Footer;
-import org.apache.poi.ss.usermodel.Header;
-import org.apache.poi.ss.usermodel.PrintSetup;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.PaneInformation;
-import org.apache.poi.ss.util.SheetUtil;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.Removal;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.apache.poi.xssf.usermodel.XSSFHyperlink;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetFormatPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-
-/**
- * Streaming version of XSSFSheet implementing the "BigGridDemo" strategy.
-*/
-public class SXSSFSheet implements Sheet
-{
-    /*package*/ final XSSFSheet _sh;
-    private final SXSSFWorkbook _workbook;
-    private final TreeMap<Integer,SXSSFRow> _rows=new TreeMap<Integer,SXSSFRow>();
-    private final SheetDataWriter _writer;
-    private int _randomAccessWindowSize = SXSSFWorkbook.DEFAULT_WINDOW_SIZE;
-    private final AutoSizeColumnTracker _autoSizeColumnTracker;
-    private int outlineLevelRow = 0;
-    private int lastFlushedRowNumber = -1;
-    private boolean allFlushed = false;
-
-    public SXSSFSheet(SXSSFWorkbook workbook, XSSFSheet xSheet) throws IOException {
-        _workbook = workbook;
-        _sh = xSheet;
-        _writer = workbook.createSheetDataWriter();
-        setRandomAccessWindowSize(_workbook.getRandomAccessWindowSize());
-        _autoSizeColumnTracker = new AutoSizeColumnTracker(this);
-    }
-
-    /**
-     * for testing purposes only
-     */
-    @Internal
-    SheetDataWriter getSheetDataWriter(){
-        return _writer;
-    }
-
-/* Gets "<sheetData>" document fragment*/
-    public InputStream getWorksheetXMLInputStream() throws IOException 
-    {
-        // flush all remaining data and close the temp file writer
-        flushRows(0);
-        _writer.close();
-        return _writer.getWorksheetXMLInputStream();
-    }
-
-//start of interface implementation
-    @Override
-    public Iterator<Row> iterator()
-    {
-        return rowIterator();
-    }
-
-    /**
-     * Create a new row within the sheet and return the high level representation
-     *
-     * @param rownum  row number
-     * @return high level Row object representing a row in the sheet
-     * @throws IllegalArgumentException If the max. number of rows is exceeded or 
-     *      a rownum is provided where the row is already flushed to disk.
-     * @see #removeRow(Row)
-     */
-    @Override
-    public SXSSFRow createRow(int rownum)
-    {
-        int maxrow = SpreadsheetVersion.EXCEL2007.getLastRowIndex();
-        if (rownum < 0 || rownum > maxrow) {
-            throw new IllegalArgumentException("Invalid row number (" + rownum
-                    + ") outside allowable range (0.." + maxrow + ")");
-        }
-
-        // attempt to overwrite a row that is already flushed to disk
-        if(rownum <= _writer.getLastFlushedRow() ) {
-            throw new IllegalArgumentException(
-                    "Attempting to write a row["+rownum+"] " +
-                    "in the range [0," + _writer.getLastFlushedRow() + "] that is already written to disk.");
-        }
-
-        // attempt to overwrite a existing row in the input template
-        if(_sh.getPhysicalNumberOfRows() > 0 && rownum <= _sh.getLastRowNum() ) {
-            throw new IllegalArgumentException(
-                    "Attempting to write a row["+rownum+"] " +
-                            "in the range [0," + _sh.getLastRowNum() + "] that is already written to disk.");
-        }
-
-        SXSSFRow newRow=new SXSSFRow(this);
-        _rows.put(rownum,newRow);
-        allFlushed = false;
-        if(_randomAccessWindowSize>=0&&_rows.size()>_randomAccessWindowSize)
-        {
-            try
-            {
-               flushRows(_randomAccessWindowSize);
-            }
-            catch (IOException ioe)
-            {
-                throw new RuntimeException(ioe);
-            }
-        }
-        return newRow;
-    }
-
-    /**
-     * Remove a row from this sheet.  All cells contained in the row are removed as well
-     *
-     * @param row   representing a row to remove.
-     */
-    @Override
-    public void removeRow(Row row)
-    {
-        if (row.getSheet() != this) {
-            throw new IllegalArgumentException("Specified row does not belong to this sheet");
-        }
-
-        for(Iterator<Map.Entry<Integer,SXSSFRow>> iter=_rows.entrySet().iterator();iter.hasNext();)
-        {
-            Map.Entry<Integer,SXSSFRow> entry=iter.next();
-            if(entry.getValue()==row)
-            {
-                iter.remove();
-                return;
-            }
-        }
-    }
-
-    /**
-     * Returns the logical row (not physical) 0-based.  If you ask for a row that is not
-     * defined you get a null.  This is to say row 4 represents the fifth row on a sheet.
-     *
-     * @param rownum  row to get (0-based)
-     * @return Row representing the rownumber or null if its not defined on the sheet
-     */
-    @Override
-    public SXSSFRow getRow(int rownum)
-    {
-        return _rows.get(rownum);
-    }
-
-    /**
-     * Returns the number of physically defined rows (NOT the number of rows in the sheet)
-     *
-     * @return the number of physically defined rows in this sheet
-     */
-    @Override
-    public int getPhysicalNumberOfRows()
-    {
-        return _rows.size()+_writer.getNumberOfFlushedRows();
-    }
-
-    /**
-     * Gets the first row on the sheet
-     *
-     * @return the number of the first logical row on the sheet (0-based)
-     */
-    @Override
-    public int getFirstRowNum()
-    {
-        if(_writer.getNumberOfFlushedRows() > 0)
-            return _writer.getLowestIndexOfFlushedRows();
-        return _rows.size() == 0 ? 0 : _rows.firstKey();
-    }
-
-    /**
-     * Gets the last row on the sheet
-     *
-     * @return last row contained n this sheet (0-based)
-     */
-    @Override
-    public int getLastRowNum()
-    {
-        return _rows.size() == 0 ? 0 : _rows.lastKey();
-    }
-
-    /**
-     * Get the visibility state for a given column
-     *
-     * @param columnIndex - the column to get (0-based)
-     * @param hidden - the visiblity state of the column
-     */
-    @Override
-    public void setColumnHidden(int columnIndex, boolean hidden)
-    {
-        _sh.setColumnHidden(columnIndex,hidden);
-    }
-
-    /**
-     * Get the hidden state for a given column
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @return hidden - <code>false</code> if the column is visible
-     */
-    @Override
-    public boolean isColumnHidden(int columnIndex)
-    {
-        return _sh.isColumnHidden(columnIndex);
-    }
-
-    /**
-     * Set the width (in units of 1/256th of a character width)
-     * <p>
-     * The maximum column width for an individual cell is 255 characters.
-     * This value represents the number of characters that can be displayed
-     * in a cell that is formatted with the standard font.
-     * </p>
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @param width - the width in units of 1/256th of a character width
-     */
-    @Override
-    public void setColumnWidth(int columnIndex, int width)
-    {
-        _sh.setColumnWidth(columnIndex,width);
-    }
-
-    /**
-     * get the width (in units of 1/256th of a character width )
-     * @param columnIndex - the column to set (0-based)
-     * @return width - the width in units of 1/256th of a character width
-     */
-    @Override
-    public int getColumnWidth(int columnIndex)
-    {
-        return _sh.getColumnWidth(columnIndex);
-    }
-
-    /**
-     * Get the actual column width in pixels
-     * 
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with the default font size (Calibri 11pt for .xlsx).
-     * </p>
-     */
-    @Override
-    public float getColumnWidthInPixels(int columnIndex) {
-        return _sh.getColumnWidthInPixels(columnIndex);
-    }    
-    
-    /**
-     * Set the default column width for the sheet (if the columns do not define their own width)
-     * in characters
-     *
-     * @param width default column width measured in characters
-     */
-    @Override
-    public void setDefaultColumnWidth(int width)
-    {
-        _sh.setDefaultColumnWidth(width);
-    }
-
-    /**
-     * Get the default column width for the sheet (if the columns do not define their own width)
-     * in characters
-     *
-     * @return default column width measured in characters
-     */
-    @Override
-    public int getDefaultColumnWidth()
-    {
-        return _sh.getDefaultColumnWidth();
-    }
- 
-
-    /**
-     * Get the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of  a point)
-     *
-     * @return  default row height measured in twips (1/20 of  a point)
-     */
-    @Override
-    public short getDefaultRowHeight()
-    {
-        return _sh.getDefaultRowHeight();
-    }
-
-    /**
-     * Get the default row height for the sheet (if the rows do not define their own height) in
-     * points.
-     *
-     * @return  default row height in points
-     */
-    @Override
-    public float getDefaultRowHeightInPoints()
-    {
-        return _sh.getDefaultRowHeightInPoints();
-    }
-
-    /**
-     * Set the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of  a point)
-     *
-     * @param  height default row height measured in twips (1/20 of  a point)
-     */
-    @Override
-    public void setDefaultRowHeight(short height)
-    {
-        _sh.setDefaultRowHeight(height);
-    }
-
-    /**
-     * Set the default row height for the sheet (if the rows do not define their own height) in
-     * points
-     * @param height default row height
-     */
-    @Override
-    public void setDefaultRowHeightInPoints(float height)
-    {
-        _sh.setDefaultRowHeightInPoints(height);
-    }
-    
-
-    /**
-     * Returns the CellStyle that applies to the given
-     *  (0 based) column, or null if no style has been
-     *  set for that column
-     */
-    @Override
-    public CellStyle getColumnStyle(int column)
-    {
-        return _sh.getColumnStyle(column);
-    }
-
-    /**
-     * Sets the CellStyle that applies to the given
-     *  (0 based) column.
-     */
-//    public CellStyle setColumnStyle(int column, CellStyle style);
-
-    /**
-     * Adds a merged region of cells (hence those cells form one)
-     *
-     * @param region (rowfrom/colfrom-rowto/colto) to merge
-     * @return index of this region
-     */
-    @Override
-    public int addMergedRegion(CellRangeAddress region)
-    {
-        return _sh.addMergedRegion(region);
-    }
-
-    /**
-     * Adds a merged region of cells (hence those cells form one)
-     *
-     * @param region (rowfrom/colfrom-rowto/colto) to merge
-     * @return index of this region
-     */
-    @Override
-    public int addMergedRegionUnsafe(CellRangeAddress region)
-    {
-        return _sh.addMergedRegionUnsafe(region);
-    }
-
-    /**
-     * Verify that merged regions do not intersect multi-cell array formulas and
-     * no merged regions intersect another merged region in this sheet.
-     *
-     * @throws IllegalStateException if region intersects with a multi-cell array formula
-     * @throws IllegalStateException if at least one region intersects with another merged region in this sheet
-     */
-    @Override
-    public void validateMergedRegions() {
-        _sh.validateMergedRegions();
-    }
-
-    /**
-     * Determines whether the output is vertically centered on the page.
-     *
-     * @param value true to vertically center, false otherwise.
-     */
-    @Override
-    public void setVerticallyCenter(boolean value)
-    {
-        _sh.setVerticallyCenter(value);
-    }
-
-    /**
-     * Determines whether the output is horizontally centered on the page.
-     *
-     * @param value true to horizontally center, false otherwise.
-     */
-    @Override
-    public void setHorizontallyCenter(boolean value)
-    {
-        _sh.setHorizontallyCenter(value);
-    }
-
-    /**
-     * Determine whether printed output for this sheet will be horizontally centered.
-     */
-    @Override
-    public boolean getHorizontallyCenter()
-    {
-        return _sh.getHorizontallyCenter();
-    }
-
-    /**
-     * Determine whether printed output for this sheet will be vertically centered.
-     */
-    @Override
-    public boolean getVerticallyCenter()
-    {
-        return _sh.getVerticallyCenter();
-    }
-
-    /**
-     * Removes a merged region of cells (hence letting them free)
-     *
-     * @param index of the region to unmerge
-     */
-    @Override
-    public void removeMergedRegion(int index)
-    {
-        _sh.removeMergedRegion(index);
-    }
-    
-    /**
-     * Removes a merged region of cells (hence letting them free)
-     *
-     * @param indices of the regions to unmerge
-     */
-    @Override
-    public void removeMergedRegions(Collection<Integer> indices)
-    {
-        _sh.removeMergedRegions(indices);
-    }
-
-    /**
-     * Returns the number of merged regions
-     *
-     * @return number of merged regions
-     */
-    @Override
-    public int getNumMergedRegions()
-    {
-        return _sh.getNumMergedRegions();
-    }
-
-    /**
-     * Returns the merged region at the specified index. If you want multiple
-     * regions, it is faster to call {@link #getMergedRegions()} than to call
-     * this each time.
-     *
-     * @return the merged region at the specified index
-     */
-    @Override
-    public CellRangeAddress getMergedRegion(int index)
-    {
-        return _sh.getMergedRegion(index);
-    }
-
-    /**
-     * Returns the list of merged regions. If you want multiple regions, this is
-     * faster than calling {@link #getMergedRegion(int)} each time.
-     *
-     * @return the list of merged regions
-     */
-    @Override
-    public List<CellRangeAddress> getMergedRegions() {
-        return _sh.getMergedRegions();
-    }
-
-    /**
-     *  Returns an iterator of the physical rows
-     *
-     * @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.
-     */
-    @Override
-    public Iterator<Row> rowIterator()
-    {
-        @SuppressWarnings("unchecked")
-        Iterator<Row> result = (Iterator<Row>)(Iterator<? extends Row>)_rows.values().iterator();
-        return result;
-    }
-
-    /**
-     * Flag indicating whether the sheet displays Automatic Page Breaks.
-     *
-     * @param value <code>true</code> if the sheet displays Automatic Page Breaks.
-     */
-    @Override
-    public void setAutobreaks(boolean value)
-    {
-        _sh.setAutobreaks(value);
-    }
-
-    /**
-     * Set whether to display the guts or not
-     *
-     * @param value - guts or no guts
-     */
-    @Override
-    public void setDisplayGuts(boolean value)
-    {
-        _sh.setDisplayGuts(value);
-    }
-
-    /**
-     * Set whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     *
-     * @param value whether to display or hide all zero values on the worksheet
-     */
-    @Override
-    public void setDisplayZeros(boolean value)
-    {
-        _sh.setDisplayZeros(value);
-    }
-
-
-    /**
-     * Gets the flag indicating whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     *
-     * @return whether all zero values on the worksheet are displayed
-     */
-    @Override
-    public boolean isDisplayZeros()
-    {
-        return _sh.isDisplayZeros();
-    }
-    
-    /**
-     * Sets whether the worksheet is displayed from right to left instead of from left to right.
-     *
-     * @param value true for right to left, false otherwise.
-     */
-    @Override
-    public void setRightToLeft(boolean value)
-    {
-       _sh.setRightToLeft(value);
-    }
-
-    /**
-     * Whether the text is displayed in right-to-left mode in the window
-     *
-     * @return whether the text is displayed in right-to-left mode in the window
-     */
-    @Override
-    public boolean isRightToLeft()
-    {
-       return _sh.isRightToLeft();
-    }
-
-    /**
-     * Flag indicating whether the Fit to Page print option is enabled.
-     *
-     * @param value <code>true</code> if the Fit to Page print option is enabled.
-     */
-    @Override
-    public void setFitToPage(boolean value)
-    {
-        _sh.setFitToPage(value);
-    }
-
-    /**
-     * Flag indicating whether summary rows appear below detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary row is inserted below the detailed data being summarized and a
-     * new outline level is established on that row.
-     * </p>
-     * <p>
-     * When false a summary row is inserted above the detailed data being summarized and a new outline level
-     * is established on that row.
-     * </p>
-     * @param value <code>true</code> if row summaries appear below detail in the outline
-     */
-    @Override
-    public void setRowSumsBelow(boolean value)
-    {
-        _sh.setRowSumsBelow(value);
-    }
-
-    /**
-     * Flag indicating whether summary columns appear to the right of detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary column is inserted to the right of the detailed data being summarized
-     * and a new outline level is established on that column.
-     * </p>
-     * <p>
-     * When false a summary column is inserted to the left of the detailed data being
-     * summarized and a new outline level is established on that column.
-     * </p>
-     * @param value <code>true</code> if col summaries appear right of the detail in the outline
-     */
-    @Override
-    public void setRowSumsRight(boolean value)
-    {
-        _sh.setRowSumsRight(value);
-    }
-
-    /**
-     * Flag indicating whether the sheet displays Automatic Page Breaks.
-     *
-     * @return <code>true</code> if the sheet displays Automatic Page Breaks.
-     */
-    @Override
-    public boolean getAutobreaks()
-    {
-        return _sh.getAutobreaks();
-    }
-
-    /**
-     * Get whether to display the guts or not,
-     * default value is true
-     *
-     * @return boolean - guts or no guts
-     */
-    @Override
-    public boolean getDisplayGuts()
-    {
-        return _sh.getDisplayGuts();
-    }
-
-    /**
-     * Flag indicating whether the Fit to Page print option is enabled.
-     *
-     * @return <code>true</code> if the Fit to Page print option is enabled.
-     */
-    @Override
-    public boolean getFitToPage()
-    {
-        return _sh.getFitToPage();
-    }
-
-    /**
-     * Flag indicating whether summary rows appear below detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary row is inserted below the detailed data being summarized and a
-     * new outline level is established on that row.
-     * </p>
-     * <p>
-     * When false a summary row is inserted above the detailed data being summarized and a new outline level
-     * is established on that row.
-     * </p>
-     * @return <code>true</code> if row summaries appear below detail in the outline
-     */
-    @Override
-    public boolean getRowSumsBelow()
-    {
-        return _sh.getRowSumsBelow();
-    }
-
-    /**
-     * Flag indicating whether summary columns appear to the right of detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary column is inserted to the right of the detailed data being summarized
-     * and a new outline level is established on that column.
-     * </p>
-     * <p>
-     * When false a summary column is inserted to the left of the detailed data being
-     * summarized and a new outline level is established on that column.
-     * </p>
-     * @return <code>true</code> if col summaries appear right of the detail in the outline
-     */
-    @Override
-    public boolean getRowSumsRight()
-    {
-        return _sh.getRowSumsRight();
-    }
-
-    /**
-     * Returns whether gridlines are printed.
-     *
-     * @return whether gridlines are printed
-     */
-    @Override
-    public boolean isPrintGridlines()
-    {
-        return _sh.isPrintGridlines();
-    }
-
-    /**
-     * Turns on or off the printing of gridlines.
-     *
-     * @param show boolean to turn on or off the printing of gridlines
-     */
-    @Override
-    public void setPrintGridlines(boolean show)
-    {
-        _sh.setPrintGridlines(show);
-    }
-    
-    /**
-     * Returns whether row and column headings are printed.
-     *
-     * @return whether row and column headings are printed
-     */
-    @Override
-    public boolean isPrintRowAndColumnHeadings()
-    {
-        return _sh.isPrintRowAndColumnHeadings();
-    }
-
-    /**
-     * Turns on or off the printing of row and column headings.
-     *
-     * @param show boolean to turn on or off the printing of row and column headings
-     */
-    @Override
-    public void setPrintRowAndColumnHeadings(boolean show)
-    {
-        _sh.setPrintRowAndColumnHeadings(show);
-    }
-
-    /**
-     * Gets the print setup object.
-     *
-     * @return The user model for the print setup object.
-     */
-    @Override
-    public PrintSetup getPrintSetup()
-    {
-        return _sh.getPrintSetup();
-    }
-
-    /**
-     * Gets the user model for the default document header.
-     * <p>
-     * Note that XSSF offers more kinds of document headers than HSSF does
-     * </p>
-     * @return the document header. Never <code>null</code>
-     */
-    @Override
-    public Header getHeader()
-    {
-        return _sh.getHeader();
-    }
-
-    /**
-     * Gets the user model for the default document footer.
-     * <p>
-     * Note that XSSF offers more kinds of document footers than HSSF does.
-     * </p>
-     * @return the document footer. Never <code>null</code>
-     */
-    @Override
-    public Footer getFooter()
-    {
-        return _sh.getFooter();
-    }
-
-    /**
-     * Sets a flag indicating whether this sheet is selected.
-     * <p>
-     * Note: multiple sheets can be selected, but only one sheet can be active at one time.
-     * </p>
-     * @param value <code>true</code> if this sheet is selected
-     * @see Workbook#setActiveSheet(int)
-     */
-    @Override
-    public void setSelected(boolean value)
-    {
-        _sh.setSelected(value);
-    }
-
-    /**
-     * Gets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @return the size of the margin
-     */
-    @Override
-    public double getMargin(short margin)
-    {
-        return _sh.getMargin(margin);
-    }
-
-    /**
-     * Sets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @param size the size of the margin
-     */
-    @Override
-    public void setMargin(short margin, double size)
-    {
-        _sh.setMargin(margin,size);
-    }
-
-    /**
-     * Answer whether protection is enabled or disabled
-     *
-     * @return true means protection enabled; false means protection disabled
-     */
-    @Override
-    public boolean getProtect()
-    {
-        return _sh.getProtect();
-    }
-    
-    /**
-     * Sets the protection enabled as well as the password
-     * @param password to set for protection. Pass <code>null</code> to remove protection
-     */
-    @Override
-    public void protectSheet(String password)
-    {
-        _sh.protectSheet(password);
-    }
-    
-    /**
-     * Answer whether scenario protection is enabled or disabled
-     *
-     * @return true means protection enabled; false means protection disabled
-     */
-    @Override
-    public boolean getScenarioProtect()
-    {
-        return _sh.getScenarioProtect();
-    }
-
-    /**
-     * Sets the zoom magnification for the sheet.  The zoom is expressed as a
-     * fraction.  For example to express a zoom of 75% use 3 for the numerator
-     * and 4 for the denominator.
-     *
-     * @param numerator     The numerator for the zoom magnification.
-     * @param denominator   The denominator for the zoom magnification.
-     * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #setZoom(int)} instead.
-     */
-    @Removal(version="3.16")
-    @Override
-    public void setZoom(int numerator, int denominator)
-    {
-        _sh.setZoom(numerator,denominator);
-    }
-    
-    /**
-     * Window zoom magnification for current view representing percent values.
-     * Valid values range from 10 to 400. Horizontal and Vertical scale together.
-     *
-     * For example:
-     * <pre>
-     * 10 - 10%
-     * 20 - 20%
-     * ...
-     * 100 - 100%
-     * ...
-     * 400 - 400%
-     * </pre>
-     *
-     * Current view can be Normal, Page Layout, or Page Break Preview.
-     *
-     * @param scale window zoom magnification
-     * @throws IllegalArgumentException if scale is invalid
-     */
-    @Override
-    public void setZoom(int scale) {
-        _sh.setZoom(scale);
-    }
-
-    /**
-     * The top row in the visible view when the sheet is
-     * first viewed after opening it in a viewer
-     *
-     * @return short indicating the rownum (0 based) of the top row
-     */
-    @Override
-    public short getTopRow()
-    {
-        return _sh.getTopRow();
-    }
-
-    /**
-     * The left col in the visible view when the sheet is
-     * first viewed after opening it in a viewer
-     *
-     * @return short indicating the rownum (0 based) of the top row
-     */
-    @Override
-    public short getLeftCol()
-    {
-        return _sh.getLeftCol();
-    }
-
-    /**
-     * Sets desktop window pane display area, when the
-     * file is first opened in a viewer.
-     *
-     * @param toprow the top row to show in desktop window pane
-     * @param leftcol the left column to show in desktop window pane
-     */
-    @Override
-    public void showInPane(int toprow, int leftcol)
-    {
-        _sh.showInPane(toprow, leftcol);
-    }
-
-    /**
-     * Control if Excel should be asked to recalculate all formulas when the
-     *  workbook is opened, via the "sheetCalcPr fullCalcOnLoad" option.
-     *  Calculating the formula values with {@link org.apache.poi.ss.usermodel.FormulaEvaluator} is the
-     *  recommended solution, but this may be used for certain cases where
-     *  evaluation in POI is not possible.
-     */
-    @Override
-    public void setForceFormulaRecalculation(boolean value) {
-       _sh.setForceFormulaRecalculation(value);
-    }
-
-    /**
-     * Whether Excel will be asked to recalculate all formulas when the
-     *  workbook is opened.
-     */
-    @Override
-    public boolean getForceFormulaRecalculation() {
-       return _sh.getForceFormulaRecalculation();
-    }
-
-    /**
-     * <i>Not implemented for SXSSFSheets</i>
-     * 
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around.
-     *
-     * Calls shiftRows(startRow, endRow, n, false, false);
-     *
-     * <p>
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted).
-     * @param startRow the row to start shifting
-     * @param endRow the row to end shifting
-     * @param n the number of rows to shift
-     */
-    @NotImplemented
-    @Override
-    public void shiftRows(int startRow, int endRow, int n)
-    {
-        throw new RuntimeException("NotImplemented");
-    }
-
-    /**
-     * <i>Not implemented for SXSSFSheets</i>
-     * 
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around
-     *
-     * <p>
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted). All merged regions that are
-     * completely overlaid by shifting will be deleted.
-     * <p>
-     * @param startRow the row to start shifting
-     * @param endRow the row to end shifting
-     * @param n the number of rows to shift
-     * @param copyRowHeight whether to copy the row height during the shift
-     * @param resetOriginalRowHeight whether to set the original row's height to the default
-     */
-    @NotImplemented
-    @Override
-    public void shiftRows(int startRow, int endRow, int n, boolean copyRowHeight, boolean resetOriginalRowHeight)
-    {
-        throw new RuntimeException("NotImplemented");
-    }
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.
-     * @param colSplit      Horizonatal position of split.
-     * @param rowSplit      Vertical position of split.
-     * @param leftmostColumn   Left column visible in right pane.
-     * @param topRow        Top row visible in bottom pane
-     */
-    @Override
-    public void createFreezePane(int colSplit, int rowSplit, int leftmostColumn, int topRow)
-    {
-        _sh.createFreezePane(colSplit, rowSplit, leftmostColumn, topRow);
-    }
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.
-     * @param colSplit      Horizonatal position of split.
-     * @param rowSplit      Vertical position of split.
-     */
-    @Override
-    public void createFreezePane(int colSplit, int rowSplit)
-    {
-        _sh.createFreezePane(colSplit,rowSplit);
-    }
-
-    /**
-     * Creates a split pane. Any existing freezepane or split pane is overwritten.
-     * @param xSplitPos      Horizonatal position of split (in 1/20th of a point).
-     * @param ySplitPos      Vertical position of split (in 1/20th of a point).
-     * @param topRow        Top row visible in bottom pane
-     * @param leftmostColumn   Left column visible in right pane.
-     * @param activePane    Active pane.  One of: PANE_LOWER_RIGHT,
-     *                      PANE_UPPER_RIGHT, PANE_LOWER_LEFT, PANE_UPPER_LEFT
-     * @see #PANE_LOWER_LEFT
-     * @see #PANE_LOWER_RIGHT
-     * @see #PANE_UPPER_LEFT
-     * @see #PANE_UPPER_RIGHT
-     */
-    @Override
-    public void createSplitPane(int xSplitPos, int ySplitPos, int leftmostColumn, int topRow, int activePane)
-    {
-        _sh.createSplitPane(xSplitPos, ySplitPos, leftmostColumn, topRow, activePane);
-    }
-
-    /**
-     * Returns the information regarding the currently configured pane (split or freeze)
-     *
-     * @return null if no pane configured, or the pane information.
-     */
-    @Override
-    public PaneInformation getPaneInformation()
-    {
-        return _sh.getPaneInformation();
-    }
-
-    /**
-     * Sets whether the gridlines are shown in a viewer
-     *
-     * @param show whether to show gridlines or not
-     */
-    @Override
-    public void setDisplayGridlines(boolean show)
-    {
-        _sh.setDisplayGridlines(show);
-    }
-
-    /**
-     * Returns if gridlines are displayed
-     *
-     * @return whether gridlines are displayed
-     */
-    @Override
-    public boolean isDisplayGridlines()
-    {
-        return _sh.isDisplayGridlines();
-    }
-
-    /**
-     * Sets whether the formulas are shown in a viewer
-     *
-     * @param show whether to show formulas or not
-     */
-    @Override
-    public void setDisplayFormulas(boolean show)
-    {
-        _sh.setDisplayFormulas(show);
-    }
-
-    /**
-     * Returns if formulas are displayed
-     *
-     * @return whether formulas are displayed
-     */
-    @Override
-    public boolean isDisplayFormulas()
-    {
-        return _sh.isDisplayFormulas();
-    }
-
-    /**
-     * Sets whether the RowColHeadings are shown in a viewer
-     *
-     * @param show whether to show RowColHeadings or not
-     */
-    @Override
-    public void setDisplayRowColHeadings(boolean show)
-    {
-        _sh.setDisplayRowColHeadings(show);
-    }
-
-    /**
-     * Returns if RowColHeadings are displayed.
-     * @return whether RowColHeadings are displayed
-     */
-    @Override
-    public boolean isDisplayRowColHeadings()
-    {
-        return _sh.isDisplayRowColHeadings();
-    }
-
-    /**
-     * Sets a page break at the indicated row
-     * @param row FIXME: Document this!
-     */
-    @Override
-    public void setRowBreak(int row)
-    {
-        _sh.setRowBreak(row);
-    }
-
-    /**
-     * Determines if there is a page break at the indicated row
-     * @param row FIXME: Document this!
-     * @return FIXME: Document this!
-     */
-    @Override
-    public boolean isRowBroken(int row)
-    {
-        return _sh.isRowBroken(row);
-    }
-
-    /**
-     * Removes the page break at the indicated row
-     * @param row
-     */
-    @Override
-    public void removeRowBreak(int row)
-    {
-        _sh.removeRowBreak(row);
-    }
-
-    /**
-     * Retrieves all the horizontal page breaks
-     * @return all the horizontal page breaks, or null if there are no row page breaks
-     */
-    @Override
-    public int[] getRowBreaks()
-    {
-        return _sh.getRowBreaks();
-    }
-
-    /**
-     * Retrieves all the vertical page breaks
-     * @return all the vertical page breaks, or null if there are no column page breaks
-     */
-    @Override
-    public int[] getColumnBreaks()
-    {
-        return _sh.getColumnBreaks();
-    }
-
-    /**
-     * Sets a page break at the indicated column
-     * @param column
-     */
-    @Override
-    public void setColumnBreak(int column)
-    {
-        _sh.setColumnBreak(column);
-    }
-
-    /**
-     * Determines if there is a page break at the indicated column
-     * @param column FIXME: Document this!
-     * @return FIXME: Document this!
-     */
-    @Override
-    public boolean isColumnBroken(int column)
-    {
-        return _sh.isColumnBroken(column);
-    }
-
-    /**
-     * Removes a page break at the indicated column
-     * @param column
-     */
-    @Override
-    public void removeColumnBreak(int column)
-    {
-        _sh.removeColumnBreak(column);
-    }
-
-    /**
-     * Expands or collapses a column group.
-     *
-     * @param columnNumber      One of the columns in the group.
-     * @param collapsed         true = collapse group, false = expand group.
-     */
-    @Override
-    public void setColumnGroupCollapsed(int columnNumber, boolean collapsed)
-    {
-        _sh.setColumnGroupCollapsed(columnNumber, collapsed);
-    }
-
-    /**
-     * Create an outline for the provided column range.
-     *
-     * @param fromColumn        beginning of the column range.
-     * @param toColumn          end of the column range.
-     */
-    @Override
-    public void groupColumn(int fromColumn, int toColumn)
-    {
-        _sh.groupColumn(fromColumn,toColumn);
-    }
-
-    /**
-     * Ungroup a range of columns that were previously groupped
-     *
-     * @param fromColumn   start column (0-based)
-     * @param toColumn     end column (0-based)
-     */
-    @Override
-    public void ungroupColumn(int fromColumn, int toColumn)
-    {
-        _sh.ungroupColumn(fromColumn, toColumn);
-    }
-
-    /**
-     * Tie a range of rows together so that they can be collapsed or expanded
-     *
-     * <p>
-     *     Please note the rows being grouped <em>must</em> be in the current window,
-     *     if the rows are already flushed then groupRow has no effect.
-     * </p>
-     * 
-     *      Correct code:
-     *      <pre><code>
-     *       Workbook wb = new SXSSFWorkbook(100);  // keep 100 rows in memory
-     *       Sheet sh = wb.createSheet();
-     *       for (int rownum = 0; rownum &lt; 1000; rownum++) {
-     *           Row row = sh.createRow(rownum);
-     *           if(rownum == 200)  {
-     *               sh.groupRow(100, 200);
-     *           }
-     *       }
-     *
-     *      </code></pre>
-     * 
-     * 
-     *      Incorrect code:
-     *      <pre><code>
-     *       Workbook wb = new SXSSFWorkbook(100);  // keep 100 rows in memory
-     *       Sheet sh = wb.createSheet();
-     *       for (int rownum = 0; rownum &lt; 1000; rownum++) {
-     *           Row row = sh.createRow(rownum);
-     *       }
-     *       sh.groupRow(100, 200); // the rows in the range [100, 200] are already flushed and groupRows has no effect
-     *
-     *      </code></pre>
-     * 
-     *
-     * @param fromRow   start row (0-based)
-     * @param toRow     end row (0-based)
-     */
-    @Override
-    public void groupRow(int fromRow, int toRow)
-    {
-        for(SXSSFRow row : _rows.subMap(fromRow, toRow + 1).values()){
-            int level = row.getOutlineLevel() + 1;
-            row.setOutlineLevel(level);
-
-            if(level > outlineLevelRow) outlineLevelRow = level;
-        }
-
-        setWorksheetOutlineLevelRow();
-    }
-    
-    /**
-     * Set row groupings (like groupRow) in a stream-friendly manner
-     *
-     * <p>
-     *    groupRows requires all rows in the group to be in the current window.
-     *    This is not always practical.  Instead use setRowOutlineLevel to 
-     *    explicitly set the group level.  Level 1 is the top level group, 
-     *    followed by 2, etc.  It is up to the user to ensure that level 2
-     *    groups are correctly nested under level 1, etc.
-     * </p>
-     *
-     * @param rownum    index of row to update (0-based)
-     * @param level     outline level (greater than 0)
-     */
-    public void setRowOutlineLevel(int rownum, int level)
-    {
-        SXSSFRow row = _rows.get(rownum);
-        row.setOutlineLevel(level);
-        if(level > 0 && level > outlineLevelRow) {
-            outlineLevelRow = level;
-            setWorksheetOutlineLevelRow();
-        }
-    }
-
-    private void setWorksheetOutlineLevelRow() {
-        CTWorksheet ct = _sh.getCTWorksheet();
-        CTSheetFormatPr pr = ct.isSetSheetFormatPr() ?
-            ct.getSheetFormatPr() :
-            ct.addNewSheetFormatPr();
-        if(outlineLevelRow > 0) pr.setOutlineLevelRow((short)outlineLevelRow);
-    }
-
-    /**
-     * Ungroup a range of rows that were previously groupped
-     *
-     * @param fromRow   start row (0-based)
-     * @param toRow     end row (0-based)
-     */
-    @Override
-    public void ungroupRow(int fromRow, int toRow)
-    {
-        _sh.ungroupRow(fromRow, toRow);
-    }
-
-    /**
-     * Set view state of a grouped range of rows.
-     *
-     * <i>Not implemented for expanding (i.e. collapse == false)</i>
-     *
-     * @param row   start row of a groupped range of rows (0-based)
-     * @param collapse whether to expand/collapse the detail rows
-     * @throws RuntimeException if collapse is false as this is not implemented for SXSSF.
-     */
-    @Override
-    public void setRowGroupCollapsed(int row, boolean collapse)
-    {
-        if (collapse) {
-            collapseRow(row);
-        } else {
-            //expandRow(rowIndex);
-            throw new RuntimeException("Unable to expand row: Not Implemented");
-        }
-    }
-    
-    /**
-     * @param rowIndex the zero based row index to collapse
-     */
-    private void collapseRow(int rowIndex) {
-        SXSSFRow row = getRow(rowIndex);
-        if(row == null) {
-            throw new IllegalArgumentException("Invalid row number("+ rowIndex + "). Row does not exist.");
-        } else {
-            int startRow = findStartOfRowOutlineGroup(rowIndex);
-
-            // Hide all the columns until the end of the group
-            int lastRow = writeHidden(row, startRow, true);
-            SXSSFRow lastRowObj = getRow(lastRow); 
-            if (lastRowObj != null) {
-                lastRowObj.setCollapsed(true);
-            } else {
-                SXSSFRow newRow = createRow(lastRow);
-                newRow.setCollapsed(true);
-            }
-        }
-    }
-    
-    /**
-     * @param rowIndex the zero based row index to find from
-     */
-    private int findStartOfRowOutlineGroup(int rowIndex) {
-        // Find the start of the group.
-        Row row = getRow(rowIndex);
-        int level = ((SXSSFRow) row).getOutlineLevel();
-        if(level == 0) {
-            throw new IllegalArgumentException("Outline level is zero for the row (" + rowIndex + ").");
-        }
-        int currentRow = rowIndex;
-        while (getRow(currentRow) != null) {
-            if (getRow(currentRow).getOutlineLevel() < level)
-                return currentRow + 1;
-            currentRow--;
-        }
-        return currentRow + 1;
-    }
-    
-    private int writeHidden(SXSSFRow xRow, int rowIndex, boolean hidden) {
-        int level = xRow.getOutlineLevel();
-        SXSSFRow currRow = getRow(rowIndex);
-
-        while (currRow != null && currRow.getOutlineLevel() >= level) {
-            currRow.setHidden(hidden);
-            rowIndex++;
-            currRow = getRow(rowIndex);
-        }
-        return rowIndex;
-    }
-
-    /**
-     * Sets the default column style for a given column.  POI will only apply this style to new cells added to the sheet.
-     *
-     * @param column the column index
-     * @param style the style to set
-     */
-    @Override
-    public void setDefaultColumnStyle(int column, CellStyle style)
-    {
-        _sh.setDefaultColumnStyle(column, style);
-    }
-    
-    
-    /**
-     * Track a column in the sheet for auto-sizing.
-     * Note this has undefined behavior if a column is tracked after one or more rows are written to the sheet.
-     * If <code>column</code> is already tracked, this call does nothing.
-     *
-     * @param column the column to track for auto-sizing
-     * @since 3.14beta1
-     * @see #trackColumnsForAutoSizing(Collection)
-     * @see #trackAllColumnsForAutoSizing()
-     */
-    public void trackColumnForAutoSizing(int column)
-    {
-        _autoSizeColumnTracker.trackColumn(column);
-    }
-    
-    /**
-     * Track several columns in the sheet for auto-sizing.
-     * Note this has undefined behavior if columns are tracked after one or more rows are written to the sheet.
-     * Any column in <code>columns</code> that are already tracked are ignored by this call.
-     *
-     * @param columns the columns to track for auto-sizing
-     * @since 3.14beta1
-     */
-    public void trackColumnsForAutoSizing(Collection<Integer> columns)
-    {
-        _autoSizeColumnTracker.trackColumns(columns);
-    }
-    
-    /**
-     * Tracks all columns in the sheet for auto-sizing. If this is called, individual columns do not need to be tracked.
-     * Because determining the best-fit width for a cell is expensive, this may affect the performance.
-     * @since 3.14beta1
-     */
-    public void trackAllColumnsForAutoSizing()
-    {
-        _autoSizeColumnTracker.trackAllColumns();
-    }
-    
-    /**
-     * Removes a column that was previously marked for inclusion in auto-size column tracking.
-     * When a column is untracked, the best-fit width is forgotten.
-     * If <code>column</code> is not tracked, it will be ignored by this call.
-     *
-     * @param column the index of the column to track for auto-sizing
-     * @return true if column was tracked prior to this call, false if no action was taken
-     * @since 3.14beta1
-     * @see #untrackColumnsForAutoSizing(Collection)
-     * @see #untrackAllColumnsForAutoSizing()
-     */
-    public boolean untrackColumnForAutoSizing(int column)
-    {
-        return _autoSizeColumnTracker.untrackColumn(column);
-    }
-    
-    /**
-     * Untracks several columns in the sheet for auto-sizing.
-     * When a column is untracked, the best-fit width is forgotten.
-     * Any column in <code>columns</code> that is not tracked will be ignored by this call.
-     *
-     * @param columns the indices of the columns to track for auto-sizing
-     * @return true if one or more columns were untracked as a result of this call
-     * @since 3.14beta1
-     */
-    public boolean untrackColumnsForAutoSizing(Collection<Integer> columns)
-    {
-        return _autoSizeColumnTracker.untrackColumns(columns);
-    }
-    
-    /**
-     * Untracks all columns in the sheet for auto-sizing. Best-fit column widths are forgotten.
-     * If this is called, individual columns do not need to be untracked.
-     * @since 3.14beta1
-     */
-    public void untrackAllColumnsForAutoSizing()
-    {
-        _autoSizeColumnTracker.untrackAllColumns();
-    }
-    
-    /**
-     * Returns true if column is currently tracked for auto-sizing.
-     *
-     * @param column the index of the column to check
-     * @return true if column is tracked
-     * @since 3.14beta1
-     */
-    public boolean isColumnTrackedForAutoSizing(int column)
-    {
-        return _autoSizeColumnTracker.isColumnTracked(column);
-    }
-    
-    /**
-     * Get the currently tracked columns for auto-sizing.
-     * Note if all columns are tracked, this will only return the columns that have been explicitly or implicitly tracked,
-     * which is probably only columns containing 1 or more non-blank values
-     *
-     * @return a set of the indices of all tracked columns
-     * @since 3.14beta1
-     */
-    public Set<Integer> getTrackedColumnsForAutoSizing()
-    {
-        return _autoSizeColumnTracker.getTrackedColumns();
-    }
-
-    /**
-     * Adjusts the column width to fit the contents.
-     *
-     * <p>
-     * This process can be relatively slow on large sheets, so this should
-     *  normally only be called once per column, at the end of your
-     *  processing.
-     * </p>
-     * You can specify whether the content of merged cells should be considered or ignored.
-     *  Default is to ignore merged cells.
-     *  
-     *  <p>
-     *  Special note about SXSSF implementation: You must register the columns you wish to track with
-     *  the SXSSFSheet using {@link #trackColumnForAutoSizing(int)} or {@link #trackAllColumnsForAutoSizing()}.
-     *  This is needed because the rows needed to compute the column width may have fallen outside the
-     *  random access window and been flushed to disk.
-     *  Tracking columns is required even if all rows are in the random access window.
-     *  </p>
-     *  <p><i>New in POI 3.14 beta 1: auto-sizes columns using cells from current and flushed rows.</i></p>
-     *
-     * @param column the column index to auto-size
-     */
-    @Override
-    public void autoSizeColumn(int column)
-    {
-        autoSizeColumn(column, false);
-    }
-
-    /**
-     * Adjusts the column width to fit the contents.
-     * <p>
-     * This process can be relatively slow on large sheets, so this should
-     *  normally only be called once per column, at the end of your
-     *  processing.
-     * </p>
-     * You can specify whether the content of merged cells should be considered or ignored.
-     *  Default is to ignore merged cells.
-     *  
-     *  <p>
-     *  Special note about SXSSF implementation: You must register the columns you wish to track with
-     *  the SXSSFSheet using {@link #trackColumnForAutoSizing(int)} or {@link #trackAllColumnsForAutoSizing()}.
-     *  This is needed because the rows needed to compute the column width may have fallen outside the
-     *  random access window and been flushed to disk.
-     *  Tracking columns is required even if all rows are in the random access window.
-     *  </p>
-     *  <p><i>New in POI 3.14 beta 1: auto-sizes columns using cells from current and flushed rows.</i></p>
-     *
-     * @param column the column index to auto-size
-     * @param useMergedCells whether to use the contents of merged cells when calculating the width of the column
-     */
-    @Override
-    public void autoSizeColumn(int column, boolean useMergedCells)
-    {
-        // Multiple calls to autoSizeColumn need to look up the best-fit width
-        // of rows already flushed to disk plus re-calculate the best-fit width
-        // of rows in the current window. It isn't safe to update the column
-        // widths before flushing to disk because columns in the random access
-        // window rows may change in best-fit width. The best-fit width of a cell
-        // is only fixed when it becomes inaccessible for modification.
-        // Changes to the shared strings table, styles table, or formulas might
-        // be able to invalidate the auto-size width without the opportunity
-        // to recalculate the best-fit width for the flushed rows. This is an
-        // inherent limitation of SXSSF. If having correct auto-sizing is
-        // critical, the flushed rows would need to be re-read by the read-only
-        // XSSF eventmodel (SAX) or the memory-heavy XSSF usermodel (DOM). 
-        final int flushedWidth;
-        try {
-            // get the best fit width of rows already flushed to disk
-            flushedWidth = _autoSizeColumnTracker.getBestFitColumnWidth(column, useMergedCells);
-        }
-        catch (final IllegalStateException e) {
-            throw new IllegalStateException("Could not auto-size column. Make sure the column was tracked prior to auto-sizing the column.", e);
-        }
-        
-        // get the best-fit width of rows currently in the random access window
-        final int activeWidth = (int) (256 * SheetUtil.getColumnWidth(this, column, useMergedCells));
-
-        // the best-fit width for both flushed rows and random access window rows
-        // flushedWidth or activeWidth may be negative if column contains only blank cells
-        final int bestFitWidth = Math.max(flushedWidth,  activeWidth);
-        
-        if (bestFitWidth > 0) {
-            final int maxColumnWidth = 255*256; // The maximum column width for an individual cell is 255 characters
-            final int width = Math.min(bestFitWidth,  maxColumnWidth);
-            setColumnWidth(column, width);
-        }
-    }
-
-    /**
-     * Returns cell comment for the specified row and column
-     *
-     * @return cell comment or <code>null</code> if not found
-     * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead.
-     */
-    @Override
-    public XSSFComment getCellComment(int row, int column)
-    {
-        return getCellComment(new CellAddress(row, column));
-    }
-    
-    /**
-     * Returns cell comment for the specified row and column
-     *
-     * @return cell comment or <code>null</code> if not found
-     */
-    @Override
-    public XSSFComment getCellComment(CellAddress ref)
-    {
-        return _sh.getCellComment(ref);
-    }
-    
-    /**
-     * Returns all cell comments on this sheet.
-     * @return A map of each Comment in the sheet, keyed on the cell address where
-     * the comment is located.
-     */
-    @Override
-    public Map<CellAddress, XSSFComment> getCellComments() {
-        return _sh.getCellComments();
-    }
-    
-    /**
-     * Get a Hyperlink in this sheet anchored at row, column
-     *
-     * @param row
-     * @param column
-     * @return hyperlink if there is a hyperlink anchored at row, column; otherwise returns null
-     */
-    @Override
-    public XSSFHyperlink getHyperlink(int row, int column) {
-        return _sh.getHyperlink(row, column);
-    }
-    
-    /**
-     * Get a Hyperlink in this sheet located in a cell specified by {code addr}
-     *
-     * @param addr The address of the cell containing the hyperlink
-     * @return hyperlink if there is a hyperlink anchored at {@code addr}; otherwise returns {@code null}
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public XSSFHyperlink getHyperlink(CellAddress addr) {
-        return _sh.getHyperlink(addr);
-    }
-    
-    /**
-     * Get a list of Hyperlinks in this sheet
-     *
-     * @return Hyperlinks for the sheet
-     */
-    @Override
-    public List<XSSFHyperlink> getHyperlinkList() {
-        return _sh.getHyperlinkList();
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Drawing getDrawingPatriarch()
-    {
-        return _sh.getDrawingPatriarch();
-    }
-
-    /**
-     * Creates the top-level drawing patriarch.
-     *
-     * @return  The new drawing patriarch.
-     */
-    @Override
-    public Drawing createDrawingPatriarch()
-    {
-        return new SXSSFDrawing((SXSSFWorkbook)getWorkbook(), _sh.createDrawingPatriarch());
-    }
-
-
-    /**
-     * Return the parent workbook
-     *
-     * @return the parent workbook
-     */
-    @Override
-    public SXSSFWorkbook getWorkbook()
-    {
-        return _workbook;
-    }
-
-    /**
-     * Returns the name of this sheet
-     *
-     * @return the name of this sheet
-     */
-    @Override
-    public String getSheetName()
-    {
-        return _sh.getSheetName();
-    }
-
-    /**
-     * Note - this is not the same as whether the sheet is focused (isActive)
-     * @return <code>true</code> if this sheet is currently selected
-     */
-    @Override
-    public boolean isSelected()
-    {
-        return _sh.isSelected();
-    }
-
-
-    /**
-     * Sets array formula to specified region for result.
-     *
-     * @param formula text representation of the formula
-     * @param range Region of array formula for result.
-     * @return the {@link CellRange} of cells affected by this change
-     */
-    @Override
-    public CellRange<? extends Cell> setArrayFormula(String formula, CellRangeAddress range)
-    {
-        return _sh.setArrayFormula(formula, range);
-    }
-
-    /**
-     * Remove a Array Formula from this sheet.  All cells contained in the Array Formula range are removed as well
-     *
-     * @param cell   any cell within Array Formula range
-     * @return the {@link CellRange} of cells affected by this change
-     */
-    @Override
-    public CellRange<? extends Cell> removeArrayFormula(Cell cell)
-    {
-        return _sh.removeArrayFormula(cell);
-    }
-    
-    @Override
-    public DataValidationHelper getDataValidationHelper()
-    {
-        return _sh.getDataValidationHelper();
-    }
-
-    @Override
-    public List<XSSFDataValidation> getDataValidations()
-    {
-        return _sh.getDataValidations();
-    }
-
-    /**
-     * Creates a data validation object
-     * @param dataValidation The Data validation object settings
-     */
-    @Override
-    public void addValidationData(DataValidation dataValidation)
-    {
-        _sh.addValidationData(dataValidation);
-    }
-
-    /**
-     * Enable filtering for a range of cells
-     * 
-     * @param range the range of cells to filter
-     */
-    @Override
-    public AutoFilter setAutoFilter(CellRangeAddress range)
-    {
-        return _sh.setAutoFilter(range);
-    }
-
-    @Override
-    public SheetConditionalFormatting getSheetConditionalFormatting(){
-        return _sh.getSheetConditionalFormatting();
-    }
-    
-    
-    @Override
-    public CellRangeAddress getRepeatingRows() {
-      return _sh.getRepeatingRows();
-    }
-    
-    @Override
-    public CellRangeAddress getRepeatingColumns() {
-      return _sh.getRepeatingColumns();
-    }
-    
-    @Override
-    public void setRepeatingRows(CellRangeAddress rowRangeRef) {
-      _sh.setRepeatingRows(rowRangeRef);
-    }
-    
-    @Override
-    public void setRepeatingColumns(CellRangeAddress columnRangeRef) {
-      _sh.setRepeatingColumns(columnRangeRef);
-    }
-    
-    
-    
-//end of interface implementation
-    /**
-     * Specifies how many rows can be accessed at most via getRow().
-     * When a new node is created via createRow() and the total number
-     * of unflushed records would exeed the specified value, then the
-     * row with the lowest index value is flushed and cannot be accessed
-     * via getRow() anymore.
-     * A value of -1 indicates unlimited access. In this case all
-     * records that have not been flushed by a call to flush() are available
-     * for random access.
-     * A value of 0 is not allowed because it would flush any newly created row
-     * without having a chance to specify any cells.
-     */
-    public void setRandomAccessWindowSize(int value)
-    {
-         if(value == 0 || value < -1) {
-             throw new IllegalArgumentException("RandomAccessWindowSize must be either -1 or a positive integer");
-         }
-         _randomAccessWindowSize=value;
-    }
-    
-    /**
-     * Are all rows flushed to disk?
-     */
-    public boolean areAllRowsFlushed() {
-        return allFlushed;
-    }
-    /**
-     * @return Last row number to be flushed to disk, or -1 if none flushed yet
-     */
-    public int getLastFlushedRowNum() {
-        return lastFlushedRowNumber;
-    }
-
-    /**
-     * Specifies how many rows can be accessed at most via getRow().
-     * The exeeding rows (if any) are flushed to the disk while rows
-     * with lower index values are flushed first.
-     */
-    public void flushRows(int remaining) throws IOException
-    {
-        while(_rows.size() > remaining) flushOneRow();
-        if (remaining == 0) allFlushed = true;
-    }
-
-    /**
-     * Flush all rows to disk. After this call no rows can be accessed via getRow()
-     *
-     * @throws IOException
-     */
-    public void flushRows() throws IOException
-    {
-        this.flushRows(0);
-    }
-
-    private void flushOneRow() throws IOException
-    {
-        Integer firstRowNum = _rows.firstKey();
-        if (firstRowNum!=null) {
-            int rowIndex = firstRowNum.intValue();
-            SXSSFRow row = _rows.get(firstRowNum);
-            // Update the best fit column widths for auto-sizing just before the rows are flushed
-            _autoSizeColumnTracker.updateColumnWidths(row);
-            _writer.writeRow(rowIndex, row);
-            _rows.remove(firstRowNum);
-            lastFlushedRowNumber = rowIndex;
-        }
-    }
-    public void changeRowNum(SXSSFRow row, int newRowNum)
-    {
-        
-        removeRow(row);
-        _rows.put(newRowNum,row);
-    }
-
-    public int getRowNum(SXSSFRow row)
-    {
-        for(Iterator<Map.Entry<Integer,SXSSFRow>> iter=_rows.entrySet().iterator();iter.hasNext();)
-        {
-            Map.Entry<Integer,SXSSFRow> entry=iter.next();
-            if(entry.getValue()==row)
-                return entry.getKey().intValue();
-        }
-        return -1;
-    }
-
-    /**
-     * Deletes the temporary file that backed this sheet on disk.
-     * @return true if the file was deleted, false if it wasn't.
-     */
-    boolean dispose() throws IOException {
-        if (!allFlushed) flushRows();
-        return _writer.dispose();
-    }
-
-    @Override
-    public int getColumnOutlineLevel(int columnIndex) {
-        return _sh.getColumnOutlineLevel(columnIndex);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public CellAddress getActiveCell() {
-        return _sh.getActiveCell();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setActiveCell(CellAddress address) {
-        _sh.setActiveCell(address);
-    }
-
-    public XSSFColor getTabColor() {
-        return _sh.getTabColor();
-    }
-
-    public void setTabColor(XSSFColor color) {
-        _sh.setTabColor(color);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
deleted file mode 100644
index 18a77bf..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
+++ /dev/null
@@ -1,1412 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.streaming;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.util.ZipEntrySource;
-import org.apache.poi.openxml4j.util.ZipFileZipEntrySource;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Streaming version of XSSFWorkbook implementing the "BigGridDemo" strategy.
- *
- * This allows to write very large files without running out of memory as only
- * a configurable portion of the rows are kept in memory at any one time.
- *
- * You can provide a template workbook which is used as basis for the written
- * data.
- *
- * See https://poi.apache.org/spreadsheet/how-to.html#sxssf for details.
- *
- * Please note that there are still things that still may consume a large
- * amount of memory based on which features you are using, e.g. merged regions,
- * comments, ... are still only stored in memory and thus may require a lot of
- * memory if used extensively.
- *
- * SXSSFWorkbook defaults to using inline strings instead of a shared strings
- * table. This is very efficient, since no document content needs to be kept in
- * memory, but is also known to produce documents that are incompatible with
- * some clients. With shared strings enabled all unique strings in the document
- * has to be kept in memory. Depending on your document content this could use
- * a lot more resources than with shared strings disabled.
- *
- * Carefully review your memory budget and compatibility needs before deciding
- * whether to enable shared strings or not.
- */
-public class SXSSFWorkbook implements Workbook {
-    /**
-     * Specifies how many rows can be accessed at most via {@link SXSSFSheet#getRow}.
-     * When a new node is created via {@link SXSSFSheet#createRow} and the total number
-     * of unflushed records would exceed the specified value, then the
-     * row with the lowest index value is flushed and cannot be accessed
-     * via {@link SXSSFSheet#getRow} anymore.
-     */
-    public static final int DEFAULT_WINDOW_SIZE = 100;
-    private static final POILogger logger = POILogFactory.getLogger(SXSSFWorkbook.class);
-
-    private final XSSFWorkbook _wb;
-
-    private final Map<SXSSFSheet,XSSFSheet> _sxFromXHash = new HashMap<SXSSFSheet,XSSFSheet>();
-    private final Map<XSSFSheet,SXSSFSheet> _xFromSxHash = new HashMap<XSSFSheet,SXSSFSheet>();
-
-    private int _randomAccessWindowSize = DEFAULT_WINDOW_SIZE;
-
-    /**
-     * whether temp files should be compressed.
-     */
-    private boolean _compressTmpFiles = false;
-
-    /**
-     * shared string table - a cache of strings in this workbook
-     */
-    private final SharedStringsTable _sharedStringSource;
-
-    /**
-     * Construct a new workbook with default row window size
-     */
-    public SXSSFWorkbook(){
-    	this(null /*workbook*/);
-    }
-
-    /**
-     * <p>Construct a workbook from a template.</p>
-     * 
-     * There are three use-cases to use SXSSFWorkbook(XSSFWorkbook) :
-     * <ol>
-     *   <li>
-     *       Append new sheets to existing workbooks. You can open existing
-     *       workbook from a file or create on the fly with XSSF.
-     *   </li>
-     *   <li>
-     *       Append rows to existing sheets. The row number MUST be greater
-     *       than {@code max(rownum)} in the template sheet.
-     *   </li>
-     *   <li>
-     *       Use existing workbook as a template and re-use global objects such
-     *       as cell styles, formats, images, etc.
-     *   </li>
-     * </ol>
-     * All three use cases can work in a combination.
-     * 
-     * What is not supported:
-     * <ul>
-     *   <li>
-     *   Access initial cells and rows in the template. After constructing
-     *   {@link #SXSSFWorkbook(XSSFWorkbook)} all internal windows are empty and
-     *   {@link SXSSFSheet#getRow} and {@link SXSSFRow#getCell} return <code>null</code>.
-     *   </li>
-     *   <li>
-     *    Override existing cells and rows. The API silently allows that but
-     *    the output file is invalid and Excel cannot read it.
-     *   </li>
-     * </ul>
-     *
-     * @param workbook  the template workbook
-     */
-    public SXSSFWorkbook(XSSFWorkbook workbook){
-    	this(workbook, DEFAULT_WINDOW_SIZE);
-    }
-    
-
-    /**
-     * Constructs an workbook from an existing workbook.
-     * <p>
-     * When a new node is created via {@link SXSSFSheet#createRow} and the total number
-     * of unflushed records would exceed the specified value, then the
-     * row with the lowest index value is flushed and cannot be accessed
-     * via {@link SXSSFSheet#getRow} anymore.
-     * </p>
-     * <p>
-     * A value of <code>-1</code> indicates unlimited access. In this case all
-     * records that have not been flushed by a call to <code>flush()</code> are available
-     * for random access.
-     * </p>
-     * <p>
-     * A value of <code>0</code> is not allowed because it would flush any newly created row
-     * without having a chance to specify any cells.
-     * </p>
-     *
-     * @param rowAccessWindowSize the number of rows that are kept in memory until flushed out, see above.
-     */
-    public SXSSFWorkbook(XSSFWorkbook workbook, int rowAccessWindowSize){
-    	this(workbook,rowAccessWindowSize, false);
-    }
-
-    /**
-     * Constructs an workbook from an existing workbook.
-     * <p>
-     * When a new node is created via {@link SXSSFSheet#createRow} and the total number
-     * of unflushed records would exceed the specified value, then the
-     * row with the lowest index value is flushed and cannot be accessed
-     * via {@link SXSSFSheet#getRow} anymore.
-     * </p>
-     * <p>
-     * A value of <code>-1</code> indicates unlimited access. In this case all
-     * records that have not been flushed by a call to <code>flush()</code> are available
-     * for random access.
-     * </p>
-     * <p>
-     * A value of <code>0</code> is not allowed because it would flush any newly created row
-     * without having a chance to specify any cells.
-     * </p>
-     *
-     * @param rowAccessWindowSize the number of rows that are kept in memory until flushed out, see above.
-     * @param compressTmpFiles whether to use gzip compression for temporary files
-     */
-    public SXSSFWorkbook(XSSFWorkbook workbook, int rowAccessWindowSize, boolean compressTmpFiles){
-    	this(workbook,rowAccessWindowSize, compressTmpFiles, false);
-    }
-
-    /**
-     * Constructs an workbook from an existing workbook.
-     * <p>
-     * When a new node is created via {@link SXSSFSheet#createRow} and the total number
-     * of unflushed records would exceed the specified value, then the
-     * row with the lowest index value is flushed and cannot be accessed
-     * via {@link SXSSFSheet#getRow} anymore.
-     * </p>
-     * <p>
-     * A value of <code>-1</code> indicates unlimited access. In this case all
-     * records that have not been flushed by a call to <code>flush()</code> are available
-     * for random access.
-     * </p>
-     * <p>
-     * A value of <code>0</code> is not allowed because it would flush any newly created row
-     * without having a chance to specify any cells.
-     * </p>
-     *
-     * @param workbook  the template workbook
-     * @param rowAccessWindowSize the number of rows that are kept in memory until flushed out, see above.
-     * @param compressTmpFiles whether to use gzip compression for temporary files
-     * @param useSharedStringsTable whether to use a shared strings table
-     */
-    public SXSSFWorkbook(XSSFWorkbook workbook, int rowAccessWindowSize, boolean compressTmpFiles, boolean useSharedStringsTable){
-        setRandomAccessWindowSize(rowAccessWindowSize);
-        setCompressTempFiles(compressTmpFiles);
-        if (workbook == null)
-        {
-            _wb=new XSSFWorkbook();
-            _sharedStringSource = useSharedStringsTable ? _wb.getSharedStringSource() : null;
-        }
-        else
-        {
-            _wb=workbook;
-            _sharedStringSource = useSharedStringsTable ? _wb.getSharedStringSource() : null;
-            final int numberOfSheets = _wb.getNumberOfSheets();
-            for ( int i = 0; i < numberOfSheets; i++ )
-            {
-                XSSFSheet sheet = _wb.getSheetAt( i );
-                createAndRegisterSXSSFSheet( sheet );
-            }
-        }
-    }
-    /**
-     * Construct an empty workbook and specify the window for row access.
-     * <p>
-     * When a new node is created via {@link SXSSFSheet#createRow} and the total number
-     * of unflushed records would exceed the specified value, then the
-     * row with the lowest index value is flushed and cannot be accessed
-     * via {@link SXSSFSheet#getRow} anymore.
-     * </p>
-     * <p>
-     * A value of <code>-1</code> indicates unlimited access. In this case all
-     * records that have not been flushed by a call to <code>flush()</code> are available
-     * for random access.
-     * </p>
-     * <p>
-     * A value of <code>0</code> is not allowed because it would flush any newly created row
-     * without having a chance to specify any cells.
-     * </p>
-     *
-     * @param rowAccessWindowSize the number of rows that are kept in memory until flushed out, see above.
-     */
-    public SXSSFWorkbook(int rowAccessWindowSize){
-    	this(null /*workbook*/, rowAccessWindowSize);
-    }
-
-    /**
-     * See the constructors for a more detailed description of the sliding window of rows.
-     *
-     * @return The number of rows that are kept in memory at once before flushing them out.
-     */
-    public int getRandomAccessWindowSize() {
-    	return _randomAccessWindowSize;
-    }
-
-    private void setRandomAccessWindowSize(int rowAccessWindowSize) {
-        if(rowAccessWindowSize == 0 || rowAccessWindowSize < -1) {
-            throw new IllegalArgumentException("rowAccessWindowSize must be greater than 0 or -1");
-        }
-        _randomAccessWindowSize = rowAccessWindowSize;
-    }
-
-    /**
-     * Get whether temp files should be compressed.
-     *
-     * @return whether to compress temp files
-     */
-    public boolean isCompressTempFiles() {
-        return _compressTmpFiles;
-    }
-    /**
-     * Set whether temp files should be compressed.
-     * <p>
-     *   SXSSF writes sheet data in temporary files (a temp file per-sheet)
-     *   and the size of these temp files can grow to to a very large size,
-     *   e.g. for a 20 MB csv data the size of the temp xml file become few GB large.
-     *   If the "compress" flag is set to <code>true</code> then the temporary XML is gzipped.
-     * </p>
-     * <p>
-     *     Please note the the "compress" option may cause performance penalty.
-     * </p>
-     * @param compress whether to compress temp files
-     */
-    public void setCompressTempFiles(boolean compress) {
-        _compressTmpFiles = compress;
-    }
-    
-    @Internal
-    protected SharedStringsTable getSharedStringSource() {
-        return _sharedStringSource;
-    }
-
-    protected SheetDataWriter createSheetDataWriter() throws IOException {
-        if(_compressTmpFiles) {
-            return new GZIPSheetDataWriter(_sharedStringSource);
-        }
-        
-        return new SheetDataWriter(_sharedStringSource);
-    }
-
-    XSSFSheet getXSSFSheet(SXSSFSheet sheet)
-    {
-        return _sxFromXHash.get(sheet);
-    }
-
-    SXSSFSheet getSXSSFSheet(XSSFSheet sheet)
-    {
-        return _xFromSxHash.get(sheet);
-    }
-
-    void registerSheetMapping(SXSSFSheet sxSheet,XSSFSheet xSheet)
-    {
-        _sxFromXHash.put(sxSheet,xSheet);
-        _xFromSxHash.put(xSheet,sxSheet);
-    }
-
-    void deregisterSheetMapping(XSSFSheet xSheet)
-    {
-        SXSSFSheet sxSheet=getSXSSFSheet(xSheet);
-        
-        // ensure that the writer is closed in all cases to not have lingering writers
-        try {
-            sxSheet.getSheetDataWriter().close();
-        } catch (IOException e) {
-            // ignore exception here
-        }
-        
-        _sxFromXHash.remove(sxSheet);
-
-        _xFromSxHash.remove(xSheet);
-    }
-
-    private XSSFSheet getSheetFromZipEntryName(String sheetRef)
-    {
-        for(XSSFSheet sheet : _sxFromXHash.values())
-        {
-            if(sheetRef.equals(sheet.getPackagePart().getPartName().getName().substring(1))) return sheet;
-        }
-        return null;
-    }
-
-    protected void injectData(ZipEntrySource zipEntrySource, OutputStream out) throws IOException 
-    {
-        try
-        {
-            ZipOutputStream zos = new ZipOutputStream(out);
-            try
-            {
-                Enumeration<? extends ZipEntry> en = zipEntrySource.getEntries();
-                while (en.hasMoreElements()) 
-                {
-                    ZipEntry ze = en.nextElement();
-                    zos.putNextEntry(new ZipEntry(ze.getName()));
-                    InputStream is = zipEntrySource.getInputStream(ze);
-                    XSSFSheet xSheet=getSheetFromZipEntryName(ze.getName());
-                    if(xSheet!=null)
-                    {
-                        SXSSFSheet sxSheet=getSXSSFSheet(xSheet);
-                        InputStream xis = sxSheet.getWorksheetXMLInputStream();
-                        try
-                        {
-                            copyStreamAndInjectWorksheet(is,zos,xis);
-                        }
-                        finally
-                        {
-                            xis.close();
-                        }
-                    }
-                    else
-                    {
-                        copyStream(is, zos);
-                    }
-                    is.close();
-                }
-            }
-            finally
-            {
-                zos.close();
-            }
-        }
-        finally
-        {
-            zipEntrySource.close();
-        }
-    }
-    private static void copyStream(InputStream in, OutputStream out) throws IOException {
-        byte[] chunk = new byte[1024];
-        int count;
-        while ((count = in.read(chunk)) >=0 ) {
-          out.write(chunk,0,count);
-        }
-    }
-    private static void copyStreamAndInjectWorksheet(InputStream in, OutputStream out, InputStream worksheetData) throws IOException {
-        InputStreamReader inReader=new InputStreamReader(in,"UTF-8"); //TODO: Is it always UTF-8 or do we need to read the xml encoding declaration in the file? If not, we should perhaps use a SAX reader instead.
-        OutputStreamWriter outWriter=new OutputStreamWriter(out,"UTF-8");
-        boolean needsStartTag = true;
-        int c;
-        int pos=0;
-        String s="<sheetData";
-        int n=s.length();
-//Copy from "in" to "out" up to the string "<sheetData/>" or "</sheetData>" (excluding).
-        while(((c=inReader.read())!=-1))
-        {
-            if(c==s.charAt(pos))
-            {
-                pos++;
-                if(pos==n)
-                {
-                	if ("<sheetData".equals(s))
-                	{
-                    	c = inReader.read();
-                    	if (c == -1)
-                    	{
-                    		outWriter.write(s);
-                    		break;
-                    	}
-                    	if (c == '>')
-                    	{
-                    		// Found <sheetData>
-                    		outWriter.write(s);
-                    		outWriter.write(c);
-                    		s = "</sheetData>";
-                    		n = s.length();
-                    		pos = 0;
-                    		needsStartTag = false;
-                    		continue;
-                    	}
-                    	if (c == '/')
-                    	{
-                    		// Found <sheetData/
-                        	c = inReader.read();
-                        	if (c == -1)
-                        	{
-                        		outWriter.write(s);
-                        		break;
-                        	}
-                        	if (c == '>')
-                        	{
-                        		// Found <sheetData/>
-                        		break;
-                        	}
-                        	
-                    		outWriter.write(s);
-                    		outWriter.write('/');
-                    		outWriter.write(c);
-                    		pos = 0;
-                    		continue;
-                    	}
-                    	
-                		outWriter.write(s);
-                		outWriter.write('/');
-                		outWriter.write(c);
-                		pos = 0;
-                		continue;
-                	}
-                	else
-                	{
-                		// Found </sheetData>
-                    	break;
-                	}
-                }
-            }
-            else
-            {
-                if(pos>0) outWriter.write(s,0,pos);
-                if(c==s.charAt(0))
-                {
-                    pos=1;
-                }
-                else
-                {
-                    outWriter.write(c);
-                    pos=0;
-                }
-            }
-        }
-        outWriter.flush();
-        if (needsStartTag)
-        {
-        	outWriter.write("<sheetData>\n");
-        	outWriter.flush();
-        }
-//Copy the worksheet data to "out".
-        copyStream(worksheetData,out);
-        outWriter.write("</sheetData>");
-        outWriter.flush();
-//Copy the rest of "in" to "out".
-        while(((c=inReader.read())!=-1))
-            outWriter.write(c);
-        outWriter.flush();
-    }
-
-    public XSSFWorkbook getXSSFWorkbook()
-    {
-        return _wb;
-    }
-
-//start of interface implementation
-
-    /**
-     * Convenience method to get the active sheet.  The active sheet is is the sheet
-     * which is currently displayed when the workbook is viewed in Excel.
-     * 'Selected' sheet(s) is a distinct concept.
-     *
-     * @return the index of the active sheet (0-based)
-     */
-    @Override
-    public int getActiveSheetIndex()
-    {
-        return _wb.getActiveSheetIndex();
-    }
-
-    /**
-     * Convenience method to set the active sheet.  The active sheet is is the sheet
-     * which is currently displayed when the workbook is viewed in Excel.
-     * 'Selected' sheet(s) is a distinct concept.
-     *
-     * @param sheetIndex index of the active sheet (0-based)
-     */
-    @Override
-    public void setActiveSheet(int sheetIndex)
-    {
-        _wb.setActiveSheet(sheetIndex);
-    }
-
-    /**
-     * Gets the first tab that is displayed in the list of tabs in excel.
-     *
-     * @return the first tab that to display in the list of tabs (0-based).
-     */
-    @Override
-    public int getFirstVisibleTab()
-    {
-        return _wb.getFirstVisibleTab();
-    }
-
-    /**
-     * Sets the first tab that is displayed in the list of tabs in excel.
-     *
-     * @param sheetIndex the first tab that to display in the list of tabs (0-based)
-     */
-    @Override
-    public void setFirstVisibleTab(int sheetIndex)
-    {
-        _wb.setFirstVisibleTab(sheetIndex);
-    }
-
-    /**
-     * Sets the order of appearance for a given sheet.
-     *
-     * @param sheetname the name of the sheet to reorder
-     * @param pos the position that we want to insert the sheet into (0 based)
-     */
-    @Override
-    public void setSheetOrder(String sheetname, int pos)
-    {
-        _wb.setSheetOrder(sheetname,pos);
-    }
-
-    /**
-     * Sets the tab whose data is actually seen when the sheet is opened.
-     * This may be different from the "selected sheet" since excel seems to
-     * allow you to show the data of one sheet when another is seen "selected"
-     * in the tabs (at the bottom).
-     *
-     * @see Sheet#setSelected(boolean)
-     * @param index the index of the sheet to select (0 based)
-     */
-    @Override
-    public void setSelectedTab(int index)
-    {
-        _wb.setSelectedTab(index);
-    }
-
-    /**
-     * Set the sheet name.
-     *
-     * @param sheet number (0 based)
-     * @throws IllegalArgumentException if the name is greater than 31 chars or contains <code>/\?*[]</code>
-     */
-    @Override
-    public void setSheetName(int sheet, String name)
-    {
-        _wb.setSheetName(sheet,name);
-    }
-
-    /**
-     * Set the sheet name
-     *
-     * @param sheet sheet number (0 based)
-     * @return Sheet name
-     */
-    @Override
-    public String getSheetName(int sheet)
-    {
-        return _wb.getSheetName(sheet);
-    }
-
-    /**
-     * Returns the index of the sheet by his name
-     *
-     * @param name the sheet name
-     * @return index of the sheet (0 based)
-     */
-    @Override
-    public int getSheetIndex(String name)
-    {
-        return _wb.getSheetIndex(name);
-    }
-
-    /**
-     * Returns the index of the given sheet
-     *
-     * @param sheet the sheet to look up
-     * @return index of the sheet (0 based)
-     */
-    @Override
-    public int getSheetIndex(Sheet sheet)
-    {
-        return _wb.getSheetIndex(getXSSFSheet((SXSSFSheet)sheet));
-    }
-
-    /**
-     * Sreate an Sheet for this Workbook, adds it to the sheets and returns
-     * the high level representation.  Use this to create new sheets.
-     *
-     * @return Sheet representing the new sheet.
-     */
-    @Override
-    public SXSSFSheet createSheet()
-    {
-        return createAndRegisterSXSSFSheet(_wb.createSheet());
-    }
-
-    SXSSFSheet createAndRegisterSXSSFSheet(XSSFSheet xSheet)
-    {
-        final SXSSFSheet sxSheet;
-        try
-        {
-            sxSheet=new SXSSFSheet(this,xSheet);
-        }
-        catch (IOException ioe)
-        {
-            throw new RuntimeException(ioe);
-        }
-        registerSheetMapping(sxSheet,xSheet);
-        return sxSheet;
-    }
-
-    /**
-     * Create an Sheet for this Workbook, adds it to the sheets and returns
-     * the high level representation.  Use this to create new sheets.
-     *
-     * @param sheetname  sheetname to set for the sheet.
-     * @return Sheet representing the new sheet.
-     * @throws IllegalArgumentException if the name is greater than 31 chars or contains <code>/\?*[]</code>
-     */
-    @Override
-    public SXSSFSheet createSheet(String sheetname)
-    {
-        return createAndRegisterSXSSFSheet(_wb.createSheet(sheetname));
-    }
-
-    /**
-     * <i>Not implemented for SXSSFWorkbook</i>
-     *
-     * Create an Sheet from an existing sheet in the Workbook.
-     *
-     * @return Sheet representing the cloned sheet.
-     */
-    @Override
-    @NotImplemented
-    public Sheet cloneSheet(int sheetNum)
-    {
-        throw new RuntimeException("NotImplemented");
-    }
-
-
-    /**
-     * Get the number of spreadsheets in the workbook
-     *
-     * @return the number of sheets
-     */
-    @Override
-    public int getNumberOfSheets()
-    {
-        return _wb.getNumberOfSheets();
-    }
-    
-    /**
-     *  Returns an iterator of the sheets in the workbook
-     *  in sheet order. Includes hidden and very hidden sheets.
-     *
-     * @return an iterator of the sheets.
-     */
-    @Override
-    public Iterator<Sheet> sheetIterator() {
-        return new SheetIterator<Sheet>();
-    }
-    
-    private final class SheetIterator<T extends Sheet> implements Iterator<T> {
-        final private Iterator<XSSFSheet> it;
-        @SuppressWarnings("unchecked")
-        public SheetIterator() {
-            it = (Iterator<XSSFSheet>)(Iterator<? extends Sheet>) _wb.iterator();
-        }
-        @Override
-        public boolean hasNext() {
-            return it.hasNext();
-        }
-        @Override
-        @SuppressWarnings("unchecked")
-        public T next() throws NoSuchElementException {
-            final XSSFSheet xssfSheet = it.next();
-            return (T) getSXSSFSheet(xssfSheet);
-        }
-        /**
-         * Unexpected behavior may occur if sheets are reordered after iterator
-         * has been created. Support for the remove method may be added in the future
-         * if someone can figure out a reliable implementation.
-         */
-        @Override
-        public void remove() throws IllegalStateException {
-            throw new UnsupportedOperationException("remove method not supported on XSSFWorkbook.iterator(). "+
-                    "Use Sheet.removeSheetAt(int) instead.");
-        }
-    }
-    
-    /**
-     * Alias for {@link #sheetIterator()} to allow
-     * foreach loops
-     */
-    @Override
-    public Iterator<Sheet> iterator() {
-        return sheetIterator();
-    }
-
-    /**
-     * Get the Sheet object at the given index.
-     *
-     * @param index of the sheet number (0-based physical and logical)
-     * @return Sheet at the provided index
-     */
-    @Override
-    public SXSSFSheet getSheetAt(int index)
-    {
-        return getSXSSFSheet(_wb.getSheetAt(index));
-    }
-
-    /**
-     * Get sheet with the given name
-     *
-     * @param name of the sheet
-     * @return Sheet with the name provided or <code>null</code> if it does not exist
-     */
-    @Override
-    public SXSSFSheet getSheet(String name)
-    {
-        return getSXSSFSheet(_wb.getSheet(name));
-    }
-
-    /**
-     * Removes sheet at the given index
-     *
-     * @param index of the sheet to remove (0-based)
-     */
-    @Override
-    public void removeSheetAt(int index)
-    {
-        // Get the sheet to be removed
-        XSSFSheet xSheet = _wb.getSheetAt(index);
-        SXSSFSheet sxSheet = getSXSSFSheet(xSheet);
-        
-        // De-register it
-        _wb.removeSheetAt(index);
-        deregisterSheetMapping(xSheet);
-        
-        // Clean up temporary resources
-        try {
-            sxSheet.dispose();
-        } catch (IOException e) {
-            logger.log(POILogger.WARN, e);
-        }
-    }
-
-    /**
-     * Create a new Font and add it to the workbook's font table
-     *
-     * @return new font object
-     */
-    @Override
-    public Font createFont()
-    {
-        return _wb.createFont();
-    }
-
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     *
-     * @return the font with the matched attributes or <code>null</code>
-     * @deprecated POI 3.15 beta 2. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead.
-     */
-    @Override
-    public Font findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline)
-    {
-        return _wb.findFont(boldWeight, color, fontHeight, name, italic, strikeout, typeOffset, underline);
-    }
-    
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     *
-     * @return the font with the matched attributes or <code>null</code>
-     */
-    @Override
-    public Font findFont(boolean bold, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline)
-    {
-        return _wb.findFont(bold, color, fontHeight, name, italic, strikeout, typeOffset, underline);
-    }
-   
-
-    /**
-     * Get the number of fonts in the font table
-     *
-     * @return number of fonts
-     */
-    @Override
-    public short getNumberOfFonts()
-    {
-        return _wb.getNumberOfFonts();
-    }
-
-    /**
-     * Get the font at the given index number
-     *
-     * @param idx  index number (0-based)
-     * @return font at the index
-     */
-    @Override
-    public Font getFontAt(short idx)
-    {
-        return _wb.getFontAt(idx);
-    }
-
-    /**
-     * Create a new Cell style and add it to the workbook's style table
-     *
-     * @return the new Cell Style object
-     */
-    @Override
-    public CellStyle createCellStyle()
-    {
-        return _wb.createCellStyle();
-    }
-
-    /**
-     * Get the number of styles the workbook contains
-     *
-     * @return count of cell styles
-     */
-    @Override
-    public int getNumCellStyles()
-    {
-        return _wb.getNumCellStyles();
-    }
-
-    /**
-     * Get the cell style object at the given index
-     *
-     * @param idx  index within the set of styles (0-based)
-     * @return CellStyle object at the index
-     */
-    @Override
-    public CellStyle getCellStyleAt(int idx)
-    {
-        return _wb.getCellStyleAt(idx);
-    }
-
-    /**
-     * Closes the underlying {@link XSSFWorkbook} and {@link OPCPackage} 
-     *  on which this Workbook is based, if any.
-     *
-     * <p>Once this has been called, no further
-     *  operations, updates or reads should be performed on the
-     *  Workbook.
-     */
-    @Override
-    public void close() throws IOException {
-        // ensure that any lingering writer is closed
-        for (SXSSFSheet sheet : _xFromSxHash.values())
-        {
-            try {
-                sheet.getSheetDataWriter().close();
-            } catch (IOException e) {
-                logger.log(POILogger.WARN,
-                        "An exception occurred while closing sheet data writer for sheet "
-                        + sheet.getSheetName() + ".", e);
-            }
-        }
-
-        
-        // Tell the base workbook to close, does nothing if 
-        //  it's a newly created one
-        _wb.close();
-    }
-    
-    /**
-     * Write out this workbook to an Outputstream.
-     *
-     * @param stream - the java OutputStream you wish to write to
-     * @exception IOException if anything can't be written.
-     */
-    @Override
-    public void write(OutputStream stream) throws IOException
-    {
-        flushSheets();
-
-        //Save the template
-        File tmplFile = TempFile.createTempFile("poi-sxssf-template", ".xlsx");
-        try
-        {
-            FileOutputStream os = new FileOutputStream(tmplFile);
-            try
-            {
-                _wb.write(os);
-            }
-            finally
-            {
-                os.close();
-            }
-
-            //Substitute the template entries with the generated sheet data files
-            final ZipEntrySource source = new ZipFileZipEntrySource(new ZipFile(tmplFile));
-            injectData(source, stream);
-        }
-        finally
-        {
-            if(!tmplFile.delete()) {
-                throw new IOException("Could not delete temporary file after processing: " + tmplFile);
-            }
-        }
-    }
-    
-    protected void flushSheets() throws IOException {
-        for (SXSSFSheet sheet : _xFromSxHash.values())
-        {
-            sheet.flushRows();
-        }
-    }
-    
-    /**
-     * Dispose of temporary files backing this workbook on disk.
-     * Calling this method will render the workbook unusable.
-     * @return true if all temporary files were deleted successfully.
-     */
-    public boolean dispose()
-    {
-        boolean success = true;
-        for (SXSSFSheet sheet : _sxFromXHash.keySet())
-        {
-            try {
-                success = sheet.dispose() && success;
-            } catch (IOException e) {
-                logger.log(POILogger.WARN, e);
-                success = false;
-            }
-        }
-        return success;
-    }
-
-    /**
-     * @return the total number of defined names in this workbook
-     */
-    @Override
-    public int getNumberOfNames()
-    {
-        return _wb.getNumberOfNames();
-    }
-
-    /**
-     * @param name the name of the defined name
-     * @return the defined name with the specified name. <code>null</code> if not found.
-     */
-    @Override
-    public Name getName(String name)
-    {
-        return _wb.getName(name);
-    }
-
-    /**
-     * Returns all defined names with the given name.
-     *
-     * @param name the name of the defined name
-     * @return a list of the defined names with the specified name. An empty list is returned if none is found.
-     */
-    @Override
-    public List<? extends Name> getNames(String name) {
-        return _wb.getNames(name);
-    }
-
-    /**
-     * Returns all defined names
-     *
-     * @return all defined names
-     */
-    @Override
-    public List<? extends Name> getAllNames()
-    {
-        return _wb.getAllNames();
-    }
-
-    /**
-     * @param nameIndex position of the named range (0-based)
-     * @return the defined name at the specified index
-     * @throws IllegalArgumentException if the supplied index is invalid
-     * @deprecated 3.16. New projects should avoid accessing named ranges by index.
-     */
-    @Override
-    @Deprecated
-    public Name getNameAt(int nameIndex)
-    {
-        return _wb.getNameAt(nameIndex);
-    }
-
-    /**
-     * Creates a new (uninitialised) defined name in this workbook
-     *
-     * @return new defined name object
-     */
-    @Override
-    public Name createName()
-    {
-        return _wb.createName();
-    }
-
-    /**
-     * Gets the defined name index by name
-     * 
-     * <i>Note:</i> Excel defined names are case-insensitive and
-     * this method performs a case-insensitive search.
-     *
-     * @param name the name of the defined name
-     * @return zero based index of the defined name. <code>-1</code> if not found.
-     *
-     * @deprecated 3.16. New projects should avoid accessing named ranges by index.
-     * Use {@link #getName(String)} instead.
-     */
-    @Override
-    @Deprecated
-    public int getNameIndex(String name)
-    {
-        return _wb.getNameIndex(name);
-    }
-
-    /**
-     * Remove the defined name at the specified index
-     *
-     * @param index named range index (0 based)
-     *
-     * @deprecated 3.16. New projects should use {@link #removeName(Name)}.
-     */
-    @Override
-    @Deprecated
-    public void removeName(int index)
-    {
-        _wb.removeName(index);
-    }
-
-    /**
-     * Remove a defined name by name
-     *
-     * @param name the name of the defined name
-     *
-     * @deprecated 3.16. New projects should use {@link #removeName(Name)}.
-     */
-    @Override
-    @Deprecated
-    public void removeName(String name)
-    {
-        _wb.removeName(name);
-    }
-
-    /**
-     * Remove the given defined name
-     *
-     * @param name the name to remove
-     */
-    @Override
-    public void removeName(Name name)
-    {
-        _wb.removeName(name);
-    }
-
-     /**
-     * Sets the printarea for the sheet provided
-     * <p>
-     * i.e. Reference = $A$1:$B$2
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @param reference Valid name Reference for the Print Area
-     */
-    @Override
-    public void setPrintArea(int sheetIndex, String reference)
-    {
-        _wb.setPrintArea(sheetIndex,reference);
-    }
-
-    /**
-     * For the Convenience of Java Programmers maintaining pointers.
-     * @see #setPrintArea(int, String)
-     * @param sheetIndex Zero-based sheet index (0 = First Sheet)
-     * @param startColumn Column to begin printarea
-     * @param endColumn Column to end the printarea
-     * @param startRow Row to begin the printarea
-     * @param endRow Row to end the printarea
-     */
-    @Override
-    public void setPrintArea(int sheetIndex, int startColumn, int endColumn, int startRow, int endRow)
-    {
-        _wb.setPrintArea(sheetIndex, startColumn, endColumn, startRow, endRow);
-    }
-
-    /**
-     * Retrieves the reference for the printarea of the specified sheet,
-     * the sheet name is appended to the reference even if it was not specified.
-     *
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @return String Null if no print area has been defined
-     */
-    @Override
-    public String getPrintArea(int sheetIndex)
-    {
-        return _wb.getPrintArea(sheetIndex);
-    }
-
-    /**
-     * Delete the printarea for the sheet specified
-     *
-     * @param sheetIndex Zero-based sheet index (0 = First Sheet)
-     */
-    @Override
-    public void removePrintArea(int sheetIndex)
-    {
-        _wb.removePrintArea(sheetIndex);
-    }
-
-    /**
-     * Retrieves the current policy on what to do when
-     *  getting missing or blank cells from a row.
-     * <p>
-     * The default is to return blank and null cells.
-     *  {@link MissingCellPolicy}
-     * </p>
-     */
-    @Override
-    public MissingCellPolicy getMissingCellPolicy()
-    {
-        return _wb.getMissingCellPolicy();
-    }
-
-    /**
-     * Sets the policy on what to do when
-     *  getting missing or blank cells from a row.
-     *
-     * This will then apply to all calls to
-     *  {@link org.apache.poi.ss.usermodel.Row#getCell(int)}. See
-     *  {@link MissingCellPolicy}
-     */
-    @Override
-    public void setMissingCellPolicy(MissingCellPolicy missingCellPolicy)
-    {
-        _wb.setMissingCellPolicy(missingCellPolicy);
-    }
-
-    /**
-     * Returns the instance of DataFormat for this workbook.
-     *
-     * @return the DataFormat object
-     */
-    @Override
-    public DataFormat createDataFormat()
-    {
-        return _wb.createDataFormat();
-    }
-
-    /**
-     * Adds a picture to the workbook.
-     *
-     * @param pictureData       The bytes of the picture
-     * @param format            The format of the picture.
-     *
-     * @return the index to this picture (1 based).
-     * @see #PICTURE_TYPE_EMF
-     * @see #PICTURE_TYPE_WMF
-     * @see #PICTURE_TYPE_PICT
-     * @see #PICTURE_TYPE_JPEG
-     * @see #PICTURE_TYPE_PNG
-     * @see #PICTURE_TYPE_DIB
-     */
-    @Override
-    public int addPicture(byte[] pictureData, int format)
-    {
-        return _wb.addPicture(pictureData,format);
-    }
-
-    /**
-     * Gets all pictures from the Workbook.
-     *
-     * @return the list of pictures (a list of {@link PictureData} objects.)
-     */
-    @Override
-    public List<? extends PictureData> getAllPictures()
-    {
-        return _wb.getAllPictures();
-    }
-
-    /**
-     * Returns an object that handles instantiating concrete
-     *  classes of the various instances one needs for HSSF, XSSF
-     *  and SXSSF.
-     */
-    @Override
-    public CreationHelper getCreationHelper() {
-        return new SXSSFCreationHelper(this);
-    }
-
-    protected boolean isDate1904() {
-        return _wb.isDate1904();
-    }
-    
-    /**
-     * @return <code>false</code> if this workbook is not visible in the GUI
-     */
-    @Override
-    public boolean isHidden()
-    {
-        return _wb.isHidden();
-    }
-
-    /**
-     * @param hiddenFlag pass <code>false</code> to make the workbook visible in the GUI
-     */
-    @Override
-    public void setHidden(boolean hiddenFlag)
-    {
-        _wb.setHidden(hiddenFlag);
-    }
-
-    /**
-     * Check whether a sheet is hidden.
-     * <p>
-     * Note that a sheet could instead be set to be very hidden, which is different
-     *  ({@link #isSheetVeryHidden(int)})
-     * </p>
-     * @param sheetIx Number
-     * @return <code>true</code> if sheet is hidden
-     */
-    @Override
-    public boolean isSheetHidden(int sheetIx)
-    {
-        return _wb.isSheetHidden(sheetIx);
-    }
-
-    /**
-     * Check whether a sheet is very hidden.
-     * <p>
-     * This is different from the normal hidden status
-     *  ({@link #isSheetHidden(int)})
-     * </p>
-     * @param sheetIx sheet index to check
-     * @return <code>true</code> if sheet is very hidden
-     */
-    @Override
-    public boolean isSheetVeryHidden(int sheetIx)
-    {
-        return _wb.isSheetVeryHidden(sheetIx);
-    }
-
-    /**
-     * Hide or unhide a sheet
-     * 
-     * Please note that the sheet currently set as active sheet (sheet 0 in a newly 
-     * created workbook or the one set via setActiveSheet()) cannot be hidden. 
-     *
-     * @param sheetIx the sheet index (0-based)
-     * @param hidden True to mark the sheet as hidden, false otherwise
-     */
-    @Override
-    public void setSheetHidden(int sheetIx, boolean hidden)
-    {
-        _wb.setSheetHidden(sheetIx,hidden);
-    }
-
-    /**
-     * Hide or unhide a sheet.
-     * 
-     * <ul>
-     *  <li>0 - visible. </li>
-     *  <li>1 - hidden. </li>
-     *  <li>2 - very hidden.</li>
-     * </ul>
-     * 
-     * Please note that the sheet currently set as active sheet (sheet 0 in a newly 
-     * created workbook or the one set via setActiveSheet()) cannot be hidden.
-     *  
-     * @param sheetIx the sheet index (0-based)
-     * @param hidden one of the following <code>Workbook</code> constants:
-     *        <code>Workbook.SHEET_STATE_VISIBLE</code>,
-     *        <code>Workbook.SHEET_STATE_HIDDEN</code>, or
-     *        <code>Workbook.SHEET_STATE_VERY_HIDDEN</code>.
-     * @throws IllegalArgumentException if the supplied sheet index or state is invalid
-     */
-    @Override
-    public void setSheetHidden(int sheetIx, int hidden)
-    {
-        _wb.setSheetHidden(sheetIx,hidden);
-    }
-    
-    /**
-     * <i>Not implemented for SXSSFWorkbook</i>
-     *
-     * Adds the LinkTable records required to allow formulas referencing
-     *  the specified external workbook to be added to this one. Allows
-     *  formulas such as "[MyOtherWorkbook]Sheet3!$A$5" to be added to the 
-     *  file, for workbooks not already referenced.
-     *
-     * @param name The name the workbook will be referenced as in formulas
-     * @param workbook The open workbook to fetch the link required information from
-     */
-    @Override
-    @NotImplemented
-    public int linkExternalWorkbook(String name, Workbook workbook) {
-        throw new RuntimeException("NotImplemented");
-    }
-    
-    /**
-     * Register a new toolpack in this workbook.
-     *
-     * @param toopack the toolpack to register
-     */
-    @Override
-    public void addToolPack(UDFFinder toopack)
-    {
-        _wb.addToolPack(toopack);
-    }
-
-    /**
-     * Whether the application shall perform a full recalculation when the workbook is opened.
-     * <p>
-     * Typically you want to force formula recalculation when you modify cell formulas or values
-     * of a workbook previously created by Excel. When set to 0, this flag will tell Excel
-     * that it needs to recalculate all formulas in the workbook the next time the file is opened.
-     * </p>
-     *
-     * @param value true if the application will perform a full recalculation of
-     * workbook values when the workbook is opened
-     * @since 3.8
-     */
-    @Override
-    public void setForceFormulaRecalculation(boolean value){
-        _wb.setForceFormulaRecalculation(value);
-    }
-
-    /**
-     * Whether Excel will be asked to recalculate all formulas when the  workbook is opened.
-     */
-    @Override
-    public boolean getForceFormulaRecalculation(){
-        return _wb.getForceFormulaRecalculation();
-    }
-
-    /**
-     * Returns the spreadsheet version (EXCLE2007) of this workbook
-     * 
-     * @return EXCEL2007 SpreadsheetVersion enum
-     * @since 3.14 beta 2
-     */
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion() {
-        return SpreadsheetVersion.EXCEL2007;
-    }
-
-//end of interface implementation
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
deleted file mode 100644
index 9820ddd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Iterator;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellType;
-
-/**
- * Initially copied from BigGridDemo "SpreadsheetWriter".
- * Unlike the original code which wrote the entire document,
- * this class only writes the "sheetData" document fragment
- * so that it was renamed to "SheetDataWriter"
- */
-public class SheetDataWriter {
-    private static final POILogger logger = POILogFactory.getLogger(SheetDataWriter.class);
-    
-    private final File _fd;
-    private final Writer _out;
-    private int _rownum;
-    private int _numberOfFlushedRows;
-    private int _lowestIndexOfFlushedRows; // meaningful only of _numberOfFlushedRows>0
-    private int _numberOfCellsOfLastFlushedRow; // meaningful only of _numberOfFlushedRows>0
-    private int _numberLastFlushedRow = -1; // meaningful only of _numberOfFlushedRows>0
-
-    /**
-     * Table of strings shared across this workbook.
-     * If two cells contain the same string, then the cell value is the same index into SharedStringsTable
-     */
-    private SharedStringsTable _sharedStringSource;
-
-    public SheetDataWriter() throws IOException {
-        _fd = createTempFile();
-        _out = createWriter(_fd);
-    }
-
-    public SheetDataWriter(SharedStringsTable sharedStringsTable) throws IOException {
-        this();
-        this._sharedStringSource = sharedStringsTable;
-    }
-    /**
-     * Create a temp file to write sheet data. 
-     * By default, temp files are created in the default temporary-file directory
-     * with a prefix "poi-sxssf-sheet" and suffix ".xml".  Subclasses can override 
-     * it and specify a different temp directory or filename or suffix, e.g. <code>.gz</code>
-     * 
-     * @return temp file to write sheet data
-     */
-    public File createTempFile() throws IOException {
-        return TempFile.createTempFile("poi-sxssf-sheet", ".xml");
-    }
-
-    /**
-     * Create a writer for the sheet data.
-     * 
-     * @param  fd the file to write to
-     */
-    public Writer createWriter(File fd) throws IOException {
-        FileOutputStream fos = new FileOutputStream(fd);
-        OutputStream decorated;
-        try {
-            decorated = decorateOutputStream(fos);
-        } catch (final IOException e) {
-            fos.close();
-            throw e;
-        }
-        return new BufferedWriter(
-                new OutputStreamWriter(decorated, "UTF-8"));
-    }
-    
-    /**
-     * Override this to translate (such as encrypt or compress) the file output stream
-     * as it is being written to disk.
-     * The default behavior is to to pass the stream through unmodified.
-     *
-     * @param fos  the stream to decorate
-     * @return a decorated stream
-     * @throws IOException
-     * @see #decorateInputStream(FileInputStream)
-     */
-    protected OutputStream decorateOutputStream(FileOutputStream fos) throws IOException {
-        return fos;
-    }
-
-    /**
-     * flush and close the temp data writer. 
-     * This method <em>must</em> be invoked before calling {@link #getWorksheetXMLInputStream()}
-     */
-    public void close() throws IOException{
-        _out.flush();
-        _out.close();
-    }
-
-    protected File getTempFile(){
-        return _fd;
-    }
-    
-    /**
-     * @return a stream to read temp file with the sheet data
-     */
-    public InputStream getWorksheetXMLInputStream() throws IOException {
-        File fd = getTempFile();
-        FileInputStream fis = new FileInputStream(fd);
-        try {
-            return decorateInputStream(fis);
-        } catch (IOException e) {
-            fis.close();
-            throw e;
-        }
-    }
-    
-    /**
-     * Override this to translate (such as decrypt or expand) the file input stream
-     * as it is being read from disk.
-     * The default behavior is to to pass the stream through unmodified.
-     *
-     * @param fis  the stream to decorate
-     * @return a decorated stream
-     * @throws IOException
-     * @see #decorateOutputStream(FileOutputStream)
-     */
-    protected InputStream decorateInputStream(FileInputStream fis) throws IOException {
-        return fis;
-    }
-
-    public int getNumberOfFlushedRows() {
-        return _numberOfFlushedRows;
-    }
-
-    public int getNumberOfCellsOfLastFlushedRow() {
-        return _numberOfCellsOfLastFlushedRow;
-    }
-
-    public int getLowestIndexOfFlushedRows() {
-        return _lowestIndexOfFlushedRows;
-    }
-
-    public int getLastFlushedRow() {
-        return _numberLastFlushedRow;
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        if (!_fd.delete()) {
-            logger.log(POILogger.ERROR, "Can't delete temporary encryption file: "+_fd);
-        }
-
-        super.finalize();
-    }
-
-    /**
-     * Write a row to the file
-     *
-     * @param rownum 0-based row number
-     * @param row    a row
-     */
-    public void writeRow(int rownum, SXSSFRow row) throws IOException {
-        if (_numberOfFlushedRows == 0)
-            _lowestIndexOfFlushedRows = rownum;
-        _numberLastFlushedRow = Math.max(rownum, _numberLastFlushedRow);
-        _numberOfCellsOfLastFlushedRow = row.getLastCellNum();
-        _numberOfFlushedRows++;
-        beginRow(rownum, row);
-        Iterator<Cell> cells = row.allCellsIterator();
-        int columnIndex = 0;
-        while (cells.hasNext()) {
-            writeCell(columnIndex++, cells.next());
-        }
-        endRow();
-    }
-
-    void beginRow(int rownum, SXSSFRow row) throws IOException {
-        _out.write("<row r=\"" + (rownum + 1) + "\"");
-        if (row.hasCustomHeight())
-            _out.write(" customHeight=\"true\"  ht=\"" + row.getHeightInPoints() + "\"");
-        if (row.getZeroHeight())
-            _out.write(" hidden=\"true\"");
-        if (row.isFormatted()) {
-            _out.write(" s=\"" + row.getRowStyleIndex() + "\"");
-            _out.write(" customFormat=\"1\"");
-        }
-        if (row.getOutlineLevel() != 0) {
-            _out.write(" outlineLevel=\"" + row.getOutlineLevel() + "\"");
-        }
-        if(row.getHidden() != null) {
-            _out.write(" hidden=\"" + (row.getHidden() ? "1" : "0") + "\"");
-        }
-        if(row.getCollapsed() != null) {
-            _out.write(" collapsed=\"" + (row.getCollapsed() ? "1" : "0") + "\"");
-        }
-        
-        _out.write(">\n");
-        this._rownum = rownum;
-    }
-
-    void endRow() throws IOException {
-        _out.write("</row>\n");
-    }
-
-    public void writeCell(int columnIndex, Cell cell) throws IOException {
-        if (cell == null) {
-            return;
-        }
-        String ref = new CellReference(_rownum, columnIndex).formatAsString();
-        _out.write("<c r=\"" + ref + "\"");
-        CellStyle cellStyle = cell.getCellStyle();
-        if (cellStyle.getIndex() != 0) {
-            // need to convert the short to unsigned short as the indexes can be up to 64k
-            // ideally we would use int for this index, but that would need changes to some more 
-            // APIs
-            _out.write(" s=\"" + (cellStyle.getIndex() & 0xffff) + "\"");
-        }
-        CellType cellType = cell.getCellTypeEnum();
-        switch (cellType) {
-            case BLANK: {
-                _out.write(">");
-                break;
-            }
-            case FORMULA: {
-                _out.write(">");
-                _out.write("<f>");
-                outputQuotedString(cell.getCellFormula());
-                _out.write("</f>");
-                switch (cell.getCachedFormulaResultTypeEnum()) {
-                    case NUMERIC:
-                        double nval = cell.getNumericCellValue();
-                        if (!Double.isNaN(nval)) {
-                            _out.write("<v>" + nval + "</v>");
-                        }
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            }
-            case STRING: {
-                if (_sharedStringSource != null) {
-                    XSSFRichTextString rt = new XSSFRichTextString(cell.getStringCellValue());
-                    int sRef = _sharedStringSource.addEntry(rt.getCTRst());
-
-                    _out.write(" t=\"" + STCellType.S.toString() + "\">");
-                    _out.write("<v>");
-                    _out.write(String.valueOf(sRef));
-                    _out.write("</v>");
-                } else {
-                    _out.write(" t=\"inlineStr\">");
-                    _out.write("<is><t");
-                    if (hasLeadingTrailingSpaces(cell.getStringCellValue())) {
-                        _out.write(" xml:space=\"preserve\"");
-                    }
-                    _out.write(">");
-                    outputQuotedString(cell.getStringCellValue());
-                    _out.write("</t></is>");
-                }
-                break;
-            }
-            case NUMERIC: {
-                _out.write(" t=\"n\">");
-                _out.write("<v>" + cell.getNumericCellValue() + "</v>");
-                break;
-            }
-            case BOOLEAN: {
-                _out.write(" t=\"b\">");
-                _out.write("<v>" + (cell.getBooleanCellValue() ? "1" : "0") + "</v>");
-                break;
-            }
-            case ERROR: {
-                FormulaError error = FormulaError.forInt(cell.getErrorCellValue());
-
-                _out.write(" t=\"e\">");
-                _out.write("<v>" + error.getString() + "</v>");
-                break;
-            }
-            default: {
-                throw new IllegalStateException("Invalid cell type: " + cellType);
-            }
-        }
-        _out.write("</c>");
-    }
-
-
-    /**
-     * @return  whether the string has leading / trailing spaces that
-     *  need to be preserved with the xml:space=\"preserve\" attribute
-     */
-    boolean hasLeadingTrailingSpaces(String str) {
-        if (str != null && str.length() > 0) {
-            char firstChar = str.charAt(0);
-            char lastChar  = str.charAt(str.length() - 1);
-            return Character.isWhitespace(firstChar) || Character.isWhitespace(lastChar) ;
-        }
-        return false;
-    }
-
-    //Taken from jdk1.3/src/javax/swing/text/html/HTMLWriter.java
-     protected void outputQuotedString(String s) throws IOException {
-        if (s == null || s.length() == 0) {
-            return;
-        }
-
-        char[] chars = s.toCharArray();
-        int last = 0;
-        int length = s.length();
-        for (int counter = 0; counter < length; counter++) {
-            char c = chars[counter];
-            switch (c) {
-                case '<':
-                    if (counter > last) {
-                        _out.write(chars, last, counter - last);
-                    }
-                    last = counter + 1;
-                    _out.write("&lt;");
-                    break;
-                case '>':
-                    if (counter > last) {
-                        _out.write(chars, last, counter - last);
-                    }
-                    last = counter + 1;
-                    _out.write("&gt;");
-                    break;
-                case '&':
-                    if (counter > last) {
-                        _out.write(chars, last, counter - last);
-                    }
-                    last = counter + 1;
-                    _out.write("&amp;");
-                    break;
-                case '"':
-                    if (counter > last) {
-                        _out.write(chars, last, counter - last);
-                    }
-                    last = counter + 1;
-                    _out.write("&quot;");
-                    break;
-                // Special characters
-                case '\n':
-                case '\r':
-                    if (counter > last) {
-                        _out.write(chars, last, counter - last);
-                    }
-                    _out.write("&#xa;");
-                    last = counter + 1;
-                    break;
-                case '\t':
-                    if (counter > last) {
-                        _out.write(chars, last, counter - last);
-                    }
-                    _out.write("&#x9;");
-                    last = counter + 1;
-                    break;
-                case 0xa0:
-                    if (counter > last) {
-                        _out.write(chars, last, counter - last);
-                    }
-                    _out.write("&#xa0;");
-                    last = counter + 1;
-                    break;
-                default:
-                    // YK: XmlBeans silently replaces all ISO control characters ( < 32) with question marks.
-                    // the same rule applies to unicode surrogates and "not a character" symbols.
-                    if( c < ' ' || Character.isLowSurrogate(c) || Character.isHighSurrogate(c) ||
-                            ('\uFFFE' <= c && c <= '\uFFFF')) {
-                        if (counter > last) {
-                            _out.write(chars, last, counter - last);
-                        }
-                        _out.write('?');
-                        last = counter + 1;
-                    }
-                    else if (c > 127) {
-                        if (counter > last) {
-                            _out.write(chars, last, counter - last);
-                        }
-                        last = counter + 1;
-                        // If the character is outside of ascii, write the
-                        // numeric value.
-                        _out.write("&#");
-                        _out.write(String.valueOf((int) c));
-                        _out.write(";");
-                    }
-                    break;
-            }
-        }
-        if (last < length) {
-            _out.write(chars, last, length - last);
-        }
-    }
-
-    /**
-     * Deletes the temporary file that backed this sheet on disk.
-     * @return true if the file was deleted, false if it wasn't.
-     */
-    boolean dispose() throws IOException {
-        final boolean ret;
-        try {
-            _out.close();
-        } finally {
-            ret = _fd.delete();
-        }
-        return ret;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
deleted file mode 100644
index 9c5e6ff..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.EvaluationName;
-import org.apache.poi.ss.formula.EvaluationWorkbook;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaParsingWorkbook;
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.SheetIdentifier;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.ptg.Area3DPxg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.NameXPxg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPxg;
-import org.apache.poi.ss.formula.udf.IndexedUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xssf.model.ExternalLinksTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName;
-
-/**
- * Internal POI use only - parent of XSSF and SXSSF evaluation workbooks
- */
-@Internal
-public abstract class BaseXSSFEvaluationWorkbook implements FormulaRenderingWorkbook, EvaluationWorkbook, FormulaParsingWorkbook {
-    protected final XSSFWorkbook _uBook;
-
-    // lazily populated. This should only be accessed through getTableCache
-    // keys are lower-case to make this a quasi-case-insensitive map
-    private Map<String, XSSFTable> _tableCache = null;
-
-
-    protected BaseXSSFEvaluationWorkbook(XSSFWorkbook book) {
-        _uBook = book;
-    }
-
-    /* (non-JavaDoc), inherit JavaDoc from EvaluationWorkbook
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        _tableCache = null;
-    }
-    
-    private int convertFromExternalSheetIndex(int externSheetIndex) {
-        return externSheetIndex;
-    }
-    /**
-     * XSSF doesn't use external sheet indexes, so when asked treat
-     * it just as a local index
-     */
-    @Override
-    public int convertFromExternSheetIndex(int externSheetIndex) {
-        return externSheetIndex;
-    }
-    /**
-     * @return  the external sheet index of the sheet with the given internal
-     * index. Used by some of the more obscure formula and named range things.
-     * Fairly easy on XSSF (we think...) since the internal and external
-     * indices are the same
-     */
-    private int convertToExternalSheetIndex(int sheetIndex) {
-        return sheetIndex;
-    }
-
-    @Override
-    public int getExternalSheetIndex(String sheetName) {
-        int sheetIndex = _uBook.getSheetIndex(sheetName);
-        return convertToExternalSheetIndex(sheetIndex);
-    }
-
-    private int resolveBookIndex(String bookName) {
-        // Strip the [] wrapper, if still present
-        if (bookName.startsWith("[") && bookName.endsWith("]")) {
-            bookName = bookName.substring(1, bookName.length()-2);
-        }
-
-        // Is it already in numeric form?
-        try {
-            return Integer.parseInt(bookName);
-        } catch (NumberFormatException e) {}
-
-        // Look up an External Link Table for this name
-        List<ExternalLinksTable> tables = _uBook.getExternalLinksTable();
-        int index = findExternalLinkIndex(bookName, tables);
-        if (index != -1) return index;
-        
-        // Is it an absolute file reference?
-        if (bookName.startsWith("'file:///") && bookName.endsWith("'")) {
-            String relBookName = bookName.substring(bookName.lastIndexOf('/')+1);
-            relBookName = relBookName.substring(0, relBookName.length()-1); // Trailing '
-            
-            // Try with this name
-            index = findExternalLinkIndex(relBookName, tables);
-            if (index != -1) return index;
-            
-            // If we get here, it's got no associated proper links yet
-            // So, add the missing reference and return
-            // Note - this is really rather nasty...
-            ExternalLinksTable fakeLinkTable = new FakeExternalLinksTable(relBookName);
-            tables.add(fakeLinkTable);
-            return tables.size(); // 1 based results, 0 = current workbook
-        }
-        
-        // Not properly referenced
-        throw new RuntimeException("Book not linked for filename " + bookName);
-    }
-    /* This is case-sensitive. Is that correct? */
-    private int findExternalLinkIndex(String bookName, List<ExternalLinksTable> tables) {
-        int i = 0;
-        for (ExternalLinksTable table : tables) {
-            if (table.getLinkedFileName().equals(bookName)) {
-                return i+1; // 1 based results, 0 = current workbook
-            }
-            i++;
-        }
-        return -1;
-    }
-    private static class FakeExternalLinksTable extends ExternalLinksTable {
-        private final String fileName;
-        private FakeExternalLinksTable(String fileName) {
-            this.fileName = fileName;
-        }
-        @Override
-        public String getLinkedFileName() {
-            return fileName;
-        }
-    }
-
-    /**
-     * Return EvaluationName wrapper around the matching XSSFName (named range)
-     * @param name case-aware but case-insensitive named range in workbook
-     * @param sheetIndex index of sheet if named range scope is limited to one sheet
-     *         if named range scope is global to the workbook, sheetIndex is -1.
-     * @return If name is a named range in the workbook, returns
-     *  EvaluationName corresponding to that named range 
-     *  Returns null if there is no named range with the same name and scope in the workbook
-     */
-    @Override
-    public EvaluationName getName(String name, int sheetIndex) {
-        for (int i = 0; i < _uBook.getNumberOfNames(); i++) {
-            XSSFName nm = _uBook.getNameAt(i);
-            String nameText = nm.getNameName();
-            int nameSheetindex = nm.getSheetIndex();
-            if (name.equalsIgnoreCase(nameText) && 
-                   (nameSheetindex == -1 || nameSheetindex == sheetIndex)) {
-                return new Name(nm, i, this);
-            }
-        }
-        return sheetIndex == -1 ? null : getName(name, -1);
-    }
-
-    @Override
-    public String getSheetName(int sheetIndex) {
-        return _uBook.getSheetName(sheetIndex);
-    }
-    
-    @Override
-    public ExternalName getExternalName(int externSheetIndex, int externNameIndex) {
-        throw new IllegalStateException("HSSF-style external references are not supported for XSSF");
-    }
-
-    @Override
-    public ExternalName getExternalName(String nameName, String sheetName, int externalWorkbookNumber) {
-        if (externalWorkbookNumber > 0) {
-            // External reference - reference is 1 based, link table is 0 based
-            int linkNumber = externalWorkbookNumber - 1;
-            ExternalLinksTable linkTable = _uBook.getExternalLinksTable().get(linkNumber);
-            
-            for (org.apache.poi.ss.usermodel.Name name : linkTable.getDefinedNames()) {
-                if (name.getNameName().equals(nameName)) {
-                    // HSSF returns one sheet higher than normal, and various bits
-                    //  of the code assume that. So, make us match that behaviour!
-                    int nameSheetIndex = name.getSheetIndex() + 1;
-                    
-                    // TODO Return a more specialised form of this, see bug #56752
-                    // Should include the cached values, for in case that book isn't available
-                    // Should support XSSF stuff lookups
-                    return new ExternalName(nameName, -1, nameSheetIndex);
-                }
-            }
-            throw new IllegalArgumentException("Name '"+nameName+"' not found in " +
-                                               "reference to " + linkTable.getLinkedFileName());
-        } else {
-            // Internal reference
-            int nameIdx = _uBook.getNameIndex(nameName);
-            return new ExternalName(nameName, nameIdx, 0);  // TODO Is this right?
-        }
-        
-    }
-
-    /**
-     * Return an external name (named range, function, user-defined function) Pxg
-     */
-    @Override
-    public NameXPxg getNameXPtg(String name, SheetIdentifier sheet) {
-        // First, try to find it as a User Defined Function
-        IndexedUDFFinder udfFinder = (IndexedUDFFinder)getUDFFinder();
-        FreeRefFunction func = udfFinder.findFunction(name);
-        if (func != null) {
-            return new NameXPxg(null, name);
-        }
-        
-        // Otherwise, try it as a named range
-        if (sheet == null) {
-            if (!_uBook.getNames(name).isEmpty()) {
-                return new NameXPxg(null, name);
-            }
-            return null;
-        }
-        if (sheet._sheetIdentifier == null) {
-            // Workbook + Named Range only
-            int bookIndex = resolveBookIndex(sheet._bookName);
-            return new NameXPxg(bookIndex, null, name);
-        }
-
-        // Use the sheetname and process
-        String sheetName = sheet._sheetIdentifier.getName();
-        
-        if (sheet._bookName != null) {
-            int bookIndex = resolveBookIndex(sheet._bookName);
-            return new NameXPxg(bookIndex, sheetName, name);
-        } else {
-            return new NameXPxg(sheetName, name);
-        }
-    }
-    @Override
-    public Ptg get3DReferencePtg(CellReference cell, SheetIdentifier sheet) {
-        if (sheet._bookName != null) {
-            int bookIndex = resolveBookIndex(sheet._bookName);
-            return new Ref3DPxg(bookIndex, sheet, cell);
-        } else {
-            return new Ref3DPxg(sheet, cell);
-        }
-    }
-    @Override
-    public Ptg get3DReferencePtg(AreaReference area, SheetIdentifier sheet) {
-        if (sheet._bookName != null) {
-            int bookIndex = resolveBookIndex(sheet._bookName);
-            return new Area3DPxg(bookIndex, sheet, area);
-        } else {
-            return new Area3DPxg(sheet, area);
-        }
-    }
-
-    @Override
-    public String resolveNameXText(NameXPtg n) {
-        int idx = n.getNameIndex();
-        String name = null;
-        
-        // First, try to find it as a User Defined Function
-        IndexedUDFFinder udfFinder = (IndexedUDFFinder)getUDFFinder();
-        name = udfFinder.getFunctionName(idx);
-        if (name != null) return name;
-        
-        // Otherwise, try it as a named range
-        XSSFName xname = _uBook.getNameAt(idx);
-        if (xname != null) {
-            name = xname.getNameName();
-        }
-        
-        return name;
-    }
-
-    @Override
-    public ExternalSheet getExternalSheet(int externSheetIndex) {
-        throw new IllegalStateException("HSSF-style external references are not supported for XSSF");
-    }
-    @Override
-    public ExternalSheet getExternalSheet(String firstSheetName, String lastSheetName, int externalWorkbookNumber) {
-        String workbookName;
-        if (externalWorkbookNumber > 0) {
-            // External reference - reference is 1 based, link table is 0 based
-            int linkNumber = externalWorkbookNumber - 1;
-            ExternalLinksTable linkTable = _uBook.getExternalLinksTable().get(linkNumber);
-            workbookName = linkTable.getLinkedFileName();
-        } else {
-            // Internal reference
-            workbookName = null;
-        }
-        
-        if (lastSheetName == null || firstSheetName.equals(lastSheetName)) {
-            return new ExternalSheet(workbookName, firstSheetName);
-        } else {
-            return new ExternalSheetRange(workbookName, firstSheetName, lastSheetName);
-        }
-    }
-
-    @NotImplemented
-    public int getExternalSheetIndex(String workbookName, String sheetName) {
-        throw new RuntimeException("not implemented yet");
-    }
-    @Override
-    public int getSheetIndex(String sheetName) {
-        return _uBook.getSheetIndex(sheetName);
-    }
-
-    @Override
-    public String getSheetFirstNameByExternSheet(int externSheetIndex) {
-        int sheetIndex = convertFromExternalSheetIndex(externSheetIndex);
-        return _uBook.getSheetName(sheetIndex);
-    }
-    @Override
-    public String getSheetLastNameByExternSheet(int externSheetIndex) {
-        // XSSF does multi-sheet references differently, so this is the same as the first
-        return getSheetFirstNameByExternSheet(externSheetIndex);
-    }
-
-    @Override
-    public String getNameText(NamePtg namePtg) {
-        return _uBook.getNameAt(namePtg.getIndex()).getNameName();
-    }
-    @Override
-    public EvaluationName getName(NamePtg namePtg) {
-        int ix = namePtg.getIndex();
-        return new Name(_uBook.getNameAt(ix), ix, this);
-    }
-    @Override
-    public XSSFName createName() {
-        return _uBook.createName();
-    }
-
-    private static String caseInsensitive(String s) {
-        return s.toUpperCase(Locale.ROOT);
-    }
-
-    /*
-     * TODO: data tables are stored at the workbook level in XSSF, but are bound to a single sheet.
-     *       The current code structure has them hanging off XSSFSheet, but formulas reference them
-     *       only by name (names are global, and case insensitive).
-     *       This map stores names as lower case for case-insensitive lookups.
-     *
-     * FIXME: Caching tables by name here for fast formula lookup means the map is out of date if
-     *       a table is renamed or added/removed to a sheet after the map is created.
-     *
-     *       Perhaps tables can be managed similar to PivotTable references above?
-     */
-    private Map<String, XSSFTable> getTableCache() {
-        if ( _tableCache != null ) {
-            return _tableCache;
-        }
-        // FIXME: use org.apache.commons.collections.map.CaseInsensitiveMap
-        _tableCache = new HashMap<String, XSSFTable>();
-
-        for (Sheet sheet : _uBook) {
-            for (XSSFTable tbl : ((XSSFSheet)sheet).getTables()) {
-                String lname = caseInsensitive(tbl.getName());
-                _tableCache.put(lname, tbl);
-            }
-        }
-        return _tableCache;
-    }
-
-    /**
-     * Returns the data table with the given name (case insensitive).
-     * Tables are cached for performance (formula evaluation looks them up by name repeatedly).
-     * After the first table lookup, adding or removing a table from the document structure will cause trouble.
-     * This is meant to be used on documents whose structure is essentially static at the point formulas are evaluated.
-     * 
-     * @param name the data table name (case-insensitive)
-     * @return The Data table in the workbook named <tt>name</tt>, or <tt>null</tt> if no table is named <tt>name</tt>.
-     * @since 3.15 beta 2
-     */
-    @Override
-    public XSSFTable getTable(String name) {
-        if (name == null) return null;
-        String lname = caseInsensitive(name);
-        return getTableCache().get(lname);
-    }
-    
-    @Override
-    public UDFFinder getUDFFinder(){
-        return _uBook.getUDFFinder();
-    }
-
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion(){
-        return SpreadsheetVersion.EXCEL2007;
-    }
-
-    private static final class Name implements EvaluationName {
-
-        private final XSSFName _nameRecord;
-        private final int _index;
-        private final FormulaParsingWorkbook _fpBook;
-
-        public Name(XSSFName name, int index, FormulaParsingWorkbook fpBook) {
-            _nameRecord = name;
-            _index = index;
-            _fpBook = fpBook;
-        }
-
-        public Ptg[] getNameDefinition() {
-
-            return FormulaParser.parse(_nameRecord.getRefersToFormula(), _fpBook, FormulaType.NAMEDRANGE, _nameRecord.getSheetIndex());
-        }
-
-        public String getNameText() {
-            return _nameRecord.getNameName();
-        }
-
-        public boolean hasFormula() {
-            // TODO - no idea if this is right
-            CTDefinedName ctn = _nameRecord.getCTName();
-            String strVal = ctn.getStringValue();
-            return !ctn.getFunction() && strVal != null && strVal.length() > 0;
-        }
-
-        public boolean isFunctionName() {
-            return _nameRecord.isFunctionName();
-        }
-
-        public boolean isRange() {
-            return hasFormula(); // TODO - is this right?
-        }
-        public NamePtg createPtg() {
-            return new NamePtg(_index);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
deleted file mode 100644
index 780126c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.formula.BaseFormulaEvaluator;
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.RichTextString;
-
-/**
- * Internal POI use only - parent of XSSF and SXSSF formula evaluators
- */
-public abstract class BaseXSSFFormulaEvaluator extends BaseFormulaEvaluator {
-    protected BaseXSSFFormulaEvaluator(WorkbookEvaluator bookEvaluator) {
-        super(bookEvaluator);
-    }
-    @Override
-    protected RichTextString createRichTextString(String str) {
-        return new XSSFRichTextString(str);
-    }
-
-    public void notifySetFormula(Cell cell) {
-        _bookEvaluator.notifyUpdateCell(new XSSFEvaluationCell((XSSFCell)cell));
-    }
-    public void notifyDeleteCell(Cell cell) {
-        _bookEvaluator.notifyDeleteCell(new XSSFEvaluationCell((XSSFCell)cell));
-    }
-    public void notifyUpdateCell(Cell cell) {
-        _bookEvaluator.notifyUpdateCell(new XSSFEvaluationCell((XSSFCell)cell));
-    }
-
-    /**
-     * Turns a XSSFCell / SXSSFCell into a XSSFEvaluationCell
-     */
-    protected abstract EvaluationCell toEvaluationCell(Cell cell);
-    
-    /**
-     * Returns a CellValue wrapper around the supplied ValueEval instance.
-     */
-    protected CellValue evaluateFormulaCellValue(Cell cell) {
-        EvaluationCell evalCell = toEvaluationCell(cell);
-        ValueEval eval = _bookEvaluator.evaluate(evalCell);
-        if (eval instanceof NumberEval) {
-            NumberEval ne = (NumberEval) eval;
-            return new CellValue(ne.getNumberValue());
-        }
-        if (eval instanceof BoolEval) {
-            BoolEval be = (BoolEval) eval;
-            return CellValue.valueOf(be.getBooleanValue());
-        }
-        if (eval instanceof StringEval) {
-            StringEval ne = (StringEval) eval;
-            return new CellValue(ne.getStringValue());
-        }
-        if (eval instanceof ErrorEval) {
-            return CellValue.getError(((ErrorEval)eval).getErrorCode());
-        }
-        throw new RuntimeException("Unexpected eval class (" + eval.getClass().getName() + ")");
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
deleted file mode 100644
index 5108813..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Specifies type of automatic numbered bullet points that should be applied to a paragraph.
- */
-public enum ListAutoNumber {
-    /**
-     * (a), (b), (c), ...
-     */
-    ALPHA_LC_PARENT_BOTH,
-    /**
-     * (A), (B), (C), ...
-     */
-    ALPHA_UC_PARENT_BOTH,
-    /**
-     * a), b), c), ...
-     */
-    ALPHA_LC_PARENT_R,
-    /**
-     * A), B), C), ...
-     */
-    ALPHA_UC_PARENT_R,
-    /**
-     *  a., b., c., ...
-     */
-    ALPHA_LC_PERIOD,
-    /**
-     * A., B., C., ...
-     */
-    ALPHA_UC_PERIOD,
-    /**
-     * (1), (2), (3), ...
-     */
-    ARABIC_PARENT_BOTH,
-    /**
-     * 1), 2), 3), ...
-     */
-    ARABIC_PARENT_R,
-
-    /**
-     * 1., 2., 3., ...
-     */
-    ARABIC_PERIOD,
-    /**
-     * 1, 2, 3, ...
-     */
-    ARABIC_PLAIN,
-
-    /**
-     * (i), (ii), (iii), ...
-     */
-    ROMAN_LC_PARENT_BOTH,
-    /**
-     * (I), (II), (III), ...
-     */
-    ROMAN_UC_PARENT_BOTH,
-    /**
-     * i), ii), iii), ...
-     */
-    ROMAN_LC_PARENT_R,
-    /**
-     * I), II), III), ...
-     */
-    ROMAN_UC_PARENT_R,
-    /**
-     *  i., ii., iii., ...
-     */
-    ROMAN_LC_PERIOD ,
-    /**
-     * I., II., III., ...
-     */
-    ROMAN_UC_PERIOD,
-    /**
-     * Dbl-byte circle numbers
-     */
-    CIRCLE_NUM_DB_PLAIN,
-    /**
-     * Wingdings black circle numbers
-     */
-    CIRCLE_NUM_WD_BLACK_PLAIN,
-    /**
-     * Wingdings white circle numbers
-     */
-    CIRCLE_NUM_WD_WHITE_PLAIN
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAlign.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAlign.java
deleted file mode 100644
index b93a885..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAlign.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Specified a list of text alignment types
- */
-public enum TextAlign {
-    /**
-     * Align text to the left margin.
-     */
-    LEFT,
-    /**
-     * Align text in the center.
-     */
-    CENTER,
-
-    /**
-     * Align text to the right margin.
-     */
-    RIGHT,
-
-    /**
-     * Align text so that it is justified across the whole line. It
-     * is smart in the sense that it will not justify sentences
-     * which are short
-     */
-    JUSTIFY,
-    JUSTIFY_LOW,
-    DIST,
-    THAI_DIST
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAutofit.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAutofit.java
deleted file mode 100644
index 6e01b13..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAutofit.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Specifies a list of auto-fit types.
- * <p>
- * Autofit specifies that a shape should be auto-fit to fully contain the text described within it.
- * Auto-fitting is when text within a shape is scaled in order to contain all the text inside
- * </p>
- */
-public enum TextAutofit {
-    /**
-     * Specifies that text within the text body should not be auto-fit to the bounding box.
-     * Auto-fitting is when text within a text box is scaled in order to remain inside
-     * the text box.
-     */
-    NONE,
-    /**
-     * Specifies that text within the text body should be normally auto-fit to the bounding box.
-     * Autofitting is when text within a text box is scaled in order to remain inside the text box.
-     *
-     * <p>
-     * <em>Example:</em> Consider the situation where a user is building a diagram and needs
-     * to have the text for each shape that they are using stay within the bounds of the shape.
-     * An easy way this might be done is by using NORMAL autofit
-     * </p>
-     */
-    NORMAL,
-    /**
-     * Specifies that a shape should be auto-fit to fully contain the text described within it.
-     * Auto-fitting is when text within a shape is scaled in order to contain all the text inside.
-     *
-     * <p>
-     * <em>Example:</em> Consider the situation where a user is building a diagram and needs to have
-     * the text for each shape that they are using stay within the bounds of the shape.
-     * An easy way this might be done is by using SHAPE autofit
-     * </p>
-     */
-    SHAPE
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextCap.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextCap.java
deleted file mode 100644
index 9202e92..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextCap.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Text Capitalization that is to be applied to the text run. This is a render-only
- * modification and does not affect the actual characters stored in the text run.
- */
-public enum TextCap {
-    NONE,
-    SMALL,
-    ALL
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextDirection.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextDirection.java
deleted file mode 100644
index f91fcca..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextDirection.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Vertical Text Types
- */
-public enum TextDirection {
-    /**
-     * Horizontal text. This should be default.
-     */
-    HORIZONTAL,
-    /**
-     * Vertical orientation.
-     * (each line is 90 degrees rotated clockwise, so it goes
-     * from top to bottom; each next line is to the left from
-     * the previous one).
-     */
-    VERTICAL,
-    /**
-     * Vertical orientation.
-     * (each line is 270 degrees rotated clockwise, so it goes
-     * from bottom to top; each next line is to the right from
-     * the previous one).
-     */
-    VERTICAL_270,
-    /**
-     * Determines if all of the text is vertical
-     * ("one letter on top of another").
-     */
-    STACKED
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextFontAlign.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
deleted file mode 100644
index 9641798..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Specified a list of text font alignment types
- */
-public enum TextFontAlign {
-	/**
-	 * Automatic alignment
-	 */
-	AUTO,
-    /**
-     * Align text to the top.
-     */
-    TOP,
-    /**
-     * Align text in the center.
-     */
-    CENTER,
-
-    /**
-     * Align text to the baseline.
-     */
-    BASELINE,
-
-    /**
-     * Align text to the bottom.
-     */
-    BOTTOM
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
deleted file mode 100644
index b1fe0c1..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Text Horizontal Overflow
- */
-public enum TextHorizontalOverflow {
-    /**
-     * When a big character does not fit into a line, allow a
-     * horizontal overflow.
-     */
-    OVERFLOW,
-
-    /**
-     * When a big character does not fit into a line, clip it at
-     * the proper horizontal overflow.
-     */
-    CLIP
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
deleted file mode 100644
index 87d3e40..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-/**
- * Text Vertical Overflow
- */
-public enum TextVerticalOverflow {
-    /**
-     * Overflow the text and pay no attention to top and bottom barriers.
-     */
-    OVERFLOW,
-
-    /**
-     * Pay attention to top and bottom barriers. Use an
-     * ellipsis to denote that there is text which is not visible.     
-     */
-    ELLIPSIS,
-
-    /**
-     * Pay attention to top and bottom barriers. Provide no
-     * indication that there is text which is not visible.
-     */
-    CLIP
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
deleted file mode 100644
index a804176..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-/**
- * An anchor is what specifics the position of a shape within a client object
- * or within another containing shape.
- *
- * @author Yegor Kozlov
- */
-public abstract class XSSFAnchor {
-
-    public abstract int getDx1();
-    public abstract void setDx1( int dx1 );
-    public abstract int getDy1();
-    public abstract void setDy1( int dy1 );
-    public abstract int getDy2();
-    public abstract void setDy2( int dy2 );
-    public abstract int getDx2();
-    public abstract void setDx2( int dx2 );
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
deleted file mode 100644
index d363ab3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-import org.apache.poi.ss.usermodel.AutoFilter;
-
-/**
- * Represents autofiltering for the specified worksheet.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFAutoFilter implements AutoFilter {
-    private XSSFSheet _sheet;
-
-    XSSFAutoFilter(XSSFSheet sheet){
-        _sheet = sheet;
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
deleted file mode 100644
index edea8cd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.BorderFormatting;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Color;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-
-/**
- * XSSF high level representation for Border Formatting component
- * of Conditional Formatting settings
- */
-public class XSSFBorderFormatting implements BorderFormatting  {
-    CTBorder _border;
-
-    /*package*/ XSSFBorderFormatting(CTBorder border) {
-        _border = border;
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderBottomEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderBottom() {
-        return getBorderBottomEnum().getCode();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderBottomEnum() {
-        STBorderStyle.Enum ptrn = _border.isSetBottom() ? _border.getBottom().getStyle() : null;
-        return ptrn == null ? BorderStyle.NONE : BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderDiagonalEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderDiagonal() {
-        return getBorderDiagonalEnum().getCode();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderDiagonalEnum() {
-        STBorderStyle.Enum ptrn = _border.isSetDiagonal() ? _border.getDiagonal().getStyle() : null;
-        return ptrn == null ? BorderStyle.NONE : BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderLeftEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderLeft() {
-        return getBorderLeftEnum().getCode();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderLeftEnum() {
-        STBorderStyle.Enum ptrn = _border.isSetLeft() ? _border.getLeft().getStyle() : null;
-        return ptrn == null ? BorderStyle.NONE : BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderRightEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderRight() {
-        return getBorderRightEnum().getCode();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderRightEnum() {
-        STBorderStyle.Enum ptrn = _border.isSetRight() ? _border.getRight().getStyle() : null;
-        return ptrn == null ? BorderStyle.NONE : BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-
-    /**
-     * @deprecated POI 3.15. Use {@link #getBorderTopEnum()}.
-     * This method will return an BorderStyle enum in the future.
-     */
-    @Override
-    public short getBorderTop() {
-        return getBorderTopEnum().getCode();
-    }
-    /**
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderTopEnum() {
-        STBorderStyle.Enum ptrn = _border.isSetTop() ? _border.getTop().getStyle() : null;
-        return ptrn == null ? BorderStyle.NONE : BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-
-    @Override
-    public XSSFColor getBottomBorderColorColor() {
-        if(!_border.isSetBottom()) return null;
-
-        CTBorderPr pr = _border.getBottom();
-        return new XSSFColor(pr.getColor());
-    }
-    @Override
-    public short getBottomBorderColor() {
-        XSSFColor color = getBottomBorderColorColor();
-        if (color == null) return 0;
-        return color.getIndexed();
-    }
-
-    @Override
-    public XSSFColor getDiagonalBorderColorColor() {
-        if(!_border.isSetDiagonal()) return null;
-
-        CTBorderPr pr = _border.getDiagonal();
-        return new XSSFColor(pr.getColor());
-    }
-    @Override
-    public short getDiagonalBorderColor() {
-        XSSFColor color = getDiagonalBorderColorColor();
-        if (color == null) return 0;
-        return color.getIndexed();
-    }
-
-    @Override
-    public XSSFColor getLeftBorderColorColor() {
-        if(!_border.isSetLeft()) return null;
-
-        CTBorderPr pr = _border.getLeft();
-        return new XSSFColor(pr.getColor());
-    }
-    @Override
-    public short getLeftBorderColor() {
-        XSSFColor color = getLeftBorderColorColor();
-        if (color == null) return 0;
-        return color.getIndexed();
-    }
-
-    @Override
-    public XSSFColor getRightBorderColorColor() {
-        if(!_border.isSetRight()) return null;
-
-        CTBorderPr pr = _border.getRight();
-        return new XSSFColor(pr.getColor());
-    }
-    @Override
-    public short getRightBorderColor() {
-        XSSFColor color = getRightBorderColorColor();
-        if (color == null) return 0;
-        return color.getIndexed();
-    }
-
-    @Override
-    public XSSFColor getTopBorderColorColor() {
-        if(!_border.isSetTop()) return null;
-
-        CTBorderPr pr = _border.getTop();
-        return new XSSFColor(pr.getColor());
-    }
-    @Override
-    public short getTopBorderColor() {
-        XSSFColor color = getRightBorderColorColor();
-        if (color == null) return 0;
-        return color.getIndexed();
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)}
-     */
-    @Override
-    public void setBorderBottom(short border) {
-        setBorderBottom(BorderStyle.valueOf(border));
-    }
-    @Override
-    public void setBorderBottom(BorderStyle border) {
-        CTBorderPr pr = _border.isSetBottom() ? _border.getBottom() : _border.addNewBottom();
-        if(border == BorderStyle.NONE) _border.unsetBottom();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Use {@link #setBorderDiagonal(BorderStyle)}
-     */
-    @Override
-    public void setBorderDiagonal(short border) {
-        setBorderDiagonal(BorderStyle.valueOf(border));
-    }
-    @Override
-    public void setBorderDiagonal(BorderStyle border) {
-        CTBorderPr pr = _border.isSetDiagonal() ? _border.getDiagonal() : _border.addNewDiagonal();
-        if(border == BorderStyle.NONE) _border.unsetDiagonal();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)}
-     */
-    @Override
-    public void setBorderLeft(short border) {
-        setBorderLeft(BorderStyle.valueOf(border));
-    }
-    @Override
-    public void setBorderLeft(BorderStyle border) {
-        CTBorderPr pr = _border.isSetLeft() ? _border.getLeft() : _border.addNewLeft();
-        if(border == BorderStyle.NONE) _border.unsetLeft();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)}
-     */
-    @Override
-    public void setBorderRight(short border) {
-        setBorderRight(BorderStyle.valueOf(border));
-    }
-    @Override
-    public void setBorderRight(BorderStyle border) {
-        CTBorderPr pr = _border.isSetRight() ? _border.getRight() : _border.addNewRight();
-        if(border == BorderStyle.NONE) _border.unsetRight();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)}
-     */
-    @Override
-    public void setBorderTop(short border) {
-        setBorderTop(BorderStyle.valueOf(border));
-    }
-    @Override
-    public void setBorderTop(BorderStyle border) {
-        CTBorderPr pr = _border.isSetTop() ? _border.getTop() : _border.addNewTop();
-        if(border == BorderStyle.NONE) _border.unsetTop();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-    }
-
-    @Override
-    public void setBottomBorderColor(Color color) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(color);
-        if (xcolor == null) setBottomBorderColor((CTColor)null);
-        else setBottomBorderColor(xcolor.getCTColor());
-    }
-    @Override
-    public void setBottomBorderColor(short color) {
-        CTColor ctColor = CTColor.Factory.newInstance();
-        ctColor.setIndexed(color);
-        setBottomBorderColor(ctColor);
-    }
-    public void setBottomBorderColor(CTColor color) {
-        CTBorderPr pr = _border.isSetBottom() ? _border.getBottom() : _border.addNewBottom();
-        if (color == null) {
-            pr.unsetColor();
-        } else {
-            pr.setColor(color);
-        }
-    }
-
-    @Override
-    public void setDiagonalBorderColor(Color color) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(color);
-        if (xcolor == null) setDiagonalBorderColor((CTColor)null);
-        else setDiagonalBorderColor(xcolor.getCTColor());
-    }
-    @Override
-    public void setDiagonalBorderColor(short color) {
-        CTColor ctColor = CTColor.Factory.newInstance();
-        ctColor.setIndexed(color);
-        setDiagonalBorderColor(ctColor);
-    }
-    public void setDiagonalBorderColor(CTColor color) {
-        CTBorderPr pr = _border.isSetDiagonal() ? _border.getDiagonal() : _border.addNewDiagonal();
-        if (color == null) {
-            pr.unsetColor();
-        } else {
-            pr.setColor(color);
-        }
-    }
-
-    @Override
-    public void setLeftBorderColor(Color color) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(color);
-        if (xcolor == null) setLeftBorderColor((CTColor)null);
-        else setLeftBorderColor(xcolor.getCTColor());
-    }
-    @Override
-    public void setLeftBorderColor(short color) {
-        CTColor ctColor = CTColor.Factory.newInstance();
-        ctColor.setIndexed(color);
-        setLeftBorderColor(ctColor);
-    }
-    public void setLeftBorderColor(CTColor color) {
-        CTBorderPr pr = _border.isSetLeft() ? _border.getLeft() : _border.addNewLeft();
-        if (color == null) {
-            pr.unsetColor();
-        } else {
-            pr.setColor(color);
-        }
-    }
-
-    @Override
-    public void setRightBorderColor(Color color) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(color);
-        if (xcolor == null) setRightBorderColor((CTColor)null);
-        else setRightBorderColor(xcolor.getCTColor());
-    }
-    @Override
-    public void setRightBorderColor(short color) {
-        CTColor ctColor = CTColor.Factory.newInstance();
-        ctColor.setIndexed(color);
-        setRightBorderColor(ctColor);
-    }
-    public void setRightBorderColor(CTColor color) {
-        CTBorderPr pr = _border.isSetRight() ? _border.getRight() : _border.addNewRight();
-        if (color == null) {
-            pr.unsetColor();
-        } else {
-            pr.setColor(color);
-        }
-    }
-
-    @Override
-    public void setTopBorderColor(Color color) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(color);
-        if (xcolor == null) setTopBorderColor((CTColor)null);
-        else setTopBorderColor(xcolor.getCTColor());
-    }
-    @Override
-    public void setTopBorderColor(short color) {
-        CTColor ctColor = CTColor.Factory.newInstance();
-        ctColor.setIndexed(color);
-        setTopBorderColor(ctColor);
-    }
-    public void setTopBorderColor(CTColor color) {
-        CTBorderPr pr = _border.isSetTop() ? _border.getTop() : _border.addNewTop();
-        if (color == null) {
-            pr.unsetColor();
-        } else {
-            pr.setColor(color);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
deleted file mode 100644
index f1f1ca3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ /dev/null
@@ -1,1300 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.SharedFormula;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellCopyPolicy;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.model.StylesTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellFormula;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellFormulaType;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellType;
-
-/**
- * High level representation of a cell in a row of a spreadsheet.
- * <p>
- * Cells can be numeric, formula-based or string-based (text).  The cell type
- * specifies this.  String cells cannot contain numbers and numeric cells cannot
- * contain strings (at least according to our model).  Client apps should do the
- * conversions themselves.  Formula cells have the formula string, as well as
- * the formula result, which can be numeric or string.
- * </p>
- * <p>
- * Cells should have their number (0 based) before being added to a row.  Only
- * cells that have values should be added.
- * </p>
- */
-public final class XSSFCell implements Cell {
-
-    private static final String FALSE_AS_STRING = "0";
-    private static final String TRUE_AS_STRING  = "1";
-    private static final String FALSE = "FALSE";
-    private static final String TRUE = "TRUE";
-
-    /**
-     * the xml bean containing information about the cell's location, value,
-     * data type, formatting, and formula
-     */
-    private CTCell _cell;
-
-    /**
-     * the XSSFRow this cell belongs to
-     */
-    private final XSSFRow _row;
-
-    /**
-     * 0-based column index
-     */
-    private int _cellNum;
-
-    /**
-     * Table of strings shared across this workbook.
-     * If two cells contain the same string, then the cell value is the same index into SharedStringsTable
-     */
-    private SharedStringsTable _sharedStringSource;
-
-    /**
-     * Table of cell styles shared across all cells in a workbook.
-     */
-    private StylesTable _stylesSource;
-
-    /**
-     * Construct a XSSFCell.
-     *
-     * @param row the parent row.
-     * @param cell the xml bean containing information about the cell.
-     */
-    protected XSSFCell(XSSFRow row, CTCell cell) {
-        _cell = cell;
-        _row = row;
-        if (cell.getR() != null) {
-            _cellNum = new CellReference(cell.getR()).getCol();
-        } else {
-            int prevNum = row.getLastCellNum();
-            if(prevNum != -1){
-                _cellNum = row.getCell(prevNum-1, MissingCellPolicy.RETURN_NULL_AND_BLANK).getColumnIndex() + 1;
-            }
-        }
-        _sharedStringSource = row.getSheet().getWorkbook().getSharedStringSource();
-        _stylesSource = row.getSheet().getWorkbook().getStylesSource();
-    }
-    
-    /**
-     * Copy cell value, formula and style, from srcCell per cell copy policy
-     * If srcCell is null, clears the cell value and cell style per cell copy policy
-     * 
-     * This does not shift references in formulas. Use {@link org.apache.poi.xssf.usermodel.helpers.XSSFRowShifter} to shift references in formulas.
-     * 
-     * @param srcCell The cell to take value, formula and style from
-     * @param policy The policy for copying the information, see {@link CellCopyPolicy}
-     * @throws IllegalArgumentException if copy cell style and srcCell is from a different workbook
-     */
-    @Beta
-    @Internal
-    public void copyCellFrom(Cell srcCell, CellCopyPolicy policy) {
-        // Copy cell value (cell type is updated implicitly)
-        if (policy.isCopyCellValue()) {
-            if (srcCell != null) {
-                CellType copyCellType = srcCell.getCellTypeEnum();
-                if (copyCellType == CellType.FORMULA && !policy.isCopyCellFormula()) {
-                    // Copy formula result as value
-                    // FIXME: Cached value may be stale
-                    copyCellType = srcCell.getCachedFormulaResultTypeEnum();
-                }
-                switch (copyCellType) {
-                    case NUMERIC:
-                        // DataFormat is not copied unless policy.isCopyCellStyle is true
-                        if (DateUtil.isCellDateFormatted(srcCell)) {
-                            setCellValue(srcCell.getDateCellValue());
-                        }
-                        else {
-                            setCellValue(srcCell.getNumericCellValue());
-                        }
-                        break;
-                    case STRING:
-                        setCellValue(srcCell.getStringCellValue());
-                        break;
-                    case FORMULA:
-                        setCellFormula(srcCell.getCellFormula());
-                        break;
-                    case BLANK:
-                        setBlank();
-                        break;
-                    case BOOLEAN:
-                        setCellValue(srcCell.getBooleanCellValue());
-                        break;
-                    case ERROR:
-                        setCellErrorValue(srcCell.getErrorCellValue());
-                        break;
-
-                    default:
-                        throw new IllegalArgumentException("Invalid cell type " + srcCell.getCellTypeEnum());
-                }
-            } else { //srcCell is null
-                setBlank();
-            }
-        }
-        
-        // Copy CellStyle
-        if (policy.isCopyCellStyle()) {
-            if (srcCell != null) {
-                setCellStyle(srcCell.getCellStyle());
-            }
-            else {
-                // clear cell style
-                setCellStyle(null);
-            }
-        }
-        
-        if (policy.isMergeHyperlink()) {
-            // if srcCell doesn't have a hyperlink and destCell has a hyperlink, don't clear destCell's hyperlink
-            final Hyperlink srcHyperlink = srcCell.getHyperlink();
-            if (srcHyperlink != null) {
-                setHyperlink(new XSSFHyperlink(srcHyperlink));
-            }
-        }
-        else if (policy.isCopyHyperlink()) {
-            // overwrite the hyperlink at dest cell with srcCell's hyperlink
-            // if srcCell doesn't have a hyperlink, clear the hyperlink (if one exists) at destCell
-            final Hyperlink srcHyperlink = srcCell.getHyperlink();
-            if (srcHyperlink == null) {
-                setHyperlink(null);
-            }
-            else {
-                setHyperlink(new XSSFHyperlink(srcHyperlink));
-            }
-        }
-    }
-
-    /**
-     * @return table of strings shared across this workbook
-     */
-    protected SharedStringsTable getSharedStringSource() {
-        return _sharedStringSource;
-    }
-
-    /**
-     * @return table of cell styles shared across this workbook
-     */
-    protected StylesTable getStylesSource() {
-        return _stylesSource;
-    }
-
-    /**
-     * Returns the sheet this cell belongs to
-     *
-     * @return the sheet this cell belongs to
-     */
-    @Override
-    public XSSFSheet getSheet() {
-        return getRow().getSheet();
-    }
-
-    /**
-     * Returns the row this cell belongs to
-     *
-     * @return the row this cell belongs to
-     */
-    @Override
-    public XSSFRow getRow() {
-        return _row;
-    }
-
-    /**
-     * Get the value of the cell as a boolean.
-     * <p>
-     * For strings, numbers, and errors, we throw an exception. For blank cells we return a false.
-     * </p>
-     * @return the value of the cell as a boolean
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()}
-     *   is not {@link CellType#BOOLEAN}, {@link CellType#BLANK} or {@link CellType#FORMULA}
-     */
-    @Override
-    public boolean getBooleanCellValue() {
-        CellType cellType = getCellTypeEnum();
-        switch(cellType) {
-            case BLANK:
-                return false;
-            case BOOLEAN:
-                return _cell.isSetV() && TRUE_AS_STRING.equals(_cell.getV());
-            case FORMULA:
-                //YK: should throw an exception if requesting boolean value from a non-boolean formula
-                return _cell.isSetV() && TRUE_AS_STRING.equals(_cell.getV());
-            default:
-                throw typeMismatch(CellType.BOOLEAN, cellType, false);
-        }
-    }
-
-    /**
-     * Set a boolean value for the cell
-     *
-     * @param value the boolean value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for booleans we'll set its value. For other types we
-     *        will change the cell to a boolean cell and set its value.
-     */
-    @Override
-    public void setCellValue(boolean value) {
-        _cell.setT(STCellType.B);
-        _cell.setV(value ? TRUE_AS_STRING : FALSE_AS_STRING);
-    }
-
-    /**
-     * Get the value of the cell as a number.
-     * <p>
-     * For strings we throw an exception. For blank cells we return a 0.
-     * For formulas or error cells we return the precalculated value;
-     * </p>
-     * @return the value of the cell as a number
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is {@link CellType#STRING}
-     * @exception NumberFormatException if the cell value isn't a parsable <code>double</code>.
-     * @see DataFormatter for turning this number into a string similar to that which Excel would render this number as.
-     */
-    @Override
-    public double getNumericCellValue() {
-        CellType cellType = getCellTypeEnum();
-        switch(cellType) {
-            case BLANK:
-                return 0.0;
-            case FORMULA:
-                // fall-through
-            case NUMERIC:
-                if(_cell.isSetV()) {
-                   String v = _cell.getV();
-                   if (v.isEmpty()) return 0.0;
-                   try {
-                      return Double.parseDouble(v);
-                   } catch(NumberFormatException e) {
-                      throw typeMismatch(CellType.NUMERIC, CellType.STRING, false);
-                   }
-                } else {
-                   return 0.0;
-                }
-            default:
-                throw typeMismatch(CellType.NUMERIC, cellType, false);
-        }
-    }
-
-
-    /**
-     * Set a numeric value for the cell
-     *
-     * @param value  the numeric value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    @Override
-    public void setCellValue(double value) {
-        if(Double.isInfinite(value)) {
-            // Excel does not support positive/negative infinities,
-            // rather, it gives a #DIV/0! error in these cases.
-            _cell.setT(STCellType.E);
-            _cell.setV(FormulaError.DIV0.getString());
-        } else if (Double.isNaN(value)){
-            // Excel does not support Not-a-Number (NaN),
-            // instead it immediately generates an #NUM! error.
-            _cell.setT(STCellType.E);
-            _cell.setV(FormulaError.NUM.getString());
-        } else {
-            _cell.setT(STCellType.N);
-            _cell.setV(String.valueOf(value));
-        }
-    }
-
-    /**
-     * Get the value of the cell as a string
-     * <p>
-     * For numeric cells we throw an exception. For blank cells we return an empty string.
-     * For formulaCells that are not string Formulas, we throw an exception
-     * </p>
-     * @return the value of the cell as a string
-     */
-    @Override
-    public String getStringCellValue() {
-        return getRichStringCellValue().getString();
-    }
-
-    /**
-     * Get the value of the cell as a XSSFRichTextString
-     * <p>
-     * For numeric cells we throw an exception. For blank cells we return an empty string.
-     * For formula cells we return the pre-calculated value if a string, otherwise an exception
-     * </p>
-     * @return the value of the cell as a XSSFRichTextString
-     */
-    @Override
-    public XSSFRichTextString getRichStringCellValue() {
-        CellType cellType = getCellTypeEnum();
-        XSSFRichTextString rt;
-        switch (cellType) {
-            case BLANK:
-                rt = new XSSFRichTextString("");
-                break;
-            case STRING:
-                if (_cell.getT() == STCellType.INLINE_STR) {
-                    if(_cell.isSetIs()) {
-                        //string is expressed directly in the cell definition instead of implementing the shared string table.
-                        rt = new XSSFRichTextString(_cell.getIs());
-                    } else if (_cell.isSetV()) {
-                        //cached result of a formula
-                        rt = new XSSFRichTextString(_cell.getV());
-                    } else {
-                        rt = new XSSFRichTextString("");
-                    }
-                } else if (_cell.getT() == STCellType.STR) {
-                    //cached formula value
-                    rt = new XSSFRichTextString(_cell.isSetV() ? _cell.getV() : "");
-                } else {
-                    if (_cell.isSetV()) {
-                        int idx = Integer.parseInt(_cell.getV());
-                        rt = new XSSFRichTextString(_sharedStringSource.getEntryAt(idx));
-                    }
-                    else {
-                        rt = new XSSFRichTextString("");
-                    }
-                }
-                break;
-            case FORMULA:
-                checkFormulaCachedValueType(CellType.STRING, getBaseCellType(false));
-                rt = new XSSFRichTextString(_cell.isSetV() ? _cell.getV() : "");
-                break;
-            default:
-                throw typeMismatch(CellType.STRING, cellType, false);
-        }
-        rt.setStylesTableReference(_stylesSource);
-        return rt;
-    }
-
-    private static void checkFormulaCachedValueType(CellType expectedTypeCode, CellType cachedValueType) {
-        if (cachedValueType != expectedTypeCode) {
-            throw typeMismatch(expectedTypeCode, cachedValueType, true);
-        }
-    }
-
-    /**
-     * Set a string value for the cell.
-     *
-     * @param str value to set the cell to.  For formulas we'll set the formula
-     * cached string result, for String cells we'll set its value. For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is null then we will change the cell to a Blank cell.
-     */
-    @Override
-    public void setCellValue(String str) {
-        setCellValue(str == null ? null : new XSSFRichTextString(str));
-    }
-
-    /**
-     * Set a string value for the cell.
-     *
-     * @param str  value to set the cell to.  For formulas we'll set the 'pre-evaluated result string,
-     * for String cells we'll set its value.  For other types we will
-     * change the cell to a string cell and set its value.
-     * If value is null then we will change the cell to a Blank cell.
-     */
-    @Override
-    public void setCellValue(RichTextString str) {
-        if(str == null || str.getString() == null){
-            setCellType(CellType.BLANK);
-            return;
-        }
-
-        if(str.length() > SpreadsheetVersion.EXCEL2007.getMaxTextLength()){
-            throw new IllegalArgumentException("The maximum length of cell contents (text) is 32,767 characters");
-        }
-
-        CellType cellType = getCellTypeEnum();
-        switch (cellType){
-            case FORMULA:
-                _cell.setV(str.getString());
-                _cell.setT(STCellType.STR);
-                break;
-            default:
-                if(_cell.getT() == STCellType.INLINE_STR) {
-                    //set the 'pre-evaluated result
-                    _cell.setV(str.getString());
-                } else {
-                    _cell.setT(STCellType.S);
-                    XSSFRichTextString rt = (XSSFRichTextString)str;
-                    rt.setStylesTableReference(_stylesSource);
-                    int sRef = _sharedStringSource.addEntry(rt.getCTRst());
-                    _cell.setV(Integer.toString(sRef));
-                }
-                break;
-        }
-    }
-
-    /**
-     * Return a formula for the cell, for example, <code>SUM(C4:E4)</code>
-     *
-     * @return a formula for the cell
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is not {@link CellType#FORMULA}
-     */
-    @Override
-    public String getCellFormula() {
-        // existing behavior - create a new XSSFEvaluationWorkbook for every call
-        return getCellFormula(null);
-    }
-    
-    /**
-     * package/hierarchy use only - reuse an existing evaluation workbook if available for caching
-     *
-     * @param fpb evaluation workbook for reuse, if available, or null to create a new one as needed
-     * @return a formula for the cell
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is not {@link CellType#FORMULA}
-     */
-    protected String getCellFormula(XSSFEvaluationWorkbook fpb) {
-        CellType cellType = getCellTypeEnum();
-        if(cellType != CellType.FORMULA) throw typeMismatch(CellType.FORMULA, cellType, false);
-
-        CTCellFormula f = _cell.getF();
-        if (isPartOfArrayFormulaGroup() && f == null) {
-            XSSFCell cell = getSheet().getFirstCellInArrayFormula(this);
-            return cell.getCellFormula(fpb);
-        }
-        if (f.getT() == STCellFormulaType.SHARED) {
-            return convertSharedFormula((int)f.getSi(), fpb == null ? XSSFEvaluationWorkbook.create(getSheet().getWorkbook()) : fpb);
-        }
-        return f.getStringValue();
-    }
-
-    /**
-     * Creates a non shared formula from the shared formula counterpart
-     *
-     * @param si Shared Group Index
-     * @return non shared formula created for the given shared formula and this cell
-     */
-    private String convertSharedFormula(int si, XSSFEvaluationWorkbook fpb){
-        XSSFSheet sheet = getSheet();
-
-        CTCellFormula f = sheet.getSharedFormula(si);
-        if(f == null) throw new IllegalStateException(
-                "Master cell of a shared formula with sid="+si+" was not found");
-
-        String sharedFormula = f.getStringValue();
-        //Range of cells which the shared formula applies to
-        String sharedFormulaRange = f.getRef();
-
-        CellRangeAddress ref = CellRangeAddress.valueOf(sharedFormulaRange);
-
-        int sheetIndex = sheet.getWorkbook().getSheetIndex(sheet);
-        SharedFormula sf = new SharedFormula(SpreadsheetVersion.EXCEL2007);
-
-        Ptg[] ptgs = FormulaParser.parse(sharedFormula, fpb, FormulaType.CELL, sheetIndex, getRowIndex());
-        Ptg[] fmla = sf.convertSharedFormulas(ptgs,
-                getRowIndex() - ref.getFirstRow(), getColumnIndex() - ref.getFirstColumn());
-        return FormulaRenderer.toFormulaString(fpb, fmla);
-    }
-
-    /**
-     * Sets formula for this cell.
-     * <p>
-     * Note, this method only sets the formula string and does not calculate the formula value.
-     * To set the precalculated value use {@link #setCellValue(double)} or {@link #setCellValue(String)}
-     * </p>
-     *
-     * @param formula the formula to set, e.g. <code>"SUM(C4:E4)"</code>.
-     *  If the argument is <code>null</code> then the current formula is removed.
-     * @throws org.apache.poi.ss.formula.FormulaParseException if the formula has incorrect syntax or is otherwise invalid
-     * @throws IllegalStateException if the operation is not allowed, for example,
-     *  when the cell is a part of a multi-cell array formula
-     */
-    @Override
-    public void setCellFormula(String formula) {
-        if(isPartOfArrayFormulaGroup()){
-            notifyArrayFormulaChanging();
-        }
-        setFormula(formula, FormulaType.CELL);
-    }
-
-    /* package */ void setCellArrayFormula(String formula, CellRangeAddress range) {
-        setFormula(formula, FormulaType.ARRAY);
-        CTCellFormula cellFormula = _cell.getF();
-        cellFormula.setT(STCellFormulaType.ARRAY);
-        cellFormula.setRef(range.formatAsString());
-    }
-
-    private void setFormula(String formula, FormulaType formulaType) {
-        XSSFWorkbook wb = _row.getSheet().getWorkbook();
-        if (formula == null) {
-            wb.onDeleteFormula(this);
-            if(_cell.isSetF()) _cell.unsetF();
-            return;
-        }
-
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        //validate through the FormulaParser
-        FormulaParser.parse(formula, fpb, formulaType, wb.getSheetIndex(getSheet()), getRowIndex());
-
-        CTCellFormula f = CTCellFormula.Factory.newInstance();
-        f.setStringValue(formula);
-        _cell.setF(f);
-        if(_cell.isSetV()) _cell.unsetV();
-    }
-
-    /**
-     * Returns column index of this cell
-     *
-     * @return zero-based column index of a column in a sheet.
-     */
-    @Override
-    public int getColumnIndex() {
-        return this._cellNum;
-    }
-
-    /**
-     * Returns row index of a row in the sheet that contains this cell
-     *
-     * @return zero-based row index of a row in the sheet that contains this cell
-     */
-    @Override
-    public int getRowIndex() {
-        return _row.getRowNum();
-    }
-
-    /**
-     * Returns an A1 style reference to the location of this cell
-     *
-     * @return A1 style reference to the location of this cell
-     */
-    public String getReference() {
-        String ref = _cell.getR();
-        if(ref == null) {
-            return getAddress().formatAsString();
-        }
-        return ref;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public CellAddress getAddress() {
-        return new CellAddress(this);
-    }
-
-    /**
-     * Return the cell's style.
-     *
-     * @return the cell's style.
-     */
-    @Override
-    public XSSFCellStyle getCellStyle() {
-        XSSFCellStyle style = null;
-        if(_stylesSource.getNumCellStyles() > 0){
-            long idx = _cell.isSetS() ? _cell.getS() : 0;
-            style = _stylesSource.getStyleAt((int)idx);
-        }
-        return style;
-    }
-
-    /**
-     * <p>Set the style for the cell.  The style should be an XSSFCellStyle created/retreived from
-     * the XSSFWorkbook.</p>
-     *
-     * <p>To change the style of a cell without affecting other cells that use the same style,
-     * use {@link org.apache.poi.ss.util.CellUtil#setCellStyleProperties(Cell, java.util.Map)}</p>
-     * 
-     * @param style  reference contained in the workbook.
-     * If the value is null then the style information is removed causing the cell to used the default workbook style.
-     * @throws IllegalArgumentException if style belongs to a different styles source (most likely because style is from a different Workbook)
-     */
-    @Override
-    public void setCellStyle(CellStyle style) {
-        if(style == null) {
-            if(_cell.isSetS()) _cell.unsetS();
-        } else {
-            XSSFCellStyle xStyle = (XSSFCellStyle)style;
-            xStyle.verifyBelongsToStylesSource(_stylesSource);
-
-            long idx = _stylesSource.putStyle(xStyle);
-            _cell.setS(idx);
-        }
-    }
-    
-    private boolean isFormulaCell() {
-        if (_cell.getF() != null || getSheet().isCellInArrayFormulaContext(this)) {
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     * Return the cell type.
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     *
-     * @return the cell type
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCellType() {
-        return getCellTypeEnum().getCode();
-    }
-
-    /**
-     * Return the cell type.
-     *
-     * @return the cell type
-     * @since POI 3.15 beta 3
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Override
-    public CellType getCellTypeEnum() {
-        if (isFormulaCell()) return CellType.FORMULA;
-
-        return getBaseCellType(true);
-    }
-
-    /**
-     * Only valid for formula cells
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     * 
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCachedFormulaResultType() {
-        return getCachedFormulaResultTypeEnum().getCode();
-    }
-    
-    /**
-     * Only valid for formula cells
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @since POI 3.15 beta 3
-     * Will be deleted when we make the CellType enum transition. See bug 59791.
-     */
-    @Override
-    public CellType getCachedFormulaResultTypeEnum() {
-        if (! isFormulaCell()) {
-            throw new IllegalStateException("Only formula cells have cached results");
-        }
-
-        return getBaseCellType(false);
-    }
-
-    /**
-     * Detect cell type based on the "t" attribute of the CTCell bean
-     */
-    private CellType getBaseCellType(boolean blankCells) {
-        switch (_cell.getT().intValue()) {
-            case STCellType.INT_B:
-                return CellType.BOOLEAN;
-            case STCellType.INT_N:
-                if (!_cell.isSetV() && blankCells) {
-                    // ooxml does have a separate cell type of 'blank'.  A blank cell gets encoded as
-                    // (either not present or) a numeric cell with no value set.
-                    // The formula evaluator (and perhaps other clients of this interface) needs to
-                    // distinguish blank values which sometimes get translated into zero and sometimes
-                    // empty string, depending on context
-                    return CellType.BLANK;
-                }
-                return CellType.NUMERIC;
-            case STCellType.INT_E:
-                return CellType.ERROR;
-            case STCellType.INT_S: // String is in shared strings
-            case STCellType.INT_INLINE_STR: // String is inline in cell
-            case STCellType.INT_STR:
-                 return CellType.STRING;
-            default:
-                throw new IllegalStateException("Illegal cell type: " + this._cell.getT());
-        }
-    }
-
-    /**
-     * Get the value of the cell as a date.
-     * <p>
-     * For strings we throw an exception. For blank cells we return a null.
-     * </p>
-     * @return the value of the cell as a date
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} is {@link CellType#STRING}
-     * @exception NumberFormatException if the cell value isn't a parsable <code>double</code>.
-     * @see DataFormatter for formatting  this date into a string similar to how excel does.
-     */
-    @Override
-    public Date getDateCellValue() {
-        if (getCellTypeEnum() == CellType.BLANK) {
-            return null;
-        }
-
-        double value = getNumericCellValue();
-        boolean date1904 = getSheet().getWorkbook().isDate1904();
-        return DateUtil.getJavaDate(value, date1904);
-    }
-
-    /**
-     * Set a date value for the cell. Excel treats dates as numeric so you will need to format the cell as
-     * a date.
-     *
-     * @param value  the date value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For other types we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    @Override
-    public void setCellValue(Date value) {
-        if(value == null) {
-            setCellType(CellType.BLANK);
-            return;
-        }
-
-        boolean date1904 = getSheet().getWorkbook().isDate1904();
-        setCellValue(DateUtil.getExcelDate(value, date1904));
-    }
-
-    /**
-     * Set a date value for the cell. Excel treats dates as numeric so you will need to format the cell as
-     * a date.
-     * <p>
-     * This will set the cell value based on the Calendar's timezone. As Excel
-     * does not support timezones this means that both 20:00+03:00 and
-     * 20:00-03:00 will be reported as the same value (20:00) even that there
-     * are 6 hours difference between the two times. This difference can be
-     * preserved by using <code>setCellValue(value.getTime())</code> which will
-     * automatically shift the times to the default timezone.
-     * </p>
-     *
-     * @param value  the date value to set this cell to.  For formulas we'll set the
-     *        precalculated value, for numerics we'll set its value. For othertypes we
-     *        will change the cell to a numeric cell and set its value.
-     */
-    @Override
-    public void setCellValue(Calendar value) {
-        if(value == null) {
-            setCellType(CellType.BLANK);
-            return;
-        }
-
-        boolean date1904 = getSheet().getWorkbook().isDate1904();
-        setCellValue( DateUtil.getExcelDate(value, date1904 ));
-    }
-
-    /**
-     * Returns the error message, such as #VALUE!
-     *
-     * @return the error message such as #VALUE!
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} isn't {@link CellType#ERROR}
-     * @see FormulaError
-     */
-    public String getErrorCellString() throws IllegalStateException {
-        CellType cellType = getBaseCellType(true);
-        if(cellType != CellType.ERROR) throw typeMismatch(CellType.ERROR, cellType, false);
-
-        return _cell.getV();
-    }
-    /**
-     * Get the value of the cell as an error code.
-     * <p>
-     * For strings, numbers, and booleans, we throw an exception.
-     * For blank cells we return a 0.
-     * </p>
-     *
-     * @return the value of the cell as an error code
-     * @throws IllegalStateException if the cell type returned by {@link #getCellTypeEnum()} isn't {@link CellType #ERROR}
-     * @see FormulaError
-     */
-    @Override
-    public byte getErrorCellValue() throws IllegalStateException {
-        String code = getErrorCellString();
-        if (code == null) {
-            return 0;
-        }
-        try {
-            return FormulaError.forString(code).getCode();
-        } catch (final IllegalArgumentException e) {
-            throw new IllegalStateException("Unexpected error code", e);
-        }
-    }
-
-    /**
-     * Set a error value for the cell
-     *
-     * @param errorCode the error value to set this cell to.  For formulas we'll set the
-     *        precalculated value , for errors we'll set
-     *        its value. For other types we will change the cell to an error
-     *        cell and set its value.
-     * @see FormulaError
-     */
-    @Override
-    public void setCellErrorValue(byte errorCode) {
-        FormulaError error = FormulaError.forInt(errorCode);
-        setCellErrorValue(error);
-    }
-
-    /**
-     * Set a error value for the cell
-     *
-     * @param error the error value to set this cell to.  For formulas we'll set the
-     *        precalculated value , for errors we'll set
-     *        its value. For other types we will change the cell to an error
-     *        cell and set its value.
-     */
-    public void setCellErrorValue(FormulaError error) {
-        _cell.setT(STCellType.E);
-        _cell.setV(error.getString());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setAsActiveCell() {
-        getSheet().setActiveCell(getAddress());
-    }
-
-    /**
-     * Blanks this cell. Blank cells have no formula or value but may have styling.
-     * This method erases all the data previously associated with this cell.
-     */
-    private void setBlank(){
-        CTCell blank = CTCell.Factory.newInstance();
-        blank.setR(_cell.getR());
-        if(_cell.isSetS()) blank.setS(_cell.getS());
-        _cell.set(blank);
-    }
-
-    /**
-     * Sets column index of this cell
-     *
-     * @param num column index of this cell
-     */
-    protected void setCellNum(int num) {
-        checkBounds(num);
-        _cellNum = num;
-        String ref = new CellReference(getRowIndex(), getColumnIndex()).formatAsString();
-        _cell.setR(ref);
-    }
-
-    /**
-     * Set the cells type (numeric, formula or string)
-     *
-     * @throws IllegalArgumentException if the specified cell type is invalid
-     * @see CellType#NUMERIC
-     * @see CellType#STRING
-     * @see CellType#FORMULA
-     * @see CellType#BLANK
-     * @see CellType#BOOLEAN
-     * @see CellType#ERROR
-     * @deprecated POI 3.15 beta 3. Use {@link #setCellType(CellType)} instead.
-     */
-    @Override
-    public void setCellType(int cellType) {
-        setCellType(CellType.forInt(cellType));
-    }
-    /**
-     * Set the cells type (numeric, formula or string)
-     *
-     * @throws IllegalArgumentException if the specified cell type is invalid
-     */
-    @Override
-    public void setCellType(CellType cellType) {
-        CellType prevType = getCellTypeEnum();
-
-        if(isPartOfArrayFormulaGroup()){
-            notifyArrayFormulaChanging();
-        }
-        if(prevType == CellType.FORMULA && cellType != CellType.FORMULA) {
-            getSheet().getWorkbook().onDeleteFormula(this);
-        }
-
-        switch (cellType) {
-            case NUMERIC:
-                _cell.setT(STCellType.N);
-                break;
-            case STRING:
-                if(prevType != CellType.STRING){
-                    String str = convertCellValueToString();
-                    XSSFRichTextString rt = new XSSFRichTextString(str);
-                    rt.setStylesTableReference(_stylesSource);
-                    int sRef = _sharedStringSource.addEntry(rt.getCTRst());
-                    _cell.setV(Integer.toString(sRef));
-                }
-                _cell.setT(STCellType.S);
-                break;
-            case FORMULA:
-                if(!_cell.isSetF()){
-                    CTCellFormula f =  CTCellFormula.Factory.newInstance();
-                    f.setStringValue("0");
-                    _cell.setF(f);
-                    if(_cell.isSetT()) _cell.unsetT();
-                }
-                break;
-            case BLANK:
-                setBlank();
-                break;
-            case BOOLEAN:
-                String newVal = convertCellValueToBoolean() ? TRUE_AS_STRING : FALSE_AS_STRING;
-                _cell.setT(STCellType.B);
-                _cell.setV(newVal);
-                break;
-
-            case ERROR:
-                _cell.setT(STCellType.E);
-                break;
-
-
-            default:
-                throw new IllegalArgumentException("Illegal cell type: " + cellType);
-        }
-        if (cellType != CellType.FORMULA && _cell.isSetF()) {
-            _cell.unsetF();
-        }
-    }
-
-    /**
-     * Returns a string representation of the cell
-     * <p>
-     * Formula cells return the formula string, rather than the formula result.
-     * Dates are displayed in dd-MMM-yyyy format
-     * Errors are displayed as #ERR&lt;errIdx&gt;
-     * </p>
-     */
-    @Override
-    public String toString() {
-        switch (getCellTypeEnum()) {
-            case NUMERIC:
-                if (DateUtil.isCellDateFormatted(this)) {
-                    DateFormat sdf = new SimpleDateFormat("dd-MMM-yyyy", LocaleUtil.getUserLocale());
-                    sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-                    return sdf.format(getDateCellValue());
-                }
-                return Double.toString(getNumericCellValue());
-            case STRING:
-                return getRichStringCellValue().toString();
-            case FORMULA:
-                return getCellFormula();
-            case BLANK:
-                return "";
-            case BOOLEAN:
-                return getBooleanCellValue() ? TRUE : FALSE;
-            case ERROR:
-                return ErrorEval.getText(getErrorCellValue());
-            default:
-                return "Unknown Cell Type: " + getCellTypeEnum();
-        }
-    }
-
-    /**
-     * Returns the raw, underlying ooxml value for the cell
-     * <p>
-     * If the cell contains a string, then this value is an index into
-     * the shared string table, pointing to the actual string value. Otherwise,
-     * the value of the cell is expressed directly in this element. Cells containing formulas express
-     * the last calculated result of the formula in this element.
-     * </p>
-     *
-     * @return the raw cell value as contained in the underlying CTCell bean,
-     *     <code>null</code> for blank cells.
-     */
-    public String getRawValue() {
-        return _cell.getV();
-    }
-
-
-    /**
-     * Used to help format error messages
-     */
-    private static RuntimeException typeMismatch(CellType expectedType, CellType actualType, boolean isFormulaCell) {
-        String msg = "Cannot get a " + expectedType + " value from a " + actualType+ " " + (isFormulaCell ? "formula " : "") + "cell";
-        return new IllegalStateException(msg);
-    }
-
-    /**
-     * @throws RuntimeException if the bounds are exceeded.
-     */
-    private static void checkBounds(int cellIndex) {
-        SpreadsheetVersion v = SpreadsheetVersion.EXCEL2007;
-        int maxcol = SpreadsheetVersion.EXCEL2007.getLastColumnIndex();
-        if (cellIndex < 0 || cellIndex > maxcol) {
-            throw new IllegalArgumentException("Invalid column index (" + cellIndex
-                    + ").  Allowable column range for " + v.name() + " is (0.."
-                    + maxcol + ") or ('A'..'" + v.getLastColumnName() + "')");
-        }
-    }
-
-    /**
-     * Returns cell comment associated with this cell
-     *
-     * @return the cell comment associated with this cell or <code>null</code>
-     */
-    @Override
-    public XSSFComment getCellComment() {
-        return getSheet().getCellComment(new CellAddress(this));
-    }
-
-    /**
-     * Assign a comment to this cell. If the supplied comment is null,
-     * the comment for this cell will be removed.
-     *
-     * @param comment the XSSFComment associated with this cell
-     */
-    @Override
-    public void setCellComment(Comment comment) {
-        if(comment == null) {
-            removeCellComment();
-            return;
-        }
-
-        comment.setAddress(getRowIndex(), getColumnIndex());
-    }
-
-    /**
-     * Removes the comment for this cell, if there is one.
-    */
-    @Override
-    public void removeCellComment() {
-        XSSFComment comment = getCellComment();
-        if(comment != null){
-            CellAddress ref = new CellAddress(getReference());
-            XSSFSheet sh = getSheet();
-            sh.getCommentsTable(false).removeComment(ref);
-            sh.getVMLDrawing(false).removeCommentShape(getRowIndex(), getColumnIndex());
-        }
-    }
-
-    /**
-     * Returns hyperlink associated with this cell
-     *
-     * @return hyperlink associated with this cell or <code>null</code> if not found
-     */
-    @Override
-    public XSSFHyperlink getHyperlink() {
-        return getSheet().getHyperlink(_row.getRowNum(), _cellNum);
-    }
-
-    /**
-     * Assign a hyperlink to this cell. If the supplied hyperlink is null, the
-     * hyperlink for this cell will be removed.
-     *
-     * @param hyperlink the hyperlink to associate with this cell
-     */
-    @Override
-    public void setHyperlink(Hyperlink hyperlink) {
-        if (hyperlink == null) {
-            removeHyperlink();
-            return;
-        }
-
-        XSSFHyperlink link = (XSSFHyperlink)hyperlink;
-
-        // Assign to us
-        link.setCellReference( new CellReference(_row.getRowNum(), _cellNum).formatAsString() );
-
-        // Add to the lists
-        getSheet().addHyperlink(link);
-    }
-
-    /**
-     * Removes the hyperlink for this cell, if there is one.
-     */
-    @Override
-    public void removeHyperlink() {
-        getSheet().removeHyperlink(_row.getRowNum(), _cellNum);
-    }
-
-    /**
-     * Returns the xml bean containing information about the cell's location (reference), value,
-     * data type, formatting, and formula
-     *
-     * @return the xml bean containing information about this cell
-     */
-    @Internal
-    public CTCell getCTCell(){
-        return _cell;
-    }
-    
-    /**
-     * Set a new internal xml bean. This is only for internal use, do not call this from outside!
-     * 
-     * This is necessary in some rare cases to work around XMLBeans specialties.
-     */
-    @Internal
-    public void setCTCell(CTCell cell) {
-        _cell = cell;
-    }
-
-    /**
-     * Chooses a new boolean value for the cell when its type is changing.<p/>
-     *
-     * Usually the caller is calling setCellType() with the intention of calling
-     * setCellValue(boolean) straight afterwards.  This method only exists to give
-     * the cell a somewhat reasonable value until the setCellValue() call (if at all).
-     * TODO - perhaps a method like setCellTypeAndValue(int, Object) should be introduced to avoid this
-     */
-    private boolean convertCellValueToBoolean() {
-        CellType cellType = getCellTypeEnum();
-
-        if (cellType == CellType.FORMULA) {
-            cellType = getBaseCellType(false);
-        }
-
-        switch (cellType) {
-            case BOOLEAN:
-                return TRUE_AS_STRING.equals(_cell.getV());
-            case STRING:
-                int sstIndex = Integer.parseInt(_cell.getV());
-                XSSFRichTextString rt = new XSSFRichTextString(_sharedStringSource.getEntryAt(sstIndex));
-                String text = rt.getString();
-                return Boolean.parseBoolean(text);
-            case NUMERIC:
-                return Double.parseDouble(_cell.getV()) != 0;
-
-            case ERROR:
-                // fall-through
-            case BLANK:
-                return false;
-                
-            default:
-                throw new RuntimeException("Unexpected cell type (" + cellType + ")");
-        }
-    }
-
-    private String convertCellValueToString() {
-        CellType cellType = getCellTypeEnum();
-
-        switch (cellType) {
-            case BLANK:
-                return "";
-            case BOOLEAN:
-                return TRUE_AS_STRING.equals(_cell.getV()) ? TRUE : FALSE;
-            case STRING:
-                int sstIndex = Integer.parseInt(_cell.getV());
-                XSSFRichTextString rt = new XSSFRichTextString(_sharedStringSource.getEntryAt(sstIndex));
-                return rt.getString();
-            case NUMERIC:
-            case ERROR:
-                return _cell.getV();
-            case FORMULA:
-                // should really evaluate, but HSSFCell can't call HSSFFormulaEvaluator
-                // just use cached formula result instead
-                break;
-            default:
-                throw new IllegalStateException("Unexpected cell type (" + cellType + ")");
-        }
-        cellType = getBaseCellType(false);
-        String textValue = _cell.getV();
-        switch (cellType) {
-            case BOOLEAN:
-                if (TRUE_AS_STRING.equals(textValue)) {
-                    return TRUE;
-                }
-                if (FALSE_AS_STRING.equals(textValue)) {
-                    return FALSE;
-                }
-                throw new IllegalStateException("Unexpected boolean cached formula value '"
-                    + textValue + "'.");
-                
-            case STRING:
-                // fall-through
-            case NUMERIC:
-                // fall-through
-            case ERROR:
-                return textValue;
-                
-            default:
-                throw new IllegalStateException("Unexpected formula result type (" + cellType + ")");
-        }
-        
-    }
-
-    @Override
-    public CellRangeAddress getArrayFormulaRange() {
-        XSSFCell cell = getSheet().getFirstCellInArrayFormula(this);
-        if (cell == null) {
-            throw new IllegalStateException("Cell " + getReference()
-                    + " is not part of an array formula.");
-        }
-        String formulaRef = cell._cell.getF().getRef();
-        return CellRangeAddress.valueOf(formulaRef);
-    }
-
-    @Override
-    public boolean isPartOfArrayFormulaGroup() {
-        return getSheet().isCellInArrayFormulaContext(this);
-    }
-
-    /**
-     * The purpose of this method is to validate the cell state prior to modification
-     *
-     * @see #notifyArrayFormulaChanging()
-     */
-    void notifyArrayFormulaChanging(String msg){
-        if(isPartOfArrayFormulaGroup()){
-            CellRangeAddress cra = getArrayFormulaRange();
-            if(cra.getNumberOfCells() > 1) {
-                throw new IllegalStateException(msg);
-            }
-            //un-register the single-cell array formula from the parent XSSFSheet
-            getRow().getSheet().removeArrayFormula(this);
-        }
-    }
-
-    /**
-     * Called when this cell is modified.
-     * <p>
-     * The purpose of this method is to validate the cell state prior to modification.
-     * </p>
-     *
-     * @see #setCellType(int)
-     * @see #setCellFormula(String)
-     * @see XSSFRow#removeCell(org.apache.poi.ss.usermodel.Cell)
-     * @see org.apache.poi.xssf.usermodel.XSSFSheet#removeRow(org.apache.poi.ss.usermodel.Row)
-     * @see org.apache.poi.xssf.usermodel.XSSFSheet#shiftRows(int, int, int)
-     * @see org.apache.poi.xssf.usermodel.XSSFSheet#addMergedRegion(org.apache.poi.ss.util.CellRangeAddress)
-     * @throws IllegalStateException if modification is not allowed
-     */
-    void notifyArrayFormulaChanging(){
-        CellReference ref = new CellReference(this);
-        String msg = "Cell "+ref.formatAsString()+" is part of a multi-cell array formula. " +
-                "You cannot change part of an array.";
-        notifyArrayFormulaChanging(msg);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
deleted file mode 100644
index 6e66f99..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ /dev/null
@@ -1,1522 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.model.ThemesTable;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellAlignment;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder.BorderSide;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellFill;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellAlignment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
-
-/**
- *
- * High level representation of the the possible formatting information for the contents of the cells on a sheet in a
- * SpreadsheetML document.
- *
- * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#createCellStyle()
- * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#getCellStyleAt(int)
- * @see org.apache.poi.xssf.usermodel.XSSFCell#setCellStyle(org.apache.poi.ss.usermodel.CellStyle)
- */
-public class XSSFCellStyle implements CellStyle {
-
-    private int _cellXfId;
-    private final StylesTable _stylesSource;
-    private CTXf _cellXf;
-    private final CTXf _cellStyleXf;
-    private XSSFFont _font;
-    private XSSFCellAlignment _cellAlignment;
-    private ThemesTable _theme;
-
-    /**
-     * Creates a Cell Style from the supplied parts
-     * @param cellXfId The main XF for the cell. Must be a valid 0-based index into the XF table
-     * @param cellStyleXfId Optional, style xf. A value of <code>-1</code> means no xf.
-     * @param stylesSource Styles Source to work off
-     */
-    public XSSFCellStyle(int cellXfId, int cellStyleXfId, StylesTable stylesSource, ThemesTable theme) {
-        _cellXfId = cellXfId;
-        _stylesSource = stylesSource;
-        _cellXf = stylesSource.getCellXfAt(this._cellXfId);
-        _cellStyleXf = cellStyleXfId == -1 ? null : stylesSource.getCellStyleXfAt(cellStyleXfId);
-        _theme = theme;
-    }
-
-    /**
-     * Used so that StylesSource can figure out our location
-     */
-    @Internal
-    public CTXf getCoreXf() {
-        return _cellXf;
-    }
-
-    /**
-     * Used so that StylesSource can figure out our location
-     */
-    @Internal
-    public CTXf getStyleXf() {
-        return _cellStyleXf;
-    }
-
-    /**
-     * Creates an empty Cell Style
-     */
-    public XSSFCellStyle(StylesTable stylesSource) {
-        _stylesSource = stylesSource;
-        // We need a new CTXf for the main styles
-        // TODO decide on a style ctxf
-        _cellXf = CTXf.Factory.newInstance();
-        _cellStyleXf = null;
-    }
-
-    /**
-     * Verifies that this style belongs to the supplied Workbook
-     *  Styles Source.
-     * Will throw an exception if it belongs to a different one.
-     * This is normally called when trying to assign a style to a
-     *  cell, to ensure the cell and the style are from the same
-     *  workbook (if they're not, it won't work)
-     * @throws IllegalArgumentException if there's a workbook mis-match
-     */
-    public void verifyBelongsToStylesSource(StylesTable src) {
-        if(this._stylesSource != src) {
-            throw new IllegalArgumentException("This Style does not belong to the supplied Workbook Stlyes Source. Are you trying to assign a style from one workbook to the cell of a differnt workbook?");
-        }
-    }
-
-    /**
-     * Clones all the style information from another
-     *  XSSFCellStyle, onto this one. This
-     *  XSSFCellStyle will then have all the same
-     *  properties as the source, but the two may
-     *  be edited independently.
-     * Any stylings on this XSSFCellStyle will be lost!
-     *
-     * The source XSSFCellStyle could be from another
-     *  XSSFWorkbook if you like. This allows you to
-     *  copy styles from one XSSFWorkbook to another.
-     */
-    @Override
-    public void cloneStyleFrom(CellStyle source) {
-        if(source instanceof XSSFCellStyle) {
-            XSSFCellStyle src = (XSSFCellStyle)source;
-
-            // Is it on our Workbook?
-            if(src._stylesSource == _stylesSource) {
-               // Nice and easy
-               _cellXf.set(src.getCoreXf());
-               _cellStyleXf.set(src.getStyleXf());
-            } else {
-               // Copy the style
-               try {
-                  // Remove any children off the current style, to
-                  //  avoid orphaned nodes
-                  if(_cellXf.isSetAlignment())
-                     _cellXf.unsetAlignment();
-                  if(_cellXf.isSetExtLst())
-                     _cellXf.unsetExtLst();
-
-                  // Create a new Xf with the same contents
-                  _cellXf = CTXf.Factory.parse(
-                        src.getCoreXf().toString(), DEFAULT_XML_OPTIONS
-                  );
-
-                  // bug 56295: ensure that the fills is available and set correctly
-                  CTFill fill = CTFill.Factory.parse(
-                          src.getCTFill().toString(), DEFAULT_XML_OPTIONS
-                          );
-                  addFill(fill);
-
-                  // bug 58084: set borders correctly
-                  CTBorder border = CTBorder.Factory.parse(
-                          src.getCTBorder().toString(), DEFAULT_XML_OPTIONS
-                          );
-                  addBorder(border);
-
-                  // Swap it over
-                  _stylesSource.replaceCellXfAt(_cellXfId, _cellXf);
-               } catch(XmlException e) {
-                  throw new POIXMLException(e);
-               }
-
-               // Copy the format
-               String fmt = src.getDataFormatString();
-               setDataFormat(
-                     (new XSSFDataFormat(_stylesSource)).getFormat(fmt)
-               );
-
-               // Copy the font
-               try {
-                  CTFont ctFont = CTFont.Factory.parse(
-                        src.getFont().getCTFont().toString(), DEFAULT_XML_OPTIONS
-                  );
-                  XSSFFont font = new XSSFFont(ctFont);
-                  font.registerTo(_stylesSource);
-                  setFont(font);
-               } catch(XmlException e) {
-                  throw new POIXMLException(e);
-               }
-            }
-
-            // Clear out cached details
-            _font = null;
-            _cellAlignment = null;
-        } else {
-            throw new IllegalArgumentException("Can only clone from one XSSFCellStyle to another, not between HSSFCellStyle and XSSFCellStyle");
-        }
-    }
-
-    private void addFill(CTFill fill) {
-        int idx = _stylesSource.putFill(new XSSFCellFill(fill));
-
-        _cellXf.setFillId(idx);
-        _cellXf.setApplyFill(true);
-    }
-    
-    private void addBorder(CTBorder border) {
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(border, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Get the type of horizontal alignment for the cell
-     *
-     * @return short - the type of alignment
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_GENERAL
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_LEFT
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_RIGHT
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_FILL
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_JUSTIFY
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER_SELECTION
-     * @deprecated POI 3.15 beta 3. Use {@link #getAlignmentEnum()} instead.
-     */
-    @Override
-    public short getAlignment() {
-        return getAlignmentEnum().getCode();
-    }
-
-    /**
-     * Get the type of horizontal alignment for the cell
-     *
-     * @return HorizontalAlignment - the type of alignment
-     */
-    @Override
-    public HorizontalAlignment getAlignmentEnum() {
-        CTCellAlignment align = _cellXf.getAlignment();
-        if(align != null && align.isSetHorizontal()) {
-            return HorizontalAlignment.forInt(align.getHorizontal().intValue()-1);
-        }
-        return HorizontalAlignment.GENERAL;
-    }
-
-    /**
-     * Get the type of border to use for the bottom border of the cell
-     * Will be removed when {@link #getBorderBottom()} returns a BorderStyle enum
-     *
-     * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderBottomEnum() {
-        if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
-
-        int idx = (int)_cellXf.getBorderId();
-        CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
-        STBorderStyle.Enum ptrn = ct.isSetBottom() ? ct.getBottom().getStyle() : null;
-        if (ptrn == null) {
-            return BorderStyle.NONE;
-        }
-        return BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-    /**
-     * Get the type of border to use for the bottom border of the cell
-     * This will return a BorderStyle enum in the future.
-     *
-     * @return border type code
-     * @deprecated 3.15 beta 2. Use {@link #getBorderBottomEnum()}
-     */
-    public short getBorderBottom() {
-        return getBorderBottomEnum().getCode();
-    }
-
-    /**
-     * Get the type of border to use for the left border of the cell
-     * Will be removed when {@link #getBorderLeft()} returns a BorderStyle enum
-     *
-     * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderLeftEnum() {
-        if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
-
-        int idx = (int)_cellXf.getBorderId();
-        CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
-        STBorderStyle.Enum ptrn = ct.isSetLeft() ? ct.getLeft().getStyle() : null;
-        if (ptrn == null) {
-            return BorderStyle.NONE;
-        }
-        return BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-
-    /**
-     * Get the type of border to use for the left border of the cell
-     * This will return a BorderStyle enum in the future.
-     *
-     * @return border type code
-     * @deprecated 3.15 beta 2. Use {@link #getBorderLeftEnum()}
-     */
-    public short getBorderLeft() {
-        return getBorderLeftEnum().getCode();
-    }
-
-    /**
-     * Get the type of border to use for the right border of the cell
-     * Will be removed when {@link #getBorderRight()} returns a BorderStyle enum
-     *
-     * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderRightEnum() {
-        if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
-
-        int idx = (int)_cellXf.getBorderId();
-        CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
-        STBorderStyle.Enum ptrn = ct.isSetRight() ? ct.getRight().getStyle() : null;
-        if (ptrn == null) {
-            return BorderStyle.NONE;
-        }
-        return BorderStyle.valueOf((short)(ptrn.intValue() - 1));
-    }
-    /**
-     * Get the type of border to use for the right border of the cell
-     * This will return a BorderStyle enum in the future.
-     *
-     * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @deprecated 3.15 beta 2. Use {@link #getBorderRightEnum()} instead
-     */
-    public short getBorderRight() {
-        return getBorderRightEnum().getCode();
-    }
-
-    /**
-     * Get the type of border to use for the top border of the cell
-     * Will be removed when {@link #getBorderTop()} returns a BorderStyle enum
-     *
-     * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @since POI 3.15
-     */
-    @Override
-    public BorderStyle getBorderTopEnum() {
-        if(!_cellXf.getApplyBorder()) return BorderStyle.NONE;
-
-        int idx = (int)_cellXf.getBorderId();
-        CTBorder ct = _stylesSource.getBorderAt(idx).getCTBorder();
-        STBorderStyle.Enum ptrn = ct.isSetTop() ? ct.getTop().getStyle() : null;
-        if (ptrn == null) {
-            return BorderStyle.NONE;
-        }
-        return BorderStyle.valueOf((short) (ptrn.intValue() - 1));
-    }
-     /**
-     * Get the type of border to use for the top border of the cell
-     * This will return a BorderStyle enum in the future.
-     *
-     * @return border type, default value is {@link org.apache.poi.ss.usermodel.BorderStyle#NONE}
-     * @deprecated 3.15 beta 2. Use {@link #getBorderTopEnum()} instead.
-     */
-    public short getBorderTop() {
-         return getBorderTopEnum().getCode();
-    }
-
-    /**
-     * Get the color to use for the bottom border
-     * <br/>
-     * Color is optional. When missing, IndexedColors.AUTOMATIC is implied.
-     * @return the index of the color definition, default value is {@link org.apache.poi.ss.usermodel.IndexedColors#AUTOMATIC}
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public short getBottomBorderColor() {
-        XSSFColor clr = getBottomBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
-    }
-
-    /**
-     * Get the color to use for the bottom border as a {@link XSSFColor}
-     *
-     * @return the used color or <code>null</code> if not set
-     */
-    public XSSFColor getBottomBorderXSSFColor() {
-        if(!_cellXf.getApplyBorder()) return null;
-
-        int idx = (int)_cellXf.getBorderId();
-        XSSFCellBorder border = _stylesSource.getBorderAt(idx);
-
-        return border.getBorderColor(BorderSide.BOTTOM);
-    }
-
-    /**
-     * Get the index of the number format (numFmt) record used by this cell format.
-     *
-     * @return the index of the number format
-     */
-    @Override
-    public short getDataFormat() {
-        return (short)_cellXf.getNumFmtId();
-    }
-
-    /**
-     * Get the contents of the format string, by looking up
-     * the StylesSource
-     *
-     * @return the number format string
-     */
-    @Override
-    public String getDataFormatString() {
-        int idx = getDataFormat();
-        return new XSSFDataFormat(_stylesSource).getFormat((short)idx);
-    }
-
-    /**
-     * Get the background fill color.
-     * <p>
-     * Note - many cells are actually filled with a foreground
-     *  fill, not a background fill - see {@link #getFillForegroundColor()}
-     * </p>
-     * @return fill color, default value is {@link org.apache.poi.ss.usermodel.IndexedColors#AUTOMATIC}
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public short getFillBackgroundColor() {
-        XSSFColor clr = getFillBackgroundXSSFColor();
-        return clr == null ? IndexedColors.AUTOMATIC.getIndex() : clr.getIndexed();
-    }
-
-    @Override
-    public XSSFColor getFillBackgroundColorColor() {
-       return getFillBackgroundXSSFColor();
-    }
-
-    /**
-     * Get the background fill color.
-     * <p>
-     * Note - many cells are actually filled with a foreground
-     *  fill, not a background fill - see {@link #getFillForegroundColor()}
-     * </p>
-     * @see org.apache.poi.xssf.usermodel.XSSFColor#getRGB()
-     * @return XSSFColor - fill color or <code>null</code> if not set
-     */
-    public XSSFColor getFillBackgroundXSSFColor() {
-        // bug 56295: handle missing applyFill attribute as "true" because Excel does as well
-        if(_cellXf.isSetApplyFill() && !_cellXf.getApplyFill()) return null;
-
-        int fillIndex = (int)_cellXf.getFillId();
-        XSSFCellFill fg = _stylesSource.getFillAt(fillIndex);
-
-        XSSFColor fillBackgroundColor = fg.getFillBackgroundColor();
-        if (fillBackgroundColor != null && _theme != null) {
-            _theme.inheritFromThemeAsRequired(fillBackgroundColor);
-        }
-        return fillBackgroundColor;
-    }
-
-    /**
-     * Get the foreground fill color.
-     * <p>
-     * Many cells are filled with this, instead of a
-     *  background color ({@link #getFillBackgroundColor()})
-     * </p>
-     * @see IndexedColors
-     * @return fill color, default value is {@link org.apache.poi.ss.usermodel.IndexedColors#AUTOMATIC}
-     */
-    @Override
-    public short getFillForegroundColor() {
-        XSSFColor clr = getFillForegroundXSSFColor();
-        return clr == null ? IndexedColors.AUTOMATIC.getIndex() : clr.getIndexed();
-    }
-
-    @Override
-    public XSSFColor getFillForegroundColorColor() {
-       return getFillForegroundXSSFColor();
-    }
-
-    /**
-     * Get the foreground fill color.
-     *
-     * @return XSSFColor - fill color or <code>null</code> if not set
-     */
-    public XSSFColor getFillForegroundXSSFColor() {
-        // bug 56295: handle missing applyFill attribute as "true" because Excel does as well
-        if(_cellXf.isSetApplyFill() && !_cellXf.getApplyFill()) return null;
-
-        int fillIndex = (int)_cellXf.getFillId();
-        XSSFCellFill fg = _stylesSource.getFillAt(fillIndex);
-
-        XSSFColor fillForegroundColor = fg.getFillForegroundColor();
-        if (fillForegroundColor != null && _theme != null) {
-            _theme.inheritFromThemeAsRequired(fillForegroundColor);
-        }
-        return fillForegroundColor;
-    }
-
-    /**
-     * Get the fill pattern
-     * @return fill pattern, default value is {@link org.apache.poi.ss.usermodel.CellStyle#NO_FILL}
-     *
-     * @see org.apache.poi.ss.usermodel.CellStyle#NO_FILL
-     * @see org.apache.poi.ss.usermodel.CellStyle#SOLID_FOREGROUND
-     * @see org.apache.poi.ss.usermodel.CellStyle#FINE_DOTS
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALT_BARS
-     * @see org.apache.poi.ss.usermodel.CellStyle#SPARSE_DOTS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_HORZ_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_VERT_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_BACKWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_FORWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#BIG_SPOTS
-     * @see org.apache.poi.ss.usermodel.CellStyle#BRICKS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_HORZ_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_VERT_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_BACKWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_FORWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#SQUARES
-     * @see org.apache.poi.ss.usermodel.CellStyle#DIAMONDS
-     * @deprecated POI 3.15 beta 3. This method will return {@link FillPatternType} in the future. Use {@link #setFillPattern(FillPatternType)} instead.
-     */
-    @Override
-    public short getFillPattern() {
-        return getFillPatternEnum().getCode();
-    }
-
-    /**
-     * Get the fill pattern
-     *
-     * @return the fill pattern, default value is {@link FillPatternType#NO_FILL}
-     */
-    @Override
-    public FillPatternType getFillPatternEnum() {
-     // bug 56295: handle missing applyFill attribute as "true" because Excel does as well
-        if(_cellXf.isSetApplyFill() && !_cellXf.getApplyFill()) return FillPatternType.NO_FILL;
-
-        int fillIndex = (int)_cellXf.getFillId();
-        XSSFCellFill fill = _stylesSource.getFillAt(fillIndex);
-
-        STPatternType.Enum ptrn = fill.getPatternType();
-        if(ptrn == null) return FillPatternType.NO_FILL;
-        return FillPatternType.forInt(ptrn.intValue() - 1);
-    }
-
-    /**
-    * Gets the font for this style
-    * @return Font - font
-    */
-    public XSSFFont getFont() {
-        if (_font == null) {
-            _font = _stylesSource.getFontAt(getFontId());
-        }
-        return _font;
-    }
-
-    /**
-     * Gets the index of the font for this style
-     *
-     * @return short - font index
-     * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#getFontAt(short)
-     */
-    @Override
-    public short getFontIndex() {
-        return (short) getFontId();
-    }
-
-    /**
-     * Get whether the cell's using this style are to be hidden
-     *
-     * @return boolean -  whether the cell using this style is hidden
-     */
-    @Override
-    public boolean getHidden() {
-        if (!_cellXf.isSetProtection() || !_cellXf.getProtection().isSetHidden()) {
-            return false;
-        }
-        return _cellXf.getProtection().getHidden();
-    }
-
-    /**
-     * Get the number of spaces to indent the text in the cell
-     *
-     * @return indent - number of spaces
-     */
-    @Override
-    public short getIndention() {
-        CTCellAlignment align = _cellXf.getAlignment();
-        return (short)(align == null ? 0 : align.getIndent());
-    }
-
-    /**
-     * Get the index within the StylesTable (sequence within the collection of CTXf elements)
-     *
-     * @return unique index number of the underlying record this style represents, as a short (may wrap)
-     */
-    @Override
-    public short getIndex() {
-        return (short)this._cellXfId;
-    }
-
-    /**
-     * Workaround for places where we need to support more than 32767 cell styles, ideally
-     * the main getIndex() and others would return int, not short, but that would affect some
-     * public APIs
-     *
-     * @return unique index number of the underlying record this style represents, as an int (always positive)
-     */
-    protected int getUIndex() {
-        return this._cellXfId;
-    }
-
-    /**
-     * Get the color to use for the left border
-     *
-     * @return the index of the color definition, default value is {@link org.apache.poi.ss.usermodel.IndexedColors#BLACK}
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public short getLeftBorderColor() {
-        XSSFColor clr = getLeftBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
-    }
-
-    /**
-     * Get the color to use for the left border
-     *
-     * @return the index of the color definition or <code>null</code> if not set
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    public XSSFColor getLeftBorderXSSFColor() {
-        if(!_cellXf.getApplyBorder()) return null;
-
-        int idx = (int)_cellXf.getBorderId();
-        XSSFCellBorder border = _stylesSource.getBorderAt(idx);
-
-        return border.getBorderColor(BorderSide.LEFT);
-    }
-
-    /**
-     * Get whether the cell's using this style are locked
-     *
-     * @return whether the cell using this style are locked
-     */
-    @Override
-    public boolean getLocked() {
-        if (!_cellXf.isSetProtection() || !_cellXf.getProtection().isSetLocked()) {
-            return true;
-        }
-        return _cellXf.getProtection().getLocked();
-    }
-
-    /**
-     * Is "Quote Prefix" or "123 Prefix" enabled for the cell?
-     */
-    @Override
-    public boolean getQuotePrefixed() {
-        return _cellXf.getQuotePrefix();
-    }
-    
-    /**
-     * Get the color to use for the right border
-     *
-     * @return the index of the color definition, default value is {@link org.apache.poi.ss.usermodel.IndexedColors#BLACK}
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public short getRightBorderColor() {
-        XSSFColor clr = getRightBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
-    }
-    /**
-     * Get the color to use for the right border
-     *
-     * @return the used color or <code>null</code> if not set
-     */
-    public XSSFColor getRightBorderXSSFColor() {
-        if(!_cellXf.getApplyBorder()) return null;
-
-        int idx = (int)_cellXf.getBorderId();
-        XSSFCellBorder border = _stylesSource.getBorderAt(idx);
-
-        return border.getBorderColor(BorderSide.RIGHT);
-    }
-
-    /**
-     * Get the degree of rotation for the text in the cell
-     * <p>
-     * Expressed in degrees. Values range from 0 to 180. The first letter of
-     * the text is considered the center-point of the arc.
-     * <br/>
-     * For 0 - 90, the value represents degrees above horizon. For 91-180 the degrees below the
-     * horizon is calculated as:
-     * <br/>
-     * <code>[degrees below horizon] = 90 - textRotation.</code>
-     * </p>
-     *
-     * @return rotation degrees (between 0 and 180 degrees)
-     */
-    @Override
-    public short getRotation() {
-        CTCellAlignment align = _cellXf.getAlignment();
-        return (short)(align == null ? 0 : align.getTextRotation());
-    }
-
-    @Override
-    public boolean getShrinkToFit() {
-        CTCellAlignment align = _cellXf.getAlignment();
-        return align != null && align.getShrinkToFit();
-    }
-
-    /**
-     * Get the color to use for the top border
-     *
-     * @return the index of the color definition, default value is {@link org.apache.poi.ss.usermodel.IndexedColors#BLACK}
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public short getTopBorderColor() {
-        XSSFColor clr = getTopBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
-    }
-
-    /**
-     * Get the color to use for the top border
-     *
-     * @return the used color or <code>null</code> if not set
-     */
-    public XSSFColor getTopBorderXSSFColor() {
-        if(!_cellXf.getApplyBorder()) return null;
-
-        int idx = (int)_cellXf.getBorderId();
-        XSSFCellBorder border = _stylesSource.getBorderAt(idx);
-
-        return border.getBorderColor(BorderSide.TOP);
-    }
-
-    /**
-     * Get the type of vertical alignment for the cell
-     *
-     * @return align the type of alignment, default value is {@link org.apache.poi.ss.usermodel.CellStyle#VERTICAL_BOTTOM}
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_TOP
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_CENTER
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_BOTTOM
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_JUSTIFY
-     * @deprecated POI 3.15 beta 3. Use {@link #getVerticalAlignmentEnum()} instead.
-     */
-    @Override
-    public short getVerticalAlignment() {
-        return getVerticalAlignmentEnum().getCode();
-    }
-
-    /**
-     * Get the type of vertical alignment for the cell
-     *
-     * @return the type of alignment, default value is {@link VerticalAlignment#BOTTOM}
-     */
-    @Override
-    public VerticalAlignment getVerticalAlignmentEnum() {
-        CTCellAlignment align = _cellXf.getAlignment();
-        if(align != null && align.isSetVertical()) {
-            return VerticalAlignment.forInt(align.getVertical().intValue()-1);
-        }
-        return VerticalAlignment.BOTTOM;
-    }
-
-    /**
-     * Whether the text should be wrapped
-     *
-     * @return  a boolean value indicating if the text in a cell should be line-wrapped within the cell.
-     */
-    @Override
-    public boolean getWrapText() {
-        CTCellAlignment align = _cellXf.getAlignment();
-        return align != null && align.getWrapText();
-    }
-
-    /**
-     * Set the type of horizontal alignment for the cell
-     *
-     * @param align - the type of alignment
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_GENERAL
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_LEFT
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_RIGHT
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_FILL
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_JUSTIFY
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALIGN_CENTER_SELECTION
-     * @deprecated POI 3.15 beta 3. Use {@link #setAlignment(HorizontalAlignment)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setAlignment(short align) {
-        setAlignment(HorizontalAlignment.forInt(align));
-    }
-
-    /**
-     * Set the type of horizontal alignment for the cell
-     *
-     * @param align - the type of alignment
-     */
-    @Override
-    public void setAlignment(HorizontalAlignment align) {
-        getCellAlignment().setHorizontal(align);
-    }
-
-    /**
-     * Set the type of border to use for the bottom border of the cell
-     *
-     * @param border the type of border to use
-     * @deprecated 3.15 beta 2. Use {@link #setBorderBottom(BorderStyle)}
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderBottom(short border) {
-        setBorderBottom(BorderStyle.valueOf(border));
-    }
-
-    /**
-     * Set the type of border to use for the bottom border of the cell
-     *
-     * @param border - type of border to use
-     * @see org.apache.poi.ss.usermodel.BorderStyle
-     * @since POI 3.15
-     */
-    @Override
-    public void setBorderBottom(BorderStyle border) {
-        CTBorder ct = getCTBorder();
-        CTBorderPr pr = ct.isSetBottom() ? ct.getBottom() : ct.addNewBottom();
-        if(border == BorderStyle.NONE) ct.unsetBottom();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the type of border to use for the left border of the cell
-     * @param border the type of border to use
-     * @deprecated 3.15 beta 2. Use {@link #setBorderLeft(BorderStyle)}
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderLeft(short border) {
-        setBorderLeft(BorderStyle.valueOf(border));
-    }
-
-     /**
-     * Set the type of border to use for the left border of the cell
-      *
-     * @param border the type of border to use
-     * @since POI 3.15
-     */
-    @Override
-    public void setBorderLeft(BorderStyle border) {
-        CTBorder ct = getCTBorder();
-        CTBorderPr pr = ct.isSetLeft() ? ct.getLeft() : ct.addNewLeft();
-        if(border == BorderStyle.NONE) ct.unsetLeft();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the type of border to use for the right border of the cell
-     *
-     * @param border the type of border to use
-     * @deprecated 3.15 beta 2. Use {@link #setBorderRight(BorderStyle)}
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderRight(short border) {
-        setBorderRight(BorderStyle.valueOf(border));
-    }
-
-     /**
-     * Set the type of border to use for the right border of the cell
-      *
-     * @param border the type of border to use
-     * @since POI 3.15
-     */
-    @Override
-    public void setBorderRight(BorderStyle border) {
-        CTBorder ct = getCTBorder();
-        CTBorderPr pr = ct.isSetRight() ? ct.getRight() : ct.addNewRight();
-        if(border == BorderStyle.NONE) ct.unsetRight();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the type of border to use for the top border of the cell
-     *
-     * @param border the type of border to use
-     * @deprecated 3.15 beta 2. Use {@link #setBorderTop(BorderStyle)}
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setBorderTop(short border) {
-        setBorderTop(BorderStyle.valueOf(border));
-    }
-
-    /**
-     * Set the type of border to use for the top border of the cell
-     *
-     * @param border the type of border to use
-     * @since POI 3.15
-     */
-    @Override
-    public void setBorderTop(BorderStyle border) {
-        CTBorder ct = getCTBorder();
-        CTBorderPr pr = ct.isSetTop() ? ct.getTop() : ct.addNewTop();
-        if(border == BorderStyle.NONE) ct.unsetTop();
-        else pr.setStyle(STBorderStyle.Enum.forInt(border.getCode() + 1));
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the color to use for the bottom border
-     * @param color the index of the color definition
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public void setBottomBorderColor(short color) {
-        XSSFColor clr = new XSSFColor();
-        clr.setIndexed(color);
-        setBottomBorderColor(clr);
-    }
-
-    /**
-     * Set the color to use for the bottom border
-     *
-     * @param color the color to use, null means no color
-     */
-    public void setBottomBorderColor(XSSFColor color) {
-        CTBorder ct = getCTBorder();
-        if(color == null && !ct.isSetBottom()) return;
-
-        CTBorderPr pr = ct.isSetBottom() ? ct.getBottom() : ct.addNewBottom();
-        if(color != null)  pr.setColor(color.getCTColor());
-        else pr.unsetColor();
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the index of a data format
-     *
-     * @param fmt the index of a data format
-     */
-    @Override
-    public void setDataFormat(short fmt) {
-        // XSSF supports >32,767 formats
-        setDataFormat(fmt&0xffff);
-    }
-    /**
-     * Set the index of a data format
-     *
-     * @param fmt the index of a data format
-     */
-    public void setDataFormat(int fmt) {
-        _cellXf.setApplyNumberFormat(true);
-        _cellXf.setNumFmtId(fmt);
-    }
-
-    /**
-     * Set the background fill color represented as a {@link XSSFColor} value.
-     * <p>
-     * For example:
-     * <pre>
-     * cs.setFillPattern(XSSFCellStyle.FINE_DOTS );
-     * cs.setFillBackgroundXSSFColor(new XSSFColor(java.awt.Color.RED));
-     * </pre>
-     * optionally a Foreground and background fill can be applied:
-     * <i>Note: Ensure Foreground color is set prior to background</i>
-     * <pre>
-     * cs.setFillPattern(XSSFCellStyle.FINE_DOTS );
-     * cs.setFillForegroundColor(new XSSFColor(java.awt.Color.BLUE));
-     * cs.setFillBackgroundColor(new XSSFColor(java.awt.Color.GREEN));
-     * </pre>
-     * or, for the special case of SOLID_FILL:
-     * <pre>
-     * cs.setFillPattern(XSSFCellStyle.SOLID_FOREGROUND );
-     * cs.setFillForegroundColor(new XSSFColor(java.awt.Color.GREEN));
-     * </pre>
-     * It is necessary to set the fill style in order
-     * for the color to be shown in the cell.
-     *
-     * @param color - the color to use
-     */
-    public void setFillBackgroundColor(XSSFColor color) {
-        CTFill ct = getCTFill();
-        CTPatternFill ptrn = ct.getPatternFill();
-        if(color == null) {
-            if(ptrn != null && ptrn.isSetBgColor()) ptrn.unsetBgColor();
-        } else {
-            if(ptrn == null) ptrn = ct.addNewPatternFill();
-            ptrn.setBgColor(color.getCTColor());
-        }
-
-        addFill(ct);
-    }
-
-    /**
-     * Set the background fill color represented as a indexed color value.
-     * <p>
-     * For example:
-     * <pre>
-     * cs.setFillPattern(XSSFCellStyle.FINE_DOTS );
-     * cs.setFillBackgroundXSSFColor(IndexedColors.RED.getIndex());
-     * </pre>
-     * optionally a Foreground and background fill can be applied:
-     * <i>Note: Ensure Foreground color is set prior to background</i>
-     * <pre>
-     * cs.setFillPattern(XSSFCellStyle.FINE_DOTS );
-     * cs.setFillForegroundColor(IndexedColors.BLUE.getIndex());
-     * cs.setFillBackgroundColor(IndexedColors.RED.getIndex());
-     * </pre>
-     * or, for the special case of SOLID_FILL:
-     * <pre>
-     * cs.setFillPattern(XSSFCellStyle.SOLID_FOREGROUND );
-     * cs.setFillForegroundColor(IndexedColors.RED.getIndex());
-     * </pre>
-     * It is necessary to set the fill style in order
-     * for the color to be shown in the cell.
-     *
-     * @param bg - the color to use
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public void setFillBackgroundColor(short bg) {
-        XSSFColor clr = new XSSFColor();
-        clr.setIndexed(bg);
-        setFillBackgroundColor(clr);
-    }
-
-    /**
-    * Set the foreground fill color represented as a {@link XSSFColor} value.
-     * <br/>
-    * <i>Note: Ensure Foreground color is set prior to background color.</i>
-    * @param color the color to use
-    * @see #setFillBackgroundColor(org.apache.poi.xssf.usermodel.XSSFColor) )
-    */
-    public void setFillForegroundColor(XSSFColor color) {
-        CTFill ct = getCTFill();
-
-        CTPatternFill ptrn = ct.getPatternFill();
-        if(color == null) {
-            if(ptrn != null && ptrn.isSetFgColor()) ptrn.unsetFgColor();
-        } else {
-            if(ptrn == null) ptrn = ct.addNewPatternFill();
-            ptrn.setFgColor(color.getCTColor());
-        }
-
-        addFill(ct);
-    }
-
-    /**
-     * Set the foreground fill color as a indexed color value
-     * <br/>
-     * <i>Note: Ensure Foreground color is set prior to background color.</i>
-     * @param fg the color to use
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public void setFillForegroundColor(short fg) {
-        XSSFColor clr = new XSSFColor();
-        clr.setIndexed(fg);
-        setFillForegroundColor(clr);
-    }
-
-    /**
-     * Get a <b>copy</b> of the currently used CTFill, if none is used, return a new instance.
-     */
-    private CTFill getCTFill(){
-        CTFill ct;
-        // bug 56295: handle missing applyFill attribute as "true" because Excel does as well
-        if(!_cellXf.isSetApplyFill() || _cellXf.getApplyFill()) {
-            int fillIndex = (int)_cellXf.getFillId();
-            XSSFCellFill cf = _stylesSource.getFillAt(fillIndex);
-
-            ct = (CTFill)cf.getCTFill().copy();
-        } else {
-            ct = CTFill.Factory.newInstance();
-        }
-        return ct;
-    }
-
-    /**
-     * Get a <b>copy</b> of the currently used CTBorder, if none is used, return a new instance.
-     */
-    private CTBorder getCTBorder(){
-        CTBorder ct;
-        if(_cellXf.getApplyBorder()) {
-            int idx = (int)_cellXf.getBorderId();
-            XSSFCellBorder cf = _stylesSource.getBorderAt(idx);
-
-            ct = (CTBorder)cf.getCTBorder().copy();
-        } else {
-            ct = CTBorder.Factory.newInstance();
-        }
-        return ct;
-    }
-
-    /**
-     * This element is used to specify cell fill information for pattern and solid color cell fills.
-     * For solid cell fills (no pattern),  foreground color is used.
-     * For cell fills with patterns specified, then the cell fill color is specified by the background color.
-     *
-     * @see org.apache.poi.ss.usermodel.CellStyle#NO_FILL
-     * @see org.apache.poi.ss.usermodel.CellStyle#SOLID_FOREGROUND
-     * @see org.apache.poi.ss.usermodel.CellStyle#FINE_DOTS
-     * @see org.apache.poi.ss.usermodel.CellStyle#ALT_BARS
-     * @see org.apache.poi.ss.usermodel.CellStyle#SPARSE_DOTS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_HORZ_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_VERT_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_BACKWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#THICK_FORWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#BIG_SPOTS
-     * @see org.apache.poi.ss.usermodel.CellStyle#BRICKS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_HORZ_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_VERT_BANDS
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_BACKWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#THIN_FORWARD_DIAG
-     * @see org.apache.poi.ss.usermodel.CellStyle#SQUARES
-     * @see org.apache.poi.ss.usermodel.CellStyle#DIAMONDS
-     * @see #setFillBackgroundColor(short)
-     * @see #setFillForegroundColor(short)
-     * @param fp  fill pattern (set to {@link org.apache.poi.ss.usermodel.CellStyle#SOLID_FOREGROUND} to fill w/foreground color)
-     * @deprecated POI 3.15. Use {@link #setFillPattern(FillPatternType)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setFillPattern(short fp) {
-        setFillPattern(FillPatternType.forInt(fp));
-    }
-
-    /**
-     * This element is used to specify cell fill information for pattern and solid color cell fills. For solid cell fills (no pattern),
-     * foreground color is used is used. For cell fills with patterns specified, then the cell fill color is specified by the background color element.
-     *
-     * @param pattern the fill pattern to use
-     * @see #setFillBackgroundColor(XSSFColor)
-     * @see #setFillForegroundColor(XSSFColor)
-     * @see org.apache.poi.ss.usermodel.FillPatternType
-     */
-    @Override
-    public void setFillPattern(FillPatternType pattern) {
-        CTFill ct = getCTFill();
-        CTPatternFill ctptrn = ct.isSetPatternFill() ? ct.getPatternFill() : ct.addNewPatternFill();
-        if (pattern == FillPatternType.NO_FILL && ctptrn.isSetPatternType()) {
-            ctptrn.unsetPatternType();
-        } else {
-            ctptrn.setPatternType(STPatternType.Enum.forInt(pattern.getCode() + 1));
-        }
-
-        addFill(ct);
-    }
-
-    /**
-     * Set the font for this style
-     *
-     * @param font  a font object created or retrieved from the XSSFWorkbook object
-     * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#createFont()
-     * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#getFontAt(short)
-     */
-    @Override
-    public void setFont(Font font) {
-        if(font != null){
-            long index = font.getIndex();
-            this._cellXf.setFontId(index);
-            this._cellXf.setApplyFont(true);
-        } else {
-            this._cellXf.setApplyFont(false);
-        }
-    }
-
-    /**
-     * Set the cell's using this style to be hidden
-     *
-     * @param hidden - whether the cell using this style should be hidden
-     */
-    @Override
-    public void setHidden(boolean hidden) {
-        if (!_cellXf.isSetProtection()) {
-             _cellXf.addNewProtection();
-         }
-        _cellXf.getProtection().setHidden(hidden);
-    }
-
-    /**
-     * Set the number of spaces to indent the text in the cell
-     *
-     * @param indent - number of spaces
-     */
-    @Override
-    public void setIndention(short indent) {
-        getCellAlignment().setIndent(indent);
-    }
-
-    /**
-     * Set the color to use for the left border as a indexed color value
-     *
-     * @param color the index of the color definition
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public void setLeftBorderColor(short color) {
-        XSSFColor clr = new XSSFColor();
-        clr.setIndexed(color);
-        setLeftBorderColor(clr);
-    }
-
-    /**
-     * Set the color to use for the left border as a {@link XSSFColor} value
-     *
-     * @param color the color to use
-     */
-    public void setLeftBorderColor(XSSFColor color) {
-        CTBorder ct = getCTBorder();
-        if(color == null && !ct.isSetLeft()) return;
-
-        CTBorderPr pr = ct.isSetLeft() ? ct.getLeft() : ct.addNewLeft();
-        if(color != null)  pr.setColor(color.getCTColor());
-        else pr.unsetColor();
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the cell's using this style to be locked
-     *
-     * @param locked -  whether the cell using this style should be locked
-     */
-    @Override
-    public void setLocked(boolean locked) {
-        if (!_cellXf.isSetProtection()) {
-             _cellXf.addNewProtection();
-         }
-        _cellXf.getProtection().setLocked(locked);
-    }
-    
-    /**
-     * Turn on or off "Quote Prefix" or "123 Prefix" for the style,
-     *  which is used to tell Excel that the thing which looks like
-     *  a number or a formula shouldn't be treated as on.
-     */
-    @Override
-    public void setQuotePrefixed(boolean quotePrefix) {
-        _cellXf.setQuotePrefix(quotePrefix);
-    }
-
-    /**
-     * Set the color to use for the right border
-     *
-     * @param color the index of the color definition
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public void setRightBorderColor(short color) {
-        XSSFColor clr = new XSSFColor();
-        clr.setIndexed(color);
-        setRightBorderColor(clr);
-    }
-
-    /**
-     * Set the color to use for the right border as a {@link XSSFColor} value
-     *
-     * @param color the color to use
-     */
-    public void setRightBorderColor(XSSFColor color) {
-        CTBorder ct = getCTBorder();
-        if(color == null && !ct.isSetRight()) return;
-
-        CTBorderPr pr = ct.isSetRight() ? ct.getRight() : ct.addNewRight();
-        if(color != null)  pr.setColor(color.getCTColor());
-        else pr.unsetColor();
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the degree of rotation for the text in the cell
-     * <p>
-     * Expressed in degrees. Values range from 0 to 180. The first letter of
-     * the text is considered the center-point of the arc.
-     * <br/>
-     * For 0 - 90, the value represents degrees above horizon. For 91-180 the degrees below the
-     * horizon is calculated as:
-     * <br/>
-     * <code>[degrees below horizon] = 90 - textRotation.</code>
-     * </p>
-     *
-     * Note: HSSF uses values from -90 to 90 degrees, whereas XSSF 
-     * uses values from 0 to 180 degrees. The implementations of this method will map between these two value-ranges 
-     * accordingly, however the corresponding getter is returning values in the range mandated by the current type
-     * of Excel file-format that this CellStyle is applied to.
-     *
-     * @param rotation - the rotation degrees (between 0 and 180 degrees)
-     */
-    @Override
-    public void setRotation(short rotation) {
-        getCellAlignment().setTextRotation(rotation);
-    }
-
-
-    /**
-     * Set the color to use for the top border
-     *
-     * @param color the index of the color definition
-     * @see org.apache.poi.ss.usermodel.IndexedColors
-     */
-    @Override
-    public void setTopBorderColor(short color) {
-        XSSFColor clr = new XSSFColor();
-        clr.setIndexed(color);
-        setTopBorderColor(clr);
-    }
-
-    /**
-     * Set the color to use for the top border as a {@link XSSFColor} value
-     *
-     * @param color the color to use
-     */
-    public void setTopBorderColor(XSSFColor color) {
-        CTBorder ct = getCTBorder();
-        if(color == null && !ct.isSetTop()) return;
-
-        CTBorderPr pr = ct.isSetTop() ? ct.getTop() : ct.addNewTop();
-        if(color != null)  pr.setColor(color.getCTColor());
-        else pr.unsetColor();
-
-        int idx = _stylesSource.putBorder(new XSSFCellBorder(ct, _theme));
-
-        _cellXf.setBorderId(idx);
-        _cellXf.setApplyBorder(true);
-    }
-
-    /**
-     * Set the type of vertical alignment for the cell
-     *
-     * @param align - align the type of alignment
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_TOP
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_CENTER
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_BOTTOM
-     * @see org.apache.poi.ss.usermodel.CellStyle#VERTICAL_JUSTIFY
-     * @see org.apache.poi.ss.usermodel.VerticalAlignment
-     * @deprecated POI 3.15 beta 3. Use {@link #setVerticalAlignment(VerticalAlignment)} instead.
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setVerticalAlignment(short align) {
-        setVerticalAlignment(VerticalAlignment.forInt(align));
-    }
-
-    /**
-     * Set the type of vertical alignment for the cell
-     *
-     * @param align - the type of alignment
-     */
-    public void setVerticalAlignment(VerticalAlignment align) {
-        getCellAlignment().setVertical(align);
-    }
-
-    /**
-     * Set whether the text should be wrapped.
-     * <p>
-     * Setting this flag to <code>true</code> make all content visible
-     * whithin a cell by displaying it on multiple lines
-     * </p>
-     *
-     * @param wrapped a boolean value indicating if the text in a cell should be line-wrapped within the cell.
-     */
-    @Override
-    public void setWrapText(boolean wrapped) {
-        getCellAlignment().setWrapText(wrapped);
-    }
-
-    /**
-     * Gets border color
-     *
-     * @param side the border side
-     * @return the used color
-     */
-    public XSSFColor getBorderColor(BorderSide side) {
-        switch(side){
-            case BOTTOM:
-                return getBottomBorderXSSFColor();
-            case RIGHT:
-                return getRightBorderXSSFColor();
-            case TOP:
-                return getTopBorderXSSFColor();
-            case LEFT:
-                return getLeftBorderXSSFColor();
-            default:
-                throw new IllegalArgumentException("Unknown border: " + side);
-        }
-    }
-
-    /**
-     * Set the color to use for the selected border
-     *
-     * @param side - where to apply the color definition
-     * @param color - the color to use
-     */
-    public void setBorderColor(BorderSide side, XSSFColor color) {
-        switch(side){
-            case BOTTOM:
-                setBottomBorderColor(color);
-                break;
-            case RIGHT:
-                setRightBorderColor(color);
-                break;
-            case TOP:
-                setTopBorderColor(color);
-                break;
-            case LEFT:
-                setLeftBorderColor(color);
-                break;
-        }
-    }
-
-    @Override
-    public void setShrinkToFit(boolean shrinkToFit) {
-        getCellAlignment().setShrinkToFit(shrinkToFit);
-    }
-
-    private int getFontId() {
-        if (_cellXf.isSetFontId()) {
-            return (int) _cellXf.getFontId();
-        }
-        return (int) _cellStyleXf.getFontId();
-    }
-
-    /**
-     * get the cellAlignment object to use for manage alignment
-     * @return XSSFCellAlignment - cell alignment
-     */
-    protected XSSFCellAlignment getCellAlignment() {
-        if (this._cellAlignment == null) {
-            this._cellAlignment = new XSSFCellAlignment(getCTCellAlignment());
-        }
-        return this._cellAlignment;
-    }
-
-    /**
-     * Return the CTCellAlignment instance for alignment
-     *
-     * @return CTCellAlignment
-     */
-    private CTCellAlignment getCTCellAlignment() {
-        if (_cellXf.getAlignment() == null) {
-            _cellXf.setAlignment(CTCellAlignment.Factory.newInstance());
-        }
-        return _cellXf.getAlignment();
-    }
-
-    /**
-     * Returns a hash code value for the object. The hash is derived from the underlying CTXf bean.
-     *
-     * @return the hash code value for this style
-     */
-    @Override
-    public int hashCode(){
-        return _cellXf.toString().hashCode();
-    }
-
-    /**
-     * Checks is the supplied style is equal to this style
-     *
-     * @param o the style to check
-     * @return true if the supplied style is equal to this style
-     */
-    @Override
-    public boolean equals(Object o){
-        if(o == null || !(o instanceof XSSFCellStyle)) return false;
-
-        XSSFCellStyle cf = (XSSFCellStyle)o;
-        return _cellXf.toString().equals(cf.getCoreXf().toString());
-    }
-
-    /**
-     * Make a copy of this style. The underlying CTXf bean is cloned,
-     * the references to fills and borders remain.
-     *
-     * @return a copy of this style
-     */
-    @Override
-    public Object clone(){
-        CTXf xf = (CTXf)_cellXf.copy();
-
-        int xfSize = _stylesSource._getStyleXfsSize();
-        int indexXf = _stylesSource.putCellXf(xf);
-        return new XSSFCellStyle(indexXf-1, xfSize-1, _stylesSource, _theme);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
deleted file mode 100644
index d396792..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.charts.AxisPosition;
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ChartAxisFactory;
-import org.apache.poi.ss.usermodel.charts.ChartData;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xssf.usermodel.charts.XSSFCategoryAxis;
-import org.apache.poi.xssf.usermodel.charts.XSSFChartAxis;
-import org.apache.poi.xssf.usermodel.charts.XSSFChartDataFactory;
-import org.apache.poi.xssf.usermodel.charts.XSSFChartLegend;
-import org.apache.poi.xssf.usermodel.charts.XSSFManualLayout;
-import org.apache.poi.xssf.usermodel.charts.XSSFValueAxis;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTCatAx;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTChartSpace;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPageMargins;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPlotArea;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPrintSettings;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTTitle;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTTx;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTValAx;
-import org.openxmlformats.schemas.drawingml.x2006.chart.ChartSpaceDocument;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextField;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-/**
- * Represents a SpreadsheetML Chart
- */
-public final class XSSFChart extends POIXMLDocumentPart implements Chart, ChartAxisFactory {
-
-	/**
-	 * Parent graphic frame.
-	 */
-	private XSSFGraphicFrame frame;
-
-	/**
-	 * Root element of the SpreadsheetML Chart part
-	 */
-	private CTChartSpace chartSpace;
-	/**
-	 * The Chart within that
-	 */
-	private CTChart chart;
-
-	List<XSSFChartAxis> axis = new ArrayList<XSSFChartAxis>();
-
-	/**
-	 * Create a new SpreadsheetML chart
-	 */
-	protected XSSFChart() {
-		super();
-		createChart();
-	}
-
-	/**
-	 * Construct a SpreadsheetML chart from a package part.
-	 *
-	 * @param part the package part holding the chart data,
-	 * the content type must be <code>application/vnd.openxmlformats-officedocument.drawingml.chart+xml</code>
-	 * 
-	 * @since POI 3.14-Beta1
-	 */
-	protected XSSFChart(PackagePart part) throws IOException, XmlException {
-		super(part);
-
-		chartSpace = ChartSpaceDocument.Factory.parse(part.getInputStream(), DEFAULT_XML_OPTIONS).getChartSpace(); 
-		chart = chartSpace.getChart();
-	}
-
-	/**
-	 * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-	 */
-	@Deprecated
-	protected XSSFChart(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-	    this(part);
-	}
-
-	
-	/**
-	 * Construct a new CTChartSpace bean.
-	 * By default, it's just an empty placeholder for chart objects.
-	 *
-	 * @return a new CTChartSpace bean
-	 */
-	private void createChart() {
-		chartSpace = CTChartSpace.Factory.newInstance();
-		chart = chartSpace.addNewChart();
-		CTPlotArea plotArea = chart.addNewPlotArea();
-
-		plotArea.addNewLayout();
-		chart.addNewPlotVisOnly().setVal(true);
-
-		CTPrintSettings printSettings = chartSpace.addNewPrintSettings();
-		printSettings.addNewHeaderFooter();
-
-		CTPageMargins pageMargins = printSettings.addNewPageMargins();
-		pageMargins.setB(0.75);
-		pageMargins.setL(0.70);
-		pageMargins.setR(0.70);
-		pageMargins.setT(0.75);
-		pageMargins.setHeader(0.30);
-		pageMargins.setFooter(0.30);
-		printSettings.addNewPageSetup();
-	}
-
-	/**
-	 * Return the underlying CTChartSpace bean, the root element of the SpreadsheetML Chart part.
-	 *
-	 * @return the underlying CTChartSpace bean
-	 */
-	@Internal
-	public CTChartSpace getCTChartSpace(){
-		return chartSpace;
-	}
-
-	/**
-	 * Return the underlying CTChart bean, within the Chart Space
-	 *
-	 * @return the underlying CTChart bean
-	 */
-	@Internal
-	public CTChart getCTChart(){
-		return chart;
-	}
-
-	@Override
-	protected void commit() throws IOException {
-		XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-
-		/*
-		   Saved chart space must have the following namespaces set:
-		   <c:chartSpace
-		      xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart"
-		      xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
-		      xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-		 */
-		xmlOptions.setSaveSyntheticDocumentElement(new QName(CTChartSpace.type.getName().getNamespaceURI(), "chartSpace", "c"));
-
-		PackagePart part = getPackagePart();
-		OutputStream out = part.getOutputStream();
-		chartSpace.save(out, xmlOptions);
-		out.close();
-	}
-
-	/**
-	 * Returns the parent graphic frame.
-	 * @return the graphic frame this chart belongs to
-	 */
-	public XSSFGraphicFrame getGraphicFrame() {
-		return frame;
-	}
-
-	/**
-	 * Sets the parent graphic frame.
-	 */
-	protected void setGraphicFrame(XSSFGraphicFrame frame) {
-		this.frame = frame;
-	}
-
-	public XSSFChartDataFactory getChartDataFactory() {
-		return XSSFChartDataFactory.getInstance();
-	}
-
-	public XSSFChart getChartAxisFactory() {
-		return this;
-	}
-
-	public void plot(ChartData data, ChartAxis... chartAxis) {
-		data.fillChart(this, chartAxis);
-	}
-
-	public XSSFValueAxis createValueAxis(AxisPosition pos) {
-		long id = axis.size() + 1;
-		XSSFValueAxis valueAxis = new XSSFValueAxis(this, id, pos);
-		if (axis.size() == 1) {
-			ChartAxis ax = axis.get(0);
-			ax.crossAxis(valueAxis);
-			valueAxis.crossAxis(ax);
-		}
-		axis.add(valueAxis);
-		return valueAxis;
-	}
-
-	public XSSFCategoryAxis createCategoryAxis(AxisPosition pos) {
-		long id = axis.size() + 1;
-		XSSFCategoryAxis categoryAxis = new XSSFCategoryAxis(this, id, pos);
-		if (axis.size() == 1) {
-			ChartAxis ax = axis.get(0);
-			ax.crossAxis(categoryAxis);
-			categoryAxis.crossAxis(ax);
-		}
-		axis.add(categoryAxis);
-		return categoryAxis;
-	}
-
-    public List<? extends XSSFChartAxis> getAxis() {
-        if (axis.isEmpty() && hasAxis()) {
-            parseAxis();
-        }
-        return axis;
-    }
-	
-	public XSSFManualLayout getManualLayout() {
-		return new XSSFManualLayout(this);
-	}
-
-	/**
-	 * @return true if only visible cells will be present on the chart,
-	 *         false otherwise
-	 */
-	public boolean isPlotOnlyVisibleCells() {
-		return chart.getPlotVisOnly().getVal();
-	}
-
-	/**
-	 * @param plotVisOnly a flag specifying if only visible cells should be
-	 *        present on the chart
-	 */
-	public void setPlotOnlyVisibleCells(boolean plotVisOnly) {
-		chart.getPlotVisOnly().setVal(plotVisOnly);
-	}
-
-	/**
-	 * Returns the title, or null if none is set
-	 */
-	public XSSFRichTextString getTitle() {
-		if(! chart.isSetTitle()) {
-			return null;
-		}
-
-		// TODO Do properly
-		CTTitle title = chart.getTitle();
-
-		StringBuffer text = new StringBuffer();
-		XmlObject[] t = title
-			.selectPath("declare namespace a='"+XSSFDrawing.NAMESPACE_A+"' .//a:t");
-		for (int m = 0; m < t.length; m++) {
-			NodeList kids = t[m].getDomNode().getChildNodes();
-			final int count = kids.getLength();
-			for (int n = 0; n < count; n++) {
-				Node kid = kids.item(n);
-				if (kid instanceof Text) {
-					text.append(kid.getNodeValue());
-				}
-			}
-		}
-
-		return new XSSFRichTextString(text.toString());
-	}
-
-	/**
-	 * Sets the title text.
-	 */
-	public void setTitle(String newTitle) {
-		CTTitle ctTitle;
-		if (chart.isSetTitle()) {
-			ctTitle = chart.getTitle();
-		} else {
-			ctTitle = chart.addNewTitle();
-		}
-
-		CTTx tx;
-		if (ctTitle.isSetTx()) {
-			tx = ctTitle.getTx();
-		} else {
-			tx = ctTitle.addNewTx();
-		}
-
-		if (tx.isSetStrRef()) {
-			tx.unsetStrRef();
-		}
-
-		CTTextBody rich;
-		if (tx.isSetRich()) {
-			rich = tx.getRich();
-		} else {
-			rich = tx.addNewRich();
-			rich.addNewBodyPr();  // body properties must exist (but can be empty)
-		}
-
-		CTTextParagraph para;
-		if (rich.sizeOfPArray() > 0) {
-			para = rich.getPArray(0);
-		} else {
-			para = rich.addNewP();
-		}
-
-		if (para.sizeOfRArray() > 0) {
-			CTRegularTextRun run = para.getRArray(0);
-			run.setT(newTitle);
-		} else if (para.sizeOfFldArray() > 0) {
-			CTTextField fld = para.getFldArray(0);
-			fld.setT(newTitle);
-		} else {
-			CTRegularTextRun run = para.addNewR();
-			run.setT(newTitle);
-		}
-	}
-
-	public XSSFChartLegend getOrCreateLegend() {
-		return new XSSFChartLegend(this);
-	}
-
-	public void deleteLegend() {
-		if (chart.isSetLegend()) {
-			chart.unsetLegend();
-		}
-	}
-
-	private boolean hasAxis() {
-		CTPlotArea ctPlotArea = chart.getPlotArea();
-		int totalAxisCount =
-			ctPlotArea.sizeOfValAxArray()  +
-			ctPlotArea.sizeOfCatAxArray()  +
-			ctPlotArea.sizeOfDateAxArray() +
-			ctPlotArea.sizeOfSerAxArray();
-		return totalAxisCount > 0;
-	}
-
-	private void parseAxis() {
-		// TODO: add other axis types
-		parseCategoryAxis();
-		parseValueAxis();
-	}
-
-	private void parseCategoryAxis() {
-		for (CTCatAx catAx : chart.getPlotArea().getCatAxArray()) {
-			axis.add(new XSSFCategoryAxis(this, catAx));
-		}
-	}
-
-	private void parseValueAxis() {
-		for (CTValAx valAx : chart.getPlotArea().getValAxArray()) {
-			axis.add(new XSSFValueAxis(this, valAx));
-		}
-	}
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
deleted file mode 100644
index 03194ae..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTChartsheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDrawing;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTLegacyDrawing;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.ChartsheetDocument;
-
-/**
- * High level representation of Sheet Parts that are of type 'chartsheet'.
- * <p>
- *  Chart sheet is a special kind of Sheet that contains only chart and no data.
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class XSSFChartSheet extends XSSFSheet  {
-
-    private static final byte[] BLANK_WORKSHEET = blankWorksheet();
-
-    protected CTChartsheet chartsheet;
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    protected XSSFChartSheet(PackagePart part) {
-        super(part);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFChartSheet(PackagePart part, PackageRelationship rel) {
-        this(part);
-    }
-    
-    protected void read(InputStream is) throws IOException {
-        //initialize the supeclass with a blank worksheet
-        super.read(new ByteArrayInputStream(BLANK_WORKSHEET));
-
-        try {
-            chartsheet = ChartsheetDocument.Factory.parse(is, DEFAULT_XML_OPTIONS).getChartsheet();
-        } catch (XmlException e){
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Provide access to the CTChartsheet bean holding this sheet's data
-     *
-     * @return the CTChartsheet bean holding this sheet's data
-     */
-    public CTChartsheet getCTChartsheet() {
-        return chartsheet;
-    }
-
-    @Override
-    protected CTDrawing getCTDrawing() {
-       return chartsheet.getDrawing();
-    }
-    
-    @Override
-    protected CTLegacyDrawing getCTLegacyDrawing() {
-       return chartsheet.getLegacyDrawing();
-    }
-    
-    @Override
-    protected void write(OutputStream out) throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(
-                new QName(CTChartsheet.type.getName().getNamespaceURI(), "chartsheet"));
-        chartsheet.save(out, xmlOptions);
-
-    }
-
-    private static byte[] blankWorksheet(){
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        try {
-            new XSSFSheet().write(out);
-        } catch (IOException e){
-            throw new RuntimeException(e);
-        }
-        return out.toByteArray();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
deleted file mode 100644
index 4dc3db8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.apache.poi.util.Internal;
-
-/**
- * @author Yegor Kozlov
- */
-public final class XSSFChildAnchor extends XSSFAnchor {
-    private CTTransform2D t2d;
-
-    public XSSFChildAnchor(int x, int y, int cx, int cy) {
-        t2d = CTTransform2D.Factory.newInstance();
-        CTPoint2D off = t2d.addNewOff();
-        CTPositiveSize2D ext = t2d.addNewExt();
-
-        off.setX(x);
-        off.setY(y);
-        ext.setCx(Math.abs(cx - x));
-        ext.setCy(Math.abs(cy - y));
-        if(x > cx)  t2d.setFlipH(true);
-        if(y > cy)  t2d.setFlipV(true);
-    }
-
-    public XSSFChildAnchor(CTTransform2D t2d) {
-        this.t2d = t2d;
-    }
-
-    @Internal
-    public CTTransform2D getCTTransform2D() {
-        return t2d;
-    }
-
-    public int getDx1() {
-        return (int)t2d.getOff().getX();
-    }
-
-    public void setDx1(int dx1) {
-        t2d.getOff().setX(dx1);
-    }
-
-    public int getDy1() {
-        return (int)t2d.getOff().getY();
-    }
-
-    public void setDy1(int dy1) {
-        t2d.getOff().setY(dy1);
-    }
-
-    public int getDy2() {
-        return (int)(getDy1() + t2d.getExt().getCy());
-    }
-
-    public void setDy2(int dy2) {
-        t2d.getExt().setCy(dy2 - getDy1());
-    }
-
-    public int getDx2() {
-        return (int)(getDx1() + t2d.getExt().getCx());
-    }
-
-    public void setDx2(int dx2) {
-        t2d.getExt().setCx(dx2 - getDx1());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
deleted file mode 100644
index df47fc2..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
-
-/**
- * A client anchor is attached to an excel worksheet.  It anchors against
- * top-left and bottom-right cells.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFClientAnchor extends XSSFAnchor implements ClientAnchor {
-    private AnchorType DEFAULT_ANCHOR_TYPE = AnchorType.MOVE_AND_RESIZE;
-    private AnchorType anchorType;
-
-    /**
-     * Starting anchor point
-     */
-    private CTMarker cell1;
-
-    /**
-     * Ending anchor point
-     */
-    private CTMarker cell2;
-
-    /**
-     * Creates a new client anchor and defaults all the anchor positions to 0.
-     */
-    public XSSFClientAnchor() {
-        anchorType = DEFAULT_ANCHOR_TYPE;
-        cell1 = CTMarker.Factory.newInstance();
-        cell1.setCol(0);
-        cell1.setColOff(0);
-        cell1.setRow(0);
-        cell1.setRowOff(0);
-        cell2 = CTMarker.Factory.newInstance();
-        cell2.setCol(0);
-        cell2.setColOff(0);
-        cell2.setRow(0);
-        cell2.setRowOff(0);
-    }
-
-    /**
-     * Creates a new client anchor and sets the top-left and bottom-right
-     * coordinates of the anchor.
-     *
-     * @param dx1  the x coordinate within the first cell.
-     * @param dy1  the y coordinate within the first cell.
-     * @param dx2  the x coordinate within the second cell.
-     * @param dy2  the y coordinate within the second cell.
-     * @param col1 the column (0 based) of the first cell.
-     * @param row1 the row (0 based) of the first cell.
-     * @param col2 the column (0 based) of the second cell.
-     * @param row2 the row (0 based) of the second cell.
-     */
-    public XSSFClientAnchor(int dx1, int dy1, int dx2, int dy2, int col1, int row1, int col2, int row2) {
-        this();
-        cell1.setCol(col1);
-        cell1.setColOff(dx1);
-        cell1.setRow(row1);
-        cell1.setRowOff(dy1);
-        cell2.setCol(col2);
-        cell2.setColOff(dx2);
-        cell2.setRow(row2);
-        cell2.setRowOff(dy2);
-    }
-
-    /**
-     * Create XSSFClientAnchor from existing xml beans
-     *
-     * @param cell1 starting anchor point
-     * @param cell2 ending anchor point
-     */
-    protected XSSFClientAnchor(CTMarker cell1, CTMarker cell2) {
-        anchorType = DEFAULT_ANCHOR_TYPE;
-        this.cell1 = cell1;
-        this.cell2 = cell2;
-    }
-
-    public short getCol1() {
-        return (short)cell1.getCol();
-    }
-
-    public void setCol1(int col1) {
-        cell1.setCol(col1);
-    }
-
-    public short getCol2() {
-        return (short)cell2.getCol();
-    }
-
-    public void setCol2(int col2) {
-        cell2.setCol(col2);
-    }
-
-    public int getRow1() {
-        return cell1.getRow();
-    }
-
-    public void setRow1(int row1) {
-        cell1.setRow(row1);
-    }
-
-    public int getRow2() {
-        return cell2.getRow();
-    }
-
-    public void setRow2(int row2) {
-        cell2.setRow(row2);
-    }
-
-    public int getDx1() {
-        return (int)cell1.getColOff();
-    }
-
-    public void setDx1(int dx1) {
-        cell1.setColOff(dx1);
-    }
-
-    public int getDy1() {
-        return (int)cell1.getRowOff();
-    }
-
-    public void setDy1(int dy1) {
-        cell1.setRowOff(dy1);
-    }
-
-    public int getDy2() {
-        return (int)cell2.getRowOff();
-    }
-
-    public void setDy2(int dy2) {
-        cell2.setRowOff(dy2);
-    }
-
-    public int getDx2() {
-        return (int)cell2.getColOff();
-    }
-
-    public void setDx2(int dx2) {
-        cell2.setColOff(dx2);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == null || !(o instanceof XSSFClientAnchor)) return false;
-
-        XSSFClientAnchor anchor = (XSSFClientAnchor) o;
-        return  getDx1() == anchor.getDx1() &&
-                getDx2() == anchor.getDx2() &&
-                getDy1() == anchor.getDy1() &&
-                getDy2() == anchor.getDy2() &&
-                getCol1() == anchor.getCol1() &&
-                getCol2() == anchor.getCol2() &&
-                getRow1() == anchor.getRow1() &&
-                getRow2() == anchor.getRow2() ;
-
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-    }
-
-    @Override
-    public String toString(){
-        return "from : " + cell1.toString()  + "; to: " + cell2.toString();
-    }
-
-    /**
-     * Return starting anchor point
-     *
-     * @return starting anchor point
-     */
-    @Internal
-    public CTMarker getFrom(){
-        return cell1;
-    }
-
-    protected void setFrom(CTMarker from){
-        cell1 = from;
-    }
-
-    /**
-     * Return ending anchor point
-     *
-     * @return ending anchor point
-     */
-    @Internal
-    public CTMarker getTo(){
-        return cell2;
-    }
-
-    protected void setTo(CTMarker to){
-        cell2 = to;
-    }
-
-
-    /**
-     * Sets the anchor type
-     * @param anchorType the anchor type to set
-     * @since POI 3.14
-     */
-    @Override
-    public void setAnchorType( AnchorType anchorType )
-    {
-        this.anchorType = anchorType;
-    }
-    /**
-     * Sets the anchor type
-     * @param anchorType the anchor type to set
-     * @deprecated POI 3.15. Use {@link #setAnchorType(AnchorType)} instead
-     */
-    @Removal(version="3.17")
-    @Override
-    public void setAnchorType( int anchorType )
-    {
-        this.anchorType = AnchorType.byId(anchorType);
-    }
-
-    /**
-     * Gets the anchor type
-     * Changed from returning an int to an enum in POI 3.14 beta 1.
-     * @return the anchor type
-     */
-    @Override
-    public AnchorType getAnchorType()
-    {
-        return anchorType;
-    }
-
-    public boolean isSet(){
-        return !(cell1.getCol() == 0 && cell2.getCol() == 0 &&
-                 cell1.getRow() == 0 && cell2.getRow() == 0);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java
deleted file mode 100644
index 441f42f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import java.util.Arrays;
-
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.ss.usermodel.ExtendedColor;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-
-/**
- * Represents a color in SpreadsheetML
- */
-public class XSSFColor extends ExtendedColor {
-    private final CTColor ctColor;
-
-    /**
-     * Create an instance of XSSFColor from the supplied XML bean
-     */
-    public XSSFColor(CTColor color) {
-        this.ctColor = color;
-    }
-
-    /**
-     * Create an new instance of XSSFColor
-     */
-    public XSSFColor() {
-        this.ctColor = CTColor.Factory.newInstance();
-    }
-
-    public XSSFColor(java.awt.Color clr) {
-        this();
-        setColor(clr);
-    }
-
-    public XSSFColor(byte[] rgb) {
-        this();
-        ctColor.setRgb(rgb);
-    }
-    
-    public XSSFColor(IndexedColors indexedColor) {
-        this();
-        ctColor.setIndexed(indexedColor.index);
-    }
-
-    /**
-     * A boolean value indicating the ctColor is automatic and system ctColor dependent.
-     */
-    @Override
-    public boolean isAuto() {
-        return ctColor.getAuto();
-    }
-    /**
-     * A boolean value indicating the ctColor is automatic and system ctColor dependent.
-     */
-    public void setAuto(boolean auto) {
-        ctColor.setAuto(auto);
-    }
-
-    /**
-     * A boolean value indicating the ctColor is Indexed
-     */
-    @Override
-    public boolean isIndexed() {
-        return ctColor.isSetIndexed();
-    }
-
-    /**
-     * A boolean value indicating the ctColor is RGB or ARGB based
-     */
-    @Override
-    public boolean isRGB() {
-        return ctColor.isSetRgb();
-    }
-
-    /**
-     * A boolean value indicating the ctColor is Theme based
-     */
-    @Override
-    public boolean isThemed() {
-        return ctColor.isSetTheme();
-    }
-    
-    /**
-     * A boolean value indicating if the ctColor has a alpha or not
-     */
-    public boolean hasAlpha() {
-        if (! ctColor.isSetRgb()) {
-            return false;
-        }
-        return ctColor.getRgb().length == 4;
-    }
-
-    /**
-     * A boolean value indicating if the ctColor has a tint or not
-     */
-    public boolean hasTint() {
-        if (!ctColor.isSetTint()) {
-            return false;
-        }
-        return ctColor.getTint() != 0;
-    }
-
-    /**
-     * Indexed ctColor value. Only used for backwards compatibility. References a ctColor in indexedColors.
-     */
-    @Override
-    public short getIndex() {
-        return (short)ctColor.getIndexed();
-    }
-    /**
-     * Indexed ctColor value. Only used for backwards compatibility. References a ctColor in indexedColors.
-     */
-    public short getIndexed() {
-        return getIndex();
-    }
-
-    /**
-     * Indexed ctColor value. Only used for backwards compatibility. References a ctColor in indexedColors.
-     */
-    public void setIndexed(int indexed) {
-        ctColor.setIndexed(indexed);
-    }
-
-   /**
-    * Standard Red Green Blue ctColor value (RGB).
-    * If there was an A (Alpha) value, it will be stripped.
-    */
-   @Override
-   public byte[] getRGB() {
-      byte[] rgb = getRGBOrARGB();
-      if(rgb == null) {
-          return null;
-      }
-
-      if(rgb.length == 4) {
-         // Need to trim off the alpha
-         byte[] tmp = new byte[3];
-         System.arraycopy(rgb, 1, tmp, 0, 3);
-         return tmp;
-      } else {
-         return rgb;
-      }
-   }
-
-   /**
-    * Standard Alpha Red Green Blue ctColor value (ARGB).
-    */
-   @Override
-   public byte[] getARGB() {
-      byte[] rgb = getRGBOrARGB();
-      if(rgb == null) {
-          return null;
-      }
-
-      if(rgb.length == 3) {
-         // Pad with the default Alpha
-         byte[] tmp = new byte[4];
-         tmp[0] = -1;
-         System.arraycopy(rgb, 0, tmp, 1, 3);
-         return tmp;
-      } else {
-         return rgb;
-      }
-   }
-
-   @Override
-   protected byte[] getStoredRBG() {
-       return ctColor.getRgb();
-   }
-
-    /**
-     * Standard Alpha Red Green Blue ctColor value (ARGB).
-     */
-   @Override
-    public void setRGB(byte[] rgb) {
-       ctColor.setRgb(rgb);
-    }
-
-    /**
-     * Index into the <clrScheme> collection, referencing a particular <sysClr> or
-     *  <srgbClr> value expressed in the Theme part.
-     */
-   @Override
-   public int getTheme() {
-      return (int)ctColor.getTheme();
-    }
-
-    /**
-     * Index into the <clrScheme> collection, referencing a particular <sysClr> or
-     *  <srgbClr> value expressed in the Theme part.
-     */
-    public void setTheme(int theme) {
-        ctColor.setTheme(theme);
-    }
-
-    /**
-     * Specifies the tint value applied to the ctColor.
-     *
-     * <p>
-     * If tint is supplied, then it is applied to the RGB value of the ctColor to determine the final
-     * ctColor applied.
-     * </p>
-     * <p>
-     * The tint value is stored as a double from -1.0 .. 1.0, where -1.0 means 100% darken and
-     * 1.0 means 100% lighten. Also, 0.0 means no change.
-     * </p>
-     * <p>
-     * In loading the RGB value, it is converted to HLS where HLS values are (0..HLSMAX), where
-     * HLSMAX is currently 255.
-     * </p>
-     * Here are some examples of how to apply tint to ctColor:
-     * <blockquote>
-     * <pre>
-     * If (tint &lt; 0)
-     * Lum' = Lum * (1.0 + tint)
-     *
-     * For example: Lum = 200; tint = -0.5; Darken 50%
-     * Lum' = 200 * (0.5) =&gt; 100
-     * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
-     * Lum' = 200 * (1.0-1.0) =&gt; 0
-     * If (tint &gt; 0)
-     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
-     * For example: Lum = 100; tint = 0.75; Lighten 75%
-     *
-     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
-     * = 100 * .25 + (255 - 255 * .25)
-     * = 25 + (255 - 63) = 25 + 192 = 217
-     * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
-     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
-     * = 100 * 0 + (255 - 255 * 0)
-     * = 0 + (255 - 0) = 255
-     * </pre>
-     * </blockquote>
-     *
-     * @return the tint value
-     */
-    @Override
-    public double getTint() {
-        return ctColor.getTint();
-    }
-
-    /**
-     * Specifies the tint value applied to the ctColor.
-     *
-     * <p>
-     * If tint is supplied, then it is applied to the RGB value of the ctColor to determine the final
-     * ctColor applied.
-     * </p>
-     * <p>
-     * The tint value is stored as a double from -1.0 .. 1.0, where -1.0 means 100% darken and
-     * 1.0 means 100% lighten. Also, 0.0 means no change.
-     * </p>
-     * <p>
-     * In loading the RGB value, it is converted to HLS where HLS values are (0..HLSMAX), where
-     * HLSMAX is currently 255.
-     * </p>
-     * Here are some examples of how to apply tint to ctColor:
-     * <blockquote>
-     * <pre>
-     * If (tint &lt; 0)
-     * Lum' = Lum * (1.0 + tint)
-     *
-     * For example: Lum = 200; tint = -0.5; Darken 50%
-     * Lum' = 200 * (0.5) =&gt; 100
-     * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
-     * Lum' = 200 * (1.0-1.0) =&gt; 0
-     * If (tint &gt; 0)
-     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
-     * For example: Lum = 100; tint = 0.75; Lighten 75%
-     *
-     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
-     * = 100 * .25 + (255 - 255 * .25)
-     * = 25 + (255 - 63) = 25 + 192 = 217
-     * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
-     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
-     * = 100 * 0 + (255 - 255 * 0)
-     * = 0 + (255 - 0) = 255
-     * </pre>
-     * </blockquote>
-     *
-     * @param tint the tint value
-     */
-    @Override
-    public void setTint(double tint) {
-        ctColor.setTint(tint);
-    }
-
-    /**
-     * Returns the underlying XML bean
-     *
-     * @return the underlying XML bean
-     */
-    @Internal
-    public CTColor getCTColor(){
-        return ctColor;
-    }
-
-    /**
-     * Checked type cast <tt>color</tt> to an XSSFColor.
-     *
-     * @param color the color to type cast
-     * @return the type casted color
-     * @throws IllegalArgumentException if color is null or is not an instance of XSSFColor
-     */
-    public static XSSFColor toXSSFColor(Color color) {
-        // FIXME: this method would be more useful if it could convert any Color to an XSSFColor
-        // Currently the only benefit of this method is to throw an IllegalArgumentException
-        // instead of a ClassCastException.
-        if (color != null && !(color instanceof XSSFColor)) {
-            throw new IllegalArgumentException("Only XSSFColor objects are supported");
-        }
-        return (XSSFColor)color;
-    }
-    
-    @Override
-    public int hashCode(){
-        return ctColor.toString().hashCode();
-    }
-
-    // Helper methods for {@link #equals(Object)}
-    private boolean sameIndexed(XSSFColor other) {
-        if (isIndexed() == other.isIndexed()) {
-            if (isIndexed()) {
-                return getIndexed() == other.getIndexed();
-            }
-            return true;
-        }
-        return false;
-    }
-    private boolean sameARGB(XSSFColor other) {
-        if (isRGB() == other.isRGB()) {
-            if (isRGB()) {
-                return Arrays.equals(getARGB(), other.getARGB());
-            }
-            return true;
-        }
-        return false;
-    }
-    private boolean sameTheme(XSSFColor other) {
-        if (isThemed() == other.isThemed()) {
-            if (isThemed()) {
-                return getTheme() == other.getTheme();
-            }
-            return true;
-        }
-        return false;
-    }
-    private boolean sameTint(XSSFColor other) {
-        if (hasTint() == other.hasTint()) {
-            if (hasTint()) {
-                return getTint() == other.getTint();
-            }
-            return true;
-        }
-        return false;
-    }
-    private boolean sameAuto(XSSFColor other) {
-        return isAuto() == other.isAuto();
-    }
-    
-    @Override
-    public boolean equals(Object o){
-        if(!(o instanceof XSSFColor)) {
-            return false;
-        }
-
-        XSSFColor other = (XSSFColor)o;
-        
-        // Compare each field in ctColor.
-        // Cannot compare ctColor's XML string representation because equivalent
-        // colors may have different relation namespace URI's
-        return sameARGB(other)
-                && sameTheme(other)
-                && sameIndexed(other)
-                && sameTint(other)
-                && sameAuto(other);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
deleted file mode 100644
index eb15001..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.ss.usermodel.ColorScaleFormatting;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCfvo;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColorScale;
-
-/**
- * High level representation for Color Scale / Color Gradient Formatting 
- *  component of Conditional Formatting settings
- */
-public class XSSFColorScaleFormatting implements ColorScaleFormatting {
-    CTColorScale _scale;
-
-    /*package*/ XSSFColorScaleFormatting(CTColorScale scale){
-        _scale = scale;
-    }
-    
-    public int getNumControlPoints() {
-        return _scale.sizeOfCfvoArray();
-    }
-    public void setNumControlPoints(int num) {
-        while (num < _scale.sizeOfCfvoArray()) {
-            _scale.removeCfvo(_scale.sizeOfCfvoArray()-1);
-            _scale.removeColor(_scale.sizeOfColorArray()-1);
-        }
-        while (num > _scale.sizeOfCfvoArray()) {
-            _scale.addNewCfvo();
-            _scale.addNewColor();
-        }
-    }
-
-    public XSSFColor[] getColors() {
-        CTColor[] ctcols = _scale.getColorArray();
-        XSSFColor[] c = new XSSFColor[ctcols.length];
-        for (int i=0; i<ctcols.length; i++) {
-            c[i] = new XSSFColor(ctcols[i]);
-        }
-        return c;
-    }
-    public void setColors(Color[] colors) {
-        CTColor[] ctcols = new CTColor[colors.length];
-        for (int i=0; i<colors.length; i++) {
-            ctcols[i] = ((XSSFColor)colors[i]).getCTColor();
-        }
-        _scale.setColorArray(ctcols);
-    }
-
-    public XSSFConditionalFormattingThreshold[] getThresholds() {
-        CTCfvo[] cfvos = _scale.getCfvoArray();
-        XSSFConditionalFormattingThreshold[] t = 
-                new XSSFConditionalFormattingThreshold[cfvos.length];
-        for (int i=0; i<cfvos.length; i++) {
-            t[i] = new XSSFConditionalFormattingThreshold(cfvos[i]);
-        }
-        return t;
-    }
-    public void setThresholds(ConditionalFormattingThreshold[] thresholds) {
-        CTCfvo[] cfvos = new CTCfvo[thresholds.length];
-        for (int i=0; i<thresholds.length; i++) {
-            cfvos[i] = ((XSSFConditionalFormattingThreshold)thresholds[i]).getCTCfvo();
-        }
-        _scale.setCfvoArray(cfvos);
-    }
-    
-    public XSSFColor createColor() {
-        return new XSSFColor(_scale.addNewColor());
-    }
-    public XSSFConditionalFormattingThreshold createThreshold() {
-        return new XSSFConditionalFormattingThreshold(_scale.addNewCfvo());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java
deleted file mode 100644
index 6e69fa9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.util.Units.EMU_PER_PIXEL;
-
-import java.math.BigInteger;
-
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-
-import com.microsoft.schemas.office.excel.CTClientData;
-import com.microsoft.schemas.vml.CTShape;
-
-public class XSSFComment implements Comment {
-    
-    private final CTComment _comment;
-    private final CommentsTable _comments;
-    private final CTShape _vmlShape;
-
-    /**
-     * cached reference to the string with the comment text
-     */
-    private XSSFRichTextString _str;
-
-    /**
-     * Creates a new XSSFComment, associated with a given
-     *  low level comment object.
-     */
-    public XSSFComment(CommentsTable comments, CTComment comment, CTShape vmlShape) {
-        _comment = comment;
-        _comments = comments;
-        _vmlShape = vmlShape;
-
-        // we potentially need to adjust the column/row information in the shape
-        // the same way as we do in setRow()/setColumn()
-        if(vmlShape != null && vmlShape.sizeOfClientDataArray() > 0) {
-            CellReference ref = new CellReference(comment.getRef());
-            CTClientData clientData = vmlShape.getClientDataArray(0);
-            clientData.setRowArray(0, new BigInteger(String.valueOf(ref.getRow())));
-            clientData.setColumnArray(0, new BigInteger(String.valueOf(ref.getCol())));
-            
-            avoidXmlbeansCorruptPointer(vmlShape);
-        }
-    }
-
-    /**
-     *
-     * @return Name of the original comment author. Default value is blank.
-     */
-    @Override
-    public String getAuthor() {
-        return _comments.getAuthor((int) _comment.getAuthorId());
-    }
-
-    /**
-     * Name of the original comment author. Default value is blank.
-     *
-     * @param author the name of the original author of the comment
-     */
-    @Override
-    public void setAuthor(String author) {
-        _comment.setAuthorId(
-                _comments.findAuthor(author)
-        );
-    }
-
-    /**
-     * @return the 0-based column of the cell that the comment is associated with.
-     */
-    @Override
-    public int getColumn() {
-        return getAddress().getColumn();
-    }
-
-    /**
-     * @return the 0-based row index of the cell that the comment is associated with.
-     */
-    @Override
-    public int getRow() {
-        return getAddress().getRow();
-    }
-
-    /**
-     * Returns whether this comment is visible.
-     *
-     * @return <code>true</code> if the comment is visible, <code>false</code> otherwise
-     */
-    @Override
-    public boolean isVisible() {
-        boolean visible = false;
-        if(_vmlShape != null){
-            String style = _vmlShape.getStyle();
-            visible = style != null && style.indexOf("visibility:visible") != -1;
-        }
-        return visible;
-    }
-
-    /**
-     * Sets whether this comment is visible.
-     *
-     * @param visible <code>true</code> if the comment is visible, <code>false</code> otherwise
-     */
-    @Override
-    public void setVisible(boolean visible) {
-        if(_vmlShape != null){
-            String style;
-            if(visible) style = "position:absolute;visibility:visible";
-            else style = "position:absolute;visibility:hidden";
-            _vmlShape.setStyle(style);
-        }
-    }
-    
-    @Override
-    public CellAddress getAddress() {
-        return new CellAddress(_comment.getRef());
-    }
-    
-    @Override
-    public void setAddress(int row, int col) {
-        setAddress(new CellAddress(row, col));
-    }
-    
-    @Override
-    public void setAddress(CellAddress address) {
-        CellAddress oldRef = new CellAddress(_comment.getRef());
-        if (address.equals(oldRef)) {
-            // nothing to do
-            return;
-        }
-        
-        _comment.setRef(address.formatAsString());
-        _comments.referenceUpdated(oldRef, _comment);
-        
-        if (_vmlShape != null) {
-            CTClientData clientData = _vmlShape.getClientDataArray(0);
-            clientData.setRowArray(0, new BigInteger(String.valueOf(address.getRow())));
-            clientData.setColumnArray(0, new BigInteger(String.valueOf(address.getColumn())));
-           
-            avoidXmlbeansCorruptPointer(_vmlShape);
-        }
-    }
-
-    /**
-     * Set the column of the cell that contains the comment
-     * 
-     * If changing both row and column, use {@link #setAddress}.
-     *
-     * @param col the 0-based column of the cell that contains the comment
-     */
-    @Override
-    public void setColumn(int col) {
-        setAddress(getRow(), col);
-    }
-
-    /**
-     * Set the row of the cell that contains the comment
-     * 
-     * If changing both row and column, use {@link #setAddress}.
-     *
-     * @param row the 0-based row of the cell that contains the comment
-     */
-    @Override
-    public void setRow(int row) {
-        setAddress(row, getColumn());
-    }
-    
-    /**
-     * @return the rich text string of the comment
-     */
-    @Override
-    public XSSFRichTextString getString() {
-        if(_str == null) {
-            CTRst rst = _comment.getText();
-            if(rst != null) _str = new XSSFRichTextString(_comment.getText());
-        }
-        return _str;
-    }
-
-    /**
-     * Sets the rich text string used by this comment.
-     *
-     * @param string  the XSSFRichTextString used by this object.
-     */
-    @Override
-    public void setString(RichTextString string) {
-        if(!(string instanceof XSSFRichTextString)){
-            throw new IllegalArgumentException("Only XSSFRichTextString argument is supported");
-        }
-        _str = (XSSFRichTextString)string;
-        _comment.setText(_str.getCTRst());
-    }
-    
-    public void setString(String string) {
-        setString(new XSSFRichTextString(string));
-    }
-
-    @Override
-    public ClientAnchor getClientAnchor() {
-        String position = _vmlShape.getClientDataArray(0).getAnchorArray(0);
-        int[] pos = new int[8];
-        int i = 0;
-        for (String s : position.split(",")) {
-            pos[i++] = Integer.parseInt(s.trim());
-        }
-        XSSFClientAnchor ca = new XSSFClientAnchor(pos[1]*EMU_PER_PIXEL, pos[3]*EMU_PER_PIXEL, pos[5]*EMU_PER_PIXEL, pos[7]*EMU_PER_PIXEL, pos[0], pos[2], pos[4], pos[6]);
-        return ca;
-    }
-
-    /**
-     * @return the xml bean holding this comment's properties
-     */
-    protected CTComment getCTComment(){
-        return _comment;
-    }
-
-    protected CTShape getCTShape(){
-        return _vmlShape;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof XSSFComment)) {
-            return false;
-        }
-        XSSFComment other = (XSSFComment) obj;
-        return ((getCTComment() == other.getCTComment()) &&
-                (getCTShape() == other.getCTShape())); 
-    }
-
-    @Override
-    public int hashCode() {
-        return ((getRow()*17) + getColumn())*31;
-    }
-
-    private static void avoidXmlbeansCorruptPointer(CTShape vmlShape) {
-        // There is a very odd xmlbeans bug when changing the row
-        //  arrays which can lead to corrupt pointer
-        // This call seems to fix them again... See bug #50795
-        vmlShape.getClientDataList().toString();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
deleted file mode 100644
index 915ba5d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.ConditionalFormatting;
-import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTConditionalFormatting;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-/**
- * @author Yegor Kozlov
- */
-public class XSSFConditionalFormatting implements ConditionalFormatting {
-    private final CTConditionalFormatting _cf;
-    private final XSSFSheet _sh;
-
-    /*package*/ XSSFConditionalFormatting(XSSFSheet sh) {
-        _cf = CTConditionalFormatting.Factory.newInstance();
-        _sh = sh;
-    }
-
-    /*package*/ XSSFConditionalFormatting(
-            XSSFSheet sh, CTConditionalFormatting cf) {
-        _cf = cf;
-        _sh = sh;
-    }
-
-    /*package*/  CTConditionalFormatting getCTConditionalFormatting() {
-        return _cf;
-    }
-
-    /**
-     * @return array of <tt>CellRangeAddress</tt>s. Never <code>null</code>
-     */
-    @Override
-    public CellRangeAddress[] getFormattingRanges() {
-        ArrayList<CellRangeAddress> lst = new ArrayList<CellRangeAddress>();
-        for (Object stRef : _cf.getSqref()) {
-            String[] regions = stRef.toString().split(" ");
-            for (final String region : regions) {
-                lst.add(CellRangeAddress.valueOf(region));
-            }
-        }
-        return lst.toArray(new CellRangeAddress[lst.size()]);
-    }
-
-    @Override
-    public void setFormattingRanges(CellRangeAddress[] ranges) {
-        if (ranges == null) {
-            throw new IllegalArgumentException("cellRanges must not be null");
-        }
-        final StringBuilder sb = new StringBuilder();
-        boolean first = true;
-        for (CellRangeAddress range : ranges) {
-            if (!first) {
-                sb.append(" ");
-            } else {
-                first = false;
-            }
-            sb.append(range.formatAsString());
-        }
-        _cf.setSqref(Collections.singletonList(sb.toString()));
-    }
-
-    /**
-     * Replaces an existing Conditional Formatting rule at position idx.
-     * Excel allows to create up to 3 Conditional Formatting rules.
-     * This method can be useful to modify existing  Conditional Formatting rules.
-     *
-     * @param idx    position of the rule. Should be between 0 and 2.
-     * @param cfRule - Conditional Formatting rule
-     */
-    @Override
-    public void setRule(int idx, ConditionalFormattingRule cfRule) {
-        XSSFConditionalFormattingRule xRule = (XSSFConditionalFormattingRule) cfRule;
-        _cf.getCfRuleArray(idx).set(xRule.getCTCfRule());
-    }
-
-    /**
-     * Add a Conditional Formatting rule.
-     * Excel allows to create up to 3 Conditional Formatting rules.
-     *
-     * @param cfRule - Conditional Formatting rule
-     */
-    @Override
-    public void addRule(ConditionalFormattingRule cfRule) {
-        XSSFConditionalFormattingRule xRule = (XSSFConditionalFormattingRule) cfRule;
-        _cf.addNewCfRule().set(xRule.getCTCfRule());
-    }
-
-    /**
-     * @return the Conditional Formatting rule at position idx.
-     */
-    @Override
-    public XSSFConditionalFormattingRule getRule(int idx) {
-        return new XSSFConditionalFormattingRule(_sh, _cf.getCfRuleArray(idx));
-    }
-
-    /**
-     * @return number of Conditional Formatting rules.
-     */
-    @Override
-    public int getNumberOfRules() {
-        return _cf.sizeOfCfRuleArray();
-    }
-
-    @Override
-    public String toString() {
-        return _cf.toString();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
deleted file mode 100644
index a639f2c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.xssf.usermodel.XSSFFontFormatting;
-import org.apache.poi.xssf.model.StylesTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.*;
-
-/**
- * XSSF suport for Conditional Formatting rules
- */
-public class XSSFConditionalFormattingRule implements ConditionalFormattingRule {
-    private final CTCfRule _cfRule;
-    private XSSFSheet _sh;
-    
-    private static Map<STCfType.Enum, ConditionType> typeLookup = new HashMap<STCfType.Enum, ConditionType>();
-    static {
-        typeLookup.put(STCfType.CELL_IS, ConditionType.CELL_VALUE_IS);
-        typeLookup.put(STCfType.EXPRESSION, ConditionType.FORMULA);
-        typeLookup.put(STCfType.COLOR_SCALE, ConditionType.COLOR_SCALE);
-        typeLookup.put(STCfType.DATA_BAR, ConditionType.DATA_BAR);
-        typeLookup.put(STCfType.ICON_SET, ConditionType.ICON_SET);
-        
-        // These are all subtypes of Filter, we think...
-        typeLookup.put(STCfType.TOP_10, ConditionType.FILTER);
-        typeLookup.put(STCfType.UNIQUE_VALUES, ConditionType.FILTER);
-        typeLookup.put(STCfType.DUPLICATE_VALUES, ConditionType.FILTER);
-        typeLookup.put(STCfType.CONTAINS_TEXT, ConditionType.FILTER);
-        typeLookup.put(STCfType.NOT_CONTAINS_TEXT, ConditionType.FILTER);
-        typeLookup.put(STCfType.BEGINS_WITH, ConditionType.FILTER);
-        typeLookup.put(STCfType.ENDS_WITH, ConditionType.FILTER);
-        typeLookup.put(STCfType.CONTAINS_BLANKS, ConditionType.FILTER);
-        typeLookup.put(STCfType.NOT_CONTAINS_BLANKS, ConditionType.FILTER);
-        typeLookup.put(STCfType.CONTAINS_ERRORS, ConditionType.FILTER);
-        typeLookup.put(STCfType.NOT_CONTAINS_ERRORS, ConditionType.FILTER);
-        typeLookup.put(STCfType.TIME_PERIOD, ConditionType.FILTER);
-        typeLookup.put(STCfType.ABOVE_AVERAGE, ConditionType.FILTER);
-    }
-    
-    /*package*/ XSSFConditionalFormattingRule(XSSFSheet sh){
-        _cfRule = CTCfRule.Factory.newInstance();
-        _sh = sh;
-    }
-
-    /*package*/ XSSFConditionalFormattingRule(XSSFSheet sh, CTCfRule cfRule){
-        _cfRule = cfRule;
-        _sh = sh;
-    }
-
-    /*package*/  CTCfRule getCTCfRule(){
-        return _cfRule;
-    }
-
-    /*package*/  CTDxf getDxf(boolean create){
-        StylesTable styles = _sh.getWorkbook().getStylesSource();
-        CTDxf dxf = null;
-        if(styles._getDXfsSize() > 0 && _cfRule.isSetDxfId()){
-            int dxfId = (int)_cfRule.getDxfId();
-            dxf = styles.getDxfAt(dxfId);
-        }
-        if(create && dxf == null) {
-            dxf = CTDxf.Factory.newInstance();
-            int dxfId = styles.putDxf(dxf);
-            _cfRule.setDxfId(dxfId - 1);
-        }
-        return dxf;
-    }
-
-    /**
-     * Create a new border formatting structure if it does not exist,
-     * otherwise just return existing object.
-     *
-     * @return - border formatting object, never returns <code>null</code>.
-     */
-    public XSSFBorderFormatting createBorderFormatting(){
-        CTDxf dxf = getDxf(true);
-        CTBorder border;
-        if(!dxf.isSetBorder()) {
-            border = dxf.addNewBorder();
-        } else {
-            border = dxf.getBorder();
-        }
-
-        return new XSSFBorderFormatting(border);
-    }
-
-    /**
-     * @return - border formatting object  if defined,  <code>null</code> otherwise
-     */
-    public XSSFBorderFormatting getBorderFormatting(){
-        CTDxf dxf = getDxf(false);
-        if(dxf == null || !dxf.isSetBorder()) return null;
-
-        return new XSSFBorderFormatting(dxf.getBorder());
-     }
-
-    /**
-     * Create a new font formatting structure if it does not exist,
-     * otherwise just return existing object.
-     *
-     * @return - font formatting object, never returns <code>null</code>.
-     */
-    public XSSFFontFormatting createFontFormatting(){
-        CTDxf dxf = getDxf(true);
-        CTFont font;
-        if(!dxf.isSetFont()) {
-            font = dxf.addNewFont();
-        } else {
-            font = dxf.getFont();
-        }
-
-        return new XSSFFontFormatting(font);
-    }
-
-    /**
-     * @return - font formatting object  if defined,  <code>null</code> otherwise
-     */
-    public XSSFFontFormatting getFontFormatting(){
-        CTDxf dxf = getDxf(false);
-        if(dxf == null || !dxf.isSetFont()) return null;
-
-        return new XSSFFontFormatting(dxf.getFont());
-    }
-
-    /**
-     * Create a new pattern formatting structure if it does not exist,
-     * otherwise just return existing object.
-     *
-     * @return - pattern formatting object, never returns <code>null</code>.
-     */
-    public XSSFPatternFormatting createPatternFormatting(){
-        CTDxf dxf = getDxf(true);
-        CTFill fill;
-        if(!dxf.isSetFill()) {
-            fill = dxf.addNewFill();
-        } else {
-            fill = dxf.getFill();
-        }
-
-        return new XSSFPatternFormatting(fill);
-    }
-
-    /**
-     * @return - pattern formatting object  if defined,  <code>null</code> otherwise
-     */
-    public XSSFPatternFormatting getPatternFormatting(){
-        CTDxf dxf = getDxf(false);
-        if(dxf == null || !dxf.isSetFill()) return null;
-
-        return new XSSFPatternFormatting(dxf.getFill());
-    }
-    
-    public XSSFDataBarFormatting createDataBarFormatting(XSSFColor color) {
-        // Is it already there?
-        if (_cfRule.isSetDataBar() && _cfRule.getType() == STCfType.DATA_BAR)
-            return getDataBarFormatting();
-        
-        // Mark it as being a Data Bar
-        _cfRule.setType(STCfType.DATA_BAR);
-
-        // Ensure the right element
-        CTDataBar bar = null;
-        if (_cfRule.isSetDataBar()) {
-            bar = _cfRule.getDataBar();
-        } else {
-            bar = _cfRule.addNewDataBar();
-        }
-        // Set the color
-        bar.setColor(color.getCTColor());
-        
-        // Add the default thresholds
-        CTCfvo min = bar.addNewCfvo();
-        min.setType(STCfvoType.Enum.forString(RangeType.MIN.name));
-        CTCfvo max = bar.addNewCfvo();
-        max.setType(STCfvoType.Enum.forString(RangeType.MAX.name));
-        
-        // Wrap and return
-        return new XSSFDataBarFormatting(bar);
-    }
-    public XSSFDataBarFormatting getDataBarFormatting() {
-        if (_cfRule.isSetDataBar()) {
-            CTDataBar bar = _cfRule.getDataBar();
-            return new XSSFDataBarFormatting(bar);
-        } else {
-            return null;
-        }
-    }
-    
-    public XSSFIconMultiStateFormatting createMultiStateFormatting(IconSet iconSet) {
-        // Is it already there?
-        if (_cfRule.isSetIconSet() && _cfRule.getType() == STCfType.ICON_SET)
-            return getMultiStateFormatting();
-        
-        // Mark it as being an Icon Set
-        _cfRule.setType(STCfType.ICON_SET);
-
-        // Ensure the right element
-        CTIconSet icons = null;
-        if (_cfRule.isSetIconSet()) {
-            icons = _cfRule.getIconSet();
-        } else {
-            icons = _cfRule.addNewIconSet();
-        }
-        // Set the type of the icon set
-        if (iconSet.name != null) {
-            STIconSetType.Enum xIconSet = STIconSetType.Enum.forString(iconSet.name);
-            icons.setIconSet(xIconSet);
-        }
-        
-        // Add a default set of thresholds
-        int jump = 100 / iconSet.num;
-        STCfvoType.Enum type = STCfvoType.Enum.forString(RangeType.PERCENT.name);
-        for (int i=0; i<iconSet.num; i++) {
-            CTCfvo cfvo = icons.addNewCfvo();
-            cfvo.setType(type);
-            cfvo.setVal(Integer.toString(i*jump));
-        }
-        
-        // Wrap and return
-        return new XSSFIconMultiStateFormatting(icons);
-    }
-    public XSSFIconMultiStateFormatting getMultiStateFormatting() {
-        if (_cfRule.isSetIconSet()) {
-            CTIconSet icons = _cfRule.getIconSet();
-            return new XSSFIconMultiStateFormatting(icons);
-        } else {
-            return null;
-        }
-    }
-    
-    public XSSFColorScaleFormatting createColorScaleFormatting() {
-        // Is it already there?
-        if (_cfRule.isSetColorScale() && _cfRule.getType() == STCfType.COLOR_SCALE)
-            return getColorScaleFormatting();
-        
-        // Mark it as being a Color Scale
-        _cfRule.setType(STCfType.COLOR_SCALE);
-
-        // Ensure the right element
-        CTColorScale scale = null;
-        if (_cfRule.isSetColorScale()) {
-            scale = _cfRule.getColorScale();
-        } else {
-            scale = _cfRule.addNewColorScale();
-        }
-        
-        // Add a default set of thresholds and colors
-        if (scale.sizeOfCfvoArray() == 0) {
-            CTCfvo cfvo;
-            cfvo = scale.addNewCfvo();
-            cfvo.setType(STCfvoType.Enum.forString(RangeType.MIN.name));
-            cfvo = scale.addNewCfvo();
-            cfvo.setType(STCfvoType.Enum.forString(RangeType.PERCENTILE.name));
-            cfvo.setVal("50");
-            cfvo = scale.addNewCfvo();
-            cfvo.setType(STCfvoType.Enum.forString(RangeType.MAX.name));
-            
-            for (int i=0; i<3; i++) {
-                scale.addNewColor();
-            }
-        }
-        
-        // Wrap and return
-        return new XSSFColorScaleFormatting(scale);
-    }
-    public XSSFColorScaleFormatting getColorScaleFormatting() {
-        if (_cfRule.isSetColorScale()) {
-            CTColorScale scale = _cfRule.getColorScale();
-            return new XSSFColorScaleFormatting(scale);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Type of conditional formatting rule.
-     */
-    @Override
-    public ConditionType getConditionType() {
-        return typeLookup.get(_cfRule.getType());
-    }
-
-    /**
-     * The comparison function used when the type of conditional formatting is set to
-     * {@link ConditionType#CELL_VALUE_IS}
-     * <p>
-     *     MUST be a constant from {@link org.apache.poi.ss.usermodel.ComparisonOperator}
-     * </p>
-     *
-     * @return the conditional format operator
-     */
-    @Override
-    public byte getComparisonOperation(){
-        STConditionalFormattingOperator.Enum op = _cfRule.getOperator();
-        if(op == null) return ComparisonOperator.NO_COMPARISON;
-        
-        switch(op.intValue()){
-            case STConditionalFormattingOperator.INT_LESS_THAN: return ComparisonOperator.LT;
-            case STConditionalFormattingOperator.INT_LESS_THAN_OR_EQUAL: return ComparisonOperator.LE;
-            case STConditionalFormattingOperator.INT_GREATER_THAN: return ComparisonOperator.GT;
-            case STConditionalFormattingOperator.INT_GREATER_THAN_OR_EQUAL: return ComparisonOperator.GE;
-            case STConditionalFormattingOperator.INT_EQUAL: return ComparisonOperator.EQUAL;
-            case STConditionalFormattingOperator.INT_NOT_EQUAL: return ComparisonOperator.NOT_EQUAL;
-            case STConditionalFormattingOperator.INT_BETWEEN: return ComparisonOperator.BETWEEN;
-            case STConditionalFormattingOperator.INT_NOT_BETWEEN: return ComparisonOperator.NOT_BETWEEN;
-        }
-        return ComparisonOperator.NO_COMPARISON;
-    }
-
-    /**
-     * The formula used to evaluate the first operand for the conditional formatting rule.
-     * <p>
-     * If the condition type is {@link ConditionType#CELL_VALUE_IS},
-     * this field is the first operand of the comparison.
-     * If type is {@link ConditionType#FORMULA}, this formula is used
-     * to determine if the conditional formatting is applied.
-     * </p>
-     * <p>
-     * If comparison type is {@link ConditionType#FORMULA} the formula MUST be a Boolean function
-     * </p>
-     *
-     * @return  the first formula
-     */
-    public String getFormula1(){
-        return _cfRule.sizeOfFormulaArray() > 0 ? _cfRule.getFormulaArray(0) : null;
-    }
-
-    /**
-     * The formula used to evaluate the second operand of the comparison when
-     * comparison type is  {@link ConditionType#CELL_VALUE_IS} and operator
-     * is either {@link org.apache.poi.ss.usermodel.ComparisonOperator#BETWEEN} or {@link org.apache.poi.ss.usermodel.ComparisonOperator#NOT_BETWEEN}
-     *
-     * @return  the second formula
-     */
-    public String getFormula2(){
-        return _cfRule.sizeOfFormulaArray() == 2 ? _cfRule.getFormulaArray(1) : null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
deleted file mode 100644
index bfdd878..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCfvo;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCfvoType;
-
-/**
- * High level representation for Icon / Multi-State / Databar /
- *  Colour Scale change thresholds
- */
-public class XSSFConditionalFormattingThreshold implements org.apache.poi.ss.usermodel.ConditionalFormattingThreshold {
-    private CTCfvo cfvo;
-    
-    protected XSSFConditionalFormattingThreshold(CTCfvo cfvo) {
-        this.cfvo = cfvo;
-    }
-    
-    protected CTCfvo getCTCfvo() {
-        return cfvo;
-    }
-
-    public RangeType getRangeType() {
-        return RangeType.byName(cfvo.getType().toString());
-    }
-    public void setRangeType(RangeType type) {
-        STCfvoType.Enum xtype = STCfvoType.Enum.forString(type.name);
-        cfvo.setType(xtype);
-    }
-
-    public String getFormula() {
-        if (cfvo.getType() == STCfvoType.FORMULA) {
-            return cfvo.getVal();
-        }
-        return null;
-    }
-    public void setFormula(String formula) {
-        cfvo.setVal(formula);
-    }
-
-    public Double getValue() {
-        if (cfvo.getType() == STCfvoType.FORMULA ||
-            cfvo.getType() == STCfvoType.MIN ||
-            cfvo.getType() == STCfvoType.MAX) {
-            return null;
-        }
-        if (cfvo.isSetVal()) {
-            return Double.parseDouble(cfvo.getVal());
-        } else {
-            return null;
-        }
-    }
-    public void setValue(Double value) {
-        if (value == null) {
-            cfvo.unsetVal();
-        } else {
-            cfvo.setVal(value.toString());
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
deleted file mode 100644
index 7dab16c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTFontReference;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeStyle;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTStyleMatrixReference;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.STFontCollectionIndex;
-import org.openxmlformats.schemas.drawingml.x2006.main.STSchemeColorVal;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTConnector;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTConnectorNonVisual;
-import org.apache.poi.util.Internal;
-
-/**
- * A connection shape drawing element. A connection shape is a line, etc.
- * that connects two other shapes in this drawing.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFConnector extends XSSFShape {
-
-    private static CTConnector prototype = null;
-
-    private CTConnector ctShape;
-
-    /**
-     * Construct a new XSSFConnector object.
-     *
-     * @param drawing the XSSFDrawing that owns this shape
-     * @param ctShape the shape bean that holds all the shape properties
-     */
-    protected XSSFConnector(XSSFDrawing drawing, CTConnector ctShape) {
-        this.drawing = drawing;
-        this.ctShape = ctShape;
-    }
-
-    /**
-     * Initialize default structure of a new auto-shape
-     *
-     */
-    protected static CTConnector prototype() {
-        if(prototype == null) {
-            CTConnector shape = CTConnector.Factory.newInstance();
-            CTConnectorNonVisual nv = shape.addNewNvCxnSpPr();
-            CTNonVisualDrawingProps nvp = nv.addNewCNvPr();
-            nvp.setId(1);
-            nvp.setName("Shape 1");
-            nv.addNewCNvCxnSpPr();
-
-            CTShapeProperties sp = shape.addNewSpPr();
-            CTTransform2D t2d = sp.addNewXfrm();
-            CTPositiveSize2D p1 = t2d.addNewExt();
-            p1.setCx(0);
-            p1.setCy(0);
-            CTPoint2D p2 = t2d.addNewOff();
-            p2.setX(0);
-            p2.setY(0);
-
-            CTPresetGeometry2D geom = sp.addNewPrstGeom();
-            geom.setPrst(STShapeType.LINE);
-            geom.addNewAvLst();
-
-            CTShapeStyle style = shape.addNewStyle();
-            CTSchemeColor scheme = style.addNewLnRef().addNewSchemeClr();
-            scheme.setVal(STSchemeColorVal.ACCENT_1);
-            style.getLnRef().setIdx(1);
-
-            CTStyleMatrixReference fillref = style.addNewFillRef();
-            fillref.setIdx(0);
-            fillref.addNewSchemeClr().setVal(STSchemeColorVal.ACCENT_1);
-
-            CTStyleMatrixReference effectRef = style.addNewEffectRef();
-            effectRef.setIdx(0);
-            effectRef.addNewSchemeClr().setVal(STSchemeColorVal.ACCENT_1);
-
-            CTFontReference fontRef = style.addNewFontRef();
-            fontRef.setIdx(STFontCollectionIndex.MINOR);
-            fontRef.addNewSchemeClr().setVal(STSchemeColorVal.TX_1);
-
-            prototype = shape;
-        }
-        return prototype;
-    }
-
-    @Internal
-    public CTConnector getCTConnector(){
-        return ctShape;
-    }
-
-    /**
-     * Gets the shape type, one of the constants defined in {@link org.apache.poi.ss.usermodel.ShapeTypes}.
-     *
-     * @return the shape type
-     * @see org.apache.poi.ss.usermodel.ShapeTypes
-     */
-    public int getShapeType() {
-        return ctShape.getSpPr().getPrstGeom().getPrst().intValue();
-    }
-
-    /**
-     * Sets the shape types.
-     *
-     * @param type the shape type, one of the constants defined in {@link org.apache.poi.ss.usermodel.ShapeTypes}.
-     * @see org.apache.poi.ss.usermodel.ShapeTypes
-     */
-    public void setShapeType(int type) {
-        ctShape.getSpPr().getPrstGeom().setPrst(STShapeType.Enum.forInt(type));
-    }
-
-    protected CTShapeProperties getShapeProperties(){
-        return ctShape.getSpPr();
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
deleted file mode 100644
index cb11a73..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-
-public class XSSFCreationHelper implements CreationHelper {
-    private final XSSFWorkbook workbook;
-
-    /**
-     * Should only be called by {@link XSSFWorkbook#getCreationHelper()}
-     *
-     * @param wb the workbook to create objects for
-     */
-    @Internal
-    public XSSFCreationHelper(XSSFWorkbook wb) {
-        workbook = wb;
-    }
-
-    /**
-     * Creates a new XSSFRichTextString for you.
-     */
-    @Override
-    public XSSFRichTextString createRichTextString(String text) {
-        XSSFRichTextString rt = new XSSFRichTextString(text);
-        rt.setStylesTableReference(workbook.getStylesSource());
-        return rt;
-    }
-
-    @Override
-    public XSSFDataFormat createDataFormat() {
-        return workbook.createDataFormat();
-    }
-
-    @Override
-    public XSSFColor createExtendedColor() {
-        return new XSSFColor();
-    }
-
-    /**
-     * Create a new XSSFHyperlink.
-     *
-     * @param type - the type of hyperlink to create, see {@link HyperlinkType}
-     * @deprecated POI 3.15 beta 3. Use {@link #createHyperlink(HyperlinkType)} instead.
-     */
-    @Deprecated
-    @Removal(version="3.17")
-    @Override
-    public XSSFHyperlink createHyperlink(int type) {
-        return new XSSFHyperlink(type);
-    }
-    
-    /**
-     * Create a new XSSFHyperlink.
-     *
-     * @param type - the type of hyperlink to create, see {@link Hyperlink}
-     */
-    @Override
-    public XSSFHyperlink createHyperlink(HyperlinkType type) {
-        return new XSSFHyperlink(type);
-    }
-
-    /**
-     * Creates a XSSFFormulaEvaluator, the object that evaluates formula cells.
-     *
-     * @return a XSSFFormulaEvaluator instance
-     */
-    @Override
-    public XSSFFormulaEvaluator createFormulaEvaluator() {
-        return new XSSFFormulaEvaluator(workbook);
-    }
-
-    /**
-     * Creates a XSSFClientAnchor. Use this object to position drawing object in
-     * a sheet
-     *
-     * @return a XSSFClientAnchor instance
-     * @see org.apache.poi.ss.usermodel.Drawing
-     */
-    @Override
-    public XSSFClientAnchor createClientAnchor() {
-        return new XSSFClientAnchor();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
deleted file mode 100644
index bc7b9cf..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.ss.usermodel.DataBarFormatting;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDataBar;
-
-/**
- * High level representation for DataBar / Data Bar Formatting 
- *  component of Conditional Formatting settings
- */
-public class XSSFDataBarFormatting implements DataBarFormatting {
-    CTDataBar _databar;
-
-    /*package*/ XSSFDataBarFormatting(CTDataBar databar){
-        _databar = databar;
-    }
-
-    public boolean isIconOnly() {
-        if (_databar.isSetShowValue())
-            return !_databar.getShowValue();
-        return false;
-    }
-    public void setIconOnly(boolean only) {
-        _databar.setShowValue(!only);
-    }
-
-    public boolean isLeftToRight() {
-        return true;
-    }
-    public void setLeftToRight(boolean ltr) {
-        // TODO How does XSSF encode this?
-    }
-
-    public int getWidthMin() {
-        return 0;
-    }
-    public void setWidthMin(int width) {
-        // TODO How does XSSF encode this?
-    }
-
-    public int getWidthMax() {
-        return 100;
-    }
-    public void setWidthMax(int width) {
-        // TODO How does XSSF encode this?
-    }
-
-    public XSSFColor getColor() {
-        return new XSSFColor(_databar.getColor());
-    }
-    public void setColor(Color color) {
-        _databar.setColor( ((XSSFColor)color).getCTColor() );
-    }
-
-    public XSSFConditionalFormattingThreshold getMinThreshold() {
-        return new XSSFConditionalFormattingThreshold(_databar.getCfvoArray(0));
-    }
-    public XSSFConditionalFormattingThreshold getMaxThreshold() {
-        return new XSSFConditionalFormattingThreshold(_databar.getCfvoArray(1));
-    }
-
-    public XSSFConditionalFormattingThreshold createThreshold() {
-        return new XSSFConditionalFormattingThreshold(_databar.addNewCfvo());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
deleted file mode 100644
index d825245..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.util.Removal;
-import org.apache.poi.xssf.model.StylesTable;
-
-/**
- * Handles data formats for XSSF.
- * 
- * Per Microsoft Excel 2007+ format limitations:
- * Workbooks support between 200 and 250 "number formats"
- * (POI calls them "data formats") So short or even byte
- * would be acceptable data types to use for referring to
- * data format indices.
- * https://support.office.com/en-us/article/excel-specifications-and-limits-1672b34d-7043-467e-8e27-269d656771c3
- * 
- */
-public class XSSFDataFormat implements DataFormat {
-    private final StylesTable stylesSource;
-
-    protected XSSFDataFormat(StylesTable stylesSource) {
-        this.stylesSource = stylesSource;
-    }
-
-    /**
-     * Get the format index that matches the given format
-     *  string, creating a new format entry if required.
-     * Aliases text to the proper format as required.
-     *
-     * @param format string matching a built-in format
-     * @return index of format.
-     */
-    @Override
-    public short getFormat(String format) {
-        int idx = BuiltinFormats.getBuiltinFormat(format);
-        if(idx == -1) idx = stylesSource.putNumberFormat(format);
-        return (short)idx;
-    }
-
-    /**
-     * get the format string that matches the given format index
-     * @param index of a format
-     * @return string represented at index of format or <code>null</code> if there is not a  format at that index
-     */
-    @Override
-    public String getFormat(short index) {
-        // Indices used for built-in formats may be overridden with
-        // custom formats, such as locale-specific currency.
-        // See org.apache.poi.xssf.usermodel.TestXSSFDataFormat#test49928() 
-        // or bug 49928 for an example.
-        // This is why we need to check stylesSource first and only fall back to
-        // BuiltinFormats if the format hasn't been overridden.
-        String fmt = stylesSource.getNumberFormatAt(index);
-        if(fmt == null) fmt = BuiltinFormats.getBuiltinFormat(index);
-        return fmt;
-    }
-    /**
-     * get the format string that matches the given format index
-     * @param index of a format
-     * @return string represented at index of format or <code>null</code> if there is not a  format at that index
-     * 
-     * @deprecated POI 3.16 beta 1 - use {@link #getFormat(short)} instead
-     */
-    @Removal(version="3.18")
-    public String getFormat(int index) {
-        return getFormat((short)index);
-    }
-    
-    /**
-     * Add a number format with a specific ID into the number format style table.
-     * If a format with the same ID already exists, overwrite the format code
-     * with <code>fmt</code>
-     * This may be used to override built-in number formats.
-     *
-     * @param index the number format ID
-     * @param format the number format code
-     */
-    public void putFormat(short index, String format) {
-        stylesSource.putNumberFormat(index, format);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
deleted file mode 100644
index c204e86..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDataValidation;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationErrorStyle;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationOperator;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationType;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationOperator.Enum;
-
-/**
- * @author <a href="rjankiraman@emptoris.com">Radhakrishnan J</a>
- *
- */
-public class XSSFDataValidation implements DataValidation {
-	private CTDataValidation ctDdataValidation;
-	private XSSFDataValidationConstraint validationConstraint;
-	private CellRangeAddressList regions;
-
-    static Map<Integer,STDataValidationOperator.Enum> operatorTypeMappings = new HashMap<Integer,STDataValidationOperator.Enum>();
-	static Map<STDataValidationOperator.Enum,Integer> operatorTypeReverseMappings = new HashMap<STDataValidationOperator.Enum,Integer>();
-	static Map<Integer,STDataValidationType.Enum> validationTypeMappings = new HashMap<Integer,STDataValidationType.Enum>();
-	static Map<STDataValidationType.Enum,Integer> validationTypeReverseMappings = new HashMap<STDataValidationType.Enum,Integer>();
-    static Map<Integer,STDataValidationErrorStyle.Enum> errorStyleMappings = new HashMap<Integer,STDataValidationErrorStyle.Enum>();
-    static {
-		errorStyleMappings.put(DataValidation.ErrorStyle.INFO, STDataValidationErrorStyle.INFORMATION);
-		errorStyleMappings.put(DataValidation.ErrorStyle.STOP, STDataValidationErrorStyle.STOP);
-		errorStyleMappings.put(DataValidation.ErrorStyle.WARNING, STDataValidationErrorStyle.WARNING);
-    }
-	
-    
-	static {
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.BETWEEN,STDataValidationOperator.BETWEEN);
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.NOT_BETWEEN,STDataValidationOperator.NOT_BETWEEN);
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.EQUAL,STDataValidationOperator.EQUAL);
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.NOT_EQUAL,STDataValidationOperator.NOT_EQUAL);
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.GREATER_THAN,STDataValidationOperator.GREATER_THAN);    	
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.GREATER_OR_EQUAL,STDataValidationOperator.GREATER_THAN_OR_EQUAL);
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.LESS_THAN,STDataValidationOperator.LESS_THAN);    	
-		operatorTypeMappings.put(DataValidationConstraint.OperatorType.LESS_OR_EQUAL,STDataValidationOperator.LESS_THAN_OR_EQUAL);
-		
-		for( Map.Entry<Integer,STDataValidationOperator.Enum> entry : operatorTypeMappings.entrySet() ) {
-			operatorTypeReverseMappings.put(entry.getValue(),entry.getKey());
-		}
-	}
-
-	static {
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.FORMULA,STDataValidationType.CUSTOM);
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.DATE,STDataValidationType.DATE);
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.DECIMAL,STDataValidationType.DECIMAL);    	
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.LIST,STDataValidationType.LIST); 
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.ANY,STDataValidationType.NONE);
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.TEXT_LENGTH,STDataValidationType.TEXT_LENGTH);
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.TIME,STDataValidationType.TIME);  
-		validationTypeMappings.put(DataValidationConstraint.ValidationType.INTEGER,STDataValidationType.WHOLE);
-		
-		for( Map.Entry<Integer,STDataValidationType.Enum> entry : validationTypeMappings.entrySet() ) {
-			validationTypeReverseMappings.put(entry.getValue(),entry.getKey());
-		}
-	}
-
-	
-	XSSFDataValidation(CellRangeAddressList regions,CTDataValidation ctDataValidation) {
-	    this(getConstraint(ctDataValidation), regions, ctDataValidation);
-	}	
-
-	public XSSFDataValidation(XSSFDataValidationConstraint constraint,CellRangeAddressList regions,CTDataValidation ctDataValidation) {
-		super();
-		this.validationConstraint = constraint;
-		this.ctDdataValidation = ctDataValidation;
-		this.regions = regions;
-	}
- 
-	CTDataValidation getCtDdataValidation() {
-		return ctDdataValidation;
-	}
-
-
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#createErrorBox(java.lang.String, java.lang.String)
-	 */
-	public void createErrorBox(String title, String text) {
-		ctDdataValidation.setErrorTitle(title);
-		ctDdataValidation.setError(text);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#createPromptBox(java.lang.String, java.lang.String)
-	 */
-	public void createPromptBox(String title, String text) {
-		ctDdataValidation.setPromptTitle(title);
-		ctDdataValidation.setPrompt(text);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getEmptyCellAllowed()
-	 */
-	public boolean getEmptyCellAllowed() {
-		return ctDdataValidation.getAllowBlank();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getErrorBoxText()
-	 */
-	public String getErrorBoxText() {
-		return ctDdataValidation.getError();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getErrorBoxTitle()
-	 */
-	public String getErrorBoxTitle() {
-		return ctDdataValidation.getErrorTitle();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getErrorStyle()
-	 */
-	public int getErrorStyle() {
-		return ctDdataValidation.getErrorStyle().intValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getPromptBoxText()
-	 */
-	public String getPromptBoxText() {
-		return ctDdataValidation.getPrompt();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getPromptBoxTitle()
-	 */
-	public String getPromptBoxTitle() {
-		return ctDdataValidation.getPromptTitle();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getShowErrorBox()
-	 */
-	public boolean getShowErrorBox() {
-		return ctDdataValidation.getShowErrorMessage();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getShowPromptBox()
-	 */
-	public boolean getShowPromptBox() {
-		return ctDdataValidation.getShowInputMessage();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getSuppressDropDownArrow()
-	 */
-	public boolean getSuppressDropDownArrow() {
-		return !ctDdataValidation.getShowDropDown();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#getValidationConstraint()
-	 */
-	public DataValidationConstraint getValidationConstraint() {
-		return validationConstraint;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#setEmptyCellAllowed(boolean)
-	 */
-	public void setEmptyCellAllowed(boolean allowed) {
-		ctDdataValidation.setAllowBlank(allowed);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#setErrorStyle(int)
-	 */
-	public void setErrorStyle(int errorStyle) {
-		ctDdataValidation.setErrorStyle(errorStyleMappings.get(errorStyle));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#setShowErrorBox(boolean)
-	 */
-	public void setShowErrorBox(boolean show) {
-		ctDdataValidation.setShowErrorMessage(show);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#setShowPromptBox(boolean)
-	 */
-	public void setShowPromptBox(boolean show) {
-		ctDdataValidation.setShowInputMessage(show);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidation#setSuppressDropDownArrow(boolean)
-	 */
-	public void setSuppressDropDownArrow(boolean suppress) {
-		if (validationConstraint.getValidationType()==ValidationType.LIST) {
-			ctDdataValidation.setShowDropDown(!suppress);
-		}
-	}
-
-	public CellRangeAddressList getRegions() {
-		return regions;
-	}
-	
-	public String prettyPrint() {
-		StringBuilder builder = new StringBuilder();
-		for(CellRangeAddress address : regions.getCellRangeAddresses()) {
-			builder.append(address.formatAsString());
-		}
-		builder.append(" => ");
-		builder.append(this.validationConstraint.prettyPrint());	
-		return builder.toString();
-	}
-	
-    private static XSSFDataValidationConstraint getConstraint(CTDataValidation ctDataValidation) {
-    	XSSFDataValidationConstraint constraint = null;
-    	String formula1 = ctDataValidation.getFormula1();
-    	String formula2 = ctDataValidation.getFormula2();
-    	Enum operator = ctDataValidation.getOperator();
-    	org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationType.Enum type = ctDataValidation.getType();
-		Integer validationType = XSSFDataValidation.validationTypeReverseMappings.get(type);
-		Integer operatorType = XSSFDataValidation.operatorTypeReverseMappings.get(operator);
-		constraint = new XSSFDataValidationConstraint(validationType,operatorType, formula1,formula2);
-    	return constraint;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
deleted file mode 100644
index d42641e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationType;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationOperator.Enum;
-
-/**
- * @author <a href="rjankiraman@emptoris.com">Radhakrishnan J</a>
- *
- */
-public class XSSFDataValidationConstraint implements DataValidationConstraint {
-    /**
-     * Excel validation constraints with static lists are delimited with optional whitespace and the Windows List Separator,
-     * which is typically comma, but can be changed by users.  POI will just assume comma.
-     */
-    private static final String LIST_SEPARATOR = ",";
-    private static final Pattern LIST_SPLIT_REGEX = Pattern.compile("\\s*" + LIST_SEPARATOR + "\\s*");
-    private static final String QUOTE = "\"";
-    
-	private String formula1;
-	private String formula2;
-	private int validationType = -1;
-	private int operator = -1;
-	private String[] explicitListOfValues;
-
-	/**
-	 * list literal constructor
-	 */
-	public XSSFDataValidationConstraint(String[] explicitListOfValues) {
-		if( explicitListOfValues==null || explicitListOfValues.length==0) {
-			throw new IllegalArgumentException("List validation with explicit values must specify at least one value");
-		}
-		this.validationType = ValidationType.LIST;
-		setExplicitListValues(explicitListOfValues);
-		
-		validate();
-	}
-	
-	public XSSFDataValidationConstraint(int validationType, String formula1) {
-		super();
-		setFormula1(formula1);
-		this.validationType = validationType;
-		validate();
-	}
-
-
-
-	public XSSFDataValidationConstraint(int validationType, int operator, String formula1) {
-		super();
-		setFormula1(formula1);
-		this.validationType = validationType;
-		this.operator = operator;
-		validate();
-	}
-
-	/**
-	 * This is the constructor called using the OOXML raw data.  Excel overloads formula1 to also encode explicit value lists,
-	 * so this constructor has to check for and parse that syntax.
-	 * @param validationType
-	 * @param operator
-	 * @param formula1 Overloaded: formula1 or list of explicit values
-	 * @param formula2 (formula1 is a list of explicit values, this is ignored: use <code>null</code>)
-	 */
-	public XSSFDataValidationConstraint(int validationType, int operator, String formula1, String formula2) {
-		super();
-		//removes leading equals sign if present
-		setFormula1(formula1);
-		setFormula2(formula2);
-		this.validationType = validationType;
-		this.operator = operator;
-		
-		validate();
-		
-		//FIXME: Need to confirm if this is not a formula.
-		// empirical testing shows Excel saves explicit lists surrounded by double quotes, 
-		// range formula expressions can't start with quotes (I think - anyone have a creative counter example?)
-		if ( ValidationType.LIST == validationType
-				&& this.formula1 != null
-				&& isQuoted(this.formula1) ) {
-			explicitListOfValues = LIST_SPLIT_REGEX.split(unquote(this.formula1));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#getExplicitListValues()
-	 */
-	public String[] getExplicitListValues() {
-		return explicitListOfValues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#getFormula1()
-	 */
-	public String getFormula1() {
-		return formula1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#getFormula2()
-	 */
-	public String getFormula2() {
-		return formula2;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#getOperator()
-	 */
-	public int getOperator() {
-		return operator;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#getValidationType()
-	 */
-	public int getValidationType() {
-		return validationType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#setExplicitListValues(java.lang.String[])
-	 */
-	public void setExplicitListValues(String[] explicitListValues) {
-		this.explicitListOfValues = explicitListValues;
-		
-		// for OOXML we need to set formula1 to the quoted csv list of values (doesn't appear documented, but that's where Excel puts its lists)
-		// further, Excel has no escaping for commas in explicit lists, so we don't need to worry about that.
-		if ( explicitListOfValues!=null && explicitListOfValues.length > 0 ) {
-			StringBuilder builder = new StringBuilder(QUOTE);
-			for (int i = 0; i < explicitListValues.length; i++) {
-				String string = explicitListValues[i];
-				if (builder.length() > 1) {
-					builder.append(LIST_SEPARATOR);
-				}
-				builder.append(string);
-			}
-			builder.append(QUOTE);
-			setFormula1(builder.toString());			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#setFormula1(java.lang.String)
-	 */
-	public void setFormula1(String formula1) {
-		this.formula1 = removeLeadingEquals(formula1);
-	}
-
-	protected static String removeLeadingEquals(String formula1) {
-		return isFormulaEmpty(formula1) ? formula1 : formula1.charAt(0)=='=' ? formula1.substring(1) : formula1;
-	}
-	private static boolean isQuoted(String s) {
-		return s.startsWith(QUOTE) && s.endsWith(QUOTE);
-	}
-	private static String unquote(String s) {
-		// removes leading and trailing quotes from a quoted string
-		if (isQuoted(s)) {
-			return s.substring(1, s.length()-1);
-		}
-		return s;
-	}
-	protected static boolean isFormulaEmpty(String formula1) {
-		return formula1 == null || formula1.trim().length()==0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#setFormula2(java.lang.String)
-	 */
-	public void setFormula2(String formula2) {
-		this.formula2 = removeLeadingEquals(formula2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationConstraint#setOperator(int)
-	 */
-	public void setOperator(int operator) {
-		this.operator = operator;
-	}
-
-	public void validate() {
-		if (validationType==ValidationType.ANY) {
-			return;
-		}
-		
-		if (validationType==ValidationType.LIST ) {
-			if (isFormulaEmpty(formula1)) {
-				throw new IllegalArgumentException("A valid formula or a list of values must be specified for list validation.");
-			}
-		} else  {
-			if( isFormulaEmpty(formula1) ) {
-				throw new IllegalArgumentException("Formula is not specified. Formula is required for all validation types except explicit list validation.");
-			}
-			
-			if( validationType!= ValidationType.FORMULA ) {
-				if (operator==-1) {
-					throw new IllegalArgumentException("This validation type requires an operator to be specified.");
-				} else if (( operator==OperatorType.BETWEEN || operator==OperatorType.NOT_BETWEEN) && isFormulaEmpty(formula2)) {
-					throw new IllegalArgumentException("Between and not between comparisons require two formulae to be specified.");
-				}
-			}
-		}
-	}
-
-	
-	public String prettyPrint() {
-		StringBuilder builder = new StringBuilder();
-		STDataValidationType.Enum vt = XSSFDataValidation.validationTypeMappings.get(validationType);
-		Enum ot = XSSFDataValidation.operatorTypeMappings.get(operator);
-		builder.append(vt);
-		builder.append(' ');
-		if (validationType!=ValidationType.ANY) {
-			if (validationType != ValidationType.LIST
-					&& validationType != ValidationType.FORMULA) {
-				builder.append(LIST_SEPARATOR).append(ot).append(", ");
-			}
-			final String NOQUOTE = "";
-			if (validationType == ValidationType.LIST && explicitListOfValues != null) {
-				builder.append(NOQUOTE).append(Arrays.asList(explicitListOfValues)).append(NOQUOTE).append(' ');
-			} else {
-				builder.append(NOQUOTE).append(formula1).append(NOQUOTE).append(' ');
-			}
-			if (formula2 != null) {
-				builder.append(NOQUOTE).append(formula2).append(NOQUOTE).append(' ');
-			}
-		}
-		return builder.toString();
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
deleted file mode 100644
index 8f7908d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDataValidation;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationErrorStyle;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationOperator;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationType;
-
-/**
- * @author <a href="rjankiraman@emptoris.com">Radhakrishnan J</a>
- *
- */
-public class XSSFDataValidationHelper implements DataValidationHelper {
-	// Findbugs: URF_UNREAD_FIELD. Do not delete without understanding how this class works.
-	//private XSSFSheet xssfSheet;
-	
-    
-    public XSSFDataValidationHelper(XSSFSheet xssfSheet) {
-		super();
-		// Findbugs: URF_UNREAD_FIELD. Do not delete without understanding how this class works.
-		//this.xssfSheet = xssfSheet;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createDateConstraint(int, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createDateConstraint(int operatorType, String formula1, String formula2, String dateFormat) {
-		return new XSSFDataValidationConstraint(ValidationType.DATE, operatorType,formula1, formula2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createDecimalConstraint(int, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createDecimalConstraint(int operatorType, String formula1, String formula2) {
-		return new XSSFDataValidationConstraint(ValidationType.DECIMAL, operatorType,formula1, formula2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createExplicitListConstraint(java.lang.String[])
-	 */
-	public DataValidationConstraint createExplicitListConstraint(String[] listOfValues) {
-		return new XSSFDataValidationConstraint(listOfValues);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createFormulaListConstraint(java.lang.String)
-	 */
-	public DataValidationConstraint createFormulaListConstraint(String listFormula) {
-		return new XSSFDataValidationConstraint(ValidationType.LIST, listFormula);
-	}
-
-	
-	
-	public DataValidationConstraint createNumericConstraint(int validationType, int operatorType, String formula1, String formula2) {
-		if( validationType==ValidationType.INTEGER) {
-			return createIntegerConstraint(operatorType, formula1, formula2);
-		} else if ( validationType==ValidationType.DECIMAL) {
-			return createDecimalConstraint(operatorType, formula1, formula2);
-		} else if ( validationType==ValidationType.TEXT_LENGTH) {
-			return createTextLengthConstraint(operatorType, formula1, formula2);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createIntegerConstraint(int, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createIntegerConstraint(int operatorType, String formula1, String formula2) {
-		return new XSSFDataValidationConstraint(ValidationType.INTEGER, operatorType,formula1,formula2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createTextLengthConstraint(int, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createTextLengthConstraint(int operatorType, String formula1, String formula2) {
-		return new XSSFDataValidationConstraint(ValidationType.TEXT_LENGTH, operatorType,formula1,formula2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createTimeConstraint(int, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public DataValidationConstraint createTimeConstraint(int operatorType, String formula1, String formula2) {
-		return new XSSFDataValidationConstraint(ValidationType.TIME, operatorType,formula1,formula2);
-	}
-
-	public DataValidationConstraint createCustomConstraint(String formula) {
-		return new XSSFDataValidationConstraint(ValidationType.FORMULA, formula);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.poi.ss.usermodel.DataValidationHelper#createValidation(org.apache.poi.ss.usermodel.DataValidationConstraint, org.apache.poi.ss.util.CellRangeAddressList)
-	 */
-	public DataValidation createValidation(DataValidationConstraint constraint, CellRangeAddressList cellRangeAddressList) {
-		XSSFDataValidationConstraint dataValidationConstraint = (XSSFDataValidationConstraint)constraint;
-		CTDataValidation newDataValidation = CTDataValidation.Factory.newInstance();
-
-		int validationType = constraint.getValidationType();
-		switch(validationType) {
-			case DataValidationConstraint.ValidationType.LIST:
-		    	newDataValidation.setType(STDataValidationType.LIST);
-				newDataValidation.setFormula1(constraint.getFormula1());				
-		    	break;
-			case DataValidationConstraint.ValidationType.ANY:				
-				newDataValidation.setType(STDataValidationType.NONE);				
-				break;
-			case DataValidationConstraint.ValidationType.TEXT_LENGTH:
-				newDataValidation.setType(STDataValidationType.TEXT_LENGTH);
-				break;				
-			case DataValidationConstraint.ValidationType.DATE:
-				newDataValidation.setType(STDataValidationType.DATE);
-				break;				
-			case DataValidationConstraint.ValidationType.INTEGER:
-				newDataValidation.setType(STDataValidationType.WHOLE);
-				break;				
-			case DataValidationConstraint.ValidationType.DECIMAL:
-				newDataValidation.setType(STDataValidationType.DECIMAL);
-				break;				
-			case DataValidationConstraint.ValidationType.TIME:
-				newDataValidation.setType(STDataValidationType.TIME);
-				break;
-			case DataValidationConstraint.ValidationType.FORMULA:
-				newDataValidation.setType(STDataValidationType.CUSTOM);
-				break;
-			default:
-				newDataValidation.setType(STDataValidationType.NONE);				
-		}
-		
-		if (validationType!=ValidationType.ANY && validationType!=ValidationType.LIST) {
-            STDataValidationOperator.Enum op = XSSFDataValidation.operatorTypeMappings.get(constraint.getOperator());
-			if(op != null) {
-                newDataValidation.setOperator(op);
-            }
-			if (constraint.getFormula1() != null) {
-				newDataValidation.setFormula1(constraint.getFormula1());
-			}
-			if (constraint.getFormula2() != null) {
-				newDataValidation.setFormula2(constraint.getFormula2());
-			}
-		}
-		
-		CellRangeAddress[] cellRangeAddresses = cellRangeAddressList.getCellRangeAddresses();
-		List<String> sqref = new ArrayList<String>();
-		for (int i = 0; i < cellRangeAddresses.length; i++) {
-			CellRangeAddress cellRangeAddress = cellRangeAddresses[i];
-			sqref.add(cellRangeAddress.formatAsString());
-		}
-		newDataValidation.setSqref(sqref);
-		newDataValidation.setAllowBlank(true);
-		newDataValidation.setErrorStyle(STDataValidationErrorStyle.STOP);
-		
-		return new XSSFDataValidation(dataValidationConstraint,cellRangeAddressList,newDataValidation);
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
deleted file mode 100644
index 3885770..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDialogsheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageBreak;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageMargins;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPrintOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetFormatPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetProtection;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetViews;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-
-//YK: TODO: this is only a prototype
-public class XSSFDialogsheet extends XSSFSheet implements Sheet{
-    protected CTDialogsheet dialogsheet;
-
-    protected XSSFDialogsheet(XSSFSheet sheet, PackageRelationship rel) {
-        super(sheet.getPackagePart(), rel);
-        this.dialogsheet = CTDialogsheet.Factory.newInstance();
-        this.worksheet = CTWorksheet.Factory.newInstance();
-    }
-
-    public XSSFRow createRow(int rowNum) {
-        return null;
-    }
-
-    protected CTHeaderFooter getSheetTypeHeaderFooter() {
-        if (dialogsheet.getHeaderFooter() == null) {
-            dialogsheet.setHeaderFooter(CTHeaderFooter.Factory.newInstance());
-        }
-        return dialogsheet.getHeaderFooter();
-    }
-
-    protected CTSheetPr getSheetTypeSheetPr() {
-        if (dialogsheet.getSheetPr() == null) {
-            dialogsheet.setSheetPr(CTSheetPr.Factory.newInstance());
-        }
-        return dialogsheet.getSheetPr();
-    }
-
-    protected CTPageBreak getSheetTypeColumnBreaks() {
-        return null;
-    }
-
-    protected CTSheetFormatPr getSheetTypeSheetFormatPr() {
-        if (dialogsheet.getSheetFormatPr() == null) {
-            dialogsheet.setSheetFormatPr(CTSheetFormatPr.Factory.newInstance());
-        }
-        return dialogsheet.getSheetFormatPr();
-    }
-
-    protected CTPageMargins getSheetTypePageMargins() {
-        if (dialogsheet.getPageMargins() == null) {
-            dialogsheet.setPageMargins(CTPageMargins.Factory.newInstance());
-        }
-        return dialogsheet.getPageMargins();
-    }
-
-    protected CTPageBreak getSheetTypeRowBreaks() {
-        return null;
-    }
-
-    protected CTSheetViews getSheetTypeSheetViews() {
-        if (dialogsheet.getSheetViews() == null) {
-            dialogsheet.setSheetViews(CTSheetViews.Factory.newInstance());
-            dialogsheet.getSheetViews().addNewSheetView();
-        }
-        return dialogsheet.getSheetViews();
-    }
-
-    protected CTPrintOptions getSheetTypePrintOptions() {
-        if (dialogsheet.getPrintOptions() == null) {
-            dialogsheet.setPrintOptions(CTPrintOptions.Factory.newInstance());
-        }
-        return dialogsheet.getPrintOptions();
-    }
-
-    protected CTSheetProtection getSheetTypeProtection() {
-        if (dialogsheet.getSheetProtection() == null) {
-            dialogsheet.setSheetProtection(CTSheetProtection.Factory.newInstance());
-        }
-        return dialogsheet.getSheetProtection();
-    }
-
-    public boolean getDialog(){
-        return true;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
deleted file mode 100644
index 8b70d71..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Units;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTConnector;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTDrawing;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGroupShape;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTOneCellAnchor;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTPicture;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShape;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTTwoCellAnchor;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.STEditAs;
-
-/**
- * Represents a SpreadsheetML drawing
- */
-public final class XSSFDrawing extends POIXMLDocumentPart implements Drawing {
-    /**
-     * Root element of the SpreadsheetML Drawing part
-     */
-    private CTDrawing drawing;
-    private long numOfGraphicFrames = 0L;
-    
-    protected static final String NAMESPACE_A = XSSFRelation.NS_DRAWINGML;
-    protected static final String NAMESPACE_C = XSSFRelation.NS_CHART;
-
-    /**
-     * Create a new SpreadsheetML drawing
-     *
-     * @see org.apache.poi.xssf.usermodel.XSSFSheet#createDrawingPatriarch()
-     */
-    protected XSSFDrawing() {
-        super();
-        drawing = newDrawing();
-    }
-
-    /**
-     * Construct a SpreadsheetML drawing from a package part
-     *
-     * @param part the package part holding the drawing data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.drawing+xml</code>
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public XSSFDrawing(PackagePart part) throws IOException, XmlException {
-        super(part);
-        XmlOptions options  = new XmlOptions(DEFAULT_XML_OPTIONS);
-        //Removing root element
-        options.setLoadReplaceDocumentElement(null);
-        drawing = CTDrawing.Factory.parse(part.getInputStream(),options);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XSSFDrawing(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-    
-    /**
-     * Construct a new CTDrawing bean. By default, it's just an empty placeholder for drawing objects
-     *
-     * @return a new CTDrawing bean
-     */
-    private static CTDrawing newDrawing(){
-        return CTDrawing.Factory.newInstance();
-    }
-
-    /**
-     * Return the underlying CTDrawing bean, the root element of the SpreadsheetML Drawing part.
-     *
-     * @return the underlying CTDrawing bean
-     */
-    @Internal
-    public CTDrawing getCTDrawing(){
-        return drawing;
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-
-        /*
-            Saved drawings must have the following namespaces set:
-            <xdr:wsDr
-                xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
-                xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing">
-        */
-        xmlOptions.setSaveSyntheticDocumentElement(
-                new QName(CTDrawing.type.getName().getNamespaceURI(), "wsDr", "xdr")
-        );
-
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        drawing.save(out, xmlOptions);
-        out.close();
-    }
-
-	@Override
-    public XSSFClientAnchor createAnchor(int dx1, int dy1, int dx2, int dy2,
-			int col1, int row1, int col2, int row2) {
-		return new XSSFClientAnchor(dx1, dy1, dx2, dy2, col1, row1, col2, row2);
-	}
-
-    /**
-     * Constructs a textbox under the drawing.
-     *
-     * @param anchor    the client anchor describes how this group is attached
-     *                  to the sheet.
-     * @return      the newly created textbox.
-     */
-    public XSSFTextBox createTextbox(XSSFClientAnchor anchor){
-        long shapeId = newShapeId();
-        CTTwoCellAnchor ctAnchor = createTwoCellAnchor(anchor);
-        CTShape ctShape = ctAnchor.addNewSp();
-        ctShape.set(XSSFSimpleShape.prototype());
-        ctShape.getNvSpPr().getCNvPr().setId(shapeId);
-        XSSFTextBox shape = new XSSFTextBox(this, ctShape);
-        shape.anchor = anchor;
-        return shape;
-
-    }
-
-    /**
-     * Creates a picture.
-     *
-     * @param anchor    the client anchor describes how this picture is attached to the sheet.
-     * @param pictureIndex the index of the picture in the workbook collection of pictures,
-     *   {@link org.apache.poi.xssf.usermodel.XSSFWorkbook#getAllPictures()} .
-     *
-     * @return  the newly created picture shape.
-     */
-    public XSSFPicture createPicture(XSSFClientAnchor anchor, int pictureIndex)
-    {
-        PackageRelationship rel = addPictureReference(pictureIndex);
-
-        long shapeId = newShapeId();
-        CTTwoCellAnchor ctAnchor = createTwoCellAnchor(anchor);
-        CTPicture ctShape = ctAnchor.addNewPic();
-        ctShape.set(XSSFPicture.prototype());
-
-        ctShape.getNvPicPr().getCNvPr().setId(shapeId);
-
-        XSSFPicture shape = new XSSFPicture(this, ctShape);
-        shape.anchor = anchor;
-        shape.setPictureReference(rel);
-        return shape;
-    }
-
-    @Override
-    public XSSFPicture createPicture(ClientAnchor anchor, int pictureIndex){
-        return createPicture((XSSFClientAnchor)anchor, pictureIndex);
-    }
-
-	/**
-	 * Creates a chart.
-	 * @param anchor the client anchor describes how this chart is attached to
-	 *               the sheet.
-	 * @return the newly created chart
-	 * @see org.apache.poi.xssf.usermodel.XSSFDrawing#createChart(ClientAnchor)
-	 */
-    public XSSFChart createChart(XSSFClientAnchor anchor) {
-        int chartNumber = getPackagePart().getPackage().
-            getPartsByContentType(XSSFRelation.CHART.getContentType()).size() + 1;
-
-        RelationPart rp = createRelationship(
-            XSSFRelation.CHART, XSSFFactory.getInstance(), chartNumber, false);
-        XSSFChart chart = rp.getDocumentPart();
-        String chartRelId = rp.getRelationship().getId();
-
-        XSSFGraphicFrame frame = createGraphicFrame(anchor);
-        frame.setChart(chart, chartRelId);
-
-        return chart;
-    }
-
-	@Override
-    public XSSFChart createChart(ClientAnchor anchor) {
-		return createChart((XSSFClientAnchor)anchor);
-	}
-
-    /**
-     * Add the indexed picture to this drawing relations
-     *
-     * @param pictureIndex the index of the picture in the workbook collection of pictures,
-     *   {@link org.apache.poi.xssf.usermodel.XSSFWorkbook#getAllPictures()} .
-     */
-    @SuppressWarnings("resource")
-    protected PackageRelationship addPictureReference(int pictureIndex){
-        XSSFWorkbook wb = (XSSFWorkbook)getParent().getParent();
-        XSSFPictureData data = wb.getAllPictures().get(pictureIndex);
-        XSSFPictureData pic = new XSSFPictureData(data.getPackagePart());
-        RelationPart rp = addRelation(null, XSSFRelation.IMAGES, pic);
-        return rp.getRelationship();
-    }
-
-    /**
-     * Creates a simple shape.  This includes such shapes as lines, rectangles,
-     * and ovals.
-     *
-     * @param anchor    the client anchor describes how this group is attached
-     *                  to the sheet.
-     * @return  the newly created shape.
-     */
-    public XSSFSimpleShape createSimpleShape(XSSFClientAnchor anchor)
-    {
-        long shapeId = newShapeId();
-        CTTwoCellAnchor ctAnchor = createTwoCellAnchor(anchor);
-        CTShape ctShape = ctAnchor.addNewSp();
-        ctShape.set(XSSFSimpleShape.prototype());
-        ctShape.getNvSpPr().getCNvPr().setId(shapeId);
-        XSSFSimpleShape shape = new XSSFSimpleShape(this, ctShape);
-        shape.anchor = anchor;
-        return shape;
-    }
-
-    /**
-     * Creates a simple shape.  This includes such shapes as lines, rectangles,
-     * and ovals.
-     *
-     * @param anchor    the client anchor describes how this group is attached
-     *                  to the sheet.
-     * @return  the newly created shape.
-     */
-    public XSSFConnector createConnector(XSSFClientAnchor anchor)
-    {
-        CTTwoCellAnchor ctAnchor = createTwoCellAnchor(anchor);
-        CTConnector ctShape = ctAnchor.addNewCxnSp();
-        ctShape.set(XSSFConnector.prototype());
-
-        XSSFConnector shape = new XSSFConnector(this, ctShape);
-        shape.anchor = anchor;
-        return shape;
-    }
-
-    /**
-     * Creates a simple shape.  This includes such shapes as lines, rectangles,
-     * and ovals.
-     *
-     * @param anchor    the client anchor describes how this group is attached
-     *                  to the sheet.
-     * @return  the newly created shape.
-     */
-    public XSSFShapeGroup createGroup(XSSFClientAnchor anchor)
-    {
-        CTTwoCellAnchor ctAnchor = createTwoCellAnchor(anchor);
-        CTGroupShape ctGroup = ctAnchor.addNewGrpSp();
-        ctGroup.set(XSSFShapeGroup.prototype());
-
-        XSSFShapeGroup shape = new XSSFShapeGroup(this, ctGroup);
-        shape.anchor = anchor;
-        return shape;
-    }
-
-	/**
-	 * Creates a comment.
-	 * @param anchor the client anchor describes how this comment is attached
-	 *               to the sheet.
-	 * @return the newly created comment.
-	 */
-    @Override
-    public XSSFComment createCellComment(ClientAnchor anchor) {
-        XSSFClientAnchor ca = (XSSFClientAnchor)anchor;
-        XSSFSheet sheet = (XSSFSheet)getParent();
-
-        //create comments and vmlDrawing parts if they don't exist
-        CommentsTable comments = sheet.getCommentsTable(true);
-        XSSFVMLDrawing vml = sheet.getVMLDrawing(true);
-        com.microsoft.schemas.vml.CTShape vmlShape = vml.newCommentShape();
-        if(ca.isSet()){
-            // convert offsets from emus to pixels since we get a DrawingML-anchor
-            // but create a VML Drawing
-            int dx1Pixels = ca.getDx1()/Units.EMU_PER_PIXEL;
-            int dy1Pixels = ca.getDy1()/Units.EMU_PER_PIXEL;
-            int dx2Pixels = ca.getDx2()/Units.EMU_PER_PIXEL;
-            int dy2Pixels = ca.getDy2()/Units.EMU_PER_PIXEL;
-            String position =
-                    ca.getCol1() + ", " + dx1Pixels + ", " +
-                    ca.getRow1() + ", " + dy1Pixels + ", " +
-                    ca.getCol2() + ", " + dx2Pixels + ", " +
-                    ca.getRow2() + ", " + dy2Pixels;
-            vmlShape.getClientDataArray(0).setAnchorArray(0, position);
-        }
-        CellAddress ref = new CellAddress(ca.getRow1(), ca.getCol1());
-
-        if(comments.findCellComment(ref) != null) {
-            throw new IllegalArgumentException("Multiple cell comments in one cell are not allowed, cell: " + ref);
-        }
-        
-        return new XSSFComment(comments, comments.newComment(ref), vmlShape);
-    }
-
-    /**
-     * Creates a new graphic frame.
-     *
-     * @param anchor    the client anchor describes how this frame is attached
-     *                  to the sheet
-     * @return  the newly created graphic frame
-     */
-    private XSSFGraphicFrame createGraphicFrame(XSSFClientAnchor anchor) {
-        CTTwoCellAnchor ctAnchor = createTwoCellAnchor(anchor);
-        CTGraphicalObjectFrame ctGraphicFrame = ctAnchor.addNewGraphicFrame();
-        ctGraphicFrame.set(XSSFGraphicFrame.prototype());
-
-        long frameId = numOfGraphicFrames++;
-        XSSFGraphicFrame graphicFrame = new XSSFGraphicFrame(this, ctGraphicFrame);
-        graphicFrame.setAnchor(anchor);
-        graphicFrame.setId(frameId);
-        graphicFrame.setName("Diagramm" + frameId);
-        return graphicFrame;
-    }
-    
-    /**
-     * Returns all charts in this drawing.
-     */
-    public List<XSSFChart> getCharts() {
-       List<XSSFChart> charts = new ArrayList<XSSFChart>();
-       for(POIXMLDocumentPart part : getRelations()) {
-          if(part instanceof XSSFChart) {
-             charts.add((XSSFChart)part);
-          }
-       }
-       return charts;
-    }
-
-    /**
-     * Create and initialize a CTTwoCellAnchor that anchors a shape against top-left and bottom-right cells.
-     *
-     * @return a new CTTwoCellAnchor
-     */
-    private CTTwoCellAnchor createTwoCellAnchor(XSSFClientAnchor anchor) {
-        CTTwoCellAnchor ctAnchor = drawing.addNewTwoCellAnchor();
-        ctAnchor.setFrom(anchor.getFrom());
-        ctAnchor.setTo(anchor.getTo());
-        ctAnchor.addNewClientData();
-        anchor.setTo(ctAnchor.getTo());
-        anchor.setFrom(ctAnchor.getFrom());
-        STEditAs.Enum aditAs;
-        switch(anchor.getAnchorType()) {
-            case DONT_MOVE_AND_RESIZE: aditAs = STEditAs.ABSOLUTE; break;
-            case MOVE_AND_RESIZE: aditAs = STEditAs.TWO_CELL; break;
-            case MOVE_DONT_RESIZE: aditAs = STEditAs.ONE_CELL; break;
-            default: aditAs = STEditAs.ONE_CELL;
-        }
-        ctAnchor.setEditAs(aditAs);
-        return ctAnchor;
-    }
-
-    private long newShapeId(){
-        return drawing.sizeOfTwoCellAnchorArray() + 1;
-    }
-
-    /**
-     *
-     * @return list of shapes in this drawing
-     */
-    public List<XSSFShape>  getShapes(){
-        List<XSSFShape> lst = new ArrayList<XSSFShape>();
-        for(XmlObject obj : drawing.selectPath("./*/*")) {
-            XSSFShape shape = null;
-            if(obj instanceof CTPicture) shape = new XSSFPicture(this, (CTPicture)obj) ;
-            else if(obj instanceof CTConnector) shape = new XSSFConnector(this, (CTConnector)obj) ;
-            else if(obj instanceof CTShape) shape = new XSSFSimpleShape(this, (CTShape)obj) ;
-            else if(obj instanceof CTGraphicalObjectFrame) shape = new XSSFGraphicFrame(this, (CTGraphicalObjectFrame)obj) ;
-            else if(obj instanceof CTGroupShape) shape = new XSSFShapeGroup(this, (CTGroupShape)obj) ;
-
-            if(shape != null){
-                shape.anchor = getAnchorFromParent(obj);
-                lst.add(shape);
-            }
-        }
-        return lst;
-    }
-
-
-    private XSSFAnchor getAnchorFromParent(XmlObject obj){
-        XSSFAnchor anchor = null;
-
-        XmlObject parentXbean = null;
-        XmlCursor cursor = obj.newCursor();
-        if(cursor.toParent()) parentXbean = cursor.getObject();
-        cursor.dispose();
-        if(parentXbean != null){
-            if (parentXbean instanceof CTTwoCellAnchor) {
-                CTTwoCellAnchor ct = (CTTwoCellAnchor)parentXbean;
-                anchor = new XSSFClientAnchor(ct.getFrom(), ct.getTo());
-            } else if (parentXbean instanceof CTOneCellAnchor) {
-                CTOneCellAnchor ct = (CTOneCellAnchor)parentXbean;
-                anchor = new XSSFClientAnchor(ct.getFrom(), CTMarker.Factory.newInstance());
-            }
-        }
-        return anchor;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
deleted file mode 100644
index 129052e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.util.Internal;
-
-/**
- * XSSF wrapper for a cell under evaluation
- */
-final class XSSFEvaluationCell implements EvaluationCell {
-
-	private final EvaluationSheet _evalSheet;
-	private final XSSFCell _cell;
-
-	public XSSFEvaluationCell(XSSFCell cell, XSSFEvaluationSheet evaluationSheet) {
-		_cell = cell;
-		_evalSheet = evaluationSheet;
-	}
-
-	public XSSFEvaluationCell(XSSFCell cell) {
-		this(cell, new XSSFEvaluationSheet(cell.getSheet()));
-	}
-
-	@Override
-	public Object getIdentityKey() {
-		// save memory by just using the cell itself as the identity key
-		// Note - this assumes XSSFCell has not overridden hashCode and equals
-		return _cell;
-	}
-
-	public XSSFCell getXSSFCell() {
-		return _cell;
-	}
-	@Override
-	public boolean getBooleanCellValue() {
-		return _cell.getBooleanCellValue();
-	}
-/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	@Override
-	public int getCellType() {
-		return _cell.getCellType();
-	}
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	@Override
-	public CellType getCellTypeEnum() {
-		return _cell.getCellTypeEnum();
-	}
-	@Override
-	public int getColumnIndex() {
-		return _cell.getColumnIndex();
-	}
-	@Override
-	public int getErrorCellValue() {
-		return _cell.getErrorCellValue();
-	}
-	@Override
-	public double getNumericCellValue() {
-		return _cell.getNumericCellValue();
-	}
-	@Override
-	public int getRowIndex() {
-		return _cell.getRowIndex();
-	}
-	@Override
-	public EvaluationSheet getSheet() {
-		return _evalSheet;
-	}
-	@Override
-	public String getStringCellValue() {
-		return _cell.getRichStringCellValue().getString();
-	}
-	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 */
-	@Override
-	public int getCachedFormulaResultType() {
-		return _cell.getCachedFormulaResultType();
-	}
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 * Will be deleted when we make the CellType enum transition. See bug 59791.
-	 */
-	@Internal(since="POI 3.15 beta 3")
-	@Override
-	public CellType getCachedFormulaResultTypeEnum() {
-		return _cell.getCachedFormulaResultTypeEnum();
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
deleted file mode 100644
index fb042af..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.util.Internal;
-
-/**
- * XSSF wrapper for a sheet under evaluation
- */
-@Internal
-final class XSSFEvaluationSheet implements EvaluationSheet {
-
-    private final XSSFSheet _xs;
-    private Map<CellKey, EvaluationCell> _cellCache;
-
-    public XSSFEvaluationSheet(XSSFSheet sheet) {
-        _xs = sheet;
-    }
-
-    public XSSFSheet getXSSFSheet() {
-        return _xs;
-    }
-
-    /* (non-JavaDoc), inherit JavaDoc from EvaluationWorkbook
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        _cellCache = null;
-    }
-    
-    @Override
-    public EvaluationCell getCell(int rowIndex, int columnIndex) {
-        // cache for performance: ~30% speedup due to caching
-        if (_cellCache == null) {
-            _cellCache = new HashMap<CellKey, EvaluationCell>(_xs.getLastRowNum()*3);
-            for (final Row row : _xs) {
-                final int rowNum = row.getRowNum();
-                for (final Cell cell : row) {
-                    // cast is safe, the iterator is just defined using the interface
-                    final CellKey key = new CellKey(rowNum, cell.getColumnIndex());
-                    final EvaluationCell evalcell = new XSSFEvaluationCell((XSSFCell) cell, this);
-                    _cellCache.put(key, evalcell);
-                }
-            }
-        }
-        
-        final CellKey key = new CellKey(rowIndex, columnIndex);
-        EvaluationCell evalcell = _cellCache.get(key);
-        
-        // If cache is stale, update cache with this one cell
-        // This is a compromise between rebuilding the entire cache
-        // (which would quickly defeat the benefit of the cache)
-        // and not caching at all.
-        // See bug 59958: Add cells on the fly to the evaluation sheet cache on cache miss
-        if (evalcell == null) {
-            XSSFRow row = _xs.getRow(rowIndex);
-            if (row == null) {
-                return null;
-            }
-            XSSFCell cell = row.getCell(columnIndex);
-            if (cell == null) {
-                return null;
-            }
-            evalcell = new XSSFEvaluationCell(cell, this);
-            _cellCache.put(key, evalcell);
-        }
-
-        return evalcell;
-    }
-    
-    private static class CellKey {
-        private final int _row;
-        private final int _col;
-        private int _hash = -1; //lazily computed
-        
-        protected CellKey(int row, int col) {
-            _row = row;
-            _col = col;
-        }
-        
-        @Override
-        public int hashCode() {
-            if ( _hash == -1 ) {
-                 _hash = (17 * 37 + _row) * 37 + _col;
-            }
-            return _hash;
-        }
-        
-        @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof CellKey)) {
-                return false;
-            }
-            // assumes other object is one of us, otherwise ClassCastException is thrown
-            final CellKey oKey = (CellKey) obj;
-            return _row == oKey._row && _col == oKey._col;
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
deleted file mode 100644
index 2c13f82..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationSheet;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.Internal;
-
-/**
- * Internal POI use only
- */
-@Internal
-public final class XSSFEvaluationWorkbook extends BaseXSSFEvaluationWorkbook {
-    private XSSFEvaluationSheet[] _sheetCache;
-    
-    public static XSSFEvaluationWorkbook create(XSSFWorkbook book) {
-        if (book == null) {
-            return null;
-        }
-        return new XSSFEvaluationWorkbook(book);
-    }
-
-    private XSSFEvaluationWorkbook(XSSFWorkbook book) {
-        super(book);
-    }
-
-    /* (non-JavaDoc), inherit JavaDoc from EvaluationSheet
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void clearAllCachedResultValues() {
-        super.clearAllCachedResultValues();
-        _sheetCache = null;
-    }
-    
-    @Override
-    public int getSheetIndex(EvaluationSheet evalSheet) {
-        XSSFSheet sheet = ((XSSFEvaluationSheet)evalSheet).getXSSFSheet();
-        return _uBook.getSheetIndex(sheet);
-    }
-
-    @Override
-    public EvaluationSheet getSheet(int sheetIndex) {
-        // Performance optimization: build sheet cache the first time this is called
-        // to avoid re-creating the XSSFEvaluationSheet each time a new cell is evaluated
-        // EvaluationWorkbooks make not guarantee to synchronize changes made to
-        // the underlying workbook after the EvaluationWorkbook is created.
-        if (_sheetCache == null) {
-            final int numberOfSheets = _uBook.getNumberOfSheets();
-            _sheetCache = new XSSFEvaluationSheet[numberOfSheets];
-            for (int i=0; i < numberOfSheets; i++) {
-                _sheetCache[i] = new XSSFEvaluationSheet(_uBook.getSheetAt(i));
-            }
-        }
-        if (sheetIndex < 0 || sheetIndex >= _sheetCache.length) {
-            // do this to reuse the out-of-bounds logic and message from XSSFWorkbook
-            _uBook.getSheetAt(sheetIndex);
-        }
-        return _sheetCache[sheetIndex];
-    }
-
-    @Override    
-    public Ptg[] getFormulaTokens(EvaluationCell evalCell) {
-        final XSSFCell cell = ((XSSFEvaluationCell)evalCell).getXSSFCell();
-        final int sheetIndex = _uBook.getSheetIndex(cell.getSheet());
-        final int rowIndex = cell.getRowIndex();
-        return FormulaParser.parse(cell.getCellFormula(this), this, FormulaType.CELL, sheetIndex, rowIndex);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
deleted file mode 100644
index 9dd28da..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Footer;
-import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-/**
- * 
- * Even page footer value. Corresponds to even printed pages. 
- * Even page(s) in the sheet may not be printed, for example, if the print area is specified to be 
- * a range such that it falls outside an even page's scope. 
- * If no even footer is specified, then the odd footer's value is assumed for even page footers. 
- *
- */
-public class XSSFEvenFooter extends XSSFHeaderFooter implements Footer{
-    
-    /**
-     * Create an instance of XSSFEvenFooter from the supplied XML bean
-     * @see XSSFSheet#getEvenFooter()
-     * @param headerFooter
-     */
-    public XSSFEvenFooter(CTHeaderFooter headerFooter) {
-        super(headerFooter);
-        headerFooter.setDifferentOddEven(true);
-    }
-    
-    /**
-     * Get the content text representing the footer
-     * @return text
-     */
-    public String getText() {
-        return getHeaderFooter().getEvenFooter();
-    }
-    
-    /**
-     * Set a text for the footer. If null unset the value.
-     * @see XSSFHeaderFooter to see how to create a string with Header/Footer Formatting Syntax
-     * @param text - a string representing the footer. 
-     */
-    public void setText(String text) {
-    	if(text == null) {
-    		getHeaderFooter().unsetEvenFooter();
-    	} else {
-    		getHeaderFooter().setEvenFooter(text);
-    	}
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
deleted file mode 100644
index 1bf9555..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Header;
-import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-/**
- * <p>
- * Even page header value. Corresponds to even printed pages.
- * Even page(s) in the sheet may not be printed, for example, if the print area is specified to be 
- * a range such that it falls outside an even page's scope.
- * If no even header is specified, then odd header value is assumed for even page headers.
- *</p>
- *
- */
-public class XSSFEvenHeader extends XSSFHeaderFooter implements Header{
-
-    /**
-     * Create an instance of XSSFEvenHeader from the supplied XML bean
-     * @see XSSFSheet#getEvenHeader()
-     * @param headerFooter
-     */
-    public XSSFEvenHeader(CTHeaderFooter headerFooter) {
-	super(headerFooter);
-	headerFooter.setDifferentOddEven(true);
-    }
-
-    /**
-     * Get the content text representing this header
-     * @return text
-     */
-    public String getText() {
-	return getHeaderFooter().getEvenHeader();
-    }
-
-    /**
-     * Set a text for the header. If null unset the value
-     * @see XSSFHeaderFooter to see how to create a string with Header/Footer Formatting Syntax
-     * @param text - a string representing the header. 
-     */
-    public void setText(String text) {
-	if(text == null) {
-	    getHeaderFooter().unsetEvenHeader();
-	} else {
-	    getHeaderFooter().setEvenHeader(text);
-	}
-    }
-
-    
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
deleted file mode 100644
index 763b094..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLFactory;
-import org.apache.poi.POIXMLRelation;
-
-/**
- * Instantiates sub-classes of POIXMLDocumentPart depending on their relationship type
- */
-public final class XSSFFactory extends POIXMLFactory  {
-    private XSSFFactory() {
-    }
-
-    private static final XSSFFactory inst = new XSSFFactory();
-
-    public static XSSFFactory getInstance(){
-        return inst;
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    @Override
-    protected POIXMLRelation getDescriptor(String relationshipType) {
-        return XSSFRelation.getInstance(relationshipType);
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    @Override
-    protected POIXMLDocumentPart createDocumentPart
-        (Class<? extends POIXMLDocumentPart> cls, Class<?>[] classes, Object[] values)
-    throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
-        Constructor<? extends POIXMLDocumentPart> constructor = cls.getDeclaredConstructor(classes);
-        return constructor.newInstance(values);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
deleted file mode 100644
index b0f2cb5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Footer;
-import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-/**
- * 
- * First page footer content. Corresponds to first printed page.  
- * The first logical page in the sheet may not be printed, for example, if the print area is specified to 
- * be a range such that it falls outside the first page's scope.
- * 
- */
-public class XSSFFirstFooter extends XSSFHeaderFooter implements Footer{
-
-    /**
-     * Create an instance of XSSFFirstFooter from the supplied XML bean
-     * @see XSSFSheet#getFirstFooter()
-     * @param headerFooter
-     */
-    protected XSSFFirstFooter(CTHeaderFooter headerFooter) {
-        super(headerFooter);
-        headerFooter.setDifferentFirst(true);
-    }
-    
-    /**
-     * Get the content text representing the footer
-     * @return text
-     */
-    public String getText() {
-        return getHeaderFooter().getFirstFooter();
-    }
-    
-    /**
-     * Set a text for the footer. If null unset the value.
-     * @see XSSFHeaderFooter to see how to create a string with Header/Footer Formatting Syntax
-     * @param text - a string representing the footer. 
-     */
-    public void setText(String text) {
-    	if(text == null) {
-    		getHeaderFooter().unsetFirstFooter();
-    	} else {
-    		getHeaderFooter().setFirstFooter(text);
-    	}
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
deleted file mode 100644
index 9ffd457..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Header;
-import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-/**
- * 
- * First page header content. Corresponds to first printed page.
- * The first logical page in the sheet may not be printed, for example, if the print area is specified to 
- * be a range such that it falls outside the first page's scope.
- *
- */
-public class XSSFFirstHeader extends XSSFHeaderFooter implements Header{
-
-    /**
-     * Create an instance of XSSFFirstHeader from the supplied XML bean
-     * @see XSSFSheet#getFirstHeader()
-     * @param headerFooter
-     */
-    protected XSSFFirstHeader(CTHeaderFooter headerFooter) {
-        super(headerFooter);
-        headerFooter.setDifferentFirst(true);
-    }
-    
-    /**
-     * Get the content text representing this header
-     * @return text
-     */
-    public String getText() {
-        return getHeaderFooter().getFirstHeader();
-    }
-    
-    /**
-     * Set a text for the header. If null unset the value
-     * @see XSSFHeaderFooter to see how to create a string with Header/Footer Formatting Syntax
-     * @param text - a string representing the header. 
-     */
-    public void setText(String text) {
-    	if(text == null) {
-    		getHeaderFooter().unsetFirstHeader();
-    	} else {
-    		getHeaderFooter().setFirstHeader(text);
-    	}
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
deleted file mode 100644
index bdbbf74..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.util.Internal;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.FontCharset;
-import org.apache.poi.ss.usermodel.FontFamily;
-import org.apache.poi.ss.usermodel.FontScheme;
-import org.apache.poi.ss.usermodel.FontUnderline;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.model.ThemesTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBooleanProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFontName;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFontScheme;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFontSize;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIntProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTUnderlineProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTVerticalAlignFontProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STFontScheme;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STUnderlineValues;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STVerticalAlignRun;
-
-/**
- * Represents a font used in a workbook.
- *
- * @author Gisella Bronzetti
- */
-public class XSSFFont implements Font {
-
-    /**
-     * By default, Microsoft Office Excel 2007 uses the Calibry font in font size 11
-     */
-    public static final String DEFAULT_FONT_NAME = "Calibri";
-    /**
-     * By default, Microsoft Office Excel 2007 uses the Calibry font in font size 11
-     */
-    public static final short DEFAULT_FONT_SIZE = 11;
-    /**
-     * Default font color is black
-     * @see org.apache.poi.ss.usermodel.IndexedColors#BLACK
-     */
-    public static final short DEFAULT_FONT_COLOR = IndexedColors.BLACK.getIndex();
-
-    private ThemesTable _themes;
-    private CTFont _ctFont;
-    private short _index;
-
-    /**
-     * Create a new XSSFFont
-     *
-     * @param font the underlying CTFont bean
-     */
-    public XSSFFont(CTFont font) {
-        _ctFont = font;
-        _index = 0;
-    }
-
-    public XSSFFont(CTFont font, int index) {
-        _ctFont = font;
-        _index = (short)index;
-    }
-
-    /**
-     * Create a new XSSFont. This method is protected to be used only by XSSFWorkbook
-     */
-    protected XSSFFont() {
-        this._ctFont = CTFont.Factory.newInstance();
-        setFontName(DEFAULT_FONT_NAME);
-        setFontHeight((double)DEFAULT_FONT_SIZE);
-    }
-    
-    /**
-     * get the underlying CTFont font
-     */
-    @Internal
-    public CTFont getCTFont() {
-        return _ctFont;
-    }
-
-    /**
-     * get a boolean value for the boldness to use.
-     *
-     * @return boolean - bold
-     */
-    public boolean getBold() {
-        CTBooleanProperty bold = _ctFont.sizeOfBArray() == 0 ? null : _ctFont.getBArray(0);
-        return (bold != null && bold.getVal());
-    }
-
-    /**
-     * get character-set to use.
-     *
-     * @return int - character-set (0-255)
-     * @see org.apache.poi.ss.usermodel.FontCharset
-     */
-    public int getCharSet() {
-        CTIntProperty charset = _ctFont.sizeOfCharsetArray() == 0 ? null : _ctFont.getCharsetArray(0);
-        int val = charset == null ? FontCharset.ANSI.getValue() : FontCharset.valueOf(charset.getVal()).getValue();
-        return val;
-    }
-
-
-    /**
-     * get the indexed color value for the font
-     * References a color defined in IndexedColors.
-     *
-     * @return short - indexed color to use
-     * @see IndexedColors
-     */
-    public short getColor() {
-        CTColor color = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0);
-        if (color == null) return IndexedColors.BLACK.getIndex();
-
-        long index = color.getIndexed();
-        if (index == XSSFFont.DEFAULT_FONT_COLOR) {
-            return IndexedColors.BLACK.getIndex();
-        } else if (index == IndexedColors.RED.getIndex()) {
-            return IndexedColors.RED.getIndex();
-        } else {
-            return (short)index;
-        }
-    }
-
-
-    /**
-     * get the color value for the font
-     * References a color defined as  Standard Alpha Red Green Blue color value (ARGB).
-     *
-     * @return XSSFColor - rgb color to use
-     */
-    public XSSFColor getXSSFColor() {
-        CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0);
-        if(ctColor != null) {
-           XSSFColor color = new XSSFColor(ctColor);
-           if(_themes != null) {
-              _themes.inheritFromThemeAsRequired(color);
-           }
-           return color;
-        } else {
-           return null;
-        }
-    }
-
-
-    /**
-     * get the color value for the font
-     * References a color defined in theme.
-     *
-     * @return short - theme defined to use
-     */
-    public short getThemeColor() {
-        CTColor color = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0);
-        long index = color == null ? 0 : color.getTheme();
-        return (short) index;
-    }
-
-    /**
-     * Get the font height in unit's of 1/20th of a point.
-     * <p>
-     * For many users, the related {@link #getFontHeightInPoints()}
-     *  will be more helpful, as that returns font heights in the
-     *  more familiar points units, eg 10, 12, 14.
-
-     * @return short - height in 1/20ths of a point
-     * @see #getFontHeightInPoints()
-     */
-    public short getFontHeight() {
-        return (short)(getFontHeightRaw()*20);
-    }
-
-    /**
-     * Get the font height in points.
-     * <p>
-     * This will return the same font height that is shown in Excel,
-     *  such as 10 or 14 or 28.
-     * @return short - height in the familiar unit of measure - points
-     * @see #getFontHeight()
-     */
-    public short getFontHeightInPoints() {
-        return (short)getFontHeightRaw();
-    }
-    
-    /**
-     * Return the raw font height, in points, but also
-     *  including fractions.
-     */
-    private double getFontHeightRaw() {
-        CTFontSize size = _ctFont.sizeOfSzArray() == 0 ? null : _ctFont.getSzArray(0);
-        if (size != null) {
-            double fontHeight = size.getVal();
-            return fontHeight;
-        }
-        return DEFAULT_FONT_SIZE;
-    }
-
-    /**
-     * get the name of the font (i.e. Arial)
-     *
-     * @return String - a string representing the name of the font to use
-     */
-    public String getFontName() {
-        CTFontName name = _ctFont.sizeOfNameArray() == 0 ? null : _ctFont.getNameArray(0);
-        return name == null ? DEFAULT_FONT_NAME : name.getVal();
-    }
-
-    /**
-     * get a boolean value that specify whether to use italics or not
-     *
-     * @return boolean - value for italic
-     */
-    public boolean getItalic() {
-        CTBooleanProperty italic = _ctFont.sizeOfIArray() == 0 ? null : _ctFont.getIArray(0);
-        return italic != null && italic.getVal();
-    }
-
-    /**
-     * get a boolean value that specify whether to use a strikeout horizontal line through the text or not
-     *
-     * @return boolean - value for strikeout
-     */
-    public boolean getStrikeout() {
-        CTBooleanProperty strike = _ctFont.sizeOfStrikeArray() == 0 ? null : _ctFont.getStrikeArray(0);
-        return strike != null && strike.getVal();
-    }
-
-    /**
-     * get normal,super or subscript.
-     *
-     * @return short - offset type to use (none,super,sub)
-     * @see Font#SS_NONE
-     * @see Font#SS_SUPER
-     * @see Font#SS_SUB
-     */
-    public short getTypeOffset() {
-        CTVerticalAlignFontProperty vAlign = _ctFont.sizeOfVertAlignArray() == 0 ? null : _ctFont.getVertAlignArray(0);
-        if (vAlign == null) {
-            return Font.SS_NONE;
-        }
-        int val = vAlign.getVal().intValue();
-        switch (val) {
-            case STVerticalAlignRun.INT_BASELINE:
-                return Font.SS_NONE;
-            case STVerticalAlignRun.INT_SUBSCRIPT:
-                return Font.SS_SUB;
-            case STVerticalAlignRun.INT_SUPERSCRIPT:
-                return Font.SS_SUPER;
-            default:
-                throw new POIXMLException("Wrong offset value " + val);
-        }
-    }
-
-    /**
-     * get type of text underlining to use
-     *
-     * @return byte - underlining type
-     * @see org.apache.poi.ss.usermodel.FontUnderline
-     */
-    public byte getUnderline() {
-        CTUnderlineProperty underline = _ctFont.sizeOfUArray() == 0 ? null : _ctFont.getUArray(0);
-        if (underline != null) {
-            FontUnderline val = FontUnderline.valueOf(underline.getVal().intValue());
-            return val.getByteValue();
-        }
-        return Font.U_NONE;
-    }
-
-    /**
-     * set a boolean value for the boldness to use. If omitted, the default value is true.
-     *
-     * @param bold - boldness to use
-     */
-    public void setBold(boolean bold) {
-        if(bold){
-            CTBooleanProperty ctBold = _ctFont.sizeOfBArray() == 0 ? _ctFont.addNewB() : _ctFont.getBArray(0);
-            ctBold.setVal(bold);
-        } else {
-            _ctFont.setBArray(null);
-        }
-    }
-
-    /**
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #setBold(boolean)} instead.
-     */
-    public void setBoldweight(short boldweight)
-    {
-        setBold(boldweight == BOLDWEIGHT_BOLD);
-    }
-
-    /**
-     * get the boldness to use
-     * @return boldweight
-     * @see #BOLDWEIGHT_NORMAL
-     * @see #BOLDWEIGHT_BOLD
-     * @deprecated 3.15 beta 2. Scheduled for removal in 3.17. Use {@link #getBold} instead.
-     */
-    public short getBoldweight()
-    {
-        return getBold() ? BOLDWEIGHT_BOLD : BOLDWEIGHT_NORMAL;
-    }
-
-    /**
-     * set character-set to use.
-     *
-     * @param charset - charset
-     * @see FontCharset
-     */
-    public void setCharSet(byte charset) {
-       int cs = charset & 0xff;
-       setCharSet(cs);
-    }
-    /**
-     * set character-set to use.
-     *
-     * @param charset - charset
-     * @see FontCharset
-     */
-    public void setCharSet(int charset) {
-        FontCharset fontCharset = FontCharset.valueOf(charset);
-        if(fontCharset != null) {
-           setCharSet(fontCharset);
-        } else {
-           throw new POIXMLException("Attention: an attempt to set a type of unknow charset and charset");
-        }
-    }
-
-    /**
-     * set character-set to use.
-     *
-     * @param charSet
-     */
-    public void setCharSet(FontCharset charSet) {
-       CTIntProperty charsetProperty;
-       if(_ctFont.sizeOfCharsetArray() == 0) {
-          charsetProperty = _ctFont.addNewCharset();
-       } else {
-          charsetProperty = _ctFont.getCharsetArray(0);
-       }
-       // We know that FontCharset only has valid entries in it,
-       //  so we can just set the int value from it
-       charsetProperty.setVal( charSet.getValue() );
-    }
-
-    /**
-     * set the indexed color for the font
-     *
-     * @param color - color to use
-     * @see #DEFAULT_FONT_COLOR - Note: default font color
-     * @see IndexedColors
-     */
-    public void setColor(short color) {
-        CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? _ctFont.addNewColor() : _ctFont.getColorArray(0);
-        switch (color) {
-            case Font.COLOR_NORMAL: {
-                ctColor.setIndexed(XSSFFont.DEFAULT_FONT_COLOR);
-                break;
-            }
-            case Font.COLOR_RED: {
-                ctColor.setIndexed(IndexedColors.RED.getIndex());
-                break;
-            }
-            default:
-                ctColor.setIndexed(color);
-        }
-    }
-
-    /**
-     * set the color for the font in Standard Alpha Red Green Blue color value
-     *
-     * @param color - color to use
-     */
-    public void setColor(XSSFColor color) {
-        if(color == null) _ctFont.setColorArray(null);
-        else {
-            CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? _ctFont.addNewColor() : _ctFont.getColorArray(0);
-            if (ctColor.isSetIndexed()) {
-                ctColor.unsetIndexed();
-            }
-            ctColor.setRgb(color.getRGB());
-        }
-    }
-
-    /**
-     * set the font height in points.
-     *
-     * @param height - height in points
-     */
-    public void setFontHeight(short height) {
-        setFontHeight((double) height/20);
-    }
-
-    /**
-     * set the font height in points.
-     *
-     * @param height - height in points
-     */
-    public void setFontHeight(double height) {
-        CTFontSize fontSize = _ctFont.sizeOfSzArray() == 0 ? _ctFont.addNewSz() : _ctFont.getSzArray(0);
-        fontSize.setVal(height);
-    }
-
-    /**
-     * set the font height in points.
-     *
-     * @link #setFontHeight
-     */
-    public void setFontHeightInPoints(short height) {
-        setFontHeight((double)height);
-    }
-
-    /**
-     * set the theme color for the font to use
-     *
-     * @param theme - theme color to use
-     */
-    public void setThemeColor(short theme) {
-        CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? _ctFont.addNewColor() : _ctFont.getColorArray(0);
-        ctColor.setTheme(theme);
-    }
-
-    /**
-     * set the name for the font (i.e. Arial).
-     * If the font doesn't exist (because it isn't installed on the system),
-     * or the charset is invalid for that font, then another font should
-     * be substituted.
-     * The string length for this attribute shall be 0 to 31 characters.
-     * Default font name is Calibri.
-     *
-     * @param name - value representing the name of the font to use
-     * @see #DEFAULT_FONT_NAME
-     */
-    public void setFontName(String name) {
-        CTFontName fontName = _ctFont.sizeOfNameArray() == 0 ? _ctFont.addNewName() : _ctFont.getNameArray(0);
-        fontName.setVal(name == null ? DEFAULT_FONT_NAME : name);
-    }
-
-
-    /**
-     * set a boolean value for the property specifying whether to use italics or not
-     * If omitted, the default value is true.
-     *
-     * @param italic - value for italics or not
-     */
-    public void setItalic(boolean italic) {
-        if(italic){
-            CTBooleanProperty bool = _ctFont.sizeOfIArray() == 0 ? _ctFont.addNewI() : _ctFont.getIArray(0);
-            bool.setVal(italic);
-        } else {
-            _ctFont.setIArray(null);
-        }
-    }
-
-
-    /**
-     * set a boolean value for the property specifying whether to use a strikeout horizontal line through the text or not
-     * If omitted, the default value is true.
-     *
-     * @param strikeout - value for strikeout or not
-     */
-    public void setStrikeout(boolean strikeout) {
-        if(!strikeout) _ctFont.setStrikeArray(null);
-        else {
-            CTBooleanProperty strike = _ctFont.sizeOfStrikeArray() == 0 ? _ctFont.addNewStrike() : _ctFont.getStrikeArray(0);
-            strike.setVal(strikeout);
-        }
-    }
-
-    /**
-     * set normal,super or subscript, that representing the vertical-alignment setting.
-     * Setting this to either subscript or superscript shall make the font size smaller if a
-     * smaller font size is available.
-     *
-     * @param offset - offset type to use (none,super,sub)
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-    public void setTypeOffset(short offset) {
-        if(offset == Font.SS_NONE){
-            _ctFont.setVertAlignArray(null);
-        } else {
-            CTVerticalAlignFontProperty offsetProperty = _ctFont.sizeOfVertAlignArray() == 0 ? _ctFont.addNewVertAlign() : _ctFont.getVertAlignArray(0);
-            switch (offset) {
-                case Font.SS_NONE:
-                    offsetProperty.setVal(STVerticalAlignRun.BASELINE);
-                    break;
-                case Font.SS_SUB:
-                    offsetProperty.setVal(STVerticalAlignRun.SUBSCRIPT);
-                    break;
-                case Font.SS_SUPER:
-                    offsetProperty.setVal(STVerticalAlignRun.SUPERSCRIPT);
-                    break;
-                default:
-                    throw new IllegalStateException("Invalid type offset: " + offset);
-            }
-        }
-    }
-
-    /**
-     * set the style of underlining that is used.
-     * The none style is equivalent to not using underlining at all.
-     *
-     * @param underline - underline type to use
-     * @see FontUnderline
-     */
-    public void setUnderline(byte underline) {
-        setUnderline(FontUnderline.valueOf(underline));
-    }
-
-    /**
-     * set an enumeration representing the style of underlining that is used.
-     * The none style is equivalent to not using underlining at all.
-     * The possible values for this attribute are defined by the FontUnderline
-     *
-     * @param underline - FontUnderline enum value
-     */
-    public void setUnderline(FontUnderline underline) {
-        if(underline == FontUnderline.NONE && _ctFont.sizeOfUArray() > 0){
-            _ctFont.setUArray(null);
-        } else {
-            CTUnderlineProperty ctUnderline = _ctFont.sizeOfUArray() == 0 ? _ctFont.addNewU() : _ctFont.getUArray(0);
-            STUnderlineValues.Enum val = STUnderlineValues.Enum.forInt(underline.getValue());
-            ctUnderline.setVal(val);
-        }
-    }
-
-
-    public String toString() {
-        return _ctFont.toString();
-    }
-
-
-    /**
-     * Perform a registration of ourselves 
-     *  to the style table
-     */
-    public long registerTo(StylesTable styles) {
-        this._themes = styles.getTheme();
-        short idx = (short)styles.putFont(this, true);
-        this._index = idx;
-        return idx;
-    }
-    /**
-     * Records the Themes Table that is associated with
-     *  the current font, used when looking up theme
-     *  based colours and properties.
-     */
-    public void setThemesTable(ThemesTable themes) {
-       this._themes = themes;
-    }
-
-    /**
-     * get the font scheme property.
-     * is used only in StylesTable to create the default instance of font
-     *
-     * @return FontScheme
-     * @see org.apache.poi.xssf.model.StylesTable#createDefaultFont()
-     */
-    public FontScheme getScheme() {
-        CTFontScheme scheme = _ctFont.sizeOfSchemeArray() == 0 ? null : _ctFont.getSchemeArray(0);
-        return scheme == null ? FontScheme.NONE : FontScheme.valueOf(scheme.getVal().intValue());
-    }
-
-    /**
-     * set font scheme property
-     *
-     * @param scheme - FontScheme enum value
-     * @see FontScheme
-     */
-    public void setScheme(FontScheme scheme) {
-        CTFontScheme ctFontScheme = _ctFont.sizeOfSchemeArray() == 0 ? _ctFont.addNewScheme() : _ctFont.getSchemeArray(0);
-        STFontScheme.Enum val = STFontScheme.Enum.forInt(scheme.getValue());
-        ctFontScheme.setVal(val);
-    }
-
-    /**
-     * get the font family to use.
-     *
-     * @return the font family to use
-     * @see org.apache.poi.ss.usermodel.FontFamily
-     */
-    public int getFamily() {
-        CTIntProperty family = _ctFont.sizeOfFamilyArray() == 0 ? _ctFont.addNewFamily() : _ctFont.getFamilyArray(0);
-        return family == null ? FontFamily.NOT_APPLICABLE.getValue() : FontFamily.valueOf(family.getVal()).getValue();
-    }
-
-    /**
-     * Set the font family this font belongs to.
-     * A font family is a set of fonts having common stroke width and serif characteristics.
-     * The font name overrides when there are conflicting values.
-     *
-     * @param value - font family
-     * @see FontFamily
-     */
-    public void setFamily(int value) {
-        CTIntProperty family = _ctFont.sizeOfFamilyArray() == 0 ? _ctFont.addNewFamily() : _ctFont.getFamilyArray(0);
-        family.setVal(value);
-    }
-
-    /**
-     * set an enumeration representing the font family this font belongs to.
-     * A font family is a set of fonts having common stroke width and serif characteristics.
-     *
-     * @param family font family
-     * @link #setFamily(int value)
-     */
-    public void setFamily(FontFamily family) {
-        setFamily(family.getValue());
-    }
-
-    /**
-     * get the index within the XSSFWorkbook (sequence within the collection of Font objects)
-     * @return unique index number of the underlying record this Font represents (probably you don't care
-     *  unless you're comparing which one is which)
-     */
-    public short getIndex()
-    {
-        return _index;
-    }
-
-    public int hashCode(){
-        return _ctFont.toString().hashCode();
-    }
-
-    public boolean equals(Object o){
-        if(!(o instanceof XSSFFont)) return false;
-
-        XSSFFont cf = (XSSFFont)o;
-        return _ctFont.toString().equals(cf.getCTFont().toString());
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
deleted file mode 100644
index 8e8a3d8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.*;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTUnderlineProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STUnderlineValues;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFontSize;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTVerticalAlignFontProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STVerticalAlignRun;
-
-
-/**
- * @author Yegor Kozlov
- */
-public class XSSFFontFormatting implements FontFormatting {
-    CTFont _font;
-
-    /*package*/ XSSFFontFormatting(CTFont font){
-        _font = font;
-    }
-
-    /**
-     * get the type of super or subscript for the font
-     *
-     * @return super or subscript option
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-    @Override
-    public short getEscapementType(){
-        if(_font.sizeOfVertAlignArray() == 0) return SS_NONE;
-
-        CTVerticalAlignFontProperty prop = _font.getVertAlignArray(0);
-        return (short)(prop.getVal().intValue() - 1);
-   }
-
-    /**
-     * set the escapement type for the font
-     *
-     * @param escapementType  super or subscript option
-     * @see #SS_NONE
-     * @see #SS_SUPER
-     * @see #SS_SUB
-     */
-    @Override
-    public void setEscapementType(short escapementType){
-        _font.setVertAlignArray(null);
-        if(escapementType != SS_NONE){
-            _font.addNewVertAlign().setVal(STVerticalAlignRun.Enum.forInt(escapementType + 1));
-        }
-    }
-
-    /**
-     * @return font color index
-     */
-    @Override
-    public short getFontColorIndex(){
-        if(_font.sizeOfColorArray() == 0) return -1;
-
-        int idx = 0;
-        CTColor color = _font.getColorArray(0);
-        if(color.isSetIndexed()) idx = (int)color.getIndexed();
-        return (short)idx;
-    }
-
-    /**
-     * @param color font color index
-     */
-    @Override
-    public void setFontColorIndex(short color){
-        _font.setColorArray(null);
-        if(color != -1){
-            _font.addNewColor().setIndexed(color);
-        }
-    }
-
-    @Override
-    public XSSFColor getFontColor() {
-        if(_font.sizeOfColorArray() == 0) return null;
-
-        return new XSSFColor(_font.getColorArray(0));
-    }
-
-    @Override
-    public void setFontColor(Color color) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(color);
-        if (xcolor == null) {
-            _font.getColorList().clear();
-        } else {
-            _font.setColorArray(0, xcolor.getCTColor());
-        }
-    }
-
-    /**
-     * gets the height of the font in 1/20th point units
-     *
-     * @return fontheight (in points/20); or -1 if not modified
-     */
-    @Override
-    public int getFontHeight(){
-        if(_font.sizeOfSzArray() == 0) return -1;
-
-        CTFontSize sz = _font.getSzArray(0);
-        return (short)(20*sz.getVal());
-    }
-
-    /**
-     * Sets the height of the font in 1/20th point units
-     *
-     * @param height the height in twips (in points/20)
-     */
-    @Override
-    public void setFontHeight(int height){
-        _font.setSzArray(null);
-        if(height != -1){
-            _font.addNewSz().setVal((double)height / 20);
-        }
-    }
-
-    /**
-     * get the type of underlining for the font
-     *
-     * @return font underlining type
-     *
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-    @Override
-    public short getUnderlineType(){
-        if(_font.sizeOfUArray() == 0) return U_NONE;
-        CTUnderlineProperty u = _font.getUArray(0);
-        switch(u.getVal().intValue()){
-            case STUnderlineValues.INT_SINGLE: return U_SINGLE;
-            case STUnderlineValues.INT_DOUBLE: return U_DOUBLE;
-            case STUnderlineValues.INT_SINGLE_ACCOUNTING: return U_SINGLE_ACCOUNTING;
-            case STUnderlineValues.INT_DOUBLE_ACCOUNTING: return U_DOUBLE_ACCOUNTING;
-            default: return U_NONE;
-        }
-    }
-
-    /**
-     * set the type of underlining type for the font
-     *
-     * @param underlineType  super or subscript option
-     *
-     * @see #U_NONE
-     * @see #U_SINGLE
-     * @see #U_DOUBLE
-     * @see #U_SINGLE_ACCOUNTING
-     * @see #U_DOUBLE_ACCOUNTING
-     */
-    @Override
-    public void setUnderlineType(short underlineType){
-        _font.setUArray(null);
-        if(underlineType != U_NONE){
-            FontUnderline fenum = FontUnderline.valueOf(underlineType);
-            STUnderlineValues.Enum val = STUnderlineValues.Enum.forInt(fenum.getValue());
-            _font.addNewU().setVal(val);
-        }
-     }
-
-    /**
-     * get whether the font weight is set to bold or not
-     *
-     * @return bold - whether the font is bold or not
-     */
-    @Override
-    public boolean isBold(){
-        return _font.sizeOfBArray() == 1 && _font.getBArray(0).getVal();
-    }
-
-    /**
-     * @return true if font style was set to <i>italic</i>
-     */
-    @Override
-    public boolean isItalic(){
-        return _font.sizeOfIArray() == 1 && _font.getIArray(0).getVal();
-    }
-
-    /**
-     * set font style options.
-     *
-     * @param italic - if true, set posture style to italic, otherwise to normal
-     * @param bold if true, set font weight to bold, otherwise to normal
-     */
-    @Override
-    public void setFontStyle(boolean italic, boolean bold){
-        _font.setIArray(null);
-        _font.setBArray(null);
-        if(italic) _font.addNewI().setVal(true);
-        if(bold) _font.addNewB().setVal(true);
-    }
-
-    /**
-     * set font style options to default values (non-italic, non-bold)
-     */
-    @Override
-    public void resetFontStyle(){
-        _font.set(CTFont.Factory.newInstance());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
deleted file mode 100644
index e63f47b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.formula.BaseFormulaEvaluator;
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-/**
- * Evaluates formula cells.<p/>
- *
- * For performance reasons, this class keeps a cache of all previously calculated intermediate
- * cell values.  Be sure to call {@link #clearAllCachedResultValues()} if any workbook cells are changed between
- * calls to evaluate~ methods on this class.
- */
-public final class XSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator {
-    private XSSFWorkbook _book;
-
-    public XSSFFormulaEvaluator(XSSFWorkbook workbook) {
-        this(workbook, null, null);
-    }
-    private XSSFFormulaEvaluator(XSSFWorkbook workbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        this(workbook, new WorkbookEvaluator(XSSFEvaluationWorkbook.create(workbook), stabilityClassifier, udfFinder));
-    }
-    protected XSSFFormulaEvaluator(XSSFWorkbook workbook, WorkbookEvaluator bookEvaluator) {
-        super(bookEvaluator);
-        _book = workbook;
-    }
-
-    /**
-     * @param stabilityClassifier used to optimise caching performance. Pass <code>null</code>
-     * for the (conservative) assumption that any cell may have its definition changed after
-     * evaluation begins.
-     * @param udfFinder pass <code>null</code> for default (AnalysisToolPak only)
-     */
-    public static XSSFFormulaEvaluator create(XSSFWorkbook workbook, IStabilityClassifier stabilityClassifier, UDFFinder udfFinder) {
-        return new XSSFFormulaEvaluator(workbook, stabilityClassifier, udfFinder);
-    }
-
-    /**
-     * Loops over all cells in all sheets of the supplied
-     *  workbook.
-     * For cells that contain formulas, their formulas are
-     *  evaluated, and the results are saved. These cells
-     *  remain as formula cells.
-     * For cells that do not contain formulas, no changes
-     *  are made.
-     * This is a helpful wrapper around looping over all
-     *  cells, and calling evaluateFormulaCell on each one.
-     */
-    public static void evaluateAllFormulaCells(XSSFWorkbook wb) {
-        BaseFormulaEvaluator.evaluateAllFormulaCells(wb);
-    }
-    
-    @Override
-    public XSSFCell evaluateInCell(Cell cell) {
-        return (XSSFCell) super.evaluateInCell(cell);
-    }
-    
-    /**
-     * Loops over all cells in all sheets of the supplied
-     *  workbook.
-     * For cells that contain formulas, their formulas are
-     *  evaluated, and the results are saved. These cells
-     *  remain as formula cells.
-     * For cells that do not contain formulas, no changes
-     *  are made.
-     * This is a helpful wrapper around looping over all
-     *  cells, and calling evaluateFormulaCell on each one.
-     */
-    public void evaluateAll() {
-        evaluateAllFormulaCells(_book, this);
-    }
-
-    /**
-     * Turns a XSSFCell into a XSSFEvaluationCell
-     */
-    protected EvaluationCell toEvaluationCell(Cell cell) {
-        if (!(cell instanceof XSSFCell)){
-            throw new IllegalArgumentException("Unexpected type of cell: " + cell.getClass() + "." +
-                    " Only XSSFCells can be evaluated.");
-        }
-
-        return new XSSFEvaluationCell((XSSFCell)cell);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
deleted file mode 100644
index 08d781b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlCursor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObjectData;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGraphicalObjectFrame;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGraphicalObjectFrameNonVisual;
-import org.openxmlformats.schemas.officeDocument.x2006.relationships.STRelationshipId;
-
-/**
- * Represents DrawingML GraphicalObjectFrame.
- *
- * @author Roman Kashitsyn
- */
-public final class XSSFGraphicFrame extends XSSFShape {
-
-	private static CTGraphicalObjectFrame prototype = null;
-
-	private CTGraphicalObjectFrame graphicFrame;
-	private XSSFClientAnchor anchor;
-
-	/**
-	 * Construct a new XSSFGraphicFrame object.
-	 *
-	 * @param drawing the XSSFDrawing that owns this frame
-	 * @param ctGraphicFrame the XML bean that stores this frame content
-	 */
-	protected XSSFGraphicFrame(XSSFDrawing drawing, CTGraphicalObjectFrame ctGraphicFrame) {
-		this.drawing = drawing; // protected field on XSSFShape
-		this.graphicFrame = ctGraphicFrame;
-	}
-
-	@Internal
-	public CTGraphicalObjectFrame getCTGraphicalObjectFrame() {
-		return graphicFrame;
-	}
-
-	/**
-	 * Initialize default structure of a new graphic frame
-	 */
-	protected static CTGraphicalObjectFrame prototype() {
-		if (prototype == null) {
-			CTGraphicalObjectFrame graphicFrame = CTGraphicalObjectFrame.Factory.newInstance();
-
-			CTGraphicalObjectFrameNonVisual nvGraphic = graphicFrame.addNewNvGraphicFramePr();
-			CTNonVisualDrawingProps props = nvGraphic.addNewCNvPr();
-			props.setId(0);
-			props.setName("Diagramm 1");
-			nvGraphic.addNewCNvGraphicFramePr();
-
-			CTTransform2D transform = graphicFrame.addNewXfrm();
-			CTPositiveSize2D extPoint = transform.addNewExt();
-			CTPoint2D offPoint = transform.addNewOff();
-
-			extPoint.setCx(0);
-			extPoint.setCy(0);
-			offPoint.setX(0);
-			offPoint.setY(0);
-
-			/* CTGraphicalObject graphic = */ graphicFrame.addNewGraphic();
-
-			prototype = graphicFrame;
-		}
-		return prototype;
-	}
-
-	/**
-	 * Sets the frame macro.
-	 */
-	public void setMacro(String macro) {
-		graphicFrame.setMacro(macro);
-	}
-
-	/**
-	 * Sets the frame name.
-	 */
-	public void setName(String name) {
-		getNonVisualProperties().setName(name);
-	}
-
-	/**
-	 * Returns the frame name.
-	 * @return name of the frame
-	 */
-	public String getName() {
-		return getNonVisualProperties().getName();
-	}
-
-	private CTNonVisualDrawingProps getNonVisualProperties() {
-		CTGraphicalObjectFrameNonVisual nvGraphic = graphicFrame.getNvGraphicFramePr();
-		return nvGraphic.getCNvPr();
-	}
-
-	/**
-	 * Attaches frame to an anchor.
-	 */
-	protected void setAnchor(XSSFClientAnchor anchor) {
-		this.anchor = anchor;
-	}
-
-	/**
-	 * Returns the frame anchor.
-	 * @return the anchor this frame is attached to
-	 */
-	public XSSFClientAnchor getAnchor() {
-		return anchor;
-	}
-
-	/**
-	 * Assign a DrawingML chart to the graphic frame.
-	 */
-	protected void setChart(XSSFChart chart, String relId) {
-		CTGraphicalObjectData data = graphicFrame.getGraphic().addNewGraphicData();
-		appendChartElement(data, relId);
-		chart.setGraphicFrame(this);
-		return;
-	}
-
-	/**
-	 * Gets the frame id.
-	 */
-	public long getId() {
-		return graphicFrame.getNvGraphicFramePr().getCNvPr().getId();
-	}
-
-	/**
-	 * Sets the frame id.
-	 */
-	protected void setId(long id) {
-		graphicFrame.getNvGraphicFramePr().getCNvPr().setId(id);
-	}
-
-	/**
-	 * The low level code to insert {@code <c:chart>} tag into
-	 * {@code<a:graphicData>}.
-	 *
-	 * Here is the schema (ECMA-376):
-	 * <pre>
-	 * {@code
-	 * <complexType name="CT_GraphicalObjectData">
-	 *   <sequence>
-	 *     <any minOccurs="0" maxOccurs="unbounded" processContents="strict"/>
-	 *   </sequence>
-	 *   <attribute name="uri" type="xsd:token"/>
-	 * </complexType>
-	 * }
-	 * </pre>
-	 */
-	private void appendChartElement(CTGraphicalObjectData data, String id) {
-		String r_namespaceUri = STRelationshipId.type.getName().getNamespaceURI();
-		String c_namespaceUri = XSSFDrawing.NAMESPACE_C;
-		XmlCursor cursor = data.newCursor();
-		cursor.toNextToken();
-		cursor.beginElement(new QName(c_namespaceUri, "chart", "c"));
-		cursor.insertAttributeWithValue(new QName(r_namespaceUri, "id", "r"), id);
-		cursor.dispose();
-		data.setUri(c_namespaceUri);
-	}
-
-    @Override
-    protected CTShapeProperties getShapeProperties(){
-        return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
deleted file mode 100644
index 9d26a66..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHyperlink;
-
-/**
- * XSSF Implementation of a Hyperlink.
- * Note - unlike with HSSF, many kinds of hyperlink
- * are largely stored as relations of the sheet
- */
-public class XSSFHyperlink implements Hyperlink {
-    final private HyperlinkType _type;
-    final private PackageRelationship _externalRel;
-    final private CTHyperlink _ctHyperlink; //contains a reference to the cell where the hyperlink is anchored, getRef()
-    private String _location; //what the hyperlink refers to
-
-    /**
-     * Create a new XSSFHyperlink. This method is protected to be used only by
-     * {@link XSSFCreationHelper#createHyperlink(int)}.
-     *
-     * @param type - the type of hyperlink to create, see {@link Hyperlink}
-     * @deprecated POI 3.15 beta 3. Use {@link #XSSFHyperlink(HyperlinkType)} instead.
-     */
-    protected XSSFHyperlink(int type) {
-        this(HyperlinkType.forInt(type));
-    }
-    
-    /**
-     * Create a new XSSFHyperlink. This method is protected to be used only by
-     * {@link XSSFCreationHelper#createHyperlink(HyperlinkType)}.
-     *
-     * @param type - the type of hyperlink to create
-     */
-    protected XSSFHyperlink(HyperlinkType type) {
-        _type = type;
-        _ctHyperlink = CTHyperlink.Factory.newInstance();
-        _externalRel = null;
-    }
-
-    /**
-     * Create a XSSFHyperlink and initialize it from the supplied CTHyperlink bean and package relationship
-     *
-     * @param ctHyperlink the xml bean containing xml properties
-     * @param hyperlinkRel the relationship in the underlying OPC package which stores the actual link's address
-     */
-    protected XSSFHyperlink(CTHyperlink ctHyperlink, PackageRelationship hyperlinkRel) {
-        _ctHyperlink = ctHyperlink;
-        _externalRel = hyperlinkRel;
-
-        // Figure out the Hyperlink type and destination
-
-        if (_externalRel == null) {
-            // If it has a location, it's internal
-            if (ctHyperlink.getLocation() != null) {
-                _type = HyperlinkType.DOCUMENT;
-                _location = ctHyperlink.getLocation();
-            } else if (ctHyperlink.getId() != null) {
-                throw new IllegalStateException("The hyperlink for cell "
-                        + ctHyperlink.getRef() + " references relation "
-                        + ctHyperlink.getId() + ", but that didn't exist!");
-            } else {
-                // hyperlink is internal and is not related to other parts
-                _type = HyperlinkType.DOCUMENT;
-            }
-        } else {
-            URI target = _externalRel.getTargetURI();
-            _location = target.toString();
-            if (ctHyperlink.getLocation() != null) {
-                // URI fragment
-                _location += "#" + ctHyperlink.getLocation();
-            }
-
-            // Try to figure out the type
-               if (_location.startsWith("http://") || _location.startsWith("https://")
-                    || _location.startsWith("ftp://")) {
-                _type = HyperlinkType.URL;
-            } else if (_location.startsWith("mailto:")) {
-                _type = HyperlinkType.EMAIL;
-            } else {
-                _type = HyperlinkType.FILE;
-            }
-        }
-
-     }
-
-    /**
-     * Create a new XSSFHyperlink. This method is for Internal use only.
-     * XSSFHyperlinks can be created by {@link XSSFCreationHelper}.
-     * See the <a href="https://poi.apache.org/spreadsheet/quick-guide.html#Hyperlinks">spreadsheet quick-guide</a>
-     * for an example.
-     *
-     * @param other the hyperlink to copy
-     */
-    @Internal //FIXME: change to protected if/when SXSSFHyperlink class is created
-    public XSSFHyperlink(Hyperlink other) {
-        if (other instanceof XSSFHyperlink) {
-            XSSFHyperlink xlink = (XSSFHyperlink) other;
-            _type = xlink.getTypeEnum();
-            _location = xlink._location;
-            _externalRel = xlink._externalRel;
-            _ctHyperlink = (CTHyperlink) xlink._ctHyperlink.copy();
-        }
-        else {
-            _type = other.getTypeEnum();
-            _location = other.getAddress();
-            _externalRel = null;
-            _ctHyperlink = CTHyperlink.Factory.newInstance();
-            setCellReference(new CellReference(other.getFirstRow(), other.getFirstColumn()));
-        }
-    }
-    /**
-     * @return the underlying CTHyperlink object
-     */
-    @Internal
-    public CTHyperlink getCTHyperlink() {
-        return _ctHyperlink;
-    }
-
-    /**
-     * Do we need to a relation too, to represent
-     * this hyperlink?
-     */
-    public boolean needsRelationToo() {
-        return (_type != HyperlinkType.DOCUMENT);
-    }
-
-    /**
-     * Generates the relation if required
-     */
-    protected void generateRelationIfNeeded(PackagePart sheetPart) {
-        if (_externalRel == null && needsRelationToo()) {
-            // Generate the relation
-            PackageRelationship rel =
-                    sheetPart.addExternalRelationship(_location, XSSFRelation.SHEET_HYPERLINKS.getRelation());
-
-            // Update the r:id
-            _ctHyperlink.setId(rel.getId());
-        }
-    }
-
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     * @see HyperlinkType#forInt
-     * @deprecated POI 3.15 beta 3. Use {@link #getTypeEnum()} instead.
-     * getType will return a HyperlinkType enum in the future.
-     */
-    @Override
-    public int getType() {
-        return _type.getCode();
-    }
-    
-    /**
-     * Return the type of this hyperlink
-     *
-     * @return the type of this hyperlink
-     */
-    @Override
-    public HyperlinkType getTypeEnum() {
-        return _type;
-    }
-
-    /**
-     * Get the reference of the cell this applies to,
-     * es A55
-     */
-    public String getCellRef() {
-        return _ctHyperlink.getRef();
-    }
-
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file.
-     * The is the hyperlink target.
-     *
-     * @return the address of this hyperlink
-     */
-    @Override
-    public String getAddress() {
-        return _location;
-    }
-
-    /**
-     * Return text label for this hyperlink
-     *
-     * @return text to display
-     */
-    @Override
-    public String getLabel() {
-        return _ctHyperlink.getDisplay();
-    }
-
-    /**
-     * Location within target. If target is a workbook (or this workbook) this shall refer to a
-     * sheet and cell or a defined name. Can also be an HTML anchor if target is HTML file.
-     *
-     * @return location
-     */
-    public String getLocation() {
-        return _ctHyperlink.getLocation();
-    }
-
-    /**
-     * Sets text label for this hyperlink
-     *
-     * @param label text label for this hyperlink
-     */
-    @Override
-    public void setLabel(String label) {
-        _ctHyperlink.setDisplay(label);
-    }
-
-    /**
-     * Location within target. If target is a workbook (or this workbook) this shall refer to a
-     * sheet and cell or a defined name. Can also be an HTML anchor if target is HTML file.
-     *
-     * @param location - string representing a location of this hyperlink
-     */
-    public void setLocation(String location) {
-        _ctHyperlink.setLocation(location);
-    }
-
-    /**
-     * Hyperlink address. Depending on the hyperlink type it can be URL, e-mail, path to a file
-     * This is the hyperlink target.
-     *
-     * @param address - the address of this hyperlink
-     */
-    @Override
-    public void setAddress(String address) {
-        validate(address);
-
-       _location = address;
-        //we must set location for internal hyperlinks
-        if (_type == HyperlinkType.DOCUMENT) {
-            setLocation(address);
-        }
-    }
-
-    @SuppressWarnings("fall-through")
-    private void validate(String address) {
-        switch (_type) {
-            // email, path to file and url must be valid URIs
-            case EMAIL:
-            case FILE:
-            case URL:
-                try {
-                    new URI(address);
-                } catch (URISyntaxException e) {
-                    throw new IllegalArgumentException("Address of hyperlink must be a valid URI", e);
-                }
-                break;
-            case DOCUMENT:
-                // currently not evaluating anything.
-                break;
-            default:
-                throw new IllegalStateException("Invalid Hyperlink type: " + _type);
-        }
-    }
-
-    /**
-     * Assigns this hyperlink to the given cell reference
-     */
-    @Internal
-    public void setCellReference(String ref) {
-        _ctHyperlink.setRef(ref);
-    }
-    @Internal
-    protected void setCellReference(CellReference ref) {
-        setCellReference(ref.formatAsString());
-    }
-
-    private CellReference buildCellReference() {
-        String ref = _ctHyperlink.getRef();
-        if (ref == null) {
-            ref = "A1";
-        }
-        return new CellReference(ref);
-    }
-
-
-    /**
-     * Return the column of the first cell that contains the hyperlink
-     *
-     * @return the 0-based column of the first cell that contains the hyperlink
-     */
-    @Override
-    public int getFirstColumn() {
-        return buildCellReference().getCol();
-    }
-
-
-    /**
-     * Return the column of the last cell that contains the hyperlink
-     *
-     * @return the 0-based column of the last cell that contains the hyperlink
-     */
-    @Override
-    public int getLastColumn() {
-        return buildCellReference().getCol();
-    }
-
-    /**
-     * Return the row of the first cell that contains the hyperlink
-     *
-     * @return the 0-based row of the cell that contains the hyperlink
-     */
-    @Override
-    public int getFirstRow() {
-        return buildCellReference().getRow();
-    }
-
-
-    /**
-     * Return the row of the last cell that contains the hyperlink
-     *
-     * @return the 0-based row of the last cell that contains the hyperlink
-     */
-    @Override
-    public int getLastRow() {
-        return buildCellReference().getRow();
-    }
-
-    /**
-     * Set the column of the first cell that contains the hyperlink
-     *
-     * @param col the 0-based column of the first cell that contains the hyperlink
-     */
-    @Override
-    public void setFirstColumn(int col) {
-        setCellReference(new CellReference( getFirstRow(), col ));
-    }
-
-    /**
-     * Set the column of the last cell that contains the hyperlink.
-     * For XSSF, a Hyperlink may only reference one cell
-     *
-     * @param col the 0-based column of the last cell that contains the hyperlink
-     */
-    @Override
-    public void setLastColumn(int col) {
-        setFirstColumn(col);
-    }
-
-    /**
-     * Set the row of the first cell that contains the hyperlink
-     *
-     * @param row the 0-based row of the first cell that contains the hyperlink
-     */
-    @Override
-    public void setFirstRow(int row) {
-        setCellReference(new CellReference( row, getFirstColumn() ));
-    }
-
-    /**
-     * Set the row of the last cell that contains the hyperlink.
-     * For XSSF, a Hyperlink may only reference one cell
-     *
-     * @param row the 0-based row of the last cell that contains the hyperlink
-     */
-    @Override
-    public void setLastRow(int row) {
-        setFirstRow(row);
-	}
-
-    /**
-     * @return additional text to help the user understand more about the hyperlink
-     */
-    public String getTooltip() {
-        return _ctHyperlink.getTooltip();
-    }
-
-    /**
-     * @param text  additional text to help the user understand more about the hyperlink
-     */
-    public void setTooltip(String text) {
-        _ctHyperlink.setTooltip(text);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
deleted file mode 100644
index c2e2691..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCfvo;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIconSet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STIconSetType;
-
-/**
- * High level representation for Icon / Multi-State Formatting 
- *  component of Conditional Formatting settings
- */
-public class XSSFIconMultiStateFormatting implements IconMultiStateFormatting {
-    CTIconSet _iconset;
-
-    /*package*/ XSSFIconMultiStateFormatting(CTIconSet iconset){
-        _iconset = iconset;
-    }
-
-    public IconSet getIconSet() {
-        String set = _iconset.getIconSet().toString();
-        return IconSet.byName(set);
-    }
-    public void setIconSet(IconSet set) {
-        STIconSetType.Enum xIconSet = STIconSetType.Enum.forString(set.name);
-        _iconset.setIconSet(xIconSet);
-    }
-
-    public boolean isIconOnly() {
-        if (_iconset.isSetShowValue())
-            return !_iconset.getShowValue();
-        return false;
-    }
-    public void setIconOnly(boolean only) {
-        _iconset.setShowValue(!only);
-    }
-
-    public boolean isReversed() {
-        if (_iconset.isSetReverse())
-            return _iconset.getReverse();
-        return false;
-    }
-    public void setReversed(boolean reversed) {
-        _iconset.setReverse(reversed);
-    }
-
-    public XSSFConditionalFormattingThreshold[] getThresholds() {
-        CTCfvo[] cfvos = _iconset.getCfvoArray();
-        XSSFConditionalFormattingThreshold[] t = 
-                new XSSFConditionalFormattingThreshold[cfvos.length];
-        for (int i=0; i<cfvos.length; i++) {
-            t[i] = new XSSFConditionalFormattingThreshold(cfvos[i]);
-        }
-        return t;
-    }
-    public void setThresholds(ConditionalFormattingThreshold[] thresholds) {
-        CTCfvo[] cfvos = new CTCfvo[thresholds.length];
-        for (int i=0; i<thresholds.length; i++) {
-            cfvos[i] = ((XSSFConditionalFormattingThreshold)thresholds[i]).getCTCfvo();
-        }
-        _iconset.setCfvoArray(cfvos);
-    }
-    public XSSFConditionalFormattingThreshold createThreshold() {
-        return new XSSFConditionalFormattingThreshold(_iconset.addNewCfvo());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
deleted file mode 100644
index 9959699..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-
-class XSSFLineBreak extends XSSFTextRun {
-    private final CTTextCharacterProperties _brProps;
-
-    XSSFLineBreak(CTRegularTextRun r, XSSFTextParagraph p, CTTextCharacterProperties brProps){
-        super(r, p);
-        _brProps = brProps;
-    }
-
-    @Override
-    protected CTTextCharacterProperties getRPr(){
-        return _brProps;
-    }
-
-    /**
-     * Always throws IllegalStateException. You cannot change text of a line break.
-     */
-    public void setText(String text){
-        throw new IllegalStateException("You cannot change text of a line break, it is always '\\n'");
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java
deleted file mode 100644
index d4d148c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLDocumentPart.RelationPart;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xssf.model.MapInfo;
-import org.apache.poi.xssf.model.SingleXmlCells;
-import org.apache.poi.xssf.usermodel.helpers.XSSFSingleXmlCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMap;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSchema;
-import org.w3c.dom.Node;
-
-/**
- * This class implements the Map element (Open Office XML Part 4:
- * chapter 3.16.2)
- * <p/>
- * This element contains all of the properties related to the XML map,
- * and the behaviors expected during data refresh operations.
- *
- * @author Roberto Manicardi
- */
-
-
-public class XSSFMap {
-    private CTMap ctMap;
-    private MapInfo mapInfo;
-
-    public XSSFMap(CTMap ctMap, MapInfo mapInfo) {
-        this.ctMap = ctMap;
-        this.mapInfo = mapInfo;
-    }
-
-
-    @Internal
-    public CTMap getCtMap() {
-        return ctMap;
-    }
-
-    @Internal
-    public CTSchema getCTSchema() {
-        String schemaId = ctMap.getSchemaID();
-        return mapInfo.getCTSchemaById(schemaId);
-    }
-
-    public Node getSchema() {
-        Node xmlSchema = null;
-
-        CTSchema schema = getCTSchema();
-        xmlSchema = schema.getDomNode().getFirstChild();
-
-        return xmlSchema;
-    }
-
-    /**
-     * @return the list of Single Xml Cells that provide a map rule to this mapping.
-     */
-    public List<XSSFSingleXmlCell> getRelatedSingleXMLCell() {
-        List<XSSFSingleXmlCell> relatedSimpleXmlCells = new ArrayList<XSSFSingleXmlCell>();
-
-        int sheetNumber = mapInfo.getWorkbook().getNumberOfSheets();
-        for (int i = 0; i < sheetNumber; i++) {
-            XSSFSheet sheet = mapInfo.getWorkbook().getSheetAt(i);
-            for (POIXMLDocumentPart p : sheet.getRelations()) {
-                if (p instanceof SingleXmlCells) {
-                    SingleXmlCells singleXMLCells = (SingleXmlCells) p;
-                    for (XSSFSingleXmlCell cell : singleXMLCells.getAllSimpleXmlCell()) {
-                        if (cell.getMapId() == ctMap.getID()) {
-                            relatedSimpleXmlCells.add(cell);
-                        }
-                    }
-                }
-            }
-        }
-        return relatedSimpleXmlCells;
-    }
-
-    /**
-     * @return the list of all Tables that provide a map rule to this mapping
-     */
-    public List<XSSFTable> getRelatedTables() {
-        List<XSSFTable> tables = new ArrayList<XSSFTable>();
-        for (Sheet sheet : mapInfo.getWorkbook()) {
-            for (RelationPart rp : ((XSSFSheet)sheet).getRelationParts()) {
-                if (rp.getRelationship().getRelationshipType().equals(XSSFRelation.TABLE.getRelation())) {
-                    XSSFTable table = rp.getDocumentPart();
-                    if (table.mapsTo(ctMap.getID())) {
-                        tables.add(table);
-                    }
-                }
-            }
-        }
-
-        return tables;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
deleted file mode 100644
index dd6fbcc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.ptg.Ptg;
-
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName;
-
-/**
- * Represents a defined named range in a SpreadsheetML workbook.
- * <p>
- * Defined names are descriptive text that is used to represents a cell, range of cells, formula, or constant value.
- * Use easy-to-understand names, such as Products, to refer to hard to understand ranges, such as <code>Sales!C20:C30</code>.
- * </p>
- * Example:
- * <pre><blockquote>
- *   XSSFWorkbook wb = new XSSFWorkbook();
- *   XSSFSheet sh = wb.createSheet("Sheet1");
- *
- *   //applies to the entire workbook
- *   XSSFName name1 = wb.createName();
- *   name1.setNameName("FMLA");
- *   name1.setRefersToFormula("Sheet1!$B$3");
- *
- *   //applies to Sheet1
- *   XSSFName name2 = wb.createName();
- *   name2.setNameName("SheetLevelName");
- *   name2.setComment("This name is scoped to Sheet1");
- *   name2.setLocalSheetId(0);
- *   name2.setRefersToFormula("Sheet1!$B$3");
- *
- * </blockquote></pre>
- *
- * @author Nick Burch
- * @author Yegor Kozlov
- */
-public final class XSSFName implements Name {
-    
-    /**
-     * A built-in defined name that specifies the workbook's print area
-     */
-    public final static String BUILTIN_PRINT_AREA = "_xlnm.Print_Area";
-
-    /**
-     * A built-in defined name that specifies the row(s) or column(s) to repeat
-     * at the top of each printed page.
-     */
-    public final static String BUILTIN_PRINT_TITLE = "_xlnm.Print_Titles";
-
-    /**
-     * A built-in defined name that refers to a range containing the criteria values
-     * to be used in applying an advanced filter to a range of data
-     */
-    public final static String BUILTIN_CRITERIA = "_xlnm.Criteria:";
-
-
-    /**
-     * this defined name refers to the range containing the filtered
-     * output values resulting from applying an advanced filter criteria to a source
-     * range
-     */
-    public final static String BUILTIN_EXTRACT = "_xlnm.Extract:";
-
-    /**
-     * ?an be one of the following
-     * <li> this defined name refers to a range to which an advanced filter has been
-     * applied. This represents the source data range, unfiltered.
-     * <li> This defined name refers to a range to which an AutoFilter has been
-     * applied
-     */
-    public final static String BUILTIN_FILTER_DB = "_xlnm._FilterDatabase";
-
-    /**
-     * A built-in defined name that refers to a consolidation area
-     */
-    public final static String BUILTIN_CONSOLIDATE_AREA = "_xlnm.Consolidate_Area";
-
-    /**
-     * A built-in defined name that specified that the range specified is from a database data source
-     */
-    public final static String BUILTIN_DATABASE = "_xlnm.Database";
-
-    /**
-     * A built-in defined name that refers to a sheet title.
-     */
-    public final static String BUILTIN_SHEET_TITLE = "_xlnm.Sheet_Title";
-
-    private XSSFWorkbook _workbook;
-    private CTDefinedName _ctName;
-
-    /**
-     * Creates an XSSFName object - called internally by XSSFWorkbook.
-     *
-     * @param name - the xml bean that holds data represenring this defined name.
-     * @param workbook - the workbook object associated with the name
-     * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#createName()
-     */
-    protected XSSFName(CTDefinedName name, XSSFWorkbook workbook) {
-        _workbook = workbook;
-        _ctName = name;
-    }
-
-    /**
-     * Returns the underlying named range object
-     */
-    protected CTDefinedName getCTName() {
-        return _ctName;
-    }
-
-    /**
-     * Returns the name that will appear in the user interface for the defined name.
-     *
-     * @return text name of this defined name
-     */
-    public String getNameName() {
-        return _ctName.getName();
-    }
-
-    /**
-     * Sets the name that will appear in the user interface for the defined name.
-     * Names must begin with a letter or underscore, not contain spaces and be unique across the workbook.
-     *
-     * <p>
-     * A name must always be unique within its scope. POI prevents you from defining a name that is not unique
-     * within its scope. However you can use the same name in different scopes. Example:
-     * <pre><blockquote>
-     * //by default names are workbook-global
-     * XSSFName name;
-     * name = workbook.createName();
-     * name.setNameName("sales_08");
-     *
-     * name = workbook.createName();
-     * name.setNameName("sales_08"); //will throw an exception: "The workbook already contains this name (case-insensitive)"
-     *
-     * //create sheet-level name
-     * name = workbook.createName();
-     * name.setSheetIndex(0); //the scope of the name is the first sheet
-     * name.setNameName("sales_08");  //ok
-     *
-     * name = workbook.createName();
-     * name.setSheetIndex(0);
-     * name.setNameName("sales_08");  //will throw an exception: "The sheet already contains this name (case-insensitive)"
-     *
-     * </blockquote></pre>
-    * </p>
-     * @param name name of this defined name
-     * @throws IllegalArgumentException if the name is invalid or the workbook already contains this name (case-insensitive)
-     */
-    public void setNameName(String name) {
-        validateName(name);
-
-        String oldName = getNameName();
-        int sheetIndex = getSheetIndex();
-        //Check to ensure no other names have the same case-insensitive name at the same scope
-        for (XSSFName foundName : _workbook.getNames(name)) {
-            if (foundName.getSheetIndex() == sheetIndex && foundName != this) {
-                String msg = "The "+(sheetIndex == -1 ? "workbook" : "sheet")+" already contains this name: " + name;
-                throw new IllegalArgumentException(msg);
-            }
-        }
-        _ctName.setName(name);
-        //Need to update the name -> named ranges map
-        _workbook.updateName(this, oldName);
-    }
-
-    public String getRefersToFormula() {
-        String result = _ctName.getStringValue();
-        if (result == null || result.length() < 1) {
-            return null;
-        }
-        return result;
-    }
-
-    public void setRefersToFormula(String formulaText) {
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(_workbook);
-        //validate through the FormulaParser
-        FormulaParser.parse(formulaText, fpb, FormulaType.NAMEDRANGE, getSheetIndex(), -1);
-
-        _ctName.setStringValue(formulaText);
-    }
-
-    public boolean isDeleted(){
-        String formulaText = getRefersToFormula();
-        if (formulaText == null) {
-            return false;
-        }
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(_workbook);
-        Ptg[] ptgs = FormulaParser.parse(formulaText, fpb, FormulaType.NAMEDRANGE, getSheetIndex(), -1);
-        return Ptg.doesFormulaReferToDeletedCell(ptgs);
-    }
-
-    /**
-     * Tell Excel that this name applies to the worksheet with the specified index instead of the entire workbook.
-     *
-     * @param index the sheet index this name applies to, -1 unsets this property making the name workbook-global
-     */
-    public void setSheetIndex(int index) {
-        int lastSheetIx = _workbook.getNumberOfSheets() - 1;
-        if (index < -1 || index > lastSheetIx) {
-            throw new IllegalArgumentException("Sheet index (" + index +") is out of range" +
-                    (lastSheetIx == -1 ? "" : (" (0.." +    lastSheetIx + ")")));
-        }
-
-        if(index == -1) {
-            if(_ctName.isSetLocalSheetId()) _ctName.unsetLocalSheetId();
-        } else {
-            _ctName.setLocalSheetId(index);
-        }
-    }
-
-    /**
-     * Returns the sheet index this name applies to.
-     *
-     * @return the sheet index this name applies to, -1 if this name applies to the entire workbook
-     */
-    public int getSheetIndex() {
-        return _ctName.isSetLocalSheetId() ? (int) _ctName.getLocalSheetId() : -1;
-    }
-
-    /**
-     * Indicates that the defined name refers to a user-defined function.
-     * This attribute is used when there is an add-in or other code project associated with the file.
-     *
-     * @param value <code>true</code> indicates the name refers to a function.
-     */
-    public void setFunction(boolean value) {
-        _ctName.setFunction(value);
-    }
-
-    /**
-     * Indicates that the defined name refers to a user-defined function.
-     * This attribute is used when there is an add-in or other code project associated with the file.
-     *
-     * @return <code>true</code> indicates the name refers to a function.
-     */
-    public boolean getFunction() {
-        return _ctName.getFunction();
-    }
-
-    /**
-     * Specifies the function group index if the defined name refers to a function. The function
-     * group defines the general category for the function. This attribute is used when there is
-     * an add-in or other code project associated with the file.
-     *
-     * @param functionGroupId the function group index that defines the general category for the function
-     */
-    public void setFunctionGroupId(int functionGroupId) {
-        _ctName.setFunctionGroupId(functionGroupId);
-    }
-
-    /**
-     * Returns the function group index if the defined name refers to a function. The function
-     * group defines the general category for the function. This attribute is used when there is
-     * an add-in or other code project associated with the file.
-     *
-     * @return the function group index that defines the general category for the function
-     */
-    public int getFunctionGroupId() {
-        return (int) _ctName.getFunctionGroupId();
-    }
-
-    /**
-     * Get the sheets name which this named range is referenced to
-     *
-     * @return sheet name, which this named range referred to.
-     * Empty string if the referenced sheet name weas not found.
-     */
-    public String getSheetName() {
-        if (_ctName.isSetLocalSheetId()) {
-            // Given as explicit sheet id
-            int sheetId = (int)_ctName.getLocalSheetId();
-            return _workbook.getSheetName(sheetId);
-        }
-        String ref = getRefersToFormula();
-        AreaReference areaRef = new AreaReference(ref);
-        return areaRef.getFirstCell().getSheetName();
-    }
-
-    /**
-     * Is the name refers to a user-defined function ?
-     *
-     * @return <code>true</code> if this name refers to a user-defined function
-     */
-    public boolean isFunctionName() {
-        return getFunction();
-    }
-
-    /**
-     * Returns the comment the user provided when the name was created.
-     *
-     * @return the user comment for this named range
-     */
-    public String getComment() {
-        return _ctName.getComment();
-    }
-
-    /**
-     * Specifies the comment the user provided when the name was created.
-     *
-     * @param comment  the user comment for this named range
-     */
-    public void setComment(String comment) {
-        _ctName.setComment(comment);
-    }
-
-    @Override
-    public int hashCode() {
-        return _ctName.toString().hashCode();
-    }
-
-    /**
-     * Compares this name to the specified object.
-     * The result is <code>true</code> if the argument is XSSFName and the
-     * underlying CTDefinedName bean equals to the CTDefinedName representing this name
-     *
-     * @param   o   the object to compare this <code>XSSFName</code> against.
-     * @return  <code>true</code> if the <code>XSSFName </code>are equal;
-     *          <code>false</code> otherwise.
-     */
-    @Override
-    public boolean equals(Object o) {
-        if(o == this) return true;
-
-        if (!(o instanceof XSSFName)) return false;
-
-        XSSFName cf = (XSSFName) o;
-        return _ctName.toString().equals(cf.getCTName().toString());
-    }
-    
-    /**
-     * https://support.office.com/en-us/article/Define-and-use-names-in-formulas-4D0F13AC-53B7-422E-AFD2-ABD7FF379C64#bmsyntax_rules_for_names
-     * 
-     * Valid characters:
-     *   First character: { letter | underscore | backslash }
-     *   Remaining characters: { letter | number | period | underscore }
-     *   
-     * Cell shorthand: cannot be { "C" | "c" | "R" | "r" }
-     * 
-     * Cell references disallowed: cannot be a cell reference $A$1 or R1C1
-     * 
-     * Spaces are not valid (follows from valid characters above)
-     * 
-     * Name length: (XSSF-specific?) 255 characters maximum
-     * 
-     * Case sensitivity: all names are case-insensitive
-     * 
-     * Uniqueness: must be unique (for names with the same scope)
-     *
-     * @param name
-     */
-    private static void validateName(String name) {
-        
-        if (name.length() == 0) {
-            throw new IllegalArgumentException("Name cannot be blank");
-        }
-        if (name.length() > 255) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': cannot exceed 255 characters in length");
-        }
-        if (name.equalsIgnoreCase("R") || name.equalsIgnoreCase("C")) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': cannot be special shorthand R or C");
-        }
-        
-        // is first character valid?
-        char c = name.charAt(0);
-        String allowedSymbols = "_\\";
-        boolean characterIsValid = (Character.isLetter(c) || allowedSymbols.indexOf(c) != -1);
-        if (!characterIsValid) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': first character must be underscore or a letter");
-        }
-        
-        // are all other characters valid?
-        allowedSymbols = "_.\\"; //backslashes needed for unicode escape
-        for (final char ch : name.toCharArray()) {
-            characterIsValid = (Character.isLetterOrDigit(ch) || allowedSymbols.indexOf(ch) != -1);
-            if (!characterIsValid) {
-                throw new IllegalArgumentException("Invalid name: '"+name+"': name must be letter, digit, period, or underscore");
-            }
-        }
-        
-        // Is the name a valid $A$1 cell reference
-        // Because $, :, and ! are disallowed characters, A1-style references become just a letter-number combination
-        if (name.matches("[A-Za-z]+\\d+")) {
-            String col = name.replaceAll("\\d", "");
-            String row = name.replaceAll("[A-Za-z]", "");
-            if (CellReference.cellReferenceIsWithinRange(col, row, SpreadsheetVersion.EXCEL97)) {
-                throw new IllegalArgumentException("Invalid name: '"+name+"': cannot be $A$1-style cell reference");
-            }
-        }
-        
-        // Is the name a valid R1C1 cell reference?
-        if (name.matches("[Rr]\\d+[Cc]\\d+")) {
-            throw new IllegalArgumentException("Invalid name: '"+name+"': cannot be R1C1-style cell reference");
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
deleted file mode 100644
index ca3950f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Footer;
-import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-/**
- * Odd page footer value. Corresponds to odd printed pages.
- * Odd page(s) in the sheet may not be printed, for example, if the print area is specified to be 
- * a range such that it falls outside an odd page's scope.
- *
- */
-public class XSSFOddFooter extends XSSFHeaderFooter implements Footer{
-
-    /**
-     * Create an instance of XSSFOddFooter from the supplied XML bean
-     * @see XSSFSheet#getOddFooter()
-     * @param headerFooter
-     */
-    public XSSFOddFooter(CTHeaderFooter headerFooter) {
-        super(headerFooter);
-    }
-    
-    /**
-     * Get the content text representing the footer
-     * @return text
-     */
-    public String getText() {
-        return getHeaderFooter().getOddFooter();
-    }
-    
-    /**
-     * Set a text for the footer. If null unset the value.
-     * @see XSSFHeaderFooter to see how to create a string with Header/Footer Formatting Syntax
-     * @param text - a string representing the footer. 
-     */
-    public void setText(String text) {
-    	if(text == null) {
-    		getHeaderFooter().unsetOddFooter();
-    	} else {
-    		getHeaderFooter().setOddFooter(text);
-    	}
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
deleted file mode 100644
index ba5c1a0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Header;
-import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-/**
- * Odd page header value. Corresponds to odd printed pages. 
- * Odd page(s) in the sheet may not be printed, for example, if the print area is specified to be 
- * a range such that it falls outside an odd page's scope.
- *
- */
-public class XSSFOddHeader extends XSSFHeaderFooter implements Header{
-
-    /**
-     * Create an instance of XSSFOddHeader from the supplied XML bean
-     * @see XSSFSheet#getOddHeader()
-     * @param headerFooter
-     */
-    protected XSSFOddHeader(CTHeaderFooter headerFooter) {
-        super(headerFooter);
-    }
-    
-    /**
-     * Get the content text representing this header
-     * @return text
-     */
-    public String getText() {
-        return getHeaderFooter().getOddHeader();
-    }
-    
-    /**
-     * Set a text for the header. If null unset the value
-     * @see XSSFHeaderFooter to see how to create a string with Header/Footer Formatting Syntax
-     * @param text - a string representing the header. 
-     */
-    public void setText(String text) {
-    	if(text == null) {
-    		getHeaderFooter().unsetOddHeader();
-    	} else {
-    		getHeaderFooter().setOddHeader(text);
-    	}
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
deleted file mode 100644
index 3ca68f2..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.ss.usermodel.PatternFormatting;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
-
-/**
- * @author Yegor Kozlov
- */
-public class XSSFPatternFormatting implements PatternFormatting {
-    CTFill _fill;
-
-    XSSFPatternFormatting(CTFill fill){
-        _fill = fill;
-    }
-
-    public XSSFColor getFillBackgroundColorColor() {
-        if(!_fill.isSetPatternFill()) return null;
-        return new XSSFColor(_fill.getPatternFill().getBgColor());
-    }
-    public XSSFColor getFillForegroundColorColor() {
-        if(!_fill.isSetPatternFill() || ! _fill.getPatternFill().isSetFgColor())
-            return null;
-        return new XSSFColor(_fill.getPatternFill().getFgColor());
-    }
-
-    public short getFillPattern() {
-        if(!_fill.isSetPatternFill() || !_fill.getPatternFill().isSetPatternType()) return NO_FILL;
-
-        return (short)(_fill.getPatternFill().getPatternType().intValue() - 1);
-     }
-
-    public short getFillBackgroundColor() {
-        XSSFColor color = getFillBackgroundColorColor();
-        if (color == null) return 0;
-        return color.getIndexed();
-    }
-    public short getFillForegroundColor() {
-        XSSFColor color = getFillForegroundColorColor();
-        if (color == null) return 0;
-        return color.getIndexed();
-    }
-
-    public void setFillBackgroundColor(Color bg) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(bg);
-        if (xcolor == null) setFillBackgroundColor((CTColor)null);
-        else setFillBackgroundColor(xcolor.getCTColor());
-    }
-    public void setFillBackgroundColor(short bg) {
-        CTColor bgColor = CTColor.Factory.newInstance();
-        bgColor.setIndexed(bg);
-        setFillBackgroundColor(bgColor);
-    }
-    private void setFillBackgroundColor(CTColor color) {
-        CTPatternFill ptrn = _fill.isSetPatternFill() ? _fill.getPatternFill() : _fill.addNewPatternFill();
-        if (color == null) {
-            ptrn.unsetBgColor();
-        } else {
-            ptrn.setBgColor(color);
-        }
-    }
-    
-    public void setFillForegroundColor(Color fg) {
-        XSSFColor xcolor = XSSFColor.toXSSFColor(fg);
-        if (xcolor == null) setFillForegroundColor((CTColor)null);
-        else setFillForegroundColor(xcolor.getCTColor());
-    }
-    public void setFillForegroundColor(short fg) {
-        CTColor fgColor = CTColor.Factory.newInstance();
-        fgColor.setIndexed(fg);
-        setFillForegroundColor(fgColor);
-    }
-    private void setFillForegroundColor(CTColor color) {
-        CTPatternFill ptrn = _fill.isSetPatternFill() ? _fill.getPatternFill() : _fill.addNewPatternFill();
-        if (color == null) {
-            ptrn.unsetFgColor();
-        } else {
-            ptrn.setFgColor(color);
-        }
-    }
-
-    public void setFillPattern(short fp){
-        CTPatternFill ptrn = _fill.isSetPatternFill() ? _fill.getPatternFill() : _fill.addNewPatternFill();
-        if(fp == NO_FILL) ptrn.unsetPatternType();
-        else ptrn.setPatternType(STPatternType.Enum.forInt(fp + 1));
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
deleted file mode 100644
index 1d87fac..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.awt.Dimension;
-import java.io.IOException;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.Picture;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.ImageUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualPictureProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTPicture;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTPictureNonVisual;
-
-/**
- * Represents a picture shape in a SpreadsheetML drawing.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFPicture extends XSSFShape implements Picture {
-    private static final POILogger logger = POILogFactory.getLogger(XSSFPicture.class);
-
-    /**
-     * Column width measured as the number of characters of the maximum digit width of the
-     * numbers 0, 1, 2, ..., 9 as rendered in the normal style's font. There are 4 pixels of margin
-     * padding (two on each side), plus 1 pixel padding for the gridlines.
-     *
-     * This value is the same for default font in Office 2007 (Calibry) and Office 2003 and earlier (Arial)
-     */
-    // private static float DEFAULT_COLUMN_WIDTH = 9.140625f;
-
-    /**
-     * A default instance of CTShape used for creating new shapes.
-     */
-    private static CTPicture prototype = null;
-
-    /**
-     * This object specifies a picture object and all its properties
-     */
-    private CTPicture ctPicture;
-
-    /**
-     * Construct a new XSSFPicture object. This constructor is called from
-     *  {@link XSSFDrawing#createPicture(XSSFClientAnchor, int)}
-     *
-     * @param drawing the XSSFDrawing that owns this picture
-     */
-    protected XSSFPicture(XSSFDrawing drawing, CTPicture ctPicture){
-        this.drawing = drawing;
-        this.ctPicture = ctPicture;
-    }
-
-    /**
-     * Returns a prototype that is used to construct new shapes
-     *
-     * @return a prototype that is used to construct new shapes
-     */
-    protected static CTPicture prototype(){
-        if(prototype == null) {
-            CTPicture pic = CTPicture.Factory.newInstance();
-            CTPictureNonVisual nvpr = pic.addNewNvPicPr();
-            CTNonVisualDrawingProps nvProps = nvpr.addNewCNvPr();
-            nvProps.setId(1);
-            nvProps.setName("Picture 1");
-            nvProps.setDescr("Picture");
-            CTNonVisualPictureProperties nvPicProps = nvpr.addNewCNvPicPr();
-            nvPicProps.addNewPicLocks().setNoChangeAspect(true);
-
-            CTBlipFillProperties blip = pic.addNewBlipFill();
-            blip.addNewBlip().setEmbed("");
-            blip.addNewStretch().addNewFillRect();
-
-            CTShapeProperties sppr = pic.addNewSpPr();
-            CTTransform2D t2d = sppr.addNewXfrm();
-            CTPositiveSize2D ext = t2d.addNewExt();
-            //should be original picture width and height expressed in EMUs
-            ext.setCx(0);
-            ext.setCy(0);
-
-            CTPoint2D off = t2d.addNewOff();
-            off.setX(0);
-            off.setY(0);
-
-            CTPresetGeometry2D prstGeom = sppr.addNewPrstGeom();
-            prstGeom.setPrst(STShapeType.RECT);
-            prstGeom.addNewAvLst();
-
-            prototype = pic;
-        }
-        return prototype;
-    }
-
-    /**
-     * Link this shape with the picture data
-     *
-     * @param rel relationship referring the picture data
-     */
-    protected void setPictureReference(PackageRelationship rel){
-        ctPicture.getBlipFill().getBlip().setEmbed(rel.getId());
-    }
-
-    /**
-     * Return the underlying CTPicture bean that holds all properties for this picture
-     *
-     * @return the underlying CTPicture bean
-     */
-    @Internal
-    public CTPicture getCTPicture(){
-        return ctPicture;
-    }
-
-    /**
-     * Reset the image to the dimension of the embedded image
-     *
-     * @see #resize(double, double)
-     */
-    public void resize(){
-        resize(Double.MAX_VALUE);
-    }
-
-    /**
-     * Resize the image proportionally.
-     *
-     * @see #resize(double, double)
-     */
-    public void resize(double scale) {
-        resize(scale, scale);
-    }
-    
-    /**
-     * Resize the image relatively to its current size.
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with the default font size (Calibri 11pt for .xlsx).
-     * If the default font is changed the resized image can be streched vertically or horizontally.
-     * </p>
-     * <p>
-     * <code>resize(1.0,1.0)</code> keeps the original size,<br/>
-     * <code>resize(0.5,0.5)</code> resize to 50% of the original,<br/>
-     * <code>resize(2.0,2.0)</code> resizes to 200% of the original.<br/>
-     * <code>resize({@link Double#MAX_VALUE},{@link Double#MAX_VALUE})</code> resizes to the dimension of the embedded image. 
-     * </p>
-     *
-     * @param scaleX the amount by which the image width is multiplied relative to the original width,
-     *  when set to {@link java.lang.Double#MAX_VALUE} the width of the embedded image is used
-     * @param scaleY the amount by which the image height is multiplied relative to the original height,
-     *  when set to {@link java.lang.Double#MAX_VALUE} the height of the embedded image is used
-     */
-    public void resize(double scaleX, double scaleY){
-        XSSFClientAnchor anchor = getClientAnchor();
-
-        XSSFClientAnchor pref = getPreferredSize(scaleX,scaleY);
-
-        int row2 = anchor.getRow1() + (pref.getRow2() - pref.getRow1());
-        int col2 = anchor.getCol1() + (pref.getCol2() - pref.getCol1());
-
-        anchor.setCol2(col2);
-        // anchor.setDx1(0);
-        anchor.setDx2(pref.getDx2());
-
-        anchor.setRow2(row2);
-        // anchor.setDy1(0);
-        anchor.setDy2(pref.getDy2());
-    }
-
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @return XSSFClientAnchor with the preferred size for this image
-     */
-    public XSSFClientAnchor getPreferredSize(){
-        return getPreferredSize(1);
-    }
-
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @param scale the amount by which image dimensions are multiplied relative to the original size.
-     * @return XSSFClientAnchor with the preferred size for this image
-     */
-    public XSSFClientAnchor getPreferredSize(double scale){
-        return getPreferredSize(scale, scale);
-    }
-    
-    /**
-     * Calculate the preferred size for this picture.
-     *
-     * @param scaleX the amount by which image width is multiplied relative to the original width.
-     * @param scaleY the amount by which image height is multiplied relative to the original height.
-     * @return XSSFClientAnchor with the preferred size for this image
-     */
-    public XSSFClientAnchor getPreferredSize(double scaleX, double scaleY){
-        Dimension dim = ImageUtils.setPreferredSize(this, scaleX, scaleY);
-        CTPositiveSize2D size2d =  ctPicture.getSpPr().getXfrm().getExt();
-        size2d.setCx((int)dim.getWidth());
-        size2d.setCy((int)dim.getHeight());
-        return getClientAnchor();
-    }
-
-    /**
-     * Return the dimension of this image
-     *
-     * @param part the package part holding raw picture data
-     * @param type type of the picture: {@link Workbook#PICTURE_TYPE_JPEG},
-     * {@link Workbook#PICTURE_TYPE_PNG} or {@link Workbook#PICTURE_TYPE_DIB}
-     *
-     * @return image dimension in pixels
-     */
-    protected static Dimension getImageDimension(PackagePart part, int type){
-        try {
-            return ImageUtils.getImageDimension(part.getInputStream(), type);
-        } catch (IOException e){
-            //return a "singulariry" if ImageIO failed to read the image
-            logger.log(POILogger.WARN, e);
-            return new Dimension();
-        }
-    }
-
-    /**
-     * Return the dimension of the embedded image in pixel
-     *
-     * @return image dimension in pixels
-     */
-    public Dimension getImageDimension() {
-        XSSFPictureData picData = getPictureData();
-        return getImageDimension(picData.getPackagePart(), picData.getPictureType());
-    }
-    
-    /**
-     * Return picture data for this shape
-     *
-     * @return picture data for this shape
-     */
-    public XSSFPictureData getPictureData() {
-        String blipId = ctPicture.getBlipFill().getBlip().getEmbed();
-        return  (XSSFPictureData)getDrawing().getRelationById(blipId);
-    }
-
-    protected CTShapeProperties getShapeProperties(){
-        return ctPicture.getSpPr();
-    }
-
-    /**
-     * @return the anchor that is used by this shape.
-     */
-    @Override
-    public XSSFClientAnchor getClientAnchor() {
-        XSSFAnchor a = getAnchor();
-        return (a instanceof XSSFClientAnchor) ? (XSSFClientAnchor)a : null;
-    }
-
-    /**
-     * @return the sheet which contains the picture shape
-     */
-    @Override
-    public XSSFSheet getSheet() {
-        return (XSSFSheet)getDrawing().getParent();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
deleted file mode 100644
index f8c9c22..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.POIXMLRelation;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.IOUtils;
-
-/**
- * Raw picture data, normally attached to a SpreadsheetML Drawing.
- * As a rule, pictures are stored in the /xl/media/ part of a SpreadsheetML package.
- */
-public class XSSFPictureData extends POIXMLDocumentPart implements PictureData {
-
-    /**
-     * Relationships for each known picture type
-     */
-    protected static final POIXMLRelation[] RELATIONS;
-    static {
-        RELATIONS = new POIXMLRelation[13];
-        RELATIONS[Workbook.PICTURE_TYPE_EMF] = XSSFRelation.IMAGE_EMF;
-        RELATIONS[Workbook.PICTURE_TYPE_WMF] = XSSFRelation.IMAGE_WMF;
-        RELATIONS[Workbook.PICTURE_TYPE_PICT] = XSSFRelation.IMAGE_PICT;
-        RELATIONS[Workbook.PICTURE_TYPE_JPEG] = XSSFRelation.IMAGE_JPEG;
-        RELATIONS[Workbook.PICTURE_TYPE_PNG] = XSSFRelation.IMAGE_PNG;
-        RELATIONS[Workbook.PICTURE_TYPE_DIB] = XSSFRelation.IMAGE_DIB;
-        RELATIONS[XSSFWorkbook.PICTURE_TYPE_GIF] = XSSFRelation.IMAGE_GIF;
-        RELATIONS[XSSFWorkbook.PICTURE_TYPE_TIFF] = XSSFRelation.IMAGE_TIFF;
-        RELATIONS[XSSFWorkbook.PICTURE_TYPE_EPS] = XSSFRelation.IMAGE_EPS;
-        RELATIONS[XSSFWorkbook.PICTURE_TYPE_BMP] = XSSFRelation.IMAGE_BMP;
-        RELATIONS[XSSFWorkbook.PICTURE_TYPE_WPG] = XSSFRelation.IMAGE_WPG;
-    }
-
-    /**
-     * Create a new XSSFPictureData node
-     *
-     * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#addPicture(byte[], int)
-     */
-    protected XSSFPictureData() {
-        super();
-    }
-
-    /**
-     * Construct XSSFPictureData from a package part
-     *
-     * @param part the package part holding the drawing data,
-     * 
-     * @since POI 3.14-Beta1
-     */
-    protected XSSFPictureData(PackagePart part) {
-        super(part);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFPictureData(PackagePart part, PackageRelationship rel) {
-        this(part);
-    }
-    
-    /**
-     * Gets the picture data as a byte array.
-     * <p>
-     * Note, that this call might be expensive since all the picture data is copied into a temporary byte array.
-     * You can grab the picture data directly from the underlying package part as follows:
-     * <br/>
-     * <code>
-     * InputStream is = getPackagePart().getInputStream();
-     * </code>
-     * </p>
-     *
-     * @return the picture data.
-     */
-    public byte[] getData() {
-        try {
-            return IOUtils.toByteArray(getPackagePart().getInputStream());
-        } catch(IOException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Suggests a file extension for this image.
-     *
-     * @return the file extension.
-     */
-    public String suggestFileExtension() {
-        return getPackagePart().getPartName().getExtension();
-    }
-
-    /**
-     * Return an integer constant that specifies type of this picture
-     *
-     * @return an integer constant that specifies type of this picture 
-     * @see org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_EMF
-     * @see org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_WMF
-     * @see org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_PICT
-     * @see org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_JPEG
-     * @see org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_PNG
-     * @see org.apache.poi.ss.usermodel.Workbook#PICTURE_TYPE_DIB
-     */
-    public int getPictureType(){
-        String contentType = getPackagePart().getContentType();
-        for (int i = 0; i < RELATIONS.length; i++) {
-            if(RELATIONS[i] == null) continue;
-
-            if(RELATIONS[i].getContentType().equals(contentType)){
-                return i;
-            }
-        }
-        return 0;
-    }
-
-    public String getMimeType() {
-        return getPackagePart().getContentType();
-    }
-
-    /**
-     * *PictureData objects store the actual content in the part directly without keeping a 
-     * copy like all others therefore we need to handle them differently.
-     */
-    @Override
-    protected void prepareForCommit() {
-        // do not clear the part here
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
deleted file mode 100644
index 418185f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Beta;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCache;
-
-public class XSSFPivotCache extends POIXMLDocumentPart {
-
-    private CTPivotCache ctPivotCache;
-
-    @Beta
-    public XSSFPivotCache(){
-        super();
-        ctPivotCache = CTPivotCache.Factory.newInstance();
-    }
-
-    @Beta
-    public XSSFPivotCache(CTPivotCache ctPivotCache) {
-        super();
-        this.ctPivotCache = ctPivotCache;
-    }
-
-     /**
-     * Creates n XSSFPivotCache representing the given package part and relationship.
-     * Should only be called when reading in an existing file.
-     *
-     * @param part - The package part that holds xml data representing this pivot cache definition.
-     * 
-     * @since POI 3.14-Beta1
-     */
-    @Beta
-    protected XSSFPivotCache(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFPivotCache(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    @Beta
-    protected void readFrom(InputStream is) throws IOException {
-	try {
-        XmlOptions options  = new XmlOptions(DEFAULT_XML_OPTIONS);
-        //Removing root element
-        options.setLoadReplaceDocumentElement(null);
-        ctPivotCache = CTPivotCache.Factory.parse(is, options);
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-
-    @Beta
-    public CTPivotCache getCTPivotCache() {
-        return ctPivotCache;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
deleted file mode 100644
index 26735c7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Date;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCacheField;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCacheFields;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCacheDefinition;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheetSource;
-
-public class XSSFPivotCacheDefinition extends POIXMLDocumentPart{
-
-    private CTPivotCacheDefinition ctPivotCacheDefinition;
-
-    @Beta
-    public XSSFPivotCacheDefinition(){
-        super();
-        ctPivotCacheDefinition = CTPivotCacheDefinition.Factory.newInstance();
-        createDefaultValues();
-    }
-
-     /**
-     * Creates an XSSFPivotCacheDefintion representing the given package part and relationship.
-     * Should only be called when reading in an existing file.
-     *
-     * @param part - The package part that holds xml data representing this pivot cache definition.
-     * 
-     * @since POI 3.14-Beta1
-     */
-    @Beta
-    protected XSSFPivotCacheDefinition(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFPivotCacheDefinition(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    @Beta
-    public void readFrom(InputStream is) throws IOException {
-	try {
-            XmlOptions options  = new XmlOptions(DEFAULT_XML_OPTIONS);
-            //Removing root element
-            options.setLoadReplaceDocumentElement(null);
-            ctPivotCacheDefinition = CTPivotCacheDefinition.Factory.parse(is, options);
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-
-    @Beta
-    @Internal
-    public CTPivotCacheDefinition getCTPivotCacheDefinition() {
-        return ctPivotCacheDefinition;
-    }
-
-    @Beta
-    private void createDefaultValues() {
-        ctPivotCacheDefinition.setCreatedVersion(XSSFPivotTable.CREATED_VERSION);
-        ctPivotCacheDefinition.setMinRefreshableVersion(XSSFPivotTable.MIN_REFRESHABLE_VERSION);
-        ctPivotCacheDefinition.setRefreshedVersion(XSSFPivotTable.UPDATED_VERSION);
-        ctPivotCacheDefinition.setRefreshedBy("Apache POI");
-        ctPivotCacheDefinition.setRefreshedDate(new Date().getTime());
-        ctPivotCacheDefinition.setRefreshOnLoad(true);
-    }
-
-    @Beta
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        //Sets the pivotCacheDefinition tag
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotCacheDefinition.type.getName().
-                getNamespaceURI(), "pivotCacheDefinition"));
-        ctPivotCacheDefinition.save(out, xmlOptions);
-        out.close();
-    }
-
-    /**
-     * Find the 2D base data area for the pivot table, either from its direct reference or named table/range.
-     * @return AreaReference representing the current area defined by the pivot table
-     * @throws IllegalArgumentException if the ref attribute is not contiguous or the name attribute is not found.
-     */
-    @Beta
-    public AreaReference getPivotArea(Workbook wb) throws IllegalArgumentException {
-        final CTWorksheetSource wsSource = ctPivotCacheDefinition.getCacheSource().getWorksheetSource();
-        
-        final String ref = wsSource.getRef();
-        final String name = wsSource.getName();
-        
-        if (ref == null && name == null) throw new IllegalArgumentException("Pivot cache must reference an area, named range, or table.");
-        
-        // this is the XML format, so tell the reference that.
-        if (ref != null) return new AreaReference(ref, SpreadsheetVersion.EXCEL2007);
-        
-        if (name != null) {
-            // named range or table?
-            final Name range = wb.getName(name);
-            if (range != null) return new AreaReference(range.getRefersToFormula(), SpreadsheetVersion.EXCEL2007);
-            // not a named range, check for a table.
-            // do this second, as tables are sheet-specific, but named ranges are not, and may not have a sheet name given.
-            final XSSFSheet sheet = (XSSFSheet) wb.getSheet(wsSource.getSheet());
-            for (XSSFTable table : sheet.getTables()) {
-                if (table.getName().equals(name)) { //case-sensitive?
-                    return new AreaReference(table.getStartCellReference(), table.getEndCellReference());
-                }
-            }
-        }
-        
-        throw new IllegalArgumentException("Name '" + name + "' was not found.");
-    }
-    
-    /**
-     * Generates a cache field for each column in the reference area for the pivot table.
-     * @param sheet The sheet where the data i collected from
-     */
-    @Beta
-    protected void createCacheFields(Sheet sheet) {
-        //Get values for start row, start and end column
-        AreaReference ar = getPivotArea(sheet.getWorkbook());
-        CellReference firstCell = ar.getFirstCell();
-        CellReference lastCell = ar.getLastCell();
-        int columnStart = firstCell.getCol();
-        int columnEnd = lastCell.getCol();
-        Row row = sheet.getRow(firstCell.getRow());
-        CTCacheFields cFields;
-        if(ctPivotCacheDefinition.getCacheFields() != null) {
-            cFields = ctPivotCacheDefinition.getCacheFields();
-        } else {
-            cFields = ctPivotCacheDefinition.addNewCacheFields();
-        }
-        //For each column, create a cache field and give it en empty sharedItems
-        for(int i=columnStart; i<=columnEnd; i++) {
-            CTCacheField cf = cFields.addNewCacheField();
-            if(i==columnEnd){
-                cFields.setCount(cFields.sizeOfCacheFieldArray());
-            }
-            //General number format
-            cf.setNumFmtId(0);
-            Cell cell = row.getCell(i);
-            cell.setCellType(CellType.STRING);
-            cf.setName(row.getCell(i).getStringCellValue());
-            cf.addNewSharedItems();
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
deleted file mode 100644
index 5dcf0d3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCacheRecords;
-
-public class XSSFPivotCacheRecords extends POIXMLDocumentPart {
-    private CTPivotCacheRecords ctPivotCacheRecords;
-    
-    @Beta
-    public XSSFPivotCacheRecords() {
-        super();
-        ctPivotCacheRecords = CTPivotCacheRecords.Factory.newInstance();
-    }
-
-    /**
-     * Creates an XSSFPivotCacheRecords representing the given package part and relationship.
-     * Should only be called when reading in an existing file.
-     *
-     * @param part - The package part that holds xml data representing this pivot cache records.
-     * 
-     * @since POI 3.14-Beta1
-     */
-    @Beta
-    protected XSSFPivotCacheRecords(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFPivotCacheRecords(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    @Beta
-    protected void readFrom(InputStream is) throws IOException {
-	try {
-        XmlOptions options  = new XmlOptions(DEFAULT_XML_OPTIONS);
-        //Removing root element
-        options.setLoadReplaceDocumentElement(null);
-            ctPivotCacheRecords = CTPivotCacheRecords.Factory.parse(is, options);
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-
-    @Beta
-    @Internal
-    public CTPivotCacheRecords getCtPivotCacheRecords() {
-        return ctPivotCacheRecords;
-    }
-
-    @Beta
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        //Sets the pivotCacheDefinition tag
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotCacheRecords.type.getName().
-                getNamespaceURI(), "pivotCacheRecords"));
-        ctPivotCacheRecords.save(out, xmlOptions);
-        out.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
deleted file mode 100644
index e6f91af..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataConsolidateFunction;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.*;
-
-public class XSSFPivotTable extends POIXMLDocumentPart {
-
-    protected final static short CREATED_VERSION = 3;
-    protected final static short MIN_REFRESHABLE_VERSION = 3;
-    protected final static short UPDATED_VERSION = 3;
-
-    private CTPivotTableDefinition pivotTableDefinition;
-    private XSSFPivotCacheDefinition pivotCacheDefinition;
-    private XSSFPivotCache pivotCache;
-    private XSSFPivotCacheRecords pivotCacheRecords;
-    private Sheet parentSheet;
-    private Sheet dataSheet;
-
-    @Beta
-    protected XSSFPivotTable() {
-        super();
-        pivotTableDefinition = CTPivotTableDefinition.Factory.newInstance();
-        pivotCache = new XSSFPivotCache();
-        pivotCacheDefinition = new XSSFPivotCacheDefinition();
-        pivotCacheRecords = new XSSFPivotCacheRecords();
-    }
-
-     /**
-     * Creates an XSSFPivotTable representing the given package part and relationship.
-     * Should only be called when reading in an existing file.
-     *
-     * @param part - The package part that holds xml data representing this pivot table.
-     * 
-     * @since POI 3.14-Beta1
-     */
-    @Beta
-    protected XSSFPivotTable(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFPivotTable(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    @Beta
-    public void readFrom(InputStream is) throws IOException {
-	try {
-            XmlOptions options  = new XmlOptions(DEFAULT_XML_OPTIONS);
-            //Removing root element
-            options.setLoadReplaceDocumentElement(null);
-            pivotTableDefinition = CTPivotTableDefinition.Factory.parse(is, options);
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-
-    @Beta
-    public void setPivotCache(XSSFPivotCache pivotCache) {
-        this.pivotCache = pivotCache;
-    }
-
-    @Beta
-    public XSSFPivotCache getPivotCache() {
-        return pivotCache;
-    }
-
-    @Beta
-    public Sheet getParentSheet() {
-        return parentSheet;
-    }
-
-    @Beta
-    public void setParentSheet(XSSFSheet parentSheet) {
-        this.parentSheet = parentSheet;
-    }
-
-    @Beta
-    @Internal
-    public CTPivotTableDefinition getCTPivotTableDefinition() {
-        return pivotTableDefinition;
-    }
-
-    @Beta
-    @Internal
-    public void setCTPivotTableDefinition(CTPivotTableDefinition pivotTableDefinition) {
-        this.pivotTableDefinition = pivotTableDefinition;
-    }
-
-    @Beta
-    public XSSFPivotCacheDefinition getPivotCacheDefinition() {
-        return pivotCacheDefinition;
-    }
-
-    @Beta
-    public void setPivotCacheDefinition(XSSFPivotCacheDefinition pivotCacheDefinition) {
-        this.pivotCacheDefinition = pivotCacheDefinition;
-    }
-
-    @Beta
-    public XSSFPivotCacheRecords getPivotCacheRecords() {
-        return pivotCacheRecords;
-    }
-
-    @Beta
-    public void setPivotCacheRecords(XSSFPivotCacheRecords pivotCacheRecords) {
-        this.pivotCacheRecords = pivotCacheRecords;
-    }
-
-    @Beta
-    public Sheet getDataSheet() {
-        return dataSheet;
-    }
-
-    @Beta
-    private void setDataSheet(Sheet dataSheet) {
-        this.dataSheet = dataSheet;
-    }
-
-    @Beta
-    @Override
-    protected void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        //Sets the pivotTableDefinition tag
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotTableDefinition.type.getName().
-                getNamespaceURI(), "pivotTableDefinition"));
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        pivotTableDefinition.save(out, xmlOptions);
-        out.close();
-    }
-
-    /**
-     * Set default values for the table definition.
-     */
-    @Beta
-    protected void setDefaultPivotTableDefinition() {
-        //Not more than one until more created
-        pivotTableDefinition.setMultipleFieldFilters(false);
-        //Indentation increment for compact rows
-        pivotTableDefinition.setIndent(0);
-        //The pivot version which created the pivot cache set to default value
-        pivotTableDefinition.setCreatedVersion(CREATED_VERSION);
-        //Minimun version required to update the pivot cache
-        pivotTableDefinition.setMinRefreshableVersion(MIN_REFRESHABLE_VERSION);
-        //Version of the application which "updated the spreadsheet last"
-        pivotTableDefinition.setUpdatedVersion(UPDATED_VERSION);
-        //Titles shown at the top of each page when printed
-        pivotTableDefinition.setItemPrintTitles(true);
-        //Set autoformat properties
-        pivotTableDefinition.setUseAutoFormatting(true);
-        pivotTableDefinition.setApplyNumberFormats(false);
-        pivotTableDefinition.setApplyWidthHeightFormats(true);
-        pivotTableDefinition.setApplyAlignmentFormats(false);
-        pivotTableDefinition.setApplyPatternFormats(false);
-        pivotTableDefinition.setApplyFontFormats(false);
-        pivotTableDefinition.setApplyBorderFormats(false);
-        pivotTableDefinition.setCacheId(pivotCache.getCTPivotCache().getCacheId());
-        pivotTableDefinition.setName("PivotTable"+pivotTableDefinition.getCacheId());
-        pivotTableDefinition.setDataCaption("Values");
-
-        //Set the default style for the pivot table
-        CTPivotTableStyle style = pivotTableDefinition.addNewPivotTableStyleInfo();
-        style.setName("PivotStyleLight16");
-        style.setShowLastColumn(true);
-        style.setShowColStripes(false);
-        style.setShowRowStripes(false);
-        style.setShowColHeaders(true);
-        style.setShowRowHeaders(true);
-    }
-
-    protected AreaReference getPivotArea() {
-        final Workbook wb = getDataSheet().getWorkbook();
-        AreaReference pivotArea = getPivotCacheDefinition().getPivotArea(wb);
-        return pivotArea;
-    }
-    
-    /**
-     * Verify column index (relative to first column in pivot area) is within the
-     * pivot area
-     *
-     * @param columnIndex
-     * @throws IndexOutOfBoundsException
-     */
-    private void checkColumnIndex(int columnIndex) throws IndexOutOfBoundsException {
-        AreaReference pivotArea = getPivotArea();
-        int size = pivotArea.getLastCell().getCol() - pivotArea.getFirstCell().getCol() + 1;
-
-        if (columnIndex < 0 || columnIndex >= size) {
-            throw new IndexOutOfBoundsException("Column Index: " + columnIndex + ", Size: " + size);
-        }
-    }
-
-    /**
-     * Add a row label using data from the given column.
-     * @param columnIndex the index of the source column to be used as row label.
-     * {@code columnIndex} is 0-based indexed and relative to the first column in the source.
-     */
-    @Beta
-    public void addRowLabel(int columnIndex) {
-        checkColumnIndex(columnIndex);
-        
-        AreaReference pivotArea = getPivotArea();
-        final int lastRowIndex = pivotArea.getLastCell().getRow() - pivotArea.getFirstCell().getRow();
-        CTPivotFields pivotFields = pivotTableDefinition.getPivotFields();
-
-        CTPivotField pivotField = CTPivotField.Factory.newInstance();
-        CTItems items = pivotField.addNewItems();
-
-        pivotField.setAxis(STAxis.AXIS_ROW);
-        pivotField.setShowAll(false);
-        for (int i = 0; i <= lastRowIndex; i++) {
-            items.addNewItem().setT(STItemType.DEFAULT);
-        }
-        items.setCount(items.sizeOfItemArray());
-        pivotFields.setPivotFieldArray(columnIndex, pivotField);
-
-        CTRowFields rowFields;
-        if(pivotTableDefinition.getRowFields() != null) {
-            rowFields = pivotTableDefinition.getRowFields();
-        } else {
-            rowFields = pivotTableDefinition.addNewRowFields();
-        }
-
-        rowFields.addNewField().setX(columnIndex);
-        rowFields.setCount(rowFields.sizeOfFieldArray());
-    }
-    
-    @Beta
-    public List<Integer> getRowLabelColumns() {
-        if (pivotTableDefinition.getRowFields() != null) {
-            List<Integer> columnIndexes = new ArrayList<Integer>();
-            for (CTField f : pivotTableDefinition.getRowFields().getFieldArray()) {
-                columnIndexes.add(f.getX());
-            }
-            return columnIndexes;
-        } else {
-            return Collections.emptyList();
-        }
-    }
-    
-    /**
-     * Add a column label using data from the given column and specified function
-     * @param columnIndex the index of the source column to be used as column label.
-     * {@code columnIndex} is 0-based indexed and relative to the first column in the source.
-     * @param function the function to be used on the data
-     * The following functions exists:
-     * Sum, Count, Average, Max, Min, Product, Count numbers, StdDev, StdDevp, Var, Varp
-     * @param valueFieldName the name of pivot table value field
-     */
-    @Beta
-    public void addColumnLabel(DataConsolidateFunction function, int columnIndex, String valueFieldName) {
-        checkColumnIndex(columnIndex);
-
-        addDataColumn(columnIndex, true);
-        addDataField(function, columnIndex, valueFieldName);
-
-        // colfield should be added for the second one.
-        if (pivotTableDefinition.getDataFields().getCount() == 2) {
-            CTColFields colFields;
-            if(pivotTableDefinition.getColFields() != null) {
-                colFields = pivotTableDefinition.getColFields();
-            } else {
-                colFields = pivotTableDefinition.addNewColFields();
-            }
-            colFields.addNewField().setX(-2);
-            colFields.setCount(colFields.sizeOfFieldArray());
-        }
-    }
-
-    /**
-     * Add a column label using data from the given column and specified function
-     * @param columnIndex the index of the source column to be used as column label
-     * {@code columnIndex} is 0-based indexed and relative to the first column in the source..
-     * @param function the function to be used on the data
-     * The following functions exists:
-     * Sum, Count, Average, Max, Min, Product, Count numbers, StdDev, StdDevp, Var, Varp
-     */
-    @Beta
-    public void addColumnLabel(DataConsolidateFunction function, int columnIndex) {
-        addColumnLabel(function, columnIndex, function.getName());
-    }
-
-    /**
-     * Add data field with data from the given column and specified function.
-     * @param function the function to be used on the data
-     *      The following functions exists:
-     *      Sum, Count, Average, Max, Min, Product, Count numbers, StdDev, StdDevp, Var, Varp
-     * @param columnIndex the index of the column to be used as column label.
-     * @param valueFieldName the name of pivot table value field
-     */
-    @Beta
-    private void addDataField(DataConsolidateFunction function, int columnIndex, String valueFieldName) {
-        checkColumnIndex(columnIndex);
-        
-        AreaReference pivotArea = getPivotArea();
-        
-        CTDataFields dataFields;
-        if(pivotTableDefinition.getDataFields() != null) {
-            dataFields = pivotTableDefinition.getDataFields();
-        } else {
-            dataFields = pivotTableDefinition.addNewDataFields();
-        }
-        CTDataField dataField = dataFields.addNewDataField();
-        dataField.setSubtotal(STDataConsolidateFunction.Enum.forInt(function.getValue()));
-        Cell cell = getDataSheet().getRow(pivotArea.getFirstCell().getRow())
-                .getCell(pivotArea.getFirstCell().getCol() + columnIndex);
-        cell.setCellType(CellType.STRING);
-        dataField.setName(valueFieldName);
-        dataField.setFld(columnIndex);
-        dataFields.setCount(dataFields.sizeOfDataFieldArray());
-    }
-
-    /**
-     * Add column containing data from the referenced area.
-     * @param columnIndex the index of the column containing the data
-     * @param isDataField true if the data should be displayed in the pivot table.
-     */
-    @Beta
-    public void addDataColumn(int columnIndex, boolean isDataField) {
-        checkColumnIndex(columnIndex);
-
-        CTPivotFields pivotFields = pivotTableDefinition.getPivotFields();
-        CTPivotField pivotField = CTPivotField.Factory.newInstance();
-
-        pivotField.setDataField(isDataField);
-        pivotField.setShowAll(false);
-        pivotFields.setPivotFieldArray(columnIndex, pivotField);
-    }
-
-    /**
-     * Add filter for the column with the corresponding index and cell value
-     * @param columnIndex index of column to filter on
-     */
-    @Beta
-    public void addReportFilter(int columnIndex) {
-        checkColumnIndex(columnIndex);
-        
-        AreaReference pivotArea = getPivotArea();
-        int lastRowIndex = pivotArea.getLastCell().getRow() - pivotArea.getFirstCell().getRow();
-
-        CTPivotFields pivotFields = pivotTableDefinition.getPivotFields();
-
-        CTPivotField pivotField = CTPivotField.Factory.newInstance();
-        CTItems items = pivotField.addNewItems();
-
-        pivotField.setAxis(STAxis.AXIS_PAGE);
-        pivotField.setShowAll(false);
-        for(int i = 0; i <= lastRowIndex; i++) {
-            items.addNewItem().setT(STItemType.DEFAULT);
-        }
-        items.setCount(items.sizeOfItemArray());
-        pivotFields.setPivotFieldArray(columnIndex, pivotField);
-
-        CTPageFields pageFields;
-        if (pivotTableDefinition.getPageFields()!= null) {
-            pageFields = pivotTableDefinition.getPageFields();
-            //Another filter has already been created
-            pivotTableDefinition.setMultipleFieldFilters(true);
-        } else {
-            pageFields = pivotTableDefinition.addNewPageFields();
-        }
-        CTPageField pageField = pageFields.addNewPageField();
-        pageField.setHier(-1);
-        pageField.setFld(columnIndex);
-
-        pageFields.setCount(pageFields.sizeOfPageFieldArray());
-        pivotTableDefinition.getLocation().setColPageCount(pageFields.getCount());
-    }
-
-    /**
-     * Creates cacheSource and workSheetSource for pivot table and sets the source reference as well assets the location of the pivot table
-     * @param position Position for pivot table in sheet
-     * @param sourceSheet Sheet where the source will be collected from
-     * @param refConfig  an configurator that knows how to configure pivot table references
-     */
-    @Beta
-    protected void createSourceReferences(CellReference position, Sheet sourceSheet, PivotTableReferenceConfigurator refConfig){
-        
-        //Get cell one to the right and one down from position, add both to AreaReference and set pivot table location.
-        AreaReference destination = new AreaReference(position, new CellReference(position.getRow()+1, position.getCol()+1));
-
-        CTLocation location;
-        if(pivotTableDefinition.getLocation() == null) {
-            location = pivotTableDefinition.addNewLocation();
-            location.setFirstDataCol(1);
-            location.setFirstDataRow(1);
-            location.setFirstHeaderRow(1);
-        } else {
-            location = pivotTableDefinition.getLocation();
-        }
-        location.setRef(destination.formatAsString());
-        pivotTableDefinition.setLocation(location);
-
-        //Set source for the pivot table
-        CTPivotCacheDefinition cacheDef = getPivotCacheDefinition().getCTPivotCacheDefinition();
-        CTCacheSource cacheSource = cacheDef.addNewCacheSource();
-        cacheSource.setType(STSourceType.WORKSHEET);
-        CTWorksheetSource worksheetSource = cacheSource.addNewWorksheetSource();
-        worksheetSource.setSheet(sourceSheet.getSheetName());
-        setDataSheet(sourceSheet);
-
-        refConfig.configureReference(worksheetSource);
-        if (worksheetSource.getName() == null && worksheetSource.getRef() == null) throw new IllegalArgumentException("Pivot table source area reference or name must be specified.");
-    }
-
-    @Beta
-    protected void createDefaultDataColumns() {
-        CTPivotFields pivotFields;
-        if (pivotTableDefinition.getPivotFields() != null) {
-            pivotFields = pivotTableDefinition.getPivotFields();
-        } else {
-            pivotFields = pivotTableDefinition.addNewPivotFields();
-        }
-        AreaReference sourceArea = getPivotArea();
-        int firstColumn = sourceArea.getFirstCell().getCol();
-        int lastColumn = sourceArea.getLastCell().getCol();
-        CTPivotField pivotField;
-        for(int i = firstColumn; i<=lastColumn; i++) {
-            pivotField = pivotFields.addNewPivotField();
-            pivotField.setDataField(false);
-            pivotField.setShowAll(false);
-        }
-        pivotFields.setCount(pivotFields.sizeOfPivotFieldArray());
-    }
-    
-    protected static interface PivotTableReferenceConfigurator {
-        
-        /**
-         * Configure the name or area reference for the pivot table 
-         * @param wsSource CTWorksheetSource that needs the pivot source reference assignment
-         */
-        public void configureReference(CTWorksheetSource wsSource);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
deleted file mode 100644
index 43b8c5a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.ss.usermodel.PageOrder;
-import org.apache.poi.ss.usermodel.PaperSize;
-import org.apache.poi.ss.usermodel.PrintCellComments;
-import org.apache.poi.ss.usermodel.PrintOrientation;
-import org.apache.poi.ss.usermodel.PrintSetup;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageMargins;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageSetup;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellComments;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STOrientation;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPageOrder;
-
-
-/**
- * Page setup and page margins settings for the worksheet.
- */
-public class XSSFPrintSetup implements PrintSetup {
-    private CTWorksheet ctWorksheet;
-    private CTPageSetup pageSetup;
-    private CTPageMargins pageMargins;
-
-    protected XSSFPrintSetup(CTWorksheet worksheet) {
-        this.ctWorksheet = worksheet;
-        
-        if(ctWorksheet.isSetPageSetup()) {
-           this.pageSetup = ctWorksheet.getPageSetup();
-        } else {
-           this.pageSetup = ctWorksheet.addNewPageSetup();
-        }
-        if(ctWorksheet.isSetPageMargins()) {
-           this.pageMargins = ctWorksheet.getPageMargins();
-        } else {
-           this.pageMargins = ctWorksheet.addNewPageMargins();
-        }
-    }
-
-    /**
-     * Set the paper size.
-     *
-     * @param size the paper size.
-     */
-    public void setPaperSize(short size) {
-        pageSetup.setPaperSize(size);
-    }
-
-    /**
-     * Set the paper size as enum value.
-     *
-     * @param size value for the paper size.
-     */
-    public void setPaperSize(PaperSize size) {
-        setPaperSize((short) (size.ordinal() + 1));
-    }
-
-    /**
-     * Set the scale.
-     * Valid values range from 10 to 400.
-     * This setting is overridden when fitToWidth and/or fitToHeight are in use
-     *
-     * @param scale the scale to use
-     */
-    public void setScale(short scale) {
-        if (scale < 10 || scale > 400) throw new POIXMLException("Scale value not accepted: you must choose a value between 10 and 400.");
-        pageSetup.setScale(scale);
-    }
-
-    /**
-     * Set the page numbering start.
-     * Page number for first printed page. If no value is specified, then 'automatic' is assumed.
-     *
-     * @param start the page numbering start
-     */
-    public void setPageStart(short start) {
-        pageSetup.setFirstPageNumber(start);
-    }
-
-    /**
-     * Set the number of pages wide to fit the sheet in
-     *
-     * @param width the number of pages
-     */
-    public void setFitWidth(short width) {
-        pageSetup.setFitToWidth(width);
-    }
-
-    /**
-     * Set the number of pages high to fit the sheet in
-     *
-     * @param height the number of pages
-     */
-    public void setFitHeight(short height) {
-        pageSetup.setFitToHeight(height);
-    }
-
-    /**
-     * Set whether to go left to right or top down in ordering
-     *
-     * @param ltor left to right
-     */
-    public void setLeftToRight(boolean ltor) {
-        if (ltor)
-            setPageOrder(PageOrder.OVER_THEN_DOWN);
-        else 
-            setPageOrder(PageOrder.DOWN_THEN_OVER);
-    }
-
-    /**
-     * Set whether to print in landscape
-     *
-     * @param ls landscape
-     */
-    public void setLandscape(boolean ls) {
-        if (ls)
-            setOrientation(PrintOrientation.LANDSCAPE);
-        else 
-            setOrientation(PrintOrientation.PORTRAIT);
-    }
-
-    /**
-     * Use the printer's defaults settings for page setup values and don't use the default values
-     * specified in the schema. For example, if dpi is not present or specified in the XML, the
-     * a plication shall not assume 600dpi as specified in the schema as a default and instead
-     * shall let the printer specify the default dpi.
-     *
-     * @param valid Valid
-     */
-    public void setValidSettings(boolean valid) {
-        pageSetup.setUsePrinterDefaults(valid);
-    }
-
-    /**
-     * Set whether it is black and white
-     *
-     * @param mono Black and white
-     */
-    public void setNoColor(boolean mono) {
-        pageSetup.setBlackAndWhite(mono);
-    }
-
-    /**
-     * Set whether it is in draft mode
-     *
-     * @param d draft
-     */
-    public void setDraft(boolean d) {
-        pageSetup.setDraft(d);
-    }
-
-    /**
-     * Print the include notes
-     *
-     * @param printnotes print the notes
-     */
-    public void setNotes(boolean printnotes) {
-        if (printnotes){
-            pageSetup.setCellComments(STCellComments.AS_DISPLAYED);
-        }
-    }
-
-    /**
-     * Set no orientation.
-     *
-     * @param orientation Orientation.
-     */
-    public void setNoOrientation(boolean orientation) {
-        if (orientation) {
-            setOrientation(PrintOrientation.DEFAULT);
-        }
-    }
-
-    /**
-     * Set whether to use page start
-     *
-     * @param page Use page start
-     */
-    public void setUsePage(boolean page) {
-        pageSetup.setUseFirstPageNumber(page);
-    }
-
-    /**
-     * Sets the horizontal resolution.
-     *
-     * @param resolution horizontal resolution
-     */
-    public void setHResolution(short resolution) {
-        pageSetup.setHorizontalDpi(resolution);
-    }
-
-    /**
-     * Sets the vertical resolution.
-     *
-     * @param resolution vertical resolution
-     */
-    public void setVResolution(short resolution) {
-        pageSetup.setVerticalDpi(resolution);
-    }
-
-    /**
-     * Sets the header margin.
-     *
-     * @param headermargin header margin
-     */
-    public void setHeaderMargin(double headermargin) {
-        pageMargins.setHeader(headermargin);
-    }
-
-    /**
-     * Sets the footer margin.
-     *
-     * @param footermargin footer margin
-     */
-    public void setFooterMargin(double footermargin) {
-        pageMargins.setFooter(footermargin);
-    }
-
-    /**
-     * Sets the number of copies.
-     *
-     * @param copies number of copies
-     */
-    public void setCopies(short copies) {
-        pageSetup.setCopies(copies);
-    }
-
-    /**
-     * Orientation of the page: landscape - portrait.
-     *
-     * @param orientation - Orientation of the page
-     * @see PrintOrientation
-     */
-    public void setOrientation(PrintOrientation orientation) {
-        STOrientation.Enum v = STOrientation.Enum.forInt(orientation.getValue());
-        pageSetup.setOrientation(v);
-    }
-
-    /**
-     * Orientation of the page: landscape - portrait.
-     *
-     * @return Orientation of the page
-     * @see PrintOrientation
-     */
-    public PrintOrientation getOrientation() {
-        STOrientation.Enum val = pageSetup.getOrientation();
-        return val == null ? PrintOrientation.DEFAULT : PrintOrientation.valueOf(val.intValue());
-    }
-
-
-    public PrintCellComments getCellComment() {
-        STCellComments.Enum val = pageSetup.getCellComments();
-        return val == null ? PrintCellComments.NONE : PrintCellComments.valueOf(val.intValue());
-    }
-
-    /**
-     * Set print page order.
-     *
-     * @param pageOrder
-     */
-    public void setPageOrder(PageOrder pageOrder) {
-        STPageOrder.Enum v = STPageOrder.Enum.forInt(pageOrder.getValue());
-        pageSetup.setPageOrder(v);
-    }
-
-    /**
-     * get print page order.
-     *
-     * @return PageOrder
-     */
-    public PageOrder getPageOrder() {
-        return (pageSetup.getPageOrder() == null) ? null : PageOrder.valueOf(pageSetup.getPageOrder().intValue());
-    }
-
-    /**
-     * Returns the paper size.
-     *
-     * @return short - paper size
-     */
-    public short getPaperSize() {
-        return (short) pageSetup.getPaperSize();
-    }
-
-    /**
-     * Returns the paper size as enum.
-     *
-     * @return PaperSize paper size
-     * @see PaperSize
-     */
-    public PaperSize getPaperSizeEnum() {
-        return PaperSize.values()[getPaperSize() - 1];
-    }
-
-    /**
-     * Returns the scale.
-     *
-     * @return short - scale
-     */
-    public short getScale() {
-        return (short) pageSetup.getScale();
-    }
-
-    /**
-     * Set the page numbering start.
-     * Page number for first printed page. If no value is specified, then 'automatic' is assumed.
-     *
-     * @return page number for first printed page
-     */
-    public short getPageStart() {
-        return (short) pageSetup.getFirstPageNumber();
-    }
-
-    /**
-     * Returns the number of pages wide to fit sheet in.
-     *
-     * @return number of pages wide to fit sheet in
-     */
-    public short getFitWidth() {
-        return (short) pageSetup.getFitToWidth();
-    }
-
-    /**
-     * Returns the number of pages high to fit the sheet in.
-     *
-     * @return number of pages high to fit the sheet in
-     */
-    public short getFitHeight() {
-        return (short) pageSetup.getFitToHeight();
-    }
-
-    /**
-     * Returns the left to right print order.
-     *
-     * @return left to right print order
-     */
-    public boolean getLeftToRight() {
-        return getPageOrder() == PageOrder.OVER_THEN_DOWN;
-    }
-
-    /**
-     * Returns the landscape mode.
-     *
-     * @return landscape mode
-     */
-    public boolean getLandscape() {
-        return getOrientation() == PrintOrientation.LANDSCAPE;
-    }
-
-    /**
-     * Use the printer's defaults settings for page setup values and don't use the default values
-     * specified in the schema. For example, if dpi is not present or specified in the XML, the
-     * application shall not assume 600dpi as specified in the schema as a default and instead
-     * shall let the printer specify the default dpi.
-     *
-     * @return valid settings
-     */
-    public boolean getValidSettings() {
-        return pageSetup.getUsePrinterDefaults();
-    }
-
-    /**
-     * Returns the black and white setting.
-     *
-     * @return black and white setting
-     */
-    public boolean getNoColor() {
-        return pageSetup.getBlackAndWhite();
-    }
-
-    /**
-     * Returns the draft mode.
-     *
-     * @return draft mode
-     */
-    public boolean getDraft() {
-        return pageSetup.getDraft();
-    }
-
-    /**
-     * Returns the print notes.
-     *
-     * @return print notes
-     */
-    public boolean getNotes() {
-        return getCellComment() == PrintCellComments.AS_DISPLAYED;
-    }
-
-    /**
-     * Returns the no orientation.
-     *
-     * @return no orientation
-     */
-    public boolean getNoOrientation() {
-        return getOrientation() == PrintOrientation.DEFAULT;
-    }
-
-    /**
-     * Returns the use page numbers.
-     *
-     * @return use page numbers
-     */
-    public boolean getUsePage() {
-        return pageSetup.getUseFirstPageNumber();
-    }
-
-    /**
-     * Returns the horizontal resolution.
-     *
-     * @return horizontal resolution
-     */
-    public short getHResolution() {
-        return (short) pageSetup.getHorizontalDpi();
-    }
-
-    /**
-     * Returns the vertical resolution.
-     *
-     * @return vertical resolution
-     */
-    public short getVResolution() {
-        return (short) pageSetup.getVerticalDpi();
-    }
-
-    /**
-     * Returns the header margin.
-     *
-     * @return header margin
-     */
-    public double getHeaderMargin() {
-        return pageMargins.getHeader();
-    }
-
-    /**
-     * Returns the footer margin.
-     *
-     * @return footer margin
-     */
-    public double getFooterMargin() {
-        return pageMargins.getFooter();
-    }
-
-    /**
-     * Returns the number of copies.
-     *
-     * @return number of copies
-     */
-    public short getCopies() {
-        return (short) pageSetup.getCopies();
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
deleted file mode 100644
index 9a16f00..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLRelation;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.model.CalculationChain;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.model.ExternalLinksTable;
-import org.apache.poi.xssf.model.MapInfo;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.model.SingleXmlCells;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.model.ThemesTable;
-
-/**
- * Defines namespaces, content types and normal file names / naming
- *  patterns, for the well-known XSSF format parts. 
- */
-public final class XSSFRelation extends POIXMLRelation {
-
-    private static final POILogger log = POILogFactory.getLogger(XSSFRelation.class);
-
-    /**
-     * A map to lookup POIXMLRelation by its relation type
-     */
-    private static final Map<String, XSSFRelation> _table = new HashMap<String, XSSFRelation>();
-
-
-    public static final XSSFRelation WORKBOOK = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/workbook",
-        "/xl/workbook.xml",
-        null
-    );
-    public static final XSSFRelation MACROS_WORKBOOK = new XSSFRelation(
-        "application/vnd.ms-excel.sheet.macroEnabled.main+xml",
-        PackageRelationshipTypes.CORE_DOCUMENT,
-        "/xl/workbook.xml",
-        null
-    );
-    public static final XSSFRelation TEMPLATE_WORKBOOK = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml",
-        PackageRelationshipTypes.CORE_DOCUMENT,
-        "/xl/workbook.xml",
-        null
-    );
-
-    public static final XSSFRelation MACRO_TEMPLATE_WORKBOOK = new XSSFRelation(
-        "application/vnd.ms-excel.template.macroEnabled.main+xml",
-        PackageRelationshipTypes.CORE_DOCUMENT,
-        "/xl/workbook.xml",
-        null
-    );
-    public static final XSSFRelation MACRO_ADDIN_WORKBOOK = new XSSFRelation(
-        "application/vnd.ms-excel.addin.macroEnabled.main+xml",
-        PackageRelationshipTypes.CORE_DOCUMENT,
-        "/xl/workbook.xml",
-        null
-    );
-
-    public static final XSSFRelation XLSB_BINARY_WORKBOOK = new XSSFRelation(
-            "application/vnd.ms-excel.sheet.binary.macroEnabled.main",
-            PackageRelationshipTypes.CORE_DOCUMENT,
-            "/xl/workbook.bin",
-            null
-        );
-
-    public static final XSSFRelation WORKSHEET = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet",
-        "/xl/worksheets/sheet#.xml",
-        XSSFSheet.class
-    );
-
-    public static final XSSFRelation CHARTSHEET = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet",
-        "/xl/chartsheets/sheet#.xml",
-        XSSFChartSheet.class
-    );
-
-    public static final XSSFRelation SHARED_STRINGS = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings",
-        "/xl/sharedStrings.xml",
-        SharedStringsTable.class
-    );
-
-    public static final XSSFRelation STYLES = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
-        PackageRelationshipTypes.STYLE_PART,
-        "/xl/styles.xml",
-        StylesTable.class
-    );
-
-    public static final XSSFRelation DRAWINGS = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.drawing+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
-        "/xl/drawings/drawing#.xml",
-        XSSFDrawing.class
-    );
-
-    public static final XSSFRelation VML_DRAWINGS = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.vmlDrawing",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing",
-        "/xl/drawings/vmlDrawing#.vml",
-        XSSFVMLDrawing.class
-    );
-
-    public static final XSSFRelation CHART = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart",
-        "/xl/charts/chart#.xml",
-        XSSFChart.class
-    );
-
-    public static final XSSFRelation CUSTOM_XML_MAPPINGS = new XSSFRelation(
-        "application/xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/xmlMaps",
-        "/xl/xmlMaps.xml",
-        MapInfo.class
-    );
-
-    public static final XSSFRelation SINGLE_XML_CELLS = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.tableSingleCells+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableSingleCells",
-        "/xl/tables/tableSingleCells#.xml",
-        SingleXmlCells.class
-    );
-
-    public static final XSSFRelation TABLE = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table",
-        "/xl/tables/table#.xml",
-        XSSFTable.class
-    );
-
-    public static final XSSFRelation IMAGES = new XSSFRelation(
-        null,
-        PackageRelationshipTypes.IMAGE_PART,
-        null,
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_EMF = new XSSFRelation(
-        "image/x-emf",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.emf",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_WMF = new XSSFRelation(
-        "image/x-wmf",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.wmf",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_PICT = new XSSFRelation(
-        "image/pict",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.pict",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_JPEG = new XSSFRelation(
-        "image/jpeg",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.jpeg",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_PNG = new XSSFRelation(
-        "image/png",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.png",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_DIB = new XSSFRelation(
-        "image/dib",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.dib",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_GIF = new XSSFRelation(
-        "image/gif",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.gif",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_TIFF = new XSSFRelation(
-        "image/tiff",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.tiff",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_EPS = new XSSFRelation(
-        "image/x-eps",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.eps",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_BMP = new XSSFRelation(
-        "image/x-ms-bmp",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.bmp",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation IMAGE_WPG = new XSSFRelation(
-        "image/x-wpg",
-        PackageRelationshipTypes.IMAGE_PART,
-        "/xl/media/image#.wpg",
-        XSSFPictureData.class
-    );
-
-    public static final XSSFRelation SHEET_COMMENTS = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
-        "/xl/comments#.xml",
-        CommentsTable.class
-    );
-
-    public static final XSSFRelation SHEET_HYPERLINKS = new XSSFRelation(
-        null,
-        PackageRelationshipTypes.HYPERLINK_PART,
-        null,
-        null
-    );
-
-    public static final XSSFRelation OLEEMBEDDINGS = new XSSFRelation(
-        null,
-        POIXMLDocument.OLE_OBJECT_REL_TYPE,
-        null,
-        null
-    );
-
-    public static final XSSFRelation PACKEMBEDDINGS = new XSSFRelation(
-        null,
-        POIXMLDocument.PACK_OBJECT_REL_TYPE,
-        null,
-        null
-    );
-
-    public static final XSSFRelation VBA_MACROS = new XSSFRelation(
-        "application/vnd.ms-office.vbaProject",
-        "http://schemas.microsoft.com/office/2006/relationships/vbaProject",
-        "/xl/vbaProject.bin",
-        XSSFVBAPart.class
-    );
-
-    public static final XSSFRelation ACTIVEX_CONTROLS = new XSSFRelation(
-        "application/vnd.ms-office.activeX+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/control",
-        "/xl/activeX/activeX#.xml",
-        null
-    );
-
-    public static final XSSFRelation ACTIVEX_BINS = new XSSFRelation(
-        "application/vnd.ms-office.activeX",
-        "http://schemas.microsoft.com/office/2006/relationships/activeXControlBinary",
-        "/xl/activeX/activeX#.bin",
-        null
-    );
-
-    public static final XSSFRelation THEME = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.theme+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",
-        "/xl/theme/theme#.xml",
-        ThemesTable.class
-    );
-
-    public static final XSSFRelation CALC_CHAIN = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain",
-        "/xl/calcChain.xml",
-        CalculationChain.class
-    );
-
-    public static final XSSFRelation EXTERNAL_LINKS = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink",
-        "/xl/externalLinks/externalLink#.xmll",
-        ExternalLinksTable.class
-    );
-
-    public static final XSSFRelation PRINTER_SETTINGS = new XSSFRelation(
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings",
-        "/xl/printerSettings/printerSettings#.bin",
-        null
-   );
-    public static final XSSFRelation PIVOT_TABLE = new XSSFRelation(
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable",
-            "/xl/pivotTables/pivotTable#.xml",
-            XSSFPivotTable.class
-    );
-    public static final XSSFRelation PIVOT_CACHE_DEFINITION = new XSSFRelation(
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition",
-            "/xl/pivotCache/pivotCacheDefinition#.xml",
-            XSSFPivotCacheDefinition.class
-    );
-    public static final XSSFRelation PIVOT_CACHE_RECORDS = new XSSFRelation(
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords",
-            "/xl/pivotCache/pivotCacheRecords#.xml",
-            XSSFPivotCacheRecords.class
-    );
-
-    public static final XSSFRelation CTRL_PROP_RECORDS = new XSSFRelation(
-            null,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp",
-            "/xl/ctrlProps/ctrlProp#.xml",
-            null
-    );
-    
-    public static final String NS_SPREADSHEETML = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
-    public static final String NS_DRAWINGML = "http://schemas.openxmlformats.org/drawingml/2006/main";
-    public static final String NS_CHART = "http://schemas.openxmlformats.org/drawingml/2006/chart";
-
-    private XSSFRelation(String type, String rel, String defaultName, Class<? extends POIXMLDocumentPart> cls) {
-        super(type, rel, defaultName, cls);
-        _table.put(rel, this);
-    }
-
-    /**
-     *  Fetches the InputStream to read the contents, based
-     *  of the specified core part, for which we are defined
-     *  as a suitable relationship
-     */
-    public InputStream getContents(PackagePart corePart) throws IOException, InvalidFormatException {
-        PackageRelationshipCollection prc =
-            corePart.getRelationshipsByType(_relation);
-        Iterator<PackageRelationship> it = prc.iterator();
-        if(it.hasNext()) {
-            PackageRelationship rel = it.next();
-            PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
-            PackagePart part = corePart.getPackage().getPart(relName);
-            return part.getInputStream();
-        }
-        log.log(POILogger.WARN, "No part " + _defaultName + " found");
-        return null;
-    }
-
-    /**
-     * Get POIXMLRelation by relation type
-     *
-     * @param rel relation type, for example,
-     *    <code>http://schemas.openxmlformats.org/officeDocument/2006/relationships/image</code>
-     * @return registered POIXMLRelation or null if not found
-     */
-    public static XSSFRelation getInstance(String rel){
-        return _table.get(rel);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
deleted file mode 100644
index e93f0fa..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.model.ThemesTable;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlCursor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRElt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXstring;
-
-
-/**
- * Rich text unicode string.  These strings can have fonts applied to arbitary parts of the string.
- *
- * <p>
- * Most strings in a workbook have formatting applied at the cell level, that is, the entire string in the cell has the
- * same formatting applied. In these cases, the formatting for the cell is stored in the styles part,
- * and the string for the cell can be shared across the workbook. The following code illustrates the example.
- * </p>
- *
- * <blockquote>
- * <pre>
- *     cell1.setCellValue(new XSSFRichTextString("Apache POI"));
- *     cell2.setCellValue(new XSSFRichTextString("Apache POI"));
- *     cell3.setCellValue(new XSSFRichTextString("Apache POI"));
- * </pre>
- * </blockquote>
- * In the above example all three cells will use the same string cached on workbook level.
- *
- * <p>
- * Some strings in the workbook may have formatting applied at a level that is more granular than the cell level.
- * For instance, specific characters within the string may be bolded, have coloring, italicizing, etc.
- * In these cases, the formatting is stored along with the text in the string table, and is treated as
- * a unique entry in the workbook. The following xml and code snippet illustrate this.
- * </p>
- *
- * <blockquote>
- * <pre>
- *     XSSFRichTextString s1 = new XSSFRichTextString("Apache POI");
- *     s1.applyFont(boldArial);
- *     cell1.setCellValue(s1);
- *
- *     XSSFRichTextString s2 = new XSSFRichTextString("Apache POI");
- *     s2.applyFont(italicCourier);
- *     cell2.setCellValue(s2);
- * </pre>
- * </blockquote>
- */
-public class XSSFRichTextString implements RichTextString {
-    private static final Pattern utfPtrn = Pattern.compile("_x([0-9A-Fa-f]{4})_");
-
-    private CTRst st;
-    private StylesTable styles;
-
-    /**
-     * Create a rich text string
-     */
-    public XSSFRichTextString(String str) {
-        st = CTRst.Factory.newInstance();
-        st.setT(str);
-        preserveSpaces(st.xgetT());
-    }
-
-    /**
-     * Create empty rich text string and initialize it with empty string
-     */
-    public XSSFRichTextString() {
-        st = CTRst.Factory.newInstance();
-    }
-
-    /**
-     * Create a rich text string from the supplied XML bean
-     */
-    public XSSFRichTextString(CTRst st) {
-        this.st = st;
-    }
-
-    /**
-     * Applies a font to the specified characters of a string.
-     *
-     * @param startIndex    The start index to apply the font to (inclusive)
-     * @param endIndex      The end index to apply the font to (exclusive)
-     * @param fontIndex     The font to use.
-     */
-    public void applyFont(int startIndex, int endIndex, short fontIndex) {
-        XSSFFont font;
-        if(styles == null) {
-            //style table is not set, remember fontIndex and set the run properties later,
-            //when setStylesTableReference is called
-            font = new XSSFFont();
-            font.setFontName("#" + fontIndex);
-        } else {
-            font = styles.getFontAt(fontIndex);
-        }
-        applyFont(startIndex, endIndex, font);
-    }
-
-    /**
-     * Applies a font to the specified characters of a string.
-     *
-     * @param startIndex    The start index to apply the font to (inclusive)
-     * @param endIndex      The end index to apply to font to (exclusive)
-     * @param font          The index of the font to use.
-     */
-    public void applyFont(int startIndex, int endIndex, Font font) {
-        if (startIndex > endIndex)
-            throw new IllegalArgumentException("Start index must be less than end index, but had " + startIndex + " and " + endIndex);
-        if (startIndex < 0 || endIndex > length())
-            throw new IllegalArgumentException("Start and end index not in range, but had " + startIndex + " and " + endIndex);
-
-        if (startIndex == endIndex)
-            return;
-
-        if(st.sizeOfRArray() == 0 && st.isSetT()) {
-            //convert <t>string</t> into a text run: <r><t>string</t></r>
-            st.addNewR().setT(st.getT());
-            st.unsetT();
-        }
-
-        String text = getString();
-        XSSFFont xssfFont = (XSSFFont)font;
-
-        TreeMap<Integer, CTRPrElt> formats = getFormatMap(st);
-        CTRPrElt fmt = CTRPrElt.Factory.newInstance();
-        setRunAttributes(xssfFont.getCTFont(), fmt);
-        applyFont(formats, startIndex, endIndex, fmt);
-
-        CTRst newSt = buildCTRst(text, formats);
-        st.set(newSt);
-    }
-
-    /**
-     * Sets the font of the entire string.
-     * @param font          The font to use.
-     */
-    public void applyFont(Font font) {
-        String text = getString();
-        applyFont(0, text.length(), font);
-    }
-
-    /**
-     * Applies the specified font to the entire string.
-     *
-     * @param fontIndex  the font to apply.
-     */
-    public void applyFont(short fontIndex) {
-        XSSFFont font;
-        if(styles == null) {
-            font = new XSSFFont();
-            font.setFontName("#" + fontIndex);
-        } else {
-            font = styles.getFontAt(fontIndex);
-        }
-        String text = getString();
-        applyFont(0, text.length(), font);
-    }
-
-    /**
-     * Append new text to this text run and apply the specify font to it
-     *
-     * @param text  the text to append
-     * @param font  the font to apply to the appended text or <code>null</code> if no formatting is required
-     */
-    public void append(String text, XSSFFont font){
-        if(st.sizeOfRArray() == 0 && st.isSetT()) {
-            //convert <t>string</t> into a text run: <r><t>string</t></r>
-            CTRElt lt = st.addNewR();
-            lt.setT(st.getT());
-            preserveSpaces(lt.xgetT());
-            st.unsetT();
-        }
-        CTRElt lt = st.addNewR();
-        lt.setT(text);
-        preserveSpaces(lt.xgetT());
-        
-        if (font != null) {
-            CTRPrElt pr = lt.addNewRPr();
-            setRunAttributes(font.getCTFont(), pr);
-        }
-    }
-
-    /**
-     * Append new text to this text run
-     *
-     * @param text  the text to append
-     */
-    public void append(String text){
-        append(text, null);
-    }
-
-    /**
-     * Copy font attributes from CTFont bean into CTRPrElt bean
-     */
-    private void setRunAttributes(CTFont ctFont, CTRPrElt pr){
-        if(ctFont.sizeOfBArray() > 0) pr.addNewB().setVal(ctFont.getBArray(0).getVal());
-        if(ctFont.sizeOfUArray() > 0) pr.addNewU().setVal(ctFont.getUArray(0).getVal());
-        if(ctFont.sizeOfIArray() > 0) pr.addNewI().setVal(ctFont.getIArray(0).getVal());
-        if(ctFont.sizeOfColorArray() > 0) {
-            CTColor c1 = ctFont.getColorArray(0);
-            CTColor c2 = pr.addNewColor();
-            if(c1.isSetAuto()) c2.setAuto(c1.getAuto());
-            if(c1.isSetIndexed()) c2.setIndexed(c1.getIndexed());
-            if(c1.isSetRgb()) c2.setRgb(c1.getRgb());
-            if(c1.isSetTheme()) c2.setTheme(c1.getTheme());
-            if(c1.isSetTint()) c2.setTint(c1.getTint());
-        }
-        if(ctFont.sizeOfSzArray() > 0) pr.addNewSz().setVal(ctFont.getSzArray(0).getVal());
-        if(ctFont.sizeOfNameArray() > 0) pr.addNewRFont().setVal(ctFont.getNameArray(0).getVal());
-        if(ctFont.sizeOfFamilyArray() > 0) pr.addNewFamily().setVal(ctFont.getFamilyArray(0).getVal());
-        if(ctFont.sizeOfSchemeArray() > 0) pr.addNewScheme().setVal(ctFont.getSchemeArray(0).getVal());
-        if(ctFont.sizeOfCharsetArray() > 0) pr.addNewCharset().setVal(ctFont.getCharsetArray(0).getVal());
-        if(ctFont.sizeOfCondenseArray() > 0) pr.addNewCondense().setVal(ctFont.getCondenseArray(0).getVal());
-        if(ctFont.sizeOfExtendArray() > 0) pr.addNewExtend().setVal(ctFont.getExtendArray(0).getVal());
-        if(ctFont.sizeOfVertAlignArray() > 0) pr.addNewVertAlign().setVal(ctFont.getVertAlignArray(0).getVal());
-        if(ctFont.sizeOfOutlineArray() > 0) pr.addNewOutline().setVal(ctFont.getOutlineArray(0).getVal());
-        if(ctFont.sizeOfShadowArray() > 0) pr.addNewShadow().setVal(ctFont.getShadowArray(0).getVal());
-        if(ctFont.sizeOfStrikeArray() > 0) pr.addNewStrike().setVal(ctFont.getStrikeArray(0).getVal());
-    }
-
-    /**
-     * Does this string have any explicit formatting applied, or is 
-     *  it just text in the default style?
-     */
-    public boolean hasFormatting() {
-        //noinspection deprecation - for performance reasons!
-        CTRElt[] rs = st.getRArray();
-        if (rs == null || rs.length == 0) {
-            return false;
-        }
-        for (CTRElt r : rs) {
-            if (r.isSetRPr()) return true;
-        }
-        return false;
-    }
-
-    /**
-     * Removes any formatting that may have been applied to the string.
-     */
-    public void clearFormatting() {
-        String text = getString();
-        st.setRArray(null);
-        st.setT(text);
-    }
-
-    /**
-     * The index within the string to which the specified formatting run applies.
-     *
-     * @param index     the index of the formatting run
-     * @return  the index within the string.
-     */
-    public int getIndexOfFormattingRun(int index) {
-        if(st.sizeOfRArray() == 0) return 0;
-
-        int pos = 0;
-        for(int i = 0; i < st.sizeOfRArray(); i++){
-            CTRElt r = st.getRArray(i);
-            if(i == index) return pos;
-
-            pos += r.getT().length();
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the number of characters this format run covers.
-     *
-     * @param index     the index of the formatting run
-     * @return  the number of characters this format run covers
-     */
-    public int getLengthOfFormattingRun(int index) {
-        if(st.sizeOfRArray() == 0 || index >= st.sizeOfRArray()) {
-            return -1;
-        }
-
-        CTRElt r = st.getRArray(index);
-        return r.getT().length();
-    }
-
-    /**
-     * Returns the plain string representation.
-     */
-    public String getString() {
-        if(st.sizeOfRArray() == 0) {
-            return utfDecode(st.getT());
-        }
-        StringBuilder buf = new StringBuilder();
-        //noinspection deprecation - for performance reasons!
-        for(CTRElt r : st.getRArray()){
-            buf.append(r.getT());
-        }
-        return utfDecode(buf.toString());
-    }
-
-    /**
-     * Removes any formatting and sets new string value
-     *
-     * @param s new string value
-     */
-    public void setString(String s){
-        clearFormatting();
-        st.setT(s);
-        preserveSpaces(st.xgetT());
-    }
-
-    /**
-     * Returns the plain string representation.
-     */
-    public String toString() {
-        return getString();
-    }
-
-    /**
-     * Returns the number of characters in this string.
-     */
-    public int length() {
-        return getString().length();
-    }
-
-    /**
-     * @return  The number of formatting runs used.
-     */
-    public int numFormattingRuns() {
-        return st.sizeOfRArray();
-    }
-
-    /**
-     * Gets a copy of the font used in a particular formatting run.
-     *
-     * @param index     the index of the formatting run
-     * @return  A copy of the  font used or null if no formatting is applied to the specified text run.
-     */
-    public XSSFFont getFontOfFormattingRun(int index) {
-        if(st.sizeOfRArray() == 0 || index >= st.sizeOfRArray()) {
-            return null;
-        }
-
-        CTRElt r = st.getRArray(index);
-        if(r.getRPr() != null) {
-           XSSFFont fnt = new XSSFFont(toCTFont(r.getRPr()));
-           fnt.setThemesTable(getThemesTable());
-           return fnt;
-        }
-
-        return null;
-    }
-
-    /**
-     * Return a copy of the font in use at a particular index.
-     *
-     * @param index         The index.
-     * @return              A copy of the  font that's currently being applied at that
-     *                      index or null if no font is being applied or the
-     *                      index is out of range.
-     */
-    public XSSFFont getFontAtIndex( int index ) {
-        final ThemesTable themes = getThemesTable();
-        int pos = 0;
-        //noinspection deprecation - for performance reasons!
-        for(CTRElt r : st.getRArray()){
-            final int length = r.getT().length();
-            if(index >= pos && index < pos + length) {
-               XSSFFont fnt = new XSSFFont(toCTFont(r.getRPr()));
-               fnt.setThemesTable(themes);
-               return fnt;
-            }
-
-            pos += length;
-        }
-        return null;
-
-    }
-
-    /**
-     * Return the underlying xml bean
-     */
-    @Internal
-    public CTRst getCTRst() {
-        return st;
-    }
-
-    protected void setStylesTableReference(StylesTable tbl){
-        styles = tbl;
-        if(st.sizeOfRArray() > 0) {
-            //noinspection deprecation - for performance reasons!
-            for (CTRElt r : st.getRArray()) {
-                CTRPrElt pr = r.getRPr();
-                if(pr != null && pr.sizeOfRFontArray() > 0){
-                    String fontName = pr.getRFontArray(0).getVal();
-                    if(fontName.startsWith("#")){
-                        int idx = Integer.parseInt(fontName.substring(1));
-                        XSSFFont font = styles.getFontAt(idx);
-                        pr.removeRFont(0);
-                        setRunAttributes(font.getCTFont(), pr);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     *
-     * CTRPrElt --> CTFont adapter
-     */
-    protected static CTFont toCTFont(CTRPrElt pr){
-        CTFont ctFont =  CTFont.Factory.newInstance();
-
-        // Bug 58315: there are files where there is no pr-entry for a RichTextString
-        if(pr == null) {
-            return ctFont;
-        }
-
-        if(pr.sizeOfBArray() > 0) ctFont.addNewB().setVal(pr.getBArray(0).getVal());
-        if(pr.sizeOfUArray() > 0) ctFont.addNewU().setVal(pr.getUArray(0).getVal());
-        if(pr.sizeOfIArray() > 0) ctFont.addNewI().setVal(pr.getIArray(0).getVal());
-        if(pr.sizeOfColorArray() > 0) {
-            CTColor c1 = pr.getColorArray(0);
-            CTColor c2 = ctFont.addNewColor();
-            if(c1.isSetAuto()) c2.setAuto(c1.getAuto());
-            if(c1.isSetIndexed()) c2.setIndexed(c1.getIndexed());
-            if(c1.isSetRgb()) c2.setRgb(c1.getRgb());
-            if(c1.isSetTheme()) c2.setTheme(c1.getTheme());
-            if(c1.isSetTint()) c2.setTint(c1.getTint());
-        }
-        if(pr.sizeOfSzArray() > 0) ctFont.addNewSz().setVal(pr.getSzArray(0).getVal());
-        if(pr.sizeOfRFontArray() > 0) ctFont.addNewName().setVal(pr.getRFontArray(0).getVal());
-        if(pr.sizeOfFamilyArray() > 0) ctFont.addNewFamily().setVal(pr.getFamilyArray(0).getVal());
-        if(pr.sizeOfSchemeArray() > 0) ctFont.addNewScheme().setVal(pr.getSchemeArray(0).getVal());
-        if(pr.sizeOfCharsetArray() > 0) ctFont.addNewCharset().setVal(pr.getCharsetArray(0).getVal());
-        if(pr.sizeOfCondenseArray() > 0) ctFont.addNewCondense().setVal(pr.getCondenseArray(0).getVal());
-        if(pr.sizeOfExtendArray() > 0) ctFont.addNewExtend().setVal(pr.getExtendArray(0).getVal());
-        if(pr.sizeOfVertAlignArray() > 0) ctFont.addNewVertAlign().setVal(pr.getVertAlignArray(0).getVal());
-        if(pr.sizeOfOutlineArray() > 0) ctFont.addNewOutline().setVal(pr.getOutlineArray(0).getVal());
-        if(pr.sizeOfShadowArray() > 0) ctFont.addNewShadow().setVal(pr.getShadowArray(0).getVal());
-        if(pr.sizeOfStrikeArray() > 0) ctFont.addNewStrike().setVal(pr.getStrikeArray(0).getVal());
-
-        return ctFont;
-    }
-
-    /**
-     * Add the xml:spaces="preserve" attribute if the string has leading or trailing spaces
-     *
-     * @param xs    the string to check
-     */
-    protected static void preserveSpaces(STXstring xs) {
-        String text = xs.getStringValue();
-        if (text != null && text.length() > 0) {
-            char firstChar = text.charAt(0);
-            char lastChar  = text.charAt(text.length() - 1);
-            if(Character.isWhitespace(firstChar) || Character.isWhitespace(lastChar)) {
-                XmlCursor c = xs.newCursor();
-                c.toNextToken();
-                c.insertAttributeWithValue(new QName("http://www.w3.org/XML/1998/namespace", "space"), "preserve");
-                c.dispose();
-            }
-        }
-    }
-
-    /**
-     * For all characters which cannot be represented in XML as defined by the XML 1.0 specification,
-     * the characters are escaped using the Unicode numerical character representation escape character
-     * format _xHHHH_, where H represents a hexadecimal character in the character's value.
-     * <p>
-     * Example: The Unicode character 0D is invalid in an XML 1.0 document,
-     * so it shall be escaped as <code>_x000D_</code>.
-     * </p>
-     * See section 3.18.9 in the OOXML spec.
-     *
-     * @param   value the string to decode
-     * @return  the decoded string
-     */
-    static String utfDecode(String value){
-        if(value == null || !value.contains("_x")) {
-            return value;
-        }
-        
-        StringBuilder buf = new StringBuilder();
-        Matcher m = utfPtrn.matcher(value);
-        int idx = 0;
-        while(m.find()) {
-            int pos = m.start();
-            if( pos > idx) {
-                buf.append(value.substring(idx, pos));
-            }
-
-            String code = m.group(1);
-            int icode = Integer.decode("0x" + code);
-            buf.append((char)icode);
-
-            idx = m.end();
-        }
-        
-        // small optimization: don't go via StringBuilder if not necessary, 
-        // the encodings are very rare, so we should almost always go via this shortcut. 
-        if(idx == 0) {
-            return value;
-        }
-        
-        buf.append(value.substring(idx));
-        return buf.toString();
-    }
-
-    void applyFont(TreeMap<Integer, CTRPrElt> formats, int startIndex, int endIndex, CTRPrElt fmt) {
-            // delete format runs that fit between startIndex and endIndex
-            // runs intersecting startIndex and endIndex remain
-            int runStartIdx = 0;
-            for (Iterator<Integer> it = formats.keySet().iterator(); it.hasNext();) {
-                int runEndIdx = it.next();
-                if (runStartIdx >= startIndex && runEndIdx < endIndex) {
-                   it.remove();
-                }
-                runStartIdx = runEndIdx;
-            }
-
-            if(startIndex > 0 && !formats.containsKey(startIndex)) {
-                // If there's a format that starts later in the string, make it start now
-                for(Map.Entry<Integer, CTRPrElt> entry : formats.entrySet()) {
-                   if(entry.getKey() > startIndex) {
-                      formats.put(startIndex, entry.getValue());
-                      break;
-                   }
-                }
-            }
-            formats.put(endIndex, fmt);
-
-            // assure that the range [startIndex, endIndex] consists if a single run
-            // there can be two or three runs depending whether startIndex or endIndex
-            // intersected existing format runs
-            SortedMap<Integer, CTRPrElt> sub = formats.subMap(startIndex, endIndex);
-            while(sub.size() > 1) sub.remove(sub.lastKey());
-        }
-
-    TreeMap<Integer, CTRPrElt> getFormatMap(CTRst entry){
-        int length = 0;
-        TreeMap<Integer, CTRPrElt> formats = new TreeMap<Integer, CTRPrElt>();
-        //noinspection deprecation - for performance reasons!
-        for (CTRElt r : entry.getRArray()) {
-            String txt = r.getT();
-            CTRPrElt fmt = r.getRPr();
-
-            length += txt.length();
-            formats.put(length, fmt);
-        }
-        return formats;
-    }
-
-    CTRst buildCTRst(String text, TreeMap<Integer, CTRPrElt> formats){
-        if(text.length() != formats.lastKey()) {
-            throw new IllegalArgumentException("Text length was " + text.length() +
-                    " but the last format index was " + formats.lastKey());
-        }
-        CTRst stf = CTRst.Factory.newInstance();
-        int runStartIdx = 0;
-        for (Map.Entry<Integer, CTRPrElt> me : formats.entrySet()) {
-            int runEndIdx = me.getKey();
-            CTRElt run = stf.addNewR();
-            String fragment = text.substring(runStartIdx, runEndIdx);
-            run.setT(fragment);
-            preserveSpaces(run.xgetT());
-
-            CTRPrElt fmt = me.getValue();
-            if (fmt != null) {
-                run.setRPr(fmt);
-            }
-            runStartIdx = runEndIdx;
-        }
-        return stf;
-    }
-    
-    private ThemesTable getThemesTable() {
-       if(styles == null) return null;
-       return styles.getTheme();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
deleted file mode 100644
index e936ed5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
+++ /dev/null
@@ -1,675 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellCopyPolicy;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.xssf.model.CalculationChain;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.usermodel.helpers.XSSFRowShifter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRow;
-
-/**
- * High level representation of a row of a spreadsheet.
- */
-public class XSSFRow implements Row, Comparable<XSSFRow> {
-    //private static final POILogger _logger = POILogFactory.getLogger(XSSFRow.class);
-
-    /**
-     * the xml bean containing all cell definitions for this row
-     */
-    private final CTRow _row;
-
-    /**
-     * Cells of this row keyed by their column indexes.
-     * The TreeMap ensures that the cells are ordered by columnIndex in the ascending order.
-     */
-    private final TreeMap<Integer, XSSFCell> _cells;
-
-    /**
-     * the parent sheet
-     */
-    private final XSSFSheet _sheet;
-
-    /**
-     * Construct a XSSFRow.
-     *
-     * @param row the xml bean containing all cell definitions for this row.
-     * @param sheet the parent sheet.
-     */
-    protected XSSFRow(CTRow row, XSSFSheet sheet) {
-        _row = row;
-        _sheet = sheet;
-        _cells = new TreeMap<Integer, XSSFCell>();
-        for (CTCell c : row.getCArray()) {
-            XSSFCell cell = new XSSFCell(this, c);
-            // Performance optimization for bug 57840: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-            final Integer colI = new Integer(cell.getColumnIndex()); // NOSONAR
-            _cells.put(colI, cell);
-            sheet.onReadCell(cell);
-        }
-        
-        if (! row.isSetR()) {
-            // Certain file format writers skip the row number
-            // Assume no gaps, and give this the next row number
-            int nextRowNum = sheet.getLastRowNum()+2;
-            if (nextRowNum == 2 && sheet.getPhysicalNumberOfRows() == 0) {
-                nextRowNum = 1;
-            }
-            row.setR(nextRowNum);
-        }
-    }
-
-    /**
-     * Returns the XSSFSheet this row belongs to
-     *
-     * @return the XSSFSheet that owns this row
-     */
-    @Override
-    public XSSFSheet getSheet() {
-        return this._sheet;
-    }
-
-    /**
-     * Cell iterator over the physically defined cells:
-     * <blockquote><pre>
-     * for (Iterator<Cell> it = row.cellIterator(); it.hasNext(); ) {
-     *     Cell cell = it.next();
-     *     ...
-     * }
-     * </pre></blockquote>
-     *
-     * @return an iterator over cells in this row.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-	public Iterator<Cell> cellIterator() {
-        return (Iterator<Cell>)(Iterator<? extends Cell>)_cells.values().iterator();
-    }
-
-    /**
-     * Alias for {@link #cellIterator()} to allow  foreach loops:
-     * <blockquote><pre>
-     * for(Cell cell : row){
-     *     ...
-     * }
-     * </pre></blockquote>
-     *
-     * @return an iterator over cells in this row.
-     */
-    @Override
-    public Iterator<Cell> iterator() {
-    	return cellIterator();
-    }
-
-    /**
-     * Compares two <code>XSSFRow</code> objects.  Two rows are equal if they belong to the same worksheet and
-     * their row indexes are equal.
-     *
-     * @param   other   the <code>XSSFRow</code> to be compared.
-     * @return  <ul>
-     *      <li>
-     *      the value <code>0</code> if the row number of this <code>XSSFRow</code> is
-     *      equal to the row number of the argument <code>XSSFRow</code>
-     *      </li>
-     *      <li>
-     *      a value less than <code>0</code> if the row number of this this <code>XSSFRow</code> is
-     *      numerically less than the row number of the argument <code>XSSFRow</code>
-     *      </li>
-     *      <li>
-     *      a value greater than <code>0</code> if the row number of this this <code>XSSFRow</code> is
-     *      numerically greater than the row number of the argument <code>XSSFRow</code>
-     *      </li>
-     *      </ul>
-     * @throws IllegalArgumentException if the argument row belongs to a different worksheet
-     */
-    @Override
-    public int compareTo(XSSFRow other) {
-        if (this.getSheet() != other.getSheet()) {
-            throw new IllegalArgumentException("The compared rows must belong to the same sheet");
-        }
-
-        Integer thisRow = this.getRowNum();
-        Integer otherRow = other.getRowNum();
-        return thisRow.compareTo(otherRow);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (!(obj instanceof XSSFRow))
-        {
-            return false;
-        }
-        XSSFRow other = (XSSFRow) obj;
-
-        return (this.getRowNum() == other.getRowNum()) &&
-               (this.getSheet() == other.getSheet());
-    }
-
-    @Override
-    public int hashCode() {
-        return _row.hashCode();
-    }
-
-    /**
-     * Use this to create new cells within the row and return it.
-     * <p>
-     * The cell that is returned is a {@link CellType#BLANK}. The type can be changed
-     * either through calling <code>setCellValue</code> or <code>setCellType</code>.
-     * </p>
-     * @param columnIndex - the column number this cell represents
-     * @return Cell a high level representation of the created cell.
-     * @throws IllegalArgumentException if columnIndex < 0 or greater than 16384,
-     *   the maximum number of columns supported by the SpreadsheetML format (.xlsx)
-     */
-    @Override
-    public XSSFCell createCell(int columnIndex) {
-        return createCell(columnIndex, CellType.BLANK);
-    }
-
-    /**
-     * Use this to create new cells within the row and return it.
-     *
-     * @param columnIndex - the column number this cell represents
-     * @param type - the cell's data type
-     * @return XSSFCell a high level representation of the created cell.
-     * @throws IllegalArgumentException if the specified cell type is invalid, columnIndex < 0
-     *   or greater than 16384, the maximum number of columns supported by the SpreadsheetML format (.xlsx)
-     * @see CellType#BLANK
-     * @see CellType#BOOLEAN
-     * @see CellType#ERROR
-     * @see CellType#FORMULA
-     * @see CellType#NUMERIC
-     * @see CellType#STRING
-     * @deprecated POI 3.15 beta 3. Use {@link #createCell(int, CellType)} instead.
-     */
-    @Override
-    public XSSFCell createCell(int columnIndex, int type) {
-        return createCell(columnIndex, CellType.forInt(type));
-    }
-    /**
-     * Use this to create new cells within the row and return it.
-     *
-     * @param columnIndex - the column number this cell represents
-     * @param type - the cell's data type
-     * @return XSSFCell a high level representation of the created cell.
-     * @throws IllegalArgumentException if the specified cell type is invalid, columnIndex < 0
-     *   or greater than 16384, the maximum number of columns supported by the SpreadsheetML format (.xlsx)
-     */
-    @Override
-    public XSSFCell createCell(int columnIndex, CellType type) {
-        // Performance optimization for bug 57840: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-        final Integer colI = new Integer(columnIndex); // NOSONAR
-        CTCell ctCell;
-        XSSFCell prev = _cells.get(colI);
-        if(prev != null){
-            ctCell = prev.getCTCell();
-            ctCell.set(CTCell.Factory.newInstance());
-        } else {
-            ctCell = _row.addNewC();
-        }
-        XSSFCell xcell = new XSSFCell(this, ctCell);
-        xcell.setCellNum(columnIndex);
-        if (type != CellType.BLANK) {
-            xcell.setCellType(type);
-        }
-        _cells.put(colI, xcell);
-        return xcell;
-    }
-
-    /**
-     * Returns the cell at the given (0 based) index,
-     *  with the {@link org.apache.poi.ss.usermodel.Row.MissingCellPolicy} from the parent Workbook.
-     *
-     * @return the cell at the given (0 based) index
-     */
-    @Override
-    public XSSFCell getCell(int cellnum) {
-    	return getCell(cellnum, _sheet.getWorkbook().getMissingCellPolicy());
-    }
-
-    /**
-     * Returns the cell at the given (0 based) index, with the specified {@link org.apache.poi.ss.usermodel.Row.MissingCellPolicy}
-     *
-     * @return the cell at the given (0 based) index
-     * @throws IllegalArgumentException if cellnum &lt; 0 or the specified MissingCellPolicy is invalid
-     */
-    @Override
-    public XSSFCell getCell(int cellnum, MissingCellPolicy policy) {
-    	if(cellnum < 0) throw new IllegalArgumentException("Cell index must be >= 0");
-
-        // Performance optimization for bug 57840: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-    	final Integer colI = new Integer(cellnum); // NOSONAR
-        XSSFCell cell = _cells.get(colI);
-        switch (policy) {
-            case RETURN_NULL_AND_BLANK:
-                return cell;
-            case RETURN_BLANK_AS_NULL:
-                boolean isBlank = (cell != null && cell.getCellTypeEnum() == CellType.BLANK);
-                return (isBlank) ? null : cell;
-            case CREATE_NULL_AS_BLANK:
-                return (cell == null) ? createCell(cellnum, CellType.BLANK) : cell;
-            default:
-                throw new IllegalArgumentException("Illegal policy " + policy + " (" + policy.id + ")");
-        }
-    }
-
-    /**
-     * Get the number of the first cell contained in this row.
-     *
-     * @return short representing the first logical cell in the row,
-     *  or -1 if the row does not contain any cells.
-     */
-    @Override
-    public short getFirstCellNum() {
-    	return (short)(_cells.size() == 0 ? -1 : _cells.firstKey());
-    }
-
-    /**
-     * Gets the index of the last cell contained in this row <b>PLUS ONE</b>. The result also
-     * happens to be the 1-based column number of the last cell.  This value can be used as a
-     * standard upper bound when iterating over cells:
-     * <pre>
-     * short minColIx = row.getFirstCellNum();
-     * short maxColIx = row.getLastCellNum();
-     * for(short colIx=minColIx; colIx&lt;maxColIx; colIx++) {
-     *   XSSFCell cell = row.getCell(colIx);
-     *   if(cell == null) {
-     *     continue;
-     *   }
-     *   //... do something with cell
-     * }
-     * </pre>
-     *
-     * @return short representing the last logical cell in the row <b>PLUS ONE</b>,
-     *   or -1 if the row does not contain any cells.
-     */
-    @Override
-    public short getLastCellNum() {
-    	return (short)(_cells.size() == 0 ? -1 : (_cells.lastKey() + 1));
-    }
-
-    /**
-     * Get the row's height measured in twips (1/20th of a point). If the height is not set, the default worksheet value is returned,
-     * See {@link org.apache.poi.xssf.usermodel.XSSFSheet#getDefaultRowHeightInPoints()}
-     *
-     * @return row height measured in twips (1/20th of a point)
-     */
-    @Override
-    public short getHeight() {
-        return (short)(getHeightInPoints()*20);
-    }
-
-    /**
-     * Returns row height measured in point size. If the height is not set, the default worksheet value is returned,
-     * See {@link org.apache.poi.xssf.usermodel.XSSFSheet#getDefaultRowHeightInPoints()}
-     *
-     * @return row height measured in point size
-     * @see org.apache.poi.xssf.usermodel.XSSFSheet#getDefaultRowHeightInPoints()
-     */
-    @Override
-    public float getHeightInPoints() {
-        if (this._row.isSetHt()) {
-            return (float) this._row.getHt();
-        }
-        return _sheet.getDefaultRowHeightInPoints();
-    }
-
-    /**
-     *  Set the height in "twips" or  1/20th of a point.
-     *
-     * @param height the height in "twips" or  1/20th of a point. <code>-1</code>  resets to the default height
-     */
-    @Override
-    public void setHeight(short height) {
-        if (height == -1) {
-            if (_row.isSetHt()) _row.unsetHt();
-            if (_row.isSetCustomHeight()) _row.unsetCustomHeight();
-        } else {
-            _row.setHt((double) height / 20);
-            _row.setCustomHeight(true);
-
-        }
-    }
-
-    /**
-     * Set the row's height in points.
-     *
-     * @param height the height in points. <code>-1</code>  resets to the default height
-     */
-    @Override
-    public void setHeightInPoints(float height) {
-	    setHeight((short)(height == -1 ? -1 : (height*20)));
-    }
-
-    /**
-     * Gets the number of defined cells (NOT number of cells in the actual row!).
-     * That is to say if only columns 0,4,5 have values then there would be 3.
-     *
-     * @return int representing the number of defined cells in the row.
-     */
-    @Override
-    public int getPhysicalNumberOfCells() {
-    	return _cells.size();
-    }
-
-    /**
-     * Get row number this row represents
-     *
-     * @return the row number (0 based)
-     */
-    @Override
-    public int getRowNum() {
-        return (int) (_row.getR() - 1);
-    }
-
-    /**
-     * Set the row number of this row.
-     *
-     * @param rowIndex  the row number (0-based)
-     * @throws IllegalArgumentException if rowNum < 0 or greater than 1048575
-     */
-    @Override
-    public void setRowNum(int rowIndex) {
-        int maxrow = SpreadsheetVersion.EXCEL2007.getLastRowIndex();
-        if (rowIndex < 0 || rowIndex > maxrow) {
-            throw new IllegalArgumentException("Invalid row number (" + rowIndex
-                    + ") outside allowable range (0.." + maxrow + ")");
-        }
-        _row.setR(rowIndex + 1);
-    }
-
-    /**
-     * Get whether or not to display this row with 0 height
-     *
-     * @return - height is zero or not.
-     */
-    @Override
-    public boolean getZeroHeight() {
-    	return this._row.getHidden();
-    }
-
-    /**
-     * Set whether or not to display this row with 0 height
-     *
-     * @param height  height is zero or not.
-     */
-    @Override
-    public void setZeroHeight(boolean height) {
-    	this._row.setHidden(height);
-
-    }
-
-    /**
-     * Is this row formatted? Most aren't, but some rows
-     *  do have whole-row styles. For those that do, you
-     *  can get the formatting from {@link #getRowStyle()}
-     */
-    @Override
-    public boolean isFormatted() {
-        return _row.isSetS();
-    }
-    /**
-     * Returns the whole-row cell style. Most rows won't
-     *  have one of these, so will return null. Call
-     *  {@link #isFormatted()} to check first.
-     */
-    @Override
-    public XSSFCellStyle getRowStyle() {
-       if(!isFormatted()) return null;
-       
-       StylesTable stylesSource = getSheet().getWorkbook().getStylesSource();
-       if(stylesSource.getNumCellStyles() > 0) {
-           return stylesSource.getStyleAt((int)_row.getS());
-       } else {
-          return null;
-       }
-    }
-    
-    /**
-     * Applies a whole-row cell styling to the row.
-     * If the value is null then the style information is removed,
-     *  causing the cell to used the default workbook style.
-     */
-    @Override
-    public void setRowStyle(CellStyle style) {
-        if(style == null) {
-           if(_row.isSetS()) {
-              _row.unsetS();
-              _row.unsetCustomFormat();
-           }
-        } else {
-            StylesTable styleSource = getSheet().getWorkbook().getStylesSource();
-            
-            XSSFCellStyle xStyle = (XSSFCellStyle)style;
-            xStyle.verifyBelongsToStylesSource(styleSource);
-
-            long idx = styleSource.putStyle(xStyle);
-            _row.setS(idx);
-            _row.setCustomFormat(true);
-        }
-    }
-    
-    /**
-     * Remove the Cell from this row.
-     *
-     * @param cell the cell to remove
-     */
-    @Override
-    public void removeCell(Cell cell) {
-        if (cell.getRow() != this) {
-            throw new IllegalArgumentException("Specified cell does not belong to this row");
-        }
-
-        XSSFCell xcell = (XSSFCell)cell;
-        if(xcell.isPartOfArrayFormulaGroup()) {
-            xcell.notifyArrayFormulaChanging();
-        }
-        if(cell.getCellTypeEnum() == CellType.FORMULA) {
-           _sheet.getWorkbook().onDeleteFormula(xcell);
-        }
-        // Performance optimization for bug 57840: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-        final Integer colI = new Integer(cell.getColumnIndex()); // NOSONAR
-        _cells.remove(colI);
-    }
-
-    /**
-     * Returns the underlying CTRow xml bean containing all cell definitions in this row
-     *
-     * @return the underlying CTRow xml bean
-     */
-    @Internal
-    public CTRow getCTRow(){
-    	return _row;
-    }
-
-    /**
-     * Fired when the document is written to an output stream.
-     *
-     * @see org.apache.poi.xssf.usermodel.XSSFSheet#write(java.io.OutputStream) ()
-     */
-    protected void onDocumentWrite(){
-        // check if cells in the CTRow are ordered
-        boolean isOrdered = true;
-        CTCell[] cArray = _row.getCArray();
-        if (cArray.length != _cells.size()) {
-            isOrdered = false;
-        } else {
-            int i = 0;
-            for (XSSFCell cell : _cells.values()) {
-                CTCell c1 = cell.getCTCell();
-                CTCell c2 = cArray[i++];
-
-                String r1 = c1.getR();
-                String r2 = c2.getR();
-                if (!(r1==null ? r2==null : r1.equals(r2))){
-                    isOrdered = false;
-                    break;
-                }
-            }
-        }
-
-        if(!isOrdered){
-            cArray = new CTCell[_cells.size()];
-            int i = 0;
-            for (XSSFCell xssfCell : _cells.values()) {
-                cArray[i] = (CTCell) xssfCell.getCTCell().copy();
-                
-                // we have to copy and re-create the XSSFCell here because the 
-                // elements as otherwise setCArray below invalidates all the columns!
-                // see Bug 56170, XMLBeans seems to always release previous objects
-                // in the CArray, so we need to provide completely new ones here!
-                //_cells.put(entry.getKey(), new XSSFCell(this, cArray[i]));
-                xssfCell.setCTCell(cArray[i]);
-                i++;
-            }
-
-            _row.setCArray(cArray);
-        }
-    }
-
-    /**
-     * @return formatted xml representation of this row
-     */
-    @Override
-    public String toString(){
-        return _row.toString();
-    }
-
-    /**
-     * update cell references when shifting rows
-     *
-     * @param n the number of rows to move
-     */
-    protected void shift(int n) {
-        int rownum = getRowNum() + n;
-        CalculationChain calcChain = _sheet.getWorkbook().getCalculationChain();
-        int sheetId = (int)_sheet.sheet.getSheetId();
-        String msg = "Row[rownum="+getRowNum()+"] contains cell(s) included in a multi-cell array formula. " +
-                "You cannot change part of an array.";
-        for(Cell c : this){
-            XSSFCell cell = (XSSFCell)c;
-            if(cell.isPartOfArrayFormulaGroup()){
-                cell.notifyArrayFormulaChanging(msg);
-            }
-
-            //remove the reference in the calculation chain
-            if(calcChain != null) calcChain.removeItem(sheetId, cell.getReference());
-
-            CTCell ctCell = cell.getCTCell();
-            String r = new CellReference(rownum, cell.getColumnIndex()).formatAsString();
-            ctCell.setR(r);
-        }
-        setRowNum(rownum);
-    }
-    
-    /**
-     * Copy the cells from srcRow to this row
-     * If this row is not a blank row, this will merge the two rows, overwriting
-     * the cells in this row with the cells in srcRow
-     * If srcRow is null, overwrite cells in destination row with blank values, styles, etc per cell copy policy
-     * srcRow may be from a different sheet in the same workbook
-     * @param srcRow the rows to copy from
-     * @param policy the policy to determine what gets copied
-     */
-    @Beta
-    public void copyRowFrom(Row srcRow, CellCopyPolicy policy) {
-        if (srcRow == null) {
-            // srcRow is blank. Overwrite cells with blank values, blank styles, etc per cell copy policy
-            for (Cell destCell : this) {
-                final XSSFCell srcCell = null;
-                // FIXME: remove type casting when copyCellFrom(Cell, CellCopyPolicy) is added to Cell interface
-                ((XSSFCell)destCell).copyCellFrom(srcCell, policy);
-            }
-
-            if (policy.isCopyMergedRegions()) {
-                // Remove MergedRegions in dest row
-                final int destRowNum = getRowNum();
-                int index = 0;
-                final Set<Integer> indices = new HashSet<Integer>();
-                for (CellRangeAddress destRegion : getSheet().getMergedRegions()) {
-                    if (destRowNum == destRegion.getFirstRow() && destRowNum == destRegion.getLastRow()) {
-                        indices.add(index);
-                    }
-                    index++;
-                }
-                getSheet().removeMergedRegions(indices);
-            }
-
-            if (policy.isCopyRowHeight()) {
-                // clear row height
-                setHeight((short)-1);
-            }
-
-        }
-        else {
-            for (final Cell c : srcRow){
-                final XSSFCell srcCell = (XSSFCell)c;
-                final XSSFCell destCell = createCell(srcCell.getColumnIndex(), srcCell.getCellTypeEnum());
-                destCell.copyCellFrom(srcCell, policy);
-            }
-
-            final XSSFRowShifter rowShifter = new XSSFRowShifter(_sheet);
-            final int sheetIndex = _sheet.getWorkbook().getSheetIndex(_sheet);
-            final String sheetName = _sheet.getWorkbook().getSheetName(sheetIndex);
-            final int srcRowNum = srcRow.getRowNum();
-            final int destRowNum = getRowNum();
-            final int rowDifference = destRowNum - srcRowNum;
-            final FormulaShifter shifter = FormulaShifter.createForRowCopy(sheetIndex, sheetName, srcRowNum, srcRowNum, rowDifference, SpreadsheetVersion.EXCEL2007);
-            rowShifter.updateRowFormulas(this, shifter);
-
-            // Copy merged regions that are fully contained on the row
-            // FIXME: is this something that rowShifter could be doing?
-            if (policy.isCopyMergedRegions()) {
-                for (CellRangeAddress srcRegion : srcRow.getSheet().getMergedRegions()) {
-                    if (srcRowNum == srcRegion.getFirstRow() && srcRowNum == srcRegion.getLastRow()) {
-                        CellRangeAddress destRegion = srcRegion.copy();
-                        destRegion.setFirstRow(destRowNum);
-                        destRegion.setLastRow(destRowNum);
-                        getSheet().addMergedRegion(destRegion);
-                    }
-                }
-            }
-
-            if (policy.isCopyRowHeight()) {
-                setHeight(srcRow.getHeight());
-            }
-        }
-    }
-
-    @Override
-    public int getOutlineLevel() {
-        return _row.getOutlineLevel();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShape.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShape.java
deleted file mode 100644
index 2c63525..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShape.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTLineProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNoFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetLineDashProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STPresetLineDashVal;
-
-/**
- * Represents a shape in a SpreadsheetML drawing.
- *
- * @author Yegor Kozlov
- */
-public abstract class XSSFShape {
-    public static final int EMU_PER_PIXEL = 9525;
-    public static final int EMU_PER_POINT = 12700;
-
-    public static final int POINT_DPI = 72;
-    public static final int PIXEL_DPI = 96;
-
-    /**
-     * Parent drawing
-     */
-    protected XSSFDrawing drawing;
-
-    /**
-     * The parent shape, always not-null for shapes in groups
-     */
-    protected XSSFShapeGroup parent;
-
-    /**
-     * anchor that is used by this shape
-     */
-    protected XSSFAnchor anchor;
-
-    /**
-     * Return the drawing that owns this shape
-     *
-     * @return the parent drawing that owns this shape
-     */
-    public XSSFDrawing getDrawing(){
-        return drawing;
-    }
-
-    /**
-     * Gets the parent shape.
-     */
-    public XSSFShapeGroup getParent()
-    {
-        return parent;
-    }
-
-    /**
-     * @return  the anchor that is used by this shape.
-     */
-    public XSSFAnchor getAnchor()
-    {
-        return anchor;
-    }
-
-    /**
-     * Returns xml bean with shape properties.
-     *
-     * @return xml bean with shape properties.
-     */
-    protected abstract CTShapeProperties getShapeProperties();
-
-    /**
-     * Whether this shape is not filled with a color
-     *
-     * @return true if this shape is not filled with a color.
-     */
-    public boolean isNoFill() {
-        return getShapeProperties().isSetNoFill();
-    }
-
-    /**
-     * Sets whether this shape is filled or transparent.
-     *
-     * @param noFill if true then no fill will be applied to the shape element.
-     */
-    public void setNoFill(boolean noFill) {
-        CTShapeProperties props = getShapeProperties();
-        //unset solid and pattern fills if they are set
-        if (props.isSetPattFill()) props.unsetPattFill();
-        if (props.isSetSolidFill()) props.unsetSolidFill();
-
-        props.setNoFill(CTNoFillProperties.Factory.newInstance());
-    }
-
-    /**
-     * Sets the color used to fill this shape using the solid fill pattern.
-     */
-    public void setFillColor(int red, int green, int blue) {
-        CTShapeProperties props = getShapeProperties();
-        CTSolidColorFillProperties fill = props.isSetSolidFill() ? props.getSolidFill() : props.addNewSolidFill();
-        CTSRgbColor rgb = CTSRgbColor.Factory.newInstance();
-        rgb.setVal(new byte[]{(byte)red, (byte)green, (byte)blue});
-        fill.setSrgbClr(rgb);
-    }
-
-    /**
-     * The color applied to the lines of this shape.
-     */
-    public void setLineStyleColor( int red, int green, int blue ) {
-        CTShapeProperties props = getShapeProperties();
-        CTLineProperties ln = props.isSetLn() ? props.getLn() : props.addNewLn();
-        CTSolidColorFillProperties fill = ln.isSetSolidFill() ? ln.getSolidFill() : ln.addNewSolidFill();
-        CTSRgbColor rgb = CTSRgbColor.Factory.newInstance();
-        rgb.setVal(new byte[]{(byte)red, (byte)green, (byte)blue});
-        fill.setSrgbClr(rgb);
-    }
-
-    /**
-     * Specifies the width to be used for the underline stroke.
-     *
-     * @param lineWidth width in points
-     */
-    public void setLineWidth( double lineWidth ) {
-        CTShapeProperties props = getShapeProperties();
-        CTLineProperties ln = props.isSetLn() ? props.getLn() : props.addNewLn();
-        ln.setW((int)(lineWidth*EMU_PER_POINT));
-    }
-
-    /**
-     * Sets the line style.
-     *
-     * @param lineStyle
-     */
-    public void setLineStyle( int lineStyle ) {
-        CTShapeProperties props = getShapeProperties();
-        CTLineProperties ln = props.isSetLn() ? props.getLn() : props.addNewLn();
-        CTPresetLineDashProperties dashStyle = CTPresetLineDashProperties.Factory.newInstance();
-        dashStyle.setVal(STPresetLineDashVal.Enum.forInt(lineStyle+1));
-        ln.setPrstDash(dashStyle);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
deleted file mode 100644
index b625134..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGroupTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTConnector;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGroupShape;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGroupShapeNonVisual;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTPicture;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShape;
-
-/**
- * This object specifies a group shape that represents many shapes grouped together. This shape is to be treated
- * just as if it were a regular shape but instead of being described by a single geometry it is made up of all the
- * shape geometries encompassed within it. Within a group shape each of the shapes that make up the group are
- * specified just as they normally would.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFShapeGroup extends XSSFShape {
-    private static CTGroupShape prototype = null;
-
-    private CTGroupShape ctGroup;
-
-    /**
-     * Construct a new XSSFSimpleShape object.
-     *
-     * @param drawing the XSSFDrawing that owns this shape
-     * @param ctGroup the XML bean that stores this group content
-     */
-    protected XSSFShapeGroup(XSSFDrawing drawing, CTGroupShape ctGroup) {
-        this.drawing = drawing;
-        this.ctGroup = ctGroup;
-    }
-
-    /**
-     * Initialize default structure of a new shape group
-     */
-    protected static CTGroupShape prototype() {
-        if (prototype == null) {
-            CTGroupShape shape = CTGroupShape.Factory.newInstance();
-
-            CTGroupShapeNonVisual nv = shape.addNewNvGrpSpPr();
-            CTNonVisualDrawingProps nvpr = nv.addNewCNvPr();
-            nvpr.setId(0);
-            nvpr.setName("Group 0");
-            nv.addNewCNvGrpSpPr();
-            CTGroupShapeProperties sp = shape.addNewGrpSpPr();
-            CTGroupTransform2D t2d = sp.addNewXfrm();
-            CTPositiveSize2D p1 = t2d.addNewExt();
-            p1.setCx(0);
-            p1.setCy(0);
-            CTPoint2D p2 = t2d.addNewOff();
-            p2.setX(0);
-            p2.setY(0);
-            CTPositiveSize2D p3 = t2d.addNewChExt();
-            p3.setCx(0);
-            p3.setCy(0);
-            CTPoint2D p4 = t2d.addNewChOff();
-            p4.setX(0);
-            p4.setY(0);
-
-            prototype = shape;
-        }
-        return prototype;
-    }
-
-    /**
-     * Constructs a textbox.
-     *
-     * @param anchor the child anchor describes how this shape is attached
-     *               to the group.
-     * @return      the newly created textbox.
-     */
-    public XSSFTextBox createTextbox(XSSFChildAnchor anchor){
-        CTShape ctShape = ctGroup.addNewSp();
-        ctShape.set(XSSFSimpleShape.prototype());
-
-        XSSFTextBox shape = new XSSFTextBox(getDrawing(), ctShape);
-        shape.parent = this;
-        shape.anchor = anchor;
-        shape.getCTShape().getSpPr().setXfrm(anchor.getCTTransform2D());
-        return shape;
-
-    }
-    /**
-     * Creates a simple shape.  This includes such shapes as lines, rectangles,
-     * and ovals.
-     *
-     * @param anchor the child anchor describes how this shape is attached
-     *               to the group.
-     * @return the newly created shape.
-     */
-    public XSSFSimpleShape createSimpleShape(XSSFChildAnchor anchor) {
-        CTShape ctShape = ctGroup.addNewSp();
-        ctShape.set(XSSFSimpleShape.prototype());
-
-        XSSFSimpleShape shape = new XSSFSimpleShape(getDrawing(), ctShape);
-        shape.parent = this;
-        shape.anchor = anchor;
-        shape.getCTShape().getSpPr().setXfrm(anchor.getCTTransform2D());
-        return shape;
-    }
-
-    /**
-     * Creates a simple shape.  This includes such shapes as lines, rectangles,
-     * and ovals.
-     *
-     * @param anchor the child anchor describes how this shape is attached
-     *               to the group.
-     * @return the newly created shape.
-     */
-    public XSSFConnector createConnector(XSSFChildAnchor anchor) {
-        CTConnector ctShape = ctGroup.addNewCxnSp();
-        ctShape.set(XSSFConnector.prototype());
-
-        XSSFConnector shape = new XSSFConnector(getDrawing(), ctShape);
-        shape.parent = this;
-        shape.anchor = anchor;
-        shape.getCTConnector().getSpPr().setXfrm(anchor.getCTTransform2D());
-        return shape;
-    }
-
-    /**
-     * Creates a picture.
-     *
-     * @param anchor       the client anchor describes how this picture is attached to the sheet.
-     * @param pictureIndex the index of the picture in the workbook collection of pictures,
-     *                     {@link XSSFWorkbook#getAllPictures()} .
-     * @return the newly created picture shape.
-     */
-    public XSSFPicture createPicture(XSSFClientAnchor anchor, int pictureIndex) {
-        PackageRelationship rel = getDrawing().addPictureReference(pictureIndex);
-
-        CTPicture ctShape = ctGroup.addNewPic();
-        ctShape.set(XSSFPicture.prototype());
-
-        XSSFPicture shape = new XSSFPicture(getDrawing(), ctShape);
-        shape.parent = this;
-        shape.anchor = anchor;
-        shape.setPictureReference(rel);
-        return shape;
-    }
-
-    @Internal
-    public CTGroupShape getCTGroupShape() {
-        return ctGroup;
-    }
-
-    /**
-     * Sets the coordinate space of this group.  All children are constrained
-     * to these coordinates.
-     */
-    public void setCoordinates(int x1, int y1, int x2, int y2) {
-        CTGroupTransform2D t2d = ctGroup.getGrpSpPr().getXfrm();
-        CTPoint2D off = t2d.getOff();
-        off.setX(x1);
-        off.setY(y1);
-        CTPositiveSize2D ext = t2d.getExt();
-        ext.setCx(x2);
-        ext.setCy(y2);
-
-        CTPoint2D chOff = t2d.getChOff();
-        chOff.setX(x1);
-        chOff.setY(y1);
-        CTPositiveSize2D chExt = t2d.getChExt();
-        chExt.setCx(x2);
-        chExt.setCy(y2);
-    }
-
-    protected CTShapeProperties getShapeProperties() {
-        throw new IllegalStateException("Not supported for shape group");
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
deleted file mode 100644
index 563c55f..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ /dev/null
@@ -1,4382 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-import static org.apache.poi.xssf.usermodel.helpers.XSSFPasswordHelper.setPassword;
-import static org.apache.poi.xssf.usermodel.helpers.XSSFPasswordHelper.validatePassword;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellCopyPolicy;
-import org.apache.poi.ss.usermodel.CellRange;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.Footer;
-import org.apache.poi.ss.usermodel.Header;
-import org.apache.poi.ss.usermodel.IgnoredErrorType;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Table;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.PaneInformation;
-import org.apache.poi.ss.util.SSCellRange;
-import org.apache.poi.ss.util.SheetUtil;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.usermodel.XSSFPivotTable.PivotTableReferenceConfigurator;
-import org.apache.poi.xssf.usermodel.helpers.ColumnHelper;
-import org.apache.poi.xssf.usermodel.helpers.XSSFIgnoredErrorHelper;
-import org.apache.poi.xssf.usermodel.helpers.XSSFRowShifter;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.*;
-
-/**
- * High level representation of a SpreadsheetML worksheet.
- *
- * <p>
- * Sheets are the central structures within a workbook, and are where a user does most of his spreadsheet work.
- * The most common type of sheet is the worksheet, which is represented as a grid of cells. Worksheet cells can
- * contain text, numbers, dates, and formulas. Cells can also be formatted.
- * </p>
- */
-public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
-    private static final POILogger logger = POILogFactory.getLogger(XSSFSheet.class);
-
-    private static final double DEFAULT_ROW_HEIGHT = 15.0;
-    private static final double DEFAULT_MARGIN_HEADER = 0.3;
-    private static final double DEFAULT_MARGIN_FOOTER = 0.3;
-    private static final double DEFAULT_MARGIN_TOP = 0.75;
-    private static final double DEFAULT_MARGIN_BOTTOM = 0.75;
-    private static final double DEFAULT_MARGIN_LEFT = 0.7;
-    private static final double DEFAULT_MARGIN_RIGHT = 0.7;
-    public static final int TWIPS_PER_POINT = 20;
-
-    //TODO make the two variable below private!
-    protected CTSheet sheet;
-    protected CTWorksheet worksheet;
-
-    private final SortedMap<Integer, XSSFRow> _rows = new TreeMap<Integer, XSSFRow>();
-    private List<XSSFHyperlink> hyperlinks;
-    private ColumnHelper columnHelper;
-    private CommentsTable sheetComments;
-    /**
-     * cache of master shared formulas in this sheet.
-     * Master shared formula is the first formula in a group of shared formulas is saved in the f element.
-     */
-    private Map<Integer, CTCellFormula> sharedFormulas;
-    private SortedMap<String,XSSFTable> tables;
-    private List<CellRangeAddress> arrayFormulas;
-    private XSSFDataValidationHelper dataValidationHelper;
-
-    /**
-     * Creates new XSSFSheet   - called by XSSFWorkbook to create a sheet from scratch.
-     *
-     * @see org.apache.poi.xssf.usermodel.XSSFWorkbook#createSheet()
-     */
-    protected XSSFSheet() {
-        super();
-        dataValidationHelper = new XSSFDataValidationHelper(this);
-        onDocumentCreate();
-    }
-
-    /**
-     * Creates an XSSFSheet representing the given package part and relationship.
-     * Should only be called by XSSFWorkbook when reading in an existing file.
-     *
-     * @param part - The package part that holds xml data representing this sheet.
-     * 
-     * @since POI 3.14-Beta1
-     */
-    protected XSSFSheet(PackagePart part) {
-        super(part);
-        dataValidationHelper = new XSSFDataValidationHelper(this);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFSheet(PackagePart part, PackageRelationship rel) {
-        this(part);
-    }
-    
-    /**
-     * Returns the parent XSSFWorkbook
-     *
-     * @return the parent XSSFWorkbook
-     */
-    @Override
-    public XSSFWorkbook getWorkbook() {
-        return (XSSFWorkbook)getParent();
-    }
-
-    /**
-     * Initialize worksheet data when reading in an exisiting file.
-     */
-    @Override
-    protected void onDocumentRead() {
-        try {
-            read(getPackagePart().getInputStream());
-        } catch (IOException e){
-            throw new POIXMLException(e);
-        }
-    }
-
-    protected void read(InputStream is) throws IOException {
-        try {
-            worksheet = WorksheetDocument.Factory.parse(is, DEFAULT_XML_OPTIONS).getWorksheet();
-        } catch (XmlException e){
-            throw new POIXMLException(e);
-        }
-
-        initRows(worksheet);
-        columnHelper = new ColumnHelper(worksheet);
-        // Look for bits we're interested in
-        for(RelationPart rp : getRelationParts()){
-            POIXMLDocumentPart p = rp.getDocumentPart();
-            if(p instanceof CommentsTable) {
-               sheetComments = (CommentsTable)p;
-            }
-            if(p instanceof XSSFTable) {
-               tables.put( rp.getRelationship().getId(), (XSSFTable)p );
-            }
-            if(p instanceof XSSFPivotTable) {
-                getWorkbook().getPivotTables().add((XSSFPivotTable) p);
-            }
-        }
-
-        // Process external hyperlinks for the sheet, if there are any
-        initHyperlinks();
-    }
-
-    /**
-     * Initialize worksheet data when creating a new sheet.
-     */
-    @Override
-    protected void onDocumentCreate(){
-        worksheet = newSheet();
-        initRows(worksheet);
-        columnHelper = new ColumnHelper(worksheet);
-        hyperlinks = new ArrayList<XSSFHyperlink>();
-    }
-
-    private void initRows(CTWorksheet worksheetParam) {
-        _rows.clear();
-        tables = new TreeMap<String, XSSFTable>();
-        sharedFormulas = new HashMap<Integer, CTCellFormula>();
-        arrayFormulas = new ArrayList<CellRangeAddress>();
-        for (CTRow row : worksheetParam.getSheetData().getRowArray()) {
-            XSSFRow r = new XSSFRow(row, this);
-            // Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-            final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
-            _rows.put(rownumI, r);
-        }
-    }
-
-    /**
-     * Read hyperlink relations, link them with CTHyperlink beans in this worksheet
-     * and initialize the internal array of XSSFHyperlink objects
-     */
-    private void initHyperlinks() {
-        hyperlinks = new ArrayList<XSSFHyperlink>();
-
-        if(!worksheet.isSetHyperlinks()) return;
-
-        try {
-            PackageRelationshipCollection hyperRels =
-                getPackagePart().getRelationshipsByType(XSSFRelation.SHEET_HYPERLINKS.getRelation());
-
-            // Turn each one into a XSSFHyperlink
-            for(CTHyperlink hyperlink : worksheet.getHyperlinks().getHyperlinkArray()) {
-                PackageRelationship hyperRel = null;
-                if(hyperlink.getId() != null) {
-                    hyperRel = hyperRels.getRelationshipByID(hyperlink.getId());
-                }
-
-                hyperlinks.add( new XSSFHyperlink(hyperlink, hyperRel) );
-            }
-        } catch (InvalidFormatException e){
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Create a new CTWorksheet instance with all values set to defaults
-     *
-     * @return a new instance
-     */
-    private static CTWorksheet newSheet(){
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTSheetFormatPr ctFormat = worksheet.addNewSheetFormatPr();
-        ctFormat.setDefaultRowHeight(DEFAULT_ROW_HEIGHT);
-
-        CTSheetView ctView = worksheet.addNewSheetViews().addNewSheetView();
-        ctView.setWorkbookViewId(0);
-
-        worksheet.addNewDimension().setRef("A1");
-
-        worksheet.addNewSheetData();
-
-        CTPageMargins ctMargins = worksheet.addNewPageMargins();
-        ctMargins.setBottom(DEFAULT_MARGIN_BOTTOM);
-        ctMargins.setFooter(DEFAULT_MARGIN_FOOTER);
-        ctMargins.setHeader(DEFAULT_MARGIN_HEADER);
-        ctMargins.setLeft(DEFAULT_MARGIN_LEFT);
-        ctMargins.setRight(DEFAULT_MARGIN_RIGHT);
-        ctMargins.setTop(DEFAULT_MARGIN_TOP);
-
-        return worksheet;
-    }
-
-    /**
-     * Provide access to the CTWorksheet bean holding this sheet's data
-     *
-     * @return the CTWorksheet bean holding this sheet's data
-     */
-    @Internal
-    public CTWorksheet getCTWorksheet() {
-        return this.worksheet;
-    }
-
-    public ColumnHelper getColumnHelper() {
-        return columnHelper;
-    }
-
-    /**
-     * Returns the name of this sheet
-     *
-     * @return the name of this sheet
-     */
-    @Override
-    public String getSheetName() {
-        return sheet.getName();
-    }
-
-    /**
-     * Adds a merged region of cells on a sheet.
-     *
-     * @param region to merge
-     * @return index of this region
-     * @throws IllegalArgumentException if region contains fewer than 2 cells
-     * @throws IllegalStateException if region intersects with a multi-cell array formula
-     * @throws IllegalStateException if region intersects with an existing region on this sheet
-     */
-    @Override
-    public int addMergedRegion(CellRangeAddress region) {
-        return addMergedRegion(region, true);
-    }
-
-    /**
-     * Adds a merged region of cells (hence those cells form one).
-     * Skips validation. It is possible to create overlapping merged regions
-     * or create a merged region that intersects a multi-cell array formula
-     * with this formula, which may result in a corrupt workbook.
-     *
-     * To check for merged regions overlapping array formulas or other merged regions
-     * after addMergedRegionUnsafe has been called, call {@link #validateMergedRegions()}, which runs in O(n^2) time.
-     *
-     * @param region to merge
-     * @return index of this region
-     * @throws IllegalArgumentException if region contains fewer than 2 cells
-     */
-    @Override
-    public int addMergedRegionUnsafe(CellRangeAddress region) {
-        return addMergedRegion(region, false);
-    }
-
-    /**
-     * Adds a merged region of cells (hence those cells form one).
-     * If validate is true, check to make sure adding the merged region to the sheet doesn't create a corrupt workbook
-     * If validate is false, skips the expensive merged region checks, but may produce a corrupt workbook.
-     *
-     * @param region to merge
-     * @param validate whether to validate merged region
-     * @return index of this region
-     * @throws IllegalArgumentException if region contains fewer than 2 cells (this check is inexpensive and is performed regardless of <tt>validate</tt>)
-     * @throws IllegalStateException if region intersects with a multi-cell array formula
-     * @throws IllegalStateException if region intersects with an existing region on this sheet
-     */
-    private int addMergedRegion(CellRangeAddress region, boolean validate) {
-        if (region.getNumberOfCells() < 2) {
-            throw new IllegalArgumentException("Merged region " + region.formatAsString() + " must contain 2 or more cells");
-        }
-        region.validate(SpreadsheetVersion.EXCEL2007);
-        
-        if (validate) {
-            // throw IllegalStateException if the argument CellRangeAddress intersects with
-            // a multi-cell array formula defined in this sheet
-            validateArrayFormulas(region);
-
-            // Throw IllegalStateException if the argument CellRangeAddress intersects with
-            // a merged region already in this sheet 
-            validateMergedRegions(region);
-        }
-
-        CTMergeCells ctMergeCells = worksheet.isSetMergeCells() ? worksheet.getMergeCells() : worksheet.addNewMergeCells();
-        CTMergeCell ctMergeCell = ctMergeCells.addNewMergeCell();
-        ctMergeCell.setRef(region.formatAsString());
-        return ctMergeCells.sizeOfMergeCellArray();
-    }
-
-    /**
-     * Verify that the candidate region does not intersect with an existing multi-cell array formula in this sheet
-     *
-     * @param region a region that is validated.
-     * @throws IllegalStateException if candidate region intersects an existing array formula in this sheet
-     */
-    private void validateArrayFormulas(CellRangeAddress region) {
-        // FIXME: this may be faster if it looped over array formulas directly rather than looping over each cell in
-        // the region and searching if that cell belongs to an array formula
-        int firstRow = region.getFirstRow();
-        int firstColumn = region.getFirstColumn();
-        int lastRow = region.getLastRow();
-        int lastColumn = region.getLastColumn();
-        // for each cell in sheet, if cell belongs to an array formula, check if merged region intersects array formula cells
-        for (int rowIn = firstRow; rowIn <= lastRow; rowIn++) {
-            XSSFRow row = getRow(rowIn);
-            if (row == null) continue;
-            
-            for (int colIn = firstColumn; colIn <= lastColumn; colIn++) {
-                XSSFCell cell = row.getCell(colIn);
-                if (cell == null) continue;
-
-                if (cell.isPartOfArrayFormulaGroup()) {
-                    CellRangeAddress arrayRange = cell.getArrayFormulaRange();
-                    if (arrayRange.getNumberOfCells() > 1 && region.intersects(arrayRange)) {
-                        String msg = "The range " + region.formatAsString() + " intersects with a multi-cell array formula. " +
-                                "You cannot merge cells of an array.";
-                        throw new IllegalStateException(msg);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Verify that none of the merged regions intersect a multi-cell array formula in this sheet
-     *
-     * @throws IllegalStateException if candidate region intersects an existing array formula in this sheet
-     */
-    private void checkForMergedRegionsIntersectingArrayFormulas() {
-        for (CellRangeAddress region : getMergedRegions()) {
-            validateArrayFormulas(region);
-        }
-    }
-
-    /**
-     * Verify that candidate region does not intersect with an existing merged region in this sheet
-     *
-     * @param candidateRegion
-     * @throws IllegalStateException if candidate region intersects an existing merged region in this sheet (or candidateRegion is already merged in this sheet)
-     */
-    private void validateMergedRegions(CellRangeAddress candidateRegion) {
-        for (final CellRangeAddress existingRegion : getMergedRegions()) {
-            if (existingRegion.intersects(candidateRegion)) {
-                throw new IllegalStateException("Cannot add merged region " + candidateRegion.formatAsString() +
-                        " to sheet because it overlaps with an existing merged region (" + existingRegion.formatAsString() + ").");
-            }
-        }
-    }
-
-    /**
-     * Verify that no merged regions intersect another merged region in this sheet.
-     *
-     * @throws IllegalStateException if at least one region intersects with another merged region in this sheet
-     */
-    private void checkForIntersectingMergedRegions() {
-        final List<CellRangeAddress> regions = getMergedRegions();
-        final int size = regions.size();
-        for (int i=0; i < size; i++) {
-            final CellRangeAddress region = regions.get(i);
-            for (final CellRangeAddress other : regions.subList(i+1, regions.size())) {
-                if (region.intersects(other)) {
-                    String msg = "The range " + region.formatAsString() +
-                                " intersects with another merged region " +
-                                other.formatAsString() + " in this sheet";
-                    throw new IllegalStateException(msg);
-                }
-            }
-        }
-    }
-
-    /**
-     * Verify that merged regions do not intersect multi-cell array formulas and
-     * no merged regions intersect another merged region in this sheet.
-     *
-     * @throws IllegalStateException if region intersects with a multi-cell array formula
-     * @throws IllegalStateException if at least one region intersects with another merged region in this sheet
-     */
-    @Override
-    public void validateMergedRegions() {
-        checkForMergedRegionsIntersectingArrayFormulas();
-        checkForIntersectingMergedRegions();
-    }
-
-    /**
-     * Adjusts the column width to fit the contents.
-     *
-     * This process can be relatively slow on large sheets, so this should
-     *  normally only be called once per column, at the end of your
-     *  processing.
-     *
-     * @param column the column index
-     */
-    @Override
-    public void autoSizeColumn(int column) {
-        autoSizeColumn(column, false);
-    }
-
-    /**
-     * Adjusts the column width to fit the contents.
-     * <p>
-     * This process can be relatively slow on large sheets, so this should
-     *  normally only be called once per column, at the end of your
-     *  processing.
-     * </p>
-     * You can specify whether the content of merged cells should be considered or ignored.
-     *  Default is to ignore merged cells.
-     *
-     * @param column the column index
-     * @param useMergedCells whether to use the contents of merged cells when calculating the width of the column
-     */
-    @Override
-    public void autoSizeColumn(int column, boolean useMergedCells) {
-        double width = SheetUtil.getColumnWidth(this, column, useMergedCells);
-
-        if (width != -1) {
-            width *= 256;
-            int maxColumnWidth = 255*256; // The maximum column width for an individual cell is 255 characters
-            if (width > maxColumnWidth) {
-                width = maxColumnWidth;
-            }
-            setColumnWidth(column, (int)(width));
-            columnHelper.setColBestFit(column, true);
-        }
-    }
-    
-    /**
-     * Return the sheet's existing drawing, or null if there isn't yet one.
-     * 
-     * Use {@link #createDrawingPatriarch()} to get or create
-     *
-     * @return a SpreadsheetML drawing
-     */
-    @Override
-    public XSSFDrawing getDrawingPatriarch() {
-        CTDrawing ctDrawing = getCTDrawing();
-        if (ctDrawing != null) {
-            // Search the referenced drawing in the list of the sheet's relations
-            for (RelationPart rp : getRelationParts()){
-                POIXMLDocumentPart p = rp.getDocumentPart();
-                if (p instanceof XSSFDrawing) {
-                    XSSFDrawing dr = (XSSFDrawing)p;
-                    String drId = rp.getRelationship().getId();
-                    if (drId.equals(ctDrawing.getId())){
-                        return dr;
-                    }
-                    break;
-                }
-            }
-            logger.log(POILogger.ERROR, "Can't find drawing with id=" + ctDrawing.getId() + " in the list of the sheet's relationships");
-        }
-        return null;
-    }
-
-    /**
-     * Create a new SpreadsheetML drawing. If this sheet already contains a drawing - return that.
-     *
-     * @return a SpreadsheetML drawing
-     */
-    @Override
-    public XSSFDrawing createDrawingPatriarch() {
-        CTDrawing ctDrawing = getCTDrawing();
-        if (ctDrawing != null) {
-            return getDrawingPatriarch();
-        }
-        
-        // Default drawingNumber = #drawings.size() + 1
-        int drawingNumber = getPackagePart().getPackage().getPartsByContentType(XSSFRelation.DRAWINGS.getContentType()).size() + 1;
-        drawingNumber = getNextPartNumber(XSSFRelation.DRAWINGS, drawingNumber);
-        RelationPart rp = createRelationship(XSSFRelation.DRAWINGS, XSSFFactory.getInstance(), drawingNumber, false);
-        XSSFDrawing drawing = rp.getDocumentPart();
-        String relId = rp.getRelationship().getId();
-
-        //add CT_Drawing element which indicates that this sheet contains drawing components built on the drawingML platform.
-        //The relationship Id references the part containing the drawingML definitions.
-        ctDrawing = worksheet.addNewDrawing();
-        ctDrawing.setId(relId);
-        
-        // Return the newly created drawing
-        return drawing;
-    }
-
-    /**
-     * Get VML drawing for this sheet (aka 'legacy' drawig)
-     *
-     * @param autoCreate if true, then a new VML drawing part is created
-     *
-     * @return the VML drawing of <code>null</code> if the drawing was not found and autoCreate=false
-     */
-    protected XSSFVMLDrawing getVMLDrawing(boolean autoCreate) {
-        XSSFVMLDrawing drawing = null;
-        CTLegacyDrawing ctDrawing = getCTLegacyDrawing();
-        if(ctDrawing == null) {
-            if(autoCreate) {
-                //drawingNumber = #drawings.size() + 1
-                int drawingNumber = getPackagePart().getPackage().getPartsByContentType(XSSFRelation.VML_DRAWINGS.getContentType()).size() + 1;
-                RelationPart rp = createRelationship(XSSFRelation.VML_DRAWINGS, XSSFFactory.getInstance(), drawingNumber, false);
-                drawing = rp.getDocumentPart();
-                String relId = rp.getRelationship().getId();
-
-                //add CTLegacyDrawing element which indicates that this sheet contains drawing components built on the drawingML platform.
-                //The relationship Id references the part containing the drawing definitions.
-                ctDrawing = worksheet.addNewLegacyDrawing();
-                ctDrawing.setId(relId);
-            }
-        } else {
-            //search the referenced drawing in the list of the sheet's relations
-            final String id = ctDrawing.getId();
-            for (RelationPart rp : getRelationParts()){
-                POIXMLDocumentPart p = rp.getDocumentPart();
-                if(p instanceof XSSFVMLDrawing) {
-                    XSSFVMLDrawing dr = (XSSFVMLDrawing)p;
-                    String drId = rp.getRelationship().getId();
-                    if (drId.equals(id)) {
-                        drawing = dr;
-                        break;
-                    }
-                    // do not break here since drawing has not been found yet (see bug 52425)
-                }
-            }
-            if(drawing == null){
-                logger.log(POILogger.ERROR, "Can't find VML drawing with id=" + id + " in the list of the sheet's relationships");
-            }
-        }
-        return drawing;
-    }
-
-    protected CTDrawing getCTDrawing() {
-       return worksheet.getDrawing();
-    }
-    protected CTLegacyDrawing getCTLegacyDrawing() {
-       return worksheet.getLegacyDrawing();
-    }
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.
-     * @param colSplit      Horizontal position of split.
-     * @param rowSplit      Vertical position of split.
-     */
-    @Override
-    public void createFreezePane(int colSplit, int rowSplit) {
-        createFreezePane( colSplit, rowSplit, colSplit, rowSplit );
-    }
-
-    /**
-     * Creates a split (freezepane). Any existing freezepane or split pane is overwritten.
-     *
-     * <p>
-     *     If both colSplit and rowSplit are zero then the existing freeze pane is removed
-     * </p>
-     *
-     * @param colSplit      Horizontal position of split.
-     * @param rowSplit      Vertical position of split.
-     * @param leftmostColumn   Left column visible in right pane.
-     * @param topRow        Top row visible in bottom pane
-     */
-    @Override
-    public void createFreezePane(int colSplit, int rowSplit, int leftmostColumn, int topRow) {
-        CTSheetView ctView = getDefaultSheetView();
-
-        // If both colSplit and rowSplit are zero then the existing freeze pane is removed
-        if(colSplit == 0 && rowSplit == 0){
-            if(ctView.isSetPane()) ctView.unsetPane();
-            ctView.setSelectionArray(null);
-            return;
-        }
-
-        if (!ctView.isSetPane()) {
-            ctView.addNewPane();
-        }
-        CTPane pane = ctView.getPane();
-
-        if (colSplit > 0) {
-           pane.setXSplit(colSplit);
-        } else {
-           if(pane.isSetXSplit()) pane.unsetXSplit();
-        }
-        if (rowSplit > 0) {
-           pane.setYSplit(rowSplit);
-        } else {
-           if(pane.isSetYSplit()) pane.unsetYSplit();
-        }
-
-        pane.setState(STPaneState.FROZEN);
-        if (rowSplit == 0) {
-            pane.setTopLeftCell(new CellReference(0, leftmostColumn).formatAsString());
-            pane.setActivePane(STPane.TOP_RIGHT);
-        } else if (colSplit == 0) {
-            pane.setTopLeftCell(new CellReference(topRow, 0).formatAsString());
-            pane.setActivePane(STPane.BOTTOM_LEFT);
-        } else {
-            pane.setTopLeftCell(new CellReference(topRow, leftmostColumn).formatAsString());
-            pane.setActivePane(STPane.BOTTOM_RIGHT);
-        }
-
-        ctView.setSelectionArray(null);
-        CTSelection sel = ctView.addNewSelection();
-        sel.setPane(pane.getActivePane());
-    }
-
-    /**
-     * Create a new row within the sheet and return the high level representation
-     *
-     * Note: If a row already exists at this position, it is removed/overwritten and
-     *      any existing cell is removed!
-     *
-     * @param rownum  row number
-     * @return High level {@link XSSFRow} object representing a row in the sheet
-     * @see #removeRow(org.apache.poi.ss.usermodel.Row)
-     */
-    @Override
-    public XSSFRow createRow(int rownum) {
-        // Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-        final Integer rownumI = new Integer(rownum); // NOSONAR
-        CTRow ctRow;
-        XSSFRow prev = _rows.get(rownumI);
-        if(prev != null){
-            // the Cells in an existing row are invalidated on-purpose, in order to clean up correctly, we
-            // need to call the remove, so things like ArrayFormulas and CalculationChain updates are done 
-            // correctly. 
-            // We remove the cell this way as the internal cell-list is changed by the remove call and 
-            // thus would cause ConcurrentModificationException otherwise
-            while(prev.getFirstCellNum() != -1) {
-                prev.removeCell(prev.getCell(prev.getFirstCellNum()));
-            }
-            
-            ctRow = prev.getCTRow();
-            ctRow.set(CTRow.Factory.newInstance());
-        } else {
-            if(_rows.isEmpty() || rownum > _rows.lastKey()) {
-                // we can append the new row at the end
-                ctRow = worksheet.getSheetData().addNewRow();
-            } else {
-                // get number of rows where row index < rownum
-                // --> this tells us where our row should go
-                int idx = _rows.headMap(rownumI).size();
-                ctRow = worksheet.getSheetData().insertNewRow(idx);
-            }
-        }
-        XSSFRow r = new XSSFRow(ctRow, this);
-        r.setRowNum(rownum);
-        _rows.put(rownumI, r);
-        return r;
-    }
-
-    /**
-     * Creates a split pane. Any existing freezepane or split pane is overwritten.
-     * @param xSplitPos      Horizontal position of split (in 1/20th of a point).
-     * @param ySplitPos      Vertical position of split (in 1/20th of a point).
-     * @param topRow        Top row visible in bottom pane
-     * @param leftmostColumn   Left column visible in right pane.
-     * @param activePane    Active pane.  One of: PANE_LOWER_RIGHT,
-     *                      PANE_UPPER_RIGHT, PANE_LOWER_LEFT, PANE_UPPER_LEFT
-     * @see org.apache.poi.ss.usermodel.Sheet#PANE_LOWER_LEFT
-     * @see org.apache.poi.ss.usermodel.Sheet#PANE_LOWER_RIGHT
-     * @see org.apache.poi.ss.usermodel.Sheet#PANE_UPPER_LEFT
-     * @see org.apache.poi.ss.usermodel.Sheet#PANE_UPPER_RIGHT
-     */
-    @Override
-    public void createSplitPane(int xSplitPos, int ySplitPos, int leftmostColumn, int topRow, int activePane) {
-        createFreezePane(xSplitPos, ySplitPos, leftmostColumn, topRow);
-        getPane().setState(STPaneState.SPLIT);
-        getPane().setActivePane(STPane.Enum.forInt(activePane));
-    }
-
-    /**
-     * Return cell comment at row, column, if one exists. Otherwise returns null.
-     * @param row the row where the comment is located
-     * @param column the column where the comment is located
-     * @return the cell comment, if one exists. Otherwise return null.
-     * @deprecated as of 2015-11-23 (circa POI 3.14beta1). Use {@link #getCellComment(CellAddress)} instead.
-     */
-    @Override
-    public XSSFComment getCellComment(int row, int column) {
-        return getCellComment(new CellAddress(row, column));
-    }
-    
-    /**
-     * Return cell comment at row, column, if one exists. Otherwise returns null.
-     *
-     * @param address the location of the cell comment
-     * @return the cell comment, if one exists. Otherwise return null.
-     */
-    @Override
-    public XSSFComment getCellComment(CellAddress address) {
-        if (sheetComments == null) {
-            return null;
-        }
-
-        final int row = address.getRow();
-        final int column = address.getColumn();
-
-        CellAddress ref = new CellAddress(row, column);
-        CTComment ctComment = sheetComments.getCTComment(ref);
-        if(ctComment == null) return null;
-
-        XSSFVMLDrawing vml = getVMLDrawing(false);
-        return new XSSFComment(sheetComments, ctComment,
-                vml == null ? null : vml.findCommentShape(row, column));
-    }
-
-    /**
-     * Returns all cell comments on this sheet.
-     * @return A map of each Comment in the sheet, keyed on the cell address where
-     * the comment is located.
-     */
-    @Override
-    public Map<CellAddress, XSSFComment> getCellComments() {
-        if (sheetComments == null) {
-            return Collections.emptyMap();
-        }
-        return sheetComments.getCellComments();
-    }
-
-    /**
-     * Get a Hyperlink in this sheet anchored at row, column
-     *
-     * @param row
-     * @param column
-     * @return hyperlink if there is a hyperlink anchored at row, column; otherwise returns null
-     */
-    @Override
-    public XSSFHyperlink getHyperlink(int row, int column) {
-        return getHyperlink(new CellAddress(row, column));
-    }
-    
-    /**
-     * Get a Hyperlink in this sheet located in a cell specified by {code addr}
-     *
-     * @param addr The address of the cell containing the hyperlink
-     * @return hyperlink if there is a hyperlink anchored at {@code addr}; otherwise returns {@code null}
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public XSSFHyperlink getHyperlink(CellAddress addr) {
-        String ref = addr.formatAsString();
-        for(XSSFHyperlink hyperlink : hyperlinks) {
-            if(hyperlink.getCellRef().equals(ref)) {
-                return hyperlink;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Get a list of Hyperlinks in this sheet
-     *
-     * @return Hyperlinks for the sheet
-     */
-    @Override
-    public List<XSSFHyperlink> getHyperlinkList() {
-        return Collections.unmodifiableList(hyperlinks);
-    }
-
-    private int[] getBreaks(CTPageBreak ctPageBreak) {
-        CTBreak[] brkArray = ctPageBreak.getBrkArray();
-        int[] breaks = new int[brkArray.length];
-        for (int i = 0 ; i < brkArray.length ; i++) {
-            breaks[i] = (int) brkArray[i].getId() - 1;
-        }
-        return breaks;
-    }
-
-    private void removeBreak(int index, CTPageBreak ctPageBreak) {
-        int index1 = index + 1;
-        CTBreak[] brkArray = ctPageBreak.getBrkArray();
-        for (int i = 0 ; i < brkArray.length ; i++) {
-            if (brkArray[i].getId() == index1) {
-                ctPageBreak.removeBrk(i);
-                // TODO: check if we can break here, i.e. if a page can have more than 1 break on the same id
-            }
-        }
-    }
-
-    /**
-     * Vertical page break information used for print layout view, page layout view, drawing print breaks
-     * in normal view, and for printing the worksheet.
-     *
-     * @return column indexes of all the vertical page breaks, never <code>null</code>
-     */
-    @Override
-    public int[] getColumnBreaks() {
-        return worksheet.isSetColBreaks() ? getBreaks(worksheet.getColBreaks()) : new int[0];
-    }
-
-    /**
-     * Get the actual column width (in units of 1/256th of a character width )
-     *
-     * <p>
-     * Note, the returned  value is always gerater that {@link #getDefaultColumnWidth()} because the latter does not include margins.
-     * Actual column width measured as the number of characters of the maximum digit width of the
-     * numbers 0, 1, 2, ..., 9 as rendered in the normal style's font. There are 4 pixels of margin
-     * padding (two on each side), plus 1 pixel padding for the gridlines.
-     * </p>
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @return width - the width in units of 1/256th of a character width
-     */
-    @Override
-    public int getColumnWidth(int columnIndex) {
-        CTCol col = columnHelper.getColumn(columnIndex, false);
-        double width = col == null || !col.isSetWidth() ? getDefaultColumnWidth() : col.getWidth();
-        return (int)(width*256);
-    }
-
-    /**
-     * Get the actual column width in pixels
-     * 
-     * <p>
-     * Please note, that this method works correctly only for workbooks
-     * with the default font size (Calibri 11pt for .xlsx).
-     * </p>
-     */
-    @Override
-    public float getColumnWidthInPixels(int columnIndex) {
-        float widthIn256 = getColumnWidth(columnIndex);
-        return (float)(widthIn256/256.0*XSSFWorkbook.DEFAULT_CHARACTER_WIDTH);
-    }
-    
-    /**
-     * Get the default column width for the sheet (if the columns do not define their own width) in
-     * characters.
-     * <p>
-     * Note, this value is different from {@link #getColumnWidth(int)}. The latter is always greater and includes
-     * 4 pixels of margin padding (two on each side), plus 1 pixel padding for the gridlines.
-     * </p>
-     * @return column width, default value is 8
-     */
-    @Override
-    public int getDefaultColumnWidth() {
-        CTSheetFormatPr pr = worksheet.getSheetFormatPr();
-        return pr == null ? 8 : (int)pr.getBaseColWidth();
-    }
-
-    /**
-     * Get the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of a point)
-     *
-     * @return  default row height
-     */
-    @Override
-    public short getDefaultRowHeight() {
-        return (short)(getDefaultRowHeightInPoints() * TWIPS_PER_POINT);
-    }
-
-
-    /**
-     * Get the default row height for the sheet measued in point size (if the rows do not define their own height).
-     *
-     * @return  default row height in points
-     */
-    @Override
-    public float getDefaultRowHeightInPoints() {
-        CTSheetFormatPr pr = worksheet.getSheetFormatPr();
-        return (float)(pr == null ? 0 : pr.getDefaultRowHeight());
-    }
-
-    private CTSheetFormatPr getSheetTypeSheetFormatPr() {
-        return worksheet.isSetSheetFormatPr() ?
-               worksheet.getSheetFormatPr() :
-               worksheet.addNewSheetFormatPr();
-    }
-
-    /**
-     * Returns the CellStyle that applies to the given
-     *  (0 based) column, or null if no style has been
-     *  set for that column
-     */
-    @Override
-    public CellStyle getColumnStyle(int column) {
-        int idx = columnHelper.getColDefaultStyle(column);
-        return getWorkbook().getCellStyleAt((short)(idx == -1 ? 0 : idx));
-    }
-
-    /**
-     * Sets whether the worksheet is displayed from right to left instead of from left to right.
-     *
-     * @param value true for right to left, false otherwise.
-     */
-    @Override
-    public void setRightToLeft(boolean value) {
-       CTSheetView view = getDefaultSheetView();
-       view.setRightToLeft(value);
-    }
-
-    /**
-     * Whether the text is displayed in right-to-left mode in the window
-     *
-     * @return whether the text is displayed in right-to-left mode in the window
-     */
-    @Override
-    public boolean isRightToLeft() {
-       CTSheetView view = getDefaultSheetView();
-       return view != null && view.getRightToLeft();
-    }
-
-    /**
-     * Get whether to display the guts or not,
-     * default value is true
-     *
-     * @return boolean - guts or no guts
-     */
-    @Override
-    public boolean getDisplayGuts() {
-        CTSheetPr sheetPr = getSheetTypeSheetPr();
-        CTOutlinePr outlinePr = sheetPr.getOutlinePr() == null ? CTOutlinePr.Factory.newInstance() : sheetPr.getOutlinePr();
-        return outlinePr.getShowOutlineSymbols();
-    }
-
-    /**
-     * Set whether to display the guts or not
-     *
-     * @param value - guts or no guts
-     */
-    @Override
-    public void setDisplayGuts(boolean value) {
-        CTSheetPr sheetPr = getSheetTypeSheetPr();
-        CTOutlinePr outlinePr = sheetPr.getOutlinePr() == null ? sheetPr.addNewOutlinePr() : sheetPr.getOutlinePr();
-        outlinePr.setShowOutlineSymbols(value);
-    }
-
-    /**
-     * Gets the flag indicating whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     *
-     * @return whether all zero values on the worksheet are displayed
-     */
-    @Override
-    public boolean isDisplayZeros(){
-        CTSheetView view = getDefaultSheetView();
-        return view == null || view.getShowZeros();
-    }
-
-    /**
-     * Set whether the window should show 0 (zero) in cells containing zero value.
-     * When false, cells with zero value appear blank instead of showing the number zero.
-     *
-     * @param value whether to display or hide all zero values on the worksheet
-     */
-    @Override
-    public void setDisplayZeros(boolean value){
-        CTSheetView view = getSheetTypeSheetView();
-        view.setShowZeros(value);
-    }
-
-    /**
-     * Gets the first row on the sheet
-     *
-     * @return the number of the first logical row on the sheet, zero based
-     */
-    @Override
-    public int getFirstRowNum() {
-        return _rows.isEmpty() ? 0 : _rows.firstKey();
-    }
-
-    /**
-     * Flag indicating whether the Fit to Page print option is enabled.
-     *
-     * @return <code>true</code>
-     */
-    @Override
-    public boolean getFitToPage() {
-        CTSheetPr sheetPr = getSheetTypeSheetPr();
-        CTPageSetUpPr psSetup = (sheetPr == null || !sheetPr.isSetPageSetUpPr()) ?
-                CTPageSetUpPr.Factory.newInstance() : sheetPr.getPageSetUpPr();
-        return psSetup.getFitToPage();
-    }
-
-    private CTSheetPr getSheetTypeSheetPr() {
-        if (worksheet.getSheetPr() == null) {
-            worksheet.setSheetPr(CTSheetPr.Factory.newInstance());
-        }
-        return worksheet.getSheetPr();
-    }
-
-    private CTHeaderFooter getSheetTypeHeaderFooter() {
-        if (worksheet.getHeaderFooter() == null) {
-            worksheet.setHeaderFooter(CTHeaderFooter.Factory.newInstance());
-        }
-        return worksheet.getHeaderFooter();
-    }
-
-
-
-    /**
-     * Returns the default footer for the sheet,
-     *  creating one as needed.
-     * You may also want to look at
-     *  {@link #getFirstFooter()},
-     *  {@link #getOddFooter()} and
-     *  {@link #getEvenFooter()}
-     */
-    @Override
-    public Footer getFooter() {
-        // The default footer is an odd footer
-        return getOddFooter();
-    }
-
-    /**
-     * Returns the default header for the sheet,
-     *  creating one as needed.
-     * You may also want to look at
-     *  {@link #getFirstHeader()},
-     *  {@link #getOddHeader()} and
-     *  {@link #getEvenHeader()}
-     */
-    @Override
-    public Header getHeader() {
-        // The default header is an odd header
-        return getOddHeader();
-    }
-
-    /**
-     * Returns the odd footer. Used on all pages unless
-     *  other footers also present, when used on only
-     *  odd pages.
-     */
-    public Footer getOddFooter() {
-        return new XSSFOddFooter(getSheetTypeHeaderFooter());
-    }
-    /**
-     * Returns the even footer. Not there by default, but
-     *  when set, used on even pages.
-     */
-    public Footer getEvenFooter() {
-        return new XSSFEvenFooter(getSheetTypeHeaderFooter());
-    }
-    /**
-     * Returns the first page footer. Not there by
-     *  default, but when set, used on the first page.
-     */
-    public Footer getFirstFooter() {
-        return new XSSFFirstFooter(getSheetTypeHeaderFooter());
-    }
-
-    /**
-     * Returns the odd header. Used on all pages unless
-     *  other headers also present, when used on only
-     *  odd pages.
-     */
-    public Header getOddHeader() {
-        return new XSSFOddHeader(getSheetTypeHeaderFooter());
-    }
-    /**
-     * Returns the even header. Not there by default, but
-     *  when set, used on even pages.
-     */
-    public Header getEvenHeader() {
-        return new XSSFEvenHeader(getSheetTypeHeaderFooter());
-    }
-    /**
-     * Returns the first page header. Not there by
-     *  default, but when set, used on the first page.
-     */
-    public Header getFirstHeader() {
-        return new XSSFFirstHeader(getSheetTypeHeaderFooter());
-    }
-
-
-    /**
-     * Determine whether printed output for this sheet will be horizontally centered.
-     */
-    @Override
-    public boolean getHorizontallyCenter() {
-        CTPrintOptions opts = worksheet.getPrintOptions();
-        return opts != null && opts.getHorizontalCentered();
-    }
-
-    @Override
-    public int getLastRowNum() {
-        return _rows.isEmpty() ? 0 : _rows.lastKey();
-    }
-
-    @Override
-    public short getLeftCol() {
-        String cellRef = worksheet.getSheetViews().getSheetViewArray(0).getTopLeftCell();
-        if(cellRef == null) {
-            return 0;
-        }
-        CellReference cellReference = new CellReference(cellRef);
-        return cellReference.getCol();
-    }
-
-    /**
-     * Gets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @return the size of the margin
-     * @see Sheet#LeftMargin
-     * @see Sheet#RightMargin
-     * @see Sheet#TopMargin
-     * @see Sheet#BottomMargin
-     * @see Sheet#HeaderMargin
-     * @see Sheet#FooterMargin
-     */
-    @Override
-    public double getMargin(short margin) {
-        if (!worksheet.isSetPageMargins()) return 0;
-
-        CTPageMargins pageMargins = worksheet.getPageMargins();
-        switch (margin) {
-            case LeftMargin:
-                return pageMargins.getLeft();
-            case RightMargin:
-                return pageMargins.getRight();
-            case TopMargin:
-                return pageMargins.getTop();
-            case BottomMargin:
-                return pageMargins.getBottom();
-            case HeaderMargin:
-                return pageMargins.getHeader();
-            case FooterMargin:
-                return pageMargins.getFooter();
-            default :
-                throw new IllegalArgumentException("Unknown margin constant:  " + margin);
-        }
-    }
-
-    /**
-     * Sets the size of the margin in inches.
-     *
-     * @param margin which margin to get
-     * @param size the size of the margin
-     * @see Sheet#LeftMargin
-     * @see Sheet#RightMargin
-     * @see Sheet#TopMargin
-     * @see Sheet#BottomMargin
-     * @see Sheet#HeaderMargin
-     * @see Sheet#FooterMargin
-     */
-    @Override
-    public void setMargin(short margin, double size) {
-        CTPageMargins pageMargins = worksheet.isSetPageMargins() ?
-                worksheet.getPageMargins() : worksheet.addNewPageMargins();
-        switch (margin) {
-            case LeftMargin:
-                pageMargins.setLeft(size);
-                break;
-            case RightMargin:
-                pageMargins.setRight(size);
-                break;
-            case TopMargin:
-                pageMargins.setTop(size);
-                break;
-            case BottomMargin:
-                pageMargins.setBottom(size);
-                break;
-            case HeaderMargin:
-                pageMargins.setHeader(size);
-                break;
-            case FooterMargin:
-                pageMargins.setFooter(size);
-                break;
-            default :
-                throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
-        }
-    }
-
-    /**
-     * Returns the merged region at the specified index. If you want multiple
-     * regions, it is faster to call {@link #getMergedRegions()} than to call
-     * this each time.
-     *
-     * @return the merged region at the specified index
-     */
-    @Override
-    public CellRangeAddress getMergedRegion(int index) {
-        CTMergeCells ctMergeCells = worksheet.getMergeCells();
-        if(ctMergeCells == null) throw new IllegalStateException("This worksheet does not contain merged regions");
-
-        CTMergeCell ctMergeCell = ctMergeCells.getMergeCellArray(index);
-        String ref = ctMergeCell.getRef();
-        return CellRangeAddress.valueOf(ref);
-    }
-
-    /**
-     * Returns the list of merged regions. If you want multiple regions, this is
-     * faster than calling {@link #getMergedRegion(int)} each time.
-     *
-     * @return the list of merged regions
-     */
-    @Override
-    public List<CellRangeAddress> getMergedRegions() {
-        List<CellRangeAddress> addresses = new ArrayList<CellRangeAddress>();
-        CTMergeCells ctMergeCells = worksheet.getMergeCells();
-        if(ctMergeCells == null) return addresses;
-
-        for(CTMergeCell ctMergeCell : ctMergeCells.getMergeCellArray()) {
-            String ref = ctMergeCell.getRef();
-            addresses.add(CellRangeAddress.valueOf(ref));
-        }
-        return addresses;
-    }
-
-    /**
-     * Returns the number of merged regions defined in this worksheet
-     *
-     * @return number of merged regions in this worksheet
-     */
-    @Override
-    public int getNumMergedRegions() {
-        CTMergeCells ctMergeCells = worksheet.getMergeCells();
-        return ctMergeCells == null ? 0 : ctMergeCells.sizeOfMergeCellArray();
-    }
-
-    public int getNumHyperlinks() {
-        return hyperlinks.size();
-    }
-
-    /**
-     * Returns the information regarding the currently configured pane (split or freeze).
-     *
-     * @return null if no pane configured, or the pane information.
-     */
-    @Override
-    public PaneInformation getPaneInformation() {
-        CTPane pane = getDefaultSheetView().getPane();
-        // no pane configured
-        if(pane == null)  return null;
-
-        CellReference cellRef = pane.isSetTopLeftCell() ? new CellReference(pane.getTopLeftCell()) : null;
-        return new PaneInformation((short)pane.getXSplit(), (short)pane.getYSplit(),
-                (short)(cellRef == null ? 0 : cellRef.getRow()),(cellRef == null ? 0 : cellRef.getCol()),
-                (byte)(pane.getActivePane().intValue() - 1), pane.getState() == STPaneState.FROZEN);
-    }
-
-    /**
-     * Returns the number of physically defined rows (NOT the number of rows in the sheet)
-     *
-     * @return the number of physically defined rows
-     */
-    @Override
-    public int getPhysicalNumberOfRows() {
-        return _rows.size();
-    }
-
-    /**
-     * Gets the print setup object.
-     *
-     * @return The user model for the print setup object.
-     */
-    @Override
-    public XSSFPrintSetup getPrintSetup() {
-        return new XSSFPrintSetup(worksheet);
-    }
-
-    /**
-     * Answer whether protection is enabled or disabled
-     *
-     * @return true => protection enabled; false => protection disabled
-     */
-    @Override
-    public boolean getProtect() {
-        return isSheetLocked();
-    }
-
-    /**
-     * Enables sheet protection and sets the password for the sheet.
-     * Also sets some attributes on the {@link CTSheetProtection} that correspond to
-     * the default values used by Excel
-     *
-     * @param password to set for protection. Pass <code>null</code> to remove protection
-     */
-    @Override
-    public void protectSheet(String password) {
-        if (password != null) {
-            CTSheetProtection sheetProtection = safeGetProtectionField();
-            setSheetPassword(password, null); // defaults to xor password
-            sheetProtection.setSheet(true);
-            sheetProtection.setScenarios(true);
-            sheetProtection.setObjects(true);
-        } else {
-            worksheet.unsetSheetProtection();
-        }
-    }
-
-    /**
-     * Sets the sheet password. 
-     * 
-     * @param password if null, the password will be removed
-     * @param hashAlgo if null, the password will be set as XOR password (Excel 2010 and earlier)
-     *  otherwise the given algorithm is used for calculating the hash password (Excel 2013)
-     */
-    public void setSheetPassword(String password, HashAlgorithm hashAlgo) {
-        if (password == null && !isSheetProtectionEnabled()) {
-            return;
-        }
-        setPassword(safeGetProtectionField(), password, hashAlgo, null);
-    }
-
-    /**
-     * Validate the password against the stored hash, the hashing method will be determined
-     *  by the existing password attributes
-     * @return true, if the hashes match (... though original password may differ ...)
-     */
-    public boolean validateSheetPassword(String password) {
-        if (!isSheetProtectionEnabled()) {
-            return (password == null);
-        }
-        return validatePassword(safeGetProtectionField(), password, null);
-    }
-    
-    /**
-     * Returns the logical row ( 0-based).  If you ask for a row that is not
-     * defined you get a null.  This is to say row 4 represents the fifth row on a sheet.
-     *
-     * @param rownum  row to get
-     * @return <code>XSSFRow</code> representing the rownumber or <code>null</code> if its not defined on the sheet
-     */
-    @Override
-    public XSSFRow getRow(int rownum) {
-        // Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-        final Integer rownumI = new Integer(rownum); // NOSONAR
-        return _rows.get(rownumI);
-    }
-    
-    /**
-     * returns all rows between startRow and endRow, inclusive.
-     * Rows between startRow and endRow that haven't been created are not included
-     * in result unless createRowIfMissing is true
-     *
-     * @param startRowNum the first row number in this sheet to return
-     * @param endRowNum the last row number in this sheet to return
-     * @param createRowIfMissing
-     * @return All rows between startRow and endRow, inclusive
-     * @throws IllegalArgumentException if startRowNum and endRowNum are not in ascending order
-     */
-    private List<XSSFRow> getRows(int startRowNum, int endRowNum, boolean createRowIfMissing) {
-        if (startRowNum > endRowNum) {
-            throw new IllegalArgumentException("getRows: startRowNum must be less than or equal to endRowNum");
-        }
-        final List<XSSFRow> rows = new ArrayList<XSSFRow>();
-        if (createRowIfMissing) {
-            for (int i = startRowNum; i <= endRowNum; i++) {
-                XSSFRow row = getRow(i);
-                if (row == null) {
-                    row = createRow(i);
-                }
-                rows.add(row);
-            }
-        }
-        else {
-            // Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-            final Integer startI = new Integer(startRowNum); // NOSONAR
-            final Integer endI = new Integer(endRowNum+1); // NOSONAR
-            final Collection<XSSFRow> inclusive = _rows.subMap(startI, endI).values();
-            rows.addAll(inclusive);
-        }
-        return rows;
-    }
-
-    /**
-     * Horizontal page break information used for print layout view, page layout view, drawing print breaks in normal
-     *  view, and for printing the worksheet.
-     *
-     * @return row indexes of all the horizontal page breaks, never <code>null</code>
-     */
-    @Override
-    public int[] getRowBreaks() {
-        return worksheet.isSetRowBreaks() ? getBreaks(worksheet.getRowBreaks()) : new int[0];
-
-    }
-
-    /**
-     * Flag indicating whether summary rows appear below detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary row is inserted below the detailed data being summarized and a
-     * new outline level is established on that row.
-     * </p>
-     * <p>
-     * When false a summary row is inserted above the detailed data being summarized and a new outline level
-     * is established on that row.
-     * </p>
-     * @return <code>true</code> if row summaries appear below detail in the outline
-     */
-    @Override
-    public boolean getRowSumsBelow() {
-        CTSheetPr sheetPr = worksheet.getSheetPr();
-        CTOutlinePr outlinePr = (sheetPr != null && sheetPr.isSetOutlinePr())
-                ? sheetPr.getOutlinePr() : null;
-        return outlinePr == null || outlinePr.getSummaryBelow();
-    }
-
-    /**
-     * Flag indicating whether summary rows appear below detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary row is inserted below the detailed data being summarized and a
-     * new outline level is established on that row.
-     * </p>
-     * <p>
-     * When false a summary row is inserted above the detailed data being summarized and a new outline level
-     * is established on that row.
-     * </p>
-     * @param value <code>true</code> if row summaries appear below detail in the outline
-     */
-    @Override
-    public void setRowSumsBelow(boolean value) {
-        ensureOutlinePr().setSummaryBelow(value);
-    }
-
-    /**
-     * Flag indicating whether summary columns appear to the right of detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary column is inserted to the right of the detailed data being summarized
-     * and a new outline level is established on that column.
-     * </p>
-     * <p>
-     * When false a summary column is inserted to the left of the detailed data being
-     * summarized and a new outline level is established on that column.
-     * </p>
-     * @return <code>true</code> if col summaries appear right of the detail in the outline
-     */
-    @Override
-    public boolean getRowSumsRight() {
-        CTSheetPr sheetPr = worksheet.getSheetPr();
-        CTOutlinePr outlinePr = (sheetPr != null && sheetPr.isSetOutlinePr())
-                ? sheetPr.getOutlinePr() : CTOutlinePr.Factory.newInstance();
-        return outlinePr.getSummaryRight();
-    }
-
-    /**
-     * Flag indicating whether summary columns appear to the right of detail in an outline, when applying an outline.
-     *
-     * <p>
-     * When true a summary column is inserted to the right of the detailed data being summarized
-     * and a new outline level is established on that column.
-     * </p>
-     * <p>
-     * When false a summary column is inserted to the left of the detailed data being
-     * summarized and a new outline level is established on that column.
-     * </p>
-     * @param value <code>true</code> if col summaries appear right of the detail in the outline
-     */
-    @Override
-    public void setRowSumsRight(boolean value) {
-        ensureOutlinePr().setSummaryRight(value);
-    }
-
-
-    /**
-     * Ensure CTWorksheet.CTSheetPr.CTOutlinePr
-     */
-    private CTOutlinePr ensureOutlinePr(){
-        CTSheetPr sheetPr = worksheet.isSetSheetPr() ? worksheet.getSheetPr() : worksheet.addNewSheetPr();
-        return sheetPr.isSetOutlinePr() ? sheetPr.getOutlinePr() : sheetPr.addNewOutlinePr();
-    }
-
-    /**
-     * A flag indicating whether scenarios are locked when the sheet is protected.
-     *
-     * @return true => protection enabled; false => protection disabled
-     */
-    @Override
-    public boolean getScenarioProtect() {
-        return worksheet.isSetSheetProtection() && worksheet.getSheetProtection().getScenarios();
-    }
-
-    /**
-     * The top row in the visible view when the sheet is
-     * first viewed after opening it in a viewer
-     *
-     * @return integer indicating the rownum (0 based) of the top row
-     */
-    @Override
-    public short getTopRow() {
-        String cellRef = getSheetTypeSheetView().getTopLeftCell();
-        if(cellRef == null) {
-            return 0;
-        }
-        CellReference cellReference = new CellReference(cellRef);
-        return (short) cellReference.getRow();
-    }
-
-    /**
-     * Determine whether printed output for this sheet will be vertically centered.
-     *
-     * @return whether printed output for this sheet will be vertically centered.
-     */
-    @Override
-    public boolean getVerticallyCenter() {
-        CTPrintOptions opts = worksheet.getPrintOptions();
-        return opts != null && opts.getVerticalCentered();
-    }
-
-    /**
-     * Group between (0 based) columns
-     */
-    @Override
-    public void groupColumn(int fromColumn, int toColumn) {
-        groupColumn1Based(fromColumn+1, toColumn+1);
-    }
-    private void groupColumn1Based(int fromColumn, int toColumn) {
-        CTCols ctCols=worksheet.getColsArray(0);
-        CTCol ctCol=CTCol.Factory.newInstance();
-
-        // copy attributes, as they might be removed by merging with the new column
-        // TODO: check if this fix is really necessary or if the sweeping algorithm
-        // in addCleanColIntoCols needs to be adapted ...
-        CTCol fixCol_before = this.columnHelper.getColumn1Based(toColumn, false);
-        if (fixCol_before != null) {
-            fixCol_before = (CTCol)fixCol_before.copy();
-        }
-
-        ctCol.setMin(fromColumn);
-        ctCol.setMax(toColumn);
-        this.columnHelper.addCleanColIntoCols(ctCols, ctCol);
-
-        CTCol fixCol_after = this.columnHelper.getColumn1Based(toColumn, false);
-        if (fixCol_before != null && fixCol_after != null) {
-            this.columnHelper.setColumnAttributes(fixCol_before, fixCol_after);
-        }
-
-        for(int index=fromColumn;index<=toColumn;index++){
-            CTCol col=columnHelper.getColumn1Based(index, false);
-            //col must exist
-            short outlineLevel=col.getOutlineLevel();
-            col.setOutlineLevel((short)(outlineLevel+1));
-            index=(int)col.getMax();
-        }
-        worksheet.setColsArray(0,ctCols);
-        setSheetFormatPrOutlineLevelCol();
-    }
-
-    /**
-     * Do not leave the width attribute undefined (see #52186).
-     */
-    private void setColWidthAttribute(CTCols ctCols) {
-        for (CTCol col : ctCols.getColArray()) {
-            if (!col.isSetWidth()) {
-                col.setWidth(getDefaultColumnWidth());
-                col.setCustomWidth(false);
-            }
-        }
-    }
-
-    /**
-     * Tie a range of cell together so that they can be collapsed or expanded
-     *
-     * @param fromRow   start row (0-based)
-     * @param toRow     end row (0-based)
-     */
-    @Override
-    public void groupRow(int fromRow, int toRow) {
-        for (int i = fromRow; i <= toRow; i++) {
-            XSSFRow xrow = getRow(i);
-            if (xrow == null) {
-                xrow = createRow(i);
-            }
-            CTRow ctrow = xrow.getCTRow();
-            short outlineLevel = ctrow.getOutlineLevel();
-            ctrow.setOutlineLevel((short) (outlineLevel + 1));
-        }
-        setSheetFormatPrOutlineLevelRow();
-    }
-
-    private short getMaxOutlineLevelRows(){
-        int outlineLevel = 0;
-        for (XSSFRow xrow : _rows.values()) {
-            outlineLevel = Math.max(outlineLevel, xrow.getCTRow().getOutlineLevel());
-        }
-        return (short) outlineLevel;
-    }
-
-    private short getMaxOutlineLevelCols() {
-        CTCols ctCols = worksheet.getColsArray(0);
-        int outlineLevel = 0;
-        for (CTCol col : ctCols.getColArray()) {
-            outlineLevel = Math.max(outlineLevel, col.getOutlineLevel());
-        }
-        return (short) outlineLevel;
-    }
-
-    /**
-     * Determines if there is a page break at the indicated column
-     */
-    @Override
-    public boolean isColumnBroken(int column) {
-        for (int colBreak : getColumnBreaks()) {
-            if (colBreak == column) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the hidden state for a given column.
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @return hidden - <code>false</code> if the column is visible
-     */
-    @Override
-    public boolean isColumnHidden(int columnIndex) {
-        CTCol col = columnHelper.getColumn(columnIndex, false);
-        return col != null && col.getHidden();
-    }
-
-    /**
-     * Gets the flag indicating whether this sheet should display formulas.
-     *
-     * @return <code>true</code> if this sheet should display formulas.
-     */
-    @Override
-    public boolean isDisplayFormulas() {
-        return getSheetTypeSheetView().getShowFormulas();
-    }
-
-    /**
-     * Gets the flag indicating whether this sheet displays the lines
-     * between rows and columns to make editing and reading easier.
-     *
-     * @return <code>true</code> if this sheet displays gridlines.
-     * @see #isPrintGridlines() to check if printing of gridlines is turned on or off
-     */
-    @Override
-    public boolean isDisplayGridlines() {
-        return getSheetTypeSheetView().getShowGridLines();
-    }
-
-    /**
-     * Sets the flag indicating whether this sheet should display the lines
-     * between rows and columns to make editing and reading easier.
-     * To turn printing of gridlines use {@link #setPrintGridlines(boolean)}
-     *
-     *
-     * @param show <code>true</code> if this sheet should display gridlines.
-     * @see #setPrintGridlines(boolean)
-     */
-    @Override
-    public void setDisplayGridlines(boolean show) {
-        getSheetTypeSheetView().setShowGridLines(show);
-    }
-
-    /**
-     * Gets the flag indicating whether this sheet should display row and column headings.
-     * <p>
-     * Row heading are the row numbers to the side of the sheet
-     * </p>
-     * <p>
-     * Column heading are the letters or numbers that appear above the columns of the sheet
-     * </p>
-     *
-     * @return <code>true</code> if this sheet should display row and column headings.
-     */
-    @Override
-    public boolean isDisplayRowColHeadings() {
-        return getSheetTypeSheetView().getShowRowColHeaders();
-    }
-
-    /**
-     * Sets the flag indicating whether this sheet should display row and column headings.
-     * <p>
-     * Row heading are the row numbers to the side of the sheet
-     * </p>
-     * <p>
-     * Column heading are the letters or numbers that appear above the columns of the sheet
-     * </p>
-     *
-     * @param show <code>true</code> if this sheet should display row and column headings.
-     */
-    @Override
-    public void setDisplayRowColHeadings(boolean show) {
-        getSheetTypeSheetView().setShowRowColHeaders(show);
-    }
-
-    /**
-     * Returns whether gridlines are printed.
-     *
-     * @return whether gridlines are printed
-     */
-    @Override
-    public boolean isPrintGridlines() {
-        CTPrintOptions opts = worksheet.getPrintOptions();
-        return opts != null && opts.getGridLines();
-    }
-
-    /**
-     * Turns on or off the printing of gridlines.
-     *
-     * @param value boolean to turn on or off the printing of gridlines
-     */
-    @Override
-    public void setPrintGridlines(boolean value) {
-        CTPrintOptions opts = worksheet.isSetPrintOptions() ?
-                worksheet.getPrintOptions() : worksheet.addNewPrintOptions();
-        opts.setGridLines(value);
-    }
-    
-    /**
-     * Returns whether row and column headings are printed.
-     *
-     * @return whether row and column headings are printed
-     */
-    @Override
-    public boolean isPrintRowAndColumnHeadings() {
-        CTPrintOptions opts = worksheet.getPrintOptions();
-        return opts != null && opts.getHeadings();
-    }
-
-    /**
-     * Turns on or off the printing of row and column headings.
-     *
-     * @param value boolean to turn on or off the printing of row and column headings
-     */
-    @Override
-    public void setPrintRowAndColumnHeadings(boolean value) {
-        CTPrintOptions opts = worksheet.isSetPrintOptions() ?
-                worksheet.getPrintOptions() : worksheet.addNewPrintOptions();
-        opts.setHeadings(value);
-    }
-
-    /**
-     * Tests if there is a page break at the indicated row
-     *
-     * @param row index of the row to test
-     * @return <code>true</code> if there is a page break at the indicated row
-     */
-    @Override
-    public boolean isRowBroken(int row) {
-        for (int rowBreak : getRowBreaks()) {
-            if (rowBreak == row) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void setBreak(int id, CTPageBreak ctPgBreak, int lastIndex) {
-        CTBreak brk = ctPgBreak.addNewBrk();
-        brk.setId(id + 1); // this is id of the element which is 1-based: <row r="1" ... >
-        brk.setMan(true);
-        brk.setMax(lastIndex); //end column of the break
-
-        int nPageBreaks = ctPgBreak.sizeOfBrkArray();
-        ctPgBreak.setCount(nPageBreaks);
-        ctPgBreak.setManualBreakCount(nPageBreaks);
-    }
-
-    /**
-     * Sets a page break at the indicated row
-     * Breaks occur above the specified row and left of the specified column inclusive.
-     *
-     * For example, <code>sheet.setColumnBreak(2);</code> breaks the sheet into two parts
-     * with columns A,B,C in the first and D,E,... in the second. Simuilar, <code>sheet.setRowBreak(2);</code>
-     * breaks the sheet into two parts with first three rows (rownum=1...3) in the first part
-     * and rows starting with rownum=4 in the second.
-     *
-     * @param row the row to break, inclusive
-     */
-    @Override
-    public void setRowBreak(int row) {
-        if (!isRowBroken(row)) {
-            CTPageBreak pgBreak = worksheet.isSetRowBreaks() ? worksheet.getRowBreaks() : worksheet.addNewRowBreaks();
-            setBreak(row, pgBreak, SpreadsheetVersion.EXCEL2007.getLastColumnIndex());
-        }
-    }
-
-    /**
-     * Removes a page break at the indicated column
-     */
-    @Override
-    public void removeColumnBreak(int column) {
-        if (worksheet.isSetColBreaks()) {
-            removeBreak(column, worksheet.getColBreaks());
-        } // else no breaks
-    }
-
-    /**
-     * Removes a merged region of cells (hence letting them free)
-     *
-     * @param index of the region to unmerge
-     */
-    @Override
-    public void removeMergedRegion(int index) {
-        if (!worksheet.isSetMergeCells()) return;
-        
-        CTMergeCells ctMergeCells = worksheet.getMergeCells();
-        int size = ctMergeCells.sizeOfMergeCellArray();
-        assert(0 <= index && index < size);
-        if (size > 1) {
-            ctMergeCells.removeMergeCell(index);
-        } else {
-            worksheet.unsetMergeCells();
-        }
-    }
-
-    /**
-     * Removes a number of merged regions of cells (hence letting them free)
-     *
-     * This method can be used to bulk-remove merged regions in a way
-     * much faster than calling removeMergedRegion() for every single
-     * merged region.
-     *
-     * @param indices A set of the regions to unmerge
-     */
-    @Override
-    public void removeMergedRegions(Collection<Integer> indices) {
-        if (!worksheet.isSetMergeCells()) return;
-        
-        CTMergeCells ctMergeCells = worksheet.getMergeCells();
-        List<CTMergeCell> newMergeCells = new ArrayList<CTMergeCell>(ctMergeCells.sizeOfMergeCellArray());
-
-        int idx = 0;
-        for (CTMergeCell mc : ctMergeCells.getMergeCellArray()) {
-            if (!indices.contains(idx++)) {
-                newMergeCells.add(mc);
-            }
-        }
-        
-        if (newMergeCells.isEmpty()) {
-            worksheet.unsetMergeCells();
-        } else {
-            CTMergeCell[] newMergeCellsArray = new CTMergeCell[newMergeCells.size()];
-            ctMergeCells.setMergeCellArray(newMergeCells.toArray(newMergeCellsArray));
-        }
-    }
-
-    /**
-     * Remove a row from this sheet.  All cells contained in the row are removed as well
-     *
-     * @param row  the row to remove.
-     */
-    @Override
-    public void removeRow(Row row) {
-        if (row.getSheet() != this) {
-            throw new IllegalArgumentException("Specified row does not belong to this sheet");
-        }
-        // collect cells into a temporary array to avoid ConcurrentModificationException
-        ArrayList<XSSFCell> cellsToDelete = new ArrayList<XSSFCell>();
-        for (Cell cell : row) {
-            cellsToDelete.add((XSSFCell)cell);
-        }
-
-        for (XSSFCell cell : cellsToDelete) {
-            row.removeCell(cell);
-        }
-
-        // Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-        final int rowNum = row.getRowNum();
-        final Integer rowNumI = new Integer(rowNum); // NOSONAR
-        // this is not the physical row number!
-        final int idx = _rows.headMap(rowNumI).size();
-        _rows.remove(rowNumI);
-        worksheet.getSheetData().removeRow(idx);
-
-        // also remove any comment located in that row
-        if(sheetComments != null) {
-            for (CellAddress ref : getCellComments().keySet()) {
-                if (ref.getRow() == rowNum) {
-                    sheetComments.removeComment(ref);
-                }
-            }
-        }
-    }
-
-    /**
-     * Removes the page break at the indicated row
-     */
-    @Override
-    public void removeRowBreak(int row) {
-        if (worksheet.isSetRowBreaks()) {
-            removeBreak(row, worksheet.getRowBreaks());
-        } // else no breaks
-    }
-
-    /**
-     * Control if Excel should be asked to recalculate all formulas on this sheet
-     * when the workbook is opened.
-     *
-     *  <p>
-     *  Calculating the formula values with {@link org.apache.poi.ss.usermodel.FormulaEvaluator} is the
-     *  recommended solution, but this may be used for certain cases where
-     *  evaluation in POI is not possible.
-     *  </p>
-     *
-     *  <p>
-     *  It is recommended to force recalcuation of formulas on workbook level using
-     *  {@link org.apache.poi.ss.usermodel.Workbook#setForceFormulaRecalculation(boolean)}
-     *  to ensure that all cross-worksheet formuals and external dependencies are updated.
-     *  </p>
-     * @param value true if the application will perform a full recalculation of
-     * this worksheet values when the workbook is opened
-     *
-     * @see org.apache.poi.ss.usermodel.Workbook#setForceFormulaRecalculation(boolean)
-     */
-    @Override
-    public void setForceFormulaRecalculation(boolean value) {
-        CTCalcPr calcPr = getWorkbook().getCTWorkbook().getCalcPr();
-
-        if(worksheet.isSetSheetCalcPr()) {
-          // Change the current setting
-          CTSheetCalcPr calc = worksheet.getSheetCalcPr();
-          calc.setFullCalcOnLoad(value);
-       }
-       else if(value) {
-          // Add the Calc block and set it
-          CTSheetCalcPr calc = worksheet.addNewSheetCalcPr();
-          calc.setFullCalcOnLoad(value);
-       }
-        if(value && calcPr != null && calcPr.getCalcMode() == STCalcMode.MANUAL) {
-            calcPr.setCalcMode(STCalcMode.AUTO);
-        }
-
-    }
-
-    /**
-     * Whether Excel will be asked to recalculate all formulas when the
-     *  workbook is opened.
-     */
-    @Override
-    public boolean getForceFormulaRecalculation() {
-       if(worksheet.isSetSheetCalcPr()) {
-          CTSheetCalcPr calc = worksheet.getSheetCalcPr();
-          return calc.getFullCalcOnLoad();
-       }
-       return false;
-    }
-
-    /**
-     * @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.
-     * Call getRowNum() on each row if you care which one it is.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public Iterator<Row> rowIterator() {
-        return (Iterator<Row>)(Iterator<? extends Row>) _rows.values().iterator();
-    }
-
-    /**
-     * Alias for {@link #rowIterator()} to
-     *  allow foreach loops
-     */
-    @Override
-    public Iterator<Row> iterator() {
-        return rowIterator();
-    }
-
-    /**
-     * Flag indicating whether the sheet displays Automatic Page Breaks.
-     *
-     * @return <code>true</code> if the sheet displays Automatic Page Breaks.
-     */
-    @Override
-    public boolean getAutobreaks() {
-        CTSheetPr sheetPr = getSheetTypeSheetPr();
-        CTPageSetUpPr psSetup = (sheetPr == null || !sheetPr.isSetPageSetUpPr()) ?
-                CTPageSetUpPr.Factory.newInstance() : sheetPr.getPageSetUpPr();
-        return psSetup.getAutoPageBreaks();
-    }
-
-    /**
-     * Flag indicating whether the sheet displays Automatic Page Breaks.
-     *
-     * @param value <code>true</code> if the sheet displays Automatic Page Breaks.
-     */
-    @Override
-    public void setAutobreaks(boolean value) {
-        CTSheetPr sheetPr = getSheetTypeSheetPr();
-        CTPageSetUpPr psSetup = sheetPr.isSetPageSetUpPr() ? sheetPr.getPageSetUpPr() : sheetPr.addNewPageSetUpPr();
-        psSetup.setAutoPageBreaks(value);
-    }
-
-    /**
-     * Sets a page break at the indicated column.
-     * Breaks occur above the specified row and left of the specified column inclusive.
-     *
-     * For example, <code>sheet.setColumnBreak(2);</code> breaks the sheet into two parts
-     * with columns A,B,C in the first and D,E,... in the second. Simuilar, <code>sheet.setRowBreak(2);</code>
-     * breaks the sheet into two parts with first three rows (rownum=1...3) in the first part
-     * and rows starting with rownum=4 in the second.
-     *
-     * @param column the column to break, inclusive
-     */
-    @Override
-    public void setColumnBreak(int column) {
-        if (!isColumnBroken(column)) {
-            CTPageBreak pgBreak = worksheet.isSetColBreaks() ? worksheet.getColBreaks() : worksheet.addNewColBreaks();
-            setBreak(column, pgBreak, SpreadsheetVersion.EXCEL2007.getLastRowIndex());
-        }
-    }
-
-    @Override
-    public void setColumnGroupCollapsed(int columnNumber, boolean collapsed) {
-        if (collapsed) {
-            collapseColumn(columnNumber);
-        } else {
-            expandColumn(columnNumber);
-        }
-    }
-
-    private void collapseColumn(int columnNumber) {
-        CTCols cols = worksheet.getColsArray(0);
-        CTCol col = columnHelper.getColumn(columnNumber, false);
-        int colInfoIx = columnHelper.getIndexOfColumn(cols, col);
-        if (colInfoIx == -1) {
-            return;
-        }
-        // Find the start of the group.
-        int groupStartColInfoIx = findStartOfColumnOutlineGroup(colInfoIx);
-
-        CTCol columnInfo = cols.getColArray(groupStartColInfoIx);
-
-        // Hide all the columns until the end of the group
-        int lastColMax = setGroupHidden(groupStartColInfoIx, columnInfo
-                .getOutlineLevel(), true);
-
-        // write collapse field
-        setColumn(lastColMax + 1, 0, null, null, Boolean.TRUE);
-
-    }
-
-    private void setColumn(int targetColumnIx, Integer style,
-                           Integer level, Boolean hidden, Boolean collapsed) {
-        CTCols cols = worksheet.getColsArray(0);
-        CTCol ci = null;
-        for (CTCol tci : cols.getColArray()) {
-            long tciMin = tci.getMin();
-            long tciMax = tci.getMax();
-            if (tciMin >= targetColumnIx && tciMax <= targetColumnIx) {
-                ci = tci;
-                break;
-            }
-            if (tciMin > targetColumnIx) {
-                // call column infos after k are for later columns
-                break; // exit now so k will be the correct insert pos
-            }
-        }
-
-        if (ci == null) {
-            // okay so there ISN'T a column info record that covers this column
-            // so lets create one!
-            CTCol nci = CTCol.Factory.newInstance();
-            nci.setMin(targetColumnIx);
-            nci.setMax(targetColumnIx);
-            unsetCollapsed(collapsed, nci);
-            this.columnHelper.addCleanColIntoCols(cols, nci);
-            return;
-        }
-
-        boolean styleChanged = style != null && ci.getStyle() != style;
-        boolean levelChanged = level != null && ci.getOutlineLevel() != level;
-        boolean hiddenChanged = hidden != null && ci.getHidden() != hidden;
-        boolean collapsedChanged = collapsed != null && ci.getCollapsed() != collapsed;
-        boolean columnChanged = levelChanged || hiddenChanged || collapsedChanged || styleChanged;
-        if (!columnChanged) {
-            // do nothing...nothing changed.
-            return;
-        }
-
-        long ciMin = ci.getMin();
-        long ciMax = ci.getMax();
-        if (ciMin == targetColumnIx && ciMax == targetColumnIx) {
-            // ColumnInfo ci for a single column, the target column
-            unsetCollapsed(collapsed, ci);
-            return;
-        }
-
-        if (ciMin == targetColumnIx || ciMax == targetColumnIx) {
-            // The target column is at either end of the multi-column ColumnInfo
-            // ci
-            // we'll just divide the info and create a new one
-            if (ciMin == targetColumnIx) {
-                ci.setMin(targetColumnIx + 1);
-            } else {
-                ci.setMax(targetColumnIx - 1);
-            }
-            CTCol nci = columnHelper.cloneCol(cols, ci);
-            nci.setMin(targetColumnIx);
-            unsetCollapsed(collapsed, nci);
-            this.columnHelper.addCleanColIntoCols(cols, nci);
-
-        } else {
-            // split to 3 records
-            CTCol ciMid = columnHelper.cloneCol(cols, ci);
-            CTCol ciEnd = columnHelper.cloneCol(cols, ci);
-            int lastcolumn = (int) ciMax;
-
-            ci.setMax(targetColumnIx - 1);
-
-            ciMid.setMin(targetColumnIx);
-            ciMid.setMax(targetColumnIx);
-            unsetCollapsed(collapsed, ciMid);
-            this.columnHelper.addCleanColIntoCols(cols, ciMid);
-
-            ciEnd.setMin(targetColumnIx + 1);
-            ciEnd.setMax(lastcolumn);
-            this.columnHelper.addCleanColIntoCols(cols, ciEnd);
-        }
-    }
-
-    private void unsetCollapsed(boolean collapsed, CTCol ci) {
-        if (collapsed) {
-            ci.setCollapsed(collapsed);
-        } else {
-            ci.unsetCollapsed();
-        }
-    }
-
-    /**
-     * Sets all adjacent columns of the same outline level to the specified
-     * hidden status.
-     *
-     * @param pIdx
-     *                the col info index of the start of the outline group
-     * @return the column index of the last column in the outline group
-     */
-    private int setGroupHidden(int pIdx, int level, boolean hidden) {
-        CTCols cols = worksheet.getColsArray(0);
-        int idx = pIdx;
-        CTCol[] colArray = cols.getColArray();
-        CTCol columnInfo = colArray[idx];
-        while (idx < colArray.length) {
-            columnInfo.setHidden(hidden);
-            if (idx + 1 < colArray.length) {
-                CTCol nextColumnInfo = colArray[idx + 1];
-
-                if (!isAdjacentBefore(columnInfo, nextColumnInfo)) {
-                    break;
-                }
-
-                if (nextColumnInfo.getOutlineLevel() < level) {
-                    break;
-                }
-                columnInfo = nextColumnInfo;
-            }
-            idx++;
-        }
-        return (int) columnInfo.getMax();
-    }
-
-    private boolean isAdjacentBefore(CTCol col, CTCol otherCol) {
-        return col.getMax() == otherCol.getMin() - 1;
-    }
-
-    private int findStartOfColumnOutlineGroup(int pIdx) {
-        // Find the start of the group.
-        CTCols cols = worksheet.getColsArray(0);
-        CTCol[] colArray = cols.getColArray();
-        CTCol columnInfo = colArray[pIdx];
-        int level = columnInfo.getOutlineLevel();
-        int idx = pIdx;
-        while (idx != 0) {
-            CTCol prevColumnInfo = colArray[idx - 1];
-            if (!isAdjacentBefore(prevColumnInfo, columnInfo)) {
-                break;
-            }
-            if (prevColumnInfo.getOutlineLevel() < level) {
-                break;
-            }
-            idx--;
-            columnInfo = prevColumnInfo;
-        }
-        return idx;
-    }
-
-    private int findEndOfColumnOutlineGroup(int colInfoIndex) {
-        CTCols cols = worksheet.getColsArray(0);
-        // Find the end of the group.
-        CTCol[] colArray = cols.getColArray();
-        CTCol columnInfo = colArray[colInfoIndex];
-        int level = columnInfo.getOutlineLevel();
-        int idx = colInfoIndex;
-        int lastIdx = colArray.length - 1;
-        while (idx < lastIdx) {
-            CTCol nextColumnInfo = colArray[idx + 1];
-            if (!isAdjacentBefore(columnInfo, nextColumnInfo)) {
-                break;
-            }
-            if (nextColumnInfo.getOutlineLevel() < level) {
-                break;
-            }
-            idx++;
-            columnInfo = nextColumnInfo;
-        }
-        return idx;
-    }
-
-    private void expandColumn(int columnIndex) {
-        CTCols cols = worksheet.getColsArray(0);
-        CTCol col = columnHelper.getColumn(columnIndex, false);
-        int colInfoIx = columnHelper.getIndexOfColumn(cols, col);
-
-        int idx = findColInfoIdx((int) col.getMax(), colInfoIx);
-        if (idx == -1) {
-            return;
-        }
-
-        // If it is already expanded do nothing.
-        if (!isColumnGroupCollapsed(idx)) {
-            return;
-        }
-
-        // Find the start/end of the group.
-        int startIdx = findStartOfColumnOutlineGroup(idx);
-        int endIdx = findEndOfColumnOutlineGroup(idx);
-
-        // expand:
-        // colapsed bit must be unset
-        // hidden bit gets unset _if_ surrounding groups are expanded you can
-        // determine
-        // this by looking at the hidden bit of the enclosing group. You will
-        // have
-        // to look at the start and the end of the current group to determine
-        // which
-        // is the enclosing group
-        // hidden bit only is altered for this outline level. ie. don't
-        // uncollapse contained groups
-        CTCol[] colArray = cols.getColArray();
-        CTCol columnInfo = colArray[endIdx];
-        if (!isColumnGroupHiddenByParent(idx)) {
-            short outlineLevel = columnInfo.getOutlineLevel();
-            boolean nestedGroup = false;
-            for (int i = startIdx; i <= endIdx; i++) {
-                CTCol ci = colArray[i];
-                if (outlineLevel == ci.getOutlineLevel()) {
-                    ci.unsetHidden();
-                    if (nestedGroup) {
-                        nestedGroup = false;
-                        ci.setCollapsed(true);
-                    }
-                } else {
-                    nestedGroup = true;
-                }
-            }
-        }
-        // Write collapse flag (stored in a single col info record after this
-        // outline group)
-        setColumn((int) columnInfo.getMax() + 1, null, null,
-                Boolean.FALSE, Boolean.FALSE);
-    }
-
-    private boolean isColumnGroupHiddenByParent(int idx) {
-        CTCols cols = worksheet.getColsArray(0);
-        // Look out outline details of end
-        int endLevel = 0;
-        boolean endHidden = false;
-        int endOfOutlineGroupIdx = findEndOfColumnOutlineGroup(idx);
-        CTCol[] colArray = cols.getColArray();
-        if (endOfOutlineGroupIdx < colArray.length) {
-            CTCol nextInfo = colArray[endOfOutlineGroupIdx + 1];
-            if (isAdjacentBefore(colArray[endOfOutlineGroupIdx], nextInfo)) {
-                endLevel = nextInfo.getOutlineLevel();
-                endHidden = nextInfo.getHidden();
-            }
-        }
-        // Look out outline details of start
-        int startLevel = 0;
-        boolean startHidden = false;
-        int startOfOutlineGroupIdx = findStartOfColumnOutlineGroup(idx);
-        if (startOfOutlineGroupIdx > 0) {
-            CTCol prevInfo = colArray[startOfOutlineGroupIdx - 1];
-
-            if (isAdjacentBefore(prevInfo, colArray[startOfOutlineGroupIdx])) {
-                startLevel = prevInfo.getOutlineLevel();
-                startHidden = prevInfo.getHidden();
-            }
-
-        }
-        if (endLevel > startLevel) {
-            return endHidden;
-        }
-        return startHidden;
-    }
-
-    private int findColInfoIdx(int columnValue, int fromColInfoIdx) {
-        CTCols cols = worksheet.getColsArray(0);
-
-        if (columnValue < 0) {
-            throw new IllegalArgumentException(
-                    "column parameter out of range: " + columnValue);
-        }
-        if (fromColInfoIdx < 0) {
-            throw new IllegalArgumentException(
-                    "fromIdx parameter out of range: " + fromColInfoIdx);
-        }
-
-        CTCol[] colArray = cols.getColArray();
-        for (int k = fromColInfoIdx; k < colArray.length; k++) {
-            CTCol ci = colArray[k];
-
-            if (containsColumn(ci, columnValue)) {
-                return k;
-            }
-
-            if (ci.getMin() > fromColInfoIdx) {
-                break;
-            }
-
-        }
-        return -1;
-    }
-
-    private boolean containsColumn(CTCol col, int columnIndex) {
-        return col.getMin() <= columnIndex && columnIndex <= col.getMax();
-    }
-
-    /**
-     * 'Collapsed' state is stored in a single column col info record
-     * immediately after the outline group
-     *
-     * @param idx
-     * @return a boolean represented if the column is collapsed
-     */
-    private boolean isColumnGroupCollapsed(int idx) {
-        CTCols cols = worksheet.getColsArray(0);
-        CTCol[] colArray = cols.getColArray();
-        int endOfOutlineGroupIdx = findEndOfColumnOutlineGroup(idx);
-        int nextColInfoIx = endOfOutlineGroupIdx + 1;
-        if (nextColInfoIx >= colArray.length) {
-            return false;
-        }
-        CTCol nextColInfo = colArray[nextColInfoIx];
-
-        CTCol col = colArray[endOfOutlineGroupIdx];
-        if (!isAdjacentBefore(col, nextColInfo)) {
-            return false;
-        }
-
-        return nextColInfo.getCollapsed();
-    }
-
-    /**
-     * Get the visibility state for a given column.
-     *
-     * @param columnIndex - the column to get (0-based)
-     * @param hidden - the visiblity state of the column
-     */
-    @Override
-    public void setColumnHidden(int columnIndex, boolean hidden) {
-        columnHelper.setColHidden(columnIndex, hidden);
-     }
-
-    /**
-     * Set the width (in units of 1/256th of a character width)
-     *
-     * <p>
-     * The maximum column width for an individual cell is 255 characters.
-     * This value represents the number of characters that can be displayed
-     * in a cell that is formatted with the standard font (first font in the workbook).
-     * </p>
-     *
-     * <p>
-     * Character width is defined as the maximum digit width
-     * of the numbers <code>0, 1, 2, ... 9</code> as rendered
-     * using the default font (first font in the workbook).
-     * <br/>
-     * Unless you are using a very special font, the default character is '0' (zero),
-     * this is true for Arial (default font font in HSSF) and Calibri (default font in XSSF)
-     * </p>
-     *
-     * <p>
-     * Please note, that the width set by this method includes 4 pixels of margin padding (two on each side),
-     * plus 1 pixel padding for the gridlines (Section 3.3.1.12 of the OOXML spec).
-     * This results is a slightly less value of visible characters than passed to this method (approx. 1/2 of a character).
-     * </p>
-     * <p>
-     * To compute the actual number of visible characters,
-     *  Excel uses the following formula (Section 3.3.1.12 of the OOXML spec):
-     * </p>
-     * <code>
-     *     width = Truncate([{Number of Visible Characters} *
-     *      {Maximum Digit Width} + {5 pixel padding}]/{Maximum Digit Width}*256)/256
-     * </code>
-     * <p>Using the Calibri font as an example, the maximum digit width of 11 point font size is 7 pixels (at 96 dpi).
-     *  If you set a column width to be eight characters wide, e.g. <code>setColumnWidth(columnIndex, 8*256)</code>,
-     *  then the actual value of visible characters (the value shown in Excel) is derived from the following equation:
-     *  <code>
-            Truncate([numChars*7+5]/7*256)/256 = 8;
-     *  </code>
-     *
-     *  which gives <code>7.29</code>.
-     *
-     * @param columnIndex - the column to set (0-based)
-     * @param width - the width in units of 1/256th of a character width
-     * @throws IllegalArgumentException if width > 255*256 (the maximum column width in Excel is 255 characters)
-     */
-    @Override
-    public void setColumnWidth(int columnIndex, int width) {
-        if(width > 255*256) throw new IllegalArgumentException("The maximum column width for an individual cell is 255 characters.");
-
-        columnHelper.setColWidth(columnIndex, (double)width/256);
-        columnHelper.setCustomWidth(columnIndex, true);
-    }
-
-    @Override
-    public void setDefaultColumnStyle(int column, CellStyle style) {
-        columnHelper.setColDefaultStyle(column, style);
-    }
-
-    /**
-     * Specifies the number of characters of the maximum digit width of the normal style's font.
-     * This value does not include margin padding or extra padding for gridlines. It is only the
-     * number of characters.
-     *
-     * @param width the number of characters. Default value is <code>8</code>.
-     */
-    @Override
-    public void setDefaultColumnWidth(int width) {
-        getSheetTypeSheetFormatPr().setBaseColWidth(width);
-    }
-
-    /**
-     * Set the default row height for the sheet (if the rows do not define their own height) in
-     * twips (1/20 of  a point)
-     *
-     * @param  height default row height in  twips (1/20 of  a point)
-     */
-    @Override
-    public void setDefaultRowHeight(short height) {
-        setDefaultRowHeightInPoints((float)height / TWIPS_PER_POINT);
-    }
-
-    /**
-     * Sets default row height measured in point size.
-     *
-     * @param height default row height measured in point size.
-     */
-    @Override
-    public void setDefaultRowHeightInPoints(float height) {
-        CTSheetFormatPr pr = getSheetTypeSheetFormatPr();
-        pr.setDefaultRowHeight(height);
-        pr.setCustomHeight(true);
-    }
-
-    /**
-     * Sets the flag indicating whether this sheet should display formulas.
-     *
-     * @param show <code>true</code> if this sheet should display formulas.
-     */
-    @Override
-    public void setDisplayFormulas(boolean show) {
-        getSheetTypeSheetView().setShowFormulas(show);
-    }
-
-    private CTSheetView getSheetTypeSheetView() {
-        if (getDefaultSheetView() == null) {
-            getSheetTypeSheetViews().setSheetViewArray(0, CTSheetView.Factory.newInstance());
-        }
-        return getDefaultSheetView();
-    }
-
-    /**
-     * Flag indicating whether the Fit to Page print option is enabled.
-     *
-     * @param b <code>true</code> if the Fit to Page print option is enabled.
-     */
-    @Override
-    public void setFitToPage(boolean b) {
-        getSheetTypePageSetUpPr().setFitToPage(b);
-    }
-
-    /**
-     * Center on page horizontally when printing.
-     *
-     * @param value whether to center on page horizontally when printing.
-     */
-    @Override
-    public void setHorizontallyCenter(boolean value) {
-        CTPrintOptions opts = worksheet.isSetPrintOptions() ?
-                worksheet.getPrintOptions() : worksheet.addNewPrintOptions();
-        opts.setHorizontalCentered(value);
-    }
-
-    /**
-     * Whether the output is vertically centered on the page.
-     *
-     * @param value true to vertically center, false otherwise.
-     */
-    @Override
-    public void setVerticallyCenter(boolean value) {
-        CTPrintOptions opts = worksheet.isSetPrintOptions() ?
-                worksheet.getPrintOptions() : worksheet.addNewPrintOptions();
-        opts.setVerticalCentered(value);
-    }
-
-    /**
-     * group the row It is possible for collapsed to be false and yet still have
-     * the rows in question hidden. This can be achieved by having a lower
-     * outline level collapsed, thus hiding all the child rows. Note that in
-     * this case, if the lowest level were expanded, the middle level would
-     * remain collapsed.
-     *
-     * @param rowIndex -
-     *                the row involved, 0 based
-     * @param collapse -
-     *                boolean value for collapse
-     */
-    @Override
-    public void setRowGroupCollapsed(int rowIndex, boolean collapse) {
-        if (collapse) {
-            collapseRow(rowIndex);
-        } else {
-            expandRow(rowIndex);
-        }
-    }
-
-    /**
-     * @param rowIndex the zero based row index to collapse
-     */
-    private void collapseRow(int rowIndex) {
-        XSSFRow row = getRow(rowIndex);
-        if (row != null) {
-            int startRow = findStartOfRowOutlineGroup(rowIndex);
-
-            // Hide all the columns until the end of the group
-            int lastRow = writeHidden(row, startRow, true);
-            if (getRow(lastRow) != null) {
-                getRow(lastRow).getCTRow().setCollapsed(true);
-            } else {
-                XSSFRow newRow = createRow(lastRow);
-                newRow.getCTRow().setCollapsed(true);
-            }
-        }
-    }
-
-    /**
-     * @param rowIndex the zero based row index to find from
-     */
-    private int findStartOfRowOutlineGroup(int rowIndex) {
-        // Find the start of the group.
-        short level = getRow(rowIndex).getCTRow().getOutlineLevel();
-        int currentRow = rowIndex;
-        while (getRow(currentRow) != null) {
-            if (getRow(currentRow).getCTRow().getOutlineLevel() < level)
-                return currentRow + 1;
-            currentRow--;
-        }
-        return currentRow;
-    }
-
-    private int writeHidden(XSSFRow xRow, int rowIndex, boolean hidden) {
-        short level = xRow.getCTRow().getOutlineLevel();
-        for (Iterator<Row> it = rowIterator(); it.hasNext();) {
-            xRow = (XSSFRow) it.next();
-
-            // skip rows before the start of this group
-            if(xRow.getRowNum() < rowIndex) {
-                continue;
-            }
-
-            if (xRow.getCTRow().getOutlineLevel() >= level) {
-                xRow.getCTRow().setHidden(hidden);
-                rowIndex++;
-            }
-
-        }
-        return rowIndex;
-    }
-
-    /**
-     * @param rowNumber the zero based row index to expand
-     */
-    private void expandRow(int rowNumber) {
-        if (rowNumber == -1)
-            return;
-        XSSFRow row = getRow(rowNumber);
-        // If it is already expanded do nothing.
-        if (!row.getCTRow().isSetHidden()) {
-            return;
-        }
-
-        // Find the start of the group.
-        int startIdx = findStartOfRowOutlineGroup(rowNumber);
-
-        // Find the end of the group.
-        int endIdx = findEndOfRowOutlineGroup(rowNumber);
-
-        // expand:
-        // collapsed must be unset
-        // hidden bit gets unset _if_ surrounding groups are expanded you can
-        // determine
-        // this by looking at the hidden bit of the enclosing group. You will
-        // have
-        // to look at the start and the end of the current group to determine
-        // which
-        // is the enclosing group
-        // hidden bit only is altered for this outline level. ie. don't
-        // un-collapse contained groups
-        short level = row.getCTRow().getOutlineLevel();
-        if (!isRowGroupHiddenByParent(rowNumber)) {
-            for (int i = startIdx; i < endIdx; i++) {
-                if (level == getRow(i).getCTRow().getOutlineLevel()) {
-                    getRow(i).getCTRow().unsetHidden();
-                } else if (!isRowGroupCollapsed(i)) {
-                    getRow(i).getCTRow().unsetHidden();
-                }
-            }
-        }
-        // Write collapse field
-        CTRow ctRow = getRow(endIdx).getCTRow();
-        // This avoids an IndexOutOfBounds if multiple nested groups are collapsed/expanded
-        if(ctRow.getCollapsed()) {
-            ctRow.unsetCollapsed();
-        }
-    }
-
-    /**
-     * @param row the zero based row index to find from
-     */
-    public int findEndOfRowOutlineGroup(int row) {
-        short level = getRow(row).getCTRow().getOutlineLevel();
-        int currentRow;
-        final int lastRowNum = getLastRowNum();
-        for (currentRow = row; currentRow < lastRowNum; currentRow++) {
-            if (getRow(currentRow) == null
-                    || getRow(currentRow).getCTRow().getOutlineLevel() < level) {
-                break;
-            }
-        }
-        return currentRow;
-    }
-
-    /**
-     * @param row the zero based row index to find from
-     */
-    private boolean isRowGroupHiddenByParent(int row) {
-        // Look out outline details of end
-        int endLevel;
-        boolean endHidden;
-        int endOfOutlineGroupIdx = findEndOfRowOutlineGroup(row);
-        if (getRow(endOfOutlineGroupIdx) == null) {
-            endLevel = 0;
-            endHidden = false;
-        } else {
-            endLevel = getRow(endOfOutlineGroupIdx).getCTRow().getOutlineLevel();
-            endHidden = getRow(endOfOutlineGroupIdx).getCTRow().getHidden();
-        }
-
-        // Look out outline details of start
-        int startLevel;
-        boolean startHidden;
-        int startOfOutlineGroupIdx = findStartOfRowOutlineGroup(row);
-        if (startOfOutlineGroupIdx < 0
-                || getRow(startOfOutlineGroupIdx) == null) {
-            startLevel = 0;
-            startHidden = false;
-        } else {
-            startLevel = getRow(startOfOutlineGroupIdx).getCTRow()
-            .getOutlineLevel();
-            startHidden = getRow(startOfOutlineGroupIdx).getCTRow()
-            .getHidden();
-        }
-        if (endLevel > startLevel) {
-            return endHidden;
-        }
-        return startHidden;
-    }
-
-    /**
-     * @param row the zero based row index to find from
-     */
-    private boolean isRowGroupCollapsed(int row) {
-        int collapseRow = findEndOfRowOutlineGroup(row) + 1;
-        if (getRow(collapseRow) == null) {
-            return false;
-        }
-        return getRow(collapseRow).getCTRow().getCollapsed();
-    }
-
-    /**
-     * Sets the zoom magnification for the sheet.  The zoom is expressed as a
-     * fraction.  For example to express a zoom of 75% use 3 for the numerator
-     * and 4 for the denominator.
-     *
-     * @param numerator     The numerator for the zoom magnification.
-     * @param denominator   The denominator for the zoom magnification.
-     * @deprecated 2015-11-23 (circa POI 3.14beta1). Use {@link #setZoom(int)} instead.
-     */
-    @Removal(version="3.16")
-    @Override
-    public void setZoom(int numerator, int denominator) {
-        int zoom = 100*numerator/denominator;
-        setZoom(zoom);
-    }
-
-    /**
-     * Window zoom magnification for current view representing percent values.
-     * Valid values range from 10 to 400. Horizontal & Vertical scale together.
-     *
-     * For example:
-     * <pre>
-     * 10 - 10%
-     * 20 - 20%
-     * ...
-     * 100 - 100%
-     * ...
-     * 400 - 400%
-     * </pre>
-     *
-     * Current view can be Normal, Page Layout, or Page Break Preview.
-     *
-     * @param scale window zoom magnification
-     * @throws IllegalArgumentException if scale is invalid
-     */
-    @Override
-    public void setZoom(int scale) {
-        if (scale < 10 || scale > 400) {
-            throw new IllegalArgumentException("Valid scale values range from 10 to 400");
-        }
-        getSheetTypeSheetView().setZoomScale(scale);
-    }
-
-
-    /**
-     * copyRows rows from srcRows to this sheet starting at destStartRow
-     *
-     * Additionally copies merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted).
-     * @param srcRows the rows to copy. Formulas will be offset by the difference
-     * in the row number of the first row in srcRows and destStartRow (even if srcRows
-     * are from a different sheet).
-     * @param destStartRow the row in this sheet to paste the first row of srcRows
-     * the remainder of srcRows will be pasted below destStartRow per the cell copy policy
-     * @param policy is the cell copy policy, which can be used to merge the source and destination
-     * when the source is blank, copy styles only, paste as value, etc
-     */
-    @Beta
-    public void copyRows(List<? extends Row> srcRows, int destStartRow, CellCopyPolicy policy) {
-        if (srcRows == null || srcRows.size() == 0) {
-            throw new IllegalArgumentException("No rows to copy");
-        }
-        final Row srcStartRow = srcRows.get(0);
-        final Row srcEndRow = srcRows.get(srcRows.size() - 1);
-        
-        if (srcStartRow == null) {
-            throw new IllegalArgumentException("copyRows: First row cannot be null");
-        }
-        
-        final int srcStartRowNum = srcStartRow.getRowNum();
-        final int srcEndRowNum = srcEndRow.getRowNum();
-        
-        // check row numbers to make sure they are continuous and increasing (monotonic)
-        // and srcRows does not contain null rows
-        final int size = srcRows.size();
-        for (int index=1; index < size; index++) {
-            final Row curRow = srcRows.get(index);
-            if (curRow == null) {
-                throw new IllegalArgumentException("srcRows may not contain null rows. Found null row at index " + index + ".");
-            //} else if (curRow.getRowNum() != prevRow.getRowNum() + 1) {
-            //    throw new IllegalArgumentException("srcRows must contain continuously increasing row numbers. " +
-            //            "Got srcRows[" + (index-1) + "]=Row " + prevRow.getRowNum() + ", srcRows[" + index + "]=Row " + curRow.getRowNum() + ".");
-            // FIXME: assumes row objects belong to non-null sheets and sheets belong to non-null workbooks.
-            } else if (srcStartRow.getSheet().getWorkbook() != curRow.getSheet().getWorkbook()) {
-                throw new IllegalArgumentException("All rows in srcRows must belong to the same sheet in the same workbook." +
-                        "Expected all rows from same workbook (" + srcStartRow.getSheet().getWorkbook() + "). " +
-                        "Got srcRows[" + index + "] from different workbook (" + curRow.getSheet().getWorkbook() + ").");
-            } else if (srcStartRow.getSheet() != curRow.getSheet()) {
-                throw new IllegalArgumentException("All rows in srcRows must belong to the same sheet. " +
-                        "Expected all rows from " + srcStartRow.getSheet().getSheetName() + ". " +
-                        "Got srcRows[" + index + "] from " + curRow.getSheet().getSheetName());
-            }
-        }
-        
-        // FIXME: is special behavior needed if srcRows and destRows belong to the same sheets and the regions overlap?
-        
-        final CellCopyPolicy options = new CellCopyPolicy(policy);
-        // avoid O(N^2) performance scanning through all regions for each row
-        // merged regions will be copied after all the rows have been copied
-        options.setCopyMergedRegions(false);
-        
-        // FIXME: if srcRows contains gaps or null values, clear out those rows that will be overwritten
-        // how will this work with merging (copy just values, leave cell styles in place?)
-        
-        int r = destStartRow;
-        for (Row srcRow : srcRows) {
-            int destRowNum;
-            if (policy.isCondenseRows()) {
-                destRowNum = r++;
-            } else {
-                final int shift = (srcRow.getRowNum() - srcStartRowNum);
-                destRowNum = destStartRow + shift;
-            }
-            //removeRow(destRowNum); //this probably clears all external formula references to destRow, causing unwanted #REF! errors
-            final XSSFRow destRow = createRow(destRowNum);
-            destRow.copyRowFrom(srcRow, options);
-        }
-        
-        // ======================
-        // Only do additional copy operations here that cannot be done with Row.copyFromRow(Row, options)
-        // reasons: operation needs to interact with multiple rows or sheets
-        
-        // Copy merged regions that are contained within the copy region
-        if (policy.isCopyMergedRegions()) {
-            // FIXME: is this something that rowShifter could be doing?
-            final int shift = destStartRow - srcStartRowNum;
-            for (CellRangeAddress srcRegion : srcStartRow.getSheet().getMergedRegions()) {
-                if (srcStartRowNum <= srcRegion.getFirstRow() && srcRegion.getLastRow() <= srcEndRowNum) {
-                    // srcRegion is fully inside the copied rows
-                    final CellRangeAddress destRegion = srcRegion.copy();
-                    destRegion.setFirstRow(destRegion.getFirstRow() + shift);
-                    destRegion.setLastRow(destRegion.getLastRow() + shift);
-                    addMergedRegion(destRegion);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Copies rows between srcStartRow and srcEndRow to the same sheet, starting at destStartRow
-     * Convenience function for {@link #copyRows(List, int, CellCopyPolicy)}
-     * 
-     * Equivalent to copyRows(getRows(srcStartRow, srcEndRow, false), destStartRow, cellCopyPolicy)
-     * 
-     * @param srcStartRow the index of the first row to copy the cells from in this sheet
-     * @param srcEndRow the index of the last row to copy the cells from in this sheet
-     * @param destStartRow the index of the first row to copy the cells to in this sheet
-     * @param cellCopyPolicy the policy to use to determine how cells are copied
-     */
-    @Beta
-    public void copyRows(int srcStartRow, int srcEndRow, int destStartRow, CellCopyPolicy cellCopyPolicy) {
-        final List<XSSFRow> srcRows = getRows(srcStartRow, srcEndRow, false); //FIXME: should be false, no need to create rows where src is only to copy them to dest
-        copyRows(srcRows, destStartRow, cellCopyPolicy);
-    }
-    
-    /**
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around.
-     *
-     * Calls shiftRows(startRow, endRow, n, false, false);
-     *
-     * <p>
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted).
-     * @param startRow the row to start shifting
-     * @param endRow the row to end shifting
-     * @param n the number of rows to shift
-     */
-    @Override
-    public void shiftRows(int startRow, int endRow, int n) {
-        shiftRows(startRow, endRow, n, false, false);
-    }
-
-    /**
-     * Shifts rows between startRow and endRow n number of rows.
-     * If you use a negative number, it will shift rows up.
-     * Code ensures that rows don't wrap around
-     *
-     * <p>
-     * Additionally shifts merged regions that are completely defined in these
-     * rows (ie. merged 2 cells on a row to be shifted). All merged regions that are
-     * completely overlaid by shifting will be deleted.
-     * <p>
-     * @param startRow the row to start shifting
-     * @param endRow the row to end shifting
-     * @param n the number of rows to shift
-     * @param copyRowHeight whether to copy the row height during the shift
-     * @param resetOriginalRowHeight whether to set the original row's height to the default
-     */
-    @Override
-    public void shiftRows(int startRow, int endRow, final int n, boolean copyRowHeight, boolean resetOriginalRowHeight) {
-        XSSFVMLDrawing vml = getVMLDrawing(false);
-
-        // first remove all rows which will be overwritten
-        for (Iterator<Row> it = rowIterator() ; it.hasNext() ; ) {
-            XSSFRow row = (XSSFRow)it.next();
-            int rownum = row.getRowNum();
-
-            // check if we should remove this row as it will be overwritten by the data later
-            if (shouldRemoveRow(startRow, endRow, n, rownum)) {
-                // remove row from worksheet.getSheetData row array
-                // Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-                final Integer rownumI = new Integer(row.getRowNum()); // NOSONAR
-                int idx = _rows.headMap(rownumI).size();
-                worksheet.getSheetData().removeRow(idx);
-
-                // remove row from _rows
-                it.remove();
-
-                // FIXME: (performance optimization) this should be moved outside the for-loop so that comments only needs to be iterated over once.
-                // also remove any comments associated with this row
-                if(sheetComments != null){
-                    CTCommentList lst = sheetComments.getCTComments().getCommentList();
-                    for (CTComment comment : lst.getCommentArray()) {
-                        String strRef = comment.getRef();
-                        CellAddress ref = new CellAddress(strRef);
-
-                        // is this comment part of the current row?
-                        if(ref.getRow() == rownum) {
-                            sheetComments.removeComment(ref);
-                            vml.removeCommentShape(ref.getRow(), ref.getColumn());
-                        }
-                    }
-                }
-                // FIXME: (performance optimization) this should be moved outside the for-loop so that hyperlinks only needs to be iterated over once.
-                // also remove any hyperlinks associated with this row
-                if (hyperlinks != null) {
-                    for (XSSFHyperlink link : new ArrayList<XSSFHyperlink>(hyperlinks)) {
-                        CellReference ref = new CellReference(link.getCellRef());
-                        if (ref.getRow() == rownum) {
-                            hyperlinks.remove(link);
-                        }
-                    }
-                }
-            }
-        }
-
-        // then do the actual moving and also adjust comments/rowHeight
-        // we need to sort it in a way so the shifting does not mess up the structures, 
-        // i.e. when shifting down, start from down and go up, when shifting up, vice-versa
-        SortedMap<XSSFComment, Integer> commentsToShift = new TreeMap<XSSFComment, Integer>(new Comparator<XSSFComment>() {
-            public int compare(XSSFComment o1, XSSFComment o2) {
-                int row1 = o1.getRow();
-                int row2 = o2.getRow();
-                
-                if(row1 == row2) {
-                    // ordering is not important when row is equal, but don't return zero to still 
-                    // get multiple comments per row into the map
-                    return o1.hashCode() - o2.hashCode();
-                }
-
-                // when shifting down, sort higher row-values first
-                if(n > 0) {
-                    return row1 < row2 ? 1 : -1;
-                } else {
-                    // sort lower-row values first when shifting up
-                    return row1 > row2 ? 1 : -1;
-                }
-            }
-        });
-
-        
-        for (Iterator<Row> it = rowIterator() ; it.hasNext() ; ) {
-            XSSFRow row = (XSSFRow)it.next();
-            int rownum = row.getRowNum();
-
-            if(sheetComments != null){
-                // calculate the new rownum
-                int newrownum = shiftedRowNum(startRow, endRow, n, rownum);
-                
-                // is there a change necessary for the current row?
-                if(newrownum != rownum) {
-                    CTCommentList lst = sheetComments.getCTComments().getCommentList();
-                    for (CTComment comment : lst.getCommentArray()) {
-                        String oldRef = comment.getRef();
-                        CellReference ref = new CellReference(oldRef);
-                        
-                        // is this comment part of the current row?
-                        if(ref.getRow() == rownum) {
-                            XSSFComment xssfComment = new XSSFComment(sheetComments, comment,
-                                    vml == null ? null : vml.findCommentShape(rownum, ref.getCol()));
-                            
-                            // we should not perform the shifting right here as we would then find
-                            // already shifted comments and would shift them again...
-                            commentsToShift.put(xssfComment, newrownum);
-                        }
-                    }
-                }
-            }
-
-            if(rownum < startRow || rownum > endRow) continue;
-
-            if (!copyRowHeight) {
-                row.setHeight((short)-1);
-            }
-
-            row.shift(n);
-        }
-        
-        // adjust all the affected comment-structures now
-        // the Map is sorted and thus provides them in the order that we need here, 
-        // i.e. from down to up if shifting down, vice-versa otherwise
-        for(Map.Entry<XSSFComment, Integer> entry : commentsToShift.entrySet()) {
-            entry.getKey().setRow(entry.getValue());
-        }
-        
-        XSSFRowShifter rowShifter = new XSSFRowShifter(this);
-
-        int sheetIndex = getWorkbook().getSheetIndex(this);
-        String sheetName = getWorkbook().getSheetName(sheetIndex);
-        FormulaShifter shifter = FormulaShifter.createForRowShift(
-                                   sheetIndex, sheetName, startRow, endRow, n, SpreadsheetVersion.EXCEL2007);
-
-        rowShifter.updateNamedRanges(shifter);
-        rowShifter.updateFormulas(shifter);
-        rowShifter.shiftMergedRegions(startRow, endRow, n);
-        rowShifter.updateConditionalFormatting(shifter);
-        rowShifter.updateHyperlinks(shifter);
-
-        //rebuild the _rows map
-        Map<Integer, XSSFRow> map = new HashMap<Integer, XSSFRow>();
-        for(XSSFRow r : _rows.values()) {
-            // Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-            final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
-            map.put(rownumI, r);
-        }
-        _rows.clear();
-        _rows.putAll(map);
-    }
-
-    private int shiftedRowNum(int startRow, int endRow, int n, int rownum) {
-        // no change if before any affected row
-        if(rownum < startRow && (n > 0 || (startRow - rownum) > n)) {
-            return rownum;
-        }
-        
-        // no change if after any affected row
-        if(rownum > endRow && (n < 0 || (rownum - endRow) > n)) {
-            return rownum;
-        }
-        
-        // row before and things are moved up
-        if(rownum < startRow) {
-            // row is moved down by the shifting
-            return rownum + (endRow - startRow);
-        }
-        
-        // row is after and things are moved down
-        if(rownum > endRow) {
-            // row is moved up by the shifting
-            return rownum - (endRow - startRow);
-        }
-        
-        // row is part of the shifted block
-        return rownum + n;
-    }
-
-    /**
-     * Location of the top left visible cell Location of the top left visible cell in the bottom right
-     * pane (when in Left-to-Right mode).
-     *
-     * @param toprow the top row to show in desktop window pane
-     * @param leftcol the left column to show in desktop window pane
-     */
-    @Override
-    public void showInPane(int toprow, int leftcol) {
-        CellReference cellReference = new CellReference(toprow, leftcol);
-        String cellRef = cellReference.formatAsString();
-        getPane().setTopLeftCell(cellRef);
-    }
-
-    @Override
-    public void ungroupColumn(int fromColumn, int toColumn) {
-        CTCols cols = worksheet.getColsArray(0);
-        for (int index = fromColumn; index <= toColumn; index++) {
-            CTCol col = columnHelper.getColumn(index, false);
-            if (col != null) {
-                short outlineLevel = col.getOutlineLevel();
-                col.setOutlineLevel((short) (outlineLevel - 1));
-                index = (int) col.getMax();
-
-                if (col.getOutlineLevel() <= 0) {
-                    int colIndex = columnHelper.getIndexOfColumn(cols, col);
-                    worksheet.getColsArray(0).removeCol(colIndex);
-                }
-            }
-        }
-        worksheet.setColsArray(0, cols);
-        setSheetFormatPrOutlineLevelCol();
-    }
-
-    /**
-     * Ungroup a range of rows that were previously groupped
-     *
-     * @param fromRow   start row (0-based)
-     * @param toRow     end row (0-based)
-     */
-    @Override
-    public void ungroupRow(int fromRow, int toRow) {
-        for (int i = fromRow; i <= toRow; i++) {
-            XSSFRow xrow = getRow(i);
-            if (xrow != null) {
-                CTRow ctRow = xrow.getCTRow();
-                int outlineLevel = ctRow.getOutlineLevel();
-                ctRow.setOutlineLevel((short) (outlineLevel - 1));
-                //remove a row only if the row has no cell and if the outline level is 0
-                if (outlineLevel == 1 && xrow.getFirstCellNum() == -1) {
-                    removeRow(xrow);
-                }
-            }
-        }
-        setSheetFormatPrOutlineLevelRow();
-    }
-
-    private void setSheetFormatPrOutlineLevelRow(){
-        short maxLevelRow=getMaxOutlineLevelRows();
-        getSheetTypeSheetFormatPr().setOutlineLevelRow(maxLevelRow);
-    }
-
-    private void setSheetFormatPrOutlineLevelCol(){
-        short maxLevelCol=getMaxOutlineLevelCols();
-        getSheetTypeSheetFormatPr().setOutlineLevelCol(maxLevelCol);
-    }
-
-    private CTSheetViews getSheetTypeSheetViews() {
-        if (worksheet.getSheetViews() == null) {
-            worksheet.setSheetViews(CTSheetViews.Factory.newInstance());
-            worksheet.getSheetViews().addNewSheetView();
-        }
-        return worksheet.getSheetViews();
-    }
-
-    /**
-     * Returns a flag indicating whether this sheet is selected.
-     * <p>
-     * When only 1 sheet is selected and active, this value should be in synch with the activeTab value.
-     * In case of a conflict, the Start Part setting wins and sets the active sheet tab.
-     * </p>
-     * Note: multiple sheets can be selected, but only one sheet can be active at one time.
-     *
-     * @return <code>true</code> if this sheet is selected
-     */
-    @Override
-    public boolean isSelected() {
-        CTSheetView view = getDefaultSheetView();
-        return view != null && view.getTabSelected();
-    }
-
-    /**
-     * Sets a flag indicating whether this sheet is selected.
-     *
-     * <p>
-     * When only 1 sheet is selected and active, this value should be in synch with the activeTab value.
-     * In case of a conflict, the Start Part setting wins and sets the active sheet tab.
-     * </p>
-     * Note: multiple sheets can be selected, but only one sheet can be active at one time.
-     *
-     * @param value <code>true</code> if this sheet is selected
-     */
-    @Override
-    public void setSelected(boolean value) {
-        CTSheetViews views = getSheetTypeSheetViews();
-        for (CTSheetView view : views.getSheetViewArray()) {
-            view.setTabSelected(value);
-        }
-    }
-
-    /**
-     * Register a hyperlink in the collection of hyperlinks on this sheet
-     *
-     * @param hyperlink the link to add
-     */
-    @Internal
-    public void addHyperlink(XSSFHyperlink hyperlink) {
-        hyperlinks.add(hyperlink);
-    }
-
-    /**
-     * Removes a hyperlink in the collection of hyperlinks on this sheet
-     *
-     * @param row row index
-     * @param column column index
-     */
-    @Internal
-    public void removeHyperlink(int row, int column) {
-        // CTHyperlinks is regenerated from scratch when writing out the spreadsheet
-        // so don't worry about maintaining hyperlinks and CTHyperlinks in parallel.
-        // only maintain hyperlinks
-        String ref = new CellReference(row, column).formatAsString();
-        for (Iterator<XSSFHyperlink> it = hyperlinks.iterator(); it.hasNext();) {
-            XSSFHyperlink hyperlink = it.next();
-            if (hyperlink.getCellRef().equals(ref)) {
-                it.remove();
-                return;
-            }
-        }
-    }
-
-    /**
-     * Return location of the active cell, e.g. <code>A1</code>.
-     *
-     * @return the location of the active cell.
-     */
-    @Override
-    public CellAddress getActiveCell() {
-        String address = getSheetTypeSelection().getActiveCell();
-        if (address == null) {
-            return null;
-        }
-        return new CellAddress(address);
-    }
-
-    /**
-     * Sets location of the active cell
-     *
-     * @param cellRef the location of the active cell, e.g. <code>A1</code>..
-     * @deprecated 3.14beta2 (circa 2015-12-05). Use {@link #setActiveCell(CellAddress)} instead.
-     */
-    public void setActiveCell(String cellRef) {
-        CTSelection ctsel = getSheetTypeSelection();
-        ctsel.setActiveCell(cellRef);
-        ctsel.setSqref(Arrays.asList(cellRef));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setActiveCell(CellAddress address) {
-        String ref = address.formatAsString();
-        CTSelection ctsel = getSheetTypeSelection();
-        ctsel.setActiveCell(ref);
-        ctsel.setSqref(Arrays.asList(ref));
-    }
-
-    /**
-     * Does this sheet have any comments on it? We need to know,
-     *  so we can decide about writing it to disk or not
-     */
-    public boolean hasComments() {
-        return sheetComments != null && sheetComments.getNumberOfComments() > 0;
-    }
-
-    protected int getNumberOfComments() {
-        return sheetComments == null ? 0 : sheetComments.getNumberOfComments();
-    }
-
-    private CTSelection getSheetTypeSelection() {
-        if (getSheetTypeSheetView().sizeOfSelectionArray() == 0) {
-            getSheetTypeSheetView().insertNewSelection(0);
-        }
-        return getSheetTypeSheetView().getSelectionArray(0);
-    }
-
-    /**
-     * Return the default sheet view. This is the last one if the sheet's views, according to sec. 3.3.1.83
-     * of the OOXML spec: "A single sheet view definition. When more than 1 sheet view is defined in the file,
-     * it means that when opening the workbook, each sheet view corresponds to a separate window within the
-     * spreadsheet application, where each window is showing the particular sheet. containing the same
-     * workbookViewId value, the last sheetView definition is loaded, and the others are discarded.
-     * When multiple windows are viewing the same sheet, multiple sheetView elements (with corresponding
-     * workbookView entries) are saved."
-     */
-    private CTSheetView getDefaultSheetView() {
-        CTSheetViews views = getSheetTypeSheetViews();
-        int sz = views == null ? 0 : views.sizeOfSheetViewArray();
-        if (sz  == 0) {
-            return null;
-        }
-        return views.getSheetViewArray(sz - 1);
-    }
-
-    /**
-     * Returns the sheet's comments object if there is one,
-     *  or null if not
-     *
-     * @param create create a new comments table if it does not exist
-     */
-    protected CommentsTable getCommentsTable(boolean create) {
-        if(sheetComments == null && create){
-           // Try to create a comments table with the same number as
-           //  the sheet has (i.e. sheet 1 -> comments 1)
-           try {
-              sheetComments = (CommentsTable)createRelationship(
-                    XSSFRelation.SHEET_COMMENTS, XSSFFactory.getInstance(), (int)sheet.getSheetId());
-           } catch(PartAlreadyExistsException e) {
-              // Technically a sheet doesn't need the same number as
-              //  it's comments, and clearly someone has already pinched
-              //  our number! Go for the next available one instead
-              sheetComments = (CommentsTable)createRelationship(
-                    XSSFRelation.SHEET_COMMENTS, XSSFFactory.getInstance(), -1);
-           }
-        }
-        return sheetComments;
-    }
-
-    private CTPageSetUpPr getSheetTypePageSetUpPr() {
-        CTSheetPr sheetPr = getSheetTypeSheetPr();
-        return sheetPr.isSetPageSetUpPr() ? sheetPr.getPageSetUpPr() : sheetPr.addNewPageSetUpPr();
-    }
-
-    private static boolean shouldRemoveRow(int startRow, int endRow, int n, int rownum) {
-        // is this row in the target-window where the moved rows will land?
-        if (rownum >= (startRow + n) && rownum <= (endRow + n)) {
-            // only remove it if the current row is not part of the data that is copied
-            if (n > 0 && rownum > endRow) {
-                return true;
-            }
-            else if (n < 0 && rownum < startRow) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private CTPane getPane() {
-        if (getDefaultSheetView().getPane() == null) {
-            getDefaultSheetView().addNewPane();
-        }
-        return getDefaultSheetView().getPane();
-    }
-
-    /**
-     * Return a master shared formula by index
-     *
-     * @param sid shared group index
-     * @return a CTCellFormula bean holding shared formula or <code>null</code> if not found
-     */
-    @Internal
-    public CTCellFormula getSharedFormula(int sid){
-        return sharedFormulas.get(sid);
-    }
-
-    void onReadCell(XSSFCell cell){
-        //collect cells holding shared formulas
-        CTCell ct = cell.getCTCell();
-        CTCellFormula f = ct.getF();
-        if (f != null && f.getT() == STCellFormulaType.SHARED && f.isSetRef() && f.getStringValue() != null) {
-            // save a detached  copy to avoid XmlValueDisconnectedException,
-            // this may happen when the master cell of a shared formula is changed
-            CTCellFormula sf = (CTCellFormula)f.copy();
-            CellRangeAddress sfRef = CellRangeAddress.valueOf(sf.getRef());
-            CellReference cellRef = new CellReference(cell);
-            // If the shared formula range precedes the master cell then the preceding  part is discarded, e.g.
-            // if the cell is E60 and the shared formula range is C60:M85 then the effective range is E60:M85
-            // see more details in https://issues.apache.org/bugzilla/show_bug.cgi?id=51710
-            if(cellRef.getCol() > sfRef.getFirstColumn() || cellRef.getRow() > sfRef.getFirstRow()){
-                String effectiveRef = new CellRangeAddress(
-                        Math.max(cellRef.getRow(), sfRef.getFirstRow()), sfRef.getLastRow(),
-                        Math.max(cellRef.getCol(), sfRef.getFirstColumn()), sfRef.getLastColumn()).formatAsString();
-                sf.setRef(effectiveRef);
-            }
-
-            sharedFormulas.put((int)f.getSi(), sf);
-        }
-        if (f != null && f.getT() == STCellFormulaType.ARRAY && f.getRef() != null) {
-            arrayFormulas.add(CellRangeAddress.valueOf(f.getRef()));
-        }
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        write(out);
-        out.close();
-    }
-
-    protected void write(OutputStream out) throws IOException {
-        boolean setToNull = false;
-        if(worksheet.sizeOfColsArray() == 1) {
-            CTCols col = worksheet.getColsArray(0);
-            if(col.sizeOfColArray() == 0) {
-                setToNull = true;
-                // this is necessary so that we do not write an empty <cols/> item into the sheet-xml in the xlsx-file
-                // Excel complains about a corrupted file if this shows up there!
-                worksheet.setColsArray(null);
-            } else {
-                setColWidthAttribute(col);
-            }
-        }
-
-        // Now re-generate our CTHyperlinks, if needed
-        if(hyperlinks.size() > 0) {
-            if(worksheet.getHyperlinks() == null) {
-                worksheet.addNewHyperlinks();
-            }
-            CTHyperlink[] ctHls = new CTHyperlink[hyperlinks.size()];
-            for(int i=0; i<ctHls.length; i++) {
-                // If our sheet has hyperlinks, have them add
-                //  any relationships that they might need
-                XSSFHyperlink hyperlink = hyperlinks.get(i);
-                hyperlink.generateRelationIfNeeded(getPackagePart());
-                // Now grab their underling object
-                ctHls[i] = hyperlink.getCTHyperlink();
-            }
-            worksheet.getHyperlinks().setHyperlinkArray(ctHls);
-        }
-
-        int minCell=Integer.MAX_VALUE, maxCell=Integer.MIN_VALUE;
-        for(XSSFRow row : _rows.values()){
-            // first perform the normal write actions for the row
-            row.onDocumentWrite();
-
-            // then calculate min/max cell-numbers for the worksheet-dimension
-            if(row.getFirstCellNum() != -1) {
-                minCell = Math.min(minCell, row.getFirstCellNum());
-            }
-            if(row.getLastCellNum() != -1) {
-                maxCell = Math.max(maxCell, row.getLastCellNum());
-            }
-        }
-
-        // finally, if we had at least one cell we can populate the optional dimension-field
-        if(minCell != Integer.MAX_VALUE) {
-            String ref = new CellRangeAddress(getFirstRowNum(), getLastRowNum(), minCell, maxCell).formatAsString();
-            if(worksheet.isSetDimension()) {
-                worksheet.getDimension().setRef(ref);
-            } else {
-                worksheet.addNewDimension().setRef(ref);
-            }
-        }
-
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTWorksheet.type.getName().getNamespaceURI(), "worksheet"));
-
-        worksheet.save(out, xmlOptions);
-
-        // Bug 52233: Ensure that we have a col-array even if write() removed it
-        if(setToNull) {
-            worksheet.addNewCols();
-        }
-    }
-
-    /**
-     * @return true when Autofilters are locked and the sheet is protected.
-     */
-    public boolean isAutoFilterLocked() {
-        return isSheetLocked() && safeGetProtectionField().getAutoFilter();
-    }
-
-    /**
-     * @return true when Deleting columns is locked and the sheet is protected.
-     */
-    public boolean isDeleteColumnsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getDeleteColumns();
-    }
-
-    /**
-     * @return true when Deleting rows is locked and the sheet is protected.
-     */
-    public boolean isDeleteRowsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getDeleteRows();
-    }
-
-    /**
-     * @return true when Formatting cells is locked and the sheet is protected.
-     */
-    public boolean isFormatCellsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getFormatCells();
-    }
-
-    /**
-     * @return true when Formatting columns is locked and the sheet is protected.
-     */
-    public boolean isFormatColumnsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getFormatColumns();
-    }
-
-    /**
-     * @return true when Formatting rows is locked and the sheet is protected.
-     */
-    public boolean isFormatRowsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getFormatRows();
-    }
-
-    /**
-     * @return true when Inserting columns is locked and the sheet is protected.
-     */
-    public boolean isInsertColumnsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getInsertColumns();
-    }
-
-    /**
-     * @return true when Inserting hyperlinks is locked and the sheet is protected.
-     */
-    public boolean isInsertHyperlinksLocked() {
-        return isSheetLocked() && safeGetProtectionField().getInsertHyperlinks();
-    }
-
-    /**
-     * @return true when Inserting rows is locked and the sheet is protected.
-     */
-    public boolean isInsertRowsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getInsertRows();
-    }
-
-    /**
-     * @return true when Pivot tables are locked and the sheet is protected.
-     */
-    public boolean isPivotTablesLocked() {
-        return isSheetLocked() && safeGetProtectionField().getPivotTables();
-    }
-
-    /**
-     * @return true when Sorting is locked and the sheet is protected.
-     */
-    public boolean isSortLocked() {
-        return isSheetLocked() && safeGetProtectionField().getSort();
-    }
-
-    /**
-     * @return true when Objects are locked and the sheet is protected.
-     */
-    public boolean isObjectsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getObjects();
-    }
-
-    /**
-     * @return true when Scenarios are locked and the sheet is protected.
-     */
-    public boolean isScenariosLocked() {
-        return isSheetLocked() && safeGetProtectionField().getScenarios();
-    }
-
-    /**
-     * @return true when Selection of locked cells is locked and the sheet is protected.
-     */
-    public boolean isSelectLockedCellsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getSelectLockedCells();
-    }
-
-    /**
-     * @return true when Selection of unlocked cells is locked and the sheet is protected.
-     */
-    public boolean isSelectUnlockedCellsLocked() {
-        return isSheetLocked() && safeGetProtectionField().getSelectUnlockedCells();
-    }
-
-    /**
-     * @return true when Sheet is Protected.
-     */
-    public boolean isSheetLocked() {
-        return worksheet.isSetSheetProtection() && safeGetProtectionField().getSheet();
-    }
-
-    /**
-     * Enable sheet protection
-     */
-    public void enableLocking() {
-        safeGetProtectionField().setSheet(true);
-    }
-
-    /**
-     * Disable sheet protection
-     */
-    public void disableLocking() {
-        safeGetProtectionField().setSheet(false);
-    }
-
-    /**
-     * Enable or disable Autofilters locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockAutoFilter(boolean enabled) {
-        safeGetProtectionField().setAutoFilter(enabled);
-    }
-
-    /**
-     * Enable or disable Deleting columns locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockDeleteColumns(boolean enabled) {
-        safeGetProtectionField().setDeleteColumns(enabled);
-    }
-
-    /**
-     * Enable or disable Deleting rows locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockDeleteRows(boolean enabled) {
-        safeGetProtectionField().setDeleteRows(enabled);
-    }
-
-    /**
-     * Enable or disable Formatting cells locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockFormatCells(boolean enabled) {
-        safeGetProtectionField().setFormatCells(enabled);
-    }
-
-    /**
-     * Enable or disable Formatting columns locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockFormatColumns(boolean enabled) {
-        safeGetProtectionField().setFormatColumns(enabled);
-    }
-
-    /**
-     * Enable or disable Formatting rows locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockFormatRows(boolean enabled) {
-        safeGetProtectionField().setFormatRows(enabled);
-    }
-
-    /**
-     * Enable or disable Inserting columns locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockInsertColumns(boolean enabled) {
-        safeGetProtectionField().setInsertColumns(enabled);
-    }
-
-    /**
-     * Enable or disable Inserting hyperlinks locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockInsertHyperlinks(boolean enabled) {
-        safeGetProtectionField().setInsertHyperlinks(enabled);
-    }
-
-    /**
-     * Enable or disable Inserting rows locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockInsertRows(boolean enabled) {
-        safeGetProtectionField().setInsertRows(enabled);
-    }
-
-    /**
-     * Enable or disable Pivot Tables locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockPivotTables(boolean enabled) {
-        safeGetProtectionField().setPivotTables(enabled);
-    }
-
-    /**
-     * Enable or disable Sort locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockSort(boolean enabled) {
-        safeGetProtectionField().setSort(enabled);
-    }
-
-    /**
-     * Enable or disable Objects locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockObjects(boolean enabled) {
-        safeGetProtectionField().setObjects(enabled);
-    }
-
-    /**
-     * Enable or disable Scenarios locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockScenarios(boolean enabled) {
-        safeGetProtectionField().setScenarios(enabled);
-    }
-
-    /**
-     * Enable or disable Selection of locked cells locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockSelectLockedCells(boolean enabled) {
-        safeGetProtectionField().setSelectLockedCells(enabled);
-    }
-
-    /**
-     * Enable or disable Selection of unlocked cells locking.
-     * This does not modify sheet protection status.
-     * To enforce this un-/locking, call {@link #disableLocking()} or {@link #enableLocking()}
-     */
-    public void lockSelectUnlockedCells(boolean enabled) {
-        safeGetProtectionField().setSelectUnlockedCells(enabled);
-    }
-
-    private CTSheetProtection safeGetProtectionField() {
-        if (!isSheetProtectionEnabled()) {
-            return worksheet.addNewSheetProtection();
-        }
-        return worksheet.getSheetProtection();
-    }
-
-    /* package */ boolean isSheetProtectionEnabled() {
-        return (worksheet.isSetSheetProtection());
-    }
-
-    /* package */ boolean isCellInArrayFormulaContext(XSSFCell cell) {
-        for (CellRangeAddress range : arrayFormulas) {
-            if (range.isInRange(cell.getRowIndex(), cell.getColumnIndex())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /* package */ XSSFCell getFirstCellInArrayFormula(XSSFCell cell) {
-        for (CellRangeAddress range : arrayFormulas) {
-            if (range.isInRange(cell.getRowIndex(), cell.getColumnIndex())) {
-                return getRow(range.getFirstRow()).getCell(range.getFirstColumn());
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Also creates cells if they don't exist
-     */
-    private CellRange<XSSFCell> getCellRange(CellRangeAddress range) {
-        int firstRow = range.getFirstRow();
-        int firstColumn = range.getFirstColumn();
-        int lastRow = range.getLastRow();
-        int lastColumn = range.getLastColumn();
-        int height = lastRow - firstRow + 1;
-        int width = lastColumn - firstColumn + 1;
-        List<XSSFCell> temp = new ArrayList<XSSFCell>(height*width);
-        for (int rowIn = firstRow; rowIn <= lastRow; rowIn++) {
-            for (int colIn = firstColumn; colIn <= lastColumn; colIn++) {
-                XSSFRow row = getRow(rowIn);
-                if (row == null) {
-                    row = createRow(rowIn);
-                }
-                XSSFCell cell = row.getCell(colIn);
-                if (cell == null) {
-                    cell = row.createCell(colIn);
-                }
-                temp.add(cell);
-            }
-        }
-        return SSCellRange.create(firstRow, firstColumn, height, width, temp, XSSFCell.class);
-    }
-
-    @Override
-    public CellRange<XSSFCell> setArrayFormula(String formula, CellRangeAddress range) {
-
-        CellRange<XSSFCell> cr = getCellRange(range);
-
-        XSSFCell mainArrayFormulaCell = cr.getTopLeftCell();
-        mainArrayFormulaCell.setCellArrayFormula(formula, range);
-        arrayFormulas.add(range);
-        return cr;
-    }
-
-    @Override
-    public CellRange<XSSFCell> removeArrayFormula(Cell cell) {
-        if (cell.getSheet() != this) {
-            throw new IllegalArgumentException("Specified cell does not belong to this sheet.");
-        }
-        for (CellRangeAddress range : arrayFormulas) {
-            if (range.isInRange(cell.getRowIndex(), cell.getColumnIndex())) {
-                arrayFormulas.remove(range);
-                CellRange<XSSFCell> cr = getCellRange(range);
-                for (XSSFCell c : cr) {
-                    c.setCellType(CellType.BLANK);
-                }
-                return cr;
-            }
-        }
-        String ref = ((XSSFCell)cell).getCTCell().getR();
-        throw new IllegalArgumentException("Cell " + ref + " is not part of an array formula.");
-    }
-
-
-    @Override
-    public DataValidationHelper getDataValidationHelper() {
-        return dataValidationHelper;
-    }
-
-    public List<XSSFDataValidation> getDataValidations() {
-        List<XSSFDataValidation> xssfValidations = new ArrayList<XSSFDataValidation>();
-        CTDataValidations dataValidations = this.worksheet.getDataValidations();
-        if( dataValidations!=null && dataValidations.getCount() > 0 ) {
-            for (CTDataValidation ctDataValidation : dataValidations.getDataValidationArray()) {
-                CellRangeAddressList addressList = new CellRangeAddressList();
-
-                @SuppressWarnings("unchecked")
-                List<String> sqref = ctDataValidation.getSqref();
-                for (String stRef : sqref) {
-                    String[] regions = stRef.split(" ");
-                    for (String region : regions) {
-                        String[] parts = region.split(":");
-                        CellReference begin = new CellReference(parts[0]);
-                        CellReference end = parts.length > 1 ? new CellReference(parts[1]) : begin;
-                        CellRangeAddress cellRangeAddress = new CellRangeAddress(begin.getRow(), end.getRow(), begin.getCol(), end.getCol());
-                        addressList.addCellRangeAddress(cellRangeAddress);
-                    }
-                }
-                XSSFDataValidation xssfDataValidation = new XSSFDataValidation(addressList, ctDataValidation);
-                xssfValidations.add(xssfDataValidation);
-            }
-        }
-        return xssfValidations;
-    }
-
-    @Override
-    public void addValidationData(DataValidation dataValidation) {
-        XSSFDataValidation xssfDataValidation = (XSSFDataValidation)dataValidation;
-        CTDataValidations dataValidations = worksheet.getDataValidations();
-        if( dataValidations==null ) {
-            dataValidations = worksheet.addNewDataValidations();
-        }
-        int currentCount = dataValidations.sizeOfDataValidationArray();
-        CTDataValidation newval = dataValidations.addNewDataValidation();
-        newval.set(xssfDataValidation.getCtDdataValidation());
-        dataValidations.setCount(currentCount + 1);
-
-    }
-
-    @SuppressWarnings("resource")
-    @Override
-    public XSSFAutoFilter setAutoFilter(CellRangeAddress range) {
-        CTAutoFilter af = worksheet.getAutoFilter();
-        if(af == null) af = worksheet.addNewAutoFilter();
-
-        CellRangeAddress norm = new CellRangeAddress(range.getFirstRow(), range.getLastRow(),
-                range.getFirstColumn(), range.getLastColumn());
-        String ref = norm.formatAsString();
-        af.setRef(ref);
-
-        XSSFWorkbook wb = getWorkbook();
-        int sheetIndex = getWorkbook().getSheetIndex(this);
-        XSSFName name = wb.getBuiltInName(XSSFName.BUILTIN_FILTER_DB, sheetIndex);
-        if (name == null) {
-            name = wb.createBuiltInName(XSSFName.BUILTIN_FILTER_DB, sheetIndex);
-        }
-
-        name.getCTName().setHidden(true);
-        CellReference r1 = new CellReference(getSheetName(), range.getFirstRow(), range.getFirstColumn(), true, true);
-        CellReference r2 = new CellReference(null, range.getLastRow(), range.getLastColumn(), true, true);
-        String fmla = r1.formatAsString() + ":" + r2.formatAsString();
-        name.setRefersToFormula(fmla);
-
-        return new XSSFAutoFilter(this);
-    }
-
-    /**
-     * Creates a new Table, and associates it with this Sheet
-     */
-    public XSSFTable createTable() {
-       if(! worksheet.isSetTableParts()) {
-          worksheet.addNewTableParts();
-       }
-
-       CTTableParts tblParts = worksheet.getTableParts();
-       CTTablePart tbl = tblParts.addNewTablePart();
-
-       // Table numbers need to be unique in the file, not just
-       //  unique within the sheet. Find the next one
-       int tableNumber = getPackagePart().getPackage().getPartsByContentType(XSSFRelation.TABLE.getContentType()).size() + 1;
-       RelationPart rp = createRelationship(XSSFRelation.TABLE, XSSFFactory.getInstance(), tableNumber, false);
-       XSSFTable table = rp.getDocumentPart();
-       tbl.setId(rp.getRelationship().getId());
-
-       tables.put(tbl.getId(), table);
-
-       return table;
-    }
-
-    /**
-     * Returns any tables associated with this Sheet
-     */
-    public List<XSSFTable> getTables() {
-        return new ArrayList<XSSFTable>(tables.values());
-    }
-
-    @Override
-    public XSSFSheetConditionalFormatting getSheetConditionalFormatting(){
-        return new XSSFSheetConditionalFormatting(this);
-    }
-    
-    /**
-     * Get background color of the sheet tab.
-     * Returns <tt>null</tt> if no sheet tab color is set.
-     *
-     * @return the background color of the sheet tab
-     */
-    public XSSFColor getTabColor() {
-        CTSheetPr pr = worksheet.getSheetPr();
-        if(pr == null) pr = worksheet.addNewSheetPr();
-        if (!pr.isSetTabColor()) {
-            return null;
-        }
-        return new XSSFColor(pr.getTabColor());
-    }
-
-    /**
-     * Set background color of the sheet tab
-     *
-     * @param colorIndex  the indexed color to set, must be a constant from {@link org.apache.poi.ss.usermodel.IndexedColors}
-     * @deprecated 3.15-beta2. Removed in 3.17. Use {@link #setTabColor(XSSFColor)}.
-     */
-    public void setTabColor(int colorIndex) {
-        IndexedColors indexedColor = IndexedColors.fromInt(colorIndex);
-        XSSFColor color = new XSSFColor(indexedColor);
-        setTabColor(color);
-    }
-    
-    /**
-     * Set background color of the sheet tab
-     *
-     * @param color the color to set
-     */
-    public void setTabColor(XSSFColor color) {
-        CTSheetPr pr = worksheet.getSheetPr();
-        if(pr == null) pr = worksheet.addNewSheetPr();
-        pr.setTabColor(color.getCTColor());
-    }
-
-    @Override
-    public CellRangeAddress getRepeatingRows() {
-      return getRepeatingRowsOrColums(true);
-    }
-
-
-    @Override
-    public CellRangeAddress getRepeatingColumns() {
-      return getRepeatingRowsOrColums(false);
-    }
-
-    @Override
-    public void setRepeatingRows(CellRangeAddress rowRangeRef) {
-      CellRangeAddress columnRangeRef = getRepeatingColumns();
-      setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
-    }
-
-
-    @Override
-    public void setRepeatingColumns(CellRangeAddress columnRangeRef) {
-      CellRangeAddress rowRangeRef = getRepeatingRows();
-      setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
-    }
-
-
-    private void setRepeatingRowsAndColumns(
-        CellRangeAddress rowDef, CellRangeAddress colDef) {
-      int col1 = -1;
-      int col2 =  -1;
-      int row1 = -1;
-      int row2 =  -1;
-
-      if (rowDef != null) {
-        row1 = rowDef.getFirstRow();
-        row2 = rowDef.getLastRow();
-        if ((row1 == -1 && row2 != -1)
-            || row1 < -1 || row2 < -1 || row1 > row2) {
-          throw new IllegalArgumentException("Invalid row range specification");
-        }
-      }
-      if (colDef != null) {
-        col1 = colDef.getFirstColumn();
-        col2 = colDef.getLastColumn();
-        if ((col1 == -1 && col2 != -1)
-            || col1 < -1 || col2 < -1 || col1 > col2) {
-          throw new IllegalArgumentException(
-              "Invalid column range specification");
-        }
-      }
-
-      int sheetIndex = getWorkbook().getSheetIndex(this);
-
-      boolean removeAll = rowDef == null && colDef == null;
-
-      XSSFName name = getWorkbook().getBuiltInName(
-          XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
-      if (removeAll) {
-          if (name != null) {
-            getWorkbook().removeName(name);
-          }
-          return;
-      }
-      if (name == null) {
-          name = getWorkbook().createBuiltInName(
-              XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
-      }
-
-      String reference = getReferenceBuiltInRecord(
-          name.getSheetName(), col1, col2, row1, row2);
-      name.setRefersToFormula(reference);
-
-      // If the print setup isn't currently defined, then add it
-      //  in but without printer defaults
-      // If it's already there, leave it as-is!
-      if (worksheet.isSetPageSetup() && worksheet.isSetPageMargins()) {
-         // Everything we need is already there
-      } else {
-        // Have initial ones put in place
-        getPrintSetup().setValidSettings(false);
-      }
-    }
-
-    private static String getReferenceBuiltInRecord(
-        String sheetName, int startC, int endC, int startR, int endR) {
-        // Excel example for built-in title:
-        //   'second sheet'!$E:$F,'second sheet'!$2:$3
-
-        CellReference colRef =
-          new CellReference(sheetName, 0, startC, true, true);
-        CellReference colRef2 =
-          new CellReference(sheetName, 0, endC, true, true);
-        CellReference rowRef =
-          new CellReference(sheetName, startR, 0, true, true);
-        CellReference rowRef2 =
-          new CellReference(sheetName, endR, 0, true, true);
-
-        String escapedName = SheetNameFormatter.format(sheetName);
-
-        String c = "";
-        String r = "";
-
-        if (startC != -1 || endC != -1) {
-          String col1 = colRef.getCellRefParts()[2];
-          String col2 = colRef2.getCellRefParts()[2];
-          c = escapedName + "!$" + col1 + ":$" + col2;
-        }
-
-        if (startR != -1 || endR != -1) {
-            String row1 = rowRef.getCellRefParts()[1];
-            String row2 = rowRef2.getCellRefParts()[1];
-            if (!row1.equals("0") && !row2.equals("0")) {
-               r = escapedName + "!$" + row1 + ":$" + row2;
-            }
-        }
-
-        StringBuilder rng = new StringBuilder();
-        rng.append(c);
-        if(rng.length() > 0 && r.length() > 0) {
-          rng.append(',');
-        }
-        rng.append(r);
-        return rng.toString();
-    }
-
-
-    private CellRangeAddress getRepeatingRowsOrColums(boolean rows) {
-      int sheetIndex = getWorkbook().getSheetIndex(this);
-      XSSFName name = getWorkbook().getBuiltInName(
-          XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
-      if (name == null ) {
-        return null;
-      }
-      String refStr = name.getRefersToFormula();
-      if (refStr == null) {
-        return null;
-      }
-      String[] parts = refStr.split(",");
-      int maxRowIndex = SpreadsheetVersion.EXCEL2007.getLastRowIndex();
-      int maxColIndex = SpreadsheetVersion.EXCEL2007.getLastColumnIndex();
-      for (String part : parts) {
-        CellRangeAddress range = CellRangeAddress.valueOf(part);
-        if ((range.getFirstColumn() == 0
-            && range.getLastColumn() == maxColIndex)
-            || (range.getFirstColumn() == -1
-                && range.getLastColumn() == -1)) {
-          if (rows) {
-            return range;
-          }
-        } else if (range.getFirstRow() == 0
-            && range.getLastRow() == maxRowIndex
-            || (range.getFirstRow() == -1
-                && range.getLastRow() == -1)) {
-          if (!rows) {
-            return range;
-          }
-        }
-      }
-      return null;
-    }
-
-    /**
-     * Creates an empty XSSFPivotTable and sets up all its relationships
-     * including: pivotCacheDefinition, pivotCacheRecords
-     * @return returns a pivotTable
-     */
-    @SuppressWarnings("resource")
-    @Beta
-    private XSSFPivotTable createPivotTable() {
-        XSSFWorkbook wb = getWorkbook();
-        List<XSSFPivotTable> pivotTables = wb.getPivotTables();
-        int tableId = getWorkbook().getPivotTables().size()+1;
-        //Create relationship between pivotTable and the worksheet
-        XSSFPivotTable pivotTable = (XSSFPivotTable) createRelationship(XSSFRelation.PIVOT_TABLE,
-                XSSFFactory.getInstance(), tableId);
-        pivotTable.setParentSheet(this);
-        pivotTables.add(pivotTable);
-        XSSFWorkbook workbook = getWorkbook();
-
-        //Create relationship between the pivot cache defintion and the workbook
-        XSSFPivotCacheDefinition pivotCacheDefinition = (XSSFPivotCacheDefinition) workbook.
-                createRelationship(XSSFRelation.PIVOT_CACHE_DEFINITION, XSSFFactory.getInstance(), tableId);
-        String rId = workbook.getRelationId(pivotCacheDefinition);
-        //Create relationship between pivotTable and pivotCacheDefinition without creating a new instance
-        PackagePart pivotPackagePart = pivotTable.getPackagePart();
-        pivotPackagePart.addRelationship(pivotCacheDefinition.getPackagePart().getPartName(),
-                TargetMode.INTERNAL, XSSFRelation.PIVOT_CACHE_DEFINITION.getRelation());
-
-        pivotTable.setPivotCacheDefinition(pivotCacheDefinition);
-
-        //Create pivotCache and sets up it's relationship with the workbook
-        pivotTable.setPivotCache(new XSSFPivotCache(workbook.addPivotCache(rId)));
-
-        //Create relationship between pivotcacherecord and pivotcachedefinition
-        XSSFPivotCacheRecords pivotCacheRecords = (XSSFPivotCacheRecords) pivotCacheDefinition.
-                createRelationship(XSSFRelation.PIVOT_CACHE_RECORDS, XSSFFactory.getInstance(), tableId);
-
-        //Set relationships id for pivotCacheDefinition to pivotCacheRecords
-        pivotTable.getPivotCacheDefinition().getCTPivotCacheDefinition().setId(pivotCacheDefinition.getRelationId(pivotCacheRecords));
-
-        wb.setPivotTables(pivotTables);
-
-        return pivotTable;
-    }
-
-    /**
-     * Create a pivot table using the AreaReference range on sourceSheet, at the given position.
-     * If the source reference contains a sheet name, it must match the sourceSheet
-     * @param source location of pivot data
-     * @param position A reference to the top left cell where the pivot table will start
-     * @param sourceSheet The sheet containing the source data, if the source reference doesn't contain a sheet name
-     * @throws IllegalArgumentException if source references a sheet different than sourceSheet
-     * @return The pivot table
-     */
-    @Beta
-    public XSSFPivotTable createPivotTable(final AreaReference source, CellReference position, Sheet sourceSheet) {
-        final String sourceSheetName = source.getFirstCell().getSheetName();
-        if(sourceSheetName != null && !sourceSheetName.equalsIgnoreCase(sourceSheet.getSheetName())) {
-            throw new IllegalArgumentException("The area is referenced in another sheet than the "
-                    + "defined source sheet " + sourceSheet.getSheetName() + ".");
-        }
-
-        return createPivotTable(position, sourceSheet, new PivotTableReferenceConfigurator() {
-                public void configureReference(CTWorksheetSource wsSource) {
-                    final String[] firstCell = source.getFirstCell().getCellRefParts();
-                    final String firstRow = firstCell[1];
-                    final String firstCol = firstCell[2];
-                    final String[] lastCell = source.getLastCell().getCellRefParts();
-                    final String lastRow = lastCell[1];
-                    final String lastCol = lastCell[2];
-                    final String ref = firstCol+firstRow+':'+lastCol+lastRow; //or just source.formatAsString()
-                    wsSource.setRef(ref);
-                }
-            });
-        }
-        
-    /**
-     * Create a pivot table using the AreaReference or named/table range on sourceSheet, at the given position.
-     * If the source reference contains a sheet name, it must match the sourceSheet.
-     * @param position A reference to the top left cell where the pivot table will start
-     * @param sourceSheet The sheet containing the source data, if the source reference doesn't contain a sheet name
-     * @param refConfig A reference to the pivot table configurator
-     * @throws IllegalArgumentException if source references a sheet different than sourceSheet
-     * @return The pivot table
-     */
-    private XSSFPivotTable createPivotTable(CellReference position, Sheet sourceSheet, PivotTableReferenceConfigurator refConfig) {
-        
-        XSSFPivotTable pivotTable = createPivotTable();
-        //Creates default settings for the pivot table
-        pivotTable.setDefaultPivotTableDefinition();
-
-        //Set sources and references
-        pivotTable.createSourceReferences(position, sourceSheet, refConfig);
-
-        //Create cachefield/s and empty SharedItems - must be after creating references
-        pivotTable.getPivotCacheDefinition().createCacheFields(sourceSheet);
-        pivotTable.createDefaultDataColumns();
-
-        return pivotTable;
-    }
-
-    /**
-     * Create a pivot table using the AreaReference range, at the given position.
-     * If the source reference contains a sheet name, that sheet is used, otherwise this sheet is assumed as the source sheet.
-     * @param source location of pivot data
-     * @param position A reference to the top left cell where the pivot table will start
-     * @return The pivot table
-     */
-    @Beta
-    public XSSFPivotTable createPivotTable(AreaReference source, CellReference position){
-        final String sourceSheetName = source.getFirstCell().getSheetName();
-        if(sourceSheetName != null && !sourceSheetName.equalsIgnoreCase(this.getSheetName())) {
-            final XSSFSheet sourceSheet = getWorkbook().getSheet(sourceSheetName);
-            return createPivotTable(source, position, sourceSheet);
-        }
-        return createPivotTable(source, position, this);
-    }
-    
-    /**
-     * Create a pivot table using the Name range reference on sourceSheet, at the given position.
-     * If the source reference contains a sheet name, it must match the sourceSheet
-     * @param source location of pivot data
-     * @param position A reference to the top left cell where the pivot table will start
-     * @param sourceSheet The sheet containing the source data, if the source reference doesn't contain a sheet name
-     * @throws IllegalArgumentException if source references a sheet different than sourceSheet
-     * @return The pivot table
-     */
-    @Beta
-    public XSSFPivotTable createPivotTable(final Name source, CellReference position, Sheet sourceSheet) {
-        if(source.getSheetName() != null && !source.getSheetName().equals(sourceSheet.getSheetName())) {
-            throw new IllegalArgumentException("The named range references another sheet than the "
-                    + "defined source sheet " + sourceSheet.getSheetName() + ".");
-        }
-        
-        return createPivotTable(position, sourceSheet, new PivotTableReferenceConfigurator() {
-                public void configureReference(CTWorksheetSource wsSource) {
-                    wsSource.setName(source.getNameName());
-                }
-            });
-        }
-        
-    /**
-     * Create a pivot table using the Name range, at the given position.
-     * If the source reference contains a sheet name, that sheet is used, otherwise this sheet is assumed as the source sheet.
-     * @param source location of pivot data
-     * @param position A reference to the top left cell where the pivot table will start
-     * @return The pivot table
-     */
-    @Beta
-    public XSSFPivotTable createPivotTable(Name source, CellReference position) {
-        return createPivotTable(source, position, getWorkbook().getSheet(source.getSheetName()));
-    }
-    
-    /**
-     * Create a pivot table using the Table, at the given position.
-     * Tables are required to have a sheet reference, so no additional logic around reference sheet is needed.
-     * @param source location of pivot data
-     * @param position A reference to the top left cell where the pivot table will start
-     * @return The pivot table
-     */
-    @Beta
-    public XSSFPivotTable createPivotTable(final Table source, CellReference position) {
-       return createPivotTable(position, getWorkbook().getSheet(source.getSheetName()), new PivotTableReferenceConfigurator() {
-           public void configureReference(CTWorksheetSource wsSource) {
-               wsSource.setName(source.getName());
-           }
-       });
-    }
-    
-    /**
-     * Returns all the pivot tables for this Sheet
-     */
-    @Beta
-    public List<XSSFPivotTable> getPivotTables() {
-        List<XSSFPivotTable> tables = new ArrayList<XSSFPivotTable>();
-        for (XSSFPivotTable table : getWorkbook().getPivotTables()) {
-            if (table.getParent() == this) {
-                tables.add(table);
-            }
-        }
-        return tables;
-    }
-    
-    public int getColumnOutlineLevel(int columnIndex) {
-        CTCol col = columnHelper.getColumn(columnIndex, false);
-        if (col == null) {
-            return 0;
-        }
-        return col.getOutlineLevel();
-    }
-    
-    /**
-     * Add ignored errors (usually to suppress them in the UI of a consuming
-     * application).
-     *
-     * @param cell Cell.
-     * @param ignoredErrorTypes Types of error to ignore there.
-     */
-    public void addIgnoredErrors(CellReference cell, IgnoredErrorType... ignoredErrorTypes) {
-        addIgnoredErrors(cell.formatAsString(), ignoredErrorTypes);
-    }
-    
-    /**
-     * Ignore errors across a range of cells.
-     * 
-     * @param region Range of cells.
-     * @param ignoredErrorTypes Types of error to ignore there.
-     */
-    public void addIgnoredErrors(CellRangeAddress region, IgnoredErrorType... ignoredErrorTypes) {
-        region.validate(SpreadsheetVersion.EXCEL2007);
-        addIgnoredErrors(region.formatAsString(), ignoredErrorTypes);
-    }
-    
-    /**
-     * Returns the errors currently being ignored and the ranges
-     * where they are ignored.
-     *
-     * @return Map of error type to the range(s) where they are ignored.
-     */
-    public Map<IgnoredErrorType, Set<CellRangeAddress>> getIgnoredErrors() {
-        Map<IgnoredErrorType, Set<CellRangeAddress>> result = new LinkedHashMap<IgnoredErrorType, Set<CellRangeAddress>>();
-        if (worksheet.isSetIgnoredErrors()) {
-            for (CTIgnoredError err : worksheet.getIgnoredErrors().getIgnoredErrorList()) {
-                for (IgnoredErrorType errType : XSSFIgnoredErrorHelper.getErrorTypes(err)) {
-                    if (!result.containsKey(errType)) {
-                        result.put(errType, new LinkedHashSet<CellRangeAddress>());
-                    }
-                    for (Object ref : err.getSqref()) {
-                        result.get(errType).add(CellRangeAddress.valueOf(ref.toString()));
-                    }
-                }
-            }
-        }
-        return result;
-    }
-    
-    private void addIgnoredErrors(String ref, IgnoredErrorType... ignoredErrorTypes) {
-        CTIgnoredErrors ctIgnoredErrors = worksheet.isSetIgnoredErrors() ? worksheet.getIgnoredErrors() : worksheet.addNewIgnoredErrors();
-        CTIgnoredError ctIgnoredError = ctIgnoredErrors.addNewIgnoredError();
-        XSSFIgnoredErrorHelper.addIgnoredErrors(ctIgnoredError, ref, ignoredErrorTypes);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
deleted file mode 100644
index a3781d2..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.ComparisonOperator;
-import org.apache.poi.ss.usermodel.ConditionalFormatting;
-import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
-import org.apache.poi.ss.usermodel.ExtendedColor;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeUtil;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCfRule;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTConditionalFormatting;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCfType;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STConditionalFormattingOperator;
-
-/**
- * XSSF Conditional Formattings
- */
-public class XSSFSheetConditionalFormatting implements SheetConditionalFormatting {
-    /** Office 2010 Conditional Formatting extensions namespace */
-    protected static final String CF_EXT_2009_NS_X14 = "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";
-
-    private final XSSFSheet _sheet;
-
-    /* package */ XSSFSheetConditionalFormatting(XSSFSheet sheet) {
-        _sheet = sheet;
-    }
-
-    /**
-     * A factory method allowing to create a conditional formatting rule
-     * with a cell comparison operator<p/>
-     * TODO - formulas containing cell references are currently not parsed properly
-     *
-     * @param comparisonOperation - a constant value from
-     *		 <tt>{@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator}</tt>: <p>
-     * <ul>
-     *		 <li>BETWEEN</li>
-     *		 <li>NOT_BETWEEN</li>
-     *		 <li>EQUAL</li>
-     *		 <li>NOT_EQUAL</li>
-     *		 <li>GT</li>
-     *		 <li>LT</li>
-     *		 <li>GE</li>
-     *		 <li>LE</li>
-     * </ul>
-     * </p>
-     * @param formula1 - formula for the valued, compared with the cell
-     * @param formula2 - second formula (only used with
-     * {@link org.apache.poi.ss.usermodel.ComparisonOperator#BETWEEN}) and
-     * {@link org.apache.poi.ss.usermodel.ComparisonOperator#NOT_BETWEEN} operations)
-     */
-    public XSSFConditionalFormattingRule createConditionalFormattingRule(
-            byte comparisonOperation,
-            String formula1,
-            String formula2) {
-
-        XSSFConditionalFormattingRule rule = new XSSFConditionalFormattingRule(_sheet);
-        CTCfRule cfRule = rule.getCTCfRule();
-        cfRule.addFormula(formula1);
-        if(formula2 != null) cfRule.addFormula(formula2);
-        cfRule.setType(STCfType.CELL_IS);
-        STConditionalFormattingOperator.Enum operator;
-        switch (comparisonOperation){
-            case ComparisonOperator.BETWEEN: operator = STConditionalFormattingOperator.BETWEEN; break;
-            case ComparisonOperator.NOT_BETWEEN: operator = STConditionalFormattingOperator.NOT_BETWEEN; break;
-            case ComparisonOperator.LT: operator = STConditionalFormattingOperator.LESS_THAN; break;
-            case ComparisonOperator.LE: operator = STConditionalFormattingOperator.LESS_THAN_OR_EQUAL; break;
-            case ComparisonOperator.GT: operator = STConditionalFormattingOperator.GREATER_THAN; break;
-            case ComparisonOperator.GE: operator = STConditionalFormattingOperator.GREATER_THAN_OR_EQUAL; break;
-            case ComparisonOperator.EQUAL: operator = STConditionalFormattingOperator.EQUAL; break;
-            case ComparisonOperator.NOT_EQUAL: operator = STConditionalFormattingOperator.NOT_EQUAL; break;
-            default: throw new IllegalArgumentException("Unknown comparison operator: " + comparisonOperation);
-        }
-        cfRule.setOperator(operator);
-
-        return rule;
-    }
-
-    public XSSFConditionalFormattingRule createConditionalFormattingRule(
-            byte comparisonOperation,
-            String formula) {
-
-        return createConditionalFormattingRule(comparisonOperation, formula, null);
-    }
-
-    /**
-     * A factory method allowing to create a conditional formatting rule with a formula.<br>
-     *
-     * @param formula - formula for the valued, compared with the cell
-     */
-    public XSSFConditionalFormattingRule createConditionalFormattingRule(String formula) {
-        XSSFConditionalFormattingRule rule = new XSSFConditionalFormattingRule(_sheet);
-        CTCfRule cfRule = rule.getCTCfRule();
-        cfRule.addFormula(formula);
-        cfRule.setType(STCfType.EXPRESSION);
-        return rule;
-    }
-
-    /**
-     * Create a Databar conditional formatting rule.
-     * <p>The thresholds and colour for it will be created, but will be 
-     *  empty and require configuring with 
-     *  {@link XSSFConditionalFormattingRule#getDataBarFormatting()}
-     *  then
-     *  {@link XSSFDataBarFormatting#getMinThreshold()}
-     *  and 
-     *  {@link XSSFDataBarFormatting#getMaxThreshold()}
-     */
-    public XSSFConditionalFormattingRule createConditionalFormattingRule(XSSFColor color) {
-        XSSFConditionalFormattingRule rule = new XSSFConditionalFormattingRule(_sheet);
-        
-        // Have it setup, with suitable defaults
-        rule.createDataBarFormatting(color);
-        
-        // All done!
-        return rule;
-    }
-    public XSSFConditionalFormattingRule createConditionalFormattingRule(ExtendedColor color) {
-        return createConditionalFormattingRule((XSSFColor)color);
-    }
-    
-    /**
-     * A factory method allowing the creation of conditional formatting
-     *  rules using an Icon Set / Multi-State formatting.
-     * The thresholds for it will be created, but will be empty
-     *  and require configuring with 
-     *  {@link XSSFConditionalFormattingRule#getMultiStateFormatting()}
-     *  then
-     *  {@link XSSFIconMultiStateFormatting#getThresholds()}
-     */
-    public XSSFConditionalFormattingRule createConditionalFormattingRule(IconSet iconSet) {
-        XSSFConditionalFormattingRule rule = new XSSFConditionalFormattingRule(_sheet);
-        
-        // Have it setup, with suitable defaults
-        rule.createMultiStateFormatting(iconSet);
-        
-        // All done!
-        return rule;
-    }
-
-    /**
-     * Create a Color Scale / Color Gradient conditional formatting rule.
-     * <p>The thresholds and colours for it will be created, but will be 
-     *  empty and require configuring with 
-     *  {@link XSSFConditionalFormattingRule#getColorScaleFormatting()}
-     *  then
-     *  {@link XSSFColorScaleFormatting#getThresholds()}
-     *  and
-     *  {@link XSSFColorScaleFormatting#getColors()}
-     */
-    public XSSFConditionalFormattingRule createConditionalFormattingColorScaleRule() {
-        XSSFConditionalFormattingRule rule = new XSSFConditionalFormattingRule(_sheet);
-        
-        // Have it setup, with suitable defaults
-        rule.createColorScaleFormatting();
-        
-        // All done!
-        return rule;
-    }
-    
-    public int addConditionalFormatting(CellRangeAddress[] regions, ConditionalFormattingRule[] cfRules) {
-        if (regions == null) {
-            throw new IllegalArgumentException("regions must not be null");
-        }
-        for(CellRangeAddress range : regions) range.validate(SpreadsheetVersion.EXCEL2007);
-
-        if (cfRules == null) {
-            throw new IllegalArgumentException("cfRules must not be null");
-        }
-        if (cfRules.length == 0) {
-            throw new IllegalArgumentException("cfRules must not be empty");
-        }
-        if (cfRules.length > 3) {
-            throw new IllegalArgumentException("Number of rules must not exceed 3");
-        }
-
-        CellRangeAddress[] mergeCellRanges = CellRangeUtil.mergeCellRanges(regions);
-        CTConditionalFormatting cf = _sheet.getCTWorksheet().addNewConditionalFormatting();
-        List<String> refs = new ArrayList<String>();
-        for(CellRangeAddress a : mergeCellRanges) refs.add(a.formatAsString());
-        cf.setSqref(refs);
-
-        int priority = 1;
-        for(CTConditionalFormatting c : _sheet.getCTWorksheet().getConditionalFormattingArray()){
-            priority += c.sizeOfCfRuleArray();
-        }
-
-        for(ConditionalFormattingRule rule : cfRules){
-            XSSFConditionalFormattingRule xRule = (XSSFConditionalFormattingRule)rule;
-            xRule.getCTCfRule().setPriority(priority++);
-            cf.addNewCfRule().set(xRule.getCTCfRule());
-        }
-        return _sheet.getCTWorksheet().sizeOfConditionalFormattingArray() - 1;
-    }
-
-    public int addConditionalFormatting(CellRangeAddress[] regions,
-            ConditionalFormattingRule rule1)
-    {
-        return addConditionalFormatting(regions,
-                rule1 == null ? null : new XSSFConditionalFormattingRule[] {
-                (XSSFConditionalFormattingRule)rule1
-        });
-    }
-
-    public int addConditionalFormatting(CellRangeAddress[] regions,
-            ConditionalFormattingRule rule1, ConditionalFormattingRule rule2)
-    {
-        return addConditionalFormatting(regions,
-                rule1 == null ? null : new XSSFConditionalFormattingRule[] {
-                    (XSSFConditionalFormattingRule)rule1,
-                    (XSSFConditionalFormattingRule)rule2
-            });
-    }
-
-    /**
-     * Adds a copy of HSSFConditionalFormatting object to the sheet
-     * <p>This method could be used to copy HSSFConditionalFormatting object
-     * from one sheet to another. For example:
-     * <pre>
-     * HSSFConditionalFormatting cf = sheet.getConditionalFormattingAt(index);
-     * newSheet.addConditionalFormatting(cf);
-     * </pre>
-     *
-     * @param cf HSSFConditionalFormatting object
-     * @return index of the new Conditional Formatting object
-     */
-    public int addConditionalFormatting( ConditionalFormatting cf ) {
-        XSSFConditionalFormatting xcf = (XSSFConditionalFormatting)cf;
-        CTWorksheet sh = _sheet.getCTWorksheet();
-        sh.addNewConditionalFormatting().set(xcf.getCTConditionalFormatting().copy());
-        return sh.sizeOfConditionalFormattingArray() - 1;
-    }
-
-    /**
-    * gets Conditional Formatting object at a particular index
-    *
-    * @param index
-    *			of the Conditional Formatting object to fetch
-    * @return Conditional Formatting object
-    */
-    public XSSFConditionalFormatting getConditionalFormattingAt(int index) {
-        checkIndex(index);
-        CTConditionalFormatting cf = _sheet.getCTWorksheet().getConditionalFormattingArray(index);
-        return new XSSFConditionalFormatting(_sheet, cf);
-    }
-
-    /**
-    * @return number of Conditional Formatting objects of the sheet
-    */
-    public int getNumConditionalFormattings() {
-        return _sheet.getCTWorksheet().sizeOfConditionalFormattingArray();
-    }
-
-    /**
-    * removes a Conditional Formatting object by index
-    * @param index of a Conditional Formatting object to remove
-    */
-    public void removeConditionalFormatting(int index) {
-        checkIndex(index);
-        _sheet.getCTWorksheet().removeConditionalFormatting(index);
-    }
-
-    private void checkIndex(int index) {
-        int cnt = getNumConditionalFormattings();
-        if (index < 0 || index >= cnt) {
-            throw new IllegalArgumentException("Specified CF index " + index
-                    + " is outside the allowable range (0.." + (cnt - 1) + ")");
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
deleted file mode 100644
index 3d58993..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
+++ /dev/null
@@ -1,866 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Units;
-import org.openxmlformats.schemas.drawingml.x2006.main.*;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShape;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShapeNonVisual;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRElt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STUnderlineValues;
-
-/**
- * Represents a shape with a predefined geometry in a SpreadsheetML drawing.
- * Possible shape types are defined in {@link org.apache.poi.ss.usermodel.ShapeTypes}
- */
-public class XSSFSimpleShape extends XSSFShape implements Iterable<XSSFTextParagraph> { // TODO - instantiable superclass
-	/**
-	 * List of the paragraphs that make up the text in this shape
-	 */
-    private final List<XSSFTextParagraph> _paragraphs;
-    /**
-     * A default instance of CTShape used for creating new shapes.
-     */
-    private static CTShape prototype = null;
-
-    /**
-     *  Xml bean that stores properties of this shape
-     */
-    private CTShape ctShape;
-
-    protected XSSFSimpleShape(XSSFDrawing drawing, CTShape ctShape) {
-        this.drawing = drawing;
-        this.ctShape = ctShape;
-        
-        _paragraphs = new ArrayList<XSSFTextParagraph>();
-        
-        // initialize any existing paragraphs - this will be the default body paragraph in a new shape, 
-        // or existing paragraphs that have been loaded from the file
-        CTTextBody body = ctShape.getTxBody();
-        if(body != null) {
-            for(int i = 0; i < body.sizeOfPArray(); i++) {
-                _paragraphs.add(new XSSFTextParagraph(body.getPArray(i), ctShape));        	
-            }
-        }
-    }
-
-    /**
-     * Prototype with the default structure of a new auto-shape.
-     */
-    protected static CTShape prototype() {
-        if(prototype == null) {
-            CTShape shape = CTShape.Factory.newInstance();
-
-            CTShapeNonVisual nv = shape.addNewNvSpPr();
-            CTNonVisualDrawingProps nvp = nv.addNewCNvPr();
-            nvp.setId(1);
-            nvp.setName("Shape 1");
-            nv.addNewCNvSpPr();
-
-            CTShapeProperties sp = shape.addNewSpPr();
-            CTTransform2D t2d = sp.addNewXfrm();
-            CTPositiveSize2D p1 = t2d.addNewExt();
-            p1.setCx(0);
-            p1.setCy(0);
-            CTPoint2D p2 = t2d.addNewOff();
-            p2.setX(0);
-            p2.setY(0);
-
-            CTPresetGeometry2D geom = sp.addNewPrstGeom();
-            geom.setPrst(STShapeType.RECT);
-            geom.addNewAvLst();
-
-            CTTextBody body = shape.addNewTxBody();
-            CTTextBodyProperties bodypr = body.addNewBodyPr();
-            bodypr.setAnchor(STTextAnchoringType.T);
-            bodypr.setRtlCol(false);
-            CTTextParagraph p = body.addNewP();
-            p.addNewPPr().setAlgn(STTextAlignType.L);
-            CTTextCharacterProperties endPr = p.addNewEndParaRPr();
-            endPr.setLang("en-US");
-            endPr.setSz(1100);   
-            CTSolidColorFillProperties scfpr = endPr.addNewSolidFill();
-            scfpr.addNewSrgbClr().setVal(new byte[] { 0, 0, 0 });
-                        
-            body.addNewLstStyle();
-
-            prototype = shape;
-        }
-        return prototype;
-    }
-
-    @Internal
-    public CTShape getCTShape(){
-        return ctShape;
-    }
-
-
-    public Iterator<XSSFTextParagraph> iterator(){
-        return _paragraphs.iterator();
-    }
-
-    /**
-     * Returns the text from all paragraphs in the shape. Paragraphs are separated by new lines.
-     * 
-     * @return  text contained within this shape or empty string
-     */
-    public String getText() {
-        final int MAX_LEVELS = 9;
-        StringBuilder out = new StringBuilder();
-        List<Integer> levelCount = new ArrayList<Integer>(MAX_LEVELS);	// maximum 9 levels
-        XSSFTextParagraph p = null;
-        
-        // initialise the levelCount array - this maintains a record of the numbering to be used at each level
-        for (int k = 0; k < MAX_LEVELS; k++){
-        	levelCount.add(0);
-        }
-
-        for(int i = 0; i < _paragraphs.size(); i++) {
-            if (out.length() > 0) out.append('\n');
-            p = _paragraphs.get(i);
-
-            if(p.isBullet() && p.getText().length() > 0){
-               
-                int level = Math.min(p.getLevel(), MAX_LEVELS - 1);
-                
-                if(p.isBulletAutoNumber()){
-                    i = processAutoNumGroup(i, level, levelCount, out);
-                } else {
-                    // indent appropriately for the level
-                    for(int j = 0; j < level; j++){
-                        out.append('\t');
-                    }               
-                    String character = p.getBulletCharacter();
-                    out.append(character.length() > 0 ? character + " " : "- ");
-                    out.append(p.getText());
-                }               
-            } else {
-                out.append(p.getText());
-                
-                // this paragraph is not a bullet, so reset the count array
-                for (int k = 0; k < MAX_LEVELS; k++){
-                    levelCount.set(k, 0);
-                }
-            }            
-        }
-
-        return out.toString();
-    }
-
-    /**
-     * 
-     */
-    private int processAutoNumGroup(int index, int level, List<Integer> levelCount, StringBuilder out){
-        XSSFTextParagraph p = null;
-        XSSFTextParagraph nextp = null;
-        ListAutoNumber scheme, nextScheme;
-        int startAt, nextStartAt;
-        
-        p = _paragraphs.get(index);
-        
-        // The rules for generating the auto numbers are as follows. If the following paragraph is also
-        // an auto-number, has the same type/scheme (and startAt if defined on this paragraph) then they are
-        // considered part of the same group. An empty bullet paragraph is counted as part of the same
-        // group but does not increment the count for the group. A change of type, startAt or the paragraph
-        // not being a bullet resets the count for that level to 1.
-        
-        // first auto-number paragraph so initialise to 1 or the bullets startAt if present
-        startAt = p.getBulletAutoNumberStart();
-        scheme = p.getBulletAutoNumberScheme();
-        if(levelCount.get(level) == 0) {
-            levelCount.set(level, startAt == 0 ? 1 : startAt);
-        }
-        // indent appropriately for the level
-        for(int j = 0; j < level; j++){
-            out.append('\t');
-        }
-        if (p.getText().length() > 0){
-            out.append(getBulletPrefix(scheme, levelCount.get(level)));
-            out.append(p.getText());
-        }
-        while(true) {                        
-            nextp = (index + 1) == _paragraphs.size() ? null : _paragraphs.get(index + 1);
-            if(nextp == null) break; // out of paragraphs
-            if(!(nextp.isBullet() && p.isBulletAutoNumber())) break; // not an auto-number bullet                      
-            if(nextp.getLevel() > level) { 
-                // recurse into the new level group
-                if (out.length() > 0) out.append('\n');
-                index = processAutoNumGroup(index + 1, nextp.getLevel(), levelCount, out);
-                continue; // restart the loop given the new index
-            } else if(nextp.getLevel() < level) {
-                break; // changed level   
-            }
-            nextScheme = nextp.getBulletAutoNumberScheme();
-            nextStartAt = nextp.getBulletAutoNumberStart();
-            
-            if(nextScheme == scheme && nextStartAt == startAt) {
-                // bullet is valid, so increment i 
-                ++index;
-                if (out.length() > 0) out.append('\n');
-                // indent for the level
-                for(int j = 0; j < level; j++){
-                    out.append('\t');
-                }
-                // check for empty text - only output a bullet if there is text, but it is still part of the group
-                if(nextp.getText().length() > 0) {
-                    // increment the count for this level
-                    levelCount.set(level, levelCount.get(level) + 1);
-                    out.append(getBulletPrefix(nextScheme, levelCount.get(level)));
-                    out.append(nextp.getText());
-                }
-            } else {
-                // something doesn't match so stop
-                break; 
-            }
-        }
-        // end of the group so reset the count for this level 
-        levelCount.set(level, 0);      
-        
-        return index; 
-    }
-    /**
-     * Returns a string containing an appropriate prefix for an auto-numbering bullet
-     * @param scheme the auto-numbering scheme used by the bullet
-     * @param value the value of the bullet
-     * @return appropriate prefix for an auto-numbering bullet
-     */
-    private String getBulletPrefix(ListAutoNumber scheme, int value){
-        StringBuilder out = new StringBuilder();
-        
-        switch(scheme) {
-        case ALPHA_LC_PARENT_BOTH:
-        case ALPHA_LC_PARENT_R:
-            if(scheme == ListAutoNumber.ALPHA_LC_PARENT_BOTH) out.append('(');
-            out.append(valueToAlpha(value).toLowerCase(Locale.ROOT));
-            out.append(')');
-            break;
-        case ALPHA_UC_PARENT_BOTH:
-        case ALPHA_UC_PARENT_R:
-            if(scheme == ListAutoNumber.ALPHA_UC_PARENT_BOTH) out.append('(');
-            out.append(valueToAlpha(value));
-            out.append(')');
-            break;        
-        case ALPHA_LC_PERIOD:
-            out.append(valueToAlpha(value).toLowerCase(Locale.ROOT));
-            out.append('.');
-            break;
-        case ALPHA_UC_PERIOD:
-            out.append(valueToAlpha(value));
-            out.append('.');
-            break;
-        case ARABIC_PARENT_BOTH:
-        case ARABIC_PARENT_R:
-            if(scheme == ListAutoNumber.ARABIC_PARENT_BOTH) out.append('(');
-            out.append(value);
-            out.append(')');
-            break;
-        case ARABIC_PERIOD:
-            out.append(value);
-            out.append('.');
-            break;
-        case ARABIC_PLAIN:
-            out.append(value);
-            break;            
-        case ROMAN_LC_PARENT_BOTH:
-        case ROMAN_LC_PARENT_R:
-            if(scheme == ListAutoNumber.ROMAN_LC_PARENT_BOTH) out.append('(');
-            out.append(valueToRoman(value).toLowerCase(Locale.ROOT));
-            out.append(')');
-            break;
-        case ROMAN_UC_PARENT_BOTH:
-        case ROMAN_UC_PARENT_R:
-            if(scheme == ListAutoNumber.ROMAN_UC_PARENT_BOTH) out.append('(');
-            out.append(valueToRoman(value));
-            out.append(')');
-            break;        
-        case ROMAN_LC_PERIOD:
-            out.append(valueToRoman(value).toLowerCase(Locale.ROOT));
-            out.append('.');
-            break;
-        case ROMAN_UC_PERIOD:
-            out.append(valueToRoman(value));
-            out.append('.');
-            break;
-        default:
-            out.append('\u2022');   // can't set the font to wingdings so use the default bullet character
-            break;            
-        }
-        out.append(" ");        
-        return out.toString();
-    }
-    
-    /**
-     * Convert an integer to its alpha equivalent e.g. 1 = A, 2 = B, 27 = AA etc
-     */
-    private String valueToAlpha(int value) {
-        String alpha = "";
-        int modulo;
-        while (value > 0) {
-            modulo = (value - 1) % 26;
-            alpha = (char)(65 + modulo) + alpha;
-            value = (value - modulo) / 26;
-        }
-        return alpha;
-    }
-    
-    private static String[] _romanChars = new String[] { "M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I" };
-    private static int[] _romanAlphaValues = new int[] { 1000,900,500,400,100,90,50,40,10,9,5,4,1 };
-        
-    /**
-     * Convert an integer to its roman equivalent e.g. 1 = I, 9 = IX etc
-     */
-    private String valueToRoman(int value) {
-        StringBuilder out = new StringBuilder();
-        for(int i = 0; value > 0 && i < _romanChars.length; i++) {
-            while(_romanAlphaValues[i] <= value) {
-                out.append(_romanChars[i]);
-                value -= _romanAlphaValues[i];
-            }
-        }
-        return out.toString();
-    }
-    
-    /**
-     * Clear all text from this shape
-     */
-    public void clearText(){
-        _paragraphs.clear();
-        CTTextBody txBody = ctShape.getTxBody();
-        txBody.setPArray(null); // remove any existing paragraphs
-    }
-    
-    /**
-     * Set a single paragraph of text on the shape. Note this will replace all existing paragraphs created on the shape.
-     * @param text	string representing the paragraph text
-     */
-    public void setText(String text){
-        clearText();
-
-        addNewTextParagraph().addNewTextRun().setText(text);
-    }
-
-    /**
-     * Set a single paragraph of text on the shape. Note this will replace all existing paragraphs created on the shape.
-     * @param str	rich text string representing the paragraph text
-     */
-    public void setText(XSSFRichTextString str){
-
-        XSSFWorkbook wb = (XSSFWorkbook)getDrawing().getParent().getParent();
-        str.setStylesTableReference(wb.getStylesSource());
-
-        CTTextParagraph p = CTTextParagraph.Factory.newInstance();
-        if(str.numFormattingRuns() == 0){
-            CTRegularTextRun r = p.addNewR();
-            CTTextCharacterProperties rPr = r.addNewRPr();
-            rPr.setLang("en-US");
-            rPr.setSz(1100);
-            r.setT(str.getString());
-
-        } else {
-            for (int i = 0; i < str.getCTRst().sizeOfRArray(); i++) {
-                CTRElt lt = str.getCTRst().getRArray(i);
-                CTRPrElt ltPr = lt.getRPr();
-                if(ltPr == null) ltPr = lt.addNewRPr();
-
-                CTRegularTextRun r = p.addNewR();
-                CTTextCharacterProperties rPr = r.addNewRPr();
-                rPr.setLang("en-US");
-
-                applyAttributes(ltPr, rPr);
-
-                r.setT(lt.getT());
-            }
-        }
-        
-        clearText();                
-        ctShape.getTxBody().setPArray(new CTTextParagraph[]{p});
-        _paragraphs.add(new XSSFTextParagraph(ctShape.getTxBody().getPArray(0), ctShape));
-    }    
-    
-    /**
-     * Returns a collection of the XSSFTextParagraphs that are attached to this shape
-     * 
-     * @return text paragraphs in this shape
-     */
-    public List<XSSFTextParagraph> getTextParagraphs() {
-        return _paragraphs;
-    }
-
-    /**
-     * Add a new paragraph run to this shape
-     *
-     * @return created paragraph run
-     */
-    public XSSFTextParagraph addNewTextParagraph() {
-        CTTextBody txBody = ctShape.getTxBody();
-        CTTextParagraph p = txBody.addNewP();
-        XSSFTextParagraph paragraph = new XSSFTextParagraph(p, ctShape);
-        _paragraphs.add(paragraph);
-        return paragraph;
-    }    
-
-    /**
-     * Add a new paragraph run to this shape, set to the provided string
-     *
-     * @return created paragraph run
-     */
-    public XSSFTextParagraph addNewTextParagraph(String text) {
-        XSSFTextParagraph paragraph = addNewTextParagraph();
-        paragraph.addNewTextRun().setText(text);
-        return paragraph;
-    }   
-    
-    /**
-     * Add a new paragraph run to this shape, set to the provided rich text string 
-     *
-     * @return created paragraph run
-     */
-    public XSSFTextParagraph addNewTextParagraph(XSSFRichTextString str) {
-        CTTextBody txBody = ctShape.getTxBody();
-        CTTextParagraph p = txBody.addNewP();
-       
-        if(str.numFormattingRuns() == 0){
-            CTRegularTextRun r = p.addNewR();
-            CTTextCharacterProperties rPr = r.addNewRPr();
-            rPr.setLang("en-US");
-            rPr.setSz(1100);
-            r.setT(str.getString());
-
-        } else {
-            for (int i = 0; i < str.getCTRst().sizeOfRArray(); i++) {
-                CTRElt lt = str.getCTRst().getRArray(i);
-                CTRPrElt ltPr = lt.getRPr();
-                if(ltPr == null) ltPr = lt.addNewRPr();
-
-                CTRegularTextRun r = p.addNewR();
-                CTTextCharacterProperties rPr = r.addNewRPr();
-                rPr.setLang("en-US");
-
-                applyAttributes(ltPr, rPr);
-
-                r.setT(lt.getT());
-            }
-        }
-        
-        // Note: the XSSFTextParagraph constructor will create its required XSSFTextRuns from the provided CTTextParagraph
-        XSSFTextParagraph paragraph = new XSSFTextParagraph(p, ctShape);
-        _paragraphs.add(paragraph);
-        
-        return paragraph;
-    }
-
-    /**
-     * Sets the type of horizontal overflow for the text.
-     *
-     * @param overflow - the type of horizontal overflow.
-     * A <code>null</code> values unsets this property.
-     */
-    public void setTextHorizontalOverflow(TextHorizontalOverflow overflow){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-             if(overflow == null) {
-                if(bodyPr.isSetHorzOverflow()) bodyPr.unsetHorzOverflow();
-            } else {
-                bodyPr.setHorzOverflow(STTextHorzOverflowType.Enum.forInt(overflow.ordinal() + 1));
-            }
-        }
-    }
-
-    /**
-     * Returns the type of horizontal overflow for the text.
-     *
-     * @return the type of horizontal overflow
-     */
-    public TextHorizontalOverflow getTextHorizontalOverflow(){
-    	CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-    	if(bodyPr != null) {
-    		if(bodyPr.isSetHorzOverflow()){
-    			return TextHorizontalOverflow.values()[bodyPr.getHorzOverflow().intValue() - 1];
-    		}    			
-    	}
-    	return TextHorizontalOverflow.OVERFLOW;
-    }    
-    
-    /**
-     * Sets the type of vertical overflow for the text.
-     *
-     * @param overflow - the type of vertical overflow.
-     * A <code>null</code> values unsets this property.
-     */
-    public void setTextVerticalOverflow(TextVerticalOverflow overflow){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-             if(overflow == null) {
-                if(bodyPr.isSetVertOverflow()) bodyPr.unsetVertOverflow();
-            } else {
-                bodyPr.setVertOverflow(STTextVertOverflowType.Enum.forInt(overflow.ordinal() + 1));
-            }
-        }
-    }
-
-    /**
-     * Returns the type of vertical overflow for the text.
-     *
-     * @return the type of vertical overflow
-     */
-    public TextVerticalOverflow getTextVerticalOverflow(){
-    	CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-    	if(bodyPr != null) {
-    		if(bodyPr.isSetVertOverflow()){
-    			return TextVerticalOverflow.values()[bodyPr.getVertOverflow().intValue() - 1];
-    		}    			
-    	}
-    	return TextVerticalOverflow.OVERFLOW;
-    }   
-    
-    /**
-     * Sets the type of vertical alignment for the text within the shape.
-     *
-     * @param anchor - the type of alignment.
-     * A <code>null</code> values unsets this property.
-     */
-    public void setVerticalAlignment(VerticalAlignment anchor){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-             if(anchor == null) {
-                if(bodyPr.isSetAnchor()) bodyPr.unsetAnchor();
-            } else {
-                bodyPr.setAnchor(STTextAnchoringType.Enum.forInt(anchor.ordinal() + 1));
-            }
-        }
-    }
-
-    /**
-     * Returns the type of vertical alignment for the text within the shape.
-     *
-     * @return the type of vertical alignment
-     */
-    public VerticalAlignment getVerticalAlignment(){
-    	CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-    	if(bodyPr != null) {
-    		if(bodyPr.isSetAnchor()){
-    			return VerticalAlignment.values()[bodyPr.getAnchor().intValue() - 1];
-    		}    			
-    	}
-    	return VerticalAlignment.TOP;
-    }
-
-    /**
-     * Sets the vertical orientation of the text
-     * 
-     * @param orientation vertical orientation of the text
-     * A <code>null</code> values unsets this property.
-     */
-    public void setTextDirection(TextDirection orientation){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            if(orientation == null) {
-                if(bodyPr.isSetVert()) bodyPr.unsetVert();
-            } else {
-                bodyPr.setVert(STTextVerticalType.Enum.forInt(orientation.ordinal() + 1));
-            }
-        }
-    }
-
-    /**
-     * Gets the vertical orientation of the text
-     * 
-     * @return vertical orientation of the text
-     */
-    public TextDirection getTextDirection(){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            STTextVerticalType.Enum val = bodyPr.getVert();
-            if(val != null){
-                return TextDirection.values()[val.intValue() - 1];
-            }
-        }
-        return TextDirection.HORIZONTAL;
-    }
-
-
-    /**
-     * Returns the distance (in points) between the bottom of the text frame
-     * and the bottom of the inscribed rectangle of the shape that contains the text.
-     *
-     * @return the bottom inset in points
-     */
-    public double getBottomInset(){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-        	if(bodyPr.isSetBIns()){
-        		return Units.toPoints(bodyPr.getBIns());
-        	}
-        }
-        // If this attribute is omitted, then a value of 0.05 inches is implied
-        return 3.6;	
-    }
-
-    /**
-     *  Returns the distance (in points) between the left edge of the text frame
-     *  and the left edge of the inscribed rectangle of the shape that contains
-     *  the text.
-     *
-     * @return the left inset in points
-     */
-    public double getLeftInset(){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-        	if(bodyPr.isSetLIns()){
-        		return Units.toPoints(bodyPr.getLIns());
-        	}
-        }
-        // If this attribute is omitted, then a value of 0.05 inches is implied
-        return 3.6;
-    }
-
-    /**
-     *  Returns the distance (in points) between the right edge of the
-     *  text frame and the right edge of the inscribed rectangle of the shape
-     *  that contains the text.
-     *
-     * @return the right inset in points
-     */
-    public double getRightInset(){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-        	if(bodyPr.isSetRIns()){
-        		return Units.toPoints(bodyPr.getRIns());
-        	}
-        }
-        // If this attribute is omitted, then a value of 0.05 inches is implied
-        return 3.6;
-    }
-
-    /**
-     *  Returns the distance (in points) between the top of the text frame
-     *  and the top of the inscribed rectangle of the shape that contains the text.
-     *
-     * @return the top inset in points
-     */
-    public double getTopInset(){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-        	if(bodyPr.isSetTIns()){
-        		return Units.toPoints(bodyPr.getTIns());
-        	}
-        }
-        // If this attribute is omitted, then a value of 0.05 inches is implied
-        return 3.6;    	
-    }
-
-    /**
-     * Sets the bottom inset.
-     * @see #getBottomInset()
-     *
-     * @param margin    the bottom margin
-     */
-    public void setBottomInset(double margin){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            if(margin == -1) {
-                if(bodyPr.isSetBIns()) bodyPr.unsetBIns();
-            } else bodyPr.setBIns(Units.toEMU(margin));
-        }
-    }
-
-    /**
-     * Sets the left inset.
-     * @see #getLeftInset()
-     *
-     * @param margin    the left margin
-     */
-    public void setLeftInset(double margin){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            if(margin == -1) {
-                if(bodyPr.isSetLIns()) bodyPr.unsetLIns();
-            } else bodyPr.setLIns(Units.toEMU(margin));
-        }
-    }
-
-    /**
-     * Sets the right inset.
-     * @see #getRightInset()
-     *
-     * @param margin    the right margin
-     */
-    public void setRightInset(double margin){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            if(margin == -1) {
-                if(bodyPr.isSetRIns()) bodyPr.unsetRIns();
-            } else bodyPr.setRIns(Units.toEMU(margin));
-        }
-    }
-
-    /**
-     * Sets the top inset.
-     * @see #getTopInset()
-     *
-     * @param margin    the top margin
-     */
-    public void setTopInset(double margin){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            if(margin == -1) {
-                if(bodyPr.isSetTIns()) bodyPr.unsetTIns();
-            } else bodyPr.setTIns(Units.toEMU(margin));
-        }
-    }
-
-
-    /**
-     * @return whether to wrap words within the bounding rectangle
-     */
-    public boolean getWordWrap(){
-    	CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-        	if(bodyPr.isSetWrap()){
-        		return bodyPr.getWrap() == STTextWrappingType.SQUARE;
-        	}
-        }
-        return true;
-    }
-
-    /**
-     *
-     * @param wrap  whether to wrap words within the bounding rectangle
-     */
-    public void setWordWrap(boolean wrap){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            bodyPr.setWrap(wrap ? STTextWrappingType.SQUARE : STTextWrappingType.NONE);
-        }
-    }
-
-    /**
-     *
-     * Specifies that a shape should be auto-fit to fully contain the text described within it.
-     * Auto-fitting is when text within a shape is scaled in order to contain all the text inside
-     *
-     * @param value type of autofit
-     */
-    public void setTextAutofit(TextAutofit value){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            if(bodyPr.isSetSpAutoFit()) bodyPr.unsetSpAutoFit();
-            if(bodyPr.isSetNoAutofit()) bodyPr.unsetNoAutofit();
-            if(bodyPr.isSetNormAutofit()) bodyPr.unsetNormAutofit();
-
-            switch(value){
-                case NONE: bodyPr.addNewNoAutofit(); break;
-                case NORMAL: bodyPr.addNewNormAutofit(); break;
-                case SHAPE: bodyPr.addNewSpAutoFit(); break;
-            }
-        }
-    }
-
-    /**
-     *
-     * @return type of autofit
-     */
-    public TextAutofit getTextAutofit(){
-        CTTextBodyProperties bodyPr = ctShape.getTxBody().getBodyPr();
-        if (bodyPr != null) {
-            if(bodyPr.isSetNoAutofit()) return TextAutofit.NONE;
-            else if (bodyPr.isSetNormAutofit()) return TextAutofit.NORMAL;
-            else if (bodyPr.isSetSpAutoFit()) return TextAutofit.SHAPE;
-        }
-        return TextAutofit.NORMAL;
-    }
-    
-    /**
-     * Gets the shape type, one of the constants defined in {@link org.apache.poi.ss.usermodel.ShapeTypes}.
-     *
-     * @return the shape type
-     * @see org.apache.poi.ss.usermodel.ShapeTypes
-     */
-    public int getShapeType() {
-        return ctShape.getSpPr().getPrstGeom().getPrst().intValue();
-    }
-
-    /**
-     * Sets the shape types.
-     *
-     * @param type the shape type, one of the constants defined in {@link org.apache.poi.ss.usermodel.ShapeTypes}.
-     * @see org.apache.poi.ss.usermodel.ShapeTypes
-     */
-    public void setShapeType(int type) {
-        ctShape.getSpPr().getPrstGeom().setPrst(STShapeType.Enum.forInt(type));
-    }
-
-    protected CTShapeProperties getShapeProperties(){
-        return ctShape.getSpPr();
-    }
-
-    /**
-     * org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt to
-     * org.openxmlformats.schemas.drawingml.x2006.main.CTFont adapter
-     */
-    private static void applyAttributes(CTRPrElt pr, CTTextCharacterProperties rPr){
-
-        if(pr.sizeOfBArray() > 0) rPr.setB(pr.getBArray(0).getVal());
-        if(pr.sizeOfUArray() > 0) {
-            STUnderlineValues.Enum u1 = pr.getUArray(0).getVal();
-            if(u1 == STUnderlineValues.SINGLE) rPr.setU(STTextUnderlineType.SNG);
-            else if(u1 == STUnderlineValues.DOUBLE) rPr.setU(STTextUnderlineType.DBL);
-            else if(u1 == STUnderlineValues.NONE) rPr.setU(STTextUnderlineType.NONE);
-        }
-        if(pr.sizeOfIArray() > 0) rPr.setI(pr.getIArray(0).getVal());
-
-        if(pr.sizeOfRFontArray() > 0) {
-            CTTextFont rFont = rPr.isSetLatin() ? rPr.getLatin() : rPr.addNewLatin();
-            rFont.setTypeface(pr.getRFontArray(0).getVal());
-        }
-
-        if(pr.sizeOfSzArray() > 0) {
-            int sz = (int)(pr.getSzArray(0).getVal()*100);
-            rPr.setSz(sz);
-        }
-        
-        if(pr.sizeOfColorArray() > 0) {
-            CTSolidColorFillProperties fill = rPr.isSetSolidFill() ? rPr.getSolidFill() : rPr.addNewSolidFill();
-            org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor xlsColor = pr.getColorArray(0);
-            if(xlsColor.isSetRgb()) {
-                CTSRgbColor clr = fill.isSetSrgbClr() ? fill.getSrgbClr() : fill.addNewSrgbClr();
-                clr.setVal(xlsColor.getRgb());
-            }
-            else if(xlsColor.isSetIndexed()) {
-                HSSFColor indexed = HSSFColor.getIndexHash().get((int) xlsColor.getIndexed());
-                if (indexed != null) {
-                    byte[] rgb = new byte[3];
-                    rgb[0] = (byte) indexed.getTriplet()[0];
-                    rgb[1] = (byte) indexed.getTriplet()[1];
-                    rgb[2] = (byte) indexed.getTriplet()[2];
-                    CTSRgbColor clr = fill.isSetSrgbClr() ? fill.getSrgbClr() : fill.addNewSrgbClr();
-                    clr.setVal(rgb);
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
deleted file mode 100644
index fb59384..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.ss.usermodel.Table;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.helpers.XSSFXmlColumnPr;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.StringUtil;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.TableDocument;
-
-/**
- * 
- * This class implements the Table Part (Open Office XML Part 4:
- * chapter 3.5.1)
- * 
- * This implementation works under the assumption that a table contains mappings to a subtree of an XML.
- * The root element of this subtree an occur multiple times (one for each row of the table). The child nodes
- * of the root element can be only attributes or element with maxOccurs=1 property set
- * 
- *
- * @author Roberto Manicardi
- */
-public class XSSFTable extends POIXMLDocumentPart implements Table {
-
-    private CTTable ctTable;
-    private transient List<XSSFXmlColumnPr> xmlColumnPr;
-    private transient CTTableColumn[] ctColumns;
-    private transient HashMap<String, Integer> columnMap;
-    private transient CellReference startCellReference;
-    private transient CellReference endCellReference;    
-    private transient String commonXPath; 
-
-
-    public XSSFTable() {
-        super();
-        ctTable = CTTable.Factory.newInstance();
-    }
-
-    /** 
-     * @since POI 3.14-Beta1
-     */
-    public XSSFTable(PackagePart part) throws IOException {
-        super(part);
-        readFrom(part.getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XSSFTable(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    public void readFrom(InputStream is) throws IOException {
-        try {
-            TableDocument doc = TableDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            ctTable = doc.getTable();
-        } catch (XmlException e) {
-            throw new IOException(e.getLocalizedMessage());
-        }
-    }
-    
-    public XSSFSheet getXSSFSheet(){
-        return (XSSFSheet) getParent();
-    }
-
-    public void writeTo(OutputStream out) throws IOException {
-        updateHeaders();
-
-        TableDocument doc = TableDocument.Factory.newInstance();
-        doc.setTable(ctTable);
-        doc.save(out, DEFAULT_XML_OPTIONS);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        writeTo(out);
-        out.close();
-    }
-    
-    /**
-      * get the underlying CTTable XML bean
-      */
-    @Internal(since="POI 3.15 beta 3")
-    public CTTable getCTTable() {
-        return ctTable;
-    }
-    
-    /**
-     * Checks if this Table element contains even a single mapping to the map identified by id
-     * @param id the XSSFMap ID
-     * @return true if the Table element contain mappings
-     */
-    public boolean mapsTo(long id){
-        List<XSSFXmlColumnPr> pointers = getXmlColumnPrs();
-        
-        for (XSSFXmlColumnPr pointer: pointers) {
-            if (pointer.getMapId()==id) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-
-    /**
-      * caches table columns for performance.
-      * Updated via updateHeaders
-      * @since 3.15 beta 2
-      */
-    private CTTableColumn[] getTableColumns() {
-        if (ctColumns == null) {
-            ctColumns = ctTable.getTableColumns().getTableColumnArray();
-        }
-        return ctColumns;
-    }
-    
-    /**
-     * 
-     * Calculates the xpath of the root element for the table. This will be the common part
-     * of all the mapping's xpaths
-     * Note: this function caches the result for performance. To flush the cache {@link #updateHeaders()} must be called.
-     * 
-     * @return the xpath of the table's root element
-     */
-    public String getCommonXpath() {
-        if (commonXPath == null) {
-            String[] commonTokens = {};
-            for (CTTableColumn column : getTableColumns()) {
-                if (column.getXmlColumnPr()!=null) {
-                    String xpath = column.getXmlColumnPr().getXpath();
-                    String[] tokens =  xpath.split("/");
-                    if (commonTokens.length==0) {
-                        commonTokens = tokens;
-                        
-                    } else {
-                        final int maxLength = Math.min(commonTokens.length, tokens.length);
-                         
-                        for (int i =0; i<maxLength; i++) {
-                            if (!commonTokens[i].equals(tokens[i])) {
-                             List<String> subCommonTokens = Arrays.asList(commonTokens).subList(0, i);
-                             
-                             String[] container = {};
-                             
-                             commonTokens = subCommonTokens.toArray(container);
-                             break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            commonTokens[0] = "";
-            commonXPath = StringUtil.join(commonTokens, "/");
-        }
-        
-        return commonXPath;
-    }
-
-    
-    /**
-     * Note this list is static - once read, it does not notice later changes to the underlying column structures
-     * To clear the cache, call {@link #updateHeaders}
-     * @return List of XSSFXmlColumnPr
-     */
-    public List<XSSFXmlColumnPr> getXmlColumnPrs() {
-        
-        if (xmlColumnPr==null) {
-            xmlColumnPr = new ArrayList<XSSFXmlColumnPr>();
-            for (CTTableColumn column: getTableColumns()) {
-                if (column.getXmlColumnPr()!=null) {
-                    XSSFXmlColumnPr columnPr = new XSSFXmlColumnPr(this,column,column.getXmlColumnPr());
-                    xmlColumnPr.add(columnPr);
-                }
-            }
-        }
-        return xmlColumnPr;
-    }
-    
-    /**
-     * @return the name of the Table, if set
-     */
-    public String getName() {
-        return ctTable.getName();
-    }
-    
-    /**
-     * Changes the name of the Table
-     */
-    public void setName(String name) {
-        if (name == null) {
-            ctTable.unsetName();
-            return;
-        }
-        ctTable.setName(name);
-    }
-
-    /**
-     * @return the display name of the Table, if set
-     */
-    public String getDisplayName() {
-        return ctTable.getDisplayName();
-    }
-
-    /**
-     * Changes the display name of the Table
-     */
-    public void setDisplayName(String name) {
-        ctTable.setDisplayName(name);
-    }
-
-    /**
-     * @return  the number of mapped table columns (see Open Office XML Part 4: chapter 3.5.1.4)
-     */
-    public long getNumberOfMappedColumns() {
-        return ctTable.getTableColumns().getCount();
-    }
-
-    /**
-     * @return  the number of mapped table columns (see Open Office XML Part 4: chapter 3.5.1.4)
-     * @deprecated 3.15 beta 2. Use {@link #getNumberOfMappedColumns}.
-     */
-    public long getNumerOfMappedColumns() {
-        return getNumberOfMappedColumns();
-    }
-
-    
-    
-    /**
-     * @return The reference for the cell in the top-left part of the table
-     * (see Open Office XML Part 4: chapter 3.5.1.2, attribute ref) 
-     *
-     * Does not track updates to underlying changes to CTTable
-     * To synchronize with changes to the underlying CTTable,
-     * call {@link #updateReferences()}.
-     */
-    public CellReference getStartCellReference() {
-        if (startCellReference==null) {
-             setCellReferences();
-        }
-        return startCellReference;
-    }
-    
-    /**
-     * @return The reference for the cell in the bottom-right part of the table
-     * (see Open Office XML Part 4: chapter 3.5.1.2, attribute ref)
-     *
-     * Does not track updates to underlying changes to CTTable
-     * To synchronize with changes to the underlying CTTable,
-     * call {@link #updateReferences()}.
-     */
-    public CellReference getEndCellReference() {
-        if (endCellReference==null) {
-             setCellReferences();
-        }
-        return endCellReference;
-    }
-
-    /**
-     * @since POI 3.15 beta 3
-     */
-    private void setCellReferences() {
-        String ref = ctTable.getRef();
-        if (ref != null) {
-            String[] boundaries = ref.split(":", 2);
-            String from = boundaries[0];
-            String to = boundaries[1];
-            startCellReference = new CellReference(from);
-            endCellReference = new CellReference(to);
-        }
-    }
-
-    
-    /**
-     * Clears the cached values set by {@link #getStartCellReference()}
-     * and {@link #getEndCellReference()}.
-     * The next call to {@link #getStartCellReference()} and
-     * {@link #getEndCellReference()} will synchronize the
-     * cell references with the underlying <code>CTTable</code>.
-     * Thus, {@link #updateReferences()} is inexpensive.
-     *
-     * @since POI 3.15 beta 3
-     */
-    public void updateReferences() {
-        startCellReference = null;
-        endCellReference = null;
-    }
-
-    
-    /**
-     * @return the total number of rows in the selection. (Note: in this version autofiltering is ignored)
-     * Returns <code>0</code> if the start or end cell references are not set.
-     * 
-     * Does not track updates to underlying changes to CTTable
-     * To synchronize with changes to the underlying CTTable,
-     * call {@link #updateReferences()}.
-     */
-    public int getRowCount() {
-        CellReference from = getStartCellReference();
-        CellReference to = getEndCellReference();
-        
-        int rowCount = 0;
-        if (from!=null && to!=null) {
-            rowCount = to.getRow() - from.getRow() + 1;
-        }
-        return rowCount;
-    }
-
-    /**
-     * Synchronize table headers with cell values in the parent sheet.
-     * Headers <em>must</em> be in sync, otherwise Excel will display a
-     * "Found unreadable content" message on startup.
-     * 
-     * If calling both {@link #updateReferences()} and
-     * {@link #updateHeaders()}, {@link #updateReferences()}
-     * should be called first.
-     */
-    public void updateHeaders() {
-        XSSFSheet sheet = (XSSFSheet)getParent();
-        CellReference ref = getStartCellReference();
-        if(ref == null) return;
-
-        int headerRow = ref.getRow();
-        int firstHeaderColumn = ref.getCol();
-        XSSFRow row = sheet.getRow(headerRow);
-
-        if (row != null && row.getCTRow().validate()) {
-            int cellnum = firstHeaderColumn;
-            for (CTTableColumn col : getCTTable().getTableColumns().getTableColumnArray()) {
-                XSSFCell cell = row.getCell(cellnum);
-                if (cell != null) {
-                    col.setName(cell.getStringCellValue());
-                }
-                cellnum++;
-            }
-            ctColumns = null;
-            columnMap = null;
-            xmlColumnPr = null;
-            commonXPath = null;
-        }
-    }
-
-    private static String caseInsensitive(String s) {
-        return s.toUpperCase(Locale.ROOT);
-    }
-
-    /**
-     * Gets the relative column index of a column in this table having the header name <code>column</code>.
-     * The column index is relative to the left-most column in the table, 0-indexed.
-     * Returns <code>-1</code> if <code>column</code> is not a header name in table.
-     *
-     * Column Header names are case-insensitive
-     *
-     * Note: this function caches column names for performance. To flush the cache (because columns
-     * have been moved or column headers have been changed), {@link #updateHeaders()} must be called.
-     *
-     * @since 3.15 beta 2
-     */
-    public int findColumnIndex(String columnHeader) {
-        if (columnHeader == null) return -1;
-        if (columnMap == null) {
-            // FIXME: replace with org.apache.commons.collections.map.CaseInsensitiveMap
-            final int count = getTableColumns().length;
-            columnMap = new HashMap<String, Integer>(count * 3 / 2);
-            
-            int i = 0;
-            for (CTTableColumn column : getTableColumns()) {
-                String columnName = column.getName();
-                columnMap.put(caseInsensitive(columnName), i);
-                i++;
-            }
-        }
-        // Table column names with special characters need a single quote escape
-        // but the escape is not present in the column definition
-        Integer idx = columnMap.get(caseInsensitive(columnHeader.replace("'", "")));
-        return idx == null ? -1 : idx.intValue();
-    }
-
-    /**
-     * @since 3.15 beta 2
-     */
-    public String getSheetName() {
-        return getXSSFSheet().getSheetName();
-    }
-
-    /**
-     * @since 3.15 beta 2
-     */
-    public boolean isHasTotalsRow() {
-        return ctTable.getTotalsRowShown();
-    }
-
-    /**
-     * @since 3.15 beta 2
-     */
-    public int getStartColIndex() {
-        return getStartCellReference().getCol();
-    }
-
-    /**
-     * @since 3.15 beta 2
-     */
-    public int getStartRowIndex() {
-        return getStartCellReference().getRow();
-    }
-
-    /**
-     * @since 3.15 beta 2
-     */
-    public int getEndColIndex() {
-        return getEndCellReference().getCol();
-    }
-
-    /**
-     * @since 3.15 beta 2
-     */
-    public int getEndRowIndex() {
-        return getEndCellReference().getRow();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
deleted file mode 100644
index 74c26b9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShape;
-
-/**
- * Represents a text box in a SpreadsheetML drawing.
- *
- * @author Yegor Kozlov
- */
-public final class XSSFTextBox extends XSSFSimpleShape {
-
-    protected XSSFTextBox(XSSFDrawing drawing, CTShape ctShape) {
-        super(drawing, ctShape);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
deleted file mode 100644
index 6500c16..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
+++ /dev/null
@@ -1,871 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Units;
-import org.apache.poi.xssf.usermodel.TextAlign;
-import org.apache.poi.xssf.model.ParagraphPropertyFetcher;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.*;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShape;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Represents a paragraph of text within the containing text body.
- * The paragraph is the highest level text separation mechanism.
- */
-public class XSSFTextParagraph implements Iterable<XSSFTextRun>{
-    private final CTTextParagraph _p;
-    private final CTShape _shape;
-    private final List<XSSFTextRun> _runs;
-
-    XSSFTextParagraph(CTTextParagraph p, CTShape ctShape){
-        _p = p;
-        _shape = ctShape;
-        _runs = new ArrayList<XSSFTextRun>();
-
-        for(XmlObject ch : _p.selectPath("*")){
-            if(ch instanceof CTRegularTextRun){
-                CTRegularTextRun r = (CTRegularTextRun)ch;
-                _runs.add(new XSSFTextRun(r, this));
-            } else if (ch instanceof CTTextLineBreak){
-                CTTextLineBreak br = (CTTextLineBreak)ch;
-                CTRegularTextRun r = CTRegularTextRun.Factory.newInstance();
-                r.setRPr(br.getRPr());
-                r.setT("\n");
-                _runs.add(new XSSFTextRun(r, this));
-            } else if (ch instanceof CTTextField){
-                CTTextField f = (CTTextField)ch;
-                CTRegularTextRun r = CTRegularTextRun.Factory.newInstance();
-                r.setRPr(f.getRPr());
-                r.setT(f.getT());
-                _runs.add(new XSSFTextRun(r, this));
-            }
-        }
-    }
-
-    public String getText(){
-        StringBuilder out = new StringBuilder();
-        for (XSSFTextRun r : _runs) {
-            out.append(r.getText());
-        }
-        return out.toString();
-    }
-
-    @Internal
-    public CTTextParagraph getXmlObject(){
-        return _p;
-    }
-
-    @Internal
-    public CTShape getParentShape(){
-        return _shape;
-    }
-
-    public List<XSSFTextRun> getTextRuns(){
-        return _runs;
-    }
-
-    public Iterator<XSSFTextRun> iterator(){
-        return _runs.iterator();
-    }
-
-    /**
-     * Add a new run of text
-     *
-     * @return a new run of text
-     */
-    public XSSFTextRun addNewTextRun(){
-        CTRegularTextRun r = _p.addNewR();
-        CTTextCharacterProperties rPr = r.addNewRPr();
-        rPr.setLang("en-US");
-        XSSFTextRun run = new XSSFTextRun(r, this);
-        _runs.add(run);
-        return run;
-    }
-
-    /**
-     * Insert a line break
-     *
-     * @return text run representing this line break ('\n')
-     */
-    public XSSFTextRun addLineBreak(){
-        CTTextLineBreak br = _p.addNewBr();
-        CTTextCharacterProperties brProps = br.addNewRPr();
-        if(_runs.size() > 0){
-            // by default line break has the font size of the last text run
-            CTTextCharacterProperties prevRun = _runs.get(_runs.size() - 1).getRPr();
-            brProps.set(prevRun);
-        }
-        CTRegularTextRun r = CTRegularTextRun.Factory.newInstance();
-        r.setRPr(brProps);
-        r.setT("\n");
-        XSSFTextRun run = new XSSFLineBreak(r, this, brProps);
-        _runs.add(run);
-        return run;
-    }
-
-    /**
-     * Returns the alignment that is applied to the paragraph.
-     *
-     * If this attribute is omitted, then a value of left is implied.
-     * @return alignment that is applied to the paragraph
-     */
-    public TextAlign getTextAlign(){
-        ParagraphPropertyFetcher<TextAlign> fetcher = new ParagraphPropertyFetcher<TextAlign>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetAlgn()){
-                    TextAlign val = TextAlign.values()[props.getAlgn().intValue() - 1];
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? TextAlign.LEFT : fetcher.getValue();        
-    }
-
-    /**
-     * Specifies the alignment that is to be applied to the paragraph.
-     * Possible values for this include left, right, centered, justified and distributed,
-     * see {@link org.apache.poi.xssf.usermodel.TextAlign}.
-     *
-     * @param align text align
-     */
-    public void setTextAlign(TextAlign align){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(align == null) {
-            if(pr.isSetAlgn()) pr.unsetAlgn();
-        } else {
-            pr.setAlgn(STTextAlignType.Enum.forInt(align.ordinal() + 1));
-        }
-    }    
-
-    /**
-     * Returns where vertically on a line of text the actual words are positioned. This deals
-     * with vertical placement of the characters with respect to the baselines.
-     * 
-     * If this attribute is omitted, then a value of baseline is implied.
-     * @return alignment that is applied to the paragraph
-     */
-    public TextFontAlign getTextFontAlign(){
-        ParagraphPropertyFetcher<TextFontAlign> fetcher = new ParagraphPropertyFetcher<TextFontAlign>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetFontAlgn()){
-                    TextFontAlign val = TextFontAlign.values()[props.getFontAlgn().intValue() - 1];
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? TextFontAlign.BASELINE : fetcher.getValue();        
-    }
-
-    /**
-     * Determines where vertically on a line of text the actual words are positioned. This deals
-     * with vertical placement of the characters with respect to the baselines. For instance
-     * having text anchored to the top baseline, anchored to the bottom baseline, centered in
-     * between, etc.
-     *
-     * @param align text font align
-     */
-    public void setTextFontAlign(TextFontAlign align){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(align == null) {
-            if(pr.isSetFontAlgn()) pr.unsetFontAlgn();
-        } else {
-            pr.setFontAlgn(STTextFontAlignType.Enum.forInt(align.ordinal() + 1));
-        }
-    }
-
-    /**
-     * @return the font to be used on bullet characters within a given paragraph
-     */
-    public String getBulletFont(){
-        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuFont()){
-                    setValue(props.getBuFont().getTypeface());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    public void setBulletFont(String typeface){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextFont font = pr.isSetBuFont() ? pr.getBuFont() : pr.addNewBuFont();
-        font.setTypeface(typeface);
-    }
-
-    /**
-     * @return the character to be used in place of the standard bullet point
-     */
-    public String getBulletCharacter(){
-        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuChar()){
-                    setValue(props.getBuChar().getChar());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    public void setBulletCharacter(String str){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextCharBullet c = pr.isSetBuChar() ? pr.getBuChar() : pr.addNewBuChar();
-        c.setChar(str);
-    }
-
-    /**
-     *
-     * @return the color of bullet characters within a given paragraph.
-     * A <code>null</code> value means to use the text font color.
-     */
-    public Color getBulletFontColor(){
-        ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuClr()){
-                    if(props.getBuClr().isSetSrgbClr()){
-                        CTSRgbColor clr = props.getBuClr().getSrgbClr();
-                        byte[] rgb = clr.getVal();
-                        setValue(new Color(0xFF & rgb[0], 0xFF & rgb[1], 0xFF & rgb[2]));
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue();
-    }
-
-    /**
-     * Set the color to be used on bullet characters within a given paragraph.
-     *
-     * @param color the bullet color
-     */
-    public void setBulletFontColor(Color color){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTColor c = pr.isSetBuClr() ? pr.getBuClr() : pr.addNewBuClr();
-        CTSRgbColor clr = c.isSetSrgbClr() ? c.getSrgbClr() : c.addNewSrgbClr();
-        clr.setVal(new byte[]{(byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()});
-    }
-
-    /**
-     * Returns the bullet size that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If bulletSize >= 0, then bulletSize is a percentage of the font size.
-     * If bulletSize < 0, then it specifies the size in points
-     * </p>
-     *
-     * @return the bullet size
-     */
-    public double getBulletFontSize(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuSzPct()){
-                    setValue(props.getBuSzPct().getVal() * 0.001);
-                    return true;
-                }
-                if(props.isSetBuSzPts()){
-                    setValue( - props.getBuSzPts().getVal() * 0.01);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? 100 : fetcher.getValue();
-    }
-
-    /**
-     * Sets the bullet size that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If bulletSize >= 0, then bulletSize is a percentage of the font size.
-     * If bulletSize < 0, then it specifies the size in points
-     * </p>
-     */
-    public void setBulletFontSize(double bulletSize){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-
-        if(bulletSize >= 0) {
-            // percentage
-            CTTextBulletSizePercent pt = pr.isSetBuSzPct() ? pr.getBuSzPct() : pr.addNewBuSzPct();
-            pt.setVal((int)(bulletSize*1000));
-            // unset points if percentage is now set
-            if(pr.isSetBuSzPts()) pr.unsetBuSzPts();
-        } else {
-            // points
-            CTTextBulletSizePoint pt = pr.isSetBuSzPts() ? pr.getBuSzPts() : pr.addNewBuSzPts();
-            pt.setVal((int)(-bulletSize*100));
-            // unset percentage if points is now set
-            if(pr.isSetBuSzPct()) pr.unsetBuSzPct();
-        }
-    }
-
-    /**
-     * Specifies the indent size that will be applied to the first line of text in the paragraph.
-     *
-     * @param value the indent in points, -1 to unset indent and use the default of 0. 
-     */
-    public void setIndent(double value){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(value == -1) {
-            if(pr.isSetIndent()) pr.unsetIndent();
-        } else {
-            pr.setIndent(Units.toEMU(value));
-        }
-    }
-
-    /**
-     *
-     * @return the indent applied to the first line of text in the paragraph.
-     */
-    public double getIndent(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetIndent()){
-                    setValue(Units.toPoints(props.getIndent()));
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-
-        return fetcher.getValue() == null ? 0 : fetcher.getValue();
-    }
-
-
-
-    /**
-     * Specifies the left margin of the paragraph. This is specified in addition to the text body
-     * inset and applies only to this text paragraph. That is the text body inset and the LeftMargin
-     * attributes are additive with respect to the text position.
-     *
-     * @param value the left margin of the paragraph, -1 to clear the margin and use the default of 0.
-     */
-    public void setLeftMargin(double value){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(value == -1) {
-            if(pr.isSetMarL()) pr.unsetMarL();
-        } else {
-            pr.setMarL(Units.toEMU(value));
-        }
-
-    }
-
-    /**
-     *
-     * @return the left margin of the paragraph
-     */
-    public double getLeftMargin(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetMarL()){
-                    double val = Units.toPoints(props.getMarL());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        // if the marL attribute is omitted, then a value of 347663 is implied
-        return fetcher.getValue() == null ? 0 : fetcher.getValue();
-    }
-
-    /**
-     * Specifies the right margin of the paragraph. This is specified in addition to the text body
-     * inset and applies only to this text paragraph. That is the text body inset and the marR
-     * attributes are additive with respect to the text position.
-     *
-     * @param value the right margin of the paragraph, -1 to clear the margin and use the default of 0.
-     */
-    public void setRightMargin(double value){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(value == -1) {
-            if(pr.isSetMarR()) pr.unsetMarR();
-        } else {
-            pr.setMarR(Units.toEMU(value));
-        }
-
-    }
-
-    /**
-     *
-     * @return the right margin of the paragraph
-     */
-    public double getRightMargin(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetMarR()){
-                    double val = Units.toPoints(props.getMarR());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        // if the marL attribute is omitted, then a value of 347663 is implied
-        return fetcher.getValue() == null ? 0 : fetcher.getValue();        
-    }    
-
-    /**
-     *
-     * @return the default size for a tab character within this paragraph in points
-     */
-    public double getDefaultTabSize(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetDefTabSz()){
-                    double val = Units.toPoints(props.getDefTabSz());
-                    setValue(val);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? 0 : fetcher.getValue();
-    }
-
-    public double getTabStop(final int idx){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetTabLst()){
-                    CTTextTabStopList tabStops = props.getTabLst();
-                    if(idx < tabStops.sizeOfTabArray() ) {
-                        CTTextTabStop ts = tabStops.getTabArray(idx);
-                        double val = Units.toPoints(ts.getPos());
-                        setValue(val);
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? 0. : fetcher.getValue();
-    }
-    /**
-     * Add a single tab stop to be used on a line of text when there are one or more tab characters
-     * present within the text. 
-     * 
-     * @param value the position of the tab stop relative to the left margin
-     */
-    public void addTabStop(double value){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextTabStopList tabStops = pr.isSetTabLst() ? pr.getTabLst() : pr.addNewTabLst();
-        tabStops.addNewTab().setPos(Units.toEMU(value));
-    }
-
-    /**
-     * This element specifies the vertical line spacing that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If linespacing >= 0, then linespacing is a percentage of normal line height
-     * If linespacing < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     * Examples:
-     * <pre><code>
-     *      // spacing will be 120% of the size of the largest text on each line
-     *      paragraph.setLineSpacing(120);
-     *
-     *      // spacing will be 200% of the size of the largest text on each line
-     *      paragraph.setLineSpacing(200);
-     *
-     *      // spacing will be 48 points
-     *      paragraph.setLineSpacing(-48.0);
-     * </code></pre>
-     * 
-     * @param linespacing the vertical line spacing
-     */
-    public void setLineSpacing(double linespacing){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextSpacing spc = CTTextSpacing.Factory.newInstance();
-        if(linespacing >= 0) spc.addNewSpcPct().setVal((int)(linespacing*1000));
-        else spc.addNewSpcPts().setVal((int)(-linespacing*100));
-        pr.setLnSpc(spc);
-    }
-
-    /**
-     * Returns the vertical line spacing that is to be used within a paragraph.
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If linespacing >= 0, then linespacing is a percentage of normal line height.
-     * If linespacing < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     *
-     * @return the vertical line spacing.
-     */
-    public double getLineSpacing(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetLnSpc()){
-                    CTTextSpacing spc = props.getLnSpc();
-
-                    if(spc.isSetSpcPct()) setValue( spc.getSpcPct().getVal()*0.001 );
-                    else if (spc.isSetSpcPts()) setValue( -spc.getSpcPts().getVal()*0.01 );
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-
-        double lnSpc = fetcher.getValue() == null ? 100 : fetcher.getValue();
-        if(lnSpc > 0) {
-            // check if the percentage value is scaled
-            CTTextNormalAutofit normAutofit = _shape.getTxBody().getBodyPr().getNormAutofit();
-            if(normAutofit != null) {
-                double scale = 1 - (double)normAutofit.getLnSpcReduction() / 100000;
-                lnSpc *= scale;
-            }
-        }
-        
-        return lnSpc;
-    }
-
-    /**
-     * Set the amount of vertical white space that will be present before the paragraph.
-     * This space is specified in either percentage or points:
-     * <p>
-     * If spaceBefore >= 0, then space is a percentage of normal line height.
-     * If spaceBefore < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     * Examples:
-     * <pre><code>
-     *      // The paragraph will be formatted to have a spacing before the paragraph text.
-     *      // The spacing will be 200% of the size of the largest text on each line
-     *      paragraph.setSpaceBefore(200);
-     *
-     *      // The spacing will be a size of 48 points
-     *      paragraph.setSpaceBefore(-48.0);
-     * </code></pre>
-     *
-     * @param spaceBefore the vertical white space before the paragraph.
-     */
-    public void setSpaceBefore(double spaceBefore){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextSpacing spc = CTTextSpacing.Factory.newInstance();
-        if(spaceBefore >= 0) spc.addNewSpcPct().setVal((int)(spaceBefore*1000));
-        else spc.addNewSpcPts().setVal((int)(-spaceBefore*100));
-        pr.setSpcBef(spc);
-    }
-
-    /**
-     * The amount of vertical white space before the paragraph
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If spaceBefore >= 0, then space is a percentage of normal line height.
-     * If spaceBefore < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     *
-     * @return the vertical white space before the paragraph
-     */
-    public double getSpaceBefore(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetSpcBef()){
-                    CTTextSpacing spc = props.getSpcBef();
-
-                    if(spc.isSetSpcPct()) setValue( spc.getSpcPct().getVal()*0.001 );
-                    else if (spc.isSetSpcPts()) setValue( -spc.getSpcPts().getVal()*0.01 );
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-
-        double spcBef = fetcher.getValue() == null ? 0 : fetcher.getValue();
-        return spcBef;
-    }
-
-    /**
-     * Set the amount of vertical white space that will be present after the paragraph.
-     * This space is specified in either percentage or points:
-     * <p>
-     * If spaceAfter >= 0, then space is a percentage of normal line height.
-     * If spaceAfter < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     * Examples:
-     * <pre><code>
-     *      // The paragraph will be formatted to have a spacing after the paragraph text.
-     *      // The spacing will be 200% of the size of the largest text on each line
-     *      paragraph.setSpaceAfter(200);
-     *
-     *      // The spacing will be a size of 48 points
-     *      paragraph.setSpaceAfter(-48.0);
-     * </code></pre>
-     *
-     * @param spaceAfter the vertical white space after the paragraph.
-     */
-    public void setSpaceAfter(double spaceAfter){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextSpacing spc = CTTextSpacing.Factory.newInstance();
-        if(spaceAfter >= 0) spc.addNewSpcPct().setVal((int)(spaceAfter*1000));
-        else spc.addNewSpcPts().setVal((int)(-spaceAfter*100));
-        pr.setSpcAft(spc);
-    }
-
-    /**
-     * The amount of vertical white space after the paragraph
-     * This may be specified in two different ways, percentage spacing and font point spacing:
-     * <p>
-     * If spaceBefore >= 0, then space is a percentage of normal line height.
-     * If spaceBefore < 0, the absolute value of linespacing is the spacing in points
-     * </p>
-     *
-     * @return the vertical white space after the paragraph
-     */
-    public double getSpaceAfter(){
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetSpcAft()){
-                    CTTextSpacing spc = props.getSpcAft();
-
-                    if(spc.isSetSpcPct()) setValue( spc.getSpcPct().getVal()*0.001 );
-                    else if (spc.isSetSpcPts()) setValue( -spc.getSpcPts().getVal()*0.01 );
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? 0 : fetcher.getValue();
-    }
-
-    /**
-     * Specifies the particular level text properties that this paragraph will follow.
-     * The value for this attribute formats the text according to the corresponding level
-     * paragraph properties defined in the list of styles associated with the body of text
-     * that this paragraph belongs to (therefore in the parent shape).
-     * <p>
-     * Note that the closest properties object to the text is used, therefore if there is
-     * a conflict between the text paragraph properties and the list style properties for 
-     * this level then the text paragraph properties will take precedence.
-     * </p>
-     *
-     * @param level the level (0 ... 4)
-     */
-    public void setLevel(int level){
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-
-        pr.setLvl(level);
-    }
-
-    /**
-     * Returns the level of text properties that this paragraph will follow.
-     * 
-     * @return the text level of this paragraph (0-based). Default is 0.
-     */
-    public int getLevel(){
-        CTTextParagraphProperties pr = _p.getPPr();
-        if(pr == null) return 0;
-
-        return pr.getLvl();
-    }
-    
-
-    /**
-     * Returns whether this paragraph has bullets
-     */
-    public boolean isBullet() {
-        ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if (props.isSetBuNone()) {
-                    setValue(false);
-                    return true;
-                }
-                if (props.isSetBuFont()) {
-                    if (props.isSetBuChar() || props.isSetBuAutoNum()) {
-                        setValue(true);
-                        return true;
-                    } else {
-                        // Excel treats text with buFont but no char/autonum
-                        //  as not bulleted
-                        // Possibly the font is just used if bullets turned on again?
-                    }
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-    
-    /**
-     * Set or unset this paragraph as a bullet point
-     * 
-     * @param flag whether text in this paragraph has bullets
-     */
-    public void setBullet(boolean flag) {
-        if(isBullet() == flag) return;
-
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        if(!flag) {
-            pr.addNewBuNone();
-            
-            if(pr.isSetBuAutoNum()) pr.unsetBuAutoNum();
-            if(pr.isSetBuBlip()) pr.unsetBuBlip();
-            if(pr.isSetBuChar()) pr.unsetBuChar();
-            if(pr.isSetBuClr()) pr.unsetBuClr();
-            if(pr.isSetBuClrTx()) pr.unsetBuClrTx();
-            if(pr.isSetBuFont()) pr.unsetBuFont();
-            if(pr.isSetBuFontTx()) pr.unsetBuFontTx();
-            if(pr.isSetBuSzPct()) pr.unsetBuSzPct();
-            if(pr.isSetBuSzPts()) pr.unsetBuSzPts();
-            if(pr.isSetBuSzTx()) pr.unsetBuSzTx();
-        } else {
-            if(pr.isSetBuNone()) pr.unsetBuNone();
-            if(!pr.isSetBuFont()) pr.addNewBuFont().setTypeface("Arial");
-            if(!pr.isSetBuAutoNum()) pr.addNewBuChar().setChar("\u2022");
-        }
-    }
-
-    /**
-     * Set this paragraph as an automatic numbered bullet point
-     *
-     * @param scheme type of auto-numbering
-     * @param startAt the number that will start number for a given sequence of automatically
-     *        numbered bullets (1-based).
-     */
-    public void setBullet(ListAutoNumber scheme, int startAt) {
-        if(startAt < 1) throw new IllegalArgumentException("Start Number must be greater or equal that 1") ;
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextAutonumberBullet lst = pr.isSetBuAutoNum() ? pr.getBuAutoNum() : pr.addNewBuAutoNum();        
-        lst.setType(STTextAutonumberScheme.Enum.forInt(scheme.ordinal() + 1));
-        lst.setStartAt(startAt);
-        
-        if(!pr.isSetBuFont()) pr.addNewBuFont().setTypeface("Arial");
-        if(pr.isSetBuNone()) pr.unsetBuNone();        
-        // remove these elements if present as it results in invalid content when opening in Excel.
-        if(pr.isSetBuBlip()) pr.unsetBuBlip();
-        if(pr.isSetBuChar()) pr.unsetBuChar();        
-    }
-    
-    /**
-     * Set this paragraph as an automatic numbered bullet point
-     *
-     * @param scheme type of auto-numbering
-     */
-    public void setBullet(ListAutoNumber scheme) {
-        CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
-        CTTextAutonumberBullet lst = pr.isSetBuAutoNum() ? pr.getBuAutoNum() : pr.addNewBuAutoNum();
-        lst.setType(STTextAutonumberScheme.Enum.forInt(scheme.ordinal() + 1));
-        
-        if(!pr.isSetBuFont()) pr.addNewBuFont().setTypeface("Arial");
-        if(pr.isSetBuNone()) pr.unsetBuNone();
-        // remove these elements if present as it results in invalid content when opening in Excel.
-        if(pr.isSetBuBlip()) pr.unsetBuBlip();
-        if(pr.isSetBuChar()) pr.unsetBuChar();
-    }
-    
-    /**
-     * Returns whether this paragraph has automatic numbered bullets
-     */
-    public boolean isBulletAutoNumber() {
-        ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuAutoNum()) {
-                    setValue(true);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? false : fetcher.getValue();
-    }
-    
-    /**
-     * Returns the starting number if this paragraph has automatic numbered bullets, otherwise returns 0
-     */
-    public int getBulletAutoNumberStart() {
-        ParagraphPropertyFetcher<Integer> fetcher = new ParagraphPropertyFetcher<Integer>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuAutoNum() && props.getBuAutoNum().isSetStartAt()) {
-                    setValue(props.getBuAutoNum().getStartAt());
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        return fetcher.getValue() == null ? 0 : fetcher.getValue();
-    }
-    
-    /**
-     * Returns the auto number scheme if this paragraph has automatic numbered bullets, otherwise returns ListAutoNumber.ARABIC_PLAIN
-     */
-    public ListAutoNumber getBulletAutoNumberScheme() {
-        ParagraphPropertyFetcher<ListAutoNumber> fetcher = new ParagraphPropertyFetcher<ListAutoNumber>(getLevel()){
-            public boolean fetch(CTTextParagraphProperties props){
-                if(props.isSetBuAutoNum()) {
-                    setValue(ListAutoNumber.values()[props.getBuAutoNum().getType().intValue() - 1]);
-                    return true;
-                }
-                return false;
-            }
-        };
-        fetchParagraphProperty(fetcher);
-        
-        // Note: documentation does not define a default, return ListAutoNumber.ARABIC_PLAIN (1,2,3...)
-        return fetcher.getValue() == null ? ListAutoNumber.ARABIC_PLAIN : fetcher.getValue();
-    }    
-
- 
-    @SuppressWarnings("rawtypes")
-    private boolean fetchParagraphProperty(ParagraphPropertyFetcher visitor){
-        boolean ok = false;
-
-        if(_p.isSetPPr()) ok = visitor.fetch(_p.getPPr());
-
-        if(!ok) {
-            ok = visitor.fetch(_shape);
-        }
-
-        return ok;
-    }
-    
-    @Override
-    public String toString(){
-        return "[" + getClass() + "]" + getText();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
deleted file mode 100644
index 5b63e94..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextFont;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextNormalAutofit;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextStrikeType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
-
-import java.awt.Color;
-
-/**
- * Represents a run of text within the containing text body. The run element is the
- * lowest level text separation mechanism within a text body.
- */
-public class XSSFTextRun {
-    private final CTRegularTextRun _r;
-    private final XSSFTextParagraph _p;
-
-    XSSFTextRun(CTRegularTextRun r, XSSFTextParagraph p){
-        _r = r;
-        _p = p;
-    }
-
-    XSSFTextParagraph getParentParagraph(){
-        return _p;
-    }
-
-    public String getText(){
-        return _r.getT();
-    }
-
-    public void setText(String text){
-        _r.setT(text);
-    }
-
-    public CTRegularTextRun getXmlObject(){
-        return _r;
-    }
-
-    public void setFontColor(Color color){
-        CTTextCharacterProperties rPr = getRPr();
-        CTSolidColorFillProperties fill = rPr.isSetSolidFill() ? rPr.getSolidFill() : rPr.addNewSolidFill();
-        CTSRgbColor clr = fill.isSetSrgbClr() ? fill.getSrgbClr() : fill.addNewSrgbClr();
-        clr.setVal(new byte[]{(byte)color.getRed(), (byte)color.getGreen(), (byte)color.getBlue()});
-
-        if(fill.isSetHslClr()) fill.unsetHslClr();
-        if(fill.isSetPrstClr()) fill.unsetPrstClr();
-        if(fill.isSetSchemeClr()) fill.unsetSchemeClr();
-        if(fill.isSetScrgbClr()) fill.unsetScrgbClr();
-        if(fill.isSetSysClr()) fill.unsetSysClr();
-
-    }
-
-    public Color getFontColor(){
-
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetSolidFill()){
-            CTSolidColorFillProperties fill = rPr.getSolidFill();
-
-            if(fill.isSetSrgbClr()){
-                CTSRgbColor clr = fill.getSrgbClr();
-                byte[] rgb = clr.getVal();
-                return new Color(0xFF & rgb[0], 0xFF & rgb[1], 0xFF & rgb[2]);
-            }	
-        }
-
-        return new Color(0, 0, 0);
-    }
-
-    /**
-     *
-     * @param fontSize  font size in points.
-     * The value of <code>-1</code> unsets the Sz attribute from the underlying xml bean
-     */
-    public void setFontSize(double fontSize){
-        CTTextCharacterProperties rPr = getRPr();
-        if(fontSize == -1.0) {
-            if(rPr.isSetSz()) rPr.unsetSz();
-        } else {
-            if(fontSize < 1.0) {
-                throw new IllegalArgumentException("Minimum font size is 1pt but was " + fontSize);
-            }
-
-            rPr.setSz((int)(100*fontSize));
-        }
-    }
-
-    /**
-     * @return font size in points or -1 if font size is not set.
-     */
-    public double getFontSize(){
-        double scale = 1;
-        double size = XSSFFont.DEFAULT_FONT_SIZE;	// default font size
-        CTTextNormalAutofit afit = getParentParagraph().getParentShape().getTxBody().getBodyPr().getNormAutofit();
-        if(afit != null) scale = (double)afit.getFontScale() / 100000;
-
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetSz()){
-            size = rPr.getSz()*0.01;        
-        }
-
-        return size * scale;
-    }
-
-    /**
-     *
-     * @return the spacing between characters within a text run,
-     * If this attribute is omitted then a value of 0 or no adjustment is assumed.
-     */
-    public double getCharacterSpacing(){
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetSpc()){
-            return rPr.getSpc()*0.01;
-        }
-        return 0;
-    }
-
-    /**
-     * Set the spacing between characters within a text run.
-     * <p>
-     * The spacing is specified in points. Positive values will cause the text to expand,
-     * negative values to condense.
-     * </p>
-     *
-     * @param spc  character spacing in points.
-     */
-    public void setCharacterSpacing(double spc){
-        CTTextCharacterProperties rPr = getRPr();
-        if(spc == 0.0) {
-            if(rPr.isSetSpc()) rPr.unsetSpc();
-        } else {
-            rPr.setSpc((int)(100*spc));
-        }
-    }
-
-    /**
-     * Specifies the typeface, or name of the font that is to be used for this text run.
-     *
-     * @param typeface  the font to apply to this text run.
-     * The value of <code>null</code> unsets the Typeface attribute from the underlying xml.
-     */
-    public void setFont(String typeface){
-        setFontFamily(typeface, (byte)-1, (byte)-1, false);
-    }
-
-    public void setFontFamily(String typeface, byte charset, byte pictAndFamily, boolean isSymbol){
-        CTTextCharacterProperties rPr = getRPr();
-
-        if(typeface == null){
-            if(rPr.isSetLatin()) rPr.unsetLatin();
-            if(rPr.isSetCs()) rPr.unsetCs();
-            if(rPr.isSetSym()) rPr.unsetSym();
-        } else {
-            if(isSymbol){
-                CTTextFont font = rPr.isSetSym() ? rPr.getSym() : rPr.addNewSym();
-                font.setTypeface(typeface);
-            } else {
-                CTTextFont latin = rPr.isSetLatin() ? rPr.getLatin() : rPr.addNewLatin();
-                latin.setTypeface(typeface);
-                if(charset != -1) latin.setCharset(charset);
-                if(pictAndFamily != -1) latin.setPitchFamily(pictAndFamily);
-            }
-        }
-    }
-
-    /**
-     * @return  font family or null if not set
-     */
-    public String getFontFamily(){
-        CTTextCharacterProperties rPr = getRPr();
-        CTTextFont font = rPr.getLatin();
-        if(font != null){
-            return font.getTypeface();
-        }
-        return XSSFFont.DEFAULT_FONT_NAME;
-    }
-
-    public byte getPitchAndFamily(){
-        CTTextCharacterProperties rPr = getRPr();
-        CTTextFont font = rPr.getLatin();
-        if(font != null){
-            return font.getPitchFamily();
-        }
-        return 0;
-    }
-
-    /**
-     * Specifies whether a run of text will be formatted as strikethrough text.
-     *
-     * @param strike whether a run of text will be formatted as strikethrough text.
-     */
-    public void setStrikethrough(boolean strike) {
-        getRPr().setStrike(strike ? STTextStrikeType.SNG_STRIKE : STTextStrikeType.NO_STRIKE);
-    }
-
-    /**
-     * @return whether a run of text will be formatted as strikethrough text. Default is false.
-     */
-    public boolean isStrikethrough() {
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetStrike()){
-            return rPr.getStrike() != STTextStrikeType.NO_STRIKE;
-        }
-        return false;
-    }
-
-    /**
-     * @return whether a run of text will be formatted as a superscript text. Default is false.
-     */
-    public boolean isSuperscript() {
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetBaseline()){
-            return rPr.getBaseline() > 0;
-        }
-        return false;
-    }
-
-    /**
-     *  Set the baseline for both the superscript and subscript fonts.
-     *  <p>
-     *     The size is specified using a percentage.
-     *     Positive values indicate superscript, negative values indicate subscript.
-     *  </p>
-     *
-     * @param baselineOffset
-     */
-    public void setBaselineOffset(double baselineOffset){
-        getRPr().setBaseline((int) baselineOffset * 1000);
-    }
-
-    /**
-     * Set whether the text in this run is formatted as superscript.
-     * Default base line offset is 30%
-     *
-     * @see #setBaselineOffset(double)
-     */
-    public void setSuperscript(boolean flag){
-        setBaselineOffset(flag ? 30. : 0.);
-    }
-
-    /**
-     * Set whether the text in this run is formatted as subscript.
-     * Default base line offset is -25%.
-     *
-     * @see #setBaselineOffset(double)
-     */
-    public void setSubscript(boolean flag){
-        setBaselineOffset(flag ? -25.0 : 0.);
-    }
-
-    /**
-     * @return whether a run of text will be formatted as a superscript text. Default is false.
-     */
-    public boolean isSubscript() {
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetBaseline()){
-            return rPr.getBaseline() < 0;
-        }
-        return false;
-    }
-
-    /**
-     * @return whether a run of text will be formatted as a superscript text. Default is false.
-     */
-    public TextCap getTextCap() {    	
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetCap()){
-            return TextCap.values()[rPr.getCap().intValue() - 1];
-        }
-        return TextCap.NONE;
-    }
-
-    /**
-     * Specifies whether this run of text will be formatted as bold text
-     *
-     * @param bold whether this run of text will be formatted as bold text
-     */
-    public void setBold(boolean bold){
-        getRPr().setB(bold);
-    }
-
-    /**
-     * @return whether this run of text is formatted as bold text
-     */
-    public boolean isBold(){
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetB()){
-            return rPr.getB();
-        }
-        return false;
-    }
-
-    /**
-     * @param italic whether this run of text is formatted as italic text
-     */
-    public void setItalic(boolean italic){
-        getRPr().setI(italic);
-    }
-
-    /**
-     * @return whether this run of text is formatted as italic text
-     */
-    public boolean isItalic(){
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetI()){
-            return rPr.getI();
-        }
-        return false;
-    }
-
-    /**
-     * @param underline whether this run of text is formatted as underlined text
-     */
-    public void setUnderline(boolean underline) {
-        getRPr().setU(underline ? STTextUnderlineType.SNG : STTextUnderlineType.NONE);
-    }
-
-    /**
-     * @return whether this run of text is formatted as underlined text
-     */
-    public boolean isUnderline(){
-        CTTextCharacterProperties rPr = getRPr();
-        if(rPr.isSetU()){
-            return rPr.getU() != STTextUnderlineType.NONE;
-        }
-        return false;
-    }
-
-    protected CTTextCharacterProperties getRPr(){
-        return _r.isSetRPr() ? _r.getRPr() : _r.addNewRPr();
-    }
-
-    @Override
-    public String toString(){
-        return "[" + getClass() + "]" + getText();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
deleted file mode 100644
index 11501e9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-
-public class XSSFVBAPart extends POIXMLDocumentPart {
-
-    /**
-     * Create a new XSSFVBAPart node
-     */
-    protected XSSFVBAPart() {
-        super();
-    }
-
-    /**
-     * Construct XSSFVBAPart from a package part
-     *
-     * @param part the package part holding the VBA data,
-     * 
-     * @since POI 3.14-Beta1
-     */
-    protected XSSFVBAPart(PackagePart part) {
-        super(part);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFVBAPart(PackagePart part, PackageRelationship rel) {
-        this(part);
-    }
-    
-    /**
-     * Like *PictureData, VBA objects store the actual content in the part
-     * directly without keeping a copy like all others therefore we need to
-     * handle them differently.
-     */
-    protected void prepareForCommit() {
-        // do not clear the part here
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
deleted file mode 100644
index 434742d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.xssf.util.EvilUnclosedBRFixingInputStream;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import com.microsoft.schemas.office.excel.CTClientData;
-import com.microsoft.schemas.office.excel.STObjectType;
-import com.microsoft.schemas.office.office.CTIdMap;
-import com.microsoft.schemas.office.office.CTShapeLayout;
-import com.microsoft.schemas.office.office.STConnectType;
-import com.microsoft.schemas.office.office.STInsetMode;
-import com.microsoft.schemas.vml.CTPath;
-import com.microsoft.schemas.vml.CTShadow;
-import com.microsoft.schemas.vml.CTShape;
-import com.microsoft.schemas.vml.CTShapetype;
-import com.microsoft.schemas.vml.STExt;
-import com.microsoft.schemas.vml.STStrokeJoinStyle;
-import com.microsoft.schemas.vml.STTrueFalse;
-
-/**
- * Represents a SpreadsheetML VML drawing.
- *
- * <p>
- * In Excel 2007 VML drawings are used to describe properties of cell comments,
- * although the spec says that VML is deprecated:
- * </p>
- * <p>
- * The VML format is a legacy format originally introduced with Office 2000 and is included and fully defined
- * in this Standard for backwards compatibility reasons. The DrawingML format is a newer and richer format
- * created with the goal of eventually replacing any uses of VML in the Office Open XML formats. VML should be
- * considered a deprecated format included in Office Open XML for legacy reasons only and new applications that
- * need a file format for drawings are strongly encouraged to use preferentially DrawingML
- * </p>
- * 
- * <p>
- * Warning - Excel is known to put invalid XML into these files!
- *  For example, &gt;br&lt; without being closed or escaped crops up.
- * </p>
- *
- * See 6.4 VML - SpreadsheetML Drawing in Office Open XML Part 4 - Markup Language Reference.pdf
- *
- * @author Yegor Kozlov
- */
-public final class XSSFVMLDrawing extends POIXMLDocumentPart {
-    private static final QName QNAME_SHAPE_LAYOUT = new QName("urn:schemas-microsoft-com:office:office", "shapelayout");
-    private static final QName QNAME_SHAPE_TYPE = new QName("urn:schemas-microsoft-com:vml", "shapetype");
-    private static final QName QNAME_SHAPE = new QName("urn:schemas-microsoft-com:vml", "shape");
-    private static final String COMMENT_SHAPE_TYPE_ID = "_x0000_t202"; // this ID value seems to have significance to Excel >= 2010; see https://issues.apache.org/bugzilla/show_bug.cgi?id=55409
-
-    /**
-     * regexp to parse shape ids, in VML they have weird form of id="_x0000_s1026"
-     */
-    private static final Pattern ptrn_shapeId = Pattern.compile("_x0000_s(\\d+)");
-
-    private List<QName> _qnames = new ArrayList<QName>();
-    private List<XmlObject> _items = new ArrayList<XmlObject>();
-    private String _shapeTypeId;
-    private int _shapeId = 1024;
-
-    /**
-     * Create a new SpreadsheetML drawing
-     *
-     * @see XSSFSheet#createDrawingPatriarch()
-     */
-    protected XSSFVMLDrawing() {
-        super();
-        newDrawing();
-    }
-
-    /**
-     * Construct a SpreadsheetML drawing from a package part
-     *
-     * @param part the package part holding the drawing data,
-     * the content type must be <code>application/vnd.openxmlformats-officedocument.drawing+xml</code>
-     * 
-     * @since POI 3.14-Beta1
-     */
-    protected XSSFVMLDrawing(PackagePart part) throws IOException, XmlException {
-        super(part);
-        read(getPackagePart().getInputStream());
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    protected XSSFVMLDrawing(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
-        this(part);
-    }
-
-    @SuppressWarnings("resource")
-    protected void read(InputStream is) throws IOException, XmlException {
-        Document doc;
-        try {
-            doc = DocumentHelper.readDocument(new EvilUnclosedBRFixingInputStream(is));
-        } catch (SAXException e) {
-            throw new XmlException(e.getMessage(), e);
-        }
-        XmlObject root = XmlObject.Factory.parse(doc, DEFAULT_XML_OPTIONS);
-
-        _qnames = new ArrayList<QName>();
-        _items = new ArrayList<XmlObject>();
-        for(XmlObject obj : root.selectPath("$this/xml/*")) {
-            Node nd = obj.getDomNode();
-            QName qname = new QName(nd.getNamespaceURI(), nd.getLocalName());
-            if (qname.equals(QNAME_SHAPE_LAYOUT)) {
-                _items.add(CTShapeLayout.Factory.parse(obj.xmlText(), DEFAULT_XML_OPTIONS));
-            } else if (qname.equals(QNAME_SHAPE_TYPE)) {
-                CTShapetype st = CTShapetype.Factory.parse(obj.xmlText(), DEFAULT_XML_OPTIONS);
-                _items.add(st);
-                _shapeTypeId = st.getId();
-            } else if (qname.equals(QNAME_SHAPE)) {
-                CTShape shape = CTShape.Factory.parse(obj.xmlText(), DEFAULT_XML_OPTIONS);
-                String id = shape.getId();
-                if(id != null) {
-                    Matcher m = ptrn_shapeId.matcher(id);
-                    if(m.find()) _shapeId = Math.max(_shapeId, Integer.parseInt(m.group(1)));
-                }
-                _items.add(shape);
-            } else {
-                Document doc2;
-                try {
-                    InputSource is2 = new InputSource(new StringReader(obj.xmlText()));
-                    doc2 = DocumentHelper.readDocument(is2);
-                } catch (SAXException e) {
-                    throw new XmlException(e.getMessage(), e);
-                }
-                
-                _items.add(XmlObject.Factory.parse(doc2, DEFAULT_XML_OPTIONS));
-            }
-            _qnames.add(qname);
-        }
-    }
-
-    protected List<XmlObject> getItems(){
-        return _items;
-    }
-
-    protected void write(OutputStream out) throws IOException {
-        XmlObject rootObject = XmlObject.Factory.newInstance();
-        XmlCursor rootCursor = rootObject.newCursor();
-        rootCursor.toNextToken();
-        rootCursor.beginElement("xml");
-
-        for(int i=0; i < _items.size(); i++){
-            XmlCursor xc = _items.get(i).newCursor();
-            rootCursor.beginElement(_qnames.get(i));
-            while(xc.toNextToken() == XmlCursor.TokenType.ATTR) {
-                Node anode = xc.getDomNode();
-                rootCursor.insertAttributeWithValue(anode.getLocalName(), anode.getNamespaceURI(), anode.getNodeValue());
-            }
-            xc.toStartDoc();
-            xc.copyXmlContents(rootCursor);
-            rootCursor.toNextToken();
-            xc.dispose();
-        }
-        rootCursor.dispose();
-
-        rootObject.save(out, DEFAULT_XML_OPTIONS);
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        write(out);
-        out.close();
-    }
-
-    /**
-     * Initialize a new Speadsheet VML drawing
-     */
-    private void newDrawing(){
-        CTShapeLayout layout = CTShapeLayout.Factory.newInstance();
-        layout.setExt(STExt.EDIT);
-        CTIdMap idmap = layout.addNewIdmap();
-        idmap.setExt(STExt.EDIT);
-        idmap.setData("1");
-        _items.add(layout);
-        _qnames.add(QNAME_SHAPE_LAYOUT);
-
-        CTShapetype shapetype = CTShapetype.Factory.newInstance();
-        _shapeTypeId = COMMENT_SHAPE_TYPE_ID;
-        shapetype.setId(_shapeTypeId);
-        shapetype.setCoordsize("21600,21600");
-        shapetype.setSpt(202);
-        shapetype.setPath2("m,l,21600r21600,l21600,xe");
-        shapetype.addNewStroke().setJoinstyle(STStrokeJoinStyle.MITER);
-        CTPath path = shapetype.addNewPath();
-        path.setGradientshapeok(STTrueFalse.T);
-        path.setConnecttype(STConnectType.RECT);
-        _items.add(shapetype);
-        _qnames.add(QNAME_SHAPE_TYPE);
-    }
-
-    protected CTShape newCommentShape(){
-        CTShape shape = CTShape.Factory.newInstance();
-        shape.setId("_x0000_s" + (++_shapeId));
-        shape.setType("#" + _shapeTypeId);
-        shape.setStyle("position:absolute; visibility:hidden");
-        shape.setFillcolor("#ffffe1");
-        shape.setInsetmode(STInsetMode.AUTO);
-        shape.addNewFill().setColor("#ffffe1");
-        CTShadow shadow = shape.addNewShadow();
-        shadow.setOn(STTrueFalse.T);
-        shadow.setColor("black");
-        shadow.setObscured(STTrueFalse.T);
-        shape.addNewPath().setConnecttype(STConnectType.NONE);
-        shape.addNewTextbox().setStyle("mso-direction-alt:auto");
-        CTClientData cldata = shape.addNewClientData();
-        cldata.setObjectType(STObjectType.NOTE);
-        cldata.addNewMoveWithCells();
-        cldata.addNewSizeWithCells();
-        cldata.addNewAnchor().setStringValue("1, 15, 0, 2, 3, 15, 3, 16");
-        cldata.addNewAutoFill().setStringValue("False");
-        cldata.addNewRow().setBigIntegerValue(new BigInteger("0"));
-        cldata.addNewColumn().setBigIntegerValue(new BigInteger("0"));
-        _items.add(shape);
-        _qnames.add(QNAME_SHAPE);
-        return shape;
-    }
-
-    /**
-     * Find a shape with ClientData of type "NOTE" and the specified row and column
-     *
-     * @return the comment shape or <code>null</code>
-     */
-    protected CTShape findCommentShape(int row, int col){
-        for(XmlObject itm : _items){
-            if(itm instanceof CTShape){
-                CTShape sh = (CTShape)itm;
-                if(sh.sizeOfClientDataArray() > 0){
-                    CTClientData cldata = sh.getClientDataArray(0);
-                    if(cldata.getObjectType() == STObjectType.NOTE){
-                        int crow = cldata.getRowArray(0).intValue();
-                        int ccol = cldata.getColumnArray(0).intValue();
-                        if(crow == row && ccol == col) {
-                            return sh;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    protected boolean removeCommentShape(int row, int col){
-        CTShape shape = findCommentShape(row, col);
-        return shape != null && _items.remove(shape);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
deleted file mode 100644
index 019b145..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ /dev/null
@@ -1,2407 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-import static org.apache.poi.xssf.usermodel.helpers.XSSFPasswordHelper.setPassword;
-import static org.apache.poi.xssf.usermodel.helpers.XSSFPasswordHelper.validatePassword;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.regex.Pattern;
-
-import javax.xml.namespace.QName;
-
-import org.apache.commons.collections4.ListValuedMap;
-import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.POIXMLProperties;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
-import org.apache.poi.ss.formula.udf.IndexedUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.WorkbookUtil;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.PackageHelper;
-import org.apache.poi.xssf.XLSBUnsupportedException;
-import org.apache.poi.xssf.model.CalculationChain;
-import org.apache.poi.xssf.model.ExternalLinksTable;
-import org.apache.poi.xssf.model.MapInfo;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.model.ThemesTable;
-import org.apache.poi.xssf.usermodel.helpers.XSSFFormulaUtils;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBookView;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBookViews;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedNames;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDialogsheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTExternalReference;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCache;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCaches;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheets;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbookPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbookProtection;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCalcMode;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STSheetState;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.WorkbookDocument;
-
-/**
- * High level representation of a SpreadsheetML workbook.  This is the first object most users
- * will construct whether they are reading or writing a workbook.  It is also the
- * top level object for creating new sheets/etc.
- */
-public class XSSFWorkbook extends POIXMLDocument implements Workbook {
-    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-
-    /**
-     * Width of one character of the default font in pixels. Same for Calibry and Arial.
-     */
-    public static final float DEFAULT_CHARACTER_WIDTH = 7.0017f;
-
-    /**
-     * Excel silently truncates long sheet names to 31 chars.
-     * This constant is used to ensure uniqueness in the first 31 chars
-     */
-    private static final int MAX_SENSITIVE_SHEET_NAME_LEN = 31;
-
-    /**
-     * Images formats supported by XSSF but not by HSSF
-     */
-    public static final int PICTURE_TYPE_GIF = 8;
-    public static final int PICTURE_TYPE_TIFF = 9;
-    public static final int PICTURE_TYPE_EPS = 10;
-    public static final int PICTURE_TYPE_BMP = 11;
-    public static final int PICTURE_TYPE_WPG = 12;
-
-    /**
-     * The underlying XML bean
-     */
-    private CTWorkbook workbook;
-
-    /**
-     * this holds the XSSFSheet objects attached to this workbook
-     */
-    private List<XSSFSheet> sheets;
-
-    /**
-     * this holds the XSSFName objects attached to this workbook, keyed by lower-case name
-     */
-    private ListValuedMap<String, XSSFName> namedRangesByName;
-
-    /**
-     * this holds the XSSFName objects attached to this workbook
-     */
-    private List<XSSFName> namedRanges;
-
-    /**
-     * shared string table - a cache of strings in this workbook
-     */
-    private SharedStringsTable sharedStringSource;
-
-    /**
-     * A collection of shared objects used for styling content,
-     * e.g. fonts, cell styles, colors, etc.
-     */
-    private StylesTable stylesSource;
-
-    /**
-     * The locator of user-defined functions.
-     * By default includes functions from the Excel Analysis Toolpack
-     */
-    private IndexedUDFFinder _udfFinder = new IndexedUDFFinder(AggregatingUDFFinder.DEFAULT);
-
-    /**
-     * TODO
-     */
-    private CalculationChain calcChain;
-    
-    /**
-     * External Links, for referencing names or cells in other workbooks.
-     */
-    private List<ExternalLinksTable> externalLinks;
-
-    /**
-     * A collection of custom XML mappings
-     */
-    private MapInfo mapInfo;
-
-    /**
-     * Used to keep track of the data formatter so that all
-     * createDataFormatter calls return the same one for a given
-     * book.  This ensures that updates from one places is visible
-     * someplace else.
-     */
-    private XSSFDataFormat formatter;
-
-    /**
-     * The policy to apply in the event of missing or
-     *  blank cells when fetching from a row.
-     * See {@link org.apache.poi.ss.usermodel.Row.MissingCellPolicy}
-     */
-    private MissingCellPolicy _missingCellPolicy = MissingCellPolicy.RETURN_NULL_AND_BLANK;
-
-    /**
-     * array of pictures for this workbook
-     */
-    private List<XSSFPictureData> pictures;
-
-    private static POILogger logger = POILogFactory.getLogger(XSSFWorkbook.class);
-
-    /**
-     * cached instance of XSSFCreationHelper for this workbook
-     * @see {@link #getCreationHelper()}
-     */
-    private XSSFCreationHelper _creationHelper;
-
-    /**
-     * List of all pivot tables in workbook
-     */
-    private List<XSSFPivotTable> pivotTables;
-    private List<CTPivotCache> pivotCaches;
-
-
-    /**
-     * Create a new SpreadsheetML workbook.
-     */
-    public XSSFWorkbook() {
-        this(XSSFWorkbookType.XLSX);
-    }
-
-    /**
-     * Create a new SpreadsheetML workbook.
-     * @param workbookType The type of workbook to make (.xlsx or .xlsm).
-     */
-    public XSSFWorkbook(XSSFWorkbookType workbookType) {
-        super(newPackage(workbookType));
-        onWorkbookCreate();
-    }
-
-    /**
-     * Constructs a XSSFWorkbook object given a OpenXML4J <code>Package</code> object,
-     *  see <a href="http://poi.apache.org/oxml4j/">http://poi.apache.org/oxml4j/</a>.
-     * 
-     * <p>Once you have finished working with the Workbook, you should close the package
-     * by calling either {@link #close()} or {@link OPCPackage#close()}, to avoid 
-     * leaving file handles open.
-     * 
-     * <p>Creating a XSSFWorkbook from a file-backed OPC Package has a lower memory
-     *  footprint than an InputStream backed one.
-     *
-     * @param pkg the OpenXML4J <code>OPC Package</code> object.
-     */
-    public XSSFWorkbook(OPCPackage pkg) throws IOException {
-        super(pkg);
-        
-        beforeDocumentRead();
-        
-        // Build a tree of POIXMLDocumentParts, this workbook being the root
-        load(XSSFFactory.getInstance());
-        
-        // some broken Workbooks miss this...
-        if(!workbook.isSetBookViews()) {
-            CTBookViews bvs = workbook.addNewBookViews();
-            CTBookView bv = bvs.addNewWorkbookView();
-            bv.setActiveTab(0);
-        }
-    }
-
-    /**
-     * Constructs a XSSFWorkbook object, by buffering the whole stream into memory
-     *  and then opening an {@link OPCPackage} object for it.
-     * 
-     * <p>Using an {@link InputStream} requires more memory than using a File, so
-     *  if a {@link File} is available then you should instead do something like
-     *   <pre><code>
-     *       OPCPackage pkg = OPCPackage.open(path);
-     *       XSSFWorkbook wb = new XSSFWorkbook(pkg);
-     *       // work with the wb object
-     *       ......
-     *       pkg.close(); // gracefully closes the underlying zip file
-     *   </code></pre>
-     */
-    public XSSFWorkbook(InputStream is) throws IOException {
-        super(PackageHelper.open(is));
-
-        beforeDocumentRead();
-        
-        // Build a tree of POIXMLDocumentParts, this workbook being the root
-        load(XSSFFactory.getInstance());
-
-        // some broken Workbooks miss this...
-        if(!workbook.isSetBookViews()) {
-            CTBookViews bvs = workbook.addNewBookViews();
-            CTBookView bv = bvs.addNewWorkbookView();
-            bv.setActiveTab(0);
-        }
-    }
-
-    /**
-     * Constructs a XSSFWorkbook object from a given file.
-     * 
-     * <p>Once you have finished working with the Workbook, you should close 
-     * the package by calling  {@link #close()}, to avoid leaving file 
-     * handles open.
-     * 
-     * <p>Opening a XSSFWorkbook from a file has a lower memory footprint 
-     *  than opening from an InputStream
-     *  
-     * @param file   the file to open
-     */
-    public XSSFWorkbook(File file) throws IOException, InvalidFormatException {
-        this(OPCPackage.open(file));
-    }
-    
-    /**
-     * Constructs a XSSFWorkbook object given a file name.
-     *
-     * 
-     * <p>Once you have finished working with the Workbook, you should close 
-     * the package by calling  {@link #close()}, to avoid leaving file 
-     * handles open.
-     * 
-     * <p>Opening a XSSFWorkbook from a file has a lower memory footprint 
-     *  than opening from an InputStream
-     *
-     * @param path   the file name.
-     */
-    public XSSFWorkbook(String path) throws IOException {
-        this(openPackage(path));
-    }
-    
-    protected void beforeDocumentRead() {
-        // Ensure it isn't a XLSB file, which we don't support
-        if (getCorePart().getContentType().equals(XSSFRelation.XLSB_BINARY_WORKBOOK.getContentType())) {
-            throw new XLSBUnsupportedException();
-        }
-
-        // Create arrays for parts attached to the workbook itself
-        pivotTables = new ArrayList<XSSFPivotTable>();
-        pivotCaches = new ArrayList<CTPivotCache>();
-    }
-
-    @Override
-    protected void onDocumentRead() throws IOException {
-        try {
-            WorkbookDocument doc = WorkbookDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-            this.workbook = doc.getWorkbook();
-
-            ThemesTable theme = null;
-            Map<String, XSSFSheet> shIdMap = new HashMap<String, XSSFSheet>();
-            Map<String, ExternalLinksTable> elIdMap = new HashMap<String, ExternalLinksTable>();
-            for(RelationPart rp : getRelationParts()){
-                POIXMLDocumentPart p = rp.getDocumentPart();
-                if(p instanceof SharedStringsTable) sharedStringSource = (SharedStringsTable)p;
-                else if(p instanceof StylesTable) stylesSource = (StylesTable)p;
-                else if(p instanceof ThemesTable) theme = (ThemesTable)p;
-                else if(p instanceof CalculationChain) calcChain = (CalculationChain)p;
-                else if(p instanceof MapInfo) mapInfo = (MapInfo)p;
-                else if (p instanceof XSSFSheet) {
-                    shIdMap.put(rp.getRelationship().getId(), (XSSFSheet)p);
-                }
-                else if (p instanceof ExternalLinksTable) {
-                    elIdMap.put(rp.getRelationship().getId(), (ExternalLinksTable)p);
-                }
-            }
-            boolean packageReadOnly = (getPackage().getPackageAccess() == PackageAccess.READ);
-            
-            if (stylesSource == null) {
-                // Create Styles if it is missing
-                if (packageReadOnly) {
-                    stylesSource = new StylesTable();
-                } else {
-                    stylesSource = (StylesTable)createRelationship(XSSFRelation.STYLES, XSSFFactory.getInstance());
-                }
-            }
-            stylesSource.setWorkbook(this);
-            stylesSource.setTheme(theme);
-
-            if (sharedStringSource == null) {
-                // Create SST if it is missing
-                if (packageReadOnly) {
-                    sharedStringSource = new SharedStringsTable();
-                } else {
-                    sharedStringSource = (SharedStringsTable)createRelationship(XSSFRelation.SHARED_STRINGS, XSSFFactory.getInstance());
-                }
-            }
-            
-            // Load individual sheets. The order of sheets is defined by the order
-            //  of CTSheet elements in the workbook
-            sheets = new ArrayList<XSSFSheet>(shIdMap.size());
-            for (CTSheet ctSheet : this.workbook.getSheets().getSheetArray()) {
-                parseSheet(shIdMap, ctSheet);
-            }
-            
-            // Load the external links tables. Their order is defined by the order 
-            //  of CTExternalReference elements in the workbook
-            externalLinks = new ArrayList<ExternalLinksTable>(elIdMap.size());
-            if (this.workbook.isSetExternalReferences()) {
-                for (CTExternalReference er : this.workbook.getExternalReferences().getExternalReferenceArray()) {
-                    ExternalLinksTable el = elIdMap.get(er.getId());
-                    if(el == null) {
-                        logger.log(POILogger.WARN, "ExternalLinksTable with r:id " + er.getId()+ " was defined, but didn't exist in package, skipping");
-                        continue;
-                    }
-                    externalLinks.add(el);
-                }
-            }
-            
-            // Process the named ranges
-            reprocessNamedRanges();
-        } catch (XmlException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Not normally to be called externally, but possibly to be overridden to avoid
-     * the DOM based parse of large sheets (see examples).
-     */
-    public void parseSheet(Map<String, XSSFSheet> shIdMap, CTSheet ctSheet) {
-        XSSFSheet sh = shIdMap.get(ctSheet.getId());
-        if(sh == null) {
-            logger.log(POILogger.WARN, "Sheet with name " + ctSheet.getName() + " and r:id " + ctSheet.getId()+ " was defined, but didn't exist in package, skipping");
-            return;
-        }
-        sh.sheet = ctSheet;
-        sh.onDocumentRead();
-        sheets.add(sh);
-    }
-
-    /**
-     * Create a new CTWorkbook with all values set to default
-     */
-    private void onWorkbookCreate() {
-        workbook = CTWorkbook.Factory.newInstance();
-
-        // don't EVER use the 1904 date system
-        CTWorkbookPr workbookPr = workbook.addNewWorkbookPr();
-        workbookPr.setDate1904(false);
-
-        CTBookViews bvs = workbook.addNewBookViews();
-        CTBookView bv = bvs.addNewWorkbookView();
-        bv.setActiveTab(0);
-        workbook.addNewSheets();
-
-        POIXMLProperties.ExtendedProperties expProps = getProperties().getExtendedProperties();
-        expProps.getUnderlyingProperties().setApplication(DOCUMENT_CREATOR);
-
-        sharedStringSource = (SharedStringsTable)createRelationship(XSSFRelation.SHARED_STRINGS, XSSFFactory.getInstance());
-        stylesSource = (StylesTable)createRelationship(XSSFRelation.STYLES, XSSFFactory.getInstance());
-        stylesSource.setWorkbook(this);
-
-        namedRanges = new ArrayList<XSSFName>();
-        namedRangesByName = new ArrayListValuedHashMap<String, XSSFName>();
-        sheets = new ArrayList<XSSFSheet>();
-        pivotTables = new ArrayList<XSSFPivotTable>();
-    }
-
-    /**
-     * Create a new SpreadsheetML package and setup the default minimal content
-     */
-    protected static OPCPackage newPackage(XSSFWorkbookType workbookType) {
-        try {
-            OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream());
-            // Main part
-            PackagePartName corePartName = PackagingURIHelper.createPartName(XSSFRelation.WORKBOOK.getDefaultFileName());
-            // Create main part relationship
-            pkg.addRelationship(corePartName, TargetMode.INTERNAL, PackageRelationshipTypes.CORE_DOCUMENT);
-            // Create main document part
-            pkg.createPart(corePartName, workbookType.getContentType());
-
-            pkg.getPackageProperties().setCreatorProperty(DOCUMENT_CREATOR);
-
-            return pkg;
-        } catch (Exception e){
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Return the underlying XML bean
-     *
-     * @return the underlying CTWorkbook bean
-     */
-    @Internal
-    public CTWorkbook getCTWorkbook() {
-        return this.workbook;
-    }
-
-    /**
-     * Adds a picture to the workbook.
-     *
-     * @param pictureData       The bytes of the picture
-     * @param format            The format of the picture.
-     *
-     * @return the index to this picture (0 based), the added picture can be obtained from {@link #getAllPictures()} .
-     * @see Workbook#PICTURE_TYPE_EMF
-     * @see Workbook#PICTURE_TYPE_WMF
-     * @see Workbook#PICTURE_TYPE_PICT
-     * @see Workbook#PICTURE_TYPE_JPEG
-     * @see Workbook#PICTURE_TYPE_PNG
-     * @see Workbook#PICTURE_TYPE_DIB
-     * @see #getAllPictures()
-     */
-    @Override
-    public int addPicture(byte[] pictureData, int format) {
-        int imageNumber = getAllPictures().size() + 1;
-        XSSFPictureData img = (XSSFPictureData)createRelationship(XSSFPictureData.RELATIONS[format], XSSFFactory.getInstance(), imageNumber, true).getDocumentPart();
-        try {
-            OutputStream out = img.getPackagePart().getOutputStream();
-            out.write(pictureData);
-            out.close();
-        } catch (IOException e){
-            throw new POIXMLException(e);
-        }
-        pictures.add(img);
-        return imageNumber - 1;
-    }
-
-    /**
-     * Adds a picture to the workbook.
-     *
-     * @param is                The sream to read image from
-     * @param format            The format of the picture.
-     *
-     * @return the index to this picture (0 based), the added picture can be obtained from {@link #getAllPictures()} .
-     * @see Workbook#PICTURE_TYPE_EMF
-     * @see Workbook#PICTURE_TYPE_WMF
-     * @see Workbook#PICTURE_TYPE_PICT
-     * @see Workbook#PICTURE_TYPE_JPEG
-     * @see Workbook#PICTURE_TYPE_PNG
-     * @see Workbook#PICTURE_TYPE_DIB
-     * @see #getAllPictures()
-     */
-    public int addPicture(InputStream is, int format) throws IOException {
-        int imageNumber = getAllPictures().size() + 1;
-        XSSFPictureData img = createRelationship(XSSFPictureData.RELATIONS[format], XSSFFactory.getInstance(), imageNumber, true).getDocumentPart();
-        OutputStream out = img.getPackagePart().getOutputStream();
-        IOUtils.copy(is, out);
-        out.close();
-        pictures.add(img);
-        return imageNumber - 1;
-    }
-
-    /**
-     * Create an XSSFSheet from an existing sheet in the XSSFWorkbook.
-     *  The cloned sheet is a deep copy of the original.
-     *
-     * @param sheetNum The index of the sheet to clone
-     * @return XSSFSheet representing the cloned sheet.
-     * @throws IllegalArgumentException if the sheet index in invalid
-     * @throws POIXMLException if there were errors when cloning
-     */
-    @Override
-    public XSSFSheet cloneSheet(int sheetNum) {
-        return cloneSheet(sheetNum, null);
-    }
-
-    /**
-     * Create an XSSFSheet from an existing sheet in the XSSFWorkbook.
-     *  The cloned sheet is a deep copy of the original but with a new given
-     *  name.
-     *
-     * @param sheetNum The index of the sheet to clone
-     * @param newName The name to set for the newly created sheet
-     * @return XSSFSheet representing the cloned sheet.
-     * @throws IllegalArgumentException if the sheet index or the sheet
-     *         name is invalid
-     * @throws POIXMLException if there were errors when cloning
-     */
-    public XSSFSheet cloneSheet(int sheetNum, String newName) {
-        validateSheetIndex(sheetNum);
-        XSSFSheet srcSheet = sheets.get(sheetNum);
-
-        if (newName == null) {
-            String srcName = srcSheet.getSheetName();
-            newName = getUniqueSheetName(srcName);
-        } else {
-            validateSheetName(newName);
-        }
-
-        XSSFSheet clonedSheet = createSheet(newName);
-
-        // copy sheet's relations
-        List<RelationPart> rels = srcSheet.getRelationParts();
-        // if the sheet being cloned has a drawing then rememebr it and re-create it too
-        XSSFDrawing dg = null;
-        for(RelationPart rp : rels) {
-            POIXMLDocumentPart r = rp.getDocumentPart();
-            // do not copy the drawing relationship, it will be re-created
-            if(r instanceof XSSFDrawing) {
-                dg = (XSSFDrawing)r;
-                continue;
-            }
-
-            addRelation(rp, clonedSheet);
-        }
-
-        try {
-            for(PackageRelationship pr : srcSheet.getPackagePart().getRelationships()) {
-                if (pr.getTargetMode() == TargetMode.EXTERNAL) {
-                    clonedSheet.getPackagePart().addExternalRelationship
-                        (pr.getTargetURI().toASCIIString(), pr.getRelationshipType(), pr.getId());
-                }
-            }
-        } catch (InvalidFormatException e) {
-            throw new POIXMLException("Failed to clone sheet", e);
-        }
-        
-        
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            srcSheet.write(out);
-            clonedSheet.read(new ByteArrayInputStream(out.toByteArray()));
-        } catch (IOException e){
-            throw new POIXMLException("Failed to clone sheet", e);
-        }
-        CTWorksheet ct = clonedSheet.getCTWorksheet();
-        if(ct.isSetLegacyDrawing()) {
-            logger.log(POILogger.WARN, "Cloning sheets with comments is not yet supported.");
-            ct.unsetLegacyDrawing();
-        }
-        if (ct.isSetPageSetup()) {
-            logger.log(POILogger.WARN, "Cloning sheets with page setup is not yet supported.");
-            ct.unsetPageSetup();
-        }
-
-        clonedSheet.setSelected(false);
-
-        // clone the sheet drawing alongs with its relationships
-        if (dg != null) {
-            if(ct.isSetDrawing()) {
-                // unset the existing reference to the drawing,
-                // so that subsequent call of clonedSheet.createDrawingPatriarch() will create a new one
-                ct.unsetDrawing();
-            }
-            XSSFDrawing clonedDg = clonedSheet.createDrawingPatriarch();
-            // copy drawing contents
-            clonedDg.getCTDrawing().set(dg.getCTDrawing());
-
-            clonedDg = clonedSheet.createDrawingPatriarch();
-            
-            // Clone drawing relations
-            List<RelationPart> srcRels = srcSheet.createDrawingPatriarch().getRelationParts();
-            for (RelationPart rp : srcRels) {
-                addRelation(rp, clonedDg);
-            }
-        }
-        return clonedSheet;
-    }
-    
-    /**
-     * @since 3.14-Beta1
-     */
-    private static void addRelation(RelationPart rp, POIXMLDocumentPart target) {
-        PackageRelationship rel = rp.getRelationship();
-        if (rel.getTargetMode() == TargetMode.EXTERNAL) {
-            target.getPackagePart().addRelationship(
-                rel.getTargetURI(), rel.getTargetMode(), rel.getRelationshipType(), rel.getId());
-        } else {        
-            XSSFRelation xssfRel = XSSFRelation.getInstance(rel.getRelationshipType());
-            if (xssfRel == null) {
-                // Don't copy all relations blindly, but only the ones we know about
-                throw new POIXMLException("Can't clone sheet - unknown relation type found: "+rel.getRelationshipType());
-            }
-            target.addRelation(rel.getId(), xssfRel, rp.getDocumentPart());
-        }
-    }
-
-    /**
-     * Generate a valid sheet name based on the existing one. Used when cloning sheets.
-     *
-     * @param srcName the original sheet name to
-     * @return clone sheet name
-     */
-    private String getUniqueSheetName(String srcName) {
-        int uniqueIndex = 2;
-        String baseName = srcName;
-        int bracketPos = srcName.lastIndexOf('(');
-        if (bracketPos > 0 && srcName.endsWith(")")) {
-            String suffix = srcName.substring(bracketPos + 1, srcName.length() - ")".length());
-            try {
-                uniqueIndex = Integer.parseInt(suffix.trim());
-                uniqueIndex++;
-                baseName = srcName.substring(0, bracketPos).trim();
-            } catch (NumberFormatException e) {
-                // contents of brackets not numeric
-            }
-        }
-        while (true) {
-            // Try and find the next sheet name that is unique
-            String index = Integer.toString(uniqueIndex++);
-            String name;
-            if (baseName.length() + index.length() + 2 < 31) {
-                name = baseName + " (" + index + ")";
-            } else {
-                name = baseName.substring(0, 31 - index.length() - 2) + "(" + index + ")";
-            }
-
-            //If the sheet name is unique, then set it otherwise move on to the next number.
-            if (getSheetIndex(name) == -1) {
-                return name;
-            }
-        }
-    }
-
-    /**
-     * Create a new XSSFCellStyle and add it to the workbook's style table
-     *
-     * @return the new XSSFCellStyle object
-     */
-    @Override
-    public XSSFCellStyle createCellStyle() {
-        return stylesSource.createCellStyle();
-    }
-
-    /**
-     * Returns the workbook's data format table (a factory for creating data format strings).
-     *
-     * @return the XSSFDataFormat object
-     * @see org.apache.poi.ss.usermodel.DataFormat
-     */
-    @Override
-    public XSSFDataFormat createDataFormat() {
-        if (formatter == null)
-            formatter = new XSSFDataFormat(stylesSource);
-        return formatter;
-    }
-
-    /**
-     * Create a new Font and add it to the workbook's font table
-     *
-     * @return new font object
-     */
-    @Override
-    public XSSFFont createFont() {
-        XSSFFont font = new XSSFFont();
-        font.registerTo(stylesSource);
-        return font;
-    }
-
-    @Override
-    public XSSFName createName() {
-        CTDefinedName ctName = CTDefinedName.Factory.newInstance();
-        ctName.setName("");
-        return createAndStoreName(ctName);
-    }
-
-    private XSSFName createAndStoreName(CTDefinedName ctName) {
-        XSSFName name = new XSSFName(ctName, this);
-        namedRanges.add(name);
-        namedRangesByName.put(ctName.getName().toLowerCase(Locale.ENGLISH), name);
-        return name;
-    }
-
-    /**
-     * Create an XSSFSheet for this workbook, adds it to the sheets and returns
-     * the high level representation.  Use this to create new sheets.
-     *
-     * @return XSSFSheet representing the new sheet.
-     */
-    @Override
-    public XSSFSheet createSheet() {
-        String sheetname = "Sheet" + (sheets.size());
-        int idx = 0;
-        while(getSheet(sheetname) != null) {
-            sheetname = "Sheet" + idx;
-            idx++;
-        }
-        return createSheet(sheetname);
-    }
-
-    /**
-     * Create a new sheet for this Workbook and return the high level representation.
-     * Use this to create new sheets.
-     *
-     * <p>
-     *     Note that Excel allows sheet names up to 31 chars in length but other applications
-     *     (such as OpenOffice) allow more. Some versions of Excel crash with names longer than 31 chars,
-     *     others - truncate such names to 31 character.
-     * </p>
-     * <p>
-     *     POI's SpreadsheetAPI silently truncates the input argument to 31 characters.
-     *     Example:
-     *
-     *     <pre><code>
-     *     Sheet sheet = workbook.createSheet("My very long sheet name which is longer than 31 chars"); // will be truncated
-     *     assert 31 == sheet.getSheetName().length();
-     *     assert "My very long sheet name which i" == sheet.getSheetName();
-     *     </code></pre>
-     * </p>
-     *
-     * Except the 31-character constraint, Excel applies some other rules:
-     * <p>
-     * Sheet name MUST be unique in the workbook and MUST NOT contain the any of the following characters:
-     * <ul>
-     * <li> 0x0000 </li>
-     * <li> 0x0003 </li>
-     * <li> colon (:) </li>
-     * <li> backslash (\) </li>
-     * <li> asterisk (*) </li>
-     * <li> question mark (?) </li>
-     * <li> forward slash (/) </li>
-     * <li> opening square bracket ([) </li>
-     * <li> closing square bracket (]) </li>
-     * </ul>
-     * The string MUST NOT begin or end with the single quote (') character.
-     * </p>
-     *
-     * <p>
-     * See {@link org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)}
-     *      for a safe way to create valid names
-     * </p>
-     * @param sheetname  sheetname to set for the sheet.
-     * @return Sheet representing the new sheet.
-     * @throws IllegalArgumentException if the name is null or invalid
-     *  or workbook already contains a sheet with this name
-     * @see org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)
-     */
-    @Override
-    public XSSFSheet createSheet(String sheetname) {
-        if (sheetname == null) {
-            throw new IllegalArgumentException("sheetName must not be null");
-        }
-
-        validateSheetName(sheetname);
-
-        // YK: Mimic Excel and silently truncate sheet names longer than 31 characters
-        if(sheetname.length() > 31) sheetname = sheetname.substring(0, 31);
-        WorkbookUtil.validateSheetName(sheetname);
-
-        CTSheet sheet = addSheet(sheetname);
-
-        int sheetNumber = 1;
-        outerloop:
-        while(true) {
-            for(XSSFSheet sh : sheets) {
-                sheetNumber = (int)Math.max(sh.sheet.getSheetId() + 1, sheetNumber);
-            }
-            
-            // Bug 57165: We also need to check that the resulting file name is not already taken
-            // this can happen when moving/cloning sheets
-            String sheetName = XSSFRelation.WORKSHEET.getFileName(sheetNumber);
-            for(POIXMLDocumentPart relation : getRelations()) {
-                if(relation.getPackagePart() != null && 
-                        sheetName.equals(relation.getPackagePart().getPartName().getName())) {
-                    // name is taken => try next one
-                    sheetNumber++;
-                    continue outerloop;
-                }
-            }
-
-            // no duplicate found => use this one
-            break;
-        }
-
-        RelationPart rp = createRelationship(XSSFRelation.WORKSHEET, XSSFFactory.getInstance(), sheetNumber, false);
-        XSSFSheet wrapper = rp.getDocumentPart();
-        wrapper.sheet = sheet;
-        sheet.setId(rp.getRelationship().getId());
-        sheet.setSheetId(sheetNumber);
-        if (sheets.isEmpty()) wrapper.setSelected(true);
-        sheets.add(wrapper);
-        return wrapper;
-    }
-
-    private void validateSheetName(final String sheetName) throws IllegalArgumentException {
-        if (containsSheet( sheetName, sheets.size() )) {
-            throw new IllegalArgumentException("The workbook already contains a sheet named '" + sheetName + "'");
-        }
-    }
-
-    protected XSSFDialogsheet createDialogsheet(String sheetname, CTDialogsheet dialogsheet) {
-        XSSFSheet sheet = createSheet(sheetname);
-        String sheetRelId = getRelationId(sheet);
-        PackageRelationship pr = getPackagePart().getRelationship(sheetRelId);
-        return new XSSFDialogsheet(sheet, pr);
-    }
-
-    private CTSheet addSheet(String sheetname) {
-        CTSheet sheet = workbook.getSheets().addNewSheet();
-        sheet.setName(sheetname);
-        return sheet;
-    }
-
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     * @deprecated POI 3.15. Use {@link #findFont(boolean, short, short, String, boolean, boolean, short, byte)} instead.
-     */
-    @Deprecated
-    @Override
-    public XSSFFont findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline) {
-        return stylesSource.findFont(boldWeight, color, fontHeight, name, italic, strikeout, typeOffset, underline);
-    }
-    
-    /**
-     * Finds a font that matches the one with the supplied attributes
-     */
-    @Override
-    public XSSFFont findFont(boolean bold, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline) {
-        return stylesSource.findFont(bold, color, fontHeight, name, italic, strikeout, typeOffset, underline);
-    }
-
-    /**
-     * Convenience method to get the active sheet.  The active sheet is is the sheet
-     * which is currently displayed when the workbook is viewed in Excel.
-     * 'Selected' sheet(s) is a distinct concept.
-     */
-    @Override
-    public int getActiveSheetIndex() {
-        //activeTab (Active Sheet Index) Specifies an unsignedInt
-        //that contains the index to the active sheet in this book view.
-        return (int)workbook.getBookViews().getWorkbookViewArray(0).getActiveTab();
-    }
-
-    /**
-     * Gets all pictures from the Workbook.
-     *
-     * @return the list of pictures (a list of {@link XSSFPictureData} objects.)
-     * @see #addPicture(byte[], int)
-     */
-    @Override
-    public List<XSSFPictureData> getAllPictures() {
-        if(pictures == null){
-            List<PackagePart> mediaParts = getPackage().getPartsByName(Pattern.compile("/xl/media/.*?"));
-            pictures = new ArrayList<XSSFPictureData>(mediaParts.size());
-            for(PackagePart part : mediaParts){
-                pictures.add(new XSSFPictureData(part));
-            }
-        }
-        return pictures; //YK: should return Collections.unmodifiableList(pictures);
-    }
-
-    /**
-     * Get the cell style object at the given index
-     *
-     * @param idx  index within the set of styles
-     * @return XSSFCellStyle object at the index
-     */
-    @Override
-    public XSSFCellStyle getCellStyleAt(int idx) {
-        return stylesSource.getStyleAt(idx);
-    }
-
-    /**
-     * Get the font at the given index number
-     *
-     * @param idx  index number
-     * @return XSSFFont at the index
-     */
-    @Override
-    public XSSFFont getFontAt(short idx) {
-        return stylesSource.getFontAt(idx);
-    }
-
-    /**
-     * Get the first named range with the given name.
-     *
-     * Note: names of named ranges are not unique as they are scoped by sheet.
-     * {@link #getNames(String name)} returns all named ranges with the given name.
-     *
-     * @param name  named range name
-     * @return XSSFName with the given name. <code>null</code> is returned no named range could be found.
-     */
-    @Override
-    public XSSFName getName(String name) {
-        Collection<XSSFName> list = getNames(name);
-        if (list.isEmpty()) {
-            return null;
-        }
-        return list.iterator().next();
-    }
-
-    /**
-     * Get the named ranges with the given name.
-     * <i>Note:</i>Excel named ranges are case-insensitive and
-     * this method performs a case-insensitive search.
-     *
-     * @param name  named range name
-     * @return list of XSSFNames with the given name. An empty list if no named ranges could be found
-     */
-    @Override
-    public List<XSSFName> getNames(String name) {
-        return Collections.unmodifiableList(namedRangesByName.get(name.toLowerCase(Locale.ENGLISH)));
-    }
-
-    /**
-     * Get the named range at the given index.
-     *
-     * @param nameIndex the index of the named range
-     * @return the XSSFName at the given index
-     *
-     * @deprecated 3.16. New projects should avoid accessing named ranges by index.
-     */
-    @Override
-    @Deprecated
-    public XSSFName getNameAt(int nameIndex) {
-        int nNames = namedRanges.size();
-        if (nNames < 1) {
-            throw new IllegalStateException("There are no defined names in this workbook");
-        }
-        if (nameIndex < 0 || nameIndex > nNames) {
-            throw new IllegalArgumentException("Specified name index " + nameIndex
-                    + " is outside the allowable range (0.." + (nNames-1) + ").");
-        }
-        return namedRanges.get(nameIndex);
-    }
-
-    /**
-     * Get a list of all the named ranges in the workbook.
-     *
-     * @return list of XSSFNames in the workbook
-     */
-    @Override
-    public List<XSSFName> getAllNames() {
-        return Collections.unmodifiableList(namedRanges);
-    }
-
-    /**
-     * Gets the named range index by name.
-     *
-     * @param name named range name
-     * @return named range index. <code>-1</code> is returned if no named ranges could be found.
-     *
-     * @deprecated 3.16. New projects should avoid accessing named ranges by index.
-     * Use {@link #getName(String)} instead.
-     */
-    @Override
-    @Deprecated
-    public int getNameIndex(String name) {
-        XSSFName nm = getName(name);
-        if (nm != null) {
-            return namedRanges.indexOf(nm);
-        }
-        return -1;
-    }
-
-    /**
-     * Get the number of styles the workbook contains
-     *
-     * @return count of cell styles
-     */
-    @Override
-    public int getNumCellStyles() {
-        return stylesSource.getNumCellStyles();
-    }
-
-    /**
-     * Get the number of fonts in the this workbook
-     *
-     * @return number of fonts
-     */
-    @Override
-    public short getNumberOfFonts() {
-        return (short)stylesSource.getFonts().size();
-    }
-
-    /**
-     * Get the number of named ranges in the this workbook
-     *
-     * @return number of named ranges
-     */
-    @Override
-    public int getNumberOfNames() {
-        return namedRanges.size();
-    }
-
-    /**
-     * Get the number of worksheets in the this workbook
-     *
-     * @return number of worksheets
-     */
-    @Override
-    public int getNumberOfSheets() {
-        return sheets.size();
-    }
-
-    /**
-     * Retrieves the reference for the printarea of the specified sheet, the sheet name is appended to the reference even if it was not specified.
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @return String Null if no print area has been defined
-     */
-    @Override
-    public String getPrintArea(int sheetIndex) {
-        XSSFName name = getBuiltInName(XSSFName.BUILTIN_PRINT_AREA, sheetIndex);
-        if (name == null) return null;
-        //adding one here because 0 indicates a global named region; doesnt make sense for print areas
-        return name.getRefersToFormula();
-
-    }
-
-    /**
-     * Get sheet with the given name (case insensitive match)
-     *
-     * @param name of the sheet
-     * @return XSSFSheet with the name provided or <code>null</code> if it does not exist
-     */
-    @Override
-    public XSSFSheet getSheet(String name) {
-        for (XSSFSheet sheet : sheets) {
-            if (name.equalsIgnoreCase(sheet.getSheetName())) {
-                return sheet;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the XSSFSheet object at the given index.
-     *
-     * @param index of the sheet number (0-based physical & logical)
-     * @return XSSFSheet at the provided index
-     * @throws IllegalArgumentException if the index is out of range (index
-     *            &lt; 0 || index &gt;= getNumberOfSheets()).
-     */
-    @Override
-    public XSSFSheet getSheetAt(int index) {
-        validateSheetIndex(index);
-        return sheets.get(index);
-    }
-
-    /**
-     * Returns the index of the sheet by his name (case insensitive match)
-     *
-     * @param name the sheet name
-     * @return index of the sheet (0 based) or <tt>-1</tt if not found
-     */
-    @Override
-    public int getSheetIndex(String name) {
-        int idx = 0;
-        for (XSSFSheet sh : sheets) {
-            if (name.equalsIgnoreCase(sh.getSheetName())) {
-                return idx;
-            }
-            idx++;
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index of the given sheet
-     *
-     * @param sheet the sheet to look up
-     * @return index of the sheet (0 based). <tt>-1</tt> if not found
-     */
-    @Override
-    public int getSheetIndex(Sheet sheet) {
-        int idx = 0;
-        for(XSSFSheet sh : sheets){
-            if(sh == sheet) return idx;
-            idx++;
-        }
-        return -1;
-    }
-
-    /**
-     * Get the sheet name
-     *
-     * @param sheetIx Number
-     * @return Sheet name
-     */
-    @Override
-    public String getSheetName(int sheetIx) {
-        validateSheetIndex(sheetIx);
-        return sheets.get(sheetIx).getSheetName();
-    }
-
-    /**
-     * Returns an iterator of the sheets in the workbook
-     * in sheet order. Includes hidden and very hidden sheets.
-     *
-     * Note: remove() is not supported on this iterator.
-     * Use {@link #removeSheetAt(int)} to remove sheets instead.
-     *
-     * @return an iterator of the sheets.
-     */
-    @Override
-    public Iterator<Sheet> sheetIterator() {
-        return new SheetIterator<Sheet>();
-    }
-    
-    /**
-     * Alias for {@link #sheetIterator()} to allow
-     * foreach loops
-     * 
-     * <code>Iterator<XSSFSheet> iterator()<code> was replaced with <code>Iterator<Sheet> iterator()</code>
-     * to make iterating over a container (Workbook, Sheet, Row) consistent across POI spreadsheets.
-     * This breaks backwards compatibility and may affect your code.
-     * See {@link XSSFWorkbook#xssfSheetIterator} for how to upgrade your code to be compatible
-     * with the new interface.
-     * 
-     * Note: remove() is not supported on this iterator.
-     * Use {@link #removeSheetAt(int)} to remove sheets instead.
-     * 
-     * @return an iterator  of the sheets.
-     */
-    @Override
-    public Iterator<Sheet> iterator() {
-        return sheetIterator();
-    }
-    
-    private final class SheetIterator<T extends Sheet> implements Iterator<T> {
-        final private Iterator<T> it;
-        @SuppressWarnings("unchecked")
-        public SheetIterator() {
-            it = (Iterator<T>) sheets.iterator();
-        }
-        @Override
-        public boolean hasNext() {
-            return it.hasNext();
-        }
-        @Override
-        public T next() throws NoSuchElementException {
-            return it.next();
-        }
-        /**
-         * Unexpected behavior may occur if sheets are reordered after iterator
-         * has been created. Support for the remove method may be added in the future
-         * if someone can figure out a reliable implementation.
-         */
-        @Override
-        public void remove() throws IllegalStateException {
-            throw new UnsupportedOperationException("remove method not supported on XSSFWorkbook.iterator(). "+
-                    "Use Sheet.removeSheetAt(int) instead.");
-        }
-    }
-    
-    /**
-     * xssfSheetIterator was added to make transitioning to the new Iterator<Sheet> iterator()
-     *  interface less painful for projects currently using POI.
-     *  
-     *  If your code was written using a for-each loop:
-     *  <pre><code>
-     *  for (XSSFSheet sh : wb) {
-     *      sh.createRow(0);
-     *  }
-     *  </code></pre>
-     *  
-     *  There are two ways to upgrade your code:
-     *  // Option A:
-     *  <pre><code>
-     *  for (XSSFSheet sh : (Iterable<XSSFSheet>) (Iterable<? extends Sheet>) wb) {
-     *      sh.createRow(0);
-     *  }
-     *  </code></pre>
-     *      
-     *  // Option B (preferred for new code):
-     *  <pre><code>
-     *  for (Sheet sh : wb) {
-     *      sh.createRow(0);
-     *  }
-     *  </code></pre>
-     *  
-     *  
-     *  
-     *  If your code was written using an iterator variable:
-     *  <pre><code>
-     *  Iterator<XSSFSheet> it = wb.iterator();
-     *  XSSFSheet sh = it.next();
-     *  sh.createRow(0);
-     *  </code></pre>
-     *  
-     *  There are three ways to upgrade your code:
-     *  // Option A:
-     *  <pre><code>
-     *  Iterator<XSSFSheet> it = (Iterator<XSSFSheet>) (Iterator<? extends Sheet>) wb.iterator();
-     *  XSSFSheet sh = it.next();
-     *  sh.createRow(0);
-     *  </code></pre>
-     *
-     *  // Option B:
-     *  <pre><code>
-     *  &#64;SuppressWarnings("deprecation")
-     *  Iterator<XSSFSheet> it = wb.xssfSheetIterator();
-     *  XSSFSheet sh = it.next();
-     *  sh.createRow(0);
-     *  </code></pre>
-     *
-     *  // Option C (preferred for new code):
-     *  <pre><code>
-     *  Iterator<Sheet> it = wb.iterator();
-     *  Sheet sh = it.next();
-     *  sh.createRow(0);
-     *  </code></pre>
-     *  
-     *  @deprecated 3.13. New projects should use the preferred options. Note: XSSFWorkbook.xssfSheetIterator
-     *  is deprecated and will be removed in 3.15.
-     *
-     * @return an iterator of the sheets.
-     */
-    @Deprecated
-    public Iterator<XSSFSheet> xssfSheetIterator() {
-        return new SheetIterator<XSSFSheet>();
-    }
-    
-    /**
-     * Are we a normal workbook (.xlsx), or a
-     *  macro enabled workbook (.xlsm)?
-     */
-    public boolean isMacroEnabled() {
-        return getPackagePart().getContentType().equals(XSSFRelation.MACROS_WORKBOOK.getContentType());
-    }
-
-    /**
-     * Remove the named range at the given index.
-     *
-     * @param nameIndex the index of the named range name to remove
-     *
-     * @deprecated 3.16. New projects should use {@link #removeName(Name)}.
-     */
-    @Override
-    @Deprecated
-    public void removeName(int nameIndex) {
-        removeName(getNameAt(nameIndex));
-    }
-
-    /**
-     * Remove the first named range found with the given name.
-     * 
-     * Note: names of named ranges are not unique (name + sheet
-     * index is unique), so {@link #removeName(Name)} should
-     * be used if possible.
-     * 
-     * @param name the named range name to remove
-     *
-     * @throws IllegalArgumentException if no named range could be found
-     *
-     * @deprecated 3.16. New projects should use {@link #removeName(Name)}.
-     */
-    @Override
-    @Deprecated
-    public void removeName(String name) {
-        List<XSSFName> names = namedRangesByName.get(name.toLowerCase(Locale.ENGLISH));
-        if (names.isEmpty()) {
-            throw new IllegalArgumentException("Named range was not found: " + name);
-        }
-        removeName(names.get(0));
-    }
-
-
-    /**
-     * As {@link #removeName(String)} is not necessarily unique
-     * (name + sheet index is unique), this method is more accurate.
-     *
-     * @param name the name to remove.
-     *
-     * @throws IllegalArgumentException if the named range is not a part of this XSSFWorkbook
-     */
-    @Override
-    public void removeName(Name name) {
-        if (!namedRangesByName.removeMapping(name.getNameName().toLowerCase(Locale.ENGLISH), name)
-                || !namedRanges.remove(name)) {
-            throw new IllegalArgumentException("Name was not found: " + name);
-        }
-    }
-
-    void updateName(XSSFName name, String oldName) {
-        if (!namedRangesByName.removeMapping(oldName.toLowerCase(Locale.ENGLISH), name)) {
-            throw new IllegalArgumentException("Name was not found: " + name);
-        }
-        namedRangesByName.put(name.getNameName().toLowerCase(Locale.ENGLISH), name);
-    }
-
-
-    /**
-     * Delete the printarea for the sheet specified
-     *
-     * @param sheetIndex 0-based sheet index (0 = First Sheet)
-     */
-    @Override
-    public void removePrintArea(int sheetIndex) {
-        XSSFName name = getBuiltInName(XSSFName.BUILTIN_PRINT_AREA, sheetIndex);
-        if (name != null) {
-            removeName(name);
-        }
-    }
-
-    /**
-     * Removes sheet at the given index.<p/>
-     *
-     * Care must be taken if the removed sheet is the currently active or only selected sheet in
-     * the workbook. There are a few situations when Excel must have a selection and/or active
-     * sheet. (For example when printing - see Bug 40414).<br/>
-     *
-     * This method makes sure that if the removed sheet was active, another sheet will become
-     * active in its place.  Furthermore, if the removed sheet was the only selected sheet, another
-     * sheet will become selected.  The newly active/selected sheet will have the same index, or
-     * one less if the removed sheet was the last in the workbook.
-     *
-     * @param index of the sheet  (0-based)
-     */
-    @Override
-    public void removeSheetAt(int index) {
-        validateSheetIndex(index);
-
-        onSheetDelete(index);
-
-        XSSFSheet sheet = getSheetAt(index);
-        removeRelation(sheet);
-        sheets.remove(index);
-
-        // only set new sheet if there are still some left
-        if(sheets.size() == 0) {
-            return;
-        }
-
-        // the index of the closest remaining sheet to the one just deleted
-        int newSheetIndex = index;
-        if (newSheetIndex >= sheets.size()) {
-            newSheetIndex = sheets.size()-1;
-        }
-
-        // adjust active sheet
-        int active = getActiveSheetIndex();
-        if(active == index) {
-            // removed sheet was the active one, reset active sheet if there is still one left now
-            setActiveSheet(newSheetIndex);
-        } else if (active > index) {
-            // removed sheet was below the active one => active is one less now
-            setActiveSheet(active-1);
-        }
-    }
-
-    /**
-     * Gracefully remove references to the sheet being deleted
-     *
-     * @param index the 0-based index of the sheet to delete
-     */
-    private void onSheetDelete(int index) {
-        //delete the CTSheet reference from workbook.xml
-        workbook.getSheets().removeSheet(index);
-
-        //calculation chain is auxiliary, remove it as it may contain orphan references to deleted cells
-        if(calcChain != null) {
-            removeRelation(calcChain);
-            calcChain = null;
-        }
-
-        //adjust indices of names ranges
-        List<XSSFName> toRemove = new ArrayList<XSSFName>();
-        for (XSSFName nm : namedRanges) {
-            CTDefinedName ct = nm.getCTName();
-            if(!ct.isSetLocalSheetId()) continue;
-            if (ct.getLocalSheetId() == index) {
-                toRemove.add(nm);
-            } else if (ct.getLocalSheetId() > index){
-                // Bump down by one, so still points at the same sheet
-                ct.setLocalSheetId(ct.getLocalSheetId()-1);
-            }
-        }
-        for (XSSFName nm : toRemove) {
-            removeName(nm);
-        }
-    }
-
-    /**
-     * Retrieves the current policy on what to do when
-     *  getting missing or blank cells from a row.
-     * The default is to return blank and null cells.
-     *  {@link MissingCellPolicy}
-     */
-    @Override
-    public MissingCellPolicy getMissingCellPolicy() {
-        return _missingCellPolicy;
-    }
-    /**
-     * Sets the policy on what to do when
-     *  getting missing or blank cells from a row.
-     * This will then apply to all calls to
-     *  {@link Row#getCell(int)}}. See
-     *  {@link MissingCellPolicy}
-     */
-    @Override
-    public void setMissingCellPolicy(MissingCellPolicy missingCellPolicy) {
-        _missingCellPolicy = missingCellPolicy;
-    }
-
-    /**
-     * Convenience method to set the active sheet.  The active sheet is is the sheet
-     * which is currently displayed when the workbook is viewed in Excel.
-     * 'Selected' sheet(s) is a distinct concept.
-     */
-    @Override
-    public void setActiveSheet(int index) {
-
-        validateSheetIndex(index);
-
-        for (CTBookView arrayBook : workbook.getBookViews().getWorkbookViewArray()) {
-            arrayBook.setActiveTab(index);
-        }
-    }
-
-    /**
-     * Validate sheet index
-     *
-     * @param index the index to validate
-     * @throws IllegalArgumentException if the index is out of range (index
-     *            &lt; 0 || index &gt;= getNumberOfSheets()).
-    */
-    private void validateSheetIndex(int index) {
-        int lastSheetIx = sheets.size() - 1;
-        if (index < 0 || index > lastSheetIx) {
-            String range = "(0.." +    lastSheetIx + ")";
-            if (lastSheetIx == -1) {
-                range = "(no sheets)";
-            }
-            throw new IllegalArgumentException("Sheet index ("
-                    + index +") is out of range " + range);
-        }
-    }
-
-    /**
-     * Gets the first tab that is displayed in the list of tabs in excel.
-     *
-     * @return integer that contains the index to the active sheet in this book view.
-     */
-    @Override
-    public int getFirstVisibleTab() {
-        CTBookViews bookViews = workbook.getBookViews();
-        CTBookView bookView = bookViews.getWorkbookViewArray(0);
-        return (short) bookView.getFirstSheet();
-    }
-
-    /**
-     * Sets the first tab that is displayed in the list of tabs in excel.
-     *
-     * @param index integer that contains the index to the active sheet in this book view.
-     */
-    @Override
-    public void setFirstVisibleTab(int index) {
-        CTBookViews bookViews = workbook.getBookViews();
-        CTBookView bookView= bookViews.getWorkbookViewArray(0);
-        bookView.setFirstSheet(index);
-    }
-
-    /**
-     * Sets the printarea for the sheet provided
-     * <p>
-     * i.e. Reference = $A$1:$B$2
-     * @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
-     * @param reference Valid name Reference for the Print Area
-     */
-    @Override
-    public void setPrintArea(int sheetIndex, String reference) {
-        XSSFName name = getBuiltInName(XSSFName.BUILTIN_PRINT_AREA, sheetIndex);
-        if (name == null) {
-            name = createBuiltInName(XSSFName.BUILTIN_PRINT_AREA, sheetIndex);
-        }
-        //short externSheetIndex = getWorkbook().checkExternSheet(sheetIndex);
-        //name.setExternSheetNumber(externSheetIndex);
-        String[] parts = COMMA_PATTERN.split(reference);
-        StringBuffer sb = new StringBuffer(32);
-        for (int i = 0; i < parts.length; i++) {
-            if(i>0) {
-                sb.append(",");
-            }
-            SheetNameFormatter.appendFormat(sb, getSheetName(sheetIndex));
-            sb.append("!");
-            sb.append(parts[i]);
-        }
-        name.setRefersToFormula(sb.toString());
-    }
-
-    /**
-     * For the Convenience of Java Programmers maintaining pointers.
-     * @see #setPrintArea(int, String)
-     * @param sheetIndex Zero-based sheet index (0 = First Sheet)
-     * @param startColumn Column to begin printarea
-     * @param endColumn Column to end the printarea
-     * @param startRow Row to begin the printarea
-     * @param endRow Row to end the printarea
-     */
-    @Override
-    public void setPrintArea(int sheetIndex, int startColumn, int endColumn, int startRow, int endRow) {
-        String reference=getReferencePrintArea(getSheetName(sheetIndex), startColumn, endColumn, startRow, endRow);
-        setPrintArea(sheetIndex, reference);
-    }
-
-    private static String getReferencePrintArea(String sheetName, int startC, int endC, int startR, int endR) {
-        //windows excel example: Sheet1!$C$3:$E$4
-        CellReference colRef = new CellReference(sheetName, startR, startC, true, true);
-        CellReference colRef2 = new CellReference(sheetName, endR, endC, true, true);
-
-        return "$" + colRef.getCellRefParts()[2] + "$" + colRef.getCellRefParts()[1] + ":$" + colRef2.getCellRefParts()[2] + "$" + colRef2.getCellRefParts()[1];
-    }
-
-    XSSFName getBuiltInName(String builtInCode, int sheetNumber) {
-        for (XSSFName name : namedRangesByName.get(builtInCode.toLowerCase(Locale.ENGLISH))) {
-            if (name.getSheetIndex() == sheetNumber) {
-                return name;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Generates a NameRecord to represent a built-in region
-     *
-     * @return a new NameRecord
-     * @throws IllegalArgumentException if sheetNumber is invalid
-     * @throws POIXMLException if such a name already exists in the workbook
-     */
-    XSSFName createBuiltInName(String builtInName, int sheetNumber) {
-        validateSheetIndex(sheetNumber);
-
-        CTDefinedNames names = workbook.getDefinedNames() == null ? workbook.addNewDefinedNames() : workbook.getDefinedNames();
-        CTDefinedName nameRecord = names.addNewDefinedName();
-        nameRecord.setName(builtInName);
-        nameRecord.setLocalSheetId(sheetNumber);
-
-        if (getBuiltInName(builtInName, sheetNumber) != null) {
-            throw new POIXMLException("Builtin (" + builtInName
-                    + ") already exists for sheet (" + sheetNumber + ")");
-        }
-
-        return createAndStoreName(nameRecord);
-    }
-
-    /**
-     * We only set one sheet as selected for compatibility with HSSF.
-     */
-    @Override
-    public void setSelectedTab(int index) {
-        int idx = 0;
-        for (XSSFSheet sh : sheets) {
-            sh.setSelected(idx == index);
-            idx++;
-        }
-    }
-
-    /**
-     * Set the sheet name.
-     *
-     * @param sheetIndex sheet number (0 based)
-     * @param sheetname  the new sheet name
-     * @throws IllegalArgumentException if the name is null or invalid
-     *  or workbook already contains a sheet with this name
-     * @see #createSheet(String)
-     * @see org.apache.poi.ss.util.WorkbookUtil#createSafeSheetName(String nameProposal)
-     */
-    @Override
-    public void setSheetName(int sheetIndex, String sheetname) {
-        validateSheetIndex(sheetIndex);
-        String oldSheetName = getSheetName(sheetIndex);
-
-        // YK: Mimic Excel and silently truncate sheet names longer than 31 characters
-        if(sheetname != null && sheetname.length() > 31) sheetname = sheetname.substring(0, 31);
-        WorkbookUtil.validateSheetName(sheetname);
-        // findbugs fix - validateSheetName has already checked for null value
-        assert(sheetname != null); 
-
-        // Do nothing if no change
-        if (sheetname.equals(oldSheetName)) return;
-        
-        // Check it isn't already taken
-        if (containsSheet(sheetname, sheetIndex ))
-            throw new IllegalArgumentException( "The workbook already contains a sheet of this name" );
-
-        // Update references to the name
-        XSSFFormulaUtils utils = new XSSFFormulaUtils(this);
-        utils.updateSheetName(sheetIndex, oldSheetName, sheetname);
-
-        workbook.getSheets().getSheetArray(sheetIndex).setName(sheetname);
-    }
-
-    /**
-     * sets the order of appearance for a given sheet.
-     *
-     * @param sheetname the name of the sheet to reorder
-     * @param pos the position that we want to insert the sheet into (0 based)
-     */
-    @Override
-    public void setSheetOrder(String sheetname, int pos) {
-        int idx = getSheetIndex(sheetname);
-        sheets.add(pos, sheets.remove(idx));
-
-        // Reorder CTSheets
-        CTSheets ct = workbook.getSheets();
-        XmlObject cts = ct.getSheetArray(idx).copy();
-        workbook.getSheets().removeSheet(idx);
-        CTSheet newcts = ct.insertNewSheet(pos);
-        newcts.set(cts);
-
-        //notify sheets
-        CTSheet[] sheetArray = ct.getSheetArray();
-        for(int i=0; i < sheetArray.length; i++) {
-            sheets.get(i).sheet = sheetArray[i];
-        }
-        
-        updateNamedRangesAfterSheetReorder(idx, pos);
-        updateActiveSheetAfterSheetReorder(idx, pos);
-    }
-    
-    /**
-     * update sheet-scoped named ranges in this workbook after changing the sheet order
-     * of a sheet at oldIndex to newIndex.
-     * Sheets between these indices will move left or right by 1.
-     *
-     * @param oldIndex the original index of the re-ordered sheet
-     * @param newIndex the new index of the re-ordered sheet
-     */
-    private void updateNamedRangesAfterSheetReorder(int oldIndex, int newIndex) {
-        // update sheet index of sheet-scoped named ranges
-        for (final XSSFName name : namedRanges) {
-            final int i = name.getSheetIndex();
-            // name has sheet-level scope
-            if (i != -1) {
-                // name refers to this sheet
-                if (i == oldIndex) {
-                    name.setSheetIndex(newIndex);
-                }
-                // if oldIndex > newIndex then this sheet moved left and sheets between newIndex and oldIndex moved right
-                else if (newIndex <= i && i < oldIndex) {
-                    name.setSheetIndex(i+1);
-                }
-                // if oldIndex < newIndex then this sheet moved right and sheets between oldIndex and newIndex moved left
-                else if (oldIndex < i && i <= newIndex) {
-                    name.setSheetIndex(i-1);
-                }
-            }
-        }
-    }
-    
-    private void updateActiveSheetAfterSheetReorder(int oldIndex, int newIndex) {
-        // adjust active sheet if necessary
-        int active = getActiveSheetIndex();
-        if(active == oldIndex) {
-            // moved sheet was the active one
-            setActiveSheet(newIndex);
-        } else if ((active < oldIndex && active < newIndex) ||
-                (active > oldIndex && active > newIndex)) {
-            // not affected
-        } else if (newIndex > oldIndex) {
-            // moved sheet was below before and is above now => active is one less
-            setActiveSheet(active-1);
-        } else {
-            // remaining case: moved sheet was higher than active before and is lower now => active is one more
-            setActiveSheet(active+1);
-        }
-    }
-
-    /**
-     * marshal named ranges from the {@link #namedRanges} collection to the underlying CTWorkbook bean
-     */
-    private void saveNamedRanges(){
-        // Named ranges
-        if(namedRanges.size() > 0) {
-            CTDefinedNames names = CTDefinedNames.Factory.newInstance();
-            CTDefinedName[] nr = new CTDefinedName[namedRanges.size()];
-            int i = 0;
-            for(XSSFName name : namedRanges) {
-                nr[i] = name.getCTName();
-                i++;
-            }
-            names.setDefinedNameArray(nr);
-            if(workbook.isSetDefinedNames()) {
-                workbook.unsetDefinedNames();
-            }
-            workbook.setDefinedNames(names);
-                        
-            // Re-process the named ranges
-            reprocessNamedRanges();
-        } else {
-            if(workbook.isSetDefinedNames()) {
-                workbook.unsetDefinedNames();
-            }
-        }
-    }
-    
-    private void reprocessNamedRanges() {
-        namedRangesByName = new ArrayListValuedHashMap<String, XSSFName>();
-        namedRanges = new ArrayList<XSSFName>();
-        if(workbook.isSetDefinedNames()) {
-            for(CTDefinedName ctName : workbook.getDefinedNames().getDefinedNameArray()) {
-                createAndStoreName(ctName);
-            }
-        }
-    }
-
-    private void saveCalculationChain(){
-        if(calcChain != null){
-            int count = calcChain.getCTCalcChain().sizeOfCArray();
-            if(count == 0){
-                removeRelation(calcChain);
-                calcChain = null;
-            }
-        }
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        saveNamedRanges();
-        saveCalculationChain();
-
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTWorkbook.type.getName().getNamespaceURI(), "workbook"));
-
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        workbook.save(out, xmlOptions);
-        out.close();
-    }
-    
-    /**
-     * Returns SharedStringsTable - tha cache of string for this workbook
-     *
-     * @return the shared string table
-     */
-    @Internal
-    public SharedStringsTable getSharedStringSource() {
-        return this.sharedStringSource;
-    }
-
-    /**
-     * Return a object representing a collection of shared objects used for styling content,
-     * e.g. fonts, cell styles, colors, etc.
-     */
-    public StylesTable getStylesSource() {
-        return this.stylesSource;
-    }
-
-    /**
-     * Returns the Theme of current workbook.
-     */
-    public ThemesTable getTheme() {
-        if (stylesSource == null) return null;
-        return stylesSource.getTheme();
-    }
-
-    /**
-     * Returns an object that handles instantiating concrete
-     *  classes of the various instances for XSSF.
-     */
-    @Override
-    public XSSFCreationHelper getCreationHelper() {
-        if(_creationHelper == null) _creationHelper = new XSSFCreationHelper(this);
-        return _creationHelper;
-    }
-
-    /**
-     * Determines whether a workbook contains the provided sheet name.
-     * For the purpose of comparison, long names are truncated to 31 chars.
-     *
-     * @param name the name to test (case insensitive match)
-     * @param excludeSheetIdx the sheet to exclude from the check or -1 to include all sheets in the check.
-     * @return true if the sheet contains the name, false otherwise.
-     */
-    private boolean containsSheet(String name, int excludeSheetIdx) {
-        CTSheet[] ctSheetArray = workbook.getSheets().getSheetArray();
-
-        if (name.length() > MAX_SENSITIVE_SHEET_NAME_LEN) {
-            name = name.substring(0, MAX_SENSITIVE_SHEET_NAME_LEN);
-        }
-
-        for (int i = 0; i < ctSheetArray.length; i++) {
-            String ctName = ctSheetArray[i].getName();
-            if (ctName.length() > MAX_SENSITIVE_SHEET_NAME_LEN) {
-                ctName = ctName.substring(0, MAX_SENSITIVE_SHEET_NAME_LEN);
-            }
-
-            if (excludeSheetIdx != i && name.equalsIgnoreCase(ctName))
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * Gets a boolean value that indicates whether the date systems used in the workbook starts in 1904.
-     * <p>
-     * The default value is false, meaning that the workbook uses the 1900 date system,
-     * where 1/1/1900 is the first day in the system..
-     * </p>
-     * @return true if the date systems used in the workbook starts in 1904
-     */
-    @Internal
-    public boolean isDate1904(){
-        CTWorkbookPr workbookPr = workbook.getWorkbookPr();
-        return workbookPr != null && workbookPr.getDate1904();
-    }
-
-    /**
-     * Get the document's embedded files.
-     */
-    @Override
-    public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
-        List<PackagePart> embedds = new LinkedList<PackagePart>();
-
-        for(XSSFSheet sheet : sheets){
-            // Get the embeddings for the workbook
-            for(PackageRelationship rel : sheet.getPackagePart().getRelationshipsByType(XSSFRelation.OLEEMBEDDINGS.getRelation())) {
-                embedds.add( sheet.getPackagePart().getRelatedPart(rel) );
-            }
-
-            for(PackageRelationship rel : sheet.getPackagePart().getRelationshipsByType(XSSFRelation.PACKEMBEDDINGS.getRelation())) {
-               embedds.add( sheet.getPackagePart().getRelatedPart(rel) );
-            }
-        }
-        return embedds;
-    }
-
-    @Override
-    @NotImplemented
-    public boolean isHidden() {
-        throw new RuntimeException("Not implemented yet");
-    }
-
-    @Override
-    @NotImplemented
-    public void setHidden(boolean hiddenFlag) {
-        throw new RuntimeException("Not implemented yet");
-    }
-
-    /**
-     * Check whether a sheet is hidden.
-     * <p>
-     * Note that a sheet could instead be set to be very hidden, which is different
-     *  ({@link #isSheetVeryHidden(int)})
-     * </p>
-     * @param sheetIx Number
-     * @return <code>true</code> if sheet is hidden
-     */
-    @Override
-    public boolean isSheetHidden(int sheetIx) {
-        validateSheetIndex(sheetIx);
-        CTSheet ctSheet = sheets.get(sheetIx).sheet;
-        return ctSheet.getState() == STSheetState.HIDDEN;
-    }
-
-    /**
-     * Check whether a sheet is very hidden.
-     * <p>
-     * This is different from the normal hidden status
-     *  ({@link #isSheetHidden(int)})
-     * </p>
-     * @param sheetIx sheet index to check
-     * @return <code>true</code> if sheet is very hidden
-     */
-    @Override
-    public boolean isSheetVeryHidden(int sheetIx) {
-        validateSheetIndex(sheetIx);
-        CTSheet ctSheet = sheets.get(sheetIx).sheet;
-        return ctSheet.getState() == STSheetState.VERY_HIDDEN;
-    }
-
-    /**
-     * Sets the visible state of this sheet.
-     * <p>
-     *   Calling <code>setSheetHidden(sheetIndex, true)</code> is equivalent to
-     *   <code>setSheetHidden(sheetIndex, Workbook.SHEET_STATE_HIDDEN)</code>.
-     * <br/>
-     *   Calling <code>setSheetHidden(sheetIndex, false)</code> is equivalent to
-     *   <code>setSheetHidden(sheetIndex, Workbook.SHEET_STATE_VISIBLE)</code>.
-     * </p>
-     * 
-     * Please note that the sheet currently set as active sheet (sheet 0 in a newly 
-     * created workbook or the one set via setActiveSheet()) cannot be hidden. 
-     *
-     * @param sheetIx   the 0-based index of the sheet
-     * @param hidden whether this sheet is hidden
-     * @see #setSheetHidden(int, int)
-     */
-    @Override
-    public void setSheetHidden(int sheetIx, boolean hidden) {
-        setSheetHidden(sheetIx, hidden ? SHEET_STATE_HIDDEN : SHEET_STATE_VISIBLE);
-    }
-
-    /**
-     * Hide or unhide a sheet.
-     *
-     * <ul>
-     *  <li>0 - visible. </li>
-     *  <li>1 - hidden. </li>
-     *  <li>2 - very hidden.</li>
-     * </ul>
-     * 
-     * Please note that the sheet currently set as active sheet (sheet 0 in a newly 
-     * created workbook or the one set via setActiveSheet()) cannot be hidden.
-     *  
-     * @param sheetIx the sheet index (0-based)
-     * @param state one of the following <code>Workbook</code> constants:
-     *        <code>Workbook.SHEET_STATE_VISIBLE</code>,
-     *        <code>Workbook.SHEET_STATE_HIDDEN</code>, or
-     *        <code>Workbook.SHEET_STATE_VERY_HIDDEN</code>.
-     * @throws IllegalArgumentException if the supplied sheet index or state is invalid
-     */
-    @Override
-    public void setSheetHidden(int sheetIx, int state) {
-        validateSheetIndex(sheetIx);
-        WorkbookUtil.validateSheetState(state);
-        CTSheet ctSheet = sheets.get(sheetIx).sheet;
-        ctSheet.setState(STSheetState.Enum.forInt(state + 1));
-    }
-
-    /**
-     * Fired when a formula is deleted from this workbook,
-     * for example when calling cell.setCellFormula(null)
-     *
-     * @see XSSFCell#setCellFormula(String)
-     */
-    protected void onDeleteFormula(XSSFCell cell){
-        if(calcChain != null) {
-            int sheetId = (int)cell.getSheet().sheet.getSheetId();
-            calcChain.removeItem(sheetId, cell.getReference());
-        }
-    }
-
-    /**
-     * Return the {@link CalculationChain} object for this workbook
-     * <p>
-     *   The calculation chain object specifies the order in which the cells in a workbook were last calculated
-     * </p>
-     *
-     * @return the <code>CalculationChain</code> object or <code>null</code> if not defined
-     */
-    @Internal
-    public CalculationChain getCalculationChain() {
-        return calcChain;
-    }
-    
-    /**
-     * Returns the list of {@link ExternalLinksTable} object for this workbook
-     * 
-     * <p>The external links table specifies details of named ranges etc
-     *  that are referenced from other workbooks, along with the last seen
-     *  values of what they point to.</p>
-     *
-     * <p>Note that Excel uses index 0 for the current workbook, so the first
-     *  External Links in a formula would be '[1]Foo' which corresponds to
-     *  entry 0 in this list.</p>
-
-     * @return the <code>ExternalLinksTable</code> list, which may be empty
-     */
-    @Internal
-    public List<ExternalLinksTable> getExternalLinksTable() {
-        return externalLinks;
-    }
-
-    /**
-     *
-     * @return a collection of custom XML mappings defined in this workbook
-     */
-    public Collection<XSSFMap> getCustomXMLMappings(){
-        return mapInfo == null ? new ArrayList<XSSFMap>() : mapInfo.getAllXSSFMaps();
-    }
-
-    /**
-     *
-     * @return the helper class used to query the custom XML mapping defined in this workbook
-     */
-    @Internal
-    public MapInfo getMapInfo(){
-        return mapInfo;
-    }
-
-    /**
-     * Adds the External Link Table part and relations required to allow formulas 
-     *  referencing the specified external workbook to be added to this one. Allows
-     *  formulas such as "[MyOtherWorkbook.xlsx]Sheet3!$A$5" to be added to the 
-     *  file, for workbooks not already linked / referenced.
-     *
-     * @param name The name the workbook will be referenced as in formulas
-     * @param workbook The open workbook to fetch the link required information from
-     */
-    @Override
-    @NotImplemented
-    public int linkExternalWorkbook(String name, Workbook workbook) {
-        throw new RuntimeException("Not Implemented - see bug #57184");
-    }
-
-    /**
-     * Specifies a boolean value that indicates whether structure of workbook is locked. <br/>
-     * A value true indicates the structure of the workbook is locked. Worksheets in the workbook can't be moved,
-     * deleted, hidden, unhidden, or renamed, and new worksheets can't be inserted.<br/>
-     * A value of false indicates the structure of the workbook is not locked.<br/>
-     *
-     * @return true if structure of workbook is locked
-     */
-    public boolean isStructureLocked() {
-        return workbookProtectionPresent() && workbook.getWorkbookProtection().getLockStructure();
-    }
-
-    /**
-     * Specifies a boolean value that indicates whether the windows that comprise the workbook are locked. <br/>
-     * A value of true indicates the workbook windows are locked. Windows are the same size and position each time the
-     * workbook is opened.<br/>
-     * A value of false indicates the workbook windows are not locked.
-     *
-     * @return true if windows that comprise the workbook are locked
-     */
-    public boolean isWindowsLocked() {
-        return workbookProtectionPresent() && workbook.getWorkbookProtection().getLockWindows();
-    }
-
-    /**
-     * Specifies a boolean value that indicates whether the workbook is locked for revisions.
-     *
-     * @return true if the workbook is locked for revisions.
-     */
-    public boolean isRevisionLocked() {
-        return workbookProtectionPresent() && workbook.getWorkbookProtection().getLockRevision();
-    }
-
-    /**
-     * Locks the structure of workbook.
-     */
-    public void lockStructure() {
-        safeGetWorkbookProtection().setLockStructure(true);
-    }
-
-    /**
-     * Unlocks the structure of workbook.
-     */
-    public void unLockStructure() {
-        safeGetWorkbookProtection().setLockStructure(false);
-    }
-
-    /**
-     * Locks the windows that comprise the workbook.
-     */
-    public void lockWindows() {
-        safeGetWorkbookProtection().setLockWindows(true);
-    }
-
-    /**
-     * Unlocks the windows that comprise the workbook.
-     */
-    public void unLockWindows() {
-        safeGetWorkbookProtection().setLockWindows(false);
-    }
-
-    /**
-     * Locks the workbook for revisions.
-     */
-    public void lockRevision() {
-        safeGetWorkbookProtection().setLockRevision(true);
-    }
-
-    /**
-     * Unlocks the workbook for revisions.
-     */
-    public void unLockRevision() {
-        safeGetWorkbookProtection().setLockRevision(false);
-    }
-
-    /**
-     * Sets the workbook password. 
-     * 
-     * @param password if null, the password will be removed
-     * @param hashAlgo if null, the password will be set as XOR password (Excel 2010 and earlier)
-     *  otherwise the given algorithm is used for calculating the hash password (Excel 2013)
-     */
-    public void setWorkbookPassword(String password, HashAlgorithm hashAlgo) {
-        if (password == null && !workbookProtectionPresent()) return;
-        setPassword(safeGetWorkbookProtection(), password, hashAlgo, "workbook");
-    }
-
-    /**
-     * Validate the password against the stored hash, the hashing method will be determined
-     *  by the existing password attributes
-     * @return true, if the hashes match (... though original password may differ ...)
-     */
-    public boolean validateWorkbookPassword(String password) {
-        if (!workbookProtectionPresent()) return (password == null);
-        return validatePassword(safeGetWorkbookProtection(), password, "workbook");
-    }
-
-    /**
-     * Sets the revisions password.
-     * 
-     * @param password if null, the password will be removed
-     * @param hashAlgo if null, the password will be set as XOR password (Excel 2010 and earlier)
-     *  otherwise the given algorithm is used for calculating the hash password (Excel 2013)
-     */
-    public void setRevisionsPassword(String password, HashAlgorithm hashAlgo) {
-        if (password == null && !workbookProtectionPresent()) return;
-        setPassword(safeGetWorkbookProtection(), password, hashAlgo, "revisions");
-    }
-
-    /**
-     * Validate the password against the stored hash, the hashing method will be determined
-     *  by the existing password attributes
-     * @return true if the hashes match (... though original password may differ ...)
-     */
-    public boolean validateRevisionsPassword(String password) {
-        if (!workbookProtectionPresent()) return (password == null);
-        return validatePassword(safeGetWorkbookProtection(), password, "revisions");
-    }
-    
-    /**
-     * Removes the workbook protection settings
-     */
-    public void unLock() {
-        if (workbookProtectionPresent()) {
-            workbook.unsetWorkbookProtection();
-        }
-    }
-    
-    private boolean workbookProtectionPresent() {
-        return workbook.isSetWorkbookProtection();
-    }
-
-    private CTWorkbookProtection safeGetWorkbookProtection() {
-        if (!workbookProtectionPresent()){
-            return workbook.addNewWorkbookProtection();
-        }
-        return workbook.getWorkbookProtection();
-    }
-    
-    /**
-     *
-     * Returns the locator of user-defined functions.
-     * <p>
-     * The default instance extends the built-in functions with the Excel Analysis Tool Pack.
-     * To set / evaluate custom functions you need to register them as follows:
-     *
-     *
-     *
-     * </p>
-     * @return wrapped instance of UDFFinder that allows seeking functions both by index and name
-     */
-    /*package*/ UDFFinder getUDFFinder() {
-        return _udfFinder;
-    }
-
-    /**
-     * Register a new toolpack in this workbook.
-     *
-     * @param toopack the toolpack to register
-     */
-    @Override
-    public void addToolPack(UDFFinder toopack){
-        _udfFinder.add(toopack);
-    }
-
-    /**
-     * Whether the application shall perform a full recalculation when the workbook is opened.
-     * <p>
-     * Typically you want to force formula recalculation when you modify cell formulas or values
-     * of a workbook previously created by Excel. When set to true, this flag will tell Excel
-     * that it needs to recalculate all formulas in the workbook the next time the file is opened.
-     * </p>
-     * <p>
-     * Note, that recalculation updates cached formula results and, thus, modifies the workbook.
-     * Depending on the version, Excel may prompt you with "Do you want to save the changes in <em>filename</em>?"
-     * on close.
-     * </p>
-     *
-     * @param value true if the application will perform a full recalculation of
-     * workbook values when the workbook is opened
-     * @since 3.8
-     */
-    @Override
-    public void setForceFormulaRecalculation(boolean value){
-        CTWorkbook ctWorkbook = getCTWorkbook();
-        CTCalcPr calcPr = ctWorkbook.isSetCalcPr() ? ctWorkbook.getCalcPr() : ctWorkbook.addNewCalcPr();
-        // when set to 0, will tell Excel that it needs to recalculate all formulas
-        // in the workbook the next time the file is opened.
-        calcPr.setCalcId(0);
-
-        if(value && calcPr.getCalcMode() == STCalcMode.MANUAL) {
-            calcPr.setCalcMode(STCalcMode.AUTO);
-        }
-    }
-
-    /**
-     * Whether Excel will be asked to recalculate all formulas when the  workbook is opened.
-     *
-     * @since 3.8
-     */
-    @Override
-    public boolean getForceFormulaRecalculation(){
-        CTWorkbook ctWorkbook = getCTWorkbook();
-        CTCalcPr calcPr = ctWorkbook.getCalcPr();
-        return calcPr != null && calcPr.getCalcId() != 0;
-    }
-
-
-
-    /**
-     * Add pivotCache to the workbook
-     */
-    @Beta
-    protected CTPivotCache addPivotCache(String rId) {
-        CTWorkbook ctWorkbook = getCTWorkbook();
-        CTPivotCaches caches;
-        if (ctWorkbook.isSetPivotCaches()) {
-            caches = ctWorkbook.getPivotCaches();
-        } else {
-            caches = ctWorkbook.addNewPivotCaches();
-        }
-        CTPivotCache cache = caches.addNewPivotCache();
-
-        int tableId = getPivotTables().size()+1;
-        cache.setCacheId(tableId);
-        cache.setId(rId);
-        if(pivotCaches == null) {
-            pivotCaches = new ArrayList<CTPivotCache>();
-        }
-        pivotCaches.add(cache);
-        return cache;
-    }
-
-    @Beta
-    public List<XSSFPivotTable> getPivotTables() {
-        return pivotTables;
-    }
-
-    @Beta
-    protected void setPivotTables(List<XSSFPivotTable> pivotTables) {
-        this.pivotTables = pivotTables;
-    }
-
-    public XSSFWorkbookType getWorkbookType() {
-        return isMacroEnabled() ? XSSFWorkbookType.XLSM : XSSFWorkbookType.XLSX;
-    }
-
-    /**
-     * Sets whether the workbook will be an .xlsx or .xlsm (macro-enabled) file.
-     */
-    public void setWorkbookType(XSSFWorkbookType type) {
-        try {
-            getPackagePart().setContentType(type.getContentType());
-        } catch (InvalidFormatException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Adds a vbaProject.bin file to the workbook.  This will change the workbook
-     * type if necessary.
-     *
-     * @throws IOException
-     */
-    public void setVBAProject(InputStream vbaProjectStream) throws IOException {
-        if (!isMacroEnabled()) {
-            setWorkbookType(XSSFWorkbookType.XLSM);
-        }
-
-        PackagePartName ppName;
-        try {
-            ppName = PackagingURIHelper.createPartName(XSSFRelation.VBA_MACROS.getDefaultFileName());
-        } catch (InvalidFormatException e) {
-            throw new POIXMLException(e);
-        }
-        OPCPackage opc = getPackage();
-        OutputStream outputStream;
-        if (!opc.containPart(ppName)) {
-            POIXMLDocumentPart relationship = createRelationship(XSSFRelation.VBA_MACROS, XSSFFactory.getInstance());
-            outputStream = relationship.getPackagePart().getOutputStream();
-        } else {
-            PackagePart part = opc.getPart(ppName);
-            outputStream = part.getOutputStream();
-        }
-        try {
-            IOUtils.copy(vbaProjectStream, outputStream);
-        } finally {
-            IOUtils.closeQuietly(outputStream);
-        }
-    }
-
-    /**
-     * Adds a vbaProject.bin file taken from another, given workbook to this one.
-     * @throws IOException
-     * @throws InvalidFormatException
-     */
-    public void setVBAProject(XSSFWorkbook macroWorkbook) throws IOException, InvalidFormatException {
-        if (!macroWorkbook.isMacroEnabled()) {
-            return;
-        }
-        InputStream vbaProjectStream = XSSFRelation.VBA_MACROS.getContents(macroWorkbook.getCorePart());
-        if (vbaProjectStream != null) {
-            setVBAProject(vbaProjectStream);
-        }
-    }
-
-    /**
-     * Returns the spreadsheet version (EXCLE2007) of this workbook
-     * 
-     * @return EXCEL2007 SpreadsheetVersion enum
-     * @since 3.14 beta 2
-     */
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion() {
-        return SpreadsheetVersion.EXCEL2007;
-    }
-    
-    /**
-     * Returns the data table with the given name (case insensitive).
-     * 
-     * @param name the data table name (case-insensitive)
-     * @return The Data table in the workbook named <tt>name</tt>, or <tt>null</tt> if no table is named <tt>name</tt>.
-     * @since 3.15 beta 2
-     */
-    public XSSFTable getTable(String name) {
-        if (name != null && sheets != null) {
-            for (XSSFSheet sheet : sheets) {
-                for (XSSFTable tbl : sheet.getTables()) {
-                    if (name.equalsIgnoreCase(tbl.getName())) {
-                        return tbl;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
deleted file mode 100644
index 917d3d6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-
-/**
- * Represents the two different kinds of XML-based OOXML document.
- */
-public enum XSSFWorkbookType {
-
-    XLSX(XSSFRelation.WORKBOOK.getContentType(), "xlsx"),
-    XLSM(XSSFRelation.MACROS_WORKBOOK.getContentType(), "xlsm");
-
-    private final String _contentType;
-    private final String _extension;
-
-    private XSSFWorkbookType(String contentType, String extension) {
-        _contentType = contentType;
-        _extension = extension;
-    }
-
-    public String getContentType() {
-        return _contentType;
-    }
-
-    public String getExtension() {
-        return _extension;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java
deleted file mode 100644
index 09393e5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.charts.ChartSeries;
-import org.apache.poi.ss.usermodel.charts.TitleType;
-import org.apache.poi.ss.util.CellReference;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTSerTx;
-
-/**
- * Base of all XSSF Chart Series
- */
-public abstract class AbstractXSSFChartSeries implements ChartSeries {
-
-    private String titleValue;
-    private CellReference titleRef;
-    private TitleType titleType;
-
-    public void setTitle(CellReference titleReference) {
-        titleType = TitleType.CELL_REFERENCE;
-        titleRef = titleReference;
-    }
-
-    public void setTitle(String title) {
-        titleType = TitleType.STRING;
-        titleValue = title;
-    }
-
-    public CellReference getTitleCellReference() {
-        if (TitleType.CELL_REFERENCE.equals(titleType)) {
-            return titleRef;
-        }
-        throw new IllegalStateException("Title type is not CellReference.");
-    }
-
-    public String getTitleString() {
-        if (TitleType.STRING.equals(titleType)) {
-            return titleValue;
-        }
-        throw new IllegalStateException("Title type is not String.");
-    }
-
-    public TitleType getTitleType() {
-        return titleType;
-    }
-
-    protected boolean isTitleSet() {
-        return titleType != null;
-    }
-
-    protected CTSerTx getCTSerTx() {
-        CTSerTx tx = CTSerTx.Factory.newInstance();
-        switch (titleType) {
-            case CELL_REFERENCE:
-                tx.addNewStrRef().setF(titleRef.formatAsString());
-                return tx;
-            case STRING:
-                tx.setV(titleValue);
-                return tx;
-            default:
-                throw new IllegalStateException("Unkown title type: " + titleType);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFCategoryAxis.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFCategoryAxis.java
deleted file mode 100644
index 43ac8f6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFCategoryAxis.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.charts.*;
-import org.apache.poi.util.Beta;
-import org.apache.poi.xssf.usermodel.XSSFChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.*;
-
-/**
- * Category axis type.
- *
- * @author Martin Andersson
- */
-@Beta
-public class XSSFCategoryAxis extends XSSFChartAxis {
-
-	private CTCatAx ctCatAx;
-
-	public XSSFCategoryAxis(XSSFChart chart, long id, AxisPosition pos) {
-		super(chart);
-		createAxis(id, pos);
-	}
-
-	public XSSFCategoryAxis(XSSFChart chart, CTCatAx ctCatAx) {
-		super(chart);
-		this.ctCatAx = ctCatAx;
-	}
-
-	public long getId() {
-		return ctCatAx.getAxId().getVal();
-	}
-
-	protected CTAxPos getCTAxPos() {
-		return ctCatAx.getAxPos();
-	}
-
-	protected CTNumFmt getCTNumFmt() {
-		if (ctCatAx.isSetNumFmt()) {
-			return ctCatAx.getNumFmt();
-		}
-		return ctCatAx.addNewNumFmt();
-	}
-
-	protected CTScaling getCTScaling() {
-		return ctCatAx.getScaling();
-	}
-
-	protected CTCrosses getCTCrosses() {
-		return ctCatAx.getCrosses();
-	}
-
-	@Override
-	protected CTBoolean getDelete() {
-		return ctCatAx.getDelete();
-	}
-
-	@Override
-	protected CTTickMark getMajorCTTickMark() {
-		return ctCatAx.getMajorTickMark();
-	}
-
-	@Override
-	protected CTTickMark getMinorCTTickMark() {
-		return ctCatAx.getMinorTickMark();
-	}
-
-	public void crossAxis(ChartAxis axis) {
-		ctCatAx.getCrossAx().setVal(axis.getId());
-	}
-
-	private void createAxis(long id, AxisPosition pos) {
-		ctCatAx = chart.getCTChart().getPlotArea().addNewCatAx();
-		ctCatAx.addNewAxId().setVal(id);
-		ctCatAx.addNewAxPos();
-		ctCatAx.addNewScaling();
-		ctCatAx.addNewCrosses();
-		ctCatAx.addNewCrossAx();
-		ctCatAx.addNewTickLblPos().setVal(STTickLblPos.NEXT_TO);
-		ctCatAx.addNewDelete();
-		ctCatAx.addNewMajorTickMark();
-		ctCatAx.addNewMinorTickMark();
-
-		setPosition(pos);
-		setOrientation(AxisOrientation.MIN_MAX);
-		setCrosses(AxisCrosses.AUTO_ZERO);
-		setVisible(true);
-		setMajorTickMark(AxisTickMark.CROSS);
-		setMinorTickMark(AxisTickMark.NONE);
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartAxis.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartAxis.java
deleted file mode 100644
index 2e89755..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartAxis.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.AxisPosition;
-import org.apache.poi.ss.usermodel.charts.AxisOrientation;
-import org.apache.poi.ss.usermodel.charts.AxisCrosses;
-import org.apache.poi.ss.usermodel.charts.AxisTickMark;
-import org.apache.poi.util.Beta;
-import org.apache.poi.xssf.usermodel.XSSFChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTAxPos;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTBoolean;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTNumFmt;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTCrosses;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTOrientation;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLogBase;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTScaling;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTTickMark;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STOrientation;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STAxPos;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STCrosses;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STTickMark;
-
-/**
- * Base class for all axis types.
- *
- * @author Roman Kashitsyn
- */
-@Beta
-public abstract class XSSFChartAxis implements ChartAxis {
-
-	protected XSSFChart chart;
-
-	private static final double MIN_LOG_BASE = 2.0;
-	private static final double MAX_LOG_BASE = 1000.0;
-
-	protected XSSFChartAxis(XSSFChart chart) {
-		this.chart = chart;
-	}
-
-	public AxisPosition getPosition() {
-		return toAxisPosition(getCTAxPos());
-	}
-
-	public void setPosition(AxisPosition position) {
-		getCTAxPos().setVal(fromAxisPosition(position));
-	}
-
-	public void setNumberFormat(String format) {
-		getCTNumFmt().setFormatCode(format);
-		getCTNumFmt().setSourceLinked(true);
-	}
-
-	public String getNumberFormat() {
-		return getCTNumFmt().getFormatCode();
-	}
-
-	public boolean isSetLogBase() {
-		return getCTScaling().isSetLogBase();
-	}
-
-	public void setLogBase(double logBase) {
-		if (logBase < MIN_LOG_BASE ||
-			MAX_LOG_BASE < logBase) {
-			throw new IllegalArgumentException("Axis log base must be between 2 and 1000 (inclusive), got: " + logBase);
-		}
-		CTScaling scaling = getCTScaling();
-		if (scaling.isSetLogBase()) {
-			scaling.getLogBase().setVal(logBase);
-		} else {
-			scaling.addNewLogBase().setVal(logBase);
-		}
-	}
-
-	public double getLogBase() {
-		CTLogBase logBase = getCTScaling().getLogBase();
-		if (logBase != null) {
-			return logBase.getVal();
-		}
-		return 0.0;
-	}
-
-	public boolean isSetMinimum() {
-		return getCTScaling().isSetMin();
-	}
-
-	public void setMinimum(double min) {
-		CTScaling scaling = getCTScaling();
-		if (scaling.isSetMin()) {
-			scaling.getMin().setVal(min);
-		} else {
-			scaling.addNewMin().setVal(min);
-		}
-	}
-
-	public double getMinimum() {
-		CTScaling scaling = getCTScaling();
-		if (scaling.isSetMin()) {
-			return scaling.getMin().getVal();
-		} else {
-			return 0.0;
-		}
-	}
-
-	public boolean isSetMaximum() {
-		return getCTScaling().isSetMax();
-	}
-
-	public void setMaximum(double max) {
-		CTScaling scaling = getCTScaling();
-		if (scaling.isSetMax()) {
-			scaling.getMax().setVal(max);
-		} else {
-			scaling.addNewMax().setVal(max);
-		}
-	}
-
-	public double getMaximum() {
-		CTScaling scaling = getCTScaling();
-		if (scaling.isSetMax()) {
-			return scaling.getMax().getVal();
-		} else {
-			return 0.0;
-		}
-	}
-
-	public AxisOrientation getOrientation() {
-		return toAxisOrientation(getCTScaling().getOrientation());
-	}
-
-	public void setOrientation(AxisOrientation orientation) {
-		CTScaling scaling = getCTScaling();
-		STOrientation.Enum stOrientation = fromAxisOrientation(orientation);
-		if (scaling.isSetOrientation()) {
-			scaling.getOrientation().setVal(stOrientation);
-		} else {
-			getCTScaling().addNewOrientation().setVal(stOrientation);
-		}
-	}
-
-	public AxisCrosses getCrosses() {
-		return toAxisCrosses(getCTCrosses());
-	}
-
-	public void setCrosses(AxisCrosses crosses) {
-		getCTCrosses().setVal(fromAxisCrosses(crosses));
-	}
-
-	public boolean isVisible() {
-		return !getDelete().getVal();
-	}
-
-	public void setVisible(boolean value) {
-		getDelete().setVal(!value);
-	}
-
-	public AxisTickMark getMajorTickMark() {
-		return toAxisTickMark(getMajorCTTickMark());
-	}
-
-	public void setMajorTickMark(AxisTickMark tickMark) {
-		getMajorCTTickMark().setVal(fromAxisTickMark(tickMark));
-	}
-
-	public AxisTickMark getMinorTickMark() {
-		return toAxisTickMark(getMinorCTTickMark());
-	}
-
-	public void setMinorTickMark(AxisTickMark tickMark) {
-		getMinorCTTickMark().setVal(fromAxisTickMark(tickMark));
-	}
-
-	protected abstract CTAxPos getCTAxPos();
-	protected abstract CTNumFmt getCTNumFmt();
-	protected abstract CTScaling getCTScaling();
-	protected abstract CTCrosses getCTCrosses();
-	protected abstract CTBoolean getDelete();
-	protected abstract CTTickMark getMajorCTTickMark();
-	protected abstract CTTickMark getMinorCTTickMark();
-
-	private static STOrientation.Enum fromAxisOrientation(AxisOrientation orientation) {
-		switch (orientation) {
-			case MIN_MAX: return STOrientation.MIN_MAX;
-			case MAX_MIN: return STOrientation.MAX_MIN;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-
-	private static AxisOrientation toAxisOrientation(CTOrientation ctOrientation) {
-		switch (ctOrientation.getVal().intValue()) {
-			case STOrientation.INT_MIN_MAX: return AxisOrientation.MIN_MAX;
-			case STOrientation.INT_MAX_MIN: return AxisOrientation.MAX_MIN;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-
-	private static STCrosses.Enum fromAxisCrosses(AxisCrosses crosses) {
-		switch (crosses) {
-			case AUTO_ZERO: return STCrosses.AUTO_ZERO;
-			case MIN: return STCrosses.MIN;
-			case MAX: return STCrosses.MAX;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-
-	private static AxisCrosses toAxisCrosses(CTCrosses ctCrosses) {
-		switch (ctCrosses.getVal().intValue()) {
-			case STCrosses.INT_AUTO_ZERO: return AxisCrosses.AUTO_ZERO;
-			case STCrosses.INT_MAX: return AxisCrosses.MAX;
-			case STCrosses.INT_MIN: return AxisCrosses.MIN;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-
-	private static STAxPos.Enum fromAxisPosition(AxisPosition position) {
-		switch (position) {
-			case BOTTOM: return STAxPos.B;
-			case LEFT: return STAxPos.L;
-			case RIGHT: return STAxPos.R;
-			case TOP: return STAxPos.T;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-
-	private static AxisPosition toAxisPosition(CTAxPos ctAxPos) {
-		switch (ctAxPos.getVal().intValue()) {
-			case STAxPos.INT_B: return AxisPosition.BOTTOM;
-			case STAxPos.INT_L: return AxisPosition.LEFT;
-			case STAxPos.INT_R: return AxisPosition.RIGHT;
-			case STAxPos.INT_T: return AxisPosition.TOP;
-			default: return AxisPosition.BOTTOM;
-		}
-	}
-
-	private static STTickMark.Enum fromAxisTickMark(AxisTickMark tickMark) {
-		switch (tickMark) {
-			case NONE: return STTickMark.NONE;
-			case IN: return STTickMark.IN;
-			case OUT: return STTickMark.OUT;
-			case CROSS: return STTickMark.CROSS;
-			default:
-				throw new IllegalArgumentException("Unknown AxisTickMark: " + tickMark);
-		}
-	}
-
-	private static AxisTickMark toAxisTickMark(CTTickMark ctTickMark) {
-		switch (ctTickMark.getVal().intValue()) {
-			case STTickMark.INT_NONE: return AxisTickMark.NONE;
-			case STTickMark.INT_IN: return AxisTickMark.IN;
-			case STTickMark.INT_OUT: return AxisTickMark.OUT;
-			case STTickMark.INT_CROSS: return AxisTickMark.CROSS;
-			default: return AxisTickMark.CROSS;
-		}
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartDataFactory.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartDataFactory.java
deleted file mode 100644
index 8bde83a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartDataFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.charts.*;
-import org.apache.poi.util.Beta;
-
-/**
- * @author Roman Kashitsyn
- */
-@Beta
-public class XSSFChartDataFactory implements ChartDataFactory {
-
-	private static XSSFChartDataFactory instance;
-
-	private XSSFChartDataFactory() {
-		super();
-	}
-
-	/**
-	 * @return new scatter charts data instance
-	 */
-	public XSSFScatterChartData createScatterChartData() {
-		return new XSSFScatterChartData();
-	}
-
-	/**
-	 * @return new line charts data instance
-	 */
-	public XSSFLineChartData createLineChartData() {
-		return new XSSFLineChartData();
-	}
-
-	/**
-	 * @return factory instance
-	 */
-	public static XSSFChartDataFactory getInstance() {
-		if (instance == null) {
-			instance = new XSSFChartDataFactory();
-		}
-		return instance;
-	}
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartLegend.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartLegend.java
deleted file mode 100644
index 6d82881..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartLegend.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.ss.usermodel.charts.ChartLegend;
-import org.apache.poi.ss.usermodel.charts.LegendPosition;
-import org.apache.poi.xssf.usermodel.XSSFChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLegend;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLegendPos;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STLegendPos;
-
-/**
- * Represents a SpreadsheetML chart legend
- * @author Roman Kashitsyn
- * @author Martin Andersson
- */
-@Beta
-public final class XSSFChartLegend implements ChartLegend {
-
-	/**
-	 * Underlaying CTLagend bean
-	 */
-	private CTLegend legend;
-
-	/**
-	 * Create a new SpreadsheetML chart legend
-	 */
-	public XSSFChartLegend(XSSFChart chart) {
-		CTChart ctChart = chart.getCTChart();
-		this.legend = (ctChart.isSetLegend()) ?
-			ctChart.getLegend() :
-			ctChart.addNewLegend();
-
-		setDefaults();
-	}
-
-	/**
-	 * Set sensible default styling.
-	 */
-	private void setDefaults() {
-		if (!legend.isSetOverlay()) {
-			legend.addNewOverlay();
-		}
-		legend.getOverlay().setVal(false);
-	}
-
-	/**
-	 * Return the underlying CTLegend bean.
-	 *
-	 * @return the underlying CTLegend bean
-	 */
-	@Internal
-	public CTLegend getCTLegend(){
-		return legend;
-	}
-
-	public void setPosition(LegendPosition position) {
-		if (!legend.isSetLegendPos()) {
-			legend.addNewLegendPos();
-		}
-		legend.getLegendPos().setVal(fromLegendPosition(position));
-	}
-
-	/*
-	 * According to ECMA-376 default position is RIGHT.
-	 */
-	public LegendPosition getPosition() {
-		if (legend.isSetLegendPos()) {
-			return toLegendPosition(legend.getLegendPos());
-		} else {
-			return LegendPosition.RIGHT;
-		}
-	}
-
-	public XSSFManualLayout getManualLayout() {
-		if (!legend.isSetLayout()) {
-			legend.addNewLayout();
-		}
-		return new XSSFManualLayout(legend.getLayout());
-	}
-
-	public boolean isOverlay() {
-		return legend.getOverlay().getVal();
-	}
-
-	public void setOverlay(boolean value) {
-		legend.getOverlay().setVal(value);
-	}
-
-	private STLegendPos.Enum fromLegendPosition(LegendPosition position) {
-		switch (position) {
-			case BOTTOM: return STLegendPos.B;
-			case LEFT: return STLegendPos.L;
-			case RIGHT: return STLegendPos.R;
-			case TOP: return STLegendPos.T;
-			case TOP_RIGHT: return STLegendPos.TR;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-
-	private LegendPosition toLegendPosition(CTLegendPos ctLegendPos) {
-		switch (ctLegendPos.getVal().intValue()) {
-			case STLegendPos.INT_B: return LegendPosition.BOTTOM;
-			case STLegendPos.INT_L: return LegendPosition.LEFT;
-			case STLegendPos.INT_R: return LegendPosition.RIGHT;
-			case STLegendPos.INT_T: return LegendPosition.TOP;
-			case STLegendPos.INT_TR: return LegendPosition.TOP_RIGHT;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartUtil.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartUtil.java
deleted file mode 100644
index d0a13b4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartUtil.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.charts.ChartDataSource;
-import org.openxmlformats.schemas.drawingml.x2006.chart.*;
-
-/**
- * Package private class with utility methods.
- *
- * @author Roman Kashitsyn
- */
-class XSSFChartUtil {
-
-    private XSSFChartUtil() {}
-
-    /**
-     * Builds CTAxDataSource object content from POI ChartDataSource.
-     * @param ctAxDataSource OOXML data source to build
-     * @param dataSource POI data source to use
-     */
-    public static void buildAxDataSource(CTAxDataSource ctAxDataSource, ChartDataSource<?> dataSource) {
-        if (dataSource.isNumeric()) {
-            if (dataSource.isReference()) {
-                buildNumRef(ctAxDataSource.addNewNumRef(), dataSource);
-            } else {
-                buildNumLit(ctAxDataSource.addNewNumLit(), dataSource);
-            }
-        } else {
-            if (dataSource.isReference()) {
-                buildStrRef(ctAxDataSource.addNewStrRef(), dataSource);
-            } else {
-                buildStrLit(ctAxDataSource.addNewStrLit(), dataSource);
-            }
-        }
-    }
-
-    /**
-     * Builds CTNumDataSource object content from POI ChartDataSource
-     * @param ctNumDataSource OOXML data source to build
-     * @param dataSource POI data source to use
-     */
-    public static void buildNumDataSource(CTNumDataSource ctNumDataSource,
-                                          ChartDataSource<? extends Number> dataSource) {
-        if (dataSource.isReference()) {
-            buildNumRef(ctNumDataSource.addNewNumRef(), dataSource);
-        } else {
-            buildNumLit(ctNumDataSource.addNewNumLit(), dataSource);
-        }
-    }
-
-    private static void buildNumRef(CTNumRef ctNumRef, ChartDataSource<?> dataSource) {
-        ctNumRef.setF(dataSource.getFormulaString());
-        CTNumData cache = ctNumRef.addNewNumCache();
-        fillNumCache(cache, dataSource);
-    }
-
-    private static void buildNumLit(CTNumData ctNumData, ChartDataSource<?> dataSource) {
-        fillNumCache(ctNumData, dataSource);
-    }
-
-    private static void buildStrRef(CTStrRef ctStrRef, ChartDataSource<?> dataSource) {
-        ctStrRef.setF(dataSource.getFormulaString());
-        CTStrData cache = ctStrRef.addNewStrCache();
-        fillStringCache(cache, dataSource);
-    }
-
-    private static void buildStrLit(CTStrData ctStrData, ChartDataSource<?> dataSource) {
-        fillStringCache(ctStrData, dataSource);
-    }
-
-    private static void fillStringCache(CTStrData cache, ChartDataSource<?> dataSource) {
-        int numOfPoints = dataSource.getPointCount();
-        cache.addNewPtCount().setVal(numOfPoints);
-        for (int i = 0; i < numOfPoints; ++i) {
-            Object value = dataSource.getPointAt(i);
-            if (value != null) {
-                CTStrVal ctStrVal = cache.addNewPt();
-                ctStrVal.setIdx(i);
-                ctStrVal.setV(value.toString());
-            }
-        }
-
-    }
-
-    private static void fillNumCache(CTNumData cache, ChartDataSource<?> dataSource) {
-        int numOfPoints = dataSource.getPointCount();
-        cache.addNewPtCount().setVal(numOfPoints);
-        for (int i = 0; i < numOfPoints; ++i) {
-            Number value = (Number) dataSource.getPointAt(i);
-            if (value != null) {
-                CTNumVal ctNumVal = cache.addNewPt();
-                ctNumVal.setIdx(i);
-                ctNumVal.setV(value.toString());
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFLineChartData.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFLineChartData.java
deleted file mode 100644
index 54bba03..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFLineChartData.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ChartDataSource;
-import org.apache.poi.ss.usermodel.charts.LineChartData;
-import org.apache.poi.ss.usermodel.charts.LineChartSeries;
-import org.apache.poi.util.Beta;
-import org.apache.poi.xssf.usermodel.XSSFChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTAxDataSource;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLineChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLineSer;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTNumDataSource;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPlotArea;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STMarkerStyle;
-
-/**
- * Holds data for a XSSF Line Chart
- */
-@Beta
-public class XSSFLineChartData implements LineChartData {
-
-    /**
-     * List of all data series.
-     */
-    private List<Series> series;
-
-    public XSSFLineChartData() {
-        series = new ArrayList<Series>();
-    }
-
-    static class Series extends AbstractXSSFChartSeries implements LineChartSeries {
-        private int id;
-        private int order;
-        private ChartDataSource<?> categories;
-        private ChartDataSource<? extends Number> values;
-
-        protected Series(int id, int order,
-                        ChartDataSource<?> categories,
-                        ChartDataSource<? extends Number> values) {
-            this.id = id;
-            this.order = order;
-            this.categories = categories;
-            this.values = values;
-        }
-
-        public ChartDataSource<?> getCategoryAxisData() {
-            return categories;
-        }
-
-        public ChartDataSource<? extends Number> getValues() {
-            return values;
-        }
-
-        protected void addToChart(CTLineChart ctLineChart) {
-            CTLineSer ctLineSer = ctLineChart.addNewSer();
-            ctLineSer.addNewIdx().setVal(id);
-            ctLineSer.addNewOrder().setVal(order);
-
-            // No marker symbol on the chart line.
-            ctLineSer.addNewMarker().addNewSymbol().setVal(STMarkerStyle.NONE);
-
-            CTAxDataSource catDS = ctLineSer.addNewCat();
-            XSSFChartUtil.buildAxDataSource(catDS, categories);
-            CTNumDataSource valueDS = ctLineSer.addNewVal();
-            XSSFChartUtil.buildNumDataSource(valueDS, values);
-
-            if (isTitleSet()) {
-                ctLineSer.setTx(getCTSerTx());
-            }
-        }
-    }
-
-    public LineChartSeries addSeries(ChartDataSource<?> categoryAxisData, ChartDataSource<? extends Number> values) {
-        if (!values.isNumeric()) {
-            throw new IllegalArgumentException("Value data source must be numeric.");
-        }
-        int numOfSeries = series.size();
-        Series newSeries = new Series(numOfSeries, numOfSeries, categoryAxisData, values);
-        series.add(newSeries);
-        return newSeries;
-    }
-
-    public List<? extends LineChartSeries> getSeries() {
-        return series;
-    }
-
-    public void fillChart(Chart chart, ChartAxis... axis) {
-        if (!(chart instanceof XSSFChart)) {
-            throw new IllegalArgumentException("Chart must be instance of XSSFChart");
-        }
-
-        XSSFChart xssfChart = (XSSFChart) chart;
-        CTPlotArea plotArea = xssfChart.getCTChart().getPlotArea();
-        CTLineChart lineChart = plotArea.addNewLineChart();
-        lineChart.addNewVaryColors().setVal(false);
-
-        for (Series s : series) {
-            s.addToChart(lineChart);
-        }
-
-        for (ChartAxis ax : axis) {
-            lineChart.addNewAxId().setVal(ax.getId());
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFManualLayout.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFManualLayout.java
deleted file mode 100644
index b71d0c9..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFManualLayout.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.	See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.	 You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.ss.usermodel.charts.ManualLayout;
-import org.apache.poi.ss.usermodel.charts.LayoutMode;
-import org.apache.poi.ss.usermodel.charts.LayoutTarget;
-import org.apache.poi.xssf.usermodel.XSSFChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STLayoutTarget;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLayout;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTManualLayout;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPlotArea;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLayoutMode;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTLayoutTarget;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STLayoutMode;
-
-/**
- * Represents a SpreadsheetML manual layout.
- * @author Roman Kashitsyn
- */
-@Beta
-public final class XSSFManualLayout implements ManualLayout {
-
-	/**
-	 * Underlaying CTManualLayout bean.
-	 */
-	private CTManualLayout layout;
-
-	private static final LayoutMode defaultLayoutMode = LayoutMode.EDGE;
-	private static final LayoutTarget defaultLayoutTarget = LayoutTarget.INNER;
-
-	/**
-	 * Create a new SpreadsheetML manual layout.
-	 * @param ctLayout a Spreadsheet ML layout that should be used as base.
-	 */
-	public XSSFManualLayout(CTLayout ctLayout) {
-		initLayout(ctLayout);
-	}
-
-	/**
-	 * Create a new SpreadsheetML manual layout for chart.
-	 * @param chart a chart to create layout for.
-	 */
-	public XSSFManualLayout(XSSFChart chart) {
-		CTPlotArea ctPlotArea = chart.getCTChart().getPlotArea();
-		CTLayout ctLayout = ctPlotArea.isSetLayout() ?
-			ctPlotArea.getLayout() : ctPlotArea.addNewLayout();
-
-		initLayout(ctLayout);
-	}
-
-	/**
-	 * Return the underlying CTManualLayout bean.
-	 *
-	 * @return the underlying CTManualLayout bean.
-	 */
-	@Internal public CTManualLayout getCTManualLayout(){
-		return layout;
-	}
-
-	public void setWidthRatio(double ratio) {
-		if (!layout.isSetW()) {
-			layout.addNewW();
-		}
-		layout.getW().setVal(ratio);
-	}
-
-	public double getWidthRatio() {
-		if (!layout.isSetW()) {
-			return 0.0;
-		}
-		return layout.getW().getVal();
-	}
-
-	public void setHeightRatio(double ratio) {
-		if (!layout.isSetH()) {
-			layout.addNewH();
-		}
-		layout.getH().setVal(ratio);
-	}
-
-	public double getHeightRatio() {
-		if (!layout.isSetH()) {
-			return 0.0;
-		}
-		return layout.getH().getVal();
-	}
-
-	public LayoutTarget getTarget() {
-		if (!layout.isSetLayoutTarget()) {
-			return defaultLayoutTarget;
-		}
-		return toLayoutTarget(layout.getLayoutTarget());
-	}
-
-	public void setTarget(LayoutTarget target) {
-		if (!layout.isSetLayoutTarget()) {
-			layout.addNewLayoutTarget();
-		}
-		layout.getLayoutTarget().setVal(fromLayoutTarget(target));
-	}
-
-	public LayoutMode getXMode() {
-		if (!layout.isSetXMode()) {
-			return defaultLayoutMode;
-		}
-		return toLayoutMode(layout.getXMode());
-	}
-
-	public void setXMode(LayoutMode mode) {
-		if (!layout.isSetXMode()) {
-			layout.addNewXMode();
-		}
-		layout.getXMode().setVal(fromLayoutMode(mode));
-	}
-
-	public LayoutMode getYMode() {
-		if (!layout.isSetYMode()) {
-			return defaultLayoutMode;
-		}
-		return toLayoutMode(layout.getYMode());
-	}
-
-	public void setYMode(LayoutMode mode) {
-		if (!layout.isSetYMode()) {
-			layout.addNewYMode();
-		}
-		layout.getYMode().setVal(fromLayoutMode(mode));
-	}
-
-	public double getX() {
-		if (!layout.isSetX()) {
-			return 0.0;
-		}
-		return layout.getX().getVal();
-	}
-
-	public void setX(double x) {
-		if (!layout.isSetX()) {
-			layout.addNewX();
-		}
-		layout.getX().setVal(x);
-	}
-
-	public double getY() {
-		if (!layout.isSetY()) {
-			return 0.0;
-		}
-		return layout.getY().getVal();
-	}
-
-	public void setY(double y) {
-		if (!layout.isSetY()) {
-			layout.addNewY();
-		}
-		layout.getY().setVal(y);
-	}
-
-	public LayoutMode getWidthMode() {
-		if (!layout.isSetWMode()) {
-			return defaultLayoutMode;
-		}
-		return toLayoutMode(layout.getWMode());
-	}
-
-	public void setWidthMode(LayoutMode mode) {
-		if (!layout.isSetWMode()) {
-			layout.addNewWMode();
-		}
-		layout.getWMode().setVal(fromLayoutMode(mode));
-	}
-
-	public LayoutMode getHeightMode() {
-		if (!layout.isSetHMode()) {
-			return defaultLayoutMode;
-		}
-		return toLayoutMode(layout.getHMode());
-	}
-
-	public void setHeightMode(LayoutMode mode) {
-		if (!layout.isSetHMode()) {
-			layout.addNewHMode();
-		}
-		layout.getHMode().setVal(fromLayoutMode(mode));
-	}
-
-	private void initLayout(CTLayout ctLayout) {
-		if (ctLayout.isSetManualLayout()) {
-			this.layout = ctLayout.getManualLayout();
-		} else {
-			this.layout = ctLayout.addNewManualLayout();
-		}
-	}
-
-	private STLayoutMode.Enum fromLayoutMode(LayoutMode mode) {
-		switch (mode) {
-		case EDGE: return STLayoutMode.EDGE;
-		case FACTOR: return STLayoutMode.FACTOR;
-		default:
-			throw new IllegalArgumentException();
-		}
-	}
-
-	private LayoutMode toLayoutMode(CTLayoutMode ctLayoutMode) {
-		switch (ctLayoutMode.getVal().intValue()) {
-		case STLayoutMode.INT_EDGE: return LayoutMode.EDGE;
-		case STLayoutMode.INT_FACTOR: return LayoutMode.FACTOR;
-		default:
-			throw new IllegalArgumentException();
-		}
-	}
-
-	private STLayoutTarget.Enum fromLayoutTarget(LayoutTarget target) {
-		switch (target) {
-		case INNER: return STLayoutTarget.INNER;
-		case OUTER: return STLayoutTarget.OUTER;
-		default:
-			throw new IllegalArgumentException();
-		}
-	}
-
-	private LayoutTarget toLayoutTarget(CTLayoutTarget ctLayoutTarget) {
-		switch (ctLayoutTarget.getVal().intValue()) {
-		case STLayoutTarget.INT_INNER: return LayoutTarget.INNER;
-		case STLayoutTarget.INT_OUTER: return LayoutTarget.OUTER;
-		default:
-			throw new IllegalArgumentException();
-		}
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFScatterChartData.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFScatterChartData.java
deleted file mode 100644
index f31b355..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFScatterChartData.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ChartDataSource;
-import org.apache.poi.ss.usermodel.charts.ScatterChartData;
-import org.apache.poi.ss.usermodel.charts.ScatterChartSeries;
-import org.apache.poi.util.Beta;
-import org.apache.poi.xssf.usermodel.XSSFChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTAxDataSource;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTNumDataSource;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTPlotArea;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTScatterChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTScatterSer;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTScatterStyle;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STScatterStyle;
-
-
-/**
- * Represents DrawingML scatter charts.
- */
-@Beta
-public class XSSFScatterChartData implements ScatterChartData {
-
-    /**
-     * List of all data series.
-     */
-    private List<Series> series;
-
-    public XSSFScatterChartData() {
-        series = new ArrayList<Series>();
-    }
-
-    /**
-     * Package private ScatterChartSerie implementation.
-     */
-    static class Series extends AbstractXSSFChartSeries implements ScatterChartSeries {
-        private int id;
-        private int order;
-        private ChartDataSource<?> xs;
-        private ChartDataSource<? extends Number> ys;
-
-        protected Series(int id, int order,
-                        ChartDataSource<?> xs,
-                        ChartDataSource<? extends Number> ys) {
-            super();
-            this.id = id;
-            this.order = order;
-            this.xs = xs;
-            this.ys = ys;
-        }
-
-        /**
-         * Returns data source used for X axis values.
-         * @return data source used for X axis values
-         */
-        public ChartDataSource<?> getXValues() {
-            return xs;
-        }
-
-        /**
-         * Returns data source used for Y axis values.
-         * @return data source used for Y axis values
-         */
-        public ChartDataSource<? extends Number> getYValues() {
-            return ys;
-        }
-
-        protected void addToChart(CTScatterChart ctScatterChart) {
-            CTScatterSer scatterSer = ctScatterChart.addNewSer();
-            scatterSer.addNewIdx().setVal(this.id);
-            scatterSer.addNewOrder().setVal(this.order);
-
-            CTAxDataSource xVal = scatterSer.addNewXVal();
-            XSSFChartUtil.buildAxDataSource(xVal, xs);
-
-            CTNumDataSource yVal = scatterSer.addNewYVal();
-            XSSFChartUtil.buildNumDataSource(yVal, ys);
-
-			if (isTitleSet()) {
-				scatterSer.setTx(getCTSerTx());
-			}
-        }
-    }
-
-    public ScatterChartSeries addSerie(ChartDataSource<?> xs,
-                                      ChartDataSource<? extends Number> ys) {
-        if (!ys.isNumeric()) {
-            throw new IllegalArgumentException("Y axis data source must be numeric.");
-        }
-        int numOfSeries = series.size();
-        Series newSerie = new Series(numOfSeries, numOfSeries, xs, ys);
-        series.add(newSerie);
-        return newSerie;
-    }
-
-    public void fillChart(Chart chart, ChartAxis... axis) {
-        if (!(chart instanceof XSSFChart)) {
-            throw new IllegalArgumentException("Chart must be instance of XSSFChart");
-        }
-
-        XSSFChart xssfChart = (XSSFChart) chart;
-        CTPlotArea plotArea = xssfChart.getCTChart().getPlotArea();
-        CTScatterChart scatterChart = plotArea.addNewScatterChart();
-        addStyle(scatterChart);
-
-        for (Series s : series) {
-            s.addToChart(scatterChart);
-        }
-
-        for (ChartAxis ax : axis) {
-            scatterChart.addNewAxId().setVal(ax.getId());
-        }
-    }
-
-    public List<? extends Series> getSeries() {
-        return series;
-    }
-
-    private void addStyle(CTScatterChart ctScatterChart) {
-        CTScatterStyle scatterStyle = ctScatterChart.addNewScatterStyle();
-        scatterStyle.setVal(STScatterStyle.LINE_MARKER);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFValueAxis.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFValueAxis.java
deleted file mode 100644
index 7fc0718..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFValueAxis.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ValueAxis;
-import org.apache.poi.ss.usermodel.charts.AxisPosition;
-import org.apache.poi.ss.usermodel.charts.AxisOrientation;
-import org.apache.poi.ss.usermodel.charts.AxisCrossBetween;
-import org.apache.poi.ss.usermodel.charts.AxisCrosses;
-import org.apache.poi.ss.usermodel.charts.AxisTickMark;
-
-import org.apache.poi.util.Beta;
-import org.apache.poi.xssf.usermodel.XSSFChart;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTValAx;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTAxPos;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTBoolean;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTNumFmt;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTCrosses;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTScaling;
-import org.openxmlformats.schemas.drawingml.x2006.chart.CTTickMark;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STCrossBetween;
-import org.openxmlformats.schemas.drawingml.x2006.chart.STTickLblPos;
-
-/**
- * Value axis type.
- *
- * @author Roman Kashitsyn
- */
-@Beta
-public class XSSFValueAxis extends XSSFChartAxis implements ValueAxis {
-
-	private CTValAx ctValAx;
-
-	public XSSFValueAxis(XSSFChart chart, long id, AxisPosition pos) {
-		super(chart);
-		createAxis(id, pos);
-	}
-
-	public XSSFValueAxis(XSSFChart chart, CTValAx ctValAx) {
-		super(chart);
-		this.ctValAx = ctValAx;
-	}
-
-	public long getId() {
-		return ctValAx.getAxId().getVal();
-	}
-
-	public void setCrossBetween(AxisCrossBetween crossBetween) {
-		ctValAx.getCrossBetween().setVal(fromCrossBetween(crossBetween));
-	}
-
-	public AxisCrossBetween getCrossBetween() {
-		return toCrossBetween(ctValAx.getCrossBetween().getVal());
-	}
-
-	@Override
-	protected CTAxPos getCTAxPos() {
-		return ctValAx.getAxPos();
-	}
-
-	@Override
-	protected CTNumFmt getCTNumFmt() {
-		if (ctValAx.isSetNumFmt()) {
-			return ctValAx.getNumFmt();
-		}
-		return ctValAx.addNewNumFmt();
-	}
-
-	@Override
-	protected CTScaling getCTScaling() {
-		return ctValAx.getScaling();
-	}
-
-	@Override
-	protected CTCrosses getCTCrosses() {
-		return ctValAx.getCrosses();
-	}
-
-	@Override
-	protected CTBoolean getDelete() {
-		return ctValAx.getDelete();
-	}
-
-	@Override
-	protected CTTickMark getMajorCTTickMark() {
-		return ctValAx.getMajorTickMark();
-	}
-
-	@Override
-	protected CTTickMark getMinorCTTickMark() {
-		return ctValAx.getMinorTickMark();
-	}
-
-	public void crossAxis(ChartAxis axis) {
-		ctValAx.getCrossAx().setVal(axis.getId());
-	}
-
-	private void createAxis(long id, AxisPosition pos) {
-		ctValAx = chart.getCTChart().getPlotArea().addNewValAx();
-		ctValAx.addNewAxId().setVal(id);
-		ctValAx.addNewAxPos();
-		ctValAx.addNewScaling();
-		ctValAx.addNewCrossBetween();
-		ctValAx.addNewCrosses();
-		ctValAx.addNewCrossAx();
-		ctValAx.addNewTickLblPos().setVal(STTickLblPos.NEXT_TO);
-		ctValAx.addNewDelete();
-		ctValAx.addNewMajorTickMark();
-		ctValAx.addNewMinorTickMark();
-
-		setPosition(pos);
-		setOrientation(AxisOrientation.MIN_MAX);
-		setCrossBetween(AxisCrossBetween.MIDPOINT_CATEGORY);
-		setCrosses(AxisCrosses.AUTO_ZERO);
-		setVisible(true);
-		setMajorTickMark(AxisTickMark.CROSS);
-		setMinorTickMark(AxisTickMark.NONE);
-	}
-
-	private static STCrossBetween.Enum fromCrossBetween(AxisCrossBetween crossBetween) {
-		switch (crossBetween) {
-			case BETWEEN: return STCrossBetween.BETWEEN;
-			case MIDPOINT_CATEGORY: return STCrossBetween.MID_CAT;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-
-	private static AxisCrossBetween toCrossBetween(STCrossBetween.Enum ctCrossBetween) {
-		switch (ctCrossBetween.intValue()) {
-			case STCrossBetween.INT_BETWEEN: return AxisCrossBetween.BETWEEN;
-			case STCrossBetween.INT_MID_CAT: return AxisCrossBetween.MIDPOINT_CATEGORY;
-			default:
-				throw new IllegalArgumentException();
-		}
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
deleted file mode 100644
index 06e5d0b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.extensions;
-
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellAlignment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STHorizontalAlignment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STVerticalAlignment;
-
-
-/**
- * Cell settings available in the Format/Alignment tab
- */
-public class XSSFCellAlignment {
-    private CTCellAlignment cellAlignement;
-
-    /**
-     * Creates a Cell Alignment from the supplied XML definition
-     *
-     * @param cellAlignment
-     */
-    public XSSFCellAlignment(CTCellAlignment cellAlignment) {
-        this.cellAlignement = cellAlignment;
-    }
-
-    /**
-     * Get the type of vertical alignment for the cell
-     *
-     * @return the type of aligment
-     * @see VerticalAlignment
-     */
-    public VerticalAlignment getVertical() {
-        STVerticalAlignment.Enum align = cellAlignement.getVertical();
-        if (align == null) align = STVerticalAlignment.BOTTOM;
-
-        return VerticalAlignment.values()[align.intValue() - 1];
-    }
-
-    /**
-     * Set the type of vertical alignment for the cell
-     *
-     * @param align - the type of alignment
-     * @see VerticalAlignment
-     */
-    public void setVertical(VerticalAlignment align) {
-        cellAlignement.setVertical(STVerticalAlignment.Enum.forInt(align.ordinal() + 1));
-    }
-
-    /**
-     * Get the type of horizontal alignment for the cell
-     *
-     * @return the type of aligment
-     * @see HorizontalAlignment
-     */
-    public HorizontalAlignment getHorizontal() {
-        STHorizontalAlignment.Enum align = cellAlignement.getHorizontal();
-        if (align == null) align = STHorizontalAlignment.GENERAL;
-
-        return HorizontalAlignment.values()[align.intValue() - 1];
-    }
-
-    /**
-     * Set the type of horizontal alignment for the cell
-     *
-     * @param align - the type of alignment
-     * @see HorizontalAlignment
-     */
-    public void setHorizontal(HorizontalAlignment align) {
-        cellAlignement.setHorizontal(STHorizontalAlignment.Enum.forInt(align.ordinal() + 1));
-    }
-
-    /**
-     * Get the number of spaces to indent the text in the cell
-     *
-     * @return indent - number of spaces
-     */
-    public long getIndent() {
-        return cellAlignement.getIndent();
-    }
-
-    /**
-     * Set the number of spaces to indent the text in the cell
-     *
-     * @param indent - number of spaces
-     */
-    public void setIndent(long indent) {
-        cellAlignement.setIndent(indent);
-    }
-
-    /**
-     * Get the degree of rotation for the text in the cell
-     * <p/>
-     * Expressed in degrees. Values range from 0 to 180. The first letter of
-     * the text is considered the center-point of the arc.
-     * <br/>
-     * For 0 - 90, the value represents degrees above horizon. For 91-180 the degrees below the
-     * horizon is calculated as:
-     * <br/>
-     * <code>[degrees below horizon] = 90 - textRotation.</code>
-     * </p>
-     *
-     * @return rotation degrees (between 0 and 180 degrees)
-     */
-    public long getTextRotation() {
-        return cellAlignement.getTextRotation();
-    }
-
-    /**
-     * Set the degree of rotation for the text in the cell
-     * <p/>
-     * Expressed in degrees. Values range from 0 to 180. The first letter of
-     * the text is considered the center-point of the arc.
-     * <br/>
-     * For 0 - 90, the value represents degrees above horizon. For 91-180 the degrees below the
-     * horizon is calculated as:
-     * <br/>
-     * <code>[degrees below horizon] = 90 - textRotation.</code>
-     * </p>
-     *
-     * Note: HSSF uses values from -90 to 90 degrees, whereas XSSF 
-     * uses values from 0 to 180 degrees. The implementations of this method will map between these two value-ranges 
-     * accordingly, however the corresponding getter is returning values in the range mandated by the current type
-     * of Excel file-format that this CellStyle is applied to.
-     *
-     * @param rotation - the rotation degrees (between 0 and 180 degrees)
-     */
-    public void setTextRotation(long rotation) {
-        if(rotation < 0 && rotation >= -90) {
-            rotation = 90 + ((-1)*rotation);
-        }
-        cellAlignement.setTextRotation(rotation);
-    }
-
-    /**
-     * Whether the text should be wrapped
-     *
-     * @return a boolean value indicating if the text in a cell should be line-wrapped within the cell.
-     */
-    public boolean getWrapText() {
-        return cellAlignement.getWrapText();
-    }
-
-    /**
-     * Set whether the text should be wrapped
-     *
-     * @param wrapped a boolean value indicating if the text in a cell should be line-wrapped within the cell.
-     */
-    public void setWrapText(boolean wrapped) {
-        cellAlignement.setWrapText(wrapped);
-    }
-
-    public boolean getShrinkToFit() {
-    	return cellAlignement.getShrinkToFit();
-    }
-    
-    public void setShrinkToFit(boolean shrink) {
-    	cellAlignement.setShrinkToFit(shrink);
-    }
-    
-    /**
-     * Access to low-level data
-     */
-    @Internal
-    public CTCellAlignment getCTCellAlignment() {
-        return cellAlignement;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
deleted file mode 100644
index b100bc2..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.extensions;
-
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.xssf.model.ThemesTable;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;
-
-/**
- * This element contains border formatting information, specifying border definition formats (left, right, top, bottom, diagonal)
- * for cells in the workbook.
- * Color is optional.
- */
-public class XSSFCellBorder {
-    private ThemesTable _theme;
-    private CTBorder border;
-
-    /**
-     * Creates a Cell Border from the supplied XML definition
-     */
-    public XSSFCellBorder(CTBorder border, ThemesTable theme) {
-        this(border);
-        this._theme = theme;
-    }
-
-    /**
-     * Creates a Cell Border from the supplied XML definition
-     */
-    public XSSFCellBorder(CTBorder border) {
-        this.border = border;
-    }
-
-    /**
-     * Creates a new, empty Cell Border.
-     * You need to attach this to the Styles Table
-     */
-    public XSSFCellBorder() {
-        border = CTBorder.Factory.newInstance();
-    }
-
-    /**
-     * Records the Themes Table that is associated with
-     *  the current font, used when looking up theme
-     *  based colours and properties.
-     */
-    public void setThemesTable(ThemesTable themes) {
-       this._theme = themes;
-    }
-    
-    /**
-     * The enumeration value indicating the side being used for a cell border.
-     */
-    public static enum BorderSide {
-        TOP, RIGHT, BOTTOM, LEFT
-    }
-
-    /**
-     * Returns the underlying XML bean.
-     *
-     * @return CTBorder
-     */
-    @Internal
-    public CTBorder getCTBorder() {
-        return border;
-    }
-
-    /**
-     * Get the type of border to use for the selected border
-     *
-     * @param side -  - where to apply the color definition
-     * @return borderstyle - the type of border to use. default value is NONE if border style is not set.
-     * @see BorderStyle
-     */
-    public BorderStyle getBorderStyle(BorderSide side) {
-        CTBorderPr ctBorder = getBorder(side);
-        STBorderStyle.Enum border = ctBorder == null ? STBorderStyle.NONE : ctBorder.getStyle();
-        return BorderStyle.values()[border.intValue() - 1];
-    }
-
-    /**
-     * Set the type of border to use for the selected border
-     *
-     * @param side  -  - where to apply the color definition
-     * @param style - border style
-     * @see BorderStyle
-     */
-    public void setBorderStyle(BorderSide side, BorderStyle style) {
-        getBorder(side, true).setStyle(STBorderStyle.Enum.forInt(style.ordinal() + 1));
-    }
-
-    /**
-     * Get the color to use for the selected border
-     *
-     * @param side - where to apply the color definition
-     * @return color - color to use as XSSFColor. null if color is not set
-     */
-    public XSSFColor getBorderColor(BorderSide side) {
-        CTBorderPr borderPr = getBorder(side);
-        
-        if(borderPr != null && borderPr.isSetColor()) { 
-            XSSFColor clr = new XSSFColor(borderPr.getColor());
-            if(_theme != null) {
-               _theme.inheritFromThemeAsRequired(clr);
-            }
-            return clr;
-        } else {
-           // No border set
-           return null;
-        }
-    }
-
-    /**
-     * Set the color to use for the selected border
-     *
-     * @param side  - where to apply the color definition
-     * @param color - the color to use
-     */
-    public void setBorderColor(BorderSide side, XSSFColor color) {
-        CTBorderPr borderPr = getBorder(side, true);
-        if (color == null) borderPr.unsetColor();
-        else
-            borderPr.setColor(color.getCTColor());
-    }
-
-    private CTBorderPr getBorder(BorderSide side) {
-        return getBorder(side, false);
-    }
-
-
-    private CTBorderPr getBorder(BorderSide side, boolean ensure) {
-        CTBorderPr borderPr;
-        switch (side) {
-            case TOP:
-                borderPr = border.getTop();
-                if (ensure && borderPr == null) borderPr = border.addNewTop();
-                break;
-            case RIGHT:
-                borderPr = border.getRight();
-                if (ensure && borderPr == null) borderPr = border.addNewRight();
-                break;
-            case BOTTOM:
-                borderPr = border.getBottom();
-                if (ensure && borderPr == null) borderPr = border.addNewBottom();
-                break;
-            case LEFT:
-                borderPr = border.getLeft();
-                if (ensure && borderPr == null) borderPr = border.addNewLeft();
-                break;
-            default:
-                throw new IllegalArgumentException("No suitable side specified for the border");
-        }
-        return borderPr;
-    }
-
-
-    public int hashCode() {
-        return border.toString().hashCode();
-    }
-
-    public boolean equals(Object o) {
-        if (!(o instanceof XSSFCellBorder)) return false;
-
-        XSSFCellBorder cf = (XSSFCellBorder) o;
-        return border.toString().equals(cf.getCTBorder().toString());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
deleted file mode 100644
index fd6a70e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.extensions;
-
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.util.Internal;
-
-/**
- * This element specifies fill formatting.
- * A cell fill consists of a background color, foreground color, and pattern to be applied across the cell.
- */
-public final class XSSFCellFill {
-
-    private CTFill _fill;
-
-    /**
-     * Creates a CellFill from the supplied parts
-     *
-     * @param fill - fill
-     */
-    public XSSFCellFill(CTFill fill) {
-        _fill = fill;
-    }
-
-    /**
-     * Creates an empty CellFill
-     */
-    public XSSFCellFill() {
-        _fill = CTFill.Factory.newInstance();
-    }
-
-    /**
-     * Get the background fill color.
-     *
-     * @return fill color, null if color is not set
-     */
-    public XSSFColor getFillBackgroundColor() {
-        CTPatternFill ptrn = _fill.getPatternFill();
-        if (ptrn == null) return null;
-
-        CTColor ctColor = ptrn.getBgColor();
-        return ctColor == null ? null : new XSSFColor(ctColor);
-    }
-
-    /**
-     * Set the background fill color represented as a indexed color value.
-     *
-     * @param index
-     */
-    public void setFillBackgroundColor(int index) {
-        CTPatternFill ptrn = ensureCTPatternFill();
-        CTColor ctColor = ptrn.isSetBgColor() ? ptrn.getBgColor() : ptrn.addNewBgColor();
-        ctColor.setIndexed(index);
-    }
-
-    /**
-     * Set the background fill color represented as a {@link XSSFColor} value.
-     *
-     * @param color
-     */
-    public void setFillBackgroundColor(XSSFColor color) {
-        CTPatternFill ptrn = ensureCTPatternFill();
-        ptrn.setBgColor(color.getCTColor());
-    }
-
-    /**
-     * Get the foreground fill color.
-     *
-     * @return XSSFColor - foreground color. null if color is not set
-     */
-    public XSSFColor getFillForegroundColor() {
-        CTPatternFill ptrn = _fill.getPatternFill();
-        if (ptrn == null) return null;
-
-        CTColor ctColor = ptrn.getFgColor();
-        return ctColor == null ? null : new XSSFColor(ctColor);
-    }
-
-    /**
-     * Set the foreground fill color as a indexed color value
-     *
-     * @param index - the color to use
-     */
-    public void setFillForegroundColor(int index) {
-        CTPatternFill ptrn = ensureCTPatternFill();
-        CTColor ctColor = ptrn.isSetFgColor() ? ptrn.getFgColor() : ptrn.addNewFgColor();
-        ctColor.setIndexed(index);
-    }
-
-    /**
-     * Set the foreground fill color represented as a {@link XSSFColor} value.
-     *
-     * @param color - the color to use
-     */
-    public void setFillForegroundColor(XSSFColor color) {
-        CTPatternFill ptrn = ensureCTPatternFill();
-        ptrn.setFgColor(color.getCTColor());
-    }
-
-    /**
-     * get the fill pattern
-     *
-     * @return fill pattern type. null if fill pattern is not set
-     */
-    public STPatternType.Enum getPatternType() {
-        CTPatternFill ptrn = _fill.getPatternFill();
-        return ptrn == null ? null : ptrn.getPatternType();
-    }
-
-    /**
-     * set the fill pattern
-     *
-     * @param patternType fill pattern to use
-     */
-    public void setPatternType(STPatternType.Enum patternType) {
-        CTPatternFill ptrn = ensureCTPatternFill();
-        ptrn.setPatternType(patternType);
-    }
-
-    private CTPatternFill ensureCTPatternFill() {
-        CTPatternFill patternFill = _fill.getPatternFill();
-        if (patternFill == null) {
-            patternFill = _fill.addNewPatternFill();
-        }
-        return patternFill;
-    }
-
-    /**
-     * Returns the underlying XML bean.
-     *
-     * @return CTFill
-     */
-    @Internal
-    public CTFill getCTFill() {
-        return _fill;
-    }
-
-
-    public int hashCode() {
-        return _fill.toString().hashCode();
-    }
-
-    public boolean equals(Object o) {
-        if (!(o instanceof XSSFCellFill)) return false;
-
-        XSSFCellFill cf = (XSSFCellFill) o;
-        return _fill.toString().equals(cf.getCTFill().toString());
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
deleted file mode 100644
index 62267f2..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.extensions;
-
-import org.apache.poi.ss.usermodel.HeaderFooter;
-import org.apache.poi.xssf.usermodel.helpers.HeaderFooterHelper;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-/**
- * Parent class of all XSSF headers and footers.
- *
- * For a list of all the different fields that can be placed into a header or
- * footer, such as page number, bold, underline etc, see the follow formatting
- * syntax
- *
- *<b> Header/Footer Formatting Syntax</b>
- *<p>
- * There are a number of formatting codes that can be written inline with the
- * actual header / footer text, which affect the formatting in the header or
- * footer.
- *</p>
- *
- * This example shows the text "Center Bold Header" on the first line (center
- * section), and the date on the second line (center section). &CCenter
- * &"-,Bold"Bold &"-,Regular"Header_x000A_&D
- *
- * <b>General Rules:</b> There is no required order in which these codes must
- * appear. The first occurrence of the following codes turns the formatting ON,
- * the second occurrence turns it OFF again:
- *
- * <dl>
- * <dt>&L</dt>
- * <dd>code for "left section" (there are three header / footer locations,
- * "left", "center", and "right"). When two or more occurrences of this section
- * marker exist, the contents from all markers are concatenated, in the order of
- * appearance, and placed into the left section.</dd>
- * <dt>&P</dt>
- * <dd>code for "current page #"</dd>
- * <dt>&N</dt>
- * <dd>code for "total pages"</dd>
- * <dt>&font size</dt>
- * <dd>code for "text font size", where font size is a font size in points.</dd>
- * <dt>&K</dt>
- * <dd>code for "text font color" RGB Color is specified as RRGGBB Theme Color
- * is specifed as TTSNN where TT is the theme color Id, S is either "+" or "-"
- * of the tint/shade value, NN is the tint/shade value.</dd>
- * <dt>&S</dt>
- * <dd>code for "text strikethrough" on / off</dd>
- * <dt>&X</dt>
- * <dd>code for "text super script" on / off</dd>
- * <dt>&Y</dt>
- * <dd>code for "text subscript" on / off</dd>
- * <dt>&C</dt>
- * <dd>code for "center section". When two or more occurrences of this section
- * marker exist, the contents from all markers are concatenated, in the order of
- * appearance, and placed into the center section. SpreadsheetML Reference
- * Material - Worksheets 1966</dd>
- * <dt>&D</dt>
- * <dd>code for "date"</dd>
- * <dt>&T</dt>
- * <dd>code for "time"</dd>
- * <dt>&G</dt>
- * <dd>code for "picture as background"</dd>
- * <dt>&U</dt>
- * <dd>code for "text single underline"</dd>
- * <dt>&E</dt>
- * <dd>code for "double underline"</dd>
- * <dt>&R</dt>
- * <dd>code for "right section". When two or more occurrences of this section
- * marker exist, the contents from all markers are concatenated, in the order of
- * appearance, and placed into the right section.</dd>
- * <dt>&Z</dt>
- * <dd>code for "this workbook's file path"</dd>
- * <dt>&F</dt>
- * <dd>code for "this workbook's file name"</dd>
- * <dt>&A</dt>
- * <dd>code for "sheet tab name"</dd>
- * <dt>&+</dt>
- * <dd>code for add to page #.</dd>
- * <dt>&-</dt>
- * <dd>code for subtract from page #.</dd>
- * <dt>&"font name,font type" - code for "text font name" and "text font type",
- * where font name and font type are strings specifying the name and type of the
- * font, separated by a comma. When a hyphen appears in font name, it means
- * "none specified". Both of font name and font type can be localized
- * values.</dd>
- * <dt>&"-,Bold"</dt>
- * <dd>code for "bold font style"</dd>
- * <dt>&B</dt>
- * <dd>also means "bold font style"</dd>
- * <dt>&"-,Regular"</dt>
- * <dd>code for "regular font style"</dd>
- * <dt>&"-,Italic"</dt>
- * <dd>code for "italic font style"</dd>
- * <dt>&I</dt>
- * <dd>also means "italic font style"</dd>
- * <dt>&"-,Bold Italic"</dt>
- * <dd>code for "bold italic font style"</dd>
- * <dt>&O</dt>
- * <dd>code for "outline style"</dd>
- * <dt>&H</dt>
- * <dd>code for "shadow style"</dd>
- * </dl>
- *
- *
- */
-public abstract class XSSFHeaderFooter implements HeaderFooter {
-	private HeaderFooterHelper helper;
-	private CTHeaderFooter headerFooter;
-
-	private boolean stripFields = false;
-
-	/**
-	 * Create an instance of XSSFHeaderFooter from the supplied XML bean
-	 *
-	 * @param headerFooter
-	 */
-	public XSSFHeaderFooter(CTHeaderFooter headerFooter) {
-		this.headerFooter = headerFooter;
-		this.helper = new HeaderFooterHelper();
-	}
-
-	/**
-	 * Returns the underlying CTHeaderFooter xml bean
-	 *
-	 * @return the underlying CTHeaderFooter xml bean
-	 */
-    @Internal
-	public CTHeaderFooter getHeaderFooter() {
-		return this.headerFooter;
-	}
-
-	public String getValue() {
-		String value = getText();
-		if (value == null)
-			return "";
-		return value;
-	}
-
-	/**
-	 * Are fields currently being stripped from the text that this
-	 * {@link XSSFHeaderFooter} returns? Default is false, but can be changed
-	 */
-	public boolean areFieldsStripped() {
-		return stripFields;
-	}
-
-	/**
-	 * Should fields (eg macros) be stripped from the text that this class
-	 * returns? Default is not to strip.
-	 *
-	 * @param stripFields
-	 */
-	public void setAreFieldsStripped(boolean stripFields) {
-		this.stripFields = stripFields;
-	}
-
-	/**
-	 * Removes any fields (eg macros, page markers etc) from the string.
-	 * Normally used to make some text suitable for showing to humans, and the
-	 * resultant text should not normally be saved back into the document!
-	 */
-	public static String stripFields(String text) {
-		return org.apache.poi.hssf.usermodel.HeaderFooter.stripFields(text);
-	}
-
-	public abstract String getText();
-
-	protected abstract void setText(String text);
-
-	/**
-	 * get the text representing the center part of this element
-	 */
-	public String getCenter() {
-		String text = helper.getCenterSection(getText());
-		if (stripFields)
-			return stripFields(text);
-		return text;
-	}
-
-	/**
-	 * get the text representing the left part of this element
-	 */
-	public String getLeft() {
-		String text = helper.getLeftSection(getText());
-		if (stripFields)
-			return stripFields(text);
-		return text;
-	}
-
-	/**
-	 * get the text representing the right part of this element
-	 */
-	public String getRight() {
-		String text = helper.getRightSection(getText());
-		if (stripFields)
-			return stripFields(text);
-		return text;
-	}
-
-	/**
-	 * set a centered string value for this element
-	 */
-	public void setCenter(String newCenter) {
-		setText(helper.setCenterSection(getText(), newCenter));
-	}
-
-	/**
-	 * set a left string value for this element
-	 */
-	public void setLeft(String newLeft) {
-		setText(helper.setLeftSection(getText(), newLeft));
-	}
-
-	/**
-	 * set a right string value for this element
-	 */
-	public void setRight(String newRight) {
-		setText(helper.setRightSection(getText(), newRight));
-	}
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
deleted file mode 100644
index b271006..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.NavigableSet;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.xssf.util.CTColComparator;
-import org.apache.poi.xssf.util.NumericRanges;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-
-/**
- * Helper class for dealing with the Column settings on
- *  a CTWorksheet (the data part of a sheet).
- * Note - within POI, we use 0 based column indexes, but
- *  the column definitions in the XML are 1 based!
- */
-public class ColumnHelper {
-
-    private CTWorksheet worksheet;
-
-    public ColumnHelper(CTWorksheet worksheet) {
-        super();
-        this.worksheet = worksheet;
-        cleanColumns();
-    }
-    
-    public void cleanColumns() {
-        TreeSet<CTCol> trackedCols = new TreeSet<CTCol>(CTColComparator.BY_MIN_MAX);
-        CTCols newCols = CTCols.Factory.newInstance();
-        CTCols[] colsArray = worksheet.getColsArray();
-        int i = 0;
-        for (i = 0; i < colsArray.length; i++) {
-            CTCols cols = colsArray[i];
-            CTCol[] colArray = cols.getColArray();
-            for (CTCol col : colArray) {
-                addCleanColIntoCols(newCols, col, trackedCols);
-            }
-        }
-        for (int y = i - 1; y >= 0; y--) {
-            worksheet.removeCols(y);
-        }
-        
-        newCols.setColArray(trackedCols.toArray(new CTCol[trackedCols.size()]));
-        worksheet.addNewCols();
-        worksheet.setColsArray(0, newCols);
-    }
-
-    public CTCols addCleanColIntoCols(CTCols cols, CTCol newCol) {
-        // Performance issue. If we encapsulated management of min/max in this
-        // class then we could keep trackedCols as state,
-        // making this log(N) rather than Nlog(N). We do this for the initial
-        // read above.
-        TreeSet<CTCol> trackedCols = new TreeSet<CTCol>(
-                CTColComparator.BY_MIN_MAX);
-        trackedCols.addAll(cols.getColList());
-        addCleanColIntoCols(cols, newCol, trackedCols);
-        cols.setColArray(trackedCols.toArray(new CTCol[0]));
-        return cols;
-    }
-
-    private void addCleanColIntoCols(final CTCols cols, final CTCol newCol, final TreeSet<CTCol> trackedCols) {
-        List<CTCol> overlapping = getOverlappingCols(newCol, trackedCols);
-        if (overlapping.isEmpty()) {
-            trackedCols.add(cloneCol(cols, newCol));
-            return;
-        }
-
-        trackedCols.removeAll(overlapping);
-        for (CTCol existing : overlapping) {
-            // We add up to three columns for each existing one: non-overlap
-            // before, overlap, non-overlap after.
-            long[] overlap = getOverlap(newCol, existing);
-
-            CTCol overlapCol = cloneCol(cols, existing, overlap);
-            setColumnAttributes(newCol, overlapCol);
-            trackedCols.add(overlapCol);
-
-            CTCol beforeCol = existing.getMin() < newCol.getMin() ? existing
-                    : newCol;
-            long[] before = new long[] {
-                    Math.min(existing.getMin(), newCol.getMin()),
-                    overlap[0] - 1 };
-            if (before[0] <= before[1]) {
-                trackedCols.add(cloneCol(cols, beforeCol, before));
-            }
-
-            CTCol afterCol = existing.getMax() > newCol.getMax() ? existing
-                    : newCol;
-            long[] after = new long[] { overlap[1] + 1,
-                    Math.max(existing.getMax(), newCol.getMax()) };
-            if (after[0] <= after[1]) {
-                trackedCols.add(cloneCol(cols, afterCol, after));
-            }
-        }
-    }
-
-    private CTCol cloneCol(final CTCols cols, final CTCol col, final long[] newRange) {
-        CTCol cloneCol = cloneCol(cols, col);
-        cloneCol.setMin(newRange[0]);
-        cloneCol.setMax(newRange[1]);
-        return cloneCol;
-    }
-
-    private long[] getOverlap(final CTCol col1, final CTCol col2) {
-        return getOverlappingRange(col1, col2);
-    }
-
-    private List<CTCol> getOverlappingCols(final CTCol newCol, final TreeSet<CTCol> trackedCols) {
-        CTCol lower = trackedCols.lower(newCol);
-        NavigableSet<CTCol> potentiallyOverlapping = lower == null ? trackedCols : trackedCols.tailSet(lower, overlaps(lower, newCol));
-        List<CTCol> overlapping = new ArrayList<CTCol>();
-        for (CTCol existing : potentiallyOverlapping) {
-            if (overlaps(newCol, existing)) {
-                overlapping.add(existing);
-            } else {
-                break;
-            }
-        }
-        return overlapping;
-    }
-
-    private boolean overlaps(final CTCol col1, final CTCol col2) {
-        return NumericRanges.getOverlappingType(toRange(col1), toRange(col2)) != NumericRanges.NO_OVERLAPS;
-    }
-
-    private long[] getOverlappingRange(final CTCol col1, final CTCol col2) {
-        return NumericRanges.getOverlappingRange(toRange(col1), toRange(col2));
-    }
-
-    private long[] toRange(final CTCol col) {
-        return new long[] { col.getMin(), col.getMax() };
-    }
-    
-    public static void sortColumns(CTCols newCols) {
-        CTCol[] colArray = newCols.getColArray();
-        Arrays.sort(colArray, CTColComparator.BY_MIN_MAX);
-        newCols.setColArray(colArray);
-    }
-
-    public CTCol cloneCol(CTCols cols, CTCol col) {
-        CTCol newCol = cols.addNewCol();
-        newCol.setMin(col.getMin());
-        newCol.setMax(col.getMax());
-        setColumnAttributes(col, newCol);
-        return newCol;
-    }
-
-    /**
-     * Returns the Column at the given 0 based index
-     */
-    public CTCol getColumn(long index, boolean splitColumns) {
-        return getColumn1Based(index+1, splitColumns);
-    }
-
-    /**
-     * Returns the Column at the given 1 based index.
-     * POI default is 0 based, but the file stores
-     *  as 1 based.
-     */
-    public CTCol getColumn1Based(long index1, boolean splitColumns) {
-        CTCols cols = worksheet.getColsArray(0);
-        
-        // Fetching the array is quicker than working on the new style
-        //  list, assuming we need to read many of them (which we often do),
-        //  and assuming we're not making many changes (which we're not)
-        CTCol[] colArray = cols.getColArray();
-
-        for (CTCol col : colArray) {
-            long colMin = col.getMin();
-            long colMax = col.getMax();
-            if (colMin <= index1 && colMax >= index1) {
-                if (splitColumns) {
-                    if (colMin < index1) {
-                        insertCol(cols, colMin, (index1 - 1), new CTCol[]{col});
-                    }
-                    if (colMax > index1) {
-                        insertCol(cols, (index1 + 1), colMax, new CTCol[]{col});
-                    }
-                    col.setMin(index1);
-                    col.setMax(index1);
-                }
-                return col;
-            }
-        }
-        return null;
-    }
-
-    /*
-     * Insert a new CTCol at position 0 into cols, setting min=min, max=max and
-     * copying all the colsWithAttributes array cols attributes into newCol
-     */
-    private CTCol insertCol(CTCols cols, long min, long max, CTCol[] colsWithAttributes) {
-        return insertCol(cols, min, max, colsWithAttributes, false, null);
-    }
-    
-    private CTCol insertCol(CTCols cols, long min, long max,            
-        CTCol[] colsWithAttributes, boolean ignoreExistsCheck, CTCol overrideColumn) {
-        if(ignoreExistsCheck || !columnExists(cols,min,max)){
-            CTCol newCol = cols.insertNewCol(0);
-            newCol.setMin(min);
-            newCol.setMax(max);
-            for (CTCol col : colsWithAttributes) {
-                setColumnAttributes(col, newCol);
-            }
-            if (overrideColumn != null) setColumnAttributes(overrideColumn, newCol); 
-            return newCol;
-        }
-        return null;
-    }
-
-    /**
-     * Does the column at the given 0 based index exist
-     *  in the supplied list of column definitions?
-     */
-    public boolean columnExists(CTCols cols, long index) {
-        return columnExists1Based(cols, index+1);
-    }
-
-    private boolean columnExists1Based(CTCols cols, long index1) {
-        for (CTCol col : cols.getColArray()) {
-            if (col.getMin() == index1) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void setColumnAttributes(CTCol fromCol, CTCol toCol) {
-        if(fromCol.isSetBestFit()) toCol.setBestFit(fromCol.getBestFit());
-        if(fromCol.isSetCustomWidth()) toCol.setCustomWidth(fromCol.getCustomWidth());
-        if(fromCol.isSetHidden()) toCol.setHidden(fromCol.getHidden());
-        if(fromCol.isSetStyle()) toCol.setStyle(fromCol.getStyle());
-        if(fromCol.isSetWidth()) toCol.setWidth(fromCol.getWidth());
-        if(fromCol.isSetCollapsed()) toCol.setCollapsed(fromCol.getCollapsed());
-        if(fromCol.isSetPhonetic()) toCol.setPhonetic(fromCol.getPhonetic());
-        if(fromCol.isSetOutlineLevel()) toCol.setOutlineLevel(fromCol.getOutlineLevel());
-        toCol.setCollapsed(fromCol.isSetCollapsed());
-    }
-
-    public void setColBestFit(long index, boolean bestFit) {
-        CTCol col = getOrCreateColumn1Based(index+1, false);
-        col.setBestFit(bestFit);
-    }
-    public void setCustomWidth(long index, boolean bestFit) {
-        CTCol col = getOrCreateColumn1Based(index+1, true);
-        col.setCustomWidth(bestFit);
-    }
-
-    public void setColWidth(long index, double width) {
-        CTCol col = getOrCreateColumn1Based(index+1, true);
-        col.setWidth(width);
-    }
-
-    public void setColHidden(long index, boolean hidden) {
-        CTCol col = getOrCreateColumn1Based(index+1, true);
-        col.setHidden(hidden);
-    }
-
-    /**
-     * Return the CTCol at the given (0 based) column index,
-     *  creating it if required.
-     */
-    protected CTCol getOrCreateColumn1Based(long index1, boolean splitColumns) {
-        CTCol col = getColumn1Based(index1, splitColumns);
-        if (col == null) {
-            col = worksheet.getColsArray(0).addNewCol();
-            col.setMin(index1);
-            col.setMax(index1);
-        }
-        return col;
-    }
-
-    public void setColDefaultStyle(long index, CellStyle style) {
-        setColDefaultStyle(index, style.getIndex());
-    }
-    
-    public void setColDefaultStyle(long index, int styleId) {
-        CTCol col = getOrCreateColumn1Based(index+1, true);
-        col.setStyle(styleId);
-    }
-    
-    // Returns -1 if no column is found for the given index
-    public int getColDefaultStyle(long index) {
-        if (getColumn(index, false) != null) {
-            return (int) getColumn(index, false).getStyle();
-        }
-        return -1;
-    }
-
-    private boolean columnExists(CTCols cols, long min, long max) {
-        for (CTCol col : cols.getColArray()) {
-            if (col.getMin() == min && col.getMax() == max) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public int getIndexOfColumn(CTCols cols, CTCol searchCol) {
-        if (cols == null || searchCol == null) return -1;
-        int i = 0;
-        for (CTCol col : cols.getColArray()) {
-            if (col.getMin() == searchCol.getMin() && col.getMax() == searchCol.getMax()) {
-                return i;
-            }
-            i++;
-        }
-        return -1;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
deleted file mode 100644
index 41e3ea4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-
-public class HeaderFooterHelper {
-    // Note - XmlBeans handles entity encoding for us,
-	//  so these should be & forms, not the &amp; ones!
-    private static final String HeaderFooterEntity_L = "&L";
-    private static final String HeaderFooterEntity_C = "&C";
-    private static final String HeaderFooterEntity_R = "&R";
-    
-    // These are other entities that may be used in the
-    //  left, center or right. Not exhaustive
-    public static final String HeaderFooterEntity_File = "&F";
-    public static final String HeaderFooterEntity_Date = "&D";
-    public static final String HeaderFooterEntity_Time = "&T";
-
-    public String getLeftSection(String string) {
-    	return getParts(string)[0];
-    }
-    public String getCenterSection(String string) {
-    	return getParts(string)[1];
-    }
-    public String getRightSection(String string) {
-    	return getParts(string)[2];
-    }
-    
-    public String setLeftSection(String string, String newLeft) {
-    	String[] parts = getParts(string);
-    	parts[0] = newLeft;
-        return joinParts(parts);
-    }
-    public String setCenterSection(String string, String newCenter) {
-    	String[] parts = getParts(string);
-    	parts[1] = newCenter;
-        return joinParts(parts);
-    }
-    public String setRightSection(String string, String newRight) {
-    	String[] parts = getParts(string);
-    	parts[2] = newRight;
-        return joinParts(parts);
-    }
-    
-    /**
-     * Split into left, center, right
-     */
-    private String[] getParts(String string) {
-    	String[] parts = new String[] { "", "", "" };
-    	if(string == null)
-    		return parts;
-    	
-    	// They can come in any order, which is just nasty
-    	// Work backwards from the end, picking the last
-    	//  on off each time as we go
-    	int lAt = 0;
-    	int cAt = 0;
-    	int rAt = 0;
-    	
-    	while(
-    		// Ensure all indicies get updated, then -1 tested
-    		(lAt = string.indexOf(HeaderFooterEntity_L)) > -2 &&
-    		(cAt = string.indexOf(HeaderFooterEntity_C)) > -2 &&  
-    		(rAt = string.indexOf(HeaderFooterEntity_R)) > -2 &&
-    		(lAt > -1 || cAt > -1 || rAt > -1)
-    	) {
-    		// Pick off the last one
-    		if(rAt > cAt && rAt > lAt) {
-        		parts[2] = string.substring(rAt + HeaderFooterEntity_R.length());
-        		string = string.substring(0, rAt);
-    		} else if(cAt > rAt && cAt > lAt) {
-        		parts[1] = string.substring(cAt + HeaderFooterEntity_C.length());
-        		string = string.substring(0, cAt);
-    		} else {
-        		parts[0] = string.substring(lAt + HeaderFooterEntity_L.length());
-        		string = string.substring(0, lAt);
-    		}
-    	}
-    	
-    	return parts;
-    }
-    private String joinParts(String[] parts) {
-    	return joinParts(parts[0], parts[1], parts[2]);
-    }
-    private String joinParts(String l, String c, String r) {
-    	StringBuffer ret = new StringBuffer();
-
-    	// Join as c, l, r
-    	if(c.length() > 0) {
-    		ret.append(HeaderFooterEntity_C);
-    		ret.append(c);
-    	}
-    	if(l.length() > 0) {
-    		ret.append(HeaderFooterEntity_L);
-    		ret.append(l);
-    	}
-    	if(r.length() > 0) {
-    		ret.append(HeaderFooterEntity_R);
-    		ret.append(r);
-    	}
-    	
-    	return ret.toString();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
deleted file mode 100644
index ef0c5ea..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Pxg;
-import org.apache.poi.ss.formula.ptg.Pxg3D;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFEvaluationWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFName;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellFormula;
-
-/**
- * Utility to update formulas and named ranges when a sheet name was changed
- *
- * @author Yegor Kozlov
- */
-public final class XSSFFormulaUtils {
-    private final XSSFWorkbook _wb;
-    private final XSSFEvaluationWorkbook _fpwb;
-
-    public XSSFFormulaUtils(XSSFWorkbook wb) {
-        _wb = wb;
-        _fpwb = XSSFEvaluationWorkbook.create(_wb);
-    }
-
-    /**
-     * Update sheet name in all formulas and named ranges.
-     * Called from {@link XSSFWorkbook#setSheetName(int, String)}
-     * <p/>
-     * <p>
-     * The idea is to parse every formula and render it back to string
-     * with the updated sheet name. This is done by parsing into Ptgs,
-     * looking for ones with sheet references in them, and changing those
-     * </p>
-     *
-     * @param sheetIndex the 0-based index of the sheet being changed
-     * @param oldName    the old sheet name
-     * @param newName    the new sheet name
-     */
-    public void updateSheetName(final int sheetIndex, final String oldName, final String newName) {
-        // update named ranges
-        for (XSSFName nm : _wb.getAllNames()) {
-            if (nm.getSheetIndex() == -1 || nm.getSheetIndex() == sheetIndex) {
-                updateName(nm, oldName, newName);
-            }
-        }
-
-        // update formulas
-        for (Sheet sh : _wb) {
-            for (Row row : sh) {
-                for (Cell cell : row) {
-                    if (cell.getCellTypeEnum() == CellType.FORMULA) {
-                        updateFormula((XSSFCell) cell, oldName, newName);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Parse cell formula and re-assemble it back using the new sheet name
-     *
-     * @param cell the cell to update
-     */
-    private void updateFormula(XSSFCell cell, String oldName, String newName) {
-        CTCellFormula f = cell.getCTCell().getF();
-        if (f != null) {
-            String formula = f.getStringValue();
-            if (formula != null && formula.length() > 0) {
-                int sheetIndex = _wb.getSheetIndex(cell.getSheet());
-                Ptg[] ptgs = FormulaParser.parse(formula, _fpwb, FormulaType.CELL, sheetIndex, cell.getRowIndex());
-                for (Ptg ptg : ptgs) {
-                    updatePtg(ptg, oldName, newName);
-                }
-                String updatedFormula = FormulaRenderer.toFormulaString(_fpwb, ptgs);
-                if (!formula.equals(updatedFormula)) f.setStringValue(updatedFormula);
-            }
-        }
-    }
-
-    /**
-     * Parse formula in the named range and re-assemble it back using the new sheet name.
-     *
-     * @param name the name to update
-     */
-    private void updateName(XSSFName name, String oldName, String newName) {
-        String formula = name.getRefersToFormula();
-        if (formula != null) {
-            int sheetIndex = name.getSheetIndex();
-            int rowIndex = -1; //don't care
-            Ptg[] ptgs = FormulaParser.parse(formula, _fpwb, FormulaType.NAMEDRANGE, sheetIndex, rowIndex);
-            for (Ptg ptg : ptgs) {
-                updatePtg(ptg, oldName, newName);
-            }
-            String updatedFormula = FormulaRenderer.toFormulaString(_fpwb, ptgs);
-            if (!formula.equals(updatedFormula)) name.setRefersToFormula(updatedFormula);
-        }
-    }
-    
-    private void updatePtg(Ptg ptg, String oldName, String newName) {
-        if (ptg instanceof Pxg) {
-            Pxg pxg = (Pxg)ptg;
-            if (pxg.getExternalWorkbookNumber() < 1) {
-                if (pxg.getSheetName() != null &&
-                        pxg.getSheetName().equals(oldName)) {
-                    pxg.setSheetName(newName);
-                }
-                if (pxg instanceof Pxg3D) {
-                    Pxg3D pxg3D = (Pxg3D)pxg;
-                    if (pxg3D.getLastSheetName() != null &&
-                            pxg3D.getLastSheetName().equals(oldName)) {
-                        pxg3D.setLastSheetName(newName);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
deleted file mode 100644
index d0dc0b7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.apache.poi.ss.usermodel.IgnoredErrorType;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIgnoredError;
-
-/**
- * XSSF-specific code for working with ignored errors
- */
-public class XSSFIgnoredErrorHelper {
-    public static boolean isSet(IgnoredErrorType errorType, CTIgnoredError error) {
-        switch(errorType) {
-            case CALCULATED_COLUMN:
-                return error.isSetCalculatedColumn();
-            case EMPTY_CELL_REFERENCE:
-                return error.isSetEmptyCellReference();
-            case EVALUATION_ERROR:
-                return error.isSetEvalError();
-            case FORMULA:
-                return error.isSetFormula();
-            case FORMULA_RANGE:
-                return error.isSetFormulaRange();
-            case LIST_DATA_VALIDATION:
-                return error.isSetListDataValidation();
-            case NUMBER_STORED_AS_TEXT:
-                return error.isSetNumberStoredAsText();
-            case TWO_DIGIT_TEXT_YEAR:
-                return error.isSetTwoDigitTextYear();
-            case UNLOCKED_FORMULA:
-                return error.isSetUnlockedFormula();
-            default:
-                throw new IllegalStateException();
-            }
-    }
-    
-    public static void set(IgnoredErrorType errorType, CTIgnoredError error) {
-        switch(errorType) {
-        case CALCULATED_COLUMN:
-            error.setCalculatedColumn(true);
-            break;
-        case EMPTY_CELL_REFERENCE:
-            error.setEmptyCellReference(true);
-            break;
-        case EVALUATION_ERROR:
-            error.setEvalError(true);
-            break;
-        case FORMULA:
-            error.setFormula(true);
-            break;
-        case FORMULA_RANGE:
-            error.setFormulaRange(true);
-            break;
-        case LIST_DATA_VALIDATION:
-            error.setListDataValidation(true);
-            break;
-        case NUMBER_STORED_AS_TEXT:
-            error.setNumberStoredAsText(true);
-            break;
-        case TWO_DIGIT_TEXT_YEAR:
-            error.setTwoDigitTextYear(true);
-            break;
-        case UNLOCKED_FORMULA:
-            error.setUnlockedFormula(true);
-            break;
-        default:
-            throw new IllegalStateException();
-        }
-    }
-    
-    public static void addIgnoredErrors(CTIgnoredError err, String ref, IgnoredErrorType... ignoredErrorTypes) {
-        err.setSqref(Arrays.asList(ref));
-        for (IgnoredErrorType errType : ignoredErrorTypes) {
-            XSSFIgnoredErrorHelper.set(errType, err);
-        }
-    }
-
-    public static  Set<IgnoredErrorType> getErrorTypes(CTIgnoredError err) {
-        Set<IgnoredErrorType> result = new LinkedHashSet<IgnoredErrorType>();
-        for (IgnoredErrorType errType : IgnoredErrorType.values()) {
-            if (XSSFIgnoredErrorHelper.isSet(errType, err)) {
-                result.add(errType);
-            }
-        }
-        return result;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
deleted file mode 100644
index 46e47f6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.Locale;
-
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.namespace.QName;
-
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-
-@Internal(since="3.15 beta 3")
-public final class XSSFPasswordHelper {
-    private XSSFPasswordHelper() {
-        // no instances of this static class
-    }
-
-    /**
-     * Sets the XORed or hashed password 
-     *
-     * @param xobj the xmlbeans object which contains the password attributes
-     * @param password the password, if null, the password attributes will be removed
-     * @param hashAlgo the hash algorithm, if null the password will be XORed
-     * @param prefix the prefix of the password attributes, may be null
-     */
-    public static void setPassword(XmlObject xobj, String password, HashAlgorithm hashAlgo, String prefix) {
-        XmlCursor cur = xobj.newCursor();
-
-        if (password == null) {
-            cur.removeAttribute(getAttrName(prefix, "password"));
-            cur.removeAttribute(getAttrName(prefix, "algorithmName"));
-            cur.removeAttribute(getAttrName(prefix, "hashValue"));
-            cur.removeAttribute(getAttrName(prefix, "saltValue"));
-            cur.removeAttribute(getAttrName(prefix, "spinCount"));
-            return;
-        } 
-        
-        cur.toFirstContentToken();
-        if (hashAlgo == null) {
-            int hash = CryptoFunctions.createXorVerifier1(password);
-            cur.insertAttributeWithValue(getAttrName(prefix, "password"),
-                                         String.format(Locale.ROOT, "%04X", hash).toUpperCase(Locale.ROOT));
-        } else {
-            SecureRandom random = new SecureRandom(); 
-            byte salt[] = random.generateSeed(16);
-    
-            // Iterations specifies the number of times the hashing function shall be iteratively run (using each
-            // iteration's result as the input for the next iteration).
-            int spinCount = 100000;
-
-            // Implementation Notes List:
-            // --> In this third stage, the reversed byte order legacy hash from the second stage shall
-            //     be converted to Unicode hex string representation
-            byte hash[] = CryptoFunctions.hashPassword(password, hashAlgo, salt, spinCount, false);
-            
-            cur.insertAttributeWithValue(getAttrName(prefix, "algorithmName"), hashAlgo.jceId); 
-            cur.insertAttributeWithValue(getAttrName(prefix, "hashValue"), DatatypeConverter.printBase64Binary(hash));
-            cur.insertAttributeWithValue(getAttrName(prefix, "saltValue"), DatatypeConverter.printBase64Binary(salt));
-            cur.insertAttributeWithValue(getAttrName(prefix, "spinCount"), ""+spinCount);
-        }
-        cur.dispose();
-    }
-
-    /**
-     * Validates the password, i.e.
-     * calculates the hash of the given password and compares it against the stored hash
-     *
-     * @param xobj the xmlbeans object which contains the password attributes
-     * @param password the password, if null the method will always return false,
-     *  even if there's no password set
-     * @param prefix the prefix of the password attributes, may be null
-     * 
-     * @return true, if the hashes match
-     */
-    public static boolean validatePassword(XmlObject xobj, String password, String prefix) {
-        // TODO: is "velvetSweatshop" the default password?
-        if (password == null) return false;
-        
-        XmlCursor cur = xobj.newCursor();
-        String xorHashVal = cur.getAttributeText(getAttrName(prefix, "password"));
-        String algoName = cur.getAttributeText(getAttrName(prefix, "algorithmName"));
-        String hashVal = cur.getAttributeText(getAttrName(prefix, "hashValue"));
-        String saltVal = cur.getAttributeText(getAttrName(prefix, "saltValue"));
-        String spinCount = cur.getAttributeText(getAttrName(prefix, "spinCount"));
-        cur.dispose();
-
-        if (xorHashVal != null) {
-            int hash1 = Integer.parseInt(xorHashVal, 16);
-            int hash2 = CryptoFunctions.createXorVerifier1(password);
-            return hash1 == hash2;
-        } else {
-            if (hashVal == null || algoName == null || saltVal == null || spinCount == null) {
-                return false;
-            }
-            
-            byte hash1[] = DatatypeConverter.parseBase64Binary(hashVal);
-            HashAlgorithm hashAlgo = HashAlgorithm.fromString(algoName);
-            byte salt[] = DatatypeConverter.parseBase64Binary(saltVal);
-            int spinCnt = Integer.parseInt(spinCount);
-            byte hash2[] = CryptoFunctions.hashPassword(password, hashAlgo, salt, spinCnt, false);
-            return Arrays.equals(hash1, hash2);
-        }
-    }
-    
-    
-    private static QName getAttrName(String prefix, String name) {
-        if (prefix == null || "".equals(prefix)) {
-            return new QName(name);
-        } else {
-            return new QName(prefix+Character.toUpperCase(name.charAt(0))+name.substring(1));
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPaswordHelper.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPaswordHelper.java
deleted file mode 100644
index 4e3c908..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPaswordHelper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-import org.apache.xmlbeans.XmlObject;
-
-/**
- * @deprecated POI 3.15 beta 3. Use {@link XSSFPasswordHelper} instead.
- */
-@Internal(since="3.15 beta 3")
-@Deprecated
-@Removal(version="3.17")
-public class XSSFPaswordHelper {
-    /**
-     * Sets the XORed or hashed password 
-     *
-     * @param xobj the xmlbeans object which contains the password attributes
-     * @param password the password, if null, the password attributes will be removed
-     * @param hashAlgo the hash algorithm, if null the password will be XORed
-     * @param prefix the prefix of the password attributes, may be null
-     */
-    public static void setPassword(XmlObject xobj, String password, HashAlgorithm hashAlgo, String prefix) {
-        XSSFPasswordHelper.setPassword(xobj, password, hashAlgo, prefix);
-    }
-
-    /**
-     * Validates the password, i.e.
-     * calculates the hash of the given password and compares it against the stored hash
-     *
-     * @param xobj the xmlbeans object which contains the password attributes
-     * @param password the password, if null the method will always return false,
-     *  even if there's no password set
-     * @param prefix the prefix of the password attributes, may be null
-     * 
-     * @return true, if the hashes match
-     */
-    public static boolean validatePassword(XmlObject xobj, String password, String prefix) {
-        return XSSFPasswordHelper.validatePassword(xobj, password, prefix);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
deleted file mode 100644
index e55b014..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.AreaErrPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.helpers.RowShifter;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFEvaluationWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFHyperlink;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellFormula;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCfRule;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTConditionalFormatting;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellFormulaType;
-
-/**
- * Helper for shifting rows up or down
- * 
- * When possible, code should be implemented in the RowShifter abstract class to avoid duplication with {@link org.apache.poi.hssf.usermodel.helpers.HSSFRowShifter}
- */
-public final class XSSFRowShifter extends RowShifter {
-    private static final POILogger logger = POILogFactory.getLogger(XSSFRowShifter.class);
-
-    public XSSFRowShifter(XSSFSheet sh) {
-        super(sh);
-    }
-    
-    /**
-     * Shift merged regions
-     * 
-     * @param startRow the row to start shifting
-     * @param endRow   the row to end shifting
-     * @param n        the number of rows to shift
-     * @return an array of merged cell regions
-     * @deprecated POI 3.15 beta 2. Use {@link #shiftMergedRegions(int, int, int)} instead.
-     */
-    public List<CellRangeAddress> shiftMerged(int startRow, int endRow, int n) {
-        return shiftMergedRegions(startRow, endRow, n);
-    }
-
-    /**
-     * Updated named ranges
-     */
-    public void updateNamedRanges(FormulaShifter shifter) {
-        Workbook wb = sheet.getWorkbook();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create((XSSFWorkbook) wb);
-        for (Name name : wb.getAllNames()) {
-            String formula = name.getRefersToFormula();
-            int sheetIndex = name.getSheetIndex();
-            final int rowIndex = -1; //don't care, named ranges are not allowed to include structured references
-
-            Ptg[] ptgs = FormulaParser.parse(formula, fpb, FormulaType.NAMEDRANGE, sheetIndex, rowIndex);
-            if (shifter.adjustFormula(ptgs, sheetIndex)) {
-                String shiftedFmla = FormulaRenderer.toFormulaString(fpb, ptgs);
-                name.setRefersToFormula(shiftedFmla);
-            }
-        }
-    }
-
-    /**
-     * Update formulas.
-     */
-    public void updateFormulas(FormulaShifter shifter) {
-        //update formulas on the parent sheet
-        updateSheetFormulas(sheet, shifter);
-
-        //update formulas on other sheets
-        Workbook wb = sheet.getWorkbook();
-        for (Sheet sh : wb) {
-            if (sheet == sh) continue;
-            updateSheetFormulas(sh, shifter);
-        }
-    }
-
-    private void updateSheetFormulas(Sheet sh, FormulaShifter shifter) {
-        for (Row r : sh) {
-            XSSFRow row = (XSSFRow) r;
-            updateRowFormulas(row, shifter);
-        }
-    }
-
-    /**
-     * Update the formulas in specified row using the formula shifting policy specified by shifter
-     *
-     * @param row the row to update the formulas on
-     * @param shifter the formula shifting policy
-     */
-    @Internal
-    public void updateRowFormulas(Row row, FormulaShifter shifter) {
-        XSSFSheet sheet = (XSSFSheet) row.getSheet();
-        for (Cell c : row) {
-            XSSFCell cell = (XSSFCell) c;
-
-            CTCell ctCell = cell.getCTCell();
-            if (ctCell.isSetF()) {
-                CTCellFormula f = ctCell.getF();
-                String formula = f.getStringValue();
-                if (formula.length() > 0) {
-                    String shiftedFormula = shiftFormula(row, formula, shifter);
-                    if (shiftedFormula != null) {
-                        f.setStringValue(shiftedFormula);
-                        if(f.getT() == STCellFormulaType.SHARED){
-                            int si = (int)f.getSi();
-                            CTCellFormula sf = sheet.getSharedFormula(si);
-                            sf.setStringValue(shiftedFormula);
-                        }
-                    }
-
-                }
-
-                //Range of cells which the formula applies to.
-                if (f.isSetRef()) {
-                    String ref = f.getRef();
-                    String shiftedRef = shiftFormula(row, ref, shifter);
-                    if (shiftedRef != null) f.setRef(shiftedRef);
-                }
-            }
-
-        }
-    }
-
-    /**
-     * Shift a formula using the supplied FormulaShifter
-     *
-     * @param row     the row of the cell this formula belongs to. Used to get a reference to the parent workbook.
-     * @param formula the formula to shift
-     * @param shifter the FormulaShifter object that operates on the parsed formula tokens
-     * @return the shifted formula if the formula was changed,
-     *         <code>null</code> if the formula wasn't modified
-     */
-    private static String shiftFormula(Row row, String formula, FormulaShifter shifter) {
-        Sheet sheet = row.getSheet();
-        Workbook wb = sheet.getWorkbook();
-        int sheetIndex = wb.getSheetIndex(sheet);
-        final int rowIndex = row.getRowNum();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create((XSSFWorkbook) wb);
-        
-        try {
-            Ptg[] ptgs = FormulaParser.parse(formula, fpb, FormulaType.CELL, sheetIndex, rowIndex);
-            String shiftedFmla = null;
-            if (shifter.adjustFormula(ptgs, sheetIndex)) {
-                shiftedFmla = FormulaRenderer.toFormulaString(fpb, ptgs);
-            }
-            return shiftedFmla;
-        } catch (FormulaParseException fpe) {
-            // Log, but don't change, rather than breaking
-            logger.log(POILogger.WARN, "Error shifting formula on row ", row.getRowNum(), fpe);
-            return formula;
-        }
-    }
-
-    public void updateConditionalFormatting(FormulaShifter shifter) {
-        XSSFSheet xsheet = (XSSFSheet) sheet;
-        XSSFWorkbook wb = xsheet.getWorkbook();
-        int sheetIndex = wb.getSheetIndex(sheet);
-        final int rowIndex = -1; //don't care, structured references not allowed in conditional formatting
-
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        CTWorksheet ctWorksheet = xsheet.getCTWorksheet();
-        CTConditionalFormatting[] conditionalFormattingArray = ctWorksheet.getConditionalFormattingArray();
-        // iterate backwards due to possible calls to ctWorksheet.removeConditionalFormatting(j)
-        for (int j = conditionalFormattingArray.length - 1; j >= 0; j--) {
-            CTConditionalFormatting cf = conditionalFormattingArray[j];
-
-            ArrayList<CellRangeAddress> cellRanges = new ArrayList<CellRangeAddress>();
-            for (Object stRef : cf.getSqref()) {
-                String[] regions = stRef.toString().split(" ");
-                for (String region : regions) {
-                    cellRanges.add(CellRangeAddress.valueOf(region));
-                }
-            }
-
-            boolean changed = false;
-            List<CellRangeAddress> temp = new ArrayList<CellRangeAddress>();
-            for (CellRangeAddress craOld : cellRanges) {
-                CellRangeAddress craNew = shiftRange(shifter, craOld, sheetIndex);
-                if (craNew == null) {
-                    changed = true;
-                    continue;
-                }
-                temp.add(craNew);
-                if (craNew != craOld) {
-                    changed = true;
-                }
-            }
-
-            if (changed) {
-                int nRanges = temp.size();
-                if (nRanges == 0) {
-                    ctWorksheet.removeConditionalFormatting(j);
-                    continue;
-                }
-                List<String> refs = new ArrayList<String>();
-                for(CellRangeAddress a : temp) refs.add(a.formatAsString());
-                cf.setSqref(refs);
-            }
-
-            for(CTCfRule cfRule : cf.getCfRuleArray()){
-                String[] formulaArray = cfRule.getFormulaArray();
-                for (int i = 0; i < formulaArray.length; i++) {
-                    String formula = formulaArray[i];
-                    Ptg[] ptgs = FormulaParser.parse(formula, fpb, FormulaType.CELL, sheetIndex, rowIndex);
-                    if (shifter.adjustFormula(ptgs, sheetIndex)) {
-                        String shiftedFmla = FormulaRenderer.toFormulaString(fpb, ptgs);
-                        cfRule.setFormulaArray(i, shiftedFmla);
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * Shift the Hyperlink anchors (not the hyperlink text, even if the hyperlink
-     * is of type LINK_DOCUMENT and refers to a cell that was shifted). Hyperlinks
-     * do not track the content they point to.
-     *
-     * @param shifter
-     */
-    public void updateHyperlinks(FormulaShifter shifter) {
-        int sheetIndex = sheet.getWorkbook().getSheetIndex(sheet);
-        List<? extends Hyperlink> hyperlinkList = sheet.getHyperlinkList();
-        
-        for (Hyperlink hyperlink : hyperlinkList) {
-            XSSFHyperlink xhyperlink = (XSSFHyperlink) hyperlink;
-            String cellRef = xhyperlink.getCellRef();
-            CellRangeAddress cra = CellRangeAddress.valueOf(cellRef);
-            CellRangeAddress shiftedRange = shiftRange(shifter, cra, sheetIndex);
-            if (shiftedRange != null && shiftedRange != cra) {
-                // shiftedRange should not be null. If shiftedRange is null, that means
-                // that a hyperlink wasn't deleted at the beginning of shiftRows when
-                // identifying rows that should be removed because they will be overwritten
-                xhyperlink.setCellReference(shiftedRange.formatAsString());
-            }
-        }
-    }
-
-    private static CellRangeAddress shiftRange(FormulaShifter shifter, CellRangeAddress cra, int currentExternSheetIx) {
-        // FormulaShifter works well in terms of Ptgs - so convert CellRangeAddress to AreaPtg (and back) here
-        AreaPtg aptg = new AreaPtg(cra.getFirstRow(), cra.getLastRow(), cra.getFirstColumn(), cra.getLastColumn(), false, false, false, false);
-        Ptg[] ptgs = { aptg, };
-
-        if (!shifter.adjustFormula(ptgs, currentExternSheetIx)) {
-            return cra;
-        }
-        Ptg ptg0 = ptgs[0];
-        if (ptg0 instanceof AreaPtg) {
-            AreaPtg bptg = (AreaPtg) ptg0;
-            return new CellRangeAddress(bptg.getFirstRow(), bptg.getLastRow(), bptg.getFirstColumn(), bptg.getLastColumn());
-        }
-        if (ptg0 instanceof AreaErrPtg) {
-            return null;
-        }
-        throw new IllegalStateException("Unexpected shifted ptg class (" + ptg0.getClass().getName() + ")");
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
deleted file mode 100644
index b91b20b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.model.SingleXmlCells;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSingleXmlCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXmlCellPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXmlPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXmlDataType.Enum;
-
-/**
- * 
- * This class is a wrapper around the CTSingleXmlCell  (Open Office XML Part 4:
- * chapter 3.5.2.1) 
- * 
-
- * 
- * @author Roberto Manicardi
- *
- */
-public class XSSFSingleXmlCell {
-	
-	private CTSingleXmlCell singleXmlCell;
-	private SingleXmlCells parent;
-	
-	
-	public XSSFSingleXmlCell(CTSingleXmlCell singleXmlCell, SingleXmlCells parent){
-		this.singleXmlCell = singleXmlCell;
-		this.parent = parent;
-	}
-	
-	/**
-	 * Gets the XSSFCell referenced by the R attribute or creates a new one if cell doesn't exists
-	 * @return the referenced XSSFCell, null if the cell reference is invalid
-	 */
-	public XSSFCell getReferencedCell(){
-		XSSFCell cell = null;
-		
-		
-		CellReference cellReference =  new CellReference(singleXmlCell.getR()); 
-		
-		XSSFRow row = parent.getXSSFSheet().getRow(cellReference.getRow());
-		if(row==null){
-			row = parent.getXSSFSheet().createRow(cellReference.getRow());
-		}
-		
-		cell = row.getCell(cellReference.getCol());  
-		if(cell==null){
-			cell = row.createCell(cellReference.getCol());
-		}
-		
-		
-		return cell;
-	}
-	
-	public String getXpath(){
-		CTXmlCellPr xmlCellPr = singleXmlCell.getXmlCellPr();
-		CTXmlPr xmlPr = xmlCellPr.getXmlPr();
-		String xpath = xmlPr.getXpath();
-		return xpath;
-	}
-	
-	public long getMapId(){
-		return singleXmlCell.getXmlCellPr().getXmlPr().getMapId();
-	}
-
-	public Enum getXmlDataType() {
-		CTXmlCellPr xmlCellPr = singleXmlCell.getXmlCellPr();
-		CTXmlPr xmlPr = xmlCellPr.getXmlPr();
-		return xmlPr.getXmlDataType();
-	}
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java b/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
deleted file mode 100644
index 574d640..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import org.apache.poi.xssf.usermodel.XSSFTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXmlColumnPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXmlDataType.Enum;
-
-
-/**
- * 
- * This class is a wrapper around the CTXmlColumnPr (Open Office XML Part 4:
- * chapter 3.5.1.7)
- * 
- *
- * @author Roberto Manicardi
- */
-public class XSSFXmlColumnPr {
-	
-	private XSSFTable table;
-	private CTTableColumn ctTableColumn;
-	private CTXmlColumnPr ctXmlColumnPr;
-	
-	public XSSFXmlColumnPr(XSSFTable table ,CTTableColumn ctTableColum,CTXmlColumnPr ctXmlColumnPr){
-		this.table = table;
-		this.ctTableColumn = ctTableColum;
-		this.ctXmlColumnPr = ctXmlColumnPr;
-	}
-	
-	public long getMapId(){
-		return ctXmlColumnPr.getMapId();
-	}
-	
-	public String getXPath(){
-		return ctXmlColumnPr.getXpath();
-	}
-	/**
-	 * (see Open Office XML Part 4: chapter 3.5.1.3)
-	 * @return An integer representing the unique identifier of this column. 
-	 */
-	public long getId(){
-		return ctTableColumn.getId();
-	}
-	
-	
-	/**
-	 * If the XPath is, for example, /Node1/Node2/Node3 and /Node1/Node2 is the common XPath for the table, the local XPath is /Node3
-	 * 	
-	 * @return the local XPath 
-	 */
-	public String getLocalXPath(){
-		StringBuilder localXPath = new StringBuilder();
-		int numberOfCommonXPathAxis = table.getCommonXpath().split("/").length-1;
-		
-		String[] xPathTokens = ctXmlColumnPr.getXpath().split("/");
-		for(int i=numberOfCommonXPathAxis; i<xPathTokens.length;i++){
-			localXPath.append("/" +xPathTokens[i]);
-		}
-		return localXPath.toString();
-	}
-
-	public Enum getXmlDataType() {
-		
-		return ctXmlColumnPr.getXmlDataType();
-	}
-	
-	
-	
-	
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/util/CTColComparator.java b/trunk/src/ooxml/java/org/apache/poi/xssf/util/CTColComparator.java
deleted file mode 100644
index 5368eb0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/util/CTColComparator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.util;
-
-import java.util.Comparator;
-
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
-
-public class CTColComparator {
-
-    private CTColComparator() {}
-
-    public static final Comparator<CTCol> BY_MAX = new Comparator<CTCol>() {
-        @Override
-        public int compare(CTCol col1, CTCol col2) {
-            long col1max = col1.getMax();
-            long col2max = col2.getMax();
-            return col1max < col2max ? -1 : col1max > col2max ? 1 : 0;
-        }
-    };
-
-    public static final Comparator<CTCol> BY_MIN_MAX = new Comparator<CTCol>() {
-        @Override
-        public int compare(CTCol col1, CTCol col2) {
-            long col11min = col1.getMin();
-            long col2min = col2.getMin();
-            return col11min < col2min ? -1 : col11min > col2min ? 1 : BY_MAX.compare(col1, col2);
-        }
-    };
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java b/trunk/src/ooxml/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java
deleted file mode 100644
index 5fae1ea..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-/**
- * This is a seriously sick fix for the fact that some .xlsx
- *  files contain raw bits of HTML, without being escaped
- *  or properly turned into XML.
- * The result is that they contain things like &gt;br&lt;,
- *  which breaks the XML parsing.
- * This very sick InputStream wrapper attempts to spot
- *  these go past, and fix them.
- * Only works for UTF-8 and US-ASCII based streams!
- * It should only be used where experience shows the problem
- *  can occur...
- */
-public class EvilUnclosedBRFixingInputStream extends InputStream {
-   private InputStream source;
-   private byte[] spare;
-   
-   private static byte[] detect = new byte[] {
-      (byte)'<', (byte)'b', (byte)'r', (byte)'>'
-   };
-   
-   public EvilUnclosedBRFixingInputStream(InputStream source) {
-      this.source = source;
-   }
-
-   /**
-    * Warning - doesn't fix!
-    */
-   @Override
-   public int read() throws IOException {
-      return source.read();
-   }
-
-   @Override
-   public int read(byte[] b, int off, int len) throws IOException {
-      // Grab any data left from last time
-      int readA = readFromSpare(b, off, len);
-
-      // Now read from the stream 
-      int readB = source.read(b, off+readA, len-readA);
-      
-      // Figure out how much we've done
-      int read;
-      if(readB == -1 || readB == 0) {
-          if (readA == 0) {
-              return readB;
-          }
-         read = readA; 
-      } else {
-         read = readA + readB;
-      }
-      
-      // Fix up our data
-      if(read > 0) {
-         read = fixUp(b, off, read);
-      }
-      
-      // All done
-      return read;
-   }
-
-   @Override
-   public int read(byte[] b) throws IOException {
-      return this.read(b, 0, b.length);
-   }
-   
-   /**
-    * Reads into the buffer from the spare bytes
-    */
-   private int readFromSpare(byte[] b, int offset, int len) {
-      if(spare == null) return 0;
-      if(len == 0) throw new IllegalArgumentException("Asked to read 0 bytes");
-      
-      if(spare.length <= len) {
-         // All fits, good
-         System.arraycopy(spare, 0, b, offset, spare.length);
-         int read = spare.length;
-         spare = null;
-         return read;
-      } else {
-         // We have more spare than they can copy with...
-         byte[] newspare = new byte[spare.length-len];
-         System.arraycopy(spare, 0, b, offset, len);
-         System.arraycopy(spare, len, newspare, 0, newspare.length);
-         spare = newspare;
-         return len;
-      }
-   }
-   private void addToSpare(byte[] b, int offset, int len, boolean atTheEnd) {
-      if(spare == null) {
-         spare = new byte[len];
-         System.arraycopy(b, offset, spare, 0, len);
-      } else {
-         byte[] newspare = new byte[spare.length+len];
-         if(atTheEnd) {
-            System.arraycopy(spare, 0, newspare, 0, spare.length);
-            System.arraycopy(b, offset, newspare, spare.length, len);
-         } else {
-            System.arraycopy(b, offset, newspare, 0, len);
-            System.arraycopy(spare, 0, newspare, len, spare.length);
-         }
-         spare = newspare;
-      }
-   }
-
-   private int fixUp(byte[] b, int offset, int read) {
-      // Do we have any potential overhanging ones?
-      for(int i=0; i<detect.length-1; i++) {
-         int base = offset+read-1-i;
-         if(base < 0) continue;
-            
-         boolean going = true;
-         for(int j=0; j<=i && going; j++) {
-            if(b[base+j] == detect[j]) {
-               // Matches
-            } else {
-               going = false;
-            }
-         }
-         if(going) {
-            // There could be a <br> handing over the end, eg <br|
-            addToSpare(b, base, i+1, true);
-            read -= 1;
-            read -= i;
-            break;
-         }
-      }
-      
-      // Find places to fix
-      ArrayList<Integer> fixAt = new ArrayList<Integer>();
-      for(int i=offset; i<=offset+read-detect.length; i++) {
-         boolean going = true;
-         for(int j=0; j<detect.length && going; j++) {
-            if(b[i+j] != detect[j]) {
-               going = false;
-            }
-         }
-         if(going) {
-            fixAt.add(i);
-         }
-      }
-      
-      if(fixAt.size()==0) {
-         return read;
-      }
-      
-      // If there isn't space in the buffer to contain
-      //  all the fixes, then save the overshoot for next time
-      int needed = offset+read+fixAt.size();
-      int overshoot = needed - b.length;  
-      if(overshoot > 0) {
-         // Make sure we don't loose part of a <br>!
-         int fixes = 0;
-         for(int at : fixAt) {
-            if(at > offset+read-detect.length-overshoot-fixes) {
-               overshoot = needed - at - 1 - fixes;
-               break;
-            }
-            fixes++;
-         }
-
-         addToSpare(b, offset+read-overshoot, overshoot, false);
-         read -= overshoot;
-      }
-      
-      // Fix them, in reverse order so the
-      //  positions are valid
-      for(int j=fixAt.size()-1; j>=0; j--) {
-         int i = fixAt.get(j);
-         if(i >= read+offset) {
-            // This one has moved into the overshoot
-            continue;
-         }
-         if(i > read-3) {
-            // This one has moved into the overshoot
-            continue;
-         }
-
-         byte[] tmp = new byte[read-i-3];
-         System.arraycopy(b, i+3, tmp, 0, tmp.length);
-         b[i+3] = (byte)'/';
-         System.arraycopy(tmp, 0, b, i+4, tmp.length);
-         // It got one longer
-         read++;
-      }
-      return read;
-   }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java b/trunk/src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java
deleted file mode 100644
index 442e24a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.util;
-
-public class NumericRanges {
-
-    public static final int NO_OVERLAPS = -1;
-    public static final int OVERLAPS_1_MINOR = 0;
-    public static final int OVERLAPS_2_MINOR = 1;
-    public static final int OVERLAPS_1_WRAPS = 2;
-    public static final int OVERLAPS_2_WRAPS = 3;
-    
-    public static long[] getOverlappingRange(long[] range1, long[] range2) {
-        int overlappingType = getOverlappingType(range1, range2);
-        if (overlappingType == OVERLAPS_1_MINOR) {
-            return new long[]{range2[0], range1[1]};
-        }
-        else if (overlappingType == OVERLAPS_2_MINOR) {
-            return new long[]{range1[0], range2[1]};
-        }
-        else if (overlappingType == OVERLAPS_2_WRAPS) {
-            return range1;
-        }
-        else if (overlappingType == OVERLAPS_1_WRAPS) {
-            return range2;
-        }
-        return new long[]{-1, -1};
-    }
-    
-    public static int getOverlappingType(long[] range1, long[] range2) {
-        long min1 = range1[0];
-        long max1 = range1[1];
-        long min2 = range2[0];
-        long max2 = range2[1];
-        if (min1 >= min2 && max1 <= max2) {
-            return OVERLAPS_2_WRAPS;
-        }
-        else if (min2 >= min1 && max2 <= max1) {
-            return OVERLAPS_1_WRAPS;
-        }
-        else if ((min2 >= min1 && min2 <= max1) && max2 >= max1) {
-            return OVERLAPS_1_MINOR;
-        }
-        else if ((min1 >= min2 && min1 <= max2)  && max1 >= max2) {
-            return OVERLAPS_2_MINOR;
-        }
-        return NO_OVERLAPS;
-        
-    }
-    
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
deleted file mode 100644
index 712e04b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.extractor;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xwpf.model.XWPFCommentsDecorator;
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-import org.apache.poi.xwpf.usermodel.IBodyElement;
-import org.apache.poi.xwpf.usermodel.ICell;
-import org.apache.poi.xwpf.usermodel.IRunElement;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFHyperlink;
-import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-import org.apache.poi.xwpf.usermodel.XWPFSDT;
-import org.apache.poi.xwpf.usermodel.XWPFSDTCell;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr;
-
-/**
- * Helper class to extract text from an OOXML Word file
- */
-public class XWPFWordExtractor extends POIXMLTextExtractor {
-    public static final XWPFRelation[] SUPPORTED_TYPES = {
-            XWPFRelation.DOCUMENT, XWPFRelation.TEMPLATE,
-            XWPFRelation.MACRO_DOCUMENT,
-            XWPFRelation.MACRO_TEMPLATE_DOCUMENT
-    };
-
-    private XWPFDocument document;
-    private boolean fetchHyperlinks = false;
-
-    public XWPFWordExtractor(OPCPackage container) throws XmlException, OpenXML4JException, IOException {
-        this(new XWPFDocument(container));
-    }
-
-    public XWPFWordExtractor(XWPFDocument document) {
-        super(document);
-        this.document = document;
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 1) {
-            System.err.println("Use:");
-            System.err.println("  XWPFWordExtractor <filename.docx>");
-            System.exit(1);
-        }
-        POIXMLTextExtractor extractor =
-                new XWPFWordExtractor(POIXMLDocument.openPackage(
-                        args[0]
-                ));
-        System.out.println(extractor.getText());
-        extractor.close();
-    }
-
-    /**
-     * Should we also fetch the hyperlinks, when fetching
-     * the text content? Default is to only output the
-     * hyperlink label, and not the contents
-     */
-    public void setFetchHyperlinks(boolean fetch) {
-        fetchHyperlinks = fetch;
-    }
-
-    public String getText() {
-        StringBuffer text = new StringBuffer();
-        XWPFHeaderFooterPolicy hfPolicy = document.getHeaderFooterPolicy();
-
-        // Start out with all headers
-        extractHeaders(text, hfPolicy);
-
-        // Process all body elements
-        for (IBodyElement e : document.getBodyElements()) {
-            appendBodyElementText(text, e);
-            text.append('\n');
-        }
-
-        // Finish up with all the footers
-        extractFooters(text, hfPolicy);
-
-        return text.toString();
-    }
-
-    public void appendBodyElementText(StringBuffer text, IBodyElement e) {
-        if (e instanceof XWPFParagraph) {
-            appendParagraphText(text, (XWPFParagraph) e);
-        } else if (e instanceof XWPFTable) {
-            appendTableText(text, (XWPFTable) e);
-        } else if (e instanceof XWPFSDT) {
-            text.append(((XWPFSDT) e).getContent().getText());
-        }
-    }
-
-    public void appendParagraphText(StringBuffer text, XWPFParagraph paragraph) {
-        CTSectPr ctSectPr = null;
-        if (paragraph.getCTP().getPPr() != null) {
-            ctSectPr = paragraph.getCTP().getPPr().getSectPr();
-        }
-
-        XWPFHeaderFooterPolicy headerFooterPolicy = null;
-
-        if (ctSectPr != null) {
-            headerFooterPolicy = new XWPFHeaderFooterPolicy(document, ctSectPr);
-            extractHeaders(text, headerFooterPolicy);
-        }
-
-
-        for (IRunElement run : paragraph.getRuns()) {
-            text.append(run.toString());
-            if (run instanceof XWPFHyperlinkRun && fetchHyperlinks) {
-                XWPFHyperlink link = ((XWPFHyperlinkRun) run).getHyperlink(document);
-                if (link != null)
-                    text.append(" <").append(link.getURL()).append(">");
-            }
-        }
-
-        // Add comments
-        XWPFCommentsDecorator decorator = new XWPFCommentsDecorator(paragraph, null);
-        String commentText = decorator.getCommentText();
-        if (commentText.length() > 0) {
-            text.append(commentText).append('\n');
-        }
-
-        // Do endnotes and footnotes
-        String footnameText = paragraph.getFootnoteText();
-        if (footnameText != null && footnameText.length() > 0) {
-            text.append(footnameText).append('\n');
-        }
-
-        if (ctSectPr != null) {
-            extractFooters(text, headerFooterPolicy);
-        }
-    }
-
-    private void appendTableText(StringBuffer text, XWPFTable table) {
-        //this works recursively to pull embedded tables from tables
-        for (XWPFTableRow row : table.getRows()) {
-            List<ICell> cells = row.getTableICells();
-            for (int i = 0; i < cells.size(); i++) {
-                ICell cell = cells.get(i);
-                if (cell instanceof XWPFTableCell) {
-                    text.append(((XWPFTableCell) cell).getTextRecursively());
-                } else if (cell instanceof XWPFSDTCell) {
-                    text.append(((XWPFSDTCell) cell).getContent().getText());
-                }
-                if (i < cells.size() - 1) {
-                    text.append("\t");
-                }
-            }
-            text.append('\n');
-        }
-    }
-
-    private void extractFooters(StringBuffer text, XWPFHeaderFooterPolicy hfPolicy) {
-        if (hfPolicy == null) return;
-
-        if (hfPolicy.getFirstPageFooter() != null) {
-            text.append(hfPolicy.getFirstPageFooter().getText());
-        }
-        if (hfPolicy.getEvenPageFooter() != null) {
-            text.append(hfPolicy.getEvenPageFooter().getText());
-        }
-        if (hfPolicy.getDefaultFooter() != null) {
-            text.append(hfPolicy.getDefaultFooter().getText());
-        }
-    }
-
-    private void extractHeaders(StringBuffer text, XWPFHeaderFooterPolicy hfPolicy) {
-        if (hfPolicy == null) return;
-
-        if (hfPolicy.getFirstPageHeader() != null) {
-            text.append(hfPolicy.getFirstPageHeader().getText());
-        }
-        if (hfPolicy.getEvenPageHeader() != null) {
-            text.append(hfPolicy.getEvenPageHeader().getText());
-        }
-        if (hfPolicy.getDefaultHeader() != null) {
-            text.append(hfPolicy.getDefaultHeader().getText());
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/WMLHelper.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/model/WMLHelper.java
deleted file mode 100644
index 7c30d21..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/WMLHelper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.model;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
-
-public final class WMLHelper {
-    
-    public static boolean STOnOffToBoolean (STOnOff.Enum value) {
-        if (value == STOnOff.TRUE || value == STOnOff.ON || value == STOnOff.X_1) {
-            return true;
-        }
-        return false;
-    }
-    
-    public static STOnOff.Enum BooleanToSTOnOff (boolean value) {
-        return (value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java
deleted file mode 100644
index 25aa7aa..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.model;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-
-/**
- * Base class for XWPF paragraphs
- *
- * @author Yury Batrakov (batrakov at gmail.com)
- */
-public class XMLParagraph {
-    protected CTP paragraph;
-
-    public XMLParagraph(CTP paragraph) {
-        this.paragraph = paragraph;
-    }
-
-    public CTP getCTP() {
-        return paragraph;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
deleted file mode 100644
index 7b83560..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.model;
-
-import org.apache.poi.xwpf.usermodel.XWPFComment;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTMarkupRange;
-
-/**
- * Decorator class for XWPFParagraph allowing to add comments
- * found in paragraph to its text
- *
- * @author Yury Batrakov (batrakov at gmail.com)
- */
-public class XWPFCommentsDecorator extends XWPFParagraphDecorator {
-    private StringBuffer commentText;
-
-    public XWPFCommentsDecorator(XWPFParagraphDecorator nextDecorator) {
-        this(nextDecorator.paragraph, nextDecorator);
-    }
-
-    public XWPFCommentsDecorator(XWPFParagraph paragraph, XWPFParagraphDecorator nextDecorator) {
-        super(paragraph, nextDecorator);
-
-        XWPFComment comment;
-        commentText = new StringBuffer();
-
-        for (CTMarkupRange anchor : paragraph.getCTP().getCommentRangeStartArray()) {
-            if ((comment = paragraph.getDocument().getCommentByID(anchor.getId().toString())) != null)
-                commentText.append("\tComment by " + comment.getAuthor() + ": " + comment.getText());
-        }
-    }
-
-    public String getCommentText() {
-        return commentText.toString();
-    }
-
-    public String getText() {
-        return super.getText() + commentText;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
deleted file mode 100644
index 68799fd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
+++ /dev/null
@@ -1,494 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.model;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLDocumentPart.RelationPart;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFFactory;
-import org.apache.poi.xwpf.usermodel.XWPFFooter;
-import org.apache.poi.xwpf.usermodel.XWPFHeader;
-import org.apache.poi.xwpf.usermodel.XWPFHeaderFooter;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHdrFtr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHdrFtrRef;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.FtrDocument;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.HdrDocument;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STHdrFtr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STHdrFtr.Enum;
-
-import com.microsoft.schemas.office.office.CTLock;
-import com.microsoft.schemas.office.office.STConnectType;
-import com.microsoft.schemas.vml.CTFormulas;
-import com.microsoft.schemas.vml.CTGroup;
-import com.microsoft.schemas.vml.CTH;
-import com.microsoft.schemas.vml.CTHandles;
-import com.microsoft.schemas.vml.CTPath;
-import com.microsoft.schemas.vml.CTShape;
-import com.microsoft.schemas.vml.CTShapetype;
-import com.microsoft.schemas.vml.CTTextPath;
-import com.microsoft.schemas.vml.STExt;
-import com.microsoft.schemas.vml.STTrueFalse;
-
-/**
- * A .docx file can have no headers/footers, the same header/footer
- * on each page, odd/even page footers, and optionally also
- * a different header/footer on the first page.
- * This class handles sorting out what there is, and giving you
- * the right headers and footers for the document.
- */
-public class XWPFHeaderFooterPolicy {
-    public static final Enum DEFAULT = STHdrFtr.DEFAULT;
-    public static final Enum EVEN = STHdrFtr.EVEN;
-    public static final Enum FIRST = STHdrFtr.FIRST;
-
-    private XWPFDocument doc;
-
-    private XWPFHeader firstPageHeader;
-    private XWPFFooter firstPageFooter;
-
-    private XWPFHeader evenPageHeader;
-    private XWPFFooter evenPageFooter;
-
-    private XWPFHeader defaultHeader;
-    private XWPFFooter defaultFooter;
-
-    /**
-     * Figures out the policy for the given document,
-     * and creates any header and footer objects
-     * as required.
-     */
-    public XWPFHeaderFooterPolicy(XWPFDocument doc) {
-        this(doc, null);
-    }
-
-    /**
-     * Figures out the policy for the given document,
-     * and creates any header and footer objects
-     * as required.
-     */
-    public XWPFHeaderFooterPolicy(XWPFDocument doc, CTSectPr sectPr) {
-        // Grab what headers and footers have been defined
-        // For now, we don't care about different ranges, as it
-        //  doesn't seem that .docx properly supports that
-        //  feature of the file format yet
-        if (sectPr == null) {
-            CTBody ctBody = doc.getDocument().getBody();
-            sectPr = ctBody.isSetSectPr()
-                    ? ctBody.getSectPr()
-                    : ctBody.addNewSectPr();
-        }
-        this.doc = doc;
-        for (int i = 0; i < sectPr.sizeOfHeaderReferenceArray(); i++) {
-            // Get the header
-            CTHdrFtrRef ref = sectPr.getHeaderReferenceArray(i);
-            POIXMLDocumentPart relatedPart = doc.getRelationById(ref.getId());
-            XWPFHeader hdr = null;
-            if (relatedPart != null && relatedPart instanceof XWPFHeader) {
-                hdr = (XWPFHeader) relatedPart;
-            }
-            // Assign it; treat invalid options as "default" POI-60293
-            Enum type;
-            try {
-                type = ref.getType();
-            } catch (XmlValueOutOfRangeException e) {
-                type = STHdrFtr.DEFAULT;
-            }
-
-            assignHeader(hdr, type);
-        }
-        for (int i = 0; i < sectPr.sizeOfFooterReferenceArray(); i++) {
-            // Get the footer
-            CTHdrFtrRef ref = sectPr.getFooterReferenceArray(i);
-            POIXMLDocumentPart relatedPart = doc.getRelationById(ref.getId());
-            XWPFFooter ftr = null;
-            if (relatedPart != null && relatedPart instanceof XWPFFooter) {
-                ftr = (XWPFFooter) relatedPart;
-            }
-            // Assign it; treat invalid options as "default" POI-60293
-            Enum type;
-            try {
-                type = ref.getType();
-            } catch (XmlValueOutOfRangeException e) {
-                type = STHdrFtr.DEFAULT;
-            }
-            assignFooter(ftr, type);
-        }
-    }
-
-    private void assignFooter(XWPFFooter ftr, Enum type) {
-        if (type == STHdrFtr.FIRST) {
-            firstPageFooter = ftr;
-        } else if (type == STHdrFtr.EVEN) {
-            evenPageFooter = ftr;
-        } else {
-            defaultFooter = ftr;
-        }
-    }
-
-    private void assignHeader(XWPFHeader hdr, Enum type) {
-        if (type == STHdrFtr.FIRST) {
-            firstPageHeader = hdr;
-        } else if (type == STHdrFtr.EVEN) {
-            evenPageHeader = hdr;
-        } else {
-            defaultHeader = hdr;
-        }
-    }
-
-    /**
-     * Creates an empty header of the specified type, containing a single
-     * empty paragraph, to which you can then set text, add more paragraphs etc.
-     */
-    public XWPFHeader createHeader(Enum type) {
-        return createHeader(type, null);
-    }
-
-    /**
-     * Creates a new header of the specified type, to which the
-     * supplied (and previously unattached!) paragraphs are
-     * added to.
-     */
-    public XWPFHeader createHeader(Enum type, XWPFParagraph[] pars) {
-        XWPFHeader header = getHeader(type);
-
-        if (header == null) {
-            HdrDocument hdrDoc = HdrDocument.Factory.newInstance();
-
-            XWPFRelation relation = XWPFRelation.HEADER;
-            int i = getRelationIndex(relation);
-
-            XWPFHeader wrapper = (XWPFHeader) doc.createRelationship(relation,
-                    XWPFFactory.getInstance(), i);
-            wrapper.setXWPFDocument(doc);
-
-            String pStyle = "Header";
-            CTHdrFtr hdr = buildHdr(type, pStyle, wrapper, pars);
-            wrapper.setHeaderFooter(hdr);
-            hdrDoc.setHdr(hdr);
-            assignHeader(wrapper, type);
-            header = wrapper;
-        }
-
-        return header;
-    }
-
-    /**
-     * Creates an empty footer of the specified type, containing a single
-     * empty paragraph, to which you can then set text, add more paragraphs etc.
-     */
-    public XWPFFooter createFooter(Enum type) {
-        return createFooter(type, null);
-    }
-
-    /**
-     * Creates a new footer of the specified type, to which the
-     * supplied (and previously unattached!) paragraphs are
-     * added to.
-     */
-    public XWPFFooter createFooter(Enum type, XWPFParagraph[] pars) {
-        XWPFFooter footer = getFooter(type);
-
-        if (footer == null) {
-            FtrDocument ftrDoc = FtrDocument.Factory.newInstance();
-
-            XWPFRelation relation = XWPFRelation.FOOTER;
-            int i = getRelationIndex(relation);
-
-            XWPFFooter wrapper = (XWPFFooter) doc.createRelationship(relation,
-                    XWPFFactory.getInstance(), i);
-            wrapper.setXWPFDocument(doc);
-
-            String pStyle = "Footer";
-            CTHdrFtr ftr = buildFtr(type, pStyle, wrapper, pars);
-            wrapper.setHeaderFooter(ftr);
-            ftrDoc.setFtr(ftr);
-            assignFooter(wrapper, type);
-            footer = wrapper;
-        }
-
-        return footer;
-    }
-
-    private int getRelationIndex(XWPFRelation relation) {
-        int i = 1;
-        for (RelationPart rp : doc.getRelationParts()) {
-            if (rp.getRelationship().getRelationshipType().equals(relation.getRelation())) {
-                i++;
-            }
-        }
-        return i;
-    }
-
-    private CTHdrFtr buildFtr(Enum type, String pStyle, XWPFHeaderFooter wrapper, XWPFParagraph[] pars) {
-        //CTHdrFtr ftr = buildHdrFtr(pStyle, pars);				// MB 24 May 2010
-        CTHdrFtr ftr = buildHdrFtr(pStyle, pars, wrapper);        // MB 24 May 2010
-        setFooterReference(type, wrapper);
-        return ftr;
-    }
-
-    private CTHdrFtr buildHdr(Enum type, String pStyle, XWPFHeaderFooter wrapper, XWPFParagraph[] pars) {
-        //CTHdrFtr hdr = buildHdrFtr(pStyle, pars);				// MB 24 May 2010
-        CTHdrFtr hdr = buildHdrFtr(pStyle, pars, wrapper);        // MB 24 May 2010
-        setHeaderReference(type, wrapper);
-        return hdr;
-    }
-
-    /**
-     * MB 24 May 2010. Created this overloaded buildHdrFtr() method because testing demonstrated
-     * that the XWPFFooter or XWPFHeader object returned by calls to the createHeader(int, XWPFParagraph[])
-     * and createFooter(int, XWPFParagraph[]) methods or the getXXXXXHeader/Footer methods where
-     * headers or footers had been added to a document since it had been created/opened, returned
-     * an object that contained no XWPFParagraph objects even if the header/footer itself did contain
-     * text. The reason was that this line of code; CTHdrFtr ftr = CTHdrFtr.Factory.newInstance();
-     * created a brand new instance of the CTHDRFtr class which was then populated with data when
-     * it should have recovered the CTHdrFtr object encapsulated within the XWPFHeaderFooter object
-     * that had previoulsy been instantiated in the createHeader(int, XWPFParagraph[]) or
-     * createFooter(int, XWPFParagraph[]) methods.
-     */
-    private CTHdrFtr buildHdrFtr(String pStyle, XWPFParagraph[] paragraphs, XWPFHeaderFooter wrapper) {
-        CTHdrFtr ftr = wrapper._getHdrFtr();
-        if (paragraphs != null) {
-            for (int i = 0; i < paragraphs.length; i++) {
-                CTP p = ftr.addNewP();
-                ftr.setPArray(i, paragraphs[i].getCTP());
-            }
-//        } else {
-//            CTP p = ftr.addNewP();
-//            CTBody body = doc.getDocument().getBody();
-//            if (body.sizeOfPArray() > 0) {
-//                CTP p0 = body.getPArray(0);
-//                if (p0.isSetRsidR()) {
-//                    byte[] rsidr = p0.getRsidR();
-//                    byte[] rsidrdefault = p0.getRsidRDefault();
-//                    p.setRsidP(rsidr);
-//                    p.setRsidRDefault(rsidrdefault);
-//                }
-//            }
-//            CTPPr pPr = p.addNewPPr();
-//            pPr.addNewPStyle().setVal(pStyle);
-        }
-        return ftr;
-    }
-
-
-    private void setFooterReference(Enum type, XWPFHeaderFooter wrapper) {
-        CTHdrFtrRef ref = doc.getDocument().getBody().getSectPr().addNewFooterReference();
-        ref.setType(type);
-        ref.setId(doc.getRelationId(wrapper));
-    }
-
-
-    private void setHeaderReference(Enum type, XWPFHeaderFooter wrapper) {
-        CTHdrFtrRef ref = doc.getDocument().getBody().getSectPr().addNewHeaderReference();
-        ref.setType(type);
-        ref.setId(doc.getRelationId(wrapper));
-    }
-    
-    public XWPFHeader getFirstPageHeader() {
-        return firstPageHeader;
-    }
-
-    public XWPFFooter getFirstPageFooter() {
-        return firstPageFooter;
-    }
-
-    /**
-     * Returns the odd page header. This is
-     * also the same as the default one...
-     */
-    public XWPFHeader getOddPageHeader() {
-        return defaultHeader;
-    }
-
-    /**
-     * Returns the odd page footer. This is
-     * also the same as the default one...
-     */
-    public XWPFFooter getOddPageFooter() {
-        return defaultFooter;
-    }
-
-    public XWPFHeader getEvenPageHeader() {
-        return evenPageHeader;
-    }
-
-    public XWPFFooter getEvenPageFooter() {
-        return evenPageFooter;
-    }
-
-    public XWPFHeader getDefaultHeader() {
-        return defaultHeader;
-    }
-
-    public XWPFFooter getDefaultFooter() {
-        return defaultFooter;
-    }
-
-    /**
-     * Get the header that applies to the given
-     * (1 based) page.
-     *
-     * @param pageNumber The one based page number
-     */
-    public XWPFHeader getHeader(int pageNumber) {
-        if (pageNumber == 1 && firstPageHeader != null) {
-            return firstPageHeader;
-        }
-        if (pageNumber % 2 == 0 && evenPageHeader != null) {
-            return evenPageHeader;
-        }
-        return defaultHeader;
-    }
-    
-    /**
-     * Get this section header for the given type
-     *
-     * @param type of header to return
-     * @return {@link XWPFHeader} object
-     */
-    public XWPFHeader getHeader(Enum type) {
-        if (type == STHdrFtr.EVEN) {
-            return evenPageHeader;
-        } else if (type == STHdrFtr.FIRST) {
-            return firstPageHeader;
-        }
-        return defaultHeader;
-    }
-
-    /**
-     * Get the footer that applies to the given
-     * (1 based) page.
-     *
-     * @param pageNumber The one based page number
-     */
-    public XWPFFooter getFooter(int pageNumber) {
-        if (pageNumber == 1 && firstPageFooter != null) {
-            return firstPageFooter;
-        }
-        if (pageNumber % 2 == 0 && evenPageFooter != null) {
-            return evenPageFooter;
-        }
-        return defaultFooter;
-    }
-    
-    /**
-     * Get this section footer for the given type
-     *
-     * @param type of footer to return
-     * @return {@link XWPFFooter} object
-     */
-    public XWPFFooter getFooter(Enum type) {
-        if (type == STHdrFtr.EVEN) {
-            return evenPageFooter;
-        } else if (type == STHdrFtr.FIRST) {
-            return firstPageFooter;
-        }
-        return defaultFooter;
-    }
-    
-
-    public void createWatermark(String text) {
-        XWPFParagraph[] pars = new XWPFParagraph[1];
-        pars[0] = getWatermarkParagraph(text, 1);
-        createHeader(DEFAULT, pars);
-        pars[0] = getWatermarkParagraph(text, 2);
-        createHeader(FIRST, pars);
-        pars[0] = getWatermarkParagraph(text, 3);
-        createHeader(EVEN, pars);
-    }
-
-    /*
-     * This is the default Watermark paragraph; the only variable is the text message
-     * TODO: manage all the other variables
-     */
-    private XWPFParagraph getWatermarkParagraph(String text, int idx) {
-        CTP p = CTP.Factory.newInstance();
-        byte[] rsidr = doc.getDocument().getBody().getPArray(0).getRsidR();
-        byte[] rsidrdefault = doc.getDocument().getBody().getPArray(0).getRsidRDefault();
-        p.setRsidP(rsidr);
-        p.setRsidRDefault(rsidrdefault);
-        CTPPr pPr = p.addNewPPr();
-        pPr.addNewPStyle().setVal("Header");
-        // start watermark paragraph
-        CTR r = p.addNewR();
-        CTRPr rPr = r.addNewRPr();
-        rPr.addNewNoProof();
-        CTPicture pict = r.addNewPict();
-        CTGroup group = CTGroup.Factory.newInstance();
-        CTShapetype shapetype = group.addNewShapetype();
-        shapetype.setId("_x0000_t136");
-        shapetype.setCoordsize("1600,21600");
-        shapetype.setSpt(136);
-        shapetype.setAdj("10800");
-        shapetype.setPath2("m@7,0l@8,0m@5,21600l@6,21600e");
-        CTFormulas formulas = shapetype.addNewFormulas();
-        formulas.addNewF().setEqn("sum #0 0 10800");
-        formulas.addNewF().setEqn("prod #0 2 1");
-        formulas.addNewF().setEqn("sum 21600 0 @1");
-        formulas.addNewF().setEqn("sum 0 0 @2");
-        formulas.addNewF().setEqn("sum 21600 0 @3");
-        formulas.addNewF().setEqn("if @0 @3 0");
-        formulas.addNewF().setEqn("if @0 21600 @1");
-        formulas.addNewF().setEqn("if @0 0 @2");
-        formulas.addNewF().setEqn("if @0 @4 21600");
-        formulas.addNewF().setEqn("mid @5 @6");
-        formulas.addNewF().setEqn("mid @8 @5");
-        formulas.addNewF().setEqn("mid @7 @8");
-        formulas.addNewF().setEqn("mid @6 @7");
-        formulas.addNewF().setEqn("sum @6 0 @5");
-        CTPath path = shapetype.addNewPath();
-        path.setTextpathok(STTrueFalse.T);
-        path.setConnecttype(STConnectType.CUSTOM);
-        path.setConnectlocs("@9,0;@10,10800;@11,21600;@12,10800");
-        path.setConnectangles("270,180,90,0");
-        CTTextPath shapeTypeTextPath = shapetype.addNewTextpath();
-        shapeTypeTextPath.setOn(STTrueFalse.T);
-        shapeTypeTextPath.setFitshape(STTrueFalse.T);
-        CTHandles handles = shapetype.addNewHandles();
-        CTH h = handles.addNewH();
-        h.setPosition("#0,bottomRight");
-        h.setXrange("6629,14971");
-        CTLock lock = shapetype.addNewLock();
-        lock.setExt(STExt.EDIT);
-        CTShape shape = group.addNewShape();
-        shape.setId("PowerPlusWaterMarkObject" + idx);
-        shape.setSpid("_x0000_s102" + (4 + idx));
-        shape.setType("#_x0000_t136");
-        shape.setStyle("position:absolute;margin-left:0;margin-top:0;width:415pt;height:207.5pt;z-index:-251654144;mso-wrap-edited:f;mso-position-horizontal:center;mso-position-horizontal-relative:margin;mso-position-vertical:center;mso-position-vertical-relative:margin");
-        shape.setWrapcoords("616 5068 390 16297 39 16921 -39 17155 7265 17545 7186 17467 -39 17467 18904 17467 10507 17467 8710 17545 18904 17077 18787 16843 18358 16297 18279 12554 19178 12476 20701 11774 20779 11228 21131 10059 21248 8811 21248 7563 20975 6316 20935 5380 19490 5146 14022 5068 2616 5068");
-        shape.setFillcolor("black");
-        shape.setStroked(STTrueFalse.FALSE);
-        CTTextPath shapeTextPath = shape.addNewTextpath();
-        shapeTextPath.setStyle("font-family:&quot;Cambria&quot;;font-size:1pt");
-        shapeTextPath.setString(text);
-        pict.set(group);
-        // end watermark paragraph
-        return new XWPFParagraph(p, doc);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
deleted file mode 100644
index 46636c3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.model;
-
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-
-/**
- * Base decorator class for XWPFParagraph
- */
-public abstract class XWPFParagraphDecorator {
-    protected XWPFParagraph paragraph;
-    protected XWPFParagraphDecorator nextDecorator;
-
-    public XWPFParagraphDecorator(XWPFParagraph paragraph) {
-        this(paragraph, null);
-    }
-
-    public XWPFParagraphDecorator(XWPFParagraph paragraph, XWPFParagraphDecorator nextDecorator) {
-        this.paragraph = paragraph;
-        this.nextDecorator = nextDecorator;
-    }
-
-    public String getText() {
-        if (nextDecorator != null) {
-            return nextDecorator.getText();
-        }
-        return paragraph.getText();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html b/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html
deleted file mode 100644
index 0a59556..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<html>
-<body>
-<p>This package contains classes for handling Microsoft .docx
-    Word Processing files, known in POI as XWPF (XML Word Processing
-    Format).
-</p>
-</body>
-</html>
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/AbstractXWPFSDT.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/AbstractXWPFSDT.java
deleted file mode 100644
index 4db163d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/AbstractXWPFSDT.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString;
-
-/**
- * Experimental abstract class that is a base for XWPFSDT and XWPFSDTCell
- * <p/>
- * WARNING - APIs expected to change rapidly.
- * <p/>
- * These classes have so far been built only for read-only processing.
- */
-public abstract class AbstractXWPFSDT implements ISDTContents {
-    private final String title;
-    private final String tag;
-    private final IBody part;
-
-    public AbstractXWPFSDT(CTSdtPr pr, IBody part) {
-        if (pr == null) {
-            title = "";
-            tag = "";
-        } else {
-            CTString[] aliases = pr.getAliasArray();
-            if (aliases != null && aliases.length > 0) {
-                title = aliases[0].getVal();
-            } else {
-                title = "";
-            }
-            CTString[] tags = pr.getTagArray();
-            if (tags != null && tags.length > 0) {
-                tag = tags[0].getVal();
-            } else {
-                tag = "";
-            }
-        }
-        this.part = part;
-
-    }
-
-    /**
-     * @return first SDT Title
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * @return first SDT Tag
-     */
-    public String getTag() {
-        return tag;
-    }
-
-    /**
-     * @return the content object
-     */
-    public abstract ISDTContent getContent();
-
-    /**
-     * @return null
-     */
-    public IBody getBody() {
-        return null;
-    }
-
-    /**
-     * @return document part
-     */
-    public POIXMLDocumentPart getPart() {
-        return part.getPart();
-    }
-
-    /**
-     * @return partType
-     */
-    public BodyType getPartType() {
-        return BodyType.CONTENTCONTROL;
-    }
-
-    /**
-     * @return element type
-     */
-    public BodyElementType getElementType() {
-        return BodyElementType.CONTENTCONTROL;
-    }
-
-    public XWPFDocument getDocument() {
-        return part.getXWPFDocument();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
deleted file mode 100644
index 5a1df0e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-/**
- * <p>
- * 9 Jan 2010
- * </p>
- * <p>
- * // TODO insert Javadoc here!
- * </p>
- *
- * @author epp
- */
-public enum BodyElementType {
-    CONTENTCONTROL,
-    PARAGRAPH,
-    TABLE,
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyType.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyType.java
deleted file mode 100644
index 39e4758..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-/**
- * The different kinds of {@link IBody} that exist
- */
-public enum BodyType {
-    CONTENTCONTROL,
-    DOCUMENT,
-    HEADER,
-    FOOTER,
-    FOOTNOTE,
-    TABLECELL
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Borders.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Borders.java
deleted file mode 100644
index b7937e5..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Borders.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies all types of borders which can be specified for WordprocessingML
- * objects which have a border. Borders can be separated into two types:
- * <ul>
- * <li> Line borders: which specify a pattern to be used when drawing a line around the
- * specified object.
- * </li>
- * <li> Art borders: which specify a repeated image to be used
- * when drawing a border around the specified object. Line borders may be
- * specified on any object which allows a border, however, art borders may only
- * be used as a border at the page level - the borders under the pgBorders
- * element
- * </li>
- * </ul>
- *
- * @author Gisella Bronzetti
- */
-public enum Borders {
-
-    NIL(1),
-
-    NONE(2),
-
-    /**
-     * Specifies a line border consisting of a single line around the parent
-     * object.
-     */
-    SINGLE(3),
-
-    THICK(4),
-
-    DOUBLE(5),
-
-    DOTTED(6),
-
-    DASHED(7),
-
-    DOT_DASH(8),
-
-    DOT_DOT_DASH(9),
-
-    TRIPLE(10),
-
-    THIN_THICK_SMALL_GAP(11),
-
-    THICK_THIN_SMALL_GAP(12),
-
-    THIN_THICK_THIN_SMALL_GAP(13),
-
-    THIN_THICK_MEDIUM_GAP(14),
-
-    THICK_THIN_MEDIUM_GAP(15),
-
-    THIN_THICK_THIN_MEDIUM_GAP(16),
-
-    THIN_THICK_LARGE_GAP(17),
-
-    THICK_THIN_LARGE_GAP(18),
-
-    THIN_THICK_THIN_LARGE_GAP(19),
-
-    WAVE(20),
-
-    DOUBLE_WAVE(21),
-
-    DASH_SMALL_GAP(22),
-
-    DASH_DOT_STROKED(23),
-
-    THREE_D_EMBOSS(24),
-
-    THREE_D_ENGRAVE(25),
-
-    OUTSET(26),
-
-    INSET(27),
-
-    /**
-     * Specifies an art border consisting of a repeated image of an apple
-     */
-    APPLES(28),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a shell pattern
-     */
-    ARCHED_SCALLOPS(29),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a baby pacifier
-     */
-    BABY_PACIFIER(30),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a baby rattle
-     */
-    BABY_RATTLE(31),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a set of
-     * balloons
-     */
-    BALLOONS_3_COLORS(32),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a hot air
-     * balloon
-     */
-    BALLOONS_HOT_AIR(33),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background.
-     */
-    BASIC_BLACK_DASHES(34),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black dot on
-     * a white background.
-     */
-    BASIC_BLACK_DOTS(35),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background
-     */
-    BASIC_BLACK_SQUARES(36),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background.
-     */
-    BASIC_THIN_LINES(37),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background.
-     */
-    BASIC_WHITE_DASHES(38),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a white dot on
-     * a black background.
-     */
-    BASIC_WHITE_DOTS(39),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background.
-     */
-    BASIC_WHITE_SQUARES(40),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background.
-     */
-    BASIC_WIDE_INLINE(41),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background
-     */
-    BASIC_WIDE_MIDLINE(42),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a black and
-     * white background
-     */
-    BASIC_WIDE_OUTLINE(43),
-
-    /**
-     * Specifies an art border consisting of a repeated image of bats
-     */
-    BATS(44),
-
-    /**
-     * Specifies an art border consisting of repeating images of birds
-     */
-    BIRDS(45),
-
-    /**
-     * Specifies an art border consisting of a repeated image of birds flying
-     */
-    BIRDS_FLIGHT(46),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a cabin
-     */
-    CABINS(47),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a piece of cake
-     */
-    CAKE_SLICE(48),
-
-    /**
-     * Specifies an art border consisting of a repeated image of candy corn
-     */
-    CANDY_CORN(49),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a knot work
-     * pattern
-     */
-    CELTIC_KNOTWORK(50),
-
-    /**
-     * Specifies an art border consisting of a banner.
-     * <p>
-     * If the border is on the left or right, no border is displayed.
-     * </p>
-     */
-    CERTIFICATE_BANNER(51),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a chain link
-     * pattern.
-     */
-    CHAIN_LINK(52),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a champagne
-     * bottle
-     */
-    CHAMPAGNE_BOTTLE(53),
-
-    /**
-     * Specifies an art border consisting of repeating images of a compass
-     */
-    CHECKED_BAR_BLACK(54),
-
-    /**
-     * Specifies an art border consisting of a repeating image of a colored
-     * pattern.
-     */
-    CHECKED_BAR_COLOR(55),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a checkerboard
-     */
-    CHECKERED(56),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a Christmas
-     * tree
-     */
-    CHRISTMAS_TREE(57),
-
-    /**
-     * Specifies an art border consisting of repeating images of lines and
-     * circles
-     */
-    CIRCLES_LINES(58),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a rectangular
-     * pattern
-     */
-    CIRCLES_RECTANGLES(59),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a wave
-     */
-    CLASSICAL_WAVE(60),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a clock
-     */
-    CLOCKS(61),
-
-    /**
-     * Specifies an art border consisting of repeating images of a compass
-     */
-    COMPASS(62),
-
-    /**
-     * Specifies an art border consisting of a repeated image of confetti
-     */
-    CONFETTI(63),
-
-    /**
-     * Specifies an art border consisting of a repeated image of confetti
-     */
-    CONFETTI_GRAYS(64),
-
-    /**
-     * Specifies an art border consisting of a repeated image of confetti
-     */
-    CONFETTI_OUTLINE(65),
-
-    /**
-     * Specifies an art border consisting of a repeated image of confetti
-     * streamers
-     */
-    CONFETTI_STREAMERS(66),
-
-    /**
-     * Specifies an art border consisting of a repeated image of confetti
-     */
-    CONFETTI_WHITE(67),
-
-    /**
-     * Specifies an art border consisting of a repeated image
-     */
-    CORNER_TRIANGLES(68),
-
-    /**
-     * Specifies an art border consisting of a dashed line
-     */
-    COUPON_CUTOUT_DASHES(69),
-
-    /**
-     * Specifies an art border consisting of a dotted line
-     */
-    COUPON_CUTOUT_DOTS(70),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a maze-like
-     * pattern
-     */
-    CRAZY_MAZE(71),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a butterfly
-     */
-    CREATURES_BUTTERFLY(72),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a fish
-     */
-    CREATURES_FISH(73),
-
-    /**
-     * Specifies an art border consisting of repeating images of insects.
-     */
-    CREATURES_INSECTS(74),
-
-    /**
-     * Specifies an art border consisting of a repeated image of a ladybug
-     */
-    CREATURES_LADY_BUG(75),
-
-    /**
-     * Specifies an art border consisting of repeating images of a cross-stitch
-     * pattern
-     */
-    CROSS_STITCH(76),
-
-    /**
-     * Specifies an art border consisting of a repeated image of Cupid
-     */
-    CUP(77),
-
-    DECO_ARCH(78),
-
-    DECO_ARCH_COLOR(79),
-
-    DECO_BLOCKS(80),
-
-    DIAMONDS_GRAY(81),
-
-    DOUBLE_D(82),
-
-    DOUBLE_DIAMONDS(83),
-
-    EARTH_1(84),
-
-    EARTH_2(85),
-
-    ECLIPSING_SQUARES_1(86),
-
-    ECLIPSING_SQUARES_2(87),
-
-    EGGS_BLACK(88),
-
-    FANS(89),
-
-    FILM(90),
-
-    FIRECRACKERS(91),
-
-    FLOWERS_BLOCK_PRINT(92),
-
-    FLOWERS_DAISIES(93),
-
-    FLOWERS_MODERN_1(94),
-
-    FLOWERS_MODERN_2(95),
-
-    FLOWERS_PANSY(96),
-
-    FLOWERS_RED_ROSE(97),
-
-    FLOWERS_ROSES(98),
-
-    FLOWERS_TEACUP(99),
-
-    FLOWERS_TINY(100),
-
-    GEMS(101),
-
-    GINGERBREAD_MAN(102),
-
-    GRADIENT(103),
-
-    HANDMADE_1(104),
-
-    HANDMADE_2(105),
-
-    HEART_BALLOON(106),
-
-    HEART_GRAY(107),
-
-    HEARTS(108),
-
-    HEEBIE_JEEBIES(109),
-
-    HOLLY(110),
-
-    HOUSE_FUNKY(111),
-
-    HYPNOTIC(112),
-
-    ICE_CREAM_CONES(113),
-
-    LIGHT_BULB(114),
-
-    LIGHTNING_1(115),
-
-    LIGHTNING_2(116),
-
-    MAP_PINS(117),
-
-    MAPLE_LEAF(118),
-
-    MAPLE_MUFFINS(119),
-
-    MARQUEE(120),
-
-    MARQUEE_TOOTHED(121),
-
-    MOONS(122),
-
-    MOSAIC(123),
-
-    MUSIC_NOTES(124),
-
-    NORTHWEST(125),
-
-    OVALS(126),
-
-    PACKAGES(127),
-
-    PALMS_BLACK(128),
-
-    PALMS_COLOR(129),
-
-    PAPER_CLIPS(130),
-
-    PAPYRUS(131),
-
-    PARTY_FAVOR(132),
-
-    PARTY_GLASS(133),
-
-    PENCILS(134),
-
-    PEOPLE(135),
-
-    PEOPLE_WAVING(136),
-
-    PEOPLE_HATS(137),
-
-    POINSETTIAS(138),
-
-    POSTAGE_STAMP(139),
-
-    PUMPKIN_1(140),
-
-    PUSH_PIN_NOTE_2(141),
-
-    PUSH_PIN_NOTE_1(142),
-
-    PYRAMIDS(143),
-
-    PYRAMIDS_ABOVE(144),
-
-    QUADRANTS(145),
-
-    RINGS(146),
-
-    SAFARI(147),
-
-    SAWTOOTH(148),
-
-    SAWTOOTH_GRAY(149),
-
-    SCARED_CAT(150),
-
-    SEATTLE(151),
-
-    SHADOWED_SQUARES(152),
-
-    SHARKS_TEETH(153),
-
-    SHOREBIRD_TRACKS(154),
-
-    SKYROCKET(155),
-
-    SNOWFLAKE_FANCY(156),
-
-    SNOWFLAKES(157),
-
-    SOMBRERO(158),
-
-    SOUTHWEST(159),
-
-    STARS(160),
-
-    STARS_TOP(161),
-
-    STARS_3_D(162),
-
-    STARS_BLACK(163),
-
-    STARS_SHADOWED(164),
-
-    SUN(165),
-
-    SWIRLIGIG(166),
-
-    TORN_PAPER(167),
-
-    TORN_PAPER_BLACK(168),
-
-    TREES(169),
-
-    TRIANGLE_PARTY(170),
-
-    TRIANGLES(171),
-
-    TRIBAL_1(172),
-
-    TRIBAL_2(173),
-
-    TRIBAL_3(174),
-
-    TRIBAL_4(175),
-
-    TRIBAL_5(176),
-
-    TRIBAL_6(177),
-
-    TWISTED_LINES_1(178),
-
-    TWISTED_LINES_2(179),
-
-    VINE(180),
-
-    WAVELINE(181),
-
-    WEAVING_ANGLES(182),
-
-    WEAVING_BRAID(183),
-
-    WEAVING_RIBBON(184),
-
-    WEAVING_STRIPS(185),
-
-    WHITE_FLOWERS(186),
-
-    WOODWORK(187),
-
-    X_ILLUSIONS(188),
-
-    ZANY_TRIANGLES(189),
-
-    ZIG_ZAG(190),
-
-    ZIG_ZAG_STITCH(191);
-
-    private static Map<Integer, Borders> imap = new HashMap<Integer, Borders>();
-
-    static {
-        for (Borders p : values()) {
-            imap.put(Integer.valueOf(p.getValue()), p);
-        }
-    }
-
-    private final int value;
-
-    private Borders(int val) {
-        value = val;
-    }
-
-    public static Borders valueOf(int type) {
-        Borders pBorder = imap.get(Integer.valueOf(type));
-        if (pBorder == null) {
-            throw new IllegalArgumentException("Unknown paragraph border: " + type);
-        }
-        return pBorder;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java
deleted file mode 100644
index e44bb3b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies the set of possible restart locations which may be used as to
- * determine the next available line when a break's type attribute has a value
- * of textWrapping.
- *
- * @author Gisella Bronzetti
- */
-public enum BreakClear {
-
-    /**
-     * Specifies that the text wrapping break shall advance the text to the next
-     * line in the WordprocessingML document, regardless of its position left to
-     * right or the presence of any floating objects which intersect with the
-     * line,
-     * <p/>
-     * This is the setting for a typical line break in a document.
-     */
-
-    NONE(1),
-
-    /**
-     * Specifies that the text wrapping break shall behave as follows:
-     * <ul>
-     * <li> If this line is broken into multiple regions (a floating object in
-     * the center of the page has text wrapping on both sides:
-     * <ul>
-     * <li> If this is the leftmost region of text flow on this line, advance
-     * the text to the next position on the line </li>
-     * <li>Otherwise, treat this as a text wrapping break of type all. </li>
-     * </ul>
-     * </li>
-     * <li> If this line is not broken into multiple regions, then treat this
-     * break as a text wrapping break of type none. </li>
-     * </ul>
-     * <li> If the parent paragraph is right to left, then these behaviors are
-     * also reversed. </li>
-     */
-    LEFT(2),
-
-    /**
-     * Specifies that the text wrapping break shall behave as follows:
-     * <ul>
-     * <li> If this line is broken into multiple regions (a floating object in
-     * the center of the page has text wrapping on both sides:
-     * <ul>
-     * <li> If this is the rightmost region of text flow on this line, advance
-     * the text to the next position on the next line </li>
-     * <li> Otherwise, treat this as a text wrapping break of type all. </li>
-     * </ul>
-     * <li> If this line is not broken into multiple regions, then treat this
-     * break as a text wrapping break of type none. </li>
-     * <li> If the parent paragraph is right to left, then these beha viors are
-     * also reversed. </li>
-     * </ul>
-     */
-    RIGHT(3),
-
-    /**
-     * Specifies that the text wrapping break shall advance the text to the next
-     * line in the WordprocessingML document which spans the full width of the
-     * line.
-     */
-    ALL(4);
-
-    private static Map<Integer, BreakClear> imap = new HashMap<Integer, BreakClear>();
-
-    static {
-        for (BreakClear p : values()) {
-            imap.put(p.getValue(), p);
-        }
-    }
-
-    private final int value;
-
-    private BreakClear(int val) {
-        value = val;
-    }
-
-    public static BreakClear valueOf(int type) {
-        BreakClear bType = imap.get(type);
-        if (bType == null)
-            throw new IllegalArgumentException("Unknown break clear type: "
-                    + type);
-        return bType;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java
deleted file mode 100644
index 30fc939..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies the possible types of break characters in a WordprocessingML
- * document.
- * The break type determines the next location where text shall be
- * placed after this manual break is applied to the text contents
- *
- * @author Gisella Bronzetti
- */
-public enum BreakType {
-
-
-    /**
-     * Specifies that the current break shall restart itself on the next page of
-     * the document when the document is displayed in page view.
-     */
-    PAGE(1),
-
-    /**
-     * Specifies that the current break shall restart itself on the next column
-     * available on the current page when the document is displayed in page
-     * view.
-     * <p>
-     * If the current section is not divided into columns, or the column break
-     * occurs in the last column on the current page when displayed, then the
-     * restart location for text shall be the next page in the document.
-     * </p>
-     */
-    COLUMN(2),
-
-    /**
-     * Specifies that the current break shall restart itself on the next line in
-     * the document when the document is displayed in page view.
-     * The determine of the next line shall be done subject to the value of the clear
-     * attribute on the specified break character.
-     */
-    TEXT_WRAPPING(3);
-
-    private static Map<Integer, BreakType> imap = new HashMap<Integer, BreakType>();
-
-    static {
-        for (BreakType p : values()) {
-            imap.put(p.getValue(), p);
-        }
-    }
-
-    private final int value;
-
-    private BreakType(int val) {
-        value = val;
-    }
-
-    public static BreakType valueOf(int type) {
-        BreakType bType = imap.get(type);
-        if (bType == null)
-            throw new IllegalArgumentException("Unknown break type: "
-                    + type);
-        return bType;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java
deleted file mode 100644
index 077697a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-public interface Document {
-    /**
-     * Extended windows meta file
-     */
-    public static final int PICTURE_TYPE_EMF = 2;
-
-    /**
-     * Windows Meta File
-     */
-    public static final int PICTURE_TYPE_WMF = 3;
-
-    /**
-     * Mac PICT format
-     */
-    public static final int PICTURE_TYPE_PICT = 4;
-
-    /**
-     * JPEG format
-     */
-    public static final int PICTURE_TYPE_JPEG = 5;
-
-    /**
-     * PNG format
-     */
-    public static final int PICTURE_TYPE_PNG = 6;
-
-    /**
-     * Device independent bitmap
-     */
-    public static final int PICTURE_TYPE_DIB = 7;
-
-    /**
-     * GIF image format
-     */
-    public static final int PICTURE_TYPE_GIF = 8;
-
-    /**
-     * Tag Image File (.tiff)
-     */
-    public static final int PICTURE_TYPE_TIFF = 9;
-
-    /**
-     * Encapsulated Postscript (.eps)
-     */
-    public static final int PICTURE_TYPE_EPS = 10;
-
-
-    /**
-     * Windows Bitmap (.bmp)
-     */
-    public static final int PICTURE_TYPE_BMP = 11;
-
-    /**
-     * WordPerfect graphics (.wpg)
-     */
-    public static final int PICTURE_TYPE_WPG = 12;
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java
deleted file mode 100644
index 6e9ce05..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.xmlbeans.XmlCursor;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-
-/**
- * <p>An IBody represents the different parts of the document which
- * can contain collections of Paragraphs and Tables. It provides a
- * common way to work with these and their contents.</p>
- * <p>Typically, this is something like a XWPFDocument, or one of
- * the parts in it like XWPFHeader, XWPFFooter, XWPFTableCell
- * </p>
- */
-public interface IBody {
-    /**
-     * returns the Part, to which the body belongs, which you need for adding relationship to other parts
-     * Actually it is needed of the class XWPFTableCell. Because you have to know to which part the tableCell
-     * belongs.
-     *
-     * @return the Part, to which the body belongs
-     */
-    public POIXMLDocumentPart getPart();
-
-    /**
-     * get the PartType of the body, for example
-     * DOCUMENT, HEADER, FOOTER, FOOTNOTE,
-     *
-     * @return the PartType of the body
-     */
-    public BodyType getPartType();
-
-    /**
-     * Returns an Iterator with paragraphs and tables,
-     * in the order that they occur in the text.
-     */
-    public List<IBodyElement> getBodyElements();
-
-    /**
-     * Returns the paragraph(s) that holds
-     * the text of the header or footer.
-     */
-    public List<XWPFParagraph> getParagraphs();
-
-    /**
-     * Return the table(s) that holds the text
-     * of the IBodyPart, for complex cases
-     * where a paragraph isn't used.
-     */
-    public List<XWPFTable> getTables();
-
-    /**
-     * if there is a corresponding {@link XWPFParagraph} of the parameter ctTable in the paragraphList of this header or footer
-     * the method will return this paragraph
-     * if there is no corresponding {@link XWPFParagraph} the method will return null
-     *
-     * @param p is instance of CTP and is searching for an XWPFParagraph
-     * @return null if there is no XWPFParagraph with an corresponding CTPparagraph in the paragraphList of this header or footer
-     * XWPFParagraph with the correspondig CTP p
-     */
-    public XWPFParagraph getParagraph(CTP p);
-
-    /**
-     * if there is a corresponding {@link XWPFTable} of the parameter ctTable in the tableList of this header
-     * the method will return this table
-     * if there is no corresponding {@link XWPFTable} the method will return null
-     *
-     * @param ctTable
-     */
-    public XWPFTable getTable(CTTbl ctTable);
-
-    /**
-     * Returns the paragraph that of position pos
-     */
-    public XWPFParagraph getParagraphArray(int pos);
-
-    /**
-     * Returns the table at position pos
-     */
-    public XWPFTable getTableArray(int pos);
-
-    /**
-     * inserts a new paragraph at position of the cursor
-     *
-     * @param cursor
-     */
-    public XWPFParagraph insertNewParagraph(XmlCursor cursor);
-
-    /**
-     * inserts a new Table at the cursor position.
-     *
-     * @param cursor
-     */
-    public XWPFTable insertNewTbl(XmlCursor cursor);
-
-    /**
-     * inserts a new Table at position pos
-     *
-     * @param pos
-     * @param table
-     */
-    void insertTable(int pos, XWPFTable table);
-
-    /**
-     * returns the TableCell to which the Table belongs
-     *
-     * @param cell
-     */
-    public XWPFTableCell getTableCell(CTTc cell);
-
-    /**
-     * Return XWPFDocument
-     */
-    public XWPFDocument getXWPFDocument();
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBodyElement.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
deleted file mode 100644
index 312ea49..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.POIXMLDocumentPart;
-
-/**
- * 9 Jan 2010
- *
- * @author Philipp Epp
- */
-public interface IBodyElement {
-    IBody getBody();
-
-    POIXMLDocumentPart getPart();
-
-    BodyType getPartType();
-
-    BodyElementType getElementType();
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ICell.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ICell.java
deleted file mode 100644
index 0ac12c7..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ICell.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-/**
- * Interface for anything that can be at a table cell level:
- * {@link XWPFTableCell}, {@link XWPFSDTCell}
- * <p/>
- * Schematically something like this:
- * &lt;tr&gt;&lt;tc/&gt;&lt;tc/&gt;&lt;sdt&gt&lt;tc/&gt;&lt;/sdt&gt;&lt;/tr&gt;
- */
-public interface ICell {
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java
deleted file mode 100644
index fea7856..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.wp.usermodel.Paragraph;
-
-/**
- * Simple interface describing both {@link XWPFParagraph}
- * and {@link XWPFSDT}
- * <p/>
- * TODO Should this be based on / extend {@link Paragraph}?
- */
-public interface IRunBody {
-    public XWPFDocument getDocument();
-
-    public POIXMLDocumentPart getPart();
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunElement.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunElement.java
deleted file mode 100644
index e8d1b83..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunElement.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.wp.usermodel.CharacterRun;
-
-/**
- * Common interface for things that can occur
- * where a run (text with common stylings) can,
- * eg {@link XWPFRun} or {@link XWPFSDT}.
- * TODO More methods to follow shortly!
- * <p/>
- * TODO Make this based on {@link CharacterRun}
- */
-public interface IRunElement {}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContent.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
deleted file mode 100644
index 5493ff3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-
-/**
- * Experimental interface to offer rudimentary read-only processing of
- * of the contentblock of an SDT/ContentControl.
- * <p/>
- * <p/>
- * <p/>
- * WARNING - APIs expected to change rapidly
- */
-public interface ISDTContent {
-
-    public String getText();
-
-    public String toString();
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
deleted file mode 100644
index 66922b8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-/**
- * Interface for anything that can be within an SDT:
- * {@link XWPFRun}, {@link XWPFTable}, {@link XWPFParagraph},
- * {@link XWPFSDT} etc
- */
-public interface ISDTContents {
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
deleted file mode 100644
index b52d2c3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies the logic which shall be used to calculate the line spacing of the
- * parent object when it is displayed in the document.
- *
- * @author Gisella Bronzetti
- */
-public enum LineSpacingRule {
-
-    /**
-     * Specifies that the line spacing of the parent object shall be
-     * automatically determined by the size of its contents, with no
-     * predetermined minimum or maximum size.
-     */
-
-    AUTO(1),
-
-    /**
-     * Specifies that the height of the line shall be exactly the value
-     * specified, regardless of the size of the contents If the contents are too
-     * large for the specified height, then they shall be clipped as necessary.
-     */
-    EXACT(2),
-
-    /**
-     * Specifies that the height of the line shall be at least the value
-     * specified, but may be expanded to fit its content as needed.
-     */
-    AT_LEAST(3);
-
-
-    private static Map<Integer, LineSpacingRule> imap = new HashMap<Integer, LineSpacingRule>();
-
-    static {
-        for (LineSpacingRule p : values()) {
-            imap.put(p.getValue(), p);
-        }
-    }
-
-    private final int value;
-
-    private LineSpacingRule(int val) {
-        value = val;
-    }
-
-    public static LineSpacingRule valueOf(int type) {
-        LineSpacingRule lineType = imap.get(type);
-        if (lineType == null)
-            throw new IllegalArgumentException("Unknown line type: " + type);
-        return lineType;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
deleted file mode 100644
index 7cffb30..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies all types of alignment which are available to be applied to objects in a
- * WordprocessingML document
- *
- * @author Yegor Kozlov
- */
-public enum ParagraphAlignment {
-    //YK: TODO document each alignment option
-
-    LEFT(1),
-    CENTER(2),
-    RIGHT(3),
-    BOTH(4),
-    MEDIUM_KASHIDA(5),
-    DISTRIBUTE(6),
-    NUM_TAB(7),
-    HIGH_KASHIDA(8),
-    LOW_KASHIDA(9),
-    THAI_DISTRIBUTE(10);
-
-    private static Map<Integer, ParagraphAlignment> imap = new HashMap<Integer, ParagraphAlignment>();
-
-    static {
-        for (ParagraphAlignment p : values()) {
-            imap.put(p.getValue(), p);
-        }
-    }
-
-    private final int value;
-
-    private ParagraphAlignment(int val) {
-        value = val;
-    }
-
-    public static ParagraphAlignment valueOf(int type) {
-        ParagraphAlignment err = imap.get(type);
-        if (err == null) throw new IllegalArgumentException("Unknown paragraph alignment: " + type);
-        return err;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
deleted file mode 100644
index 4eebe41..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-
-/**
- * postion of a character in a paragrapho
- * 1st RunPositon
- * 2nd TextPosition
- * 3rd CharacterPosition
- */
-public class PositionInParagraph {
-    private int posRun = 0, posText = 0, posChar = 0;
-
-    public PositionInParagraph() {
-    }
-
-    public PositionInParagraph(int posRun, int posText, int posChar) {
-        this.posRun = posRun;
-        this.posChar = posChar;
-        this.posText = posText;
-    }
-
-    public int getRun() {
-        return posRun;
-    }
-
-    public void setRun(int beginRun) {
-        this.posRun = beginRun;
-    }
-
-    public int getText() {
-        return posText;
-    }
-
-    public void setText(int beginText) {
-        this.posText = beginText;
-    }
-
-    public int getChar() {
-        return posChar;
-    }
-
-    public void setChar(int beginChar) {
-        this.posChar = beginChar;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TOC.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TOC.java
deleted file mode 100644
index a75fc84..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TOC.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.math.BigInteger;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.xmlbeans.impl.xb.xmlschema.SpaceAttribute.Space;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDecimalNumber;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFonts;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtContentBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtEndPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTabStop;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTabs;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STFldCharType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTabJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTabTlc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTheme;
-
-public class TOC {
-
-    CTSdtBlock block;
-
-    public TOC() {
-        this(CTSdtBlock.Factory.newInstance());
-    }
-
-    public TOC(CTSdtBlock block) {
-        this.block = block;
-        CTSdtPr sdtPr = block.addNewSdtPr();
-        CTDecimalNumber id = sdtPr.addNewId();
-        id.setVal(new BigInteger("4844945"));
-        sdtPr.addNewDocPartObj().addNewDocPartGallery().setVal("Table of contents");
-        CTSdtEndPr sdtEndPr = block.addNewSdtEndPr();
-        CTRPr rPr = sdtEndPr.addNewRPr();
-        CTFonts fonts = rPr.addNewRFonts();
-        fonts.setAsciiTheme(STTheme.MINOR_H_ANSI);
-        fonts.setEastAsiaTheme(STTheme.MINOR_H_ANSI);
-        fonts.setHAnsiTheme(STTheme.MINOR_H_ANSI);
-        fonts.setCstheme(STTheme.MINOR_BIDI);
-        rPr.addNewB().setVal(STOnOff.OFF);
-        rPr.addNewBCs().setVal(STOnOff.OFF);
-        rPr.addNewColor().setVal("auto");
-        rPr.addNewSz().setVal(new BigInteger("24"));
-        rPr.addNewSzCs().setVal(new BigInteger("24"));
-        CTSdtContentBlock content = block.addNewSdtContent();
-        CTP p = content.addNewP();
-        p.setRsidR("00EF7E24".getBytes(LocaleUtil.CHARSET_1252));
-        p.setRsidRDefault("00EF7E24".getBytes(LocaleUtil.CHARSET_1252));
-        p.addNewPPr().addNewPStyle().setVal("TOCHeading");
-        p.addNewR().addNewT().setStringValue("Table of Contents");
-    }
-
-    @Internal
-    public CTSdtBlock getBlock() {
-        return this.block;
-    }
-
-    public void addRow(int level, String title, int page, String bookmarkRef) {
-        CTSdtContentBlock contentBlock = this.block.getSdtContent();
-        CTP p = contentBlock.addNewP();
-        p.setRsidR("00EF7E24".getBytes(LocaleUtil.CHARSET_1252));
-        p.setRsidRDefault("00EF7E24".getBytes(LocaleUtil.CHARSET_1252));
-        CTPPr pPr = p.addNewPPr();
-        pPr.addNewPStyle().setVal("TOC" + level);
-        CTTabs tabs = pPr.addNewTabs();
-        CTTabStop tab = tabs.addNewTab();
-        tab.setVal(STTabJc.RIGHT);
-        tab.setLeader(STTabTlc.DOT);
-        tab.setPos(new BigInteger("8290"));
-        pPr.addNewRPr().addNewNoProof();
-        CTR run = p.addNewR();
-        run.addNewRPr().addNewNoProof();
-        run.addNewT().setStringValue(title);
-        run = p.addNewR();
-        run.addNewRPr().addNewNoProof();
-        run.addNewTab();
-        run = p.addNewR();
-        run.addNewRPr().addNewNoProof();
-        run.addNewFldChar().setFldCharType(STFldCharType.BEGIN);
-        // pageref run
-        run = p.addNewR();
-        run.addNewRPr().addNewNoProof();
-        CTText text = run.addNewInstrText();
-        text.setSpace(Space.PRESERVE);
-        // bookmark reference
-        text.setStringValue(" PAGEREF _Toc" + bookmarkRef + " \\h ");
-        p.addNewR().addNewRPr().addNewNoProof();
-        run = p.addNewR();
-        run.addNewRPr().addNewNoProof();
-        run.addNewFldChar().setFldCharType(STFldCharType.SEPARATE);
-        // page number run
-        run = p.addNewR();
-        run.addNewRPr().addNewNoProof();
-        run.addNewT().setStringValue(Integer.toString(page));
-        run = p.addNewR();
-        run.addNewRPr().addNewNoProof();
-        run.addNewFldChar().setFldCharType(STFldCharType.END);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
deleted file mode 100644
index 1cc6434..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies all types of vertical alignment which are available to be applied to of all text
- * on each line displayed within a paragraph.
- *
- * @author Gisella Bronzetti
- */
-public enum TextAlignment {
-    /**
-     * Specifies that all text in the parent object shall be
-     * aligned to the top of each character when displayed
-     */
-    TOP(1),
-    /**
-     * Specifies that all text in the parent object shall be
-     * aligned to the center of each character when displayed.
-     */
-    CENTER(2),
-    /**
-     * Specifies that all text in the parent object shall be
-     * aligned to the baseline of each character when displayed.
-     */
-    BASELINE(3),
-    /**
-     * Specifies that all text in the parent object shall be
-     * aligned to the bottom of each character when displayed.
-     */
-    BOTTOM(4),
-    /**
-     * Specifies that all text in the parent object shall be
-     * aligned automatically when displayed.
-     */
-    AUTO(5);
-
-    private static Map<Integer, TextAlignment> imap = new HashMap<Integer, TextAlignment>();
-
-    static {
-        for (TextAlignment p : values()) {
-            imap.put(p.getValue(), p);
-        }
-    }
-
-    private final int value;
-
-    private TextAlignment(int val) {
-        value = val;
-    }
-
-    public static TextAlignment valueOf(int type) {
-        TextAlignment align = imap.get(type);
-        if (align == null) throw new IllegalArgumentException("Unknown text alignment: " + type);
-        return align;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegement.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegement.java
deleted file mode 100644
index 44477da..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegement.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-
-/**
- * saves the begin and end position  of a text in a Paragraph
- */
-public class TextSegement {
-    private PositionInParagraph beginPos;
-    private PositionInParagraph endPos;
-
-    public TextSegement() {
-        this.beginPos = new PositionInParagraph();
-        this.endPos = new PositionInParagraph();
-    }
-
-    public TextSegement(int beginRun, int endRun, int beginText, int endText, int beginChar, int endChar) {
-        PositionInParagraph beginPos = new PositionInParagraph(beginRun, beginText, beginChar);
-        PositionInParagraph endPos = new PositionInParagraph(endRun, endText, endChar);
-        this.beginPos = beginPos;
-        this.endPos = endPos;
-    }
-
-    public TextSegement(PositionInParagraph beginPos, PositionInParagraph endPos) {
-        this.beginPos = beginPos;
-        this.endPos = endPos;
-    }
-
-    public PositionInParagraph getBeginPos() {
-        return beginPos;
-    }
-
-    public PositionInParagraph getEndPos() {
-        return endPos;
-    }
-
-    public int getBeginRun() {
-        return beginPos.getRun();
-    }
-
-    public void setBeginRun(int beginRun) {
-        beginPos.setRun(beginRun);
-    }
-
-    public int getBeginText() {
-        return beginPos.getText();
-    }
-
-    public void setBeginText(int beginText) {
-        beginPos.setText(beginText);
-    }
-
-    public int getBeginChar() {
-        return beginPos.getChar();
-    }
-
-    public void setBeginChar(int beginChar) {
-        beginPos.setChar(beginChar);
-    }
-
-    public int getEndRun() {
-        return endPos.getRun();
-    }
-
-    public void setEndRun(int endRun) {
-        endPos.setRun(endRun);
-    }
-
-    public int getEndText() {
-        return endPos.getText();
-    }
-
-    public void setEndText(int endText) {
-        endPos.setText(endText);
-    }
-
-    public int getEndChar() {
-        return endPos.getChar();
-    }
-
-    public void setEndChar(int endChar) {
-        endPos.setChar(endChar);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
deleted file mode 100644
index c99b17b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies the types of patterns which may be used to create the underline
- * applied beneath the text in a run.
- *
- * @author Gisella Bronzetti
- */
-public enum UnderlinePatterns {
-
-    /**
-     * Specifies an underline consisting of a single line beneath all characters
-     * in this run.
-     */
-    SINGLE(1),
-
-    /**
-     * Specifies an underline consisting of a single line beneath all non-space
-     * characters in the run. There shall be no underline beneath any space
-     * character (breaking or non-breaking).
-     */
-    WORDS(2),
-
-    /**
-     * Specifies an underline consisting of two lines beneath all characters in
-     * this run
-     */
-    DOUBLE(3),
-
-    /**
-     * Specifies an underline consisting of a single thick line beneath all
-     * characters in this run.
-     */
-    THICK(4),
-
-    /**
-     * Specifies an underline consisting of a series of dot characters beneath
-     * all characters in this run.
-     */
-    DOTTED(5),
-
-    /**
-     * Specifies an underline consisting of a series of thick dot characters
-     * beneath all characters in this run.
-     */
-    DOTTED_HEAVY(6),
-
-    /**
-     * Specifies an underline consisting of a dashed line beneath all characters
-     * in this run.
-     */
-    DASH(7),
-
-    /**
-     * Specifies an underline consisting of a series of thick dashes beneath all
-     * characters in this run.
-     */
-    DASHED_HEAVY(8),
-
-    /**
-     * Specifies an underline consisting of long dashed characters beneath all
-     * characters in this run.
-     */
-    DASH_LONG(9),
-
-    /**
-     * Specifies an underline consisting of thick long dashed characters beneath
-     * all characters in this run.
-     */
-    DASH_LONG_HEAVY(10),
-
-    /**
-     * Specifies an underline consisting of a series of dash, dot characters
-     * beneath all characters in this run.
-     */
-    DOT_DASH(11),
-
-    /**
-     * Specifies an underline consisting of a series of thick dash, dot
-     * characters beneath all characters in this run.
-     */
-    DASH_DOT_HEAVY(12),
-
-    /**
-     * Specifies an underline consisting of a series of dash, dot, dot
-     * characters beneath all characters in this run.
-     */
-    DOT_DOT_DASH(13),
-
-    /**
-     * Specifies an underline consisting of a series of thick dash, dot, dot
-     * characters beneath all characters in this run.
-     */
-    DASH_DOT_DOT_HEAVY(14),
-
-    /**
-     * Specifies an underline consisting of a single wavy line beneath all
-     * characters in this run.
-     */
-    WAVE(15),
-
-    /**
-     * Specifies an underline consisting of a single thick wavy line beneath all
-     * characters in this run.
-     */
-    WAVY_HEAVY(16),
-
-    /**
-     * Specifies an underline consisting of a pair of wavy lines beneath all
-     * characters in this run.
-     */
-    WAVY_DOUBLE(17),
-
-    /**
-     * Specifies no underline beneath this run.
-     */
-    NONE(18);
-
-    private static Map<Integer, UnderlinePatterns> imap = new HashMap<Integer, UnderlinePatterns>();
-
-    static {
-        for (UnderlinePatterns p : values()) {
-            imap.put(p.getValue(), p);
-        }
-    }
-
-    private final int value;
-
-    private UnderlinePatterns(int val) {
-        value = val;
-    }
-
-    public static UnderlinePatterns valueOf(int type) {
-        UnderlinePatterns align = imap.get(type);
-        if (align == null)
-            throw new IllegalArgumentException("Unknown underline pattern: "
-                    + type);
-        return align;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
deleted file mode 100644
index 7b7538d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies possible values for the alignment of the contents of this run in
- * relation to the default appearance of the run's text. This allows the text to
- * be repositioned as subscript or superscript without altering the font size of
- * the run properties.
- *
- * @author Gisella Bronzetti
- */
-public enum VerticalAlign {
-
-    /**
-     * Specifies that the text in the parent run shall be located at the
-     * baseline and presented in the same size as surrounding text.
-     */
-    BASELINE(1),
-    /**
-     * Specifies that this text should be subscript. This setting shall lower
-     * the text in this run below the baseline and change it to a smaller size,
-     * if a smaller size is available.
-     */
-    SUPERSCRIPT(2),
-    /**
-     * Specifies that this text should be superscript. This setting shall raise
-     * the text in this run above the baseline and change it to a smaller size,
-     * if a smaller size is available.
-     */
-    SUBSCRIPT(3);
-
-    private static Map<Integer, VerticalAlign> imap = new HashMap<Integer, VerticalAlign>();
-
-    static {
-        for (VerticalAlign p : values()) {
-            imap.put(p.getValue(), p);
-        }
-    }
-
-    private final int value;
-
-    private VerticalAlign(int val) {
-        value = val;
-    }
-
-    public static VerticalAlign valueOf(int type) {
-        VerticalAlign align = imap.get(type);
-        if (align == null)
-            throw new IllegalArgumentException("Unknown vertical alignment: "
-                    + type);
-        return align;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
deleted file mode 100644
index 8d4886b..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
-
-/**
- * @author Philipp Epp
- */
-public class XWPFAbstractNum {
-    protected XWPFNumbering numbering;
-    private CTAbstractNum ctAbstractNum;
-
-    protected XWPFAbstractNum() {
-        this.ctAbstractNum = null;
-        this.numbering = null;
-
-    }
-
-    public XWPFAbstractNum(CTAbstractNum abstractNum) {
-        this.ctAbstractNum = abstractNum;
-    }
-
-    public XWPFAbstractNum(CTAbstractNum ctAbstractNum, XWPFNumbering numbering) {
-        this.ctAbstractNum = ctAbstractNum;
-        this.numbering = numbering;
-    }
-
-    public CTAbstractNum getAbstractNum() {
-        return ctAbstractNum;
-    }
-
-    public XWPFNumbering getNumbering() {
-        return numbering;
-    }
-
-    public void setNumbering(XWPFNumbering numbering) {
-        this.numbering = numbering;
-    }
-
-    public CTAbstractNum getCTAbstractNum() {
-        return ctAbstractNum;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
deleted file mode 100644
index 5f7fa5d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTComment;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-
-/**
- * Sketch of XWPF comment class
- *
- * @author Yury Batrakov (batrakov at gmail.com)
- */
-public class XWPFComment {
-    protected String id;
-    protected String author;
-    protected StringBuffer text;
-
-    public XWPFComment(CTComment comment, XWPFDocument document) {
-        text = new StringBuffer();
-        id = comment.getId().toString();
-        author = comment.getAuthor();
-
-        for (CTP ctp : comment.getPArray()) {
-            XWPFParagraph p = new XWPFParagraph(ctp, document);
-            text.append(p.getText());
-        }
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public String getText() {
-        return text.toString();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
deleted file mode 100644
index a430c87..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
-
-/**
- * Default Paragraph style, from which other styles will override
- * TODO Share logic with {@link XWPFParagraph} which also uses CTPPr
- */
-public class XWPFDefaultParagraphStyle {
-    private CTPPr ppr;
-
-    public XWPFDefaultParagraphStyle(CTPPr ppr) {
-        this.ppr = ppr;
-    }
-
-    protected CTPPr getPPr() {
-        return ppr;
-    }
-
-    public int getSpacingAfter() {
-        if (ppr.isSetSpacing())
-            return ppr.getSpacing().getAfter().intValue();
-        return -1;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
deleted file mode 100644
index 459335d..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
-
-/**
- * Default Character Run style, from which other styles will override
- * TODO Share logic with {@link XWPFRun} which also uses CTRPr
- */
-public class XWPFDefaultRunStyle {
-    private CTRPr rpr;
-
-    public XWPFDefaultRunStyle(CTRPr rpr) {
-        this.rpr = rpr;
-    }
-
-    protected CTRPr getRPr() {
-        return rpr;
-    }
-
-    public int getFontSize() {
-        if (rpr.isSetSz())
-            return rpr.getSz().getVal().intValue() / 2;
-        return -1;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
deleted file mode 100644
index 9afde2c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ /dev/null
@@ -1,1564 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocument;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.POIXMLProperties;
-import org.apache.poi.POIXMLRelation;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.IdentifierManager;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.PackageHelper;
-import org.apache.poi.wp.usermodel.HeaderFooterType;
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
-
-/**
- * <p>High(ish) level class for working with .docx files.</p>
- * <p/>
- * <p>This class tries to hide some of the complexity
- * of the underlying file format, but as it's not a
- * mature and stable API yet, certain parts of the
- * XML structure come through. You'll therefore almost
- * certainly need to refer to the OOXML specifications
- * from
- * http://www.ecma-international.org/publications/standards/Ecma-376.htm
- * at some point in your use.</p>
- */
-public class XWPFDocument extends POIXMLDocument implements Document, IBody {
-    private static final POILogger LOG = POILogFactory.getLogger(XWPFDocument.class);
-    
-    protected List<XWPFFooter> footers = new ArrayList<XWPFFooter>();
-    protected List<XWPFHeader> headers = new ArrayList<XWPFHeader>();
-    protected List<XWPFComment> comments = new ArrayList<XWPFComment>();
-    protected List<XWPFHyperlink> hyperlinks = new ArrayList<XWPFHyperlink>();
-    protected List<XWPFParagraph> paragraphs = new ArrayList<XWPFParagraph>();
-    protected List<XWPFTable> tables = new ArrayList<XWPFTable>();
-    protected List<XWPFSDT> contentControls = new ArrayList<XWPFSDT>();
-    protected List<IBodyElement> bodyElements = new ArrayList<IBodyElement>();
-    protected List<XWPFPictureData> pictures = new ArrayList<XWPFPictureData>();
-    protected Map<Long, List<XWPFPictureData>> packagePictures = new HashMap<Long, List<XWPFPictureData>>();
-    protected Map<Integer, XWPFFootnote> endnotes = new HashMap<Integer, XWPFFootnote>();
-    protected XWPFNumbering numbering;
-    protected XWPFStyles styles;
-    protected XWPFFootnotes footnotes;
-    private CTDocument1 ctDocument;
-    private XWPFSettings settings;
-    /**
-     * Keeps track on all id-values used in this document and included parts, like headers, footers, etc.
-     */
-    private IdentifierManager drawingIdManager = new IdentifierManager(0L, 4294967295L);
-    /**
-     * Handles the joy of different headers/footers for different pages
-     */
-    private XWPFHeaderFooterPolicy headerFooterPolicy;
-
-    public XWPFDocument(OPCPackage pkg) throws IOException {
-        super(pkg);
-
-        //build a tree of POIXMLDocumentParts, this document being the root
-        load(XWPFFactory.getInstance());
-    }
-
-    public XWPFDocument(InputStream is) throws IOException {
-        super(PackageHelper.open(is));
-
-        //build a tree of POIXMLDocumentParts, this workbook being the root
-        load(XWPFFactory.getInstance());
-    }
-
-    public XWPFDocument() {
-        super(newPackage());
-        onDocumentCreate();
-    }
-
-    /**
-     * Create a new WordProcessingML package and setup the default minimal content
-     */
-    protected static OPCPackage newPackage() {
-        try {
-            OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream());
-            // Main part
-            PackagePartName corePartName = PackagingURIHelper.createPartName(XWPFRelation.DOCUMENT.getDefaultFileName());
-            // Create main part relationship
-            pkg.addRelationship(corePartName, TargetMode.INTERNAL, PackageRelationshipTypes.CORE_DOCUMENT);
-            // Create main document part
-            pkg.createPart(corePartName, XWPFRelation.DOCUMENT.getContentType());
-
-            pkg.getPackageProperties().setCreatorProperty(DOCUMENT_CREATOR);
-
-            return pkg;
-        } catch (Exception e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    protected void onDocumentRead() throws IOException {
-        try {
-            DocumentDocument doc = DocumentDocument.Factory.parse(getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-            ctDocument = doc.getDocument();
-
-            initFootnotes();
-
-            // parse the document with cursor and add
-            // the XmlObject to its lists
-            XmlCursor cursor = ctDocument.getBody().newCursor();
-            cursor.selectPath("./*");
-            while (cursor.toNextSelection()) {
-                XmlObject o = cursor.getObject();
-                if (o instanceof CTP) {
-                    XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                    bodyElements.add(p);
-                    paragraphs.add(p);
-                } else if (o instanceof CTTbl) {
-                    XWPFTable t = new XWPFTable((CTTbl) o, this);
-                    bodyElements.add(t);
-                    tables.add(t);
-                } else if (o instanceof CTSdtBlock) {
-                    XWPFSDT c = new XWPFSDT((CTSdtBlock) o, this);
-                    bodyElements.add(c);
-                    contentControls.add(c);
-                }
-            }
-            cursor.dispose();
-
-            // Sort out headers and footers
-            if (doc.getDocument().getBody().getSectPr() != null)
-                headerFooterPolicy = new XWPFHeaderFooterPolicy(this);
-
-            // Create for each XML-part in the Package a PartClass
-            for (RelationPart rp : getRelationParts()) {
-                POIXMLDocumentPart p = rp.getDocumentPart();
-                String relation = rp.getRelationship().getRelationshipType();
-                if (relation.equals(XWPFRelation.STYLES.getRelation())) {
-                    this.styles = (XWPFStyles) p;
-                    this.styles.onDocumentRead();
-                } else if (relation.equals(XWPFRelation.NUMBERING.getRelation())) {
-                    this.numbering = (XWPFNumbering) p;
-                    this.numbering.onDocumentRead();
-                } else if (relation.equals(XWPFRelation.FOOTER.getRelation())) {
-                    XWPFFooter footer = (XWPFFooter) p;
-                    footers.add(footer);
-                    footer.onDocumentRead();
-                } else if (relation.equals(XWPFRelation.HEADER.getRelation())) {
-                    XWPFHeader header = (XWPFHeader) p;
-                    headers.add(header);
-                    header.onDocumentRead();
-                } else if (relation.equals(XWPFRelation.COMMENT.getRelation())) {
-                    // TODO Create according XWPFComment class, extending POIXMLDocumentPart
-                    CommentsDocument cmntdoc = CommentsDocument.Factory.parse(p.getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-                    for (CTComment ctcomment : cmntdoc.getComments().getCommentArray()) {
-                        comments.add(new XWPFComment(ctcomment, this));
-                    }
-                } else if (relation.equals(XWPFRelation.SETTINGS.getRelation())) {
-                    settings = (XWPFSettings) p;
-                    settings.onDocumentRead();
-                } else if (relation.equals(XWPFRelation.IMAGES.getRelation())) {
-                    XWPFPictureData picData = (XWPFPictureData) p;
-                    picData.onDocumentRead();
-                    registerPackagePictureData(picData);
-                    pictures.add(picData);
-                } else if (relation.equals(XWPFRelation.GLOSSARY_DOCUMENT.getRelation())) {
-                    // We don't currently process the glossary itself
-                    // Until we do, we do need to load the glossary child parts of it
-                    for (POIXMLDocumentPart gp : p.getRelations()) {
-                        // Trigger the onDocumentRead for all the child parts
-                        // Otherwise we'll hit issues on Styles, Settings etc on save
-                        // TODO: Refactor this to not need to access protected method
-                        // from other package! Remove the static helper method once fixed!!!
-                        POIXMLDocumentPart._invokeOnDocumentRead(gp);
-                    }
-                }
-            }
-            initHyperlinks();
-        } catch (XmlException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    private void initHyperlinks() {
-        // Get the hyperlinks
-        // TODO: make me optional/separated in private function
-        try {
-            Iterator<PackageRelationship> relIter =
-                    getPackagePart().getRelationshipsByType(XWPFRelation.HYPERLINK.getRelation()).iterator();
-            while (relIter.hasNext()) {
-                PackageRelationship rel = relIter.next();
-                hyperlinks.add(new XWPFHyperlink(rel.getId(), rel.getTargetURI().toString()));
-            }
-        } catch (InvalidFormatException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    private void initFootnotes() throws XmlException, IOException {
-        for (RelationPart rp : getRelationParts()) {
-            POIXMLDocumentPart p = rp.getDocumentPart();
-            String relation = rp.getRelationship().getRelationshipType();
-            if (relation.equals(XWPFRelation.FOOTNOTE.getRelation())) {
-                this.footnotes = (XWPFFootnotes) p;
-                this.footnotes.onDocumentRead();
-            } else if (relation.equals(XWPFRelation.ENDNOTE.getRelation())) {
-                EndnotesDocument endnotesDocument = EndnotesDocument.Factory.parse(p.getPackagePart().getInputStream(), DEFAULT_XML_OPTIONS);
-
-                for (CTFtnEdn ctFtnEdn : endnotesDocument.getEndnotes().getEndnoteArray()) {
-                    endnotes.put(ctFtnEdn.getId().intValue(), new XWPFFootnote(this, ctFtnEdn));
-                }
-            }
-        }
-    }
-
-    /**
-     * Create a new CTWorkbook with all values set to default
-     */
-    @Override
-    protected void onDocumentCreate() {
-        ctDocument = CTDocument1.Factory.newInstance();
-        ctDocument.addNewBody();
-
-        settings = (XWPFSettings) createRelationship(XWPFRelation.SETTINGS, XWPFFactory.getInstance());
-
-        POIXMLProperties.ExtendedProperties expProps = getProperties().getExtendedProperties();
-        expProps.getUnderlyingProperties().setApplication(DOCUMENT_CREATOR);
-    }
-
-    /**
-     * Returns the low level document base object
-     */
-    @Internal
-    public CTDocument1 getDocument() {
-        return ctDocument;
-    }
-
-    IdentifierManager getDrawingIdManager() {
-        return drawingIdManager;
-    }
-
-    /**
-     * returns an Iterator with paragraphs and tables
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getBodyElements()
-     */
-    @Override
-    public List<IBodyElement> getBodyElements() {
-        return Collections.unmodifiableList(bodyElements);
-    }
-
-    public Iterator<IBodyElement> getBodyElementsIterator() {
-        return bodyElements.iterator();
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getParagraphs()
-     */
-    @Override
-    public List<XWPFParagraph> getParagraphs() {
-        return Collections.unmodifiableList(paragraphs);
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTables()
-     */
-    @Override
-    public List<XWPFTable> getTables() {
-        return Collections.unmodifiableList(tables);
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTableArray(int)
-     */
-    @Override
-    public XWPFTable getTableArray(int pos) {
-        if (pos >= 0 && pos < tables.size()) {
-            return tables.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * @return the list of footers
-     */
-    public List<XWPFFooter> getFooterList() {
-        return Collections.unmodifiableList(footers);
-    }
-
-    public XWPFFooter getFooterArray(int pos) {
-        if(pos >=0 && pos < footers.size()) {
-            return footers.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * @return the list of headers
-     */
-    public List<XWPFHeader> getHeaderList() {
-        return Collections.unmodifiableList(headers);
-    }
-
-    public XWPFHeader getHeaderArray(int pos) {
-        if(pos >=0 && pos < headers.size()) {
-            return headers.get(pos);
-        }
-        return null;
-    }
-
-    public String getTblStyle(XWPFTable table) {
-        return table.getStyleID();
-    }
-
-    public XWPFHyperlink getHyperlinkByID(String id) {
-        for (XWPFHyperlink link : hyperlinks) {
-            if (link.getId().equals(id))
-                return link;
-        }
-
-        return null;
-    }
-
-    public XWPFFootnote getFootnoteByID(int id) {
-        if (footnotes == null) return null;
-        return footnotes.getFootnoteById(id);
-    }
-
-    public XWPFFootnote getEndnoteByID(int id) {
-        if (endnotes == null) return null;
-        return endnotes.get(id);
-    }
-
-    public List<XWPFFootnote> getFootnotes() {
-        if (footnotes == null) {
-            return Collections.emptyList();
-        }
-        return footnotes.getFootnotesList();
-    }
-
-    public XWPFHyperlink[] getHyperlinks() {
-        return hyperlinks.toArray(new XWPFHyperlink[hyperlinks.size()]);
-    }
-
-    public XWPFComment getCommentByID(String id) {
-        for (XWPFComment comment : comments) {
-            if (comment.getId().equals(id))
-                return comment;
-        }
-
-        return null;
-    }
-
-    public XWPFComment[] getComments() {
-        return comments.toArray(new XWPFComment[comments.size()]);
-    }
-
-    /**
-     * Get the document part that's defined as the
-     * given relationship of the core document.
-     */
-    public PackagePart getPartById(String id) {
-        try {
-            PackagePart corePart = getCorePart();
-            return corePart.getRelatedPart(corePart.getRelationship(id));
-        } catch (InvalidFormatException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    /**
-     * Returns the policy on headers and footers, which
-     * also provides a way to get at them.
-     */
-    public XWPFHeaderFooterPolicy getHeaderFooterPolicy() {
-        return headerFooterPolicy;
-    }
-    public XWPFHeaderFooterPolicy createHeaderFooterPolicy() {
-        if (headerFooterPolicy == null) {
-//            if (! ctDocument.getBody().isSetSectPr()) {
-//                ctDocument.getBody().addNewSectPr();
-//            }
-            headerFooterPolicy = new XWPFHeaderFooterPolicy(this);
-        }
-        return headerFooterPolicy;
-    }
-    
-    /**
-     * Create a header of the given type
-     *
-     * @param type {@link HeaderFooterType} enum
-     * @return object of type {@link XWPFHeader}
-     */
-    public XWPFHeader createHeader(HeaderFooterType type) {
-        XWPFHeaderFooterPolicy hfPolicy = createHeaderFooterPolicy();
-        // TODO this needs to be migrated out into section code
-        if (type == HeaderFooterType.FIRST) {
-            CTSectPr ctSectPr = getSection();
-            if (ctSectPr.isSetTitlePg() == false) {
-                CTOnOff titlePg = ctSectPr.addNewTitlePg();
-                titlePg.setVal(STOnOff.ON);
-            }
-        // } else if (type == HeaderFooterType.EVEN) {
-            // TODO Add support for Even/Odd headings and footers
-        }
-        return hfPolicy.createHeader(STHdrFtr.Enum.forInt(type.toInt()));
-    }
-    
-    
-    /**
-     * Create a footer of the given type
-     *
-     * @param type {@link HeaderFooterType} enum
-     * @return object of type {@link XWPFFooter}
-     */
-    public XWPFFooter createFooter(HeaderFooterType type) {
-        XWPFHeaderFooterPolicy hfPolicy = createHeaderFooterPolicy();
-        // TODO this needs to be migrated out into section code
-        if (type == HeaderFooterType.FIRST) {
-            CTSectPr ctSectPr = getSection();
-            if (ctSectPr.isSetTitlePg() == false) {
-                CTOnOff titlePg = ctSectPr.addNewTitlePg();
-                titlePg.setVal(STOnOff.ON);
-            }
-        // } else if (type == HeaderFooterType.EVEN) {
-            // TODO Add support for Even/Odd headings and footers
-        }
-        return hfPolicy.createFooter(STHdrFtr.Enum.forInt(type.toInt()));
-    }
-
-    /**
-     * Return the {@link CTSectPr} object that corresponds with the
-     * last section in this document.
-     *
-     * @return {@link CTSectPr} object
-     */
-    private CTSectPr getSection() {
-        CTBody ctBody = getDocument().getBody();
-        return (ctBody.isSetSectPr() ?
-                ctBody.getSectPr() :
-                ctBody.addNewSectPr());
-    }
-
-    /**
-     * Returns the styles object used
-     */
-    @Internal
-    public CTStyles getStyle() throws XmlException, IOException {
-        PackagePart[] parts;
-        try {
-            parts = getRelatedByType(XWPFRelation.STYLES.getRelation());
-        } catch (InvalidFormatException e) {
-            throw new IllegalStateException(e);
-        }
-        if (parts.length != 1) {
-            throw new IllegalStateException("Expecting one Styles document part, but found " + parts.length);
-        }
-
-        StylesDocument sd = StylesDocument.Factory.parse(parts[0].getInputStream(), DEFAULT_XML_OPTIONS);
-        return sd.getStyles();
-    }
-
-    /**
-     * Get the document's embedded files.
-     */
-    @Override
-    public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
-        List<PackagePart> embedds = new LinkedList<PackagePart>();
-
-        // Get the embeddings for the workbook
-        PackagePart part = getPackagePart();
-        for (PackageRelationship rel : getPackagePart().getRelationshipsByType(OLE_OBJECT_REL_TYPE)) {
-            embedds.add(part.getRelatedPart(rel));
-        }
-
-        for (PackageRelationship rel : getPackagePart().getRelationshipsByType(PACK_OBJECT_REL_TYPE)) {
-            embedds.add(part.getRelatedPart(rel));
-        }
-
-        return embedds;
-    }
-
-    /**
-     * Finds that for example the 2nd entry in the body list is the 1st paragraph
-     */
-    private int getBodyElementSpecificPos(int pos, List<? extends IBodyElement> list) {
-        // If there's nothing to find, skip it
-        if (list.size() == 0) {
-            return -1;
-        }
-
-        if (pos >= 0 && pos < bodyElements.size()) {
-            // Ensure the type is correct
-            IBodyElement needle = bodyElements.get(pos);
-            if (needle.getElementType() != list.get(0).getElementType()) {
-                // Wrong type
-                return -1;
-            }
-
-            // Work back until we find it
-            int startPos = Math.min(pos, list.size() - 1);
-            for (int i = startPos; i >= 0; i--) {
-                if (list.get(i) == needle) {
-                    return i;
-                }
-            }
-        }
-
-        // Couldn't be found
-        return -1;
-    }
-
-    /**
-     * Look up the paragraph at the specified position in the body elements list
-     * and return this paragraphs position in the paragraphs list
-     *
-     * @param pos The position of the relevant paragraph in the body elements
-     *            list
-     * @return the position of the paragraph in the paragraphs list, if there is
-     * a paragraph at the position in the bodyelements list. Else it
-     * will return -1
-     */
-    public int getParagraphPos(int pos) {
-        return getBodyElementSpecificPos(pos, paragraphs);
-    }
-
-    /**
-     * get with the position of a table in the bodyelement array list
-     * the position of this table in the table array list
-     *
-     * @param pos position of the table in the bodyelement array list
-     * @return if there is a table at the position in the bodyelement array list,
-     * else it will return null.
-     */
-    public int getTablePos(int pos) {
-        return getBodyElementSpecificPos(pos, tables);
-    }
-
-    /**
-     * Add a new paragraph at position of the cursor. The cursor must be on the
-     * {@link org.apache.xmlbeans.XmlCursor.TokenType#START} tag of an subelement
-     * of the documents body. When this method is done, the cursor passed as
-     * parameter points to the {@link org.apache.xmlbeans.XmlCursor.TokenType#END}
-     * of the newly inserted paragraph.
-     *
-     * @param cursor
-     * @return the {@link XWPFParagraph} object representing the newly inserted
-     * CTP object
-     */
-    @Override
-    public XWPFParagraph insertNewParagraph(XmlCursor cursor) {
-        if (isCursorInBody(cursor)) {
-            String uri = CTP.type.getName().getNamespaceURI();
-            /*
-             * TODO DO not use a coded constant, find the constant in the OOXML
-             * classes instead, as the child of type CT_Paragraph is defined in the 
-             * OOXML schema as 'p'
-             */
-            String localPart = "p";
-            // creates a new Paragraph, cursor is positioned inside the new
-            // element
-            cursor.beginElement(localPart, uri);
-            // move the cursor to the START token to the paragraph just created
-            cursor.toParent();
-            CTP p = (CTP) cursor.getObject();
-            XWPFParagraph newP = new XWPFParagraph(p, this);
-            XmlObject o = null;
-            /*
-             * move the cursor to the previous element until a) the next
-             * paragraph is found or b) all elements have been passed
-             */
-            while (!(o instanceof CTP) && (cursor.toPrevSibling())) {
-                o = cursor.getObject();
-            }
-            /*
-             * if the object that has been found is a) not a paragraph or b) is
-             * the paragraph that has just been inserted, as the cursor in the
-             * while loop above was not moved as there were no other siblings,
-             * then the paragraph that was just inserted is the first paragraph
-             * in the body. Otherwise, take the previous paragraph and calculate
-             * the new index for the new paragraph.
-             */
-            if ((!(o instanceof CTP)) || (CTP) o == p) {
-                paragraphs.add(0, newP);
-            } else {
-                int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1;
-                paragraphs.add(pos, newP);
-            }
-
-            /*
-             * create a new cursor, that points to the START token of the just
-             * inserted paragraph
-             */
-            XmlCursor newParaPos = p.newCursor();
-            try {
-                /*
-                 * Calculate the paragraphs index in the list of all body
-                 * elements
-                 */
-                int i = 0;
-                cursor.toCursor(newParaPos);
-                while (cursor.toPrevSibling()) {
-                    o = cursor.getObject();
-                    if (o instanceof CTP || o instanceof CTTbl)
-                        i++;
-                }
-                bodyElements.add(i, newP);
-                cursor.toCursor(newParaPos);
-                cursor.toEndToken();
-                return newP;
-            } finally {
-                newParaPos.dispose();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public XWPFTable insertNewTbl(XmlCursor cursor) {
-        if (isCursorInBody(cursor)) {
-            String uri = CTTbl.type.getName().getNamespaceURI();
-            String localPart = "tbl";
-            cursor.beginElement(localPart, uri);
-            cursor.toParent();
-            CTTbl t = (CTTbl) cursor.getObject();
-            XWPFTable newT = new XWPFTable(t, this);
-            XmlObject o = null;
-            while (!(o instanceof CTTbl) && (cursor.toPrevSibling())) {
-                o = cursor.getObject();
-            }
-            if (!(o instanceof CTTbl)) {
-                tables.add(0, newT);
-            } else {
-                int pos = tables.indexOf(getTable((CTTbl) o)) + 1;
-                tables.add(pos, newT);
-            }
-            int i = 0;
-            XmlCursor tableCursor = t.newCursor();
-            try {
-                cursor.toCursor(tableCursor);
-                while (cursor.toPrevSibling()) {
-                    o = cursor.getObject();
-                    if (o instanceof CTP || o instanceof CTTbl)
-                        i++;
-                }
-                bodyElements.add(i, newT);
-                cursor.toCursor(tableCursor);
-                cursor.toEndToken();
-                return newT;
-            } finally {
-                tableCursor.dispose();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * verifies that cursor is on the right position
-     *
-     * @param cursor
-     */
-    private boolean isCursorInBody(XmlCursor cursor) {
-        XmlCursor verify = cursor.newCursor();
-        verify.toParent();
-        boolean result = (verify.getObject() == this.ctDocument.getBody());
-        verify.dispose();
-        return result;
-    }
-
-    private int getPosOfBodyElement(IBodyElement needle) {
-        BodyElementType type = needle.getElementType();
-        IBodyElement current;
-        for (int i = 0; i < bodyElements.size(); i++) {
-            current = bodyElements.get(i);
-            if (current.getElementType() == type) {
-                if (current.equals(needle)) {
-                    return i;
-                }
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Get the position of the paragraph, within the list
-     * of all the body elements.
-     *
-     * @param p The paragraph to find
-     * @return The location, or -1 if the paragraph couldn't be found
-     */
-    public int getPosOfParagraph(XWPFParagraph p) {
-        return getPosOfBodyElement(p);
-    }
-
-    /**
-     * Get the position of the table, within the list of
-     * all the body elements.
-     *
-     * @param t The table to find
-     * @return The location, or -1 if the table couldn't be found
-     */
-    public int getPosOfTable(XWPFTable t) {
-        return getPosOfBodyElement(t);
-    }
-
-    /**
-     * commit and saves the document
-     */
-    @Override
-    protected void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTDocument1.type.getName().getNamespaceURI(), "document"));
-
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        ctDocument.save(out, xmlOptions);
-        out.close();
-    }
-
-    /**
-     * Gets the index of the relation we're trying to create
-     *
-     * @param relation
-     * @return i
-     */
-    private int getRelationIndex(XWPFRelation relation) {
-        int i = 1;
-        for (RelationPart rp : getRelationParts()) {
-            if (rp.getRelationship().getRelationshipType().equals(relation.getRelation())) {
-                i++;
-            }
-        }
-        return i;
-    }
-
-    /**
-     * Appends a new paragraph to this document
-     *
-     * @return a new paragraph
-     */
-    public XWPFParagraph createParagraph() {
-        XWPFParagraph p = new XWPFParagraph(ctDocument.getBody().addNewP(), this);
-        bodyElements.add(p);
-        paragraphs.add(p);
-        return p;
-    }
-
-    /**
-     * Creates an empty numbering if one does not already exist and sets the numbering member
-     *
-     * @return numbering
-     */
-    public XWPFNumbering createNumbering() {
-        if (numbering == null) {
-            NumberingDocument numberingDoc = NumberingDocument.Factory.newInstance();
-
-            XWPFRelation relation = XWPFRelation.NUMBERING;
-            int i = getRelationIndex(relation);
-
-            XWPFNumbering wrapper = (XWPFNumbering) createRelationship(relation, XWPFFactory.getInstance(), i);
-            wrapper.setNumbering(numberingDoc.addNewNumbering());
-            numbering = wrapper;
-        }
-
-        return numbering;
-    }
-
-    /**
-     * Creates an empty styles for the document if one does not already exist
-     *
-     * @return styles
-     */
-    public XWPFStyles createStyles() {
-        if (styles == null) {
-            StylesDocument stylesDoc = StylesDocument.Factory.newInstance();
-
-            XWPFRelation relation = XWPFRelation.STYLES;
-            int i = getRelationIndex(relation);
-
-            XWPFStyles wrapper = (XWPFStyles) createRelationship(relation, XWPFFactory.getInstance(), i);
-            wrapper.setStyles(stylesDoc.addNewStyles());
-            styles = wrapper;
-        }
-
-        return styles;
-    }
-
-    /**
-     * Creates an empty footnotes element for the document if one does not already exist
-     *
-     * @return footnotes
-     */
-    public XWPFFootnotes createFootnotes() {
-        if (footnotes == null) {
-            FootnotesDocument footnotesDoc = FootnotesDocument.Factory.newInstance();
-
-            XWPFRelation relation = XWPFRelation.FOOTNOTE;
-            int i = getRelationIndex(relation);
-
-            XWPFFootnotes wrapper = (XWPFFootnotes) createRelationship(relation, XWPFFactory.getInstance(), i);
-            wrapper.setFootnotes(footnotesDoc.addNewFootnotes());
-            footnotes = wrapper;
-        }
-
-        return footnotes;
-    }
-
-    public XWPFFootnote addFootnote(CTFtnEdn note) {
-        return footnotes.addFootnote(note);
-    }
-
-    public XWPFFootnote addEndnote(CTFtnEdn note) {
-        XWPFFootnote endnote = new XWPFFootnote(this, note);
-        endnotes.put(note.getId().intValue(), endnote);
-        return endnote;
-    }
-
-    /**
-     * remove a BodyElement from bodyElements array list
-     *
-     * @param pos
-     * @return true if removing was successfully, else return false
-     */
-    public boolean removeBodyElement(int pos) {
-        if (pos >= 0 && pos < bodyElements.size()) {
-            BodyElementType type = bodyElements.get(pos).getElementType();
-            if (type == BodyElementType.TABLE) {
-                int tablePos = getTablePos(pos);
-                tables.remove(tablePos);
-                ctDocument.getBody().removeTbl(tablePos);
-            }
-            if (type == BodyElementType.PARAGRAPH) {
-                int paraPos = getParagraphPos(pos);
-                paragraphs.remove(paraPos);
-                ctDocument.getBody().removeP(paraPos);
-            }
-            bodyElements.remove(pos);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * copies content of a paragraph to a existing paragraph in the list paragraphs at position pos
-     *
-     * @param paragraph
-     * @param pos
-     */
-    public void setParagraph(XWPFParagraph paragraph, int pos) {
-        paragraphs.set(pos, paragraph);
-        ctDocument.getBody().setPArray(pos, paragraph.getCTP());
-        /* TODO update body element, update xwpf element, verify that
-         * incoming paragraph belongs to this document or if not, XML was
-         * copied properly (namespace-abbreviations, etc.)
-         */
-    }
-
-    /**
-     * @return the LastParagraph of the document
-     */
-    public XWPFParagraph getLastParagraph() {
-        int lastPos = paragraphs.toArray().length - 1;
-        return paragraphs.get(lastPos);
-    }
-
-    /**
-     * Create an empty table with one row and one column as default.
-     *
-     * @return a new table
-     */
-    public XWPFTable createTable() {
-        XWPFTable table = new XWPFTable(ctDocument.getBody().addNewTbl(), this);
-        bodyElements.add(table);
-        tables.add(table);
-        return table;
-    }
-
-    /**
-     * Create an empty table with a number of rows and cols specified
-     *
-     * @param rows
-     * @param cols
-     * @return table
-     */
-    public XWPFTable createTable(int rows, int cols) {
-        XWPFTable table = new XWPFTable(ctDocument.getBody().addNewTbl(), this, rows, cols);
-        bodyElements.add(table);
-        tables.add(table);
-        return table;
-    }
-
-    /**
-     *
-     */
-    public void createTOC() {
-        CTSdtBlock block = this.getDocument().getBody().addNewSdt();
-        TOC toc = new TOC(block);
-        for (XWPFParagraph par : paragraphs) {
-            String parStyle = par.getStyle();
-            if (parStyle != null && parStyle.startsWith("Heading")) {
-                try {
-                    int level = Integer.parseInt(parStyle.substring("Heading".length()));
-                    toc.addRow(level, par.getText(), 1, "112723803");
-                } catch (NumberFormatException e) {
-                    LOG.log(POILogger.ERROR, "can't format number in TOC heading", e);
-                }
-            }
-        }
-    }
-
-    /**
-     * Replace content of table in array tables at position pos with a
-     *
-     * @param pos
-     * @param table
-     */
-    public void setTable(int pos, XWPFTable table) {
-        tables.set(pos, table);
-        ctDocument.getBody().setTblArray(pos, table.getCTTbl());
-    }
-	
-	/**
-     * Verifies that the documentProtection tag in settings.xml file <br/>
-     * specifies that the protection is enforced (w:enforcement="1") <br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;readOnly&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     *
-     * @return true if documentProtection is enforced with option any
-     */
-    public boolean isEnforcedProtection() {
-        return settings.isEnforcedWith();
-    }
-
-    /**
-     * Verifies that the documentProtection tag in settings.xml file <br/>
-     * specifies that the protection is enforced (w:enforcement="1") <br/>
-     * and that the kind of protection is readOnly (w:edit="readOnly")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;readOnly&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     *
-     * @return true if documentProtection is enforced with option readOnly
-     */
-    public boolean isEnforcedReadonlyProtection() {
-        return settings.isEnforcedWith(STDocProtect.READ_ONLY);
-    }
-
-    /**
-     * Verifies that the documentProtection tag in settings.xml file <br/>
-     * specifies that the protection is enforced (w:enforcement="1") <br/>
-     * and that the kind of protection is forms (w:edit="forms")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;forms&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     *
-     * @return true if documentProtection is enforced with option forms
-     */
-    public boolean isEnforcedFillingFormsProtection() {
-        return settings.isEnforcedWith(STDocProtect.FORMS);
-    }
-
-    /**
-     * Verifies that the documentProtection tag in settings.xml file <br/>
-     * specifies that the protection is enforced (w:enforcement="1") <br/>
-     * and that the kind of protection is comments (w:edit="comments")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;comments&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     *
-     * @return true if documentProtection is enforced with option comments
-     */
-    public boolean isEnforcedCommentsProtection() {
-        return settings.isEnforcedWith(STDocProtect.COMMENTS);
-    }
-
-    /**
-     * Verifies that the documentProtection tag in settings.xml file <br/>
-     * specifies that the protection is enforced (w:enforcement="1") <br/>
-     * and that the kind of protection is trackedChanges (w:edit="trackedChanges")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;trackedChanges&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     *
-     * @return true if documentProtection is enforced with option trackedChanges
-     */
-    public boolean isEnforcedTrackedChangesProtection() {
-        return settings.isEnforcedWith(STDocProtect.TRACKED_CHANGES);
-    }
-
-    public boolean isEnforcedUpdateFields() {
-        return settings.isUpdateFields();
-    }
-
-    /**
-     * Enforces the readOnly protection.<br/>
-     * In the documentProtection tag inside settings.xml file, <br/>
-     * it sets the value of enforcement to "1" (w:enforcement="1") <br/>
-     * and the value of edit to readOnly (w:edit="readOnly")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;readOnly&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     */
-    public void enforceReadonlyProtection() {
-        settings.setEnforcementEditValue(STDocProtect.READ_ONLY);
-    }
-
-    /**
-     * Enforces the readOnly protection with a password.<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *   &lt;w:documentProtection w:edit=&quot;readOnly&quot; w:enforcement=&quot;1&quot;
-     *       w:cryptProviderType=&quot;rsaAES&quot; w:cryptAlgorithmClass=&quot;hash&quot;
-     *       w:cryptAlgorithmType=&quot;typeAny&quot; w:cryptAlgorithmSid=&quot;14&quot;
-     *       w:cryptSpinCount=&quot;100000&quot; w:hash=&quot;...&quot; w:salt=&quot;....&quot;
-     *   /&gt;
-     * </pre>
-     *
-     * @param password the plaintext password, if null no password will be applied
-     * @param hashAlgo the hash algorithm - only md2, m5, sha1, sha256, sha384 and sha512 are supported.
-     *                 if null, it will default default to sha1
-     */
-    public void enforceReadonlyProtection(String password, HashAlgorithm hashAlgo) {
-        settings.setEnforcementEditValue(STDocProtect.READ_ONLY, password, hashAlgo);
-    }
-
-    /**
-     * Enforce the Filling Forms protection.<br/>
-     * In the documentProtection tag inside settings.xml file, <br/>
-     * it sets the value of enforcement to "1" (w:enforcement="1") <br/>
-     * and the value of edit to forms (w:edit="forms")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;forms&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     */
-    public void enforceFillingFormsProtection() {
-        settings.setEnforcementEditValue(STDocProtect.FORMS);
-    }
-
-    /**
-     * Enforce the Filling Forms protection.<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *   &lt;w:documentProtection w:edit=&quot;forms&quot; w:enforcement=&quot;1&quot;
-     *       w:cryptProviderType=&quot;rsaAES&quot; w:cryptAlgorithmClass=&quot;hash&quot;
-     *       w:cryptAlgorithmType=&quot;typeAny&quot; w:cryptAlgorithmSid=&quot;14&quot;
-     *       w:cryptSpinCount=&quot;100000&quot; w:hash=&quot;...&quot; w:salt=&quot;....&quot;
-     *   /&gt;
-     * </pre>
-     *
-     * @param password the plaintext password, if null no password will be applied
-     * @param hashAlgo the hash algorithm - only md2, m5, sha1, sha256, sha384 and sha512 are supported.
-     *                 if null, it will default default to sha1
-     */
-    public void enforceFillingFormsProtection(String password, HashAlgorithm hashAlgo) {
-        settings.setEnforcementEditValue(STDocProtect.FORMS, password, hashAlgo);
-    }
-
-    /**
-     * Enforce the Comments protection.<br/>
-     * In the documentProtection tag inside settings.xml file,<br/>
-     * it sets the value of enforcement to "1" (w:enforcement="1") <br/>
-     * and the value of edit to comments (w:edit="comments")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;comments&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     */
-    public void enforceCommentsProtection() {
-        settings.setEnforcementEditValue(STDocProtect.COMMENTS);
-    }
-
-    /**
-     * Enforce the Comments protection.<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *   &lt;w:documentProtection w:edit=&quot;comments&quot; w:enforcement=&quot;1&quot;
-     *       w:cryptProviderType=&quot;rsaAES&quot; w:cryptAlgorithmClass=&quot;hash&quot;
-     *       w:cryptAlgorithmType=&quot;typeAny&quot; w:cryptAlgorithmSid=&quot;14&quot;
-     *       w:cryptSpinCount=&quot;100000&quot; w:hash=&quot;...&quot; w:salt=&quot;....&quot;
-     *   /&gt;
-     * </pre>
-     *
-     * @param password the plaintext password, if null no password will be applied
-     * @param hashAlgo the hash algorithm - only md2, m5, sha1, sha256, sha384 and sha512 are supported.
-     *                 if null, it will default default to sha1
-     */
-    public void enforceCommentsProtection(String password, HashAlgorithm hashAlgo) {
-        settings.setEnforcementEditValue(STDocProtect.COMMENTS, password, hashAlgo);
-    }
-
-    /**
-     * Enforce the Tracked Changes protection.<br/>
-     * In the documentProtection tag inside settings.xml file, <br/>
-     * it sets the value of enforcement to "1" (w:enforcement="1") <br/>
-     * and the value of edit to trackedChanges (w:edit="trackedChanges")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;trackedChanges&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     */
-    public void enforceTrackedChangesProtection() {
-        settings.setEnforcementEditValue(STDocProtect.TRACKED_CHANGES);
-    }
-
-    /**
-     * Enforce the Tracked Changes protection.<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *   &lt;w:documentProtection w:edit=&quot;trackedChanges&quot; w:enforcement=&quot;1&quot;
-     *       w:cryptProviderType=&quot;rsaAES&quot; w:cryptAlgorithmClass=&quot;hash&quot;
-     *       w:cryptAlgorithmType=&quot;typeAny&quot; w:cryptAlgorithmSid=&quot;14&quot;
-     *       w:cryptSpinCount=&quot;100000&quot; w:hash=&quot;...&quot; w:salt=&quot;....&quot;
-     *   /&gt;
-     * </pre>
-     *
-     * @param password the plaintext password, if null no password will be applied
-     * @param hashAlgo the hash algorithm - only md2, m5, sha1, sha256, sha384 and sha512 are supported.
-     *                 if null, it will default default to sha1
-     */
-    public void enforceTrackedChangesProtection(String password, HashAlgorithm hashAlgo) {
-        settings.setEnforcementEditValue(STDocProtect.TRACKED_CHANGES, password, hashAlgo);
-    }
-
-    /**
-     * Validates the existing password
-     *
-     * @param password
-     * @return true, only if password was set and equals, false otherwise
-     */
-    public boolean validateProtectionPassword(String password) {
-        return settings.validateProtectionPassword(password);
-    }
-
-    /**
-     * Remove protection enforcement.<br/>
-     * In the documentProtection tag inside settings.xml file <br/>
-     * it sets the value of enforcement to "0" (w:enforcement="0") <br/>
-     */
-    public void removeProtectionEnforcement() {
-        settings.removeEnforcement();
-    }
-
-    /**
-     * Enforces fields update on document open (in Word).
-     * In the settings.xml file <br/>
-     * sets the updateSettings value to true (w:updateSettings w:val="true")
-     * <p/>
-     * NOTICES:
-     * <ul>
-     * <li>Causing Word to ask on open: "This document contains fields that may refer to other files. Do you want to update the fields in this document?"
-     * (if "Update automatic links at open" is enabled)</li>
-     * <li>Flag is removed after saving with changes in Word </li>
-     * </ul>
-     */
-    public void enforceUpdateFields() {
-        settings.setUpdateFields();
-    }
-
-    /**
-     * Check if revision tracking is turned on.
-     *
-     * @return <code>true</code> if revision tracking is turned on
-     */
-    public boolean isTrackRevisions() {
-        return settings.isTrackRevisions();
-    }
-
-    /**
-     * Enable or disable revision tracking.
-     *
-     * @param enable <code>true</code> to turn on revision tracking, <code>false</code> to turn off revision tracking
-     */
-    public void setTrackRevisions(boolean enable) {
-        settings.setTrackRevisions(enable);
-    }
-
-
-    /**
-     * Returns the current zoom factor in percent values, i.e. 100 is normal zoom.
-     *
-     * @return A percent value denoting the current zoom setting of this document.
-     */
-    public long getZoomPercent() {
-        return settings.getZoomPercent();
-    }
-
-    /**
-     * Set the zoom setting as percent value, i.e. 100 is normal zoom.
-     *
-     * @param zoomPercent A percent value denoting the zoom setting for this document.
-     */
-    public void setZoomPercent(long zoomPercent) {
-        settings.setZoomPercent(zoomPercent);
-    }
-    
-    /**
-     * inserts an existing XWPFTable to the arrays bodyElements and tables
-     *
-     * @param pos
-     * @param table
-     */
-    @Override
-    public void insertTable(int pos, XWPFTable table) {
-        bodyElements.add(pos, table);
-        int i = 0;
-        for (CTTbl tbl : ctDocument.getBody().getTblArray()) {
-            if (tbl == table.getCTTbl()) {
-                break;
-            }
-            i++;
-        }
-        tables.add(i, table);
-    }
-
-    /**
-     * Returns all Pictures, which are referenced from the document itself.
-     *
-     * @return a {@link List} of {@link XWPFPictureData}. The returned {@link List} is unmodifiable. Use #a
-     */
-    public List<XWPFPictureData> getAllPictures() {
-        return Collections.unmodifiableList(pictures);
-    }
-
-    /**
-     * @return all Pictures in this package
-     */
-    public List<XWPFPictureData> getAllPackagePictures() {
-        List<XWPFPictureData> result = new ArrayList<XWPFPictureData>();
-        Collection<List<XWPFPictureData>> values = packagePictures.values();
-        for (List<XWPFPictureData> list : values) {
-            result.addAll(list);
-        }
-        return Collections.unmodifiableList(result);
-    }
-
-    void registerPackagePictureData(XWPFPictureData picData) {
-        List<XWPFPictureData> list = packagePictures.get(picData.getChecksum());
-        if (list == null) {
-            list = new ArrayList<XWPFPictureData>(1);
-            packagePictures.put(picData.getChecksum(), list);
-        }
-        if (!list.contains(picData)) {
-            list.add(picData);
-        }
-    }
-
-    XWPFPictureData findPackagePictureData(byte[] pictureData, int format) {
-        long checksum = IOUtils.calculateChecksum(pictureData);
-        XWPFPictureData xwpfPicData = null;
-        /*
-         * Try to find PictureData with this checksum. Create new, if none
-         * exists.
-         */
-        List<XWPFPictureData> xwpfPicDataList = packagePictures.get(checksum);
-        if (xwpfPicDataList != null) {
-            Iterator<XWPFPictureData> iter = xwpfPicDataList.iterator();
-            while (iter.hasNext() && xwpfPicData == null) {
-                XWPFPictureData curElem = iter.next();
-                if (Arrays.equals(pictureData, curElem.getData())) {
-                    xwpfPicData = curElem;
-                }
-            }
-        }
-        return xwpfPicData;
-    }
-
-    public String addPictureData(byte[] pictureData, int format) throws InvalidFormatException {
-        XWPFPictureData xwpfPicData = findPackagePictureData(pictureData, format);
-        POIXMLRelation relDesc = XWPFPictureData.RELATIONS[format];
-
-        if (xwpfPicData == null) {
-            /* Part doesn't exist, create a new one */
-            int idx = getNextPicNameNumber(format);
-            xwpfPicData = (XWPFPictureData) createRelationship(relDesc, XWPFFactory.getInstance(), idx);
-            /* write bytes to new part */
-            PackagePart picDataPart = xwpfPicData.getPackagePart();
-            OutputStream out = null;
-            try {
-                out = picDataPart.getOutputStream();
-                out.write(pictureData);
-            } catch (IOException e) {
-                throw new POIXMLException(e);
-            } finally {
-                try {
-                    if (out != null) out.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
-
-            registerPackagePictureData(xwpfPicData);
-            pictures.add(xwpfPicData);
-
-            return getRelationId(xwpfPicData);
-        } else if (!getRelations().contains(xwpfPicData)) {
-            /*
-             * Part already existed, but was not related so far. Create
-             * relationship to the already existing part and update
-             * POIXMLDocumentPart data.
-             */
-            // TODO add support for TargetMode.EXTERNAL relations.
-            RelationPart rp = addRelation(null, XWPFRelation.IMAGES, xwpfPicData);
-            return rp.getRelationship().getId();
-        } else {
-            /* Part already existed, get relation id and return it */
-            return getRelationId(xwpfPicData);
-        }
-    }
-
-    public String addPictureData(InputStream is, int format) throws InvalidFormatException {
-        try {
-            byte[] data = IOUtils.toByteArray(is);
-            return addPictureData(data, format);
-        } catch (IOException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * get the next free ImageNumber
-     *
-     * @param format
-     * @return the next free ImageNumber
-     * @throws InvalidFormatException
-     */
-    public int getNextPicNameNumber(int format) throws InvalidFormatException {
-        int img = getAllPackagePictures().size() + 1;
-        String proposal = XWPFPictureData.RELATIONS[format].getFileName(img);
-        PackagePartName createPartName = PackagingURIHelper.createPartName(proposal);
-        while (this.getPackage().getPart(createPartName) != null) {
-            img++;
-            proposal = XWPFPictureData.RELATIONS[format].getFileName(img);
-            createPartName = PackagingURIHelper.createPartName(proposal);
-        }
-        return img;
-    }
-
-    /**
-     * returns the PictureData by blipID
-     *
-     * @param blipID
-     * @return XWPFPictureData of a specificID
-     */
-    public XWPFPictureData getPictureDataByID(String blipID) {
-        POIXMLDocumentPart relatedPart = getRelationById(blipID);
-        if (relatedPart instanceof XWPFPictureData) {
-            XWPFPictureData xwpfPicData = (XWPFPictureData) relatedPart;
-            return xwpfPicData;
-        }
-        return null;
-    }
-
-    /**
-     * getNumbering
-     *
-     * @return numbering
-     */
-    public XWPFNumbering getNumbering() {
-        return numbering;
-    }
-
-    /**
-     * get Styles
-     *
-     * @return styles for this document
-     */
-    public XWPFStyles getStyles() {
-        return styles;
-    }
-
-    /**
-     * get the paragraph with the CTP class p
-     *
-     * @param p
-     * @return the paragraph with the CTP class p
-     */
-    @Override
-    public XWPFParagraph getParagraph(CTP p) {
-        for (int i = 0; i < getParagraphs().size(); i++) {
-            if (getParagraphs().get(i).getCTP() == p) {
-                return getParagraphs().get(i);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * get a table by its CTTbl-Object
-     *
-     * @param ctTbl
-     * @return a table by its CTTbl-Object or null
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTable(org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl)
-     */
-    @Override
-    public XWPFTable getTable(CTTbl ctTbl) {
-        for (int i = 0; i < tables.size(); i++) {
-            if (getTables().get(i).getCTTbl() == ctTbl) {
-                return getTables().get(i);
-            }
-        }
-        return null;
-    }
-
-    public Iterator<XWPFTable> getTablesIterator() {
-        return tables.iterator();
-    }
-
-    public Iterator<XWPFParagraph> getParagraphsIterator() {
-        return paragraphs.iterator();
-    }
-
-    /**
-     * Returns the paragraph that of position pos
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getParagraphArray(int)
-     */
-    @Override
-    public XWPFParagraph getParagraphArray(int pos) {
-        if (pos >= 0 && pos < paragraphs.size()) {
-            return paragraphs.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * returns the Part, to which the body belongs, which you need for adding relationship to other parts
-     * Actually it is needed of the class XWPFTableCell. Because you have to know to which part the tableCell
-     * belongs.
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPart()
-     */
-    @Override
-    public POIXMLDocumentPart getPart() {
-        return this;
-    }
-
-
-    /**
-     * get the PartType of the body, for example
-     * DOCUMENT, HEADER, FOOTER, FOOTNOTE,
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
-     */
-    @Override
-    public BodyType getPartType() {
-        return BodyType.DOCUMENT;
-    }
-
-    /**
-     * get the TableCell which belongs to the TableCell
-     *
-     * @param cell
-     */
-    @Override
-    public XWPFTableCell getTableCell(CTTc cell) {
-        XmlCursor cursor = cell.newCursor();
-        cursor.toParent();
-        XmlObject o = cursor.getObject();
-        if (!(o instanceof CTRow)) {
-            return null;
-        }
-        CTRow row = (CTRow) o;
-        cursor.toParent();
-        o = cursor.getObject();
-        cursor.dispose();
-        if (!(o instanceof CTTbl)) {
-            return null;
-        }
-        CTTbl tbl = (CTTbl) o;
-        XWPFTable table = getTable(tbl);
-        if (table == null) {
-            return null;
-        }
-        XWPFTableRow tableRow = table.getRow(row);
-        if (tableRow == null) {
-            return null;
-        }
-        return tableRow.getTableCell(cell);
-    }
-
-    @Override
-    public XWPFDocument getXWPFDocument() {
-        return this;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
deleted file mode 100644
index bc5bbe4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLFactory;
-import org.apache.poi.POIXMLRelation;
-
-/**
- * Instantiates sub-classes of POIXMLDocumentPart depending on their relationship type
- */
-public final class XWPFFactory extends POIXMLFactory {
-    private XWPFFactory() {
-
-    }
-
-    private static final XWPFFactory inst = new XWPFFactory();
-
-    public static XWPFFactory getInstance() {
-        return inst;
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    @Override
-    protected POIXMLRelation getDescriptor(String relationshipType) {
-        return XWPFRelation.getInstance(relationshipType);
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    @Override
-    protected POIXMLDocumentPart createDocumentPart
-        (Class<? extends POIXMLDocumentPart> cls, Class<?>[] classes, Object[] values)
-    throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
-        Constructor<? extends POIXMLDocumentPart> constructor = cls.getDeclaredConstructor(classes);
-        return constructor.newInstance(values);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
deleted file mode 100644
index 997c7d0..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSimpleField;
-
-/**
- * A run of text which is part of a field, such as Title
- *  of Page number or Author.
- * Any given Field may be made up of multiple of these.
- */
-public class XWPFFieldRun extends XWPFRun {
-    private CTSimpleField field;
-
-    public XWPFFieldRun(CTSimpleField field, CTR run, IRunBody p) {
-        super(run, p);
-        this.field = field;
-    }
-
-    @Internal
-    public CTSimpleField getCTField() {
-        return field;
-    }
-
-    public String getFieldInstruction() {
-        return field.getInstr();
-    }
-
-    public void setFieldInstruction(String instruction) {
-        field.setInstr(instruction);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
deleted file mode 100644
index dfe7462..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHdrFtr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumbering;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.FtrDocument;
-
-/**
- * Sketch of XWPF footer class
- */
-public class XWPFFooter extends XWPFHeaderFooter {
-    public XWPFFooter() {
-        super();
-    }
-
-    public XWPFFooter(XWPFDocument doc, CTHdrFtr hdrFtr) throws IOException {
-        super(doc, hdrFtr);
-        XmlCursor cursor = headerFooter.newCursor();
-        cursor.selectPath("./*");
-        while (cursor.toNextSelection()) {
-            XmlObject o = cursor.getObject();
-            if (o instanceof CTP) {
-                XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                paragraphs.add(p);
-                bodyElements.add(p);
-            }
-            if (o instanceof CTTbl) {
-                XWPFTable t = new XWPFTable((CTTbl) o, this);
-                tables.add(t);
-                bodyElements.add(t);
-            }
-
-        }
-        cursor.dispose();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XWPFFooter(POIXMLDocumentPart parent, PackagePart part) throws IOException {
-        super(parent, part);
-    }
-    
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFFooter(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel) throws IOException {
-        this(parent, part);
-    }
-
-    /**
-     * save and commit footer
-     */
-    @Override
-    protected void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTNumbering.type.getName().getNamespaceURI(), "ftr"));
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        super._getHdrFtr().save(out, xmlOptions);
-        out.close();
-    }
-
-    @Override
-    protected void onDocumentRead() throws IOException {
-        super.onDocumentRead();
-        FtrDocument ftrDocument = null;
-        InputStream is = null;
-        try {
-            is = getPackagePart().getInputStream();
-            ftrDocument = FtrDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            headerFooter = ftrDocument.getFtr();
-            // parse the document with cursor and add
-            // the XmlObject to its lists
-            XmlCursor cursor = headerFooter.newCursor();
-            cursor.selectPath("./*");
-            while (cursor.toNextSelection()) {
-                XmlObject o = cursor.getObject();
-                if (o instanceof CTP) {
-                    XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                    paragraphs.add(p);
-                    bodyElements.add(p);
-                }
-                if (o instanceof CTTbl) {
-                    XWPFTable t = new XWPFTable((CTTbl) o, this);
-                    tables.add(t);
-                    bodyElements.add(t);
-                }
-                if (o instanceof CTSdtBlock) {
-                    XWPFSDT c = new XWPFSDT((CTSdtBlock) o, this);
-                    bodyElements.add(c);
-                }
-            }
-            cursor.dispose();
-        } catch (Exception e) {
-            throw new POIXMLException(e);
-        } finally {
-            if (is != null) {
-                is.close();
-            }
-        }
-    }
-
-    /**
-     * get the PartType of the body
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
-     */
-    public BodyType getPartType() {
-        return BodyType.FOOTER;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
deleted file mode 100644
index b5f24dd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/* ====================================================================
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdn;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-
-public class XWPFFootnote implements Iterable<XWPFParagraph>, IBody {
-    private List<XWPFParagraph> paragraphs = new ArrayList<XWPFParagraph>();
-    private List<XWPFTable> tables = new ArrayList<XWPFTable>();
-    private List<XWPFPictureData> pictures = new ArrayList<XWPFPictureData>();
-    private List<IBodyElement> bodyElements = new ArrayList<IBodyElement>();
-
-    private CTFtnEdn ctFtnEdn;
-    private XWPFFootnotes footnotes;
-    private XWPFDocument document;
-
-    public XWPFFootnote(CTFtnEdn note, XWPFFootnotes xFootnotes) {
-        footnotes = xFootnotes;
-        ctFtnEdn = note;
-        document = xFootnotes.getXWPFDocument();
-        init();
-    }
-
-    public XWPFFootnote(XWPFDocument document, CTFtnEdn body) {
-        ctFtnEdn = body;
-        this.document = document;
-        init();
-    }
-
-    private void init() {
-        XmlCursor cursor = ctFtnEdn.newCursor();
-        //copied from XWPFDocument...should centralize this code
-        //to avoid duplication
-        cursor.selectPath("./*");
-        while (cursor.toNextSelection()) {
-            XmlObject o = cursor.getObject();
-            if (o instanceof CTP) {
-                XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                bodyElements.add(p);
-                paragraphs.add(p);
-            } else if (o instanceof CTTbl) {
-                XWPFTable t = new XWPFTable((CTTbl) o, this);
-                bodyElements.add(t);
-                tables.add(t);
-            } else if (o instanceof CTSdtBlock) {
-                XWPFSDT c = new XWPFSDT((CTSdtBlock) o, this);
-                bodyElements.add(c);
-            }
-
-        }
-        cursor.dispose();
-    }
-
-    public List<XWPFParagraph> getParagraphs() {
-        return paragraphs;
-    }
-
-    public Iterator<XWPFParagraph> iterator() {
-        return paragraphs.iterator();
-    }
-
-    public List<XWPFTable> getTables() {
-        return tables;
-    }
-
-    public List<XWPFPictureData> getPictures() {
-        return pictures;
-    }
-
-    public List<IBodyElement> getBodyElements() {
-        return bodyElements;
-    }
-
-    public CTFtnEdn getCTFtnEdn() {
-        return ctFtnEdn;
-    }
-
-    public void setCTFtnEdn(CTFtnEdn footnote) {
-        ctFtnEdn = footnote;
-    }
-
-    /**
-     * @param pos in table array
-     * @return The table at position pos
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTableArray(int)
-     */
-    public XWPFTable getTableArray(int pos) {
-        if (pos >= 0 && pos < tables.size()) {
-            return tables.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * inserts an existing XWPFTable to the arrays bodyElements and tables
-     *
-     * @param pos
-     * @param table
-     * @see org.apache.poi.xwpf.usermodel.IBody#insertTable(int pos, XWPFTable table)
-     */
-    public void insertTable(int pos, XWPFTable table) {
-        bodyElements.add(pos, table);
-        int i = 0;
-        for (CTTbl tbl : ctFtnEdn.getTblArray()) {
-            if (tbl == table.getCTTbl()) {
-                break;
-            }
-            i++;
-        }
-        tables.add(i, table);
-
-    }
-
-    /**
-     * if there is a corresponding {@link XWPFTable} of the parameter ctTable in the tableList of this header
-     * the method will return this table
-     * if there is no corresponding {@link XWPFTable} the method will return null
-     *
-     * @param ctTable
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTable(CTTbl ctTable)
-     */
-    public XWPFTable getTable(CTTbl ctTable) {
-        for (XWPFTable table : tables) {
-            if (table == null)
-                return null;
-            if (table.getCTTbl().equals(ctTable))
-                return table;
-        }
-        return null;
-    }
-
-    /**
-     * if there is a corresponding {@link XWPFParagraph} of the parameter ctTable in the paragraphList of this header or footer
-     * the method will return this paragraph
-     * if there is no corresponding {@link XWPFParagraph} the method will return null
-     *
-     * @param p is instance of CTP and is searching for an XWPFParagraph
-     * @return null if there is no XWPFParagraph with an corresponding CTPparagraph in the paragraphList of this header or footer
-     * XWPFParagraph with the correspondig CTP p
-     * @see org.apache.poi.xwpf.usermodel.IBody#getParagraph(CTP p)
-     */
-    public XWPFParagraph getParagraph(CTP p) {
-        for (XWPFParagraph paragraph : paragraphs) {
-            if (paragraph.getCTP().equals(p))
-                return paragraph;
-        }
-        return null;
-    }
-
-    /**
-     * Returns the paragraph that holds
-     * the text of the header or footer.
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getParagraphArray(int pos)
-     */
-    public XWPFParagraph getParagraphArray(int pos) {
-        if(pos >=0 && pos < paragraphs.size()) {
-            return paragraphs.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * get the TableCell which belongs to the TableCell
-     *
-     * @param cell
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTableCell(CTTc cell)
-     */
-    public XWPFTableCell getTableCell(CTTc cell) {
-        XmlCursor cursor = cell.newCursor();
-        cursor.toParent();
-        XmlObject o = cursor.getObject();
-        if (!(o instanceof CTRow)) {
-            return null;
-        }
-        CTRow row = (CTRow) o;
-        cursor.toParent();
-        o = cursor.getObject();
-        cursor.dispose();
-        if (!(o instanceof CTTbl)) {
-            return null;
-        }
-        CTTbl tbl = (CTTbl) o;
-        XWPFTable table = getTable(tbl);
-        if (table == null) {
-            return null;
-        }
-        XWPFTableRow tableRow = table.getRow(row);
-        if(tableRow == null){
-            return null;
-        }
-        return tableRow.getTableCell(cell);
-    }
-
-    /**
-     * verifies that cursor is on the right position
-     *
-     * @param cursor
-     */
-    private boolean isCursorInFtn(XmlCursor cursor) {
-        XmlCursor verify = cursor.newCursor();
-        verify.toParent();
-        if (verify.getObject() == this.ctFtnEdn) {
-            return true;
-        }
-        return false;
-    }
-
-    public POIXMLDocumentPart getOwner() {
-        return footnotes;
-    }
-
-    /**
-     * @param cursor
-     * @return the inserted table
-     * @see org.apache.poi.xwpf.usermodel.IBody#insertNewTbl(XmlCursor cursor)
-     */
-    public XWPFTable insertNewTbl(XmlCursor cursor) {
-        if (isCursorInFtn(cursor)) {
-            String uri = CTTbl.type.getName().getNamespaceURI();
-            String localPart = "tbl";
-            cursor.beginElement(localPart, uri);
-            cursor.toParent();
-            CTTbl t = (CTTbl) cursor.getObject();
-            XWPFTable newT = new XWPFTable(t, this);
-            cursor.removeXmlContents();
-            XmlObject o = null;
-            while (!(o instanceof CTTbl) && (cursor.toPrevSibling())) {
-                o = cursor.getObject();
-            }
-            if (!(o instanceof CTTbl)) {
-                tables.add(0, newT);
-            } else {
-                int pos = tables.indexOf(getTable((CTTbl) o)) + 1;
-                tables.add(pos, newT);
-            }
-            int i = 0;
-            cursor = t.newCursor();
-            while (cursor.toPrevSibling()) {
-                o = cursor.getObject();
-                if (o instanceof CTP || o instanceof CTTbl)
-                    i++;
-            }
-            bodyElements.add(i, newT);
-            XmlCursor c2 = t.newCursor();
-            cursor.toCursor(c2);
-            cursor.toEndToken();
-            c2.dispose();
-            return newT;
-        }
-        return null;
-    }
-
-    /**
-     * add a new paragraph at position of the cursor
-     *
-     * @param cursor
-     * @return the inserted paragraph
-     * @see org.apache.poi.xwpf.usermodel.IBody#insertNewParagraph(XmlCursor cursor)
-     */
-    public XWPFParagraph insertNewParagraph(final XmlCursor cursor) {
-        if (isCursorInFtn(cursor)) {
-            String uri = CTP.type.getName().getNamespaceURI();
-            String localPart = "p";
-            cursor.beginElement(localPart, uri);
-            cursor.toParent();
-            CTP p = (CTP) cursor.getObject();
-            XWPFParagraph newP = new XWPFParagraph(p, this);
-            XmlObject o = null;
-            while (!(o instanceof CTP) && (cursor.toPrevSibling())) {
-                o = cursor.getObject();
-            }
-            if ((!(o instanceof CTP)) || (CTP) o == p) {
-                paragraphs.add(0, newP);
-            } else {
-                int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1;
-                paragraphs.add(pos, newP);
-            }
-            int i = 0;
-            XmlCursor p2 = p.newCursor();
-            cursor.toCursor(p2);
-            p2.dispose();
-            while (cursor.toPrevSibling()) {
-                o = cursor.getObject();
-                if (o instanceof CTP || o instanceof CTTbl)
-                    i++;
-            }
-            bodyElements.add(i, newP);
-            p2 = p.newCursor();
-            cursor.toCursor(p2);
-            cursor.toEndToken();
-            p2.dispose();
-            return newP;
-        }
-        return null;
-    }
-
-    /**
-     * add a new table to the end of the footnote
-     *
-     * @param table
-     * @return the added XWPFTable
-     */
-    public XWPFTable addNewTbl(CTTbl table) {
-        CTTbl newTable = ctFtnEdn.addNewTbl();
-        newTable.set(table);
-        XWPFTable xTable = new XWPFTable(newTable, this);
-        tables.add(xTable);
-        return xTable;
-    }
-
-    /**
-     * add a new paragraph to the end of the footnote
-     *
-     * @param paragraph
-     * @return the added XWPFParagraph
-     */
-    public XWPFParagraph addNewParagraph(CTP paragraph) {
-        CTP newPara = ctFtnEdn.addNewP();
-        newPara.set(paragraph);
-        XWPFParagraph xPara = new XWPFParagraph(newPara, this);
-        paragraphs.add(xPara);
-        return xPara;
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getXWPFDocument()
-     */
-    public XWPFDocument getXWPFDocument() {
-        return document;
-    }
-
-    /**
-     * returns the Part, to which the body belongs, which you need for adding relationship to other parts
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPart()
-     */
-    public POIXMLDocumentPart getPart() {
-        return footnotes;
-    }
-
-    /**
-     * get the PartType of the body
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
-     */
-    public BodyType getPartType() {
-        return BodyType.FOOTNOTE;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
deleted file mode 100644
index defae4a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFootnotes;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdn;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.FootnotesDocument;
-
-/**
- * Looks after the collection of Footnotes for a document
- */
-public class XWPFFootnotes extends POIXMLDocumentPart {
-    protected XWPFDocument document;
-    private List<XWPFFootnote> listFootnote = new ArrayList<XWPFFootnote>();
-    private CTFootnotes ctFootnotes;
-
-    /**
-     * Construct XWPFFootnotes from a package part
-     *
-     * @param part the package part holding the data of the footnotes,
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public XWPFFootnotes(PackagePart part) throws IOException, OpenXML4JException {
-        super(part);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFFootnotes(PackagePart part, PackageRelationship rel) throws IOException, OpenXML4JException {
-        this(part);
-    }
-    
-    /**
-     * Construct XWPFFootnotes from scratch for a new document.
-     */
-    public XWPFFootnotes() {
-    }
-
-    /**
-     * Read document
-     */
-    @Override
-    protected void onDocumentRead() throws IOException {
-        FootnotesDocument notesDoc;
-        InputStream is = null;
-        try {
-            is = getPackagePart().getInputStream();
-            notesDoc = FootnotesDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            ctFootnotes = notesDoc.getFootnotes();
-        } catch (XmlException e) {
-            throw new POIXMLException();
-        } finally {
-            if (is != null) {
-                is.close();
-            }
-        }
-
-        // Find our footnotes
-        for (CTFtnEdn note : ctFootnotes.getFootnoteArray()) {
-            listFootnote.add(new XWPFFootnote(note, this));
-        }
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTFootnotes.type.getName().getNamespaceURI(), "footnotes"));
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        ctFootnotes.save(out, xmlOptions);
-        out.close();
-    }
-
-    public List<XWPFFootnote> getFootnotesList() {
-        return listFootnote;
-    }
-
-    public XWPFFootnote getFootnoteById(int id) {
-        for (XWPFFootnote note : listFootnote) {
-            if (note.getCTFtnEdn().getId().intValue() == id)
-                return note;
-        }
-        return null;
-    }
-
-    /**
-     * Sets the ctFootnotes
-     *
-     * @param footnotes
-     */
-    public void setFootnotes(CTFootnotes footnotes) {
-        ctFootnotes = footnotes;
-    }
-
-    /**
-     * add an XWPFFootnote to the document
-     *
-     * @param footnote
-     * @throws IOException
-     */
-    public void addFootnote(XWPFFootnote footnote) {
-        listFootnote.add(footnote);
-        ctFootnotes.addNewFootnote().set(footnote.getCTFtnEdn());
-    }
-
-    /**
-     * add a footnote to the document
-     *
-     * @param note
-     * @throws IOException
-     */
-    public XWPFFootnote addFootnote(CTFtnEdn note) {
-        CTFtnEdn newNote = ctFootnotes.addNewFootnote();
-        newNote.set(note);
-        XWPFFootnote xNote = new XWPFFootnote(newNote, this);
-        listFootnote.add(xNote);
-        return xNote;
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPart()
-     */
-    public XWPFDocument getXWPFDocument() {
-        if (document != null) {
-            return document;
-        } else {
-            return (XWPFDocument) getParent();
-        }
-    }
-
-    public void setXWPFDocument(XWPFDocument doc) {
-        document = doc;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
deleted file mode 100644
index 0af8df4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHdrFtr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumbering;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.HdrDocument;
-
-/**
- * Sketch of XWPF header class
- */
-public class XWPFHeader extends XWPFHeaderFooter {
-    public XWPFHeader() {
-        super();
-    }
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XWPFHeader(POIXMLDocumentPart parent, PackagePart part) throws IOException {
-        super(parent, part);
-    }
-    
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFHeader(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel) throws IOException {
-        this(parent, part);
-    }
-
-    public XWPFHeader(XWPFDocument doc, CTHdrFtr hdrFtr) {
-        super(doc, hdrFtr);
-        XmlCursor cursor = headerFooter.newCursor();
-        cursor.selectPath("./*");
-        while (cursor.toNextSelection()) {
-            XmlObject o = cursor.getObject();
-            if (o instanceof CTP) {
-                XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                paragraphs.add(p);
-            }
-            if (o instanceof CTTbl) {
-                XWPFTable t = new XWPFTable((CTTbl) o, this);
-                tables.add(t);
-            }
-        }
-        cursor.dispose();
-    }
-
-    /**
-     * save and commit footer
-     */
-    @Override
-    protected void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTNumbering.type.getName().getNamespaceURI(), "hdr"));
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        super._getHdrFtr().save(out, xmlOptions);
-        out.close();
-    }
-
-    /**
-     * reads the document
-     *
-     * @throws IOException
-     */
-    @Override
-    protected void onDocumentRead() throws IOException {
-        super.onDocumentRead();
-        HdrDocument hdrDocument = null;
-        InputStream is = null;
-        try {
-            is = getPackagePart().getInputStream();
-            hdrDocument = HdrDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            headerFooter = hdrDocument.getHdr();
-            // parse the document with cursor and add
-            // the XmlObject to its lists
-            XmlCursor cursor = headerFooter.newCursor();
-            cursor.selectPath("./*");
-            while (cursor.toNextSelection()) {
-                XmlObject o = cursor.getObject();
-                if (o instanceof CTP) {
-                    XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                    paragraphs.add(p);
-                    bodyElements.add(p);
-                }
-                if (o instanceof CTTbl) {
-                    XWPFTable t = new XWPFTable((CTTbl) o, this);
-                    tables.add(t);
-                    bodyElements.add(t);
-                }
-                if (o instanceof CTSdtBlock) {
-                    XWPFSDT c = new XWPFSDT((CTSdtBlock) o, this);
-                    bodyElements.add(c);
-                }
-            }
-            cursor.dispose();
-        } catch (XmlException e) {
-            throw new POIXMLException(e);
-        } finally {
-            if (is != null) {
-                is.close();
-            }
-        }
-    }
-
-    /**
-     * get the PartType of the body
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
-     */
-    public BodyType getPartType() {
-        return BodyType.HEADER;
-    }
-}//end class
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
deleted file mode 100644
index e8488b3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.POIXMLRelation;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHdrFtr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-
-/**
- * Parent of XWPF headers and footers
- */
-public abstract class XWPFHeaderFooter extends POIXMLDocumentPart implements IBody {
-    List<XWPFParagraph> paragraphs = new ArrayList<XWPFParagraph>();
-    List<XWPFTable> tables = new ArrayList<XWPFTable>();
-    List<XWPFPictureData> pictures = new ArrayList<XWPFPictureData>();
-    List<IBodyElement> bodyElements = new ArrayList<IBodyElement>();
-
-    CTHdrFtr headerFooter;
-    XWPFDocument document;
-
-    XWPFHeaderFooter(XWPFDocument doc, CTHdrFtr hdrFtr) {
-        if (doc == null) {
-            throw new NullPointerException();
-        }
-
-        document = doc;
-        headerFooter = hdrFtr;
-        readHdrFtr();
-    }
-
-    protected XWPFHeaderFooter() {
-        headerFooter = CTHdrFtr.Factory.newInstance();
-        readHdrFtr();
-    }
-
-    /**
-     * @since by POI 3.14-Beta1
-     */
-    public XWPFHeaderFooter(POIXMLDocumentPart parent, PackagePart part) throws IOException {
-        super(parent, part);
-        this.document = (XWPFDocument) getParent();
-
-        if (this.document == null) {
-            throw new NullPointerException();
-        }
-    }
-    
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFHeaderFooter(POIXMLDocumentPart parent, PackagePart part, PackageRelationship rel) throws IOException {
-        this(parent, part);
-    }
-
-    @Override
-    protected void onDocumentRead() throws IOException {
-        for (POIXMLDocumentPart poixmlDocumentPart : getRelations()) {
-            if (poixmlDocumentPart instanceof XWPFPictureData) {
-                XWPFPictureData xwpfPicData = (XWPFPictureData) poixmlDocumentPart;
-                pictures.add(xwpfPicData);
-                document.registerPackagePictureData(xwpfPicData);
-            }
-        }
-    }
-
-    @Internal
-    public CTHdrFtr _getHdrFtr() {
-        return headerFooter;
-    }
-
-    public List<IBodyElement> getBodyElements() {
-        return Collections.unmodifiableList(bodyElements);
-    }
-
-    /**
-     * Returns the paragraph(s) that holds
-     * the text of the header or footer.
-     * Normally there is only the one paragraph, but
-     * there could be more in certain cases, or
-     * a table.
-     */
-    public List<XWPFParagraph> getParagraphs() {
-        return Collections.unmodifiableList(paragraphs);
-    }
-
-
-    /**
-     * Return the table(s) that holds the text
-     * of the header or footer, for complex cases
-     * where a paragraph isn't used.
-     * Normally there's just one paragraph, but some
-     * complex headers/footers have a table or two
-     * in addition.
-     */
-    public List<XWPFTable> getTables() throws ArrayIndexOutOfBoundsException {
-        return Collections.unmodifiableList(tables);
-    }
-
-
-    /**
-     * Returns the textual content of the header/footer,
-     * by flattening out the text of its paragraph(s)
-     */
-    public String getText() {
-        StringBuffer t = new StringBuffer();
-        //TODO: simplify this to get ibody elements in order
-        for (int i = 0; i < paragraphs.size(); i++) {
-            if (!paragraphs.get(i).isEmpty()) {
-                String text = paragraphs.get(i).getText();
-                if (text != null && text.length() > 0) {
-                    t.append(text);
-                    t.append('\n');
-                }
-            }
-        }
-
-        for (int i = 0; i < tables.size(); i++) {
-            String text = tables.get(i).getText();
-            if (text != null && text.length() > 0) {
-                t.append(text);
-                t.append('\n');
-            }
-        }
-
-        for (IBodyElement bodyElement : getBodyElements()) {
-            if (bodyElement instanceof XWPFSDT) {
-                t.append(((XWPFSDT) bodyElement).getContent().getText() + '\n');
-            }
-        }
-        return t.toString();
-    }
-
-    /**
-     * set a new headerFooter
-     */
-    public void setHeaderFooter(CTHdrFtr headerFooter) {
-        this.headerFooter = headerFooter;
-        readHdrFtr();
-    }
-
-    /**
-     * if there is a corresponding {@link XWPFTable} of the parameter ctTable in the tableList of this header
-     * the method will return this table
-     * if there is no corresponding {@link XWPFTable} the method will return null
-     *
-     * @param ctTable
-     */
-    public XWPFTable getTable(CTTbl ctTable) {
-        for (XWPFTable table : tables) {
-            if (table == null)
-                return null;
-            if (table.getCTTbl().equals(ctTable))
-                return table;
-        }
-        return null;
-    }
-
-    /**
-     * if there is a corresponding {@link XWPFParagraph} of the parameter ctTable in the paragraphList of this header or footer
-     * the method will return this paragraph
-     * if there is no corresponding {@link XWPFParagraph} the method will return null
-     *
-     * @param p is instance of CTP and is searching for an XWPFParagraph
-     * @return null if there is no XWPFParagraph with an corresponding CTPparagraph in the paragraphList of this header or footer
-     * XWPFParagraph with the correspondig CTP p
-     */
-    public XWPFParagraph getParagraph(CTP p) {
-        for (XWPFParagraph paragraph : paragraphs) {
-            if (paragraph.getCTP().equals(p))
-                return paragraph;
-        }
-        return null;
-
-    }
-
-    /**
-     * Returns the paragraph that holds
-     * the text of the header or footer.
-     */
-    public XWPFParagraph getParagraphArray(int pos) {
-        if(pos >= 0 && pos<paragraphs.size()){
-            return paragraphs.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * get a List of all Paragraphs
-     *
-     * @return a list of {@link XWPFParagraph}
-     */
-    public List<XWPFParagraph> getListParagraph() {
-        return paragraphs;
-    }
-
-    public List<XWPFPictureData> getAllPictures() {
-        return Collections.unmodifiableList(pictures);
-    }
-
-    /**
-     * get all Pictures in this package
-     *
-     * @return all Pictures in this package
-     */
-    public List<XWPFPictureData> getAllPackagePictures() {
-        return document.getAllPackagePictures();
-
-    }
-
-    /**
-     * Adds a picture to the document.
-     *
-     * @param pictureData The picture data
-     * @param format      The format of the picture.
-     * @return the index to this picture (0 based), the added picture can be obtained from {@link #getAllPictures()} .
-     * @throws InvalidFormatException
-     */
-    public String addPictureData(byte[] pictureData, int format) throws InvalidFormatException {
-        XWPFPictureData xwpfPicData = document.findPackagePictureData(pictureData, format);
-        POIXMLRelation relDesc = XWPFPictureData.RELATIONS[format];
-
-        if (xwpfPicData == null) {
-            /* Part doesn't exist, create a new one */
-            int idx = document.getNextPicNameNumber(format);
-            xwpfPicData = (XWPFPictureData) createRelationship(relDesc, XWPFFactory.getInstance(), idx);
-            /* write bytes to new part */
-            PackagePart picDataPart = xwpfPicData.getPackagePart();
-            OutputStream out = null;
-            try {
-                out = picDataPart.getOutputStream();
-                out.write(pictureData);
-            } catch (IOException e) {
-                throw new POIXMLException(e);
-            } finally {
-                try {
-                    if (out != null) out.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
-
-            document.registerPackagePictureData(xwpfPicData);
-            pictures.add(xwpfPicData);
-            return getRelationId(xwpfPicData);
-        } else if (!getRelations().contains(xwpfPicData)) {
-            /*
-             * Part already existed, but was not related so far. Create
-             * relationship to the already existing part and update
-             * POIXMLDocumentPart data.
-             */
-            // TODO add support for TargetMode.EXTERNAL relations.
-            RelationPart rp = addRelation(null, XWPFRelation.IMAGES, xwpfPicData);
-            pictures.add(xwpfPicData);
-            return rp.getRelationship().getId();
-        } else {
-            /* Part already existed, get relation id and return it */
-            return getRelationId(xwpfPicData);
-        }
-    }
-
-    /**
-     * Adds a picture to the document.
-     *
-     * @param is     The stream to read image from
-     * @param format The format of the picture.
-     * @return the index to this picture (0 based), the added picture can be obtained from {@link #getAllPictures()} .
-     * @throws InvalidFormatException
-     * @throws IOException
-     */
-    public String addPictureData(InputStream is, int format) throws InvalidFormatException, IOException {
-        byte[] data = IOUtils.toByteArray(is);
-        return addPictureData(data, format);
-    }
-
-    /**
-     * returns the PictureData by blipID
-     *
-     * @param blipID
-     * @return XWPFPictureData of a specificID
-     * @throws Exception
-     */
-    public XWPFPictureData getPictureDataByID(String blipID) {
-        POIXMLDocumentPart relatedPart = getRelationById(blipID);
-        if (relatedPart != null && relatedPart instanceof XWPFPictureData) {
-            return (XWPFPictureData) relatedPart;
-        }
-        return null;
-    }
-
-    /**
-     * Adds a new paragraph at the end of the header or footer
-     * 
-     * @return new {@link XWPFParagraph} object
-     */
-    public XWPFParagraph createParagraph() {
-        XWPFParagraph paragraph = new XWPFParagraph(headerFooter.addNewP(), this);
-        paragraphs.add(paragraph);
-        bodyElements.add(paragraph);
-        return paragraph;
-    }
-    
-    /**
-     * Adds a new table at the end of the header or footer
-     * 
-     * @param rows - number of rows in the table
-     * @param cols - number of columns in the table
-     * @return new {@link XWPFTable} object
-     */
-    public XWPFTable createTable(int rows, int cols) {
-        XWPFTable table = new XWPFTable(headerFooter.addNewTbl(), this, rows, cols);
-        tables.add(table);
-        bodyElements.add(table);
-        return table;
-    }
-    
-    /**
-     * Removes a specific paragraph from this header / footer
-     *
-     * @param paragraph - {@link XWPFParagraph} object to remove
-     */
-    public void removeParagraph(XWPFParagraph paragraph) {
-        if (paragraphs.contains(paragraph)) {
-            CTP ctP = paragraph.getCTP();
-            XmlCursor c = ctP.newCursor();
-            c.removeXml();
-            c.dispose();
-            paragraphs.remove(paragraph);
-            bodyElements.remove(paragraph);
-        }
-    }
-    
-    /**
-     * Removes a specific table from this header / footer
-     * 
-     * @param table - {@link XWPFTable} object to remove 
-     */
-    public void removeTable(XWPFTable table) {
-        if (tables.contains(table)) {
-            CTTbl ctTbl = table.getCTTbl();
-            XmlCursor c = ctTbl.newCursor();
-            c.removeXml();
-            c.dispose();
-            tables.remove(table);
-            bodyElements.remove(table);
-        }
-    }
-    
-    /**
-     * Clears all paragraphs and tables from this header / footer
-     */
-    public void clearHeaderFooter() {
-       XmlCursor c = headerFooter.newCursor();
-       c.removeXmlContents();
-       c.dispose();
-       paragraphs.clear();
-       tables.clear();
-       bodyElements.clear();
-    }
-    
-    /**
-     * add a new paragraph at position of the cursor
-     *
-     * @param cursor
-     * @return the inserted paragraph
-     */
-    public XWPFParagraph insertNewParagraph(XmlCursor cursor) {
-        if (isCursorInHdrF(cursor)) {
-            String uri = CTP.type.getName().getNamespaceURI();
-            String localPart = "p";
-            cursor.beginElement(localPart, uri);
-            cursor.toParent();
-            CTP p = (CTP) cursor.getObject();
-            XWPFParagraph newP = new XWPFParagraph(p, this);
-            XmlObject o = null;
-            while (!(o instanceof CTP) && (cursor.toPrevSibling())) {
-                o = cursor.getObject();
-            }
-            if ((!(o instanceof CTP)) || (CTP) o == p) {
-                paragraphs.add(0, newP);
-            } else {
-                int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1;
-                paragraphs.add(pos, newP);
-            }
-            int i = 0;
-            XmlCursor p2 = p.newCursor();
-            cursor.toCursor(p2);
-            p2.dispose();
-            while (cursor.toPrevSibling()) {
-                o = cursor.getObject();
-                if (o instanceof CTP || o instanceof CTTbl)
-                    i++;
-            }
-            bodyElements.add(i, newP);
-            p2 = p.newCursor();
-            cursor.toCursor(p2);
-            cursor.toEndToken();
-            p2.dispose();
-            return newP;
-        }
-        return null;
-    }
-
-
-    /**
-     * @param cursor
-     * @return the inserted table
-     */
-    public XWPFTable insertNewTbl(final XmlCursor cursor) {
-        if (isCursorInHdrF(cursor)) {
-            String uri = CTTbl.type.getName().getNamespaceURI();
-            String localPart = "tbl";
-            cursor.beginElement(localPart, uri);
-            cursor.toParent();
-            CTTbl t = (CTTbl) cursor.getObject();
-            XWPFTable newT = new XWPFTable(t, this);
-            cursor.removeXmlContents();
-            XmlObject o = null;
-            while (!(o instanceof CTTbl) && (cursor.toPrevSibling())) {
-                o = cursor.getObject();
-            }
-            if (!(o instanceof CTTbl)) {
-                tables.add(0, newT);
-            } else {
-                int pos = tables.indexOf(getTable((CTTbl) o)) + 1;
-                tables.add(pos, newT);
-            }
-            int i = 0;
-            XmlCursor cursor2 = t.newCursor();
-            while (cursor2.toPrevSibling()) {
-                o = cursor2.getObject();
-                if (o instanceof CTP || o instanceof CTTbl) {
-                    i++;
-                }
-            }
-            cursor2.dispose();
-            bodyElements.add(i, newT);
-            cursor2 = t.newCursor();
-            cursor.toCursor(cursor2);
-            cursor.toEndToken();
-            cursor2.dispose();
-            return newT;
-        }
-        return null;
-    }
-
-    /**
-     * verifies that cursor is on the right position
-     *
-     * @param cursor
-     */
-    private boolean isCursorInHdrF(XmlCursor cursor) {
-        XmlCursor verify = cursor.newCursor();
-        verify.toParent();
-        boolean result = (verify.getObject() == this.headerFooter);
-        verify.dispose();
-        return result;
-    }
-
-
-    public POIXMLDocumentPart getOwner() {
-        return this;
-    }
-
-    /**
-     * Returns the table at position pos
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTableArray(int)
-     */
-    public XWPFTable getTableArray(int pos) {
-        if (pos >= 0 && pos < tables.size()) {
-            return tables.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * inserts an existing XWPFTable to the arrays bodyElements and tables
-     *
-     * @param pos
-     * @param table
-     */
-    public void insertTable(int pos, XWPFTable table) {
-        bodyElements.add(pos, table);
-        int i = 0;
-        for (CTTbl tbl : headerFooter.getTblArray()) {
-            if (tbl == table.getCTTbl()) {
-                break;
-            }
-            i++;
-        }
-        tables.add(i, table);
-
-    }
-
-    public void readHdrFtr() {
-        bodyElements = new ArrayList<IBodyElement>();
-        paragraphs = new ArrayList<XWPFParagraph>();
-        tables = new ArrayList<XWPFTable>();
-        // parse the document with cursor and add
-        // the XmlObject to its lists
-        XmlCursor cursor = headerFooter.newCursor();
-        cursor.selectPath("./*");
-        while (cursor.toNextSelection()) {
-            XmlObject o = cursor.getObject();
-            if (o instanceof CTP) {
-                XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                paragraphs.add(p);
-                bodyElements.add(p);
-            }
-            if (o instanceof CTTbl) {
-                XWPFTable t = new XWPFTable((CTTbl) o, this);
-                tables.add(t);
-                bodyElements.add(t);
-            }
-        }
-        cursor.dispose();
-    }
-
-    /**
-     * get the TableCell which belongs to the TableCell
-     *
-     * @param cell
-     */
-    public XWPFTableCell getTableCell(CTTc cell) {
-        XmlCursor cursor = cell.newCursor();
-        cursor.toParent();
-        XmlObject o = cursor.getObject();
-        if (!(o instanceof CTRow)) {
-            cursor.dispose();
-            return null;
-        }
-        CTRow row = (CTRow) o;
-        cursor.toParent();
-        o = cursor.getObject();
-        cursor.dispose();
-        if (!(o instanceof CTTbl)) {
-            return null;
-        }
-        CTTbl tbl = (CTTbl) o;
-        XWPFTable table = getTable(tbl);
-        if (table == null) {
-            return null;
-        }
-        XWPFTableRow tableRow = table.getRow(row);
-        return tableRow.getTableCell(cell);
-    }
-
-    public XWPFDocument getXWPFDocument() {
-        if (document != null) {
-            return document;
-        } else {
-            return (XWPFDocument) getParent();
-        }
-    }
-
-    public void setXWPFDocument(XWPFDocument doc) {
-        document = doc;
-    }
-
-    /**
-     * returns the Part, to which the body belongs, which you need for adding relationship to other parts
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPart()
-     */
-    public POIXMLDocumentPart getPart() {
-        return this;
-    }
-    
-    @Override
-    protected void prepareForCommit() {
-        // must contain at least an empty paragraph
-        if (bodyElements.size() == 0) {
-            createParagraph();
-        }
-        
-        // Cells must contain at least an empty paragraph
-        for (XWPFTable tbl : tables) {
-            for (XWPFTableRow row : tbl.tableRows) {
-                for (XWPFTableCell cell : row.getTableCells()) {
-                    if (cell.getBodyElements().size() == 0) {
-                        cell.addParagraph();
-                    }
-                }
-            }
-        }
-        super.prepareForCommit();
-        
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
deleted file mode 100644
index c00f75a..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-/**
- * Sketch of XWPF hyperlink class
- *
- * @author Yury Batrakov (batrakov at gmail.com)
- */
-public class XWPFHyperlink {
-    String id, url;
-
-    public XWPFHyperlink(String id, String url) {
-        this.id = id;
-        this.url = url;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getURL() {
-        return url;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
deleted file mode 100644
index 9a79b20..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHyperlink;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-
-/**
- * A run of text with a Hyperlink applied to it.
- * Any given Hyperlink may be made up of multiple of these.
- */
-public class XWPFHyperlinkRun extends XWPFRun {
-    private CTHyperlink hyperlink;
-
-    public XWPFHyperlinkRun(CTHyperlink hyperlink, CTR run, IRunBody p) {
-        super(run, p);
-        this.hyperlink = hyperlink;
-    }
-
-    @Internal
-    public CTHyperlink getCTHyperlink() {
-        return hyperlink;
-    }
-
-    public String getAnchor() {
-        return hyperlink.getAnchor();
-    }
-
-    /**
-     * Returns the ID of the hyperlink, if one is set.
-     */
-    public String getHyperlinkId() {
-        return hyperlink.getId();
-    }
-
-    public void setHyperlinkId(String id) {
-        hyperlink.setId(id);
-    }
-
-    /**
-     * If this Hyperlink is an external reference hyperlink,
-     * return the object for it.
-     */
-    public XWPFHyperlink getHyperlink(XWPFDocument document) {
-        String id = getHyperlinkId();
-        if (id == null)
-            return null;
-
-        return document.getHyperlinkByID(id);
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
deleted file mode 100644
index da8b983..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLatentStyles;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLsdException;
-
-public class XWPFLatentStyles {
-    // As of 2016-06-10, POI does not contain a LatentStyle class, nor was one included in the patch for bug 48574.
-    protected XWPFStyles styles; //LatentStyle shall know styles
-    private CTLatentStyles latentStyles;
-
-    protected XWPFLatentStyles() {
-    }
-
-    protected XWPFLatentStyles(CTLatentStyles latentStyles) {
-        this(latentStyles, null);
-    }
-
-    protected XWPFLatentStyles(CTLatentStyles latentStyles, XWPFStyles styles) {
-        this.latentStyles = latentStyles;
-        this.styles = styles;
-    }
-
-    public int getNumberOfStyles() {
-        return latentStyles.sizeOfLsdExceptionArray();
-    }
-
-    /**
-     * checks whether specific LatentStyleID is a latentStyle
-     */
-    protected boolean isLatentStyle(String latentStyleID) {
-        for (CTLsdException lsd : latentStyles.getLsdExceptionArray()) {
-            if (lsd.getName().equals(latentStyleID)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
deleted file mode 100644
index 7674510..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
-
-/**
- * TODO Bring more of the logic over from XWPFParagraph
- */
-public class XWPFNum {
-    protected XWPFNumbering numbering;
-    private CTNum ctNum;
-
-    public XWPFNum() {
-        this.ctNum = null;
-        this.numbering = null;
-    }
-
-    public XWPFNum(CTNum ctNum) {
-        this.ctNum = ctNum;
-        this.numbering = null;
-    }
-
-    public XWPFNum(XWPFNumbering numbering) {
-        this.ctNum = null;
-        this.numbering = numbering;
-    }
-
-    public XWPFNum(CTNum ctNum, XWPFNumbering numbering) {
-        this.ctNum = ctNum;
-        this.numbering = numbering;
-    }
-
-    public XWPFNumbering getNumbering() {
-        return numbering;
-    }
-
-    public void setNumbering(XWPFNumbering numbering) {
-        this.numbering = numbering;
-    }
-
-    public CTNum getCTNum() {
-        return ctNum;
-    }
-
-    public void setCTNum(CTNum ctNum) {
-        this.ctNum = ctNum;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
deleted file mode 100644
index 10b42f8..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumbering;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.NumberingDocument;
-
-/**
- * @author Philipp Epp
- */
-public class XWPFNumbering extends POIXMLDocumentPart {
-    protected List<XWPFAbstractNum> abstractNums = new ArrayList<XWPFAbstractNum>();
-    protected List<XWPFNum> nums = new ArrayList<XWPFNum>();
-    boolean isNew;
-    private CTNumbering ctNumbering;
-
-    /**
-     * create a new styles object with an existing document
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public XWPFNumbering(PackagePart part) throws IOException, OpenXML4JException {
-        super(part);
-        isNew = true;
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFNumbering(PackagePart part, PackageRelationship rel) throws IOException, OpenXML4JException {
-        this(part);
-    }
-    
-    /**
-     * create a new XWPFNumbering object for use in a new document
-     */
-    public XWPFNumbering() {
-        abstractNums = new ArrayList<XWPFAbstractNum>();
-        nums = new ArrayList<XWPFNum>();
-        isNew = true;
-    }
-
-    /**
-     * read numbering form an existing package
-     */
-    @Override
-    protected void onDocumentRead() throws IOException {
-        NumberingDocument numberingDoc = null;
-        InputStream is;
-        is = getPackagePart().getInputStream();
-        try {
-            numberingDoc = NumberingDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            ctNumbering = numberingDoc.getNumbering();
-            //get any Nums
-            for (CTNum ctNum : ctNumbering.getNumArray()) {
-                nums.add(new XWPFNum(ctNum, this));
-            }
-            for (CTAbstractNum ctAbstractNum : ctNumbering.getAbstractNumArray()) {
-                abstractNums.add(new XWPFAbstractNum(ctAbstractNum, this));
-            }
-            isNew = false;
-        } catch (XmlException e) {
-            throw new POIXMLException();
-        } finally {
-            is.close();
-        }
-    }
-
-    /**
-     * save and commit numbering
-     */
-    @Override
-    protected void commit() throws IOException {
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTNumbering.type.getName().getNamespaceURI(), "numbering"));
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        ctNumbering.save(out, xmlOptions);
-        out.close();
-    }
-
-
-    /**
-     * Sets the ctNumbering
-     *
-     * @param numbering
-     */
-    public void setNumbering(CTNumbering numbering) {
-        ctNumbering = numbering;
-    }
-
-
-    /**
-     * Checks whether number with numID exists
-     *
-     * @param numID
-     * @return boolean        true if num exist, false if num not exist
-     */
-    public boolean numExist(BigInteger numID) {
-        for (XWPFNum num : nums) {
-            if (num.getCTNum().getNumId().equals(numID))
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * add a new number to the numbering document
-     *
-     * @param num
-     */
-    public BigInteger addNum(XWPFNum num) {
-        ctNumbering.addNewNum();
-        int pos = ctNumbering.sizeOfNumArray() - 1;
-        ctNumbering.setNumArray(pos, num.getCTNum());
-        nums.add(num);
-        return num.getCTNum().getNumId();
-    }
-
-    /**
-     * Add a new num with an abstractNumID
-     *
-     * @return return NumId of the added num
-     */
-    public BigInteger addNum(BigInteger abstractNumID) {
-        CTNum ctNum = this.ctNumbering.addNewNum();
-        ctNum.addNewAbstractNumId();
-        ctNum.getAbstractNumId().setVal(abstractNumID);
-        ctNum.setNumId(BigInteger.valueOf(nums.size() + 1));
-        XWPFNum num = new XWPFNum(ctNum, this);
-        nums.add(num);
-        return ctNum.getNumId();
-    }
-
-    /**
-     * Add a new num with an abstractNumID and a numID
-     *
-     * @param abstractNumID
-     * @param numID
-     */
-    public void addNum(BigInteger abstractNumID, BigInteger numID) {
-        CTNum ctNum = this.ctNumbering.addNewNum();
-        ctNum.addNewAbstractNumId();
-        ctNum.getAbstractNumId().setVal(abstractNumID);
-        ctNum.setNumId(numID);
-        XWPFNum num = new XWPFNum(ctNum, this);
-        nums.add(num);
-    }
-
-    /**
-     * get Num by NumID
-     *
-     * @param numID
-     * @return abstractNum with NumId if no Num exists with that NumID
-     * null will be returned
-     */
-    public XWPFNum getNum(BigInteger numID) {
-        for (XWPFNum num : nums) {
-            if (num.getCTNum().getNumId().equals(numID))
-                return num;
-        }
-        return null;
-    }
-
-    /**
-     * get AbstractNum by abstractNumID
-     *
-     * @param abstractNumID
-     * @return abstractNum with abstractNumId if no abstractNum exists with that abstractNumID
-     * null will be returned
-     */
-    public XWPFAbstractNum getAbstractNum(BigInteger abstractNumID) {
-        for (XWPFAbstractNum abstractNum : abstractNums) {
-            if (abstractNum.getAbstractNum().getAbstractNumId().equals(abstractNumID)) {
-                return abstractNum;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Compare AbstractNum with abstractNums of this numbering document.
-     * If the content of abstractNum equals with an abstractNum of the List in numbering
-     * the BigInteger Value of it will be returned.
-     * If no equal abstractNum is existing null will be returned
-     *
-     * @param abstractNum
-     * @return BigInteger
-     */
-    public BigInteger getIdOfAbstractNum(XWPFAbstractNum abstractNum) {
-        CTAbstractNum copy = (CTAbstractNum) abstractNum.getCTAbstractNum().copy();
-        XWPFAbstractNum newAbstractNum = new XWPFAbstractNum(copy, this);
-        int i;
-        for (i = 0; i < abstractNums.size(); i++) {
-            newAbstractNum.getCTAbstractNum().setAbstractNumId(BigInteger.valueOf(i));
-            newAbstractNum.setNumbering(this);
-            if (newAbstractNum.getCTAbstractNum().valueEquals(abstractNums.get(i).getCTAbstractNum())) {
-                return newAbstractNum.getCTAbstractNum().getAbstractNumId();
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * add a new AbstractNum and return its AbstractNumID
-     *
-     * @param abstractNum
-     */
-    public BigInteger addAbstractNum(XWPFAbstractNum abstractNum) {
-        int pos = abstractNums.size();
-        if (abstractNum.getAbstractNum() != null) { // Use the current CTAbstractNum if it exists
-            ctNumbering.addNewAbstractNum().set(abstractNum.getAbstractNum());
-        } else {
-            ctNumbering.addNewAbstractNum();
-            abstractNum.getAbstractNum().setAbstractNumId(BigInteger.valueOf(pos));
-            ctNumbering.setAbstractNumArray(pos, abstractNum.getAbstractNum());
-        }
-        abstractNums.add(abstractNum);
-        return abstractNum.getCTAbstractNum().getAbstractNumId();
-    }
-
-    /**
-     * remove an existing abstractNum
-     *
-     * @param abstractNumID
-     * @return true if abstractNum with abstractNumID exists in NumberingArray,
-     * false if abstractNum with abstractNumID not exists
-     */
-    public boolean removeAbstractNum(BigInteger abstractNumID) {
-        if (abstractNumID.byteValue() < abstractNums.size()) {
-            ctNumbering.removeAbstractNum(abstractNumID.byteValue());
-            abstractNums.remove(abstractNumID.byteValue());
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * return the abstractNumID
-     * If the AbstractNumID not exists
-     * return null
-     *
-     * @param numID
-     * @return abstractNumID
-     */
-    public BigInteger getAbstractNumID(BigInteger numID) {
-        XWPFNum num = getNum(numID);
-        if (num == null)
-            return null;
-        if (num.getCTNum() == null)
-            return null;
-        if (num.getCTNum().getAbstractNumId() == null)
-            return null;
-        return num.getCTNum().getAbstractNumId().getVal();
-    }
-}
-
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
deleted file mode 100644
index 4e2d365..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ /dev/null
@@ -1,1581 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.util.Internal;
-import org.apache.poi.wp.usermodel.Paragraph;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDecimalNumber;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdnRef;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHyperlink;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTInd;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLvl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumLvl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPBdr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTProofErr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRunTrackChange;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtRun;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSimpleField;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSmartTagRun;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSpacing;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextAlignment;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STLineSpacingRule;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTextAlignment;
-
-/**
- * <p>A Paragraph within a Document, Table, Header etc.</p>
- * <p/>
- * <p>A paragraph has a lot of styling information, but the
- * actual text (possibly along with more styling) is held on
- * the child {@link XWPFRun}s.</p>
- */
-public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Paragraph {
-    private final CTP paragraph;
-    protected IBody part;
-    /**
-     * For access to the document's hyperlink, comments, tables etc
-     */
-    protected XWPFDocument document;
-    protected List<XWPFRun> runs;
-    protected List<IRunElement> iruns;
-
-    private StringBuffer footnoteText = new StringBuffer();
-
-    public XWPFParagraph(CTP prgrph, IBody part) {
-        this.paragraph = prgrph;
-        this.part = part;
-
-        this.document = part.getXWPFDocument();
-
-        if (document == null) {
-            throw new NullPointerException();
-        }
-
-        // Build up the character runs
-        runs = new ArrayList<XWPFRun>();
-        iruns = new ArrayList<IRunElement>();
-        buildRunsInOrderFromXml(paragraph);
-
-        // Look for bits associated with the runs
-        for (XWPFRun run : runs) {
-            CTR r = run.getCTR();
-
-            // Check for bits that only apply when attached to a core document
-            // TODO Make this nicer by tracking the XWPFFootnotes directly
-            XmlCursor c = r.newCursor();
-            c.selectPath("child::*");
-            while (c.toNextSelection()) {
-                XmlObject o = c.getObject();
-                if (o instanceof CTFtnEdnRef) {
-                    CTFtnEdnRef ftn = (CTFtnEdnRef) o;
-                    footnoteText.append(" [").append(ftn.getId()).append(": ");
-                    XWPFFootnote footnote =
-                            ftn.getDomNode().getLocalName().equals("footnoteReference") ?
-                                    document.getFootnoteByID(ftn.getId().intValue()) :
-                                    document.getEndnoteByID(ftn.getId().intValue());
-
-                    boolean first = true;
-                    for (XWPFParagraph p : footnote.getParagraphs()) {
-                        if (!first) {
-                            footnoteText.append("\n");
-                            first = false;
-                        }
-                        footnoteText.append(p.getText());
-                    }
-
-                    footnoteText.append("] ");
-                }
-            }
-            c.dispose();
-        }
-    }
-
-    /**
-     * Identifies (in order) the parts of the paragraph /
-     * sub-paragraph that correspond to character text
-     * runs, and builds the appropriate runs for these.
-     */
-    @SuppressWarnings("deprecation")
-    private void buildRunsInOrderFromXml(XmlObject object) {
-        XmlCursor c = object.newCursor();
-        c.selectPath("child::*");
-        while (c.toNextSelection()) {
-            XmlObject o = c.getObject();
-            if (o instanceof CTR) {
-                XWPFRun r = new XWPFRun((CTR) o, this);
-                runs.add(r);
-                iruns.add(r);
-            }
-            if (o instanceof CTHyperlink) {
-                CTHyperlink link = (CTHyperlink)o;
-                for (CTR r : link.getRArray()) {
-                    XWPFHyperlinkRun hr = new XWPFHyperlinkRun(link, r, this);
-                    runs.add(hr);
-                    iruns.add(hr);
-                }
-            }
-            if (o instanceof CTSimpleField) {
-                CTSimpleField field = (CTSimpleField)o;
-                for (CTR r : field.getRArray()) {
-                    XWPFFieldRun fr = new XWPFFieldRun(field, r, this);
-                    runs.add(fr);
-                    iruns.add(fr);
-                }
-            }
-            if (o instanceof CTSdtBlock) {
-                XWPFSDT cc = new XWPFSDT((CTSdtBlock) o, part);
-                iruns.add(cc);
-            }
-            if (o instanceof CTSdtRun) {
-                XWPFSDT cc = new XWPFSDT((CTSdtRun) o, part);
-                iruns.add(cc);
-            }
-            if (o instanceof CTRunTrackChange) {
-                for (CTR r : ((CTRunTrackChange) o).getRArray()) {
-                    XWPFRun cr = new XWPFRun(r, this);
-                    runs.add(cr);
-                    iruns.add(cr);
-                }
-            }
-            if (o instanceof CTSmartTagRun) {
-                // Smart Tags can be nested many times.
-                // This implementation does not preserve the tagging information
-                buildRunsInOrderFromXml(o);
-            }
-        }
-        c.dispose();
-    }
-
-    @Internal
-    public CTP getCTP() {
-        return paragraph;
-    }
-
-    public List<XWPFRun> getRuns() {
-        return Collections.unmodifiableList(runs);
-    }
-
-    /**
-     * Return literal runs and sdt/content control objects.
-     *
-     * @return List<IRunElement>
-     */
-    public List<IRunElement> getIRuns() {
-        return Collections.unmodifiableList(iruns);
-    }
-
-    public boolean isEmpty() {
-        return !paragraph.getDomNode().hasChildNodes();
-    }
-
-    public XWPFDocument getDocument() {
-        return document;
-    }
-
-    /**
-     * Return the textual content of the paragraph, including text from pictures
-     * and sdt elements in it.
-     */
-    public String getText() {
-        StringBuffer out = new StringBuffer();
-        for (IRunElement run : iruns) {
-            if (run instanceof XWPFRun) {
-                XWPFRun xRun = (XWPFRun) run;
-                // don't include the text if reviewing is enabled and this is a deleted run
-                if (!xRun.getCTR().isSetRsidDel()) {
-                    out.append(xRun.toString());
-                }
-            } else if (run instanceof XWPFSDT) {
-                out.append(((XWPFSDT) run).getContent().getText());
-            } else {
-                out.append(run.toString());
-            }
-        }
-        out.append(footnoteText);
-        return out.toString();
-    }
-
-    /**
-     * Return styleID of the paragraph if style exist for this paragraph
-     * if not, null will be returned
-     *
-     * @return styleID as String
-     */
-    public String getStyleID() {
-        if (paragraph.getPPr() != null) {
-            if (paragraph.getPPr().getPStyle() != null) {
-                if (paragraph.getPPr().getPStyle().getVal() != null)
-                    return paragraph.getPPr().getPStyle().getVal();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * If style exist for this paragraph
-     * NumId of the paragraph will be returned.
-     * If style not exist null will be returned
-     *
-     * @return NumID as BigInteger
-     */
-    public BigInteger getNumID() {
-        if (paragraph.getPPr() != null) {
-            if (paragraph.getPPr().getNumPr() != null) {
-                if (paragraph.getPPr().getNumPr().getNumId() != null)
-                    return paragraph.getPPr().getNumPr().getNumId().getVal();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * setNumID of Paragraph
-     *
-     * @param numPos
-     */
-    public void setNumID(BigInteger numPos) {
-        if (paragraph.getPPr() == null)
-            paragraph.addNewPPr();
-        if (paragraph.getPPr().getNumPr() == null)
-            paragraph.getPPr().addNewNumPr();
-        if (paragraph.getPPr().getNumPr().getNumId() == null) {
-            paragraph.getPPr().getNumPr().addNewNumId();
-        }
-        paragraph.getPPr().getNumPr().getNumId().setVal(numPos);
-    }
-
-    /**
-     * Returns Ilvl of the numeric style for this paragraph.
-     * Returns null if this paragraph does not have numeric style.
-     *
-     * @return Ilvl as BigInteger
-     */
-    public BigInteger getNumIlvl() {
-        if (paragraph.getPPr() != null) {
-            if (paragraph.getPPr().getNumPr() != null) {
-                if (paragraph.getPPr().getNumPr().getIlvl() != null)
-                    return paragraph.getPPr().getNumPr().getIlvl().getVal();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns numbering format for this paragraph, eg bullet or
-     * lowerLetter.
-     * Returns null if this paragraph does not have numeric style.
-     */
-    public String getNumFmt() {
-        BigInteger numID = getNumID();
-        XWPFNumbering numbering = document.getNumbering();
-        if (numID != null && numbering != null) {
-            XWPFNum num = numbering.getNum(numID);
-            if (num != null) {
-                BigInteger ilvl = getNumIlvl();
-                BigInteger abstractNumId = num.getCTNum().getAbstractNumId().getVal();
-                CTAbstractNum anum = numbering.getAbstractNum(abstractNumId).getAbstractNum();
-                CTLvl level = null;
-                for (int i = 0; i < anum.sizeOfLvlArray(); i++) {
-                    CTLvl lvl = anum.getLvlArray(i);
-                    if (lvl.getIlvl().equals(ilvl)) {
-                        level = lvl;
-                        break;
-                    }
-                }
-                if (level != null && level.getNumFmt() != null
-                        && level.getNumFmt().getVal() != null)
-                    return level.getNumFmt().getVal().toString();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the text that should be used around the paragraph level numbers.
-     *
-     * @return a string (e.g. "%1.") or null if the value is not found.
-     */
-    public String getNumLevelText() {
-        BigInteger numID = getNumID();
-        XWPFNumbering numbering = document.getNumbering();
-        if (numID != null && numbering != null) {
-            XWPFNum num = numbering.getNum(numID);
-            if (num != null) {
-                BigInteger ilvl = getNumIlvl();
-                CTNum ctNum = num.getCTNum();
-                if (ctNum == null)
-                    return null;
-
-                CTDecimalNumber ctDecimalNumber = ctNum.getAbstractNumId();
-                if (ctDecimalNumber == null)
-                    return null;
-
-                BigInteger abstractNumId = ctDecimalNumber.getVal();
-                if (abstractNumId == null)
-                    return null;
-
-                XWPFAbstractNum xwpfAbstractNum = numbering.getAbstractNum(abstractNumId);
-
-                if (xwpfAbstractNum == null)
-                    return null;
-
-                CTAbstractNum anum = xwpfAbstractNum.getCTAbstractNum();
-
-                if (anum == null)
-                    return null;
-
-                CTLvl level = null;
-                for (int i = 0; i < anum.sizeOfLvlArray(); i++) {
-                    CTLvl lvl = anum.getLvlArray(i);
-                    if (lvl != null && lvl.getIlvl() != null && lvl.getIlvl().equals(ilvl)) {
-                        level = lvl;
-                        break;
-                    }
-                }
-                if (level != null && level.getLvlText() != null
-                        && level.getLvlText().getVal() != null)
-                    return level.getLvlText().getVal().toString();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Gets the numstartOverride for the paragraph numbering for this paragraph.
-     *
-     * @return returns the overridden start number or null if there is no override for this paragraph.
-     */
-    public BigInteger getNumStartOverride() {
-        BigInteger numID = getNumID();
-        XWPFNumbering numbering = document.getNumbering();
-        if (numID != null && numbering != null) {
-            XWPFNum num = numbering.getNum(numID);
-
-            if (num != null) {
-                CTNum ctNum = num.getCTNum();
-                if (ctNum == null) {
-                    return null;
-                }
-                BigInteger ilvl = getNumIlvl();
-                CTNumLvl level = null;
-                for (int i = 0; i < ctNum.sizeOfLvlOverrideArray(); i++) {
-                    CTNumLvl ctNumLvl = ctNum.getLvlOverrideArray(i);
-                    if (ctNumLvl != null && ctNumLvl.getIlvl() != null &&
-                            ctNumLvl.getIlvl().equals(ilvl)) {
-                        level = ctNumLvl;
-                        break;
-                    }
-                }
-                if (level != null && level.getStartOverride() != null) {
-                    return level.getStartOverride().getVal();
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the text of the paragraph, but not of any objects in the
-     * paragraph
-     */
-    public String getParagraphText() {
-        StringBuffer out = new StringBuffer();
-        for (XWPFRun run : runs) {
-            out.append(run.toString());
-        }
-        return out.toString();
-    }
-
-    /**
-     * Returns any text from any suitable pictures in the paragraph
-     */
-    public String getPictureText() {
-        StringBuffer out = new StringBuffer();
-        for (XWPFRun run : runs) {
-            out.append(run.getPictureText());
-        }
-        return out.toString();
-    }
-
-    /**
-     * Returns the footnote text of the paragraph
-     *
-     * @return the footnote text or empty string if the paragraph does not have footnotes
-     */
-    public String getFootnoteText() {
-        return footnoteText.toString();
-    }
-
-    /**
-     * Returns the paragraph alignment which shall be applied to text in this
-     * paragraph.
-     * <p/>
-     * <p/>
-     * If this element is not set on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then no alignment is applied to the
-     * paragraph.
-     * </p>
-     *
-     * @return the paragraph alignment of this paragraph.
-     */
-    public ParagraphAlignment getAlignment() {
-        CTPPr pr = getCTPPr();
-        return pr == null || !pr.isSetJc() ? ParagraphAlignment.LEFT
-                : ParagraphAlignment.valueOf(pr.getJc().getVal().intValue());
-    }
-
-    /**
-     * Specifies the paragraph alignment which shall be applied to text in this
-     * paragraph.
-     * <p/>
-     * <p/>
-     * If this element is not set on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then no alignment is applied to the
-     * paragraph.
-     * </p>
-     *
-     * @param align the paragraph alignment to apply to this paragraph.
-     */
-    public void setAlignment(ParagraphAlignment align) {
-        CTPPr pr = getCTPPr();
-        CTJc jc = pr.isSetJc() ? pr.getJc() : pr.addNewJc();
-        STJc.Enum en = STJc.Enum.forInt(align.getValue());
-        jc.setVal(en);
-    }
-
-    /**
-     * @return The raw alignment value, {@link #getAlignment()} is suggested
-     */
-    public int getFontAlignment() {
-        return getAlignment().getValue();
-    }
-
-    public void setFontAlignment(int align) {
-        ParagraphAlignment pAlign = ParagraphAlignment.valueOf(align);
-        setAlignment(pAlign);
-    }
-
-    /**
-     * Returns the text vertical alignment which shall be applied to text in
-     * this paragraph.
-     * <p/>
-     * If the line height (before any added spacing) is larger than one or more
-     * characters on the line, all characters will be aligned to each other as
-     * specified by this element.
-     * </p>
-     * <p/>
-     * If this element is omitted on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then the vertical alignment of all
-     * characters on the line shall be automatically determined by the consumer.
-     * </p>
-     *
-     * @return the vertical alignment of this paragraph.
-     */
-    public TextAlignment getVerticalAlignment() {
-        CTPPr pr = getCTPPr();
-        return (pr == null || !pr.isSetTextAlignment()) ? TextAlignment.AUTO
-                : TextAlignment.valueOf(pr.getTextAlignment().getVal()
-                .intValue());
-    }
-
-    /**
-     * Specifies the text vertical alignment which shall be applied to text in
-     * this paragraph.
-     * <p/>
-     * If the line height (before any added spacing) is larger than one or more
-     * characters on the line, all characters will be aligned to each other as
-     * specified by this element.
-     * </p>
-     * <p/>
-     * If this element is omitted on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then the vertical alignment of all
-     * characters on the line shall be automatically determined by the consumer.
-     * </p>
-     *
-     * @param valign the paragraph vertical alignment to apply to this
-     *               paragraph.
-     */
-    public void setVerticalAlignment(TextAlignment valign) {
-        CTPPr pr = getCTPPr();
-        CTTextAlignment textAlignment = pr.isSetTextAlignment() ? pr
-                .getTextAlignment() : pr.addNewTextAlignment();
-        STTextAlignment.Enum en = STTextAlignment.Enum
-                .forInt(valign.getValue());
-        textAlignment.setVal(en);
-    }
-
-    /**
-     * Specifies the border which shall be displayed above a set of paragraphs
-     * which have the same set of paragraph border settings.
-     *
-     * @return paragraphBorder - the top border for the paragraph
-     * @see #setBorderTop(Borders)
-     * @see Borders a list of all types of borders
-     */
-    public Borders getBorderTop() {
-        CTPBdr border = getCTPBrd(false);
-        CTBorder ct = null;
-        if (border != null) {
-            ct = border.getTop();
-        }
-        STBorder.Enum ptrn = (ct != null) ? ct.getVal() : STBorder.NONE;
-        return Borders.valueOf(ptrn.intValue());
-    }
-
-    /**
-     * Specifies the border which shall be displayed above a set of paragraphs
-     * which have the same set of paragraph border settings.
-     * <p/>
-     * <p/>
-     * To determine if any two adjoining paragraphs shall have an individual top
-     * and bottom border or a between border, the set of borders on the two
-     * adjoining paragraphs are compared. If the border information on those two
-     * paragraphs is identical for all possible paragraphs borders, then the
-     * between border is displayed. Otherwise, the final paragraph shall use its
-     * bottom border and the following paragraph shall use its top border,
-     * respectively. If this border specifies a space attribute, that value
-     * determines the space above the text (ignoring any spacing above) which
-     * should be left before this border is drawn, specified in points.
-     * </p>
-     * <p/>
-     * If this element is omitted on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then no between border shall be applied
-     * above identical paragraphs.
-     * </p>
-     * <b>This border can only be a line border.</b>
-     *
-     * @param border
-     * @see Borders for a list of all types of borders
-     */
-    public void setBorderTop(Borders border) {
-        CTPBdr ct = getCTPBrd(true);
-        if (ct == null) {
-            throw new RuntimeException("invalid paragraph state");
-        }
-
-        CTBorder pr = (ct.isSetTop()) ? ct.getTop() : ct.addNewTop();
-        if (border.getValue() == Borders.NONE.getValue())
-            ct.unsetTop();
-        else
-            pr.setVal(STBorder.Enum.forInt(border.getValue()));
-    }
-
-    /**
-     * Specifies the border which shall be displayed below a set of
-     * paragraphs which have the same set of paragraph border settings.
-     *
-     * @return paragraphBorder - the bottom border for the paragraph
-     * @see #setBorderBottom(Borders)
-     * @see Borders a list of all types of borders
-     */
-    public Borders getBorderBottom() {
-        CTPBdr border = getCTPBrd(false);
-        CTBorder ct = null;
-        if (border != null) {
-            ct = border.getBottom();
-        }
-        STBorder.Enum ptrn = ct != null ? ct.getVal() : STBorder.NONE;
-        return Borders.valueOf(ptrn.intValue());
-    }
-
-    /**
-     * Specifies the border which shall be displayed below a set of paragraphs
-     * which have the same set of paragraph border settings.
-     * <p/>
-     * To determine if any two adjoining paragraphs shall have an individual top
-     * and bottom border or a between border, the set of borders on the two
-     * adjoining paragraphs are compared. If the border information on those two
-     * paragraphs is identical for all possible paragraphs borders, then the
-     * between border is displayed. Otherwise, the final paragraph shall use its
-     * bottom border and the following paragraph shall use its top border,
-     * respectively. If this border specifies a space attribute, that value
-     * determines the space after the bottom of the text (ignoring any space
-     * below) which should be left before this border is drawn, specified in
-     * points.
-     * </p>
-     * <p/>
-     * If this element is omitted on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then no between border shall be applied
-     * below identical paragraphs.
-     * </p>
-     * <b>This border can only be a line border.</b>
-     *
-     * @param border
-     * @see Borders a list of all types of borders
-     */
-    public void setBorderBottom(Borders border) {
-        CTPBdr ct = getCTPBrd(true);
-        CTBorder pr = ct.isSetBottom() ? ct.getBottom() : ct.addNewBottom();
-        if (border.getValue() == Borders.NONE.getValue())
-            ct.unsetBottom();
-        else
-            pr.setVal(STBorder.Enum.forInt(border.getValue()));
-    }
-
-    /**
-     * Specifies the border which shall be displayed on the left side of the
-     * page around the specified paragraph.
-     *
-     * @return ParagraphBorder - the left border for the paragraph
-     * @see #setBorderLeft(Borders)
-     * @see Borders for a list of all possible borders
-     */
-    public Borders getBorderLeft() {
-        CTPBdr border = getCTPBrd(false);
-        CTBorder ct = null;
-        if (border != null) {
-            ct = border.getLeft();
-        }
-        STBorder.Enum ptrn = ct != null ? ct.getVal() : STBorder.NONE;
-        return Borders.valueOf(ptrn.intValue());
-    }
-
-    /**
-     * Specifies the border which shall be displayed on the left side of the
-     * page around the specified paragraph.
-     * <p/>
-     * To determine if any two adjoining paragraphs should have a left border
-     * which spans the full line height or not, the left border shall be drawn
-     * between the top border or between border at the top (whichever would be
-     * rendered for the current paragraph), and the bottom border or between
-     * border at the bottom (whichever would be rendered for the current
-     * paragraph).
-     * </p>
-     * <p/>
-     * If this element is omitted on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then no left border shall be applied.
-     * </p>
-     * <b>This border can only be a line border.</b>
-     *
-     * @param border
-     * @see Borders for a list of all possible borders
-     */
-    public void setBorderLeft(Borders border) {
-        CTPBdr ct = getCTPBrd(true);
-        CTBorder pr = ct.isSetLeft() ? ct.getLeft() : ct.addNewLeft();
-        if (border.getValue() == Borders.NONE.getValue())
-            ct.unsetLeft();
-        else
-            pr.setVal(STBorder.Enum.forInt(border.getValue()));
-    }
-
-    /**
-     * Specifies the border which shall be displayed on the right side of the
-     * page around the specified paragraph.
-     *
-     * @return ParagraphBorder - the right border for the paragraph
-     * @see #setBorderRight(Borders)
-     * @see Borders for a list of all possible borders
-     */
-    public Borders getBorderRight() {
-        CTPBdr border = getCTPBrd(false);
-        CTBorder ct = null;
-        if (border != null) {
-            ct = border.getRight();
-        }
-        STBorder.Enum ptrn = ct != null ? ct.getVal() : STBorder.NONE;
-        return Borders.valueOf(ptrn.intValue());
-    }
-
-    /**
-     * Specifies the border which shall be displayed on the right side of the
-     * page around the specified paragraph.
-     * <p/>
-     * To determine if any two adjoining paragraphs should have a right border
-     * which spans the full line height or not, the right border shall be drawn
-     * between the top border or between border at the top (whichever would be
-     * rendered for the current paragraph), and the bottom border or between
-     * border at the bottom (whichever would be rendered for the current
-     * paragraph).
-     * </p>
-     * <p/>
-     * If this element is omitted on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then no right border shall be applied.
-     * </p>
-     * <b>This border can only be a line border.</b>
-     *
-     * @param border
-     * @see Borders for a list of all possible borders
-     */
-    public void setBorderRight(Borders border) {
-        CTPBdr ct = getCTPBrd(true);
-        CTBorder pr = ct.isSetRight() ? ct.getRight() : ct.addNewRight();
-        if (border.getValue() == Borders.NONE.getValue())
-            ct.unsetRight();
-        else
-            pr.setVal(STBorder.Enum.forInt(border.getValue()));
-    }
-
-    /**
-     * Specifies the border which shall be displayed between each paragraph in a
-     * set of paragraphs which have the same set of paragraph border settings.
-     *
-     * @return ParagraphBorder - the between border for the paragraph
-     * @see #setBorderBetween(Borders)
-     * @see Borders for a list of all possible borders
-     */
-    public Borders getBorderBetween() {
-        CTPBdr border = getCTPBrd(false);
-        CTBorder ct = null;
-        if (border != null) {
-            ct = border.getBetween();
-        }
-        STBorder.Enum ptrn = ct != null ? ct.getVal() : STBorder.NONE;
-        return Borders.valueOf(ptrn.intValue());
-    }
-
-    /**
-     * Specifies the border which shall be displayed between each paragraph in a
-     * set of paragraphs which have the same set of paragraph border settings.
-     * <p/>
-     * To determine if any two adjoining paragraphs should have a between border
-     * or an individual top and bottom border, the set of borders on the two
-     * adjoining paragraphs are compared. If the border information on those two
-     * paragraphs is identical for all possible paragraphs borders, then the
-     * between border is displayed. Otherwise, each paragraph shall use its
-     * bottom and top border, respectively. If this border specifies a space
-     * attribute, that value is ignored - this border is always located at the
-     * bottom of each paragraph with an identical following paragraph, taking
-     * into account any space after the line pitch.
-     * </p>
-     * <p/>
-     * If this element is omitted on a given paragraph, its value is determined
-     * by the setting previously set at any level of the style hierarchy (i.e.
-     * that previous setting remains unchanged). If this setting is never
-     * specified in the style hierarchy, then no between border shall be applied
-     * between identical paragraphs.
-     * </p>
-     * <b>This border can only be a line border.</b>
-     *
-     * @param border
-     * @see Borders for a list of all possible borders
-     */
-    public void setBorderBetween(Borders border) {
-        CTPBdr ct = getCTPBrd(true);
-        CTBorder pr = ct.isSetBetween() ? ct.getBetween() : ct.addNewBetween();
-        if (border.getValue() == Borders.NONE.getValue())
-            ct.unsetBetween();
-        else
-            pr.setVal(STBorder.Enum.forInt(border.getValue()));
-    }
-
-    /**
-     * Specifies that when rendering this document in a paginated
-     * view, the contents of this paragraph are rendered on the start of a new
-     * page in the document.
-     * <p/>
-     * If this element is omitted on a given paragraph,
-     * its value is determined by the setting previously set at any level of the
-     * style hierarchy (i.e. that previous setting remains unchanged). If this
-     * setting is never specified in the style hierarchy, then this property
-     * shall not be applied. Since the paragraph is specified to start on a new
-     * page, it begins page two even though it could have fit on page one.
-     * </p>
-     *
-     * @return boolean - if page break is set
-     */
-    public boolean isPageBreak() {
-        CTPPr ppr = getCTPPr();
-        CTOnOff ct_pageBreak = ppr.isSetPageBreakBefore() ? ppr
-                .getPageBreakBefore() : null;
-        if (ct_pageBreak != null
-                && ct_pageBreak.getVal().intValue() == STOnOff.INT_TRUE) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Specifies that when rendering this document in a paginated
-     * view, the contents of this paragraph are rendered on the start of a new
-     * page in the document.
-     * <p/>
-     * If this element is omitted on a given paragraph,
-     * its value is determined by the setting previously set at any level of the
-     * style hierarchy (i.e. that previous setting remains unchanged). If this
-     * setting is never specified in the style hierarchy, then this property
-     * shall not be applied. Since the paragraph is specified to start on a new
-     * page, it begins page two even though it could have fit on page one.
-     * </p>
-     *
-     * @param pageBreak -
-     *                  boolean value
-     */
-    public void setPageBreak(boolean pageBreak) {
-        CTPPr ppr = getCTPPr();
-        CTOnOff ct_pageBreak = ppr.isSetPageBreakBefore() ? ppr
-                .getPageBreakBefore() : ppr.addNewPageBreakBefore();
-        if (pageBreak)
-            ct_pageBreak.setVal(STOnOff.TRUE);
-        else
-            ct_pageBreak.setVal(STOnOff.FALSE);
-    }
-
-    /**
-     * Specifies the spacing that should be added after the last line in this
-     * paragraph in the document in absolute units.
-     *
-     * @return int - value representing the spacing after the paragraph
-     */
-    public int getSpacingAfter() {
-        CTSpacing spacing = getCTSpacing(false);
-        return (spacing != null && spacing.isSetAfter()) ? spacing.getAfter().intValue() : -1;
-    }
-
-    /**
-     * Specifies the spacing that should be added after the last line in this
-     * paragraph in the document in absolute units.
-     * <p/>
-     * If the afterLines attribute or the afterAutoSpacing attribute is also
-     * specified, then this attribute value is ignored.
-     * </p>
-     *
-     * @param spaces -
-     *               a positive whole number, whose contents consist of a
-     *               measurement in twentieths of a point.
-     */
-    public void setSpacingAfter(int spaces) {
-        CTSpacing spacing = getCTSpacing(true);
-        if (spacing != null) {
-            BigInteger bi = new BigInteger("" + spaces);
-            spacing.setAfter(bi);
-        }
-
-    }
-
-    /**
-     * Specifies the spacing that should be added after the last line in this
-     * paragraph in the document in absolute units.
-     *
-     * @return bigInteger - value representing the spacing after the paragraph
-     * @see #setSpacingAfterLines(int)
-     */
-    public int getSpacingAfterLines() {
-        CTSpacing spacing = getCTSpacing(false);
-        return (spacing != null && spacing.isSetAfterLines()) ? spacing.getAfterLines().intValue() : -1;
-    }
-
-    /**
-     * Specifies the spacing that should be added after the last line in this
-     * paragraph in the document in line units.
-     * <b>The value of this attribute is
-     * specified in one hundredths of a line.
-     * </b>
-     * <p/>
-     * If the afterAutoSpacing attribute
-     * is also specified, then this attribute value is ignored. If this setting
-     * is never specified in the style hierarchy, then its value shall be zero
-     * (if needed)
-     * </p>
-     *
-     * @param spaces -
-     *               a positive whole number, whose contents consist of a
-     *               measurement in twentieths of a
-     */
-    public void setSpacingAfterLines(int spaces) {
-        CTSpacing spacing = getCTSpacing(true);
-        BigInteger bi = new BigInteger("" + spaces);
-        spacing.setAfterLines(bi);
-    }
-
-    /**
-     * Specifies the spacing that should be added above the first line in this
-     * paragraph in the document in absolute units.
-     *
-     * @return the spacing that should be added above the first line
-     * @see #setSpacingBefore(int)
-     */
-    public int getSpacingBefore() {
-        CTSpacing spacing = getCTSpacing(false);
-        return (spacing != null && spacing.isSetBefore()) ? spacing.getBefore().intValue() : -1;
-    }
-
-    /**
-     * Specifies the spacing that should be added above the first line in this
-     * paragraph in the document in absolute units.
-     * <p/>
-     * If the beforeLines attribute or the beforeAutoSpacing attribute is also
-     * specified, then this attribute value is ignored.
-     * </p>
-     *
-     * @param spaces
-     */
-    public void setSpacingBefore(int spaces) {
-        CTSpacing spacing = getCTSpacing(true);
-        BigInteger bi = new BigInteger("" + spaces);
-        spacing.setBefore(bi);
-    }
-
-    /**
-     * Specifies the spacing that should be added before the first line in this paragraph in the
-     * document in line units.
-     * The value of this attribute is specified in one hundredths of a line.
-     *
-     * @return the spacing that should be added before the first line in this paragraph
-     * @see #setSpacingBeforeLines(int)
-     */
-    public int getSpacingBeforeLines() {
-        CTSpacing spacing = getCTSpacing(false);
-        return (spacing != null && spacing.isSetBeforeLines()) ? spacing.getBeforeLines().intValue() : -1;
-    }
-
-    /**
-     * Specifies the spacing that should be added before the first line in this
-     * paragraph in the document in line units. <b> The value of this attribute
-     * is specified in one hundredths of a line. </b>
-     * <p/>
-     * If the beforeAutoSpacing attribute is also specified, then this attribute
-     * value is ignored. If this setting is never specified in the style
-     * hierarchy, then its value shall be zero.
-     * </p>
-     *
-     * @param spaces
-     */
-    public void setSpacingBeforeLines(int spaces) {
-        CTSpacing spacing = getCTSpacing(true);
-        BigInteger bi = new BigInteger("" + spaces);
-        spacing.setBeforeLines(bi);
-    }
-
-    /**
-     * Specifies how the spacing between lines is calculated as stored in the
-     * line attribute. If this attribute is omitted, then it shall be assumed to
-     * be of a value auto if a line attribute value is present.
-     *
-     * @return rule
-     * @see LineSpacingRule
-     * @see #setSpacingLineRule(LineSpacingRule)
-     */
-    public LineSpacingRule getSpacingLineRule() {
-        CTSpacing spacing = getCTSpacing(false);
-        return (spacing != null && spacing.isSetLineRule()) ? LineSpacingRule.valueOf(spacing
-                .getLineRule().intValue()) : LineSpacingRule.AUTO;
-    }
-
-    /**
-     * Specifies how the spacing between lines is calculated as stored in the
-     * line attribute. If this attribute is omitted, then it shall be assumed to
-     * be of a value auto if a line attribute value is present.
-     *
-     * @param rule
-     * @see LineSpacingRule
-     */
-    public void setSpacingLineRule(LineSpacingRule rule) {
-        CTSpacing spacing = getCTSpacing(true);
-        spacing.setLineRule(STLineSpacingRule.Enum.forInt(rule.getValue()));
-    }
-
-    /**
-     * Specifies the indentation which shall be placed between the left text
-     * margin for this paragraph and the left edge of that paragraph's content
-     * in a left to right paragraph, and the right text margin and the right
-     * edge of that paragraph's text in a right to left paragraph
-     * <p/>
-     * If this attribute is omitted, its value shall be assumed to be zero.
-     * Negative values are defined such that the text is moved past the text margin,
-     * positive values move the text inside the text margin.
-     * </p>
-     *
-     * @return indentation or null if indentation is not set
-     */
-    public int getIndentationLeft() {
-        CTInd indentation = getCTInd(false);
-        return (indentation != null && indentation.isSetLeft()) ? indentation.getLeft().intValue()
-                : -1;
-    }
-
-    /**
-     * Specifies the indentation which shall be placed between the left text
-     * margin for this paragraph and the left edge of that paragraph's content
-     * in a left to right paragraph, and the right text margin and the right
-     * edge of that paragraph's text in a right to left paragraph
-     * <p/>
-     * If this attribute is omitted, its value shall be assumed to be zero.
-     * Negative values are defined such that the text is moved past the text margin,
-     * positive values move the text inside the text margin.
-     * </p>
-     *
-     * @param indentation
-     */
-    public void setIndentationLeft(int indentation) {
-        CTInd indent = getCTInd(true);
-        BigInteger bi = new BigInteger("" + indentation);
-        indent.setLeft(bi);
-    }
-
-    /**
-     * Specifies the indentation which shall be placed between the right text
-     * margin for this paragraph and the right edge of that paragraph's content
-     * in a left to right paragraph, and the right text margin and the right
-     * edge of that paragraph's text in a right to left paragraph
-     * <p/>
-     * If this attribute is omitted, its value shall be assumed to be zero.
-     * Negative values are defined such that the text is moved past the text margin,
-     * positive values move the text inside the text margin.
-     * </p>
-     *
-     * @return indentation or null if indentation is not set
-     */
-
-    public int getIndentationRight() {
-        CTInd indentation = getCTInd(false);
-        return (indentation != null && indentation.isSetRight()) ? indentation.getRight().intValue()
-                : -1;
-    }
-
-    /**
-     * Specifies the indentation which shall be placed between the right text
-     * margin for this paragraph and the right edge of that paragraph's content
-     * in a left to right paragraph, and the right text margin and the right
-     * edge of that paragraph's text in a right to left paragraph
-     * <p/>
-     * If this attribute is omitted, its value shall be assumed to be zero.
-     * Negative values are defined such that the text is moved past the text margin,
-     * positive values move the text inside the text margin.
-     * </p>
-     *
-     * @param indentation
-     */
-    public void setIndentationRight(int indentation) {
-        CTInd indent = getCTInd(true);
-        BigInteger bi = new BigInteger("" + indentation);
-        indent.setRight(bi);
-    }
-
-    /**
-     * Specifies the indentation which shall be removed from the first line of
-     * the parent paragraph, by moving the indentation on the first line back
-     * towards the beginning of the direction of text flow.
-     * This indentation is
-     * specified relative to the paragraph indentation which is specified for
-     * all other lines in the parent paragraph.
-     * The firstLine and hanging
-     * attributes are mutually exclusive, if both are specified, then the
-     * firstLine value is ignored.
-     *
-     * @return indentation or null if indentation is not set
-     */
-    public int getIndentationHanging() {
-        CTInd indentation = getCTInd(false);
-        return (indentation != null && indentation.isSetHanging()) ? indentation.getHanging().intValue() : -1;
-    }
-
-    /**
-     * Specifies the indentation which shall be removed from the first line of
-     * the parent paragraph, by moving the indentation on the first line back
-     * towards the beginning of the direction of text flow.
-     * This indentation is specified relative to the paragraph indentation which is specified for
-     * all other lines in the parent paragraph.
-     * <p/>
-     * The firstLine and hanging attributes are mutually exclusive, if both are specified, then the
-     * firstLine value is ignored.
-     * </p>
-     *
-     * @param indentation
-     */
-
-    public void setIndentationHanging(int indentation) {
-        CTInd indent = getCTInd(true);
-        BigInteger bi = new BigInteger("" + indentation);
-        indent.setHanging(bi);
-    }
-
-    /**
-     * Specifies the additional indentation which shall be applied to the first
-     * line of the parent paragraph. This additional indentation is specified
-     * relative to the paragraph indentation which is specified for all other
-     * lines in the parent paragraph.
-     * The firstLine and hanging attributes are
-     * mutually exclusive, if both are specified, then the firstLine value is
-     * ignored.
-     * If the firstLineChars attribute is also specified, then this
-     * value is ignored.
-     * If this attribute is omitted, then its value shall be
-     * assumed to be zero (if needed).
-     *
-     * @return indentation or null if indentation is not set
-     */
-    public int getIndentationFirstLine() {
-        CTInd indentation = getCTInd(false);
-        return (indentation != null && indentation.isSetFirstLine()) ? indentation.getFirstLine().intValue()
-                : -1;
-    }
-
-    /**
-     * Specifies the additional indentation which shall be applied to the first
-     * line of the parent paragraph. This additional indentation is specified
-     * relative to the paragraph indentation which is specified for all other
-     * lines in the parent paragraph.
-     * The firstLine and hanging attributes are
-     * mutually exclusive, if both are specified, then the firstLine value is
-     * ignored.
-     * If the firstLineChars attribute is also specified, then this
-     * value is ignored. If this attribute is omitted, then its value shall be
-     * assumed to be zero (if needed).
-     *
-     * @param indentation
-     */
-    public void setIndentationFirstLine(int indentation) {
-        CTInd indent = getCTInd(true);
-        BigInteger bi = new BigInteger("" + indentation);
-        indent.setFirstLine(bi);
-    }
-
-    public int getIndentFromLeft() {
-        return getIndentationLeft();
-    }
-
-    public void setIndentFromLeft(int dxaLeft) {
-        setIndentationLeft(dxaLeft);
-    }
-
-    public int getIndentFromRight() {
-        return getIndentationRight();
-    }
-
-    public void setIndentFromRight(int dxaRight) {
-        setIndentationRight(dxaRight);
-    }
-
-    public int getFirstLineIndent() {
-        return getIndentationFirstLine();
-    }
-
-    public void setFirstLineIndent(int first) {
-        setIndentationFirstLine(first);
-    }
-
-    /**
-     * This element specifies whether a consumer shall break Latin text which
-     * exceeds the text extents of a line by breaking the word across two lines
-     * (breaking on the character level) or by moving the word to the following
-     * line (breaking on the word level).
-     *
-     * @return boolean
-     */
-    public boolean isWordWrapped() {
-        CTOnOff wordWrap = getCTPPr().isSetWordWrap() ? getCTPPr()
-                .getWordWrap() : null;
-        if (wordWrap != null) {
-            return (wordWrap.getVal() == STOnOff.ON
-                    || wordWrap.getVal() == STOnOff.TRUE || wordWrap.getVal() == STOnOff.X_1) ? true
-                    : false;
-        }
-        return false;
-    }
-
-    /**
-     * This element specifies whether a consumer shall break Latin text which
-     * exceeds the text extents of a line by breaking the word across two lines
-     * (breaking on the character level) or by moving the word to the following
-     * line (breaking on the word level).
-     *
-     * @param wrap - boolean
-     */
-    public void setWordWrapped(boolean wrap) {
-        CTOnOff wordWrap = getCTPPr().isSetWordWrap() ? getCTPPr()
-                .getWordWrap() : getCTPPr().addNewWordWrap();
-        if (wrap)
-            wordWrap.setVal(STOnOff.TRUE);
-        else
-            wordWrap.unsetVal();
-    }
-
-    public boolean isWordWrap() {
-        return isWordWrapped();
-    }
-
-    @Deprecated
-    public void setWordWrap(boolean wrap) {
-        setWordWrapped(wrap);
-    }
-
-    /**
-     * @return the style of the paragraph
-     */
-    public String getStyle() {
-        CTPPr pr = getCTPPr();
-        CTString style = pr.isSetPStyle() ? pr.getPStyle() : null;
-        return style != null ? style.getVal() : null;
-    }
-
-    /**
-     * This method provides a style to the paragraph
-     * This is useful when, e.g. an Heading style has to be assigned
-     *
-     * @param newStyle
-     */
-    public void setStyle(String newStyle) {
-        CTPPr pr = getCTPPr();
-        CTString style = pr.getPStyle() != null ? pr.getPStyle() : pr.addNewPStyle();
-        style.setVal(newStyle);
-    }
-
-    /**
-     * Get a <b>copy</b> of the currently used CTPBrd, if none is used, return
-     * a new instance.
-     */
-    private CTPBdr getCTPBrd(boolean create) {
-        CTPPr pr = getCTPPr();
-        CTPBdr ct = pr.isSetPBdr() ? pr.getPBdr() : null;
-        if (create && ct == null)
-            ct = pr.addNewPBdr();
-        return ct;
-    }
-
-    /**
-     * Get a <b>copy</b> of the currently used CTSpacing, if none is used,
-     * return a new instance.
-     */
-    private CTSpacing getCTSpacing(boolean create) {
-        CTPPr pr = getCTPPr();
-        CTSpacing ct = pr.getSpacing() == null ? null : pr.getSpacing();
-        if (create && ct == null)
-            ct = pr.addNewSpacing();
-        return ct;
-    }
-
-    /**
-     * Get a <b>copy</b> of the currently used CTPInd, if none is used, return
-     * a new instance.
-     */
-    private CTInd getCTInd(boolean create) {
-        CTPPr pr = getCTPPr();
-        CTInd ct = pr.getInd() == null ? null : pr.getInd();
-        if (create && ct == null)
-            ct = pr.addNewInd();
-        return ct;
-    }
-
-    /**
-     * Get a <b>copy</b> of the currently used CTPPr, if none is used, return
-     * a new instance.
-     */
-    private CTPPr getCTPPr() {
-        CTPPr pr = paragraph.getPPr() == null ? paragraph.addNewPPr()
-                : paragraph.getPPr();
-        return pr;
-    }
-
-
-    /**
-     * add a new run at the end of the position of
-     * the content of parameter run
-     *
-     * @param run
-     */
-    protected void addRun(CTR run) {
-        int pos;
-        pos = paragraph.sizeOfRArray();
-        paragraph.addNewR();
-        paragraph.setRArray(pos, run);
-    }
-
-    /**
-     * Appends a new run to this paragraph
-     *
-     * @return a new text run
-     */
-    public XWPFRun createRun() {
-        XWPFRun xwpfRun = new XWPFRun(paragraph.addNewR(), (IRunBody)this);
-        runs.add(xwpfRun);
-        iruns.add(xwpfRun);
-        return xwpfRun;
-    }
-
-    /**
-     * insert a new Run in RunArray
-     *
-     * @param pos The position at which the new run should be added.
-     * 
-     * @return the inserted run or null if the given pos is out of bounds.
-     */
-    public XWPFRun insertNewRun(int pos) {
-        if (pos >= 0 && pos <= runs.size()) {
-            // calculate the correct pos as our run/irun list contains
-            // hyperlinks
-            // and fields so it is different to the paragraph R array.
-            int rPos = 0;
-            for (int i = 0; i < pos; i++) {
-                XWPFRun currRun = runs.get(i);
-                if (!(currRun instanceof XWPFHyperlinkRun
-                        || currRun instanceof XWPFFieldRun)) {
-                    rPos++;
-                }
-            }
-
-            CTR ctRun = paragraph.insertNewR(rPos);
-            XWPFRun newRun = new XWPFRun(ctRun, (IRunBody) this);
-
-            // To update the iruns, find where we're going
-            // in the normal runs, and go in there
-            int iPos = iruns.size();
-            if (pos < runs.size()) {
-                XWPFRun oldAtPos = runs.get(pos);
-                int oldAt = iruns.indexOf(oldAtPos);
-                if (oldAt != -1) {
-                    iPos = oldAt;
-                }
-            }
-            iruns.add(iPos, newRun);
-
-            // Runs itself is easy to update
-            runs.add(pos, newRun);
-
-            return newRun;
-        }
-
-        return null;
-    }
-    // TODO Add methods to allow adding a HyperlinkRun or a FieldRun
-
-    /**
-     * this methods parse the paragraph and search for the string searched.
-     * If it finds the string, it will return true and the position of the String
-     * will be saved in the parameter startPos.
-     *
-     * @param searched
-     * @param startPos
-     */
-    public TextSegement searchText(String searched, PositionInParagraph startPos) {
-        int startRun = startPos.getRun(),
-            startText = startPos.getText(),
-            startChar = startPos.getChar();
-        int beginRunPos = 0, candCharPos = 0;
-        boolean newList = false;
-        
-        CTR[] rArray = paragraph.getRArray();
-        for (int runPos = startRun; runPos < rArray.length; runPos++) {
-            int beginTextPos = 0, beginCharPos = 0, textPos = 0, charPos = 0;
-            CTR ctRun = rArray[runPos];
-            XmlCursor c = ctRun.newCursor();
-            c.selectPath("./*");
-            try {
-                while (c.toNextSelection()) {
-                    XmlObject o = c.getObject();
-                    if (o instanceof CTText) {
-                        if (textPos >= startText) {
-                            String candidate = ((CTText) o).getStringValue();
-                            if (runPos == startRun)
-                                charPos = startChar;
-                            else
-                                charPos = 0;
-    
-                            for (; charPos < candidate.length(); charPos++) {
-                                if ((candidate.charAt(charPos) == searched.charAt(0)) && (candCharPos == 0)) {
-                                    beginTextPos = textPos;
-                                    beginCharPos = charPos;
-                                    beginRunPos = runPos;
-                                    newList = true;
-                                }
-                                if (candidate.charAt(charPos) == searched.charAt(candCharPos)) {
-                                    if (candCharPos + 1 < searched.length())
-                                        candCharPos++;
-                                    else if (newList) {
-                                        TextSegement segement = new TextSegement();
-                                        segement.setBeginRun(beginRunPos);
-                                        segement.setBeginText(beginTextPos);
-                                        segement.setBeginChar(beginCharPos);
-                                        segement.setEndRun(runPos);
-                                        segement.setEndText(textPos);
-                                        segement.setEndChar(charPos);
-                                        return segement;
-                                    }
-                                } else {
-                                    candCharPos = 0;
-                                }
-                            }
-                        }
-                        textPos++;
-                    } else if (o instanceof CTProofErr) {
-                        c.removeXml();
-                    } else if (o instanceof CTRPr) ;
-                        //do nothing
-                    else
-                        candCharPos = 0;
-                }
-            } finally {
-                c.dispose();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * get a Text
-     *
-     * @param segment
-     */
-    public String getText(TextSegement segment) {
-        int runBegin = segment.getBeginRun();
-        int textBegin = segment.getBeginText();
-        int charBegin = segment.getBeginChar();
-        int runEnd = segment.getEndRun();
-        int textEnd = segment.getEndText();
-        int charEnd = segment.getEndChar();
-        StringBuilder out = new StringBuilder();
-        CTR[] rArray = paragraph.getRArray();
-        for (int i = runBegin; i <= runEnd; i++) {
-            CTText[] tArray = rArray[i].getTArray();
-            int startText = 0, endText = tArray.length - 1;
-            if (i == runBegin)
-                startText = textBegin;
-            if (i == runEnd)
-                endText = textEnd;
-            for (int j = startText; j <= endText; j++) {
-                String tmpText = tArray[j].getStringValue();
-                int startChar = 0, endChar = tmpText.length() - 1;
-                if ((j == textBegin) && (i == runBegin))
-                    startChar = charBegin;
-                if ((j == textEnd) && (i == runEnd)) {
-                    endChar = charEnd;
-                }
-                out.append(tmpText.substring(startChar, endChar + 1));
-            }
-        }
-        return out.toString();
-    }
-
-    /**
-     * removes a Run at the position pos in the paragraph
-     *
-     * @param pos
-     * @return true if the run was removed
-     */
-    public boolean removeRun(int pos) {
-        if (pos >= 0 && pos < runs.size()) {
-            // Remove the run from our high level lists
-            XWPFRun run = runs.get(pos);
-            if (run instanceof XWPFHyperlinkRun ||
-                run instanceof XWPFFieldRun) {
-                // TODO Add support for removing these kinds of nested runs,
-                //  which aren't on the CTP -> R array, but CTP -> XXX -> R array
-                throw new IllegalArgumentException("Removing Field or Hyperlink runs not yet supported");
-            }
-            runs.remove(pos);
-            iruns.remove(run);
-            // Remove the run from the low-level XML
-            //calculate the correct pos as our run/irun list contains hyperlinks and fields so is different to the paragraph R array.
-            int rPos = 0;
-            for(int i=0;i<pos;i++) {
-              XWPFRun currRun = runs.get(i);
-              if(!(currRun instanceof XWPFHyperlinkRun || currRun instanceof XWPFFieldRun))
-                rPos++;
-            }
-            getCTP().removeR(rPos);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * returns the type of the BodyElement Paragraph
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBodyElement#getElementType()
-     */
-    public BodyElementType getElementType() {
-        return BodyElementType.PARAGRAPH;
-    }
-
-    public IBody getBody() {
-        return part;
-    }
-
-    /**
-     * returns the part of the bodyElement
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPart()
-     */
-    public POIXMLDocumentPart getPart() {
-        if (part != null) {
-            return part.getPart();
-        }
-        return null;
-    }
-
-    /**
-     * returns the partType of the bodyPart which owns the bodyElement
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
-     */
-    public BodyType getPartType() {
-        return part.getPartType();
-    }
-
-    /**
-     * adds a new Run to the Paragraph
-     *
-     * @param r
-     */
-    public void addRun(XWPFRun r) {
-        if (!runs.contains(r)) {
-            runs.add(r);
-        }
-    }
-
-    /**
-     * return the XWPFRun-Element which owns the CTR run-Element
-     *
-     * @param r
-     */
-    public XWPFRun getRun(CTR r) {
-        for (int i = 0; i < getRuns().size(); i++) {
-            if (getRuns().get(i).getCTR() == r) {
-                return getRuns().get(i);
-            }
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
deleted file mode 100644
index c69e8dd..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture;
-
-
-/**
- * @author Philipp Epp
- */
-public class XWPFPicture {
-
-    private CTPicture ctPic;
-    private String description;
-    private XWPFRun run;
-
-    public XWPFPicture(CTPicture ctPic, XWPFRun run) {
-        this.run = run;
-        this.ctPic = ctPic;
-        description = ctPic.getNvPicPr().getCNvPr().getDescr();
-    }
-
-    /**
-     * Link Picture with PictureData
-     *
-     * @param rel
-     */
-    public void setPictureReference(PackageRelationship rel) {
-        ctPic.getBlipFill().getBlip().setEmbed(rel.getId());
-    }
-
-    /**
-     * Return the underlying CTPicture bean that holds all properties for this picture
-     *
-     * @return the underlying CTPicture bean
-     */
-    public CTPicture getCTPicture() {
-        return ctPic;
-    }
-
-    /**
-     * Get the PictureData of the Picture, if present.
-     * Note - not all kinds of picture have data
-     */
-    public XWPFPictureData getPictureData() {
-        CTBlipFillProperties blipProps = ctPic.getBlipFill();
-
-        if (blipProps == null || !blipProps.isSetBlip()) {
-            // return null if Blip data is missing
-            return null;
-        }
-
-        String blipId = blipProps.getBlip().getEmbed();
-        POIXMLDocumentPart part = run.getParent().getPart();
-        if (part != null) {
-            POIXMLDocumentPart relatedPart = part.getRelationById(blipId);
-            if (relatedPart instanceof XWPFPictureData) {
-                return (XWPFPictureData) relatedPart;
-            }
-        }
-        return null;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
deleted file mode 100644
index 3c19b42..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.POIXMLRelation;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.util.IOUtils;
-
-/**
- * Raw picture data, normally attached to a WordprocessingML Drawing.
- * As a rule, pictures are stored in the /word/media/ part of a WordprocessingML package.
- */
-
-/**
- * @author Philipp Epp
- */
-public class XWPFPictureData extends POIXMLDocumentPart {
-
-    /**
-     * Relationships for each known picture type
-     */
-    protected static final POIXMLRelation[] RELATIONS;
-
-    static {
-        RELATIONS = new POIXMLRelation[13];
-        RELATIONS[Document.PICTURE_TYPE_EMF] = XWPFRelation.IMAGE_EMF;
-        RELATIONS[Document.PICTURE_TYPE_WMF] = XWPFRelation.IMAGE_WMF;
-        RELATIONS[Document.PICTURE_TYPE_PICT] = XWPFRelation.IMAGE_PICT;
-        RELATIONS[Document.PICTURE_TYPE_JPEG] = XWPFRelation.IMAGE_JPEG;
-        RELATIONS[Document.PICTURE_TYPE_PNG] = XWPFRelation.IMAGE_PNG;
-        RELATIONS[Document.PICTURE_TYPE_DIB] = XWPFRelation.IMAGE_DIB;
-        RELATIONS[Document.PICTURE_TYPE_GIF] = XWPFRelation.IMAGE_GIF;
-        RELATIONS[Document.PICTURE_TYPE_TIFF] = XWPFRelation.IMAGE_TIFF;
-        RELATIONS[Document.PICTURE_TYPE_EPS] = XWPFRelation.IMAGE_EPS;
-        RELATIONS[Document.PICTURE_TYPE_BMP] = XWPFRelation.IMAGE_BMP;
-        RELATIONS[Document.PICTURE_TYPE_WPG] = XWPFRelation.IMAGE_WPG;
-    }
-
-    private Long checksum = null;
-
-    /**
-     * Create a new XWPFGraphicData node
-     */
-    protected XWPFPictureData() {
-        super();
-    }
-
-    /**
-     * Construct XWPFPictureData from a package part
-     *
-     * @param part the package part holding the drawing data,
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public XWPFPictureData(PackagePart part) {
-        super(part);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFPictureData(PackagePart part, PackageRelationship rel) {
-        this(part);
-    }
-    
-    @Override
-    protected void onDocumentRead() throws IOException {
-        super.onDocumentRead();
-    }
-
-    /**
-     * Gets the picture data as a byte array.
-     * <p>
-     * Note, that this call might be expensive since all the picture data is copied into a temporary byte array.
-     * You can grab the picture data directly from the underlying package part as follows:
-     * <br/>
-     * <code>
-     * InputStream is = getPackagePart().getInputStream();
-     * </code>
-     * </p>
-     *
-     * @return the Picture data.
-     */
-    public byte[] getData() {
-        try {
-            return IOUtils.toByteArray(getPackagePart().getInputStream());
-        } catch (IOException e) {
-            throw new POIXMLException(e);
-        }
-    }
-
-    /**
-     * Returns the file name of the image, eg image7.jpg . The original filename
-     * isn't always available, but if it can be found it's likely to be in the
-     * CTDrawing
-     */
-    public String getFileName() {
-        String name = getPackagePart().getPartName().getName();
-        return name.substring(name.lastIndexOf('/') + 1);
-    }
-
-    /**
-     * Suggests a file extension for this image.
-     *
-     * @return the file extension.
-     */
-    public String suggestFileExtension() {
-        return getPackagePart().getPartName().getExtension();
-    }
-
-    /**
-     * Return an integer constant that specifies type of this picture
-     *
-     * @return an integer constant that specifies type of this picture
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_EMF
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_WMF
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_PICT
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_JPEG
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_PNG
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_DIB
-     */
-    public int getPictureType() {
-        String contentType = getPackagePart().getContentType();
-        for (int i = 0; i < RELATIONS.length; i++) {
-            if (RELATIONS[i] == null) {
-                continue;
-            }
-
-            if (RELATIONS[i].getContentType().equals(contentType)) {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-    public Long getChecksum() {
-        if (this.checksum == null) {
-            InputStream is = null;
-            byte[] data;
-            try {
-                is = getPackagePart().getInputStream();
-                data = IOUtils.toByteArray(is);
-            } catch (IOException e) {
-                throw new POIXMLException(e);
-            } finally {
-                try {
-                    if (is != null) is.close();
-                } catch (IOException e) {
-                    throw new POIXMLException(e);
-                }
-            }
-            this.checksum = IOUtils.calculateChecksum(data);
-        }
-        return this.checksum;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        /**
-         * In case two objects ARE equal, but its not the same instance, this
-         * implementation will always run through the whole
-         * byte-array-comparison before returning true. If this will turn into a
-         * performance issue, two possible approaches are available:<br>
-         * a) Use the checksum only and take the risk that two images might have
-         * the same CRC32 sum, although they are not the same.<br>
-         * b) Use a second (or third) checksum algorithm to minimise the chance
-         * that two images have the same checksums but are not equal (e.g.
-         * CRC32, MD5 and SHA-1 checksums, additionally compare the
-         * data-byte-array lengths).
-         */
-        if (obj == this) {
-            return true;
-        }
-
-        if (obj == null) {
-            return false;
-        }
-
-        if (!(obj instanceof XWPFPictureData)) {
-            return false;
-        }
-
-        XWPFPictureData picData = (XWPFPictureData) obj;
-        PackagePart foreignPackagePart = picData.getPackagePart();
-        PackagePart ownPackagePart = this.getPackagePart();
-
-        if ((foreignPackagePart != null && ownPackagePart == null)
-                || (foreignPackagePart == null && ownPackagePart != null)) {
-            return false;
-        }
-
-        if (ownPackagePart != null) {
-            OPCPackage foreignPackage = foreignPackagePart.getPackage();
-            OPCPackage ownPackage = ownPackagePart.getPackage();
-
-            if ((foreignPackage != null && ownPackage == null)
-                    || (foreignPackage == null && ownPackage != null)) {
-                return false;
-            }
-            if (ownPackage != null) {
-
-                if (!ownPackage.equals(foreignPackage)) {
-                    return false;
-                }
-            }
-        }
-
-        Long foreignChecksum = picData.getChecksum();
-        Long localChecksum = getChecksum();
-
-        if (!(localChecksum.equals(foreignChecksum))) {
-            return false;
-        }
-        return Arrays.equals(this.getData(), picData.getData());
-    }
-
-    @Override
-    public int hashCode() {
-        return getChecksum().hashCode();
-    }
-
-    /**
-     * *PictureData objects store the actual content in the part directly without keeping a
-     * copy like all others therefore we need to handle them differently.
-     */
-    @Override
-    protected void prepareForCommit() {
-        // do not clear the part here
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
deleted file mode 100644
index 0afaedc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLRelation;
-
-/**
- * @author Yegor Kozlov
- */
-public final class XWPFRelation extends POIXMLRelation {
-
-    /**
-     * A map to lookup POIXMLRelation by its relation type
-     */
-    private static final Map<String, XWPFRelation> _table = new HashMap<String, XWPFRelation>();
-
-    public static final XWPFRelation DOCUMENT = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
-            "/word/document.xml",
-            null
-    );
-    public static final XWPFRelation TEMPLATE = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
-            "/word/document.xml",
-            null
-    );
-    public static final XWPFRelation MACRO_DOCUMENT = new XWPFRelation(
-            "application/vnd.ms-word.document.macroEnabled.main+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
-            "/word/document.xml",
-            null
-    );
-    public static final XWPFRelation MACRO_TEMPLATE_DOCUMENT = new XWPFRelation(
-            "application/vnd.ms-word.template.macroEnabledTemplate.main+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
-            "/word/document.xml",
-            null
-    );
-    public static final XWPFRelation GLOSSARY_DOCUMENT = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument",
-            "/word/glossary/document.xml",
-            null
-    );
-    public static final XWPFRelation NUMBERING = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering",
-            "/word/numbering.xml",
-            XWPFNumbering.class
-    );
-    public static final XWPFRelation FONT_TABLE = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable",
-            "/word/fontTable.xml",
-            null
-    );
-    public static final XWPFRelation SETTINGS = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings",
-            "/word/settings.xml",
-            XWPFSettings.class
-    );
-    public static final XWPFRelation STYLES = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles",
-            "/word/styles.xml",
-            XWPFStyles.class
-    );
-    public static final XWPFRelation WEB_SETTINGS = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings",
-            "/word/webSettings.xml",
-            null
-    );
-    public static final XWPFRelation HEADER = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header",
-            "/word/header#.xml",
-            XWPFHeader.class
-    );
-    public static final XWPFRelation FOOTER = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer",
-            "/word/footer#.xml",
-            XWPFFooter.class
-    );
-    public static final XWPFRelation THEME = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.theme+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",
-            "/word/theme/theme#.xml",
-            null
-    );
-    public static final XWPFRelation HYPERLINK = new XWPFRelation(
-            null,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
-            null,
-            null
-    );
-    public static final XWPFRelation COMMENT = new XWPFRelation(
-            null,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
-            null,
-            null
-    );
-    public static final XWPFRelation FOOTNOTE = new XWPFRelation(
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes",
-            "/word/footnotes.xml",
-            XWPFFootnotes.class
-    );
-    public static final XWPFRelation ENDNOTE = new XWPFRelation(
-            null,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes",
-            null,
-            null
-    );
-    /**
-     * Supported image formats
-     */
-    public static final XWPFRelation IMAGE_EMF = new XWPFRelation(
-            "image/x-emf",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.emf",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_WMF = new XWPFRelation(
-            "image/x-wmf",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.wmf",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_PICT = new XWPFRelation(
-            "image/pict",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.pict",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_JPEG = new XWPFRelation(
-            "image/jpeg",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.jpeg",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_PNG = new XWPFRelation(
-            "image/png",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.png",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_DIB = new XWPFRelation(
-            "image/dib",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.dib",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_GIF = new XWPFRelation(
-            "image/gif",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.gif",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_TIFF = new XWPFRelation(
-            "image/tiff",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.tiff",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_EPS = new XWPFRelation(
-            "image/x-eps",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.eps",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_BMP = new XWPFRelation(
-            "image/x-ms-bmp",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.bmp",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGE_WPG = new XWPFRelation(
-            "image/x-wpg",
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            "/word/media/image#.wpg",
-            XWPFPictureData.class
-    );
-    public static final XWPFRelation IMAGES = new XWPFRelation(
-            null,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            null,
-            XWPFPictureData.class
-    );
-
-    private XWPFRelation(String type, String rel, String defaultName, Class<? extends POIXMLDocumentPart> cls) {
-        super(type, rel, defaultName, cls);
-        _table.put(rel, this);
-    }
-
-    /**
-     * Get POIXMLRelation by relation type
-     *
-     * @param rel relation type, for example,
-     *            <code>http://schemas.openxmlformats.org/officeDocument/2006/relationships/image</code>
-     * @return registered POIXMLRelation or null if not found
-     */
-    public static XWPFRelation getInstance(String rel) {
-        return _table.get(rel);
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
deleted file mode 100644
index c2718ab..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
+++ /dev/null
@@ -1,1140 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.Internal;
-import org.apache.poi.wp.usermodel.CharacterRun;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlString;
-import org.apache.xmlbeans.XmlToken;
-import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObjectData;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualPictureProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture;
-import org.openxmlformats.schemas.drawingml.x2006.picture.CTPictureNonVisual;
-import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTAnchor;
-import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTInline;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTColor;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDrawing;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTEmpty;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFFCheckBox;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFldChar;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFonts;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdnRef;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHpsMeasure;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPTab;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSignedHpsMeasure;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSignedTwipsMeasure;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTUnderline;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVerticalAlignRun;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBrClear;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBrType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STFldCharType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STHighlightColor;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STUnderline;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalAlignRun;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * XWPFRun object defines a region of text with a common set of properties
- */
-public class XWPFRun implements ISDTContents, IRunElement, CharacterRun {
-    private CTR run;
-    private String pictureText;
-    private IRunBody parent;
-    private List<XWPFPicture> pictures;
-
-    /**
-     * @param r the CTR bean which holds the run attributes
-     * @param p the parent paragraph
-     */
-    public XWPFRun(CTR r, IRunBody p) {
-        this.run = r;
-        this.parent = p;
-
-        /**
-         * reserve already occupied drawing ids, so reserving new ids later will
-         * not corrupt the document
-         */
-        for (CTDrawing ctDrawing : r.getDrawingArray()) {
-            for (CTAnchor anchor : ctDrawing.getAnchorArray()) {
-                if (anchor.getDocPr() != null) {
-                    getDocument().getDrawingIdManager().reserve(anchor.getDocPr().getId());
-                }
-            }
-            for (CTInline inline : ctDrawing.getInlineArray()) {
-                if (inline.getDocPr() != null) {
-                    getDocument().getDrawingIdManager().reserve(inline.getDocPr().getId());
-                }
-            }
-        }
-
-        // Look for any text in any of our pictures or drawings
-        StringBuilder text = new StringBuilder();
-        List<XmlObject> pictTextObjs = new ArrayList<XmlObject>();
-        pictTextObjs.addAll(Arrays.asList(r.getPictArray()));
-        pictTextObjs.addAll(Arrays.asList(r.getDrawingArray()));
-        for (XmlObject o : pictTextObjs) {
-            XmlObject[] ts = o.selectPath("declare namespace w='http://schemas.openxmlformats.org/wordprocessingml/2006/main' .//w:t");
-            for (XmlObject t : ts) {
-                NodeList kids = t.getDomNode().getChildNodes();
-                for (int n = 0; n < kids.getLength(); n++) {
-                    if (kids.item(n) instanceof Text) {
-                        if (text.length() > 0)
-                            text.append("\n");
-                        text.append(kids.item(n).getNodeValue());
-                    }
-                }
-            }
-        }
-        pictureText = text.toString();
-
-        // Do we have any embedded pictures?
-        // (They're a different CTPicture, under the drawingml namespace)
-        pictures = new ArrayList<XWPFPicture>();
-        for (XmlObject o : pictTextObjs) {
-            for (CTPicture pict : getCTPictures(o)) {
-                XWPFPicture picture = new XWPFPicture(pict, this);
-                pictures.add(picture);
-            }
-        }
-    }
-
-    /**
-     * @deprecated Use {@link XWPFRun#XWPFRun(CTR, IRunBody)}
-     */
-    public XWPFRun(CTR r, XWPFParagraph p) {
-        this(r, (IRunBody) p);
-    }
-
-    /**
-     * Add the xml:spaces="preserve" attribute if the string has leading or trailing white spaces
-     *
-     * @param xs the string to check
-     */
-    static void preserveSpaces(XmlString xs) {
-        String text = xs.getStringValue();
-        if (text != null && (text.startsWith(" ") || text.endsWith(" "))) {
-            XmlCursor c = xs.newCursor();
-            c.toNextToken();
-            c.insertAttributeWithValue(new QName("http://www.w3.org/XML/1998/namespace", "space"), "preserve");
-            c.dispose();
-        }
-    }
-
-    private List<CTPicture> getCTPictures(XmlObject o) {
-        List<CTPicture> pics = new ArrayList<CTPicture>();
-        XmlObject[] picts = o.selectPath("declare namespace pic='" + CTPicture.type.getName().getNamespaceURI() + "' .//pic:pic");
-        for (XmlObject pict : picts) {
-            if (pict instanceof XmlAnyTypeImpl) {
-                // Pesky XmlBeans bug - see Bugzilla #49934
-                try {
-                    pict = CTPicture.Factory.parse(pict.toString(), DEFAULT_XML_OPTIONS);
-                } catch (XmlException e) {
-                    throw new POIXMLException(e);
-                }
-            }
-            if (pict instanceof CTPicture) {
-                pics.add((CTPicture) pict);
-            }
-        }
-        return pics;
-    }
-
-    /**
-     * Get the currently used CTR object
-     *
-     * @return ctr object
-     */
-    @Internal
-    public CTR getCTR() {
-        return run;
-    }
-
-    /**
-     * Get the currently referenced paragraph/SDT object
-     *
-     * @return current parent
-     */
-    public IRunBody getParent() {
-        return parent;
-    }
-
-    /**
-     * Get the currently referenced paragraph, or null if a SDT object
-     *
-     * @deprecated use {@link XWPFRun#getParent()} instead
-     */
-    public XWPFParagraph getParagraph() {
-        if (parent instanceof XWPFParagraph)
-            return (XWPFParagraph) parent;
-        return null;
-    }
-
-    /**
-     * @return The {@link XWPFDocument} instance, this run belongs to, or
-     * <code>null</code> if parent structure (paragraph > document) is not properly set.
-     */
-    public XWPFDocument getDocument() {
-        if (parent != null) {
-            return parent.getDocument();
-        }
-        return null;
-    }
-
-    /**
-     * For isBold, isItalic etc
-     */
-    private static boolean isCTOnOff(CTOnOff onoff) {
-        if (!onoff.isSetVal())
-            return true;
-        final STOnOff.Enum val = onoff.getVal();
-        return (
-            (STOnOff.TRUE == val) ||
-            (STOnOff.X_1 == val) ||
-            (STOnOff.ON == val)
-        );
-    }
-
-    /**
-     * Whether the bold property shall be applied to all non-complex script
-     * characters in the contents of this run when displayed in a document
-     *
-     * @return <code>true</code> if the bold property is applied
-     */
-    public boolean isBold() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetB()) {
-            return false;
-        }
-        return isCTOnOff(pr.getB());
-    }
-
-    /**
-     * Whether the bold property shall be applied to all non-complex script
-     * characters in the contents of this run when displayed in a document.
-     * <p>
-     * This formatting property is a toggle property, which specifies that its
-     * behavior differs between its use within a style definition and its use as
-     * direct formatting. When used as part of a style definition, setting this
-     * property shall toggle the current state of that property as specified up
-     * to this point in the hierarchy (i.e. applied to not applied, and vice
-     * versa). Setting it to <code>false</code> (or an equivalent) shall
-     * result in the current setting remaining unchanged. However, when used as
-     * direct formatting, setting this property to true or false shall set the
-     * absolute state of the resulting property.
-     * </p>
-     * <p>
-     * If this element is not present, the default value is to leave the
-     * formatting applied at previous level in the style hierarchy. If this
-     * element is never applied in the style hierarchy, then bold shall not be
-     * applied to non-complex script characters.
-     * </p>
-     *
-     * @param value <code>true</code> if the bold property is applied to
-     *              this run
-     */
-    public void setBold(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff bold = pr.isSetB() ? pr.getB() : pr.addNewB();
-        bold.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    /**
-     * Get text color. The returned value is a string in the hex form "RRGGBB".
-     */
-    public String getColor() {
-        String color = null;
-        if (run.isSetRPr()) {
-            CTRPr pr = run.getRPr();
-            if (pr.isSetColor()) {
-                CTColor clr = pr.getColor();
-                color = clr.xgetVal().getStringValue();
-            }
-        }
-        return color;
-    }
-
-    /**
-     * Set text color.
-     *
-     * @param rgbStr - the desired color, in the hex form "RRGGBB".
-     */
-    public void setColor(String rgbStr) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTColor color = pr.isSetColor() ? pr.getColor() : pr.addNewColor();
-        color.setVal(rgbStr);
-    }
-
-    /**
-     * Return the string content of this text run
-     *
-     * @return the text of this text run or <code>null</code> if not set
-     */
-    public String getText(int pos) {
-        return run.sizeOfTArray() == 0 ? null : run.getTArray(pos)
-                .getStringValue();
-    }
-
-    /**
-     * Returns text embedded in pictures
-     */
-    public String getPictureText() {
-        return pictureText;
-    }
-
-    /**
-     * Sets the text of this text run
-     *
-     * @param value the literal text which shall be displayed in the document
-     */
-    public void setText(String value) {
-        setText(value, run.sizeOfTArray());
-    }
-
-    /**
-     * Sets the text of this text run in the
-     *
-     * @param value the literal text which shall be displayed in the document
-     * @param pos   - position in the text array (NB: 0 based)
-     */
-    public void setText(String value, int pos) {
-        if (pos > run.sizeOfTArray())
-            throw new ArrayIndexOutOfBoundsException("Value too large for the parameter position in XWPFRun.setText(String value,int pos)");
-        CTText t = (pos < run.sizeOfTArray() && pos >= 0) ? run.getTArray(pos) : run.addNewT();
-        t.setStringValue(value);
-        preserveSpaces(t);
-    }
-
-    /**
-     * Whether the italic property should be applied to all non-complex script
-     * characters in the contents of this run when displayed in a document.
-     *
-     * @return <code>true</code> if the italic property is applied
-     */
-    public boolean isItalic() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetI())
-            return false;
-        return isCTOnOff(pr.getI());
-    }
-
-    /**
-     * Whether the bold property shall be applied to all non-complex script
-     * characters in the contents of this run when displayed in a document
-     * <p/>
-     * <p/>
-     * This formatting property is a toggle property, which specifies that its
-     * behavior differs between its use within a style definition and its use as
-     * direct formatting. When used as part of a style definition, setting this
-     * property shall toggle the current state of that property as specified up
-     * to this point in the hierarchy (i.e. applied to not applied, and vice
-     * versa). Setting it to <code>false</code> (or an equivalent) shall
-     * result in the current setting remaining unchanged. However, when used as
-     * direct formatting, setting this property to true or false shall set the
-     * absolute state of the resulting property.
-     * </p>
-     * <p/>
-     * If this element is not present, the default value is to leave the
-     * formatting applied at previous level in the style hierarchy. If this
-     * element is never applied in the style hierarchy, then bold shall not be
-     * applied to non-complex script characters.
-     * </p>
-     *
-     * @param value <code>true</code> if the italic property is applied to
-     *              this run
-     */
-    public void setItalic(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff italic = pr.isSetI() ? pr.getI() : pr.addNewI();
-        italic.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    /**
-     * Specifies that the contents of this run should be displayed along with an
-     * underline appearing directly below the character heigh
-     *
-     * @return the Underline pattern applyed to this run
-     * @see UnderlinePatterns
-     */
-    public UnderlinePatterns getUnderline() {
-        CTRPr pr = run.getRPr();
-        return (pr != null && pr.isSetU() && pr.getU().getVal() != null)
-                ? UnderlinePatterns.valueOf(pr.getU().getVal().intValue())
-                : UnderlinePatterns.NONE;
-    }
-
-    /**
-     * Specifies that the contents of this run should be displayed along with an
-     * underline appearing directly below the character heigh
-     * <p/>
-     * <p/>
-     * If this element is not present, the default value is to leave the
-     * formatting applied at previous level in the style hierarchy. If this
-     * element is never applied in the style hierarchy, then an underline shall
-     * not be applied to the contents of this run.
-     * </p>
-     *
-     * @param value -
-     *              underline type
-     * @see UnderlinePatterns : all possible patterns that could be applied
-     */
-    public void setUnderline(UnderlinePatterns value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTUnderline underline = (pr.getU() == null) ? pr.addNewU() : pr.getU();
-        underline.setVal(STUnderline.Enum.forInt(value.getValue()));
-    }
-
-    /**
-     * Specifies that the contents of this run shall be displayed with a single
-     * horizontal line through the center of the line.
-     *
-     * @return <code>true</code> if the strike property is applied
-     */
-    public boolean isStrikeThrough() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetStrike())
-            return false;
-        return isCTOnOff(pr.getStrike());
-    }
-
-    /**
-     * Specifies that the contents of this run shall be displayed with a single
-     * horizontal line through the center of the line.
-     * <p/>
-     * This formatting property is a toggle property, which specifies that its
-     * behaviour differs between its use within a style definition and its use as
-     * direct formatting. When used as part of a style definition, setting this
-     * property shall toggle the current state of that property as specified up
-     * to this point in the hierarchy (i.e. applied to not applied, and vice
-     * versa). Setting it to false (or an equivalent) shall result in the
-     * current setting remaining unchanged. However, when used as direct
-     * formatting, setting this property to true or false shall set the absolute
-     * state of the resulting property.
-     * </p>
-     * <p/>
-     * If this element is not present, the default value is to leave the
-     * formatting applied at previous level in the style hierarchy. If this
-     * element is never applied in the style hierarchy, then strikethrough shall
-     * not be applied to the contents of this run.
-     * </p>
-     *
-     * @param value <code>true</code> if the strike property is applied to
-     *              this run
-     */
-    public void setStrikeThrough(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff strike = pr.isSetStrike() ? pr.getStrike() : pr.addNewStrike();
-        strike.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    @Deprecated
-    public boolean isStrike() {
-        return isStrikeThrough();
-    }
-
-    @Deprecated
-    public void setStrike(boolean value) {
-        setStrikeThrough(value);
-    }
-
-    /**
-     * Specifies that the contents of this run shall be displayed with a double
-     * horizontal line through the center of the line.
-     *
-     * @return <code>true</code> if the double strike property is applied
-     */
-    public boolean isDoubleStrikeThrough() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetDstrike())
-            return false;
-        return isCTOnOff(pr.getDstrike());
-    }
-
-    /**
-     * Specifies that the contents of this run shall be displayed with a
-     * double horizontal line through the center of the line.
-     *
-     * @see #setStrikeThrough(boolean) for the rules about this
-     */
-    public void setDoubleStrikethrough(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff dstrike = pr.isSetDstrike() ? pr.getDstrike() : pr.addNewDstrike();
-        dstrike.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    public boolean isSmallCaps() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetSmallCaps())
-            return false;
-        return isCTOnOff(pr.getSmallCaps());
-    }
-
-    public void setSmallCaps(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff caps = pr.isSetSmallCaps() ? pr.getSmallCaps() : pr.addNewSmallCaps();
-        caps.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    public boolean isCapitalized() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetCaps())
-            return false;
-        return isCTOnOff(pr.getCaps());
-    }
-
-    public void setCapitalized(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff caps = pr.isSetCaps() ? pr.getCaps() : pr.addNewCaps();
-        caps.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    public boolean isShadowed() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetShadow())
-            return false;
-        return isCTOnOff(pr.getShadow());
-    }
-
-    public void setShadow(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff shadow = pr.isSetShadow() ? pr.getShadow() : pr.addNewShadow();
-        shadow.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    public boolean isImprinted() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetImprint())
-            return false;
-        return isCTOnOff(pr.getImprint());
-    }
-
-    public void setImprinted(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff imprinted = pr.isSetImprint() ? pr.getImprint() : pr.addNewImprint();
-        imprinted.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    public boolean isEmbossed() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetEmboss())
-            return false;
-        return isCTOnOff(pr.getEmboss());
-    }
-
-    public void setEmbossed(boolean value) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTOnOff emboss = pr.isSetEmboss() ? pr.getEmboss() : pr.addNewEmboss();
-        emboss.setVal(value ? STOnOff.TRUE : STOnOff.FALSE);
-    }
-
-    /**
-     * Specifies the alignment which shall be applied to the contents of this
-     * run in relation to the default appearance of the run's text.
-     * This allows the text to be repositioned as subscript or superscript without
-     * altering the font size of the run properties.
-     *
-     * @return VerticalAlign
-     * @see VerticalAlign all possible value that could be applyed to this run
-     */
-    public VerticalAlign getSubscript() {
-        CTRPr pr = run.getRPr();
-        return (pr != null && pr.isSetVertAlign()) ? VerticalAlign.valueOf(pr.getVertAlign().getVal().intValue()) : VerticalAlign.BASELINE;
-    }
-
-    /**
-     * Specifies the alignment which shall be applied to the contents of this
-     * run in relation to the default appearance of the run's text. This allows
-     * the text to be repositioned as subscript or superscript without altering
-     * the font size of the run properties.
-     * <p/>
-     * If this element is not present, the default value is to leave the
-     * formatting applied at previous level in the style hierarchy. If this
-     * element is never applied in the style hierarchy, then the text shall not
-     * be subscript or superscript relative to the default baseline location for
-     * the contents of this run.
-     * </p>
-     *
-     * @param valign
-     * @see VerticalAlign
-     */
-    public void setSubscript(VerticalAlign valign) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTVerticalAlignRun ctValign = pr.isSetVertAlign() ? pr.getVertAlign() : pr.addNewVertAlign();
-        ctValign.setVal(STVerticalAlignRun.Enum.forInt(valign.getValue()));
-    }
-
-    public int getKerning() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetKern())
-            return 0;
-        return pr.getKern().getVal().intValue();
-    }
-
-    public void setKerning(int kern) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTHpsMeasure kernmes = pr.isSetKern() ? pr.getKern() : pr.addNewKern();
-        kernmes.setVal(BigInteger.valueOf(kern));
-    }
-
-    public boolean isHighlighted() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetHighlight())
-            return false;
-        if (pr.getHighlight().getVal() == STHighlightColor.NONE)
-            return false;
-        return true;
-    }
-    // TODO Provide a wrapper round STHighlightColor, then expose getter/setter
-    //  for the highlight colour. Ideally also then add to CharacterRun interface
-
-    public int getCharacterSpacing() {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetSpacing())
-            return 0;
-        return pr.getSpacing().getVal().intValue();
-    }
-
-    public void setCharacterSpacing(int twips) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTSignedTwipsMeasure spc = pr.isSetSpacing() ? pr.getSpacing() : pr.addNewSpacing();
-        spc.setVal(BigInteger.valueOf(twips));
-    }
-
-    /**
-     * Gets the fonts which shall be used to display the text contents of
-     * this run. Specifies a font which shall be used to format all characters
-     * in the ASCII range (0 - 127) within the parent run
-     *
-     * @return a string representing the font family
-     */
-    public String getFontFamily() {
-        return getFontFamily(null);
-    }
-
-    /**
-     * Specifies the fonts which shall be used to display the text contents of
-     * this run. Specifies a font which shall be used to format all characters
-     * in the ASCII range (0 - 127) within the parent run.
-     * <p/>
-     * Also sets the other font ranges, if they haven't been set before
-     *
-     * @param fontFamily
-     * @see FontCharRange
-     */
-    public void setFontFamily(String fontFamily) {
-        setFontFamily(fontFamily, null);
-    }
-
-    /**
-     * Alias for {@link #getFontFamily()}
-     */
-    public String getFontName() {
-        return getFontFamily();
-    }
-
-    /**
-     * Gets the font family for the specified font char range.
-     * If fcr is null, the font char range "ascii" is used
-     *
-     * @param fcr the font char range, defaults to "ansi"
-     * @return a string representing the font famil
-     */
-    public String getFontFamily(FontCharRange fcr) {
-        CTRPr pr = run.getRPr();
-        if (pr == null || !pr.isSetRFonts()) return null;
-
-        CTFonts fonts = pr.getRFonts();
-        switch (fcr == null ? FontCharRange.ascii : fcr) {
-            default:
-            case ascii:
-                return fonts.getAscii();
-            case cs:
-                return fonts.getCs();
-            case eastAsia:
-                return fonts.getEastAsia();
-            case hAnsi:
-                return fonts.getHAnsi();
-        }
-    }
-
-    /**
-     * Specifies the fonts which shall be used to display the text contents of
-     * this run. The default handling for fcr == null is to overwrite the
-     * ascii font char range with the given font family and also set all not
-     * specified font ranges
-     *
-     * @param fontFamily
-     * @param fcr        FontCharRange or null for default handling
-     */
-    public void setFontFamily(String fontFamily, FontCharRange fcr) {
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTFonts fonts = pr.isSetRFonts() ? pr.getRFonts() : pr.addNewRFonts();
-
-        if (fcr == null) {
-            fonts.setAscii(fontFamily);
-            if (!fonts.isSetHAnsi()) {
-                fonts.setHAnsi(fontFamily);
-            }
-            if (!fonts.isSetCs()) {
-                fonts.setCs(fontFamily);
-            }
-            if (!fonts.isSetEastAsia()) {
-                fonts.setEastAsia(fontFamily);
-            }
-        } else {
-            switch (fcr) {
-                case ascii:
-                    fonts.setAscii(fontFamily);
-                    break;
-                case cs:
-                    fonts.setCs(fontFamily);
-                    break;
-                case eastAsia:
-                    fonts.setEastAsia(fontFamily);
-                    break;
-                case hAnsi:
-                    fonts.setHAnsi(fontFamily);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Specifies the font size which shall be applied to all non complex script
-     * characters in the contents of this run when displayed.
-     *
-     * @return value representing the font size
-     */
-    public int getFontSize() {
-        CTRPr pr = run.getRPr();
-        return (pr != null && pr.isSetSz()) ? pr.getSz().getVal().divide(new BigInteger("2")).intValue() : -1;
-    }
-
-    /**
-     * Specifies the font size which shall be applied to all non complex script
-     * characters in the contents of this run when displayed.
-     * <p/>
-     * If this element is not present, the default value is to leave the value
-     * applied at previous level in the style hierarchy. If this element is
-     * never applied in the style hierarchy, then any appropriate font size may
-     * be used for non complex script characters.
-     * </p>
-     *
-     * @param size
-     */
-    public void setFontSize(int size) {
-        BigInteger bint = new BigInteger("" + size);
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTHpsMeasure ctSize = pr.isSetSz() ? pr.getSz() : pr.addNewSz();
-        ctSize.setVal(bint.multiply(new BigInteger("2")));
-    }
-
-    /**
-     * This element specifies the amount by which text shall be raised or
-     * lowered for this run in relation to the default baseline of the
-     * surrounding non-positioned text. This allows the text to be repositioned
-     * without altering the font size of the contents.
-     *
-     * @return a big integer representing the amount of text shall be "moved"
-     */
-    public int getTextPosition() {
-        CTRPr pr = run.getRPr();
-        return (pr != null && pr.isSetPosition()) ? pr.getPosition().getVal().intValue()
-                : -1;
-    }
-
-    /**
-     * This element specifies the amount by which text shall be raised or
-     * lowered for this run in relation to the default baseline of the
-     * surrounding non-positioned text. This allows the text to be repositioned
-     * without altering the font size of the contents.
-     * <p/>
-     * If the val attribute is positive, then the parent run shall be raised
-     * above the baseline of the surrounding text by the specified number of
-     * half-points. If the val attribute is negative, then the parent run shall
-     * be lowered below the baseline of the surrounding text by the specified
-     * number of half-points.
-     * </p>
-     * <p/>
-     * If this element is not present, the default value is to leave the
-     * formatting applied at previous level in the style hierarchy. If this
-     * element is never applied in the style hierarchy, then the text shall not
-     * be raised or lowered relative to the default baseline location for the
-     * contents of this run.
-     * </p>
-     *
-     * @param val
-     */
-    public void setTextPosition(int val) {
-        BigInteger bint = new BigInteger("" + val);
-        CTRPr pr = run.isSetRPr() ? run.getRPr() : run.addNewRPr();
-        CTSignedHpsMeasure position = pr.isSetPosition() ? pr.getPosition() : pr.addNewPosition();
-        position.setVal(bint);
-    }
-
-    /**
-     *
-     */
-    public void removeBreak() {
-        // TODO
-    }
-
-    /**
-     * Specifies that a break shall be placed at the current location in the run
-     * content.
-     * A break is a special character which is used to override the
-     * normal line breaking that would be performed based on the normal layout
-     * of the document's contents.
-     *
-     * @see #addCarriageReturn()
-     */
-    public void addBreak() {
-        run.addNewBr();
-    }
-
-    /**
-     * Specifies that a break shall be placed at the current location in the run
-     * content.
-     * A break is a special character which is used to override the
-     * normal line breaking that would be performed based on the normal layout
-     * of the document's contents.
-     * <p>
-     * The behavior of this break character (the
-     * location where text shall be restarted after this break) shall be
-     * determined by its type values.
-     * </p>
-     *
-     * @see BreakType
-     */
-    public void addBreak(BreakType type) {
-        CTBr br = run.addNewBr();
-        br.setType(STBrType.Enum.forInt(type.getValue()));
-    }
-
-    /**
-     * Specifies that a break shall be placed at the current location in the run
-     * content. A break is a special character which is used to override the
-     * normal line breaking that would be performed based on the normal layout
-     * of the document's contents.
-     * <p>
-     * The behavior of this break character (the
-     * location where text shall be restarted after this break) shall be
-     * determined by its type (in this case is BreakType.TEXT_WRAPPING as default) and clear attribute values.
-     * </p>
-     *
-     * @see BreakClear
-     */
-    public void addBreak(BreakClear clear) {
-        CTBr br = run.addNewBr();
-        br.setType(STBrType.Enum.forInt(BreakType.TEXT_WRAPPING.getValue()));
-        br.setClear(STBrClear.Enum.forInt(clear.getValue()));
-    }
-
-    /**
-     * Specifies that a tab shall be placed at the current location in
-     * the run content.
-     */
-    public void addTab() {
-        run.addNewTab();
-    }
-
-    public void removeTab() {
-        //TODO
-    }
-
-    /**
-     * Specifies that a carriage return shall be placed at the
-     * current location in the run content.
-     * A carriage return is used to end the current line of text in
-     * Wordprocess.
-     * The behavior of a carriage return in run content shall be
-     * identical to a break character with null type and clear attributes, which
-     * shall end the current line and find the next available line on which to
-     * continue.
-     * The carriage return character forced the following text to be
-     * restarted on the next available line in the document.
-     */
-    public void addCarriageReturn() {
-        run.addNewCr();
-    }
-
-    public void removeCarriageReturn() {
-        //TODO
-    }
-
-    /**
-     * Adds a picture to the run. This method handles
-     * attaching the picture data to the overall file.
-     *
-     * @param pictureData The raw picture data
-     * @param pictureType The type of the picture, eg {@link Document#PICTURE_TYPE_JPEG}
-     * @param width       width in EMUs. To convert to / from points use {@link org.apache.poi.util.Units}
-     * @param height      height in EMUs. To convert to / from points use {@link org.apache.poi.util.Units}
-     * @throws org.apache.poi.openxml4j.exceptions.InvalidFormatException
-     * @throws IOException
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_EMF
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_WMF
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_PICT
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_JPEG
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_PNG
-     * @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_DIB
-     */
-    public XWPFPicture addPicture(InputStream pictureData, int pictureType, String filename, int width, int height)
-            throws InvalidFormatException, IOException {
-        String relationId;
-        XWPFPictureData picData;
-        
-        // Work out what to add the picture to, then add both the
-        //  picture and the relationship for it
-        // TODO Should we have an interface for this sort of thing?
-        if (parent.getPart() instanceof XWPFHeaderFooter) {
-            XWPFHeaderFooter headerFooter = (XWPFHeaderFooter)parent.getPart();
-            relationId = headerFooter.addPictureData(pictureData, pictureType);
-            picData = (XWPFPictureData) headerFooter.getRelationById(relationId);
-        } else {
-            @SuppressWarnings("resource")
-            XWPFDocument doc = parent.getDocument();
-            relationId = doc.addPictureData(pictureData, pictureType);
-            picData = (XWPFPictureData) doc.getRelationById(relationId);
-        }
-
-        // Create the drawing entry for it
-        try {
-            CTDrawing drawing = run.addNewDrawing();
-            CTInline inline = drawing.addNewInline();
-
-            // Do the fiddly namespace bits on the inline
-            // (We need full control of what goes where and as what)
-            String xml =
-                    "<a:graphic xmlns:a=\"" + CTGraphicalObject.type.getName().getNamespaceURI() + "\">" +
-                            "<a:graphicData uri=\"" + CTPicture.type.getName().getNamespaceURI() + "\">" +
-                            "<pic:pic xmlns:pic=\"" + CTPicture.type.getName().getNamespaceURI() + "\" />" +
-                            "</a:graphicData>" +
-                            "</a:graphic>";
-            InputSource is = new InputSource(new StringReader(xml));
-            org.w3c.dom.Document doc = DocumentHelper.readDocument(is);
-            inline.set(XmlToken.Factory.parse(doc.getDocumentElement(), DEFAULT_XML_OPTIONS));
-
-            // Setup the inline
-            inline.setDistT(0);
-            inline.setDistR(0);
-            inline.setDistB(0);
-            inline.setDistL(0);
-
-            CTNonVisualDrawingProps docPr = inline.addNewDocPr();
-            long id = getParent().getDocument().getDrawingIdManager().reserveNew();
-            docPr.setId(id);
-            /* This name is not visible in Word 2010 anywhere. */
-            docPr.setName("Drawing " + id);
-            docPr.setDescr(filename);
-
-            CTPositiveSize2D extent = inline.addNewExtent();
-            extent.setCx(width);
-            extent.setCy(height);
-
-            // Grab the picture object
-            CTGraphicalObject graphic = inline.getGraphic();
-            CTGraphicalObjectData graphicData = graphic.getGraphicData();
-            CTPicture pic = getCTPictures(graphicData).get(0);
-
-            // Set it up
-            CTPictureNonVisual nvPicPr = pic.addNewNvPicPr();
-
-            CTNonVisualDrawingProps cNvPr = nvPicPr.addNewCNvPr();
-            /* use "0" for the id. See ECM-576, 20.2.2.3 */
-            cNvPr.setId(0L);
-            /* This name is not visible in Word 2010 anywhere */
-            cNvPr.setName("Picture " + id);
-            cNvPr.setDescr(filename);
-
-            CTNonVisualPictureProperties cNvPicPr = nvPicPr.addNewCNvPicPr();
-            cNvPicPr.addNewPicLocks().setNoChangeAspect(true);
-
-            CTBlipFillProperties blipFill = pic.addNewBlipFill();
-            CTBlip blip = blipFill.addNewBlip();
-            blip.setEmbed(parent.getDocument().getRelationId(picData));
-            blipFill.addNewStretch().addNewFillRect();
-
-            CTShapeProperties spPr = pic.addNewSpPr();
-            CTTransform2D xfrm = spPr.addNewXfrm();
-
-            CTPoint2D off = xfrm.addNewOff();
-            off.setX(0);
-            off.setY(0);
-
-            CTPositiveSize2D ext = xfrm.addNewExt();
-            ext.setCx(width);
-            ext.setCy(height);
-
-            CTPresetGeometry2D prstGeom = spPr.addNewPrstGeom();
-            prstGeom.setPrst(STShapeType.RECT);
-            prstGeom.addNewAvLst();
-
-            // Finish up
-            XWPFPicture xwpfPicture = new XWPFPicture(pic, this);
-            pictures.add(xwpfPicture);
-            return xwpfPicture;
-        } catch (XmlException e) {
-            throw new IllegalStateException(e);
-        } catch (SAXException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Returns the embedded pictures of the run. These
-     * are pictures which reference an external,
-     * embedded picture image such as a .png or .jpg
-     */
-    public List<XWPFPicture> getEmbeddedPictures() {
-        return pictures;
-    }
-
-    /**
-     * Returns the string version of the text
-     */
-    public String toString() {
-        return text();
-    }
-
-    /**
-     * Returns the string version of the text, with tabs and
-     * carriage returns in place of their xml equivalents.
-     */
-    public String text() {
-        StringBuffer text = new StringBuffer();
-
-        // Grab the text and tabs of the text run
-        // Do so in a way that preserves the ordering
-        XmlCursor c = run.newCursor();
-        c.selectPath("./*");
-        while (c.toNextSelection()) {
-            XmlObject o = c.getObject();
-            if (o instanceof CTText) {
-                String tagName = o.getDomNode().getNodeName();
-                // Field Codes (w:instrText, defined in spec sec. 17.16.23)
-                //  come up as instances of CTText, but we don't want them
-                //  in the normal text output
-                if (!"w:instrText".equals(tagName)) {
-                    text.append(((CTText) o).getStringValue());
-                }
-            }
-
-            // Complex type evaluation (currently only for extraction of check boxes)
-            if (o instanceof CTFldChar) {
-                CTFldChar ctfldChar = ((CTFldChar) o);
-                if (ctfldChar.getFldCharType() == STFldCharType.BEGIN) {
-                    if (ctfldChar.getFfData() != null) {
-                        for (CTFFCheckBox checkBox : ctfldChar.getFfData().getCheckBoxList()) {
-                            if (checkBox.getDefault() != null && checkBox.getDefault().getVal() == STOnOff.X_1) {
-                                text.append("|X|");
-                            } else {
-                                text.append("|_|");
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (o instanceof CTPTab) {
-                text.append("\t");
-            }
-            if (o instanceof CTBr) {
-                text.append("\n");
-            }
-            if (o instanceof CTEmpty) {
-                // Some inline text elements get returned not as
-                //  themselves, but as CTEmpty, owing to some odd
-                //  definitions around line 5642 of the XSDs
-                // This bit works around it, and replicates the above
-                //  rules for that case
-                String tagName = o.getDomNode().getNodeName();
-                if ("w:tab".equals(tagName) || "tab".equals(tagName)) {
-                    text.append("\t");
-                }
-                if ("w:br".equals(tagName) || "br".equals(tagName)) {
-                    text.append("\n");
-                }
-                if ("w:cr".equals(tagName) || "cr".equals(tagName)) {
-                    text.append("\n");
-                }
-            }
-            if (o instanceof CTFtnEdnRef) {
-                CTFtnEdnRef ftn = (CTFtnEdnRef) o;
-                String footnoteRef = ftn.getDomNode().getLocalName().equals("footnoteReference") ?
-                        "[footnoteRef:" + ftn.getId().intValue() + "]" : "[endnoteRef:" + ftn.getId().intValue() + "]";
-                text.append(footnoteRef);
-            }
-        }
-
-        c.dispose();
-
-        // Any picture text?
-        if (pictureText != null && pictureText.length() > 0) {
-            text.append("\n").append(pictureText);
-        }
-
-        return text.toString();
-    }
-
-    /**
-     * @see <a href="http://msdn.microsoft.com/en-us/library/ff533743(v=office.12).aspx">[MS-OI29500] Run Fonts</a>
-     */
-    public static enum FontCharRange {
-        ascii /* char 0-127 */,
-        cs /* complex symbol */,
-        eastAsia /* east asia */,
-        hAnsi /* high ansi */
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
deleted file mode 100644
index fd8389e..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtRun;
-
-/**
- * Experimental class to offer rudimentary read-only processing of
- * of StructuredDocumentTags/ContentControl
- * <p/>
- * WARNING - APIs expected to change rapidly
- */
-public class XWPFSDT extends AbstractXWPFSDT
-        implements IBodyElement, IRunBody, ISDTContents, IRunElement {
-    private final ISDTContent content;
-
-    public XWPFSDT(CTSdtRun sdtRun, IBody part) {
-        super(sdtRun.getSdtPr(), part);
-        this.content = new XWPFSDTContent(sdtRun.getSdtContent(), part, this);
-    }
-
-    public XWPFSDT(CTSdtBlock block, IBody part) {
-        super(block.getSdtPr(), part);
-        this.content = new XWPFSDTContent(block.getSdtContent(), part, this);
-    }
-
-    public ISDTContent getContent() {
-        return content;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
deleted file mode 100644
index fb40955..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtCell;
-
-/**
- * Experimental class to offer rudimentary read-only processing of
- * of StructuredDocumentTags/ContentControl that can appear
- * in a table row as if a table cell.
- * <p/>
- * These can contain one or more cells or other SDTs within them.
- * <p/>
- * WARNING - APIs expected to change rapidly
- */
-public class XWPFSDTCell extends AbstractXWPFSDT implements ICell {
-    private final XWPFSDTContentCell cellContent;
-
-    public XWPFSDTCell(CTSdtCell sdtCell, XWPFTableRow xwpfTableRow, IBody part) {
-        super(sdtCell.getSdtPr(), part);
-        cellContent = new XWPFSDTContentCell(sdtCell.getSdtContent(), xwpfTableRow, part);
-    }
-
-    @Override
-    public ISDTContent getContent() {
-        return cellContent;
-    }
-
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
deleted file mode 100644
index d160e66..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtContentBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtContentRun;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-
-/**
- * Experimental class to offer rudimentary read-only processing of
- * of the contentblock of an SDT/ContentControl.
- * <p/>
- * <p/>
- * <p/>
- * WARNING - APIs expected to change rapidly
- */
-public class XWPFSDTContent implements ISDTContent {
-
-    // private final IBody part;
-    // private final XWPFDocument document;
-    private List<XWPFParagraph> paragraphs = new ArrayList<XWPFParagraph>();
-    private List<XWPFTable> tables = new ArrayList<XWPFTable>();
-    private List<XWPFRun> runs = new ArrayList<XWPFRun>();
-    private List<XWPFSDT> contentControls = new ArrayList<XWPFSDT>();
-    private List<ISDTContents> bodyElements = new ArrayList<ISDTContents>();
-
-    public XWPFSDTContent(CTSdtContentRun sdtRun, IBody part, IRunBody parent) {
-        for (CTR ctr : sdtRun.getRArray()) {
-            XWPFRun run = new XWPFRun(ctr, parent);
-            runs.add(run);
-            bodyElements.add(run);
-        }
-    }
-
-    public XWPFSDTContent(CTSdtContentBlock block, IBody part, IRunBody parent) {
-        XmlCursor cursor = block.newCursor();
-        cursor.selectPath("./*");
-        while (cursor.toNextSelection()) {
-            XmlObject o = cursor.getObject();
-            if (o instanceof CTP) {
-                XWPFParagraph p = new XWPFParagraph((CTP) o, part);
-                bodyElements.add(p);
-                paragraphs.add(p);
-            } else if (o instanceof CTTbl) {
-                XWPFTable t = new XWPFTable((CTTbl) o, part);
-                bodyElements.add(t);
-                tables.add(t);
-            } else if (o instanceof CTSdtBlock) {
-                XWPFSDT c = new XWPFSDT(((CTSdtBlock) o), part);
-                bodyElements.add(c);
-                contentControls.add(c);
-            } else if (o instanceof CTR) {
-                XWPFRun run = new XWPFRun((CTR) o, parent);
-                runs.add(run);
-                bodyElements.add(run);
-            }
-        }
-        cursor.dispose();
-    }
-
-    public String getText() {
-        StringBuilder text = new StringBuilder();
-        boolean addNewLine = false;
-        for (int i = 0; i < bodyElements.size(); i++) {
-            Object o = bodyElements.get(i);
-            if (o instanceof XWPFParagraph) {
-                appendParagraph((XWPFParagraph) o, text);
-                addNewLine = true;
-            } else if (o instanceof XWPFTable) {
-                appendTable((XWPFTable) o, text);
-                addNewLine = true;
-            } else if (o instanceof XWPFSDT) {
-                text.append(((XWPFSDT) o).getContent().getText());
-                addNewLine = true;
-            } else if (o instanceof XWPFRun) {
-                text.append(((XWPFRun) o).toString());
-                addNewLine = false;
-            }
-            if (addNewLine == true && i < bodyElements.size() - 1) {
-                text.append("\n");
-            }
-        }
-        return text.toString();
-    }
-
-    private void appendTable(XWPFTable table, StringBuilder text) {
-        //this works recursively to pull embedded tables from within cells
-        for (XWPFTableRow row : table.getRows()) {
-            List<ICell> cells = row.getTableICells();
-            for (int i = 0; i < cells.size(); i++) {
-                ICell cell = cells.get(i);
-                if (cell instanceof XWPFTableCell) {
-                    text.append(((XWPFTableCell) cell).getTextRecursively());
-                } else if (cell instanceof XWPFSDTCell) {
-                    text.append(((XWPFSDTCell) cell).getContent().getText());
-                }
-                if (i < cells.size() - 1) {
-                    text.append("\t");
-                }
-            }
-            text.append('\n');
-        }
-    }
-
-    private void appendParagraph(XWPFParagraph paragraph, StringBuilder text) {
-        for (IRunElement run : paragraph.getRuns()) {
-            text.append(run.toString());
-        }
-    }
-
-    public String toString() {
-        return getText();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
deleted file mode 100644
index c8246f6..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-
-import javax.xml.namespace.QName;
-
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtContentCell;
-
-
-/**
- * Experimental class to offer rudimentary read-only processing of
- * of the XWPFSDTCellContent.
- * <p/>
- * WARNING - APIs expected to change rapidly
- */
-public class XWPFSDTContentCell implements ISDTContent {
-
-    //A full implementation would grab the icells
-    //that a content cell can contain.  This would require
-    //significant changes, including changing the notion that the
-    //parent of a cell can be not just a row, but an sdt.
-    //For now we are just grabbing the text out of the text tokentypes.
-
-    //private List<ICell> cells = new ArrayList<ICell>().
-
-    private String text = "";
-
-    public XWPFSDTContentCell(CTSdtContentCell sdtContentCell,
-                              XWPFTableRow xwpfTableRow, IBody part) {
-        super();
-        //sdtContentCell is allowed to be null:  minOccurs="0" maxOccurs="1"
-        if (sdtContentCell == null) {
-            return;
-        }
-        StringBuilder sb = new StringBuilder();
-        XmlCursor cursor = sdtContentCell.newCursor();
-
-        //keep track of the following,
-        //and add "\n" only before the start of a body
-        //element if it is not the first body element.
-
-        //index of cell in row
-        int tcCnt = 0;
-        //count of body objects
-        int iBodyCnt = 0;
-        int depth = 1;
-
-        while (cursor.hasNextToken() && depth > 0) {
-            TokenType t = cursor.toNextToken();
-            if (t.isText()) {
-                sb.append(cursor.getTextValue());
-            } else if (isStartToken(cursor, "tr")) {
-                tcCnt = 0;
-                iBodyCnt = 0;
-            } else if (isStartToken(cursor, "tc")) {
-                if (tcCnt++ > 0) {
-                    sb.append("\t");
-                }
-                iBodyCnt = 0;
-            } else if (isStartToken(cursor, "p") ||
-                    isStartToken(cursor, "tbl") ||
-                    isStartToken(cursor, "sdt")) {
-                if (iBodyCnt > 0) {
-                    sb.append("\n");
-                }
-                iBodyCnt++;
-            }
-            if (cursor.isStart()) {
-                depth++;
-            } else if (cursor.isEnd()) {
-                depth--;
-            }
-        }
-        text = sb.toString();
-        cursor.dispose();
-    }
-
-
-    private boolean isStartToken(XmlCursor cursor, String string) {
-        if (!cursor.isStart()) {
-            return false;
-        }
-        QName qName = cursor.getName();
-        if (qName != null && qName.getLocalPart() != null &&
-                qName.getLocalPart().equals(string)) {
-            return true;
-        }
-        return false;
-    }
-
-
-    public String getText() {
-        return text;
-    }
-
-    public String toString() {
-        return getText();
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
deleted file mode 100644
index d9d29a3..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.Arrays;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDocProtect;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSettings;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTZoom;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STAlgClass;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STAlgType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STCryptProv;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STDocProtect;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.SettingsDocument;
-
-public class XWPFSettings extends POIXMLDocumentPart {
-
-    private CTSettings ctSettings;
-
-    /**
-     * @since POI 3.14-Beta1
-     */
-    public XWPFSettings(PackagePart part) throws IOException {
-        super(part);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFSettings(PackagePart part, PackageRelationship rel) throws IOException {
-        this(part);
-    }
-    
-    public XWPFSettings() {
-        super();
-        ctSettings = CTSettings.Factory.newInstance();
-    }
-
-    @Override
-    protected void onDocumentRead() throws IOException {
-        super.onDocumentRead();
-        readFrom(getPackagePart().getInputStream());
-    }
-
-    /**
-     * Set zoom.<br/>
-     * In the zoom tag inside settings.xml file <br/>
-     * it sets the value of zoom
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *    &lt;w:zoom w:percent="50" /&gt;
-     * <pre>
-     *
-     * @return percentage as an integer of zoom level
-     */
-    public long getZoomPercent() {
-        CTZoom zoom;
-        if (!ctSettings.isSetZoom()) {
-            zoom = ctSettings.addNewZoom();
-        } else {
-            zoom = ctSettings.getZoom();
-        }
-
-        
-        BigInteger percent = zoom.getPercent();
-        if(percent == null) {
-            return 100;
-        }
-        return percent.longValue();
-    }
-
-    /**
-     * Set zoom.<br/>
-     * In the zoom tag inside settings.xml file <br/>
-     * it sets the value of zoom
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *    &lt;w:zoom w:percent="50" /&gt;
-     * <pre>
-     */
-    public void setZoomPercent(long zoomPercent) {
-        if (!ctSettings.isSetZoom()) {
-            ctSettings.addNewZoom();
-        }
-        CTZoom zoom = ctSettings.getZoom();
-        zoom.setPercent(BigInteger.valueOf(zoomPercent));
-    }
-	
-	/**
-     * Verifies the documentProtection tag inside settings.xml file <br/>
-     * if the protection is enforced (w:enforcement="1") <br/>
-     *  <p/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;readOnly&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     *
-     * @return true if documentProtection is enforced with option any
-     */
-	public boolean isEnforcedWith() {
-        CTDocProtect ctDocProtect = ctSettings.getDocumentProtection();
-
-        if (ctDocProtect == null) {
-            return false;
-        }
-
-        return ctDocProtect.getEnforcement().equals(STOnOff.X_1);
-    }
-
-    /**
-     * Verifies the documentProtection tag inside settings.xml file <br/>
-     * if the protection is enforced (w:enforcement="1") <br/>
-     * and if the kind of protection equals to passed (STDocProtect.Enum editValue) <br/>
-     * <p/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;readOnly&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     *
-     * @return true if documentProtection is enforced with option readOnly
-     */
-    public boolean isEnforcedWith(STDocProtect.Enum editValue) {
-        CTDocProtect ctDocProtect = ctSettings.getDocumentProtection();
-
-        if (ctDocProtect == null) {
-            return false;
-        }
-
-        return ctDocProtect.getEnforcement().equals(STOnOff.X_1) && ctDocProtect.getEdit().equals(editValue);
-    }
-
-    /**
-     * Enforces the protection with the option specified by passed editValue.<br/>
-     * <br/>
-     * In the documentProtection tag inside settings.xml file <br/>
-     * it sets the value of enforcement to "1" (w:enforcement="1") <br/>
-     * and the value of edit to the passed editValue (w:edit="[passed editValue]")<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *     &lt;w:settings  ... &gt;
-     *         &lt;w:documentProtection w:edit=&quot;[passed editValue]&quot; w:enforcement=&quot;1&quot;/&gt;
-     * </pre>
-     */
-    public void setEnforcementEditValue(org.openxmlformats.schemas.wordprocessingml.x2006.main.STDocProtect.Enum editValue) {
-        safeGetDocumentProtection().setEnforcement(STOnOff.X_1);
-        safeGetDocumentProtection().setEdit(editValue);
-    }
-
-    /**
-     * Enforces the protection with the option specified by passed editValue and password.<br/>
-     * <br/>
-     * sample snippet from settings.xml
-     * <pre>
-     *   &lt;w:documentProtection w:edit=&quot;[passed editValue]&quot; w:enforcement=&quot;1&quot;
-     *       w:cryptProviderType=&quot;rsaAES&quot; w:cryptAlgorithmClass=&quot;hash&quot;
-     *       w:cryptAlgorithmType=&quot;typeAny&quot; w:cryptAlgorithmSid=&quot;14&quot;
-     *       w:cryptSpinCount=&quot;100000&quot; w:hash=&quot;...&quot; w:salt=&quot;....&quot;
-     *   /&gt;
-     * </pre>
-     *
-     * @param editValue the protection type
-     * @param password  the plaintext password, if null no password will be applied
-     * @param hashAlgo  the hash algorithm - only md2, m5, sha1, sha256, sha384 and sha512 are supported.
-     *                  if null, it will default default to sha1
-     */
-    public void setEnforcementEditValue(org.openxmlformats.schemas.wordprocessingml.x2006.main.STDocProtect.Enum editValue,
-                                        String password, HashAlgorithm hashAlgo) {
-        safeGetDocumentProtection().setEnforcement(STOnOff.X_1);
-        safeGetDocumentProtection().setEdit(editValue);
-
-        if (password == null) {
-            if (safeGetDocumentProtection().isSetCryptProviderType()) {
-                safeGetDocumentProtection().unsetCryptProviderType();
-            }
-
-            if (safeGetDocumentProtection().isSetCryptAlgorithmClass()) {
-                safeGetDocumentProtection().unsetCryptAlgorithmClass();
-            }
-
-            if (safeGetDocumentProtection().isSetCryptAlgorithmType()) {
-                safeGetDocumentProtection().unsetCryptAlgorithmType();
-            }
-
-            if (safeGetDocumentProtection().isSetCryptAlgorithmSid()) {
-                safeGetDocumentProtection().unsetCryptAlgorithmSid();
-            }
-
-            if (safeGetDocumentProtection().isSetSalt()) {
-                safeGetDocumentProtection().unsetSalt();
-            }
-
-            if (safeGetDocumentProtection().isSetCryptSpinCount()) {
-                safeGetDocumentProtection().unsetCryptSpinCount();
-            }
-
-            if (safeGetDocumentProtection().isSetHash()) {
-                safeGetDocumentProtection().unsetHash();
-            }
-        } else {
-            final STCryptProv.Enum providerType;
-            final int sid;
-            if (hashAlgo == null) {
-                hashAlgo = HashAlgorithm.sha1;
-            }
-            
-            switch (hashAlgo) {
-                case md2:
-                    providerType = STCryptProv.RSA_FULL;
-                    sid = 1;
-                    break;
-                case md4:
-                    providerType = STCryptProv.RSA_FULL;
-                    sid = 2;
-                    break;
-                case md5:
-                    providerType = STCryptProv.RSA_FULL;
-                    sid = 3;
-                    break;
-                case sha1:
-                    providerType = STCryptProv.RSA_FULL;
-                    sid = 4;
-                    break;
-                case sha256:
-                    providerType = STCryptProv.RSA_AES;
-                    sid = 12;
-                    break;
-                case sha384:
-                    providerType = STCryptProv.RSA_AES;
-                    sid = 13;
-                    break;
-                case sha512:
-                    providerType = STCryptProv.RSA_AES;
-                    sid = 14;
-                    break;
-                default:
-                    throw new EncryptedDocumentException
-                            ("Hash algorithm '" + hashAlgo + "' is not supported for document write protection.");
-            }
-
-
-            SecureRandom random = new SecureRandom();
-            byte salt[] = random.generateSeed(16);
-
-            // Iterations specifies the number of times the hashing function shall be iteratively run (using each
-            // iteration's result as the input for the next iteration).
-            int spinCount = 100000;
-
-            String legacyHash = CryptoFunctions.xorHashPasswordReversed(password);
-            // Implementation Notes List:
-            // --> In this third stage, the reversed byte order legacy hash from the second stage shall
-            //     be converted to Unicode hex string representation
-            byte hash[] = CryptoFunctions.hashPassword(legacyHash, hashAlgo, salt, spinCount, false);
-
-            safeGetDocumentProtection().setSalt(salt);
-            safeGetDocumentProtection().setHash(hash);
-            safeGetDocumentProtection().setCryptSpinCount(BigInteger.valueOf(spinCount));
-            safeGetDocumentProtection().setCryptAlgorithmType(STAlgType.TYPE_ANY);
-            safeGetDocumentProtection().setCryptAlgorithmClass(STAlgClass.HASH);
-            safeGetDocumentProtection().setCryptProviderType(providerType);
-            safeGetDocumentProtection().setCryptAlgorithmSid(BigInteger.valueOf(sid));
-        }
-    }
-
-    /**
-     * Validates the existing password
-     *
-     * @param password
-     * @return true, only if password was set and equals, false otherwise
-     */
-    public boolean validateProtectionPassword(String password) {
-        BigInteger sid = safeGetDocumentProtection().getCryptAlgorithmSid();
-        byte hash[] = safeGetDocumentProtection().getHash();
-        byte salt[] = safeGetDocumentProtection().getSalt();
-        BigInteger spinCount = safeGetDocumentProtection().getCryptSpinCount();
-
-        if (sid == null || hash == null || salt == null || spinCount == null) return false;
-
-        HashAlgorithm hashAlgo;
-        switch (sid.intValue()) {
-            case 1:
-                hashAlgo = HashAlgorithm.md2;
-                break;
-            case 2:
-                hashAlgo = HashAlgorithm.md4;
-                break;
-            case 3:
-                hashAlgo = HashAlgorithm.md5;
-                break;
-            case 4:
-                hashAlgo = HashAlgorithm.sha1;
-                break;
-            case 12:
-                hashAlgo = HashAlgorithm.sha256;
-                break;
-            case 13:
-                hashAlgo = HashAlgorithm.sha384;
-                break;
-            case 14:
-                hashAlgo = HashAlgorithm.sha512;
-                break;
-            default:
-                return false;
-        }
-
-        String legacyHash = CryptoFunctions.xorHashPasswordReversed(password);
-        // Implementation Notes List:
-        // --> In this third stage, the reversed byte order legacy hash from the second stage shall
-        //     be converted to Unicode hex string representation
-        byte hash2[] = CryptoFunctions.hashPassword(legacyHash, hashAlgo, salt, spinCount.intValue(), false);
-
-        return Arrays.equals(hash, hash2);
-    }
-
-    /**
-     * Removes protection enforcement.<br/>
-     * In the documentProtection tag inside settings.xml file <br/>
-     * it sets the value of enforcement to "0" (w:enforcement="0") <br/>
-     */
-    public void removeEnforcement() {
-        safeGetDocumentProtection().setEnforcement(STOnOff.X_0);
-    }
-
-    /**
-     * Enforces fields update on document open (in Word).
-     * In the settings.xml file <br/>
-     * sets the updateSettings value to true (w:updateSettings w:val="true")
-     * <p/>
-     * NOTICES:
-     * <ul>
-     * <li>Causing Word to ask on open: "This document contains fields that may refer to other files. Do you want to update the fields in this document?"
-     * (if "Update automatic links at open" is enabled)</li>
-     * <li>Flag is removed after saving with changes in Word </li>
-     * </ul>
-     */
-    public void setUpdateFields() {
-        CTOnOff onOff = CTOnOff.Factory.newInstance();
-        onOff.setVal(STOnOff.TRUE);
-        ctSettings.setUpdateFields(onOff);
-    }
-
-    boolean isUpdateFields() {
-        return ctSettings.isSetUpdateFields() && ctSettings.getUpdateFields().getVal() == STOnOff.TRUE;
-    }
-
-    /**
-     * Check if revision tracking is turned on.
-     *
-     * @return <code>true</code> if revision tracking is turned on
-     */
-    public boolean isTrackRevisions() {
-        return ctSettings.isSetTrackRevisions();
-    }
-
-    /**
-     * Enable or disable revision tracking.
-     *
-     * @param enable <code>true</code> to  turn on revision tracking, <code>false</code> to turn off revision tracking
-     */
-    public void setTrackRevisions(boolean enable) {
-        if (enable) {
-            if (!ctSettings.isSetTrackRevisions()) {
-                ctSettings.addNewTrackRevisions();
-            }
-        } else {
-            if (ctSettings.isSetTrackRevisions()) {
-                ctSettings.unsetTrackRevisions();
-            }
-        }
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        if (ctSettings == null) {
-            throw new IllegalStateException("Unable to write out settings that were never read in!");
-        }
-
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTSettings.type.getName().getNamespaceURI(), "settings"));
-
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        ctSettings.save(out, xmlOptions);
-        out.close();
-    }
-
-    private CTDocProtect safeGetDocumentProtection() {
-        CTDocProtect documentProtection = ctSettings.getDocumentProtection();
-        if (documentProtection == null) {
-            documentProtection = CTDocProtect.Factory.newInstance();
-            ctSettings.setDocumentProtection(documentProtection);
-        }
-        return ctSettings.getDocumentProtection();
-    }
-
-    private void readFrom(InputStream inputStream) {
-        try {
-            ctSettings = SettingsDocument.Factory.parse(inputStream, DEFAULT_XML_OPTIONS).getSettings();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
deleted file mode 100644
index a6ebdcc..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyle;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STStyleType;
-
-/**
- * @author Philipp Epp
- */
-public class XWPFStyle {
-
-    protected XWPFStyles styles;
-    private CTStyle ctStyle;
-
-    /**
-     * constructor
-     *
-     * @param style
-     */
-    public XWPFStyle(CTStyle style) {
-        this(style, null);
-    }
-
-    /**
-     * constructor
-     *
-     * @param style
-     * @param styles
-     */
-    public XWPFStyle(CTStyle style, XWPFStyles styles) {
-        this.ctStyle = style;
-        this.styles = styles;
-    }
-
-    /**
-     * get StyleID of the style
-     *
-     * @return styleID        StyleID of the style
-     */
-    public String getStyleId() {
-        return ctStyle.getStyleId();
-    }
-
-    /**
-     * set styleID
-     *
-     * @param styleId
-     */
-    public void setStyleId(String styleId) {
-        ctStyle.setStyleId(styleId);
-    }
-
-    /**
-     * get Type of the Style
-     *
-     * @return ctType
-     */
-    public STStyleType.Enum getType() {
-        return ctStyle.getType();
-    }
-
-    /**
-     * set styleType
-     *
-     * @param type
-     */
-    public void setType(STStyleType.Enum type) {
-        ctStyle.setType(type);
-    }
-
-    /**
-     * set style
-     *
-     * @param style
-     */
-    public void setStyle(CTStyle style) {
-        this.ctStyle = style;
-    }
-
-    /**
-     * get ctStyle
-     *
-     * @return ctStyle
-     */
-    public CTStyle getCTStyle() {
-        return this.ctStyle;
-    }
-
-    /**
-     * get styles
-     *
-     * @return styles        the styles to which this style belongs
-     */
-    public XWPFStyles getStyles() {
-        return styles;
-    }
-
-    public String getBasisStyleID() {
-        if (ctStyle.getBasedOn() != null)
-            return ctStyle.getBasedOn().getVal();
-        else
-            return null;
-    }
-
-
-    /**
-     * get StyleID of the linked Style
-     */
-    public String getLinkStyleID() {
-        if (ctStyle.getLink() != null)
-            return ctStyle.getLink().getVal();
-        else
-            return null;
-    }
-
-    /**
-     * get StyleID of the next style
-     */
-    public String getNextStyleID() {
-        if (ctStyle.getNext() != null)
-            return ctStyle.getNext().getVal();
-        else
-            return null;
-    }
-
-    public String getName() {
-        if (ctStyle.isSetName())
-            return ctStyle.getName().getVal();
-        return null;
-    }
-
-    /**
-     * compares the names of the Styles
-     *
-     * @param compStyle
-     */
-    public boolean hasSameName(XWPFStyle compStyle) {
-        CTStyle ctCompStyle = compStyle.getCTStyle();
-        String name = ctCompStyle.getName().getVal();
-        return name.equals(ctStyle.getName().getVal());
-    }
-
-}//end class
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
deleted file mode 100644
index 55e1ca4..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.apache.poi.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDocDefaults;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFonts;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLanguage;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPrDefault;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPrDefault;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyle;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyles;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.StylesDocument;
-
-/**
- * Holds details of built-in, default and user styles, which
- * apply to tables / paragraphs / lists etc.
- * Text within one of those with custom stylings has the style
- * information stored in the {@link XWPFRun}
- */
-public class XWPFStyles extends POIXMLDocumentPart {
-    private CTStyles ctStyles;
-    private List<XWPFStyle> listStyle = new ArrayList<XWPFStyle>();
-
-    private XWPFLatentStyles latentStyles;
-    private XWPFDefaultRunStyle defaultRunStyle;
-    private XWPFDefaultParagraphStyle defaultParaStyle;
-
-    /**
-     * Construct XWPFStyles from a package part
-     *
-     * @param part the package part holding the data of the styles,
-     * 
-     * @since POI 3.14-Beta1
-     */
-    public XWPFStyles(PackagePart part) throws IOException, OpenXML4JException {
-        super(part);
-    }
-
-    /**
-     * @deprecated in POI 3.14, scheduled for removal in POI 3.16
-     */
-    @Deprecated
-    public XWPFStyles(PackagePart part, PackageRelationship rel) throws IOException, OpenXML4JException {
-        this(part);
-    }
-    
-    /**
-     * Construct XWPFStyles from scratch for a new document.
-     */
-    public XWPFStyles() {
-    }
-
-    /**
-     * Read document
-     */
-    @Override
-    protected void onDocumentRead() throws IOException {
-        StylesDocument stylesDoc;
-        InputStream is = getPackagePart().getInputStream();
-        try {
-            stylesDoc = StylesDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
-            setStyles(stylesDoc.getStyles());
-            latentStyles = new XWPFLatentStyles(ctStyles.getLatentStyles(), this);
-        } catch (XmlException e) {
-            throw new POIXMLException("Unable to read styles", e);
-        } finally {
-            is.close();
-        }
-    }
-
-    @Override
-    protected void commit() throws IOException {
-        if (ctStyles == null) {
-            throw new IllegalStateException("Unable to write out styles that were never read in!");
-        }
-
-        XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
-        xmlOptions.setSaveSyntheticDocumentElement(new QName(CTStyles.type.getName().getNamespaceURI(), "styles"));
-        PackagePart part = getPackagePart();
-        OutputStream out = part.getOutputStream();
-        ctStyles.save(out, xmlOptions);
-        out.close();
-    }
-
-    protected void ensureDocDefaults() {
-        if (!ctStyles.isSetDocDefaults()) {
-            ctStyles.addNewDocDefaults();
-        }
-
-        CTDocDefaults docDefaults = ctStyles.getDocDefaults();
-        if (!docDefaults.isSetPPrDefault())
-            docDefaults.addNewPPrDefault();
-        if (!docDefaults.isSetRPrDefault())
-            docDefaults.addNewRPrDefault();
-
-        CTPPrDefault pprd = docDefaults.getPPrDefault();
-        CTRPrDefault rprd = docDefaults.getRPrDefault();
-        if (!pprd.isSetPPr()) pprd.addNewPPr();
-        if (!rprd.isSetRPr()) rprd.addNewRPr();
-
-        defaultRunStyle = new XWPFDefaultRunStyle(rprd.getRPr());
-        defaultParaStyle = new XWPFDefaultParagraphStyle(pprd.getPPr());
-    }
-
-    /**
-     * Sets the ctStyles
-     *
-     * @param styles
-     */
-    public void setStyles(CTStyles styles) {
-        ctStyles = styles;
-
-        // Build up all the style objects
-        for (CTStyle style : ctStyles.getStyleArray()) {
-            listStyle.add(new XWPFStyle(style, this));
-        }
-        if (ctStyles.isSetDocDefaults()) {
-            CTDocDefaults docDefaults = ctStyles.getDocDefaults();
-            if (docDefaults.isSetRPrDefault() && docDefaults.getRPrDefault().isSetRPr()) {
-                defaultRunStyle = new XWPFDefaultRunStyle(
-                        docDefaults.getRPrDefault().getRPr());
-            }
-            if (docDefaults.isSetPPrDefault() && docDefaults.getPPrDefault().isSetPPr()) {
-                defaultParaStyle = new XWPFDefaultParagraphStyle(
-                        docDefaults.getPPrDefault().getPPr());
-            }
-        }
-    }
-
-    /**
-     * checks whether style with styleID exist
-     *
-     * @param styleID styleID of the Style in the style-Document
-     * @return true if style exist, false if style not exist
-     */
-    public boolean styleExist(String styleID) {
-        for (XWPFStyle style : listStyle) {
-            if (style.getStyleId().equals(styleID))
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * add a style to the document
-     *
-     * @param style
-     * @throws IOException
-     */
-    public void addStyle(XWPFStyle style) {
-        listStyle.add(style);
-        ctStyles.addNewStyle();
-        int pos = ctStyles.sizeOfStyleArray() - 1;
-        ctStyles.setStyleArray(pos, style.getCTStyle());
-    }
-
-    /**
-     * Get style by a styleID
-     *
-     * @param styleID styleID of the searched style
-     * @return style
-     */
-    public XWPFStyle getStyle(String styleID) {
-        for (XWPFStyle style : listStyle) {
-            if (style.getStyleId().equals(styleID))
-                return style;
-        }
-        return null;
-    }
-
-    public int getNumberOfStyles() {
-        return listStyle.size();
-    }
-
-    /**
-     * get the styles which are related to the parameter style and their relatives
-     * this method can be used to copy all styles from one document to another document
-     *
-     * @param style
-     * @return a list of all styles which were used by this method
-     */
-    public List<XWPFStyle> getUsedStyleList(XWPFStyle style) {
-        List<XWPFStyle> usedStyleList = new ArrayList<XWPFStyle>();
-        usedStyleList.add(style);
-        return getUsedStyleList(style, usedStyleList);
-    }
-
-    /**
-     * get the styles which are related to parameter style
-     *
-     * @param style
-     * @return all Styles of the parameterList
-     */
-    private List<XWPFStyle> getUsedStyleList(XWPFStyle style, List<XWPFStyle> usedStyleList) {
-        String basisStyleID = style.getBasisStyleID();
-        XWPFStyle basisStyle = getStyle(basisStyleID);
-        if ((basisStyle != null) && (!usedStyleList.contains(basisStyle))) {
-            usedStyleList.add(basisStyle);
-            getUsedStyleList(basisStyle, usedStyleList);
-        }
-        String linkStyleID = style.getLinkStyleID();
-        XWPFStyle linkStyle = getStyle(linkStyleID);
-        if ((linkStyle != null) && (!usedStyleList.contains(linkStyle))) {
-            usedStyleList.add(linkStyle);
-            getUsedStyleList(linkStyle, usedStyleList);
-        }
-
-        String nextStyleID = style.getNextStyleID();
-        XWPFStyle nextStyle = getStyle(nextStyleID);
-        if ((nextStyle != null) && (!usedStyleList.contains(nextStyle))) {
-            usedStyleList.add(linkStyle);
-            getUsedStyleList(linkStyle, usedStyleList);
-        }
-        return usedStyleList;
-    }
-
-    protected CTLanguage getCTLanguage() {
-        ensureDocDefaults();
-
-        CTLanguage lang = null;
-        if (defaultRunStyle.getRPr().isSetLang()) {
-            lang = defaultRunStyle.getRPr().getLang();
-        } else {
-            lang = defaultRunStyle.getRPr().addNewLang();
-        }
-
-        return lang;
-    }
-
-    /**
-     * Sets the default spelling language on ctStyles DocDefaults parameter
-     *
-     * @param strSpellingLanguage
-     */
-    public void setSpellingLanguage(String strSpellingLanguage) {
-        CTLanguage lang = getCTLanguage();
-        lang.setVal(strSpellingLanguage);
-        lang.setBidi(strSpellingLanguage);
-    }
-
-    /**
-     * Sets the default East Asia spelling language on ctStyles DocDefaults parameter
-     *
-     * @param strEastAsia
-     */
-    public void setEastAsia(String strEastAsia) {
-        CTLanguage lang = getCTLanguage();
-        lang.setEastAsia(strEastAsia);
-    }
-
-    /**
-     * Sets the default font on ctStyles DocDefaults parameter
-     * TODO Replace this with specific setters for each type, possibly
-     * on XWPFDefaultRunStyle
-     */
-    public void setDefaultFonts(CTFonts fonts) {
-        ensureDocDefaults();
-
-        CTRPr runProps = defaultRunStyle.getRPr();
-        runProps.setRFonts(fonts);
-    }
-
-    /**
-     * get the style with the same name
-     * if this style is not existing, return null
-     */
-    public XWPFStyle getStyleWithSameName(XWPFStyle style) {
-        for (XWPFStyle ownStyle : listStyle) {
-            if (ownStyle.hasSameName(style)) {
-                return ownStyle;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the default style which applies text runs in the document
-     */
-    public XWPFDefaultRunStyle getDefaultRunStyle() {
-        ensureDocDefaults();
-        return defaultRunStyle;
-    }
-
-    /**
-     * Get the default paragraph style which applies to the document
-     */
-    public XWPFDefaultParagraphStyle getDefaultParagraphStyle() {
-        ensureDocDefaults();
-        return defaultParaStyle;
-    }
-
-    /**
-     * Get the definition of all the Latent Styles
-     */
-    public XWPFLatentStyles getLatentStyles() {
-        return latentStyles;
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
deleted file mode 100644
index 2e4bb5c..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.util.Internal;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDecimalNumber;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblBorders;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblCellMar;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
-
-/**
- * <p>Sketch of XWPFTable class. Only table's text is being hold.</p>
- * <p>Specifies the contents of a table present in the document. A table is a set
- * of paragraphs (and other block-level content) arranged in rows and columns.</p>
- */
-public class XWPFTable implements IBodyElement, ISDTContents {
-    private static EnumMap<XWPFBorderType, STBorder.Enum> xwpfBorderTypeMap;
-    // Create a map from the STBorder.Enum values to the XWPF-level enums
-    private static HashMap<Integer, XWPFBorderType> stBorderTypeMap;
-
-    static {
-        // populate enum maps
-        xwpfBorderTypeMap = new EnumMap<XWPFBorderType, STBorder.Enum>(XWPFBorderType.class);
-        xwpfBorderTypeMap.put(XWPFBorderType.NIL, STBorder.Enum.forInt(STBorder.INT_NIL));
-        xwpfBorderTypeMap.put(XWPFBorderType.NONE, STBorder.Enum.forInt(STBorder.INT_NONE));
-        xwpfBorderTypeMap.put(XWPFBorderType.SINGLE, STBorder.Enum.forInt(STBorder.INT_SINGLE));
-        xwpfBorderTypeMap.put(XWPFBorderType.THICK, STBorder.Enum.forInt(STBorder.INT_THICK));
-        xwpfBorderTypeMap.put(XWPFBorderType.DOUBLE, STBorder.Enum.forInt(STBorder.INT_DOUBLE));
-        xwpfBorderTypeMap.put(XWPFBorderType.DOTTED, STBorder.Enum.forInt(STBorder.INT_DOTTED));
-        xwpfBorderTypeMap.put(XWPFBorderType.DASHED, STBorder.Enum.forInt(STBorder.INT_DASHED));
-        xwpfBorderTypeMap.put(XWPFBorderType.DOT_DASH, STBorder.Enum.forInt(STBorder.INT_DOT_DASH));
-
-        stBorderTypeMap = new HashMap<Integer, XWPFBorderType>();
-        stBorderTypeMap.put(STBorder.INT_NIL, XWPFBorderType.NIL);
-        stBorderTypeMap.put(STBorder.INT_NONE, XWPFBorderType.NONE);
-        stBorderTypeMap.put(STBorder.INT_SINGLE, XWPFBorderType.SINGLE);
-        stBorderTypeMap.put(STBorder.INT_THICK, XWPFBorderType.THICK);
-        stBorderTypeMap.put(STBorder.INT_DOUBLE, XWPFBorderType.DOUBLE);
-        stBorderTypeMap.put(STBorder.INT_DOTTED, XWPFBorderType.DOTTED);
-        stBorderTypeMap.put(STBorder.INT_DASHED, XWPFBorderType.DASHED);
-        stBorderTypeMap.put(STBorder.INT_DOT_DASH, XWPFBorderType.DOT_DASH);
-    }
-
-    protected StringBuffer text = new StringBuffer();
-    protected List<XWPFTableRow> tableRows;
-
-    // Unused: UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD
-    //protected List<String> styleIDs;
-    protected IBody part;
-    private CTTbl ctTbl;
-
-    public XWPFTable(CTTbl table, IBody part, int row, int col) {
-        this(table, part);
-
-        for (int i = 0; i < row; i++) {
-            XWPFTableRow tabRow = (getRow(i) == null) ? createRow() : getRow(i);
-            for (int k = 0; k < col; k++) {
-                if (tabRow.getCell(k) == null) {
-                    tabRow.createCell();
-                }
-            }
-        }
-    }
-
-    public XWPFTable(CTTbl table, IBody part) {
-        this.part = part;
-        this.ctTbl = table;
-
-        tableRows = new ArrayList<XWPFTableRow>();
-
-        // is an empty table: I add one row and one column as default
-        if (table.sizeOfTrArray() == 0)
-            createEmptyTable(table);
-
-        for (CTRow row : table.getTrArray()) {
-            StringBuilder rowText = new StringBuilder();
-            XWPFTableRow tabRow = new XWPFTableRow(row, this);
-            tableRows.add(tabRow);
-            for (CTTc cell : row.getTcArray()) {
-                for (CTP ctp : cell.getPArray()) {
-                    XWPFParagraph p = new XWPFParagraph(ctp, part);
-                    if (rowText.length() > 0) {
-                        rowText.append('\t');
-                    }
-                    rowText.append(p.getText());
-                }
-            }
-            if (rowText.length() > 0) {
-                this.text.append(rowText);
-                this.text.append('\n');
-            }
-        }
-    }
-
-    private void createEmptyTable(CTTbl table) {
-        // MINIMUM ELEMENTS FOR A TABLE
-        table.addNewTr().addNewTc().addNewP();
-
-        CTTblPr tblpro = table.addNewTblPr();
-        tblpro.addNewTblW().setW(new BigInteger("0"));
-        tblpro.getTblW().setType(STTblWidth.AUTO);
-
-        // layout
-        // tblpro.addNewTblLayout().setType(STTblLayoutType.AUTOFIT);
-
-        // borders
-        CTTblBorders borders = tblpro.addNewTblBorders();
-        borders.addNewBottom().setVal(STBorder.SINGLE);
-        borders.addNewInsideH().setVal(STBorder.SINGLE);
-        borders.addNewInsideV().setVal(STBorder.SINGLE);
-        borders.addNewLeft().setVal(STBorder.SINGLE);
-        borders.addNewRight().setVal(STBorder.SINGLE);
-        borders.addNewTop().setVal(STBorder.SINGLE);
-
-        /*
-         * CTTblGrid tblgrid=table.addNewTblGrid();
-         * tblgrid.addNewGridCol().setW(new BigInteger("2000"));
-         */
-        getRows();
-    }
-
-    /**
-     * @return ctTbl object
-     */
-    @Internal
-    public CTTbl getCTTbl() {
-        return ctTbl;
-    }
-
-    /**
-     * Convenience method to extract text in cells.  This
-     * does not extract text recursively in cells, and it does not
-     * currently include text in SDT (form) components.
-     * <p/>
-     * To get all text within a table, see XWPFWordExtractor's appendTableText
-     * as an example.
-     *
-     * @return text
-     */
-    public String getText() {
-        return text.toString();
-    }
-
-    public void addNewRowBetween(int start, int end) {
-        // TODO
-    }
-
-    /**
-     * add a new column for each row in this table
-     */
-    public void addNewCol() {
-        if (ctTbl.sizeOfTrArray() == 0) {
-            createRow();
-        }
-        for (int i = 0; i < ctTbl.sizeOfTrArray(); i++) {
-            XWPFTableRow tabRow = new XWPFTableRow(ctTbl.getTrArray(i), this);
-            tabRow.createCell();
-        }
-    }
-
-    /**
-     * create a new XWPFTableRow object with as many cells as the number of columns defined in that moment
-     *
-     * @return tableRow
-     */
-    public XWPFTableRow createRow() {
-        int sizeCol = ctTbl.sizeOfTrArray() > 0 ? ctTbl.getTrArray(0)
-                .sizeOfTcArray() : 0;
-        XWPFTableRow tabRow = new XWPFTableRow(ctTbl.addNewTr(), this);
-        addColumn(tabRow, sizeCol);
-        tableRows.add(tabRow);
-        return tabRow;
-    }
-
-    /**
-     * @param pos - index of the row
-     * @return the row at the position specified or null if no rows is defined or if the position is greather than the max size of rows array
-     */
-    public XWPFTableRow getRow(int pos) {
-        if (pos >= 0 && pos < ctTbl.sizeOfTrArray()) {
-            //return new XWPFTableRow(ctTbl.getTrArray(pos));
-            return getRows().get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * @return width value
-     */
-    public int getWidth() {
-        CTTblPr tblPr = getTrPr();
-        return tblPr.isSetTblW() ? tblPr.getTblW().getW().intValue() : -1;
-    }
-
-    /**
-     * @param width
-     */
-    public void setWidth(int width) {
-        CTTblPr tblPr = getTrPr();
-        CTTblWidth tblWidth = tblPr.isSetTblW() ? tblPr.getTblW() : tblPr.addNewTblW();
-        tblWidth.setW(new BigInteger("" + width));
-    }
-
-    /**
-     * @return number of rows in table
-     */
-    public int getNumberOfRows() {
-        return ctTbl.sizeOfTrArray();
-    }
-
-    private CTTblPr getTrPr() {
-        return (ctTbl.getTblPr() != null) ? ctTbl.getTblPr() : ctTbl
-                .addNewTblPr();
-    }
-
-    private void addColumn(XWPFTableRow tabRow, int sizeCol) {
-        if (sizeCol > 0) {
-            for (int i = 0; i < sizeCol; i++) {
-                tabRow.createCell();
-            }
-        }
-    }
-
-    /**
-     * get the StyleID of the table
-     *
-     * @return style-ID of the table
-     */
-    public String getStyleID() {
-        String styleId = null;
-        CTTblPr tblPr = ctTbl.getTblPr();
-        if (tblPr != null) {
-            CTString styleStr = tblPr.getTblStyle();
-            if (styleStr != null) {
-                styleId = styleStr.getVal();
-            }
-        }
-        return styleId;
-    }
-
-    /**
-     * Set the table style. If the style is not defined in the document, MS Word
-     * will set the table style to "Normal".
-     *
-     * @param styleName - the style name to apply to this table
-     */
-    public void setStyleID(String styleName) {
-        CTTblPr tblPr = getTrPr();
-        CTString styleStr = tblPr.getTblStyle();
-        if (styleStr == null) {
-            styleStr = tblPr.addNewTblStyle();
-        }
-        styleStr.setVal(styleName);
-    }
-
-    public XWPFBorderType getInsideHBorderType() {
-        XWPFBorderType bt = null;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideH()) {
-                CTBorder border = ctb.getInsideH();
-                bt = stBorderTypeMap.get(border.getVal().intValue());
-            }
-        }
-        return bt;
-    }
-
-    public int getInsideHBorderSize() {
-        int size = -1;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideH()) {
-                CTBorder border = ctb.getInsideH();
-                size = border.getSz().intValue();
-            }
-        }
-        return size;
-    }
-
-    public int getInsideHBorderSpace() {
-        int space = -1;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideH()) {
-                CTBorder border = ctb.getInsideH();
-                space = border.getSpace().intValue();
-            }
-        }
-        return space;
-    }
-
-    public String getInsideHBorderColor() {
-        String color = null;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideH()) {
-                CTBorder border = ctb.getInsideH();
-                color = border.xgetColor().getStringValue();
-            }
-        }
-        return color;
-    }
-
-    public XWPFBorderType getInsideVBorderType() {
-        XWPFBorderType bt = null;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideV()) {
-                CTBorder border = ctb.getInsideV();
-                bt = stBorderTypeMap.get(border.getVal().intValue());
-            }
-        }
-        return bt;
-    }
-
-    public int getInsideVBorderSize() {
-        int size = -1;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideV()) {
-                CTBorder border = ctb.getInsideV();
-                size = border.getSz().intValue();
-            }
-        }
-        return size;
-    }
-
-    public int getInsideVBorderSpace() {
-        int space = -1;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideV()) {
-                CTBorder border = ctb.getInsideV();
-                space = border.getSpace().intValue();
-            }
-        }
-        return space;
-    }
-
-    public String getInsideVBorderColor() {
-        String color = null;
-
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblBorders()) {
-            CTTblBorders ctb = tblPr.getTblBorders();
-            if (ctb.isSetInsideV()) {
-                CTBorder border = ctb.getInsideV();
-                color = border.xgetColor().getStringValue();
-            }
-        }
-        return color;
-    }
-
-    public int getRowBandSize() {
-        int size = 0;
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblStyleRowBandSize()) {
-            CTDecimalNumber rowSize = tblPr.getTblStyleRowBandSize();
-            size = rowSize.getVal().intValue();
-        }
-        return size;
-    }
-
-    public void setRowBandSize(int size) {
-        CTTblPr tblPr = getTrPr();
-        CTDecimalNumber rowSize = tblPr.isSetTblStyleRowBandSize() ? tblPr.getTblStyleRowBandSize() : tblPr.addNewTblStyleRowBandSize();
-        rowSize.setVal(BigInteger.valueOf(size));
-    }
-
-    public int getColBandSize() {
-        int size = 0;
-        CTTblPr tblPr = getTrPr();
-        if (tblPr.isSetTblStyleColBandSize()) {
-            CTDecimalNumber colSize = tblPr.getTblStyleColBandSize();
-            size = colSize.getVal().intValue();
-        }
-        return size;
-    }
-
-    public void setColBandSize(int size) {
-        CTTblPr tblPr = getTrPr();
-        CTDecimalNumber colSize = tblPr.isSetTblStyleColBandSize() ? tblPr.getTblStyleColBandSize() : tblPr.addNewTblStyleColBandSize();
-        colSize.setVal(BigInteger.valueOf(size));
-    }
-
-    public void setInsideHBorder(XWPFBorderType type, int size, int space, String rgbColor) {
-        CTTblPr tblPr = getTrPr();
-        CTTblBorders ctb = tblPr.isSetTblBorders() ? tblPr.getTblBorders() : tblPr.addNewTblBorders();
-        CTBorder b = ctb.isSetInsideH() ? ctb.getInsideH() : ctb.addNewInsideH();
-        b.setVal(xwpfBorderTypeMap.get(type));
-        b.setSz(BigInteger.valueOf(size));
-        b.setSpace(BigInteger.valueOf(space));
-        b.setColor(rgbColor);
-    }
-
-    public void setInsideVBorder(XWPFBorderType type, int size, int space, String rgbColor) {
-        CTTblPr tblPr = getTrPr();
-        CTTblBorders ctb = tblPr.isSetTblBorders() ? tblPr.getTblBorders() : tblPr.addNewTblBorders();
-        CTBorder b = ctb.isSetInsideV() ? ctb.getInsideV() : ctb.addNewInsideV();
-        b.setVal(xwpfBorderTypeMap.get(type));
-        b.setSz(BigInteger.valueOf(size));
-        b.setSpace(BigInteger.valueOf(space));
-        b.setColor(rgbColor);
-    }
-
-    public int getCellMarginTop() {
-        int margin = 0;
-        CTTblPr tblPr = getTrPr();
-        CTTblCellMar tcm = tblPr.getTblCellMar();
-        if (tcm != null) {
-            CTTblWidth tw = tcm.getTop();
-            if (tw != null) {
-                margin = tw.getW().intValue();
-            }
-        }
-        return margin;
-    }
-
-    public int getCellMarginLeft() {
-        int margin = 0;
-        CTTblPr tblPr = getTrPr();
-        CTTblCellMar tcm = tblPr.getTblCellMar();
-        if (tcm != null) {
-            CTTblWidth tw = tcm.getLeft();
-            if (tw != null) {
-                margin = tw.getW().intValue();
-            }
-        }
-        return margin;
-    }
-
-    public int getCellMarginBottom() {
-        int margin = 0;
-        CTTblPr tblPr = getTrPr();
-        CTTblCellMar tcm = tblPr.getTblCellMar();
-        if (tcm != null) {
-            CTTblWidth tw = tcm.getBottom();
-            if (tw != null) {
-                margin = tw.getW().intValue();
-            }
-        }
-        return margin;
-    }
-
-    public int getCellMarginRight() {
-        int margin = 0;
-        CTTblPr tblPr = getTrPr();
-        CTTblCellMar tcm = tblPr.getTblCellMar();
-        if (tcm != null) {
-            CTTblWidth tw = tcm.getRight();
-            if (tw != null) {
-                margin = tw.getW().intValue();
-            }
-        }
-        return margin;
-    }
-
-    public void setCellMargins(int top, int left, int bottom, int right) {
-        CTTblPr tblPr = getTrPr();
-        CTTblCellMar tcm = tblPr.isSetTblCellMar() ? tblPr.getTblCellMar() : tblPr.addNewTblCellMar();
-
-        CTTblWidth tw = tcm.isSetLeft() ? tcm.getLeft() : tcm.addNewLeft();
-        tw.setType(STTblWidth.DXA);
-        tw.setW(BigInteger.valueOf(left));
-
-        tw = tcm.isSetTop() ? tcm.getTop() : tcm.addNewTop();
-        tw.setType(STTblWidth.DXA);
-        tw.setW(BigInteger.valueOf(top));
-
-        tw = tcm.isSetBottom() ? tcm.getBottom() : tcm.addNewBottom();
-        tw.setType(STTblWidth.DXA);
-        tw.setW(BigInteger.valueOf(bottom));
-
-        tw = tcm.isSetRight() ? tcm.getRight() : tcm.addNewRight();
-        tw.setType(STTblWidth.DXA);
-        tw.setW(BigInteger.valueOf(right));
-    }
-
-    /**
-     * add a new Row to the table
-     *
-     * @param row the row which should be added
-     */
-    public void addRow(XWPFTableRow row) {
-        ctTbl.addNewTr();
-        ctTbl.setTrArray(getNumberOfRows() - 1, row.getCtRow());
-        tableRows.add(row);
-    }
-
-    /**
-     * add a new Row to the table
-     * at position pos
-     *
-     * @param row the row which should be added
-     */
-    public boolean addRow(XWPFTableRow row, int pos) {
-        if (pos >= 0 && pos <= tableRows.size()) {
-            ctTbl.insertNewTr(pos);
-            ctTbl.setTrArray(pos, row.getCtRow());
-            tableRows.add(pos, row);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * inserts a new tablerow
-     *
-     * @param pos
-     * @return the inserted row
-     */
-    public XWPFTableRow insertNewTableRow(int pos) {
-        if (pos >= 0 && pos <= tableRows.size()) {
-            CTRow row = ctTbl.insertNewTr(pos);
-            XWPFTableRow tableRow = new XWPFTableRow(row, this);
-            tableRows.add(pos, tableRow);
-            return tableRow;
-        }
-        return null;
-    }
-
-    /**
-     * Remove a row at position pos from the table
-     *
-     * @param pos position the Row in the Table
-     */
-    public boolean removeRow(int pos) throws IndexOutOfBoundsException {
-        if (pos >= 0 && pos < tableRows.size()) {
-            if (ctTbl.sizeOfTrArray() > 0) {
-                ctTbl.removeTr(pos);
-            }
-            tableRows.remove(pos);
-            return true;
-        }
-        return false;
-    }
-
-    public List<XWPFTableRow> getRows() {
-        return tableRows;
-    }
-
-    /**
-     * returns the type of the BodyElement Table
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBodyElement#getElementType()
-     */
-    public BodyElementType getElementType() {
-        return BodyElementType.TABLE;
-    }
-
-    public IBody getBody() {
-        return part;
-    }
-
-    /**
-     * returns the part of the bodyElement
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPart()
-     */
-    public POIXMLDocumentPart getPart() {
-        if (part != null) {
-            return part.getPart();
-        }
-        return null;
-    }
-
-    /**
-     * returns the partType of the bodyPart which owns the bodyElement
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
-     */
-    public BodyType getPartType() {
-        return part.getPartType();
-    }
-
-    /**
-     * returns the XWPFRow which belongs to the CTRow row
-     * if this row is not existing in the table null will be returned
-     */
-    public XWPFTableRow getRow(CTRow row) {
-        for (int i = 0; i < getRows().size(); i++) {
-            if (getRows().get(i).getCtRow() == row) return getRow(i);
-        }
-        return null;
-    }
-
-    // Create a map from this XWPF-level enum to the STBorder.Enum values
-    public static enum XWPFBorderType {
-        NIL, NONE, SINGLE, THICK, DOUBLE, DOTTED, DASHED, DOT_DASH
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
deleted file mode 100644
index f070b09..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.util.Internal;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtRun;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShd;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVerticalJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STShd;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc;
-
-/**
- * Represents a Cell within a {@link XWPFTable}. The
- * Cell is the thing that holds the actual content (paragraphs etc)
- */
-public class XWPFTableCell implements IBody, ICell {
-    private static EnumMap<XWPFVertAlign, STVerticalJc.Enum> alignMap;
-    // Create a map from the STVerticalJc.Enum values to the XWPF-level enums
-    private static HashMap<Integer, XWPFVertAlign> stVertAlignTypeMap;
-
-    static {
-        // populate enum maps
-        alignMap = new EnumMap<XWPFVertAlign, STVerticalJc.Enum>(XWPFVertAlign.class);
-        alignMap.put(XWPFVertAlign.TOP, STVerticalJc.Enum.forInt(STVerticalJc.INT_TOP));
-        alignMap.put(XWPFVertAlign.CENTER, STVerticalJc.Enum.forInt(STVerticalJc.INT_CENTER));
-        alignMap.put(XWPFVertAlign.BOTH, STVerticalJc.Enum.forInt(STVerticalJc.INT_BOTH));
-        alignMap.put(XWPFVertAlign.BOTTOM, STVerticalJc.Enum.forInt(STVerticalJc.INT_BOTTOM));
-
-        stVertAlignTypeMap = new HashMap<Integer, XWPFVertAlign>();
-        stVertAlignTypeMap.put(STVerticalJc.INT_TOP, XWPFVertAlign.TOP);
-        stVertAlignTypeMap.put(STVerticalJc.INT_CENTER, XWPFVertAlign.CENTER);
-        stVertAlignTypeMap.put(STVerticalJc.INT_BOTH, XWPFVertAlign.BOTH);
-        stVertAlignTypeMap.put(STVerticalJc.INT_BOTTOM, XWPFVertAlign.BOTTOM);
-
-    }
-
-    private final CTTc ctTc;
-    protected List<XWPFParagraph> paragraphs = null;
-    protected List<XWPFTable> tables = null;
-    protected List<IBodyElement> bodyElements = null;
-
-    protected IBody part;
-    private XWPFTableRow tableRow = null;
-
-    /**
-     * If a table cell does not include at least one block-level element, then this document shall be considered corrupt
-     */
-    public XWPFTableCell(CTTc cell, XWPFTableRow tableRow, IBody part) {
-        this.ctTc = cell;
-        this.part = part;
-        this.tableRow = tableRow;
-        // NB: If a table cell does not include at least one block-level element, then this document shall be considered corrupt.
-        if (cell.sizeOfPArray() < 1)
-            cell.addNewP();
-        bodyElements = new ArrayList<IBodyElement>();
-        paragraphs = new ArrayList<XWPFParagraph>();
-        tables = new ArrayList<XWPFTable>();
-
-        XmlCursor cursor = ctTc.newCursor();
-        cursor.selectPath("./*");
-        while (cursor.toNextSelection()) {
-            XmlObject o = cursor.getObject();
-            if (o instanceof CTP) {
-                XWPFParagraph p = new XWPFParagraph((CTP) o, this);
-                paragraphs.add(p);
-                bodyElements.add(p);
-            }
-            if (o instanceof CTTbl) {
-                XWPFTable t = new XWPFTable((CTTbl) o, this);
-                tables.add(t);
-                bodyElements.add(t);
-            }
-            if (o instanceof CTSdtBlock) {
-                XWPFSDT c = new XWPFSDT((CTSdtBlock) o, this);
-                bodyElements.add(c);
-            }
-            if (o instanceof CTSdtRun) {
-                XWPFSDT c = new XWPFSDT((CTSdtRun) o, this);
-                System.out.println(c.getContent().getText());
-                bodyElements.add(c);
-            }
-        }
-        cursor.dispose();
-    }
-
-    @Internal
-    public CTTc getCTTc() {
-        return ctTc;
-    }
-
-    /**
-     * returns an Iterator with paragraphs and tables
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getBodyElements()
-     */
-    public List<IBodyElement> getBodyElements() {
-        return Collections.unmodifiableList(bodyElements);
-    }
-
-    public void setParagraph(XWPFParagraph p) {
-        if (ctTc.sizeOfPArray() == 0) {
-            ctTc.addNewP();
-        }
-        ctTc.setPArray(0, p.getCTP());
-    }
-
-    /**
-     * returns a list of paragraphs
-     */
-    public List<XWPFParagraph> getParagraphs() {
-        return paragraphs;
-    }
-
-    /**
-     * Add a Paragraph to this Table Cell
-     *
-     * @return The paragraph which was added
-     */
-    public XWPFParagraph addParagraph() {
-        XWPFParagraph p = new XWPFParagraph(ctTc.addNewP(), this);
-        addParagraph(p);
-        return p;
-    }
-
-    /**
-     * add a Paragraph to this TableCell
-     *
-     * @param p the paragaph which has to be added
-     */
-    public void addParagraph(XWPFParagraph p) {
-        paragraphs.add(p);
-    }
-
-    /**
-     * removes a paragraph of this tablecell
-     *
-     * @param pos The position in the list of paragraphs, 0-based
-     */
-    public void removeParagraph(int pos) {
-        paragraphs.remove(pos);
-        ctTc.removeP(pos);
-    }
-
-    /**
-     * if there is a corresponding {@link XWPFParagraph} of the parameter ctTable in the paragraphList of this table
-     * the method will return this paragraph
-     * if there is no corresponding {@link XWPFParagraph} the method will return null
-     *
-     * @param p is instance of CTP and is searching for an XWPFParagraph
-     * @return null if there is no XWPFParagraph with an corresponding CTPparagraph in the paragraphList of this table
-     * XWPFParagraph with the correspondig CTP p
-     */
-    public XWPFParagraph getParagraph(CTP p) {
-        for (XWPFParagraph paragraph : paragraphs) {
-            if (p.equals(paragraph.getCTP())) {
-                return paragraph;
-            }
-        }
-        return null;
-    }
-
-    public XWPFTableRow getTableRow() {
-        return tableRow;
-    }
-
-    /**
-     * Get cell color. Note that this method only returns the "fill" value.
-     *
-     * @return RGB string of cell color
-     */
-    public String getColor() {
-        String color = null;
-        CTTcPr tcpr = ctTc.getTcPr();
-        if (tcpr != null) {
-            CTShd ctshd = tcpr.getShd();
-            if (ctshd != null) {
-                color = ctshd.xgetFill().getStringValue();
-            }
-        }
-        return color;
-    }
-
-    /**
-     * Set cell color. This sets some associated values; for finer control
-     * you may want to access these elements individually.
-     *
-     * @param rgbStr - the desired cell color, in the hex form "RRGGBB".
-     */
-    public void setColor(String rgbStr) {
-        CTTcPr tcpr = ctTc.isSetTcPr() ? ctTc.getTcPr() : ctTc.addNewTcPr();
-        CTShd ctshd = tcpr.isSetShd() ? tcpr.getShd() : tcpr.addNewShd();
-        ctshd.setColor("auto");
-        ctshd.setVal(STShd.CLEAR);
-        ctshd.setFill(rgbStr);
-    }
-
-    /**
-     * Get the vertical alignment of the cell.
-     *
-     * @return the cell alignment enum value or <code>null</code>
-     * if no vertical alignment is set.
-     */
-    public XWPFVertAlign getVerticalAlignment() {
-        XWPFVertAlign vAlign = null;
-        CTTcPr tcpr = ctTc.getTcPr();
-        if (tcpr != null) {
-            CTVerticalJc va = tcpr.getVAlign();
-            if(va != null) {
-                vAlign = stVertAlignTypeMap.get(va.getVal().intValue());
-            } else {
-                vAlign = XWPFVertAlign.TOP;
-            }
-            if (va != null && va.getVal() != null) {
-                vAlign = stVertAlignTypeMap.get(va.getVal().intValue());
-            }
-        }
-        return vAlign;
-    }
-
-    /**
-     * Set the vertical alignment of the cell.
-     *
-     * @param vAlign - the desired alignment enum value
-     */
-    public void setVerticalAlignment(XWPFVertAlign vAlign) {
-        CTTcPr tcpr = ctTc.isSetTcPr() ? ctTc.getTcPr() : ctTc.addNewTcPr();
-        CTVerticalJc va = tcpr.addNewVAlign();
-        va.setVal(alignMap.get(vAlign));
-    }
-
-    /**
-     * add a new paragraph at position of the cursor
-     *
-     * @param cursor The XmlCursor structure created with XmlBeans
-     * @return the inserted paragraph
-     */
-    public XWPFParagraph insertNewParagraph(final XmlCursor cursor) {
-        if (!isCursorInTableCell(cursor)) {
-            return null;
-        }
-
-        String uri = CTP.type.getName().getNamespaceURI();
-        String localPart = "p";
-        cursor.beginElement(localPart, uri);
-        cursor.toParent();
-        CTP p = (CTP) cursor.getObject();
-        XWPFParagraph newP = new XWPFParagraph(p, this);
-        XmlObject o = null;
-        while (!(o instanceof CTP) && (cursor.toPrevSibling())) {
-            o = cursor.getObject();
-        }
-        if ((!(o instanceof CTP)) || (CTP) o == p) {
-            paragraphs.add(0, newP);
-        } else {
-            int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1;
-            paragraphs.add(pos, newP);
-        }
-        int i = 0;
-        XmlCursor p2 = p.newCursor();
-        cursor.toCursor(p2);
-        p2.dispose();
-        while (cursor.toPrevSibling()) {
-            o = cursor.getObject();
-            if (o instanceof CTP || o instanceof CTTbl)
-                i++;
-        }
-        bodyElements.add(i, newP);
-        p2 = p.newCursor();
-        cursor.toCursor(p2);
-        p2.dispose();
-        cursor.toEndToken();
-        return newP;
-    }
-
-    public XWPFTable insertNewTbl(final XmlCursor cursor) {
-        if (isCursorInTableCell(cursor)) {
-            String uri = CTTbl.type.getName().getNamespaceURI();
-            String localPart = "tbl";
-            cursor.beginElement(localPart, uri);
-            cursor.toParent();
-            CTTbl t = (CTTbl) cursor.getObject();
-            XWPFTable newT = new XWPFTable(t, this);
-            cursor.removeXmlContents();
-            XmlObject o = null;
-            while (!(o instanceof CTTbl) && (cursor.toPrevSibling())) {
-                o = cursor.getObject();
-            }
-            if (!(o instanceof CTTbl)) {
-                tables.add(0, newT);
-            } else {
-                int pos = tables.indexOf(getTable((CTTbl) o)) + 1;
-                tables.add(pos, newT);
-            }
-            int i = 0;
-            XmlCursor cursor2 = t.newCursor();
-            while (cursor2.toPrevSibling()) {
-                o = cursor2.getObject();
-                if (o instanceof CTP || o instanceof CTTbl)
-                    i++;
-            }
-            cursor2.dispose();
-            bodyElements.add(i, newT);
-            cursor2 = t.newCursor();
-            cursor.toCursor(cursor2);
-            cursor.toEndToken();
-            cursor2.dispose();
-            return newT;
-        }
-        return null;
-    }
-
-    /**
-     * verifies that cursor is on the right position
-     */
-    private boolean isCursorInTableCell(XmlCursor cursor) {
-        XmlCursor verify = cursor.newCursor();
-        verify.toParent();
-        boolean result = (verify.getObject() == this.ctTc);
-        verify.dispose();
-        return result;
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getParagraphArray(int)
-     */
-    public XWPFParagraph getParagraphArray(int pos) {
-        if (pos >= 0 && pos < paragraphs.size()) {
-            return paragraphs.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * get the to which the TableCell belongs
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPart()
-     */
-    public POIXMLDocumentPart getPart() {
-        return tableRow.getTable().getPart();
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
-     */
-    public BodyType getPartType() {
-        return BodyType.TABLECELL;
-    }
-
-    /**
-     * get a table by its CTTbl-Object
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTable(org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl)
-     */
-    public XWPFTable getTable(CTTbl ctTable) {
-        for (int i = 0; i < tables.size(); i++) {
-            if (getTables().get(i).getCTTbl() == ctTable) return getTables().get(i);
-        }
-        return null;
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTableArray(int)
-     */
-    public XWPFTable getTableArray(int pos) {
-        if(pos >= 0 && pos < tables.size()) {
-            return tables.get(pos);
-        }
-        return null;
-    }
-
-    /**
-     * @see org.apache.poi.xwpf.usermodel.IBody#getTables()
-     */
-    public List<XWPFTable> getTables() {
-        return Collections.unmodifiableList(tables);
-    }
-
-    /**
-     * inserts an existing XWPFTable to the arrays bodyElements and tables
-     *
-     * @see org.apache.poi.xwpf.usermodel.IBody#insertTable(int, org.apache.poi.xwpf.usermodel.XWPFTable)
-     */
-    public void insertTable(int pos, XWPFTable table) {
-        bodyElements.add(pos, table);
-        int i = 0;
-        for (CTTbl tbl : ctTc.getTblArray()) {
-            if (tbl == table.getCTTbl()) {
-                break;
-            }
-            i++;
-        }
-        tables.add(i, table);
-    }
-
-    public String getText() {
-        StringBuilder text = new StringBuilder();
-        for (XWPFParagraph p : paragraphs) {
-            text.append(p.getText());
-        }
-        return text.toString();
-    }
-
-    public void setText(String text) {
-        CTP ctP = (ctTc.sizeOfPArray() == 0) ? ctTc.addNewP() : ctTc.getPArray(0);
-        XWPFParagraph par = new XWPFParagraph(ctP, this);
-        par.createRun().setText(text);
-    }
-
-    /**
-     * extracts all text recursively through embedded tables and embedded SDTs
-     */
-    public String getTextRecursively() {
-
-        StringBuffer text = new StringBuffer();
-        for (int i = 0; i < bodyElements.size(); i++) {
-            boolean isLast = (i == bodyElements.size() - 1);
-            appendBodyElementText(text, bodyElements.get(i), isLast);
-        }
-
-        return text.toString();
-    }
-
-    private void appendBodyElementText(StringBuffer text, IBodyElement e, boolean isLast) {
-        if (e instanceof XWPFParagraph) {
-            text.append(((XWPFParagraph) e).getText());
-            if (!isLast) {
-                text.append('\t');
-            }
-        } else if (e instanceof XWPFTable) {
-            XWPFTable eTable = (XWPFTable) e;
-            for (XWPFTableRow row : eTable.getRows()) {
-                for (XWPFTableCell cell : row.getTableCells()) {
-                    List<IBodyElement> localBodyElements = cell.getBodyElements();
-                    for (int i = 0; i < localBodyElements.size(); i++) {
-                        boolean localIsLast = (i == localBodyElements.size() - 1);
-                        appendBodyElementText(text, localBodyElements.get(i), localIsLast);
-                    }
-                }
-            }
-
-            if (!isLast) {
-                text.append('\n');
-            }
-        } else if (e instanceof XWPFSDT) {
-            text.append(((XWPFSDT) e).getContent().getText());
-            if (!isLast) {
-                text.append('\t');
-            }
-        }
-    }
-
-    /**
-     * get the TableCell which belongs to the TableCell
-     */
-    public XWPFTableCell getTableCell(CTTc cell) {
-        XmlCursor cursor = cell.newCursor();
-        cursor.toParent();
-        XmlObject o = cursor.getObject();
-        if (!(o instanceof CTRow)) {
-            return null;
-        }
-        CTRow row = (CTRow) o;
-        cursor.toParent();
-        o = cursor.getObject();
-        cursor.dispose();
-        if (!(o instanceof CTTbl)) {
-            return null;
-        }
-        CTTbl tbl = (CTTbl) o;
-        XWPFTable table = getTable(tbl);
-        if (table == null) {
-            return null;
-        }
-        XWPFTableRow tr = table.getRow(row);
-        if (tr == null) {
-            return null;
-        }
-        return tr.getTableCell(cell);
-    }
-
-    public XWPFDocument getXWPFDocument() {
-        return part.getXWPFDocument();
-    }
-
-    // Create a map from this XWPF-level enum to the STVerticalJc.Enum values
-    public enum XWPFVertAlign {
-        TOP, CENTER, BOTH, BOTTOM
-    }
-}
diff --git a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java b/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
deleted file mode 100644
index 3f530df..0000000
--- a/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.xwpf.model.WMLHelper;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHeight;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtCell;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTrPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
-
-
-/**
- * A row within an {@link XWPFTable}. Rows mostly just have
- * sizings and stylings, the interesting content lives inside
- * the child {@link XWPFTableCell}s
- */
-public class XWPFTableRow {
-    private CTRow ctRow;
-    private XWPFTable table;
-    private List<XWPFTableCell> tableCells;
-
-    public XWPFTableRow(CTRow row, XWPFTable table) {
-        this.table = table;
-        this.ctRow = row;
-        getTableCells();
-    }
-
-    @Internal
-    public CTRow getCtRow() {
-        return ctRow;
-    }
-
-    /**
-     * create a new XWPFTableCell and add it to the tableCell-list of this tableRow
-     *
-     * @return the newly created XWPFTableCell
-     */
-    public XWPFTableCell createCell() {
-        XWPFTableCell tableCell = new XWPFTableCell(ctRow.addNewTc(), this, table.getBody());
-        tableCells.add(tableCell);
-        return tableCell;
-    }
-
-    public XWPFTableCell getCell(int pos) {
-        if (pos >= 0 && pos < ctRow.sizeOfTcArray()) {
-            return getTableCells().get(pos);
-        }
-        return null;
-    }
-
-    public void removeCell(int pos) {
-        if (pos >= 0 && pos < ctRow.sizeOfTcArray()) {
-            tableCells.remove(pos);
-        }
-    }
-
-    /**
-     * adds a new TableCell at the end of this tableRow
-     */
-    public XWPFTableCell addNewTableCell() {
-        CTTc cell = ctRow.addNewTc();
-        XWPFTableCell tableCell = new XWPFTableCell(cell, this, table.getBody());
-        tableCells.add(tableCell);
-        return tableCell;
-    }
-
-    /**
-     * This element specifies the height of the current table row within the
-     * current table. This height shall be used to determine the resulting
-     * height of the table row, which may be absolute or relative (depending on
-     * its attribute values). If omitted, then the table row shall automatically
-     * resize its height to the height required by its contents (the equivalent
-     * of an hRule value of auto).
-     *
-     * @return height
-     */
-    public int getHeight() {
-        CTTrPr properties = getTrPr();
-        return properties.sizeOfTrHeightArray() == 0 ? 0 : properties.getTrHeightArray(0).getVal().intValue();
-    }
-
-    /**
-     * This element specifies the height of the current table row within the
-     * current table. This height shall be used to determine the resulting
-     * height of the table row, which may be absolute or relative (depending on
-     * its attribute values). If omitted, then the table row shall automatically
-     * resize its height to the height required by its contents (the equivalent
-     * of an hRule value of auto).
-     *
-     * @param height
-     */
-    public void setHeight(int height) {
-        CTTrPr properties = getTrPr();
-        CTHeight h = properties.sizeOfTrHeightArray() == 0 ? properties.addNewTrHeight() : properties.getTrHeightArray(0);
-        h.setVal(new BigInteger("" + height));
-    }
-
-    private CTTrPr getTrPr() {
-        return (ctRow.isSetTrPr()) ? ctRow.getTrPr() : ctRow.addNewTrPr();
-    }
-
-    public XWPFTable getTable() {
-        return table;
-    }
-
-    /**
-     * create and return a list of all XWPFTableCell
-     * who belongs to this row
-     *
-     * @return a list of {@link XWPFTableCell}
-     */
-    public List<ICell> getTableICells() {
-
-        List<ICell> cells = new ArrayList<ICell>();
-        //Can't use ctRow.getTcList because that only gets table cells
-        //Can't use ctRow.getSdtList because that only gets sdts that are at cell level
-        XmlCursor cursor = ctRow.newCursor();
-        cursor.selectPath("./*");
-        while (cursor.toNextSelection()) {
-            XmlObject o = cursor.getObject();
-            if (o instanceof CTTc) {
-                cells.add(new XWPFTableCell((CTTc) o, this, table.getBody()));
-            } else if (o instanceof CTSdtCell) {
-                cells.add(new XWPFSDTCell((CTSdtCell) o, this, table.getBody()));
-            }
-        }
-        cursor.dispose();
-        return cells;
-    }
-
-    /**
-     * create and return a list of all XWPFTableCell
-     * who belongs to this row
-     *
-     * @return a list of {@link XWPFTableCell}
-     */
-    public List<XWPFTableCell> getTableCells() {
-        if (tableCells == null) {
-            List<XWPFTableCell> cells = new ArrayList<XWPFTableCell>();
-            for (CTTc tableCell : ctRow.getTcArray()) {
-                cells.add(new XWPFTableCell(tableCell, this, table.getBody()));
-            }
-            //TODO: it is possible to have an SDT that contains a cell in within a row
-            //need to modify this code so that it pulls out SDT wrappers around cells, too.
-
-            this.tableCells = cells;
-        }
-        return tableCells;
-    }
-
-    /**
-     * returns the XWPFTableCell which belongs to the CTTC cell
-     * if there is no XWPFTableCell which belongs to the parameter CTTc cell null will be returned
-     */
-    public XWPFTableCell getTableCell(CTTc cell) {
-        for (int i = 0; i < tableCells.size(); i++) {
-            if (tableCells.get(i).getCTTc() == cell)
-                return tableCells.get(i);
-        }
-        return null;
-    }
-
-    /**
-     * Return true if the "can't split row" value is true. The logic for this
-     * attribute is a little unusual: a TRUE value means DON'T allow rows to
-     * split, FALSE means allow rows to split.
-     *
-     * @return true if rows can't be split, false otherwise.
-     */
-    public boolean isCantSplitRow() {
-        boolean isCant = false;
-        if (ctRow.isSetTrPr()) {
-            CTTrPr trpr = getTrPr();
-            if (trpr.sizeOfCantSplitArray() > 0) {
-                CTOnOff onoff = trpr.getCantSplitArray(0);
-                isCant = (onoff.isSetVal() ? WMLHelper.STOnOffToBoolean(onoff.getVal()) : true);
-            }
-        }
-        return isCant;
-    }
-
-    /**
-     * Controls whether to allow this table row to split across pages.
-     * The logic for this attribute is a little unusual: a true value means
-     * DON'T allow rows to split, false means allow rows to split.
-     *
-     * @param split - if true, don't allow row to be split. If false, allow
-     *              row to be split.
-     */
-    public void setCantSplitRow(boolean split) {
-        CTTrPr trpr = getTrPr();
-        CTOnOff onoff = (trpr.sizeOfCantSplitArray() > 0 ? trpr.getCantSplitArray(0) : trpr.addNewCantSplit());
-        onoff.setVal(WMLHelper.BooleanToSTOnOff(split));
-    }
-
-    /**
-     * Return true if a table's header row should be repeated at the top of a
-     * table split across pages. NOTE - Word will not repeat a table row unless
-     * all preceding rows of the table are also repeated. This function returns
-     * false if the row will not be repeated even if the repeat tag is present
-     * for this row. 
-     *
-     * @return true if table's header row should be repeated at the top of each
-     * page of table, false otherwise.
-     */
-    public boolean isRepeatHeader() {
-        boolean repeat = false;
-        for (XWPFTableRow row : table.getRows()) {
-            repeat = row.getRepeat();
-            if (row == this || !repeat) {
-                break;
-            }
-        }
-        return repeat;
-    }
-    
-    private boolean getRepeat() {
-        boolean repeat = false;
-        if (ctRow.isSetTrPr()) {
-            CTTrPr trpr = getTrPr();
-            if (trpr.sizeOfTblHeaderArray() > 0) {
-                CTOnOff rpt = trpr.getTblHeaderArray(0);
-                repeat = (rpt.isSetVal() ? WMLHelper.STOnOffToBoolean(rpt.getVal()) : true);
-            }
-        }
-        return repeat;
-    }
-
-    /**
-     * This attribute controls whether to repeat a table's header row at the top
-     * of a table split across pages. NOTE - for a row to be repeated, all preceding
-     * rows in the table must also be repeated.
-     *
-     * @param repeat - if TRUE, repeat header row at the top of each page of table;
-     *               if FALSE, don't repeat header row.
-     */
-    public void setRepeatHeader(boolean repeat) {
-        CTTrPr trpr = getTrPr();
-        CTOnOff onoff = (trpr.sizeOfTblHeaderArray() > 0 ? trpr.getTblHeaderArray(0) : trpr.addNewTblHeader());
-        onoff.setVal(WMLHelper.BooleanToSTOnOff(repeat));
-    }
-}
diff --git a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd b/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
deleted file mode 100644
index 7423c85..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xs:schema xmlns="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:e="http://schemas.microsoft.com/office/2006/encryption" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://schemas.microsoft.com/office/2006/encryption" schemaLocation="encryptionInfo.xsd"/>
-	<xs:simpleType name="ST_PasswordKeyEncryptorUri">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="CT_CertificateKeyEncryptor">
-		<xs:attribute name="encryptedKeyValue" type="xs:base64Binary" use="required">
-			<xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted form of the intermediate key, which is encrypted with the public key contained within the X509Certificate attribute.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="X509Certificate" type="xs:base64Binary" use="required">
-			<xs:annotation><xs:documentation>A base64-encoded value that specifies a DER-encoded X.509 certificate (1) used to encrypt the intermediate key. The certificate (1) MUST contain only the public portion of the public-private key pair.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="certVerifier" type="xs:base64Binary" use="required">
-			<xs:annotation><xs:documentation>A base64-encoded value that specifies the HMAC of the binary data obtained by base64-decoding the X509Certificate attribute. The hashing algorithm used to derive the HMAC MUST be the hashing algorithm specified for the Encryption.keyData element. The secret key used to derive the HMAC MUST be the intermediate key. If the intermediate key is reset, any CertificateKeyEncryptor elements are also reset to contain the new intermediate key, except that the certVerifier attribute MUST match the value calculated using the current intermediate key, to verify that the CertificateKeyEncryptor element actually encrypted the current intermediate key. If a CertificateKeyEncryptor element does not have a correct certVerifier attribute, it MUST be discarded.</xs:documentation></xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="encryptedKey" type="CT_CertificateKeyEncryptor"/>
-</xs:schema>
diff --git a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig b/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
deleted file mode 100644
index 73a27fa..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate">
-
-<xb:qname name="c:encryptedKey" javaname="EncryptedCertificateKey"/>
-  
-</xb:config>
\ No newline at end of file
diff --git a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd b/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd
deleted file mode 100644
index 5b08560..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xs:schema xmlns="http://schemas.microsoft.com/office/2006/encryption" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/encryption" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://schemas.microsoft.com/office/2006/keyEncryptor/password" schemaLocation="encryptionPassword.xsd"/>
-	<xs:import namespace="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" schemaLocation="encryptionCertificate.xsd"/>
-	<xs:simpleType name="ST_SaltSize">
-		<xs:annotation>
-			<xs:documentation>An unsigned integer that specifies the number of bytes used by a salt. It MUST be at least 1 and no greater than 65,536.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:unsignedInt">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="65536"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ST_BlockSize">
-		<xs:annotation>
-			<xs:documentation>An unsigned integer that specifies the number of bytes used to encrypt one block of data. It MUST be at least 2, no greater than 4096, and a multiple of 2.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:unsignedInt">
-			<xs:minInclusive value="2"/>
-			<xs:maxInclusive value="4096"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ST_KeyBits">
-		<xs:annotation>
-			<xs:documentation>An unsigned integer that specifies the number of bits used by an encryption algorithm. It MUST be at least 8 and a multiple of 8.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:unsignedInt">
-			<xs:minInclusive value="8"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ST_HashSize">
-		<xs:annotation>
-			<xs:documentation>An unsigned integer that specifies the number of bytes used by a hash value. It MUST be at least 1, no greater than 65,536, and the same number of bytes as the hash algorithm emits.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:unsignedInt">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="65536"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ST_SpinCount">
-		<xs:annotation>
-			<xs:documentation>An unsigned integer that specifies the number of times to iterate on a hash of a password. It MUST NOT be greater than 10,000,000.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:unsignedInt">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="10000000"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ST_CipherAlgorithm">
-		<xs:annotation>
-			<xs:appinfo>modified for poi - list is restricted to given list in [ms-offcrypto]</xs:appinfo>
-			<xs:documentation>A string that specifies the cipher algorithm. Values that are not defined MAY be used, and a compliant implementation is not required to support all defined values. Any algorithm that can be resolved by name by the underlying operating system can be used for hashing or encryption. Only block algorithms are supported for encryption. AES-128 is the default encryption algorithm, and SHA-1 is the default hashing algorithm if no other algorithms have been configured.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="AES">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the AES algorithm.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="RC2">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the algorithm as specified in [RFC2268] (http://tools.ietf.org/html/rfc2268). The use of RC2 is not recommended. If RC2 is used with a key length of less than 128 bits, documents could interoperate incorrectly across different versions of Windows.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="RC4">
-				<xs:annotation>
-					<xs:documentation>MUST NOT be used.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="DES">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the DES algorithm. The use of DES is not recommended. If DES is used, the key length specified in the KeyBits element is required to be set to 64 for 56-bit encryption, and the key decrypted from encryptedKeyValue of KeyEncryptor is required to include the DES parity bits.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="DESX">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the algorithm as specified in [DRAFT-DESX] (http://tools.ietf.org/html/draft-ietf-ipsec-ciph-desx-00). The use of DESX is not recommended. If DESX is used, documents could interoperate incorrectly across different versions of Windows.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="3DES">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the algorithm as specified in [RFC1851] (http://tools.ietf.org/html/rfc1851). If 3DES or 3DES_112 is used, the key length specified in the KeyBits element is required to be set to 192 for 168-bit encryption and 128 for 112-bit encryption, and the key decrypted from encryptedKeyValue of KeyEncryptor is required to include the DES parity bits.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="3DES_112">
-				<xs:annotation>
-					<xs:documentation>see 3DES</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ST_CipherChaining">
-		<xs:annotation>
-			<xs:documentation>A string that specifies the chaining mode used by CipherAlgorithm. For more details about chaining modes, see [BCMO800-38A] (http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf).</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="ChainingModeCBC">
-				<xs:annotation>
-					<xs:documentation>block chaining (CBC)</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="ChainingModeCFB">
-				<xs:annotation>
-					<xs:documentation>Cipher feedback chaining (CFB), with an 8-bit window</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ST_HashAlgorithm">
-		<xs:annotation>
-			<xs:appinfo>modified for poi - list is restricted to given list in [ms-offcrypto]</xs:appinfo>
-			<xs:documentation>A string specifying a hashing algorithm. Values that are not defined MAY be used, and a compliant implementation is not required to support all defined values.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="SHA1">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the algorithm as specified in [RFC4634] (http://tools.ietf.org/html/rfc4634).</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="SHA256">
-				<xs:annotation>
-					<xs:documentation>see SHA1</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="SHA384">
-				<xs:annotation>
-					<xs:documentation>see SHA1</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="SHA512">
-				<xs:annotation>
-					<xs:documentation>see SHA1</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="MD5">
-				<xs:annotation>
-					<xs:documentation>MUST conform to MD5.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="MD4">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the algorithm as specified in [RFC1320] (http://tools.ietf.org/html/rfc1320).</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="MD2">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the algorithm as specified in [RFC1319] (http://tools.ietf.org/html/rfc1319).</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="RIPEMD-128">
-				<xs:annotation>
-					<xs:documentation>MUST conform to the hash functions specified in [ISO/IEC 10118]. (https://en.wikipedia.org/wiki/RIPEMD)</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="RIPEMD-160">
-				<xs:annotation>
-					<xs:documentation>see RIPEMD-128 (https://en.wikipedia.org/wiki/RIPEMD)</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="WHIRLPOOL">
-				<xs:annotation>
-					<xs:documentation>see RIPEMD-128 (https://en.wikipedia.org/wiki/ISO/IEC_10118-3)</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="CT_KeyData">
-		<xs:annotation>
-			<xs:documentation>A complex type that specifies the encryption used within this element. The saltValue attribute is a base64-encoded binary value that is randomly generated. The number of bytes required to decode the saltValue attribute MUST be equal to the value of the saltSize attribute.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="saltSize" type="ST_SaltSize" use="required"/>
-		<xs:attribute name="blockSize" type="ST_BlockSize" use="required"/>
-		<xs:attribute name="keyBits" type="ST_KeyBits" use="required"/>
-		<xs:attribute name="hashSize" type="ST_HashSize" use="required"/>
-		<xs:attribute name="cipherAlgorithm" type="ST_CipherAlgorithm" use="required"/>
-		<xs:attribute name="cipherChaining" type="ST_CipherChaining" use="required"/>
-		<xs:attribute name="hashAlgorithm" type="ST_HashAlgorithm" use="required"/>
-		<xs:attribute name="saltValue" type="xs:base64Binary" use="required"/>
-	</xs:complexType>
-	<xs:complexType name="CT_DataIntegrity">
-		<xs:annotation>
-			<xs:documentation>A complex type that specifies data used to verify whether the encrypted data passes an integrity check. It MUST be generated using the method specified in section 2.3.4.14 (http://msdn.microsoft.com/en-us/library/dd924068(v=office.12).aspx).</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="encryptedHmacKey" type="xs:base64Binary" use="required">
-			<xs:annotation>
-				<xs:documentation>A base64-encoded value that specifies an encrypted key used in calculating the encryptedHmacValue.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="encryptedHmacValue" type="xs:base64Binary" use="required">
-			<xs:annotation>
-				<xs:documentation>A base64-encoded value that specifies an HMAC derived from encryptedHmacKey and the encrypted data.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="CT_KeyEncryptor">
-		<xs:annotation>
-			<xs:appinfo>modified for POI</xs:appinfo>
-			<xs:documentation>A complex type that specifies the parameters used to encrypt an intermediate key, which is used to perform the final encryption of the document. To ensure extensibility, arbitrary elements can be defined to encrypt the intermediate key. The intermediate key MUST be the same for all KeyEncryptor elements.</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:element ref="p:encryptedKey"/>
-			<xs:element ref="c:encryptedKey"/>
-		</xs:choice>
-		<xs:attribute name="uri">
-			<xs:annotation>
-				<xs:appinfo>modified for POI</xs:appinfo>
-			</xs:annotation>
-			<xs:simpleType>
-				<xs:restriction base="xs:token">
-					<xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/password"/>
-					<xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="CT_KeyEncryptors">
-		<xs:annotation>
-			<xs:documentation>A sequence of KeyEncryptor elements. Exactly one KeyEncryptors element MUST be present, and the KeyEncryptors element MUST contain at least one KeyEncryptor.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="keyEncryptor" type="CT_KeyEncryptor" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="CT_Encryption">
-		<xs:sequence>
-			<xs:element name="keyData" type="CT_KeyData"/>
-			<xs:element name="dataIntegrity" type="CT_DataIntegrity">
-				<xs:annotation>
-					<xs:appinfo>modified for POI</xs:appinfo>
-					<xs:documentation>All ECMA-376 documents [ECMA-376] encrypted by Microsoft Office using agile encryption will have a DataIntegrity element present. The schema allows for a DataIntegrity element to not be present because the encryption schema can be used by applications that do not create ECMA-376 documents [ECMA-376].</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="keyEncryptors" type="CT_KeyEncryptors">
-				<xs:annotation>
-					<xs:documentation>The KeyEncryptor element, which MUST be used when encrypting password-protected agile encryption documents, is either a PasswordKeyEncryptor or a CertificateKeyEncryptor. Exactly one PasswordKeyEncryptor MUST be present. Zero or more CertificateKeyEncryptor elements are contained within the KeyEncryptors element.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="encryption" type="CT_Encryption"/>
-</xs:schema>
diff --git a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig b/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
deleted file mode 100644
index c9474a0..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password">
-
-<xb:qname name="c:encryptedKey" javaname="EncryptedCertificateKey"/>
-<xb:qname name="p:encryptedKey" javaname="EncryptedPasswordKey"/>
-  
-</xb:config>
\ No newline at end of file
diff --git a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd b/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd
deleted file mode 100644
index 79ae888..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xs:schema xmlns="http://schemas.microsoft.com/office/2006/keyEncryptor/password" xmlns:e="http://schemas.microsoft.com/office/2006/encryption" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/keyEncryptor/password" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://schemas.microsoft.com/office/2006/encryption" schemaLocation="encryptionInfo.xsd"/>
-	<xs:simpleType name="ST_PasswordKeyEncryptorUri">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/password"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="CT_PasswordKeyEncryptor">
-		<xs:attribute name="saltSize" type="e:ST_SaltSize" use="required">
-			<xs:annotation><xs:documentation>A SaltSize that specifies the size of the salt for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="blockSize" type="e:ST_BlockSize" use="required">
-			<xs:annotation><xs:documentation>A BlockSize that specifies the block size for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="keyBits" type="e:ST_KeyBits" use="required">
-			<xs:annotation><xs:documentation>A KeyBits that specifies the number of bits for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="hashSize" type="e:ST_HashSize" use="required">
-			<xs:annotation><xs:documentation>A HashSize that specifies the size of the binary form of the hash for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="cipherAlgorithm" type="e:ST_CipherAlgorithm" use="required">
-			<xs:annotation><xs:documentation>A CipherAlgorithm that specifies the cipher algorithm for a PasswordKeyEncryptor. The cipher algorithm specified MUST be the same as the cipher algorithm specified for the Encryption.keyData element.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="cipherChaining" type="e:ST_CipherChaining" use="required">
-			<xs:annotation><xs:documentation>A CipherChaining that specifies the cipher chaining mode for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="hashAlgorithm" type="e:ST_HashAlgorithm" use="required">
-			<xs:annotation><xs:documentation>A HashAlgorithm that specifies the hashing algorithm for a PasswordKeyEncryptor. The hashing algorithm specified MUST be the same as the hashing algorithm specified for the Encryption.keyData element.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="saltValue" type="xs:base64Binary" use="required">
-			<xs:annotation><xs:documentation>A base64-encoded binary byte array that specifies the salt value for a PasswordKeyEncryptor. The number of bytes required by the decoded form of this element MUST be saltSize.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="spinCount" type="e:ST_SpinCount" use="required">
-			<xs:annotation><xs:documentation>A SpinCount that specifies the spin count for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="encryptedVerifierHashInput" type="xs:base64Binary" use="required">
-			<xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted verifier hash input for a PasswordKeyEncryptor used in password verification.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="encryptedVerifierHashValue" type="xs:base64Binary" use="required">
-			<xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted verifier hash value for a PasswordKeyEncryptor used in password verification.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="encryptedKeyValue" type="xs:base64Binary" use="required">
-			<xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted form of the intermediate key.</xs:documentation></xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="encryptedKey" type="CT_PasswordKeyEncryptor"/>
-</xs:schema>
diff --git a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig b/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
deleted file mode 100644
index 3a2bb2c..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password">
-
-<xb:qname name="p:encryptedKey" javaname="EncryptedPasswordKey"/>
-  
-</xb:config>
\ No newline at end of file
diff --git a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd b/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd
deleted file mode 100644
index f7019f1..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsd:schema targetNamespace="http://schemas.microsoft.com/office/2006/digsig" elementFormDefault="qualified" xmlns="http://schemas.microsoft.com/office/2006/digsig" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<xsd:simpleType name="ST_PositiveInteger">
-		<xsd:restriction base="xsd:int">
-			<xsd:minExclusive value="0"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="ST_SignatureComments">
-		<xsd:restriction base="xsd:string">
-			<xsd:maxLength value="255"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="ST_SignatureProviderUrl">
-		<xsd:restriction base="xsd:string">
-			<xsd:maxLength value="2083"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="ST_SignatureText">
-		<xsd:restriction base="xsd:string">
-			<xsd:maxLength value="100"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="ST_SignatureType">
-		<xsd:restriction base="xsd:int">
-			<xsd:enumeration value="1"/>
-			<xsd:enumeration value="2"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="ST_Version">
-		<xsd:restriction base="xsd:string">
-			<xsd:maxLength value="64"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="ST_UniqueIdentifierWithBraces">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="\{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}\}|"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:group name="EG_RequiredChildren">
-		<xsd:sequence>
-			<xsd:element name="SetupID" type="ST_UniqueIdentifierWithBraces"/>
-			<xsd:element name="SignatureText" type="ST_SignatureText"/>
-			<xsd:element name="SignatureImage" type="xsd:base64Binary"/>
-			<xsd:element name="SignatureComments" type="ST_SignatureComments"/>
-			<xsd:element name="WindowsVersion" type="ST_Version"/>
-			<xsd:element name="OfficeVersion" type="ST_Version"/>
-			<xsd:element name="ApplicationVersion" type="ST_Version"/>
-			<xsd:element name="Monitors" type="ST_PositiveInteger"/>
-			<xsd:element name="HorizontalResolution" type="ST_PositiveInteger"/>
-			<xsd:element name="VerticalResolution" type="ST_PositiveInteger"/>
-			<xsd:element name="ColorDepth" type="ST_PositiveInteger"/>
-			<xsd:element name="SignatureProviderId" type="ST_UniqueIdentifierWithBraces"/>
-			<xsd:element name="SignatureProviderUrl" type="ST_SignatureProviderUrl"/>
-			<xsd:element name="SignatureProviderDetails" type="xsd:int"/>
-			<xsd:element name="SignatureType" type="ST_SignatureType"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:group name="EG_OptionalChildren">
-		<xsd:sequence>
-			<xsd:element name="DelegateSuggestedSigner" type="xsd:string"/>
-			<xsd:element name="DelegateSuggestedSigner2" type="xsd:string"/>
-			<xsd:element name="DelegateSuggestedSignerEmail" type="xsd:string"/>
-			<xsd:element name="ManifestHashAlgorithm" type="xsd:anyURI" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:group name="EG_OptionalChildrenV2">
-		<xsd:sequence>
-			<xsd:element name="Address1" type="xsd:string"/>
-			<xsd:element name="Address2" type="xsd:string"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="CT_SignatureInfoV1">
-		<xsd:sequence>
-			<xsd:group ref="EG_RequiredChildren"/>
-			<xsd:group ref="EG_OptionalChildren" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="CT_SignatureInfoV2">
-		<xsd:sequence>
-			<xsd:group ref="EG_OptionalChildrenV2" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="SignatureInfoV1" type="CT_SignatureInfoV1"/>
-	<xsd:element name="SignatureInfoV2" type="CT_SignatureInfoV2"/>
-</xsd:schema>
\ No newline at end of file
diff --git a/trunk/src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig b/trunk/src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
deleted file mode 100644
index 3121e45..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
-
-  <xb:namespace uri="urn:schemas-microsoft-com:office:office">
-    <xb:package>com.microsoft.schemas.office.office</xb:package>
-  </xb:namespace>
-
-  <xb:namespace uri="urn:schemas-microsoft-com:office:excel">
-    <xb:package>com.microsoft.schemas.office.excel</xb:package>
-  </xb:namespace>
-
-  <xb:namespace uri="urn:schemas-microsoft-com:office:word">
-    <xb:package>com.microsoft.schemas.office.word</xb:package>
-  </xb:namespace>
-
-  <xb:namespace uri="urn:schemas-microsoft-com:office:powerpoint">
-    <xb:package>com.microsoft.schemas.office.powerpoint</xb:package>
-  </xb:namespace>
-
-  <xb:namespace uri="urn:schemas-microsoft-com:vml">
-    <xb:package>com.microsoft.schemas.vml</xb:package>
-  </xb:namespace>
-
-</xb:config>
\ No newline at end of file
diff --git a/trunk/src/ooxml/resources/org/apache/poi/xdgf/visio.xsd b/trunk/src/ooxml/resources/org/apache/poi/xdgf/visio.xsd
deleted file mode 100644
index eec0b68..0000000
--- a/trunk/src/ooxml/resources/org/apache/poi/xdgf/visio.xsd
+++ /dev/null
@@ -1,829 +0,0 @@
-<!--
-  XML for Visio Schema
-  http://schemas.microsoft.com/office/visio/2011/1/core
-  Copyright (C) 2000-2002 Microsoft Corporation. All rights reserved.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://schemas.microsoft.com/office/visio/2012/main"
-            xmlns="http://schemas.microsoft.com/office/visio/2012/main"
-            xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-            elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"/>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      Permission to copy, display and distribute the contents of this document (the
-      "Specification"), in any medium for any purpose without fee or royalty is
-      hereby granted, provided that you include the following notice on ALL copies of
-      the Specification, or portions thereof, that you make:
-      Copyright (c) Microsoft Corporation.  All rights reserved.  Permission to copy,
-      display and distribute this document is available at:
-      http://msdn.microsoft.com/library/en-us/odcXMLRef/html/odcXMLRefLegalNotice.asp?frame=true.
-      No right to create modifications or derivatives of this Specification is
-      granted herein. There is a separate patent license available to parties
-      interested in implementing software programs that can read and write files that
-      conform to the Specification.  This patent license is available at this
-      location:  http://www.microsoft.com/mscorp/ip/format/xmlpatentlicense.asp.
-      THE SPECIFICATION IS PROVIDED "AS IS" AND MICROSOFT MAKES NO REPRESENTATIONS OR
-      WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE;
-      THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT
-      THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
-      COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. MICROSOFT WILL NOT BE LIABLE FOR ANY
-      DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF
-      OR RELATING TO ANY USE OR DISTRIBUTION OF THE SPECIFICATION.
-      The name and trademarks of Microsoft may NOT be used in any manner, including
-      advertising or publicity pertaining to the Specification or its contents
-      without specific, written prior permission. Title to copyright in the
-      Specification will at all times remain with Microsoft. No other rights are
-      granted by implication, estoppel or otherwise.
-    </xsd:documentation>
-  </xsd:annotation>
-  
-  <!--
-    Root-level elements for different parts
-  -->
-  <!--document.xml-->
-  <xsd:element name="VisioDocument" type="VisioDocument_Type" />
-  <!--masters/masters.xml-->
-  <xsd:element name="Masters" type="Masters_Type" />
-  <!--masters/master#.xml-->
-  <xsd:element name="MasterContents" type="PageContents_Type" />
-  <!--pages/pages.xml-->
-  <xsd:element name="Pages" type="Pages_Type" />
-  <!--pages/page#.xml-->
-  <xsd:element name="PageContents" type="PageContents_Type" />
-  <!--data/connections.xml-->
-  <xsd:element name="DataConnections" type="DataConnections_Type" />
-  <!--data/recordsets.xml-->
-  <xsd:element name="DataRecordSets" type="DataRecordSets_Type" />
-  <!--comments.xml-->
-  <xsd:element name="Comments" type="Comments_Type" />
-  <!--extensions.xml-->
-  <xsd:element name="Extensions" type="Extensions_Type" />
-  <!--
-    Complex types
-  -->
-  <xsd:complexType name="VisioDocument_Type">
-    <xsd:sequence>
-      <xsd:element name="DocumentSettings" type="DocumentSettings_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="Colors" type="Colors_Type" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="FaceNames" type="FaceNames_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="StyleSheets" type="StyleSheets_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="DocumentSheet" type="DocumentSheet_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="EventList" type="EventList_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="HeaderFooter" type="HeaderFooter_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="PublishSettings" type="PublishSettings_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other"
-               processContents="lax" />
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax" />
-  </xsd:complexType>
-
-  <!--Sheet abstract base class-->
-  <xsd:complexType name="Sheet_Type" abstract="true">
-    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="Cell" type="Cell_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="Trigger" type="Trigger_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="Section" type="Section_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-
-      <!--Sheets can hold and roundtrip arbitrary, unknown sub-XML-->
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other"
-               processContents="lax" />
-    </xsd:sequence>
-    
-    <!--Style sheet IDs for inheritance-->
-    <xsd:attribute name="LineStyle" type="xsd:unsignedInt" />
-    <xsd:attribute name="FillStyle" type="xsd:unsignedInt" />
-    <xsd:attribute name="TextStyle" type="xsd:unsignedInt" />
-
-    <!--Sheets can hold and roundtrip arbitrary, unknown attributes-->
-    <xsd:anyAttribute namespace="##other" processContents="lax" />
-  </xsd:complexType>
-
-  <!--Section base types-->
-  <xsd:complexType name="Section_Type">
-    <xsd:sequence>
-      <!--Cells only show up directly under the Geometry section-->
-      <xsd:element name="Cell" type="Cell_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="Trigger" type="Trigger_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-
-      <!--All Sections have child rows-->
-      <xsd:element name="Row" type="Row_Type" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    
-    <xsd:attribute name="N" type="xsd:string" use="required" />
-    <xsd:attribute name="Del" type="xsd:boolean" />
-    
-    <!--Only Geometry sections have indexes as there can be several in a Sheet-->
-    <xsd:attribute name="IX" type="xsd:unsignedInt" />
-  </xsd:complexType>
-
-  <!--Row base types-->
-  <xsd:complexType name="Row_Type">
-    <xsd:sequence>
-      <xsd:element name="Cell" type="Cell_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="Trigger" type="Trigger_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-    
-    <!--The name attributes are only used on named rows-->
-    <xsd:attribute name="N" type="xsd:string" />
-    <xsd:attribute name="LocalName" type="xsd:string" />
-    
-    <!--The index attribute is only used on indexed rows-->
-    <xsd:attribute name="IX" type="xsd:unsignedInt" />
-    
-    <!--The type attribute is only used on Rows in the Geometry section-->
-    <xsd:attribute name="T" type="xsd:string" />
-    
-    <!--Any row can be locally deleted-->
-    <xsd:attribute name="Del" type="xsd:boolean" />
-  </xsd:complexType>
-
-  <!--Cell base type-->
-  <xsd:complexType name="Cell_Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="RefBy" type="RefBy_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="N" type="xsd:string" use="required" />
-    <xsd:attribute name="U" type="xsd:string" />
-    <xsd:attribute name="E" type="xsd:string" />
-    <xsd:attribute name="F" type="xsd:string" />
-    <xsd:attribute name="V" type="xsd:string" />
-  </xsd:complexType>
-
-  <!--Trigger base type-->
-  <xsd:complexType name="Trigger_Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="RefBy" type="RefBy_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="N" type="xsd:string" use="required" />
-  </xsd:complexType>
-
-  <xsd:complexType name="DocumentSheet_Type">
-    <xsd:complexContent>
-      <xsd:extension base="Sheet_Type">
-        <xsd:attribute name="Name" type="xsd:string" />
-        <xsd:attribute name="NameU" type="xsd:string" />
-        <xsd:attribute name="IsCustomName" type="xsd:boolean" />
-        <xsd:attribute name="IsCustomNameU" type="xsd:boolean" />
-        <xsd:attribute name="UniqueID" type="xsd:string" />
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  
-  <xsd:complexType name="StyleSheet_Type">
-    <xsd:complexContent>
-      <xsd:extension base="Sheet_Type">
-        <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-        <xsd:attribute name="Name" type="xsd:string" />
-        <xsd:attribute name="NameU" type="xsd:string" />
-        <xsd:attribute name="IsCustomName" type="xsd:boolean" />
-        <xsd:attribute name="IsCustomNameU" type="xsd:boolean" />
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  
-  <xsd:complexType name="PageSheet_Type">
-    <xsd:complexContent>
-      <xsd:extension base="Sheet_Type">
-        <xsd:attribute name="UniqueID" type="xsd:string" />
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  
-  <xsd:complexType name="ShapeSheet_Type">
-    <xsd:complexContent>
-      <xsd:extension base="Sheet_Type">
-        <xsd:sequence>
-          <!--Shape Text-->
-          <xsd:element name="Text" type="Text_Type" minOccurs="0" maxOccurs="1" />
-          
-          <!--Legacy data fields-->
-          <xsd:element name="Data1" type="Data_Type" minOccurs="0" maxOccurs="1" />
-          <xsd:element name="Data2" type="Data_Type" minOccurs="0" maxOccurs="1" />
-          <xsd:element name="Data3" type="Data_Type" minOccurs="0" maxOccurs="1" />
-          
-          <!--Foreign object data for images, OLE, ActiveX, etc.-->
-          <xsd:element name="ForeignData" type="ForeignData_Type" minOccurs="0"
-                       maxOccurs="1" />
-          
-          <!--Sub-shapes if this is a group-->
-          <xsd:element name="Shapes" type="Shapes_Type" minOccurs="0"
-                       maxOccurs="1" />
-        </xsd:sequence>
-        
-        <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-        <xsd:attribute name="OriginalID" type="xsd:unsignedInt" />
-        <xsd:attribute name="Del" type="xsd:boolean" />
-        <xsd:attribute name="MasterShape" type="xsd:unsignedInt" />
-        <xsd:attribute name="UniqueID" type="xsd:string" />
-        <xsd:attribute name="Name" type="xsd:string" />
-        <xsd:attribute name="NameU" type="xsd:string" />
-        <xsd:attribute name="IsCustomName" type="xsd:boolean" />
-        <xsd:attribute name="IsCustomNameU" type="xsd:boolean" />
-        <xsd:attribute name="Master" type="xsd:unsignedInt" />
-        <xsd:attribute name="Type" type="xsd:token" />
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="Text_Type" mixed="true">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="cp" type="cp_Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="pp" type="pp_Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="tp" type="tp_Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="fld" type="fld_Type" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:choice>
-  </xsd:complexType>
-
-  <!--Text fields-->
-  <xsd:complexType name="cp_Type">
-    <xsd:attribute name="IX" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="pp_Type">
-    <xsd:attribute name="IX" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="tp_Type">
-    <xsd:attribute name="IX" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="fld_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="IX" type="xsd:unsignedInt" use="required" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="Data_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="ForeignData_Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="Rel" type="Rel_Type" minOccurs="1" maxOccurs="1" />
-    </xsd:sequence>
-    <xsd:attribute name="ForeignType" type="xsd:token" use="required" />
-    <xsd:attribute name="ObjectType" type="xsd:unsignedInt" />
-    <xsd:attribute name="ShowAsIcon" type="xsd:boolean" />
-    <xsd:attribute name="ObjectWidth" type="xsd:double" />
-    <xsd:attribute name="ObjectHeight" type="xsd:double" />
-    <xsd:attribute name="MappingMode" type="xsd:unsignedShort" />
-    <xsd:attribute name="ExtentX" type="xsd:double" />
-    <xsd:attribute name="ExtentY" type="xsd:double" />
-    <xsd:attribute name="CompressionType" type="xsd:token" />
-    <xsd:attribute name="CompressionLevel" type="xsd:double" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="DocumentSettings_Type">
-    <xsd:all>
-      <xsd:element name="GlueSettings" type="GlueSettings_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="SnapSettings" type="SnapSettings_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="SnapExtensions" type="SnapExtensions_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="SnapAngles" type="SnapAngles_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="DynamicGridEnabled" type="DynamicGridEnabled_Type"
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element name="ProtectStyles" type="ProtectStyles_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="ProtectShapes" type="ProtectShapes_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="ProtectMasters" type="ProtectMasters_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="ProtectBkgnds" type="ProtectBkgnds_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="CustomMenusFile" type="CustomMenusFile_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="CustomToolbarsFile" type="CustomToolbarsFile_Type"
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element name="AttachedToolbars" type="AttachedToolbars_Type" minOccurs="0"
-                   maxOccurs="1" />
-    </xsd:all>
-    <xsd:attribute name="TopPage" type="xsd:unsignedInt" />
-    <xsd:attribute name="DefaultTextStyle" type="xsd:unsignedInt" />
-    <xsd:attribute name="DefaultLineStyle" type="xsd:unsignedInt" />
-    <xsd:attribute name="DefaultFillStyle" type="xsd:unsignedInt" />
-    <xsd:attribute name="DefaultGuideStyle" type="xsd:unsignedInt" />
-  </xsd:complexType>
-  <xsd:complexType name="GlueSettings_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:int" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="SnapSettings_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:int" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="SnapExtensions_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:int" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="SnapAngles_Type">
-    <xsd:sequence>
-      <xsd:element name="SnapAngle" type="SnapAngle_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="SnapAngle_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:double" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="DynamicGridEnabled_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="ProtectStyles_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="ProtectShapes_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="ProtectMasters_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="ProtectBkgnds_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="CustomMenusFile_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="CustomToolbarsFile_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="AttachedToolbars_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:base64Binary" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="Colors_Type">
-    <xsd:sequence>
-      <xsd:element name="ColorEntry" type="ColorEntry_Type" minOccurs="1"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ColorEntry_Type">
-    <xsd:attribute name="IX" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="RGB" type="xsd:string" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="FaceNames_Type">
-    <xsd:sequence>
-      <xsd:element name="FaceName" type="FaceName_Type" minOccurs="1"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="FaceName_Type">
-    <xsd:attribute name="NameU" type="xsd:string" use="required" />
-    <xsd:attribute name="UnicodeRanges" type="xsd:string" />
-    <xsd:attribute name="CharSets" type="xsd:string" />
-    <xsd:attribute name="Panos" type="xsd:string" />
-    <xsd:attribute name="Panose" type="xsd:string" />
-    <xsd:attribute name="Flags" type="xsd:unsignedInt" />
-  </xsd:complexType>
-  <xsd:complexType name="StyleSheets_Type">
-    <xsd:sequence>
-      <xsd:element name="StyleSheet" type="StyleSheet_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Masters_Type">
-    <xsd:sequence>
-      <xsd:element name="Master" type="Master_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="MasterShortcut" type="MasterShortcut_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Master_Type">
-    <xsd:all>
-      <xsd:element name="PageSheet" type="PageSheet_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="Rel" type="Rel_Type" minOccurs="1" maxOccurs="1" />
-      <xsd:element name="Icon" type="Icon_Type" minOccurs="0" maxOccurs="1" />
-    </xsd:all>
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="BaseID" type="xsd:string" />
-    <xsd:attribute name="UniqueID" type="xsd:string" />
-    <xsd:attribute name="MatchByName" type="xsd:boolean" />
-    <xsd:attribute name="Name" type="xsd:string" />
-    <xsd:attribute name="NameU" type="xsd:string" />
-    <xsd:attribute name="IsCustomName" type="xsd:boolean" />
-    <xsd:attribute name="IsCustomNameU" type="xsd:boolean" />
-    <xsd:attribute name="IconSize" type="xsd:unsignedShort" />
-    <xsd:attribute name="PatternFlags" type="xsd:unsignedShort" />
-    <xsd:attribute name="Prompt" type="xsd:string" />
-    <xsd:attribute name="Hidden" type="xsd:boolean" />
-    <xsd:attribute name="IconUpdate" type="xsd:boolean" />
-    <xsd:attribute name="AlignName" type="xsd:unsignedShort" />
-    <xsd:attribute name="MasterType" type="xsd:unsignedShort" />
-  </xsd:complexType>
-  <xsd:complexType name="Icon_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:base64Binary" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="MasterShortcut_Type">
-    <xsd:all>
-      <xsd:element name="Icon" type="Icon_Type" minOccurs="0" maxOccurs="1" />
-    </xsd:all>
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="Name" type="xsd:string" />
-    <xsd:attribute name="NameU" type="xsd:string" />
-    <xsd:attribute name="IsCustomName" type="xsd:boolean" />
-    <xsd:attribute name="IsCustomNameU" type="xsd:boolean" />
-    <xsd:attribute name="IconSize" type="xsd:unsignedShort" />
-    <xsd:attribute name="PatternFlags" type="xsd:unsignedShort" />
-    <xsd:attribute name="Prompt" type="xsd:string" />
-    <xsd:attribute name="ShortcutURL" type="xsd:string" />
-    <xsd:attribute name="ShortcutHelp" type="xsd:string" />
-    <xsd:attribute name="AlignName" type="xsd:unsignedShort" />
-    <xsd:attribute name="MasterType" type="xsd:unsignedShort" />
-  </xsd:complexType>
-  <xsd:complexType name="PageContents_Type">
-    <xsd:sequence>
-      <xsd:element name="Shapes" type="Shapes_Type" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="Connects" type="Connects_Type" minOccurs="0"
-                   maxOccurs="1" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Shapes_Type">
-    <xsd:sequence>
-      <xsd:element name="Shape" type="ShapeSheet_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Connects_Type">
-    <xsd:sequence>
-      <xsd:element name="Connect" type="Connect_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Connect_Type">
-    <xsd:attribute name="FromSheet" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="FromCell" type="xsd:string" />
-    <xsd:attribute name="FromPart" type="xsd:int" />
-    <xsd:attribute name="ToSheet" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="ToCell" type="xsd:string" />
-    <xsd:attribute name="ToPart" type="xsd:int" />
-  </xsd:complexType>
-  <xsd:complexType name="Pages_Type">
-    <xsd:sequence>
-      <xsd:element name="Page" type="Page_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Page_Type">
-    <xsd:all>
-      <xsd:element name="PageSheet" type="PageSheet_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="Rel" type="Rel_Type" minOccurs="1" maxOccurs="1" />
-    </xsd:all>
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="Name" type="xsd:string" />
-    <xsd:attribute name="NameU" type="xsd:string" />
-    <xsd:attribute name="IsCustomName" type="xsd:boolean" />
-    <xsd:attribute name="IsCustomNameU" type="xsd:boolean" />
-    <xsd:attribute name="Background" type="xsd:boolean" />
-    <xsd:attribute name="BackPage" type="xsd:unsignedInt" />
-    <xsd:attribute name="ViewScale" type="xsd:double" />
-    <xsd:attribute name="ViewCenterX" type="xsd:double" />
-    <xsd:attribute name="ViewCenterY" type="xsd:double" />
-    <xsd:attribute name="ReviewerID" type="xsd:unsignedInt" />
-    <xsd:attribute name="AssociatedPage" type="xsd:unsignedInt" />
-  </xsd:complexType>
-  <xsd:complexType name="EventList_Type">
-    <xsd:sequence>
-      <xsd:element name="EventItem" type="EventItem_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="EventItem_Type">
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="Action" type="xsd:unsignedShort" use="required" />
-    <xsd:attribute name="EventCode" type="xsd:unsignedShort" use="required" />
-    <xsd:attribute name="Enabled" type="xsd:boolean" />
-    <xsd:attribute name="Target" type="xsd:string" use="required" />
-    <xsd:attribute name="TargetArgs" type="xsd:string" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="HeaderFooter_Type">
-    <xsd:all>
-      <xsd:element name="HeaderMargin" type="HeaderMargin_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="FooterMargin" type="FooterMargin_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="HeaderLeft" type="HeaderLeft_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="HeaderCenter" type="HeaderCenter_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="HeaderRight" type="HeaderRight_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="FooterLeft" type="FooterLeft_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="FooterCenter" type="FooterCenter_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="FooterRight" type="FooterRight_Type" minOccurs="0" 
-                   maxOccurs="1" />
-      <xsd:element name="HeaderFooterFont" type="HeaderFooterFont_Type" minOccurs="0"
-                   maxOccurs="1" />
-    </xsd:all>
-    <xsd:attribute name="HeaderFooterColor" type="xsd:string" />
-  </xsd:complexType>
-  <xsd:complexType name="HeaderMargin_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:double">
-        <xsd:attribute name="Unit" type="xsd:string" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="FooterMargin_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:double">
-        <xsd:attribute name="Unit" type="xsd:string" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="HeaderLeft_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="HeaderCenter_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="HeaderRight_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="FooterLeft_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="FooterCenter_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="FooterRight_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="HeaderFooterFont_Type">
-    <xsd:attribute name="Height" type="xsd:int" />
-    <xsd:attribute name="Width" type="xsd:int" />
-    <xsd:attribute name="Escapement" type="xsd:int" />
-    <xsd:attribute name="Orientation" type="xsd:int" />
-    <xsd:attribute name="Weight" type="xsd:int" />
-    <xsd:attribute name="Italic" type="xsd:unsignedByte" />
-    <xsd:attribute name="Underline" type="xsd:unsignedByte" />
-    <xsd:attribute name="StrikeOut" type="xsd:unsignedByte" />
-    <xsd:attribute name="CharSet" type="xsd:unsignedByte" />
-    <xsd:attribute name="OutPrecision" type="xsd:unsignedByte" />
-    <xsd:attribute name="ClipPrecision" type="xsd:unsignedByte" />
-    <xsd:attribute name="Quality" type="xsd:unsignedByte" />
-    <xsd:attribute name="PitchAndFamily" type="xsd:unsignedByte" />
-    <xsd:attribute name="FaceName" type="xsd:string" />
-  </xsd:complexType>
-  <xsd:complexType name="DataConnections_Type">
-    <xsd:sequence>
-      <xsd:element name="DataConnection" type="DataConnection_Type" minOccurs="1"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="NextID" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="DataConnection_Type">
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="FileName" type="xsd:string" use="required" />
-    <xsd:attribute name="ConnectionString" type="xsd:string" />
-    <xsd:attribute name="Command" type="xsd:string" />
-    <xsd:attribute name="FriendlyName" type="xsd:string" />
-    <xsd:attribute name="Timeout" type="xsd:unsignedInt" />
-    <xsd:attribute name="AlwaysUseConnectionFile" type="xsd:boolean" />
-  </xsd:complexType>
-  <xsd:complexType name="DataRecordSets_Type">
-    <xsd:sequence>
-      <xsd:element name="DataRecordSet" type="DataRecordSet_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="NextID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="ActiveRecordsetID" type="xsd:unsignedInt" />
-    <xsd:attribute name="DataWindowOrder" type="xsd:string" />
-  </xsd:complexType>
-  <xsd:complexType name="DataRecordSet_Type">
-    <xsd:sequence>
-      <xsd:element name="Rel" type="Rel_Type" minOccurs="1" maxOccurs="1" />
-      <xsd:element name="DataColumns" type="DataColumns_Type" minOccurs="1"
-                   maxOccurs="1" />
-      <xsd:element name="PrimaryKey" type="PrimaryKey_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="RowMap" type="RowMap_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="RefreshConflict" type="RefreshConflict_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="AutoLinkComparison" type="AutoLinkComparison_Type"
-                   minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="ConnectionID" type="xsd:unsignedInt" />
-    <xsd:attribute name="Command" type="xsd:string" />
-    <xsd:attribute name="Options" type="xsd:unsignedInt" />
-    <xsd:attribute name="TimeRefreshed" type="xsd:dateTime" />
-    <xsd:attribute name="NextRowID" type="xsd:unsignedInt" />
-    <xsd:attribute name="Name" type="xsd:string" />
-    <xsd:attribute name="RowOrder" type="xsd:boolean" />
-    <xsd:attribute name="RefreshOverwriteAll" type="xsd:boolean" />
-    <xsd:attribute name="RefreshNoReconciliationUI" type="xsd:boolean" />
-    <xsd:attribute name="RefreshInterval" type="xsd:unsignedInt" />
-    <xsd:attribute name="ReplaceLinks" type="xsd:unsignedInt" />
-    <xsd:attribute name="Checksum" type="xsd:unsignedInt" />
-  </xsd:complexType>
-  <xsd:complexType name="DataColumns_Type">
-    <xsd:sequence>
-      <xsd:element name="DataColumn" type="DataColumn_Type" minOccurs="1"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="SortColumn" type="xsd:string" />
-    <xsd:attribute name="SortAsc" type="xsd:boolean" />
-  </xsd:complexType>
-  <xsd:complexType name="DataColumn_Type">
-    <xsd:attribute name="ColumnNameID" type="xsd:string" use="required" />
-    <xsd:attribute name="Name" type="xsd:string" use="required" />
-    <xsd:attribute name="Label" type="xsd:string" use="required" />
-    <xsd:attribute name="OrigLabel" type="xsd:string" />
-    <xsd:attribute name="LangID" type="xsd:unsignedInt" />
-    <xsd:attribute name="Calendar" type="xsd:unsignedShort" />
-    <xsd:attribute name="DataType" type="xsd:unsignedShort" />
-    <xsd:attribute name="UnitType" type="xsd:string" />
-    <xsd:attribute name="Currency" type="xsd:unsignedShort" />
-    <xsd:attribute name="Degree" type="xsd:unsignedInt" />
-    <xsd:attribute name="DisplayWidth" type="xsd:unsignedInt" />
-    <xsd:attribute name="DisplayOrder" type="xsd:unsignedInt" />
-    <xsd:attribute name="Mapped" type="xsd:boolean" />
-    <xsd:attribute name="Hyperlink" type="xsd:boolean" />
-  </xsd:complexType>
-  <xsd:complexType name="PrimaryKey_Type">
-    <xsd:sequence>
-      <xsd:element name="RowKeyValue" type="RowKeyValue_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="ColumnNameID" type="xsd:string" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="RowKeyValue_Type">
-    <xsd:attribute name="RowID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="Value" type="xsd:string" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="RowMap_Type">
-    <xsd:attribute name="RowID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="PageID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="ShapeID" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="RefreshConflict_Type">
-    <xsd:attribute name="RowID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="ShapeID" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="PageID" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="AutoLinkComparison_Type">
-    <xsd:attribute name="ColumnName" type="xsd:string" use="required" />
-    <xsd:attribute name="ContextType" type="xsd:unsignedInt" use="required" />
-    <xsd:attribute name="ContextTypeLabel" type="xsd:string" />
-  </xsd:complexType>
-  <xsd:complexType name="PublishSettings_Type">
-    <xsd:sequence>
-      <xsd:element name="PublishedPage" type="PublishedPage_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="RefreshableData" type="RefreshableData_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Comments_Type">
-    <xsd:sequence>
-      <xsd:element name="AuthorList" type="AuthorList_Type" minOccurs="0"
-                   maxOccurs="1" />
-      <xsd:element name="CommentList" type="CommentList_Type" minOccurs="0"
-                   maxOccurs="1" />
-    </xsd:sequence>
-    <xsd:attribute name="ShowCommentTags" type="xsd:boolean" />
-  </xsd:complexType>
-  <xsd:complexType name="AuthorList_Type">
-    <xsd:sequence>
-      <xsd:element name="AuthorEntry" type="AuthorEntry_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="AuthorEntry_Type">
-    <xsd:attribute name="Name" type="xsd:string" />
-    <xsd:attribute name="Initials" type="xsd:string" />
-    <xsd:attribute name="ResolutionID" type="xsd:string" />
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="CommentList_Type">
-    <xsd:sequence>
-      <xsd:element name="CommentEntry" type="CommentEntry_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CommentEntry_Type">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="AuthorID" type="xsd:unsignedInt" use="required" />
-        <xsd:attribute name="PageID" type="xsd:unsignedInt" use="required" />
-        <xsd:attribute name="ShapeID" type="xsd:unsignedInt" />
-        <xsd:attribute name="Date" type="xsd:dateTime" use="required" />
-        <xsd:attribute name="EditDate" type="xsd:dateTime" />
-        <xsd:attribute name="Done" type="xsd:boolean" />
-        <xsd:attribute name="CommentID" type="xsd:unsignedInt" use="required" />
-        <xsd:attribute name="AutoCommentType" type="xsd:unsignedInt" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="PublishedPage_Type">
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="RefreshableData_Type">
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="RefBy_Type">
-    <xsd:attribute name="T" type="xsd:string" use="required" />
-    <xsd:attribute name="ID" type="xsd:unsignedInt" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="Extensions_Type">
-    <xsd:sequence>
-      <xsd:element name="CellDef" type="CellDef_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="FunctionDef" type="FunctionDef_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="SectionDef" type="SectionDef_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CellDef_Type">
-    <xsd:attribute name="N" type="xsd:string" use="required" />
-    <xsd:attribute name="T" type="xsd:token" use="required" />
-    <xsd:attribute name="F" type="xsd:string" />
-    <xsd:attribute name="IX" type="xsd:unsignedByte" />
-    <xsd:attribute name="S" type="xsd:unsignedByte" />
-  </xsd:complexType>
-  <xsd:complexType name="FunctionDef_Type">
-    <xsd:attribute name="N" type="xsd:string" use="required" />
-  </xsd:complexType>
-  <xsd:complexType name="SectionDef_Type">
-    <xsd:sequence>
-      <xsd:element name="CellDef" type="CellDef_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-      <xsd:element name="RowDef" type="RowDef_Type" minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-    <xsd:attribute name="N" type="xsd:string" use="required" />
-    <xsd:attribute name="T" type="xsd:string" />
-    <xsd:attribute name="S" type="xsd:unsignedByte" />
-  </xsd:complexType>
-  <xsd:complexType name="RowDef_Type">
-    <xsd:sequence>
-      <xsd:element name="CellDef" type="CellDef_Type" minOccurs="0"
-                   maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Rel_Type">
-    <xsd:attribute ref="r:id" use="required"/>
-  </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java b/trunk/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java
deleted file mode 100644
index 137f631..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.filesystem.DocumentFactoryHelper;
-
-/**
- * Class to test that HXF correctly detects OOXML
- *  documents
- */
-public class TestDetectAsOOXML extends TestCase
-{
-	public void testOpensProperly() throws Exception
-	{
-        OPCPackage.open(HSSFTestDataSamples.openSampleFileStream("sample.xlsx"));
-	}
-	
-	public void testDetectAsPOIFS() throws Exception {
-		InputStream in;
-		
-		// ooxml file is
-		in = new PushbackInputStream(
-				HSSFTestDataSamples.openSampleFileStream("SampleSS.xlsx"), 10
-		);
-		assertTrue(DocumentFactoryHelper.hasOOXMLHeader(in));
-		in.close();
-		
-		// xls file isn't
-		in = new PushbackInputStream(
-				HSSFTestDataSamples.openSampleFileStream("SampleSS.xls"), 10
-		);
-		assertFalse(DocumentFactoryHelper.hasOOXMLHeader(in));
-		in.close();
-		
-		// text file isn't
-		in = new PushbackInputStream(
-				HSSFTestDataSamples.openSampleFileStream("SampleSS.txt"), 10
-		);
-		assertFalse(DocumentFactoryHelper.hasOOXMLHeader(in));
-		in.close();
-	}
-    
-    public void testFileCorruption() throws Exception {
-	    
-	    // create test InputStream
-	    byte[] testData = { (byte)1, (byte)2, (byte)3 };
-        ByteArrayInputStream testInput = new ByteArrayInputStream(testData);
-        
-        // detect header
-        InputStream in = new PushbackInputStream(testInput, 10);
-        assertFalse(DocumentFactoryHelper.hasOOXMLHeader(in));
-		//noinspection deprecation
-		assertFalse(POIXMLDocument.hasOOXMLHeader(in));
-        
-        // check if InputStream is still intact
-        byte[] test = new byte[3];
-        assertEquals(3, in.read(test));
-        assertTrue(Arrays.equals(testData, test));
-        assertEquals(-1, in.read());
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/TestEmbeded.java b/trunk/src/ooxml/testcases/org/apache/poi/TestEmbeded.java
deleted file mode 100644
index fb16b8a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/TestEmbeded.java
+++ /dev/null
@@ -1,70 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi;
-
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test that we handle embeded bits in
- *  OOXML files properly
- */
-public class TestEmbeded extends TestCase
-{
-	public void testExcel() throws Exception {
-		POIXMLDocument doc = new XSSFWorkbook(
-                POIDataSamples.getSpreadSheetInstance().openResourceAsStream("ExcelWithAttachments.xlsm")
-        );
-		test(doc, 4);
-	}
-
-	public void testWord() throws Exception {
-		POIXMLDocument doc = new XWPFDocument(
-                POIDataSamples.getDocumentInstance().openResourceAsStream("WordWithAttachments.docx")
-        );
-		test(doc, 5);
-	}
-
-	public void testPowerPoint() throws Exception {
-		POIXMLDocument doc = new XSLFSlideShow(OPCPackage.open(
-                POIDataSamples.getSlideShowInstance().openResourceAsStream("PPTWithAttachments.pptm"))
-        );
-		test(doc, 4);
-	}
-	
-	private void test(POIXMLDocument doc, int expectedCount) throws Exception {
-		assertNotNull(doc.getAllEmbedds());
-		assertEquals(expectedCount, doc.getAllEmbedds().size());
-
-		for(int i=0; i<doc.getAllEmbedds().size(); i++) {
-			PackagePart pp = doc.getAllEmbedds().get(i);
-			assertNotNull(pp);
-			
-			byte[] b = IOUtils.toByteArray(pp.getInputStream());
-			assertTrue(b.length > 0);
-		}
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java b/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
deleted file mode 100644
index be63e2b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.util.NullOutputStream;
-import org.apache.poi.util.PackageHelper;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFShape;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-import org.junit.Test;
-
-/**
- * Test recursive read and write of OPC packages
- */
-public final class TestPOIXMLDocument {
-
-    private static class OPCParser extends POIXMLDocument {
-
-        public OPCParser(OPCPackage pkg) {
-            super(pkg);
-        }
-        
-        public OPCParser(OPCPackage pkg, String coreDocumentRel) {
-            super(pkg, coreDocumentRel);
-        }
-
-        @Override
-        public List<PackagePart> getAllEmbedds() {
-            throw new RuntimeException("not supported");
-        }
-
-        public void parse(POIXMLFactory factory) throws IOException{
-            load(factory);
-        }
-    }
-
-    private static final class TestFactory extends POIXMLFactory {
-
-        public TestFactory() {
-            //
-        }
-
-        @Override
-        protected POIXMLRelation getDescriptor(String relationshipType) {
-            return null;
-        }
-
-        /**
-         * @since POI 3.14-Beta1
-         */
-        @Override
-        protected POIXMLDocumentPart createDocumentPart
-            (Class<? extends POIXMLDocumentPart> cls, Class<?>[] classes, Object[] values)
-        throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
-            return null;
-        }
-    }
-
-    /**
-     * Recursively traverse a OOXML document and assert that same logical parts have the same physical instances
-     */
-    private static void traverse(POIXMLDocumentPart part, HashMap<String,POIXMLDocumentPart> context) throws IOException{
-        assertEquals(part.getPackageRelationship().getTargetURI().toString(), part.getPackagePart().getPartName().getName());
-        
-        context.put(part.getPackagePart().getPartName().getName(), part);
-        for(POIXMLDocumentPart p : part.getRelations()){
-            assertNotNull(p.toString());
-            
-            String uri = p.getPackagePart().getPartName().getURI().toString();
-            assertEquals(uri, p.getPackageRelationship().getTargetURI().toString());
-            if (!context.containsKey(uri)) {
-                traverse(p, context);
-            } else {
-                POIXMLDocumentPart prev = context.get(uri);
-                assertSame("Duplicate POIXMLDocumentPart instance for targetURI=" + uri, prev, p);
-            }
-        }
-    }
-
-    public void assertReadWrite(OPCPackage pkg1) throws Exception {
-
-        OPCParser doc = new OPCParser(pkg1);
-        doc.parse(new TestFactory());
-
-        HashMap<String,POIXMLDocumentPart> context = new HashMap<String,POIXMLDocumentPart>();
-        traverse(doc, context);
-        context.clear();
-
-        File tmp = TempFile.createTempFile("poi-ooxml", ".tmp");
-        FileOutputStream out = new FileOutputStream(tmp);
-        doc.write(out);
-        out.close();
-        
-        // Should not be able to write to an output stream that has been closed
-        try {
-            doc.write(out);
-            fail("Should not be able to write to an output stream that has been closed.");
-        } catch (final OpenXML4JRuntimeException e) {
-            // FIXME: A better exception class (IOException?) and message should be raised
-            // indicating that the document could not be written because the output stream is closed.
-            // see {@link org.apache.poi.openxml4j.opc.ZipPackage#saveImpl(java.io.OutputStream)}
-            if (e.getMessage().matches("Fail to save: an error occurs while saving the package : The part .+ fail to be saved in the stream with marshaller .+")) {
-                // expected
-            } else {
-                throw e;
-            }
-        }
-
-        // Should not be able to write a document that has been closed
-        doc.close();
-        try {
-            doc.write(new NullOutputStream());
-            fail("Should not be able to write a document that has been closed.");
-        } catch (final IOException e) {
-            if (e.getMessage().equals("Cannot write data, document seems to have been closed already")) {
-                // expected
-            } else {
-                throw e;
-            }
-        }
-        
-        // Should be able to close a document multiple times, though subsequent closes will have no effect.
-        doc.close();
-
-
-        @SuppressWarnings("resource")
-        OPCPackage pkg2 = OPCPackage.open(tmp.getAbsolutePath());
-        doc = new OPCParser(pkg1);
-        try {
-            doc.parse(new TestFactory());
-            context = new HashMap<String,POIXMLDocumentPart>();
-            traverse(doc, context);
-            context.clear();
-    
-            assertEquals(pkg1.getRelationships().size(), pkg2.getRelationships().size());
-    
-            ArrayList<PackagePart> l1 = pkg1.getParts();
-            ArrayList<PackagePart> l2 = pkg2.getParts();
-    
-            assertEquals(l1.size(), l2.size());
-            for (int i=0; i < l1.size(); i++){
-                PackagePart p1 = l1.get(i);
-                PackagePart p2 = l2.get(i);
-    
-                assertEquals(p1.getContentType(), p2.getContentType());
-                assertEquals(p1.hasRelationships(), p2.hasRelationships());
-                if(p1.hasRelationships()){
-                    assertEquals(p1.getRelationships().size(), p2.getRelationships().size());
-                }
-                assertEquals(p1.getPartName(), p2.getPartName());
-            }
-        } finally {
-            doc.close();
-            pkg1.close();
-            pkg2.close();
-        }
-    }
-
-    @Test
-    public void testPPTX() throws Exception {
-        POIDataSamples pds = POIDataSamples.getSlideShowInstance();
-        assertReadWrite(PackageHelper.open(pds.openResourceAsStream("PPTWithAttachments.pptm")));
-    }
-
-    @Test
-    public void testXLSX() throws Exception {
-        POIDataSamples pds = POIDataSamples.getSpreadSheetInstance();
-        assertReadWrite(PackageHelper.open(pds.openResourceAsStream("ExcelWithAttachments.xlsm")));
-    }
-
-    @Test
-    public void testDOCX() throws Exception {
-        POIDataSamples pds = POIDataSamples.getDocumentInstance();
-        assertReadWrite(PackageHelper.open(pds.openResourceAsStream("WordWithAttachments.docx")));
-    }
-
-    @Test
-    public void testRelationOrder() throws Exception {
-        POIDataSamples pds = POIDataSamples.getDocumentInstance();
-        @SuppressWarnings("resource")
-        OPCPackage pkg = PackageHelper.open(pds.openResourceAsStream("WordWithAttachments.docx"));
-        OPCParser doc = new OPCParser(pkg);
-        try {
-            doc.parse(new TestFactory());
-    
-            for(POIXMLDocumentPart rel : doc.getRelations()){
-                //TODO finish me
-                assertNotNull(rel);
-            }
-        } finally {
-        	doc.close();
-        }
-    }
-    
-    @Test
-    public void testGetNextPartNumber() throws Exception {
-        POIDataSamples pds = POIDataSamples.getDocumentInstance();
-        @SuppressWarnings("resource")
-        OPCPackage pkg = PackageHelper.open(pds.openResourceAsStream("WordWithAttachments.docx"));
-        OPCParser doc = new OPCParser(pkg);
-        try {
-            doc.parse(new TestFactory());
-            
-            // Non-indexed parts: Word is taken, Excel is not
-            assertEquals(-1, doc.getNextPartNumber(XWPFRelation.DOCUMENT, 0));
-            assertEquals(-1, doc.getNextPartNumber(XWPFRelation.DOCUMENT, -1));
-            assertEquals(-1, doc.getNextPartNumber(XWPFRelation.DOCUMENT, 99));
-            assertEquals(0, doc.getNextPartNumber(XSSFRelation.WORKBOOK, 0));
-            assertEquals(0, doc.getNextPartNumber(XSSFRelation.WORKBOOK, -1));
-            assertEquals(0, doc.getNextPartNumber(XSSFRelation.WORKBOOK, 99));
-            
-            // Indexed parts:
-            // Has 2 headers
-            assertEquals(0, doc.getNextPartNumber(XWPFRelation.HEADER, 0));
-            assertEquals(3, doc.getNextPartNumber(XWPFRelation.HEADER, -1));
-            assertEquals(3, doc.getNextPartNumber(XWPFRelation.HEADER, 1));
-            assertEquals(8, doc.getNextPartNumber(XWPFRelation.HEADER, 8));
-            
-            // Has no Excel Sheets
-            assertEquals(0, doc.getNextPartNumber(XSSFRelation.WORKSHEET, 0));
-            assertEquals(1, doc.getNextPartNumber(XSSFRelation.WORKSHEET, -1));
-            assertEquals(1, doc.getNextPartNumber(XSSFRelation.WORKSHEET, 1));
-        } finally {
-            doc.close();
-        }
-    }
-
-    @Test
-    public void testCommitNullPart() throws IOException, InvalidFormatException {
-        POIXMLDocumentPart part = new POIXMLDocumentPart();
-        part.prepareForCommit();
-        part.commit();
-        part.onSave(new HashSet<PackagePart>());
-
-        assertNull(part.getRelationById(null));
-        assertNull(part.getRelationId(null));
-        assertFalse(part.removeRelation(null, true));
-        part.removeRelation(null);
-        assertEquals("",part.toString());
-        part.onDocumentCreate();
-        //part.getTargetPart(null);
-    }
-    
-    @Test
-    public void testVSDX() throws Exception {
-        POIDataSamples pds = POIDataSamples.getDiagramInstance();
-        @SuppressWarnings("resource")
-        OPCPackage open = PackageHelper.open(pds.openResourceAsStream("test.vsdx"));
-        POIXMLDocument part = new OPCParser(open, PackageRelationshipTypes.VISIO_CORE_DOCUMENT);
-        
-        assertNotNull(part);
-        assertEquals(0, part.getRelationCounter());
-        part.close();
-    }
-    
-    @Test
-    public void testVSDXPart() throws IOException {
-        POIDataSamples pds = POIDataSamples.getDiagramInstance();
-        OPCPackage open = PackageHelper.open(pds.openResourceAsStream("test.vsdx"));
-        
-        POIXMLDocumentPart part = new POIXMLDocumentPart(open, PackageRelationshipTypes.VISIO_CORE_DOCUMENT);
-        
-        assertNotNull(part);
-        assertEquals(0, part.getRelationCounter());
-        
-        open.close();
-    }
-    
-    @Test(expected=POIXMLException.class)
-    public void testInvalidCoreRel() throws IOException {
-        POIDataSamples pds = POIDataSamples.getDiagramInstance();
-        OPCPackage open = PackageHelper.open(pds.openResourceAsStream("test.vsdx"));
-        
-        try {
-            new POIXMLDocumentPart(open, "somethingillegal");
-        } finally {
-            open.close();
-        }
-    }
-    
-    @Test(expected=IllegalStateException.class)
-    public void testOSGIClassLoadingAsIs() throws IOException {
-        Thread thread = Thread.currentThread();
-        ClassLoader cl = thread.getContextClassLoader();
-        InputStream is = POIDataSamples.getSlideShowInstance().openResourceAsStream("table_test.pptx");
-        try {
-            thread.setContextClassLoader(cl.getParent());
-            XMLSlideShow ppt = new XMLSlideShow(is);
-            ppt.getSlides().get(0).getShapes();
-        } finally {
-            thread.setContextClassLoader(cl);
-            is.close();
-        }
-    }
-
-
-    @Test
-    public void testOSGIClassLoadingFixed() throws IOException {
-        Thread thread = Thread.currentThread();
-        ClassLoader cl = thread.getContextClassLoader();
-        InputStream is = POIDataSamples.getSlideShowInstance().openResourceAsStream("table_test.pptx");
-        try {
-            thread.setContextClassLoader(cl.getParent());
-            POIXMLTypeLoader.setClassLoader(cl);
-            XMLSlideShow ppt = new XMLSlideShow(is);
-            ppt.getSlides().get(0).getShapes();
-        } finally {
-            thread.setContextClassLoader(cl);
-            POIXMLTypeLoader.setClassLoader(null);
-            is.close();
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java b/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
deleted file mode 100644
index 8673283..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/* ====================================================================
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.POIXMLProperties.CoreProperties;
-import org.apache.poi.openxml4j.util.Nullable;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test setting extended and custom OOXML properties
- */
-public final class TestPOIXMLProperties {
-    private XWPFDocument sampleDoc;
-    private XWPFDocument sampleNoThumb;
-    private POIXMLProperties _props;
-    private CoreProperties _coreProperties;
-
-    @Before
-    public void setUp() throws IOException {
-        sampleDoc = XWPFTestDataSamples.openSampleDocument("documentProperties.docx");
-        sampleNoThumb = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
-        assertNotNull(sampleDoc);
-        assertNotNull(sampleNoThumb);
-        _props = sampleDoc.getProperties();
-        _coreProperties = _props.getCoreProperties();
-        assertNotNull(_props);
-    }
-
-    @After
-    public void closeResources() throws Exception {
-        sampleDoc.close();
-        sampleNoThumb.close();
-    }
-
-    @Test
-    public void testWorkbookExtendedProperties() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        POIXMLProperties props = workbook.getProperties();
-        assertNotNull(props);
-
-        org.apache.poi.POIXMLProperties.ExtendedProperties properties =
-                props.getExtendedProperties();
-
-        org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
-                ctProps = properties.getUnderlyingProperties();
-
-
-        String appVersion = "3.5 beta";
-        String application = "POI";
-
-        ctProps.setApplication(application);
-        ctProps.setAppVersion(appVersion);
-
-        XSSFWorkbook newWorkbook =
-                XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        workbook.close();
-        assertTrue(workbook != newWorkbook);
-
-
-        POIXMLProperties newProps = newWorkbook.getProperties();
-        assertNotNull(newProps);
-        org.apache.poi.POIXMLProperties.ExtendedProperties newProperties =
-                newProps.getExtendedProperties();
-
-        assertEquals(application, newProperties.getApplication());
-        assertEquals(appVersion, newProperties.getAppVersion());
-
-        org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
-                newCtProps = newProperties.getUnderlyingProperties();
-
-        assertEquals(application, newCtProps.getApplication());
-        assertEquals(appVersion, newCtProps.getAppVersion());
-
-        newWorkbook.close();
-    }
-
-
-    /**
-     * Test usermodel API for setting custom properties
-     */
-    @Test
-    public void testCustomProperties() throws Exception {
-        POIXMLDocument wb1 = new XSSFWorkbook();
-
-        POIXMLProperties.CustomProperties customProps = wb1.getProperties().getCustomProperties();
-        customProps.addProperty("test-1", "string val");
-        customProps.addProperty("test-2", 1974);
-        customProps.addProperty("test-3", 36.6);
-        //adding a duplicate
-        try {
-            customProps.addProperty("test-3", 36.6);
-            fail("expected exception");
-        } catch(IllegalArgumentException e){
-            assertEquals("A property with this name already exists in the custom properties", e.getMessage());
-        }
-        customProps.addProperty("test-4", true);
-
-        POIXMLDocument wb2 = XSSFTestDataSamples.writeOutAndReadBack((XSSFWorkbook)wb1);
-        wb1.close();
-        org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties ctProps =
-                wb2.getProperties().getCustomProperties().getUnderlyingProperties();
-        assertEquals(4, ctProps.sizeOfPropertyArray());
-        org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty p;
-
-        p = ctProps.getPropertyArray(0);
-        assertEquals("{D5CDD505-2E9C-101B-9397-08002B2CF9AE}", p.getFmtid());
-        assertEquals("test-1", p.getName());
-        assertEquals("string val", p.getLpwstr());
-        assertEquals(2, p.getPid());
-
-        p = ctProps.getPropertyArray(1);
-        assertEquals("{D5CDD505-2E9C-101B-9397-08002B2CF9AE}", p.getFmtid());
-        assertEquals("test-2", p.getName());
-        assertEquals(1974, p.getI4());
-        assertEquals(3, p.getPid());
-
-        p = ctProps.getPropertyArray(2);
-        assertEquals("{D5CDD505-2E9C-101B-9397-08002B2CF9AE}", p.getFmtid());
-        assertEquals("test-3", p.getName());
-        assertEquals(36.6, p.getR8(), 0);
-        assertEquals(4, p.getPid());
-
-        p = ctProps.getPropertyArray(3);
-        assertEquals("{D5CDD505-2E9C-101B-9397-08002B2CF9AE}", p.getFmtid());
-        assertEquals("test-4", p.getName());
-        assertEquals(true, p.getBool());
-        assertEquals(5, p.getPid());
-        
-        wb2.close();
-    }
-
-    @Test
-    public void testDocumentProperties() {
-        String category = _coreProperties.getCategory();
-        assertEquals("test", category);
-        String contentStatus = "Draft";
-        _coreProperties.setContentStatus(contentStatus);
-        assertEquals("Draft", contentStatus);
-        Date created = _coreProperties.getCreated();
-        // the original file contains a following value: 2009-07-20T13:12:00Z
-        assertTrue(dateTimeEqualToUTCString(created, "2009-07-20T13:12:00Z"));
-        String creator = _coreProperties.getCreator();
-        assertEquals("Paolo Mottadelli", creator);
-        String subject = _coreProperties.getSubject();
-        assertEquals("Greetings", subject);
-        String title = _coreProperties.getTitle();
-        assertEquals("Hello World", title);
-    }
-
-    @Test
-    public void testTransitiveSetters() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        CoreProperties cp = doc.getProperties().getCoreProperties();
-
-
-        Date dateCreated = LocaleUtil.getLocaleCalendar(2010, 6, 15, 10, 0, 0).getTime();
-        cp.setCreated(new Nullable<Date>(dateCreated));
-        assertEquals(dateCreated, cp.getCreated());
-
-        XWPFDocument doc2 = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        doc.close();
-        cp = doc2.getProperties().getCoreProperties();
-        Date dt3 = cp.getCreated();
-        assertEquals(dateCreated, dt3);
-        doc2.close();
-    }
-
-    @Test
-    public void testGetSetRevision() {
-        String revision = _coreProperties.getRevision();
-        assertTrue("Revision number is 1", Integer.parseInt(revision) > 1);
-        _coreProperties.setRevision("20");
-        assertEquals("20", _coreProperties.getRevision());
-        _coreProperties.setRevision("20xx");
-        assertEquals("20", _coreProperties.getRevision());
-    }
-
-    @Test
-    public void testLastModifiedByUserProperty() {
-        String lastModifiedByUser = _coreProperties.getLastModifiedByUser();
-        assertEquals("Paolo Mottadelli", lastModifiedByUser);
-        _coreProperties.setLastModifiedByUser("Test User");
-        assertEquals("Test User", _coreProperties.getLastModifiedByUser());
-    }
-
-    public static boolean dateTimeEqualToUTCString(Date dateTime, String utcString) {
-        Calendar utcCalendar = LocaleUtil.getLocaleCalendar(LocaleUtil.TIMEZONE_UTC);
-        utcCalendar.setTimeInMillis(dateTime.getTime());
-        String dateTimeUtcString = utcCalendar.get(Calendar.YEAR) + "-" + 
-                zeroPad((utcCalendar.get(Calendar.MONTH)+1)) + "-" + 
-                zeroPad(utcCalendar.get(Calendar.DAY_OF_MONTH)) + "T" + 
-                zeroPad(utcCalendar.get(Calendar.HOUR_OF_DAY)) + ":" +
-                zeroPad(utcCalendar.get(Calendar.MINUTE)) + ":" + 
-                zeroPad(utcCalendar.get(Calendar.SECOND)) + "Z";
-
-        return utcString.equals(dateTimeUtcString);
-    }
-
-    public void testThumbnails() throws Exception {
-        POIXMLProperties noThumbProps = sampleNoThumb.getProperties();
-
-        assertNotNull(_props.getThumbnailPart());
-        assertNull(noThumbProps.getThumbnailPart());
-
-        assertNotNull(_props.getThumbnailFilename());
-        assertNull(noThumbProps.getThumbnailFilename());
-
-        assertNotNull(_props.getThumbnailImage());
-        assertNull(noThumbProps.getThumbnailImage());
-
-        assertEquals("thumbnail.jpeg", _props.getThumbnailFilename());
-
-
-        // Adding / changing
-        noThumbProps.setThumbnail("Testing.png", new ByteArrayInputStream(new byte[1]));
-        assertNotNull(noThumbProps.getThumbnailPart());
-        assertEquals("Testing.png", noThumbProps.getThumbnailFilename());
-        assertNotNull(noThumbProps.getThumbnailImage());
-        assertEquals(1, noThumbProps.getThumbnailImage().available());
-
-        noThumbProps.setThumbnail("Testing2.png", new ByteArrayInputStream(new byte[2]));
-        assertNotNull(noThumbProps.getThumbnailPart());
-        assertEquals("Testing.png", noThumbProps.getThumbnailFilename());
-        assertNotNull(noThumbProps.getThumbnailImage());
-        assertEquals(2, noThumbProps.getThumbnailImage().available());
-    }
-
-    private static String zeroPad(long i) {
-        if (i >= 0 && i <=9) {
-            return "0" + i;
-        } else {
-            return String.valueOf(i);
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java b/trunk/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
deleted file mode 100644
index 9ba1333..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.util.PackageHelper;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public final class TestXMLPropertiesTextExtractor extends TestCase {
-    private static final POIDataSamples _ssSamples = POIDataSamples.getSpreadSheetInstance();
-    private static final POIDataSamples _slSamples = POIDataSamples.getSlideShowInstance();
-
-	public void testGetFromMainExtractor() throws Exception {
-		OPCPackage pkg = PackageHelper.open(_ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm"));
-
-		XSSFWorkbook wb = new XSSFWorkbook(pkg);
-
-		XSSFExcelExtractor ext = new XSSFExcelExtractor(wb);
-		POIXMLPropertiesTextExtractor textExt = ext.getMetadataTextExtractor();
-
-		// Check basics
-		assertNotNull(textExt);
-		assertTrue(textExt.getText().length() > 0);
-
-		// Check some of the content
-		String text = textExt.getText();
-		String cText = textExt.getCorePropertiesText();
-
-		assertTrue(text.contains("LastModifiedBy = Yury Batrakov"));
-		assertTrue(cText.contains("LastModifiedBy = Yury Batrakov"));
-		
-		textExt.close();
-		ext.close();
-	}
-
-	public void testCore() throws Exception {
-		OPCPackage pkg = PackageHelper.open(
-                _ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
-		);
-		XSSFWorkbook wb = new XSSFWorkbook(pkg);
-
-		POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
-		ext.getText();
-
-		// Now check
-		String text = ext.getText();
-		String cText = ext.getCorePropertiesText();
-
-		assertTrue(text.contains("LastModifiedBy = Yury Batrakov"));
-		assertTrue(cText.contains("LastModifiedBy = Yury Batrakov"));
-		
-		ext.close();
-	}
-
-	public void testExtended() throws Exception {
-		OPCPackage pkg = OPCPackage.open(
-                _ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
-		);
-		XSSFWorkbook wb = new XSSFWorkbook(pkg);
-
-		POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
-		ext.getText();
-
-		// Now check
-		String text = ext.getText();
-		String eText = ext.getExtendedPropertiesText();
-
-		assertTrue(text.contains("Application = Microsoft Excel"));
-		assertTrue(text.contains("Company = Mera"));
-		assertTrue(eText.contains("Application = Microsoft Excel"));
-		assertTrue(eText.contains("Company = Mera"));
-
-		ext.close();
-	}
-
-	public void testCustom() throws Exception {
-      OPCPackage pkg = OPCPackage.open(
-                _ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
-      );
-      XSSFWorkbook wb = new XSSFWorkbook(pkg);
-
-      POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
-      ext.getText();
-
-      // Now check
-      String text = ext.getText();
-      String cText = ext.getCustomPropertiesText();
-      
-      assertTrue(text.contains("description = another value"));
-      assertTrue(cText.contains("description = another value"));
-
-      ext.close();
-	}
-	
-	/**
-	 * Bug #49386 - some properties, especially
-	 *  dates can be null
-	 */
-	public void testWithSomeNulls() throws Exception {
-      OPCPackage pkg = OPCPackage.open(
-            _slSamples.openResourceAsStream("49386-null_dates.pptx")
-      );
-      XSLFSlideShow sl = new XSLFSlideShow(pkg);
-   
-      POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(sl);
-      ext.getText();
-      
-      String text = ext.getText();
-      assertFalse(text.contains("Created =")); // With date is null
-      assertTrue(text.contains("CreatedString = ")); // Via string is blank
-      assertTrue(text.contains("LastModifiedBy = IT Client Services"));
-		
-      ext.close();
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java b/trunk/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java
deleted file mode 100644
index 0d7bc5a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java
+++ /dev/null
@@ -1,1039 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.extractor;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.UnsupportedFileFormatException;
-import org.apache.poi.hdgf.extractor.VisioTextExtractor;
-import org.apache.poi.hpbf.extractor.PublisherTextExtractor;
-import org.apache.poi.hslf.extractor.PowerPointExtractor;
-import org.apache.poi.hsmf.extractor.OutlookTextExtactor;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.extractor.EventBasedExcelExtractor;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.hwpf.extractor.Word6Extractor;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xdgf.extractor.XDGFVisioExtractor;
-import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
-import org.apache.poi.xssf.extractor.XSSFEventBasedExcelExtractor;
-import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test that the extractor factory plays nicely
- */
-public class TestExtractorFactory {
-    private static File txt;
-
-    private static File xls;
-    private static File xlsx;
-    private static File xlsxStrict;
-    private static File xltx;
-    private static File xlsEmb;
-
-    private static File doc;
-    private static File doc6;
-    private static File doc95;
-    private static File docx;
-    private static File dotx;
-    private static File docEmb;
-    private static File docEmbOOXML;
-
-    private static File ppt;
-    private static File pptx;
-
-    private static File msg;
-    private static File msgEmb;
-    private static File msgEmbMsg;
-
-    private static File vsd;
-    private static File vsdx;
-
-    private static File pub;
-
-    private static File getFileAndCheck(POIDataSamples samples, String name) {
-        File file = samples.getFile(name);
-
-        assertNotNull("Did not get a file for " + name, file);
-        assertTrue("Did not get a type file for " + name, file.isFile());
-        assertTrue("File did not exist: " + name, file.exists());
-
-        return file;
-    }
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-
-        POIDataSamples ssTests = POIDataSamples.getSpreadSheetInstance();
-        xls = getFileAndCheck(ssTests, "SampleSS.xls");
-        xlsx = getFileAndCheck(ssTests, "SampleSS.xlsx");
-        xlsxStrict = getFileAndCheck(ssTests, "SampleSS.strict.xlsx");
-        xltx = getFileAndCheck(ssTests, "test.xltx");
-        xlsEmb = getFileAndCheck(ssTests, "excel_with_embeded.xls");
-
-        POIDataSamples wpTests = POIDataSamples.getDocumentInstance();
-        doc = getFileAndCheck(wpTests, "SampleDoc.doc");
-        doc6 = getFileAndCheck(wpTests, "Word6.doc");
-        doc95 = getFileAndCheck(wpTests, "Word95.doc");
-        docx = getFileAndCheck(wpTests, "SampleDoc.docx");
-        dotx = getFileAndCheck(wpTests, "test.dotx");
-        docEmb = getFileAndCheck(wpTests, "word_with_embeded.doc");
-        docEmbOOXML = getFileAndCheck(wpTests, "word_with_embeded_ooxml.doc");
-
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-        ppt = getFileAndCheck(slTests, "SampleShow.ppt");
-        pptx = getFileAndCheck(slTests, "SampleShow.pptx");
-        txt = getFileAndCheck(slTests, "SampleShow.txt");
-
-        POIDataSamples dgTests = POIDataSamples.getDiagramInstance();
-        vsd = getFileAndCheck(dgTests, "Test_Visio-Some_Random_Text.vsd");
-        vsdx = getFileAndCheck(dgTests, "test.vsdx");
-
-        POIDataSamples pubTests = POIDataSamples.getPublisherInstance();
-        pub = getFileAndCheck(pubTests, "Simple.pub");
-
-        POIDataSamples olTests = POIDataSamples.getHSMFInstance();
-        msg = getFileAndCheck(olTests, "quick.msg");
-        msgEmb = getFileAndCheck(olTests, "attachment_test_msg.msg");
-        msgEmbMsg = getFileAndCheck(olTests, "attachment_msg_pdf.msg");
-    }
-
-    @Test
-    public void testFile() throws Exception {
-        // Excel
-        POITextExtractor xlsExtractor = ExtractorFactory.createExtractor(xls);
-        assertNotNull("Had empty extractor for " + xls, xlsExtractor);
-        assertTrue("Expected instanceof ExcelExtractor, but had: " + xlsExtractor.getClass(), 
-                xlsExtractor
-                instanceof ExcelExtractor
-        );
-        assertTrue(
-                xlsExtractor.getText().length() > 200
-        );
-        xlsExtractor.close();
-
-        POITextExtractor extractor = ExtractorFactory.createExtractor(xlsx);
-        assertTrue(
-                extractor.getClass().getName(),
-                extractor
-                instanceof XSSFExcelExtractor
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(xlsx);
-        assertTrue(
-                extractor.getText().length() > 200
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(xltx);
-        assertTrue(
-                extractor.getClass().getName(),
-                extractor
-                instanceof XSSFExcelExtractor
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(xltx);
-        assertTrue(
-                extractor.getText().contains("test")
-        );
-        extractor.close();
-
-        // TODO Support OOXML-Strict, see bug #57699
-        try {
-            /*extractor =*/ ExtractorFactory.createExtractor(xlsxStrict);
-            fail("OOXML-Strict isn't yet supported");
-        } catch (POIXMLException e) {
-            // Expected, for now
-        }
-//        extractor = ExtractorFactory.createExtractor(xlsxStrict);
-//        assertTrue(
-//                extractor
-//                instanceof XSSFExcelExtractor
-//        );
-//        extractor.close();
-//
-//        extractor = ExtractorFactory.createExtractor(xlsxStrict);
-//        assertTrue(
-//                extractor.getText().contains("test")
-//        );
-//        extractor.close();
-
-
-        // Word
-        extractor = ExtractorFactory.createExtractor(doc);
-        assertTrue(
-                extractor
-                instanceof WordExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(doc6);
-        assertTrue(
-                extractor
-                instanceof Word6Extractor
-        );
-        assertTrue(
-                extractor.getText().length() > 20
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(doc95);
-        assertTrue(
-                extractor
-                instanceof Word6Extractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(docx);
-        assertTrue(
-                extractor instanceof XWPFWordExtractor
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(docx);
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(dotx);
-        assertTrue(
-                extractor instanceof XWPFWordExtractor
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(dotx);
-        assertTrue(
-                extractor.getText().contains("Test")
-        );
-        extractor.close();
-
-        // PowerPoint (PPT)
-        extractor = ExtractorFactory.createExtractor(ppt);
-        assertTrue(
-                extractor
-                instanceof PowerPointExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        // PowerPoint (PPTX)
-        extractor = ExtractorFactory.createExtractor(pptx);
-        assertTrue(
-                extractor
-                instanceof XSLFPowerPointExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        // Visio - binary
-        extractor = ExtractorFactory.createExtractor(vsd);
-        assertTrue(
-                extractor
-                instanceof VisioTextExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 50
-        );
-        extractor.close();
-
-        // Visio - vsdx
-        extractor = ExtractorFactory.createExtractor(vsdx);
-        assertTrue(
-                extractor
-                instanceof XDGFVisioExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 20
-        );
-        extractor.close();
-
-        // Publisher
-        extractor = ExtractorFactory.createExtractor(pub);
-        assertTrue(
-                extractor
-                instanceof PublisherTextExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 50
-        );
-        extractor.close();
-
-        // Outlook msg
-        extractor = ExtractorFactory.createExtractor(msg);
-        assertTrue(
-                extractor
-                instanceof OutlookTextExtactor
-        );
-        assertTrue(
-                extractor.getText().length() > 50
-        );
-        extractor.close();
-
-        // Text
-        try {
-            ExtractorFactory.createExtractor(txt);
-            fail();
-        } catch(IllegalArgumentException e) {
-            // Good
-        }
-    }
-
-    @Test
-    public void testInputStream() throws Exception {
-        // Excel
-        POITextExtractor extractor = ExtractorFactory.createExtractor(new FileInputStream(xls));
-        assertTrue(
-                extractor
-                instanceof ExcelExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 200
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(xlsx));
-        assertTrue(
-                extractor.getClass().getName(),
-                extractor
-                instanceof XSSFExcelExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 200
-        );
-        // TODO Support OOXML-Strict, see bug #57699
-//        assertTrue(
-//                ExtractorFactory.createExtractor(new FileInputStream(xlsxStrict))
-//                instanceof XSSFExcelExtractor
-//        );
-//        assertTrue(
-//                ExtractorFactory.createExtractor(new FileInputStream(xlsxStrict)).getText().length() > 200
-//        );
-        extractor.close();
-
-        // Word
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(doc));
-        assertTrue(
-                extractor.getClass().getName(),
-                extractor
-                instanceof WordExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(doc6));
-        assertTrue(
-                extractor.getClass().getName(),
-                extractor
-                instanceof Word6Extractor
-        );
-        assertTrue(
-                extractor.getText().length() > 20
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(doc95));
-        assertTrue(
-                extractor.getClass().getName(),
-                extractor
-                instanceof Word6Extractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(docx));
-        assertTrue(
-                extractor
-                instanceof XWPFWordExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        // PowerPoint
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(ppt));
-        assertTrue(
-                extractor
-                instanceof PowerPointExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(pptx));
-        assertTrue(
-                extractor
-                instanceof XSLFPowerPointExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 120
-        );
-        extractor.close();
-
-        // Visio
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(vsd));
-        assertTrue(
-                extractor
-                instanceof VisioTextExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 50
-        );
-        extractor.close();
-
-        // Visio - vsdx
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(vsdx));
-        assertTrue(
-                extractor
-                instanceof XDGFVisioExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 20
-        );
-        extractor.close();
-        
-        // Publisher
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(pub));
-        assertTrue(
-                extractor
-                instanceof PublisherTextExtractor
-        );
-        assertTrue(
-                extractor.getText().length() > 50
-        );
-        extractor.close();
-
-        // Outlook msg
-        extractor = ExtractorFactory.createExtractor(new FileInputStream(msg));
-        assertTrue(
-                extractor
-                instanceof OutlookTextExtactor
-        );
-        assertTrue(
-                extractor.getText().length() > 50
-        );
-        extractor.close();
-
-        // Text
-        try {
-            FileInputStream stream = new FileInputStream(txt);
-            try {
-                ExtractorFactory.createExtractor(stream);
-                fail();
-            } finally {
-                IOUtils.closeQuietly(stream);
-            }
-        } catch(IllegalArgumentException e) {
-            // Good
-        }
-    }
-
-    @Test
-    public void testPOIFS() throws Exception {
-        // Excel
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(xls)))
-                instanceof ExcelExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(xls))).getText().length() > 200
-        );
-
-        // Word
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(doc)))
-                instanceof WordExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(doc))).getText().length() > 120
-        );
-
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(doc6)))
-                instanceof Word6Extractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(doc6))).getText().length() > 20
-        );
-
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(doc95)))
-                instanceof Word6Extractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(doc95))).getText().length() > 120
-        );
-
-        // PowerPoint
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(ppt)))
-                instanceof PowerPointExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(ppt))).getText().length() > 120
-        );
-
-        // Visio
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(vsd)))
-                instanceof VisioTextExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(vsd))).getText().length() > 50
-        );
-
-        // Publisher
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(pub)))
-                instanceof PublisherTextExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(pub))).getText().length() > 50
-        );
-
-        // Outlook msg
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(msg)))
-                instanceof OutlookTextExtactor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(msg))).getText().length() > 50
-        );
-
-        // Text
-        try {
-            ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(txt)));
-            fail();
-        } catch(IOException e) {
-            // Good
-        }
-    }
-
-
-    @Test
-    public void testOPOIFS() throws Exception {
-        // Excel
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(xls)))
-                        instanceof ExcelExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(xls))).getText().length() > 200
-        );
-
-        // Word
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(doc)))
-                        instanceof WordExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(doc))).getText().length() > 120
-        );
-
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(doc6)))
-                        instanceof Word6Extractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(doc6))).getText().length() > 20
-        );
-
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(doc95)))
-                        instanceof Word6Extractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(doc95))).getText().length() > 120
-        );
-
-        // PowerPoint
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(ppt)))
-                        instanceof PowerPointExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(ppt))).getText().length() > 120
-        );
-
-        // Visio
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(vsd)))
-                        instanceof VisioTextExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(vsd))).getText().length() > 50
-        );
-
-        // Publisher
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(pub)))
-                        instanceof PublisherTextExtractor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(pub))).getText().length() > 50
-        );
-
-        // Outlook msg
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(msg)))
-                        instanceof OutlookTextExtactor
-        );
-        assertTrue(
-                ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(msg))).getText().length() > 50
-        );
-
-        // Text
-        try {
-            ExtractorFactory.createExtractor(new OPOIFSFileSystem(new FileInputStream(txt)));
-            fail();
-        } catch(IOException e) {
-            // Good
-        }
-    }
-
-    @Test
-    public void testPackage() throws Exception {
-        // Excel
-        POIXMLTextExtractor extractor = ExtractorFactory.createExtractor(OPCPackage.open(xlsx.toString(), PackageAccess.READ));
-        assertTrue(extractor instanceof XSSFExcelExtractor);
-        extractor.close();
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(xlsx.toString()));
-        assertTrue(extractor.getText().length() > 200);
-        extractor.close();
-
-        // Word
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(docx.toString()));
-        assertTrue(extractor instanceof XWPFWordExtractor);
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(docx.toString()));
-        assertTrue(extractor.getText().length() > 120);
-        extractor.close();
-
-        // PowerPoint
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(pptx.toString()));
-        assertTrue(extractor instanceof XSLFPowerPointExtractor);
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(pptx.toString()));
-        assertTrue(extractor.getText().length() > 120);
-        extractor.close();
-        
-        // Visio
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(vsdx.toString()));
-        assertTrue(extractor instanceof XDGFVisioExtractor);
-        assertTrue(extractor.getText().length() > 20);
-        extractor.close();
-
-        // Text
-        try {
-            ExtractorFactory.createExtractor(OPCPackage.open(txt.toString()));
-            fail("TestExtractorFactory.testPackage() failed on " + txt);
-        } catch(UnsupportedFileFormatException e) {
-            // Good
-        } catch (Exception e) {
-            System.out.println("TestExtractorFactory.testPackage() failed on " + txt);
-            throw e;
-        }
-    }
-
-    @Test
-    public void testPreferEventBased() throws Exception {
-        assertFalse(ExtractorFactory.getPreferEventExtractor());
-        assertFalse(ExtractorFactory.getThreadPrefersEventExtractors());
-        assertNull(ExtractorFactory.getAllThreadsPreferEventExtractors());
-
-        ExtractorFactory.setThreadPrefersEventExtractors(true);
-
-        assertTrue(ExtractorFactory.getPreferEventExtractor());
-        assertTrue(ExtractorFactory.getThreadPrefersEventExtractors());
-        assertNull(ExtractorFactory.getAllThreadsPreferEventExtractors());
-
-        ExtractorFactory.setAllThreadsPreferEventExtractors(false);
-
-        assertFalse(ExtractorFactory.getPreferEventExtractor());
-        assertTrue(ExtractorFactory.getThreadPrefersEventExtractors());
-        assertEquals(Boolean.FALSE, ExtractorFactory.getAllThreadsPreferEventExtractors());
-
-        ExtractorFactory.setAllThreadsPreferEventExtractors(null);
-
-        assertTrue(ExtractorFactory.getPreferEventExtractor());
-        assertTrue(ExtractorFactory.getThreadPrefersEventExtractors());
-        assertNull(ExtractorFactory.getAllThreadsPreferEventExtractors());
-
-
-        // Check we get the right extractors now
-        POITextExtractor extractor = ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(xls)));
-        assertTrue(
-                extractor
-                instanceof EventBasedExcelExtractor
-        );
-        extractor.close();
-        extractor = ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(xls)));
-        assertTrue(
-                extractor.getText().length() > 200
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(xlsx.toString(), PackageAccess.READ));
-        assertTrue(extractor instanceof XSSFEventBasedExcelExtractor);
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(xlsx.toString(), PackageAccess.READ));
-        assertTrue(
-                extractor.getText().length() > 200
-        );
-        extractor.close();
-
-
-        // Put back to normal
-        ExtractorFactory.setThreadPrefersEventExtractors(false);
-        assertFalse(ExtractorFactory.getPreferEventExtractor());
-        assertFalse(ExtractorFactory.getThreadPrefersEventExtractors());
-        assertNull(ExtractorFactory.getAllThreadsPreferEventExtractors());
-
-        // And back
-        extractor = ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(xls)));
-        assertTrue(
-                extractor
-                instanceof ExcelExtractor
-        );
-        extractor.close();
-        extractor = ExtractorFactory.createExtractor(new POIFSFileSystem(new FileInputStream(xls)));
-        assertTrue(
-                extractor.getText().length() > 200
-        );
-        extractor.close();
-
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(xlsx.toString(), PackageAccess.READ));
-        assertTrue(
-                extractor
-                instanceof XSSFExcelExtractor
-        );
-        extractor.close();
-        extractor = ExtractorFactory.createExtractor(OPCPackage.open(xlsx.toString()));
-        assertTrue(
-                extractor.getText().length() > 200
-        );
-        extractor.close();
-    }
-
-    /**
-     * Test embeded docs text extraction. For now, only
-     *  does poifs embeded, but will do ooxml ones 
-     *  at some point.
-     */
-    @Test
-    public void testEmbeded() throws Exception {
-        POIOLE2TextExtractor ext;
-        POITextExtractor[] embeds;
-
-        // No embedings
-        ext = (POIOLE2TextExtractor)
-                ExtractorFactory.createExtractor(xls);
-        embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
-        assertEquals(0, embeds.length);
-        ext.close();
-
-        // Excel
-        ext = (POIOLE2TextExtractor)
-                ExtractorFactory.createExtractor(xlsEmb);
-        embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
-
-        assertEquals(6, embeds.length);
-        int numWord = 0, numXls = 0, numPpt = 0, numMsg = 0, numWordX;
-        for (POITextExtractor embed : embeds) {
-            assertTrue(embed.getText().length() > 20);
-
-            if (embed instanceof PowerPointExtractor) numPpt++;
-            else if (embed instanceof ExcelExtractor) numXls++;
-            else if (embed instanceof WordExtractor) numWord++;
-            else if (embed instanceof OutlookTextExtactor) numMsg++;
-        }
-        assertEquals(2, numPpt);
-        assertEquals(2, numXls);
-        assertEquals(2, numWord);
-        assertEquals(0, numMsg);
-        ext.close();
-
-        // Word
-        ext = (POIOLE2TextExtractor)
-                ExtractorFactory.createExtractor(docEmb);
-        embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
-
-        numWord = 0; numXls = 0; numPpt = 0; numMsg = 0;
-        assertEquals(4, embeds.length);
-        for (POITextExtractor embed : embeds) {
-            assertTrue(embed.getText().length() > 20);
-            if (embed instanceof PowerPointExtractor) numPpt++;
-            else if (embed instanceof ExcelExtractor) numXls++;
-            else if (embed instanceof WordExtractor) numWord++;
-            else if (embed instanceof OutlookTextExtactor) numMsg++;
-        }
-        assertEquals(1, numPpt);
-        assertEquals(2, numXls);
-        assertEquals(1, numWord);
-        assertEquals(0, numMsg);
-        ext.close();
-
-        // Word which contains an OOXML file
-        ext = (POIOLE2TextExtractor)
-                ExtractorFactory.createExtractor(docEmbOOXML);
-        embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
-
-        numWord = 0; numXls = 0; numPpt = 0; numMsg = 0; numWordX = 0;
-        assertEquals(3, embeds.length);
-        for (POITextExtractor embed : embeds) {
-            assertTrue(embed.getText().length() > 20);
-            if (embed instanceof PowerPointExtractor) numPpt++;
-            else if (embed instanceof ExcelExtractor) numXls++;
-            else if (embed instanceof WordExtractor) numWord++;
-            else if (embed instanceof OutlookTextExtactor) numMsg++;
-            else if (embed instanceof XWPFWordExtractor) numWordX++;
-        }
-        assertEquals(1, numPpt);
-        assertEquals(1, numXls);
-        assertEquals(0, numWord);
-        assertEquals(1, numWordX);
-        assertEquals(0, numMsg);
-        ext.close();
-
-        // Outlook
-        ext = (OutlookTextExtactor)
-                ExtractorFactory.createExtractor(msgEmb);
-        embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
-
-        numWord = 0; numXls = 0; numPpt = 0; numMsg = 0;
-        assertEquals(1, embeds.length);
-        for (POITextExtractor embed : embeds) {
-            assertTrue(embed.getText().length() > 20);
-            if (embed instanceof PowerPointExtractor) numPpt++;
-            else if (embed instanceof ExcelExtractor) numXls++;
-            else if (embed instanceof WordExtractor) numWord++;
-            else if (embed instanceof OutlookTextExtactor) numMsg++;
-        }
-        assertEquals(0, numPpt);
-        assertEquals(0, numXls);
-        assertEquals(1, numWord);
-        assertEquals(0, numMsg);
-        ext.close();
-
-        // Outlook with another outlook file in it
-        ext = (OutlookTextExtactor)
-                ExtractorFactory.createExtractor(msgEmbMsg);
-        embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
-
-        numWord = 0; numXls = 0; numPpt = 0; numMsg = 0;
-        assertEquals(1, embeds.length);
-        for (POITextExtractor embed : embeds) {
-            assertTrue(embed.getText().length() > 20);
-            if (embed instanceof PowerPointExtractor) numPpt++;
-            else if (embed instanceof ExcelExtractor) numXls++;
-            else if (embed instanceof WordExtractor) numWord++;
-            else if (embed instanceof OutlookTextExtactor) numMsg++;
-        }
-        assertEquals(0, numPpt);
-        assertEquals(0, numXls);
-        assertEquals(0, numWord);
-        assertEquals(1, numMsg);
-        ext.close();
-
-        // TODO - PowerPoint
-        // TODO - Publisher
-        // TODO - Visio
-    }
-
-    private static final String[] EXPECTED_FAILURES = new String[] {
-        // password protected files
-        "spreadsheet/password.xls",
-        "spreadsheet/protected_passtika.xlsx",
-        "spreadsheet/51832.xls",
-        "document/PasswordProtected.doc",
-        "slideshow/Password_Protected-hello.ppt",
-        "slideshow/Password_Protected-56-hello.ppt",
-        "slideshow/Password_Protected-np-hello.ppt",
-        "slideshow/cryptoapi-proc2356.ppt",
-        //"document/bug53475-password-is-pass.docx",
-        //"document/bug53475-password-is-solrcell.docx",
-        "spreadsheet/xor-encryption-abc.xls",
-        "spreadsheet/35897-type4.xls",
-        //"poifs/protect.xlsx",
-        //"poifs/protected_sha512.xlsx",
-        //"poifs/extenxls_pwd123.xlsx",
-        //"poifs/protected_agile.docx",
-        "spreadsheet/58616.xlsx",
-
-        // TODO: fails XMLExportTest, is this ok?
-        "spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx",
-        "spreadsheet/55864.xlsx",
-        "spreadsheet/57890.xlsx",
-
-        // TODO: these fail now with some NPE/file read error because we now try to compute every value via Cell.toString()!
-        "spreadsheet/44958.xls",
-        "spreadsheet/44958_1.xls",
-        "spreadsheet/testArraysAndTables.xls",
-
-        // TODO: good to ignore?
-        "spreadsheet/sample-beta.xlsx",
-
-        // This is actually a spreadsheet!
-        "hpsf/TestRobert_Flaherty.doc",
-
-        // some files that are broken, eg Word 95, ...
-        "spreadsheet/43493.xls",
-        "spreadsheet/46904.xls",
-        "document/Bug50955.doc",
-        "slideshow/PPT95.ppt",
-        "openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx",
-        "openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx",
-        "openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx",
-        "openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx",
-        "openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx",
-        "openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx",
-        "openxml4j/OPCCompliance_DerivedPartNameFAIL.docx",
-        "openxml4j/invalid.xlsx",
-        "spreadsheet/54764-2.xlsx",   // see TestXSSFBugs.bug54764()
-        "spreadsheet/54764.xlsx",     // see TestXSSFBugs.bug54764()
-        "spreadsheet/Simple.xlsb",
-        "poifs/unknown_properties.msg", // POIFS properties corrupted
-        "poifs/only-zero-byte-streams.ole2", // No actual contents
-        "spreadsheet/poc-xmlbomb.xlsx",  // contains xml-entity-expansion
-        "spreadsheet/poc-shared-strings.xlsx",  // contains shared-string-entity-expansion
-
-        // old Excel files, which we only support simple text extraction of
-        "spreadsheet/testEXCEL_2.xls",
-        "spreadsheet/testEXCEL_3.xls",
-        "spreadsheet/testEXCEL_4.xls",
-        "spreadsheet/testEXCEL_5.xls",
-        "spreadsheet/testEXCEL_95.xls",
-
-        // OOXML Strict is not yet supported, see bug #57699
-        "spreadsheet/SampleSS.strict.xlsx",
-        "spreadsheet/SimpleStrict.xlsx",
-        "spreadsheet/sample.strict.xlsx",
-
-        // non-TNEF files
-        "ddf/Container.dat",
-        "ddf/47143.dat",
-
-        // sheet cloning errors
-        "spreadsheet/47813.xlsx",
-        "spreadsheet/56450.xls",
-        "spreadsheet/57231_MixedGasReport.xls",
-        "spreadsheet/OddStyleRecord.xls",
-        "spreadsheet/WithChartSheet.xlsx",
-        "spreadsheet/chart_sheet.xlsx",
-    };
-    
-    @Test
-    public void testFileLeak() throws Exception {
-        // run a number of files that might fail in order to catch 
-        // leaked file resources when using file-leak-detector while
-        // running the test
-        
-        for(String file : EXPECTED_FAILURES) {
-            try {
-                ExtractorFactory.createExtractor(POIDataSamples.getSpreadSheetInstance().getFile(file));
-            } catch (Exception e) {
-                // catch all exceptions here as we are only interested in file-handle leaks
-            }
-        }
-    }
-    
-    /**
-     *  #59074 - Excel 95 files should give a helpful message, not just 
-     *   "No supported documents found in the OLE2 stream"
-     */
-    @Test
-    public void bug59074() throws Exception {
-        try {
-            ExtractorFactory.createExtractor(
-                    POIDataSamples.getSpreadSheetInstance().getFile("59074.xls"));
-            fail("Old excel formats not supported via ExtractorFactory");
-        } catch (OldExcelFormatException e) {
-            // expected here
-        }
-    }
-
-    @Test
-    public void testGetEmbeddedFromXMLExtractor() {
-        try {
-            // currently not implemented
-            ExtractorFactory.getEmbededDocsTextExtractors((POIXMLTextExtractor)null);
-            fail("Unsupported currently");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-    }
-    
-    // This bug is currently open. This test will fail with "expected error not thrown" when the bug has been fixed.
-    // When this happens, change this from @Test(expected=...) to @Test
-    // bug 45565: text within TextBoxes is extracted by ExcelExtractor and WordExtractor
-    @Test(expected=AssertionError.class)
-    public void test45565() throws Exception {
-        POITextExtractor extractor = ExtractorFactory.createExtractor(HSSFTestDataSamples.getSampleFile("45565.xls"));
-        try {
-            String text = extractor.getText();
-            assertContains(text, "testdoc");
-            assertContains(text, "test phrase");
-        } finally {
-            extractor.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
deleted file mode 100644
index 1c6b942..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.TempFile;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * Centralises logic for finding/opening sample files for ooxml4j unit tests 
- */
-public final class OpenXML4JTestDataSamples {
-    private static final POIDataSamples _samples = POIDataSamples.getOpenXML4JInstance();
-
-	private OpenXML4JTestDataSamples() {
-		// no instances of this class
-	}
-
-	public static InputStream openSampleStream(String sampleFileName) {
-		return _samples.openResourceAsStream(sampleFileName);
-	}
-	public static String getSampleFileName(String sampleFileName) {
-		return getSampleFile(sampleFileName).getAbsolutePath();
-	}
-	
-	public static File getSampleFile(String sampleFileName) {
-		return _samples.getFile(sampleFileName);
-	}
-	
-	public static File getOutputFile(String outputFileName) throws IOException {
-        String suffix = outputFileName.substring(outputFileName.lastIndexOf('.'));
-        return TempFile.createTempFile(outputFileName, suffix);
-	}
-
-
-	public static InputStream openComplianceSampleStream(String sampleFileName) {
-        return _samples.openResourceAsStream(sampleFileName);
-	}
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java
deleted file mode 100644
index 7b98afd..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-      TestContentType.class
-    , TestFileHelper.class
-    , TestListParts.class
-    , TestPackage.class
-    , TestPackageCoreProperties.class
-    , TestPackagePartName.class
-    , TestPackageThumbnail.class
-    , TestPackagingURIHelper.class
-    , TestRelationships.class
-})
-public final class AllOpenXML4JTests {
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
deleted file mode 100644
index 91187ce..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.internal.ContentType;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-
-/**
- * Tests for content type (ContentType class).
- *
- * @author Julien Chable
- */
-public final class TestContentType extends TestCase {
-
-	/**
-	 * Check rule M1.13: Package implementers shall only create and only
-	 * recognize parts with a content type; format designers shall specify a
-	 * content type for each part included in the format. Content types for
-	 * package parts shall fit the definition and syntax for media types as
-	 * specified in RFC 2616, \u00A73.7.
-	 */
-	public void testContentTypeValidation() throws InvalidFormatException {
-		String[] contentTypesToTest = new String[] { "text/xml",
-				"application/pgp-key", "application/vnd.hp-PCLXL",
-				"application/vnd.lotus-1-2-3" };
-		for (String contentType : contentTypesToTest) {
-			new ContentType(contentType);
-		}
-	}
-
-	/**
-	 * Check rule M1.13 : Package implementers shall only create and only
-	 * recognize parts with a content type; format designers shall specify a
-	 * content type for each part included in the format. Content types for
-	 * package parts shall fit the definition and syntax for media types as
-	 * specified in RFC 2616, \u00A3.7.
-	 *
-	 * Check rule M1.14: Content types shall not use linear white space either
-	 * between the type and subtype or between an attribute and its value.
-	 * Content types also shall not have leading or trailing white spaces.
-	 * Package implementers shall create only such content types and shall
-	 * require such content types when retrieving a part from a package; format
-	 * designers shall specify only such content types for inclusion in the
-	 * format.
-	 */
-	public void testContentTypeValidationFailure() {
-		String[] contentTypesToTest = new String[] { "text/xml/app", "",
-				"test", "text(xml/xml", "text)xml/xml", "text<xml/xml",
-				"text>/xml", "text@/xml", "text,/xml", "text;/xml",
-				"text:/xml", "text\\/xml", "t/ext/xml", "t\"ext/xml",
-				"text[/xml", "text]/xml", "text?/xml", "tex=t/xml",
-				"te{xt/xml", "tex}t/xml", "te xt/xml",
-				"text" + (char) 9 + "/xml", "text xml", " text/xml " };
-		for (String contentType : contentTypesToTest) {
-			try {
-				new ContentType(contentType);
-			} catch (InvalidFormatException e) {
-				continue;
-			}
-			fail("Must have fail for content type: '" + contentType + "' !");
-		}
-	}
-
-   /**
-    * Parameters are allowed, provides that they meet the
-    *  criteria of rule [01.2]
-    * Invalid parameters are verified as incorrect in 
-    *  {@link #testContentTypeParameterFailure()}
-    */
-   public void testContentTypeParam() throws InvalidFormatException {
-      String[] contentTypesToTest = new String[] { "mail/toto;titi=tata",
-               "text/xml;a=b;c=d", "text/xml;key1=param1;key2=param2",
-               "application/pgp-key;version=\"2\"", 
-               "application/x-resqml+xml;version=2.0;type=obj_global2dCrs"
-      };
-      for (String contentType : contentTypesToTest) {
-          new ContentType(contentType);
-      }
-   }
-   
-	/**
-	 * Check rule [O1.2]: Format designers might restrict the usage of
-	 * parameters for content types.
-	 */
-	public void testContentTypeParameterFailure() {
-		String[] contentTypesToTest = new String[] { 
-		        "mail/toto;\"titi=tata\"", // quotes not allowed like that
-                "mail/toto;titi = tata", // spaces not allowed
-                "text/\u0080" // characters above ASCII are not allowed
-        };
-		for (String contentType : contentTypesToTest) {
-			try {
-				new ContentType(contentType);
-			} catch (InvalidFormatException e) {
-				continue;
-			}
-			fail("Must have fail for content type: '" + contentType + "' !");
-		}
-	}
-
-	/**
-	 * Check rule M1.15: The package implementer shall require a content type
-	 * that does not include comments and the format designer shall specify such
-	 * a content type.
-	 */
-	public void testContentTypeCommentFailure() {
-		String[] contentTypesToTest = new String[] { "text/xml(comment)" };
-		for (String contentType : contentTypesToTest) {
-			try {
-				new ContentType(contentType);
-			} catch (InvalidFormatException e) {
-				continue;
-			}
-			fail("Must have fail for content type: '" + contentType + "' !");
-		}
-	}
-	
-	/**
-	 * OOXML content types don't need entities, but we shouldn't
-	 * barf if we get one from a third party system that added them
-	 */
-	public void testFileWithContentTypeEntities() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("ContentTypeHasEntities.ooxml");
-        OPCPackage p = OPCPackage.open(is);
-        
-        // Check we found the contents of it
-        boolean foundCoreProps = false, foundDocument = false, foundTheme1 = false;
-        for (PackagePart part : p.getParts()) {
-            if (part.getPartName().toString().equals("/docProps/core.xml")) {
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, part.getContentType());
-                foundCoreProps = true;
-            }
-            if (part.getPartName().toString().equals("/word/document.xml")) {
-                assertEquals(XWPFRelation.DOCUMENT.getContentType(), part.getContentType());
-                foundDocument = true;
-            }
-            if (part.getPartName().toString().equals("/word/theme/theme1.xml")) {
-                assertEquals(XWPFRelation.THEME.getContentType(), part.getContentType());
-                foundTheme1 = true;
-            }
-        }
-        assertTrue("Core not found in " + p.getParts(), foundCoreProps);
-        assertTrue("Document not found in " + p.getParts(), foundDocument);
-        assertTrue("Theme1 not found in " + p.getParts(), foundTheme1);
-	}
-	
-	/**
-	 * Check that we can open a file where there are valid
-	 *  parameters on a content type
-	 */
-	public void testFileWithContentTypeParams() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("ContentTypeHasParameters.ooxml");
-
-        OPCPackage p = OPCPackage.open(is);
-        
-        final String typeResqml = "application/x-resqml+xml";
-        
-        // Check the types on everything
-        for (PackagePart part : p.getParts()) {
-            final String contentType = part.getContentType();
-            final ContentType details = part.getContentTypeDetails();
-            final int length = details.getParameterKeys().length;
-            final boolean hasParameters = details.hasParameters();
-
-            // _rels type doesn't have any params
-            if (part.isRelationshipPart()) {
-                assertEquals(ContentTypes.RELATIONSHIPS_PART, contentType);
-                assertEquals(ContentTypes.RELATIONSHIPS_PART, details.toString());
-                assertEquals(false, hasParameters);
-                assertEquals(0, length);
-            }
-            // Core type doesn't have any params
-            else if (part.getPartName().toString().equals("/docProps/core.xml")) {
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, contentType);
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, details.toString());
-                assertEquals(false, hasParameters);
-                assertEquals(0, length);
-            }
-            // Global Crs types do have params
-            else if (part.getPartName().toString().equals("/global1dCrs.xml")) {
-                assertTrue(part.getContentType().startsWith(typeResqml));
-                assertEquals(typeResqml, details.toString(false));
-                assertEquals(true, hasParameters);
-                assertContains("version=2.0", details.toString());
-                assertContains("type=obj_global1dCrs", details.toString());
-                assertEquals(2, length);
-                assertEquals("2.0", details.getParameter("version"));
-                assertEquals("obj_global1dCrs", details.getParameter("type"));
-            }
-            else if (part.getPartName().toString().equals("/global2dCrs.xml")) {
-                assertTrue(part.getContentType().startsWith(typeResqml));
-                assertEquals(typeResqml, details.toString(false));
-                assertEquals(true, hasParameters);
-                assertContains("version=2.0", details.toString());
-                assertContains("type=obj_global2dCrs", details.toString());
-                assertEquals(2, length);
-                assertEquals("2.0", details.getParameter("version"));
-                assertEquals("obj_global2dCrs", details.getParameter("type"));
-            }
-            // Other thingy
-            else if (part.getPartName().toString().equals("/myTestingGuid.xml")) {
-                assertTrue(part.getContentType().startsWith(typeResqml));
-                assertEquals(typeResqml, details.toString(false));
-                assertEquals(true, hasParameters);
-                assertContains("version=2.0", details.toString());
-                assertContains("type=obj_tectonicBoundaryFeature", details.toString());
-                assertEquals(2, length);
-                assertEquals("2.0", details.getParameter("version"));
-                assertEquals("obj_tectonicBoundaryFeature", details.getParameter("type"));
-            }
-            // That should be it!
-            else {
-                fail("Unexpected part " + part);
-            }
-        }
-    }
-
-    private static void assertContains(String needle, String haystack) {
-        assertTrue(haystack.contains(needle));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
deleted file mode 100644
index 72dc40c..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.TreeMap;
-
-import org.apache.poi.openxml4j.opc.internal.FileHelper;
-import org.junit.Test;
-
-/**
- * Test TestFileHelper class.
- *
- * @author Julien Chable
- */
-public final class TestFileHelper {
-
-	/**
-	 * TODO - use simple JDK methods on {@link File} instead:<br/>
-	 * {@link File#getParentFile()} instead of {@link FileHelper#getDirectory(File)
-	 * {@link File#getName()} instead of {@link FileHelper#getFilename(File)
-	 */
-    @Test
-	public void testGetDirectory() {
-		TreeMap<String, String> expectedValue = new TreeMap<String, String>();
-		expectedValue.put("/dir1/test.doc", "/dir1");
-		expectedValue.put("/dir1/dir2/test.doc.xml", "/dir1/dir2");
-
-		for (String filename : expectedValue.keySet()) {
-			File f1 = new File(expectedValue.get(filename));
-			File f2 = FileHelper.getDirectory(new File(filename));
-
-//			if (false) {
-//				// YK: The original version asserted expected values against File#getAbsolutePath():
-//				assertTrue(expectedValue.get(filename).equalsIgnoreCase(f2.getAbsolutePath()));
-//				// This comparison is platform dependent. A better approach is below
-//			}
-			assertTrue(f1.equals(f2));
-		}
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java
deleted file mode 100644
index 78294e3..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.TreeMap;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.POILogFactory;
-
-public final class TestListParts extends TestCase {
-    private static final POILogger logger = POILogFactory.getLogger(TestListParts.class);
-
-	private TreeMap<PackagePartName, String> expectedValues;
-
-	private TreeMap<PackagePartName, String> values;
-
-	@Override
-	protected void setUp() throws Exception {
-		values = new TreeMap<PackagePartName, String>();
-
-		// Expected values
-		expectedValues = new TreeMap<PackagePartName, String>();
-		expectedValues.put(PackagingURIHelper.createPartName("/_rels/.rels"),
-				"application/vnd.openxmlformats-package.relationships+xml");
-
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/docProps/app.xml"),
-						"application/vnd.openxmlformats-officedocument.extended-properties+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/docProps/core.xml"),
-				"application/vnd.openxmlformats-package.core-properties+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/word/_rels/document.xml.rels"),
-				"application/vnd.openxmlformats-package.relationships+xml");
-		expectedValues
-				.put(
-						PackagingURIHelper.createPartName("/word/document.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/word/fontTable.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/word/media/image1.gif"), "image/gif");
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/word/settings.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/word/styles.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/word/theme/theme1.xml"),
-				"application/vnd.openxmlformats-officedocument.theme+xml");
-		expectedValues
-				.put(
-						PackagingURIHelper
-								.createPartName("/word/webSettings.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml");
-	}
-
-	/**
-	 * List all parts of a package.
-	 */
-	public void testListParts() throws InvalidFormatException {
-		InputStream is = OpenXML4JTestDataSamples.openSampleStream("sample.docx");
-
-		OPCPackage p;
-		try {
-			p = OPCPackage.open(is);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		for (PackagePart part : p.getParts()) {
-			values.put(part.getPartName(), part.getContentType());
-			logger.log(POILogger.DEBUG, part.getPartName());
-		}
-
-		// Compare expected values with values return by the package
-		for (PackagePartName partName : expectedValues.keySet()) {
-			assertNotNull(values.get(partName));
-			assertEquals(expectedValues.get(partName), values.get(partName));
-		}
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
deleted file mode 100644
index 5f83bc5..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
+++ /dev/null
@@ -1,964 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.TreeMap;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POITestCase;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.UnsupportedFileFormatException;
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.ODFNotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.OLE2NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.opc.internal.ContentTypeManager;
-import org.apache.poi.openxml4j.opc.internal.FileHelper;
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.openxml4j.opc.internal.ZipHelper;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-public final class TestPackage {
-    private static final POILogger logger = POILogFactory.getLogger(TestPackage.class);
-
-	/**
-	 * Test that just opening and closing the file doesn't alter the document.
-	 */
-    @Test
-	public void openSave() throws IOException, InvalidFormatException {
-		String originalFile = OpenXML4JTestDataSamples.getSampleFileName("TestPackageCommon.docx");
-		File targetFile = OpenXML4JTestDataSamples.getOutputFile("TestPackageOpenSaveTMP.docx");
-
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(originalFile, PackageAccess.READ_WRITE);
-		try {
-    		p.save(targetFile.getAbsoluteFile());
-    
-    		// Compare the original and newly saved document
-    		assertTrue(targetFile.exists());
-    		ZipFileAssert.assertEquals(new File(originalFile), targetFile);
-    		assertTrue(targetFile.delete());
-		} finally {
-            // use revert to not re-write the input file
-            p.revert();
-		}
-	}
-
-	/**
-	 * Test that when we create a new Package, we give it
-	 *  the correct default content types
-	 * @throws IllegalAccessException 
-	 * @throws NoSuchFieldException 
-	 * @throws IllegalArgumentException 
-	 * @throws SecurityException 
-	 */
-    @Test
-	public void createGetsContentTypes()
-    throws IOException, InvalidFormatException, SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException {
-		File targetFile = OpenXML4JTestDataSamples.getOutputFile("TestCreatePackageTMP.docx");
-
-		// Zap the target file, in case of an earlier run
-		if(targetFile.exists()) {
-			assertTrue(targetFile.delete());
-		}
-
-		@SuppressWarnings("resource")
-        OPCPackage pkg = OPCPackage.create(targetFile);
-
-		// Check it has content types for rels and xml
-		ContentTypeManager ctm = getContentTypeManager(pkg);
-		assertEquals(
-				"application/xml",
-				ctm.getContentType(
-						PackagingURIHelper.createPartName("/foo.xml")
-				)
-		);
-		assertEquals(
-				ContentTypes.RELATIONSHIPS_PART,
-				ctm.getContentType(
-						PackagingURIHelper.createPartName("/foo.rels")
-				)
-		);
-		assertNull(
-				ctm.getContentType(
-						PackagingURIHelper.createPartName("/foo.txt")
-				)
-		);
-		
-		pkg.revert();
-	}
-
-	/**
-	 * Test package creation.
-	 */
-    @Test
-	public void createPackageAddPart() throws IOException, InvalidFormatException {
-		File targetFile = OpenXML4JTestDataSamples.getOutputFile("TestCreatePackageTMP.docx");
-
-		File expectedFile = OpenXML4JTestDataSamples.getSampleFile("TestCreatePackageOUTPUT.docx");
-
-        // Zap the target file, in case of an earlier run
-        if(targetFile.exists()) {
-			assertTrue(targetFile.delete());
-		}
-
-        // Create a package
-        OPCPackage pkg = OPCPackage.create(targetFile);
-        PackagePartName corePartName = PackagingURIHelper
-                .createPartName("/word/document.xml");
-
-        pkg.addRelationship(corePartName, TargetMode.INTERNAL,
-                PackageRelationshipTypes.CORE_DOCUMENT, "rId1");
-
-        PackagePart corePart = pkg
-                .createPart(
-                        corePartName,
-                        "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
-
-        Document doc = DocumentHelper.createDocument();
-        Element elDocument = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:document");
-        doc.appendChild(elDocument);
-        Element elBody = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:body");
-        elDocument.appendChild(elBody);
-        Element elParagraph = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:p");
-        elBody.appendChild(elParagraph);
-        Element elRun = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:r");
-        elParagraph.appendChild(elRun);
-        Element elText = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:t");
-        elRun.appendChild(elText);
-        elText.setTextContent("Hello Open XML !");
-
-        StreamHelper.saveXmlInStream(doc, corePart.getOutputStream());
-        pkg.close();
-
-        ZipFileAssert.assertEquals(expectedFile, targetFile);
-        assertTrue(targetFile.delete());
-	}
-
-	/**
-	 * Tests that we can create a new package, add a core
-	 *  document and another part, save and re-load and
-	 *  have everything setup as expected
-	 * @throws SAXException 
-	 */
-    @Test
-	public void createPackageWithCoreDocument() throws IOException, InvalidFormatException, URISyntaxException, SAXException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		OPCPackage pkg = OPCPackage.create(baos);
-
-		// Add a core document
-        PackagePartName corePartName = PackagingURIHelper.createPartName("/xl/workbook.xml");
-        // Create main part relationship
-        pkg.addRelationship(corePartName, TargetMode.INTERNAL, PackageRelationshipTypes.CORE_DOCUMENT, "rId1");
-        // Create main document part
-        PackagePart corePart = pkg.createPart(corePartName, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml");
-        // Put in some dummy content
-        OutputStream coreOut = corePart.getOutputStream();
-        coreOut.write("<dummy-xml />".getBytes("UTF-8"));
-        coreOut.close();
-
-		// And another bit
-        PackagePartName sheetPartName = PackagingURIHelper.createPartName("/xl/worksheets/sheet1.xml");
-        PackageRelationship rel =
-        	 corePart.addRelationship(sheetPartName, TargetMode.INTERNAL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet", "rSheet1");
-		assertNotNull(rel);
-
-        PackagePart part = pkg.createPart(sheetPartName, "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml");
-        assertNotNull(part);
-
-        // Dummy content again
-        coreOut = corePart.getOutputStream();
-        coreOut.write("<dummy-xml2 />".getBytes("UTF-8"));
-        coreOut.close();
-
-        //add a relationship with internal target: "#Sheet1!A1"
-        corePart.addRelationship(new URI("#Sheet1!A1"), TargetMode.INTERNAL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", "rId2");
-
-        // Check things are as expected
-        PackageRelationshipCollection coreRels =
-        	pkg.getRelationshipsByType(PackageRelationshipTypes.CORE_DOCUMENT);
-        assertEquals(1, coreRels.size());
-        PackageRelationship coreRel = coreRels.getRelationship(0);
-		assertNotNull(coreRel);
-        assertEquals("/", coreRel.getSourceURI().toString());
-        assertEquals("/xl/workbook.xml", coreRel.getTargetURI().toString());
-        assertNotNull(pkg.getPart(coreRel));
-
-
-        // Save and re-load
-        pkg.close();
-        File tmp = TempFile.createTempFile("testCreatePackageWithCoreDocument", ".zip");
-        OutputStream fout = new FileOutputStream(tmp);
-        try {
-            fout.write(baos.toByteArray());
-        } finally {
-            fout.close();
-        }
-        pkg = OPCPackage.open(tmp.getPath());
-        //tmp.delete();
-
-        try {
-            // Check still right
-            coreRels = pkg.getRelationshipsByType(PackageRelationshipTypes.CORE_DOCUMENT);
-            assertEquals(1, coreRels.size());
-            coreRel = coreRels.getRelationship(0);
-
-			assertNotNull(coreRel);
-            assertEquals("/", coreRel.getSourceURI().toString());
-            assertEquals("/xl/workbook.xml", coreRel.getTargetURI().toString());
-            corePart = pkg.getPart(coreRel);
-            assertNotNull(corePart);
-    
-            PackageRelationshipCollection rels = corePart.getRelationshipsByType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink");
-            assertEquals(1, rels.size());
-            rel = rels.getRelationship(0);
-			assertNotNull(rel);
-            assertEquals("Sheet1!A1", rel.getTargetURI().getRawFragment());
-    
-            assertMSCompatibility(pkg);
-        } finally {
-            pkg.close();
-        }
-    }
-
-    private void assertMSCompatibility(OPCPackage pkg) throws IOException, InvalidFormatException, SAXException {
-        PackagePartName relName = PackagingURIHelper.createPartName(PackageRelationship.getContainerPartRelationship());
-        PackagePart relPart = pkg.getPart(relName);
-
-        Document xmlRelationshipsDoc = DocumentHelper.readDocument(relPart.getInputStream());
-
-        Element root = xmlRelationshipsDoc.getDocumentElement();
-        NodeList nodeList = root.getElementsByTagName(PackageRelationship.RELATIONSHIP_TAG_NAME);
-        int nodeCount = nodeList.getLength();
-        for (int i = 0; i < nodeCount; i++) {
-            Element element = (Element) nodeList.item(i);
-            String value = element.getAttribute(PackageRelationship.TARGET_ATTRIBUTE_NAME);
-            assertTrue("Root target must not start with a leading slash ('/'): " + value, value.charAt(0) != '/');
-        }
-
-    }
-
-    /**
-	 * Test package opening.
-	 */
-    @Test
-	public void openPackage() throws IOException, InvalidFormatException {
-		File targetFile = OpenXML4JTestDataSamples.getOutputFile("TestOpenPackageTMP.docx");
-
-		File inputFile = OpenXML4JTestDataSamples.getSampleFile("TestOpenPackageINPUT.docx");
-
-		File expectedFile = OpenXML4JTestDataSamples.getSampleFile("TestOpenPackageOUTPUT.docx");
-
-		// Copy the input file in the output directory
-		FileHelper.copyFile(inputFile, targetFile);
-
-		// Create a package
-		OPCPackage pkg = OPCPackage.open(targetFile.getAbsolutePath());
-
-		// Modify core part
-		PackagePartName corePartName = PackagingURIHelper
-				.createPartName("/word/document.xml");
-
-		PackagePart corePart = pkg.getPart(corePartName);
-
-		// Delete some part to have a valid document
-		for (PackageRelationship rel : corePart.getRelationships()) {
-			corePart.removeRelationship(rel.getId());
-			pkg.removePart(PackagingURIHelper.createPartName(PackagingURIHelper
-					.resolvePartUri(corePart.getPartName().getURI(), rel
-							.getTargetURI())));
-		}
-
-		// Create a content
-		Document doc = DocumentHelper.createDocument();
-        Element elDocument = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:document");
-        doc.appendChild(elDocument);
-        Element elBody = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:body");
-        elDocument.appendChild(elBody);
-        Element elParagraph = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:p");
-        elBody.appendChild(elParagraph);
-        Element elRun = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:r");
-        elParagraph.appendChild(elRun);
-        Element elText = doc.createElementNS("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w:t");
-        elRun.appendChild(elText);
-        elText.setTextContent("Hello Open XML !");
-
-		StreamHelper.saveXmlInStream(doc, corePart.getOutputStream());
-
-		// Save and close
-		try {
-			pkg.close();
-		} catch (IOException e) {
-			fail();
-		}
-
-		ZipFileAssert.assertEquals(expectedFile, targetFile);
-		assertTrue(targetFile.delete());
-	}
-
-	/**
-	 * Checks that we can write a package to a simple
-	 *  OutputStream, in addition to the normal writing
-	 *  to a file
-	 */
-    @Test
-	public void saveToOutputStream() throws IOException, InvalidFormatException {
-		String originalFile = OpenXML4JTestDataSamples.getSampleFileName("TestPackageCommon.docx");
-		File targetFile = OpenXML4JTestDataSamples.getOutputFile("TestPackageOpenSaveTMP.docx");
-
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(originalFile, PackageAccess.READ_WRITE);
-		try {
-    		FileOutputStream fout = new FileOutputStream(targetFile);
-    		try {
-    		    p.save(fout);
-    		} finally {
-    		    fout.close();
-    		}
-    
-    		// Compare the original and newly saved document
-    		assertTrue(targetFile.exists());
-    		ZipFileAssert.assertEquals(new File(originalFile), targetFile);
-    		assertTrue(targetFile.delete());
-		} finally {
-		    // use revert to not re-write the input file
-		    p.revert();
-		}
-	}
-
-	/**
-	 * Checks that we can open+read a package from a
-	 *  simple InputStream, in addition to the normal
-	 *  reading from a file
-	 */
-    @Test
-	public void openFromInputStream() throws IOException, InvalidFormatException {
-		String originalFile = OpenXML4JTestDataSamples.getSampleFileName("TestPackageCommon.docx");
-
-		FileInputStream finp = new FileInputStream(originalFile);
-
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(finp);
-
-		assertNotNull(p);
-		assertNotNull(p.getRelationships());
-		assertEquals(12, p.getParts().size());
-
-		// Check it has the usual bits
-		assertTrue(p.hasRelationships());
-		assertTrue(p.containPart(PackagingURIHelper.createPartName("/_rels/.rels")));
-		
-		p.revert();
-		finp.close();
-	}
-
-    /**
-     * TODO: fix and enable
-     * @throws URISyntaxException 
-     */
-    @Test
-    @Ignore
-    public void removePartRecursive() throws IOException, InvalidFormatException, URISyntaxException {
-		String originalFile = OpenXML4JTestDataSamples.getSampleFileName("TestPackageCommon.docx");
-		File targetFile = OpenXML4JTestDataSamples.getOutputFile("TestPackageRemovePartRecursiveOUTPUT.docx");
-		File tempFile = OpenXML4JTestDataSamples.getOutputFile("TestPackageRemovePartRecursiveTMP.docx");
-
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(originalFile, PackageAccess.READ_WRITE);
-		p.removePartRecursive(PackagingURIHelper.createPartName(new URI(
-				"/word/document.xml")));
-		p.save(tempFile.getAbsoluteFile());
-
-		// Compare the original and newly saved document
-		assertTrue(targetFile.exists());
-		ZipFileAssert.assertEquals(targetFile, tempFile);
-		assertTrue(targetFile.delete());
-		
-		p.revert();
-	}
-
-    @Test
-	public void deletePart() throws InvalidFormatException {
-		TreeMap<PackagePartName, String> expectedValues;
-		TreeMap<PackagePartName, String> values;
-
-		values = new TreeMap<PackagePartName, String>();
-
-		// Expected values
-		expectedValues = new TreeMap<PackagePartName, String>();
-		expectedValues.put(PackagingURIHelper.createPartName("/_rels/.rels"),
-				"application/vnd.openxmlformats-package.relationships+xml");
-
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/docProps/app.xml"),
-						"application/vnd.openxmlformats-officedocument.extended-properties+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/docProps/core.xml"),
-				"application/vnd.openxmlformats-package.core-properties+xml");
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/word/fontTable.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/word/media/image1.gif"), "image/gif");
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/word/settings.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/word/styles.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/word/theme/theme1.xml"),
-				"application/vnd.openxmlformats-officedocument.theme+xml");
-		expectedValues
-				.put(
-						PackagingURIHelper
-								.createPartName("/word/webSettings.xml"),
-						"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml");
-
-		String filepath =  OpenXML4JTestDataSamples.getSampleFileName("sample.docx");
-
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(filepath, PackageAccess.READ_WRITE);
-		// Remove the core part
-		p.deletePart(PackagingURIHelper.createPartName("/word/document.xml"));
-
-		for (PackagePart part : p.getParts()) {
-			values.put(part.getPartName(), part.getContentType());
-			logger.log(POILogger.DEBUG, part.getPartName());
-		}
-
-		// Compare expected values with values return by the package
-		for (PackagePartName partName : expectedValues.keySet()) {
-			assertNotNull(values.get(partName));
-			assertEquals(expectedValues.get(partName), values.get(partName));
-		}
-		// Don't save modifications
-		p.revert();
-	}
-
-    @Test
-	public void deletePartRecursive() throws InvalidFormatException {
-		TreeMap<PackagePartName, String> expectedValues;
-		TreeMap<PackagePartName, String> values;
-
-		values = new TreeMap<PackagePartName, String>();
-
-		// Expected values
-		expectedValues = new TreeMap<PackagePartName, String>();
-		expectedValues.put(PackagingURIHelper.createPartName("/_rels/.rels"),
-				"application/vnd.openxmlformats-package.relationships+xml");
-
-		expectedValues
-				.put(PackagingURIHelper.createPartName("/docProps/app.xml"),
-						"application/vnd.openxmlformats-officedocument.extended-properties+xml");
-		expectedValues.put(PackagingURIHelper
-				.createPartName("/docProps/core.xml"),
-				"application/vnd.openxmlformats-package.core-properties+xml");
-
-		String filepath = OpenXML4JTestDataSamples.getSampleFileName("sample.docx");
-
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(filepath, PackageAccess.READ_WRITE);
-		// Remove the core part
-		p.deletePartRecursive(PackagingURIHelper.createPartName("/word/document.xml"));
-
-		for (PackagePart part : p.getParts()) {
-			values.put(part.getPartName(), part.getContentType());
-			logger.log(POILogger.DEBUG, part.getPartName());
-		}
-
-		// Compare expected values with values return by the package
-		for (PackagePartName partName : expectedValues.keySet()) {
-			assertNotNull(values.get(partName));
-			assertEquals(expectedValues.get(partName), values.get(partName));
-		}
-		// Don't save modifications
-		p.revert();
-	}
-	
-	/**
-	 * Test that we can open a file by path, and then
-	 *  write changes to it.
-	 */
-    @Test
-	public void openFileThenOverwrite() throws IOException, InvalidFormatException {
-        File tempFile = TempFile.createTempFile("poiTesting","tmp");
-        File origFile = OpenXML4JTestDataSamples.getSampleFile("TestPackageCommon.docx");
-        FileHelper.copyFile(origFile, tempFile);
-        
-        // Open the temp file
-        OPCPackage p = OPCPackage.open(tempFile.toString(), PackageAccess.READ_WRITE);
-        // Close it
-        p.close();
-        // Delete it
-        assertTrue(tempFile.delete());
-        
-        // Reset
-        FileHelper.copyFile(origFile, tempFile);
-        p = OPCPackage.open(tempFile.toString(), PackageAccess.READ_WRITE);
-        
-        // Save it to the same file - not allowed
-        try {
-            p.save(tempFile);
-            fail("You shouldn't be able to call save(File) to overwrite the current file");
-        } catch(InvalidOperationException e) {
-			// expected here
-		}
-
-        p.close();
-        // Delete it
-        assertTrue(tempFile.delete());
-        
-        
-        // Open it read only, then close and delete - allowed
-        FileHelper.copyFile(origFile, tempFile);
-        p = OPCPackage.open(tempFile.toString(), PackageAccess.READ);
-        p.close();
-        assertTrue(tempFile.delete());
-	}
-    /**
-     * Test that we can open a file by path, save it
-     *  to another file, then delete both
-     */
-    @Test
-    public void openFileThenSaveDelete() throws IOException, InvalidFormatException {
-        File tempFile = TempFile.createTempFile("poiTesting","tmp");
-        File tempFile2 = TempFile.createTempFile("poiTesting","tmp");
-        File origFile = OpenXML4JTestDataSamples.getSampleFile("TestPackageCommon.docx");
-        FileHelper.copyFile(origFile, tempFile);
-        
-        // Open the temp file
-        OPCPackage p = OPCPackage.open(tempFile.toString(), PackageAccess.READ_WRITE);
-
-        // Save it to a different file
-        p.save(tempFile2);
-        p.close();
-        
-        // Delete both the files
-        assertTrue(tempFile.delete());
-        assertTrue(tempFile2.delete());
-    }
-
-	private static ContentTypeManager getContentTypeManager(OPCPackage pkg) {
-	    return POITestCase.getFieldValue(OPCPackage.class, pkg, ContentTypeManager.class, "contentTypeManager");
-	}
-
-    @Test
-    public void getPartsByName() throws IOException, InvalidFormatException {
-        String filepath =  OpenXML4JTestDataSamples.getSampleFileName("sample.docx");
-
-        @SuppressWarnings("resource")
-        OPCPackage pkg = OPCPackage.open(filepath, PackageAccess.READ_WRITE);
-        try {
-            List<PackagePart> rs =  pkg.getPartsByName(Pattern.compile("/word/.*?\\.xml"));
-            HashMap<String, PackagePart>  selected = new HashMap<String, PackagePart>();
-    
-            for(PackagePart p : rs)
-                selected.put(p.getPartName().getName(), p);
-    
-            assertEquals(6, selected.size());
-            assertTrue(selected.containsKey("/word/document.xml"));
-            assertTrue(selected.containsKey("/word/fontTable.xml"));
-            assertTrue(selected.containsKey("/word/settings.xml"));
-            assertTrue(selected.containsKey("/word/styles.xml"));
-            assertTrue(selected.containsKey("/word/theme/theme1.xml"));
-            assertTrue(selected.containsKey("/word/webSettings.xml"));
-        } finally {
-            // use revert to not re-write the input file
-            pkg.revert();
-        }
-    }
-    
-    @Test
-    public void getPartSize() throws IOException, InvalidFormatException {
-       String filepath =  OpenXML4JTestDataSamples.getSampleFileName("sample.docx");
-       OPCPackage pkg = OPCPackage.open(filepath, PackageAccess.READ);
-       try {
-           int checked = 0;
-           for (PackagePart part : pkg.getParts()) {
-              // Can get the size of zip parts
-              if (part.getPartName().getName().equals("/word/document.xml")) {
-                 checked++;
-                 assertEquals(ZipPackagePart.class, part.getClass());
-                 assertEquals(6031L, part.getSize());
-              }
-              if (part.getPartName().getName().equals("/word/fontTable.xml")) {
-                 checked++;
-                 assertEquals(ZipPackagePart.class, part.getClass());
-                 assertEquals(1312L, part.getSize());
-              }
-              
-              // But not from the others
-              if (part.getPartName().getName().equals("/docProps/core.xml")) {
-                 checked++;
-                 assertEquals(PackagePropertiesPart.class, part.getClass());
-                 assertEquals(-1, part.getSize());
-              }
-           }
-           // Ensure we actually found the parts we want to check
-           assertEquals(3, checked);
-       } finally {
-           pkg.close();
-       }
-    }
-
-    @Test
-    public void replaceContentType()
-    throws IOException, InvalidFormatException, SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("sample.xlsx");
-        @SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(is);
-
-        ContentTypeManager mgr = getContentTypeManager(p);
-
-        assertTrue(mgr.isContentTypeRegister("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"));
-        assertFalse(mgr.isContentTypeRegister("application/vnd.ms-excel.sheet.macroEnabled.main+xml"));
-
-        assertTrue(
-                p.replaceContentType(
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
-                "application/vnd.ms-excel.sheet.macroEnabled.main+xml")
-        );
-
-        assertFalse(mgr.isContentTypeRegister("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"));
-        assertTrue(mgr.isContentTypeRegister("application/vnd.ms-excel.sheet.macroEnabled.main+xml"));
-        p.revert();
-        is.close();
-    }
-    
-    /**
-     * Verify we give helpful exceptions (or as best we can) when
-     *  supplied with non-OOXML file types (eg OLE2, ODF)
-     */
-    @Test
-    public void NonOOXMLFileTypes() throws Exception {
-        // Spreadsheet has a good mix of alternate file types
-        POIDataSamples files = POIDataSamples.getSpreadSheetInstance();
-        
-        // OLE2 - Stream
-        try {
-			InputStream stream = files.openResourceAsStream("SampleSS.xls");
-			try {
-				OPCPackage.open(stream);
-			} finally {
-				stream.close();
-			}
-            fail("Shouldn't be able to open OLE2");
-        } catch (OLE2NotOfficeXmlFileException e) {
-            assertTrue(e.getMessage().contains("The supplied data appears to be in the OLE2 Format"));
-            assertTrue(e.getMessage().contains("You are calling the part of POI that deals with OOXML"));
-        }
-        // OLE2 - File
-        try {
-            OPCPackage.open(files.getFile("SampleSS.xls"));
-            fail("Shouldn't be able to open OLE2");
-        } catch (OLE2NotOfficeXmlFileException e) {
-            assertTrue(e.getMessage().contains("The supplied data appears to be in the OLE2 Format"));
-            assertTrue(e.getMessage().contains("You are calling the part of POI that deals with OOXML"));
-        }
-        
-        // Raw XML - Stream
-        try {
-			InputStream stream = files.openResourceAsStream("SampleSS.xml");
-			try {
-				OPCPackage.open(stream);
-			} finally {
-				stream.close();
-			}
-            fail("Shouldn't be able to open XML");
-        } catch (NotOfficeXmlFileException e) {
-            assertTrue(e.getMessage().contains("The supplied data appears to be a raw XML file"));
-            assertTrue(e.getMessage().contains("Formats such as Office 2003 XML"));
-        }
-        // Raw XML - File
-        try {
-            OPCPackage.open(files.getFile("SampleSS.xml"));
-            fail("Shouldn't be able to open XML");
-        } catch (NotOfficeXmlFileException e) {
-            assertTrue(e.getMessage().contains("The supplied data appears to be a raw XML file"));
-            assertTrue(e.getMessage().contains("Formats such as Office 2003 XML"));
-        }
-        
-        // ODF / ODS - Stream
-        try {
-			InputStream stream = files.openResourceAsStream("SampleSS.ods");
-			try {
-				OPCPackage.open(stream);
-			} finally {
-				stream.close();
-			}
-            fail("Shouldn't be able to open ODS");
-        } catch (ODFNotOfficeXmlFileException e) {
-            assertTrue(e.toString().contains("The supplied data appears to be in ODF"));
-            assertTrue(e.toString().contains("Formats like these (eg ODS"));
-        }
-        // ODF / ODS - File
-        try {
-            OPCPackage.open(files.getFile("SampleSS.ods"));
-            fail("Shouldn't be able to open ODS");
-        } catch (ODFNotOfficeXmlFileException e) {
-            assertTrue(e.toString().contains("The supplied data appears to be in ODF"));
-            assertTrue(e.toString().contains("Formats like these (eg ODS"));
-        }
-        
-        // Plain Text - Stream
-        try {
-			InputStream stream = files.openResourceAsStream("SampleSS.txt");
-			try {
-				OPCPackage.open(stream);
-			} finally {
-				stream.close();
-			}
-            fail("Shouldn't be able to open Plain Text");
-        } catch (NotOfficeXmlFileException e) {
-            assertTrue(e.getMessage().contains("No valid entries or contents found"));
-            assertTrue(e.getMessage().contains("not a valid OOXML"));
-        }
-        // Plain Text - File
-        try {
-            OPCPackage.open(files.getFile("SampleSS.txt"));
-            fail("Shouldn't be able to open Plain Text");
-        } catch (UnsupportedFileFormatException e) {
-            // Unhelpful low-level error, sorry
-        }
-    }
-
-    @Test(expected=IOException.class)
-    public void zipBombCreateAndHandle()
-    throws IOException, EncryptedDocumentException, InvalidFormatException {
-        // #50090 / #56865
-        ZipFile zipFile = ZipHelper.openZipFile(OpenXML4JTestDataSamples.getSampleFile("sample.xlsx"));
-		assertNotNull(zipFile);
-
-		ByteArrayOutputStream bos = new ByteArrayOutputStream(2500000);
-		ZipOutputStream append = new ZipOutputStream(bos);
-		// first, copy contents from existing war
-        Enumeration<? extends ZipEntry> entries = zipFile.entries();
-        while (entries.hasMoreElements()) {
-            ZipEntry e2 = entries.nextElement();
-            ZipEntry e = new ZipEntry(e2.getName());
-            e.setTime(e2.getTime());
-            e.setComment(e2.getComment());
-            e.setSize(e2.getSize());
-            
-            append.putNextEntry(e);
-            if (!e.isDirectory()) {
-                InputStream is = zipFile.getInputStream(e);
-                if (e.getName().equals("[Content_Types].xml")) {
-                    ByteArrayOutputStream bos2 = new ByteArrayOutputStream();
-                    IOUtils.copy(is, bos2);
-                    long size = bos2.size()-"</Types>".length();
-                    append.write(bos2.toByteArray(), 0, (int)size);
-                    byte spam[] = new byte[0x7FFF];
-                    for (int i=0; i<spam.length; i++) spam[i] = ' ';
-                    // 0x7FFF0000 is the maximum for 32-bit zips, but less still works
-                    while (size < 0x7FFF00) {
-                        append.write(spam);
-                        size += spam.length;
-                    }
-                    append.write("</Types>".getBytes("UTF-8"));
-                    size += 8;
-                    e.setSize(size);
-                } else {
-                    IOUtils.copy(is, append);
-                }
-                is.close();
-            }
-            append.closeEntry();
-        }
-        
-        append.close();
-        zipFile.close();
-
-        byte buf[] = bos.toByteArray();
-		//noinspection UnusedAssignment
-		bos = null;
-        
-        Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(buf));
-        wb.getSheetAt(0);
-        wb.close();
-        zipFile.close();
-    }
-    
-    @Test
-    public void zipBombCheckSizes()
-    throws IOException, EncryptedDocumentException, InvalidFormatException {
-        File file = OpenXML4JTestDataSamples.getSampleFile("sample.xlsx");
-
-        try {
-            double min_ratio = Double.MAX_VALUE;
-            long max_size = 0;
-            ZipFile zf = ZipHelper.openZipFile(file);
-			assertNotNull(zf);
-            Enumeration<? extends ZipEntry> entries = zf.entries();
-            while (entries.hasMoreElements()) {
-                ZipEntry ze = entries.nextElement();
-                double ratio = (double)ze.getCompressedSize() / (double)ze.getSize();
-                min_ratio = Math.min(min_ratio, ratio);
-                max_size = Math.max(max_size, ze.getSize());
-            }
-            zf.close();
-    
-            // use values close to, but within the limits 
-            ZipSecureFile.setMinInflateRatio(min_ratio-0.002);
-			assertEquals(min_ratio-0.002, ZipSecureFile.getMinInflateRatio(), 0.00001);
-            ZipSecureFile.setMaxEntrySize(max_size+1);
-			assertEquals(max_size+1, ZipSecureFile.getMaxEntrySize());
-			
-            WorkbookFactory.create(file, null, true).close();
-    
-            // check ratio out of bounds
-            ZipSecureFile.setMinInflateRatio(min_ratio+0.002);
-            try {
-                WorkbookFactory.create(file, null, true).close();
-                // this is a bit strange, as there will be different exceptions thrown
-                // depending if this executed via "ant test" or within eclipse
-                // maybe a difference in JDK ...
-            } catch (InvalidFormatException e) {
-                checkForZipBombException(e);
-            } catch (POIXMLException e) {
-                checkForZipBombException(e);
-            }
-    
-            // check max entry size ouf of bounds
-            ZipSecureFile.setMinInflateRatio(min_ratio-0.002);
-            ZipSecureFile.setMaxEntrySize(max_size-1);
-            try {
-                WorkbookFactory.create(file, null, true).close();
-            } catch (InvalidFormatException e) {
-                checkForZipBombException(e);
-            } catch (POIXMLException e) {
-                checkForZipBombException(e);
-            }
-        } finally {
-            // reset otherwise a lot of ooxml tests will fail
-            ZipSecureFile.setMinInflateRatio(0.01d);
-            ZipSecureFile.setMaxEntrySize(0xFFFFFFFFL);
-        }
-    }
-
-    private void checkForZipBombException(Throwable e) {
-        if(e instanceof InvocationTargetException) {
-            InvocationTargetException t = (InvocationTargetException)e;
-            IOException t2 = (IOException)t.getTargetException();
-            if(t2.getMessage().startsWith("Zip bomb detected!")) {
-                return;
-            }
-        }
-        
-        String msg = e.getMessage();
-        if(msg != null && msg.startsWith("Zip bomb detected!")) {
-            return;
-        }
-        
-        // recursively check the causes for the message as it can be nested further down in the exception-tree
-        if(e.getCause() != null && e.getCause() != e) {
-            checkForZipBombException(e.getCause());
-            return;
-        }
-
-        throw new IllegalStateException("Expected to catch an Exception because of a detected Zip Bomb, but did not find the related error message in the exception", e);        
-    }
-
-    @Test
-    public void testConstructors() throws IOException {
-        // verify the various ways to construct a ZipSecureFile
-        File file = OpenXML4JTestDataSamples.getSampleFile("sample.xlsx");
-        ZipSecureFile zipFile = new ZipSecureFile(file);
-        assertNotNull(zipFile.getName());
-        zipFile.close();
-
-        zipFile = new ZipSecureFile(file, ZipFile.OPEN_READ);
-        assertNotNull(zipFile.getName());
-        zipFile.close();
-
-        zipFile = new ZipSecureFile(file.getAbsolutePath());
-        assertNotNull(zipFile.getName());
-        zipFile.close();
-    }
-
-    @Test
-    public void testMaxTextSize() {
-        long before = ZipSecureFile.getMaxTextSize();
-        try {
-            ZipSecureFile.setMaxTextSize(12345);
-            assertEquals(12345, ZipSecureFile.getMaxTextSize());
-        } finally {
-            ZipSecureFile.setMaxTextSize(before);
-        }
-    }
-    
-    // bug 60128
-    @Test
-    public void testCorruptFile() throws IOException {
-        OPCPackage pkg = null;
-        File file = OpenXML4JTestDataSamples.getSampleFile("invalid.xlsx");
-        try {
-            pkg = OPCPackage.open(file, PackageAccess.READ);
-        } catch (Exception e) {
-            System.out.println(e.getClass().getName());
-            System.out.println(e.getMessage());
-            e.printStackTrace();
-        } finally {
-            if (pkg != null) {
-                pkg.close();
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
deleted file mode 100644
index b29d21f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.openxml4j.util.Nullable;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty;
-
-public final class TestPackageCoreProperties {
-	/**
-	 * Test package core properties getters.
-	 */
-    @Test
-	public void testGetProperties() throws Exception {
-		// Open the package
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(OpenXML4JTestDataSamples.openSampleStream("TestPackageCoreProperiesGetters.docx"));
-		compareProperties(p);
-		p.revert();
-	}
-
-	/**
-	 * Test package core properties setters.
-	 */
-    @Test
-    public void testSetProperties() throws Exception {
-		String inputPath = OpenXML4JTestDataSamples.getSampleFileName("TestPackageCoreProperiesSetters.docx");
-
-		File outputFile = OpenXML4JTestDataSamples.getOutputFile("TestPackageCoreProperiesSettersOUTPUT.docx");
-
-		// Open package
-		@SuppressWarnings("resource")
-        OPCPackage p = OPCPackage.open(inputPath, PackageAccess.READ_WRITE);
-		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
-        df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-		Date dateToInsert = df.parse("2007-05-12T08:00:00Z", new ParsePosition(0));
-
-        SimpleDateFormat msdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ROOT);
-        msdf.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-
-		PackageProperties props = p.getPackageProperties();
-
-        //test various date formats
-        props.setCreatedProperty("2007-05-12T08:00:00Z");
-        assertEquals(dateToInsert, props.getCreatedProperty().getValue());
-
-        props.setCreatedProperty("2007-05-12T08:00:00"); //no Z, assume Z
-        assertEquals(dateToInsert, props.getCreatedProperty().getValue());
-
-        props.setCreatedProperty("2007-05-12T08:00:00.123Z");//millis
-        assertEquals(msdf.parse("2007-05-12T08:00:00.123Z"), props.getCreatedProperty().getValue());
-
-        props.setCreatedProperty("2007-05-12T10:00:00+0200");
-        assertEquals(dateToInsert, props.getCreatedProperty().getValue());
-
-        props.setCreatedProperty("2007-05-12T10:00:00+02:00");//colon in tz
-        assertEquals(dateToInsert, props.getCreatedProperty().getValue());
-
-        props.setCreatedProperty("2007-05-12T06:00:00-0200");
-        assertEquals(dateToInsert, props.getCreatedProperty().getValue());
-
-        props.setCreatedProperty("2015-07-27");
-        assertEquals(msdf.parse("2015-07-27T00:00:00.000Z"), props.getCreatedProperty().getValue());
-
-        props.setCreatedProperty("2007-05-12T10:00:00.123+0200");
-        assertEquals(msdf.parse("2007-05-12T08:00:00.123Z"), props.getCreatedProperty().getValue());
-
-        props.setCategoryProperty("MyCategory");
-		props.setContentStatusProperty("MyContentStatus");
-		props.setContentTypeProperty("MyContentType");
-		props.setCreatorProperty("MyCreator");
-		props.setDescriptionProperty("MyDescription");
-		props.setIdentifierProperty("MyIdentifier");
-		props.setKeywordsProperty("MyKeywords");
-		props.setLanguageProperty("MyLanguage");
-		props.setLastModifiedByProperty("Julien Chable");
-		props.setLastPrintedProperty(new Nullable<Date>(dateToInsert));
-		props.setModifiedProperty(new Nullable<Date>(dateToInsert));
-		props.setRevisionProperty("2");
-		props.setTitleProperty("MyTitle");
-		props.setSubjectProperty("MySubject");
-		props.setVersionProperty("2");
-		// Save the package in the output directory
-		p.save(outputFile);
-        p.revert();
-
-		// Open the newly created file to check core properties saved values.
-		@SuppressWarnings("resource")
-        OPCPackage p2 = OPCPackage.open(outputFile.getAbsolutePath(), PackageAccess.READ);
-	    compareProperties(p2);
-	    p2.revert();
-		outputFile.delete();
-	}
-
-	private void compareProperties(OPCPackage p) throws InvalidFormatException {
-		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
-		df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-		Date expectedDate = df.parse("2007-05-12T08:00:00Z", new ParsePosition(0));
-
-		// Gets the core properties
-		PackageProperties props = p.getPackageProperties();
-		assertEquals("MyCategory", props.getCategoryProperty().getValue());
-		assertEquals("MyContentStatus", props.getContentStatusProperty().getValue());
-		assertEquals("MyContentType", props.getContentTypeProperty().getValue());
-		assertEquals(expectedDate, props.getCreatedProperty().getValue());
-		assertEquals("MyCreator", props.getCreatorProperty().getValue());
-		assertEquals("MyDescription", props.getDescriptionProperty().getValue());
-		assertEquals("MyIdentifier", props.getIdentifierProperty().getValue());
-		assertEquals("MyKeywords", props.getKeywordsProperty().getValue());
-		assertEquals("MyLanguage", props.getLanguageProperty().getValue());
-		assertEquals("Julien Chable", props.getLastModifiedByProperty().getValue());
-		assertEquals(expectedDate, props.getLastPrintedProperty().getValue());
-		assertEquals(expectedDate, props.getModifiedProperty().getValue());
-		assertEquals("2", props.getRevisionProperty().getValue());
-		assertEquals("MySubject", props.getSubjectProperty().getValue());
-		assertEquals("MyTitle", props.getTitleProperty().getValue());
-		assertEquals("2", props.getVersionProperty().getValue());
-	}
-
-	@Test
-	public void testCoreProperties_bug51374() throws Exception {
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
-        df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-        String strDate = "2007-05-12T08:00:00Z";
-        Date date = df.parse(strDate);
-
-        OPCPackage pkg = new ZipPackage();
-        PackagePropertiesPart props = (PackagePropertiesPart)pkg.getPackageProperties();
-
-        // created
-        assertEquals("", props.getCreatedPropertyString());
-        assertNull(props.getCreatedProperty().getValue());
-        props.setCreatedProperty((String)null);
-        assertEquals("", props.getCreatedPropertyString());
-        assertNull(props.getCreatedProperty().getValue());
-        props.setCreatedProperty(new Nullable<Date>());
-        assertEquals("", props.getCreatedPropertyString());
-        assertNull(props.getCreatedProperty().getValue());
-        props.setCreatedProperty(new Nullable<Date>(date));
-        assertEquals(strDate, props.getCreatedPropertyString());
-        assertEquals(date, props.getCreatedProperty().getValue());
-        props.setCreatedProperty(strDate);
-        assertEquals(strDate, props.getCreatedPropertyString());
-        assertEquals(date, props.getCreatedProperty().getValue());
-
-        // lastPrinted
-        assertEquals("", props.getLastPrintedPropertyString());
-        assertNull(props.getLastPrintedProperty().getValue());
-        props.setLastPrintedProperty((String)null);
-        assertEquals("", props.getLastPrintedPropertyString());
-        assertNull(props.getLastPrintedProperty().getValue());
-        props.setLastPrintedProperty(new Nullable<Date>());
-        assertEquals("", props.getLastPrintedPropertyString());
-        assertNull(props.getLastPrintedProperty().getValue());
-        props.setLastPrintedProperty(new Nullable<Date>(date));
-        assertEquals(strDate, props.getLastPrintedPropertyString());
-        assertEquals(date, props.getLastPrintedProperty().getValue());
-        props.setLastPrintedProperty(strDate);
-        assertEquals(strDate, props.getLastPrintedPropertyString());
-        assertEquals(date, props.getLastPrintedProperty().getValue());
-
-        // modified
-        assertNull(props.getModifiedProperty().getValue());
-        props.setModifiedProperty((String)null);
-        assertNull(props.getModifiedProperty().getValue());
-        props.setModifiedProperty(new Nullable<Date>());
-        assertNull(props.getModifiedProperty().getValue());
-        props.setModifiedProperty(new Nullable<Date>(date));
-        assertEquals(strDate, props.getModifiedPropertyString());
-        assertEquals(date, props.getModifiedProperty().getValue());
-        props.setModifiedProperty(strDate);
-        assertEquals(strDate, props.getModifiedPropertyString());
-        assertEquals(date, props.getModifiedProperty().getValue());
-        
-        // Tidy
-        pkg.close();
-    }
-
-	@Test
-	public void testGetPropertiesLO() throws Exception {
-        // Open the package
-        OPCPackage pkg1 = OPCPackage.open(OpenXML4JTestDataSamples.openSampleStream("51444.xlsx"));
-        PackageProperties props1 = pkg1.getPackageProperties();
-        assertEquals(null, props1.getTitleProperty().getValue());
-        props1.setTitleProperty("Bug 51444 fixed");
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        pkg1.save(out);
-        out.close();
-        pkg1.close();
-
-        OPCPackage pkg2 = OPCPackage.open(new ByteArrayInputStream(out.toByteArray()));
-        PackageProperties props2 = pkg2.getPackageProperties();
-        props2.setTitleProperty("Bug 51444 fixed");
-        pkg2.close();
-    }
-
-	@Test
-	public void testEntitiesInCoreProps_56164() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("CorePropertiesHasEntities.ooxml");
-        OPCPackage p = OPCPackage.open(is);
-        is.close();
-
-        // Should have 3 root relationships
-        boolean foundDocRel = false, foundCorePropRel = false, foundExtPropRel = false;
-        for (PackageRelationship pr : p.getRelationships()) {
-            if (pr.getRelationshipType().equals(PackageRelationshipTypes.CORE_DOCUMENT))
-                foundDocRel = true;
-            if (pr.getRelationshipType().equals(PackageRelationshipTypes.CORE_PROPERTIES))
-                foundCorePropRel = true;
-            if (pr.getRelationshipType().equals(PackageRelationshipTypes.EXTENDED_PROPERTIES))
-                foundExtPropRel = true;
-        }
-        assertTrue("Core/Doc Relationship not found in " + p.getRelationships(), foundDocRel);
-        assertTrue("Core Props Relationship not found in " + p.getRelationships(), foundCorePropRel);
-        assertTrue("Ext Props Relationship not found in " + p.getRelationships(), foundExtPropRel);
-
-        // Get the Core Properties
-        PackagePropertiesPart props = (PackagePropertiesPart)p.getPackageProperties();
-        
-        // Check
-        assertEquals("Stefan Kopf", props.getCreatorProperty().getValue());
-        
-        p.close();
-    }
-    
-	@Test
-	public void testListOfCustomProperties() throws Exception {
-        File inp = POIDataSamples.getSpreadSheetInstance().getFile("ExcelWithAttachments.xlsm");
-        OPCPackage pkg = OPCPackage.open(inp, PackageAccess.READ);
-        XSSFWorkbook wb = new XSSFWorkbook(pkg);
-        
-        assertNotNull(wb.getProperties());
-        assertNotNull(wb.getProperties().getCustomProperties());
-        
-        for (CTProperty prop : wb.getProperties().getCustomProperties().getUnderlyingProperties().getPropertyList()) {
-            assertNotNull(prop);
-        }
-        
-        wb.close();
-        pkg.close();
-    }
-	
-	@Test
-	public void testAlternateCorePropertyTimezones() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("OPCCompliance_CoreProperties_AlternateTimezones.docx");
-        OPCPackage pkg = OPCPackage.open(is);
-        PackagePropertiesPart props = (PackagePropertiesPart)pkg.getPackageProperties();
-        is.close();
-        
-        // We need predictable dates for testing!
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ROOT);
-        df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-
-        // Check text properties first
-        assertEquals("Lorem Ipsum", props.getTitleProperty().getValue());
-        assertEquals("Apache POI", props.getCreatorProperty().getValue());
-        
-        // Created at has a +3 timezone and milliseconds
-        //   2006-10-13T18:06:00.123+03:00
-        // = 2006-10-13T15:06:00.123+00:00
-        assertEquals("2006-10-13T15:06:00Z", props.getCreatedPropertyString());
-        assertEquals("2006-10-13T15:06:00.123Z", df.format(props.getCreatedProperty().getValue()));
-        
-        // Modified at has a -13 timezone but no milliseconds
-        //   2007-06-20T07:59:00-13:00
-        // = 2007-06-20T20:59:00-13:00
-        assertEquals("2007-06-20T20:59:00Z", props.getModifiedPropertyString());
-        assertEquals("2007-06-20T20:59:00.000Z", df.format(props.getModifiedProperty().getValue()));
-        
-        
-        // Ensure we can change them with other timezones and still read back OK
-        props.setCreatedProperty("2007-06-20T20:57:00+13:00");
-        props.setModifiedProperty("2007-06-20T20:59:00.123-13:00");
-        
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        pkg.save(baos);
-        pkg = OPCPackage.open(new ByteArrayInputStream(baos.toByteArray()));
-        
-        // Check text properties first - should be unchanged
-        assertEquals("Lorem Ipsum", props.getTitleProperty().getValue());
-        assertEquals("Apache POI", props.getCreatorProperty().getValue());
-        
-        // Check the updated times
-        //   2007-06-20T20:57:00+13:00
-        // = 2007-06-20T07:57:00Z
-        assertEquals("2007-06-20T07:57:00.000Z", df.format(props.getCreatedProperty().getValue()));
-        
-        //   2007-06-20T20:59:00.123-13:00
-        // = 2007-06-21T09:59:00.123Z
-        assertEquals("2007-06-21T09:59:00.123Z", df.format(props.getModifiedProperty().getValue()));
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java
deleted file mode 100644
index ed9b900..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-
-import junit.framework.TestCase;
-
-public final class TestPackagePartName extends TestCase {
-
-	/**
-	 * Test method getExtension().
-	 */
-	public void testGetExtension() throws Exception{
-		PackagePartName name1 = PackagingURIHelper.createPartName("/doc/props/document.xml");
-		PackagePartName name2 = PackagingURIHelper.createPartName("/root/document");
-		assertEquals("xml", name1.getExtension());
-		assertEquals("", name2.getExtension());
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
deleted file mode 100644
index 432bd89..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-
-/**
- * Test the addition of thumbnail in a package.
- * 
- * @author Julien Chable
- */
-public final class TestPackageThumbnail extends TestCase {
-
-	/**
-	 * Test package addThumbnail() method.
-	 */
-	public void testSetProperties() throws Exception {
-		String inputPath = OpenXML4JTestDataSamples.getSampleFileName("TestPackageThumbnail.docx");
-
-		String imagePath = OpenXML4JTestDataSamples.getSampleFileName("thumbnail.jpg");
-
-		File outputFile = OpenXML4JTestDataSamples.getOutputFile("TestPackageThumbnailOUTPUT.docx");
-
-		// Open package
-		OPCPackage p = OPCPackage.open(inputPath, PackageAccess.READ_WRITE);
-		try {
-    		p.addThumbnail(imagePath);
-    		// Save the package in the output directory
-    		p.save(outputFile);
-    
-    		// Open the newly created file to check core properties saved values.
-    		OPCPackage p2 = OPCPackage.open(outputFile.getAbsolutePath(), PackageAccess.READ);
-    		try {
-        		if (p2.getRelationshipsByType(PackageRelationshipTypes.THUMBNAIL)
-        				.size() == 0)
-        			fail("Thumbnail not added to the package !");
-    		} finally {
-    		    p2.revert();
-    		    p2.close();
-    		}
-		} finally {
-		    p.revert();
-		    outputFile.delete();
-		}
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
deleted file mode 100644
index 39ab5ed..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.openxml4j.opc;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-
-public class TestPackagingURIHelper extends TestCase {
-
-	/**
-	 * Test relativizePartName() method.
-	 */
-	public void testRelativizeURI() throws Exception {
-		URI uri1 = new URI("/word/document.xml");
-		URI uri2 = new URI("/word/media/image1.gif");
-        URI uri3 = new URI("/word/media/image1.gif#Sheet1!A1");
-        URI uri4 = new URI("#'My%20Sheet1'!A1");
-
-		// Document to image is down a directory
-		URI retURI1to2 = PackagingURIHelper.relativizeURI(uri1, uri2);
-		assertEquals("media/image1.gif", retURI1to2.getPath());
-		// Image to document is up a directory
-		URI retURI2to1 = PackagingURIHelper.relativizeURI(uri2, uri1);
-		assertEquals("../document.xml", retURI2to1.getPath());
-		
-		// Document and CustomXML parts totally different [Julien C.]
-		URI uriCustomXml = new URI("/customXml/item1.xml");
-		URI uriRes = PackagingURIHelper.relativizeURI(uri1, uriCustomXml);
-		assertEquals("../customXml/item1.xml", uriRes.toString());
-
-		// Document to itself is the same place (empty URI)
-		URI retURI2 = PackagingURIHelper.relativizeURI(uri1, uri1);
-		// YK: the line below used to assert empty string which is wrong
-        // if source and target are the same they should be relaitivized as the last segment,
-        // see Bugzilla 51187
-        assertEquals("document.xml", retURI2.getPath());
-
-		// relativization against root
-		URI root = new URI("/");
-        uriRes = PackagingURIHelper.relativizeURI(root, uri1);
-        assertEquals("/word/document.xml", uriRes.toString());
-
-        //URI compatible with MS Office and OpenOffice: leading slash is removed
-        uriRes = PackagingURIHelper.relativizeURI(root, uri1, true);
-        assertEquals("word/document.xml", uriRes.toString());
-
-        //preserve URI fragments
-        uriRes = PackagingURIHelper.relativizeURI(uri1, uri3, true);
-        assertEquals("media/image1.gif#Sheet1!A1", uriRes.toString());
-        uriRes = PackagingURIHelper.relativizeURI(root, uri4, true);
-        assertEquals("#'My%20Sheet1'!A1", uriRes.toString());
-    }
-
-	/**
-	 * Test createPartName(String, y)
-	 */
-	public void testCreatePartNameRelativeString()
-			throws InvalidFormatException {
-		PackagePartName partNameToValid = PackagingURIHelper
-				.createPartName("/word/media/image1.gif");
-
-		OPCPackage pkg = OPCPackage.create("DELETEIFEXISTS.docx");
-		// Base part
-		PackagePartName nameBase = PackagingURIHelper
-				.createPartName("/word/document.xml");
-		PackagePart partBase = pkg.createPart(nameBase, ContentTypes.XML);
-		// Relative part name
-		PackagePartName relativeName = PackagingURIHelper.createPartName(
-				"media/image1.gif", partBase);
-		assertTrue("The part name must be equal to "
-				+ partNameToValid.getName(), partNameToValid
-				.equals(relativeName));
-		pkg.revert();
-	}
-
-	/**
-	 * Test createPartName(URI, y)
-	 */
-	public void testCreatePartNameRelativeURI() throws Exception {
-		PackagePartName partNameToValid = PackagingURIHelper
-				.createPartName("/word/media/image1.gif");
-
-		OPCPackage pkg = OPCPackage.create("DELETEIFEXISTS.docx");
-		// Base part
-		PackagePartName nameBase = PackagingURIHelper
-				.createPartName("/word/document.xml");
-		PackagePart partBase = pkg.createPart(nameBase, ContentTypes.XML);
-		// Relative part name
-		PackagePartName relativeName = PackagingURIHelper.createPartName(
-				new URI("media/image1.gif"), partBase);
-		assertTrue("The part name must be equal to "
-				+ partNameToValid.getName(), partNameToValid
-				.equals(relativeName));
-		pkg.revert();
-	}
-
-    public void testCreateURIFromString() throws Exception {
-        String[] href = {
-                "..\\\\\\cygwin\\home\\yegor\\.vim\\filetype.vim",
-                "..\\Program%20Files\\AGEIA%20Technologies\\v2.3.3\\NxCooking.dll",
-                "file:///D:\\seva\\1981\\r810102ns.mp3",
-                "..\\cygwin\\home\\yegor\\dinom\\%5baccess%5d.2010-10-26.log",
-                "#'Instructions (Text)'!B21",
-                "javascript://"
-        };
-        for(String s : href){
-            try {
-                URI uri = PackagingURIHelper.toURI(s);
-            } catch (URISyntaxException e){
-                fail("Failed to create URI from " + s);
-            }
-        }
-    }
-
-    public void test53734() throws Exception {
-        URI uri = PackagingURIHelper.toURI("javascript://");
-        // POI appends a trailing slash tpo avoid "Expected authority at index 13: javascript://"
-        // https://issues.apache.org/bugzilla/show_bug.cgi?id=53734
-        assertEquals("javascript:///", uri.toASCIIString());
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
deleted file mode 100644
index cf485ed..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-
-
-public class TestRelationships extends TestCase {
-	private static final String HYPERLINK_REL_TYPE =
-		"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
-	private static final String COMMENTS_REL_TYPE =
-		"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";
-	private static final String SHEET_WITH_COMMENTS =
-		"/xl/worksheets/sheet1.xml";
-
-    private static final POILogger logger = POILogFactory.getLogger(TestPackageCoreProperties.class);
-
-    /**
-     * Test relationships are correctly loaded. This at the moment fails (as of r499)
-     * whenever a document is loaded before its correspondig .rels file has been found.
-     * The code in this case assumes there are no relationships defined, but it should
-     * really look also for not yet loaded parts.
-     */
-    public void testLoadRelationships() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("sample.xlsx");
-        OPCPackage pkg = OPCPackage.open(is);
-        logger.log(POILogger.DEBUG, "1: " + pkg);
-        PackageRelationshipCollection rels = pkg.getRelationshipsByType(PackageRelationshipTypes.CORE_DOCUMENT);
-        PackageRelationship coreDocRelationship = rels.getRelationship(0);
-        PackagePart corePart = pkg.getPart(coreDocRelationship);
-        String relIds[] = { "rId1", "rId2", "rId3" };
-        for (String relId : relIds) {
-            PackageRelationship rel = corePart.getRelationship(relId);
-            assertNotNull(rel);
-            PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
-            PackagePart sheetPart = pkg.getPart(relName);
-            assertEquals("Number of relationships1 for " + sheetPart.getPartName(), 1, sheetPart.getRelationships().size());
-        }
-    }
-    
-    /**
-     * Checks that we can fetch a collection of relations by
-     *  type, then grab from within there by id
-     */
-    public void testFetchFromCollection() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("ExcelWithHyperlinks.xlsx");
-        OPCPackage pkg = OPCPackage.open(is);
-        PackagePart sheet = pkg.getPart(
-        		PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
-        assertNotNull(sheet);
-        
-        assertTrue(sheet.hasRelationships());
-        assertEquals(6, sheet.getRelationships().size());
-        
-        // Should have three hyperlinks, and one comment
-        PackageRelationshipCollection hyperlinks =
-        	sheet.getRelationshipsByType(HYPERLINK_REL_TYPE);
-        PackageRelationshipCollection comments =
-        	sheet.getRelationshipsByType(COMMENTS_REL_TYPE);
-        assertEquals(3, hyperlinks.size());
-        assertEquals(1, comments.size());
-        
-        // Check we can get bits out by id
-        // Hyperlinks are rId1, rId2 and rId3
-        // Comment is rId6
-        assertNotNull(hyperlinks.getRelationshipByID("rId1"));
-        assertNotNull(hyperlinks.getRelationshipByID("rId2"));
-        assertNotNull(hyperlinks.getRelationshipByID("rId3"));
-        assertNull(hyperlinks.getRelationshipByID("rId6"));
-        
-        assertNull(comments.getRelationshipByID("rId1"));
-        assertNull(comments.getRelationshipByID("rId2"));
-        assertNull(comments.getRelationshipByID("rId3"));
-        assertNotNull(comments.getRelationshipByID("rId6"));
-        
-        assertNotNull(sheet.getRelationship("rId1"));
-        assertNotNull(sheet.getRelationship("rId2"));
-        assertNotNull(sheet.getRelationship("rId3"));
-        assertNotNull(sheet.getRelationship("rId6"));
-    }
-    
-    /**
-     * Excel uses relations on sheets to store the details of 
-     *  external hyperlinks. Check we can load these ok.
-     */
-    public void testLoadExcelHyperlinkRelations() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("ExcelWithHyperlinks.xlsx");
-        OPCPackage pkg = OPCPackage.open(is);
-	    PackagePart sheet = pkg.getPart(
-	    		PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
-	    assertNotNull(sheet);
-
-	    // rId1 is url
-	    PackageRelationship url = sheet.getRelationship("rId1");
-	    assertNotNull(url);
-	    assertEquals("rId1", url.getId());
-	    assertEquals("/xl/worksheets/sheet1.xml", url.getSourceURI().toString());
-	    assertEquals("http://poi.apache.org/", url.getTargetURI().toString());
-	    
-	    // rId2 is file
-	    PackageRelationship file = sheet.getRelationship("rId2");
-	    assertNotNull(file);
-	    assertEquals("rId2", file.getId());
-	    assertEquals("/xl/worksheets/sheet1.xml", file.getSourceURI().toString());
-	    assertEquals("WithVariousData.xlsx", file.getTargetURI().toString());
-	    
-	    // rId3 is mailto
-	    PackageRelationship mailto = sheet.getRelationship("rId3");
-	    assertNotNull(mailto);
-	    assertEquals("rId3", mailto.getId());
-	    assertEquals("/xl/worksheets/sheet1.xml", mailto.getSourceURI().toString());
-	    assertEquals("mailto:dev@poi.apache.org?subject=XSSF%20Hyperlinks", mailto.getTargetURI().toString());
-    }
-    
-    /*
-     * Excel uses relations on sheets to store the details of 
-     *  external hyperlinks. Check we can create these OK, 
-     *  then still read them later
-     */
-    public void testCreateExcelHyperlinkRelations() throws Exception {
-    	String filepath = OpenXML4JTestDataSamples.getSampleFileName("ExcelWithHyperlinks.xlsx");
-	    OPCPackage pkg = OPCPackage.open(filepath, PackageAccess.READ_WRITE);
-	    PackagePart sheet = pkg.getPart(
-	    		PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
-	    assertNotNull(sheet);
-	    
-	    assertEquals(3, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
-	    
-	    // Add three new ones
-	    PackageRelationship openxml4j =
-	    	sheet.addExternalRelationship("http://www.openxml4j.org/", HYPERLINK_REL_TYPE);
-	    PackageRelationship sf =
-	    	sheet.addExternalRelationship("http://openxml4j.sf.net/", HYPERLINK_REL_TYPE);
-	    PackageRelationship file =
-	    	sheet.addExternalRelationship("MyDocument.docx", HYPERLINK_REL_TYPE);
-	    
-	    // Check they were added properly
-	    assertNotNull(openxml4j);
-	    assertNotNull(sf);
-	    assertNotNull(file);
-	    
-	    assertEquals(6, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
-	    
-	    assertEquals("http://www.openxml4j.org/", openxml4j.getTargetURI().toString());
-	    assertEquals("/xl/worksheets/sheet1.xml", openxml4j.getSourceURI().toString());
-	    assertEquals(HYPERLINK_REL_TYPE, openxml4j.getRelationshipType());
-	    
-	    assertEquals("http://openxml4j.sf.net/", sf.getTargetURI().toString());
-	    assertEquals("/xl/worksheets/sheet1.xml", sf.getSourceURI().toString());
-	    assertEquals(HYPERLINK_REL_TYPE, sf.getRelationshipType());
-	    
-	    assertEquals("MyDocument.docx", file.getTargetURI().toString());
-	    assertEquals("/xl/worksheets/sheet1.xml", file.getSourceURI().toString());
-	    assertEquals(HYPERLINK_REL_TYPE, file.getRelationshipType());
-	    
-	    // Will get ids 7, 8 and 9, as we already have 1-6
-	    assertEquals("rId7", openxml4j.getId());
-	    assertEquals("rId8", sf.getId());
-	    assertEquals("rId9", file.getId());
-	    
-	    
-	    // Write out and re-load
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    pkg.save(baos);
-        
-	    // use revert to not re-write the input file
-        pkg.revert();
-
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-	    pkg = OPCPackage.open(bais);
-	    
-	    // Check again
-	    sheet = pkg.getPart(
-	    		PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
-	    
-	    assertEquals(6, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
-	    
-	    assertEquals("http://poi.apache.org/",
-	    		sheet.getRelationship("rId1").getTargetURI().toString());
-	    assertEquals("mailto:dev@poi.apache.org?subject=XSSF%20Hyperlinks",
-	    		sheet.getRelationship("rId3").getTargetURI().toString());
-	    
-	    assertEquals("http://www.openxml4j.org/",
-	    		sheet.getRelationship("rId7").getTargetURI().toString());
-	    assertEquals("http://openxml4j.sf.net/",
-	    		sheet.getRelationship("rId8").getTargetURI().toString());
-	    assertEquals("MyDocument.docx",
-	    		sheet.getRelationship("rId9").getTargetURI().toString());
-    }
-
-    public void testCreateRelationsFromScratch() throws Exception {
-    	ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    	OPCPackage pkg = OPCPackage.create(baos);
-    	
-    	PackagePart partA =
-    		pkg.createPart(PackagingURIHelper.createPartName("/partA"), "text/plain");
-    	PackagePart partB =
-    		pkg.createPart(PackagingURIHelper.createPartName("/partB"), "image/png");
-    	assertNotNull(partA);
-    	assertNotNull(partB);
-    	
-    	// Internal
-    	partA.addRelationship(partB.getPartName(), TargetMode.INTERNAL, "http://example/Rel");
-    	
-    	// External
-    	partA.addExternalRelationship("http://poi.apache.org/", "http://example/poi");
-    	partB.addExternalRelationship("http://poi.apache.org/ss/", "http://example/poi/ss");
-
-    	// Check as expected currently
-    	assertEquals("/partB", partA.getRelationship("rId1").getTargetURI().toString());
-    	assertEquals("http://poi.apache.org/", 
-    			partA.getRelationship("rId2").getTargetURI().toString());
-    	assertEquals("http://poi.apache.org/ss/", 
-    			partB.getRelationship("rId1").getTargetURI().toString());
-    	
-    	
-    	// Save, and re-load
-    	pkg.close();
-    	ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    	pkg = OPCPackage.open(bais);
-    	
-    	partA = pkg.getPart(PackagingURIHelper.createPartName("/partA"));
-    	partB = pkg.getPart(PackagingURIHelper.createPartName("/partB"));
-    	
-    	
-    	// Check the relations
-    	assertEquals(2, partA.getRelationships().size());
-    	assertEquals(1, partB.getRelationships().size());
-    	
-    	assertEquals("/partB", partA.getRelationship("rId1").getTargetURI().toString());
-    	assertEquals("http://poi.apache.org/", 
-    			partA.getRelationship("rId2").getTargetURI().toString());
-    	assertEquals("http://poi.apache.org/ss/", 
-    			partB.getRelationship("rId1").getTargetURI().toString());
-    	// Check core too
-    	assertEquals("/docProps/core.xml",
-    			pkg.getRelationshipsByType("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties").getRelationship(0).getTargetURI().toString());
-    	
-    	
-    	// Add some more
-      partB.addExternalRelationship("http://poi.apache.org/new", "http://example/poi/new");
-      partB.addExternalRelationship("http://poi.apache.org/alt", "http://example/poi/alt");
-      
-      // Check the relations
-      assertEquals(2, partA.getRelationships().size());
-      assertEquals(3, partB.getRelationships().size());
-      
-      assertEquals("/partB", partA.getRelationship("rId1").getTargetURI().toString());
-      assertEquals("http://poi.apache.org/", 
-            partA.getRelationship("rId2").getTargetURI().toString());
-      assertEquals("http://poi.apache.org/ss/", 
-            partB.getRelationship("rId1").getTargetURI().toString());
-      assertEquals("http://poi.apache.org/new", 
-            partB.getRelationship("rId2").getTargetURI().toString());
-      assertEquals("http://poi.apache.org/alt", 
-            partB.getRelationship("rId3").getTargetURI().toString());
-    }
-
-
-    public void testTargetWithSpecialChars() throws Exception{
-        OPCPackage pkg;
-
-        String filepath = OpenXML4JTestDataSamples.getSampleFileName("50154.xlsx");
-        pkg = OPCPackage.open(filepath);
-        assert_50154(pkg);
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        pkg.save(baos);
-
-        // use revert to not re-write the input file
-        pkg.revert();
-
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        pkg = OPCPackage.open(bais);
-
-        assert_50154(pkg);
-    }
-
-    public void assert_50154(OPCPackage pkg) throws Exception {
-        URI drawingURI = new URI("/xl/drawings/drawing1.xml");
-        PackagePart drawingPart = pkg.getPart(PackagingURIHelper.createPartName(drawingURI));
-        PackageRelationshipCollection drawingRels = drawingPart.getRelationships();
-
-        assertEquals(6, drawingRels.size());
-
-        // expected one image
-        assertEquals(1, drawingPart.getRelationshipsByType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image").size());
-        // and three hyperlinks
-        assertEquals(5, drawingPart.getRelationshipsByType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink").size());
-
-        PackageRelationship rId1 = drawingPart.getRelationship("rId1");
-        URI parent = drawingPart.getPartName().getURI();
-        URI rel1 = parent.relativize(rId1.getTargetURI());
-        URI rel11 = PackagingURIHelper.relativizeURI(drawingPart.getPartName().getURI(), rId1.getTargetURI());
-        assertEquals("'Another Sheet'!A1", rel1.getFragment());
-        assertEquals("'Another Sheet'!A1", rel11.getFragment());
-
-        PackageRelationship rId2 = drawingPart.getRelationship("rId2");
-        URI rel2 = PackagingURIHelper.relativizeURI(drawingPart.getPartName().getURI(), rId2.getTargetURI());
-        assertEquals("../media/image1.png", rel2.getPath());
-
-        PackageRelationship rId3 = drawingPart.getRelationship("rId3");
-        URI rel3 = parent.relativize(rId3.getTargetURI());
-        assertEquals("ThirdSheet!A1", rel3.getFragment());
-
-        PackageRelationship rId4 = drawingPart.getRelationship("rId4");
-        URI rel4 = parent.relativize(rId4.getTargetURI());
-        assertEquals("'\u0410\u043F\u0430\u0447\u0435 \u041F\u041E\u0418'!A1", rel4.getFragment());
-
-        PackageRelationship rId5 = drawingPart.getRelationship("rId5");
-        URI rel5 = parent.relativize(rId5.getTargetURI());
-        // back slashed have been replaced with forward
-        assertEquals("file:///D:/chan-chan.mp3", rel5.toString());
-
-        PackageRelationship rId6 = drawingPart.getRelationship("rId6");
-        URI rel6 = parent.relativize(rId6.getTargetURI());
-        assertEquals("../../../../../../../cygwin/home/yegor/dinom/&&&[access].2010-10-26.log", rel6.getPath());
-        assertEquals("'\u0410\u043F\u0430\u0447\u0435 \u041F\u041E\u0418'!A5", rel6.getFragment());
-    }
-
-   public void testSelfRelations_bug51187() throws Exception {
-    	ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    	OPCPackage pkg = OPCPackage.create(baos);
-
-    	PackagePart partA =
-    		pkg.createPart(PackagingURIHelper.createPartName("/partA"), "text/plain");
-    	assertNotNull(partA);
-
-    	// reference itself
-    	PackageRelationship rel1 = partA.addRelationship(partA.getPartName(), TargetMode.INTERNAL, "partA");
-
-    	
-    	// Save, and re-load
-    	pkg.close();
-    	ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    	pkg = OPCPackage.open(bais);
-
-    	partA = pkg.getPart(PackagingURIHelper.createPartName("/partA"));
-
-
-    	// Check the relations
-    	assertEquals(1, partA.getRelationships().size());
-
-       PackageRelationship rel2 = partA.getRelationships().getRelationship(0);
-
-    	assertEquals(rel1.getRelationshipType(), rel2.getRelationshipType());
-       assertEquals(rel1.getId(), rel2.getId());
-       assertEquals(rel1.getSourceURI(), rel2.getSourceURI());
-       assertEquals(rel1.getTargetURI(), rel2.getTargetURI());
-       assertEquals(rel1.getTargetMode(), rel2.getTargetMode());
-    }
-
-    public void testTrailingSpacesInURI_53282() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("53282.xlsx");
-        OPCPackage pkg = OPCPackage.open(is);
-        is.close();
-
-        PackageRelationshipCollection sheetRels = pkg.getPartsByName(Pattern.compile("/xl/worksheets/sheet1.xml")).get(0).getRelationships();
-        assertEquals(3, sheetRels.size());
-        PackageRelationship rId1 = sheetRels.getRelationshipByID("rId1");
-        assertEquals(TargetMode.EXTERNAL, rId1.getTargetMode());
-        URI targetUri = rId1.getTargetURI();
-        assertEquals("mailto:nobody@nowhere.uk%C2%A0", targetUri.toASCIIString());
-        assertEquals("nobody@nowhere.uk\u00A0", targetUri.getSchemeSpecificPart());
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        pkg.save(out);
-        out.close();
-
-        pkg =  OPCPackage.open(new ByteArrayInputStream(out.toByteArray()));
-        sheetRels = pkg.getPartsByName(Pattern.compile("/xl/worksheets/sheet1.xml")).get(0).getRelationships();
-        assertEquals(3, sheetRels.size());
-        rId1 = sheetRels.getRelationshipByID("rId1");
-        assertEquals(TargetMode.EXTERNAL, rId1.getTargetMode());
-        targetUri = rId1.getTargetURI();
-        assertEquals("mailto:nobody@nowhere.uk%C2%A0", targetUri.toASCIIString());
-        assertEquals("nobody@nowhere.uk\u00A0", targetUri.getSchemeSpecificPart());
-    }
-    
-    public void testEntitiesInRels_56164() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("PackageRelsHasEntities.ooxml");
-        OPCPackage p = OPCPackage.open(is);
-        is.close();
-
-        // Should have 3 root relationships
-        boolean foundDocRel = false, foundCorePropRel = false, foundExtPropRel = false;
-        for (PackageRelationship pr : p.getRelationships()) {
-            if (pr.getRelationshipType().equals(PackageRelationshipTypes.CORE_DOCUMENT))
-                foundDocRel = true;
-            if (pr.getRelationshipType().equals(PackageRelationshipTypes.CORE_PROPERTIES))
-                foundCorePropRel = true;
-            if (pr.getRelationshipType().equals(PackageRelationshipTypes.EXTENDED_PROPERTIES))
-                foundExtPropRel = true;
-        }
-        assertTrue("Core/Doc Relationship not found in " + p.getRelationships(), foundDocRel);
-        assertTrue("Core Props Relationship not found in " + p.getRelationships(), foundCorePropRel);
-        assertTrue("Ext Props Relationship not found in " + p.getRelationships(), foundExtPropRel);
-        
-        // Should have normal work parts
-        boolean foundCoreProps = false, foundDocument = false, foundTheme1 = false;
-        for (PackagePart part : p.getParts()) {
-            if (part.getPartName().toString().equals("/docProps/core.xml")) {
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, part.getContentType());
-                foundCoreProps = true;
-            }
-            if (part.getPartName().toString().equals("/word/document.xml")) {
-                assertEquals(XWPFRelation.DOCUMENT.getContentType(), part.getContentType());
-                foundDocument = true;
-            }
-            if (part.getPartName().toString().equals("/word/theme/theme1.xml")) {
-                assertEquals(XWPFRelation.THEME.getContentType(), part.getContentType());
-                foundTheme1 = true;
-            }
-        }
-        assertTrue("Core not found in " + p.getParts(), foundCoreProps);
-        assertTrue("Document not found in " + p.getParts(), foundDocument);
-        assertTrue("Theme1 not found in " + p.getParts(), foundTheme1);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestZipPackage.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestZipPackage.java
deleted file mode 100644
index 0989d10..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestZipPackage.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.ODFNotOfficeXmlFileException;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFRelation;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Test;
-
-public class TestZipPackage {
-    @Test
-    public void testBug56479() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("dcterms_bug_56479.zip");
-        OPCPackage p = OPCPackage.open(is);
-        
-        // Check we found the contents of it
-        boolean foundCoreProps = false, foundDocument = false, foundTheme1 = false;
-        for (PackagePart part : p.getParts()) {
-            if (part.getPartName().toString().equals("/docProps/core.xml")) {
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, part.getContentType());
-                foundCoreProps = true;
-            }
-            if (part.getPartName().toString().equals("/word/document.xml")) {
-                assertEquals(XWPFRelation.DOCUMENT.getContentType(), part.getContentType());
-                foundDocument = true;
-            }
-            if (part.getPartName().toString().equals("/word/theme/theme1.xml")) {
-                assertEquals(XWPFRelation.THEME.getContentType(), part.getContentType());
-                foundTheme1 = true;
-            }
-        }
-        assertTrue("Core not found in " + p.getParts(), foundCoreProps);
-        assertFalse("Document should not be found in " + p.getParts(), foundDocument);
-        assertFalse("Theme1 should not found in " + p.getParts(), foundTheme1);
-        p.close();
-        is.close();
-    }
-
-    @Test
-    public void testZipEntityExpansionTerminates() throws IOException {
-        try {
-            Workbook wb = XSSFTestDataSamples.openSampleWorkbook("poc-xmlbomb.xlsx");
-            wb.close();
-            fail("Should catch exception due to entity expansion limitations");
-        } catch (POIXMLException e) {
-            assertEntityLimitReached(e);
-        }
-    }
-
-    private void assertEntityLimitReached(Exception e) throws UnsupportedEncodingException {
-        ByteArrayOutputStream str = new ByteArrayOutputStream();
-        PrintWriter writer = new PrintWriter(new OutputStreamWriter(str, "UTF-8"));
-        try {
-            e.printStackTrace(writer);
-        } finally {
-            writer.close();
-        }
-        String string = new String(str.toByteArray(), "UTF-8");
-        assertTrue("Had: " + string, string.contains("The parser has encountered more than"));
-    }
-
-    @Test
-    public void testZipEntityExpansionExceedsMemory() throws Exception {
-        try {
-            Workbook wb = WorkbookFactory.create(XSSFTestDataSamples.openSamplePackage("poc-xmlbomb.xlsx"));
-            wb.close();
-            fail("Should catch exception due to entity expansion limitations");
-        } catch (POIXMLException e) {
-            assertEntityLimitReached(e);
-        }
-
-        try {
-            POITextExtractor extractor = ExtractorFactory.createExtractor(HSSFTestDataSamples.getSampleFile("poc-xmlbomb.xlsx"));
-            try  {
-                assertNotNull(extractor);
-    
-                try {
-                    extractor.getText();
-                } catch (IllegalStateException e) {
-                    // expected due to shared strings expansion
-                }
-            } finally {
-                extractor.close();
-            }
-        } catch (POIXMLException e) {
-            assertEntityLimitReached(e);
-        }
-    }
-
-    @Test
-    public void testZipEntityExpansionSharedStringTable() throws Exception {
-        Workbook wb = WorkbookFactory.create(XSSFTestDataSamples.openSamplePackage("poc-shared-strings.xlsx"));
-        wb.close();
-        
-        POITextExtractor extractor = ExtractorFactory.createExtractor(HSSFTestDataSamples.getSampleFile("poc-shared-strings.xlsx"));
-        try  {
-            assertNotNull(extractor);
-
-            try {
-                extractor.getText();
-            } catch (IllegalStateException e) {
-                // expected due to shared strings expansion
-            }
-        } finally {
-            extractor.close();
-        }
-    }
-
-    @Test
-    public void testZipEntityExpansionSharedStringTableEvents() throws Exception {
-        boolean before = ExtractorFactory.getThreadPrefersEventExtractors();
-        ExtractorFactory.setThreadPrefersEventExtractors(true);
-        try {
-            POITextExtractor extractor = ExtractorFactory.createExtractor(HSSFTestDataSamples.getSampleFile("poc-shared-strings.xlsx"));
-            try  {
-                assertNotNull(extractor);
-    
-                try {
-                    extractor.getText();
-                } catch (IllegalStateException e) {
-                    // expected due to shared strings expansion
-                }
-            } finally {
-                extractor.close();
-            }
-        } catch (XmlException e) {
-            assertEntityLimitReached(e);
-        } finally {
-            ExtractorFactory.setThreadPrefersEventExtractors(before);
-        }
-    }
-    
-    @Test
-    public void unparseableCentralDirectory() throws IOException {
-        File f = OpenXML4JTestDataSamples.getSampleFile("at.pzp.www_uploads_media_PP_Scheinecker-jdk6error.pptx");
-        SlideShow<?,?> ppt = SlideShowFactory.create(f, null, true);
-        ppt.close();
-    }
-
-    @Test
-    public void testClosingStreamOnException() throws IOException {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("dcterms_bug_56479.zip");
-        File tmp = File.createTempFile("poi-test-truncated-zip", "");
-        // create a corrupted zip file by truncating a valid zip file to the first 100 bytes
-        OutputStream os = new FileOutputStream(tmp);
-        for (int i = 0; i < 100; i++) {
-            os.write(is.read());
-        }
-        os.flush();
-        os.close();
-        is.close();
-
-        // feed the corrupted zip file to OPCPackage
-        try {
-            OPCPackage.open(tmp, PackageAccess.READ);
-        } catch (Exception e) {
-            // expected: the zip file is invalid
-            // this test does not care if open() throws an exception or not.
-        }
-        // If the stream is not closed on exception, it will keep a file descriptor to tmp,
-        // and requests to the OS to delete the file will fail.
-        assertTrue("Can't delete tmp file", tmp.delete());
-    }
-    
-    /**
-     * If ZipPackage is passed an invalid file, a call to close
-     *  (eg from the OPCPackage open method) should tidy up the
-     *  stream / file the broken file is being read from.
-     * See bug #60128 for more
-     */
-    @Test
-    public void testTidyStreamOnInvalidFile() throws Exception {
-        // Spreadsheet has a good mix of alternate file types
-        POIDataSamples files = POIDataSamples.getSpreadSheetInstance();
-        
-        File[] notValidF = new File[] {
-                files.getFile("SampleSS.ods"), files.getFile("SampleSS.txt")
-        };
-        InputStream[] notValidS = new InputStream[] {
-                files.openResourceAsStream("SampleSS.ods"), files.openResourceAsStream("SampleSS.txt")
-        };
-
-        for (File notValid : notValidF) {
-            ZipPackage pkg = new ZipPackage(notValid, PackageAccess.READ);
-            assertNotNull(pkg.getZipArchive());
-            assertFalse(pkg.getZipArchive().isClosed());
-            try {
-                pkg.getParts();
-                fail("Shouldn't work");
-            } catch (ODFNotOfficeXmlFileException e) {
-            } catch (NotOfficeXmlFileException ne) {}
-            pkg.close();
-            
-            assertNotNull(pkg.getZipArchive());
-            assertTrue(pkg.getZipArchive().isClosed());
-        }
-        for (InputStream notValid : notValidS) {
-            ZipPackage pkg = new ZipPackage(notValid, PackageAccess.READ);
-            assertNotNull(pkg.getZipArchive());
-            assertFalse(pkg.getZipArchive().isClosed());
-            try {
-                pkg.getParts();
-                fail("Shouldn't work");
-            } catch (ODFNotOfficeXmlFileException e) {
-            } catch (NotOfficeXmlFileException ne) {}
-            pkg.close();
-            
-            assertNotNull(pkg.getZipArchive());
-            assertTrue(pkg.getZipArchive().isClosed());
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java
deleted file mode 100644
index c59be45..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
-/**
- * Compare the contents of 2 zip files.
- * 
- * @author CDubettier
- */
-public class ZipFileAssert {
-	private ZipFileAssert() {
-	}
-
-	static final int BUFFER_SIZE = 2048;
-
-	protected static boolean equals(
-			TreeMap<String, ByteArrayOutputStream> file1,
-			TreeMap<String, ByteArrayOutputStream> file2) {
-		Set listFile1 = file1.keySet();
-		if (listFile1.size() == file2.keySet().size()) {
-			for (Iterator iter = listFile1.iterator(); iter.hasNext();) {
-				String fileName = (String) iter.next();
-				// extract the contents for both
-				ByteArrayOutputStream contain2 = file2.get(fileName);
-				ByteArrayOutputStream contain1 = file1.get(fileName);
-
-				if (contain2 == null) {
-					// file not found in archive 2
-					Assert.fail(fileName + " not found in 2nd zip");
-					return false;
-				}
-				// no need to check for contain1. The key come from it
-
-				if ((fileName.endsWith(".xml")) || fileName.endsWith(".rels")) {
-					// we have a xml file
-                    // TODO
-                    // YK: the original OpenXML4J version attempted to compare xml using xmlunit (http://xmlunit.sourceforge.net),
-                    // but POI does not depend on this library
-                } else {
-					// not xml, may be an image or other binary format
-					if (contain2.size() != contain1.size()) {
-						// not the same size
-						Assert.fail(fileName
-								+ " does not have the same size in both zip:"
-								+ contain2.size() + "!=" + contain1.size());
-						return false;
-					}
-					byte array1[] = contain1.toByteArray();
-					byte array2[] = contain2.toByteArray();
-					for (int i = 0; i < array1.length; i++) {
-						if (array1[i] != array2[i]) {
-							Assert.fail(fileName + " differ at index:" + i);
-							return false;
-						}
-					}
-				}
-			}
-		} else {
-			// not the same number of files -> cannot be equals
-			Assert.fail("not the same number of files in zip:"
-					+ listFile1.size() + "!=" + file2.keySet().size());
-			return false;
-		}
-		return true;
-	}
-
-	protected static TreeMap<String, ByteArrayOutputStream> decompress(
-			File filename) throws IOException {
-		// store the zip content in memory
-		// let s assume it is not Go ;-)
-		TreeMap<String, ByteArrayOutputStream> zipContent = new TreeMap<String, ByteArrayOutputStream>();
-
-		byte data[] = new byte[BUFFER_SIZE];
-		/* Open file to decompress */
-		FileInputStream file_decompress = new FileInputStream(filename);
-
-		/* Create a buffer for the decompressed files */
-		BufferedInputStream buffi = new BufferedInputStream(file_decompress);
-
-		/* Open the file with the buffer */
-		ZipInputStream zis = new ZipInputStream(buffi);
-
-		/* Processing entries of the zip file */
-		ZipEntry entree;
-		int count;
-		while ((entree = zis.getNextEntry()) != null) {
-
-			/* Create a array for the current entry */
-			ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
-			zipContent.put(entree.getName(), byteArray);
-
-			/* copy in memory */
-			while ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {
-				byteArray.write(data, 0, count);
-			}
-			/* Flush the buffer */
-			byteArray.flush();
-			byteArray.close();
-		}
-
-		zis.close();
-
-		return zipContent;
-	}
-
-	/**
-	 * Asserts that two files are equal. Throws an <tt>AssertionFailedError</tt>
-	 * if they are not.
-	 * <p>
-	 * 
-	 */
-	public static void assertEquals(File expected, File actual) {
-		Assert.assertNotNull(expected);
-		Assert.assertNotNull(actual);
-
-		Assert.assertTrue("File does not exist [" + expected.getAbsolutePath()
-				+ "]", expected.exists());
-		Assert.assertTrue("File does not exist [" + actual.getAbsolutePath()
-				+ "]", actual.exists());
-
-		Assert.assertTrue("Expected file not readable", expected.canRead());
-		Assert.assertTrue("Actual file not readable", actual.canRead());
-
-		try {
-			TreeMap<String, ByteArrayOutputStream> file1 = decompress(expected);
-			TreeMap<String, ByteArrayOutputStream> file2 = decompress(actual);
-			equals(file1, file2);
-		} catch (IOException e) {
-			throw new AssertionFailedError(e.toString());
-		}
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
deleted file mode 100644
index 311db55..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.compliance;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.TempFile;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * Test core properties Open Packaging Convention compliance.
- * 
- * M4.1: The format designer shall specify and the format producer shall create
- * at most one core properties relationship for a package. A format consumer
- * shall consider more than one core properties relationship for a package to be
- * an error. If present, the relationship shall target the Core Properties part.
- * (POI relaxes this on reading, as Office sometimes breaks this)
- * 
- * M4.2: The format designer shall not specify and the format producer shall not
- * create Core Properties that use the Markup Compatibility namespace as defined
- * in Annex F, "Standard Namespaces and Content Types". A format consumer shall
- * consider the use of the Markup Compatibility namespace to be an error.
- * 
- * M4.3: Producers shall not create a document element that contains refinements
- * to the Dublin Core elements, except for the two specified in the schema:
- * <dcterms:created> and <dcterms:modified> Consumers shall consider a document
- * element that violates this constraint to be an error.
- * 
- * M4.4: Producers shall not create a document element that contains the
- * xml:lang attribute. Consumers shall consider a document element that violates
- * this constraint to be an error.
- * 
- * M4.5: Producers shall not create a document element that contains the
- * xsi:type attribute, except for a <dcterms:created> or <dcterms:modified>
- * element where the xsi:type attribute shall be present and shall hold the
- * value dcterms:W3CDTF, where dcterms is the namespace prefix of the Dublin
- * Core namespace. Consumers shall consider a document element that violates
- * this constraint to be an error.
- * 
- * @author Julien Chable
- */
-public final class TestOPCComplianceCoreProperties {
-
-    @Test
-    public void testCorePropertiesPart() {
-        OPCPackage pkg;
-        try {
-            InputStream is = OpenXML4JTestDataSamples.openComplianceSampleStream("OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx");
-            pkg = OPCPackage.open(is);
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        pkg.revert();
-    }
-
-    private static String extractInvalidFormatMessage(String sampleNameSuffix) {
-        InputStream is = OpenXML4JTestDataSamples.openComplianceSampleStream("OPCCompliance_CoreProperties_" + sampleNameSuffix);
-        OPCPackage pkg;
-        try {
-            pkg = OPCPackage.open(is);
-        } catch (InvalidFormatException e) {
-            // no longer required for successful test
-            return e.getMessage();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        pkg.revert();
-        throw new AssertionFailedError("expected OPC compliance exception was not thrown");
-    }
-    
-    /**
-     * Test M4.1 rule.
-     */
-    @Test
-    public void testOnlyOneCorePropertiesPart() throws Exception {
-       // We have relaxed this check, so we can read the file anyway
-       try {
-          extractInvalidFormatMessage("OnlyOneCorePropertiesPartFAIL.docx");
-          fail("M4.1 should be being relaxed");
-       } catch (AssertionFailedError e) {
-           // expected here
-       }
-       
-       // We will use the first core properties, and ignore the others
-      InputStream is = OpenXML4JTestDataSamples.openSampleStream("MultipleCoreProperties.docx");
-      OPCPackage pkg = OPCPackage.open(is);
-      
-      // We can see 2 by type
-      assertEquals(2, pkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-      // But only the first one by relationship
-      assertEquals(1, pkg.getPartsByRelationshipType(PackageRelationshipTypes.CORE_PROPERTIES).size());
-      // It should be core.xml not the older core1.xml
-      assertEquals(
-            "/docProps/core.xml",
-            pkg.getPartsByRelationshipType(PackageRelationshipTypes.CORE_PROPERTIES).get(0).getPartName().toString()
-      );
-    }
-    
-    private static URI createURI(String text) {
-        try {
-            return new URI(text);
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Test M4.1 rule.
-     */
-    @Test
-    public void testOnlyOneCorePropertiesPart_AddRelationship() {
-        InputStream is = OpenXML4JTestDataSamples.openComplianceSampleStream("OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx");
-        OPCPackage pkg;
-        try {
-            pkg = OPCPackage.open(is);
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        URI partUri = createURI("/docProps/core2.xml");
-        try {
-            pkg.addRelationship(PackagingURIHelper.createPartName(partUri), TargetMode.INTERNAL,
-                    PackageRelationshipTypes.CORE_PROPERTIES);
-            // no longer fail on compliance error
-            //fail("expected OPC compliance exception was not thrown");
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
-        } catch (InvalidOperationException e) {
-            // expected during successful test
-            assertEquals("OPC Compliance error [M4.1]: can't add another core properties part ! Use the built-in package method instead.", e.getMessage());
-        }
-        pkg.revert();
-    }
-
-    /**
-     * Test M4.1 rule.
-     */
-    @Test
-    public void testOnlyOneCorePropertiesPart_AddPart() throws InvalidFormatException {
-        String sampleFileName = "OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx";
-        OPCPackage pkg = OPCPackage.open(POIDataSamples.getOpenXML4JInstance().getFile(sampleFileName).getPath());
-
-        URI partUri = createURI("/docProps/core2.xml");
-        try {
-            pkg.createPart(PackagingURIHelper.createPartName(partUri),
-                    ContentTypes.CORE_PROPERTIES_PART);
-            // no longer fail on compliance error
-            //fail("expected OPC compliance exception was not thrown");
-        } catch (InvalidOperationException e) {
-            // expected during successful test
-            assertEquals("OPC Compliance error [M4.1]: you try to add more than one core properties relationship in the package !", e.getMessage());
-        }
-        pkg.revert();
-    }
-
-    /**
-     * Test M4.2 rule.
-     */
-    @Test
-    public void testDoNotUseCompatibilityMarkup() {
-        String msg = extractInvalidFormatMessage("DoNotUseCompatibilityMarkupFAIL.docx");
-        assertEquals("OPC Compliance error [M4.2]: A format consumer shall consider the use of the Markup Compatibility namespace to be an error.", msg);
-    }
-
-    /**
-     * Test M4.3 rule.
-     */
-    @Test
-    public void testDCTermsNamespaceLimitedUse() {
-        String msg = extractInvalidFormatMessage("DCTermsNamespaceLimitedUseFAIL.docx");
-        assertEquals("OPC Compliance error [M4.3]: Producers shall not create a document element that contains refinements to the Dublin Core elements, except for the two specified in the schema: <dcterms:created> and <dcterms:modified> Consumers shall consider a document element that violates this constraint to be an error.", msg);
-    }
-
-    /**
-     * Test M4.4 rule.
-     */
-    @Test
-    public void testUnauthorizedXMLLangAttribute() {
-        String msg = extractInvalidFormatMessage("UnauthorizedXMLLangAttributeFAIL.docx");
-        assertEquals("OPC Compliance error [M4.4]: Producers shall not create a document element that contains the xml:lang attribute. Consumers shall consider a document element that violates this constraint to be an error.", msg);
-    }
-
-    /**
-     * Test M4.5 rule.
-     */
-    @Test
-    public void testLimitedXSITypeAttribute_NotPresent() {
-        String msg = extractInvalidFormatMessage("LimitedXSITypeAttribute_NotPresentFAIL.docx");
-        assertEquals("The element 'created' must have the 'xsi:type' attribute present !", msg);
-    }
-
-    /**
-     * Test M4.5 rule.
-     */
-    @Test
-    public void testLimitedXSITypeAttribute_PresentWithUnauthorizedValue() {
-        String msg = extractInvalidFormatMessage("LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx");
-        assertEquals("The element 'modified' must have the 'xsi:type' attribute with the value 'dcterms:W3CDTF', but had 'W3CDTF' !", msg);
-    }
-    
-    /**
-     * Document with no core properties - testing at the OPC level,
-     *  saving into a new stream
-     */
-    @Test
-    public void testNoCoreProperties_saveNew() throws Exception {
-        String sampleFileName = "OPCCompliance_NoCoreProperties.xlsx";
-        OPCPackage pkg = OPCPackage.open(POIDataSamples.getOpenXML4JInstance().getFile(sampleFileName).getPath());
-
-        // Verify it has empty properties
-        assertEquals(0, pkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-        assertNotNull(pkg.getPackageProperties());
-        assertNotNull(pkg.getPackageProperties().getLanguageProperty());
-        assertNull(pkg.getPackageProperties().getLanguageProperty().getValue());
-
-        // Save and re-load
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        pkg.save(baos);
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        pkg.revert();
-
-        pkg = OPCPackage.open(bais);
-
-        // An Empty Properties part has been added in the save/load
-        assertEquals(1, pkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-        assertNotNull(pkg.getPackageProperties());
-        assertNotNull(pkg.getPackageProperties().getLanguageProperty());
-        assertNull(pkg.getPackageProperties().getLanguageProperty().getValue());
-        pkg.close();
-        
-        // Open a new copy of it
-        pkg = OPCPackage.open(POIDataSamples.getOpenXML4JInstance().getFile(sampleFileName).getPath());
-        
-        // Save and re-load, without having touched the properties yet
-        baos = new ByteArrayOutputStream();
-        pkg.save(baos);
-        pkg.revert();
-
-        bais = new ByteArrayInputStream(baos.toByteArray());
-        pkg = OPCPackage.open(bais);
-        
-        // Check that this too added empty properties without error
-        assertEquals(1, pkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-        assertNotNull(pkg.getPackageProperties());
-        assertNotNull(pkg.getPackageProperties().getLanguageProperty());
-        assertNull(pkg.getPackageProperties().getLanguageProperty().getValue());
-    }
-
-    /**
-     * Document with no core properties - testing at the OPC level,
-     *  from a temp-file, saving in-place
-     */
-    @Test
-    public void testNoCoreProperties_saveInPlace() throws Exception {
-        String sampleFileName = "OPCCompliance_NoCoreProperties.xlsx";
-
-        // Copy this into a temp file, so we can play with it
-        File tmp = TempFile.createTempFile("poi-test", ".opc");
-        FileOutputStream out = new FileOutputStream(tmp);
-        InputStream in = POIDataSamples.getOpenXML4JInstance().openResourceAsStream(sampleFileName);
-        IOUtils.copy(
-                in,
-                out);
-        out.close();
-        in.close();
-
-        // Open it from that temp file
-        OPCPackage pkg = OPCPackage.open(tmp);
-
-        // Empty properties
-        assertEquals(0, pkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-        assertNotNull(pkg.getPackageProperties());
-        assertNotNull(pkg.getPackageProperties().getLanguageProperty());
-        assertNull(pkg.getPackageProperties().getLanguageProperty().getValue());
-
-        // Save and close
-        pkg.close();
-
-        // Re-open and check
-        pkg = OPCPackage.open(tmp);
-
-        // An Empty Properties part has been added in the save/load
-        assertEquals(1, pkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-        assertNotNull(pkg.getPackageProperties());
-        assertNotNull(pkg.getPackageProperties().getLanguageProperty());
-        assertNull(pkg.getPackageProperties().getLanguageProperty().getValue());
-
-        // Finish and tidy
-        pkg.revert();
-        assertTrue(tmp.delete());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
deleted file mode 100644
index 7cf9e4b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.compliance;
-
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.junit.Test;
-
-/**
- * Test Open Packaging Convention package model compliance.
- *
- * M1.11 : A package implementer shall neither create nor recognize a part with
- * a part name derived from another part name by appending segments to it.
- *
- * @author Julien Chable
- */
-public class TestOPCCompliancePackageModel {
-
-    /**
-     * A package implementer shall neither create nor recognize a part with a
-     * part name derived from another part name by appending segments to it.
-     * [M1.11]
-     */
-    @Test
-    public void testPartNameDerivationAdditionFailure() {
-        OPCPackage pkg = OPCPackage.create("TODELETEIFEXIST.docx");
-        try {
-            PackagePartName name = PackagingURIHelper
-                    .createPartName("/word/document.xml");
-            PackagePartName nameDerived = PackagingURIHelper
-                    .createPartName("/word/document.xml/image1.gif");
-            pkg.createPart(name, ContentTypes.XML);
-            pkg.createPart(nameDerived, ContentTypes.EXTENSION_GIF);
-        } catch (InvalidOperationException e) {
-            pkg.revert();
-            return;
-        } catch (InvalidFormatException e) {
-            fail(e.getMessage());
-        }
-        fail("A package implementer shall neither create nor recognize a part with a"
-                + " part name derived from another part name by appending segments to it."
-                + " [M1.11]");
-    }
-
-    /**
-     * A package implementer shall neither create nor recognize a part with a
-     * part name derived from another part name by appending segments to it.
-     * [M1.11]
-     */
-    @Test
-    public void testPartNameDerivationReadingFailure() throws IOException {
-        String filename = "OPCCompliance_DerivedPartNameFAIL.docx";
-        try {
-            OPCPackage.open(POIDataSamples.getOpenXML4JInstance().openResourceAsStream(filename));
-        } catch (InvalidFormatException e) {
-            return;
-        }
-        fail("A package implementer shall neither create nor recognize a part with a"
-                + " part name derived from another part name by appending segments to it."
-                + " [M1.11]");
-    }
-
-    /**
-     * Rule M1.12 : Packages shall not contain equivalent part names and package
-     * implementers shall neither create nor recognize packages with equivalent
-     * part names.
-     */
-    @Test
-    public void testAddPackageAlreadyAddFailure() throws Exception {
-        OPCPackage pkg = OPCPackage.create("DELETEIFEXISTS.docx");
-        PackagePartName name1 = null;
-        PackagePartName name2 = null;
-        try {
-            name1 = PackagingURIHelper.createPartName("/word/document.xml");
-            name2 = PackagingURIHelper.createPartName("/word/document.xml");
-        } catch (InvalidFormatException e) {
-            throw new Exception(e.getMessage());
-        }
-        pkg.createPart(name1, ContentTypes.XML);
-        try {
-            pkg.createPart(name2, ContentTypes.XML);
-        } catch (PartAlreadyExistsException e) {
-            return;
-        }
-        fail("Packages shall not contain equivalent part names and package implementers shall neither create nor recognize packages with equivalent part names. [M1.12]");
-    }
-
-    /**
-     * Rule M1.12 : Packages shall not contain equivalent part names and package
-     * implementers shall neither create nor recognize packages with equivalent
-     * part names.
-     */
-    @Test
-    public void testAddPackageAlreadyAddFailure2() throws Exception {
-        OPCPackage pkg = OPCPackage.create("DELETEIFEXISTS.docx");
-        PackagePartName partName = null;
-        try {
-            partName = PackagingURIHelper.createPartName("/word/document.xml");
-        } catch (InvalidFormatException e) {
-            throw new Exception(e.getMessage());
-        }
-        pkg.createPart(partName, ContentTypes.XML);
-        try {
-            pkg.createPart(partName, ContentTypes.XML);
-        } catch (InvalidOperationException e) {
-            return;
-        }
-        fail("Packages shall not contain equivalent part names and package implementers shall neither create nor recognize packages with equivalent part names. [M1.12]");
-    }
-
-    /**
-     * Try to add a relationship to a relationship part.
-     *
-     * Check rule M1.25: The Relationships part shall not have relationships to
-     * any other part. Package implementers shall enforce this requirement upon
-     * the attempt to create such a relationship and shall treat any such
-     * relationship as invalid.
-     */
-    @Test
-    public void testAddRelationshipRelationshipsPartFailure() {
-        OPCPackage pkg = OPCPackage.create("DELETEIFEXISTS.docx");
-        PackagePartName name1 = null;
-        try {
-            name1 = PackagingURIHelper
-                    .createPartName("/test/_rels/document.xml.rels");
-        } catch (InvalidFormatException e) {
-            fail("This exception should never happen !");
-        }
-
-        try {
-            pkg.addRelationship(name1, TargetMode.INTERNAL,
-                    PackageRelationshipTypes.CORE_DOCUMENT);
-        } catch (InvalidOperationException e) {
-            return;
-        }
-        fail("Fail test -> M1.25: The Relationships part shall not have relationships to any other part");
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
deleted file mode 100644
index e7754ed..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.compliance;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.junit.Test;
-
-/**
- * Test part name Open Packaging Convention compliance.
- *
- * (Open Packaging Convention 8.1.1 Part names) :
- *
- * The part name grammar is defined as follows:
- *
- * part_name = 1*( "/" segment )
- *
- * segment = 1*( pchar )
- *
- * pchar is defined in RFC 3986.
- *
- * The part name grammar implies the following constraints. The package
- * implementer shall neither create any part that violates these constraints nor
- * retrieve any data from a package as a part if the purported part name
- * violates these constraints.
- *
- * A part name shall not be empty. [M1.1]
- *
- * A part name shall not have empty segments. [M1.3]
- *
- * A part name shall start with a forward slash ("/") character. [M1.4]
- *
- * A part name shall not have a forward slash as the last character. [M1.5]
- *
- * A segment shall not hold any characters other than pchar characters. [M1.6]
- *
- * Part segments have the following additional constraints. The package
- * implementer shall neither create any part with a part name comprised of a
- * segment that violates these constraints nor retrieve any data from a package
- * as a part if the purported part name contains a segment that violates these
- * constraints.
- *
- * A segment shall not contain percent-encoded forward slash ("/"), or backward
- * slash ("\") characters. [M1.7]
- *
- * A segment shall not contain percent-encoded unreserved characters. [M1.8]
- *
- * A segment shall not end with a dot (".") character. [M1.9]
- *
- * A segment shall include at least one non-dot character. [M1.10]
- *
- * A package implementer shall neither create nor recognize a part with a part
- * name derived from another part name by appending segments to it. [M1.11]
- *
- * Part name equivalence is determined by comparing part names as
- * case-insensitive ASCII strings. [M1.12]
- *
- * @author Julien Chable
- */
-public final class TestOPCCompliancePartName {
-
-    /**
-     * Test some common invalid names.
-     *
-     * A segment shall not contain percent-encoded unreserved characters. [M1.8]
-     */
-    @Test
-    public void testInvalidPartNames() {
-        String[] invalidNames = { "/", "/xml./doc.xml", "[Content_Types].xml", "//xml/." };
-        for (String s : invalidNames) {
-            URI uri = null;
-            try {
-                uri = new URI(s);
-            } catch (URISyntaxException e) {
-                assertTrue(s.equals("[Content_Types].xml"));
-                continue;
-            }
-            assertFalse("This part name SHOULD NOT be valid: " + s,
-                    PackagingURIHelper.isValidPartName(uri));
-        }
-    }
-
-    /**
-     * Test some common valid names.
-     */
-    @Test
-    public void testValidPartNames() throws URISyntaxException {
-        String[] validNames = { "/xml/item1.xml", "/document.xml",
-                "/a/%D1%86.xml" };
-        for (String s : validNames)
-            assertTrue("This part name SHOULD be valid: " + s,
-                    PackagingURIHelper.isValidPartName(new URI(s)));
-    }
-
-    /**
-     * A part name shall not be empty. [M1.1]
-     */
-    @Test
-    public void testEmptyPartNameFailure() throws URISyntaxException {
-        try {
-            PackagingURIHelper.createPartName(new URI(""));
-            fail("A part name shall not be empty. [M1.1]");
-        } catch (InvalidFormatException e) {
-            // Normal behaviour
-        }
-    }
-
-    /**
-     * A part name shall not have empty segments. [M1.3]
-     *
-     * A segment shall not end with a dot ('.') character. [M1.9]
-     *
-     * A segment shall include at least one non-dot character. [M1.10]
-     */
-    @Test
-    public void testPartNameWithInvalidSegmentsFailure() {
-        String[] invalidNames = { "//document.xml", "//word/document.xml",
-                "/word//document.rels", "/word//rels//document.rels",
-                "/xml./doc.xml", "/document.", "/./document.xml",
-                "/word/./doc.rels", "/%2F/document.xml" };
-        try {
-            for (String s : invalidNames)
-                assertFalse(
-                        "A part name shall not have empty segments. [M1.3]",
-                        PackagingURIHelper.isValidPartName(new URI(s)));
-        } catch (URISyntaxException e) {
-            fail();
-        }
-    }
-
-    /**
-     * A segment shall not hold any characters other than ipchar (RFC 3987) characters.
-     * [M1.6].
-     */
-    @Test
-    public void testPartNameWithNonPCharCharacters() {
-        String[] validNames = { "/doc&.xml" };
-        try {
-            for (String s : validNames)
-                assertTrue(
-                        "A segment shall not contain non pchar characters [M1.6] : "
-                                + s, PackagingURIHelper
-                                .isValidPartName(new URI(s)));
-        } catch (URISyntaxException e) {
-            fail();
-        }
-    }
-
-    /**
-     * A segment shall not contain percent-encoded unreserved characters [M1.8].
-     */
-    @Test
-    public void testPartNameWithUnreservedEncodedCharactersFailure() {
-        String[] invalidNames = { "/a/docum%65nt.xml" };
-        try {
-            for (String s : invalidNames)
-                assertFalse(
-                        "A segment shall not contain percent-encoded unreserved characters [M1.8] : "
-                                + s, PackagingURIHelper
-                                .isValidPartName(new URI(s)));
-        } catch (URISyntaxException e) {
-            fail();
-        }
-    }
-
-    /**
-     * A part name shall start with a forward slash ('/') character. [M1.4]
-     */
-    @Test
-    public void testPartNameStartsWithAForwardSlashFailure()
-            throws URISyntaxException {
-        try {
-            PackagingURIHelper.createPartName(new URI("document.xml"));
-            fail("A part name shall start with a forward slash ('/') character. [M1.4]");
-        } catch (InvalidFormatException e) {
-            // Normal behaviour
-        }
-    }
-
-    /**
-     * A part name shall not have a forward slash as the last character. [M1.5]
-     */
-    @Test
-    public void testPartNameEndsWithAForwardSlashFailure()
-            throws URISyntaxException {
-        try {
-            PackagingURIHelper.createPartName(new URI("/document.xml/"));
-            fail("A part name shall not have a forward slash as the last character. [M1.5]");
-        } catch (InvalidFormatException e) {
-            // Normal behaviour
-        }
-    }
-
-    /**
-     * Part name equivalence is determined by comparing part names as
-     * case-insensitive ASCII strings. [M1.12]
-     */
-    @Test
-    public void testPartNameComparaison() throws Exception {
-        String[] partName1 = { "/word/document.xml", "/docProps/core.xml", "/rels/.rels" };
-        String[] partName2 = { "/WORD/DocUment.XML", "/docProps/core.xml", "/rels/.rels" };
-        for (int i = 0; i < partName1.length || i < partName2.length; ++i) {
-            PackagePartName p1 = PackagingURIHelper.createPartName(partName1[i]);
-            PackagePartName p2 = PackagingURIHelper.createPartName(partName2[i]);
-            assertTrue(p1.equals(p2));
-            assertTrue(p1.compareTo(p2) == 0);
-            assertTrue(p1.hashCode() == p2.hashCode());
-        }
-    }
-
-    /**
-     * Part name equivalence is determined by comparing part names as
-     * case-insensitive ASCII strings. [M1.12].
-     *
-     * All the comparisons MUST FAIL !
-     */
-    @Test
-    public void testPartNameComparaisonFailure() throws Exception {
-        String[] partName1 = { "/word/document.xml", "/docProps/core.xml", "/rels/.rels" };
-        String[] partName2 = { "/WORD/DocUment.XML2", "/docProp/core.xml", "/rels/rels" };
-        for (int i = 0; i < partName1.length || i < partName2.length; ++i) {
-            PackagePartName p1 = PackagingURIHelper.createPartName(partName1[i]);
-            PackagePartName p2 = PackagingURIHelper.createPartName(partName2[i]);
-            assertFalse(p1.equals(p2));
-            assertFalse(p1.compareTo(p2) == 0);
-            assertFalse(p1.hashCode() == p2.hashCode());
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
deleted file mode 100644
index 936d0f9..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public final class TestContentTypeManager {
-
-    /**
-     * Test the properties part content parsing.
-     */
-    @Test
-    public void testContentType() throws Exception {
-        String filepath =  OpenXML4JTestDataSamples.getSampleFileName("sample.docx");
-
-        // Retrieves core properties part
-        OPCPackage p = OPCPackage.open(filepath, PackageAccess.READ);
-        try {
-            PackageRelationshipCollection rels = p.getRelationshipsByType(PackageRelationshipTypes.CORE_PROPERTIES);
-            PackageRelationship corePropertiesRelationship = rels.getRelationship(0);
-            PackagePart coreDocument = p.getPart(corePropertiesRelationship);
-
-            assertEquals("application/vnd.openxmlformats-package.core-properties+xml", coreDocument.getContentType());
-
-            // TODO - finish writing this test
-            assumeTrue("finish writing this test", false);
-
-            ContentTypeManager ctm = new ZipContentTypeManager(coreDocument.getInputStream(), p);
-            assertNotNull(ctm);
-        } finally {
-            p.close();
-        }
-    }
-
-    /**
-     * Test the addition of several default and override content types.
-     */
-    @Test
-    public void testContentTypeAddition() throws Exception {
-        ContentTypeManager ctm = new ZipContentTypeManager(null, null);
-
-        PackagePartName name1 = PackagingURIHelper.createPartName("/foo/foo.XML");
-        PackagePartName name2 = PackagingURIHelper.createPartName("/foo/foo2.xml");
-        PackagePartName name3 = PackagingURIHelper.createPartName("/foo/doc.rels");
-        PackagePartName name4 = PackagingURIHelper.createPartName("/foo/doc.RELS");
-
-        // Add content types
-        ctm.addContentType(name1, "foo-type1");
-        ctm.addContentType(name2, "foo-type2");
-        ctm.addContentType(name3, "text/xml+rel");
-        ctm.addContentType(name4, "text/xml+rel");
-
-        assertEquals(ctm.getContentType(name1), "foo-type1");
-        assertEquals(ctm.getContentType(name2), "foo-type2");
-        assertEquals(ctm.getContentType(name3), "text/xml+rel");
-        assertEquals(ctm.getContentType(name3), "text/xml+rel");
-    }
-
-    /**
-     * Test the addition then removal of content types.
-     */
-    @Test
-    public void testContentTypeRemoval() throws Exception {
-        ContentTypeManager ctm = new ZipContentTypeManager(null, null);
-
-        PackagePartName name1 = PackagingURIHelper.createPartName("/foo/foo.xml");
-        PackagePartName name2 = PackagingURIHelper.createPartName("/foo/foo2.xml");
-        PackagePartName name3 = PackagingURIHelper.createPartName("/foo/doc.rels");
-        PackagePartName name4 = PackagingURIHelper.createPartName("/foo/doc.RELS");
-
-        // Add content types
-        ctm.addContentType(name1, "foo-type1");
-        ctm.addContentType(name2, "foo-type2");
-        ctm.addContentType(name3, "text/xml+rel");
-        ctm.addContentType(name4, "text/xml+rel");
-        ctm.removeContentType(name2);
-        ctm.removeContentType(name3);
-
-        assertEquals(ctm.getContentType(name1), "foo-type1");
-        assertEquals(ctm.getContentType(name2), "foo-type1");
-        assertEquals(ctm.getContentType(name3), null);
-
-        ctm.removeContentType(name1);
-        assertEquals(ctm.getContentType(name1), null);
-        assertEquals(ctm.getContentType(name2), null);
-    }
-
-    /**
-     * Test the addition then removal of content types in a package.
-     */
-    @Ignore
-    @Test
-    public void testContentTypeRemovalPackage() {
-        // TODO
-        fail("test not written");
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java b/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java
deleted file mode 100644
index 1a4c0de..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.openxml4j.opc.internal;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.internal.marshallers.ZipPackagePropertiesMarshaller;
-import org.junit.Test;
-
-public class TestZipPackagePropertiesMarshaller {
-
-    @Test(expected=IllegalArgumentException.class)
-    public void nonZipOutputStream() throws OpenXML4JException {
-        PartMarshaller marshaller = new ZipPackagePropertiesMarshaller();
-        OutputStream notAZipOutputStream = new ByteArrayOutputStream(0);
-        marshaller.marshall(null, notAZipOutputStream);
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/AllPOIFSCryptoTests.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/AllPOIFSCryptoTests.java
deleted file mode 100644
index fd8e56a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/AllPOIFSCryptoTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-
-/**
- * Tests for org.apache.poi.poifs.crypt
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-      TestEncryptionInfo.class
-    , TestDecryptor.class
-    , TestEncryptor.class
-    , TestAgileEncryptionParameters.class
-    , TestCertificateEncryption.class
-})
-public final class AllPOIFSCryptoTests {
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java
deleted file mode 100644
index afd70f0..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.RSAKeyGenParameterSpec;
-import java.util.Date;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AuthorityInformationAccess;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLNumber;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509ExtensionUtils;
-import org.bouncycastle.cert.X509v2CRLBuilder;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509CRLConverter;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.ocsp.BasicOCSPResp;
-import org.bouncycastle.cert.ocsp.BasicOCSPRespBuilder;
-import org.bouncycastle.cert.ocsp.CertificateID;
-import org.bouncycastle.cert.ocsp.CertificateStatus;
-import org.bouncycastle.cert.ocsp.OCSPReq;
-import org.bouncycastle.cert.ocsp.OCSPReqBuilder;
-import org.bouncycastle.cert.ocsp.OCSPResp;
-import org.bouncycastle.cert.ocsp.OCSPRespBuilder;
-import org.bouncycastle.cert.ocsp.Req;
-import org.bouncycastle.cert.ocsp.RevokedStatus;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class PkiTestUtils {
-
-    private PkiTestUtils() {
-        super();
-    }
-
-    static KeyPair generateKeyPair() throws Exception {
-        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-        SecureRandom random = new SecureRandom();
-        keyPairGenerator.initialize(new RSAKeyGenParameterSpec(1024,
-                RSAKeyGenParameterSpec.F4), random);
-        KeyPair keyPair = keyPairGenerator.generateKeyPair();
-        return keyPair;
-    }
-
-    static X509Certificate generateCertificate(PublicKey subjectPublicKey,
-            String subjectDn, Date notBefore, Date notAfter,
-            X509Certificate issuerCertificate, PrivateKey issuerPrivateKey,
-            boolean caFlag, int pathLength, String crlUri, String ocspUri,
-            KeyUsage keyUsage)
-    throws IOException, OperatorCreationException, CertificateException
-    {
-        String signatureAlgorithm = "SHA1withRSA";
-        X500Name issuerName;
-        if (issuerCertificate != null) {
-            issuerName = new X509CertificateHolder(issuerCertificate.getEncoded()).getIssuer();
-        } else {
-            issuerName = new X500Name(subjectDn);
-        }
-        
-        RSAPublicKey rsaPubKey = (RSAPublicKey)subjectPublicKey;
-        RSAKeyParameters rsaSpec = new RSAKeyParameters(false, rsaPubKey.getModulus(), rsaPubKey.getPublicExponent());
-
-        SubjectPublicKeyInfo subjectPublicKeyInfo = 
-            SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(rsaSpec);
-
-        DigestCalculator digestCalc = new JcaDigestCalculatorProviderBuilder()
-            .setProvider("BC").build().get(CertificateID.HASH_SHA1);
-        
-        X509v3CertificateBuilder certificateGenerator = new X509v3CertificateBuilder(
-              issuerName
-            , new BigInteger(128, new SecureRandom())
-            , notBefore
-            , notAfter
-            , new X500Name(subjectDn)
-            , subjectPublicKeyInfo
-        );
-
-        X509ExtensionUtils exUtils = new X509ExtensionUtils(digestCalc);
-        SubjectKeyIdentifier subKeyId = exUtils.createSubjectKeyIdentifier(subjectPublicKeyInfo);
-        AuthorityKeyIdentifier autKeyId = (issuerCertificate != null) 
-            ? exUtils.createAuthorityKeyIdentifier(new X509CertificateHolder(issuerCertificate.getEncoded()))
-            : exUtils.createAuthorityKeyIdentifier(subjectPublicKeyInfo);
-
-        certificateGenerator.addExtension(Extension.subjectKeyIdentifier, false, subKeyId);
-        certificateGenerator.addExtension(Extension.authorityKeyIdentifier, false, autKeyId);
-
-        if (caFlag) {
-            BasicConstraints bc;
-            
-            if (-1 == pathLength) {
-                bc = new BasicConstraints(true);
-            } else {
-                bc = new BasicConstraints(pathLength);
-            }
-            certificateGenerator.addExtension(Extension.basicConstraints, false, bc);
-        }
-
-        if (null != crlUri) {
-            int uri = GeneralName.uniformResourceIdentifier;
-            DERIA5String crlUriDer = new DERIA5String(crlUri);
-            GeneralName gn = new GeneralName(uri, crlUriDer);
-
-            DERSequence gnDer = new DERSequence(gn);
-            GeneralNames gns = GeneralNames.getInstance(gnDer);
-            
-            DistributionPointName dpn = new DistributionPointName(0, gns);
-            DistributionPoint distp = new DistributionPoint(dpn, null, null);
-            DERSequence distpDer = new DERSequence(distp);
-            certificateGenerator.addExtension(Extension.cRLDistributionPoints, false, distpDer);
-        }
-
-        if (null != ocspUri) {
-            int uri = GeneralName.uniformResourceIdentifier;
-            GeneralName ocspName = new GeneralName(uri, ocspUri);
-            
-            AuthorityInformationAccess authorityInformationAccess =
-                new AuthorityInformationAccess(X509ObjectIdentifiers.ocspAccessMethod, ocspName);
-            
-            certificateGenerator.addExtension(Extension.authorityInfoAccess, false, authorityInformationAccess);
-        }
-
-        if (null != keyUsage) {
-            certificateGenerator.addExtension(Extension.keyUsage, true, keyUsage);
-        }
-
-        JcaContentSignerBuilder signerBuilder = new JcaContentSignerBuilder(signatureAlgorithm);
-        signerBuilder.setProvider("BC");
-        
-        X509CertificateHolder certHolder =
-            certificateGenerator.build(signerBuilder.build(issuerPrivateKey));
-
-        /*
-         * Next certificate factory trick is needed to make sure that the
-         * certificate delivered to the caller is provided by the default
-         * security provider instead of BouncyCastle. If we don't do this trick
-         * we might run into trouble when trying to use the CertPath validator.
-         */
-//        CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-//        certificate = (X509Certificate) certificateFactory
-//                .generateCertificate(new ByteArrayInputStream(certificate
-//                        .getEncoded()));
-        return new JcaX509CertificateConverter().getCertificate(certHolder);
-    }
-
-    static Document loadDocument(InputStream documentInputStream)
-            throws ParserConfigurationException, SAXException, IOException {
-        InputSource inputSource = new InputSource(documentInputStream);
-        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory
-                .newInstance();
-        documentBuilderFactory.setNamespaceAware(true);
-        DocumentBuilder documentBuilder = documentBuilderFactory
-                .newDocumentBuilder();
-        Document document = documentBuilder.parse(inputSource);
-        return document;
-    }
-
-    static String toString(Node dom) throws TransformerException {
-        Source source = new DOMSource(dom);
-        StringWriter stringWriter = new StringWriter();
-        Result result = new StreamResult(stringWriter);
-        TransformerFactory transformerFactory = TransformerFactory
-                .newInstance();
-        Transformer transformer = transformerFactory.newTransformer();
-        /*
-         * We have to omit the ?xml declaration if we want to embed the
-         * document.
-         */
-        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-        transformer.transform(source, result);
-        return stringWriter.getBuffer().toString();
-    }
-
-    public static X509CRL generateCrl(X509Certificate issuer, PrivateKey issuerPrivateKey)
-    throws CertificateEncodingException, IOException, CRLException, OperatorCreationException {
-        
-        X509CertificateHolder holder = new X509CertificateHolder(issuer.getEncoded());
-        X509v2CRLBuilder crlBuilder = new X509v2CRLBuilder(holder.getIssuer(), new Date());
-        crlBuilder.setNextUpdate(new Date(new Date().getTime() + 100000));
-        JcaContentSignerBuilder contentBuilder = new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC");
-
-        CRLNumber crlNumber = new CRLNumber(new BigInteger("1234"));
-        
-        crlBuilder.addExtension(Extension.cRLNumber, false, crlNumber);
-        X509CRLHolder x509Crl = crlBuilder.build(contentBuilder.build(issuerPrivateKey));
-        return new JcaX509CRLConverter().setProvider("BC").getCRL(x509Crl);
-    }
-
-    public static OCSPResp createOcspResp(X509Certificate certificate,
-            boolean revoked, X509Certificate issuerCertificate,
-            X509Certificate ocspResponderCertificate,
-            PrivateKey ocspResponderPrivateKey, String signatureAlgorithm,
-            long nonceTimeinMillis)
-            throws Exception {
-        DigestCalculator digestCalc = new JcaDigestCalculatorProviderBuilder()
-            .setProvider("BC").build().get(CertificateID.HASH_SHA1);
-        X509CertificateHolder issuerHolder = new X509CertificateHolder(issuerCertificate.getEncoded());
-        CertificateID certId = new CertificateID(digestCalc, issuerHolder, certificate.getSerialNumber());
-        
-        // request
-        //create a nonce to avoid replay attack
-        BigInteger nonce = BigInteger.valueOf(nonceTimeinMillis);
-        DEROctetString nonceDer = new DEROctetString(nonce.toByteArray());
-        Extension ext = new Extension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, true, nonceDer);
-        Extensions exts = new Extensions(ext);
-        
-        OCSPReqBuilder ocspReqBuilder = new OCSPReqBuilder();
-        ocspReqBuilder.addRequest(certId);
-        ocspReqBuilder.setRequestExtensions(exts);
-        OCSPReq ocspReq = ocspReqBuilder.build();
-
-        
-        SubjectPublicKeyInfo keyInfo = new SubjectPublicKeyInfo
-            (CertificateID.HASH_SHA1, ocspResponderCertificate.getPublicKey().getEncoded());
-        
-        BasicOCSPRespBuilder basicOCSPRespBuilder = new BasicOCSPRespBuilder(keyInfo, digestCalc);
-        basicOCSPRespBuilder.setResponseExtensions(exts);
-
-        // request processing
-        Req[] requestList = ocspReq.getRequestList();
-        for (Req ocspRequest : requestList) {
-            CertificateID certificateID = ocspRequest.getCertID();
-            CertificateStatus certificateStatus = CertificateStatus.GOOD;
-            if (revoked) {
-                certificateStatus = new RevokedStatus(new Date(), CRLReason.privilegeWithdrawn);
-            }
-            basicOCSPRespBuilder.addResponse(certificateID, certificateStatus);
-        }
-
-        // basic response generation
-        X509CertificateHolder[] chain = null;
-        if (!ocspResponderCertificate.equals(issuerCertificate)) {
-            // TODO: HorribleProxy can't convert array input params yet
-            chain = new X509CertificateHolder[] {
-                new X509CertificateHolder(ocspResponderCertificate.getEncoded()),
-                issuerHolder
-            };
-        }
-        
-        ContentSigner contentSigner = new JcaContentSignerBuilder("SHA1withRSA")
-            .setProvider("BC").build(ocspResponderPrivateKey);
-        BasicOCSPResp basicOCSPResp = basicOCSPRespBuilder.build(contentSigner, chain, new Date(nonceTimeinMillis));
-
-        
-        OCSPRespBuilder ocspRespBuilder = new OCSPRespBuilder();
-        OCSPResp ocspResp = ocspRespBuilder.build(OCSPRespBuilder.SUCCESSFUL, basicOCSPResp);
-
-        return ocspResp;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java
deleted file mode 100644
index 2cefa95..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.crypto.Cipher;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TestAgileEncryptionParameters {
-
-    static byte testData[];
-    
-    @Parameter(value = 0)
-    public CipherAlgorithm ca;
-    @Parameter(value = 1)
-    public HashAlgorithm ha;
-    @Parameter(value = 2)
-    public ChainingMode cm;
-
-    @Parameters(name="{0} {1} {2}")
-    public static Collection<Object[]> data() {
-        CipherAlgorithm caList[] = { CipherAlgorithm.aes128, CipherAlgorithm.aes192, CipherAlgorithm.aes256, CipherAlgorithm.rc2, CipherAlgorithm.des, CipherAlgorithm.des3 };
-        HashAlgorithm haList[] = { HashAlgorithm.sha1, HashAlgorithm.sha256, HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.md5 };
-        ChainingMode cmList[] = { ChainingMode.cbc, ChainingMode.cfb };
-
-        List<Object[]> data = new ArrayList<Object[]>();
-        for (CipherAlgorithm ca : caList) {
-            for (HashAlgorithm ha : haList) {
-                for (ChainingMode cm : cmList) {
-                    data.add(new Object[]{ca,ha,cm});
-                }
-            }
-        }
-        
-        return data;
-    }
-    
-    @BeforeClass
-    public static void initTestData() throws Exception {
-        InputStream testFile = POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.docx");
-        testData = IOUtils.toByteArray(testFile);
-        testFile.close();
-    }
-    
-    @Test
-    public void testAgileEncryptionModes() throws Exception {
-        int maxKeyLen = Cipher.getMaxAllowedKeyLength(ca.jceId);
-        Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files", maxKeyLen >= ca.defaultKeySize);
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-        POIFSFileSystem fsEnc = new POIFSFileSystem();
-        EncryptionInfo infoEnc = new EncryptionInfo(EncryptionMode.agile, ca, ha, -1, -1, cm);
-        Encryptor enc = infoEnc.getEncryptor();
-        enc.confirmPassword("foobaa");
-        OutputStream os = enc.getDataStream(fsEnc);
-        os.write(testData);
-        os.close();
-        bos.reset();
-        fsEnc.writeFilesystem(bos);
-        fsEnc.close();
-        
-        POIFSFileSystem fsDec = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-        EncryptionInfo infoDec = new EncryptionInfo(fsDec);
-        Decryptor dec = infoDec.getDecryptor();
-        boolean passed = dec.verifyPassword("foobaa");
-        assertTrue(passed);
-        InputStream is = dec.getDataStream(fsDec);
-        byte actualData[] = IOUtils.toByteArray(is);
-        is.close();
-        fsDec.close();
-        assertArrayEquals("Failed roundtrip - "+ca+"-"+ha+"-"+cm, testData, actualData);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
deleted file mode 100644
index d48fb0d..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.X509Certificate;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.crypt.agile.AgileDecryptor;
-import org.apache.poi.poifs.crypt.agile.AgileEncryptionVerifier;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.junit.Test;
-
-/*
-import org.junit.BeforeClass;
-import java.util.Date;
-import java.math.BigInteger;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.cert.Certificate;
-import sun.security.x509.AlgorithmId;
-import sun.security.x509.CertificateAlgorithmId;
-import sun.security.x509.CertificateIssuerName;
-import sun.security.x509.CertificateSerialNumber;
-import sun.security.x509.CertificateSubjectName;
-import sun.security.x509.CertificateValidity;
-import sun.security.x509.CertificateVersion;
-import sun.security.x509.CertificateX509Key;
-import sun.security.x509.X500Name;
-import sun.security.x509.X509CertImpl;
-import sun.security.x509.X509CertInfo;
-*/
-
-/**
- * @see <a href="http://stackoverflow.com/questions/1615871/creating-an-x509-certificate-in-java-without-bouncycastle">creating a self-signed certificate</a> 
- */
-public class TestCertificateEncryption {
-    /**
-     * how many days from now the Certificate is valid for
-     */
-    static final int days = 1000;
-    /**
-     * the signing algorithm, eg "SHA1withRSA"
-     */
-    static final String algorithm = "SHA1withRSA";
-    static final String password = "foobaa";
-    static final String certAlias = "poitest";
-    /**
-     * the X.509 Distinguished Name, eg "CN=Test, L=London, C=GB"
-     */
-    static final String certDN = "CN=poitest";
-    // static final File pfxFile = TempFile.createTempFile("poitest", ".pfx");
-    static byte pfxFileBytes[];
-    
-    static class CertData {
-        KeyPair keypair;
-        X509Certificate x509;
-    }
-    
-    /** 
-     * Create a self-signed X.509 Certificate
-     * 
-     * The keystore generation / loading is split, because normally the keystore would
-     * already exist.
-     */ 
-    /* @BeforeClass
-    public static void initKeystore() throws GeneralSecurityException, IOException {
-        CertData certData = new CertData();
-        
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
-        keyGen.initialize(1024);
-        certData.keypair = keyGen.generateKeyPair();
-        PrivateKey privkey = certData.keypair.getPrivate();
-        PublicKey publkey = certData.keypair.getPublic();
-    
-        X509CertInfo info = new X509CertInfo();
-        Date from = new Date();
-        Date to = new Date(from.getTime() + days * 86400000l);
-        CertificateValidity interval = new CertificateValidity(from, to);
-        BigInteger sn = new BigInteger(64, new SecureRandom());
-        X500Name owner = new X500Name(certDN);
-        
-        info.set(X509CertInfo.VALIDITY, interval);
-        info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(sn));
-        info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(owner));
-        info.set(X509CertInfo.ISSUER, new CertificateIssuerName(owner));
-        info.set(X509CertInfo.KEY, new CertificateX509Key(publkey));
-        info.set(X509CertInfo.VERSION, new CertificateVersion(CertificateVersion.V3));
-        AlgorithmId algo = new AlgorithmId(AlgorithmId.md5WithRSAEncryption_oid);
-        info.set(X509CertInfo.ALGORITHM_ID, new CertificateAlgorithmId(algo));
-        
-        // Sign the cert to identify the algorithm that's used.
-        X509CertImpl cert = new X509CertImpl(info);
-        cert.sign(privkey, algorithm);
-        
-        // Update the algorith, and resign.
-        algo = (AlgorithmId)cert.get(X509CertImpl.SIG_ALG);
-        info.set(CertificateAlgorithmId.NAME + "." + CertificateAlgorithmId.ALGORITHM, algo);
-        cert = new X509CertImpl(info);
-        cert.sign(privkey, algorithm);
-        certData.x509 = cert;
-        
-        KeyStore keystore = KeyStore.getInstance("PKCS12");
-        keystore.load(null, password.toCharArray());
-        keystore.setKeyEntry(certAlias, certData.keypair.getPrivate(), password.toCharArray(), new Certificate[]{certData.x509});
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        keystore.store(bos, password.toCharArray());
-        pfxFileBytes = bos.toByteArray();
-    } */
-
-    public CertData loadKeystore()
-    throws GeneralSecurityException, IOException {
-        KeyStore keystore = KeyStore.getInstance("PKCS12");
-        
-        // InputStream fis = new ByteArrayInputStream(pfxFileBytes);
-        InputStream fis = POIDataSamples.getPOIFSInstance().openResourceAsStream("poitest.pfx");
-        keystore.load(fis, password.toCharArray());
-        fis.close();
-        
-        X509Certificate x509 = (X509Certificate)keystore.getCertificate(certAlias);
-        PrivateKey privateKey = (PrivateKey)keystore.getKey(certAlias, password.toCharArray());
-        PublicKey publicKey = x509.getPublicKey();
-
-        CertData certData = new CertData();
-        certData.keypair = new KeyPair(publicKey, privateKey);
-        certData.x509 = x509;
-        
-        return certData;
-    }
-    
-    @Test
-    public void testCertificateEncryption() throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem();
-        EncryptionInfo info = new EncryptionInfo(EncryptionMode.agile, CipherAlgorithm.aes128, HashAlgorithm.sha1, -1, -1, ChainingMode.cbc);
-        AgileEncryptionVerifier aev = (AgileEncryptionVerifier)info.getVerifier();
-        CertData certData = loadKeystore();
-        aev.addCertificate(certData.x509);
-        
-        Encryptor enc = info.getEncryptor();
-        enc.confirmPassword("foobaa");
-        
-        File file = POIDataSamples.getDocumentInstance().getFile("VariousPictures.docx");
-        InputStream fis = new FileInputStream(file);
-        byte byteExpected[] = IOUtils.toByteArray(fis);
-        fis.close();
-        
-        OutputStream os = enc.getDataStream(fs);
-        IOUtils.copy(new ByteArrayInputStream(byteExpected), os);
-        os.close();
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        fs.writeFilesystem(bos);
-        bos.close();
-        
-        fs = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-        info = new EncryptionInfo(fs);
-        AgileDecryptor agDec = (AgileDecryptor)info.getDecryptor();
-        boolean passed = agDec.verifyPassword(certData.keypair, certData.x509);
-        assertTrue("certificate verification failed", passed);
-        
-        fis = agDec.getDataStream(fs);
-        byte byteActual[] = IOUtils.toByteArray(fis);
-        fis.close();
-        
-        assertThat(byteExpected, equalTo(byteActual));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
deleted file mode 100644
index e17e2dc..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import javax.crypto.Cipher;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Assume;
-import org.junit.Test;
-
-public class TestDecryptor {
-    @Test
-    public void passwordVerification() throws IOException, GeneralSecurityException {
-        POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getPOIFSInstance().openResourceAsStream("protect.xlsx"));
-
-        EncryptionInfo info = new EncryptionInfo(fs);
-
-        Decryptor d = Decryptor.getInstance(info);
-
-        assertTrue(d.verifyPassword(Decryptor.DEFAULT_PASSWORD));
-    }
-
-    @Test
-    public void decrypt() throws IOException, GeneralSecurityException {
-        POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getPOIFSInstance().openResourceAsStream("protect.xlsx"));
-
-        EncryptionInfo info = new EncryptionInfo(fs);
-
-        Decryptor d = Decryptor.getInstance(info);
-
-        d.verifyPassword(Decryptor.DEFAULT_PASSWORD);
-
-        zipOk(fs.getRoot(), d);
-    }
-
-    @Test
-    public void agile() throws IOException, GeneralSecurityException {
-        POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getPOIFSInstance().openResourceAsStream("protected_agile.docx"));
-
-        EncryptionInfo info = new EncryptionInfo(fs);
-
-        assertTrue(info.getVersionMajor() == 4 && info.getVersionMinor() == 4);
-
-        Decryptor d = Decryptor.getInstance(info);
-
-        assertTrue(d.verifyPassword(Decryptor.DEFAULT_PASSWORD));
-
-        zipOk(fs.getRoot(), d);
-    }
-
-    private void zipOk(DirectoryNode root, Decryptor d) throws IOException, GeneralSecurityException {
-        ZipInputStream zin = new ZipInputStream(d.getDataStream(root));
-
-        while (true) {
-            ZipEntry entry = zin.getNextEntry();
-            if (entry==null) break;
-            // crc32 is checked within zip-stream
-            if (entry.isDirectory()) continue;
-            zin.skip(entry.getSize());
-            byte buf[] = new byte[10];
-            int readBytes = zin.read(buf);
-            // zin.available() doesn't work for entries
-            assertEquals("size failed for "+entry.getName(), -1, readBytes);
-        }
-        
-        zin.close();
-    }
-
-    @Test
-    public void dataLength() throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getPOIFSInstance().openResourceAsStream("protected_agile.docx"));
-
-        EncryptionInfo info = new EncryptionInfo(fs);
-
-        Decryptor d = Decryptor.getInstance(info);
-
-        d.verifyPassword(Decryptor.DEFAULT_PASSWORD);
-
-        InputStream is = d.getDataStream(fs);
-
-        long len = d.getLength();
-        assertEquals(12810, len);
-
-        byte[] buf = new byte[(int)len];
-
-        is.read(buf);
-
-        ZipInputStream zin = new ZipInputStream(new ByteArrayInputStream(buf));
-
-        while (true) {
-            ZipEntry entry = zin.getNextEntry();
-            if (entry==null) {
-                break;
-            }
-
-            while (zin.available()>0) {
-                zin.skip(zin.available());
-            }
-        }
-    }
-
-    @Test
-    public void bug57080() throws Exception {
-        // the test file contains a wrong ole entry size, produced by extenxls
-        // the fix limits the available size and tries to read all entries 
-        File f = POIDataSamples.getPOIFSInstance().getFile("extenxls_pwd123.xlsx");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(f, true);
-        EncryptionInfo info = new EncryptionInfo(fs);
-        Decryptor d = Decryptor.getInstance(info);
-        d.verifyPassword("pwd123");
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ZipInputStream zis = new ZipInputStream(d.getDataStream(fs));
-        ZipEntry ze;
-        while ((ze = zis.getNextEntry()) != null) {
-            bos.reset();
-            IOUtils.copy(zis, bos);
-            assertEquals(ze.getSize(), bos.size());
-        }
-        
-        zis.close();
-        fs.close();
-    }
-
-    @Test
-    public void test58616() throws IOException, GeneralSecurityException {
-        POIFSFileSystem pfs = new POIFSFileSystem(new FileInputStream(XSSFTestDataSamples.getSampleFile("58616.xlsx")));                
-        EncryptionInfo info = new EncryptionInfo(pfs);             
-        Decryptor dec = Decryptor.getInstance(info);   
-        //dec.verifyPassword(null);
-        dec.getDataStream(pfs);
-    }
-
-    @Test
-    public void bug60320() throws IOException, GeneralSecurityException {
-        int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES");
-        Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files for AES 256", maxKeyLen == 2147483647);
-
-        InputStream is = POIDataSamples.getPOIFSInstance().openResourceAsStream("60320-protected.xlsx");
-        POIFSFileSystem fs = new POIFSFileSystem(is);
-        is.close();
-
-        EncryptionInfo info = new EncryptionInfo(fs);
-
-        Decryptor d = Decryptor.getInstance(info);
-
-        boolean b = d.verifyPassword("Test001!!");
-        assertTrue(b);
-
-        zipOk(fs.getRoot(), d);
-        
-        fs.close();
-    }    
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptionInfo.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptionInfo.java
deleted file mode 100644
index 204c2ed..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptionInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-
-public class TestEncryptionInfo {
-    @Test
-    public void testEncryptionInfo() throws IOException {
-        POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getPOIFSInstance().openResourceAsStream("protect.xlsx"));
-
-        EncryptionInfo info = new EncryptionInfo(fs);
-
-        assertEquals(3, info.getVersionMajor());
-        assertEquals(2, info.getVersionMinor());
-
-        assertEquals(CipherAlgorithm.aes128, info.getHeader().getCipherAlgorithm());
-        assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithm());
-        assertEquals(128, info.getHeader().getKeySize());
-        assertEquals(32, info.getVerifier().getEncryptedVerifierHash().length);
-        assertEquals(CipherProvider.aes, info.getHeader().getCipherProvider());                
-        assertEquals("Microsoft Enhanced RSA and AES Cryptographic Provider", info.getHeader().getCspName());
-        
-        fs.close();
-    }
-    
-    @Test
-    public void testEncryptionInfoSHA512() throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getPOIFSInstance().openResourceAsStream("protected_sha512.xlsx"));
-
-        EncryptionInfo info = new EncryptionInfo(fs);
-
-        assertEquals(4, info.getVersionMajor());
-        assertEquals(4, info.getVersionMinor());
-
-        assertEquals(CipherAlgorithm.aes256, info.getHeader().getCipherAlgorithm());
-        assertEquals(HashAlgorithm.sha512, info.getHeader().getHashAlgorithm());
-        assertEquals(256, info.getHeader().getKeySize());
-        assertEquals(64, info.getVerifier().getEncryptedVerifierHash().length);
-        assertEquals(CipherProvider.aes, info.getHeader().getCipherProvider());                
-//        assertEquals("Microsoft Enhanced RSA and AES Cryptographic Provider", info.getHeader().getCspName());
-        
-        fs.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
deleted file mode 100644
index 4a411cc..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import javax.crypto.Cipher;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.crypt.agile.AgileDecryptor;
-import org.apache.poi.poifs.crypt.agile.AgileEncryptionHeader;
-import org.apache.poi.poifs.crypt.agile.AgileEncryptionVerifier;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.BoundedInputStream;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class TestEncryptor {
-    @Test
-    public void binaryRC4Encryption() throws Exception {
-        // please contribute a real sample file, which is binary rc4 encrypted
-        // ... at least the output can be opened in Excel Viewer 
-        String password = "pass";
-
-        InputStream is = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("SimpleMultiCell.xlsx");
-        ByteArrayOutputStream payloadExpected = new ByteArrayOutputStream();
-        IOUtils.copy(is, payloadExpected);
-        is.close();
-        
-        POIFSFileSystem fs = new POIFSFileSystem();
-        EncryptionInfo ei = new EncryptionInfo(EncryptionMode.binaryRC4);
-        Encryptor enc = ei.getEncryptor();
-        enc.confirmPassword(password);
-        
-        OutputStream os = enc.getDataStream(fs.getRoot());
-        payloadExpected.writeTo(os);
-        os.close();
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        fs.writeFilesystem(bos);
-        
-        fs = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-        ei = new EncryptionInfo(fs);
-        Decryptor dec = ei.getDecryptor();
-        boolean b = dec.verifyPassword(password);
-        assertTrue(b);
-        
-        ByteArrayOutputStream payloadActual = new ByteArrayOutputStream();
-        is = dec.getDataStream(fs.getRoot());
-        IOUtils.copy(is,payloadActual);
-        is.close();
-        
-        assertArrayEquals(payloadExpected.toByteArray(), payloadActual.toByteArray());
-    }
-
-    @Test
-    public void agileEncryption() throws Exception {
-        int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES");
-        Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files for AES 256", maxKeyLen == 2147483647);
-
-        File file = POIDataSamples.getDocumentInstance().getFile("bug53475-password-is-pass.docx");
-        String pass = "pass";
-        NPOIFSFileSystem nfs = new NPOIFSFileSystem(file);
-
-        // Check the encryption details
-        EncryptionInfo infoExpected = new EncryptionInfo(nfs);
-        Decryptor decExpected = Decryptor.getInstance(infoExpected);
-        boolean passed = decExpected.verifyPassword(pass);
-        assertTrue("Unable to process: document is encrypted", passed);
-        
-        // extract the payload
-        InputStream is = decExpected.getDataStream(nfs);
-        byte payloadExpected[] = IOUtils.toByteArray(is);
-        is.close();
-
-        long decPackLenExpected = decExpected.getLength();
-        assertEquals(decPackLenExpected, payloadExpected.length);
-
-        is = nfs.getRoot().createDocumentInputStream(Decryptor.DEFAULT_POIFS_ENTRY);
-        is = new BoundedInputStream(is, is.available()-16); // ignore padding block
-        byte encPackExpected[] = IOUtils.toByteArray(is);
-        is.close();
-        
-        // listDir(nfs.getRoot(), "orig", "");
-        
-        nfs.close();
-
-        // check that same verifier/salt lead to same hashes
-        byte verifierSaltExpected[] = infoExpected.getVerifier().getSalt();
-        byte verifierExpected[] = decExpected.getVerifier();
-        byte keySalt[] = infoExpected.getHeader().getKeySalt();
-        byte keySpec[] = decExpected.getSecretKey().getEncoded();
-        byte integritySalt[] = decExpected.getIntegrityHmacKey();
-        // the hmacs of the file always differ, as we use PKCS5-padding to pad the bytes
-        // whereas office just uses random bytes
-        // byte integrityHash[] = d.getIntegrityHmacValue();
-        
-        POIFSFileSystem fs = new POIFSFileSystem();
-        EncryptionInfo infoActual = new EncryptionInfo(
-              EncryptionMode.agile
-            , infoExpected.getVerifier().getCipherAlgorithm()
-            , infoExpected.getVerifier().getHashAlgorithm()
-            , infoExpected.getHeader().getKeySize()
-            , infoExpected.getHeader().getBlockSize()
-            , infoExpected.getVerifier().getChainingMode()
-        );        
-
-        Encryptor e = Encryptor.getInstance(infoActual);
-        e.confirmPassword(pass, keySpec, keySalt, verifierExpected, verifierSaltExpected, integritySalt);
-    
-        OutputStream os = e.getDataStream(fs);
-        IOUtils.copy(new ByteArrayInputStream(payloadExpected), os);
-        os.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream(); 
-        fs.writeFilesystem(bos);
-        
-        nfs = new NPOIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-        infoActual = new EncryptionInfo(nfs.getRoot());
-        Decryptor decActual = Decryptor.getInstance(infoActual);
-        passed = decActual.verifyPassword(pass);        
-        assertTrue("Unable to process: document is encrypted", passed);
-        
-        // extract the payload
-        is = decActual.getDataStream(nfs);
-        byte payloadActual[] = IOUtils.toByteArray(is);
-        is.close();
-        
-        long decPackLenActual = decActual.getLength();
-        
-        is = nfs.getRoot().createDocumentInputStream(Decryptor.DEFAULT_POIFS_ENTRY);
-        is = new BoundedInputStream(is, is.available()-16); // ignore padding block
-        byte encPackActual[] = IOUtils.toByteArray(is);
-        is.close();
-        
-        // listDir(nfs.getRoot(), "copy", "");
-        
-        nfs.close();
-        
-        AgileEncryptionHeader aehExpected = (AgileEncryptionHeader)infoExpected.getHeader();
-        AgileEncryptionHeader aehActual = (AgileEncryptionHeader)infoActual.getHeader();
-        assertArrayEquals(aehExpected.getEncryptedHmacKey(), aehActual.getEncryptedHmacKey());
-        assertEquals(decPackLenExpected, decPackLenActual);
-        assertArrayEquals(payloadExpected, payloadActual);
-        assertArrayEquals(encPackExpected, encPackActual);
-    }
-    
-    @Test
-    public void standardEncryption() throws Exception {
-        File file = POIDataSamples.getDocumentInstance().getFile("bug53475-password-is-solrcell.docx");
-        String pass = "solrcell";
-        
-        NPOIFSFileSystem nfs = new NPOIFSFileSystem(file);
-
-        // Check the encryption details
-        EncryptionInfo infoExpected = new EncryptionInfo(nfs);
-        Decryptor d = Decryptor.getInstance(infoExpected);
-        boolean passed = d.verifyPassword(pass);
-        assertTrue("Unable to process: document is encrypted", passed);
-
-        // extract the payload
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        InputStream is = d.getDataStream(nfs);
-        IOUtils.copy(is, bos);
-        is.close();
-        nfs.close();
-        byte payloadExpected[] = bos.toByteArray();
-        
-        // check that same verifier/salt lead to same hashes
-        byte verifierSaltExpected[] = infoExpected.getVerifier().getSalt();
-        byte verifierExpected[] = d.getVerifier();
-        byte keySpec[] = d.getSecretKey().getEncoded();
-        byte keySalt[] = infoExpected.getHeader().getKeySalt();
-        
-        
-        EncryptionInfo infoActual = new EncryptionInfo(
-              EncryptionMode.standard
-            , infoExpected.getVerifier().getCipherAlgorithm()
-            , infoExpected.getVerifier().getHashAlgorithm()
-            , infoExpected.getHeader().getKeySize()
-            , infoExpected.getHeader().getBlockSize()
-            , infoExpected.getVerifier().getChainingMode()
-        );
-        
-        Encryptor e = Encryptor.getInstance(infoActual);
-        e.confirmPassword(pass, keySpec, keySalt, verifierExpected, verifierSaltExpected, null);
-        
-        assertArrayEquals(infoExpected.getVerifier().getEncryptedVerifier(), infoActual.getVerifier().getEncryptedVerifier());
-        assertArrayEquals(infoExpected.getVerifier().getEncryptedVerifierHash(), infoActual.getVerifier().getEncryptedVerifierHash());
-
-        // now we use a newly generated salt/verifier and check
-        // if the file content is still the same 
-
-        infoActual = new EncryptionInfo(
-              EncryptionMode.standard
-            , infoExpected.getVerifier().getCipherAlgorithm()
-            , infoExpected.getVerifier().getHashAlgorithm()
-            , infoExpected.getHeader().getKeySize()
-            , infoExpected.getHeader().getBlockSize()
-            , infoExpected.getVerifier().getChainingMode()
-        );
-        
-        e = Encryptor.getInstance(infoActual);
-        e.confirmPassword(pass);
-
-        POIFSFileSystem fs = new POIFSFileSystem();
-        OutputStream os = e.getDataStream(fs);
-        IOUtils.copy(new ByteArrayInputStream(payloadExpected), os);
-        os.close();
-        
-        bos.reset();
-        fs.writeFilesystem(bos);
-
-        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        
-        // FileOutputStream fos = new FileOutputStream("encrypted.docx");
-        // IOUtils.copy(bis, fos);
-        // fos.close();
-        // bis.reset();
-        
-        nfs = new NPOIFSFileSystem(bis);
-        infoExpected = new EncryptionInfo(nfs);
-        d = Decryptor.getInstance(infoExpected);
-        passed = d.verifyPassword(pass);
-        assertTrue("Unable to process: document is encrypted", passed);
-
-        bos.reset();
-        is = d.getDataStream(nfs);
-        IOUtils.copy(is, bos);
-        is.close();
-        nfs.close();
-        byte payloadActual[] = bos.toByteArray();        
-        
-        assertArrayEquals(payloadExpected, payloadActual);
-    }
-    
-    /**
-     * Ensure we can encrypt a package that is missing the Core
-     *  Properties, eg one from dodgy versions of Jasper Reports 
-     * See https://github.com/nestoru/xlsxenc/ and
-     * http://stackoverflow.com/questions/28593223
-     */
-    @Test
-    public void encryptPackageWithoutCoreProperties() throws Exception {
-        // Open our file without core properties
-        File inp = POIDataSamples.getOpenXML4JInstance().getFile("OPCCompliance_NoCoreProperties.xlsx");
-        OPCPackage pkg = OPCPackage.open(inp.getPath());
-        
-        // It doesn't have any core properties yet
-        assertEquals(0, pkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-        assertNotNull(pkg.getPackageProperties());
-        assertNotNull(pkg.getPackageProperties().getLanguageProperty());
-        assertNull(pkg.getPackageProperties().getLanguageProperty().getValue());
-        
-        // Encrypt it
-        EncryptionInfo info = new EncryptionInfo(EncryptionMode.agile);
-        NPOIFSFileSystem fs = new NPOIFSFileSystem();
-        
-        Encryptor enc = info.getEncryptor();
-        enc.confirmPassword("password");
-        OutputStream os = enc.getDataStream(fs);
-        pkg.save(os);
-        pkg.revert();
-        
-        // Save the resulting OLE2 document, and re-open it
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        fs.writeFilesystem(baos);
-        
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        NPOIFSFileSystem inpFS = new NPOIFSFileSystem(bais);
-        
-        // Check we can decrypt it
-        info = new EncryptionInfo(inpFS);
-        Decryptor d = Decryptor.getInstance(info);
-        assertEquals(true, d.verifyPassword("password"));
-        
-        OPCPackage inpPkg = OPCPackage.open(d.getDataStream(inpFS));
-        
-        // Check it now has empty core properties
-        assertEquals(1, inpPkg.getPartsByContentType(ContentTypes.CORE_PROPERTIES_PART).size());
-        assertNotNull(inpPkg.getPackageProperties());
-        assertNotNull(inpPkg.getPackageProperties().getLanguageProperty());
-        assertNull(inpPkg.getPackageProperties().getLanguageProperty().getValue());
-    }
-    
-    @Test
-    @Ignore
-    public void inPlaceRewrite() throws Exception {
-        File f = TempFile.createTempFile("protected_agile", ".docx");
-        // File f = new File("protected_agile.docx");
-        FileOutputStream fos = new FileOutputStream(f);
-        InputStream fis = POIDataSamples.getPOIFSInstance().openResourceAsStream("protected_agile.docx");
-        IOUtils.copy(fis, fos);
-        fis.close();
-        fos.close();
-        
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(f, false);
-
-        // decrypt the protected file - in this case it was encrypted with the default password
-        EncryptionInfo encInfo = new EncryptionInfo(fs);
-        Decryptor d = encInfo.getDecryptor();
-        boolean b = d.verifyPassword(Decryptor.DEFAULT_PASSWORD);
-        assertTrue(b);
-
-        // do some strange things with it ;)
-        XWPFDocument docx = new XWPFDocument(d.getDataStream(fs));
-        docx.getParagraphArray(0).insertNewRun(0).setText("POI was here! All your base are belong to us!");
-        docx.getParagraphArray(0).insertNewRun(1).addBreak();
-
-        // and encrypt it again
-        Encryptor e = encInfo.getEncryptor();
-        e.confirmPassword("AYBABTU");
-        docx.write(e.getDataStream(fs));
-        
-        fs.close();
-    }
-    
-    
-    private void listEntry(DocumentNode de, String ext, String path) throws IOException {
-        path += "\\" + de.getName().replaceAll("[\\p{Cntrl}]", "_");
-        System.out.println(ext+": "+path+" ("+de.getSize()+" bytes)");
-        
-        String name = de.getName().replaceAll("[\\p{Cntrl}]", "_");
-        
-        InputStream is = ((DirectoryNode)de.getParent()).createDocumentInputStream(de);
-        FileOutputStream fos = new FileOutputStream("solr."+name+"."+ext);
-        IOUtils.copy(is, fos);
-        fos.close();
-        is.close();
-    }
-    
-    @SuppressWarnings("unused")
-    private void listDir(DirectoryNode dn, String ext, String path) throws IOException {
-        path += "\\" + dn.getName().replace('\u0006', '_');
-        System.out.println(ext+": "+path+" ("+dn.getStorageClsid()+")");
-        
-        Iterator<Entry> iter = dn.getEntries();
-        while (iter.hasNext()) {
-            Entry ent = iter.next();
-            if (ent instanceof DirectoryNode) {
-                listDir((DirectoryNode)ent, ext, path);
-            } else {
-                listEntry((DocumentNode)ent, ext, path);
-            }
-        }
-    }
-
-    /*
-     * this test simulates the generation of bugs 60320 sample file
-     * as the padding bytes of the EncryptedPackage stream are random or in POIs case PKCS5-padded
-     * one would need to mock those bytes to get the same hmacValues - see diff below
-     *
-     * this use-case is experimental - for the time being the setters of the encryption classes
-     * are spreaded between two packages and are protected - so you would need to violate
-     * the packages rules and provide a helper class in the *poifs.crypt package-namespace.
-     * the default way of defining the encryption settings is via the EncryptionInfo class
-     */
-    @Test
-    public void bug60320CustomEncrypt() throws Exception {
-        int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES");
-        Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files for AES 256", maxKeyLen == 2147483647);
-
-        // --- src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java  (revision 1766745)
-        // +++ src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java  (working copy)
-        // @@ -208,6 +208,13 @@
-        //      protected int invokeCipher(int posInChunk, boolean doFinal) throws GeneralSecurityException {
-        //          byte plain[] = (_plainByteFlags.isEmpty()) ? null : _chunk.clone();
-        //  
-        // +        if (posInChunk < 4096) {
-        // +            _cipher.update(_chunk, 0, posInChunk, _chunk);
-        // +            byte bla[] = { (byte)0x7A,(byte)0x0F,(byte)0x27,(byte)0xF0,(byte)0x17,(byte)0x6E,(byte)0x77,(byte)0x05,(byte)0xB9,(byte)0xDA,(byte)0x49,(byte)0xF9,(byte)0xD7,(byte)0x8E,(byte)0x03,(byte)0x1D };
-        // +            System.arraycopy(bla, 0, _chunk, posInChunk-2, bla.length);
-        // +            return posInChunk-2+bla.length;
-        // +        }
-        // +        
-        //          int ciLen = (doFinal)
-        //              ? _cipher.doFinal(_chunk, 0, posInChunk, _chunk)
-        //              : _cipher.update(_chunk, 0, posInChunk, _chunk);
-        //
-        //      --- src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java (revision 1766745)
-        //      +++ src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java (working copy)
-        //      
-        //      @@ -300,7 +297,7 @@
-        //      protected static Cipher initCipherForBlock(Cipher existing, int block, boolean lastChunk, EncryptionInfo encryptionInfo, SecretKey skey, int encryptionMode)
-        //      throws GeneralSecurityException {
-        //          EncryptionHeader header = encryptionInfo.getHeader();
-        // -        String padding = (lastChunk ? "PKCS5Padding" : "NoPadding");
-        // +        String padding = "NoPadding"; // (lastChunk ? "PKCS5Padding" : "NoPadding");
-        //          if (existing == null || !existing.getAlgorithm().endsWith(padding)) {
-        //              existing = getCipher(skey, header.getCipherAlgorithm(), header.getChainingMode(), header.getKeySalt(), encryptionMode, padding);
-        //          }
-
-        InputStream is = POIDataSamples.getPOIFSInstance().openResourceAsStream("60320-protected.xlsx");
-        POIFSFileSystem fsOrig = new POIFSFileSystem(is);
-        is.close();
-        EncryptionInfo infoOrig = new EncryptionInfo(fsOrig);
-        Decryptor decOrig = infoOrig.getDecryptor();
-        boolean b = decOrig.verifyPassword("Test001!!");
-        assertTrue(b);
-        InputStream decIn = decOrig.getDataStream(fsOrig);
-        byte[] zipInput = IOUtils.toByteArray(decIn);
-        decIn.close();
-
-        InputStream epOrig = fsOrig.getRoot().createDocumentInputStream("EncryptedPackage");
-        // ignore the 16 padding bytes
-        byte[] epOrigBytes = IOUtils.toByteArray(epOrig, 9400);
-        epOrig.close();
-        
-        EncryptionInfo eiNew = new EncryptionInfo(EncryptionMode.agile);
-        AgileEncryptionHeader aehHeader = (AgileEncryptionHeader)eiNew.getHeader();
-        aehHeader.setCipherAlgorithm(CipherAlgorithm.aes128);
-        aehHeader.setHashAlgorithm(HashAlgorithm.sha1);
-        AgileEncryptionVerifier aehVerifier = (AgileEncryptionVerifier)eiNew.getVerifier();
-        
-        // this cast might look strange - if the setters would be public, it will become obsolete
-        // see http://stackoverflow.com/questions/5637650/overriding-protected-methods-in-java
-        ((EncryptionVerifier)aehVerifier).setCipherAlgorithm(CipherAlgorithm.aes256);
-        aehVerifier.setHashAlgorithm(HashAlgorithm.sha512);
-        
-        Encryptor enc = eiNew.getEncryptor();
-        enc.confirmPassword("Test001!!",
-            infoOrig.getDecryptor().getSecretKey().getEncoded(),
-            infoOrig.getHeader().getKeySalt(),
-            infoOrig.getDecryptor().getVerifier(),
-            infoOrig.getVerifier().getSalt(),
-            infoOrig.getDecryptor().getIntegrityHmacKey()
-        );
-        NPOIFSFileSystem fsNew = new NPOIFSFileSystem();
-        OutputStream os = enc.getDataStream(fsNew);
-        os.write(zipInput);
-        os.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        fsNew.writeFilesystem(bos);
-        fsNew.close();
-        
-        NPOIFSFileSystem fsReload = new NPOIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-        InputStream epReload = fsReload.getRoot().createDocumentInputStream("EncryptedPackage");
-        byte[] epNewBytes = IOUtils.toByteArray(epReload, 9400);
-        epReload.close();
-        
-        assertArrayEquals(epOrigBytes, epNewBytes);
-        
-        EncryptionInfo infoReload = new EncryptionInfo(fsOrig);
-        Decryptor decReload = infoReload.getDecryptor();
-        b = decReload.verifyPassword("Test001!!");
-        assertTrue(b);
-        
-        AgileEncryptionHeader aehOrig = (AgileEncryptionHeader)infoOrig.getHeader();
-        AgileEncryptionHeader aehReload = (AgileEncryptionHeader)infoReload.getHeader();
-        assertEquals(aehOrig.getBlockSize(), aehReload.getBlockSize());
-        assertEquals(aehOrig.getChainingMode(), aehReload.getChainingMode());
-        assertEquals(aehOrig.getCipherAlgorithm(), aehReload.getCipherAlgorithm());
-        assertEquals(aehOrig.getCipherProvider(), aehReload.getCipherProvider());
-        assertEquals(aehOrig.getCspName(), aehReload.getCspName());
-        assertArrayEquals(aehOrig.getEncryptedHmacKey(), aehReload.getEncryptedHmacKey());
-        // this only works, when the paddings are mocked to be the same ...
-        // assertArrayEquals(aehOrig.getEncryptedHmacValue(), aehReload.getEncryptedHmacValue());
-        assertEquals(aehOrig.getFlags(), aehReload.getFlags());
-        assertEquals(aehOrig.getHashAlgorithm(), aehReload.getHashAlgorithm());
-        assertArrayEquals(aehOrig.getKeySalt(), aehReload.getKeySalt());
-        assertEquals(aehOrig.getKeySize(), aehReload.getKeySize());
-        
-        AgileEncryptionVerifier aevOrig = (AgileEncryptionVerifier)infoOrig.getVerifier();
-        AgileEncryptionVerifier aevReload = (AgileEncryptionVerifier)infoReload.getVerifier();
-        assertEquals(aevOrig.getBlockSize(), aevReload.getBlockSize());
-        assertEquals(aevOrig.getChainingMode(), aevReload.getChainingMode());
-        assertEquals(aevOrig.getCipherAlgorithm(), aevReload.getCipherAlgorithm());
-        assertArrayEquals(aevOrig.getEncryptedKey(), aevReload.getEncryptedKey());
-        assertArrayEquals(aevOrig.getEncryptedVerifier(), aevReload.getEncryptedVerifier());
-        assertArrayEquals(aevOrig.getEncryptedVerifierHash(), aevReload.getEncryptedVerifierHash());
-        assertEquals(aevOrig.getHashAlgorithm(), aevReload.getHashAlgorithm());
-        assertEquals(aevOrig.getKeySize(), aevReload.getKeySize());
-        assertArrayEquals(aevOrig.getSalt(), aevReload.getSalt());
-        assertEquals(aevOrig.getSpinCount(), aevReload.getSpinCount());
-
-        AgileDecryptor adOrig = (AgileDecryptor)infoOrig.getDecryptor();
-        AgileDecryptor adReload = (AgileDecryptor)infoReload.getDecryptor();
-        
-        assertArrayEquals(adOrig.getIntegrityHmacKey(), adReload.getIntegrityHmacKey());
-        // doesn't work without mocking ... see above
-        // assertArrayEquals(adOrig.getIntegrityHmacValue(), adReload.getIntegrityHmacValue());
-        assertArrayEquals(adOrig.getSecretKey().getEncoded(), adReload.getSecretKey().getEncoded());
-        assertArrayEquals(adOrig.getVerifier(), adReload.getVerifier());
-
-        fsReload.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSecureTempZip.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSecureTempZip.java
deleted file mode 100644
index e6224ad..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSecureTempZip.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.util.ZipEntrySource;
-import org.apache.poi.poifs.crypt.temp.AesZipFileZipEntrySource;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.extractor.XSSFEventBasedExcelExtractor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Test;
-
-public class TestSecureTempZip {
-    /**
-     * Test case for #59841 - this is an example on how to use encrypted temp files,
-     * which are streamed into POI opposed to having everything in memory
-     */
-    @Test
-    public void protectedTempZip() throws IOException, GeneralSecurityException, XmlException, OpenXML4JException {
-        File tikaProt = XSSFTestDataSamples.getSampleFile("protected_passtika.xlsx");
-        FileInputStream fis = new FileInputStream(tikaProt);
-        POIFSFileSystem poifs = new POIFSFileSystem(fis);
-        EncryptionInfo ei = new EncryptionInfo(poifs);
-        Decryptor dec = ei.getDecryptor();
-        boolean passOk = dec.verifyPassword("tika");
-        assertTrue(passOk);
-
-        // extract encrypted ooxml file and write to custom encrypted zip file 
-        InputStream is = dec.getDataStream(poifs);
-        
-        // provide ZipEntrySource to poi which decrypts on the fly
-        ZipEntrySource source = AesZipFileZipEntrySource.createZipEntrySource(is);
-
-        // test the source
-        OPCPackage opc = OPCPackage.open(source);
-        String expected = "This is an Encrypted Excel spreadsheet.";
-        
-        XSSFEventBasedExcelExtractor extractor = new XSSFEventBasedExcelExtractor(opc);
-        extractor.setIncludeSheetNames(false);
-        String txt = extractor.getText();
-        assertEquals(expected, txt.trim());
-        
-        XSSFWorkbook wb = new XSSFWorkbook(opc);
-        txt = wb.getSheetAt(0).getRow(0).getCell(0).getStringCellValue();
-        assertEquals(expected, txt);
-
-        extractor.close();
-        
-        wb.close();
-        opc.close();
-        source.close();
-        poifs.close();
-        fis.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java b/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
deleted file mode 100644
index 202b9e1..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
+++ /dev/null
@@ -1,719 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/* ====================================================================
-   This product contains an ASLv2 licensed version of the OOXML signer
-   package from the eID Applet project
-   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  
-   Copyright (C) 2008-2014 FedICT.
-   ================================================================= */ 
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.*;
-import java.security.Key;
-import java.security.KeyPair;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POITestCase;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
-import org.apache.poi.poifs.crypt.dsig.DigestInfo;
-import org.apache.poi.poifs.crypt.dsig.SignatureConfig;
-import org.apache.poi.poifs.crypt.dsig.SignatureInfo;
-import org.apache.poi.poifs.crypt.dsig.SignatureInfo.SignaturePart;
-import org.apache.poi.poifs.crypt.dsig.facets.EnvelopedSignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.facets.KeyInfoSignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.facets.XAdESSignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.facets.XAdESXLSignatureFacet;
-import org.apache.poi.poifs.crypt.dsig.services.RevocationData;
-import org.apache.poi.poifs.crypt.dsig.services.RevocationDataService;
-import org.apache.poi.poifs.crypt.dsig.services.TimeStampService;
-import org.apache.poi.poifs.crypt.dsig.services.TimeStampServiceValidator;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.util.DocumentHelper;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.XmlObject;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.cert.ocsp.OCSPResp;
-import org.etsi.uri.x01903.v13.DigestAlgAndValueType;
-import org.etsi.uri.x01903.v13.QualifyingPropertiesType;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3.x2000.x09.xmldsig.ReferenceType;
-import org.w3.x2000.x09.xmldsig.SignatureDocument;
-import org.w3c.dom.Document;
-
-public class TestSignatureInfo {
-    private static final POILogger LOG = POILogFactory.getLogger(TestSignatureInfo.class);
-    private static final POIDataSamples testdata = POIDataSamples.getXmlDSignInstance();
-
-    private static Calendar cal;
-    private KeyPair keyPair = null;
-    private X509Certificate x509 = null;
-    
-    @BeforeClass
-    public static void initBouncy() throws IOException {
-        CryptoFunctions.registerBouncyCastle();
-
-        // Set cal to now ... only set to fixed date for debugging ...
-        cal = LocaleUtil.getLocaleCalendar(LocaleUtil.TIMEZONE_UTC);
-        assertNotNull(cal);
-//        cal.set(2014, 7, 6, 21, 42, 12);
-//        cal.clear(Calendar.MILLISECOND);
-
-        // don't run this test when we are using older Xerces as it triggers an XML Parser backwards compatibility issue 
-        // in the xmlsec jar file
-        String additionalJar = System.getProperty("additionaljar");
-        //System.out.println("Having: " + additionalJar);
-        Assume.assumeTrue("Not running TestSignatureInfo because we are testing with additionaljar set to " + additionalJar, 
-                additionalJar == null || additionalJar.trim().length() == 0);
-    }
-    
-    @Test
-    public void office2007prettyPrintedRels() throws Exception {
-        OPCPackage pkg = OPCPackage.open(testdata.getFile("office2007prettyPrintedRels.docx"), PackageAccess.READ);
-        try {
-            SignatureConfig sic = new SignatureConfig();
-            sic.setOpcPackage(pkg);
-            SignatureInfo si = new SignatureInfo();
-            si.setSignatureConfig(sic);
-            boolean isValid = si.verifySignature();
-            assertTrue(isValid);
-        } finally {
-            pkg.close();
-        }
-    }
-    
-    @Test
-    public void getSignerUnsigned() throws Exception {
-        String testFiles[] = { 
-            "hello-world-unsigned.docx",
-            "hello-world-unsigned.pptx",
-            "hello-world-unsigned.xlsx",
-            "hello-world-office-2010-technical-preview-unsigned.docx"
-        };
-        
-        for (String testFile : testFiles) {
-            OPCPackage pkg = OPCPackage.open(testdata.getFile(testFile), PackageAccess.READ);
-            SignatureConfig sic = new SignatureConfig();
-            sic.setOpcPackage(pkg);
-            SignatureInfo si = new SignatureInfo();
-            si.setSignatureConfig(sic);
-            List<X509Certificate> result = new ArrayList<X509Certificate>();
-            for (SignaturePart sp : si.getSignatureParts()) {
-                if (sp.validate()) {
-                    result.add(sp.getSigner());
-                }
-            }
-            pkg.revert();
-            pkg.close();
-            assertNotNull(result);
-            assertTrue(result.isEmpty());
-        }
-    }
-    
-    @Test
-    public void getSigner() throws Exception {
-        String testFiles[] = { 
-            "hyperlink-example-signed.docx",
-            "hello-world-signed.docx",
-            "hello-world-signed.pptx",
-            "hello-world-signed.xlsx",
-            "hello-world-office-2010-technical-preview.docx",
-            "ms-office-2010-signed.docx",
-            "ms-office-2010-signed.pptx",
-            "ms-office-2010-signed.xlsx",
-            "Office2010-SP1-XAdES-X-L.docx",
-            "signed.docx",
-        };
-        
-        for (String testFile : testFiles) {
-            OPCPackage pkg = OPCPackage.open(testdata.getFile(testFile), PackageAccess.READ);
-            try {
-                SignatureConfig sic = new SignatureConfig();
-                sic.setOpcPackage(pkg);
-                SignatureInfo si = new SignatureInfo();
-                si.setSignatureConfig(sic);
-                List<X509Certificate> result = new ArrayList<X509Certificate>();
-                for (SignaturePart sp : si.getSignatureParts()) {
-                    if (sp.validate()) {
-                        result.add(sp.getSigner());
-                    }
-                }
-    
-                assertNotNull(result);
-                assertEquals("test-file: "+testFile, 1, result.size());
-                X509Certificate signer = result.get(0);
-                LOG.log(POILogger.DEBUG, "signer: " + signer.getSubjectX500Principal());
-    
-                boolean b = si.verifySignature();
-                assertTrue("test-file: "+testFile, b);
-                pkg.revert();
-            } finally {
-                pkg.close();
-            }
-        }
-    }
-
-    @Test
-    public void getMultiSigners() throws Exception {
-        String testFile = "hello-world-signed-twice.docx";
-        OPCPackage pkg = OPCPackage.open(testdata.getFile(testFile), PackageAccess.READ);
-        try {
-            SignatureConfig sic = new SignatureConfig();
-            sic.setOpcPackage(pkg);
-            SignatureInfo si = new SignatureInfo();
-            si.setSignatureConfig(sic);
-            List<X509Certificate> result = new ArrayList<X509Certificate>();
-            for (SignaturePart sp : si.getSignatureParts()) {
-                if (sp.validate()) {
-                    result.add(sp.getSigner());
-                }
-            }
-    
-            assertNotNull(result);
-            assertEquals("test-file: "+testFile, 2, result.size());
-            X509Certificate signer1 = result.get(0);
-            X509Certificate signer2 = result.get(1);
-            LOG.log(POILogger.DEBUG, "signer 1: " + signer1.getSubjectX500Principal());
-            LOG.log(POILogger.DEBUG, "signer 2: " + signer2.getSubjectX500Principal());
-    
-            boolean b = si.verifySignature();
-            assertTrue("test-file: "+testFile, b);
-            pkg.revert();
-        } finally {
-            pkg.close();
-        }
-    }
-    
-    @Test
-    public void testSignSpreadsheet() throws Exception {
-        String testFile = "hello-world-unsigned.xlsx";
-        OPCPackage pkg = OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE);
-        sign(pkg, "Test", "CN=Test", 1);
-        pkg.close();
-    }
-
-    @Test
-    public void testManipulation() throws Exception {
-        // sign & validate
-        String testFile = "hello-world-unsigned.xlsx";
-        @SuppressWarnings("resource")
-        OPCPackage pkg = OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE);
-        sign(pkg, "Test", "CN=Test", 1);
-        
-        // manipulate
-        XSSFWorkbook wb = new XSSFWorkbook(pkg);
-        wb.setSheetName(0, "manipulated");
-        // ... I don't know, why commit is protected ...
-        POITestCase.callMethod(XSSFWorkbook.class, wb, Void.class, "commit", new Class[0], new Object[0]);
-
-        // todo: test a manipulation on a package part, which is not signed
-        // ... maybe in combination with #56164 
-        
-        // validate
-        SignatureConfig sic = new SignatureConfig();
-        sic.setOpcPackage(pkg);
-        SignatureInfo si = new SignatureInfo();
-        si.setSignatureConfig(sic);
-        boolean b = si.verifySignature();
-        assertFalse("signature should be broken", b);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testSignSpreadsheetWithSignatureInfo() throws Exception {
-        initKeyPair("Test", "CN=Test");
-        String testFile = "hello-world-unsigned.xlsx";
-        OPCPackage pkg = OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE);
-        SignatureConfig sic = new SignatureConfig();
-        sic.setOpcPackage(pkg);
-        sic.setKey(keyPair.getPrivate());
-        sic.setSigningCertificateChain(Collections.singletonList(x509));
-        SignatureInfo si = new SignatureInfo();
-        si.setSignatureConfig(sic);
-        // hash > sha1 doesn't work in excel viewer ...
-        si.confirmSignature();
-        List<X509Certificate> result = new ArrayList<X509Certificate>();
-        for (SignaturePart sp : si.getSignatureParts()) {
-            if (sp.validate()) {
-                result.add(sp.getSigner());
-            }
-        }
-        assertEquals(1, result.size());
-        pkg.close();
-    }
-
-    @Test
-    public void testSignEnvelopingDocument() throws Exception {
-        String testFile = "hello-world-unsigned.xlsx";
-        OPCPackage pkg = OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE);
-
-        initKeyPair("Test", "CN=Test");
-        final X509CRL crl = PkiTestUtils.generateCrl(x509, keyPair.getPrivate());
-        
-        // setup
-        SignatureConfig signatureConfig = new SignatureConfig();
-        signatureConfig.setOpcPackage(pkg);
-        signatureConfig.setKey(keyPair.getPrivate());
-
-        /*
-         * We need at least 2 certificates for the XAdES-C complete certificate
-         * refs construction.
-         */
-        List<X509Certificate> certificateChain = new ArrayList<X509Certificate>();
-        certificateChain.add(x509);
-        certificateChain.add(x509);
-        signatureConfig.setSigningCertificateChain(certificateChain);
-        
-        signatureConfig.addSignatureFacet(new EnvelopedSignatureFacet());
-        signatureConfig.addSignatureFacet(new KeyInfoSignatureFacet());
-        signatureConfig.addSignatureFacet(new XAdESSignatureFacet());
-        signatureConfig.addSignatureFacet(new XAdESXLSignatureFacet());
-        
-        // check for internet, no error means it works
-        boolean mockTsp = (getAccessError("http://timestamp.comodoca.com/rfc3161", true, 10000) != null);
-        
-        // http://timestamping.edelweb.fr/service/tsp
-        // http://tsa.belgium.be/connect
-        // http://timestamp.comodoca.com/authenticode
-        // http://timestamp.comodoca.com/rfc3161
-        // http://services.globaltrustfinder.com/adss/tsa
-        signatureConfig.setTspUrl("http://timestamp.comodoca.com/rfc3161");
-        signatureConfig.setTspRequestPolicy(null); // comodoca request fails, if default policy is set ...
-        signatureConfig.setTspOldProtocol(false);
-        
-        //set proxy info if any
-        String proxy = System.getProperty("http_proxy");
-        if (proxy != null && proxy.trim().length() > 0) {
-            signatureConfig.setProxyUrl(proxy);
-        }
-
-        if (mockTsp) {
-            TimeStampService tspService = new TimeStampService(){
-                @Override
-                public byte[] timeStamp(byte[] data, RevocationData revocationData) throws Exception {
-                    revocationData.addCRL(crl);
-                    return "time-stamp-token".getBytes(LocaleUtil.CHARSET_1252);                
-                }
-                @Override
-                public void setSignatureConfig(SignatureConfig config) {
-                    // empty on purpose
-                }
-            };
-            signatureConfig.setTspService(tspService);
-        } else {
-            TimeStampServiceValidator tspValidator = new TimeStampServiceValidator() {
-                @Override
-                public void validate(List<X509Certificate> validateChain,
-                RevocationData revocationData) throws Exception {
-                    for (X509Certificate certificate : validateChain) {
-                        LOG.log(POILogger.DEBUG, "certificate: " + certificate.getSubjectX500Principal());
-                        LOG.log(POILogger.DEBUG, "validity: " + certificate.getNotBefore() + " - " + certificate.getNotAfter());
-                    }
-                }
-            };
-            signatureConfig.setTspValidator(tspValidator);
-            signatureConfig.setTspOldProtocol(signatureConfig.getTspUrl().contains("edelweb"));
-        }
-        
-        final RevocationData revocationData = new RevocationData();
-        revocationData.addCRL(crl);
-        OCSPResp ocspResp = PkiTestUtils.createOcspResp(x509, false,
-                x509, x509, keyPair.getPrivate(), "SHA1withRSA", cal.getTimeInMillis());
-        revocationData.addOCSP(ocspResp.getEncoded());
-
-        RevocationDataService revocationDataService = new RevocationDataService(){
-            @Override
-            public RevocationData getRevocationData(List<X509Certificate> revocationChain) {
-                return revocationData;
-            }
-        };
-        signatureConfig.setRevocationDataService(revocationDataService);
-
-        // operate
-        SignatureInfo si = new SignatureInfo();
-        si.setSignatureConfig(signatureConfig);
-        try {
-            si.confirmSignature();
-        } catch (RuntimeException e) {
-            pkg.close();
-            // only allow a ConnectException because of timeout, we see this in Jenkins from time to time...
-            if(e.getCause() == null) {
-                throw e;
-            }
-            if((e.getCause() instanceof ConnectException) || (e.getCause() instanceof SocketTimeoutException)) {
-                Assume.assumeTrue("Only allowing ConnectException with 'timed out' as message here, but had: " + e,
-                        e.getCause().getMessage().contains("timed out"));
-            } else if (e.getCause() instanceof IOException) {
-                Assume.assumeTrue("Only allowing IOException with 'Error contacting TSP server' as message here, but had: " + e,
-                        e.getCause().getMessage().contains("Error contacting TSP server"));
-            } else if (e.getCause() instanceof RuntimeException) {
-                Assume.assumeTrue("Only allowing RuntimeException with 'This site is cur' as message here, but had: " + e,
-                        e.getCause().getMessage().contains("This site is cur"));
-            } else {
-                throw e;
-            }
-        }
-        
-        // verify
-        Iterator<SignaturePart> spIter = si.getSignatureParts().iterator();
-        assertTrue("Had: " + si.getSignatureConfig().getOpcPackage().
-                        getRelationshipsByType(PackageRelationshipTypes.DIGITAL_SIGNATURE_ORIGIN),
-                spIter.hasNext());
-        SignaturePart sp = spIter.next();
-        boolean valid = sp.validate();
-        assertTrue(valid);
-        
-        SignatureDocument sigDoc = sp.getSignatureDocument();
-        String declareNS = 
-            "declare namespace xades='http://uri.etsi.org/01903/v1.3.2#'; "
-          + "declare namespace ds='http://www.w3.org/2000/09/xmldsig#'; ";
-        
-        String digestValXQuery = declareNS +
-            "$this/ds:Signature/ds:SignedInfo/ds:Reference";
-        for (ReferenceType rt : (ReferenceType[])sigDoc.selectPath(digestValXQuery)) {
-            assertNotNull(rt.getDigestValue());
-            assertEquals(signatureConfig.getDigestMethodUri(), rt.getDigestMethod().getAlgorithm());
-        }
-
-        String certDigestXQuery = declareNS +
-            "$this//xades:SigningCertificate/xades:Cert/xades:CertDigest";
-        XmlObject xoList[] = sigDoc.selectPath(certDigestXQuery);
-        assertEquals(xoList.length, 1);
-        DigestAlgAndValueType certDigest = (DigestAlgAndValueType)xoList[0];
-        assertNotNull(certDigest.getDigestValue());
-
-        String qualPropXQuery = declareNS +
-            "$this/ds:Signature/ds:Object/xades:QualifyingProperties";
-        xoList = sigDoc.selectPath(qualPropXQuery);
-        assertEquals(xoList.length, 1);
-        QualifyingPropertiesType qualProp = (QualifyingPropertiesType)xoList[0];
-        boolean qualPropXsdOk = qualProp.validate();
-        assertTrue(qualPropXsdOk);
-
-        pkg.close();
-    }
-
-    public static String getAccessError(String destinationUrl, boolean fireRequest, int timeout) {
-        URL url;
-        try {
-            url = new URL(destinationUrl);
-        } catch (MalformedURLException e) {
-            throw new IllegalArgumentException("Invalid destination URL", e);
-        }
-
-        HttpURLConnection conn = null;
-        try {
-            conn = (HttpURLConnection) url.openConnection();
-
-            // set specified timeout if non-zero
-            if(timeout != 0) {
-                conn.setConnectTimeout(timeout);
-                conn.setReadTimeout(timeout);
-            }
-
-            conn.setDoOutput(false);
-            conn.setDoInput(true);
-
-            /* if connecting is not possible this will throw a connection refused exception */
-            conn.connect();
-
-            if (fireRequest) {
-                InputStream is = null;
-                try {
-                    is = conn.getInputStream();
-                } finally {
-                    IOUtils.closeQuietly(is);
-                }
-
-            }
-            /* if connecting is possible we return true here */
-            return null;
-
-        } catch (IOException e) {
-            /* exception is thrown -> server not available */
-            return e.getClass().getName() + ": " + e.getMessage();
-        } finally {
-            if (conn != null) {
-                conn.disconnect();
-            }
-        }
-    }
-    
-    @Test
-    public void testCertChain() throws Exception {
-        KeyStore keystore = KeyStore.getInstance("PKCS12");
-        String password = "test";
-        InputStream is = testdata.openResourceAsStream("chaintest.pfx");
-        keystore.load(is, password.toCharArray());
-        is.close();
-
-        Key key = keystore.getKey("poitest", password.toCharArray());
-        Certificate chainList[] = keystore.getCertificateChain("poitest");
-        List<X509Certificate> certChain = new ArrayList<X509Certificate>();
-        for (Certificate c : chainList) {
-            certChain.add((X509Certificate)c);
-        }
-        x509 = certChain.get(0);
-        keyPair = new KeyPair(x509.getPublicKey(), (PrivateKey)key);
-        
-        String testFile = "hello-world-unsigned.xlsx";
-        OPCPackage pkg = OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE);
-
-        SignatureConfig signatureConfig = new SignatureConfig();
-        signatureConfig.setKey(keyPair.getPrivate());
-        signatureConfig.setSigningCertificateChain(certChain);
-        Calendar oldCal = LocaleUtil.getLocaleCalendar(2007, 7, 1);
-        signatureConfig.setExecutionTime(oldCal.getTime());
-        signatureConfig.setDigestAlgo(HashAlgorithm.sha1);
-        signatureConfig.setOpcPackage(pkg);
-        
-        SignatureInfo si = new SignatureInfo();
-        si.setSignatureConfig(signatureConfig);
-
-        si.confirmSignature();
-        
-        for (SignaturePart sp : si.getSignatureParts()){
-            assertTrue("Could not validate", sp.validate());
-            X509Certificate signer = sp.getSigner();
-            assertNotNull("signer undefined?!", signer);
-            List<X509Certificate> certChainRes = sp.getCertChain();
-            assertEquals(3, certChainRes.size());
-        }
-        
-        pkg.close();
-    }
-
-    @Test
-    public void testNonSha1() throws Exception {
-        String testFile = "hello-world-unsigned.xlsx";
-        initKeyPair("Test", "CN=Test");
-
-        SignatureConfig signatureConfig = new SignatureConfig();
-        signatureConfig.setKey(keyPair.getPrivate());
-        signatureConfig.setSigningCertificateChain(Collections.singletonList(x509));
-
-        HashAlgorithm testAlgo[] = { HashAlgorithm.sha224, HashAlgorithm.sha256
-            , HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.ripemd160 }; 
-        
-        for (HashAlgorithm ha : testAlgo) {
-            OPCPackage pkg = null;
-            try {
-                signatureConfig.setDigestAlgo(ha);
-                pkg = OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE);
-                signatureConfig.setOpcPackage(pkg);
-                
-                SignatureInfo si = new SignatureInfo();
-                si.setSignatureConfig(signatureConfig);
-        
-                si.confirmSignature();
-                boolean b = si.verifySignature();
-                assertTrue("Signature not correctly calculated for " + ha, b);
-            } finally {
-                if (pkg != null) pkg.close();
-            }
-        }
-    }
-
-    @Test
-    public void bug58630() throws Exception {
-        // test deletion of sheet 0 and signing
-        File tpl = copy(testdata.getFile("bug58630.xlsx"));
-        SXSSFWorkbook wb1 = new SXSSFWorkbook((XSSFWorkbook)WorkbookFactory.create(tpl), 10);
-        wb1.setCompressTempFiles(true);
-        wb1.removeSheetAt(0);
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        wb1.write(os);
-        wb1.close();
-        OPCPackage pkg = OPCPackage.open(new ByteArrayInputStream(os.toByteArray()));
-        
-        initKeyPair("Test", "CN=Test");
-        SignatureConfig signatureConfig = new SignatureConfig();
-        signatureConfig.setKey(keyPair.getPrivate());
-        signatureConfig.setSigningCertificateChain(Collections.singletonList(x509));
-        signatureConfig.setOpcPackage(pkg);
-        
-        SignatureInfo si = new SignatureInfo();
-        si.setSignatureConfig(signatureConfig);
-        si.confirmSignature();
-        assertTrue("invalid signature", si.verifySignature());
-        
-        pkg.close();
-    }
-    
-    @Test
-    public void testMultiSign() throws Exception {
-        initKeyPair("KeyA", "CN=KeyA");
-        //KeyPair keyPairA = keyPair;
-        //X509Certificate x509A = x509;
-        initKeyPair("KeyB", "CN=KeyB");
-        //KeyPair keyPairB = keyPair;
-        //X509Certificate x509B = x509;
-        
-        File tpl = copy(testdata.getFile("bug58630.xlsx"));
-        OPCPackage pkg = OPCPackage.open(tpl);
-        try {
-            //SignatureConfig signatureConfig = new SignatureConfig();
-            assertNotNull(pkg);
-        } finally {
-            pkg.close();
-        }
-    }
-    
-    private void sign(OPCPackage pkgCopy, String alias, String signerDn, int signerCount) throws Exception {
-        initKeyPair(alias, signerDn);
-
-        SignatureConfig signatureConfig = new SignatureConfig();
-        signatureConfig.setKey(keyPair.getPrivate());
-        signatureConfig.setSigningCertificateChain(Collections.singletonList(x509));
-        signatureConfig.setExecutionTime(cal.getTime());
-        signatureConfig.setDigestAlgo(HashAlgorithm.sha1);
-        signatureConfig.setOpcPackage(pkgCopy);
-        
-        SignatureInfo si = new SignatureInfo();
-        si.setSignatureConfig(signatureConfig);
-
-        Document document = DocumentHelper.createDocument();
-
-        // operate
-        DigestInfo digestInfo = si.preSign(document, null);
-
-        // verify
-        assertNotNull(digestInfo);
-        LOG.log(POILogger.DEBUG, "digest algo: " + digestInfo.hashAlgo);
-        LOG.log(POILogger.DEBUG, "digest description: " + digestInfo.description);
-        assertEquals("Office OpenXML Document", digestInfo.description);
-        assertNotNull(digestInfo.hashAlgo);
-        assertNotNull(digestInfo.digestValue);
-
-        // setup: key material, signature value
-        byte[] signatureValue = si.signDigest(digestInfo.digestValue);
-        
-        // operate: postSign
-        si.postSign(document, signatureValue);
-
-        // verify: signature
-        si.getSignatureConfig().setOpcPackage(pkgCopy);
-        List<X509Certificate> result = new ArrayList<X509Certificate>();
-        for (SignaturePart sp : si.getSignatureParts()) {
-            if (sp.validate()) {
-                result.add(sp.getSigner());
-            }
-        }
-        assertEquals(signerCount, result.size());
-    }
-
-    private void initKeyPair(String alias, String subjectDN) throws Exception {
-        final char password[] = "test".toCharArray();
-        File file = new File("build/test.pfx");
-
-        KeyStore keystore = KeyStore.getInstance("PKCS12");
-
-        if (file.exists()) {
-            FileInputStream fis = new FileInputStream(file);
-            keystore.load(fis, password);
-            fis.close();
-        } else {
-            keystore.load(null, password);
-        }
-
-        if (keystore.isKeyEntry(alias)) {
-            Key key = keystore.getKey(alias, password);
-            x509 = (X509Certificate)keystore.getCertificate(alias);
-            keyPair = new KeyPair(x509.getPublicKey(), (PrivateKey)key);
-        } else {
-            keyPair = PkiTestUtils.generateKeyPair();
-            Date notBefore = cal.getTime();
-            Calendar cal2 = (Calendar)cal.clone();
-            cal2.add(Calendar.YEAR, 1);
-            Date notAfter = cal2.getTime();
-            KeyUsage keyUsage = new KeyUsage(KeyUsage.digitalSignature);
-            
-            x509 = PkiTestUtils.generateCertificate(keyPair.getPublic(), subjectDN
-                , notBefore, notAfter, null, keyPair.getPrivate(), true, 0, null, null, keyUsage);
-
-            keystore.setKeyEntry(alias, keyPair.getPrivate(), password, new Certificate[]{x509});
-            FileOutputStream fos = new FileOutputStream(file);
-            keystore.store(fos, password);
-            fos.close();
-        }
-    }
-
-    private static File copy(File input) throws IOException {
-        String extension = input.getName().replaceAll(".*?(\\.[^.]+)?$", "$1");
-        if (extension == null || "".equals(extension)) {
-            extension = ".zip";
-        }
-
-        // ensure that we create the "build" directory as it might not be existing
-        // in the Sonar Maven runs where we are at a different source directory
-        File buildDir = new File("build");
-        if(!buildDir.exists()) {
-            assertTrue("Failed to create " + buildDir.getAbsolutePath(), 
-                    buildDir.mkdirs());
-        }
-        File tmpFile = new File(buildDir, "sigtest"+extension);
-
-        OutputStream fos = new FileOutputStream(tmpFile);
-        try {
-            InputStream fis = new FileInputStream(input);
-            try {
-                IOUtils.copy(fis, fos);
-            } finally {
-                fis.close();
-            }
-        } finally {
-            fos.close();
-        }
-
-        return tmpFile;
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/sl/TestHeadersFooters.java b/trunk/src/ooxml/testcases/org/apache/poi/sl/TestHeadersFooters.java
deleted file mode 100644
index 8587b0e..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/sl/TestHeadersFooters.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.apache.poi.sl.TestTable.openSampleSlideshow;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.sl.usermodel.TextShape;
-import org.junit.Test;
-
-public class TestHeadersFooters {
-    @Test
-    public void bug58144() throws IOException {
-        SlideShow<?,?> ppt1 = openSampleSlideshow("bug58144-headers-footers-2003.ppt");
-        HSLFSlide sl1 = (HSLFSlide)ppt1.getSlides().get(0);
-        HeadersFooters hfs1 = sl1.getHeadersFooters();
-        assertNull(hfs1.getHeaderText());
-        assertEquals("Confidential", hfs1.getFooterText());
-        List<List<HSLFTextParagraph>> llp1 = sl1.getTextParagraphs();
-        assertEquals("Test", HSLFTextParagraph.getText(llp1.get(0)));
-        assertFalse(llp1.get(0).get(0).isHeaderOrFooter());
-        ppt1.close();
-
-        String ppt2007s[] = {
-            "bug58144-headers-footers-2007.ppt", "bug58144-headers-footers-2007.pptx"
-        };
-        
-        for (String pptName : ppt2007s) {
-            SlideShow<?,?> ppt2 = openSampleSlideshow(pptName);
-            Slide<?,?> sl2 =  ppt2.getSlides().get(0);
-            
-            if (ppt2 instanceof HSLFSlideShow) {
-                HeadersFooters hfs2 = ((HSLFSlide)sl2).getHeadersFooters();
-                assertNull(hfs2.getHeaderText());
-                assertEquals("Slide footer", hfs2.getFooterText());
-            }
-            
-            List<? extends Shape<?,?>> shapes = sl2.getShapes();
-            TextShape<?,?> ts0 = (TextShape<?,?>)shapes.get(0);
-            assertEquals("Test file", ts0.getText());
-            TextShape<?,?> ts1 = (TextShape<?,?>)shapes.get(1);
-            assertEquals("Has some text in the headers and footers", ts1.getText());
-            TextShape<?,?> ts2 = (TextShape<?,?>)shapes.get(2);
-            assertEquals("Slide footer", ts2.getText());
-            List<? extends TextParagraph<?,?,?>> ltp2 = ts2.getTextParagraphs();
-            assertTrue(ltp2.get(0).isHeaderOrFooter());
-            ppt2.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java b/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java
deleted file mode 100644
index 1dec172..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.sl;
-
-import static org.junit.Assert.assertEquals;
-
-import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.sl.usermodel.TableCell;
-import org.apache.poi.sl.usermodel.TableShape;
-import org.apache.poi.sl.usermodel.TextShape.TextDirection;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.junit.Test;
-
-public class TestTable {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-    
-    /** a generic way to open a sample slideshow document **/
-    public static SlideShow<?,?> openSampleSlideshow(String sampleName) throws IOException {
-        InputStream is = _slTests.openResourceAsStream(sampleName);
-        try {
-            return SlideShowFactory.create(is);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            is.close();
-        }
-    }
-    
-    @Test
-    public void testColWidthRowHeight() throws IOException {
-        // Test of table dimensions of same slideshow saved as ppt/x
-        // to check if both return similar (points) value
-        SlideShow<?,?> ppt = openSampleSlideshow("table_test.ppt");
-        TableShape<?,?> ts = (TableShape<?,?>)ppt.getSlides().get(0).getShapes().get(0);
-
-        SlideShow<?,?> pptx = openSampleSlideshow("table_test.pptx");
-        TableShape<?,?> tsx = (TableShape<?,?>)pptx.getSlides().get(0).getShapes().get(0);
-        
-        // assume table shape should be equal to itself
-        confirmTableShapeEqual(ts, ts);
-        confirmTableShapeEqual(tsx, tsx);
-        
-        // assert ppt and pptx versions of the same table have the same shape
-        confirmTableShapeEqual(ts, tsx);
-
-        pptx.close();
-        ppt.close();
-    }
-    
-    private void confirmTableShapeEqual(TableShape<?,?> tableA, TableShape<?,?> tableB) {
-        int cols = tableA.getNumberOfColumns();
-        int rows = tableA.getNumberOfRows();
-        
-        int colsx = tableB.getNumberOfColumns();
-        int rowsx = tableB.getNumberOfRows();
-        
-        assertEquals("tables should have same number of columns", cols, colsx);
-        assertEquals("tables should have same number of rows", rows, rowsx);
-        
-        for (int i=0; i<cols; i++) {
-            assertEquals("Width of column " + i + " should be equal",
-                    tableA.getColumnWidth(i), tableB.getColumnWidth(i), 0.2);
-        }
-
-        for (int i=0; i<rows; i++) {
-            assertEquals("Height of row " + i + " should be equal",
-                    tableA.getRowHeight(i), tableB.getRowHeight(i), 0.3);
-        }
-    }
-
-    @Test
-    public void testTextDirection() throws IOException {
-        
-        TextDirection tds[] = {
-            TextDirection.HORIZONTAL,
-            TextDirection.VERTICAL,
-            TextDirection.VERTICAL_270,
-            // TextDirection.STACKED is not supported on HSLF
-        };
-        
-        for (int i=0; i<2; i++) {
-            SlideShow<?,?> ppt1 = (i == 0) ? new HSLFSlideShow() : new XMLSlideShow();
-            TableShape<?,?> tbl1 = ppt1.createSlide().createTable(1, 3);
-            tbl1.setAnchor(new Rectangle2D.Double(50, 50, 200, 200));
-        
-            int col = 0;
-            for (TextDirection td : tds) {
-                TableCell<?,?> c = tbl1.getCell(0, col++);
-                c.setTextDirection(td);
-                c.setText("bla");
-            }
-            
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            ppt1.write(bos);
-            ppt1.close();
-            
-            InputStream is = new ByteArrayInputStream(bos.toByteArray());
-            SlideShow<?,?> ppt2 = SlideShowFactory.create(is);
-            TableShape<?,?> tbl2 = (TableShape<?,?>)ppt2.getSlides().get(0).getShapes().get(0);
-            
-            col = 0;
-            for (TextDirection td : tds) {
-                TableCell<?,?> c = tbl2.getCell(0, col++);
-                assertEquals(td, c.getTextDirection());
-            }
-            ppt2.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java b/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java
deleted file mode 100644
index 303bc83..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.sl.draw;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.awt.Dimension;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.PictureShape;
-import org.apache.poi.sl.usermodel.RectAlign;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.util.Units;
-import org.junit.Test;
-
-public class TestDrawPictureShape {
-    final static POIDataSamples ssSamples = POIDataSamples.getSlideShowInstance();
-    
-    /** a generic way to open a sample slideshow document **/
-    public static SlideShow<?,?> openSampleDocument(String sampleName) throws IOException {
-        InputStream is = ssSamples.openResourceAsStream(sampleName);
-        try {
-            return SlideShowFactory.create(is);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            is.close();
-        }
-    }
-
-    @Test
-    public void testResize() throws Exception {
-        String files[] = { "pictures.ppt", "shapes.pptx" };
-        for (String file : files) {
-            SlideShow<?,?> ss = openSampleDocument(file);
-            
-            Slide<?,?> slide = ss.getSlides().get(0);
-            PictureShape<?,?> picShape = null;
-            for (Shape<?,?> shape : slide.getShapes()) {
-                if (shape instanceof PictureShape) {
-                    picShape = (PictureShape<?,?>)shape;
-                    break;
-                }
-            }
-            assertNotNull(picShape);
-            PictureData pd = picShape.getPictureData();
-            Dimension dimPd = pd.getImageDimension();
-            new DrawPictureShape(picShape).resize();
-            Dimension dimShape = new Dimension(
-                (int)picShape.getAnchor().getWidth(),
-                (int)picShape.getAnchor().getHeight()
-            );
-            assertEquals(dimPd, dimShape);
-            
-            double newWidth = (dimPd.getWidth()*(100d/dimPd.getHeight()));
-            // ... -1 is a rounding error
-            Rectangle2D expRect = new Rectangle2D.Double(rbf(50+300-newWidth, picShape), 50, rbf(newWidth, picShape), 100);
-            Rectangle2D target = new Rectangle2D.Double(50,50,300,100);
-            new DrawPictureShape(picShape).resize(target, RectAlign.BOTTOM_RIGHT);
-            Rectangle2D actRect = picShape.getAnchor();
-            assertEquals(expRect.getX(), actRect.getX(), .0001);
-            assertEquals(expRect.getY(), actRect.getY(), .0001);
-            assertEquals(expRect.getWidth(), actRect.getWidth(), .0001);
-            assertEquals(expRect.getHeight(), actRect.getHeight(), .0001);
-            ss.close();
-        }
-    }
-    
-    // round back and forth - points -> master -> points
-    static double rbf(double val, PictureShape<?,?> picShape) {
-        if (picShape.getClass().getName().contains("HSLF")) {
-            return Units.masterToPoints(Units.pointsToMaster(val));
-        } else {
-            return val;
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
deleted file mode 100644
index 4b77e96..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss;
-
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileNotFoundException;
-
-import org.apache.poi.EmptyFileException;
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.junit.Test;
-
-public final class TestWorkbookFactory {
-    private static final String xls = "SampleSS.xls";
-    private static final String xlsx = "SampleSS.xlsx";
-    private static final String[] xls_prot = new String[] {"password.xls", "password"};
-    private static final String[] xlsx_prot = new String[]{"protected_passtika.xlsx", "tika"};
-    private static final String txt = "SampleSS.txt";
-    
-    private static final POILogger LOGGER = POILogFactory.getLogger(TestWorkbookFactory.class);
-    
-    /**
-     * Closes the sample workbook read in from filename.
-     * Throws an exception if closing the workbook results in the file on disk getting modified.
-     *
-     * @param filename the sample workbook to read in
-     * @param wb the workbook to close
-     * @throws IOException
-     */
-    private static void assertCloseDoesNotModifyFile(String filename, Workbook wb) throws IOException {
-        final byte[] before = HSSFTestDataSamples.getTestDataFileContent(filename);
-        // FIXME: replace with wb.close() when bug 58779 is resolved
-        closeOrRevert(wb);
-        final byte[] after = HSSFTestDataSamples.getTestDataFileContent(filename);
-        assertArrayEquals(filename + " sample file was modified as a result of closing the workbook",
-                before, after);
-    }
-    
-    /**
-     * bug 58779: Closing an XSSFWorkbook that was created with WorkbookFactory modifies the file
-     * FIXME: replace this method with wb.close() when bug 58779 is resolved.
-     *
-     * @param wb the workbook to close or revert
-     */
-    private static void closeOrRevert(Workbook wb) throws IOException {
-        if (wb instanceof HSSFWorkbook) {
-            wb.close();
-        }
-        else if (wb instanceof XSSFWorkbook) {
-            final XSSFWorkbook xwb = (XSSFWorkbook) wb;
-            if (PackageAccess.READ == xwb.getPackage().getPackageAccess()) {
-                xwb.close();
-            }
-            else {
-                // TODO: close() re-writes the sample-file?! Resort to revert() for now to close file handle...
-                LOGGER.log(POILogger.WARN,
-                        "reverting XSSFWorkbook rather than closing it to avoid close() modifying the file on disk. " +
-                        "Refer to bug 58779.");
-                xwb.getPackage().revert();
-            }
-        } else {
-            throw new RuntimeException("Unsupported workbook type");
-        }
-    }
-
-    @Test
-    public void testCreateNative() throws Exception {
-        Workbook wb;
-
-        // POIFS -> hssf
-        wb = WorkbookFactory.create(
-                new POIFSFileSystem(HSSFTestDataSamples.openSampleFileStream(xls))
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        // Package -> xssf
-        wb = WorkbookFactory.create(
-                OPCPackage.open(
-                        HSSFTestDataSamples.openSampleFileStream(xlsx))
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-    }
-
-    @Test
-    public void testCreateReadOnly() throws Exception {
-        Workbook wb;
-
-        // POIFS -> hssf
-        wb = WorkbookFactory.create(HSSFTestDataSamples.getSampleFile(xls), null, true);
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        // Package -> xssf
-        wb = WorkbookFactory.create(HSSFTestDataSamples.getSampleFile(xlsx), null, true);
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-    }
-
-    /**
-     * Creates the appropriate kind of Workbook, but
-     *  checking the mime magic at the start of the
-     *  InputStream, then creating what's required.
-     */
-    @Test
-    public void testCreateGeneric() throws Exception {
-        Workbook wb;
-
-        // InputStream -> either
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xls)
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xlsx)
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-
-        // File -> either
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xls)
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xlsx)
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-
-        // Invalid type -> exception
-        final byte[] before = HSSFTestDataSamples.getTestDataFileContent(txt);
-        try {
-            InputStream stream = HSSFTestDataSamples.openSampleFileStream(txt);
-            try {
-                wb = WorkbookFactory.create(stream);
-            } finally {
-                stream.close();
-            }
-            fail();
-        } catch(InvalidFormatException e) {
-            // Good
-        }
-        final byte[] after = HSSFTestDataSamples.getTestDataFileContent(txt);
-        assertArrayEquals("Invalid type file was modified after trying to open the file as a spreadsheet",
-                before, after);
-    }
-
-    /**
-     * Check that the overloaded stream methods which take passwords work properly
-     */
-    @Test
-    public void testCreateWithPasswordFromStream() throws Exception {
-        Workbook wb;
-
-
-        // Unprotected, no password given, opens normally
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xls), null
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xlsx), null
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-
-
-        // Unprotected, wrong password, opens normally
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xls), "wrong"
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xlsx), "wrong"
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-
-
-        // Protected, correct password, opens fine
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xls_prot[0]), xls_prot[1]
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls_prot[0], wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.openSampleFileStream(xlsx_prot[0]), xlsx_prot[1]
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx_prot[0], wb);
-
-
-        // Protected, wrong password, throws Exception
-        try {
-            wb = WorkbookFactory.create(
-                    HSSFTestDataSamples.openSampleFileStream(xls_prot[0]), "wrong"
-            );
-            assertCloseDoesNotModifyFile(xls_prot[0], wb);
-            fail("Shouldn't be able to open with the wrong password");
-        } catch (EncryptedDocumentException e) {}
-
-        try {
-            wb = WorkbookFactory.create(
-                    HSSFTestDataSamples.openSampleFileStream(xlsx_prot[0]), "wrong"
-            );
-            assertCloseDoesNotModifyFile(xlsx_prot[0], wb);
-            fail("Shouldn't be able to open with the wrong password");
-        } catch (EncryptedDocumentException e) {}
-    }
-
-    /**
-     * Check that the overloaded file methods which take passwords work properly
-     */
-    @Test
-    public void testCreateWithPasswordFromFile() throws Exception {
-        Workbook wb;
-
-        // Unprotected, no password given, opens normally
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xls), null
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xlsx), null
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-
-        // Unprotected, wrong password, opens normally
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xls), "wrong"
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls, wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xlsx), "wrong"
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertCloseDoesNotModifyFile(xlsx, wb);
-
-        // Protected, correct password, opens fine
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xls_prot[0]), xls_prot[1]
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof HSSFWorkbook);
-        assertCloseDoesNotModifyFile(xls_prot[0], wb);
-
-        wb = WorkbookFactory.create(
-                HSSFTestDataSamples.getSampleFile(xlsx_prot[0]), xlsx_prot[1]
-        );
-        assertNotNull(wb);
-        assertTrue(wb instanceof XSSFWorkbook);
-        assertTrue(wb.getNumberOfSheets() > 0);
-        assertNotNull(wb.getSheetAt(0));
-        assertNotNull(wb.getSheetAt(0).getRow(0));
-        assertCloseDoesNotModifyFile(xlsx_prot[0], wb);
-
-        // Protected, wrong password, throws Exception
-        try {
-            wb = WorkbookFactory.create(
-                    HSSFTestDataSamples.getSampleFile(xls_prot[0]), "wrong"
-            );
-            assertCloseDoesNotModifyFile(xls_prot[0], wb);
-            fail("Shouldn't be able to open with the wrong password");
-        } catch (EncryptedDocumentException e) {
-            // expected here
-        }
-
-        try {
-            wb = WorkbookFactory.create(
-                    HSSFTestDataSamples.getSampleFile(xlsx_prot[0]), "wrong"
-            );
-            assertCloseDoesNotModifyFile(xlsx_prot[0], wb);
-            fail("Shouldn't be able to open with the wrong password");
-        } catch (EncryptedDocumentException e) {
-            // expected here
-        }
-    }
-    
-    /**
-     * Check that a helpful exception is given on an empty input stream
-     */
-    @Test
-    public void testEmptyInputStream() throws Exception {
-        InputStream emptyStream = new ByteArrayInputStream(new byte[0]);
-        try {
-            WorkbookFactory.create(emptyStream);
-            fail("Shouldn't be able to create for an empty stream");
-        } catch (final EmptyFileException expected) {}
-    }
-    
-    /**
-     * Check that a helpful exception is given on an empty file
-     */
-    @Test
-    public void testEmptyFile() throws Exception {
-        File emptyFile = TempFile.createTempFile("empty", ".poi");
-        try {
-            WorkbookFactory.create(emptyFile);
-            fail("Shouldn't be able to create for an empty file");
-        } catch (final EmptyFileException expected) {}
-        emptyFile.delete();
-    }
-
-    /**
-      * Check that a helpful exception is raised on a non-existing file
-      */
-    @Test
-    public void testNonExistantFile() throws Exception {
-        File nonExistantFile = new File("notExistantFile");
-        assertFalse(nonExistantFile.exists());
-
-        try {
-            WorkbookFactory.create(nonExistantFile, "password", true);
-            fail("Should not be able to create for a non-existant file");
-        } catch (final FileNotFoundException e) {
-            // expected
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java
deleted file mode 100644
index ea51926..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Locale;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/** Test the individual CellFormatPart types. */
-public class TestCellFormatPart extends CellFormatTestBase {
-    
-    private static Locale userLocale;
-    
-    @BeforeClass
-    public static void setLocale() {
-        userLocale = LocaleUtil.getUserLocale();
-        LocaleUtil.setUserLocale(Locale.ROOT);
-    }
-    
-    @AfterClass
-    public static void unsetLocale() {
-        LocaleUtil.setUserLocale(userLocale);
-    }
-    
-    private static final Pattern NUMBER_EXTRACT_FMT = Pattern.compile(
-            "([-+]?[0-9]+)(\\.[0-9]+)?.*(?:(e).*?([+-]?[0-9]+))",
-            Pattern.CASE_INSENSITIVE);
-
-    public TestCellFormatPart() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void testGeneralFormat() throws Exception {
-        runFormatTests("GeneralFormatTests.xlsx", new CellValue() {
-            @Override
-            public Object getValue(Cell cell) {
-                switch (CellFormat.ultimateTypeEnum(cell)) {
-                    case BOOLEAN:
-                        return cell.getBooleanCellValue();
-                    case NUMERIC:
-                        return cell.getNumericCellValue();
-                    default:
-                        return cell.getStringCellValue();
-                }
-            }
-        });
-    }
-
-    public void testNumberFormat() throws Exception {
-        runFormatTests("NumberFormatTests.xlsx", new CellValue() {
-            @Override
-            public Object getValue(Cell cell) {
-                return cell.getNumericCellValue();
-            }
-        });
-    }
-
-    @Test
-    public void testNumberApproxFormat() throws Exception {
-        runFormatTests("NumberFormatApproxTests.xlsx", new CellValue() {
-            @Override
-            public Object getValue(Cell cell) {
-                return cell.getNumericCellValue();
-            }
-
-            @Override
-            void equivalent(String expected, String actual,
-                    CellFormatPart format) {
-                double expectedVal = extractNumber(expected);
-                double actualVal = extractNumber(actual);
-                // equal within 1%
-                double delta = expectedVal / 100;
-                assertEquals("format \"" + format + "\"," + expected + " ~= " +
-                        actual, expectedVal, actualVal, delta);
-            }
-        });
-    }
-
-    @Test
-    public void testDateFormat() throws Exception {
-        TimeZone tz = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
-        try {
-            runFormatTests("DateFormatTests.xlsx", new CellValue() {
-                @Override
-                public Object getValue(Cell cell) {
-                    return cell.getDateCellValue();
-                }
-            });
-        } finally {
-            LocaleUtil.setUserTimeZone(tz);
-        }
-    }
-
-    @Test
-    public void testElapsedFormat() throws Exception {
-        runFormatTests("ElapsedFormatTests.xlsx", new CellValue() {
-            @Override
-            public Object getValue(Cell cell) {
-                return cell.getNumericCellValue();
-            }
-        });
-    }
-
-    @Test
-    public void testTextFormat() throws Exception {
-        runFormatTests("TextFormatTests.xlsx", new CellValue() {
-            @Override
-            public Object getValue(Cell cell) {
-                switch(CellFormat.ultimateTypeEnum(cell)) {
-                    case BOOLEAN:
-                        return cell.getBooleanCellValue();
-                    default:
-                        return cell.getStringCellValue();
-                }
-            }
-        });
-    }
-
-    @Test
-    public void testConditions() throws Exception {
-        runFormatTests("FormatConditionTests.xlsx", new CellValue() {
-            @Override
-            Object getValue(Cell cell) {
-                return cell.getNumericCellValue();
-            }
-        });
-    }
-
-    private double extractNumber(String str) {
-        Matcher m = NUMBER_EXTRACT_FMT.matcher(str);
-        if (!m.find())
-            throw new IllegalArgumentException(
-                    "Cannot find numer in \"" + str + "\"");
-
-        StringBuffer sb = new StringBuffer();
-        // The groups in the pattern are the parts of the number
-        for (int i = 1; i <= m.groupCount(); i++) {
-            String part = m.group(i);
-            if (part != null)
-                sb.append(part);
-        }
-        return Double.valueOf(sb.toString());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestFormulaParser.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestFormulaParser.java
deleted file mode 100644
index dfbbd42..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestFormulaParser.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.ss.formula;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.NameXPxg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPxg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFEvaluationWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test {@link FormulaParser}'s handling of row numbers at the edge of the
- * HSSF/XSSF ranges.
- * 
- * @author David North
- */
-public class TestFormulaParser {
-
-    @Test
-    public void testHSSFFailsForOver65536() {
-        FormulaParsingWorkbook workbook = HSSFEvaluationWorkbook.create(new HSSFWorkbook());
-        try {
-            FormulaParser.parse("Sheet1!1:65537", workbook, FormulaType.CELL, 0);
-            fail("Expected exception");
-        }
-        catch (FormulaParseException expected) {
-            // expected here
-        }
-    }
-
-    @Test
-    public void testHSSFPassCase() {
-        FormulaParsingWorkbook workbook = HSSFEvaluationWorkbook.create(new HSSFWorkbook());
-        FormulaParser.parse("Sheet1!1:65536", workbook, FormulaType.CELL, 0);
-    }
-
-    @Test
-    public void testXSSFWorksForOver65536() {
-        FormulaParsingWorkbook workbook = XSSFEvaluationWorkbook.create(new XSSFWorkbook());
-        FormulaParser.parse("Sheet1!1:65537", workbook, FormulaType.CELL, 0);
-    }
-
-    @Test
-    public void testXSSFFailCase() {
-        FormulaParsingWorkbook workbook = XSSFEvaluationWorkbook.create(new XSSFWorkbook());
-        try {
-            FormulaParser.parse("Sheet1!1:1048577", workbook, FormulaType.CELL, 0); // one more than max rows.
-            fail("Expected exception");
-        }
-        catch (FormulaParseException expected) {
-            // expected here
-        }
-    }
-    
-    // copied from org.apache.poi.hssf.model.TestFormulaParser
-    @Test
-    public void testMacroFunction() throws Exception {
-        // testNames.xlsm contains a VB function called 'myFunc'
-        final String testFile = "testNames.xlsm";
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook(testFile);
-        try {
-            XSSFEvaluationWorkbook workbook = XSSFEvaluationWorkbook.create(wb);
-    
-            //Expected ptg stack: [NamePtg(myFunc), StringPtg(arg), (additional operands would go here...), FunctionPtg(myFunc)]
-            Ptg[] ptg = FormulaParser.parse("myFunc(\"arg\")", workbook, FormulaType.CELL, -1);
-            assertEquals(3, ptg.length);
-    
-            // the name gets encoded as the first operand on the stack
-            NameXPxg tname = (NameXPxg) ptg[0];
-            assertEquals("myFunc", tname.toFormulaString());
-            
-            // the function's arguments are pushed onto the stack from left-to-right as OperandPtgs
-            StringPtg arg = (StringPtg) ptg[1];
-            assertEquals("arg", arg.getValue());
-    
-            // The external FunctionPtg is the last Ptg added to the stack
-            // During formula evaluation, this Ptg pops off the the appropriate number of
-            // arguments (getNumberOfOperands()) and pushes the result on the stack 
-            AbstractFunctionPtg tfunc = (AbstractFunctionPtg) ptg[2];
-            assertTrue(tfunc.isExternalFunction());
-            
-            // confirm formula parsing is case-insensitive
-            FormulaParser.parse("mYfUnC(\"arg\")", workbook, FormulaType.CELL, -1);
-            
-            // confirm formula parsing doesn't care about argument count or type
-            // this should only throw an error when evaluating the formula.
-            FormulaParser.parse("myFunc()", workbook, FormulaType.CELL, -1);
-            FormulaParser.parse("myFunc(\"arg\", 0, TRUE)", workbook, FormulaType.CELL, -1);
-            
-            // A completely unknown formula name (not saved in workbook) should still be parseable and renderable
-            // but will throw an NotImplementedFunctionException or return a #NAME? error value if evaluated.
-            FormulaParser.parse("yourFunc(\"arg\")", workbook, FormulaType.CELL, -1);
-            
-            // Make sure workbook can be written and read
-            XSSFTestDataSamples.writeOutAndReadBack(wb).close();
-            
-            // Manually check to make sure file isn't corrupted
-            // TODO: develop a process for occasionally manually reviewing workbooks
-            // to verify workbooks are not corrupted
-            /*
-            final File fileIn = XSSFTestDataSamples.getSampleFile(testFile);
-            final File reSavedFile = new File(fileIn.getParentFile(), fileIn.getName().replace(".xlsm", "-saved.xlsm"));
-            final FileOutputStream fos = new FileOutputStream(reSavedFile);
-            wb.write(fos);
-            fos.close();
-            */
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void testParserErrors() throws Exception {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("testNames.xlsm");
-        try {
-            XSSFEvaluationWorkbook workbook = XSSFEvaluationWorkbook.create(wb);
-            
-            parseExpectedException("(");
-            parseExpectedException(")");
-            parseExpectedException("+");
-            parseExpectedException("42+");
-            parseExpectedException("IF()");
-            parseExpectedException("IF("); //no closing paren
-            parseExpectedException("myFunc(", workbook); //no closing paren
-        } finally {
-            wb.close();
-        }
-    }
-    
-    private static void parseExpectedException(String formula) {
-        parseExpectedException(formula, null);
-    }
-    
-    /** confirm formula has invalid syntax and parsing the formula results in FormulaParseException
-     */
-    private static void parseExpectedException(String formula, FormulaParsingWorkbook wb) {
-        try {
-            FormulaParser.parse(formula, wb, FormulaType.CELL, -1);
-            fail("Expected FormulaParseException: " + formula);
-        } catch (final FormulaParseException e) {
-            // expected during successful test
-            assertNotNull(e.getMessage());
-        }
-    }
-    
-    // trivial case for bug 60219: FormulaParser can't parse external references when sheet name is quoted
-    @Test
-    public void testParseExternalReferencesWithUnquotedSheetName() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpwb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs = FormulaParser.parse("[1]Sheet1!A1", fpwb, FormulaType.CELL, -1);
-        // org.apache.poi.ss.formula.ptg.Ref3DPxg [ [workbook=1] sheet=Sheet 1 ! A1]
-        assertEquals("Ptgs length", 1, ptgs.length);
-        assertTrue("Ptg class", ptgs[0] instanceof Ref3DPxg);
-        Ref3DPxg pxg = (Ref3DPxg) ptgs[0];
-        assertEquals("External workbook number", 1, pxg.getExternalWorkbookNumber());
-        assertEquals("Sheet name", "Sheet1", pxg.getSheetName());
-        assertEquals("Row", 0, pxg.getRow());
-        assertEquals("Column", 0, pxg.getColumn());
-        wb.close();
-    }
-    
-    // bug 60219: FormulaParser can't parse external references when sheet name is quoted
-    @Ignore
-    @Test
-    public void testParseExternalReferencesWithQuotedSheetName() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpwb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs = FormulaParser.parse("'[1]Sheet 1'!A1", fpwb, FormulaType.CELL, -1);
-        // org.apache.poi.ss.formula.ptg.Ref3DPxg [ [workbook=1] sheet=Sheet 1 ! A1]
-        assertEquals("Ptgs length", 1, ptgs.length);
-        assertTrue("Ptg class", ptgs[0] instanceof Ref3DPxg);
-        Ref3DPxg pxg = (Ref3DPxg) ptgs[0];
-        assertEquals("External workbook number", 1, pxg.getExternalWorkbookNumber());
-        assertEquals("Sheet name", "Sheet 1", pxg.getSheetName());
-        assertEquals("Row", 0, pxg.getRow());
-        assertEquals("Column", 0, pxg.getColumn());
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java
deleted file mode 100644
index b60664a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Table;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFTable;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-/**
- * Tests Excel Table expressions (structured references)
- * @see <a href="https://support.office.com/en-us/article/Using-structured-references-with-Excel-tables-F5ED2452-2337-4F71-BED3-C8AE6D2B276E">
- *         Excel Structured Reference Syntax
- *      </a>
- */
-public class TestStructuredReferences {
-
-    /**
-     * Test the regular expression used in INDIRECT() evaluation to recognize structured references
-     */
-    @Test
-    public void testTableExpressionSyntax() {
-        assertTrue("Valid structured reference syntax didn't match expression", Table.isStructuredReference.matcher("abc[col1]").matches());
-        assertTrue("Valid structured reference syntax didn't match expression", Table.isStructuredReference.matcher("_abc[col1]").matches());
-        assertTrue("Valid structured reference syntax didn't match expression", Table.isStructuredReference.matcher("_[col1]").matches());
-        assertTrue("Valid structured reference syntax didn't match expression", Table.isStructuredReference.matcher("\\[col1]").matches());
-        assertTrue("Valid structured reference syntax didn't match expression", Table.isStructuredReference.matcher("\\[col1]").matches());
-        assertTrue("Valid structured reference syntax didn't match expression", Table.isStructuredReference.matcher("\\[#This Row]").matches());
-        assertTrue("Valid structured reference syntax didn't match expression", Table.isStructuredReference.matcher("\\[ [col1], [col2] ]").matches());
-        
-        // can't have a space between the table name and open bracket
-        assertFalse("Invalid structured reference syntax didn't fail expression", Table.isStructuredReference.matcher("\\abc [ [col1], [col2] ]").matches());
-    }
-    
-    @Test
-    public void testTableFormulas() throws Exception {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        try {
-            
-            final FormulaEvaluator eval = new XSSFFormulaEvaluator(wb);
-            final XSSFSheet tableSheet = wb.getSheet("Table");
-            final XSSFSheet formulaSheet = wb.getSheet("Formulas");
-
-            confirm(eval, tableSheet.getRow(5).getCell(0), 49);
-            confirm(eval, formulaSheet.getRow(0).getCell(0), 209);
-            confirm(eval, formulaSheet.getRow(1).getCell(0), "one");
-            
-            // test changing a table value, to see if the caches are properly cleared
-            // Issue 59814
-            
-            // this test passes before the fix for 59814
-            tableSheet.getRow(1).getCell(1).setCellValue("ONEA");
-            confirm(eval, formulaSheet.getRow(1).getCell(0), "ONEA");
-            
-            // test adding a row to a table, issue 59814
-            Row newRow = tableSheet.getRow(7);
-            if (newRow == null) newRow = tableSheet.createRow(7);
-            newRow.createCell(0, CellType.FORMULA).setCellFormula("\\_Prime.1[[#This Row],[@Number]]*\\_Prime.1[[#This Row],[@Number]]");
-            newRow.createCell(1, CellType.STRING).setCellValue("thirteen");
-            newRow.createCell(2, CellType.NUMERIC).setCellValue(13);
-            
-            // update Table
-            final XSSFTable table = wb.getTable("\\_Prime.1");
-            final AreaReference newArea = new AreaReference(table.getStartCellReference(), new CellReference(table.getEndRowIndex() + 1, table.getEndColIndex()));
-            String newAreaStr = newArea.formatAsString();
-            table.getCTTable().setRef(newAreaStr);
-            table.getCTTable().getAutoFilter().setRef(newAreaStr);
-            table.updateHeaders();
-            table.updateReferences();
-
-            // these fail before the fix for 59814
-            confirm(eval, tableSheet.getRow(7).getCell(0), 13*13);
-            confirm(eval, formulaSheet.getRow(0).getCell(0), 209 + 13*13);
-
-        } finally {
-            wb.close();
-        }
-    }
-
-    private static void confirm(FormulaEvaluator fe, Cell cell, double expectedResult) {
-        fe.clearAllCachedResultValues();
-        CellValue cv = fe.evaluate(cell);
-        if (cv.getCellTypeEnum() != CellType.NUMERIC) {
-            fail("expected numeric cell type but got " + cv.formatAsString());
-        }
-        assertEquals(expectedResult, cv.getNumberValue(), 0.0);
-    }
-
-    private static void confirm(FormulaEvaluator fe, Cell cell, String expectedResult) {
-        fe.clearAllCachedResultValues();
-        CellValue cv = fe.evaluate(cell);
-        if (cv.getCellTypeEnum() != CellType.STRING) {
-            fail("expected String cell type but got " + cv.formatAsString());
-        }
-        assertEquals(expectedResult, cv.getStringValue());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/eval/TestXSSFCircularReferences.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/eval/TestXSSFCircularReferences.java
deleted file mode 100644
index 0b8c9fc..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/eval/TestXSSFCircularReferences.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.xssf.XSSFITestDataProvider;
-
-/**
- * Tests XSSFFormulaEvaluator for its handling of cell formula circular references.
- *
- * @author Josh Micich
- */
-public final class TestXSSFCircularReferences extends BaseTestCircularReferences {
-	public TestXSSFCircularReferences() {
-        super(XSSFITestDataProvider.instance);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
deleted file mode 100644
index 921dc44..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import junit.framework.AssertionFailedError;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public final class TestProper {
-    private Cell cell11;
-    private FormulaEvaluator evaluator;
-
-    @Test
-    public void testValidHSSF() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        evaluator = new HSSFFormulaEvaluator(wb);
-
-        confirm(wb);
-    }
-
-    @Test
-    public void testValidXSSF() {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        evaluator = new XSSFFormulaEvaluator(wb);
-
-        confirm(wb);
-    }
-
-    private void confirm(Workbook wb) {
-        Sheet sheet = wb.createSheet("new sheet");
-        cell11 = sheet.createRow(0).createCell(0);
-        cell11.setCellType(CellType.FORMULA);
-
-        confirm("PROPER(\"hi there\")", "Hi There"); //simple case
-        confirm("PROPER(\"what's up\")", "What'S Up"); //apostrophes are treated as word breaks
-        confirm("PROPER(\"I DON'T TH!NK SO!\")", "I Don'T Th!Nk So!"); //capitalization is ignored, special punctuation is treated as a word break
-        confirm("PROPER(\"dr\u00dcb\u00f6'\u00e4 \u00e9lo\u015f|\u00eb\u00e8 \")", "Dr\u00fcb\u00f6'\u00c4 \u00c9lo\u015f|\u00cb\u00e8 ");
-        confirm("PROPER(\"hi123 the123re\")", "Hi123 The123Re"); //numbers are treated as word breaks
-        confirm("PROPER(\"-\")", "-"); //nothing happens with ascii punctuation that is not upper or lower case
-        confirm("PROPER(\"!\u00a7$\")", "!\u00a7$"); //nothing happens with unicode punctuation (section sign) that is not upper or lower case
-        confirm("PROPER(\"/&%\")", "/&%"); //nothing happens with ascii punctuation that is not upper or lower case
-        confirm("PROPER(\"Apache POI\")", "Apache Poi"); //acronyms are not special
-        confirm("PROPER(\"  hello world\")", "  Hello World"); //leading whitespace is ignored
-        
-        final String scharfes = "\u00df"; //German lowercase eszett, scharfes s, sharp s
-        confirm("PROPER(\"stra"+scharfes+"e\")", "Stra"+scharfes+"e");
-        assertTrue(Character.isLetter(scharfes.charAt(0)));
-        
-        // CURRENTLY FAILS: result: "SSUnd"+scharfes
-        // LibreOffice 5.0.3.2 behavior: "Sund"+scharfes
-        // Excel 2013 behavior: ???
-        confirm("PROPER(\""+scharfes+"und"+scharfes+"\")", "SSund"+scharfes);
-        
-        // also test longer string
-        StringBuilder builder = new StringBuilder("A");
-        StringBuilder expected = new StringBuilder("A");
-        for(int i = 1;i < 254;i++) {
-            builder.append((char)(65 + (i % 26)));
-            expected.append((char)(97 + (i % 26)));
-        }
-        confirm("PROPER(\"" + builder.toString() + "\")", expected.toString());
-    }
-
-    private void confirm(String formulaText, String expectedResult) {
-        cell11.setCellFormula(formulaText);
-        evaluator.clearAllCachedResultValues();
-        CellValue cv = evaluator.evaluate(cell11);
-        if (cv.getCellTypeEnum() != CellType.STRING) {
-            throw new AssertionFailedError("Wrong result type: " + cv.formatAsString());
-        }
-        String actualValue = cv.getStringValue();
-        assertEquals(expectedResult, actualValue);
-    }
-
-    @Test
-    public void test() {
-        checkProper("", "");
-        checkProper("a", "A");
-        checkProper("abc", "Abc");
-        checkProper("abc abc", "Abc Abc");
-        checkProper("abc/abc", "Abc/Abc");
-        checkProper("ABC/ABC", "Abc/Abc");
-        checkProper("aBc/ABC", "Abc/Abc");
-        checkProper("aBc@#$%^&*()_+=-ABC", "Abc@#$%^&*()_+=-Abc");
-        checkProper("aBc25aerg/ABC", "Abc25Aerg/Abc");
-        checkProper("aBc/\u00C4\u00F6\u00DF\u00FC/ABC", "Abc/\u00C4\u00F6\u00DF\u00FC/Abc");  // Some German umlauts with uppercase first letter is not changed
-        checkProper("\u00FC", "\u00DC");
-        checkProper("\u00DC", "\u00DC");
-        checkProper("\u00DF", "SS");    // German "scharfes s" is uppercased to "SS"
-        checkProper("\u00DFomesing", "SSomesing");    // German "scharfes s" is uppercased to "SS"
-        checkProper("aBc/\u00FC\u00C4\u00F6\u00DF\u00FC/ABC", "Abc/\u00DC\u00E4\u00F6\u00DF\u00FC/Abc");  // Some German umlauts with lowercase first letter is changed to uppercase
-    }
-
-    @Test
-    public void testMicroBenchmark() {
-        ValueEval strArg = new StringEval("some longer text that needs a number of replacements to check for runtime of different implementations");
-        long start = System.currentTimeMillis();
-        for(int i = 0;i < 300000;i++) {
-            final ValueEval ret = TextFunction.PROPER.evaluate(new ValueEval[]{strArg}, 0, 0);
-            assertEquals("Some Longer Text That Needs A Number Of Replacements To Check For Runtime Of Different Implementations", ((StringEval)ret).getStringValue());
-        }
-        // Took aprox. 600ms on a decent Laptop in July 2016
-        System.out.println("Took: " + (System.currentTimeMillis() - start) + "ms");
-    }
-
-    private void checkProper(String input, String expected) {
-        ValueEval strArg = new StringEval(input);
-        final ValueEval ret = TextFunction.PROPER.evaluate(new ValueEval[]{strArg}, 0, 0);
-        assertEquals(expected, ((StringEval)ret).getStringValue());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java
deleted file mode 100644
index 0a47141..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.xssf.streaming.SXSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.junit.Test;
-
-/**
- * Class for combined testing of XML-specific functionality of 
- * {@link XSSFCell} and {@link SXSSFCell}.
- * 
- *  Any test that is applicable for {@link HSSFCell} as well should go into
- *  the common base class {@link BaseTestCell}.
- */
-public abstract class BaseTestXCell extends BaseTestCell {
-    protected BaseTestXCell(ITestDataProvider testDataProvider) {
-        super(testDataProvider);
-    }
-
-    @Test
-    public void testXmlEncoding() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sh = wb1.createSheet();
-        Row row = sh.createRow(0);
-        Cell cell = row.createCell(0);
-        String sval = "\u0000\u0002\u0012<>\t\n\u00a0 &\"POI\'\u2122";
-        cell.setCellValue(sval);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        // invalid characters are replaced with question marks
-        assertEquals("???<>\t\n\u00a0 &\"POI\'\u2122", wb2.getSheetAt(0).getRow(0).getCell(0).getStringCellValue());
-        wb2.close();
-    }
-
-    @Test
-    public void testSetNullValues() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Cell cell = wb.createSheet("test").createRow(0).createCell(0);
-
-        cell.setCellValue((Calendar)null);
-        cell.setCellValue((Date)null);
-        cell.setCellValue((String)null);
-        cell.setCellValue((RichTextString) null);
-        cell.setCellValue((String)null);
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java
deleted file mode 100644
index a4b2100..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.xssf.streaming.SXSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.junit.Test;
-
-/**
- * Class for combined testing of XML-specific functionality of 
- * {@link XSSFRow} and {@link SXSSFRow}.
- * 
- *  Any test that is applicable for {@link org.apache.poi.hssf.usermodel.HSSFRow} as well should go into
- *  the common base class {@link BaseTestRow}.
- */
-public abstract class BaseTestXRow extends BaseTestRow {
-    protected BaseTestXRow(ITestDataProvider testDataProvider) {
-        super(testDataProvider);
-    }
-
-    @Test
-    public void testRowBounds() throws IOException {
-        baseTestRowBounds(_testDataProvider.getSpreadsheetVersion().getLastRowIndex());
-    }
-
-    @Test
-    public void testCellBounds() throws IOException {
-        baseTestCellBounds(_testDataProvider.getSpreadsheetVersion().getLastColumnIndex());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java
deleted file mode 100644
index f6e1bff..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-
-/**
- * Class for combined testing of XML-specific functionality of 
- * {@link XSSFSheet} and {@link SXSSFSheet}.
- * 
- *  Any test that is applicable for {@link org.apache.poi.hssf.usermodel.HSSFSheet} as well should go into
- *  the common base class {@link BaseTestSheet}.
- */
-public abstract class BaseTestXSheet extends BaseTestSheet {
-    protected BaseTestXSheet(ITestDataProvider testDataProvider) {
-        super(testDataProvider);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java
deleted file mode 100644
index 9c7fe3a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Class for combined testing of XML-specific functionality of 
- * {@link XSSFWorkbook} and {@link SXSSFWorkbook}.
- * 
- *  Any test that is applicable for {@link org.apache.poi.hssf.usermodel.HSSFWorkbook} as well should go into
- *  the common base class {@link BaseTestWorkbook}.
- */
-public abstract class BaseTestXWorkbook extends BaseTestWorkbook {
-    protected BaseTestXWorkbook(ITestDataProvider testDataProvider) {
-        super(testDataProvider);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestXSSFBorderStyle.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestXSSFBorderStyle.java
deleted file mode 100644
index 2e9334b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestXSSFBorderStyle.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.xssf.XSSFITestDataProvider;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestXSSFBorderStyle extends BaseTestBorderStyle  {
-
-    public TestXSSFBorderStyle() {
-        super(XSSFITestDataProvider.instance);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestSXSSFCellUtil.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestSXSSFCellUtil.java
deleted file mode 100644
index 70c5fae..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestSXSSFCellUtil.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-
-public class TestSXSSFCellUtil extends BaseTestCellUtil {
-    public TestSXSSFCellUtil() {
-        super(SXSSFITestDataProvider.instance);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestXSSFCellUtil.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestXSSFCellUtil.java
deleted file mode 100644
index c58ebe9..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestXSSFCellUtil.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.xssf.XSSFITestDataProvider;
-
-public class TestXSSFCellUtil extends BaseTestCellUtil {
-    public TestXSSFCellUtil() {
-        super(XSSFITestDataProvider.instance);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestXSSFPropertyTemplate.java b/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestXSSFPropertyTemplate.java
deleted file mode 100644
index 1c4b7ad..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/ss/util/TestXSSFPropertyTemplate.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BorderExtent;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-public class TestXSSFPropertyTemplate {
-    
-    @Test
-    public void applyBorders() throws IOException {
-        CellRangeAddress a1c3 = new CellRangeAddress(0, 2, 0, 2);
-        CellRangeAddress b2 = new CellRangeAddress(1, 1, 1, 1);
-        PropertyTemplate pt = new PropertyTemplate();
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        
-        pt.drawBorders(a1c3, BorderStyle.THIN, IndexedColors.RED.getIndex(), BorderExtent.ALL);
-        pt.applyBorders(sheet);
-        
-        for (Row row: sheet) {
-            for (Cell cell: row) {
-                CellStyle cs = cell.getCellStyle();
-                assertEquals(BorderStyle.THIN, cs.getBorderTopEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getTopBorderColor());
-                assertEquals(BorderStyle.THIN, cs.getBorderBottomEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getBottomBorderColor());
-                assertEquals(BorderStyle.THIN, cs.getBorderLeftEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getLeftBorderColor());
-                assertEquals(BorderStyle.THIN, cs.getBorderRightEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getRightBorderColor());
-            }
-        }
-        
-        pt.drawBorders(b2, BorderStyle.NONE, BorderExtent.ALL);
-        pt.applyBorders(sheet);
-        
-        for (Row row: sheet) {
-            for (Cell cell: row) {
-                CellStyle cs = cell.getCellStyle();
-                if (cell.getColumnIndex() != 1 || row.getRowNum() == 0) {
-                assertEquals(BorderStyle.THIN, cs.getBorderTopEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getTopBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderTopEnum());
-                }
-                if (cell.getColumnIndex() != 1 || row.getRowNum() == 2) {
-                assertEquals(BorderStyle.THIN, cs.getBorderBottomEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getBottomBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderBottomEnum());
-                }
-                if (cell.getColumnIndex() == 0 || row.getRowNum() != 1) {
-                assertEquals(BorderStyle.THIN, cs.getBorderLeftEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getLeftBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderLeftEnum());
-                }
-                if (cell.getColumnIndex() == 2 || row.getRowNum() != 1) {
-                assertEquals(BorderStyle.THIN, cs.getBorderRightEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getRightBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderRightEnum());
-                }
-            }
-        }
-        
-        wb.close();
-    }
-    
-    @Test
-    public void clonePropertyTemplate() throws IOException {
-        CellRangeAddress a1c3 = new CellRangeAddress(0, 2, 0, 2);
-        PropertyTemplate pt = new PropertyTemplate();
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM, IndexedColors.RED.getIndex(), BorderExtent.ALL);
-        PropertyTemplate pt2 = new PropertyTemplate(pt);
-        assertNotSame(pt2, pt);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt2.getNumBorderColors(i, j));
-                assertEquals(4, pt2.getNumBorderColors(i, j));
-            }
-        }
-        
-        CellRangeAddress b2 = new CellRangeAddress(1,1,1,1);
-        pt2.drawBorders(b2, BorderStyle.THIN, BorderExtent.ALL);
-        
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        pt.applyBorders(sheet);
-        
-        for (Row row : sheet) {
-            for (Cell cell : row) {
-                CellStyle cs = cell.getCellStyle();
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderTopEnum());
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderBottomEnum());
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderLeftEnum());
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderRightEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getTopBorderColor());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getBottomBorderColor());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getLeftBorderColor());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getRightBorderColor());
-            }
-        }
-        
-        wb.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java b/trunk/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java
deleted file mode 100644
index db062f4..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.util;
-
-import junit.framework.TestCase;
-
-public class TestIdentifierManager extends TestCase
-{
-    public void testBasic()
-    {
-        IdentifierManager manager = new IdentifierManager(0L,100L);
-        assertEquals(101L,manager.getRemainingIdentifiers());
-        assertEquals(0L,manager.reserveNew());
-        assertEquals(100L,manager.getRemainingIdentifiers());
-        assertEquals(1L,manager.reserve(0L));
-        assertEquals(99L,manager.getRemainingIdentifiers());
-    }
-
-    public void testLongLimits()
-    {
-        long min = IdentifierManager.MIN_ID;
-        long max = IdentifierManager.MAX_ID;
-        IdentifierManager manager = new IdentifierManager(min,max);
-        assertTrue("Limits lead to a long variable overflow", max - min + 1 > 0);
-        assertTrue("Limits lead to a long variable overflow", manager.getRemainingIdentifiers() > 0);
-        assertEquals(min,manager.reserveNew());
-        assertEquals(max,manager.reserve(max));
-        assertEquals(max - min -1, manager.getRemainingIdentifiers());
-        manager.release(max);
-        manager.release(min);
-    }
-    
-    public void testReserve()
-    {
-        IdentifierManager manager = new IdentifierManager(10L,30L);
-        assertEquals(12L,manager.reserve(12L));
-        long reserve = manager.reserve(12L);
-        assertFalse("Same id must be reserved twice!",reserve == 12L);
-        assertTrue(manager.release(12L));
-        assertTrue(manager.release(reserve));
-        assertFalse(manager.release(12L));
-        assertFalse(manager.release(reserve));
-        
-        manager = new IdentifierManager(0L,2L);
-        assertEquals(0L,manager.reserve(0L));
-        assertEquals(1L,manager.reserve(1L));
-        assertEquals(2L,manager.reserve(2L));
-        try
-        {
-            manager.reserve(0L);
-            fail("Exception expected");
-        }
-        catch(IllegalStateException e)
-        {
-            // expected
-        }
-        try
-        {
-            manager.reserve(1L);
-            fail("Exception expected");
-        }
-        catch(IllegalStateException e)
-        {
-            // expected
-        }
-        try
-        {
-            manager.reserve(2L);
-            fail("Exception expected");
-        }
-        catch(IllegalStateException e)
-        {
-            // expected
-        }
-    }
-
-    public void testReserveNew()
-    {
-        IdentifierManager manager = new IdentifierManager(10L,12L);
-        assertSame(10L,manager.reserveNew());
-        assertSame(11L,manager.reserveNew());
-        assertSame(12L,manager.reserveNew());
-        try {
-            manager.reserveNew();
-            fail("IllegalStateException expected");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-    }
-    
-    public void testRelease() {
-        IdentifierManager manager = new IdentifierManager(10L,20L);
-        assertEquals(10L,manager.reserve(10L));
-        assertEquals(11L,manager.reserve(11L));
-        assertEquals(12L,manager.reserve(12L));
-        assertEquals(13L,manager.reserve(13L));
-        assertEquals(14L,manager.reserve(14L));
-        
-        assertTrue(manager.release(10L));
-        assertEquals(10L,manager.reserve(10L));
-        assertTrue(manager.release(10L));
-        
-        assertTrue(manager.release(11L));
-        assertEquals(11L,manager.reserve(11L));
-        assertTrue(manager.release(11L));
-        assertFalse(manager.release(11L));
-        assertFalse(manager.release(10L));
-
-        assertEquals(10L,manager.reserve(10L));
-        assertEquals(11L,manager.reserve(11L));
-        assertTrue(manager.release(12L));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java b/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
deleted file mode 100644
index 43a6036..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xdgf.extractor;
-
-import java.io.IOException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xdgf.usermodel.XmlVisioDocument;
-
-import junit.framework.TestCase;
-
-public class TestXDGFVisioExtractor extends TestCase {
-
-    private POIDataSamples diagrams;
-    private OPCPackage pkg;
-    private XmlVisioDocument xml;
-
-    @Override
-    protected void setUp() throws Exception {
-        diagrams = POIDataSamples.getDiagramInstance();
-        
-        pkg = OPCPackage.open(diagrams.openResourceAsStream("test_text_extraction.vsdx"));
-        xml = new XmlVisioDocument(pkg);
-    }
-
-    public void testGetSimpleText() throws IOException {
-        new XDGFVisioExtractor(xml).close();
-        new XDGFVisioExtractor(pkg).close();
-        
-        XDGFVisioExtractor extractor = new XDGFVisioExtractor(xml);
-        extractor.getText();
-        
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-        
-        assertEquals("Text here\nText there\nText, text, everywhere!\nRouter here\n",
-                     text);
-        
-        extractor.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java b/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java
deleted file mode 100644
index 447684c..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xdgf.usermodel.section;
-
-import java.util.Iterator;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class CombinedIteratorTest {
-
-    void testIteration(CombinedIterable<String> iterable, String... expected) {
-
-        Iterator<String> iter = iterable.iterator();
-
-        for (String element : expected) {
-            Assert.assertEquals(true, iter.hasNext());
-            Assert.assertEquals(element, iter.next());
-        }
-
-        Assert.assertEquals(false, iter.hasNext());
-    }
-
-    @Test
-    public void testNullMaster() {
-
-        SortedMap<Long, String> base = new TreeMap<Long, String>();
-        base.put(1L, "B1");
-        base.put(2L, "B2");
-        base.put(3L, "B3");
-
-        testIteration(new CombinedIterable<String>(base, null), "B1", "B2",
-                "B3");
-    }
-
-    @Test
-    public void testNoMatchesBaseFirst() {
-
-        SortedMap<Long, String> base = new TreeMap<Long, String>();
-        base.put(1L, "B1");
-        base.put(2L, "B2");
-        base.put(3L, "B3");
-
-        SortedMap<Long, String> master = new TreeMap<Long, String>();
-        master.put(4L, "M4");
-        master.put(5L, "M5");
-        master.put(6L, "M6");
-
-        testIteration(new CombinedIterable<String>(base, master), "B1", "B2",
-                "B3", "M4", "M5", "M6");
-    }
-
-    @Test
-    public void testNoMatchesMasterFirst() {
-
-        SortedMap<Long, String> base = new TreeMap<Long, String>();
-        base.put(4L, "B4");
-        base.put(5L, "B5");
-        base.put(6L, "B6");
-
-        SortedMap<Long, String> master = new TreeMap<Long, String>();
-        master.put(1L, "M1");
-        master.put(2L, "M2");
-        master.put(3L, "M3");
-
-        testIteration(new CombinedIterable<String>(base, master), "M1", "M2",
-                "M3", "B4", "B5", "B6");
-    }
-
-    @Test
-    public void testInterleaved1() {
-
-        SortedMap<Long, String> base = new TreeMap<Long, String>();
-        base.put(1L, "B1");
-        base.put(3L, "B3");
-        base.put(5L, "B5");
-
-        SortedMap<Long, String> master = new TreeMap<Long, String>();
-        master.put(2L, "M2");
-        master.put(4L, "M4");
-        master.put(6L, "M6");
-
-        testIteration(new CombinedIterable<String>(base, master), "B1", "M2",
-                "B3", "M4", "B5", "M6");
-    }
-
-    @Test
-    public void testInterleaved2() {
-
-        SortedMap<Long, String> base = new TreeMap<Long, String>();
-        base.put(1L, "B1");
-        base.put(2L, "B2");
-        base.put(5L, "B5");
-        base.put(6L, "B6");
-
-        SortedMap<Long, String> master = new TreeMap<Long, String>();
-        master.put(3L, "M3");
-        master.put(4L, "M4");
-        master.put(7L, "M7");
-        master.put(8L, "M8");
-
-        testIteration(new CombinedIterable<String>(base, master), "B1", "B2",
-                "M3", "M4", "B5", "B6", "M7", "M8");
-    }
-
-    @Test
-    public void testAllMatching() {
-
-        SortedMap<Long, String> base = new TreeMap<Long, String>();
-        base.put(1L, "B1");
-        base.put(2L, "B2");
-        base.put(3L, "B3");
-
-        SortedMap<Long, String> master = new TreeMap<Long, String>();
-        master.put(1L, "M1");
-        master.put(2L, "M2");
-        master.put(3L, "M3");
-
-        testIteration(new CombinedIterable<String>(base, master), "B1", "B2",
-                "B3");
-    }
-
-    @Test
-    public void testAllMatching2() {
-
-        SortedMap<Long, String> base = new TreeMap<Long, String>();
-        base.put(1L, "B1");
-        base.put(2L, "B2");
-        base.put(3L, "B3");
-
-        SortedMap<Long, String> master = new TreeMap<Long, String>();
-        master.put(1L, "M1");
-        master.put(2L, "M2");
-        master.put(3L, "M3");
-        master.put(4L, "M4");
-
-        testIteration(new CombinedIterable<String>(base, master), "B1", "B2",
-                "B3", "M4");
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
deleted file mode 100644
index 7c02ba2..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Collection;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLDocumentPart.RelationPart;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.TexturePaint;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFAutoShape;
-import org.apache.poi.xslf.usermodel.XSLFHyperlink;
-import org.apache.poi.xslf.usermodel.XSLFPictureData;
-import org.apache.poi.xslf.usermodel.XSLFPictureShape;
-import org.apache.poi.xslf.usermodel.XSLFRelation;
-import org.apache.poi.xslf.usermodel.XSLFShape;
-import org.apache.poi.xslf.usermodel.XSLFSlide;
-import org.apache.poi.xslf.usermodel.XSLFSlideLayout;
-import org.apache.poi.xslf.usermodel.XSLFSlideMaster;
-import org.apache.poi.xslf.usermodel.XSLFTextRun;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-public class TestXSLFBugs {
-    private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-    
-    @Test
-    public void bug51187() throws Exception {
-       XMLSlideShow ss1 = XSLFTestDataSamples.openSampleDocument("51187.pptx");
-       
-       assertEquals(1, ss1.getSlides().size());
-       
-       // Check the relations on it
-       // Note - rId3 is a self reference
-       XSLFSlide slide0 = ss1.getSlides().get(0);
-       
-       assertRelation(slide0, "/ppt/slides/slide1.xml", null);
-       assertRelation(slide0, "/ppt/slideLayouts/slideLayout12.xml", "rId1");
-       assertRelation(slide0, "/ppt/notesSlides/notesSlide1.xml", "rId2");
-       assertRelation(slide0, "/ppt/slides/slide1.xml", "rId3");
-       assertRelation(slide0, "/ppt/media/image1.png", "rId4");
-       
-       // Save and re-load
-       XMLSlideShow ss2 = XSLFTestDataSamples.writeOutAndReadBack(ss1);
-       ss1.close();
-       assertEquals(1, ss2.getSlides().size());
-       
-       slide0 = ss2.getSlides().get(0);
-       assertRelation(slide0, "/ppt/slides/slide1.xml", null);
-       assertRelation(slide0, "/ppt/slideLayouts/slideLayout12.xml", "rId1");
-       assertRelation(slide0, "/ppt/notesSlides/notesSlide1.xml", "rId2");
-       // TODO Fix this
-       assertRelation(slide0, "/ppt/slides/slide1.xml", "rId3");
-       assertRelation(slide0, "/ppt/media/image1.png", "rId4");
-       
-       ss2.close();
-    }
-    
-    private static void assertRelation(XSLFSlide slide, String exp, String rId) {
-        POIXMLDocumentPart pd = (rId != null) ? slide.getRelationById(rId) : slide;
-        assertEquals(exp, pd.getPackagePart().getPartName().getName());
-    }
-    
-    /**
-     * Slide relations with anchors in them
-     */
-    @Test
-    public void tika705() throws Exception {
-       XMLSlideShow ss = XSLFTestDataSamples.openSampleDocument("with_japanese.pptx");
-       
-       // Should have one slide
-       assertEquals(1, ss.getSlides().size());
-       XSLFSlide slide = ss.getSlides().get(0);
-       
-       // Check the relations from this
-       Collection<RelationPart> rels = slide.getRelationParts();
-       
-       // Should have 6 relations:
-       //   1 external hyperlink (skipped from list)
-       //   4 internal hyperlinks
-       //   1 slide layout
-       assertEquals(5, rels.size());
-       int layouts = 0;
-       int hyperlinks = 0;
-       for(RelationPart p : rels) {
-          if(p.getRelationship().getRelationshipType().equals(XSLFRelation.HYPERLINK.getRelation())) {
-             hyperlinks++;
-          } else if(p.getDocumentPart() instanceof XSLFSlideLayout) {
-             layouts++;
-          }
-       }
-       assertEquals(1, layouts);
-       assertEquals(4, hyperlinks);
-       
-       // Hyperlinks should all be to #_ftn1 or #ftnref1
-       for(RelationPart p : rels) {
-          if(p.getRelationship().getRelationshipType().equals(XSLFRelation.HYPERLINK.getRelation())) {
-             URI target = p.getRelationship().getTargetURI();
-             
-             if(target.getFragment().equals("_ftn1") ||
-                target.getFragment().equals("_ftnref1")) {
-                // Good
-             } else {
-                fail("Invalid target " + target.getFragment() + " on " + target);
-             }
-          }
-       }
-       ss.close();
-    }
-    
-    /**
-     * A slideshow can have more than one rID pointing to a given 
-     *  slide, eg presentation.xml rID1 -> slide1.xml, but slide1.xml 
-     *  rID2 -> slide3.xml
-     */
-    @Test
-    public void bug54916() throws Exception {
-        XMLSlideShow ss = XSLFTestDataSamples.openSampleDocument("OverlappingRelations.pptx");
-        XSLFSlide slide; 
-        
-        // Should find 4 slides
-        assertEquals(4, ss.getSlides().size());
-        
-        // Check the text, to see we got them in order
-        slide = ss.getSlides().get(0);
-        assertContains(getSlideText(slide), "POI cannot read this");
-        
-        slide = ss.getSlides().get(1);
-        assertContains(getSlideText(slide), "POI can read this");
-        assertContains(getSlideText(slide), "Has a relationship to another slide");
-        
-        slide = ss.getSlides().get(2);
-        assertContains(getSlideText(slide), "POI can read this");
-        
-        slide = ss.getSlides().get(3);
-        assertContains(getSlideText(slide), "POI can read this");
-        
-        ss.close();
-    }
-    
-    /**
-     * When the picture is not embedded but inserted only as a "link to file", 
-     * there is no data available and XSLFPictureShape.getPictureData()
-     * gives a NPE, see bug #56812
-     */
-    @Test
-    public void bug56812() throws Exception {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("56812.pptx");
-        
-        int internalPictures = 0;
-        int externalPictures = 0;
-        for (XSLFSlide slide : ppt.getSlides()){
-            for (XSLFShape shape : slide.getShapes()){
-                assertNotNull(shape);
-                
-                if (shape instanceof XSLFPictureShape) {
-                    XSLFPictureShape picture = (XSLFPictureShape)shape;
-                    if (picture.isExternalLinkedPicture()) {
-                        externalPictures++;
-                        
-                        assertNotNull(picture.getPictureLink());
-                    } else {
-                        internalPictures++;
-                        
-                        XSLFPictureData data = picture.getPictureData();
-                        assertNotNull(data);
-                        assertNotNull(data.getFileName());
-                    }
-                }
-            }
-        }
-        
-        assertEquals(2, internalPictures);
-        assertEquals(1, externalPictures);
-        ppt.close();
-    }
-
-    @Test
-    @Ignore("Similar to TestFontRendering it doesn't make sense to compare images because of tiny rendering differences in windows/unix")
-    public void bug54542() throws Exception {
-        XMLSlideShow ss = XSLFTestDataSamples.openSampleDocument("54542_cropped_bitmap.pptx");
-        
-        Dimension pgsize = ss.getPageSize();
-        
-        XSLFSlide slide = ss.getSlides().get(0);
-        
-        // render it
-        double zoom = 1;
-        AffineTransform at = new AffineTransform();
-        at.setToScale(zoom, zoom);
-        
-        BufferedImage imgActual = new BufferedImage((int)Math.ceil(pgsize.width*zoom), (int)Math.ceil(pgsize.height*zoom), BufferedImage.TYPE_3BYTE_BGR);
-        Graphics2D graphics = imgActual.createGraphics();
-        graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-        graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-        graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        graphics.setTransform(at);                
-        graphics.setPaint(Color.white);
-        graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
-        slide.draw(graphics);             
-        
-        ImageIO.write(imgActual, "PNG", new File("bug54542.png"));
-        ss.close();
-    }
-    
-    protected String getSlideText(XSLFSlide slide) {
-        return XSLFPowerPointExtractor.getText(slide, true, false, false);
-    }
-
-    @Test
-    public void bug57250() throws Exception {
-        XMLSlideShow ss = new XMLSlideShow();
-        for (String s : new String[]{"Slide1","Slide2"}) {
-            ss.createSlide().createTextBox().setText(s);
-        }
-        validateSlides(ss, false, "Slide1","Slide2");
-
-        XSLFSlide slide = ss.createSlide();
-        slide.createTextBox().setText("New slide");
-        validateSlides(ss, true, "Slide1","Slide2","New slide");
-
-        // Move backward
-        ss.setSlideOrder(slide, 0);
-        validateSlides(ss, true, "New slide","Slide1","Slide2");
-
-        // Move forward
-        ss.setSlideOrder(slide, 1);
-        validateSlides(ss, true, "Slide1","New slide","Slide2");
-
-        // Move to end
-        ss.setSlideOrder(slide, 0);
-        ss.setSlideOrder(slide, 2);
-        validateSlides(ss, true, "Slide1","Slide2","New slide");
-        ss.close();
-    }
-    
-    /**
-     * When working with >9 images, make sure the sorting ensures
-     *  that image10.foo isn't between image1.foo and image2.foo
-     */
-    @Test
-    public void test57552() throws Exception {
-        XMLSlideShow ss = new XMLSlideShow();
-        for (String s : new String[]{"Slide1","Slide2"}) {
-            ss.createSlide().createTextBox().setText(s);
-        }
-        
-        // Slide starts with just layout relation
-        XSLFSlide slide = ss.getSlides().get(0);
-        assertEquals(0, ss.getPictureData().size());
-        assertEquals(1, slide.getShapes().size());
-        
-        assertEquals(1, slide.getRelations().size());
-        assertRelationEquals(XSLFRelation.SLIDE_LAYOUT, slide.getRelations().get(0));
-        
-        // Some dummy pictures
-        byte[][] pics = new byte[15][3];
-        for (int i=0; i<pics.length; i++) {
-            for (int j=0; j<pics[i].length; j++) {
-                pics[i][j] = (byte)i;
-            }
-        }
-        
-        // Add a few pictures
-        for (int i=0; i<10; i++) {
-            XSLFPictureData data = ss.addPicture(pics[i], PictureType.JPEG);
-            assertEquals(i, data.getIndex());
-            assertEquals(i+1, ss.getPictureData().size());
-            
-            XSLFPictureShape shape = slide.createPicture(data);
-            assertNotNull(shape.getPictureData());
-            assertArrayEquals(pics[i], shape.getPictureData().getData());
-            assertEquals(i+2, slide.getShapes().size());
-        }
-        // Re-fetch the pictures and check
-        for (int i=0; i<10; i++) {
-            XSLFPictureShape shape = (XSLFPictureShape)slide.getShapes().get(i+1);
-            assertNotNull(shape.getPictureData());
-            assertArrayEquals(pics[i], shape.getPictureData().getData());
-        }
-        
-        // Add past 10
-        for (int i=10; i<15; i++) {
-            XSLFPictureData data = ss.addPicture(pics[i], PictureType.JPEG);
-            assertEquals(i, data.getIndex());
-            assertEquals(i+1, ss.getPictureData().size());
-            
-            XSLFPictureShape shape = slide.createPicture(data);
-            assertNotNull(shape.getPictureData());
-            assertArrayEquals(pics[i], shape.getPictureData().getData());
-            assertEquals(i+2, slide.getShapes().size());
-        }
-        // Check all pictures
-        for (int i=0; i<15; i++) {
-            XSLFPictureShape shape = (XSLFPictureShape)slide.getShapes().get(i+1);
-            assertNotNull(shape.getPictureData());
-            assertArrayEquals(pics[i], shape.getPictureData().getData());
-        }
-        
-        // Add a duplicate, check the right one is picked
-        XSLFPictureData data = ss.addPicture(pics[3], PictureType.JPEG);
-        assertEquals(3, data.getIndex());
-        assertEquals(15, ss.getPictureData().size());
-        
-        XSLFPictureShape shape = slide.createPicture(data);
-        assertNotNull(shape.getPictureData());
-        assertArrayEquals(pics[3], shape.getPictureData().getData());
-        assertEquals(17, slide.getShapes().size());
-        
-        
-        // Save and re-load
-        XMLSlideShow ss2 = XSLFTestDataSamples.writeOutAndReadBack(ss);
-        slide = ss2.getSlides().get(0);
-        
-        // Check the 15 individual ones added
-        for (int i=0; i<15; i++) {
-            shape = (XSLFPictureShape)slide.getShapes().get(i+1);
-            assertNotNull(shape.getPictureData());
-            assertArrayEquals(pics[i], shape.getPictureData().getData());
-        }
-        
-        // Check the duplicate
-        shape = (XSLFPictureShape)slide.getShapes().get(16);
-        assertNotNull(shape.getPictureData());
-        assertArrayEquals(pics[3], shape.getPictureData().getData());
-        
-        // Add another duplicate
-        data = ss2.addPicture(pics[5], PictureType.JPEG);
-        assertEquals(5, data.getIndex());
-        assertEquals(15, ss2.getPictureData().size());
-        
-        shape = slide.createPicture(data);
-        assertNotNull(shape.getPictureData());
-        assertArrayEquals(pics[5], shape.getPictureData().getData());
-        assertEquals(18, slide.getShapes().size());
-        
-        ss2.close();
-        ss.close();
-    }
-
-    private void validateSlides(XMLSlideShow ss, boolean saveAndReload, String... slideTexts) throws IOException {
-        if (saveAndReload) {
-            XMLSlideShow ss2 = XSLFTestDataSamples.writeOutAndReadBack(ss);
-            validateSlides(ss, slideTexts);
-            ss2.close();
-        } else {
-            validateSlides(ss, slideTexts);
-        }
-    }
-    
-    private void validateSlides(XMLSlideShow ss, String... slideTexts) throws IOException {
-        assertEquals(slideTexts.length, ss.getSlides().size());
-
-        for (int i = 0; i < slideTexts.length; i++) {
-            XSLFSlide slide = ss.getSlides().get(i);
-            assertContains(getSlideText(slide), slideTexts[i]);
-        }
-    }
-    
-    private void assertRelationEquals(XSLFRelation expected, POIXMLDocumentPart relation) {
-        assertEquals(expected.getContentType(), relation.getPackagePart().getContentType());
-        assertEquals(expected.getFileName(expected.getFileNameIndex(relation)), relation.getPackagePart().getPartName().getName());
-    }
-    
-    @Test
-    public void bug58205() throws IOException {
-        XMLSlideShow ss = XSLFTestDataSamples.openSampleDocument("themes.pptx");
-       
-        int i = 1;
-        for (XSLFSlideMaster sm : ss.getSlideMasters()) {
-            assertEquals("rId"+(i++), ss.getRelationId(sm));
-        }
-        
-        ss.close();
-    }
-
-    @Test
-    public void bug55791a() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("45541_Footer.pptx");
-        removeAndCreateSlide(ppt);
-        ppt.close();
-    }
-
-    @Test
-    public void bug55791b() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("SampleShow.pptx");
-        removeAndCreateSlide(ppt);
-        ppt.close();
-    }
-
-    private void removeAndCreateSlide(XMLSlideShow ppt) {
-        assertTrue(ppt.getSlides().size() > 1);
-        ppt.removeSlide(1);
-        assertNotNull(ppt.createSlide());
-    }
-
-    @Test
-    public void blibFillAlternateContent() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("2411-Performance_Up.pptx");
-        XSLFPictureShape ps = (XSLFPictureShape)ppt.getSlides().get(4).getShapes().get(0);
-        assertNotNull(ps.getPictureData());
-        ppt.close();
-    }
-
-    @Test
-    public void bug59434() throws IOException {
-        String url1 = "http://poi.apache.org/changes.html";
-        String url2 = "http://poi.apache.org/faq.html";
-        XMLSlideShow ppt1 = new XMLSlideShow();
-        PictureData pd1 = ppt1.addPicture(slTests.readFile("tomcat.png"), PictureType.PNG);
-        PictureData pd2 = ppt1.addPicture(slTests.readFile("santa.wmf"), PictureType.WMF);
-        XSLFSlide slide = ppt1.createSlide();
-        XSLFPictureShape ps1 = slide.createPicture(pd1);
-        ps1.setAnchor(new Rectangle2D.Double(20, 20, 100, 100));
-        XSLFHyperlink hl1 = ps1.createHyperlink();
-        hl1.linkToUrl(url1);
-        XSLFPictureShape ps2 = slide.createPicture(pd2);
-        ps2.setAnchor(new Rectangle2D.Double(120, 120, 100, 100));
-        XSLFHyperlink hl2 = ps2.createHyperlink();
-        hl2.linkToUrl(url2);
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-        slide = ppt2.getSlides().get(0);
-        ps1 = (XSLFPictureShape)slide.getShapes().get(0);
-        ps2 = (XSLFPictureShape)slide.getShapes().get(1);
-        assertEquals(url1, ps1.getHyperlink().getAddress());
-        assertEquals(url2, ps2.getHyperlink().getAddress());
-    
-        ppt2.close();
-    }
-
-    @Test
-    public void bug58217() throws IOException {
-        Color fillColor = new Color(1f,1f,0f,0.1f);
-        Color lineColor = new Color(25.3f/255f,1f,0f,0.4f);
-        Color textColor = new Color(1f,1f,0f,0.6f);
-        
-        XMLSlideShow ppt1 = new XMLSlideShow();
-        XSLFSlide sl = ppt1.createSlide();
-        XSLFAutoShape as = sl.createAutoShape();
-        as.setShapeType(ShapeType.STAR_10);
-        as.setAnchor(new Rectangle2D.Double(100,100,300,300));
-        as.setFillColor(fillColor);
-        as.setLineColor(lineColor);
-        as.setText("Alpha");
-        as.setVerticalAlignment(VerticalAlignment.MIDDLE);
-        as.setHorizontalCentered(true);
-        XSLFTextRun tr = as.getTextParagraphs().get(0).getTextRuns().get(0);
-        tr.setFontSize(32d);
-        tr.setFontColor(textColor);
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-        sl = ppt2.getSlides().get(0);
-        as = (XSLFAutoShape)sl.getShapes().get(0);
-        checkColor(fillColor, as.getFillStyle().getPaint());
-        checkColor(lineColor, as.getStrokeStyle().getPaint());
-        checkColor(textColor, as.getTextParagraphs().get(0).getTextRuns().get(0).getFontColor());
-        ppt2.close();
-    }
-    
-    private static void checkColor(Color expected, PaintStyle actualStyle) {
-        assertTrue(actualStyle instanceof SolidPaint);
-        SolidPaint ps = (SolidPaint)actualStyle;
-        Color actual = DrawPaint.applyColorTransform(ps.getSolidColor());
-        float expRGB[] = expected.getRGBComponents(null);
-        float actRGB[] = actual.getRGBComponents(null);
-        assertArrayEquals(expRGB, actRGB, 0.0001f);
-    }
-
-    @Test
-    public void bug55714() throws IOException {
-        XMLSlideShow srcPptx = XSLFTestDataSamples.openSampleDocument("pptx2svg.pptx");
-        XMLSlideShow newPptx = new XMLSlideShow();
-        XSLFSlide srcSlide = srcPptx.getSlides().get(0);
-        XSLFSlide newSlide = newPptx.createSlide();
-
-        XSLFSlideLayout srcSlideLayout = srcSlide.getSlideLayout();
-        XSLFSlideLayout newSlideLayout = newSlide.getSlideLayout();
-        newSlideLayout.importContent(srcSlideLayout);
-
-        XSLFSlideMaster srcSlideMaster = srcSlide.getSlideMaster();
-        XSLFSlideMaster newSlideMaster = newSlide.getSlideMaster();
-        newSlideMaster.importContent(srcSlideMaster); 
-
-        newSlide.importContent(srcSlide);
-        XMLSlideShow rwPptx = XSLFTestDataSamples.writeOutAndReadBack(newPptx);
-        
-        PaintStyle ps = rwPptx.getSlides().get(0).getBackground().getFillStyle().getPaint();
-        assertTrue(ps instanceof TexturePaint);
-        
-        rwPptx.close();
-        newPptx.close();
-        srcPptx.close();
-    }
-
-    @Test
-    public void bug59273() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("bug59273.potx");
-        ppt.getPackage().replaceContentType(
-            XSLFRelation.PRESENTATIONML_TEMPLATE.getContentType(), 
-            XSLFRelation.MAIN.getContentType()
-        );
-
-        XMLSlideShow rwPptx = XSLFTestDataSamples.writeOutAndReadBack(ppt);
-        OPCPackage pkg = rwPptx.getPackage();
-        int size = pkg.getPartsByContentType(XSLFRelation.MAIN.getContentType()).size();
-        assertEquals(1, size);
-        size = pkg.getPartsByContentType(XSLFRelation.PRESENTATIONML_TEMPLATE.getContentType()).size();
-        assertEquals(0, size);
-        
-        rwPptx.close();
-        ppt.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
deleted file mode 100644
index 95dd57d..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIXMLProperties.CoreProperties;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.poi.xslf.usermodel.XSLFAutoShape;
-import org.apache.poi.xslf.usermodel.XSLFBackground;
-import org.apache.poi.xslf.usermodel.XSLFRelation;
-import org.apache.poi.xslf.usermodel.XSLFSlide;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Before;
-import org.junit.Test;
-import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry;
-
-public class TestXSLFSlideShow {
-    private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-    private OPCPackage pack;
-
-    @Before
-    public void setUp() throws Exception {
-		pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx"));
-	}
-
-    @Test
-	public void testContainsMainContentType() throws Exception {
-		boolean found = false;
-		for(PackagePart part : pack.getParts()) {
-			if(part.getContentType().equals(XSLFRelation.MAIN.getContentType())) {
-				found = true;
-			}
-		}
-		assertTrue(found);
-	}
-
-    @Test
-	public void testOpen() throws IOException, OpenXML4JException, XmlException {
-		// With the finalized uri, should be fine
-		XSLFSlideShow xml = new XSLFSlideShow(pack);
-		// Check the core
-		assertNotNull(xml.getPresentation());
-		
-		// Check it has some slides
-		assertNotEquals(0, xml.getSlideReferences().sizeOfSldIdArray());
-		assertNotEquals(0, xml.getSlideMasterReferences().sizeOfSldMasterIdArray());
-		
-		xml.close();
-	}
-	
-    @Test
-	public void testSlideBasics() throws IOException, OpenXML4JException, XmlException {
-		XSLFSlideShow xml = new XSLFSlideShow(pack);
-		
-		// Should have 1 master
-		assertEquals(1, xml.getSlideMasterReferences().sizeOfSldMasterIdArray());
-
-		// Should have three sheets
-		assertEquals(2, xml.getSlideReferences().sizeOfSldIdArray());
-
-		// Check they're as expected
-		CTSlideIdListEntry[] slides = xml.getSlideReferences().getSldIdArray();
-
-		assertEquals(256, slides[0].getId());
-		assertEquals(257, slides[1].getId());
-		assertEquals("rId2", slides[0].getId2());
-		assertEquals("rId3", slides[1].getId2());
-		
-		// Now get those objects
-		assertNotNull(xml.getSlide(slides[0]));
-		assertNotNull(xml.getSlide(slides[1]));
-		
-		// And check they have notes as expected
-		assertNotNull(xml.getNotes(slides[0]));
-		assertNotNull(xml.getNotes(slides[1]));
-		
-		// And again for the master
-		CTSlideMasterIdListEntry[] masters = xml.getSlideMasterReferences().getSldMasterIdArray();
-		
-		assertEquals(2147483648l, masters[0].getId());
-		assertEquals("rId1", masters[0].getId2());
-		assertNotNull(xml.getSlideMaster(masters[0]));
-		
-		xml.close();
-	}
-	
-    @Test
-	public void testMetadataBasics() throws IOException, OpenXML4JException, XmlException {
-		XSLFSlideShow xml = new XSLFSlideShow(pack);
-		
-		assertNotNull(xml.getProperties().getCoreProperties());
-		assertNotNull(xml.getProperties().getExtendedProperties());
-		
-		CTProperties props = xml.getProperties().getExtendedProperties().getUnderlyingProperties();
-		assertEquals("Microsoft Office PowerPoint", props.getApplication());
-		assertEquals(0, props.getCharacters());
-		assertEquals(0, props.getLines());
-		
-		CoreProperties cprops = xml.getProperties().getCoreProperties();
-		assertNull(cprops.getTitle());
-		assertNull(cprops.getUnderlyingProperties().getSubjectProperty().getValue());
-		
-		xml.close();
-	}
-    
-    @Test
-    public void testMasterBackground() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFBackground b = ppt.getSlideMasters().get(0).getBackground();
-        b.setFillColor(Color.RED);
-        
-        XSLFSlide sl = ppt.createSlide();
-        XSLFAutoShape as = sl.createAutoShape();
-        as.setAnchor(new Rectangle2D.Double(100,100,100,100));
-        as.setShapeType(ShapeType.CLOUD);
-        
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt);
-        ppt.close();
-        
-        XSLFBackground b2 = ppt2.getSlideMasters().get(0).getBackground();
-        assertEquals(Color.RED, b2.getFillColor());
-        
-        ppt2.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java
deleted file mode 100644
index 550c4d8..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Yegor Kozlov
- */
-public class XSLFTestDataSamples {
-
-    public static XMLSlideShow openSampleDocument(String sampleName) {
-        InputStream is = POIDataSamples.getSlideShowInstance().openResourceAsStream(sampleName);
-        try {
-            return new XMLSlideShow(OPCPackage.open(is));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                is.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public static XMLSlideShow writeOutAndReadBack(XMLSlideShow doc) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-        try {
-            doc.write(baos);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        
-        InputStream bais;
-        bais = new ByteArrayInputStream(baos.toByteArray());
-        try {
-            return new XMLSlideShow(OPCPackage.open(bais));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                baos.close();
-                bais.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
deleted file mode 100644
index f76e084..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.extractor;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.apache.poi.POITestCase.assertNotContained;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Test;
-
-/**
- * Tests for XSLFPowerPointExtractor
- */
-public class TestXSLFPowerPointExtractor {
-    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-	/**
-	 * Get text out of the simple file
-	 * @throws XmlException
-	 * @throws OpenXML4JException
-	 */
-    @Test
-    public void testGetSimpleText()
-    throws IOException, XmlException, OpenXML4JException {
-        XMLSlideShow xmlA = openPPTX("sample.pptx");
-        @SuppressWarnings("resource")
-        OPCPackage pkg = xmlA.getPackage();
-
-	    new XSLFPowerPointExtractor(xmlA).close();
-		new XSLFPowerPointExtractor(pkg).close();
-
-		XSLFPowerPointExtractor extractor =
-			new XSLFPowerPointExtractor(xmlA);
-		extractor.getText();
-
-		String text = extractor.getText();
-		assertTrue(text.length() > 0);
-
-		// Check Basics
-		assertTrue(text.startsWith("Lorem ipsum dolor sit amet\n"));
-		assertContains(text, "amet\n\n");
-
-		// Our placeholder master text
-		// This shouldn't show up in the output
-	    // String masterText =
-	    //     "Click to edit Master title style\n" +
-        //     "Click to edit Master subtitle style\n" +
-        //     "\n\n\n\n\n\n" +
-        //     "Click to edit Master title style\n" +
-        //     "Click to edit Master text styles\n" +
-        //     "Second level\n" +
-        //     "Third level\n" +
-        //     "Fourth level\n" +
-        //     "Fifth level\n";
-
-		// Just slides, no notes
-		text = extractor.getText(true, false, false);
-		String slideText =
-	        "Lorem ipsum dolor sit amet\n" +
-            "Nunc at risus vel erat tempus posuere. Aenean non ante.\n" +
-            "\n" +
-            "Lorem ipsum dolor sit amet\n" +
-            "Lorem\n" +
-            "ipsum\n" +
-            "dolor\n" +
-            "sit\n" +
-            "amet\n" +
-            "\n";
-		assertEquals(slideText, text);
-
-		// Just notes, no slides
-		text = extractor.getText(false, true);
-		assertEquals("\n\n1\n\n\n2\n", text);
-
-		// Both
-		text = extractor.getText(true, true, false);
-		String bothText =
-	        "Lorem ipsum dolor sit amet\n" +
-            "Nunc at risus vel erat tempus posuere. Aenean non ante.\n" +
-            "\n\n\n1\n" +
-            "Lorem ipsum dolor sit amet\n" +
-            "Lorem\n" +
-            "ipsum\n" +
-            "dolor\n" +
-            "sit\n" +
-            "amet\n" +
-            "\n\n\n2\n";
-        assertEquals(bothText, text);
-
-		// With Slides and Master Text
-        text = extractor.getText(true, false, true);
-        String smText =
-            "Lorem ipsum dolor sit amet\n" +
-            "Nunc at risus vel erat tempus posuere. Aenean non ante.\n" +
-            "\n" +
-            "Lorem ipsum dolor sit amet\n" +
-            "Lorem\n" +
-            "ipsum\n" +
-            "dolor\n" +
-            "sit\n" +
-            "amet\n" +
-            "\n";
-        assertEquals(smText, text);
-
-		// With Slides, Notes and Master Text
-        text = extractor.getText(true, true, true);
-        String snmText =
-            "Lorem ipsum dolor sit amet\n" +
-            "Nunc at risus vel erat tempus posuere. Aenean non ante.\n" +
-            "\n\n\n1\n" +
-            "Lorem ipsum dolor sit amet\n" +
-            "Lorem\n" +
-            "ipsum\n" +
-            "dolor\n" +
-            "sit\n" +
-            "amet\n" +
-            "\n\n\n2\n";
-        assertEquals(snmText, text);
-
-		// Via set defaults
-		extractor.setSlidesByDefault(false);
-		extractor.setNotesByDefault(true);
-		text = extractor.getText();
-		assertEquals("\n\n1\n\n\n2\n", text);
-
-		extractor.close();
-		xmlA.close();
-	}
-
-    public void testGetComments() throws IOException {
-        XMLSlideShow xml = openPPTX("45545_Comment.pptx");
-        XSLFPowerPointExtractor extractor = new XSLFPowerPointExtractor(xml);
-
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-
-        // Check comments are there
-        assertContains(text, "testdoc");
-        assertContains(text, "test phrase");
-
-        // Check the authors came through too
-        assertContains(text, "XPVMWARE01");
-
-        extractor.close();
-        xml.close();
-    }
-
-	public void testGetMasterText() throws Exception {
-	    XMLSlideShow xml = openPPTX("WithMaster.pptx");
-	    XSLFPowerPointExtractor extractor = new XSLFPowerPointExtractor(xml);
-	    extractor.setSlidesByDefault(true);
-	    extractor.setNotesByDefault(false);
-	    extractor.setMasterByDefault(true);
-
-	    String text = extractor.getText();
-	    assertTrue(text.length() > 0);
-
-	    // Check master text is there
-	    assertContains(text, "Footer from the master slide");
-
-	    // Theme text shouldn't show up
-	    // String themeText =
-        //     "Theme Master Title\n" +
-        //     "Theme Master first level\n" +
-        //     "And the 2nd level\n" +
-        //     "Our 3rd level goes here\n" +
-        //     "And onto the 4th, such fun....\n" +
-        //     "Finally is the Fifth level\n";
-
-	    // Check the whole text
-	    String wholeText =
-            "First page title\n" +
-            "First page subtitle\n" +
-            "This is the Master Title\n" +
-            "This text comes from the Master Slide\n" +
-            "\n" +
-            // TODO Detect we didn't have a title, and include the master one
-            "2nd page subtitle\n" +
-            "Footer from the master slide\n" +
-            "This is the Master Title\n" +
-            "This text comes from the Master Slide\n";
-	    assertEquals(wholeText, text);
-
-		extractor.close();
-		xml.close();
-	}
-
-	@Test
-	public void testTable() throws Exception {
-        XMLSlideShow xml = openPPTX("present1.pptx");
-        XSLFPowerPointExtractor extractor = new XSLFPowerPointExtractor(xml);
-
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-
-        // Check comments are there
-        assertTrue("Unable to find expected word in text\n" + text, text.contains("TEST"));
-
-		extractor.close();
-		xml.close();
-    }
-
-    /**
-     * Test that we can get the text from macro enabled,
-     *  template, theme, slide enabled etc formats, as
-     *  well as from the normal file
-     */
-    @Test
-    public void testDifferentSubformats() throws Exception {
-        String[] extensions = new String[] {
-            "pptx", "pptm", "ppsm", "ppsx", "thmx",
-            // "xps" - Doesn't have a core document
-        };
-        for(String extension : extensions) {
-            String filename = "testPPT." + extension;
-            XMLSlideShow xml = openPPTX(filename);
-            XSLFPowerPointExtractor extractor = new XSLFPowerPointExtractor(xml);
-
-            String text = extractor.getText();
-            if (extension.equals("thmx")) {
-                // Theme file doesn't have any textual content
-                assertEquals(0, text.length());
-                continue;
-            }
-
-         assertTrue(text.length() > 0);
-         assertTrue(
-               "Text missing for " + filename + "\n" + text,
-               text.contains("Attachment Test")
-         );
-         assertTrue(
-               "Text missing for " + filename + "\n" + text,
-               text.contains("This is a test file data with the same content")
-         );
-         assertTrue(
-               "Text missing for " + filename + "\n" + text,
-               text.contains("content parsing")
-         );
-         assertTrue(
-               "Text missing for " + filename + "\n" + text,
-               text.contains("Different words to test against")
-         );
-         assertTrue(
-               "Text missing for " + filename + "\n" + text,
-               text.contains("Mystery")
-         );
-
- 		 extractor.close();
- 		 xml.close();
-       }
-    }
-
-    @Test
-    public void test45541() throws Exception {
-        // extract text from a powerpoint that has a header in the notes-element
-        POITextExtractor extr = ExtractorFactory.createExtractor(
-            slTests.getFile("45541_Header.pptx"));
-        String text = extr.getText();
-        assertNotNull(text);
-        assertFalse("Had: " + text, text.contains("testdoc"));
-
-        text = ((XSLFPowerPointExtractor)extr).getText(false, true);
-        assertContains(text, "testdoc");
-        extr.close();
-       assertNotNull(text);
-
-        // extract text from a powerpoint that has a footer in the master-slide
-        extr = ExtractorFactory.createExtractor(
-            slTests.getFile("45541_Footer.pptx"));
-        text = extr.getText();
-        assertNotContained(text, "testdoc");
-
-        text = ((XSLFPowerPointExtractor)extr).getText(false, true);
-        assertNotContained(text, "testdoc");
-
-        text = ((XSLFPowerPointExtractor)extr).getText(false, false, true);
-        assertNotContained(text, "testdoc");
-
-        extr.close();
-    }
-
-
-    @Test
-    public void bug54570() throws IOException {
-        XMLSlideShow xml = openPPTX("bug54570.pptx");
-        XSLFPowerPointExtractor extractor = new XSLFPowerPointExtractor(xml);
-        String text = extractor.getText();
-        assertNotNull(text);
-        extractor.close();
-        xml.close();
-    }
-
-    private XMLSlideShow openPPTX(String file) throws IOException {
-        InputStream is = slTests.openResourceAsStream(file);
-        try {
-            return new XMLSlideShow(is);
-        } finally {
-            is.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java
deleted file mode 100644
index 36d4247..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xslf.geom;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.poi.sl.draw.binding.CTCustomGeometry2D;
-import org.apache.poi.sl.draw.geom.*;
-import org.junit.Test;
-
-/**
- * Date: 10/24/11
- *
- * @author Yegor Kozlov
- */
-public class TestFormulaParser {
-    @Test
-    public void testParse(){
-
-        Formula[] ops = {
-            new Guide("adj1", "val 100"),
-            new Guide("adj2", "val 200"),
-            new Guide("adj3", "val -1"),
-            new Guide("a1", "*/ adj1 2 adj2"), // a1 = 100*2 / 200
-            new Guide("a2", "+- adj2 a1 adj1"), // a2 = 200 + a1 - 100
-            new Guide("a3", "+/ adj1 adj2 adj2"), // a3 = (100 + 200) / 200
-            new Guide("a4", "?: adj3 adj1 adj2"), // a4 = adj3 > 0 ? adj1 : adj2
-            new Guide("a5", "abs -2"),
-        };
-
-        CustomGeometry geom = new CustomGeometry(new CTCustomGeometry2D());
-        Context ctx = new Context(geom, null, null);
-        for(Formula fmla : ops) {
-            ctx.evaluate(fmla);
-        }
-
-        assertEquals(100.0, ctx.getValue("adj1"), 0.0);
-        assertEquals(200.0, ctx.getValue("adj2"), 0.0);
-        assertEquals(1.0, ctx.getValue("a1"), 0.0);
-        assertEquals(101.0, ctx.getValue("a2"), 0.0);
-        assertEquals(1.5, ctx.getValue("a3"), 0.0);
-        assertEquals(200.0, ctx.getValue("a4"), 0.0);
-        assertEquals(2.0, ctx.getValue("a5"), 0.0);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
deleted file mode 100644
index 9ad888d..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.io.File;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.xslf.util.PPTX2PNG;
-import org.junit.Test;
-
-/**
- * Date: 10/26/11
- *
- * @author Yegor Kozlov
- */
-public class TestPPTX2PNG {
-    
-    @Test
-    public void render() throws Exception {
-        POIDataSamples samples = POIDataSamples.getSlideShowInstance();
-
-//        File testFilesX[] = new File("tmp_ppt").listFiles(new FileFilter() {
-//            public boolean accept(File pathname) {
-//                return pathname.getName().toLowerCase().contains("ppt");
-//            }
-//        });
-//        String testFiles[] = new String[testFilesX.length];
-//        for (int i=0; i<testFilesX.length; i++) {
-//            testFiles[i] = testFilesX[i].getPath();
-//        }
-        
-
-        String[] testFiles = {"53446.ppt", "alterman_security.ppt","alterman_security.pptx","KEY02.pptx","themes.pptx","backgrounds.pptx","layouts.pptx", "sample.pptx", "shapes.pptx",};
-        String[] args = {
-            "-format", "null", // png,gif,jpg or null for test
-            "-slide", "-1", // -1 for all
-            "-outdir", new File("build/tmp/").getCanonicalPath(),
-            "-quiet",
-            "dummyfile"
-        };
-        for(String sampleFile : testFiles){
-            args[args.length-1] = samples.getFile(sampleFile).getCanonicalPath();
-//            args[args.length-1] = new File(sampleFile).getCanonicalPath();
-            try {
-                PPTX2PNG.main(args);
-            } catch (IllegalStateException e) {
-                throw new IllegalStateException("While reading file " + sampleFile, e);
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
deleted file mode 100644
index 0e58d41..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.sl.usermodel.BaseTestSlideShow;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry;
-
-public class TestXMLSlideShow extends BaseTestSlideShow {
-   private OPCPackage pack;
-   
-   @Override
-   public XMLSlideShow createSlideShow() {
-       return new XMLSlideShow();
-   }
-
-   @Before
-   public void setUp() throws Exception {
-      pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx"));
-   }
-   
-   @After
-   public void tearDown() throws IOException {
-       pack.revert();
-   }
-
-   @Test
-   public void testContainsMainContentType() throws Exception {
-      boolean found = false;
-      for(PackagePart part : pack.getParts()) {
-         if(part.getContentType().equals(XSLFRelation.MAIN.getContentType())) {
-            found = true;
-         }
-      }
-      assertTrue(found);
-   }
-
-   @Test
-   public void testOpen() throws Exception {
-      // With the finalised uri, should be fine
-       XMLSlideShow xml = new XMLSlideShow(pack);
-      // Check the core
-      assertNotNull(xml.getCTPresentation());
-
-      // Check it has some slides
-      assertFalse(xml.getSlides().isEmpty());
-      assertFalse(xml.getSlideMasters().isEmpty());
-      
-      xml.close();
-   }
-
-   @Test
-   public void testSlideBasics() throws IOException {
-      XMLSlideShow xml = new XMLSlideShow(pack);
-
-      // Should have 1 master
-      assertEquals(1, xml.getSlideMasters().size());
-
-      // Should have two sheets
-      assertEquals(2, xml.getSlides().size());
-
-      // Check they're as expected
-      CTSlideIdListEntry[] slides = xml.getCTPresentation().getSldIdLst().getSldIdArray();
-
-      assertEquals(256, slides[0].getId());
-      assertEquals(257, slides[1].getId());
-      assertEquals("rId2", slides[0].getId2());
-      assertEquals("rId3", slides[1].getId2());
-
-      // Now get those objects
-      assertNotNull(xml.getSlides().get(0));
-      assertNotNull(xml.getSlides().get(1));
-
-      // And check they have notes as expected
-      assertNotNull(xml.getSlides().get(0).getNotes());
-      assertNotNull(xml.getSlides().get(1).getNotes());
-
-      // Next up look for the slide master
-      CTSlideMasterIdListEntry[] masters = xml.getCTPresentation().getSldMasterIdLst().getSldMasterIdArray();
-
-      assertEquals(2147483648l, masters[0].getId());
-      assertEquals("rId1", masters[0].getId2());
-      assertNotNull(xml.getSlideMasters().get(0));
-
-      // Finally look for the notes master
-      CTNotesMasterIdListEntry notesMaster =
-         xml.getCTPresentation().getNotesMasterIdLst().getNotesMasterId();
-      assertNotNull(notesMaster);
-
-      assertNotNull(xml.getNotesMaster());
-      
-      xml.close();
-   }
-	
-   @Test
-   public void testMetadataBasics() throws IOException {
-      XMLSlideShow xml = new XMLSlideShow(pack);
-
-      assertNotNull(xml.getProperties().getCoreProperties());
-      assertNotNull(xml.getProperties().getExtendedProperties());
-
-      assertEquals("Microsoft Office PowerPoint", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
-      assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
-      assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
-
-      assertEquals(null, xml.getProperties().getCoreProperties().getTitle());
-      assertEquals(null, xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue());
-      
-      xml.close();
-   }
-   
-   @Test
-   public void testComments() throws Exception {
-      // Default sample file has none
-      XMLSlideShow xml = new XMLSlideShow(pack);
-      
-      assertEquals(null, xml.getCommentAuthors());
-      
-      for (XSLFSlide slide : xml.getSlides()) {
-         assertEquals(null, slide.getComments());
-      }
-      
-      // Try another with comments
-      XMLSlideShow xmlComments = new XMLSlideShow(slTests.openResourceAsStream("45545_Comment.pptx"));
-      
-      // Has one author
-      assertNotNull(xmlComments.getCommentAuthors());
-      assertEquals(1, xmlComments.getCommentAuthors().getCTCommentAuthorsList().sizeOfCmAuthorArray());
-      assertEquals("XPVMWARE01", xmlComments.getCommentAuthors().getAuthorById(0).getName());
-      
-      // First two slides have comments
-      int i = -1;
-      for (XSLFSlide slide : xmlComments.getSlides()) {
-         i++;
-         
-         if(i == 0) {
-            assertNotNull(slide.getComments());
-            assertEquals(1, slide.getComments().getNumberOfComments());
-            assertEquals("testdoc", slide.getComments().getCommentAt(0).getText());
-            assertEquals(0, slide.getComments().getCommentAt(0).getAuthorId());
-         } else if (i == 1) {
-            assertNotNull(slide.getComments());
-            assertEquals(1, slide.getComments().getNumberOfComments());
-            assertEquals("test phrase", slide.getComments().getCommentAt(0).getText());
-            assertEquals(0, slide.getComments().getCommentAt(0).getAuthorId());
-         } else {
-            assertEquals(null, slide.getComments());
-         }
-      }
-      
-      xmlComments.close();
-      xml.close();
-   }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
deleted file mode 100644
index 798dc47..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.*;
-import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
-import org.apache.poi.sl.usermodel.TextShape.TextAutofit;
-import org.apache.poi.sl.usermodel.TextShape.TextDirection;
-import org.apache.poi.util.Units;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextStrikeType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFAutoShape {
-    @Test
-    public void testTextBodyProperies() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFAutoShape shape = slide.createAutoShape();
-        shape.addNewTextParagraph().addNewTextRun().setText("POI");
-
-        // default margins from slide master
-        assertEquals(3.6, shape.getBottomInset(), 0);
-        assertEquals(3.6, shape.getTopInset(), 0);
-        assertEquals(7.2, shape.getLeftInset(), 0);
-        assertEquals(7.2, shape.getRightInset(), 0);
-
-        shape.setBottomInset(1.0);
-        assertEquals(1.0, shape.getBottomInset(), 0);
-        shape.setTopInset(2.0);
-        assertEquals(2.0, shape.getTopInset(), 0);
-        shape.setLeftInset(3.0);
-        assertEquals(3.0, shape.getLeftInset(), 0);
-        shape.setRightInset(4.0);
-        assertEquals(4.0, shape.getRightInset(), 0);
-
-        shape.setBottomInset(0.0);
-        assertEquals(0.0, shape.getBottomInset(), 0);
-        shape.setTopInset(0.0);
-        assertEquals(0.0, shape.getTopInset(), 0);
-        shape.setLeftInset(0.0);
-        assertEquals(0.0, shape.getLeftInset(), 0);
-        shape.setRightInset(0.0);
-        assertEquals(0.0, shape.getRightInset(), 0);
-
-        // unset to defauls
-        shape.setBottomInset(-1);
-        assertEquals(3.6, shape.getBottomInset(), 0);
-        shape.setTopInset(-1);
-        assertEquals(3.6, shape.getTopInset(), 0);
-        shape.setLeftInset(-1);
-        assertEquals(7.2, shape.getLeftInset(), 0);
-        shape.setRightInset(-1);
-        assertEquals(7.2, shape.getRightInset(), 0);
-
-        // shape
-        assertTrue(shape.getWordWrap());
-        shape.setWordWrap(false);
-        assertFalse(shape.getWordWrap());
-        shape.setWordWrap(true);
-        assertTrue(shape.getWordWrap());
-
-        // shape
-        assertEquals(TextAutofit.NORMAL, shape.getTextAutofit());
-        shape.setTextAutofit(TextAutofit.NONE);
-        assertEquals(TextAutofit.NONE, shape.getTextAutofit());
-        shape.setTextAutofit(TextAutofit.SHAPE);
-        assertEquals(TextAutofit.SHAPE, shape.getTextAutofit());
-        shape.setTextAutofit(TextAutofit.NORMAL);
-        assertEquals(TextAutofit.NORMAL, shape.getTextAutofit());
-
-        assertEquals(VerticalAlignment.TOP, shape.getVerticalAlignment());
-        shape.setVerticalAlignment(VerticalAlignment.BOTTOM);
-        assertEquals(VerticalAlignment.BOTTOM, shape.getVerticalAlignment());
-        shape.setVerticalAlignment(VerticalAlignment.MIDDLE);
-        assertEquals(VerticalAlignment.MIDDLE, shape.getVerticalAlignment());
-        shape.setVerticalAlignment(null);
-        assertEquals(VerticalAlignment.TOP, shape.getVerticalAlignment());
-
-        assertEquals(TextDirection.HORIZONTAL, shape.getTextDirection());
-        shape.setTextDirection(TextDirection.VERTICAL);
-        assertEquals(TextDirection.VERTICAL, shape.getTextDirection());
-        shape.setTextDirection(null);
-        assertEquals(TextDirection.HORIZONTAL, shape.getTextDirection());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testTextParagraph() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        assertTrue(slide.getShapes().isEmpty());
-
-        XSLFAutoShape shape = slide.createAutoShape();
-        assertEquals(0, shape.getTextParagraphs().size());
-        XSLFTextParagraph p = shape.addNewTextParagraph();
-        assertEquals(1, shape.getTextParagraphs().size());
-
-        assertNull(p.getIndent());
-        assertEquals(0, p.getLeftMargin(), 0);
-        assertNull(p.getLineSpacing());
-        assertNull(p.getSpaceAfter());
-        assertNull(p.getSpaceBefore());
-        assertEquals(0, p.getIndentLevel());
-
-        p.setIndent(2.0);
-        assertEquals(2.0, p.getIndent(), 0);
-        assertTrue(p.getXmlObject().getPPr().isSetIndent());
-        p.setIndent(null);
-        assertNull(p.getIndent());
-        assertFalse(p.getXmlObject().getPPr().isSetIndent());
-        p.setIndent(10.0);
-        assertEquals(10., p.getIndent(), 0);
-        assertTrue(p.getXmlObject().getPPr().isSetIndent());
-
-
-        assertFalse(p.getXmlObject().getPPr().isSetLvl());
-        p.setIndentLevel(1);
-        assertEquals(1, p.getIndentLevel());
-        assertTrue(p.getXmlObject().getPPr().isSetLvl());
-        p.setIndentLevel(2);
-        assertEquals(2, p.getIndentLevel());
-
-        p.setLeftMargin(2.0);
-        assertEquals(2.0, p.getLeftMargin(), 0);
-        assertTrue(p.getXmlObject().getPPr().isSetMarL());
-        p.setLeftMargin(10.0);
-        assertEquals(10., p.getLeftMargin(), 0);
-        assertEquals(Units.toEMU(10), p.getXmlObject().getPPr().getMarL());
-
-
-        assertFalse(p.getXmlObject().getPPr().isSetSpcAft());
-        p.setSpaceAfter(200d);
-        assertEquals(200000, p.getXmlObject().getPPr().getSpcAft().getSpcPct().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcAft().isSetSpcPts());
-        p.setSpaceAfter(100d);
-        assertEquals(100000, p.getXmlObject().getPPr().getSpcAft().getSpcPct().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcAft().isSetSpcPts());
-        p.setSpaceAfter(-20d);
-        assertEquals(2000, p.getXmlObject().getPPr().getSpcAft().getSpcPts().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcAft().isSetSpcPct());
-        p.setSpaceAfter(-10d);
-        assertEquals(1000, p.getXmlObject().getPPr().getSpcAft().getSpcPts().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcAft().isSetSpcPct());
-
-        assertFalse(p.getXmlObject().getPPr().isSetSpcBef());
-        p.setSpaceBefore(200d);
-        assertEquals(200000, p.getXmlObject().getPPr().getSpcBef().getSpcPct().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcBef().isSetSpcPts());
-        p.setSpaceBefore(100d);
-        assertEquals(100000, p.getXmlObject().getPPr().getSpcBef().getSpcPct().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcBef().isSetSpcPts());
-        p.setSpaceBefore(-20d);
-        assertEquals(2000, p.getXmlObject().getPPr().getSpcBef().getSpcPts().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcBef().isSetSpcPct());
-        p.setSpaceBefore(-10d);
-        assertEquals(1000, p.getXmlObject().getPPr().getSpcBef().getSpcPts().getVal());
-        assertFalse(p.getXmlObject().getPPr().getSpcBef().isSetSpcPct());
-
-        assertFalse(p.getXmlObject().getPPr().isSetLnSpc());
-        p.setLineSpacing(200d);
-        assertEquals(200000, p.getXmlObject().getPPr().getLnSpc().getSpcPct().getVal());
-        assertFalse(p.getXmlObject().getPPr().getLnSpc().isSetSpcPts());
-        p.setLineSpacing(100d);
-        assertEquals(100000, p.getXmlObject().getPPr().getLnSpc().getSpcPct().getVal());
-        assertFalse(p.getXmlObject().getPPr().getLnSpc().isSetSpcPts());
-        p.setLineSpacing(-20d);
-        assertEquals(2000, p.getXmlObject().getPPr().getLnSpc().getSpcPts().getVal());
-        assertFalse(p.getXmlObject().getPPr().getLnSpc().isSetSpcPct());
-        p.setLineSpacing(-10d);
-        assertEquals(1000, p.getXmlObject().getPPr().getLnSpc().getSpcPts().getVal());
-        assertFalse(p.getXmlObject().getPPr().getLnSpc().isSetSpcPct());
-
-        // align is set in autoshape prototype
-        assertTrue(p.getXmlObject().getPPr().isSetAlgn());
-        assertEquals(TextAlign.LEFT, p.getTextAlign());
-        p.setTextAlign(TextAlign.LEFT);
-        assertTrue(p.getXmlObject().getPPr().isSetAlgn());
-        assertEquals(TextAlign.LEFT, p.getTextAlign());
-        p.setTextAlign(TextAlign.RIGHT);
-        assertEquals(TextAlign.RIGHT, p.getTextAlign());
-        p.setTextAlign(TextAlign.JUSTIFY);
-        assertEquals(TextAlign.JUSTIFY, p.getTextAlign());
-        p.setTextAlign(null);
-        assertEquals(TextAlign.LEFT, p.getTextAlign());
-        assertFalse(p.getXmlObject().getPPr().isSetAlgn());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testTextRun() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFAutoShape shape = slide.createAutoShape();
-        assertEquals(0, shape.getTextParagraphs().size());
-        XSLFTextParagraph p = shape.addNewTextParagraph();
-        assertEquals(1, shape.getTextParagraphs().size());
-        assertEquals(0, p.getTextRuns().size());
-        XSLFTextRun r = p.addNewTextRun();
-        assertEquals(1, p.getTextRuns().size());
-        assertSame(r, p.getTextRuns().get(0));
-
-        assertEquals(18.0, r.getFontSize(), 0); // default font size for text boxes
-        assertFalse(r.getXmlObject().getRPr().isSetSz());
-        r.setFontSize(10.0);
-        assertTrue(r.getXmlObject().isSetRPr());
-        assertEquals(1000, r.getXmlObject().getRPr().getSz());
-        r.setFontSize(12.5);
-        assertEquals(1250, r.getXmlObject().getRPr().getSz());
-        r.setFontSize(null);
-        assertFalse(r.getXmlObject().getRPr().isSetSz());
-
-        assertFalse(r.getXmlObject().getRPr().isSetLatin());
-        assertEquals("Calibri", r.getFontFamily()); // comes from the slide master
-        r.setFontFamily(null);
-        assertEquals("Calibri", r.getFontFamily()); // comes from the slide master
-        r.setFontFamily("Arial");
-        assertEquals("Arial", r.getFontFamily());
-        assertEquals("Arial", r.getXmlObject().getRPr().getLatin().getTypeface());
-        r.setFontFamily("Symbol");
-        assertEquals("Symbol", r.getFontFamily());
-        assertEquals("Symbol", r.getXmlObject().getRPr().getLatin().getTypeface());
-        r.setFontFamily(null);
-        assertEquals("Calibri", r.getFontFamily()); // comes from the slide master
-        assertFalse(r.getXmlObject().getRPr().isSetLatin());
-
-        assertFalse(r.isStrikethrough());
-        assertFalse(r.getXmlObject().getRPr().isSetStrike());
-        r.setStrikethrough(true);
-        assertTrue(r.isStrikethrough());
-        assertEquals(STTextStrikeType.SNG_STRIKE, r.getXmlObject().getRPr().getStrike());
-
-        assertFalse(r.isBold());
-        assertFalse(r.getXmlObject().getRPr().isSetB());
-        r.setBold(true);
-        assertTrue(r.isBold());
-        assertEquals(true, r.getXmlObject().getRPr().getB());
-
-        assertFalse(r.isItalic());
-        assertFalse(r.getXmlObject().getRPr().isSetI());
-        r.setItalic(true);
-        assertTrue(r.isItalic());
-        assertEquals(true, r.getXmlObject().getRPr().getI());
-
-        assertFalse(r.isUnderlined());
-        assertFalse(r.getXmlObject().getRPr().isSetU());
-        r.setUnderlined(true);
-        assertTrue(r.isUnderlined());
-        assertEquals(STTextUnderlineType.SNG, r.getXmlObject().getRPr().getU());
-
-        r.setText("Apache");
-        assertEquals("Apache", r.getRawText());
-        r.setText("POI");
-        assertEquals("POI", r.getRawText());
-        r.setText(null);
-        assertNull(r.getRawText());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testShapeType() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFAutoShape shape = slide.createAutoShape();
-        assertEquals(ShapeType.RECT, shape.getShapeType());
-
-        shape.setShapeType(ShapeType.TRIANGLE);
-        assertEquals(ShapeType.TRIANGLE, shape.getShapeType());
-
-        for(ShapeType tp : ShapeType.values()) {
-            if (tp.ooxmlId == -1 || tp == ShapeType.SEAL) continue;
-            shape.setShapeType(tp);
-            assertEquals(tp, shape.getShapeType());
-        }
-        
-        ppt.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
deleted file mode 100644
index 02fa668..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xslf.usermodel;
-
-import java.io.OutputStream;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.drawingml.x2006.chart.*;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFChart extends TestCase {
-
-    /**
-     * a modified version from POI-examples
-     */
-    public void testFillChartTemplate() throws Exception {
-
-        String chartTitle = "Apache POI";  // first line is chart title
-
-        XMLSlideShow pptx = XSLFTestDataSamples.openSampleDocument("pie-chart.pptx");
-        XSLFSlide slide = pptx.getSlides().get(0);
-
-        // find chart in the slide
-        XSLFChart chart = null;
-        for(POIXMLDocumentPart part : slide.getRelations()){
-            if(part instanceof XSLFChart){
-                chart = (XSLFChart) part;
-                break;
-            }
-        }
-
-        if(chart == null) throw new IllegalStateException("chart not found in the template");
-
-        // embedded Excel workbook that holds the chart data
-        POIXMLDocumentPart xlsPart = chart.getRelations().get(0);
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-
-        CTChart ctChart = chart.getCTChart();
-        CTPlotArea plotArea = ctChart.getPlotArea();
-
-        CTPieChart pieChart = plotArea.getPieChartArray(0);
-        //Pie Chart Series
-        CTPieSer ser = pieChart.getSerArray(0);
-
-        // Series Text
-        CTSerTx tx = ser.getTx();
-        tx.getStrRef().getStrCache().getPtArray(0).setV(chartTitle);
-        sheet.createRow(0).createCell(1).setCellValue(chartTitle);
-        String titleRef = new CellReference(sheet.getSheetName(), 0, 1, true, true).formatAsString();
-        tx.getStrRef().setF(titleRef);
-
-
-        // Category Axis Data
-        CTAxDataSource cat = ser.getCat();
-        CTStrData strData = cat.getStrRef().getStrCache();
-
-        // Values
-        CTNumDataSource valSrc = ser.getVal();
-        CTNumData numData = valSrc.getNumRef().getNumCache();
-
-        strData.setPtArray(null);  // unset old axis text
-        numData.setPtArray(null);  // unset old values
-
-        Map<String, Double> pieModel = new LinkedHashMap<String, Double>();
-        pieModel.put("First", 1.0);
-        pieModel.put("Second", 3.0);
-        pieModel.put("Third", 4.0);
-
-        // set model
-        int idx = 0;
-        int rownum = 1;
-        for(String key : pieModel.keySet()){
-            double val = pieModel.get(key);
-
-            CTNumVal numVal = numData.addNewPt();
-            numVal.setIdx(idx);
-            numVal.setV("" + val);
-
-            CTStrVal sVal = strData.addNewPt();
-            sVal.setIdx(idx);
-            sVal.setV(key);
-
-            idx++;
-            XSSFRow row = sheet.createRow(rownum++);
-            row.createCell(0).setCellValue(key);
-            row.createCell(1).setCellValue(val);
-        }
-        numData.getPtCount().setVal(idx);
-        strData.getPtCount().setVal(idx);
-
-        String numDataRange = new CellRangeAddress(1, rownum-1, 1, 1).formatAsString(sheet.getSheetName(), true);
-        valSrc.getNumRef().setF(numDataRange);
-        String axisDataRange = new CellRangeAddress(1, rownum-1, 0, 0).formatAsString(sheet.getSheetName(), true);
-        cat.getStrRef().setF(axisDataRange);
-
-        // updated the embedded workbook with the data
-        OutputStream xlsOut = xlsPart.getPackagePart().getOutputStream();
-        wb.write(xlsOut);
-        xlsOut.close();
-
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java
deleted file mode 100644
index 659f4be..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.PresetColor;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTHslColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSystemColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.STPresetColorVal;
-import org.openxmlformats.schemas.drawingml.x2006.main.STSchemeColorVal;
-import org.openxmlformats.schemas.drawingml.x2006.main.STSystemColorVal;
-
-public class TestXSLFColor {
-
-    @Test
-    public void testGetters() {
-        CTColor xml = CTColor.Factory.newInstance();
-        CTSRgbColor c = xml.addNewSrgbClr();
-        c.setVal(new byte[]{(byte)0xFF, 0, 0});
-
-        XSLFColor color = new XSLFColor(xml, null, null);
-
-        assertEquals(-1, color.getAlpha());
-        c.addNewAlpha().setVal(50000);
-        assertEquals(50, color.getAlpha());
-
-        assertEquals(-1, color.getAlphaMod());
-        c.addNewAlphaMod().setVal(50000);
-        assertEquals(50, color.getAlphaMod());
-
-        assertEquals(-1, color.getAlphaOff());
-        c.addNewAlphaOff().setVal(50000);
-        assertEquals(50, color.getAlphaOff());
-
-        assertEquals(-1, color.getLumMod());
-        c.addNewLumMod().setVal(50000);
-        assertEquals(50, color.getLumMod());
-
-        assertEquals(-1, color.getLumOff());
-        c.addNewLumOff().setVal(50000);
-        assertEquals(50, color.getLumOff());
-
-        assertEquals(-1, color.getSat());
-        c.addNewSat().setVal(50000);
-        assertEquals(50, color.getSat());
-
-        assertEquals(-1, color.getSatMod());
-        c.addNewSatMod().setVal(50000);
-        assertEquals(50, color.getSatMod());
-
-        assertEquals(-1, color.getSatOff());
-        c.addNewSatOff().setVal(50000);
-        assertEquals(50, color.getSatOff());
-
-        assertEquals(-1, color.getRed());
-        c.addNewRed().setVal(50000);
-        assertEquals(50, color.getRed());
-
-        assertEquals(-1, color.getGreen());
-        c.addNewGreen().setVal(50000);
-        assertEquals(50, color.getGreen());
-
-        assertEquals(-1, color.getBlue());
-        c.addNewBlue().setVal(50000);
-        assertEquals(50, color.getRed());
-
-        assertEquals(-1, color.getShade());
-        c.addNewShade().setVal(50000);
-        assertEquals(50, color.getShade());
-
-        assertEquals(-1, color.getTint());
-        c.addNewTint().setVal(50000);
-        assertEquals(50, color.getTint());
-    }
-
-    @Test
-    public void testHSL() {
-        CTColor xml = CTColor.Factory.newInstance();
-        CTHslColor c = xml.addNewHslClr();
-        c.setHue2(14400000);
-        c.setSat2(100000);
-        c.setLum2(50000);
-
-        XSLFColor color = new XSLFColor(xml, null, null);
-        assertEquals(Color.BLUE, color.getColor());
-    }
-
-    @Test
-    public void testSRgb() {
-        CTColor xml = CTColor.Factory.newInstance();
-        xml.addNewSrgbClr().setVal(new byte[]{ (byte)0xFF, (byte)0xFF, 0});
-
-        XSLFColor color = new XSLFColor(xml, null, null);
-        assertEquals(new Color(0xFF, 0xFF, 0), color.getColor());
-    }
-
-    @Test
-    public void testSchemeColor() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFTheme theme = ppt.createSlide().getTheme();
-
-        CTColor xml = CTColor.Factory.newInstance();
-        xml.addNewSchemeClr().setVal(STSchemeColorVal.ACCENT_2);
-
-        XSLFColor color = new XSLFColor(xml, theme, null);
-        // accent2 is theme1.xml is <a:srgbClr val="C0504D"/>
-        assertEquals(Color.decode("0xC0504D"), color.getColor());
-
-        xml = CTColor.Factory.newInstance();
-        xml.addNewSchemeClr().setVal(STSchemeColorVal.LT_1);
-        color = new XSLFColor(xml, theme, null);
-        // <a:sysClr val="window" lastClr="FFFFFF"/>
-        assertEquals(Color.decode("0xFFFFFF"), color.getColor());
-
-        xml = CTColor.Factory.newInstance();
-        xml.addNewSchemeClr().setVal(STSchemeColorVal.DK_1);
-        color = new XSLFColor(xml, theme, null);
-        // <a:sysClr val="windowText" lastClr="000000"/>
-        assertEquals(Color.decode("0x000000"), color.getColor());
-
-        ppt.close();
-    }
-
-    @Test
-    public void testPresetColor() {
-        CTColor xml = CTColor.Factory.newInstance();
-        xml.addNewPrstClr().setVal(STPresetColorVal.AQUAMARINE);
-        XSLFColor color = new XSLFColor(xml, null, null);
-        assertEquals(new Color(127, 255, 212), color.getColor());
-
-
-        for(PresetColor pc : PresetColor.values()) {
-            if (pc.ooxmlId == null) continue;
-            xml = CTColor.Factory.newInstance();
-            STPresetColorVal.Enum preVal = STPresetColorVal.Enum.forString(pc.ooxmlId);
-            STSystemColorVal.Enum sysVal = STSystemColorVal.Enum.forString(pc.ooxmlId);
-            assertTrue(pc.ooxmlId, preVal != null || sysVal != null);
-            if (preVal != null) {
-                xml.addNewPrstClr().setVal(preVal);
-            } else {
-                xml.addNewSysClr().setVal(sysVal);
-            }
-            color = new XSLFColor(xml, null, null);
-            assertEquals(pc.color, color.getColor());
-        }
-    }
-
-    @Test
-    public void testSys() {
-        CTColor xml = CTColor.Factory.newInstance();
-        CTSystemColor sys = xml.addNewSysClr();
-        sys.setVal(STSystemColorVal.CAPTION_TEXT);
-        XSLFColor color = new XSLFColor(xml, null, null);
-        assertEquals(Color.black, color.getColor());
-
-        xml = CTColor.Factory.newInstance();
-        sys = xml.addNewSysClr();
-        sys.setLastClr(new byte[]{(byte)0xFF, 0, 0});
-        color = new XSLFColor(xml, null, null);
-        assertEquals(Color.red, color.getColor());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
deleted file mode 100644
index 0598562..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.apache.poi.xslf.usermodel.TestXSLFSimpleShape.getSpPr;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape;
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTConnection;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualConnectorProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndLength;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndType;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndWidth;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
-
-public class TestXSLFConnectorShape {
-
-    @Test
-    public void testLineDecorations() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFConnectorShape shape = slide.createConnector();
-        assertEquals(1, slide.getShapes().size());
-
-        assertFalse(getSpPr(shape).getLn().isSetHeadEnd());
-        assertFalse(getSpPr(shape).getLn().isSetTailEnd());
-
-        // line decorations
-        assertEquals(DecorationShape.NONE, shape.getLineHeadDecoration());
-        assertEquals(DecorationShape.NONE, shape.getLineTailDecoration());
-        shape.setLineHeadDecoration(null);
-        shape.setLineTailDecoration(null);
-        assertEquals(DecorationShape.NONE, shape.getLineHeadDecoration());
-        assertEquals(DecorationShape.NONE, shape.getLineTailDecoration());
-        assertFalse(getSpPr(shape).getLn().getHeadEnd().isSetType());
-        assertFalse(getSpPr(shape).getLn().getTailEnd().isSetType());
-
-        shape.setLineHeadDecoration(DecorationShape.ARROW);
-        shape.setLineTailDecoration(DecorationShape.DIAMOND);
-        assertEquals(DecorationShape.ARROW, shape.getLineHeadDecoration());
-        assertEquals(DecorationShape.DIAMOND, shape.getLineTailDecoration());
-        assertEquals(STLineEndType.ARROW, getSpPr(shape).getLn().getHeadEnd().getType());
-        assertEquals(STLineEndType.DIAMOND, getSpPr(shape).getLn().getTailEnd().getType());
-
-        shape.setLineHeadDecoration(DecorationShape.DIAMOND);
-        shape.setLineTailDecoration(DecorationShape.ARROW);
-        assertEquals(DecorationShape.DIAMOND, shape.getLineHeadDecoration());
-        assertEquals(DecorationShape.ARROW, shape.getLineTailDecoration());
-        assertEquals(STLineEndType.DIAMOND, getSpPr(shape).getLn().getHeadEnd().getType());
-        assertEquals(STLineEndType.ARROW, getSpPr(shape).getLn().getTailEnd().getType());
-
-        // line end width
-        assertEquals(DecorationSize.MEDIUM, shape.getLineHeadWidth());
-        assertEquals(DecorationSize.MEDIUM, shape.getLineTailWidth());
-        shape.setLineHeadWidth(null);
-        shape.setLineHeadWidth(null);
-        assertEquals(DecorationSize.MEDIUM, shape.getLineHeadWidth());
-        assertEquals(DecorationSize.MEDIUM, shape.getLineTailWidth());
-        assertFalse(getSpPr(shape).getLn().getHeadEnd().isSetW());
-        assertFalse(getSpPr(shape).getLn().getTailEnd().isSetW());
-        shape.setLineHeadWidth(DecorationSize.LARGE);
-        shape.setLineTailWidth(DecorationSize.MEDIUM);
-        assertEquals(DecorationSize.LARGE, shape.getLineHeadWidth());
-        assertEquals(DecorationSize.MEDIUM, shape.getLineTailWidth());
-        assertEquals(STLineEndWidth.LG, getSpPr(shape).getLn().getHeadEnd().getW());
-        assertEquals(STLineEndWidth.MED, getSpPr(shape).getLn().getTailEnd().getW());
-        shape.setLineHeadWidth(DecorationSize.MEDIUM);
-        shape.setLineTailWidth(DecorationSize.LARGE);
-        assertEquals(DecorationSize.MEDIUM, shape.getLineHeadWidth());
-        assertEquals(DecorationSize.LARGE, shape.getLineTailWidth());
-        assertEquals(STLineEndWidth.MED, getSpPr(shape).getLn().getHeadEnd().getW());
-        assertEquals(STLineEndWidth.LG, getSpPr(shape).getLn().getTailEnd().getW());
-
-        // line end length
-        assertEquals(DecorationSize.MEDIUM, shape.getLineHeadLength());
-        assertEquals(DecorationSize.MEDIUM, shape.getLineTailLength());
-        shape.setLineHeadLength(null);
-        shape.setLineTailLength(null);
-        assertEquals(DecorationSize.MEDIUM, shape.getLineHeadLength());
-        assertEquals(DecorationSize.MEDIUM, shape.getLineTailLength());
-        assertFalse(getSpPr(shape).getLn().getHeadEnd().isSetLen());
-        assertFalse(getSpPr(shape).getLn().getTailEnd().isSetLen());
-        shape.setLineHeadLength(DecorationSize.LARGE);
-        shape.setLineTailLength(DecorationSize.MEDIUM);
-        assertEquals(DecorationSize.LARGE, shape.getLineHeadLength());
-        assertEquals(DecorationSize.MEDIUM, shape.getLineTailLength());
-        assertEquals(STLineEndLength.LG, getSpPr(shape).getLn().getHeadEnd().getLen());
-        assertEquals(STLineEndLength.MED, getSpPr(shape).getLn().getTailEnd().getLen());
-        shape.setLineHeadLength(DecorationSize.MEDIUM);
-        shape.setLineTailLength(DecorationSize.LARGE);
-        assertEquals(DecorationSize.MEDIUM, shape.getLineHeadLength());
-        assertEquals(DecorationSize.LARGE, shape.getLineTailLength());
-        assertEquals(STLineEndLength.MED, getSpPr(shape).getLn().getHeadEnd().getLen());
-        assertEquals(STLineEndLength.LG, getSpPr(shape).getLn().getTailEnd().getLen());
-
-        ppt.close();
-    }
-
-    @Test
-    public void testAddConnector() throws IOException {
-        XMLSlideShow pptx = new XMLSlideShow();
-        XSLFSlide slide = pptx.createSlide();
-
-        XSLFAutoShape rect1 = slide.createAutoShape();
-        rect1.setShapeType(ShapeType.RECT);
-        rect1.setAnchor(new Rectangle2D.Double(100, 100, 100, 100));
-        rect1.setFillColor(Color.blue);
-
-        XSLFAutoShape rect2 = slide.createAutoShape();
-        rect2.setShapeType(ShapeType.RECT);
-        rect2.setAnchor(new Rectangle2D.Double(300, 300, 100, 100));
-        rect2.setFillColor(Color.red);
-
-
-        XSLFConnectorShape connector1 = slide.createConnector();
-        connector1.setAnchor(new Rectangle2D.Double(200, 150, 100, 200));
-
-        CTConnector ctConnector = (CTConnector)connector1.getXmlObject();
-        ctConnector.getSpPr().getPrstGeom().setPrst(STShapeType.BENT_CONNECTOR_3);
-        CTNonVisualConnectorProperties cx = ctConnector.getNvCxnSpPr().getCNvCxnSpPr();
-        // connection start
-        CTConnection stCxn = cx.addNewStCxn();
-        stCxn.setId(rect1.getShapeId());
-        // side of the rectangle to attach the connector: left=1, bottom=2,right=3, top=4
-        stCxn.setIdx(2);
-
-        CTConnection end = cx.addNewEndCxn();
-        end.setId(rect2.getShapeId());
-        // side of the rectangle to attach the connector: left=1, bottom=2,right=3, top=4
-        end.setIdx(3);
-        
-        pptx.close();
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
deleted file mode 100644
index 5a4e100..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.apache.poi.xslf.usermodel.TestXSLFSimpleShape.getSpPr;
-
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.junit.Test;
-
-public class TestXSLFFreeformShape {
-
-    @Test
-    public void testSetPath() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        XSLFFreeformShape shape1 = slide.createFreeform();
-        // comples path consisting of a rectangle and an ellipse inside it
-        Path2D.Double path1 = new Path2D.Double(new Rectangle2D.Double(150, 150, 300, 300));
-        path1.append(new Ellipse2D.Double(200, 200, 100, 50), false);
-        shape1.setPath(path1);
-
-        Path2D.Double path2 = shape1.getPath();
-
-        // YK: how to compare the original path1 and the value returned by XSLFFreeformShape.getPath() ?
-        // one way is to create another XSLFFreeformShape from path2 and compare the resulting xml
-        assertEquals(path1.getBounds2D(), path2.getBounds2D());
-
-        XSLFFreeformShape shape2 = slide.createFreeform();
-        shape2.setPath(path2);
-
-        assertEquals(getSpPr(shape1).getCustGeom().toString(), getSpPr(shape2).getCustGeom().toString());
-        
-        ppt.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
deleted file mode 100644
index ff06d51..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Dimension;
-import java.awt.geom.Rectangle2D;
-
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFGroupShape {
-
-    @Test
-    public void testCreateShapes() throws Exception {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        ppt.setPageSize(new Dimension(792, 612));
-        
-        XSLFGroupShape group = slide.createGroup();
-        assertEquals(1, slide.getShapes().size());
-
-        Rectangle2D interior = new Rectangle2D.Double(-10, -10, 20, 20);
-        group.setInteriorAnchor(interior);
-        assertEquals(interior, group.getInteriorAnchor());
-
-        Rectangle2D anchor = new Rectangle2D.Double(0, 0, 792, 612);
-        group.setAnchor(anchor);
-        assertEquals(anchor, group.getAnchor());
-
-        assertTrue(group.getShapes().isEmpty());
-
-        XSLFTextBox shape1 = group.createTextBox();
-        assertEquals(1, group.getShapes().size());
-        assertSame(shape1, group.getShapes().get(0));
-        assertEquals(3, shape1.getShapeId());
-
-        XSLFAutoShape shape2 = group.createAutoShape();
-        assertEquals(2, group.getShapes().size());
-        assertSame(shape1, group.getShapes().get(0));
-        assertSame(shape2, group.getShapes().get(1));
-        assertEquals(4, shape2.getShapeId());
-
-        XSLFConnectorShape shape3 = group.createConnector();
-        assertEquals(3, group.getShapes().size());
-        assertSame(shape3, group.getShapes().get(2));
-        assertEquals(5, shape3.getShapeId());
-
-        XSLFGroupShape shape4 = group.createGroup();
-        assertEquals(4, group.getShapes().size());
-        assertSame(shape4, group.getShapes().get(3));
-        assertEquals(6, shape4.getShapeId());
-
-        group.removeShape(shape2);
-        assertEquals(3, group.getShapes().size());
-        assertSame(shape1, group.getShapes().get(0));
-        assertSame(shape3, group.getShapes().get(1));
-        assertSame(shape4, group.getShapes().get(2));
-
-        group.removeShape(shape3);
-        assertEquals(2, group.getShapes().size());
-        assertSame(shape1, group.getShapes().get(0));
-        assertSame(shape4, group.getShapes().get(1));
-
-        group.removeShape(shape1);
-        group.removeShape(shape4);
-        assertTrue(group.getShapes().isEmpty());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testRemoveShapes() throws Exception {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFGroupShape group1 = slide.createGroup();
-        group1.createTextBox();
-        XSLFGroupShape group2 = slide.createGroup();
-        group2.createTextBox();
-        XSLFGroupShape group3 = slide.createGroup();
-        slide.removeShape(group1);
-        slide.removeShape(group2);
-        slide.removeShape(group3);
-
-        ppt.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
deleted file mode 100644
index 0ff02d0..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-
-public class TestXSLFHyperlink {
-
-    @Test
-    public void testRead() throws IOException{
-        XMLSlideShow  ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-
-        XSLFSlide slide = ppt.getSlides().get(4);
-        List<XSLFShape> shapes = slide.getShapes();
-        XSLFTable tbl = (XSLFTable)shapes.get(0);
-        XSLFTableCell cell1 = tbl.getRows().get(1).getCells().get(0);
-        assertEquals("Web Page", cell1.getText());
-        XSLFHyperlink link1 = cell1.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(link1);
-        assertEquals("http://poi.apache.org/", link1.getAddress());
-
-        XSLFTableCell cell2 = tbl.getRows().get(2).getCells().get(0);
-        assertEquals("Place in this document", cell2.getText());
-        XSLFHyperlink link2 = cell2.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(link2);
-        assertEquals("/ppt/slides/slide2.xml", link2.getAddress());
-
-        XSLFTableCell cell3 = tbl.getRows().get(3).getCells().get(0);
-        assertEquals("Email", cell3.getText());
-        XSLFHyperlink link3 = cell3.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(link3);
-        assertEquals("mailto:dev@poi.apache.org?subject=Hi%20There", link3.getAddress());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testCreate() throws IOException, InvalidFormatException  {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide1 = ppt.createSlide();
-        XSLFSlide slide2 = ppt.createSlide();
-
-        int numRel = slide1.getPackagePart().getRelationships().size();
-        assertEquals(1, numRel);
-        XSLFTextBox sh1 = slide1.createTextBox();
-        XSLFTextRun r1 = sh1.addNewTextParagraph().addNewTextRun();
-        r1.setText("Web Page");
-        XSLFHyperlink link1 = r1.createHyperlink();
-        link1.setAddress("http://poi.apache.org/");
-        assertEquals("http://poi.apache.org/", link1.getAddress());
-        assertEquals(numRel + 1, slide1.getPackagePart().getRelationships().size());
-
-        String id1 = link1.getXmlObject().getId();
-        assertNotNull(id1);
-        PackageRelationship rel1 = slide1.getPackagePart().getRelationship(id1);
-        assertNotNull(rel1);
-        assertEquals(id1, rel1.getId());
-        assertEquals(TargetMode.EXTERNAL, rel1.getTargetMode());
-        assertEquals(XSLFRelation.HYPERLINK.getRelation(), rel1.getRelationshipType());
-
-        XSLFTextBox sh2 = slide1.createTextBox();
-        XSLFTextRun r2 = sh2.addNewTextParagraph().addNewTextRun();
-        r2.setText("Place in this document");
-        XSLFHyperlink link2 = r2.createHyperlink();
-        link2.linkToSlide(slide2);
-        assertEquals("/ppt/slides/slide2.xml", link2.getAddress());
-        assertEquals(numRel + 2, slide1.getPackagePart().getRelationships().size());
-
-        String id2 = link2.getXmlObject().getId();
-        assertNotNull(id2);
-        PackageRelationship rel2 = slide1.getPackagePart().getRelationship(id2);
-        assertNotNull(rel2);
-        assertEquals(id2, rel2.getId());
-        assertEquals(TargetMode.INTERNAL, rel2.getTargetMode());
-        assertEquals(XSLFRelation.SLIDE.getRelation(), rel2.getRelationshipType());
-        
-        ppt.close();
-    }
-
-
-    @Test
-    public void bug47291() throws IOException {
-        Rectangle2D anchor = new Rectangle2D.Double(100,100,100,100);
-        XMLSlideShow ppt1 = new XMLSlideShow();
-        XSLFSlide slide1 = ppt1.createSlide();
-        XSLFTextBox tb1 = slide1.createTextBox();
-        tb1.setAnchor(anchor);
-        XSLFTextRun r1 = tb1.setText("page1");
-        XSLFHyperlink hl1 = r1.createHyperlink();
-        hl1.linkToEmail("dev@poi.apache.org");
-        XSLFTextBox tb2 = ppt1.createSlide().createTextBox();
-        tb2.setAnchor(anchor);
-        XSLFTextRun r2 = tb2.setText("page2");
-        XSLFHyperlink hl2 = r2.createHyperlink();
-        hl2.linkToLastSlide();
-        XSLFSlide sl3 = ppt1.createSlide();
-        XSLFTextBox tb3 = sl3.createTextBox();
-        tb3.setAnchor(anchor);
-        tb3.setText("text1 ");
-        XSLFTextRun r3 = tb3.appendText("lin\u000bk", false);
-        tb3.appendText(" text2", false);
-        XSLFHyperlink hl3 = r3.createHyperlink();
-        hl3.linkToSlide(slide1);
-        XSLFTextBox tb4 = ppt1.createSlide().createTextBox();
-        tb4.setAnchor(anchor);
-        XSLFTextRun r4 = tb4.setText("page4");
-        XSLFHyperlink hl4 = r4.createHyperlink();
-        hl4.linkToUrl("http://poi.apache.org");
-        XSLFTextBox tb5 = ppt1.createSlide().createTextBox();
-        tb5.setAnchor(anchor);
-        tb5.setText("page5");
-        XSLFHyperlink hl5 = tb5.createHyperlink();
-        hl5.linkToFirstSlide();
-
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-
-        List<XSLFSlide> slides = ppt2.getSlides();
-        tb1 = (XSLFTextBox)slides.get(0).getShapes().get(0);
-        hl1 = tb1.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(hl1);
-        assertEquals("dev@poi.apache.org", hl1.getLabel());
-        assertEquals(HyperlinkType.EMAIL, hl1.getTypeEnum());
-
-        tb2 = (XSLFTextBox)slides.get(1).getShapes().get(0);
-        hl2 = tb2.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(hl2);
-        assertEquals("lastslide", hl2.getXmlObject().getAction().split("=")[1]);
-        assertEquals(HyperlinkType.DOCUMENT, hl2.getTypeEnum());
-
-        tb3 = (XSLFTextBox)slides.get(2).getShapes().get(0);
-        hl3 = tb3.getTextParagraphs().get(0).getTextRuns().get(3).getHyperlink();
-        assertNotNull(hl3);
-        assertEquals("/ppt/slides/slide1.xml", hl3.getAddress());
-        assertEquals(HyperlinkType.DOCUMENT, hl3.getTypeEnum());
-
-        tb4 = (XSLFTextBox)slides.get(3).getShapes().get(0);
-        hl4 = tb4.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(hl4);
-        assertEquals("http://poi.apache.org", hl4.getLabel());
-        assertEquals(HyperlinkType.URL, hl4.getTypeEnum());
-
-        tb5 = (XSLFTextBox)slides.get(4).getShapes().get(0);
-        hl5 = tb5.getHyperlink();
-        assertNotNull(hl5);
-        assertEquals("firstslide", hl5.getXmlObject().getAction().split("=")[1]);
-        assertEquals(HyperlinkType.DOCUMENT, hl5.getTypeEnum());
-        
-        ppt2.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
deleted file mode 100644
index ae18fc7..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-
-public class TestXSLFNotes {
-
-    @Test
-    public void createNewNote() throws IOException {
-
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide1 = ppt.createSlide();
-
-        assertNull(ppt.getNotesMaster());
-        assertNull(slide1.getNotes());
-
-        XSLFNotes notesSlide = ppt.getNotesSlide(slide1);
-        assertNotNull(ppt.getNotesMaster());
-        assertNotNull(notesSlide);
-
-        String note = null;
-        for (XSLFTextShape shape : notesSlide.getPlaceholders()) {
-            if (shape.getTextType() == Placeholder.BODY) {
-                shape.setText("New Note");
-                note = shape.getText();
-                break;
-            }
-        }
-        assertNotNull(note);
-        assertEquals("New Note", note);
-        
-        ppt.close();
-    }
-
-    @Test
-    public void addNote() throws IOException {
-
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("sample.pptx");
-
-        XSLFSlide slide = ppt.createSlide();
-        XSLFNotes notesSlide = ppt.getNotesSlide(slide);
-        assertNotNull(notesSlide);
-
-        String note = null;
-        for (XSLFTextShape shape : notesSlide.getPlaceholders()) {
-            if (shape.getTextType() == Placeholder.BODY) {
-                shape.setText("New Note");
-                note = shape.getText();
-                break;
-            }
-        }
-        assertNotNull(note);
-        assertEquals("New Note", note);
-        
-        ppt.close();
-    }
-
-    @Test
-    public void replaceNotes() throws IOException {
-
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("sample.pptx");
-
-        for (XSLFSlide slide : ppt.getSlides()) {
-            assertNotNull(slide.getNotes());
-
-            XSLFNotes notesSlide = ppt.getNotesSlide(slide);
-            assertNotNull(notesSlide);
-
-            String note = null;
-            for (XSLFTextShape shape : notesSlide.getPlaceholders()) {
-                if (shape.getTextType() == Placeholder.BODY) {
-                    shape.setText("New Note");
-                    note = shape.getText();
-                    break;
-                }
-            }
-            assertNotNull(note);
-            assertEquals("New Note", note);
-        }
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
deleted file mode 100644
index 95d407a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-
-public class TestXSLFPictureShape {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void testCreate() throws Exception {
-        XMLSlideShow ppt1 = new XMLSlideShow();
-        assertEquals(0, ppt1.getPictureData().size());
-        byte[] data1 = new byte[100];
-        for(int i = 0;i < 100;i++) { data1[i] = (byte)i; }
-        XSLFPictureData pdata1 = ppt1.addPicture(data1, PictureType.JPEG);
-        assertEquals(0, pdata1.getIndex());
-        assertEquals(1, ppt1.getPictureData().size());
-
-        XSLFSlide slide = ppt1.createSlide();
-        XSLFPictureShape shape1 = slide.createPicture(pdata1);
-        assertNotNull(shape1.getPictureData());
-        assertArrayEquals(data1, shape1.getPictureData().getData());
-
-        byte[] data2 = new byte[200];
-        for(int i = 0;i < 200;i++) { data2[i] = (byte)i; }
-        XSLFPictureData pdata2 = ppt1.addPicture(data2, PictureType.PNG);
-        XSLFPictureShape shape2 = slide.createPicture(pdata2);
-        assertNotNull(shape2.getPictureData());
-        assertEquals(1, pdata2.getIndex());
-        assertEquals(2, ppt1.getPictureData().size());
-        assertArrayEquals(data2, shape2.getPictureData().getData());
-
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-        List<XSLFPictureData> pics = ppt2.getPictureData();
-        assertEquals(2, pics.size());
-        assertArrayEquals(data1, pics.get(0).getData());
-        assertArrayEquals(data2, pics.get(1).getData());
-
-        List<XSLFShape> shapes = ppt2.getSlides().get(0).getShapes();
-        assertArrayEquals(data1, ((XSLFPictureShape) shapes.get(0)).getPictureData().getData());
-        assertArrayEquals(data2, ((XSLFPictureShape) shapes.get(1)).getPictureData().getData());
-        ppt2.close();
-    }
-
-    @Test
-    public void testCreateMultiplePictures() throws Exception {
-        XMLSlideShow ppt1 = new XMLSlideShow();
-        XSLFSlide slide1 = ppt1.createSlide();
-        XSLFGroupShape group1 = slide1.createGroup();
-
-
-        int pictureIndex = 0;
-        // first add 20 images to the slide
-        for (int i = 0; i < 20; i++, pictureIndex++) {
-            byte[] data = new byte[]{(byte)pictureIndex};
-            XSLFPictureData elementData = ppt1.addPicture(data, PictureType.PNG);
-            assertEquals(pictureIndex, elementData.getIndex());   // added images have indexes 0,1,2....19
-            XSLFPictureShape picture = slide1.createPicture(elementData);
-            // POI saves images as image1.png, image2.png, etc.
-            String fileName = "image" + (elementData.getIndex()+1) + ".png";
-            assertEquals(fileName, picture.getPictureData().getFileName());
-            assertArrayEquals(data, picture.getPictureData().getData());
-        }
-
-        // and then add next 20 images to a group
-        for (int i = 0; i < 20; i++, pictureIndex++) {
-            byte[] data = new byte[]{(byte)pictureIndex};
-            XSLFPictureData elementData = ppt1.addPicture(data, PictureType.PNG);
-            XSLFPictureShape picture = group1.createPicture(elementData);
-            // POI saves images as image1.png, image2.png, etc.
-            assertEquals(pictureIndex, elementData.getIndex());   // added images have indexes 0,1,2....19
-            String fileName = "image" + (pictureIndex + 1) + ".png";
-            assertEquals(fileName, picture.getPictureData().getFileName());
-            assertArrayEquals(data, picture.getPictureData().getData());
-        }
-
-        // serialize, read back and check that all images are there
-
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-        // pictures keyed by file name
-        Map<String, XSLFPictureData> pics = new HashMap<String, XSLFPictureData>();
-        for(XSLFPictureData p : ppt2.getPictureData()){
-            pics.put(p.getFileName(), p);
-        }
-        assertEquals(40, pics.size());
-        for (int i = 0; i < 40; i++) {
-            byte[] data1 = new byte[]{(byte)i};
-            String fileName = "image" + (i + 1) + ".png";
-            XSLFPictureData data = pics.get(fileName);
-            assertNotNull(data);
-            assertEquals(fileName, data.getFileName());
-            assertArrayEquals(data1, data.getData());
-        }
-        ppt2.close();
-    }
-
-    @Test
-    public void testImageCaching() throws Exception {
-        XMLSlideShow ppt = new XMLSlideShow();
-        byte[] img1 = new byte[]{1,2,3};
-        byte[] img2 = new byte[]{3,4,5};
-        XSLFPictureData pdata1 = ppt.addPicture(img1, PictureType.PNG);
-        assertEquals(0, pdata1.getIndex());
-        assertEquals(0, ppt.addPicture(img1, PictureType.PNG).getIndex());
-
-        XSLFPictureData idx2 = ppt.addPicture(img2, PictureType.PNG);
-        assertEquals(1, idx2.getIndex());
-        assertEquals(1, ppt.addPicture(img2, PictureType.PNG).getIndex());
-
-        XSLFSlide slide1 = ppt.createSlide();
-        assertNotNull(slide1);
-        XSLFSlide slide2 = ppt.createSlide();
-        assertNotNull(slide2);
-
-        ppt.close();
-    }
-
-    @Test
-    public void testMerge() throws Exception {
-        XMLSlideShow ppt1 = new XMLSlideShow();
-        byte[] data1 = new byte[100];
-        XSLFPictureData pdata1 = ppt1.addPicture(data1, PictureType.JPEG);
-
-        XSLFSlide slide1 = ppt1.createSlide();
-        XSLFPictureShape shape1 = slide1.createPicture(pdata1);
-        CTPicture ctPic1 = (CTPicture)shape1.getXmlObject();
-        ctPic1.getNvPicPr().getNvPr().addNewCustDataLst().addNewTags().setId("rId99");
-        
-        XMLSlideShow ppt2 = new XMLSlideShow();
-
-        XSLFSlide slide2 = ppt2.createSlide().importContent(slide1);
-        XSLFPictureShape shape2 = (XSLFPictureShape)slide2.getShapes().get(0);
-
-        assertArrayEquals(data1, shape2.getPictureData().getData());
-
-        CTPicture ctPic2 = (CTPicture)shape2.getXmlObject();
-        assertFalse(ctPic2.getNvPicPr().getNvPr().isSetCustDataLst());
-
-        ppt1.close();
-        ppt2.close();
-    }
-    
-    @Test
-    public void bug58663() throws IOException {
-        InputStream is = _slTests.openResourceAsStream("shapes.pptx");
-        XMLSlideShow ppt = new XMLSlideShow(is);
-        is.close();
-        
-        XSLFSlide slide = ppt.getSlides().get(0);
-        XSLFPictureShape ps = (XSLFPictureShape)slide.getShapes().get(3);
-        slide.removeShape(ps);
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ppt.write(bos);
-        ppt.close();
-        
-        XMLSlideShow ppt2 = new XMLSlideShow(new ByteArrayInputStream(bos.toByteArray()));
-        assertTrue(ppt2.getPictureData().isEmpty());
-        ppt2.close();
-    }
-    
-    @Test
-    public void testTiffImageBug59742() throws Exception {
-        XMLSlideShow slideShow = new XMLSlideShow();
-        final InputStream tiffStream = _slTests.openResourceAsStream("testtiff.tif");
-        final byte[] pictureData = IOUtils.toByteArray(tiffStream);
-        IOUtils.closeQuietly(tiffStream);
-        
-        XSLFPictureData pic = slideShow.addPicture(pictureData, PictureType.TIFF);
-        assertEquals("image/tiff", pic.getContentType());
-        assertEquals("image1.tiff", pic.getFileName());
-        
-        slideShow.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
deleted file mode 100644
index fa56117..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.*;
-
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFShape {
-
-    @Test
-    public void testReadTextShapes() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-        List<XSLFSlide> slides = ppt.getSlides();
-
-        XSLFSlide slide1 = slides.get(0);
-        List<XSLFShape> shapes1 = slide1.getShapes();
-        assertEquals(7, shapes1.size());
-        assertEquals("TextBox 3", shapes1.get(0).getShapeName());
-        XSLFAutoShape sh0 = (XSLFAutoShape) shapes1.get(0);
-        assertEquals("Learning PPTX", sh0.getText());
-        List<XSLFTextParagraph> paragraphs0 = sh0.getTextParagraphs();
-        assertEquals(1, paragraphs0.size());
-        XSLFTextParagraph p0 = paragraphs0.get(0);
-        assertEquals("Learning PPTX", p0.getText());
-        assertEquals(1, p0.getTextRuns().size());
-        XSLFTextRun r0 = p0.getTextRuns().get(0);
-        assertEquals("Learning PPTX", r0.getRawText());
-
-        XSLFSlide slide2 = slides.get(1);
-        List<XSLFShape> shapes2 = slide2.getShapes();
-        assertTrue(shapes2.get(0) instanceof XSLFAutoShape);
-        assertEquals("PPTX Title", ((XSLFAutoShape) shapes2.get(0)).getText());
-        XSLFAutoShape sh1 = (XSLFAutoShape) shapes2.get(0);
-        List<XSLFTextParagraph> paragraphs1 = sh1.getTextParagraphs();
-        assertEquals(1, paragraphs1.size());
-        XSLFTextParagraph p1 = paragraphs1.get(0);
-        assertEquals("PPTX Title", p1.getText());
-        List<XSLFTextRun> r2 = paragraphs1.get(0).getTextRuns();
-        assertEquals(2, r2.size());
-        assertEquals("PPTX ", r2.get(0).getRawText());
-        assertEquals("Title", r2.get(1).getRawText());
-        // Title is underlined
-        assertEquals(STTextUnderlineType.SNG, r2.get(1).getXmlObject().getRPr().getU());
-
-
-        assertTrue(shapes2.get(1) instanceof XSLFAutoShape);
-        assertEquals("Subtitle\nAnd second line", ((XSLFAutoShape) shapes2.get(1)).getText());
-        XSLFAutoShape sh2 = (XSLFAutoShape) shapes2.get(1);
-        List<XSLFTextParagraph> paragraphs2 = sh2.getTextParagraphs();
-        assertEquals(2, paragraphs2.size());
-        assertEquals("Subtitle", paragraphs2.get(0).getText());
-        assertEquals("And second line", paragraphs2.get(1).getText());
-
-        assertEquals(1, paragraphs2.get(0).getTextRuns().size());
-        assertEquals(1, paragraphs2.get(1).getTextRuns().size());
-
-        assertEquals("Subtitle", paragraphs2.get(0).getTextRuns().get(0).getRawText());
-        assertTrue(paragraphs2.get(0).getTextRuns().get(0).getXmlObject().getRPr().getB());
-        assertEquals("And second line", paragraphs2.get(1).getTextRuns().get(0).getRawText());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testCreateShapes() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        assertTrue(slide.getShapes().isEmpty());
-
-        XSLFTextBox textBox = slide.createTextBox();
-
-        assertEquals(1, slide.getShapes().size());
-        assertSame(textBox, slide.getShapes().get(0));
-
-        assertEquals("", textBox.getText());
-        // FIXME: is this correct? Should it be starting out with 0 or 1 text paragraphs?
-        assertEquals(1, textBox.getTextParagraphs().size());
-        textBox.addNewTextParagraph().addNewTextRun().setText("Apache");
-        textBox.addNewTextParagraph().addNewTextRun().setText("POI");
-        assertEquals("Apache\nPOI", textBox.getText());
-        assertEquals(3, textBox.getTextParagraphs().size());
-        
-        ppt.close();
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
deleted file mode 100644
index 22bab7c..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-/**
- * test common operations on containers of shapes (sheets and groups of shapes)
- *
- * @author Yegor Kozlov
- */
-public class TestXSLFShapeContainer {
-
-    @SuppressWarnings("unused")
-    public void verifyContainer(XSLFShapeContainer container) {
-        container.clear();
-        assertEquals(0, container.getShapes().size());
-
-        XSLFGroupShape shape1 = container.createGroup();
-        assertEquals(1, container.getShapes().size());
-
-        XSLFTextBox shape2 = container.createTextBox();
-        assertEquals(2, container.getShapes().size());
-
-        XSLFAutoShape shape3 = container.createAutoShape();
-        assertEquals(3, container.getShapes().size());
-
-        XSLFConnectorShape shape4 = container.createConnector();
-        assertEquals(4, container.getShapes().size());
-
-        container.clear();
-        assertEquals(0, container.getShapes().size());
-    }
-
-    @Test
-    public void testSheet() {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSheet sheet = ppt.createSlide();
-        verifyContainer(sheet);
-
-
-        XSLFGroupShape group = sheet.createGroup();
-        verifyContainer(group);
-
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
deleted file mode 100644
index a307eaa..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-
-/**
- * test common properties for sheets (slides, masters, layouts, etc.)
- *
- * @author Yegor Kozlov
- */
-public class TestXSLFSheet {
-    
-    @Test
-    public void testCreateShapes() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        assertTrue(slide.getShapes().isEmpty());
-
-        XSLFSimpleShape shape1 = slide.createAutoShape();
-        assertEquals(1, slide.getShapes().size());
-        assertSame(shape1, slide.getShapes().get(0));
-
-        XSLFTextBox shape2 = slide.createTextBox();
-        assertEquals(2, slide.getShapes().size());
-        assertSame(shape1, slide.getShapes().get(0));
-        assertSame(shape2, slide.getShapes().get(1));
-
-        XSLFConnectorShape shape3 = slide.createConnector();
-        assertEquals(3, slide.getShapes().size());
-        assertSame(shape1, slide.getShapes().get(0));
-        assertSame(shape2, slide.getShapes().get(1));
-        assertSame(shape3, slide.getShapes().get(2));
-
-        XSLFGroupShape shape4 = slide.createGroup();
-        assertEquals(4, slide.getShapes().size());
-        assertSame(shape1, slide.getShapes().get(0));
-        assertSame(shape2, slide.getShapes().get(1));
-        assertSame(shape3, slide.getShapes().get(2));
-        assertSame(shape4, slide.getShapes().get(3));
-
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt);
-        slide = ppt2.getSlides().get(0);
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals(4, shapes.size());
-
-        assertTrue(shapes.get(0) instanceof XSLFAutoShape);
-        assertTrue(shapes.get(1) instanceof XSLFTextBox);
-        assertTrue(shapes.get(2) instanceof XSLFConnectorShape);
-        assertTrue(shapes.get(3) instanceof XSLFGroupShape);
-        
-        ppt.close();
-        ppt2.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
deleted file mode 100644
index c000da8..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.geom.TestPresetGeometries;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCap;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.apache.poi.util.Units;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.apache.xmlbeans.XmlObject;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectStyleItem;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectStyleList;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOuterShadowEffect;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTStyleMatrix;
-import org.openxmlformats.schemas.drawingml.x2006.main.STLineCap;
-import org.openxmlformats.schemas.drawingml.x2006.main.STPresetLineDashVal;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-
-public class TestXSLFSimpleShape {
-    
-    @Test
-    public void testLineStyles() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFSimpleShape shape = slide.createAutoShape();
-        assertEquals(1, slide.getShapes().size());
-        // line properties are not set by default
-        assertFalse(getSpPr(shape).isSetLn());
-
-        assertEquals(0., shape.getLineWidth(), 0);
-        assertEquals(null, shape.getLineColor());
-        assertEquals(null, shape.getLineDash());
-        assertEquals(null, shape.getLineCap());
-
-        shape.setLineWidth(0);
-        shape.setLineColor(null);
-        shape.setLineDash(null);
-        shape.setLineCap(null);
-
-        assertTrue(getSpPr(shape).isSetLn());
-        assertTrue(getSpPr(shape).getLn().isSetNoFill());
-
-        // line width
-        shape.setLineWidth(1.0);
-        assertEquals(1.0, shape.getLineWidth(), 0);
-        assertEquals(Units.EMU_PER_POINT, getSpPr(shape).getLn().getW());
-        shape.setLineWidth(5.5);
-        assertEquals(5.5, shape.getLineWidth(), 0);
-        assertEquals(Units.toEMU(5.5), getSpPr(shape).getLn().getW());
-        shape.setLineWidth(0.0);
-        // setting line width to zero unsets the W attribute
-        assertFalse(getSpPr(shape).getLn().isSetW());
-
-        // line cap
-        shape.setLineCap(LineCap.FLAT);
-        assertEquals(LineCap.FLAT, shape.getLineCap());
-        assertEquals(STLineCap.FLAT, getSpPr(shape).getLn().getCap());
-        shape.setLineCap(LineCap.SQUARE);
-        assertEquals(LineCap.SQUARE, shape.getLineCap());
-        assertEquals(STLineCap.SQ, getSpPr(shape).getLn().getCap());
-        shape.setLineCap(LineCap.ROUND);
-        assertEquals(LineCap.ROUND, shape.getLineCap());
-        assertEquals(STLineCap.RND, getSpPr(shape).getLn().getCap());
-        shape.setLineCap(null);
-        // setting cap to null unsets the Cap attribute
-        assertFalse(getSpPr(shape).getLn().isSetCap());
-
-        // line dash
-        shape.setLineDash(LineDash.SOLID);
-        assertEquals(LineDash.SOLID, shape.getLineDash());
-        assertEquals(STPresetLineDashVal.SOLID, getSpPr(shape).getLn().getPrstDash().getVal());
-        shape.setLineDash(LineDash.DASH_DOT);
-        assertEquals(LineDash.DASH_DOT, shape.getLineDash());
-        assertEquals(STPresetLineDashVal.DASH_DOT, getSpPr(shape).getLn().getPrstDash().getVal());
-        shape.setLineDash(LineDash.LG_DASH_DOT);
-        assertEquals(LineDash.LG_DASH_DOT, shape.getLineDash());
-        assertEquals(STPresetLineDashVal.LG_DASH_DOT, getSpPr(shape).getLn().getPrstDash().getVal());
-        shape.setLineDash(null);
-        // setting dash width to null unsets the Dash element
-        assertFalse(getSpPr(shape).getLn().isSetPrstDash());
-
-        // line color
-        assertFalse(getSpPr(shape).getLn().isSetSolidFill());
-        shape.setLineColor(Color.RED);
-        assertEquals(Color.RED, shape.getLineColor());
-        assertTrue(getSpPr(shape).getLn().isSetSolidFill());
-        shape.setLineColor(Color.BLUE);
-        assertEquals(Color.BLUE, shape.getLineColor());
-        assertTrue(getSpPr(shape).getLn().isSetSolidFill());
-        shape.setLineColor(null);
-        assertEquals(null, shape.getLineColor());
-        // setting dash width to null unsets the SolidFill element
-        assertFalse(getSpPr(shape).getLn().isSetSolidFill());
-
-        XSLFSimpleShape ln2 = slide.createAutoShape();
-        ln2.setLineDash(LineDash.DOT);
-        assertEquals(LineDash.DOT, ln2.getLineDash());
-        ln2.setLineWidth(0.);
-        assertEquals(0., ln2.getLineWidth(), 0);
-
-        XSLFSimpleShape ln3 = slide.createAutoShape();
-        ln3.setLineWidth(1.);
-        assertEquals(1., ln3.getLineWidth(), 0);
-        ln3.setLineDash(null);
-        assertEquals(null, ln3.getLineDash());
-        ln3.setLineCap(null);
-        assertEquals(null, ln3.getLineDash());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testFill() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFAutoShape shape = slide.createAutoShape();
-        // line properties are not set by default
-        assertFalse(getSpPr(shape).isSetSolidFill());
-
-        assertNull(shape.getFillColor());
-        shape.setFillColor(null);
-        assertNull(shape.getFillColor());
-        assertFalse(getSpPr(shape).isSetSolidFill());
-
-        shape.setFillColor(Color.RED);
-        assertEquals(Color.RED, shape.getFillColor());
-        shape.setFillColor(Color.DARK_GRAY);
-        assertEquals(Color.DARK_GRAY, shape.getFillColor());
-        assertTrue(getSpPr(shape).isSetSolidFill());
-
-        shape.setFillColor(null);
-        assertNull(shape.getFillColor());
-        assertFalse(getSpPr(shape).isSetSolidFill());
-        ppt.close();
-    }
-
-    @Test
-    public void testDefaultProperties() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-
-        XSLFSlide slide6 = ppt.getSlides().get(5);
-        List<XSLFShape> shapes = slide6.getShapes();
-        for(XSLFShape xs : shapes){
-            XSLFSimpleShape s = (XSLFSimpleShape)xs;
-            // all shapes have a theme color="accent1"
-            assertEquals("accent1", s.getSpStyle().getFillRef().getSchemeClr().getVal().toString());
-            assertEquals(2.0, s.getLineWidth(), 0);
-            assertEquals(LineCap.FLAT, s.getLineCap());
-            assertEquals(new Color(79,129,189), s.getLineColor());
-        }
-
-        XSLFSimpleShape s0 = (XSLFSimpleShape) shapes.get(0);
-        // fill is not set
-        assertNull(getSpPr(s0).getSolidFill());
-        //assertEquals(slide6.getTheme().getColor("accent1").getColor(), s0.getFillColor());
-        assertEquals(new Color(79, 129, 189), s0.getFillColor());
-
-        // lighter 80%
-        XSLFSimpleShape s1 = (XSLFSimpleShape)shapes.get(1);
-        CTSchemeColor ref1 = getSpPr(s1).getSolidFill().getSchemeClr();
-        assertEquals(1, ref1.sizeOfLumModArray());
-        assertEquals(1, ref1.sizeOfLumOffArray());
-        assertEquals(20000, ref1.getLumModArray(0).getVal());
-        assertEquals(80000, ref1.getLumOffArray(0).getVal());
-        assertEquals("accent1", ref1.getVal().toString());
-        assertEquals(new Color(220, 230, 242), s1.getFillColor());
-
-        // lighter 60%
-        XSLFSimpleShape s2 = (XSLFSimpleShape)shapes.get(2);
-        CTSchemeColor ref2 = getSpPr(s2).getSolidFill().getSchemeClr();
-        assertEquals(1, ref2.sizeOfLumModArray());
-        assertEquals(1, ref2.sizeOfLumOffArray());
-        assertEquals(40000, ref2.getLumModArray(0).getVal());
-        assertEquals(60000, ref2.getLumOffArray(0).getVal());
-        assertEquals("accent1", ref2.getVal().toString());
-        assertEquals(new Color(185, 205, 229), s2.getFillColor());
-
-        // lighter 40%
-        XSLFSimpleShape s3 = (XSLFSimpleShape)shapes.get(3);
-        CTSchemeColor ref3 = getSpPr(s3).getSolidFill().getSchemeClr();
-        assertEquals(1, ref3.sizeOfLumModArray());
-        assertEquals(1, ref3.sizeOfLumOffArray());
-        assertEquals(60000, ref3.getLumModArray(0).getVal());
-        assertEquals(40000, ref3.getLumOffArray(0).getVal());
-        assertEquals("accent1", ref3.getVal().toString());
-        assertEquals(new Color(149, 179, 215), s3.getFillColor());
-
-        // darker 25%
-        XSLFSimpleShape s4 = (XSLFSimpleShape)shapes.get(4);
-        CTSchemeColor ref4 = getSpPr(s4).getSolidFill().getSchemeClr();
-        assertEquals(1, ref4.sizeOfLumModArray());
-        assertEquals(0, ref4.sizeOfLumOffArray());
-        assertEquals(75000, ref4.getLumModArray(0).getVal());
-        assertEquals("accent1", ref3.getVal().toString());
-        assertEquals(new Color(55, 96, 146), s4.getFillColor());
-
-        XSLFSimpleShape s5 = (XSLFSimpleShape)shapes.get(5);
-        CTSchemeColor ref5 = getSpPr(s5).getSolidFill().getSchemeClr();
-        assertEquals(1, ref5.sizeOfLumModArray());
-        assertEquals(0, ref5.sizeOfLumOffArray());
-        assertEquals(50000, ref5.getLumModArray(0).getVal());
-        assertEquals("accent1", ref5.getVal().toString());
-        assertEquals(new Color(37, 64, 97), s5.getFillColor());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testAnchor() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-        List<XSLFSlide> slide = ppt.getSlides();
-
-        XSLFSlide slide2 = slide.get(1);
-        XSLFSlideLayout layout2 = slide2.getSlideLayout();
-        List<XSLFShape> shapes2 = slide2.getShapes();
-        XSLFTextShape sh1 = (XSLFTextShape)shapes2.get(0);
-        assertEquals(Placeholder.CENTERED_TITLE, sh1.getTextType());
-        assertEquals("PPTX Title", sh1.getText());
-        assertFalse(getSpPr(sh1).isSetXfrm()); // xfrm is not set, the query is delegated to the slide layout
-        assertEquals(sh1.getAnchor(), layout2.getTextShapeByType(Placeholder.CENTERED_TITLE).getAnchor());
-
-        XSLFTextShape sh2 = (XSLFTextShape)shapes2.get(1);
-        assertEquals("Subtitle\nAnd second line", sh2.getText());
-        assertEquals(Placeholder.SUBTITLE, sh2.getTextType());
-        assertFalse(getSpPr(sh2).isSetXfrm()); // xfrm is not set, the query is delegated to the slide layout
-        assertEquals(sh2.getAnchor(), layout2.getTextShapeByType(Placeholder.SUBTITLE).getAnchor());
-
-        XSLFSlide slide5 = slide.get(4);
-        XSLFSlideLayout layout5 = slide5.getSlideLayout();
-        XSLFTextShape shTitle = slide5.getTextShapeByType(Placeholder.TITLE);
-        assertEquals("Hyperlinks", shTitle.getText());
-        // xfrm is not set, the query is delegated to the slide layout
-        assertFalse(getSpPr(shTitle).isSetXfrm());
-        // xfrm is not set, the query is delegated to the slide master
-        assertFalse(getSpPr(layout5.getTextShapeByType(Placeholder.TITLE)).isSetXfrm());
-        assertTrue(getSpPr(layout5.getSlideMaster().getTextShapeByType(Placeholder.TITLE)).isSetXfrm());
-        assertEquals(shTitle.getAnchor(), layout5.getSlideMaster().getTextShapeByType(Placeholder.TITLE).getAnchor());
-
-        ppt.close();
-    }
-
-    @SuppressWarnings("unused")
-    @Test
-    public void testShadowEffects() throws IOException{
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        CTStyleMatrix styleMatrix = slide.getTheme().getXmlObject().getThemeElements().getFmtScheme();
-        CTEffectStyleList lst = styleMatrix.getEffectStyleLst();
-        assertNotNull(lst);
-        for(CTEffectStyleItem ef : lst.getEffectStyleArray()){
-            CTOuterShadowEffect obj = ef.getEffectLst().getOuterShdw();
-        }
-        ppt.close();
-    }
-    
-    @Test
-    public void testValidGeometry() throws Exception {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFSimpleShape shape = slide.createAutoShape();
-        CTShapeProperties spPr = getSpPr(shape);
-        
-        CTPresetGeometry2D prstGeom = CTPresetGeometry2D.Factory.newInstance();
-        prstGeom.setPrst(STShapeType.Enum.forInt(1));
-        
-        assertNotNull(prstGeom.getPrst());
-        assertNotNull(prstGeom.getPrst().toString());
-        assertNotNull(spPr.getPrstGeom());
-        spPr.setPrstGeom(prstGeom);
-        assertNotNull(spPr.getPrstGeom().getPrst());
-        assertNotNull(spPr.getPrstGeom().getPrst().toString());
-        
-        assertNotNull(shape.getGeometry());
-        
-        ppt.close();
-    }
-
-    
-    @Test
-    public void testInvalidGeometry() throws Exception {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFSimpleShape shape = slide.createAutoShape();
-        CTShapeProperties spPr = getSpPr(shape);
-        
-        CTPresetGeometry2D prstGeom = CTPresetGeometry2D.Factory.newInstance();
-        prstGeom.setPrst(STShapeType.Enum.forInt(1));
-        
-        assertNotNull(prstGeom.getPrst());
-        assertNotNull(prstGeom.getPrst().toString());
-        assertNotNull(spPr.getPrstGeom());
-        spPr.setPrstGeom(prstGeom);
-        assertNotNull(spPr.getPrstGeom().getPrst());
-        assertNotNull(spPr.getPrstGeom().getPrst().toString());
-        
-        try {
-            // cause the geometries to be not found
-            TestPresetGeometries.clearPreset();
-            try {
-                shape.getGeometry();
-                fail("Should fail without the geometry");
-            } catch (IllegalStateException e) {
-                assertTrue(e.getMessage(), e.getMessage().contains("line"));
-            }
-        } finally {
-            // reset to not affect other tests
-            TestPresetGeometries.resetPreset();
-        }
-        
-        ppt.close();
-    }
-
-    @SuppressWarnings("Duplicates")
-    @Test
-    public void testArrayStoreException() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("aascu.org_workarea_downloadasset.aspx_id=5864.pptx");
-        Dimension pgsize = ppt.getPageSize();
-
-        for (Slide<?,?> s : ppt.getSlides()) {
-            //System.out.println("Slide: " + s);
-
-            BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D graphics = img.createGraphics();
-            DrawFactory.getInstance(graphics).fixFonts(graphics);
-
-            // default rendering options
-            graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-            graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-            graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-
-            // draw stuff
-            s.draw(graphics);
-
-            graphics.dispose();
-            img.flush();
-        }
-        ppt.close();
-    }
-    
-    static CTShapeProperties getSpPr(XSLFShape shape) {
-        XmlObject xo = shape.getShapeProperties();
-        assertTrue(xo instanceof CTShapeProperties);
-        return (CTShapeProperties)xo;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
deleted file mode 100644
index 0af1347..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.sl.TestCommonSL.sameColor;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFSlide {
-    
-    @Test
-    public void testReadShapes() throws IOException {
-        XMLSlideShow  ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-        List<XSLFSlide> slides = ppt.getSlides();
-
-        XSLFSlide slide1 = slides.get(0);
-        List<XSLFShape> shapes1 = slide1.getShapes();
-        assertEquals(7, shapes1.size());
-        assertEquals("TextBox 3", shapes1.get(0).getShapeName());
-        assertTrue(shapes1.get(0) instanceof XSLFTextBox);
-        XSLFAutoShape sh0 = (XSLFAutoShape)shapes1.get(0);
-        assertEquals("Learning PPTX", sh0.getText());
-
-
-        assertEquals("Straight Connector 5", shapes1.get(1).getShapeName());
-        assertTrue(shapes1.get(1) instanceof XSLFConnectorShape);
-
-        assertEquals("Freeform 6", shapes1.get(2).getShapeName());
-        assertTrue(shapes1.get(2) instanceof XSLFFreeformShape);
-        XSLFAutoShape sh2 = (XSLFAutoShape)shapes1.get(2);
-        assertEquals("Cloud", sh2.getText());
-
-        assertEquals("Picture 1", shapes1.get(3).getShapeName());
-        assertTrue(shapes1.get(3) instanceof XSLFPictureShape);
-
-        assertEquals("Table 2", shapes1.get(4).getShapeName());
-        assertTrue(shapes1.get(4) instanceof XSLFGraphicFrame);
-
-        assertEquals("Straight Arrow Connector 7", shapes1.get(5).getShapeName());
-        assertTrue(shapes1.get(5) instanceof XSLFConnectorShape);
-
-        assertEquals("Elbow Connector 9", shapes1.get(6).getShapeName());
-        assertTrue(shapes1.get(6) instanceof XSLFConnectorShape);
-
-        // titles on slide2
-        XSLFSlide slide2 = slides.get(1);
-        List<XSLFShape> shapes2 = slide2.getShapes();
-        assertEquals(2, shapes2.size());
-        assertTrue(shapes2.get(0) instanceof XSLFAutoShape);
-        assertEquals("PPTX Title", ((XSLFAutoShape)shapes2.get(0)).getText());
-        assertTrue(shapes2.get(1) instanceof XSLFAutoShape);
-        assertEquals("Subtitle\nAnd second line", ((XSLFAutoShape)shapes2.get(1)).getText());
-
-        //  group shape on slide3
-        XSLFSlide slide3 = slides.get(2);
-        List<XSLFShape> shapes3 = slide3.getShapes();
-        assertEquals(1, shapes3.size());
-        assertTrue(shapes3.get(0) instanceof XSLFGroupShape);
-        List<XSLFShape> groupShapes = ((XSLFGroupShape)shapes3.get(0)).getShapes();
-        assertEquals(3, groupShapes.size());
-        assertTrue(groupShapes.get(0) instanceof XSLFAutoShape);
-        assertEquals("Rectangle 1", groupShapes.get(0).getShapeName());
-
-        assertTrue(groupShapes.get(1) instanceof XSLFAutoShape);
-        assertEquals("Oval 2", groupShapes.get(1).getShapeName());
-
-        assertTrue(groupShapes.get(2) instanceof XSLFAutoShape);
-        assertEquals("Right Arrow 3", groupShapes.get(2).getShapeName());
-
-        XSLFSlide slide4 = slides.get(3);
-        List<XSLFShape> shapes4 = slide4.getShapes();
-        assertEquals(1, shapes4.size());
-        assertTrue(shapes4.get(0) instanceof XSLFTable);
-        XSLFTable tbl = (XSLFTable)shapes4.get(0);
-        assertEquals(3, tbl.getNumberOfColumns());
-        assertEquals(6, tbl.getNumberOfRows());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testCreateSlide() throws IOException {
-        XMLSlideShow  ppt = new XMLSlideShow();
-        assertEquals(0, ppt.getSlides().size());
-
-        XSLFSlide slide = ppt.createSlide();
-        assertFalse(slide.getFollowMasterGraphics());
-        slide.setFollowMasterGraphics(false);
-        assertFalse(slide.getFollowMasterGraphics());
-        slide.setFollowMasterGraphics(true);
-        assertTrue(slide.getFollowMasterGraphics());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testImportContent() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XMLSlideShow  src = XSLFTestDataSamples.openSampleDocument("themes.pptx");
-
-        // create a blank slide and import content from the 4th slide of themes.pptx
-        XSLFSlide slide1 = ppt.createSlide().importContent(src.getSlides().get(3));
-        List<XSLFShape> shapes1 = slide1.getShapes();
-        assertEquals(2, shapes1.size());
-
-        XSLFTextShape sh1 = (XSLFTextShape)shapes1.get(0);
-        assertEquals("Austin Theme", sh1.getText());
-        XSLFTextRun r1 = sh1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals("Century Gothic", r1.getFontFamily());
-        assertEquals(40.0, r1.getFontSize(), 0);
-        assertTrue(r1.isBold());
-        assertTrue(r1.isItalic());
-        assertTrue(sameColor(new Color(148, 198, 0), r1.getFontColor()));
-        assertNull(sh1.getFillColor());
-        assertNull(sh1.getLineColor());
-
-        XSLFTextShape sh2 = (XSLFTextShape)shapes1.get(1);
-        assertEquals(
-                "Text in a autoshape is white\n" +
-                "Fill: RGB(148, 198,0)", sh2.getText());
-        XSLFTextRun r2 = sh2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals("Century Gothic", r2.getFontFamily());
-        assertEquals(18.0, r2.getFontSize(), 0);
-        assertFalse(r2.isBold());
-        assertFalse(r2.isItalic());
-        assertTrue(sameColor(Color.white, r2.getFontColor()));
-        assertEquals(new Color(148, 198, 0), sh2.getFillColor());
-        assertEquals(new Color(148, 198, 0), sh2.getLineColor()); // slightly different from PowerPoint!
-
-        // the 5th slide has a picture and a texture fill
-        XSLFSlide slide2 = ppt.createSlide().importContent(src.getSlides().get(4));
-        List<XSLFShape> shapes2 = slide2.getShapes();
-        assertEquals(2, shapes2.size());
-
-        XSLFTextShape sh3 = (XSLFTextShape)shapes2.get(0);
-        assertEquals("This slide overrides master background with a texture fill", sh3.getText());
-        XSLFTextRun r3 = sh3.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals("Century Gothic", r3.getFontFamily());
-        //assertEquals(32.4.0, r3.getFontSize());
-        assertTrue(r3.isBold());
-        assertTrue(r3.isItalic());
-        assertTrue(sameColor(new Color(148, 198, 0), r3.getFontColor()));
-        assertNull(sh3.getFillColor());
-        assertNull(sh3.getLineColor());
-
-        XSLFPictureShape sh4 = (XSLFPictureShape)shapes2.get(1);
-        XSLFPictureShape srcPic = (XSLFPictureShape)src.getSlides().get(4).getShapes().get(1);
-        assertArrayEquals(sh4.getPictureData().getData(), srcPic.getPictureData().getData());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testMergeSlides() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        String[] pptx = {"shapes.pptx", "themes.pptx", "layouts.pptx", "backgrounds.pptx"};
-
-        for(String arg : pptx){
-            XMLSlideShow  src = XSLFTestDataSamples.openSampleDocument(arg);
-
-            for(XSLFSlide srcSlide : src.getSlides()){
-                ppt.createSlide().importContent(srcSlide);
-            }
-        }
-        assertEquals(30, ppt.getSlides().size());
-        
-        ppt.close();
-    }    
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
deleted file mode 100644
index 0f0f0bc..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
-import java.awt.Dimension;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFSlideShow {
-    @Test
-    public void testCreateSlide() throws IOException {
-        XMLSlideShow  ppt = new XMLSlideShow();
-        assertEquals(0, ppt.getSlides().size());
-
-        XSLFSlide slide1 = ppt.createSlide();
-        assertEquals(1, ppt.getSlides().size());
-        assertSame(slide1, ppt.getSlides().get(0));
-
-        List<POIXMLDocumentPart> rels =  slide1.getRelations();
-        assertEquals(1, rels.size());
-        assertEquals(slide1.getSlideMaster().getLayout(SlideLayout.BLANK), rels.get(0));
-
-        XSLFSlide slide2 = ppt.createSlide();
-        assertEquals(2, ppt.getSlides().size());
-        assertSame(slide2, ppt.getSlides().get(1));
-
-        ppt.setSlideOrder(slide2, 0);
-        assertSame(slide2, ppt.getSlides().get(0));
-        assertSame(slide1, ppt.getSlides().get(1));
-
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt);
-        assertEquals(2, ppt2.getSlides().size());
-        rels =  ppt2.getSlides().get(0).getRelations();
-        
-        ppt2.close();
-        ppt.close();
-    }
-
-    @Test
-    public void testRemoveSlide() throws IOException {
-        XMLSlideShow  ppt = new XMLSlideShow();
-        assertEquals(0, ppt.getSlides().size());
-
-        XSLFSlide slide1 = ppt.createSlide();
-        XSLFSlide slide2 = ppt.createSlide();
-
-        assertEquals(2, ppt.getSlides().size());
-        assertSame(slide1, ppt.getSlides().get(0));
-        assertSame(slide2, ppt.getSlides().get(1));
-
-        XSLFSlide removedSlide = ppt.removeSlide(0);
-        assertSame(slide1, removedSlide);
-
-        assertEquals(1, ppt.getSlides().size());
-        assertSame(slide2, ppt.getSlides().get(0));
-
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt);
-        assertEquals(1, ppt2.getSlides().size());
-        
-        ppt2.close();
-        ppt.close();
-    }
-
-    @Test
-    public void testDimension() throws IOException {
-        XMLSlideShow  ppt = new XMLSlideShow();
-        Dimension sz = ppt.getPageSize();
-        assertEquals(720, sz.width);
-        assertEquals(540, sz.height);
-        ppt.setPageSize(new Dimension(792, 612));
-        sz = ppt.getPageSize();
-        assertEquals(792, sz.width);
-        assertEquals(612, sz.height);
-        ppt.close();
-    }
-
-    @Test
-    public void testSlideMasters() throws IOException {
-        XMLSlideShow  ppt = new XMLSlideShow();
-        List<XSLFSlideMaster> masters = ppt.getSlideMasters();
-        assertEquals(1, masters.size());
-
-        XSLFSlide slide = ppt.createSlide();
-        assertSame(masters.get(0), slide.getSlideMaster());
-        ppt.close();
-    }
-
-    @Test
-    public void testSlideLayout() throws IOException {
-        XMLSlideShow  ppt = new XMLSlideShow();
-        List<XSLFSlideMaster> masters = ppt.getSlideMasters();
-        assertEquals(1, masters.size());
-
-        XSLFSlide slide = ppt.createSlide();
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        assertNotNull(layout);
-
-        assertSame(masters.get(0), layout.getSlideMaster());
-        ppt.close();
-    }
-
-    @Test
-    public void testSlideLayoutNames() throws IOException {
-        final String names[] = {
-              "Blank", "Title Only", "Section Header", "Picture with Caption", "Title and Content"
-            , "Title Slide", "Title and Vertical Text", "Vertical Title and Text", "Comparison"
-            , "Two Content", "Content with Caption"                
-        };
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("layouts.pptx");
-        for (String name : names) {
-            assertNotNull(ppt.findLayout(name));
-        }
-        final SlideLayout layTypes[] = {
-              SlideLayout.BLANK, SlideLayout.TITLE_ONLY, SlideLayout.SECTION_HEADER
-            , SlideLayout.PIC_TX, SlideLayout.TITLE_AND_CONTENT, SlideLayout.TITLE
-            , SlideLayout.VERT_TX, SlideLayout.VERT_TITLE_AND_TX, SlideLayout.TWO_TX_TWO_OBJ
-            , SlideLayout.TWO_OBJ, SlideLayout.OBJ_TX                
-        };
-        for (SlideLayout sl : layTypes){
-            assertNotNull(ppt.getSlideMasters().get(0).getLayout(sl));
-        }
-        ppt.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
deleted file mode 100644
index 9bfc695..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.sl.usermodel.BaseTestSlideShowFactory;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.TempFile;
-import org.junit.Test;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
-
-public final class TestXSLFSlideShowFactory extends BaseTestSlideShowFactory {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-    private static final String filename = "SampleShow.pptx";
-    private static final String password = "opensesame";
-    private static final String removeExpectedExceptionMsg =
-            "This functionality this unit test is trying to test is now passing. " +
-            "The unit test needs to be updated by deleting the expected exception code. Status and close any related bugs.";
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Test
-    public void testFactoryFromFile() throws Exception {
-        // Remove thrown.* when bug 58779 is resolved
-        // In the mean time, this function will modify SampleShow.pptx on disk.
-        thrown.expect(AssertionError.class);
-        // thrown.expectCause(Matcher<ArrayComparisonFailure>);
-        thrown.expectMessage("SampleShow.pptx sample file was modified as a result of closing the slideshow");
-        thrown.reportMissingExceptionWithMessage("Bug 58779: " + removeExpectedExceptionMsg);
-    
-        testFactoryFromFile(filename);
-    }
-
-    @Test
-    public void testFactoryFromStream() throws Exception {
-        testFactoryFromStream(filename);
-    }
-
-    @Test
-    public void testFactoryFromNative() throws Exception {
-        // Remove thrown.* when unit test for XSLF SlideShowFactory.create(OPCPackage) is implemented
-        thrown.expect(UnsupportedOperationException.class);
-        thrown.expectMessage("Test not implemented");
-        thrown.reportMissingExceptionWithMessage(removeExpectedExceptionMsg);
-
-        testFactoryFromNative(filename);
-    }
-
-    @Test
-    public void testFactoryFromProtectedFile() throws Exception {
-        File pFile = createProtected();
-        testFactoryFromProtectedFile(pFile.getAbsolutePath(), password);
-    }
-
-    @Test
-    public void testFactoryFromProtectedStream() throws Exception {
-        File pFile = createProtected();
-        testFactoryFromProtectedStream(pFile.getAbsolutePath(), password);
-    }
-
-    @Test
-    public void testFactoryFromProtectedNative() throws Exception {
-        File pFile = createProtected();
-        testFactoryFromProtectedNative(pFile.getAbsolutePath(), password);
-    }
-
-    private static File createProtected() throws IOException, GeneralSecurityException {
-        return createProtected(filename, password);
-    }
-
-    private static File createProtected(String basefile, String password)
-    throws IOException, GeneralSecurityException {
-        NPOIFSFileSystem fs = new NPOIFSFileSystem();
-        EncryptionInfo info = new EncryptionInfo(EncryptionMode.agile);
-        Encryptor enc = info.getEncryptor();
-        enc.confirmPassword(password);
-        InputStream fis = _slTests.openResourceAsStream(basefile);
-        OutputStream os = enc.getDataStream(fs);
-        IOUtils.copy(fis, os);
-        os.close();
-        fis.close();
-        
-        File tf = TempFile.createTempFile("test-xslf-slidefactory", ".pptx");
-        FileOutputStream fos = new FileOutputStream(tf);
-        fs.writeFilesystem(fos);
-        fos.close();
-        fs.close();
-
-        return tf;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
deleted file mode 100644
index 1d77a01..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.TableCell.BorderEdge;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
-
-public class TestXSLFTable {
-    @Test
-    public void testRead() throws IOException {
-        XMLSlideShow  ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-
-        XSLFSlide slide = ppt.getSlides().get(3);
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals(1, shapes.size());
-        assertTrue(shapes.get(0) instanceof XSLFTable);
-        XSLFTable tbl = (XSLFTable)shapes.get(0);
-        assertEquals(3, tbl.getNumberOfColumns());
-        assertEquals(6, tbl.getNumberOfRows());
-        assertNotNull(tbl.getCTTable());
-
-        List<XSLFTableRow> rows = tbl.getRows();
-        assertEquals(6, rows.size());
-
-        assertEquals(90.0, tbl.getColumnWidth(0), 0);
-        assertEquals(240.0, tbl.getColumnWidth(1), 0);
-        assertEquals(150.0, tbl.getColumnWidth(2), 0);
-
-        for(XSLFTableRow row : tbl){
-            // all rows have the same height
-            assertEquals(29.2, row.getHeight(), 0);
-        }
-
-        XSLFTableRow row0 = rows.get(0);
-        List<XSLFTableCell> cells0 = row0.getCells();
-        assertEquals(3, cells0.size());
-        assertEquals("header1", cells0.get(0).getText());
-        assertEquals("header2", cells0.get(1).getText());
-        assertEquals("header3", cells0.get(2).getText());
-
-        XSLFTableRow row1 = rows.get(1);
-        List<XSLFTableCell> cells1 = row1.getCells();
-        assertEquals(3, cells1.size());
-        assertEquals("A1", cells1.get(0).getText());
-        assertEquals("B1", cells1.get(1).getText());
-        assertEquals("C1", cells1.get(2).getText());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testCreate() throws IOException {
-        XMLSlideShow ppt1 = new XMLSlideShow();
-        XSLFSlide slide = ppt1.createSlide();
-
-        XSLFTable tbl = slide.createTable();
-        assertNotNull(tbl.getCTTable());
-        assertNotNull(tbl.getCTTable().getTblGrid());
-        assertNotNull(tbl.getCTTable().getTblPr());
-        assertTrue(tbl.getXmlObject() instanceof CTGraphicalObjectFrame);
-        assertEquals("Table 1", tbl.getShapeName());
-        assertEquals(2, tbl.getShapeId());
-        assertEquals(0, tbl.getRows().size());
-        assertEquals(0, tbl.getCTTable().sizeOfTrArray());
-        assertEquals(0, tbl.getCTTable().getTblGrid().sizeOfGridColArray());
-
-        assertEquals(0, tbl.getNumberOfColumns());
-        assertEquals(0, tbl.getNumberOfRows());
-
-        XSLFTableRow row0 = tbl.addRow();
-        assertNotNull(row0.getXmlObject());
-        assertEquals(1, tbl.getNumberOfRows());
-        assertSame(row0, tbl.getRows().get(0));
-        assertEquals(20.0, row0.getHeight(), 0);
-        row0.setHeight(30.0);
-        assertEquals(30.0, row0.getHeight(), 0);
-
-        assertEquals(0, row0.getCells().size());
-        XSLFTableCell cell0 = row0.addCell();
-        assertNotNull(cell0.getXmlObject());
-        // by default table cell has no borders
-        CTTableCell tc = (CTTableCell)cell0.getXmlObject();
-        assertTrue(tc.getTcPr().getLnB().isSetNoFill());
-        assertTrue(tc.getTcPr().getLnT().isSetNoFill());
-        assertTrue(tc.getTcPr().getLnL().isSetNoFill());
-        assertTrue(tc.getTcPr().getLnR().isSetNoFill());
-
-        assertSame(cell0, row0.getCells().get(0));
-        assertEquals(1, tbl.getNumberOfColumns());
-        assertEquals(100.0, tbl.getColumnWidth(0), 0);
-        cell0.addNewTextParagraph().addNewTextRun().setText("POI");
-        assertEquals("POI", cell0.getText());
-
-        XSLFTableCell cell1 = row0.addCell();
-        assertSame(cell1, row0.getCells().get(1));
-        assertEquals(2, tbl.getNumberOfColumns());
-        assertEquals(100.0, tbl.getColumnWidth(1), 0);
-        cell1.addNewTextParagraph().addNewTextRun().setText("Apache");
-        assertEquals("Apache", cell1.getText());
-
-        for (BorderEdge edge : BorderEdge.values()) {
-            assertNull(cell1.getBorderWidth(edge));
-            cell1.setBorderWidth(edge, 2.0);
-            assertEquals(2.0, cell1.getBorderWidth(edge), 0);
-            assertNull(cell1.getBorderColor(edge));
-            cell1.setBorderColor(edge, Color.yellow);
-            assertEquals(Color.yellow, cell1.getBorderColor(edge));
-        }
-
-        assertEquals(VerticalAlignment.TOP, cell1.getVerticalAlignment());
-        cell1.setVerticalAlignment(VerticalAlignment.MIDDLE);
-        assertEquals(VerticalAlignment.MIDDLE, cell1.getVerticalAlignment());
-        cell1.setVerticalAlignment(null);
-        assertEquals(VerticalAlignment.TOP, cell1.getVerticalAlignment());
-        
-        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-
-        slide = ppt2.getSlides().get(0);
-        tbl = (XSLFTable)slide.getShapes().get(0);
-        assertEquals(2, tbl.getNumberOfColumns());
-        assertEquals(1, tbl.getNumberOfRows());
-        assertEquals("POI", tbl.getCell(0, 0).getText());
-        assertEquals("Apache", tbl.getCell(0, 1).getText());
-        
-        ppt2.close();
-    }
-    
-    @Test
-    public void removeTable() throws IOException {
-        XMLSlideShow ss = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-        XSLFSlide sl = ss.getSlides().get(0);
-        XSLFTable tab = (XSLFTable)sl.getShapes().get(4);
-        sl.removeShape(tab);
-        
-        XMLSlideShow ss2 = XSLFTestDataSamples.writeOutAndReadBack(ss);
-        ss.close();
-        
-        sl = ss2.getSlides().get(0);
-        for (XSLFShape s : sl.getShapes()) {
-            assertFalse(s instanceof XSLFTable);
-        }
-        
-        ss2.close();
-    }
-
-    @Test
-    public void checkTextHeight() throws IOException {
-        // from bug 59686
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide sl = ppt.createSlide();
-        XSLFTable tab = sl.createTable();
-        tab.setAnchor(new Rectangle2D.Double(50,50,300,50));
-        XSLFTableRow tr = tab.addRow();
-        XSLFTableCell tc0 = tr.addCell();
-        tc0.setText("bla bla bla bla");
-        tab.setColumnWidth(0, 50);
-
-        // usually text height == 88, but font rendering is plattform dependent
-        // so we use something more reliable
-        assertTrue(tc0.getTextHeight() > 50);
-        assertEquals(0, tc0.getLineWidth(), 0);
-        
-        ppt.close();
-    }
-
-    @Test
-    public void checkNullPointerException() {
-        XMLSlideShow ss = XSLFTestDataSamples.openSampleDocument("au.asn.aes.www_conferences_2011_presentations_Fri_20Room4Level4_20930_20Maloney.pptx");
-        Dimension pgsize = ss.getPageSize();
-        for (Slide<?, ?> s : ss.getSlides()) {
-            BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D graphics = img.createGraphics();
-
-            // draw stuff
-            s.draw(graphics);
-
-            graphics.dispose();
-            img.flush();
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
deleted file mode 100644
index 8a08928..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
-
-public class TestXSLFTableRow {
-    
-    private static XMLSlideShow ppt;
-    private static XSLFTable tbl;
-    private static XSLFTableRow row;
-    
-    /** Copied from {@link TestXSLFTable#testRead()} */
-    @Before
-    public void setUp() throws IOException {
-        ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-
-        XSLFSlide slide = ppt.getSlides().get(3);
-        List<XSLFShape> shapes = slide.getShapes();
-        tbl = (XSLFTable)shapes.get(0);
-        List<XSLFTableRow> rows = tbl.getRows();
-        row = rows.get(0);
-    }
-    
-    @After
-    public void tearDown() throws IOException {
-        ppt.getPackage().revert();
-        ppt.close();
-    }
-
-
-    @Test
-    public void constructor() {
-        XSLFTableRow row2 = new XSLFTableRow(row.getXmlObject(), tbl);
-        assertSame(row.getXmlObject(), row2.getXmlObject());
-        assertEquals(row.getHeight(), row2.getHeight(), 1e-16);
-    }
-    
-    @Test
-    public void testHeight() {
-        final double h = 10.0;
-        row.setHeight(h);
-        assertEquals(h, row.getHeight(), 1e-16);
-    }
-    
-    /** copied from {@link TestXSLFTable#testCreate()} */
-    @Test
-    public void getCells() {
-        List<XSLFTableCell> cells = row.getCells();
-        assertNotNull(cells);
-        assertEquals(3, cells.size());
-    }
-    
-    @Test
-    public void testIterator() {
-        int i = 0;
-        for (XSLFTableCell cell : row) {
-            i++;
-            assertEquals("header"+i, cell.getText());
-        }
-        assertEquals(3, i);
-    }
-    
-    /** copied from {@link TestXSLFTable#testCreate()} */
-    @Test
-    public void addCell() {
-        XSLFTableCell cell = row.addCell();
-        assertNotNull(cell);
-        
-        assertNotNull(cell.getXmlObject());
-        // by default table cell has no borders
-        CTTableCell tc = (CTTableCell)cell.getXmlObject();
-        assertTrue(tc.getTcPr().getLnB().isSetNoFill());
-        assertTrue(tc.getTcPr().getLnT().isSetNoFill());
-        assertTrue(tc.getTcPr().getLnL().isSetNoFill());
-        assertTrue(tc.getTcPr().getLnR().isSetNoFill());
-    }
-    
-    @Test
-    public void mergeCells() {
-        try {
-            row.mergeCells(0, 0);
-            fail("expected IllegalArgumentException when merging fewer than 2 columns");
-        } catch (final IllegalArgumentException e) {
-            // expected
-        }
-        
-        row.mergeCells(0, 1);
-        List<XSLFTableCell> cells = row.getCells();
-        //the top-left cell of a merged region is not regarded as merged
-        assertFalse("top-left cell of merged region", cells.get(0).isMerged());
-        assertTrue("inside merged region", cells.get(1).isMerged());
-        assertFalse("outside merged region", cells.get(2).isMerged());
-    }
-    
-    @Test
-    public void getXmlObject() {
-        CTTableRow ctrow = row.getXmlObject();
-        assertNotNull(ctrow);
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
deleted file mode 100644
index 1236993..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-public class TestXSLFTableStyles {
-
-    @Test
-    public void testRead() throws IOException {
-        XMLSlideShow  ppt = new XMLSlideShow();
-        XSLFTableStyles tblStyles = ppt.getTableStyles();
-        assertNotNull(tblStyles);
-
-        assertEquals(0, tblStyles.getStyles().size());
-        
-        ppt.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
deleted file mode 100644
index 15352b4..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFTextBox {
-
-    @Test
-    public void testPlaceholder() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        XSLFTextBox shape = slide.createTextBox();
-        assertNull(shape.getTextType());
-        shape.setPlaceholder(Placeholder.TITLE);
-        assertEquals(Placeholder.TITLE, shape.getTextType());
-        shape.setPlaceholder(null);
-        assertNull(shape.getTextType());
-        shape.setText("Apache POI");
-        
-        ppt.close();
-    }
-
-    /**
-     * text box inherits default text proeprties from presentation.xml
-     */
-    @Test
-    public void testDefaultTextStyle() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-
-        // default character properties for paragraphs with level=1
-        CTTextCharacterProperties pPr = ppt.getCTPresentation().getDefaultTextStyle().getLvl1PPr().getDefRPr();
-
-        XSLFTextBox shape = slide.createTextBox();
-        shape.setText("Apache POI");
-        assertEquals(1, shape.getTextParagraphs().size());
-        assertEquals(1, shape.getTextParagraphs().get(0).getTextRuns().size());
-
-        XSLFTextRun r = shape.getTextParagraphs().get(0).getTextRuns().get(0);
-
-        assertEquals(1800, pPr.getSz());
-        assertEquals(18.0, r.getFontSize(), 0);
-        assertEquals("Calibri", r.getFontFamily());
-
-        pPr.setSz(900);
-        pPr.getLatin().setTypeface("Arial");
-        assertEquals(9.0, r.getFontSize(), 0);
-        assertEquals("Arial", r.getFontFamily());
-
-        // unset font size in presentation.xml. The value should be taken from master slide
-        // from /p:sldMaster/p:txStyles/p:otherStyle/a:lvl1pPr/a:defRPr
-        ppt.getCTPresentation().getDefaultTextStyle().getLvl1PPr().getDefRPr().unsetSz();
-        pPr = slide.getSlideMaster().getXmlObject().getTxStyles().getOtherStyle().getLvl1PPr().getDefRPr();
-        assertEquals(1800, pPr.getSz());
-        assertEquals(18.0, r.getFontSize(), 0);
-        pPr.setSz(2000);
-        assertEquals(20.0, r.getFontSize(), 0);
-
-        pPr.unsetSz();  // Should never be
-        assertNull(r.getFontSize());
-        
-        ppt.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
deleted file mode 100644
index 9d710cd..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.sl.TestCommonSL.sameColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.sl.draw.DrawTextFragment;
-import org.apache.poi.sl.draw.DrawTextParagraph;
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Assume;
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFTextParagraph {
-    // private static POILogger _logger = POILogFactory.getLogger(XSLFTextParagraph.class);
-
-    static class DrawTextParagraphProxy extends DrawTextParagraph {
-        DrawTextParagraphProxy(XSLFTextParagraph p) {
-            super(p);
-        }
-        
-        @Override
-        public void breakText(Graphics2D graphics) {
-            super.breakText(graphics);
-        }
-        
-        @Override
-        public double getWrappingWidth(boolean firstLine, Graphics2D graphics) {
-            return super.getWrappingWidth(firstLine, graphics);
-        }
-        
-        public List<DrawTextFragment> getLines() {
-            return lines;
-        }
-    }
-    
-    @Test
-    public void testWrappingWidth() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        XSLFTextShape sh = slide.createAutoShape();
-        sh.setLineColor(Color.black);
-
-        XSLFTextParagraph p = sh.addNewTextParagraph();
-        p.addNewTextRun().setText(
-                "Paragraph formatting allows for more granular control " +
-                "of text within a shape. Properties here apply to all text " +
-                "residing within the corresponding paragraph.");
-
-        Rectangle2D anchor = new Rectangle2D.Double(50, 50, 300, 200);
-        sh.setAnchor(anchor);
-        
-        DrawTextParagraphProxy dtp = new DrawTextParagraphProxy(p);
-
-        Double leftInset = sh.getLeftInset();
-        Double rightInset = sh.getRightInset();
-        assertEquals(7.2, leftInset, 0);
-        assertEquals(7.2, rightInset, 0);
-
-        Double leftMargin = p.getLeftMargin();
-        assertEquals(0.0, leftMargin, 0);
-
-        Double indent = p.getIndent();
-        assertNull(indent); // default
-
-        double expectedWidth;
-
-        // Case 1: bullet=false, leftMargin=0, indent=0.
-        expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin;
-        assertEquals(285.6, expectedWidth, 0); // 300 - 7.2 - 7.2 - 0
-        assertEquals(expectedWidth, dtp.getWrappingWidth(true, null), 0);
-        assertEquals(expectedWidth, dtp.getWrappingWidth(false, null), 0);
-
-        p.setLeftMargin(36d); // 0.5"
-        leftMargin = p.getLeftMargin();
-        assertEquals(36.0, leftMargin, 0);
-        expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin;
-        assertEquals(249.6, expectedWidth, 1E-5); // 300 - 7.2 - 7.2 - 36
-        assertEquals(expectedWidth, dtp.getWrappingWidth(true, null), 0);
-        assertEquals(expectedWidth, dtp.getWrappingWidth(false, null), 0);
-
-        // increase insets, the wrapping width should get smaller
-        sh.setLeftInset(10);
-        sh.setRightInset(10);
-        leftInset = sh.getLeftInset();
-        rightInset = sh.getRightInset();
-        assertEquals(10.0, leftInset, 0);
-        assertEquals(10.0, rightInset, 0);
-        expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin;
-        assertEquals(244.0, expectedWidth, 0); // 300 - 10 - 10 - 36
-        assertEquals(expectedWidth, dtp.getWrappingWidth(true, null), 0);
-        assertEquals(expectedWidth, dtp.getWrappingWidth(false, null), 0);
-
-        // set a positive indent of a 0.5 inch. This means "First Line" indentation:
-        // |<---  indent -->|Here goes first line of the text
-        // Here go other lines (second and subsequent)
-
-        p.setIndent(36.0);  // 0.5"
-        indent = p.getIndent();
-        assertEquals(36.0, indent, 0);
-        expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin - indent;
-        assertEquals(208.0, expectedWidth, 0); // 300 - 10 - 10 - 36 - 6.4
-        assertEquals(expectedWidth, dtp.getWrappingWidth(true, null), 0); // first line is indented
-        // other lines are not indented
-        expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin;
-        assertEquals(244.0, expectedWidth, 0); // 300 - 10 - 10 - 36
-        assertEquals(expectedWidth, dtp.getWrappingWidth(false, null), 0);
-
-        // set a negative indent of a 1 inch. This means "Hanging" indentation:
-        // Here goes first line of the text
-        // |<---  indent -->|Here go other lines (second and subsequent)
-        p.setIndent(-72.0);  // 1"
-        indent = p.getIndent();
-        assertEquals(-72.0, indent, 0);
-        expectedWidth = anchor.getWidth() - leftInset - rightInset;
-        assertEquals(280.0, expectedWidth, 0); // 300 - 10 - 10 
-        assertEquals(expectedWidth, dtp.getWrappingWidth(true, null), 0); // first line is NOT indented
-        // other lines are indented by leftMargin (the value of indent is not used)
-        expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin;
-        assertEquals(244.0, expectedWidth, 0); // 300 - 10 - 10 - 36 
-        assertEquals(expectedWidth, dtp.getWrappingWidth(false, null), 0);
-        
-        ppt.close();
-     }
-
-    /**
-     * test breaking test into lines.
-     * This test requires that the Arial font is available and will run only on windows
-     */
-    @Test
-    public void testBreakLines() throws IOException {
-        String os = System.getProperty("os.name");
-        Assume.assumeTrue("Skipping testBreakLines(), it is executed only on Windows machines", (os != null && os.contains("Windows")));
-
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        XSLFTextShape sh = slide.createAutoShape();
-
-        XSLFTextParagraph p = sh.addNewTextParagraph();
-        XSLFTextRun r = p.addNewTextRun();
-        r.setFontFamily("Arial"); // this should always be available
-        r.setFontSize(12d);
-        r.setText(
-                "Paragraph formatting allows for more granular control " +
-                "of text within a shape. Properties here apply to all text " +
-                "residing within the corresponding paragraph.");
-
-        sh.setAnchor(new Rectangle2D.Double(50, 50, 300, 200));
-        DrawTextParagraphProxy dtp = new DrawTextParagraphProxy(p);
-
-        BufferedImage img = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
-        Graphics2D graphics = img.createGraphics();
-
-        List<DrawTextFragment> lines;
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(4, lines.size());
-
-        // decrease the shape width from 300 pt to 100 pt
-        sh.setAnchor(new Rectangle2D.Double(50, 50, 100, 200));
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(12, lines.size());
-
-        // decrease the shape width from 300 pt to 100 pt
-        sh.setAnchor(new Rectangle2D.Double(50, 50, 600, 200));
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(2, lines.size());
-
-        // set left and right margins to 200pt. This leaves 200pt for wrapping text
-        sh.setLeftInset(200);
-        sh.setRightInset(200);
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(5, lines.size());
-
-        r.setText("Apache POI");
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(1, lines.size());
-        assertEquals("Apache POI", lines.get(0).getString());
-
-        r.setText("Apache\nPOI");
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(2, lines.size());
-        assertEquals("Apache", lines.get(0).getString());
-        assertEquals("POI", lines.get(1).getString());
-
-        // trailing newlines are ignored
-        r.setText("Apache\nPOI\n");
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(2, lines.size());
-        assertEquals("Apache", lines.get(0).getString());
-        assertEquals("POI", lines.get(1).getString());
-
-        XSLFAutoShape sh2 = slide.createAutoShape();
-        sh2.setAnchor(new Rectangle2D.Double(50, 50, 300, 200));
-        XSLFTextParagraph p2 = sh2.addNewTextParagraph();
-        XSLFTextRun r2 = p2.addNewTextRun();
-        r2.setFontFamily("serif"); // this should always be available
-        r2.setFontSize(30d);
-        r2.setText("Apache\n");
-        XSLFTextRun r3 = p2.addNewTextRun();
-        r3.setFontFamily("serif"); // this should always be available
-        r3.setFontSize(10d);
-        r3.setText("POI");
-        dtp = new DrawTextParagraphProxy(p2);
-        dtp.breakText(graphics);
-        lines = dtp.getLines();
-        assertEquals(2, lines.size());
-        assertEquals("Apache", lines.get(0).getString());
-        assertEquals("POI", lines.get(1).getString());
-        // the first line is at least two times higher than the second
-        assertTrue(lines.get(0).getHeight() > lines.get(1).getHeight()*2);
-
-        ppt.close();
-    }
-
-    @Test
-    public void testThemeInheritance() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("prProps.pptx");
-        List<XSLFShape> shapes = ppt.getSlides().get(0).getShapes();
-        XSLFTextShape sh1 = (XSLFTextShape)shapes.get(0);
-        assertEquals("Apache", sh1.getText());
-        assertEquals(TextAlign.CENTER, sh1.getTextParagraphs().get(0).getTextAlign());
-        XSLFTextShape sh2 = (XSLFTextShape)shapes.get(1);
-        assertEquals("Software", sh2.getText());
-        assertEquals(TextAlign.CENTER, sh2.getTextParagraphs().get(0).getTextAlign());
-        XSLFTextShape sh3 = (XSLFTextShape)shapes.get(2);
-        assertEquals("Foundation", sh3.getText());
-        assertEquals(TextAlign.CENTER, sh3.getTextParagraphs().get(0).getTextAlign());
-        ppt.close();
-    }
-
-    @Test
-    public void testParagraphProperties() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        XSLFTextShape sh = slide.createAutoShape();
-
-        XSLFTextParagraph p = sh.addNewTextParagraph();
-        assertFalse(p.isBullet());
-        p.setBullet(true);
-        assertTrue(p.isBullet());
-
-        assertEquals("\u2022", p.getBulletCharacter());
-        p.setBulletCharacter("*");
-        assertEquals("*", p.getBulletCharacter());
-
-        assertEquals("Arial", p.getBulletFont());
-        p.setBulletFont("Calibri");
-        assertEquals("Calibri", p.getBulletFont());
-
-        assertEquals(null, p.getBulletFontColor());
-        p.setBulletFontColor(Color.red);
-        assertTrue(sameColor(Color.red, p.getBulletFontColor()));
-
-        assertNull(p.getBulletFontSize());
-        p.setBulletFontSize(200.);
-        assertEquals(200., p.getBulletFontSize(), 0);
-        p.setBulletFontSize(-20.);
-        assertEquals(-20.0, p.getBulletFontSize(), 0);
-
-        assertEquals(72.0, p.getDefaultTabSize(), 0);
-        
-        assertNull(p.getIndent());
-        p.setIndent(72.0);
-        assertEquals(72.0, p.getIndent(), 0);
-        p.setIndent(-1d); // the value of -1.0 resets to the defaults (not any more ...)
-        assertEquals(-1d, p.getIndent(), 0);
-        p.setIndent(null); 
-        assertNull(p.getIndent());
-
-        assertEquals(0.0, p.getLeftMargin(), 0);
-        p.setLeftMargin(72.0);
-        assertEquals(72.0, p.getLeftMargin(), 0);
-        p.setLeftMargin(-1.0); // the value of -1.0 resets to the defaults
-        assertEquals(-1.0, p.getLeftMargin(), 0);
-        p.setLeftMargin(null);
-        assertEquals(0d, p.getLeftMargin(), 0); // default will be taken from master
-
-        assertEquals(0, p.getIndentLevel());
-        p.setIndentLevel(1);
-        assertEquals(1, p.getIndentLevel());
-        p.setIndentLevel(2);
-        assertEquals(2, p.getIndentLevel());
-
-        assertNull(p.getLineSpacing());
-        p.setLineSpacing(200.);
-        assertEquals(200.0, p.getLineSpacing(), 0);
-        p.setLineSpacing(-15.);
-        assertEquals(-15.0, p.getLineSpacing(), 0);
-
-        assertNull(p.getSpaceAfter());
-        p.setSpaceAfter(200.);
-        assertEquals(200.0, p.getSpaceAfter(), 0);
-        p.setSpaceAfter(-15.);
-        assertEquals(-15.0, p.getSpaceAfter(), 0);
-        p.setSpaceAfter(null);
-        assertNull(p.getSpaceAfter());
-        p.setSpaceAfter(null);
-        assertNull(p.getSpaceAfter());
-
-        assertNull(p.getSpaceBefore());
-        p.setSpaceBefore(200.);
-        assertEquals(200.0, p.getSpaceBefore(), 0);
-        p.setSpaceBefore(-15.);
-        assertEquals(-15.0, p.getSpaceBefore(), 0);
-        p.setSpaceBefore(null);
-        assertNull(p.getSpaceBefore());
-        p.setSpaceBefore(null);
-        assertNull(p.getSpaceBefore());
-
-        assertEquals(TextAlign.LEFT, p.getTextAlign());
-        p.setTextAlign(TextAlign.RIGHT);
-        assertEquals(TextAlign.RIGHT, p.getTextAlign());
-
-        p.setBullet(false);
-        assertFalse(p.isBullet());
-
-        p.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenBoth, 1);
-
-        double tabStop = p.getTabStop(0);
-        assertEquals(0.0, tabStop, 0);
-
-        p.addTabStop(100.);
-        assertEquals(100., p.getTabStop(0), 0);
-
-        assertEquals(72.0, p.getDefaultTabSize(), 0);
-
-        ppt.close();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testLineBreak() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        try {
-            XSLFSlide slide = ppt.createSlide();
-            XSLFTextShape sh = slide.createAutoShape();
-    
-            XSLFTextParagraph p = sh.addNewTextParagraph();
-            XSLFTextRun r1 = p.addNewTextRun();
-            r1.setText("Hello,");
-            XSLFTextRun r2 = p.addLineBreak();
-            assertEquals("\n", r2.getRawText());
-            r2.setFontSize(10.0);
-            assertEquals(10.0, r2.getFontSize(), 0);
-            XSLFTextRun r3 = p.addNewTextRun();
-            r3.setText("World!");
-            r3.setFontSize(20.0);
-            XSLFTextRun r4 = p.addLineBreak();
-            assertEquals(20.0, r4.getFontSize(), 0);
-    
-            assertEquals("Hello,\nWorld!\n",sh.getText());
-
-            // "You cannot change text of a line break, it is always '\\n'"
-            r2.setText("aaa");
-        } finally {
-            ppt.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
deleted file mode 100644
index 5b2fa7b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.sl.TestCommonSL.sameColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.io.IOException;
-
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSLFTextRun {
-
-    @Test
-    public void testRunProperties() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        XSLFTextShape sh = slide.createAutoShape();
-
-        XSLFTextRun r = sh.addNewTextParagraph().addNewTextRun();
-        assertEquals("en-US", r.getRPr(true).getLang());
-
-        assertEquals(0., r.getCharacterSpacing(), 0);
-        r.setCharacterSpacing(3);
-        assertEquals(3., r.getCharacterSpacing(), 0);
-        r.setCharacterSpacing(-3);
-        assertEquals(-3., r.getCharacterSpacing(), 0);
-        r.setCharacterSpacing(0);
-        assertEquals(0., r.getCharacterSpacing(), 0);
-        assertFalse(r.getRPr(true).isSetSpc());
-
-        assertTrue(sameColor(Color.black, r.getFontColor()));
-        r.setFontColor(Color.red);
-        assertTrue(sameColor(Color.red, r.getFontColor()));
-
-        assertEquals("Calibri", r.getFontFamily());
-        r.setFontFamily("Arial");
-        assertEquals("Arial", r.getFontFamily());
-
-        assertEquals(18.0, r.getFontSize(), 0);
-        r.setFontSize(13.0);
-        assertEquals(13.0, r.getFontSize(), 0);
-
-        assertEquals(false, r.isSuperscript());
-        r.setSuperscript(true);
-        assertEquals(true, r.isSuperscript());
-        r.setSuperscript(false);
-        assertEquals(false, r.isSuperscript());
-
-        assertEquals(false, r.isSubscript());
-        r.setSubscript(true);
-        assertEquals(true, r.isSubscript());
-        r.setSubscript(false);
-        assertEquals(false, r.isSubscript());
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
deleted file mode 100644
index 8ae19f2..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
+++ /dev/null
@@ -1,931 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.sl.TestCommonSL.sameColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.apache.poi.xslf.usermodel.TestXSLFSimpleShape.getSpPr;
-
-import java.awt.Color;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFTextShape;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextAlignType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
-
-public class TestXSLFTextShape {
-
-    @Test
-    public void testLayouts() throws IOException {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("layouts.pptx");
-
-        List<XSLFSlide> slide = ppt.getSlides();
-
-        verifySlide1(slide.get(0));
-        verifySlide2(slide.get(1));
-        verifySlide3(slide.get(2));
-        verifySlide4(slide.get(3));
-        verifySlide7(slide.get(6));
-        verifySlide8(slide.get(7));
-        verifySlide10(slide.get(9));
-        
-        ppt.close();
-    }
-
-    void verifySlide1(XSLFSlide slide){
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals("Title Slide",layout.getName());
-
-        XSLFTextShape shape1 = (XSLFTextShape)shapes.get(0);
-        CTPlaceholder ph1 = shape1.getCTPlaceholder();
-        assertEquals(STPlaceholderType.CTR_TITLE, ph1.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape1).getXfrm());
-
-        XSLFTextShape masterShape1 = (XSLFTextShape)layout.getPlaceholder(ph1);
-        assertNotNull(getSpPr(masterShape1).getXfrm());
-        assertEquals(masterShape1.getAnchor(), shape1.getAnchor());
-
-        CTTextBodyProperties bodyPr1 = shape1.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr1.isSetLIns() && !bodyPr1.isSetRIns() &&
-                !bodyPr1.isSetBIns() && !bodyPr1.isSetTIns() &&
-                !bodyPr1.isSetAnchor()
-        );
-        assertEquals(7.2, shape1.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape1.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape1.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape1.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.MIDDLE, shape1.getVerticalAlignment());
-
-        // now check text properties
-        assertEquals("Centered Title", shape1.getText());
-        XSLFTextRun r1 = shape1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals("Calibri", r1.getFontFamily());
-        assertEquals(44.0, r1.getFontSize(), 0);
-        assertTrue(sameColor(Color.black, r1.getFontColor()));
-
-        XSLFTextShape shape2 = (XSLFTextShape)shapes.get(1);
-        CTPlaceholder ph2 = shape2.getCTPlaceholder();
-        assertEquals(STPlaceholderType.SUB_TITLE, ph2.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape2).getXfrm());
-
-        XSLFTextShape masterShape2 = (XSLFTextShape)layout.getPlaceholder(ph2);
-        assertNotNull(getSpPr(masterShape2).getXfrm());
-        assertEquals(masterShape2.getAnchor(), shape2.getAnchor());
-
-        CTTextBodyProperties bodyPr2 = shape2.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr2.isSetLIns() && !bodyPr2.isSetRIns() &&
-                !bodyPr2.isSetBIns() && !bodyPr2.isSetTIns() &&
-                !bodyPr2.isSetAnchor()
-        );
-        assertEquals(7.2, shape2.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape2.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape2.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape2.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
-
-        assertEquals("subtitle", shape2.getText());
-        XSLFTextRun r2 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals("Calibri", r2.getFontFamily());
-        assertEquals(32.0, r2.getFontSize(), 0);
-        // TODO fix calculation of tint
-        //assertEquals(new Color(137, 137, 137), r2.getFontColor());
-    }
-
-    void verifySlide2(XSLFSlide slide){
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals("Title and Content",layout.getName());
-
-        XSLFTextShape shape1 = (XSLFTextShape)shapes.get(0);
-        CTPlaceholder ph1 = shape1.getCTPlaceholder();
-        assertEquals(STPlaceholderType.TITLE, ph1.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape1).getXfrm());
-
-        XSLFTextShape masterShape1 = (XSLFTextShape)layout.getPlaceholder(ph1);
-        // layout does not have anchor info either, it is in the slide master
-        assertNull(getSpPr(masterShape1).getXfrm());
-        masterShape1 = (XSLFTextShape)layout.getSlideMaster().getPlaceholder(ph1);
-        assertNotNull(getSpPr(masterShape1).getXfrm());
-        assertEquals(masterShape1.getAnchor(), shape1.getAnchor());
-
-        CTTextBodyProperties bodyPr1 = shape1.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr1.isSetLIns() && !bodyPr1.isSetRIns() &&
-                !bodyPr1.isSetBIns() && !bodyPr1.isSetTIns() &&
-                !bodyPr1.isSetAnchor()
-        );
-        assertEquals(7.2, shape1.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape1.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape1.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape1.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.MIDDLE, shape1.getVerticalAlignment());
-
-        // now check text properties
-        assertEquals("Title", shape1.getText());
-        XSLFTextRun r1 = shape1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals("Calibri", r1.getFontFamily());
-        assertEquals(44.0, r1.getFontSize(), 0);
-        assertTrue(sameColor(Color.black, r1.getFontColor()));
-
-        XSLFTextShape shape2 = (XSLFTextShape)shapes.get(1);
-        CTPlaceholder ph2 = shape2.getCTPlaceholder();
-        assertFalse(ph2.isSetType()); // <p:ph idx="1"/>
-        assertTrue(ph2.isSetIdx());
-        assertEquals(1, ph2.getIdx());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape2).getXfrm());
-
-        XSLFTextShape masterShape2 = (XSLFTextShape)layout.getPlaceholder(ph2);
-        // anchor of the body text is missing in the slide layout, llokup in the slide master
-        assertNull(getSpPr(masterShape2).getXfrm());
-        masterShape2 = (XSLFTextShape)layout.getSlideMaster().getPlaceholder(ph2);
-        assertNotNull(getSpPr(masterShape2).getXfrm());
-        assertEquals(masterShape2.getAnchor(), shape2.getAnchor());
-
-        CTTextBodyProperties bodyPr2 = shape2.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr2.isSetLIns() && !bodyPr2.isSetRIns() &&
-                !bodyPr2.isSetBIns() && !bodyPr2.isSetTIns() &&
-                !bodyPr2.isSetAnchor()
-        );
-        assertEquals(7.2, shape2.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape2.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape2.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape2.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
-
-        XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(0, pr1.getParentParagraph().getIndentLevel());
-        assertEquals("Content", pr1.getRawText());
-        assertEquals("Calibri", pr1.getFontFamily());
-        assertEquals(32.0, pr1.getFontSize(), 0);
-        assertEquals(27.0, pr1.getParentParagraph().getLeftMargin(), 0); 
-        assertEquals("\u2022", pr1.getParentParagraph().getBulletCharacter()); 
-        assertEquals("Arial", pr1.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);
-        assertEquals(1, pr2.getParentParagraph().getIndentLevel());
-        assertEquals("Level 2", pr2.getRawText());
-        assertEquals("Calibri", pr2.getFontFamily());
-        assertEquals(28.0, pr2.getFontSize(), 0);
-        assertEquals(58.5, pr2.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2013", pr2.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr2.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);
-        assertEquals(2, pr3.getParentParagraph().getIndentLevel());
-        assertEquals("Level 3", pr3.getRawText());
-        assertEquals("Calibri", pr3.getFontFamily());
-        assertEquals(24.0, pr3.getFontSize(), 0);
-        assertEquals(90.0, pr3.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2022", pr3.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr3.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);
-        assertEquals(3, pr4.getParentParagraph().getIndentLevel());
-        assertEquals("Level 4", pr4.getRawText());
-        assertEquals("Calibri", pr4.getFontFamily());
-        assertEquals(20.0, pr4.getFontSize(), 0);
-        assertEquals(126.0, pr4.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2013", pr4.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr4.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr5 = shape2.getTextParagraphs().get(4).getTextRuns().get(0);
-        assertEquals(4, pr5.getParentParagraph().getIndentLevel());
-        assertEquals("Level 5", pr5.getRawText());
-        assertEquals("Calibri", pr5.getFontFamily());
-        assertEquals(20.0, pr5.getFontSize(), 0);
-        assertEquals(162.0, pr5.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u00bb", pr5.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr5.getParentParagraph().getBulletFont());
-
-    }
-
-    void verifySlide3(XSLFSlide slide){
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals("Section Header",layout.getName());
-
-        XSLFTextShape shape1 = (XSLFTextShape)shapes.get(0);
-        CTPlaceholder ph1 = shape1.getCTPlaceholder();
-        assertEquals(STPlaceholderType.TITLE, ph1.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape1).getXfrm());
-
-        XSLFTextShape masterShape1 = (XSLFTextShape)layout.getPlaceholder(ph1);
-        assertNotNull(getSpPr(masterShape1).getXfrm());
-        assertEquals(masterShape1.getAnchor(), shape1.getAnchor());
-
-        CTTextBodyProperties bodyPr1 = shape1.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr1.isSetLIns() && !bodyPr1.isSetRIns() &&
-                !bodyPr1.isSetBIns() && !bodyPr1.isSetTIns() &&
-                !bodyPr1.isSetAnchor()
-        );
-        assertEquals(7.2, shape1.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape1.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape1.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape1.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.TOP, shape1.getVerticalAlignment());
-
-        // now check text properties
-        assertEquals("Section Title", shape1.getText());
-        XSLFTextRun r1 = shape1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(TextAlign.LEFT, r1.getParentParagraph().getTextAlign());
-        assertEquals("Calibri", r1.getFontFamily());
-        assertEquals(40.0, r1.getFontSize(), 0);
-        assertTrue(sameColor(Color.black, r1.getFontColor()));
-        assertTrue(r1.isBold());
-        assertFalse(r1.isItalic());
-        assertFalse(r1.isUnderlined());
-
-        XSLFTextShape shape2 = (XSLFTextShape)shapes.get(1);
-        CTPlaceholder ph2 = shape2.getCTPlaceholder();
-        assertEquals(STPlaceholderType.BODY, ph2.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape2).getXfrm());
-
-        XSLFTextShape masterShape2 = (XSLFTextShape)layout.getPlaceholder(ph2);
-        assertNotNull(getSpPr(masterShape2).getXfrm());
-        assertEquals(masterShape2.getAnchor(), shape2.getAnchor());
-
-        CTTextBodyProperties bodyPr2 = shape2.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr2.isSetLIns() && !bodyPr2.isSetRIns() &&
-                !bodyPr2.isSetBIns() && !bodyPr2.isSetTIns() &&
-                !bodyPr2.isSetAnchor()
-        );
-        assertEquals(7.2, shape2.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape2.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape2.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape2.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.BOTTOM, shape2.getVerticalAlignment());
-
-        assertEquals("Section Header", shape2.getText());
-        XSLFTextRun r2 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(TextAlign.LEFT, r2.getParentParagraph().getTextAlign());
-        assertEquals("Calibri", r2.getFontFamily());
-        assertEquals(20.0, r2.getFontSize(), 0);
-        // TODO fix calculation of tint
-        //assertEquals(new Color(137, 137, 137), r2.getFontColor());
-    }
-
-    void verifySlide4(XSLFSlide slide){
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals("Two Content",layout.getName());
-
-        XSLFTextShape shape1 = (XSLFTextShape)shapes.get(0);
-        CTPlaceholder ph1 = shape1.getCTPlaceholder();
-        assertEquals(STPlaceholderType.TITLE, ph1.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape1).getXfrm());
-
-        XSLFTextShape masterShape1 = (XSLFTextShape)layout.getPlaceholder(ph1);
-        // layout does not have anchor info either, it is in the slide master
-        assertNull(getSpPr(masterShape1).getXfrm());
-        masterShape1 = (XSLFTextShape)layout.getSlideMaster().getPlaceholder(ph1);
-        assertNotNull(getSpPr(masterShape1).getXfrm());
-        assertEquals(masterShape1.getAnchor(), shape1.getAnchor());
-
-        CTTextBodyProperties bodyPr1 = shape1.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr1.isSetLIns() && !bodyPr1.isSetRIns() &&
-                !bodyPr1.isSetBIns() && !bodyPr1.isSetTIns() &&
-                !bodyPr1.isSetAnchor()
-        );
-        assertEquals(7.2, shape1.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape1.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape1.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape1.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.MIDDLE, shape1.getVerticalAlignment());
-
-        // now check text properties
-        assertEquals("Title", shape1.getText());
-        XSLFTextRun r1 = shape1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(TextAlign.CENTER, r1.getParentParagraph().getTextAlign());
-        assertEquals("Calibri", r1.getFontFamily());
-        assertEquals(44.0, r1.getFontSize(), 0);
-        assertTrue(sameColor(Color.black, r1.getFontColor()));
-
-        XSLFTextShape shape2 = (XSLFTextShape)shapes.get(1);
-        CTPlaceholder ph2 = shape2.getCTPlaceholder();
-        assertFalse(ph2.isSetType());
-        assertTrue(ph2.isSetIdx());
-        assertEquals(1, ph2.getIdx());  //<p:ph sz="half" idx="1"/>
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape2).getXfrm());
-
-        XSLFTextShape masterShape2 = (XSLFTextShape)layout.getPlaceholder(ph2);
-        assertNotNull(getSpPr(masterShape2).getXfrm());
-        assertEquals(masterShape2.getAnchor(), shape2.getAnchor());
-
-        CTTextBodyProperties bodyPr2 = shape2.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr2.isSetLIns() && !bodyPr2.isSetRIns() &&
-                !bodyPr2.isSetBIns() && !bodyPr2.isSetTIns() &&
-                !bodyPr2.isSetAnchor()
-        );
-        assertEquals(7.2, shape2.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape2.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape2.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape2.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
-
-        XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(0, pr1.getParentParagraph().getIndentLevel());
-        assertEquals("Left", pr1.getRawText());
-        assertEquals("Calibri", pr1.getFontFamily());
-        assertEquals(28.0, pr1.getFontSize(), 0);
-        assertEquals(27.0, pr1.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2022", pr1.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr1.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);
-        assertEquals(1, pr2.getParentParagraph().getIndentLevel());
-        assertEquals("Level 2", pr2.getParentParagraph().getText());
-        assertEquals("Calibri", pr2.getFontFamily());
-        assertEquals(24.0, pr2.getFontSize(), 0);
-        assertEquals(58.5, pr2.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2013", pr2.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr2.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);
-        assertEquals(2, pr3.getParentParagraph().getIndentLevel());
-        assertEquals("Level 3", pr3.getParentParagraph().getText());
-        assertEquals("Calibri", pr3.getFontFamily());
-        assertEquals(20.0, pr3.getFontSize(), 0);
-        assertEquals(90.0, pr3.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2022", pr3.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr3.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);
-        assertEquals(3, pr4.getParentParagraph().getIndentLevel());
-        assertEquals("Level 4", pr4.getParentParagraph().getText());
-        assertEquals("Calibri", pr4.getFontFamily());
-        assertEquals(18.0, pr4.getFontSize(), 0);
-        assertEquals(126.0, pr4.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2013", pr4.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr4.getParentParagraph().getBulletFont());
-
-        XSLFTextShape shape3 = (XSLFTextShape)shapes.get(2);
-        XSLFTextRun pr5 = shape3.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(0, pr5.getParentParagraph().getIndentLevel());
-        assertEquals("Right", pr5.getRawText());
-        assertEquals("Calibri", pr5.getFontFamily());
-        assertTrue(sameColor(Color.black, pr5.getFontColor()));
-    }
-
-    @SuppressWarnings("unused")
-    void verifySlide5(XSLFSlide slide){
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        List<XSLFShape> shapes = slide.getShapes();
-        // TODO
-    }    
-
-    void verifySlide7(XSLFSlide slide){
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals("Blank",layout.getName());
-
-        XSLFTextShape shape1 = (XSLFTextShape)shapes.get(0);
-        CTPlaceholder ph1 = shape1.getCTPlaceholder();
-        assertEquals(STPlaceholderType.TITLE, ph1.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape1).getXfrm());
-
-        CTTextBodyProperties bodyPr1 = shape1.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr1.isSetLIns() && !bodyPr1.isSetRIns() &&
-                !bodyPr1.isSetBIns() && !bodyPr1.isSetTIns() &&
-                !bodyPr1.isSetAnchor()
-        );
-        assertEquals(7.2, shape1.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape1.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape1.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape1.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.MIDDLE, shape1.getVerticalAlignment());
-
-        // now check text properties
-        assertEquals("Blank with Default Title", shape1.getText());
-        XSLFTextRun r1 = shape1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(TextAlign.CENTER, r1.getParentParagraph().getTextAlign());
-        assertEquals("Calibri", r1.getFontFamily());
-        assertEquals(44.0, r1.getFontSize(), 0);
-        assertTrue(sameColor(Color.black, r1.getFontColor()));
-        assertFalse(r1.isBold());
-
-        XSLFTextShape shape2 = (XSLFTextShape)shapes.get(1);
-
-        CTTextBodyProperties bodyPr2 = shape2.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr2.isSetLIns() && !bodyPr2.isSetRIns() &&
-                !bodyPr2.isSetBIns() && !bodyPr2.isSetTIns() &&
-                !bodyPr2.isSetAnchor()
-        );
-        assertEquals(7.2, shape2.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape2.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape2.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape2.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
-
-        XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(0, pr1.getParentParagraph().getIndentLevel());
-        assertEquals("Default Text", pr1.getRawText());
-        assertEquals("Calibri", pr1.getFontFamily());
-        assertEquals(18.0, pr1.getFontSize(), 0);
-
-        XSLFTextShape shape3 = (XSLFTextShape)shapes.get(2);
-        assertEquals("Default", shape3.getTextParagraphs().get(0).getText());
-        assertEquals("Text with levels", shape3.getTextParagraphs().get(1).getText());
-        assertEquals("Level 1", shape3.getTextParagraphs().get(2).getText());
-        assertEquals("Level 2", shape3.getTextParagraphs().get(3).getText());
-        assertEquals("Level 3", shape3.getTextParagraphs().get(4).getText());
-
-        for(int p = 0; p < 5; p++) {
-            XSLFTextParagraph pr = shape3.getTextParagraphs().get(p);
-            assertEquals("Calibri", pr.getTextRuns().get(0).getFontFamily());
-            assertEquals(18.0, pr.getTextRuns().get(0).getFontSize(), 0);
-        }
-    }
-
-    void verifySlide8(XSLFSlide slide){
-        XSLFSlideLayout layout = slide.getSlideLayout();
-        List<XSLFShape> shapes = slide.getShapes();
-        assertEquals("Content with Caption",layout.getName());
-
-        XSLFTextShape shape1 = (XSLFTextShape)shapes.get(0);
-        CTPlaceholder ph1 = shape1.getCTPlaceholder();
-        assertEquals(STPlaceholderType.TITLE, ph1.getType());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape1).getXfrm());
-
-        XSLFTextShape masterShape1 = (XSLFTextShape)layout.getPlaceholder(ph1);
-        // layout does not have anchor info either, it is in the slide master
-        assertNotNull(getSpPr(masterShape1).getXfrm());
-        assertEquals(masterShape1.getAnchor(), shape1.getAnchor());
-
-        CTTextBodyProperties bodyPr1 = shape1.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr1.isSetLIns() && !bodyPr1.isSetRIns() &&
-                !bodyPr1.isSetBIns() && !bodyPr1.isSetTIns() &&
-                !bodyPr1.isSetAnchor()
-        );
-        assertEquals(7.2, shape1.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape1.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape1.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape1.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.BOTTOM, shape1.getVerticalAlignment());
-
-        // now check text properties
-        assertEquals("Caption", shape1.getText());
-        XSLFTextRun r1 = shape1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(TextAlign.LEFT, r1.getParentParagraph().getTextAlign());
-        assertEquals("Calibri", r1.getFontFamily());
-        assertEquals(20.0, r1.getFontSize(), 0);
-        assertTrue(sameColor(Color.black, r1.getFontColor()));
-        assertTrue(r1.isBold());
-
-        XSLFTextShape shape2 = (XSLFTextShape)shapes.get(1);
-        CTPlaceholder ph2 = shape2.getCTPlaceholder();
-        assertFalse(ph2.isSetType());
-        assertTrue(ph2.isSetIdx());
-        assertEquals(1, ph2.getIdx());
-        // anchor is not defined in the shape
-        assertNull(getSpPr(shape2).getXfrm());
-
-        XSLFTextShape masterShape2 = (XSLFTextShape)layout.getPlaceholder(ph2);
-        assertNotNull(getSpPr(masterShape2).getXfrm());
-        assertEquals(masterShape2.getAnchor(), shape2.getAnchor());
-
-        CTTextBodyProperties bodyPr2 = shape2.getTextBodyPr();
-        // none of the following properties are set in the shapes and fetched from the master shape
-        assertTrue(
-                !bodyPr2.isSetLIns() && !bodyPr2.isSetRIns() &&
-                !bodyPr2.isSetBIns() && !bodyPr2.isSetTIns() &&
-                !bodyPr2.isSetAnchor()
-        );
-        assertEquals(7.2, shape2.getLeftInset(), 0);  // 0.1"
-        assertEquals(7.2, shape2.getRightInset(), 0); // 0.1"
-        assertEquals(3.6, shape2.getTopInset(), 0);  // 0.05"
-        assertEquals(3.6, shape2.getBottomInset(), 0); // 0.05"
-        assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
-
-        XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(0, pr1.getParentParagraph().getIndentLevel());
-        assertEquals("Level 1", pr1.getRawText());
-        assertEquals("Calibri", pr1.getFontFamily());
-        assertEquals(32.0, pr1.getFontSize(), 0);
-        assertEquals(27.0, pr1.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2022", pr1.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr1.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);
-        assertEquals(1, pr2.getParentParagraph().getIndentLevel());
-        assertEquals("Level 2", pr2.getParentParagraph().getText());
-        assertEquals("Calibri", pr2.getFontFamily());
-        assertEquals(28.0, pr2.getFontSize(), 0);
-        assertEquals(58.5, pr2.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2013", pr2.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr2.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);
-        assertEquals(2, pr3.getParentParagraph().getIndentLevel());
-        assertEquals("Level 3", pr3.getParentParagraph().getText());
-        assertEquals("Calibri", pr3.getFontFamily());
-        assertEquals(24.0, pr3.getFontSize(), 0);
-        assertEquals(90.0, pr3.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2022", pr3.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr3.getParentParagraph().getBulletFont());
-
-        XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);
-        assertEquals(3, pr4.getParentParagraph().getIndentLevel());
-        assertEquals("Level 4", pr4.getParentParagraph().getText());
-        assertEquals("Calibri", pr4.getFontFamily());
-        assertEquals(20.0, pr4.getFontSize(), 0);
-        assertEquals(126.0, pr4.getParentParagraph().getLeftMargin(), 0);
-        assertEquals("\u2013", pr4.getParentParagraph().getBulletCharacter());
-        assertEquals("Arial", pr4.getParentParagraph().getBulletFont());
-
-        XSLFTextShape shape3 = (XSLFTextShape)shapes.get(2);
-        assertEquals(VerticalAlignment.TOP, shape3.getVerticalAlignment());
-        assertEquals("Content with caption", shape3.getText());
-
-        pr1 = shape3.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(0, pr1.getParentParagraph().getIndentLevel());
-        assertEquals("Content with caption", pr1.getRawText());
-        assertEquals("Calibri", pr1.getFontFamily());
-        assertEquals(14.0, pr1.getFontSize(), 0);
-
-    }
-
-    void verifySlide10(XSLFSlide slide){
-        XSLFTextShape footer = (XSLFTextShape)slide.getPlaceholderByType(STPlaceholderType.INT_FTR);
-
-        // now check text properties
-        assertEquals("Apache Software Foundation", footer.getText());
-        assertEquals(VerticalAlignment.MIDDLE, footer.getVerticalAlignment());
-
-        XSLFTextRun r1 = footer.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(TextAlign.CENTER, r1.getParentParagraph().getTextAlign());
-        assertEquals("Calibri", r1.getFontFamily());
-        assertEquals(12.0, r1.getFontSize(), 0);
-        // TODO calculation of tint is incorrect
-        assertTrue(sameColor(new Color(64,64,64), r1.getFontColor()));
-
-        XSLFTextShape dt = (XSLFTextShape)slide.getPlaceholderByType(STPlaceholderType.INT_DT);
-        assertEquals("Friday, October 21, 2011", dt.getText());
-
-        XSLFTextShape sldNum = (XSLFTextShape)slide.getPlaceholderByType(STPlaceholderType.INT_SLD_NUM);
-        assertEquals("10", sldNum.getText());
-    }
-
-    @Test
-    public void testTitleStyles() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XSLFSlideMaster master = ppt.getSlideMasters().get(0);
-        XSLFTheme theme = master.getTheme();
-        XSLFSlideLayout layout = master.getLayout(SlideLayout.TITLE);
-        XSLFSlide slide = ppt.createSlide(layout) ;
-        assertSame(layout, slide.getSlideLayout());
-        assertSame(master, slide.getSlideMaster());
-
-        XSLFTextShape titleShape = slide.getPlaceholder(0);
-        titleShape.setText("Apache POI");
-        XSLFTextParagraph paragraph = titleShape.getTextParagraphs().get(0);
-        XSLFTextRun textRun = paragraph.getTextRuns().get(0);
-
-        // level 1 : default title style on the master slide
-        // /p:sldMaster/p:txStyles/p:titleStyle/a:lvl1pPr
-        CTTextParagraphProperties lv1PPr = master.getXmlObject().getTxStyles().getTitleStyle().getLvl1PPr();
-        CTTextCharacterProperties lv1CPr = lv1PPr.getDefRPr();
-        assertEquals(4400, lv1CPr.getSz());
-        assertEquals(44.0, textRun.getFontSize(), 0);
-        assertEquals("+mj-lt", lv1CPr.getLatin().getTypeface());
-        assertEquals("Calibri", theme.getMajorFont());
-        assertEquals("Calibri", textRun.getFontFamily());
-        lv1CPr.setSz(3200);
-        assertEquals(32.0, textRun.getFontSize(), 0);
-        lv1CPr.getLatin().setTypeface("Arial");
-        assertEquals("Arial", textRun.getFontFamily());
-        assertEquals(STTextAlignType.CTR, lv1PPr.getAlgn());
-        assertEquals(TextAlign.CENTER, paragraph.getTextAlign());
-        lv1PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, paragraph.getTextAlign());
-
-        // level 2: title placeholder on the master slide
-        // /p:sldMaster/p:cSld/p:spTree/p:sp/p:nvPr/p:ph[@type="title"]
-        XSLFTextShape tx2 = master.getPlaceholder(0);
-        CTTextParagraphProperties lv2PPr = tx2.getTextBody(true).getLstStyle().addNewLvl1PPr();
-        CTTextCharacterProperties lv2CPr = lv2PPr.addNewDefRPr();
-        lv2CPr.setSz(3300);
-        assertEquals(33.0, textRun.getFontSize(), 0);
-        lv2CPr.addNewLatin().setTypeface("Times");
-        assertEquals("Times", textRun.getFontFamily());
-        lv2PPr.setAlgn(STTextAlignType.R);
-        assertEquals(TextAlign.RIGHT, paragraph.getTextAlign());
-
-
-        // level 3: title placeholder on the slide layout
-        // /p:sldLayout /p:cSld/p:spTree/p:sp/p:nvPr/p:ph[@type="ctrTitle"]
-        XSLFTextShape tx3 = layout.getPlaceholder(0);
-        CTTextParagraphProperties lv3PPr = tx3.getTextBody(true).getLstStyle().addNewLvl1PPr();
-        CTTextCharacterProperties lv3CPr = lv3PPr.addNewDefRPr();
-        lv3CPr.setSz(3400);
-        assertEquals(34.0, textRun.getFontSize(), 0);
-        lv3CPr.addNewLatin().setTypeface("Courier New");
-        assertEquals("Courier New", textRun.getFontFamily());
-        lv3PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, paragraph.getTextAlign());
-
-        // level 4: default text properties in the shape itself
-        // ./p:sp/p:txBody/a:lstStyle/a:lvl1pPr
-        CTTextParagraphProperties lv4PPr = titleShape.getTextBody(true).getLstStyle().addNewLvl1PPr();
-        CTTextCharacterProperties lv4CPr = lv4PPr.addNewDefRPr();
-        lv4CPr.setSz(3500);
-        assertEquals(35.0, textRun.getFontSize(), 0);
-        lv4CPr.addNewLatin().setTypeface("Arial");
-        assertEquals("Arial", textRun.getFontFamily());
-        lv4PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, paragraph.getTextAlign());
-
-        // level 5: text properties are defined in the text run
-        CTTextParagraphProperties lv5PPr = paragraph.getXmlObject().addNewPPr();
-        CTTextCharacterProperties lv5CPr = textRun.getXmlObject().getRPr();
-        lv5CPr.setSz(3600);
-        assertEquals(36.0, textRun.getFontSize(), 0);
-        lv5CPr.addNewLatin().setTypeface("Calibri");
-        assertEquals("Calibri", textRun.getFontFamily());
-        lv5PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, paragraph.getTextAlign());
-        
-        ppt.close();
-    }
-
-    @Test
-    public void testBodyStyles() throws IOException {
-        XMLSlideShow ppt = new XMLSlideShow();
-
-        XSLFSlideMaster master = ppt.getSlideMasters().get(0);
-        XSLFTheme theme = master.getTheme();
-        XSLFSlideLayout layout = master.getLayout(SlideLayout.TITLE_AND_CONTENT);
-        XSLFSlide slide = ppt.createSlide(layout) ;
-        assertSame(layout, slide.getSlideLayout());
-        assertSame(master, slide.getSlideMaster());
-
-        XSLFTextShape tx1 = slide.getPlaceholder(1);
-        tx1.clearText();
-
-        XSLFTextParagraph p1 = tx1.addNewTextParagraph();
-        assertEquals(0, p1.getIndentLevel());
-        XSLFTextRun r1 = p1.addNewTextRun();
-        r1.setText("Apache POI");
-
-        XSLFTextParagraph p2 = tx1.addNewTextParagraph();
-        p2.setIndentLevel(1);
-        assertEquals(1, p2.getIndentLevel());
-        XSLFTextRun r2 = p2.addNewTextRun();
-        r2.setText("HSLF");
-
-        XSLFTextParagraph p3 = tx1.addNewTextParagraph();
-        p3.setIndentLevel(2);
-        assertEquals(2, p3.getIndentLevel());
-        XSLFTextRun r3 = p3.addNewTextRun();
-        r3.setText("XSLF");
-
-        // level 1 : default title style on the master slide
-        // /p:sldMaster/p:txStyles/p:bodyStyle/a:lvl1pPr
-        CTTextParagraphProperties lv1PPr = master.getXmlObject().getTxStyles().getBodyStyle().getLvl1PPr();
-        CTTextCharacterProperties lv1CPr = lv1PPr.getDefRPr();
-        CTTextParagraphProperties lv2PPr = master.getXmlObject().getTxStyles().getBodyStyle().getLvl2PPr();
-        CTTextCharacterProperties lv2CPr = lv2PPr.getDefRPr();
-        CTTextParagraphProperties lv3PPr = master.getXmlObject().getTxStyles().getBodyStyle().getLvl3PPr();
-        CTTextCharacterProperties lv3CPr = lv3PPr.getDefRPr();
-        // lv1
-        assertEquals(3200, lv1CPr.getSz());
-        assertEquals(32.0, r1.getFontSize(), 0);
-        assertEquals("+mn-lt", lv1CPr.getLatin().getTypeface());
-        assertEquals("Calibri", theme.getMinorFont());
-        assertEquals("Calibri", r1.getFontFamily());
-        lv1CPr.setSz(3300);
-        assertEquals(33.0, r1.getFontSize(), 0);
-        lv1CPr.getLatin().setTypeface("Arial");
-        assertEquals("Arial", r1.getFontFamily());
-        assertEquals(STTextAlignType.L, lv1PPr.getAlgn());
-        assertEquals(TextAlign.LEFT, p1.getTextAlign());
-        lv1PPr.setAlgn(STTextAlignType.R);
-        assertEquals(TextAlign.RIGHT, p1.getTextAlign());
-        //lv2
-        assertEquals(2800, lv2CPr.getSz());
-        assertEquals(28.0, r2.getFontSize(), 0);
-        lv2CPr.setSz(3300);
-        assertEquals(33.0, r2.getFontSize(), 0);
-        lv2CPr.getLatin().setTypeface("Times");
-        assertEquals("Times", r2.getFontFamily());
-        assertEquals(STTextAlignType.L, lv2PPr.getAlgn());
-        assertEquals(TextAlign.LEFT, p2.getTextAlign());
-        lv2PPr.setAlgn(STTextAlignType.R);
-        assertEquals(TextAlign.RIGHT, p2.getTextAlign());
-        //lv3
-        assertEquals(2400, lv3CPr.getSz());
-        assertEquals(24.0, r3.getFontSize(), 0);
-        lv3CPr.setSz(2500);
-        assertEquals(25.0, r3.getFontSize(), 0);
-        lv3CPr.getLatin().setTypeface("Courier New");
-        assertEquals("Courier New", r3.getFontFamily());
-        assertEquals(STTextAlignType.L, lv3PPr.getAlgn());
-        assertEquals(TextAlign.LEFT, p3.getTextAlign());
-        lv3PPr.setAlgn(STTextAlignType.R);
-        assertEquals(TextAlign.RIGHT, p3.getTextAlign());
-
-
-        // level 2: body placeholder on the master slide
-        // /p:sldMaster/p:cSld/p:spTree/p:sp/p:nvPr/p:ph[@type="body"]
-        XSLFTextShape tx2 = master.getPlaceholder(1);
-        assertEquals(Placeholder.BODY, tx2.getTextType());
-
-        lv1PPr = tx2.getTextBody(true).getLstStyle().addNewLvl1PPr();
-        lv1CPr = lv1PPr.addNewDefRPr();
-        lv2PPr = tx2.getTextBody(true).getLstStyle().addNewLvl2PPr();
-        lv2CPr = lv2PPr.addNewDefRPr();
-        lv3PPr = tx2.getTextBody(true).getLstStyle().addNewLvl3PPr();
-        lv3CPr = lv3PPr.addNewDefRPr();
-
-        lv1CPr.setSz(3300);
-        assertEquals(33.0, r1.getFontSize(), 0);
-        lv1CPr.addNewLatin().setTypeface("Times");
-        assertEquals("Times", r1.getFontFamily());
-        lv1PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, p1.getTextAlign());
-
-        lv2CPr.setSz(3300);
-        assertEquals(33.0, r2.getFontSize(), 0);
-        lv2CPr.addNewLatin().setTypeface("Times");
-        assertEquals("Times", r2.getFontFamily());
-        lv2PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, p2.getTextAlign());
-
-        lv3CPr.setSz(3300);
-        assertEquals(33.0, r3.getFontSize(), 0);
-        lv3CPr.addNewLatin().setTypeface("Times");
-        assertEquals("Times", r3.getFontFamily());
-        lv3PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, p3.getTextAlign());
-
-        // level 3: body placeholder on the slide layout
-        // /p:sldLayout /p:cSld/p:spTree/p:sp/p:nvPr/p:ph[@type="ctrTitle"]
-        XSLFTextShape tx3 = layout.getPlaceholder(1);
-        assertEquals(Placeholder.BODY, tx2.getTextType());
-        lv1PPr = tx3.getTextBody(true).getLstStyle().addNewLvl1PPr();
-        lv1CPr = lv1PPr.addNewDefRPr();
-        lv2PPr = tx3.getTextBody(true).getLstStyle().addNewLvl2PPr();
-        lv2CPr = lv2PPr.addNewDefRPr();
-        lv3PPr = tx3.getTextBody(true).getLstStyle().addNewLvl3PPr();
-        lv3CPr = lv3PPr.addNewDefRPr();
-
-        lv1CPr.setSz(3400);
-        assertEquals(34.0, r1.getFontSize(), 0);
-        lv1CPr.addNewLatin().setTypeface("Courier New");
-        assertEquals("Courier New", r1.getFontFamily());
-        lv1PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, p1.getTextAlign());
-
-        lv2CPr.setSz(3400);
-        assertEquals(34.0, r2.getFontSize(), 0);
-        lv2CPr.addNewLatin().setTypeface("Courier New");
-        assertEquals("Courier New", r2.getFontFamily());
-        lv2PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, p2.getTextAlign());
-
-        lv3CPr.setSz(3400);
-        assertEquals(34.0, r3.getFontSize(), 0);
-        lv3CPr.addNewLatin().setTypeface("Courier New");
-        assertEquals("Courier New", r3.getFontFamily());
-        lv3PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, p3.getTextAlign());
-
-        // level 4: default text properties in the shape itself
-        // ./p:sp/p:txBody/a:lstStyle/a:lvl1pPr
-        lv1PPr = tx1.getTextBody(true).getLstStyle().addNewLvl1PPr();
-        lv1CPr = lv1PPr.addNewDefRPr();
-        lv2PPr = tx1.getTextBody(true).getLstStyle().addNewLvl2PPr();
-        lv2CPr = lv2PPr.addNewDefRPr();
-        lv3PPr = tx1.getTextBody(true).getLstStyle().addNewLvl3PPr();
-        lv3CPr = lv3PPr.addNewDefRPr();
-
-        lv1CPr.setSz(3500);
-        assertEquals(35.0, r1.getFontSize(), 0);
-        lv1CPr.addNewLatin().setTypeface("Arial");
-        assertEquals("Arial", r1.getFontFamily());
-        lv1PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, p1.getTextAlign());
-
-        lv2CPr.setSz(3500);
-        assertEquals(35.0, r2.getFontSize(), 0);
-        lv2CPr.addNewLatin().setTypeface("Arial");
-        assertEquals("Arial", r2.getFontFamily());
-        lv2PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, p2.getTextAlign());
-
-        lv3CPr.setSz(3500);
-        assertEquals(35.0, r3.getFontSize(), 0);
-        lv3CPr.addNewLatin().setTypeface("Arial");
-        assertEquals("Arial", r3.getFontFamily());
-        lv3PPr.setAlgn(STTextAlignType.L);
-        assertEquals(TextAlign.LEFT, p3.getTextAlign());
-
-        // level 5: text properties are defined in the text run
-        lv1PPr = p1.getXmlObject().isSetPPr() ? p1.getXmlObject().getPPr() : p1.getXmlObject().addNewPPr();
-        lv1CPr = r1.getXmlObject().getRPr();
-        lv2PPr = p2.getXmlObject().isSetPPr() ? p2.getXmlObject().getPPr() : p2.getXmlObject().addNewPPr();
-        lv2CPr = r2.getXmlObject().getRPr();
-        lv3PPr = p3.getXmlObject().isSetPPr() ? p3.getXmlObject().getPPr() : p3.getXmlObject().addNewPPr();
-        lv3CPr = r3.getXmlObject().getRPr();
-
-        lv1CPr.setSz(3600);
-        assertEquals(36.0, r1.getFontSize(), 0);
-        lv1CPr.addNewLatin().setTypeface("Calibri");
-        assertEquals("Calibri", r1.getFontFamily());
-        lv1PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, p1.getTextAlign());
-
-        lv2CPr.setSz(3600);
-        assertEquals(36.0, r2.getFontSize(), 0);
-        lv2CPr.addNewLatin().setTypeface("Calibri");
-        assertEquals("Calibri", r2.getFontFamily());
-        lv2PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, p2.getTextAlign());
-
-        lv3CPr.setSz(3600);
-        assertEquals(36.0, r3.getFontSize(), 0);
-        lv3CPr.addNewLatin().setTypeface("Calibri");
-        assertEquals("Calibri", r3.getFontFamily());
-        lv3PPr.setAlgn(STTextAlignType.CTR);
-        assertEquals(TextAlign.CENTER, p3.getTextAlign());
-        
-        ppt.close();
-    }
-    
-    @Test
-    public void metroBlob() throws IOException {
-        File f = POIDataSamples.getSlideShowInstance().getFile("bug52297.ppt");
-        SlideShow<?,?> ppt = SlideShowFactory.create(f);
-        HSLFTextShape sh = (HSLFTextShape)ppt.getSlides().get(1).getShapes().get(3);
-        XSLFAutoShape xsh = (XSLFAutoShape)sh.getMetroShape();
-        String textExp = " ___ ___ ___ ________ __  _______ ___  ___________  __________ __ _____ ___ ___ ___ _______ ____ ______ ___________  _____________ ___ _______ ______  ____ ______ __ ___________  __________ ___ _________  _____ ________ __________  ___ _______ __________ ";
-        String textAct = xsh.getText();
-        ppt.close();
-        assertEquals(textExp, textAct);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java b/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
deleted file mode 100644
index 912ecc0..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xslf.usermodel;
-
-import static org.apache.poi.sl.TestCommonSL.sameColor;
-import static org.junit.Assert.*;
-
-import java.awt.Color;
-import java.util.List;
-
-import org.apache.poi.sl.usermodel.*;
-import org.apache.poi.sl.usermodel.PaintStyle.GradientPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.TexturePaint;
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
-
-/**
- * test reading properties from a multi-theme and multi-master document
- *
- * @author Yegor Kozlov
- */
-public class TestXSLFTheme {
-    @Test
-    public void testRead(){
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("themes.pptx");
-        List<XSLFSlide> slides = ppt.getSlides();
-
-        slide1(slides.get(0));
-        slide2(slides.get(1));
-        slide3(slides.get(2));
-        slide4(slides.get(3));
-        slide5(slides.get(4));
-        slide6(slides.get(5));
-        slide7(slides.get(6));
-        slide8(slides.get(7));
-        slide9(slides.get(8));
-        slide10(slides.get(9));
-    }
-
-    private XSLFShape getShape(XSLFSheet sheet, String name){
-        for(XSLFShape sh : sheet.getShapes()){
-            if(sh.getShapeName().equals(name)) return sh;
-        }
-        throw new IllegalArgumentException("Shape not found: " + name);
-    }
-
-    void slide1(XSLFSlide slide){
-        assertEquals(Color.WHITE, slide.getBackground().getFillColor());
-
-        XSLFTheme theme = slide.getTheme();
-        assertEquals("Office Theme", theme.getName());
-
-        XSLFTextShape sh1 = (XSLFTextShape)getShape(slide, "Rectangle 3");
-        XSLFTextRun run1 = sh1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(Color.white, run1.getFontColor()));
-        assertEquals(new Color(79, 129, 189), sh1.getFillColor());
-        assertTrue(sh1.getFillStyle().getPaint() instanceof SolidPaint) ;   // solid fill
-
-    }
-
-    void slide2(XSLFSlide slide){
-        // Background 2, darker 10%
-        // YK: PPT shows slightly different color: new Color(221, 217, 195)
-        assertEquals(new Color(221, 217, 195), slide.getBackground().getFillColor());
-    }
-
-    void slide3(XSLFSlide slide){
-        PaintStyle fs = slide.getBackground().getFillStyle().getPaint();
-        assertTrue(fs instanceof GradientPaint);
-    }
-
-    void slide4(XSLFSlide slide){
-        PaintStyle fs = slide.getBackground().getFillStyle().getPaint();
-        assertTrue(fs instanceof GradientPaint);
-
-        XSLFTextShape sh1 = (XSLFTextShape)getShape(slide, "Rectangle 4");
-        XSLFTextRun run1 = sh1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(Color.white, run1.getFontColor()));
-        assertEquals(new Color(148, 198, 0), sh1.getFillColor());
-        assertTrue(sh1.getFillStyle().getPaint() instanceof SolidPaint) ;   // solid fill
-
-        XSLFTextShape sh2 = (XSLFTextShape)getShape(slide, "Title 3");
-        XSLFTextRun run2 = sh2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(new Color(148, 198, 0), run2.getFontColor()));
-        assertNull(sh2.getFillColor());  // no fill
-
-        assertFalse(slide.getSlideLayout().getFollowMasterGraphics());
-    }
-
-    void slide5(XSLFSlide slide){
-        PaintStyle fs = slide.getBackground().getFillStyle().getPaint();
-        assertTrue(fs instanceof TexturePaint);
-
-        XSLFTextShape sh2 = (XSLFTextShape)getShape(slide, "Title 1");
-        XSLFTextRun run2 = sh2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(new Color(148, 198, 0), run2.getFontColor()));
-        assertNull(sh2.getFillColor());  // no fill
-        // font size is 40pt and scale factor is 90%
-        assertEquals(36.0, run2.getFontSize(), 0);
-
-        assertFalse(slide.getSlideLayout().getFollowMasterGraphics());
-    }
-
-    void slide6(XSLFSlide slide){
-
-        XSLFTextShape sh1 = (XSLFTextShape)getShape(slide, "Subtitle 3");
-        XSLFTextRun run1 = sh1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(new Color(66, 66, 66), run1.getFontColor()));
-        assertNull(sh1.getFillColor());  // no fill
-
-        XSLFTextShape sh2 = (XSLFTextShape)getShape(slide, "Title 2");
-        XSLFTextRun run2 = sh2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(new Color(148, 198, 0), run2.getFontColor()));
-        assertNull(sh2.getFillColor());  // no fill
-
-        assertFalse(slide.getSlideLayout().getFollowMasterGraphics());
-    }
-
-    void slide7(XSLFSlide slide){
-
-        //YK: PPT reports a slightly different color: r=189,g=239,b=87
-        assertEquals(new Color(189, 239, 87), slide.getBackground().getFillColor());
-
-        assertFalse(slide.getFollowMasterGraphics());
-    }
-
-    void slide8(XSLFSlide slide){
-        PaintStyle fs = slide.getBackground().getFillStyle().getPaint();
-        assertTrue(fs instanceof TexturePaint);
-    }
-
-    void slide9(XSLFSlide slide){
-        PaintStyle fs = slide.getBackground().getFillStyle().getPaint();
-        assertTrue(fs instanceof TexturePaint);
-    }
-
-    void slide10(XSLFSlide slide){
-        PaintStyle fs = slide.getBackground().getFillStyle().getPaint();
-        assertTrue(fs instanceof GradientPaint);
-
-        XSLFTextShape sh1 = (XSLFTextShape)getShape(slide, "Title 3");
-        XSLFTextRun run1 = sh1.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(Color.white, run1.getFontColor()));
-        assertNull(sh1.getFillColor());  // no fill
-
-        XSLFTextShape sh2 = (XSLFTextShape)getShape(slide, "Subtitle 4");
-        XSLFTextRun run2 = sh2.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertTrue(sameColor(Color.white, run2.getFontColor()));
-        assertNull(sh2.getFillColor());  // no fill
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java
deleted file mode 100644
index c6e2f7e..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf;
-
-import org.apache.poi.ss.format.TestCellFormatPart;
-import org.apache.poi.xssf.eventusermodel.TestXSSFReader;
-import org.apache.poi.xssf.extractor.TestXSSFExcelExtractor;
-import org.apache.poi.xssf.io.TestLoadSaveXSSF;
-import org.apache.poi.xssf.model.TestCommentsTable;
-import org.apache.poi.xssf.model.TestSharedStringsTable;
-import org.apache.poi.xssf.usermodel.AllXSSFUsermodelTests;
-import org.apache.poi.xssf.util.TestCTColComparator;
-import org.apache.poi.xssf.util.TestNumericRanges;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-
-/**
- * Collects all tests for <tt>org.apache.poi.xssf</tt> and sub-packages.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    AllXSSFUsermodelTests.class,
-    TestXSSFReader.class,
-    TestXSSFExcelExtractor.class,
-    TestLoadSaveXSSF.class,
-    TestCommentsTable.class,
-    TestSharedStringsTable.class,
-    //TestStylesTable.class, //converted to junit4
-    //TestCellReference.class, //converted to junit4
-    TestCTColComparator.class,
-    TestNumericRanges.class,       
-    TestCellFormatPart.class,
-    TestXSSFCloneSheet.class
-})
-public final class AllXSSFTests {
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
deleted file mode 100644
index 4f2eb40..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * @author Yegor Kozlov
- */
-public final class SXSSFITestDataProvider implements ITestDataProvider {
-    public static final SXSSFITestDataProvider instance = new SXSSFITestDataProvider();
-
-    // an instance of all SXSSFWorkbooks opened by this TestDataProvider,
-    // so that the temporary files created can be disposed up by cleanup() 
-    private final Collection<SXSSFWorkbook> instances = new ArrayList<SXSSFWorkbook>();
-
-    private SXSSFITestDataProvider() {
-        // enforce singleton
-    }
-
-    @Override
-    public Workbook openSampleWorkbook(String sampleFileName) {
-        XSSFWorkbook xssfWorkbook = XSSFITestDataProvider.instance.openSampleWorkbook(sampleFileName);
-        SXSSFWorkbook swb = new SXSSFWorkbook(xssfWorkbook);
-        instances.add(swb);
-        return swb;
-    }
-
-    /**
-     * Returns an XSSFWorkbook since SXSSFWorkbook is write-only
-     */
-    @Override
-    public XSSFWorkbook writeOutAndReadBack(Workbook wb) {
-        if(!(wb instanceof SXSSFWorkbook)) {
-            throw new IllegalArgumentException("Expected an instance of SXSSFWorkbook");
-        }
-
-        XSSFWorkbook result;
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream(8192);
-            wb.write(baos);
-            InputStream is = new ByteArrayInputStream(baos.toByteArray());
-            result = new XSSFWorkbook(is);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return result;
-    }
-
-    @Override
-    public SXSSFWorkbook createWorkbook() {
-        SXSSFWorkbook wb = new SXSSFWorkbook();
-        instances.add(wb);
-        return wb;
-    }
-    
-    //************ SXSSF-specific methods ***************//
-    @Override
-    public SXSSFWorkbook createWorkbook(int rowAccessWindowSize) {
-        SXSSFWorkbook wb = new SXSSFWorkbook(rowAccessWindowSize);
-        instances.add(wb);
-        return wb;
-    }
-    
-    @Override
-    public void trackAllColumnsForAutosizing(Sheet sheet) {
-        ((SXSSFSheet)sheet).trackAllColumnsForAutoSizing();
-    }
-    //************ End SXSSF-specific methods ***************//
-    
-    @Override
-    public FormulaEvaluator createFormulaEvaluator(Workbook wb) {
-        return new XSSFFormulaEvaluator(((SXSSFWorkbook) wb).getXSSFWorkbook());
-    }
-
-    @Override
-    public byte[] getTestDataFileContent(String fileName) {
-        return POIDataSamples.getSpreadSheetInstance().readFile(fileName);
-    }
-
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion() {
-        return SpreadsheetVersion.EXCEL2007;
-    }
-
-    @Override
-    public String getStandardFileNameExtension() {
-        return "xlsx";
-    }
-
-    public synchronized boolean cleanup() {
-        boolean ok = true;
-        for(final SXSSFWorkbook wb : instances) {
-            ok = ok && wb.dispose();
-        }
-        instances.clear();
-        return ok;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
deleted file mode 100644
index 9e12609..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public class TestSheetProtection extends TestCase {
-	private XSSFSheet sheet;
-	
-	@Override
-	protected void setUp() throws Exception {
-		XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_not_protected.xlsx");
-		sheet = workbook.getSheetAt(0);
-	}
-	
-	public void testShouldReadWorkbookProtection() throws Exception {
-		assertFalse(sheet.isAutoFilterLocked());
-		assertFalse(sheet.isDeleteColumnsLocked());
-		assertFalse(sheet.isDeleteRowsLocked());
-		assertFalse(sheet.isFormatCellsLocked());
-		assertFalse(sheet.isFormatColumnsLocked());
-		assertFalse(sheet.isFormatRowsLocked());
-		assertFalse(sheet.isInsertColumnsLocked());
-		assertFalse(sheet.isInsertHyperlinksLocked());
-		assertFalse(sheet.isInsertRowsLocked());
-		assertFalse(sheet.isPivotTablesLocked());
-		assertFalse(sheet.isSortLocked());
-		assertFalse(sheet.isObjectsLocked());
-		assertFalse(sheet.isScenariosLocked());
-		assertFalse(sheet.isSelectLockedCellsLocked());
-		assertFalse(sheet.isSelectUnlockedCellsLocked());
-		assertFalse(sheet.isSheetLocked());
-
-		sheet = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_allLocked.xlsx").getSheetAt(0);
-
-		assertTrue(sheet.isAutoFilterLocked());
-		assertTrue(sheet.isDeleteColumnsLocked());
-		assertTrue(sheet.isDeleteRowsLocked());
-		assertTrue(sheet.isFormatCellsLocked());
-		assertTrue(sheet.isFormatColumnsLocked());
-		assertTrue(sheet.isFormatRowsLocked());
-		assertTrue(sheet.isInsertColumnsLocked());
-		assertTrue(sheet.isInsertHyperlinksLocked());
-		assertTrue(sheet.isInsertRowsLocked());
-		assertTrue(sheet.isPivotTablesLocked());
-		assertTrue(sheet.isSortLocked());
-		assertTrue(sheet.isObjectsLocked());
-		assertTrue(sheet.isScenariosLocked());
-		assertTrue(sheet.isSelectLockedCellsLocked());
-		assertTrue(sheet.isSelectUnlockedCellsLocked());
-		assertTrue(sheet.isSheetLocked());
-	}
-	
-	public void testWriteAutoFilter() throws Exception {
-		assertFalse(sheet.isAutoFilterLocked());
-		sheet.lockAutoFilter(true);
-		assertFalse(sheet.isAutoFilterLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isAutoFilterLocked());
-		sheet.lockAutoFilter(false);
-		assertFalse(sheet.isAutoFilterLocked());
-	}
-	
-	public void testWriteDeleteColumns() throws Exception {
-		assertFalse(sheet.isDeleteColumnsLocked());
-		sheet.lockDeleteColumns(true);
-		assertFalse(sheet.isDeleteColumnsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isDeleteColumnsLocked());
-		sheet.lockDeleteColumns(false);
-		assertFalse(sheet.isDeleteColumnsLocked());
-	}
-	
-	public void testWriteDeleteRows() throws Exception {
-		assertFalse(sheet.isDeleteRowsLocked());
-		sheet.lockDeleteRows(true);
-		assertFalse(sheet.isDeleteRowsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isDeleteRowsLocked());
-        sheet.lockDeleteRows(false);
-        assertFalse(sheet.isDeleteRowsLocked());
-	}
-	
-	public void testWriteFormatCells() throws Exception {
-		assertFalse(sheet.isFormatCellsLocked());
-		sheet.lockFormatCells(true);
-		assertFalse(sheet.isFormatCellsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isFormatCellsLocked());
-        sheet.lockFormatCells(false);
-        assertFalse(sheet.isFormatCellsLocked());
-	}
-	
-	public void testWriteFormatColumns() throws Exception {
-		assertFalse(sheet.isFormatColumnsLocked());
-		sheet.lockFormatColumns(true);
-		assertFalse(sheet.isFormatColumnsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isFormatColumnsLocked());
-        sheet.lockFormatColumns(false);
-        assertFalse(sheet.isFormatColumnsLocked());
-	}
-	
-	public void testWriteFormatRows() throws Exception {
-		assertFalse(sheet.isFormatRowsLocked());
-		sheet.lockFormatRows(true);
-		assertFalse(sheet.isFormatRowsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isFormatRowsLocked());
-        sheet.lockFormatRows(false);
-        assertFalse(sheet.isFormatRowsLocked());
-	}
-	
-	public void testWriteInsertColumns() throws Exception {
-		assertFalse(sheet.isInsertColumnsLocked());
-		sheet.lockInsertColumns(true);
-		assertFalse(sheet.isInsertColumnsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isInsertColumnsLocked());
-        sheet.lockInsertColumns(false);
-        assertFalse(sheet.isInsertColumnsLocked());
-	}
-	
-	public void testWriteInsertHyperlinks() throws Exception {
-		assertFalse(sheet.isInsertHyperlinksLocked());
-		sheet.lockInsertHyperlinks(true);
-		assertFalse(sheet.isInsertHyperlinksLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isInsertHyperlinksLocked());
-        sheet.lockInsertHyperlinks(false);
-        assertFalse(sheet.isInsertHyperlinksLocked());
-	}
-	
-	public void testWriteInsertRows() throws Exception {
-		assertFalse(sheet.isInsertRowsLocked());
-		sheet.lockInsertRows(true);
-		assertFalse(sheet.isInsertRowsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isInsertRowsLocked());
-        sheet.lockInsertRows(false);
-        assertFalse(sheet.isInsertRowsLocked());
-	}
-	
-	public void testWritePivotTables() throws Exception {
-		assertFalse(sheet.isPivotTablesLocked());
-		sheet.lockPivotTables(true);
-		assertFalse(sheet.isPivotTablesLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isPivotTablesLocked());
-        sheet.lockPivotTables(false);
-        assertFalse(sheet.isPivotTablesLocked());
-	}
-	
-	public void testWriteSort() throws Exception {
-		assertFalse(sheet.isSortLocked());
-		sheet.lockSort(true);
-		assertFalse(sheet.isSortLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isSortLocked());
-        sheet.lockSort(false);
-        assertFalse(sheet.isSortLocked());
-	}
-	
-	public void testWriteObjects() throws Exception {
-		assertFalse(sheet.isObjectsLocked());
-		sheet.lockObjects(true);
-		assertFalse(sheet.isObjectsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isObjectsLocked());
-        sheet.lockObjects(false);
-        assertFalse(sheet.isObjectsLocked());
-	}
-	
-	public void testWriteScenarios() throws Exception {
-		assertFalse(sheet.isScenariosLocked());
-		sheet.lockScenarios(true);
-		assertFalse(sheet.isScenariosLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isScenariosLocked());
-        sheet.lockScenarios(false);
-        assertFalse(sheet.isScenariosLocked());
-	}
-	
-	public void testWriteSelectLockedCells() throws Exception {
-		assertFalse(sheet.isSelectLockedCellsLocked());
-		sheet.lockSelectLockedCells(true);
-		assertFalse(sheet.isSelectLockedCellsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isSelectLockedCellsLocked());
-        sheet.lockSelectLockedCells(false);
-        assertFalse(sheet.isSelectLockedCellsLocked());
-	}
-	
-	public void testWriteSelectUnlockedCells() throws Exception {
-		assertFalse(sheet.isSelectUnlockedCellsLocked());
-		sheet.lockSelectUnlockedCells(true);
-		assertFalse(sheet.isSelectUnlockedCellsLocked());
-		sheet.enableLocking();
-		assertTrue(sheet.isSelectUnlockedCellsLocked());
-        sheet.lockSelectUnlockedCells(false);
-        assertFalse(sheet.isSelectUnlockedCellsLocked());
-	}
-
-	public void testWriteSelectEnableLocking() throws Exception {
-		sheet = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_allLocked.xlsx").getSheetAt(0);
-		
-		assertTrue(sheet.isAutoFilterLocked());
-		assertTrue(sheet.isDeleteColumnsLocked());
-		assertTrue(sheet.isDeleteRowsLocked());
-		assertTrue(sheet.isFormatCellsLocked());
-		assertTrue(sheet.isFormatColumnsLocked());
-		assertTrue(sheet.isFormatRowsLocked());
-		assertTrue(sheet.isInsertColumnsLocked());
-		assertTrue(sheet.isInsertHyperlinksLocked());
-		assertTrue(sheet.isInsertRowsLocked());
-		assertTrue(sheet.isPivotTablesLocked());
-		assertTrue(sheet.isSortLocked());
-		assertTrue(sheet.isObjectsLocked());
-		assertTrue(sheet.isScenariosLocked());
-		assertTrue(sheet.isSelectLockedCellsLocked());
-		assertTrue(sheet.isSelectUnlockedCellsLocked());
-		assertTrue(sheet.isSheetLocked());
-		
-		sheet.disableLocking();
-		
-		assertFalse(sheet.isAutoFilterLocked());
-		assertFalse(sheet.isDeleteColumnsLocked());
-		assertFalse(sheet.isDeleteRowsLocked());
-		assertFalse(sheet.isFormatCellsLocked());
-		assertFalse(sheet.isFormatColumnsLocked());
-		assertFalse(sheet.isFormatRowsLocked());
-		assertFalse(sheet.isInsertColumnsLocked());
-		assertFalse(sheet.isInsertHyperlinksLocked());
-		assertFalse(sheet.isInsertRowsLocked());
-		assertFalse(sheet.isPivotTablesLocked());
-		assertFalse(sheet.isSortLocked());
-		assertFalse(sheet.isObjectsLocked());
-		assertFalse(sheet.isScenariosLocked());
-		assertFalse(sheet.isSelectLockedCellsLocked());
-		assertFalse(sheet.isSelectUnlockedCellsLocked());
-		assertFalse(sheet.isSheetLocked());
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
deleted file mode 100644
index 9c7e935..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf;
-
-import static org.apache.poi.xssf.XSSFTestDataSamples.openSampleWorkbook;
-import static org.apache.poi.xssf.XSSFTestDataSamples.writeOutAndReadBack;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.apache.poi.poifs.crypt.Encryptor;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class TestWorkbookProtection {
-
-    @Test
-    public void workbookAndRevisionPassword() throws Exception {
-        XSSFWorkbook workbook;
-        String password = "test";
-        
-        // validate password with an actual office file (Excel 2010)
-        workbook = openSampleWorkbook("workbookProtection-workbook_password_user_range-2010.xlsx");
-        assertTrue(workbook.validateWorkbookPassword(password));
-
-        // validate with another office file (Excel 2013)
-        workbook = openSampleWorkbook("workbookProtection-workbook_password-2013.xlsx");
-        assertTrue(workbook.validateWorkbookPassword(password));
-
-        
-        workbook = openSampleWorkbook("workbookProtection_not_protected.xlsx");
-
-        // setting a null password shouldn't introduce the protection element
-        workbook.setWorkbookPassword(null, null);
-        assertNull(workbook.getCTWorkbook().getWorkbookProtection());
-
-        // compare the hashes
-        workbook.setWorkbookPassword(password, null);
-        int hashVal = CryptoFunctions.createXorVerifier1(password);
-        int actualVal = Integer.parseInt(workbook.getCTWorkbook().getWorkbookProtection().xgetWorkbookPassword().getStringValue(),16);
-        assertEquals(hashVal, actualVal);
-        assertTrue(workbook.validateWorkbookPassword(password));
-        
-        // removing the password again
-        workbook.setWorkbookPassword(null, null);
-        assertFalse(workbook.getCTWorkbook().getWorkbookProtection().isSetWorkbookPassword());
-        
-        // removing the whole protection structure
-        workbook.unLock();
-        assertNull(workbook.getCTWorkbook().getWorkbookProtection());
-        
-        // setting a null password shouldn't introduce the protection element
-        workbook.setRevisionsPassword(null, null);
-        assertNull(workbook.getCTWorkbook().getWorkbookProtection());
-
-        // compare the hashes
-        password = "T\u0400ST\u0100passwordWhichIsLongerThan15Chars";
-        workbook.setRevisionsPassword(password, null);
-        hashVal = CryptoFunctions.createXorVerifier1(password);
-        actualVal = Integer.parseInt(workbook.getCTWorkbook().getWorkbookProtection().xgetRevisionsPassword().getStringValue(),16);
-        assertEquals(hashVal, actualVal);
-        assertTrue(workbook.validateRevisionsPassword(password));
-    }
-    
-    @Test
-    public void shouldReadWorkbookProtection() throws Exception {
-        XSSFWorkbook workbook = openSampleWorkbook("workbookProtection_not_protected.xlsx");
-        assertFalse(workbook.isStructureLocked());
-        assertFalse(workbook.isWindowsLocked());
-        assertFalse(workbook.isRevisionLocked());
-
-        workbook = openSampleWorkbook("workbookProtection_workbook_structure_protected.xlsx");
-        assertTrue(workbook.isStructureLocked());
-        assertFalse(workbook.isWindowsLocked());
-        assertFalse(workbook.isRevisionLocked());
-
-        workbook = openSampleWorkbook("workbookProtection_workbook_windows_protected.xlsx");
-        assertTrue(workbook.isWindowsLocked());
-        assertFalse(workbook.isStructureLocked());
-        assertFalse(workbook.isRevisionLocked());
-
-        workbook = openSampleWorkbook("workbookProtection_workbook_revision_protected.xlsx");
-        assertTrue(workbook.isRevisionLocked());
-        assertFalse(workbook.isWindowsLocked());
-        assertFalse(workbook.isStructureLocked());
-    }
-
-    @Test
-    public void shouldWriteStructureLock() throws Exception {
-        XSSFWorkbook workbook = openSampleWorkbook("workbookProtection_not_protected.xlsx");
-        assertFalse(workbook.isStructureLocked());
-
-        workbook.lockStructure();
-
-        assertTrue(workbook.isStructureLocked());
-
-        workbook.unLockStructure();
-
-        assertFalse(workbook.isStructureLocked());
-    }
-
-    @Test
-    public void shouldWriteWindowsLock() throws Exception {
-        XSSFWorkbook workbook = openSampleWorkbook("workbookProtection_not_protected.xlsx");
-        assertFalse(workbook.isWindowsLocked());
-
-        workbook.lockWindows();
-
-        assertTrue(workbook.isWindowsLocked());
-
-        workbook.unLockWindows();
-
-        assertFalse(workbook.isWindowsLocked());
-    }
-
-    @Test
-    public void shouldWriteRevisionLock() throws Exception {
-        XSSFWorkbook workbook = openSampleWorkbook("workbookProtection_not_protected.xlsx");
-        assertFalse(workbook.isRevisionLocked());
-
-        workbook.lockRevision();
-
-        assertTrue(workbook.isRevisionLocked());
-
-        workbook.unLockRevision();
-
-        assertFalse(workbook.isRevisionLocked());
-    }
-
-    @SuppressWarnings("resource")
-    @Test
-    public void testHashPassword() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        wb.lockRevision();
-        wb.setRevisionsPassword("test", HashAlgorithm.sha1);
-        
-        wb = writeOutAndReadBack(wb);
-        
-        assertTrue(wb.isRevisionLocked());
-        assertTrue(wb.validateRevisionsPassword("test"));
-    }
-    
-    @SuppressWarnings("resource")
-    @Test
-    public void testIntegration() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        wb.createSheet("Testing purpose sheet");
-        assertFalse(wb.isRevisionLocked());
-
-        wb.lockRevision();
-        wb.setRevisionsPassword("test", null);
-
-        wb = writeOutAndReadBack(wb);
-        
-        assertTrue(wb.isRevisionLocked());
-        assertTrue(wb.validateRevisionsPassword("test"));
-    }
-    
-    @Test
-    public void testEncryptDecrypt() throws Exception {
-        final String password = "abc123";
-        final String sheetName = "TestSheet1";
-        final String cellValue = "customZipEntrySource";
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet1 = workbook.createSheet(sheetName);
-        XSSFRow row1 = sheet1.createRow(1);
-        XSSFCell cell1 = row1.createCell(1);
-        cell1.setCellValue(cellValue);
-        File tf1 = TempFile.createTempFile("poitest", ".xlsx");
-        FileOutputStream fos1 = new FileOutputStream(tf1);
-        workbook.write(fos1);
-        IOUtils.closeQuietly(fos1);
-        POIFSFileSystem poiFileSystem = new POIFSFileSystem();
-        EncryptionInfo encryptionInfo = new EncryptionInfo(EncryptionMode.agile);
-        Encryptor enc = encryptionInfo.getEncryptor();
-        enc.confirmPassword(password);
-        FileInputStream fis = new FileInputStream(tf1);
-        OPCPackage opc = OPCPackage.open(fis);
-        IOUtils.closeQuietly(fis);
-        try {
-            OutputStream os = enc.getDataStream(poiFileSystem);
-            opc.save(os);
-            IOUtils.closeQuietly(os);
-        } finally {
-            IOUtils.closeQuietly(opc);
-        }
-        tf1.delete();
-        FileOutputStream fos2 = new FileOutputStream(tf1);
-        poiFileSystem.writeFilesystem(fos2);
-        IOUtils.closeQuietly(fos2);
-        workbook.close();
-        fis = new FileInputStream(tf1);
-        POIFSFileSystem poiFileSystem2 = new POIFSFileSystem(fis);
-        IOUtils.closeQuietly(fis);
-        EncryptionInfo encryptionInfo2 = new EncryptionInfo(poiFileSystem2);
-        Decryptor decryptor = encryptionInfo2.getDecryptor();
-        decryptor.verifyPassword(password);
-        XSSFWorkbook workbook2 = new XSSFWorkbook(decryptor.getDataStream(poiFileSystem2));
-        workbook2.close();
-        tf1.delete();
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java
deleted file mode 100644
index 91883a3..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.usermodel.BaseTestCloneSheet;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestXSSFCloneSheet  extends BaseTestCloneSheet {
-    public TestXSSFCloneSheet() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    private static final String OTHER_SHEET_NAME = "Another";
-    private static final String VALID_SHEET_NAME = "Sheet01";
-    private XSSFWorkbook wb;
-
-    @Before
-    public void setUp() {
-        wb = new XSSFWorkbook();
-        wb.createSheet(VALID_SHEET_NAME);  
-    }
-
-    @Test
-    public void testCloneSheetIntStringValidName() {
-        XSSFSheet cloned = wb.cloneSheet(0, OTHER_SHEET_NAME);
-        assertEquals(OTHER_SHEET_NAME, cloned.getSheetName());
-        assertEquals(2, wb.getNumberOfSheets());
-    }
-    
-    @Test
-    public void testCloneSheetIntStringInvalidName() {
-        try {
-            wb.cloneSheet(0, VALID_SHEET_NAME);
-            fail("Should fail");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-        assertEquals(1, wb.getNumberOfSheets());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
deleted file mode 100644
index e0ba661..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * @author Yegor Kozlov
- */
-public final class XSSFITestDataProvider implements ITestDataProvider {
-    public static final XSSFITestDataProvider instance = new XSSFITestDataProvider();
-
-    private XSSFITestDataProvider() {
-        // enforce singleton
-    }
-
-    @Override
-    public XSSFWorkbook openSampleWorkbook(String sampleFileName) {
-        return XSSFTestDataSamples.openSampleWorkbook(sampleFileName);
-    }
-
-    @Override
-    public XSSFWorkbook writeOutAndReadBack(Workbook original) {
-        if(!(original instanceof XSSFWorkbook)) {
-            throw new IllegalArgumentException("Expected an instance of XSSFWorkbook, but had " + original.getClass());
-        }
-        return XSSFTestDataSamples.writeOutAndReadBack((XSSFWorkbook)original);
-    }
-
-    @Override
-    public XSSFWorkbook createWorkbook() {
-        return new XSSFWorkbook();
-    }
-    
-    //************ SXSSF-specific methods ***************//
-    @Override
-    public XSSFWorkbook createWorkbook(int rowAccessWindowSize) {
-        return createWorkbook();
-    }
-    
-    @Override
-    public void trackAllColumnsForAutosizing(Sheet sheet) {}
-    //************ End SXSSF-specific methods ***************//
-   
-    @Override
-    public FormulaEvaluator createFormulaEvaluator(Workbook wb) {
-        return new XSSFFormulaEvaluator((XSSFWorkbook) wb);
-    }
-
-    @Override
-    public byte[] getTestDataFileContent(String fileName) {
-        return POIDataSamples.getSpreadSheetInstance().readFile(fileName);
-    }
-
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion(){
-        return SpreadsheetVersion.EXCEL2007;
-    }
-
-    @Override
-    public String getStandardFileNameExtension() {
-        return "xlsx";
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java
deleted file mode 100644
index 68188cb..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Centralises logic for finding/opening sample files in the test-data/spreadsheet folder. 
- * 
- * @author Josh Micich
- */
-public class XSSFTestDataSamples {
-    /**
-     * Used by {@link writeOutAndReadBack(R wb, String testName)}.  If a
-     * value is set for this in the System Properties, the xlsx file
-     * will be written out to that directory.
-     */
-    public static final String TEST_OUTPUT_DIR = "poi.test.xssf.output.dir";
-
-    public static File getSampleFile(String sampleFileName) {
-        return HSSFTestDataSamples.getSampleFile(sampleFileName);
-    }
-    public static OPCPackage openSamplePackage(String sampleName) {
-        try {
-            return OPCPackage.open(HSSFTestDataSamples.openSampleFileStream(sampleName));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-    public static XSSFWorkbook openSampleWorkbook(String sampleName) {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleName);
-        try {
-            return new XSSFWorkbook(is);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    /**
-     * Write out workbook <code>wb</code> to {@link #TEST_OUTPUT_DIR}/testName.xlsx
-     * (or create a temporary file if <code>TEST_OUTPUT_DIR</code> is not defined).
-     *
-     * @param wb the workbook to write
-     * @param testName a fragment of the filename
-     * @return the location where the workbook was saved
-     * @throws IOException
-     */
-    public static <R extends Workbook> File writeOut(R wb, String testName) throws IOException {
-        final String testOutputDir = System.getProperty(TEST_OUTPUT_DIR);
-        final File file;
-        if (testOutputDir != null) {
-            file = new File(testOutputDir, testName + ".xlsx");
-        }
-        else {
-            file = TempFile.createTempFile(testName, ".xlsx");
-        }
-        if (file.exists()) {
-            file.delete();
-        }
-        final OutputStream out = new FileOutputStream(file);
-        try {
-            wb.write(out);
-        } finally {
-            out.close();
-        }
-        return file;
-    }
-    
-    /**
-     * Write out workbook <code>wb</code> to a memory buffer
-     *
-     * @param wb the workbook to write
-     * @return the memory buffer
-     * @throws IOException
-     */
-    public static <R extends Workbook> ByteArrayOutputStream writeOut(R wb) throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream(8192);
-        wb.write(out);
-        return out;
-    }
-    
-    /**
-     * Write out the workbook then closes the workbook. 
-     * This should be used when there is insufficient memory to have
-     * both workbooks open.
-     * 
-     * Make sure there are no references to any objects in the workbook
-     * so that garbage collection may free the workbook.
-     * 
-     * After calling this method, null the reference to <code>wb</code>,
-     * then call {@link #readBack(File)} or {@link #readBackAndDelete(File)} to re-read the file.
-     * 
-     * Alternatively, use {@link #writeOutAndClose(Workbook)} to use a ByteArrayOutputStream/ByteArrayInputStream
-     * to avoid creating a temporary file. However, this may complicate the calling
-     * code to avoid having the workbook, BAOS, and BAIS open at the same time.
-     *
-     * @param wb
-     * @param testName file name to be used to write to a file. This file will be cleaned up by a call to readBack(String)
-     * @return workbook location
-     * @throws RuntimeException if {@link #TEST_OUTPUT_DIR} System property is not set
-     */
-    public static <R extends Workbook> File writeOutAndClose(R wb, String testName) {
-        try {
-            File file = writeOut(wb, testName);
-            // Do not close the workbook if there was a problem writing the workbook
-            wb.close();
-            return file;
-        }
-        catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    
-    /**
-     * Write out workbook <code>wb</code> to a memory buffer,
-     * then close the workbook
-     *
-     * @param wb the workbook to write
-     * @return the memory buffer
-     * @throws IOException
-     */
-    public static <R extends Workbook> ByteArrayOutputStream writeOutAndClose(R wb) {
-        try {
-            ByteArrayOutputStream out = writeOut(wb);
-            // Do not close the workbook if there was a problem writing the workbook
-            wb.close();
-            return out;
-        }
-        catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    /**
-     * Read back a workbook that was written out to a file with
-     * {@link #writeOut(Workbook, String))} or {@link #writeOutAndClose(Workbook, String)}.
-     * Deletes the file after reading back the file.
-     * Does not delete the file if an exception is raised.
-     *
-     * @param file the workbook file to read and delete
-     * @return the read back workbook
-     * @throws IOException
-     */
-    public static XSSFWorkbook readBackAndDelete(File file) throws IOException {
-        XSSFWorkbook wb = readBack(file);
-        // do not delete the file if there's an error--might be helpful for debugging 
-        file.delete();
-        return wb;
-    }
-    
-    /**
-     * Read back a workbook that was written out to a file with
-     * {@link #writeOut(Workbook, String)} or {@link #writeOutAndClose(Workbook, String)}.
-     *
-     * @param file the workbook file to read
-     * @return the read back workbook
-     * @throws IOException
-     */
-    public static XSSFWorkbook readBack(File file) throws IOException {
-        InputStream in = new FileInputStream(file);
-        try {
-            return new XSSFWorkbook(in);
-        }
-        finally {
-            in.close();
-        }
-    }
-    
-    /**
-     * Read back a workbook that was written out to a memory buffer with
-     * {@link #writeOut(Workbook)} or {@link #writeOutAndClose(Workbook)}.
-     *
-     * @param file the workbook file to read
-     * @return the read back workbook
-     * @throws IOException
-     */
-    public static XSSFWorkbook readBack(ByteArrayOutputStream out) throws IOException {
-        InputStream is = new ByteArrayInputStream(out.toByteArray());
-        out.close();
-        try {
-            return new XSSFWorkbook(is);
-        }
-        finally {
-            is.close();
-        }
-    }
-    
-    /**
-     * Write out and read back using a memory buffer to avoid disk I/O.
-     * If there is not enough memory to have two workbooks open at the same time,
-     * consider using:
-     * 
-     * Workbook wb = new XSSFWorkbook();
-     * String testName = "example";
-     * 
-     * <code>
-     * File file = writeOutAndClose(wb, testName);
-     * // clear all references that would prevent the workbook from getting garbage collected
-     * wb = null;
-     * Workbook wbBack = readBackAndDelete(file);
-     * </code>
-     *
-     * @param wb the workbook to write out
-     * @return the read back workbook
-     */
-    public static <R extends Workbook> R writeOutAndReadBack(R wb) {
-        Workbook result;
-        try {
-            result = readBack(writeOut(wb));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        @SuppressWarnings("unchecked")
-        R r = (R) result;
-        return r;
-    }
-    
-    /**
-     * Write out, close, and read back the workbook using a memory buffer to avoid disk I/O.
-     *
-     * @param wb the workbook to write out and close
-     * @return the read back workbook
-     */
-    public static <R extends Workbook> R writeOutCloseAndReadBack(R wb) {
-        Workbook result;
-        try {
-            result = readBack(writeOutAndClose(wb));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        @SuppressWarnings("unchecked")
-        R r = (R) result;
-        return r;
-        
-    }
-    
-    /**
-     * Writes the Workbook either into a file or into a byte array, depending on presence of 
-     * the system property {@value #TEST_OUTPUT_DIR}, and reads it in a new instance of the Workbook back.
-     * If TEST_OUTPUT_DIR is set, the file will NOT be deleted at the end of this function.
-     * @param wb workbook to write
-     * @param testName file name to be used if writing into a file. The old file with the same name will be overridden.
-     * @return new instance read from the stream written by the wb parameter.
-     */
-    
-    public static <R extends Workbook> R writeOutAndReadBack(R wb, String testName) {
-        if (System.getProperty(TEST_OUTPUT_DIR) == null) {
-            return writeOutAndReadBack(wb);
-        } else {
-            try {
-                Workbook result = readBack(writeOut(wb, testName));
-                @SuppressWarnings("unchecked")
-                R r = (R) result;
-                return r;
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
deleted file mode 100644
index ad8470b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.eventusermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * Tests for {@link org.apache.poi.xssf.eventusermodel.XSSFReader}
- */
-public final class TestReadOnlySharedStringsTable extends TestCase {
-    private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
-
-    public void testParse() throws Exception {
-		OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
-        List<PackagePart> parts = pkg.getPartsByName(Pattern.compile("/xl/sharedStrings.xml"));
-        assertEquals(1, parts.size());
-
-        SharedStringsTable stbl = new SharedStringsTable(parts.get(0), null);
-        ReadOnlySharedStringsTable rtbl = new ReadOnlySharedStringsTable(parts.get(0), null);
-
-        assertEquals(stbl.getCount(), rtbl.getCount());
-        assertEquals(stbl.getUniqueCount(), rtbl.getUniqueCount());
-
-        assertEquals(stbl.getItems().size(), stbl.getUniqueCount());
-        assertEquals(rtbl.getItems().size(), rtbl.getUniqueCount());
-        for(int i=0; i < stbl.getUniqueCount(); i++){
-            CTRst i1 = stbl.getEntryAt(i);
-            String i2 = rtbl.getEntryAt(i);
-            assertEquals(i1.getT(), i2);
-        }
-
-	}
-    
-    public void testEmptySSTOnPackageObtainedViaWorkbook() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook(_ssTests.openResourceAsStream("noSharedStringTable.xlsx"));
-        OPCPackage pkg = wb.getPackage();
-        assertEmptySST(pkg);
-        wb.close();
-    }
-    
-    public void testEmptySSTOnPackageDirect() throws Exception {
-        OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("noSharedStringTable.xlsx"));
-        assertEmptySST(pkg);
-    }
-
-    private void assertEmptySST(OPCPackage pkg) throws IOException, SAXException {
-        ReadOnlySharedStringsTable sst = new ReadOnlySharedStringsTable(pkg);
-        assertEquals(0, sst.getCount());
-        assertEquals(0, sst.getUniqueCount());
-        assertNull(sst.getItems()); // same state it's left in if fed a package which has no SST part.
-    }
-    
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
deleted file mode 100644
index 49742dc..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.eventusermodel;
-
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.poi.xssf.usermodel.XSSFSimpleShape;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link XSSFReader}
- */
-public final class TestXSSFReader extends TestCase {
-    private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
-
-    public void testGetBits() throws Exception {
-		OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
-
-		XSSFReader r = new XSSFReader(pkg);
-
-		assertNotNull(r.getWorkbookData());
-		assertNotNull(r.getSharedStringsData());
-		assertNotNull(r.getStylesData());
-
-		assertNotNull(r.getSharedStringsTable());
-		assertNotNull(r.getStylesTable());
-	}
-
-	public void testStyles() throws Exception {
-		OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
-
-		XSSFReader r = new XSSFReader(pkg);
-
-		assertEquals(3, r.getStylesTable().getFonts().size());
-		assertEquals(0, r.getStylesTable().getNumDataFormats());
-		
-		// The Styles Table should have the themes associated with it too
-		assertNotNull(r.getStylesTable().getTheme());
-		
-		// Check we get valid data for the two
-		assertNotNull(r.getStylesData());
-      assertNotNull(r.getThemesData());
-	}
-
-	public void testStrings() throws Exception {
-        OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
-
-		XSSFReader r = new XSSFReader(pkg);
-
-		assertEquals(11, r.getSharedStringsTable().getItems().size());
-		assertEquals("Test spreadsheet", new XSSFRichTextString(r.getSharedStringsTable().getEntryAt(0)).toString());
-	}
-
-	public void testSheets() throws Exception {
-        OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
-
-		XSSFReader r = new XSSFReader(pkg);
-		byte[] data = new byte[4096];
-
-		// By r:id
-		assertNotNull(r.getSheet("rId2"));
-		int read = IOUtils.readFully(r.getSheet("rId2"), data);
-		assertEquals(974, read);
-
-		// All
-		Iterator<InputStream> it = r.getSheetsData();
-
-		int count = 0;
-		while(it.hasNext()) {
-			count++;
-			InputStream inp = it.next();
-			assertNotNull(inp);
-			read = IOUtils.readFully(inp, data);
-			inp.close();
-
-			assertTrue(read > 400);
-			assertTrue(read < 1500);
-		}
-		assertEquals(3, count);
-	}
-
-	/**
-	 * Check that the sheet iterator returns sheets in the logical order
-	 * (as they are defined in the workbook.xml)
-	 */
-	public void testOrderOfSheets() throws Exception {
-        OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("reordered_sheets.xlsx"));
-
-		XSSFReader r = new XSSFReader(pkg);
-
-		String[] sheetNames = {"Sheet4", "Sheet2", "Sheet3", "Sheet1"};
-		XSSFReader.SheetIterator it = (XSSFReader.SheetIterator)r.getSheetsData();
-
-		int count = 0;
-		while(it.hasNext()) {
-			InputStream inp = it.next();
-			assertNotNull(inp);
-			inp.close();
-
-			assertEquals(sheetNames[count], it.getSheetName());
-			count++;
-		}
-		assertEquals(4, count);
-	}
-	
-	public void testComments() throws Exception {
-      OPCPackage pkg =  XSSFTestDataSamples.openSamplePackage("comments.xlsx");
-      XSSFReader r = new XSSFReader(pkg);
-      XSSFReader.SheetIterator it = (XSSFReader.SheetIterator)r.getSheetsData();
-      
-      int count = 0;
-      while(it.hasNext()) {
-         count++;
-         InputStream inp = it.next();
-         inp.close();
-
-         if(count == 1) {
-            assertNotNull(it.getSheetComments());
-            CommentsTable ct = it.getSheetComments();
-            assertEquals(1, ct.getNumberOfAuthors());
-            assertEquals(3, ct.getNumberOfComments());
-         } else {
-            assertNull(it.getSheetComments());
-         }
-      }
-      assertEquals(3, count);
-	}
-   
-   /**
-    * Iterating over a workbook with chart sheets in it, using the
-    *  XSSFReader method
-    * @throws Exception
-    */
-   public void test50119() throws Exception {
-      OPCPackage pkg =  XSSFTestDataSamples.openSamplePackage("WithChartSheet.xlsx");
-      XSSFReader r = new XSSFReader(pkg);
-      XSSFReader.SheetIterator it = (XSSFReader.SheetIterator)r.getSheetsData();
-      
-      while(it.hasNext())
-      {
-          InputStream stream = it.next();
-          stream.close();
-      }
-   }
-
-    /**
-     * Test text extraction from text box using getShapes()
-     *
-     * @throws Exception
-     */
-    public void testShapes() throws Exception {
-        OPCPackage pkg = XSSFTestDataSamples.openSamplePackage("WithTextBox.xlsx");
-        XSSFReader r = new XSSFReader(pkg);
-        XSSFReader.SheetIterator it = (XSSFReader.SheetIterator) r.getSheetsData();
-
-        String text = getShapesString(it);
-        assertTrue(text.contains("Line 1"));
-        assertTrue(text.contains("Line 2"));
-        assertTrue(text.contains("Line 3"));
-    }
-
-    private String getShapesString(XSSFReader.SheetIterator it) {
-        StringBuilder sb = new StringBuilder();
-        while (it.hasNext()) {
-            it.next();
-            List<XSSFShape> shapes = it.getShapes();
-            if (shapes != null) {
-                for (XSSFShape shape : shapes) {
-                    if (shape instanceof XSSFSimpleShape) {
-                        String t = ((XSSFSimpleShape) shape).getText();
-                        sb.append(t).append('\n');
-                    }
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    public void testBug57914() throws Exception {
-        OPCPackage pkg = XSSFTestDataSamples.openSamplePackage("57914.xlsx");
-        final XSSFReader r;
-
-        // for now expect this to fail, when we fix 57699, this one should fail so we know we should adjust
-        // this test as well
-        try {
-            r = new XSSFReader(pkg);
-            fail("This will fail until bug 57699 is fixed");
-        } catch (POIXMLException e) {
-            assertTrue("Had " + e, e.getMessage().contains("57699"));
-            return;
-        }
-
-        XSSFReader.SheetIterator it = (XSSFReader.SheetIterator) r.getSheetsData();
-
-        String text = getShapesString(it);
-        assertTrue(text.contains("Line 1"));
-        assertTrue(text.contains("Line 2"));
-        assertTrue(text.contains("Line 3"));
-    }
-
-   /**
-    * NPE from XSSFReader$SheetIterator.<init> on XLSX files generated by
-    *  the openpyxl library
-    */
-   public void test58747() throws Exception {
-       OPCPackage pkg =  XSSFTestDataSamples.openSamplePackage("58747.xlsx");
-       ReadOnlySharedStringsTable strings = new ReadOnlySharedStringsTable(pkg);
-       assertNotNull(strings);
-       XSSFReader reader = new XSSFReader(pkg);
-       StylesTable styles = reader.getStylesTable();
-       assertNotNull(styles);
-
-       XSSFReader.SheetIterator iter = (XSSFReader.SheetIterator) reader.getSheetsData();
-       assertEquals(true, iter.hasNext());
-       iter.next();
-
-       assertEquals(false, iter.hasNext());
-       assertEquals("Orders", iter.getSheetName());
-       
-       pkg.close();
-   }
-
-    /**
-     * NPE when sheet has no relationship id in the workbook
-     * 60825
-     */
-    public void testSheetWithNoRelationshipId() throws Exception {
-        OPCPackage pkg =  XSSFTestDataSamples.openSamplePackage("60825.xlsx");
-        ReadOnlySharedStringsTable strings = new ReadOnlySharedStringsTable(pkg);
-        assertNotNull(strings);
-        XSSFReader reader = new XSSFReader(pkg);
-        StylesTable styles = reader.getStylesTable();
-        assertNotNull(styles);
-
-        XSSFReader.SheetIterator iter = (XSSFReader.SheetIterator) reader.getSheetsData();
-        assertNotNull(iter.next());
-        assertFalse(iter.hasNext());
-
-        pkg.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
deleted file mode 100644
index b223804..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.extractor;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-
-/**
- * Tests for {@link XSSFEventBasedExcelExtractor}
- */
-public class TestXSSFEventBasedExcelExtractor extends TestCase {
-	protected XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
-        return new XSSFEventBasedExcelExtractor(XSSFTestDataSamples.
-                openSamplePackage(sampleName));
-	}
-
-	/**
-	 * Get text out of the simple file
-	 */
-	public void testGetSimpleText() throws Exception {
-		// a very simple file
-	   XSSFEventBasedExcelExtractor extractor = getExtractor("sample.xlsx");
-		extractor.getText();
-		
-		String text = extractor.getText();
-		assertTrue(text.length() > 0);
-		
-		// Check sheet names
-		assertTrue(text.startsWith("Sheet1"));
-		assertTrue(text.endsWith("Sheet3\n"));
-		
-		// Now without, will have text
-		extractor.setIncludeSheetNames(false);
-		text = extractor.getText();
-		String CHUNK1 =
-			"Lorem\t111\n" + 
-    		"ipsum\t222\n" + 
-    		"dolor\t333\n" + 
-    		"sit\t444\n" + 
-    		"amet\t555\n" + 
-    		"consectetuer\t666\n" + 
-    		"adipiscing\t777\n" + 
-    		"elit\t888\n" + 
-    		"Nunc\t999\n";
-		String CHUNK2 =
-			"The quick brown fox jumps over the lazy dog\n" +
-			"hello, xssf	hello, xssf\n" +
-			"hello, xssf	hello, xssf\n" +
-			"hello, xssf	hello, xssf\n" +
-			"hello, xssf	hello, xssf\n";
-		assertEquals(
-				CHUNK1 + 
-				"at\t4995\n" + 
-				CHUNK2
-				, text);
-		
-		// Now get formulas not their values
-		extractor.setFormulasNotResults(true);
-		text = extractor.getText();
-		assertEquals(
-				CHUNK1 +
-				"at\tSUM(B1:B9)\n" + 
-				CHUNK2, text);
-		
-		// With sheet names too
-		extractor.setIncludeSheetNames(true);
-		text = extractor.getText();
-		assertEquals(
-				"Sheet1\n" +
-				CHUNK1 +
-				"at\tSUM(B1:B9)\n" + 
-				"rich test\n" +
-				CHUNK2 +
-				"Sheet3\n"
-				, text);
-		
-		extractor.close();
-	}
-	
-	public void testGetComplexText() throws Exception {
-		// A fairly complex file
-	   XSSFEventBasedExcelExtractor extractor = getExtractor("AverageTaxRates.xlsx");
-		extractor.getText();
-		
-		String text = extractor.getText();
-		assertTrue(text.length() > 0);
-		
-		// Might not have all formatting it should do!
-		assertTrue(text.startsWith(
-						"Avgtxfull\n" +
-						"(iii) AVERAGE TAX RATES ON ANNUAL"	
-		));
-		
-		extractor.close();
-	}
-	
-   public void testInlineStrings() throws Exception {
-      XSSFEventBasedExcelExtractor extractor = getExtractor("InlineStrings.xlsx");
-      extractor.setFormulasNotResults(true);
-      String text = extractor.getText();
-
-      // Numbers
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("43"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("22"));
-      
-      // Strings
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("ABCDE"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("Long Text"));
-      
-      // Inline Strings
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("1st Inline String"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("And More"));
-      
-      // Formulas
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("A2"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("A5-A$2"));
-		
-      extractor.close();
-   }
-   
-	/**
-	 * Test that we return pretty much the same as
-	 *  ExcelExtractor does, when we're both passed
-	 *  the same file, just saved as xls and xlsx
-	 */
-	public void testComparedToOLE2() throws Exception {
-		// A fairly simple file - ooxml
-	   XSSFEventBasedExcelExtractor ooxmlExtractor = getExtractor("SampleSS.xlsx");
-
-		ExcelExtractor ole2Extractor =
-			new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls"));
-		
-		POITextExtractor[] extractors =
-			new POITextExtractor[] { ooxmlExtractor, ole2Extractor };
-		for (POITextExtractor extractor : extractors) {
-            String text = extractor.getText().replaceAll("[\r\t]", "");
-			assertTrue(text.startsWith("First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n"));
-			Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
-			Matcher m = pattern.matcher(text);
-			assertTrue(m.matches());			
-		}
-		
-		ole2Extractor.close();
-		ooxmlExtractor.close();
-	}
-	
-	 /**
-	    * Test text extraction from text box using getShapes()
-	    * @throws Exception
-	    */
-    public void testShapes() throws Exception{
-	    XSSFEventBasedExcelExtractor ooxmlExtractor = getExtractor("WithTextBox.xlsx");
-	       
-	    try {
-    	    String text = ooxmlExtractor.getText();
-    
-    	    assertTrue(text.indexOf("Line 1") > -1);
-    	    assertTrue(text.indexOf("Line 2") > -1);
-    	    assertTrue(text.indexOf("Line 3") > -1);
-	    } finally {
-	        ooxmlExtractor.close();
-	    }
-    }
-
-    /**
-     * Test that we return the same output for unstyled numbers as the
-     * non-event-based XSSFExcelExtractor.
-     */
-    public void testUnstyledNumbersComparedToNonEventBasedExtractor()
-            throws Exception {
-
-        String expectedOutput = "Sheet1\n99.99\n";
-
-        XSSFExcelExtractor extractor = new XSSFExcelExtractor(
-                XSSFTestDataSamples.openSampleWorkbook("56011.xlsx"));
-        try {
-            assertEquals(expectedOutput, extractor.getText().replace(",", "."));
-        } finally {
-            extractor.close();
-        }
-
-        XSSFEventBasedExcelExtractor fixture =
-                new XSSFEventBasedExcelExtractor(
-                        XSSFTestDataSamples.openSamplePackage("56011.xlsx"));
-        try {
-            assertEquals(expectedOutput, fixture.getText().replace(",", "."));
-        } finally {
-            fixture.close();
-        }
-    }
-
-    /**
-     * Test that we return the same output headers and footers as the
-     * non-event-based XSSFExcelExtractor.
-     */
-    public void testHeadersAndFootersComparedToNonEventBasedExtractor()
-        throws Exception {
-
-        String expectedOutputWithHeadersAndFooters =
-                "Sheet1\n" +
-                "&\"Calibri,Regular\"&K000000top left\t&\"Calibri,Regular\"&K000000top center\t&\"Calibri,Regular\"&K000000top right\n" +
-                "abc\t123\n" +
-                "&\"Calibri,Regular\"&K000000bottom left\t&\"Calibri,Regular\"&K000000bottom center\t&\"Calibri,Regular\"&K000000bottom right\n";
-
-        String expectedOutputWithoutHeadersAndFooters =
-                "Sheet1\n" +
-                "abc\t123\n";
-
-        XSSFExcelExtractor extractor = new XSSFExcelExtractor(
-                XSSFTestDataSamples.openSampleWorkbook("headerFooterTest.xlsx"));
-        try {
-            assertEquals(expectedOutputWithHeadersAndFooters, extractor.getText());
-            extractor.setIncludeHeadersFooters(false);
-            assertEquals(expectedOutputWithoutHeadersAndFooters, extractor.getText());
-        } finally {
-            extractor.close();
-        }
-
-        XSSFEventBasedExcelExtractor fixture =
-                new XSSFEventBasedExcelExtractor(
-                        XSSFTestDataSamples.openSamplePackage("headerFooterTest.xlsx"));
-        try {
-            assertEquals(expectedOutputWithHeadersAndFooters, fixture.getText());
-            fixture.setIncludeHeadersFooters(false);
-            assertEquals(expectedOutputWithoutHeadersAndFooters, fixture.getText());
-        } finally {
-            fixture.close();
-        }
-    }
-
-    /**
-      * Test that XSSFEventBasedExcelExtractor outputs comments when specified.
-      * The output will contain two improvements over the output from
-     *  XSSFExcelExtractor in that (1) comments from empty cells will be
-      * outputted, and (2) the author will not be outputted twice.
-      * <p>
-      * This test will need to be modified if these improvements are ported to
-      * XSSFExcelExtractor.
-      */
-    public void testCommentsComparedToNonEventBasedExtractor()
-        throws Exception {
-
-        String expectedOutputWithoutComments =
-                "Sheet1\n" +
-                "\n" +
-                "abc\n" +
-                "\n" +
-                "123\n" +
-                "\n" +
-                "\n" +
-                "\n";
-
-        String nonEventBasedExtractorOutputWithComments =
-                "Sheet1\n" +
-                "\n" +
-                "abc Comment by Shaun Kalley: Shaun Kalley: Comment A2\n" +
-                "\n" +
-                "123 Comment by Shaun Kalley: Shaun Kalley: Comment B4\n" +
-                "\n" +
-                "\n" +
-                "\n";
-
-        String eventBasedExtractorOutputWithComments =
-                "Sheet1\n" +
-                "Comment by Shaun Kalley: Comment A1\tComment by Shaun Kalley: Comment B1\n" +
-                "abc Comment by Shaun Kalley: Comment A2\tComment by Shaun Kalley: Comment B2\n" +
-                "Comment by Shaun Kalley: Comment A3\tComment by Shaun Kalley: Comment B3\n" +
-                "Comment by Shaun Kalley: Comment A4\t123 Comment by Shaun Kalley: Comment B4\n" +
-                "Comment by Shaun Kalley: Comment A5\tComment by Shaun Kalley: Comment B5\n" +
-                "Comment by Shaun Kalley: Comment A7\tComment by Shaun Kalley: Comment B7\n" +
-                "Comment by Shaun Kalley: Comment A8\tComment by Shaun Kalley: Comment B8\n";
-
-        XSSFExcelExtractor extractor = new XSSFExcelExtractor(
-                XSSFTestDataSamples.openSampleWorkbook("commentTest.xlsx"));
-        try {
-            assertEquals(expectedOutputWithoutComments, extractor.getText());
-            extractor.setIncludeCellComments(true);
-            assertEquals(nonEventBasedExtractorOutputWithComments, extractor.getText());
-        } finally {
-            extractor.close();
-        }
-
-        XSSFEventBasedExcelExtractor fixture =
-                new XSSFEventBasedExcelExtractor(
-                        XSSFTestDataSamples.openSamplePackage("commentTest.xlsx"));
-        try {
-            assertEquals(expectedOutputWithoutComments, fixture.getText());
-            fixture.setIncludeCellComments(true);
-            assertEquals(eventBasedExtractorOutputWithComments, fixture.getText());
-        } finally {
-            fixture.close();
-        }
-    }
-    
-    public void testFile56278_normal() throws Exception {
-        // first with normal Text Extractor
-        POIXMLTextExtractor extractor = new XSSFExcelExtractor(
-                XSSFTestDataSamples.openSampleWorkbook("56278.xlsx"));
-        try {
-            assertNotNull(extractor.getText());
-        } finally {
-            extractor.close();
-        }
-    }
-    
-    public void testFile56278_event() throws Exception {
-        // then with event based one
-        POIXMLTextExtractor extractor = getExtractor("56278.xlsx");        
-        try {
-            assertNotNull(extractor.getText());
-        } finally {
-            extractor.close();
-        }
-    }
-
-	public void test59021() throws Exception {
-		XSSFEventBasedExcelExtractor ex =
-				new XSSFEventBasedExcelExtractor(
-						XSSFTestDataSamples.openSamplePackage("59021.xlsx"));
-		String text = ex.getText();
-		assertTrue("can't find Abhkazia", text.contains("Abkhazia - Fixed"));
-		assertTrue("can't find 10/02/2016", text.contains("10/02/2016"));
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
deleted file mode 100644
index 34478a9..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.extractor;
-
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-
-
-public class TestXSSFEventBasedExcelExtractorUsingFactory extends TestXSSFEventBasedExcelExtractor {
-	@Override
-	protected final XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
-		ExtractorFactory.setAllThreadsPreferEventExtractors(true);
-		return (XSSFEventBasedExcelExtractor) ExtractorFactory.createExtractor(HSSFTestDataSamples.openSampleFileStream(sampleName));
-	}
-	
-	@Override
-    public void tearDown() {
-	    // reset setting to not affect other tests
-	    ExtractorFactory.setAllThreadsPreferEventExtractors(null);
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
deleted file mode 100644
index 89a4e40..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.extractor;
-
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-
-/**
- * Tests for {@link XSSFExcelExtractor}
- */
-public class TestXSSFExcelExtractor extends TestCase {
-	protected XSSFExcelExtractor getExtractor(String sampleName) {
-		return new XSSFExcelExtractor(XSSFTestDataSamples.openSampleWorkbook(sampleName));
-	}
-
-	/**
-	 * Get text out of the simple file
-	 * @throws IOException 
-	 */
-	public void testGetSimpleText() throws IOException {
-		// a very simple file
-		XSSFExcelExtractor extractor = getExtractor("sample.xlsx");
-		extractor.getText();
-		
-		String text = extractor.getText();
-		assertTrue(text.length() > 0);
-		
-		// Check sheet names
-		assertTrue(text.startsWith("Sheet1"));
-		assertTrue(text.endsWith("Sheet3\n"));
-		
-		// Now without, will have text
-		extractor.setIncludeSheetNames(false);
-		text = extractor.getText();
-		String CHUNK1 =
-			"Lorem\t111\n" + 
-    		"ipsum\t222\n" + 
-    		"dolor\t333\n" + 
-    		"sit\t444\n" + 
-    		"amet\t555\n" + 
-    		"consectetuer\t666\n" + 
-    		"adipiscing\t777\n" + 
-    		"elit\t888\n" + 
-    		"Nunc\t999\n";
-		String CHUNK2 =
-			"The quick brown fox jumps over the lazy dog\n" +
-			"hello, xssf	hello, xssf\n" +
-			"hello, xssf	hello, xssf\n" +
-			"hello, xssf	hello, xssf\n" +
-			"hello, xssf	hello, xssf\n";
-		assertEquals(
-				CHUNK1 + 
-				"at\t4995\n" + 
-				CHUNK2
-				, text);
-		
-		// Now get formulas not their values
-		extractor.setFormulasNotResults(true);
-		text = extractor.getText();
-		assertEquals(
-				CHUNK1 +
-				"at\tSUM(B1:B9)\n" + 
-				CHUNK2, text);
-		
-		// With sheet names too
-		extractor.setIncludeSheetNames(true);
-		text = extractor.getText();
-		assertEquals(
-				"Sheet1\n" +
-				CHUNK1 +
-				"at\tSUM(B1:B9)\n" + 
-				"rich test\n" +
-				CHUNK2 +
-				"Sheet3\n"
-				, text);
-		
-		extractor.close();
-	}
-	
-	public void testGetComplexText() throws IOException {
-		// A fairly complex file
-		XSSFExcelExtractor extractor = getExtractor("AverageTaxRates.xlsx");
-		extractor.getText();
-		
-		String text = extractor.getText();
-		assertTrue(text.length() > 0);
-		
-		// Might not have all formatting it should do!
-		// TODO decide if we should really have the "null" in there
-		assertTrue(text.startsWith(
-						"Avgtxfull\n" +
-						"null\t(iii) AVERAGE TAX RATES ON ANNUAL"	
-		));
-		
-		extractor.close();
-	}
-	
-	/**
-	 * Test that we return pretty much the same as
-	 *  ExcelExtractor does, when we're both passed
-	 *  the same file, just saved as xls and xlsx
-	 * @throws IOException 
-	 */
-	public void testComparedToOLE2() throws IOException {
-		// A fairly simple file - ooxml
-		XSSFExcelExtractor ooxmlExtractor = getExtractor("SampleSS.xlsx");
-
-		ExcelExtractor ole2Extractor =
-			new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls"));
-		
-		POITextExtractor[] extractors =
-			new POITextExtractor[] { ooxmlExtractor, ole2Extractor };
-		
-		for (POITextExtractor extractor : extractors) {
-			String text = extractor.getText().replaceAll("[\r\t]", "");
-			assertTrue(text.startsWith("First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n"));
-			Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
-			Matcher m = pattern.matcher(text);
-			assertTrue(m.matches());			
-		}
-
-		ole2Extractor.close();
-		ooxmlExtractor.close();
-	}
-	
-	/**
-	 * From bug #45540
-	 * @throws IOException 
-	 */
-	public void testHeaderFooter() throws IOException {
-		String[] files = new String[] {
-			"45540_classic_Header.xlsx", "45540_form_Header.xlsx",
-			"45540_classic_Footer.xlsx", "45540_form_Footer.xlsx",
-		};
-		for(String sampleName : files) {
-			XSSFExcelExtractor extractor = getExtractor(sampleName);
-			String text = extractor.getText();
-			
-			assertTrue("Unable to find expected word in text from " + sampleName + "\n" + text, text.contains("testdoc"));
-			assertTrue("Unable to find expected word in text\n" + text, text.contains("test phrase"));
-			
-			extractor.close();
-		}
-	}
-
-	/**
-	 * From bug #45544
-	 * @throws IOException 
-	 */
-	public void testComments() throws IOException {
-		XSSFExcelExtractor extractor = getExtractor("45544.xlsx");
-		String text = extractor.getText();
-
-		// No comments there yet
-		assertFalse("Unable to find expected word in text\n" + text, text.contains("testdoc"));
-		assertFalse("Unable to find expected word in text\n" + text, text.contains("test phrase"));
-
-		// Turn on comment extraction, will then be
-		extractor.setIncludeCellComments(true);
-		text = extractor.getText();
-		assertTrue("Unable to find expected word in text\n" + text, text.contains("testdoc"));
-		assertTrue("Unable to find expected word in text\n" + text, text.contains("test phrase"));
-		
-		extractor.close();
-	}
-	
-	public void testInlineStrings() throws IOException {
-      XSSFExcelExtractor extractor = getExtractor("InlineStrings.xlsx");
-      extractor.setFormulasNotResults(true);
-      String text = extractor.getText();
-
-      // Numbers
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("43"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("22"));
-      
-      // Strings
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("ABCDE"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("Long Text"));
-      
-      // Inline Strings
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("1st Inline String"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("And More"));
-      
-      // Formulas
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("A2"));
-      assertTrue("Unable to find expected word in text\n" + text, text.contains("A5-A$2"));
-      
-      extractor.close();
-	}
-	/**
-	 * Simple test for text box text
-	 * @throws IOException
-	 */
-	public void testTextBoxes() throws IOException {
-	    XSSFExcelExtractor extractor = getExtractor("WithTextBox.xlsx");
-	    try {
-    	    extractor.setFormulasNotResults(true);
-    	    String text = extractor.getText();
-    	    assertTrue(text.indexOf("Line 1") > -1);
-    	    assertTrue(text.indexOf("Line 2") > -1);
-    	    assertTrue(text.indexOf("Line 3") > -1);
-	    } finally {
-	        extractor.close();
-	    }
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
deleted file mode 100644
index 57983be..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.extractor;
-
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-
-/**
- * Tests for {@link XSSFExcelExtractor}
- */
-public final class TestXSSFExcelExtractorUsingFactory extends TestXSSFExcelExtractor {
-	@Override
-	protected final XSSFExcelExtractor getExtractor(String sampleName) {
-		ExtractorFactory.setAllThreadsPreferEventExtractors(false);
-		ExtractorFactory.setThreadPrefersEventExtractors(false);
-		try {
-			return (XSSFExcelExtractor) ExtractorFactory.createExtractor(HSSFTestDataSamples.openSampleFileStream(sampleName));
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-    
-    @Override
-    public void tearDown() {
-        // reset setting to not affect other tests
-        ExtractorFactory.setAllThreadsPreferEventExtractors(null);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
deleted file mode 100644
index 783b7a0..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.extractor;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.XMLHelper;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.MapInfo;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Roberto Manicardi
- */
-public final class TestXSSFExportToXML extends TestCase {
-
-    public void testExportToXML() throws Exception {
-
-		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
-
-        boolean found = false;
-		for (POIXMLDocumentPart p : wb.getRelations()) {
-
-			if (!(p instanceof MapInfo)) {
-				continue;
-			}
-			MapInfo mapInfo = (MapInfo) p;
-
-			XSSFMap map = mapInfo.getXSSFMapById(1);
-			XSSFExportToXml exporter = new XSSFExportToXml(map);
-			ByteArrayOutputStream os = new ByteArrayOutputStream();
-			exporter.exportToXML(os, true);
-			String xml = os.toString("UTF-8");
-
-			assertNotNull(xml);
-			assertFalse(xml.equals(""));
-
-			String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
-			String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
-			String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
-			String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
-			String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
-			String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
-			String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
-			String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
-
-			assertEquals("ro", docente);
-			assertEquals("ro", nome);
-			assertEquals("ds", tutor);
-			assertEquals("gs", cdl);
-			assertEquals("g", durata);
-			assertEquals("gvvv", argomento);
-			assertEquals("aaaa", progetto);
-			assertEquals("aa", crediti);
-			
-			parseXML(xml);
-	           
-           found = true;
-       }
-       assertTrue(found);
-	}
-
-	public void testExportToXMLInverseOrder() throws Exception {
-
-		XSSFWorkbook wb = XSSFTestDataSamples
-				.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
-
-        boolean found = false;
-		for (POIXMLDocumentPart p : wb.getRelations()) {
-
-			if (!(p instanceof MapInfo)) {
-				continue;
-			}
-            MapInfo mapInfo = (MapInfo) p;
-
-			XSSFMap map = mapInfo.getXSSFMapById(1);
-			XSSFExportToXml exporter = new XSSFExportToXml(map);
-			ByteArrayOutputStream os = new ByteArrayOutputStream();
-			exporter.exportToXML(os, true);
-			String xml = os.toString("UTF-8");
-
-			assertNotNull(xml);
-			assertFalse(xml.equals(""));
-
-			String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
-			String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
-			String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
-			String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
-			String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
-			String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
-			String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
-			String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
-
-			assertEquals("aa", nome);
-			assertEquals("aaaa", docente);
-			assertEquals("gvvv", tutor);
-			assertEquals("g", cdl);
-			assertEquals("gs", durata);
-			assertEquals("ds", argomento);
-			assertEquals("ro", progetto);
-			assertEquals("ro", crediti);
-			
-			parseXML(xml);
-	           
-           found = true;
-       }
-       assertTrue(found);
-	}
-
-	public void testXPathOrdering() {
-
-		XSSFWorkbook wb = XSSFTestDataSamples
-				.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
-
-        boolean found = false;
-		for (POIXMLDocumentPart p : wb.getRelations()) {
-
-			if (p instanceof MapInfo) {
-                MapInfo mapInfo = (MapInfo) p;
-
-				XSSFMap map = mapInfo.getXSSFMapById(1);
-				XSSFExportToXml exporter = new XSSFExportToXml(map);
-
-				assertEquals(1, exporter.compare("/CORSO/DOCENTE", "/CORSO/NOME"));
-				assertEquals(-1, exporter.compare("/CORSO/NOME", "/CORSO/DOCENTE"));
-			}
-	           
-           found = true;
-       }
-       assertTrue(found);
-	}
-
-	public void testMultiTable() throws Exception {
-
-		XSSFWorkbook wb = XSSFTestDataSamples
-				.openSampleWorkbook("CustomXMLMappings-complex-type.xlsx");
-
-		boolean found = false;
-		for (POIXMLDocumentPart p : wb.getRelations()) {
-
-			if (p instanceof MapInfo) {
-				MapInfo mapInfo = (MapInfo) p;
-
-				XSSFMap map = mapInfo.getXSSFMapById(2);
-
-				assertNotNull(map);
-
-				XSSFExportToXml exporter = new XSSFExportToXml(map);
-				ByteArrayOutputStream os = new ByteArrayOutputStream();
-				exporter.exportToXML(os, true);
-				String xml = os.toString("UTF-8");
-
-				assertNotNull(xml);
-
-				String[] regexConditions = {
-						"<MapInfo", "</MapInfo>",
-						"<Schema ID=\"1\" Namespace=\"\" SchemaRef=\"\"/>",
-						"<Schema ID=\"4\" Namespace=\"\" SchemaRef=\"\"/>",
-						"DataBinding",
-						"Map Append=\"false\" AutoFit=\"false\" ID=\"1\"",
-						"Map Append=\"false\" AutoFit=\"false\" ID=\"5\"",
-				};
-
-				for (String condition : regexConditions) {
-					Pattern pattern = Pattern.compile(condition);
-					Matcher matcher = pattern.matcher(xml);
-					assertTrue(matcher.find());
-				}
-			}
-	           
-           found = true;
-       }
-       assertTrue(found);
-	}
-
-    public void testExportToXMLSingleAttributeNamespace() throws Exception {
-        // TODO: Fails, but I don't know if it is ok or not...
-        
-//        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMapping-singleattributenamespace.xlsx");
-//
-//        for (XSSFMap map : wb.getCustomXMLMappings()) {
-//            XSSFExportToXml exporter = new XSSFExportToXml(map);
-//
-//            ByteArrayOutputStream os = new ByteArrayOutputStream();
-//            exporter.exportToXML(os, true);
-//        }
-    }
-	
-    public void test55850ComplexXmlExport() throws Exception {
-
-        XSSFWorkbook wb = XSSFTestDataSamples
-                .openSampleWorkbook("55850.xlsx");
-
-        boolean found = false;
-        for (POIXMLDocumentPart p : wb.getRelations()) {
-
-            if (!(p instanceof MapInfo)) {
-                continue;
-            }
-            MapInfo mapInfo = (MapInfo) p;
-
-            XSSFMap map = mapInfo.getXSSFMapById(2);
-
-            assertNotNull("XSSFMap is null", map);
-
-            XSSFExportToXml exporter = new XSSFExportToXml(map);
-            ByteArrayOutputStream os = new ByteArrayOutputStream();
-            exporter.exportToXML(os, true);
-            String xmlData = os.toString("UTF-8");
-
-            assertNotNull(xmlData);
-            assertFalse(xmlData.equals(""));
-
-            String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
-            String b = a.split("<B>")[1].split("</B>")[0].trim();
-            String c = b.split("<C>")[1].split("</C>")[0].trim();
-            String d = c.split("<D>")[1].split("</Dd>")[0].trim();
-            String e = d.split("<E>")[1].split("</EA>")[0].trim();
-
-            String euro = e.split("<EUR>")[1].split("</EUR>")[0].trim();
-            String chf = e.split("<CHF>")[1].split("</CHF>")[0].trim();
-
-            assertEquals("15", euro);
-            assertEquals("19", chf);
-            
-            parseXML(xmlData);
-            
-            found = true;
-        }
-        assertTrue(found);
-    }
-
-   public void testFormulaCells_Bugzilla_55927() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55927.xlsx");
-       
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-           
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-           
-           XSSFMap map = mapInfo.getXSSFMapById(1);
-           
-           assertNotNull("XSSFMap is null", map);
-           
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, true);
-           String xmlData = os.toString("UTF-8");
-           
-           assertNotNull(xmlData);
-           assertFalse(xmlData.equals(""));
-           
-           assertEquals("2012-01-13", xmlData.split("<DATE>")[1].split("</DATE>")[0].trim());
-           assertEquals("2012-02-16", xmlData.split("<FORMULA_DATE>")[1].split("</FORMULA_DATE>")[0].trim());
-           
-           parseXML(xmlData);
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-
-   public void testFormulaCells_Bugzilla_55926() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55926.xlsx");
-
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-
-           XSSFMap map = mapInfo.getXSSFMapById(1);
-
-           assertNotNull("XSSFMap is null", map);
-
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, true);
-           String xmlData = os.toString("UTF-8");
-
-           assertNotNull(xmlData);
-           assertFalse(xmlData.equals(""));
-           
-           String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
-           String doubleValue = a.split("<DOUBLE>")[1].split("</DOUBLE>")[0].trim();
-           String stringValue = a.split("<STRING>")[1].split("</STRING>")[0].trim();
-           
-           assertEquals("Hello World", stringValue);
-           assertEquals("5.1", doubleValue);
-           
-           parseXML(xmlData);
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-   
-   public void testXmlExportIgnoresEmptyCells_Bugzilla_55924() throws Exception {
-
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55924.xlsx");
-
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-
-           XSSFMap map = mapInfo.getXSSFMapById(1);
-
-           assertNotNull("XSSFMap is null", map);
-
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, true);
-           String xmlData = os.toString("UTF-8");
-
-           assertNotNull(xmlData);
-           assertFalse(xmlData.equals(""));
-
-           String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
-           String euro = a.split("<EUR>")[1].split("</EUR>")[0].trim();
-           assertEquals("1",euro);
-           
-           parseXML(xmlData);
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-
-   public void testXmlExportSchemaWithXSAllTag_Bugzilla_56169() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56169.xlsx");
-
-       for (XSSFMap map : wb.getCustomXMLMappings()) {
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, true);
-           String xmlData = os.toString("UTF-8");
-
-           assertNotNull(xmlData);
-           assertTrue(!xmlData.equals(""));
-
-           String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
-           String a_b = a.split("<B>")[1].split("</B>")[0].trim();
-           String a_b_c = a_b.split("<C>")[1].split("</C>")[0].trim();
-           String a_b_c_e = a_b_c.split("<E>")[1].split("</EA>")[0].trim();
-           String a_b_c_e_euro = a_b_c_e.split("<EUR>")[1].split("</EUR>")[0].trim();
-           String a_b_c_e_chf = a_b_c_e.split("<CHF>")[1].split("</CHF>")[0].trim();
-
-           assertEquals("1", a_b_c_e_euro);
-           assertEquals("2", a_b_c_e_chf);
-
-           String a_b_d = a_b.split("<D>")[1].split("</Dd>")[0].trim();
-           String a_b_d_e = a_b_d.split("<E>")[1].split("</EA>")[0].trim();
-
-           String a_b_d_e_euro = a_b_d_e.split("<EUR>")[1].split("</EUR>")[0].trim();
-           String a_b_d_e_chf = a_b_d_e.split("<CHF>")[1].split("</CHF>")[0].trim();
-
-           assertEquals("3", a_b_d_e_euro);
-           assertEquals("4", a_b_d_e_chf);
-       }
-   }
-   
-   public void testXmlExportCompare_Bug_55923() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55923.xlsx");
-
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-
-           XSSFMap map = mapInfo.getXSSFMapById(4);
-
-           assertNotNull("XSSFMap is null", map);
-
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           assertEquals(0, exporter.compare("", ""));
-           assertEquals(0, exporter.compare("/", "/"));
-           assertEquals(0, exporter.compare("//", "//"));
-           assertEquals(0, exporter.compare("/a/", "/b/"));
-           
-           assertEquals(-1, exporter.compare("/ns1:Entry/ns1:A/ns1:B/ns1:C/ns1:E/ns1:EUR",
-                                           "/ns1:Entry/ns1:A/ns1:B/ns1:C/ns1:E/ns1:CHF"));
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-   
-   public void testXmlExportSchemaOrderingBug_Bugzilla_55923() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55923.xlsx");
-
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-
-           XSSFMap map = mapInfo.getXSSFMapById(4);
-
-           assertNotNull("XSSFMap is null", map);
-
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, true);
-           String xmlData = os.toString("UTF-8");
-
-           assertNotNull(xmlData);
-           assertFalse(xmlData.equals(""));
-           
-           String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
-           String a_b = a.split("<B>")[1].split("</B>")[0].trim();
-           String a_b_c = a_b.split("<C>")[1].split("</C>")[0].trim();
-           String a_b_c_e = a_b_c.split("<E>")[1].split("</EA>")[0].trim();
-           String a_b_c_e_euro = a_b_c_e.split("<EUR>")[1].split("</EUR>")[0].trim();
-           String a_b_c_e_chf = a_b_c_e.split("<CHF>")[1].split("</CHF>")[0].trim();
-           
-           assertEquals("1",a_b_c_e_euro);
-           assertEquals("2",a_b_c_e_chf);
-           
-           String a_b_d = a_b.split("<D>")[1].split("</Dd>")[0].trim();
-           String a_b_d_e = a_b_d.split("<E>")[1].split("</EA>")[0].trim();
-           
-           String a_b_d_e_euro = a_b_d_e.split("<EUR>")[1].split("</EUR>")[0].trim();
-           String a_b_d_e_chf = a_b_d_e.split("<CHF>")[1].split("</CHF>")[0].trim();
-           
-           assertEquals("3",a_b_d_e_euro);
-           assertEquals("4",a_b_d_e_chf);
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-   
-   private void parseXML(String xmlData) throws IOException, SAXException, ParserConfigurationException {
-       DocumentBuilderFactory docBuilderFactory = XMLHelper.getDocumentBuilderFactory();
-       docBuilderFactory.setNamespaceAware(true);
-       docBuilderFactory.setValidating(false);
-       DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-       docBuilder.setEntityResolver(new DummyEntityResolver());
-
-       docBuilder.parse(new ByteArrayInputStream(xmlData.getBytes("UTF-8")));
-   }
-
-   private static class DummyEntityResolver implements EntityResolver
-   {
-       @Override
-       public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
-       {
-           return null;
-       }
-   }
-   
-   public void testExportDataTypes() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55923.xlsx");
-       
-       Sheet sheet = wb.getSheetAt(0);
-       Row row = sheet.getRow(0);
-       
-       Cell cString = row.createCell(0);
-       cString.setCellValue("somestring");
-       cString.setCellType(CellType.STRING);
-       
-       Cell cBoolean = row.createCell(1);
-       cBoolean.setCellValue(true);
-       cBoolean.setCellType(CellType.BOOLEAN);
-       
-       Cell cError = row.createCell(2);
-       cError.setCellType(CellType.ERROR);
-       
-       Cell cFormulaString = row.createCell(3);
-       cFormulaString.setCellFormula("A1");
-       cFormulaString.setCellType(CellType.FORMULA);
-       
-       Cell cFormulaNumeric = row.createCell(4);
-       cFormulaNumeric.setCellFormula("F1");
-       cFormulaNumeric.setCellType(CellType.FORMULA);
-       
-       Cell cNumeric = row.createCell(5);
-       cNumeric.setCellValue(1.2);
-       cNumeric.setCellType(CellType.NUMERIC);
-       
-       Cell cDate = row.createCell(6);
-       cDate.setCellValue(new Date());
-       cDate.setCellType(CellType.NUMERIC);
-       
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-
-           XSSFMap map = mapInfo.getXSSFMapById(4);
-
-           assertNotNull("XSSFMap is null", map);
-
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, true);
-           String xmlData = os.toString("UTF-8");
-
-           assertNotNull(xmlData);
-           assertFalse(xmlData.equals(""));
-           
-           parseXML(xmlData);
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-
-   public void testValidateFalse() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55923.xlsx");
-
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-
-           XSSFMap map = mapInfo.getXSSFMapById(4);
-
-           assertNotNull("XSSFMap is null", map);
-
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, false);
-           String xmlData = os.toString("UTF-8");
-
-           assertNotNull(xmlData);
-           assertFalse(xmlData.equals(""));
-           
-           parseXML(xmlData);
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-
-   public void testRefElementsInXmlSchema_Bugzilla_56730() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56730.xlsx");
-       
-       boolean found = false;
-       for (POIXMLDocumentPart p : wb.getRelations()) {
-           
-           if (!(p instanceof MapInfo)) {
-               continue;
-           }
-           MapInfo mapInfo = (MapInfo) p;
-           
-           XSSFMap map = mapInfo.getXSSFMapById(1);
-           
-           assertNotNull("XSSFMap is null", map);
-           
-           XSSFExportToXml exporter = new XSSFExportToXml(map);
-           ByteArrayOutputStream os = new ByteArrayOutputStream();
-           exporter.exportToXML(os, true);
-           String xmlData = os.toString("UTF-8");
-           
-           assertNotNull(xmlData);
-           assertFalse(xmlData.equals(""));
-           
-           assertEquals("2014-12-31", xmlData.split("<DATE>")[1].split("</DATE>")[0].trim());
-           assertEquals("12.5", xmlData.split("<REFELEMENT>")[1].split("</REFELEMENT>")[0].trim());
-           
-           parseXML(xmlData);
-           
-           found = true;
-       }
-       assertTrue(found);
-   }
-
-    public void testBug59026() throws Exception {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("59026.xlsx");
-
-        Collection<XSSFMap> mappings = wb.getCustomXMLMappings();
-        assertTrue(mappings.size() > 0);
-        for (XSSFMap map : mappings) {
-            XSSFExportToXml exporter = new XSSFExportToXml(map);
-
-            ByteArrayOutputStream os = new ByteArrayOutputStream();
-            exporter.exportToXML(os, false);
-            assertNotNull(os.toString("UTF-8"));
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
deleted file mode 100644
index 626e104..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.extractor;
-
-import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.text.DateFormatSymbols;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import javax.xml.xpath.XPathExpressionException;
-
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-public class TestXSSFImportFromXML {
-	
-	@Test
-	public void testImportFromXML() throws IOException, XPathExpressionException, SAXException{
-		
-		 XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
-		 try {
-    		 String name = "name";
-    		 String teacher = "teacher";
-    		 String tutor = "tutor";
-    		 String cdl = "cdl";
-    		 String duration = "duration";
-    		 String topic = "topic";
-    		 String project = "project";
-    		 String credits = "credits";
-    		 
-    		 String testXML = "<CORSO>"+
-    						  "<NOME>"+name+"</NOME>"+
-    						  "<DOCENTE>"+teacher+"</DOCENTE>"+ 
-    						  "<TUTOR>"+tutor+"</TUTOR>"+ 
-    						  "<CDL>"+cdl+"</CDL>"+
-    		 				  "<DURATA>"+duration+"</DURATA>"+ 
-    		 				  "<ARGOMENTO>"+topic+"</ARGOMENTO>"+ 
-    		 				  "<PROGETTO>"+project+"</PROGETTO>"+
-    		 				  "<CREDITI>"+credits+"</CREDITI>"+ 
-    		 				  "</CORSO>\u0000";		
-    		 
-    		 XSSFMap map = wb.getMapInfo().getXSSFMapByName("CORSO_mapping");
-    		 assertNotNull(map);
-    		 XSSFImportFromXML importer = new XSSFImportFromXML(map);
-    		 
-    		 importer.importFromXML(testXML);
-    		 
-    		 XSSFSheet sheet=wb.getSheetAt(0);
-    		 
-    		 XSSFRow row = sheet.getRow(0);
-    		 assertTrue(row.getCell(0).getStringCellValue().equals(name));
-    		 assertTrue(row.getCell(1).getStringCellValue().equals(teacher));
-    		 assertTrue(row.getCell(2).getStringCellValue().equals(tutor));
-    		 assertTrue(row.getCell(3).getStringCellValue().equals(cdl));
-    		 assertTrue(row.getCell(4).getStringCellValue().equals(duration));
-    		 assertTrue(row.getCell(5).getStringCellValue().equals(topic));
-    		 assertTrue(row.getCell(6).getStringCellValue().equals(project));
-    		 assertTrue(row.getCell(7).getStringCellValue().equals(credits));
-		 } finally {
-		     wb.close();
-		 }
-	}
-	
-	@Test	
-	public void testMultiTable() throws IOException, XPathExpressionException, SAXException{
-		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings-complex-type.xlsx");	 
-		try {
-    		String cellC6 = "c6";
-    		String cellC7 = "c7";
-    		String cellC8 = "c8";
-    		String cellC9 = "c9";
-    		
-    		String testXML = "<ns1:MapInfo xmlns:ns1=\""+NS_SPREADSHEETML+"\" SelectionNamespaces=\"\">" +
-    						 "<ns1:Schema ID=\""+cellC6+"\" SchemaRef=\"a\" />"+ 
-    						 "<ns1:Schema ID=\""+cellC7+"\" SchemaRef=\"b\" />"+ 
-    						 "<ns1:Schema ID=\""+cellC8+"\" SchemaRef=\"c\" />"+ 
-    						 "<ns1:Schema ID=\""+cellC9+"\" SchemaRef=\"d\" />"+ 
-    						 "<ns1:Map ID=\"1\" Name=\"\" RootElement=\"\" SchemaID=\"\" ShowImportExportValidationErrors=\"\" AutoFit=\"\" Append=\"\" PreserveSortAFLayout=\"\" PreserveFormat=\"\">"+
-    						 "<ns1:DataBinding DataBindingLoadMode=\"\" />"+ 
-    						 "</ns1:Map>"+
-    						 "<ns1:Map ID=\"2\" Name=\"\" RootElement=\"\" SchemaID=\"\" ShowImportExportValidationErrors=\"\" AutoFit=\"\" Append=\"\" PreserveSortAFLayout=\"\" PreserveFormat=\"\">"+
-    						 "<ns1:DataBinding DataBindingLoadMode=\"\" />"+ 
-    						 "</ns1:Map>"+
-    						 "<ns1:Map ID=\"3\" Name=\"\" RootElement=\"\" SchemaID=\"\" ShowImportExportValidationErrors=\"\" AutoFit=\"\" Append=\"\" PreserveSortAFLayout=\"\" PreserveFormat=\"\">"+
-    						 "<ns1:DataBinding DataBindingLoadMode=\"\" />"+ 
-    						 "</ns1:Map>"+
-    						 "</ns1:MapInfo>\u0000";
-    
-    		XSSFMap map = wb.getMapInfo().getXSSFMapByName("MapInfo_mapping");
-    		assertNotNull(map);
-    		XSSFImportFromXML importer = new XSSFImportFromXML(map);
-    		 
-    		importer.importFromXML(testXML);
-    		 
-    		//Check for Schema element
-    		XSSFSheet sheet=wb.getSheetAt(1);
-    		 
-    		assertEquals(cellC6,sheet.getRow(5).getCell(2).getStringCellValue());
-    		assertEquals(cellC7,sheet.getRow(6).getCell(2).getStringCellValue());
-    		assertEquals(cellC8,sheet.getRow(7).getCell(2).getStringCellValue());
-    		assertEquals(cellC9,sheet.getRow(8).getCell(2).getStringCellValue());
-        } finally {
-            wb.close();
-        }
-	}
-
-	
-	@Test
-	public void testSingleAttributeCellWithNamespace() throws IOException, XPathExpressionException, SAXException{
-		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMapping-singleattributenamespace.xlsx");	 
-		try {
-    		int id = 1;
-    		String displayName = "dispName";
-    		String ref="19"; 
-    		int count = 21;
-    		
-    		String testXML = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>"+ 
-    						 "<ns1:table xmlns:ns1=\""+NS_SPREADSHEETML+"\" id=\""+id+"\" displayName=\""+displayName+"\" ref=\""+ref+"\">"+
-    						 "<ns1:tableColumns count=\""+count+"\" />"+ 
-    						 "</ns1:table>\u0000"; 
-    		XSSFMap map = wb.getMapInfo().getXSSFMapByName("table_mapping");
-    		assertNotNull(map);
-    		XSSFImportFromXML importer = new XSSFImportFromXML(map);
-    		importer.importFromXML(testXML);
-    		
-    		//Check for Schema element
-    		XSSFSheet sheet=wb.getSheetAt(0);
-    		 
-    		assertEquals(new Double(id), sheet.getRow(28).getCell(1).getNumericCellValue(), 0);
-    		assertEquals(displayName, sheet.getRow(11).getCell(5).getStringCellValue());
-    		assertEquals(ref, sheet.getRow(14).getCell(7).getStringCellValue());
-    		assertEquals(new Double(count), sheet.getRow(18).getCell(3).getNumericCellValue(), 0);
-        } finally {
-            wb.close();
-        }
-	}
-	
-	@Test
-	public void testOptionalFields_Bugzilla_55864() throws IOException, XPathExpressionException, SAXException {
-		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55864.xlsx");	 
-		try {
-    		String testXML = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
-    				"<PersonInfoRoot>" +
-    				"<PersonData>" +
-    				"<FirstName>Albert</FirstName>" +
-    				"<LastName>Einstein</LastName>" +
-    				"<BirthDate>1879-03-14</BirthDate>" +
-    				"</PersonData>" +
-    				"</PersonInfoRoot>";
-    		
-    		XSSFMap map = wb.getMapInfo().getXSSFMapByName("PersonInfoRoot_Map");
-    		assertNotNull(map);
-    		XSSFImportFromXML importer = new XSSFImportFromXML(map);
-    		 
-    		importer.importFromXML(testXML);
-    		 
-    		XSSFSheet sheet=wb.getSheetAt(0);
-    		 
-    		 XSSFRow rowHeadings = sheet.getRow(0);
-    		 XSSFRow rowData = sheet.getRow(1);
-    		 
-    		 assertEquals("FirstName", rowHeadings.getCell(0).getStringCellValue());
-    		 assertEquals("Albert", rowData.getCell(0).getStringCellValue());
-    		 
-    		 assertEquals("LastName", rowHeadings.getCell(1).getStringCellValue());
-    		 assertEquals("Einstein", rowData.getCell(1).getStringCellValue());
-    		 
-    		 assertEquals("BirthDate", rowHeadings.getCell(2).getStringCellValue());
-    		 assertEquals("1879-03-14", rowData.getCell(2).getStringCellValue());
-    		 
-    		 // Value for OptionalRating is declared optional (minOccurs=0) in 55864.xlsx
-    		 assertEquals("OptionalRating", rowHeadings.getCell(3).getStringCellValue());
-    		 assertNull("", rowData.getCell(3));
-        } finally {
-            wb.close();
-        }
-	}
-
-	@Test
-	public void testOptionalFields_Bugzilla_57890() throws IOException, ParseException, XPathExpressionException, SAXException {
-		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57890.xlsx");
-
-		String testXML = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" + "<TestInfoRoot>"
-				+ "<TestData>" + "<Int>" + Integer.MIN_VALUE + "</Int>" + "<UnsignedInt>12345</UnsignedInt>"
-				+ "<double>1.0000123</double>" + "<Date>1991-03-14</Date>" + "</TestData>" + "</TestInfoRoot>";
-
-		XSSFMap map = wb.getMapInfo().getXSSFMapByName("TestInfoRoot_Map");
-		assertNotNull(map);
-		XSSFImportFromXML importer = new XSSFImportFromXML(map);
-
-		importer.importFromXML(testXML);
-
-		XSSFSheet sheet = wb.getSheetAt(0);
-
-		XSSFRow rowHeadings = sheet.getRow(0);
-		XSSFRow rowData = sheet.getRow(1);
-
-		assertEquals("Date", rowHeadings.getCell(0).getStringCellValue());
-		Date date = new SimpleDateFormat("yyyy-MM-dd", DateFormatSymbols.getInstance(Locale.ROOT)).parse("1991-3-14");
-		assertEquals(date, rowData.getCell(0).getDateCellValue());
-
-		assertEquals("Amount Int", rowHeadings.getCell(1).getStringCellValue());
-		assertEquals(new Double(Integer.MIN_VALUE), rowData.getCell(1).getNumericCellValue(), 0);
-
-		assertEquals("Amount Double", rowHeadings.getCell(2).getStringCellValue());
-		assertEquals(1.0000123, rowData.getCell(2).getNumericCellValue(), 0);
-
-		assertEquals("Amount UnsignedInt", rowHeadings.getCell(3).getStringCellValue());
-		assertEquals(new Double(12345), rowData.getCell(3).getNumericCellValue(), 0);
-		
-		wb.close();
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
deleted file mode 100644
index 366d853..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.io;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFPictureData;
-import org.apache.poi.POIDataSamples;
-
-
-public class TestLoadSaveXSSF extends TestCase {
-    private static final POIDataSamples _ssSampels = POIDataSamples.getSpreadSheetInstance();
-
-    public void testLoadSample() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook(_ssSampels.openResourceAsStream("sample.xlsx"));
-        assertEquals(3, workbook.getNumberOfSheets());
-        assertEquals("Sheet1", workbook.getSheetName(0));
-        Sheet sheet = workbook.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell((short) 1);
-        assertNotNull(cell);
-        assertEquals(111.0, cell.getNumericCellValue(), 0.0);
-        cell = row.getCell((short) 0);
-        assertEquals("Lorem", cell.getRichStringCellValue().getString());
-    }
-
-    // TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successful.
-    public void testLoadStyles() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook(_ssSampels.openResourceAsStream("styles.xlsx"));
-        Sheet sheet = workbook.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell((short) 0);
-        CellStyle style = cell.getCellStyle();
-        // assertNotNull(style);
-    }
-
-    // TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successful.
-    public void testLoadPictures() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook(_ssSampels.openResourceAsStream("picture.xlsx"));
-        List<XSSFPictureData> pictures = workbook.getAllPictures();
-        assertEquals(1, pictures.size());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
deleted file mode 100644
index d2fd60f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcCell;
-
-import junit.framework.TestCase;
-
-
-public final class TestCalculationChain extends TestCase {
-
-    public void test46535() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("46535.xlsx");
-
-        CalculationChain chain = wb.getCalculationChain();
-        //the bean holding the reference to the formula to be deleted
-        CTCalcCell c = chain.getCTCalcChain().getCArray(0);
-        int cnt = chain.getCTCalcChain().sizeOfCArray();
-        assertEquals(10, c.getI());
-        assertEquals("E1", c.getR());
-
-        XSSFSheet sheet = wb.getSheet("Test");
-        XSSFCell cell = sheet.getRow(0).getCell(4);
-
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        cell.setCellFormula(null);
-
-        //the count of items is less by one
-        c = chain.getCTCalcChain().getCArray(0);
-        int cnt2 =  chain.getCTCalcChain().sizeOfCArray();
-        assertEquals(cnt - 1, cnt2);
-        //the first item in the calculation chain is the former second one
-        assertEquals(10, c.getI());
-        assertEquals("C1", c.getR());
-
-        assertEquals(CellType.STRING, cell.getCellTypeEnum());
-        cell.setCellValue("ABC");
-        assertEquals(CellType.STRING, cell.getCellTypeEnum());
-    }
-
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
deleted file mode 100644
index 1c03b97..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCommentList;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-
-
-public class TestCommentsTable {
-
-    private static final String TEST_A2_TEXT = "test A2 text";
-    private static final String TEST_A1_TEXT = "test A1 text";
-    private static final String TEST_AUTHOR = "test author";
-
-    @Test
-    public void findAuthor() throws Exception {
-        CommentsTable sheetComments = new CommentsTable();
-        assertEquals(1, sheetComments.getNumberOfAuthors());
-        assertEquals(0, sheetComments.findAuthor(""));
-        assertEquals("", sheetComments.getAuthor(0));
-
-        assertEquals(1, sheetComments.findAuthor(TEST_AUTHOR));
-        assertEquals(2, sheetComments.findAuthor("another author"));
-        assertEquals(1, sheetComments.findAuthor(TEST_AUTHOR));
-        assertEquals(3, sheetComments.findAuthor("YAA"));
-        assertEquals(2, sheetComments.findAuthor("another author"));
-    }
-
-    @Test
-    public void getCellComment() throws Exception {
-        CommentsTable sheetComments = new CommentsTable();
-
-        CTComments comments = sheetComments.getCTComments();
-        CTCommentList commentList = comments.getCommentList();
-
-        // Create 2 comments for A1 and A" cells
-        CTComment comment0 = commentList.insertNewComment(0);
-        comment0.setRef("A1");
-        CTRst ctrst0 = CTRst.Factory.newInstance();
-        ctrst0.setT(TEST_A1_TEXT);
-        comment0.setText(ctrst0);
-        CTComment comment1 = commentList.insertNewComment(0);
-        comment1.setRef("A2");
-        CTRst ctrst1 = CTRst.Factory.newInstance();
-        ctrst1.setT(TEST_A2_TEXT);
-        comment1.setText(ctrst1);
-
-        // test finding the right comment for a cell
-        assertSame(comment0, sheetComments.getCTComment(new CellAddress("A1")));
-        assertSame(comment1, sheetComments.getCTComment(new CellAddress("A2")));
-        assertNull(sheetComments.getCTComment(new CellAddress("A3")));
-    }
-
-
-    @Test
-    public void existing() {
-        Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithVariousData.xlsx");
-        Sheet sheet1 = workbook.getSheetAt(0);
-        Sheet sheet2 = workbook.getSheetAt(1);
-
-        assertTrue( ((XSSFSheet)sheet1).hasComments() );
-        assertFalse( ((XSSFSheet)sheet2).hasComments() );
-
-        // Comments should be in C5 and C7
-        Row r5 = sheet1.getRow(4);
-        Row r7 = sheet1.getRow(6);
-        assertNotNull( r5.getCell(2).getCellComment() );
-        assertNotNull( r7.getCell(2).getCellComment() );
-
-        // Check they have what we expect
-        // TODO: Rich text formatting
-        Comment cc5 = r5.getCell(2).getCellComment();
-        Comment cc7 = r7.getCell(2).getCellComment();
-
-        assertEquals("Nick Burch", cc5.getAuthor());
-        assertEquals("Nick Burch:\nThis is a comment", cc5.getString().getString());
-        assertEquals(4, cc5.getRow());
-        assertEquals(2, cc5.getColumn());
-
-        assertEquals("Nick Burch", cc7.getAuthor());
-        assertEquals("Nick Burch:\nComment #1\n", cc7.getString().getString());
-        assertEquals(6, cc7.getRow());
-        assertEquals(2, cc7.getColumn());
-    }
-
-    @Test
-    public void writeRead() {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithVariousData.xlsx");
-        XSSFSheet sheet1 = workbook.getSheetAt(0);
-        XSSFSheet sheet2 = workbook.getSheetAt(1);
-
-        assertTrue( sheet1.hasComments() );
-        assertFalse( sheet2.hasComments() );
-
-        // Change on comment on sheet 1, and add another into
-        //  sheet 2
-        Row r5 = sheet1.getRow(4);
-        Comment cc5 = r5.getCell(2).getCellComment();
-        cc5.setAuthor("Apache POI");
-        cc5.setString(new XSSFRichTextString("Hello!"));
-
-        Row r2s2 = sheet2.createRow(2);
-        Cell c1r2s2 = r2s2.createCell(1);
-        assertNull(c1r2s2.getCellComment());
-
-        Drawing dg = sheet2.createDrawingPatriarch();
-        Comment cc2 = dg.createCellComment(new XSSFClientAnchor());
-        cc2.setAuthor("Also POI");
-        cc2.setString(new XSSFRichTextString("A new comment"));
-        c1r2s2.setCellComment(cc2);
-
-
-        // Save, and re-load the file
-        workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-
-        // Check we still have comments where we should do
-        sheet1 = workbook.getSheetAt(0);
-        sheet2 = workbook.getSheetAt(1);
-        assertNotNull(sheet1.getRow(4).getCell(2).getCellComment());
-        assertNotNull(sheet1.getRow(6).getCell(2).getCellComment());
-        assertNotNull(sheet2.getRow(2).getCell(1).getCellComment());
-
-        // And check they still have the contents they should do
-        assertEquals("Apache POI",
-                sheet1.getRow(4).getCell(2).getCellComment().getAuthor());
-        assertEquals("Nick Burch",
-                sheet1.getRow(6).getCell(2).getCellComment().getAuthor());
-        assertEquals("Also POI",
-                sheet2.getRow(2).getCell(1).getCellComment().getAuthor());
-
-        assertEquals("Hello!",
-                sheet1.getRow(4).getCell(2).getCellComment().getString().getString());
-    }
-
-    @Test
-    public void readWriteMultipleAuthors() {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithMoreVariousData.xlsx");
-        XSSFSheet sheet1 = workbook.getSheetAt(0);
-        XSSFSheet sheet2 = workbook.getSheetAt(1);
-
-        assertTrue( sheet1.hasComments() );
-        assertFalse( sheet2.hasComments() );
-
-        assertEquals("Nick Burch",
-                sheet1.getRow(4).getCell(2).getCellComment().getAuthor());
-        assertEquals("Nick Burch",
-                sheet1.getRow(6).getCell(2).getCellComment().getAuthor());
-        assertEquals("Torchbox",
-                sheet1.getRow(12).getCell(2).getCellComment().getAuthor());
-
-        // Save, and re-load the file
-        workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-
-        // Check we still have comments where we should do
-        sheet1 = workbook.getSheetAt(0);
-        assertNotNull(sheet1.getRow(4).getCell(2).getCellComment());
-        assertNotNull(sheet1.getRow(6).getCell(2).getCellComment());
-        assertNotNull(sheet1.getRow(12).getCell(2).getCellComment());
-
-        // And check they still have the contents they should do
-        assertEquals("Nick Burch",
-                sheet1.getRow(4).getCell(2).getCellComment().getAuthor());
-        assertEquals("Nick Burch",
-                sheet1.getRow(6).getCell(2).getCellComment().getAuthor());
-        assertEquals("Torchbox",
-                sheet1.getRow(12).getCell(2).getCellComment().getAuthor());
-
-        // Todo - check text too, once bug fixed
-    }
-
-    @Test
-    public void removeComment() throws Exception {
-        final CellAddress addrA1 = new CellAddress("A1");
-        final CellAddress addrA2 = new CellAddress("A2");
-        final CellAddress addrA3 = new CellAddress("A3");
-        
-        CommentsTable sheetComments = new CommentsTable();
-        CTComment a1 = sheetComments.newComment(addrA1);
-        CTComment a2 = sheetComments.newComment(addrA2);
-        CTComment a3 = sheetComments.newComment(addrA3);
-
-        assertSame(a1, sheetComments.getCTComment(addrA1));
-        assertSame(a2, sheetComments.getCTComment(addrA2));
-        assertSame(a3, sheetComments.getCTComment(addrA3));
-        assertEquals(3, sheetComments.getNumberOfComments());
-
-        assertTrue(sheetComments.removeComment(addrA1));
-        assertEquals(2, sheetComments.getNumberOfComments());
-        assertNull(sheetComments.getCTComment(addrA1));
-        assertSame(a2, sheetComments.getCTComment(addrA2));
-        assertSame(a3, sheetComments.getCTComment(addrA3));
-
-        assertTrue(sheetComments.removeComment(addrA2));
-        assertEquals(1, sheetComments.getNumberOfComments());
-        assertNull(sheetComments.getCTComment(addrA1));
-        assertNull(sheetComments.getCTComment(addrA2));
-        assertSame(a3, sheetComments.getCTComment(addrA3));
-
-        assertTrue(sheetComments.removeComment(addrA3));
-        assertEquals(0, sheetComments.getNumberOfComments());
-        assertNull(sheetComments.getCTComment(addrA1));
-        assertNull(sheetComments.getCTComment(addrA2));
-        assertNull(sheetComments.getCTComment(addrA3));
-    }
-
-    @Test
-    public void bug54920() throws IOException {
-        final Workbook workbook = new XSSFWorkbook();
-        final Sheet sheet = workbook.createSheet("sheet01");
-        // create anchor
-        CreationHelper helper = sheet.getWorkbook().getCreationHelper();
-        ClientAnchor anchor = helper.createClientAnchor();
-
-        // place comment in A1
-        // NOTE - only occurs if a comment is placed in A1 first
-        Cell A1 = getCell(sheet, 0, 0);
-        //Cell A1 = getCell(sheet, 2, 2);
-        Drawing drawing = sheet.createDrawingPatriarch();
-        setComment(sheet, A1, drawing, "for A1", helper, anchor);
-        
-        // find comment in A1 before we set the comment in B2
-        Comment commentA1 = A1.getCellComment();
-        assertNotNull("Should still find the previous comment in A1, but had null", commentA1);
-        assertEquals("should find correct comment in A1, but had null: " + commentA1, "for A1", commentA1.getString().getString());
-        
-        // place comment in B2, according to Bug 54920 this removes the comment in A1!
-        Cell B2 = getCell(sheet, 1, 1);
-        setComment(sheet, B2, drawing, "for B2", helper, anchor);
-
-        // find comment in A1
-        Comment commentB2 = B2.getCellComment();
-        assertEquals("should find correct comment in B2, but had null: " + commentB2, "for B2", commentB2.getString().getString());
-        
-        // find comment in A1
-        commentA1 = A1.getCellComment();
-        assertNotNull("Should still find the previous comment in A1, but had null", commentA1);
-        assertEquals("should find correct comment in A1, but had null: " + commentA1, "for A1", commentA1.getString().getString());
-        
-        workbook.close();
-    }
-    
-    // Set the comment on a sheet
-    //
-    private static void setComment(Sheet sheet, Cell cell, Drawing drawing, String commentText, CreationHelper helper, ClientAnchor anchor) {
-        System.out.println("Setting col: " + cell.getColumnIndex() + " and row " + cell.getRowIndex());
-        anchor.setCol1(cell.getColumnIndex());
-        anchor.setCol2(cell.getColumnIndex());
-        anchor.setRow1(cell.getRowIndex());
-        anchor.setRow2(cell.getRowIndex());
-        
-        // get comment, or create if it does not exist
-        // NOTE - only occurs if getCellComment is called first
-        Comment comment = cell.getCellComment();
-        //Comment comment = null;
-        if (comment == null) {
-            comment = drawing.createCellComment(anchor);
-        }
-        comment.setAuthor("Test");
-        
-        // attach the comment to the cell
-        comment.setString(helper.createRichTextString(commentText));
-        cell.setCellComment(comment);
-    }
-    
-    // Get a cell, create as needed
-    //
-    private static Cell getCell(Sheet sheet, int rowIndex, int colIndex) {
-        Row row = sheet.getRow(rowIndex);
-        if (row == null) {
-            row = sheet.createRow(rowIndex);
-        }
-        
-        Cell cell = row.getCell(colIndex);
-        if (cell == null) {
-            cell = row.createCell(colIndex);
-        }
-        
-        return cell;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java
deleted file mode 100644
index 1fbf86a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-public final class TestExternalLinksTable {
-    @Test
-    public void none() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("SampleSS.xlsx");
-        assertNotNull(wb.getExternalLinksTable());
-        assertEquals(0, wb.getExternalLinksTable().size());
-    }
-    
-    @Test
-    public void basicRead() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref-56737.xlsx");
-        assertNotNull(wb.getExternalLinksTable());
-        Name name = null;
-
-        assertEquals(1, wb.getExternalLinksTable().size());
-
-        ExternalLinksTable links = wb.getExternalLinksTable().get(0);
-        assertEquals(3, links.getSheetNames().size());
-        assertEquals(2, links.getDefinedNames().size());
-        
-        assertEquals("Uses",    links.getSheetNames().get(0));
-        assertEquals("Defines", links.getSheetNames().get(1));
-        assertEquals("56737",   links.getSheetNames().get(2));
-        
-        name = links.getDefinedNames().get(0);
-        assertEquals("NR_Global_B2", name.getNameName());
-        assertEquals(-1, name.getSheetIndex());
-        assertEquals(null, name.getSheetName());
-        assertEquals("'Defines'!$B$2", name.getRefersToFormula());
-        
-        name = links.getDefinedNames().get(1);
-        assertEquals("NR_To_A1", name.getNameName());
-        assertEquals(1, name.getSheetIndex());
-        assertEquals("Defines", name.getSheetName());
-        assertEquals("'Defines'!$A$1", name.getRefersToFormula());
-        
-        assertEquals("56737.xlsx", links.getLinkedFileName());
-    }
-    
-    @Test
-    public void basicReadWriteRead() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref-56737.xlsx");
-        Name name = wb.getExternalLinksTable().get(0).getDefinedNames().get(1);
-        name.setNameName("Testing");
-        name.setRefersToFormula("$A$1");
-        
-        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertEquals(1, wb.getExternalLinksTable().size());
-        ExternalLinksTable links = wb.getExternalLinksTable().get(0);
-        
-        name = links.getDefinedNames().get(0);
-        assertEquals("NR_Global_B2", name.getNameName());
-        assertEquals(-1, name.getSheetIndex());
-        assertEquals(null, name.getSheetName());
-        assertEquals("'Defines'!$B$2", name.getRefersToFormula());
-        
-        name = links.getDefinedNames().get(1);
-        assertEquals("Testing", name.getNameName());
-        assertEquals(1, name.getSheetIndex());
-        assertEquals("Defines", name.getSheetName());
-        assertEquals("$A$1", name.getRefersToFormula());
-    }
-    
-    @Test
-    public void readWithReferencesToTwoExternalBooks() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref2-56737.xlsx");
-        
-        assertNotNull(wb.getExternalLinksTable());
-        Name name = null;
-
-        assertEquals(2, wb.getExternalLinksTable().size());
-
-        // Check the first one, links to 56737.xlsx
-        ExternalLinksTable links = wb.getExternalLinksTable().get(0);
-        assertEquals("56737.xlsx", links.getLinkedFileName());
-        assertEquals(3, links.getSheetNames().size());
-        assertEquals(2, links.getDefinedNames().size());
-        
-        assertEquals("Uses",    links.getSheetNames().get(0));
-        assertEquals("Defines", links.getSheetNames().get(1));
-        assertEquals("56737",   links.getSheetNames().get(2));
-        
-        name = links.getDefinedNames().get(0);
-        assertEquals("NR_Global_B2", name.getNameName());
-        assertEquals(-1, name.getSheetIndex());
-        assertEquals(null, name.getSheetName());
-        assertEquals("'Defines'!$B$2", name.getRefersToFormula());
-        
-        name = links.getDefinedNames().get(1);
-        assertEquals("NR_To_A1", name.getNameName());
-        assertEquals(1, name.getSheetIndex());
-        assertEquals("Defines", name.getSheetName());
-        assertEquals("'Defines'!$A$1", name.getRefersToFormula());
-
-        
-        // Check the second one, links to 56737.xls, slightly differently
-        links = wb.getExternalLinksTable().get(1);
-        assertEquals("56737.xls", links.getLinkedFileName());
-        assertEquals(2, links.getSheetNames().size());
-        assertEquals(2, links.getDefinedNames().size());
-        
-        assertEquals("Uses",    links.getSheetNames().get(0));
-        assertEquals("Defines", links.getSheetNames().get(1));
-        
-        name = links.getDefinedNames().get(0);
-        assertEquals("NR_Global_B2", name.getNameName());
-        assertEquals(-1, name.getSheetIndex());
-        assertEquals(null, name.getSheetName());
-        assertEquals("'Defines'!$B$2", name.getRefersToFormula());
-        
-        name = links.getDefinedNames().get(1);
-        assertEquals("NR_To_A1", name.getNameName());
-        assertEquals(1, name.getSheetIndex());
-        assertEquals("Defines", name.getSheetName());
-        assertEquals("'Defines'!$A$1", name.getRefersToFormula());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
deleted file mode 100644
index 33e91e8..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.model;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFMap;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMapInfo;
-import org.w3c.dom.Node;
-
-/**
- * @author Roberto Manicardi
- */
-public final class TestMapInfo extends TestCase {
-
-
-    public void testMapInfoExists() {
-
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
-
-        MapInfo mapInfo = null;
-        SingleXmlCells singleXMLCells = null;
-
-        for (POIXMLDocumentPart p : wb.getRelations()) {
-
-
-            if (p instanceof MapInfo) {
-                mapInfo = (MapInfo) p;
-
-
-                CTMapInfo ctMapInfo = mapInfo.getCTMapInfo();
-
-                assertNotNull(ctMapInfo);
-
-                assertEquals(1, ctMapInfo.sizeOfSchemaArray());
-
-                for (XSSFMap map : mapInfo.getAllXSSFMaps()) {
-                    Node xmlSchema = map.getSchema();
-                    assertNotNull(xmlSchema);
-                }
-            }
-        }
-
-        XSSFSheet sheet1 = wb.getSheetAt(0);
-
-        for (POIXMLDocumentPart p : sheet1.getRelations()) {
-
-            if (p instanceof SingleXmlCells) {
-                singleXMLCells = (SingleXmlCells) p;
-            }
-
-        }
-        assertNotNull(mapInfo);
-        assertNotNull(singleXMLCells);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java
deleted file mode 100644
index ef87a9f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRElt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-
-import junit.framework.TestCase;
-
-/**
- * Test {@link SharedStringsTable}, the cache of strings in a workbook
- *
- * @author Yegor Kozlov
- */
-public final class TestSharedStringsTable extends TestCase {
-
-    public void testCreateNew() {
-        SharedStringsTable sst = new SharedStringsTable();
-
-        CTRst st;
-        int idx;
-
-        // Check defaults
-        assertNotNull(sst.getItems());
-        assertEquals(0, sst.getItems().size());
-        assertEquals(0, sst.getCount());
-        assertEquals(0, sst.getUniqueCount());
-
-        st = CTRst.Factory.newInstance();
-        st.setT("Hello, World!");
-
-        idx = sst.addEntry(st);
-        assertEquals(0, idx);
-        assertEquals(1, sst.getCount());
-        assertEquals(1, sst.getUniqueCount());
-
-        //add the same entry again
-        idx = sst.addEntry(st);
-        assertEquals(0, idx);
-        assertEquals(2, sst.getCount());
-        assertEquals(1, sst.getUniqueCount());
-
-        //and again
-        idx = sst.addEntry(st);
-        assertEquals(0, idx);
-        assertEquals(3, sst.getCount());
-        assertEquals(1, sst.getUniqueCount());
-
-        st = CTRst.Factory.newInstance();
-        st.setT("Second string");
-
-        idx = sst.addEntry(st);
-        assertEquals(1, idx);
-        assertEquals(4, sst.getCount());
-        assertEquals(2, sst.getUniqueCount());
-
-        //add the same entry again
-        idx = sst.addEntry(st);
-        assertEquals(1, idx);
-        assertEquals(5, sst.getCount());
-        assertEquals(2, sst.getUniqueCount());
-
-        st = CTRst.Factory.newInstance();
-        CTRElt r = st.addNewR();
-        CTRPrElt pr = r.addNewRPr();
-        pr.addNewColor().setRgb(new byte[]{(byte)0xFF, 0, 0}); //red
-        pr.addNewI().setVal(true);  //bold
-        pr.addNewB().setVal(true);  //italic
-        r.setT("Second string");
-
-        idx = sst.addEntry(st);
-        assertEquals(2, idx);
-        assertEquals(6, sst.getCount());
-        assertEquals(3, sst.getUniqueCount());
-
-        idx = sst.addEntry(st);
-        assertEquals(2, idx);
-        assertEquals(7, sst.getCount());
-        assertEquals(3, sst.getUniqueCount());
-
-        //OK. the sst table is filled, check the contents
-        assertEquals(3, sst.getItems().size());
-        assertEquals("Hello, World!", new XSSFRichTextString(sst.getEntryAt(0)).toString());
-        assertEquals("Second string", new XSSFRichTextString(sst.getEntryAt(1)).toString());
-        assertEquals("Second string", new XSSFRichTextString(sst.getEntryAt(2)).toString());
-    }
-
-    public void testReadWrite() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("sample.xlsx");
-        SharedStringsTable sst1 = wb1.getSharedStringSource();
-
-        //serialize, read back and compare with the original
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        SharedStringsTable sst2 = wb2.getSharedStringSource();
-
-        assertEquals(sst1.getCount(), sst2.getCount());
-        assertEquals(sst1.getUniqueCount(), sst2.getUniqueCount());
-
-        List<CTRst> items1 = sst1.getItems();
-        List<CTRst> items2 = sst2.getItems();
-        assertEquals(items1.size(), items2.size());
-        for (int i = 0; i < items1.size(); i++) {
-            CTRst st1 = items1.get(i);
-            CTRst st2 = items2.get(i);
-            assertEquals(st1.toString(), st2.toString());
-        }
-
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        assertNotNull(wb3);
-        wb3.close();
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Test for Bugzilla 48936
-     *
-     * A specific sequence of strings can result in broken CDATA section in sharedStrings.xml file.
-     *
-     * @author Philippe Laflamme
-     */
-    public void testBug48936() throws IOException {
-        Workbook w1 = new XSSFWorkbook();
-        Sheet s = w1.createSheet();
-        int i = 0;
-        List<String> lst = readStrings("48936-strings.txt");
-        for (String str : lst) {
-            s.createRow(i++).createCell(0).setCellValue(str);
-        }
-
-        Workbook w2 = XSSFTestDataSamples.writeOutAndReadBack(w1);
-        w1.close();
-        s = w2.getSheetAt(0);
-        i = 0;
-        for (String str : lst) {
-            String val = s.getRow(i++).getCell(0).getStringCellValue();
-            assertEquals(str, val);
-        }
-        
-        Workbook w3 = XSSFTestDataSamples.writeOutAndReadBack(w2);
-        w2.close();
-        assertNotNull(w3);
-        w3.close();
-    }
-
-    private List<String> readStrings(String filename) throws IOException {
-        List<String> strs = new ArrayList<String>();
-        POIDataSamples samples = POIDataSamples.getSpreadSheetInstance();
-        BufferedReader br = new BufferedReader(
-                new InputStreamReader(samples.openResourceAsStream(filename), "UTF-8"));
-        String s;
-        while ((s = br.readLine()) != null) {
-            if (s.trim().length() > 0) {
-                strs.add(s.trim());
-            }
-        }
-        br.close();
-        return strs;
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
deleted file mode 100644
index 9d29fc4..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public final class TestStylesTable {
-    private static final String testFile = "Formatting.xlsx";
-    private static final String customDataFormat = "YYYY-mm-dd";
-    
-    @BeforeClass
-    public static void assumeCustomDataFormatIsNotBuiltIn() {
-        assertEquals(-1, BuiltinFormats.getBuiltinFormat(customDataFormat));
-    }
-
-    @Test
-    public void testCreateNew() {
-        StylesTable st = new StylesTable();
-
-        // Check defaults
-        assertNotNull(st.getCTStylesheet());
-        assertEquals(1, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(0, st.getNumDataFormats());
-    }
-
-    @Test
-    public void testCreateSaveLoad() {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        StylesTable st = wb.getStylesSource();
-
-        assertNotNull(st.getCTStylesheet());
-        assertEquals(1, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(0, st.getNumDataFormats());
-
-        st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource();
-
-        assertNotNull(st.getCTStylesheet());
-        assertEquals(1, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(0, st.getNumDataFormats());
-        
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb));
-    }
-
-    @Test
-    public void testLoadExisting() {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook(testFile);
-        assertNotNull(workbook.getStylesSource());
-
-        StylesTable st = workbook.getStylesSource();
-
-        doTestExisting(st);
-        
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(workbook));
-    }
-
-    @Test
-    public void testLoadSaveLoad() {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook(testFile);
-        assertNotNull(workbook.getStylesSource());
-
-        StylesTable st = workbook.getStylesSource();
-        doTestExisting(st);
-
-        st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource();
-        doTestExisting(st);
-    }
-
-    public void doTestExisting(StylesTable st) {
-        // Check contents
-        assertNotNull(st.getCTStylesheet());
-        assertEquals(11, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(8, st.getNumDataFormats());
-
-        assertEquals(2, st.getFonts().size());
-        assertEquals(2, st.getFills().size());
-        assertEquals(1, st.getBorders().size());
-
-        assertEquals("yyyy/mm/dd", st.getNumberFormatAt((short)165));
-        assertEquals("yy/mm/dd", st.getNumberFormatAt((short)167));
-
-        assertNotNull(st.getStyleAt(0));
-        assertNotNull(st.getStyleAt(1));
-        assertNotNull(st.getStyleAt(2));
-        
-        assertEquals(0, st.getStyleAt(0).getDataFormat());
-        assertEquals(14, st.getStyleAt(1).getDataFormat());
-        assertEquals(0, st.getStyleAt(2).getDataFormat());
-        assertEquals(165, st.getStyleAt(3).getDataFormat());
-
-        assertEquals("yyyy/mm/dd", st.getStyleAt(3).getDataFormatString());
-    }
-
-    @Test
-    public void populateNew() {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        StylesTable st = wb.getStylesSource();
-
-        assertNotNull(st.getCTStylesheet());
-        assertEquals(1, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(0, st.getNumDataFormats());
-
-        int nf1 = st.putNumberFormat("yyyy-mm-dd");
-        int nf2 = st.putNumberFormat("yyyy-mm-DD");
-        assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd"));
-
-        st.putStyle(new XSSFCellStyle(st));
-
-        // Save and re-load
-        st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource();
-
-        assertNotNull(st.getCTStylesheet());
-        assertEquals(2, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(2, st.getNumDataFormats());
-
-        assertEquals("yyyy-mm-dd", st.getNumberFormatAt((short)nf1));
-        assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd"));
-        assertEquals(nf2, st.putNumberFormat("yyyy-mm-DD"));
-        
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb));
-    }
-
-    @Test
-    public void populateExisting() {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook(testFile);
-        assertNotNull(workbook.getStylesSource());
-
-        StylesTable st = workbook.getStylesSource();
-        assertEquals(11, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(8, st.getNumDataFormats());
-
-        int nf1 = st.putNumberFormat("YYYY-mm-dd");
-        int nf2 = st.putNumberFormat("YYYY-mm-DD");
-        assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd"));
-
-        st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource();
-
-        assertEquals(11, st._getXfsSize());
-        assertEquals(1, st._getStyleXfsSize());
-        assertEquals(10, st.getNumDataFormats());
-
-        assertEquals("YYYY-mm-dd", st.getNumberFormatAt((short)nf1));
-        assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd"));
-        assertEquals(nf2, st.putNumberFormat("YYYY-mm-DD"));
-        
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(workbook));
-    }
-    
-    @Test
-    public void exceedNumberFormatLimit() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            StylesTable styles = wb.getStylesSource();
-            for (int i = 0; i < styles.getMaxNumberOfDataFormats(); i++) {
-                wb.getStylesSource().putNumberFormat("\"test" + i + " \"0");
-            }
-            try {
-                wb.getStylesSource().putNumberFormat("\"anotherformat \"0");
-            } catch (final IllegalStateException e) {
-                if (e.getMessage().startsWith("The maximum number of Data Formats was exceeded.")) {
-                    //expected
-                }
-                else {
-                    throw e;
-                }
-            }
-        } finally {
-            wb.close();
-        }
-    }
-    
-    private static final <K,V> void assertNotContainsKey(Map<K,V> map, K key) {
-        assertFalse(map.containsKey(key));
-    }
-    private static final <K,V> void assertNotContainsValue(Map<K,V> map, V value) {
-        assertFalse(map.containsValue(value));
-    }
-    
-    @Test
-    public void removeNumberFormat() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        try {
-            final String fmt = customDataFormat;
-            final short fmtIdx = (short) wb1.getStylesSource().putNumberFormat(fmt);
-            
-            Cell cell = wb1.createSheet("test").createRow(0).createCell(0);
-            cell.setCellValue(5.25);
-            CellStyle style = wb1.createCellStyle();
-            style.setDataFormat(fmtIdx);
-            cell.setCellStyle(style);
-            
-            assertEquals(fmt, cell.getCellStyle().getDataFormatString());
-            assertEquals(fmt, wb1.getStylesSource().getNumberFormatAt(fmtIdx));
-            
-            // remove the number format from the workbook
-            wb1.getStylesSource().removeNumberFormat(fmt);
-            
-            // number format in CellStyles should be restored to default number format
-            final short defaultFmtIdx = 0;
-            final String defaultFmt = BuiltinFormats.getBuiltinFormat(0);
-            assertEquals(defaultFmtIdx, style.getDataFormat());
-            assertEquals(defaultFmt, style.getDataFormatString());
-            
-            // The custom number format should be entirely removed from the workbook
-            Map<Short,String> numberFormats = wb1.getStylesSource().getNumberFormats();
-            assertNotContainsKey(numberFormats, fmtIdx);
-            assertNotContainsValue(numberFormats, fmt);
-            
-            // The default style shouldn't be added back to the styles source because it's built-in
-            assertEquals(0, wb1.getStylesSource().getNumDataFormats());
-            
-            cell = null; style = null; numberFormats = null;
-            XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutCloseAndReadBack(wb1);
-            
-            cell = wb2.getSheet("test").getRow(0).getCell(0);
-            style = cell.getCellStyle();
-            
-            // number format in CellStyles should be restored to default number format
-            assertEquals(defaultFmtIdx, style.getDataFormat());
-            assertEquals(defaultFmt, style.getDataFormatString());
-            
-            // The custom number format should be entirely removed from the workbook
-            numberFormats = wb2.getStylesSource().getNumberFormats();
-            assertNotContainsKey(numberFormats, fmtIdx);
-            assertNotContainsValue(numberFormats, fmt);
-            
-            // The default style shouldn't be added back to the styles source because it's built-in
-            assertEquals(0, wb2.getStylesSource().getNumDataFormats());
-            
-            wb2.close();
-            
-        } finally {
-            wb1.close();
-        }
-    }
-    
-    @Test
-    public void maxNumberOfDataFormats() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        
-        try {
-            StylesTable styles = wb.getStylesSource();
-            
-            // Check default limit
-            int n = styles.getMaxNumberOfDataFormats();
-            // https://support.office.com/en-us/article/excel-specifications-and-limits-1672b34d-7043-467e-8e27-269d656771c3
-            assertTrue(200 <= n);
-            assertTrue(n <= 250);
-            
-            // Check upper limit
-            n = Integer.MAX_VALUE;
-            styles.setMaxNumberOfDataFormats(n);
-            assertEquals(n, styles.getMaxNumberOfDataFormats());
-            
-            // Check negative (illegal) limits
-            try {
-                styles.setMaxNumberOfDataFormats(-1);
-                fail("Expected to get an IllegalArgumentException(\"Maximum Number of Data Formats must be greater than or equal to 0\")");
-            } catch (final IllegalArgumentException e) {
-                if (e.getMessage().startsWith("Maximum Number of Data Formats must be greater than or equal to 0")) {
-                    // expected
-                } else {
-                    throw e;
-                }
-            }
-        }
-        finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void addDataFormatsBeyondUpperLimit() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        
-        try {
-            StylesTable styles = wb.getStylesSource();
-            styles.setMaxNumberOfDataFormats(0);
-            
-            // Try adding a format beyond the upper limit
-            try {
-                styles.putNumberFormat("\"test \"0");
-                fail("Expected to raise IllegalStateException");
-            } catch (final IllegalStateException e) {
-                if (e.getMessage().startsWith("The maximum number of Data Formats was exceeded.")) {
-                    // expected
-                } else {
-                    throw e;
-                }
-            }
-        }
-        finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void decreaseUpperLimitBelowCurrentNumDataFormats() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        
-        try {
-            StylesTable styles = wb.getStylesSource();
-            styles.putNumberFormat(customDataFormat);
-            
-            // Try decreasing the upper limit below the current number of formats
-            try {
-                styles.setMaxNumberOfDataFormats(0);
-                fail("Expected to raise IllegalStateException");
-            } catch (final IllegalStateException e) {
-                if (e.getMessage().startsWith("Cannot set the maximum number of data formats less than the current quantity.")) {
-                    // expected
-                } else {
-                    throw e;
-                }
-            }
-        }
-        finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
deleted file mode 100644
index ffeceb2..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.FileOutputStream;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.ThemesTable.ThemeElement;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-
-public class TestThemesTable {
-    private final String testFileSimple = "Themes.xlsx";
-    private final String testFileComplex = "Themes2.xlsx";
-    // TODO .xls version available too, add HSSF support then check 
-    
-    // What colours they should show up as
-    private static String rgbExpected[] = {
-            "ffffff", // Lt1
-            "000000", // Dk1
-            "eeece1", // Lt2
-            "1f497d", // DK2
-            "4f81bd", // Accent1
-            "c0504d", // Accent2
-            "9bbb59", // Accent3
-            "8064a2", // Accent4
-            "4bacc6", // Accent5
-            "f79646", // Accent6
-            "0000ff", // Hlink
-            "800080"  // FolHlink
-    };
-
-    @Test
-    public void testThemesTableColors() throws Exception {
-        // Load our two test workbooks
-        XSSFWorkbook simple = XSSFTestDataSamples.openSampleWorkbook(testFileSimple);
-        XSSFWorkbook complex = XSSFTestDataSamples.openSampleWorkbook(testFileComplex);
-        // Save and re-load them, to check for stability across that
-        XSSFWorkbook simpleRS = XSSFTestDataSamples.writeOutAndReadBack(simple);
-        XSSFWorkbook complexRS = XSSFTestDataSamples.writeOutAndReadBack(complex);
-        // Fetch fresh copies to test with
-        simple = XSSFTestDataSamples.openSampleWorkbook(testFileSimple);
-        complex = XSSFTestDataSamples.openSampleWorkbook(testFileComplex);
-        // Files and descriptions
-        Map<String,XSSFWorkbook> workbooks = new LinkedHashMap<String, XSSFWorkbook>();
-        workbooks.put(testFileSimple, simple);
-        workbooks.put("Re-Saved_" + testFileSimple, simpleRS);
-        workbooks.put(testFileComplex, complex);
-        workbooks.put("Re-Saved_" + testFileComplex, complexRS);
-        
-        // Sanity check
-        assertEquals(rgbExpected.length, rgbExpected.length);
-        
-        // For offline testing
-        boolean createFiles = false;
-        
-        // Check each workbook in turn, and verify that the colours
-        //  for the theme-applied cells in Column A are correct
-        for (String whatWorkbook : workbooks.keySet()) {
-            XSSFWorkbook workbook = workbooks.get(whatWorkbook);
-            XSSFSheet sheet = workbook.getSheetAt(0);
-            int startRN = 0;
-            if (whatWorkbook.endsWith(testFileComplex)) startRN++;
-            
-            for (int rn=startRN; rn<rgbExpected.length+startRN; rn++) {
-                XSSFRow row = sheet.getRow(rn);
-                assertNotNull("Missing row " + rn + " in " + whatWorkbook, row);
-                String ref = (new CellReference(rn, 0)).formatAsString();
-                XSSFCell cell = row.getCell(0);
-                assertNotNull(
-                        "Missing cell " + ref + " in " + whatWorkbook, cell);
-
-                int expectedThemeIdx = rn-startRN;
-                ThemeElement themeElem = ThemeElement.byId(expectedThemeIdx);
-                assertEquals(
-                        "Wrong theme at " + ref + " in " + whatWorkbook,
-                        themeElem.name.toLowerCase(Locale.ROOT), cell.getStringCellValue());
-
-                // Fonts are theme-based in their colours
-                XSSFFont font = cell.getCellStyle().getFont();
-                CTColor ctColor = font.getCTFont().getColorArray(0);
-                assertNotNull(ctColor);
-                assertEquals(true, ctColor.isSetTheme());
-                assertEquals(themeElem.idx, ctColor.getTheme());
-                
-                // Get the colour, via the theme
-                XSSFColor color = font.getXSSFColor();
-                // Theme colours aren't tinted
-                assertEquals(false, color.hasTint());
-                // Check the RGB part (no tint)
-                assertEquals(
-                        "Wrong theme colour " + themeElem.name + " on " + whatWorkbook,
-                        rgbExpected[expectedThemeIdx], Hex.encodeHexString(color.getRGB()));
-                long themeIdx = font.getCTFont().getColorArray(0).getTheme();
-                assertEquals(
-                        "Wrong theme index " + expectedThemeIdx + " on " + whatWorkbook,
-                        expectedThemeIdx, themeIdx);
-                
-                if (createFiles) {
-                    XSSFCellStyle cs = row.getSheet().getWorkbook().createCellStyle();
-                    cs.setFillForegroundColor(color);
-                    cs.setFillPattern(CellStyle.SOLID_FOREGROUND);
-                    row.createCell(1).setCellStyle(cs);
-                }
-            }
-            
-            if (createFiles) {
-                FileOutputStream fos = new FileOutputStream("Generated_"+whatWorkbook);
-                workbook.write(fos);
-                fos.close();
-            }
-        }
-    }
-
-    /**
-     * Ensure that, for a file with themes, we can correctly
-     *  read both the themed and non-themed colours back.
-     * Column A = Theme Foreground
-     * Column B = Theme Foreground
-     * Column C = Explicit Colour Foreground
-     * Column E = Explicit Colour Background, Black Foreground
-     * Column G = Conditional Formatting Backgrounds
-     * 
-     * Note - Grey Row has an odd way of doing the styling... 
-     */
-    @Test
-    public void themedAndNonThemedColours() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook(testFileComplex);
-        XSSFSheet sheet = wb.getSheetAt(0);
-        XSSFCellStyle style;
-        XSSFColor color;
-        XSSFCell cell;
-        
-        String[] names = {"White","Black","Grey","Dark Blue","Blue","Red","Green"};
-        String[] explicitFHexes = { "FFFFFFFF", "FF000000", "FFC0C0C0", "FF002060",
-                                    "FF0070C0", "FFFF0000", "FF00B050" };
-        String[] explicitBHexes = { "FFFFFFFF", "FF000000", "FFC0C0C0", "FF002060",
-                                    "FF0000FF", "FFFF0000", "FF00FF00" };
-        assertEquals(7, names.length);
-        
-        // Check the non-CF colours in Columns A, B, C and E
-        for (int rn=1; rn<8; rn++) {
-            int idx = rn-1;
-            XSSFRow row = sheet.getRow(rn);
-            assertNotNull("Missing row " + rn, row);
-            
-            // Theme cells come first
-            XSSFCell themeCell = row.getCell(0);
-            ThemeElement themeElem = ThemeElement.byId(idx);
-            assertCellContents(themeElem.name, themeCell);
-
-            // Sanity check names
-            assertCellContents(names[idx], row.getCell(1));
-            assertCellContents(names[idx], row.getCell(2));
-            assertCellContents(names[idx], row.getCell(4));
-            
-            
-            // Check the colours
-            
-            //  A: Theme Based, Foreground
-            style = themeCell.getCellStyle();
-            color = style.getFont().getXSSFColor();
-            assertEquals(true, color.isThemed());
-            assertEquals(idx, color.getTheme());
-            assertEquals(rgbExpected[idx], Hex.encodeHexString(color.getRGB()));
-            
-            //  B: Theme Based, Foreground
-            cell = row.getCell(1);
-            style = cell.getCellStyle();
-            color = style.getFont().getXSSFColor();
-            assertEquals(true, color.isThemed());
-            if (idx != 2) {
-                assertEquals(idx, color.getTheme());
-                assertEquals(rgbExpected[idx], Hex.encodeHexString(color.getRGB()));
-            } else {
-                assertEquals(1, color.getTheme());
-                assertEquals(0.50, color.getTint(), 0.001);
-            }
-            
-            //  C: Explicit, Foreground
-            cell = row.getCell(2);
-            style = cell.getCellStyle();
-            color = style.getFont().getXSSFColor();
-            assertEquals(false, color.isThemed());
-            assertEquals(explicitFHexes[idx], color.getARGBHex());
-            
-            // E: Explicit Background, Foreground all Black
-            cell = row.getCell(4);
-            style = cell.getCellStyle();
-            
-            color = style.getFont().getXSSFColor();
-            assertEquals(true, color.isThemed());
-            assertEquals("FF000000", color.getARGBHex());
-            
-            color = style.getFillForegroundXSSFColor();
-            assertEquals(false, color.isThemed());
-            assertEquals(explicitBHexes[idx], color.getARGBHex());
-            color = style.getFillBackgroundColorColor();
-            assertEquals(false, color.isThemed());
-            assertEquals(null, color.getARGBHex());
-        }
-        
-        // Check the CF colours
-        // TODO
-    }
-    private static void assertCellContents(String expected, XSSFCell cell) {
-        assertNotNull(cell);
-        assertEquals(expected.toLowerCase(Locale.ROOT), 
-                     cell.getStringCellValue().toLowerCase(Locale.ROOT));
-    }
-    
-    @Test
-    @SuppressWarnings("resource")
-    public void testAddNew() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        wb.createSheet();
-        assertEquals(null, wb.getTheme());
-        
-        StylesTable styles = wb.getStylesSource();
-        assertEquals(null, styles.getTheme());
-        
-        styles.ensureThemesTable();
-        
-        assertNotNull(styles.getTheme());
-        assertNotNull(wb.getTheme());
-        
-        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        styles = wb.getStylesSource();
-        assertNotNull(styles.getTheme());
-        assertNotNull(wb.getTheme());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
deleted file mode 100644
index cb90efb..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.streaming;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.poifs.crypt.temp.SXSSFWorkbookWithCustomZipEntrySource;
-import org.apache.poi.poifs.crypt.temp.SheetDataWriterWithDecorator;
-
-// a class to record a list of temporary files that are written to disk
-// afterwards, a test function can check whether these files were encrypted or not
-public class TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource extends SXSSFWorkbookWithCustomZipEntrySource {
-
-    private final List<File> tempFiles = new ArrayList<File>();
-
-    List<File> getTempFiles() {
-        return new ArrayList<File>(tempFiles);
-    }
-    
-    @Override
-    protected SheetDataWriter createSheetDataWriter() throws IOException {
-        return new TempFileRecordingSheetDataWriterWithDecorator();
-    }
-
-    class TempFileRecordingSheetDataWriterWithDecorator extends SheetDataWriterWithDecorator {
-
-        TempFileRecordingSheetDataWriterWithDecorator() throws IOException {
-            super();
-            tempFiles.add(getTempFile());
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
deleted file mode 100644
index a6a2dde..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.SheetUtil;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * Tests the auto-sizing behaviour of {@link SXSSFSheet} when not all
- * rows fit into the memory window size etc.
- * 
- * @see Bug #57450 which reported the original mis-behaviour
- */
-public class TestAutoSizeColumnTracker {
-    
-    private SXSSFSheet sheet;
-    private SXSSFWorkbook workbook;
-    private AutoSizeColumnTracker tracker;
-    private static final SortedSet<Integer> columns;
-    static {
-        SortedSet<Integer>_columns = new TreeSet<Integer>();
-        _columns.add(0);
-        _columns.add(1);
-        _columns.add(3);
-        columns = Collections.unmodifiableSortedSet(_columns);
-    }
-    private final static String SHORT_MESSAGE = "short";
-    private final static String LONG_MESSAGE = "This is a test of a long message! This is a test of a long message!";
-    
-    @Before
-    public void setUpSheetAndWorkbook() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        tracker = new AutoSizeColumnTracker(sheet);
-    }
-    
-    @After
-    public void tearDownSheetAndWorkbook() throws IOException {
-        if (sheet != null) {
-            sheet.dispose();
-        }
-        if (workbook != null) {
-            workbook.close();
-        }
-    }
-    
-    @Test
-    public void trackAndUntrackColumn() {
-        assumeTrue(tracker.getTrackedColumns().isEmpty());
-        tracker.trackColumn(0);
-        Set<Integer> expected = new HashSet<Integer>();
-        expected.add(0);
-        assertEquals(expected, tracker.getTrackedColumns());
-        tracker.untrackColumn(0);
-        assertTrue(tracker.getTrackedColumns().isEmpty());
-    }
-    
-    @Test
-    public void trackAndUntrackColumns() {
-        assumeTrue(tracker.getTrackedColumns().isEmpty());
-        tracker.trackColumns(columns);
-        assertEquals(columns, tracker.getTrackedColumns());
-        tracker.untrackColumn(3);
-        tracker.untrackColumn(0);
-        tracker.untrackColumn(1);
-        assertTrue(tracker.getTrackedColumns().isEmpty());
-        tracker.trackColumn(0);
-        tracker.trackColumns(columns);
-        tracker.untrackColumn(4);
-        assertEquals(columns, tracker.getTrackedColumns());
-        tracker.untrackColumns(columns);
-        assertTrue(tracker.getTrackedColumns().isEmpty());
-    }
-    
-    @Test
-    public void trackAndUntrackAllColumns() {
-        assumeTrue(tracker.getTrackedColumns().isEmpty());
-        tracker.trackAllColumns();
-        assertTrue(tracker.getTrackedColumns().isEmpty());
-        
-        Row row = sheet.createRow(0);
-        for (int column : columns) {
-            row.createCell(column);
-        }
-        // implicitly track the columns
-        tracker.updateColumnWidths(row);
-        assertEquals(columns, tracker.getTrackedColumns());
-        
-        tracker.untrackAllColumns();
-        assertTrue(tracker.getTrackedColumns().isEmpty());
-    }
-    
-    @Test
-    public void isColumnTracked() {
-        assumeFalse(tracker.isColumnTracked(0));
-        tracker.trackColumn(0);
-        assertTrue(tracker.isColumnTracked(0));
-        tracker.untrackColumn(0);
-        assertFalse(tracker.isColumnTracked(0));
-    }
-    
-    @Test
-    public void getTrackedColumns() {
-        assumeTrue(tracker.getTrackedColumns().isEmpty());
-        
-        for (int column : columns) {
-            tracker.trackColumn(column);
-        }
-
-        assertEquals(3, tracker.getTrackedColumns().size());
-        assertEquals(columns, tracker.getTrackedColumns());
-    }
-    
-    @Test
-    public void isAllColumnsTracked() {
-        assertFalse(tracker.isAllColumnsTracked());
-        tracker.trackAllColumns();
-        assertTrue(tracker.isAllColumnsTracked());
-        tracker.untrackAllColumns();
-        assertFalse(tracker.isAllColumnsTracked());
-    }
-    
-    @Test
-    public void updateColumnWidths_and_getBestFitColumnWidth() {
-        tracker.trackAllColumns();
-        Row row1 = sheet.createRow(0);
-        Row row2 = sheet.createRow(1);
-        // A1, B1, D1
-        for (int column : columns) {
-            row1.createCell(column).setCellValue(LONG_MESSAGE);
-            row2.createCell(column+1).setCellValue(SHORT_MESSAGE);
-        }
-        tracker.updateColumnWidths(row1);
-        tracker.updateColumnWidths(row2);
-        sheet.addMergedRegion(CellRangeAddress.valueOf("D1:E1"));
-        
-        assumeRequiredFontsAreInstalled(workbook, row1.getCell(columns.iterator().next()));
-        
-        // Excel 2013 and LibreOffice 4.2.8.2 both treat columns with merged regions as blank
-        /**    A     B    C      D   E
-         * 1 LONG  LONG        LONGMERGE
-         * 2       SHORT SHORT     SHORT
-         */
-        
-        // measured in Excel 2013. Sizes may vary.
-        final int longMsgWidth = (int) (57.43*256);
-        final int shortMsgWidth = (int) (4.86*256);
-        
-        checkColumnWidth(longMsgWidth, 0, true);
-        checkColumnWidth(longMsgWidth, 0, false);
-        checkColumnWidth(longMsgWidth, 1, true);
-        checkColumnWidth(longMsgWidth, 1, false);
-        checkColumnWidth(shortMsgWidth, 2, true);
-        checkColumnWidth(shortMsgWidth, 2, false);
-        checkColumnWidth(-1, 3, true);
-        checkColumnWidth(longMsgWidth, 3, false);
-        checkColumnWidth(shortMsgWidth, 4, true); //but is it really? shouldn't autosizing column E use "" from E1 and SHORT from E2?
-        checkColumnWidth(shortMsgWidth, 4, false);
-    }
-    
-    private void checkColumnWidth(int expectedWidth, int column, boolean useMergedCells) {
-        final int bestFitWidth = tracker.getBestFitColumnWidth(column, useMergedCells);
-        if (bestFitWidth < 0 && expectedWidth < 0) return;
-        final double abs_error = Math.abs(bestFitWidth-expectedWidth);
-        final double rel_error = abs_error / expectedWidth;
-        if (rel_error > 0.25) {
-            fail("check column width: " +
-                    rel_error + ", " + abs_error + ", " +
-                    expectedWidth + ", " + bestFitWidth);
-        }
-        
-    }
-    
-    private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) {
-        // autoSize will fail if required fonts are not installed, skip this test then
-        Font font = workbook.getFontAt(cell.getCellStyle().getFontIndex());
-        System.out.println(font.getFontHeightInPoints());
-        System.out.println(font.getFontName());
-        Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font,
-                          SheetUtil.canComputeColumnWidth(font));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java
deleted file mode 100644
index 7ce130d..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-public final class TestOutlining {
-    @Test
-	public void testSetRowGroupCollapsed() throws IOException {
-		SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
-		wb2.setCompressTempFiles(true);
-		SXSSFSheet sheet2 = wb2.createSheet("new sheet");
-
-		int rowCount = 20;
-		for (int i = 0; i < rowCount; i++) {
-			sheet2.createRow(i);
-		}
-
-		sheet2.groupRow(4, 9);
-		sheet2.groupRow(11, 19);
-
-		sheet2.setRowGroupCollapsed(4, true);
-
-		SXSSFRow r = sheet2.getRow(8);
-		assertTrue(r.getHidden());
-		r = sheet2.getRow(10);
-		assertTrue(r.getCollapsed());
-		r = sheet2.getRow(12);
-		assertNull(r.getHidden());
-		wb2.dispose();
-		
-		wb2.close();
-	}
-
-    @Test
-    public void testSetRowGroupCollapsedError() throws IOException {
-		SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
-		wb2.setCompressTempFiles(true);
-		SXSSFSheet sheet2 = wb2.createSheet("new sheet");
-
-		int rowCount = 20;
-		for (int i = 0; i < rowCount; i++) {
-			sheet2.createRow(i);
-		}
-
-		sheet2.groupRow(4, 9);
-		sheet2.groupRow(11, 19);
-
-		try {
-			sheet2.setRowGroupCollapsed(3, true);
-			fail("Should fail with an exception");
-		} catch (IllegalArgumentException e) {
-			assertTrue(e.getMessage().contains("row (3)"));
-		}
-
-		try {
-			sheet2.setRowGroupCollapsed(10, true);
-			fail("Should fail with an exception");
-		} catch (IllegalArgumentException e) {
-			assertTrue(e.getMessage().contains("row (10)"));
-		}
-
-		try {
-			sheet2.setRowGroupCollapsed(0, true);
-			fail("Should fail with an exception");
-		} catch (IllegalArgumentException e) {
-			assertTrue(e.getMessage().contains("row (0)"));
-		}
-
-		try {
-			sheet2.setRowGroupCollapsed(20, true);
-			fail("Should fail with an exception");
-		} catch (IllegalArgumentException e) {
-			assertTrue("Had: " + e.getMessage(), 
-					e.getMessage().contains("Row does not exist"));
-		}
-
-		SXSSFRow r = sheet2.getRow(8);
-		assertNotNull(r);
-		assertNull(r.getHidden());
-		r = sheet2.getRow(10);
-		assertNull(r.getCollapsed());
-		r = sheet2.getRow(12);
-		assertNull(r.getHidden());
-		wb2.dispose();
-		
-		wb2.close();
-	}
-	
-    @Test
-    public void testOutlineGettersHSSF() throws IOException {
-        HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
-        HSSFSheet hssfSheet = hssfWorkbook.createSheet();
-        hssfSheet.createRow(0);
-        hssfSheet.createRow(1);
-        hssfSheet.createRow(2);
-        hssfSheet.createRow(3);
-        hssfSheet.createRow(4);
-        hssfSheet.groupRow(1, 3);
-        hssfSheet.groupRow(2, 3);
-
-        assertEquals(0, hssfSheet.getRow(0).getOutlineLevel());
-        assertEquals(1, hssfSheet.getRow(1).getOutlineLevel());
-        assertEquals(2, hssfSheet.getRow(2).getOutlineLevel());
-        assertEquals(2, hssfSheet.getRow(3).getOutlineLevel());
-        assertEquals(0, hssfSheet.getRow(4).getOutlineLevel());
-        hssfWorkbook.close();
-    }
-    
-    @Test
-    public void testOutlineGettersXSSF() throws IOException {
-        XSSFWorkbook xssfWorkbook = new XSSFWorkbook();
-        XSSFSheet xssfSheet = xssfWorkbook.createSheet();
-        xssfSheet.createRow(0);
-        xssfSheet.createRow(1);
-        xssfSheet.createRow(2);
-        xssfSheet.createRow(3);
-        xssfSheet.createRow(4);
-        xssfSheet.groupRow(1, 3);
-        xssfSheet.groupRow(2, 3);
-
-        assertEquals(0, xssfSheet.getRow(0).getOutlineLevel());
-        assertEquals(1, xssfSheet.getRow(1).getOutlineLevel());
-        assertEquals(2, xssfSheet.getRow(2).getOutlineLevel());
-        assertEquals(2, xssfSheet.getRow(3).getOutlineLevel());
-        assertEquals(0, xssfSheet.getRow(4).getOutlineLevel());
-        xssfWorkbook.close();
-    }
-    
-    @Test
-    public void testOutlineGettersSXSSF() throws IOException {
-        SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook();
-        Sheet sxssfSheet = sxssfWorkbook.createSheet();
-        sxssfSheet.createRow(0);
-        sxssfSheet.createRow(1);
-        sxssfSheet.createRow(2);
-        sxssfSheet.createRow(3);
-        sxssfSheet.createRow(4);
-        sxssfSheet.createRow(5);
-        
-        // nothing happens with empty row-area
-        sxssfSheet.groupRow(1, 0);
-        assertEquals(0, sxssfSheet.getRow(0).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(1).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(2).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(3).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(4).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(5).getOutlineLevel());
-        
-        sxssfSheet.groupRow(1, 3);
-        sxssfSheet.groupRow(2, 3);
-
-        assertEquals(0, sxssfSheet.getRow(0).getOutlineLevel());
-        assertEquals(1, sxssfSheet.getRow(1).getOutlineLevel());
-        assertEquals(2, sxssfSheet.getRow(2).getOutlineLevel());
-        assertEquals(2, sxssfSheet.getRow(3).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(4).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(5).getOutlineLevel());
-        
-        // add tests for direct setting - add row 4 to deepest group
-        ((SXSSFSheet)sxssfSheet).setRowOutlineLevel(4, 2);
-        assertEquals(0, sxssfSheet.getRow(0).getOutlineLevel());
-        assertEquals(1, sxssfSheet.getRow(1).getOutlineLevel());
-        assertEquals(2, sxssfSheet.getRow(2).getOutlineLevel());
-        assertEquals(2, sxssfSheet.getRow(3).getOutlineLevel());
-        assertEquals(2, sxssfSheet.getRow(4).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(5).getOutlineLevel());
-        
-        sxssfWorkbook.dispose();
-        sxssfWorkbook.close();
-    }
-    
-    @Test
-    public void testOutlineGettersSXSSFSetOutlineLevel() throws IOException {
-        SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook();
-        Sheet sxssfSheet = sxssfWorkbook.createSheet();
-        sxssfSheet.createRow(0);
-        sxssfSheet.createRow(1);
-        sxssfSheet.createRow(2);
-        sxssfSheet.createRow(3);
-        sxssfSheet.createRow(4);
-        sxssfSheet.createRow(5);
-    
-        // what happens with level below 1
-        ((SXSSFSheet)sxssfSheet).setRowOutlineLevel(0, -2);
-        assertEquals(-2, sxssfSheet.getRow(0).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(1).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(2).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(3).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(4).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(5).getOutlineLevel());
-
-        // add tests for direct setting
-        ((SXSSFSheet)sxssfSheet).setRowOutlineLevel(4, 2);
-        assertEquals(-2, sxssfSheet.getRow(0).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(1).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(2).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(3).getOutlineLevel());
-        assertEquals(2, sxssfSheet.getRow(4).getOutlineLevel());
-        assertEquals(0, sxssfSheet.getRow(5).getOutlineLevel());
-        
-        sxssfWorkbook.dispose();
-        sxssfWorkbook.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
deleted file mode 100644
index b84b06b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import javax.xml.namespace.QName;
-
-import org.apache.poi.ss.usermodel.BaseTestXCell;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.XmlCursor;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-
-/**
- * Tests various functionality having to do with {@link SXSSFCell}.  For instance support for
- * particular datatypes, etc.
- */
-public class TestSXSSFCell extends BaseTestXCell {
-
-    public TestSXSSFCell() {
-        super(SXSSFITestDataProvider.instance);
-    }
-
-    @AfterClass
-    public static void tearDownClass(){
-        SXSSFITestDataProvider.instance.cleanup();
-    }
-
-    @Test
-    public void testPreserveSpaces() throws IOException {
-        String[] samplesWithSpaces = {
-                " POI",
-                "POI ",
-                " POI ",
-                "\nPOI",
-                "\n\nPOI \n",
-        };
-        for(String str : samplesWithSpaces){
-            Workbook swb = _testDataProvider.createWorkbook();
-            Cell sCell = swb.createSheet().createRow(0).createCell(0);
-            sCell.setCellValue(str);
-            assertEquals(sCell.getStringCellValue(), str);
-
-            // read back as XSSF and check that xml:spaces="preserve" is set
-            XSSFWorkbook xwb = (XSSFWorkbook)_testDataProvider.writeOutAndReadBack(swb);
-            XSSFCell xCell = xwb.getSheetAt(0).getRow(0).getCell(0);
-
-            CTRst is = xCell.getCTCell().getIs();
-            XmlCursor c = is.newCursor();
-            c.toNextToken();
-            String t = c.getAttributeText(new QName("http://www.w3.org/XML/1998/namespace", "space"));
-            c.dispose();
-            assertEquals("expected xml:spaces=\"preserve\" \"" + str + "\"", "preserve", t);
-            xwb.close();
-            swb.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
deleted file mode 100644
index 2ee465b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.BaseTestDataValidation;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.junit.Test;
-
-public class TestSXSSFDataValidation extends BaseTestDataValidation {
-
-    public TestSXSSFDataValidation(){
-        super(SXSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void test53965() throws Exception {
-        SXSSFWorkbook wb = new SXSSFWorkbook();
-        try {
-            Sheet sheet = wb.createSheet();
-            List<? extends DataValidation> lst = sheet.getDataValidations();    //<-- works
-            assertEquals(0, lst.size());
-    
-            //create the cell that will have the validation applied
-            sheet.createRow(0).createCell(0);
-    
-            DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-            DataValidationConstraint constraint = dataValidationHelper.createCustomConstraint("SUM($A$1:$A$1) <= 3500");
-            CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-            DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-            sheet.addValidationData(validation);
-    
-            // this line caused XmlValueOutOfRangeException , see Bugzilla 3965
-            lst = sheet.getDataValidations();
-            assertEquals(1, lst.size());
-        } finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
deleted file mode 100644
index 0839fe8..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-/**
- * Formula Evaluation with SXSSF.
- * 
- * Note that SXSSF can only evaluate formulas where the
- *  cell is in the current window, and all references
- *  from the cell are in the current window
- */
-public final class TestSXSSFFormulaEvaluation {
-    public static final SXSSFITestDataProvider _testDataProvider = SXSSFITestDataProvider.instance;
-
-    /**
-     * EvaluateAll will normally fail, as any reference or
-     *  formula outside of the window will fail, and any
-     *  non-active sheets will fail
-     */
-    @Test
-    public void testEvaluateAllFails() throws IOException {
-        SXSSFWorkbook wb = new SXSSFWorkbook(5);
-        SXSSFSheet s = wb.createSheet();
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        
-        s.createRow(0).createCell(0).setCellFormula("1+2");
-        s.createRow(1).createCell(0).setCellFormula("A21");
-        for (int i=2; i<19; i++) { s.createRow(i); }
-        
-        // Cells outside window will fail, whether referenced or not
-        s.createRow(19).createCell(0).setCellFormula("A1+A2");
-        s.createRow(20).createCell(0).setCellFormula("A1+A11+100");
-        try {
-            eval.evaluateAll();
-            fail("Evaluate All shouldn't work, as some cells outside the window");
-        } catch(SXSSFFormulaEvaluator.RowFlushedException e) {
-            // Expected
-        }
-        
-        
-        // Inactive sheets will fail
-        XSSFWorkbook xwb = new XSSFWorkbook();
-        xwb.createSheet("Open");
-        xwb.createSheet("Closed");
-
-        wb.close();
-        wb = new SXSSFWorkbook(xwb, 5);
-        s = wb.getSheet("Closed");
-        s.flushRows();
-        s = wb.getSheet("Open");
-        s.createRow(0).createCell(0).setCellFormula("1+2");
-        
-        eval = wb.getCreationHelper().createFormulaEvaluator();
-        try {
-            eval.evaluateAll();
-            fail("Evaluate All shouldn't work, as sheets flushed");
-        } catch (SXSSFFormulaEvaluator.SheetsFlushedException e) {}
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testEvaluateRefOutsideWindowFails() throws IOException {
-        SXSSFWorkbook wb = new SXSSFWorkbook(5);
-        SXSSFSheet s = wb.createSheet();
-        
-        s.createRow(0).createCell(0).setCellFormula("1+2");
-        assertEquals(false, s.areAllRowsFlushed());
-        assertEquals(-1, s.getLastFlushedRowNum());
-        
-        for (int i=1; i<=19; i++) { s.createRow(i); }
-        Cell c = s.createRow(20).createCell(0);
-        c.setCellFormula("A1+100");
-        
-        assertEquals(false, s.areAllRowsFlushed());
-        assertEquals(15, s.getLastFlushedRowNum());
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        try {
-            eval.evaluateFormulaCellEnum(c);
-            fail("Evaluate shouldn't work, as reference outside the window");
-        } catch(SXSSFFormulaEvaluator.RowFlushedException e) {
-            // Expected
-        }
-        
-        wb.close();
-    }
-    
-    /**
-     * If all formula cells + their references are inside the window,
-     *  then evaluation works
-     * @throws IOException 
-     */
-    @Test
-    public void testEvaluateAllInWindow() throws IOException {
-        SXSSFWorkbook wb = new SXSSFWorkbook(5);
-        SXSSFSheet s = wb.createSheet();
-        s.createRow(0).createCell(0).setCellFormula("1+2");
-        s.createRow(1).createCell(1).setCellFormula("A1+10");
-        s.createRow(2).createCell(2).setCellFormula("B2+100");
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        eval.evaluateAll();
-        
-        assertEquals(3, (int)s.getRow(0).getCell(0).getNumericCellValue());
-        assertEquals(13, (int)s.getRow(1).getCell(1).getNumericCellValue());
-        assertEquals(113, (int)s.getRow(2).getCell(2).getNumericCellValue());
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testEvaluateRefInsideWindow() throws IOException {
-        SXSSFWorkbook wb = new SXSSFWorkbook(5);
-        SXSSFSheet s = wb.createSheet();
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        
-        SXSSFCell c = s.createRow(0).createCell(0);
-        c.setCellValue(1.5);
-        
-        c = s.createRow(1).createCell(0);
-        c.setCellFormula("A1*2");
-        
-        assertEquals(0, (int)c.getNumericCellValue());
-        eval.evaluateFormulaCellEnum(c);
-        assertEquals(3, (int)c.getNumericCellValue());
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testEvaluateSimple() throws IOException {
-        SXSSFWorkbook wb = new SXSSFWorkbook(5);
-        SXSSFSheet s = wb.createSheet();
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        
-        SXSSFCell c = s.createRow(0).createCell(0);
-        c.setCellFormula("1+2");
-        assertEquals(0, (int)c.getNumericCellValue());
-        eval.evaluateFormulaCellEnum(c);
-        assertEquals(3, (int)c.getNumericCellValue());
-        
-        c = s.createRow(1).createCell(0);
-        c.setCellFormula("CONCATENATE(\"hello\",\" \",\"world\")");
-        eval.evaluateFormulaCellEnum(c);
-        assertEquals("hello world", c.getStringCellValue());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
deleted file mode 100644
index e1e237b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import org.junit.After;
-
-import org.apache.poi.ss.usermodel.BaseTestHyperlink;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.usermodel.XSSFHyperlink;
-
-/**
- * Test setting hyperlinks in SXSSF
- *
- * @author Yegor Kozlov
- */
-public class TestSXSSFHyperlink extends BaseTestHyperlink {
-
-    public TestSXSSFHyperlink() {
-        super(SXSSFITestDataProvider.instance);
-    }
-
-
-    @After
-    public void tearDown(){
-        SXSSFITestDataProvider.instance.cleanup();
-    }
-    
-    @Override
-    public XSSFHyperlink copyHyperlink(Hyperlink link) {
-        // FIXME: replace with SXSSFHyperlink if it ever gets created
-        return new XSSFHyperlink(link);
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java
deleted file mode 100644
index 90a730d..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import org.apache.poi.ss.usermodel.BaseTestXRow;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.junit.After;
-
-/**
- * Tests for XSSFRow
- */
-public final class TestSXSSFRow extends BaseTestXRow {
-
-    public TestSXSSFRow() {
-        super(SXSSFITestDataProvider.instance);
-    }
-
-
-    @After
-    public void tearDown() {
-        ((SXSSFITestDataProvider) _testDataProvider).cleanup();
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
deleted file mode 100644
index d5be11e..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BaseTestXSheet;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.After;
-import org.junit.Test;
-
-
-public final class TestSXSSFSheet extends BaseTestXSheet {
-
-    public TestSXSSFSheet() {
-        super(SXSSFITestDataProvider.instance);
-    }
-
-
-    @After
-    public void tearDown(){
-        SXSSFITestDataProvider.instance.cleanup();
-    }
-    
-    @Override
-    protected void trackColumnsForAutoSizingIfSXSSF(Sheet sheet) {
-        SXSSFSheet sxSheet = (SXSSFSheet) sheet;
-        sxSheet.trackAllColumnsForAutoSizing();
-    }
-
-
-    /**
-     * cloning of sheets is not supported in SXSSF
-     */
-    @Override
-    @Test
-    public void cloneSheet() throws IOException {
-        thrown.expect(RuntimeException.class);
-        thrown.expectMessage("NotImplemented");
-        super.cloneSheet();
-    }
-
-    @Override
-    @Test
-    public void cloneSheetMultipleTimes() throws IOException {
-        thrown.expect(RuntimeException.class);
-        thrown.expectMessage("NotImplemented");
-        super.cloneSheetMultipleTimes();
-    }
-    
-    /**
-     * shifting rows is not supported in SXSSF
-     */
-    @Override
-    @Test
-    public void shiftMerged() throws IOException {
-        thrown.expect(RuntimeException.class);
-        thrown.expectMessage("NotImplemented");
-        super.shiftMerged();
-    }
-
-    /**
-     *  Bug 35084: cloning cells with formula
-     *
-     *  The test is disabled because cloning of sheets is not supported in SXSSF
-     */
-    @Override
-    @Test
-    public void bug35084() throws IOException {
-        thrown.expect(RuntimeException.class);
-        thrown.expectMessage("NotImplemented");
-        super.bug35084();
-    }
-
-    @Override
-    @Test
-    public void getCellComment() throws IOException {
-        // TODO: reading cell comments via Sheet does not work currently as it tries 
-        // to access the underlying sheet for this, but comments are stored as
-        // properties on Cells...
-    }
-    
-    @Override
-    @Test
-    public void defaultColumnStyle() {
-        //TODO column styles are not yet supported by XSSF
-    }
-
-    @Test
-    public void overrideFlushedRows() throws IOException {
-        Workbook wb = new SXSSFWorkbook(3);
-        try {
-            Sheet sheet = wb.createSheet();
-    
-            sheet.createRow(1);
-            sheet.createRow(2);
-            sheet.createRow(3);
-            sheet.createRow(4);
-    
-            thrown.expect(Throwable.class);
-            thrown.expectMessage("Attempting to write a row[1] in the range [0,1] that is already written to disk.");
-            sheet.createRow(1);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void overrideRowsInTemplate() throws IOException {
-        XSSFWorkbook template = new XSSFWorkbook();
-        template.createSheet().createRow(1);
-
-        Workbook wb = new SXSSFWorkbook(template);
-        try {
-            Sheet sheet = wb.getSheetAt(0);
-    
-            try {
-                sheet.createRow(1);
-                fail("expected exception");
-            } catch (Throwable e){
-                assertEquals("Attempting to write a row[1] in the range [0,1] that is already written to disk.", e.getMessage());
-            }
-            try {
-                sheet.createRow(0);
-                fail("expected exception");
-            } catch (Throwable e){
-                assertEquals("Attempting to write a row[0] in the range [0,1] that is already written to disk.", e.getMessage());
-            }
-            sheet.createRow(2);
-        } finally {
-            wb.close();
-            template.close();
-        }
-    }
-
-    @Test
-    public void changeRowNum() throws IOException {
-        SXSSFWorkbook wb = new SXSSFWorkbook(3);
-        SXSSFSheet sheet = wb.createSheet();
-        SXSSFRow row0 = sheet.createRow(0);
-        SXSSFRow row1 = sheet.createRow(1);
-        sheet.changeRowNum(row0, 2);
-        
-        assertEquals("Row 1 knows its row number", 1, row1.getRowNum());
-        assertEquals("Row 2 knows its row number", 2, row0.getRowNum());
-        assertEquals("Sheet knows Row 1's row number", 1, sheet.getRowNum(row1));
-        assertEquals("Sheet knows Row 2's row number", 2, sheet.getRowNum(row0));
-        assertEquals("Sheet row iteratation order should be ascending", row1, sheet.iterator().next());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
deleted file mode 100644
index 15acbfc..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.SheetUtil;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-
-/**
- * Tests the auto-sizing behaviour of {@link SXSSFSheet} when not all
- * rows fit into the memory window size etc.
- * 
- * @see Bug #57450 which reported the original mis-behaviour
- */
-@RunWith(Parameterized.class)
-public class TestSXSSFSheetAutoSizeColumn {
-    
-    private static final String SHORT_CELL_VALUE = "Ben";
-    private static final String LONG_CELL_VALUE = "B Be Ben Beni Benif Benify Benif Beni Ben Be B";
-    
-    // Approximative threshold to decide whether test is PASS or FAIL:
-    //  shortCellValue ends up with approx column width 1_000 (on my machine),
-    //  longCellValue ends up with approx. column width 10_000 (on my machine)
-    //  so shortCellValue can be expected to be < 5000 for all fonts
-    //  and longCellValue can be expected to be > 5000 for all fonts
-    private static final int COLUMN_WIDTH_THRESHOLD_BETWEEN_SHORT_AND_LONG = 4000;
-    private static final int MAX_COLUMN_WIDTH = 255*256;
-    
-    private static final SortedSet<Integer> columns;
-    static {
-        SortedSet<Integer>_columns = new TreeSet<Integer>();
-        _columns.add(0);
-        _columns.add(1);
-        _columns.add(3);
-        columns = Collections.unmodifiableSortedSet(_columns);
-    }
-    
-    
-    private SXSSFSheet sheet;
-    private SXSSFWorkbook workbook;
-    
-    @Parameter(0)
-    public boolean useMergedCells;
-    
-    @Parameters(name="{index}: useMergedCells={0}")
-    public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][] {     
-                 {false},
-                 {true}, 
-           });
-    }
-    
-    @After
-    public void tearDownSheetAndWorkbook() throws IOException {
-        if (sheet != null) {
-            sheet.dispose();
-        }
-        if (workbook != null) {
-            workbook.close();
-        }
-    }
-    
-    @Test
-    public void test_EmptySheet_NoException() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        sheet.trackAllColumnsForAutoSizing();
-        
-        for (int i = 0; i < 10; i++) {
-            sheet.autoSizeColumn(i, useMergedCells);
-        }
-    }
-    
-    @Test
-    public void test_WindowSizeDefault_AllRowsFitIntoWindowSize() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        sheet.trackAllColumnsForAutoSizing();
-        
-        final Cell cellRow0 = createRowWithCellValues(sheet, 0, LONG_CELL_VALUE);
-        
-        assumeRequiredFontsAreInstalled(workbook, cellRow0);
-
-        createRowWithCellValues(sheet, 1, SHORT_CELL_VALUE);
-
-        sheet.autoSizeColumn(0, useMergedCells);
-
-        assertColumnWidthStrictlyWithinRange(sheet.getColumnWidth(0), COLUMN_WIDTH_THRESHOLD_BETWEEN_SHORT_AND_LONG, MAX_COLUMN_WIDTH);
-    }
-    
-    @Test
-    public void test_WindowSizeEqualsOne_ConsiderFlushedRows() {
-        workbook = new SXSSFWorkbook(null, 1); // Window size 1 so only last row will be in memory
-        sheet = workbook.createSheet();
-        sheet.trackAllColumnsForAutoSizing();
-        
-        final Cell cellRow0 = createRowWithCellValues(sheet, 0, LONG_CELL_VALUE);
-        
-        assumeRequiredFontsAreInstalled(workbook, cellRow0);
-
-        createRowWithCellValues(sheet, 1, SHORT_CELL_VALUE);
-
-        sheet.autoSizeColumn(0, useMergedCells);
-
-        assertColumnWidthStrictlyWithinRange(sheet.getColumnWidth(0), COLUMN_WIDTH_THRESHOLD_BETWEEN_SHORT_AND_LONG, MAX_COLUMN_WIDTH);
-    }
-
-    @Test
-    public void test_WindowSizeEqualsOne_lastRowIsNotWidest() {
-        workbook = new SXSSFWorkbook(null, 1); // Window size 1 so only last row will be in memory
-        sheet = workbook.createSheet();
-        sheet.trackAllColumnsForAutoSizing();
-        
-        final Cell cellRow0 = createRowWithCellValues(sheet, 0, LONG_CELL_VALUE);
-        
-        assumeRequiredFontsAreInstalled(workbook, cellRow0);
-
-        createRowWithCellValues(sheet, 1, SHORT_CELL_VALUE);
-
-        sheet.autoSizeColumn(0, useMergedCells);
-
-        assertColumnWidthStrictlyWithinRange(sheet.getColumnWidth(0), COLUMN_WIDTH_THRESHOLD_BETWEEN_SHORT_AND_LONG, MAX_COLUMN_WIDTH);
-    }
-    
-    @Test
-    public void test_WindowSizeEqualsOne_lastRowIsWidest() {
-        workbook = new SXSSFWorkbook(null, 1); // Window size 1 so only last row will be in memory
-        sheet = workbook.createSheet();
-        sheet.trackAllColumnsForAutoSizing();
-        
-        final Cell cellRow0 = createRowWithCellValues(sheet, 0, SHORT_CELL_VALUE);
-
-        assumeRequiredFontsAreInstalled(workbook, cellRow0);
-        
-        createRowWithCellValues(sheet, 1, LONG_CELL_VALUE);
-
-        sheet.autoSizeColumn(0, useMergedCells);
-
-        assertColumnWidthStrictlyWithinRange(sheet.getColumnWidth(0), COLUMN_WIDTH_THRESHOLD_BETWEEN_SHORT_AND_LONG, MAX_COLUMN_WIDTH);
-    }
-    
-    // fails only for useMergedCell=true
-    @Test
-    public void test_WindowSizeEqualsOne_flushedRowHasMergedCell() {
-        workbook = new SXSSFWorkbook(null, 1); // Window size 1 so only last row will be in memory
-        sheet = workbook.createSheet();
-        sheet.trackAllColumnsForAutoSizing();
-        
-        Cell a1 = createRowWithCellValues(sheet, 0, LONG_CELL_VALUE);
-
-        assumeRequiredFontsAreInstalled(workbook, a1);
-        sheet.addMergedRegion(CellRangeAddress.valueOf("A1:B1"));
-        
-        createRowWithCellValues(sheet, 1, SHORT_CELL_VALUE, SHORT_CELL_VALUE);
-        
-        /**
-         *    A      B
-         * 1 LONGMERGED
-         * 2 SHORT SHORT
-         */
-        
-        sheet.autoSizeColumn(0, useMergedCells);
-        sheet.autoSizeColumn(1, useMergedCells);
-
-        if (useMergedCells) {
-            // Excel and LibreOffice behavior: ignore merged cells for auto-sizing.
-            // POI behavior: evenly distribute the column width among the merged columns.
-            //               each column must be auto-sized in order for the column widths
-            //               to add up to the best fit width.
-            final int colspan = 2;
-            final int expectedWidth = (10000 + 1000)/colspan; //average of 1_000 and 10_000
-            final int minExpectedWidth = expectedWidth / 2;
-            final int maxExpectedWidth = expectedWidth * 3 / 2;
-            assertColumnWidthStrictlyWithinRange(sheet.getColumnWidth(0), minExpectedWidth, maxExpectedWidth); //short
-        } else {
-            assertColumnWidthStrictlyWithinRange(sheet.getColumnWidth(0), COLUMN_WIDTH_THRESHOLD_BETWEEN_SHORT_AND_LONG, MAX_COLUMN_WIDTH); //long
-        }
-        assertColumnWidthStrictlyWithinRange(sheet.getColumnWidth(1), 0, COLUMN_WIDTH_THRESHOLD_BETWEEN_SHORT_AND_LONG); //short
-    }
-    
-    @Test
-    public void autoSizeColumn_trackColumnForAutoSizing() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        sheet.trackColumnForAutoSizing(0);
-        
-        SortedSet<Integer> expected = new TreeSet<Integer>();
-        expected.add(0);
-        assertEquals(expected, sheet.getTrackedColumnsForAutoSizing());
-        
-        sheet.autoSizeColumn(0, useMergedCells);
-        try {
-            sheet.autoSizeColumn(1, useMergedCells);
-            fail("Should not be able to auto-size an untracked column");
-        }
-        catch (final IllegalStateException e) {
-            // expected
-        }
-    }
-    
-    @Test
-    public void autoSizeColumn_trackColumnsForAutoSizing() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        
-        sheet.trackColumnsForAutoSizing(columns);
-        SortedSet<Integer> sorted = new TreeSet<Integer>(columns);
-        assertEquals(sorted, sheet.getTrackedColumnsForAutoSizing());
-        
-        sheet.autoSizeColumn(sorted.first(), useMergedCells);
-        try {
-            assumeFalse(columns.contains(5));
-            sheet.autoSizeColumn(5, useMergedCells);
-            fail("Should not be able to auto-size an untracked column");
-        }
-        catch (final IllegalStateException e) {
-            // expected
-        }
-    }
-    
-    @Test
-    public void autoSizeColumn_untrackColumnForAutoSizing() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        
-        sheet.trackColumnsForAutoSizing(columns);
-        sheet.untrackColumnForAutoSizing(columns.first());
-        
-        assumeTrue(sheet.getTrackedColumnsForAutoSizing().contains(columns.last()));
-        sheet.autoSizeColumn(columns.last(), useMergedCells);
-        try {
-            assumeFalse(sheet.getTrackedColumnsForAutoSizing().contains(columns.first()));
-            sheet.autoSizeColumn(columns.first(), useMergedCells);
-            fail("Should not be able to auto-size an untracked column");
-        }
-        catch (final IllegalStateException e) {
-            // expected
-        }
-    }
-    
-    @Test
-    public void autoSizeColumn_untrackColumnsForAutoSizing() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        
-        sheet.trackColumnForAutoSizing(15);
-        sheet.trackColumnsForAutoSizing(columns);
-        sheet.untrackColumnsForAutoSizing(columns);
-        
-        assumeTrue(sheet.getTrackedColumnsForAutoSizing().contains(15));
-        sheet.autoSizeColumn(15, useMergedCells);
-        try {
-            assumeFalse(sheet.getTrackedColumnsForAutoSizing().contains(columns.first()));
-            sheet.autoSizeColumn(columns.first(), useMergedCells);
-            fail("Should not be able to auto-size an untracked column");
-        }
-        catch (final IllegalStateException e) {
-            // expected
-        }
-    }
-    
-    @Test
-    public void autoSizeColumn_isColumnTrackedForAutoSizing() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        
-        sheet.trackColumnsForAutoSizing(columns);
-        for (int column : columns) {
-            assertTrue(sheet.isColumnTrackedForAutoSizing(column));
-            
-            assumeFalse(columns.contains(column+10));
-            assertFalse(sheet.isColumnTrackedForAutoSizing(column+10));
-        }
-    }
-    
-    @Test
-    public void autoSizeColumn_trackAllColumns() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        
-        sheet.trackAllColumnsForAutoSizing();
-        sheet.autoSizeColumn(0, useMergedCells);
-        
-        sheet.untrackAllColumnsForAutoSizing();
-        try {
-            sheet.autoSizeColumn(0, useMergedCells);
-            fail("Should not be able to auto-size an implicitly untracked column");
-        } catch (final IllegalStateException e) {
-            // expected
-        }
-    }
-    
-    @Test
-    public void autoSizeColumn_trackAllColumns_explicitUntrackColumn() {
-        workbook = new SXSSFWorkbook();
-        sheet = workbook.createSheet();
-        
-        sheet.trackColumnsForAutoSizing(columns);
-        sheet.trackAllColumnsForAutoSizing();
-        
-        sheet.untrackColumnForAutoSizing(0);
-        try {
-            sheet.autoSizeColumn(0, useMergedCells);
-            fail("Should not be able to auto-size an explicitly untracked column");
-        } catch (final IllegalStateException e) {
-            // expected
-        }
-    }
-    
-    
-    private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) {
-        // autoSize will fail if required fonts are not installed, skip this test then
-        Font font = workbook.getFontAt(cell.getCellStyle().getFontIndex());
-        Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font,
-                          SheetUtil.canComputeColumnWidth(font));
-    }
-    
-    private static Cell createRowWithCellValues(final Sheet sheet, final int rowNumber, final String... cellValues) {
-        Row row = sheet.createRow(rowNumber);
-        int cellIndex = 0;
-        Cell firstCell = null;
-        for (final String cellValue : cellValues) {
-            Cell cell = row.createCell(cellIndex++);
-            if (firstCell == null) {
-                firstCell = cell;
-            }
-            cell.setCellValue(cellValue);
-        }
-        return firstCell;
-    }
-    
-    private static void assertColumnWidthStrictlyWithinRange(final int actualColumnWidth, final int lowerBoundExclusive, final int upperBoundExclusive) {
-        assertTrue("Expected a column width greater than " + lowerBoundExclusive + " but found " + actualColumnWidth,
-                actualColumnWidth > lowerBoundExclusive);
-        assertTrue("Expected column width less than " + upperBoundExclusive + " but found " + actualColumnWidth, actualColumnWidth < upperBoundExclusive);
-       
-    }
-    
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
deleted file mode 100644
index 7b5a67d..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POITestCase;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.ss.usermodel.BaseTestXWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.NullOutputStream;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public final class TestSXSSFWorkbook extends BaseTestXWorkbook {
-
-    public TestSXSSFWorkbook() {
-        super(SXSSFITestDataProvider.instance);
-    }
-
-    @After
-    public void tearDown(){
-        ((SXSSFITestDataProvider)_testDataProvider).cleanup();
-    }
-
-    /**
-     * cloning of sheets is not supported in SXSSF
-     */
-    @Override
-    @Test
-    public void cloneSheet() throws IOException {
-        try {
-            super.cloneSheet();
-            fail("expected exception");
-        } catch (RuntimeException e){
-            assertEquals("NotImplemented", e.getMessage());
-        }
-    }
-
-    /**
-     * cloning of sheets is not supported in SXSSF
-     */
-    @Override
-    @Test
-    public void sheetClone() throws IOException {
-        try {
-            super.sheetClone();
-            fail("expected exception");
-        } catch (RuntimeException e){
-            assertEquals("NotImplemented", e.getMessage());
-        }
-    }
-
-    /**
-     * Skip this test, as SXSSF doesn't update formulas on sheet name
-     *  changes.
-     */
-    @Override
-    @Test
-    public void setSheetName() {
-        Assume.assumeTrue("SXSSF doesn't update formulas on sheet name changes, as most cells probably aren't in memory at the time", false);
-    }
-
-    @Test
-    public void existingWorkbook() throws IOException {
-    	XSSFWorkbook xssfWb1 = new XSSFWorkbook();
-    	xssfWb1.createSheet("S1");
-        SXSSFWorkbook wb1 = new SXSSFWorkbook(xssfWb1);
-    	XSSFWorkbook xssfWb2 = SXSSFITestDataProvider.instance.writeOutAndReadBack(wb1);
-    	assertTrue(wb1.dispose());
-
-        SXSSFWorkbook wb2 = new SXSSFWorkbook(xssfWb2);
-    	assertEquals(1, wb2.getNumberOfSheets());
-    	Sheet sheet  = wb2.getSheetAt(0);
-    	assertNotNull(sheet);
-    	assertEquals("S1", sheet.getSheetName());
-	    assertTrue(wb2.dispose());
-	    xssfWb2.close();
-	    xssfWb1.close();
-	    
-	    wb2.close();
-	    wb1.close();
-    }
-
-    @Test
-    public void useSharedStringsTable() throws Exception {
-        SXSSFWorkbook wb = new SXSSFWorkbook(null, 10, false, true);
-
-        SharedStringsTable sss =  POITestCase.getFieldValue(SXSSFWorkbook.class, wb, SharedStringsTable.class, "_sharedStringSource");
-        
-        assertNotNull(sss);
-
-        Row row = wb.createSheet("S1").createRow(0);
-
-        row.createCell(0).setCellValue("A");
-        row.createCell(1).setCellValue("B");
-        row.createCell(2).setCellValue("A");
-
-        XSSFWorkbook xssfWorkbook = SXSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        sss = POITestCase.getFieldValue(SXSSFWorkbook.class, wb, SharedStringsTable.class, "_sharedStringSource");
-        assertEquals(2, sss.getUniqueCount());
-        assertTrue(wb.dispose());
-
-        Sheet sheet1 = xssfWorkbook.getSheetAt(0);
-        assertEquals("S1", sheet1.getSheetName());
-        assertEquals(1, sheet1.getPhysicalNumberOfRows());
-        row = sheet1.getRow(0);
-        assertNotNull(row);
-        Cell cell = row.getCell(0);
-        assertNotNull(cell);
-        assertEquals("A", cell.getStringCellValue());
-        cell = row.getCell(1);
-        assertNotNull(cell);
-        assertEquals("B", cell.getStringCellValue());
-        cell = row.getCell(2);
-        assertNotNull(cell);
-        assertEquals("A", cell.getStringCellValue());
-
-        xssfWorkbook.close();
-        wb.close();
-    }
-
-    @Test
-    public void addToExistingWorkbook() throws IOException {
-    	XSSFWorkbook xssfWb1 = new XSSFWorkbook();
-    	xssfWb1.createSheet("S1");
-    	Sheet sheet = xssfWb1.createSheet("S2");
-    	Row row = sheet.createRow(1);
-    	Cell cell = row.createCell(1);
-    	cell.setCellValue("value 2_1_1");
-        SXSSFWorkbook wb1 = new SXSSFWorkbook(xssfWb1);
-    	XSSFWorkbook xssfWb2 = SXSSFITestDataProvider.instance.writeOutAndReadBack(wb1);
-        assertTrue(wb1.dispose());
-        xssfWb1.close();
-
-        SXSSFWorkbook wb2 = new SXSSFWorkbook(xssfWb2);
-    	// Add a row to the existing empty sheet
-    	Sheet sheet1 = wb2.getSheetAt(0);
-    	Row row1_1 = sheet1.createRow(1);
-    	Cell cell1_1_1 = row1_1.createCell(1);
-    	cell1_1_1.setCellValue("value 1_1_1");
-
-    	// Add a row to the existing non-empty sheet
-    	Sheet sheet2 = wb2.getSheetAt(1);
-    	Row row2_2 = sheet2.createRow(2);
-    	Cell cell2_2_1 = row2_2.createCell(1);
-    	cell2_2_1.setCellValue("value 2_2_1");
-
-    	// Add a sheet with one row
-    	Sheet sheet3 = wb2.createSheet("S3");
-    	Row row3_1 = sheet3.createRow(1);
-    	Cell cell3_1_1 = row3_1.createCell(1);
-    	cell3_1_1.setCellValue("value 3_1_1");
-
-    	XSSFWorkbook xssfWb3 = SXSSFITestDataProvider.instance.writeOutAndReadBack(wb2);
-    	wb2.close();
-    	
-    	assertEquals(3, xssfWb3.getNumberOfSheets());
-    	// Verify sheet 1
-    	sheet1 = xssfWb3.getSheetAt(0);
-    	assertEquals("S1", sheet1.getSheetName());
-    	assertEquals(1, sheet1.getPhysicalNumberOfRows());
-    	row1_1 = sheet1.getRow(1);
-    	assertNotNull(row1_1);
-    	cell1_1_1 = row1_1.getCell(1);
-    	assertNotNull(cell1_1_1);
-    	assertEquals("value 1_1_1", cell1_1_1.getStringCellValue());
-    	// Verify sheet 2
-    	sheet2 = xssfWb3.getSheetAt(1);
-    	assertEquals("S2", sheet2.getSheetName());
-    	assertEquals(2, sheet2.getPhysicalNumberOfRows());
-    	Row row2_1 = sheet2.getRow(1);
-    	assertNotNull(row2_1);
-    	Cell cell2_1_1 = row2_1.getCell(1);
-    	assertNotNull(cell2_1_1);
-    	assertEquals("value 2_1_1", cell2_1_1.getStringCellValue());
-    	row2_2 = sheet2.getRow(2);
-    	assertNotNull(row2_2);
-    	cell2_2_1 = row2_2.getCell(1);
-    	assertNotNull(cell2_2_1);
-    	assertEquals("value 2_2_1", cell2_2_1.getStringCellValue());
-    	// Verify sheet 3
-    	sheet3 = xssfWb3.getSheetAt(2);
-    	assertEquals("S3", sheet3.getSheetName());
-    	assertEquals(1, sheet3.getPhysicalNumberOfRows());
-    	row3_1 = sheet3.getRow(1);
-    	assertNotNull(row3_1);
-    	cell3_1_1 = row3_1.getCell(1);
-    	assertNotNull(cell3_1_1);
-    	assertEquals("value 3_1_1", cell3_1_1.getStringCellValue());
-    	
-        xssfWb2.close();
-    	xssfWb3.close();
-    	wb1.close();
-    }
-
-    @Test
-    public void sheetdataWriter() throws IOException{
-        SXSSFWorkbook wb = new SXSSFWorkbook();
-        SXSSFSheet sh = wb.createSheet();
-        SheetDataWriter wr = sh.getSheetDataWriter();
-        assertTrue(wr.getClass() == SheetDataWriter.class);
-        File tmp = wr.getTempFile();
-        assertTrue(tmp.getName().startsWith("poi-sxssf-sheet"));
-        assertTrue(tmp.getName().endsWith(".xml"));
-        assertTrue(wb.dispose());
-        wb.close();
-
-        wb = new SXSSFWorkbook();
-        wb.setCompressTempFiles(true);
-        sh = wb.createSheet();
-        wr = sh.getSheetDataWriter();
-        assertTrue(wr.getClass() == GZIPSheetDataWriter.class);
-        tmp = wr.getTempFile();
-        assertTrue(tmp.getName().startsWith("poi-sxssf-sheet-xml"));
-        assertTrue(tmp.getName().endsWith(".gz"));
-        assertTrue(wb.dispose());
-        wb.close();
-
-        //Test escaping of Unicode control characters
-        wb = new SXSSFWorkbook();
-        wb.createSheet("S1").createRow(0).createCell(0).setCellValue("value\u0019");
-        XSSFWorkbook xssfWorkbook = SXSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        Cell cell = xssfWorkbook.getSheet("S1").getRow(0).getCell(0);
-        assertEquals("value?", cell.getStringCellValue());
-
-        assertTrue(wb.dispose());
-        wb.close();
-        xssfWorkbook.close();
-    }
-
-    @Test
-    public void gzipSheetdataWriter() throws IOException {
-        SXSSFWorkbook wb = new SXSSFWorkbook();
-        wb.setCompressTempFiles(true);
-        int rowNum = 1000;
-        int sheetNum = 5;
-        for(int i = 0; i < sheetNum; i++){
-            Sheet sh = wb.createSheet("sheet" + i);
-            for(int j = 0; j < rowNum; j++){
-                Row row = sh.createRow(j);
-                Cell cell1 = row.createCell(0);
-                cell1.setCellValue(new CellReference(cell1).formatAsString());
-
-                Cell cell2 = row.createCell(1);
-                cell2.setCellValue(i);
-
-                Cell cell3 = row.createCell(2);
-                cell3.setCellValue(j);
-            }
-        }
-
-        XSSFWorkbook xwb = SXSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        for(int i = 0; i < sheetNum; i++){
-            Sheet sh = xwb.getSheetAt(i);
-            assertEquals("sheet" + i, sh.getSheetName());
-            for(int j = 0; j < rowNum; j++){
-                Row row = sh.getRow(j);
-                assertNotNull("row[" + j + "]", row);
-                Cell cell1 = row.getCell(0);
-                assertEquals(new CellReference(cell1).formatAsString(), cell1.getStringCellValue());
-
-                Cell cell2 = row.getCell(1);
-                assertEquals(i, (int)cell2.getNumericCellValue());
-
-                Cell cell3 = row.getCell(2);
-                assertEquals(j, (int)cell3.getNumericCellValue());
-            }
-        }
-
-        assertTrue(wb.dispose());
-        xwb.close();
-        wb.close();
-    }
-
-    protected static void assertWorkbookDispose(SXSSFWorkbook wb)
-    {
-        int rowNum = 1000;
-        int sheetNum = 5;
-        for(int i = 0; i < sheetNum; i++){
-            Sheet sh = wb.createSheet("sheet" + i);
-            for(int j = 0; j < rowNum; j++){
-                Row row = sh.createRow(j);
-                Cell cell1 = row.createCell(0);
-                cell1.setCellValue(new CellReference(cell1).formatAsString());
-
-                Cell cell2 = row.createCell(1);
-                cell2.setCellValue(i);
-
-                Cell cell3 = row.createCell(2);
-                cell3.setCellValue(j);
-            }
-        }
-
-        for (Sheet sheet : wb) {
-            SXSSFSheet sxSheet = (SXSSFSheet) sheet;
-            assertTrue(sxSheet.getSheetDataWriter().getTempFile().exists());
-        }
-
-        assertTrue(wb.dispose());
-
-        for (Sheet sheet : wb) {
-            SXSSFSheet sxSheet = (SXSSFSheet) sheet;
-            assertFalse(sxSheet.getSheetDataWriter().getTempFile().exists());
-        }
-    }
-
-    @Test
-    public void workbookDispose() throws IOException {
-        SXSSFWorkbook wb1 = new SXSSFWorkbook();
-        // the underlying writer is SheetDataWriter
-        assertWorkbookDispose(wb1);
-        wb1.close();
-
-        SXSSFWorkbook wb2 = new SXSSFWorkbook();
-        wb2.setCompressTempFiles(true);
-        // the underlying writer is GZIPSheetDataWriter
-        assertWorkbookDispose(wb2);
-        wb2.close();
-    }
-
-    @Ignore("currently writing the same sheet multiple times is not supported...")
-    @Test
-    public void bug53515() throws Exception {
-        Workbook wb1 = new SXSSFWorkbook(10);
-        populateWorkbook(wb1);
-        saveTwice(wb1);
-        Workbook wb2 = new XSSFWorkbook();
-        populateWorkbook(wb2);
-        saveTwice(wb2);
-        wb2.close();
-        wb1.close();
-    }
-
-    @Ignore("Crashes the JVM because of documented JVM behavior with concurrent writing/reading of zip-files, "
-            + "see http://www.oracle.com/technetwork/java/javase/documentation/overview-156328.html")
-    @Test
-    public void bug53515a() throws Exception {
-        File out = new File("Test.xlsx");
-        out.delete();
-        for (int i = 0; i < 2; i++) {
-            System.out.println("Iteration " + i);
-            final SXSSFWorkbook wb;
-            if (out.exists()) {
-                wb = new SXSSFWorkbook(
-                        (XSSFWorkbook) WorkbookFactory.create(out));
-            } else {
-                wb = new SXSSFWorkbook(10);
-            }
-
-            try {
-                FileOutputStream outSteam = new FileOutputStream(out);
-                if (i == 0) {
-                    populateWorkbook(wb);
-                } else {
-                    System.gc();
-                    System.gc();
-                    System.gc();
-                }
-
-                wb.write(outSteam);
-                // assertTrue(wb.dispose());
-                outSteam.close();
-            } finally {
-                assertTrue(wb.dispose());
-            }
-            wb.close();
-        }
-        out.delete();
-    }
-
-    private static void populateWorkbook(Workbook wb) {
-        Sheet sh = wb.createSheet();
-        for (int rownum = 0; rownum < 100; rownum++) {
-            Row row = sh.createRow(rownum);
-            for (int cellnum = 0; cellnum < 10; cellnum++) {
-                Cell cell = row.createCell(cellnum);
-                String address = new CellReference(cell).formatAsString();
-                cell.setCellValue(address);
-            }
-        }
-    }
-
-    private static void saveTwice(Workbook wb) throws Exception {
-        for (int i = 0; i < 2; i++) {
-            try {
-                NullOutputStream out = new NullOutputStream();
-                wb.write(out);
-                out.close();
-            } catch (Exception e) {
-                throw new Exception("ERROR: failed on " + (i + 1)
-                        + "th time calling " + wb.getClass().getName()
-                        + ".write() with exception " + e.getMessage(), e);
-            }
-        }
-    }
-
-    @Ignore("Just a local test for http://stackoverflow.com/questions/33627329/apache-poi-streaming-api-using-xssf-template")
-    @Test
-    public void testTemplateFile() throws IOException {
-        XSSFWorkbook workBook = XSSFTestDataSamples.openSampleWorkbook("sample.xlsx");
-        SXSSFWorkbook streamingWorkBook = new SXSSFWorkbook(workBook,10);
-        Sheet sheet = streamingWorkBook.getSheet("Sheet1");
-        for(int rowNum = 10;rowNum < 1000000;rowNum++) {
-            Row row = sheet.createRow(rowNum);
-            for(int cellNum = 0;cellNum < 700;cellNum++) {
-                Cell cell = row.createCell(cellNum);
-                cell.setCellValue("somevalue");
-            }
-            
-            if(rowNum % 100 == 0) {
-                System.out.print(".");
-                if(rowNum % 10000 == 0) {
-                    System.out.println(rowNum);
-                }
-            }
-        }
-
-        FileOutputStream fos = new FileOutputStream("C:\\temp\\streaming.xlsx");
-        streamingWorkBook.write(fos);
-        fos.close();
-        
-        streamingWorkBook.close();
-        workBook.close();
-    }
-    
-
-    @Test
-    public void closeDoesNotModifyWorkbook() throws IOException, InvalidFormatException {
-        final String filename = "SampleSS.xlsx";
-        final File file = POIDataSamples.getSpreadSheetInstance().getFile(filename);
-        SXSSFWorkbook wb = null;
-        XSSFWorkbook xwb = null;
-        
-        // Some tests commented out because close() modifies the file
-        // See bug 58779
-        
-        // String
-        //wb = new SXSSFWorkbook(new XSSFWorkbook(file.getPath()));
-        //assertCloseDoesNotModifyFile(filename, wb);
-        
-        // File
-        //wb = new SXSSFWorkbook(new XSSFWorkbook(file));
-        //assertCloseDoesNotModifyFile(filename, wb);
-        
-        // InputStream
-        FileInputStream fis = new FileInputStream(file);
-        try {
-            xwb = new XSSFWorkbook(fis);
-            wb = new SXSSFWorkbook(xwb);
-            assertCloseDoesNotModifyFile(filename, wb);
-        } finally {
-            if (xwb != null) {
-                xwb.close();
-            }
-            if (wb != null) {
-                wb.close();
-            }
-            fis.close();
-        }
-        
-        // OPCPackage
-        //wb = new SXSSFWorkbook(new XSSFWorkbook(OPCPackage.open(file)));
-        //assertCloseDoesNotModifyFile(filename, wb);
-    }
-    
-    /**
-     * Bug #59743
-     * 
-     * this is only triggered on other files apart of sheet[1,2,...].xml
-     * as those are either copied uncompressed or with the use of GZIPInputStream
-     * so we use shared strings
-     */
-    @Test
-    public void testZipBombNotTriggeredOnUselessContent() throws IOException {
-        SXSSFWorkbook swb = new SXSSFWorkbook(null, 1, true, true);
-        SXSSFSheet s = swb.createSheet();
-        char useless[] = new char[32767];
-        Arrays.fill(useless, ' ');
-        
-        for (int row=0; row<1; row++) {
-            Row r = s.createRow(row);
-            for (int col=0; col<10; col++) {
-                char prefix[] = Integer.toHexString(row*1000+col).toCharArray();
-                Arrays.fill(useless, 0, 10, ' ');
-                System.arraycopy(prefix, 0, useless, 0, prefix.length);
-                String ul = new String(useless);
-                r.createCell(col, CellType.STRING).setCellValue(ul);
-                ul = null;
-            }
-        }
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        swb.write(bos);
-        swb.dispose();
-        swb.close();
-    }
-    
-    /**
-     * To avoid accident changes to the template, you should be able
-     *  to create a SXSSFWorkbook from a read-only XSSF one, then
-     *  change + save that (only). See bug #60010
-     * TODO Fix this to work!
-     */
-    @Test
-    @Ignore
-    public void createFromReadOnlyWorkbook() throws Exception {
-        File input = XSSFTestDataSamples.getSampleFile("sample.xlsx");
-        OPCPackage pkg = OPCPackage.open(input, PackageAccess.READ);
-        XSSFWorkbook xssf = new XSSFWorkbook(pkg);
-        SXSSFWorkbook wb = new SXSSFWorkbook(xssf, 2);
-        
-        String sheetName = "Test SXSSF";
-        Sheet s = wb.createSheet(sheetName);
-        for (int i=0; i<10; i++) {
-            Row r = s.createRow(i);
-            r.createCell(0).setCellValue(true);
-            r.createCell(1).setCellValue(2.4);
-            r.createCell(2).setCellValue("Test Row " + i);
-        }
-        assertEquals(10, s.getLastRowNum());
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        wb.write(bos);
-        wb.dispose();
-        wb.close();
-        
-        xssf = new XSSFWorkbook(new ByteArrayInputStream(bos.toByteArray()));
-        s = xssf.getSheet(sheetName);
-        assertEquals(10, s.getLastRowNum());
-        assertEquals(true, s.getRow(0).getCell(0).getBooleanCellValue());
-        assertEquals("Test Row 9", s.getRow(9).getCell(2).getStringCellValue());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
deleted file mode 100644
index b477c8b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xssf.streaming;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.security.GeneralSecurityException;
-import java.util.List;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.util.ZipEntrySource;
-import org.apache.poi.poifs.crypt.temp.AesZipFileZipEntrySource;
-import org.apache.poi.poifs.crypt.temp.EncryptedTempData;
-import org.apache.poi.poifs.crypt.temp.SXSSFWorkbookWithCustomZipEntrySource;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-/**
- * This class tests that an SXSSFWorkbook can be written and read where all temporary disk I/O
- * is encrypted, but the final saved workbook is not encrypted
- */
-public final class TestSXSSFWorkbookWithCustomZipEntrySource {
-    
-    final String sheetName = "TestSheet1";
-    final String cellValue = "customZipEntrySource";
-    
-    // write an unencrypted workbook to disk, but any temporary files are encrypted
-    @Test
-    public void customZipEntrySource() throws IOException {
-        SXSSFWorkbookWithCustomZipEntrySource workbook = new SXSSFWorkbookWithCustomZipEntrySource();
-        SXSSFSheet sheet1 = workbook.createSheet(sheetName);
-        SXSSFRow row1 = sheet1.createRow(1);
-        SXSSFCell cell1 = row1.createCell(1);
-        cell1.setCellValue(cellValue);
-        ByteArrayOutputStream os = new ByteArrayOutputStream(8192);
-        workbook.write(os);
-        workbook.close();
-        workbook.dispose();
-        XSSFWorkbook xwb = new XSSFWorkbook(new ByteArrayInputStream(os.toByteArray()));
-        XSSFSheet xs1 = xwb.getSheetAt(0);
-        assertEquals(sheetName, xs1.getSheetName());
-        XSSFRow xr1 = xs1.getRow(1);
-        XSSFCell xc1 = xr1.getCell(1);
-        assertEquals(cellValue, xc1.getStringCellValue());
-        xwb.close();
-    }
-    
-    // write an encrypted workbook to disk, and encrypt any temporary files as well
-    @Test
-    public void customZipEntrySourceForWriteAndRead() throws IOException, GeneralSecurityException, InvalidFormatException {
-        SXSSFWorkbookWithCustomZipEntrySource workbook = new SXSSFWorkbookWithCustomZipEntrySource();
-        SXSSFSheet sheet1 = workbook.createSheet(sheetName);
-        SXSSFRow row1 = sheet1.createRow(1);
-        SXSSFCell cell1 = row1.createCell(1);
-        cell1.setCellValue(cellValue);
-        EncryptedTempData tempData = new EncryptedTempData();
-        workbook.write(tempData.getOutputStream());
-        workbook.close();
-        workbook.dispose();
-        ZipEntrySource zipEntrySource = AesZipFileZipEntrySource.createZipEntrySource(tempData.getInputStream());
-        tempData.dispose();
-        OPCPackage opc = OPCPackage.open(zipEntrySource);
-        XSSFWorkbook xwb = new XSSFWorkbook(opc);
-        zipEntrySource.close();
-        XSSFSheet xs1 = xwb.getSheetAt(0);
-        assertEquals(sheetName, xs1.getSheetName());
-        XSSFRow xr1 = xs1.getRow(1);
-        XSSFCell xc1 = xr1.getCell(1);
-        assertEquals(cellValue, xc1.getStringCellValue());
-        xwb.close();
-        opc.close();
-    }
-    
-    // Java 7 and above:
-    // import static java.nio.charset.StandardCharsets.UTF_8;
-    // Java 6 and below:
-    private static final Charset UTF_8 = Charset.forName("UTF-8");
-    
-    @Test
-    public void validateTempFilesAreEncrypted() throws IOException {
-        TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource workbook = new TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource();
-        SXSSFSheet sheet1 = workbook.createSheet(sheetName);
-        SXSSFRow row1 = sheet1.createRow(1);
-        SXSSFCell cell1 = row1.createCell(1);
-        cell1.setCellValue(cellValue);
-        ByteArrayOutputStream os = new ByteArrayOutputStream(8192);
-        workbook.write(os);
-        workbook.close();
-        List<File> tempFiles = workbook.getTempFiles();
-        assertEquals(1, tempFiles.size());
-        File tempFile = tempFiles.get(0);
-        assertTrue("tempFile exists?", tempFile.exists());
-        InputStream stream = new FileInputStream(tempFile);
-        try {
-            byte[] data = IOUtils.toByteArray(stream);
-            String text = new String(data, UTF_8);
-            assertFalse(text.contains(sheetName));
-            assertFalse(text.contains(cellValue));
-        } finally {
-            stream.close();
-        }
-        workbook.dispose();
-        assertFalse("tempFile deleted after dispose?", tempFile.exists());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
deleted file mode 100644
index 6ecad0a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.formula.eval.forked.TestForkedEvaluator;
-import org.apache.poi.xssf.usermodel.extensions.TestXSSFBorder;
-import org.apache.poi.xssf.usermodel.extensions.TestXSSFCellFill;
-import org.apache.poi.xssf.usermodel.extensions.TestXSSFSheetComments;
-import org.apache.poi.xssf.usermodel.helpers.TestColumnHelper;
-import org.apache.poi.xssf.usermodel.helpers.TestHeaderFooterHelper;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for <tt>org.apache.poi.xssf.usermodel</tt> and sub-packages.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestFormulaEvaluatorOnXSSF.class,
-    TestMultiSheetFormulaEvaluatorOnXSSF.class,
-    TestSheetHiding.class,
-    TestXSSFBugs.class,
-    TestXSSFDataFormat.class,
-    TestXSSFCellStyle.class,
-    TestXSSFComment.class,
-    TestXSSFDialogSheet.class,
-    TestXSSFDrawing.class,
-    TestXSSFFont.class,
-    TestXSSFFormulaEvaluation.class,
-    TestXSSFHeaderFooter.class,
-    TestXSSFHyperlink.class,
-    TestXSSFName.class,
-    TestXSSFPicture.class,
-    TestXSSFPictureData.class,
-    TestXSSFPrintSetup.class,
-    TestXSSFRichTextString.class,
-    TestXSSFRow.class,
-    TestXSSFSheet.class,
-    TestXSSFSheetUpdateArrayFormulas.class,
-    TestXSSFTable.class,
-    TestXSSFWorkbook.class,
-    TestXSSFBorder.class,
-    TestXSSFCellFill.class,
-    TestXSSFSheetComments.class,
-    TestColumnHelper.class,
-    TestHeaderFooterHelper.class,
-    //TestXSSFPivotTable.class, //converted to junit4
-    TestForkedEvaluator.class
-})
-public final class AllXSSFUsermodelTests {
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
deleted file mode 100644
index 4458125..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataConsolidateFunction;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageField;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageFields;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotFields;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotTableDefinition;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataConsolidateFunction;
-
-public abstract class BaseTestXSSFPivotTable {
-    private static final XSSFITestDataProvider _testDataProvider = XSSFITestDataProvider.instance;
-    protected XSSFWorkbook wb;
-    protected XSSFPivotTable pivotTable;
-    protected XSSFPivotTable offsetPivotTable;
-    protected Cell offsetOuterCell;
-    
-    /**
-     * required to set up the test pivot tables and cell reference, either by name or reference.
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Before
-    public abstract void setUp();
-    
-    @After
-    public void tearDown() throws IOException {
-        if (wb != null) {
-            XSSFWorkbook wb2 = _testDataProvider.writeOutAndReadBack(wb);
-            wb.close();
-            wb2.close();
-        }
-    }
-
-    /**
-     * Verify that when creating a row label it's  created on the correct row
-     * and the count is increased by one.
-     */
-    @Test
-    public void testAddRowLabelToPivotTable() {
-        int columnIndex = 0;
-
-        assertEquals(0, pivotTable.getRowLabelColumns().size());
-        
-        pivotTable.addRowLabel(columnIndex);
-        CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
-
-        assertEquals(defintion.getRowFields().getFieldArray(0).getX(), columnIndex);
-        assertEquals(defintion.getRowFields().getCount(), 1);
-        assertEquals(1, pivotTable.getRowLabelColumns().size());
-        
-        columnIndex = 1;
-        pivotTable.addRowLabel(columnIndex);
-        assertEquals(2, pivotTable.getRowLabelColumns().size());
-        
-        assertEquals(0, (int)pivotTable.getRowLabelColumns().get(0));
-        assertEquals(1, (int)pivotTable.getRowLabelColumns().get(1));
-    }
-
-    /**
-     * Verify that it's not possible to create a row label outside of the referenced area.
-     */
-    @Test
-    public void testAddRowLabelOutOfRangeThrowsException() {
-        int columnIndex = 5;
-
-        try {
-            pivotTable.addRowLabel(columnIndex);
-        } catch(IndexOutOfBoundsException e) {
-            return;
-        }
-        fail();
-    }
-
-    /**
-     * Verify that when creating one column label, no col fields are being created.
-     */
-    @Test
-    public void testAddOneColumnLabelToPivotTableDoesNotCreateColField() {
-        int columnIndex = 0;
-
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnIndex);
-        CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
-
-        assertEquals(defintion.getColFields(), null);
-    }
-
-    /**
-     * Verify that it's possible to create three column labels with different DataConsolidateFunction
-     */
-    @Test
-    public void testAddThreeDifferentColumnLabelsToPivotTable() {
-        int columnOne = 0;
-        int columnTwo = 1;
-        int columnThree = 2;
-
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnOne);
-        pivotTable.addColumnLabel(DataConsolidateFunction.MAX, columnTwo);
-        pivotTable.addColumnLabel(DataConsolidateFunction.MIN, columnThree);
-        CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
-
-        assertEquals(defintion.getDataFields().getDataFieldList().size(), 3);
-    }
-    
-    
-    /**
-     * Verify that it's possible to create three column labels with the same DataConsolidateFunction
-     */
-    @Test
-    public void testAddThreeSametColumnLabelsToPivotTable() {
-        int columnOne = 0;
-        int columnTwo = 1;
-        int columnThree = 2;
-
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnOne);
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnTwo);
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnThree);
-        CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
-
-        assertEquals(defintion.getDataFields().getDataFieldList().size(), 3);
-    }
-    
-    /**
-     * Verify that when creating two column labels, a col field is being created and X is set to -2.
-     */
-    @Test
-    public void testAddTwoColumnLabelsToPivotTable() {
-        int columnOne = 0;
-        int columnTwo = 1;
-
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnOne);
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnTwo);
-        CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
-
-        assertEquals(defintion.getColFields().getFieldArray(0).getX(), -2);
-    }
-
-    /**
-     * Verify that a data field is created when creating a data column
-     */
-    @Test
-    public void testColumnLabelCreatesDataField() {
-        int columnIndex = 0;
-
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnIndex);
-
-        CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
-
-        assertEquals(defintion.getDataFields().getDataFieldArray(0).getFld(), columnIndex);
-        assertEquals(defintion.getDataFields().getDataFieldArray(0).getSubtotal(),
-                STDataConsolidateFunction.Enum.forInt(DataConsolidateFunction.SUM.getValue()));
-    }
-    
-    /**
-     * Verify that it's possible to set a custom name when creating a data column
-     */
-    @Test
-    public void testColumnLabelSetCustomName() {
-        int columnIndex = 0;
-
-        String customName = "Custom Name";
-        
-        pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnIndex, customName);
-
-        CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
-
-        assertEquals(defintion.getDataFields().getDataFieldArray(0).getFld(), columnIndex);
-        assertEquals(defintion.getDataFields().getDataFieldArray(0).getName(), customName);
-    }
-
-    /**
-     * Verify that it's not possible to create a column label outside of the referenced area.
-     */
-    @Test
-    public void testAddColumnLabelOutOfRangeThrowsException() {
-        int columnIndex = 5;
-
-        try {
-            pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnIndex);
-        } catch(IndexOutOfBoundsException e) {
-            return;
-        }
-        fail();
-    }
-
-     /**
-     * Verify when creating a data column set to a data field, the data field with the corresponding
-     * column index will be set to true.
-     */
-    @Test
-    public void testAddDataColumn() {
-        int columnIndex = 0;
-        boolean isDataField = true;
-
-        pivotTable.addDataColumn(columnIndex, isDataField);
-        CTPivotFields pivotFields = pivotTable.getCTPivotTableDefinition().getPivotFields();
-        assertEquals(pivotFields.getPivotFieldArray(columnIndex).getDataField(), isDataField);
-    }
-
-    /**
-     * Verify that it's not possible to create a data column outside of the referenced area.
-     */
-    @Test
-    public void testAddDataColumnOutOfRangeThrowsException() {
-        int columnIndex = 5;
-        boolean isDataField = true;
-
-        try {
-            pivotTable.addDataColumn(columnIndex, isDataField);
-        } catch(IndexOutOfBoundsException e) {
-            return;
-        }
-        fail();
-    }
-
-     /**
-     * Verify that it's possible to create a new filter
-     */
-    @Test
-    public void testAddReportFilter() {
-        int columnIndex = 0;
-
-        pivotTable.addReportFilter(columnIndex);
-        CTPageFields fields = pivotTable.getCTPivotTableDefinition().getPageFields();
-        CTPageField field = fields.getPageFieldArray(0);
-        assertEquals(field.getFld(), columnIndex);
-        assertEquals(field.getHier(), -1);
-        assertEquals(fields.getCount(), 1);
-    }
-
-     /**
-     * Verify that it's not possible to create a new filter outside of the referenced area.
-     */
-    @Test
-    public void testAddReportFilterOutOfRangeThrowsException() {
-        int columnIndex = 5;
-        try {
-            pivotTable.addReportFilter(columnIndex);
-        } catch(IndexOutOfBoundsException e) {
-            return;
-        }
-        fail();
-    }
-    
-    /**
-     * Verify that the Pivot Table operates only within the referenced area, even when the
-     * first column of the referenced area is not index 0.
-     */
-    @Test
-    public void testAddDataColumnWithOffsetData() {
-        offsetPivotTable.addColumnLabel(DataConsolidateFunction.SUM, 1);
-        assertEquals(CellType.NUMERIC, offsetOuterCell.getCellTypeEnum());
-        
-        offsetPivotTable.addColumnLabel(DataConsolidateFunction.SUM, 0);
-    }
-    
-    @Test
-    public void testPivotTableSheetNamesAreCaseInsensitive() {
-        wb.setSheetName(0,  "original");
-        wb.setSheetName(1,  "offset");
-        XSSFSheet original = wb.getSheet("OriginaL");
-        XSSFSheet offset = wb.getSheet("OffseT");
-        // assume sheets are accessible via case-insensitive name
-        assertNotNull(original);
-        assertNotNull(offset);
-        
-        AreaReference source = new AreaReference("ORIGinal!A1:C2", _testDataProvider.getSpreadsheetVersion());
-        // create a pivot table on the same sheet, case insensitive
-        original.createPivotTable(source, new CellReference("W1"));
-        // create a pivot table on a different sheet, case insensitive
-        offset.createPivotTable(source, new CellReference("W1"));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
deleted file mode 100644
index ad8b490..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.ss.formula.eval.TestFormulasFromSpreadsheet;
-import org.apache.poi.ss.formula.functions.TestMathX;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Performs much the same role as {@link TestFormulasFromSpreadsheet},
- *  except for a XSSF spreadsheet, not a HSSF one.
- * This allows us to check that all our Formula Evaluation code
- *  is able to work for XSSF, as well as for HSSF.
- * 
- * Periodically, you should open FormulaEvalTestData.xls in
- *  Excel 2007, and re-save it as FormulaEvalTestData_Copy.xlsx
- *  
- */
-@RunWith(Parameterized.class)
-public final class TestFormulaEvaluatorOnXSSF {
-    private static final POILogger logger = POILogFactory.getLogger(TestFormulaEvaluatorOnXSSF.class);
-
-    private static XSSFWorkbook workbook;
-    private static Sheet sheet;
-    private static FormulaEvaluator evaluator;
-    private static Locale userLocale;
-    
-	/** 
-	 * This class defines constants for navigating around the test data spreadsheet used for these tests.
-	 */
-	private static interface SS {
-		
-		/**
-		 * Name of the test spreadsheet (found in the standard test data folder)
-		 */
-		String FILENAME = "FormulaEvalTestData_Copy.xlsx";
-        /**
-         * Row (zero-based) in the test spreadsheet where the operator examples start.
-         */
-        int START_OPERATORS_ROW_INDEX = 22; // Row '23'
-        /**
-         * Row (zero-based) in the test spreadsheet where the function examples start.
-         */
-        int START_FUNCTIONS_ROW_INDEX = 95; // Row '96'
-        /**
-         * Index of the column that contains the function names
-         */
-        int COLUMN_INDEX_FUNCTION_NAME = 1; // Column 'B'
-
-        /**
-         * Used to indicate when there are no more functions left
-         */
-        String FUNCTION_NAMES_END_SENTINEL = "<END-OF-FUNCTIONS>";
-
-        /**
-         * Index of the column where the test values start (for each function)
-         */
-        short COLUMN_INDEX_FIRST_TEST_VALUE = 3; // Column 'D'
-
-        /**
-         * Each function takes 4 rows in the test spreadsheet
-         */
-        int NUMBER_OF_ROWS_PER_FUNCTION = 4;
-	}
-
-    @Parameter(value = 0)
-    public String targetFunctionName;
-    @Parameter(value = 1)
-    public int formulasRowIdx;
-    @Parameter(value = 2)
-    public int expectedValuesRowIdx;
-
-    @AfterClass
-    public static void closeResource() throws Exception {
-        LocaleUtil.setUserLocale(userLocale);
-        workbook.close();
-    }
-    
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        // Function "Text" uses custom-formats which are locale specific
-        // can't set the locale on a per-testrun execution, as some settings have been
-        // already set, when we would try to change the locale by then
-        userLocale = LocaleUtil.getUserLocale();
-        LocaleUtil.setUserLocale(Locale.ROOT);
-
-        workbook = new XSSFWorkbook( OPCPackage.open(HSSFTestDataSamples.getSampleFile(SS.FILENAME), PackageAccess.READ) );
-        sheet = workbook.getSheetAt( 0 );
-        evaluator = new XSSFFormulaEvaluator(workbook);
-        
-        List<Object[]> data = new ArrayList<Object[]>();
-        
-        processFunctionGroup(data, SS.START_OPERATORS_ROW_INDEX, null);
-        processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, null);
-        // example for debugging individual functions/operators:
-        // processFunctionGroup(data, SS.START_OPERATORS_ROW_INDEX, "ConcatEval");
-        // processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, "Text");
-
-        return data;
-    }
-    
-    /**
-     * @param startRowIndex row index in the spreadsheet where the first function/operator is found 
-     * @param testFocusFunctionName name of a single function/operator to test alone. 
-     * Typically pass <code>null</code> to test all functions
-     */
-    private static void processFunctionGroup(List<Object[]> data, int startRowIndex, String testFocusFunctionName) {
-        for (int rowIndex = startRowIndex; true; rowIndex += SS.NUMBER_OF_ROWS_PER_FUNCTION) {
-            Row r = sheet.getRow(rowIndex);
-
-            // only evaluate non empty row
-            if(r == null) continue;
-            
-            String targetFunctionName = getTargetFunctionName(r);
-            assertNotNull("Test spreadsheet cell empty on row ("
-                + (rowIndex+1) + "). Expected function name or '"
-                + SS.FUNCTION_NAMES_END_SENTINEL + "'", targetFunctionName);
-
-            if(targetFunctionName.equals(SS.FUNCTION_NAMES_END_SENTINEL)) {
-                // found end of functions list
-                break;
-            }
-            if(testFocusFunctionName == null || targetFunctionName.equalsIgnoreCase(testFocusFunctionName)) {
-                
-                // expected results are on the row below
-                Row expectedValuesRow = sheet.getRow(rowIndex + 1);
-                // +1 for 1-based, +1 for next row
-                assertNotNull("Missing expected values row for function '" 
-                    + targetFunctionName + " (row " + rowIndex + 2 + ")"
-                    , expectedValuesRow);
-                
-                data.add(new Object[]{targetFunctionName, rowIndex, rowIndex + 1});
-            }
-        }
-    }
-
-
-	@Test
-	public void processFunctionRow() {
-	    Row formulasRow = sheet.getRow(formulasRowIdx);
-	    Row expectedValuesRow = sheet.getRow(expectedValuesRowIdx);
-	    
-		short endcolnum = formulasRow.getLastCellNum();
-
-		// iterate across the row for all the evaluation cases
-		for (short colnum=SS.COLUMN_INDEX_FIRST_TEST_VALUE; colnum < endcolnum; colnum++) {
-			Cell c = formulasRow.getCell(colnum);
-			assumeNotNull(c);
-			assumeTrue(c.getCellTypeEnum() == CellType.FORMULA);
-			ignoredFormulaTestCase(c.getCellFormula());
-
-			CellValue actValue = evaluator.evaluate(c);
-			Cell expValue = (expectedValuesRow == null) ? null : expectedValuesRow.getCell(colnum);
-
-			String msg = String.format(Locale.ROOT, "Function '%s': Formula: %s @ %d:%d"
-		        , targetFunctionName, c.getCellFormula(), formulasRow.getRowNum(), colnum);
-			
-			assertNotNull(msg + " - Bad setup data expected value is null", expValue);
-			assertNotNull(msg + " - actual value was null", actValue);
-	        
-	        final CellType expectedCellType = expValue.getCellTypeEnum();
-	        switch (expectedCellType) {
-	            case BLANK:
-	                assertEquals(msg, CellType.BLANK, actValue.getCellTypeEnum());
-	                break;
-	            case BOOLEAN:
-	                assertEquals(msg, CellType.BOOLEAN, actValue.getCellTypeEnum());
-	                assertEquals(msg, expValue.getBooleanCellValue(), actValue.getBooleanValue());
-	                break;
-	            case ERROR:
-	                assertEquals(msg, CellType.ERROR, actValue.getCellTypeEnum());
-//	              if(false) { // TODO: fix ~45 functions which are currently returning incorrect error values
-//	                  assertEquals(msg, expValue.getErrorCellValue(), actValue.getErrorValue());
-//	              }
-	                break;
-	            case FORMULA: // will never be used, since we will call method after formula evaluation
-	                fail("Cannot expect formula as result of formula evaluation: " + msg);
-	            case NUMERIC:
-	                assertEquals(msg, CellType.NUMERIC, actValue.getCellTypeEnum());
-	                TestMathX.assertEquals(msg, expValue.getNumericCellValue(), actValue.getNumberValue(), TestMathX.POS_ZERO, TestMathX.DIFF_TOLERANCE_FACTOR);
-//	              double delta = Math.abs(expValue.getNumericCellValue()-actValue.getNumberValue());
-//	              double pctExpValue = Math.abs(0.00001*expValue.getNumericCellValue());
-//	              assertTrue(msg, delta <= pctExpValue);
-	                break;
-	            case STRING:
-	                assertEquals(msg, CellType.STRING, actValue.getCellTypeEnum());
-	                assertEquals(msg, expValue.getRichStringCellValue().getString(), actValue.getStringValue());
-	                break;
-	            default:
-	                fail("Unexpected cell type: " + expectedCellType);
-	        }
-		}
-	}
-
-	/*
-	 * TODO - these are all formulas which currently (Apr-2008) break on ooxml 
-	 */
-	private static void ignoredFormulaTestCase(String cellFormula) {
-        // full row ranges are not parsed properly yet.
-        // These cases currently work in svn trunk because of another bug which causes the 
-        // formula to get rendered as COLUMN($A$1:$IV$2) or ROW($A$2:$IV$3) 
-	    assumeFalse("COLUMN(1:2)".equals(cellFormula));
-	    assumeFalse("ROW(2:3)".equals(cellFormula));
-
-        // currently throws NPE because unknown function "currentcell" causes name lookup 
-        // Name lookup requires some equivalent object of the Workbook within xSSFWorkbook.
-	    assumeFalse("ISREF(currentcell())".equals(cellFormula));
-	}
-
-	/**
-	 * @return <code>null</code> if cell is missing, empty or blank
-	 */
-	private static String getTargetFunctionName(Row r) {
-		if(r == null) {
-            logger.log(POILogger.WARN, "Warning - given null row, can't figure out function name");
-			return null;
-		}
-		Cell cell = r.getCell(SS.COLUMN_INDEX_FUNCTION_NAME);
-		if(cell == null) {
-            logger.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.BLANK) {
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.STRING) {
-			return cell.getRichStringCellValue().getString();
-		}
-		
-		fail("Bad cell type for 'function name' column: ("+cell.getColumnIndex()+") row ("+(r.getRowNum()+1)+")");
-		return null;
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
deleted file mode 100644
index 2427dd1..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.formula.TestMissingWorkbook;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-
-/**
- * XSSF Specific version of the Missing Workbooks test
- */
-public final class TestMissingWorkbookOnXSSF extends TestMissingWorkbook {
-    public TestMissingWorkbookOnXSSF() {
-        super("52575_main.xlsx", "source_dummy.xlsx", "52575_source.xls");
-    }
-    
-    @Override
-    protected void setUp() throws Exception {
-        mainWorkbook = XSSFTestDataSamples.openSampleWorkbook(MAIN_WORKBOOK_FILENAME);
-        sourceWorkbook = HSSFTestDataSamples.openSampleWorkbook(SOURCE_WORKBOOK_FILENAME);
-        
-        assertNotNull(mainWorkbook);
-        assertNotNull(sourceWorkbook);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
deleted file mode 100644
index b8926a3..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.ss.formula.eval.TestFormulasFromSpreadsheet;
-import org.apache.poi.ss.formula.functions.TestMathX;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests formulas for multi sheet reference (i.e. SUM(Sheet1:Sheet5!A1))
- */
-@RunWith(Parameterized.class)
-public final class TestMultiSheetFormulaEvaluatorOnXSSF {
-    private static final POILogger logger = POILogFactory.getLogger(TestFormulasFromSpreadsheet.class);
-
-    private static XSSFWorkbook workbook;
-    private static Sheet sheet;
-    private static FormulaEvaluator evaluator;
-
-	/**
-	 * This class defines constants for navigating around the test data spreadsheet used for these tests.
-	 */
-	interface SS {
-
-		/**
-		 * Name of the test spreadsheet (found in the standard test data folder)
-		 */
-		String FILENAME = "FormulaSheetRange.xlsx";
-		/**
-		 * Row (zero-based) in the test spreadsheet where the function examples start.
-		 */
-		int START_FUNCTIONS_ROW_INDEX = 10; // Row '11'
-		/**
-		 * Index of the column that contains the function names
-		 */
-		int COLUMN_INDEX_FUNCTION_NAME = 0; // Column 'A'
-		/**
-		 * Index of the column that contains the test names
-		 */
-		int COLUMN_INDEX_TEST_NAME = 1; // Column 'B'
-		/**
-		 * Used to indicate when there are no more functions left
-		 */
-		String FUNCTION_NAMES_END_SENTINEL = "<END>";
-
-		/**
-		 * Index of the column where the test expected value is present
-		 */
-		short COLUMN_INDEX_EXPECTED_VALUE = 2; // Column 'C'
-		/**
-		 * Index of the column where the test actual value is present
-		 */
-		short COLUMN_INDEX_ACTUAL_VALUE = 3; // Column 'D'
-		/**
-		 * Test sheet name (sheet with all test formulae)
-		 */
-		String TEST_SHEET_NAME = "test";
-	}
-
-    @Parameter(value = 0)
-	public String targetTestName;
-	@Parameter(value = 1)
-    public String targetFunctionName;
-    @Parameter(value = 2)
-    public int formulasRowIdx;
-
-    @AfterClass
-    public static void closeResource() throws Exception {
-        workbook.close();
-    }
-
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        workbook = new XSSFWorkbook( OPCPackage.open(HSSFTestDataSamples.getSampleFile(SS.FILENAME), PackageAccess.READ) );
-        sheet = workbook.getSheet( SS.TEST_SHEET_NAME );
-        evaluator = new XSSFFormulaEvaluator(workbook);
-
-        List<Object[]> data = new ArrayList<Object[]>();
-
-        processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, null);
-
-        return data;
-    }
-
-    /**
-     * @param startRowIndex row index in the spreadsheet where the first function/operator is found
-     * @param testFocusFunctionName name of a single function/operator to test alone.
-     * Typically pass <code>null</code> to test all functions
-     */
-    private static void processFunctionGroup(List<Object[]> data, int startRowIndex, String testFocusFunctionName) {
-        for (int rowIndex = startRowIndex; true; rowIndex++) {
-            Row r = sheet.getRow(rowIndex);
-
-            // only evaluate non empty row
-            if(r == null) continue;
-
-            String targetFunctionName = getTargetFunctionName(r);
-            assertNotNull("Test spreadsheet cell empty on row ("
-                + (rowIndex+1) + "). Expected function name or '"
-                + SS.FUNCTION_NAMES_END_SENTINEL + "'", targetFunctionName);
-
-            if(targetFunctionName.equals(SS.FUNCTION_NAMES_END_SENTINEL)) {
-                // found end of functions list
-                break;
-            }
-
-            String targetTestName = getTargetTestName(r);
-            if(testFocusFunctionName == null || targetFunctionName.equalsIgnoreCase(testFocusFunctionName)) {
-
-                // expected results are on the row below
-                Cell expectedValueCell = r.getCell(SS.COLUMN_INDEX_EXPECTED_VALUE);
-                assertNotNull("Missing expected values cell for function '"
-                    + targetFunctionName + ", test" + targetTestName + " (row " +
-                    rowIndex + 1 + ")", expectedValueCell);
-
-                data.add(new Object[]{targetTestName, targetFunctionName, rowIndex});
-            }
-        }
-    }
-
-    /**
-    *
-    * @return a constant from the local Result class denoting whether there were any evaluation
-    * cases, and whether they all succeeded.
-    */
-    @Test
-    public void processFunctionRow() {
-        Row r = sheet.getRow(formulasRowIdx);
-
-        Cell expValue = r.getCell(SS.COLUMN_INDEX_EXPECTED_VALUE);
-        assertNotNull("Missing expected values cell for function '"
-            + targetFunctionName + ", test" + targetTestName + " (row " +
-            formulasRowIdx + 1 + ")", expValue);
-
-        Cell c = r.getCell(SS.COLUMN_INDEX_ACTUAL_VALUE);
-        assumeNotNull(c);
-        assumeTrue(c.getCellTypeEnum() == CellType.FORMULA);
-
-        CellValue actValue = evaluator.evaluate(c);
-
-        String msg = String.format(Locale.ROOT, "Function '%s': Test: '%s': Formula: %s @ %d:%d",
-            targetFunctionName, targetTestName, c.getCellFormula(), formulasRowIdx, SS.COLUMN_INDEX_ACTUAL_VALUE);
-
-        assertNotNull(msg + " - actual value was null", actValue);
-
-        final CellType expectedCellType = expValue.getCellTypeEnum();
-        switch (expectedCellType) {
-            case BLANK:
-                assertEquals(msg, CellType.BLANK, actValue.getCellTypeEnum());
-                break;
-            case BOOLEAN:
-                assertEquals(msg, CellType.BOOLEAN, actValue.getCellTypeEnum());
-                assertEquals(msg, expValue.getBooleanCellValue(), actValue.getBooleanValue());
-                break;
-            case ERROR:
-                assertEquals(msg, CellType.ERROR, actValue.getCellTypeEnum());
-//              if(false) { // TODO: fix ~45 functions which are currently returning incorrect error values
-//                  assertEquals(msg, expected.getErrorCellValue(), actual.getErrorValue());
-//              }
-                break;
-            case FORMULA: // will never be used, since we will call method after formula evaluation
-                fail("Cannot expect formula as result of formula evaluation: " + msg);
-            case NUMERIC:
-                assertEquals(msg, CellType.NUMERIC, actValue.getCellTypeEnum());
-                TestMathX.assertEquals(msg, expValue.getNumericCellValue(), actValue.getNumberValue(), TestMathX.POS_ZERO, TestMathX.DIFF_TOLERANCE_FACTOR);
-//              double delta = Math.abs(expected.getNumericCellValue()-actual.getNumberValue());
-//              double pctExpected = Math.abs(0.00001*expected.getNumericCellValue());
-//              assertTrue(msg, delta <= pctExpected);
-                break;
-            case STRING:
-                assertEquals(msg, CellType.STRING, actValue.getCellTypeEnum());
-                assertEquals(msg, expValue.getRichStringCellValue().getString(), actValue.getStringValue());
-                break;
-            default:
-                fail("Unexpected cell type: " + expectedCellType);
-        }
-    }
-
-    /**
-	 * @return <code>null</code> if cell is missing, empty or blank
-	 */
-	private static String getTargetFunctionName(Row r) {
-		if(r == null) {
-		    logger.log(POILogger.WARN, "Warning - given null row, can't figure out function name");
-			return null;
-		}
-		Cell cell = r.getCell(SS.COLUMN_INDEX_FUNCTION_NAME);
-		if(cell == null) {
-            logger.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.BLANK) {
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.STRING) {
-			return cell.getRichStringCellValue().getString();
-		}
-
-		fail("Bad cell type for 'function name' column: ("
-			+ cell.getCellTypeEnum() + ") row (" + (r.getRowNum() +1) + ")");
-		return "";
-	}
-	/**
-	 * @return <code>null</code> if cell is missing, empty or blank
-	 */
-	private static String getTargetTestName(Row r) {
-		if(r == null) {
-            logger.log(POILogger.WARN, "Warning - given null row, can't figure out test name");
-			return null;
-		}
-		Cell cell = r.getCell(SS.COLUMN_INDEX_TEST_NAME);
-		if(cell == null) {
-		    logger.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_TEST_NAME + ", can't figure out test name");
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.BLANK) {
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.STRING) {
-			return cell.getRichStringCellValue().getString();
-		}
-
-		fail("Bad cell type for 'test name' column: ("
-			+ cell.getCellTypeEnum() + ") row (" + (r.getRowNum() +1) + ")");
-		return "";
-	}
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
deleted file mode 100644
index af58706..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BaseTestBugzillaIssues;
-import org.apache.poi.ss.usermodel.PrintSetup;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public final class TestSXSSFBugs extends BaseTestBugzillaIssues {
-    public TestSXSSFBugs() {
-        super(SXSSFITestDataProvider.instance);
-    }
-
-    // override some tests which do not work for SXSSF
-    @Override @Ignore("cloneSheet() not implemented") @Test public void bug18800() { /* cloneSheet() not implemented */ }
-    @Override @Ignore("cloneSheet() not implemented") @Test public void bug22720() { /* cloneSheet() not implemented */ }
-    @Override @Ignore("Evaluation is not fully supported") @Test public void bug47815() { /* Evaluation is not supported */ }
-    @Override @Ignore("Evaluation is not fully supported") @Test public void test58113() { /* Evaluation is not supported */ }
-    @Override @Ignore("Evaluation is not fully supported") @Test public void bug46729_testMaxFunctionArguments() { /* Evaluation is not supported */ }
-    @Override @Ignore("Reading data is not supported") @Test public void bug57798() { /* Reading data is not supported */ }
-
-    /**
-     * Setting repeating rows and columns shouldn't break
-     *  any print settings that were there before
-     */
-    @Test
-    public void bug49253() throws Exception {
-        Workbook wb1 = new SXSSFWorkbook();
-        Workbook wb2 = new SXSSFWorkbook();
-        CellRangeAddress cra = CellRangeAddress.valueOf("C2:D3");
-
-        // No print settings before repeating
-        Sheet s1 = wb1.createSheet(); 
-        s1.setRepeatingColumns(cra);
-        s1.setRepeatingRows(cra);
-
-        PrintSetup ps1 = s1.getPrintSetup();
-        assertEquals(false, ps1.getValidSettings());
-        assertEquals(false, ps1.getLandscape());
-
-
-        // Had valid print settings before repeating
-        Sheet s2 = wb2.createSheet();
-        PrintSetup ps2 = s2.getPrintSetup();
-
-        ps2.setLandscape(false);
-        assertEquals(true, ps2.getValidSettings());
-        assertEquals(false, ps2.getLandscape());
-        s2.setRepeatingColumns(cra);
-        s2.setRepeatingRows(cra);
-
-        ps2 = s2.getPrintSetup();
-        assertEquals(true, ps2.getValidSettings());
-        assertEquals(false, ps2.getLandscape());
-
-        wb1.close();
-        wb2.close();
-    }
-    
-    // bug 60197: setSheetOrder should update sheet-scoped named ranges to maintain references to the sheets before the re-order
-    @Test
-    @Override
-    public void bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged() throws Exception {
-        try {
-            super.bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged();
-        } catch (final RuntimeException e) {
-            final Throwable cause = e.getCause();
-            if (cause instanceof IOException && cause.getMessage().equals("Stream closed")) {
-                // expected on the second time that _testDataProvider.writeOutAndReadBack(SXSSFWorkbook) is called
-                // if the test makes it this far, then we know that XSSFName sheet indices are updated when sheet
-                // order is changed, which is the purpose of this test. Therefore, consider this a passing test.
-            } else {
-                throw e;
-            }
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
deleted file mode 100644
index f6b4e63..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.ss.usermodel.BaseTestSheetHiding;
-
-public final class TestSheetHiding extends BaseTestSheetHiding {
-    public TestSheetHiding() {
-        super(XSSFITestDataProvider.instance,
-                "TwoSheetsOneHidden.xlsx", "TwoSheetsNoneHidden.xlsx");
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
deleted file mode 100644
index 874db82..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellUtil;
-import org.apache.poi.ss.util.RegionUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRow;
-
-/**
- * @author centic
- *
- * This testcase contains tests for bugs that are yet to be fixed. Therefore,
- * the standard ant test target does not run these tests. Run this testcase with
- * the single-test target. The names of the tests usually correspond to the
- * Bugzilla id's PLEASE MOVE tests from this class to TestBugs once the bugs are
- * fixed, so that they are then run automatically.
- */
-public final class TestUnfixedBugs {
-    @Test
-    public void testBug54084Unicode() throws IOException {
-        // sample XLSX with the same text-contents as the text-file above
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("54084 - Greek - beyond BMP.xlsx");
-
-        verifyBug54084Unicode(wb);
-
-//        OutputStream baos = new FileOutputStream("/tmp/test.xlsx");
-//        try {
-//            wb.write(baos);
-//        } finally {
-//            baos.close();
-//        }
-
-        // now write the file and read it back in
-        XSSFWorkbook wbWritten = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        verifyBug54084Unicode(wbWritten);
-
-        // finally also write it out via the streaming interface and verify that we still can read it back in
-        SXSSFWorkbook swb = new SXSSFWorkbook(wb);
-        Workbook wbStreamingWritten = SXSSFITestDataProvider.instance.writeOutAndReadBack(swb);
-        verifyBug54084Unicode(wbStreamingWritten);
-
-        wbWritten.close();
-        swb.close();
-        wbStreamingWritten.close();
-        wb.close();
-    }
-
-    private void verifyBug54084Unicode(Workbook wb) {
-        // expected data is stored in UTF-8 in a text-file
-        byte data[] = HSSFTestDataSamples.getTestDataFileContent("54084 - Greek - beyond BMP.txt");
-        String testData = new String(data, Charset.forName("UTF-8")).trim();
-
-        Sheet sheet = wb.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell(0);
-
-        String value = cell.getStringCellValue();
-        //System.out.println(value);
-
-        assertEquals("The data in the text-file should exactly match the data that we read from the workbook", testData, value);
-    }
-
-    @Test
-    public void test54071() throws Exception {
-        Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("54071.xlsx");
-        Sheet sheet = workbook.getSheetAt(0);
-        int rows = sheet.getPhysicalNumberOfRows();
-        System.out.println(">> file rows is:"+(rows-1)+" <<");
-        Row title = sheet.getRow(0);
-
-        Date prev = null;
-        for (int row = 1; row < rows; row++) {
-            Row rowObj = sheet.getRow(row);
-            for (int col = 0; col < 1; col++) {
-                String titleName = title.getCell(col).toString();
-                Cell cell = rowObj.getCell(col);
-                if (titleName.startsWith("time")) {
-                    // here the output will produce ...59 or ...58 for the rows, probably POI is
-                    // doing some different rounding or some other small difference...
-                    System.out.println("==Time:"+cell.getDateCellValue());
-                    if(prev != null) {
-                        assertEquals(prev, cell.getDateCellValue());
-                    }
-                    
-                    prev = cell.getDateCellValue();
-                }
-            }
-        }
-        
-        workbook.close();
-    }
-    
-    @Test
-    public void test54071Simple() {
-        double value1 = 41224.999988425923;
-        double value2 = 41224.999988368058;
-        
-        int wholeDays1 = (int)Math.floor(value1);
-        int millisecondsInDay1 = (int)((value1 - wholeDays1) * DateUtil.DAY_MILLISECONDS + 0.5);
-
-        int wholeDays2 = (int)Math.floor(value2);
-        int millisecondsInDay2 = (int)((value2 - wholeDays2) * DateUtil.DAY_MILLISECONDS + 0.5);
-        
-        assertEquals(wholeDays1, wholeDays2);
-        // here we see that the time-value is 5 milliseconds apart, one is 86399000 and the other is 86398995, 
-        // thus one is one second higher than the other
-        assertEquals("The time-values are 5 milliseconds apart", 
-                millisecondsInDay1, millisecondsInDay2);
-
-        // when we do the calendar-stuff, there is a boolean which determines if
-        // the milliseconds are rounded or not, having this at "false" causes the 
-        // second to be different here!
-        int startYear = 1900;
-        int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which it isn't
-        Calendar calendar1 = LocaleUtil.getLocaleCalendar(startYear,0, wholeDays1 + dayAdjust);
-        calendar1.set(Calendar.MILLISECOND, millisecondsInDay1);
-      // this is the rounding part:
-      calendar1.add(Calendar.MILLISECOND, 500);
-      calendar1.clear(Calendar.MILLISECOND);
-
-        Calendar calendar2 = LocaleUtil.getLocaleCalendar(startYear,0, wholeDays2 + dayAdjust);
-        calendar2.set(Calendar.MILLISECOND, millisecondsInDay2);
-      // this is the rounding part:
-      calendar2.add(Calendar.MILLISECOND, 500);
-      calendar2.clear(Calendar.MILLISECOND);
-
-        // now the calendars are equal
-        assertEquals(calendar1, calendar2);
-        
-        assertEquals(DateUtil.getJavaDate(value1, false), DateUtil.getJavaDate(value2, false));
-    }
-
-    // When this is fixed, the test case should go to BaseTestXCell with 
-    // adjustments to use _testDataProvider to also verify this for XSSF
-    @Test
-    public void testBug57294() throws IOException {
-        Workbook wb = SXSSFITestDataProvider.instance.createWorkbook();
-        
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        RichTextString str = new XSSFRichTextString("Test rich text string");
-        str.applyFont(2, 4, (short)0);
-        assertEquals(3, str.numFormattingRuns());
-        cell.setCellValue(str);
-        
-        Workbook wbBack = SXSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        wb.close();
-        
-        // re-read after serializing and reading back
-        Cell cellBack = wbBack.getSheetAt(0).getRow(0).getCell(0);
-        assertNotNull(cellBack);
-        RichTextString strBack = cellBack.getRichStringCellValue();
-        assertNotNull(strBack);
-        assertEquals(3, strBack.numFormattingRuns());
-        assertEquals(0, strBack.getIndexOfFormattingRun(0));
-        assertEquals(2, strBack.getIndexOfFormattingRun(1));
-        assertEquals(4, strBack.getIndexOfFormattingRun(2));
-        
-        wbBack.close();
-    }
-
-   @Test
-   public void testBug55752() throws IOException {
-       Workbook wb = new XSSFWorkbook();
-       try {
-           Sheet sheet = wb.createSheet("test");
-    
-           for (int i = 0; i < 4; i++) {
-               Row row = sheet.createRow(i);
-               for (int j = 0; j < 2; j++) {
-                   Cell cell = row.createCell(j);
-                   cell.setCellStyle(wb.createCellStyle());
-               }
-           }
-    
-           // set content
-           Row row1 = sheet.getRow(0);
-           row1.getCell(0).setCellValue("AAA");
-           Row row2 = sheet.getRow(1);
-           row2.getCell(0).setCellValue("BBB");
-           Row row3 = sheet.getRow(2);
-           row3.getCell(0).setCellValue("CCC");
-           Row row4 = sheet.getRow(3);
-           row4.getCell(0).setCellValue("DDD");
-    
-           // merge cells
-           CellRangeAddress range1 = new CellRangeAddress(0, 0, 0, 1);
-           sheet.addMergedRegion(range1);
-           CellRangeAddress range2 = new CellRangeAddress(1, 1, 0, 1);
-           sheet.addMergedRegion(range2);
-           CellRangeAddress range3 = new CellRangeAddress(2, 2, 0, 1);
-           sheet.addMergedRegion(range3);
-           assertEquals(0, range3.getFirstColumn());
-           assertEquals(1, range3.getLastColumn());
-           assertEquals(2, range3.getLastRow());
-           CellRangeAddress range4 = new CellRangeAddress(3, 3, 0, 1);
-           sheet.addMergedRegion(range4);
-           
-           // set border
-           RegionUtil.setBorderBottom(CellStyle.BORDER_THIN, range1, sheet, wb);
-           
-           row2.getCell(0).getCellStyle().setBorderBottom(CellStyle.BORDER_THIN);
-           row2.getCell(1).getCellStyle().setBorderBottom(CellStyle.BORDER_THIN);
-
-           Cell cell0 = CellUtil.getCell(row3, 0);
-           CellUtil.setCellStyleProperty(cell0, CellUtil.BORDER_BOTTOM, CellStyle.BORDER_THIN);
-           Cell cell1 = CellUtil.getCell(row3, 1);
-           CellUtil.setCellStyleProperty(cell1, CellUtil.BORDER_BOTTOM, CellStyle.BORDER_THIN);
-
-           RegionUtil.setBorderBottom(CellStyle.BORDER_THIN, range4, sheet, wb);
-    
-           // write to file
-           OutputStream stream = new FileOutputStream(new File("C:/temp/55752.xlsx"));
-           try {
-               wb.write(stream);
-           } finally {
-               stream.close();
-           }
-       } finally {
-           wb.close();
-       }
-   }
-
-   @Test
-   public void test57423() throws IOException {        
-       Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57423.xlsx");
-       
-       Sheet testSheet = wb.getSheetAt(0);
-
-       // row shift (negative or positive) causes corrupted output xlsx file when the shift value is bigger 
-       // than the number of rows being shifted 
-       // Excel 2010 on opening the output file says:
-       // "Excel found unreadable content" and offers recovering the file by removing the unreadable content
-       // This can be observed in cases like the following:
-       // negative shift of 1 row by less than -1
-       // negative shift of 2 rows by less than -2
-       // positive shift of 1 row by 2 or more 
-       // positive shift of 2 rows by 3 or more
-       
-       //testSheet.shiftRows(4, 5, -3);
-       testSheet.shiftRows(10, 10, 2);
-       
-       checkRows57423(testSheet);
-       
-       Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-
-       /*FileOutputStream stream = new FileOutputStream("C:\\temp\\57423.xlsx");
-       try {
-           wb.write(stream);
-       } finally {
-           stream.close();
-       }*/
-
-       wb.close();
-       
-       checkRows57423(wbBack.getSheetAt(0));
-       
-       wbBack.close();
-   }
-
-   private void checkRows57423(Sheet testSheet) throws IOException {
-       checkRow57423(testSheet, 0, "0");
-       checkRow57423(testSheet, 1, "1");
-       checkRow57423(testSheet, 2, "2");
-       checkRow57423(testSheet, 3, "3");
-       checkRow57423(testSheet, 4, "4");
-       checkRow57423(testSheet, 5, "5");
-       checkRow57423(testSheet, 6, "6");
-       checkRow57423(testSheet, 7, "7");
-       checkRow57423(testSheet, 8, "8");
-       checkRow57423(testSheet, 9, "9");
-       
-       assertNull("Row number 10 should be gone after the shift", 
-               testSheet.getRow(10));
-       
-       checkRow57423(testSheet, 11, "11");
-       checkRow57423(testSheet, 12, "10");
-       checkRow57423(testSheet, 13, "13");
-       checkRow57423(testSheet, 14, "14");
-       checkRow57423(testSheet, 15, "15");
-       checkRow57423(testSheet, 16, "16");
-       checkRow57423(testSheet, 17, "17");
-       checkRow57423(testSheet, 18, "18");
-       
-       ByteArrayOutputStream stream = new ByteArrayOutputStream();
-       try {
-           ((XSSFSheet)testSheet).write(stream);
-       } finally {
-           stream.close();
-       }
-       
-       // verify that the resulting XML has the rows in correct order as required by Excel
-       String xml = new String(stream.toByteArray(), "UTF-8");
-       int posR12 = xml.indexOf("<row r=\"12\"");
-       int posR13 = xml.indexOf("<row r=\"13\"");
-       
-       // both need to be found
-       assertTrue(posR12 != -1);
-       assertTrue(posR13 != -1);
-       
-       assertTrue("Need to find row 12 before row 13 after the shifting, but had row 12 at " + posR12 + " and row 13 at " + posR13, 
-               posR12 < posR13);
-   }
-
-   private void checkRow57423(Sheet testSheet, int rowNum, String contents) {
-       Row row = testSheet.getRow(rowNum);
-       assertNotNull("Expecting row at rownum " + rowNum, row);
-       
-       CTRow ctRow = ((XSSFRow)row).getCTRow();
-       assertEquals(rowNum+1, ctRow.getR());
-       
-       Cell cell = row.getCell(0);
-       assertNotNull("Expecting cell at rownum " + rowNum, cell);
-       assertEquals("Did not have expected contents at rownum " + rowNum, 
-               contents + ".0", cell.toString());
-   }
-
-   @Test
-   public void test58325_one() {
-       check58325(XSSFTestDataSamples.openSampleWorkbook("58325_lt.xlsx"), 1);
-   }
-
-   @Test
-   public void test58325_three() {
-       check58325(XSSFTestDataSamples.openSampleWorkbook("58325_db.xlsx"), 3);
-   }
-
-   private void check58325(XSSFWorkbook wb, int expectedShapes) {
-       XSSFSheet sheet = wb.getSheet("MetasNM001");
-       assertNotNull(sheet);
-
-       StringBuilder str = new StringBuilder();
-       str.append("sheet " + sheet.getSheetName() + " - ");
-
-       XSSFDrawing drawing = sheet.getDrawingPatriarch();
-       //drawing = ((XSSFSheet)sheet).createDrawingPatriarch();
-
-       List<XSSFShape> shapes = drawing.getShapes();
-       str.append("drawing.getShapes().size() = " + shapes.size());
-       Iterator<XSSFShape> it = shapes.iterator();
-       while(it.hasNext()) {           
-           XSSFShape shape = it.next();
-           str.append(", " + shape.toString());
-           str.append(", Col1:"+((XSSFClientAnchor)shape.getAnchor()).getCol1());
-           str.append(", Col2:"+((XSSFClientAnchor)shape.getAnchor()).getCol2());
-           str.append(", Row1:"+((XSSFClientAnchor)shape.getAnchor()).getRow1());
-           str.append(", Row2:"+((XSSFClientAnchor)shape.getAnchor()).getRow2());
-       }
-       
-       assertEquals("Having shapes: " + str, 
-               expectedShapes, shapes.size());
-   }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
deleted file mode 100644
index 6cf7003..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ /dev/null
@@ -1,3190 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.*;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.TreeMap;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLDocumentPart.RelationPart;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.POIXMLProperties;
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.Function;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.CellUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.XLSBUnsupportedException;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.CalculationChain;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellFill;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedNames;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTFontImpl;
-
-@SuppressWarnings("deprecation")
-public final class TestXSSFBugs extends BaseTestBugzillaIssues {
-    public TestXSSFBugs() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    /**
-     * test writing a file with large number of unique strings,
-     * open resulting file in Excel to check results!
-     */
-    @Test
-    public void bug15375_2() throws IOException {
-        bug15375(1000);
-    }
-
-    /**
-     * Named ranges had the right reference, but
-     *  the wrong sheet name
-     */
-    @Test
-    public void bug45430() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("45430.xlsx");
-        assertFalse(wb.isMacroEnabled());
-        assertEquals(3, wb.getNumberOfNames());
-
-        assertEquals(0, wb.getName("SheetAA1").getCTName().getLocalSheetId());
-        assertFalse(wb.getName("SheetAA1").getCTName().isSetLocalSheetId());
-        assertEquals("SheetA!$A$1", wb.getName("SheetAA1").getRefersToFormula());
-        assertEquals("SheetA", wb.getName("SheetAA1").getSheetName());
-
-        assertEquals(0, wb.getName("SheetBA1").getCTName().getLocalSheetId());
-        assertFalse(wb.getName("SheetBA1").getCTName().isSetLocalSheetId());
-        assertEquals("SheetB!$A$1", wb.getName("SheetBA1").getRefersToFormula());
-        assertEquals("SheetB", wb.getName("SheetBA1").getSheetName());
-
-        assertEquals(0, wb.getName("SheetCA1").getCTName().getLocalSheetId());
-        assertFalse(wb.getName("SheetCA1").getCTName().isSetLocalSheetId());
-        assertEquals("SheetC!$A$1", wb.getName("SheetCA1").getRefersToFormula());
-        assertEquals("SheetC", wb.getName("SheetCA1").getSheetName());
-
-        // Save and re-load, still there
-        XSSFWorkbook nwb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertEquals(3, nwb.getNumberOfNames());
-        assertEquals("SheetA!$A$1", nwb.getName("SheetAA1").getRefersToFormula());
-
-        nwb.close();
-        wb.close();
-    }
-
-    /**
-     * We should carry vba macros over after save
-     */
-    @Test
-    public void bug45431() throws IOException, InvalidFormatException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("45431.xlsm");
-        OPCPackage pkg1 = wb1.getPackage();
-        assertTrue(wb1.isMacroEnabled());
-
-        // Check the various macro related bits can be found
-        PackagePart vba = pkg1.getPart(
-                PackagingURIHelper.createPartName("/xl/vbaProject.bin")
-        );
-        assertNotNull(vba);
-        // And the drawing bit
-        PackagePart drw = pkg1.getPart(
-                PackagingURIHelper.createPartName("/xl/drawings/vmlDrawing1.vml")
-        );
-        assertNotNull(drw);
-
-
-        // Save and re-open, both still there
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        pkg1.close();
-        wb1.close();
-
-        OPCPackage pkg2 = wb2.getPackage();
-        assertTrue(wb2.isMacroEnabled());
-
-        vba = pkg2.getPart(
-                PackagingURIHelper.createPartName("/xl/vbaProject.bin")
-        );
-        assertNotNull(vba);
-        drw = pkg2.getPart(
-                PackagingURIHelper.createPartName("/xl/drawings/vmlDrawing1.vml")
-        );
-        assertNotNull(drw);
-
-        // And again, just to be sure
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        pkg2.close();
-        wb2.close();
-        OPCPackage pkg3 = wb3.getPackage();
-        assertTrue(wb3.isMacroEnabled());
-
-        vba = pkg3.getPart(
-                PackagingURIHelper.createPartName("/xl/vbaProject.bin")
-        );
-        assertNotNull(vba);
-        drw = pkg3.getPart(
-                PackagingURIHelper.createPartName("/xl/drawings/vmlDrawing1.vml")
-        );
-        assertNotNull(drw);
-
-        pkg3.close();
-        wb3.close();
-    }
-
-    @Test
-    public void bug47504() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("47504.xlsx");
-        assertEquals(1, wb1.getNumberOfSheets());
-        XSSFSheet sh = wb1.getSheetAt(0);
-        XSSFDrawing drawing = sh.createDrawingPatriarch();
-        List<RelationPart> rels = drawing.getRelationParts();
-        assertEquals(1, rels.size());
-        assertEquals("Sheet1!A1", rels.get(0).getRelationship().getTargetURI().getFragment());
-
-        // And again, just to be sure
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        assertEquals(1, wb2.getNumberOfSheets());
-        sh = wb2.getSheetAt(0);
-        drawing = sh.createDrawingPatriarch();
-        rels = drawing.getRelationParts();
-        assertEquals(1, rels.size());
-        assertEquals("Sheet1!A1", rels.get(0).getRelationship().getTargetURI().getFragment());
-        wb2.close();
-    }
-
-    /**
-     * Excel will sometimes write a button with a textbox
-     *  containing &gt;br&lt; (not closed!).
-     * Clearly Excel shouldn't do this, but test that we can
-     *  read the file despite the naughtyness
-     */
-    @Test
-    public void bug49020() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("BrNotClosed.xlsx");
-        wb.close();
-    }
-
-    /**
-     * ensure that CTPhoneticPr is loaded by the ooxml test suite so that it is included in poi-ooxml-schemas
-     */
-    @Test
-    public void bug49325() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("49325.xlsx");
-        CTWorksheet sh = wb.getSheetAt(0).getCTWorksheet();
-        assertNotNull(sh.getPhoneticPr());
-        wb.close();
-    }
-
-    /**
-     * Names which are defined with a Sheet
-     *  should return that sheet index properly
-     */
-    @Test
-    public void bug48923() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("48923.xlsx");
-        assertEquals(4, wb.getNumberOfNames());
-
-        Name b1 = wb.getName("NameB1");
-        Name b2 = wb.getName("NameB2");
-        Name sheet2 = wb.getName("NameSheet2");
-        Name test = wb.getName("Test");
-
-        assertNotNull(b1);
-        assertEquals("NameB1", b1.getNameName());
-        assertEquals("Sheet1", b1.getSheetName());
-        assertEquals(-1, b1.getSheetIndex());
-
-        assertNotNull(b2);
-        assertEquals("NameB2", b2.getNameName());
-        assertEquals("Sheet1", b2.getSheetName());
-        assertEquals(-1, b2.getSheetIndex());
-
-        assertNotNull(sheet2);
-        assertEquals("NameSheet2", sheet2.getNameName());
-        assertEquals("Sheet2", sheet2.getSheetName());
-        assertEquals(-1, sheet2.getSheetIndex());
-
-        assertNotNull(test);
-        assertEquals("Test", test.getNameName());
-        assertEquals("Sheet1", test.getSheetName());
-        assertEquals(-1, test.getSheetIndex());
-
-        wb.close();
-    }
-
-    /**
-     * Problem with evaluation formulas due to
-     *  NameXPtgs.
-     * Blows up on:
-     *   IF(B6= (ROUNDUP(B6,0) + ROUNDDOWN(B6,0))/2, MROUND(B6,2),ROUND(B6,0))
-     *
-     * TODO: delete this test case when MROUND and VAR are implemented
-     */
-    @Test
-    public void bug48539() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("48539.xlsx");
-        try {
-            assertEquals(3, wb.getNumberOfSheets());
-            assertEquals(0, wb.getNumberOfNames());
-
-            // Try each cell individually
-            XSSFFormulaEvaluator eval = new XSSFFormulaEvaluator(wb);
-            for(int i=0; i<wb.getNumberOfSheets(); i++) {
-                Sheet s = wb.getSheetAt(i);
-                for(Row r : s) {
-                    for(Cell c : r) {
-                        if(c.getCellTypeEnum() == CellType.FORMULA) {
-                            CellValue cv = eval.evaluate(c);
-
-                            if(cv.getCellTypeEnum() == CellType.NUMERIC) {
-                                // assert that the calculated value agrees with
-                                // the cached formula result calculated by Excel
-                                String formula = c.getCellFormula();
-                                double cachedFormulaResult = c.getNumericCellValue();
-                                double evaluatedFormulaResult = cv.getNumberValue();
-                                assertEquals(formula, cachedFormulaResult, evaluatedFormulaResult, 1E-7);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Now all of them
-            XSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-        } finally {
-            wb.close();
-        }
-    }
-
-    /**
-     * Foreground colours should be found even if
-     *  a theme is used
-     */
-    @Test
-    public void bug48779() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("48779.xlsx");
-        XSSFCell cell = wb.getSheetAt(0).getRow(0).getCell(0);
-        XSSFCellStyle cs = cell.getCellStyle();
-
-        assertNotNull(cs);
-        assertEquals(1, cs.getIndex());
-
-        // Look at the low level xml elements
-        assertEquals(2, cs.getCoreXf().getFillId());
-        assertEquals(0, cs.getCoreXf().getXfId());
-        assertEquals(true, cs.getCoreXf().getApplyFill());
-
-        XSSFCellFill fg = wb.getStylesSource().getFillAt(2);
-        assertNotNull(fg.getFillForegroundColor());
-        assertEquals(0, fg.getFillForegroundColor().getIndexed());
-        assertEquals(0.0, fg.getFillForegroundColor().getTint(), 0);
-        assertEquals("FFFF0000", fg.getFillForegroundColor().getARGBHex());
-        assertNotNull(fg.getFillBackgroundColor());
-        assertEquals(64, fg.getFillBackgroundColor().getIndexed());
-
-        // Now look higher up
-        assertNotNull(cs.getFillForegroundXSSFColor());
-        assertEquals(0, cs.getFillForegroundColor());
-        assertEquals("FFFF0000", cs.getFillForegroundXSSFColor().getARGBHex());
-        assertEquals("FFFF0000", cs.getFillForegroundColorColor().getARGBHex());
-
-        assertNotNull(cs.getFillBackgroundColor());
-        assertEquals(64, cs.getFillBackgroundColor());
-        assertEquals(null, cs.getFillBackgroundXSSFColor().getARGBHex());
-        assertEquals(null, cs.getFillBackgroundColorColor().getARGBHex());
-
-        wb.close();
-    }
-
-    /**
-     * Ensure General and @ format are working properly
-     *  for integers
-     */
-    @Test
-    public void bug47490() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("GeneralFormatTests.xlsx");
-        Sheet s = wb.getSheetAt(1);
-        Row r;
-        DataFormatter df = new DataFormatter();
-
-        r = s.getRow(1);
-        assertEquals(1.0, r.getCell(2).getNumericCellValue(), 0);
-        assertEquals("General", r.getCell(2).getCellStyle().getDataFormatString());
-        assertEquals("1", df.formatCellValue(r.getCell(2)));
-        assertEquals("1", df.formatRawCellContents(1.0, -1, "@"));
-        assertEquals("1", df.formatRawCellContents(1.0, -1, "General"));
-
-        r = s.getRow(2);
-        assertEquals(12.0, r.getCell(2).getNumericCellValue(), 0);
-        assertEquals("General", r.getCell(2).getCellStyle().getDataFormatString());
-        assertEquals("12", df.formatCellValue(r.getCell(2)));
-        assertEquals("12", df.formatRawCellContents(12.0, -1, "@"));
-        assertEquals("12", df.formatRawCellContents(12.0, -1, "General"));
-
-        r = s.getRow(3);
-        assertEquals(123.0, r.getCell(2).getNumericCellValue(), 0);
-        assertEquals("General", r.getCell(2).getCellStyle().getDataFormatString());
-        assertEquals("123", df.formatCellValue(r.getCell(2)));
-        assertEquals("123", df.formatRawCellContents(123.0, -1, "@"));
-        assertEquals("123", df.formatRawCellContents(123.0, -1, "General"));
-        
-        wb.close();
-    }
-
-    /**
-     * A problem file from a non-standard source (a scientific instrument that saves its
-     * output as an .xlsx file) that have two issues:
-     * 1. The Content Type part name is lower-case:  [content_types].xml
-     * 2. The file appears to use backslashes as path separators
-     *
-     * The OPC spec tolerates both of these peculiarities, so does POI
-     */
-    @Test
-    public void bug49609() throws IOException {
-        XSSFWorkbook wb =  XSSFTestDataSamples.openSampleWorkbook("49609.xlsx");
-        assertEquals("FAM", wb.getSheetName(0));
-        assertEquals("Cycle", wb.getSheetAt(0).getRow(0).getCell(1).getStringCellValue());
-        wb.close();
-
-    }
-
-    @Test
-    public void bug49783() throws IOException {
-        Workbook wb =  XSSFTestDataSamples.openSampleWorkbook("49783.xlsx");
-        Sheet sheet = wb.getSheetAt(0);
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        Cell cell;
-
-        cell = sheet.getRow(0).getCell(0);
-        assertEquals("#REF!*#REF!", cell.getCellFormula());
-        assertEquals(CellType.ERROR, evaluator.evaluateInCell(cell).getCellTypeEnum());
-        assertEquals("#REF!", FormulaError.forInt(cell.getErrorCellValue()).getString());
-
-        Name nm1 = wb.getName("sale_1");
-        assertNotNull("name sale_1 should be present", nm1);
-        assertEquals("Sheet1!#REF!", nm1.getRefersToFormula());
-        Name nm2 = wb.getName("sale_2");
-        assertNotNull("name sale_2 should be present", nm2);
-        assertEquals("Sheet1!#REF!", nm2.getRefersToFormula());
-
-        cell = sheet.getRow(1).getCell(0);
-        assertEquals("sale_1*sale_2", cell.getCellFormula());
-        assertEquals(CellType.ERROR, evaluator.evaluateInCell(cell).getCellTypeEnum());
-        assertEquals("#REF!", FormulaError.forInt(cell.getErrorCellValue()).getString());
-        
-        wb.close();
-    }
-
-    /**
-     * Creating a rich string of "hello world" and applying
-     *  a font to characters 1-5 means we have two strings,
-     *  "hello" and " world". As such, we need to apply
-     *  preserve spaces to the 2nd bit, lest we end up
-     *  with something like "helloworld" !
-     */
-    @Test
-    public void bug49941() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet s = wb1.createSheet();
-        XSSFRow r = s.createRow(0);
-        XSSFCell c = r.createCell(0);
-
-        // First without fonts
-        c.setCellValue(
-                new XSSFRichTextString(" with spaces ")
-        );
-        assertEquals(" with spaces ", c.getRichStringCellValue().toString());
-        assertEquals(0, c.getRichStringCellValue().getCTRst().sizeOfRArray());
-        assertEquals(true, c.getRichStringCellValue().getCTRst().isSetT());
-        // Should have the preserve set
-        assertEquals(
-                1,
-                c.getRichStringCellValue().getCTRst().xgetT().getDomNode().getAttributes().getLength()
-        );
-        assertEquals(
-                "preserve",
-                c.getRichStringCellValue().getCTRst().xgetT().getDomNode().getAttributes().item(0).getNodeValue()
-        );
-
-        // Save and check
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        s = wb2.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-        assertEquals(" with spaces ", c.getRichStringCellValue().toString());
-        assertEquals(0, c.getRichStringCellValue().getCTRst().sizeOfRArray());
-        assertEquals(true, c.getRichStringCellValue().getCTRst().isSetT());
-
-        // Change the string
-        c.setCellValue(
-                new XSSFRichTextString("hello world")
-        );
-        assertEquals("hello world", c.getRichStringCellValue().toString());
-        // Won't have preserve
-        assertEquals(
-                0,
-                c.getRichStringCellValue().getCTRst().xgetT().getDomNode().getAttributes().getLength()
-        );
-
-        // Apply a font
-        XSSFFont f = wb2.createFont();
-        f.setBold(true);
-        c.getRichStringCellValue().applyFont(0, 5, f);
-        assertEquals("hello world", c.getRichStringCellValue().toString());
-        // Does need preserving on the 2nd part
-        assertEquals(2, c.getRichStringCellValue().getCTRst().sizeOfRArray());
-        assertEquals(
-                0,
-                c.getRichStringCellValue().getCTRst().getRArray(0).xgetT().getDomNode().getAttributes().getLength()
-        );
-        assertEquals(
-                1,
-                c.getRichStringCellValue().getCTRst().getRArray(1).xgetT().getDomNode().getAttributes().getLength()
-        );
-        assertEquals(
-                "preserve",
-                c.getRichStringCellValue().getCTRst().getRArray(1).xgetT().getDomNode().getAttributes().item(0).getNodeValue()
-        );
-
-        // Save and check
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        
-        s = wb3.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-        assertEquals("hello world", c.getRichStringCellValue().toString());
-        wb3.close();
-    }
-
-    /**
-     * Repeatedly writing the same file which has styles
-     */
-    @Test
-    public void bug49940() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("styles.xlsx");
-        assertEquals(3, wb.getNumberOfSheets());
-        assertEquals(10, wb.getStylesSource().getNumCellStyles());
-
-        ByteArrayOutputStream b1 = new ByteArrayOutputStream();
-        ByteArrayOutputStream b2 = new ByteArrayOutputStream();
-        ByteArrayOutputStream b3 = new ByteArrayOutputStream();
-        wb.write(b1);
-        wb.write(b2);
-        wb.write(b3);
-
-        for(byte[] data : new byte[][] {
-                b1.toByteArray(), b2.toByteArray(), b3.toByteArray()
-        }) {
-            ByteArrayInputStream bais = new ByteArrayInputStream(data);
-            XSSFWorkbook wb2 = new XSSFWorkbook(bais);
-            assertEquals(3, wb2.getNumberOfSheets());
-            assertEquals(10, wb2.getStylesSource().getNumCellStyles());
-            wb2.close();
-        }
-        
-        wb.close();
-    }
-
-    /**
-     * Various ways of removing a cell formula should all zap the calcChain
-     * entry.
-     */
-    @Test
-    public void bug49966() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples
-                .openSampleWorkbook("shared_formulas.xlsx");
-        XSSFSheet sheet = wb1.getSheetAt(0);
-
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-
-        // CalcChain has lots of entries
-        CalculationChain cc = wb1.getCalculationChain();
-        assertEquals("A2", cc.getCTCalcChain().getCArray(0).getR());
-        assertEquals("A3", cc.getCTCalcChain().getCArray(1).getR());
-        assertEquals("A4", cc.getCTCalcChain().getCArray(2).getR());
-        assertEquals("A5", cc.getCTCalcChain().getCArray(3).getR());
-        assertEquals("A6", cc.getCTCalcChain().getCArray(4).getR());
-        assertEquals("A7", cc.getCTCalcChain().getCArray(5).getR());
-        assertEquals("A8", cc.getCTCalcChain().getCArray(6).getR());
-        assertEquals(40, cc.getCTCalcChain().sizeOfCArray());
-
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-
-        // Try various ways of changing the formulas
-        // If it stays a formula, chain entry should remain
-        // Otherwise should go
-        sheet.getRow(1).getCell(0).setCellFormula("A1"); // stay
-        sheet.getRow(2).getCell(0).setCellFormula(null); // go
-        sheet.getRow(3).getCell(0).setCellType(CellType.FORMULA); // stay
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-
-        sheet.getRow(4).getCell(0).setCellType(CellType.STRING); // go
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-
-        validateCells(sheet);
-        sheet.getRow(5).removeCell(sheet.getRow(5).getCell(0)); // go
-        validateCells(sheet);
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-
-        sheet.getRow(6).getCell(0).setCellType(CellType.BLANK); // go
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-
-        sheet.getRow(7).getCell(0).setCellValue((String) null); // go
-
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-
-        // Save and check
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        assertEquals(35, cc.getCTCalcChain().sizeOfCArray());
-
-        cc = wb2.getCalculationChain();
-        assertEquals("A2", cc.getCTCalcChain().getCArray(0).getR());
-        assertEquals("A4", cc.getCTCalcChain().getCArray(1).getR());
-        assertEquals("A9", cc.getCTCalcChain().getCArray(2).getR());
-        wb2.close();
-    }
-
-    @Test
-    public void bug49966Row() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples
-                .openSampleWorkbook("shared_formulas.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-
-        validateCells(sheet);
-        sheet.getRow(5).removeCell(sheet.getRow(5).getCell(0)); // go
-        validateCells(sheet);
-        
-        wb.close();
-    }
-
-    private void validateCells(XSSFSheet sheet) {
-        for(Row row : sheet) {
-            // trigger handling
-            ((XSSFRow)row).onDocumentWrite();
-        }
-    }
-
-    @Test
-    public void bug49156() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("49156.xlsx");
-        FormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sheet = wb.getSheetAt(0);
-        for(Row row : sheet){
-            for(Cell cell : row){
-                if(cell.getCellTypeEnum() == CellType.FORMULA){
-                    formulaEvaluator.evaluateInCell(cell); // caused NPE on some cells
-                }
-            }
-        }
-        wb.close();
-    }
-
-    /**
-     * Newlines are valid characters in a formula
-     */
-    @Test
-    public void bug50440And51875() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("NewlineInFormulas.xlsx");
-        Sheet s = wb.getSheetAt(0);
-        Cell c = s.getRow(0).getCell(0);
-
-        assertEquals("SUM(\n1,2\n)", c.getCellFormula());
-        assertEquals(3.0, c.getNumericCellValue(), 0);
-
-        FormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-        formulaEvaluator.evaluateFormulaCellEnum(c);
-
-        assertEquals("SUM(\n1,2\n)", c.getCellFormula());
-        assertEquals(3.0, c.getNumericCellValue(), 0);
-
-        // For 51875
-        Cell b3 = s.getRow(2).getCell(1);
-        formulaEvaluator.evaluateFormulaCellEnum(b3);
-        assertEquals("B1+B2", b3.getCellFormula()); // The newline is lost for shared formulas
-        assertEquals(3.0, b3.getNumericCellValue(), 0);
-        
-        wb.close();
-    }
-
-    /**
-     * Moving a cell comment from one cell to another
-     */
-    @Test
-    public void bug50795() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("50795.xlsx");
-        XSSFSheet sheet = wb1.getSheetAt(0);
-        XSSFRow row = sheet.getRow(0);
-
-        XSSFCell cellWith = row.getCell(0);
-        XSSFCell cellWithoutComment = row.getCell(1);
-
-        assertNotNull(cellWith.getCellComment());
-        assertNull(cellWithoutComment.getCellComment());
-
-        String exp = "\u0410\u0432\u0442\u043e\u0440:\ncomment";
-        XSSFComment comment = cellWith.getCellComment();
-        assertEquals(exp, comment.getString().getString());
-
-
-        // Check we can write it out and read it back as-is
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        sheet = wb2.getSheetAt(0);
-        row = sheet.getRow(0);
-        cellWith = row.getCell(0);
-        cellWithoutComment = row.getCell(1);
-
-        // Double check things are as expected
-        assertNotNull(cellWith.getCellComment());
-        assertNull(cellWithoutComment.getCellComment());
-        comment = cellWith.getCellComment();
-        assertEquals(exp, comment.getString().getString());
-
-
-        // Move the comment
-        cellWithoutComment.setCellComment(comment);
-
-
-        // Write out and re-check
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        
-        sheet = wb3.getSheetAt(0);
-        row = sheet.getRow(0);
-
-        // Ensure it swapped over
-        cellWith = row.getCell(0);
-        cellWithoutComment = row.getCell(1);
-        assertNull(cellWith.getCellComment());
-        assertNotNull(cellWithoutComment.getCellComment());
-
-        comment = cellWithoutComment.getCellComment();
-        assertEquals(exp, comment.getString().getString());
-        
-        wb3.close();
-    }
-
-    /**
-     * When the cell background colour is set with one of the first
-     *  two columns of the theme colour palette, the colours are
-     *  shades of white or black.
-     * For those cases, ensure we don't break on reading the colour
-     */
-    @Test
-    public void bug50299() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("50299.xlsx");
-
-        // Check all the colours
-        for(int sn=0; sn<wb.getNumberOfSheets(); sn++) {
-            Sheet s = wb.getSheetAt(sn);
-            for(Row r : s) {
-                for(Cell c : r) {
-                    CellStyle cs = c.getCellStyle();
-                    if(cs != null) {
-                        cs.getFillForegroundColor();
-                    }
-                }
-            }
-        }
-
-        // Check one bit in detail
-        // Check that we get back foreground=0 for the theme colours,
-        //  and background=64 for the auto colouring
-        Sheet s = wb.getSheetAt(0);
-        assertEquals(0,  s.getRow(0).getCell(8).getCellStyle().getFillForegroundColor());
-        assertEquals(64, s.getRow(0).getCell(8).getCellStyle().getFillBackgroundColor());
-        assertEquals(0,  s.getRow(1).getCell(8).getCellStyle().getFillForegroundColor());
-        assertEquals(64, s.getRow(1).getCell(8).getCellStyle().getFillBackgroundColor());
-        
-        wb.close();
-    }
-
-    /**
-     * Excel .xls style indexed colours in a .xlsx file
-     */
-    @Test
-    public void bug50786() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("50786-indexed_colours.xlsx");
-        XSSFSheet s = wb.getSheetAt(0);
-        XSSFRow r = s.getRow(2);
-
-        // Check we have the right cell
-        XSSFCell c = r.getCell(1);
-        assertEquals("test\u00a0", c.getRichStringCellValue().getString());
-
-        // It should be light green
-        XSSFCellStyle cs = c.getCellStyle();
-        assertEquals(42, cs.getFillForegroundColor());
-        assertEquals(42, cs.getFillForegroundColorColor().getIndexed());
-        assertNotNull(cs.getFillForegroundColorColor().getRGB());
-        assertEquals("FFCCFFCC", cs.getFillForegroundColorColor().getARGBHex());
-        wb.close();
-    }
-
-    /**
-     * If the border colours are set with themes, then we
-     *  should still be able to get colours
-     */
-    @Test
-    public void bug50846() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("50846-border_colours.xlsx");
-
-        XSSFSheet sheet = wb.getSheetAt(0);
-        XSSFRow row = sheet.getRow(0);
-
-        // Border from a theme, brown
-        XSSFCell cellT = row.getCell(0);
-        XSSFCellStyle styleT = cellT.getCellStyle();
-        XSSFColor colorT = styleT.getBottomBorderXSSFColor();
-
-        assertEquals(5, colorT.getTheme());
-        assertEquals("FFC0504D", colorT.getARGBHex());
-
-        // Border from a style direct, red
-        XSSFCell cellS = row.getCell(1);
-        XSSFCellStyle styleS = cellS.getCellStyle();
-        XSSFColor colorS = styleS.getBottomBorderXSSFColor();
-
-        assertEquals(0, colorS.getTheme());
-        assertEquals("FFFF0000", colorS.getARGBHex());
-        wb.close();
-    }
-
-    /**
-     * Fonts where their colours come from the theme rather
-     *  then being set explicitly still should allow the
-     *  fetching of the RGB.
-     */
-    @Test
-    public void bug50784() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("50784-font_theme_colours.xlsx");
-        XSSFSheet s = wb.getSheetAt(0);
-        XSSFRow r = s.getRow(0);
-
-        // Column 1 has a font with regular colours
-        XSSFCell cr = r.getCell(1);
-        XSSFFont fr = wb.getFontAt( cr.getCellStyle().getFontIndex() );
-        XSSFColor colr =  fr.getXSSFColor();
-        // No theme, has colours
-        assertEquals(0, colr.getTheme());
-        assertNotNull( colr.getRGB() );
-
-        // Column 0 has a font with colours from a theme
-        XSSFCell ct = r.getCell(0);
-        XSSFFont ft = wb.getFontAt( ct.getCellStyle().getFontIndex() );
-        XSSFColor colt =  ft.getXSSFColor();
-        // Has a theme, which has the colours on it
-        assertEquals(9, colt.getTheme());
-        XSSFColor themeC = wb.getTheme().getThemeColor(colt.getTheme());
-        assertNotNull( themeC.getRGB() );
-        assertNotNull( colt.getRGB() );
-        assertEquals( themeC.getARGBHex(), colt.getARGBHex() ); // The same colour
-        wb.close();
-    }
-
-    /**
-     * New lines were being eaten when setting a font on
-     *  a rich text string
-     */
-    @Test
-    public void bug48877() throws IOException {
-        String text = "Use \n with word wrap on to create a new line.\n" +
-                "This line finishes with two trailing spaces.  ";
-
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet();
-
-        Font font1 = wb1.createFont();
-        font1.setColor((short) 20);
-        Font font2 = wb1.createFont();
-        font2.setColor(Font.COLOR_RED);
-        Font font3 = wb1.getFontAt((short)0);
-
-        XSSFRow row = sheet.createRow(2);
-        XSSFCell cell = row.createCell(2);
-
-        XSSFRichTextString richTextString =
-                wb1.getCreationHelper().createRichTextString(text);
-
-        // Check the text has the newline
-        assertEquals(text, richTextString.getString());
-
-        // Apply the font
-        richTextString.applyFont(font3);
-        richTextString.applyFont(0, 3, font1);
-        cell.setCellValue(richTextString);
-
-        // To enable newlines you need set a cell styles with wrap=true
-        CellStyle cs = wb1.createCellStyle();
-        cs.setWrapText(true);
-        cell.setCellStyle(cs);
-
-        // Check the text has the
-        assertEquals(text, cell.getStringCellValue());
-
-        // Save the file and re-read it
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        row = sheet.getRow(2);
-        cell = row.getCell(2);
-        assertEquals(text, cell.getStringCellValue());
-
-        // Now add a 2nd, and check again
-        int fontAt = text.indexOf("\n", 6);
-        cell.getRichStringCellValue().applyFont(10, fontAt+1, font2);
-        assertEquals(text, cell.getStringCellValue());
-
-        assertEquals(4, cell.getRichStringCellValue().numFormattingRuns());
-        assertEquals("Use", cell.getRichStringCellValue().getCTRst().getRArray(0).getT());
-
-        String r3 = cell.getRichStringCellValue().getCTRst().getRArray(2).getT();
-        assertEquals("line.\n", r3.substring(r3.length()-6));
-
-        // Save and re-check
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        
-        sheet = wb3.getSheetAt(0);
-        row = sheet.getRow(2);
-        cell = row.getCell(2);
-        assertEquals(text, cell.getStringCellValue());
-        wb3.close();
-
-        // FileOutputStream out = new FileOutputStream("/tmp/test48877.xlsx");
-        // wb.write(out);
-        // out.close();
-    }
-
-    /**
-     * Adding sheets when one has a table, then re-ordering
-     */
-    @Test
-    public void bug50867() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("50867_with_table.xlsx");
-        assertEquals(3, wb1.getNumberOfSheets());
-
-        XSSFSheet s1 = wb1.getSheetAt(0);
-        XSSFSheet s2 = wb1.getSheetAt(1);
-        XSSFSheet s3 = wb1.getSheetAt(2);
-        assertEquals(1, s1.getTables().size());
-        assertEquals(0, s2.getTables().size());
-        assertEquals(0, s3.getTables().size());
-
-        XSSFTable t = s1.getTables().get(0);
-        assertEquals("Tabella1", t.getName());
-        assertEquals("Tabella1", t.getDisplayName());
-        assertEquals("A1:C3", t.getCTTable().getRef());
-
-        // Add a sheet and re-order
-        XSSFSheet s4 = wb1.createSheet("NewSheet");
-        wb1.setSheetOrder(s4.getSheetName(), 0);
-
-        // Check on tables
-        assertEquals(1, s1.getTables().size());
-        assertEquals(0, s2.getTables().size());
-        assertEquals(0, s3.getTables().size());
-        assertEquals(0, s4.getTables().size());
-
-        // Refetch to get the new order
-        s1 = wb1.getSheetAt(0);
-        s2 = wb1.getSheetAt(1);
-        s3 = wb1.getSheetAt(2);
-        s4 = wb1.getSheetAt(3);
-        assertEquals(0, s1.getTables().size());
-        assertEquals(1, s2.getTables().size());
-        assertEquals(0, s3.getTables().size());
-        assertEquals(0, s4.getTables().size());
-
-        // Save and re-load
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        s1 = wb2.getSheetAt(0);
-        s2 = wb2.getSheetAt(1);
-        s3 = wb2.getSheetAt(2);
-        s4 = wb2.getSheetAt(3);
-        assertEquals(0, s1.getTables().size());
-        assertEquals(1, s2.getTables().size());
-        assertEquals(0, s3.getTables().size());
-        assertEquals(0, s4.getTables().size());
-
-        t = s2.getTables().get(0);
-        assertEquals("Tabella1", t.getName());
-        assertEquals("Tabella1", t.getDisplayName());
-        assertEquals("A1:C3", t.getCTTable().getRef());
-
-
-        // Add some more tables, and check
-        t = s2.createTable();
-        t.setName("New 2");
-        t.setDisplayName("New 2");
-        t = s3.createTable();
-        t.setName("New 3");
-        t.setDisplayName("New 3");
-
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        s1 = wb3.getSheetAt(0);
-        s2 = wb3.getSheetAt(1);
-        s3 = wb3.getSheetAt(2);
-        s4 = wb3.getSheetAt(3);
-        assertEquals(0, s1.getTables().size());
-        assertEquals(2, s2.getTables().size());
-        assertEquals(1, s3.getTables().size());
-        assertEquals(0, s4.getTables().size());
-
-        t = s2.getTables().get(0);
-        assertEquals("Tabella1", t.getName());
-        assertEquals("Tabella1", t.getDisplayName());
-        assertEquals("A1:C3", t.getCTTable().getRef());
-
-        t = s2.getTables().get(1);
-        assertEquals("New 2", t.getName());
-        assertEquals("New 2", t.getDisplayName());
-
-        t = s3.getTables().get(0);
-        assertEquals("New 3", t.getName());
-        assertEquals("New 3", t.getDisplayName());
-
-        // Check the relationships
-        assertEquals(0, s1.getRelations().size());
-        assertEquals(3, s2.getRelations().size());
-        assertEquals(1, s3.getRelations().size());
-        assertEquals(0, s4.getRelations().size());
-
-        assertEquals(
-                XSSFRelation.PRINTER_SETTINGS.getContentType(),
-                s2.getRelations().get(0).getPackagePart().getContentType()
-        );
-        assertEquals(
-                XSSFRelation.TABLE.getContentType(),
-                s2.getRelations().get(1).getPackagePart().getContentType()
-        );
-        assertEquals(
-                XSSFRelation.TABLE.getContentType(),
-                s2.getRelations().get(2).getPackagePart().getContentType()
-        );
-        assertEquals(
-                XSSFRelation.TABLE.getContentType(),
-                s3.getRelations().get(0).getPackagePart().getContentType()
-        );
-        assertEquals(
-                "/xl/tables/table3.xml",
-                s3.getRelations().get(0).getPackagePart().getPartName().toString()
-        );
-        wb3.close();
-    }
-
-    /**
-     * Setting repeating rows and columns shouldn't break
-     *  any print settings that were there before
-     */
-    @Test
-    public void bug49253() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFWorkbook wb2 = new XSSFWorkbook();
-        CellRangeAddress cra = CellRangeAddress.valueOf("C2:D3");
-
-        // No print settings before repeating
-        XSSFSheet s1 = wb1.createSheet();
-        assertEquals(false, s1.getCTWorksheet().isSetPageSetup());
-        assertEquals(true, s1.getCTWorksheet().isSetPageMargins());
-        s1.setRepeatingColumns(cra);
-        s1.setRepeatingRows(cra);
-
-        assertEquals(true, s1.getCTWorksheet().isSetPageSetup());
-        assertEquals(true, s1.getCTWorksheet().isSetPageMargins());
-
-        PrintSetup ps1 = s1.getPrintSetup();
-        assertEquals(false, ps1.getValidSettings());
-        assertEquals(false, ps1.getLandscape());
-
-
-        // Had valid print settings before repeating
-        XSSFSheet s2 = wb2.createSheet();
-        PrintSetup ps2 = s2.getPrintSetup();
-        assertEquals(true, s2.getCTWorksheet().isSetPageSetup());
-        assertEquals(true, s2.getCTWorksheet().isSetPageMargins());
-
-        ps2.setLandscape(false);
-        assertEquals(true, ps2.getValidSettings());
-        assertEquals(false, ps2.getLandscape());
-        s2.setRepeatingColumns(cra);
-        s2.setRepeatingRows(cra);
-
-        ps2 = s2.getPrintSetup();
-        assertEquals(true, s2.getCTWorksheet().isSetPageSetup());
-        assertEquals(true, s2.getCTWorksheet().isSetPageMargins());
-        assertEquals(true, ps2.getValidSettings());
-        assertEquals(false, ps2.getLandscape());
-
-        wb1.close();
-        wb2.close();
-    }
-
-    /**
-     * Default Column style
-     */
-    @Test
-    public void bug51037() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet s = wb.createSheet();
-
-        CellStyle defaultStyle = wb.getCellStyleAt((short)0);
-        assertEquals(0, defaultStyle.getIndex());
-
-        CellStyle blueStyle = wb.createCellStyle();
-        blueStyle.setFillForegroundColor(IndexedColors.AQUA.getIndex());
-        blueStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);
-        assertEquals(1, blueStyle.getIndex());
-
-        CellStyle pinkStyle = wb.createCellStyle();
-        pinkStyle.setFillForegroundColor(IndexedColors.PINK.getIndex());
-        pinkStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);
-        assertEquals(2, pinkStyle.getIndex());
-
-        // Starts empty
-        assertEquals(1, s.getCTWorksheet().sizeOfColsArray());
-        CTCols cols = s.getCTWorksheet().getColsArray(0);
-        assertEquals(0, cols.sizeOfColArray());
-
-        // Add some rows and columns
-        XSSFRow r1 = s.createRow(0);
-        XSSFRow r2 = s.createRow(1);
-        r1.createCell(0);
-        r1.createCell(2);
-        r2.createCell(0);
-        r2.createCell(3);
-
-        // Check no style is there
-        assertEquals(1, s.getCTWorksheet().sizeOfColsArray());
-        assertEquals(0, cols.sizeOfColArray());
-
-        assertEquals(defaultStyle, s.getColumnStyle(0));
-        assertEquals(defaultStyle, s.getColumnStyle(2));
-        assertEquals(defaultStyle, s.getColumnStyle(3));
-
-
-        // Apply the styles
-        s.setDefaultColumnStyle(0, pinkStyle);
-        s.setDefaultColumnStyle(3, blueStyle);
-
-        // Check
-        assertEquals(pinkStyle, s.getColumnStyle(0));
-        assertEquals(defaultStyle, s.getColumnStyle(2));
-        assertEquals(blueStyle, s.getColumnStyle(3));
-
-        assertEquals(1, s.getCTWorksheet().sizeOfColsArray());
-        assertEquals(2, cols.sizeOfColArray());
-
-        assertEquals(1, cols.getColArray(0).getMin());
-        assertEquals(1, cols.getColArray(0).getMax());
-        assertEquals(pinkStyle.getIndex(), cols.getColArray(0).getStyle());
-
-        assertEquals(4, cols.getColArray(1).getMin());
-        assertEquals(4, cols.getColArray(1).getMax());
-        assertEquals(blueStyle.getIndex(), cols.getColArray(1).getStyle());
-
-
-        // Save, re-load and re-check
-        XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        s = wbBack.getSheetAt(0);
-        defaultStyle = wbBack.getCellStyleAt(defaultStyle.getIndex());
-        blueStyle = wbBack.getCellStyleAt(blueStyle.getIndex());
-        pinkStyle = wbBack.getCellStyleAt(pinkStyle.getIndex());
-
-        assertEquals(pinkStyle, s.getColumnStyle(0));
-        assertEquals(defaultStyle, s.getColumnStyle(2));
-        assertEquals(blueStyle, s.getColumnStyle(3));
-        wbBack.close();
-    }
-
-    /**
-     * Repeatedly writing a file.
-     * Something with the SharedStringsTable currently breaks...
-     */
-    @Test
-    public void bug46662() throws IOException {
-        // New file
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-        XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-        wb1.close();
-
-        // Simple file
-        XSSFWorkbook wb2 = XSSFTestDataSamples.openSampleWorkbook("sample.xlsx");
-        XSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-        XSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-        XSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-        wb2.close();
-
-        // Complex file
-        // TODO
-    }
-
-    /**
-     * Colours and styles when the list has gaps in it
-     */
-    @Test
-    public void bug51222() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("51222.xlsx");
-        XSSFSheet s = wb.getSheetAt(0);
-
-        XSSFCell cA4_EEECE1 = s.getRow(3).getCell(0);
-        XSSFCell cA5_1F497D = s.getRow(4).getCell(0);
-
-        // Check the text
-        assertEquals("A4", cA4_EEECE1.getRichStringCellValue().getString());
-        assertEquals("A5", cA5_1F497D.getRichStringCellValue().getString());
-
-        // Check the styles assigned to them
-        assertEquals(4, cA4_EEECE1.getCTCell().getS());
-        assertEquals(5, cA5_1F497D.getCTCell().getS());
-
-        // Check we look up the correct style
-        assertEquals(4, cA4_EEECE1.getCellStyle().getIndex());
-        assertEquals(5, cA5_1F497D.getCellStyle().getIndex());
-
-        // Check the fills on them at the low level
-        assertEquals(5, cA4_EEECE1.getCellStyle().getCoreXf().getFillId());
-        assertEquals(6, cA5_1F497D.getCellStyle().getCoreXf().getFillId());
-
-        // These should reference themes 2 and 3
-        assertEquals(2, wb.getStylesSource().getFillAt(5).getCTFill().getPatternFill().getFgColor().getTheme());
-        assertEquals(3, wb.getStylesSource().getFillAt(6).getCTFill().getPatternFill().getFgColor().getTheme());
-
-        // Ensure we get the right colours for these themes
-        // TODO fix
-        // assertEquals("FFEEECE1", wb.getTheme().getThemeColor(2).getARGBHex());
-        // assertEquals("FF1F497D", wb.getTheme().getThemeColor(3).getARGBHex());
-
-        // Finally check the colours on the styles
-        // TODO fix
-        // assertEquals("FFEEECE1", cA4_EEECE1.getCellStyle().getFillForegroundXSSFColor().getARGBHex());
-        // assertEquals("FF1F497D", cA5_1F497D.getCellStyle().getFillForegroundXSSFColor().getARGBHex());
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug51470() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("51470.xlsx");
-        XSSFSheet sh0 = wb.getSheetAt(0);
-        XSSFSheet sh1 = wb.cloneSheet(0);
-        List<RelationPart> rels0 = sh0.getRelationParts();
-        List<RelationPart> rels1 = sh1.getRelationParts();
-        assertEquals(1, rels0.size());
-        assertEquals(1, rels1.size());
-
-        PackageRelationship pr0 = rels0.get(0).getRelationship();
-        PackageRelationship pr1 = rels1.get(0).getRelationship();
-        
-        assertEquals(pr0.getTargetMode(), pr1.getTargetMode());
-        assertEquals(pr0.getTargetURI(), pr1.getTargetURI());
-        POIXMLDocumentPart doc0 = rels0.get(0).getDocumentPart();
-        POIXMLDocumentPart doc1 = rels1.get(0).getDocumentPart();
-        
-        assertEquals(doc0, doc1);
-        wb.close();
-    }
-
-    /**
-     * Add comments to Sheet 1, when Sheet 2 already has
-     *  comments (so /xl/comments1.xml is taken)
-     */
-    @Test
-    public void bug51850() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("51850.xlsx");
-        XSSFSheet sh1 = wb1.getSheetAt(0);
-        XSSFSheet sh2 = wb1.getSheetAt(1);
-
-        // Sheet 2 has comments
-        assertNotNull(sh2.getCommentsTable(false));
-        assertEquals(1, sh2.getCommentsTable(false).getNumberOfComments());
-
-        // Sheet 1 doesn't (yet)
-        assertNull(sh1.getCommentsTable(false));
-
-        // Try to add comments to Sheet 1
-        CreationHelper factory = wb1.getCreationHelper();
-        Drawing drawing = sh1.createDrawingPatriarch();
-
-        ClientAnchor anchor = factory.createClientAnchor();
-        anchor.setCol1(0);
-        anchor.setCol2(4);
-        anchor.setRow1(0);
-        anchor.setRow2(1);
-
-        Comment comment1 = drawing.createCellComment(anchor);
-        comment1.setString(
-                factory.createRichTextString("I like this cell. It's my favourite."));
-        comment1.setAuthor("Bob T. Fish");
-
-        anchor = factory.createClientAnchor();
-        anchor.setCol1(0);
-        anchor.setCol2(4);
-        anchor.setRow1(1);
-        anchor.setRow2(1);
-        Comment comment2 = drawing.createCellComment(anchor);
-        comment2.setString(
-                factory.createRichTextString("This is much less fun..."));
-        comment2.setAuthor("Bob T. Fish");
-
-        Cell c1 = sh1.getRow(0).createCell(4);
-        c1.setCellValue(2.3);
-        c1.setCellComment(comment1);
-
-        Cell c2 = sh1.getRow(0).createCell(5);
-        c2.setCellValue(2.1);
-        c2.setCellComment(comment2);
-
-
-        // Save and re-load
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh1 = wb2.getSheetAt(0);
-        sh2 = wb2.getSheetAt(1);
-
-        // Check the comments
-        assertNotNull(sh2.getCommentsTable(false));
-        assertEquals(1, sh2.getCommentsTable(false).getNumberOfComments());
-
-        assertNotNull(sh1.getCommentsTable(false));
-        assertEquals(2, sh1.getCommentsTable(false).getNumberOfComments());
-        wb2.close();
-    }
-
-    /**
-     * Sheet names with a , in them
-     */
-    @Test
-    public void bug51963() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("51963.xlsx");
-        Sheet sheet = wb.getSheetAt(0);
-        assertEquals("Abc,1", sheet.getSheetName());
-
-        Name name = wb.getName("Intekon.ProdCodes");
-        assertEquals("'Abc,1'!$A$1:$A$2", name.getRefersToFormula());
-
-        @SuppressWarnings("deprecation")
-        AreaReference ref = new AreaReference(name.getRefersToFormula());
-        assertEquals(0, ref.getFirstCell().getRow());
-        assertEquals(0, ref.getFirstCell().getCol());
-        assertEquals(1, ref.getLastCell().getRow());
-        assertEquals(0, ref.getLastCell().getCol());
-        wb.close();
-    }
-
-    /**
-     * Sum across multiple workbooks
-     *  eg =SUM($Sheet1.C1:$Sheet4.C1)
-     */
-    @Test
-    public void bug48703() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("48703.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-
-        // Contains two forms, one with a range and one a list
-        XSSFRow r1 = sheet.getRow(0);
-        XSSFRow r2 = sheet.getRow(1);
-        XSSFCell c1 = r1.getCell(1);
-        XSSFCell c2 = r2.getCell(1);
-
-        assertEquals(20.0, c1.getNumericCellValue(), 0);
-        assertEquals("SUM(Sheet1!C1,Sheet2!C1,Sheet3!C1,Sheet4!C1)", c1.getCellFormula());
-
-        assertEquals(20.0, c2.getNumericCellValue(), 0);
-        assertEquals("SUM(Sheet1:Sheet4!C1)", c2.getCellFormula());
-
-        // Try evaluating both
-        XSSFFormulaEvaluator eval = new XSSFFormulaEvaluator(wb);
-        eval.evaluateFormulaCellEnum(c1);
-        eval.evaluateFormulaCellEnum(c2);
-
-        assertEquals(20.0, c1.getNumericCellValue(), 0);
-        assertEquals(20.0, c2.getNumericCellValue(), 0);
-        wb.close();
-    }
-
-    /**
-     * Bugzilla 51710: problems reading shared formuals from .xlsx
-     */
-    @Test
-    public void bug51710() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("51710.xlsx");
-
-        final String[] columns = {"A","B","C","D","E","F","G","H","I","J","K","L","M","N"};
-        final int rowMax = 500; // bug triggers on row index 59
-
-        Sheet sheet = wb.getSheetAt(0);
-
-
-        // go through all formula cells
-        for (int rInd = 2; rInd <= rowMax; rInd++) {
-            Row row = sheet.getRow(rInd);
-
-            for (int cInd = 1; cInd <= 12; cInd++) {
-                Cell cell = row.getCell(cInd);
-                String formula = cell.getCellFormula();
-                CellReference ref = new CellReference(cell);
-
-                //simulate correct answer
-                String correct = "$A" + (rInd + 1) + "*" + columns[cInd] + "$2";
-
-                assertEquals("Incorrect formula in " + ref.formatAsString(), correct, formula);
-            }
-
-        }
-        wb.close();
-    }
-
-    /**
-     * Bug 53101:
-     */
-    @Test
-    public void bug5301() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("53101.xlsx");
-        FormulaEvaluator evaluator =
-                wb.getCreationHelper().createFormulaEvaluator();
-        // A1: SUM(B1: IZ1)
-        double a1Value =
-                evaluator.evaluate(wb.getSheetAt(0).getRow(0).getCell(0)).getNumberValue();
-
-        // Assert
-        assertEquals(259.0, a1Value, 0.0);
-
-        // KY: SUM(B1: IZ1)
-        /*double ky1Value =*/
-                evaluator.evaluate(wb.getSheetAt(0).getRow(0).getCell(310)).getNumberValue();
-
-        // Assert
-        assertEquals(259.0, a1Value, 0.0);
-        wb.close();
-    }
-
-    @Test
-    public void bug54436() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("54436.xlsx");
-        if(!WorkbookEvaluator.getSupportedFunctionNames().contains("GETPIVOTDATA")){
-            Function func = new Function() {
-                @Override
-                public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-                    return ErrorEval.NA;
-                }
-            };
-
-            WorkbookEvaluator.registerFunction("GETPIVOTDATA", func);
-        }
-        wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-        wb.close();
-    }
-
-    /**
-     * Password Protected .xlsx files should give a helpful
-     *  error message when called via WorkbookFactory with no password
-     */
-    @Test(expected=EncryptedDocumentException.class)
-    public void bug55692_poifs() throws IOException {
-        // Via a POIFSFileSystem
-        POIFSFileSystem fsP = new POIFSFileSystem(
-            POIDataSamples.getPOIFSInstance().openResourceAsStream("protect.xlsx"));
-        try {
-            WorkbookFactory.create(fsP);
-        } finally {
-            fsP.close();
-        }
-    }
-
-    @Test
-    public void bug55692_stream() throws IOException, InvalidFormatException {
-        // Directly on a Stream, will go via NPOIFS and spot it's
-        //  actually a .xlsx file encrypted with the default password, and open
-        Workbook wb = WorkbookFactory.create(
-                POIDataSamples.getPOIFSInstance().openResourceAsStream("protect.xlsx"));
-        assertNotNull(wb);
-        assertEquals(3, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    @Test
-    public void bug55692_npoifs() throws IOException {
-        // Via a NPOIFSFileSystem, will spot it's actually a .xlsx file
-        //  encrypted with the default password, and open
-        NPOIFSFileSystem fsNP = new NPOIFSFileSystem(
-                POIDataSamples.getPOIFSInstance().openResourceAsStream("protect.xlsx"));
-        Workbook wb = WorkbookFactory.create(fsNP);
-        assertNotNull(wb);
-        assertEquals(3, wb.getNumberOfSheets());
-        wb.close();
-        fsNP.close();
-    }
-
-    @Test
-    public void bug53282() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("53282b.xlsx");
-        Cell c = wb.getSheetAt(0).getRow(1).getCell(0);
-        assertEquals("#@_#", c.getStringCellValue());
-        assertEquals("http://invalid.uri", c.getHyperlink().getAddress());
-        wb.close();
-    }
-
-    /**
-     * Was giving NullPointerException
-     * at org.apache.poi.xssf.usermodel.XSSFWorkbook.onDocumentRead
-     * due to a lack of Styles Table
-     */
-    @Test
-    public void bug56278() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56278.xlsx");
-        assertEquals(0, wb.getSheetIndex("Market Rates"));
-
-        // Save and re-check
-        Workbook nwb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertEquals(0, nwb.getSheetIndex("Market Rates"));
-        nwb.close();
-        wb.close();
-    }
-
-    @Test
-    public void bug56315() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56315.xlsx");
-        Cell c = wb.getSheetAt(0).getRow(1).getCell(0);
-        CellValue cv = wb.getCreationHelper().createFormulaEvaluator().evaluate(c);
-        double rounded = cv.getNumberValue();
-        assertEquals(0.1, rounded, 0.0);
-        wb.close();
-    }
-
-    @Test
-    public void bug56468() throws IOException, InterruptedException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFRow row = sheet.createRow(0);
-        XSSFCell cell = row.createCell(0);
-        cell.setCellValue("Hi");
-        sheet.setRepeatingRows(new CellRangeAddress(0, 0, 0, 0));
-
-        // small hack to try to make this test stable, previously it failed whenever the two written ZIP files had different file-creation
-        // dates stored.
-        // We try to do a loop until the current second changes in order to avoid problems with some date information that is written to the ZIP and thus
-        // causes differences
-        long start = System.currentTimeMillis()/1000;
-        while(System.currentTimeMillis()/1000 == start) {
-            Thread.sleep(10);
-        }
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream(8096);
-        wb.write(bos);
-        byte firstSave[] = bos.toByteArray();
-        bos.reset();
-        wb.write(bos);
-        byte secondSave[] = bos.toByteArray();
-
-        /*OutputStream stream = new FileOutputStream("C:\\temp\\poi.xlsx");
-        try {
-            wb.write(stream);
-        } finally {
-            stream.close();
-        }*/
-
-        assertArrayEquals("Had: \n" + Arrays.toString(firstSave) + " and \n" + Arrays.toString(secondSave),
-                firstSave, secondSave);
-
-        wb.close();
-    }
-
-    /**
-     * ISO-8601 style cell formats with a T in them, eg
-     * cell format of "yyyy-MM-ddTHH:mm:ss"
-     */
-    @Test
-    public void bug54034() throws IOException {
-        TimeZone tz = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
-        try {
-            Workbook wb = XSSFTestDataSamples.openSampleWorkbook("54034.xlsx");
-            Sheet sheet = wb.getSheet("Sheet1");
-            Row row = sheet.getRow(1);
-            Cell cell = row.getCell(2);
-            assertTrue(DateUtil.isCellDateFormatted(cell));
-
-            DataFormatter fmt = new DataFormatter();
-            assertEquals("yyyy\\-mm\\-dd\\Thh:mm", cell.getCellStyle().getDataFormatString());
-            assertEquals("2012-08-08T22:59", fmt.formatCellValue(cell));
-
-            wb.close();
-        } finally {
-            LocaleUtil.setUserTimeZone(tz);
-        }
-    }
-
-
-    @Test
-    public void testBug53798XLSX() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("53798_shiftNegative_TMPL.xlsx");
-        File xlsOutput = TempFile.createTempFile("testBug53798", ".xlsx");
-        bug53798Work(wb, xlsOutput);
-        wb.close();
-    }
-
-    @Ignore("Shifting rows is not yet implemented in SXSSFSheet")
-    @Test
-    public void testBug53798XLSXStream() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("53798_shiftNegative_TMPL.xlsx");
-        File xlsOutput = TempFile.createTempFile("testBug53798", ".xlsx");
-        SXSSFWorkbook wb2 = new SXSSFWorkbook(wb);
-        bug53798Work(wb2, xlsOutput);
-        wb2.close();
-        wb.close();
-    }
-
-    @Test
-    public void testBug53798XLS() throws IOException {
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("53798_shiftNegative_TMPL.xls");
-        File xlsOutput = TempFile.createTempFile("testBug53798", ".xls");
-        bug53798Work(wb, xlsOutput);
-        wb.close();
-    }
-
-    /**
-     * SUMIF was throwing a NPE on some formulas
-     */
-    @Test
-    public void testBug56420SumIfNPE() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56420.xlsx");
-
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sheet = wb.getSheetAt(0);
-        Row r = sheet.getRow(2);
-        Cell c = r.getCell(2);
-        assertEquals("SUMIF($A$1:$A$4,A3,$B$1:$B$4)", c.getCellFormula());
-        Cell eval = evaluator.evaluateInCell(c);
-        assertEquals(0.0, eval.getNumericCellValue(), 0.0001);
-        wb.close();
-    }
-
-    private void bug53798Work(Workbook wb, File xlsOutput) throws IOException {
-        Sheet testSheet = wb.getSheetAt(0);
-
-        testSheet.shiftRows(2, 2, 1);
-
-        saveAndReloadReport(wb, xlsOutput);
-
-        // 1) corrupted xlsx (unreadable data in the first row of a shifted group) already comes about
-        // when shifted by less than -1 negative amount (try -2)
-        testSheet.shiftRows(3, 3, -1);
-
-        saveAndReloadReport(wb, xlsOutput);
-
-        testSheet.shiftRows(2, 2, 1);
-
-        saveAndReloadReport(wb, xlsOutput);
-
-        // 2) attempt to create a new row IN PLACE of a removed row by a negative shift causes corrupted
-        // xlsx file with  unreadable data in the negative shifted row.
-        // NOTE it's ok to create any other row.
-        Row newRow = testSheet.createRow(3);
-
-        saveAndReloadReport(wb, xlsOutput);
-
-        Cell newCell = newRow.createCell(0);
-
-        saveAndReloadReport(wb, xlsOutput);
-
-        newCell.setCellValue("new Cell in row "+newRow.getRowNum());
-
-        saveAndReloadReport(wb, xlsOutput);
-
-        // 3) once a negative shift has been made any attempt to shift another group of rows
-        // (note: outside of previously negative shifted rows) by a POSITIVE amount causes POI exception:
-        // org.apache.xmlbeans.impl.values.XmlValueDisconnectedException.
-        // NOTE: another negative shift on another group of rows is successful, provided no new rows in
-        // place of previously shifted rows were attempted to be created as explained above.
-        testSheet.shiftRows(6, 7, 1);   // -- CHANGE the shift to positive once the behaviour of
-                                        // the above has been tested
-
-        saveAndReloadReport(wb, xlsOutput);
-    }
-
-    /**
-     * XSSFCell.typeMismatch on certain blank cells when formatting
-     *  with DataFormatter
-     */
-    @Test
-    public void bug56702() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56702.xlsx");
-
-        Sheet sheet = wb.getSheetAt(0);
-
-        // Get wrong cell by row 8 & column 7
-        Cell cell = sheet.getRow(8).getCell(7);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-
-        // Check the value - will be zero as it is <c><v/></c>
-        assertEquals(0.0, cell.getNumericCellValue(), 0.001);
-
-        // Try to format
-        DataFormatter formatter = new DataFormatter();
-        formatter.formatCellValue(cell);
-
-        // Check the formatting
-        assertEquals("0", formatter.formatCellValue(cell));
-        wb.close();
-    }
-
-    /**
-     * Formulas which reference named ranges, either in other
-     *  sheets, or workbook scoped but in other workbooks.
-     * Used to fail with with errors like
-     * org.apache.poi.ss.formula.FormulaParseException: Cell reference expected after sheet name at index 9
-     * org.apache.poi.ss.formula.FormulaParseException: Parse error near char 0 '[' in specified formula '[0]!NR_Global_B2'. Expected number, string, or defined name
-     */
-    @Test
-    public void bug56737() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56737.xlsx");
-
-        // Check the named range definitions
-        Name nSheetScope = wb.getName("NR_To_A1");
-        Name nWBScope = wb.getName("NR_Global_B2");
-
-        assertNotNull(nSheetScope);
-        assertNotNull(nWBScope);
-
-        assertEquals("Defines!$A$1", nSheetScope.getRefersToFormula());
-        assertEquals("Defines!$B$2", nWBScope.getRefersToFormula());
-
-        // Check the different kinds of formulas
-        Sheet s = wb.getSheetAt(0);
-        Cell cRefSName = s.getRow(1).getCell(3);
-        Cell cRefWName = s.getRow(2).getCell(3);
-
-        assertEquals("Defines!NR_To_A1", cRefSName.getCellFormula());
-        // Note the formula, as stored in the file, has the external name index not filename
-        // TODO Provide a way to get the one with the filename
-        assertEquals("[0]!NR_Global_B2", cRefWName.getCellFormula());
-
-        // Try to evaluate them
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals("Test A1", eval.evaluate(cRefSName).getStringValue());
-        assertEquals(142, (int)eval.evaluate(cRefWName).getNumberValue());
-
-        // Try to evaluate everything
-        eval.evaluateAll();
-        wb.close();
-    }
-
-    private void saveAndReloadReport(Workbook wb, File outFile) throws IOException {
-        // run some method on the font to verify if it is "disconnected" already
-        //for(short i = 0;i < 256;i++)
-        {
-            Font font = wb.getFontAt((short)0);
-            if(font instanceof XSSFFont) {
-                XSSFFont xfont = (XSSFFont) wb.getFontAt((short)0);
-                CTFontImpl ctFont = (CTFontImpl) xfont.getCTFont();
-                assertEquals(0, ctFont.sizeOfBArray());
-            }
-        }
-
-        FileOutputStream fileOutStream = new FileOutputStream(outFile);
-        try {
-            wb.write(fileOutStream);
-        } finally {
-            fileOutStream.close();
-        }
-
-        FileInputStream is = new FileInputStream(outFile);
-        try {
-            Workbook newWB = null;
-            try {
-                if(wb instanceof XSSFWorkbook) {
-                    newWB = new XSSFWorkbook(is);
-                } else if(wb instanceof HSSFWorkbook) {
-                    newWB = new HSSFWorkbook(is);
-                } else if(wb instanceof SXSSFWorkbook) {
-                    newWB = new SXSSFWorkbook(new XSSFWorkbook(is));
-                } else {
-                    throw new IllegalStateException("Unknown workbook: " + wb);
-                }
-                assertNotNull(newWB.getSheet("test"));
-            } finally {
-                if (newWB != null) {
-                    newWB.close();
-                }
-            }
-        } finally {
-            is.close();
-        }
-    }
-
-    @Test
-    public void testBug56688_1() throws IOException {
-        XSSFWorkbook excel = XSSFTestDataSamples.openSampleWorkbook("56688_1.xlsx");
-        checkValue(excel, "-1.0");  /* Not 0.0 because POI sees date "0" minus one month as invalid date, which is -1! */
-        excel.close();
-    }
-
-    @Test
-    public void testBug56688_2() throws IOException {
-        XSSFWorkbook excel = XSSFTestDataSamples.openSampleWorkbook("56688_2.xlsx");
-        checkValue(excel, "#VALUE!");
-        excel.close();
-    }
-
-    @Test
-    public void testBug56688_3() throws IOException {
-        XSSFWorkbook excel = XSSFTestDataSamples.openSampleWorkbook("56688_3.xlsx");
-        checkValue(excel, "#VALUE!");
-        excel.close();
-    }
-
-    @Test
-    public void testBug56688_4() throws IOException {
-        XSSFWorkbook excel = XSSFTestDataSamples.openSampleWorkbook("56688_4.xlsx");
-
-        Calendar calendar = LocaleUtil.getLocaleCalendar();
-        calendar.add(Calendar.MONTH, 2);
-        double excelDate = DateUtil.getExcelDate(calendar.getTime());
-        NumberEval eval = new NumberEval(Math.floor(excelDate));
-        checkValue(excel, eval.getStringValue() + ".0");
-
-        excel.close();
-    }
-
-    /**
-     * New hyperlink with no initial cell reference, still need
-     *  to be able to change it
-     */
-    @Test
-    public void testBug56527() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFCreationHelper creationHelper = wb.getCreationHelper();
-        XSSFHyperlink hyperlink;
-
-        // Try with a cell reference
-        hyperlink = creationHelper.createHyperlink(HyperlinkType.URL);
-        sheet.addHyperlink(hyperlink);
-        hyperlink.setAddress("http://myurl");
-        hyperlink.setCellReference("B4");
-        assertEquals(3, hyperlink.getFirstRow());
-        assertEquals(1, hyperlink.getFirstColumn());
-        assertEquals(3, hyperlink.getLastRow());
-        assertEquals(1, hyperlink.getLastColumn());
-
-        // Try with explicit rows / columns
-        hyperlink = creationHelper.createHyperlink(HyperlinkType.URL);
-        sheet.addHyperlink(hyperlink);
-        hyperlink.setAddress("http://myurl");
-        hyperlink.setFirstRow(5);
-        hyperlink.setFirstColumn(3);
-
-        assertEquals(5, hyperlink.getFirstRow());
-        assertEquals(3, hyperlink.getFirstColumn());
-        assertEquals(5, hyperlink.getLastRow());
-        assertEquals(3, hyperlink.getLastColumn());
-        wb.close();
-    }
-
-    /**
-     * Shifting rows with a formula that references a
-     * function in another file
-     */
-    @Test
-    public void bug56502() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56502.xlsx");
-        Sheet sheet = wb.getSheetAt(0);
-
-        Cell cFunc = sheet.getRow(3).getCell(0);
-        assertEquals("[1]!LUCANET(\"Ist\")", cFunc.getCellFormula());
-        Cell cRef = sheet.getRow(3).createCell(1);
-        cRef.setCellFormula("A3");
-
-        // Shift it down one row
-        sheet.shiftRows(1, sheet.getLastRowNum(), 1);
-
-        // Check the new formulas: Function won't change, Reference will
-        cFunc = sheet.getRow(4).getCell(0);
-        assertEquals("[1]!LUCANET(\"Ist\")", cFunc.getCellFormula());
-        cRef = sheet.getRow(4).getCell(1);
-        assertEquals("A4", cRef.getCellFormula());
-        wb.close();
-    }
-
-    @Test
-    public void bug54764() throws IOException, OpenXML4JException, XmlException {
-        OPCPackage pkg = XSSFTestDataSamples.openSamplePackage("54764.xlsx");
-
-        // Check the core properties - will be found but empty, due
-        //  to the expansion being too much to be considered valid
-        POIXMLProperties props = new POIXMLProperties(pkg);
-        assertEquals(null, props.getCoreProperties().getTitle());
-        assertEquals(null, props.getCoreProperties().getSubject());
-        assertEquals(null, props.getCoreProperties().getDescription());
-
-        // Now check the spreadsheet itself
-        try {
-            new XSSFWorkbook(pkg).close();
-            fail("Should fail as too much expansion occurs");
-        } catch(POIXMLException e) {
-            // Expected
-        }
-        pkg.close();
-
-        // Try with one with the entities in the Content Types
-        try {
-            XSSFTestDataSamples.openSamplePackage("54764-2.xlsx").close();
-            fail("Should fail as too much expansion occurs");
-        } catch(Exception e) {
-            // Expected
-        }
-
-        // Check we can still parse valid files after all that
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("sample.xlsx");
-        assertEquals(3, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    /**
-     * CTDefinedNamesImpl should be included in the smaller
-     *  poi-ooxml-schemas jar
-     */
-    @Test
-    public void bug57176() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57176.xlsx");
-        CTDefinedNames definedNames = wb.getCTWorkbook().getDefinedNames();
-        List<CTDefinedName> definedNameList = definedNames.getDefinedNameList();
-        for (CTDefinedName defName : definedNameList) {
-            assertNotNull(defName.getName());
-            assertNotNull(defName.getStringValue());
-        }
-        assertEquals("TestDefinedName", definedNameList.get(0).getName());
-        wb.close();
-    }
-
-    /**
-     * .xlsb files are not supported, but we should generate a helpful
-     *  error message if given one
-     */
-    @Test
-    public void bug56800_xlsb() throws IOException, InvalidFormatException {
-        // Can be opened at the OPC level
-        OPCPackage pkg = XSSFTestDataSamples.openSamplePackage("Simple.xlsb");
-
-        // XSSF Workbook gives helpful error
-        try {
-            new XSSFWorkbook(pkg).close();
-            fail(".xlsb files not supported");
-        } catch (XLSBUnsupportedException e) {
-            // Good, detected and warned
-        }
-
-        // Workbook Factory gives helpful error on package
-        try {
-            WorkbookFactory.create(pkg).close();
-            fail(".xlsb files not supported");
-        } catch (XLSBUnsupportedException e) {
-            // Good, detected and warned
-        }
-
-        // Workbook Factory gives helpful error on file
-        File xlsbFile = HSSFTestDataSamples.getSampleFile("Simple.xlsb");
-        try {
-            WorkbookFactory.create(xlsbFile).close();
-            fail(".xlsb files not supported");
-        } catch (XLSBUnsupportedException e) {
-            // Good, detected and warned
-        }
-        
-        pkg.close();
-    }
-
-    private void checkValue(XSSFWorkbook excel, String expect) {
-        XSSFFormulaEvaluator evaluator = new XSSFFormulaEvaluator(excel);
-        evaluator.evaluateAll();
-
-        XSSFCell cell = excel.getSheetAt(0).getRow(1).getCell(1);
-        CellValue value = evaluator.evaluate(cell);
-
-        assertEquals(expect, value.formatAsString());
-    }
-
-    @Test
-    public void testBug57196() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57196.xlsx");
-        Sheet sheet = wb.getSheet("Feuil1");
-        Row mod=sheet.getRow(1);
-        mod.getCell(1).setCellValue(3);
-        HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-//        FileOutputStream fileOutput = new FileOutputStream("/tmp/57196.xlsx");
-//        wb.write(fileOutput);
-//        fileOutput.close();
-        wb.close();
-    }
-
-    @Test
-    public void test57196_Detail() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet("Sheet1");
-        XSSFRow row = sheet.createRow(0);
-        XSSFCell cell = row.createCell(0);
-        cell.setCellFormula("DEC2HEX(HEX2DEC(O8)-O2+D2)");
-        XSSFFormulaEvaluator fe = new XSSFFormulaEvaluator(wb);
-        CellValue cv = fe.evaluate(cell);
-
-        assertNotNull(cv);
-        wb.close();
-    }
-
-    @Test
-    public void test57196_Detail2() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet("Sheet1");
-        XSSFRow row = sheet.createRow(0);
-        XSSFCell cell = row.createCell(0);
-        cell.setCellFormula("DEC2HEX(O2+D2)");
-        XSSFFormulaEvaluator fe = new XSSFFormulaEvaluator(wb);
-        CellValue cv = fe.evaluate(cell);
-
-        assertNotNull(cv);
-        wb.close();
-    }
-
-    @Test
-    public void test57196_WorkbookEvaluator() throws IOException {
-        String previousLogger = System.getProperty("org.apache.poi.util.POILogger");
-        //System.setProperty("org.apache.poi.util.POILogger", "org.apache.poi.util.SystemOutLogger");
-        //System.setProperty("poi.log.level", "3");
-        try {
-            XSSFWorkbook wb = new XSSFWorkbook();
-            XSSFSheet sheet = wb.createSheet("Sheet1");
-            XSSFRow row = sheet.createRow(0);
-            XSSFCell cell = row.createCell(0);
-            cell.setCellValue("0");
-            cell = row.createCell(1);
-            cell.setCellValue(0);
-            cell = row.createCell(2);
-            cell.setCellValue(0);
-
-            // simple formula worked
-            cell.setCellFormula("DEC2HEX(O2+D2)");
-
-            WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(XSSFEvaluationWorkbook.create(wb), null, null);
-            workbookEvaluator.setDebugEvaluationOutputForNextEval(true);
-            workbookEvaluator.evaluate(new XSSFEvaluationCell(cell));
-
-            // this already failed! Hex2Dec did not correctly handle RefEval
-            cell.setCellFormula("HEX2DEC(O8)");
-            workbookEvaluator.clearAllCachedResultValues();
-
-            workbookEvaluator = new WorkbookEvaluator(XSSFEvaluationWorkbook.create(wb), null, null);
-            workbookEvaluator.setDebugEvaluationOutputForNextEval(true);
-            workbookEvaluator.evaluate(new XSSFEvaluationCell(cell));
-
-            // slightly more complex one failed
-            cell.setCellFormula("HEX2DEC(O8)-O2+D2");
-            workbookEvaluator.clearAllCachedResultValues();
-
-            workbookEvaluator = new WorkbookEvaluator(XSSFEvaluationWorkbook.create(wb), null, null);
-            workbookEvaluator.setDebugEvaluationOutputForNextEval(true);
-            workbookEvaluator.evaluate(new XSSFEvaluationCell(cell));
-
-            // more complicated failed
-            cell.setCellFormula("DEC2HEX(HEX2DEC(O8)-O2+D2)");
-            workbookEvaluator.clearAllCachedResultValues();
-
-            workbookEvaluator.setDebugEvaluationOutputForNextEval(true);
-            workbookEvaluator.evaluate(new XSSFEvaluationCell(cell));
-
-            // what other similar functions
-            cell.setCellFormula("DEC2BIN(O8)-O2+D2");
-            workbookEvaluator.clearAllCachedResultValues();
-
-            workbookEvaluator = new WorkbookEvaluator(XSSFEvaluationWorkbook.create(wb), null, null);
-            workbookEvaluator.setDebugEvaluationOutputForNextEval(true);
-            workbookEvaluator.evaluate(new XSSFEvaluationCell(cell));
-
-            // what other similar functions
-            cell.setCellFormula("DEC2BIN(A1)");
-            workbookEvaluator.clearAllCachedResultValues();
-
-            workbookEvaluator = new WorkbookEvaluator(XSSFEvaluationWorkbook.create(wb), null, null);
-            workbookEvaluator.setDebugEvaluationOutputForNextEval(true);
-            workbookEvaluator.evaluate(new XSSFEvaluationCell(cell));
-
-            // what other similar functions
-            cell.setCellFormula("BIN2DEC(B1)");
-            workbookEvaluator.clearAllCachedResultValues();
-
-            workbookEvaluator = new WorkbookEvaluator(XSSFEvaluationWorkbook.create(wb), null, null);
-            workbookEvaluator.setDebugEvaluationOutputForNextEval(true);
-            workbookEvaluator.evaluate(new XSSFEvaluationCell(cell));
-            
-            wb.close();
-        } finally {
-            if(previousLogger == null) {
-                System.clearProperty("org.apache.poi.util.POILogger");
-            } else {
-                System.setProperty("org.apache.poi.util.POILogger", previousLogger);
-            }
-            System.clearProperty("poi.log.level");
-        }
-    }
-
-    /**
-     * A .xlsx file with no Shared Strings table should open fine
-     *  in read-only mode
-     */
-    @SuppressWarnings("resource")
-    @Test
-    public void bug57482() throws IOException, InvalidFormatException {
-        for (PackageAccess access : new PackageAccess[] {
-                PackageAccess.READ_WRITE, PackageAccess.READ
-        }) {
-            File file = HSSFTestDataSamples.getSampleFile("57482-OnlyNumeric.xlsx");
-            OPCPackage pkg = OPCPackage.open(file, access);
-            try {
-                // Try to open it and read the contents
-                XSSFWorkbook wb1 = new XSSFWorkbook(pkg);
-                assertNotNull(wb1.getSharedStringSource());
-                assertEquals(0, wb1.getSharedStringSource().getCount());
-
-                DataFormatter fmt = new DataFormatter();
-                XSSFSheet s = wb1.getSheetAt(0);
-                assertEquals("1",  fmt.formatCellValue(s.getRow(0).getCell(0)));
-                assertEquals("11", fmt.formatCellValue(s.getRow(0).getCell(1)));
-                assertEquals("5",  fmt.formatCellValue(s.getRow(4).getCell(0)));
-
-                // Add a text cell
-                s.getRow(0).createCell(3).setCellValue("Testing");
-                assertEquals("Testing",  fmt.formatCellValue(s.getRow(0).getCell(3)));
-
-                // Try to write-out and read again, should only work
-                //  in read-write mode, not read-only mode
-                XSSFWorkbook wb2 = null;
-                try {
-                    wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-                    if (access == PackageAccess.READ) {
-                        fail("Shouln't be able to write from read-only mode");
-                    }
-
-                    // Check again
-                    s = wb2.getSheetAt(0);
-                    assertEquals("1",  fmt.formatCellValue(s.getRow(0).getCell(0)));
-                    assertEquals("11", fmt.formatCellValue(s.getRow(0).getCell(1)));
-                    assertEquals("5",  fmt.formatCellValue(s.getRow(4).getCell(0)));
-                    assertEquals("Testing",  fmt.formatCellValue(s.getRow(0).getCell(3)));
-                
-                } catch (InvalidOperationException e) {
-                    if (access == PackageAccess.READ_WRITE) {
-                        // Shouldn't occur in write-mode
-                        throw e;
-                    }
-                } finally {
-                    if (wb2 != null) {
-                        wb2.getPackage().revert();
-                    }
-                }
-                
-                wb1.getPackage().revert();
-            } finally {
-                pkg.revert();
-            }
-        }
-    }
-
-    /**
-     * "Unknown error type: -60" fetching formula error value
-     */
-    @Test
-    public void bug57535() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57535.xlsx");
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        evaluator.clearAllCachedResultValues();
-
-        Sheet sheet = wb.getSheet("Sheet1");
-        Cell cell = sheet.getRow(5).getCell(4);
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("E4+E5", cell.getCellFormula());
-
-        CellValue value = evaluator.evaluate(cell);
-        assertEquals(CellType.ERROR, value.getCellTypeEnum());
-        assertEquals(-60, value.getErrorValue());
-        assertEquals("~CIRCULAR~REF~", FormulaError.forInt(value.getErrorValue()).getString());
-        assertEquals("CIRCULAR_REF", FormulaError.forInt(value.getErrorValue()).toString());
-        
-        wb.close();
-    }
-
-
-    @Test
-    public void test57165() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57171_57163_57165.xlsx");
-        try {
-            removeAllSheetsBut(3, wb);
-            wb.cloneSheet(0); // Throws exception here
-            wb.setSheetName(1, "New Sheet");
-            //saveWorkbook(wb, fileName);
-
-            XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-            wbBack.close();
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void test57165_create() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57171_57163_57165.xlsx");
-        try {
-            removeAllSheetsBut(3, wb);
-            wb.createSheet("newsheet"); // Throws exception here
-            wb.setSheetName(1, "New Sheet");
-            //saveWorkbook(wb, fileName);
-
-            XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-            wbBack.close();
-        } finally {
-            wb.close();
-        }
-    }
-
-    private static void removeAllSheetsBut(int sheetIndex, Workbook wb)
-    {
-        int sheetNb = wb.getNumberOfSheets();
-        // Move this sheet at the first position
-        wb.setSheetOrder(wb.getSheetName(sheetIndex), 0);
-        for (int sn = sheetNb - 1; sn > 0; sn--)
-        {
-            wb.removeSheetAt(sn);
-        }
-    }
-
-    /**
-     * Sums 2 plus the cell at the left, indirectly to avoid reference
-     * problems when deleting columns, conditionally to stop recursion
-     */
-    private static final String FORMULA1 =
-            "IF( INDIRECT( ADDRESS( ROW(), COLUMN()-1 ) ) = 0, 0,"
-                    + "INDIRECT( ADDRESS( ROW(), COLUMN()-1 ) ) ) + 2";
-
-    /**
-     * Sums 2 plus the upper cell, indirectly to avoid reference
-     * problems when deleting rows, conditionally to stop recursion
-     */
-    private static final String FORMULA2 =
-            "IF( INDIRECT( ADDRESS( ROW()-1, COLUMN() ) ) = 0, 0,"
-                    + "INDIRECT( ADDRESS( ROW()-1, COLUMN() ) ) ) + 2";
-
-    /**
-     * Expected:
-
-     * [  0][  2][  4]
-     */
-    @Test
-    public void testBug56820_Formula1() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        try {
-            FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-            Sheet sh = wb.createSheet();
-
-            sh.createRow(0).createCell(0).setCellValue(0.0d);
-            Cell formulaCell1 = sh.getRow(0).createCell(1);
-            Cell formulaCell2 = sh.getRow(0).createCell(2);
-            formulaCell1.setCellFormula(FORMULA1);
-            formulaCell2.setCellFormula(FORMULA1);
-
-            double A1 = evaluator.evaluate(formulaCell1).getNumberValue();
-            double A2 = evaluator.evaluate(formulaCell2).getNumberValue();
-
-            assertEquals(2, A1, 0);
-            assertEquals(4, A2, 0);  //<-- FAILS EXPECTATIONS
-        } finally {
-            wb.close();
-        }
-    }
-
-    /**
-     * Expected:
-
-     * [  0] <- number
-     * [  2] <- formula
-     * [  4] <- formula
-     */
-    @Test
-    public void testBug56820_Formula2() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        try {
-            FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-            Sheet sh = wb.createSheet();
-
-            sh.createRow(0).createCell(0).setCellValue(0.0d);
-            Cell formulaCell1 = sh.createRow(1).createCell(0);
-            Cell formulaCell2 = sh.createRow(2).createCell(0);
-            formulaCell1.setCellFormula(FORMULA2);
-            formulaCell2.setCellFormula(FORMULA2);
-
-            double A1 = evaluator.evaluate(formulaCell1).getNumberValue();
-            double A2 = evaluator.evaluate(formulaCell2).getNumberValue(); //<-- FAILS EVALUATION
-
-            assertEquals(2, A1, 0);
-            assertEquals(4, A2, 0);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void test56467() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("picture.xlsx");
-        try {
-            Sheet orig = wb.getSheetAt(0);
-            assertNotNull(orig);
-
-            Sheet sheet = wb.cloneSheet(0);
-            Drawing drawing = sheet.createDrawingPatriarch();
-            for (XSSFShape shape : ((XSSFDrawing) drawing).getShapes()) {
-                if (shape instanceof XSSFPicture) {
-                    XSSFPictureData pictureData = ((XSSFPicture) shape).getPictureData();
-                    assertNotNull(pictureData);
-                }
-            }
-
-        } finally {
-        	wb.close();
-        }
-    }
-
-    /**
-     * OOXML-Strict files
-     * Not currently working - namespace mis-match from XMLBeans
-     */
-    @Test
-    @Ignore("XMLBeans namespace mis-match on ooxml-strict files")
-    public void test57699() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("sample.strict.xlsx");
-        assertEquals(3, wb.getNumberOfSheets());
-        // TODO Check sheet contents
-        // TODO Check formula evaluation
-
-        XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertEquals(3, wbBack.getNumberOfSheets());
-        // TODO Re-check sheet contents
-        // TODO Re-check formula evaluation
-        
-        wb.close();
-        wbBack.close();
-    }
-
-    @Test
-    public void testBug56295_MergeXlslsWithStyles() throws IOException {
-        XSSFWorkbook xlsToAppendWorkbook = XSSFTestDataSamples.openSampleWorkbook("56295.xlsx");
-        XSSFSheet sheet = xlsToAppendWorkbook.getSheetAt(0);
-        XSSFRow srcRow = sheet.getRow(0);
-        XSSFCell oldCell = srcRow.getCell(0);
-        XSSFCellStyle cellStyle = oldCell.getCellStyle();
-
-        checkStyle(cellStyle);
-
-//        StylesTable table = xlsToAppendWorkbook.getStylesSource();
-//        List<XSSFCellFill> fills = table.getFills();
-//        System.out.println("Having " + fills.size() + " fills");
-//        for(XSSFCellFill fill : fills) {
-//        	System.out.println("Fill: " + fill.getFillBackgroundColor() + "/" + fill.getFillForegroundColor());
-//        }
-        xlsToAppendWorkbook.close();
-
-        XSSFWorkbook targetWorkbook = new XSSFWorkbook();
-        XSSFSheet newSheet = targetWorkbook.createSheet(sheet.getSheetName());
-        XSSFRow destRow = newSheet.createRow(0);
-        XSSFCell newCell = destRow.createCell(0);
-
-		//newCell.getCellStyle().cloneStyleFrom(cellStyle);
-        CellStyle newCellStyle = targetWorkbook.createCellStyle();
-        newCellStyle.cloneStyleFrom(cellStyle);
-        newCell.setCellStyle(newCellStyle);
-		checkStyle(newCell.getCellStyle());
-        newCell.setCellValue(oldCell.getStringCellValue());
-
-//        OutputStream os = new FileOutputStream("output.xlsm");
-//        try {
-//        	targetWorkbook.write(os);
-//        } finally {
-//        	os.close();
-//        }
-
-        XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(targetWorkbook);
-        XSSFCellStyle styleBack = wbBack.getSheetAt(0).getRow(0).getCell(0).getCellStyle();
-        checkStyle(styleBack);
-        
-        targetWorkbook.close();
-        wbBack.close();
-    }
-
-    /**
-     * Paragraph with property BuFont but none of the properties
-     *  BuNone, BuChar, and BuAutoNum, used to trigger a NPE
-     * Excel treats this as not-bulleted, so now do we
-     */
-    @Test
-    public void testBug57826() throws IOException {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("57826.xlsx");
-
-        assertTrue("no sheets in workbook", workbook.getNumberOfSheets() >= 1);
-        XSSFSheet sheet = workbook.getSheetAt(0);
-
-        XSSFDrawing drawing = sheet.getDrawingPatriarch();
-        assertNotNull(drawing);
-
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(1, shapes.size());
-        assertTrue(shapes.get(0) instanceof XSSFSimpleShape);
-
-        XSSFSimpleShape shape = (XSSFSimpleShape)shapes.get(0);
-
-        // Used to throw a NPE
-        String text = shape.getText();
-
-        // No bulleting info included
-        assertEquals("test ok", text);
-        
-        workbook.close();
-    }
-
-	private void checkStyle(XSSFCellStyle cellStyle) {
-		assertNotNull(cellStyle);
-        assertEquals(0, cellStyle.getFillForegroundColor());
-        assertNotNull(cellStyle.getFillForegroundXSSFColor());
-        XSSFColor fgColor = cellStyle.getFillForegroundColorColor();
-		assertNotNull(fgColor);
-		assertEquals("FF00FFFF", fgColor.getARGBHex());
-
-        assertEquals(0, cellStyle.getFillBackgroundColor());
-        assertNotNull(cellStyle.getFillBackgroundXSSFColor());
-        XSSFColor bgColor = cellStyle.getFillBackgroundColorColor();
-		assertNotNull(bgColor);
-		assertEquals("FF00FFFF", fgColor.getARGBHex());
-	}
-
-    @Test
-    public void bug57642() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet s = wb.createSheet("TestSheet");
-        XSSFCell c = s.createRow(0).createCell(0);
-        c.setCellFormula("ISERROR(TestSheet!A1)");
-        c = s.createRow(1).createCell(1);
-        c.setCellFormula("ISERROR(B2)");
-
-        wb.setSheetName(0, "CSN");
-        c = s.getRow(0).getCell(0);
-        assertEquals("ISERROR(CSN!A1)", c.getCellFormula());
-        c = s.getRow(1).getCell(1);
-        assertEquals("ISERROR(B2)", c.getCellFormula());
-
-        wb.close();
-    }
-
-    /**
-     * .xlsx supports 64000 cell styles, the style indexes after
-     *  32,767 must not be -32,768, then -32,767, -32,766
-     */
-    @SuppressWarnings("resource")
-    @Test
-    public void bug57880() throws IOException {
-        int numStyles = 33000;
-        XSSFWorkbook wb = new XSSFWorkbook();
-        for (int i=1; i<numStyles; i++) {
-            // Create a style and use it
-            XSSFCellStyle style = wb.createCellStyle();
-            assertEquals(i, style.getUIndex());
-        }
-        assertEquals(numStyles, wb.getNumCellStyles());
-
-        // avoid OOM in gump run
-        File file = XSSFTestDataSamples.writeOutAndClose(wb, "bug57880");
-        //noinspection UnusedAssignment
-        wb = null;
-        // Garbage collection may happen here
-        
-        // avoid zip bomb detection
-        double ratio = ZipSecureFile.getMinInflateRatio();
-        ZipSecureFile.setMinInflateRatio(0.00005);
-        wb = XSSFTestDataSamples.readBackAndDelete(file);
-        ZipSecureFile.setMinInflateRatio(ratio);
-
-        //Assume identical cell styles aren't consolidated
-        //If XSSFWorkbooks ever implicitly optimize/consolidate cell styles (such as when the workbook is written to disk)
-        //then this unit test should be updated
-        assertEquals(numStyles, wb.getNumCellStyles());
-        for (int i=1; i<numStyles; i++) {
-            XSSFCellStyle style = wb.getCellStyleAt(i);
-            assertNotNull(style);
-            assertEquals(i, style.getUIndex());
-        }
-        wb.close();
-    }
-
-
-    @Test
-    public void test56574() throws IOException {
-        runTest56574(false);
-        runTest56574(true);
-    }
-
-    private void runTest56574(boolean createRow) throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56574.xlsx");
-
-        Sheet sheet = wb.getSheet("Func");
-        assertNotNull(sheet);
-
-        Map<String, Object[]> data;
-        data = new TreeMap<String, Object[]>();
-        data.put("1", new Object[] {"ID", "NAME", "LASTNAME"});
-        data.put("2", new Object[] {2, "Amit", "Shukla"});
-        data.put("3", new Object[] {1, "Lokesh", "Gupta"});
-        data.put("4", new Object[] {4, "John", "Adwards"});
-        data.put("5", new Object[] {2, "Brian", "Schultz"});
-
-        int rownum = 1;
-        for (Map.Entry<String,Object[]> me : data.entrySet()) {
-            final Row row;
-            if(createRow) {
-                row = sheet.createRow(rownum++);
-            } else {
-                row = sheet.getRow(rownum++);
-            }
-            assertNotNull(row);
-
-            int cellnum = 0;
-            for (Object obj : me.getValue()) {
-                Cell cell = row.getCell(cellnum);
-                if(cell == null){
-                    cell = row.createCell(cellnum);
-                } else {
-                    if(cell.getCellTypeEnum() == CellType.FORMULA) {
-                        cell.setCellFormula(null);
-                        cell.getCellStyle().setDataFormat((short) 0);
-                    }
-                }
-               if(obj instanceof String) {
-                    cell.setCellValue((String)obj);
-               } else if(obj instanceof Integer) {
-                    cell.setCellValue((Integer)obj);
-               }
-               cellnum++;
-            }
-        }
-
-        XSSFFormulaEvaluator.evaluateAllFormulaCells((XSSFWorkbook) wb);
-        wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-
-        CalculationChain chain = ((XSSFWorkbook)wb).getCalculationChain();
-        for(CTCalcCell calc : chain.getCTCalcChain().getCList()) {
-            // A2 to A6 should be gone
-            assertFalse(calc.getR().equals("A2"));
-            assertFalse(calc.getR().equals("A3"));
-            assertFalse(calc.getR().equals("A4"));
-            assertFalse(calc.getR().equals("A5"));
-            assertFalse(calc.getR().equals("A6"));
-        }
-
-        Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        Sheet sheetBack = wbBack.getSheet("Func");
-        assertNotNull(sheetBack);
-
-        chain = ((XSSFWorkbook)wbBack).getCalculationChain();
-        for(CTCalcCell calc : chain.getCTCalcChain().getCList()) {
-            // A2 to A6 should be gone
-            assertFalse(calc.getR().equals("A2"));
-            assertFalse(calc.getR().equals("A3"));
-            assertFalse(calc.getR().equals("A4"));
-            assertFalse(calc.getR().equals("A5"));
-            assertFalse(calc.getR().equals("A6"));
-        }
-
-        wbBack.close();
-        wb.close();
-    }
-
-    /**
-     * Excel 2007 generated Macro-Enabled .xlsm file
-     */
-    @Test
-    public void bug57181() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57181.xlsm");
-        assertEquals(9, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    @Test
-    public void bug52111() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("Intersection-52111-xssf.xlsx");
-        Sheet s = wb.getSheetAt(0);
-        assertFormula(wb, s.getRow(2).getCell(0), "(C2:D3 D3:E4)", "4.0");
-        assertFormula(wb, s.getRow(6).getCell(0), "Tabelle2!E:E Tabelle2!11:11", "5.0");
-        assertFormula(wb, s.getRow(8).getCell(0), "Tabelle2!E:F Tabelle2!11:12", null);
-        wb.close();
-    }
-
-    private void assertFormula(Workbook wb, Cell intF, String expectedFormula, String expectedResultOrNull) {
-        assertEquals(CellType.FORMULA, intF.getCellTypeEnum());
-        if (null == expectedResultOrNull) {
-            assertEquals(CellType.ERROR, intF.getCachedFormulaResultTypeEnum());
-            expectedResultOrNull = "#VALUE!";
-        }
-        else {
-            assertEquals(CellType.NUMERIC, intF.getCachedFormulaResultTypeEnum());
-        }
-
-        assertEquals(expectedFormula, intF.getCellFormula());
-
-        // Check we can evaluate it correctly
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals(expectedResultOrNull, eval.evaluate(intF).formatAsString());
-    }
-
-    @Test
-    public void test48962() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("48962.xlsx");
-        Sheet sh = wb.getSheetAt(0);
-        Row row = sh.getRow(1);
-        Cell cell = row.getCell(0);
-
-        CellStyle style = cell.getCellStyle();
-        assertNotNull(style);
-
-        // color index
-        assertEquals(64, style.getFillBackgroundColor());
-        XSSFColor color = ((XSSFCellStyle)style).getFillBackgroundXSSFColor();
-        assertNotNull(color);
-
-        // indexed color
-        assertEquals(64, color.getIndexed());
-        assertEquals(64, color.getIndex());
-
-        // not an RGB color
-        assertFalse(color.isRGB());
-        assertNull(color.getRGB());
-        wb.close();
-    }
-
-    @Test
-    public void test50755_workday_formula_example() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("50755_workday_formula_example.xlsx");
-        Sheet sheet = wb.getSheet("Sheet1");
-        for(Row aRow : sheet) {
-            Cell cell = aRow.getCell(1);
-            if(cell.getCellTypeEnum() == CellType.FORMULA) {
-                String formula = cell.getCellFormula();
-                //System.out.println("formula: " + formula);
-                assertNotNull(formula);
-                assertTrue(formula.contains("WORKDAY"));
-            } else {
-                assertNotNull(cell.toString());
-            }
-        }
-        wb.close();
-    }
-
-    @Test
-    public void test51626() throws IOException, InvalidFormatException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("51626.xlsx");
-        assertNotNull(wb);
-        wb.close();
-
-        InputStream stream = HSSFTestDataSamples.openSampleFileStream("51626.xlsx");
-        wb = WorkbookFactory.create(stream);
-        stream.close();
-        wb.close();
-
-        wb = XSSFTestDataSamples.openSampleWorkbook("51626_contact.xlsx");
-        assertNotNull(wb);
-        wb.close();
-
-        stream = HSSFTestDataSamples.openSampleFileStream("51626_contact.xlsx");
-        wb = WorkbookFactory.create(stream);
-        stream.close();
-        wb.close();
-    }
-
-    @Test
-    public void test51451() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sh = wb.createSheet();
-
-        Row row = sh.createRow(0);
-        Cell cell = row.createCell(0);
-        cell.setCellValue(239827342);
-
-        CellStyle style = wb.createCellStyle();
-        //style.setHidden(false);
-        DataFormat excelFormat = wb.createDataFormat();
-        style.setDataFormat(excelFormat.getFormat("#,##0"));
-        sh.setDefaultColumnStyle(0, style);
-
-//        FileOutputStream out = new FileOutputStream("/tmp/51451.xlsx");
-//        wb.write(out);
-//        out.close();
-
-        wb.close();
-    }
-
-    @Test
-    public void test53105() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("53105.xlsx");
-        assertNotNull(wb);
-
-
-        // Act
-        // evaluate SUM('Skye Lookup Input'!A4:XFD4), cells in range each contain "1"
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        double numericValue = evaluator.evaluate(wb.getSheetAt(0).getRow(1).getCell(0)).getNumberValue();
-
-        // Assert
-        assertEquals(16384.0, numericValue, 0.0);
-
-        wb.close();
-    }
-
-
-    @Test
-    public void test58315() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("58315.xlsx");
-        Cell cell = wb.getSheetAt(0).getRow(0).getCell(0);
-        assertNotNull(cell);
-        StringBuilder tmpCellContent = new StringBuilder(cell.getStringCellValue());
-        XSSFRichTextString richText = (XSSFRichTextString) cell.getRichStringCellValue();
-
-        for (int i = richText.length() - 1; i >= 0; i--) {
-            Font f = richText.getFontAtIndex(i);
-            if (f != null && f.getStrikeout()) {
-                tmpCellContent.deleteCharAt(i);
-            }
-        }
-        String result = tmpCellContent.toString();
-        assertEquals("320 350", result);
-
-        wb.close();
-    }
-
-    @Test
-    public void test55406() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("55406_Conditional_formatting_sample.xlsx");
-        Sheet sheet = wb.getSheetAt(0);
-        Cell cellA1 = sheet.getRow(0).getCell(0);
-        Cell cellA2 = sheet.getRow(1).getCell(0);
-        
-        assertEquals(0, cellA1.getCellStyle().getFillForegroundColor());
-        assertEquals("FFFDFDFD", ((XSSFColor)cellA1.getCellStyle().getFillForegroundColorColor()).getARGBHex());
-        assertEquals(0, cellA2.getCellStyle().getFillForegroundColor());
-        assertEquals("FFFDFDFD", ((XSSFColor)cellA2.getCellStyle().getFillForegroundColorColor()).getARGBHex());
-        
-        SheetConditionalFormatting cond = sheet.getSheetConditionalFormatting();
-        assertEquals(2, cond.getNumConditionalFormattings());
-
-        assertEquals(1, cond.getConditionalFormattingAt(0).getNumberOfRules());
-        assertEquals(64, cond.getConditionalFormattingAt(0).getRule(0).getPatternFormatting().getFillForegroundColor());
-        assertEquals("ISEVEN(ROW())", cond.getConditionalFormattingAt(0).getRule(0).getFormula1());
-        assertNull(((XSSFColor)cond.getConditionalFormattingAt(0).getRule(0).getPatternFormatting().getFillForegroundColorColor()).getARGBHex());
-
-        assertEquals(1, cond.getConditionalFormattingAt(1).getNumberOfRules());
-        assertEquals(64, cond.getConditionalFormattingAt(1).getRule(0).getPatternFormatting().getFillForegroundColor()); 
-        assertEquals("ISEVEN(ROW())", cond.getConditionalFormattingAt(1).getRule(0).getFormula1());
-        assertNull(((XSSFColor)cond.getConditionalFormattingAt(1).getRule(0).getPatternFormatting().getFillForegroundColorColor()).getARGBHex()); 
-        
-        wb.close();
-    }
-
-    @Test
-    public void test51998() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("51998.xlsx");
-        
-        Set<String> sheetNames = new HashSet<String>();
-        
-        for (int sheetNum = 0; sheetNum < wb.getNumberOfSheets(); sheetNum++)
-        {
-            sheetNames.add(wb.getSheetName(sheetNum));
-        }
-        
-        for (String sheetName : sheetNames)
-        {
-            int sheetIndex = wb.getSheetIndex(sheetName);
-            
-            wb.removeSheetAt(sheetIndex);
-            
-            Sheet newSheet = wb.createSheet();
-            //Sheet newSheet = wb.createSheet(sheetName);
-            int newSheetIndex = wb.getSheetIndex(newSheet);
-            //System.out.println(newSheetIndex);
-            wb.setSheetName(newSheetIndex, sheetName);
-            wb.setSheetOrder(sheetName, sheetIndex);
-        }
-        
-        Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        
-        assertNotNull(wbBack);
-        wbBack.close();
-    }
-    
-    @Test
-    public void test58731() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("58731.xlsx");
-        Sheet sheet = wb.createSheet("Java Books");
-        
-        Object[][] bookData = {
-                {"Head First Java", "Kathy Serria", 79},
-                {"Effective Java", "Joshua Bloch", 36},
-                {"Clean Code", "Robert martin", 42},
-                {"Thinking in Java", "Bruce Eckel", 35},
-        };
- 
-        int rowCount = 0;
-        for (Object[] aBook : bookData) {
-            Row row = sheet.createRow(rowCount++);
-             
-            int columnCount = 0;
-            for (Object field : aBook) {
-                Cell cell = row.createCell(columnCount++);
-                if (field instanceof String) {
-                    cell.setCellValue((String) field);
-                } else if (field instanceof Integer) {
-                    cell.setCellValue((Integer) field);
-                }
-            }
-        }
-        
-        Workbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb2.getSheet("Java Books");
-        assertNotNull(sheet.getRow(0));
-        assertNotNull(sheet.getRow(0).getCell(0));
-        assertEquals(bookData[0][0], sheet.getRow(0).getCell(0).getStringCellValue());
-        
-        wb2.close();
-        wb.close();
-    }
-    
-    /**
-     * Regression between 3.10.1 and 3.13 - 
-     * org.apache.poi.openxml4j.exceptions.InvalidFormatException: 
-     * The part /xl/sharedStrings.xml does not have any content type 
-     * ! Rule: Package require content types when retrieving a part from a package. [M.1.14]
-     */
-    @Test
-    public void test58760() throws IOException {
-        Workbook wb1 = XSSFTestDataSamples.openSampleWorkbook("58760.xlsx");
-        assertEquals(1, wb1.getNumberOfSheets());
-        assertEquals("Sheet1", wb1.getSheetName(0));
-        Workbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        assertEquals(1, wb2.getNumberOfSheets());
-        assertEquals("Sheet1", wb2.getSheetName(0));
-        wb2.close();
-        wb1.close();
-    }
-
-    @Test
-    public void test57236() throws IOException {
-        // Having very small numbers leads to different formatting, Excel uses the scientific notation, but POI leads to "0"
-        
-        /*
-        DecimalFormat format = new DecimalFormat("#.##########", new DecimalFormatSymbols(Locale.getDefault()));
-        double d = 3.0E-104;
-        assertEquals("3.0E-104", format.format(d));
-         */
-        
-        DataFormatter formatter = new DataFormatter(true);
-
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57236.xlsx");
-        for(int sheetNum = 0;sheetNum < wb.getNumberOfSheets();sheetNum++) {
-            Sheet sheet = wb.getSheetAt(sheetNum);
-            for(int rowNum = sheet.getFirstRowNum();rowNum < sheet.getLastRowNum();rowNum++) {
-                Row row = sheet.getRow(rowNum);
-                for(int cellNum = row.getFirstCellNum();cellNum < row.getLastCellNum();cellNum++) {
-                    Cell cell = row.getCell(cellNum);
-                    String fmtCellValue = formatter.formatCellValue(cell);
-                    
-                    System.out.println("Cell: " + fmtCellValue);
-                    assertNotNull(fmtCellValue);
-                    assertFalse(fmtCellValue.equals("0"));
-                }
-            }
-        }
-        
-        wb.close();
-    }
-
-    private void createXls() throws IOException
-    {
-        Workbook workbook = new HSSFWorkbook();
-        FileOutputStream fileOut = new FileOutputStream("/tmp/rotated.xls");
-        Sheet sheet1 = workbook.createSheet();
-        Row row1 = sheet1.createRow((short) 0);
-
-        Cell cell1 = row1.createCell(0);
-
-        cell1.setCellValue("Successful rotated text.");
-
-        CellStyle style = workbook.createCellStyle();
-        style.setRotation((short) -90);
-
-        cell1.setCellStyle(style);
-
-        workbook.write(fileOut);
-        fileOut.close();
-        workbook.close();
-    }
-
-    private void createXlsx() throws IOException {
-        Workbook workbook = new XSSFWorkbook();
-        FileOutputStream fileOut = new FileOutputStream("/tmp/rotated.xlsx");
-        Sheet sheet1 = workbook.createSheet();
-        Row row1 = sheet1.createRow((short) 0);
-
-        Cell cell1 = row1.createCell(0);
-
-        cell1.setCellValue("Unsuccessful rotated text.");
-
-        CellStyle style = workbook.createCellStyle();
-        style.setRotation((short) -90);
-
-        cell1.setCellStyle(style);
-
-        workbook.write(fileOut);
-        fileOut.close();
-        workbook.close();
-    }
-
-    @Ignore("Creates files for checking results manually, actual values are tested in Test*CellStyle")
-    @Test
-    public void test58043() throws IOException {
-        createXls();
-        createXlsx();
-    }
-
-    @Test
-    public void test59132() throws IOException {
-        Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("59132.xlsx");
-        Sheet worksheet = workbook.getSheet("sheet1");
-
-        // B3
-        Row row = worksheet.getRow(2);
-        Cell cell = row.getCell(1);
-
-        cell.setCellValue((String)null);
-
-        FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-
-        // B3
-        row = worksheet.getRow(2);
-        cell = row.getCell(1);
-
-        assertEquals(CellType.BLANK, cell.getCellTypeEnum());
-        assertEquals(CellType._NONE, evaluator.evaluateFormulaCellEnum(cell));
-
-        // A3
-        row = worksheet.getRow(2);
-        cell = row.getCell(0);
-
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("IF(ISBLANK(B3),\"\",B3)", cell.getCellFormula());
-        assertEquals(CellType.STRING, evaluator.evaluateFormulaCellEnum(cell));
-        CellValue value = evaluator.evaluate(cell);
-        assertEquals("", value.getStringValue());
-
-        // A5
-        row = worksheet.getRow(4);
-        cell = row.getCell(0);
-
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("COUNTBLANK(A1:A4)", cell.getCellFormula());
-        assertEquals(CellType.NUMERIC, evaluator.evaluateFormulaCellEnum(cell));
-        value = evaluator.evaluate(cell);
-        assertEquals(1.0, value.getNumberValue(), 0.1);
-
-        /*FileOutputStream output = new FileOutputStream("C:\\temp\\59132.xlsx");
-        try {
-            workbook.write(output);
-        } finally {
-            output.close();
-        }*/
-
-        workbook.close();
-    }
-    
-    @Ignore("bug 59442")
-    @Test
-    public void testSetRGBBackgroundColor() throws IOException {
-
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFCell cell = workbook.createSheet().createRow(0).createCell(0);
-
-        XSSFColor color = new XSSFColor(java.awt.Color.RED);
-        XSSFCellStyle style = workbook.createCellStyle();
-        style.setFillForegroundColor(color);
-        style.setFillPattern(XSSFCellStyle.SOLID_FOREGROUND);
-        cell.setCellStyle(style);
-
-        // Everything is fine at this point, cell is red
-
-        Map<String, Object> properties = new HashMap<String, Object>();
-        properties.put(CellUtil.BORDER_BOTTOM, CellStyle.BORDER_THIN); //or BorderStyle.THIN
-        CellUtil.setCellStyleProperties(cell, properties);
-        
-        // Now the cell is all black
-        XSSFColor actual = cell.getCellStyle().getFillBackgroundColorColor();
-        assertNotNull(actual);
-        assertEquals(color.getARGBHex(), actual.getARGBHex());
-        
-        XSSFWorkbook nwb = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        workbook.close();
-        XSSFCell ncell = nwb.getSheetAt(0).getRow(0).getCell(0);
-        XSSFColor ncolor = new XSSFColor(java.awt.Color.RED);
-
-        // Now the cell is all black
-        XSSFColor nactual = ncell.getCellStyle().getFillBackgroundColorColor();
-        assertNotNull(nactual);
-        assertEquals(ncolor.getARGBHex(), nactual.getARGBHex());
-        
-        nwb.close();
-    }
-
-    @Ignore("currently fails on POI 3.15 beta 2")
-    @Test
-    public void test55273() {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("ExcelTables.xlsx");
-        Sheet sheet = wb.getSheet("ExcelTable");
-
-        Name name = wb.getName("TableAsRangeName");
-        assertEquals("TableName[#All]", name.getRefersToFormula());
-        // POI 3.15-beta 2 (2016-06-15): getSheetName throws IllegalArgumentException: Invalid CellReference: TableName[#All]
-        assertEquals("TableName", name.getSheetName());
-
-        XSSFSheet xsheet = (XSSFSheet) sheet;
-        List<XSSFTable> tables = xsheet.getTables();
-        assertEquals(2, tables.size()); //FIXME: how many tables are there in this spreadsheet?
-        assertEquals("Table1", tables.get(0).getName()); //FIXME: what is the table name?
-        assertEquals("Table2", tables.get(1).getName()); //FIXME: what is the table name?
-    }
-    
-    @Test
-    public void test57523() {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57523.xlsx");
-        Sheet sheet = wb.getSheet("Attribute Master");
-        Row row = sheet.getRow(15);
-
-        int N = CellReference.convertColStringToIndex("N");
-        Cell N16 = row.getCell(N);
-        assertEquals(500.0, N16.getNumericCellValue(), 0.00001);
-        
-        int P = CellReference.convertColStringToIndex("P");
-        Cell P16 = row.getCell(P);
-        assertEquals(10.0, P16.getNumericCellValue(), 0.00001);
-    }
-    
-    /**
-     * Files produced by some scientific equipment neglect
-     *  to include the row number on the row tags
-     */
-    @Test
-    public void noRowNumbers59746() {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("59746_NoRowNums.xlsx");
-        Sheet sheet = wb.getSheetAt(0);
-        assertTrue("Last row num: "+sheet.getLastRowNum(), sheet.getLastRowNum()>20);
-        assertEquals("Checked", sheet.getRow(0).getCell(0).getStringCellValue());
-        assertEquals("Checked", sheet.getRow(9).getCell(2).getStringCellValue());
-        assertEquals(false, sheet.getRow(70).getCell(8).getBooleanCellValue());
-        assertEquals(71, sheet.getPhysicalNumberOfRows());
-        assertEquals(70, sheet.getLastRowNum());
-        assertEquals(70, sheet.getRow(sheet.getLastRowNum()).getRowNum());
-    }
-
-    @Test
-    public void testWorkdayFunction() throws IOException {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("59106.xlsx");
-        XSSFSheet sheet = workbook.getSheet("Test");
-        Row row = sheet.getRow(1);
-        Cell cell = row.getCell(0);
-        DataFormatter form = new DataFormatter();
-        FormulaEvaluator evaluator = cell.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
-        String result = form.formatCellValue(cell, evaluator);
-
-        assertEquals("09 Mar 2016", result);
-    }
-    
-    // This bug is currently open. When this bug is fixed, it should not throw an AssertionError
-    @Test(expected=AssertionError.class)
-    public void test55076_collapseColumnGroups() throws Exception {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        
-        // this column collapsing bug only occurs when the grouped columns are different widths
-        sheet.setColumnWidth(1, 400);
-        sheet.setColumnWidth(2, 600);
-        sheet.setColumnWidth(3, 800);
-        
-        assertEquals(400, sheet.getColumnWidth(1));
-        assertEquals(600, sheet.getColumnWidth(2));
-        assertEquals(800, sheet.getColumnWidth(3));
-        
-        sheet.groupColumn(1, 3);
-        sheet.setColumnGroupCollapsed(1, true);
-        
-        assertEquals(0, sheet.getColumnOutlineLevel(0));
-        assertEquals(1, sheet.getColumnOutlineLevel(1));
-        assertEquals(1, sheet.getColumnOutlineLevel(2));
-        assertEquals(1, sheet.getColumnOutlineLevel(3));
-        assertEquals(0, sheet.getColumnOutlineLevel(4));
-        
-        // none of the columns should be hidden
-        // column group collapsing is a different concept
-        for (int c=0; c<5; c++) {
-            assertFalse("Column " + c, sheet.isColumnHidden(c));
-        }
-        
-        assertEquals(400, sheet.getColumnWidth(1));
-        assertEquals(600, sheet.getColumnWidth(2));
-        assertEquals(800, sheet.getColumnWidth(3));
-        
-        wb.close();
-    }
-    
-    /**
-     * Other things, including charts, may end up taking drawing part
-     *  numbers. (Uses a test file hand-crafted with an extra non-drawing
-     *  part with a part number)
-     */
-    @Test
-    public void drawingNumbersAlreadyTaken_60255() throws Exception {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("60255_extra_drawingparts.xlsx");
-        assertEquals(4, wb.getNumberOfSheets());
-        
-        // Sheet 3 starts with a drawing
-        Sheet sheet = wb.getSheetAt(0);
-        assertNull(sheet.getDrawingPatriarch());
-        sheet = wb.getSheetAt(1);
-        assertNull(sheet.getDrawingPatriarch());
-        sheet = wb.getSheetAt(2);
-        assertNotNull(sheet.getDrawingPatriarch());
-        sheet = wb.getSheetAt(3);
-        assertNull(sheet.getDrawingPatriarch());
-        
-        // Add another sheet, and give it a drawing
-        sheet = wb.createSheet();
-        assertNull(sheet.getDrawingPatriarch());
-        sheet.createDrawingPatriarch();
-        assertNotNull(sheet.getDrawingPatriarch());
-        
-        // Save and check
-        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertEquals(5, wb.getNumberOfSheets());
-        
-        // Sheets 3 and 5 now
-        sheet = wb.getSheetAt(0);
-        assertNull(sheet.getDrawingPatriarch());
-        sheet = wb.getSheetAt(1);
-        assertNull(sheet.getDrawingPatriarch());
-        sheet = wb.getSheetAt(2);
-        assertNotNull(sheet.getDrawingPatriarch());
-        sheet = wb.getSheetAt(3);
-        assertNull(sheet.getDrawingPatriarch());
-        sheet = wb.getSheetAt(4);
-        assertNotNull(sheet.getDrawingPatriarch());
-    }
-
-    @Test
-    public void test53611() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("test");
-        Row row = sheet.createRow(1);
-        Cell cell = row.createCell(1);
-        cell.setCellValue("blabla");
-
-        row = sheet.createRow(4);
-        cell = row.createCell(7);
-        cell.setCellValue("blabla");
-
-        // we currently only populate the dimension during writing out
-        // to avoid having to iterate all rows/cells in each add/remove of a row or cell
-        //OutputStream str = new FileOutputStream("/tmp/53611.xlsx");
-        OutputStream str = new ByteArrayOutputStream();
-        try {
-            wb.write(str);
-        } finally {
-            str.close();
-        }
-
-        assertEquals("B2:I5", ((XSSFSheet)sheet).getCTWorksheet().getDimension().getRef());
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
deleted file mode 100644
index bbca662..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
+++ /dev/null
@@ -1,667 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.BaseTestXCell;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellCopyPolicy;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.SharedStringsTable;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellType;
-
-public final class TestXSSFCell extends BaseTestXCell {
-
-    public TestXSSFCell() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    /**
-     * Bug 47026: trouble changing cell type when workbook doesn't contain
-     * Shared String Table
-     */
-    @Test
-    public void test47026_1() throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook("47026.xlsm");
-        Sheet sheet = wb.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell(0);
-        cell.setCellType(CellType.STRING);
-        cell.setCellValue("456");
-        wb.close();
-    }
-
-    @Test
-    public void test47026_2() throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook("47026.xlsm");
-        Sheet sheet = wb.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell(0);
-        cell.setCellFormula(null);
-        cell.setCellValue("456");
-        wb.close();
-    }
-
-    /**
-     * Test that we can read inline strings that are expressed directly in the cell definition
-     * instead of implementing the shared string table.
-     *
-     * Some programs, for example, Microsoft Excel Driver for .xlsx insert inline string
-     * instead of using the shared string table. See bug 47206
-     */
-    @Test
-    public void testInlineString() throws IOException {
-        XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("xlsx-jdbc.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-        XSSFRow row = sheet.getRow(1);
-
-        XSSFCell cell_0 = row.getCell(0);
-        assertEquals(STCellType.INT_INLINE_STR, cell_0.getCTCell().getT().intValue());
-        assertTrue(cell_0.getCTCell().isSetIs());
-        assertEquals("A Very large string in column 1 AAAAAAAAAAAAAAAAAAAAA", cell_0.getStringCellValue());
-
-        XSSFCell cell_1 = row.getCell(1);
-        assertEquals(STCellType.INT_INLINE_STR, cell_1.getCTCell().getT().intValue());
-        assertTrue(cell_1.getCTCell().isSetIs());
-        assertEquals("foo", cell_1.getStringCellValue());
-
-        XSSFCell cell_2 = row.getCell(2);
-        assertEquals(STCellType.INT_INLINE_STR, cell_2.getCTCell().getT().intValue());
-        assertTrue(cell_2.getCTCell().isSetIs());
-        assertEquals("bar", row.getCell(2).getStringCellValue());
-        wb.close();
-    }
-
-    /**
-     *  Bug 47278 -  xsi:nil attribute for <t> tag caused Excel 2007 to fail to open workbook
-     */
-    @Test
-    public void test47278() throws IOException {
-        XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        SharedStringsTable sst = wb.getSharedStringSource();
-        assertEquals(0, sst.getCount());
-
-        //case 1. cell.setCellValue(new XSSFRichTextString((String)null));
-        Cell cell_0 = row.createCell(0);
-        RichTextString str = new XSSFRichTextString((String)null);
-        assertNull(str.getString());
-        cell_0.setCellValue(str);
-        assertEquals(0, sst.getCount());
-        assertEquals(CellType.BLANK, cell_0.getCellTypeEnum());
-
-        //case 2. cell.setCellValue((String)null);
-        Cell cell_1 = row.createCell(1);
-        cell_1.setCellValue((String)null);
-        assertEquals(0, sst.getCount());
-        assertEquals(CellType.BLANK, cell_1.getCellTypeEnum());
-        wb.close();
-    }
-
-    @Test
-    public void testFormulaString() throws IOException {
-        XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.createWorkbook();
-        try {
-            XSSFCell cell = wb.createSheet().createRow(0).createCell(0);
-            CTCell ctCell = cell.getCTCell(); //low-level bean holding cell's xml
-    
-            cell.setCellFormula("A2");
-            assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-            assertEquals("A2", cell.getCellFormula());
-            //the value is not set and cell's type='N' which means blank
-            assertEquals(STCellType.N, ctCell.getT());
-    
-            //set cached formula value
-            cell.setCellValue("t='str'");
-            //we are still of 'formula' type
-            assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-            assertEquals("A2", cell.getCellFormula());
-            //cached formula value is set and cell's type='STR'
-            assertEquals(STCellType.STR, ctCell.getT());
-            assertEquals("t='str'", cell.getStringCellValue());
-    
-            //now remove the formula, the cached formula result remains
-            cell.setCellFormula(null);
-            assertEquals(CellType.STRING, cell.getCellTypeEnum());
-            assertEquals(STCellType.STR, ctCell.getT());
-            //the line below failed prior to fix of Bug #47889
-            assertEquals("t='str'", cell.getStringCellValue());
-    
-            //revert to a blank cell
-            cell.setCellValue((String)null);
-            assertEquals(CellType.BLANK, cell.getCellTypeEnum());
-            assertEquals(STCellType.N, ctCell.getT());
-            assertEquals("", cell.getStringCellValue());
-        } finally {
-            wb.close();
-        }
-    }
-
-    /**
-     * Bug 47889: problems when calling XSSFCell.getStringCellValue() on a workbook created in Gnumeric
-     */
-    @Test
-    public void test47889() throws IOException {
-        XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("47889.xlsx");
-        XSSFSheet sh = wb.getSheetAt(0);
-
-        XSSFCell cell;
-
-        //try a string cell
-        cell = sh.getRow(0).getCell(0);
-        assertEquals(CellType.STRING, cell.getCellTypeEnum());
-        assertEquals("a", cell.getStringCellValue());
-        assertEquals("a", cell.toString());
-        //Gnumeric produces spreadsheets without styles
-        //make sure we return null for that instead of throwing OutOfBounds
-        assertEquals(null, cell.getCellStyle());
-
-        //try a numeric cell
-        cell = sh.getRow(1).getCell(0);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals(1.0, cell.getNumericCellValue(), 0);
-        assertEquals("1.0", cell.toString());
-        //Gnumeric produces spreadsheets without styles
-        //make sure we return null for that instead of throwing OutOfBounds
-        assertEquals(null, cell.getCellStyle());
-        wb.close();
-    }
-
-    @Test
-    public void testMissingRAttribute() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet();
-        XSSFRow row = sheet.createRow(0);
-        XSSFCell a1 = row.createCell(0);
-        a1.setCellValue("A1");
-        XSSFCell a2 = row.createCell(1);
-        a2.setCellValue("B1");
-        XSSFCell a4 = row.createCell(4);
-        a4.setCellValue("E1");
-        XSSFCell a6 = row.createCell(5);
-        a6.setCellValue("F1");
-
-        assertCellsWithMissingR(row);
-
-        a2.getCTCell().unsetR();
-        a6.getCTCell().unsetR();
-
-        assertCellsWithMissingR(row);
-
-        XSSFWorkbook wb2 = (XSSFWorkbook)_testDataProvider.writeOutAndReadBack(wb1);
-        row = wb2.getSheetAt(0).getRow(0);
-        assertCellsWithMissingR(row);
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    private void assertCellsWithMissingR(XSSFRow row){
-        XSSFCell a1 = row.getCell(0);
-        assertNotNull(a1);
-        XSSFCell a2 = row.getCell(1);
-        assertNotNull(a2);
-        XSSFCell a5 = row.getCell(4);
-        assertNotNull(a5);
-        XSSFCell a6 = row.getCell(5);
-        assertNotNull(a6);
-
-        assertEquals(6, row.getLastCellNum());
-        assertEquals(4, row.getPhysicalNumberOfCells());
-
-        assertEquals("A1", a1.getStringCellValue());
-        assertEquals("B1", a2.getStringCellValue());
-        assertEquals("E1", a5.getStringCellValue());
-        assertEquals("F1", a6.getStringCellValue());
-
-        // even if R attribute is not set,
-        // POI is able to re-construct it from column and row indexes
-        assertEquals("A1", a1.getReference());
-        assertEquals("B1", a2.getReference());
-        assertEquals("E1", a5.getReference());
-        assertEquals("F1", a6.getReference());
-    }
-
-    @Test
-    public void testMissingRAttributeBug54288() throws IOException {
-        // workbook with cells missing the R attribute
-        XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("54288.xlsx");
-        // same workbook re-saved in Excel 2010, the R attribute is updated for every cell with the right value.
-        XSSFWorkbook wbRef = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("54288-ref.xlsx");
-
-        XSSFSheet sheet = wb.getSheetAt(0);
-        XSSFSheet sheetRef = wbRef.getSheetAt(0);
-        assertEquals(sheetRef.getPhysicalNumberOfRows(), sheet.getPhysicalNumberOfRows());
-
-        // Test idea: iterate over cells in the reference worksheet, they all have the R attribute set.
-        // For each cell from the reference sheet find the corresponding cell in the problematic file (with missing R)
-        // and assert that POI reads them equally:
-        DataFormatter formater = new DataFormatter();
-        for(Row r : sheetRef){
-            XSSFRow rowRef = (XSSFRow)r;
-            XSSFRow row = sheet.getRow(rowRef.getRowNum());
-
-            assertEquals("number of cells in row["+row.getRowNum()+"]",
-                    rowRef.getPhysicalNumberOfCells(), row.getPhysicalNumberOfCells());
-
-            for(Cell c :  rowRef){
-                XSSFCell cellRef = (XSSFCell)c;
-                XSSFCell cell = row.getCell(cellRef.getColumnIndex());
-
-                assertEquals(cellRef.getColumnIndex(), cell.getColumnIndex());
-                assertEquals(cellRef.getReference(), cell.getReference());
-
-                if(!cell.getCTCell().isSetR()){
-                    assertTrue("R must e set in cellRef", cellRef.getCTCell().isSetR());
-
-                    String valRef = formater.formatCellValue(cellRef);
-                    String val = formater.formatCellValue(cell);
-                    assertEquals(valRef, val);
-                }
-
-            }
-        }
-        wbRef.close();
-        wb.close();
-    }
-    
-    @Test
-    public void test56170() throws IOException {
-        final Workbook wb1 = XSSFTestDataSamples.openSampleWorkbook("56170.xlsx");
-        final XSSFSheet sheet = (XSSFSheet) wb1.getSheetAt(0);
-
-        Workbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        Cell cell;
-        
-        // add some contents to table so that the table will need expansion
-        Row row = sheet.getRow(0);
-        Workbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        cell = row.createCell(0);
-        Workbook wb4 = XSSFTestDataSamples.writeOutAndReadBack(wb3);
-        cell.setCellValue("demo1");
-        Workbook wb5 = XSSFTestDataSamples.writeOutAndReadBack(wb4);
-        cell = row.createCell(1);
-        Workbook wb6 = XSSFTestDataSamples.writeOutAndReadBack(wb5);
-        cell.setCellValue("demo2");
-        Workbook wb7 = XSSFTestDataSamples.writeOutAndReadBack(wb6);
-        cell = row.createCell(2);
-        Workbook wb8 = XSSFTestDataSamples.writeOutAndReadBack(wb7);
-        cell.setCellValue("demo3");
-
-        Workbook wb9 = XSSFTestDataSamples.writeOutAndReadBack(wb8);
-        
-        row = sheet.getRow(1);
-        cell = row.createCell(0);
-        cell.setCellValue("demo1");
-        cell = row.createCell(1);
-        cell.setCellValue("demo2");
-        cell = row.createCell(2);
-        cell.setCellValue("demo3");
-
-        Workbook wb10 = XSSFTestDataSamples.writeOutAndReadBack(wb9);
-        
-        // expand table
-        XSSFTable table = sheet.getTables().get(0);
-        final CellReference startRef = table.getStartCellReference();
-        final CellReference endRef = table.getEndCellReference();
-        table.getCTTable().setRef(new CellRangeAddress(startRef.getRow(), 1, startRef.getCol(), endRef.getCol()).formatAsString());
-
-        Workbook wb11 = XSSFTestDataSamples.writeOutAndReadBack(wb10);
-        assertNotNull(wb11);
-
-        wb11.close();
-        wb10.close();
-        wb9.close();
-        wb8.close();
-        wb7.close();
-        wb6.close();
-        wb5.close();
-        wb4.close();
-        wb3.close();
-        wb2.close();
-        wb1.close();
-    }
-    
-    @Test
-    public void test56170Reproduce() throws IOException {
-        final Workbook wb = new XSSFWorkbook();
-        try {
-            final Sheet sheet = wb.createSheet();
-            Row row = sheet.createRow(0);
-            
-            // by creating Cells out of order we trigger the handling in onDocumentWrite()
-            Cell cell1 = row.createCell(1);
-            Cell cell2 = row.createCell(0);
-    
-            validateRow(row);
-            
-            validateRow(row);
-    
-            // once again with removing one cell
-            row.removeCell(cell1);
-    
-            validateRow(row);
-    
-            // once again with removing one cell
-            row.removeCell(cell1);
-    
-            // now check again
-            validateRow(row);
-    
-            // once again with removing one cell
-            row.removeCell(cell2);
-    
-            // now check again
-            validateRow(row);
-        } finally {
-            wb.close();
-        }
-    }
-
-    private void validateRow(Row row) {
-        // trigger bug with CArray handling
-        ((XSSFRow)row).onDocumentWrite();
-        
-        for(Cell cell : row) {
-            assertNotNull(cell.toString());
-        }
-    }    
-
-    @Test
-    public void testBug56644ReturnNull() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56644.xlsx");
-        try {
-            wb.setMissingCellPolicy(MissingCellPolicy.RETURN_BLANK_AS_NULL);
-            Sheet sheet = wb.getSheet("samplelist");
-            Row row = sheet.getRow(20);
-            row.createCell(2);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testBug56644ReturnBlank() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56644.xlsx");
-        try {
-            wb.setMissingCellPolicy(MissingCellPolicy.RETURN_NULL_AND_BLANK);
-            Sheet sheet = wb.getSheet("samplelist");
-            Row row = sheet.getRow(20);
-            row.createCell(2);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testBug56644CreateBlank() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56644.xlsx");
-        try {
-            wb.setMissingCellPolicy(MissingCellPolicy.CREATE_NULL_AS_BLANK);
-            Sheet sheet = wb.getSheet("samplelist");
-            Row row = sheet.getRow(20);
-            row.createCell(2);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testEncodingBelowAscii() throws IOException {
-        StringBuilder sb = new StringBuilder();
-        // test all possible characters
-        for(int i = 0; i < Character.MAX_VALUE; i++) {
-        	sb.append((char)i);
-        }
-
-        String strAll = sb.toString();
-
-        // process in chunks as we have a limit on size of column now
-        int pos = 0;
-        while(pos < strAll.length()) {
-        	String str = strAll.substring(pos, Math.min(strAll.length(), pos+SpreadsheetVersion.EXCEL2007.getMaxTextLength()));
-
-            Workbook wb = HSSFITestDataProvider.instance.createWorkbook();
-            Cell cell = wb.createSheet().createRow(0).createCell(0);
-
-            Workbook xwb = XSSFITestDataProvider.instance.createWorkbook();
-            Cell xCell = xwb.createSheet().createRow(0).createCell(0);
-
-            Workbook swb = SXSSFITestDataProvider.instance.createWorkbook();
-            Cell sCell = swb.createSheet().createRow(0).createCell(0);
-
-        	cell.setCellValue(str);
-        	assertEquals(str, cell.getStringCellValue());
-        	xCell.setCellValue(str);
-        	assertEquals(str, xCell.getStringCellValue());
-        	sCell.setCellValue(str);
-        	assertEquals(str, sCell.getStringCellValue());
-
-        	Workbook wbBack = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        	Workbook xwbBack = XSSFITestDataProvider.instance.writeOutAndReadBack(xwb);
-        	Workbook swbBack = SXSSFITestDataProvider.instance.writeOutAndReadBack(swb);
-        	cell = wbBack.getSheetAt(0).createRow(0).createCell(0);
-        	xCell = xwbBack.getSheetAt(0).createRow(0).createCell(0);
-        	sCell = swbBack.getSheetAt(0).createRow(0).createCell(0);
-
-        	assertEquals(cell.getStringCellValue(), xCell.getStringCellValue());
-        	assertEquals(cell.getStringCellValue(), sCell.getStringCellValue());
-
-        	pos += SpreadsheetVersion.EXCEL97.getMaxTextLength();
-
-        	swbBack.close();
-        	xwbBack.close();
-        	wbBack.close();
-        	swb.close();
-        	xwb.close();
-        	wb.close();
-        }
-    }
-
-    private XSSFCell srcCell, destCell; //used for testCopyCellFrom_CellCopyPolicy
-    
-    @Test
-    public final void testCopyCellFrom_CellCopyPolicy_default() {
-        setUp_testCopyCellFrom_CellCopyPolicy();
-        
-        // default copy policy
-        final CellCopyPolicy policy = new CellCopyPolicy();
-        destCell.copyCellFrom(srcCell, policy);
-        
-        assertEquals(CellType.FORMULA, destCell.getCellTypeEnum());
-        assertEquals("2+3", destCell.getCellFormula());
-        assertEquals(srcCell.getCellStyle(), destCell.getCellStyle());
-    }
-    
-    @Test
-    public final void testCopyCellFrom_CellCopyPolicy_value() {
-        setUp_testCopyCellFrom_CellCopyPolicy();
-        
-        // Paste values only
-        final CellCopyPolicy policy = new CellCopyPolicy.Builder().cellFormula(false).build();
-        destCell.copyCellFrom(srcCell, policy);
-        assertEquals(CellType.NUMERIC, destCell.getCellTypeEnum());
-    }
-    
-    @Test
-    public final void testCopyCellFrom_CellCopyPolicy_formulaWithUnregisteredUDF() {
-        setUp_testCopyCellFrom_CellCopyPolicy();
-        
-        srcCell.setCellFormula("MYFUNC2(123, $A5, Sheet1!$B7)");
-        
-        // Copy formula verbatim (no shifting). This is okay because copyCellFrom is Internal.
-        // Users should use higher-level copying functions to row- or column-shift formulas.
-        final CellCopyPolicy policy = new CellCopyPolicy.Builder().cellFormula(true).build();
-        destCell.copyCellFrom(srcCell, policy);
-        assertEquals("MYFUNC2(123, $A5, Sheet1!$B7)", destCell.getCellFormula());
-    }
-    
-    @Test
-    public final void testCopyCellFrom_CellCopyPolicy_style() {
-        setUp_testCopyCellFrom_CellCopyPolicy();
-        srcCell.setCellValue((String) null);
-        
-        // Paste styles only
-        final CellCopyPolicy policy = new CellCopyPolicy.Builder().cellValue(false).build();
-        destCell.copyCellFrom(srcCell, policy);
-        assertEquals(srcCell.getCellStyle(), destCell.getCellStyle());
-        
-        // Old cell value should not have been overwritten
-        assertNotEquals(CellType.BLANK, destCell.getCellTypeEnum());
-        assertEquals(CellType.BOOLEAN, destCell.getCellTypeEnum());
-        assertEquals(true, destCell.getBooleanCellValue());
-    }
-    
-    @Test
-    public final void testCopyCellFrom_CellCopyPolicy_copyHyperlink() throws IOException {
-        setUp_testCopyCellFrom_CellCopyPolicy();
-        final Workbook wb = srcCell.getSheet().getWorkbook();
-        final CreationHelper createHelper = wb.getCreationHelper();
-
-        srcCell.setCellValue("URL LINK");
-        Hyperlink link = createHelper.createHyperlink(HyperlinkType.URL);
-        link.setAddress("http://poi.apache.org/");
-        srcCell.setHyperlink(link);
-
-        // Set link cell style (optional)
-        CellStyle hlinkStyle = wb.createCellStyle();
-        Font hlinkFont = wb.createFont();
-        hlinkFont.setUnderline(Font.U_SINGLE);
-        hlinkFont.setColor(IndexedColors.BLUE.getIndex());
-        hlinkStyle.setFont(hlinkFont);
-        srcCell.setCellStyle(hlinkStyle);
-
-        // Copy hyperlink
-        final CellCopyPolicy policy = new CellCopyPolicy.Builder().copyHyperlink(true).mergeHyperlink(false).build();
-        destCell.copyCellFrom(srcCell, policy);
-        assertNotNull(destCell.getHyperlink());
-
-        assertSame("unit test assumes srcCell and destCell are on the same sheet",
-                srcCell.getSheet(), destCell.getSheet());
-
-        final List<XSSFHyperlink> links = srcCell.getSheet().getHyperlinkList();
-        assertEquals("number of hyperlinks on sheet", 2, links.size());
-        assertEquals("source hyperlink",
-                new CellReference(srcCell).formatAsString(), links.get(0).getCellRef());
-        assertEquals("destination hyperlink",
-                new CellReference(destCell).formatAsString(), links.get(1).getCellRef());
-        
-        wb.close();
-    }
-    
-    @Test
-    public final void testCopyCellFrom_CellCopyPolicy_mergeHyperlink() throws IOException {
-        setUp_testCopyCellFrom_CellCopyPolicy();
-        final Workbook wb = srcCell.getSheet().getWorkbook();
-        final CreationHelper createHelper = wb.getCreationHelper();
-
-        srcCell.setCellValue("URL LINK");
-        Hyperlink link = createHelper.createHyperlink(HyperlinkType.URL);
-        link.setAddress("http://poi.apache.org/");
-        destCell.setHyperlink(link);
-
-        // Set link cell style (optional)
-        CellStyle hlinkStyle = wb.createCellStyle();
-        Font hlinkFont = wb.createFont();
-        hlinkFont.setUnderline(Font.U_SINGLE);
-        hlinkFont.setColor(IndexedColors.BLUE.getIndex());
-        hlinkStyle.setFont(hlinkFont);
-        destCell.setCellStyle(hlinkStyle);
-        
-        // Pre-condition assumptions. This test is broken if either of these fail.
-        assertSame("unit test assumes srcCell and destCell are on the same sheet",
-                srcCell.getSheet(), destCell.getSheet());
-        assertNull(srcCell.getHyperlink());
-
-        // Merge hyperlink - since srcCell doesn't have a hyperlink, destCell's hyperlink is not overwritten (cleared).
-        final CellCopyPolicy policy = new CellCopyPolicy.Builder().mergeHyperlink(true).copyHyperlink(false).build();
-        destCell.copyCellFrom(srcCell, policy);
-        assertNull(srcCell.getHyperlink());
-        assertNotNull(destCell.getHyperlink());
-        assertSame(link, destCell.getHyperlink());
-
-        List<XSSFHyperlink> links;
-        links = srcCell.getSheet().getHyperlinkList();
-        assertEquals("number of hyperlinks on sheet", 1, links.size());
-        assertEquals("source hyperlink",
-                new CellReference(destCell).formatAsString(), links.get(0).getCellRef());
-        
-        // Merge destCell's hyperlink to srcCell. Since destCell does have a hyperlink, this should copy destCell's hyperlink to srcCell.
-        srcCell.copyCellFrom(destCell, policy);
-        assertNotNull(srcCell.getHyperlink());
-        assertNotNull(destCell.getHyperlink());
-        
-        links = srcCell.getSheet().getHyperlinkList();
-        assertEquals("number of hyperlinks on sheet", 2, links.size());
-        assertEquals("dest hyperlink",
-                new CellReference(destCell).formatAsString(), links.get(0).getCellRef());
-        assertEquals("source hyperlink",
-                new CellReference(srcCell).formatAsString(), links.get(1).getCellRef());
-        
-        wb.close();
-    }
-    
-    private void setUp_testCopyCellFrom_CellCopyPolicy() {
-        @SuppressWarnings("resource")
-        final XSSFWorkbook wb = new XSSFWorkbook();
-        final XSSFRow row = wb.createSheet("Sheet1").createRow(0);
-        srcCell = row.createCell(0);
-        destCell = row.createCell(1);
-        
-        srcCell.setCellFormula("2+3");
-        
-        final CellStyle style = wb.createCellStyle();
-        style.setBorderTop(BorderStyle.THICK);
-        style.setFillBackgroundColor((short) 5);
-        srcCell.setCellStyle(style);
-        
-        destCell.setCellValue(true);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
deleted file mode 100644
index c907d40..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
+++ /dev/null
@@ -1,1065 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellFill;
-import org.junit.Before;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellXfs;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STHorizontalAlignment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STVerticalAlignment;
-
-public class TestXSSFCellStyle {
-	private StylesTable stylesTable;
-	private CTBorder ctBorderA;
-	private CTFill ctFill;
-	private CTFont ctFont;
-	private CTXf cellStyleXf;
-	private CTXf cellXf;
-	private CTCellXfs cellXfs;
-	private XSSFCellStyle cellStyle;
-	private CTStylesheet ctStylesheet;
-
-	@Before
-	public void setUp() {
-		stylesTable = new StylesTable();
-
-		ctStylesheet = stylesTable.getCTStylesheet();
-
-		ctBorderA = CTBorder.Factory.newInstance();
-		XSSFCellBorder borderA = new XSSFCellBorder(ctBorderA);
-		long borderId = stylesTable.putBorder(borderA);
-		assertEquals(1, borderId);
-
-		XSSFCellBorder borderB = new XSSFCellBorder();
-		assertEquals(1, stylesTable.putBorder(borderB));
-
-		ctFill = CTFill.Factory.newInstance();
-		XSSFCellFill fill = new XSSFCellFill(ctFill);
-		long fillId = stylesTable.putFill(fill);
-		assertEquals(2, fillId);
-
-		ctFont = CTFont.Factory.newInstance();
-		XSSFFont font = new XSSFFont(ctFont);
-		long fontId = stylesTable.putFont(font);
-		assertEquals(1, fontId);
-
-		cellStyleXf = ctStylesheet.addNewCellStyleXfs().addNewXf();
-		cellStyleXf.setBorderId(1);
-		cellStyleXf.setFillId(1);
-		cellStyleXf.setFontId(1);
-
-		cellXfs = ctStylesheet.addNewCellXfs();
-		cellXf = cellXfs.addNewXf();
-		cellXf.setXfId(1);
-		cellXf.setBorderId(1);
-		cellXf.setFillId(1);
-		cellXf.setFontId(1);
-		stylesTable.putCellStyleXf(cellStyleXf);
-		stylesTable.putCellXf(cellXf);
-		cellStyle = new XSSFCellStyle(1, 1, stylesTable, null);
-
-		assertNotNull(stylesTable.getFillAt(1).getCTFill().getPatternFill());
-		assertEquals(STPatternType.INT_DARK_GRAY, stylesTable.getFillAt(1).getCTFill().getPatternFill().getPatternType().intValue());
-	}
-
-	@Test
-	public void testGetSetBorderBottom() {
-        //default values
-        assertEquals(BorderStyle.NONE, cellStyle.getBorderBottomEnum());
-
-        int num = stylesTable.getBorders().size();
-        cellStyle.setBorderBottom(BorderStyle.MEDIUM);
-        assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderBottomEnum());
-        //a new border has been added
-        assertEquals(num + 1, stylesTable.getBorders().size());
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(STBorderStyle.MEDIUM, ctBorder.getBottom().getStyle());
-
-        num = stylesTable.getBorders().size();
-        //setting the same border multiple times should not change borderId
-        for (int i = 0; i < 3; i++) {
-            cellStyle.setBorderBottom(BorderStyle.MEDIUM);
-            assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderBottomEnum());
-        }
-        assertEquals(borderId, cellStyle.getCoreXf().getBorderId());
-        assertEquals(num, stylesTable.getBorders().size());
-        assertSame(ctBorder, stylesTable.getBorderAt(borderId).getCTBorder());
-
-        //setting border to none removes the <bottom> element
-        cellStyle.setBorderBottom(BorderStyle.NONE);
-        assertEquals(num, stylesTable.getBorders().size());
-        borderId = (int)cellStyle.getCoreXf().getBorderId();
-        ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertFalse(ctBorder.isSetBottom());
-    }
-
-	@Test
-    public void testGetSetBorderRight() {
-        //default values
-        assertEquals(BorderStyle.NONE, cellStyle.getBorderRightEnum());
-
-        int num = stylesTable.getBorders().size();
-        cellStyle.setBorderRight(BorderStyle.MEDIUM);
-        assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderRightEnum());
-        //a new border has been added
-        assertEquals(num + 1, stylesTable.getBorders().size());
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(STBorderStyle.MEDIUM, ctBorder.getRight().getStyle());
-
-        num = stylesTable.getBorders().size();
-        //setting the same border multiple times should not change borderId
-        for (int i = 0; i < 3; i++) {
-            cellStyle.setBorderRight(BorderStyle.MEDIUM);
-            assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderRightEnum());
-        }
-        assertEquals(borderId, cellStyle.getCoreXf().getBorderId());
-        assertEquals(num, stylesTable.getBorders().size());
-        assertSame(ctBorder, stylesTable.getBorderAt(borderId).getCTBorder());
-
-        //setting border to none removes the <right> element
-        cellStyle.setBorderRight(BorderStyle.NONE);
-        assertEquals(num, stylesTable.getBorders().size());
-        borderId = (int)cellStyle.getCoreXf().getBorderId();
-        ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertFalse(ctBorder.isSetRight());
-    }
-
-	@Test
-    public void testGetSetBorderLeft() {
-        //default values
-        assertEquals(BorderStyle.NONE, cellStyle.getBorderLeftEnum());
-
-        int num = stylesTable.getBorders().size();
-        cellStyle.setBorderLeft(BorderStyle.MEDIUM);
-        assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderLeftEnum());
-        //a new border has been added
-        assertEquals(num + 1, stylesTable.getBorders().size());
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(STBorderStyle.MEDIUM, ctBorder.getLeft().getStyle());
-
-        num = stylesTable.getBorders().size();
-        //setting the same border multiple times should not change borderId
-        for (int i = 0; i < 3; i++) {
-            cellStyle.setBorderLeft(BorderStyle.MEDIUM);
-            assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderLeftEnum());
-        }
-        assertEquals(borderId, cellStyle.getCoreXf().getBorderId());
-        assertEquals(num, stylesTable.getBorders().size());
-        assertSame(ctBorder, stylesTable.getBorderAt(borderId).getCTBorder());
-
-        //setting border to none removes the <left> element
-        cellStyle.setBorderLeft(BorderStyle.NONE);
-        assertEquals(num, stylesTable.getBorders().size());
-        borderId = (int)cellStyle.getCoreXf().getBorderId();
-        ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertFalse(ctBorder.isSetLeft());
-	}
-
-	@Test
-    public void testGetSetBorderTop() {
-        //default values
-        assertEquals(BorderStyle.NONE, cellStyle.getBorderTopEnum());
-
-        int num = stylesTable.getBorders().size();
-        cellStyle.setBorderTop(BorderStyle.MEDIUM);
-        assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderTopEnum());
-        //a new border has been added
-        assertEquals(num + 1, stylesTable.getBorders().size());
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(STBorderStyle.MEDIUM, ctBorder.getTop().getStyle());
-
-        num = stylesTable.getBorders().size();
-        //setting the same border multiple times should not change borderId
-        for (int i = 0; i < 3; i++) {
-            cellStyle.setBorderTop(BorderStyle.MEDIUM);
-            assertEquals(BorderStyle.MEDIUM, cellStyle.getBorderTopEnum());
-        }
-        assertEquals(borderId, cellStyle.getCoreXf().getBorderId());
-        assertEquals(num, stylesTable.getBorders().size());
-        assertSame(ctBorder, stylesTable.getBorderAt(borderId).getCTBorder());
-
-        //setting border to none removes the <top> element
-        cellStyle.setBorderTop(BorderStyle.NONE);
-        assertEquals(num, stylesTable.getBorders().size());
-        borderId = (int)cellStyle.getCoreXf().getBorderId();
-        ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertFalse(ctBorder.isSetTop());
-    }
-    
-    private void testGetSetBorderXMLBean(BorderStyle border, STBorderStyle.Enum expected) {
-        cellStyle.setBorderTop(border);
-        assertEquals(border, cellStyle.getBorderTopEnum());
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(expected, ctBorder.getTop().getStyle());
-    }
-    
-    
-    // Border Styles, in BorderStyle/STBorderStyle enum order
-    @Test
-    public void testGetSetBorderNone() {
-        cellStyle.setBorderTop(BorderStyle.NONE);
-        assertEquals(BorderStyle.NONE, cellStyle.getBorderTopEnum());
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertNull(ctBorder.getTop());
-        // no border style and STBorderStyle.NONE are equivalent
-        // POI prefers to unset the border style than explicitly set it STBorderStyle.NONE
-    }
-
-    @Test
-    public void testGetSetBorderThin() {
-        testGetSetBorderXMLBean(BorderStyle.THIN, STBorderStyle.THIN);
-    }
-    
-    @Test
-    public void testGetSetBorderMedium() {
-        testGetSetBorderXMLBean(BorderStyle.MEDIUM, STBorderStyle.MEDIUM);
-    }
-    
-    @Test
-    public void testGetSetBorderDashed() {
-        testGetSetBorderXMLBean(BorderStyle.DASHED, STBorderStyle.DASHED);
-    }
-    
-    @Test
-    public void testGetSetBorderDotted() {
-        testGetSetBorderXMLBean(BorderStyle.DOTTED, STBorderStyle.DOTTED);
-    }
-    
-    @Test
-    public void testGetSetBorderThick() {
-        testGetSetBorderXMLBean(BorderStyle.THICK, STBorderStyle.THICK);
-    }
-    
-    @Test
-    public void testGetSetBorderDouble() {
-        testGetSetBorderXMLBean(BorderStyle.DOUBLE, STBorderStyle.DOUBLE);
-    }
-    
-    @Test
-    public void testGetSetBorderHair() {
-        testGetSetBorderXMLBean(BorderStyle.HAIR, STBorderStyle.HAIR);
-    }
-    
-    @Test
-    public void testGetSetBorderMediumDashed() {
-        testGetSetBorderXMLBean(BorderStyle.MEDIUM_DASHED, STBorderStyle.MEDIUM_DASHED);
-    }
-    
-    @Test
-    public void testGetSetBorderDashDot() {
-        testGetSetBorderXMLBean(BorderStyle.DASH_DOT, STBorderStyle.DASH_DOT);
-    }
-    
-    @Test
-    public void testGetSetBorderMediumDashDot() {
-        testGetSetBorderXMLBean(BorderStyle.MEDIUM_DASH_DOT, STBorderStyle.MEDIUM_DASH_DOT);
-    }
-    
-    @Test
-    public void testGetSetBorderDashDotDot() {
-        testGetSetBorderXMLBean(BorderStyle.DASH_DOT_DOT, STBorderStyle.DASH_DOT_DOT);
-    }
-    
-    @Test
-    public void testGetSetBorderMediumDashDotDot() {
-        testGetSetBorderXMLBean(BorderStyle.MEDIUM_DASH_DOT_DOT, STBorderStyle.MEDIUM_DASH_DOT_DOT);
-    }
-    
-    @Test
-    public void testGetSetBorderSlantDashDot() {
-        testGetSetBorderXMLBean(BorderStyle.SLANTED_DASH_DOT, STBorderStyle.SLANT_DASH_DOT);
-    }
-    
-    @Test
-    public void testGetSetBottomBorderColor() {
-        //defaults
-        assertEquals(IndexedColors.BLACK.getIndex(), cellStyle.getBottomBorderColor());
-        assertNull(cellStyle.getBottomBorderXSSFColor());
-
-        int num = stylesTable.getBorders().size();
-
-        XSSFColor clr;
-
-        //setting indexed color
-        cellStyle.setBottomBorderColor(IndexedColors.BLUE_GREY.getIndex());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), cellStyle.getBottomBorderColor());
-        clr = cellStyle.getBottomBorderXSSFColor();
-        assertTrue(clr.getCTColor().isSetIndexed());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), clr.getIndexed());
-        //a new border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), ctBorder.getBottom().getColor().getIndexed());
-
-        //setting XSSFColor
-        num = stylesTable.getBorders().size();
-        clr = new XSSFColor(java.awt.Color.CYAN);
-        cellStyle.setBottomBorderColor(clr);
-        assertEquals(clr.getCTColor().toString(), cellStyle.getBottomBorderXSSFColor().getCTColor().toString());
-        byte[] rgb = cellStyle.getBottomBorderXSSFColor().getRGB();
-        assertEquals(java.awt.Color.CYAN, new java.awt.Color(rgb[0] & 0xFF, rgb[1] & 0xFF, rgb[2] & 0xFF));
-        //another border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //passing null unsets the color
-        cellStyle.setBottomBorderColor(null);
-        assertNull(cellStyle.getBottomBorderXSSFColor());
-    }
-
-	@Test
-    public void testGetSetTopBorderColor() {
-        //defaults
-        assertEquals(IndexedColors.BLACK.getIndex(), cellStyle.getTopBorderColor());
-        assertNull(cellStyle.getTopBorderXSSFColor());
-
-        int num = stylesTable.getBorders().size();
-
-        XSSFColor clr;
-
-        //setting indexed color
-        cellStyle.setTopBorderColor(IndexedColors.BLUE_GREY.getIndex());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), cellStyle.getTopBorderColor());
-        clr = cellStyle.getTopBorderXSSFColor();
-        assertTrue(clr.getCTColor().isSetIndexed());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), clr.getIndexed());
-        //a new border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), ctBorder.getTop().getColor().getIndexed());
-
-        //setting XSSFColor
-        num = stylesTable.getBorders().size();
-        clr = new XSSFColor(java.awt.Color.CYAN);
-        cellStyle.setTopBorderColor(clr);
-        assertEquals(clr.getCTColor().toString(), cellStyle.getTopBorderXSSFColor().getCTColor().toString());
-        byte[] rgb = cellStyle.getTopBorderXSSFColor().getRGB();
-        assertEquals(java.awt.Color.CYAN, new java.awt.Color(rgb[0] & 0xFF, rgb[1] & 0xFF, rgb[2] & 0xFF));
-        //another border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //passing null unsets the color
-        cellStyle.setTopBorderColor(null);
-        assertNull(cellStyle.getTopBorderXSSFColor());
-	}
-
-	@Test
-    public void testGetSetLeftBorderColor() {
-        //defaults
-        assertEquals(IndexedColors.BLACK.getIndex(), cellStyle.getLeftBorderColor());
-        assertNull(cellStyle.getLeftBorderXSSFColor());
-
-        int num = stylesTable.getBorders().size();
-
-        XSSFColor clr;
-
-        //setting indexed color
-        cellStyle.setLeftBorderColor(IndexedColors.BLUE_GREY.getIndex());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), cellStyle.getLeftBorderColor());
-        clr = cellStyle.getLeftBorderXSSFColor();
-        assertTrue(clr.getCTColor().isSetIndexed());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), clr.getIndexed());
-        //a new border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), ctBorder.getLeft().getColor().getIndexed());
-
-        //setting XSSFColor
-        num = stylesTable.getBorders().size();
-        clr = new XSSFColor(java.awt.Color.CYAN);
-        cellStyle.setLeftBorderColor(clr);
-        assertEquals(clr.getCTColor().toString(), cellStyle.getLeftBorderXSSFColor().getCTColor().toString());
-        byte[] rgb = cellStyle.getLeftBorderXSSFColor().getRGB();
-        assertEquals(java.awt.Color.CYAN, new java.awt.Color(rgb[0] & 0xFF, rgb[1] & 0xFF, rgb[2] & 0xFF));
-        //another border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //passing null unsets the color
-        cellStyle.setLeftBorderColor(null);
-        assertNull(cellStyle.getLeftBorderXSSFColor());
-	}
-
-	@Test
-    public void testGetSetRightBorderColor() {
-        //defaults
-        assertEquals(IndexedColors.BLACK.getIndex(), cellStyle.getRightBorderColor());
-        assertNull(cellStyle.getRightBorderXSSFColor());
-
-        int num = stylesTable.getBorders().size();
-
-        XSSFColor clr;
-
-        //setting indexed color
-        cellStyle.setRightBorderColor(IndexedColors.BLUE_GREY.getIndex());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), cellStyle.getRightBorderColor());
-        clr = cellStyle.getRightBorderXSSFColor();
-        assertTrue(clr.getCTColor().isSetIndexed());
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), clr.getIndexed());
-        //a new border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //id of the created border
-        int borderId = (int)cellStyle.getCoreXf().getBorderId();
-        assertTrue(borderId > 0);
-        //check changes in the underlying xml bean
-        CTBorder ctBorder = stylesTable.getBorderAt(borderId).getCTBorder();
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), ctBorder.getRight().getColor().getIndexed());
-
-        //setting XSSFColor
-        num = stylesTable.getBorders().size();
-        clr = new XSSFColor(java.awt.Color.CYAN);
-        cellStyle.setRightBorderColor(clr);
-        assertEquals(clr.getCTColor().toString(), cellStyle.getRightBorderXSSFColor().getCTColor().toString());
-        byte[] rgb = cellStyle.getRightBorderXSSFColor().getRGB();
-        assertEquals(java.awt.Color.CYAN, new java.awt.Color(rgb[0] & 0xFF, rgb[1] & 0xFF, rgb[2] & 0xFF));
-        //another border was added to the styles table
-        assertEquals(num + 1, stylesTable.getBorders().size());
-
-        //passing null unsets the color
-        cellStyle.setRightBorderColor(null);
-        assertNull(cellStyle.getRightBorderXSSFColor());
-	}
-
-	@Test
-    public void testGetSetFillBackgroundColor() {
-
-        assertEquals(IndexedColors.AUTOMATIC.getIndex(), cellStyle.getFillBackgroundColor());
-        assertNull(cellStyle.getFillBackgroundXSSFColor());
-
-        XSSFColor clr;
-
-        int num = stylesTable.getFills().size();
-
-        //setting indexed color
-        cellStyle.setFillBackgroundColor(IndexedColors.RED.getIndex());
-        assertEquals(IndexedColors.RED.getIndex(), cellStyle.getFillBackgroundColor());
-        clr = cellStyle.getFillBackgroundXSSFColor();
-        assertTrue(clr.getCTColor().isSetIndexed());
-        assertEquals(IndexedColors.RED.getIndex(), clr.getIndexed());
-        //a new fill was added to the styles table
-        assertEquals(num + 1, stylesTable.getFills().size());
-
-        //id of the created border
-        int fillId = (int)cellStyle.getCoreXf().getFillId();
-        assertTrue(fillId > 0);
-        //check changes in the underlying xml bean
-        CTFill ctFill2 = stylesTable.getFillAt(fillId).getCTFill();
-        assertEquals(IndexedColors.RED.getIndex(), ctFill2.getPatternFill().getBgColor().getIndexed());
-
-        //setting XSSFColor
-        num = stylesTable.getFills().size();
-        clr = new XSSFColor(java.awt.Color.CYAN);
-        cellStyle.setFillBackgroundColor(clr);
-        assertEquals(clr.getCTColor().toString(), cellStyle.getFillBackgroundXSSFColor().getCTColor().toString());
-        byte[] rgb = cellStyle.getFillBackgroundXSSFColor().getRGB();
-        assertEquals(java.awt.Color.CYAN, new java.awt.Color(rgb[0] & 0xFF, rgb[1] & 0xFF, rgb[2] & 0xFF));
-        //another border was added to the styles table
-        assertEquals(num + 1, stylesTable.getFills().size());
-
-        //passing null unsets the color
-        cellStyle.setFillBackgroundColor(null);
-        assertNull(cellStyle.getFillBackgroundXSSFColor());
-        assertEquals(IndexedColors.AUTOMATIC.getIndex(), cellStyle.getFillBackgroundColor());
-	}
-
-	@Test
-    public void testDefaultStyles() throws IOException {
-
-		XSSFWorkbook wb1 = new XSSFWorkbook();
-
-		XSSFCellStyle style1 = wb1.createCellStyle();
-        assertEquals(IndexedColors.AUTOMATIC.getIndex(), style1.getFillBackgroundColor());
-        assertNull(style1.getFillBackgroundXSSFColor());
-
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb1));
-        wb1.close();
-
-        //compatibility with HSSF
-        HSSFWorkbook wb2 = new HSSFWorkbook();
-        HSSFCellStyle style2 = wb2.createCellStyle();
-        assertEquals(style2.getFillBackgroundColor(), style1.getFillBackgroundColor());
-        assertEquals(style2.getFillForegroundColor(), style1.getFillForegroundColor());
-        assertEquals(style2.getFillPatternEnum(), style1.getFillPatternEnum());
-        assertEquals(style2.getFillPattern(), style1.getFillPattern());
-
-        assertEquals(style2.getLeftBorderColor(), style1.getLeftBorderColor());
-        assertEquals(style2.getTopBorderColor(), style1.getTopBorderColor());
-        assertEquals(style2.getRightBorderColor(), style1.getRightBorderColor());
-        assertEquals(style2.getBottomBorderColor(), style1.getBottomBorderColor());
-
-        assertEquals(style2.getBorderBottomEnum(), style1.getBorderBottomEnum());
-        assertEquals(style2.getBorderLeftEnum(), style1.getBorderLeftEnum());
-        assertEquals(style2.getBorderRightEnum(), style1.getBorderRightEnum());
-        assertEquals(style2.getBorderTopEnum(), style1.getBorderTopEnum());
-        wb2.close();
-	}
-
-	@Test
-    public void testGetFillForegroundColor() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        StylesTable styles = wb.getStylesSource();
-        assertEquals(1, wb.getNumCellStyles());
-        assertEquals(2, styles.getFills().size());
-
-        XSSFCellStyle defaultStyle = wb.getCellStyleAt((short)0);
-        assertEquals(IndexedColors.AUTOMATIC.getIndex(), defaultStyle.getFillForegroundColor());
-        assertEquals(null, defaultStyle.getFillForegroundXSSFColor());
-        assertEquals(FillPatternType.NO_FILL, defaultStyle.getFillPatternEnum());
-        assertEquals(CellStyle.NO_FILL, defaultStyle.getFillPattern());
-
-        XSSFCellStyle customStyle = wb.createCellStyle();
-
-        customStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        assertEquals(FillPatternType.SOLID_FOREGROUND, customStyle.getFillPatternEnum());
-        assertEquals(CellStyle.SOLID_FOREGROUND, customStyle.getFillPattern());
-        assertEquals(3, styles.getFills().size());
-
-        customStyle.setFillForegroundColor(IndexedColors.BRIGHT_GREEN.getIndex());
-        assertEquals(IndexedColors.BRIGHT_GREEN.getIndex(), customStyle.getFillForegroundColor());
-        assertEquals(4, styles.getFills().size());
-
-        for (int i = 0; i < 3; i++) {
-            XSSFCellStyle style = wb.createCellStyle();
-
-            style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-            assertEquals(FillPatternType.SOLID_FOREGROUND, style.getFillPatternEnum());
-            assertEquals(CellStyle.SOLID_FOREGROUND, style.getFillPattern());
-            assertEquals(4, styles.getFills().size());
-
-            style.setFillForegroundColor(IndexedColors.BRIGHT_GREEN.getIndex());
-            assertEquals(IndexedColors.BRIGHT_GREEN.getIndex(), style.getFillForegroundColor());
-            assertEquals(4, styles.getFills().size());
-        }
-
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb));
-        wb.close();
-    }
-
-    @Test
-    public void testGetFillPattern() {
-
-        assertEquals(STPatternType.INT_DARK_GRAY-1, cellStyle.getFillPatternEnum().getCode());
-        assertEquals(STPatternType.INT_DARK_GRAY-1, cellStyle.getFillPattern());
-
-        int num = stylesTable.getFills().size();
-        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        assertEquals(FillPatternType.SOLID_FOREGROUND, cellStyle.getFillPatternEnum());
-        assertEquals(CellStyle.SOLID_FOREGROUND, cellStyle.getFillPattern());
-        assertEquals(num + 1, stylesTable.getFills().size());
-        int fillId = (int)cellStyle.getCoreXf().getFillId();
-        assertTrue(fillId > 0);
-        //check changes in the underlying xml bean
-        CTFill ctFill2 = stylesTable.getFillAt(fillId).getCTFill();
-        assertEquals(STPatternType.SOLID, ctFill2.getPatternFill().getPatternType());
-
-        //setting the same fill multiple time does not update the styles table
-        for (int i = 0; i < 3; i++) {
-            cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        }
-        assertEquals(num + 1, stylesTable.getFills().size());
-
-        cellStyle.setFillPattern(FillPatternType.NO_FILL);
-        assertEquals(FillPatternType.NO_FILL, cellStyle.getFillPatternEnum());
-        assertEquals(CellStyle.NO_FILL, cellStyle.getFillPattern());
-        fillId = (int)cellStyle.getCoreXf().getFillId();
-        ctFill2 = stylesTable.getFillAt(fillId).getCTFill();
-        assertFalse(ctFill2.getPatternFill().isSetPatternType());
-
-	}
-
-	@Test
-    public void testGetFont() {
-		assertNotNull(cellStyle.getFont());
-	}
-
-	@Test
-    public void testGetSetHidden() {
-		assertFalse(cellStyle.getHidden());
-		cellStyle.setHidden(true);
-		assertTrue(cellStyle.getHidden());
-		cellStyle.setHidden(false);
-		assertFalse(cellStyle.getHidden());
-	}
-
-	@Test
-    public void testGetSetLocked() {
-		assertTrue(cellStyle.getLocked());
-		cellStyle.setLocked(true);
-		assertTrue(cellStyle.getLocked());
-		cellStyle.setLocked(false);
-		assertFalse(cellStyle.getLocked());
-	}
-
-	@Test
-    public void testGetSetIndent() {
-		assertEquals((short)0, cellStyle.getIndention());
-		cellStyle.setIndention((short)3);
-		assertEquals((short)3, cellStyle.getIndention());
-		cellStyle.setIndention((short) 13);
-		assertEquals((short)13, cellStyle.getIndention());
-	}
-
-	@Test
-    public void testGetSetAlignement() {
-		assertNull(cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
-		assertEquals(HorizontalAlignment.GENERAL, cellStyle.getAlignmentEnum());
-
-		cellStyle.setAlignment(XSSFCellStyle.ALIGN_LEFT);
-		assertEquals(XSSFCellStyle.ALIGN_LEFT, cellStyle.getAlignment());
-		assertEquals(HorizontalAlignment.LEFT, cellStyle.getAlignmentEnum());
-		assertEquals(STHorizontalAlignment.LEFT, cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
-
-		cellStyle.setAlignment(HorizontalAlignment.JUSTIFY);
-		assertEquals(XSSFCellStyle.ALIGN_JUSTIFY, cellStyle.getAlignment());
-		assertEquals(HorizontalAlignment.JUSTIFY, cellStyle.getAlignmentEnum());
-		assertEquals(STHorizontalAlignment.JUSTIFY, cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
-
-		cellStyle.setAlignment(HorizontalAlignment.CENTER);
-		assertEquals(XSSFCellStyle.ALIGN_CENTER, cellStyle.getAlignment());
-		assertEquals(HorizontalAlignment.CENTER, cellStyle.getAlignmentEnum());
-		assertEquals(STHorizontalAlignment.CENTER, cellStyle.getCellAlignment().getCTCellAlignment().getHorizontal());
-	}
-
-	@Test
-    public void testGetSetVerticalAlignment() {
-		assertEquals(VerticalAlignment.BOTTOM, cellStyle.getVerticalAlignmentEnum());
-		assertEquals(XSSFCellStyle.VERTICAL_BOTTOM, cellStyle.getVerticalAlignment());
-		assertNull(cellStyle.getCellAlignment().getCTCellAlignment().getVertical());
-
-		cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
-		assertEquals(XSSFCellStyle.VERTICAL_CENTER, cellStyle.getVerticalAlignment());
-		assertEquals(VerticalAlignment.CENTER, cellStyle.getVerticalAlignmentEnum());
-		assertEquals(STVerticalAlignment.CENTER, cellStyle.getCellAlignment().getCTCellAlignment().getVertical());
-
-		cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_JUSTIFY);
-		assertEquals(XSSFCellStyle.VERTICAL_JUSTIFY, cellStyle.getVerticalAlignment());
-		assertEquals(VerticalAlignment.JUSTIFY, cellStyle.getVerticalAlignmentEnum());
-		assertEquals(STVerticalAlignment.JUSTIFY, cellStyle.getCellAlignment().getCTCellAlignment().getVertical());
-	}
-
-	@Test
-    public void testGetSetWrapText() {
-		assertFalse(cellStyle.getWrapText());
-		cellStyle.setWrapText(true);
-		assertTrue(cellStyle.getWrapText());
-		cellStyle.setWrapText(false);
-        assertFalse(cellStyle.getWrapText());
-	}
-
-	/**
-	 * Cloning one XSSFCellStyle onto Another, same XSSFWorkbook
-	 */
-	@Test
-    public void testCloneStyleSameWB() throws IOException {
-      XSSFWorkbook wb = new XSSFWorkbook();
-      assertEquals(1, wb.getNumberOfFonts());
-      
-      XSSFFont fnt = wb.createFont();
-      fnt.setFontName("TestingFont");
-      assertEquals(2, wb.getNumberOfFonts());
-      
-      XSSFCellStyle orig = wb.createCellStyle();
-      orig.setAlignment(CellStyle.ALIGN_RIGHT);
-      orig.setFont(fnt);
-      orig.setDataFormat((short)18);
-      
-      assertTrue(CellStyle.ALIGN_RIGHT == orig.getAlignment());
-      assertTrue(fnt == orig.getFont());
-      assertTrue(18 == orig.getDataFormat());
-      
-      XSSFCellStyle clone = wb.createCellStyle();
-      assertFalse(CellStyle.ALIGN_RIGHT == clone.getAlignment());
-      assertFalse(fnt == clone.getFont());
-      assertFalse(18 == clone.getDataFormat());
-      
-      clone.cloneStyleFrom(orig);
-      assertTrue(CellStyle.ALIGN_RIGHT == clone.getAlignment());
-      assertTrue(fnt == clone.getFont());
-      assertTrue(18 == clone.getDataFormat());
-      assertEquals(2, wb.getNumberOfFonts());
-
-      XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb);
-      assertNotNull(wb2);
-      wb2.close();
-      
-      wb.close();
-	}
-
-	/**
-	 * Cloning one XSSFCellStyle onto Another, different XSSFWorkbooks
-	 */
-	@Test
-    public void testCloneStyleDiffWB() throws IOException {
-       XSSFWorkbook wbOrig = new XSSFWorkbook();
-       assertEquals(1, wbOrig.getNumberOfFonts());
-       assertEquals(0, wbOrig.getStylesSource().getNumberFormats().size());
-       
-       XSSFFont fnt = wbOrig.createFont();
-       fnt.setFontName("TestingFont");
-       assertEquals(2, wbOrig.getNumberOfFonts());
-       assertEquals(0, wbOrig.getStylesSource().getNumberFormats().size());
-       
-       XSSFDataFormat fmt = wbOrig.createDataFormat();
-       fmt.getFormat("MadeUpOne");
-       fmt.getFormat("MadeUpTwo");
-       
-       XSSFCellStyle orig = wbOrig.createCellStyle();
-       orig.setAlignment(HSSFCellStyle.ALIGN_RIGHT);
-       orig.setFont(fnt);
-       orig.setDataFormat(fmt.getFormat("Test##"));
-       
-       assertTrue(XSSFCellStyle.ALIGN_RIGHT == orig.getAlignment());
-       assertTrue(fnt == orig.getFont());
-       assertTrue(fmt.getFormat("Test##") == orig.getDataFormat());
-       
-       assertEquals(2, wbOrig.getNumberOfFonts());
-       assertEquals(3, wbOrig.getStylesSource().getNumberFormats().size());
-       
-       
-       // Now a style on another workbook
-       XSSFWorkbook wbClone = new XSSFWorkbook();
-       assertEquals(1, wbClone.getNumberOfFonts());
-       assertEquals(0, wbClone.getStylesSource().getNumberFormats().size());
-       assertEquals(1, wbClone.getNumCellStyles());
-       
-       XSSFDataFormat fmtClone = wbClone.createDataFormat();
-       XSSFCellStyle clone = wbClone.createCellStyle();
-       
-       assertEquals(1, wbClone.getNumberOfFonts());
-       assertEquals(0, wbClone.getStylesSource().getNumberFormats().size());
-       
-       assertFalse(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
-       assertNotEquals("TestingFont", clone.getFont().getFontName());
-       
-       clone.cloneStyleFrom(orig);
-       
-       assertEquals(2, wbClone.getNumberOfFonts());
-       assertEquals(2, wbClone.getNumCellStyles());
-       assertEquals(1, wbClone.getStylesSource().getNumberFormats().size());
-       
-       assertEquals(HSSFCellStyle.ALIGN_RIGHT, clone.getAlignment());
-       assertEquals("TestingFont", clone.getFont().getFontName());
-       assertEquals(fmtClone.getFormat("Test##"), clone.getDataFormat());
-       assertFalse(fmtClone.getFormat("Test##") == fmt.getFormat("Test##"));
-       
-       // Save it and re-check
-       XSSFWorkbook wbReload = XSSFTestDataSamples.writeOutAndReadBack(wbClone);
-       assertEquals(2, wbReload.getNumberOfFonts());
-       assertEquals(2, wbReload.getNumCellStyles());
-       assertEquals(1, wbReload.getStylesSource().getNumberFormats().size());
-       
-       XSSFCellStyle reload = wbReload.getCellStyleAt((short)1);
-       assertEquals(HSSFCellStyle.ALIGN_RIGHT, reload.getAlignment());
-       assertEquals("TestingFont", reload.getFont().getFontName());
-       assertEquals(fmtClone.getFormat("Test##"), reload.getDataFormat());
-       assertFalse(fmtClone.getFormat("Test##") == fmt.getFormat("Test##"));
-
-       XSSFWorkbook wbOrig2 = XSSFTestDataSamples.writeOutAndReadBack(wbOrig);
-       assertNotNull(wbOrig2);
-       wbOrig2.close();
-       
-       XSSFWorkbook wbClone2 = XSSFTestDataSamples.writeOutAndReadBack(wbClone);
-       assertNotNull(wbClone2);
-       wbClone2.close();
-       
-       wbReload.close();
-       wbClone.close();
-       wbOrig.close();
-   }
-
-    /**
-     * Avoid ArrayIndexOutOfBoundsException  when creating cell style
-     * in a workbook that has an empty xf table.
-     */
-	@Test
-    public void testBug52348() throws IOException {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("52348.xlsx");
-        StylesTable st = workbook.getStylesSource();
-        assertEquals(0, st._getStyleXfsSize());
-        
-        XSSFCellStyle style = workbook.createCellStyle(); // no exception at this point
-        assertNull(style.getStyleXf());
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertNotNull(wb2);
-        wb2.close();
-        workbook.close();
-    }
-
-    /**
-     * Avoid ArrayIndexOutOfBoundsException  when getting cell style
-     * in a workbook that has an empty xf table.
-     */
-	@Test
-    public void testBug55650() throws IOException {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("52348.xlsx");
-        StylesTable st = workbook.getStylesSource();
-        assertEquals(0, st._getStyleXfsSize());
-
-        // no exception at this point
-        XSSFCellStyle style = workbook.getSheetAt(0).getRow(0).getCell(0).getCellStyle();
-        assertNull(style.getStyleXf());
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertNotNull(wb2);
-        wb2.close();
-        
-        workbook.close();
-    }
-
-	@Test
-    public void testShrinkToFit() throws IOException {
-    	// Existing file
-    	XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("ShrinkToFit.xlsx");
-    	Sheet s = wb1.getSheetAt(0);
-    	Row r = s.getRow(0);
-    	CellStyle cs = r.getCell(0).getCellStyle();
-
-    	assertEquals(true, cs.getShrinkToFit());
-
-    	// New file
-    	XSSFWorkbook wb2 = new XSSFWorkbook();
-    	s = wb2.createSheet();
-    	r = s.createRow(0);
-
-    	cs = wb2.createCellStyle();
-    	cs.setShrinkToFit(false);
-    	r.createCell(0).setCellStyle(cs);
-
-    	cs = wb2.createCellStyle();
-    	cs.setShrinkToFit(true);
-    	r.createCell(1).setCellStyle(cs);
-
-    	// Write out, read, and check
-    	XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-    	s = wb3.getSheetAt(0);
-    	r = s.getRow(0);
-    	assertEquals(false, r.getCell(0).getCellStyle().getShrinkToFit());
-    	assertEquals(true,  r.getCell(1).getCellStyle().getShrinkToFit());
-
-    	XSSFWorkbook wb4 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-    	assertNotNull(wb4);
-    	wb4.close();
-    	
-    	XSSFWorkbook wb5 = XSSFTestDataSamples.writeOutAndReadBack(wb3);
-    	assertNotNull(wb5);
-    	wb5.close();
-    	
-    	wb3.close();
-    	wb2.close();
-    	wb1.close();
-        
-    }
-    
-    @Test
-    public void testSetColor() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        
-        DataFormat format = wb.createDataFormat();
-        Cell cell = row.createCell(1);
-        cell.setCellValue("somevalue");
-        CellStyle cellStyle2 = wb.createCellStyle();
-
-
-        cellStyle2.setDataFormat(format.getFormat("###0"));
-
-        cellStyle2.setFillBackgroundColor(IndexedColors.DARK_BLUE.getIndex());
-        cellStyle2.setFillForegroundColor(IndexedColors.DARK_BLUE.getIndex());
-        cellStyle2.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-
-        cellStyle2.setAlignment(CellStyle.ALIGN_RIGHT);
-        cellStyle2.setVerticalAlignment(CellStyle.VERTICAL_TOP);
-
-        cell.setCellStyle(cellStyle2);
-
-        Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        Cell cellBack = wbBack.getSheetAt(0).getRow(0).getCell(1);
-        assertNotNull(cellBack);
-        CellStyle styleBack = cellBack.getCellStyle();
-        assertEquals(IndexedColors.DARK_BLUE.getIndex(), styleBack.getFillBackgroundColor());
-        assertEquals(IndexedColors.DARK_BLUE.getIndex(), styleBack.getFillForegroundColor());
-        assertEquals(CellStyle.ALIGN_RIGHT, styleBack.getAlignment());
-        assertEquals(CellStyle.VERTICAL_TOP, styleBack.getVerticalAlignment());
-        assertEquals(FillPatternType.SOLID_FOREGROUND, styleBack.getFillPatternEnum());
-        assertEquals(CellStyle.SOLID_FOREGROUND, styleBack.getFillPattern());
-        
-        wbBack.close();
-        
-        wb.close();
-    }
-
-    public static void copyStyles(Workbook reference, Workbook target) {
-        final int numberOfStyles = reference.getNumCellStyles();
-        // don't copy default style (style index 0)
-        for (int i = 1; i < numberOfStyles; i++) {
-            final CellStyle referenceStyle = reference.getCellStyleAt(i);
-            final CellStyle targetStyle = target.createCellStyle();
-            targetStyle.cloneStyleFrom(referenceStyle);
-        }
-        /*System.out.println("Reference : "+reference.getNumCellStyles());
-        System.out.println("Target    : "+target.getNumCellStyles());*/
-    }
-
-    @Test
-    public void test58084() throws IOException {
-        Workbook reference = XSSFTestDataSamples.openSampleWorkbook("template.xlsx");
-        Workbook target = new XSSFWorkbook();
-        copyStyles(reference, target);
-        
-        assertEquals(reference.getNumCellStyles(), target.getNumCellStyles());
-        final Sheet sheet = target.createSheet();
-        final Row row = sheet.createRow(0);
-        int col = 0;
-        for (short i = 1; i < target.getNumCellStyles(); i++) {
-            final Cell cell = row.createCell(col++);
-            cell.setCellValue("Coucou"+i);
-            cell.setCellStyle(target.getCellStyleAt(i));
-        }
-        /*OutputStream out = new FileOutputStream("C:\\temp\\58084.xlsx");
-        target.write(out);
-        out.close();*/
-
-        Workbook copy = XSSFTestDataSamples.writeOutAndReadBack(target);
-
-        // previously this failed because the border-element was not copied over 
-        copy.getCellStyleAt((short)1).getBorderBottomEnum();
-        
-        copy.close();
-        
-        target.close();
-        reference.close();
-    }
-
-    @Test
-    public void test58043() {
-        assertEquals(0, cellStyle.getRotation());
-
-        cellStyle.setRotation((short)89);
-        assertEquals(89, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)90);
-        assertEquals(90, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)179);
-        assertEquals(179, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)180);
-        assertEquals(180, cellStyle.getRotation());
-        
-        // negative values are mapped to the correct values for compatibility between HSSF and XSSF
-        cellStyle.setRotation((short)-1);
-        assertEquals(91, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)-89);
-        assertEquals(179, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)-90);
-        assertEquals(180, cellStyle.getRotation());
-    }
-
-    @Test
-    public void bug58996_UsedToWorkIn3_11_ButNotIn3_13() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-
-        XSSFCellStyle cellStyle = workbook.createCellStyle();
-        cellStyle.setFillForegroundColor(null);
-        assertNull(cellStyle.getFillForegroundColorColor());
-
-        cellStyle.setFillBackgroundColor(null);
-        assertNull(cellStyle.getFillBackgroundColorColor());
-
-        cellStyle.setFillPattern(FillPatternType.NO_FILL);
-        assertEquals(FillPatternType.NO_FILL, cellStyle.getFillPatternEnum());
-
-        cellStyle.setBottomBorderColor(null);
-        assertNull(cellStyle.getBottomBorderXSSFColor());
-
-        cellStyle.setTopBorderColor(null);
-        assertNull(cellStyle.getTopBorderXSSFColor());
-
-        cellStyle.setLeftBorderColor(null);
-        assertNull(cellStyle.getLeftBorderXSSFColor());
-
-        cellStyle.setRightBorderColor(null);
-        assertNull(cellStyle.getRightBorderXSSFColor());
-        
-        workbook.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java
deleted file mode 100644
index 1c87324..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xssf.XSSFTestDataSamples;
-
-public final class TestXSSFChart extends TestCase {
- 
-    public void testGetAccessors() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithThreeCharts.xlsx");
-        XSSFSheet s1 = wb.getSheetAt(0);
-        XSSFSheet s2 = wb.getSheetAt(1);
-        XSSFSheet s3 = wb.getSheetAt(2);
-        
-        assertEquals(0, s1.getRelations().size());
-        assertEquals(1, s2.getRelations().size());
-        assertEquals(1, s3.getRelations().size());
-        
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb));
-    }
-    
-    public void testGetCharts() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithThreeCharts.xlsx");
-       
-       XSSFSheet s1 = wb.getSheetAt(0);
-       XSSFSheet s2 = wb.getSheetAt(1);
-       XSSFSheet s3 = wb.getSheetAt(2);
-       
-       assertEquals(0, s1.createDrawingPatriarch().getCharts().size());
-       assertEquals(2, s2.createDrawingPatriarch().getCharts().size());
-       assertEquals(1, s3.createDrawingPatriarch().getCharts().size());
-       
-       // Check the titles
-       XSSFChart chart = s2.createDrawingPatriarch().getCharts().get(0);
-       assertEquals(null, chart.getTitle());
-       
-       chart = s2.createDrawingPatriarch().getCharts().get(1);
-       assertEquals("Pie Chart Title Thingy", chart.getTitle().getString());
-       
-       chart = s3.createDrawingPatriarch().getCharts().get(0);
-       assertEquals("Sheet 3 Chart with Title", chart.getTitle().getString());
-       
-       assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb));
-    }
-
-	public void testAddChartsToNewWorkbook() throws Exception {
-		XSSFWorkbook wb = new XSSFWorkbook();
-		XSSFSheet s1 = wb.createSheet();
-		XSSFDrawing d1 = s1.createDrawingPatriarch();
-		XSSFClientAnchor a1 = new XSSFClientAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		XSSFChart c1 = d1.createChart(a1);
-
-		assertEquals(1, d1.getCharts().size());
-		assertNotNull(c1.getGraphicFrame());
-		assertNotNull(c1.getOrCreateLegend());
-
-		XSSFClientAnchor a2 = new XSSFClientAnchor(0, 0, 0, 0, 1, 11, 10, 60);
-		XSSFChart c2 = d1.createChart(a2);
-		assertNotNull(c2);
-		assertEquals(2, d1.getCharts().size());
-        
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb));
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
deleted file mode 100644
index 2eb4fc3..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTChartsheet;
-
-import static org.junit.Assert.*;
-
-public final class TestXSSFChartSheet {
-
-    @Test
-    public void testXSSFFactory() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("chart_sheet.xlsx");
-        assertEquals(4, wb.getNumberOfSheets());
-
-        //the third sheet is of type 'chartsheet'
-        assertEquals("Chart1", wb.getSheetName(2));
-        assertTrue(wb.getSheetAt(2) instanceof XSSFChartSheet);
-        assertEquals("Chart1", wb.getSheetAt(2).getSheetName());
-
-        final CTChartsheet ctChartsheet = ((XSSFChartSheet) wb.getSheetAt(2)).getCTChartsheet();
-        assertNotNull(ctChartsheet);
-    }
-
-    @Test
-    public void testGetAccessors() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("chart_sheet.xlsx");
-        XSSFChartSheet sheet = (XSSFChartSheet)wb.getSheetAt(2);
-
-        assertFalse("Row iterator for charts sheets should return zero rows",
-                sheet.iterator().hasNext());
-
-        //access to a arbitrary row
-        assertNull(sheet.getRow(1));
-
-        //some basic get* accessors
-        assertEquals(0, sheet.getNumberOfComments());
-        assertEquals(0, sheet.getNumHyperlinks());
-        assertEquals(0, sheet.getNumMergedRegions());
-        assertNull(sheet.getActiveCell());
-        assertTrue(sheet.getAutobreaks());
-        //noinspection deprecation
-        assertNull(sheet.getCellComment(0, 0));
-        assertNull(sheet.getCellComment(new CellAddress(0, 0)));
-        assertEquals(0, sheet.getColumnBreaks().length);
-        assertTrue(sheet.getRowSumsBelow());
-        assertNotNull(sheet.createDrawingPatriarch());
-        assertNotNull(sheet.getDrawingPatriarch());
-        assertNotNull(sheet.getCTChartsheet());
-    }
-    
-    @Test
-    public void testGetCharts() throws Exception {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("chart_sheet.xlsx");
-       
-       XSSFSheet ns = wb.getSheetAt(0);
-       XSSFChartSheet cs = (XSSFChartSheet)wb.getSheetAt(2);
-       
-       assertEquals(0, ns.createDrawingPatriarch().getCharts().size());
-       assertEquals(1, cs.createDrawingPatriarch().getCharts().size());
-       
-       XSSFChart chart = cs.createDrawingPatriarch().getCharts().get(0);
-       assertNull(chart.getTitle());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
deleted file mode 100644
index 1d3f97f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
-
-/**
- * Test asserts the POI produces &lt;cols&gt; element that could be read and properly interpreted by the MS Excel.
- * For specification of the "cols" element see the chapter 3.3.1.16 of the "Office Open XML Part 4 - Markup Language Reference.pdf".
- * The specification can be downloaded at http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip.
- * 
- * <p><em>
- * The test saves xlsx file on a disk if the system property is set:
- * -Dpoi.test.xssf.output.dir=${workspace_loc}/poi/build/xssf-output
- * </em>
- * 
- */
-public class TestXSSFColGrouping {
-	
-	private static final POILogger logger = POILogFactory.getLogger(TestXSSFColGrouping.class);
-
-	
-    /**
-     * Tests that POI doesn't produce "col" elements without "width" attribute. 
-     * POI-52186
-     */
-	@Test
-    public void testNoColsWithoutWidthWhenGrouping() throws IOException {
-		XSSFWorkbook wb1 = new XSSFWorkbook();
-		XSSFSheet sheet = wb1.createSheet("test");
-
-        sheet.setColumnWidth(4, 5000);
-        sheet.setColumnWidth(5, 5000);
-       
-        sheet.groupColumn((short) 4, (short) 7);
-        sheet.groupColumn((short) 9, (short) 12);
-        
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1, "testNoColsWithoutWidthWhenGrouping");
-        sheet = wb2.getSheet("test");
-        
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        logger.log(POILogger.DEBUG, "test52186/cols:" + cols);
-        for (CTCol col : cols.getColArray()) {
-			assertTrue("Col width attribute is unset: " + col.toString(), col.isSetWidth());
-		}
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Tests that POI doesn't produce "col" elements without "width" attribute. 
-     * POI-52186
-     */
-	@Test
-	public void testNoColsWithoutWidthWhenGroupingAndCollapsing() throws IOException {
-		XSSFWorkbook wb1 = new XSSFWorkbook();
-		XSSFSheet sheet = wb1.createSheet("test");
-
-        sheet.setColumnWidth(4, 5000);
-        sheet.setColumnWidth(5, 5000);
-       
-        sheet.groupColumn((short) 4, (short) 5);
-        
-        sheet.setColumnGroupCollapsed(4, true);
-        
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        logger.log(POILogger.DEBUG, "test52186_2/cols:" + cols);
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1, "testNoColsWithoutWidthWhenGroupingAndCollapsing");
-        sheet = wb2.getSheet("test");
-        
-        for (int i = 4; i <= 5; i++) {
-        	assertEquals("Unexpected width of column "+ i, 5000, sheet.getColumnWidth(i));
-        }
-        cols = sheet.getCTWorksheet().getColsArray(0);
-        for (CTCol col : cols.getColArray()) {
-			assertTrue("Col width attribute is unset: " + col.toString(), col.isSetWidth());
-		}
-        wb2.close();
-        wb1.close();
-    }
-    
-    /**
-     * Test the cols element is correct in case of NumericRanges.OVERLAPS_2_WRAPS
-     */
-	@Test
-    public void testMergingOverlappingCols_OVERLAPS_2_WRAPS() throws IOException {
-		XSSFWorkbook wb1 = new XSSFWorkbook();
-		XSSFSheet sheet = wb1.createSheet("test");
-
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        CTCol col = cols.addNewCol();
-        col.setMin(1 + 1);
-        col.setMax(4 + 1);
-        col.setWidth(20);
-        col.setCustomWidth(true);
-
-        sheet.groupColumn((short) 2, (short) 3);
-        
-        sheet.getCTWorksheet().getColsArray(0);
-        logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_2_WRAPS/cols:" + cols);
-        
-        assertEquals(0, cols.getColArray(0).getOutlineLevel());
-        assertEquals(2, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(2, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(0).getCustomWidth());
-
-        assertEquals(1, cols.getColArray(1).getOutlineLevel());
-        assertEquals(3, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(4, cols.getColArray(1).getMax()); // 1 based        
-        assertEquals(true, cols.getColArray(1).getCustomWidth());
-
-        assertEquals(0, cols.getColArray(2).getOutlineLevel());
-        assertEquals(5, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(5, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(2).getCustomWidth());
-        
-        assertEquals(3, cols.sizeOfColArray());
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1, "testMergingOverlappingCols_OVERLAPS_2_WRAPS");
-        sheet = wb2.getSheet("test");
-        
-        for (int i = 1; i <= 4; i++) {
-        	assertEquals("Unexpected width of column "+ i, 20 * 256, sheet.getColumnWidth(i));
-        }
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Test the cols element is correct in case of NumericRanges.OVERLAPS_1_WRAPS
-     */
-	@Test
-    public void testMergingOverlappingCols_OVERLAPS_1_WRAPS() throws IOException {
-		XSSFWorkbook wb1 = new XSSFWorkbook();
-		XSSFSheet sheet = wb1.createSheet("test");
-
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        CTCol col = cols.addNewCol();
-        col.setMin(2 + 1);
-        col.setMax(4 + 1);
-        col.setWidth(20);
-        col.setCustomWidth(true);
-
-        sheet.groupColumn((short) 1, (short) 5);
-        
-        cols = sheet.getCTWorksheet().getColsArray(0);
-        logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_1_WRAPS/cols:" + cols);
-        
-        assertEquals(1, cols.getColArray(0).getOutlineLevel());
-        assertEquals(2, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(2, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false, cols.getColArray(0).getCustomWidth());
-
-        assertEquals(1, cols.getColArray(1).getOutlineLevel());
-        assertEquals(3, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(5, cols.getColArray(1).getMax()); // 1 based        
-        assertEquals(true, cols.getColArray(1).getCustomWidth());
-
-        assertEquals(1, cols.getColArray(2).getOutlineLevel());
-        assertEquals(6, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(6, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(false, cols.getColArray(2).getCustomWidth());
-        
-        assertEquals(3, cols.sizeOfColArray());
-        
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1, "testMergingOverlappingCols_OVERLAPS_1_WRAPS");
-        sheet = wb2.getSheet("test");
-        
-        for (int i = 2; i <= 4; i++) {
-        	assertEquals("Unexpected width of column "+ i, 20 * 256, sheet.getColumnWidth(i));
-        }
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Test the cols element is correct in case of NumericRanges.OVERLAPS_1_MINOR
-     */
-	@Test
-    public void testMergingOverlappingCols_OVERLAPS_1_MINOR() throws IOException {
-		XSSFWorkbook wb1 = new XSSFWorkbook();
-		XSSFSheet sheet = wb1.createSheet("test");
-
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        CTCol col = cols.addNewCol();
-        col.setMin(2 + 1);
-        col.setMax(4 + 1);
-        col.setWidth(20);
-        col.setCustomWidth(true);
-
-        sheet.groupColumn((short) 3, (short) 5);
-        
-        cols = sheet.getCTWorksheet().getColsArray(0);
-        logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_1_MINOR/cols:" + cols);
-
-        assertEquals(0, cols.getColArray(0).getOutlineLevel());
-        assertEquals(3, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(3, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(0).getCustomWidth());
-
-        assertEquals(1, cols.getColArray(1).getOutlineLevel());
-        assertEquals(4, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(5, cols.getColArray(1).getMax()); // 1 based        
-        assertEquals(true, cols.getColArray(1).getCustomWidth());
-
-        assertEquals(1, cols.getColArray(2).getOutlineLevel());
-        assertEquals(6, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(6, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(false, cols.getColArray(2).getCustomWidth());
-        
-        assertEquals(3, cols.sizeOfColArray());
-        
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1, "testMergingOverlappingCols_OVERLAPS_1_MINOR");
-        sheet = wb2.getSheet("test");
-        
-        for (int i = 2; i <= 4; i++) {
-        	assertEquals("Unexpected width of column "+ i, 20 * 256, sheet.getColumnWidth(i));
-        }
-    	assertEquals("Unexpected width of column "+ 5, sheet.getDefaultColumnWidth() * 256, sheet.getColumnWidth(5));
-    	
-    	wb2.close();
-    	wb1.close();
-    }
-
-    /**
-     * Test the cols element is correct in case of NumericRanges.OVERLAPS_2_MINOR
-     */
-	@Test
-    public void testMergingOverlappingCols_OVERLAPS_2_MINOR() throws IOException {
-		XSSFWorkbook wb1 = new XSSFWorkbook();
-		XSSFSheet sheet = wb1.createSheet("test");
-
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        CTCol col = cols.addNewCol();
-        col.setMin(2 + 1);
-        col.setMax(4 + 1);
-        col.setWidth(20);
-        col.setCustomWidth(true);
-
-        sheet.groupColumn((short) 1, (short) 3);
-        
-        cols = sheet.getCTWorksheet().getColsArray(0);
-        logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_2_MINOR/cols:" + cols);
-
-        assertEquals(1, cols.getColArray(0).getOutlineLevel());
-        assertEquals(2, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(2, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false, cols.getColArray(0).getCustomWidth());
-
-        assertEquals(1, cols.getColArray(1).getOutlineLevel());
-        assertEquals(3, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(4, cols.getColArray(1).getMax()); // 1 based        
-        assertEquals(true, cols.getColArray(1).getCustomWidth());
-
-        assertEquals(0, cols.getColArray(2).getOutlineLevel());
-        assertEquals(5, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(5, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(2).getCustomWidth());
-        
-        assertEquals(3, cols.sizeOfColArray());
-        
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1, "testMergingOverlappingCols_OVERLAPS_2_MINOR");
-        sheet = wb2.getSheet("test");
-        
-        for (int i = 2; i <= 4; i++) {
-        	assertEquals("Unexpected width of column "+ i, 20 * 256, sheet.getColumnWidth(i));
-        }
-    	assertEquals("Unexpected width of column "+ 1, sheet.getDefaultColumnWidth() * 256, sheet.getColumnWidth(1));
-    	
-    	wb2.close();
-    	wb1.close();
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
deleted file mode 100644
index 38406c3..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-
-public final class TestXSSFColor {
-    
-   @Test
-   public void testIndexedColour() throws Exception {
-      XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("48779.xlsx");
-
-      // Check the CTColor is as expected
-      XSSFColor indexed = wb.getCellStyleAt((short)1).getFillBackgroundXSSFColor();
-      assertEquals(true, indexed.getCTColor().isSetIndexed());
-      assertEquals(64, indexed.getCTColor().getIndexed());
-      assertEquals(false, indexed.getCTColor().isSetRgb());
-      assertEquals(null, indexed.getCTColor().getRgb());
-
-      // Now check the XSSFColor
-      // Note - 64 is a special "auto" one with no rgb equiv
-      assertEquals(64, indexed.getIndexed());
-      assertEquals(null, indexed.getRGB());
-      assertEquals(null, indexed.getRGBWithTint());
-      assertEquals(null, indexed.getARGBHex());
-      assertFalse(indexed.hasAlpha());
-      assertFalse(indexed.hasTint());
-
-      // Now move to one with indexed rgb values
-      indexed.setIndexed(59);
-      assertEquals(true, indexed.getCTColor().isSetIndexed());
-      assertEquals(59, indexed.getCTColor().getIndexed());
-      assertEquals(false, indexed.getCTColor().isSetRgb());
-      assertEquals(null, indexed.getCTColor().getRgb());
-
-      assertEquals(59, indexed.getIndexed());
-      assertEquals("FF333300", indexed.getARGBHex());
-
-      assertEquals(3, indexed.getRGB().length);
-      assertEquals(0x33, indexed.getRGB()[0]);
-      assertEquals(0x33, indexed.getRGB()[1]);
-      assertEquals(0x00, indexed.getRGB()[2]);
-
-      assertEquals(4, indexed.getARGB().length);
-      assertEquals(-1, indexed.getARGB()[0]);
-      assertEquals(0x33, indexed.getARGB()[1]);
-      assertEquals(0x33, indexed.getARGB()[2]);
-      assertEquals(0x00, indexed.getARGB()[3]);
-
-      // You don't get tinted indexed colours, sorry...
-      assertEquals(null, indexed.getRGBWithTint());
-      
-      wb.close();
-   }
-
-   @Test
-   public void testRGBColour() throws IOException {
-      XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("50299.xlsx");
-
-      // Check the CTColor is as expected
-      XSSFColor rgb3 = wb.getCellStyleAt((short)25).getFillForegroundXSSFColor();
-      assertEquals(false, rgb3.getCTColor().isSetIndexed());
-      assertEquals(0,     rgb3.getCTColor().getIndexed());
-      assertEquals(true,  rgb3.getCTColor().isSetTint());
-      assertEquals(-0.34999, rgb3.getCTColor().getTint(), 0.00001);
-      assertEquals(true,  rgb3.getCTColor().isSetRgb());
-      assertEquals(3,     rgb3.getCTColor().getRgb().length);
-
-      // Now check the XSSFColor
-      assertEquals(0, rgb3.getIndexed());
-      assertEquals(-0.34999, rgb3.getTint(), 0.00001);
-      assertFalse(rgb3.hasAlpha());
-      assertTrue(rgb3.hasTint());
-
-      assertEquals("FFFFFFFF", rgb3.getARGBHex());
-      assertEquals(3, rgb3.getRGB().length);
-      assertEquals(-1, rgb3.getRGB()[0]);
-      assertEquals(-1, rgb3.getRGB()[1]);
-      assertEquals(-1,  rgb3.getRGB()[2]);
-
-      assertEquals(4, rgb3.getARGB().length);
-      assertEquals(-1, rgb3.getARGB()[0]);
-      assertEquals(-1, rgb3.getARGB()[1]);
-      assertEquals(-1,  rgb3.getARGB()[2]);
-      assertEquals(-1,  rgb3.getARGB()[3]);
-
-      // Tint doesn't have the alpha
-      // tint = -0.34999
-      // 255 * (1 + tint) = 165 truncated
-      // or (byte) -91 (which is 165 - 256)
-      assertEquals(3, rgb3.getRGBWithTint().length);
-      assertEquals(-91, rgb3.getRGBWithTint()[0]);
-      assertEquals(-91,  rgb3.getRGBWithTint()[1]);
-      assertEquals(-91,  rgb3.getRGBWithTint()[2]);
-
-      // Set the color to black (no theme).
-      rgb3.setRGB(new byte[] {0, 0, 0});
-      assertEquals("FF000000", rgb3.getARGBHex());
-      assertEquals(0, rgb3.getCTColor().getRgb()[0]);
-      assertEquals(0, rgb3.getCTColor().getRgb()[1]);
-      assertEquals(0, rgb3.getCTColor().getRgb()[2]);
-
-      // Set another, is fine
-      rgb3.setRGB(new byte[] {16,17,18});
-      assertFalse(rgb3.hasAlpha());
-      assertEquals("FF101112", rgb3.getARGBHex());
-      assertEquals(0x10, rgb3.getCTColor().getRgb()[0]);
-      assertEquals(0x11, rgb3.getCTColor().getRgb()[1]);
-      assertEquals(0x12, rgb3.getCTColor().getRgb()[2]);
-      
-      wb.close();
-   }
-
-   @Test
-   public void testARGBColour() throws IOException {
-      XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("48779.xlsx");
-
-      // Check the CTColor is as expected
-      XSSFColor rgb4 = wb.getCellStyleAt((short)1).getFillForegroundXSSFColor();
-      assertEquals(false, rgb4.getCTColor().isSetIndexed());
-      assertEquals(0,     rgb4.getCTColor().getIndexed());
-      assertEquals(true, rgb4.getCTColor().isSetRgb());
-      assertEquals(4, rgb4.getCTColor().getRgb().length);
-
-      // Now check the XSSFColor
-      assertEquals(0, rgb4.getIndexed());
-      assertEquals(0.0, rgb4.getTint(), 0);
-      assertFalse(rgb4.hasTint());
-      assertTrue(rgb4.hasAlpha());
-
-      assertEquals("FFFF0000", rgb4.getARGBHex());
-      assertEquals(3, rgb4.getRGB().length);
-      assertEquals(-1, rgb4.getRGB()[0]);
-      assertEquals(0,  rgb4.getRGB()[1]);
-      assertEquals(0,  rgb4.getRGB()[2]);
-
-      assertEquals(4, rgb4.getARGB().length);
-      assertEquals(-1, rgb4.getARGB()[0]);
-      assertEquals(-1, rgb4.getARGB()[1]);
-      assertEquals(0,  rgb4.getARGB()[2]);
-      assertEquals(0,  rgb4.getARGB()[3]);
-
-      // Tint doesn't have the alpha
-      assertEquals(3, rgb4.getRGBWithTint().length);
-      assertEquals(-1, rgb4.getRGBWithTint()[0]);
-      assertEquals(0,  rgb4.getRGBWithTint()[1]);
-      assertEquals(0,  rgb4.getRGBWithTint()[2]);
-
-
-      // Turn on tinting, and check it behaves
-      // TODO These values are suspected to be wrong...
-      rgb4.setTint(0.4);
-      assertTrue(rgb4.hasTint());
-      assertEquals(0.4, rgb4.getTint(), 0);
-
-      assertEquals(3, rgb4.getRGBWithTint().length);
-      assertEquals(-1, rgb4.getRGBWithTint()[0]);
-      assertEquals(102,  rgb4.getRGBWithTint()[1]);
-      assertEquals(102,  rgb4.getRGBWithTint()[2]);
-      
-      wb.close();
-   }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
deleted file mode 100644
index dac2095..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
-import static org.junit.Assert.*;
-
-import java.io.*;
-
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.ss.usermodel.BaseTestCellComment;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.xmlbeans.XmlObject;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComment;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
-
-import com.microsoft.schemas.vml.CTShape;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestXSSFComment extends BaseTestCellComment  {
-
-    private static final String TEST_RICHTEXTSTRING = "test richtextstring";
-
-    public TestXSSFComment() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    /**
-     * test properties of a newly constructed comment
-     */
-    @Test
-    public void constructor() {
-        CommentsTable sheetComments = new CommentsTable();
-        assertNotNull(sheetComments.getCTComments().getCommentList());
-        assertNotNull(sheetComments.getCTComments().getAuthors());
-        assertEquals(1, sheetComments.getCTComments().getAuthors().sizeOfAuthorArray());
-        assertEquals(1, sheetComments.getNumberOfAuthors());
-
-        CTComment ctComment = sheetComments.newComment(CellAddress.A1);
-        CTShape vmlShape = CTShape.Factory.newInstance();
-
-        XSSFComment comment = new XSSFComment(sheetComments, ctComment, vmlShape);
-        assertEquals(null, comment.getString());
-        assertEquals(0, comment.getRow());
-        assertEquals(0, comment.getColumn());
-        assertEquals("", comment.getAuthor());
-        assertEquals(false, comment.isVisible());
-    }
-
-    @Test
-    public void getSetCol() {
-        CommentsTable sheetComments = new CommentsTable();
-        XSSFVMLDrawing vml = new XSSFVMLDrawing();
-        CTComment ctComment = sheetComments.newComment(CellAddress.A1);
-        CTShape vmlShape = vml.newCommentShape();
-
-        XSSFComment comment = new XSSFComment(sheetComments, ctComment, vmlShape);
-        comment.setColumn(1);
-        assertEquals(1, comment.getColumn());
-        assertEquals(1, new CellReference(ctComment.getRef()).getCol());
-        assertEquals(1, vmlShape.getClientDataArray(0).getColumnArray(0).intValue());
-
-        comment.setColumn(5);
-        assertEquals(5, comment.getColumn());
-        assertEquals(5, new CellReference(ctComment.getRef()).getCol());
-        assertEquals(5, vmlShape.getClientDataArray(0).getColumnArray(0).intValue());
-    }
-
-    @Test
-    public void getSetRow() {
-        CommentsTable sheetComments = new CommentsTable();
-        XSSFVMLDrawing vml = new XSSFVMLDrawing();
-        CTComment ctComment = sheetComments.newComment(CellAddress.A1);
-        CTShape vmlShape = vml.newCommentShape();
-
-        XSSFComment comment = new XSSFComment(sheetComments, ctComment, vmlShape);
-        comment.setRow(1);
-        assertEquals(1, comment.getRow());
-        assertEquals(1, new CellReference(ctComment.getRef()).getRow());
-        assertEquals(1, vmlShape.getClientDataArray(0).getRowArray(0).intValue());
-
-        comment.setRow(5);
-        assertEquals(5, comment.getRow());
-        assertEquals(5, new CellReference(ctComment.getRef()).getRow());
-        assertEquals(5, vmlShape.getClientDataArray(0).getRowArray(0).intValue());
-    }
-
-    @Test
-    public void setString() {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sh = wb.createSheet();
-        XSSFComment comment = sh.createDrawingPatriarch().createCellComment(new XSSFClientAnchor());
-
-        //passing HSSFRichTextString is incorrect
-        try {
-            comment.setString(new HSSFRichTextString(TEST_RICHTEXTSTRING));
-            fail("expected exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("Only XSSFRichTextString argument is supported", e.getMessage());
-        }
-
-        //simple string argument
-        comment.setString(TEST_RICHTEXTSTRING);
-        assertEquals(TEST_RICHTEXTSTRING, comment.getString().getString());
-
-        //if the text is already set, it should be overridden, not added twice!
-        comment.setString(TEST_RICHTEXTSTRING);
-
-        CTComment ctComment = comment.getCTComment();
-        XmlObject[] obj = ctComment.selectPath(
-                "declare namespace w='"+NS_SPREADSHEETML+"' .//w:text");
-        assertEquals(1, obj.length);
-        assertEquals(TEST_RICHTEXTSTRING, comment.getString().getString());
-
-        //sequential call of comment.getString() should return the same XSSFRichTextString object
-        assertSame(comment.getString(), comment.getString());
-
-        XSSFRichTextString richText = new XSSFRichTextString(TEST_RICHTEXTSTRING);
-        XSSFFont font1 = wb.createFont();
-        font1.setFontName("Tahoma");
-        font1.setFontHeight(8.5);
-        font1.setItalic(true);
-        font1.setColor(IndexedColors.BLUE_GREY.getIndex());
-        richText.applyFont(0, 5, font1);
-
-        //check the low-level stuff
-        comment.setString(richText);
-        obj = ctComment.selectPath(
-                "declare namespace w='"+NS_SPREADSHEETML+"' .//w:text");
-        assertEquals(1, obj.length);
-        assertSame(comment.getString(), richText);
-        //check that the rich text is set in the comment
-        CTRPrElt rPr = richText.getCTRst().getRArray(0).getRPr();
-        assertEquals(true, rPr.getIArray(0).getVal());
-        assertEquals(8.5, rPr.getSzArray(0).getVal(), 0);
-        assertEquals(IndexedColors.BLUE_GREY.getIndex(), rPr.getColorArray(0).getIndexed());
-        assertEquals("Tahoma", rPr.getRFontArray(0).getVal());
-        
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(wb));
-    }
-
-    @Test
-    public void author() {
-        CommentsTable sheetComments = new CommentsTable();
-        CTComment ctComment = sheetComments.newComment(CellAddress.A1);
-
-        assertEquals(1, sheetComments.getNumberOfAuthors());
-        XSSFComment comment = new XSSFComment(sheetComments, ctComment, null);
-        assertEquals("", comment.getAuthor());
-        comment.setAuthor("Apache POI");
-        assertEquals("Apache POI", comment.getAuthor());
-        assertEquals(2, sheetComments.getNumberOfAuthors());
-        comment.setAuthor("Apache POI");
-        assertEquals(2, sheetComments.getNumberOfAuthors());
-        comment.setAuthor("");
-        assertEquals("", comment.getAuthor());
-        assertEquals(2, sheetComments.getNumberOfAuthors());
-    }
-
-    @Test
-    public void testBug58175() throws IOException {
-        Workbook wb = new SXSSFWorkbook();
-        try {
-            Sheet sheet = wb.createSheet();
-
-            Row row = sheet.createRow(1);
-            Cell cell = row.createCell(3);
-
-            cell.setCellValue("F4");
-
-            CreationHelper factory = wb.getCreationHelper();
-
-            // When the comment box is visible, have it show in a 1x3 space
-            ClientAnchor anchor = factory.createClientAnchor();
-            anchor.setCol1(cell.getColumnIndex());
-            anchor.setCol2(cell.getColumnIndex() + 1);
-            anchor.setRow1(row.getRowNum());
-            anchor.setRow2(row.getRowNum() + 3);
-
-            XSSFClientAnchor ca = (XSSFClientAnchor) anchor;
-
-            // create comments and vmlDrawing parts if they don't exist
-            CommentsTable comments = ((SXSSFWorkbook) wb).getXSSFWorkbook()
-                    .getSheetAt(0).getCommentsTable(true);
-            XSSFVMLDrawing vml = ((SXSSFWorkbook) wb).getXSSFWorkbook()
-                    .getSheetAt(0).getVMLDrawing(true);
-            CTShape vmlShape1 = vml.newCommentShape();
-            if (ca.isSet()) {
-                String position = ca.getCol1() + ", 0, " + ca.getRow1()
-                        + ", 0, " + ca.getCol2() + ", 0, " + ca.getRow2()
-                        + ", 0";
-                vmlShape1.getClientDataArray(0).setAnchorArray(0, position);
-            }
-
-            // create the comment in two different ways and verify that there is no difference
-            XSSFComment shape1 = new XSSFComment(comments, comments.newComment(CellAddress.A1), vmlShape1);
-            shape1.setColumn(ca.getCol1());
-            shape1.setRow(ca.getRow1());
-
-            CTShape vmlShape2 = vml.newCommentShape();
-            if (ca.isSet()) {
-                String position = ca.getCol1() + ", 0, " + ca.getRow1()
-                        + ", 0, " + ca.getCol2() + ", 0, " + ca.getRow2()
-                        + ", 0";
-                vmlShape2.getClientDataArray(0).setAnchorArray(0, position);
-            }
-            
-            CellAddress ref = new CellAddress(ca.getRow1(), ca.getCol1());
-            XSSFComment shape2 = new XSSFComment(comments, comments.newComment(ref), vmlShape2);
-        
-            assertEquals(shape1.getAuthor(), shape2.getAuthor());
-            assertEquals(shape1.getClientAnchor(), shape2.getClientAnchor());
-            assertEquals(shape1.getColumn(), shape2.getColumn());
-            assertEquals(shape1.getRow(), shape2.getRow());
-            assertEquals(shape1.getCTComment().toString(), shape2.getCTComment().toString());
-            assertEquals(shape1.getCTComment().getRef(), shape2.getCTComment().getRef());
-            
-            /*CommentsTable table1 = shape1.getCommentsTable();
-            CommentsTable table2 = shape2.getCommentsTable();
-            assertEquals(table1.getCTComments().toString(), table2.getCTComments().toString());
-            assertEquals(table1.getNumberOfComments(), table2.getNumberOfComments());
-            assertEquals(table1.getRelations(), table2.getRelations());*/
-            
-            assertEquals("The vmlShapes should have equal content afterwards", 
-                    vmlShape1.toString().replaceAll("_x0000_s\\d+", "_x0000_s0000"), vmlShape2.toString().replaceAll("_x0000_s\\d+", "_x0000_s0000"));
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Ignore("Used for manual testing with opening the resulting Workbook in Excel")
-    @Test
-    public void testBug58175a() throws IOException {
-        Workbook wb = new SXSSFWorkbook();
-        try {
-            Sheet sheet = wb.createSheet();
-
-            Row row = sheet.createRow(1);
-            Cell cell = row.createCell(3);
-
-            cell.setCellValue("F4");
-
-            Drawing drawing = sheet.createDrawingPatriarch();
-
-            CreationHelper factory = wb.getCreationHelper();
-
-            // When the comment box is visible, have it show in a 1x3 space
-            ClientAnchor anchor = factory.createClientAnchor();
-            anchor.setCol1(cell.getColumnIndex());
-            anchor.setCol2(cell.getColumnIndex() + 1);
-            anchor.setRow1(row.getRowNum());
-            anchor.setRow2(row.getRowNum() + 3);
-
-            // Create the comment and set the text+author
-            Comment comment = drawing.createCellComment(anchor);
-            RichTextString str = factory.createRichTextString("Hello, World!");
-            comment.setString(str);
-            comment.setAuthor("Apache POI");
-
-            /* fixed the problem as well 
-             * comment.setColumn(cell.getColumnIndex());
-             * comment.setRow(cell.getRowIndex());
-             */
-
-            // Assign the comment to the cell
-            cell.setCellComment(comment);
-
-            OutputStream out = new FileOutputStream("C:\\temp\\58175.xlsx");
-            try {
-                wb.write(out);
-            } finally {
-                out.close();
-            }
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void bug57838DeleteRowsWthCommentsBug() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57838.xlsx");
-        Sheet sheet=wb.getSheetAt(0);
-        Comment comment1 = sheet.getCellComment(new CellAddress(2, 1));
-        assertNotNull(comment1);
-        Comment comment2 = sheet.getCellComment(new CellAddress(2, 2));
-        assertNotNull(comment2);
-        Row row=sheet.getRow(2);
-        assertNotNull(row);
-
-        sheet.removeRow(row); // Remove row from index 2
-
-        row=sheet.getRow(2);
-        assertNull(row); // Row is null since we deleted it.
-
-        comment1 = sheet.getCellComment(new CellAddress(2, 1));
-        assertNull(comment1); // comment should be null but will fail due to bug
-        comment2 = sheet.getCellComment(new CellAddress(2, 2));
-        assertNull(comment2); // comment should be null but will fail due to bug
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
deleted file mode 100644
index a73a0cf..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BaseTestConditionalFormatting;
-import org.apache.poi.ss.usermodel.Color;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.junit.Test;
-
-/**
- * XSSF-specific Conditional Formatting tests
- */
-public class TestXSSFConditionalFormatting extends BaseTestConditionalFormatting {
-    public TestXSSFConditionalFormatting(){
-        super(XSSFITestDataProvider.instance);
-    }
-
-    @Override
-    protected void assertColour(String hexExpected, Color actual) {
-        assertNotNull("Colour must be given", actual);
-        XSSFColor colour = (XSSFColor)actual;
-        if (hexExpected.length() == 8) {
-            assertEquals(hexExpected, colour.getARGBHex());
-        } else {
-            assertEquals(hexExpected, colour.getARGBHex().substring(2));
-        }
-    }
-
-    @Test
-    public void testRead() throws IOException {
-        testRead("WithConditionalFormatting.xlsx");
-    }
-    
-    @Test
-    public void testReadOffice2007() throws IOException {
-        testReadOffice2007("NewStyleConditionalFormattings.xlsx");
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
deleted file mode 100644
index c717953..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BaseTestDataFormat;
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-
-/**
- * Tests for {@link XSSFDataFormat}
- */
-public final class TestXSSFDataFormat extends BaseTestDataFormat {
-
-	public TestXSSFDataFormat() {
-		super(XSSFITestDataProvider.instance);
-	}
-
-    /**
-     * [Bug 49928] formatCellValue returns incorrect value for \u00a3 formatted cells
-     */
-	@Override
-    @Test
-    public void test49928() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("49928.xlsx");
-        doTest49928Core(wb);
-        
-        DataFormat dataFormat = wb.createDataFormat();
-
-        // As of 2015-12-27, there is no way to override a built-in number format with POI XSSFWorkbook
-        // 49928.xlsx has been saved with a poundFmt that overrides the default value (dollar)
-        short poundFmtIdx = wb.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getDataFormat();
-        assertEquals(poundFmtIdx, dataFormat.getFormat(poundFmt));
-
-        // now create a custom format with Pound (\u00a3)
-        
-        String customFmt = "\u00a3##.00[Yellow]";
-        assertNotBuiltInFormat(customFmt);
-        short customFmtIdx = dataFormat.getFormat(customFmt);
-        assertTrue(customFmtIdx >= BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX);
-        assertEquals(customFmt, dataFormat.getFormat(customFmtIdx));
-        
-        wb.close();
-    }
-    
-    /**
-     * [Bug 58532] Handle formats that go numnum, numK, numM etc 
-     */
-	@Override
-    @Test
-    public void test58532() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("FormatKM.xlsx");
-        doTest58532Core(wb);
-        wb.close();
-    }
-    
-    /**
-     * [Bug 58778] Built-in number formats can be overridden with XSSFDataFormat.putFormat(int id, String fmt)
-     */
-	@Test
-    public void test58778() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        Cell cell = wb1.createSheet("bug58778").createRow(0).createCell(0);
-        cell.setCellValue(5.25);
-        CellStyle style = wb1.createCellStyle();
-        
-        XSSFDataFormat dataFormat = wb1.createDataFormat();
-        
-        short poundFmtIdx = 6;
-        dataFormat.putFormat(poundFmtIdx, poundFmt);
-        style.setDataFormat(poundFmtIdx);
-        cell.setCellStyle(style);
-        // Cell should appear as "<poundsymbol>5"
-        
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutCloseAndReadBack(wb1);
-        cell = wb2.getSheet("bug58778").getRow(0).getCell(0);
-        assertEquals(5.25, cell.getNumericCellValue(), 0);
-        
-        style = cell.getCellStyle();
-        assertEquals(poundFmt, style.getDataFormatString());
-        assertEquals(poundFmtIdx, style.getDataFormat());
-        
-        // manually check the file to make sure the cell is rendered as "<poundsymbol>5"
-        // Verified with LibreOffice 4.2.8.2 on 2015-12-28
-        wb2.close();
-        wb1.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
deleted file mode 100644
index e0da16b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.BaseTestDataValidation;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-
-public class TestXSSFDataValidation extends BaseTestDataValidation {
-
-    public TestXSSFDataValidation(){
-        super(XSSFITestDataProvider.instance);
-    }
-
-    @Test
-	public void testAddValidations() throws Exception {
-		XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("DataValidations-49244.xlsx");
-		Sheet sheet = wb1.getSheetAt(0);
-		List<XSSFDataValidation> dataValidations = ((XSSFSheet)sheet).getDataValidations();
-		
-/**
- * 		For each validation type, there are two cells with the same validation. This tests
- * 		application of a single validation definition to multiple cells.
- * 		
- * 		For list ( 3 validations for explicit and 3 for formula )
- * 			- one validation that allows blank. 
- * 			- one that does not allow blank.
- * 			- one that does not show the drop down arrow.
- * 		= 2
- * 
- * 		For number validations ( integer/decimal and text length ) with 8 different types of operators.
- *		= 50  
- * 
- * 		= 52 ( Total )
- */
-		assertEquals(52,dataValidations.size());
-
-		DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-		int[] validationTypes = new int[]{ValidationType.INTEGER,ValidationType.DECIMAL,ValidationType.TEXT_LENGTH};
-		
-		int[] singleOperandOperatorTypes = new int[]{
-				OperatorType.LESS_THAN,OperatorType.LESS_OR_EQUAL,
-				OperatorType.GREATER_THAN,OperatorType.GREATER_OR_EQUAL,
-				OperatorType.EQUAL,OperatorType.NOT_EQUAL
-				} ;
-		int[] doubleOperandOperatorTypes = new int[]{
-				OperatorType.BETWEEN,OperatorType.NOT_BETWEEN
-		};
-		
-		BigDecimal value  = new BigDecimal("10"),value2 = new BigDecimal("20");
-		BigDecimal dvalue = new BigDecimal("10.001"),dvalue2 = new BigDecimal("19.999");
-		final int lastRow = sheet.getLastRowNum();
-		int offset = lastRow + 3;
-		
-		int lastKnownNumValidations = dataValidations.size();
-		
-		Row row = sheet.createRow(offset++);
-		Cell cell = row.createCell(0);
-		DataValidationConstraint explicitListValidation = dataValidationHelper.createExplicitListConstraint(new String[]{"MA","MI","CA"});
-		CellRangeAddressList cellRangeAddressList = new CellRangeAddressList();
-		cellRangeAddressList.addCellRangeAddress(cell.getRowIndex(), cell.getColumnIndex(), cell.getRowIndex(), cell.getColumnIndex());
-		DataValidation dataValidation = dataValidationHelper.createValidation(explicitListValidation, cellRangeAddressList);
-		setOtherValidationParameters(dataValidation);
-		sheet.addValidationData(dataValidation);
-		lastKnownNumValidations++;
-		
-		row = sheet.createRow(offset++);
-		cell = row.createCell(0);
-
-		cellRangeAddressList = new CellRangeAddressList();
-		cellRangeAddressList.addCellRangeAddress(cell.getRowIndex(), cell.getColumnIndex(), cell.getRowIndex(), cell.getColumnIndex());
-		
-		Cell firstCell =  row.createCell(1);firstCell.setCellValue("UT");
-		Cell secondCell = row.createCell(2);secondCell.setCellValue("MN");
-		Cell thirdCell  = row.createCell(3);thirdCell.setCellValue("IL");
-		
-		int rowNum = row.getRowNum() + 1;
-		String listFormula = new StringBuilder("$B$").append(rowNum).append(":").append("$D$").append(rowNum).toString();
-		DataValidationConstraint formulaListValidation = dataValidationHelper.createFormulaListConstraint(listFormula);
-		
-		dataValidation = dataValidationHelper.createValidation(formulaListValidation, cellRangeAddressList);
-		setOtherValidationParameters(dataValidation);
-		sheet.addValidationData(dataValidation);
-		lastKnownNumValidations++;
-		
-		offset++;
-		offset++;
-		
-		for (int i = 0; i < validationTypes.length; i++) {
-			int validationType = validationTypes[i];
-			offset = offset + 2;
-			final Row row0 = sheet.createRow(offset++);			
-			Cell cell_10 = row0.createCell(0);
-			cell_10.setCellValue(validationType==ValidationType.DECIMAL ? "Decimal " : validationType==ValidationType.INTEGER ? "Integer" : "Text Length");
-			offset++;
-			for (int j = 0; j < singleOperandOperatorTypes.length; j++) {
-				int operatorType = singleOperandOperatorTypes[j];
-				final Row row1 = sheet.createRow(offset++);
-				
-				//For Integer (> and >=) we add 1 extra cell for validations whose formulae reference other cells.
-				final Row row2 = i==0 && j < 2 ? sheet.createRow(offset++) : null;
-				
-				cell_10 = row1.createCell(0);
-				cell_10.setCellValue(XSSFDataValidation.operatorTypeMappings.get(operatorType).toString());				
-				Cell cell_11 = row1.createCell(1);
-				Cell cell_21 = row1.createCell(2);
-				Cell cell_22 = i==0 && j < 2 ? row2.createCell(2) : null;
-				
-				Cell cell_13 = row1.createCell(3);
-				
-				
-				cell_13.setCellType(CellType.NUMERIC);				
-				cell_13.setCellValue(validationType==ValidationType.DECIMAL ? dvalue.doubleValue() : value.intValue());
-
-				
-				//First create value based validation;
-				DataValidationConstraint constraint = dataValidationHelper.createNumericConstraint(validationType,operatorType, value.toString(), null);
-				cellRangeAddressList = new CellRangeAddressList();
-				cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_11.getRowIndex(),cell_11.getRowIndex(),cell_11.getColumnIndex(),cell_11.getColumnIndex()));
-				DataValidation validation = dataValidationHelper.createValidation(constraint, cellRangeAddressList);
-				setOtherValidationParameters(validation);
-				sheet.addValidationData(validation);
-				assertEquals(++lastKnownNumValidations,((XSSFSheet)sheet).getDataValidations().size());
-				
-				//Now create real formula based validation.
-				String formula1 = new CellReference(cell_13.getRowIndex(),cell_13.getColumnIndex()).formatAsString();
-				constraint = dataValidationHelper.createNumericConstraint(validationType,operatorType, formula1, null);
-				if (i==0 && j==0) {
-					cellRangeAddressList = new CellRangeAddressList();
-					cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_21.getRowIndex(), cell_21.getRowIndex(), cell_21.getColumnIndex(), cell_21.getColumnIndex()));
-					validation = dataValidationHelper.createValidation(constraint, cellRangeAddressList);
-					setOtherValidationParameters(validation);
-					sheet.addValidationData(validation);
-					assertEquals(++lastKnownNumValidations, ((XSSFSheet) sheet).getDataValidations().size());
-					
-					cellRangeAddressList = new CellRangeAddressList();
-					cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_22.getRowIndex(), cell_22.getRowIndex(), cell_22.getColumnIndex(), cell_22.getColumnIndex()));
-					validation = dataValidationHelper.createValidation(constraint, cellRangeAddressList);
-					setOtherValidationParameters( validation);
-					sheet.addValidationData(validation);
-					assertEquals(++lastKnownNumValidations, ((XSSFSheet) sheet).getDataValidations().size());
-				} else if(i==0 && j==1 ){
-					cellRangeAddressList = new CellRangeAddressList();					
-					cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_21.getRowIndex(), cell_21.getRowIndex(), cell_21.getColumnIndex(), cell_21.getColumnIndex()));
-					cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_22.getRowIndex(), cell_22.getRowIndex(), cell_22.getColumnIndex(), cell_22.getColumnIndex()));
-					validation = dataValidationHelper.createValidation(constraint, cellRangeAddressList);
-					setOtherValidationParameters( validation);
-					sheet.addValidationData(validation);
-					assertEquals(++lastKnownNumValidations, ((XSSFSheet) sheet).getDataValidations().size());
-				} else {
-					cellRangeAddressList = new CellRangeAddressList();
-					cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_21.getRowIndex(), cell_21.getRowIndex(), cell_21.getColumnIndex(), cell_21.getColumnIndex()));
-					validation = dataValidationHelper.createValidation(constraint, cellRangeAddressList);
-					setOtherValidationParameters(validation);
-					sheet.addValidationData(validation);
-					assertEquals(++lastKnownNumValidations, ((XSSFSheet) sheet).getDataValidations().size());
-				}
-			}
-
-			for (int operatorType : doubleOperandOperatorTypes) {
-				final Row row1 = sheet.createRow(offset++);
-				
-				cell_10 = row1.createCell(0);
-				cell_10.setCellValue(XSSFDataValidation.operatorTypeMappings.get(operatorType).toString());				
-				
-				Cell cell_11 = row1.createCell(1);
-				Cell cell_21 = row1.createCell(2);
-				
-				Cell cell_13 = row1.createCell(3);
-				Cell cell_14 = row1.createCell(4);
-				
-				
-				String value1String = validationType==ValidationType.DECIMAL ? dvalue.toString() : value.toString();
-				cell_13.setCellType(CellType.NUMERIC);				
-				cell_13.setCellValue(validationType==ValidationType.DECIMAL ? dvalue.doubleValue() : value.intValue());
-
-				String value2String = validationType==ValidationType.DECIMAL ? dvalue2.toString() : value2.toString();
-				cell_14.setCellType(CellType.NUMERIC);
-				cell_14.setCellValue(validationType==ValidationType.DECIMAL ? dvalue2.doubleValue() : value2.intValue());
-				
-				
-				//First create value based validation;
-				DataValidationConstraint constraint = dataValidationHelper.createNumericConstraint(validationType,operatorType, value1String, value2String);
-				cellRangeAddressList = new CellRangeAddressList();
-				cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_11.getRowIndex(),cell_11.getRowIndex(),cell_11.getColumnIndex(),cell_11.getColumnIndex()));
-				DataValidation validation = dataValidationHelper.createValidation(constraint, cellRangeAddressList);
-				setOtherValidationParameters(validation);
-				sheet.addValidationData(validation);
-				assertEquals(++lastKnownNumValidations,((XSSFSheet)sheet).getDataValidations().size());
-				
-				
-				//Now create real formula based validation.
-				String formula1 = new CellReference(cell_13.getRowIndex(),cell_13.getColumnIndex()).formatAsString();
-				String formula2 = new CellReference(cell_14.getRowIndex(),cell_14.getColumnIndex()).formatAsString();
-				constraint = dataValidationHelper.createNumericConstraint(validationType,operatorType, formula1, formula2);
-				cellRangeAddressList = new CellRangeAddressList();
-				cellRangeAddressList.addCellRangeAddress(new CellRangeAddress(cell_21.getRowIndex(),cell_21.getRowIndex(),cell_21.getColumnIndex(),cell_21.getColumnIndex()));
-				validation = dataValidationHelper.createValidation(constraint, cellRangeAddressList);
-				
-				setOtherValidationParameters(validation);
-				sheet.addValidationData(validation);	
-				assertEquals(++lastKnownNumValidations,((XSSFSheet)sheet).getDataValidations().size());
-			}
-		}
-
-		XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-		wb1.close();
-		Sheet sheetAt = wb2.getSheetAt(0);
-		assertEquals(lastKnownNumValidations,((XSSFSheet)sheetAt).getDataValidations().size());
-		wb2.close();
-	}
-
-	protected void setOtherValidationParameters(DataValidation validation) {
-		boolean yesNo = true;
-		validation.setEmptyCellAllowed(yesNo);
-		validation.setShowErrorBox(yesNo);
-		validation.setShowPromptBox(yesNo);
-		validation.createErrorBox("Error Message Title", "Error Message");
-		validation.createPromptBox("Prompt", "Enter some value");
-		validation.setSuppressDropDownArrow(yesNo);
-	}
-
-	@Test
-    public void test53965() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-            List<XSSFDataValidation> lst = sheet.getDataValidations();    //<-- works
-            assertEquals(0, lst.size());
-    
-            //create the cell that will have the validation applied
-            sheet.createRow(0).createCell(0);
-    
-            DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-            DataValidationConstraint constraint = dataValidationHelper.createCustomConstraint("SUM($A$1:$A$1) <= 3500");
-            CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-            DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-            sheet.addValidationData(validation);
-    
-            // this line caused XmlValueOutOfRangeException , see Bugzilla 3965
-            lst = sheet.getDataValidations();
-            assertEquals(1, lst.size());
-        } finally {
-            wb.close();
-        }
-    }
-
-	@Test
-    public void testDefaultAllowBlank() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-    
-            final XSSFDataValidation validation = createValidation(sheet);
-            sheet.addValidationData(validation);
-    
-            final List<XSSFDataValidation> dataValidations = sheet.getDataValidations();
-            assertEquals(true, dataValidations.get(0).getCtDdataValidation().getAllowBlank());
-        } finally {
-            wb.close();
-        }
-    }
-
-	@Test
-    public void testSetAllowBlankToFalse() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-    
-            final XSSFDataValidation validation = createValidation(sheet);
-            validation.getCtDdataValidation().setAllowBlank(false);
-    
-            sheet.addValidationData(validation);
-    
-            final List<XSSFDataValidation> dataValidations = sheet.getDataValidations();
-            assertEquals(false, dataValidations.get(0).getCtDdataValidation().getAllowBlank());
-        } finally {
-            wb.close();
-        }
-    }
-
-	@Test
-    public void testSetAllowBlankToTrue() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-    
-            final XSSFDataValidation validation = createValidation(sheet);
-            validation.getCtDdataValidation().setAllowBlank(true);
-    
-            sheet.addValidationData(validation);
-    
-            final List<XSSFDataValidation> dataValidations = sheet.getDataValidations();
-            assertEquals(true, dataValidations.get(0).getCtDdataValidation().getAllowBlank());
-        } finally {
-            wb.close();
-        }
-    }
-
-    private XSSFDataValidation createValidation(XSSFSheet sheet) {
-        //create the cell that will have the validation applied
-        final Row row = sheet.createRow(0);
-        row.createCell(0);
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-
-        DataValidationConstraint constraint = dataValidationHelper.createCustomConstraint("true");
-        final XSSFDataValidation validation = (XSSFDataValidation) dataValidationHelper.createValidation(constraint, new CellRangeAddressList(0, 0, 0, 0));
-        return validation;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
deleted file mode 100644
index a3475f4..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType;
-import org.junit.Test;
-
-public class TestXSSFDataValidationConstraint {
-    static final int listType = ValidationType.LIST;
-    static final int ignoredType = OperatorType.IGNORED;
-
-    // See bug 59719
-    @Test
-    public void listLiteralsQuotesAreStripped_formulaConstructor() {
-        // literal list, using formula constructor
-        String literal = "\"one, two, three\"";
-        String[] expected = new String[] { "one", "two", "three" };
-        DataValidationConstraint constraint = new XSSFDataValidationConstraint(listType, ignoredType, literal, null);
-        assertArrayEquals(expected, constraint.getExplicitListValues());
-        // Excel and DataValidationConstraint parser ignore (strip) whitespace; quotes should still be intact
-        // FIXME: whitespace wasn't stripped
-        assertEquals(literal, constraint.getFormula1());
-    }
-    
-    @Test
-    public void listLiteralsQuotesAreStripped_arrayConstructor() {
-        // literal list, using array constructor
-        String literal = "\"one, two, three\"";
-        String[] expected = new String[] { "one", "two", "three" };
-        DataValidationConstraint constraint = new XSSFDataValidationConstraint(expected);
-        assertArrayEquals(expected, constraint.getExplicitListValues());
-        // Excel and DataValidationConstraint parser ignore (strip) whitespace; quotes should still be intact
-        assertEquals(literal.replace(" ", ""), constraint.getFormula1());
-	}
-	
-    @Test
-    public void rangeReference() {
-		// (unnamed range) reference list        
-        String reference = "A1:A5";
-        DataValidationConstraint constraint = new XSSFDataValidationConstraint(listType, ignoredType, reference, null);
-        assertNull(constraint.getExplicitListValues());
-        assertEquals("A1:A5", constraint.getFormula1());
-    }
-    
-    @Test
-    public void namedRangeReference() {
-        // named range list
-        String namedRange = "MyNamedRange";
-        DataValidationConstraint constraint = new XSSFDataValidationConstraint(listType, ignoredType, namedRange, null);
-        assertNull(constraint.getExplicitListValues());
-        assertEquals("MyNamedRange", constraint.getFormula1());
-    }
-
-}        
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
deleted file mode 100644
index 8a72b41..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDialogsheet;
-
-
-public class TestXSSFDialogSheet extends TestCase {
-	
-
-	public void testCreateDialogSheet() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        Sheet dialogsheet = workbook.createDialogsheet("Dialogsheet 1", CTDialogsheet.Factory.newInstance());
-        assertNotNull(dialogsheet);
-	}
-    
-    public void testGetDialog() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet dialogsheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertTrue(dialogsheet.getDialog());
-    	
-    }
-	
-	public void testAddRow() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        Sheet dialogsheet = workbook.createDialogsheet("Dialogsheet 1", CTDialogsheet.Factory.newInstance());
-        assertNotNull(dialogsheet);
-        Row row = dialogsheet.createRow(0);
-        assertNull(row);
-	}
-    
-    public void testGetSetAutoBreaks() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertTrue(sheet.getAutobreaks());
-        sheet.setAutobreaks(false);
-        assertFalse(sheet.getAutobreaks());
-    }
-    
-    public void testIsSetFitToPage() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertFalse(sheet.getFitToPage());
-        sheet.setFitToPage(true);
-        assertTrue(sheet.getFitToPage());
-        sheet.setFitToPage(false);
-        assertFalse(sheet.getFitToPage());
-    }
-    
-   
-    public void testGetFooter() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertNotNull(sheet.getFooter());
-        sheet.getFooter().setCenter("test center footer");
-        assertEquals("test center footer", sheet.getFooter().getCenter());
-    }
-    
-    public void testGetAllHeadersFooters() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertNotNull(sheet);
-        assertNotNull(sheet.getOddFooter());
-        assertNotNull(sheet.getEvenFooter());
-        assertNotNull(sheet.getFirstFooter());
-        assertNotNull(sheet.getOddHeader());
-        assertNotNull(sheet.getEvenHeader());
-        assertNotNull(sheet.getFirstHeader());
-        
-        assertEquals("", sheet.getOddFooter().getLeft());
-        sheet.getOddFooter().setLeft("odd footer left");
-        assertEquals("odd footer left", sheet.getOddFooter().getLeft());
-        
-        assertEquals("", sheet.getEvenFooter().getLeft());
-        sheet.getEvenFooter().setLeft("even footer left");
-        assertEquals("even footer left", sheet.getEvenFooter().getLeft());
-        
-        assertEquals("", sheet.getFirstFooter().getLeft());
-        sheet.getFirstFooter().setLeft("first footer left");
-        assertEquals("first footer left", sheet.getFirstFooter().getLeft());
-        
-        assertEquals("", sheet.getOddHeader().getLeft());
-        sheet.getOddHeader().setLeft("odd header left");
-        assertEquals("odd header left", sheet.getOddHeader().getLeft());
-        
-        assertEquals("", sheet.getOddHeader().getRight());
-        sheet.getOddHeader().setRight("odd header right");
-        assertEquals("odd header right", sheet.getOddHeader().getRight());
-        
-        assertEquals("", sheet.getOddHeader().getCenter());
-        sheet.getOddHeader().setCenter("odd header center");
-        assertEquals("odd header center", sheet.getOddHeader().getCenter());
-
-    }
-    
-    public void testGetSetHorizontallyCentered() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertFalse(sheet.getHorizontallyCenter());
-        sheet.setHorizontallyCenter(true);
-        assertTrue(sheet.getHorizontallyCenter());
-        sheet.setHorizontallyCenter(false);
-        assertFalse(sheet.getHorizontallyCenter());
-    }
-    
-    public void testGetSetVerticallyCentered() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertFalse(sheet.getVerticallyCenter());
-        sheet.setVerticallyCenter(true);
-        assertTrue(sheet.getVerticallyCenter());
-        sheet.setVerticallyCenter(false);
-        assertFalse(sheet.getVerticallyCenter());
-    }
-    
-    public void testIsSetPrintGridlines() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertFalse(sheet.isPrintGridlines());
-        sheet.setPrintGridlines(true);
-        assertTrue(sheet.isPrintGridlines());
-    }
-    
-    public void testIsSetDisplayFormulas() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertFalse(sheet.isDisplayFormulas());
-        sheet.setDisplayFormulas(true);
-        assertTrue(sheet.isDisplayFormulas());
-    }
-    
-    public void testIsSetDisplayGridLines() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertTrue(sheet.isDisplayGridlines());
-        sheet.setDisplayGridlines(false);
-        assertFalse(sheet.isDisplayGridlines());
-    }
-    
-    public void testIsSetDisplayRowColHeadings() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertTrue(sheet.isDisplayRowColHeadings());
-        sheet.setDisplayRowColHeadings(false);
-        assertFalse(sheet.isDisplayRowColHeadings());
-    }
-    
-    public void testGetScenarioProtect() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
-        assertFalse(sheet.getScenarioProtect());
-    }
-	
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
deleted file mode 100644
index 8bcce73..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLDocumentPart.RelationPart;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.FontUnderline;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTDrawing;
-
-public class TestXSSFDrawing {
-    @Test
-    public void testRead() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithDrawing.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-        //the sheet has one relationship and it is XSSFDrawing
-        List<RelationPart> rels = sheet.getRelationParts();
-        assertEquals(1, rels.size());
-        RelationPart rp = rels.get(0);
-        assertTrue(rp.getDocumentPart() instanceof XSSFDrawing);
-
-        XSSFDrawing drawing = (XSSFDrawing)rp.getDocumentPart();
-        //sheet.createDrawingPatriarch() should return the same instance of XSSFDrawing
-        assertSame(drawing, sheet.createDrawingPatriarch());
-        String drawingId = rp.getRelationship().getId();
-
-        //there should be a relation to this drawing in the worksheet
-        assertTrue(sheet.getCTWorksheet().isSetDrawing());
-        assertEquals(drawingId, sheet.getCTWorksheet().getDrawing().getId());
-
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(6, shapes.size());
-
-        assertTrue(shapes.get(0) instanceof XSSFPicture);
-        assertTrue(shapes.get(1) instanceof XSSFPicture);
-        assertTrue(shapes.get(2) instanceof XSSFPicture);
-        assertTrue(shapes.get(3) instanceof XSSFPicture);
-        assertTrue(shapes.get(4) instanceof XSSFSimpleShape);
-        assertTrue(shapes.get(5) instanceof XSSFPicture);
-
-        for(XSSFShape sh : shapes) assertNotNull(sh.getAnchor());
-
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    @Test
-    public void testNew() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet();
-        //multiple calls of createDrawingPatriarch should return the same instance of XSSFDrawing
-        XSSFDrawing dr1 = sheet.createDrawingPatriarch();
-        XSSFDrawing dr2 = sheet.createDrawingPatriarch();
-        assertSame(dr1, dr2);
-
-        List<RelationPart> rels = sheet.getRelationParts();
-        assertEquals(1, rels.size());
-        RelationPart rp = rels.get(0);
-        assertTrue(rp.getDocumentPart() instanceof XSSFDrawing);
-
-        XSSFDrawing drawing = rp.getDocumentPart();
-        String drawingId = rp.getRelationship().getId();
-
-        //there should be a relation to this drawing in the worksheet
-        assertTrue(sheet.getCTWorksheet().isSetDrawing());
-        assertEquals(drawingId, sheet.getCTWorksheet().getDrawing().getId());
-
-        XSSFConnector c1= drawing.createConnector(new XSSFClientAnchor(0,0,0,0,0,0,2,2));
-        c1.setLineWidth(2.5);
-        c1.setLineStyle(1);
-
-        XSSFShapeGroup c2 = drawing.createGroup(new XSSFClientAnchor(0,0,0,0,0,0,5,5));
-        assertNotNull(c2);
-
-        XSSFSimpleShape c3 = drawing.createSimpleShape(new XSSFClientAnchor(0,0,0,0,2,2,3,4));
-        c3.setText(new XSSFRichTextString("Test String"));
-        c3.setFillColor(128, 128, 128);
-
-        XSSFTextBox c4 = drawing.createTextbox(new XSSFClientAnchor(0,0,0,0,4,4,5,6));
-        XSSFRichTextString rt = new XSSFRichTextString("Test String");
-        rt.applyFont(0, 5, wb1.createFont());
-        rt.applyFont(5, 6, wb1.createFont());
-        c4.setText(rt);
-
-        c4.setNoFill(true);
-        assertEquals(4, drawing.getCTDrawing().sizeOfTwoCellAnchorArray());
-
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(4, shapes.size());
-        assertTrue(shapes.get(0) instanceof XSSFConnector);
-        assertTrue(shapes.get(1) instanceof XSSFShapeGroup);
-        assertTrue(shapes.get(2) instanceof XSSFSimpleShape);
-        assertTrue(shapes.get(3) instanceof XSSFSimpleShape); //
-
-        // Save and re-load it
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-
-        // Check
-        dr1 = sheet.createDrawingPatriarch();
-        CTDrawing ctDrawing = dr1.getCTDrawing();
-        
-        // Connector, shapes and text boxes are all two cell anchors
-        assertEquals(0, ctDrawing.sizeOfAbsoluteAnchorArray());
-        assertEquals(0, ctDrawing.sizeOfOneCellAnchorArray());
-        assertEquals(4, ctDrawing.sizeOfTwoCellAnchorArray());
-
-        shapes = dr1.getShapes();
-        assertEquals(4, shapes.size());
-        assertTrue(shapes.get(0) instanceof XSSFConnector);
-        assertTrue(shapes.get(1) instanceof XSSFShapeGroup);
-        assertTrue(shapes.get(2) instanceof XSSFSimpleShape);
-        assertTrue(shapes.get(3) instanceof XSSFSimpleShape); //
-
-        // Ensure it got the right namespaces
-        String xml = ctDrawing.toString();
-        assertTrue(xml.contains("xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\""));
-        assertTrue(xml.contains("xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\""));
-        
-        checkRewrite(wb2);
-        wb2.close();
-    }
-    
-    @Test
-    public void testMultipleDrawings() throws IOException{
-        XSSFWorkbook wb = new XSSFWorkbook();
-        for (int i = 0; i < 3; i++) {
-            XSSFSheet sheet = wb.createSheet();
-            XSSFDrawing drawing = sheet.createDrawingPatriarch();
-            assertNotNull(drawing);
-        }
-        OPCPackage pkg = wb.getPackage();
-        try {
-            assertEquals(3, pkg.getPartsByContentType(XSSFRelation.DRAWINGS.getContentType()).size());
-            checkRewrite(wb);
-        } finally {
-            pkg.close();
-        }
-        wb.close();
-    }
-
-    @Test
-    public void testClone() throws Exception{
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithDrawing.xlsx");
-        XSSFSheet sheet1 = wb.getSheetAt(0);
-
-        XSSFSheet sheet2 = wb.cloneSheet(0);
-        
-        //the source sheet has one relationship and it is XSSFDrawing
-        List<POIXMLDocumentPart> rels1 = sheet1.getRelations();
-        assertEquals(1, rels1.size());
-        assertTrue(rels1.get(0) instanceof XSSFDrawing);
-
-        List<POIXMLDocumentPart> rels2 = sheet2.getRelations();
-        assertEquals(1, rels2.size());
-        assertTrue(rels2.get(0) instanceof XSSFDrawing);
-
-        XSSFDrawing drawing1 = (XSSFDrawing)rels1.get(0);
-        XSSFDrawing drawing2 = (XSSFDrawing)rels2.get(0);
-        assertNotSame(drawing1, drawing2);  // drawing2 is a clone of drawing1
-
-        List<XSSFShape> shapes1 = drawing1.getShapes();
-        List<XSSFShape> shapes2 = drawing2.getShapes();
-        assertEquals(shapes1.size(), shapes2.size());
-
-        for(int i = 0; i < shapes1.size(); i++){
-            XSSFShape sh1 = shapes1.get(i);
-            XSSFShape sh2 = shapes2.get(i);
-
-            assertTrue(sh1.getClass() == sh2.getClass());
-            assertEquals(sh1.getShapeProperties().toString(), sh2.getShapeProperties().toString());
-        }
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    /**
-     * ensure that rich text attributes defined in a XSSFRichTextString
-     * are passed to XSSFSimpleShape.
-     *
-     * See Bugzilla 52219.
-     */
-    @Test
-    public void testRichText() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-        XSSFRichTextString rt = new XSSFRichTextString("Test String");
-
-        XSSFFont font = wb.createFont();
-        font.setColor(new XSSFColor(new Color(0, 128, 128)));
-        font.setItalic(true);
-        font.setBold(true);
-        font.setUnderline(FontUnderline.SINGLE);
-        rt.applyFont(font);
-
-        shape.setText(rt);
-
-        CTTextParagraph pr = shape.getCTShape().getTxBody().getPArray(0);
-        assertEquals(1, pr.sizeOfRArray());
-
-        CTTextCharacterProperties rPr = pr.getRArray(0).getRPr();
-        assertEquals(true, rPr.getB());
-        assertEquals(true, rPr.getI());
-        assertEquals(STTextUnderlineType.SNG, rPr.getU());
-        assertArrayEquals(
-                new byte[]{0, (byte)128, (byte)128} ,
-                rPr.getSolidFill().getSrgbClr().getVal());
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    /**
-     *  test that anchor is not null when reading shapes from existing drawings
-     */
-    @Test
-    public void testReadAnchors() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFClientAnchor anchor1 = new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4);
-        XSSFShape shape1 = drawing.createTextbox(anchor1);
-        assertNotNull(shape1);
-
-        XSSFClientAnchor anchor2 = new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 5);
-        XSSFShape shape2 = drawing.createTextbox(anchor2);
-        assertNotNull(shape2);
-
-        int pictureIndex= wb1.addPicture(new byte[]{}, XSSFWorkbook.PICTURE_TYPE_PNG);
-        XSSFClientAnchor anchor3 = new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 6);
-        XSSFShape shape3 = drawing.createPicture(anchor3, pictureIndex);
-        assertNotNull(shape3);
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        drawing = sheet.createDrawingPatriarch();
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(shapes.get(0).getAnchor(), anchor1);
-        assertEquals(shapes.get(1).getAnchor(), anchor2);
-        assertEquals(shapes.get(2).getAnchor(), anchor3);
-        
-        checkRewrite(wb2);
-        wb2.close();
-    }
-    
-    /**
-     * ensure that font and color rich text attributes defined in a XSSFRichTextString
-     * are passed to XSSFSimpleShape.
-     *
-     * See Bugzilla 54969.
-     */
-    @Test
-    public void testRichTextFontAndColor() throws IOException {
-    	XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-        XSSFRichTextString rt = new XSSFRichTextString("Test String");
-
-        XSSFFont font = wb.createFont();
-        font.setColor(new XSSFColor(new Color(0, 128, 128)));
-        font.setFontName("Arial");
-        rt.applyFont(font);
-
-        shape.setText(rt);
-
-        CTTextParagraph pr = shape.getCTShape().getTxBody().getPArray(0);
-        assertEquals(1, pr.sizeOfRArray());
-
-        CTTextCharacterProperties rPr = pr.getRArray(0).getRPr();
-        assertEquals("Arial", rPr.getLatin().getTypeface());
-        assertArrayEquals(
-                new byte[]{0, (byte)128, (byte)128} ,
-                rPr.getSolidFill().getSrgbClr().getVal());
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    /**
-     * Test setText single paragraph to ensure backwards compatibility
-     */
-    @Test
-    public void testSetTextSingleParagraph() throws IOException {
-    	XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-        XSSFRichTextString rt = new XSSFRichTextString("Test String");
-
-        XSSFFont font = wb.createFont();
-        font.setColor(new XSSFColor(new Color(0, 255, 255)));
-        font.setFontName("Arial");
-        rt.applyFont(font);
-
-        shape.setText(rt);
-        
-        List<XSSFTextParagraph> paras = shape.getTextParagraphs();
-        assertEquals(1, paras.size());
-        assertEquals("Test String", paras.get(0).getText());
-        
-        List<XSSFTextRun> runs = paras.get(0).getTextRuns();
-        assertEquals(1, runs.size());
-        assertEquals("Arial", runs.get(0).getFontFamily());
-        
-        Color clr = runs.get(0).getFontColor(); 
-        assertArrayEquals(
-                new int[] { 0, 255, 255 } ,
-                new int[] { clr.getRed(), clr.getGreen(), clr.getBlue() });
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-    
-    /**
-     * Test addNewTextParagraph 
-     */
-    @Test
-    public void testAddNewTextParagraph() throws IOException {
-    	XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-        
-        XSSFTextParagraph para = shape.addNewTextParagraph();
-        para.addNewTextRun().setText("Line 1");
-                
-        List<XSSFTextParagraph> paras = shape.getTextParagraphs();
-        assertEquals(2, paras.size());	// this should be 2 as XSSFSimpleShape creates a default paragraph (no text), and then we add a string to that.
-        
-        List<XSSFTextRun> runs = para.getTextRuns();
-        assertEquals(1, runs.size());
-        assertEquals("Line 1", runs.get(0).getText());
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    /**
-     * Test addNewTextParagraph using RichTextString
-     */
-    @Test
-    public void testAddNewTextParagraphWithRTS() throws IOException {
-    	XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-        XSSFRichTextString rt = new XSSFRichTextString("Test Rich Text String");
-
-        XSSFFont font = wb1.createFont();        
-        font.setColor(new XSSFColor(new Color(0, 255, 255)));
-        font.setFontName("Arial");
-        rt.applyFont(font);
-        
-        XSSFFont midfont = wb1.createFont();
-        midfont.setColor(new XSSFColor(new Color(0, 255, 0)));
-        rt.applyFont(5, 14, midfont);	// set the text "Rich Text" to be green and the default font
-        
-        XSSFTextParagraph para = shape.addNewTextParagraph(rt);
-        
-        // Save and re-load it
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-
-        // Check
-        drawing = sheet.createDrawingPatriarch();
-        
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(1, shapes.size());
-        assertTrue(shapes.get(0) instanceof XSSFSimpleShape); 
-        
-        XSSFSimpleShape sshape = (XSSFSimpleShape) shapes.get(0);
-        
-        List<XSSFTextParagraph> paras = sshape.getTextParagraphs();
-        assertEquals(2, paras.size());	// this should be 2 as XSSFSimpleShape creates a default paragraph (no text), and then we add a string to that.  
-        
-        List<XSSFTextRun> runs = para.getTextRuns();
-        assertEquals(3, runs.size());
-        
-        // first run properties
-        assertEquals("Test ", runs.get(0).getText());
-        assertEquals("Arial", runs.get(0).getFontFamily());
-
-        Color clr = runs.get(0).getFontColor(); 
-        assertArrayEquals(
-                new int[] { 0, 255, 255 } ,
-                new int[] { clr.getRed(), clr.getGreen(), clr.getBlue() });
-
-        // second run properties        
-        assertEquals("Rich Text", runs.get(1).getText());
-        assertEquals(XSSFFont.DEFAULT_FONT_NAME, runs.get(1).getFontFamily());
-
-        clr = runs.get(1).getFontColor(); 
-        assertArrayEquals(
-                new int[] { 0, 255, 0 } ,
-                new int[] { clr.getRed(), clr.getGreen(), clr.getBlue() });        
-        
-        // third run properties
-        assertEquals(" String", runs.get(2).getText());
-        assertEquals("Arial", runs.get(2).getFontFamily());
-        clr = runs.get(2).getFontColor(); 
-        assertArrayEquals(
-                new int[] { 0, 255, 255 } ,
-                new int[] { clr.getRed(), clr.getGreen(), clr.getBlue() });
-        
-        checkRewrite(wb2);
-        wb2.close();
-    }    
-    
-    /**
-     * Test add multiple paragraphs and retrieve text
-     */
-    @Test
-    public void testAddMultipleParagraphs() throws IOException {
-    	XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-        
-        XSSFTextParagraph para = shape.addNewTextParagraph();
-        para.addNewTextRun().setText("Line 1");
-                
-        para = shape.addNewTextParagraph();
-        para.addNewTextRun().setText("Line 2");
-        
-        para = shape.addNewTextParagraph();
-        para.addNewTextRun().setText("Line 3");
-        
-        List<XSSFTextParagraph> paras = shape.getTextParagraphs();
-        assertEquals(4, paras.size());	// this should be 4 as XSSFSimpleShape creates a default paragraph (no text), and then we added 3 paragraphs
-        assertEquals("Line 1\nLine 2\nLine 3", shape.getText());           
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-    
-    /**
-     * Test setting the text, then adding multiple paragraphs and retrieve text
-     */
-    @Test
-    public void testSetAddMultipleParagraphs() throws IOException {
-    	XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-        
-        shape.setText("Line 1");
-                
-        XSSFTextParagraph para = shape.addNewTextParagraph();
-        para.addNewTextRun().setText("Line 2");
-        
-        para = shape.addNewTextParagraph();
-        para.addNewTextRun().setText("Line 3");
-        
-        List<XSSFTextParagraph> paras = shape.getTextParagraphs();
-        assertEquals(3, paras.size());	// this should be 3 as we overwrote the default paragraph with setText, then added 2 new paragraphs
-        assertEquals("Line 1\nLine 2\nLine 3", shape.getText());
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-    
-    /**
-     * Test reading text from a textbox in an existing file
-     */
-    @Test
-    public void testReadTextBox() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithDrawing.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-        //the sheet has one relationship and it is XSSFDrawing
-        List<RelationPart> rels = sheet.getRelationParts();
-        assertEquals(1, rels.size());
-        RelationPart rp = rels.get(0);
-        assertTrue(rp.getDocumentPart() instanceof XSSFDrawing);
-
-        XSSFDrawing drawing = rp.getDocumentPart();
-        //sheet.createDrawingPatriarch() should return the same instance of XSSFDrawing
-        assertSame(drawing, sheet.createDrawingPatriarch());
-        String drawingId = rp.getRelationship().getId();
-
-        //there should be a relation to this drawing in the worksheet
-        assertTrue(sheet.getCTWorksheet().isSetDrawing());
-        assertEquals(drawingId, sheet.getCTWorksheet().getDrawing().getId());
-
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(6, shapes.size());
-
-        assertTrue(shapes.get(4) instanceof XSSFSimpleShape);
-
-        XSSFSimpleShape textbox = (XSSFSimpleShape) shapes.get(4); 
-        assertEquals("Sheet with various pictures\n(jpeg, png, wmf, emf and pict)", textbox.getText());
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    
-    /**
-     * Test reading multiple paragraphs from a textbox in an existing file
-     */
-    @Test
-    public void testReadTextBoxParagraphs() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithTextBox.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-        //the sheet has one relationship and it is XSSFDrawing
-        List<RelationPart> rels = sheet.getRelationParts();
-        assertEquals(1, rels.size());
-        RelationPart rp = rels.get(0);
-       
-        assertTrue(rp.getDocumentPart() instanceof XSSFDrawing);
-
-        XSSFDrawing drawing = rp.getDocumentPart();
-        
-        //sheet.createDrawingPatriarch() should return the same instance of XSSFDrawing
-        assertSame(drawing, sheet.createDrawingPatriarch());
-        String drawingId = rp.getRelationship().getId();
-
-        //there should be a relation to this drawing in the worksheet
-        assertTrue(sheet.getCTWorksheet().isSetDrawing());
-        assertEquals(drawingId, sheet.getCTWorksheet().getDrawing().getId());
-
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(1, shapes.size());
-
-        assertTrue(shapes.get(0) instanceof XSSFSimpleShape);
-
-        XSSFSimpleShape textbox = (XSSFSimpleShape) shapes.get(0);
-        
-        List<XSSFTextParagraph> paras = textbox.getTextParagraphs();
-        assertEquals(3, paras.size());
-        
-        assertEquals("Line 2", paras.get(1).getText());	// check content of second paragraph
-
-        assertEquals("Line 1\nLine 2\nLine 3", textbox.getText());	// check content of entire textbox
-        
-        // check attributes of paragraphs
-        assertEquals(TextAlign.LEFT, paras.get(0).getTextAlign());
-        assertEquals(TextAlign.CENTER, paras.get(1).getTextAlign());
-        assertEquals(TextAlign.RIGHT, paras.get(2).getTextAlign());
-        
-        Color clr = paras.get(0).getTextRuns().get(0).getFontColor(); 
-        assertArrayEquals(
-                new int[] { 255, 0, 0 } ,
-                new int[] { clr.getRed(), clr.getGreen(), clr.getBlue() });
-        
-        clr = paras.get(1).getTextRuns().get(0).getFontColor(); 
-        assertArrayEquals(
-                new int[] { 0, 255, 0 } ,
-                new int[] { clr.getRed(), clr.getGreen(), clr.getBlue() });
-        
-        clr = paras.get(2).getTextRuns().get(0).getFontColor(); 
-        assertArrayEquals(
-                new int[] { 0, 0, 255 } ,
-                new int[] { clr.getRed(), clr.getGreen(), clr.getBlue() });
-        
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    /**
-     * Test adding and reading back paragraphs as bullet points
-     */
-    @Test
-    public void testAddBulletParagraphs() throws IOException {
-    
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 10, 20));
-        
-        String paraString1 = "A normal paragraph";
-        String paraString2 = "First bullet";
-        String paraString3 = "Second bullet (level 1)";
-        String paraString4 = "Third bullet";
-        String paraString5 = "Another normal paragraph";
-        String paraString6 = "First numbered bullet";
-        String paraString7 = "Second bullet (level 1)";
-        String paraString8 = "Third bullet (level 1)";
-        String paraString9 = "Fourth bullet (level 1)";
-        String paraString10 = "Fifth Bullet";
-        
-        XSSFTextParagraph para = shape.addNewTextParagraph(paraString1);
-        para = shape.addNewTextParagraph(paraString2);
-        para.setBullet(true);
-
-        para = shape.addNewTextParagraph(paraString3);
-        para.setBullet(true);
-        para.setLevel(1);
-
-        para = shape.addNewTextParagraph(paraString4);
-        para.setBullet(true);
-        
-        para = shape.addNewTextParagraph(paraString5);
-        para = shape.addNewTextParagraph(paraString6);
-        para.setBullet(ListAutoNumber.ARABIC_PERIOD);
-
-        para = shape.addNewTextParagraph(paraString7);
-        para.setBullet(ListAutoNumber.ARABIC_PERIOD, 3);
-        para.setLevel(1);
-        
-        para = shape.addNewTextParagraph(paraString8);
-        para.setBullet(ListAutoNumber.ARABIC_PERIOD, 3);
-        para.setLevel(1);
-
-        para = shape.addNewTextParagraph("");
-        para.setBullet(ListAutoNumber.ARABIC_PERIOD, 3);
-        para.setLevel(1);
-        
-        para = shape.addNewTextParagraph(paraString9);
-        para.setBullet(ListAutoNumber.ARABIC_PERIOD, 3);
-        para.setLevel(1);
-        
-        para = shape.addNewTextParagraph(paraString10);
-        para.setBullet(ListAutoNumber.ARABIC_PERIOD);
-        
-        // Save and re-load it
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-
-        // Check
-        drawing = sheet.createDrawingPatriarch();
-        
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(1, shapes.size());
-        assertTrue(shapes.get(0) instanceof XSSFSimpleShape); 
-        
-        XSSFSimpleShape sshape = (XSSFSimpleShape) shapes.get(0);
-        
-        List<XSSFTextParagraph> paras = sshape.getTextParagraphs();
-        assertEquals(12, paras.size());  // this should be 12 as XSSFSimpleShape creates a default paragraph (no text), and then we added to that
-        
-        StringBuilder builder = new StringBuilder();
-        
-        builder.append(paraString1);
-        builder.append("\n");
-        builder.append("\u2022 ");
-        builder.append(paraString2);
-        builder.append("\n");
-        builder.append("\t\u2022 ");
-        builder.append(paraString3);
-        builder.append("\n");
-        builder.append("\u2022 ");
-        builder.append(paraString4);
-        builder.append("\n");
-        builder.append(paraString5);
-        builder.append("\n");
-        builder.append("1. ");
-        builder.append(paraString6);
-        builder.append("\n");
-        builder.append("\t3. ");
-        builder.append(paraString7);
-        builder.append("\n");
-        builder.append("\t4. ");
-        builder.append(paraString8);
-        builder.append("\n");
-        builder.append("\t");   // should be empty
-        builder.append("\n");
-        builder.append("\t5. ");
-        builder.append(paraString9);
-        builder.append("\n");
-        builder.append("2. ");
-        builder.append(paraString10);
-        
-        assertEquals(builder.toString(), sshape.getText());
-        
-        checkRewrite(wb2);
-        wb2.close();
-    }  
-    
-    /**
-     * Test reading bullet numbering from a textbox in an existing file
-     */
-    @Test
-    public void testReadTextBox2() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithTextBox2.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-        List<XSSFShape> shapes = drawing.getShapes();
-        XSSFSimpleShape textbox = (XSSFSimpleShape) shapes.get(0);
-        String extracted = textbox.getText();
-        StringBuilder sb = new StringBuilder();
-        sb.append("1. content1A\n");
-        sb.append("\t1. content1B\n");
-        sb.append("\t2. content2B\n");
-        sb.append("\t3. content3B\n");
-        sb.append("2. content2A\n");
-        sb.append("\t3. content2BStartAt3\n");
-        sb.append("\t\n\t\n\t");
-        sb.append("4. content2BStartAt3Incremented\n");
-        sb.append("\t\n\t\n\t\n\t");
-
-        assertEquals(sb.toString(), extracted);
-        checkRewrite(wb);
-        wb.close();
-    }
-
-    @Test
-    public void testXSSFSimpleShapeCausesNPE56514() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("56514.xlsx");
-        XSSFSheet sheet = wb1.getSheetAt(0);
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-        List<XSSFShape> shapes = drawing.getShapes();
-        assertEquals(4, shapes.size());
-        
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        drawing = sheet.createDrawingPatriarch();
-        
-        shapes = drawing.getShapes();
-        assertEquals(4, shapes.size());
-        wb2.close();
-        
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testBug56835CellComment() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-        
-        // first comment works
-        ClientAnchor anchor = new XSSFClientAnchor(1, 1, 2, 2, 3, 3, 4, 4);
-        XSSFComment comment = drawing.createCellComment(anchor);
-        assertNotNull(comment);
-        
-        // Should fail if we try to add the same comment for the same cell
-        try {
-            drawing.createCellComment(anchor);
-        } finally {
-            wb.close();
-        }
-    }
-
-    private static void checkRewrite(XSSFWorkbook wb) throws IOException {
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertNotNull(wb2);
-        wb2.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
deleted file mode 100644
index 1b1417f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class TestXSSFEvaluationSheet {
-
-    @Test
-    public void test() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet("test");
-        XSSFRow row = sheet.createRow(0);
-        row.createCell(0);
-        XSSFEvaluationSheet evalsheet = new XSSFEvaluationSheet(sheet);
-
-        assertNotNull("Cell 0,0 is found", evalsheet.getCell(0, 0));
-        assertNull("Cell 0,1 is not found", evalsheet.getCell(0, 1));
-        assertNull("Cell 1,0 is not found", evalsheet.getCell(1, 0));
-
-        // now add Cell 0,1
-        row.createCell(1);
-
-        assertNotNull("Cell 0,0 is found", evalsheet.getCell(0, 0));
-        assertNotNull("Cell 0,1 is now also found", evalsheet.getCell(0, 1));
-        assertNull("Cell 1,0 is not found", evalsheet.getCell(1, 0));
-
-        // after clearing all values it also works
-        row.createCell(2);
-        evalsheet.clearAllCachedResultValues();
-
-        assertNotNull("Cell 0,0 is found", evalsheet.getCell(0, 0));
-        assertNotNull("Cell 0,2 is now also found", evalsheet.getCell(0, 2));
-        assertNull("Cell 1,0 is not found", evalsheet.getCell(1, 0));
-
-        // other things
-        assertEquals(sheet, evalsheet.getXSSFSheet());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
deleted file mode 100644
index 219b842..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.formula.BaseTestExternalFunctions;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-
-/**
- * Tests setting and evaluating user-defined functions in HSSF
- */
-public final class TestXSSFExternalFunctions extends BaseTestExternalFunctions {
-	public TestXSSFExternalFunctions() {
-		super(XSSFITestDataProvider.instance, "atp.xlsx");
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
deleted file mode 100644
index 2eeb5e8..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.ss.usermodel.BaseTestFont;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.FontCharset;
-import org.apache.poi.ss.usermodel.FontFamily;
-import org.apache.poi.ss.usermodel.FontScheme;
-import org.apache.poi.ss.usermodel.FontUnderline;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.SheetUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBooleanProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFontName;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFontScheme;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFontSize;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIntProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTUnderlineProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTVerticalAlignFontProperty;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STFontScheme;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STUnderlineValues;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STVerticalAlignRun;
-
-public final class TestXSSFFont extends BaseTestFont{
-
-	public TestXSSFFont() {
-		super(XSSFITestDataProvider.instance);
-	}
-
-	@Test
-	public void testDefaultFont() throws IOException {
-		baseTestDefaultFont("Calibri", (short) 220, IndexedColors.BLACK.getIndex());
-	}
-
-	@Test
-	public void testConstructor() {
-		XSSFFont xssfFont=new XSSFFont();
-		assertNotNull(xssfFont.getCTFont());
-	}
-
-	@Test
-	public void testBold() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTBooleanProperty bool=ctFont.addNewB();
-		bool.setVal(false);
-		ctFont.setBArray(0,bool);
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(false, xssfFont.getBold());
-
-
-		xssfFont.setBold(true);
-		assertEquals(ctFont.sizeOfBArray(),1);
-		assertEquals(true, ctFont.getBArray(0).getVal());
-	}
-
-	@Test
-	public void testCharSet() throws IOException {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTIntProperty prop=ctFont.addNewCharset();
-		prop.setVal(FontCharset.ANSI.getValue());
-
-		ctFont.setCharsetArray(0,prop);
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(Font.ANSI_CHARSET,xssfFont.getCharSet());
-
-		xssfFont.setCharSet(FontCharset.DEFAULT);
-		assertEquals(FontCharset.DEFAULT.getValue(),ctFont.getCharsetArray(0).getVal());
-
-		// Try with a few less usual ones:
-		// Set with the Charset itself
-        xssfFont.setCharSet(FontCharset.RUSSIAN);
-        assertEquals(FontCharset.RUSSIAN.getValue(), xssfFont.getCharSet());
-        // And set with the Charset index
-        xssfFont.setCharSet(FontCharset.ARABIC.getValue());
-        assertEquals(FontCharset.ARABIC.getValue(), xssfFont.getCharSet());
-        xssfFont.setCharSet((byte)(FontCharset.ARABIC.getValue()));
-        assertEquals(FontCharset.ARABIC.getValue(), xssfFont.getCharSet());
-        
-        // This one isn't allowed
-        assertEquals(null, FontCharset.valueOf(9999));
-        try {
-           xssfFont.setCharSet(9999);
-           fail("Shouldn't be able to set an invalid charset");
-        } catch(POIXMLException e) {}
-      
-		
-		// Now try with a few sample files
-		
-		// Normal charset
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx");
-        assertEquals(0, 
-              wb1.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
-        );
-        wb1.close();
-		
-		// GB2312 charact set
-        XSSFWorkbook wb2 = XSSFTestDataSamples.openSampleWorkbook("49273.xlsx");
-        assertEquals(134, 
-              wb2.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
-        );
-        wb2.close();
-	}
-
-	@Test
-	public void testFontName() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontName fname=ctFont.addNewName();
-		fname.setVal("Arial");
-		ctFont.setNameArray(0,fname);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals("Arial", xssfFont.getFontName());
-
-		xssfFont.setFontName("Courier");
-		assertEquals("Courier",ctFont.getNameArray(0).getVal());
-	}
-
-	@Test
-	public void testItalic() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTBooleanProperty bool=ctFont.addNewI();
-		bool.setVal(false);
-		ctFont.setIArray(0,bool);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(false, xssfFont.getItalic());
-
-		xssfFont.setItalic(true);
-		assertEquals(ctFont.sizeOfIArray(),1);
-		assertEquals(true, ctFont.getIArray(0).getVal());
-		assertEquals(true,ctFont.getIArray(0).getVal());
-	}
-
-	@Test
-	public void testStrikeout() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTBooleanProperty bool=ctFont.addNewStrike();
-		bool.setVal(false);
-		ctFont.setStrikeArray(0,bool);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(false, xssfFont.getStrikeout());
-
-		xssfFont.setStrikeout(true);
-		assertEquals(ctFont.sizeOfStrikeArray(),1);
-		assertEquals(true, ctFont.getStrikeArray(0).getVal());
-		assertEquals(true,ctFont.getStrikeArray(0).getVal());
-	}
-
-	@Test
-	public void testFontHeight() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontSize size=ctFont.addNewSz();
-		size.setVal(11);
-		ctFont.setSzArray(0,size);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(11,xssfFont.getFontHeightInPoints());
-
-		xssfFont.setFontHeight(20);
-		assertEquals(20.0, ctFont.getSzArray(0).getVal(), 0.0);
-	}
-
-	@Test
-	public void testFontHeightInPoint() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontSize size=ctFont.addNewSz();
-		size.setVal(14);
-		ctFont.setSzArray(0,size);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(14,xssfFont.getFontHeightInPoints());
-
-		xssfFont.setFontHeightInPoints((short)20);
-		assertEquals(20.0, ctFont.getSzArray(0).getVal(), 0.0);
-	}
-
-	@Test
-	public void testUnderline() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTUnderlineProperty underlinePropr=ctFont.addNewU();
-		underlinePropr.setVal(STUnderlineValues.SINGLE);
-		ctFont.setUArray(0,underlinePropr);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(Font.U_SINGLE, xssfFont.getUnderline());
-
-		xssfFont.setUnderline(Font.U_DOUBLE);
-		assertEquals(ctFont.sizeOfUArray(),1);
-		assertEquals(STUnderlineValues.DOUBLE,ctFont.getUArray(0).getVal());
-
-		xssfFont.setUnderline(FontUnderline.DOUBLE_ACCOUNTING);
-		assertEquals(ctFont.sizeOfUArray(),1);
-		assertEquals(STUnderlineValues.DOUBLE_ACCOUNTING,ctFont.getUArray(0).getVal());
-	}
-
-	@Test
-	public void testColor() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTColor color=ctFont.addNewColor();
-		color.setIndexed(XSSFFont.DEFAULT_FONT_COLOR);
-		ctFont.setColorArray(0,color);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(IndexedColors.BLACK.getIndex(),xssfFont.getColor());
-
-		xssfFont.setColor(IndexedColors.RED.getIndex());
-		assertEquals(IndexedColors.RED.getIndex(), ctFont.getColorArray(0).getIndexed());
-	}
-
-	@Test
-	public void testRgbColor() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTColor color=ctFont.addNewColor();
-
-		color.setRgb(Integer.toHexString(0xFFFFFF).getBytes(LocaleUtil.CHARSET_1252));
-		ctFont.setColorArray(0,color);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(ctFont.getColorArray(0).getRgb()[0],xssfFont.getXSSFColor().getRGB()[0]);
-		assertEquals(ctFont.getColorArray(0).getRgb()[1],xssfFont.getXSSFColor().getRGB()[1]);
-		assertEquals(ctFont.getColorArray(0).getRgb()[2],xssfFont.getXSSFColor().getRGB()[2]);
-		assertEquals(ctFont.getColorArray(0).getRgb()[3],xssfFont.getXSSFColor().getRGB()[3]);
-
-		xssfFont.setColor((short)23);
-		
-		byte[] bytes = Integer.toHexString(0xF1F1F1).getBytes(LocaleUtil.CHARSET_1252);
-        color.setRgb(bytes);
-		XSSFColor newColor=new XSSFColor(color);
-		xssfFont.setColor(newColor);
-		assertEquals(ctFont.getColorArray(0).getRgb()[2],newColor.getRGB()[2]);
-		
-		assertArrayEquals(bytes, xssfFont.getXSSFColor().getRGB());
-		assertEquals(0, xssfFont.getColor());
-	}
-
-	@Test
-	public void testThemeColor() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTColor color=ctFont.addNewColor();
-		color.setTheme(1);
-		ctFont.setColorArray(0,color);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(ctFont.getColorArray(0).getTheme(),xssfFont.getThemeColor());
-
-		xssfFont.setThemeColor(IndexedColors.RED.getIndex());
-		assertEquals(IndexedColors.RED.getIndex(),ctFont.getColorArray(0).getTheme());
-	}
-
-	@Test
-	public void testFamily() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTIntProperty family=ctFont.addNewFamily();
-		family.setVal(FontFamily.MODERN.getValue());
-		ctFont.setFamilyArray(0,family);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(FontFamily.MODERN.getValue(),xssfFont.getFamily());
-	}
-
-	@Test
-	public void testScheme() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontScheme scheme=ctFont.addNewScheme();
-		scheme.setVal(STFontScheme.MAJOR);
-		ctFont.setSchemeArray(0,scheme);
-
-		XSSFFont font=new XSSFFont(ctFont);
-		assertEquals(FontScheme.MAJOR,font.getScheme());
-
-		font.setScheme(FontScheme.NONE);
-		assertEquals(STFontScheme.NONE,ctFont.getSchemeArray(0).getVal());
-	}
-
-	@Test
-	public void testTypeOffset() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTVerticalAlignFontProperty valign=ctFont.addNewVertAlign();
-		valign.setVal(STVerticalAlignRun.BASELINE);
-		ctFont.setVertAlignArray(0,valign);
-
-		XSSFFont font=new XSSFFont(ctFont);
-		assertEquals(Font.SS_NONE,font.getTypeOffset());
-
-		font.setTypeOffset(XSSFFont.SS_SUPER);
-		assertEquals(STVerticalAlignRun.SUPERSCRIPT,ctFont.getVertAlignArray(0).getVal());
-	}
-
-	// store test from TestSheetUtil here as it uses XSSF
-	@Test
-	public void testCanComputeWidthXSSF() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-
-        // cannot check on result because on some machines we get back false here!
-        SheetUtil.canComputeColumnWidth(wb.getFontAt((short)0));
-
-        wb.close();        
-    }
-
-    // store test from TestSheetUtil here as it uses XSSF
-	@Test
-	public void testCanComputeWidthInvalidFont() throws IOException {
-        Font font = new XSSFFont(CTFont.Factory.newInstance());
-        font.setFontName("some non existing font name");
-        
-        // Even with invalid fonts we still get back useful data most of the time... 
-        SheetUtil.canComputeColumnWidth(font);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
deleted file mode 100644
index 4da863f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.formula.eval.forked.TestForkedEvaluator;
-import org.apache.poi.ss.usermodel.Workbook;
-
-public class TestXSSFForkedEvaluator extends TestForkedEvaluator {
-    
-    @Override
-    protected Workbook newWorkbook() {
-        return new XSSFWorkbook();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
deleted file mode 100644
index 84a4aa6..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
+++ /dev/null
@@ -1,696 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.BaseTestFormulaEvaluator;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public final class TestXSSFFormulaEvaluation extends BaseTestFormulaEvaluator {
-
-    public TestXSSFFormulaEvaluation() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void testSharedFormulas() throws IOException {
-        baseTestSharedFormulas("shared_formulas.xlsx");
-    }
-
-    @Test
-    public void testSharedFormulas_evaluateInCell() throws IOException {
-        XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("49872.xlsx");
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        XSSFSheet sheet = wb.getSheetAt(0);
-
-        double result = 3.0;
-
-        // B3 is a master shared formula, C3 and D3 don't have the formula written in their f element.
-        // Instead, the attribute si for a particular cell is used to figure what the formula expression
-        // should be based on the cell's relative location to the master formula, e.g.
-        // B3:        <f t="shared" ref="B3:D3" si="0">B1+B2</f>
-        // C3 and D3: <f t="shared" si="0"/>
-
-        // get B3 and evaluate it in the cell
-        XSSFCell b3 = sheet.getRow(2).getCell(1);
-        assertEquals(result, evaluator.evaluateInCell(b3).getNumericCellValue(), 0);
-
-        //at this point the master formula is gone, but we are still able to evaluate dependent cells
-        XSSFCell c3 = sheet.getRow(2).getCell(2);
-        assertEquals(result, evaluator.evaluateInCell(c3).getNumericCellValue(), 0);
-
-        XSSFCell d3 = sheet.getRow(2).getCell(3);
-        assertEquals(result, evaluator.evaluateInCell(d3).getNumericCellValue(), 0);
-        
-        wb.close();
-    }
-
-    /**
-     * Evaluation of cell references with column indexes greater than 255. See bugzilla 50096
-     */
-    @Test
-    public void testEvaluateColumnGreaterThan255() throws IOException {
-        XSSFWorkbook wb = (XSSFWorkbook) _testDataProvider.openSampleWorkbook("50096.xlsx");
-        XSSFFormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        /**
-         *  The first row simply contains the numbers 1 - 300.
-         *  The second row simply refers to the cell value above in the first row by a simple formula.
-         */
-        for (int i = 245; i < 265; i++) {
-            XSSFCell cell_noformula = wb.getSheetAt(0).getRow(0).getCell(i);
-            XSSFCell cell_formula = wb.getSheetAt(0).getRow(1).getCell(i);
-
-            CellReference ref_noformula = new CellReference(cell_noformula.getRowIndex(), cell_noformula.getColumnIndex());
-            CellReference ref_formula = new CellReference(cell_noformula.getRowIndex(), cell_noformula.getColumnIndex());
-            String fmla = cell_formula.getCellFormula();
-            // assure that the formula refers to the cell above.
-            // the check below is 'deep' and involves conversion of the shared formula:
-            // in the sample file a shared formula in GN1 is spanned in the range GN2:IY2,
-            assertEquals(ref_noformula.formatAsString(), fmla);
-
-            CellValue cv_noformula = evaluator.evaluate(cell_noformula);
-            CellValue cv_formula = evaluator.evaluate(cell_formula);
-            assertEquals("Wrong evaluation result in " + ref_formula.formatAsString(),
-                    cv_noformula.getNumberValue(), cv_formula.getNumberValue(), 0);
-        }
-        
-        wb.close();
-    }
-    
-    /**
-     * Related to bugs #56737 and #56752 - XSSF workbooks which have
-     *  formulas that refer to cells and named ranges in multiple other
-     *  workbooks, both HSSF and XSSF ones
-     */
-    @Test
-    public void testReferencesToOtherWorkbooks() throws Exception {
-        XSSFWorkbook wb = (XSSFWorkbook) _testDataProvider.openSampleWorkbook("ref2-56737.xlsx");
-        XSSFFormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        XSSFSheet s = wb.getSheetAt(0);
-        
-        // References to a .xlsx file
-        Row rXSLX = s.getRow(2);
-        Cell cXSLX_cell = rXSLX.getCell(4);
-        Cell cXSLX_sNR  = rXSLX.getCell(6);
-        Cell cXSLX_gNR  = rXSLX.getCell(8);
-        assertEquals("[1]Uses!$A$1",        cXSLX_cell.getCellFormula());
-        assertEquals("[1]Defines!NR_To_A1", cXSLX_sNR.getCellFormula());
-        assertEquals("[1]!NR_Global_B2",    cXSLX_gNR.getCellFormula());
-        
-        assertEquals("Hello!", cXSLX_cell.getStringCellValue());
-        assertEquals("Test A1", cXSLX_sNR.getStringCellValue());
-        assertEquals(142.0, cXSLX_gNR.getNumericCellValue(), 0);
-        
-        // References to a .xls file
-        Row rXSL = s.getRow(4);
-        Cell cXSL_cell = rXSL.getCell(4);
-        Cell cXSL_sNR  = rXSL.getCell(6);
-        Cell cXSL_gNR  = rXSL.getCell(8);
-        assertEquals("[2]Uses!$C$1",        cXSL_cell.getCellFormula());
-        assertEquals("[2]Defines!NR_To_A1", cXSL_sNR.getCellFormula());
-        assertEquals("[2]!NR_Global_B2",    cXSL_gNR.getCellFormula());
-        
-        assertEquals("Hello!", cXSL_cell.getStringCellValue());
-        assertEquals("Test A1", cXSL_sNR.getStringCellValue());
-        assertEquals(142.0, cXSL_gNR.getNumericCellValue(), 0);
-        
-        // Try to evaluate without references, won't work
-        // (At least, not unit we fix bug #56752 that is)
-        try {
-            evaluator.evaluate(cXSL_cell);
-            fail("Without a fix for #56752, shouldn't be able to evaluate a " +
-                 "reference to a non-provided linked workbook");
-        } catch(Exception e) {
-            // expected here
-        }
-        
-        // Setup the environment
-        Map<String,FormulaEvaluator> evaluators = new HashMap<String, FormulaEvaluator>();
-        evaluators.put("ref2-56737.xlsx", evaluator);
-        evaluators.put("56737.xlsx", 
-                _testDataProvider.openSampleWorkbook("56737.xlsx").getCreationHelper().createFormulaEvaluator());
-        evaluators.put("56737.xls", 
-                HSSFTestDataSamples.openSampleWorkbook("56737.xls").getCreationHelper().createFormulaEvaluator());
-        evaluator.setupReferencedWorkbooks(evaluators);
-        
-        // Try evaluating all of them, ensure we don't blow up
-        for(Row r : s) {
-            for (Cell c : r) {
-                evaluator.evaluate(c);
-            }
-        }
-        // And evaluate the other way too
-        evaluator.evaluateAll();
-        
-        // Static evaluator won't work, as no references passed in
-        try {
-            XSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-            fail("Static method lacks references, shouldn't work");
-        } catch(Exception e) {
-            // expected here
-        }
-        
-        
-        // Evaluate specific cells and check results
-        assertEquals("\"Hello!\"",  evaluator.evaluate(cXSLX_cell).formatAsString());
-        assertEquals("\"Test A1\"", evaluator.evaluate(cXSLX_sNR).formatAsString());
-        assertEquals("142.0",   evaluator.evaluate(cXSLX_gNR).formatAsString());
-
-        assertEquals("\"Hello!\"",  evaluator.evaluate(cXSL_cell).formatAsString());
-        assertEquals("\"Test A1\"", evaluator.evaluate(cXSL_sNR).formatAsString());
-        assertEquals("142.0",   evaluator.evaluate(cXSL_gNR).formatAsString());
-        
-        
-        // Add another formula referencing these workbooks
-        Cell cXSL_cell2 = rXSL.createCell(40);
-        cXSL_cell2.setCellFormula("[56737.xls]Uses!$C$1");
-        // TODO Shouldn't it become [2] like the others?
-        assertEquals("[56737.xls]Uses!$C$1", cXSL_cell2.getCellFormula());
-        assertEquals("\"Hello!\"",  evaluator.evaluate(cXSL_cell2).formatAsString());
-        
-        
-        // Now add a formula that refers to yet another (different) workbook
-        // Won't work without the workbook being linked
-        Cell cXSLX_nw_cell = rXSLX.createCell(42);
-        try {
-            cXSLX_nw_cell.setCellFormula("[alt.xlsx]Sheet1!$A$1");
-            fail("New workbook not linked, shouldn't be able to add");
-        } catch (Exception e) {
-            // expected here
-        }
-        
-        // Link and re-try
-        Workbook alt = new XSSFWorkbook();
-        try {
-            alt.createSheet().createRow(0).createCell(0).setCellValue("In another workbook");
-            // TODO Implement the rest of this, see bug #57184
-/*
-            wb.linkExternalWorkbook("alt.xlsx", alt);
-                    
-            cXSLX_nw_cell.setCellFormula("[alt.xlsx]Sheet1!$A$1");
-            // Check it - TODO Is this correct? Or should it become [3]Sheet1!$A$1 ?
-            assertEquals("[alt.xlsx]Sheet1!$A$1", cXSLX_nw_cell.getCellFormula());
-            
-            // Evaluate it, without a link to that workbook
-            try {
-                evaluator.evaluate(cXSLX_nw_cell);
-                fail("No cached value and no link to workbook, shouldn't evaluate");
-            } catch(Exception e) {}
-            
-            // Add a link, check it does
-            evaluators.put("alt.xlsx", alt.getCreationHelper().createFormulaEvaluator());
-            evaluator.setupReferencedWorkbooks(evaluators);
-            
-            evaluator.evaluate(cXSLX_nw_cell);
-            assertEquals("In another workbook", cXSLX_nw_cell.getStringCellValue());
-*/
-        } finally {
-            alt.close();
-        }
-        
-        wb.close();
-    }
-    
-    /**
-     * If a formula references cells or named ranges in another workbook,
-     *  but that isn't available at evaluation time, the cached values
-     *  should be used instead
-     * TODO Add the support then add a unit test
-     * See bug #56752
-     */
-    @Test
-    @Ignore
-    public void testCachedReferencesToOtherWorkbooks() throws Exception {
-        // TODO
-    }
-    
-    /**
-     * A handful of functions (such as SUM, COUNTA, MIN) support
-     *  multi-sheet references (eg Sheet1:Sheet3!A1 = Cell A1 from
-     *  Sheets 1 through Sheet 3).
-     * This test, based on common test files for HSSF and XSSF, checks
-     *  that we can correctly evaluate these
-     */
-    @Test
-    public void testMultiSheetReferencesHSSFandXSSF() throws Exception {
-        Workbook wb1 = HSSFTestDataSamples.openSampleWorkbook("55906-MultiSheetRefs.xls");
-        Workbook wb2 = XSSFTestDataSamples.openSampleWorkbook("55906-MultiSheetRefs.xlsx");
-
-        for (Workbook wb : new Workbook[] {wb1,wb2}) {
-            FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-            Sheet s1 = wb.getSheetAt(0);
-
-            
-            // Simple SUM over numbers
-            Cell sumF = s1.getRow(2).getCell(0);
-            assertNotNull(sumF);
-            assertEquals("SUM(Sheet1:Sheet3!A1)", sumF.getCellFormula());
-            assertEquals("Failed for " + wb.getClass(), "66.0", evaluator.evaluate(sumF).formatAsString());
-            
-            
-            // Various Stats formulas on numbers
-            Cell avgF = s1.getRow(2).getCell(1);
-            assertNotNull(avgF);
-            assertEquals("AVERAGE(Sheet1:Sheet3!A1)", avgF.getCellFormula());
-            assertEquals("22.0", evaluator.evaluate(avgF).formatAsString());
-            
-            Cell minF = s1.getRow(3).getCell(1);
-            assertNotNull(minF);
-            assertEquals("MIN(Sheet1:Sheet3!A$1)", minF.getCellFormula());
-            assertEquals("11.0", evaluator.evaluate(minF).formatAsString());
-            
-            Cell maxF = s1.getRow(4).getCell(1);
-            assertNotNull(maxF);
-            assertEquals("MAX(Sheet1:Sheet3!A$1)", maxF.getCellFormula());
-            assertEquals("33.0", evaluator.evaluate(maxF).formatAsString());
-            
-            Cell countF = s1.getRow(5).getCell(1);
-            assertNotNull(countF);
-            assertEquals("COUNT(Sheet1:Sheet3!A$1)", countF.getCellFormula());
-            assertEquals("3.0", evaluator.evaluate(countF).formatAsString());
-            
-            
-            // Various CountAs on Strings
-            Cell countA_1F = s1.getRow(2).getCell(2);
-            assertNotNull(countA_1F);
-            assertEquals("COUNTA(Sheet1:Sheet3!C1)", countA_1F.getCellFormula());
-            assertEquals("3.0", evaluator.evaluate(countA_1F).formatAsString());
-            
-            Cell countA_2F = s1.getRow(2).getCell(3);
-            assertNotNull(countA_2F);
-            assertEquals("COUNTA(Sheet1:Sheet3!D1)", countA_2F.getCellFormula());
-            assertEquals("0.0", evaluator.evaluate(countA_2F).formatAsString());
-            
-            Cell countA_3F = s1.getRow(2).getCell(4);
-            assertNotNull(countA_3F);
-            assertEquals("COUNTA(Sheet1:Sheet3!E1)", countA_3F.getCellFormula());
-            assertEquals("3.0", evaluator.evaluate(countA_3F).formatAsString());
-        }
-        
-        wb2.close();
-        wb1.close();
-    }
-    
-    /**
-     * A handful of functions (such as SUM, COUNTA, MIN) support
-     *  multi-sheet areas (eg Sheet1:Sheet3!A1:B2 = Cell A1 to Cell B2,
-     *  from Sheets 1 through Sheet 3).
-     * This test, based on common test files for HSSF and XSSF, checks
-     *  that we can correctly evaluate these
-     */
-    @Test
-    public void testMultiSheetAreasHSSFandXSSF() throws IOException {
-        Workbook wb1 = HSSFTestDataSamples.openSampleWorkbook("55906-MultiSheetRefs.xls");
-        Workbook wb2 = XSSFTestDataSamples.openSampleWorkbook("55906-MultiSheetRefs.xlsx");
-
-        for (Workbook wb : new Workbook[]{wb1,wb2}) {
-            FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-            Sheet s1 = wb.getSheetAt(0);
-
-            
-            // SUM over a range
-            Cell sumFA = s1.getRow(2).getCell(7);
-            assertNotNull(sumFA);
-            assertEquals("SUM(Sheet1:Sheet3!A1:B2)", sumFA.getCellFormula());
-            assertEquals("Failed for " + wb.getClass(), "110.0", evaluator.evaluate(sumFA).formatAsString());
-
-            
-            // Various Stats formulas on ranges of numbers
-            Cell avgFA = s1.getRow(2).getCell(8);
-            assertNotNull(avgFA);
-            assertEquals("AVERAGE(Sheet1:Sheet3!A1:B2)", avgFA.getCellFormula());
-            assertEquals("27.5", evaluator.evaluate(avgFA).formatAsString());
-            
-            Cell minFA = s1.getRow(3).getCell(8);
-            assertNotNull(minFA);
-            assertEquals("MIN(Sheet1:Sheet3!A$1:B$2)", minFA.getCellFormula());
-            assertEquals("11.0", evaluator.evaluate(minFA).formatAsString());
-            
-            Cell maxFA = s1.getRow(4).getCell(8);
-            assertNotNull(maxFA);
-            assertEquals("MAX(Sheet1:Sheet3!A$1:B$2)", maxFA.getCellFormula());
-            assertEquals("44.0", evaluator.evaluate(maxFA).formatAsString());
-            
-            Cell countFA = s1.getRow(5).getCell(8);
-            assertNotNull(countFA);
-            assertEquals("COUNT(Sheet1:Sheet3!$A$1:$B$2)", countFA.getCellFormula());
-            assertEquals("4.0", evaluator.evaluate(countFA).formatAsString());
-        }
-        
-        wb2.close();
-        wb1.close();
-    }
-    
-    @Test
-    public void testMultisheetFormulaEval() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet1 = wb.createSheet("Sheet1");
-            XSSFSheet sheet2 = wb.createSheet("Sheet2");
-            XSSFSheet sheet3 = wb.createSheet("Sheet3");
-            
-            // sheet1 A1
-            XSSFCell cell = sheet1.createRow(0).createCell(0);
-            cell.setCellType(CellType.NUMERIC);
-            cell.setCellValue(1.0);
-            
-            // sheet2 A1
-            cell = sheet2.createRow(0).createCell(0);
-            cell.setCellType(CellType.NUMERIC);
-            cell.setCellValue(1.0);
-            
-            // sheet2 B1
-            cell = sheet2.getRow(0).createCell(1);
-            cell.setCellType(CellType.NUMERIC);
-            cell.setCellValue(1.0);
-            
-            // sheet3 A1
-            cell = sheet3.createRow(0).createCell(0);
-            cell.setCellType(CellType.NUMERIC);
-            cell.setCellValue(1.0);
-            
-            // sheet1 A2 formulae
-            cell = sheet1.createRow(1).createCell(0);
-            cell.setCellType(CellType.FORMULA);
-            cell.setCellFormula("SUM(Sheet1:Sheet3!A1)");
-            
-            // sheet1 A3 formulae
-            cell = sheet1.createRow(2).createCell(0);
-            cell.setCellType(CellType.FORMULA);
-            cell.setCellFormula("SUM(Sheet1:Sheet3!A1:B1)");
-            
-            wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-            
-            cell = sheet1.getRow(1).getCell(0);
-            assertEquals(3.0, cell.getNumericCellValue(), 0);
-            
-            cell = sheet1.getRow(2).getCell(0);
-            assertEquals(4.0, cell.getNumericCellValue(), 0);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testBug55843() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet("test");
-            XSSFRow row = sheet.createRow(0);
-            XSSFRow row2 = sheet.createRow(1);
-            XSSFCell cellA2 = row2.createCell(0, CellType.FORMULA);
-            XSSFCell cellB1 = row.createCell(1, CellType.NUMERIC);
-            cellB1.setCellValue(10);
-            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-            cellA2.setCellFormula("IF(B1=0,\"\",((ROW()-ROW(A$1))*12))");
-            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
-            assertEquals("12.0", evaluate.formatAsString());
-
-            cellA2.setCellFormula("IF(NOT(B1=0),((ROW()-ROW(A$1))*12),\"\")");
-            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
-            
-            assertEquals(evaluate.toString(), evaluateN.toString());
-            assertEquals("12.0", evaluateN.formatAsString());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void testBug55843a() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet("test");
-            XSSFRow row = sheet.createRow(0);
-            XSSFRow row2 = sheet.createRow(1);
-            XSSFCell cellA2 = row2.createCell(0, CellType.FORMULA);
-            XSSFCell cellB1 = row.createCell(1, CellType.NUMERIC);
-            cellB1.setCellValue(10);
-            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-            cellA2.setCellFormula("IF(B1=0,\"\",((ROW(A$1))))");
-            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
-            assertEquals("1.0", evaluate.formatAsString());
-
-            cellA2.setCellFormula("IF(NOT(B1=0),((ROW(A$1))),\"\")");
-            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
-            
-            assertEquals(evaluate.toString(), evaluateN.toString());
-            assertEquals("1.0", evaluateN.formatAsString());
-        } finally {
-            wb.close();
-        }
-    }    
-
-    @Test
-    public void testBug55843b() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet("test");
-            XSSFRow row = sheet.createRow(0);
-            XSSFRow row2 = sheet.createRow(1);
-            XSSFCell cellA2 = row2.createCell(0, CellType.FORMULA);
-            XSSFCell cellB1 = row.createCell(1, CellType.NUMERIC);
-            cellB1.setCellValue(10);
-            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-            cellA2.setCellFormula("IF(B1=0,\"\",((ROW())))");
-            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
-            assertEquals("2.0", evaluate.formatAsString());
-            
-            cellA2.setCellFormula("IF(NOT(B1=0),((ROW())),\"\")");
-            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
-            
-            assertEquals(evaluate.toString(), evaluateN.toString());
-            assertEquals("2.0", evaluateN.formatAsString());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void testBug55843c() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet("test");
-            XSSFRow row = sheet.createRow(0);
-            XSSFRow row2 = sheet.createRow(1);
-            XSSFCell cellA2 = row2.createCell(0, CellType.FORMULA);
-            XSSFCell cellB1 = row.createCell(1, CellType.NUMERIC);
-            cellB1.setCellValue(10);
-            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-            
-            cellA2.setCellFormula("IF(NOT(B1=0),((ROW())))");
-            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
-            assertEquals("2.0", evaluateN.formatAsString());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void testBug55843d() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet("test");
-            XSSFRow row = sheet.createRow(0);
-            XSSFRow row2 = sheet.createRow(1);
-            XSSFCell cellA2 = row2.createCell(0, CellType.FORMULA);
-            XSSFCell cellB1 = row.createCell(1, CellType.NUMERIC);
-            cellB1.setCellValue(10);
-            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-            
-            cellA2.setCellFormula("IF(NOT(B1=0),((ROW())),\"\")");
-            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
-            assertEquals("2.0", evaluateN.formatAsString());
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testBug55843e() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet("test");
-            XSSFRow row = sheet.createRow(0);
-            XSSFRow row2 = sheet.createRow(1);
-            XSSFCell cellA2 = row2.createCell(0, CellType.FORMULA);
-            XSSFCell cellB1 = row.createCell(1, CellType.NUMERIC);
-            cellB1.setCellValue(10);
-            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-            cellA2.setCellFormula("IF(B1=0,\"\",((ROW())))");
-            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
-            assertEquals("2.0", evaluate.formatAsString());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void testBug55843f() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet("test");
-            XSSFRow row = sheet.createRow(0);
-            XSSFRow row2 = sheet.createRow(1);
-            XSSFCell cellA2 = row2.createCell(0, CellType.FORMULA);
-            XSSFCell cellB1 = row.createCell(1, CellType.NUMERIC);
-            cellB1.setCellValue(10);
-            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-            cellA2.setCellFormula("IF(B1=0,\"\",IF(B1=10,3,4))");
-            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
-            assertEquals("3.0", evaluate.formatAsString());
-        } finally {
-            wb.close();
-        }
-    }    
-
-    @Test
-    public void testBug56655() throws IOException {
-        Workbook wb =  new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        
-        setCellFormula(sheet, 0, 0, "#VALUE!");
-        setCellFormula(sheet, 0, 1, "SUMIFS(A:A,A:A,#VALUE!)");
-
-        wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-
-        assertEquals(CellType.ERROR, getCell(sheet, 0,0).getCachedFormulaResultTypeEnum());
-        assertEquals(FormulaError.VALUE.getCode(), getCell(sheet, 0,0).getErrorCellValue());
-        assertEquals(CellType.ERROR, getCell(sheet, 0,1).getCachedFormulaResultTypeEnum());
-        assertEquals(FormulaError.VALUE.getCode(), getCell(sheet, 0,1).getErrorCellValue());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testBug56655a() throws IOException {
-        Workbook wb =  new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        
-        setCellFormula(sheet, 0, 0, "B1*C1");
-        sheet.getRow(0).createCell(1).setCellValue("A");
-        setCellFormula(sheet, 1, 0, "B1*C1");
-        sheet.getRow(1).createCell(1).setCellValue("A");
-        setCellFormula(sheet, 0, 3, "SUMIFS(A:A,A:A,A2)");
-
-        wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-
-        assertEquals(CellType.ERROR, getCell(sheet, 0, 0).getCachedFormulaResultTypeEnum());
-        assertEquals(FormulaError.VALUE.getCode(), getCell(sheet, 0, 0).getErrorCellValue());
-        assertEquals(CellType.ERROR, getCell(sheet, 1, 0).getCachedFormulaResultTypeEnum());
-        assertEquals(FormulaError.VALUE.getCode(), getCell(sheet, 1, 0).getErrorCellValue());
-        assertEquals(CellType.ERROR, getCell(sheet, 0, 3).getCachedFormulaResultTypeEnum());
-        assertEquals(FormulaError.VALUE.getCode(), getCell(sheet, 0, 3).getErrorCellValue());
-        
-        wb.close();
-    }
-
-    // bug 57721
-    @Test
-    public void structuredReferences() throws IOException {
-        verifyAllFormulasInWorkbookCanBeEvaluated("evaluate_formula_with_structured_table_references.xlsx");
-    }
-    
-    // bug 57840
-    @Ignore("Takes over a minute to evaluate all formulas in this large workbook. Run this test when profiling for formula evaluation speed.")
-    @Test
-    public void testLotsOfFormulasWithStructuredReferencesToCalculatedTableColumns() throws IOException {
-        verifyAllFormulasInWorkbookCanBeEvaluated("StructuredRefs-lots-with-lookups.xlsx");
-    }
-
-    // FIXME: use junit4 parameterization
-    private static void verifyAllFormulasInWorkbookCanBeEvaluated(String sampleWorkbook) throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook(sampleWorkbook);
-        XSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-        wb.close();
-    }
-
-    /**
-     * @param row 0-based
-     * @param column 0-based
-     */
-    private void setCellFormula(Sheet sheet, int row, int column, String formula) {
-        Row r = sheet.getRow(row);
-        if (r == null) {
-            r = sheet.createRow(row);
-        }
-        Cell cell = r.getCell(column);
-        if (cell == null) {
-            cell = r.createCell(column);
-        }
-        cell.setCellType(CellType.FORMULA);
-        cell.setCellFormula(formula);
-    }
-
-    /**
-     * @param rowNo 0-based
-     * @param column 0-based
-     */
-    private Cell getCell(Sheet sheet, int rowNo, int column) {
-        return sheet.getRow(rowNo).getCell(column);
-    }
-
-    @Test
-    public void test59736() {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("59736.xlsx");
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        Cell cell = wb.getSheetAt(0).getRow(0).getCell(0);
-        assertEquals(1, cell.getNumericCellValue(), 0.001);
-
-        cell = wb.getSheetAt(0).getRow(1).getCell(0);
-        CellValue value = evaluator.evaluate(cell);
-        assertEquals(1, value.getNumberValue(), 0.001);
-
-        cell = wb.getSheetAt(0).getRow(2).getCell(0);
-        value = evaluator.evaluate(cell);
-        assertEquals(1, value.getNumberValue(), 0.001);
-    }
-    
-    @Test
-    public void evaluateInCellReturnsSameDataType() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        wb.createSheet().createRow(0).createCell(0);
-        XSSFFormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        XSSFCell cell = wb.getSheetAt(0).getRow(0).getCell(0);
-        XSSFCell same = evaluator.evaluateInCell(cell);
-        assertSame(cell, same);
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
deleted file mode 100644
index 88677c3..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
+++ /dev/null
@@ -1,746 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaParsingWorkbook;
-import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.WorkbookDependentFormula;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.Area3DPxg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.ErrPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.IntersectionPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPxg;
-import org.apache.poi.ss.formula.ptg.ParenthesisPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPxg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-
-public final class TestXSSFFormulaParser {
-    private static Ptg[] parse(FormulaParsingWorkbook fpb, String fmla) {
-        return FormulaParser.parse(fmla, fpb, FormulaType.CELL, -1);
-    }
-    private static Ptg[] parse(FormulaParsingWorkbook fpb, String fmla, int rowIndex) {
-        return FormulaParser.parse(fmla, fpb, FormulaType.CELL, -1, rowIndex);
-    }
-
-    @Test
-    public void basicParsing() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        ptgs = parse(fpb, "ABC10");
-        assertEquals(1, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-
-        ptgs = parse(fpb, "A500000");
-        assertEquals(1, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-
-        ptgs = parse(fpb, "ABC500000");
-        assertEquals(1, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-
-        //highest allowed rows and column (XFD and 0x100000)
-        ptgs = parse(fpb, "XFD1048576");
-        assertEquals(1, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-
-
-        //column greater than XFD
-        try {
-            /*ptgs =*/ parse(fpb, "XFE10");
-            fail("expected exception");
-        } catch (FormulaParseException e){
-            assertEquals("Specified named range 'XFE10' does not exist in the current workbook.", e.getMessage());
-        }
-
-        //row greater than 0x100000
-        try {
-            /*ptgs =*/ parse(fpb, "XFD1048577");
-            fail("expected exception");
-        } catch (FormulaParseException e){
-            assertEquals("Specified named range 'XFD1048577' does not exist in the current workbook.", e.getMessage());
-        }
-        
-        // Formula referencing one cell
-        ptgs = parse(fpb, "ISEVEN(A1)");
-        assertEquals(3, ptgs.length);
-        assertEquals(NameXPxg.class,   ptgs[0].getClass());
-        assertEquals(RefPtg.class,     ptgs[1].getClass());
-        assertEquals(FuncVarPtg.class, ptgs[2].getClass());
-        assertEquals("ISEVEN", ptgs[0].toFormulaString());
-        assertEquals("A1",     ptgs[1].toFormulaString());
-        assertEquals("#external#", ptgs[2].toFormulaString());
-        
-        // Formula referencing an area
-        ptgs = parse(fpb, "SUM(A1:B3)");
-        assertEquals(2, ptgs.length);
-        assertEquals(AreaPtg.class, ptgs[0].getClass());
-        assertEquals(AttrPtg.class, ptgs[1].getClass());
-        assertEquals("A1:B3", ptgs[0].toFormulaString());
-        assertEquals("SUM",   ptgs[1].toFormulaString());
-        
-        // Formula referencing one cell in a different sheet
-        ptgs = parse(fpb, "SUM(Sheet1!A1)");
-        assertEquals(2, ptgs.length);
-        assertEquals(Ref3DPxg.class, ptgs[0].getClass());
-        assertEquals(AttrPtg.class,  ptgs[1].getClass());
-        assertEquals("Sheet1!A1", ptgs[0].toFormulaString());
-        assertEquals("SUM",       ptgs[1].toFormulaString());
-        
-        // Formula referencing an area in a different sheet
-        ptgs = parse(fpb, "SUM(Sheet1!A1:B3)");
-        assertEquals(2, ptgs.length);
-        assertEquals(Area3DPxg.class,ptgs[0].getClass());
-        assertEquals(AttrPtg.class,  ptgs[1].getClass());
-        assertEquals("Sheet1!A1:B3", ptgs[0].toFormulaString());
-        assertEquals("SUM",          ptgs[1].toFormulaString());
-
-        wb.close();
-    }
-
-    @Test
-    public void builtInFormulas() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        ptgs = parse(fpb, "LOG10");
-        assertEquals(1, ptgs.length);
-        assertTrue("",(ptgs[0] instanceof RefPtg));
-
-        ptgs = parse(fpb, "LOG10(100)");
-        assertEquals(2, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof IntPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof FuncPtg);
-
-        wb.close();
-    }
-    
-    @Test
-    public void formulaReferencesSameWorkbook() throws IOException {
-        // Use a test file with "other workbook" style references
-        //  to itself
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56737.xlsx");
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        // Reference to a named range in our own workbook, as if it
-        // were defined in a different workbook
-        ptgs = parse(fpb, "[0]!NR_Global_B2");
-        assertEquals(1, ptgs.length);
-        assertEquals(NameXPxg.class, ptgs[0].getClass());
-        assertEquals(0,    ((NameXPxg)ptgs[0]).getExternalWorkbookNumber());
-        assertEquals(null, ((NameXPxg)ptgs[0]).getSheetName());
-        assertEquals("NR_Global_B2",((NameXPxg)ptgs[0]).getNameName());
-        assertEquals("[0]!NR_Global_B2",((NameXPxg)ptgs[0]).toFormulaString());
-
-        wb.close();
-    }
-   
-    @Test
-    public void formulaReferencesOtherSheets() throws IOException {
-        // Use a test file with the named ranges in place
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56737.xlsx");
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        // Reference to a single cell in a different sheet
-        ptgs = parse(fpb, "Uses!A1");
-        assertEquals(1, ptgs.length);
-        assertEquals(Ref3DPxg.class, ptgs[0].getClass());
-        assertEquals(-1,   ((Ref3DPxg)ptgs[0]).getExternalWorkbookNumber());
-        assertEquals("A1", ((Ref3DPxg)ptgs[0]).format2DRefAsString());
-        assertEquals("Uses!A1", ((Ref3DPxg)ptgs[0]).toFormulaString());
-        
-        // Reference to a single cell in a different sheet, which needs quoting
-        ptgs = parse(fpb, "'Testing 47100'!A1");
-        assertEquals(1, ptgs.length);
-        assertEquals(Ref3DPxg.class, ptgs[0].getClass());
-        assertEquals(-1,   ((Ref3DPxg)ptgs[0]).getExternalWorkbookNumber());
-        assertEquals("Testing 47100", ((Ref3DPxg)ptgs[0]).getSheetName());
-        assertEquals("A1", ((Ref3DPxg)ptgs[0]).format2DRefAsString());
-        assertEquals("'Testing 47100'!A1", ((Ref3DPxg)ptgs[0]).toFormulaString());
-        
-        // Reference to a sheet scoped named range from another sheet
-        ptgs = parse(fpb, "Defines!NR_To_A1");
-        assertEquals(1, ptgs.length);
-        assertEquals(NameXPxg.class, ptgs[0].getClass());
-        assertEquals(-1,        ((NameXPxg)ptgs[0]).getExternalWorkbookNumber());
-        assertEquals("Defines", ((NameXPxg)ptgs[0]).getSheetName());
-        assertEquals("NR_To_A1",((NameXPxg)ptgs[0]).getNameName());
-        assertEquals("Defines!NR_To_A1",((NameXPxg)ptgs[0]).toFormulaString());
-        
-        // Reference to a workbook scoped named range
-        ptgs = parse(fpb, "NR_Global_B2");
-        assertEquals(1, ptgs.length);
-        assertEquals(NamePtg.class, ptgs[0].getClass());
-        assertEquals("NR_Global_B2",((NamePtg)ptgs[0]).toFormulaString(fpb));
-
-        wb.close();
-    }
-    
-    @Test
-    public void formulaReferencesOtherWorkbook() throws IOException {
-        // Use a test file with the external linked table in place
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref-56737.xlsx");
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        // Reference to a single cell in a different workbook
-        ptgs = parse(fpb, "[1]Uses!$A$1");
-        assertEquals(1, ptgs.length);
-        assertEquals(Ref3DPxg.class, ptgs[0].getClass());
-        assertEquals(1,     ((Ref3DPxg)ptgs[0]).getExternalWorkbookNumber());
-        assertEquals("Uses",((Ref3DPxg)ptgs[0]).getSheetName());
-        assertEquals("$A$1",((Ref3DPxg)ptgs[0]).format2DRefAsString());
-        assertEquals("[1]Uses!$A$1",((Ref3DPxg)ptgs[0]).toFormulaString());
-        
-        // Reference to a sheet-scoped named range in a different workbook
-        ptgs = parse(fpb, "[1]Defines!NR_To_A1");
-        assertEquals(1, ptgs.length);
-        assertEquals(NameXPxg.class, ptgs[0].getClass());
-        assertEquals(1,         ((NameXPxg)ptgs[0]).getExternalWorkbookNumber());
-        assertEquals("Defines", ((NameXPxg)ptgs[0]).getSheetName());
-        assertEquals("NR_To_A1",((NameXPxg)ptgs[0]).getNameName());
-        assertEquals("[1]Defines!NR_To_A1",((NameXPxg)ptgs[0]).toFormulaString());
-        
-        // Reference to a global named range in a different workbook
-        ptgs = parse(fpb, "[1]!NR_Global_B2");
-        assertEquals(1, ptgs.length);
-        assertEquals(NameXPxg.class, ptgs[0].getClass());
-        assertEquals(1,    ((NameXPxg)ptgs[0]).getExternalWorkbookNumber());
-        assertEquals(null, ((NameXPxg)ptgs[0]).getSheetName());
-        assertEquals("NR_Global_B2",((NameXPxg)ptgs[0]).getNameName());
-        assertEquals("[1]!NR_Global_B2",((NameXPxg)ptgs[0]).toFormulaString());
-
-        wb.close();
-    }
-    
-    /**
-     * A handful of functions (such as SUM, COUNTA, MIN) support
-     *  multi-sheet references (eg Sheet1:Sheet3!A1 = Cell A1 from
-     *  Sheets 1 through Sheet 3) and multi-sheet area references 
-     *  (eg Sheet1:Sheet3!A1:B2 = Cells A1 through B2 from Sheets
-     *   1 through Sheet 3).
-     * This test, based on common test files for HSSF and XSSF, checks
-     *  that we can read and parse these kinds of references 
-     * (but not evaluate - that's elsewhere in the test suite)
-     */
-    @Test
-    public void multiSheetReferencesHSSFandXSSF() throws IOException {
-        Workbook[] wbs = new Workbook[] {
-                HSSFTestDataSamples.openSampleWorkbook("55906-MultiSheetRefs.xls"),
-                XSSFTestDataSamples.openSampleWorkbook("55906-MultiSheetRefs.xlsx")
-        };
-        for (Workbook wb : wbs) {
-            Sheet s1 = wb.getSheetAt(0);
-            Ptg[] ptgs;
-            
-            // Check the contents
-            Cell sumF = s1.getRow(2).getCell(0);
-            assertNotNull(sumF);
-            assertEquals("SUM(Sheet1:Sheet3!A1)", sumF.getCellFormula());
-            
-            Cell avgF = s1.getRow(2).getCell(1);
-            assertNotNull(avgF);
-            assertEquals("AVERAGE(Sheet1:Sheet3!A1)", avgF.getCellFormula());
-            
-            Cell countAF = s1.getRow(2).getCell(2);
-            assertNotNull(countAF);
-            assertEquals("COUNTA(Sheet1:Sheet3!C1)", countAF.getCellFormula());
-            
-            Cell maxF = s1.getRow(4).getCell(1);
-            assertNotNull(maxF);
-            assertEquals("MAX(Sheet1:Sheet3!A$1)", maxF.getCellFormula());
-            
-            
-            Cell sumFA = s1.getRow(2).getCell(7);
-            assertNotNull(sumFA);
-            assertEquals("SUM(Sheet1:Sheet3!A1:B2)", sumFA.getCellFormula());
-            
-            Cell avgFA = s1.getRow(2).getCell(8);
-            assertNotNull(avgFA);
-            assertEquals("AVERAGE(Sheet1:Sheet3!A1:B2)", avgFA.getCellFormula());
-            
-            Cell maxFA = s1.getRow(4).getCell(8);
-            assertNotNull(maxFA);
-            assertEquals("MAX(Sheet1:Sheet3!A$1:B$2)", maxFA.getCellFormula());
-            
-            Cell countFA = s1.getRow(5).getCell(8);
-            assertNotNull(countFA);
-            assertEquals("COUNT(Sheet1:Sheet3!$A$1:$B$2)", countFA.getCellFormula());
-            
-            
-            // Create a formula parser
-            final FormulaParsingWorkbook fpb;
-            if (wb instanceof HSSFWorkbook)
-                fpb = HSSFEvaluationWorkbook.create((HSSFWorkbook)wb);
-            else
-                fpb = XSSFEvaluationWorkbook.create((XSSFWorkbook)wb);
-
-            // Check things parse as expected:
-
-            // SUM to one cell over 3 workbooks, relative reference
-            ptgs = parse(fpb, "SUM(Sheet1:Sheet3!A1)");
-            assertEquals(2, ptgs.length);
-            if (wb instanceof HSSFWorkbook) {
-                assertEquals(Ref3DPtg.class, ptgs[0].getClass());
-            } else {
-                assertEquals(Ref3DPxg.class, ptgs[0].getClass());
-            }
-            assertEquals("Sheet1:Sheet3!A1", toFormulaString(ptgs[0], fpb));
-            assertEquals(AttrPtg.class, ptgs[1].getClass());
-            assertEquals("SUM",         toFormulaString(ptgs[1], fpb));
-
-            // MAX to one cell over 3 workbooks, absolute row reference
-            ptgs = parse(fpb, "MAX(Sheet1:Sheet3!A$1)");
-            assertEquals(2, ptgs.length);
-            if (wb instanceof HSSFWorkbook) {
-                assertEquals(Ref3DPtg.class, ptgs[0].getClass());
-            } else {
-                assertEquals(Ref3DPxg.class, ptgs[0].getClass());
-            }
-            assertEquals("Sheet1:Sheet3!A$1", toFormulaString(ptgs[0], fpb));
-            assertEquals(FuncVarPtg.class, ptgs[1].getClass());
-            assertEquals("MAX",            toFormulaString(ptgs[1], fpb));
-
-            // MIN to one cell over 3 workbooks, absolute reference
-            ptgs = parse(fpb, "MIN(Sheet1:Sheet3!$A$1)");
-            assertEquals(2, ptgs.length);
-            if (wb instanceof HSSFWorkbook) {
-                assertEquals(Ref3DPtg.class, ptgs[0].getClass());
-            } else {
-                assertEquals(Ref3DPxg.class, ptgs[0].getClass());
-            }
-            assertEquals("Sheet1:Sheet3!$A$1", toFormulaString(ptgs[0], fpb));
-            assertEquals(FuncVarPtg.class, ptgs[1].getClass());
-            assertEquals("MIN",            toFormulaString(ptgs[1], fpb));
-
-            // SUM to a range of cells over 3 workbooks
-            ptgs = parse(fpb, "SUM(Sheet1:Sheet3!A1:B2)");
-            assertEquals(2, ptgs.length);
-            if (wb instanceof HSSFWorkbook) {
-                assertEquals(Area3DPtg.class, ptgs[0].getClass());
-            } else {
-                assertEquals(Area3DPxg.class, ptgs[0].getClass());
-            }
-            assertEquals("Sheet1:Sheet3!A1:B2", toFormulaString(ptgs[0], fpb));
-            assertEquals(AttrPtg.class, ptgs[1].getClass());
-            assertEquals("SUM",         toFormulaString(ptgs[1], fpb));
-
-            // MIN to a range of cells over 3 workbooks, absolute reference
-            ptgs = parse(fpb, "MIN(Sheet1:Sheet3!$A$1:$B$2)");
-            assertEquals(2, ptgs.length);
-            if (wb instanceof HSSFWorkbook) {
-                assertEquals(Area3DPtg.class, ptgs[0].getClass());
-            } else {
-                assertEquals(Area3DPxg.class, ptgs[0].getClass());
-            }
-            assertEquals("Sheet1:Sheet3!$A$1:$B$2", toFormulaString(ptgs[0], fpb));
-            assertEquals(FuncVarPtg.class, ptgs[1].getClass());
-            assertEquals("MIN",            toFormulaString(ptgs[1], fpb));
-
-            // Check we can round-trip - try to set a new one to a new single cell
-            Cell newF = s1.getRow(0).createCell(10, CellType.FORMULA);
-            newF.setCellFormula("SUM(Sheet2:Sheet3!A1)");
-            assertEquals("SUM(Sheet2:Sheet3!A1)", newF.getCellFormula());
-            
-            // Check we can round-trip - try to set a new one to a cell range
-            newF = s1.getRow(0).createCell(11, CellType.FORMULA);
-            newF.setCellFormula("MIN(Sheet1:Sheet2!A1:B2)");
-            assertEquals("MIN(Sheet1:Sheet2!A1:B2)", newF.getCellFormula());
-
-            wb.close();
-        }
-    }
-
-    private static String toFormulaString(Ptg ptg, FormulaParsingWorkbook wb) {
-        if (ptg instanceof WorkbookDependentFormula) {
-            return ((WorkbookDependentFormula)ptg).toFormulaString((FormulaRenderingWorkbook)wb);
-        }
-        return ptg.toFormulaString();
-    }
-
-    @Test
-    public void test58648Single() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        ptgs = parse(fpb, "(ABC10 )");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                2, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof ParenthesisPtg);
-
-        wb.close();
-    }
-
-    @Test
-    public void test58648Basic() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        // verify whitespaces in different places
-        ptgs = parse(fpb, "(ABC10)");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                2, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof ParenthesisPtg);
-
-        ptgs = parse(fpb, "( ABC10)");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                2, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof ParenthesisPtg);
-
-        ptgs = parse(fpb, "(ABC10 )");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                2, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof ParenthesisPtg);
-
-        ptgs = parse(fpb, "((ABC10))");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                3, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof ParenthesisPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof ParenthesisPtg);
-
-        ptgs = parse(fpb, "((ABC10) )");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                3, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof ParenthesisPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof ParenthesisPtg);
-
-        ptgs = parse(fpb, "( (ABC10))");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                3, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof ParenthesisPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof ParenthesisPtg);
-
-        wb.close();
-    }
-
-    @Test
-    public void test58648FormulaParsing() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("58648.xlsx");
-
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        for (int i = 0; i < wb.getNumberOfSheets(); i++) {
-            Sheet xsheet = wb.getSheetAt(i);
-
-            for (Row row : xsheet) {
-                for (Cell cell : row) {
-                    if (cell.getCellTypeEnum() == CellType.FORMULA) {
-                        try {
-                            evaluator.evaluateFormulaCellEnum(cell);
-                        } catch (Exception e) {
-                            CellReference cellRef = new CellReference(cell.getRowIndex(), cell.getColumnIndex());
-                            throw new RuntimeException("error at: " + cellRef.toString(), e);
-                        }
-                    }
-                }
-            }
-        }
-
-        Sheet sheet = wb.getSheet("my-sheet");
-        Cell cell = sheet.getRow(1).getCell(4);
-
-        assertEquals(5d, cell.getNumericCellValue(), 0d);
-
-        wb.close();
-    }
-
-    @Test
-    public void testWhitespaceInFormula() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        // verify whitespaces in different places
-        ptgs = parse(fpb, "INTERCEPT(A2:A5, B2:B5)");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                3, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof FuncPtg);
-
-        ptgs = parse(fpb, " INTERCEPT ( \t \r A2 : \nA5 , B2 : B5 ) \t");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                3, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof FuncPtg);
-
-        ptgs = parse(fpb, "(VLOOKUP(\"item1\", A2:B3, 2, FALSE) - VLOOKUP(\"item2\", A2:B3, 2, FALSE) )");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                12, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof StringPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof IntPtg);
-
-        ptgs = parse(fpb, "A1:B1 B1:B2");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                4, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof MemAreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[3] instanceof IntersectionPtg);
-
-        ptgs = parse(fpb, "A1:B1    B1:B2");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                4, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof MemAreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[3] instanceof IntersectionPtg);
-
-        wb.close();
-    }
-
-    @Test
-    public void testWhitespaceInComplexFormula() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        // verify whitespaces in different places
-        ptgs = parse(fpb, "SUM(A1:INDEX(1:1048576,MAX(IFERROR(MATCH(99^99,B:B,1),0),IFERROR(MATCH(\"zzzz\",B:B,1),0)),MAX(IFERROR(MATCH(99^99,1:1,1),0),IFERROR(MATCH(\"zzzz\",1:1,1),0))))");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                40, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof MemFuncPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[3] instanceof NameXPxg);
-
-        ptgs = parse(fpb, "SUM ( A1 : INDEX( 1 : 1048576 , MAX( IFERROR ( MATCH ( 99 ^ 99 , B : B , 1 ) , 0 ) , IFERROR ( MATCH ( \"zzzz\" , B:B , 1 ) , 0 ) ) , MAX ( IFERROR ( MATCH ( 99 ^ 99 , 1 : 1 , 1 ) , 0 ) , IFERROR ( MATCH ( \"zzzz\" , 1 : 1 , 1 )   , 0 )   )   )   )");
-        assertEquals("Had: " + Arrays.toString(ptgs),
-                40, ptgs.length);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof MemFuncPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[1] instanceof RefPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[2] instanceof AreaPtg);
-        assertTrue("Had " + Arrays.toString(ptgs), ptgs[3] instanceof NameXPxg);
-
-        wb.close();
-    }
-
-    @Test
-    public void parseStructuredReferences() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-
-        XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
-        Ptg[] ptgs;
-
-        /*
-        The following cases are tested (copied from FormulaParser.parseStructuredReference)
-           1 Table1[col]
-           2 Table1[[#Totals],[col]]
-           3 Table1[#Totals]
-           4 Table1[#All]
-           5 Table1[#Data]
-           6 Table1[#Headers]
-           7 Table1[#Totals]
-           8 Table1[#This Row]
-           9 Table1[[#All],[col]]
-          10 Table1[[#Headers],[col]]
-          11 Table1[[#Totals],[col]]
-          12 Table1[[#All],[col1]:[col2]]
-          13 Table1[[#Data],[col1]:[col2]]
-          14 Table1[[#Headers],[col1]:[col2]]
-          15 Table1[[#Totals],[col1]:[col2]]
-          16 Table1[[#Headers],[#Data],[col2]]
-          17 Table1[[#This Row], [col1]]
-          18 Table1[ [col1]:[col2] ]
-        */
-
-        final String tbl = "\\_Prime.1";
-        final String noTotalsRowReason = ": Tables without a Totals row should return #REF! on [#Totals]";
-
-        ////// Case 1: Evaluate Table1[col] with apostrophe-escaped #-signs ////////
-        ptgs = parse(fpb, "SUM("+tbl+"[calc='#*'#])");
-        assertEquals(2, ptgs.length);
-
-        // Area3DPxg [sheet=Table ! A2:A7]
-        assertTrue(ptgs[0] instanceof Area3DPxg);
-        Area3DPxg ptg0 = (Area3DPxg) ptgs[0];
-        assertEquals("Table", ptg0.getSheetName());
-        assertEquals("A2:A7", ptg0.format2DRefAsString());
-        // Note: structured references are evaluated and resolved to regular 3D area references.
-        assertEquals("Table!A2:A7", ptg0.toFormulaString());
-
-        // AttrPtg [sum ]
-        assertTrue(ptgs[1] instanceof AttrPtg);
-        AttrPtg ptg1 = (AttrPtg) ptgs[1];
-        assertTrue(ptg1.isSum());
-
-        ////// Case 1: Evaluate "Table1[col]" ////////
-        ptgs = parse(fpb, tbl+"[Name]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[col]", "Table!B2:B7", ptgs[0].toFormulaString());
-
-        ////// Case 2: Evaluate "Table1[[#Totals],[col]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Totals],[col]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#Totals],[col]]" + noTotalsRowReason, ErrPtg.REF_INVALID, ptgs[0]);
-
-        ////// Case 3: Evaluate "Table1[#Totals]" ////////
-        ptgs = parse(fpb, tbl+"[#Totals]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[#Totals]" + noTotalsRowReason, ErrPtg.REF_INVALID, ptgs[0]);
-
-        ////// Case 4: Evaluate "Table1[#All]" ////////
-        ptgs = parse(fpb, tbl+"[#All]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[#All]", "Table!A1:C7", ptgs[0].toFormulaString());
-
-        ////// Case 5: Evaluate "Table1[#Data]" (excludes Header and Data rows) ////////
-        ptgs = parse(fpb, tbl+"[#Data]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[#Data]", "Table!A2:C7", ptgs[0].toFormulaString());
-
-        ////// Case 6: Evaluate "Table1[#Headers]" ////////
-        ptgs = parse(fpb, tbl+"[#Headers]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[#Headers]", "Table!A1:C1", ptgs[0].toFormulaString());
-
-        ////// Case 7: Evaluate "Table1[#Totals]" ////////
-        ptgs = parse(fpb, tbl+"[#Totals]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[#Totals]" + noTotalsRowReason, ErrPtg.REF_INVALID, ptgs[0]);
-
-        ////// Case 8: Evaluate "Table1[#This Row]" ////////
-        ptgs = parse(fpb, tbl+"[#This Row]", 2);
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[#This Row]", "Table!A3:C3", ptgs[0].toFormulaString());
-
-        ////// Evaluate "Table1[@]" (equivalent to "Table1[#This Row]") ////////
-        ptgs = parse(fpb, tbl+"[@]", 2);
-        assertEquals(1, ptgs.length);
-        assertEquals("Table!A3:C3", ptgs[0].toFormulaString());
-
-        ////// Evaluate "Table1[#This Row]" when rowIndex is outside Table ////////
-        ptgs = parse(fpb, tbl+"[#This Row]", 10);
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[#This Row]", ErrPtg.VALUE_INVALID, ptgs[0]);
-
-        ////// Evaluate "Table1[@]" when rowIndex is outside Table ////////
-        ptgs = parse(fpb, tbl+"[@]", 10);
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[@]", ErrPtg.VALUE_INVALID, ptgs[0]);
-
-        ////// Evaluate "Table1[[#Data],[col]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Data], [Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#Data],[col]]", "Table!C2:C7", ptgs[0].toFormulaString());
-
-
-        ////// Case 9: Evaluate "Table1[[#All],[col]]" ////////
-        ptgs = parse(fpb, tbl+"[[#All], [Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#All],[col]]", "Table!C1:C7", ptgs[0].toFormulaString());
-
-        ////// Case 10: Evaluate "Table1[[#Headers],[col]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Headers], [Number]]");
-        assertEquals(1, ptgs.length);
-        // also acceptable: Table1!B1
-        assertEquals("Table1[[#Headers],[col]]", "Table!C1:C1", ptgs[0].toFormulaString());
-
-        ////// Case 11: Evaluate "Table1[[#Totals],[col]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Totals],[Name]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#Totals],[col]]" + noTotalsRowReason, ErrPtg.REF_INVALID, ptgs[0]);
-
-        ////// Case 12: Evaluate "Table1[[#All],[col1]:[col2]]" ////////
-        ptgs = parse(fpb, tbl+"[[#All], [Name]:[Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#All],[col1]:[col2]]", "Table!B1:C7", ptgs[0].toFormulaString());
-
-        ////// Case 13: Evaluate "Table1[[#Data],[col]:[col2]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Data], [Name]:[Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#Data],[col]:[col2]]", "Table!B2:C7", ptgs[0].toFormulaString());
-
-        ////// Case 14: Evaluate "Table1[[#Headers],[col1]:[col2]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Headers], [Name]:[Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#Headers],[col1]:[col2]]", "Table!B1:C1", ptgs[0].toFormulaString());
-
-        ////// Case 15: Evaluate "Table1[[#Totals],[col]:[col2]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Totals], [Name]:[Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#Totals],[col]:[col2]]" + noTotalsRowReason, ErrPtg.REF_INVALID, ptgs[0]);
-
-        ////// Case 16: Evaluate "Table1[[#Headers],[#Data],[col]]" ////////
-        ptgs = parse(fpb, tbl+"[[#Headers],[#Data],[Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[#Headers],[#Data],[col]]", "Table!C1:C7", ptgs[0].toFormulaString());
-
-        ////// Case 17: Evaluate "Table1[[#This Row], [col1]]" ////////
-        ptgs = parse(fpb, tbl+"[[#This Row], [Number]]", 2);
-        assertEquals(1, ptgs.length);
-        // also acceptable: Table!C3
-        assertEquals("Table1[[#This Row], [col1]]", "Table!C3:C3", ptgs[0].toFormulaString());
-
-        ////// Case 18: Evaluate "Table1[[col]:[col2]]" ////////
-        ptgs = parse(fpb, tbl+"[[Name]:[Number]]");
-        assertEquals(1, ptgs.length);
-        assertEquals("Table1[[col]:[col2]]", "Table!B2:C7", ptgs[0].toFormulaString());
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
deleted file mode 100644
index 7c50d6a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link XSSFHeaderFooter}
- */
-public class TestXSSFHeaderFooter extends TestCase {
-	public void testStripFields() {
-		String simple = "I am a test header";
-		String withPage = "I am a&P test header";
-		String withLots = "I&A am&N a&P test&T header&U";
-		String withFont = "I&22 am a&\"Arial,bold\" test header";
-		String withOtherAnds = "I am a&P test header&&";
-		String withOtherAnds2 = "I am a&P test header&a&b";
-		
-		assertEquals(simple, XSSFOddHeader.stripFields(simple));
-		assertEquals(simple, XSSFOddHeader.stripFields(withPage));
-		assertEquals(simple, XSSFOddHeader.stripFields(withLots));
-		assertEquals(simple, XSSFOddHeader.stripFields(withFont));
-		assertEquals(simple + "&&", XSSFOddHeader.stripFields(withOtherAnds));
-		assertEquals(simple + "&a&b", XSSFOddHeader.stripFields(withOtherAnds2));
-		
-		// Now test the default strip flag
-		XSSFEvenHeader head = new XSSFEvenHeader(CTHeaderFooter.Factory.newInstance());
-		head.setCenter("Center");
-		head.setLeft("In the left");
-	
-		assertEquals("In the left", head.getLeft());
-		assertEquals("Center", head.getCenter());
-		assertEquals("", head.getRight());
-		
-		head.setLeft("Top &P&F&D Left");
-		assertEquals("Top &P&F&D Left", head.getLeft());
-		assertFalse(head.areFieldsStripped());
-		
-		head.setAreFieldsStripped(true);
-		assertEquals("Top  Left", head.getLeft());
-		assertTrue(head.areFieldsStripped());
-		
-		// Now even more complex
-		head.setCenter("HEADER TEXT &P&N&D&T&Z&F&F&A&V");
-		assertEquals("HEADER TEXT &V", head.getCenter());
-	}
-
-	public void testGetSetCenterLeftRight() {
-		
-		XSSFOddFooter footer = new XSSFOddFooter(CTHeaderFooter.Factory.newInstance());
-		assertEquals("", footer.getCenter());
-		footer.setCenter("My first center section");
-		assertEquals("My first center section", footer.getCenter());
-		footer.setCenter("No, let's update the center section");
-		assertEquals("No, let's update the center section", footer.getCenter());
-		footer.setLeft("And add a left one");
-		footer.setRight("Finally the right section is added");
-		assertEquals("And add a left one", footer.getLeft());
-		assertEquals("Finally the right section is added", footer.getRight());
-		
-		// Test changing the three sections value
-		footer.setCenter("Second center version");
-		footer.setLeft("Second left version");
-		footer.setRight("Second right version");
-		assertEquals("Second center version", footer.getCenter());
-		assertEquals("Second left version", footer.getLeft());
-		assertEquals("Second right version", footer.getRight());
-		
-	}
-	
-	// TODO Rest of tests
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
deleted file mode 100644
index e03edcd..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.usermodel.HSSFHyperlink;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.ss.usermodel.BaseTestHyperlink;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-
-public final class TestXSSFHyperlink extends BaseTestHyperlink {
-    public TestXSSFHyperlink() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void testLoadExisting() {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithMoreVariousData.xlsx");
-        assertEquals(3, workbook.getNumberOfSheets());
-
-        XSSFSheet sheet = workbook.getSheetAt(0);
-
-        // Check the hyperlinks
-        assertEquals(4, sheet.getNumHyperlinks());
-        doTestHyperlinkContents(sheet);
-    }
-
-    @Test
-    public void testCreate() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        XSSFRow row = sheet.createRow(0);
-        XSSFCreationHelper createHelper = workbook.getCreationHelper();
-        
-        String[] urls = {
-                "http://apache.org",
-                "www.apache.org",
-                "/temp",
-                "c:/temp",
-                "http://apache.org/default.php?s=isTramsformed&submit=Search&la=*&li=*"};
-        for(int i = 0; i < urls.length; i++){
-            String s = urls[i];
-            XSSFHyperlink link = createHelper.createHyperlink(HyperlinkType.URL);
-            link.setAddress(s);
-
-            XSSFCell cell = row.createCell(i);
-            cell.setHyperlink(link);
-        }
-        workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        sheet = workbook.getSheetAt(0);
-        PackageRelationshipCollection rels = sheet.getPackagePart().getRelationships();
-        assertEquals(urls.length, rels.size());
-        for(int i = 0; i < rels.size(); i++){
-            PackageRelationship rel = rels.getRelationship(i);
-            // there should be a relationship for each URL
-            assertEquals(urls[i], rel.getTargetURI().toString());
-        }
-
-        // Bugzilla 53041: Hyperlink relations are duplicated when saving XSSF file
-        workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        sheet = workbook.getSheetAt(0);
-        rels = sheet.getPackagePart().getRelationships();
-        assertEquals(urls.length, rels.size());
-        for(int i = 0; i < rels.size(); i++){
-            PackageRelationship rel = rels.getRelationship(i);
-            // there should be a relationship for each URL
-            assertEquals(urls[i], rel.getTargetURI().toString());
-        }
-    }
-
-    @Test
-    public void testInvalidURLs() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFCreationHelper createHelper = workbook.getCreationHelper();
-
-        String[] invalidURLs = {
-                "http:\\apache.org",
-                "www.apache .org",
-                "c:\\temp",
-                "\\poi"};
-        for(String s : invalidURLs){
-            try {
-                createHelper.createHyperlink(HyperlinkType.URL).setAddress(s);
-                fail("expected IllegalArgumentException: " + s);
-            } catch (IllegalArgumentException e){
-
-            }
-        }
-        workbook.close();
-    }
-
-    @Test
-    public void testLoadSave() {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithMoreVariousData.xlsx");
-        CreationHelper createHelper = workbook.getCreationHelper();
-        assertEquals(3, workbook.getNumberOfSheets());
-        XSSFSheet sheet = workbook.getSheetAt(0);
-
-        // Check hyperlinks
-        assertEquals(4, sheet.getNumHyperlinks());
-        doTestHyperlinkContents(sheet);
-
-
-        // Write out, and check
-
-        // Load up again, check all links still there
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertEquals(3, wb2.getNumberOfSheets());
-        assertNotNull(wb2.getSheetAt(0));
-        assertNotNull(wb2.getSheetAt(1));
-        assertNotNull(wb2.getSheetAt(2));
-
-        sheet = wb2.getSheetAt(0);
-
-
-        // Check hyperlinks again
-        assertEquals(4, sheet.getNumHyperlinks());
-        doTestHyperlinkContents(sheet);
-
-
-        // Add one more, and re-check
-        Row r17 = sheet.createRow(17);
-        Cell r17c = r17.createCell(2);
-
-        Hyperlink hyperlink = createHelper.createHyperlink(HyperlinkType.URL);
-        hyperlink.setAddress("http://poi.apache.org/spreadsheet/");
-        hyperlink.setLabel("POI SS Link");
-        r17c.setHyperlink(hyperlink);
-
-        assertEquals(5, sheet.getNumHyperlinks());
-        doTestHyperlinkContents(sheet);
-
-        assertEquals(HyperlinkType.URL,
-                sheet.getRow(17).getCell(2).getHyperlink().getTypeEnum());
-        assertEquals("POI SS Link",
-                sheet.getRow(17).getCell(2).getHyperlink().getLabel());
-        assertEquals("http://poi.apache.org/spreadsheet/",
-                sheet.getRow(17).getCell(2).getHyperlink().getAddress());
-
-
-        // Save and re-load once more
-
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        assertEquals(3, wb3.getNumberOfSheets());
-        assertNotNull(wb3.getSheetAt(0));
-        assertNotNull(wb3.getSheetAt(1));
-        assertNotNull(wb3.getSheetAt(2));
-
-        sheet = wb3.getSheetAt(0);
-
-        assertEquals(5, sheet.getNumHyperlinks());
-        doTestHyperlinkContents(sheet);
-
-        assertEquals(HyperlinkType.URL,
-                sheet.getRow(17).getCell(2).getHyperlink().getTypeEnum());
-        assertEquals("POI SS Link",
-                sheet.getRow(17).getCell(2).getHyperlink().getLabel());
-        assertEquals("http://poi.apache.org/spreadsheet/",
-                sheet.getRow(17).getCell(2).getHyperlink().getAddress());
-    }
-
-    /**
-     * Only for WithMoreVariousData.xlsx !
-     */
-    private static void doTestHyperlinkContents(XSSFSheet sheet) {
-        assertNotNull(sheet.getRow(3).getCell(2).getHyperlink());
-        assertNotNull(sheet.getRow(14).getCell(2).getHyperlink());
-        assertNotNull(sheet.getRow(15).getCell(2).getHyperlink());
-        assertNotNull(sheet.getRow(16).getCell(2).getHyperlink());
-
-        // First is a link to poi
-        assertEquals(HyperlinkType.URL,
-                sheet.getRow(3).getCell(2).getHyperlink().getTypeEnum());
-        assertEquals(null,
-                sheet.getRow(3).getCell(2).getHyperlink().getLabel());
-        assertEquals("http://poi.apache.org/",
-                sheet.getRow(3).getCell(2).getHyperlink().getAddress());
-
-        // Next is an internal doc link
-        assertEquals(HyperlinkType.DOCUMENT,
-                sheet.getRow(14).getCell(2).getHyperlink().getTypeEnum());
-        assertEquals("Internal hyperlink to A2",
-                sheet.getRow(14).getCell(2).getHyperlink().getLabel());
-        assertEquals("Sheet1!A2",
-                sheet.getRow(14).getCell(2).getHyperlink().getAddress());
-
-        // Next is a file
-        assertEquals(HyperlinkType.FILE,
-                sheet.getRow(15).getCell(2).getHyperlink().getTypeEnum());
-        assertEquals(null,
-                sheet.getRow(15).getCell(2).getHyperlink().getLabel());
-        assertEquals("WithVariousData.xlsx",
-                sheet.getRow(15).getCell(2).getHyperlink().getAddress());
-
-        // Last is a mailto
-        assertEquals(HyperlinkType.EMAIL,
-                sheet.getRow(16).getCell(2).getHyperlink().getTypeEnum());
-        assertEquals(null,
-                sheet.getRow(16).getCell(2).getHyperlink().getLabel());
-        assertEquals("mailto:dev@poi.apache.org?subject=XSSF%20Hyperlinks",
-                sheet.getRow(16).getCell(2).getHyperlink().getAddress());
-    }
-
-    @Test
-    public void test52716() {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("52716.xlsx");
-        XSSFSheet sh1 = wb1.getSheetAt(0);
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        XSSFSheet sh2 = wb2.getSheetAt(0);
-
-        assertEquals(sh1.getNumberOfComments(), sh2.getNumberOfComments());
-        XSSFHyperlink l1 = sh1.getHyperlink(0, 1);
-        assertEquals(HyperlinkType.DOCUMENT, l1.getTypeEnum());
-        assertEquals("B1", l1.getCellRef());
-        assertEquals("Sort on Titel", l1.getTooltip());
-
-        XSSFHyperlink l2 = sh2.getHyperlink(0, 1);
-        assertEquals(l1.getTooltip(), l2.getTooltip());
-        assertEquals(HyperlinkType.DOCUMENT, l2.getTypeEnum());
-        assertEquals("B1", l2.getCellRef());
-    }
-
-    @Test
-    public void test53734() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("53734.xlsx");
-        XSSFHyperlink link = wb.getSheetAt(0).getRow(0).getCell(0).getHyperlink();
-        assertEquals("javascript:///", link.getAddress());
-
-        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        link = wb.getSheetAt(0).getRow(0).getCell(0).getHyperlink();
-        assertEquals("javascript:///", link.getAddress());
-    }
-
-    @Test
-    public void test53282() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("53282.xlsx");
-        XSSFHyperlink link = wb.getSheetAt(0).getRow(0).getCell(14).getHyperlink();
-        assertEquals("mailto:nobody@nowhere.uk%C2%A0", link.getAddress());
-
-        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        link = wb.getSheetAt(0).getRow(0).getCell(14).getHyperlink();
-        assertEquals("mailto:nobody@nowhere.uk%C2%A0", link.getAddress());
-    }
-    
-    @Override
-    public XSSFHyperlink copyHyperlink(Hyperlink link) {
-        return new XSSFHyperlink(link);
-    }
-    
-    @Test
-    public void testCopyHSSFHyperlink() throws IOException {
-        HSSFWorkbook hssfworkbook = new HSSFWorkbook();
-        HSSFHyperlink hlink = hssfworkbook.getCreationHelper().createHyperlink(HyperlinkType.URL);
-        hlink.setAddress("http://poi.apache.org/");
-        hlink.setFirstColumn(3);
-        hlink.setFirstRow(2);
-        hlink.setLastColumn(5);
-        hlink.setLastRow(6);
-        hlink.setLabel("label");
-        XSSFHyperlink xlink = new XSSFHyperlink(hlink);
-        
-        assertEquals("http://poi.apache.org/", xlink.getAddress());
-        assertEquals(new CellReference(2, 3), new CellReference(xlink.getCellRef()));
-        // Are HSSFHyperlink.label and XSSFHyperlink.tooltip the same? If so, perhaps one of these needs renamed for a consistent Hyperlink interface
-        // assertEquals("label", xlink.getTooltip());
-        
-        hssfworkbook.close();
-    }
-    
-    /* bug 59775: XSSFHyperlink has wrong type if it contains a location (CTHyperlink#getLocation)
-     * URLs with a hash mark (#) are still URL hyperlinks, not document links
-     */
-    @Test
-    public void testURLsWithHashMark() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("59775.xlsx");
-        XSSFSheet sh = wb.getSheetAt(0);
-        CellAddress A2 = new CellAddress("A2");
-        CellAddress A3 = new CellAddress("A3");
-        CellAddress A4 = new CellAddress("A4");
-        CellAddress A7 = new CellAddress("A7");
-        
-        XSSFHyperlink link = sh.getHyperlink(A2);
-        assertEquals("address", "A2", link.getCellRef());
-        assertEquals("link type", HyperlinkType.URL, link.getTypeEnum());
-        assertEquals("link target", "http://twitter.com/#!/apacheorg", link.getAddress());
-        
-        link = sh.getHyperlink(A3);
-        assertEquals("address", "A3", link.getCellRef());
-        assertEquals("link type", HyperlinkType.URL, link.getTypeEnum());
-        assertEquals("link target", "http://www.bailii.org/databases.html#ie", link.getAddress());
-        
-        link = sh.getHyperlink(A4);
-        assertEquals("address", "A4", link.getCellRef());
-        assertEquals("link type", HyperlinkType.URL, link.getTypeEnum());
-        assertEquals("link target", "https://en.wikipedia.org/wiki/Apache_POI#See_also", link.getAddress());
-        
-        link = sh.getHyperlink(A7);
-        assertEquals("address", "A7", link.getCellRef());
-        assertEquals("link type", HyperlinkType.DOCUMENT, link.getTypeEnum());
-        assertEquals("link target", "Sheet1", link.getAddress());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java
deleted file mode 100644
index a188a11..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-
-import static org.junit.Assert.*;
-
-import org.apache.poi.ss.usermodel.BaseTestNamedRange;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestXSSFName extends BaseTestNamedRange {
-
-    public TestXSSFName() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    //TODO combine testRepeatingRowsAndColums() for HSSF and XSSF
-    @Test
-    public void testRepeatingRowsAndColums() throws Exception {
-        // First test that setting RR&C for same sheet more than once only creates a
-        // single  Print_Titles built-in record
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet1 = wb.createSheet("First Sheet");
-
-        sheet1.setRepeatingRows(null);
-        sheet1.setRepeatingColumns(null);
-
-        // set repeating rows and columns twice for the first sheet
-        for (int i = 0; i < 2; i++) {
-          sheet1.setRepeatingRows(CellRangeAddress.valueOf("1:4"));
-          sheet1.setRepeatingColumns(CellRangeAddress.valueOf("A:A"));
-            //sheet.createFreezePane(0, 3);
-        }
-        assertEquals(1, wb.getNumberOfNames());
-        XSSFName nr1 = wb.getName(XSSFName.BUILTIN_PRINT_TITLE);
-
-        assertEquals("'First Sheet'!$A:$A,'First Sheet'!$1:$4", nr1.getRefersToFormula());
-
-        //remove the columns part
-        sheet1.setRepeatingColumns(null);
-        assertEquals("'First Sheet'!$1:$4", nr1.getRefersToFormula());
-
-        //revert
-        sheet1.setRepeatingColumns(CellRangeAddress.valueOf("A:A"));
-
-        //remove the rows part
-        sheet1.setRepeatingRows(null);
-        assertEquals("'First Sheet'!$A:$A", nr1.getRefersToFormula());
-
-        //revert
-        sheet1.setRepeatingRows(CellRangeAddress.valueOf("1:4"));
-
-        // Save and re-open
-        XSSFWorkbook nwb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        
-        assertEquals(1, nwb.getNumberOfNames());
-        nr1 = nwb.getName(XSSFName.BUILTIN_PRINT_TITLE);
-
-        assertEquals("'First Sheet'!$A:$A,'First Sheet'!$1:$4", nr1.getRefersToFormula());
-
-        // check that setting RR&C on a second sheet causes a new Print_Titles built-in
-        // name to be created
-        XSSFSheet sheet2 = nwb.createSheet("SecondSheet");
-        sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:1"));
-        sheet2.setRepeatingColumns(CellRangeAddress.valueOf("B:C"));
-
-        assertEquals(2, nwb.getNumberOfNames());
-        XSSFName nr2 = nwb.getNames(XSSFName.BUILTIN_PRINT_TITLE).get(1);
-
-        assertEquals(XSSFName.BUILTIN_PRINT_TITLE, nr2.getNameName());
-        assertEquals("SecondSheet!$B:$C,SecondSheet!$1:$1", nr2.getRefersToFormula());
-
-        sheet2.setRepeatingRows(null);
-        sheet2.setRepeatingColumns(null);
-        nwb.close();
-    }
-
-    @Test
-    public void testSetNameName() throws Exception {
-        // Test that renaming named ranges doesn't break our new named range map
-        XSSFWorkbook wb = new XSSFWorkbook();
-        wb.createSheet("First Sheet");
-
-        // Two named ranges called "name1", one scoped to sheet1 and one globally
-        XSSFName nameSheet1 = wb.createName();
-        nameSheet1.setNameName("name1");
-        nameSheet1.setRefersToFormula("'First Sheet'!$A$1");
-        nameSheet1.setSheetIndex(0);
-
-        XSSFName nameGlobal = wb.createName();
-        nameGlobal.setNameName("name1");
-        nameGlobal.setRefersToFormula("'First Sheet'!$B$1");
-
-        // Rename sheet-scoped name to "name2", check everything is updated properly
-        // and that the other name is unaffected
-        nameSheet1.setNameName("name2");
-        assertEquals(1, wb.getNames("name1").size());
-        assertEquals(1, wb.getNames("name2").size());
-        assertEquals(nameGlobal, wb.getName("name1"));
-        assertEquals(nameSheet1, wb.getName("name2"));
-
-        // Rename the other name to "name" and check everything again
-        nameGlobal.setNameName("name2");
-        assertEquals(0, wb.getNames("name1").size());
-        assertEquals(2, wb.getNames("name2").size());
-        assertTrue(wb.getNames("name2").contains(nameGlobal));
-        assertTrue(wb.getNames("name2").contains(nameSheet1));
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
deleted file mode 100644
index edaa974..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.BaseTestPicture;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTTwoCellAnchor;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.STEditAs;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestXSSFPicture extends BaseTestPicture {
-
-    public TestXSSFPicture() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void resize() throws Exception {
-        XSSFWorkbook wb = XSSFITestDataProvider.instance.openSampleWorkbook("resize_compare.xlsx");
-        XSSFDrawing dp = wb.getSheetAt(0).createDrawingPatriarch();
-        List<XSSFShape> pics = dp.getShapes();
-        XSSFPicture inpPic = (XSSFPicture)pics.get(0);
-        XSSFPicture cmpPic = (XSSFPicture)pics.get(0);
-        
-        baseTestResize(inpPic, cmpPic, 2.0, 2.0);
-        wb.close();
-    }
-
-
-    @Test
-    public void create() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        byte[] jpegData = "test jpeg data".getBytes(LocaleUtil.CHARSET_1252);
-
-        List<XSSFPictureData> pictures = wb.getAllPictures();
-        assertEquals(0, pictures.size());
-
-        int jpegIdx = wb.addPicture(jpegData, XSSFWorkbook.PICTURE_TYPE_JPEG);
-        assertEquals(1, pictures.size());
-        assertEquals("jpeg", pictures.get(jpegIdx).suggestFileExtension());
-        assertArrayEquals(jpegData, pictures.get(jpegIdx).getData());
-
-        XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-        assertEquals(AnchorType.MOVE_AND_RESIZE, anchor.getAnchorType());
-        anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-        assertEquals(AnchorType.DONT_MOVE_AND_RESIZE, anchor.getAnchorType());
-
-        XSSFPicture shape = drawing.createPicture(anchor, jpegIdx);
-        assertTrue(anchor.equals(shape.getAnchor()));
-        assertNotNull(shape.getPictureData());
-        assertArrayEquals(jpegData, shape.getPictureData().getData());
-
-        CTTwoCellAnchor ctShapeHolder = drawing.getCTDrawing().getTwoCellAnchorArray(0);
-        // STEditAs.ABSOLUTE corresponds to ClientAnchor.DONT_MOVE_AND_RESIZE
-        assertEquals(STEditAs.ABSOLUTE, ctShapeHolder.getEditAs());
-        
-        wb.close();
-    }
-
-    /**
-     * test that ShapeId in CTNonVisualDrawingProps is incremented
-     *
-     * See Bugzilla 50458
-     */
-    @Test
-    public void incrementShapeId() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-        byte[] jpegData = "picture1".getBytes(LocaleUtil.CHARSET_1252);
-        int jpegIdx = wb.addPicture(jpegData, XSSFWorkbook.PICTURE_TYPE_JPEG);
-
-        XSSFPicture shape1 = drawing.createPicture(anchor, jpegIdx);
-        assertEquals(1, shape1.getCTPicture().getNvPicPr().getCNvPr().getId());
-
-        jpegData = "picture2".getBytes(LocaleUtil.CHARSET_1252);
-        jpegIdx = wb.addPicture(jpegData, XSSFWorkbook.PICTURE_TYPE_JPEG);
-        XSSFPicture shape2 = drawing.createPicture(anchor, jpegIdx);
-        assertEquals(2, shape2.getCTPicture().getNvPicPr().getCNvPr().getId());
-        wb.close();
-    }
-
-    /**
-     * same image refrerred by mulitple sheets
-     */
-    @SuppressWarnings("resource")
-    @Test
-    public void multiRelationShips() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-
-        byte[] pic1Data = "test jpeg data".getBytes(LocaleUtil.CHARSET_1252);
-        byte[] pic2Data = "test png data".getBytes(LocaleUtil.CHARSET_1252);
-
-        List<XSSFPictureData> pictures = wb.getAllPictures();
-        assertEquals(0, pictures.size());
-
-        int pic1 = wb.addPicture(pic1Data, XSSFWorkbook.PICTURE_TYPE_JPEG);
-        int pic2 = wb.addPicture(pic2Data, XSSFWorkbook.PICTURE_TYPE_PNG);
-
-        XSSFSheet sheet1 = wb.createSheet();
-        XSSFDrawing drawing1 = sheet1.createDrawingPatriarch();
-        XSSFPicture shape1 = drawing1.createPicture(new XSSFClientAnchor(), pic1);
-        XSSFPicture shape2 = drawing1.createPicture(new XSSFClientAnchor(), pic2);
-
-        XSSFSheet sheet2 = wb.createSheet();
-        XSSFDrawing drawing2 = sheet2.createDrawingPatriarch();
-        XSSFPicture shape3 = drawing2.createPicture(new XSSFClientAnchor(), pic2);
-        XSSFPicture shape4 = drawing2.createPicture(new XSSFClientAnchor(), pic1);
-
-        assertEquals(2, pictures.size());
-
-        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        pictures = wb.getAllPictures();
-        assertEquals(2, pictures.size());
-
-        sheet1 = wb.getSheetAt(0);
-        drawing1 = sheet1.createDrawingPatriarch();
-        XSSFPicture shape11 = (XSSFPicture)drawing1.getShapes().get(0);
-        assertArrayEquals(shape1.getPictureData().getData(), shape11.getPictureData().getData());
-        XSSFPicture shape22 = (XSSFPicture)drawing1.getShapes().get(1);
-        assertArrayEquals(shape2.getPictureData().getData(), shape22.getPictureData().getData());
-
-        sheet2 = wb.getSheetAt(1);
-        drawing2 = sheet2.createDrawingPatriarch();
-        XSSFPicture shape33 = (XSSFPicture)drawing2.getShapes().get(0);
-        assertArrayEquals(shape3.getPictureData().getData(), shape33.getPictureData().getData());
-        XSSFPicture shape44 = (XSSFPicture)drawing2.getShapes().get(1);
-        assertArrayEquals(shape4.getPictureData().getData(), shape44.getPictureData().getData());
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
deleted file mode 100644
index db2801f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestXSSFPictureData {
-    @Test
-    public void testRead() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithDrawing.xlsx");
-        List<XSSFPictureData> pictures = wb.getAllPictures();
-        //wb.getAllPictures() should return the same instance across multiple calls
-        assertSame(pictures, wb.getAllPictures());
-
-        assertEquals(5, pictures.size());
-        String[] ext = {"jpeg", "emf", "png", "emf", "wmf"};
-        String[] mimetype = {"image/jpeg", "image/x-emf", "image/png", "image/x-emf", "image/x-wmf"};
-        for (int i = 0; i < pictures.size(); i++) {
-            assertEquals(ext[i], pictures.get(i).suggestFileExtension());
-            assertEquals(mimetype[i], pictures.get(i).getMimeType());
-        }
-
-        int num = pictures.size();
-
-        byte[] pictureData = {0xA, 0xB, 0XC, 0xD, 0xE, 0xF};
-
-        int idx = wb.addPicture(pictureData, XSSFWorkbook.PICTURE_TYPE_JPEG);
-        assertEquals(num + 1, pictures.size());
-        //idx is 0-based index in the #pictures array
-        assertEquals(pictures.size() - 1, idx);
-        XSSFPictureData pict = pictures.get(idx);
-        assertEquals("jpeg", pict.suggestFileExtension());
-        assertArrayEquals(pictureData, pict.getData());
-        wb.close();
-    }
-
-    @Test
-    public void testNew() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFDrawing drawing = sheet.createDrawingPatriarch();
-
-        byte[] jpegData = "test jpeg data".getBytes(LocaleUtil.CHARSET_1252);
-        byte[] wmfData =  "test wmf data".getBytes(LocaleUtil.CHARSET_1252);
-        byte[] pngData =  "test png data".getBytes(LocaleUtil.CHARSET_1252);
-
-        List<XSSFPictureData> pictures = wb.getAllPictures();
-        assertEquals(0, pictures.size());
-
-        int jpegIdx = wb.addPicture(jpegData, XSSFWorkbook.PICTURE_TYPE_JPEG);
-        assertEquals(1, pictures.size());
-        assertEquals("jpeg", pictures.get(jpegIdx).suggestFileExtension());
-        assertArrayEquals(jpegData, pictures.get(jpegIdx).getData());
-
-        int wmfIdx = wb.addPicture(wmfData, XSSFWorkbook.PICTURE_TYPE_WMF);
-        assertEquals(2, pictures.size());
-        assertEquals("wmf", pictures.get(wmfIdx).suggestFileExtension());
-        assertArrayEquals(wmfData, pictures.get(wmfIdx).getData());
-
-        int pngIdx = wb.addPicture(pngData, XSSFWorkbook.PICTURE_TYPE_PNG);
-        assertEquals(3, pictures.size());
-        assertEquals("png", pictures.get(pngIdx).suggestFileExtension());
-        assertArrayEquals(pngData, pictures.get(pngIdx).getData());
-
-        //TODO finish usermodel API for XSSFPicture
-        XSSFPicture p1 = drawing.createPicture(new XSSFClientAnchor(), jpegIdx);
-        assertNotNull(p1);
-        XSSFPicture p2 = drawing.createPicture(new XSSFClientAnchor(), wmfIdx);
-        assertNotNull(p2);
-        XSSFPicture p3 = drawing.createPicture(new XSSFClientAnchor(), pngIdx);
-        assertNotNull(p3);
-
-        //check that the added pictures are accessible after write
-        XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        List<XSSFPictureData> pictures2 = wbBack.getAllPictures();
-        assertEquals(3, pictures2.size());
-
-        assertEquals("jpeg", pictures2.get(jpegIdx).suggestFileExtension());
-        assertArrayEquals(jpegData, pictures2.get(jpegIdx).getData());
-
-        assertEquals("wmf", pictures2.get(wmfIdx).suggestFileExtension());
-        assertArrayEquals(wmfData, pictures2.get(wmfIdx).getData());
-
-        assertEquals("png", pictures2.get(pngIdx).suggestFileExtension());
-        assertArrayEquals(pngData, pictures2.get(pngIdx).getData());
-        wbBack.close();
-        wb.close();
-    }
-
-    /**
-     * Bug 53568:  XSSFPicture.getPictureData() can return null.
-     */
-    @Test
-    public void test53568() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("53568.xlsx");
-        List<XSSFPictureData> pictures = wb.getAllPictures();
-        assertNotNull(pictures);
-        assertEquals(4, pictures.size());
-
-        XSSFSheet sheet1 = wb.getSheetAt(0);
-        List<XSSFShape> shapes1 = sheet1.createDrawingPatriarch().getShapes();
-        assertNotNull(shapes1);
-        assertEquals(5, shapes1.size());
-        
-        for(int i = 0; i < wb.getNumberOfSheets(); i++){
-            XSSFSheet sheet = wb.getSheetAt(i);
-            XSSFDrawing drawing = sheet.createDrawingPatriarch();
-            for(XSSFShape shape : drawing.getShapes()){
-                if(shape instanceof XSSFPicture){
-                    XSSFPicture pic = (XSSFPicture)shape;
-                    XSSFPictureData picData = pic.getPictureData();
-                    assertNotNull(picData);
-                }
-            }
-        }
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
deleted file mode 100644
index 8df2a66..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.CellReference;
-import org.junit.Before;
-
-/**
- * Test pivot tables created by named range
- */
-public class TestXSSFPivotTableName extends BaseTestXSSFPivotTable {
-
-    @Override
-    @Before
-    public void setUp(){
-        wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-
-        Row row1 = sheet.createRow(0);
-        // Create a cell and put a value in it.
-        Cell cell = row1.createCell(0);
-        cell.setCellValue("Names");
-        Cell cell2 = row1.createCell(1);
-        cell2.setCellValue("#");
-        Cell cell7 = row1.createCell(2);
-        cell7.setCellValue("Data");
-        Cell cell10 = row1.createCell(3);
-        cell10.setCellValue("Value");
-
-        Row row2 = sheet.createRow(1);
-        Cell cell3 = row2.createCell(0);
-        cell3.setCellValue("Jan");
-        Cell cell4 = row2.createCell(1);
-        cell4.setCellValue(10);
-        Cell cell8 = row2.createCell(2);
-        cell8.setCellValue("Apa");
-        Cell cell11 = row1.createCell(3);
-        cell11.setCellValue(11.11);
-
-        Row row3 = sheet.createRow(2);
-        Cell cell5 = row3.createCell(0);
-        cell5.setCellValue("Ben");
-        Cell cell6 = row3.createCell(1);
-        cell6.setCellValue(9);
-        Cell cell9 = row3.createCell(2);
-        cell9.setCellValue("Bepa");
-        Cell cell12 = row1.createCell(3);
-        cell12.setCellValue(12.12);
-
-        XSSFName namedRange = sheet.getWorkbook().createName();
-        namedRange.setRefersToFormula(sheet.getSheetName() + "!" + "A1:C2");
-        pivotTable = sheet.createPivotTable(namedRange, new CellReference("H5"));
-        
-        XSSFSheet offsetSheet = wb.createSheet();
-        
-        Row tableRow_1 = offsetSheet.createRow(1);
-        offsetOuterCell = tableRow_1.createCell(1);
-        offsetOuterCell.setCellValue(-1);
-        Cell tableCell_1_1 = tableRow_1.createCell(2);
-        tableCell_1_1.setCellValue("Row #");
-        Cell tableCell_1_2 = tableRow_1.createCell(3);
-        tableCell_1_2.setCellValue("Exponent");
-        Cell tableCell_1_3 = tableRow_1.createCell(4);
-        tableCell_1_3.setCellValue("10^Exponent");
-        
-        Row tableRow_2 = offsetSheet.createRow(2);
-        Cell tableCell_2_1 = tableRow_2.createCell(2);
-        tableCell_2_1.setCellValue(0);
-        Cell tableCell_2_2 = tableRow_2.createCell(3);
-        tableCell_2_2.setCellValue(0);
-        Cell tableCell_2_3 = tableRow_2.createCell(4);
-        tableCell_2_3.setCellValue(1);
-        
-        Row tableRow_3= offsetSheet.createRow(3);
-        Cell tableCell_3_1 = tableRow_3.createCell(2);
-        tableCell_3_1.setCellValue(1);
-        Cell tableCell_3_2 = tableRow_3.createCell(3);
-        tableCell_3_2.setCellValue(1);
-        Cell tableCell_3_3 = tableRow_3.createCell(4);
-        tableCell_3_3.setCellValue(10);
-        
-        Row tableRow_4 = offsetSheet.createRow(4);
-        Cell tableCell_4_1 = tableRow_4.createCell(2);
-        tableCell_4_1.setCellValue(2);
-        Cell tableCell_4_2 = tableRow_4.createCell(3);
-        tableCell_4_2.setCellValue(2);
-        Cell tableCell_4_3 = tableRow_4.createCell(4);
-        tableCell_4_3.setCellValue(100);
-        
-        namedRange = sheet.getWorkbook().createName();
-        namedRange.setRefersToFormula("C2:E4");
-        namedRange.setSheetIndex(sheet.getWorkbook().getSheetIndex(sheet));
-        offsetPivotTable = offsetSheet.createPivotTable(namedRange, new CellReference("C6"));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
deleted file mode 100644
index ec0c5c6..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.junit.Before;
-
-/**
- * Test pivot tables created by area reference
- */
-public class TestXSSFPivotTableRef extends BaseTestXSSFPivotTable {
-    
-    @Override
-    @Before
-    public void setUp(){
-        wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-
-        Row row1 = sheet.createRow(0);
-        // Create a cell and put a value in it.
-        Cell cell = row1.createCell(0);
-        cell.setCellValue("Names");
-        Cell cell2 = row1.createCell(1);
-        cell2.setCellValue("#");
-        Cell cell7 = row1.createCell(2);
-        cell7.setCellValue("Data");
-        Cell cell10 = row1.createCell(3);
-        cell10.setCellValue("Value");
-
-        Row row2 = sheet.createRow(1);
-        Cell cell3 = row2.createCell(0);
-        cell3.setCellValue("Jan");
-        Cell cell4 = row2.createCell(1);
-        cell4.setCellValue(10);
-        Cell cell8 = row2.createCell(2);
-        cell8.setCellValue("Apa");
-        Cell cell11 = row1.createCell(3);
-        cell11.setCellValue(11.11);
-
-        Row row3 = sheet.createRow(2);
-        Cell cell5 = row3.createCell(0);
-        cell5.setCellValue("Ben");
-        Cell cell6 = row3.createCell(1);
-        cell6.setCellValue(9);
-        Cell cell9 = row3.createCell(2);
-        cell9.setCellValue("Bepa");
-        Cell cell12 = row1.createCell(3);
-        cell12.setCellValue(12.12);
-
-        AreaReference source = new AreaReference("A1:C2", SpreadsheetVersion.EXCEL2007);
-        pivotTable = sheet.createPivotTable(source, new CellReference("H5"));
-        
-        XSSFSheet offsetSheet = wb.createSheet();
-        
-        Row tableRow_1 = offsetSheet.createRow(1);
-        offsetOuterCell = tableRow_1.createCell(1);
-        offsetOuterCell.setCellValue(-1);
-        Cell tableCell_1_1 = tableRow_1.createCell(2);
-        tableCell_1_1.setCellValue("Row #");
-        Cell tableCell_1_2 = tableRow_1.createCell(3);
-        tableCell_1_2.setCellValue("Exponent");
-        Cell tableCell_1_3 = tableRow_1.createCell(4);
-        tableCell_1_3.setCellValue("10^Exponent");
-        
-        Row tableRow_2 = offsetSheet.createRow(2);
-        Cell tableCell_2_1 = tableRow_2.createCell(2);
-        tableCell_2_1.setCellValue(0);
-        Cell tableCell_2_2 = tableRow_2.createCell(3);
-        tableCell_2_2.setCellValue(0);
-        Cell tableCell_2_3 = tableRow_2.createCell(4);
-        tableCell_2_3.setCellValue(1);
-        
-        Row tableRow_3= offsetSheet.createRow(3);
-        Cell tableCell_3_1 = tableRow_3.createCell(2);
-        tableCell_3_1.setCellValue(1);
-        Cell tableCell_3_2 = tableRow_3.createCell(3);
-        tableCell_3_2.setCellValue(1);
-        Cell tableCell_3_3 = tableRow_3.createCell(4);
-        tableCell_3_3.setCellValue(10);
-        
-        Row tableRow_4 = offsetSheet.createRow(4);
-        Cell tableCell_4_1 = tableRow_4.createCell(2);
-        tableCell_4_1.setCellValue(2);
-        Cell tableCell_4_2 = tableRow_4.createCell(3);
-        tableCell_4_2.setCellValue(2);
-        Cell tableCell_4_3 = tableRow_4.createCell(4);
-        tableCell_4_3.setCellValue(100);
-        
-        AreaReference offsetSource = new AreaReference(new CellReference("C2"), new CellReference("E4"));
-        offsetPivotTable = offsetSheet.createPivotTable(offsetSource, new CellReference("C6"));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
deleted file mode 100644
index 6cda3af..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.PageOrder;
-import org.apache.poi.ss.usermodel.PaperSize;
-import org.apache.poi.ss.usermodel.PrintCellComments;
-import org.apache.poi.ss.usermodel.PrintOrientation;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageMargins;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPageSetup;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellComments;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STOrientation;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPageOrder;
-
-/**
- * Tests for {@link XSSFPrintSetup}
- */
-public class TestXSSFPrintSetup extends TestCase {
-    public void testSetGetPaperSize() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setPaperSize(9);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(PaperSize.A4_PAPER, printSetup.getPaperSizeEnum());
-        assertEquals(9, printSetup.getPaperSize());
-
-        printSetup.setPaperSize(PaperSize.A3_PAPER);
-        assertEquals(8, pSetup.getPaperSize());
-    }
-
-
-    public void testSetGetScale() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setScale(9);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(9, printSetup.getScale());
-
-        printSetup.setScale((short) 100);
-        assertEquals(100, pSetup.getScale());
-    }
-
-    public void testSetGetPageStart() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setFirstPageNumber(9);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(9, printSetup.getPageStart());
-
-        printSetup.setPageStart((short) 1);
-        assertEquals(1, pSetup.getFirstPageNumber());
-    }
-
-
-    public void testSetGetFitWidthHeight() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setFitToWidth(50);
-        pSetup.setFitToHeight(99);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(50, printSetup.getFitWidth());
-        assertEquals(99, printSetup.getFitHeight());
-
-        printSetup.setFitWidth((short) 66);
-        printSetup.setFitHeight((short) 80);
-        assertEquals(66, pSetup.getFitToWidth());
-        assertEquals(80, pSetup.getFitToHeight());
-
-    }
-
-    public void testSetGetLeftToRight() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setPageOrder(STPageOrder.DOWN_THEN_OVER);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(false, printSetup.getLeftToRight());
-
-        printSetup.setLeftToRight(true);
-        assertEquals(PageOrder.OVER_THEN_DOWN.getValue(), pSetup.getPageOrder().intValue());
-    }
-
-    public void testSetGetOrientation() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setOrientation(STOrientation.PORTRAIT);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(PrintOrientation.PORTRAIT, printSetup.getOrientation());
-        assertEquals(false, printSetup.getLandscape());
-        assertEquals(false, printSetup.getNoOrientation());
-
-        printSetup.setOrientation(PrintOrientation.LANDSCAPE);
-        assertEquals(pSetup.getOrientation().intValue(), printSetup.getOrientation().getValue());
-        assertEquals(true, printSetup.getLandscape());
-        assertEquals(false, printSetup.getNoOrientation());
-    }
-
-
-    public void testSetGetValidSettings() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setUsePrinterDefaults(false);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(false, printSetup.getValidSettings());
-
-        printSetup.setValidSettings(true);
-        assertEquals(true, pSetup.getUsePrinterDefaults());
-    }
-
-    public void testSetGetNoColor() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setBlackAndWhite(false);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(false, printSetup.getNoColor());
-
-        printSetup.setNoColor(true);
-        assertEquals(true, pSetup.getBlackAndWhite());
-    }
-
-    public void testSetGetDraft() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setDraft(false);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(false, printSetup.getDraft());
-
-        printSetup.setDraft(true);
-        assertEquals(true, pSetup.getDraft());
-    }
-
-    public void testSetGetNotes() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setCellComments(STCellComments.NONE);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(false, printSetup.getNotes());
-
-        printSetup.setNotes(true);
-        assertEquals(PrintCellComments.AS_DISPLAYED.getValue(), pSetup.getCellComments().intValue());
-    }
-
-
-    public void testSetGetUsePage() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setUseFirstPageNumber(false);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(false, printSetup.getUsePage());
-
-        printSetup.setUsePage(true);
-        assertEquals(true, pSetup.getUseFirstPageNumber());
-    }
-
-    public void testSetGetHVResolution() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setHorizontalDpi(120);
-        pSetup.setVerticalDpi(100);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(120, printSetup.getHResolution());
-        assertEquals(100, printSetup.getVResolution());
-
-        printSetup.setHResolution((short) 150);
-        printSetup.setVResolution((short) 130);
-        assertEquals(150, pSetup.getHorizontalDpi());
-        assertEquals(130, pSetup.getVerticalDpi());
-    }
-
-    public void testSetGetHeaderFooterMargin() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageMargins pMargins = worksheet.addNewPageMargins();
-        pMargins.setHeader(1.5);
-        pMargins.setFooter(2);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(1.5, printSetup.getHeaderMargin(), 0.0);
-        assertEquals(2.0, printSetup.getFooterMargin(), 0.0);
-
-        printSetup.setHeaderMargin(5);
-        printSetup.setFooterMargin(3.5);
-        assertEquals(5.0, pMargins.getHeader(), 0.0);
-        assertEquals(3.5, pMargins.getFooter(), 0.0);
-    }
-
-    public void testSetGetCopies() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        CTPageSetup pSetup = worksheet.addNewPageSetup();
-        pSetup.setCopies(9);
-        XSSFPrintSetup printSetup = new XSSFPrintSetup(worksheet);
-        assertEquals(9, printSetup.getCopies());
-
-        printSetup.setCopies((short) 15);
-        assertEquals(15, pSetup.getCopies());
-    }
-    
-    public void testSetSaveRead() throws Exception {
-       XSSFWorkbook wb = new XSSFWorkbook();
-       XSSFSheet s1 = wb.createSheet();
-       assertEquals(false, s1.getCTWorksheet().isSetPageSetup());
-       assertEquals(true, s1.getCTWorksheet().isSetPageMargins());
-       
-       XSSFPrintSetup print = s1.getPrintSetup();
-       assertEquals(true, s1.getCTWorksheet().isSetPageSetup());
-       assertEquals(true, s1.getCTWorksheet().isSetPageMargins());
-       
-       print.setCopies((short)3);
-       print.setLandscape(true);
-       assertEquals(3, print.getCopies());
-       assertEquals(true, print.getLandscape());
-       
-       XSSFSheet s2 = wb.createSheet();
-       assertEquals(false, s2.getCTWorksheet().isSetPageSetup());
-       assertEquals(true, s2.getCTWorksheet().isSetPageMargins());
-       
-       // Round trip and check
-       XSSFWorkbook wbBack = XSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-       
-       s1 = wbBack.getSheetAt(0);
-       s2 = wbBack.getSheetAt(1);
-       
-       assertEquals(true, s1.getCTWorksheet().isSetPageSetup());
-       assertEquals(true, s1.getCTWorksheet().isSetPageMargins());
-       assertEquals(false, s2.getCTWorksheet().isSetPageSetup());
-       assertEquals(true, s2.getCTWorksheet().isSetPageMargins());
-       
-       print = s1.getPrintSetup();
-       assertEquals(3, print.getCopies());
-       assertEquals(true, print.getLandscape());
-       
-       wb.close();
-    }
-
-    /**
-     * Open a file with print settings, save and check.
-     * Then, change, save, read, check
-     */
-    public void testRoundTrip() {
-       // TODO
-    }
-
-    @Test
-    public void testSetLandscapeFalse() throws Exception {
-        XSSFPrintSetup ps = new XSSFPrintSetup(CTWorksheet.Factory.newInstance());
-        
-        assertFalse(ps.getLandscape());
-        
-        ps.setLandscape(true);
-        assertTrue(ps.getLandscape());
-        
-        ps.setLandscape(false);
-        assertFalse(ps.getLandscape());
-    }
-
-    @Test
-    public void testSetLeftToRight() throws Exception {
-        XSSFPrintSetup ps = new XSSFPrintSetup(CTWorksheet.Factory.newInstance());
-        
-        assertFalse(ps.getLeftToRight());
-        
-        ps.setLeftToRight(true);
-        assertTrue(ps.getLeftToRight());
-        
-        ps.setLeftToRight(false);
-        assertFalse(ps.getLeftToRight());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
deleted file mode 100644
index 9adc531..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.StylesTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXstring;
-
-import java.io.IOException;
-import java.util.TreeMap;
-
-/**
- * Tests functionality of the XSSFRichTextRun object
- *
- * @author Yegor Kozlov
- */
-public final class TestXSSFRichTextString extends TestCase {
-
-    public void testCreate() {
-        XSSFRichTextString rt = new XSSFRichTextString("Apache POI");
-        assertEquals("Apache POI", rt.getString());
-        assertEquals(false, rt.hasFormatting());
-
-        CTRst st = rt.getCTRst();
-        assertTrue(st.isSetT());
-        assertEquals("Apache POI", st.getT());
-        assertEquals(false, rt.hasFormatting());
-
-        rt.append(" is cool stuff");
-        assertEquals(2, st.sizeOfRArray());
-        assertFalse(st.isSetT());
-
-        assertEquals("Apache POI is cool stuff", rt.getString());
-        assertEquals(false, rt.hasFormatting());
-    }
-
-    public void testEmpty() {
-        XSSFRichTextString rt = new XSSFRichTextString();
-        assertEquals(0, rt.getIndexOfFormattingRun(9999));
-        assertEquals(-1, rt.getLengthOfFormattingRun(9999));
-        assertNull(rt.getFontAtIndex(9999));
-    }
-
-    public void testApplyFont() {
-        XSSFRichTextString rt = new XSSFRichTextString();
-        rt.append("123");
-        rt.append("4567");
-        rt.append("89");
-
-        assertEquals("123456789", rt.getString());
-        assertEquals(false, rt.hasFormatting());
-
-        XSSFFont font1 = new XSSFFont();
-        font1.setBold(true);
-
-        rt.applyFont(2, 5, font1);
-        assertEquals(true, rt.hasFormatting());
-
-        assertEquals(4, rt.numFormattingRuns());
-        assertEquals(0, rt.getIndexOfFormattingRun(0));
-        assertEquals("12", rt.getCTRst().getRArray(0).getT());
-
-        assertEquals(2, rt.getIndexOfFormattingRun(1));
-        assertEquals("345", rt.getCTRst().getRArray(1).getT());
-
-        assertEquals(5, rt.getIndexOfFormattingRun(2));
-        assertEquals(2, rt.getLengthOfFormattingRun(2));
-        assertEquals("67", rt.getCTRst().getRArray(2).getT());
-
-        assertEquals(7, rt.getIndexOfFormattingRun(3));
-        assertEquals(2, rt.getLengthOfFormattingRun(3));
-        assertEquals("89", rt.getCTRst().getRArray(3).getT());
-        
-        
-        assertEquals(-1, rt.getIndexOfFormattingRun(9999));
-        assertEquals(-1, rt.getLengthOfFormattingRun(9999));
-        assertNull(rt.getFontAtIndex(9999));
-    }
-
-    public void testApplyFontIndex() {
-        XSSFRichTextString rt = new XSSFRichTextString("Apache POI");
-        rt.applyFont(0, 10, (short)1);
-        
-        rt.applyFont((short)1);
-        
-        assertNotNull(rt.getFontAtIndex(0));
-    }
-
-    public void testApplyFontWithStyles() {
-        XSSFRichTextString rt = new XSSFRichTextString("Apache POI");
-        
-        StylesTable tbl = new StylesTable();
-        rt.setStylesTableReference(tbl);
-        
-        try {
-            rt.applyFont(0, 10, (short)1);
-            fail("Fails without styles in the table");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-        
-        tbl.putFont(new XSSFFont());
-        rt.applyFont(0, 10, (short)1);
-        rt.applyFont((short)1);
-    }
-
-    public void testApplyFontException() {
-        XSSFRichTextString rt = new XSSFRichTextString("Apache POI");
-        
-        rt.applyFont(0, 0, (short)1);
-
-        try {
-            rt.applyFont(11, 10, (short)1);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("11"));
-        }
-
-        try {
-            rt.applyFont(-1, 10, (short)1);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("-1"));
-        }
-
-        try {
-            rt.applyFont(0, 555, (short)1);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("555"));
-        }
-    }
-
-    public void testClearFormatting() {
-
-        XSSFRichTextString rt = new XSSFRichTextString("Apache POI");
-        assertEquals("Apache POI", rt.getString());
-        assertEquals(false, rt.hasFormatting());
-
-        rt.clearFormatting();
-
-        CTRst st = rt.getCTRst();
-        assertTrue(st.isSetT());
-        assertEquals("Apache POI", rt.getString());
-        assertEquals(0, rt.numFormattingRuns());
-        assertEquals(false, rt.hasFormatting());
-
-        XSSFFont font = new XSSFFont();
-        font.setBold(true);
-
-        rt.applyFont(7, 10, font);
-        assertEquals(2, rt.numFormattingRuns());
-        assertEquals(true, rt.hasFormatting());
-        
-        rt.clearFormatting();
-        
-        assertEquals("Apache POI", rt.getString());
-        assertEquals(0, rt.numFormattingRuns());
-        assertEquals(false, rt.hasFormatting());
-    }
-
-    public void testGetFonts() {
-
-        XSSFRichTextString rt = new XSSFRichTextString();
-
-        XSSFFont font1 = new XSSFFont();
-        font1.setFontName("Arial");
-        font1.setItalic(true);
-        rt.append("The quick", font1);
-
-        XSSFFont font1$ = rt.getFontOfFormattingRun(0);
-        assertEquals(font1.getItalic(), font1$.getItalic());
-        assertEquals(font1.getFontName(), font1$.getFontName());
-
-        XSSFFont font2 = new XSSFFont();
-        font2.setFontName("Courier");
-        font2.setBold(true);
-        rt.append(" brown fox", font2);
-
-        XSSFFont font2$ = rt.getFontOfFormattingRun(1);
-        assertEquals(font2.getBold(), font2$.getBold());
-        assertEquals(font2.getFontName(), font2$.getFontName());
-    }
-
-    /**
-     * make sure we insert xml:space="preserve" attribute
-     * if a string has leading or trailing white spaces
-     */
-    public void testPreserveSpaces() {
-        XSSFRichTextString rt = new XSSFRichTextString("Apache");
-        CTRst ct = rt.getCTRst();
-        STXstring xs = ct.xgetT();
-        assertEquals("<xml-fragment>Apache</xml-fragment>", xs.xmlText());
-        rt.setString("  Apache");
-        assertEquals("<xml-fragment xml:space=\"preserve\">  Apache</xml-fragment>", xs.xmlText());
-
-        rt.append(" POI");
-        rt.append(" ");
-        assertEquals("  Apache POI ", rt.getString());
-        assertEquals("<xml-fragment xml:space=\"preserve\">  Apache</xml-fragment>", rt.getCTRst().getRArray(0).xgetT().xmlText());
-        assertEquals("<xml-fragment xml:space=\"preserve\"> POI</xml-fragment>", rt.getCTRst().getRArray(1).xgetT().xmlText());
-        assertEquals("<xml-fragment xml:space=\"preserve\"> </xml-fragment>", rt.getCTRst().getRArray(2).xgetT().xmlText());
-    }
-
-    /**
-     * test that unicode representation_ xHHHH_ is properly processed
-     */
-    public void testUtfDecode() throws IOException {
-        CTRst st = CTRst.Factory.newInstance();
-        st.setT("abc_x000D_2ef_x000D_");
-        XSSFRichTextString rt = new XSSFRichTextString(st);
-        //_x000D_ is converted into carriage return
-        assertEquals("abc\r2ef\r", rt.getString());
-
-        // Test Lowercase case
-        CTRst st2 = CTRst.Factory.newInstance();
-        st2.setT("abc_x000d_2ef_x000d_");
-        XSSFRichTextString rt2 = new XSSFRichTextString(st2);
-        assertEquals("abc\r2ef\r", rt2.getString());
-    }
-
-    public void testApplyFont_lowlevel(){
-        CTRst st = CTRst.Factory.newInstance();
-        String text = "Apache Software Foundation";
-        XSSFRichTextString str = new XSSFRichTextString(text);
-        assertEquals(26, text.length());
-
-        st.addNewR().setT(text);
-
-        TreeMap<Integer, CTRPrElt> formats = str.getFormatMap(st);
-        assertEquals(1, formats.size());
-        assertEquals(26, (int)formats.firstKey());
-        assertNull(formats.get( formats.firstKey() ));
-
-        CTRPrElt fmt1 = CTRPrElt.Factory.newInstance();
-        str.applyFont(formats, 0, 6, fmt1);
-        assertEquals(2, formats.size());
-        assertEquals("[6, 26]", formats.keySet().toString());
-        Object[] runs1 = formats.values().toArray();
-        assertSame(fmt1, runs1[0]);
-        assertSame(null, runs1[1]);
-
-        CTRPrElt fmt2 = CTRPrElt.Factory.newInstance();
-        str.applyFont(formats, 7, 15, fmt2);
-        assertEquals(4, formats.size());
-        assertEquals("[6, 7, 15, 26]", formats.keySet().toString());
-        Object[] runs2 = formats.values().toArray();
-        assertSame(fmt1, runs2[0]);
-        assertSame(null, runs2[1]);
-        assertSame(fmt2, runs2[2]);
-        assertSame(null, runs2[3]);
-
-        CTRPrElt fmt3 = CTRPrElt.Factory.newInstance();
-        str.applyFont(formats, 6, 7, fmt3);
-        assertEquals(4, formats.size());
-        assertEquals("[6, 7, 15, 26]", formats.keySet().toString());
-        Object[] runs3 = formats.values().toArray();
-        assertSame(fmt1, runs3[0]);
-        assertSame(fmt3, runs3[1]);
-        assertSame(fmt2, runs3[2]);
-        assertSame(null, runs3[3]);
-
-        CTRPrElt fmt4 = CTRPrElt.Factory.newInstance();
-        str.applyFont(formats, 0, 7, fmt4);
-        assertEquals(3, formats.size());
-        assertEquals("[7, 15, 26]", formats.keySet().toString());
-        Object[] runs4 = formats.values().toArray();
-        assertSame(fmt4, runs4[0]);
-        assertSame(fmt2, runs4[1]);
-        assertSame(null, runs4[2]);
-
-        CTRPrElt fmt5 = CTRPrElt.Factory.newInstance();
-        str.applyFont(formats, 0, 26, fmt5);
-        assertEquals(1, formats.size());
-        assertEquals("[26]", formats.keySet().toString());
-        Object[] runs5 = formats.values().toArray();
-        assertSame(fmt5, runs5[0]);
-
-        CTRPrElt fmt6 = CTRPrElt.Factory.newInstance();
-        str.applyFont(formats, 15, 26, fmt6);
-        assertEquals(2, formats.size());
-        assertEquals("[15, 26]", formats.keySet().toString());
-        Object[] runs6 = formats.values().toArray();
-        assertSame(fmt5, runs6[0]);
-        assertSame(fmt6, runs6[1]);
-
-        str.applyFont(formats, 0, 26, null);
-        assertEquals(1, formats.size());
-        assertEquals("[26]", formats.keySet().toString());
-        Object[] runs7 = formats.values().toArray();
-        assertSame(null, runs7[0]);
-
-        str.applyFont(formats, 15, 26, fmt6);
-        assertEquals(2, formats.size());
-        assertEquals("[15, 26]", formats.keySet().toString());
-        Object[] runs8 = formats.values().toArray();
-        assertSame(null, runs8[0]);
-        assertSame(fmt6, runs8[1]);
-
-        str.applyFont(formats, 15, 26, fmt5);
-        assertEquals(2, formats.size());
-        assertEquals("[15, 26]", formats.keySet().toString());
-        Object[] runs9 = formats.values().toArray();
-        assertSame(null, runs9[0]);
-        assertSame(fmt5, runs9[1]);
-
-        str.applyFont(formats, 2, 20, fmt6);
-        assertEquals(3, formats.size());
-        assertEquals("[2, 20, 26]", formats.keySet().toString());
-        Object[] runs10 = formats.values().toArray();
-        assertSame(null, runs10[0]);
-        assertSame(fmt6, runs10[1]);
-        assertSame(fmt5, runs10[2]);
-
-        str.applyFont(formats, 22, 24, fmt4);
-        assertEquals(5, formats.size());
-        assertEquals("[2, 20, 22, 24, 26]", formats.keySet().toString());
-        Object[] runs11 = formats.values().toArray();
-        assertSame(null, runs11[0]);
-        assertSame(fmt6, runs11[1]);
-        assertSame(fmt5, runs11[2]);
-        assertSame(fmt4, runs11[3]);
-        assertSame(fmt5, runs11[4]);
-
-        str.applyFont(formats, 0, 10, fmt1);
-        assertEquals(5, formats.size());
-        assertEquals("[10, 20, 22, 24, 26]", formats.keySet().toString());
-        Object[] runs12 = formats.values().toArray();
-        assertSame(fmt1, runs12[0]);
-        assertSame(fmt6, runs12[1]);
-        assertSame(fmt5, runs12[2]);
-        assertSame(fmt4, runs12[3]);
-        assertSame(fmt5, runs12[4]);
-    }
-
-    public void testApplyFont_usermodel(){
-        String text = "Apache Software Foundation";
-        XSSFRichTextString str = new XSSFRichTextString(text);
-        XSSFFont font1 = new XSSFFont();
-        XSSFFont font2 = new XSSFFont();
-        XSSFFont font3 = new XSSFFont();
-        str.applyFont(font1);
-        assertEquals(1, str.numFormattingRuns());
-
-        str.applyFont(0, 6, font1);
-        str.applyFont(6, text.length(), font2);
-        assertEquals(2, str.numFormattingRuns());
-        assertEquals("Apache", str.getCTRst().getRArray(0).getT());
-        assertEquals(" Software Foundation", str.getCTRst().getRArray(1).getT());
-
-        str.applyFont(15, 26, font3);
-        assertEquals(3, str.numFormattingRuns());
-        assertEquals("Apache", str.getCTRst().getRArray(0).getT());
-        assertEquals(" Software", str.getCTRst().getRArray(1).getT());
-        assertEquals(" Foundation", str.getCTRst().getRArray(2).getT());
-
-        str.applyFont(6, text.length(), font2);
-        assertEquals(2, str.numFormattingRuns());
-        assertEquals("Apache", str.getCTRst().getRArray(0).getT());
-        assertEquals(" Software Foundation", str.getCTRst().getRArray(1).getT());
-    }
-
-    public void testLineBreaks_bug48877() throws IOException{
-
-        XSSFFont font = new XSSFFont();
-        //noinspection deprecation
-        font.setBoldweight(XSSFFont.BOLDWEIGHT_BOLD);
-        font.setFontHeightInPoints((short) 14);
-        XSSFRichTextString str;
-        STXstring t1, t2, t3;
-
-        str = new XSSFRichTextString("Incorrect\nLine-Breaking");
-        str.applyFont(0, 8, font);
-        t1 = str.getCTRst().getRArray(0).xgetT();
-        t2 = str.getCTRst().getRArray(1).xgetT();
-        assertEquals("<xml-fragment>Incorrec</xml-fragment>", t1.xmlText());
-        assertEquals("<xml-fragment>t\nLine-Breaking</xml-fragment>", t2.xmlText());
-
-        str = new XSSFRichTextString("Incorrect\nLine-Breaking");
-        str.applyFont(0, 9, font);
-        t1 = str.getCTRst().getRArray(0).xgetT();
-        t2 = str.getCTRst().getRArray(1).xgetT();
-        assertEquals("<xml-fragment>Incorrect</xml-fragment>", t1.xmlText());
-        assertEquals("<xml-fragment xml:space=\"preserve\">\nLine-Breaking</xml-fragment>", t2.xmlText());
-
-        str = new XSSFRichTextString("Incorrect\n Line-Breaking");
-        str.applyFont(0, 9, font);
-        t1 = str.getCTRst().getRArray(0).xgetT();
-        t2 = str.getCTRst().getRArray(1).xgetT();
-        assertEquals("<xml-fragment>Incorrect</xml-fragment>", t1.xmlText());
-        assertEquals("<xml-fragment xml:space=\"preserve\">\n Line-Breaking</xml-fragment>", t2.xmlText());
-
-        str = new XSSFRichTextString("Tab\tseparated\n");
-        t1 = str.getCTRst().xgetT();
-        // trailing \n causes must be preserved
-        assertEquals("<xml-fragment xml:space=\"preserve\">Tab\tseparated\n</xml-fragment>", t1.xmlText());
-
-        str.applyFont(0, 3, font);
-        t1 = str.getCTRst().getRArray(0).xgetT();
-        t2 = str.getCTRst().getRArray(1).xgetT();
-        assertEquals("<xml-fragment>Tab</xml-fragment>", t1.xmlText());
-        assertEquals("<xml-fragment xml:space=\"preserve\">\tseparated\n</xml-fragment>", t2.xmlText());
-
-        str = new XSSFRichTextString("Tab\tseparated\n");
-        str.applyFont(0, 4, font);
-        t1 = str.getCTRst().getRArray(0).xgetT();
-        t2 = str.getCTRst().getRArray(1).xgetT();
-        assertEquals("<xml-fragment xml:space=\"preserve\">Tab\t</xml-fragment>", t1.xmlText());
-        assertEquals("<xml-fragment xml:space=\"preserve\">separated\n</xml-fragment>", t2.xmlText());
-
-        str = new XSSFRichTextString("\n\n\nNew Line\n\n");
-        str.applyFont(0, 3, font);
-        str.applyFont(11, 13, font);
-        t1 = str.getCTRst().getRArray(0).xgetT();
-        t2 = str.getCTRst().getRArray(1).xgetT();
-        t3 = str.getCTRst().getRArray(2).xgetT();
-        // YK: don't know why, but XmlBeans converts leading tab characters to spaces
-        assertEquals("<xml-fragment xml:space=\"preserve\">\n\n\n</xml-fragment>", t1.xmlText());
-        assertEquals("<xml-fragment>New Line</xml-fragment>", t2.xmlText());
-        assertEquals("<xml-fragment xml:space=\"preserve\">\n\n</xml-fragment>", t3.xmlText());
-    }
-
-    public void testBug56511() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56511.xlsx");
-        for (Sheet sheet : wb) {
-            int lastRow = sheet.getLastRowNum();
-            for (int rowIdx = sheet.getFirstRowNum(); rowIdx <= lastRow; rowIdx++) {
-                Row row = sheet.getRow(rowIdx);
-                if(row != null) {
-                    int lastCell = row.getLastCellNum();
-    
-                    for (int cellIdx = row.getFirstCellNum(); cellIdx <= lastCell; cellIdx++) {
-    
-                        Cell cell = row.getCell(cellIdx);
-                        if (cell != null) {
-                            //System.out.println("row " + rowIdx + " column " + cellIdx + ": " + cell.getCellType() + ": " + cell.toString());
-                            
-                            XSSFRichTextString richText = (XSSFRichTextString) cell.getRichStringCellValue();
-                            int anzFormattingRuns = richText.numFormattingRuns();
-                            for (int run = 0; run < anzFormattingRuns; run++) {
-                                /*XSSFFont font =*/ richText.getFontOfFormattingRun(run);
-                                //System.out.println("  run " + run
-                                //        + " font " + (font == null ? "<null>" : font.getFontName()));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public void testBug56511_values() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56511.xlsx");
-        Sheet sheet = wb.getSheetAt(0);
-        Row row = sheet.getRow(0);
-
-        // verify the values to ensure future changes keep the returned information equal 
-        XSSFRichTextString rt = (XSSFRichTextString) row.getCell(0).getRichStringCellValue();
-        assertEquals(0, rt.numFormattingRuns());
-        assertNull(rt.getFontOfFormattingRun(0));
-        assertEquals(-1, rt.getLengthOfFormattingRun(0));
-        
-        rt = (XSSFRichTextString) row.getCell(1).getRichStringCellValue();
-        assertEquals(0, row.getCell(1).getRichStringCellValue().numFormattingRuns());
-        assertNull(rt.getFontOfFormattingRun(1));
-        assertEquals(-1, rt.getLengthOfFormattingRun(1));
-               
-        rt = (XSSFRichTextString) row.getCell(2).getRichStringCellValue();
-        assertEquals(2, rt.numFormattingRuns());
-        assertNotNull(rt.getFontOfFormattingRun(0));
-        assertEquals(4, rt.getLengthOfFormattingRun(0));
-        
-        assertNotNull(rt.getFontOfFormattingRun(1));
-        assertEquals(9, rt.getLengthOfFormattingRun(1));
-
-        assertNull(rt.getFontOfFormattingRun(2));
-        
-        rt = (XSSFRichTextString) row.getCell(3).getRichStringCellValue();
-        assertEquals(3, rt.numFormattingRuns());
-        assertNull(rt.getFontOfFormattingRun(0));
-        assertEquals(1, rt.getLengthOfFormattingRun(0));
-        
-        assertNotNull(rt.getFontOfFormattingRun(1));
-        assertEquals(3, rt.getLengthOfFormattingRun(1));
-        
-        assertNotNull(rt.getFontOfFormattingRun(2));
-        assertEquals(9, rt.getLengthOfFormattingRun(2));
-    }
-
-    public void testToString() {
-        XSSFRichTextString rt = new XSSFRichTextString("Apache POI");
-        assertNotNull(rt.toString());
-        
-        // TODO: normally toString() should never return null, should we adjust this?
-        rt = new XSSFRichTextString();
-        assertNull(rt.toString());
-    }
-
-    public void test59008Font() {
-        XSSFFont font = new XSSFFont(CTFont.Factory.newInstance());
-
-        XSSFRichTextString rts = new XSSFRichTextString();
-        rts.append("This is correct ");
-        int s1 = rts.length();
-        rts.append("This is Bold Red", font);
-        int s2 = rts.length();
-        rts.append(" This uses the default font rather than the cell style font");
-        int s3 = rts.length();
-
-        assertEquals("<xml-fragment/>", rts.getFontAtIndex(s1-1).toString());
-        assertEquals(font, rts.getFontAtIndex(s2-1));
-        assertEquals("<xml-fragment/>", rts.getFontAtIndex(s3-1).toString());
-    }
-
-    public void test60289UtfDecode() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("60289.xlsx");
-        assertEquals("Rich Text\r\nTest", wb.getSheetAt(0).getRow(1).getCell(1).getRichStringCellValue().getString());
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java
deleted file mode 100644
index 6b49d81..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BaseTestXRow;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellCopyPolicy;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.junit.Test;
-
-/**
- * Tests for XSSFRow
- */
-public final class TestXSSFRow extends BaseTestXRow {
-
-    public TestXSSFRow() {
-        super(XSSFITestDataProvider.instance);
-    }
-    
-    @Test
-    public void testCopyRowFrom() throws IOException {
-        final XSSFWorkbook workbook = new XSSFWorkbook();
-        final XSSFSheet sheet = workbook.createSheet("test");
-        final XSSFRow srcRow = sheet.createRow(0);
-        srcRow.createCell(0).setCellValue("Hello");
-        final XSSFRow destRow = sheet.createRow(1);
-        
-        destRow.copyRowFrom(srcRow, new CellCopyPolicy());
-        assertNotNull(destRow.getCell(0));
-        assertEquals("Hello", destRow.getCell(0).getStringCellValue());
-        
-        workbook.close();
-    }
-    
-    @Test
-    public void testCopyRowFromExternalSheet() throws IOException {
-        final XSSFWorkbook workbook = new XSSFWorkbook();
-        final Sheet srcSheet = workbook.createSheet("src");
-        final XSSFSheet destSheet = workbook.createSheet("dest");
-        workbook.createSheet("other");
-        
-        final Row srcRow = srcSheet.createRow(0);
-        int col = 0;
-        //Test 2D and 3D Ref Ptgs (Pxg for OOXML Workbooks)
-        srcRow.createCell(col++).setCellFormula("B5");
-        srcRow.createCell(col++).setCellFormula("src!B5");
-        srcRow.createCell(col++).setCellFormula("dest!B5");
-        srcRow.createCell(col++).setCellFormula("other!B5");
-        
-        //Test 2D and 3D Ref Ptgs with absolute row
-        srcRow.createCell(col++).setCellFormula("B$5");
-        srcRow.createCell(col++).setCellFormula("src!B$5");
-        srcRow.createCell(col++).setCellFormula("dest!B$5");
-        srcRow.createCell(col++).setCellFormula("other!B$5");
-        
-        //Test 2D and 3D Area Ptgs (Pxg for OOXML Workbooks)
-        srcRow.createCell(col++).setCellFormula("SUM(B5:D$5)");
-        srcRow.createCell(col++).setCellFormula("SUM(src!B5:D$5)");
-        srcRow.createCell(col++).setCellFormula("SUM(dest!B5:D$5)");
-        srcRow.createCell(col++).setCellFormula("SUM(other!B5:D$5)");
-
-        //////////////////
-
-        final XSSFRow destRow = destSheet.createRow(1);
-        destRow.copyRowFrom(srcRow, new CellCopyPolicy());
-        
-        //////////////////
-        
-        //Test 2D and 3D Ref Ptgs (Pxg for OOXML Workbooks)
-        col = 0;
-        Cell cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("RefPtg", "B6", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Ref3DPtg", "src!B6", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Ref3DPtg", "dest!B6", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Ref3DPtg", "other!B6", cell.getCellFormula());
-        
-        /////////////////////////////////////////////
-        
-        //Test 2D and 3D Ref Ptgs with absolute row (Ptg row number shouldn't change)
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("RefPtg", "B$5", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Ref3DPtg", "src!B$5", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Ref3DPtg", "dest!B$5", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Ref3DPtg", "other!B$5", cell.getCellFormula());
-        
-        //////////////////////////////////////////
-        
-        //Test 2D and 3D Area Ptgs (Pxg for OOXML Workbooks)
-        // Note: absolute row changes from last cell to first cell in order
-        // to maintain topLeft:bottomRight order
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Area2DPtg", "SUM(B$5:D6)", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(cell);
-        assertEquals("Area3DPtg", "SUM(src!B$5:D6)", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(destRow.getCell(6));
-        assertEquals("Area3DPtg", "SUM(dest!B$5:D6)", cell.getCellFormula());
-        
-        cell = destRow.getCell(col++);
-        assertNotNull(destRow.getCell(7));
-        assertEquals("Area3DPtg", "SUM(other!B$5:D6)", cell.getCellFormula());
-        
-        workbook.close();
-    }
-    
-    @Test
-    public void testCopyRowOverwritesExistingRow() throws IOException {
-        final XSSFWorkbook workbook = new XSSFWorkbook();
-        final XSSFSheet sheet1 = workbook.createSheet("Sheet1");
-        final Sheet sheet2 = workbook.createSheet("Sheet2");
-        
-        final Row srcRow = sheet1.createRow(0);
-        final XSSFRow destRow = sheet1.createRow(1);
-        final Row observerRow = sheet1.createRow(2);
-        final Row externObserverRow = sheet2.createRow(0);
-        
-        srcRow.createCell(0).setCellValue("hello");
-        srcRow.createCell(1).setCellValue("world");
-        destRow.createCell(0).setCellValue(5.0); //A2 -> 5.0
-        destRow.createCell(1).setCellFormula("A1"); // B2 -> A1 -> "hello"
-        observerRow.createCell(0).setCellFormula("A2"); // A3 -> A2 -> 5.0
-        observerRow.createCell(1).setCellFormula("B2"); // B3 -> B2 -> A1 -> "hello"
-        externObserverRow.createCell(0).setCellFormula("Sheet1!A2"); //Sheet2!A1 -> Sheet1!A2 -> 5.0
-        
-        // overwrite existing destRow with row-copy of srcRow
-        destRow.copyRowFrom(srcRow, new CellCopyPolicy());
-        
-        // copyRowFrom should update existing destRow, rather than creating a new row and reassigning the destRow pointer
-        // to the new row (and allow the old row to be garbage collected)
-        // this is mostly so existing references to rows that are overwritten are updated
-        // rather than allowing users to continue updating rows that are no longer part of the sheet
-        assertSame("existing references to srcRow are still valid", srcRow, sheet1.getRow(0));
-        assertSame("existing references to destRow are still valid", destRow, sheet1.getRow(1));
-        assertSame("existing references to observerRow are still valid", observerRow, sheet1.getRow(2));
-        assertSame("existing references to externObserverRow are still valid", externObserverRow, sheet2.getRow(0));
-        
-        // Make sure copyRowFrom actually copied row (this is tested elsewhere)
-        assertEquals(CellType.STRING, destRow.getCell(0).getCellTypeEnum());
-        assertEquals("hello", destRow.getCell(0).getStringCellValue());
-        
-        // We don't want #REF! errors if we copy a row that contains cells that are referred to by other cells outside of copied region
-        assertEquals("references to overwritten cells are unmodified", "A2", observerRow.getCell(0).getCellFormula());
-        assertEquals("references to overwritten cells are unmodified", "B2", observerRow.getCell(1).getCellFormula());
-        assertEquals("references to overwritten cells are unmodified", "Sheet1!A2", externObserverRow.getCell(0).getCellFormula());
-        
-        workbook.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
deleted file mode 100644
index 24c1d72..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
+++ /dev/null
@@ -1,2040 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.xssf.XSSFTestDataSamples.openSampleWorkbook;
-import static org.apache.poi.xssf.XSSFTestDataSamples.writeOutAndReadBack;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.POIXMLException;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.AutoFilter;
-import org.apache.poi.ss.usermodel.BaseTestXSheet;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellCopyPolicy;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.IgnoredErrorType;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.CellUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.CalculationChain;
-import org.apache.poi.xssf.model.CommentsTable;
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.helpers.ColumnHelper;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIgnoredError;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRow;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetData;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetProtection;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCalcMode;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPane;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STUnsignedShortHex;
-
-
-public final class TestXSSFSheet extends BaseTestXSheet {
-
-    public TestXSSFSheet() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    //TODO column styles are not yet supported by XSSF
-    @Override
-    @Test
-    public void defaultColumnStyle() {
-        //super.defaultColumnStyle();
-    }
-
-    @Test
-    public void getSetMargin() throws IOException {
-        baseTestGetSetMargin(new double[]{0.7, 0.7, 0.75, 0.75, 0.3, 0.3});
-    }
-
-    @Test
-    public void existingHeaderFooter() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("45540_classic_Header.xlsx");
-        XSSFOddHeader hdr;
-        XSSFOddFooter ftr;
-
-        // Sheet 1 has a header with center and right text
-        XSSFSheet s1 = wb1.getSheetAt(0);
-        assertNotNull(s1.getHeader());
-        assertNotNull(s1.getFooter());
-        hdr = (XSSFOddHeader) s1.getHeader();
-        ftr = (XSSFOddFooter) s1.getFooter();
-
-        assertEquals("&Ctestdoc&Rtest phrase", hdr.getText());
-        assertEquals(null, ftr.getText());
-
-        assertEquals("", hdr.getLeft());
-        assertEquals("testdoc", hdr.getCenter());
-        assertEquals("test phrase", hdr.getRight());
-
-        assertEquals("", ftr.getLeft());
-        assertEquals("", ftr.getCenter());
-        assertEquals("", ftr.getRight());
-
-        // Sheet 2 has a footer, but it's empty
-        XSSFSheet s2 = wb1.getSheetAt(1);
-        assertNotNull(s2.getHeader());
-        assertNotNull(s2.getFooter());
-        hdr = (XSSFOddHeader) s2.getHeader();
-        ftr = (XSSFOddFooter) s2.getFooter();
-
-        assertEquals(null, hdr.getText());
-        assertEquals("&L&F", ftr.getText());
-
-        assertEquals("", hdr.getLeft());
-        assertEquals("", hdr.getCenter());
-        assertEquals("", hdr.getRight());
-
-        assertEquals("&F", ftr.getLeft());
-        assertEquals("", ftr.getCenter());
-        assertEquals("", ftr.getRight());
-
-        // Save and reload
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        hdr = (XSSFOddHeader) wb2.getSheetAt(0).getHeader();
-        ftr = (XSSFOddFooter) wb2.getSheetAt(0).getFooter();
-
-        assertEquals("", hdr.getLeft());
-        assertEquals("testdoc", hdr.getCenter());
-        assertEquals("test phrase", hdr.getRight());
-
-        assertEquals("", ftr.getLeft());
-        assertEquals("", ftr.getCenter());
-        assertEquals("", ftr.getRight());
-        
-        wb2.close();
-    }
-
-    @Test
-    public void getAllHeadersFooters() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet("Sheet 1");
-        assertNotNull(sheet.getOddFooter());
-        assertNotNull(sheet.getEvenFooter());
-        assertNotNull(sheet.getFirstFooter());
-        assertNotNull(sheet.getOddHeader());
-        assertNotNull(sheet.getEvenHeader());
-        assertNotNull(sheet.getFirstHeader());
-
-        assertEquals("", sheet.getOddFooter().getLeft());
-        sheet.getOddFooter().setLeft("odd footer left");
-        assertEquals("odd footer left", sheet.getOddFooter().getLeft());
-
-        assertEquals("", sheet.getEvenFooter().getLeft());
-        sheet.getEvenFooter().setLeft("even footer left");
-        assertEquals("even footer left", sheet.getEvenFooter().getLeft());
-
-        assertEquals("", sheet.getFirstFooter().getLeft());
-        sheet.getFirstFooter().setLeft("first footer left");
-        assertEquals("first footer left", sheet.getFirstFooter().getLeft());
-
-        assertEquals("", sheet.getOddHeader().getLeft());
-        sheet.getOddHeader().setLeft("odd header left");
-        assertEquals("odd header left", sheet.getOddHeader().getLeft());
-
-        assertEquals("", sheet.getOddHeader().getRight());
-        sheet.getOddHeader().setRight("odd header right");
-        assertEquals("odd header right", sheet.getOddHeader().getRight());
-
-        assertEquals("", sheet.getOddHeader().getCenter());
-        sheet.getOddHeader().setCenter("odd header center");
-        assertEquals("odd header center", sheet.getOddHeader().getCenter());
-
-        // Defaults are odd
-        assertEquals("odd footer left", sheet.getFooter().getLeft());
-        assertEquals("odd header center", sheet.getHeader().getCenter());
-        
-        workbook.close();
-    }
-
-    @Test
-    public void autoSizeColumn() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet("Sheet 1");
-        sheet.createRow(0).createCell(13).setCellValue("test");
-
-        sheet.autoSizeColumn(13);
-
-        ColumnHelper columnHelper = sheet.getColumnHelper();
-        CTCol col = columnHelper.getColumn(13, false);
-        assertTrue(col.getBestFit());
-        workbook.close();
-    }
-
-
-    @Test
-    public void setCellComment() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-
-        XSSFDrawing dg = sheet.createDrawingPatriarch();
-        XSSFComment comment = dg.createCellComment(new XSSFClientAnchor());
-
-        Cell cell = sheet.createRow(0).createCell(0);
-        CommentsTable comments = sheet.getCommentsTable(false);
-        CTComments ctComments = comments.getCTComments();
-
-        cell.setCellComment(comment);
-        assertEquals("A1", ctComments.getCommentList().getCommentArray(0).getRef());
-        comment.setAuthor("test A1 author");
-        assertEquals("test A1 author", comments.getAuthor((int) ctComments.getCommentList().getCommentArray(0).getAuthorId()));
-        workbook.close();
-    }
-
-    @Test
-    public void getActiveCell() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CellAddress R5 = new CellAddress("R5");
-        sheet.setActiveCell(R5);
-
-        assertEquals(R5, sheet.getActiveCell());
-        workbook.close();
-    }
-
-    @Test
-    public void createFreezePane_XSSF() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
-
-        sheet.createFreezePane(2, 4);
-        assertEquals(2.0, ctWorksheet.getSheetViews().getSheetViewArray(0).getPane().getXSplit(), 0.0);
-        assertEquals(STPane.BOTTOM_RIGHT, ctWorksheet.getSheetViews().getSheetViewArray(0).getPane().getActivePane());
-        sheet.createFreezePane(3, 6, 10, 10);
-        assertEquals(3.0, ctWorksheet.getSheetViews().getSheetViewArray(0).getPane().getXSplit(), 0.0);
-        //    assertEquals(10, sheet.getTopRow());
-        //    assertEquals(10, sheet.getLeftCol());
-        sheet.createSplitPane(4, 8, 12, 12, 1);
-        assertEquals(8.0, ctWorksheet.getSheetViews().getSheetViewArray(0).getPane().getYSplit(), 0.0);
-        assertEquals(STPane.BOTTOM_RIGHT, ctWorksheet.getSheetViews().getSheetViewArray(0).getPane().getActivePane());
-        
-        workbook.close();
-    }
-
-    @Test
-    public void removeMergedRegion_lowlevel() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
-        CellRangeAddress region_1 = CellRangeAddress.valueOf("A1:B2");
-        CellRangeAddress region_2 = CellRangeAddress.valueOf("C3:D4");
-        CellRangeAddress region_3 = CellRangeAddress.valueOf("E5:F6");
-        CellRangeAddress region_4 = CellRangeAddress.valueOf("G7:H8");
-        sheet.addMergedRegion(region_1);
-        sheet.addMergedRegion(region_2);
-        sheet.addMergedRegion(region_3);
-        assertEquals("C3:D4", ctWorksheet.getMergeCells().getMergeCellArray(1).getRef());
-        assertEquals(3, sheet.getNumMergedRegions());
-        sheet.removeMergedRegion(1);
-        assertEquals("E5:F6", ctWorksheet.getMergeCells().getMergeCellArray(1).getRef());
-        assertEquals(2, sheet.getNumMergedRegions());
-        sheet.removeMergedRegion(1);
-        sheet.removeMergedRegion(0);
-        assertEquals(0, sheet.getNumMergedRegions());
-        assertNull(" CTMergeCells should be deleted after removing the last merged " +
-                "region on the sheet.", sheet.getCTWorksheet().getMergeCells());
-        sheet.addMergedRegion(region_1);
-        sheet.addMergedRegion(region_2);
-        sheet.addMergedRegion(region_3);
-        sheet.addMergedRegion(region_4);
-        // test invalid indexes OOBE
-        Set<Integer> rmIdx = new HashSet<Integer>(Arrays.asList(5,6));
-        sheet.removeMergedRegions(rmIdx);
-        rmIdx = new HashSet<Integer>(Arrays.asList(1,3));
-        sheet.removeMergedRegions(rmIdx);
-        assertEquals("A1:B2", ctWorksheet.getMergeCells().getMergeCellArray(0).getRef());
-        assertEquals("E5:F6", ctWorksheet.getMergeCells().getMergeCellArray(1).getRef());
-        workbook.close();
-    }
-
-    @Test
-    public void setDefaultColumnStyle() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
-        StylesTable stylesTable = workbook.getStylesSource();
-        XSSFFont font = new XSSFFont();
-        font.setFontName("Cambria");
-        stylesTable.putFont(font);
-        CTXf cellStyleXf = CTXf.Factory.newInstance();
-        cellStyleXf.setFontId(1);
-        cellStyleXf.setFillId(0);
-        cellStyleXf.setBorderId(0);
-        cellStyleXf.setNumFmtId(0);
-        stylesTable.putCellStyleXf(cellStyleXf);
-        CTXf cellXf = CTXf.Factory.newInstance();
-        cellXf.setXfId(1);
-        stylesTable.putCellXf(cellXf);
-        XSSFCellStyle cellStyle = new XSSFCellStyle(1, 1, stylesTable, null);
-        assertEquals(1, cellStyle.getFontIndex());
-
-        sheet.setDefaultColumnStyle(3, cellStyle);
-        assertEquals(1, ctWorksheet.getColsArray(0).getColArray(0).getStyle());
-        workbook.close();
-    }
-
-
-    @Test
-    public void groupUngroupColumn() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-
-        //one level
-        sheet.groupColumn(2, 7);
-        sheet.groupColumn(10, 11);
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        assertEquals(2, cols.sizeOfColArray());
-        CTCol[] colArray = cols.getColArray();
-        assertNotNull(colArray);
-        assertEquals(2 + 1, colArray[0].getMin()); // 1 based
-        assertEquals(7 + 1, colArray[0].getMax()); // 1 based
-        assertEquals(1, colArray[0].getOutlineLevel());
-        assertEquals(0, sheet.getColumnOutlineLevel(0));
-
-        //two level
-        sheet.groupColumn(1, 2);
-        cols = sheet.getCTWorksheet().getColsArray(0);
-        assertEquals(4, cols.sizeOfColArray());
-        colArray = cols.getColArray();
-        assertEquals(2, colArray[1].getOutlineLevel());
-
-        //three level
-        sheet.groupColumn(6, 8);
-        sheet.groupColumn(2, 3);
-        cols = sheet.getCTWorksheet().getColsArray(0);
-        assertEquals(7, cols.sizeOfColArray());
-        colArray = cols.getColArray();
-        assertEquals(3, colArray[1].getOutlineLevel());
-        assertEquals(3, sheet.getCTWorksheet().getSheetFormatPr().getOutlineLevelCol());
-
-        sheet.ungroupColumn(8, 10);
-        colArray = cols.getColArray();
-        //assertEquals(3, colArray[1].getOutlineLevel());
-
-        sheet.ungroupColumn(4, 6);
-        sheet.ungroupColumn(2, 2);
-        colArray = cols.getColArray();
-        assertEquals(4, colArray.length);
-        assertEquals(2, sheet.getCTWorksheet().getSheetFormatPr().getOutlineLevelCol());
-        
-        workbook.close();
-    }
-
-    @Test
-    public void groupUngroupRow() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-
-        //one level
-        sheet.groupRow(9, 10);
-        assertEquals(2, sheet.getPhysicalNumberOfRows());
-        CTRow ctrow = sheet.getRow(9).getCTRow();
-
-        assertNotNull(ctrow);
-        assertEquals(10, ctrow.getR());
-        assertEquals(1, ctrow.getOutlineLevel());
-        assertEquals(1, sheet.getCTWorksheet().getSheetFormatPr().getOutlineLevelRow());
-
-        //two level
-        sheet.groupRow(10, 13);
-        assertEquals(5, sheet.getPhysicalNumberOfRows());
-        ctrow = sheet.getRow(10).getCTRow();
-        assertNotNull(ctrow);
-        assertEquals(11, ctrow.getR());
-        assertEquals(2, ctrow.getOutlineLevel());
-        assertEquals(2, sheet.getCTWorksheet().getSheetFormatPr().getOutlineLevelRow());
-
-
-        sheet.ungroupRow(8, 10);
-        assertEquals(4, sheet.getPhysicalNumberOfRows());
-        assertEquals(1, sheet.getCTWorksheet().getSheetFormatPr().getOutlineLevelRow());
-
-        sheet.ungroupRow(10, 10);
-        assertEquals(3, sheet.getPhysicalNumberOfRows());
-
-        assertEquals(1, sheet.getCTWorksheet().getSheetFormatPr().getOutlineLevelRow());
-        
-        workbook.close();
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void setZoom() throws IOException {
-        XSSFWorkbook workBook = new XSSFWorkbook();
-        XSSFSheet sheet1 = workBook.createSheet("new sheet");
-        sheet1.setZoom(75);   // 75 percent magnification
-        long zoom = sheet1.getCTWorksheet().getSheetViews().getSheetViewArray(0).getZoomScale();
-        assertEquals(zoom, 75);
-
-        sheet1.setZoom(200);
-        zoom = sheet1.getCTWorksheet().getSheetViews().getSheetViewArray(0).getZoomScale();
-        assertEquals(zoom, 200);
-
-        // Valid scale values range from 10 to 400
-        try {
-            sheet1.setZoom(500);
-        } finally {
-            workBook.close();
-        }
-    }
-
-    /**
-     * TODO - while this is internally consistent, I'm not
-     *  completely clear in all cases what it's supposed to
-     *  be doing... Someone who understands the goals a little
-     *  better should really review this!
-     */
-    @Test
-    public void setColumnGroupCollapsed() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet1 = wb1.createSheet();
-
-        CTCols cols=sheet1.getCTWorksheet().getColsArray(0);
-        assertEquals(0,cols.sizeOfColArray());
-
-        sheet1.groupColumn( (short)4, (short)7 );
-        sheet1.groupColumn( (short)9, (short)12 );
-
-        assertEquals(2,cols.sizeOfColArray());
-
-        assertEquals(false,cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(true, cols.getColArray(1).isSetCollapsed());
-        assertEquals(10, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(1).getMax()); // 1 based
-
-        sheet1.groupColumn( (short)10, (short)11 );
-        assertEquals(4,cols.sizeOfColArray());
-
-        assertEquals(false,cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(true, cols.getColArray(1).isSetCollapsed());
-        assertEquals(10, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(10, cols.getColArray(1).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(2).isSetHidden());
-        assertEquals(true, cols.getColArray(2).isSetCollapsed());
-        assertEquals(11, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(12, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(3).isSetHidden());
-        assertEquals(true, cols.getColArray(3).isSetCollapsed());
-        assertEquals(13, cols.getColArray(3).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(3).getMax()); // 1 based
-
-        // collapse columns - 1
-        sheet1.setColumnGroupCollapsed( (short)5, true );
-        assertEquals(5,cols.sizeOfColArray());
-
-        assertEquals(true, cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(true, cols.getColArray(1).isSetCollapsed());
-        assertEquals(9, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(9, cols.getColArray(1).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(2).isSetHidden());
-        assertEquals(true, cols.getColArray(2).isSetCollapsed());
-        assertEquals(10, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(10, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(3).isSetHidden());
-        assertEquals(true, cols.getColArray(3).isSetCollapsed());
-        assertEquals(11, cols.getColArray(3).getMin()); // 1 based
-        assertEquals(12, cols.getColArray(3).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(4).isSetHidden());
-        assertEquals(true, cols.getColArray(4).isSetCollapsed());
-        assertEquals(13, cols.getColArray(4).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(4).getMax()); // 1 based
-
-
-        // expand columns - 1
-        sheet1.setColumnGroupCollapsed( (short)5, false );
-
-        assertEquals(false,cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(false,cols.getColArray(1).isSetCollapsed());
-        assertEquals(9, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(9, cols.getColArray(1).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(2).isSetHidden());
-        assertEquals(true, cols.getColArray(2).isSetCollapsed());
-        assertEquals(10, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(10, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(3).isSetHidden());
-        assertEquals(true, cols.getColArray(3).isSetCollapsed());
-        assertEquals(11, cols.getColArray(3).getMin()); // 1 based
-        assertEquals(12, cols.getColArray(3).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(4).isSetHidden());
-        assertEquals(true, cols.getColArray(4).isSetCollapsed());
-        assertEquals(13, cols.getColArray(4).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(4).getMax()); // 1 based
-
-
-        //collapse - 2
-        sheet1.setColumnGroupCollapsed( (short)9, true );
-        assertEquals(6,cols.sizeOfColArray());
-        assertEquals(false,cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(false,cols.getColArray(1).isSetCollapsed());
-        assertEquals(9, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(9, cols.getColArray(1).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(2).isSetHidden());
-        assertEquals(true, cols.getColArray(2).isSetCollapsed());
-        assertEquals(10, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(10, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(3).isSetHidden());
-        assertEquals(true, cols.getColArray(3).isSetCollapsed());
-        assertEquals(11, cols.getColArray(3).getMin()); // 1 based
-        assertEquals(12, cols.getColArray(3).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(4).isSetHidden());
-        assertEquals(true, cols.getColArray(4).isSetCollapsed());
-        assertEquals(13, cols.getColArray(4).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(4).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(5).isSetHidden());
-        assertEquals(true, cols.getColArray(5).isSetCollapsed());
-        assertEquals(14, cols.getColArray(5).getMin()); // 1 based
-        assertEquals(14, cols.getColArray(5).getMax()); // 1 based
-
-
-        //expand - 2
-        sheet1.setColumnGroupCollapsed( (short)9, false );
-        assertEquals(6,cols.sizeOfColArray());
-        assertEquals(14,cols.getColArray(5).getMin());
-
-        //outline level 2: the line under ==> collapsed==True
-        assertEquals(2,cols.getColArray(3).getOutlineLevel());
-        assertEquals(true,cols.getColArray(4).isSetCollapsed());
-
-        assertEquals(false,cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(false,cols.getColArray(1).isSetCollapsed());
-        assertEquals(9, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(9, cols.getColArray(1).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(2).isSetHidden());
-        assertEquals(true, cols.getColArray(2).isSetCollapsed());
-        assertEquals(10, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(10, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(3).isSetHidden());
-        assertEquals(true, cols.getColArray(3).isSetCollapsed());
-        assertEquals(11, cols.getColArray(3).getMin()); // 1 based
-        assertEquals(12, cols.getColArray(3).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(4).isSetHidden());
-        assertEquals(true, cols.getColArray(4).isSetCollapsed());
-        assertEquals(13, cols.getColArray(4).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(4).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(5).isSetHidden());
-        assertEquals(false,cols.getColArray(5).isSetCollapsed());
-        assertEquals(14, cols.getColArray(5).getMin()); // 1 based
-        assertEquals(14, cols.getColArray(5).getMax()); // 1 based
-
-        //DOCUMENTARE MEGLIO IL DISCORSO DEL LIVELLO
-        //collapse - 3
-        sheet1.setColumnGroupCollapsed( (short)10, true );
-        assertEquals(6,cols.sizeOfColArray());
-        assertEquals(false,cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(false,cols.getColArray(1).isSetCollapsed());
-        assertEquals(9, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(9, cols.getColArray(1).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(2).isSetHidden());
-        assertEquals(true, cols.getColArray(2).isSetCollapsed());
-        assertEquals(10, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(10, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(true, cols.getColArray(3).isSetHidden());
-        assertEquals(true, cols.getColArray(3).isSetCollapsed());
-        assertEquals(11, cols.getColArray(3).getMin()); // 1 based
-        assertEquals(12, cols.getColArray(3).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(4).isSetHidden());
-        assertEquals(true, cols.getColArray(4).isSetCollapsed());
-        assertEquals(13, cols.getColArray(4).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(4).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(5).isSetHidden());
-        assertEquals(false,cols.getColArray(5).isSetCollapsed());
-        assertEquals(14, cols.getColArray(5).getMin()); // 1 based
-        assertEquals(14, cols.getColArray(5).getMax()); // 1 based
-
-
-        //expand - 3
-        sheet1.setColumnGroupCollapsed( (short)10, false );
-        assertEquals(6,cols.sizeOfColArray());
-        assertEquals(false,cols.getColArray(0).getHidden());
-        assertEquals(false,cols.getColArray(5).getHidden());
-        assertEquals(false,cols.getColArray(4).isSetCollapsed());
-
-//      write out and give back
-        // Save and re-load
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet1 = wb2.getSheetAt(0);
-        assertEquals(6,cols.sizeOfColArray());
-
-        assertEquals(false,cols.getColArray(0).isSetHidden());
-        assertEquals(true, cols.getColArray(0).isSetCollapsed());
-        assertEquals(5, cols.getColArray(0).getMin()); // 1 based
-        assertEquals(8, cols.getColArray(0).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(1).isSetHidden());
-        assertEquals(false,cols.getColArray(1).isSetCollapsed());
-        assertEquals(9, cols.getColArray(1).getMin()); // 1 based
-        assertEquals(9, cols.getColArray(1).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(2).isSetHidden());
-        assertEquals(true, cols.getColArray(2).isSetCollapsed());
-        assertEquals(10, cols.getColArray(2).getMin()); // 1 based
-        assertEquals(10, cols.getColArray(2).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(3).isSetHidden());
-        assertEquals(true, cols.getColArray(3).isSetCollapsed());
-        assertEquals(11, cols.getColArray(3).getMin()); // 1 based
-        assertEquals(12, cols.getColArray(3).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(4).isSetHidden());
-        assertEquals(false,cols.getColArray(4).isSetCollapsed());
-        assertEquals(13, cols.getColArray(4).getMin()); // 1 based
-        assertEquals(13, cols.getColArray(4).getMax()); // 1 based
-        assertEquals(false,cols.getColArray(5).isSetHidden());
-        assertEquals(false,cols.getColArray(5).isSetCollapsed());
-        assertEquals(14, cols.getColArray(5).getMin()); // 1 based
-        assertEquals(14, cols.getColArray(5).getMax()); // 1 based
-        
-        wb2.close();
-    }
-
-    /**
-     * TODO - while this is internally consistent, I'm not
-     *  completely clear in all cases what it's supposed to
-     *  be doing... Someone who understands the goals a little
-     *  better should really review this!
-     */
-    @Test
-    public void setRowGroupCollapsed() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet1 = wb1.createSheet();
-
-        sheet1.groupRow( 5, 14 );
-        sheet1.groupRow( 7, 14 );
-        sheet1.groupRow( 16, 19 );
-
-        assertEquals(14,sheet1.getPhysicalNumberOfRows());
-        assertFalse(sheet1.getRow(6).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(6).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(7).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(7).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(9).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(9).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(14).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(14).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetHidden());
-
-        //collapsed
-        sheet1.setRowGroupCollapsed( 7, true );
-
-        assertFalse(sheet1.getRow(6).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(6).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(7).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(7).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(9).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(9).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(14).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(14).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetHidden());
-
-        //expanded
-        sheet1.setRowGroupCollapsed( 7, false );
-
-        assertFalse(sheet1.getRow(6).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(6).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(7).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(7).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(9).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(9).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(14).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(14).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetHidden());
-
-
-        // Save and re-load
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet1 = wb2.getSheetAt(0);
-
-        assertFalse(sheet1.getRow(6).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(6).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(7).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(7).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(9).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(9).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(14).getCTRow().isSetCollapsed());
-        assertTrue (sheet1.getRow(14).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(16).getCTRow().isSetHidden());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetCollapsed());
-        assertFalse(sheet1.getRow(18).getCTRow().isSetHidden());
-        
-        wb2.close();
-    }
-
-    /**
-     * Get / Set column width and check the actual values of the underlying XML beans
-     */
-    @Test
-    public void columnWidth_lowlevel() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet("Sheet 1");
-        sheet.setColumnWidth(1, 22 * 256);
-        assertEquals(22 * 256, sheet.getColumnWidth(1));
-
-        // Now check the low level stuff, and check that's all
-        //  been set correctly
-        XSSFSheet xs = sheet;
-        CTWorksheet cts = xs.getCTWorksheet();
-
-        assertEquals(1, cts.sizeOfColsArray());
-        CTCols cols = cts.getColsArray(0);
-        assertEquals(1, cols.sizeOfColArray());
-        CTCol col = cols.getColArray(0);
-
-        // XML is 1 based, POI is 0 based
-        assertEquals(2, col.getMin());
-        assertEquals(2, col.getMax());
-        assertEquals(22.0, col.getWidth(), 0.0);
-        assertTrue(col.getCustomWidth());
-
-        // Now set another
-        sheet.setColumnWidth(3, 33 * 256);
-
-        assertEquals(1, cts.sizeOfColsArray());
-        cols = cts.getColsArray(0);
-        assertEquals(2, cols.sizeOfColArray());
-
-        col = cols.getColArray(0);
-        assertEquals(2, col.getMin()); // POI 1
-        assertEquals(2, col.getMax());
-        assertEquals(22.0, col.getWidth(), 0.0);
-        assertTrue(col.getCustomWidth());
-
-        col = cols.getColArray(1);
-        assertEquals(4, col.getMin()); // POI 3
-        assertEquals(4, col.getMax());
-        assertEquals(33.0, col.getWidth(), 0.0);
-        assertTrue(col.getCustomWidth());
-        
-        workbook.close();
-    }
-
-    /**
-     * Setting width of a column included in a column span
-     */
-    @Test
-    public void bug47862() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("47862.xlsx");
-        XSSFSheet sheet = wb1.getSheetAt(0);
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        //<cols>
-        //  <col min="1" max="5" width="15.77734375" customWidth="1"/>
-        //</cols>
-
-        //a span of columns [1,5]
-        assertEquals(1, cols.sizeOfColArray());
-        CTCol col = cols.getColArray(0);
-        assertEquals(1, col.getMin());
-        assertEquals(5, col.getMax());
-        double swidth = 15.77734375; //width of columns in the span
-        assertEquals(swidth, col.getWidth(), 0.0);
-
-        for (int i = 0; i < 5; i++) {
-            assertEquals((int)(swidth*256), sheet.getColumnWidth(i));
-        }
-
-        int[] cw = new int[]{10, 15, 20, 25, 30};
-        for (int i = 0; i < 5; i++) {
-            sheet.setColumnWidth(i, cw[i]*256);
-        }
-
-        //the check below failed prior to fix of Bug #47862
-        ColumnHelper.sortColumns(cols);
-        //<cols>
-        //  <col min="1" max="1" customWidth="true" width="10.0" />
-        //  <col min="2" max="2" customWidth="true" width="15.0" />
-        //  <col min="3" max="3" customWidth="true" width="20.0" />
-        //  <col min="4" max="4" customWidth="true" width="25.0" />
-        //  <col min="5" max="5" customWidth="true" width="30.0" />
-        //</cols>
-
-        //now the span is splitted into 5 individual columns
-        assertEquals(5, cols.sizeOfColArray());
-        for (int i = 0; i < 5; i++) {
-            assertEquals(cw[i]*256, sheet.getColumnWidth(i));
-            assertEquals(cw[i], cols.getColArray(i).getWidth(), 0.0);
-        }
-
-        //serialize and check again
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        cols = sheet.getCTWorksheet().getColsArray(0);
-        assertEquals(5, cols.sizeOfColArray());
-        for (int i = 0; i < 5; i++) {
-            assertEquals(cw[i]*256, sheet.getColumnWidth(i));
-            assertEquals(cw[i], cols.getColArray(i).getWidth(), 0.0);
-        }
-        
-        wb2.close();
-    }
-
-    /**
-     * Hiding a column included in a column span
-     */
-    @Test
-    public void bug47804() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("47804.xlsx");
-        XSSFSheet sheet = wb1.getSheetAt(0);
-        CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-        assertEquals(2, cols.sizeOfColArray());
-        CTCol col;
-        //<cols>
-        //  <col min="2" max="4" width="12" customWidth="1"/>
-        //  <col min="7" max="7" width="10.85546875" customWidth="1"/>
-        //</cols>
-
-        //a span of columns [2,4]
-        col = cols.getColArray(0);
-        assertEquals(2, col.getMin());
-        assertEquals(4, col.getMax());
-        //individual column
-        col = cols.getColArray(1);
-        assertEquals(7, col.getMin());
-        assertEquals(7, col.getMax());
-
-        sheet.setColumnHidden(2, true); // Column C
-        sheet.setColumnHidden(6, true); // Column G
-
-        assertTrue(sheet.isColumnHidden(2));
-        assertTrue(sheet.isColumnHidden(6));
-
-        //other columns but C and G are not hidden
-        assertFalse(sheet.isColumnHidden(1));
-        assertFalse(sheet.isColumnHidden(3));
-        assertFalse(sheet.isColumnHidden(4));
-        assertFalse(sheet.isColumnHidden(5));
-
-        //the check below failed prior to fix of Bug #47804
-        ColumnHelper.sortColumns(cols);
-        //the span is now splitted into three parts
-        //<cols>
-        //  <col min="2" max="2" customWidth="true" width="12.0" />
-        //  <col min="3" max="3" customWidth="true" width="12.0" hidden="true"/>
-        //  <col min="4" max="4" customWidth="true" width="12.0"/>
-        //  <col min="7" max="7" customWidth="true" width="10.85546875" hidden="true"/>
-        //</cols>
-
-        assertEquals(4, cols.sizeOfColArray());
-        col = cols.getColArray(0);
-        assertEquals(2, col.getMin());
-        assertEquals(2, col.getMax());
-        col = cols.getColArray(1);
-        assertEquals(3, col.getMin());
-        assertEquals(3, col.getMax());
-        col = cols.getColArray(2);
-        assertEquals(4, col.getMin());
-        assertEquals(4, col.getMax());
-        col = cols.getColArray(3);
-        assertEquals(7, col.getMin());
-        assertEquals(7, col.getMax());
-
-        //serialize and check again
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        assertTrue(sheet.isColumnHidden(2));
-        assertTrue(sheet.isColumnHidden(6));
-        assertFalse(sheet.isColumnHidden(1));
-        assertFalse(sheet.isColumnHidden(3));
-        assertFalse(sheet.isColumnHidden(4));
-        assertFalse(sheet.isColumnHidden(5));
-        
-        wb2.close();
-    }
-
-    @Test
-    public void commentsTable() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet1 = wb1.createSheet();
-        CommentsTable comment1 = sheet1.getCommentsTable(false);
-        assertNull(comment1);
-
-        comment1 = sheet1.getCommentsTable(true);
-        assertNotNull(comment1);
-        assertEquals("/xl/comments1.xml", comment1.getPackagePart().getPartName().getName());
-
-        assertSame(comment1, sheet1.getCommentsTable(true));
-
-        //second sheet
-        XSSFSheet sheet2 = wb1.createSheet();
-        CommentsTable comment2 = sheet2.getCommentsTable(false);
-        assertNull(comment2);
-
-        comment2 = sheet2.getCommentsTable(true);
-        assertNotNull(comment2);
-
-        assertSame(comment2, sheet2.getCommentsTable(true));
-        assertEquals("/xl/comments2.xml", comment2.getPackagePart().getPartName().getName());
-
-        //comment1 and  comment2 are different objects
-        assertNotSame(comment1, comment2);
-        wb1.close();
-        
-        //now test against a workbook containing cell comments
-        XSSFWorkbook wb2 = XSSFTestDataSamples.openSampleWorkbook("WithMoreVariousData.xlsx");
-        sheet1 = wb2.getSheetAt(0);
-        comment1 = sheet1.getCommentsTable(true);
-        assertNotNull(comment1);
-        assertEquals("/xl/comments1.xml", comment1.getPackagePart().getPartName().getName());
-        assertSame(comment1, sheet1.getCommentsTable(true));
-        
-        wb2.close();
-    }
-
-    /**
-     * Rows and cells can be created in random order,
-     * but CTRows are kept in ascending order
-     */
-    @Override
-    @Test
-    public void createRow() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet();
-        CTWorksheet wsh = sheet.getCTWorksheet();
-        CTSheetData sheetData = wsh.getSheetData();
-        assertEquals(0, sheetData.sizeOfRowArray());
-
-        XSSFRow row1 = sheet.createRow(2);
-        row1.createCell(2);
-        row1.createCell(1);
-
-        XSSFRow row2 = sheet.createRow(1);
-        row2.createCell(2);
-        row2.createCell(1);
-        row2.createCell(0);
-
-        XSSFRow row3 = sheet.createRow(0);
-        row3.createCell(3);
-        row3.createCell(0);
-        row3.createCell(2);
-        row3.createCell(5);
-
-
-        CTRow[] xrow = sheetData.getRowArray();
-        assertEquals(3, xrow.length);
-
-        //rows are sorted: {0, 1, 2}
-        assertEquals(4, xrow[0].sizeOfCArray());
-        assertEquals(1, xrow[0].getR());
-        assertTrue(xrow[0].equals(row3.getCTRow()));
-
-        assertEquals(3, xrow[1].sizeOfCArray());
-        assertEquals(2, xrow[1].getR());
-        assertTrue(xrow[1].equals(row2.getCTRow()));
-
-        assertEquals(2, xrow[2].sizeOfCArray());
-        assertEquals(3, xrow[2].getR());
-        assertTrue(xrow[2].equals(row1.getCTRow()));
-
-        CTCell[] xcell = xrow[0].getCArray();
-        assertEquals("D1", xcell[0].getR());
-        assertEquals("A1", xcell[1].getR());
-        assertEquals("C1", xcell[2].getR());
-        assertEquals("F1", xcell[3].getR());
-
-        //re-creating a row does NOT add extra data to the parent
-        row2 = sheet.createRow(1);
-        assertEquals(3, sheetData.sizeOfRowArray());
-        //existing cells are invalidated
-        assertEquals(0, sheetData.getRowArray(1).sizeOfCArray());
-        assertEquals(0, row2.getPhysicalNumberOfCells());
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        wsh = sheet.getCTWorksheet();
-        xrow = sheetData.getRowArray();
-        assertEquals(3, xrow.length);
-
-        //rows are sorted: {0, 1, 2}
-        assertEquals(4, xrow[0].sizeOfCArray());
-        assertEquals(1, xrow[0].getR());
-        //cells are now sorted
-        xcell = xrow[0].getCArray();
-        assertEquals("A1", xcell[0].getR());
-        assertEquals("C1", xcell[1].getR());
-        assertEquals("D1", xcell[2].getR());
-        assertEquals("F1", xcell[3].getR());
-
-
-        assertEquals(0, xrow[1].sizeOfCArray());
-        assertEquals(2, xrow[1].getR());
-
-        assertEquals(2, xrow[2].sizeOfCArray());
-        assertEquals(3, xrow[2].getR());
-
-        wb2.close();
-    }
-
-    @Test
-    public void setAutoFilter() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet("new sheet");
-        sheet.setAutoFilter(CellRangeAddress.valueOf("A1:D100"));
-
-        assertEquals("A1:D100", sheet.getCTWorksheet().getAutoFilter().getRef());
-
-        // auto-filter must be registered in workboook.xml, see Bugzilla 50315
-        XSSFName nm = wb.getBuiltInName(XSSFName.BUILTIN_FILTER_DB, 0);
-        assertNotNull(nm);
-
-        assertEquals(0, nm.getCTName().getLocalSheetId());
-        assertEquals(true, nm.getCTName().getHidden());
-        assertEquals("_xlnm._FilterDatabase", nm.getCTName().getName());
-        assertEquals("'new sheet'!$A$1:$D$100", nm.getCTName().getStringValue());
-        
-        wb.close();
-    }
-
-    @Test
-    public void protectSheet_lowlevel() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        CTSheetProtection pr = sheet.getCTWorksheet().getSheetProtection();
-        assertNull("CTSheetProtection should be null by default", pr);
-        String password = "Test";
-        sheet.protectSheet(password);
-        pr = sheet.getCTWorksheet().getSheetProtection();
-        assertNotNull("CTSheetProtection should be not null", pr);
-        assertTrue("sheet protection should be on", pr.isSetSheet());
-        assertTrue("object protection should be on", pr.isSetObjects());
-        assertTrue("scenario protection should be on", pr.isSetScenarios());
-        int hashVal = CryptoFunctions.createXorVerifier1(password);
-        int actualVal = Integer.parseInt(pr.xgetPassword().getStringValue(),16);
-        assertEquals("well known value for top secret hash should match", hashVal, actualVal);
-
-        sheet.protectSheet(null);
-        assertNull("protectSheet(null) should unset CTSheetProtection", sheet.getCTWorksheet().getSheetProtection());
-        
-        wb.close();
-    }
-
-    @Test
-    public void protectSheet_emptyPassword() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        CTSheetProtection pr = sheet.getCTWorksheet().getSheetProtection();
-        assertNull("CTSheetProtection should be null by default", pr);
-        String password = "";
-        sheet.protectSheet(password);
-        pr = sheet.getCTWorksheet().getSheetProtection();
-        assertNotNull("CTSheetProtection should be not null", pr);
-        assertTrue("sheet protection should be on", pr.isSetSheet());
-        assertTrue("object protection should be on", pr.isSetObjects());
-        assertTrue("scenario protection should be on", pr.isSetScenarios());
-        int hashVal = CryptoFunctions.createXorVerifier1(password);
-        STUnsignedShortHex xpassword = pr.xgetPassword();
-        int actualVal = Integer.parseInt(xpassword.getStringValue(),16);
-        assertEquals("well known value for top secret hash should match", hashVal, actualVal);
-
-        sheet.protectSheet(null);
-        assertNull("protectSheet(null) should unset CTSheetProtection", sheet.getCTWorksheet().getSheetProtection());
-
-        wb.close();
-    }
-
-    @Test
-    public void protectSheet_lowlevel_2013() throws IOException {
-        String password = "test";
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet xs = wb1.createSheet();
-        xs.setSheetPassword(password, HashAlgorithm.sha384);
-        XSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-        assertTrue(wb2.getSheetAt(0).validateSheetPassword(password));
-        wb2.close();
-        
-        XSSFWorkbook wb3 = openSampleWorkbook("workbookProtection-sheet_password-2013.xlsx");
-        assertTrue(wb3.getSheetAt(0).validateSheetPassword("pwd"));
-        wb3.close();
-    }
-    
-
-    @Test
-    public void bug49966() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("49966.xlsx");
-        CalculationChain calcChain = wb1.getCalculationChain();
-        assertNotNull(wb1.getCalculationChain());
-        assertEquals(3, calcChain.getCTCalcChain().sizeOfCArray());
-
-        XSSFSheet sheet = wb1.getSheetAt(0);
-        XSSFRow row = sheet.getRow(0);
-
-        sheet.removeRow(row);
-        assertEquals("XSSFSheet#removeRow did not clear calcChain entries",
-                0, calcChain.getCTCalcChain().sizeOfCArray());
-
-        //calcChain should be gone
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        assertNull(wb2.getCalculationChain());
-        wb2.close();
-    }
-
-    /**
-     * See bug #50829 test data tables
-     */
-    @Test
-    public void tables() throws IOException {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithTable.xlsx");
-       assertEquals(3, wb.getNumberOfSheets());
-
-       // Check the table sheet
-       XSSFSheet s1 = wb.getSheetAt(0);
-       assertEquals("a", s1.getRow(0).getCell(0).getRichStringCellValue().toString());
-       assertEquals(1.0, s1.getRow(1).getCell(0).getNumericCellValue(), 0);
-
-       List<XSSFTable> tables = s1.getTables();
-       assertNotNull(tables);
-       assertEquals(1, tables.size());
-
-       XSSFTable table = tables.get(0);
-       assertEquals("Tabella1", table.getName());
-       assertEquals("Tabella1", table.getDisplayName());
-
-       // And the others
-       XSSFSheet s2 = wb.getSheetAt(1);
-       assertEquals(0, s2.getTables().size());
-       XSSFSheet s3 = wb.getSheetAt(2);
-       assertEquals(0, s3.getTables().size());
-       wb.close();
-    }
-
-    /**
-     * Test to trigger OOXML-LITE generating to include org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetCalcPr
-     */
-    @Test
-    public void setForceFormulaRecalculation() throws IOException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet("Sheet 1");
-
-        assertFalse(sheet.getForceFormulaRecalculation());
-        
-        // Set
-        sheet.setForceFormulaRecalculation(true);
-        assertEquals(true, sheet.getForceFormulaRecalculation());
-
-        // calcMode="manual" is unset when forceFormulaRecalculation=true
-        CTCalcPr calcPr = wb1.getCTWorkbook().addNewCalcPr();
-        calcPr.setCalcMode(STCalcMode.MANUAL);
-        sheet.setForceFormulaRecalculation(true);
-        assertEquals(STCalcMode.AUTO, calcPr.getCalcMode());
-
-        // Check
-        sheet.setForceFormulaRecalculation(false);
-        assertEquals(false, sheet.getForceFormulaRecalculation());
-
-
-        // Save, re-load, and re-check
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheet("Sheet 1");
-        assertEquals(false, sheet.getForceFormulaRecalculation());
-        wb2.close();
-    }
-
-    @Test
-    public void bug54607() throws IOException {
-        // run with the file provided in the Bug-Report
-        runGetTopRow("54607.xlsx", true, 1, 0, 0);
-        runGetLeftCol("54607.xlsx", true, 0, 0, 0);
-
-        // run with some other flie to see
-        runGetTopRow("54436.xlsx", true, 0);
-        runGetLeftCol("54436.xlsx", true, 0);
-        runGetTopRow("TwoSheetsNoneHidden.xlsx", true, 0, 0);
-        runGetLeftCol("TwoSheetsNoneHidden.xlsx", true, 0, 0);
-        runGetTopRow("TwoSheetsNoneHidden.xls", false, 0, 0);
-        runGetLeftCol("TwoSheetsNoneHidden.xls", false, 0, 0);
-    }
-
-    private void runGetTopRow(String file, boolean isXSSF, int... topRows) throws IOException {
-        final Workbook wb = (isXSSF)
-            ? XSSFTestDataSamples.openSampleWorkbook(file)
-            : HSSFTestDataSamples.openSampleWorkbook(file);
-
-        for (int si = 0; si < wb.getNumberOfSheets(); si++) {
-            Sheet sh = wb.getSheetAt(si);
-            assertNotNull(sh.getSheetName());
-            assertEquals("Did not match for sheet " + si, topRows[si], sh.getTopRow());
-        }
-
-        // for XSSF also test with SXSSF
-        if (isXSSF) {
-            Workbook swb = new SXSSFWorkbook((XSSFWorkbook) wb);
-            for (int si = 0; si < swb.getNumberOfSheets(); si++) {
-                Sheet sh = swb.getSheetAt(si);
-                assertNotNull(sh.getSheetName());
-                assertEquals("Did not match for sheet " + si, topRows[si], sh.getTopRow());
-            }
-            swb.close();
-        }
-        
-        wb.close();
-    }
-
-    private void runGetLeftCol(String file, boolean isXSSF, int... topRows) throws IOException {
-        final Workbook wb = (isXSSF)
-            ? XSSFTestDataSamples.openSampleWorkbook(file)
-            : HSSFTestDataSamples.openSampleWorkbook(file);
-
-        for (int si = 0; si < wb.getNumberOfSheets(); si++) {
-            Sheet sh = wb.getSheetAt(si);
-            assertNotNull(sh.getSheetName());
-            assertEquals("Did not match for sheet " + si, topRows[si], sh.getLeftCol());
-        }
-
-        // for XSSF also test with SXSSF
-        if(isXSSF) {
-            Workbook swb = new SXSSFWorkbook((XSSFWorkbook) wb);
-            for (int si = 0; si < swb.getNumberOfSheets(); si++) {
-                Sheet sh = swb.getSheetAt(si);
-                assertNotNull(sh.getSheetName());
-                assertEquals("Did not match for sheet " + si, topRows[si], sh.getLeftCol());
-            }
-            swb.close();
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug55745() throws Exception {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55745.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-        List<XSSFTable> tables = sheet.getTables();
-        /*System.out.println(tables.size());
-
-        for(XSSFTable table : tables) {
-            System.out.println("XPath: " + table.getCommonXpath());
-            System.out.println("Name: " + table.getName());
-            System.out.println("Mapped Cols: " + table.getNumberOfMappedColumns());
-            System.out.println("Rowcount: " + table.getRowCount());
-            System.out.println("End Cell: " + table.getEndCellReference());
-            System.out.println("Start Cell: " + table.getStartCellReference());
-        }*/
-        assertEquals("Sheet should contain 8 tables", 8, tables.size());
-        assertNotNull("Sheet should contain a comments table", sheet.getCommentsTable(false));
-        wb.close();
-    }
-
-    @Test
-    public void bug55723b() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        // stored with a special name
-        assertNull(wb.getBuiltInName(XSSFName.BUILTIN_FILTER_DB, 0));
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A:B");
-        AutoFilter filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-
-        // stored with a special name
-        XSSFName name = wb.getBuiltInName(XSSFName.BUILTIN_FILTER_DB, 0);
-        assertNotNull(name);
-        assertEquals("Sheet0!$A:$B", name.getRefersToFormula());
-
-        range = CellRangeAddress.valueOf("B:C");
-        filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-
-        // stored with a special name
-        name = wb.getBuiltInName(XSSFName.BUILTIN_FILTER_DB, 0);
-        assertNotNull(name);
-        assertEquals("Sheet0!$B:$C", name.getRefersToFormula());
-        
-        wb.close();
-    }
-
-    @Test(timeout=180000)
-    public void bug51585() throws IOException {
-        XSSFTestDataSamples.openSampleWorkbook("51585.xlsx").close();
-    }
-
-    private XSSFWorkbook setupSheet(){
-        //set up workbook
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-
-        Row row1 = sheet.createRow((short) 0);
-        Cell cell = row1.createCell((short) 0);
-        cell.setCellValue("Names");
-        Cell cell2 = row1.createCell((short) 1);
-        cell2.setCellValue("#");
-
-        Row row2 = sheet.createRow((short) 1);
-        Cell cell3 = row2.createCell((short) 0);
-        cell3.setCellValue("Jane");
-        Cell cell4 = row2.createCell((short) 1);
-        cell4.setCellValue(3);
-
-        Row row3 = sheet.createRow((short) 2);
-        Cell cell5 = row3.createCell((short) 0);
-        cell5.setCellValue("John");
-        Cell cell6 = row3.createCell((short) 1);
-        cell6.setCellValue(3);
-
-        return wb;
-    }
-
-    @Test
-    public void testCreateTwoPivotTablesInOneSheet() throws IOException {
-        XSSFWorkbook wb = setupSheet();
-        XSSFSheet sheet = wb.getSheetAt(0);
-
-        assertNotNull(wb);
-        assertNotNull(sheet);
-        XSSFPivotTable pivotTable = sheet.createPivotTable(new AreaReference("A1:B2", SpreadsheetVersion.EXCEL2007), new CellReference("H5"));
-        assertNotNull(pivotTable);
-        assertTrue(wb.getPivotTables().size() > 0);
-        XSSFPivotTable pivotTable2 = sheet.createPivotTable(new AreaReference("A1:B2", SpreadsheetVersion.EXCEL2007), new CellReference("L5"), sheet);
-        assertNotNull(pivotTable2);
-        assertTrue(wb.getPivotTables().size() > 1);
-        wb.close();
-    }
-
-    @Test
-    public void testCreateTwoPivotTablesInTwoSheets() throws IOException {
-        XSSFWorkbook wb = setupSheet();
-        XSSFSheet sheet = wb.getSheetAt(0);
-
-        assertNotNull(wb);
-        assertNotNull(sheet);
-        XSSFPivotTable pivotTable = sheet.createPivotTable(new AreaReference("A1:B2", SpreadsheetVersion.EXCEL2007), new CellReference("H5"));
-        assertNotNull(pivotTable);
-        assertTrue(wb.getPivotTables().size() > 0);
-        assertNotNull(wb);
-        XSSFSheet sheet2 = wb.createSheet();
-        XSSFPivotTable pivotTable2 = sheet2.createPivotTable(new AreaReference("A1:B2", SpreadsheetVersion.EXCEL2007), new CellReference("H5"), sheet);
-        assertNotNull(pivotTable2);
-        assertTrue(wb.getPivotTables().size() > 1);
-        wb.close();
-    }
-
-    @Test
-    public void testCreatePivotTable() throws IOException {
-        XSSFWorkbook wb = setupSheet();
-        XSSFSheet sheet = wb.getSheetAt(0);
-
-        assertNotNull(wb);
-        assertNotNull(sheet);
-        XSSFPivotTable pivotTable = sheet.createPivotTable(new AreaReference("A1:B2", SpreadsheetVersion.EXCEL2007), new CellReference("H5"));
-        assertNotNull(pivotTable);
-        assertTrue(wb.getPivotTables().size() > 0);
-        wb.close();
-    }
-
-    @Test
-    public void testCreatePivotTableInOtherSheetThanDataSheet() throws IOException {
-        XSSFWorkbook wb = setupSheet();
-        XSSFSheet sheet1 = wb.getSheetAt(0);
-        XSSFSheet sheet2 = wb.createSheet();
-
-        XSSFPivotTable pivotTable = sheet2.createPivotTable
-                (new AreaReference("A1:B2", SpreadsheetVersion.EXCEL2007), new CellReference("H5"), sheet1);
-        assertEquals(0, pivotTable.getRowLabelColumns().size());
-        
-        assertEquals(1, wb.getPivotTables().size());
-        assertEquals(0, sheet1.getPivotTables().size());
-        assertEquals(1, sheet2.getPivotTables().size());
-        wb.close();
-    }
-
-    @Test
-    public void testCreatePivotTableInOtherSheetThanDataSheetUsingAreaReference() throws IOException {
-        XSSFWorkbook wb = setupSheet();
-        XSSFSheet sheet = wb.getSheetAt(0);
-        XSSFSheet sheet2 = wb.createSheet("TEST");
-
-        XSSFPivotTable pivotTable = sheet2.createPivotTable(
-                new AreaReference(sheet.getSheetName()+"!A$1:B$2", SpreadsheetVersion.EXCEL2007),
-                new CellReference("H5"));
-        assertEquals(0, pivotTable.getRowLabelColumns().size());
-        wb.close();
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testCreatePivotTableWithConflictingDataSheets() throws IOException {
-        XSSFWorkbook wb = setupSheet();
-        XSSFSheet sheet = wb.getSheetAt(0);
-        XSSFSheet sheet2 = wb.createSheet("TEST");
-
-        sheet2.createPivotTable(
-                new AreaReference(sheet.getSheetName()+"!A$1:B$2", SpreadsheetVersion.EXCEL2007),
-                new CellReference("H5"),
-                sheet2);
-        wb.close();
-    }
-    
-    @Test(expected=POIXMLException.class)
-    public void testReadFails() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        
-        // Throws exception because we cannot read here
-        try {
-            sheet.onDocumentRead();
-        } finally {
-            wb.close();
-        }
-    }
-    
-    /** 
-     * This would be better off as a testable example rather than a simple unit test
-     * since Sheet.createComment() was deprecated and removed.
-     * https://poi.apache.org/spreadsheet/quick-guide.html#CellComments
-     * Feel free to relocated or delete this unit test if it doesn't belong here.
-     */
-    @Test
-    public void testCreateComment() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        ClientAnchor anchor = wb.getCreationHelper().createClientAnchor();
-        XSSFSheet sheet = wb.createSheet();
-        XSSFComment comment = sheet.createDrawingPatriarch().createCellComment(anchor);
-        assertNotNull(comment);
-        wb.close();
-    }
-    
-    protected void testCopyOneRow(String copyRowsTestWorkbook) throws IOException {
-        final double FLOAT_PRECISION = 1e-9;
-        final XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook(copyRowsTestWorkbook);
-        final XSSFSheet sheet = wb.getSheetAt(0);
-        final CellCopyPolicy defaultCopyPolicy = new CellCopyPolicy();
-        sheet.copyRows(1, 1, 6, defaultCopyPolicy);
-
-        final Row srcRow = sheet.getRow(1);
-        final Row destRow = sheet.getRow(6);
-        int col = 0;
-        Cell cell;
-
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("Source row ->", cell.getStringCellValue());
-
-        // Style
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Style] B7 cell value", "Red", cell.getStringCellValue());
-        assertEquals("[Style] B7 cell style", CellUtil.getCell(srcRow, 1).getCellStyle(), cell.getCellStyle());
-
-        // Blank
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Blank] C7 cell type", CellType.BLANK, cell.getCellTypeEnum());
-
-        // Error
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Error] D7 cell type", CellType.ERROR, cell.getCellTypeEnum());
-        final FormulaError error = FormulaError.forInt(cell.getErrorCellValue());
-        assertEquals("[Error] D7 cell value", FormulaError.NA, error); //FIXME: XSSFCell and HSSFCell expose different interfaces. getErrorCellString would be helpful here
-
-        // Date
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Date] E7 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        final Date date = LocaleUtil.getLocaleCalendar(2000, Calendar.JANUARY, 1).getTime();
-        assertEquals("[Date] E7 cell value", date, cell.getDateCellValue());
-
-        // Boolean
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Boolean] F7 cell type", CellType.BOOLEAN, cell.getCellTypeEnum());
-        assertEquals("[Boolean] F7 cell value", true, cell.getBooleanCellValue());
-
-        // String
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[String] G7 cell type", CellType.STRING, cell.getCellTypeEnum());
-        assertEquals("[String] G7 cell value", "Hello", cell.getStringCellValue());
-        
-        // Int
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Int] H7 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Int] H7 cell value", 15, (int) cell.getNumericCellValue());
-        
-        // Float
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Float] I7 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Float] I7 cell value", 12.5, cell.getNumericCellValue(), FLOAT_PRECISION);
-        
-        // Cell Formula
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("J7", new CellReference(cell).formatAsString());
-        assertEquals("[Cell Formula] J7 cell type", CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula] J7 cell formula", "5+2", cell.getCellFormula());
-        System.out.println("Cell formula evaluation currently unsupported");
-        
-        // Cell Formula with Reference
-        // Formula row references should be adjusted by destRowNum-srcRowNum
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("K7", new CellReference(cell).formatAsString());
-        assertEquals("[Cell Formula with Reference] K7 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Reference] K7 cell formula",
-                "J7+H$2", cell.getCellFormula());
-        
-        // Cell Formula with Reference spanning multiple rows
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Cell Formula with Reference spanning multiple rows] L7 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Reference spanning multiple rows] L7 cell formula",
-                "G7&\" \"&G8", cell.getCellFormula());
-        
-        // Cell Formula with Reference spanning multiple rows
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Cell Formula with Area Reference] M7 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Area Reference] M7 cell formula",
-                "SUM(H7:I8)", cell.getCellFormula());
-        
-        // Array Formula
-        cell = CellUtil.getCell(destRow, col++);
-        System.out.println("Array formulas currently unsupported");
-        // FIXME: Array Formula set with Sheet.setArrayFormula() instead of cell.setFormula()
-        /*
-        assertEquals("[Array Formula] N7 cell type", CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Array Formula] N7 cell formula", "{SUM(H7:J7*{1,2,3})}", cell.getCellFormula());
-        */
-        
-        // Data Format
-        cell = CellUtil.getCell(destRow, col++);
-        assertEquals("[Data Format] O7 cell type;", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Data Format] O7 cell value", 100.20, cell.getNumericCellValue(), FLOAT_PRECISION);
-        //FIXME: currently fails
-        final String moneyFormat = "\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)";
-        assertEquals("[Data Format] O7 data format", moneyFormat, cell.getCellStyle().getDataFormatString());
-        
-        // Merged
-        cell = CellUtil.getCell(destRow, col);
-        assertEquals("[Merged] P7:Q7 cell value",
-                "Merged cells", cell.getStringCellValue());
-        assertTrue("[Merged] P7:Q7 merged region",
-                sheet.getMergedRegions().contains(CellRangeAddress.valueOf("P7:Q7")));
-        
-        // Merged across multiple rows
-        // Microsoft Excel 2013 does not copy a merged region unless all rows of
-        // the source merged region are selected
-        // POI's behavior should match this behavior
-        col += 2;
-        cell = CellUtil.getCell(destRow, col);
-        // Note: this behavior deviates from Microsoft Excel,
-        // which will not overwrite a cell in destination row if merged region extends beyond the copied row.
-        // The Excel way would require:
-        //assertEquals("[Merged across multiple rows] R7:S8 merged region", "Should NOT be overwritten", cell.getStringCellValue());
-        //assertFalse("[Merged across multiple rows] R7:S8 merged region", 
-        //        sheet.getMergedRegions().contains(CellRangeAddress.valueOf("R7:S8")));
-        // As currently implemented, cell value is copied but merged region is not copied
-        assertEquals("[Merged across multiple rows] R7:S8 cell value",
-                "Merged cells across multiple rows", cell.getStringCellValue());
-        assertFalse("[Merged across multiple rows] R7:S7 merged region (one row)", 
-                sheet.getMergedRegions().contains(CellRangeAddress.valueOf("R7:S7"))); //shouldn't do 1-row merge
-        assertFalse("[Merged across multiple rows] R7:S8 merged region", 
-                sheet.getMergedRegions().contains(CellRangeAddress.valueOf("R7:S8"))); //shouldn't do 2-row merge
-        
-        // Make sure other rows are blank (off-by-one errors)
-        assertNull(sheet.getRow(5));
-        assertNull(sheet.getRow(7));
-        
-        wb.close();
-    }
-    
-    protected void testCopyMultipleRows(String copyRowsTestWorkbook) throws IOException {
-        final double FLOAT_PRECISION = 1e-9;
-        final XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook(copyRowsTestWorkbook);
-        final XSSFSheet sheet = wb.getSheetAt(0);
-        final CellCopyPolicy defaultCopyPolicy = new CellCopyPolicy();
-        sheet.copyRows(0, 3, 8, defaultCopyPolicy);
-
-        @SuppressWarnings("unused")
-        final Row srcHeaderRow = sheet.getRow(0);
-        final Row srcRow1 = sheet.getRow(1);
-        final Row srcRow2 = sheet.getRow(2);
-        final Row srcRow3 = sheet.getRow(3);
-        final Row destHeaderRow = sheet.getRow(8);
-        final Row destRow1 = sheet.getRow(9);
-        final Row destRow2 = sheet.getRow(10);
-        final Row destRow3 = sheet.getRow(11);
-        int col = 0;
-        Cell cell;
-        
-        // Header row should be copied
-        assertNotNull(destHeaderRow);
-        
-        // Data rows
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("Source row ->", cell.getStringCellValue());
-        
-        // Style
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Style] B10 cell value", "Red", cell.getStringCellValue());
-        assertEquals("[Style] B10 cell style", CellUtil.getCell(srcRow1, 1).getCellStyle(), cell.getCellStyle());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Style] B11 cell value", "Blue", cell.getStringCellValue());
-        assertEquals("[Style] B11 cell style", CellUtil.getCell(srcRow2, 1).getCellStyle(), cell.getCellStyle());
-        
-        // Blank
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Blank] C10 cell type", CellType.BLANK, cell.getCellTypeEnum());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Blank] C11 cell type", CellType.BLANK, cell.getCellTypeEnum());
-        
-        // Error
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Error] D10 cell type", CellType.ERROR, cell.getCellTypeEnum());
-        FormulaError error = FormulaError.forInt(cell.getErrorCellValue());
-        assertEquals("[Error] D10 cell value", FormulaError.NA, error); //FIXME: XSSFCell and HSSFCell expose different interfaces. getErrorCellString would be helpful here
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Error] D11 cell type", CellType.ERROR, cell.getCellTypeEnum());
-        error = FormulaError.forInt(cell.getErrorCellValue());
-        assertEquals("[Error] D11 cell value", FormulaError.NAME, error); //FIXME: XSSFCell and HSSFCell expose different interfaces. getErrorCellString would be helpful here
-        
-        // Date
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Date] E10 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        Date date = LocaleUtil.getLocaleCalendar(2000, Calendar.JANUARY, 1).getTime();
-        assertEquals("[Date] E10 cell value", date, cell.getDateCellValue());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Date] E11 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        date = LocaleUtil.getLocaleCalendar(2000, Calendar.JANUARY, 2).getTime();
-        assertEquals("[Date] E11 cell value", date, cell.getDateCellValue());
-        
-        // Boolean
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Boolean] F10 cell type", CellType.BOOLEAN, cell.getCellTypeEnum());
-        assertEquals("[Boolean] F10 cell value", true, cell.getBooleanCellValue());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Boolean] F11 cell type", CellType.BOOLEAN, cell.getCellTypeEnum());
-        assertEquals("[Boolean] F11 cell value", false, cell.getBooleanCellValue());
-        
-        // String
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[String] G10 cell type", CellType.STRING, cell.getCellTypeEnum());
-        assertEquals("[String] G10 cell value", "Hello", cell.getStringCellValue());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[String] G11 cell type", CellType.STRING, cell.getCellTypeEnum());
-        assertEquals("[String] G11 cell value", "World", cell.getStringCellValue());
-        
-        // Int
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Int] H10 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Int] H10 cell value", 15, (int) cell.getNumericCellValue());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Int] H11 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Int] H11 cell value", 42, (int) cell.getNumericCellValue());
-        
-        // Float
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Float] I10 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Float] I10 cell value", 12.5, cell.getNumericCellValue(), FLOAT_PRECISION);
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Float] I11 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Float] I11 cell value", 5.5, cell.getNumericCellValue(), FLOAT_PRECISION);
-        
-        // Cell Formula
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Cell Formula] J10 cell type", CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula] J10 cell formula", "5+2", cell.getCellFormula());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Cell Formula] J11 cell type", CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula] J11 cell formula", "6+18", cell.getCellFormula());
-
-        // Cell Formula with Reference
-        col++;
-        // Formula row references should be adjusted by destRowNum-srcRowNum
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Cell Formula with Reference] K10 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Reference] K10 cell formula",
-                "J10+H$2", cell.getCellFormula());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Cell Formula with Reference] K11 cell type", CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Reference] K11 cell formula", "J11+H$2", cell.getCellFormula());
-        
-        // Cell Formula with Reference spanning multiple rows
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Cell Formula with Reference spanning multiple rows] L10 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Reference spanning multiple rows] L10 cell formula",
-                "G10&\" \"&G11", cell.getCellFormula());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Cell Formula with Reference spanning multiple rows] L11 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Reference spanning multiple rows] L11 cell formula",
-                "G11&\" \"&G12", cell.getCellFormula());
-        
-        // Cell Formula with Area Reference
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Cell Formula with Area Reference] M10 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Area Reference] M10 cell formula",
-                "SUM(H10:I11)", cell.getCellFormula());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Cell Formula with Area Reference] M11 cell type",
-                CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Cell Formula with Area Reference] M11 cell formula",
-                "SUM($H$3:I10)", cell.getCellFormula()); //Also acceptable: SUM($H10:I$3), but this AreaReference isn't in ascending order
-        
-        // Array Formula
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        // System.out.println("Array formulas currently unsupported");
-    /*
-        // FIXME: Array Formula set with Sheet.setArrayFormula() instead of cell.setFormula()
-        assertEquals("[Array Formula] N10 cell type", CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Array Formula] N10 cell formula", "{SUM(H10:J10*{1,2,3})}", cell.getCellFormula());
-        
-        cell = CellUtil.getCell(destRow2, col);
-        // FIXME: Array Formula set with Sheet.setArrayFormula() instead of cell.setFormula() 
-        assertEquals("[Array Formula] N11 cell type", CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("[Array Formula] N11 cell formula", "{SUM(H11:J11*{1,2,3})}", cell.getCellFormula());
-     */
-        
-        // Data Format
-        col++;
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Data Format] O10 cell type", CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals("[Data Format] O10 cell value", 100.20, cell.getNumericCellValue(), FLOAT_PRECISION);
-        final String moneyFormat = "\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)";
-        assertEquals("[Data Format] O10 cell data format", moneyFormat, cell.getCellStyle().getDataFormatString());
-        
-        // Merged
-        col++;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Merged] P10:Q10 cell value",
-                "Merged cells", cell.getStringCellValue());
-        assertTrue("[Merged] P10:Q10 merged region",
-                sheet.getMergedRegions().contains(CellRangeAddress.valueOf("P10:Q10")));
-        
-        cell = CellUtil.getCell(destRow2, col);
-        assertEquals("[Merged] P11:Q11 cell value", "Merged cells", cell.getStringCellValue());
-        assertTrue("[Merged] P11:Q11 merged region",
-                sheet.getMergedRegions().contains(CellRangeAddress.valueOf("P11:Q11")));
-        
-        // Should Q10/Q11 be checked?
-        
-        // Merged across multiple rows
-        // Microsoft Excel 2013 does not copy a merged region unless all rows of
-        // the source merged region are selected
-        // POI's behavior should match this behavior
-        col += 2;
-        cell = CellUtil.getCell(destRow1, col);
-        assertEquals("[Merged across multiple rows] R10:S11 cell value", 
-                "Merged cells across multiple rows", cell.getStringCellValue());
-        assertTrue("[Merged across multiple rows] R10:S11 merged region", 
-                sheet.getMergedRegions().contains(CellRangeAddress.valueOf("R10:S11")));
-        
-        // Row 3 (zero-based) was empty, so Row 11 (zero-based) should be empty too.
-        if (srcRow3 == null) {
-            assertNull("Row 3 was empty, so Row 11 should be empty", destRow3);
-        }
-        
-        // Make sure other rows are blank (off-by-one errors)
-        assertNull("Off-by-one lower edge case", sheet.getRow(7)); //one row above destHeaderRow
-        assertNull("Off-by-one upper edge case", sheet.getRow(12)); //one row below destRow3
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testCopyOneRow() throws IOException {
-        testCopyOneRow("XSSFSheet.copyRows.xlsx");
-    }
-    
-    @Test
-    public void testCopyMultipleRows() throws IOException {
-        testCopyMultipleRows("XSSFSheet.copyRows.xlsx");
-    }
-
-    @Test
-    public void testIgnoredErrors() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CellRangeAddress region = CellRangeAddress.valueOf("B2:D4");
-        sheet.addIgnoredErrors(region, IgnoredErrorType.NUMBER_STORED_AS_TEXT);
-        final CTIgnoredError ignoredError = sheet.getCTWorksheet().getIgnoredErrors().getIgnoredErrorArray(0);
-        assertEquals(1, ignoredError.getSqref().size());
-        assertEquals("B2:D4", ignoredError.getSqref().get(0));
-        assertTrue(ignoredError.getNumberStoredAsText());
-        
-        Map<IgnoredErrorType, Set<CellRangeAddress>> ignoredErrors = sheet.getIgnoredErrors();
-        assertEquals(1, ignoredErrors.size());
-        assertEquals(1, ignoredErrors.get(IgnoredErrorType.NUMBER_STORED_AS_TEXT).size());
-        assertEquals("B2:D4", ignoredErrors.get(IgnoredErrorType.NUMBER_STORED_AS_TEXT).iterator().next().formatAsString());
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testIgnoredErrorsMultipleTypes() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CellRangeAddress region = CellRangeAddress.valueOf("B2:D4");
-        sheet.addIgnoredErrors(region, IgnoredErrorType.FORMULA, IgnoredErrorType.EVALUATION_ERROR);
-        final CTIgnoredError ignoredError = sheet.getCTWorksheet().getIgnoredErrors().getIgnoredErrorArray(0);
-        assertEquals(1, ignoredError.getSqref().size());
-        assertEquals("B2:D4", ignoredError.getSqref().get(0));
-        assertFalse(ignoredError.getNumberStoredAsText());
-        assertTrue(ignoredError.getFormula());
-        assertTrue(ignoredError.getEvalError());
-        
-        Map<IgnoredErrorType, Set<CellRangeAddress>> ignoredErrors = sheet.getIgnoredErrors();
-        assertEquals(2, ignoredErrors.size());
-        assertEquals(1, ignoredErrors.get(IgnoredErrorType.FORMULA).size());
-        assertEquals("B2:D4", ignoredErrors.get(IgnoredErrorType.FORMULA).iterator().next().formatAsString());
-        assertEquals(1, ignoredErrors.get(IgnoredErrorType.EVALUATION_ERROR).size());
-        assertEquals("B2:D4", ignoredErrors.get(IgnoredErrorType.EVALUATION_ERROR).iterator().next().formatAsString());
-        workbook.close();
-    }
-
-    @Test
-    public void testIgnoredErrorsMultipleCalls() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CellRangeAddress region = CellRangeAddress.valueOf("B2:D4");
-        // Two calls means two elements, no clever collapsing just yet.
-        sheet.addIgnoredErrors(region, IgnoredErrorType.EVALUATION_ERROR);
-        sheet.addIgnoredErrors(region, IgnoredErrorType.FORMULA);
-        
-        CTIgnoredError ignoredError = sheet.getCTWorksheet().getIgnoredErrors().getIgnoredErrorArray(0);
-        assertEquals(1, ignoredError.getSqref().size());
-        assertEquals("B2:D4", ignoredError.getSqref().get(0));
-        assertFalse(ignoredError.getFormula());
-        assertTrue(ignoredError.getEvalError());
-        
-        ignoredError = sheet.getCTWorksheet().getIgnoredErrors().getIgnoredErrorArray(1);
-        assertEquals(1, ignoredError.getSqref().size());
-        assertEquals("B2:D4", ignoredError.getSqref().get(0));
-        assertTrue(ignoredError.getFormula());
-        assertFalse(ignoredError.getEvalError());
-        
-        Map<IgnoredErrorType, Set<CellRangeAddress>> ignoredErrors = sheet.getIgnoredErrors();
-        assertEquals(2, ignoredErrors.size());
-        assertEquals(1, ignoredErrors.get(IgnoredErrorType.FORMULA).size());
-        assertEquals("B2:D4", ignoredErrors.get(IgnoredErrorType.FORMULA).iterator().next().formatAsString());
-        assertEquals(1, ignoredErrors.get(IgnoredErrorType.EVALUATION_ERROR).size());
-        assertEquals("B2:D4", ignoredErrors.get(IgnoredErrorType.EVALUATION_ERROR).iterator().next().formatAsString());
-        workbook.close();
-    }
-    
-    @Test
-    public void setTabColor() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sh = wb.createSheet();
-            assertTrue(sh.getCTWorksheet().getSheetPr() == null || !sh.getCTWorksheet().getSheetPr().isSetTabColor());
-            sh.setTabColor(new XSSFColor(IndexedColors.RED));
-            assertTrue(sh.getCTWorksheet().getSheetPr().isSetTabColor());
-            assertEquals(IndexedColors.RED.index,
-                    sh.getCTWorksheet().getSheetPr().getTabColor().getIndexed());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void getTabColor() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sh = wb.createSheet();
-            assertTrue(sh.getCTWorksheet().getSheetPr() == null || !sh.getCTWorksheet().getSheetPr().isSetTabColor());
-            assertNull(sh.getTabColor());
-            sh.setTabColor(new XSSFColor(IndexedColors.RED));
-            XSSFColor expected = new XSSFColor(IndexedColors.RED);
-            assertEquals(expected, sh.getTabColor());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    // Test using an existing workbook saved by Excel
-    @Test
-    public void tabColor() throws IOException {
-        XSSFWorkbook wb = openSampleWorkbook("SheetTabColors.xlsx");
-        try {
-            // non-colored sheets do not have a color
-            assertNull(wb.getSheet("default").getTabColor());
-            
-            // test indexed-colored sheet
-            XSSFColor expected = new XSSFColor(IndexedColors.RED);
-            assertEquals(expected, wb.getSheet("indexedRed").getTabColor());
-            
-            // test regular-colored (non-indexed, ARGB) sheet
-            expected = new XSSFColor();
-            expected.setARGBHex("FF7F2700");
-            assertEquals(expected, wb.getSheet("customOrange").getTabColor());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    /**
-     * See bug #52425
-     */
-    @Test
-    public void testInsertCommentsToClonedSheet() {
-    	Workbook wb = XSSFTestDataSamples.openSampleWorkbook("52425.xlsx");
-		CreationHelper helper = wb.getCreationHelper();
-		Sheet sheet2 = wb.createSheet("Sheet 2");
-		Sheet sheet3 = wb.cloneSheet(0);
-		wb.setSheetName(2, "Sheet 3");
-
-		// Adding Comment to new created Sheet 2
-		addComments(helper, sheet2);
-		// Adding Comment to cloned Sheet 3
-		addComments(helper, sheet3);
-	}
-    
-    private void addComments(CreationHelper helper, Sheet sheet) {
-		Drawing drawing = sheet.createDrawingPatriarch();
-
-		for (int i = 0; i < 2; i++) {
-			ClientAnchor anchor = helper.createClientAnchor();
-			anchor.setCol1(0);
-			anchor.setRow1(0 + i);
-			anchor.setCol2(2);
-			anchor.setRow2(3 + i);
-
-			Comment comment = drawing.createCellComment(anchor);
-			comment.setString(helper.createRichTextString("BugTesting"));
-
-			Row row = sheet.getRow(0 + i);
-			if (row == null)
-				row = sheet.createRow(0 + i);
-			Cell cell = row.getCell(0);
-			if (cell == null)
-				cell = row.createCell(0);
-
-			cell.setCellComment(comment);
-		}
-
-    }
-    
-    // bug 59687:  XSSFSheet.RemoveRow doesn't handle row gaps properly when removing row comments
-    @Test
-    public void testRemoveRowWithCommentAndGapAbove() throws IOException {
-        final Workbook wb = _testDataProvider.openSampleWorkbook("59687.xlsx");
-        final Sheet sheet = wb.getSheetAt(0);
-
-        // comment exists
-        CellAddress commentCellAddress = new CellAddress("A4");
-        assertNotNull(sheet.getCellComment(commentCellAddress));
-        
-        assertEquals("Wrong starting # of comments",  1, sheet.getCellComments().size());
-        
-        sheet.removeRow(sheet.getRow(commentCellAddress.getRow()));
-        
-        assertEquals("There should not be any comments left!",  0, sheet.getCellComments().size());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
deleted file mode 100644
index 031aadf..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import org.apache.poi.ss.usermodel.BaseTestSheetAutosizeColumn;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestXSSFSheetAutosizeColumn extends BaseTestSheetAutosizeColumn {
-
-    public TestXSSFSheetAutosizeColumn(){
-        super(XSSFITestDataProvider.instance);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
deleted file mode 100644
index fb7a9c0..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
-
-public class TestXSSFSheetMergeRegions {
-    @Test
-    public void testMergeRegionsSpeed() throws IOException {
-        final XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57893-many-merges.xlsx");
-        try {
-            long millis = Long.MAX_VALUE;
-
-            // in order to reduce the number of false positives we run it a few times before we fail, 
-            // sometimes it fails on machines that are busy at the moment.  
-            for(int i = 0;i < 5;i++) {
-                millis = runTest(wb);
-                if(millis < 2000) {
-                    break;
-                }
-                System.out.println("Retry " + i + " because run-time is too high: " + millis);
-            }
-
-            boolean inGump = false;
-            String version = System.getProperty("version.id");
-            if(version != null && version.startsWith("gump-")) {
-                inGump = true;
-            }
-
-            // This time is typically ~800ms, versus ~7800ms to iterate getMergedRegion(int).
-            // when running in Gump, the VM is very slow, so we should allow much more time
-            assertTrue("Should have taken <2000 ms to iterate 50k merged regions but took " + millis,
-                    inGump ? millis < 8000 : millis < 2000);
-        } finally {
-            wb.close();
-        }
-    }
-
-    private long runTest(final XSSFWorkbook wb) {
-        final long start = System.currentTimeMillis();
-        final XSSFSheet sheet = wb.getSheetAt(0);
-        final List<CellRangeAddress> mergedRegions = sheet.getMergedRegions();
-        assertEquals(50000, mergedRegions.size());
-        for (CellRangeAddress cellRangeAddress : mergedRegions) {
-            assertEquals(cellRangeAddress.getFirstRow(), cellRangeAddress.getLastRow());
-            assertEquals(2, cellRangeAddress.getNumberOfCells());
-        }
-        return System.currentTimeMillis() - start;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
deleted file mode 100644
index cb8fc60..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-
-public final class TestXSSFSheetRowGrouping extends TestCase {
-
-    private static final int ROWS_NUMBER = 200;
-    private static final int GROUP_SIZE = 5;
-
-    //private int o_groupsNumber = 0;
-
-    public void test55640() throws IOException {
-        //long startTime = System.currentTimeMillis();
-        Workbook wb = new XSSFWorkbook();
-        fillData(wb);
-        writeToFile(wb);
-
-        //System.out.println("Number of groups: " + o_groupsNumber);
-        //System.out.println("Execution time: " + (System.currentTimeMillis()-startTime) + " ms");
-    }
-
-
-    private void fillData(Workbook p_wb) {
-        Sheet sheet = p_wb.createSheet("sheet123");
-        sheet.setRowSumsBelow(false);
-
-        for (int i = 0; i < ROWS_NUMBER; i++) {
-            Row row = sheet.createRow(i);
-            Cell cell = row.createCell(0);
-            cell.setCellValue(i+1);
-        }
-
-        int i = 1;
-        while (i < ROWS_NUMBER) {
-            int end = i+(GROUP_SIZE-2);
-            int start = i;                    // natural order
-//            int start = end - 1;                // reverse order
-            while (start < end) {             // natural order
-//                while (start >= i) {            // reverse order
-                sheet.groupRow(start, end);
-                //o_groupsNumber++;
-                boolean collapsed = isCollapsed();
-                //System.out.println("Set group " + start + "->" + end + " to " + collapsed);
-                sheet.setRowGroupCollapsed(start, collapsed);
-                start++;                      // natural order
-//                start--;                        // reverse order
-            }
-            i += GROUP_SIZE;
-        }
-    }
-
-    private boolean isCollapsed() {
-        return Math.random() > 0.5d;
-    }
-
-    private void writeToFile(Workbook p_wb) throws IOException {
-//        FileOutputStream fileOut = new FileOutputStream("/tmp/55640.xlsx");
-//        try {
-//            p_wb.write(fileOut);
-//        } finally {
-//            fileOut.close();
-//        }
-        assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(p_wb));
-    }
-
-    public void test55640reduce1() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet123");
-        sheet.setRowSumsBelow(false);
-
-        for (int i = 0; i < ROWS_NUMBER; i++) {
-            Row row = sheet.createRow(i);
-            Cell cell = row.createCell(0);
-            cell.setCellValue(i+1);
-        }
-
-        int i = 1;
-        while (i < ROWS_NUMBER) {
-            int end = i+(GROUP_SIZE-2);
-            int start = i;                    // natural order
-            while (start < end) {             // natural order
-                sheet.groupRow(start, end);
-                //o_groupsNumber++;
-                boolean collapsed = start % 2 == 0 ? false : true;
-                //System.out.println("Set group " + start + "->" + end + " to " + collapsed);
-                sheet.setRowGroupCollapsed(start, collapsed);
-                start++;                      // natural order
-            }
-            i += GROUP_SIZE;
-        }
-        writeToFile(wb);
-    }
-
-
-    public void test55640_VerifyCases() throws IOException {
-        // NOTE: This is currently based on current behavior of POI, somehow
-        // what POI returns in the calls to collapsed/hidden is not fully matching 
-        // the examples in the spec or I did not fully understand how POI stores the data internally...
-        
-        // all expanded
-        verifyGroupCollapsed(
-                // level1, level2, level3
-                false, false, false, 
-                // collapsed:
-                new Boolean[] { false, false, false, false, false}, 
-                // hidden:
-                new boolean[] { false, false, false, false, false},
-                // outlineLevel
-                new int[] { 1, 2, 3, 3, 3 }
-                );
-
-        
-        // Level 1 collapsed, others expanded, should only have 4 rows, all hidden: 
-        verifyGroupCollapsed(
-                // level1, level2, level3
-                true, false, false, 
-                // collapsed:
-                new Boolean[] { false, false, false, false, false},
-                // hidden:
-                new boolean[] { true, true, true, true, true},
-                // outlineLevel
-                new int[] { 1, 2, 3, 3, 3 }
-                );
-
-        // Level 1 and 2 collapsed, Level 3 expanded, 
-        verifyGroupCollapsed(
-                // level1, level2, level3
-                true, true, false, 
-                // collapsed:
-                new Boolean[] { false, false, false, false, true, false},
-                // hidden:
-                new boolean[] { true, true, true, true, true, false},
-                // outlineLevel
-                new int[] { 1, 2, 3, 3, 3, 0 }
-                );
-
-        // Level 1 collapsed, Level 2 expanded, Level 3 collapsed 
-        verifyGroupCollapsed(
-                // level1, level2, level3
-                true, false, true, 
-                // collapsed:
-                new Boolean[] { false, false, false, false, false, true},
-                // hidden:
-                new boolean[] { true, true, true, true, true, false},
-                // outlineLevel
-                new int[] { 1, 2, 3, 3, 3, 0 }
-                );
-
-        // Level 2 collapsed, others expanded:
-        verifyGroupCollapsed(
-                // level1, level2, level3
-                false, true, false, 
-                // collapsed:
-                new Boolean[] { false, false, false, false, false, false},
-                // hidden:
-                new boolean[] { false, true, true, true, true, false},
-                // outlineLevel
-                new int[] { 1, 2, 3, 3, 3, 0 }
-                );
-
-        // Level 3 collapsed, others expanded 
-        verifyGroupCollapsed(
-                // level1, level2, level3
-                false, false, true, 
-                // collapsed:
-                new Boolean[] { false, false, false, false, false, true},
-                // hidden:
-                new boolean[] { false, false, true, true, true, false},
-                // outlineLevel
-                new int[] { 1, 2, 3, 3, 3, 0 }
-                );
-
-        // All collapsed 
-        verifyGroupCollapsed(
-                // level1, level2, level3
-                true, true, true, 
-                // collapsed:
-                new Boolean[] { false, false, false, false, true, true},
-                // hidden:
-                new boolean[] { true, true, true, true, true, false},
-                // outlineLevel
-                new int[] { 1, 2, 3, 3, 3, 0 }
-                );
-    }
-    
-   
-    private void verifyGroupCollapsed(boolean level1, boolean level2, boolean level3, 
-            Boolean[] collapsed, boolean[] hidden, int[] outlineLevel) throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet123");
-
-        for (int i = 0; i < 4; i++) {
-            sheet.createRow(i);
-        }
-        
-        sheet.groupRow(0, 4);
-        sheet.groupRow(1, 4);
-        sheet.groupRow(2, 4);
-        
-        sheet.setRowGroupCollapsed(0, level1);
-        sheet.setRowGroupCollapsed(1, level2);
-        sheet.setRowGroupCollapsed(2, level3);
-
-        checkWorkbookGrouping(wb, collapsed, hidden, outlineLevel);
-    }
-
-    public void test55640_VerifyCasesSpec() throws IOException {
-        // NOTE: This is currently based on current behavior of POI, somehow
-        // what POI returns in the calls to collapsed/hidden is not fully matching 
-        // the examples in the spec or I did not fully understand how POI stores the data internally...
-        
-        // all expanded
-        verifyGroupCollapsedSpec(
-                // level3, level2, level1
-                false, false, false, 
-                // collapsed:
-                new Boolean[] { false, false, false, false}, 
-                // hidden:
-                new boolean[] { false, false, false, false},
-                // outlineLevel
-                new int[] { 3, 3, 2, 1 }
-                );
-
-        
-        verifyGroupCollapsedSpec(
-                // level3, level2, level1
-                false, false, true, 
-                // collapsed:
-                new Boolean[] { false, false, false, true},
-                // hidden:
-                new boolean[] { true, true, true, false},
-                // outlineLevel
-                new int[] { 3, 3, 2, 1 }
-                );
-
-        verifyGroupCollapsedSpec(
-                // level3, level2, level1
-                false, true, false, 
-                // collapsed:
-                new Boolean[] { false, false, true, false},
-                // hidden:
-                new boolean[] { true, true, true, false},
-                // outlineLevel
-                new int[] { 3, 3, 2, 1 }
-                );
-        
-        verifyGroupCollapsedSpec(
-                // level3, level2, level1
-                false, true, true, 
-                // collapsed:
-                new Boolean[] { false, false, true, true},
-                // hidden:
-                new boolean[] { true, true, true, false},
-                // outlineLevel
-                new int[] { 3, 3, 2, 1 }
-                );
-    }
-
-    private void verifyGroupCollapsedSpec(boolean level1, boolean level2, boolean level3, 
-            Boolean[] collapsed, boolean[] hidden, int[] outlineLevel) throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet123");
-
-        for (int i = 5; i < 9; i++) {
-            sheet.createRow(i);
-        }
-        
-        sheet.groupRow(5, 6);
-        sheet.groupRow(5, 7);
-        sheet.groupRow(5, 8);
-        
-        sheet.setRowGroupCollapsed(6, level1);
-        sheet.setRowGroupCollapsed(7, level2);
-        sheet.setRowGroupCollapsed(8, level3);
-        
-        checkWorkbookGrouping(wb, collapsed, hidden, outlineLevel);
-    }
-
-    private void checkWorkbookGrouping(Workbook wb, Boolean[] collapsed, boolean[] hidden, int[] outlineLevel) throws IOException {
-        printWorkbook(wb);
-        Sheet sheet = wb.getSheetAt(0);
-        
-        assertEquals(collapsed.length, hidden.length);
-        assertEquals(collapsed.length, outlineLevel.length);
-        assertEquals("Expected " + collapsed.length + " rows with collapsed state, but had " + (sheet.getLastRowNum()-sheet.getFirstRowNum()+1) + " rows ("
-                + sheet.getFirstRowNum() + "-" + sheet.getLastRowNum() + ")",  
-                collapsed.length, sheet.getLastRowNum()-sheet.getFirstRowNum()+1);
-        for(int i = sheet.getFirstRowNum(); i < sheet.getLastRowNum();i++) {
-            if(collapsed[i-sheet.getFirstRowNum()] == null) {
-                continue;
-            }
-            XSSFRow row = (XSSFRow) sheet.getRow(i);
-            assertNotNull("Could not read row " + i, row);
-            assertNotNull("Could not read row " + i, row.getCTRow());
-            assertEquals("Row: " + i + ": collapsed", collapsed[i-sheet.getFirstRowNum()].booleanValue(), row.getCTRow().getCollapsed());
-            assertEquals("Row: " + i + ": hidden", hidden[i-sheet.getFirstRowNum()], row.getCTRow().getHidden());
-            
-            assertEquals("Row: " + i + ": level", outlineLevel[i-sheet.getFirstRowNum()], row.getCTRow().getOutlineLevel());
-        }
-        
-        writeToFile(wb);
-    }
-
- 
-    public void test55640working() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet123");
-
-        sheet.groupRow(1, 4);
-        sheet.groupRow(2, 5);
-        sheet.groupRow(3, 6);
-        
-        sheet.setRowGroupCollapsed(1, true);
-        sheet.setRowGroupCollapsed(2, false);
-        sheet.setRowGroupCollapsed(3, false);
-
-        writeToFile(wb);
-    }
-
-    // just used for printing out contents of spreadsheets
-    public void notRuntest55640printSample() {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55640.xlsx");
-        printWorkbook(wb);
-        
-        wb = XSSFTestDataSamples.openSampleWorkbook("GroupTest.xlsx");
-        printWorkbook(wb);
-    }
-
-    private void printWorkbook(Workbook wb) {
-        // disable all output for now...
-//        Sheet sheet = wb.getSheetAt(0);
-//        
-//        for(Iterator<Row> it = sheet.rowIterator();it.hasNext();) {
-//            XSSFRow row = (XSSFRow) it.next();
-//            boolean collapsed = row.getCTRow().getCollapsed();
-//            boolean hidden = row.getCTRow().getHidden();
-//            short level = row.getCTRow().getOutlineLevel();
-//            
-//            System.out.println("Row: " + row.getRowNum() + ": Level: " + level + " Collapsed: " + collapsed + " Hidden: " + hidden);
-//        }
-    }
-    
-    public void testGroupingTest() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("GroupTest.xlsx");       
-        
-        assertEquals(31, wb.getSheetAt(0).getLastRowNum());
-        
-        // NOTE: This is currently based on current behavior of POI, somehow
-        // what POI returns in the calls to collapsed/hidden is not fully matching 
-        // the examples in the spec or I did not fully understand how POI stores the data internally...
-        checkWorkbookGrouping(wb, 
-                new Boolean [] {
-                    // 0-4
-                    false, false, false, false, false, null, null, 
-                    // 7-11
-                    false, false, true, true, true, null, null, 
-                    // 14-18
-                    false, false, true, false, false, null,
-                    // 20-24
-                    false, false, true, true, false, null, null, 
-                    // 27-31
-                    false, false, false, true, false }, 
-                new boolean[] { 
-                    // 0-4
-                    false, false, false, false, false, false, false,  
-                    // 7-11
-                    true,  true, true, true, false, false, false, 
-                    // 14-18
-                    true, true, false, false, false, false,  
-                    // 20-24
-                    true, true, true, false, false, false, false, 
-                    // 27-31
-                    true, true, true, true, false },
-                // outlineLevel
-                new int[] { 
-                    // 0-4
-                    3, 3, 2, 1, 0, 0, 0,
-                    // 7-11
-                    3, 3, 2, 1, 0, 0, 0,
-                    // 14-18
-                    3, 3, 2, 1, 0, 0,
-                    // 20-24
-                    3, 3, 2, 1, 0, 0, 0, 
-                    // 27-31
-                    3, 3, 2, 1, 0,
-                }
-                );
-        /*
-Row: 0: Level: 3 Collapsed: false Hidden: false
-Row: 1: Level: 3 Collapsed: false Hidden: false
-Row: 2: Level: 2 Collapsed: false Hidden: false
-Row: 3: Level: 1 Collapsed: false Hidden: false
-Row: 4: Level: 0 Collapsed: false Hidden: false
-Row: 7: Level: 3 Collapsed: false Hidden: true
-Row: 8: Level: 3 Collapsed: false Hidden: true
-Row: 9: Level: 2 Collapsed: true Hidden: true
-Row: 10: Level: 1 Collapsed: true Hidden: true
-Row: 11: Level: 0 Collapsed: true Hidden: false
-Row: 14: Level: 3 Collapsed: false Hidden: true
-Row: 15: Level: 3 Collapsed: false Hidden: true
-Row: 16: Level: 2 Collapsed: true Hidden: false
-Row: 17: Level: 1 Collapsed: false Hidden: false
-Row: 18: Level: 0 Collapsed: false Hidden: false
-Row: 20: Level: 3 Collapsed: false Hidden: true
-Row: 21: Level: 3 Collapsed: false Hidden: true
-Row: 22: Level: 2 Collapsed: true Hidden: true
-Row: 23: Level: 1 Collapsed: true Hidden: false
-Row: 24: Level: 0 Collapsed: false Hidden: false
-Row: 27: Level: 3 Collapsed: false Hidden: true
-Row: 28: Level: 3 Collapsed: false Hidden: true
-Row: 29: Level: 2 Collapsed: false Hidden: true
-Row: 30: Level: 1 Collapsed: true Hidden: true
-Row: 31: Level: 0 Collapsed: true Hidden: false
-         */
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
deleted file mode 100644
index fa4c77fb..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.apache.poi.POITestCase.skipTest;
-import static org.apache.poi.POITestCase.testPassesNow;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BaseTestSheetShiftRows;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellUtil;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.xmlbeans.impl.values.XmlValueDisconnectedException;
-import org.junit.Test;
-
-public final class TestXSSFSheetShiftRows extends BaseTestSheetShiftRows {
-
-    public TestXSSFSheetShiftRows(){
-        super(XSSFITestDataProvider.instance);
-    }
-
-    @Override
-    @Test
-    public void testShiftRowBreaks() {
-        // disabled test from superclass
-        // TODO - support shifting of page breaks
-    }
-
-    /** Error occurred at FormulaShifter#rowMoveAreaPtg while shift rows upward. */
-    @Test
-    public void testBug54524() throws IOException {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("54524.xlsx");
-        XSSFSheet sheet = workbook.getSheetAt(0);
-        sheet.shiftRows(3, 5, -1);
-
-        Cell cell = CellUtil.getCell(sheet.getRow(1), 0);
-        assertEquals(1.0, cell.getNumericCellValue(), 0);
-        cell = CellUtil.getCell(sheet.getRow(2), 0);
-        assertEquals("SUM(A2:A2)", cell.getCellFormula());
-        cell = CellUtil.getCell(sheet.getRow(3), 0);
-        assertEquals("X", cell.getStringCellValue());
-        workbook.close();
-    }
-
-    /**  negative row shift causes corrupted data or throws exception */
-    @Test
-    public void testBug53798() throws IOException {
-        // NOTE that for HSSF (.xls) negative shifts combined with positive ones do work as expected  
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("53798.xlsx");
-
-        Sheet testSheet    = wb.getSheetAt(0);
-        // 1) corrupted xlsx (unreadable data in the first row of a shifted group) already comes about  
-        // when shifted by less than -1 negative amount (try -2)
-        testSheet.shiftRows(3, 3, -2);
-        
-        // 2) attempt to create a new row IN PLACE of a removed row by a negative shift causes corrupted
-        // xlsx file with  unreadable data in the negative shifted row. 
-        // NOTE it's ok to create any other row.
-        Row newRow = testSheet.createRow(3);
-        Cell newCell = newRow.createCell(0);
-        newCell.setCellValue("new Cell in row "+newRow.getRowNum());
-        
-        // 3) once a negative shift has been made any attempt to shift another group of rows 
-        // (note: outside of previously negative shifted rows) by a POSITIVE amount causes POI exception: 
-        // org.apache.xmlbeans.impl.values.XmlValueDisconnectedException.
-        // NOTE: another negative shift on another group of rows is successful, provided no new rows in  
-        // place of previously shifted rows were attempted to be created as explained above.
-
-        // -- CHANGE the shift to positive once the behaviour of the above has been tested
-        testSheet.shiftRows(6, 7, 1); 
-        
-        Workbook read = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        assertNotNull(read);
-        
-        Sheet readSheet = read.getSheetAt(0);
-        verifyCellContent(readSheet, 0, "0.0");
-        verifyCellContent(readSheet, 1, "3.0");
-        verifyCellContent(readSheet, 2, "2.0");
-        verifyCellContent(readSheet, 3, "new Cell in row 3");
-        verifyCellContent(readSheet, 4, "4.0");
-        verifyCellContent(readSheet, 5, "5.0");
-        verifyCellContent(readSheet, 6, null);
-        verifyCellContent(readSheet, 7, "6.0");
-        verifyCellContent(readSheet, 8, "7.0");
-        read.close();
-    }
-
-    private void verifyCellContent(Sheet readSheet, int row, String expect) {
-        Row readRow = readSheet.getRow(row);
-        if(expect == null) {
-            assertNull(readRow);
-            return;
-        }
-        Cell readCell = readRow.getCell(0);
-        //noinspection deprecation
-        if(readCell.getCellTypeEnum() == CellType.NUMERIC) {
-            assertEquals(expect, Double.toString(readCell.getNumericCellValue()));
-        } else {
-            assertEquals(expect, readCell.getStringCellValue());
-        }
-    }
-    
-    /** negative row shift causes corrupted data or throws exception */
-    @Test
-    public void testBug53798a() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("53798.xlsx");
-
-        Sheet testSheet    = wb.getSheetAt(0);
-        testSheet.shiftRows(3, 3, -1);
-        for (Row r : testSheet) {
-            r.getRowNum();
-        }
-        testSheet.shiftRows(6, 6, 1);
-        
-        Workbook read = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        assertNotNull(read);
-        
-        Sheet readSheet = read.getSheetAt(0);
-        verifyCellContent(readSheet, 0, "0.0");
-        verifyCellContent(readSheet, 1, "1.0");
-        verifyCellContent(readSheet, 2, "3.0");
-        verifyCellContent(readSheet, 3, null);
-        verifyCellContent(readSheet, 4, "4.0");
-        verifyCellContent(readSheet, 5, "5.0");
-        verifyCellContent(readSheet, 6, null);
-        verifyCellContent(readSheet, 7, "6.0");
-        verifyCellContent(readSheet, 8, "8.0");
-        read.close();
-    }
-    
-    /** Shifting rows with comment result - Unreadable content error and comment deletion */
-    @Test
-    public void testBug56017() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56017.xlsx");
-
-        Sheet sheet = wb.getSheetAt(0);
-
-        Comment comment = sheet.getCellComment(new CellAddress(0, 0));
-        assertNotNull(comment);
-        assertEquals("Amdocs", comment.getAuthor());
-        assertEquals("Amdocs:\ntest\n", comment.getString().getString());
-        
-        sheet.shiftRows(0, 1, 1);
-
-        // comment in row 0 is gone
-        comment = sheet.getCellComment(new CellAddress(0, 0));
-        assertNull(comment);
-        
-        // comment is now in row 1
-        comment = sheet.getCellComment(new CellAddress(1, 0));
-        assertNotNull(comment);
-        assertEquals("Amdocs", comment.getAuthor());
-        assertEquals("Amdocs:\ntest\n", comment.getString().getString());
-        
-        Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        assertNotNull(wbBack);
-
-        Sheet sheetBack = wbBack.getSheetAt(0);
-
-        // comment in row 0 is gone
-        comment = sheetBack.getCellComment(new CellAddress(0, 0));
-        assertNull(comment);
-
-        // comment is now in row 1
-        comment = sheetBack.getCellComment(new CellAddress(1, 0));
-        assertNotNull(comment);
-        assertEquals("Amdocs", comment.getAuthor());
-        assertEquals("Amdocs:\ntest\n", comment.getString().getString());
-        wbBack.close();
-    }
-
-    /** Moving the active sheet and deleting the others results in a corrupted file */
-    @Test
-    public void test57171() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57171_57163_57165.xlsx");
-        assertEquals(5, wb.getActiveSheetIndex());
-        removeAllSheetsBut(5, wb); // 5 is the active / selected sheet
-        assertEquals(0, wb.getActiveSheetIndex());
-
-        Workbook wbRead = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        assertEquals(0, wbRead.getActiveSheetIndex());
-
-        wbRead.removeSheetAt(0);
-        assertEquals(0, wbRead.getActiveSheetIndex());
-
-        wbRead.close();
-    }
-
-    /**  Cannot delete an arbitrary sheet in an XLS workbook (only the last one) */
-    @Test
-    public void test57163() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57171_57163_57165.xlsx");
-        assertEquals(5, wb.getActiveSheetIndex());
-        wb.removeSheetAt(0);
-        assertEquals(4, wb.getActiveSheetIndex());
-
-        wb.close();
-    }
-
-    @Test
-    public void testSetSheetOrderAndAdjustActiveSheet() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57171_57163_57165.xlsx");
-        
-        assertEquals(5, wb.getActiveSheetIndex());
-
-        // move the sheets around in all possible combinations to check that the active sheet
-        // is set correctly in all cases
-        wb.setSheetOrder(wb.getSheetName(5), 4);
-        assertEquals(4, wb.getActiveSheetIndex());
-        
-        wb.setSheetOrder(wb.getSheetName(5), 5);
-        assertEquals(4, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(3), 5);
-        assertEquals(3, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(4), 5);
-        assertEquals(3, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(2), 2);
-        assertEquals(3, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(2), 1);
-        assertEquals(3, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(3), 5);
-        assertEquals(5, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(0), 5);
-        assertEquals(4, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(0), 5);
-        assertEquals(3, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(0), 5);
-        assertEquals(2, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(0), 5);
-        assertEquals(1, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(0), 5);
-        assertEquals(0, wb.getActiveSheetIndex());
-
-        wb.setSheetOrder(wb.getSheetName(0), 5);
-        assertEquals(5, wb.getActiveSheetIndex());
-        
-        wb.close();
-    }   
-
-    @Test
-    public void testRemoveSheetAndAdjustActiveSheet() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57171_57163_57165.xlsx");
-        
-        assertEquals(5, wb.getActiveSheetIndex());
-        
-        wb.removeSheetAt(0);
-        assertEquals(4, wb.getActiveSheetIndex());
-        
-        wb.setActiveSheet(3);
-        assertEquals(3, wb.getActiveSheetIndex());
-        
-        wb.removeSheetAt(4);
-        assertEquals(3, wb.getActiveSheetIndex());
-
-        wb.removeSheetAt(3);
-        assertEquals(2, wb.getActiveSheetIndex());
-
-        wb.removeSheetAt(0);
-        assertEquals(1, wb.getActiveSheetIndex());
-
-        wb.removeSheetAt(1);
-        assertEquals(0, wb.getActiveSheetIndex());
-
-        wb.removeSheetAt(0);
-        assertEquals(0, wb.getActiveSheetIndex());
-
-        try {
-            wb.removeSheetAt(0);
-            fail("Should catch exception as no more sheets are there");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-        assertEquals(0, wb.getActiveSheetIndex());
-        
-        wb.createSheet();
-        assertEquals(0, wb.getActiveSheetIndex());
-        
-        wb.removeSheetAt(0);
-        assertEquals(0, wb.getActiveSheetIndex());
-        
-        wb.close();
-    }
-
-    /** Failed to clone a sheet from an Excel 2010 */
-    @Test
-    public void test57165() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57171_57163_57165.xlsx");
-        assertEquals(5, wb.getActiveSheetIndex());
-        removeAllSheetsBut(3, wb);
-        assertEquals(0, wb.getActiveSheetIndex());
-        wb.createSheet("New Sheet1");
-        assertEquals(0, wb.getActiveSheetIndex());
-        wb.cloneSheet(0); // Throws exception here
-        wb.setSheetName(1, "New Sheet");
-        assertEquals(0, wb.getActiveSheetIndex());
-
-        wb.close();
-    }
-
-    private static void removeAllSheetsBut(int sheetIndex, Workbook wb) {
-        int sheetNb = wb.getNumberOfSheets();
-        // Move this sheet at the first position
-        wb.setSheetOrder(wb.getSheetName(sheetIndex), 0);
-        // Must make this sheet active (otherwise, for XLSX, Excel might protest that active sheet no longer exists)
-        // I think POI should automatically handle this case when deleting sheets...
-        // wb.setActiveSheet(0);
-        for (int sn = sheetNb - 1; sn > 0; sn--) {
-            wb.removeSheetAt(sn);
-        }
-    }
-
-    /** Shifting rows with cell comments only shifts comments from first such cell. Other cell comments not shifted */
-    @Test
-    public void testBug57828_OnlyOneCommentShiftedInRow() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("57828.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-
-        Comment comment1 = sheet.getCellComment(new CellAddress(2, 1));
-        assertNotNull(comment1);
-
-        Comment comment2 = sheet.getCellComment(new CellAddress(2, 2));
-        assertNotNull(comment2);
-
-        Comment comment3 = sheet.getCellComment(new CellAddress(1, 1));
-        assertNull("NO comment in (1,1) and it should be null", comment3);
-
-        sheet.shiftRows(2, 2, -1);
-
-        comment3 = sheet.getCellComment(new CellAddress(1, 1));
-        assertNotNull("Comment in (2,1) moved to (1,1) so its not null now.", comment3);
-
-        comment1 = sheet.getCellComment(new CellAddress(2, 1));
-        assertNull("No comment currently in (2,1) and hence it is null", comment1);
-
-        comment2 = sheet.getCellComment(new CellAddress(1, 2));
-        assertNotNull("Comment in (2,2) should have moved as well because of shift rows. But its not", comment2);
-        
-        wb.close();
-    }
-    
-    // This test is written as expected-to-fail and should be rewritten
-    // as expected-to-pass when the bug is fixed.
-    //@Ignore("Bug 59733 - shiftRows() causes org.apache.xmlbeans.impl.values.XmlValueDisconnectedException")
-    @Test
-    public void bug59733() throws IOException {
-        Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet();
-        for (int r=0; r<4; r++) {
-            sheet.createRow(r);
-        }
-
-        // Shift the 2nd row on top of the 0th row
-        sheet.shiftRows(2, 2, -2);
-        
-        /*
-         * The following error is thrown when shifting the 3rd row on top of the 0th row
-         * If the rows are not created, the error does not occur
-
-        org.apache.xmlbeans.impl.values.XmlValueDisconnectedException
-            at org.apache.xmlbeans.impl.values.XmlObjectBase.check_orphaned(XmlObjectBase.java:1258)
-            at org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTRowImpl.getR(Unknown Source)
-            at org.apache.poi.xssf.usermodel.XSSFRow.getRowNum(XSSFRow.java:363)
-            at org.apache.poi.xssf.usermodel.TestXSSFSheetShiftRows.bug59733(TestXSSFSheetShiftRows.java:393)
-         */
-        // FIXME: remove try, catch, and testPassesNow, skipTest when test passes
-        try {
-            sheet.removeRow(sheet.getRow(0));
-            assertEquals(1, sheet.getRow(1).getRowNum());
-            testPassesNow(59733);
-        } catch (XmlValueDisconnectedException e) {
-            skipTest(e);
-        }
-        
-
-        workbook.close();
-    }
-
-    private static String getCellFormula(Sheet sheet, String address) {
-        CellAddress cellAddress = new CellAddress(address);
-        Row row = sheet.getRow(cellAddress.getRow());
-        assertNotNull(row);
-        Cell cell = row.getCell(cellAddress.getColumn());
-        assertNotNull(cell);
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        return cell.getCellFormula();
-    }
-
-    // This test is written as expected-to-fail and should be rewritten
-    // as expected-to-pass when the bug is fixed.
-    @Test
-    public void testSharedFormulas() throws Exception {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("TestShiftRowSharedFormula.xlsx");
-        XSSFSheet sheet = wb.getSheetAt(0);
-        assertEquals("SUM(C2:C4)", getCellFormula(sheet, "C5"));
-        assertEquals("SUM(D2:D4)", getCellFormula(sheet, "D5"));
-        assertEquals("SUM(E2:E4)", getCellFormula(sheet, "E5"));
-
-        sheet.shiftRows(3, sheet.getLastRowNum(), 1);
-        // FIXME: remove try, catch, and testPassesNow, skipTest when test passes
-        try {
-            assertEquals("SUM(C2:C5)", getCellFormula(sheet, "C6"));
-            assertEquals("SUM(D2:D5)", getCellFormula(sheet, "D6"));
-            assertEquals("SUM(E2:E5)", getCellFormula(sheet, "E6"));
-            testPassesNow(59983);
-        } catch (AssertionError e) {
-            skipTest(e);
-        }
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
deleted file mode 100644
index 85378ec..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.BaseTestSheetUpdateArrayFormulas;
-import org.apache.poi.ss.usermodel.CellRange;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellFormula;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellFormulaType;
-
-import junit.framework.AssertionFailedError;
-/**
- * Test array formulas in XSSF
- *
- * @author Yegor Kozlov
- * @author Josh Micich
- */
-public final class TestXSSFSheetUpdateArrayFormulas extends BaseTestSheetUpdateArrayFormulas {
-
-    public TestXSSFSheetUpdateArrayFormulas() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    // Test methods common with HSSF are in superclass
-    // Local methods here test XSSF-specific details of updating array formulas
-    @Test
-    public void testXSSFSetArrayFormula_singleCell() throws IOException {
-        CellRange<XSSFCell> cells;
-
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-
-        // 1. single-cell array formula
-        String formula1 = "123";
-        CellRangeAddress range = CellRangeAddress.valueOf("C3:C3");
-        cells = sheet.setArrayFormula(formula1, range);
-        assertEquals(1, cells.size());
-
-        // check getFirstCell...
-        XSSFCell firstCell = cells.getTopLeftCell();
-        assertSame(firstCell, sheet.getFirstCellInArrayFormula(firstCell));
-        //retrieve the range and check it is the same
-        assertEquals(range.formatAsString(), firstCell.getArrayFormulaRange().formatAsString());
-        confirmArrayFormulaCell(firstCell, "C3", formula1, "C3");
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testXSSFSetArrayFormula_multiCell() throws IOException {
-        CellRange<XSSFCell> cells;
-
-        String formula2 = "456";
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-
-        CellRangeAddress range = CellRangeAddress.valueOf("C4:C6");
-        cells = sheet.setArrayFormula(formula2, range);
-        assertEquals(3, cells.size());
-
-        // sheet.setArrayFormula creates rows and cells for the designated range
-        /*
-         * From the spec:
-         * For a multi-cell formula, the c elements for all cells except the top-left
-         * cell in that range shall not have an f element;
-         */
-        // Check that each cell exists and that the formula text is set correctly on the first cell
-        XSSFCell firstCell = cells.getTopLeftCell();
-        confirmArrayFormulaCell(firstCell, "C4", formula2, "C4:C6");
-        confirmArrayFormulaCell(cells.getCell(1, 0), "C5");
-        confirmArrayFormulaCell(cells.getCell(2, 0), "C6");
-
-        assertSame(firstCell, sheet.getFirstCellInArrayFormula(firstCell));
-        workbook.close();
-    }
-
-    private static void confirmArrayFormulaCell(XSSFCell c, String cellRef) {
-        confirmArrayFormulaCell(c, cellRef, null, null);
-    }
-    private static void confirmArrayFormulaCell(XSSFCell c, String cellRef, String formulaText, String arrayRangeRef) {
-        if (c == null) {
-            throw new AssertionFailedError("Cell should not be null.");
-        }
-        CTCell ctCell = c.getCTCell();
-        assertEquals(cellRef, ctCell.getR());
-        if (formulaText == null) {
-            assertFalse(ctCell.isSetF());
-            assertNull(ctCell.getF());
-        } else {
-            CTCellFormula f = ctCell.getF();
-            assertEquals(arrayRangeRef, f.getRef());
-            assertEquals(formulaText, f.getStringValue());
-            assertEquals(STCellFormulaType.ARRAY, f.getT());
-        }
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
deleted file mode 100644
index e9eebe6..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.awt.Color;
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.junit.Test;
-
-public class TestXSSFSimpleShape {
-    @Test
-    public void testXSSFTextParagraph() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-            XSSFDrawing drawing = sheet.createDrawingPatriarch();
-    
-            XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-            
-            XSSFRichTextString rt = new XSSFRichTextString("Test String");
-            
-            XSSFFont font = wb.createFont();
-            Color color = new Color(0, 255, 255);
-            font.setColor(new XSSFColor(color));
-            font.setFontName("Arial");
-            rt.applyFont(font);
-    
-            shape.setText(rt);
-
-            assertNotNull(shape.getCTShape());
-            assertNotNull(shape.iterator());
-            assertNotNull(XSSFSimpleShape.prototype());
-            
-            for(ListAutoNumber nr : ListAutoNumber.values()) {
-                shape.getTextParagraphs().get(0).setBullet(nr);
-                assertNotNull(shape.getText());
-            }
-            
-            shape.getTextParagraphs().get(0).setBullet(false);
-            assertNotNull(shape.getText());
-
-            shape.setText("testtext");
-            assertEquals("testtext", shape.getText());
-            
-            shape.setText(new XSSFRichTextString());
-            assertEquals("null", shape.getText());
-            
-            shape.addNewTextParagraph();
-            shape.addNewTextParagraph("test-other-text");
-            shape.addNewTextParagraph(new XSSFRichTextString("rtstring"));
-            shape.addNewTextParagraph(new XSSFRichTextString());
-            assertEquals("null\n\ntest-other-text\nrtstring\nnull", shape.getText());
-            
-            assertEquals(TextHorizontalOverflow.OVERFLOW, shape.getTextHorizontalOverflow());
-            shape.setTextHorizontalOverflow(TextHorizontalOverflow.CLIP);
-            assertEquals(TextHorizontalOverflow.CLIP, shape.getTextHorizontalOverflow());
-            shape.setTextHorizontalOverflow(TextHorizontalOverflow.OVERFLOW);
-            assertEquals(TextHorizontalOverflow.OVERFLOW, shape.getTextHorizontalOverflow());
-            shape.setTextHorizontalOverflow(null);
-            assertEquals(TextHorizontalOverflow.OVERFLOW, shape.getTextHorizontalOverflow());
-            shape.setTextHorizontalOverflow(null);
-            assertEquals(TextHorizontalOverflow.OVERFLOW, shape.getTextHorizontalOverflow());
-            
-            assertEquals(TextVerticalOverflow.OVERFLOW, shape.getTextVerticalOverflow());
-            shape.setTextVerticalOverflow(TextVerticalOverflow.CLIP);
-            assertEquals(TextVerticalOverflow.CLIP, shape.getTextVerticalOverflow());
-            shape.setTextVerticalOverflow(TextVerticalOverflow.OVERFLOW);
-            assertEquals(TextVerticalOverflow.OVERFLOW, shape.getTextVerticalOverflow());
-            shape.setTextVerticalOverflow(null);
-            assertEquals(TextVerticalOverflow.OVERFLOW, shape.getTextVerticalOverflow());
-            shape.setTextVerticalOverflow(null);
-            assertEquals(TextVerticalOverflow.OVERFLOW, shape.getTextVerticalOverflow());
-
-            assertEquals(VerticalAlignment.TOP, shape.getVerticalAlignment());
-            shape.setVerticalAlignment(VerticalAlignment.BOTTOM);
-            assertEquals(VerticalAlignment.BOTTOM, shape.getVerticalAlignment());
-            shape.setVerticalAlignment(VerticalAlignment.TOP);
-            assertEquals(VerticalAlignment.TOP, shape.getVerticalAlignment());
-            shape.setVerticalAlignment(null);
-            assertEquals(VerticalAlignment.TOP, shape.getVerticalAlignment());
-            shape.setVerticalAlignment(null);
-            assertEquals(VerticalAlignment.TOP, shape.getVerticalAlignment());
-
-            assertEquals(TextDirection.HORIZONTAL, shape.getTextDirection());
-            shape.setTextDirection(TextDirection.STACKED);
-            assertEquals(TextDirection.STACKED, shape.getTextDirection());
-            shape.setTextDirection(TextDirection.HORIZONTAL);
-            assertEquals(TextDirection.HORIZONTAL, shape.getTextDirection());
-            shape.setTextDirection(null);
-            assertEquals(TextDirection.HORIZONTAL, shape.getTextDirection());
-            shape.setTextDirection(null);
-            assertEquals(TextDirection.HORIZONTAL, shape.getTextDirection());
-
-            assertEquals(3.6, shape.getBottomInset(), 0.01);
-            shape.setBottomInset(12.32);
-            assertEquals(12.32, shape.getBottomInset(), 0.01);
-            shape.setBottomInset(-1);
-            assertEquals(3.6, shape.getBottomInset(), 0.01);
-            shape.setBottomInset(-1);
-            assertEquals(3.6, shape.getBottomInset(), 0.01);
-            
-            assertEquals(3.6, shape.getLeftInset(), 0.01);
-            shape.setLeftInset(12.31);
-            assertEquals(12.31, shape.getLeftInset(), 0.01);
-            shape.setLeftInset(-1);
-            assertEquals(3.6, shape.getLeftInset(), 0.01);
-            shape.setLeftInset(-1);
-            assertEquals(3.6, shape.getLeftInset(), 0.01);
-
-            assertEquals(3.6, shape.getRightInset(), 0.01);
-            shape.setRightInset(13.31);
-            assertEquals(13.31, shape.getRightInset(), 0.01);
-            shape.setRightInset(-1);
-            assertEquals(3.6, shape.getRightInset(), 0.01);
-            shape.setRightInset(-1);
-            assertEquals(3.6, shape.getRightInset(), 0.01);
-
-            assertEquals(3.6, shape.getTopInset(), 0.01);
-            shape.setTopInset(23.31);
-            assertEquals(23.31, shape.getTopInset(), 0.01);
-            shape.setTopInset(-1);
-            assertEquals(3.6, shape.getTopInset(), 0.01);
-            shape.setTopInset(-1);
-            assertEquals(3.6, shape.getTopInset(), 0.01);
-            
-            assertTrue(shape.getWordWrap());
-            shape.setWordWrap(false);
-            assertFalse(shape.getWordWrap());
-            shape.setWordWrap(true);
-            assertTrue(shape.getWordWrap());
-
-            assertEquals(TextAutofit.NORMAL, shape.getTextAutofit());
-            shape.setTextAutofit(TextAutofit.NORMAL);
-            assertEquals(TextAutofit.NORMAL, shape.getTextAutofit());
-            shape.setTextAutofit(TextAutofit.SHAPE);
-            assertEquals(TextAutofit.SHAPE, shape.getTextAutofit());
-            shape.setTextAutofit(TextAutofit.NONE);
-            assertEquals(TextAutofit.NONE, shape.getTextAutofit());
-            
-            assertEquals(5, shape.getShapeType());
-            shape.setShapeType(23);
-            assertEquals(23, shape.getShapeType());
-
-            // TODO: should this be supported?
-//            shape.setShapeType(-1);
-//            assertEquals(-1, shape.getShapeType());
-//            shape.setShapeType(-1);
-//            assertEquals(-1, shape.getShapeType());
-            
-            assertNotNull(shape.getShapeProperties());
-        } finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
deleted file mode 100644
index 69b412a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTable;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableStyleInfo;
-
-public final class TestXSSFTable {
-
-    @Test
-    public void bug56274() throws IOException {
-        // read sample file
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("56274.xlsx");
-
-        // read the original sheet header order
-        XSSFRow row = wb1.getSheetAt(0).getRow(0);
-        List<String> headers = new ArrayList<String>();
-        for (Cell cell : row) {
-            headers.add(cell.getStringCellValue());
-        }
-
-        // save the worksheet as-is using SXSSF
-        File outputFile = TempFile.createTempFile("poi-56274", ".xlsx");
-        SXSSFWorkbook outputWorkbook = new SXSSFWorkbook(wb1);
-        FileOutputStream fos = new FileOutputStream(outputFile);
-        outputWorkbook.write(fos);
-        fos.close();
-        outputWorkbook.close();
-
-        // re-read the saved file and make sure headers in the xml are in the original order
-        FileInputStream fis = new FileInputStream(outputFile);
-        XSSFWorkbook wb2 = new XSSFWorkbook(fis);
-        fis.close();
-        CTTable ctTable = wb2.getSheetAt(0).getTables().get(0).getCTTable();
-        CTTableColumn[] ctTableColumnArray = ctTable.getTableColumns().getTableColumnArray();
-
-        assertEquals("number of headers in xml table should match number of header cells in worksheet",
-                headers.size(), ctTableColumnArray.length);
-        for (int i = 0; i < headers.size(); i++) {
-            assertEquals("header name in xml table should match number of header cells in worksheet",
-                    headers.get(i), ctTableColumnArray[i].getName());
-        }
-        assertTrue(outputFile.delete());
-        wb2.close();
-        wb1.close();
-    }
-
-    @Test
-    public void testCTTableStyleInfo() throws IOException {
-        XSSFWorkbook outputWorkbook = new XSSFWorkbook();
-        XSSFSheet sheet = outputWorkbook.createSheet();
-
-        //Create
-        XSSFTable outputTable = sheet.createTable();
-        outputTable.setDisplayName("Test");
-        CTTable outputCTTable = outputTable.getCTTable();
-
-        //Style configurations
-        CTTableStyleInfo outputStyleInfo = outputCTTable.addNewTableStyleInfo();
-        outputStyleInfo.setName("TableStyleLight1");
-        outputStyleInfo.setShowColumnStripes(false);
-        outputStyleInfo.setShowRowStripes(true);
-
-        XSSFWorkbook inputWorkbook = XSSFTestDataSamples.writeOutAndReadBack(outputWorkbook);
-        List<XSSFTable> tables = inputWorkbook.getSheetAt(0).getTables();
-        assertEquals("Tables number", 1, tables.size());
-
-        XSSFTable inputTable = tables.get(0);
-        assertEquals("Table display name", outputTable.getDisplayName(), inputTable.getDisplayName());
-
-        CTTableStyleInfo inputStyleInfo = inputTable.getCTTable().getTableStyleInfo();
-        assertEquals("Style name", outputStyleInfo.getName(), inputStyleInfo.getName());
-        assertEquals("Show column stripes",
-                outputStyleInfo.getShowColumnStripes(), inputStyleInfo.getShowColumnStripes());
-        assertEquals("Show row stripes",
-                outputStyleInfo.getShowRowStripes(), inputStyleInfo.getShowRowStripes());
-
-        inputWorkbook.close();
-        outputWorkbook.close();
-    }
-
-    @Test
-    public void findColumnIndex() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertNotNull(table);
-        assertEquals("column header has special escaped characters",
-                0, table.findColumnIndex("calc='#*'#"));
-        assertEquals(1, table.findColumnIndex("Name"));
-        assertEquals(2, table.findColumnIndex("Number"));
-
-        assertEquals("case insensitive", 2, table.findColumnIndex("NuMbEr"));
-
-        // findColumnIndex should return -1 if no column header name matches
-        assertEquals(-1, table.findColumnIndex(null));
-        assertEquals(-1, table.findColumnIndex(""));
-        assertEquals(-1, table.findColumnIndex("one"));
-
-        wb.close();
-    }
-
-    @Test
-    public void findColumnIndexIsRelativeToTableNotSheet() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("DataTableCities.xlsx");
-        XSSFTable table = wb.getTable("SmallCity");
-
-        // Make sure that XSSFTable.findColumnIndex returns the column index relative to the first
-        // column in the table, not the column number in the sheet
-        assertEquals(0, table.findColumnIndex("City")); // column I in worksheet but 0th column in table
-        assertEquals(1, table.findColumnIndex("Latitude"));
-        assertEquals(2, table.findColumnIndex("Longitude"));
-        assertEquals(3, table.findColumnIndex("Population"));
-
-        wb.close();
-    }
-
-    @Test
-    public void getSheetName() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals("Table", table.getSheetName());
-        wb.close(); 
-    }
-
-    @Test
-    public void isHasTotalsRow() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertFalse(table.isHasTotalsRow());
-        wb.close(); 
-    }
-
-    @Test
-    public void getStartColIndex() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals(0, table.getStartColIndex());
-        wb.close(); 
-    }
-
-    @Test
-    public void getEndColIndex() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals(2, table.getEndColIndex());
-        wb.close(); 
-    }
-
-    @Test
-    public void getStartRowIndex() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals(0, table.getStartRowIndex());
-        wb.close(); 
-    }
-
-    @Test
-    public void getEndRowIndex() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals(6, table.getEndRowIndex());
-        wb.close(); 
-    }
-
-    @Test
-    public void getStartCellReference() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals(new CellReference("A1"), table.getStartCellReference());
-        wb.close(); 
-    }
-
-    @Test
-    public void getEndCellReference() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals(new CellReference("C7"), table.getEndCellReference());
-        wb.close(); 
-    }
-
-    @Test
-    public void getNumberOfMappedColumns() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals(3, table.getNumberOfMappedColumns());
-        wb.close(); 
-    }
-
-    @Test
-    public void getAndSetDisplayName() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("StructuredReferences.xlsx");
-        XSSFTable table = wb.getTable("\\_Prime.1");
-        assertEquals("\\_Prime.1", table.getDisplayName());
-
-        table.setDisplayName(null);
-        assertNull(table.getDisplayName());
-        assertEquals("\\_Prime.1", table.getName()); // name and display name are different
-
-        table.setDisplayName("Display name");
-        assertEquals("Display name", table.getDisplayName());
-        assertEquals("\\_Prime.1", table.getName()); // name and display name are different
-
-        wb.close();
-    }
-
-    @Test
-    public void getCellReferences() {
-        // make sure that cached start and end cell references
-        // can be synchronized with the underlying CTTable
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sh = wb.createSheet();
-        XSSFTable table = sh.createTable();
-        CTTable ctTable = table.getCTTable();
-        ctTable.setRef("B2:E8");
-
-        assertEquals(new CellReference("B2"), table.getStartCellReference());
-        assertEquals(new CellReference("E8"), table.getEndCellReference());
-
-        // At this point start and end cell reference are cached
-        // and may not follow changes to the underlying CTTable
-        ctTable.setRef("C1:M3");
-
-        assertEquals(new CellReference("B2"), table.getStartCellReference());
-        assertEquals(new CellReference("E8"), table.getEndCellReference());
-
-        // Force a synchronization between CTTable and XSSFTable
-        // start and end cell references
-        table.updateReferences();
-
-        assertEquals(new CellReference("C1"), table.getStartCellReference());
-        assertEquals(new CellReference("M3"), table.getEndCellReference());
-
-    }
-
-    @Test
-    public void getRowCount() {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sh = wb.createSheet();
-        XSSFTable table = sh.createTable();
-        CTTable ctTable = table.getCTTable();
-
-        assertEquals(0, table.getRowCount());
-
-        ctTable.setRef("B2:B2");
-        // update cell references to clear the cache
-        table.updateReferences();
-        assertEquals(1, table.getRowCount());
-
-        ctTable.setRef("B2:B12");
-        // update cell references to clear the cache
-        table.updateReferences();
-        assertEquals(11, table.getRowCount());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
deleted file mode 100644
index 7952f1f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
-import org.junit.Test;
-
-public class TestXSSFTextParagraph {
-    @Test
-    public void testXSSFTextParagraph() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-            XSSFDrawing drawing = sheet.createDrawingPatriarch();
-    
-            XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-            XSSFRichTextString rt = new XSSFRichTextString("Test String");
-    
-            XSSFFont font = wb.createFont();
-            Color color = new Color(0, 255, 255);
-            font.setColor(new XSSFColor(color));
-            font.setFontName("Arial");
-            rt.applyFont(font);
-    
-            shape.setText(rt);
-            
-            List<XSSFTextParagraph> paras = shape.getTextParagraphs();
-            assertEquals(1, paras.size());
-    
-            XSSFTextParagraph text = paras.get(0);
-            assertEquals("Test String", text.getText());
-            
-            assertFalse(text.isBullet());
-            assertNotNull(text.getXmlObject());
-            assertEquals(shape.getCTShape(), text.getParentShape());
-            assertNotNull(text.iterator());
-            assertNotNull(text.addLineBreak());
-
-            assertNotNull(text.getTextRuns());
-            assertEquals(2, text.getTextRuns().size());
-            text.addNewTextRun();
-            assertEquals(3, text.getTextRuns().size());
-            
-            assertEquals(TextAlign.LEFT, text.getTextAlign());
-            text.setTextAlign(null);
-            assertEquals(TextAlign.LEFT, text.getTextAlign());
-            text.setTextAlign(TextAlign.CENTER);
-            assertEquals(TextAlign.CENTER, text.getTextAlign());
-            text.setTextAlign(TextAlign.RIGHT);
-            assertEquals(TextAlign.RIGHT, text.getTextAlign());
-            text.setTextAlign(null);
-            assertEquals(TextAlign.LEFT, text.getTextAlign());
-            
-            text.setTextFontAlign(TextFontAlign.BASELINE);
-            assertEquals(TextFontAlign.BASELINE, text.getTextFontAlign());
-            text.setTextFontAlign(TextFontAlign.BOTTOM);
-            assertEquals(TextFontAlign.BOTTOM, text.getTextFontAlign());
-            text.setTextFontAlign(null);
-            assertEquals(TextFontAlign.BASELINE, text.getTextFontAlign());
-            text.setTextFontAlign(null);
-            assertEquals(TextFontAlign.BASELINE, text.getTextFontAlign());
-            
-            assertNull(text.getBulletFont());
-            text.setBulletFont("Arial");
-            assertEquals("Arial", text.getBulletFont());
-            
-            assertNull(text.getBulletCharacter());
-            text.setBulletCharacter(".");
-            assertEquals(".", text.getBulletCharacter());
-            
-            assertNull(text.getBulletFontColor());
-            text.setBulletFontColor(color);
-            assertEquals(color, text.getBulletFontColor());
-            
-            assertEquals(100.0, text.getBulletFontSize(), 0.01);
-            text.setBulletFontSize(1.0);
-            assertEquals(1.0, text.getBulletFontSize(), 0.01);
-            text.setBulletFontSize(1.0);
-            assertEquals(1.0, text.getBulletFontSize(), 0.01);
-            text.setBulletFontSize(-9.0);
-            assertEquals(-9.0, text.getBulletFontSize(), 0.01);
-            text.setBulletFontSize(-9.0);
-            assertEquals(-9.0, text.getBulletFontSize(), 0.01);
-            text.setBulletFontSize(1.0);
-            assertEquals(1.0, text.getBulletFontSize(), 0.01);
-            text.setBulletFontSize(-9.0);
-            assertEquals(-9.0, text.getBulletFontSize(), 0.01);
-
-            assertEquals(0.0, text.getIndent(), 0.01);
-            text.setIndent(2.0);
-            assertEquals(2.0, text.getIndent(), 0.01);
-            text.setIndent(-1.0);
-            assertEquals(0.0, text.getIndent(), 0.01);
-            text.setIndent(-1.0);
-            assertEquals(0.0, text.getIndent(), 0.01);
-            
-            assertEquals(0.0, text.getLeftMargin(), 0.01);
-            text.setLeftMargin(3.0);
-            assertEquals(3.0, text.getLeftMargin(), 0.01);
-            text.setLeftMargin(-1.0);
-            assertEquals(0.0, text.getLeftMargin(), 0.01);
-            text.setLeftMargin(-1.0);
-            assertEquals(0.0, text.getLeftMargin(), 0.01);
-            
-            assertEquals(0.0, text.getRightMargin(), 0.01);
-            text.setRightMargin(4.5);
-            assertEquals(4.5, text.getRightMargin(), 0.01);
-            text.setRightMargin(-1.0);
-            assertEquals(0.0, text.getRightMargin(), 0.01);
-            text.setRightMargin(-1.0);
-            assertEquals(0.0, text.getRightMargin(), 0.01);
-            
-            assertEquals(0.0, text.getDefaultTabSize(), 0.01);
-            
-            assertEquals(0.0, text.getTabStop(0), 0.01);
-            text.addTabStop(3.14);
-            assertEquals(3.14, text.getTabStop(0), 0.01);
-            
-            assertEquals(100.0, text.getLineSpacing(), 0.01);
-            text.setLineSpacing(3.15);
-            assertEquals(3.15, text.getLineSpacing(), 0.01);
-            text.setLineSpacing(-2.13);
-            assertEquals(-2.13, text.getLineSpacing(), 0.01);
-
-            assertEquals(0.0, text.getSpaceBefore(), 0.01);
-            text.setSpaceBefore(3.17);
-            assertEquals(3.17, text.getSpaceBefore(), 0.01);
-            text.setSpaceBefore(-4.7);
-            assertEquals(-4.7, text.getSpaceBefore(), 0.01);
-
-            assertEquals(0.0, text.getSpaceAfter(), 0.01);
-            text.setSpaceAfter(6.17);
-            assertEquals(6.17, text.getSpaceAfter(), 0.01);
-            text.setSpaceAfter(-8.17);
-            assertEquals(-8.17, text.getSpaceAfter(), 0.01);
-            
-            assertEquals(0, text.getLevel());
-            text.setLevel(1);
-            assertEquals(1, text.getLevel());
-            text.setLevel(4);
-            assertEquals(4, text.getLevel());
-            
-            assertTrue(text.isBullet());
-            assertFalse(text.isBulletAutoNumber());
-            text.setBullet(false);
-            text.setBullet(false);
-            assertFalse(text.isBullet());
-            assertFalse(text.isBulletAutoNumber());
-            text.setBullet(true);
-            assertTrue(text.isBullet());
-            assertFalse(text.isBulletAutoNumber());
-            assertEquals(0, text.getBulletAutoNumberStart());
-            assertEquals(ListAutoNumber.ARABIC_PLAIN, text.getBulletAutoNumberScheme());
-            
-            text.setBullet(false);
-            assertFalse(text.isBullet());
-            text.setBullet(ListAutoNumber.CIRCLE_NUM_DB_PLAIN);
-            assertTrue(text.isBullet());
-            assertTrue(text.isBulletAutoNumber());
-            assertEquals(0, text.getBulletAutoNumberStart());
-            assertEquals(ListAutoNumber.CIRCLE_NUM_DB_PLAIN, text.getBulletAutoNumberScheme());
-            text.setBullet(false);
-            assertFalse(text.isBullet());
-            assertFalse(text.isBulletAutoNumber());
-            text.setBullet(ListAutoNumber.CIRCLE_NUM_WD_BLACK_PLAIN, 10);
-            assertTrue(text.isBullet());
-            assertTrue(text.isBulletAutoNumber());
-            assertEquals(10, text.getBulletAutoNumberStart());
-            assertEquals(ListAutoNumber.CIRCLE_NUM_WD_BLACK_PLAIN, text.getBulletAutoNumberScheme());
-
-            
-            assertNotNull(text.toString());
-            
-            new XSSFTextParagraph(text.getXmlObject(), shape.getCTShape());
-        } finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
deleted file mode 100644
index e599e17..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
-import org.junit.Test;
-
-public class TestXSSFTextRun {
-    @Test
-    public void testXSSFTextParagraph() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            XSSFSheet sheet = wb.createSheet();
-            XSSFDrawing drawing = sheet.createDrawingPatriarch();
-    
-            XSSFTextBox shape = drawing.createTextbox(new XSSFClientAnchor(0, 0, 0, 0, 2, 2, 3, 4));
-
-            XSSFTextParagraph para = shape.addNewTextParagraph();
-            para.addNewTextRun().setText("Line 1");
-
-            List<XSSFTextRun> runs = para.getTextRuns();
-            assertEquals(1, runs.size());
-            XSSFTextRun run = runs.get(0);
-            assertEquals("Line 1", run.getText());
-            
-            assertNotNull(run.getParentParagraph());
-            assertNotNull(run.getXmlObject());
-            assertNotNull(run.getRPr());
-            
-            assertEquals(new Color(0,0,0), run.getFontColor());
-            
-            Color color = new Color(0, 255, 255);
-            run.setFontColor(color);
-            assertEquals(color, run.getFontColor());
-            
-            assertEquals(11.0, run.getFontSize(), 0.01);
-            run.setFontSize(12.32);
-            assertEquals(12.32, run.getFontSize(), 0.01);
-            run.setFontSize(-1.0);
-            assertEquals(11.0, run.getFontSize(), 0.01);
-            run.setFontSize(-1.0);
-            assertEquals(11.0, run.getFontSize(), 0.01);
-            try {
-                run.setFontSize(0.9);
-                fail("Should fail");
-            } catch (IllegalArgumentException e) {
-                assertTrue(e.getMessage().contains("0.9"));
-            }
-            assertEquals(11.0, run.getFontSize(), 0.01);
-            
-            assertEquals(0.0, run.getCharacterSpacing(), 0.01);
-            run.setCharacterSpacing(12.31);
-            assertEquals(12.31, run.getCharacterSpacing(), 0.01);
-            run.setCharacterSpacing(0.0);
-            assertEquals(0.0, run.getCharacterSpacing(), 0.01);
-            run.setCharacterSpacing(0.0);
-            assertEquals(0.0, run.getCharacterSpacing(), 0.01);
-            
-            assertEquals("Calibri", run.getFontFamily());
-            run.setFontFamily("Arial", (byte)1, (byte)1, false);
-            assertEquals("Arial", run.getFontFamily());
-            run.setFontFamily("Arial", (byte)-1, (byte)1, false);
-            assertEquals("Arial", run.getFontFamily());
-            run.setFontFamily("Arial", (byte)1, (byte)-1, false);
-            assertEquals("Arial", run.getFontFamily());
-            run.setFontFamily("Arial", (byte)1, (byte)1, true);
-            assertEquals("Arial", run.getFontFamily());
-            run.setFontFamily(null, (byte)1, (byte)1, false);
-            assertEquals("Calibri", run.getFontFamily());
-            run.setFontFamily(null, (byte)1, (byte)1, false);
-            assertEquals("Calibri", run.getFontFamily());
-
-            run.setFont("Arial");
-            assertEquals("Arial", run.getFontFamily());
-            
-            assertEquals((byte)0, run.getPitchAndFamily());
-            run.setFont(null);
-            assertEquals((byte)0, run.getPitchAndFamily());
-            
-            assertFalse(run.isStrikethrough());
-            run.setStrikethrough(true);
-            assertTrue(run.isStrikethrough());
-            run.setStrikethrough(false);
-            assertFalse(run.isStrikethrough());
-
-            assertFalse(run.isSuperscript());
-            run.setSuperscript(true);
-            assertTrue(run.isSuperscript());
-            run.setSuperscript(false);
-            assertFalse(run.isSuperscript());
-
-            assertFalse(run.isSubscript());
-            run.setSubscript(true);
-            assertTrue(run.isSubscript());
-            run.setSubscript(false);
-            assertFalse(run.isSubscript());
-            
-            assertEquals(TextCap.NONE, run.getTextCap());
-
-            assertFalse(run.isBold());
-            run.setBold(true);
-            assertTrue(run.isBold());
-            run.setBold(false);
-            assertFalse(run.isBold());
-
-            assertFalse(run.isItalic());
-            run.setItalic(true);
-            assertTrue(run.isItalic());
-            run.setItalic(false);
-            assertFalse(run.isItalic());
-
-            assertFalse(run.isUnderline());
-            run.setUnderline(true);
-            assertTrue(run.isUnderline());
-            run.setUnderline(false);
-            assertFalse(run.isUnderline());
-            
-            assertNotNull(run.toString());
-        } finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
deleted file mode 100644
index 4ae2b8b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.util.List;
-
-import com.microsoft.schemas.office.excel.STTrueFalseBlank;
-import org.apache.poi.POIDataSamples;
-import org.apache.xmlbeans.XmlObject;
-
-import com.microsoft.schemas.office.excel.CTClientData;
-import com.microsoft.schemas.office.excel.STObjectType;
-import com.microsoft.schemas.office.office.CTShapeLayout;
-import com.microsoft.schemas.office.office.STConnectType;
-import com.microsoft.schemas.office.office.STInsetMode;
-import com.microsoft.schemas.vml.CTShadow;
-import com.microsoft.schemas.vml.CTShape;
-import com.microsoft.schemas.vml.CTShapetype;
-import com.microsoft.schemas.vml.STExt;
-import com.microsoft.schemas.vml.STTrueFalse;
-
-import junit.framework.TestCase;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestXSSFVMLDrawing extends TestCase {
-
-    public void testNew() throws Exception {
-        XSSFVMLDrawing vml = new XSSFVMLDrawing();
-        List<XmlObject> items = vml.getItems();
-        assertEquals(2, items.size());
-        assertTrue(items.get(0) instanceof CTShapeLayout);
-        CTShapeLayout layout = (CTShapeLayout)items.get(0);
-        assertEquals(STExt.EDIT, layout.getExt());
-        assertEquals(STExt.EDIT, layout.getIdmap().getExt());
-        assertEquals("1", layout.getIdmap().getData());
-    
-        assertTrue(items.get(1) instanceof CTShapetype);
-        CTShapetype type = (CTShapetype)items.get(1);
-        assertEquals("21600,21600", type.getCoordsize());
-        assertEquals(202.0f, type.getSpt());
-        assertEquals("m,l,21600r21600,l21600,xe", type.getPath2());
-        assertEquals("_x0000_t202", type.getId());
-        assertEquals(STTrueFalse.T, type.getPathArray(0).getGradientshapeok());
-        assertEquals(STConnectType.RECT, type.getPathArray(0).getConnecttype());
-
-        CTShape shape = vml.newCommentShape();
-        assertEquals(3, items.size());
-        assertSame(items.get(2),  shape);
-        assertEquals("#_x0000_t202", shape.getType());
-        assertEquals("position:absolute; visibility:hidden", shape.getStyle());
-        assertEquals("#ffffe1", shape.getFillcolor());
-        assertEquals(STInsetMode.AUTO, shape.getInsetmode());
-        assertEquals("#ffffe1", shape.getFillArray(0).getColor());
-        CTShadow shadow = shape.getShadowArray(0);
-        assertEquals(STTrueFalse.T, shadow.getOn());
-        assertEquals("black", shadow.getColor());
-        assertEquals(STTrueFalse.T, shadow.getObscured());
-        assertEquals(STConnectType.NONE, shape.getPathArray(0).getConnecttype());
-        assertEquals("mso-direction-alt:auto", shape.getTextboxArray(0).getStyle());
-        CTClientData cldata = shape.getClientDataArray(0);
-        assertEquals(STObjectType.NOTE, cldata.getObjectType());
-        assertEquals(1, cldata.sizeOfMoveWithCellsArray());
-        assertEquals(1, cldata.sizeOfSizeWithCellsArray());
-        assertEquals("1, 15, 0, 2, 3, 15, 3, 16", cldata.getAnchorArray(0));
-        assertEquals("False", cldata.getAutoFillArray(0).toString());
-        assertEquals(0, cldata.getRowArray(0).intValue());
-        assertEquals(0, cldata.getColumnArray(0).intValue());
-        assertEquals("[]", cldata.getVisibleList().toString());
-        cldata.setVisibleArray(new STTrueFalseBlank.Enum[] { STTrueFalseBlank.Enum.forString("True") });
-        assertEquals("[True]", cldata.getVisibleList().toString());
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        vml.write(out);
-
-        XSSFVMLDrawing vml2 = new XSSFVMLDrawing();
-        vml2.read(new ByteArrayInputStream(out.toByteArray()));
-        List<XmlObject> items2 = vml2.getItems();
-        assertEquals(3, items2.size());
-        assertTrue(items2.get(0) instanceof CTShapeLayout);
-        assertTrue(items2.get(1) instanceof CTShapetype);
-        assertTrue(items2.get(2) instanceof CTShape);
-    }
-
-    public void testFindCommentShape() throws Exception {
-        
-        XSSFVMLDrawing vml = new XSSFVMLDrawing();
-        InputStream stream = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("vmlDrawing1.vml");
-        try {
-            vml.read(stream);
-        } finally {
-            stream.close();
-        }
-
-        CTShape sh_a1 = vml.findCommentShape(0, 0);
-        assertNotNull(sh_a1);
-        assertEquals("_x0000_s1025", sh_a1.getId());
-
-        CTShape sh_b1 = vml.findCommentShape(0, 1);
-        assertNotNull(sh_b1);
-        assertEquals("_x0000_s1026", sh_b1.getId());
-
-        CTShape sh_c1 = vml.findCommentShape(0, 2);
-        assertNull(sh_c1);
-
-        CTShape sh_d1 = vml.newCommentShape();
-        assertEquals("_x0000_s1027", sh_d1.getId());
-        sh_d1.getClientDataArray(0).setRowArray(0, new BigInteger("0"));
-        sh_d1.getClientDataArray(0).setColumnArray(0, new BigInteger("3"));
-        assertSame(sh_d1, vml.findCommentShape(0, 3));
-
-        //newly created drawing
-        XSSFVMLDrawing newVml = new XSSFVMLDrawing();
-        assertNull(newVml.findCommentShape(0, 0));
-
-        sh_a1 = newVml.newCommentShape();
-        assertEquals("_x0000_s1025", sh_a1.getId());
-        sh_a1.getClientDataArray(0).setRowArray(0, new BigInteger("0"));
-        sh_a1.getClientDataArray(0).setColumnArray(0, new BigInteger("1"));
-        assertSame(sh_a1, newVml.findCommentShape(0, 1));
-    }
-
-    public void testRemoveCommentShape() throws Exception {
-        XSSFVMLDrawing vml = new XSSFVMLDrawing();
-        InputStream stream = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("vmlDrawing1.vml");
-        try {
-            vml.read(stream);
-        } finally {
-            stream.close();
-        }
-
-        CTShape sh_a1 = vml.findCommentShape(0, 0);
-        assertNotNull(sh_a1);
-
-        assertTrue(vml.removeCommentShape(0, 0));
-        assertNull(vml.findCommentShape(0, 0));
-
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
deleted file mode 100644
index 7f832c4..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
+++ /dev/null
@@ -1,1183 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.CRC32;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIXMLProperties;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.ContentTypes;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.internal.FileHelper;
-import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart;
-import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.BaseTestXWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xssf.XSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.model.StylesTable;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCache;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbookPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCalcMode;
-
-public final class TestXSSFWorkbook extends BaseTestXWorkbook {
-
-    public TestXSSFWorkbook() {
-        super(XSSFITestDataProvider.instance);
-    }
-
-    /**
-     * Tests that we can save, and then re-load a new document
-     */
-    @Test
-    public void saveLoadNew() throws IOException, InvalidFormatException {
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-
-        //check that the default date system is set to 1900
-        CTWorkbookPr pr = wb1.getCTWorkbook().getWorkbookPr();
-        assertNotNull(pr);
-        assertTrue(pr.isSetDate1904());
-        assertFalse("XSSF must use the 1900 date system", pr.getDate1904());
-
-        Sheet sheet1 = wb1.createSheet("sheet1");
-        Sheet sheet2 = wb1.createSheet("sheet2");
-        wb1.createSheet("sheet3");
-
-        RichTextString rts = wb1.getCreationHelper().createRichTextString("hello world");
-
-        sheet1.createRow(0).createCell((short)0).setCellValue(1.2);
-        sheet1.createRow(1).createCell((short)0).setCellValue(rts);
-        sheet2.createRow(0);
-
-        assertEquals(0, wb1.getSheetAt(0).getFirstRowNum());
-        assertEquals(1, wb1.getSheetAt(0).getLastRowNum());
-        assertEquals(0, wb1.getSheetAt(1).getFirstRowNum());
-        assertEquals(0, wb1.getSheetAt(1).getLastRowNum());
-        assertEquals(0, wb1.getSheetAt(2).getFirstRowNum());
-        assertEquals(0, wb1.getSheetAt(2).getLastRowNum());
-
-        File file = TempFile.createTempFile("poi-", ".xlsx");
-        OutputStream out = new FileOutputStream(file);
-        wb1.write(out);
-        out.close();
-
-        // Check the package contains what we'd expect it to
-        OPCPackage pkg = OPCPackage.open(file.toString());
-        PackagePart wbRelPart =
-            pkg.getPart(PackagingURIHelper.createPartName("/xl/_rels/workbook.xml.rels"));
-        assertNotNull(wbRelPart);
-        assertTrue(wbRelPart.isRelationshipPart());
-        assertEquals(ContentTypes.RELATIONSHIPS_PART, wbRelPart.getContentType());
-
-        PackagePart wbPart =
-            pkg.getPart(PackagingURIHelper.createPartName("/xl/workbook.xml"));
-        // Links to the three sheets, shared strings and styles
-        assertTrue(wbPart.hasRelationships());
-        assertEquals(5, wbPart.getRelationships().size());
-        wb1.close();
-
-        // Load back the XSSFWorkbook
-        @SuppressWarnings("resource")
-        XSSFWorkbook wb2 = new XSSFWorkbook(pkg);
-        assertEquals(3, wb2.getNumberOfSheets());
-        assertNotNull(wb2.getSheetAt(0));
-        assertNotNull(wb2.getSheetAt(1));
-        assertNotNull(wb2.getSheetAt(2));
-
-        assertNotNull(wb2.getSharedStringSource());
-        assertNotNull(wb2.getStylesSource());
-
-        assertEquals(0, wb2.getSheetAt(0).getFirstRowNum());
-        assertEquals(1, wb2.getSheetAt(0).getLastRowNum());
-        assertEquals(0, wb2.getSheetAt(1).getFirstRowNum());
-        assertEquals(0, wb2.getSheetAt(1).getLastRowNum());
-        assertEquals(0, wb2.getSheetAt(2).getFirstRowNum());
-        assertEquals(0, wb2.getSheetAt(2).getLastRowNum());
-
-        sheet1 = wb2.getSheetAt(0);
-        assertEquals(1.2, sheet1.getRow(0).getCell(0).getNumericCellValue(), 0.0001);
-        assertEquals("hello world", sheet1.getRow(1).getCell(0).getRichStringCellValue().getString());
-
-        pkg.close();
-    }
-
-    @Test
-    public void existing() throws Exception {
-
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx");
-        assertNotNull(workbook.getSharedStringSource());
-        assertNotNull(workbook.getStylesSource());
-
-        // And check a few low level bits too
-        OPCPackage pkg = OPCPackage.open(HSSFTestDataSamples.openSampleFileStream("Formatting.xlsx"));
-        PackagePart wbPart =
-            pkg.getPart(PackagingURIHelper.createPartName("/xl/workbook.xml"));
-
-        // Links to the three sheets, shared, styles and themes
-        assertTrue(wbPart.hasRelationships());
-        assertEquals(6, wbPart.getRelationships().size());
-
-        pkg.close();
-        workbook.close();
-    }
-
-    @Test
-    public void getCellStyleAt() throws IOException{
-         XSSFWorkbook workbook = new XSSFWorkbook();
-         try {
-            short i = 0;
-            //get default style
-            CellStyle cellStyleAt = workbook.getCellStyleAt(i);
-            assertNotNull(cellStyleAt);
-
-            //get custom style
-            StylesTable styleSource = workbook.getStylesSource();
-            XSSFCellStyle customStyle = new XSSFCellStyle(styleSource);
-            XSSFFont font = new XSSFFont();
-            font.setFontName("Verdana");
-            customStyle.setFont(font);
-            int x = styleSource.putStyle(customStyle);
-            cellStyleAt = workbook.getCellStyleAt((short)x);
-            assertNotNull(cellStyleAt);
-         } finally {
-             workbook.close();
-         }
-    }
-
-    @Test
-    public void getFontAt() throws IOException{
-         XSSFWorkbook workbook = new XSSFWorkbook();
-         try {
-            StylesTable styleSource = workbook.getStylesSource();
-            short i = 0;
-            //get default font
-            Font fontAt = workbook.getFontAt(i);
-            assertNotNull(fontAt);
-
-            //get customized font
-            XSSFFont customFont = new XSSFFont();
-            customFont.setItalic(true);
-            int x = styleSource.putFont(customFont);
-            fontAt = workbook.getFontAt((short)x);
-            assertNotNull(fontAt);
-         } finally {
-             workbook.close();
-         }
-    }
-
-    @Test
-    public void getNumCellStyles() throws IOException{
-         XSSFWorkbook workbook = new XSSFWorkbook();
-         try {
-            //get default cellStyles
-            assertEquals(1, workbook.getNumCellStyles());
-         } finally {
-             workbook.close();
-         }
-    }
-
-    @Test
-    public void loadSave() throws IOException {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx");
-        assertEquals(3, workbook.getNumberOfSheets());
-        assertEquals("dd/mm/yyyy", workbook.getSheetAt(0).getRow(1).getCell(0).getRichStringCellValue().getString());
-        assertNotNull(workbook.getSharedStringSource());
-        assertNotNull(workbook.getStylesSource());
-
-        // Write out, and check
-        // Load up again, check all still there
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertEquals(3, wb2.getNumberOfSheets());
-        assertNotNull(wb2.getSheetAt(0));
-        assertNotNull(wb2.getSheetAt(1));
-        assertNotNull(wb2.getSheetAt(2));
-
-        assertEquals("dd/mm/yyyy", wb2.getSheetAt(0).getRow(1).getCell(0).getRichStringCellValue().getString());
-        assertEquals("yyyy/mm/dd", wb2.getSheetAt(0).getRow(2).getCell(0).getRichStringCellValue().getString());
-        assertEquals("yyyy-mm-dd", wb2.getSheetAt(0).getRow(3).getCell(0).getRichStringCellValue().getString());
-        assertEquals("yy/mm/dd", wb2.getSheetAt(0).getRow(4).getCell(0).getRichStringCellValue().getString());
-        assertNotNull(wb2.getSharedStringSource());
-        assertNotNull(wb2.getStylesSource());
-
-        workbook.close();
-        wb2.close();
-    }
-
-    @Test
-    public void styles() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx");
-
-        StylesTable ss = wb1.getStylesSource();
-        assertNotNull(ss);
-        StylesTable st = ss;
-
-        // Has 8 number formats
-        assertEquals(8, st.getNumDataFormats());
-        // Has 2 fonts
-        assertEquals(2, st.getFonts().size());
-        // Has 2 fills
-        assertEquals(2, st.getFills().size());
-        // Has 1 border
-        assertEquals(1, st.getBorders().size());
-
-        // Add two more styles
-        assertEquals(StylesTable.FIRST_CUSTOM_STYLE_ID + 8,
-                st.putNumberFormat("testFORMAT"));
-        assertEquals(StylesTable.FIRST_CUSTOM_STYLE_ID + 8,
-                st.putNumberFormat("testFORMAT"));
-        assertEquals(StylesTable.FIRST_CUSTOM_STYLE_ID + 9,
-                st.putNumberFormat("testFORMAT2"));
-        assertEquals(10, st.getNumDataFormats());
-
-
-        // Save, load back in again, and check
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        ss = wb2.getStylesSource();
-        assertNotNull(ss);
-
-        assertEquals(10, st.getNumDataFormats());
-        assertEquals(2, st.getFonts().size());
-        assertEquals(2, st.getFills().size());
-        assertEquals(1, st.getBorders().size());
-        wb2.close();
-    }
-
-    @Test
-    public void incrementSheetId() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            int sheetId = (int)wb.createSheet().sheet.getSheetId();
-            assertEquals(1, sheetId);
-            sheetId = (int)wb.createSheet().sheet.getSheetId();
-            assertEquals(2, sheetId);
-
-            //test file with gaps in the sheetId sequence
-            XSSFWorkbook wbBack = XSSFTestDataSamples.openSampleWorkbook("47089.xlsm");
-            try {
-                int lastSheetId = (int)wbBack.getSheetAt(wbBack.getNumberOfSheets() - 1).sheet.getSheetId();
-                sheetId = (int)wbBack.createSheet().sheet.getSheetId();
-                assertEquals(lastSheetId+1, sheetId);
-            } finally {
-                wbBack.close();
-            }
-        } finally {
-            wb.close();
-        }
-    }
-
-    /**
-     *  Test setting of core properties such as Title and Author
-     * @throws IOException
-     */
-    @Test
-    public void workbookProperties() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        try {
-            POIXMLProperties props = workbook.getProperties();
-            assertNotNull(props);
-            //the Application property must be set for new workbooks, see Bugzilla #47559
-            assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
-
-            PackagePropertiesPart opcProps = props.getCoreProperties().getUnderlyingProperties();
-            assertNotNull(opcProps);
-
-            opcProps.setTitleProperty("Testing Bugzilla #47460");
-            assertEquals("Apache POI", opcProps.getCreatorProperty().getValue());
-            opcProps.setCreatorProperty("poi-dev@poi.apache.org");
-
-            XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-            assertEquals("Apache POI", wbBack.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
-            opcProps = wbBack.getProperties().getCoreProperties().getUnderlyingProperties();
-            assertEquals("Testing Bugzilla #47460", opcProps.getTitleProperty().getValue());
-            assertEquals("poi-dev@poi.apache.org", opcProps.getCreatorProperty().getValue());
-            wbBack.close();
-        } finally {
-            workbook.close();
-        }
-    }
-
-    /**
-     * Verify that the attached test data was not modified. If this test method
-     * fails, the test data is not working properly.
-     */
-    @Test
-    public void bug47668() throws Exception {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("47668.xlsx");
-        List<XSSFPictureData> allPictures = workbook.getAllPictures();
-        assertEquals(1, allPictures.size());
-
-        PackagePartName imagePartName = PackagingURIHelper
-                .createPartName("/xl/media/image1.jpeg");
-        PackagePart imagePart = workbook.getPackage().getPart(imagePartName);
-        assertNotNull(imagePart);
-
-        for (XSSFPictureData pictureData : allPictures) {
-            PackagePart picturePart = pictureData.getPackagePart();
-            assertSame(imagePart, picturePart);
-        }
-
-        XSSFSheet sheet0 = workbook.getSheetAt(0);
-        XSSFDrawing drawing0 = sheet0.createDrawingPatriarch();
-        XSSFPictureData pictureData0 = (XSSFPictureData) drawing0.getRelations().get(0);
-        byte[] data0 = pictureData0.getData();
-        CRC32 crc0 = new CRC32();
-        crc0.update(data0);
-
-        XSSFSheet sheet1 = workbook.getSheetAt(1);
-        XSSFDrawing drawing1 = sheet1.createDrawingPatriarch();
-        XSSFPictureData pictureData1 = (XSSFPictureData) drawing1.getRelations().get(0);
-        byte[] data1 = pictureData1.getData();
-        CRC32 crc1 = new CRC32();
-        crc1.update(data1);
-
-        assertEquals(crc0.getValue(), crc1.getValue());
-        workbook.close();
-    }
-
-    /**
-     * When deleting a sheet make sure that we adjust sheet indices of named ranges
-     */
-    @Test
-    public void bug47737() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("47737.xlsx");
-        assertEquals(2, wb.getNumberOfNames());
-        assertNotNull(wb.getCalculationChain());
-
-        XSSFName nm0 = wb.getNameAt(0);
-        assertTrue(nm0.getCTName().isSetLocalSheetId());
-        assertEquals(0, nm0.getCTName().getLocalSheetId());
-
-        XSSFName nm1 = wb.getNameAt(1);
-        assertTrue(nm1.getCTName().isSetLocalSheetId());
-        assertEquals(1, nm1.getCTName().getLocalSheetId());
-
-        wb.removeSheetAt(0);
-        assertEquals(1, wb.getNumberOfNames());
-        XSSFName nm2 = wb.getNameAt(0);
-        assertTrue(nm2.getCTName().isSetLocalSheetId());
-        assertEquals(0, nm2.getCTName().getLocalSheetId());
-        //calculation chain is removed as well
-        assertNull(wb.getCalculationChain());
-        wb.close();
-
-    }
-
-    /**
-     * Problems with XSSFWorkbook.removeSheetAt when workbook contains charts
-     */
-    @Test
-    public void bug47813() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("47813.xlsx");
-        assertEquals(3, wb1.getNumberOfSheets());
-        assertNotNull(wb1.getCalculationChain());
-
-        assertEquals("Numbers", wb1.getSheetName(0));
-        //the second sheet is of type 'chartsheet'
-        assertEquals("Chart", wb1.getSheetName(1));
-        assertTrue(wb1.getSheetAt(1) instanceof XSSFChartSheet);
-        assertEquals("SomeJunk", wb1.getSheetName(2));
-
-        wb1.removeSheetAt(2);
-        assertEquals(2, wb1.getNumberOfSheets());
-        assertNull(wb1.getCalculationChain());
-
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        assertEquals(2, wb2.getNumberOfSheets());
-        assertNull(wb2.getCalculationChain());
-
-        assertEquals("Numbers", wb2.getSheetName(0));
-        assertEquals("Chart", wb2.getSheetName(1));
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Problems with the count of the number of styles
-     *  coming out wrong
-     */
-    @Test
-    public void bug49702() throws IOException {
-        // First try with a new file
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-
-        // Should have one style
-        assertEquals(1, wb1.getNumCellStyles());
-        wb1.getCellStyleAt((short)0);
-        try {
-            wb1.getCellStyleAt((short)1);
-            fail("Shouldn't be able to get style at 1 that doesn't exist");
-        } catch(IndexOutOfBoundsException e) {}
-
-        // Add another one
-        CellStyle cs = wb1.createCellStyle();
-        cs.setDataFormat((short)11);
-
-        // Re-check
-        assertEquals(2, wb1.getNumCellStyles());
-        wb1.getCellStyleAt((short)0);
-        wb1.getCellStyleAt((short)1);
-        try {
-            wb1.getCellStyleAt((short)2);
-            fail("Shouldn't be able to get style at 2 that doesn't exist");
-        } catch(IndexOutOfBoundsException e) {}
-
-        // Save and reload
-        XSSFWorkbook nwb = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        assertEquals(2, nwb.getNumCellStyles());
-        nwb.getCellStyleAt((short)0);
-        nwb.getCellStyleAt((short)1);
-        try {
-            nwb.getCellStyleAt((short)2);
-            fail("Shouldn't be able to get style at 2 that doesn't exist");
-        } catch(IndexOutOfBoundsException e) {}
-
-        // Now with an existing file
-        XSSFWorkbook wb2 = XSSFTestDataSamples.openSampleWorkbook("sample.xlsx");
-        assertEquals(3, wb2.getNumCellStyles());
-        wb2.getCellStyleAt((short)0);
-        wb2.getCellStyleAt((short)1);
-        wb2.getCellStyleAt((short)2);
-        try {
-            wb2.getCellStyleAt((short)3);
-            fail("Shouldn't be able to get style at 3 that doesn't exist");
-        } catch(IndexOutOfBoundsException e) {}
-
-        wb2.close();
-        wb1.close();
-        nwb.close();
-    }
-
-    @Test
-    public void recalcId() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            assertFalse(wb.getForceFormulaRecalculation());
-            CTWorkbook ctWorkbook = wb.getCTWorkbook();
-            assertFalse(ctWorkbook.isSetCalcPr());
-
-            wb.setForceFormulaRecalculation(true); // resets the EngineId flag to zero
-
-            CTCalcPr calcPr = ctWorkbook.getCalcPr();
-            assertNotNull(calcPr);
-            assertEquals(0, (int) calcPr.getCalcId());
-
-            calcPr.setCalcId(100);
-            assertTrue(wb.getForceFormulaRecalculation());
-
-            wb.setForceFormulaRecalculation(true); // resets the EngineId flag to zero
-            assertEquals(0, (int) calcPr.getCalcId());
-            assertFalse(wb.getForceFormulaRecalculation());
-
-            // calcMode="manual" is unset when forceFormulaRecalculation=true
-            calcPr.setCalcMode(STCalcMode.MANUAL);
-            wb.setForceFormulaRecalculation(true);
-            assertEquals(STCalcMode.AUTO, calcPr.getCalcMode());
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void changeSheetNameWithSharedFormulas() throws IOException {
-        changeSheetNameWithSharedFormulas("shared_formulas.xlsx");
-    }
-
-    @Test
-    public void columnWidthPOI52233() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        XSSFRow row = sheet.createRow(0);
-        XSSFCell cell = row.createCell(0);
-        cell.setCellValue("hello world");
-
-        sheet = workbook.createSheet();
-        sheet.setColumnWidth(4, 5000);
-        sheet.setColumnWidth(5, 5000);
-
-        sheet.groupColumn((short) 4, (short) 5);
-
-        accessWorkbook(workbook);
-
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        try {
-            workbook.write(stream);
-        } finally {
-            stream.close();
-        }
-
-        accessWorkbook(workbook);
-        workbook.close();
-    }
-
-    private void accessWorkbook(XSSFWorkbook workbook) {
-        workbook.getSheetAt(1).setColumnGroupCollapsed(4, true);
-        workbook.getSheetAt(1).setColumnGroupCollapsed(4, false);
-
-        assertEquals("hello world", workbook.getSheetAt(0).getRow(0).getCell(0).getStringCellValue());
-        assertEquals(2048, workbook.getSheetAt(0).getColumnWidth(0)); // <-works
-    }
-
-    @Test
-    public void bug48495() throws IOException {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("48495.xlsx");
-
-        assertSheetOrder(wb, "Sheet1");
-
-        Sheet sheet = wb.getSheetAt(0);
-        sheet.shiftRows(2, sheet.getLastRowNum(), 1, true, false);
-        Row newRow = sheet.getRow(2);
-        if (newRow == null) newRow = sheet.createRow(2);
-        newRow.createCell(0).setCellValue(" Another Header");
-        wb.cloneSheet(0);
-
-        assertSheetOrder(wb, "Sheet1", "Sheet1 (2)");
-
-        //            FileOutputStream fileOut = new FileOutputStream("/tmp/bug48495.xlsx");
-//            try {
-//                wb.write(fileOut);
-//            } finally {
-//                fileOut.close();
-//            }
-
-        Workbook read = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertNotNull(read);
-        assertSheetOrder(read, "Sheet1", "Sheet1 (2)");
-        read.close();
-        wb.close();
-    }
-
-    @Test
-    public void bug47090a() throws IOException {
-        Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("47090.xlsx");
-        assertSheetOrder(workbook, "Sheet1", "Sheet2");
-        workbook.removeSheetAt(0);
-        assertSheetOrder(workbook, "Sheet2");
-        workbook.createSheet();
-        assertSheetOrder(workbook, "Sheet2", "Sheet1");
-        Workbook read = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertSheetOrder(read, "Sheet2", "Sheet1");
-        read.close();
-        workbook.close();
-    }
-
-    @Test
-    public void bug47090b() throws IOException {
-        Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("47090.xlsx");
-        assertSheetOrder(workbook, "Sheet1", "Sheet2");
-        workbook.removeSheetAt(1);
-        assertSheetOrder(workbook, "Sheet1");
-        workbook.createSheet();
-        assertSheetOrder(workbook, "Sheet1", "Sheet0");        // Sheet0 because it uses "Sheet" + sheets.size() as starting point!
-        Workbook read = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertSheetOrder(read, "Sheet1", "Sheet0");
-        read.close();
-        workbook.close();
-    }
-
-    @Test
-    public void bug47090c() throws IOException {
-        Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("47090.xlsx");
-        assertSheetOrder(workbook, "Sheet1", "Sheet2");
-        workbook.removeSheetAt(0);
-        assertSheetOrder(workbook, "Sheet2");
-        workbook.cloneSheet(0);
-        assertSheetOrder(workbook, "Sheet2", "Sheet2 (2)");
-        Workbook read = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertSheetOrder(read, "Sheet2", "Sheet2 (2)");
-        read.close();
-        workbook.close();
-    }
-
-    @Test
-    public void bug47090d() throws IOException {
-        Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("47090.xlsx");
-        assertSheetOrder(workbook, "Sheet1", "Sheet2");
-        workbook.createSheet();
-        assertSheetOrder(workbook, "Sheet1", "Sheet2", "Sheet0");
-        workbook.removeSheetAt(0);
-        assertSheetOrder(workbook, "Sheet2", "Sheet0");
-        workbook.createSheet();
-        assertSheetOrder(workbook, "Sheet2", "Sheet0", "Sheet1");
-        Workbook read = XSSFTestDataSamples.writeOutAndReadBack(workbook);
-        assertSheetOrder(read, "Sheet2", "Sheet0", "Sheet1");
-        read.close();
-        workbook.close();
-    }
-
-    @Test
-    public void bug51158() throws IOException {
-        // create a workbook
-        final XSSFWorkbook wb1 = new XSSFWorkbook();
-        XSSFSheet sheet = wb1.createSheet("Test Sheet");
-        XSSFRow row = sheet.createRow(2);
-        XSSFCell cell = row.createCell(3);
-        cell.setCellValue("test1");
-
-        //XSSFCreationHelper helper = workbook.getCreationHelper();
-        //cell.setHyperlink(helper.createHyperlink(0));
-
-        XSSFComment comment = sheet.createDrawingPatriarch().createCellComment(new XSSFClientAnchor());
-        assertNotNull(comment);
-        comment.setString("some comment");
-
-//        CellStyle cs = workbook.createCellStyle();
-//        cs.setShrinkToFit(false);
-//        row.createCell(0).setCellStyle(cs);
-
-        // write the first excel file
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        assertNotNull(wb2);
-        sheet = wb2.getSheetAt(0);
-        row = sheet.getRow(2);
-        assertEquals("test1", row.getCell(3).getStringCellValue());
-        assertNull(row.getCell(4));
-
-        // add a new cell to the sheet
-        cell = row.createCell(4);
-        cell.setCellValue("test2");
-
-        // write the second excel file
-        XSSFWorkbook wb3 = XSSFTestDataSamples.writeOutAndReadBack(wb2);
-        assertNotNull(wb3);
-        sheet = wb3.getSheetAt(0);
-        row = sheet.getRow(2);        
-        
-        assertEquals("test1", row.getCell(3).getStringCellValue());
-        assertEquals("test2", row.getCell(4).getStringCellValue());
-        wb3.close();
-        wb2.close();
-        wb1.close();
-    }
-
-    @Test
-    public void bug51158a() throws IOException {
-        // create a workbook
-        final XSSFWorkbook workbook = new XSSFWorkbook();
-        try {
-            workbook.createSheet("Test Sheet");
-
-            XSSFSheet sheetBack = workbook.getSheetAt(0);
-
-            // committing twice did add the XML twice without clearing the part in between
-            sheetBack.commit();
-
-            // ensure that a memory based package part does not have lingering data from previous commit() calls
-            if(sheetBack.getPackagePart() instanceof MemoryPackagePart) {
-                ((MemoryPackagePart)sheetBack.getPackagePart()).clear();
-            }
-
-            sheetBack.commit();
-
-            String str = new String(IOUtils.toByteArray(sheetBack.getPackagePart().getInputStream()), "UTF-8");
-
-            assertEquals(1, countMatches(str, "<worksheet"));
-        } finally {
-            workbook.close();
-        }
-    }
-
-    private static final int INDEX_NOT_FOUND = -1;
-
-    private static boolean isEmpty(CharSequence cs) {
-        return cs == null || cs.length() == 0;
-    }
-
-    private static int countMatches(CharSequence str, CharSequence sub) {
-        if (isEmpty(str) || isEmpty(sub)) {
-            return 0;
-        }
-        int count = 0;
-        int idx = 0;
-        while ((idx = indexOf(str, sub, idx)) != INDEX_NOT_FOUND) {
-            count++;
-            idx += sub.length();
-        }
-        return count;
-    }
-
-    private static int indexOf(CharSequence cs, CharSequence searchChar, int start) {
-        return cs.toString().indexOf(searchChar.toString(), start);
-    }
-
-    @Test
-    public void testAddPivotCache() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            CTWorkbook ctWb = wb.getCTWorkbook();
-            CTPivotCache pivotCache = wb.addPivotCache("0");
-            //Ensures that pivotCaches is initiated
-            assertTrue(ctWb.isSetPivotCaches());
-            assertSame(pivotCache, ctWb.getPivotCaches().getPivotCacheArray(0));
-            assertEquals("0", pivotCache.getId());
-        } finally {
-            wb.close();
-        }
-    }
-
-    protected void setPivotData(XSSFWorkbook wb){
-        XSSFSheet sheet = wb.createSheet();
-
-        Row row1 = sheet.createRow(0);
-        // Create a cell and put a value in it.
-        Cell cell = row1.createCell(0);
-        cell.setCellValue("Names");
-        Cell cell2 = row1.createCell(1);
-        cell2.setCellValue("#");
-        Cell cell7 = row1.createCell(2);
-        cell7.setCellValue("Data");
-
-        Row row2 = sheet.createRow(1);
-        Cell cell3 = row2.createCell(0);
-        cell3.setCellValue("Jan");
-        Cell cell4 = row2.createCell(1);
-        cell4.setCellValue(10);
-        Cell cell8 = row2.createCell(2);
-        cell8.setCellValue("Apa");
-
-        Row row3 = sheet.createRow(2);
-        Cell cell5 = row3.createCell(0);
-        cell5.setCellValue("Ben");
-        Cell cell6 = row3.createCell(1);
-        cell6.setCellValue(9);
-        Cell cell9 = row3.createCell(2);
-        cell9.setCellValue("Bepa");
-
-        AreaReference source = new AreaReference("A1:B2", SpreadsheetVersion.EXCEL2007);
-        sheet.createPivotTable(source, new CellReference("H5"));
-    }
-
-    @Test
-    public void testLoadWorkbookWithPivotTable() throws Exception {
-        File file = TempFile.createTempFile("ooxml-pivottable", ".xlsx");
-
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            setPivotData(wb);
-
-            FileOutputStream fileOut = new FileOutputStream(file);
-            wb.write(fileOut);
-            fileOut.close();
-        } finally {
-            wb.close();
-        }
-
-        XSSFWorkbook wb2 = (XSSFWorkbook) WorkbookFactory.create(file);
-        try {
-            assertTrue(wb2.getPivotTables().size() == 1);
-        } finally {
-            wb2.close();
-        }
-
-        assertTrue(file.delete());
-    }
-
-    @Test
-    public void testAddPivotTableToWorkbookWithLoadedPivotTable() throws Exception {
-        File file = TempFile.createTempFile("ooxml-pivottable", ".xlsx");
-
-        XSSFWorkbook wb = new XSSFWorkbook();
-        try {
-            setPivotData(wb);
-
-            FileOutputStream fileOut = new FileOutputStream(file);
-            try {
-                wb.write(fileOut);
-            } finally {
-                fileOut.close();
-            }
-        } finally {
-            wb.close();
-        }
-
-        XSSFWorkbook wb2 = (XSSFWorkbook) WorkbookFactory.create(file);
-        try {
-            setPivotData(wb2);
-            assertTrue(wb2.getPivotTables().size() == 2);
-        } finally {
-            wb2.close();
-        }
-
-        assertTrue(file.delete());
-    }
-
-    @Test
-    public void testSetFirstVisibleTab_57373() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-
-        try {
-            /*Sheet sheet1 =*/ wb.createSheet();
-            Sheet sheet2 = wb.createSheet();
-            int idx2 = wb.getSheetIndex(sheet2);
-            Sheet sheet3 = wb.createSheet();
-            int idx3 = wb.getSheetIndex(sheet3);
-
-            // add many sheets so "first visible" is relevant
-            for(int i = 0; i < 30;i++) {
-                wb.createSheet();
-            }
-
-            wb.setFirstVisibleTab(idx2);
-            wb.setActiveSheet(idx3);
-
-            //wb.write(new FileOutputStream(new File("C:\\temp\\test.xlsx")));
-
-            assertEquals(idx2, wb.getFirstVisibleTab());
-            assertEquals(idx3, wb.getActiveSheetIndex());
-
-            Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
-
-            sheet2 = wbBack.getSheetAt(idx2);
-            sheet3 = wbBack.getSheetAt(idx3);
-            assertEquals(idx2, wb.getFirstVisibleTab());
-            assertEquals(idx3, wb.getActiveSheetIndex());
-            wbBack.close();
-        } finally {
-            wb.close();
-        }
-    }
-
-    /**
-     * Tests that we can save a workbook with macros and reload it.
-     */
-    @Test
-    public void testSetVBAProject() throws Exception {
-        File file;
-        final byte[] allBytes = new byte[256];
-        for (int i = 0; i < 256; i++) {
-            allBytes[i] = (byte) (i - 128);
-        }
-
-        XSSFWorkbook wb1 = new XSSFWorkbook();
-        wb1.createSheet();
-        wb1.setVBAProject(new ByteArrayInputStream(allBytes));
-        file = TempFile.createTempFile("poi-", ".xlsm");
-        OutputStream out = new FileOutputStream(file);
-        wb1.write(out);
-        out.close();
-        wb1.close();
-
-        // Check the package contains what we'd expect it to
-        OPCPackage pkg = OPCPackage.open(file.toString());
-        PackagePart wbPart = pkg.getPart(PackagingURIHelper.createPartName("/xl/workbook.xml"));
-        assertTrue(wbPart.hasRelationships());
-        final PackageRelationshipCollection relationships = wbPart.getRelationships().getRelationships(XSSFRelation.VBA_MACROS.getRelation());
-        assertEquals(1, relationships.size());
-        assertEquals(XSSFRelation.VBA_MACROS.getDefaultFileName(), relationships.getRelationship(0).getTargetURI().toString());
-        PackagePart vbaPart = pkg.getPart(PackagingURIHelper.createPartName(XSSFRelation.VBA_MACROS.getDefaultFileName()));
-        assertNotNull(vbaPart);
-        assertFalse(vbaPart.isRelationshipPart());
-        assertEquals(XSSFRelation.VBA_MACROS.getContentType(), vbaPart.getContentType());
-        final byte[] fromFile = IOUtils.toByteArray(vbaPart.getInputStream());
-        assertArrayEquals(allBytes, fromFile);
-
-        // Load back the XSSFWorkbook just to check nothing explodes
-        @SuppressWarnings("resource")
-        XSSFWorkbook wb2 = new XSSFWorkbook(pkg);
-        assertEquals(1, wb2.getNumberOfSheets());
-        assertEquals(XSSFWorkbookType.XLSM, wb2.getWorkbookType());
-        pkg.close();
-    }
-
-    @Test
-    public void testBug54399() throws IOException {
-        XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("54399.xlsx");
-
-        for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
-          workbook.setSheetName(i, "SheetRenamed" + (i + 1));
-        }
-
-        workbook.close();
-    }
-
-    /**
-     *  Iterator<XSSFSheet> XSSFWorkbook.iterator was committed in r700472 on 2008-09-30
-     *  and has been replaced with Iterator<Sheet> XSSFWorkbook.iterator
-     *
-     *  In order to make code for looping over sheets in workbooks standard, regardless
-     *  of the type of workbook (HSSFWorkbook, XSSFWorkbook, SXSSFWorkbook), the previously
-     *  available Iterator<XSSFSheet> iterator and Iterator<XSSFSheet> sheetIterator
-     *  have been replaced with Iterator<Sheet>  {@link #iterator} and
-     *  Iterator<Sheet> {@link #sheetIterator}. This makes iterating over sheets in a workbook
-     *  similar to iterating over rows in a sheet and cells in a row.
-     *
-     *  Note: this breaks backwards compatibility! Existing codebases will need to
-     *  upgrade their code with either of the following options presented in this test case.
-     *
-     */
-    @SuppressWarnings("unchecked")
-    @Test
-    public void bug58245_XSSFSheetIterator() throws IOException {
-        final XSSFWorkbook wb = new XSSFWorkbook();
-        wb.createSheet();
-
-        // =====================================================================
-        // Case 1: Existing code uses XSSFSheet for-each loop
-        // =====================================================================
-        // Original code (no longer valid)
-        /*
-        for (XSSFSheet sh : wb) {
-            sh.createRow(0);
-        }
-        */
-
-        // Option A:
-        for (XSSFSheet sh : (Iterable<XSSFSheet>) (Iterable<? extends Sheet>) wb) {
-            sh.createRow(0);
-        }
-
-        // Option B (preferred for new code):
-        for (Sheet sh : wb) {
-            sh.createRow(0);
-        }
-
-        // =====================================================================
-        // Case 2: Existing code creates an iterator variable
-        // =====================================================================
-        // Original code (no longer valid)
-        /*
-        Iterator<XSSFSheet> it = wb.iterator();
-        XSSFSheet sh = it.next();
-        sh.createRow(0);
-        */
-
-        // Option A:
-        {
-            Iterator<XSSFSheet> it = (Iterator<XSSFSheet>) (Iterator<? extends Sheet>) wb.iterator();
-            XSSFSheet sh = it.next();
-            sh.createRow(0);
-        }
-
-        // Option B:
-        {
-            @SuppressWarnings("deprecation")
-            Iterator<XSSFSheet> it = wb.xssfSheetIterator();
-            XSSFSheet sh = it.next();
-            sh.createRow(0);
-        }
-
-        // Option C (preferred for new code):
-        {
-            Iterator<Sheet> it = wb.iterator();
-            Sheet sh = it.next();
-            sh.createRow(0);
-        }
-        wb.close();
-    }
-
-    @Test
-    public void testBug56957CloseWorkbook() throws Exception {
-        File file = TempFile.createTempFile("TestBug56957_", ".xlsx");
-        final Date dateExp = LocaleUtil.getLocaleCalendar(2014, 10, 9).getTime();
-
-        try {
-            // as the file is written to, we make a copy before actually working on it
-            FileHelper.copyFile(HSSFTestDataSamples.getSampleFile("56957.xlsx"), file);
-
-            assertTrue(file.exists());
-
-            // read-only mode works!
-            Workbook workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ));
-            Date dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getDateCellValue();
-            assertEquals(dateExp, dateAct);
-            workbook.close();
-            workbook = null;
-
-            workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ));
-            dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getDateCellValue();
-            assertEquals(dateExp, dateAct);
-            workbook.close();
-            workbook = null;
-
-            // now check read/write mode
-            workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ_WRITE));
-            dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getDateCellValue();
-            assertEquals(dateExp, dateAct);
-            workbook.close();
-            workbook = null;
-
-            workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ_WRITE));
-            dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getDateCellValue();
-            assertEquals(dateExp, dateAct);
-            workbook.close();
-            workbook = null;
-        } finally {
-            assertTrue(file.exists());
-            assertTrue(file.delete());
-        }
-    }
-
-    @Test
-    public void closeDoesNotModifyWorkbook() throws IOException, InvalidFormatException {
-        final String filename = "SampleSS.xlsx";
-        final File file = POIDataSamples.getSpreadSheetInstance().getFile(filename);
-        Workbook wb;
-        
-        // Some tests commented out because close() modifies the file
-        // See bug 58779
-        
-        // String
-        //wb = new XSSFWorkbook(file.getPath());
-        //assertCloseDoesNotModifyFile(filename, wb);
-        
-        // File
-        //wb = new XSSFWorkbook(file);
-        //assertCloseDoesNotModifyFile(filename, wb);
-        
-        // InputStream
-        wb = new XSSFWorkbook(new FileInputStream(file));
-        assertCloseDoesNotModifyFile(filename, wb);
-        
-        // OPCPackage
-        //wb = new XSSFWorkbook(OPCPackage.open(file));
-        //assertCloseDoesNotModifyFile(filename, wb);
-    }
-
-    @Test
-    public void testCloseBeforeWrite() throws IOException {
-        Workbook wb = new XSSFWorkbook();
-        wb.createSheet("somesheet");
-
-        // test what happens if we close the Workbook before we write it out
-        wb.close();
-
-        try {
-            XSSFTestDataSamples.writeOutAndReadBack(wb);
-            fail("Expecting IOException here");
-        } catch (RuntimeException e) {
-            // expected here
-            assertTrue("Had: " + e.getCause(), e.getCause() instanceof IOException);
-        }
-    }
-
-    /**
-     * See bug #57840 test data tables
-     */
-    @Test
-    public void getTable() throws IOException {
-       XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithTable.xlsx");
-       XSSFTable table1 = wb.getTable("Tabella1");
-       assertNotNull("Tabella1 was not found in workbook", table1);
-       assertEquals("Table name", "Tabella1", table1.getName());
-       assertEquals("Sheet name", "Foglio1", table1.getSheetName());
-
-       // Table lookup should be case-insensitive
-       assertSame("Case insensitive table name lookup", table1, wb.getTable("TABELLA1"));
-
-       // If workbook does not contain any data tables matching the provided name, getTable should return null
-       assertNull("Null table name should not throw NPE", wb.getTable(null));
-       assertNull("Should not be able to find non-existent table", wb.getTable("Foglio1"));
-
-       // If a table is added after getTable is called it should still be reachable by XSSFWorkbook.getTable
-       // This test makes sure that if any caching is done that getTable never uses a stale cache
-       XSSFTable table2 = wb.getSheet("Foglio2").createTable();
-       table2.setName("Table2");
-       assertSame("Did not find Table2", table2, wb.getTable("Table2"));
-       
-       // If table name is modified after getTable is called, the table can only be found by its new name
-       // This test makes sure that if any caching is done that getTable never uses a stale cache
-       table1.setName("Table1");
-       assertSame("Did not find Tabella1 renamed to Table1", table1, wb.getTable("TABLE1"));
-
-       wb.close();
-    }
-
-    @Test
-    public void testRemoveSheet() throws IOException {
-        // Test removing a sheet maintains the named ranges correctly
-        XSSFWorkbook wb = new XSSFWorkbook();
-        wb.createSheet("Sheet1");
-        wb.createSheet("Sheet2");
-
-        XSSFName sheet1Name = wb.createName();
-        sheet1Name.setNameName("name1");
-        sheet1Name.setSheetIndex(0);
-        sheet1Name.setRefersToFormula("Sheet1!$A$1");
-
-        XSSFName sheet2Name = wb.createName();
-        sheet2Name.setNameName("name1");
-        sheet2Name.setSheetIndex(1);
-        sheet2Name.setRefersToFormula("Sheet2!$A$1");
-
-        assertTrue(wb.getAllNames().contains(sheet1Name));
-        assertTrue(wb.getAllNames().contains(sheet2Name));
-
-        assertEquals(2, wb.getNames("name1").size());
-        assertEquals(sheet1Name, wb.getNames("name1").get(0));
-        assertEquals(sheet2Name, wb.getNames("name1").get(1));
-
-        // Remove sheet1, we should only have sheet2Name now
-        wb.removeSheetAt(0);
-
-        assertFalse(wb.getAllNames().contains(sheet1Name));
-        assertTrue(wb.getAllNames().contains(sheet2Name));
-        assertEquals(1, wb.getNames("name1").size());
-        assertEquals(sheet2Name, wb.getNames("name1").get(0));
-
-        // Check by index as well for sanity
-        assertEquals(1, wb.getNumberOfNames());
-        assertEquals(0, wb.getNameIndex("name1"));
-        assertEquals(sheet2Name, wb.getNameAt(0));
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
deleted file mode 100644
index 64ce92b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.charts.*;
-import org.apache.poi.xssf.usermodel.*;
-
-public final class TestXSSFCategoryAxis extends TestCase {
- 
-	public void testAccessMethods() throws Exception {
-		XSSFWorkbook wb = new XSSFWorkbook();
-		XSSFSheet sheet = wb.createSheet();
-		XSSFDrawing drawing = sheet.createDrawingPatriarch();
-		XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		XSSFChart chart = drawing.createChart(anchor);
-		XSSFCategoryAxis axis = chart.getChartAxisFactory().createCategoryAxis(AxisPosition.BOTTOM);
-
-		axis.setCrosses(AxisCrosses.AUTO_ZERO);
-		assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
-
-		assertEquals(chart.getAxis().size(), 1);
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
deleted file mode 100644
index 41e02b1..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.charts.*;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.*;
-
-public final class TestXSSFChartAxis extends TestCase {
-
-	private static final double EPSILON = 1E-7;
-	private final XSSFChartAxis axis;
-
-	public TestXSSFChartAxis() {
-		super();
-		XSSFWorkbook wb = new XSSFWorkbook();
-		XSSFSheet sheet = wb.createSheet();
-		XSSFDrawing drawing = sheet.createDrawingPatriarch();
-		XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		XSSFChart chart = drawing.createChart(anchor);
-		axis = chart.getChartAxisFactory().createValueAxis(AxisPosition.BOTTOM);
-	}
- 
-	public void testLogBaseIllegalArgument() throws Exception {
-		IllegalArgumentException iae = null;
-		try {
-			axis.setLogBase(0.0);
-		} catch (IllegalArgumentException e) {
-			iae = e;
-		}
-		assertNotNull(iae);
-
-		iae = null;
-		try {
-			axis.setLogBase(30000.0);
-		} catch (IllegalArgumentException e) {
-			iae = e;
-		}
-		assertNotNull(iae);
-	}
-
-	public void testLogBaseLegalArgument() throws Exception {
-		axis.setLogBase(Math.E);
-		assertTrue(Math.abs(axis.getLogBase() - Math.E) < EPSILON);
-	}
-
-	public void testNumberFormat() throws Exception {
-		final String numberFormat = "General";
-		axis.setNumberFormat(numberFormat);
-		assertEquals(numberFormat, axis.getNumberFormat());
-	}
-
-	public void testMaxAndMinAccessMethods() {
-		final double newValue = 10.0;
-
-		axis.setMinimum(newValue);
-		assertTrue(Math.abs(axis.getMinimum() - newValue) < EPSILON);
-
-		axis.setMaximum(newValue);
-		assertTrue(Math.abs(axis.getMaximum() - newValue) < EPSILON);
-	}
-
-	public void testVisibleAccessMethods() {
-		axis.setVisible(true);
-		assertTrue(axis.isVisible());
-
-		axis.setVisible(false);
-		assertFalse(axis.isVisible());
-	}
-
-	public void testMajorTickMarkAccessMethods() {
-		axis.setMajorTickMark(AxisTickMark.NONE);
-		assertEquals(AxisTickMark.NONE, axis.getMajorTickMark());
-
-		axis.setMajorTickMark(AxisTickMark.IN);
-		assertEquals(AxisTickMark.IN, axis.getMajorTickMark());
-
-		axis.setMajorTickMark(AxisTickMark.OUT);
-		assertEquals(AxisTickMark.OUT, axis.getMajorTickMark());
-
-		axis.setMajorTickMark(AxisTickMark.CROSS);
-		assertEquals(AxisTickMark.CROSS, axis.getMajorTickMark());
-	}
-
-	public void testMinorTickMarkAccessMethods() {
-		axis.setMinorTickMark(AxisTickMark.NONE);
-		assertEquals(AxisTickMark.NONE, axis.getMinorTickMark());
-
-		axis.setMinorTickMark(AxisTickMark.IN);
-		assertEquals(AxisTickMark.IN, axis.getMinorTickMark());
-
-		axis.setMinorTickMark(AxisTickMark.OUT);
-		assertEquals(AxisTickMark.OUT, axis.getMinorTickMark());
-
-		axis.setMinorTickMark(AxisTickMark.CROSS);
-		assertEquals(AxisTickMark.CROSS, axis.getMinorTickMark());
-	}
-
-	public void testGetChartAxisBug57362() {
-	  //Load existing excel with some chart on it having primary and secondary axis.
-	    final Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("57362.xlsx");
-        final Sheet sh = workbook.getSheetAt(0);
-        final XSSFSheet xsh = (XSSFSheet) sh;
-        final XSSFDrawing drawing = xsh.createDrawingPatriarch();
-        final XSSFChart chart = drawing.getCharts().get(0);
-
-        final List<? extends XSSFChartAxis> axisList = chart.getAxis();
-
-        assertEquals(4, axisList.size());
-        assertNotNull(axisList.get(0));
-        assertNotNull(axisList.get(1));
-        assertNotNull(axisList.get(2));
-        assertNotNull(axisList.get(3));
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartLegend.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartLegend.java
deleted file mode 100644
index 02aabad..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartLegend.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.charts.ChartLegend;
-import org.apache.poi.ss.usermodel.charts.LegendPosition;
-import org.apache.poi.xssf.usermodel.*;
-
-/**
- * Tests ChartLegend
- *
- * @author Martin Andersson
- * @author Cedric dot Walter at gmail dot com
- */
-public final class TestXSSFChartLegend extends TestCase {
-
-	public void testLegendPositionAccessMethods() throws Exception {
-		Workbook wb = new XSSFWorkbook();
-		Sheet sheet = wb.createSheet();
-		Drawing drawing = sheet.createDrawingPatriarch();
-		ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		Chart chart = drawing.createChart(anchor);
-		ChartLegend legend = chart.getOrCreateLegend();
-
-		legend.setPosition(LegendPosition.TOP_RIGHT);
-		assertEquals(LegendPosition.TOP_RIGHT, legend.getPosition());
-	}
-
-    public void test_setOverlay_defaultChartLegend_expectOverlayInitialValueSetToFalse() {
-        // Arrange
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Drawing drawing = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-        Chart chart = drawing.createChart(anchor);
-        ChartLegend legend = chart.getOrCreateLegend();
-
-        // Act
-
-        // Assert
-        assertFalse(legend.isOverlay());
-    }
-
-	public void test_setOverlay_chartLegendSetToTrue_expectOverlayInitialValueSetToTrue() {
-        // Arrange
-        Workbook wb = new XSSFWorkbook();
-		Sheet sheet = wb.createSheet();
-		Drawing drawing = sheet.createDrawingPatriarch();
-		ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		Chart chart = drawing.createChart(anchor);
-		ChartLegend legend = chart.getOrCreateLegend();
-
-        // Act
-		legend.setOverlay(true);
-
-        // Assert
-        assertTrue(legend.isOverlay());
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
deleted file mode 100644
index de05749..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.charts.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.*;
-
-import java.util.List;
-
-/**
- * Test get/set chart title.
- */
-public class TestXSSFChartTitle extends TestCase {
-    private Workbook createWorkbookWithChart() {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = wb.createSheet("linechart");
-        final int NUM_OF_ROWS = 3;
-        final int NUM_OF_COLUMNS = 10;
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        Row row;
-        Cell cell;
-        for (int rowIndex = 0; rowIndex < NUM_OF_ROWS; rowIndex++) {
-            row = sheet.createRow((short) rowIndex);
-            for (int colIndex = 0; colIndex < NUM_OF_COLUMNS; colIndex++) {
-                cell = row.createCell((short) colIndex);
-                cell.setCellValue(colIndex * (rowIndex + 1));
-            }
-        }
-
-        Drawing drawing = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 0, 5, 10, 15);
-
-        Chart chart = drawing.createChart(anchor);
-        ChartLegend legend = chart.getOrCreateLegend();
-        legend.setPosition(LegendPosition.TOP_RIGHT);
-
-        LineChartData data = chart.getChartDataFactory().createLineChartData();
-
-        // Use a category axis for the bottom axis.
-        ChartAxis bottomAxis = chart.getChartAxisFactory().createCategoryAxis(AxisPosition.BOTTOM);
-        ValueAxis leftAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.LEFT);
-        leftAxis.setCrosses(AxisCrosses.AUTO_ZERO);
-
-        ChartDataSource<Number> xs = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(0, 0, 0, NUM_OF_COLUMNS - 1));
-        ChartDataSource<Number> ys1 = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(1, 1, 0, NUM_OF_COLUMNS - 1));
-        ChartDataSource<Number> ys2 = DataSources.fromNumericCellRange(sheet, new CellRangeAddress(2, 2, 0, NUM_OF_COLUMNS - 1));
-
-        data.addSeries(xs, ys1);
-        data.addSeries(xs, ys2);
-
-        chart.plot(data, bottomAxis, leftAxis);
-
-        return wb;
-    }
-
-    /**
-     * Gets the first chart from the named sheet in the workbook.
-     */
-    private XSSFChart getChartFromWorkbook(Workbook wb, String sheetName) {
-        Sheet sheet = wb.getSheet(sheetName);
-        if (sheet instanceof XSSFSheet) {
-            XSSFSheet xsheet = (XSSFSheet) sheet;
-            XSSFDrawing drawing = xsheet.getDrawingPatriarch();
-            if (drawing != null) {
-                List<XSSFChart> charts = drawing.getCharts();
-                if (charts != null && charts.size() > 0) {
-                    return charts.get(0);
-                }
-            }
-        }
-        return null;
-    }
-
-    public void testNewChart() {
-        Workbook wb = createWorkbookWithChart();
-        XSSFChart chart = getChartFromWorkbook(wb, "linechart");
-        assertNotNull(chart);
-        assertNull(chart.getTitle());
-        final String myTitle = "My chart title";
-        chart.setTitle(myTitle);
-        XSSFRichTextString queryTitle = chart.getTitle();
-        assertNotNull(queryTitle);
-        assertEquals(myTitle, queryTitle.toString());
-    }
-
-    public void testExistingChartWithTitle() {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("chartTitle_withTitle.xlsx");
-        XSSFChart chart = getChartFromWorkbook(wb, "Sheet1");
-        assertNotNull(chart);
-        XSSFRichTextString originalTitle = chart.getTitle();
-        assertNotNull(originalTitle);
-        final String myTitle = "My chart title";
-        assertFalse(myTitle.equals(originalTitle.toString()));
-        chart.setTitle(myTitle);
-        XSSFRichTextString queryTitle = chart.getTitle();
-        assertNotNull(queryTitle);
-        assertEquals(myTitle, queryTitle.toString());
-    }
-
-    public void testExistingChartNoTitle() {
-        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("chartTitle_noTitle.xlsx");
-        XSSFChart chart = getChartFromWorkbook(wb, "Sheet1");
-        assertNotNull(chart);
-        assertNull(chart.getTitle());
-        final String myTitle = "My chart title";
-        chart.setTitle(myTitle);
-        XSSFRichTextString queryTitle = chart.getTitle();
-        assertNotNull(queryTitle);
-        assertEquals(myTitle, queryTitle.toString());
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
deleted file mode 100644
index cf7fd78..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.charts;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.charts.AxisPosition;
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ChartDataSource;
-import org.apache.poi.ss.usermodel.charts.DataSources;
-import org.apache.poi.ss.usermodel.charts.LineChartData;
-import org.apache.poi.ss.usermodel.charts.LineChartSeries;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.SheetBuilder;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Tests for XSSF Line Charts
- */
-public class TestXSSFLineChartData extends TestCase {
-
-    private static final Object[][] plotData = {
-            {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"},
-            {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
-    };
-
-    public void testOneSeriePlot() throws Exception {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, plotData).build();
-        Drawing drawing = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-        Chart chart = drawing.createChart(anchor);
-
-        ChartAxis bottomAxis = chart.getChartAxisFactory().createCategoryAxis(AxisPosition.BOTTOM);
-        ChartAxis leftAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.LEFT);
-
-        LineChartData lineChartData =
-                chart.getChartDataFactory().createLineChartData();
-
-        ChartDataSource<String> xs = DataSources.fromStringCellRange(sheet, CellRangeAddress.valueOf("A1:J1"));
-        ChartDataSource<Number> ys = DataSources.fromNumericCellRange(sheet, CellRangeAddress.valueOf("A2:J2"));
-        LineChartSeries series = lineChartData.addSeries(xs, ys);
-
-        assertNotNull(series);
-        assertEquals(1, lineChartData.getSeries().size());
-        assertTrue(lineChartData.getSeries().contains(series));
-
-        chart.plot(lineChartData, bottomAxis, leftAxis);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java
deleted file mode 100644
index 8b5e8d9..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.charts.ChartLegend;
-import org.apache.poi.ss.usermodel.charts.ManualLayout;
-import org.apache.poi.ss.usermodel.charts.LayoutMode;
-import org.apache.poi.ss.usermodel.charts.LayoutTarget;
-import org.apache.poi.xssf.usermodel.*;
-
-public final class TestXSSFManualLayout extends TestCase {
-	
-	/*
-	 * Accessor methods are not trivial. They use lazy underlying bean
-	 * initialization so there can be some errors (NPE, for example).
-	 */
-	public void testAccessorMethods() throws Exception {
-		final double newRatio = 1.1;
-		final double newCoordinate = 0.3;
-		final LayoutMode nonDefaultMode = LayoutMode.FACTOR;
-		final LayoutTarget nonDefaultTarget = LayoutTarget.OUTER;
-
-		ManualLayout layout = getEmptyLayout();
-
-		layout.setWidthRatio(newRatio);
-		assertTrue(layout.getWidthRatio() == newRatio);
-
-		layout.setHeightRatio(newRatio);
-		assertTrue(layout.getHeightRatio() == newRatio);
-
-		layout.setX(newCoordinate);
-		assertTrue(layout.getX() == newCoordinate);
-
-		layout.setY(newCoordinate);
-		assertTrue(layout.getY() == newCoordinate);
-
-		layout.setXMode(nonDefaultMode);
-		assertTrue(layout.getXMode() == nonDefaultMode);
-
-		layout.setYMode(nonDefaultMode);
-		assertTrue(layout.getYMode() == nonDefaultMode);
-
-		layout.setWidthMode(nonDefaultMode);
-		assertTrue(layout.getWidthMode() == nonDefaultMode);
-
-		layout.setHeightMode(nonDefaultMode);
-		assertTrue(layout.getHeightMode() == nonDefaultMode);
-
-		layout.setTarget(nonDefaultTarget);
-		assertTrue(layout.getTarget() == nonDefaultTarget);
-
-	}
-
-	/*
-	 * Layout must have reasonable default values and must not throw
-	 * any exceptions.
-	 */
-	public void testDefaultValues() throws Exception {
-		ManualLayout layout = getEmptyLayout();
-		
-		assertNotNull(layout.getTarget());
-		assertNotNull(layout.getXMode());
-		assertNotNull(layout.getYMode());
-		assertNotNull(layout.getHeightMode());
-		assertNotNull(layout.getWidthMode());
-		/*
-		 * According to interface, 0.0 should be returned for
-		 * uninitialized double properties.
-		 */
-		assertTrue(layout.getX() == 0.0);
-		assertTrue(layout.getY() == 0.0);
-		assertTrue(layout.getWidthRatio() == 0.0);
-		assertTrue(layout.getHeightRatio() == 0.0);
-	}
-
-	private ManualLayout getEmptyLayout() {
-		Workbook wb = new XSSFWorkbook();
-		Sheet sheet = wb.createSheet();
-		Drawing drawing = sheet.createDrawingPatriarch();
-		ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		Chart chart = drawing.createChart(anchor);
-		ChartLegend legend = chart.getOrCreateLegend();
-		return legend.getManualLayout();
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
deleted file mode 100644
index e041e89..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.Chart;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.charts.AxisPosition;
-import org.apache.poi.ss.usermodel.charts.ChartAxis;
-import org.apache.poi.ss.usermodel.charts.ChartDataSource;
-import org.apache.poi.ss.usermodel.charts.DataSources;
-import org.apache.poi.ss.usermodel.charts.ScatterChartData;
-import org.apache.poi.ss.usermodel.charts.ScatterChartSeries;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.SheetBuilder;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-/**
- * Tests for XSSFScatterChartData.
- */
-public final class TestXSSFScatterChartData extends TestCase {
-
-    private static final Object[][] plotData = {
-            {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"},
-            {  1,    2,   3,    4,    5,   6,    7,   8,    9,  10}
-    };
-
-    public void testOneSeriePlot() throws Exception {
-        Workbook wb = new XSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, plotData).build();
-        Drawing drawing = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-        Chart chart = drawing.createChart(anchor);
-
-        ChartAxis bottomAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.BOTTOM);
-        ChartAxis leftAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.LEFT);
-
-        ScatterChartData scatterChartData =
-                chart.getChartDataFactory().createScatterChartData();
-
-        ChartDataSource<String> xs = DataSources.fromStringCellRange(sheet, CellRangeAddress.valueOf("A1:J1"));
-        ChartDataSource<Number> ys = DataSources.fromNumericCellRange(sheet, CellRangeAddress.valueOf("A2:J2"));
-        ScatterChartSeries series = scatterChartData.addSerie(xs, ys);
-
-        assertNotNull(series);
-        assertEquals(1, scatterChartData.getSeries().size());
-        assertTrue(scatterChartData.getSeries().contains(series));
-
-        chart.plot(scatterChartData, bottomAxis, leftAxis);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
deleted file mode 100644
index db8ded3..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.charts;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.charts.*;
-import org.apache.poi.xssf.usermodel.*;
-
-public final class TestXSSFValueAxis extends TestCase {
- 
-	public void testAccessMethods() throws Exception {
-		XSSFWorkbook wb = new XSSFWorkbook();
-		XSSFSheet sheet = wb.createSheet();
-		XSSFDrawing drawing = sheet.createDrawingPatriarch();
-		XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		XSSFChart chart = drawing.createChart(anchor);
-		XSSFValueAxis axis = chart.getChartAxisFactory().createValueAxis(AxisPosition.BOTTOM);
-
-		axis.setCrossBetween(AxisCrossBetween.MIDPOINT_CATEGORY);
-		assertEquals(axis.getCrossBetween(), AxisCrossBetween.MIDPOINT_CATEGORY);
-
-		axis.setCrosses(AxisCrosses.AUTO_ZERO);
-		assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
-
-		assertEquals(chart.getAxis().size(), 1);
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
deleted file mode 100644
index e7233c2..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.extensions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder.BorderSide;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;
-
-
-public class TestXSSFBorder extends TestCase {
-	
-	public void testGetBorderStyle() {
-		CTStylesheet stylesheet = CTStylesheet.Factory.newInstance();
-		CTBorder border = stylesheet.addNewBorders().addNewBorder();
-		CTBorderPr top = border.addNewTop();
-		CTBorderPr right = border.addNewRight();
-		CTBorderPr bottom = border.addNewBottom();
-		
-		top.setStyle(STBorderStyle.DASH_DOT);
-		right.setStyle(STBorderStyle.NONE);
-		bottom.setStyle(STBorderStyle.THIN);
-		
-		XSSFCellBorder cellBorderStyle = new XSSFCellBorder(border);
-		assertEquals("DASH_DOT", cellBorderStyle.getBorderStyle(BorderSide.TOP).toString());
-		
-		assertEquals("NONE", cellBorderStyle.getBorderStyle(BorderSide.RIGHT).toString());
-		assertEquals(BorderStyle.NONE.ordinal(), cellBorderStyle.getBorderStyle(BorderSide.RIGHT).ordinal());
-		
-		assertEquals("THIN", cellBorderStyle.getBorderStyle(BorderSide.BOTTOM).toString());
-		
-		assertEquals(BorderStyle.THIN.ordinal(), cellBorderStyle.getBorderStyle(BorderSide.BOTTOM).ordinal());
-	}
-	
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
deleted file mode 100644
index 832d6bf..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.extensions;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
-
-
-public class TestXSSFCellFill {
-
-    @Test
-    public void testGetFillBackgroundColor() {
-        CTFill ctFill = CTFill.Factory.newInstance();
-        XSSFCellFill cellFill = new XSSFCellFill(ctFill);
-        CTPatternFill ctPatternFill = ctFill.addNewPatternFill();
-        CTColor bgColor = ctPatternFill.addNewBgColor();
-        assertNotNull(cellFill.getFillBackgroundColor());
-        bgColor.setIndexed(2);
-        assertEquals(2, cellFill.getFillBackgroundColor().getIndexed());
-    }
-
-    @Test
-    public void testGetFillForegroundColor() {
-        CTFill ctFill = CTFill.Factory.newInstance();
-        XSSFCellFill cellFill = new XSSFCellFill(ctFill);
-        CTPatternFill ctPatternFill = ctFill.addNewPatternFill();
-        CTColor fgColor = ctPatternFill.addNewFgColor();
-        assertNotNull(cellFill.getFillForegroundColor());
-        fgColor.setIndexed(8);
-        assertEquals(8, cellFill.getFillForegroundColor().getIndexed());
-    }
-
-    @Test
-    public void testGetSetPatternType() {
-        CTFill ctFill = CTFill.Factory.newInstance();
-        XSSFCellFill cellFill = new XSSFCellFill(ctFill);
-        CTPatternFill ctPatternFill = ctFill.addNewPatternFill();
-        ctPatternFill.setPatternType(STPatternType.SOLID);
-        assertEquals(FillPatternType.SOLID_FOREGROUND.ordinal(), cellFill.getPatternType().intValue()-1);
-    }
-
-    @Test
-    public void testGetNotModifies() {
-        CTFill ctFill = CTFill.Factory.newInstance();
-        XSSFCellFill cellFill = new XSSFCellFill(ctFill);
-        CTPatternFill ctPatternFill = ctFill.addNewPatternFill();
-        ctPatternFill.setPatternType(STPatternType.DARK_DOWN);
-        assertEquals(8, cellFill.getPatternType().intValue());
-    }
-
-    @Test
-    public void testColorFromTheme() throws IOException {
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("styles.xlsx");
-        XSSFCell cellWithThemeColor = wb.getSheetAt(0).getRow(10).getCell(0);
-        //color RGB will be extracted from theme
-        XSSFColor foregroundColor = cellWithThemeColor.getCellStyle().getFillForegroundXSSFColor();
-        byte[] rgb = foregroundColor.getRGB();
-        byte[] rgbWithTint = foregroundColor.getRGBWithTint();
-        // Dk2
-        assertEquals(rgb[0],31);
-        assertEquals(rgb[1],73);
-        assertEquals(rgb[2],125);
-        // Dk2, lighter 40% (tint is about 0.39998)
-        // 31 * (1.0 - 0.39998) + (255 - 255 * (1.0 - 0.39998)) = 120.59552 => 120 (byte)
-        // 73 * (1.0 - 0.39998) + (255 - 255 * (1.0 - 0.39998)) = 145.79636 => -111 (byte)
-        // 125 * (1.0 - 0.39998) + (255 - 255 * (1.0 - 0.39998)) = 176.99740 => -80 (byte)
-        assertEquals(rgbWithTint[0],120);
-        assertEquals(rgbWithTint[1],-111);
-        assertEquals(rgbWithTint[2],-80);
-        wb.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFSheetComments.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFSheetComments.java
deleted file mode 100644
index b58078f..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFSheetComments.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.extensions;
-
-import junit.framework.TestCase;
-
-public class TestXSSFSheetComments extends TestCase {
-	// So eclipse doesn't moan
-	public void testTODO() {
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
deleted file mode 100644
index 1ca8fb8..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
-
-/**
- * Tests for {@link ColumnHelper}
- *
- */
-public final class TestColumnHelper extends TestCase {
-
-    public void testCleanColumns() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-
-        CTCols cols1 = worksheet.addNewCols();
-        CTCol col1 = cols1.addNewCol();
-        col1.setMin(1);
-        col1.setMax(1);
-        col1.setWidth(88);
-        col1.setHidden(true);
-        CTCol col2 = cols1.addNewCol();
-        col2.setMin(2);
-        col2.setMax(3);
-        CTCols cols2 = worksheet.addNewCols();
-        CTCol col4 = cols2.addNewCol();
-        col4.setMin(13);
-        col4.setMax(16384);
-
-        // Test cleaning cols
-        assertEquals(2, worksheet.sizeOfColsArray());
-        int count = countColumns(worksheet);
-        assertEquals(16375, count);
-        // Clean columns and test a clean worksheet
-        ColumnHelper helper = new ColumnHelper(worksheet);
-        assertEquals(1, worksheet.sizeOfColsArray());
-        count = countColumns(worksheet);
-        assertEquals(16375, count);
-        // Remember - POI column 0 == OOXML column 1
-        assertEquals(88.0, helper.getColumn(0, false).getWidth(), 0.0);
-        assertTrue(helper.getColumn(0, false).getHidden());
-        assertEquals(0.0, helper.getColumn(1, false).getWidth(), 0.0);
-        assertFalse(helper.getColumn(1, false).getHidden());
-    }
-
-    public void testSortColumns() {
-        CTCols cols1 = CTCols.Factory.newInstance();
-        CTCol col1 = cols1.addNewCol();
-        col1.setMin(1);
-        col1.setMax(1);
-        col1.setWidth(88);
-        col1.setHidden(true);
-        CTCol col2 = cols1.addNewCol();
-        col2.setMin(2);
-        col2.setMax(3);
-        CTCol col3 = cols1.addNewCol();
-        col3.setMin(13);
-        col3.setMax(16750);
-        assertEquals(3, cols1.sizeOfColArray());
-        CTCol col4 = cols1.addNewCol();
-        col4.setMin(8);
-        col4.setMax(11);
-        assertEquals(4, cols1.sizeOfColArray());
-        CTCol col5 = cols1.addNewCol();
-        col5.setMin(4);
-        col5.setMax(5);
-        assertEquals(5, cols1.sizeOfColArray());
-        CTCol col6 = cols1.addNewCol();
-        col6.setMin(8);
-        col6.setMax(9);
-        col6.setHidden(true);
-        CTCol col7 = cols1.addNewCol();
-        col7.setMin(6);
-        col7.setMax(8);
-        col7.setWidth(17.0);
-        CTCol col8 = cols1.addNewCol();
-        col8.setMin(25);
-        col8.setMax(27);
-        CTCol col9 = cols1.addNewCol();
-        col9.setMin(20);
-        col9.setMax(30);
-        assertEquals(9, cols1.sizeOfColArray());
-        assertEquals(20, cols1.getColArray(8).getMin());
-        assertEquals(30, cols1.getColArray(8).getMax());
-        ColumnHelper.sortColumns(cols1);
-        assertEquals(9, cols1.sizeOfColArray());
-        assertEquals(25, cols1.getColArray(8).getMin());
-        assertEquals(27, cols1.getColArray(8).getMax());
-    }
-
-    public void testCloneCol() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        ColumnHelper helper = new ColumnHelper(worksheet);
-
-        CTCols cols = CTCols.Factory.newInstance();
-        CTCol col = CTCol.Factory.newInstance();
-        col.setMin(2);
-        col.setMax(8);
-        col.setHidden(true);
-        col.setWidth(13.4);
-        CTCol newCol = helper.cloneCol(cols, col);
-        assertEquals(2, newCol.getMin());
-        assertEquals(8, newCol.getMax());
-        assertTrue(newCol.getHidden());
-        assertEquals(13.4, newCol.getWidth(), 0.0);
-    }
-
-    public void testAddCleanColIntoCols() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        ColumnHelper helper = new ColumnHelper(worksheet);
-
-        CTCols cols1 = CTCols.Factory.newInstance();
-        CTCol col1 = cols1.addNewCol();
-        col1.setMin(1);
-        col1.setMax(1);
-        col1.setWidth(88);
-        col1.setHidden(true);
-        CTCol col2 = cols1.addNewCol();
-        col2.setMin(2);
-        col2.setMax(3);
-        CTCol col3 = cols1.addNewCol();
-        col3.setMin(13);
-        col3.setMax(16750);
-        assertEquals(3, cols1.sizeOfColArray());
-        CTCol col4 = cols1.addNewCol();
-        col4.setMin(8);
-        col4.setMax(9);
-        assertEquals(4, cols1.sizeOfColArray());
-
-        // No overlap
-        helper.addCleanColIntoCols(cols1, createCol(4, 5));
-        assertEquals(5, cols1.sizeOfColArray());
-
-        // Overlaps with 8 - 9 (overlap and after replacements required)
-        CTCol col6 = createCol(8, 11);
-        col6.setHidden(true);
-        helper.addCleanColIntoCols(cols1, col6);
-        assertEquals(6, cols1.sizeOfColArray());
-
-        // Overlaps with 8 - 9 (before and overlap replacements required)
-        CTCol col7 = createCol(6, 8);
-        col7.setWidth(17.0);
-        helper.addCleanColIntoCols(cols1, col7);
-        assertEquals(8, cols1.sizeOfColArray());
-
-        // Overlaps with 13 - 16750 (before, overlap and after replacements required)
-        helper.addCleanColIntoCols(cols1, createCol(20, 30));
-        assertEquals(10, cols1.sizeOfColArray());
-
-        // Overlaps with 20 - 30 (before, overlap and after replacements required)
-        helper.addCleanColIntoCols(cols1, createCol(25, 27));
-
-        // TODO - assert something interesting
-        assertEquals(12, cols1.sizeOfColArray());
-        assertEquals(1, cols1.getColArray(0).getMin());
-        assertEquals(16750, cols1.getColArray(11).getMax());
-    }
-
-    public void testAddCleanColIntoColsExactOverlap() throws Exception {
-        CTCols cols = createHiddenAndBestFitColsWithHelper(1, 1, 1, 1);
-        assertEquals(1, cols.sizeOfColArray());
-        assertMinMaxHiddenBestFit(cols, 0, 1, 1, true, true);
-    }
-
-    public void testAddCleanColIntoColsOverlapsOverhangingBothSides() throws Exception {
-        CTCols cols = createHiddenAndBestFitColsWithHelper(2, 2, 1, 3);
-        assertEquals(3, cols.sizeOfColArray());
-        assertMinMaxHiddenBestFit(cols, 0, 1, 1, false, true);
-        assertMinMaxHiddenBestFit(cols, 1, 2, 2, true, true);
-        assertMinMaxHiddenBestFit(cols, 2, 3, 3, false, true);
-    }
-
-    public void testAddCleanColIntoColsOverlapsCompletelyNested() throws Exception {
-        CTCols cols = createHiddenAndBestFitColsWithHelper(1, 3, 2, 2);
-        assertEquals(3, cols.sizeOfColArray());
-        assertMinMaxHiddenBestFit(cols, 0, 1, 1, true, false);
-        assertMinMaxHiddenBestFit(cols, 1, 2, 2, true, true);
-        assertMinMaxHiddenBestFit(cols, 2, 3, 3, true, false);
-    }
-
-    public void testAddCleanColIntoColsNewOverlapsOverhangingLeftNotRightExactRight() throws Exception {
-        CTCols cols = createHiddenAndBestFitColsWithHelper(2, 3, 1, 3);
-        assertEquals(2, cols.sizeOfColArray());
-        assertMinMaxHiddenBestFit(cols, 0, 1, 1, false, true);
-        assertMinMaxHiddenBestFit(cols, 1, 2, 3, true, true);
-    }
-
-    public void testAddCleanColIntoColsNewOverlapsOverhangingRightNotLeftExactLeft() throws Exception {
-        CTCols cols = createHiddenAndBestFitColsWithHelper(1, 2, 1, 3);
-        assertEquals(2, cols.sizeOfColArray());
-        assertMinMaxHiddenBestFit(cols, 0, 1, 2, true, true);
-        assertMinMaxHiddenBestFit(cols, 1, 3, 3, false, true);
-    }
-
-    public void testAddCleanColIntoColsNewOverlapsOverhangingLeftNotRight() throws Exception {
-        CTCols cols = createHiddenAndBestFitColsWithHelper(2, 3, 1, 2);
-        assertEquals(3, cols.sizeOfColArray());
-        assertMinMaxHiddenBestFit(cols, 0, 1, 1, false, true);
-        assertMinMaxHiddenBestFit(cols, 1, 2, 2, true, true);
-        assertMinMaxHiddenBestFit(cols, 2, 3, 3, true, false);
-    }
-
-    public void testAddCleanColIntoColsNewOverlapsOverhangingRightNotLeft() throws Exception {
-        CTCols cols = createHiddenAndBestFitColsWithHelper(1, 2, 2, 3);
-        assertEquals(3, cols.sizeOfColArray());
-        assertMinMaxHiddenBestFit(cols, 0, 1, 1, true, false);
-        assertMinMaxHiddenBestFit(cols, 1, 2, 2, true, true);
-        assertMinMaxHiddenBestFit(cols, 2, 3, 3, false, true);
-    }
-
-    /**
-     * Creates and adds a hidden column and then a best fit column with the given min/max pairs.
-     * Suitable for testing handling of overlap. 
-     */
-    private CTCols createHiddenAndBestFitColsWithHelper(int hiddenMin, int hiddenMax, int bestFitMin, int bestFitMax) {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-        ColumnHelper helper = new ColumnHelper(worksheet);
-        CTCols cols = worksheet.getColsArray(0);
-
-        CTCol hidden = createCol(hiddenMin, hiddenMax);
-        hidden.setHidden(true);
-        helper.addCleanColIntoCols(cols, hidden);
-
-        CTCol bestFit = createCol(bestFitMin, bestFitMax);
-        bestFit.setBestFit(true);
-        helper.addCleanColIntoCols(cols, bestFit);
-        return cols;
-    }
-
-    private void assertMinMaxHiddenBestFit(CTCols cols, int index, int min, int max, boolean hidden, boolean bestFit) {
-        CTCol col = cols.getColArray(index);
-        assertEquals(min, col.getMin());
-        assertEquals(max, col.getMax());
-        assertEquals(hidden, col.getHidden());
-        assertEquals(bestFit, col.getBestFit());
-    }
-
-    private CTCol createCol(int min, int max) {
-        CTCol col = CTCol.Factory.newInstance();
-        col.setMin(min);
-        col.setMax(max);
-        return col;
-    }
-
-    public void testGetColumn() {
-        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
-
-        CTCols cols1 = worksheet.addNewCols();
-        CTCol col1 = cols1.addNewCol();
-        col1.setMin(1);
-        col1.setMax(1);
-        col1.setWidth(88);
-        col1.setHidden(true);
-        CTCol col2 = cols1.addNewCol();
-        col2.setMin(2);
-        col2.setMax(3);
-        CTCols cols2 = worksheet.addNewCols();
-        CTCol col4 = cols2.addNewCol();
-        col4.setMin(3);
-        col4.setMax(6);
-
-        // Remember - POI column 0 == OOXML column 1
-        ColumnHelper helper = new ColumnHelper(worksheet);
-        assertNotNull(helper.getColumn(0, false));
-        assertNotNull(helper.getColumn(1, false));
-        assertEquals(88.0, helper.getColumn(0, false).getWidth(), 0.0);
-        assertEquals(0.0, helper.getColumn(1, false).getWidth(), 0.0);
-        assertTrue(helper.getColumn(0, false).getHidden());
-        assertFalse(helper.getColumn(1, false).getHidden());
-        assertNull(helper.getColumn(99, false));
-        assertNotNull(helper.getColumn(5, false));
-    }
-
-    public void testSetColumnAttributes() {
-        CTCol col = CTCol.Factory.newInstance();
-        col.setWidth(12);
-        col.setHidden(true);
-        CTCol newCol = CTCol.Factory.newInstance();
-        assertEquals(0.0, newCol.getWidth(), 0.0);
-        assertFalse(newCol.getHidden());
-        ColumnHelper helper = new ColumnHelper(CTWorksheet.Factory
-                .newInstance());
-        helper.setColumnAttributes(col, newCol);
-        assertEquals(12.0, newCol.getWidth(), 0.0);
-        assertTrue(newCol.getHidden());
-    }
-
-    public void testGetOrCreateColumn() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet("Sheet 1");
-        ColumnHelper columnHelper = sheet.getColumnHelper();
-
-        // Check POI 0 based, OOXML 1 based
-        CTCol col = columnHelper.getOrCreateColumn1Based(3, false);
-        assertNotNull(col);
-        assertNull(columnHelper.getColumn(1, false));
-        assertNotNull(columnHelper.getColumn(2, false));
-        assertNotNull(columnHelper.getColumn1Based(3, false));
-        assertNull(columnHelper.getColumn(3, false));
-
-        CTCol col2 = columnHelper.getOrCreateColumn1Based(30, false);
-        assertNotNull(col2);
-        assertNull(columnHelper.getColumn(28, false));
-        assertNotNull(columnHelper.getColumn(29, false));
-        assertNotNull(columnHelper.getColumn1Based(30, false));
-        assertNull(columnHelper.getColumn(30, false));
-    }
-
-    public void testGetSetColDefaultStyle() {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
-        ColumnHelper columnHelper = sheet.getColumnHelper();
-
-        // POI column 3, OOXML column 4
-        CTCol col = columnHelper.getOrCreateColumn1Based(4, false);
-
-        assertNotNull(col);
-        assertNotNull(columnHelper.getColumn(3, false));
-        columnHelper.setColDefaultStyle(3, 2);
-        assertEquals(2, columnHelper.getColDefaultStyle(3));
-        assertEquals(-1, columnHelper.getColDefaultStyle(4));
-        StylesTable stylesTable = workbook.getStylesSource();
-        CTXf cellXf = CTXf.Factory.newInstance();
-        cellXf.setFontId(0);
-        cellXf.setFillId(0);
-        cellXf.setBorderId(0);
-        cellXf.setNumFmtId(0);
-        cellXf.setXfId(0);
-        stylesTable.putCellXf(cellXf);
-        CTCol col_2 = ctWorksheet.getColsArray(0).addNewCol();
-        col_2.setMin(10);
-        col_2.setMax(12);
-        col_2.setStyle(1);
-        assertEquals(1, columnHelper.getColDefaultStyle(11));
-        XSSFCellStyle cellStyle = new XSSFCellStyle(0, 0, stylesTable, null);
-        columnHelper.setColDefaultStyle(11, cellStyle);
-        assertEquals(0, col_2.getStyle());
-        assertEquals(1, columnHelper.getColDefaultStyle(10));
-    }
-
-    private static int countColumns(CTWorksheet worksheet) {
-        int count;
-        count = 0;
-        for (int i = 0; i < worksheet.sizeOfColsArray(); i++) {
-            for (int y = 0; y < worksheet.getColsArray(i).sizeOfColArray(); y++) {
-                for (long k = worksheet.getColsArray(i).getColArray(y).getMin(); k <= worksheet
-                        .getColsArray(i).getColArray(y).getMax(); k++) {
-                    count++;
-                }
-            }
-        }
-        return count;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
deleted file mode 100644
index 2d25e3e..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.helpers;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xssf.usermodel.helpers.HeaderFooterHelper;
-
-/**
- * Test the header and footer helper.
- * As we go through XmlBeans, should always use &,
- *  and not &amp;
- */
-public class TestHeaderFooterHelper extends TestCase {
-    
-    public void testGetCenterLeftRightSection() {
-        HeaderFooterHelper helper = new HeaderFooterHelper();
-        
-        String headerFooter = "&CTest the center section";
-        assertEquals("Test the center section", helper.getCenterSection(headerFooter));
-        
-        headerFooter = "&CTest the center section&LThe left one&RAnd the right one";
-        assertEquals("Test the center section", helper.getCenterSection(headerFooter));
-        assertEquals("The left one", helper.getLeftSection(headerFooter));
-        assertEquals("And the right one", helper.getRightSection(headerFooter));
-    }
-    
-    public void testSetCenterLeftRightSection() {
-        HeaderFooterHelper helper = new HeaderFooterHelper();
-        String headerFooter = "";
-        headerFooter = helper.setCenterSection(headerFooter, "First added center section");
-        assertEquals("First added center section", helper.getCenterSection(headerFooter));
-        headerFooter = helper.setLeftSection(headerFooter, "First left");
-        assertEquals("First left", helper.getLeftSection(headerFooter));
-
-        headerFooter = helper.setRightSection(headerFooter, "First right");
-        assertEquals("First right", helper.getRightSection(headerFooter));
-        assertEquals("&CFirst added center section&LFirst left&RFirst right", headerFooter);
-
-        headerFooter = helper.setRightSection(headerFooter, "First right&F");
-        assertEquals("First right&F", helper.getRightSection(headerFooter));
-        assertEquals("&CFirst added center section&LFirst left&RFirst right&F", headerFooter);
-        
-        headerFooter = helper.setRightSection(headerFooter, "First right&");
-        assertEquals("First right&", helper.getRightSection(headerFooter));
-        assertEquals("&CFirst added center section&LFirst left&RFirst right&", headerFooter);
-    }
-    
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java
deleted file mode 100644
index 812a921..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.util;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.util.CellReference;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.*;
-
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * Mixed utilities for testing memory usage in XSSF
- *
- * @author Yegor Kozlov
- */
-public class MemoryUsage extends TestCase {
-    private static final int NUM_COLUMNS = 255;
-    
-    private static void printMemoryUsage(String msg) {
-        System.out.println(" Memory (" + msg + "): " + Runtime.getRuntime().totalMemory()/(1024*1024) + "MB");
-    }
-
-    /**
-     * Generate a spreadsheet until OutOfMemoryError
-     * <p>
-     *  cells in even columns are numbers, cells in odd columns are strings
-     * </p>
-     *
-     * @param wb        the workbook to write to
-     * @param numCols   the number of columns in a row
-     */
-    public static void mixedSpreadsheet(Workbook wb, int numCols){
-
-        System.out.println("Testing " + wb.getClass().getName());
-        printMemoryUsage("before");
-        int i=0, cnt=0;
-        try {
-            Sheet sh = wb.createSheet();
-            for(i=0; ; i++){
-                Row row = sh.createRow(i);
-                for(int j=0; j < numCols; j++){
-                    Cell cell = row.createCell(j);
-                    if(j % 2 == 0) cell.setCellValue(j);
-                    else cell.setCellValue(new CellReference(j, i).formatAsString());
-                    cnt++;
-                }
-            }
-        } catch (OutOfMemoryError er){
-            System.out.println("Failed at row=" + i + ", objects : " + cnt);
-        } catch (final Exception e) {
-            System.out.println("Unable to reach an OutOfMemoryError");
-            System.out.println(e.getClass().getName() + ": " + e.getMessage());
-        }
-        printMemoryUsage("after");
-    }
-
-    /**
-     * Generate a spreadsheet who's all cell values are numbers.
-     * The data is generated until OutOfMemoryError. 
-     * <p>
-     * as compared to {@link #mixedSpreadsheet(org.apache.poi.ss.usermodel.Workbook, int)},
-     * this method does not set string values and, hence, does not involve the Shared Strings Table.
-     * </p>
-     *
-     * @param wb        the workbook to write to
-     * @param numCols   the number of columns in a row
-     */
-    public static void numberSpreadsheet(Workbook wb, int numCols){
-
-        System.out.println("Testing " + wb.getClass().getName());
-        printMemoryUsage("before");
-        int i=0, cnt=0;
-        try {
-            Sheet sh = wb.createSheet();
-            for(i=0; ; i++){
-                Row row = sh.createRow(i);
-                for(int j=0; j < numCols; j++){
-                    Cell cell = row.createCell(j);
-                    cell.setCellValue(j);
-                    cnt++;
-                }
-            }
-        } catch (OutOfMemoryError er){
-            System.out.println("Failed at row=" + i + ", objects : " + cnt);
-        } catch (final Exception e) {
-            System.out.println("Unable to reach an OutOfMemoryError");
-            System.out.println(e.getClass().getName() + ": " + e.getMessage());
-        }
-        printMemoryUsage("after");
-    }
-
-    /**
-     * Generate a spreadsheet until OutOfMemoryError using low-level OOXML XmlBeans.
-     * Similar to {@link #numberSpreadsheet(org.apache.poi.ss.usermodel.Workbook, int)}
-     *
-     * <p>
-     *
-     * @param numCols  the number of columns in a row
-     */
-    public static void xmlBeans(int numCols) {
-        int i = 0, cnt = 0;
-        printMemoryUsage("before");
-
-        CTWorksheet sh = CTWorksheet.Factory.newInstance();
-        CTSheetData data = sh.addNewSheetData();
-        try {
-            for (i = 0; ; i++) {
-                CTRow row = data.addNewRow();
-                row.setR(i);
-                for (int j = 0; j < numCols; j++) {
-                    CTCell cell = row.addNewC();
-                    cell.setT(STCellType.N);
-                    cell.setV(String.valueOf(j));
-                    cnt++;
-                }
-            }
-        } catch (OutOfMemoryError er) {
-            System.out.println("Failed at row=" + i + ", objects: " + cnt);
-        } catch (final Exception e) {
-            System.out.println("Unable to reach an OutOfMemoryError");
-            System.out.println(e.getClass().getName() + ": " + e.getMessage());
-        }
-        printMemoryUsage("after");
-    }
-
-    /**
-     * Generate detached (parentless) Xml beans until OutOfMemoryError
-     *
-     * @see #testXmlAttached()
-     */
-    public void testXmlDetached(){
-        List<CTRow> rows = new ArrayList<CTRow>();
-        int i = 0;
-        try {
-            for(;;){
-                //create a standalone CTRow bean
-                CTRow r = CTRow.Factory.newInstance();
-                r.setR(++i);
-                rows.add(r);
-            }
-        } catch (OutOfMemoryError er) {
-            System.out.println("Failed at row=" + i);
-        } catch (final Exception e) {
-            System.out.println("Unable to reach an OutOfMemoryError");
-            System.out.println(e.getClass().getName() + ": " + e.getMessage());
-        }
-        printMemoryUsage("after");
-    }
-
-    /**
-     * Generate attached (having a parent bean) Xml beans until OutOfMemoryError.
-     * This is MUCH more memory-efficient than {@link #testXmlDetached()}
-     *
-     * @see #testXmlAttached()
-     */
-    public void testXmlAttached(){
-        printMemoryUsage("before");
-        List<CTRow> rows = new ArrayList<CTRow>();
-        int i = 0;
-        //top-level element in sheet.xml
-        CTWorksheet sh = CTWorksheet.Factory.newInstance();
-        CTSheetData data = sh.addNewSheetData();
-        try {
-            for(;;){
-                //create CTRow attached to the parent object
-                CTRow r = data.addNewRow();
-                r.setR(++i);
-                rows.add(r);
-            }
-        } catch (OutOfMemoryError er) {
-            System.out.println("Failed at row=" + i);
-        } catch (final Exception e) {
-            System.out.println("Unable to reach an OutOfMemoryError");
-            System.out.println(e.getClass().getName() + ": " + e.getMessage());
-        }
-        printMemoryUsage("after");
-    }
-
-    public void testMixedHSSF(){
-        numberSpreadsheet(new HSSFWorkbook(), NUM_COLUMNS);
-    }
-
-    public void testMixedXSSF(){
-        numberSpreadsheet(new XSSFWorkbook(), NUM_COLUMNS);
-    }
-
-    public void testNumberHSSF(){
-        numberSpreadsheet(new HSSFWorkbook(), NUM_COLUMNS);
-    }
-
-    public void testNumberXSSF(){
-        numberSpreadsheet(new XSSFWorkbook(), NUM_COLUMNS);
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java
deleted file mode 100644
index 9fa8320..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.util;
-
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
-
-
-public final class TestCTColComparator extends TestCase {
-
-    public void testCompare() {
-        CTCol o1 = CTCol.Factory.newInstance();
-        o1.setMin(1);
-        o1.setMax(10);
-        CTCol o2 = CTCol.Factory.newInstance();
-        o2.setMin(11);
-        o2.setMax(12);
-        assertEquals(-1, CTColComparator.BY_MIN_MAX.compare(o1, o2));
-        CTCol o3 = CTCol.Factory.newInstance();
-        o3.setMin(5);
-        o3.setMax(8);
-        CTCol o4 = CTCol.Factory.newInstance();
-        o4.setMin(5);
-        o4.setMax(80);
-        assertEquals(-1, CTColComparator.BY_MIN_MAX.compare(o3, o4));
-    }
-
-    public void testArraysSort() {
-        CTCol o1 = CTCol.Factory.newInstance();
-        o1.setMin(1);
-        o1.setMax(10);
-        CTCol o2 = CTCol.Factory.newInstance();
-        o2.setMin(11);
-        o2.setMax(12);
-        assertEquals(-1, CTColComparator.BY_MIN_MAX.compare(o1, o2));
-        CTCol o3 = CTCol.Factory.newInstance();
-        o3.setMin(5);
-        o3.setMax(80);
-        CTCol o4 = CTCol.Factory.newInstance();
-        o4.setMin(5);
-        o4.setMax(8);
-        assertEquals(1, CTColComparator.BY_MIN_MAX.compare(o3, o4));
-        CTCol[] cols = new CTCol[4];
-        cols[0] = o1;
-        cols[1] = o2;
-        cols[2] = o3;
-        cols[3] = o4;
-        assertEquals(80, cols[2].getMax());
-        assertEquals(8, cols[3].getMax());
-        Arrays.sort(cols, CTColComparator.BY_MIN_MAX);
-        assertEquals(12, cols[3].getMax());
-        assertEquals(8, cols[1].getMax());
-        assertEquals(80, cols[2].getMax());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
deleted file mode 100644
index a15b22c..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-public final class TestEvilUnclosedBRFixingInputStream extends TestCase {
-   public void testOK() throws Exception {
-      byte[] ok = "<p><div>Hello There!</div> <div>Tags!</div></p>".getBytes("UTF-8");
-      
-      EvilUnclosedBRFixingInputStream inp = new EvilUnclosedBRFixingInputStream(
-            new ByteArrayInputStream(ok)
-      );
-      
-      ByteArrayOutputStream bout = new ByteArrayOutputStream();
-      boolean going = true;
-      while(going) {
-         byte[] b = new byte[1024];
-         int r = inp.read(b);
-         if(r > 0) {
-            bout.write(b, 0, r);
-         } else {
-            going = false;
-         }
-      }
-      
-      byte[] result = bout.toByteArray();
-      assertEquals(ok, result);
-   }
-   
-   public void testProblem() throws Exception {
-      byte[] orig = "<p><div>Hello<br>There!</div> <div>Tags!</div></p>".getBytes("UTF-8");
-      byte[] fixed = "<p><div>Hello<br/>There!</div> <div>Tags!</div></p>".getBytes("UTF-8");
-      
-      EvilUnclosedBRFixingInputStream inp = new EvilUnclosedBRFixingInputStream(
-            new ByteArrayInputStream(orig)
-      );
-      
-      ByteArrayOutputStream bout = new ByteArrayOutputStream();
-      boolean going = true;
-      while(going) {
-         byte[] b = new byte[1024];
-         int r = inp.read(b);
-         if(r > 0) {
-            bout.write(b, 0, r);
-         } else {
-            going = false;
-         }
-      }
-      
-      byte[] result = bout.toByteArray();
-      assertEquals(fixed, result);
-   }
-   
-   /**
-    * Checks that we can copy with br tags around the buffer boundaries
-    */
-   public void testBufferSize() throws Exception {
-      byte[] orig = "<p><div>Hello<br> <br>There!</div> <div>Tags!<br><br></div></p>".getBytes("UTF-8");
-      byte[] fixed = "<p><div>Hello<br/> <br/>There!</div> <div>Tags!<br/><br/></div></p>".getBytes("UTF-8");
-      
-      // Vary the buffer size, so that we can end up with the br in the
-      //  overflow or only part in the buffer
-      for(int i=5; i<orig.length; i++) {
-         EvilUnclosedBRFixingInputStream inp = new EvilUnclosedBRFixingInputStream(
-               new ByteArrayInputStream(orig)
-         );
-         
-         ByteArrayOutputStream bout = new ByteArrayOutputStream();
-         boolean going = true;
-         while(going) {
-            byte[] b = new byte[i];
-            int r = inp.read(b);
-            if(r > 0) {
-               bout.write(b, 0, r);
-            } else {
-               going = false;
-            }
-         }
-         
-         byte[] result = bout.toByteArray();
-         assertEquals(fixed, result);
-      }
-   }
-
-   protected void assertEquals(byte[] a, byte[] b) {
-      assertEquals(a.length, b.length);
-      for(int i=0; i<a.length; i++) {
-         assertEquals("Wrong byte at index " + i, a[i], b[i]);
-      }
-   }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java b/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java
deleted file mode 100644
index 90ea973..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xssf.util;
-
-import junit.framework.TestCase;
-
-
-public class TestNumericRanges extends TestCase {
-    
-    public void testGetOverlappingType() {
-        long[] r1 = {3, 8};
-        long[] r2 = {6, 11};
-        long[] r3 = {1, 5};
-        long[] r4 = {2, 20};
-        long[] r5 = {5, 6};
-        long[] r6 = {20, 23};
-        assertEquals(NumericRanges.OVERLAPS_1_MINOR, NumericRanges.getOverlappingType(r1, r2));
-        assertEquals(NumericRanges.OVERLAPS_2_MINOR, NumericRanges.getOverlappingType(r1, r3));
-        assertEquals(NumericRanges.OVERLAPS_2_WRAPS, NumericRanges.getOverlappingType(r1, r4));
-        assertEquals(NumericRanges.OVERLAPS_1_WRAPS, NumericRanges.getOverlappingType(r1, r5));
-        assertEquals(NumericRanges.NO_OVERLAPS, NumericRanges.getOverlappingType(r1, r6));
-    }
-    
-    public void testGetOverlappingRange() {
-        long[] r1 = {3, 8};
-        long[] r2 = {6, 11};
-        long[] r3 = {1, 5};
-        long[] r4 = {2, 20};
-        long[] r5 = {5, 6};
-        long[] r6 = {20, 23};
-        assertEquals(6, NumericRanges.getOverlappingRange(r1, r2)[0]);
-        assertEquals(8, NumericRanges.getOverlappingRange(r1, r2)[1]);
-        assertEquals(3, NumericRanges.getOverlappingRange(r1, r3)[0]);
-        assertEquals(5, NumericRanges.getOverlappingRange(r1, r3)[1]);
-        assertEquals(3, NumericRanges.getOverlappingRange(r1, r4)[0]);
-        assertEquals(8, NumericRanges.getOverlappingRange(r1, r4)[1]);
-        assertEquals(5, NumericRanges.getOverlappingRange(r1, r5)[0]);
-        assertEquals(6, NumericRanges.getOverlappingRange(r1, r5)[1]);
-        assertEquals(-1, NumericRanges.getOverlappingRange(r1, r6)[0]);
-        assertEquals(-1, NumericRanges.getOverlappingRange(r1, r6)[1]);
-    }
-    
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
deleted file mode 100644
index 7243f11..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf;
-
-import org.apache.poi.xwpf.extractor.TestXWPFWordExtractor;
-import org.apache.poi.xwpf.model.TestXWPFHeaderFooterPolicy;
-import org.apache.poi.xwpf.usermodel.TestXWPFDocument;
-import org.apache.poi.xwpf.usermodel.TestXWPFHeader;
-import org.apache.poi.xwpf.usermodel.TestXWPFHeadings;
-import org.apache.poi.xwpf.usermodel.TestXWPFNumbering;
-import org.apache.poi.xwpf.usermodel.TestXWPFParagraph;
-import org.apache.poi.xwpf.usermodel.TestXWPFPictureData;
-import org.apache.poi.xwpf.usermodel.TestXWPFRun;
-import org.apache.poi.xwpf.usermodel.TestXWPFStyles;
-import org.apache.poi.xwpf.usermodel.TestXWPFTable;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for <tt>org.apache.poi.xwpf</tt> and sub-packages.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        TestXWPFBugs.class,
-        org.apache.poi.xwpf.usermodel.TestXWPFBugs.class,
-        TestXWPFDocument.class,
-        TestXWPFWordExtractor.class,
-        TestXWPFHeaderFooterPolicy.class,
-        TestXWPFHeader.class,
-        TestXWPFHeadings.class,
-        TestXWPFParagraph.class,
-        TestXWPFRun.class,
-        TestXWPFTable.class,
-        TestXWPFStyles.class,
-        TestXWPFPictureData.class,
-        TestXWPFNumbering.class,
-        TestAllExtendedProperties.class,
-        TestPackageCorePropertiesGetKeywords.class
-})
-public final class AllXWPFTests {
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java
deleted file mode 100644
index ff955da..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIXMLProperties.CoreProperties;
-import org.apache.poi.openxml4j.opc.PackageProperties;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTDigSigBlob;
-import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties;
-import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTVectorLpstr;
-import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTVectorVariant;
-
-/**
- * Tests if the {@link CoreProperties#getKeywords()} method. This test has been
- * submitted because even though the
- * {@link PackageProperties#getKeywordsProperty()} had been present before, the
- * {@link CoreProperties#getKeywords()} had been missing.
- * <p/>
- * The author of this has added {@link CoreProperties#getKeywords()} and
- * {@link CoreProperties#setKeywords(String)} and this test is supposed to test
- * them.
- *
- * @author Antoni Mylka
- */
-public final class TestAllExtendedProperties extends TestCase {
-    public void testGetAllExtendedProperties() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("TestPoiXMLDocumentCorePropertiesGetKeywords.docx");
-        CTProperties ctProps = doc.getProperties().getExtendedProperties().getUnderlyingProperties();
-        assertEquals("Microsoft Office Word", ctProps.getApplication());
-        assertEquals("14.0000", ctProps.getAppVersion());
-        assertEquals(57, ctProps.getCharacters());
-        assertEquals(66, ctProps.getCharactersWithSpaces());
-        assertEquals("", ctProps.getCompany());
-        assertNull(ctProps.getDigSig());
-        assertEquals(0, ctProps.getDocSecurity());
-        assertNotNull(ctProps.getDomNode());
-
-        CTVectorVariant vec = ctProps.getHeadingPairs();
-        assertEquals(2, vec.getVector().sizeOfVariantArray());
-        assertEquals("Title", vec.getVector().getVariantArray(0).getLpstr());
-        assertEquals(1, vec.getVector().getVariantArray(1).getI4());
-
-        assertFalse(ctProps.isSetHiddenSlides());
-        assertEquals(0, ctProps.getHiddenSlides());
-        assertFalse(ctProps.isSetHLinks());
-        assertNull(ctProps.getHLinks());
-        assertNull(ctProps.getHyperlinkBase());
-        assertTrue(ctProps.isSetHyperlinksChanged());
-        assertFalse(ctProps.getHyperlinksChanged());
-        assertEquals(1, ctProps.getLines());
-        assertTrue(ctProps.isSetLinksUpToDate());
-        assertFalse(ctProps.getLinksUpToDate());
-        assertNull(ctProps.getManager());
-        assertFalse(ctProps.isSetMMClips());
-        assertEquals(0, ctProps.getMMClips());
-        assertFalse(ctProps.isSetNotes());
-        assertEquals(0, ctProps.getNotes());
-        assertEquals(1, ctProps.getPages());
-        assertEquals(1, ctProps.getParagraphs());
-        assertNull(ctProps.getPresentationFormat());
-        assertTrue(ctProps.isSetScaleCrop());
-        assertFalse(ctProps.getScaleCrop());
-        assertTrue(ctProps.isSetSharedDoc());
-        assertFalse(ctProps.getSharedDoc());
-        assertFalse(ctProps.isSetSlides());
-        assertEquals(0, ctProps.getSlides());
-        assertEquals("Normal.dotm", ctProps.getTemplate());
-
-        CTVectorLpstr vec2 = ctProps.getTitlesOfParts();
-        assertEquals(1, vec2.getVector().sizeOfLpstrArray());
-        assertEquals("Example Word 2010 Document", vec2.getVector().getLpstrArray(0));
-
-        assertEquals(3, ctProps.getTotalTime());
-        assertEquals(10, ctProps.getWords());
-
-        // Check the digital signature part
-        // Won't be there in this file, but we
-        //  need to do this check so that the
-        //  appropriate parts end up in the
-        //  smaller ooxml schemas file
-        CTDigSigBlob blob = ctProps.getDigSig();
-        assertNull(blob);
-
-        blob = CTDigSigBlob.Factory.newInstance();
-        blob.setBlob(new byte[]{2, 6, 7, 2, 3, 4, 5, 1, 2, 3});
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
deleted file mode 100644
index 67ad794..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.junit.Test;
-
-public class TestDocumentProtection {
-
-    @Test
-    public void testShouldReadEnforcementProperties() throws Exception {
-
-        XWPFDocument documentWithoutDocumentProtectionTag = XWPFTestDataSamples.openSampleDocument("documentProtection_no_protection.docx");
-        assertFalse(documentWithoutDocumentProtectionTag.isEnforcedReadonlyProtection());
-        assertFalse(documentWithoutDocumentProtectionTag.isEnforcedFillingFormsProtection());
-        assertFalse(documentWithoutDocumentProtectionTag.isEnforcedCommentsProtection());
-        assertFalse(documentWithoutDocumentProtectionTag.isEnforcedTrackedChangesProtection());
-
-        XWPFDocument documentWithoutEnforcement = XWPFTestDataSamples.openSampleDocument("documentProtection_no_protection_tag_existing.docx");
-        assertFalse(documentWithoutEnforcement.isEnforcedReadonlyProtection());
-        assertFalse(documentWithoutEnforcement.isEnforcedFillingFormsProtection());
-        assertFalse(documentWithoutEnforcement.isEnforcedCommentsProtection());
-        assertFalse(documentWithoutEnforcement.isEnforcedTrackedChangesProtection());
-
-        XWPFDocument documentWithReadonlyEnforcement = XWPFTestDataSamples.openSampleDocument("documentProtection_readonly_no_password.docx");
-        assertTrue(documentWithReadonlyEnforcement.isEnforcedReadonlyProtection());
-        assertFalse(documentWithReadonlyEnforcement.isEnforcedFillingFormsProtection());
-        assertFalse(documentWithReadonlyEnforcement.isEnforcedCommentsProtection());
-        assertFalse(documentWithReadonlyEnforcement.isEnforcedTrackedChangesProtection());
-
-        XWPFDocument documentWithFillingFormsEnforcement = XWPFTestDataSamples.openSampleDocument("documentProtection_forms_no_password.docx");
-        assertTrue(documentWithFillingFormsEnforcement.isEnforcedFillingFormsProtection());
-        assertFalse(documentWithFillingFormsEnforcement.isEnforcedReadonlyProtection());
-        assertFalse(documentWithFillingFormsEnforcement.isEnforcedCommentsProtection());
-        assertFalse(documentWithFillingFormsEnforcement.isEnforcedTrackedChangesProtection());
-
-        XWPFDocument documentWithCommentsEnforcement = XWPFTestDataSamples.openSampleDocument("documentProtection_comments_no_password.docx");
-        assertFalse(documentWithCommentsEnforcement.isEnforcedFillingFormsProtection());
-        assertFalse(documentWithCommentsEnforcement.isEnforcedReadonlyProtection());
-        assertTrue(documentWithCommentsEnforcement.isEnforcedCommentsProtection());
-        assertFalse(documentWithCommentsEnforcement.isEnforcedTrackedChangesProtection());
-
-        XWPFDocument documentWithTrackedChangesEnforcement = XWPFTestDataSamples.openSampleDocument("documentProtection_trackedChanges_no_password.docx");
-        assertFalse(documentWithTrackedChangesEnforcement.isEnforcedFillingFormsProtection());
-        assertFalse(documentWithTrackedChangesEnforcement.isEnforcedReadonlyProtection());
-        assertFalse(documentWithTrackedChangesEnforcement.isEnforcedCommentsProtection());
-        assertTrue(documentWithTrackedChangesEnforcement.isEnforcedTrackedChangesProtection());
-
-    }
-
-    @Test
-    public void testShouldEnforceForReadOnly() throws Exception {
-        //		XWPFDocument document = createDocumentFromSampleFile("test-data/document/documentProtection_no_protection.docx");
-        XWPFDocument document = XWPFTestDataSamples.openSampleDocument("documentProtection_no_protection.docx");
-        assertFalse(document.isEnforcedReadonlyProtection());
-
-        document.enforceReadonlyProtection();
-
-        assertTrue(document.isEnforcedReadonlyProtection());
-    }
-
-    @Test
-    public void testShouldEnforceForFillingForms() throws Exception {
-        XWPFDocument document = XWPFTestDataSamples.openSampleDocument("documentProtection_no_protection.docx");
-        assertFalse(document.isEnforcedFillingFormsProtection());
-
-        document.enforceFillingFormsProtection();
-
-        assertTrue(document.isEnforcedFillingFormsProtection());
-    }
-
-    @Test
-    public void testShouldEnforceForComments() throws Exception {
-        XWPFDocument document = XWPFTestDataSamples.openSampleDocument("documentProtection_no_protection.docx");
-        assertFalse(document.isEnforcedCommentsProtection());
-
-        document.enforceCommentsProtection();
-
-        assertTrue(document.isEnforcedCommentsProtection());
-    }
-
-    @Test
-    public void testShouldEnforceForTrackedChanges() throws Exception {
-        XWPFDocument document = XWPFTestDataSamples.openSampleDocument("documentProtection_no_protection.docx");
-        assertFalse(document.isEnforcedTrackedChangesProtection());
-
-        document.enforceTrackedChangesProtection();
-
-        assertTrue(document.isEnforcedTrackedChangesProtection());
-    }
-
-    @Test
-    public void testShouldUnsetEnforcement() throws Exception {
-        XWPFDocument document = XWPFTestDataSamples.openSampleDocument("documentProtection_readonly_no_password.docx");
-        assertTrue(document.isEnforcedReadonlyProtection());
-
-        document.removeProtectionEnforcement();
-
-        assertFalse(document.isEnforcedReadonlyProtection());
-    }
-
-    @Test
-    public void testIntegration() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-
-        XWPFParagraph p1 = doc.createParagraph();
-
-        XWPFRun r1 = p1.createRun();
-        r1.setText("Lorem ipsum dolor sit amet.");
-        doc.enforceCommentsProtection();
-
-        File tempFile = TempFile.createTempFile("documentProtectionFile", ".docx");
-        FileOutputStream out = new FileOutputStream(tempFile);
-
-        doc.write(out);
-        out.close();
-
-        FileInputStream inputStream = new FileInputStream(tempFile);
-        XWPFDocument document = new XWPFDocument(inputStream);
-        inputStream.close();
-
-        assertTrue(document.isEnforcedCommentsProtection());
-    }
-
-    @Test
-    public void testUpdateFields() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-        assertFalse(doc.isEnforcedUpdateFields());
-        doc.enforceUpdateFields();
-        assertTrue(doc.isEnforcedUpdateFields());
-    }
-
-    @Test
-    public void bug56076_read() throws Exception {
-        // test legacy xored-hashed password
-        assertEquals("64CEED7E", CryptoFunctions.xorHashPassword("Example"));
-        // check leading 0
-        assertEquals("0005CB00", CryptoFunctions.xorHashPassword("34579"));
-
-        // test document write protection with password
-        XWPFDocument document = XWPFTestDataSamples.openSampleDocument("bug56076.docx");
-        boolean isValid = document.validateProtectionPassword("Example");
-        assertTrue(isValid);
-    }
-
-    @Test
-    public void bug56076_write() throws Exception {
-        // test document write protection with password
-        XWPFDocument document = new XWPFDocument();
-        document.enforceCommentsProtection("Example", HashAlgorithm.sha512);
-        document = XWPFTestDataSamples.writeOutAndReadBack(document);
-        boolean isValid = document.validateProtectionPassword("Example");
-        assertTrue(isValid);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
deleted file mode 100644
index 85a21f1..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIXMLProperties.CoreProperties;
-import org.apache.poi.openxml4j.opc.PackageProperties;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-/**
- * Tests if the {@link CoreProperties#getKeywords()} method. This test has been
- * submitted because even though the
- * {@link PackageProperties#getKeywordsProperty()} had been present before, the
- * {@link CoreProperties#getKeywords()} had been missing.
- * <p/>
- * The author of this has added {@link CoreProperties#getKeywords()} and
- * {@link CoreProperties#setKeywords(String)} and this test is supposed to test
- * them.
- *
- * @author Antoni Mylka
- */
-public final class TestPackageCorePropertiesGetKeywords extends TestCase {
-    public void testGetSetKeywords() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("TestPoiXMLDocumentCorePropertiesGetKeywords.docx");
-        String keywords = doc.getProperties().getCoreProperties().getKeywords();
-        assertEquals("extractor, test, rdf", keywords);
-
-        doc.getProperties().getCoreProperties().setKeywords("test, keywords");
-        doc = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        keywords = doc.getProperties().getCoreProperties().getKeywords();
-        assertEquals("test, keywords", keywords);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
deleted file mode 100644
index 92f738c..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import javax.crypto.Cipher;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Assume;
-import org.junit.Test;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.DocumentDocument;
-
-public class TestXWPFBugs {
-    /**
-     * A word document that's encrypted with non-standard
-     * Encryption options, and no cspname section. See bug 53475
-     */
-    @Test
-    public void bug53475NoCSPName() throws Exception {
-        File file = POIDataSamples.getDocumentInstance().getFile("bug53475-password-is-solrcell.docx");
-        NPOIFSFileSystem filesystem = new NPOIFSFileSystem(file, true);
-
-        // Check the encryption details
-        EncryptionInfo info = new EncryptionInfo(filesystem);
-        assertEquals(128, info.getHeader().getKeySize());
-        assertEquals(CipherAlgorithm.aes128, info.getHeader().getCipherAlgorithm());
-        assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx());
-
-        // Check it can be decoded
-        Decryptor d = Decryptor.getInstance(info);
-        assertTrue("Unable to process: document is encrypted", d.verifyPassword("solrcell"));
-
-        // Check we can read the word document in that
-        InputStream dataStream = d.getDataStream(filesystem);
-        OPCPackage opc = OPCPackage.open(dataStream);
-        XWPFDocument doc = new XWPFDocument(opc);
-        XWPFWordExtractor ex = new XWPFWordExtractor(doc);
-        String text = ex.getText();
-        assertNotNull(text);
-        assertEquals("This is password protected Word document.", text.trim());
-        ex.close();
-
-        filesystem.close();
-    }
-
-    /**
-     * A word document with aes-256, i.e. aes is always 128 bit (= 128 bit block size),
-     * but the key can be 128/192/256 bits
-     */
-    @Test
-    public void bug53475_aes256() throws Exception {
-        int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES");
-        Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files for AES 256", maxKeyLen == 2147483647);
-
-        File file = POIDataSamples.getDocumentInstance().getFile("bug53475-password-is-pass.docx");
-        NPOIFSFileSystem filesystem = new NPOIFSFileSystem(file, true);
-
-        // Check the encryption details
-        EncryptionInfo info = new EncryptionInfo(filesystem);
-        assertEquals(16, info.getHeader().getBlockSize());
-        assertEquals(256, info.getHeader().getKeySize());
-        assertEquals(CipherAlgorithm.aes256, info.getHeader().getCipherAlgorithm());
-        assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx());
-
-        // Check it can be decoded
-        Decryptor d = Decryptor.getInstance(info);
-        assertTrue("Unable to process: document is encrypted", d.verifyPassword("pass"));
-
-        // Check we can read the word document in that
-        InputStream dataStream = d.getDataStream(filesystem);
-        OPCPackage opc = OPCPackage.open(dataStream);
-        XWPFDocument doc = new XWPFDocument(opc);
-        XWPFWordExtractor ex = new XWPFWordExtractor(doc);
-        String text = ex.getText();
-        assertNotNull(text);
-        // I know ... a stupid typo, maybe next time ...
-        assertEquals("The is a password protected document.", text.trim());
-        ex.close();
-
-        filesystem.close();
-    }
-
-    
-    @Test
-    public void bug59058() throws IOException, XmlException {
-        String files[] = { "bug57031.docx", "bug59058.docx" };
-        for (String f : files) {
-            ZipFile zf = new ZipFile(POIDataSamples.getDocumentInstance().getFile(f));
-            ZipEntry entry = zf.getEntry("word/document.xml");
-            DocumentDocument document = DocumentDocument.Factory.parse(zf.getInputStream(entry));
-            assertNotNull(document);
-            zf.close();
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java
deleted file mode 100644
index d7f2222..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-/**
- * @author Yegor Kozlov
- */
-public class XWPFTestDataSamples {
-
-    public static XWPFDocument openSampleDocument(String sampleName) throws IOException {
-        InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream(sampleName);
-        return new XWPFDocument(is);
-    }
-
-    public static XWPFDocument writeOutAndReadBack(XWPFDocument doc) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-        doc.write(baos);
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        return new XWPFDocument(bais);
-    }
-
-    public static byte[] getImage(String filename) throws IOException {
-        InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream(filename);
-        try {
-            return IOUtils.toByteArray(is);
-        } finally {
-            is.close();
-        }
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java
deleted file mode 100644
index 929d430..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.extractor;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-public class TestExternalEntities extends TestCase {
-
-    /**
-     * Get text out of the simple file
-     *
-     * @throws IOException
-     */
-    public void testFile() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("ExternalEntityInText.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        String text = extractor.getText();
-
-        assertTrue(text.length() > 0);
-
-        // Check contents, they should not contain the text from POI web site after colon!
-        assertEquals("Here should not be the POI web site: \"\"", text.trim());
-
-        extractor.close();
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
deleted file mode 100644
index cf1ba0a..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.extractor;
-
-import java.io.IOException;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-/**
- * Tests for HXFWordExtractor
- */
-public class TestXWPFWordExtractor extends TestCase {
-
-    /**
-     * Get text out of the simple file
-     *
-     * @throws IOException
-     */
-    public void testGetSimpleText() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-
-        // Check contents
-        assertTrue(text.startsWith(
-                "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc at risus vel erat tempus posuere. Aenean non ante. Suspendisse vehicula dolor sit amet odio."
-        ));
-        assertTrue(text.endsWith(
-                "Phasellus ultricies mi nec leo. Sed tempus. In sit amet lorem at velit faucibus vestibulum.\n"
-        ));
-
-        // Check number of paragraphs by counting number of newlines
-        int numberOfParagraphs = StringUtil.countMatches(text, '\n');
-        assertEquals(3, numberOfParagraphs);
-
-        extractor.close();
-    }
-
-    /**
-     * Tests getting the text out of a complex file
-     *
-     * @throws IOException
-     */
-    public void testGetComplexText() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("IllustrativeCases.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-
-        char euro = '\u20ac';
-//		System.err.println("'"+text.substring(text.length() - 40) + "'");
-
-        // Check contents
-        assertTrue(text.startsWith(
-                "  \n(V) ILLUSTRATIVE CASES\n\n"
-        ));
-        assertTrue(text.contains(
-                "As well as gaining " + euro + "90 from child benefit increases, he will also receive the early childhood supplement of " + euro + "250 per quarter for Vincent for the full four quarters of the year.\n\n\n\n"// \n\n\n"
-        ));
-        assertTrue(text.endsWith(
-                "11.4%\t\t90\t\t\t\t\t250\t\t1,310\t\n\n \n\n\n"
-        ));
-
-        // Check number of paragraphs by counting number of newlines
-        int numberOfParagraphs = StringUtil.countMatches(text, '\n');
-        assertEquals(134, numberOfParagraphs);
-
-        extractor.close();
-    }
-
-    public void testGetWithHyperlinks() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("TestDocument.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        // Now check contents
-        extractor.setFetchHyperlinks(false);
-        assertEquals(
-                "This is a test document.\nThis bit is in bold and italic\n" +
-                        "Back to normal\n" +
-                        "This contains BOLD, ITALIC and BOTH, as well as RED and YELLOW text.\n" +
-                        "We have a hyperlink here, and another.\n",
-                extractor.getText()
-        );
-
-        // One hyperlink is a real one, one is just to the top of page
-        extractor.setFetchHyperlinks(true);
-        assertEquals(
-                "This is a test document.\nThis bit is in bold and italic\n" +
-                        "Back to normal\n" +
-                        "This contains BOLD, ITALIC and BOTH, as well as RED and YELLOW text.\n" +
-                        "We have a hyperlink <http://poi.apache.org/> here, and another.\n",
-                extractor.getText()
-        );
-
-        extractor.close();
-    }
-
-    public void testHeadersFooters() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("ThreeColHeadFoot.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        assertEquals(
-                "First header column!\tMid header\tRight header!\n" +
-                        "This is a sample word document. It has two pages. It has a three column heading, and a three column footer\n" +
-                        "\n" +
-                        "HEADING TEXT\n" +
-                        "\n" +
-                        "More on page one\n" +
-                        "\n\n" +
-                        "End of page 1\n\n\n" +
-                        "This is page two. It also has a three column heading, and a three column footer.\n" +
-                        "Footer Left\tFooter Middle\tFooter Right\n",
-                extractor.getText()
-        );
-
-        // Now another file, expect multiple headers
-        //  and multiple footers
-        doc = XWPFTestDataSamples.openSampleDocument("DiffFirstPageHeadFoot.docx");
-        extractor.close();
-
-        extractor = new XWPFWordExtractor(doc);
-        extractor.close();
-
-        extractor =
-                new XWPFWordExtractor(doc);
-        extractor.getText();
-
-        assertEquals(
-                "I am the header on the first page, and I" + '\u2019' + "m nice and simple\n" +
-                        "First header column!\tMid header\tRight header!\n" +
-                        "This is a sample word document. It has two pages. It has a simple header and footer, which is different to all the other pages.\n" +
-                        "\n" +
-                        "HEADING TEXT\n" +
-                        "\n" +
-                        "More on page one\n" +
-                        "\n\n" +
-                        "End of page 1\n\n\n" +
-                        "This is page two. It also has a three column heading, and a three column footer.\n" +
-                        "The footer of the first page\n" +
-                        "Footer Left\tFooter Middle\tFooter Right\n",
-                extractor.getText()
-        );
-
-        extractor.close();
-    }
-
-    public void testFootnotes() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("footnotes.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-        String text = extractor.getText();
-        assertTrue(text.contains("snoska"));
-        assertTrue(text.contains("Eto ochen prostoy[footnoteRef:1] text so snoskoy"));
-
-        extractor.close();
-    }
-
-
-    public void testTableFootnotes() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("table_footnotes.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        assertTrue(extractor.getText().contains("snoska"));
-
-        extractor.close();
-    }
-
-    public void testFormFootnotes() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("form_footnotes.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        String text = extractor.getText();
-        assertTrue("Unable to find expected word in text\n" + text, text.contains("testdoc"));
-        assertTrue("Unable to find expected word in text\n" + text, text.contains("test phrase"));
-
-        extractor.close();
-    }
-
-    public void testEndnotes() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("endnotes.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-        String text = extractor.getText();
-        assertTrue(text.contains("XXX"));
-        assertTrue(text.contains("tilaka [endnoteRef:2]or 'tika'"));
-
-        extractor.close();
-    }
-
-    public void testInsertedDeletedText() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("delins.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        assertTrue(extractor.getText().contains("pendant worn"));
-        assertTrue(extractor.getText().contains("extremely well"));
-
-        extractor.close();
-    }
-
-    public void testParagraphHeader() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Headers.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        assertTrue(extractor.getText().contains("Section 1"));
-        assertTrue(extractor.getText().contains("Section 2"));
-        assertTrue(extractor.getText().contains("Section 3"));
-
-        extractor.close();
-    }
-
-    /**
-     * Test that we can open and process .docm
-     * (macro enabled) docx files (bug #45690)
-     *
-     * @throws IOException
-     */
-    public void testDOCMFiles() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("45690.docm");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        assertTrue(extractor.getText().contains("2004"));
-        assertTrue(extractor.getText().contains("2008"));
-        assertTrue(extractor.getText().contains("(120 "));
-
-        extractor.close();
-    }
-
-    /**
-     * Test that we handle things like tabs and
-     * carriage returns properly in the text that
-     * we're extracting (bug #49189)
-     *
-     * @throws IOException
-     */
-    public void testDocTabs() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("WithTabs.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        // Check bits
-        assertTrue(extractor.getText().contains("a"));
-        assertTrue(extractor.getText().contains("\t"));
-        assertTrue(extractor.getText().contains("b"));
-
-        // Now check the first paragraph in total
-        assertTrue(extractor.getText().contains("a\tb\n"));
-
-        extractor.close();
-    }
-
-    /**
-     * The output should not contain field codes, e.g. those specified in the
-     * w:instrText tag (spec sec. 17.16.23)
-     *
-     * @throws IOException
-     */
-    public void testNoFieldCodes() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("FieldCodes.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-        assertFalse(text.contains("AUTHOR"));
-        assertFalse(text.contains("CREATEDATE"));
-
-        extractor.close();
-    }
-
-    /**
-     * The output should contain the values of simple fields, those specified
-     * with the fldSimple element (spec sec. 17.16.19)
-     *
-     * @throws IOException
-     */
-    public void testFldSimpleContent() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("FldSimple.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-        assertTrue(text.contains("FldSimple.docx"));
-
-        extractor.close();
-    }
-
-    /**
-     * Test for parsing document with drawings to prevent
-     * NoClassDefFoundError for CTAnchor in XWPFRun
-     */
-    public void testDrawings() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("drawing.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-        String text = extractor.getText();
-        assertTrue(text.length() > 0);
-
-        extractor.close();
-    }
-
-    /**
-     * Test for basic extraction of SDT content
-     *
-     * @throws IOException
-     */
-    public void testSimpleControlContent() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug54849.docx");
-        String[] targs = new String[]{
-                "header_rich_text",
-                "rich_text",
-                "rich_text_pre_table\nrich_text_cell1\t\t\t\n\t\t\t\n\t\t\t\n\nrich_text_post_table",
-                "plain_text_no_newlines",
-                "plain_text_with_newlines1\nplain_text_with_newlines2\n",
-                "watermelon\n",
-                "dirt\n",
-                "4/16/2013\n",
-                "rich_text_in_cell",
-                "abc",
-                "rich_text_in_paragraph_in_cell",
-                "footer_rich_text",
-                "footnote_sdt",
-                "endnote_sdt"
-        };
-        XWPFWordExtractor ex = new XWPFWordExtractor(doc);
-        String s = ex.getText().toLowerCase(Locale.ROOT);
-        int hits = 0;
-
-        for (String targ : targs) {
-            boolean hit = false;
-            if (s.contains(targ)) {
-                hit = true;
-                hits++;
-            }
-            assertEquals("controlled content loading-" + targ, true, hit);
-        }
-        assertEquals("controlled content loading hit count", targs.length, hits);
-        ex.close();
-
-
-        doc = XWPFTestDataSamples.openSampleDocument("Bug54771a.docx");
-        targs = new String[]{
-                "bb",
-                "test subtitle\n",
-                "test user\n",
-        };
-        ex = new XWPFWordExtractor(doc);
-        s = ex.getText().toLowerCase(Locale.ROOT);
-
-        //At one point in development there were three copies of the text.
-        //This ensures that there is only one copy.
-        for (String targ : targs) {
-            Matcher m = Pattern.compile(targ).matcher(s);
-            int hit = 0;
-            while (m.find()) {
-                hit++;
-            }
-            assertEquals("controlled content loading-" + targ, 1, hit);
-        }
-        //"test\n" appears twice: once as the "title" and once in the text.
-        //This also happens when you save this document as text from MSWord.
-        Matcher m = Pattern.compile("test\n").matcher(s);
-        int hit = 0;
-        while (m.find()) {
-            hit++;
-        }
-        assertEquals("test<N>", 2, hit);
-        ex.close();
-    }
-
-    /**
-     * No Header or Footer in document
-     */
-    public void testBug55733() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("55733.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        // Check it gives text without error
-        extractor.getText();
-        extractor.close();
-    }
-
-    public void testCheckboxes() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("checkboxes.docx");
-        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
-        assertEquals("This is a small test for checkboxes \nunchecked: |_| \n" +
-                "Or checked: |X|\n\n\n\n\n" +
-                "Test a checkbox within a textbox: |_| -> |X|\n\n\n" +
-                "In Table:\n|_|\t|X|\n\n\n" +
-                "In Sequence:\n|X||_||X|\n", extractor.getText());
-        extractor.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
deleted file mode 100644
index d12020b..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.model;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-
-/**
- * Tests for the various XWPF decorators
- */
-public class TestXWPFDecorators extends TestCase {
-    private XWPFDocument simple;
-    private XWPFDocument hyperlink;
-    private XWPFDocument comments;
-
-    @Override
-    protected void setUp() throws IOException {
-        simple = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
-        hyperlink = XWPFTestDataSamples.openSampleDocument("TestDocument.docx");
-        comments = XWPFTestDataSamples.openSampleDocument("WordWithAttachments.docx");
-    }
-
-    public void testHyperlink() {
-        XWPFParagraph ps;
-        XWPFParagraph ph;
-        assertEquals(7, simple.getParagraphs().size());
-        assertEquals(5, hyperlink.getParagraphs().size());
-
-        // Simple text
-        ps = simple.getParagraphs().get(0);
-        assertEquals("I am a test document", ps.getParagraphText());
-        assertEquals(1, ps.getRuns().size());
-
-        ph = hyperlink.getParagraphs().get(4);
-        assertEquals("We have a hyperlink here, and another.", ph.getParagraphText());
-        assertEquals(3, ph.getRuns().size());
-
-
-        // The proper way to do hyperlinks(!)
-        assertFalse(ps.getRuns().get(0) instanceof XWPFHyperlinkRun);
-        assertFalse(ph.getRuns().get(0) instanceof XWPFHyperlinkRun);
-        assertTrue(ph.getRuns().get(1) instanceof XWPFHyperlinkRun);
-        assertFalse(ph.getRuns().get(2) instanceof XWPFHyperlinkRun);
-
-        XWPFHyperlinkRun link = (XWPFHyperlinkRun) ph.getRuns().get(1);
-        assertEquals("http://poi.apache.org/", link.getHyperlink(hyperlink).getURL());
-    }
-
-    public void testComments() {
-        int numComments = 0;
-        for (XWPFParagraph p : comments.getParagraphs()) {
-            XWPFCommentsDecorator d = new XWPFCommentsDecorator(p, null);
-            if (d.getCommentText().length() > 0) {
-                numComments++;
-                assertEquals("\tComment by", d.getCommentText().substring(0, 11));
-            }
-        }
-        assertEquals(3, numComments);
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
deleted file mode 100644
index 0596a94..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.model;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFFooter;
-import org.apache.poi.xwpf.usermodel.XWPFHeader;
-
-/**
- * Tests for XWPF Header Footer Stuff
- */
-public class TestXWPFHeaderFooterPolicy extends TestCase {
-    private XWPFDocument noHeader;
-    private XWPFDocument header;
-    private XWPFDocument headerFooter;
-    private XWPFDocument footer;
-    private XWPFDocument oddEven;
-    private XWPFDocument diffFirst;
-
-    @Override
-    protected void setUp() throws IOException {
-        noHeader = XWPFTestDataSamples.openSampleDocument("NoHeadFoot.docx");
-        header = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
-        headerFooter = XWPFTestDataSamples.openSampleDocument("SimpleHeadThreeColFoot.docx");
-        footer = XWPFTestDataSamples.openSampleDocument("FancyFoot.docx");
-        oddEven = XWPFTestDataSamples.openSampleDocument("PageSpecificHeadFoot.docx");
-        diffFirst = XWPFTestDataSamples.openSampleDocument("DiffFirstPageHeadFoot.docx");
-    }
-
-    public void testPolicy() {
-        XWPFHeaderFooterPolicy policy;
-
-        policy = noHeader.getHeaderFooterPolicy();
-        assertNull(policy.getDefaultHeader());
-        assertNull(policy.getDefaultFooter());
-
-        assertNull(policy.getHeader(1));
-        assertNull(policy.getHeader(2));
-        assertNull(policy.getHeader(3));
-        assertNull(policy.getFooter(1));
-        assertNull(policy.getFooter(2));
-        assertNull(policy.getFooter(3));
-
-
-        policy = header.getHeaderFooterPolicy();
-        assertNotNull(policy.getDefaultHeader());
-        assertNull(policy.getDefaultFooter());
-
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
-        assertNull(policy.getFooter(1));
-        assertNull(policy.getFooter(2));
-        assertNull(policy.getFooter(3));
-
-
-        policy = footer.getHeaderFooterPolicy();
-        assertNull(policy.getDefaultHeader());
-        assertNotNull(policy.getDefaultFooter());
-
-        assertNull(policy.getHeader(1));
-        assertNull(policy.getHeader(2));
-        assertNull(policy.getHeader(3));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-
-
-        policy = headerFooter.getHeaderFooterPolicy();
-        assertNotNull(policy.getDefaultHeader());
-        assertNotNull(policy.getDefaultFooter());
-
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-
-
-        policy = oddEven.getHeaderFooterPolicy();
-        assertNotNull(policy.getDefaultHeader());
-        assertNotNull(policy.getDefaultFooter());
-        assertNotNull(policy.getEvenPageHeader());
-        assertNotNull(policy.getEvenPageFooter());
-
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
-        assertEquals(policy.getEvenPageHeader(), policy.getHeader(2));
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
-        assertEquals(policy.getEvenPageFooter(), policy.getFooter(2));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-
-
-        policy = diffFirst.getHeaderFooterPolicy();
-        assertNotNull(policy.getDefaultHeader());
-        assertNotNull(policy.getDefaultFooter());
-        assertNotNull(policy.getFirstPageHeader());
-        assertNotNull(policy.getFirstPageFooter());
-        assertNull(policy.getEvenPageHeader());
-        assertNull(policy.getEvenPageFooter());
-
-        assertEquals(policy.getFirstPageHeader(), policy.getHeader(1));
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
-        assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
-        assertEquals(policy.getFirstPageFooter(), policy.getFooter(1));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
-        assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-    }
-    
-    @SuppressWarnings("resource")
-    public void testCreate() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-        assertEquals(null, doc.getHeaderFooterPolicy());
-        assertEquals(0, doc.getHeaderList().size());
-        assertEquals(0, doc.getFooterList().size());
-        
-        XWPFHeaderFooterPolicy policy = doc.createHeaderFooterPolicy();
-        assertNotNull(doc.getHeaderFooterPolicy());
-        assertEquals(0, doc.getHeaderList().size());
-        assertEquals(0, doc.getFooterList().size());
-        
-        // Create a header and a footer
-        XWPFHeader header = policy.createHeader(XWPFHeaderFooterPolicy.DEFAULT);
-        XWPFFooter footer = policy.createFooter(XWPFHeaderFooterPolicy.DEFAULT);
-        header.createParagraph().createRun().setText("Header Hello");
-        footer.createParagraph().createRun().setText("Footer Bye");
-        
-        
-        // Save, re-load, and check
-        doc = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        assertNotNull(doc.getHeaderFooterPolicy());
-        assertEquals(1, doc.getHeaderList().size());
-        assertEquals(1, doc.getFooterList().size());
-        
-        assertEquals("Header Hello\n", doc.getHeaderList().get(0).getText());
-        assertEquals("Footer Bye\n", doc.getFooterList().get(0).getText());
-    }
-
-    public void testContents() {
-        XWPFHeaderFooterPolicy policy;
-
-        // Test a few simple bits off a simple header
-        policy = diffFirst.getHeaderFooterPolicy();
-
-        assertEquals(
-                "I am the header on the first page, and I" + '\u2019' + "m nice and simple\n",
-                policy.getFirstPageHeader().getText()
-        );
-        assertEquals(
-                "First header column!\tMid header\tRight header!\n",
-                policy.getDefaultHeader().getText()
-        );
-
-
-        // And a few bits off a more complex header
-        policy = oddEven.getHeaderFooterPolicy();
-
-        assertEquals(
-                "[ODD Page Header text]\n\n",
-                policy.getDefaultHeader().getText()
-        );
-        assertEquals(
-                "[This is an Even Page, with a Header]\n\n",
-                policy.getEvenPageHeader().getText()
-        );
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
deleted file mode 100644
index 47ec765..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.junit.Test;
-
-public class TestChangeTracking {
-    @Test
-    public void detection() throws Exception {
-        XWPFDocument documentWithoutChangeTracking = XWPFTestDataSamples.openSampleDocument("bug56075-changeTracking_off.docx");
-        assertFalse(documentWithoutChangeTracking.isTrackRevisions());
-
-        XWPFDocument documentWithChangeTracking = XWPFTestDataSamples.openSampleDocument("bug56075-changeTracking_on.docx");
-        assertTrue(documentWithChangeTracking.isTrackRevisions());
-    }
-
-    @Test
-    public void activateChangeTracking() throws Exception {
-        XWPFDocument document = XWPFTestDataSamples.openSampleDocument("bug56075-changeTracking_off.docx");
-        assertFalse(document.isTrackRevisions());
-
-        document.setTrackRevisions(true);
-
-        assertTrue(document.isTrackRevisions());
-    }
-
-    @Test
-    @SuppressWarnings("resource")
-    public void integration() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-
-        XWPFParagraph p1 = doc.createParagraph();
-
-        XWPFRun r1 = p1.createRun();
-        r1.setText("Lorem ipsum dolor sit amet.");
-        doc.setTrackRevisions(true);
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        doc.write(out);
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(out.toByteArray());
-        XWPFDocument document = new XWPFDocument(inputStream);
-        inputStream.close();
-
-        assertTrue(document.isTrackRevisions());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
deleted file mode 100644
index 28980da..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.util.Units;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFRun.FontCharRange;
-import org.junit.Test;
-
-public class TestXWPFBugs {
-    @Test
-    public void bug55802() throws Exception {
-        String blabla =
-                "Bir, iki, \u00fc\u00e7, d\u00f6rt, be\u015f,\n" +
-                        "\nalt\u0131, yedi, sekiz, dokuz, on.\n" +
-                        "\nK\u0131rm\u0131z\u0131 don,\n" +
-                        "\ngel bizim bah\u00e7eye kon,\n" +
-                        "\nsar\u0131 limon";
-        XWPFDocument doc = new XWPFDocument();
-        XWPFRun run = doc.createParagraph().createRun();
-
-        for (String str : blabla.split("\n")) {
-            run.setText(str);
-            run.addBreak();
-        }
-
-        run.setFontFamily("Times New Roman");
-        run.setFontSize(20);
-        assertEquals(run.getFontFamily(), "Times New Roman");
-        assertEquals(run.getFontFamily(FontCharRange.cs), "Times New Roman");
-        assertEquals(run.getFontFamily(FontCharRange.eastAsia), "Times New Roman");
-        assertEquals(run.getFontFamily(FontCharRange.hAnsi), "Times New Roman");
-        run.setFontFamily("Arial", FontCharRange.hAnsi);
-        assertEquals(run.getFontFamily(FontCharRange.hAnsi), "Arial");
-        
-        doc.close();
-    }
-
-    @Test
-    public void bug57312_NullPointException() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("57312.docx");
-        assertNotNull(doc);
-
-        for (IBodyElement bodyElement : doc.getBodyElements()) {
-            BodyElementType elementType = bodyElement.getElementType();
-
-            if (elementType == BodyElementType.PARAGRAPH) {
-                XWPFParagraph paragraph = (XWPFParagraph) bodyElement;
-
-                for (IRunElement iRunElem : paragraph.getIRuns()) {
-
-                    if (iRunElem instanceof XWPFRun) {
-                        XWPFRun runElement = (XWPFRun) iRunElem;
-
-                        UnderlinePatterns underline = runElement.getUnderline();
-                        assertNotNull(underline);
-
-                        //System.out.println("Found: " + underline + ": " + runElement.getText(0));
-                    }
-                }
-            }
-        }
-    }
-
-    @Test
-    public void bug57495_getTableArrayInDoc() {
-        XWPFDocument doc =new XWPFDocument();
-        //let's create a few tables for the test
-        for(int i=0;i<3;i++) {
-            doc.createTable(2, 2);
-        }
-        XWPFTable table = doc.getTableArray(0);
-        assertNotNull(table);
-        //let's check also that returns the correct table
-        XWPFTable same = doc.getTables().get(0);
-        assertEquals(table, same);
-    }
-
-    @Test
-    public void bug57495_getParagraphArrayInTableCell() {
-        XWPFDocument doc =new XWPFDocument();
-        //let's create a table for the test
-        XWPFTable table = doc.createTable(2, 2);       
-        assertNotNull(table);
-        XWPFParagraph p = table.getRow(0).getCell(0).getParagraphArray(0);
-        assertNotNull(p);
-        //let's check also that returns the correct paragraph
-        XWPFParagraph same = table.getRow(0).getCell(0).getParagraphs().get(0);        
-        assertEquals(p, same);
-    }
-    
-    @Test
-    public void bug57495_convertPixelsToEMUs() {
-        int pixels = 100;
-        int expectedEMU = 952500;
-        int result = Units.pixelToEMU(pixels);
-        assertEquals(expectedEMU, result);
-    }
-
-    @Test
-    public void test56392() throws IOException, OpenXML4JException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("56392.docx");
-        assertNotNull(doc);
-    }
-
-    /**
-     * Removing a run needs to remove it from both Runs and IRuns
-     */
-    @Test
-    public void test57829() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        assertNotNull(doc);
-        assertEquals(3, doc.getParagraphs().size());
-
-        for (XWPFParagraph paragraph : doc.getParagraphs()) {
-            paragraph.removeRun(0);
-            assertNotNull(paragraph.getText());
-        }
-    }
-    
-  /**
-   * Removing a run needs to take into account position of run if paragraph contains hyperlink runs
-   */
-  @Test
-  public void test58618() throws Exception {
-      XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("58618.docx");
-      XWPFParagraph para = (XWPFParagraph)doc.getBodyElements().get(0);
-      assertNotNull(para);
-      assertEquals("Some text  some hyper links link link and some text.....", para.getText());
-      XWPFRun run = para.insertNewRun(para.getRuns().size());
-      run.setText("New Text");
-      assertEquals("Some text  some hyper links link link and some text.....New Text", para.getText());
-      para.removeRun(para.getRuns().size() -2);
-      assertEquals("Some text  some hyper links link linkNew Text", para.getText());
-  }
-
-    @Test
-    public void test59378() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("59378.docx");
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        doc.write(out);
-        out.close();
-
-        XWPFDocument doc2 = new XWPFDocument(new ByteArrayInputStream(out.toByteArray()));
-        doc2.close();
-
-        XWPFDocument docBack = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        docBack.close();
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
deleted file mode 100644
index 0d81437..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.POIXMLProperties;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.openxml4j.opc.PackageAccess;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import org.apache.xmlbeans.XmlCursor;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-
-public final class TestXWPFDocument {
-
-    @Test
-    public void testContainsMainContentType() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        OPCPackage pack = doc.getPackage();
-
-        boolean found = false;
-        for (PackagePart part : pack.getParts()) {
-            if (part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
-                found = true;
-            }
-//            if (false) {
-//                // successful tests should be silent
-//                System.out.println(part);
-//            }
-        }
-        assertTrue(found);
-        
-        pack.close();
-        doc.close();
-    }
-
-    @Test
-    public void testOpen() throws Exception {
-        // Simple file
-        XWPFDocument xml1 = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        // Check it has key parts
-        assertNotNull(xml1.getDocument());
-        assertNotNull(xml1.getDocument().getBody());
-        assertNotNull(xml1.getStyle());
-        xml1.close();
-
-        // Complex file
-        XWPFDocument xml2 = XWPFTestDataSamples.openSampleDocument("IllustrativeCases.docx");
-        assertNotNull(xml2.getDocument());
-        assertNotNull(xml2.getDocument().getBody());
-        assertNotNull(xml2.getStyle());
-        xml2.close();
-    }
-
-    @Test
-    public void testMetadataBasics() throws IOException {
-        XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        assertNotNull(xml.getProperties().getCoreProperties());
-        assertNotNull(xml.getProperties().getExtendedProperties());
-
-        assertEquals("Microsoft Office Word", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
-        assertEquals(1315, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
-        assertEquals(10, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
-
-        assertEquals(null, xml.getProperties().getCoreProperties().getTitle());
-        assertEquals(null, xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue());
-        xml.close();
-    }
-
-    @Test
-    public void testMetadataComplex() throws IOException {
-        XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("IllustrativeCases.docx");
-        assertNotNull(xml.getProperties().getCoreProperties());
-        assertNotNull(xml.getProperties().getExtendedProperties());
-
-        assertEquals("Microsoft Office Outlook", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
-        assertEquals(5184, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
-        assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
-
-        assertEquals(" ", xml.getProperties().getCoreProperties().getTitle());
-        assertEquals(" ", xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue());
-        xml.close();
-    }
-
-    @Test
-    public void testWorkbookProperties() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-        POIXMLProperties props = doc.getProperties();
-        assertNotNull(props);
-        assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
-        doc.close();
-    }
-
-    @Test
-    public void testAddParagraph() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        assertEquals(3, doc.getParagraphs().size());
-
-        XWPFParagraph p = doc.createParagraph();
-        assertEquals(p, doc.getParagraphs().get(3));
-        assertEquals(4, doc.getParagraphs().size());
-
-        assertEquals(3, doc.getParagraphPos(3));
-        assertEquals(3, doc.getPosOfParagraph(p));
-
-        CTP ctp = p.getCTP();
-        XWPFParagraph newP = doc.getParagraph(ctp);
-        assertSame(p, newP);
-        XmlCursor cursor = doc.getDocument().getBody().getPArray(0).newCursor();
-        XWPFParagraph cP = doc.insertNewParagraph(cursor);
-        assertSame(cP, doc.getParagraphs().get(0));
-        assertEquals(5, doc.getParagraphs().size());
-        doc.close();
-    }
-
-    @Test
-    public void testAddPicture() throws IOException, InvalidFormatException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        byte[] jpeg = XWPFTestDataSamples.getImage("nature1.jpg");
-        String relationId = doc.addPictureData(jpeg, XWPFDocument.PICTURE_TYPE_JPEG);
-
-        byte[] newJpeg = ((XWPFPictureData) doc.getRelationById(relationId)).getData();
-        assertEquals(newJpeg.length, jpeg.length);
-        for (int i = 0; i < jpeg.length; i++) {
-            assertEquals(newJpeg[i], jpeg[i]);
-        }
-        doc.close();
-    }
-
-    @Test
-    public void testAllPictureFormats() throws IOException, InvalidFormatException {
-        XWPFDocument doc = new XWPFDocument();
-
-        doc.addPictureData(new byte[10], XWPFDocument.PICTURE_TYPE_EMF);
-        doc.addPictureData(new byte[11], XWPFDocument.PICTURE_TYPE_WMF);
-        doc.addPictureData(new byte[12], XWPFDocument.PICTURE_TYPE_PICT);
-        doc.addPictureData(new byte[13], XWPFDocument.PICTURE_TYPE_JPEG);
-        doc.addPictureData(new byte[14], XWPFDocument.PICTURE_TYPE_PNG);
-        doc.addPictureData(new byte[15], XWPFDocument.PICTURE_TYPE_DIB);
-        doc.addPictureData(new byte[16], XWPFDocument.PICTURE_TYPE_GIF);
-        doc.addPictureData(new byte[17], XWPFDocument.PICTURE_TYPE_TIFF);
-        doc.addPictureData(new byte[18], XWPFDocument.PICTURE_TYPE_EPS);
-        doc.addPictureData(new byte[19], XWPFDocument.PICTURE_TYPE_BMP);
-        doc.addPictureData(new byte[20], XWPFDocument.PICTURE_TYPE_WPG);
-
-        assertEquals(11, doc.getAllPictures().size());
-
-        XWPFDocument doc2 = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        assertEquals(11, doc2.getAllPictures().size());
-        doc2.close();
-        doc.close();
-    }
-
-    @Test
-    public void testRemoveBodyElement() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-        assertEquals(3, doc.getParagraphs().size());
-        assertEquals(3, doc.getBodyElements().size());
-
-        XWPFParagraph p1 = doc.getParagraphs().get(0);
-        XWPFParagraph p2 = doc.getParagraphs().get(1);
-        XWPFParagraph p3 = doc.getParagraphs().get(2);
-
-        assertEquals(p1, doc.getBodyElements().get(0));
-        assertEquals(p1, doc.getParagraphs().get(0));
-        assertEquals(p2, doc.getBodyElements().get(1));
-        assertEquals(p2, doc.getParagraphs().get(1));
-        assertEquals(p3, doc.getBodyElements().get(2));
-        assertEquals(p3, doc.getParagraphs().get(2));
-
-        // Add another
-        XWPFParagraph p4 = doc.createParagraph();
-
-        assertEquals(4, doc.getParagraphs().size());
-        assertEquals(4, doc.getBodyElements().size());
-        assertEquals(p1, doc.getBodyElements().get(0));
-        assertEquals(p1, doc.getParagraphs().get(0));
-        assertEquals(p2, doc.getBodyElements().get(1));
-        assertEquals(p2, doc.getParagraphs().get(1));
-        assertEquals(p3, doc.getBodyElements().get(2));
-        assertEquals(p3, doc.getParagraphs().get(2));
-        assertEquals(p4, doc.getBodyElements().get(3));
-        assertEquals(p4, doc.getParagraphs().get(3));
-
-        // Remove the 2nd
-        assertEquals(true, doc.removeBodyElement(1));
-        assertEquals(3, doc.getParagraphs().size());
-        assertEquals(3, doc.getBodyElements().size());
-
-        assertEquals(p1, doc.getBodyElements().get(0));
-        assertEquals(p1, doc.getParagraphs().get(0));
-        assertEquals(p3, doc.getBodyElements().get(1));
-        assertEquals(p3, doc.getParagraphs().get(1));
-        assertEquals(p4, doc.getBodyElements().get(2));
-        assertEquals(p4, doc.getParagraphs().get(2));
-
-        // Remove the 1st
-        assertEquals(true, doc.removeBodyElement(0));
-        assertEquals(2, doc.getParagraphs().size());
-        assertEquals(2, doc.getBodyElements().size());
-
-        assertEquals(p3, doc.getBodyElements().get(0));
-        assertEquals(p3, doc.getParagraphs().get(0));
-        assertEquals(p4, doc.getBodyElements().get(1));
-        assertEquals(p4, doc.getParagraphs().get(1));
-
-        // Remove the last
-        assertEquals(true, doc.removeBodyElement(1));
-        assertEquals(1, doc.getParagraphs().size());
-        assertEquals(1, doc.getBodyElements().size());
-
-        assertEquals(p3, doc.getBodyElements().get(0));
-        assertEquals(p3, doc.getParagraphs().get(0));
-        doc.close();
-    }
-
-    @Test
-    public void testRegisterPackagePictureData() throws IOException, InvalidFormatException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_1.docx");
-
-        /* manually assemble a new image package part*/
-        OPCPackage opcPckg = doc.getPackage();
-        XWPFRelation jpgRelation = XWPFRelation.IMAGE_JPEG;
-        PackagePartName partName = PackagingURIHelper.createPartName(jpgRelation.getDefaultFileName().replace('#', '2'));
-        PackagePart newImagePart = opcPckg.createPart(partName, jpgRelation.getContentType());
-        byte[] nature1 = XWPFTestDataSamples.getImage("abstract4.jpg");
-        OutputStream os = newImagePart.getOutputStream();
-        os.write(nature1);
-        os.close();
-        XWPFHeader xwpfHeader = doc.getHeaderArray(0);
-        PackageRelationship relationship = xwpfHeader.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, jpgRelation.getRelation());
-        XWPFPictureData newPicData = new XWPFPictureData(newImagePart, relationship);
-        /* new part is now ready to rumble */
-
-        assertFalse(xwpfHeader.getAllPictures().contains(newPicData));
-        assertFalse(doc.getAllPictures().contains(newPicData));
-        assertFalse(doc.getAllPackagePictures().contains(newPicData));
-
-        doc.registerPackagePictureData(newPicData);
-
-        assertFalse(xwpfHeader.getAllPictures().contains(newPicData));
-        assertFalse(doc.getAllPictures().contains(newPicData));
-        assertTrue(doc.getAllPackagePictures().contains(newPicData));
-
-        doc.getPackage().revert();
-        opcPckg.close();
-        doc.close();
-    }
-
-    @Test
-    public void testFindPackagePictureData() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_1.docx");
-        byte[] nature1 = XWPFTestDataSamples.getImage("nature1.gif");
-        XWPFPictureData part = doc.findPackagePictureData(nature1, Document.PICTURE_TYPE_GIF);
-        assertNotNull(part);
-        assertTrue(doc.getAllPictures().contains(part));
-        assertTrue(doc.getAllPackagePictures().contains(part));
-        doc.getPackage().revert();
-        doc.close();
-    }
-
-    @Test
-    public void testGetAllPictures() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_3.docx");
-        List<XWPFPictureData> allPictures = doc.getAllPictures();
-        List<XWPFPictureData> allPackagePictures = doc.getAllPackagePictures();
-
-        assertNotNull(allPictures);
-        assertEquals(3, allPictures.size());
-        for (XWPFPictureData xwpfPictureData : allPictures) {
-            assertTrue(allPackagePictures.contains(xwpfPictureData));
-        }
-
-        try {
-            allPictures.add(allPictures.get(0));
-            fail("This list must be unmodifiable!");
-        } catch (UnsupportedOperationException e) {
-            // all ok
-        }
-
-        doc.getPackage().revert();
-        doc.close();
-    }
-
-    @Test
-    public void testGetAllPackagePictures() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_3.docx");
-        List<XWPFPictureData> allPackagePictures = doc.getAllPackagePictures();
-
-        assertNotNull(allPackagePictures);
-        assertEquals(5, allPackagePictures.size());
-
-        try {
-            allPackagePictures.add(allPackagePictures.get(0));
-            fail("This list must be unmodifiable!");
-        } catch (UnsupportedOperationException e) {
-            // all ok
-        }
-
-        doc.getPackage().revert();
-        doc.close();
-    }
-
-    @Test
-    public void testPictureHandlingSimpleFile() throws IOException, InvalidFormatException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_1.docx");
-        assertEquals(1, doc.getAllPackagePictures().size());
-        byte[] newPic = XWPFTestDataSamples.getImage("abstract4.jpg");
-        String id1 = doc.addPictureData(newPic, Document.PICTURE_TYPE_JPEG);
-        assertEquals(2, doc.getAllPackagePictures().size());
-        /* copy data, to avoid instance-equality */
-        byte[] newPicCopy = Arrays.copyOf(newPic, newPic.length);
-        String id2 = doc.addPictureData(newPicCopy, Document.PICTURE_TYPE_JPEG);
-        assertEquals(id1, id2);
-        doc.getPackage().revert();
-        doc.close();
-    }
-
-    @Test
-    public void testPictureHandlingHeaderDocumentImages() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_2.docx");
-        assertEquals(1, doc.getAllPictures().size());
-        assertEquals(1, doc.getAllPackagePictures().size());
-        assertEquals(1, doc.getHeaderArray(0).getAllPictures().size());
-        doc.getPackage().revert();
-        doc.close();
-    }
-
-    @Test
-    public void testPictureHandlingComplex() throws IOException, InvalidFormatException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_3.docx");
-        XWPFHeader xwpfHeader = doc.getHeaderArray(0);
-
-        assertEquals(3, doc.getAllPictures().size());
-        assertEquals(3, xwpfHeader.getAllPictures().size());
-        assertEquals(5, doc.getAllPackagePictures().size());
-
-        byte[] nature1 = XWPFTestDataSamples.getImage("nature1.jpg");
-        String id = doc.addPictureData(nature1, Document.PICTURE_TYPE_JPEG);
-        POIXMLDocumentPart part1 = xwpfHeader.getRelationById("rId1");
-        XWPFPictureData part2 = (XWPFPictureData) doc.getRelationById(id);
-        assertSame(part1, part2);
-
-        doc.getPackage().revert();
-        doc.close();
-    }
-
-    @Test
-    public void testZeroLengthLibreOfficeDocumentWithWaterMarkHeader() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("zero-length.docx");
-        POIXMLProperties properties = doc.getProperties();
-
-        assertNotNull(properties.getCoreProperties());
-
-        XWPFHeader headerArray = doc.getHeaderArray(0);
-        assertEquals(1, headerArray.getAllPictures().size());
-        assertEquals("image1.png", headerArray.pictures.get(0).getFileName());
-        assertEquals("", headerArray.getText());
-
-        POIXMLProperties.ExtendedProperties extendedProperties = properties.getExtendedProperties();
-        assertNotNull(extendedProperties);
-        assertEquals(0, extendedProperties.getUnderlyingProperties().getCharacters());
-        doc.close();
-    }
-
-    @Test
-    public void testSettings() throws IOException {
-        XWPFSettings settings = new XWPFSettings();
-        assertEquals(100, settings.getZoomPercent());
-        settings.setZoomPercent(50);
-        assertEquals(50, settings.getZoomPercent());
-
-        XWPFDocument doc = new XWPFDocument();
-        assertEquals(100, doc.getZoomPercent());
-
-        doc.setZoomPercent(50);
-        assertEquals(50, doc.getZoomPercent());
-
-        doc.setZoomPercent(200);
-        assertEquals(200, doc.getZoomPercent());
-
-        XWPFDocument back = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        assertEquals(200, back.getZoomPercent());
-        back.close();
-
-//        OutputStream out = new FileOutputStream("/tmp/testZoom.docx");
-//        doc.write(out);
-//        out.close();
-
-        doc.close();
-    }
-	
-	@Test
-	public void testEnforcedWith() throws IOException {
-		XWPFDocument docx = XWPFTestDataSamples.openSampleDocument("EnforcedWith.docx");
-		assertTrue(docx.isEnforcedProtection());
-		docx.close();
-	}
-	
-	@Test
-	@Ignore("XWPF should be able to write to a new Stream when opened Read-Only")
-	public void testWriteFromReadOnlyOPC() throws Exception {
-	    OPCPackage opc = OPCPackage.open(
-	            POIDataSamples.getDocumentInstance().getFile("SampleDoc.docx"),
-	            PackageAccess.READ
-	    );
-	    XWPFDocument doc = new XWPFDocument(opc);
-	    XWPFWordExtractor ext = new XWPFWordExtractor(doc);
-	    String origText = ext.getText();
-	    
-	    doc = XWPFTestDataSamples.writeOutAndReadBack(doc);
-	    ext = new XWPFWordExtractor(doc);
-	    
-	    assertEquals(origText, ext.getText());
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
deleted file mode 100644
index 7025a26..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdn;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STFtnEdn;
-
-public class TestXWPFFootnotes extends TestCase {
-
-    public void testAddFootnotesToDocument() throws IOException {
-        XWPFDocument docOut = new XWPFDocument();
-
-        BigInteger noteId = BigInteger.valueOf(1);
-
-        XWPFFootnotes footnotes = docOut.createFootnotes();
-        CTFtnEdn ctNote = CTFtnEdn.Factory.newInstance();
-        ctNote.setId(noteId);
-        ctNote.setType(STFtnEdn.NORMAL);
-        footnotes.addFootnote(ctNote);
-
-        XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
-        XWPFFootnote note = docIn.getFootnoteByID(noteId.intValue());
-        assertEquals(note.getCTFtnEdn().getType(), STFtnEdn.NORMAL);
-    }
-
-    /**
-     * Bug 55066 - avoid double loading the footnotes
-     */
-    public void testLoadFootnotesOnce() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug54849.docx");
-        List<XWPFFootnote> footnotes = doc.getFootnotes();
-        int hits = 0;
-        for (XWPFFootnote fn : footnotes) {
-            for (IBodyElement e : fn.getBodyElements()) {
-                if (e instanceof XWPFParagraph) {
-                    String txt = ((XWPFParagraph) e).getText();
-                    if (txt.indexOf("Footnote_sdt") > -1) {
-                        hits++;
-                    }
-                }
-            }
-        }
-        assertEquals("Load footnotes once", 1, hits);
-    }
-}
-
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
deleted file mode 100644
index fbb24f5..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-import org.junit.Test;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
-
-public final class TestXWPFHeader {
-
-    @Test
-    public void testSimpleHeader() throws IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("headerFooter.docx");
-
-        XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
-
-        XWPFHeader header = policy.getDefaultHeader();
-        XWPFFooter footer = policy.getDefaultFooter();
-        assertNotNull(header);
-        assertNotNull(footer);
-    }
-
-    @Test
-    public void testImageInHeader() throws IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("headerPic.docx");
-
-        XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
-
-        XWPFHeader header = policy.getDefaultHeader();
-
-        assertNotNull(header.getRelations());
-        assertEquals(1, header.getRelations().size());
-    }
-
-    @Test
-    public void testSetHeader() throws IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
-        // no header is set (yet)
-        XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
-        assertNull(policy.getDefaultHeader());
-        assertNull(policy.getFirstPageHeader());
-        assertNull(policy.getDefaultFooter());
-        assertNull(policy.getFirstPageFooter());
-
-        CTP ctP1 = CTP.Factory.newInstance();
-        CTR ctR1 = ctP1.addNewR();
-        CTText t = ctR1.addNewT();
-        String tText = "Paragraph in header";
-        t.setStringValue(tText);
-
-        // Commented MB 23 May 2010
-        //CTP ctP2 = CTP.Factory.newInstance();
-        //CTR ctR2 = ctP2.addNewR();
-        //CTText t2 = ctR2.addNewT();
-        //t2.setStringValue("Second paragraph.. for footer");
-
-        // Create two paragraphs for insertion into the footer.
-        // Previously only one was inserted MB 23 May 2010
-        CTP ctP2 = CTP.Factory.newInstance();
-        CTR ctR2 = ctP2.addNewR();
-        CTText t2 = ctR2.addNewT();
-        t2.setStringValue("First paragraph for the footer");
-
-        CTP ctP3 = CTP.Factory.newInstance();
-        CTR ctR3 = ctP3.addNewR();
-        CTText t3 = ctR3.addNewT();
-        t3.setStringValue("Second paragraph for the footer");
-
-        XWPFParagraph p1 = new XWPFParagraph(ctP1, sampleDoc);
-        XWPFParagraph[] pars = new XWPFParagraph[1];
-        pars[0] = p1;
-
-        XWPFParagraph p2 = new XWPFParagraph(ctP2, sampleDoc);
-        XWPFParagraph p3 = new XWPFParagraph(ctP3, sampleDoc);
-        XWPFParagraph[] pars2 = new XWPFParagraph[2];
-        pars2[0] = p2;
-        pars2[1] = p3;
-
-        // Set headers
-        XWPFHeader headerD = policy.createHeader(XWPFHeaderFooterPolicy.DEFAULT, pars);
-        XWPFHeader headerF = policy.createHeader(XWPFHeaderFooterPolicy.FIRST);
-        // Set a default footer and capture the returned XWPFFooter object.
-        XWPFFooter footerD = policy.createFooter(XWPFHeaderFooterPolicy.DEFAULT, pars2);
-        XWPFFooter footerF = policy.createFooter(XWPFHeaderFooterPolicy.FIRST);
-
-        // Ensure the headers and footer were set correctly....
-        assertNotNull(policy.getDefaultHeader());
-        assertNotNull(policy.getFirstPageHeader());
-        assertNotNull(policy.getDefaultFooter());
-        assertNotNull(policy.getFirstPageFooter());
-        // ....and that the footer object captured above contains two
-        // paragraphs of text.
-        assertEquals(2, footerD.getParagraphs().size());
-        assertEquals(0, footerF.getParagraphs().size());
-
-        // Check the header created with the paragraph got them, and the one
-        // created without got none
-        assertEquals(1, headerD.getParagraphs().size());
-        assertEquals(tText, headerD.getParagraphs().get(0).getText());
-
-        assertEquals(0, headerF.getParagraphs().size());
-
-        // As an additional check, recover the defauls footer and
-        // make sure that it contains two paragraphs of text and that
-        // both do hold what is expected.
-        footerD = policy.getDefaultFooter();
-        XWPFParagraph[] paras = footerD.getParagraphs().toArray(new XWPFParagraph[0]);
-
-        assertEquals(2, paras.length);
-        assertEquals("First paragraph for the footer", paras[0].getText());
-        assertEquals("Second paragraph for the footer", paras[1].getText());
-
-
-        // Add some text to the empty header
-        String fText1 = "New Text!";
-        String fText2 = "More Text!";
-        headerF.createParagraph().insertNewRun(0).setText(fText1);
-        headerF.createParagraph().insertNewRun(0).setText(fText2);
-//        headerF.getParagraphs().get(0).insertNewRun(0).setText(fText1);
-    
-        // Check it
-        assertEquals(tText, headerD.getParagraphs().get(0).getText());
-        assertEquals(fText1, headerF.getParagraphs().get(0).getText());
-        assertEquals(fText2, headerF.getParagraphs().get(1).getText());
-
-
-        // Save, re-open, ensure it's all still there
-        XWPFDocument reopened = XWPFTestDataSamples.writeOutAndReadBack(sampleDoc);
-        policy = reopened.getHeaderFooterPolicy();
-        assertNotNull(policy.getDefaultHeader());
-        assertNotNull(policy.getFirstPageHeader());
-        assertNull(policy.getEvenPageHeader());
-        assertNotNull(policy.getDefaultFooter());
-        assertNotNull(policy.getFirstPageFooter());
-        assertNull(policy.getEvenPageFooter());
-
-        // Check the new headers still have their text
-        headerD = policy.getDefaultHeader();
-        headerF = policy.getFirstPageHeader();
-        assertEquals(tText, headerD.getParagraphs().get(0).getText());
-        assertEquals(fText1, headerF.getParagraphs().get(0).getText());
-        assertEquals(fText2, headerF.getParagraphs().get(1).getText());
-
-        // Check the new footers have their new text too
-        footerD = policy.getDefaultFooter();
-        paras = footerD.getParagraphs().toArray(new XWPFParagraph[0]);
-        footerF = policy.getFirstPageFooter();
-
-        assertEquals(2, paras.length);
-        assertEquals("First paragraph for the footer", paras[0].getText());
-        assertEquals("Second paragraph for the footer", paras[1].getText());
-        assertEquals(1, footerF.getParagraphs().size());
-    }
-
-    @Test
-    public void testSetWatermark() throws IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
-
-        // No header is set (yet)
-        XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
-        assertNull(policy.getDefaultHeader());
-        assertNull(policy.getFirstPageHeader());
-        assertNull(policy.getDefaultFooter());
-
-        policy.createWatermark("DRAFT");
-
-        assertNotNull(policy.getDefaultHeader());
-        assertNotNull(policy.getFirstPageHeader());
-        assertNotNull(policy.getEvenPageHeader());
-
-        // Re-open, and check
-        XWPFDocument reopened = XWPFTestDataSamples.writeOutAndReadBack(sampleDoc);
-        policy = reopened.getHeaderFooterPolicy();
-
-        assertNotNull(policy.getDefaultHeader());
-        assertNotNull(policy.getFirstPageHeader());
-        assertNotNull(policy.getEvenPageHeader());
-    }
-
-    @Test
-    public void testAddPictureData() {
-        // TODO
-    }
-
-    @Test
-    public void testGetAllPictures() {
-        // TODO
-    }
-
-    @Test
-    public void testGetAllPackagePictures() {
-        // TODO
-    }
-
-    @Test
-    public void testGetPictureDataById() {
-        // TODO
-    }
-
-    @Test
-    public void bug60293() throws Exception {
-        //test handling of non-standard header/footer options
-        XWPFDocument xwpf = XWPFTestDataSamples.openSampleDocument("60293.docx");
-        assertEquals(3, xwpf.getHeaderList().size());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
deleted file mode 100644
index ef7620e..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-
-/**
- * @author Paolo Mottadelli
- */
-public final class TestXWPFHeadings extends TestCase {
-    private static final String HEADING1 = "Heading1";
-
-    public void testSetParagraphStyle() throws IOException, XmlException {
-        //new clean instance of paragraph
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("heading123.docx");
-        XWPFParagraph p = doc.createParagraph();
-        XWPFRun run = p.createRun();
-        run.setText("Heading 1");
-
-        CTSdtBlock block = doc.getDocument().getBody().addNewSdt();
-
-        assertNull(p.getStyle());
-        p.setStyle(HEADING1);
-        assertEquals(HEADING1, p.getCTP().getPPr().getPStyle().getVal());
-
-        doc.createTOC();
-        /*
-        // TODO - finish this test
-		if (false) {
-			CTStyles styles = doc.getStyle();
-			CTStyle style = styles.addNewStyle();
-			style.setType(STStyleType.PARAGRAPH);
-			style.setStyleId("Heading1");
-		}
-
-		if (false) {
-			File file = TempFile.createTempFile("testHeaders", ".docx");
-			OutputStream out = new FileOutputStream(file);
-			doc.write(out);
-			out.close();
-		}
-        */
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
deleted file mode 100644
index 5a5ce78..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.io.IOException;
-import java.math.BigInteger;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumLvl;
-
-public class TestXWPFNumbering extends TestCase {
-
-    public void testCompareAbstractNum() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
-        XWPFNumbering numbering = doc.getNumbering();
-        BigInteger numId = BigInteger.valueOf(1);
-        assertTrue(numbering.numExist(numId));
-        XWPFNum num = numbering.getNum(numId);
-        BigInteger abstrNumId = num.getCTNum().getAbstractNumId().getVal();
-        XWPFAbstractNum abstractNum = numbering.getAbstractNum(abstrNumId);
-        BigInteger compareAbstractNum = numbering.getIdOfAbstractNum(abstractNum);
-        assertEquals(abstrNumId, compareAbstractNum);
-    }
-
-    public void testAddNumberingToDoc() throws IOException {
-        BigInteger abstractNumId = BigInteger.valueOf(1);
-        BigInteger numId = BigInteger.valueOf(1);
-
-        XWPFDocument docOut = new XWPFDocument();
-        XWPFNumbering numbering = docOut.createNumbering();
-        numId = numbering.addNum(abstractNumId);
-
-        XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
-        numbering = docIn.getNumbering();
-        assertTrue(numbering.numExist(numId));
-        XWPFNum num = numbering.getNum(numId);
-
-        BigInteger compareAbstractNum = num.getCTNum().getAbstractNumId().getVal();
-        assertEquals(abstractNumId, compareAbstractNum);
-    }
-
-    public void testGetNumIlvl() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
-        BigInteger numIlvl = BigInteger.valueOf(0);
-        assertEquals(numIlvl, doc.getParagraphs().get(0).getNumIlvl());
-        numIlvl = BigInteger.valueOf(1);
-        assertEquals(numIlvl, doc.getParagraphs().get(5).getNumIlvl());
-    }
-
-    public void testGetNumFmt() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
-        assertEquals("bullet", doc.getParagraphs().get(0).getNumFmt());
-        assertEquals("bullet", doc.getParagraphs().get(1).getNumFmt());
-        assertEquals("bullet", doc.getParagraphs().get(2).getNumFmt());
-        assertEquals("bullet", doc.getParagraphs().get(3).getNumFmt());
-        assertEquals("decimal", doc.getParagraphs().get(4).getNumFmt());
-        assertEquals("lowerLetter", doc.getParagraphs().get(5).getNumFmt());
-        assertEquals("lowerRoman", doc.getParagraphs().get(6).getNumFmt());
-    }
-
-    public void testLvlText() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
-
-        assertEquals("%1.%2.%3.", doc.getParagraphs().get(12).getNumLevelText());
-
-        assertEquals("NEW-%1-FORMAT", doc.getParagraphs().get(14).getNumLevelText());
-
-        XWPFParagraph p = doc.getParagraphs().get(18);
-        assertEquals("%1.", p.getNumLevelText());
-        //test that null doesn't throw NPE
-        assertNull(p.getNumFmt());
-    }
-
-    public void testOverrideList() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("NumberingWOverrides.docx");
-        XWPFParagraph p = doc.getParagraphs().get(4);
-        XWPFNumbering numbering = doc.getNumbering();
-        CTNum ctNum = numbering.getNum(p.getNumID()).getCTNum();
-        assertEquals(9, ctNum.sizeOfLvlOverrideArray());
-        CTNumLvl ctNumLvl = ctNum.getLvlOverrideArray(0);
-        assertEquals("upperLetter", ctNumLvl.getLvl().getNumFmt().getVal().toString());
-    }
-
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
deleted file mode 100644
index 756aeef..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.List;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture;
-import org.openxmlformats.schemas.drawingml.x2006.picture.PicDocument;
-import org.openxmlformats.schemas.drawingml.x2006.picture.impl.PicDocumentImpl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBookmark;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBorder;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTInd;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPBdr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSpacing;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextAlignment;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STLineSpacingRule;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTextAlignment;
-
-/**
- * Tests for XWPF Paragraphs
- */
-public final class TestXWPFParagraph {
-
-    /**
-     * Check that we get the right paragraph from the header
-     *
-     * @throws IOException
-     */
-    @Test
-    public void testHeaderParagraph() throws IOException {
-        XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
-
-        XWPFHeader hdr = xml.getHeaderFooterPolicy().getDefaultHeader();
-        assertNotNull(hdr);
-
-        List<XWPFParagraph> ps = hdr.getParagraphs();
-        assertEquals(1, ps.size());
-        XWPFParagraph p = ps.get(0);
-
-        assertEquals(5, p.getCTP().sizeOfRArray());
-        assertEquals("First header column!\tMid header\tRight header!", p.getText());
-        
-        xml.close();
-    }
-
-    /**
-     * Check that we get the right paragraphs from the document
-     *
-     * @throws IOException
-     */
-    @Test
-    public void testDocumentParagraph() throws IOException {
-        XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
-        List<XWPFParagraph> ps = xml.getParagraphs();
-        assertEquals(10, ps.size());
-
-        assertFalse(ps.get(0).isEmpty());
-        assertEquals(
-                "This is a sample word document. It has two pages. It has a three column heading, but no footer.",
-                ps.get(0).getText());
-
-        assertTrue(ps.get(1).isEmpty());
-        assertEquals("", ps.get(1).getText());
-
-        assertFalse(ps.get(2).isEmpty());
-        assertEquals("HEADING TEXT", ps.get(2).getText());
-
-        assertTrue(ps.get(3).isEmpty());
-        assertEquals("", ps.get(3).getText());
-
-        assertFalse(ps.get(4).isEmpty());
-        assertEquals("More on page one", ps.get(4).getText());
-        
-        xml.close();
-    }
-
-    @Test
-    public void testSetGetBorderTop() throws IOException {
-        //new clean instance of paragraph
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        assertEquals(STBorder.NONE.intValue(), p.getBorderTop().getValue());
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        //bordi
-        CTPBdr bdr = ppr.addNewPBdr();
-        CTBorder borderTop = bdr.addNewTop();
-        borderTop.setVal(STBorder.DOUBLE);
-        bdr.setTop(borderTop);
-
-        assertEquals(Borders.DOUBLE, p.getBorderTop());
-        p.setBorderTop(Borders.SINGLE);
-        assertEquals(STBorder.SINGLE, borderTop.getVal());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetAlignment() throws IOException {
-        //new clean instance of paragraph
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        assertEquals(STJc.LEFT.intValue(), p.getAlignment().getValue());
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        CTJc align = ppr.addNewJc();
-        align.setVal(STJc.CENTER);
-        assertEquals(ParagraphAlignment.CENTER, p.getAlignment());
-
-        p.setAlignment(ParagraphAlignment.BOTH);
-        assertEquals(STJc.BOTH, ppr.getJc().getVal());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetSpacing() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        assertEquals(-1, p.getSpacingAfter());
-
-        CTSpacing spacing = ppr.addNewSpacing();
-        spacing.setAfter(new BigInteger("10"));
-        assertEquals(10, p.getSpacingAfter());
-
-        p.setSpacingAfter(100);
-        assertEquals(100, spacing.getAfter().intValue());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetSpacingLineRule() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        assertEquals(STLineSpacingRule.INT_AUTO, p.getSpacingLineRule().getValue());
-
-        CTSpacing spacing = ppr.addNewSpacing();
-        spacing.setLineRule(STLineSpacingRule.AT_LEAST);
-        assertEquals(LineSpacingRule.AT_LEAST, p.getSpacingLineRule());
-
-        p.setSpacingAfter(100);
-        assertEquals(100, spacing.getAfter().intValue());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetIndentation() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        assertEquals(-1, p.getIndentationLeft());
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        assertEquals(-1, p.getIndentationLeft());
-
-        CTInd ind = ppr.addNewInd();
-        ind.setLeft(new BigInteger("10"));
-        assertEquals(10, p.getIndentationLeft());
-
-        p.setIndentationLeft(100);
-        assertEquals(100, ind.getLeft().intValue());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetVerticalAlignment() throws IOException {
-        //new clean instance of paragraph
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        CTTextAlignment txtAlign = ppr.addNewTextAlignment();
-        txtAlign.setVal(STTextAlignment.CENTER);
-        assertEquals(TextAlignment.CENTER, p.getVerticalAlignment());
-
-        p.setVerticalAlignment(TextAlignment.BOTTOM);
-        assertEquals(STTextAlignment.BOTTOM, ppr.getTextAlignment().getVal());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetWordWrap() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        CTOnOff wordWrap = ppr.addNewWordWrap();
-        wordWrap.setVal(STOnOff.FALSE);
-        assertEquals(false, p.isWordWrap());
-
-        p.setWordWrapped(true);
-        assertEquals(STOnOff.TRUE, ppr.getWordWrap().getVal());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetPageBreak() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        CTP ctp = p.getCTP();
-        CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
-
-        CTOnOff pageBreak = ppr.addNewPageBreakBefore();
-        pageBreak.setVal(STOnOff.FALSE);
-        assertEquals(false, p.isPageBreak());
-
-        p.setPageBreak(true);
-        assertEquals(STOnOff.TRUE, ppr.getPageBreakBefore().getVal());
-        doc.close();
-    }
-
-    @Test
-    public void testBookmarks() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("bookmarks.docx");
-        XWPFParagraph paragraph = doc.getParagraphs().get(0);
-        assertEquals("Sample Word Document", paragraph.getText());
-        assertEquals(1, paragraph.getCTP().sizeOfBookmarkStartArray());
-        assertEquals(0, paragraph.getCTP().sizeOfBookmarkEndArray());
-        CTBookmark ctBookmark = paragraph.getCTP().getBookmarkStartArray(0);
-        assertEquals("poi", ctBookmark.getName());
-        for (CTBookmark bookmark : paragraph.getCTP().getBookmarkStartList()) {
-            assertEquals("poi", bookmark.getName());
-        }
-        doc.close();
-    }
-
-    @Test
-    public void testGetSetNumID() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        p.setNumID(new BigInteger("10"));
-        assertEquals("10", p.getNumID().toString());
-        doc.close();
-    }
-
-    @Test
-    public void testAddingRuns() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-
-        XWPFParagraph p = doc.getParagraphs().get(0);
-        assertEquals(2, p.getRuns().size());
-
-        XWPFRun r = p.createRun();
-        assertEquals(3, p.getRuns().size());
-        assertEquals(2, p.getRuns().indexOf(r));
-
-        XWPFRun r2 = p.insertNewRun(1);
-        assertEquals(4, p.getRuns().size());
-        assertEquals(1, p.getRuns().indexOf(r2));
-        assertEquals(3, p.getRuns().indexOf(r));
-        
-        doc.close();
-    }
-
-    @Test
-    public void testPictures() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("VariousPictures.docx");
-        assertEquals(7, doc.getParagraphs().size());
-
-        XWPFParagraph p;
-        XWPFRun r;
-
-        // Text paragraphs
-        assertEquals("Sheet with various pictures", doc.getParagraphs().get(0).getText());
-        assertEquals("(jpeg, png, wmf, emf and pict) ", doc.getParagraphs().get(1).getText());
-
-        // Spacer ones
-        assertEquals("", doc.getParagraphs().get(2).getText());
-        assertEquals("", doc.getParagraphs().get(3).getText());
-        assertEquals("", doc.getParagraphs().get(4).getText());
-
-        // Image one
-        p = doc.getParagraphs().get(5);
-        assertEquals(6, p.getRuns().size());
-
-        r = p.getRuns().get(0);
-        assertEquals("", r.toString());
-        assertEquals(1, r.getEmbeddedPictures().size());
-        assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
-        assertEquals("image1.wmf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
-        r = p.getRuns().get(1);
-        assertEquals("", r.toString());
-        assertEquals(1, r.getEmbeddedPictures().size());
-        assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
-        assertEquals("image2.png", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
-        r = p.getRuns().get(2);
-        assertEquals("", r.toString());
-        assertEquals(1, r.getEmbeddedPictures().size());
-        assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
-        assertEquals("image3.emf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
-        r = p.getRuns().get(3);
-        assertEquals("", r.toString());
-        assertEquals(1, r.getEmbeddedPictures().size());
-        assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
-        assertEquals("image4.emf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
-        r = p.getRuns().get(4);
-        assertEquals("", r.toString());
-        assertEquals(1, r.getEmbeddedPictures().size());
-        assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
-        assertEquals("image5.jpeg", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
-        r = p.getRuns().get(5);
-        assertEquals(" ", r.toString());
-        assertEquals(0, r.getEmbeddedPictures().size());
-
-        // Final spacer
-        assertEquals("", doc.getParagraphs().get(6).getText());
-
-
-        // Look in detail at one
-        r = p.getRuns().get(4);
-        XWPFPicture pict = r.getEmbeddedPictures().get(0);
-        CTPicture picture = pict.getCTPicture();
-        assertEquals("rId8", picture.getBlipFill().getBlip().getEmbed());
-
-        // Ensure that the ooxml compiler finds everything we need
-        r.getCTR().getDrawingArray(0);
-        r.getCTR().getDrawingArray(0).getInlineArray(0);
-        r.getCTR().getDrawingArray(0).getInlineArray(0).getGraphic();
-        r.getCTR().getDrawingArray(0).getInlineArray(0).getGraphic().getGraphicData();
-        PicDocument pd = new PicDocumentImpl(null);
-        assertTrue(pd.isNil());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testTika792() throws Exception {
-        //This test forces the loading of CTMoveBookmark and
-        //CTMoveBookmarkImpl into ooxml-lite.
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Tika-792.docx");
-        XWPFParagraph paragraph = doc.getParagraphs().get(0);
-        assertEquals("s", paragraph.getText());
-        doc.close();
-    }
-
-    @Test
-    public void testSettersGetters() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        assertTrue(p.isEmpty());
-        assertFalse(p.removeRun(0));
-
-        p.setBorderTop(Borders.BABY_PACIFIER);
-        p.setBorderBetween(Borders.BABY_PACIFIER);
-        p.setBorderBottom(Borders.BABY_RATTLE);
-
-        assertNotNull(p.getIRuns());
-        assertEquals(0, p.getIRuns().size());
-        assertFalse(p.isEmpty());
-        assertNull(p.getStyleID());
-        assertNull(p.getStyle());
-
-        assertNull(p.getNumID());
-        p.setNumID(BigInteger.valueOf(12));
-        assertEquals(BigInteger.valueOf(12), p.getNumID());
-        p.setNumID(BigInteger.valueOf(13));
-        assertEquals(BigInteger.valueOf(13), p.getNumID());
-
-        assertNull(p.getNumFmt());
-
-        assertNull(p.getNumIlvl());
-
-        assertEquals("", p.getParagraphText());
-        assertEquals("", p.getPictureText());
-        assertEquals("", p.getFootnoteText());
-
-        p.setBorderBetween(Borders.NONE);
-        assertEquals(Borders.NONE, p.getBorderBetween());
-        p.setBorderBetween(Borders.BASIC_BLACK_DASHES);
-        assertEquals(Borders.BASIC_BLACK_DASHES, p.getBorderBetween());
-
-        p.setBorderBottom(Borders.NONE);
-        assertEquals(Borders.NONE, p.getBorderBottom());
-        p.setBorderBottom(Borders.BABY_RATTLE);
-        assertEquals(Borders.BABY_RATTLE, p.getBorderBottom());
-
-        p.setBorderLeft(Borders.NONE);
-        assertEquals(Borders.NONE, p.getBorderLeft());
-        p.setBorderLeft(Borders.BASIC_WHITE_SQUARES);
-        assertEquals(Borders.BASIC_WHITE_SQUARES, p.getBorderLeft());
-
-        p.setBorderRight(Borders.NONE);
-        assertEquals(Borders.NONE, p.getBorderRight());
-        p.setBorderRight(Borders.BASIC_WHITE_DASHES);
-        assertEquals(Borders.BASIC_WHITE_DASHES, p.getBorderRight());
-
-        p.setBorderBottom(Borders.NONE);
-        assertEquals(Borders.NONE, p.getBorderBottom());
-        p.setBorderBottom(Borders.BASIC_WHITE_DOTS);
-        assertEquals(Borders.BASIC_WHITE_DOTS, p.getBorderBottom());
-
-        assertFalse(p.isPageBreak());
-        p.setPageBreak(true);
-        assertTrue(p.isPageBreak());
-        p.setPageBreak(false);
-        assertFalse(p.isPageBreak());
-
-        assertEquals(-1, p.getSpacingAfter());
-        p.setSpacingAfter(12);
-        assertEquals(12, p.getSpacingAfter());
-
-        assertEquals(-1, p.getSpacingAfterLines());
-        p.setSpacingAfterLines(14);
-        assertEquals(14, p.getSpacingAfterLines());
-
-        assertEquals(-1, p.getSpacingBefore());
-        p.setSpacingBefore(16);
-        assertEquals(16, p.getSpacingBefore());
-
-        assertEquals(-1, p.getSpacingBeforeLines());
-        p.setSpacingBeforeLines(18);
-        assertEquals(18, p.getSpacingBeforeLines());
-
-        assertEquals(LineSpacingRule.AUTO, p.getSpacingLineRule());
-        p.setSpacingLineRule(LineSpacingRule.EXACT);
-        assertEquals(LineSpacingRule.EXACT, p.getSpacingLineRule());
-
-        assertEquals(-1, p.getIndentationLeft());
-        p.setIndentationLeft(21);
-        assertEquals(21, p.getIndentationLeft());
-
-        assertEquals(-1, p.getIndentationRight());
-        p.setIndentationRight(25);
-        assertEquals(25, p.getIndentationRight());
-
-        assertEquals(-1, p.getIndentationHanging());
-        p.setIndentationHanging(25);
-        assertEquals(25, p.getIndentationHanging());
-
-        assertEquals(-1, p.getIndentationFirstLine());
-        p.setIndentationFirstLine(25);
-        assertEquals(25, p.getIndentationFirstLine());
-
-        assertFalse(p.isWordWrap());
-        p.setWordWrapped(true);
-        assertTrue(p.isWordWrap());
-        p.setWordWrapped(false);
-        assertFalse(p.isWordWrap());
-
-        assertNull(p.getStyle());
-        p.setStyle("teststyle");
-        assertEquals("teststyle", p.getStyle());
-
-        p.addRun(CTR.Factory.newInstance());
-
-        //assertTrue(p.removeRun(0));
-
-        assertNotNull(p.getBody());
-        assertEquals(BodyElementType.PARAGRAPH, p.getElementType());
-        assertEquals(BodyType.DOCUMENT, p.getPartType());
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSearchTextNotFound() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        assertNull(p.searchText("test", new PositionInParagraph()));
-        assertEquals("", p.getText());
-        doc.close();
-    }
-
-    @Test
-    public void testSearchTextFound() throws IOException {
-        XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
-
-        List<XWPFParagraph> ps = xml.getParagraphs();
-        assertEquals(10, ps.size());
-
-        XWPFParagraph p = ps.get(0);
-
-        TextSegement segment = p.searchText("sample word document", new PositionInParagraph());
-        assertNotNull(segment);
-
-        assertEquals("sample word document", p.getText(segment));
-
-        assertTrue(p.removeRun(0));
-        xml.close();
-    }
-    
-    @Test
-    public void testFieldRuns() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("FldSimple.docx");
-        List<XWPFParagraph> ps = doc.getParagraphs();
-        assertEquals(1, ps.size());
-        
-        XWPFParagraph p = ps.get(0);
-        assertEquals(1, p.getRuns().size());
-        assertEquals(1, p.getIRuns().size());
-        
-        XWPFRun r = p.getRuns().get(0);
-        assertEquals(XWPFFieldRun.class, r.getClass());
-        
-        XWPFFieldRun fr = (XWPFFieldRun)r;
-        assertEquals(" FILENAME   \\* MERGEFORMAT ", fr.getFieldInstruction());
-        assertEquals("FldSimple.docx", fr.text());
-        assertEquals("FldSimple.docx", p.getText());
-        doc.close();
-    }
-
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testRuns() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFParagraph p = doc.createParagraph();
-
-        CTR run = CTR.Factory.newInstance();
-        XWPFRun r = new XWPFRun(run, doc.createParagraph());
-        p.addRun(r);
-        p.addRun(r);
-
-        assertNotNull(p.getRun(run));
-        assertNull(p.getRun(null));
-        doc.close();
-    }
-
-    @Test
-    public void test58067() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("58067.docx");
-        
-        StringBuilder str = new StringBuilder();
-        for(XWPFParagraph par : doc.getParagraphs()) {
-            str.append(par.getText()).append("\n");
-        }
-        assertEquals("This is a test.\n\n\n\n3\n4\n5\n\n\n\nThis is a whole paragraph where one word is deleted.\n", str.toString());
-    }
-    
-    @Test
-    public void testNumberedLists() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("ComplexNumberedLists.docx");
-        XWPFParagraph p;
-        
-        p = doc.getParagraphArray(0);
-        assertEquals("This is a document with numbered lists", p.getText());
-        assertEquals(null, p.getNumID());
-        assertEquals(null, p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(1);
-        assertEquals("Entry #1", p.getText());
-        assertEquals(BigInteger.valueOf(1), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(2);
-        assertEquals("Entry #2, with children", p.getText());
-        assertEquals(BigInteger.valueOf(1), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(3);
-        assertEquals("2-a", p.getText());
-        assertEquals(BigInteger.valueOf(1), p.getNumID());
-        assertEquals(BigInteger.valueOf(1), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(4);
-        assertEquals("2-b", p.getText());
-        assertEquals(BigInteger.valueOf(1), p.getNumID());
-        assertEquals(BigInteger.valueOf(1), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(5);
-        assertEquals("2-c", p.getText());
-        assertEquals(BigInteger.valueOf(1), p.getNumID());
-        assertEquals(BigInteger.valueOf(1), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(6);
-        assertEquals("Entry #3", p.getText());
-        assertEquals(BigInteger.valueOf(1), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(7);
-        assertEquals("Entry #4", p.getText());
-        assertEquals(BigInteger.valueOf(1), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        // New list
-        p = doc.getParagraphArray(8);
-        assertEquals("Restarted to 1 from 5", p.getText());
-        assertEquals(BigInteger.valueOf(2), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(9);
-        assertEquals("Restarted @ 2", p.getText());
-        assertEquals(BigInteger.valueOf(2), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        p = doc.getParagraphArray(10);
-        assertEquals("Restarted @ 3", p.getText());
-        assertEquals(BigInteger.valueOf(2), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        assertEquals(null, p.getNumStartOverride());
-        
-        // New list starting at 10
-        p = doc.getParagraphArray(11);
-        assertEquals("Jump to new list at 10", p.getText());
-        assertEquals(BigInteger.valueOf(6), p.getNumID());
-        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
-        // TODO Why isn't this seen as 10?
-        assertEquals(null, p.getNumStartOverride());
-        
-        // TODO Shouldn't we use XWPFNumbering or similar here?
-        // TODO Make it easier to change
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
deleted file mode 100644
index f4c0a49..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-
-public class TestXWPFPictureData extends TestCase {
-
-    public void testRead() throws InvalidFormatException, IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("VariousPictures.docx");
-        List<XWPFPictureData> pictures = sampleDoc.getAllPictures();
-
-        assertEquals(5, pictures.size());
-        String[] ext = {"wmf", "png", "emf", "emf", "jpeg"};
-        for (int i = 0; i < pictures.size(); i++) {
-            assertEquals(ext[i], pictures.get(i).suggestFileExtension());
-        }
-
-        int num = pictures.size();
-
-        byte[] pictureData = XWPFTestDataSamples.getImage("nature1.jpg");
-
-        String relationId = sampleDoc.addPictureData(pictureData, XWPFDocument.PICTURE_TYPE_JPEG);
-        // picture list was updated
-        assertEquals(num + 1, pictures.size());
-        XWPFPictureData pict = (XWPFPictureData) sampleDoc.getRelationById(relationId);
-        assertEquals("jpeg", pict.suggestFileExtension());
-        assertArrayEquals(pictureData, pict.getData());
-    }
-
-    public void testPictureInHeader() throws IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("headerPic.docx");
-        verifyOneHeaderPicture(sampleDoc);
-
-        XWPFDocument readBack = XWPFTestDataSamples.writeOutAndReadBack(sampleDoc);
-        verifyOneHeaderPicture(readBack);
-    }
-    
-    public void testCreateHeaderPicture() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-        
-        // Starts with no header
-        XWPFHeaderFooterPolicy policy = doc.getHeaderFooterPolicy();
-        assertNull(policy);
-        
-        // Add a default header
-        policy = doc.createHeaderFooterPolicy();
-        XWPFHeader header = policy.createHeader(XWPFHeaderFooterPolicy.DEFAULT);
-        header.createParagraph().createRun().setText("Hello, Header World!");
-        header.createParagraph().createRun().setText("Paragraph 2");
-        assertEquals(0, header.getAllPictures().size());
-        assertEquals(2, header.getParagraphs().size());
-        
-        // Add a picture to the first paragraph
-        header.getParagraphs().get(0).getRuns().get(0).addPicture(
-                new ByteArrayInputStream(new byte[] {1,2,3,4}), 
-                Document.PICTURE_TYPE_JPEG, "test.jpg", 2, 2);
-        
-        // Check
-        verifyOneHeaderPicture(doc);
-        
-        // Save, re-load, re-check
-        XWPFDocument readBack = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        verifyOneHeaderPicture(readBack);
-    }
-
-    private void verifyOneHeaderPicture(XWPFDocument sampleDoc) {
-        XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
-
-        XWPFHeader header = policy.getDefaultHeader();
-
-        List<XWPFPictureData> pictures = header.getAllPictures();
-        assertEquals(1, pictures.size());
-    }
-
-    public void testNew() throws InvalidFormatException, IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("EmptyDocumentWithHeaderFooter.docx");
-        byte[] jpegData = XWPFTestDataSamples.getImage("nature1.jpg");
-        assertNotNull(jpegData);
-        byte[] gifData = XWPFTestDataSamples.getImage("nature1.gif");
-        assertNotNull(gifData);
-        byte[] pngData = XWPFTestDataSamples.getImage("nature1.png");
-        assertNotNull(pngData);
-
-        List<XWPFPictureData> pictures = doc.getAllPictures();
-        assertEquals(0, pictures.size());
-
-        // Document shouldn't have any image relationships
-        assertEquals(13, doc.getPackagePart().getRelationships().size());
-        for (PackageRelationship rel : doc.getPackagePart().getRelationships()) {
-            if (rel.getRelationshipType().equals(XSSFRelation.IMAGE_JPEG.getRelation())) {
-                fail("Shouldn't have JPEG yet");
-            }
-        }
-
-        // Add the image
-        String relationId = doc.addPictureData(jpegData, XWPFDocument.PICTURE_TYPE_JPEG);
-        assertEquals(1, pictures.size());
-        XWPFPictureData jpgPicData = (XWPFPictureData) doc.getRelationById(relationId);
-        assertEquals("jpeg", jpgPicData.suggestFileExtension());
-        assertArrayEquals(jpegData, jpgPicData.getData());
-
-        // Ensure it now has one
-        assertEquals(14, doc.getPackagePart().getRelationships().size());
-        PackageRelationship jpegRel = null;
-        for (PackageRelationship rel : doc.getPackagePart().getRelationships()) {
-            if (rel.getRelationshipType().equals(XWPFRelation.IMAGE_JPEG.getRelation())) {
-                if (jpegRel != null)
-                    fail("Found 2 jpegs!");
-                jpegRel = rel;
-            }
-        }
-        assertNotNull("JPEG Relationship not found", jpegRel);
-
-        // Check the details
-        assertNotNull(jpegRel);
-        assertEquals(XWPFRelation.IMAGE_JPEG.getRelation(), jpegRel.getRelationshipType());
-        assertEquals("/word/document.xml", jpegRel.getSource().getPartName().toString());
-        assertEquals("/word/media/image1.jpeg", jpegRel.getTargetURI().getPath());
-
-        XWPFPictureData pictureDataByID = doc.getPictureDataByID(jpegRel.getId());
-        assertArrayEquals(jpegData, pictureDataByID.getData());
-
-        // Save an re-load, check it appears
-        doc = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        assertEquals(1, doc.getAllPictures().size());
-        assertEquals(1, doc.getAllPackagePictures().size());
-
-        // verify the picture that we read back in
-        pictureDataByID = doc.getPictureDataByID(jpegRel.getId());
-        assertArrayEquals(jpegData, pictureDataByID.getData());
-
-    }
-
-    public void testBug51770() throws InvalidFormatException, IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug51170.docx");
-        XWPFHeaderFooterPolicy policy = doc.getHeaderFooterPolicy();
-        XWPFHeader header = policy.getDefaultHeader();
-        for (XWPFParagraph paragraph : header.getParagraphs()) {
-            for (XWPFRun run : paragraph.getRuns()) {
-                for (XWPFPicture picture : run.getEmbeddedPictures()) {
-                    if (paragraph.getDocument() != null) {
-                        //System.out.println(picture.getCTPicture());
-                        XWPFPictureData data = picture.getPictureData();
-                        if (data != null) System.out.println(data.getFileName());
-                    }
-                }
-            }
-        }
-
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
deleted file mode 100644
index 4194027..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.util.Units;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-/**
- * Tests for XWPF Run
- */
-@SuppressWarnings("deprecation")
-public class TestXWPFRun {
-    private CTR ctRun;
-    private XWPFParagraph p;
-    private XWPFDocument doc;
-
-    @Before
-    public void setUp() {
-        doc = new XWPFDocument();
-        p = doc.createParagraph();
-
-        this.ctRun = CTR.Factory.newInstance();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetText() {
-        ctRun.addNewT().setStringValue("TEST STRING");
-        ctRun.addNewT().setStringValue("TEST2 STRING");
-        ctRun.addNewT().setStringValue("TEST3 STRING");
-
-        assertEquals(3, ctRun.sizeOfTArray());
-        XWPFRun run = new XWPFRun(ctRun, p);
-
-        assertEquals("TEST2 STRING", run.getText(1));
-
-        run.setText("NEW STRING", 0);
-        assertEquals("NEW STRING", run.getText(0));
-
-        //run.setText("xxx",14);
-        //fail("Position wrong");
-    }
-
-    /*
-     * bug 59208
-     * Purpose: test all valid boolean-like values
-     * exercise isCTOnOff(CTOnOff) through all valid permutations
-     */
-    @Test
-    public void testCTOnOff() {
-        CTRPr rpr = ctRun.addNewRPr();
-        CTOnOff bold = rpr.addNewB();        
-        XWPFRun run = new XWPFRun(ctRun, p);
-
-        // True values: "true", "1", "on"
-        bold.setVal(STOnOff.TRUE);
-        assertEquals(true, run.isBold());    
-
-        bold.setVal(STOnOff.X_1);
-        assertEquals(true, run.isBold());
-
-        bold.setVal(STOnOff.ON);
-        assertEquals(true, run.isBold());
-
-        // False values: "false", "0", "off"
-        bold.setVal(STOnOff.FALSE);
-        assertEquals(false, run.isBold());
-
-        bold.setVal(STOnOff.X_0);
-        assertEquals(false, run.isBold());
-
-        bold.setVal(STOnOff.OFF);
-        assertEquals(false, run.isBold());
-    }
-
-    @Test
-    public void testSetGetBold() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewB().setVal(STOnOff.TRUE);
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals(true, run.isBold());
-
-        run.setBold(false);
-        // Implementation detail: POI natively prefers <w:b w:val="false"/>,
-        // but should correctly read val="0" and val="off"
-        assertEquals(STOnOff.FALSE, rpr.getB().getVal());
-    }
-
-    @Test
-    public void testSetGetItalic() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewI().setVal(STOnOff.TRUE);
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals(true, run.isItalic());
-
-        run.setItalic(false);
-        assertEquals(STOnOff.FALSE, rpr.getI().getVal());
-    }
-
-    @Test
-    public void testSetGetStrike() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewStrike().setVal(STOnOff.TRUE);
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals(true, run.isStrike());
-
-        run.setStrike(false);
-        assertEquals(STOnOff.FALSE, rpr.getStrike().getVal());
-    }
-
-    @Test
-    public void testSetGetUnderline() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewU().setVal(STUnderline.DASH);
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals(UnderlinePatterns.DASH.getValue(), run.getUnderline()
-                .getValue());
-
-        run.setUnderline(UnderlinePatterns.NONE);
-        assertEquals(STUnderline.NONE.intValue(), rpr.getU().getVal()
-                .intValue());
-    }
-
-    @Test
-    public void testSetGetVAlign() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewVertAlign().setVal(STVerticalAlignRun.SUBSCRIPT);
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals(VerticalAlign.SUBSCRIPT, run.getSubscript());
-
-        run.setSubscript(VerticalAlign.BASELINE);
-        assertEquals(STVerticalAlignRun.BASELINE, rpr.getVertAlign().getVal());
-    }
-
-    @Test
-    public void testSetGetFontFamily() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewRFonts().setAscii("Times New Roman");
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals("Times New Roman", run.getFontFamily());
-
-        run.setFontFamily("Verdana");
-        assertEquals("Verdana", rpr.getRFonts().getAscii());
-    }
-
-    @Test
-    public void testSetGetFontSize() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewSz().setVal(new BigInteger("14"));
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals(7, run.getFontSize());
-
-        run.setFontSize(24);
-        assertEquals(48, rpr.getSz().getVal().longValue());
-    }
-
-    @Test
-    public void testSetGetTextForegroundBackground() {
-        CTRPr rpr = ctRun.addNewRPr();
-        rpr.addNewPosition().setVal(new BigInteger("4000"));
-
-        XWPFRun run = new XWPFRun(ctRun, p);
-        assertEquals(4000, run.getTextPosition());
-
-        run.setTextPosition(2400);
-        assertEquals(2400, rpr.getPosition().getVal().longValue());
-    }
-
-    @Test
-    public void testSetGetColor() {
-        XWPFRun run = new XWPFRun(ctRun, p);
-        run.setColor("0F0F0F");
-        String clr = run.getColor();
-        assertEquals("0F0F0F", clr);
-    }
-
-    @Test
-    public void testAddCarriageReturn() {
-        ctRun.addNewT().setStringValue("TEST STRING");
-        ctRun.addNewCr();
-        ctRun.addNewT().setStringValue("TEST2 STRING");
-        ctRun.addNewCr();
-        ctRun.addNewT().setStringValue("TEST3 STRING");
-        assertEquals(2, ctRun.sizeOfCrArray());
-
-        XWPFRun run = new XWPFRun(CTR.Factory.newInstance(), p);
-        run.setText("T1");
-        run.addCarriageReturn();
-        run.addCarriageReturn();
-        run.setText("T2");
-        run.addCarriageReturn();
-        assertEquals(3, run.getCTR().sizeOfCrArray());
-
-        assertEquals("T1\n\nT2\n", run.toString());
-    }
-
-    @Test
-    public void testAddTabsAndLineBreaks() {
-        ctRun.addNewT().setStringValue("TEST STRING");
-        ctRun.addNewCr();
-        ctRun.addNewT().setStringValue("TEST2 STRING");
-        ctRun.addNewTab();
-        ctRun.addNewT().setStringValue("TEST3 STRING");
-        assertEquals(1, ctRun.sizeOfCrArray());
-        assertEquals(1, ctRun.sizeOfTabArray());
-
-        XWPFRun run = new XWPFRun(CTR.Factory.newInstance(), p);
-        run.setText("T1");
-        run.addCarriageReturn();
-        run.setText("T2");
-        run.addTab();
-        run.setText("T3");
-        assertEquals(1, run.getCTR().sizeOfCrArray());
-        assertEquals(1, run.getCTR().sizeOfTabArray());
-
-        assertEquals("T1\nT2\tT3", run.toString());
-    }
-
-    @Test
-    public void testAddPageBreak() {
-        ctRun.addNewT().setStringValue("TEST STRING");
-        ctRun.addNewBr();
-        ctRun.addNewT().setStringValue("TEST2 STRING");
-        CTBr breac = ctRun.addNewBr();
-        breac.setClear(STBrClear.LEFT);
-        ctRun.addNewT().setStringValue("TEST3 STRING");
-        assertEquals(2, ctRun.sizeOfBrArray());
-
-        XWPFRun run = new XWPFRun(CTR.Factory.newInstance(), p);
-        run.setText("TEXT1");
-        run.addBreak();
-        run.setText("TEXT2");
-        run.addBreak(BreakType.TEXT_WRAPPING);
-        assertEquals(2, run.getCTR().sizeOfBrArray());
-    }
-
-    /**
-     * Test that on an existing document, we do the
-     * right thing with it
-     *
-     * @throws IOException
-     */
-    @Test
-    public void testExisting() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("TestDocument.docx");
-        XWPFParagraph p;
-        XWPFRun run;
-
-
-        // First paragraph is simple
-        p = doc.getParagraphArray(0);
-        assertEquals("This is a test document.", p.getText());
-        assertEquals(2, p.getRuns().size());
-
-        run = p.getRuns().get(0);
-        assertEquals("This is a test document", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-        run = p.getRuns().get(1);
-        assertEquals(".", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-
-        // Next paragraph is all in one style, but a different one
-        p = doc.getParagraphArray(1);
-        assertEquals("This bit is in bold and italic", p.getText());
-        assertEquals(1, p.getRuns().size());
-
-        run = p.getRuns().get(0);
-        assertEquals("This bit is in bold and italic", run.toString());
-        assertEquals(true, run.isBold());
-        assertEquals(true, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(true, run.getCTR().getRPr().isSetB());
-        assertEquals(false, run.getCTR().getRPr().getB().isSetVal());
-
-
-        // Back to normal
-        p = doc.getParagraphArray(2);
-        assertEquals("Back to normal", p.getText());
-        assertEquals(1, p.getRuns().size());
-
-        run = p.getRuns().get(0);
-        assertEquals("Back to normal", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-
-        // Different styles in one paragraph
-        p = doc.getParagraphArray(3);
-        assertEquals("This contains BOLD, ITALIC and BOTH, as well as RED and YELLOW text.", p.getText());
-        assertEquals(11, p.getRuns().size());
-
-        run = p.getRuns().get(0);
-        assertEquals("This contains ", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-        run = p.getRuns().get(1);
-        assertEquals("BOLD", run.toString());
-        assertEquals(true, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-
-        run = p.getRuns().get(2);
-        assertEquals(", ", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-        run = p.getRuns().get(3);
-        assertEquals("ITALIC", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(true, run.isItalic());
-        assertEquals(false, run.isStrike());
-
-        run = p.getRuns().get(4);
-        assertEquals(" and ", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-        run = p.getRuns().get(5);
-        assertEquals("BOTH", run.toString());
-        assertEquals(true, run.isBold());
-        assertEquals(true, run.isItalic());
-        assertEquals(false, run.isStrike());
-
-        run = p.getRuns().get(6);
-        assertEquals(", as well as ", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-        run = p.getRuns().get(7);
-        assertEquals("RED", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-
-        run = p.getRuns().get(8);
-        assertEquals(" and ", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-
-        run = p.getRuns().get(9);
-        assertEquals("YELLOW", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-
-        run = p.getRuns().get(10);
-        assertEquals(" text.", run.toString());
-        assertEquals(false, run.isBold());
-        assertEquals(false, run.isItalic());
-        assertEquals(false, run.isStrike());
-        assertEquals(null, run.getCTR().getRPr());
-    }
-
-    @Test
-    public void testPictureInHeader() throws IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("headerPic.docx");
-        XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
-
-        XWPFHeader header = policy.getDefaultHeader();
-
-        int count = 0;
-
-        for (XWPFParagraph p : header.getParagraphs()) {
-            for (XWPFRun r : p.getRuns()) {
-                List<XWPFPicture> pictures = r.getEmbeddedPictures();
-
-                for (XWPFPicture pic : pictures) {
-                    assertNotNull(pic.getPictureData());
-                    assertEquals("DOZOR", pic.getDescription());
-                }
-
-                count += pictures.size();
-            }
-        }
-
-        assertEquals(1, count);
-    }
-
-    @Test
-    public void testSetGetHighlight() throws Exception {
-        XWPFRun run = p.createRun();
-        assertEquals(false, run.isHighlighted());
-        
-        // TODO Do this using XWPFRun methods
-        run.getCTR().addNewRPr().addNewHighlight().setVal(STHighlightColor.NONE);
-        assertEquals(false, run.isHighlighted());
-        run.getCTR().getRPr().getHighlight().setVal(STHighlightColor.CYAN);
-        assertEquals(true, run.isHighlighted());
-        run.getCTR().getRPr().getHighlight().setVal(STHighlightColor.NONE);
-        assertEquals(false, run.isHighlighted());
-    }
-
-    @Test
-    public void testAddPicture() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("TestDocument.docx");
-        XWPFParagraph p = doc.getParagraphArray(2);
-        XWPFRun r = p.getRuns().get(0);
-
-        assertEquals(0, doc.getAllPictures().size());
-        assertEquals(0, r.getEmbeddedPictures().size());
-
-        r.addPicture(new ByteArrayInputStream(new byte[0]), Document.PICTURE_TYPE_JPEG, "test.jpg", 21, 32);
-
-        assertEquals(1, doc.getAllPictures().size());
-        assertEquals(1, r.getEmbeddedPictures().size());
-        
-        XWPFDocument docBack = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        XWPFParagraph pBack = docBack.getParagraphArray(2);
-        XWPFRun rBack = pBack.getRuns().get(0);
-        
-        assertEquals(1, docBack.getAllPictures().size());
-        assertEquals(1, rBack.getEmbeddedPictures().size());
-    }
-
-    /**
-     * Bugzilla #52288 - setting the font family on the
-     * run mustn't NPE
-     */
-    @Test
-    public void testSetFontFamily_52288() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("52288.docx");
-        final Iterator<XWPFParagraph> paragraphs = doc.getParagraphsIterator();
-        while (paragraphs.hasNext()) {
-            final XWPFParagraph paragraph = paragraphs.next();
-            for (final XWPFRun run : paragraph.getRuns()) {
-                if (run != null) {
-                    final String text = run.getText(0);
-                    if (text != null) {
-                        run.setFontFamily("Times New Roman");
-                    }
-                }
-            }
-        }
-    }
-
-    @Test
-    public void testBug55476() throws IOException, InvalidFormatException {
-        byte[] image = XWPFTestDataSamples.getImage("abstract1.jpg");
-        XWPFDocument document = new XWPFDocument();
-
-        document.createParagraph().createRun().addPicture(
-                new ByteArrayInputStream(image), Document.PICTURE_TYPE_JPEG, "test.jpg", Units.toEMU(300), Units.toEMU(100));
-
-        XWPFDocument docBack = XWPFTestDataSamples.writeOutAndReadBack(document);
-        List<XWPFPicture> pictures = docBack.getParagraphArray(0).getRuns().get(0).getEmbeddedPictures();
-        assertEquals(1, pictures.size());
-        docBack.close();
-
-        /*OutputStream stream = new FileOutputStream("c:\\temp\\55476.docx");
-        try {
-            document.write(stream);
-        } finally {
-            stream.close();
-        }*/
-
-        document.close();
-    }
-
-    @Test
-    public void testBug58922() {
-        XWPFDocument document = new XWPFDocument();
-
-        final XWPFRun run = document.createParagraph().createRun();
-
-
-        assertEquals(-1, run.getFontSize());
-
-        run.setFontSize(10);
-        assertEquals(10, run.getFontSize());
-
-        run.setFontSize(Short.MAX_VALUE-1);
-        assertEquals(Short.MAX_VALUE-1, run.getFontSize());
-
-        run.setFontSize(Short.MAX_VALUE);
-        assertEquals(Short.MAX_VALUE, run.getFontSize());
-
-        run.setFontSize(Short.MAX_VALUE+1);
-        assertEquals(Short.MAX_VALUE+1, run.getFontSize());
-
-        run.setFontSize(Integer.MAX_VALUE-1);
-        assertEquals(Integer.MAX_VALUE-1, run.getFontSize());
-
-        run.setFontSize(Integer.MAX_VALUE);
-        assertEquals(Integer.MAX_VALUE, run.getFontSize());
-
-        run.setFontSize(-1);
-        assertEquals(-1, run.getFontSize());
-
-
-        assertEquals(-1, run.getTextPosition());
-
-        run.setTextPosition(10);
-        assertEquals(10, run.getTextPosition());
-
-        run.setTextPosition(Short.MAX_VALUE-1);
-        assertEquals(Short.MAX_VALUE-1, run.getTextPosition());
-
-        run.setTextPosition(Short.MAX_VALUE);
-        assertEquals(Short.MAX_VALUE, run.getTextPosition());
-
-        run.setTextPosition(Short.MAX_VALUE+1);
-        assertEquals(Short.MAX_VALUE+1, run.getTextPosition());
-
-        run.setTextPosition(Short.MAX_VALUE+1);
-        assertEquals(Short.MAX_VALUE+1, run.getTextPosition());
-
-        run.setTextPosition(Integer.MAX_VALUE-1);
-        assertEquals(Integer.MAX_VALUE-1, run.getTextPosition());
-
-        run.setTextPosition(Integer.MAX_VALUE);
-        assertEquals(Integer.MAX_VALUE, run.getTextPosition());
-
-        run.setTextPosition(-1);
-        assertEquals(-1, run.getTextPosition());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
deleted file mode 100644
index 9cba17e..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public final class TestXWPFSDT {
-
-    /**
-     * Test simple tag and title extraction from SDT
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testTagTitle() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug54849.docx");
-        String tag = null;
-        String title = null;
-        List<AbstractXWPFSDT> sdts = extractAllSDTs(doc);
-        for (AbstractXWPFSDT sdt : sdts) {
-            if (sdt.getContent().toString().equals("Rich_text")) {
-                tag = "MyTag";
-                title = "MyTitle";
-                break;
-            }
-
-        }
-        assertEquals("controls size", 13, sdts.size());
-
-        assertEquals("tag", "MyTag", tag);
-        assertEquals("title", "MyTitle", title);
-    }
-
-    @Test
-    public void testGetSDTs() throws Exception {
-        String[] contents = new String[]{
-                "header_rich_text",
-                "Rich_text",
-                "Rich_text_pre_table\nRich_text_cell1\t\t\t\n\t\t\t\n\t\t\t\n\nRich_text_post_table",
-                "Plain_text_no_newlines",
-                "Plain_text_with_newlines1\nplain_text_with_newlines2",
-                "Watermelon",
-                "Dirt",
-                "4/16/2013",
-                "Rich_text_in_cell",
-                "rich_text_in_paragraph_in_cell",
-                "Footer_rich_text",
-                "Footnote_sdt",
-                "Endnote_sdt"
-
-        };
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug54849.docx");
-        List<AbstractXWPFSDT> sdts = extractAllSDTs(doc);
-
-        assertEquals("number of sdts", contents.length, sdts.size());
-
-        for (int i = 0; i < contents.length; i++) {
-            AbstractXWPFSDT sdt = sdts.get(i);
-            assertEquals(i + ": " + contents[i], contents[i], sdt.getContent().toString());
-        }
-    }
-
-    /**
-     * POI-54771 and TIKA-1317
-     */
-    @Test
-    public void testSDTAsCell() throws Exception {
-        //Bug54771a.docx and Bug54771b.docx test slightly 
-        //different recursion patterns. Keep both!
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug54771a.docx");
-        List<AbstractXWPFSDT> sdts = extractAllSDTs(doc);
-        String text = sdts.get(0).getContent().getText();
-        assertEquals(2, sdts.size());
-        assertTrue(text.indexOf("Test") > -1);
-
-        text = sdts.get(1).getContent().getText();
-        assertTrue(text.indexOf("Test Subtitle") > -1);
-        assertTrue(text.indexOf("Test User") > -1);
-        assertTrue(text.indexOf("Test") < text.indexOf("Test Subtitle"));
-
-        doc = XWPFTestDataSamples.openSampleDocument("Bug54771b.docx");
-        sdts = extractAllSDTs(doc);
-        assertEquals(3, sdts.size());
-        assertTrue(sdts.get(0).getContent().getText().indexOf("Test") > -1);
-
-        assertTrue(sdts.get(1).getContent().getText().indexOf("Test Subtitle") > -1);
-        assertTrue(sdts.get(2).getContent().getText().indexOf("Test User") > -1);
-
-    }
-
-    /**
-     * POI-55142 and Tika 1130
-     */
-    @Test
-    public void testNewLinesBetweenRuns() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug55142.docx");
-        List<AbstractXWPFSDT> sdts = extractAllSDTs(doc);
-        List<String> targs = new ArrayList<String>();
-        //these test newlines and tabs in paragraphs/body elements
-        targs.add("Rich-text1 abcdefghi");
-        targs.add("Rich-text2 abcd\t\tefgh");
-        targs.add("Rich-text3 abcd\nefg");
-        targs.add("Rich-text4 abcdefg");
-        targs.add("Rich-text5 abcdefg\nhijk");
-        targs.add("Plain-text1 abcdefg");
-        targs.add("Plain-text2 abcdefg\nhijk\nlmnop");
-        //this tests consecutive runs within a cell (not a paragraph)
-        //this test case was triggered by Tika-1130
-        targs.add("sdt_incell2 abcdefg");
-
-        for (int i = 0; i < sdts.size(); i++) {
-            AbstractXWPFSDT sdt = sdts.get(i);
-            assertEquals(targs.get(i), targs.get(i), sdt.getContent().getText());
-        }
-    }
-
-    @Test
-    public void test60341() throws IOException {
-        //handle sdtbody without an sdtpr
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug60341.docx");
-        List<AbstractXWPFSDT> sdts = extractAllSDTs(doc);
-        assertEquals(1, sdts.size());
-        assertEquals("", sdts.get(0).getTag());
-        assertEquals("", sdts.get(0).getTitle());
-    }
-
-    private List<AbstractXWPFSDT> extractAllSDTs(XWPFDocument doc) {
-
-        List<AbstractXWPFSDT> sdts = new ArrayList<AbstractXWPFSDT>();
-
-        List<XWPFHeader> headers = doc.getHeaderList();
-        for (XWPFHeader header : headers) {
-            sdts.addAll(extractSDTsFromBodyElements(header.getBodyElements()));
-        }
-        sdts.addAll(extractSDTsFromBodyElements(doc.getBodyElements()));
-
-        List<XWPFFooter> footers = doc.getFooterList();
-        for (XWPFFooter footer : footers) {
-            sdts.addAll(extractSDTsFromBodyElements(footer.getBodyElements()));
-        }
-
-        for (XWPFFootnote footnote : doc.getFootnotes()) {
-            sdts.addAll(extractSDTsFromBodyElements(footnote.getBodyElements()));
-        }
-        for (Map.Entry<Integer, XWPFFootnote> e : doc.endnotes.entrySet()) {
-            sdts.addAll(extractSDTsFromBodyElements(e.getValue().getBodyElements()));
-        }
-        return sdts;
-    }
-
-    private List<AbstractXWPFSDT> extractSDTsFromBodyElements(List<IBodyElement> elements) {
-        List<AbstractXWPFSDT> sdts = new ArrayList<AbstractXWPFSDT>();
-        for (IBodyElement e : elements) {
-            if (e instanceof XWPFSDT) {
-                XWPFSDT sdt = (XWPFSDT) e;
-                sdts.add(sdt);
-            } else if (e instanceof XWPFParagraph) {
-
-                XWPFParagraph p = (XWPFParagraph) e;
-                for (IRunElement e2 : p.getIRuns()) {
-                    if (e2 instanceof XWPFSDT) {
-                        XWPFSDT sdt = (XWPFSDT) e2;
-                        sdts.add(sdt);
-                    }
-                }
-            } else if (e instanceof XWPFTable) {
-                XWPFTable table = (XWPFTable) e;
-                sdts.addAll(extractSDTsFromTable(table));
-            }
-        }
-        return sdts;
-    }
-
-    private List<AbstractXWPFSDT> extractSDTsFromTable(XWPFTable table) {
-
-        List<AbstractXWPFSDT> sdts = new ArrayList<AbstractXWPFSDT>();
-        for (XWPFTableRow r : table.getRows()) {
-            for (ICell c : r.getTableICells()) {
-                if (c instanceof XWPFSDTCell) {
-                    sdts.add((XWPFSDTCell) c);
-                } else if (c instanceof XWPFTableCell) {
-                    sdts.addAll(extractSDTsFromBodyElements(((XWPFTableCell) c).getBodyElements()));
-                }
-            }
-        }
-        return sdts;
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
deleted file mode 100644
index 7adc0d0..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-
-/**
- * Tests for reading SmartTags from Word docx.
- *
- * @author Fabian Lange
- */
-public final class TestXWPFSmartTag extends TestCase {
-
-    public void testSmartTags() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("smarttag-snippet.docx");
-        XWPFParagraph p = doc.getParagraphArray(0);
-        assertTrue(p.getText().contains("Carnegie Mellon University School of Computer Science"));
-        p = doc.getParagraphArray(2);
-        assertTrue(p.getText().contains("Alice's Adventures"));
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
deleted file mode 100644
index 3773b29..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFonts;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLatentStyles;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLsdException;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyle;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyles;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STStyleType;
-
-public class TestXWPFStyles extends TestCase {
-    public void testGetUsedStyles() throws IOException {
-        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("Styles.docx");
-        List<XWPFStyle> testUsedStyleList = new ArrayList<XWPFStyle>();
-        XWPFStyles styles = sampleDoc.getStyles();
-        XWPFStyle style = styles.getStyle("berschrift1");
-        testUsedStyleList.add(style);
-        testUsedStyleList.add(styles.getStyle("Standard"));
-        testUsedStyleList.add(styles.getStyle("berschrift1Zchn"));
-        testUsedStyleList.add(styles.getStyle("Absatz-Standardschriftart"));
-        style.hasSameName(style);
-
-        List<XWPFStyle> usedStyleList = styles.getUsedStyleList(style);
-        assertEquals(usedStyleList, testUsedStyleList);
-    }
-
-    public void testAddStylesToDocument() throws IOException {
-        XWPFDocument docOut = new XWPFDocument();
-        XWPFStyles styles = docOut.createStyles();
-
-        String strStyleId = "headline1";
-        CTStyle ctStyle = CTStyle.Factory.newInstance();
-
-        ctStyle.setStyleId(strStyleId);
-        XWPFStyle s = new XWPFStyle(ctStyle);
-        styles.addStyle(s);
-
-        assertTrue(styles.styleExist(strStyleId));
-
-        XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
-        styles = docIn.getStyles();
-        assertTrue(styles.styleExist(strStyleId));
-    }
-
-    /**
-     * Bug #52449 - We should be able to write a file containing
-     * both regular and glossary styles without error
-     */
-    public void test52449() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("52449.docx");
-        XWPFStyles styles = doc.getStyles();
-        assertNotNull(styles);
-
-        XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(doc);
-        styles = docIn.getStyles();
-        assertNotNull(styles);
-    }
-
-
-    /**
-     * YK: tests below don't make much sense,
-     * they exist only to copy xml beans to pi-ooxml-schemas.jar
-     */
-    @SuppressWarnings("resource")
-    public void testLanguages() {
-        XWPFDocument docOut = new XWPFDocument();
-        XWPFStyles styles = docOut.createStyles();
-        styles.setEastAsia("Chinese");
-
-        styles.setSpellingLanguage("English");
-
-        CTFonts def = CTFonts.Factory.newInstance();
-        styles.setDefaultFonts(def);
-    }
-
-    public void testType() {
-        CTStyle ctStyle = CTStyle.Factory.newInstance();
-        XWPFStyle style = new XWPFStyle(ctStyle);
-
-        style.setType(STStyleType.PARAGRAPH);
-        assertEquals(STStyleType.PARAGRAPH, style.getType());
-    }
-
-    public void testLatentStyles() {
-        CTLatentStyles latentStyles = CTLatentStyles.Factory.newInstance();
-        CTLsdException ex = latentStyles.addNewLsdException();
-        ex.setName("ex1");
-        XWPFLatentStyles ls = new XWPFLatentStyles(latentStyles);
-        assertEquals(true, ls.isLatentStyle("ex1"));
-        assertEquals(false, ls.isLatentStyle("notex1"));
-    }
-
-    public void testSetStyles_Bug57254() throws IOException {
-        XWPFDocument docOut = new XWPFDocument();
-        XWPFStyles styles = docOut.createStyles();
-
-        CTStyles ctStyles = CTStyles.Factory.newInstance();
-        String strStyleId = "headline1";
-        CTStyle ctStyle = ctStyles.addNewStyle();
-
-        ctStyle.setStyleId(strStyleId);
-        styles.setStyles(ctStyles);
-
-        assertTrue(styles.styleExist(strStyleId));
-
-        XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
-        styles = docIn.getStyles();
-        assertTrue(styles.styleExist(strStyleId));
-    }
-
-    public void testEasyAccessToStyles() throws IOException {
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
-        XWPFStyles styles = doc.getStyles();
-        assertNotNull(styles);
-
-        // Has 3 paragraphs on page one, a break, and 3 on page 2
-        assertEquals(7, doc.getParagraphs().size());
-
-        // Check the first three have no run styles, just default paragraph style
-        for (int i = 0; i < 3; i++) {
-            XWPFParagraph p = doc.getParagraphs().get(i);
-            assertEquals(null, p.getStyle());
-            assertEquals(null, p.getStyleID());
-            assertEquals(1, p.getRuns().size());
-
-            XWPFRun r = p.getRuns().get(0);
-            assertEquals(null, r.getColor());
-            assertEquals(null, r.getFontFamily());
-            assertEquals(null, r.getFontName());
-            assertEquals(-1, r.getFontSize());
-        }
-
-        // On page two, has explicit styles, but on runs not on
-        //  the paragraph itself
-        for (int i = 4; i < 7; i++) {
-            XWPFParagraph p = doc.getParagraphs().get(i);
-            assertEquals(null, p.getStyle());
-            assertEquals(null, p.getStyleID());
-            assertEquals(1, p.getRuns().size());
-
-            XWPFRun r = p.getRuns().get(0);
-            assertEquals("Arial Black", r.getFontFamily());
-            assertEquals("Arial Black", r.getFontName());
-            assertEquals(16, r.getFontSize());
-            assertEquals("548DD4", r.getColor());
-        }
-
-        // Check the document styles
-        // Should have a style defined for each type
-        assertEquals(4, styles.getNumberOfStyles());
-        assertNotNull(styles.getStyle("Normal"));
-        assertNotNull(styles.getStyle("DefaultParagraphFont"));
-        assertNotNull(styles.getStyle("TableNormal"));
-        assertNotNull(styles.getStyle("NoList"));
-
-        // We can't do much yet with latent styles
-        assertEquals(137, styles.getLatentStyles().getNumberOfStyles());
-
-        // Check the default styles
-        assertNotNull(styles.getDefaultRunStyle());
-        assertNotNull(styles.getDefaultParagraphStyle());
-
-        assertEquals(11, styles.getDefaultRunStyle().getFontSize());
-        assertEquals(200, styles.getDefaultParagraphStyle().getSpacingAfter());
-    }
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
deleted file mode 100644
index 449f6b6..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xwpf.usermodel;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFTable.XWPFBorderType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblBorders;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblCellMar;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblGrid;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
-
-/**
- * Tests for XWPF Tables
- */
-public class TestXWPFTable extends TestCase {
-    @Override
-    protected void setUp() {
-        /*
-          XWPFDocument doc = new XWPFDocument();
-          p = doc.createParagraph();
-
-          this.ctRun = CTR.Factory.newInstance();
-       */
-    }
-
-    public void testConstructor() {
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable xtab = new XWPFTable(ctTable, doc);
-        assertNotNull(xtab);
-        assertEquals(1, ctTable.sizeOfTrArray());
-        assertEquals(1, ctTable.getTrArray(0).sizeOfTcArray());
-        assertNotNull(ctTable.getTrArray(0).getTcArray(0).getPArray(0));
-
-        ctTable = CTTbl.Factory.newInstance();
-        xtab = new XWPFTable(ctTable, doc, 3, 2);
-        assertNotNull(xtab);
-        assertEquals(3, ctTable.sizeOfTrArray());
-        assertEquals(2, ctTable.getTrArray(0).sizeOfTcArray());
-        assertNotNull(ctTable.getTrArray(0).getTcArray(0).getPArray(0));
-    }
-
-    public void testTblGrid() {
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        CTTblGrid cttblgrid = ctTable.addNewTblGrid();
-        cttblgrid.addNewGridCol().setW(new BigInteger("123"));
-        cttblgrid.addNewGridCol().setW(new BigInteger("321"));
-
-        XWPFTable xtab = new XWPFTable(ctTable, doc);
-        assertEquals(123, xtab.getCTTbl().getTblGrid().getGridColArray(0).getW().intValue());
-        assertEquals(321, xtab.getCTTbl().getTblGrid().getGridColArray(1).getW().intValue());
-    }
-
-    public void testGetText() {
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl table = CTTbl.Factory.newInstance();
-        CTRow row = table.addNewTr();
-        CTTc cell = row.addNewTc();
-        CTP paragraph = cell.addNewP();
-        CTR run = paragraph.addNewR();
-        CTText text = run.addNewT();
-        text.setStringValue("finally I can write!");
-
-        XWPFTable xtab = new XWPFTable(table, doc);
-        assertEquals("finally I can write!\n", xtab.getText());
-    }
-
-
-    public void testCreateRow() {
-        XWPFDocument doc = new XWPFDocument();
-
-        CTTbl table = CTTbl.Factory.newInstance();
-        CTRow r1 = table.addNewTr();
-        r1.addNewTc().addNewP();
-        r1.addNewTc().addNewP();
-        CTRow r2 = table.addNewTr();
-        r2.addNewTc().addNewP();
-        r2.addNewTc().addNewP();
-        CTRow r3 = table.addNewTr();
-        r3.addNewTc().addNewP();
-        r3.addNewTc().addNewP();
-
-        XWPFTable xtab = new XWPFTable(table, doc);
-        assertEquals(3, xtab.getNumberOfRows());
-        assertNotNull(xtab.getRow(2));
-
-        //add a new row
-        xtab.createRow();
-        assertEquals(4, xtab.getNumberOfRows());
-
-        //check number of cols
-        assertEquals(2, table.getTrArray(0).sizeOfTcArray());
-
-        //check creation of first row
-        xtab = new XWPFTable(CTTbl.Factory.newInstance(), doc);
-        assertEquals(1, xtab.getCTTbl().getTrArray(0).sizeOfTcArray());
-    }
-
-
-    public void testSetGetWidth() {
-        XWPFDocument doc = new XWPFDocument();
-
-        CTTbl table = CTTbl.Factory.newInstance();
-        table.addNewTblPr().addNewTblW().setW(new BigInteger("1000"));
-
-        XWPFTable xtab = new XWPFTable(table, doc);
-
-        assertEquals(1000, xtab.getWidth());
-
-        xtab.setWidth(100);
-        assertEquals(100, table.getTblPr().getTblW().getW().intValue());
-    }
-
-    public void testSetGetHeight() {
-        XWPFDocument doc = new XWPFDocument();
-
-        CTTbl table = CTTbl.Factory.newInstance();
-
-        XWPFTable xtab = new XWPFTable(table, doc);
-        XWPFTableRow row = xtab.createRow();
-        row.setHeight(20);
-        assertEquals(20, row.getHeight());
-    }
-
-    public void testSetGetMargins() {
-        // instantiate the following class so it'll get picked up by
-        // the XmlBean process and added to the jar file. it's required
-        // for the following XWPFTable methods.
-        CTTblCellMar ctm = CTTblCellMar.Factory.newInstance();
-        assertNotNull(ctm);
-        // create a table
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        // set margins
-        table.setCellMargins(50, 50, 250, 450);
-        // get margin components
-        int t = table.getCellMarginTop();
-        assertEquals(50, t);
-        int l = table.getCellMarginLeft();
-        assertEquals(50, l);
-        int b = table.getCellMarginBottom();
-        assertEquals(250, b);
-        int r = table.getCellMarginRight();
-        assertEquals(450, r);
-    }
-
-    public void testSetGetHBorders() {
-        // instantiate the following classes so they'll get picked up by
-        // the XmlBean process and added to the jar file. they are required
-        // for the following XWPFTable methods.
-        CTTblBorders cttb = CTTblBorders.Factory.newInstance();
-        assertNotNull(cttb);
-        STBorder stb = STBorder.Factory.newInstance();
-        assertNotNull(stb);
-        // create a table
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        // set inside horizontal border
-        table.setInsideHBorder(XWPFBorderType.SINGLE, 4, 0, "FF0000");
-        // get inside horizontal border components
-        int s = table.getInsideHBorderSize();
-        assertEquals(4, s);
-        int sp = table.getInsideHBorderSpace();
-        assertEquals(0, sp);
-        String clr = table.getInsideHBorderColor();
-        assertEquals("FF0000", clr);
-        XWPFBorderType bt = table.getInsideHBorderType();
-        assertEquals(XWPFBorderType.SINGLE, bt);
-    }
-
-    public void testSetGetVBorders() {
-        // create a table
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        // set inside vertical border
-        table.setInsideVBorder(XWPFBorderType.DOUBLE, 4, 0, "00FF00");
-        // get inside vertical border components
-        XWPFBorderType bt = table.getInsideVBorderType();
-        assertEquals(XWPFBorderType.DOUBLE, bt);
-        int sz = table.getInsideVBorderSize();
-        assertEquals(4, sz);
-        int sp = table.getInsideVBorderSpace();
-        assertEquals(0, sp);
-        String clr = table.getInsideVBorderColor();
-        assertEquals("00FF00", clr);
-    }
-
-    public void testSetGetRowBandSize() {
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        table.setRowBandSize(12);
-        int sz = table.getRowBandSize();
-        assertEquals(12, sz);
-    }
-
-    public void testSetGetColBandSize() {
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        table.setColBandSize(16);
-        int sz = table.getColBandSize();
-        assertEquals(16, sz);
-    }
-
-    public void testCreateTable() throws Exception {
-        // open an empty document
-        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-
-        // create a table with 5 rows and 7 columns
-        int noRows = 5;
-        int noCols = 7;
-        XWPFTable table = doc.createTable(noRows, noCols);
-
-        // assert the table is empty
-        List<XWPFTableRow> rows = table.getRows();
-        assertEquals("Table has less rows than requested.", noRows, rows.size());
-        for (XWPFTableRow xwpfRow : rows) {
-            assertNotNull(xwpfRow);
-            for (int i = 0; i < 7; i++) {
-                XWPFTableCell xwpfCell = xwpfRow.getCell(i);
-                assertNotNull(xwpfCell);
-                assertEquals("Empty cells should not have one paragraph.", 1, xwpfCell.getParagraphs().size());
-                xwpfCell = xwpfRow.getCell(i);
-                assertEquals("Calling 'getCell' must not modify cells content.", 1, xwpfCell.getParagraphs().size());
-            }
-        }
-        doc.getPackage().revert();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
deleted file mode 100644
index 00e34e2..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.xwpf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell.XWPFVertAlign;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
-
-import java.util.List;
-
-public class TestXWPFTableCell extends TestCase {
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testSetGetVertAlignment() throws Exception {
-        // instantiate the following classes so they'll get picked up by
-        // the XmlBean process and added to the jar file. they are required
-        // for the following XWPFTableCell methods.
-        CTShd ctShd = CTShd.Factory.newInstance();
-        assertNotNull(ctShd);
-        CTVerticalJc ctVjc = CTVerticalJc.Factory.newInstance();
-        assertNotNull(ctVjc);
-        STShd stShd = STShd.Factory.newInstance();
-        assertNotNull(stShd);
-        STVerticalJc stVjc = STVerticalJc.Factory.newInstance();
-        assertNotNull(stVjc);
-
-        // create a table
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        // table has a single row by default; grab it
-        XWPFTableRow tr = table.getRow(0);
-        assertNotNull(tr);
-        // row has a single cell by default; grab it
-        XWPFTableCell cell = tr.getCell(0);
-
-        cell.setVerticalAlignment(XWPFVertAlign.BOTH);
-        XWPFVertAlign al = cell.getVerticalAlignment();
-        assertEquals(XWPFVertAlign.BOTH, al);
-    }
-
-    public void testSetGetColor() throws Exception {
-        // create a table
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        // table has a single row by default; grab it
-        XWPFTableRow tr = table.getRow(0);
-        assertNotNull(tr);
-        // row has a single cell by default; grab it
-        XWPFTableCell cell = tr.getCell(0);
-
-        cell.setColor("F0000F");
-        String clr = cell.getColor();
-        assertEquals("F0000F", clr);
-    }
-
-    /**
-     * ensure that CTHMerge & CTTcBorders go in poi-ooxml.jar
-     */
-    @SuppressWarnings("unused")
-    public void test54099() {
-        XWPFDocument doc = new XWPFDocument();
-        CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable table = new XWPFTable(ctTable, doc);
-        XWPFTableRow tr = table.getRow(0);
-        XWPFTableCell cell = tr.getCell(0);
-
-        CTTc ctTc = cell.getCTTc();
-        CTTcPr tcPr = ctTc.addNewTcPr();
-        CTHMerge hMerge = tcPr.addNewHMerge();
-        hMerge.setVal(STMerge.RESTART);
-
-        CTTcBorders tblBorders = tcPr.addNewTcBorders();
-        CTVMerge vMerge = tcPr.addNewVMerge();
-    }
-
-    public void testCellVerticalAlign() throws Exception{
-        XWPFDocument docx = XWPFTestDataSamples.openSampleDocument("59030.docx");
-        List<XWPFTable> tables = docx.getTables();
-        assertEquals(1, tables.size());
-
-        XWPFTable table = tables.get(0);
-
-        List<XWPFTableRow> tableRows = table.getRows();
-        assertEquals(2, tableRows.size());
-
-        assertEquals(XWPFVertAlign.TOP, tableRows.get(0).getCell(0).getVerticalAlignment());
-        assertEquals(XWPFVertAlign.BOTTOM, tableRows.get(0).getCell(1).getVerticalAlignment());
-        assertEquals(XWPFVertAlign.CENTER, tableRows.get(1).getCell(0).getVerticalAlignment());
-        assertEquals(XWPFVertAlign.TOP, tableRows.get(1).getCell(1).getVerticalAlignment());
-    }
-	
-	public void testCellVerticalAlign2() throws Exception{
-		XWPFDocument docx = XWPFTestDataSamples.openSampleDocument("TestTableCellAlign.docx");
-		List<XWPFTable> tables = docx.getTables();
-        for (XWPFTable table : tables) {
-            List<XWPFTableRow> tableRows = table.getRows();
-            for (XWPFTableRow tableRow : tableRows) {
-                List<XWPFTableCell> tableCells = tableRow.getTableCells();
-                for (XWPFTableCell tableCell : tableCells) {
-					assertNotNull(tableCell.getVerticalAlignment());
-				}
-			}
-		}			
-	}
-}
diff --git a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
deleted file mode 100644
index 57ed435..0000000
--- a/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.xwpf.usermodel;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.junit.Test;
-
-public class TestXWPFTableRow {
-
-    @Test
-    public void testCreateRow() throws IOException {
-        XWPFDocument doc = new XWPFDocument();
-        XWPFTable table = doc.createTable(1, 1);
-        XWPFTableRow tr = table.createRow();
-        assertNotNull(tr);
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetCantSplitRow() throws IOException {
-        // create a table
-        XWPFDocument doc = new XWPFDocument();
-        XWPFTable table = doc.createTable(1, 1);
-        // table has a single row by default; grab it
-        XWPFTableRow tr = table.getRow(0);
-        assertNotNull(tr);
-
-        // Assert the repeat header is false by default
-        boolean isCantSplit = tr.isCantSplitRow();
-        assertFalse(isCantSplit);
-        
-        // Repeat the header
-        tr.setCantSplitRow(true);
-        isCantSplit = tr.isCantSplitRow();
-        assertTrue(isCantSplit);
-
-        // Make the header no longer repeating
-        tr.setCantSplitRow(false);
-        isCantSplit = tr.isCantSplitRow();
-        assertFalse(isCantSplit);
-        
-        doc.close();
-    }
-
-    @Test
-    public void testSetGetRepeatHeader() throws IOException {
-        // create a table
-        XWPFDocument doc = new XWPFDocument();
-        XWPFTable table = doc.createTable(3, 1);
-        // table has a single row by default; grab it
-        XWPFTableRow tr = table.getRow(0);
-        assertNotNull(tr);
-        
-        // Assert the repeat header is false by default
-        boolean isRpt = tr.isRepeatHeader();
-        assertFalse(isRpt);
-        
-        // Repeat the header
-        tr.setRepeatHeader(true);
-        isRpt = tr.isRepeatHeader();
-        assertTrue(isRpt);
-
-        // Make the header no longer repeating
-        tr.setRepeatHeader(false);
-        isRpt = tr.isRepeatHeader();
-        assertFalse(isRpt);
-        
-        // If the third row is set to repeat, but not the second,
-        // isRepeatHeader should report false because Word will
-        // ignore it.
-        tr = table.getRow(2);
-        tr.setRepeatHeader(true);
-        isRpt = tr.isRepeatHeader();
-        assertFalse(isRpt);
-        
-        doc.close();
-    }
-    
-    // Test that validates the table header value can be parsed from a document
-    // generated in Word
-    @Test
-    public void testIsRepeatHeader() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples
-                .openSampleDocument("Bug60337.docx");
-        XWPFTable table = doc.getTables().get(0);
-        XWPFTableRow tr = table.getRow(0);
-        boolean isRpt = tr.isRepeatHeader();
-        assertTrue(isRpt);
-        
-        tr = table.getRow(1);
-        isRpt = tr.isRepeatHeader();
-        assertFalse(isRpt);
-        
-        tr = table.getRow(2);
-        isRpt = tr.isRepeatHeader();
-        assertFalse(isRpt);
-    }
-    
-    
-    // Test that validates the table header value can be parsed from a document
-    // generated in Word
-    @Test
-    public void testIsCantSplit() throws Exception {
-        XWPFDocument doc = XWPFTestDataSamples
-                .openSampleDocument("Bug60337.docx");
-        XWPFTable table = doc.getTables().get(0);
-        XWPFTableRow tr = table.getRow(0);
-        boolean isCantSplit = tr.isCantSplitRow();
-        assertFalse(isCantSplit);
-        
-        tr = table.getRow(1);
-        isCantSplit = tr.isCantSplitRow();
-        assertFalse(isCantSplit);
-
-        tr = table.getRow(2);
-        isCantSplit = tr.isCantSplitRow();
-        assertTrue(isCantSplit);
-    }
-}
diff --git a/trunk/src/records/definitions/area_format_record.xml b/trunk/src/records/definitions/area_format_record.xml
deleted file mode 100644
index 3fc2a9c..0000000
--- a/trunk/src/records/definitions/area_format_record.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x100a" name="AreaFormat" excel-record-id="AREAFORMAT" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The area format record is used to define the colours and patterns for an area.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="4" name="foreground color" description="foreground color in RGB"/>
-        <field type="int" size="4" name="background color" description="background color in RGB"/>
-        <field type="int" size="2" name="pattern" description="fill pattern"/>
-        <field type="int" size="2" name="format flags">
-            <bit number="0" name="automatic" description="automatic formatting"/>
-            <bit number="1" name="invert" description="swap foreground and background colours when data is negative"/>
-        </field>
-        <field type="int" size="2" name="forecolor index" description="index to foreground color"/>
-        <field type="int" size="2" name="backcolor index" description="index to background color"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/area_record.xml b/trunk/src/records/definitions/area_record.xml
deleted file mode 100644
index 16f04e1..0000000
--- a/trunk/src/records/definitions/area_record.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x101A" name="Area" excel-record-id="AREA"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The area record is used to define a area chart.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="format flags">
-            <bit number="0" name="stacked" description="series is stacked"/>
-            <bit number="1" name="display as percentage" description="results displayed as percentages"/>
-            <bit number="2" name="shadow" description="display a shadow for the chart"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/attached_label_record.xml b/trunk/src/records/definitions/attached_label_record.xml
deleted file mode 100644
index e2e59e8..0000000
--- a/trunk/src/records/definitions/attached_label_record.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x100c" name="SeriesLabels" excel-record-id="ATTACHEDLABEL"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The series label record defines the type of label associated with the data format record.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="format flags">
-            <bit number="0" name="show actual" description="show actual value of the data point"/>
-            <bit number="1" name="show percent" description="show value as percentage of total (pie charts only)"/>
-            <bit number="2" name="label as percentage" description="show category label/value as percentage (pie charts only)"/>
-            <bit number="3" name="smoothed line" description="show smooth line"/>
-            <bit number="4" name="show label" description="display category label"/>
-            <bit number="5" name="show bubble sizes" description="??"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/axes_used_record.xml b/trunk/src/records/definitions/axes_used_record.xml
deleted file mode 100644
index cd8cf10..0000000
--- a/trunk/src/records/definitions/axes_used_record.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1046" name="AxisUsed" excel-record-id="AXISUSED"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The number of axes used on a chart.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="num axis"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/axis_line_format_record.xml b/trunk/src/records/definitions/axis_line_format_record.xml
deleted file mode 100644
index ff0fc4d..0000000
--- a/trunk/src/records/definitions/axis_line_format_record.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1021" name="AxisLineFormat" excel-record-id="AXISLINEFORMAT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The axis line format record defines the axis type details.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="axis type">
-            <const name="axis line" value="0"/>
-            <const name="major grid line" value="1"/>
-            <const name="minor grid line" value="2"/>
-            <const name="walls or floor" value="3"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/axis_options_record.xml b/trunk/src/records/definitions/axis_options_record.xml
deleted file mode 100644
index 0100f6e..0000000
--- a/trunk/src/records/definitions/axis_options_record.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1062" name="AxisOptions" excel-record-id="AXCEXT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The axis options record provides unit information and other various tidbits about the axis.</description>
-    <author>Andrew C. Oliver(acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="minimum category" description="minimum category on axis"/>
-        <field type="int" size="2" name="maximum category" description="maximum category on axis"/>
-        <field type="int" size="2" name="major unit value" decription="is this like where it draws the line?"/>
-        <field type="int" size="2" name="major unit" description="units vs values..dunno"/>
-        <field type="int" size="2" name="minor unit value" description="is this where it draws the tick marks?"/>
-        <field type="int" size="2" name="minor unit" description="dunno exactly"/>
-        <field type="int" size="2" name="base unit" description="dunno exactly"/>
-        <field type="int" size="2" name="crossing point" description="where the axes cross"/>
-        <field type="int" size="2" name="options">
-            <bit number="0" name="default minimum" description="use the default minimum category"/>
-            <bit number="1" name="default maximum" description="use the default maximum category"/>
-            <bit number="2" name="default major" description="use the default major unit"/>
-            <bit number="3" name="default minor unit" description="use the default minor unit"/>
-            <bit number="4" name="isDate" description="this is a date axis"/>
-            <bit number="5" name="default base" description="use the default base unit"/>
-            <bit number="6" name="default cross" description="use the default crossing point"/>
-            <bit number="7" name="default date settings" description="use default date setttings for this axis"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/axis_parent_record.xml b/trunk/src/records/definitions/axis_parent_record.xml
deleted file mode 100644
index 22532a8..0000000
--- a/trunk/src/records/definitions/axis_parent_record.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1041" name="AxisParent" excel-record-id="AXISPARENT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The axis size and location</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="axis type">
-            <const name="main" value="0"/>
-            <const name="secondary" value="1"/>
-        </field>
-        <field type="int" size="4" name="x"/>
-        <field type="int" size="4" name="y"/>
-        <field type="int" size="4" name="width"/>
-        <field type="int" size="4" name="height"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/axis_record.xml b/trunk/src/records/definitions/axis_record.xml
deleted file mode 100644
index b03c23f..0000000
--- a/trunk/src/records/definitions/axis_record.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x101d" name="Axis" excel-record-id="AXIS" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The axis record defines the type of an axis.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="axis type">
-            <const name="category or x axis" value="0"/>
-            <const name="value axis" value="1"/>
-            <const name="series axis" value="2"/>
-        </field>
-        <field type="int" size="4" name="reserved1"/>
-        <field type="int" size="4" name="reserved2"/>
-        <field type="int" size="4" name="reserved3"/>
-        <field type="int" size="4" name="reserved4"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/bar_record.xml b/trunk/src/records/definitions/bar_record.xml
deleted file mode 100644
index 9fffd79..0000000
--- a/trunk/src/records/definitions/bar_record.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1017" name="Bar" excel-record-id="BAR"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The bar record is used to define a bar chart.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="bar space" description="space between bars"/>
-        <field type="int" size="2" name="category space" description="space between categories"/>
-        <field type="int" size="2" name="format flags">
-            <bit number="0" name="horizontal" description="true to display horizontal bar charts, false for vertical"/>
-            <bit number="1" name="stacked" description="stack displayed values"/>
-            <bit number="2" name="display as percentage" description="display chart values as a percentage"/>
-            <bit number="3" name="shadow" description="display a shadow for the chart"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/category_series_axis_record.xml b/trunk/src/records/definitions/category_series_axis_record.xml
deleted file mode 100644
index 94088b5..0000000
--- a/trunk/src/records/definitions/category_series_axis_record.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1020" name="CategorySeriesAxis" excel-record-id="CATSERRANGE"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>This record refers to a category or series axis and is used to specify label/tickmark frequency.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="crossing point" description="axis or category crossing point for 2d charts"/>
-        <field type="int" size="2" name="label frequency" description="label frequency"/>
-        <field type="int" size="2" name="tick mark frequency" description="tick mark frequency"/>
-        <field type="int" size="2" name="options" description="various options">
-            <bit number="0" name="value axis crossing" description="set true to indicate axis crosses between categories and false to cross axis midway"/>
-            <bit number="1" name="crosses far right" description="axis crosses at the far right"/>
-            <bit number="2" name="reversed" description="categories are displayed in reverse order"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/chart_record.xml b/trunk/src/records/definitions/chart_record.xml
deleted file mode 100644
index f1bd8fc..0000000
--- a/trunk/src/records/definitions/chart_record.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1002" name="Chart" excel-record-id="CHART"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The chart record is used to define the location and size of a chart.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="4" name="x" description="x position of top-left corner (specified on 1/72 of an inch, two bytes are a whole and two are a fraction)"/>
-        <field type="int" size="4" name="y" description="y position of top-left corner (specified on 1/72 of an inch, two bytes are a whole and two are a fraction)"/>
-        <field type="int" size="4" name="width" description="width of chart (specified on 1/72 of an inch), two bytes are a whole and two are a fraction"/>
-        <field type="int" size="4" name="height" description="height of chart (specified on 1/72 of an inch), two bytes are a whole and two are a fraction"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/common_object_data_record.xml b/trunk/src/records/definitions/common_object_data_record.xml
deleted file mode 100644
index ad7ebfd..0000000
--- a/trunk/src/records/definitions/common_object_data_record.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x15" name="CommonObjectData" excel-record-id="ftCmo"
-    package="org.apache.poi.hssf.record">
-    <suffix>SubRecord</suffix>
-    <extends>SubRecord</extends>
-    <description>The common object data record is used to store all common preferences for an excel object.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="object type">
-            <const value="0" name="group" description="group"/>
-            <const value="1" name="line" description="line"/>
-            <const value="2" name="rectangle" description="rectangle"/>
-            <const value="3" name="oval" description="oval"/>
-            <const value="4" name="arc" description="arc"/>
-            <const value="5" name="chart" description="chart"/>
-            <const value="6" name="text" description="text"/>
-            <const value="7" name="button" description="button"/>
-            <const value="8" name="picture" description="picture"/>
-            <const value="9" name="polygon" description="polygon"/>
-            <const value="10" name="reserved1" description="reserved1"/>
-            <const value="11" name="checkbox" description="checkbox"/>
-            <const value="12" name="option button" description="option button"/>
-            <const value="13" name="edit box" description="edit box"/>
-            <const value="14" name="label" description="label"/>
-            <const value="15" name="dialog box" description="dialog box"/>
-            <const value="16" name="spinner" description="spinner"/>
-            <const value="17" name="scroll bar" description="scroll bar"/>
-            <const value="18" name="list box" description="list box"/>
-            <const value="19" name="group box" description="group box"/>
-            <const value="20" name="combo box" description="combo box"/>
-            <const value="21" name="reserved2" description="reserved2"/>
-            <const value="22" name="reserved3" description="reserved3"/>
-            <const value="23" name="reserved4" description="reserved4"/>
-            <const value="24" name="reserved5" description="reserved5"/>
-            <const value="25" name="comment" description="comment"/>
-            <const value="26" name="reserved6" description="reserved6"/>
-            <const value="27" name="reserved7" description="reserved7"/>
-            <const value="28" name="reserved8" description="reserved8"/>
-            <const value="29" name="reserved9" description="reserved9"/>
-            <const value="30" name="microsoft office drawing" description="microsoft office drawing"/>
-        </field>
-        <field type="int" size="2" name="object id"/>
-        <field type="int" size="2" name="option">
-            <bit number="0" name="locked" description="true if object is locked when sheet has been protected"/>
-            <bit number="4" name="printable" description="object appears when printed"/>
-            <bit number="13" name="autofill" description="whether object uses an automatic fill style"/>
-            <bit number="14" name="autoline" description="whether object uses an automatic line style"/>
-        </field>
-        <field type="int" size="4" name="reserved1" description="Should always be 0"/>
-        <field type="int" size="4" name="reserved2" description="Should always be 0"/>
-        <field type="int" size="4" name="reserved3" description="Should always be 0"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/dat_record.xml b/trunk/src/records/definitions/dat_record.xml
deleted file mode 100644
index bda909e..0000000
--- a/trunk/src/records/definitions/dat_record.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1063" name="Dat" excel-record-id="DAT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The dat record is used to store options for the chart.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="options">
-            <bit number="0" name="horizontal border" description="has a horizontal border"/>
-            <bit number="1" name="vertical border" description="has vertical border"/>
-            <bit number="2" name="border" description="data table has a border"/>
-            <bit number="3" name="show series key" description="shows the series key"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/dataformat_record.xml b/trunk/src/records/definitions/dataformat_record.xml
deleted file mode 100644
index 3720e24..0000000
--- a/trunk/src/records/definitions/dataformat_record.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1006" name="DataFormat"  excel-record-id="DATAFORMAT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The data format record is used to index into a series.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="point number" description="0xFFFF for entire series"/>
-        <field type="int" size="2" name="series index" description="relative index"/>
-        <field type="int" size="2" name="series number" description="series number (which can be different from series index when series order is changed)"/>
-        <field type="int" size="2" name="format flags">
-            <bit number="0" name="use excel 4 colors" description="set true to use excel 4 colors."/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/default_data_label_text_properties_record.xml b/trunk/src/records/definitions/default_data_label_text_properties_record.xml
deleted file mode 100644
index 9a0e755..0000000
--- a/trunk/src/records/definitions/default_data_label_text_properties_record.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1024" name="DefaultDataLabelTextProperties"
-    excel-record-id="DEFAULTTEXT" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The default data label text properties record identifies the text characteristics of the preceeding text record.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="category data type">
-            <const name="show labels characteristic" value="0"/>
-            <const name="value and percentage characteristic" value="1"/>
-            <const name="all text characteristic" value="2"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/font_basis_record.xml b/trunk/src/records/definitions/font_basis_record.xml
deleted file mode 100644
index e16b292..0000000
--- a/trunk/src/records/definitions/font_basis_record.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1060" name="FontBasis" excel-record-id="FBI"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The font basis record stores various font metrics.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="x Basis" description="width when font was supplied"/>
-        <field type="int" size="2" name="y Basis" description="height when font was supplied"/>
-        <field type="int" size="2" name="height basis" description="font height applied"/>
-        <field type="int" size="2" name="scale" description="scale"/>
-        <field type="int" size="2" name="index to font table" description="the index number into the font table"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/font_example.xml b/trunk/src/records/definitions/font_example.xml
deleted file mode 100644
index 9bf5447..0000000
--- a/trunk/src/records/definitions/font_example.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x31" name="Font"  excel-record-id="FONT" package="org.apache.poi.hssf.records">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Describes a font record.  In Excel a font belongs in the font table.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="font height"/>
-        <field type="bits" size="2" name="attributes">
-            <bit number="1" name="italic" description="Indicates whether a font has an italic appearance"/>
-            <bit number="3" name="struck out" description="Indicates whether a font has a line through the middle."/>
-        </field>
-        <field type="int" size="2" name="colour palette index"/>
-        <field type="int" size="2" name="bold weight">
-            <const name="normal text" value="400" description="Sets text to normal appearance"/>
-            <const name="bold text" value="700" description="Redenders a font bold"/>
-        </field>
-        <field type="int" size="2" name="super sub script">
-            <const name="none" value="0"/>
-            <const name="super script" value="1"/>
-            <const name="subscript" value="2"/>
-        </field>
-        <field type="int" size="1" name="underline">
-            <const name="none" value="0"/>
-            <const name="single" value="1"/>
-            <const name="double" value="2"/>
-            <const name="single accounting" value="3"/>
-            <const name="double accounting" value="4"/>
-        </field>
-        <field type="int" size="1" name="font family"/>
-        <field type="int" size="1" name="character set"/>
-        <field type="int" size="1" name="reserved"/>
-        <field type="string" size="var" name="font name"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/font_index_record.xml b/trunk/src/records/definitions/font_index_record.xml
deleted file mode 100644
index bac26e2..0000000
--- a/trunk/src/records/definitions/font_index_record.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1026" name="FontIndex" excel-record-id="FONTX"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The font index record indexes into the font table for the text record.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="font index" description="index to the font table"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/frame_record.xml b/trunk/src/records/definitions/frame_record.xml
deleted file mode 100644
index b3b0339..0000000
--- a/trunk/src/records/definitions/frame_record.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1032" name="Frame" excel-record-id="FRAME"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The frame record indicates whether there is a border around the displayed text of a chart.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="border type">
-            <const name="regular" value="0" description="regular rectangle or no border"/>
-            <const name="shadow" value="1" description="rectangle with shadow"/>
-        </field>
-        <field type="int" size="2" name="options">
-            <bit number="0" name="auto size" description="excel calculates the size automatically if true"/>
-            <bit number="1" name="auto position" description="excel calculates the position automatically"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/ftend_record.xml b/trunk/src/records/definitions/ftend_record.xml
deleted file mode 100644
index 45f9d59..0000000
--- a/trunk/src/records/definitions/ftend_record.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x00" name="End" excel-record-id="ftEnd"
-    package="org.apache.poi.hssf.record">
-    <suffix>SubRecord</suffix>
-    <extends>SubRecord</extends>
-    <description>The end data record is used to denote the end of the subrecords.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/legend_record.xml b/trunk/src/records/definitions/legend_record.xml
deleted file mode 100644
index 577443e..0000000
--- a/trunk/src/records/definitions/legend_record.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1015" name="Legend" excel-record-id="LEGEND"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Defines a legend for a chart.</description>
-    <author>Andrew C. Oliver (acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="4" name="x axis upper left" description="x axis of the upper left hand corner">
-            <testresult value="0xe76"/>
-        </field>
-        <field type="int" size="4" name="y axis upper left" description="y axis of the upper left hand corner">
-            <testresult  value="0x786"/>
-        </field>
-        <field type="int" size="4" name="x size" description="width along the x axis">
-            <testresult  value="0x119"/>
-        </field>
-        <field type="int" size="4" name="y size" description="height along the y axis">
-            <testresult  value="0x8b"/>
-        </field>
-        <field type="int" size="1" name="type" description="type of legend (mostly position)">
-	    <const name="bottom" value="0"/>
-	    <const name="corner" value="1"/>
-	    <const name="top" value="2"/>
-	    <const name="right" value="3"/>
-	    <const name="left" value="4"/>
-	    <const name="undocked" value="7"/>
-            <testresult  value="0x3"/>
-        </field>
-        <field type="int" size="1" name="spacing" description="how close the parts of the legend are together">
-	    <const name="close" value="0"/>
-	    <const name="medium" value="1"/>
-	    <const name="open" value="2"/>
-            <testresult  value="0x1"/>
-        </field>
-        <field type="int" size="2" name="options" description="various bit settings">
-            <bit number="0" name="auto position" description="automatic positioning (1=docked)">
-            <testresult value="true"/>
-            </bit>
-            <bit number="1" name="auto series" description="excel 5 only (true)">
-            <testresult value="true"/>
-            </bit>
-            <bit number="2" name="auto x positioning" description="position of legend on the x axis is automatic">
-            <testresult value="true"/>
-            </bit>
-            <bit number="3" name="auto y positioning" description="position of legend on the y axis is automatic">
-            <testresult value="true"/>
-            </bit>
-            <bit number="4" name="vertical" description="vertical or horizontal legend (1 or 0 respectively).  Always 0 if not automatic.">
-            <testresult value="true"/>
-            </bit>
-            <bit number="5" name="data table" description="1 if chart contains data table">
-            <testresult value="false"/>
-            </bit>
- <!-- rest is always 0 -->
-            <testresult  value="0x1f"/>
-        </field>
-    </fields>
-    <testdata>
-	76 0E 00 00 86 07 00 00 19 01 00 00 8B 00 00 00 03 01 1F 00
-     </testdata>
-    <testsize>24</testsize>
-</record>
diff --git a/trunk/src/records/definitions/line_format_record.xml b/trunk/src/records/definitions/line_format_record.xml
deleted file mode 100644
index f55679f..0000000
--- a/trunk/src/records/definitions/line_format_record.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1007" name="LineFormat" excel-record-id="LINEFORMAT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Describes a line format record.  The line format record controls how a line on a chart appears.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="4" name="line color" description="The RGB color of a line (with the high byte = 0)"/>
-        <field type="int" size="2" name="line pattern">
-            <const name="solid" value="0" description="solid"/>
-            <const name="dash" value="1" description="dash"/>
-            <const name="dot" value="2" description="dot"/>
-            <const name="dash dot" value="3" description="dash dot"/>
-            <const name="dash dot dot" value="4" description="dash dot dot"/>
-            <const name="none" value="5" description="none"/>
-            <const name="dark gray pattern" value="6" description="dark gray pattern"/>
-            <const name="medium gray pattern" value="7" description="medium gray pattern"/>
-            <const name="light gray pattern" value="8" description="light gray pattern"/>
-        </field>
-        <field type="int" size="2" name="weight">
-            <const name="hairline" value="-1" description="hairline"/>
-            <const name="narrow" value="0" description="single"/>
-            <const name="medium" value="1" description="double"/>
-            <const name="wide" value="2" description="triple"/>
-        </field>
-        <field type="bits" size="2" name="format">
-            <bit number="0" name="auto" description="automatic format"/>
-            <bit number="2" name="draw ticks" description="draw tick marks"/>
-            <bit number="2" name="unknown" description="book marks this as reserved = 0 but it seems to do something"/>
-        </field>
-        <field type="int" size="2" name="colour palette index"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/linked_data_record.xml b/trunk/src/records/definitions/linked_data_record.xml
deleted file mode 100644
index bd247bd..0000000
--- a/trunk/src/records/definitions/linked_data_record.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1051" name="LinkedData" excel-record-id="AI" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Describes a linked data record.  This record refers to the series data or text.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="1" name="link type" description="What type of link is this?">
-            <const name="title or text" value="0" description="links a series title or text"/>
-            <const name="values" value="1" description="links to series values"/>
-            <const name="categories" value="2" description="links to categories"/>
-        </field>
-        <field type="int" size="1" name="reference type">
-            <const name="default categories" value="0" description="use default categories"/>
-            <const name="direct" value="1" description="reference to some text or a value entered directly into the formula bar"/>
-            <const name="worksheet" value="2" description="reference links to worksheet"/>
-            <const name="not used" value="3" description="??"/>
-            <const name="error reported" value="4" description="error reported"/>
-        </field>
-        <field type="bits" size="2" name="options">
-            <bit number="0" name="custom number format" description="true if this object has a custom number format"/>
-        </field>
-        <field type="int" size="2" name="index number fmt record"/>
-        <field type="custom:org.apache.poi.hssf.record.LinkedDataFormulaField"
-            size="var" name="formula of link" description="formula"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/number_format_index_record.xml b/trunk/src/records/definitions/number_format_index_record.xml
deleted file mode 100644
index 08d5f5c..0000000
--- a/trunk/src/records/definitions/number_format_index_record.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x104e" name="NumberFormatIndex" excel-record-id="IFMT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The number format index record indexes format table.  This applies to an axis.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="format index" description="index to the format table"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/object_link_record.xml b/trunk/src/records/definitions/object_link_record.xml
deleted file mode 100644
index 03848bb..0000000
--- a/trunk/src/records/definitions/object_link_record.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1027" name="ObjectLink" excel-record-id="OBJECTLINK"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Links text to an object on the chart or identifies it as the title.</description>
-    <author>Andrew C. Oliver (acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="anchor id" description="what is the text object linked to">
-            <const name="chart title" value="1"/>
-            <const name="y axis" value="2"/>
-            <const name="x axis" value="3"/>
-            <const name="series or point" value="4"/>
-            <const name="z axis" value="7"/>
-            <testresult value="3"/>
-        </field>
-        <field type="int" size="2" name="link 1" description="if this is a data series or point, this holds a link to that point or series">
-            <testresult  value="0x00"/>
-        </field>
-        <field type="int" size="2" name="link 2" description="if this is a data series or point, this holds a link to that point or series">
-            <testresult  value="0x00"/>
-        </field>
-    </fields>
-    <testdata>
-	03 00 00 00 00 00
-     </testdata>
-    <testsize>10</testsize>
-</record>
diff --git a/trunk/src/records/definitions/pane_record.xml b/trunk/src/records/definitions/pane_record.xml
deleted file mode 100644
index 4364431..0000000
--- a/trunk/src/records/definitions/pane_record.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x41" name="Pane" excel-record-id="PANE" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Describes the frozen and unfozen panes.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="x" description="horizontal position in 1/20th of a point (or number of columns visible if frozen pane)"/>
-        <field type="int" size="2" name="y" description="vertical position in 1/20th of a point (or number of rows visible if frozen pane)"/>
-        <field type="int" size="2" name="top row" description="top row visible in bottom pane"/>
-        <field type="int" size="2" name="left column" description="left column visible in the right pane"/>
-        <field type="int" size="2" name="active pane" description="which pane is active">
-            <const name="lower right" value="0"/>
-            <const name="upper right" value="1"/>
-            <const name="lower left" value="2"/>
-            <const name="upper left" value="3"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/plot_area_record.xml b/trunk/src/records/definitions/plot_area_record.xml
deleted file mode 100644
index 300492a..0000000
--- a/trunk/src/records/definitions/plot_area_record.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1035" name="PlotArea" excel-record-id="PLOTAREA"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>preceeds and identifies a frame as belonging to the plot area.</description>
-    <author>Andrew C. Oliver (acoliver at apache.org)</author>
-    <testsize>4</testsize>
-</record>
diff --git a/trunk/src/records/definitions/plotgrowth_record.xml b/trunk/src/records/definitions/plotgrowth_record.xml
deleted file mode 100644
index 469b981..0000000
--- a/trunk/src/records/definitions/plotgrowth_record.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1064" name="PlotGrowth" excel-record-id="PLOTGROWTH"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The plot growth record specifies the scaling factors used when a font is scaled.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="4" name="horizontalScale"/>
-        <field type="int" size="4" name="verticalScale"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/scl_record.xml b/trunk/src/records/definitions/scl_record.xml
deleted file mode 100644
index abe21b1..0000000
--- a/trunk/src/records/definitions/scl_record.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0xa0" name="SCL" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Specifies the window's zoom magnification.  If this record isn't present then the windows zoom is 100%. see p384 Excel Dev Kit</description>
-    <author>Andrew C. Oliver (acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="numerator" description="numerator of the fraction"/>
-        <field type="int" size="2" name="denominator" description="denominator of the fraction"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/series_chart_group_record.xml b/trunk/src/records/definitions/series_chart_group_record.xml
deleted file mode 100644
index 84338f1..0000000
--- a/trunk/src/records/definitions/series_chart_group_record.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1045" name="SeriesChartGroupIndex"  excel-record-id="SERTOCRT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The series chart group index record stores the index to the CHARTFORMAT record (0 based).</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="chart group index" description="index to the CHARTFORMAT record"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/series_index_record.xml b/trunk/src/records/definitions/series_index_record.xml
deleted file mode 100644
index a35e019..0000000
--- a/trunk/src/records/definitions/series_index_record.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1065" name="SeriesIndex" excel-record-id="SINDEX"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>links a series to its position in the series list.</description>
-    <author>Andrew C. Oliver (acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="index" description="where is this series in the list">
-            <testresult value="3"/>
-        </field>
-    </fields>
-    <testdata>
-	03 00
-     </testdata>
-    <testsize>6</testsize>
-</record>
diff --git a/trunk/src/records/definitions/series_list_record.xml b/trunk/src/records/definitions/series_list_record.xml
deleted file mode 100644
index 88eeb67..0000000
--- a/trunk/src/records/definitions/series_list_record.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1016" name="SeriesList" excel-record-id="SERIESLIST"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The series list record defines the series displayed as an overlay to the main chart record.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="varword" name="series numbers"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/series_record.xml b/trunk/src/records/definitions/series_record.xml
deleted file mode 100644
index e6d5164..0000000
--- a/trunk/src/records/definitions/series_record.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1003" name="Series" excel-record-id="SERIES" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The series record describes the overall data for a series.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="category data type">
-            <const name="dates" value="0"/>
-            <const name="numeric" value="1"/>
-            <const name="sequence" value="2"/>
-            <const name="text" value="3"/>
-        </field>
-        <field type="int" size="2" name="values data type">
-            <const name="dates" value="0"/>
-            <const name="numeric" value="1"/>
-            <const name="sequence" value="2"/>
-            <const name="text" value="3"/>
-        </field>
-        <field type="int" size="2" name="num categories"/>
-        <field type="int" size="2" name="num values"/>
-        <field type="int" size="2" name="bubble series type">
-            <const name="dates" value="0"/>
-            <const name="numeric" value="1"/>
-            <const name="sequence" value="2"/>
-            <const name="text" value="3"/>
-        </field>
-        <field type="int" size="2" name="num bubble values"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/series_text_record.xml b/trunk/src/records/definitions/series_text_record.xml
deleted file mode 100644
index f86aa2d..0000000
--- a/trunk/src/records/definitions/series_text_record.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x100d" name="SeriesText" excel-record-id="SERIESTEXT"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Defines a series name</description>
-    <author>Andrew C. Oliver (acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="id" description="should always be 0">
-            <testresult value="0"/>
-        </field>
-        <field type="int" size="1" name="text length">
-            <testresult  value="0x0C"/>
-        </field>
-        <field type="int" size="1" name="undocumented" description="probably highbyte flag to tell whether string is little or big endian">
-            <testresult  value="0x01"/>
-        </field>
-        <field type="hbstring" size="(field_2_textLength *2)" name="text">
-            <testresult value="Value Number"/>
-        </field>
-    </fields>
-    <testdata>00 00 0C 01 56 00 61 00 6C 00 75 00 65 00 20 00 4E 00 75 00 6D 00 62 00 65 00 72 00</testdata>
-    <testsize>32</testsize>
-</record>
diff --git a/trunk/src/records/definitions/sertocrt_record.xml b/trunk/src/records/definitions/sertocrt_record.xml
deleted file mode 100644
index a904e96..0000000
--- a/trunk/src/records/definitions/sertocrt_record.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1045" name="SeriesToChartGroup" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Indicates the chart-group index for a series.  The order probably defines the mapping.  So the 0th record probably means the 0th series.  The only field in this of course defines which chart group the 0th series (for instance) would map to.  Confusing?  Well thats because it is.  (p 522 BCG)</description>
-    <author>Andrew C. Oliver (acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="chart group index" description="index to the chart group for this series"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/sheet_properties_record.xml b/trunk/src/records/definitions/sheet_properties_record.xml
deleted file mode 100644
index 97c5300..0000000
--- a/trunk/src/records/definitions/sheet_properties_record.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1044" name="SheetProperties" excel-record-id="SHTPROPS" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>Describes a chart sheet properties record.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="bits" size="2" name="flags">
-            <bit number="0" name="chart type manually formatted" description="Has the chart type been manually formatted?"/>
-            <bit number="1" name="plot visible only" description="Only show visible cells on the chart."/>
-            <bit number="2" name="do not size with window" description="Do not size the chart when the window changes size"/>
-            <bit number="3" name="default plot dimensions" description="Indicates that the default area dimensions should be used."/>
-            <bit number="4" name="auto plot area" description="??"/>
-        </field>
-        <field type="int" size="1" name="empty">
-            <const name="not plotted" value="0" description="Empty cells are not plotted"/>
-            <const name="zero" value="1" description="Empty cells are treated as zero"/>
-            <const name="interpolated" value="2" description="Empty cells are interpolated"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/subrecord.xsl b/trunk/src/records/definitions/subrecord.xsl
deleted file mode 100644
index 01016bc..0000000
--- a/trunk/src/records/definitions/subrecord.xsl
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="record">
-
-<xsl:if test="@package">
-package <xsl:value-of select="@package"/>;
-</xsl:if>
-
-
-import org.apache.poi.util.*;
-
-/**
- * <xsl:value-of select="/record/description"/>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-<xsl:apply-templates select="author"/>
- */
-public class <xsl:value-of select="@name"/>SubRecord
-    extends SubRecord
-{
-    public final static short      sid                             = <xsl:value-of select="@id"/>;
-<xsl:for-each select="//fields/field">    private  <xsl:value-of select="recutil:getType(@size,@type,10)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/><xsl:value-of select="recutil:initializeText(@size,@type)"/>;
-<xsl:apply-templates select="./bit|./const|./bit/const"/>
-</xsl:for-each>
-
-    public <xsl:value-of select="@name"/>SubRecord()
-    {
-<xsl:for-each select="//fields/field"><xsl:if test="@default">
-<xsl:text>        </xsl:text>
-<xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> = <xsl:value-of select="@default"/>;
-</xsl:if></xsl:for-each>
-    }
-
-    /**
-     * Constructs a <xsl:value-of select="@name"/> record and sets its fields appropriately.
-     *
-     * @param id    id must be <xsl:value-of select="@id"/> or an exception
-     *              will be throw upon validation
-     * @param size  size the size of the data area of the record
-     * @param data  data of the record (should not contain sid/len)
-     */
-
-    public <xsl:value-of select="@name"/>SubRecord(short id, short size, byte [] data)
-    {
-        super(id, size, data);
-    <xsl:for-each select="//fields/field">
-    <xsl:if test="@default">
-        <xsl:text>        </xsl:text>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> =
-        <xsl:value-of select="@default"/>;
-
-    </xsl:if>
-    </xsl:for-each>
-    }
-
-    /**
-     * Constructs a <xsl:value-of select="@name"/> record and sets its fields appropriately.
-     *
-     * @param id    id must be <xsl:value-of select="@id"/> or an exception
-     *              will be throw upon validation
-     * @param size  size the size of the data area of the record
-     * @param data  data of the record (should not contain sid/len)
-     * @param offset of the record's data
-     */
-
-    public <xsl:value-of select="@name"/>SubRecord(short id, short size, byte [] data, int offset)
-    {
-        super(id, size, data, offset);
-    <xsl:for-each select="//fields/field">
-    <xsl:if test="@default">
-        <xsl:text>        </xsl:text>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> =
-        <xsl:value-of select="@default"/>;
-
-    </xsl:if>
-    </xsl:for-each>
-    }
-
-    /**
-     * Checks the sid matches the expected side for this record
-     *
-     * @param id   the expected sid.
-     */
-    protected void validateSid(short id)
-    {
-        if (id != sid)
-        {
-            throw new RecordFormatException(&quot;Not a <xsl:value-of select="@name"/> record&quot;);
-        }
-    }
-
-    protected void fillFields(byte [] data, short size, int offset)
-    {
-
-<xsl:text>        int pos = 0;
-</xsl:text>
-
- <xsl:variable name="fieldIterator" select="field:new()"/>
-<xsl:for-each select="//fields/field">
-    <xsl:text>        </xsl:text><xsl:value-of select="field:fillDecoder2($fieldIterator,position(),@name,@size,@type)"/>;
-</xsl:for-each>
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
-<xsl:apply-templates select="//field" mode="tostring"/>
-        buffer.append("[/<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
-        return buffer.toString();
-    }
-
-    public int serialize(int offset, byte[] data)
-    {
-        int pos = 0;
-
-        LittleEndian.putShort(data, 0 + offset, sid);
-        LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
-<xsl:variable name="fieldIterator" select="field:new()"/>
-<xsl:for-each select="//fields/field"><xsl:text>
-        </xsl:text><xsl:value-of select="field:serialiseEncoder($fieldIterator,position(),@name,@size,@type)"/>
-</xsl:for-each>
-
-        return getRecordSize();
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getRecordSize()
-    {
-<xsl:variable name="fieldIterator" select="field:new()"/>
-<xsl:text>        return 4 </xsl:text>
-<xsl:for-each select="//fields/field">
-    <xsl:value-of select="field:calcSize($fieldIterator,position(),@name,@size,@type)"/>
-</xsl:for-each>;
-    }
-
-    public short getSid()
-    {
-        return this.sid;
-    }
-
-    public Object clone() {
-        <xsl:value-of select="@name"/>SubRecord rec = new <xsl:value-of select="@name"/>SubRecord();
-    <xsl:for-each select="//fields/field">
-        <xsl:text>
-        </xsl:text><xsl:value-of select="recutil:clone(@name,@type,position())"/><xsl:text>;</xsl:text>
-    </xsl:for-each>
-        return rec;
-    }
-
-<xsl:apply-templates select="//field" mode="getset"/>
-<xsl:apply-templates select="//field" mode="bits"/>
-
-}  // END OF CLASS
-
-
-</xsl:template>
-
-<xsl:template match = "field" mode="bits">
-<xsl:variable name="fieldNum" select="position()"/>
-<xsl:for-each select="bit">
-<xsl:if test="not (@mask)">
-    /**
-     * Sets the <xsl:value-of select="@name"/> field value.
-     * <xsl:value-of select="@description"/>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(boolean value)
-    {
-        <xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/> = <xsl:value-of select="recutil:getFieldName(@name,0)"/>.set<xsl:value-of select="recutil:getType1stCap(../@size,../@type,0)"/>Boolean(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>, value);
-    }
-
-    /**
-     * <xsl:value-of select="@description"/>
-     * @return  the <xsl:value-of select="@name"/> field value.
-     */
-    public boolean is<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(@name,0)"/>.isSet(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>);
-    }
-</xsl:if>
-<xsl:if test="@mask">
-    /**
-     * Sets the <xsl:value-of select="@name"/> field value.
-     * <xsl:value-of select="@description"/>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(short value)
-    {
-        <xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/> = <xsl:value-of select="recutil:getFieldName(@name,0)"/>.set<xsl:value-of select="recutil:getType1stCap(../@size,../@type,0)"/>Value(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>, value);
-    }
-
-    /**
-     * <xsl:value-of select="@description"/>
-     * @return  the <xsl:value-of select="@name"/> field value.
-     */
-    public short get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(@name,0)"/>.getShortValue(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>);
-    }
-</xsl:if>
-</xsl:for-each>
-</xsl:template>
-
-<xsl:template match = "bit" ><xsl:if test="not (@mask)">    private  BitField   <xsl:value-of select="recutil:getFieldName(@name,42)"/>  = new BitField(<xsl:value-of select="recutil:getMask(@number)"/>);
-</xsl:if><xsl:if test="@mask">    private BitField   <xsl:value-of select="recutil:getFieldName(@name,42)"/> = new BitField(<xsl:value-of select="@mask"/>);
-</xsl:if>
-</xsl:template>
-<xsl:template match = "const">    public final static <xsl:value-of select="recutil:getType(../@size,../@type,10)"/><xsl:text>  </xsl:text><xsl:value-of select="recutil:getConstName(../@name,@name,30)"/> = <xsl:value-of select="@value"/>;
-</xsl:template>
-
-<xsl:template match = "const" mode="listconsts">
-<xsl:text>
-     *        </xsl:text>
-<xsl:value-of select="recutil:getConstName(../@name,@name,0)"/></xsl:template>
-<xsl:template match="field" mode="getset">
-    /**
-     * Get the <xsl:value-of select="@name"/> field for the <xsl:value-of select="../../@name"/> record.<xsl:if test="./const">
-     *
-     * @return  One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    public <xsl:value-of select="recutil:getType(@size,@type,0)"/> get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-
-    /**
-     * Set the <xsl:value-of select="@name"/> field for the <xsl:value-of select="../../@name"/> record.<xsl:if test="./const">
-     *
-     * @param <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-     *        One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(<xsl:value-of select="recutil:getType(@size,@type,0)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>)
-    {
-        this.<xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> = <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-</xsl:template>
-
-<xsl:template match="field" mode="tostring">
-    <xsl:value-of select="recutil:getToString(@name,@type,@size)"/>
-    <xsl:text>
-        buffer.append(System.getProperty("line.separator")); </xsl:text>
-    <xsl:apply-templates select="bit" mode="bittostring"/>
-    <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-    <xsl:template match="bit" mode="bittostring">
-        <xsl:if test="not (@mask)">
-            <xsl:text>&#10;        buffer.append("         .</xsl:text>
-            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
-            <xsl:text>     = ").append(is</xsl:text>
-            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
-            <xsl:text>()).append('\n'); </xsl:text>
-        </xsl:if>
-        <xsl:if test="@mask">
-        <xsl:text>&#10;            buffer.append("         .</xsl:text>
-            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
-            <xsl:text>     = ").append(get</xsl:text>
-            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
-            <xsl:text>()).append('\n'); </xsl:text>
-        </xsl:if>
-    </xsl:template>
-
-<xsl:template match="author">
- * @author <xsl:value-of select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/trunk/src/records/definitions/subrecord_test.xsl b/trunk/src/records/definitions/subrecord_test.xsl
deleted file mode 100644
index c729b41..0000000
--- a/trunk/src/records/definitions/subrecord_test.xsl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="record">
-
-<xsl:if test="@package">
-package <xsl:value-of select="@package"/>;
-</xsl:if>
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the <xsl:value-of select="@name"/>SubRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-<xsl:apply-templates select="author"/>
- */
-public class Test<xsl:value-of select="@name"/>SubRecord
-        extends TestCase
-{
-    byte[] data = new byte[] {
-	<xsl:value-of select="recutil:getByteArrayString(testdata)"/>
-    };
-
-    public Test<xsl:value-of select="@name"/>SubRecord(String name)
-    {
-        super(name);
-    }
-
-    public void testLoad()
-            throws Exception
-    {
-        <xsl:value-of select="@name"/>SubRecord record = new <xsl:value-of select="@name"/>SubRecord((short)<xsl:value-of select="@id"/>, (short)data.length, data);
-        
-<xsl:for-each select="//fields/field">
-            <xsl:choose><xsl:when test="@type='string' or @type='hbstring'">
-        assertEquals( "<xsl:value-of select="./testresult/@value"/>", record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:when test="@size='1'">
-        assertEquals( (byte)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:when test="@size='2'">
-        assertEquals( (short)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:when test="@size='4'">
-        assertEquals( (int)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:otherwise>
-       assertEquals( (double)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:otherwise></xsl:choose>
-<xsl:apply-templates select="./bit" mode="get"/>
-</xsl:for-each>
-
-        assertEquals( <xsl:value-of select="./testsize"/>, record.getRecordSize() );
-
-        record.validateSid((short)<xsl:value-of select="@id"/>);
-    }
-
-    public void testStore()
-    {
-        <xsl:value-of select="@name"/>SubRecord record = new <xsl:value-of select="@name"/>SubRecord();
-
-
-<xsl:for-each select="//fields/field">
-            <xsl:choose><xsl:when test="@type='string' or @type='hbstring'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( "<xsl:value-of select="./testresult/@value"/>" );
-</xsl:when><xsl:when test="@size='1'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (byte)<xsl:value-of select="./testresult/@value"/> );
-</xsl:when><xsl:when test="@size='2'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (short)<xsl:value-of select="./testresult/@value"/> );
-</xsl:when><xsl:when test="@size='4'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (int)<xsl:value-of select="./testresult/@value"/> );
-</xsl:when><xsl:otherwise>
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (double)<xsl:value-of select="./testresult/@value"/> );
-</xsl:otherwise></xsl:choose>
-
-<xsl:apply-templates select="./bit" mode="set"/>
-</xsl:for-each>
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i &lt; data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
-</xsl:template>
-
-<xsl:template match="author">
- * @author <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template match="bit" mode="get">
-<xsl:text>        </xsl:text>assertEquals( <xsl:value-of select="./testresult/@value"/>, record.is<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>() );<xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="bit" mode="set">
-<xsl:text>        </xsl:text>record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( <xsl:value-of select="./testresult/@value"/> );<xsl:text>
-</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/trunk/src/records/definitions/text_record.xml b/trunk/src/records/definitions/text_record.xml
deleted file mode 100644
index c486a7f..0000000
--- a/trunk/src/records/definitions/text_record.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1025" name="Text" excel-record-id="TEXT" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The text record is used to define text stored on a chart.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="1" name="horizontal alignment">
-            <const name="left" value="1"/>
-            <const name="center" value="2"/>
-            <const name="bottom" value="3"/>          <!-- is this correct.  maybe it should be right???? -->
-            <const name="justify" value="4"/>
-        </field>
-        <field type="int" size="1" name="vertical alignment">
-            <const name="top" value="1"/>
-            <const name="center" value="2"/>
-            <const name="bottom" value="3"/>
-            <const name="justify" value="4"/>
-        </field>
-        <field type="int" size="2" name="display mode">
-            <const name="transparent" value="1"/>
-            <const name="opaque" value="2"/>
-        </field>
-        <field type="int" size="4" name="rgbColor" description="RGB color of text, high byte should be 0"/>
-        <field type="int" size="4" name="x" description="x position of the text in 1/4000th of the chart area"/>
-        <field type="int" size="4" name="y" description="y position of the text in 1/4000th of the chart area"/>
-        <field type="int" size="4" name="width" description="width of the text in 1/4000th of the chart area"/>
-        <field type="int" size="4" name="height" description="width of the text in 1/4000th of the chart area"/>
-        <field type="bits" size="2" name="options1">
-            <bit number="0" name="auto color" description="true = automaticly selected colour, false = user-selected"/>
-            <bit number="1" name="show key" description="true = draw legend"/>
-            <bit number="2" name="show value" description="false = text is category label"/>
-            <bit number="3" name="vertical" description="true = text is vertical"/>
-            <bit number="4" name="auto generated text" description=""/>
-            <bit number="5" name="generated" description=""/>
-            <bit number="6" name="auto label deleted" description=""/>
-            <bit number="7" name="auto background" description=""/>
-            <bit mask="0x0700" name="rotation" description="">
-                <const name="none" value="0"/>
-                <const name="top to bottom" value="1"/>
-                <const name="rotated 90 degrees" value="2"/>
-                <const name="rotated 90 degrees clockwise" value="3"/>
-            </bit>
-            <bit number="11" name="show category label as percentage" description=""/>
-            <bit number="12" name="show value as percentage" description=""/>
-            <bit number="13" name="show bubble sizes" description=""/>
-            <bit number="14" name="show label" description=""/>
-        </field>
-        <field type="int" size="2" name="index of color value" description="the index of the color value for the text"/>
-        <field type="bits" size="2" name="options2">
-            <bit mask="0x000F" name="data label placement">
-                <const name="chart dependent" value="0"/>
-                <const name="outside" value="1"/>
-                <const name="inside" value="2"/>
-                <const name="center" value="3"/>
-                <const name="axis" value="4"/>
-                <const name="above" value="5"/>
-                <const name="below" value="6"/>
-                <const name="left" value="7"/>
-                <const name="right" value="8"/>
-                <const name="auto" value="9"/>
-                <const name="user moved" value="10"/>
-            </bit>
-        </field>
-        <field type="int" size="2" name="text rotation" description="0 = horizontal, 90 = up, 180 = down, -90 = down"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/textobject_record.xml b/trunk/src/records/definitions/textobject_record.xml
deleted file mode 100644
index 8e7e6e8..0000000
--- a/trunk/src/records/definitions/textobject_record.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1B6" name="TextObjectBase" excel-record-id="TXO"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The TXO record is used to define the properties of a text box.  It is followed
-        by two continue records unless there is no actual text.  The first continue record contains
-        the text data and the next continue record contains the formatting runs.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="options" description="option flags">
-            <bit number="0" name="reserved1" description="reserved field"/>
-            <bit mask="0x000E" name="Horizontal text alignment">
-                <const name="left aligned" value="1"/>
-                <const name="centered" value="2"/>
-                <const name="right aligned" value="3"/>
-                <const name="justified" value="4"/>
-            </bit>
-            <bit mask="0x0070" name="Vertical text alignment">
-                <const name="top" value="1"/>
-                <const name="center" value="2"/>
-                <const name="bottom" value="3"/>
-                <const name="justify" value="4"/>
-            </bit>
-            <bit mask="0x0180" name="reserved2"/>
-            <bit number="9" name="text locked" description="Text has been locked"/>
-            <bit mask="0xFC00" name="reserved3"/>
-        </field>
-        <field type="int" size="2" name="text orientation" description="specifies whether the text is rotated">
-            <const name="none" value="0"/>
-            <const name="top_to_bottom" value="1"/>
-            <const name="rot_right" value="2"/>
-            <const name="rot_left" value="3"/>
-        </field>
-        <field type="int" size="2" name="reserved4" description="reserved field"/>
-        <field type="int" size="2" name="reserved5" description="reserved field"/>
-        <field type="int" size="2" name="reserved6" description="reserved field"/>
-        <field type="int" size="2" name="text length" description="the left of the text string"/>
-        <field type="int" size="2" name="formatting run length" description="the length of the formatting runs."/>
-        <field type="int" size="4" name="reserved7" description="reserved field"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/tick_record.xml b/trunk/src/records/definitions/tick_record.xml
deleted file mode 100644
index d1f704a..0000000
--- a/trunk/src/records/definitions/tick_record.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x101e" name="Tick" excel-record-id="TICK" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The Tick record defines how tick marks and label positioning/formatting</description>
-    <author>Andrew C. Oliver(acoliver at apache.org)</author>
-    <fields>
-        <field type="int" size="1" name="major tick type" description="type of major tick mark 0 (none),1 (inside axis line), 2 (outside axis line), 3 (cross axis line)"/>
-        <field type="int" size="1" name="minor tick type" description="type of minor tick mark 0 (none),1 (inside axis line), 2 (outside axis line), 3 (cross axis line)"/>
-        <field type="int" size="1" name="label position" decription="label position relative to the axis line 0=invisible, 1=low end,2=high end, 3=next to axis"/>
-        <field type="int" size="1" name="background" description="1=transparent, 2=opaque"/>
-        <field type="int" size="4" name="label color rgb" description="an RGB value of the label text where highbyte=0"/>
-        <field type="int" size="4" name="zero 1" description="must be 0"/>
-        <field type="int" size="4" name="zero 2" description="must be 0"/>
-        <field type="int" size="4" name="zero 3" description="must be 0"/>
-        <field type="int" size="4" name="zero 4" description="must be 0"/>        
-        <field type="int" size="2" name="options">
-            <bit number="0" name="auto text color" description="use the quote unquote automatic color for text"/>
-            <bit number="1" name="auto text background" description="use the quote unquote automatic color for text background"/>
-            <bit mask="0x1c" name="rotation" description="rotate text (0=none, 1=normal, 2=90 degrees counterclockwise, 3=90 degrees clockwise)"/>
-            <bit number="5" name="autorotate" description="automatically rotate the text"/>
-        </field>
-        <field type="int" size="2" name="tick color" description="HSSFColor for tick label"/>
-        <field type="int" size="2" name="zero 5" description="must be 0"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/units_record.xml b/trunk/src/records/definitions/units_record.xml
deleted file mode 100644
index ff28126..0000000
--- a/trunk/src/records/definitions/units_record.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x1001" name="Units" excel-record-id="UNITS" package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The units record describes units.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="int" size="2" name="units" description="Always zero"/>
-    </fields>
-</record>
diff --git a/trunk/src/records/definitions/value_range_record.xml b/trunk/src/records/definitions/value_range_record.xml
deleted file mode 100644
index c5be1d8..0000000
--- a/trunk/src/records/definitions/value_range_record.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x101f" name="ValueRange" excel-record-id="VALUERANGE"
-    package="org.apache.poi.hssf.record">
-    <suffix>Record</suffix>
-    <extends>Record</extends>
-    <description>The value range record defines the range of the value axis.</description>
-    <author>Glen Stampoultzis (glens at apache.org)</author>
-    <fields>
-        <field type="float" size="8" name="minimum axis value"/>
-        <field type="float" size="8" name="maximum axis value"/>
-        <field type="float" size="8" name="major increment"/>
-        <field type="float" size="8" name="minor increment"/>
-        <field type="float" size="8" name="category axis cross"/>
-        <field type="int" size="2" name="options">
-            <bit number="0" name="automatic minimum" description="automatic minimum value selected"/>
-            <bit number="1" name="automatic maximum" description="automatic maximum value selected"/>
-            <bit number="2" name="automatic major" description="automatic major unit selected"/>
-            <bit number="3" name="automatic minor" description="automatic minor unit selected"/>
-            <bit number="4" name="automatic category crossing" description="category crossing point is automatically selected"/>
-            <bit number="5" name="logarithmic scale" description="use logarithmic scale"/>
-            <bit number="6" name="values in reverse" description="values are reverses in graph"/>
-            <bit number="7" name="cross category axis at maximum" description="category axis to cross at maximum value"/>
-            <bit number="8" name="reserved" description="reserved, must equal 1 (excel dev. guide says otherwise)"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/records/styles/record.xsl b/trunk/src/records/styles/record.xsl
deleted file mode 100644
index dae346b..0000000
--- a/trunk/src/records/styles/record.xsl
+++ /dev/null
@@ -1,570 +0,0 @@
-<<<<<<< record.xsl
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="record">
-
-<xsl:if test="@package">
-package <xsl:value-of select="@package"/>;
-</xsl:if>
-
-
-import org.apache.poi.util.*;
-
-/**
- * <xsl:value-of select="/record/description"/>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-<xsl:apply-templates select="author"/>
- */
-public class <xsl:value-of select="@name"/>Record
-    extends Record
-{
-    public final static short      sid                             = <xsl:value-of select="@id"/>;
-<xsl:for-each select="//fields/field">    private  <xsl:value-of select="recutil:getType(@size,@type,10)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/><xsl:value-of select="recutil:initializeText(@size,@type)"/>;
-<xsl:apply-templates select="./bit|./const|./bit/const"/>
-</xsl:for-each>
-
-    public <xsl:value-of select="@name"/>Record()
-    {
-<xsl:for-each select="//fields/field"><xsl:if test="@default">
-<xsl:text>        </xsl:text>
-<xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> = <xsl:value-of select="@default"/>;
-</xsl:if></xsl:for-each>
-    }
-
-    /**
-     * Constructs a <xsl:value-of select="@name"/> record and sets its fields appropriately.
-     *
-     * @param id    id must be <xsl:value-of select="@id"/> or an exception
-     *              will be throw upon validation
-     * @param size  size the size of the data area of the record
-     * @param data  data of the record (should not contain sid/len)
-     */
-
-    public <xsl:value-of select="@name"/>Record(RecordInputStream in)
-    {
-        super(in);
-    <xsl:for-each select="//fields/field">
-    <xsl:if test="@default">
-        <xsl:text>        </xsl:text>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> =
-        <xsl:value-of select="@default"/>;
-
-    </xsl:if>
-    </xsl:for-each>
-    }
-
-    /**
-     * Checks the sid matches the expected side for this record
-     *
-     * @param id   the expected sid.
-     */
-    protected void validateSid(short id)
-    {
-        if (id != sid)
-        {
-            throw new RecordFormatException(&quot;Not a <xsl:value-of select="@name"/> record&quot;);
-        }
-    }
-
-    protected void fillFields(RecordInputStream in)
-    {
-
-<xsl:text>        int pos = 0;
-</xsl:text>
-
- <xsl:variable name="fieldIterator" select="field:new()"/>
-<xsl:for-each select="//fields/field">
-    <xsl:text>        </xsl:text><xsl:value-of select="field:fillDecoder2($fieldIterator,position(),@name,@size,@type)"/>;
-</xsl:for-each>
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
-<xsl:apply-templates select="//field" mode="tostring"/>
-        buffer.append("[/<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
-        return buffer.toString();
-    }
-
-    public int serialize(int offset, byte[] data)
-    {
-        int pos = 0;
-
-        LittleEndian.putShort(data, 0 + offset, sid);
-        LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
-<xsl:variable name="fieldIterator" select="field:new()"/>
-<xsl:for-each select="//fields/field"><xsl:text>
-        </xsl:text><xsl:value-of select="field:serialiseEncoder($fieldIterator,position(),@name,@size,@type)"/>
-</xsl:for-each>
-
-        return getRecordSize();
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getRecordSize()
-    {
-<xsl:variable name="fieldIterator" select="field:new()"/>
-<xsl:text>        return 4 </xsl:text>
-<xsl:for-each select="//fields/field">
-    <xsl:value-of select="field:calcSize($fieldIterator,position(),@name,@size,@type)"/>
-</xsl:for-each>;
-    }
-
-    public short getSid()
-    {
-        return this.sid;
-    }
-
-    public Object clone() {
-        <xsl:value-of select="@name"/>Record rec = new <xsl:value-of select="@name"/>Record();
-    <xsl:for-each select="//fields/field">
-        <xsl:text>
-        </xsl:text><xsl:value-of select="recutil:clone(@name,@type,position())"/><xsl:text>;</xsl:text>
-    </xsl:for-each>
-        return rec;
-    }
-
-
-
-<xsl:apply-templates select="//field" mode="getset"/>
-<xsl:apply-templates select="//field" mode="bits"/>
-
-}  // END OF CLASS
-
-
-
-
-</xsl:template>
-
-<xsl:template match = "field" mode="bits">
-<xsl:variable name="fieldNum" select="position()"/>
-<xsl:for-each select="bit">
-<xsl:if test="not (@mask)">
-    /**
-     * Sets the <xsl:value-of select="@name"/> field value.
-     * <xsl:value-of select="@description"/>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(boolean value)
-    {
-        <xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/> = <xsl:value-of select="recutil:getFieldName(@name,0)"/>.set<xsl:value-of select="recutil:getType1stCap(../@size,../@type,0)"/>Boolean(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>, value);
-    }
-
-    /**
-     * <xsl:value-of select="@description"/>
-     * @return  the <xsl:value-of select="@name"/> field value.
-     */
-    public boolean is<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(@name,0)"/>.isSet(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>);
-    }
-</xsl:if>
-<xsl:if test="@mask">
-    /**
-     * Sets the <xsl:value-of select="@name"/> field value.
-     * <xsl:value-of select="@description"/>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(short value)
-    {
-        <xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/> = <xsl:value-of select="recutil:getFieldName(@name,0)"/>.set<xsl:value-of select="recutil:getType1stCap(../@size,../@type,0)"/>Value(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>, value);
-    }
-
-    /**
-     * <xsl:value-of select="@description"/>
-     * @return  the <xsl:value-of select="@name"/> field value.
-     */
-    public short get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(@name,0)"/>.getShortValue(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>);
-    }
-</xsl:if>
-</xsl:for-each>
-</xsl:template>
-
-<xsl:template match = "bit" ><xsl:if test="not (@mask)">    private  BitField   <xsl:value-of select="recutil:getFieldName(@name,42)"/>  = new BitField(<xsl:value-of select="recutil:getMask(@number)"/>);
-</xsl:if><xsl:if test="@mask">    private BitField   <xsl:value-of select="recutil:getFieldName(@name,42)"/> = new BitField(<xsl:value-of select="@mask"/>);
-</xsl:if>
-</xsl:template>
-<xsl:template match = "const">    public final static <xsl:value-of select="recutil:getType(../@size,../@type,10)"/><xsl:text>  </xsl:text><xsl:value-of select="recutil:getConstName(../@name,@name,30)"/> = <xsl:value-of select="@value"/>;
-</xsl:template>
-
-<xsl:template match = "const" mode="listconsts">
-<xsl:text>
-     *        </xsl:text>
-<xsl:value-of select="recutil:getConstName(../@name,@name,0)"/></xsl:template>
-<xsl:template match="field" mode="getset">
-    /**
-     * Get the <xsl:value-of select="@name"/> field for the <xsl:value-of select="../../@name"/> record.<xsl:if test="./const">
-     *
-     * @return  One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    public <xsl:value-of select="recutil:getType(@size,@type,0)"/> get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-
-    /**
-     * Set the <xsl:value-of select="@name"/> field for the <xsl:value-of select="../../@name"/> record.<xsl:if test="./const">
-     *
-     * @param <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-     *        One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(<xsl:value-of select="recutil:getType(@size,@type,0)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>)
-    {
-        this.<xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> = <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-</xsl:template>
-
-<xsl:template match="field" mode="tostring">
-    <xsl:value-of select="recutil:getToString(@name,@type,@size)"/>
-    <xsl:text>
-        buffer.append(System.getProperty("line.separator")); </xsl:text>
-    <xsl:apply-templates select="bit" mode="bittostring"/>
-    <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-    <xsl:template match="bit" mode="bittostring">
-        <xsl:if test="not (@mask)">
-            <xsl:text>&#10;        buffer.append("         .</xsl:text>
-            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
-            <xsl:text>     = ").append(is</xsl:text>
-            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
-            <xsl:text>()).append('\n'); </xsl:text>
-        </xsl:if>
-        <xsl:if test="@mask">
-        <xsl:text>&#10;            buffer.append("         .</xsl:text>
-            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
-            <xsl:text>     = ").append(get</xsl:text>
-            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
-            <xsl:text>()).append('\n'); </xsl:text>
-        </xsl:if>
-    </xsl:template>
-
-<xsl:template match="author">
- * @author <xsl:value-of select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
-=======
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="record">
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-<xsl:if test="@package">
-package <xsl:value-of select="@package"/>;
-</xsl:if>
-
-
-import org.apache.poi.util.*;
-
-/**
- * <xsl:value-of select="/record/description"/>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
-<xsl:apply-templates select="author"/>
- */
-public class <xsl:value-of select="@name"/>Record
-    extends Record
-{
-    public final static short      sid                             = <xsl:value-of select="@id"/>;
-<xsl:for-each select="//fields/field">    private  <xsl:value-of select="recutil:getType(@size,@type,10)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/><xsl:value-of select="recutil:initializeText(@size,@type)"/>;
-<xsl:apply-templates select="./bit|./const|./bit/const"/>
-</xsl:for-each>
-
-    public <xsl:value-of select="@name"/>Record()
-    {
-<xsl:for-each select="//fields/field"><xsl:if test="@default">
-<xsl:text>        </xsl:text>
-<xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> = <xsl:value-of select="@default"/>;
-</xsl:if></xsl:for-each>
-    }
-
-    /**
-     * Constructs a <xsl:value-of select="@name"/> record and sets its fields appropriately.
-     *
-     * @param id    id must be <xsl:value-of select="@id"/> or an exception
-     *              will be throw upon validation
-     * @param size  size the size of the data area of the record
-     * @param data  data of the record (should not contain sid/len)
-     */
-
-    public <xsl:value-of select="@name"/>Record(short id, short size, byte [] data)
-    {
-        super(id, size, data);
-    <xsl:for-each select="//fields/field">
-    <xsl:if test="@default">
-        <xsl:text>        </xsl:text>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> =
-        <xsl:value-of select="@default"/>;
-
-    </xsl:if>
-    </xsl:for-each>
-    }
-
-    /**
-     * Constructs a <xsl:value-of select="@name"/> record and sets its fields appropriately.
-     *
-     * @param id    id must be <xsl:value-of select="@id"/> or an exception
-     *              will be throw upon validation
-     * @param size  size the size of the data area of the record
-     * @param data  data of the record (should not contain sid/len)
-     * @param offset of the record's data
-     */
-
-    public <xsl:value-of select="@name"/>Record(short id, short size, byte [] data, int offset)
-    {
-        super(id, size, data, offset);
-    <xsl:for-each select="//fields/field">
-    <xsl:if test="@default">
-        <xsl:text>        </xsl:text>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> =
-        <xsl:value-of select="@default"/>;
-
-    </xsl:if>
-    </xsl:for-each>
-    }
-
-    /**
-     * Checks the sid matches the expected side for this record
-     *
-     * @param id   the expected sid.
-     */
-    protected void validateSid(short id)
-    {
-        if (id != sid)
-        {
-            throw new RecordFormatException(&quot;Not a <xsl:value-of select="@name"/> record&quot;);
-        }
-    }
-
-    protected void fillFields(byte [] data, short size, int offset)
-    {
-
-<xsl:text>        int pos = 0;
-</xsl:text>
-
- <xsl:variable name="fieldIterator1" select="field:new()"/>
-<xsl:for-each select="//fields/field">
-    <xsl:text>        </xsl:text><xsl:value-of select="field:fillDecoder2($fieldIterator1,position(),@name,@size,@type)"/>;
-</xsl:for-each>
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
-<xsl:apply-templates select="//field" mode="tostring"/>
-        buffer.append("[/<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
-        return buffer.toString();
-    }
-
-    public int serialize(int offset, byte[] data)
-    {
-        int pos = 0;
-
-        LittleEndian.putShort(data, 0 + offset, sid);
-        LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
-<xsl:variable name="fieldIterator2" select="field:new()"/>
-<xsl:for-each select="//fields/field"><xsl:text>
-        </xsl:text><xsl:value-of select="field:serialiseEncoder($fieldIterator2,position(),@name,@size,@type)"/>
-</xsl:for-each>
-
-        return getRecordSize();
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getRecordSize()
-    {
-<xsl:variable name="fieldIterator3" select="field:new()"/>
-<xsl:text>        return 4 </xsl:text>
-<xsl:for-each select="//fields/field">
-    <xsl:value-of select="field:calcSize($fieldIterator3,position(),@name,@size,@type)"/>
-</xsl:for-each>;
-    }
-
-    public short getSid()
-    {
-        return this.sid;
-    }
-
-    public Object clone() {
-        <xsl:value-of select="@name"/>Record rec = new <xsl:value-of select="@name"/>Record();
-    <xsl:for-each select="//fields/field">
-        <xsl:text>
-        </xsl:text><xsl:value-of select="recutil:clone(@name,@type,position())"/><xsl:text>;</xsl:text>
-    </xsl:for-each>
-        return rec;
-    }
-
-
-
-<xsl:apply-templates select="//field" mode="getset"/>
-<xsl:apply-templates select="//field" mode="bits"/>
-
-}  // END OF CLASS
-
-
-
-
-</xsl:template>
-
-<xsl:template match = "field" mode="bits">
-<xsl:variable name="fieldNum" select="position()"/>
-<xsl:for-each select="bit">
-<xsl:if test="not (@mask)">
-    /**
-     * Sets the <xsl:value-of select="@name"/> field value.
-     * <xsl:value-of select="@description"/>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(boolean value)
-    {
-        <xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/> = <xsl:value-of select="recutil:getFieldName(@name,0)"/>.set<xsl:value-of select="recutil:getType1stCap(../@size,../@type,0)"/>Boolean(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>, value);
-    }
-
-    /**
-     * <xsl:value-of select="@description"/>
-     * @return  the <xsl:value-of select="@name"/> field value.
-     */
-    public boolean is<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(@name,0)"/>.isSet(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>);
-    }
-</xsl:if>
-<xsl:if test="@mask">
-    /**
-     * Sets the <xsl:value-of select="@name"/> field value.
-     * <xsl:value-of select="@description"/>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(short value)
-    {
-        <xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/> = <xsl:value-of select="recutil:getFieldName(@name,0)"/>.set<xsl:value-of select="recutil:getType1stCap(../@size,../@type,0)"/>Value(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>, value);
-    }
-
-    /**
-     * <xsl:value-of select="@description"/>
-     * @return  the <xsl:value-of select="@name"/> field value.
-     */
-    public short get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(@name,0)"/>.getShortValue(<xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/>);
-    }
-</xsl:if>
-</xsl:for-each>
-</xsl:template>
-
-<xsl:template match = "bit" ><xsl:if test="not (@mask)">    private  BitField   <xsl:value-of select="recutil:getFieldName(@name,42)"/>  = new BitField(<xsl:value-of select="recutil:getMask(@number)"/>);
-</xsl:if><xsl:if test="@mask">    private BitField   <xsl:value-of select="recutil:getFieldName(@name,42)"/> = new BitField(<xsl:value-of select="@mask"/>);
-</xsl:if>
-</xsl:template>
-<xsl:template match = "const">    public final static <xsl:value-of select="recutil:getType(../@size,../@type,10)"/><xsl:text>  </xsl:text><xsl:value-of select="recutil:getConstName(../@name,@name,30)"/> = <xsl:value-of select="@value"/>;
-</xsl:template>
-
-<xsl:template match = "const" mode="listconsts">
-<xsl:text>
-     *        </xsl:text>
-<xsl:value-of select="recutil:getConstName(../@name,@name,0)"/></xsl:template>
-<xsl:template match="field" mode="getset">
-    /**
-     * Get the <xsl:value-of select="@name"/> field for the <xsl:value-of select="../../@name"/> record.<xsl:if test="./const">
-     *
-     * @return  One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    public <xsl:value-of select="recutil:getType(@size,@type,0)"/> get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-
-    /**
-     * Set the <xsl:value-of select="@name"/> field for the <xsl:value-of select="../../@name"/> record.<xsl:if test="./const">
-     *
-     * @param <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-     *        One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>(<xsl:value-of select="recutil:getType(@size,@type,0)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>)
-    {
-        this.<xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> = <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-</xsl:template>
-
-<xsl:template match="field" mode="tostring">
-    <xsl:value-of select="recutil:getToString(@name,@type,@size)"/>
-    <xsl:text>
-        buffer.append(System.getProperty("line.separator")); </xsl:text>
-    <xsl:apply-templates select="bit" mode="bittostring"/>
-    <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-    <xsl:template match="bit" mode="bittostring">
-        <xsl:if test="not (@mask)">
-            <xsl:text>&#10;        buffer.append("         .</xsl:text>
-            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
-            <xsl:text>     = ").append(is</xsl:text>
-            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
-            <xsl:text>()).append('\n'); </xsl:text>
-        </xsl:if>
-        <xsl:if test="@mask">
-        <xsl:text>&#10;            buffer.append("         .</xsl:text>
-            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
-            <xsl:text>     = ").append(get</xsl:text>
-            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
-            <xsl:text>()).append('\n'); </xsl:text>
-        </xsl:if>
-    </xsl:template>
-
-<xsl:template match="author">
- * @author <xsl:value-of select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
->>>>>>> 1.11
diff --git a/trunk/src/records/styles/record_document.xsl b/trunk/src/records/styles/record_document.xsl
deleted file mode 100644
index 7895c66..0000000
--- a/trunk/src/records/styles/record_document.xsl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="record">
-<document>
-    <header>
-        <title><xsl:value-of select="@name"/> Record Documentation</title>
-    </header>
-
-    <body>
-        <s1 title="Record Description">
-            <p><xsl:value-of select="/record/description"/>
-            </p>
-        </s1>
-        <s1 title="Fields">
-            <table>
-                <tr>
-                    <th colspan="1" rowspan="1">Name</th>
-                    <th colspan="1" rowspan="1">Size</th>
-                    <th colspan="1" rowspan="1">Offset</th>
-                    <th colspan="1" rowspan="1">Description</th>
-                    <th colspan="1" rowspan="1">Default Value</th>
-                </tr>
-                <xsl:apply-templates select="//field"/>
-            </table>
-        </s1>
-    </body>
-    <footer>
-        <legal>
-          Copyright (c) @year@ The Poi Project All rights reserved.
-        </legal>
-    </footer>
-
-</document>
-</xsl:template>
-
-<xsl:template match="field">
-    <tr>
-        <td><xsl:value-of select="@name"/></td>
-        <td><xsl:value-of select="@size"/></td>
-        <td> </td>
-        <td><xsl:value-of select="@description"/></td>
-        <td><xsl:value-of select="@default"/></td>
-    </tr>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/trunk/src/records/styles/record_test.xsl b/trunk/src/records/styles/record_test.xsl
deleted file mode 100644
index a70a949..0000000
--- a/trunk/src/records/styles/record_test.xsl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="record">
-
-<xsl:if test="@package">
-package <xsl:value-of select="@package"/>;
-</xsl:if>
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the <xsl:value-of select="@name"/>Record
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-<xsl:apply-templates select="author"/>
- */
-public class Test<xsl:value-of select="@name"/>Record
-        extends TestCase
-{
-    byte[] data = new byte[] {
-	<xsl:value-of select="recutil:getByteArrayString(testdata)"/>
-    };
-
-    public Test<xsl:value-of select="@name"/>Record(String name)
-    {
-        super(name);
-    }
-
-    public void testLoad()
-            throws Exception
-    {
-        <xsl:value-of select="@name"/>Record record = new <xsl:value-of select="@name"/>Record((short)<xsl:value-of select="@id"/>, (short)data.length, data);
-        
-<xsl:for-each select="//fields/field">
-            <xsl:choose><xsl:when test="@type='string' or @type='hbstring'">
-        assertEquals( "<xsl:value-of select="./testresult/@value"/>", record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:when test="@size='1'">
-        assertEquals( (byte)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:when test="@size='2'">
-        assertEquals( (short)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:when test="@size='4'">
-        assertEquals( (int)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:when><xsl:otherwise>
-       assertEquals( (double)<xsl:value-of select="./testresult/@value"/>, record.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-</xsl:otherwise></xsl:choose>
-<xsl:apply-templates select="./bit" mode="get"/>
-</xsl:for-each>
-
-        assertEquals( <xsl:value-of select="./testsize"/>, record.getRecordSize() );
-
-        record.validateSid((short)<xsl:value-of select="@id"/>);
-    }
-
-    public void testStore()
-    {
-        <xsl:value-of select="@name"/>Record record = new <xsl:value-of select="@name"/>Record();
-
-
-<xsl:for-each select="//fields/field">
-            <xsl:choose><xsl:when test="@type='string' or @type='hbstring'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( "<xsl:value-of select="./testresult/@value"/>" );
-</xsl:when><xsl:when test="@size='1'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (byte)<xsl:value-of select="./testresult/@value"/> );
-</xsl:when><xsl:when test="@size='2'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (short)<xsl:value-of select="./testresult/@value"/> );
-</xsl:when><xsl:when test="@size='4'">
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (int)<xsl:value-of select="./testresult/@value"/> );
-</xsl:when><xsl:otherwise>
-        record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( (double)<xsl:value-of select="./testresult/@value"/> );
-</xsl:otherwise></xsl:choose>
-
-<xsl:apply-templates select="./bit" mode="set"/>
-</xsl:for-each>
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i &lt; data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
-</xsl:template>
-
-<xsl:template match="author">
- * @author <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template match="bit" mode="get">
-<xsl:text>        </xsl:text>assertEquals( <xsl:value-of select="./testresult/@value"/>, record.is<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>() );<xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="bit" mode="set">
-<xsl:text>        </xsl:text>record.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( <xsl:value-of select="./testresult/@value"/> );<xsl:text>
-</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/trunk/src/resources/devtools/complete-log4j.properties b/trunk/src/resources/devtools/complete-log4j.properties
deleted file mode 100644
index 0959ec2..0000000
--- a/trunk/src/resources/devtools/complete-log4j.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#log4j.rootCategory=debug,  globalLog
-log4j.category.org.apache.poi.hssf=debug,  hssfLog
-log4j.category.org.apache.poi.hdf=debug,  hdfLog
-log4j.category.org.apache.poi.hpsf=debug,  hpsfLog
-log4j.category.org.apache.poi.poifs=debug,  poifsLog
-log4j.category.org.apache.poi.util=debug,  utilLog
-
-log4j.appender.hssfLog=org.apache.log4j.FileAppender
-log4j.appender.hssfLog.File=build/hssf.log
-log4j.appender.hssfLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.hssfLog.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-log4j.appender.hdfLog=org.apache.log4j.FileAppender
-log4j.appender.hdfLog.File=build/hdf.log
-log4j.appender.hdfLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.hdfLog.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-log4j.appender.hpsfLog=org.apache.log4j.FileAppender
-log4j.appender.hpsfLog.File=build/hpsf.log
-log4j.appender.hpsfLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.hpsfLog.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-log4j.appender.poifsLog=org.apache.log4j.FileAppender
-log4j.appender.poifsLog.File=build/poifs.log
-log4j.appender.poifsLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.poifsLog.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-log4j.appender.utilLog=org.apache.log4j.FileAppender
-log4j.appender.utilLog.File=build/util.log
-log4j.appender.utilLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.utilLog.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
diff --git a/trunk/src/resources/devtools/fatal-only-log4j.properties b/trunk/src/resources/devtools/fatal-only-log4j.properties
deleted file mode 100644
index c1e023a..0000000
--- a/trunk/src/resources/devtools/fatal-only-log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set root logger level to FATAL and its only appender to stdout
-log4j.rootLogger=FATAL, stdout
-log4j.category.org=FATAL,  stdout
-
-# stdout is set to be a ConsoleAppender. 
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-  
-# stdout uses PatternLayout.
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
- 
diff --git a/trunk/src/resources/devtools/findbugs-filters.xml b/trunk/src/resources/devtools/findbugs-filters.xml
deleted file mode 100644
index 98c2ffb..0000000
--- a/trunk/src/resources/devtools/findbugs-filters.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<FindBugsFilter>
-	<Match>
-		<Bug code="EI,EI2" pattern="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE,MS_PKGPROTECT,MS_MUTABLE_ARRAY"/>
-	</Match>
-
-	<Match>
-		<Class name="org.apache.poi.hssf.usermodel.DummyGraphics2d"/>
-		<Bug code="FI" />
-	</Match>
-
-	<!-- things that were moved or are named equally on purpose -->
-        <!-- Classes that shadow an identically named class in Common SS should be deprecated and deleted -->
-	<Match>
-		<Or>
-			<Class name="org.apache.poi.hssf.extractor.ExcelExtractor"/>
-			<Class name="org.apache.poi.hssf.record.RecordFormatException"/>
-			<Class name="org.apache.poi.hssf.record.UnicodeString"/>
-			<Class name="org.apache.poi.hssf.usermodel.HeaderFooter"/>
-			<Class name="org.apache.poi.hssf.util.AreaReference"/>
-			<Class name="org.apache.poi.hssf.util.CellRangeAddress"/>
-			<Class name="org.apache.poi.hssf.util.CellRangeAddressList"/>
-			<Class name="org.apache.poi.hssf.util.CellReference"/>
-			<Class name="org.apache.poi.hssf.util.Region"/>
-			<Class name="org.apache.poi.hssf.util.PaneInformation"/>
-			<Class name="org.apache.poi.hwpf.usermodel.CharacterRun"/>
-			<Class name="org.apache.poi.sl.usermodel.Hyperlink"/>
-			<Class name="org.apache.poi.ss.usermodel.Hyperlink"/>
-			<Class name="org.apache.poi.xssf.model.IndexedUDFFinder"/>
-			<Class name="org.apache.poi.xdgf.exceptions.XDGFException"/>
-		</Or>
-		<Bug code="Nm" />
-	</Match>
-
-	<!-- ignore fields that correspond to the values in a H??F binary record -->
-	<Match>
-		<Class name="~org\.apache\.poi\.h..f\..*"/>
-		<Bug pattern="URF_UNREAD_FIELD" />
-		<Field name="~field_[12345].*" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.hssf.usermodel.HSSFChart"/>
-		<Bug pattern="URF_UNREAD_FIELD" />
-		<Field name="chartTitleFormat" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.hwmf.record.HwmfWindowing"/>
-		<Bug pattern="URF_UNREAD_FIELD" />
-		<Field name="count2" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.xwpf.usermodel.XWPFLatentStyles"/>
-		<Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
-		<Field name="styles" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.hslf.blip.Metafile"/>
-		<Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
-		<Field name="compression" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.hwmf.record.HwmfFont"/>
-		<Bug pattern="UUF_UNUSED_FIELD" />
-		<Or>
-			<Field name="family" />
-			<Field name="pitch" />
-		</Or>
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.hssf.usermodel.HSSFCell"/>
-		<Or>
-			<Method name="setCellValue" params="double" />
-			<Method name="setCellValue" params="boolean" />
-			<Method name="setCellErrorValue" params="byte" />
-		</Or>
-		<Bug pattern="SF_SWITCH_FALLTHROUGH" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.hssf.usermodel.HSSFWorkbook"/>
-		<Method name="addPicture" />
-		<Bug pattern="SF_SWITCH_FALLTHROUGH" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.ss.formula.atp.YearFrac"/>
-		<Method name="evaluate" />
-		<Bug pattern="SF_SWITCH_FALLTHROUGH" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.ss.formula.functions.FinanceFunction"/>
-		<Method name="evaluate" />
-		<Bug pattern="SF_SWITCH_FALLTHROUGH" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.ss.formula.functions.Offset"/>
-		<Method name="evaluate" />
-		<Bug pattern="SF_SWITCH_FALLTHROUGH" />
-	</Match>
-	<Match>
-		<Class name="org.apache.poi.util.HeadRead"/>
-		<Method name="readData" params="java.io.InputStream,int" />
-		<Bug pattern="SF_SWITCH_FALLTHROUGH" />
-	</Match>
-	
-
-    <!-- invalid performance issues - e.g. see #57840 -->
-    <Match>
-        <Or>
-            <Class name="org.apache.poi.xssf.usermodel.XSSFRow"/>
-            <Class name="org.apache.poi.xssf.usermodel.XSSFSheet"/>
-        </Or>
-        <Bug pattern="DM_NUMBER_CTOR" />
-    </Match>
-
-
-</FindBugsFilter>
diff --git a/trunk/src/resources/devtools/forbidden-signatures-prod.txt b/trunk/src/resources/devtools/forbidden-signatures-prod.txt
deleted file mode 100644
index 59dcf47..0000000
--- a/trunk/src/resources/devtools/forbidden-signatures-prod.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-# (C) Copyright Uwe Schindler (Generics Policeman) and others.
-# Parts of this work are licensed to the Apache Software Foundation (ASF)
-# under one or more contributor license agreements.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# This file contains API signatures which are specific to POI.
-# The goal is to minimize implicit defaults
-
-@defaultMessage POI forbidden APIs which are tolerated in non-production code, e.g. in tests and examples
-
-# We have applications which use this to return error codes on invalid commandline parameters...
-#@defaultMessage Please do not terminate the application
-#java.lang.System#exit(int)
-#java.lang.Runtime#exit(int)
-#java.lang.Runtime#halt(int)
-
-
-java.lang.System#gc() @ Please do not try to stop the world
-java.lang.Throwable#printStackTrace() @ Please use POILogger for exceptions
-java.lang.Throwable#printStackTrace(java.io.PrintStream) @ Please use POILogger for exceptions
-java.lang.Throwable#printStackTrace(java.io.PrintWriter) @ Please use POILogger for exceptions
\ No newline at end of file
diff --git a/trunk/src/resources/devtools/forbidden-signatures.txt b/trunk/src/resources/devtools/forbidden-signatures.txt
deleted file mode 100644
index 54b2856..0000000
--- a/trunk/src/resources/devtools/forbidden-signatures.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-# (C) Copyright Uwe Schindler (Generics Policeman) and others.
-# Parts of this work are licensed to the Apache Software Foundation (ASF)
-# under one or more contributor license agreements.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# This file contains API signatures which are specific to POI.
-# The goal is to minimize implicit defaults
-
-@ignoreUnresolvable
-@defaultMessage POI forbidden APIs
-
-# Locale related interfaces which we want to avoid to not have code which depends on the locale of the current machine
-java.util.Locale#getDefault() @ Do not use methods that depend on the current Local, either use Locale.ROOT or let the user define the local, see class LocaleUtil for details
-java.util.Locale#setDefault(java.util.Locale) @ Do not use methods that depend on the current Local, either use Locale.ROOT or let the user define the local, see class LocaleUtil for details
-java.util.TimeZone#getDefault() @ Do not use methods that depend on the current Local, either use Locale.ROOT or let the user define the local, see class LocaleUtil for details
-java.util.Date#toString() @ Do not use methods that depend on the current Local, either use Locale.ROOT or let the user define the local, see class LocaleUtil for details
-
-java.text.DecimalFormatSymbols#<init>() @ use DecimalFormatSymbols.getInstance()
-java.text.DecimalFormatSymbols#<init>(java.util.Locale) @ use DecimalFormatSymbols.getInstance()
-
-# the following are taken from the Elasticsearch source at https://github.com/elastic/elasticsearch/tree/master/buildSrc/src/main/resources/forbidden
-
-@defaultMessage Convert to URI
-java.net.URL#getPath()
-java.net.URL#getFile()
-
-@defaultMessage Usage of getLocalHost is discouraged
-java.net.InetAddress#getLocalHost()
-
-@defaultMessage Specify a location for the temp file/directory instead.
-java.nio.file.Files#createTempDirectory(java.lang.String,java.nio.file.attribute.FileAttribute[])
-java.nio.file.Files#createTempFile(java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[])
-
-@defaultMessage Specify a location for the temp file/directory instead.
-java.nio.file.Files#createTempDirectory(java.lang.String,java.nio.file.attribute.FileAttribute[])
-java.nio.file.Files#createTempFile(java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[])
-
-@defaultMessage Don't use java serialization - this can break BWC without noticing it
-java.io.ObjectOutputStream
-java.io.ObjectOutput
-java.io.ObjectInputStream
-java.io.ObjectInput
-
-@defaultMessage Resolve hosts explicitly to the address(es) you want with InetAddress.
-java.net.InetSocketAddress#<init>(java.lang.String,int)
-java.net.Socket#<init>(java.lang.String,int)
-java.net.Socket#<init>(java.lang.String,int,java.net.InetAddress,int)
-
-@defaultMessage Don't bind to wildcard addresses. Be specific.
-java.net.DatagramSocket#<init>()
-java.net.DatagramSocket#<init>(int)
-java.net.InetSocketAddress#<init>(int)
-java.net.MulticastSocket#<init>()
-java.net.MulticastSocket#<init>(int)
-java.net.ServerSocket#<init>(int)
-java.net.ServerSocket#<init>(int,int)
-
-@defaultMessage use NetworkAddress format/formatAddress to print IP or IP+ports
-java.net.InetAddress#toString()
-java.net.InetAddress#getHostAddress()
-java.net.Inet4Address#getHostAddress()
-java.net.Inet6Address#getHostAddress()
-java.net.InetSocketAddress#toString()
-
-@defaultMessage avoid DNS lookups by accident: if you have a valid reason, then @SuppressWarnings with that reason so its completely clear
-java.net.InetAddress#getHostName()
-java.net.InetAddress#getCanonicalHostName()
-
-java.net.InetSocketAddress#getHostName() @ Use getHostString() instead, which avoids a DNS lookup
-
-@defaultMessage this method needs special permission
-java.lang.Thread#getAllStackTraces()
-
-@defaultMessage Avoid unchecked warnings by using Collections#empty(List|Map|Set) methods
-java.util.Collections#EMPTY_LIST
-java.util.Collections#EMPTY_MAP
-java.util.Collections#EMPTY_SET
-
-
-@defaultMessage spawns threads with vague names; use a custom thread factory and name threads so that you can tell (by its name) which executor it is associated with
-java.util.concurrent.Executors#newFixedThreadPool(int)
-java.util.concurrent.Executors#newSingleThreadExecutor()
-java.util.concurrent.Executors#newCachedThreadPool()
-java.util.concurrent.Executors#newSingleThreadScheduledExecutor()
-java.util.concurrent.Executors#newScheduledThreadPool(int)
-java.util.concurrent.Executors#defaultThreadFactory()
-java.util.concurrent.Executors#privilegedThreadFactory()
-
-java.lang.Character#codePointBefore(char[],int) @ Implicit start offset is error-prone when the char[] is a buffer and the first chars are random chars
-java.lang.Character#codePointAt(char[],int) @ Implicit end offset is error-prone when the char[] is a buffer and the last chars are random chars
-
-@defaultMessage Only use wait / notify when really needed try to use concurrency primitives, latches or callbacks instead.
-java.lang.Object#wait()
-java.lang.Object#wait(long)
-java.lang.Object#wait(long,int)
-java.lang.Object#notify()
-java.lang.Object#notifyAll()
-
-@defaultMessage Don't interrupt threads use FutureUtils#cancel(Future<T>) instead
-java.util.concurrent.Future#cancel(boolean)
diff --git a/trunk/src/resources/devtools/poi.jin b/trunk/src/resources/devtools/poi.jin
deleted file mode 100644
index c52acef..0000000
--- a/trunk/src/resources/devtools/poi.jin
+++ /dev/null
@@ -1,284 +0,0 @@
-###
-### Jindent 3.2x property file -- http://www.jindent.de
-###
-### this encapsulates my preferred style, plus project-specific style ...
-###
-### author: Marc Johnson
-###
-
-### General -- Convention
-
-conventionName                            = ""
-conventionString                          = ""
-conventionNotePosition                    = "none"
-blankLinesToSeparateConventionNote        = 2
-
-### General -- Jindent Note
-
-jindentNotePosition                       = "none"
-blankLinesToSeparateJindentNote           = 2
-
-### Header/Footer -- Header Template
-
-headerSmartMode                           = infinite
-headerIdentifyKey                         = "Copyright (c) 2002-2006 The Apache Software Foundation"
-blankLinesBeforeHeader                    = 1
-header[00]="/* ==================================================================="
-header[01]=" * Licensed to the Apache Software Foundation (ASF) under one"
-header[02]=" * or more contributor license agreements.  See the NOTICE file"
-header[03]=" * distributed with this work for additional information"
-header[04]=" * regarding copyright ownership.  The ASF licenses this file"
-header[05]=" * to you under the Apache License, Version 2.0 (the"
-header[06]=" * \"License\"); you may not use this file except in compliance"
-header[07]=" * with the License.  You may obtain a copy of the License at"
-header[08]=" * "
-header[09]=" * http://www.apache.org/licenses/LICENSE-2.0"
-header[10]=" * "
-header[11]=" * Unless required by applicable law or agreed to in writing,"
-header[12]=" * software distributed under the License is distributed on an"
-header[13]=" * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
-header[14]=" * KIND, either express or implied.  See the License for the"
-header[15]=" * specific language governing permissions and limitations"
-header[16]=" * under the License"
-header[17]=" */"
-blankLinesAfterHeader                     = 1
-
-### Header/Footer -- Footer Template
-
-footerSmartMode                           = infinite
-footerIdentifyKey                         = ""
-blankLinesBeforeFooter                    = 0
-footer[00]                                = ""
-blankLinesAfterFooter                     = 0
-
-### Indentation -- Misc
-
-tabulatorSize                             = 8
-indentSize                                = 4
-firstLevelIndent                          = 0
-indentCaseFromSwitch                      = true
-labelNewLine                              = true
-indentLabels                              = true
-minimumCommentIndent                      = 3
-indentLeadingsByTabs                      = false
-indentCommentsByTabs                      = false
-indentDeclarationsByTabs                  = false
-indentAssignmentsByTabs                   = false
-
-### Indentation -- Alignment
-
-alignComments                             = true
-alignDeclarations                         = true
-alignAssignments                          = true
-alignTernaryConditions                    = false
-alignTernaryExpressions                   = true
-alignTooLongComments                      = true
-
-### Braces -- Style
-
-leftBraceNewLineGeneral                   = true
-rightBraceNewLineGeneral                  = true
-indentLeftBraceGeneral                    = 0
-indentRightBraceGeneral                   = 0
-indentAfterRightBraceGeneral              = 0
-cuddleEmptyBracesGeneral                  = false
-indentCuddledBracesGeneral                = 0
-
-leftBraceNewLineClassInterface            = true
-rightBraceNewLineClassInterface           = true
-indentLeftBraceClassInterface             = 0
-indentRightBraceClassInterface            = 0
-indentAfterRightBraceClassInterface       = 0
-cuddleEmptyBracesClassInterface           = false
-indentCuddledBracesClassInterface         = 0
-
-leftBraceNewLineMethod                    = true
-rightBraceNewLineMethod                   = true
-indentLeftBraceMethod                     = 0
-indentRightBraceMethod                    = 0
-indentAfterRightBraceMethod               = 0
-cuddleEmptyBracesMethod                   = false
-indentCuddledBracesMethod                 = 0
-
-leftBraceNewLineTryCatch                  = true
-rightBraceNewLineTryCatch                 = true
-indentLeftBraceTryCatch                   = 0
-indentRightBraceTryCatch                  = 0
-indentAfterRightBraceTryCatch             = 0
-cuddleEmptyBracesTryCatch                 = false
-indentCuddledBracesTryCatch               = 0
-
-### Braces -- Insert At
-
-insertBracesAtIfElse                      = true
-insertBracesAtFor                         = true
-insertBracesAtWhile                       = true
-insertBracesAtDoWhile                     = true
-insertParenthesisAtConditions             = true
-
-### Braces -- If-Else
-
-singleIfStatementInOneLine                = false
-singleElseStatementInOneLine              = false
-specialElseIfTreatment                    = true
-
-### JavaDoc -- Misc
-
-deleteJavaDocComments                     = false
-formatJavaDocComments                     = true
-insertMissingJavaDocTags                  = true
-deleteObsoleteJavaDocTags                 = false
-createPublicClassInterfaceJavaDocs        = true
-createFriendlyClassInterfaceJavaDocs      = false
-createPrivateClassInterfaceJavaDocs       = false
-createProtectedClassInterfaceJavaDocs     = false
-createPublicMethodJavaDocs                = false
-createFriendlyMethodJavaDocs              = false
-createPrivateMethodJavaDocs               = false
-createProtectedMethodJavaDocs             = false
-createPublicFieldJavaDocs                 = false
-createFriendlyFieldJavaDocs               = false
-createPrivateFieldJavaDocs                = false
-createProtectedFieldJavaDocs              = false
-
-### JavaDoc -- Templates
-
-sortExceptionsInTemplates                 = true
-javaDocMethodTop[00]                      = "/**"
-javaDocMethodTop[01]                      = " * Method $objectName$"
-javaDocMethodTop[02]                      = " *"
-javaDocMethodParamSeparator[00]           = " *"
-javaDocMethodParam[00]                    = " * @param $paramName$"
-javaDocMethodReturn[00]                   = " *"
-javaDocMethodReturn[01]                   = " * @return"
-javaDocMethodExceptionSeparator[00]       = " *"
-javaDocMethodException[00]                = " * @exception $exceptionName$"
-javaDocMethodBottom[00]                   = " *"
-javaDocMethodBottom[01]                   = " */"
-javaDocConstructorTop[00]                 = "/**"
-javaDocConstructorTop[01]                 = " * Constructor $objectName$"
-javaDocConstructorTop[02]                 = " *"
-javaDocConstructorParamSeparator[00]      = " *"
-javaDocConstructorParam[00]               = " * @param $paramName$"
-javaDocConstructorExceptionSeparator[00]  = " *"
-javaDocConstructorException[00]           = " * @exception $exceptionName$"
-javaDocConstructorBottom[00]              = " *"
-javaDocConstructorBottom[01]              = " */"
-javaDocClass[00]                          = "/**"
-javaDocClass[01]                          = " * Class $objectName$"
-javaDocClass[02]                          = " *"
-javaDocClass[03]                          = " *"
-javaDocClass[04]                          = " * @author"
-javaDocClass[05]                          = " * @version %I%, %G%"
-javaDocClass[06]                          = " */"
-javaDocInterface[00]                      = "/**"
-javaDocInterface[01]                      = " * Interface $objectName$"
-javaDocInterface[02]                      = " *"
-javaDocInterface[03]                      = " *"
-javaDocInterface[04]                      = " * @author"
-javaDocInterface[05]                      = " * @version %I%, %G%"
-javaDocInterface[06]                      = " */"
-javaDocField[00]                          = "/** Field $objectName$           */"
-
-### Comments -- Format/Delete
-
-deleteBlockComments                       = false
-deleteSingleLineComments                  = false
-deleteTrailingComments                    = false
-deleteEndOfLineComments                   = false
-formatBlockComments                       = true
-formatSingleLineComments                  = true
-formatTrailingComments                    = true
-formatEndOfLineComments                   = true
-
-### Comments -- Exceptions
-
-neverIndentFirstColumnComments            = true
-neverFormatFirstColumnComments            = true
-neverFormatHeader                         = false
-neverFormatFooter                         = false
-
-### Separation -- Misc
-
-keepBlankLines                            = 0
-minLinesToInsertBlankLineInClasses        = infinite
-minLinesToInsertBlankLineInMethods        = infinite
-
-### Separation -- Separate
-
-separateChunksByComments                  = false
-allowBreakSeparatedFromCaseBlock          = false
-blankLinesBetweenCaseBlocks               = 1
-blankLinesBetweenChunks                   = 0
-comparableImportDepth                     = 2
-blankLinesToSeparateImports               = 1
-blankLinesBetweenClassInterface           = 2
-
-### Separation -- Insert Blank Lines
-
-blankLinesAfterDeclarations               = 1
-blankLinesAfterMethods                    = 1
-blankLinesAfterClasses                    = 1
-blankLinesAfterInterfaces                 = 1
-blankLinesBeforeJavaDocComments           = 1
-blankLinesAfterJavaDocComments            = 1
-blankLinesBeforeBlockComments             = 1
-blankLinesAfterBlockComments              = 0
-blankLinesBeforeSingleLineComments        = 1
-blankLinesAfterSingleLineComments         = 0
-blankLinesBeforeEndOfLineComments         = 1
-blankLinesAfterEndOfLineComments          = 0
-blankLinesAfterSwitch                     = 1
-blankLinesAfterPackage                    = 1
-blankLinesAfterLastImport                 = 1
-
-### Whitespaces -- Padding
-
-separateAssignmentOperators               = true
-separateConditionalOperators              = true
-separateComparisonOperators               = true
-separateNumericalOperators                = true
-paddingCastParenthesis                    = true
-paddingParenthesis                        = false
-paddingBrackets                           = true
-paddingBraces                             = true
-
-### Whitespaces -- Space Before
-
-spaceBeforeMethodDeclarationParenthesis   = false
-spaceBeforeMethodCallParenthesis          = false
-spaceBeforeBrackets                       = false
-spaceBeforeBracketsInTypes                = true
-spaceBeforeStatementParenthesis           = true
-spaceBeforeConditionBang                  = true
-spaceBeforeCaseColon                      = true
-
-### Whitespaces -- Space After
-
-spaceAfterComma                           = true
-spaceAfterSemicolon                       = true
-spaceAfterCasting                         = true
-
-### Whitespaces -- No Spaces
-
-noSpacesInEmptyForExpressions             = true
-
-### Line Wrapping -- Misc
-
-maxFieldElementsPerLine                   = 0
-wrapLines                                 = true
-wrapBecauseOfComments                     = true
-wrapLongMethodNames                       = true
-maxLineLength                             = 78
-deepIndent                                = 45
-forceIndent                               = 8
-forceIndentTolerance                      = 4
-allowWrappingAfterAssignments             = true
-allowWrappingAfterParenthesis             = true
-preferWrappingAfterThrows                 = true
-alwaysWrapThrows                          = true
-alwaysWrapExtends                         = true
-alwaysWrapImplements                      = true
-indentWrappedThrows                       = 4
-indentWrappedExtends                      = 4
-indentWrappedImplements                   = 4
diff --git a/trunk/src/resources/devtools/unpack_ooxml.sh b/trunk/src/resources/devtools/unpack_ooxml.sh
deleted file mode 100755
index a4b8703..0000000
--- a/trunk/src/resources/devtools/unpack_ooxml.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash -e
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements.  See the NOTICE file distributed with
-#   this work for additional information regarding copyright ownership.
-#   The ASF licenses this file to You under the Apache License, Version 2.0
-#   (the "License"); you may not use this file except in compliance with
-#   the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-# basename it
-
-FILENAME="$1"
-BASENAME="${FILENAME##*/}"
-OUTDIR="${BASENAME%.*}"
-
-if [ ! -f "$FILENAME" ]; then
-    echo "File $FILENAME does not exist"
-    exit 1
-fi
-
-# if dir exists, fail
-if [ -d "$OUTDIR" ]; then
-    echo "Directory '$OUTDIR' already exists!"
-    exit 1
-fi
-
-mkdir "$OUTDIR"
-unzip -d "$OUTDIR" "$FILENAME"
-
-pushd "$OUTDIR"
-
-find . -type f \( -iname "*.xml" -or -iname "*.rels" \) -exec python -c "import os, sys, xml.dom.minidom
-with open('{}', 'r') as fp:
-    s = fp.read()
-with open('{}.bak', 'w') as fp:
-    fp.write(xml.dom.minidom.parseString(s).toprettyxml().encode('utf-8'))
-os.rename('{}.bak', '{}')" \;
diff --git a/trunk/src/resources/logos/logoKarmokar4.png b/trunk/src/resources/logos/logoKarmokar4.png
deleted file mode 100644
index 90a915a..0000000
--- a/trunk/src/resources/logos/logoKarmokar4.png
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/logos/logoKarmokar4edited.png b/trunk/src/resources/logos/logoKarmokar4edited.png
deleted file mode 100644
index 73c02a5..0000000
--- a/trunk/src/resources/logos/logoKarmokar4edited.png
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/logos/logoKarmokar4s.png b/trunk/src/resources/logos/logoKarmokar4s.png
deleted file mode 100644
index 33391cd..0000000
--- a/trunk/src/resources/logos/logoKarmokar4s.png
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/logos/logoKarmokar5.png b/trunk/src/resources/logos/logoKarmokar5.png
deleted file mode 100644
index e2d1f3f..0000000
--- a/trunk/src/resources/logos/logoKarmokar5.png
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/logos/project-alt-logo.jpg b/trunk/src/resources/logos/project-alt-logo.jpg
deleted file mode 100644
index 0731751..0000000
--- a/trunk/src/resources/logos/project-alt-logo.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/logos/project-feather-logo.jpg b/trunk/src/resources/logos/project-feather-logo.jpg
deleted file mode 100644
index 24c9e06..0000000
--- a/trunk/src/resources/logos/project-feather-logo.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/main/font_metrics.properties b/trunk/src/resources/main/font_metrics.properties
deleted file mode 100644
index e521b0c..0000000
--- a/trunk/src/resources/main/font_metrics.properties
+++ /dev/null
@@ -1,927 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#Font Metrics
-#Sun Sep 07 21:54:47 EST 2003
-font.Lucida\ Sans\ Demibold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Medium\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Jokerman.height=16
-font.Harrington.height=13
-font.Curlz\ MT.height=14
-font.Garamond\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Wide\ Latin.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Colonna\ MT.widths=5, 6, 5, 6, 6, 4, 7, 6, 4, 4, 6, 4, 9, 6, 6, 6, 6, 5, 5, 5, 6, 6, 8, 6, 6, 5, 8, 6, 7, 8, 6, 6, 7, 8, 4, 4, 7, 6, 9, 9, 7, 7, 7, 8, 5, 7, 8, 7, 9, 7, 8, 6, 6, 4, 5, 5, 6, 5, 6, 5, 5, 6, 
-font.Gill\ Sans\ MT\ Ext\ Condensed\ Bold.height=12
-font.Beesknees\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Freestyle\ Script.height=13
-font.Palace\ Script\ MT.widths=4, 3, 3, 4, 3, 3, 4, 4, 3, 3, 4, 3, 6, 4, 3, 4, 3, 3, 3, 3, 4, 4, 5, 4, 4, 3, 8, 8, 6, 8, 5, 7, 6, 8, 6, 6, 8, 7, 8, 7, 5, 7, 6, 8, 6, 7, 5, 5, 6, 7, 5, 6, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-font.Lucida\ Sans\ Demibold\ Roman.height=14
-font.Franklin\ Gothic\ Book\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Serif.widths=7, 7, 6, 7, 6, 4, 7, 7, 5, 5, 8, 5, 11, 7, 6, 6, 7, 6, 6, 5, 7, 6, 9, 6, 6, 6, 8, 9, 8, 9, 8, 8, 8, 10, 5, 5, 9, 7, 11, 9, 9, 8, 9, 8, 7, 7, 9, 7, 10, 7, 7, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bitstream\ Vera\ Sans\ Mono.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Matisse\ ITC.height=14
-font.Arial\ Special\ G2\ Bold\ Italic.height=14
-font.Lucida\ Fax\ Demibold.height=14
-font.Arial\ Special\ G1\ Bold\ Italic.height=14
-font.Tempus\ Sans\ ITC.height=14
-font.Impact.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Algerian.widths=9, 7, 7, 7, 7, 7, 8, 7, 4, 6, 8, 6, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 8, 7, 7, 9, 7, 7, 7, 7, 7, 8, 7, 4, 6, 8, 6, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Gill\ Sans\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow\ Special\ G1\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.OCR\ A\ Extended.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Cooper\ Black.widths=7, 7, 6, 8, 6, 5, 7, 8, 6, 6, 8, 6, 11, 8, 7, 8, 7, 6, 6, 6, 8, 7, 11, 7, 7, 6, 9, 8, 8, 9, 8, 8, 9, 9, 4, 7, 9, 7, 10, 9, 9, 8, 9, 9, 7, 8, 9, 9, 11, 9, 9, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Century\ Gothic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bauhaus\ 93.widths=7, 7, 7, 7, 7, 4, 7, 6, 4, 5, 6, 4, 9, 6, 7, 7, 7, 4, 5, 4, 6, 5, 9, 6, 6, 6, 7, 7, 9, 8, 6, 6, 7, 7, 4, 4, 7, 4, 9, 7, 9, 7, 9, 7, 5, 6, 7, 6, 9, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bernard\ MT\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Old\ English\ Text\ MT.widths=5, 5, 4, 5, 4, 3, 5, 5, 3, 3, 6, 3, 7, 5, 5, 5, 5, 4, 5, 3, 5, 5, 7, 6, 5, 4, 9, 10, 10, 10, 10, 10, 9, 10, 8, 8, 10, 9, 12, 11, 10, 10, 10, 9, 10, 9, 11, 9, 10, 8, 9, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Century\ Schoolbook.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Fax\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Rounded\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Informal\ Roman.widths=5, 5, 4, 6, 5, 4, 5, 5, 3, 3, 5, 3, 7, 5, 4, 5, 5, 5, 4, 4, 5, 5, 7, 5, 5, 6, 7, 7, 6, 7, 6, 6, 7, 7, 4, 6, 6, 6, 8, 7, 6, 6, 6, 6, 5, 7, 7, 7, 9, 7, 7, 7, 5, 4, 6, 6, 6, 7, 6, 6, 6, 6, 
-font.Lucida\ Sans\ Demibold.height=14
-font.Ravie.height=14
-font.Perpetua.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.MT\ Extra.height=13
-font.Bitstream\ Vera\ Sans\ Mono\ Bold\ Oblique.height=14
-font.Book\ Antiqua\ Bold\ Italic.height=14
-font.Eras\ Medium\ ITC.height=12
-font.Rockwell\ Bold.height=14
-font.Snap\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.dialog.italic.widths=7, 7, 6, 7, 7, 4, 7, 7, 4, 3, 6, 4, 8, 7, 7, 7, 7, 4, 6, 4, 7, 6, 9, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 3, 6, 8, 7, 9, 8, 9, 8, 9, 8, 8, 7, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Century\ Gothic\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Demi\ Italic.height=14
-font.Franklin\ Gothic\ Book.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G1\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Desdemona.height=12
-font.Franklin\ Gothic\ Demi\ Cond.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Wingdings\ 3.height=13
-font.High\ Tower\ Text.height=13
-font.Edwardian\ Script\ ITC.widths=4, 4, 3, 4, 3, 2, 4, 4, 3, 3, 4, 3, 6, 5, 4, 4, 4, 4, 3, 3, 4, 4, 5, 4, 4, 4, 10, 10, 9, 9, 9, 8, 8, 10, 7, 7, 10, 9, 11, 10, 9, 9, 8, 10, 8, 7, 10, 8, 10, 11, 10, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Gigi.widths=6, 5, 5, 5, 6, 5, 6, 5, 5, 4, 6, 6, 9, 6, 4, 6, 5, 5, 4, 5, 6, 5, 8, 6, 6, 4, 10, 8, 7, 10, 5, 9, 7, 9, 6, 6, 9, 8, 11, 9, 6, 8, 8, 7, 6, 7, 8, 9, 13, 9, 9, 7, 5, 5, 6, 5, 6, 5, 5, 5, 5, 6, 
-font.Engravers\ MT.height=13
-font.Californian\ FB\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Calligraphy\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G1\ Italic.height=14
-font.Book\ Antiqua\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Heavy.widths=7, 7, 6, 7, 7, 5, 7, 7, 4, 4, 7, 4, 10, 7, 7, 7, 7, 5, 6, 5, 7, 6, 8, 7, 6, 6, 7, 7, 7, 8, 7, 6, 8, 8, 4, 5, 8, 6, 9, 8, 8, 7, 8, 8, 7, 6, 8, 7, 10, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Sans\ Typewriter\ Regular.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Ransom\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.High\ Tower\ Text\ Italic.height=14
-font.dialog.bold.height=14
-font.Times\ New\ Roman\ Special\ G2\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Trebuchet\ MS\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Special\ G1\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ Ultra\ Bold\ Condensed.widths=5, 5, 4, 5, 5, 4, 5, 5, 3, 3, 5, 3, 8, 5, 5, 5, 5, 5, 4, 4, 5, 5, 7, 6, 5, 4, 7, 6, 5, 6, 5, 5, 6, 7, 3, 4, 6, 5, 7, 6, 6, 6, 6, 6, 5, 5, 6, 6, 8, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Monotype\ Sorts\ 2.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rockwell\ Condensed.height=13
-font.Bell\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G2\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Special\ G1\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Gill\ Sans\ Ultra\ Bold.height=13
-font.American\ Uncial.height=13
-font.Kino\ MT.widths=5, 5, 5, 5, 5, 4, 5, 5, 3, 3, 5, 3, 7, 5, 5, 5, 5, 4, 4, 4, 5, 5, 7, 4, 5, 4, 6, 5, 6, 6, 5, 5, 6, 6, 4, 5, 5, 5, 8, 6, 7, 5, 7, 5, 5, 5, 6, 6, 7, 5, 6, 4, 7, 4, 5, 5, 5, 5, 5, 4, 5, 5, 
-font.Wingdings.height=12
-font.Mistral.widths=5, 4, 4, 5, 3, 3, 4, 5, 4, 4, 5, 4, 7, 6, 5, 4, 4, 4, 4, 4, 5, 4, 6, 5, 5, 4, 5, 6, 6, 6, 5, 5, 6, 6, 5, 4, 6, 4, 7, 6, 6, 5, 6, 6, 4, 4, 6, 5, 7, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 4, 5, 5, 
-font.Bitstream\ Vera\ Sans\ Bold\ Oblique.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Harrington.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Console.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookshelf\ Symbol\ 1.widths=5, 5, 5, 7, 7, 9, 7, 7, 3, 3, 4, 3, 10, 5, 7, 9, 9, 4, 6, 4, 9, 6, 6, 4, 4, 5, 8, 9, 6, 7, 9, 9, 7, 8, 4, 9, 5, 3, 10, 7, 9, 9, 9, 4, 6, 4, 9, 9, 9, 9, 9, 6, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-font.Lucida\ Fax\ Demibold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Eras\ Demi\ ITC.height=12
-font.Calisto\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Blackadder\ ITC.height=13
-font.Arial\ Narrow\ Special\ G2\ Italic.height=14
-font.Century\ Gothic.widths=7, 7, 6, 7, 6, 3, 7, 6, 2, 3, 6, 2, 10, 6, 6, 7, 7, 3, 4, 3, 6, 6, 8, 6, 6, 5, 7, 6, 8, 7, 5, 5, 8, 7, 3, 5, 6, 4, 9, 7, 8, 6, 8, 6, 5, 4, 6, 7, 9, 7, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Ransom\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Monotype\ Sorts.widths=9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 
-font.Vivaldi\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Typewriter\ Bold\ Oblique.height=14
-font.Lucida\ Handwriting\ Italic.height=14
-font.Castellar.widths=9, 8, 9, 10, 7, 7, 9, 10, 5, 6, 9, 7, 12, 10, 10, 7, 10, 9, 6, 8, 10, 9, 12, 10, 9, 8, 9, 8, 9, 10, 7, 7, 9, 10, 5, 6, 9, 7, 12, 10, 10, 7, 10, 9, 6, 8, 10, 9, 12, 10, 9, 8, 8, 5, 6, 6, 7, 6, 7, 6, 7, 7, 
-font.Forte.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Medium.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Abadi\ MT\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Regular.height=14
-font.Bradley\ Hand\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Eurostile.height=10
-font.Perpetua\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Rockwell\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookshelf\ Symbol\ 2.height=13
-font.Calisto\ MT\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.serif.plain.height=14
-font.Lucida\ Bright\ Regular.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bell\ MT\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Tw\ Cen\ MT\ Condensed.widths=4, 4, 3, 4, 4, 3, 4, 4, 2, 2, 4, 2, 7, 4, 4, 4, 4, 3, 3, 3, 4, 4, 6, 4, 4, 3, 5, 5, 4, 5, 4, 4, 5, 5, 3, 4, 5, 4, 6, 5, 5, 4, 5, 5, 4, 4, 5, 5, 7, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-font.dialog.bolditalic.height=14
-font.Palatino\ Linotype\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.dialoginput.italic.widths=7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Georgia\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Rockwell\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Demi.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Goudy\ Old\ Style\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Perpetua\ Titling\ MT\ Light.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Parchment.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Symbol.height=14
-font.Abadi\ MT\ Condensed.widths=5, 5, 5, 5, 5, 3, 5, 5, 3, 3, 5, 3, 7, 5, 5, 5, 5, 4, 5, 3, 5, 5, 7, 5, 5, 5, 5, 6, 5, 6, 6, 5, 6, 6, 3, 4, 5, 5, 7, 6, 6, 6, 6, 5, 5, 5, 6, 5, 7, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Palatino\ Linotype\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G1.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana\ Ref.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Gothic\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Vladimir\ Script.widths=5, 5, 4, 5, 4, 4, 5, 5, 4, 3, 5, 4, 6, 5, 5, 5, 5, 4, 4, 4, 5, 5, 6, 5, 5, 4, 9, 9, 7, 8, 7, 7, 8, 9, 7, 8, 7, 7, 10, 8, 7, 7, 7, 8, 7, 7, 8, 8, 10, 7, 8, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Franklin\ Gothic\ Demi\ Cond.widths=5, 5, 4, 5, 5, 3, 5, 5, 2, 2, 5, 2, 7, 5, 5, 5, 5, 3, 4, 3, 5, 4, 6, 4, 4, 4, 5, 6, 5, 6, 5, 4, 6, 6, 3, 3, 5, 4, 8, 6, 6, 5, 6, 5, 5, 4, 6, 5, 7, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.OCR\ A\ Extended.height=11
-font.Arial\ Narrow\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Runic\ MT\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Wide\ Latin.widths=11, 11, 10, 11, 10, 8, 10, 12, 7, 7, 13, 7, 18, 12, 11, 11, 11, 10, 10, 7, 12, 12, 16, 13, 11, 10, 15, 15, 14, 16, 15, 14, 16, 17, 10, 11, 16, 14, 18, 15, 14, 15, 14, 16, 13, 13, 16, 14, 19, 15, 14, 13, 13, 10, 13, 12, 13, 12, 13, 11, 13, 13, 
-font.Arial\ Special\ G2\ Bold.height=14
-font.Lucida\ Console.height=11
-font.Lucida\ Sans\ Typewriter\ Regular.height=14
-font.Bookman\ Old\ Style\ Bold.height=14
-font.Copperplate\ Gothic\ Light.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Trebuchet\ MS\ Bold.height=14
-font.Garamond\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Serif\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Viner\ Hand\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Book.widths=6, 6, 6, 6, 6, 4, 6, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 6, 4, 6, 6, 8, 5, 5, 5, 6, 7, 7, 7, 6, 6, 7, 7, 4, 5, 7, 6, 9, 8, 7, 7, 7, 7, 7, 6, 7, 6, 9, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bookman\ Old\ Style\ Bold\ Italic.height=14
-font.Ransom\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Pacmania.height=12
-font.Arial\ Narrow\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Fax\ Demibold\ Italic.height=14
-font.monospaced.italic.widths=7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Book\ Antiqua\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Sans\ Demibold\ Roman.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial.height=13
-font.Lucida\ Bright\ Demibold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Special\ G2.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Mistral.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana\ Ref.height=14
-font.Papyrus.height=17
-font.Lucida\ Sans\ Unicode.widths=7, 7, 6, 7, 6, 5, 7, 7, 4, 4, 7, 4, 9, 7, 7, 7, 7, 6, 6, 5, 7, 7, 9, 7, 7, 7, 8, 7, 8, 8, 6, 6, 8, 8, 4, 4, 8, 6, 10, 8, 9, 7, 9, 7, 6, 7, 8, 8, 10, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Sans\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Bold\ Italic.height=14
-font.Century\ Schoolbook\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Special\ G2\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Special\ G1.widths=8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Arial\ Narrow\ Special\ G1.widths=10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-font.Marlett.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Gothic\ Italic.height=14
-font.Century\ Gothic\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Georgia\ Bold.height=14
-font.Lucida\ Sans\ Typewriter\ Bold.height=14
-font.MS\ Outlook.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Fax\ Demibold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rockwell\ Bold\ Italic.height=14
-font.Parchment.widths=3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 3, 2, 4, 3, 3, 3, 3, 3, 3, 2, 3, 3, 4, 3, 3, 2, 10, 9, 8, 8, 8, 7, 11, 9, 7, 7, 9, 9, 10, 10, 10, 9, 9, 8, 8, 8, 9, 8, 10, 8, 8, 9, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 
-font.Palatino\ Linotype\ Bold\ Italic.height=14
-font.Verdana\ Bold\ Italic.height=14
-font.Juice\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Typewriter\ Oblique.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G2\ Bold.height=14
-font.Ransom.height=16
-font.Rockwell\ Condensed\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Californian\ FB\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana\ Italic.height=14
-font.French\ Script\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Garamond\ Bold.height=14
-font.Lucida\ Calligraphy\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Narrow\ Special\ G2\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Eras\ Light\ ITC.height=12
-font.Franklin\ Gothic\ Book\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Broadway.widths=8, 8, 7, 8, 7, 5, 7, 9, 5, 5, 8, 5, 13, 9, 7, 8, 8, 6, 6, 5, 9, 7, 10, 8, 7, 8, 9, 8, 8, 9, 8, 8, 9, 9, 5, 7, 8, 8, 10, 8, 9, 9, 9, 9, 7, 8, 9, 9, 11, 9, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Californian\ FB\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Courier\ New\ Bold\ Italic.height=14
-font.Marlett.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Trebuchet\ MS.widths=5, 6, 5, 6, 6, 4, 6, 6, 3, 4, 6, 3, 9, 6, 6, 6, 6, 5, 4, 4, 6, 6, 9, 6, 5, 5, 7, 6, 6, 6, 6, 6, 7, 7, 3, 5, 6, 6, 8, 7, 7, 6, 7, 6, 5, 6, 7, 7, 10, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Tw\ Cen\ MT\ Medium\ Italic.height=14
-font.Microsoft\ Sans\ Serif.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Brush\ Script\ MT\ Italic.height=14
-font.Baskerville\ Old\ Face.widths=5, 6, 5, 6, 6, 4, 5, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 5, 4, 6, 5, 7, 5, 5, 5, 8, 8, 8, 9, 7, 6, 9, 9, 5, 4, 8, 7, 10, 9, 9, 7, 9, 7, 6, 8, 9, 8, 12, 8, 8, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Edda.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans\ Bold.height=14
-font.Rage\ Italic.widths=5, 4, 4, 6, 4, 3, 5, 5, 4, 3, 5, 4, 7, 6, 5, 6, 6, 5, 4, 4, 6, 5, 6, 5, 6, 4, 7, 8, 6, 8, 7, 6, 6, 8, 5, 6, 8, 7, 10, 8, 7, 7, 6, 8, 7, 6, 8, 7, 9, 7, 8, 7, 6, 4, 6, 6, 6, 5, 6, 5, 6, 6, 
-font.Franklin\ Gothic\ Medium\ Italic.height=14
-font.Century\ Schoolbook\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Braggadocio.widths=9, 9, 7, 9, 8, 6, 9, 9, 5, 5, 10, 5, 13, 9, 9, 9, 9, 8, 7, 6, 9, 8, 11, 8, 10, 9, 10, 12, 10, 11, 10, 10, 10, 12, 7, 8, 13, 10, 13, 10, 11, 11, 11, 12, 9, 11, 10, 11, 13, 10, 11, 12, 11, 7, 10, 11, 12, 11, 10, 11, 11, 11, 
-font.Wingdings\ 2.height=12
-font.Britannic\ Bold.height=11
-font.Bitstream\ Vera\ Sans\ Mono\ Bold\ Oblique.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookshelf\ Symbol\ 5.widths=9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 
-font.Playbill.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow\ Bold\ Italic.height=14
-font.Georgia\ Ref.widths=7, 7, 6, 7, 6, 5, 7, 8, 5, 4, 7, 5, 11, 8, 6, 7, 6, 6, 6, 5, 8, 7, 9, 7, 7, 6, 9, 8, 7, 8, 8, 7, 8, 9, 5, 6, 8, 7, 10, 10, 8, 8, 8, 9, 7, 7, 9, 9, 11, 9, 9, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Georgia.widths=7, 7, 5, 7, 6, 5, 6, 8, 5, 4, 7, 5, 11, 8, 6, 7, 6, 5, 5, 5, 8, 7, 8, 7, 7, 5, 8, 8, 7, 8, 7, 7, 8, 9, 5, 6, 8, 7, 10, 8, 8, 7, 8, 8, 6, 7, 8, 8, 11, 8, 8, 7, 7, 6, 6, 6, 6, 6, 7, 6, 7, 7, 
-font.Arial\ Black\ Italic.height=14
-font.Franklin\ Gothic\ Medium\ Cond.widths=6, 6, 5, 6, 5, 4, 5, 6, 3, 3, 5, 3, 8, 6, 6, 6, 6, 4, 5, 4, 6, 5, 7, 5, 5, 4, 6, 6, 6, 7, 6, 5, 7, 6, 3, 4, 6, 5, 8, 7, 7, 6, 7, 6, 6, 5, 6, 6, 8, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Bauhaus\ 93.height=15
-font.Old\ English\ Text\ MT.height=11
-font.Verdana\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Augsburger\ Initials.widths=8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.monospaced.bold.height=14
-font.Bell\ MT.widths=5, 6, 5, 6, 5, 4, 6, 6, 4, 4, 6, 4, 8, 6, 6, 6, 6, 5, 5, 4, 6, 6, 8, 6, 6, 5, 8, 7, 7, 9, 8, 7, 8, 9, 5, 5, 8, 7, 10, 9, 8, 7, 8, 8, 6, 8, 9, 8, 11, 8, 8, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Rockwell\ Italic.height=14
-font.Lucida\ Sans\ Unicode.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Castellar.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Stencil.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Chiller.widths=4, 4, 4, 4, 4, 3, 4, 4, 3, 3, 4, 3, 6, 4, 4, 4, 4, 3, 4, 4, 4, 4, 5, 4, 5, 5, 6, 6, 6, 5, 5, 4, 5, 5, 4, 5, 6, 5, 7, 6, 6, 5, 6, 5, 4, 5, 5, 5, 7, 6, 5, 6, 6, 4, 5, 5, 5, 5, 5, 5, 6, 5, 
-font.Gill\ Sans\ MT\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.dialog.italic.height=14
-font.Perpetua\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.ProFont.widths=8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.dialog.bolditalic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Trebuchet\ MS\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Bold.height=14
-font.Californian\ FB\ Bold.height=14
-font.Rockwell\ Condensed\ Bold.height=14
-font.Georgia\ Bold\ Italic.height=14
-font.Trebuchet\ MS\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G1\ Bold.height=14
-font.Harlow\ Solid\ Italic\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Poor\ Richard.widths=6, 6, 5, 6, 5, 4, 6, 6, 4, 3, 6, 4, 8, 6, 5, 6, 6, 4, 4, 4, 6, 6, 7, 5, 6, 4, 8, 7, 8, 8, 6, 6, 8, 8, 4, 5, 7, 6, 9, 8, 9, 6, 9, 7, 6, 6, 8, 8, 11, 7, 8, 6, 6, 4, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.serif.bolditalic.widths=5, 5, 4, 5, 4, 3, 5, 6, 3, 3, 5, 3, 8, 6, 5, 5, 5, 4, 4, 3, 6, 4, 7, 5, 4, 4, 7, 7, 7, 7, 7, 7, 7, 8, 4, 5, 7, 6, 9, 7, 7, 6, 7, 7, 6, 6, 7, 7, 9, 7, 7, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Gill\ Sans\ Ultra\ Bold\ Condensed.height=13
-font.Verdana.widths=7, 7, 6, 7, 7, 5, 7, 7, 3, 4, 7, 3, 11, 7, 7, 7, 7, 5, 6, 5, 7, 7, 9, 7, 7, 6, 9, 8, 7, 9, 7, 7, 8, 8, 6, 6, 8, 6, 9, 8, 9, 8, 9, 8, 7, 6, 8, 8, 12, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Gill\ Sans\ Ultra\ Bold\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G2\ Bold\ Italic.height=14
-font.Courier\ New\ Italic.height=14
-font.Goudy\ Old\ Style.widths=5, 6, 5, 6, 5, 4, 5, 6, 4, 4, 6, 4, 8, 7, 6, 6, 6, 4, 4, 4, 6, 5, 7, 5, 5, 4, 8, 7, 8, 8, 7, 6, 9, 9, 4, 4, 8, 6, 10, 8, 9, 6, 9, 8, 6, 7, 9, 8, 11, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.dialog.plain.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Bold.height=14
-font.Bitstream\ Vera\ Sans\ Mono\ Oblique.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Trebuchet\ MS.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Modern\ No.\ 20.widths=6, 6, 5, 6, 5, 5, 5, 7, 4, 4, 6, 4, 9, 6, 5, 6, 6, 5, 4, 4, 6, 5, 8, 6, 6, 5, 8, 8, 6, 8, 8, 7, 8, 9, 5, 6, 8, 8, 10, 8, 7, 7, 7, 8, 6, 7, 8, 8, 11, 8, 8, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Kino\ MT.height=12
-font.Viner\ Hand\ ITC.widths=7, 6, 5, 6, 5, 5, 6, 7, 5, 5, 8, 5, 10, 8, 5, 6, 7, 5, 4, 6, 8, 7, 9, 6, 7, 6, 9, 9, 8, 9, 8, 7, 7, 9, 5, 6, 10, 8, 10, 9, 6, 8, 9, 8, 8, 7, 8, 8, 12, 7, 8, 8, 5, 4, 8, 6, 7, 5, 6, 6, 6, 6, 
-font.Forte.widths=7, 6, 5, 7, 5, 5, 7, 6, 4, 4, 6, 6, 9, 6, 6, 7, 6, 4, 5, 4, 6, 5, 8, 6, 6, 5, 8, 8, 7, 8, 7, 6, 7, 9, 7, 6, 8, 5, 12, 9, 7, 7, 8, 7, 6, 6, 7, 6, 9, 8, 8, 7, 6, 5, 5, 6, 6, 6, 6, 6, 6, 6, 
-font.dialoginput.bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Impact.height=14
-font.Showcard\ Gothic.widths=7, 8, 7, 10, 7, 6, 8, 9, 5, 6, 8, 6, 10, 9, 9, 8, 9, 8, 7, 7, 9, 7, 11, 8, 7, 7, 7, 8, 7, 10, 7, 6, 8, 9, 5, 6, 8, 6, 10, 9, 9, 8, 9, 8, 7, 7, 9, 7, 11, 8, 7, 7, 7, 5, 6, 6, 7, 6, 6, 6, 7, 7, 
-font.Felix\ Titling.widths=8, 7, 9, 9, 6, 6, 9, 8, 4, 4, 9, 6, 10, 9, 9, 6, 9, 9, 6, 7, 9, 8, 11, 8, 7, 8, 8, 7, 9, 9, 6, 6, 9, 8, 4, 4, 9, 6, 10, 9, 9, 6, 9, 9, 6, 7, 9, 8, 11, 8, 7, 8, 7, 4, 6, 7, 6, 7, 7, 6, 7, 7, 
-font.Arial\ Black.height=15
-font.Comic\ Sans\ MS\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Stencil.height=11
-font.Gill\ Sans\ MT\ Condensed.height=13
-font.Tw\ Cen\ MT\ Medium\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.French\ Script\ MT.widths=4, 4, 4, 4, 4, 3, 5, 5, 3, 3, 5, 3, 6, 4, 4, 4, 4, 3, 4, 3, 4, 4, 5, 4, 4, 4, 6, 8, 6, 8, 6, 7, 6, 9, 6, 6, 9, 7, 11, 10, 7, 6, 7, 8, 7, 6, 8, 8, 9, 7, 8, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Symbol.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Book\ Antiqua\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G1.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Felix\ Titling.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua\ Bold\ Italic.height=14
-font.Arial\ Special\ G1\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Condensed\ Extra\ Bold.height=12
-font.Century\ Schoolbook\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Calisto\ MT.widths=4, 6, 4, 5, 4, 3, 5, 6, 3, 3, 5, 3, 9, 6, 6, 6, 5, 4, 4, 3, 6, 6, 8, 5, 5, 5, 8, 7, 8, 8, 6, 6, 9, 8, 3, 5, 8, 6, 10, 8, 9, 5, 9, 7, 6, 5, 8, 7, 11, 7, 8, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.dialoginput.bolditalic.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Pristina.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G1\ Bold.height=14
-font.serif.bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Kristen\ ITC.height=15
-font.Lucida\ Bright\ Demibold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Special\ G2.widths=8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Palatino\ Linotype.height=14
-font.dialoginput.plain.height=14
-font.Times\ New\ Roman\ Special\ G2.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Kunstler\ Script.height=12
-font.Book\ Antiqua.widths=5, 6, 4, 6, 5, 4, 6, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 4, 3, 6, 6, 8, 5, 6, 5, 8, 7, 7, 8, 6, 6, 8, 8, 4, 4, 8, 6, 10, 8, 8, 6, 8, 7, 6, 7, 8, 8, 10, 7, 7, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Times\ New\ Roman.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Medium.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Mercurius\ Script\ MT\ Bold.height=12
-font.Tw\ Cen\ MT\ Condensed.height=12
-font.Monotype\ Sorts\ 2.widths=11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 
-font.sansserif.bold.height=14
-font.Elephant\ Italic.height=14
-font.dialoginput.italic.height=14
-font.Tahoma\ Bold.height=14
-font.Rockwell\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT\ Italic.height=14
-font.serif.bold.widths=5, 6, 4, 6, 4, 4, 5, 6, 3, 3, 5, 3, 8, 6, 5, 6, 6, 4, 4, 3, 6, 5, 7, 6, 5, 3, 7, 7, 7, 7, 7, 6, 8, 8, 4, 5, 8, 7, 9, 7, 8, 6, 9, 7, 6, 7, 7, 7, 10, 7, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Baskerville\ Old\ Face.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Abadi\ MT\ Condensed.height=12
-font.Copperplate\ Gothic\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Snap\ ITC.widths=7, 7, 7, 7, 7, 7, 8, 7, 6, 5, 8, 5, 9, 7, 7, 7, 7, 7, 7, 7, 8, 8, 11, 9, 8, 7, 10, 9, 9, 9, 9, 9, 10, 10, 6, 9, 9, 8, 12, 10, 9, 9, 9, 9, 9, 8, 9, 9, 12, 10, 10, 9, 9, 6, 9, 9, 10, 9, 9, 9, 10, 9, 
-font.Rockwell\ Extra\ Bold.widths=8, 8, 7, 8, 7, 5, 8, 8, 4, 4, 7, 4, 12, 8, 8, 8, 8, 5, 6, 5, 8, 7, 10, 7, 7, 7, 8, 9, 8, 9, 8, 7, 8, 9, 5, 4, 9, 7, 11, 9, 9, 8, 9, 9, 6, 8, 7, 8, 11, 10, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bradley\ Hand\ ITC.height=13
-font.Imprint\ MT\ Shadow.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G2.height=16
-font.Arial\ Narrow\ Special\ G2.height=16
-font.Bitstream\ Vera\ Sans\ Oblique.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Elephant.widths=7, 7, 6, 7, 6, 5, 6, 7, 4, 4, 7, 4, 10, 8, 7, 7, 7, 6, 6, 5, 8, 6, 9, 6, 6, 6, 8, 10, 9, 10, 10, 9, 10, 11, 6, 8, 10, 9, 12, 10, 10, 9, 10, 10, 8, 9, 10, 8, 13, 9, 8, 9, 9, 6, 8, 8, 8, 8, 8, 7, 8, 8, 
-font.Eurostile\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Gigi.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Imprint\ MT\ Shadow.height=13
-font.Monotype\ Corsiva.widths=5, 5, 4, 5, 4, 4, 6, 5, 3, 3, 5, 3, 7, 6, 5, 5, 5, 4, 4, 4, 6, 5, 8, 5, 5, 5, 7, 7, 6, 8, 7, 7, 7, 8, 5, 5, 8, 7, 9, 8, 7, 7, 7, 7, 6, 6, 8, 7, 10, 7, 7, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Matisse\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookman\ Old\ Style.widths=6, 6, 6, 6, 6, 5, 6, 7, 4, 4, 7, 4, 10, 7, 7, 7, 6, 5, 5, 5, 7, 6, 10, 6, 6, 6, 7, 8, 7, 8, 7, 7, 8, 8, 4, 7, 8, 7, 11, 8, 8, 7, 8, 8, 7, 8, 8, 8, 11, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Perpetua.height=13
-font.Franklin\ Gothic\ Book.height=13
-font.Gloucester\ MT\ Extra\ Condensed.widths=4, 5, 4, 5, 4, 3, 4, 5, 3, 3, 5, 3, 6, 5, 5, 5, 5, 4, 4, 3, 5, 4, 6, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 3, 4, 5, 4, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Ransom\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans\ Mono.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Garamond\ Italic.height=14
-font.Colonna\ MT.height=12
-font.Gill\ Sans\ MT\ Ext\ Condensed\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Calisto\ MT\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Edda.widths=9, 10, 9, 10, 8, 9, 9, 10, 5, 5, 9, 8, 13, 9, 8, 10, 9, 9, 8, 8, 9, 9, 14, 9, 10, 9, 9, 9, 9, 10, 9, 9, 10, 10, 5, 6, 10, 8, 11, 10, 10, 9, 10, 9, 9, 9, 10, 9, 12, 9, 8, 9, 9, 5, 8, 8, 8, 8, 8, 7, 8, 8, 
-font.Palace\ Script\ MT.height=10
-font.Bitstream\ Vera\ Serif.height=13
-font.Onyx.widths=5, 5, 5, 5, 5, 3, 5, 5, 3, 3, 5, 3, 7, 5, 5, 5, 5, 5, 4, 4, 5, 5, 7, 5, 5, 4, 5, 5, 5, 5, 4, 4, 5, 5, 3, 4, 5, 4, 7, 6, 5, 5, 5, 6, 5, 5, 5, 5, 7, 5, 5, 5, 5, 3, 4, 4, 5, 5, 5, 4, 5, 5, 
-font.Playbill.widths=4, 4, 3, 4, 3, 3, 3, 4, 2, 2, 4, 2, 5, 4, 3, 4, 4, 3, 3, 3, 4, 4, 5, 4, 4, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 6, 5, 4, 4, 4, 5, 4, 4, 4, 4, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Bookman\ Old\ Style\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Vladimir\ Script.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tempus\ Sans\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Algerian.height=14
-font.Arial\ Narrow\ Special\ G1\ Italic.height=14
-font.Cooper\ Black.height=13
-font.Chiller.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Fax\ Italic.height=14
-font.Bitstream\ Vera\ Sans\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Informal\ Roman.height=13
-font.Kunstler\ Script.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.monospaced.plain.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Script\ MT\ Bold.widths=5, 4, 4, 5, 4, 4, 5, 5, 2, 4, 5, 3, 7, 5, 4, 6, 5, 4, 4, 3, 5, 4, 7, 6, 5, 5, 7, 8, 6, 8, 5, 6, 6, 9, 6, 5, 8, 6, 10, 9, 6, 7, 6, 8, 6, 7, 8, 7, 10, 7, 8, 6, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Juice\ ITC.widths=5, 5, 4, 5, 4, 4, 4, 5, 3, 3, 4, 3, 6, 5, 4, 5, 5, 4, 4, 4, 5, 4, 6, 4, 5, 4, 5, 4, 4, 4, 4, 4, 4, 5, 3, 4, 4, 4, 5, 5, 5, 4, 5, 4, 4, 4, 5, 5, 5, 5, 4, 4, 5, 3, 4, 4, 4, 4, 5, 4, 4, 5, 
-font.Calisto\ MT\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Georgia\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tahoma.widths=6, 6, 5, 6, 6, 4, 6, 6, 3, 4, 7, 3, 9, 6, 6, 6, 6, 5, 5, 4, 6, 6, 9, 6, 6, 5, 8, 7, 7, 8, 6, 6, 7, 8, 5, 5, 7, 6, 9, 7, 8, 7, 8, 7, 6, 7, 7, 7, 10, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Special\ G2\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bookshelf\ Symbol\ 4.widths=9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 
-font.Tw\ Cen\ MT\ Bold\ Italic.height=14
-font.High\ Tower\ Text\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Demibold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Enviro.widths=5, 5, 6, 5, 6, 4, 6, 5, 3, 3, 5, 4, 9, 5, 5, 5, 6, 4, 5, 4, 6, 5, 7, 4, 5, 6, 7, 8, 7, 7, 8, 6, 7, 7, 3, 7, 8, 8, 8, 7, 8, 8, 8, 8, 9, 7, 7, 7, 9, 6, 8, 7, 7, 3, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Edwardian\ Script\ ITC.height=13
-font.Gigi.height=15
-font.Abadi\ MT\ Condensed\ Light.widths=5, 5, 5, 5, 5, 3, 5, 5, 3, 3, 5, 3, 7, 5, 5, 5, 5, 4, 5, 3, 5, 5, 6, 5, 5, 5, 5, 6, 5, 6, 5, 5, 5, 6, 3, 4, 5, 5, 7, 6, 6, 6, 6, 6, 5, 5, 6, 5, 7, 6, 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Goudy\ Old\ Style\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Heavy.height=13
-font.Stop.widths=7, 6, 6, 7, 6, 6, 7, 6, 4, 5, 6, 5, 9, 7, 8, 6, 8, 6, 6, 6, 7, 7, 9, 7, 7, 6, 7, 6, 6, 7, 6, 6, 7, 6, 4, 5, 6, 5, 9, 7, 8, 6, 8, 6, 6, 6, 7, 7, 9, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Andy\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Haettenschweiler.widths=5, 5, 5, 5, 5, 4, 5, 5, 3, 3, 5, 3, 7, 5, 5, 5, 5, 5, 5, 4, 5, 5, 7, 5, 5, 5, 5, 5, 5, 5, 4, 4, 5, 5, 3, 5, 5, 4, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 7, 6, 5, 5, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Maiandra\ GD.widths=5, 6, 5, 6, 5, 4, 5, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 4, 4, 6, 6, 9, 5, 6, 5, 8, 7, 7, 8, 6, 6, 8, 9, 4, 5, 7, 5, 10, 8, 9, 6, 9, 7, 5, 7, 8, 7, 11, 7, 7, 6, 6, 4, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Franklin\ Gothic\ Heavy\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.sansserif.bolditalic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.dialoginput.italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Ransom\ Bold.height=14
-font.Britannic\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Edwardian\ Script\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Trebuchet\ MS\ Italic.height=14
-font.Californian\ FB.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Baskerville\ Old\ Face.height=11
-font.Times\ New\ Roman\ Special\ G1\ Bold\ Italic.height=14
-font.Californian\ FB\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Book\ Antiqua\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bernard\ MT\ Condensed.widths=6, 6, 5, 6, 5, 4, 6, 6, 4, 4, 6, 4, 8, 6, 6, 6, 6, 5, 4, 4, 6, 5, 7, 5, 5, 5, 6, 6, 5, 6, 5, 5, 6, 7, 4, 4, 6, 5, 7, 6, 6, 6, 6, 6, 5, 6, 5, 6, 8, 6, 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Lucida\ Bright\ Demibold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans\ Mono\ Oblique.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Freestyle\ Script.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Schoolbook.widths=7, 7, 5, 7, 6, 4, 6, 7, 4, 4, 7, 4, 10, 7, 6, 7, 7, 5, 6, 5, 7, 6, 9, 6, 6, 6, 8, 8, 8, 9, 8, 8, 9, 9, 5, 7, 9, 8, 10, 9, 9, 8, 9, 8, 7, 8, 9, 8, 11, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Typewriter\ Oblique.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Mistral.height=11
-font.Bitstream\ Vera\ Sans\ Bold\ Oblique.height=14
-font.Arial\ Special\ G2\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Georgia\ Ref.height=13
-font.Bitstream\ Vera\ Sans\ Mono\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Ransom.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookshelf\ Symbol\ 1.height=13
-font.Century\ Gothic\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Gothic.height=14
-font.Wingdings\ 2.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT.widths=5, 6, 5, 6, 6, 3, 5, 6, 3, 3, 6, 3, 10, 6, 6, 6, 6, 4, 4, 4, 6, 5, 8, 6, 5, 5, 8, 7, 8, 8, 6, 6, 8, 8, 3, 3, 7, 6, 9, 8, 9, 7, 9, 7, 6, 7, 8, 7, 12, 8, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Ransom\ Bold\ Italic.height=14
-font.Times\ New\ Roman\ Special\ G1\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Monotype\ Sorts.height=10
-font.Book\ Antiqua.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Maiandra\ GD\ Demi\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Franklin\ Gothic\ Heavy\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Castellar.height=13
-font.sansserif.plain.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.OpenSymbol.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G1\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Gradl.widths=4, 4, 3, 4, 3, 2, 4, 4, 2, 2, 4, 2, 5, 4, 4, 4, 4, 3, 3, 3, 4, 3, 4, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, 4, 6, 4, 5, 4, 4, 4, 4, 4, 5, 4, 6, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
-font.Arial\ Narrow\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Parade.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.ProFont.height=14
-font.Perpetua\ Bold.height=14
-font.Wingdings\ 3.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Calisto\ MT\ Italic.height=14
-font.Lucida\ Bright\ Regular.height=14
-font.Bell\ MT\ Italic.height=14
-font.Kristen\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Typewriter\ Bold\ Oblique.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Demi\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rage\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Georgia\ Italic.height=14
-font.MS\ Outlook.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Goudy\ Old\ Style\ Italic.height=14
-font.Lucida\ Sans\ Typewriter\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua\ Titling\ MT\ Light.height=14
-font.Footlight\ MT\ Light.widths=6, 6, 5, 6, 5, 4, 6, 7, 4, 4, 6, 4, 9, 7, 6, 6, 6, 5, 5, 4, 7, 6, 9, 6, 6, 5, 7, 6, 7, 8, 6, 5, 8, 8, 4, 4, 7, 6, 10, 8, 8, 6, 8, 6, 5, 6, 8, 7, 11, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Augsburger\ Initials.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Courier\ New\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.monospaced.bolditalic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookman\ Old\ Style\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Gothic\ Bold.height=14
-font.Vladimir\ Script.height=13
-font.Franklin\ Gothic\ Demi\ Cond.height=13
-font.Century\ Schoolbook\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Narrow\ Bold.height=14
-font.Times\ New\ Roman\ Special\ G1.widths=8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.OpenSymbol.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Wide\ Latin.height=11
-font.Showcard\ Gothic.height=14
-font.Californian\ FB.widths=4, 6, 5, 5, 5, 4, 6, 5, 3, 3, 6, 3, 7, 5, 5, 6, 5, 5, 4, 4, 5, 5, 8, 5, 5, 5, 7, 6, 7, 7, 7, 6, 7, 8, 4, 4, 7, 6, 10, 8, 7, 6, 7, 7, 5, 6, 8, 7, 11, 7, 6, 7, 5, 4, 5, 5, 6, 5, 5, 5, 5, 5, 
-font.Tw\ Cen\ MT\ Bold.height=14
-font.Bitstream\ Vera\ Sans.widths=7, 7, 6, 7, 7, 4, 7, 7, 3, 3, 7, 3, 11, 7, 7, 7, 7, 5, 6, 5, 7, 7, 9, 7, 7, 5, 9, 7, 7, 8, 6, 6, 8, 8, 3, 3, 7, 6, 9, 8, 8, 7, 8, 8, 7, 7, 8, 9, 11, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Palatino\ Linotype\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.sansserif.italic.widths=7, 7, 6, 7, 7, 4, 7, 7, 4, 3, 6, 4, 8, 7, 7, 7, 7, 4, 6, 4, 7, 6, 9, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 3, 6, 8, 7, 9, 8, 9, 8, 9, 8, 8, 7, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Footlight\ MT\ Light.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow\ Italic.height=14
-font.monospaced.italic.height=14
-font.Book\ Antiqua\ Italic.height=14
-font.Arial\ Narrow.widths=5, 5, 5, 5, 5, 3, 5, 5, 2, 2, 5, 2, 7, 5, 5, 5, 5, 4, 5, 3, 5, 5, 6, 5, 5, 4, 6, 6, 6, 6, 5, 5, 6, 6, 2, 5, 6, 5, 7, 6, 6, 5, 6, 6, 5, 5, 6, 5, 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Lucida\ Bright\ Demibold\ Italic.height=14
-font.Times\ New\ Roman.widths=5, 6, 4, 6, 4, 4, 5, 6, 3, 3, 5, 3, 8, 6, 5, 6, 6, 4, 4, 3, 6, 5, 7, 6, 5, 3, 7, 7, 7, 7, 7, 6, 8, 8, 4, 5, 8, 7, 9, 7, 8, 6, 9, 7, 6, 7, 7, 7, 10, 7, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Arial.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Handwriting\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Sans\ Unicode.height=16
-font.Ravie.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.serif.italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Andy\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Schoolbook\ Bold.height=14
-font.Times\ New\ Roman\ Special\ G2\ Italic.height=14
-font.Arial\ Special\ G1.height=16
-font.Arial\ Narrow\ Special\ G1.height=16
-font.Bookman\ Old\ Style\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Special\ G2.height=16
-font.Rockwell\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Gothic\ Bold\ Italic.height=14
-font.sansserif.plain.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Tw\ Cen\ MT\ Medium.height=14
-font.Parchment.height=12
-font.Bitstream\ Vera\ Serif\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Informal\ Roman.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Fax\ Regular.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Ransom\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow\ Special\ G1\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Showcard\ Gothic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.OCRB.widths=7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Jokerman.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Colonna\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Eras\ Light\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Fax\ Regular.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Copperplate\ Gothic\ Bold.widths=7, 7, 7, 7, 6, 6, 7, 7, 4, 5, 7, 6, 9, 7, 7, 7, 7, 7, 6, 4, 7, 7, 9, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 9, 4, 6, 8, 7, 9, 9, 9, 8, 9, 8, 7, 6, 8, 7, 13, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Pepita\ MT.widths=5, 5, 4, 6, 4, 4, 6, 5, 3, 4, 5, 4, 7, 5, 4, 6, 5, 4, 4, 4, 5, 5, 8, 6, 5, 6, 10, 9, 8, 11, 6, 9, 10, 9, 5, 5, 11, 8, 12, 9, 9, 9, 12, 9, 9, 9, 10, 9, 12, 9, 9, 11, 5, 4, 6, 5, 7, 6, 5, 6, 6, 7, 
-font.Eras\ Bold\ ITC.widths=6, 7, 5, 7, 6, 4, 7, 7, 3, 3, 6, 3, 9, 7, 6, 7, 7, 4, 5, 4, 7, 6, 9, 6, 6, 5, 8, 7, 7, 8, 7, 6, 8, 8, 3, 5, 8, 6, 9, 8, 9, 6, 9, 7, 6, 6, 8, 8, 11, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Franklin\ Gothic\ Demi.widths=5, 5, 5, 5, 5, 3, 6, 5, 3, 3, 5, 3, 8, 5, 5, 5, 5, 3, 5, 4, 5, 5, 7, 5, 4, 4, 6, 7, 6, 6, 6, 6, 6, 6, 3, 4, 6, 5, 9, 6, 6, 6, 6, 7, 6, 5, 7, 6, 9, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Rockwell\ Extra\ Bold.height=13
-font.monospaced.plain.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Centaur.widths=5, 6, 5, 6, 5, 4, 5, 6, 3, 3, 6, 3, 8, 6, 6, 6, 6, 4, 4, 4, 6, 5, 7, 5, 5, 5, 7, 6, 7, 8, 7, 6, 8, 9, 5, 5, 7, 7, 10, 9, 8, 6, 8, 8, 6, 8, 8, 8, 11, 8, 8, 7, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Tw\ Cen\ MT\ Condensed\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Harlow\ Solid\ Italic\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Calligraphy\ Italic.height=14
-font.Palatino\ Linotype\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Courier\ New\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.dialoginput.bold.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Broadway.height=13
-font.Franklin\ Gothic\ Book\ Italic.height=14
-font.Marlett.height=10
-font.Trebuchet\ MS.height=13
-font.Arial\ Narrow\ Special\ G2\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Webdings.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Monotype\ Corsiva.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.High\ Tower\ Text.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gloucester\ MT\ Extra\ Condensed.height=13
-font.Rage\ Italic.height=14
-font.Abadi\ MT\ Condensed\ Extra\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookshelf\ Symbol\ 3.widths=7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Braggadocio.height=10
-font.Microsoft\ Sans\ Serif.widths=7, 7, 6, 7, 7, 4, 7, 7, 3, 3, 6, 3, 9, 7, 7, 7, 7, 4, 6, 4, 7, 7, 9, 6, 6, 6, 8, 8, 8, 9, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 6, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Curlz\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Goudy\ Stout.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.sansserif.bolditalic.widths=6, 6, 6, 6, 6, 3, 6, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 6, 3, 6, 6, 8, 6, 6, 5, 7, 7, 7, 7, 7, 6, 8, 7, 3, 6, 7, 6, 9, 7, 8, 7, 8, 7, 7, 6, 7, 7, 9, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Bookshelf\ Symbol\ 5.height=13
-font.Edda.height=16
-font.Vivaldi\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bookshelf\ Symbol\ 1.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Georgia.height=13
-font.Bell\ MT\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Franklin\ Gothic\ Medium\ Cond.height=13
-font.Bookman\ Old\ Style.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Augsburger\ Initials.height=12
-font.Beesknees\ ITC.widths=7, 7, 6, 7, 6, 6, 7, 7, 4, 4, 7, 5, 8, 7, 8, 6, 8, 7, 5, 5, 7, 7, 9, 7, 7, 7, 9, 8, 7, 8, 7, 7, 8, 8, 5, 5, 8, 6, 10, 8, 9, 7, 9, 8, 6, 6, 8, 9, 10, 9, 8, 8, 9, 5, 7, 6, 7, 6, 8, 6, 7, 8, 
-font.Perpetua\ Titling\ MT\ Light.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bell\ MT.height=12
-font.Arial\ Narrow\ Special\ G1\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G2\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Juice\ ITC.height=13
-font.Trebuchet\ MS\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Rounded\ MT\ Bold.widths=6, 6, 6, 6, 6, 3, 6, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 5, 4, 6, 5, 8, 5, 5, 5, 7, 7, 7, 7, 7, 6, 8, 8, 3, 6, 7, 6, 8, 8, 8, 7, 8, 7, 7, 6, 8, 7, 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Arial\ Special\ G2\ Italic.height=14
-font.Chiller.height=13
-font.Gill\ Sans\ MT\ Bold\ Italic.height=14
-font.Bookshelf\ Symbol\ 2.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Abadi\ MT\ Condensed\ Light.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Demibold\ Italic.height=14
-font.Ransom\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Goudy\ Stout.widths=14, 13, 11, 12, 13, 13, 13, 16, 11, 12, 16, 13, 18, 13, 13, 12, 11, 15, 11, 14, 14, 13, 18, 14, 14, 14, 14, 13, 11, 12, 13, 13, 13, 16, 11, 12, 16, 13, 18, 13, 13, 12, 11, 15, 11, 14, 14, 13, 18, 14, 14, 14, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 
-font.Trebuchet\ MS\ Bold\ Italic.height=14
-font.Elephant\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow\ Special\ G2\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Pacmania.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Broadway.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Pristina.widths=5, 5, 4, 5, 4, 3, 5, 5, 3, 2, 5, 2, 7, 5, 4, 5, 5, 4, 4, 3, 5, 5, 6, 5, 5, 4, 7, 8, 7, 8, 8, 7, 7, 9, 6, 6, 9, 6, 11, 8, 8, 7, 8, 8, 6, 7, 9, 8, 11, 8, 8, 6, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Courier\ New.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Abadi\ MT\ Condensed\ Extra\ Bold.widths=4, 5, 4, 5, 5, 3, 5, 5, 3, 3, 4, 3, 7, 5, 5, 5, 5, 3, 4, 3, 5, 4, 6, 4, 4, 4, 5, 5, 4, 5, 5, 4, 5, 5, 3, 3, 5, 4, 6, 5, 6, 5, 6, 5, 5, 5, 5, 5, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Copperplate\ Gothic\ Light.widths=7, 7, 8, 8, 7, 7, 8, 8, 4, 6, 7, 7, 8, 8, 9, 7, 9, 7, 7, 6, 8, 7, 10, 7, 6, 6, 8, 9, 9, 9, 8, 8, 9, 9, 4, 7, 8, 8, 10, 9, 10, 8, 10, 9, 8, 8, 9, 8, 12, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.dialog.plain.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Poor\ Richard.height=13
-font.Franklin\ Gothic\ Medium.widths=6, 6, 6, 6, 6, 4, 6, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 6, 4, 6, 5, 8, 5, 5, 5, 7, 7, 7, 8, 6, 6, 7, 7, 4, 5, 7, 6, 9, 8, 7, 7, 7, 7, 7, 6, 7, 6, 10, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.serif.bolditalic.height=14
-font.Bookshelf\ Symbol\ 3.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Comic\ Sans\ MS\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Bright\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Runic\ MT\ Condensed.widths=5, 5, 5, 5, 5, 3, 5, 5, 3, 3, 4, 3, 7, 5, 5, 5, 5, 5, 5, 3, 5, 5, 7, 5, 5, 4, 5, 6, 6, 6, 6, 4, 6, 6, 3, 5, 5, 6, 7, 6, 6, 6, 6, 5, 5, 5, 6, 5, 7, 5, 5, 5, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 
-font.Perpetua\ Titling\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ Ultra\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana.height=14
-font.Goudy\ Old\ Style.height=13
-font.monospaced.bolditalic.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Goudy\ Old\ Style.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans\ Mono\ Oblique.height=14
-font.Modern\ No.\ 20.height=12
-font.Matura\ MT\ Script\ Capitals.widths=6, 6, 5, 6, 5, 5, 6, 6, 4, 4, 6, 4, 8, 6, 6, 6, 6, 5, 6, 4, 6, 6, 9, 6, 6, 6, 14, 12, 10, 14, 9, 13, 9, 9, 9, 13, 13, 13, 16, 15, 13, 10, 12, 11, 10, 10, 12, 13, 15, 15, 12, 14, 8, 5, 6, 5, 7, 6, 6, 6, 6, 6, 
-font.Viner\ Hand\ ITC.height=17
-font.Forte.height=15
-font.Placard\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Medium.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Placard\ Condensed.widths=5, 5, 5, 5, 5, 3, 5, 5, 3, 3, 5, 3, 6, 5, 5, 5, 5, 3, 4, 3, 5, 4, 6, 5, 4, 3, 5, 5, 5, 5, 4, 4, 5, 5, 3, 3, 5, 4, 6, 5, 5, 5, 5, 5, 5, 4, 5, 5, 6, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Jokerman.widths=7, 7, 6, 7, 7, 4, 7, 8, 4, 4, 7, 4, 9, 7, 7, 7, 7, 6, 5, 5, 7, 6, 8, 7, 7, 7, 9, 8, 8, 8, 7, 6, 9, 8, 4, 7, 8, 8, 10, 10, 9, 8, 9, 8, 7, 8, 9, 8, 12, 9, 8, 8, 8, 5, 7, 8, 8, 7, 7, 7, 7, 8, 
-font.Franklin\ Gothic\ Heavy.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Black.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Harrington.widths=6, 6, 6, 7, 6, 4, 6, 6, 4, 4, 6, 4, 8, 6, 7, 7, 6, 5, 6, 4, 7, 6, 8, 5, 7, 6, 8, 8, 7, 8, 8, 7, 8, 8, 4, 4, 7, 7, 9, 8, 8, 8, 8, 8, 7, 6, 8, 7, 10, 7, 7, 7, 7, 4, 6, 6, 7, 6, 6, 5, 6, 6, 
-font.Felix\ Titling.height=13
-font.Comic\ Sans\ MS\ Bold.height=14
-font.Papyrus.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Curlz\ MT.widths=5, 5, 5, 5, 5, 4, 5, 6, 3, 3, 5, 3, 8, 6, 6, 6, 6, 5, 4, 4, 6, 5, 8, 5, 5, 5, 7, 7, 6, 8, 6, 6, 7, 8, 4, 5, 7, 6, 9, 9, 8, 7, 8, 7, 6, 6, 8, 7, 10, 7, 8, 6, 6, 4, 5, 5, 6, 6, 6, 5, 5, 6, 
-font.Century\ Schoolbook\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT\ Ext\ Condensed\ Bold.widths=3, 3, 2, 3, 3, 2, 3, 3, 1, 2, 3, 2, 4, 3, 3, 3, 3, 2, 2, 2, 3, 3, 4, 3, 3, 2, 3, 3, 3, 3, 2, 2, 3, 3, 2, 2, 3, 2, 4, 3, 3, 3, 3, 3, 2, 3, 3, 3, 5, 3, 3, 2, 3, 2, 2, 2, 3, 2, 3, 2, 3, 3, 
-font.French\ Script\ MT.height=13
-font.Tw\ Cen\ MT\ Condensed\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Freestyle\ Script.widths=3, 3, 4, 4, 4, 5, 6, 6, 2, 3, 5, 4, 4, 4, 4, 3, 5, 3, 4, 4, 5, 4, 6, 3, 4, 3, 5, 4, 5, 6, 5, 5, 5, 6, 4, 5, 6, 4, 6, 6, 5, 5, 5, 6, 5, 6, 6, 6, 7, 5, 5, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 4, 
-font.Lucida\ Sans\ Demibold\ Roman.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bookshelf\ Symbol\ 4.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Goudy\ Old\ Style\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Braggadocio.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Regular.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gloucester\ MT\ Extra\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G2\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Fax\ Demibold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Special\ G1\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Perpetua\ Titling\ MT\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Century\ Schoolbook\ Bold\ Italic.height=14
-font.Calisto\ MT.height=13
-font.Lucida\ Sans\ Demibold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.dialoginput.bolditalic.height=14
-font.Poor\ Richard.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Ravie.widths=9, 9, 8, 9, 8, 8, 9, 9, 6, 8, 9, 5, 13, 9, 8, 9, 9, 9, 8, 9, 9, 9, 12, 9, 10, 9, 10, 9, 8, 9, 10, 9, 9, 10, 6, 9, 11, 9, 14, 9, 9, 9, 9, 12, 9, 10, 10, 11, 14, 10, 10, 10, 8, 6, 9, 9, 11, 9, 9, 8, 8, 9, 
-font.Arial\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.MT\ Extra.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Bitstream\ Vera\ Sans\ Mono\ Bold\ Oblique.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Eras\ Medium\ ITC.widths=6, 7, 6, 7, 6, 4, 7, 7, 3, 3, 6, 3, 10, 7, 7, 7, 7, 5, 5, 4, 7, 6, 9, 6, 6, 5, 8, 7, 7, 8, 7, 6, 8, 8, 3, 5, 7, 6, 10, 9, 9, 6, 9, 7, 6, 6, 8, 8, 11, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Bright\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Bright\ Demibold.height=14
-font.Pepita\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Wingdings.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookshelf\ Symbol\ 5.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.dialoginput.bolditalic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Book\ Antiqua.height=13
-font.Franklin\ Gothic\ Demi\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Comic\ Sans\ MS.widths=6, 6, 5, 6, 6, 5, 5, 6, 3, 4, 5, 3, 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 7, 6, 6, 5, 7, 6, 6, 7, 6, 6, 7, 8, 5, 7, 6, 6, 9, 8, 8, 5, 9, 6, 7, 7, 7, 7, 10, 7, 6, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Desdemona.widths=6, 6, 6, 6, 6, 6, 7, 7, 3, 5, 6, 6, 8, 7, 8, 6, 7, 6, 6, 6, 7, 6, 7, 6, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 3, 5, 6, 6, 8, 7, 8, 6, 7, 6, 6, 6, 7, 6, 7, 6, 5, 6, 5, 3, 5, 6, 5, 5, 5, 5, 5, 6, 
-font.sansserif.italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Wingdings\ 3.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.High\ Tower\ Text.widths=5, 7, 5, 6, 5, 5, 6, 7, 4, 4, 6, 4, 10, 7, 6, 7, 6, 5, 6, 4, 7, 6, 9, 6, 6, 6, 9, 7, 9, 9, 7, 6, 9, 8, 4, 5, 8, 7, 10, 9, 10, 7, 10, 7, 7, 8, 9, 9, 11, 8, 8, 9, 6, 4, 5, 5, 6, 5, 6, 6, 6, 6, 
-font.Monotype\ Sorts\ 2.height=13
-font.Bookman\ Old\ Style\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Engravers\ MT.widths=10, 10, 10, 11, 9, 9, 11, 11, 6, 8, 11, 9, 12, 11, 11, 9, 11, 11, 9, 10, 11, 10, 13, 11, 11, 9, 10, 10, 10, 11, 9, 9, 11, 11, 6, 8, 11, 9, 12, 11, 11, 9, 11, 11, 9, 10, 11, 10, 13, 11, 11, 9, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Special\ G1\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Maiandra\ GD.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G1\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Eurostile.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.serif.bold.height=14
-font.High\ Tower\ Text\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.dialog.bold.widths=6, 6, 6, 6, 6, 3, 6, 6, 3, 4, 6, 3, 9, 6, 6, 6, 6, 4, 6, 3, 6, 7, 9, 6, 5, 5, 7, 7, 7, 7, 7, 6, 8, 7, 3, 6, 7, 6, 9, 7, 8, 7, 8, 7, 7, 5, 7, 7, 9, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Book\ Antiqua\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Snap\ ITC.height=14
-font.Trebuchet\ MS\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rockwell\ Condensed.widths=5, 5, 4, 5, 4, 3, 5, 5, 3, 3, 5, 3, 8, 5, 5, 5, 5, 3, 4, 3, 5, 4, 6, 4, 4, 4, 6, 5, 5, 6, 5, 5, 5, 6, 4, 3, 6, 5, 7, 6, 6, 5, 5, 5, 4, 5, 5, 6, 7, 6, 6, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-font.Cooper\ Black.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G2\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ Ultra\ Bold.widths=7, 8, 6, 8, 7, 6, 8, 8, 4, 5, 8, 4, 12, 8, 7, 8, 8, 7, 6, 6, 8, 7, 10, 8, 7, 7, 10, 9, 8, 9, 7, 7, 9, 10, 4, 6, 9, 7, 11, 9, 9, 8, 9, 9, 7, 7, 9, 8, 12, 10, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 
-font.Bitstream\ Vera\ Serif.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans\ Oblique.height=14
-font.Elephant.height=13
-font.Eurostile\ Bold.height=14
-font.American\ Uncial.widths=8, 7, 7, 9, 8, 8, 8, 8, 4, 6, 7, 5, 13, 8, 8, 8, 8, 8, 6, 7, 8, 8, 12, 9, 8, 8, 8, 7, 7, 9, 8, 8, 8, 8, 4, 6, 7, 5, 13, 8, 8, 8, 8, 8, 6, 7, 8, 8, 12, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Arial\ Narrow\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Centaur.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Monotype\ Corsiva.height=12
-font.Bookman\ Old\ Style.height=13
-font.Wingdings.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Lucida\ Sans\ Demibold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT\ Condensed.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans\ Mono.height=13
-font.Times\ New\ Roman.height=13
-font.Arial\ Narrow\ Special\ G2\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Matura\ MT\ Script\ Capitals.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Calisto\ MT\ Bold.height=14
-font.Bitstream\ Vera\ Sans\ Mono\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.serif.italic.widths=6, 6, 5, 6, 5, 4, 6, 6, 4, 4, 5, 4, 8, 6, 6, 6, 6, 5, 5, 4, 6, 5, 8, 5, 5, 5, 7, 7, 8, 8, 7, 7, 8, 8, 4, 5, 8, 7, 9, 8, 8, 7, 8, 7, 6, 7, 8, 7, 10, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Bauhaus\ 93.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.dialog.bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Onyx.height=11
-font.Playbill.height=11
-font.Tahoma\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Handwriting\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Tahoma.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.monospaced.italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Calisto\ MT\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Georgia\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Georgia\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Kino\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.monospaced.plain.height=14
-font.Eurostile.widths=6, 6, 6, 6, 6, 4, 6, 6, 3, 3, 5, 3, 9, 6, 6, 6, 6, 5, 6, 4, 6, 5, 8, 5, 5, 5, 7, 7, 7, 8, 6, 6, 7, 8, 3, 6, 7, 6, 10, 8, 7, 7, 8, 7, 7, 6, 8, 7, 11, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Sans\ Regular.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Script\ MT\ Bold.height=13
-font.Tahoma.height=13
-font.Bookshelf\ Symbol\ 4.height=13
-font.dialog.bolditalic.widths=6, 6, 6, 6, 6, 3, 6, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 6, 3, 6, 6, 8, 6, 6, 5, 7, 7, 7, 7, 7, 6, 8, 7, 3, 6, 7, 6, 9, 7, 8, 7, 8, 7, 7, 6, 7, 7, 9, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Rockwell\ Extra\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Maiandra\ GD\ Demi\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Enviro.height=13
-font.Abadi\ MT\ Condensed\ Light.height=12
-font.Centaur.height=12
-font.Tw\ Cen\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Garamond.widths=5, 6, 5, 5, 5, 3, 5, 6, 3, 3, 5, 3, 8, 6, 5, 6, 5, 3, 4, 3, 6, 5, 7, 5, 5, 5, 7, 7, 7, 8, 7, 6, 7, 8, 4, 4, 7, 6, 9, 7, 8, 6, 8, 7, 5, 6, 7, 6, 9, 6, 7, 7, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Bell\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Maiandra\ GD\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Stop.height=9
-font.Andy\ Bold.height=14
-font.Palatino\ Linotype.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Symbol.widths=7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Courier\ New\ Bold.height=14
-font.Haettenschweiler.height=12
-font.Maiandra\ GD.height=13
-font.Franklin\ Gothic\ Heavy\ Italic.height=14
-font.dialoginput.bold.height=14
-font.OCR\ A\ Extended.widths=7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Verdana\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.MT\ Extra.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Italic.height=14
-font.Script\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Georgia\ Ref.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Sans\ Typewriter\ Regular.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bookman\ Old\ Style\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.sansserif.bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Trebuchet\ MS\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Californian\ FB\ Italic.height=14
-font.Bernard\ MT\ Condensed.height=13
-font.Arial\ Special\ G1\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Comic\ Sans\ MS.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Parade.widths=6, 7, 6, 7, 6, 4, 6, 7, 4, 4, 6, 4, 9, 7, 6, 6, 7, 5, 5, 4, 7, 7, 9, 7, 8, 6, 8, 7, 7, 8, 7, 7, 8, 8, 4, 7, 7, 6, 10, 8, 8, 7, 7, 7, 7, 7, 8, 9, 11, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bookman\ Old\ Style\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Jester\ Regular.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Century\ Schoolbook.height=13
-font.Lucida\ Sans\ Typewriter\ Oblique.height=14
-font.Eurostile\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans\ Mono\ Bold.height=14
-font.Garamond\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Medium\ Cond.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.dialoginput.plain.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana\ Ref.widths=8, 8, 6, 8, 8, 5, 8, 8, 4, 4, 8, 4, 12, 8, 8, 8, 8, 5, 7, 5, 8, 7, 8, 8, 7, 7, 8, 8, 9, 9, 7, 7, 9, 9, 6, 6, 8, 7, 10, 8, 10, 8, 10, 9, 8, 8, 9, 8, 12, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Papyrus.widths=6, 8, 6, 7, 7, 5, 6, 7, 4, 4, 6, 4, 10, 7, 7, 6, 7, 5, 5, 5, 7, 5, 6, 5, 6, 5, 11, 10, 11, 11, 11, 8, 11, 11, 4, 8, 10, 8, 11, 10, 13, 8, 12, 9, 11, 11, 11, 9, 12, 9, 9, 9, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.OCRB.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Matisse\ ITC.widths=5, 5, 6, 5, 5, 5, 5, 5, 3, 5, 7, 5, 12, 8, 5, 5, 5, 5, 5, 5, 6, 9, 10, 5, 5, 5, 5, 5, 4, 5, 4, 5, 5, 5, 3, 5, 6, 5, 9, 7, 5, 6, 6, 6, 4, 6, 5, 5, 7, 7, 8, 5, 6, 4, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Arial\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Special\ G2\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tempus\ Sans\ ITC.widths=5, 6, 5, 6, 6, 4, 6, 6, 4, 4, 6, 4, 10, 7, 7, 6, 6, 4, 4, 5, 7, 6, 8, 6, 6, 5, 9, 6, 7, 8, 6, 6, 8, 9, 4, 5, 8, 6, 10, 9, 9, 7, 9, 7, 5, 6, 8, 8, 11, 7, 7, 7, 8, 5, 7, 6, 7, 6, 6, 6, 6, 6, 
-font.Gill\ Sans\ MT.height=13
-font.Arial\ Narrow\ Special\ G1\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gill\ Sans\ MT\ Bold.height=14
-font.Century\ Gothic\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Onyx.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Modern\ No.\ 20.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Maiandra\ GD\ Demi\ Bold.height=14
-font.Garamond.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Condensed\ Extra\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Georgia\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Sans\ Italic.height=14
-font.Bitstream\ Vera\ Sans\ Bold\ Oblique.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.serif.plain.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rockwell\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Special\ G1\ Italic.height=14
-font.Gradl.height=11
-font.Book\ Antiqua\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Calisto\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rockwell\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Palatino\ Linotype\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Goudy\ Stout.height=15
-font.Algerian.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Eras\ Bold\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Stop.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Engravers\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Courier\ New\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Ransom.widths=6, 7, 5, 7, 5, 4, 3, 5, 5, 3, 6, 3, 6, 6, 7, 6, 5, 4, 4, 3, 6, 4, 8, 16, 4, 9, 6, 6, 8, 8, 4, 11, 7, 8, 5, 6, 8, 7, 6, 9, 6, 3, 9, 5, 7, 8, 5, 5, 11, 8, 5, 9, 8, 4, 4, 5, 4, 4, 3, 8, 10, 7, 
-font.Gill\ Sans\ MT\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Pristina.height=13
-font.Old\ English\ Text\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Courier\ New.height=12
-font.Arial\ Narrow\ Special\ G1.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Verdana\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Eras\ Medium\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Garamond\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.MS\ Outlook.height=12
-font.serif.bolditalic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Gradl.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Eras\ Light\ ITC.widths=6, 7, 6, 7, 6, 4, 7, 7, 3, 3, 5, 3, 9, 7, 7, 7, 7, 4, 5, 4, 7, 6, 9, 5, 5, 5, 7, 7, 7, 8, 6, 6, 8, 8, 3, 5, 6, 6, 9, 8, 9, 6, 9, 6, 5, 6, 8, 7, 11, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Palace\ Script\ MT.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Footlight\ MT\ Light.height=10
-font.Courier\ New\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Tw\ Cen\ MT\ Medium\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Brush\ Script\ MT\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Century\ Schoolbook\ Italic.height=14
-font.Times\ New\ Roman\ Special\ G1.height=16
-font.OpenSymbol.height=14
-font.Bitstream\ Vera\ Sans\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Placard\ Condensed.height=14
-font.Californian\ FB.height=13
-font.Bell\ MT\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Century\ Gothic\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Wingdings\ 2.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Britannic\ Bold.widths=5, 5, 5, 5, 5, 3, 5, 6, 3, 3, 5, 3, 8, 6, 5, 5, 5, 4, 5, 3, 6, 4, 7, 5, 5, 4, 5, 6, 6, 7, 5, 5, 6, 7, 3, 4, 6, 5, 7, 6, 6, 6, 6, 6, 5, 5, 6, 5, 8, 6, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.dialog.italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bitstream\ Vera\ Sans.height=13
-font.Arial\ Narrow\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Palatino\ Linotype\ Bold.height=14
-font.Goudy\ Old\ Style\ Bold.height=14
-font.sansserif.italic.height=14
-font.Arial\ Black\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Perpetua\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Enviro.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua\ Titling\ MT\ Bold.height=14
-font.Eras\ Demi\ ITC.widths=6, 6, 5, 6, 6, 3, 6, 6, 3, 3, 5, 3, 9, 6, 6, 6, 6, 4, 4, 4, 6, 5, 9, 6, 5, 5, 8, 7, 6, 8, 6, 6, 8, 8, 3, 5, 7, 5, 9, 8, 8, 6, 8, 6, 5, 6, 8, 7, 11, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Arial\ Narrow.height=13
-font.Blackadder\ ITC.widths=5, 5, 4, 5, 4, 4, 5, 5, 3, 4, 5, 3, 6, 5, 4, 5, 5, 4, 4, 4, 6, 5, 6, 5, 5, 5, 9, 9, 9, 9, 9, 7, 9, 10, 6, 7, 11, 8, 13, 9, 9, 8, 11, 10, 8, 6, 11, 10, 12, 11, 9, 10, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5, 
-font.Times\ New\ Roman\ Bold\ Italic.height=14
-font.monospaced.bold.widths=6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.monospaced.bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rockwell\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Lucida\ Sans\ Typewriter\ Bold\ Oblique.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Haettenschweiler.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.American\ Uncial.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookman\ Old\ Style\ Italic.height=14
-font.Calisto\ MT\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.sansserif.plain.height=14
-font.Comic\ Sans\ MS.height=14
-font.Bitstream\ Vera\ Serif\ Bold.height=14
-font.Arial\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Tw\ Cen\ MT\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Rockwell\ Condensed\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Georgia\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bookshelf\ Symbol\ 2.widths=5, 5, 5, 7, 7, 9, 7, 7, 3, 3, 4, 3, 10, 5, 9, 9, 9, 9, 6, 4, 7, 9, 6, 4, 4, 5, 7, 9, 6, 7, 7, 9, 7, 8, 9, 9, 5, 7, 10, 7, 9, 9, 9, 4, 6, 8, 8, 9, 9, 9, 9, 7, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-font.serif.plain.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Narrow\ Special\ G1\ Bold.height=14
-font.Arial\ Special\ G1\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.OCRB.height=15
-font.Lucida\ Fax\ Regular.height=14
-font.Copperplate\ Gothic\ Bold.height=12
-font.Maiandra\ GD\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Special\ G2\ Bold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Brush\ Script\ MT\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Book\ Antiqua\ Bold.height=14
-font.Pepita\ MT.height=12
-font.Eras\ Bold\ ITC.height=13
-font.Franklin\ Gothic\ Demi.height=13
-font.Courier\ New\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Tw\ Cen\ MT\ Condensed\ Bold.height=14
-font.Harlow\ Solid\ Italic\ Italic.height=14
-font.Century\ Schoolbook\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Courier\ New\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Times\ New\ Roman\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Palatino\ Linotype\ Italic.height=14
-font.Monotype\ Sorts.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Fax\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Franklin\ Gothic\ Medium\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Impact.widths=6, 6, 6, 6, 6, 4, 6, 6, 4, 4, 6, 4, 8, 6, 6, 6, 6, 5, 6, 4, 6, 6, 8, 4, 5, 5, 6, 7, 7, 7, 5, 5, 7, 7, 4, 4, 6, 5, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 5, 6, 5, 6, 6, 6, 6, 6, 5, 6, 6, 
-font.Arial\ Special\ G2\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Courier\ New.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Arial\ Narrow\ Special\ G2\ Bold.height=14
-font.Times\ New\ Roman\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Lucida\ Bright\ Demibold\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Webdings.height=10
-font.Arial\ Black.widths=8, 8, 8, 8, 8, 5, 8, 8, 4, 4, 8, 4, 11, 8, 8, 8, 8, 5, 7, 5, 8, 7, 10, 8, 7, 7, 9, 9, 9, 9, 8, 8, 9, 9, 5, 8, 9, 8, 10, 9, 9, 8, 9, 9, 8, 8, 9, 9, 11, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Lucida\ Console.widths=7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Elephant.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Stencil.widths=7, 8, 7, 7, 7, 7, 7, 9, 5, 6, 8, 6, 9, 8, 7, 7, 7, 8, 7, 7, 8, 7, 9, 7, 7, 6, 7, 8, 7, 7, 7, 7, 7, 9, 5, 6, 8, 6, 9, 8, 7, 7, 7, 8, 7, 7, 8, 7, 9, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Gill\ Sans\ MT\ Condensed.widths=4, 5, 4, 5, 4, 3, 4, 5, 3, 3, 4, 3, 6, 5, 4, 5, 5, 4, 4, 3, 5, 4, 5, 4, 4, 4, 5, 5, 4, 5, 5, 4, 5, 5, 3, 3, 5, 4, 6, 5, 5, 5, 5, 5, 4, 4, 5, 4, 7, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Georgia.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Eras\ Demi\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bookshelf\ Symbol\ 3.height=14
-font.Microsoft\ Sans\ Serif.height=13
-font.Arial\ Italic.height=14
-font.Mercurius\ Script\ MT\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.sansserif.bolditalic.height=14
-font.serif.italic.height=14
-font.Vivaldi\ Italic.height=14
-font.Pacmania.widths=9, 8, 8, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Lucida\ Fax\ Demibold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.ProFont.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Tw\ Cen\ MT\ Condensed\ Extra\ Bold.widths=5, 5, 3, 5, 4, 3, 5, 5, 3, 3, 5, 3, 7, 5, 5, 5, 5, 3, 4, 3, 5, 4, 6, 5, 4, 4, 5, 5, 4, 5, 4, 4, 6, 6, 3, 4, 5, 4, 7, 6, 6, 5, 6, 5, 4, 4, 6, 6, 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Arial.widths=6, 6, 6, 6, 6, 3, 6, 6, 3, 4, 6, 3, 9, 6, 6, 6, 6, 4, 6, 3, 6, 7, 9, 6, 5, 5, 7, 7, 7, 7, 7, 6, 8, 7, 3, 6, 7, 6, 9, 7, 8, 7, 8, 7, 7, 5, 7, 7, 9, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Bell\ MT\ Bold.height=14
-font.Calisto\ MT\ Bold\ Italic.height=14
-font.Times\ New\ Roman\ Special\ G1\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Beesknees\ ITC.height=13
-font.Verdana\ Bold.height=14
-font.Kristen\ ITC.widths=7, 7, 7, 7, 7, 6, 6, 7, 4, 4, 7, 4, 9, 7, 7, 7, 7, 5, 6, 6, 7, 6, 9, 7, 5, 6, 10, 8, 9, 10, 8, 7, 9, 10, 5, 7, 9, 8, 12, 10, 10, 8, 10, 8, 7, 8, 10, 8, 11, 8, 8, 10, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Palatino\ Linotype.widths=5, 6, 5, 6, 5, 4, 6, 6, 3, 3, 6, 3, 9, 6, 6, 6, 6, 4, 4, 3, 6, 5, 8, 5, 5, 5, 8, 7, 7, 8, 6, 6, 8, 8, 4, 4, 8, 6, 10, 8, 8, 7, 8, 7, 6, 8, 8, 8, 10, 7, 6, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.dialoginput.plain.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Kunstler\ Script.widths=4, 4, 3, 4, 3, 3, 4, 5, 3, 3, 4, 3, 7, 5, 3, 5, 4, 3, 3, 3, 4, 4, 6, 4, 5, 4, 9, 10, 9, 10, 8, 8, 11, 9, 7, 6, 9, 9, 9, 9, 8, 8, 8, 10, 7, 8, 9, 8, 10, 8, 8, 8, 4, 4, 5, 4, 4, 4, 4, 4, 4, 4, 
-font.Lucida\ Sans\ Typewriter\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Arial\ Rounded\ MT\ Bold.height=13
-font.Arial\ Black\ Italic.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Mercurius\ Script\ MT\ Bold.widths=6, 6, 4, 6, 4, 4, 6, 5, 4, 4, 5, 4, 8, 5, 5, 6, 6, 4, 4, 4, 6, 5, 8, 6, 6, 5, 8, 8, 7, 8, 7, 7, 7, 9, 5, 7, 8, 7, 11, 9, 7, 8, 7, 8, 6, 8, 9, 7, 11, 8, 8, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Webdings.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Jester\ Regular.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.sansserif.bold.widths=6, 6, 6, 6, 6, 3, 6, 6, 3, 4, 6, 3, 9, 6, 6, 6, 6, 4, 6, 3, 6, 7, 9, 6, 5, 5, 7, 7, 7, 7, 7, 6, 8, 7, 3, 6, 7, 6, 9, 7, 8, 7, 8, 7, 7, 5, 7, 7, 9, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.Desdemona.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Ransom\ Italic.height=14
-font.Elephant\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Verdana\ Bold\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Tahoma\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Palatino\ Linotype\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Times\ New\ Roman\ Special\ G2\ Bold.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Garamond.height=12
-font.Gill\ Sans\ MT\ Italic.widths=7, 7, 7, 7, 7, 4, 7, 7, 4, 4, 5, 4, 10, 7, 7, 7, 7, 4, 5, 4, 7, 6, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8, 4, 6, 8, 7, 10, 8, 9, 8, 9, 8, 8, 8, 8, 8, 10, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-font.Bitstream\ Vera\ Sans\ Oblique.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Maiandra\ GD\ Italic.height=14
-font.Abadi\ MT\ Condensed\ Extra\ Bold.height=12
-font.Copperplate\ Gothic\ Light.height=12
-font.Lucida\ Bright\ Regular.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Bradley\ Hand\ ITC.widths=6, 6, 5, 6, 5, 5, 7, 6, 4, 4, 7, 4, 10, 7, 5, 6, 7, 5, 5, 4, 7, 6, 8, 6, 7, 6, 8, 8, 7, 7, 7, 6, 8, 8, 4, 4, 8, 7, 10, 9, 8, 7, 8, 8, 8, 7, 8, 7, 11, 7, 8, 10, 6, 6, 7, 7, 7, 7, 7, 7, 6, 6, 
-font.dialog.plain.height=14
-font.Arial\ Special\ G2.widths=8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-font.Franklin\ Gothic\ Medium.height=13
-font.Arial\ Narrow\ Special\ G2.widths=10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-font.Lucida\ Bright\ Italic.height=14
-font.Runic\ MT\ Condensed.height=12
-font.Imprint\ MT\ Shadow.widths=5, 7, 5, 7, 5, 4, 6, 7, 4, 4, 6, 4, 10, 7, 6, 7, 7, 5, 5, 4, 7, 6, 9, 6, 6, 5, 8, 8, 8, 10, 8, 8, 9, 10, 5, 5, 9, 8, 10, 9, 9, 8, 9, 9, 7, 8, 9, 8, 11, 9, 8, 8, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 
-font.monospaced.bolditalic.height=14
-font.Verdana\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua.widths=5, 6, 5, 6, 5, 3, 5, 6, 3, 3, 6, 3, 8, 6, 6, 6, 6, 4, 4, 3, 6, 5, 8, 6, 5, 5, 7, 6, 6, 7, 5, 5, 7, 8, 4, 4, 7, 5, 9, 7, 7, 5, 7, 7, 5, 6, 7, 6, 9, 7, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-font.Matura\ MT\ Script\ Capitals.height=14
-font.Parade.height=12
-font.Jester\ Regular.height=14
-font.Blackadder\ ITC.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Goudy\ Old\ Style\ Bold.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-font.Perpetua\ Italic.height=14
-font.Arial\ Narrow\ Special\ G2.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
-
-font.Something.height=13
-font.Something.characters=a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-font.Something.widths=6, 6, 6, 6, 6, 3, 6, 6, 3, 4, 6, 3, 9, 6, 6, 6, 6, 4, 6, 3, 6, 7, 9, 6, 5, 5, 7, 7, 7, 7, 7, 6, 8, 7, 3, 6, 7, 6, 9, 7, 8, 7, 8, 7, 7, 5, 7, 7, 9, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
diff --git a/trunk/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml b/trunk/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
deleted file mode 100644
index 4a3a070..0000000
--- a/trunk/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
+++ /dev/null
@@ -1,19906 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<presetShapeDefinitons>
-  <accentBorderCallout1>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 112500" />
-
-      <gd name="adj4" fmla="val -38333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <close />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </accentBorderCallout1>
-  <accentBorderCallout2>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 112500" />
-
-      <gd name="adj6" fmla="val -46667" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <close />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </accentBorderCallout2>
-  <accentBorderCallout3>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 100000" />
-
-      <gd name="adj6" fmla="val -16667" />
-
-      <gd name="adj7" fmla="val 112963" />
-
-      <gd name="adj8" fmla="val -8333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-      <gd name="y4" fmla="*/ h adj7 100000" />
-      <gd name="x4" fmla="*/ w adj8 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-      <ahXY gdRefX="adj8" minX="-2147483647" maxX="2147483647" gdRefY="adj7" minY="-2147483647" maxY="2147483647">
-        <pos x="x4" y="y4" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <close />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </accentBorderCallout3>
-  <accentCallout1>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 112500" />
-
-      <gd name="adj4" fmla="val -38333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <close />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </accentCallout1>
-  <accentCallout2>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 112500" />
-
-      <gd name="adj6" fmla="val -46667" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <close />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </accentCallout2>
-  <accentCallout3>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 100000" />
-
-      <gd name="adj6" fmla="val -16667" />
-
-      <gd name="adj7" fmla="val 112963" />
-
-      <gd name="adj8" fmla="val -8333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-      <gd name="y4" fmla="*/ h adj7 100000" />
-      <gd name="x4" fmla="*/ w adj8 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-      <ahXY gdRefX="adj8" minX="-2147483647" maxX="2147483647" gdRefY="adj7" minY="-2147483647" maxY="2147483647">
-        <pos x="x4" y="y4" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <close />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </accentCallout3>
-  <actionButtonBackPrevious>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-    </gdLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g11" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g11" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g11" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </actionButtonBackPrevious>
-  <actionButtonBeginning>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 1 8" />
-      <gd name="g15" fmla="*/ g13 1 4" />
-      <gd name="g16" fmla="+- g11 g14 0" />
-      <gd name="g17" fmla="+- g11 g15 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g17" y="vc" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g16" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g16" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g17" y="vc" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g16" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g16" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g17" y="vc" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g16" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g16" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonBeginning>
-  <actionButtonBlank>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonBlank>
-  <actionButtonDocument>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="dx1" fmla="*/ ss 9 32" />
-      <gd name="g11" fmla="+- hc 0 dx1" />
-      <gd name="g12" fmla="+- hc dx1 0" />
-      <gd name="g13" fmla="*/ ss 3 16" />
-      <gd name="g14" fmla="+- g12 0 g13" />
-      <gd name="g15" fmla="+- g9 g13 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g11" y="g9" />
-        </moveTo>
-        <lnTo>
-          <pt x="g14" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g15" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="g11" y="g9" />
-        </moveTo>
-        <lnTo>
-          <pt x="g14" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g14" y="g15" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g15" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g14" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g14" y="g15" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g15" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g11" y="g9" />
-        </moveTo>
-        <lnTo>
-          <pt x="g14" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g15" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g12" y="g15" />
-        </moveTo>
-        <lnTo>
-          <pt x="g14" y="g15" />
-        </lnTo>
-        <lnTo>
-          <pt x="g14" y="g9" />
-        </lnTo>
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonDocument>
-  <actionButtonEnd>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 3 4" />
-      <gd name="g15" fmla="*/ g13 7 8" />
-      <gd name="g16" fmla="+- g11 g14 0" />
-      <gd name="g17" fmla="+- g11 g15 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g16" y="vc" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g17" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g17" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g16" y="vc" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g17" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g17" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g16" y="vc" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g17" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g12" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g17" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonEnd>
-  <actionButtonForwardNext>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-    </gdLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g12" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g12" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g12" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g11" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g9" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </actionButtonForwardNext>
-  <actionButtonHelp>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 1 7" />
-      <gd name="g15" fmla="*/ g13 3 14" />
-      <gd name="g16" fmla="*/ g13 2 7" />
-      <gd name="g19" fmla="*/ g13 3 7" />
-      <gd name="g20" fmla="*/ g13 4 7" />
-      <gd name="g21" fmla="*/ g13 17 28" />
-      <gd name="g23" fmla="*/ g13 21 28" />
-      <gd name="g24" fmla="*/ g13 11 14" />
-      <gd name="g27" fmla="+- g9 g16 0" />
-      <gd name="g29" fmla="+- g9 g21 0" />
-      <gd name="g30" fmla="+- g9 g23 0" />
-      <gd name="g31" fmla="+- g9 g24 0" />
-      <gd name="g33" fmla="+- g11 g15 0" />
-      <gd name="g36" fmla="+- g11 g19 0" />
-      <gd name="g37" fmla="+- g11 g20 0" />
-      <gd name="g41" fmla="*/ g13 1 14" />
-      <gd name="g42" fmla="*/ g13 3 28" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g33" y="g27" />
-        </moveTo>
-
-        <arcTo wR="g16" hR="g16" stAng="cd2" swAng="cd2" />
-        <arcTo wR="g14" hR="g15" stAng="0" swAng="cd4" />
-        <arcTo wR="g41" hR="g42" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="g37" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g29" />
-        </lnTo>
-        <arcTo wR="g14" hR="g15" stAng="cd2" swAng="cd4" />
-        <arcTo wR="g41" hR="g42" stAng="cd4" swAng="-5400000" />
-        <arcTo wR="g14" hR="g14" stAng="0" swAng="-10800000" />
-        <close />
-        <moveTo>
-          <pt x="hc" y="g31" />
-        </moveTo>
-
-        <arcTo wR="g42" hR="g42" stAng="3cd4" swAng="21600000" />
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g33" y="g27" />
-        </moveTo>
-
-        <arcTo wR="g16" hR="g16" stAng="cd2" swAng="cd2" />
-        <arcTo wR="g14" hR="g15" stAng="0" swAng="cd4" />
-        <arcTo wR="g41" hR="g42" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="g37" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g29" />
-        </lnTo>
-        <arcTo wR="g14" hR="g15" stAng="cd2" swAng="cd4" />
-        <arcTo wR="g41" hR="g42" stAng="cd4" swAng="-5400000" />
-        <arcTo wR="g14" hR="g14" stAng="0" swAng="-10800000" />
-        <close />
-        <moveTo>
-          <pt x="hc" y="g31" />
-        </moveTo>
-
-        <arcTo wR="g42" hR="g42" stAng="3cd4" swAng="21600000" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g33" y="g27" />
-        </moveTo>
-
-        <arcTo wR="g16" hR="g16" stAng="cd2" swAng="cd2" />
-        <arcTo wR="g14" hR="g15" stAng="0" swAng="cd4" />
-        <arcTo wR="g41" hR="g42" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="g37" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g29" />
-        </lnTo>
-        <arcTo wR="g14" hR="g15" stAng="cd2" swAng="cd4" />
-        <arcTo wR="g41" hR="g42" stAng="cd4" swAng="-5400000" />
-        <arcTo wR="g14" hR="g14" stAng="0" swAng="-10800000" />
-        <close />
-        <moveTo>
-          <pt x="hc" y="g31" />
-        </moveTo>
-
-        <arcTo wR="g42" hR="g42" stAng="3cd4" swAng="21600000" />
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonHelp>
-  <actionButtonHome>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 1 16" />
-      <gd name="g15" fmla="*/ g13 1 8" />
-      <gd name="g16" fmla="*/ g13 3 16" />
-      <gd name="g17" fmla="*/ g13 5 16" />
-      <gd name="g18" fmla="*/ g13 7 16" />
-      <gd name="g19" fmla="*/ g13 9 16" />
-      <gd name="g20" fmla="*/ g13 11 16" />
-      <gd name="g21" fmla="*/ g13 3 4" />
-      <gd name="g22" fmla="*/ g13 13 16" />
-      <gd name="g23" fmla="*/ g13 7 8" />
-      <gd name="g24" fmla="+- g9 g14 0" />
-      <gd name="g25" fmla="+- g9 g16 0" />
-      <gd name="g26" fmla="+- g9 g17 0" />
-      <gd name="g27" fmla="+- g9 g21 0" />
-      <gd name="g28" fmla="+- g11 g15 0" />
-      <gd name="g29" fmla="+- g11 g18 0" />
-      <gd name="g30" fmla="+- g11 g19 0" />
-      <gd name="g31" fmla="+- g11 g20 0" />
-      <gd name="g32" fmla="+- g11 g22 0" />
-      <gd name="g33" fmla="+- g11 g23 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="hc" y="g9" />
-        </moveTo>
-        <lnTo>
-          <pt x="g11" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g28" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g28" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g26" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g24" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g24" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g25" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="g32" y="g26" />
-        </moveTo>
-        <lnTo>
-          <pt x="g32" y="g24" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g24" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g25" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g28" y="vc" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g28" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g29" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g29" y="g27" />
-        </lnTo>
-        <lnTo>
-          <pt x="g30" y="g27" />
-        </lnTo>
-        <lnTo>
-          <pt x="g30" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="hc" y="g9" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="vc" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g29" y="g27" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g30" y="g27" />
-        </lnTo>
-        <lnTo>
-          <pt x="g30" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g29" y="g10" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="hc" y="g9" />
-        </moveTo>
-        <lnTo>
-          <pt x="g31" y="g25" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g24" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g24" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g26" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g28" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g28" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="vc" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g31" y="g25" />
-        </moveTo>
-        <lnTo>
-          <pt x="g32" y="g26" />
-        </lnTo>
-
-        <moveTo>
-          <pt x="g33" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g28" y="vc" />
-        </lnTo>
-
-        <moveTo>
-          <pt x="g29" y="g10" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g29" y="g27" />
-        </lnTo>
-        <lnTo>
-          <pt x="g30" y="g27" />
-        </lnTo>
-        <lnTo>
-          <pt x="g30" y="g10" />
-        </lnTo>
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonHome>
-  <actionButtonInformation>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 1 32" />
-      <gd name="g17" fmla="*/ g13 5 16" />
-      <gd name="g18" fmla="*/ g13 3 8" />
-      <gd name="g19" fmla="*/ g13 13 32" />
-      <gd name="g20" fmla="*/ g13 19 32" />
-      <gd name="g22" fmla="*/ g13 11 16" />
-      <gd name="g23" fmla="*/ g13 13 16" />
-      <gd name="g24" fmla="*/ g13 7 8" />
-      <gd name="g25" fmla="+- g9 g14 0" />
-      <gd name="g28" fmla="+- g9 g17 0" />
-      <gd name="g29" fmla="+- g9 g18 0" />
-      <gd name="g30" fmla="+- g9 g23 0" />
-      <gd name="g31" fmla="+- g9 g24 0" />
-      <gd name="g32" fmla="+- g11 g17 0" />
-      <gd name="g34" fmla="+- g11 g19 0" />
-      <gd name="g35" fmla="+- g11 g20 0" />
-      <gd name="g37" fmla="+- g11 g22 0" />
-      <gd name="g38" fmla="*/ g13 3 32" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="hc" y="g9" />
-        </moveTo>
-
-        <arcTo wR="dx2" hR="dx2" stAng="3cd4" swAng="21600000" />
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="hc" y="g9" />
-        </moveTo>
-
-        <arcTo wR="dx2" hR="dx2" stAng="3cd4" swAng="21600000" />
-        <close />
-        <moveTo>
-          <pt x="hc" y="g25" />
-        </moveTo>
-
-        <arcTo wR="g38" hR="g38" stAng="3cd4" swAng="21600000" />
-        <moveTo>
-          <pt x="g32" y="g28" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g32" y="g29" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g29" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g31" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g31" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g28" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="lighten" extrusionOk="false">
-        <moveTo>
-          <pt x="hc" y="g25" />
-        </moveTo>
-
-        <arcTo wR="g38" hR="g38" stAng="3cd4" swAng="21600000" />
-        <moveTo>
-          <pt x="g32" y="g28" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g35" y="g28" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g31" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g31" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g29" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g29" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="hc" y="g9" />
-        </moveTo>
-
-        <arcTo wR="dx2" hR="dx2" stAng="3cd4" swAng="21600000" />
-        <close />
-        <moveTo>
-          <pt x="hc" y="g25" />
-        </moveTo>
-
-        <arcTo wR="g38" hR="g38" stAng="3cd4" swAng="21600000" />
-        <moveTo>
-          <pt x="g32" y="g28" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g35" y="g28" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g31" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g31" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g30" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g29" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g29" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonInformation>
-  <actionButtonMovie>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 1455 21600" />
-      <gd name="g15" fmla="*/ g13 1905 21600" />
-      <gd name="g16" fmla="*/ g13 2325 21600" />
-      <gd name="g17" fmla="*/ g13 16155 21600" />
-      <gd name="g18" fmla="*/ g13 17010 21600" />
-      <gd name="g19" fmla="*/ g13 19335 21600" />
-      <gd name="g20" fmla="*/ g13 19725 21600" />
-      <gd name="g21" fmla="*/ g13 20595 21600" />
-      <gd name="g22" fmla="*/ g13 5280 21600" />
-      <gd name="g23" fmla="*/ g13 5730 21600" />
-      <gd name="g24" fmla="*/ g13 6630 21600" />
-      <gd name="g25" fmla="*/ g13 7492 21600" />
-      <gd name="g26" fmla="*/ g13 9067 21600" />
-      <gd name="g27" fmla="*/ g13 9555 21600" />
-      <gd name="g28" fmla="*/ g13 13342 21600" />
-      <gd name="g29" fmla="*/ g13 14580 21600" />
-      <gd name="g30" fmla="*/ g13 15592 21600" />
-      <gd name="g31" fmla="+- g11 g14 0" />
-      <gd name="g32" fmla="+- g11 g15 0" />
-      <gd name="g33" fmla="+- g11 g16 0" />
-      <gd name="g34" fmla="+- g11 g17 0" />
-      <gd name="g35" fmla="+- g11 g18 0" />
-      <gd name="g36" fmla="+- g11 g19 0" />
-      <gd name="g37" fmla="+- g11 g20 0" />
-      <gd name="g38" fmla="+- g11 g21 0" />
-      <gd name="g39" fmla="+- g9 g22 0" />
-      <gd name="g40" fmla="+- g9 g23 0" />
-      <gd name="g41" fmla="+- g9 g24 0" />
-      <gd name="g42" fmla="+- g9 g25 0" />
-      <gd name="g43" fmla="+- g9 g26 0" />
-      <gd name="g44" fmla="+- g9 g27 0" />
-      <gd name="g45" fmla="+- g9 g28 0" />
-      <gd name="g46" fmla="+- g9 g29 0" />
-      <gd name="g47" fmla="+- g9 g30 0" />
-      <gd name="g48" fmla="+- g9 g31 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g11" y="g39" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g44" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g44" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g43" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g43" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g47" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g47" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g45" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g45" />
-        </lnTo>
-        <lnTo>
-          <pt x="g38" y="g46" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g46" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g38" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g42" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g42" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g40" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g40" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g39" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g11" y="g39" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g44" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g44" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g43" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g43" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g47" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g47" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g45" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g45" />
-        </lnTo>
-        <lnTo>
-          <pt x="g38" y="g46" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g46" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g38" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g42" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g42" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g40" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g40" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g39" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g11" y="g39" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g31" y="g39" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g40" />
-        </lnTo>
-        <lnTo>
-          <pt x="g34" y="g40" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g42" />
-        </lnTo>
-        <lnTo>
-          <pt x="g37" y="g42" />
-        </lnTo>
-        <lnTo>
-          <pt x="g38" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g41" />
-        </lnTo>
-        <lnTo>
-          <pt x="g12" y="g46" />
-        </lnTo>
-        <lnTo>
-          <pt x="g38" y="g46" />
-        </lnTo>
-        <lnTo>
-          <pt x="g36" y="g45" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g45" />
-        </lnTo>
-        <lnTo>
-          <pt x="g35" y="g47" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g47" />
-        </lnTo>
-        <lnTo>
-          <pt x="g33" y="g43" />
-        </lnTo>
-        <lnTo>
-          <pt x="g32" y="g43" />
-        </lnTo>
-        <lnTo>
-          <pt x="g31" y="g44" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g44" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonMovie>
-  <actionButtonReturn>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 7 8" />
-      <gd name="g15" fmla="*/ g13 3 4" />
-      <gd name="g16" fmla="*/ g13 5 8" />
-      <gd name="g17" fmla="*/ g13 3 8" />
-      <gd name="g18" fmla="*/ g13 1 4" />
-      <gd name="g19" fmla="+- g9 g15 0" />
-      <gd name="g20" fmla="+- g9 g16 0" />
-      <gd name="g21" fmla="+- g9 g18 0" />
-      <gd name="g22" fmla="+- g11 g14 0" />
-      <gd name="g23" fmla="+- g11 g15 0" />
-      <gd name="g24" fmla="+- g11 g16 0" />
-      <gd name="g25" fmla="+- g11 g17 0" />
-      <gd name="g26" fmla="+- g11 g18 0" />
-      <gd name="g27" fmla="*/ g13 1 8" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g12" y="g21" />
-        </moveTo>
-        <lnTo>
-          <pt x="g23" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g20" />
-        </lnTo>
-        <arcTo wR="g27" hR="g27" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="g25" y="g19" />
-        </lnTo>
-        <arcTo wR="g27" hR="g27" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="g26" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g20" />
-        </lnTo>
-        <arcTo wR="g17" hR="g17" stAng="cd2" swAng="-5400000" />
-        <lnTo>
-          <pt x="hc" y="g10" />
-        </lnTo>
-        <arcTo wR="g17" hR="g17" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="g22" y="g21" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g12" y="g21" />
-        </moveTo>
-        <lnTo>
-          <pt x="g23" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g20" />
-        </lnTo>
-        <arcTo wR="g27" hR="g27" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="g25" y="g19" />
-        </lnTo>
-        <arcTo wR="g27" hR="g27" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="g26" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g20" />
-        </lnTo>
-        <arcTo wR="g17" hR="g17" stAng="cd2" swAng="-5400000" />
-        <lnTo>
-          <pt x="hc" y="g10" />
-        </lnTo>
-        <arcTo wR="g17" hR="g17" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="g22" y="g21" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g12" y="g21" />
-        </moveTo>
-        <lnTo>
-          <pt x="g22" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g22" y="g20" />
-        </lnTo>
-        <arcTo wR="g17" hR="g17" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="g25" y="g10" />
-        </lnTo>
-        <arcTo wR="g17" hR="g17" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="g11" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g26" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g26" y="g20" />
-        </lnTo>
-        <arcTo wR="g27" hR="g27" stAng="cd2" swAng="-5400000" />
-        <lnTo>
-          <pt x="hc" y="g19" />
-        </lnTo>
-        <arcTo wR="g27" hR="g27" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="g24" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g23" y="g9" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonReturn>
-  <actionButtonSound>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx2" fmla="*/ ss 3 8" />
-      <gd name="g9" fmla="+- vc 0 dx2" />
-      <gd name="g10" fmla="+- vc dx2 0" />
-      <gd name="g11" fmla="+- hc 0 dx2" />
-      <gd name="g12" fmla="+- hc dx2 0" />
-      <gd name="g13" fmla="*/ ss 3 4" />
-      <gd name="g14" fmla="*/ g13 1 8" />
-      <gd name="g15" fmla="*/ g13 5 16" />
-      <gd name="g16" fmla="*/ g13 5 8" />
-      <gd name="g17" fmla="*/ g13 11 16" />
-      <gd name="g18" fmla="*/ g13 3 4" />
-      <gd name="g19" fmla="*/ g13 7 8" />
-      <gd name="g20" fmla="+- g9 g14 0" />
-      <gd name="g21" fmla="+- g9 g15 0" />
-      <gd name="g22" fmla="+- g9 g17 0" />
-      <gd name="g23" fmla="+- g9 g19 0" />
-      <gd name="g24" fmla="+- g11 g15 0" />
-      <gd name="g25" fmla="+- g11 g16 0" />
-      <gd name="g26" fmla="+- g11 g18 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g11" y="g21" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g22" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g22" />
-        </lnTo>
-        <lnTo>
-          <pt x="g25" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g25" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g21" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-        <moveTo>
-          <pt x="g11" y="g21" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g11" y="g22" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g22" />
-        </lnTo>
-        <lnTo>
-          <pt x="g25" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g25" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g21" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="g11" y="g21" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="g24" y="g21" />
-        </lnTo>
-        <lnTo>
-          <pt x="g25" y="g9" />
-        </lnTo>
-        <lnTo>
-          <pt x="g25" y="g10" />
-        </lnTo>
-        <lnTo>
-          <pt x="g24" y="g22" />
-        </lnTo>
-        <lnTo>
-          <pt x="g11" y="g22" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="g26" y="g21" />
-        </moveTo>
-        <lnTo>
-          <pt x="g12" y="g20" />
-        </lnTo>
-        <moveTo>
-          <pt x="g26" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="g12" y="vc" />
-        </lnTo>
-        <moveTo>
-          <pt x="g26" y="g22" />
-        </moveTo>
-        <lnTo>
-          <pt x="g12" y="g23" />
-        </lnTo>
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </actionButtonSound>
-  <arc>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 16200000" />
-      <gd name="adj2" fmla="val 0" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="stAng" fmla="pin 0 adj1 21599999" />
-      <gd name="enAng" fmla="pin 0 adj2 21599999" />
-      <gd name="sw11" fmla="+- enAng 0 stAng" />
-      <gd name="sw12" fmla="+- sw11 21600000 0" />
-      <gd name="swAng" fmla="?: sw11 sw11 sw12" />
-      <gd name="wt1" fmla="sin wd2 stAng" />
-      <gd name="ht1" fmla="cos hd2 stAng" />
-      <gd name="dx1" fmla="cat2 wd2 ht1 wt1" />
-      <gd name="dy1" fmla="sat2 hd2 ht1 wt1" />
-      <gd name="wt2" fmla="sin wd2 enAng" />
-      <gd name="ht2" fmla="cos hd2 enAng" />
-      <gd name="dx2" fmla="cat2 wd2 ht2 wt2" />
-      <gd name="dy2" fmla="sat2 hd2 ht2 wt2" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc dy1 0" />
-      <gd name="x2" fmla="+- hc dx2 0" />
-      <gd name="y2" fmla="+- vc dy2 0" />
-      <gd name="sw0" fmla="+- 21600000 0 stAng" />
-      <gd name="da1" fmla="+- swAng 0 sw0" />
-      <gd name="g1" fmla="max x1 x2" />
-      <gd name="ir" fmla="?: da1 r g1" />
-      <gd name="sw1" fmla="+- cd4 0 stAng" />
-      <gd name="sw2" fmla="+- 27000000 0 stAng" />
-      <gd name="sw3" fmla="?: sw1 sw1 sw2" />
-      <gd name="da2" fmla="+- swAng 0 sw3" />
-      <gd name="g5" fmla="max y1 y2" />
-      <gd name="ib" fmla="?: da2 b g5" />
-      <gd name="sw4" fmla="+- cd2 0 stAng" />
-      <gd name="sw5" fmla="+- 32400000 0 stAng" />
-      <gd name="sw6" fmla="?: sw4 sw4 sw5" />
-      <gd name="da3" fmla="+- swAng 0 sw6" />
-      <gd name="g9" fmla="min x1 x2" />
-      <gd name="il" fmla="?: da3 l g9" />
-      <gd name="sw7" fmla="+- 3cd4 0 stAng" />
-      <gd name="sw8" fmla="+- 37800000 0 stAng" />
-      <gd name="sw9" fmla="?: sw7 sw7 sw8" />
-      <gd name="da4" fmla="+- swAng 0 sw9" />
-      <gd name="g13" fmla="min y1 y2" />
-      <gd name="it" fmla="?: da4 t g13" />
-      <gd name="cang1" fmla="+- stAng 0 cd4" />
-      <gd name="cang2" fmla="+- enAng cd4 0" />
-      <gd name="cang3" fmla="+/ cang1 cang2 2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefAng="adj1" minAng="0" maxAng="21599999">
-        <pos x="x1" y="y1" />
-      </ahPolar>
-      <ahPolar gdRefAng="adj2" minAng="0" maxAng="21599999">
-        <pos x="x2" y="y2" />
-      </ahPolar>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cang1">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="cang3">
-        <pos x="hc" y="vc" />
-      </cxn>
-      <cxn ang="cang2">
-        <pos x="x2" y="y2" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="stAng" swAng="swAng" />
-        <lnTo>
-          <pt x="hc" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="stAng" swAng="swAng" />
-      </path>
-    </pathLst>
-  </arc>
-  <bentArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 43750" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="a3" fmla="pin 0 adj3 50000" />
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="aw2" fmla="*/ ss a2 100000" />
-
-      <gd name="th2" fmla="*/ th 1 2" />
-      <gd name="dh2" fmla="+- aw2 0 th2" />
-
-      <gd name="ah" fmla="*/ ss a3 100000" />
-
-      <gd name="bw" fmla="+- r 0 ah" />
-
-      <gd name="bh" fmla="+- b 0 dh2" />
-
-      <gd name="bs" fmla="min bw bh" />
-
-      <gd name="maxAdj4" fmla="*/ 100000 bs ss" />
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-
-      <gd name="bd" fmla="*/ ss a4 100000" />
-
-
-      <gd name="bd3" fmla="+- bd 0 th" />
-      <gd name="bd2" fmla="max bd3 0" />
-      <gd name="x3" fmla="+- th bd2 0" />
-      <gd name="x4" fmla="+- r 0 ah" />
-
-
-      <gd name="y3" fmla="+- dh2 th 0" />
-      <gd name="y4" fmla="+- y3 dh2 0" />
-      <gd name="y5" fmla="+- dh2 bd 0" />
-      <gd name="y6" fmla="+- y3 bd2 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="th" y="b" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="50000">
-        <pos x="r" y="y4" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="0" maxX="50000">
-        <pos x="x4" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="0" maxX="maxAdj4">
-        <pos x="bd" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x4" y="t" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x4" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="th2" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="aw2" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="l" y="y5" />
-        </lnTo>
-        <arcTo wR="bd" hR="bd" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x4" y="dh2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="aw2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <arcTo wR="bd2" hR="bd2" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="th" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </bentArrow>
-  <bentConnector2>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-      </path>
-    </pathLst>
-  </bentConnector2>
-  <bentConnector3>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x1" fmla="*/ w adj1 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647">
-        <pos x="x1" y="vc" />
-      </ahXY>
-    </ahLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-      </path>
-    </pathLst>
-  </bentConnector3>
-  <bentConnector4>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x1" fmla="*/ w adj1 100000" />
-      <gd name="x2" fmla="+/ x1 r 2" />
-      <gd name="y2" fmla="*/ h adj2 100000" />
-      <gd name="y1" fmla="+/ t y2 2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-    </ahLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-      </path>
-    </pathLst>
-  </bentConnector4>
-  <bentConnector5>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 50000" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x1" fmla="*/ w adj1 100000" />
-
-      <gd name="x3" fmla="*/ w adj3 100000" />
-
-      <gd name="x2" fmla="+/ x1 x3 2" />
-
-      <gd name="y2" fmla="*/ h adj2 100000" />
-
-      <gd name="y1" fmla="+/ t y2 2" />
-
-      <gd name="y3" fmla="+/ b y2 2" />
-
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="-2147483647" maxX="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-    </ahLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </bentConnector5>
-  <bentUpArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="a3" fmla="pin 0 adj3 50000" />
-      <gd name="y1" fmla="*/ ss a3 100000" />
-      <gd name="dx1" fmla="*/ ss a2 50000" />
-
-      <gd name="x1" fmla="+- r 0 dx1" />
-      <gd name="dx3" fmla="*/ ss a2 100000" />
-
-      <gd name="x3" fmla="+- r 0 dx3" />
-      <gd name="dx2" fmla="*/ ss a1 200000" />
-
-      <gd name="x2" fmla="+- x3 0 dx2" />
-      <gd name="x4" fmla="+- x3 dx2 0" />
-      <gd name="dy2" fmla="*/ ss a1 100000" />
-
-      <gd name="y2" fmla="+- b 0 dy2" />
-      <gd name="x0" fmla="*/ x4 1 2" />
-      <gd name="y3" fmla="+/ y2 b 2" />
-      <gd name="y15" fmla="+/ y1 b 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="50000">
-        <pos x="l" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="50000">
-        <pos x="x2" y="y1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x0" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y15" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="y2" r="x4" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </bentUpArrow>
-  <bevel>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 12500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-
-
-
-      <gd name="x2" fmla="+- r 0 x1" />
-
-      <gd name="y2" fmla="+- b 0 x1" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="x1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="x1" r="x2" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x1" y="x1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="lightenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="x1" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="lighten" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darken" extrusionOk="false">
-
-        <moveTo>
-          <pt x="r" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x1" y="x1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="x1" />
-        </lnTo>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <moveTo>
-          <pt x="r" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <moveTo>
-          <pt x="r" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </bevel>
-  <blockArc>
-
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 10800000" />
-
-      <gd name="adj2" fmla="val 0" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="stAng" fmla="pin 0 adj1 21599999" />
-      <gd name="istAng" fmla="pin 0 adj2 21599999" />
-      <gd name="a3" fmla="pin 0 adj3 50000" />
-      <gd name="sw11" fmla="+- istAng 0 stAng" />
-
-      <gd name="sw12" fmla="+- sw11 21600000 0" />
-
-      <gd name="swAng" fmla="?: sw11 sw11 sw12" />
-
-      <gd name="iswAng" fmla="+- 0 0 swAng" />
-
-
-      <gd name="wt1" fmla="sin wd2 stAng" />
-      <gd name="ht1" fmla="cos hd2 stAng" />
-      <gd name="wt3" fmla="sin wd2 istAng" />
-      <gd name="ht3" fmla="cos hd2 istAng" />
-      <gd name="dx1" fmla="cat2 wd2 ht1 wt1" />
-      <gd name="dy1" fmla="sat2 hd2 ht1 wt1" />
-      <gd name="dx3" fmla="cat2 wd2 ht3 wt3" />
-      <gd name="dy3" fmla="sat2 hd2 ht3 wt3" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-
-      <gd name="y1" fmla="+- vc dy1 0" />
-
-      <gd name="x3" fmla="+- hc dx3 0" />
-
-      <gd name="y3" fmla="+- vc dy3 0" />
-
-
-      <gd name="dr" fmla="*/ ss a3 100000" />
-      <gd name="iwd2" fmla="+- wd2 0 dr" />
-      <gd name="ihd2" fmla="+- hd2 0 dr" />
-      <gd name="wt2" fmla="sin iwd2 istAng" />
-      <gd name="ht2" fmla="cos ihd2 istAng" />
-      <gd name="wt4" fmla="sin iwd2 stAng" />
-      <gd name="ht4" fmla="cos ihd2 stAng" />
-      <gd name="dx2" fmla="cat2 iwd2 ht2 wt2" />
-      <gd name="dy2" fmla="sat2 ihd2 ht2 wt2" />
-      <gd name="dx4" fmla="cat2 iwd2 ht4 wt4" />
-      <gd name="dy4" fmla="sat2 ihd2 ht4 wt4" />
-      <gd name="x2" fmla="+- hc dx2 0" />
-
-      <gd name="y2" fmla="+- vc dy2 0" />
-
-      <gd name="x4" fmla="+- hc dx4 0" />
-
-      <gd name="y4" fmla="+- vc dy4 0" />
-
-
-      <gd name="sw0" fmla="+- 21600000 0 stAng" />
-      <gd name="da1" fmla="+- swAng 0 sw0" />
-      <gd name="g1" fmla="max x1 x2" />
-      <gd name="g2" fmla="max x3 x4" />
-      <gd name="g3" fmla="max g1 g2" />
-      <gd name="ir" fmla="?: da1 r g3" />
-
-      <gd name="sw1" fmla="+- cd4 0 stAng" />
-      <gd name="sw2" fmla="+- 27000000 0 stAng" />
-      <gd name="sw3" fmla="?: sw1 sw1 sw2" />
-      <gd name="da2" fmla="+- swAng 0 sw3" />
-      <gd name="g5" fmla="max y1 y2" />
-      <gd name="g6" fmla="max y3 y4" />
-      <gd name="g7" fmla="max g5 g6" />
-      <gd name="ib" fmla="?: da2 b g7" />
-
-      <gd name="sw4" fmla="+- cd2 0 stAng" />
-      <gd name="sw5" fmla="+- 32400000 0 stAng" />
-      <gd name="sw6" fmla="?: sw4 sw4 sw5" />
-      <gd name="da3" fmla="+- swAng 0 sw6" />
-      <gd name="g9" fmla="min x1 x2" />
-      <gd name="g10" fmla="min x3 x4" />
-      <gd name="g11" fmla="min g9 g10" />
-      <gd name="il" fmla="?: da3 l g11" />
-
-      <gd name="sw7" fmla="+- 3cd4 0 stAng" />
-      <gd name="sw8" fmla="+- 37800000 0 stAng" />
-      <gd name="sw9" fmla="?: sw7 sw7 sw8" />
-      <gd name="da4" fmla="+- swAng 0 sw9" />
-      <gd name="g13" fmla="min y1 y2" />
-      <gd name="g14" fmla="min y3 y4" />
-      <gd name="g15" fmla="min g13 g14" />
-      <gd name="it" fmla="?: da4 t g15" />
-
-      <gd name="x5" fmla="+/ x1 x4 2" />
-
-      <gd name="y5" fmla="+/ y1 y4 2" />
-
-      <gd name="x6" fmla="+/ x3 x2 2" />
-
-      <gd name="y6" fmla="+/ y3 y2 2" />
-
-      <gd name="cang1" fmla="+- stAng 0 cd4" />
-      <gd name="cang2" fmla="+- istAng cd4 0" />
-      <gd name="cang3" fmla="+/ cang1 cang2 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefAng="adj1" minAng="0" maxAng="21599999">
-        <pos x="x1" y="y1" />
-      </ahPolar>
-      <ahPolar gdRefR="adj3" minR="0" maxR="50000" gdRefAng="adj2" minAng="0" maxAng="21599999">
-        <pos x="x2" y="y2" />
-      </ahPolar>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cang1">
-        <pos x="x5" y="y5" />
-      </cxn>
-      <cxn ang="cang2">
-        <pos x="x6" y="y6" />
-      </cxn>
-      <cxn ang="cang3">
-        <pos x="hc" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="stAng" swAng="swAng" />
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <arcTo wR="iwd2" hR="ihd2" stAng="istAng" swAng="iswAng" />
-        <close />
-      </path>
-    </pathLst>
-
-  </blockArc>
-  <borderCallout1>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 112500" />
-
-      <gd name="adj4" fmla="val -38333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </borderCallout1>
-  <borderCallout2>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 112500" />
-
-      <gd name="adj6" fmla="val -46667" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </borderCallout2>
-  <borderCallout3>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 100000" />
-
-      <gd name="adj6" fmla="val -16667" />
-
-      <gd name="adj7" fmla="val 112963" />
-
-      <gd name="adj8" fmla="val -8333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-      <gd name="y4" fmla="*/ h adj7 100000" />
-      <gd name="x4" fmla="*/ w adj8 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-      <ahXY gdRefX="adj8" minX="-2147483647" maxX="2147483647" gdRefY="adj7" minY="-2147483647" maxY="2147483647">
-        <pos x="x4" y="y4" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </borderCallout3>
-  <bracePair>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 8333" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 25000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="*/ ss a 50000" />
-      <gd name="x3" fmla="+- r 0 x2" />
-      <gd name="x4" fmla="+- r 0 x1" />
-
-      <gd name="y2" fmla="+- vc 0 x1" />
-      <gd name="y3" fmla="+- vc x1 0" />
-      <gd name="y4" fmla="+- b 0 x1" />
-      <gd name="it" fmla="*/ x1 29289 100000" />
-
-      <gd name="il" fmla="+- x1 it 0" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 it" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="25000">
-        <pos x="l" y="x1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="x2" y="b" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="-5400000" />
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="x1" y="x1" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="-5400000" />
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="x2" y="b" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="-5400000" />
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="x1" y="x1" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="cd4" />
-        <moveTo>
-          <pt x="x3" y="t" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="-5400000" />
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="cd4" />
-      </path>
-    </pathLst>
-
-  </bracePair>
-  <bracketPair>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 16667" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="+- r 0 x1" />
-
-      <gd name="y2" fmla="+- b 0 x1" />
-      <gd name="il" fmla="*/ x1 29289 100000" />
-
-
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 il" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="l" y="x1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="x1" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="x1" y="b" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="l" y="x1" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="cd4" />
-        <moveTo>
-          <pt x="x2" y="t" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="cd4" />
-      </path>
-    </pathLst>
-
-  </bracketPair>
-  <callout1>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 112500" />
-
-      <gd name="adj4" fmla="val -38333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </callout1>
-  <callout2>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 112500" />
-
-      <gd name="adj6" fmla="val -46667" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </callout2>
-  <callout3>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="adj1" fmla="val 18750" />
-
-      <gd name="adj2" fmla="val -8333" />
-
-      <gd name="adj3" fmla="val 18750" />
-
-      <gd name="adj4" fmla="val -16667" />
-
-      <gd name="adj5" fmla="val 100000" />
-
-      <gd name="adj6" fmla="val -16667" />
-
-      <gd name="adj7" fmla="val 112963" />
-
-      <gd name="adj8" fmla="val -8333" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h adj1 100000" />
-      <gd name="x1" fmla="*/ w adj2 100000" />
-      <gd name="y2" fmla="*/ h adj3 100000" />
-      <gd name="x2" fmla="*/ w adj4 100000" />
-      <gd name="y3" fmla="*/ h adj5 100000" />
-      <gd name="x3" fmla="*/ w adj6 100000" />
-      <gd name="y4" fmla="*/ h adj7 100000" />
-      <gd name="x4" fmla="*/ w adj8 100000" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj2" minX="-2147483647" maxX="2147483647" gdRefY="adj1" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="-2147483647" maxX="2147483647" gdRefY="adj3" minY="-2147483647" maxY="2147483647">
-        <pos x="x2" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj6" minX="-2147483647" maxX="2147483647" gdRefY="adj5" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y3" />
-      </ahXY>
-      <ahXY gdRefX="adj8" minX="-2147483647" maxX="2147483647" gdRefY="adj7" minY="-2147483647" maxY="2147483647">
-        <pos x="x4" y="y4" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </callout3>
-  <can>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 50000 h ss" />
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="y1" fmla="*/ ss a 200000" />
-      <gd name="y2" fmla="+- y1 y1 0" />
-      <gd name="y3" fmla="+- b 0 y1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="maxAdj">
-        <pos x="hc" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="y2" r="r" b="y3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd2" swAng="-10800000" />
-        <lnTo>
-          <pt x="r" y="y3" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="cd2" />
-        <close />
-      </path>
-      <path stroke="false" fill="lighten" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd2" swAng="cd2" />
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="cd2" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="r" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="cd2" />
-        <arcTo wR="wd2" hR="y1" stAng="cd2" swAng="cd2" />
-        <lnTo>
-          <pt x="r" y="y3" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="cd2" />
-        <lnTo>
-          <pt x="l" y="y1" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </can>
-  <chartPlus>
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="10" h="10" fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="5" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="5" y="10" />
-        </lnTo>
-        <moveTo>
-          <pt x="0" y="5" />
-        </moveTo>
-        <lnTo>
-          <pt x="10" y="5" />
-        </lnTo>
-      </path>
-      <path w="10" h="10" stroke="false">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="0" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="0" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </chartPlus>
-  <chartStar>
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="10" h="10" fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="10" y="10" />
-        </lnTo>
-        <moveTo>
-          <pt x="0" y="10" />
-        </moveTo>
-        <lnTo>
-          <pt x="10" y="0" />
-        </lnTo>
-        <moveTo>
-          <pt x="5" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="5" y="10" />
-        </lnTo>
-      </path>
-      <path w="10" h="10" stroke="false">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="0" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="0" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </chartStar>
-  <chartX>
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="10" h="10" fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="10" y="10" />
-        </lnTo>
-        <moveTo>
-          <pt x="0" y="10" />
-        </moveTo>
-        <lnTo>
-          <pt x="10" y="0" />
-        </lnTo>
-      </path>
-      <path w="10" h="10" stroke="false">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="0" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="0" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </chartX>
-  <chevron>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 100000 w ss" />
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="+- r 0 x1" />
-      <gd name="x3" fmla="*/ x2 1 2" />
-      <gd name="dx" fmla="+- x2 0 x1" />
-      <gd name="il" fmla="?: dx x1 l" />
-      <gd name="ir" fmla="?: dx x2 r" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="maxAdj">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="t" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </chevron>
-  <chord>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 2700000" />
-
-      <gd name="adj2" fmla="val 16200000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="stAng" fmla="pin 0 adj1 21599999" />
-      <gd name="enAng" fmla="pin 0 adj2 21599999" />
-      <gd name="sw1" fmla="+- enAng 0 stAng" />
-
-      <gd name="sw2" fmla="+- sw1 21600000 0" />
-
-      <gd name="swAng" fmla="?: sw1 sw1 sw2" />
-
-      <gd name="wt1" fmla="sin wd2 stAng" />
-      <gd name="ht1" fmla="cos hd2 stAng" />
-      <gd name="dx1" fmla="cat2 wd2 ht1 wt1" />
-      <gd name="dy1" fmla="sat2 hd2 ht1 wt1" />
-      <gd name="wt2" fmla="sin wd2 enAng" />
-      <gd name="ht2" fmla="cos hd2 enAng" />
-      <gd name="dx2" fmla="cat2 wd2 ht2 wt2" />
-      <gd name="dy2" fmla="sat2 hd2 ht2 wt2" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-
-      <gd name="y1" fmla="+- vc dy1 0" />
-
-      <gd name="x2" fmla="+- hc dx2 0" />
-
-      <gd name="y2" fmla="+- vc dy2 0" />
-
-      <gd name="x3" fmla="+/ x1 x2 2" />
-      <gd name="y3" fmla="+/ y1 y2 2" />
-      <gd name="midAng0" fmla="*/ swAng 1 2" />
-      <gd name="midAng" fmla="+- stAng midAng0 cd2" />
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefAng="adj1" minAng="0" maxAng="21599999">
-        <pos x="x1" y="y1" />
-      </ahPolar>
-      <ahPolar gdRefAng="adj2" minAng="0" maxAng="21599999">
-        <pos x="x2" y="y2" />
-      </ahPolar>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="stAng">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="enAng">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="midAng">
-        <pos x="x3" y="y3" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="stAng" swAng="swAng" />
-        <close />
-      </path>
-    </pathLst>
-
-  </chord>
-  <circularArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 12500" />
-
-      <gd name="adj2" fmla="val 1142319" />
-
-      <gd name="adj3" fmla="val 20457681" />
-
-      <gd name="adj4" fmla="val 10800000" />
-
-      <gd name="adj5" fmla="val 12500" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a5" fmla="pin 0 adj5 25000" />
-
-      <gd name="maxAdj1" fmla="*/ a5 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="enAng" fmla="pin 1 adj3 21599999" />
-      <gd name="stAng" fmla="pin 0 adj4 21599999" />
-
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="thh" fmla="*/ ss a5 100000" />
-
-      <gd name="th2" fmla="*/ th 1 2" />
-
-
-      <gd name="rw1" fmla="+- wd2 th2 thh" />
-
-      <gd name="rh1" fmla="+- hd2 th2 thh" />
-
-      <gd name="rw2" fmla="+- rw1 0 th" />
-
-      <gd name="rh2" fmla="+- rh1 0 th" />
-
-      <gd name="rw3" fmla="+- rw2 th2 0" />
-
-      <gd name="rh3" fmla="+- rh2 th2 0" />
-
-
-      <gd name="wtH" fmla="sin rw3 enAng" />
-      <gd name="htH" fmla="cos rh3 enAng" />
-      <gd name="dxH" fmla="cat2 rw3 htH wtH" />
-      <gd name="dyH" fmla="sat2 rh3 htH wtH" />
-      <gd name="xH" fmla="+- hc dxH 0" />
-
-      <gd name="yH" fmla="+- vc dyH 0" />
-
-
-      <gd name="rI" fmla="min rw2 rh2" />
-
-      <gd name="u1" fmla="*/ dxH dxH 1" />
-      <gd name="u2" fmla="*/ dyH dyH 1" />
-      <gd name="u3" fmla="*/ rI rI 1" />
-      <gd name="u4" fmla="+- u1 0 u3" />
-      <gd name="u5" fmla="+- u2 0 u3" />
-      <gd name="u6" fmla="*/ u4 u5 u1" />
-      <gd name="u7" fmla="*/ u6 1 u2" />
-      <gd name="u8" fmla="+- 1 0 u7" />
-      <gd name="u9" fmla="sqrt u8" />
-      <gd name="u10" fmla="*/ u4 1 dxH" />
-      <gd name="u11" fmla="*/ u10 1 dyH" />
-      <gd name="u12" fmla="+/ 1 u9 u11" />
-      <gd name="u13" fmla="at2 1 u12" />
-      <gd name="u14" fmla="+- u13 21600000 0" />
-      <gd name="u15" fmla="?: u13 u13 u14" />
-      <gd name="u16" fmla="+- u15 0 enAng" />
-
-      <gd name="u17" fmla="+- u16 21600000 0" />
-      <gd name="u18" fmla="?: u16 u16 u17" />
-      <gd name="u19" fmla="+- u18 0 cd2" />
-      <gd name="u20" fmla="+- u18 0 21600000" />
-      <gd name="u21" fmla="?: u19 u20 u18" />
-      <gd name="maxAng" fmla="abs u21" />
-      <gd name="aAng" fmla="pin 0 adj2 maxAng" />
-
-      <gd name="ptAng" fmla="+- enAng aAng 0" />
-
-
-      <gd name="wtA" fmla="sin rw3 ptAng" />
-      <gd name="htA" fmla="cos rh3 ptAng" />
-      <gd name="dxA" fmla="cat2 rw3 htA wtA" />
-      <gd name="dyA" fmla="sat2 rh3 htA wtA" />
-      <gd name="xA" fmla="+- hc dxA 0" />
-
-      <gd name="yA" fmla="+- vc dyA 0" />
-
-
-      <gd name="wtE" fmla="sin rw1 stAng" />
-      <gd name="htE" fmla="cos rh1 stAng" />
-      <gd name="dxE" fmla="cat2 rw1 htE wtE" />
-      <gd name="dyE" fmla="sat2 rh1 htE wtE" />
-      <gd name="xE" fmla="+- hc dxE 0" />
-
-      <gd name="yE" fmla="+- vc dyE 0" />
-
-
-      <gd name="dxG" fmla="cos thh ptAng" />
-      <gd name="dyG" fmla="sin thh ptAng" />
-      <gd name="xG" fmla="+- xH dxG 0" />
-
-      <gd name="yG" fmla="+- yH dyG 0" />
-
-
-      <gd name="dxB" fmla="cos thh ptAng" />
-      <gd name="dyB" fmla="sin thh ptAng" />
-      <gd name="xB" fmla="+- xH 0 dxB 0" />
-
-      <gd name="yB" fmla="+- yH 0 dyB 0" />
-
-
-      <gd name="sx1" fmla="+- xB 0 hc" />
-
-      <gd name="sy1" fmla="+- yB 0 vc" />
-
-      <gd name="sx2" fmla="+- xG 0 hc" />
-
-      <gd name="sy2" fmla="+- yG 0 vc" />
-
-
-      <gd name="rO" fmla="min rw1 rh1" />
-
-      <gd name="x1O" fmla="*/ sx1 rO rw1" />
-
-      <gd name="y1O" fmla="*/ sy1 rO rh1" />
-
-      <gd name="x2O" fmla="*/ sx2 rO rw1" />
-
-      <gd name="y2O" fmla="*/ sy2 rO rh1" />
-
-
-      <gd name="dxO" fmla="+- x2O 0 x1O" />
-      <gd name="dyO" fmla="+- y2O 0 y1O" />
-      <gd name="dO" fmla="mod dxO dyO 0" />
-
-      <gd name="q1" fmla="*/ x1O y2O 1" />
-      <gd name="q2" fmla="*/ x2O y1O 1" />
-      <gd name="DO" fmla="+- q1 0 q2" />
-
-
-      <gd name="q3" fmla="*/ rO rO 1" />
-
-      <gd name="q4" fmla="*/ dO dO 1" />
-
-      <gd name="q5" fmla="*/ q3 q4 1" />
-
-      <gd name="q6" fmla="*/ DO DO 1" />
-
-      <gd name="q7" fmla="+- q5 0 q6" />
-
-      <gd name="q8" fmla="max q7 0" />
-
-      <gd name="sdelO" fmla="sqrt q8" />
-
-      <gd name="ndyO" fmla="*/ dyO -1 1" />
-      <gd name="sdyO" fmla="?: ndyO -1 1" />
-
-      <gd name="q9" fmla="*/ sdyO dxO 1" />
-
-      <gd name="q10" fmla="*/ q9 sdelO 1" />
-
-      <gd name="q11" fmla="*/ DO dyO 1" />
-
-      <gd name="dxF1" fmla="+/ q11 q10 q4" />
-
-      <gd name="q12" fmla="+- q11 0 q10" />
-      <gd name="dxF2" fmla="*/ q12 1 q4" />
-
-
-      <gd name="adyO" fmla="abs dyO" />
-      <gd name="q13" fmla="*/ adyO sdelO 1" />
-
-      <gd name="q14" fmla="*/ DO dxO -1" />
-
-      <gd name="dyF1" fmla="+/ q14 q13 q4" />
-
-      <gd name="q15" fmla="+- q14 0 q13" />
-      <gd name="dyF2" fmla="*/ q15 1 q4" />
-
-
-
-      <gd name="q16" fmla="+- x2O 0 dxF1" />
-      <gd name="q17" fmla="+- x2O 0 dxF2" />
-      <gd name="q18" fmla="+- y2O 0 dyF1" />
-      <gd name="q19" fmla="+- y2O 0 dyF2" />
-      <gd name="q20" fmla="mod q16 q18 0" />
-
-      <gd name="q21" fmla="mod q17 q19 0" />
-
-      <gd name="q22" fmla="+- q21 0 q20" />
-      <gd name="dxF" fmla="?: q22 dxF1 dxF2" />
-
-      <gd name="dyF" fmla="?: q22 dyF1 dyF2" />
-
-      <gd name="sdxF" fmla="*/ dxF rw1 rO" />
-
-      <gd name="sdyF" fmla="*/ dyF rh1 rO" />
-
-      <gd name="xF" fmla="+- hc sdxF 0" />
-
-      <gd name="yF" fmla="+- vc sdyF 0" />
-
-
-
-
-      <gd name="x1I" fmla="*/ sx1 rI rw2" />
-
-      <gd name="y1I" fmla="*/ sy1 rI rh2" />
-
-      <gd name="x2I" fmla="*/ sx2 rI rw2" />
-
-      <gd name="y2I" fmla="*/ sy2 rI rh2" />
-
-
-      <gd name="dxI" fmla="+- x2I 0 x1I" />
-      <gd name="dyI" fmla="+- y2I 0 y1I" />
-      <gd name="dI" fmla="mod dxI dyI 0" />
-      <gd name="v1" fmla="*/ x1I y2I 1" />
-      <gd name="v2" fmla="*/ x2I y1I 1" />
-      <gd name="DI" fmla="+- v1 0 v2" />
-
-      <gd name="v3" fmla="*/ rI rI 1" />
-      <gd name="v4" fmla="*/ dI dI 1" />
-      <gd name="v5" fmla="*/ v3 v4 1" />
-      <gd name="v6" fmla="*/ DI DI 1" />
-      <gd name="v7" fmla="+- v5 0 v6" />
-      <gd name="v8" fmla="max v7 0" />
-      <gd name="sdelI" fmla="sqrt v8" />
-      <gd name="v9" fmla="*/ sdyO dxI 1" />
-      <gd name="v10" fmla="*/ v9 sdelI 1" />
-      <gd name="v11" fmla="*/ DI dyI 1" />
-      <gd name="dxC1" fmla="+/ v11 v10 v4" />
-      <gd name="v12" fmla="+- v11 0 v10" />
-      <gd name="dxC2" fmla="*/ v12 1 v4" />
-
-      <gd name="adyI" fmla="abs dyI" />
-      <gd name="v13" fmla="*/ adyI sdelI 1" />
-      <gd name="v14" fmla="*/ DI dxI -1" />
-      <gd name="dyC1" fmla="+/ v14 v13 v4" />
-      <gd name="v15" fmla="+- v14 0 v13" />
-      <gd name="dyC2" fmla="*/ v15 1 v4" />
-
-      <gd name="v16" fmla="+- x1I 0 dxC1" />
-      <gd name="v17" fmla="+- x1I 0 dxC2" />
-      <gd name="v18" fmla="+- y1I 0 dyC1" />
-      <gd name="v19" fmla="+- y1I 0 dyC2" />
-      <gd name="v20" fmla="mod v16 v18 0" />
-      <gd name="v21" fmla="mod v17 v19 0" />
-      <gd name="v22" fmla="+- v21 0 v20" />
-      <gd name="dxC" fmla="?: v22 dxC1 dxC2" />
-      <gd name="dyC" fmla="?: v22 dyC1 dyC2" />
-      <gd name="sdxC" fmla="*/ dxC rw2 rI" />
-      <gd name="sdyC" fmla="*/ dyC rh2 rI" />
-      <gd name="xC" fmla="+- hc sdxC 0" />
-
-      <gd name="yC" fmla="+- vc sdyC 0" />
-
-
-      <gd name="ist0" fmla="at2 sdxC sdyC" />
-      <gd name="ist1" fmla="+- ist0 21600000 0" />
-      <gd name="istAng" fmla="?: ist0 ist0 ist1" />
-      <gd name="isw1" fmla="+- stAng 0 istAng" />
-      <gd name="isw2" fmla="+- isw1 0 21600000" />
-      <gd name="iswAng" fmla="?: isw1 isw2 isw1" />
-
-
-      <gd name="p1" fmla="+- xF 0 xC" />
-      <gd name="p2" fmla="+- yF 0 yC" />
-      <gd name="p3" fmla="mod p1 p2 0" />
-      <gd name="p4" fmla="*/ p3 1 2" />
-      <gd name="p5" fmla="+- p4 0 thh" />
-      <gd name="xGp" fmla="?: p5 xF xG" />
-      <gd name="yGp" fmla="?: p5 yF yG" />
-      <gd name="xBp" fmla="?: p5 xC xB" />
-      <gd name="yBp" fmla="?: p5 yC yB" />
-
-      <gd name="en0" fmla="at2 sdxF sdyF" />
-      <gd name="en1" fmla="+- en0 21600000 0" />
-      <gd name="en2" fmla="?: en0 en0 en1" />
-      <gd name="sw0" fmla="+- en2 0 stAng" />
-      <gd name="sw1" fmla="+- sw0 21600000 0" />
-      <gd name="swAng" fmla="?: sw0 sw0 sw1" />
-
-      <gd name="wtI" fmla="sin rw3 stAng" />
-      <gd name="htI" fmla="cos rh3 stAng" />
-      <gd name="dxI" fmla="cat2 rw3 htI wtI" />
-      <gd name="dyI" fmla="sat2 rh3 htI wtI" />
-      <gd name="xI" fmla="+- hc dxI 0" />
-
-      <gd name="yI" fmla="+- vc dyI 0" />
-
-
-      <gd name="aI" fmla="+- stAng 0 cd4" />
-      <gd name="aA" fmla="+- ptAng cd4 0" />
-      <gd name="aB" fmla="+- ptAng cd2 0" />
-
-      <gd name="idx" fmla="cos rw1 2700000" />
-      <gd name="idy" fmla="sin rh1 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefAng="adj2" minAng="0" maxAng="maxAng">
-        <pos x="xA" y="yA" />
-      </ahPolar>
-      <ahPolar gdRefAng="adj4" minAng="0" maxAng="21599999">
-        <pos x="xE" y="yE" />
-      </ahPolar>
-      <ahPolar gdRefR="adj1" minR="0" maxR="maxAdj1" gdRefAng="adj3" minAng="0" maxAng="21599999">
-        <pos x="xF" y="yF" />
-      </ahPolar>
-      <ahPolar gdRefR="adj5" minR="0" maxR="25000">
-        <pos x="xB" y="yB" />
-      </ahPolar>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="aI">
-        <pos x="xI" y="yI" />
-      </cxn>
-      <cxn ang="ptAng">
-        <pos x="xGp" y="yGp" />
-      </cxn>
-      <cxn ang="aA">
-        <pos x="xA" y="yA" />
-      </cxn>
-      <cxn ang="aB">
-        <pos x="xBp" y="yBp" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="xE" y="yE" />
-        </moveTo>
-        <arcTo wR="rw1" hR="rh1" stAng="stAng" swAng="swAng" />
-        <lnTo>
-          <pt x="xGp" y="yGp" />
-        </lnTo>
-        <lnTo>
-          <pt x="xA" y="yA" />
-        </lnTo>
-        <lnTo>
-          <pt x="xBp" y="yBp" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC" y="yC" />
-        </lnTo>
-        <arcTo wR="rw2" hR="rh2" stAng="istAng" swAng="iswAng" />
-        <close />
-      </path>
-    </pathLst>
-
-  </circularArrow>
-  <cloud>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="il" fmla="*/ w 2977 21600" />
-      <gd name="it" fmla="*/ h 3262 21600" />
-      <gd name="ir" fmla="*/ w 17087 21600" />
-      <gd name="ib" fmla="*/ h 17337 21600" />
-      <gd name="g27" fmla="*/ w 67 21600" />
-      <gd name="g28" fmla="*/ h 21577 21600" />
-      <gd name="g29" fmla="*/ w 21582 21600" />
-      <gd name="g30" fmla="*/ h 1235 21600" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="g29" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="g28" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="g27" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="g30" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="43200" h="43200">
-        <moveTo>
-          <pt x="3900" y="14370" />
-        </moveTo>
-        <arcTo wR="6753" hR="9190" stAng="-11429249" swAng="7426832" />
-        <arcTo wR="5333" hR="7267" stAng="-8646143" swAng="5396714" />
-        <arcTo wR="4365" hR="5945" stAng="-8748475" swAng="5983381" />
-        <arcTo wR="4857" hR="6595" stAng="-7859164" swAng="7034504" />
-        <arcTo wR="5333" hR="7273" stAng="-4722533" swAng="6541615" />
-        <arcTo wR="6775" hR="9220" stAng="-2776035" swAng="7816140" />
-        <arcTo wR="5785" hR="7867" stAng="37501" swAng="6842000" />
-        <arcTo wR="6752" hR="9215" stAng="1347096" swAng="6910353" />
-        <arcTo wR="7720" hR="10543" stAng="3974558" swAng="4542661" />
-        <arcTo wR="4360" hR="5918" stAng="-16496525" swAng="8804134" />
-        <arcTo wR="4345" hR="5945" stAng="-14809710" swAng="9151131" />
-        <close />
-      </path>
-      <path w="43200" h="43200" fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="4693" y="26177" />
-        </moveTo>
-        <arcTo wR="4345" hR="5945" stAng="5204520" swAng="1585770" />
-        <moveTo>
-          <pt x="6928" y="34899" />
-        </moveTo>
-        <arcTo wR="4360" hR="5918" stAng="4416628" swAng="686848" />
-        <moveTo>
-          <pt x="16478" y="39090" />
-        </moveTo>
-        <arcTo wR="6752" hR="9215" stAng="8257449" swAng="844866" />
-        <moveTo>
-          <pt x="28827" y="34751" />
-        </moveTo>
-        <arcTo wR="6752" hR="9215" stAng="387196" swAng="959901" />
-        <moveTo>
-          <pt x="34129" y="22954" />
-        </moveTo>
-        <arcTo wR="5785" hR="7867" stAng="-4217541" swAng="4255042" />
-        <moveTo>
-          <pt x="41798" y="15354" />
-        </moveTo>
-        <arcTo wR="5333" hR="7273" stAng="1819082" swAng="1665090" />
-        <moveTo>
-          <pt x="38324" y="5426" />
-        </moveTo>
-        <arcTo wR="4857" hR="6595" stAng="-824660" swAng="891534" />
-        <moveTo>
-          <pt x="29078" y="3952" />
-        </moveTo>
-        <arcTo wR="4857" hR="6595" stAng="-8950887" swAng="1091722" />
-        <moveTo>
-          <pt x="22141" y="4720" />
-        </moveTo>
-        <arcTo wR="4365" hR="5945" stAng="-9809656" swAng="1061181" />
-        <moveTo>
-          <pt x="14000" y="5192" />
-        </moveTo>
-        <arcTo wR="6753" hR="9190" stAng="-4002417" swAng="739161" />
-        <moveTo>
-          <pt x="4127" y="15789" />
-        </moveTo>
-        <arcTo wR="6753" hR="9190" stAng="9459261" swAng="711490" />
-      </path>
-    </pathLst>
-
-  </cloud>
-  <cloudCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val -20833" />
-
-      <gd name="adj2" fmla="val 62500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dxPos" fmla="*/ w adj1 100000" />
-      <gd name="dyPos" fmla="*/ h adj2 100000" />
-      <gd name="xPos" fmla="+- hc dxPos 0" />
-      <gd name="yPos" fmla="+- vc dyPos 0" />
-      <gd name="ht" fmla="cat2 hd2 dxPos dyPos" />
-      <gd name="wt" fmla="sat2 wd2 dxPos dyPos" />
-      <gd name="g2" fmla="cat2 wd2 ht wt" />
-      <gd name="g3" fmla="sat2 hd2 ht wt" />
-      <gd name="g4" fmla="+- hc g2 0" />
-
-      <gd name="g5" fmla="+- vc g3 0" />
-
-      <gd name="g6" fmla="+- g4 0 xPos" />
-
-      <gd name="g7" fmla="+- g5 0 yPos" />
-
-      <gd name="g8" fmla="mod g6 g7 0" />
-
-      <gd name="g9" fmla="*/ ss 6600 21600" />
-
-      <gd name="g10" fmla="+- g8 0 g9" />
-
-      <gd name="g11" fmla="*/ g10 1 3" />
-
-      <gd name="g12" fmla="*/ ss 1800 21600" />
-
-      <gd name="g13" fmla="+- g11 g12 0" />
-
-      <gd name="g14" fmla="*/ g13 g6 g8" />
-
-      <gd name="g15" fmla="*/ g13 g7 g8" />
-
-      <gd name="g16" fmla="+- g14 xPos 0" />
-
-      <gd name="g17" fmla="+- g15 yPos 0" />
-
-      <gd name="g18" fmla="*/ ss 4800 21600" />
-
-      <gd name="g19" fmla="*/ g11 2 1" />
-
-      <gd name="g20" fmla="+- g18 g19 0" />
-
-      <gd name="g21" fmla="*/ g20 g6 g8" />
-      <gd name="g22" fmla="*/ g20 g7 g8" />
-      <gd name="g23" fmla="+- g21 xPos 0" />
-      <gd name="g24" fmla="+- g22 yPos 0" />
-      <gd name="g25" fmla="*/ ss 1200 21600" />
-      <gd name="g26" fmla="*/ ss 600 21600" />
-
-      <gd name="x23" fmla="+- xPos g26 0" />
-      <gd name="x24" fmla="+- g16 g25 0" />
-      <gd name="x25" fmla="+- g23 g12 0" />
-      <gd name="il" fmla="*/ w 2977 21600" />
-      <gd name="it" fmla="*/ h 3262 21600" />
-      <gd name="ir" fmla="*/ w 17087 21600" />
-      <gd name="ib" fmla="*/ h 17337 21600" />
-
-      <gd name="g27" fmla="*/ w 67 21600" />
-      <gd name="g28" fmla="*/ h 21577 21600" />
-      <gd name="g29" fmla="*/ w 21582 21600" />
-      <gd name="g30" fmla="*/ h 1235 21600" />
-      <gd name="pang" fmla="at2 dxPos dyPos" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647" gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="xPos" y="yPos" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd2">
-        <pos x="g27" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="g28" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="g29" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="g30" />
-      </cxn>
-      <cxn ang="pang">
-        <pos x="xPos" y="yPos" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="43200" h="43200">
-        <moveTo>
-          <pt x="3900" y="14370" />
-        </moveTo>
-        <arcTo wR="6753" hR="9190" stAng="-11429249" swAng="7426832" />
-        <arcTo wR="5333" hR="7267" stAng="-8646143" swAng="5396714" />
-        <arcTo wR="4365" hR="5945" stAng="-8748475" swAng="5983381" />
-        <arcTo wR="4857" hR="6595" stAng="-7859164" swAng="7034504" />
-        <arcTo wR="5333" hR="7273" stAng="-4722533" swAng="6541615" />
-        <arcTo wR="6775" hR="9220" stAng="-2776035" swAng="7816140" />
-        <arcTo wR="5785" hR="7867" stAng="37501" swAng="6842000" />
-        <arcTo wR="6752" hR="9215" stAng="1347096" swAng="6910353" />
-        <arcTo wR="7720" hR="10543" stAng="3974558" swAng="4542661" />
-        <arcTo wR="4360" hR="5918" stAng="-16496525" swAng="8804134" />
-        <arcTo wR="4345" hR="5945" stAng="-14809710" swAng="9151131" />
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="x23" y="yPos" />
-        </moveTo>
-        <arcTo wR="g26" hR="g26" stAng="0" swAng="21600000" />
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="x24" y="g17" />
-        </moveTo>
-        <arcTo wR="g25" hR="g25" stAng="0" swAng="21600000" />
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="x25" y="g24" />
-        </moveTo>
-        <arcTo wR="g12" hR="g12" stAng="0" swAng="21600000" />
-        <close />
-      </path>
-      <path w="43200" h="43200" fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="4693" y="26177" />
-        </moveTo>
-        <arcTo wR="4345" hR="5945" stAng="5204520" swAng="1585770" />
-        <moveTo>
-          <pt x="6928" y="34899" />
-        </moveTo>
-        <arcTo wR="4360" hR="5918" stAng="4416628" swAng="686848" />
-        <moveTo>
-          <pt x="16478" y="39090" />
-        </moveTo>
-        <arcTo wR="6752" hR="9215" stAng="8257449" swAng="844866" />
-        <moveTo>
-          <pt x="28827" y="34751" />
-        </moveTo>
-        <arcTo wR="6752" hR="9215" stAng="387196" swAng="959901" />
-        <moveTo>
-          <pt x="34129" y="22954" />
-        </moveTo>
-        <arcTo wR="5785" hR="7867" stAng="-4217541" swAng="4255042" />
-        <moveTo>
-          <pt x="41798" y="15354" />
-        </moveTo>
-        <arcTo wR="5333" hR="7273" stAng="1819082" swAng="1665090" />
-        <moveTo>
-          <pt x="38324" y="5426" />
-        </moveTo>
-        <arcTo wR="4857" hR="6595" stAng="-824660" swAng="891534" />
-        <moveTo>
-          <pt x="29078" y="3952" />
-        </moveTo>
-        <arcTo wR="4857" hR="6595" stAng="-8950887" swAng="1091722" />
-        <moveTo>
-          <pt x="22141" y="4720" />
-        </moveTo>
-        <arcTo wR="4365" hR="5945" stAng="-9809656" swAng="1061181" />
-        <moveTo>
-          <pt x="14000" y="5192" />
-        </moveTo>
-        <arcTo wR="6753" hR="9190" stAng="-4002417" swAng="739161" />
-        <moveTo>
-          <pt x="4127" y="15789" />
-        </moveTo>
-        <arcTo wR="6753" hR="9190" stAng="9459261" swAng="711490" />
-      </path>
-    </pathLst>
-
-  </cloudCallout>
-  <corner>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj1" fmla="*/ 100000 h ss" />
-      <gd name="maxAdj2" fmla="*/ 100000 w ss" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="x1" fmla="*/ ss a2 100000" />
-      <gd name="dy1" fmla="*/ ss a1 100000" />
-      <gd name="y1" fmla="+- b 0 dy1" />
-      <gd name="cx1" fmla="*/ x1 1 2" />
-      <gd name="cy1" fmla="+/ y1 b 2" />
-      <gd name="d" fmla="+- w 0 h" />
-      <gd name="it" fmla="?: d y1 t" />
-      <gd name="ir" fmla="?: d r x1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="cy1" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="cx1" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="it" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </corner>
-  <cornerTabs>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="md" fmla="mod w h 0" />
-      <gd name="dx" fmla="*/ 1 md 20" />
-
-      <gd name="y1" fmla="+- 0 b dx" />
-
-      <gd name="x1" fmla="+- 0 r dx" />
-
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd2">
-        <pos x="l" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="dx" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="dx" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="t" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="dx" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="t" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="dx" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="b" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="dx" t="dx" r="x1" b="y1" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="dx" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="dx" />
-        </lnTo>
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="dx" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="dx" />
-        </lnTo>
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="r" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </cornerTabs>
-  <cube>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 100000" />
-      <gd name="y1" fmla="*/ ss a 100000" />
-      <gd name="y4" fmla="+- b 0 y1" />
-      <gd name="y2" fmla="*/ y4 1 2" />
-      <gd name="y3" fmla="+/ y1 b 2" />
-      <gd name="x4" fmla="+- r 0 y1" />
-      <gd name="x2" fmla="*/ x4 1 2" />
-      <gd name="x3" fmla="+/ y1 r 2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="100000">
-        <pos x="l" y="y1" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y3" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y2" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="y1" r="x4" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-        <moveTo>
-          <pt x="x4" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="lightenLess" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="y1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="y1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <moveTo>
-          <pt x="x4" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-      </path>
-    </pathLst>
-  </cube>
-  <curvedConnector2>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="wd2" y="t" />
-          <pt x="r" y="hd2" />
-          <pt x="r" y="b" />
-        </cubicBezTo>
-      </path>
-    </pathLst>
-  </curvedConnector2>
-  <curvedConnector3>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w adj1 100000" />
-      <gd name="x1" fmla="+/ l x2 2" />
-      <gd name="x3" fmla="+/ r x2 2" />
-      <gd name="y3" fmla="*/ h 3 4" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647">
-        <pos x="x2" y="vc" />
-      </ahXY>
-    </ahLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="x1" y="t" />
-          <pt x="x2" y="hd4" />
-          <pt x="x2" y="vc" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x2" y="y3" />
-          <pt x="x3" y="b" />
-          <pt x="r" y="b" />
-        </cubicBezTo>
-      </path>
-    </pathLst>
-  </curvedConnector3>
-  <curvedConnector4>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w adj1 100000" />
-      <gd name="x1" fmla="+/ l x2 2" />
-      <gd name="x3" fmla="+/ r x2 2" />
-      <gd name="x4" fmla="+/ x2 x3 2" />
-      <gd name="x5" fmla="+/ x3 r 2" />
-      <gd name="y4" fmla="*/ h adj2 100000" />
-      <gd name="y1" fmla="+/ t y4 2" />
-      <gd name="y2" fmla="+/ t y1 2" />
-      <gd name="y3" fmla="+/ y1 y4 2" />
-      <gd name="y5" fmla="+/ b y4 2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647">
-        <pos x="x2" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="x3" y="y4" />
-      </ahXY>
-    </ahLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="x1" y="t" />
-          <pt x="x2" y="y2" />
-          <pt x="x2" y="y1" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x2" y="y3" />
-          <pt x="x4" y="y4" />
-          <pt x="x3" y="y4" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x5" y="y4" />
-          <pt x="r" y="y5" />
-          <pt x="r" y="b" />
-        </cubicBezTo>
-      </path>
-    </pathLst>
-  </curvedConnector4>
-  <curvedConnector5>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 50000" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x3" fmla="*/ w adj1 100000" />
-      <gd name="x6" fmla="*/ w adj3 100000" />
-      <gd name="x1" fmla="+/ x3 x6 2" />
-      <gd name="x2" fmla="+/ l x3 2" />
-      <gd name="x4" fmla="+/ x3 x1 2" />
-      <gd name="x5" fmla="+/ x6 x1 2" />
-      <gd name="x7" fmla="+/ x6 r 2" />
-      <gd name="y4" fmla="*/ h adj2 100000" />
-      <gd name="y1" fmla="+/ t y4 2" />
-      <gd name="y2" fmla="+/ t y1 2" />
-      <gd name="y3" fmla="+/ y1 y4 2" />
-      <gd name="y5" fmla="+/ b y4 2" />
-      <gd name="y6" fmla="+/ y5 y4 2" />
-      <gd name="y7" fmla="+/ y5 b 2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647">
-        <pos x="x3" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="x1" y="y4" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="-2147483647" maxX="2147483647">
-        <pos x="x6" y="y5" />
-      </ahXY>
-    </ahLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="x2" y="t" />
-          <pt x="x3" y="y2" />
-          <pt x="x3" y="y1" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x3" y="y3" />
-          <pt x="x4" y="y4" />
-          <pt x="x1" y="y4" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x5" y="y4" />
-          <pt x="x6" y="y6" />
-          <pt x="x6" y="y5" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x6" y="y7" />
-          <pt x="x7" y="b" />
-          <pt x="r" y="b" />
-        </cubicBezTo>
-      </path>
-    </pathLst>
-
-  </curvedConnector5>
-  <curvedDownArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 w ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="aw" fmla="*/ ss a2 100000" />
-
-      <gd name="q1" fmla="+/ th aw 4" />
-
-      <gd name="wR" fmla="+- wd2 0 q1" />
-
-      <gd name="q7" fmla="*/ wR 2 1" />
-
-      <gd name="q8" fmla="*/ q7 q7 1" />
-
-      <gd name="q9" fmla="*/ th th 1" />
-
-      <gd name="q10" fmla="+- q8 0 q9" />
-      <gd name="q11" fmla="sqrt q10" />
-      <gd name="idy" fmla="*/ q11 h q7" />
-      <gd name="maxAdj3" fmla="*/ 100000 idy ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="ah" fmla="*/ ss adj3 100000" />
-
-
-
-
-
-      <gd name="x3" fmla="+- wR th 0" />
-
-      <gd name="q2" fmla="*/ h h 1" />
-      <gd name="q3" fmla="*/ ah ah 1" />
-      <gd name="q4" fmla="+- q2 0 q3" />
-      <gd name="q5" fmla="sqrt q4" />
-      <gd name="dx" fmla="*/ q5 wR h" />
-      <gd name="x5" fmla="+- wR dx 0" />
-
-      <gd name="x7" fmla="+- x3 dx 0" />
-
-      <gd name="q6" fmla="+- aw 0 th" />
-      <gd name="dh" fmla="*/ q6 1 2" />
-
-      <gd name="x4" fmla="+- x5 0 dh" />
-
-      <gd name="x8" fmla="+- x7 dh 0" />
-
-      <gd name="aw2" fmla="*/ aw 1 2" />
-      <gd name="x6" fmla="+- r 0 aw2" />
-
-      <gd name="y1" fmla="+- b 0 ah" />
-      <gd name="swAng" fmla="at2 ah dx" />
-
-      <gd name="mswAng" fmla="+- 0 0 swAng" />
-      <gd name="iy" fmla="+- b 0 idy" />
-
-      <gd name="ix" fmla="+/ wR x3 2" />
-
-      <gd name="q12" fmla="*/ th 1 2" />
-      <gd name="dang2" fmla="at2 idy q12" />
-      <gd name="stAng" fmla="+- 3cd4 swAng 0" />
-      <gd name="stAng2" fmla="+- 3cd4 0 dang2" />
-      <gd name="swAng2" fmla="+- dang2 0 cd4" />
-      <gd name="swAng3" fmla="+- cd4 dang2 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="adj2">
-        <pos x="x7" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x4" y="b" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="y1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="ix" y="t" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="q12" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x4" y="y1" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x6" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x8" y="y1" />
-      </cxn>
-    </cxnLst>
-
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="x6" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y1" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="stAng" swAng="mswAng" />
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="3cd4" swAng="swAng" />
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <close />
-      </path>
-
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="ix" y="iy" />
-        </moveTo>
-        <arcTo wR="wR" hR="h" stAng="stAng2" swAng="swAng2" />
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="cd2" swAng="swAng3" />
-        <close />
-      </path>
-
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="ix" y="iy" />
-        </moveTo>
-        <arcTo wR="wR" hR="h" stAng="stAng2" swAng="swAng2" />
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="3cd4" swAng="swAng" />
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y1" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="stAng" swAng="mswAng" />
-      </path>
-    </pathLst>
-
-  </curvedDownArrow>
-  <curvedLeftArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 h ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="a1" fmla="pin 0 adj1 a2" />
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="aw" fmla="*/ ss a2 100000" />
-
-      <gd name="q1" fmla="+/ th aw 4" />
-
-      <gd name="hR" fmla="+- hd2 0 q1" />
-
-      <gd name="q7" fmla="*/ hR 2 1" />
-
-      <gd name="q8" fmla="*/ q7 q7 1" />
-
-      <gd name="q9" fmla="*/ th th 1" />
-
-      <gd name="q10" fmla="+- q8 0 q9" />
-      <gd name="q11" fmla="sqrt q10" />
-      <gd name="idx" fmla="*/ q11 w q7" />
-      <gd name="maxAdj3" fmla="*/ 100000 idx ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="ah" fmla="*/ ss a3 100000" />
-
-
-
-
-
-      <gd name="y3" fmla="+- hR th 0" />
-
-      <gd name="q2" fmla="*/ w w 1" />
-      <gd name="q3" fmla="*/ ah ah 1" />
-      <gd name="q4" fmla="+- q2 0 q3" />
-      <gd name="q5" fmla="sqrt q4" />
-      <gd name="dy" fmla="*/ q5 hR w" />
-      <gd name="y5" fmla="+- hR dy 0" />
-
-      <gd name="y7" fmla="+- y3 dy 0" />
-
-      <gd name="q6" fmla="+- aw 0 th" />
-      <gd name="dh" fmla="*/ q6 1 2" />
-
-      <gd name="y4" fmla="+- y5 0 dh" />
-
-      <gd name="y8" fmla="+- y7 dh 0" />
-
-      <gd name="aw2" fmla="*/ aw 1 2" />
-      <gd name="y6" fmla="+- b 0 aw2" />
-
-      <gd name="x1" fmla="+- l ah 0" />
-      <gd name="swAng" fmla="at2 ah dy" />
-
-      <gd name="mswAng" fmla="+- 0 0 swAng" />
-      <gd name="ix" fmla="+- l idx 0" />
-
-      <gd name="iy" fmla="+/ hR y3 2" />
-
-      <gd name="q12" fmla="*/ th 1 2" />
-      <gd name="dang2" fmla="at2 idx q12" />
-      <gd name="swAng2" fmla="+- dang2 0 swAng" />
-      <gd name="swAng3" fmla="+- swAng dang2 0" />
-      <gd name="stAng3" fmla="+- 0 0 dang2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="a2">
-        <pos x="x1" y="y5" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="r" y="y4" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="0" maxX="maxAdj3">
-        <pos x="x1" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd2">
-        <pos x="l" y="q12" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y4" />
-      </cxn>
-      <cxn ang="cd3">
-        <pos x="l" y="y6" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="y8" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="iy" />
-      </cxn>
-    </cxnLst>
-
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="y6" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y5" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="swAng" swAng="swAng2" />
-        <arcTo wR="w" hR="hR" stAng="stAng3" swAng="swAng3" />
-        <lnTo>
-          <pt x="x1" y="y8" />
-        </lnTo>
-        <close />
-      </path>
-
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="r" y="y3" />
-        </moveTo>
-        <arcTo wR="w" hR="hR" stAng="0" swAng="-5400000" />
-        <lnTo>
-          <pt x="l" y="t" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="3cd4" swAng="cd4" />
-        <close />
-      </path>
-
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="r" y="y3" />
-        </moveTo>
-        <arcTo wR="w" hR="hR" stAng="0" swAng="-5400000" />
-        <lnTo>
-          <pt x="l" y="t" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y3" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="0" swAng="swAng" />
-        <lnTo>
-          <pt x="x1" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y5" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="swAng" swAng="swAng2" />
-      </path>
-    </pathLst>
-
-  </curvedLeftArrow>
-  <curvedRightArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 h ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="a1" fmla="pin 0 adj1 a2" />
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="aw" fmla="*/ ss a2 100000" />
-
-      <gd name="q1" fmla="+/ th aw 4" />
-
-      <gd name="hR" fmla="+- hd2 0 q1" />
-
-      <gd name="q7" fmla="*/ hR 2 1" />
-
-      <gd name="q8" fmla="*/ q7 q7 1" />
-
-      <gd name="q9" fmla="*/ th th 1" />
-
-      <gd name="q10" fmla="+- q8 0 q9" />
-      <gd name="q11" fmla="sqrt q10" />
-      <gd name="idx" fmla="*/ q11 w q7" />
-      <gd name="maxAdj3" fmla="*/ 100000 idx ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="ah" fmla="*/ ss a3 100000" />
-
-
-
-
-
-      <gd name="y3" fmla="+- hR th 0" />
-
-      <gd name="q2" fmla="*/ w w 1" />
-      <gd name="q3" fmla="*/ ah ah 1" />
-      <gd name="q4" fmla="+- q2 0 q3" />
-      <gd name="q5" fmla="sqrt q4" />
-      <gd name="dy" fmla="*/ q5 hR w" />
-      <gd name="y5" fmla="+- hR dy 0" />
-
-      <gd name="y7" fmla="+- y3 dy 0" />
-
-      <gd name="q6" fmla="+- aw 0 th" />
-      <gd name="dh" fmla="*/ q6 1 2" />
-
-      <gd name="y4" fmla="+- y5 0 dh" />
-
-      <gd name="y8" fmla="+- y7 dh 0" />
-
-      <gd name="aw2" fmla="*/ aw 1 2" />
-      <gd name="y6" fmla="+- b 0 aw2" />
-
-      <gd name="x1" fmla="+- r 0 ah" />
-      <gd name="swAng" fmla="at2 ah dy" />
-
-      <gd name="stAng" fmla="+- cd2 0 swAng" />
-      <gd name="mswAng" fmla="+- 0 0 swAng" />
-      <gd name="ix" fmla="+- r 0 idx" />
-
-      <gd name="iy" fmla="+/ hR y3 2" />
-
-      <gd name="q12" fmla="*/ th 1 2" />
-      <gd name="dang2" fmla="at2 idx q12" />
-      <gd name="swAng2" fmla="+- dang2 0 cd4" />
-      <gd name="swAng3" fmla="+- cd4 dang2 0" />
-      <gd name="stAng3" fmla="+- cd2 0 dang2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="a2">
-        <pos x="x1" y="y5" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="r" y="y4" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="0" maxX="maxAdj3">
-        <pos x="x1" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd2">
-        <pos x="l" y="iy" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="y8" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y6" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x1" y="y4" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="q12" />
-      </cxn>
-    </cxnLst>
-
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="hR" />
-        </moveTo>
-        <arcTo wR="w" hR="hR" stAng="cd2" swAng="mswAng" />
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y7" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="stAng" swAng="swAng" />
-        <close />
-      </path>
-
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="r" y="th" />
-        </moveTo>
-        <arcTo wR="w" hR="hR" stAng="3cd4" swAng="swAng2" />
-        <arcTo wR="w" hR="hR" stAng="stAng3" swAng="swAng3" />
-        <close />
-      </path>
-
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="hR" />
-        </moveTo>
-        <arcTo wR="w" hR="hR" stAng="cd2" swAng="mswAng" />
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y7" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="stAng" swAng="swAng" />
-        <lnTo>
-          <pt x="l" y="hR" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="th" />
-        </lnTo>
-        <arcTo wR="w" hR="hR" stAng="3cd4" swAng="swAng2" />
-      </path>
-    </pathLst>
-
-  </curvedRightArrow>
-  <curvedUpArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 w ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="aw" fmla="*/ ss a2 100000" />
-
-      <gd name="q1" fmla="+/ th aw 4" />
-
-      <gd name="wR" fmla="+- wd2 0 q1" />
-
-      <gd name="q7" fmla="*/ wR 2 1" />
-
-      <gd name="q8" fmla="*/ q7 q7 1" />
-
-      <gd name="q9" fmla="*/ th th 1" />
-
-      <gd name="q10" fmla="+- q8 0 q9" />
-      <gd name="q11" fmla="sqrt q10" />
-      <gd name="idy" fmla="*/ q11 h q7" />
-      <gd name="maxAdj3" fmla="*/ 100000 idy ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="ah" fmla="*/ ss adj3 100000" />
-
-
-
-
-
-      <gd name="x3" fmla="+- wR th 0" />
-
-      <gd name="q2" fmla="*/ h h 1" />
-      <gd name="q3" fmla="*/ ah ah 1" />
-      <gd name="q4" fmla="+- q2 0 q3" />
-      <gd name="q5" fmla="sqrt q4" />
-      <gd name="dx" fmla="*/ q5 wR h" />
-      <gd name="x5" fmla="+- wR dx 0" />
-
-      <gd name="x7" fmla="+- x3 dx 0" />
-
-      <gd name="q6" fmla="+- aw 0 th" />
-      <gd name="dh" fmla="*/ q6 1 2" />
-
-      <gd name="x4" fmla="+- x5 0 dh" />
-
-      <gd name="x8" fmla="+- x7 dh 0" />
-
-      <gd name="aw2" fmla="*/ aw 1 2" />
-      <gd name="x6" fmla="+- r 0 aw2" />
-
-      <gd name="y1" fmla="+- t ah 0" />
-      <gd name="swAng" fmla="at2 ah dx" />
-
-      <gd name="mswAng" fmla="+- 0 0 swAng" />
-      <gd name="iy" fmla="+- t idy 0" />
-
-      <gd name="ix" fmla="+/ wR x3 2" />
-
-      <gd name="q12" fmla="*/ th 1 2" />
-      <gd name="dang2" fmla="at2 idy q12" />
-      <gd name="swAng2" fmla="+- dang2 0 swAng" />
-      <gd name="mswAng2" fmla="+- 0 0 swAng2" />
-      <gd name="stAng3" fmla="+- cd4 0 swAng" />
-      <gd name="swAng3" fmla="+- swAng dang2 0" />
-      <gd name="stAng2" fmla="+- cd4 0 dang2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="a2">
-        <pos x="x7" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x4" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="y1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x6" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x4" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="q12" y="t" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ix" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x8" y="y1" />
-      </cxn>
-    </cxnLst>
-
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="x6" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y1" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="stAng3" swAng="swAng3" />
-        <arcTo wR="wR" hR="h" stAng="stAng2" swAng="swAng2" />
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <close />
-      </path>
-
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="wR" y="b" />
-        </moveTo>
-        <arcTo wR="wR" hR="h" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="th" y="t" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="cd2" swAng="-5400000" />
-        <close />
-      </path>
-
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="ix" y="iy" />
-        </moveTo>
-        <arcTo wR="wR" hR="h" stAng="stAng2" swAng="swAng2" />
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y1" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="stAng3" swAng="swAng" />
-        <lnTo>
-          <pt x="wR" y="b" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="th" y="t" />
-        </lnTo>
-        <arcTo wR="wR" hR="h" stAng="cd2" swAng="-5400000" />
-      </path>
-    </pathLst>
-
-  </curvedUpArrow>
-  <decagon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="vf" fmla="val 105146" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="shd2" fmla="*/ hd2 vf 100000" />
-      <gd name="dx1" fmla="cos wd2 2160000" />
-      <gd name="dx2" fmla="cos wd2 4320000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="dy1" fmla="sin shd2 4320000" />
-      <gd name="dy2" fmla="sin shd2 2160000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc dy2 0" />
-      <gd name="y4" fmla="+- vc dy1 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x4" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="y4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x3" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y2" r="x4" b="y3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </decagon>
-  <diagStripe>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 50000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 100000" />
-      <gd name="x2" fmla="*/ w a 100000" />
-      <gd name="x1" fmla="*/ x2 1 2" />
-      <gd name="x3" fmla="+/ x2 r 2" />
-      <gd name="y2" fmla="*/ h a 100000" />
-      <gd name="y1" fmla="*/ y2 1 2" />
-      <gd name="y3" fmla="+/ y2 b 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="100000">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="hc" y="vc" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="x3" b="y3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </diagStripe>
-  <diamond>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="ir" fmla="*/ w 3 4" />
-      <gd name="ib" fmla="*/ h 3 4" />
-    </gdLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="wd4" t="hd4" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </diamond>
-  <dodecagon>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x1" fmla="*/ w 2894 21600" />
-      <gd name="x2" fmla="*/ w 7906 21600" />
-      <gd name="x3" fmla="*/ w 13694 21600" />
-      <gd name="x4" fmla="*/ w 18706 21600" />
-      <gd name="y1" fmla="*/ h 2894 21600" />
-      <gd name="y2" fmla="*/ h 7906 21600" />
-      <gd name="y3" fmla="*/ h 13694 21600" />
-      <gd name="y4" fmla="*/ h 18706 21600" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x4" y="y1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y3" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y1" r="x4" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y3" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </dodecagon>
-  <donut>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dr" fmla="*/ ss a 100000" />
-      <gd name="iwd2" fmla="+- wd2 0 dr" />
-      <gd name="ihd2" fmla="+- hd2 0 dr" />
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefR="adj" minR="0" maxR="50000">
-        <pos x="dr" y="vc" />
-      </ahPolar>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-        <moveTo>
-          <pt x="dr" y="vc" />
-        </moveTo>
-        <arcTo wR="iwd2" hR="ihd2" stAng="cd2" swAng="-5400000" />
-        <arcTo wR="iwd2" hR="ihd2" stAng="cd4" swAng="-5400000" />
-        <arcTo wR="iwd2" hR="ihd2" stAng="0" swAng="-5400000" />
-        <arcTo wR="iwd2" hR="ihd2" stAng="3cd4" swAng="-5400000" />
-        <close />
-      </path>
-    </pathLst>
-
-  </donut>
-  <doubleWave>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 6250" />
-
-      <gd name="adj2" fmla="val 0" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 12500" />
-      <gd name="a2" fmla="pin -10000 adj2 10000" />
-      <gd name="y1" fmla="*/ h a1 100000" />
-
-      <gd name="dy2" fmla="*/ y1 10 3" />
-      <gd name="y2" fmla="+- y1 0 dy2" />
-
-      <gd name="y3" fmla="+- y1 dy2 0" />
-
-      <gd name="y4" fmla="+- b 0 y1" />
-
-      <gd name="y5" fmla="+- y4 0 dy2" />
-
-      <gd name="y6" fmla="+- y4 dy2 0" />
-
-      <gd name="dx1" fmla="*/ w a2 100000" />
-
-      <gd name="of2" fmla="*/ w a2 50000" />
-
-      <gd name="x1" fmla="abs dx1" />
-
-      <gd name="dx2" fmla="?: of2 0 of2" />
-      <gd name="x2" fmla="+- l 0 dx2" />
-
-      <gd name="dx8" fmla="?: of2 of2 0" />
-      <gd name="x8" fmla="+- r 0 dx8" />
-
-      <gd name="dx3" fmla="+/ dx2 x8 6" />
-      <gd name="x3" fmla="+- x2 dx3 0" />
-
-      <gd name="dx4" fmla="+/ dx2 x8 3" />
-      <gd name="x4" fmla="+- x2 dx4 0" />
-
-      <gd name="x5" fmla="+/ x2 x8 2" />
-
-      <gd name="x6" fmla="+- x5 dx3 0" />
-
-      <gd name="x7" fmla="+/ x6 x8 2" />
-
-      <gd name="x9" fmla="+- l dx8 0" />
-
-      <gd name="x15" fmla="+- r dx2 0" />
-
-      <gd name="x10" fmla="+- x9 dx3 0" />
-
-      <gd name="x11" fmla="+- x9 dx4 0" />
-
-      <gd name="x12" fmla="+/ x9 x15 2" />
-
-      <gd name="x13" fmla="+- x12 dx3 0" />
-
-      <gd name="x14" fmla="+/ x13 x15 2" />
-
-      <gd name="x16" fmla="+- r 0 x1" />
-
-      <gd name="xAdj" fmla="+- hc dx1 0" />
-      <gd name="il" fmla="max x2 x9" />
-      <gd name="ir" fmla="min x8 x15" />
-      <gd name="it" fmla="*/ h a1 50000" />
-      <gd name="ib" fmla="+- b 0 it" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="12500">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="-10000" maxX="10000">
-        <pos x="xAdj" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="x12" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x5" y="y4" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x16" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x2" y="y1" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="x3" y="y2" />
-          <pt x="x4" y="y3" />
-          <pt x="x5" y="y1" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x6" y="y2" />
-          <pt x="x7" y="y3" />
-          <pt x="x8" y="y1" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="x15" y="y4" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="x14" y="y6" />
-          <pt x="x13" y="y5" />
-          <pt x="x12" y="y4" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x11" y="y6" />
-          <pt x="x10" y="y5" />
-          <pt x="x9" y="y4" />
-        </cubicBezTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </doubleWave>
-  <downArrow>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 100000 h ss" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="dy1" fmla="*/ ss a2 100000" />
-      <gd name="y1" fmla="+- b 0 dy1" />
-      <gd name="dx1" fmla="*/ w a1 200000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc dx1 0" />
-      <gd name="dy2" fmla="*/ x1 dy1 wd2" />
-      <gd name="y2" fmla="+- y1 dy2 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="100000">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="l" y="y1" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y1" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y1" />
-      </cxn>
-    </cxnLst>
-    <rect l="x1" t="t" r="x2" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </downArrow>
-  <downArrowCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 64977" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 w ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ 100000 h ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q2" fmla="*/ a3 ss h" />
-
-      <gd name="maxAdj4" fmla="+- 100000 0 q2" />
-
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-      <gd name="dx1" fmla="*/ ss a2 100000" />
-
-      <gd name="dx2" fmla="*/ ss a1 200000" />
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="dy3" fmla="*/ ss a3 100000" />
-
-      <gd name="y3" fmla="+- b 0 dy3" />
-      <gd name="y2" fmla="*/ h a4 100000" />
-
-      <gd name="y1" fmla="*/ y2 1 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="x2" y="y3" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x1" y="b" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="y3" />
-      </ahXY>
-      <ahXY gdRefY="adj4" minY="0" maxY="maxAdj4">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y1" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </downArrowCallout>
-  <ellipse>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-  </ellipse>
-  <ellipseRibbon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 12500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 25000 adj2 75000" />
-      <gd name="q10" fmla="+- 100000 0 a1" />
-      <gd name="q11" fmla="*/ q10 1 2" />
-      <gd name="q12" fmla="+- a1 0 q11" />
-      <gd name="minAdj3" fmla="max 0 q12" />
-      <gd name="a3" fmla="pin minAdj3 adj3 a1" />
-
-
-      <gd name="dx2" fmla="*/ w a2 200000" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-
-      <gd name="x3" fmla="+- x2 wd8 0" />
-
-      <gd name="x4" fmla="+- r 0 x3" />
-
-      <gd name="x5" fmla="+- r 0 x2" />
-
-      <gd name="x6" fmla="+- r 0 wd8" />
-
-      <gd name="dy1" fmla="*/ h a3 100000" />
-
-      <gd name="f1" fmla="*/ 4 dy1 w" />
-
-      <gd name="q1" fmla="*/ x3 x3 w" />
-      <gd name="q2" fmla="+- x3 0 q1" />
-      <gd name="y1" fmla="*/ f1 q2 1" />
-
-      <gd name="cx1" fmla="*/ x3 1 2" />
-
-      <gd name="cy1" fmla="*/ f1 cx1 1" />
-
-      <gd name="cx2" fmla="+- r 0 cx1" />
-
-
-
-      <gd name="q1" fmla="*/ h a1 100000" />
-
-      <gd name="dy3" fmla="+- q1 0 dy1" />
-
-      <gd name="q3" fmla="*/ x2 x2 w" />
-      <gd name="q4" fmla="+- x2 0 q3" />
-      <gd name="q5" fmla="*/ f1 q4 1" />
-      <gd name="y3" fmla="+- q5 dy3 0" />
-
-
-
-      <gd name="q6" fmla="+- dy1 dy3 y3" />
-      <gd name="q7" fmla="+- q6 dy1 0" />
-      <gd name="cy3" fmla="+- q7 dy3 0" />
-
-      <gd name="rh" fmla="+- b 0 q1" />
-
-      <gd name="q8" fmla="*/ dy1 14 16" />
-      <gd name="y2" fmla="+/ q8 rh 2" />
-
-
-      <gd name="y5" fmla="+- q5 rh 0" />
-
-      <gd name="y6" fmla="+- y3 rh 0" />
-
-      <gd name="cx4" fmla="*/ x2 1 2" />
-
-      <gd name="q9" fmla="*/ f1 cx4 1" />
-      <gd name="cy4" fmla="+- q9 rh 0" />
-
-      <gd name="cx5" fmla="+- r 0 cx4" />
-
-
-
-
-
-      <gd name="cy6" fmla="+- cy3 rh 0" />
-
-      <gd name="y7" fmla="+- y1 dy3 0" />
-      <gd name="cy7" fmla="+- q1 q1 y7" />
-      <gd name="y8" fmla="+- b 0 dy1" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="hc" y="q1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="25000" maxX="75000">
-        <pos x="x2" y="b" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="minAdj3" maxY="a1">
-        <pos x="l" y="y8" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="q1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd8" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="y2" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="q1" r="x5" b="y6" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <quadBezTo>
-          <pt x="cx1" y="cy1" />
-          <pt x="x3" y="y1" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy3" />
-          <pt x="x5" y="y3" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx2" y="cy1" />
-          <pt x="r" y="t" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="rh" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx5" y="cy4" />
-          <pt x="x5" y="y5" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x5" y="y6" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy6" />
-          <pt x="x2" y="y6" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x2" y="y5" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx4" y="cy4" />
-          <pt x="l" y="rh" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="wd8" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="x3" y="y7" />
-        </moveTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy3" />
-          <pt x="x5" y="y3" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y7" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy7" />
-          <pt x="x3" y="y7" />
-        </quadBezTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <quadBezTo>
-          <pt x="cx1" y="cy1" />
-          <pt x="x3" y="y1" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy3" />
-          <pt x="x5" y="y3" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx2" y="cy1" />
-          <pt x="r" y="t" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="rh" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx5" y="cy4" />
-          <pt x="x5" y="y5" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x5" y="y6" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy6" />
-          <pt x="x2" y="y6" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x2" y="y5" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx4" y="cy4" />
-          <pt x="l" y="rh" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="wd8" y="y2" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x2" y="y5" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <moveTo>
-          <pt x="x5" y="y3" />
-        </moveTo>
-        <lnTo>
-          <pt x="x5" y="y5" />
-        </lnTo>
-        <moveTo>
-          <pt x="x3" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x3" y="y7" />
-        </lnTo>
-        <moveTo>
-          <pt x="x4" y="y7" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </ellipseRibbon>
-  <ellipseRibbon2>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 12500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 25000 adj2 75000" />
-      <gd name="q10" fmla="+- 100000 0 a1" />
-      <gd name="q11" fmla="*/ q10 1 2" />
-      <gd name="q12" fmla="+- a1 0 q11" />
-      <gd name="minAdj3" fmla="max 0 q12" />
-      <gd name="a3" fmla="pin minAdj3 adj3 a1" />
-      <gd name="dx2" fmla="*/ w a2 200000" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-
-      <gd name="x3" fmla="+- x2 wd8 0" />
-
-      <gd name="x4" fmla="+- r 0 x3" />
-
-      <gd name="x5" fmla="+- r 0 x2" />
-
-      <gd name="x6" fmla="+- r 0 wd8" />
-
-      <gd name="dy1" fmla="*/ h a3 100000" />
-
-      <gd name="f1" fmla="*/ 4 dy1 w" />
-
-      <gd name="q1" fmla="*/ x3 x3 w" />
-      <gd name="q2" fmla="+- x3 0 q1" />
-      <gd name="u1" fmla="*/ f1 q2 1" />
-
-      <gd name="y1" fmla="+- b 0 u1" />
-      <gd name="cx1" fmla="*/ x3 1 2" />
-
-      <gd name="cu1" fmla="*/ f1 cx1 1" />
-
-      <gd name="cy1" fmla="+- b 0 cu1" />
-      <gd name="cx2" fmla="+- r 0 cx1" />
-
-
-
-      <gd name="q1" fmla="*/ h a1 100000" />
-
-      <gd name="dy3" fmla="+- q1 0 dy1" />
-
-      <gd name="q3" fmla="*/ x2 x2 w" />
-      <gd name="q4" fmla="+- x2 0 q3" />
-      <gd name="q5" fmla="*/ f1 q4 1" />
-      <gd name="u3" fmla="+- q5 dy3 0" />
-
-      <gd name="y3" fmla="+- b 0 u3" />
-
-
-      <gd name="q6" fmla="+- dy1 dy3 u3" />
-      <gd name="q7" fmla="+- q6 dy1 0" />
-      <gd name="cu3" fmla="+- q7 dy3 0" />
-
-      <gd name="cy3" fmla="+- b 0 cu3" />
-      <gd name="rh" fmla="+- b 0 q1" />
-
-      <gd name="q8" fmla="*/ dy1 14 16" />
-      <gd name="u2" fmla="+/ q8 rh 2" />
-
-      <gd name="y2" fmla="+- b 0 u2" />
-
-      <gd name="u5" fmla="+- q5 rh 0" />
-
-      <gd name="y5" fmla="+- b 0 u5" />
-      <gd name="u6" fmla="+- u3 rh 0" />
-
-      <gd name="y6" fmla="+- b 0 u6" />
-      <gd name="cx4" fmla="*/ x2 1 2" />
-
-      <gd name="q9" fmla="*/ f1 cx4 1" />
-      <gd name="cu4" fmla="+- q9 rh 0" />
-
-      <gd name="cy4" fmla="+- b 0 cu4" />
-      <gd name="cx5" fmla="+- r 0 cx4" />
-
-
-
-
-
-      <gd name="cu6" fmla="+- cu3 rh 0" />
-
-      <gd name="cy6" fmla="+- b 0 cu6" />
-      <gd name="u7" fmla="+- u1 dy3 0" />
-      <gd name="y7" fmla="+- b 0 u7" />
-      <gd name="cu7" fmla="+- q1 q1 u7" />
-      <gd name="cy7" fmla="+- b 0 cu7" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="hc" y="rh" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="25000" maxX="100000">
-        <pos x="x2" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="minAdj3" maxY="a1">
-        <pos x="l" y="dy1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd8" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="rh" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="y2" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="y6" r="x5" b="rh" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <quadBezTo>
-          <pt x="cx1" y="cy1" />
-          <pt x="x3" y="y1" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy3" />
-          <pt x="x5" y="y3" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx2" y="cy1" />
-          <pt x="r" y="b" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="q1" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx5" y="cy4" />
-          <pt x="x5" y="y5" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x5" y="y6" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy6" />
-          <pt x="x2" y="y6" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x2" y="y5" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx4" y="cy4" />
-          <pt x="l" y="q1" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="wd8" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="x3" y="y7" />
-        </moveTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy3" />
-          <pt x="x5" y="y3" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y7" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy7" />
-          <pt x="x3" y="y7" />
-        </quadBezTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="wd8" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="q1" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx4" y="cy4" />
-          <pt x="x2" y="y5" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x2" y="y6" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy6" />
-          <pt x="x5" y="y6" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x5" y="y5" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx5" y="cy4" />
-          <pt x="r" y="q1" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx2" y="cy1" />
-          <pt x="x4" y="y1" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x5" y="y3" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="hc" y="cy3" />
-          <pt x="x2" y="y3" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="cx1" y="cy1" />
-          <pt x="l" y="b" />
-        </quadBezTo>
-        <close />
-        <moveTo>
-          <pt x="x2" y="y3" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y5" />
-        </lnTo>
-        <moveTo>
-          <pt x="x5" y="y5" />
-        </moveTo>
-        <lnTo>
-          <pt x="x5" y="y3" />
-        </lnTo>
-        <moveTo>
-          <pt x="x3" y="y7" />
-        </moveTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <moveTo>
-          <pt x="x4" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="y7" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </ellipseRibbon2>
-  <flowChartAlternateProcess>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="+- r 0 ssd6" />
-      <gd name="y2" fmla="+- b 0 ssd6" />
-      <gd name="il" fmla="*/ ssd6 29289 100000" />
-
-
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 il" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="ssd6" />
-        </moveTo>
-        <arcTo wR="ssd6" hR="ssd6" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <arcTo wR="ssd6" hR="ssd6" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <arcTo wR="ssd6" hR="ssd6" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="ssd6" y="b" />
-        </lnTo>
-        <arcTo wR="ssd6" hR="ssd6" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartAlternateProcess>
-  <flowChartCollate>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="ir" fmla="*/ w 3 4" />
-      <gd name="ib" fmla="*/ h 3 4" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd4" t="hd4" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="2" h="2">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="2" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="2" y="2" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="2" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartCollate>
-  <flowChartConnector>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartConnector>
-  <flowChartDecision>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="ir" fmla="*/ w 3 4" />
-      <gd name="ib" fmla="*/ h 3 4" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd4" t="hd4" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="2" h="2">
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="2" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartDecision>
-  <flowChartDelay>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartDelay>
-  <flowChartDisplay>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 5 6" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd6" t="t" r="x2" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="6" h="6">
-        <moveTo>
-          <pt x="0" y="3" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="5" y="0" />
-        </lnTo>
-        <arcTo wR="1" hR="3" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="1" y="6" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartDisplay>
-  <flowChartDocument>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h 17322 21600" />
-      <gd name="y2" fmla="*/ h 20172 21600" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="y1" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="21600" h="21600">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="21600" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="17322" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="10800" y="17322" />
-          <pt x="10800" y="23922" />
-          <pt x="0" y="20172" />
-        </cubicBezTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartDocument>
-  <flowChartExtract>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 3 4" />
-    </gdLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd4" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd4" t="vc" r="x2" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="2" h="2">
-        <moveTo>
-          <pt x="0" y="2" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="2" y="2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartExtract>
-  <flowChartInputOutput>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x3" fmla="*/ w 2 5" />
-      <gd name="x4" fmla="*/ w 3 5" />
-      <gd name="x5" fmla="*/ w 4 5" />
-      <gd name="x6" fmla="*/ w 9 10" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x4" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd10" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd5" t="t" r="x5" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="5" h="5">
-        <moveTo>
-          <pt x="0" y="5" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="5" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="4" y="5" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartInputOutput>
-  <flowChartInternalStorage>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd8" t="hd8" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false" w="1" h="1">
-
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="1" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false" w="8" h="8">
-
-        <moveTo>
-          <pt x="1" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="8" />
-        </lnTo>
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <lnTo>
-          <pt x="8" y="1" />
-        </lnTo>
-      </path>
-      <path fill="none" w="1" h="1">
-
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartInternalStorage>
-  <flowChartMagneticDisk>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y3" fmla="*/ h 5 6" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="hd3" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="hd3" r="r" b="y3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false" w="6" h="6">
-
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <arcTo wR="3" hR="1" stAng="cd2" swAng="cd2" />
-        <lnTo>
-          <pt x="6" y="5" />
-        </lnTo>
-        <arcTo wR="3" hR="1" stAng="0" swAng="cd2" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false" w="6" h="6">
-
-        <moveTo>
-          <pt x="6" y="1" />
-        </moveTo>
-        <arcTo wR="3" hR="1" stAng="0" swAng="cd2" />
-      </path>
-      <path fill="none" w="6" h="6">
-
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <arcTo wR="3" hR="1" stAng="cd2" swAng="cd2" />
-        <lnTo>
-          <pt x="6" y="5" />
-        </lnTo>
-        <arcTo wR="3" hR="1" stAng="0" swAng="cd2" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartMagneticDisk>
-  <flowChartMagneticDrum>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 2 3" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd6" t="t" r="x2" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false" w="6" h="6">
-
-        <moveTo>
-          <pt x="1" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="5" y="0" />
-        </lnTo>
-        <arcTo wR="1" hR="3" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="1" y="6" />
-        </lnTo>
-        <arcTo wR="1" hR="3" stAng="cd4" swAng="cd2" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false" w="6" h="6">
-
-        <moveTo>
-          <pt x="5" y="6" />
-        </moveTo>
-        <arcTo wR="1" hR="3" stAng="cd4" swAng="cd2" />
-      </path>
-      <path fill="none" w="6" h="6">
-
-        <moveTo>
-          <pt x="1" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="5" y="0" />
-        </lnTo>
-        <arcTo wR="1" hR="3" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="1" y="6" />
-        </lnTo>
-        <arcTo wR="1" hR="3" stAng="cd4" swAng="cd2" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartMagneticDrum>
-  <flowChartMagneticTape>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-      <gd name="ang1" fmla="at2 w h" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="hc" y="b" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="ang1" />
-        <lnTo>
-          <pt x="r" y="ib" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartMagneticTape>
-  <flowChartManualInput>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="hd10" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="hd5" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="5" h="5">
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <lnTo>
-          <pt x="5" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="5" y="5" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="5" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartManualInput>
-  <flowChartManualOperation>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x3" fmla="*/ w 4 5" />
-      <gd name="x4" fmla="*/ w 9 10" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd10" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd5" t="t" r="x3" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="5" h="5">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="5" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="4" y="5" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="5" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartManualOperation>
-  <flowChartMerge>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 3 4" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd4" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd4" t="t" r="x2" b="vc" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="2" h="2">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="2" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartMerge>
-  <flowChartMultidocument>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y2" fmla="*/ h 3675 21600" />
-      <gd name="y8" fmla="*/ h 20782 21600" />
-      <gd name="x3" fmla="*/ w 9298 21600" />
-      <gd name="x4" fmla="*/ w 12286 21600" />
-      <gd name="x5" fmla="*/ w 18595 21600" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x4" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y8" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="y2" r="x5" b="y8" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false" w="21600" h="21600">
-
-        <moveTo>
-          <pt x="0" y="20782" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="9298" y="23542" />
-          <pt x="9298" y="18022" />
-          <pt x="18595" y="18022" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="18595" y="3675" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="3675" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="1532" y="3675" />
-        </moveTo>
-        <lnTo>
-          <pt x="1532" y="1815" />
-        </lnTo>
-        <lnTo>
-          <pt x="20000" y="1815" />
-        </lnTo>
-        <lnTo>
-          <pt x="20000" y="16252" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="19298" y="16252" />
-          <pt x="18595" y="16352" />
-          <pt x="18595" y="16352" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="18595" y="3675" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="2972" y="1815" />
-        </moveTo>
-        <lnTo>
-          <pt x="2972" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="14392" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="20800" y="14392" />
-          <pt x="20000" y="14467" />
-          <pt x="20000" y="14467" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="20000" y="1815" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false" w="21600" h="21600">
-
-        <moveTo>
-          <pt x="0" y="3675" />
-        </moveTo>
-        <lnTo>
-          <pt x="18595" y="3675" />
-        </lnTo>
-        <lnTo>
-          <pt x="18595" y="18022" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="9298" y="18022" />
-          <pt x="9298" y="23542" />
-          <pt x="0" y="20782" />
-        </cubicBezTo>
-        <close />
-        <moveTo>
-          <pt x="1532" y="3675" />
-        </moveTo>
-        <lnTo>
-          <pt x="1532" y="1815" />
-        </lnTo>
-        <lnTo>
-          <pt x="20000" y="1815" />
-        </lnTo>
-        <lnTo>
-          <pt x="20000" y="16252" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="19298" y="16252" />
-          <pt x="18595" y="16352" />
-          <pt x="18595" y="16352" />
-        </cubicBezTo>
-        <moveTo>
-          <pt x="2972" y="1815" />
-        </moveTo>
-        <lnTo>
-          <pt x="2972" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="14392" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="20800" y="14392" />
-          <pt x="20000" y="14467" />
-          <pt x="20000" y="14467" />
-        </cubicBezTo>
-      </path>
-      <path stroke="false" fill="none" w="21600" h="21600">
-
-        <moveTo>
-          <pt x="0" y="20782" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="9298" y="23542" />
-          <pt x="9298" y="18022" />
-          <pt x="18595" y="18022" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="18595" y="16352" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="18595" y="16352" />
-          <pt x="19298" y="16252" />
-          <pt x="20000" y="16252" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="20000" y="14467" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="20000" y="14467" />
-          <pt x="20800" y="14392" />
-          <pt x="21600" y="14392" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="21600" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="2972" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="2972" y="1815" />
-        </lnTo>
-        <lnTo>
-          <pt x="1532" y="1815" />
-        </lnTo>
-        <lnTo>
-          <pt x="1532" y="3675" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="3675" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartMultidocument>
-  <flowChartOfflineStorage>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x4" fmla="*/ w 3 4" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x4" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd4" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd4" t="t" r="x4" b="vc" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false" w="2" h="2">
-
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="2" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false" w="5" h="5">
-
-        <moveTo>
-          <pt x="2" y="4" />
-        </moveTo>
-        <lnTo>
-          <pt x="3" y="4" />
-        </lnTo>
-      </path>
-      <path fill="none" extrusionOk="true" w="2" h="2">
-
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="2" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartOfflineStorage>
-  <flowChartOffpageConnector>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y1" fmla="*/ h 4 5" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="y1" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="10" h="10">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="10" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="8" />
-        </lnTo>
-        <lnTo>
-          <pt x="5" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="8" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartOffpageConnector>
-  <flowChartOnlineStorage>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 5 6" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd6" t="t" r="x2" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="6" h="6">
-        <moveTo>
-          <pt x="1" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="6" y="0" />
-        </lnTo>
-        <arcTo wR="1" hR="3" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="1" y="6" />
-        </lnTo>
-        <arcTo wR="1" hR="3" stAng="cd4" swAng="cd2" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartOnlineStorage>
-  <flowChartOr>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="hc" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-      </path>
-      <path fill="none">
-
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartOr>
-  <flowChartPredefinedProcess>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 7 8" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd8" t="t" r="x2" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false" w="1" h="1">
-
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="1" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false" w="8" h="8">
-
-        <moveTo>
-          <pt x="1" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="8" />
-        </lnTo>
-        <moveTo>
-          <pt x="7" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="7" y="8" />
-        </lnTo>
-      </path>
-      <path fill="none" w="1" h="1">
-
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartPredefinedProcess>
-  <flowChartPreparation>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 4 5" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd5" t="t" r="x2" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="10" h="10">
-        <moveTo>
-          <pt x="0" y="5" />
-        </moveTo>
-        <lnTo>
-          <pt x="2" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="8" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="10" y="5" />
-        </lnTo>
-        <lnTo>
-          <pt x="8" y="10" />
-        </lnTo>
-        <lnTo>
-          <pt x="2" y="10" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartPreparation>
-  <flowChartProcess>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="1" h="1">
-        <moveTo>
-          <pt x="0" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartProcess>
-  <flowChartPunchedCard>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="hd5" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="5" h="5">
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="5" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="5" y="5" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="5" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartPunchedCard>
-  <flowChartPunchedTape>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="y2" fmla="*/ h 9 10" />
-      <gd name="ib" fmla="*/ h 4 5" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="hd10" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="hd5" r="r" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="20" h="20">
-        <moveTo>
-          <pt x="0" y="2" />
-        </moveTo>
-        <arcTo wR="5" hR="2" stAng="cd2" swAng="-10800000" />
-        <arcTo wR="5" hR="2" stAng="cd2" swAng="cd2" />
-        <lnTo>
-          <pt x="20" y="18" />
-        </lnTo>
-        <arcTo wR="5" hR="2" stAng="0" swAng="-10800000" />
-        <arcTo wR="5" hR="2" stAng="0" swAng="cd2" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartPunchedTape>
-  <flowChartSort>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="ir" fmla="*/ w 3 4" />
-      <gd name="ib" fmla="*/ h 3 4" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="wd4" t="hd4" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false" w="2" h="2">
-
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="2" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false" w="2" h="2">
-
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <lnTo>
-          <pt x="2" y="1" />
-        </lnTo>
-      </path>
-      <path fill="none" w="2" h="2">
-
-        <moveTo>
-          <pt x="0" y="1" />
-        </moveTo>
-        <lnTo>
-          <pt x="1" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="2" y="1" />
-        </lnTo>
-        <lnTo>
-          <pt x="1" y="2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartSort>
-  <flowChartSummingJunction>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="il" y="it" />
-        </moveTo>
-        <lnTo>
-          <pt x="ir" y="ib" />
-        </lnTo>
-        <moveTo>
-          <pt x="ir" y="it" />
-        </moveTo>
-        <lnTo>
-          <pt x="il" y="ib" />
-        </lnTo>
-      </path>
-      <path fill="none">
-
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartSummingJunction>
-  <flowChartTerminator>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="il" fmla="*/ w 1018 21600" />
-      <gd name="ir" fmla="*/ w 20582 21600" />
-      <gd name="it" fmla="*/ h 3163 21600" />
-      <gd name="ib" fmla="*/ h 18437 21600" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="21600" h="21600">
-        <moveTo>
-          <pt x="3475" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="18125" y="0" />
-        </lnTo>
-        <arcTo wR="3475" hR="10800" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="3475" y="21600" />
-        </lnTo>
-        <arcTo wR="3475" hR="10800" stAng="cd4" swAng="cd2" />
-        <close />
-      </path>
-    </pathLst>
-
-  </flowChartTerminator>
-  <foldedCorner>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 16667" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dy2" fmla="*/ ss a 100000" />
-      <gd name="dy1" fmla="*/ dy2 1 5" />
-      <gd name="x1" fmla="+- r 0 dy2" />
-      <gd name="x2" fmla="+- x1 dy1 0" />
-      <gd name="y2" fmla="+- b 0 dy2" />
-      <gd name="y1" fmla="+- y2 dy1 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x1" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-        <moveTo>
-          <pt x="x1" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </foldedCorner>
-  <frame>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 12500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="x1" fmla="*/ ss a1 100000" />
-
-      <gd name="x4" fmla="+- r 0 x1" />
-
-
-
-      <gd name="y4" fmla="+- b 0 x1" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="x1" r="x4" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x1" y="x1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="x1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </frame>
-  <funnel>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="d" fmla="*/ ss 1 20" />
-
-
-      <gd name="rw2" fmla="+- wd2 0 d" />
-
-      <gd name="rh2" fmla="+- hd4 0 d" />
-
-
-
-      <gd name="t1" fmla="cos wd2 480000" />
-
-      <gd name="t2" fmla="sin hd4 480000" />
-
-      <gd name="da" fmla="at2 t1 t2" />
-
-
-      <gd name="2da" fmla="*/ da 2 1" />
-      <gd name="stAng1" fmla="+- cd2 0 da" />
-      <gd name="swAng1" fmla="+- cd2 2da 0" />
-
-
-      <gd name="swAng3" fmla="+- cd2 0 2da" />
-
-
-      <gd name="rw3" fmla="*/ wd2 1 4" />
-      <gd name="rh3" fmla="*/ hd4 1 4" />
-
-
-      <gd name="ct1" fmla="cos hd4 stAng1" />
-      <gd name="st1" fmla="sin wd2 stAng1" />
-      <gd name="m1" fmla="mod ct1 st1 0" />
-      <gd name="n1" fmla="*/ wd2 hd4 m1" />
-      <gd name="dx1" fmla="cos n1 stAng1" />
-      <gd name="dy1" fmla="sin n1 stAng1" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- hd4 dy1 0" />
-
-
-      <gd name="ct3" fmla="cos rh3 da" />
-      <gd name="st3" fmla="sin rw3 da" />
-      <gd name="m3" fmla="mod ct3 st3 0" />
-      <gd name="n3" fmla="*/ rw3 rh3 m3" />
-      <gd name="dx3" fmla="cos n3 da" />
-      <gd name="dy3" fmla="sin n3 da" />
-      <gd name="x3" fmla="+- hc dx3 0" />
-      <gd name="vc3" fmla="+- b 0 rh3" />
-      <gd name="y2" fmla="+- vc3 dy3 0" />
-
-
-      <gd name="x2" fmla="+- wd2 0 rw2" />
-
-      <gd name="cd" fmla="*/ cd2 2 1" />
-    </gdLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <arcTo hR="hd4" wR="wd2" stAng="stAng1" swAng="swAng1" />
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <arcTo hR="rh3" wR="rw3" stAng="da" swAng="swAng3" />
-        <close />
-        <moveTo>
-          <pt x="x2" y="hd4" />
-        </moveTo>
-        <arcTo hR="rh2" wR="rw2" stAng="cd2" swAng="-21600000" />
-        <close />
-      </path>
-    </pathLst>
-
-  </funnel>
-  <gear6>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 15000" />
-
-      <gd name="adj2" fmla="val 3526" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-
-
-
-      <gd name="a1" fmla="pin 0 adj1 20000" />
-      <gd name="a2" fmla="pin 0 adj2 5358" />
-
-
-      <gd name="th" fmla="*/ ss a1 100000" />
-      <gd name="lFD" fmla="*/ ss a2 100000" />
-
-      <gd name="th2" fmla="*/ th 1 2" />
-      <gd name="l2" fmla="*/ lFD 1 2" />
-      <gd name="l3" fmla="+- th2 l2 0" />
-
-
-      <gd name="rh" fmla="+- hd2 0 th" />
-      <gd name="rw" fmla="+- wd2 0 th" />
-
-
-      <gd name="dr" fmla="+- rw 0 rh" />
-      <gd name="maxr" fmla="?: dr rh rw" />
-      <gd name="ha" fmla="at2 maxr l3" />
-
-
-      <gd name="aA1" fmla="+- 19800000 0 ha" />
-      <gd name="aD1" fmla="+- 19800000 ha 0" />
-
-
-      <gd name="ta11" fmla="cos rw aA1" />
-      <gd name="ta12" fmla="sin rh aA1" />
-      <gd name="bA1" fmla="at2 ta11 ta12" />
-
-      <gd name="cta1" fmla="cos rh bA1" />
-      <gd name="sta1" fmla="sin rw bA1" />
-      <gd name="ma1" fmla="mod cta1 sta1 0" />
-      <gd name="na1" fmla="*/ rw rh ma1" />
-      <gd name="dxa1" fmla="cos na1 bA1" />
-      <gd name="dya1" fmla="sin na1 bA1" />
-      <gd name="xA1" fmla="+- hc dxa1 0" />
-      <gd name="yA1" fmla="+- vc dya1 0" />
-
-
-      <gd name="td11" fmla="cos rw aD1" />
-      <gd name="td12" fmla="sin rh aD1" />
-      <gd name="bD1" fmla="at2 td11 td12" />
-
-      <gd name="ctd1" fmla="cos rh bD1" />
-      <gd name="std1" fmla="sin rw bD1" />
-      <gd name="md1" fmla="mod ctd1 std1 0" />
-      <gd name="nd1" fmla="*/ rw rh md1" />
-      <gd name="dxd1" fmla="cos nd1 bD1" />
-      <gd name="dyd1" fmla="sin nd1 bD1" />
-      <gd name="xD1" fmla="+- hc dxd1 0" />
-      <gd name="yD1" fmla="+- vc dyd1 0" />
-
-
-      <gd name="xAD1" fmla="+- xA1 0 xD1" />
-      <gd name="yAD1" fmla="+- yA1 0 yD1" />
-      <gd name="lAD1" fmla="mod xAD1 yAD1 0" />
-      <gd name="a1" fmla="at2 yAD1 xAD1" />
-
-
-      <gd name="dxF1" fmla="sin lFD a1" />
-      <gd name="dyF1" fmla="cos lFD a1" />
-      <gd name="xF1" fmla="+- xD1 dxF1 0" />
-      <gd name="yF1" fmla="+- yD1 dyF1 0" />
-      <gd name="xE1" fmla="+- xA1 0 dxF1" />
-      <gd name="yE1" fmla="+- yA1 0 dyF1" />
-
-
-      <gd name="yC1t" fmla="sin th a1" />
-      <gd name="xC1t" fmla="cos th a1" />
-      <gd name="yC1" fmla="+- yF1 yC1t 0" />
-      <gd name="xC1" fmla="+- xF1 0 xC1t" />
-
-
-      <gd name="yB1" fmla="+- yE1 yC1t 0" />
-      <gd name="xB1" fmla="+- xE1 0 xC1t" />
-
-
-      <gd name="aD6" fmla="+- 3cd4 ha 0" />
-
-
-      <gd name="td61" fmla="cos rw aD6" />
-      <gd name="td62" fmla="sin rh aD6" />
-      <gd name="bD6" fmla="at2 td61 td62" />
-
-      <gd name="ctd6" fmla="cos rh bD6" />
-      <gd name="std6" fmla="sin rw bD6" />
-      <gd name="md6" fmla="mod ctd6 std6 0" />
-      <gd name="nd6" fmla="*/ rw rh md6" />
-      <gd name="dxd6" fmla="cos nd6 bD6" />
-      <gd name="dyd6" fmla="sin nd6 bD6" />
-      <gd name="xD6" fmla="+- hc dxd6 0" />
-      <gd name="yD6" fmla="+- vc dyd6 0" />
-
-
-      <gd name="xA6" fmla="+- hc 0 dxd6" />
-
-
-      <gd name="xF6" fmla="+- xD6 0 lFD" />
-      <gd name="xE6" fmla="+- xA6 lFD 0" />
-
-
-      <gd name="yC6" fmla="+- yD6 0 th" />
-
-      <gd name="swAng1" fmla="+- bA1 0 bD6" />
-
-
-      <gd name="aA2" fmla="+- 1800000 0 ha" />
-      <gd name="aD2" fmla="+- 1800000 ha 0" />
-
-
-      <gd name="ta21" fmla="cos rw aA2" />
-      <gd name="ta22" fmla="sin rh aA2" />
-      <gd name="bA2" fmla="at2 ta21 ta22" />
-
-      <gd name="yA2" fmla="+- h 0 yD1" />
-
-
-      <gd name="td21" fmla="cos rw aD2" />
-      <gd name="td22" fmla="sin rh aD2" />
-      <gd name="bD2" fmla="at2 td21 td22" />
-
-      <gd name="yD2" fmla="+- h 0 yA1" />
-
-
-      <gd name="yC2" fmla="+- h 0 yB1" />
-
-
-      <gd name="yB2" fmla="+- h 0 yC1" />
-      <gd name="xB2" fmla="val xC1" />
-
-      <gd name="swAng2" fmla="+- bA2 0 bD1" />
-
-
-      <gd name="aD3" fmla="+- cd4 ha 0" />
-
-      <gd name="td31" fmla="cos rw aD3" />
-      <gd name="td32" fmla="sin rh aD3" />
-      <gd name="bD3" fmla="at2 td31 td32" />
-
-
-      <gd name="yD3" fmla="+- h 0 yD6" />
-
-
-      <gd name="yB3" fmla="+- h 0 yC6" />
-
-
-      <gd name="aD4" fmla="+- 9000000 ha 0" />
-
-      <gd name="td41" fmla="cos rw aD4" />
-      <gd name="td42" fmla="sin rh aD4" />
-      <gd name="bD4" fmla="at2 td41 td42" />
-
-
-      <gd name="xD4" fmla="+- w 0 xD1" />
-
-
-      <gd name="xC4" fmla="+- w 0 xC1" />
-
-
-      <gd name="xB4" fmla="+- w 0 xB1" />
-
-
-      <gd name="aD5" fmla="+- 12600000 ha 0" />
-
-      <gd name="td51" fmla="cos rw aD5" />
-      <gd name="td52" fmla="sin rh aD5" />
-      <gd name="bD5" fmla="at2 td51 td52" />
-
-
-      <gd name="xD5" fmla="+- w 0 xA1" />
-
-
-      <gd name="xC5" fmla="+- w 0 xB1" />
-
-
-      <gd name="xB5" fmla="+- w 0 xC1" />
-
-
-      <gd name="xCxn1" fmla="+/ xB1 xC1 2" />
-      <gd name="yCxn1" fmla="+/ yB1 yC1 2" />
-      <gd name="yCxn2" fmla="+- b 0 yCxn1" />
-      <gd name="xCxn4" fmla="+/ r 0 xCxn1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="20000">
-        <pos x="xD6" y="yD6" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="5358">
-        <pos x="xA6" y="yD6" />
-      </ahXY>
-
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="19800000">
-        <pos x="xCxn1" y="yCxn1" />
-      </cxn>
-
-      <cxn ang="1800000">
-        <pos x="xCxn1" y="yCxn2" />
-      </cxn>
-
-      <cxn ang="cd4">
-        <pos x="hc" y="yB3" />
-      </cxn>
-
-      <cxn ang="9000000">
-        <pos x="xCxn4" y="yCxn2" />
-      </cxn>
-
-      <cxn ang="12600000">
-        <pos x="xCxn4" y="yCxn1" />
-      </cxn>
-
-      <cxn ang="3cd4">
-        <pos x="hc" y="yC6" />
-      </cxn>
-
-    </cxnLst>
-
-    <rect l="xD5" t="yA1" r="xA1" b="yD2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="xA1" y="yA1" />
-        </moveTo>
-        <lnTo>
-          <pt x="xB1" y="yB1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC1" y="yC1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD1" y="yD1" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD1" swAng="swAng2" />
-
-        <lnTo>
-          <pt x="xC1" y="yB2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xB1" y="yC2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xA1" y="yD2" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD2" swAng="swAng1" />
-
-        <lnTo>
-          <pt x="xF6" y="yB3" />
-        </lnTo>
-        <lnTo>
-          <pt x="xE6" y="yB3" />
-        </lnTo>
-        <lnTo>
-          <pt x="xA6" y="yD3" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD3" swAng="swAng1" />
-
-        <lnTo>
-          <pt x="xB4" y="yC2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC4" y="yB2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD4" y="yA2" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD4" swAng="swAng2" />
-
-        <lnTo>
-          <pt x="xB5" y="yC1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC5" y="yB1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD5" y="yA1" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD5" swAng="swAng1" />
-
-        <lnTo>
-          <pt x="xE6" y="yC6" />
-        </lnTo>
-        <lnTo>
-          <pt x="xF6" y="yC6" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD6" y="yD6" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD6" swAng="swAng1" />
-        <close />
-      </path>
-    </pathLst>
-
-  </gear6>
-  <gear9>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 10000" />
-
-      <gd name="adj2" fmla="val 1763" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-
-
-
-      <gd name="a1" fmla="pin 0 adj1 20000" />
-      <gd name="a2" fmla="pin 0 adj2 2679" />
-
-
-      <gd name="th" fmla="*/ ss a1 100000" />
-      <gd name="lFD" fmla="*/ ss a2 100000" />
-
-      <gd name="th2" fmla="*/ th 1 2" />
-      <gd name="l2" fmla="*/ lFD 1 2" />
-      <gd name="l3" fmla="+- th2 l2 0" />
-
-
-      <gd name="rh" fmla="+- hd2 0 th" />
-      <gd name="rw" fmla="+- wd2 0 th" />
-
-
-      <gd name="dr" fmla="+- rw 0 rh" />
-      <gd name="maxr" fmla="?: dr rh rw" />
-      <gd name="ha" fmla="at2 maxr l3" />
-
-
-      <gd name="aA1" fmla="+- 18600000 0 ha" />
-      <gd name="aD1" fmla="+- 18600000 ha 0" />
-
-
-      <gd name="ta11" fmla="cos rw aA1" />
-      <gd name="ta12" fmla="sin rh aA1" />
-      <gd name="bA1" fmla="at2 ta11 ta12" />
-
-      <gd name="cta1" fmla="cos rh bA1" />
-      <gd name="sta1" fmla="sin rw bA1" />
-      <gd name="ma1" fmla="mod cta1 sta1 0" />
-      <gd name="na1" fmla="*/ rw rh ma1" />
-      <gd name="dxa1" fmla="cos na1 bA1" />
-      <gd name="dya1" fmla="sin na1 bA1" />
-      <gd name="xA1" fmla="+- hc dxa1 0" />
-      <gd name="yA1" fmla="+- vc dya1 0" />
-
-
-      <gd name="td11" fmla="cos rw aD1" />
-      <gd name="td12" fmla="sin rh aD1" />
-      <gd name="bD1" fmla="at2 td11 td12" />
-
-      <gd name="ctd1" fmla="cos rh bD1" />
-      <gd name="std1" fmla="sin rw bD1" />
-      <gd name="md1" fmla="mod ctd1 std1 0" />
-      <gd name="nd1" fmla="*/ rw rh md1" />
-      <gd name="dxd1" fmla="cos nd1 bD1" />
-      <gd name="dyd1" fmla="sin nd1 bD1" />
-      <gd name="xD1" fmla="+- hc dxd1 0" />
-      <gd name="yD1" fmla="+- vc dyd1 0" />
-
-
-      <gd name="xAD1" fmla="+- xA1 0 xD1" />
-      <gd name="yAD1" fmla="+- yA1 0 yD1" />
-      <gd name="lAD1" fmla="mod xAD1 yAD1 0" />
-      <gd name="a1" fmla="at2 yAD1 xAD1" />
-
-
-      <gd name="dxF1" fmla="sin lFD a1" />
-      <gd name="dyF1" fmla="cos lFD a1" />
-      <gd name="xF1" fmla="+- xD1 dxF1 0" />
-      <gd name="yF1" fmla="+- yD1 dyF1 0" />
-      <gd name="xE1" fmla="+- xA1 0 dxF1" />
-      <gd name="yE1" fmla="+- yA1 0 dyF1" />
-
-
-      <gd name="yC1t" fmla="sin th a1" />
-      <gd name="xC1t" fmla="cos th a1" />
-      <gd name="yC1" fmla="+- yF1 yC1t 0" />
-      <gd name="xC1" fmla="+- xF1 0 xC1t" />
-
-
-      <gd name="yB1" fmla="+- yE1 yC1t 0" />
-      <gd name="xB1" fmla="+- xE1 0 xC1t" />
-
-
-      <gd name="aA2" fmla="+- 21000000 0 ha" />
-      <gd name="aD2" fmla="+- 21000000 ha 0" />
-
-
-      <gd name="ta21" fmla="cos rw aA2" />
-      <gd name="ta22" fmla="sin rh aA2" />
-      <gd name="bA2" fmla="at2 ta21 ta22" />
-
-      <gd name="cta2" fmla="cos rh bA2" />
-      <gd name="sta2" fmla="sin rw bA2" />
-      <gd name="ma2" fmla="mod cta2 sta2 0" />
-      <gd name="na2" fmla="*/ rw rh ma2" />
-      <gd name="dxa2" fmla="cos na2 bA2" />
-      <gd name="dya2" fmla="sin na2 bA2" />
-      <gd name="xA2" fmla="+- hc dxa2 0" />
-      <gd name="yA2" fmla="+- vc dya2 0" />
-
-
-      <gd name="td21" fmla="cos rw aD2" />
-      <gd name="td22" fmla="sin rh aD2" />
-      <gd name="bD2" fmla="at2 td21 td22" />
-
-      <gd name="ctd2" fmla="cos rh bD2" />
-      <gd name="std2" fmla="sin rw bD2" />
-      <gd name="md2" fmla="mod ctd2 std2 0" />
-      <gd name="nd2" fmla="*/ rw rh md2" />
-      <gd name="dxd2" fmla="cos nd2 bD2" />
-      <gd name="dyd2" fmla="sin nd2 bD2" />
-      <gd name="xD2" fmla="+- hc dxd2 0" />
-      <gd name="yD2" fmla="+- vc dyd2 0" />
-
-
-      <gd name="xAD2" fmla="+- xA2 0 xD2" />
-      <gd name="yAD2" fmla="+- yA2 0 yD2" />
-      <gd name="lAD2" fmla="mod xAD2 yAD2 0" />
-      <gd name="a2" fmla="at2 yAD2 xAD2" />
-
-
-      <gd name="dxF2" fmla="sin lFD a2" />
-      <gd name="dyF2" fmla="cos lFD a2" />
-      <gd name="xF2" fmla="+- xD2 dxF2 0" />
-      <gd name="yF2" fmla="+- yD2 dyF2 0" />
-      <gd name="xE2" fmla="+- xA2 0 dxF2" />
-      <gd name="yE2" fmla="+- yA2 0 dyF2" />
-
-
-      <gd name="yC2t" fmla="sin th a2" />
-      <gd name="xC2t" fmla="cos th a2" />
-      <gd name="yC2" fmla="+- yF2 yC2t 0" />
-      <gd name="xC2" fmla="+- xF2 0 xC2t" />
-
-
-      <gd name="yB2" fmla="+- yE2 yC2t 0" />
-      <gd name="xB2" fmla="+- xE2 0 xC2t" />
-
-      <gd name="swAng1" fmla="+- bA2 0 bD1" />
-
-
-      <gd name="aA3" fmla="+- 1800000 0 ha" />
-      <gd name="aD3" fmla="+- 1800000 ha 0" />
-
-
-      <gd name="ta31" fmla="cos rw aA3" />
-      <gd name="ta32" fmla="sin rh aA3" />
-      <gd name="bA3" fmla="at2 ta31 ta32" />
-
-      <gd name="cta3" fmla="cos rh bA3" />
-      <gd name="sta3" fmla="sin rw bA3" />
-      <gd name="ma3" fmla="mod cta3 sta3 0" />
-      <gd name="na3" fmla="*/ rw rh ma3" />
-      <gd name="dxa3" fmla="cos na3 bA3" />
-      <gd name="dya3" fmla="sin na3 bA3" />
-      <gd name="xA3" fmla="+- hc dxa3 0" />
-      <gd name="yA3" fmla="+- vc dya3 0" />
-
-
-      <gd name="td31" fmla="cos rw aD3" />
-      <gd name="td32" fmla="sin rh aD3" />
-      <gd name="bD3" fmla="at2 td31 td32" />
-
-      <gd name="ctd3" fmla="cos rh bD3" />
-      <gd name="std3" fmla="sin rw bD3" />
-      <gd name="md3" fmla="mod ctd3 std3 0" />
-      <gd name="nd3" fmla="*/ rw rh md3" />
-      <gd name="dxd3" fmla="cos nd3 bD3" />
-      <gd name="dyd3" fmla="sin nd3 bD3" />
-      <gd name="xD3" fmla="+- hc dxd3 0" />
-      <gd name="yD3" fmla="+- vc dyd3 0" />
-
-
-      <gd name="xAD3" fmla="+- xA3 0 xD3" />
-      <gd name="yAD3" fmla="+- yA3 0 yD3" />
-      <gd name="lAD3" fmla="mod xAD3 yAD3 0" />
-      <gd name="a3" fmla="at2 yAD3 xAD3" />
-
-
-      <gd name="dxF3" fmla="sin lFD a3" />
-      <gd name="dyF3" fmla="cos lFD a3" />
-      <gd name="xF3" fmla="+- xD3 dxF3 0" />
-      <gd name="yF3" fmla="+- yD3 dyF3 0" />
-      <gd name="xE3" fmla="+- xA3 0 dxF3" />
-      <gd name="yE3" fmla="+- yA3 0 dyF3" />
-
-
-      <gd name="yC3t" fmla="sin th a3" />
-      <gd name="xC3t" fmla="cos th a3" />
-      <gd name="yC3" fmla="+- yF3 yC3t 0" />
-      <gd name="xC3" fmla="+- xF3 0 xC3t" />
-
-
-      <gd name="yB3" fmla="+- yE3 yC3t 0" />
-      <gd name="xB3" fmla="+- xE3 0 xC3t" />
-
-      <gd name="swAng2" fmla="+- bA3 0 bD2" />
-
-
-      <gd name="aA4" fmla="+- 4200000 0 ha" />
-      <gd name="aD4" fmla="+- 4200000 ha 0" />
-
-
-      <gd name="ta41" fmla="cos rw aA4" />
-      <gd name="ta42" fmla="sin rh aA4" />
-      <gd name="bA4" fmla="at2 ta41 ta42" />
-
-      <gd name="cta4" fmla="cos rh bA4" />
-      <gd name="sta4" fmla="sin rw bA4" />
-      <gd name="ma4" fmla="mod cta4 sta4 0" />
-      <gd name="na4" fmla="*/ rw rh ma4" />
-      <gd name="dxa4" fmla="cos na4 bA4" />
-      <gd name="dya4" fmla="sin na4 bA4" />
-      <gd name="xA4" fmla="+- hc dxa4 0" />
-      <gd name="yA4" fmla="+- vc dya4 0" />
-
-
-      <gd name="td41" fmla="cos rw aD4" />
-      <gd name="td42" fmla="sin rh aD4" />
-      <gd name="bD4" fmla="at2 td41 td42" />
-
-      <gd name="ctd4" fmla="cos rh bD4" />
-      <gd name="std4" fmla="sin rw bD4" />
-      <gd name="md4" fmla="mod ctd4 std4 0" />
-      <gd name="nd4" fmla="*/ rw rh md4" />
-      <gd name="dxd4" fmla="cos nd4 bD4" />
-      <gd name="dyd4" fmla="sin nd4 bD4" />
-      <gd name="xD4" fmla="+- hc dxd4 0" />
-      <gd name="yD4" fmla="+- vc dyd4 0" />
-
-
-      <gd name="xAD4" fmla="+- xA4 0 xD4" />
-      <gd name="yAD4" fmla="+- yA4 0 yD4" />
-      <gd name="lAD4" fmla="mod xAD4 yAD4 0" />
-      <gd name="a4" fmla="at2 yAD4 xAD4" />
-
-
-      <gd name="dxF4" fmla="sin lFD a4" />
-      <gd name="dyF4" fmla="cos lFD a4" />
-      <gd name="xF4" fmla="+- xD4 dxF4 0" />
-      <gd name="yF4" fmla="+- yD4 dyF4 0" />
-      <gd name="xE4" fmla="+- xA4 0 dxF4" />
-      <gd name="yE4" fmla="+- yA4 0 dyF4" />
-
-
-      <gd name="yC4t" fmla="sin th a4" />
-      <gd name="xC4t" fmla="cos th a4" />
-      <gd name="yC4" fmla="+- yF4 yC4t 0" />
-      <gd name="xC4" fmla="+- xF4 0 xC4t" />
-
-
-      <gd name="yB4" fmla="+- yE4 yC4t 0" />
-      <gd name="xB4" fmla="+- xE4 0 xC4t" />
-
-      <gd name="swAng3" fmla="+- bA4 0 bD3" />
-
-
-      <gd name="aA5" fmla="+- 6600000 0 ha" />
-      <gd name="aD5" fmla="+- 6600000 ha 0" />
-
-      <gd name="ta51" fmla="cos rw aA5" />
-      <gd name="ta52" fmla="sin rh aA5" />
-      <gd name="bA5" fmla="at2 ta51 ta52" />
-
-      <gd name="td51" fmla="cos rw aD5" />
-      <gd name="td52" fmla="sin rh aD5" />
-      <gd name="bD5" fmla="at2 td51 td52" />
-
-
-      <gd name="xD5" fmla="+- w 0 xA4" />
-
-
-      <gd name="xC5" fmla="+- w 0 xB4" />
-
-
-      <gd name="xB5" fmla="+- w 0 xC4" />
-
-      <gd name="swAng4" fmla="+- bA5 0 bD4" />
-
-
-      <gd name="aD6" fmla="+- 9000000 ha 0" />
-
-      <gd name="td61" fmla="cos rw aD6" />
-      <gd name="td62" fmla="sin rh aD6" />
-      <gd name="bD6" fmla="at2 td61 td62" />
-
-
-      <gd name="xD6" fmla="+- w 0 xA3" />
-
-
-      <gd name="xC6" fmla="+- w 0 xB3" />
-
-
-      <gd name="xB6" fmla="+- w 0 xC3" />
-
-
-      <gd name="aD7" fmla="+- 11400000 ha 0" />
-
-      <gd name="td71" fmla="cos rw aD7" />
-      <gd name="td72" fmla="sin rh aD7" />
-      <gd name="bD7" fmla="at2 td71 td72" />
-
-
-      <gd name="xD7" fmla="+- w 0 xA2" />
-
-
-      <gd name="xC7" fmla="+- w 0 xB2" />
-
-
-      <gd name="xB7" fmla="+- w 0 xC2" />
-
-
-      <gd name="aD8" fmla="+- 13800000 ha 0" />
-
-      <gd name="td81" fmla="cos rw aD8" />
-      <gd name="td82" fmla="sin rh aD8" />
-      <gd name="bD8" fmla="at2 td81 td82" />
-
-
-      <gd name="xA8" fmla="+- w 0 xD1" />
-
-      <gd name="xD8" fmla="+- w 0 xA1" />
-
-
-      <gd name="xC8" fmla="+- w 0 xB1" />
-
-
-      <gd name="xB8" fmla="+- w 0 xC1" />
-
-
-      <gd name="aA9" fmla="+- 3cd4 0 ha" />
-      <gd name="aD9" fmla="+- 3cd4 ha 0" />
-
-
-      <gd name="td91" fmla="cos rw aD9" />
-      <gd name="td92" fmla="sin rh aD9" />
-      <gd name="bD9" fmla="at2 td91 td92" />
-
-      <gd name="ctd9" fmla="cos rh bD9" />
-      <gd name="std9" fmla="sin rw bD9" />
-      <gd name="md9" fmla="mod ctd9 std9 0" />
-      <gd name="nd9" fmla="*/ rw rh md9" />
-      <gd name="dxd9" fmla="cos nd9 bD9" />
-      <gd name="dyd9" fmla="sin nd9 bD9" />
-      <gd name="xD9" fmla="+- hc dxd9 0" />
-      <gd name="yD9" fmla="+- vc dyd9 0" />
-
-
-      <gd name="ta91" fmla="cos rw aA9" />
-      <gd name="ta92" fmla="sin rh aA9" />
-      <gd name="bA9" fmla="at2 ta91 ta92" />
-
-      <gd name="xA9" fmla="+- hc 0 dxd9" />
-
-
-      <gd name="xF9" fmla="+- xD9 0 lFD" />
-      <gd name="xE9" fmla="+- xA9 lFD 0" />
-
-
-      <gd name="yC9" fmla="+- yD9 0 th" />
-
-      <gd name="swAng5" fmla="+- bA9 0 bD8" />
-
-
-      <gd name="xCxn1" fmla="+/ xB1 xC1 2" />
-      <gd name="yCxn1" fmla="+/ yB1 yC1 2" />
-      <gd name="xCxn2" fmla="+/ xB2 xC2 2" />
-      <gd name="yCxn2" fmla="+/ yB2 yC2 2" />
-      <gd name="xCxn3" fmla="+/ xB3 xC3 2" />
-      <gd name="yCxn3" fmla="+/ yB3 yC3 2" />
-      <gd name="xCxn4" fmla="+/ xB4 xC4 2" />
-      <gd name="yCxn4" fmla="+/ yB4 yC4 2" />
-      <gd name="xCxn5" fmla="+/ r 0 xCxn4" />
-      <gd name="xCxn6" fmla="+/ r 0 xCxn3" />
-      <gd name="xCxn7" fmla="+/ r 0 xCxn2" />
-      <gd name="xCxn8" fmla="+/ r 0 xCxn1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="20000">
-        <pos x="xD9" y="yD9" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="2679">
-        <pos x="xA9" y="yD9" />
-      </ahXY>
-
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="18600000">
-        <pos x="xCxn1" y="yCxn1" />
-      </cxn>
-
-      <cxn ang="21000000">
-        <pos x="xCxn2" y="yCxn2" />
-      </cxn>
-
-      <cxn ang="1800000">
-        <pos x="xCxn3" y="yCxn3" />
-      </cxn>
-
-      <cxn ang="4200000">
-        <pos x="xCxn4" y="yCxn4" />
-      </cxn>
-
-      <cxn ang="6600000">
-        <pos x="xCxn5" y="yCxn4" />
-      </cxn>
-
-      <cxn ang="9000000">
-        <pos x="xCxn6" y="yCxn3" />
-      </cxn>
-
-      <cxn ang="11400000">
-        <pos x="xCxn7" y="yCxn2" />
-      </cxn>
-
-      <cxn ang="13800000">
-        <pos x="xCxn8" y="yCxn1" />
-      </cxn>
-
-      <cxn ang="3cd4">
-        <pos x="hc" y="yC9" />
-      </cxn>
-
-    </cxnLst>
-
-    <rect l="xA8" t="yD1" r="xD1" b="yD3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="xA1" y="yA1" />
-        </moveTo>
-        <lnTo>
-          <pt x="xB1" y="yB1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC1" y="yC1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD1" y="yD1" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD1" swAng="swAng1" />
-
-        <lnTo>
-          <pt x="xB2" y="yB2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC2" y="yC2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD2" y="yD2" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD2" swAng="swAng2" />
-
-        <lnTo>
-          <pt x="xB3" y="yB3" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC3" y="yC3" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD3" y="yD3" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD3" swAng="swAng3" />
-
-        <lnTo>
-          <pt x="xB4" y="yB4" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC4" y="yC4" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD4" y="yD4" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD4" swAng="swAng4" />
-
-        <lnTo>
-          <pt x="xB5" y="yC4" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC5" y="yB4" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD5" y="yA4" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD5" swAng="swAng3" />
-
-        <lnTo>
-          <pt x="xB6" y="yC3" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC6" y="yB3" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD6" y="yA3" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD6" swAng="swAng2" />
-
-        <lnTo>
-          <pt x="xB7" y="yC2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC7" y="yB2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD7" y="yA2" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD7" swAng="swAng1" />
-
-        <lnTo>
-          <pt x="xB8" y="yC1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC8" y="yB1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD8" y="yA1" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD8" swAng="swAng5" />
-
-        <lnTo>
-          <pt x="xE9" y="yC9" />
-        </lnTo>
-        <lnTo>
-          <pt x="xF9" y="yC9" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD9" y="yD9" />
-        </lnTo>
-        <arcTo hR="rh" wR="rw" stAng="bD9" swAng="swAng5" />
-        <close />
-      </path>
-    </pathLst>
-
-  </gear9>
-  <halfFrame>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 33333" />
-
-      <gd name="adj2" fmla="val 33333" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 100000 w ss" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="x1" fmla="*/ ss a2 100000" />
-      <gd name="g1" fmla="*/ h x1 w" />
-      <gd name="g2" fmla="+- h 0 g1" />
-      <gd name="maxAdj1" fmla="*/ 100000 g2 ss" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="y1" fmla="*/ ss a1 100000" />
-      <gd name="dx2" fmla="*/ y1 w h" />
-      <gd name="x2" fmla="+- r 0 dx2" />
-      <gd name="dy2" fmla="*/ x1 h w" />
-      <gd name="y2" fmla="+- b 0 dy2" />
-      <gd name="cx1" fmla="*/ x1 1 2" />
-      <gd name="cy1" fmla="+/ y2 b 2" />
-      <gd name="cx2" fmla="+/ x2 r 2" />
-      <gd name="cy2" fmla="*/ y1 1 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="cx2" y="cy2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="cx1" y="cy1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </halfFrame>
-  <heart>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dx1" fmla="*/ w 49 48" />
-      <gd name="dx2" fmla="*/ w 10 48" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- t 0 hd3" />
-
-
-      <gd name="il" fmla="*/ w 1 6" />
-      <gd name="ir" fmla="*/ w 5 6" />
-      <gd name="ib" fmla="*/ h 2 3" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="hd4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="hd4" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="hc" y="hd4" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="x3" y="y1" />
-          <pt x="x4" y="hd4" />
-          <pt x="hc" y="b" />
-        </cubicBezTo>
-        <cubicBezTo>
-          <pt x="x1" y="hd4" />
-          <pt x="x2" y="y1" />
-          <pt x="hc" y="hd4" />
-        </cubicBezTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </heart>
-  <heptagon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="hf" fmla="val 102572" />
-      <gd name="vf" fmla="val 105210" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="swd2" fmla="*/ wd2 hf 100000" />
-      <gd name="shd2" fmla="*/ hd2 vf 100000" />
-      <gd name="svc" fmla="*/ vc  vf 100000" />
-      <gd name="dx1" fmla="*/ swd2 97493 100000" />
-      <gd name="dx2" fmla="*/ swd2 78183 100000" />
-      <gd name="dx3" fmla="*/ swd2 43388 100000" />
-      <gd name="dy1" fmla="*/ shd2 62349 100000" />
-      <gd name="dy2" fmla="*/ shd2 22252 100000" />
-      <gd name="dy3" fmla="*/ shd2 90097 100000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc 0 dx3" />
-      <gd name="x4" fmla="+- hc dx3 0" />
-      <gd name="x5" fmla="+- hc dx2 0" />
-      <gd name="x6" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- svc 0 dy1" />
-      <gd name="y2" fmla="+- svc dy2 0" />
-      <gd name="y3" fmla="+- svc dy3 0" />
-      <gd name="ib" fmla="+- b 0 y1" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x5" y="y1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x4" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x2" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="y1" r="x5" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </heptagon>
-  <hexagon>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-      <gd name="vf" fmla="val 115470" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 50000 w ss" />
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="shd2" fmla="*/ hd2 vf 100000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="+- r 0 x1" />
-      <gd name="dy1" fmla="sin shd2 3600000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc dy1 0" />
-      <gd name="q1" fmla="*/ maxAdj -1 2" />
-      <gd name="q2" fmla="+- a q1 0" />
-      <gd name="q3" fmla="?: q2 4 2" />
-      <gd name="q4" fmla="?: q2 3 2" />
-      <gd name="q5" fmla="?: q2 q1 0" />
-      <gd name="q6" fmla="+/ a q5 q1" />
-      <gd name="q7" fmla="*/ q6 q4 -1" />
-      <gd name="q8" fmla="+- q3 q7 0" />
-      <gd name="il" fmla="*/ w q8 24" />
-      <gd name="it" fmla="*/ h q8 24" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 it" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="maxAdj">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="y1" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </hexagon>
-  <homePlate>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 100000 w ss" />
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="dx1" fmla="*/ ss a 100000" />
-      <gd name="x1" fmla="+- r 0 dx1" />
-      <gd name="ir" fmla="+/ x1 r 2" />
-      <gd name="x2" fmla="*/ x1 1 2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="maxAdj">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x2" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </homePlate>
-  <horizontalScroll>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 12500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 25000" />
-      <gd name="ch" fmla="*/ ss a 100000" />
-
-      <gd name="ch2" fmla="*/ ch 1 2" />
-
-      <gd name="ch4" fmla="*/ ch 1 4" />
-
-
-
-
-
-      <gd name="y3" fmla="+- ch ch2 0" />
-
-      <gd name="y4" fmla="+- ch ch 0" />
-
-      <gd name="y6" fmla="+- b 0 ch" />
-
-      <gd name="y7" fmla="+- b 0 ch2" />
-
-      <gd name="y5" fmla="+- y6 0 ch2" />
-
-
-
-
-
-      <gd name="x3" fmla="+- r 0 ch" />
-
-      <gd name="x4" fmla="+- r 0 ch2" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="25000">
-        <pos x="ch" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="hc" y="ch" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="y6" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="ch" t="ch" r="x4" b="y6" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="r" y="ch2" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="x4" y="ch2" />
-        </lnTo>
-        <arcTo wR="ch4" hR="ch4" stAng="0" swAng="cd2" />
-        <lnTo>
-          <pt x="x3" y="ch" />
-        </lnTo>
-        <lnTo>
-          <pt x="ch2" y="ch" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="l" y="y7" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd2" swAng="-10800000" />
-        <lnTo>
-          <pt x="ch" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y6" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="-5400000" />
-        <close />
-        <moveTo>
-          <pt x="ch2" y="y4" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="-5400000" />
-        <arcTo wR="ch4" hR="ch4" stAng="0" swAng="-10800000" />
-        <close />
-      </path>
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="ch2" y="y4" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="-5400000" />
-        <arcTo wR="ch4" hR="ch4" stAng="0" swAng="-10800000" />
-        <close />
-        <moveTo>
-          <pt x="x4" y="ch" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="-16200000" />
-        <arcTo wR="ch4" hR="ch4" stAng="cd2" swAng="-10800000" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="y3" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x3" y="ch" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="ch2" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd2" swAng="cd2" />
-        <lnTo>
-          <pt x="r" y="y5" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="ch" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="ch" y="y7" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd2" />
-        <close />
-        <moveTo>
-          <pt x="x3" y="ch" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="ch" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="-5400000" />
-        <moveTo>
-          <pt x="x4" y="ch" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="ch2" />
-        </lnTo>
-        <arcTo wR="ch4" hR="ch4" stAng="0" swAng="cd2" />
-        <moveTo>
-          <pt x="ch2" y="y4" />
-        </moveTo>
-        <lnTo>
-          <pt x="ch2" y="y3" />
-        </lnTo>
-        <arcTo wR="ch4" hR="ch4" stAng="cd2" swAng="cd2" />
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd2" />
-        <moveTo>
-          <pt x="ch" y="y3" />
-        </moveTo>
-        <lnTo>
-          <pt x="ch" y="y6" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </horizontalScroll>
-  <irregularSeal1>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x5" fmla="*/ w 4627 21600" />
-      <gd name="x12" fmla="*/ w 8485 21600" />
-      <gd name="x21" fmla="*/ w 16702 21600" />
-      <gd name="x24" fmla="*/ w 14522 21600" />
-      <gd name="y3" fmla="*/ h 6320 21600" />
-      <gd name="y6" fmla="*/ h 8615 21600" />
-      <gd name="y9" fmla="*/ h 13937 21600" />
-      <gd name="y18" fmla="*/ h 13290 21600" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x24" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y6" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x12" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y18" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x5" t="y3" r="x21" b="y9" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="21600" h="21600">
-        <moveTo>
-          <pt x="10800" y="5800" />
-        </moveTo>
-        <lnTo>
-          <pt x="14522" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="14155" y="5325" />
-        </lnTo>
-        <lnTo>
-          <pt x="18380" y="4457" />
-        </lnTo>
-        <lnTo>
-          <pt x="16702" y="7315" />
-        </lnTo>
-        <lnTo>
-          <pt x="21097" y="8137" />
-        </lnTo>
-        <lnTo>
-          <pt x="17607" y="10475" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="13290" />
-        </lnTo>
-        <lnTo>
-          <pt x="16837" y="12942" />
-        </lnTo>
-        <lnTo>
-          <pt x="18145" y="18095" />
-        </lnTo>
-        <lnTo>
-          <pt x="14020" y="14457" />
-        </lnTo>
-        <lnTo>
-          <pt x="13247" y="19737" />
-        </lnTo>
-        <lnTo>
-          <pt x="10532" y="14935" />
-        </lnTo>
-        <lnTo>
-          <pt x="8485" y="21600" />
-        </lnTo>
-        <lnTo>
-          <pt x="7715" y="15627" />
-        </lnTo>
-        <lnTo>
-          <pt x="4762" y="17617" />
-        </lnTo>
-        <lnTo>
-          <pt x="5667" y="13937" />
-        </lnTo>
-        <lnTo>
-          <pt x="135" y="14587" />
-        </lnTo>
-        <lnTo>
-          <pt x="3722" y="11775" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="8615" />
-        </lnTo>
-        <lnTo>
-          <pt x="4627" y="7617" />
-        </lnTo>
-        <lnTo>
-          <pt x="370" y="2295" />
-        </lnTo>
-        <lnTo>
-          <pt x="7312" y="6320" />
-        </lnTo>
-        <lnTo>
-          <pt x="8352" y="2295" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </irregularSeal1>
-  <irregularSeal2>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x2" fmla="*/ w 9722 21600" />
-      <gd name="x5" fmla="*/ w 5372 21600" />
-      <gd name="x16" fmla="*/ w 11612 21600" />
-      <gd name="x19" fmla="*/ w 14640 21600" />
-      <gd name="y2" fmla="*/ h 1887 21600" />
-      <gd name="y3" fmla="*/ h 6382 21600" />
-      <gd name="y8" fmla="*/ h 12877 21600" />
-      <gd name="y14" fmla="*/ h 19712 21600" />
-      <gd name="y16" fmla="*/ h 18842 21600" />
-      <gd name="y17" fmla="*/ h 15935 21600" />
-      <gd name="y24" fmla="*/ h 6645 21600" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y8" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x16" y="y16" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y24" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x5" t="y3" r="x19" b="y17" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="21600" h="21600">
-        <moveTo>
-          <pt x="11462" y="4342" />
-        </moveTo>
-        <lnTo>
-          <pt x="14790" y="0" />
-        </lnTo>
-        <lnTo>
-          <pt x="14525" y="5777" />
-        </lnTo>
-        <lnTo>
-          <pt x="18007" y="3172" />
-        </lnTo>
-        <lnTo>
-          <pt x="16380" y="6532" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="6645" />
-        </lnTo>
-        <lnTo>
-          <pt x="16985" y="9402" />
-        </lnTo>
-        <lnTo>
-          <pt x="18270" y="11290" />
-        </lnTo>
-        <lnTo>
-          <pt x="16380" y="12310" />
-        </lnTo>
-        <lnTo>
-          <pt x="18877" y="15632" />
-        </lnTo>
-        <lnTo>
-          <pt x="14640" y="14350" />
-        </lnTo>
-        <lnTo>
-          <pt x="14942" y="17370" />
-        </lnTo>
-        <lnTo>
-          <pt x="12180" y="15935" />
-        </lnTo>
-        <lnTo>
-          <pt x="11612" y="18842" />
-        </lnTo>
-        <lnTo>
-          <pt x="9872" y="17370" />
-        </lnTo>
-        <lnTo>
-          <pt x="8700" y="19712" />
-        </lnTo>
-        <lnTo>
-          <pt x="7527" y="18125" />
-        </lnTo>
-        <lnTo>
-          <pt x="4917" y="21600" />
-        </lnTo>
-        <lnTo>
-          <pt x="4805" y="18240" />
-        </lnTo>
-        <lnTo>
-          <pt x="1285" y="17825" />
-        </lnTo>
-        <lnTo>
-          <pt x="3330" y="15370" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="12877" />
-        </lnTo>
-        <lnTo>
-          <pt x="3935" y="11592" />
-        </lnTo>
-        <lnTo>
-          <pt x="1172" y="8270" />
-        </lnTo>
-        <lnTo>
-          <pt x="5372" y="7817" />
-        </lnTo>
-        <lnTo>
-          <pt x="4502" y="3625" />
-        </lnTo>
-        <lnTo>
-          <pt x="8550" y="6382" />
-        </lnTo>
-        <lnTo>
-          <pt x="9722" y="1887" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </irregularSeal2>
-  <leftArrow>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 100000 w ss" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="dx2" fmla="*/ ss a2 100000" />
-      <gd name="x2" fmla="+- l dx2 0" />
-      <gd name="dy1" fmla="*/ h a1 200000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc dy1 0" />
-      <gd name="dx1" fmla="*/ y1 dx2 hd2" />
-      <gd name="x1" fmla="+- x2  0 dx1" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="r" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x2" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="x1" t="y1" r="r" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </leftArrow>
-  <leftArrowCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 64977" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 h ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ 100000 w ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q2" fmla="*/ a3 ss w" />
-
-      <gd name="maxAdj4" fmla="+- 100000 0 q2" />
-
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-      <gd name="dy1" fmla="*/ ss a2 100000" />
-
-      <gd name="dy2" fmla="*/ ss a1 200000" />
-
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc dy2 0" />
-      <gd name="y4" fmla="+- vc dy1 0" />
-      <gd name="x1" fmla="*/ ss a3 100000" />
-
-      <gd name="dx2" fmla="*/ w a4 100000" />
-
-      <gd name="x2" fmla="+- r 0 dx2" />
-      <gd name="x3" fmla="+/ x2 r 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="x1" y="y2" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="0" maxX="maxAdj3">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="0" maxX="maxAdj4">
-        <pos x="x2" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </leftArrowCallout>
-  <leftBrace>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 8333" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 100000" />
-      <gd name="q1" fmla="+- 100000 0 a2" />
-      <gd name="q2" fmla="min q1 a2" />
-      <gd name="q3" fmla="*/ q2 1 2" />
-      <gd name="maxAdj1" fmla="*/ q3 h ss" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="y1" fmla="*/ ss a1 100000" />
-      <gd name="y3" fmla="*/ h a2 100000" />
-      <gd name="y4" fmla="+- y3 y1 0" />
-      <gd name="dx1" fmla="cos wd2 2700000" />
-      <gd name="dy1" fmla="sin y1 2700000" />
-      <gd name="il" fmla="+- r 0 dx1" />
-      <gd name="it" fmla="+- y1 0 dy1" />
-      <gd name="ib" fmla="+- b dy1 y1" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="hc" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="100000">
-        <pos x="l" y="y3" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="r" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y3" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="r" y="b" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="r" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="r" y="b" />
-        </moveTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="hc" y="y4" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="-5400000" />
-        <arcTo wR="wd2" hR="y1" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="hc" y="y1" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd2" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="r" y="b" />
-        </moveTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="hc" y="y4" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="-5400000" />
-        <arcTo wR="wd2" hR="y1" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="hc" y="y1" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd2" swAng="cd4" />
-      </path>
-    </pathLst>
-  </leftBrace>
-  <leftBracket>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 8333" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 50000 h ss" />
-
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="y1" fmla="*/ ss a 100000" />
-
-      <gd name="y2" fmla="+- b 0 y1" />
-
-      <gd name="dx1" fmla="cos w 2700000" />
-      <gd name="dy1" fmla="sin y1 2700000" />
-      <gd name="il" fmla="+- r 0 dx1" />
-      <gd name="it" fmla="+- y1 0 dy1" />
-      <gd name="ib" fmla="+- b dy1 y1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="maxAdj">
-        <pos x="l" y="y1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="r" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="r" y="b" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="r" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="r" y="b" />
-        </moveTo>
-        <arcTo wR="w" hR="y1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="l" y="y1" />
-        </lnTo>
-        <arcTo wR="w" hR="y1" stAng="cd2" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none">
-
-        <moveTo>
-          <pt x="r" y="b" />
-        </moveTo>
-        <arcTo wR="w" hR="y1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="l" y="y1" />
-        </lnTo>
-        <arcTo wR="w" hR="y1" stAng="cd2" swAng="cd4" />
-      </path>
-    </pathLst>
-
-  </leftBracket>
-  <leftCircularArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 12500" />
-
-      <gd name="adj2" fmla="val -1142319" />
-
-      <gd name="adj3" fmla="val 1142319" />
-
-      <gd name="adj4" fmla="val 10800000" />
-
-      <gd name="adj5" fmla="val 12500" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a5" fmla="pin 0 adj5 25000" />
-
-      <gd name="maxAdj1" fmla="*/ a5 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="enAng" fmla="pin 1 adj3 21599999" />
-      <gd name="stAng" fmla="pin 0 adj4 21599999" />
-
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="thh" fmla="*/ ss a5 100000" />
-
-      <gd name="th2" fmla="*/ th 1 2" />
-
-
-      <gd name="rw1" fmla="+- wd2 th2 thh" />
-
-      <gd name="rh1" fmla="+- hd2 th2 thh" />
-
-      <gd name="rw2" fmla="+- rw1 0 th" />
-
-      <gd name="rh2" fmla="+- rh1 0 th" />
-
-      <gd name="rw3" fmla="+- rw2 th2 0" />
-
-      <gd name="rh3" fmla="+- rh2 th2 0" />
-
-
-      <gd name="wtH" fmla="sin rw3 enAng" />
-      <gd name="htH" fmla="cos rh3 enAng" />
-      <gd name="dxH" fmla="cat2 rw3 htH wtH" />
-      <gd name="dyH" fmla="sat2 rh3 htH wtH" />
-      <gd name="xH" fmla="+- hc dxH 0" />
-
-      <gd name="yH" fmla="+- vc dyH 0" />
-
-
-      <gd name="rI" fmla="min rw2 rh2" />
-
-      <gd name="u1" fmla="*/ dxH dxH 1" />
-      <gd name="u2" fmla="*/ dyH dyH 1" />
-      <gd name="u3" fmla="*/ rI rI 1" />
-      <gd name="u4" fmla="+- u1 0 u3" />
-      <gd name="u5" fmla="+- u2 0 u3" />
-      <gd name="u6" fmla="*/ u4 u5 u1" />
-      <gd name="u7" fmla="*/ u6 1 u2" />
-      <gd name="u8" fmla="+- 1 0 u7" />
-      <gd name="u9" fmla="sqrt u8" />
-      <gd name="u10" fmla="*/ u4 1 dxH" />
-      <gd name="u11" fmla="*/ u10 1 dyH" />
-      <gd name="u12" fmla="+/ 1 u9 u11" />
-      <gd name="u13" fmla="at2 1 u12" />
-      <gd name="u14" fmla="+- u13 21600000 0" />
-      <gd name="u15" fmla="?: u13 u13 u14" />
-      <gd name="u16" fmla="+- u15 0 enAng" />
-
-      <gd name="u17" fmla="+- u16 21600000 0" />
-      <gd name="u18" fmla="?: u16 u16 u17" />
-      <gd name="u19" fmla="+- u18 0 cd2" />
-      <gd name="u20" fmla="+- u18 0 21600000" />
-      <gd name="u21" fmla="?: u19 u20 u18" />
-      <gd name="u22" fmla="abs u21" />
-      <gd name="minAng" fmla="*/ u22 -1 1" />
-      <gd name="u23" fmla="abs adj2" />
-      <gd name="a2" fmla="*/ u23 -1 1" />
-      <gd name="aAng" fmla="pin minAng a2 0" />
-
-      <gd name="ptAng" fmla="+- enAng aAng 0" />
-
-
-      <gd name="wtA" fmla="sin rw3 ptAng" />
-      <gd name="htA" fmla="cos rh3 ptAng" />
-      <gd name="dxA" fmla="cat2 rw3 htA wtA" />
-      <gd name="dyA" fmla="sat2 rh3 htA wtA" />
-      <gd name="xA" fmla="+- hc dxA 0" />
-
-      <gd name="yA" fmla="+- vc dyA 0" />
-
-
-      <gd name="wtE" fmla="sin rw1 stAng" />
-      <gd name="htE" fmla="cos rh1 stAng" />
-      <gd name="dxE" fmla="cat2 rw1 htE wtE" />
-      <gd name="dyE" fmla="sat2 rh1 htE wtE" />
-      <gd name="xE" fmla="+- hc dxE 0" />
-
-      <gd name="yE" fmla="+- vc dyE 0" />
-
-
-      <gd name="wtD" fmla="sin rw2 stAng" />
-      <gd name="htD" fmla="cos rh2 stAng" />
-      <gd name="dxD" fmla="cat2 rw2 htD wtD" />
-      <gd name="dyD" fmla="sat2 rh2 htD wtD" />
-      <gd name="xD" fmla="+- hc dxD 0" />
-
-      <gd name="yD" fmla="+- vc dyD 0" />
-
-
-      <gd name="dxG" fmla="cos thh ptAng" />
-      <gd name="dyG" fmla="sin thh ptAng" />
-      <gd name="xG" fmla="+- xH dxG 0" />
-
-      <gd name="yG" fmla="+- yH dyG 0" />
-
-
-      <gd name="dxB" fmla="cos thh ptAng" />
-      <gd name="dyB" fmla="sin thh ptAng" />
-      <gd name="xB" fmla="+- xH 0 dxB 0" />
-
-      <gd name="yB" fmla="+- yH 0 dyB 0" />
-
-
-      <gd name="sx1" fmla="+- xB 0 hc" />
-
-      <gd name="sy1" fmla="+- yB 0 vc" />
-
-      <gd name="sx2" fmla="+- xG 0 hc" />
-
-      <gd name="sy2" fmla="+- yG 0 vc" />
-
-
-      <gd name="rO" fmla="min rw1 rh1" />
-
-      <gd name="x1O" fmla="*/ sx1 rO rw1" />
-
-      <gd name="y1O" fmla="*/ sy1 rO rh1" />
-
-      <gd name="x2O" fmla="*/ sx2 rO rw1" />
-
-      <gd name="y2O" fmla="*/ sy2 rO rh1" />
-
-
-      <gd name="dxO" fmla="+- x2O 0 x1O" />
-      <gd name="dyO" fmla="+- y2O 0 y1O" />
-      <gd name="dO" fmla="mod dxO dyO 0" />
-
-      <gd name="q1" fmla="*/ x1O y2O 1" />
-      <gd name="q2" fmla="*/ x2O y1O 1" />
-      <gd name="DO" fmla="+- q1 0 q2" />
-
-
-      <gd name="q3" fmla="*/ rO rO 1" />
-
-      <gd name="q4" fmla="*/ dO dO 1" />
-
-      <gd name="q5" fmla="*/ q3 q4 1" />
-
-      <gd name="q6" fmla="*/ DO DO 1" />
-
-      <gd name="q7" fmla="+- q5 0 q6" />
-
-      <gd name="q8" fmla="max q7 0" />
-
-      <gd name="sdelO" fmla="sqrt q8" />
-
-      <gd name="ndyO" fmla="*/ dyO -1 1" />
-      <gd name="sdyO" fmla="?: ndyO -1 1" />
-
-      <gd name="q9" fmla="*/ sdyO dxO 1" />
-
-      <gd name="q10" fmla="*/ q9 sdelO 1" />
-
-      <gd name="q11" fmla="*/ DO dyO 1" />
-
-      <gd name="dxF1" fmla="+/ q11 q10 q4" />
-
-      <gd name="q12" fmla="+- q11 0 q10" />
-      <gd name="dxF2" fmla="*/ q12 1 q4" />
-
-
-      <gd name="adyO" fmla="abs dyO" />
-      <gd name="q13" fmla="*/ adyO sdelO 1" />
-
-      <gd name="q14" fmla="*/ DO dxO -1" />
-
-      <gd name="dyF1" fmla="+/ q14 q13 q4" />
-
-      <gd name="q15" fmla="+- q14 0 q13" />
-      <gd name="dyF2" fmla="*/ q15 1 q4" />
-
-
-
-      <gd name="q16" fmla="+- x2O 0 dxF1" />
-      <gd name="q17" fmla="+- x2O 0 dxF2" />
-      <gd name="q18" fmla="+- y2O 0 dyF1" />
-      <gd name="q19" fmla="+- y2O 0 dyF2" />
-      <gd name="q20" fmla="mod q16 q18 0" />
-
-      <gd name="q21" fmla="mod q17 q19 0" />
-
-      <gd name="q22" fmla="+- q21 0 q20" />
-      <gd name="dxF" fmla="?: q22 dxF1 dxF2" />
-
-      <gd name="dyF" fmla="?: q22 dyF1 dyF2" />
-
-      <gd name="sdxF" fmla="*/ dxF rw1 rO" />
-
-      <gd name="sdyF" fmla="*/ dyF rh1 rO" />
-
-      <gd name="xF" fmla="+- hc sdxF 0" />
-
-      <gd name="yF" fmla="+- vc sdyF 0" />
-
-
-
-
-      <gd name="x1I" fmla="*/ sx1 rI rw2" />
-
-      <gd name="y1I" fmla="*/ sy1 rI rh2" />
-
-      <gd name="x2I" fmla="*/ sx2 rI rw2" />
-
-      <gd name="y2I" fmla="*/ sy2 rI rh2" />
-
-
-      <gd name="dxI" fmla="+- x2I 0 x1I" />
-      <gd name="dyI" fmla="+- y2I 0 y1I" />
-      <gd name="dI" fmla="mod dxI dyI 0" />
-      <gd name="v1" fmla="*/ x1I y2I 1" />
-      <gd name="v2" fmla="*/ x2I y1I 1" />
-      <gd name="DI" fmla="+- v1 0 v2" />
-
-      <gd name="v3" fmla="*/ rI rI 1" />
-      <gd name="v4" fmla="*/ dI dI 1" />
-      <gd name="v5" fmla="*/ v3 v4 1" />
-      <gd name="v6" fmla="*/ DI DI 1" />
-      <gd name="v7" fmla="+- v5 0 v6" />
-      <gd name="v8" fmla="max v7 0" />
-      <gd name="sdelI" fmla="sqrt v8" />
-      <gd name="v9" fmla="*/ sdyO dxI 1" />
-      <gd name="v10" fmla="*/ v9 sdelI 1" />
-      <gd name="v11" fmla="*/ DI dyI 1" />
-      <gd name="dxC1" fmla="+/ v11 v10 v4" />
-      <gd name="v12" fmla="+- v11 0 v10" />
-      <gd name="dxC2" fmla="*/ v12 1 v4" />
-
-      <gd name="adyI" fmla="abs dyI" />
-      <gd name="v13" fmla="*/ adyI sdelI 1" />
-      <gd name="v14" fmla="*/ DI dxI -1" />
-      <gd name="dyC1" fmla="+/ v14 v13 v4" />
-      <gd name="v15" fmla="+- v14 0 v13" />
-      <gd name="dyC2" fmla="*/ v15 1 v4" />
-
-      <gd name="v16" fmla="+- x1I 0 dxC1" />
-      <gd name="v17" fmla="+- x1I 0 dxC2" />
-      <gd name="v18" fmla="+- y1I 0 dyC1" />
-      <gd name="v19" fmla="+- y1I 0 dyC2" />
-      <gd name="v20" fmla="mod v16 v18 0" />
-      <gd name="v21" fmla="mod v17 v19 0" />
-      <gd name="v22" fmla="+- v21 0 v20" />
-      <gd name="dxC" fmla="?: v22 dxC1 dxC2" />
-      <gd name="dyC" fmla="?: v22 dyC1 dyC2" />
-      <gd name="sdxC" fmla="*/ dxC rw2 rI" />
-      <gd name="sdyC" fmla="*/ dyC rh2 rI" />
-      <gd name="xC" fmla="+- hc sdxC 0" />
-
-      <gd name="yC" fmla="+- vc sdyC 0" />
-
-
-      <gd name="ist0" fmla="at2 sdxC sdyC" />
-      <gd name="ist1" fmla="+- ist0 21600000 0" />
-      <gd name="istAng0" fmla="?: ist0 ist0 ist1" />
-      <gd name="isw1" fmla="+- stAng 0 istAng0" />
-      <gd name="isw2" fmla="+- isw1 21600000 0" />
-      <gd name="iswAng0" fmla="?: isw1 isw1 isw2" />
-
-      <gd name="istAng" fmla="+- istAng0 iswAng0 0" />
-      <gd name="iswAng" fmla="+- 0 0 iswAng0" />
-
-      <gd name="p1" fmla="+- xF 0 xC" />
-      <gd name="p2" fmla="+- yF 0 yC" />
-      <gd name="p3" fmla="mod p1 p2 0" />
-      <gd name="p4" fmla="*/ p3 1 2" />
-      <gd name="p5" fmla="+- p4 0 thh" />
-      <gd name="xGp" fmla="?: p5 xF xG" />
-      <gd name="yGp" fmla="?: p5 yF yG" />
-      <gd name="xBp" fmla="?: p5 xC xB" />
-      <gd name="yBp" fmla="?: p5 yC yB" />
-
-      <gd name="en0" fmla="at2 sdxF sdyF" />
-      <gd name="en1" fmla="+- en0 21600000 0" />
-      <gd name="en2" fmla="?: en0 en0 en1" />
-      <gd name="sw0" fmla="+- en2 0 stAng" />
-      <gd name="sw1" fmla="+- sw0 0 21600000" />
-      <gd name="swAng" fmla="?: sw0 sw1 sw0" />
-
-
-      <gd name="stAng0" fmla="+- stAng swAng 0" />
-
-      <gd name="swAng0" fmla="+- 0 0 swAng" />
-
-
-      <gd name="wtI" fmla="sin rw3 stAng" />
-      <gd name="htI" fmla="cos rh3 stAng" />
-      <gd name="dxI" fmla="cat2 rw3 htI wtI" />
-      <gd name="dyI" fmla="sat2 rh3 htI wtI" />
-      <gd name="xI" fmla="+- hc dxI 0" />
-
-      <gd name="yI" fmla="+- vc dyI 0" />
-
-
-      <gd name="aI" fmla="+- stAng cd4 0" />
-      <gd name="aA" fmla="+- ptAng 0 cd4" />
-      <gd name="aB" fmla="+- ptAng cd2 0" />
-
-      <gd name="idx" fmla="cos rw1 2700000" />
-      <gd name="idy" fmla="sin rh1 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefAng="adj2" minAng="minAng" maxAng="0">
-        <pos x="xA" y="yA" />
-      </ahPolar>
-      <ahPolar gdRefAng="adj4" minAng="0" maxAng="21599999">
-        <pos x="xE" y="yE" />
-      </ahPolar>
-      <ahPolar gdRefR="adj1" minR="0" maxR="maxAdj1" gdRefAng="adj3" minAng="0" maxAng="21599999">
-        <pos x="xF" y="yF" />
-      </ahPolar>
-      <ahPolar gdRefR="adj5" minR="0" maxR="25000">
-        <pos x="xB" y="yB" />
-      </ahPolar>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="aI">
-        <pos x="xI" y="yI" />
-      </cxn>
-      <cxn ang="ptAng">
-        <pos x="xGp" y="yGp" />
-      </cxn>
-      <cxn ang="aA">
-        <pos x="xA" y="yA" />
-      </cxn>
-      <cxn ang="aB">
-        <pos x="xBp" y="yBp" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="xE" y="yE" />
-        </moveTo>
-        <lnTo>
-          <pt x="xD" y="yD" />
-        </lnTo>
-        <arcTo wR="rw2" hR="rh2" stAng="istAng" swAng="iswAng" />
-        <lnTo>
-          <pt x="xBp" y="yBp" />
-        </lnTo>
-        <lnTo>
-          <pt x="xA" y="yA" />
-        </lnTo>
-        <lnTo>
-          <pt x="xGp" y="yGp" />
-        </lnTo>
-        <lnTo>
-          <pt x="xF" y="yF" />
-        </lnTo>
-        <arcTo wR="rw1" hR="rh1" stAng="stAng0" swAng="swAng0" />
-        <close />
-      </path>
-    </pathLst>
-
-  </leftCircularArrow>
-  <leftRightArrow>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 w ss" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="x2" fmla="*/ ss a2 100000" />
-      <gd name="x3" fmla="+- r 0 x2" />
-      <gd name="dy" fmla="*/ h a1 200000" />
-      <gd name="y1" fmla="+- vc 0 dy" />
-      <gd name="y2" fmla="+- vc dy 0" />
-      <gd name="dx1" fmla="*/ y1 x2 hd2" />
-      <gd name="x1" fmla="+- x2 0 dx1" />
-      <gd name="x4" fmla="+- x3 dx1 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="x3" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="x1" t="y1" r="x4" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </leftRightArrow>
-  <leftRightArrowCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 48123" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 h ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ 50000 w ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q2" fmla="*/ a3 ss wd2" />
-
-      <gd name="maxAdj4" fmla="+- 100000 0 q2" />
-
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-      <gd name="dy1" fmla="*/ ss a2 100000" />
-
-      <gd name="dy2" fmla="*/ ss a1 200000" />
-
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc dy2 0" />
-      <gd name="y4" fmla="+- vc dy1 0" />
-      <gd name="x1" fmla="*/ ss a3 100000" />
-
-      <gd name="x4" fmla="+- r 0 x1" />
-
-      <gd name="dx2" fmla="*/ w a4 200000" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-
-      <gd name="x3" fmla="+- hc dx2 0" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="x1" y="y2" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="0" maxX="maxAdj3">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="0" maxX="maxAdj4">
-        <pos x="x2" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="t" r="x3" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </leftRightArrowCallout>
-  <leftRightCircularArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 12500" />
-
-      <gd name="adj2" fmla="val 1142319" />
-
-      <gd name="adj3" fmla="val 20457681" />
-
-      <gd name="adj4" fmla="val 11942319" />
-
-      <gd name="adj5" fmla="val 12500" />
-
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a5" fmla="pin 0 adj5 25000" />
-
-      <gd name="maxAdj1" fmla="*/ a5 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="enAng" fmla="pin 1 adj3 21599999" />
-      <gd name="stAng" fmla="pin 0 adj4 21599999" />
-
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="thh" fmla="*/ ss a5 100000" />
-
-      <gd name="th2" fmla="*/ th 1 2" />
-
-
-      <gd name="rw1" fmla="+- wd2 th2 thh" />
-
-      <gd name="rh1" fmla="+- hd2 th2 thh" />
-
-      <gd name="rw2" fmla="+- rw1 0 th" />
-
-      <gd name="rh2" fmla="+- rh1 0 th" />
-
-      <gd name="rw3" fmla="+- rw2 th2 0" />
-
-      <gd name="rh3" fmla="+- rh2 th2 0" />
-
-
-      <gd name="wtH" fmla="sin rw3 enAng" />
-      <gd name="htH" fmla="cos rh3 enAng" />
-      <gd name="dxH" fmla="cat2 rw3 htH wtH" />
-      <gd name="dyH" fmla="sat2 rh3 htH wtH" />
-      <gd name="xH" fmla="+- hc dxH 0" />
-
-      <gd name="yH" fmla="+- vc dyH 0" />
-
-
-      <gd name="rI" fmla="min rw2 rh2" />
-
-      <gd name="u1" fmla="*/ dxH dxH 1" />
-      <gd name="u2" fmla="*/ dyH dyH 1" />
-      <gd name="u3" fmla="*/ rI rI 1" />
-      <gd name="u4" fmla="+- u1 0 u3" />
-      <gd name="u5" fmla="+- u2 0 u3" />
-      <gd name="u6" fmla="*/ u4 u5 u1" />
-      <gd name="u7" fmla="*/ u6 1 u2" />
-      <gd name="u8" fmla="+- 1 0 u7" />
-      <gd name="u9" fmla="sqrt u8" />
-      <gd name="u10" fmla="*/ u4 1 dxH" />
-      <gd name="u11" fmla="*/ u10 1 dyH" />
-      <gd name="u12" fmla="+/ 1 u9 u11" />
-      <gd name="u13" fmla="at2 1 u12" />
-      <gd name="u14" fmla="+- u13 21600000 0" />
-      <gd name="u15" fmla="?: u13 u13 u14" />
-      <gd name="u16" fmla="+- u15 0 enAng" />
-
-      <gd name="u17" fmla="+- u16 21600000 0" />
-      <gd name="u18" fmla="?: u16 u16 u17" />
-      <gd name="u19" fmla="+- u18 0 cd2" />
-      <gd name="u20" fmla="+- u18 0 21600000" />
-      <gd name="u21" fmla="?: u19 u20 u18" />
-      <gd name="maxAng" fmla="abs u21" />
-      <gd name="aAng" fmla="pin 0 adj2 maxAng" />
-
-      <gd name="ptAng" fmla="+- enAng aAng 0" />
-
-
-      <gd name="wtA" fmla="sin rw3 ptAng" />
-      <gd name="htA" fmla="cos rh3 ptAng" />
-      <gd name="dxA" fmla="cat2 rw3 htA wtA" />
-      <gd name="dyA" fmla="sat2 rh3 htA wtA" />
-      <gd name="xA" fmla="+- hc dxA 0" />
-
-      <gd name="yA" fmla="+- vc dyA 0" />
-
-
-      <gd name="dxG" fmla="cos thh ptAng" />
-      <gd name="dyG" fmla="sin thh ptAng" />
-      <gd name="xG" fmla="+- xH dxG 0" />
-
-      <gd name="yG" fmla="+- yH dyG 0" />
-
-
-      <gd name="dxB" fmla="cos thh ptAng" />
-      <gd name="dyB" fmla="sin thh ptAng" />
-      <gd name="xB" fmla="+- xH 0 dxB 0" />
-
-      <gd name="yB" fmla="+- yH 0 dyB 0" />
-
-
-      <gd name="sx1" fmla="+- xB 0 hc" />
-
-      <gd name="sy1" fmla="+- yB 0 vc" />
-
-      <gd name="sx2" fmla="+- xG 0 hc" />
-
-      <gd name="sy2" fmla="+- yG 0 vc" />
-
-
-      <gd name="rO" fmla="min rw1 rh1" />
-
-      <gd name="x1O" fmla="*/ sx1 rO rw1" />
-
-      <gd name="y1O" fmla="*/ sy1 rO rh1" />
-
-      <gd name="x2O" fmla="*/ sx2 rO rw1" />
-
-      <gd name="y2O" fmla="*/ sy2 rO rh1" />
-
-
-      <gd name="dxO" fmla="+- x2O 0 x1O" />
-      <gd name="dyO" fmla="+- y2O 0 y1O" />
-      <gd name="dO" fmla="mod dxO dyO 0" />
-
-      <gd name="q1" fmla="*/ x1O y2O 1" />
-      <gd name="q2" fmla="*/ x2O y1O 1" />
-      <gd name="DO" fmla="+- q1 0 q2" />
-
-
-      <gd name="q3" fmla="*/ rO rO 1" />
-
-      <gd name="q4" fmla="*/ dO dO 1" />
-
-      <gd name="q5" fmla="*/ q3 q4 1" />
-
-      <gd name="q6" fmla="*/ DO DO 1" />
-
-      <gd name="q7" fmla="+- q5 0 q6" />
-
-      <gd name="q8" fmla="max q7 0" />
-
-      <gd name="sdelO" fmla="sqrt q8" />
-
-      <gd name="ndyO" fmla="*/ dyO -1 1" />
-      <gd name="sdyO" fmla="?: ndyO -1 1" />
-
-      <gd name="q9" fmla="*/ sdyO dxO 1" />
-
-      <gd name="q10" fmla="*/ q9 sdelO 1" />
-
-      <gd name="q11" fmla="*/ DO dyO 1" />
-
-      <gd name="dxF1" fmla="+/ q11 q10 q4" />
-
-      <gd name="q12" fmla="+- q11 0 q10" />
-      <gd name="dxF2" fmla="*/ q12 1 q4" />
-
-
-      <gd name="adyO" fmla="abs dyO" />
-      <gd name="q13" fmla="*/ adyO sdelO 1" />
-
-      <gd name="q14" fmla="*/ DO dxO -1" />
-
-      <gd name="dyF1" fmla="+/ q14 q13 q4" />
-
-      <gd name="q15" fmla="+- q14 0 q13" />
-      <gd name="dyF2" fmla="*/ q15 1 q4" />
-
-
-
-      <gd name="q16" fmla="+- x2O 0 dxF1" />
-      <gd name="q17" fmla="+- x2O 0 dxF2" />
-      <gd name="q18" fmla="+- y2O 0 dyF1" />
-      <gd name="q19" fmla="+- y2O 0 dyF2" />
-      <gd name="q20" fmla="mod q16 q18 0" />
-
-      <gd name="q21" fmla="mod q17 q19 0" />
-
-      <gd name="q22" fmla="+- q21 0 q20" />
-      <gd name="dxF" fmla="?: q22 dxF1 dxF2" />
-
-      <gd name="dyF" fmla="?: q22 dyF1 dyF2" />
-
-      <gd name="sdxF" fmla="*/ dxF rw1 rO" />
-
-      <gd name="sdyF" fmla="*/ dyF rh1 rO" />
-
-      <gd name="xF" fmla="+- hc sdxF 0" />
-
-      <gd name="yF" fmla="+- vc sdyF 0" />
-
-
-
-
-      <gd name="x1I" fmla="*/ sx1 rI rw2" />
-
-      <gd name="y1I" fmla="*/ sy1 rI rh2" />
-
-      <gd name="x2I" fmla="*/ sx2 rI rw2" />
-
-      <gd name="y2I" fmla="*/ sy2 rI rh2" />
-
-
-      <gd name="dxI" fmla="+- x2I 0 x1I" />
-      <gd name="dyI" fmla="+- y2I 0 y1I" />
-      <gd name="dI" fmla="mod dxI dyI 0" />
-      <gd name="v1" fmla="*/ x1I y2I 1" />
-      <gd name="v2" fmla="*/ x2I y1I 1" />
-      <gd name="DI" fmla="+- v1 0 v2" />
-
-      <gd name="v3" fmla="*/ rI rI 1" />
-      <gd name="v4" fmla="*/ dI dI 1" />
-      <gd name="v5" fmla="*/ v3 v4 1" />
-      <gd name="v6" fmla="*/ DI DI 1" />
-      <gd name="v7" fmla="+- v5 0 v6" />
-      <gd name="v8" fmla="max v7 0" />
-      <gd name="sdelI" fmla="sqrt v8" />
-      <gd name="v9" fmla="*/ sdyO dxI 1" />
-      <gd name="v10" fmla="*/ v9 sdelI 1" />
-      <gd name="v11" fmla="*/ DI dyI 1" />
-      <gd name="dxC1" fmla="+/ v11 v10 v4" />
-      <gd name="v12" fmla="+- v11 0 v10" />
-      <gd name="dxC2" fmla="*/ v12 1 v4" />
-
-      <gd name="adyI" fmla="abs dyI" />
-      <gd name="v13" fmla="*/ adyI sdelI 1" />
-      <gd name="v14" fmla="*/ DI dxI -1" />
-      <gd name="dyC1" fmla="+/ v14 v13 v4" />
-      <gd name="v15" fmla="+- v14 0 v13" />
-      <gd name="dyC2" fmla="*/ v15 1 v4" />
-
-      <gd name="v16" fmla="+- x1I 0 dxC1" />
-      <gd name="v17" fmla="+- x1I 0 dxC2" />
-      <gd name="v18" fmla="+- y1I 0 dyC1" />
-      <gd name="v19" fmla="+- y1I 0 dyC2" />
-      <gd name="v20" fmla="mod v16 v18 0" />
-      <gd name="v21" fmla="mod v17 v19 0" />
-      <gd name="v22" fmla="+- v21 0 v20" />
-      <gd name="dxC" fmla="?: v22 dxC1 dxC2" />
-      <gd name="dyC" fmla="?: v22 dyC1 dyC2" />
-      <gd name="sdxC" fmla="*/ dxC rw2 rI" />
-      <gd name="sdyC" fmla="*/ dyC rh2 rI" />
-      <gd name="xC" fmla="+- hc sdxC 0" />
-
-      <gd name="yC" fmla="+- vc sdyC 0" />
-
-
-      <gd name="wtI" fmla="sin rw3 stAng" />
-      <gd name="htI" fmla="cos rh3 stAng" />
-      <gd name="dxI" fmla="cat2 rw3 htI wtI" />
-      <gd name="dyI" fmla="sat2 rh3 htI wtI" />
-      <gd name="xI" fmla="+- hc dxI 0" />
-
-      <gd name="yI" fmla="+- vc dyI 0" />
-
-
-      <gd name="lptAng" fmla="+- stAng 0 aAng" />
-
-
-      <gd name="wtL" fmla="sin rw3 lptAng" />
-      <gd name="htL" fmla="cos rh3 lptAng" />
-      <gd name="dxL" fmla="cat2 rw3 htL wtL" />
-      <gd name="dyL" fmla="sat2 rh3 htL wtL" />
-      <gd name="xL" fmla="+- hc dxL 0" />
-
-      <gd name="yL" fmla="+- vc dyL 0" />
-
-
-      <gd name="dxK" fmla="cos thh lptAng" />
-      <gd name="dyK" fmla="sin thh lptAng" />
-      <gd name="xK" fmla="+- xI dxK 0" />
-
-      <gd name="yK" fmla="+- yI dyK 0" />
-
-
-      <gd name="dxJ" fmla="cos thh lptAng" />
-      <gd name="dyJ" fmla="sin thh lptAng" />
-      <gd name="xJ" fmla="+- xI 0 dxJ 0" />
-
-      <gd name="yJ" fmla="+- yI 0 dyJ 0" />
-
-
-      <gd name="p1" fmla="+- xF 0 xC" />
-      <gd name="p2" fmla="+- yF 0 yC" />
-      <gd name="p3" fmla="mod p1 p2 0" />
-      <gd name="p4" fmla="*/ p3 1 2" />
-      <gd name="p5" fmla="+- p4 0 thh" />
-      <gd name="xGp" fmla="?: p5 xF xG" />
-      <gd name="yGp" fmla="?: p5 yF yG" />
-      <gd name="xBp" fmla="?: p5 xC xB" />
-      <gd name="yBp" fmla="?: p5 yC yB" />
-
-      <gd name="en0" fmla="at2 sdxF sdyF" />
-      <gd name="en1" fmla="+- en0 21600000 0" />
-      <gd name="en2" fmla="?: en0 en0 en1" />
-      <gd name="od0" fmla="+- en2 0 enAng" />
-      <gd name="od1" fmla="+- od0 21600000 0" />
-      <gd name="od2" fmla="?: od0 od0 od1" />
-
-      <gd name="st0" fmla="+- stAng 0 od2" />
-      <gd name="st1" fmla="+- st0 21600000 0" />
-      <gd name="st2" fmla="?: st0 st0 st1" />
-
-      <gd name="sw0" fmla="+- en2 0 st2" />
-      <gd name="sw1" fmla="+- sw0 21600000 0" />
-      <gd name="swAng" fmla="?: sw0 sw0 sw1" />
-
-
-      <gd name="ist0" fmla="at2 sdxC sdyC" />
-      <gd name="ist1" fmla="+- ist0 21600000 0" />
-      <gd name="istAng" fmla="?: ist0 ist0 ist1" />
-
-      <gd name="id0" fmla="+- istAng 0 enAng" />
-      <gd name="id1" fmla="+- id0 0 21600000" />
-      <gd name="id2" fmla="?: id0 id1 id0" />
-
-      <gd name="ien0" fmla="+- stAng 0 id2" />
-      <gd name="ien1" fmla="+- ien0 0 21600000" />
-      <gd name="ien2" fmla="?: ien1 ien1 ien0" />
-
-      <gd name="isw1" fmla="+- ien2 0 istAng" />
-      <gd name="isw2" fmla="+- isw1 0 21600000" />
-      <gd name="iswAng" fmla="?: isw1 isw2 isw1" />
-
-
-      <gd name="wtE" fmla="sin rw1 st2" />
-      <gd name="htE" fmla="cos rh1 st2" />
-      <gd name="dxE" fmla="cat2 rw1 htE wtE" />
-      <gd name="dyE" fmla="sat2 rh1 htE wtE" />
-      <gd name="xE" fmla="+- hc dxE 0" />
-
-      <gd name="yE" fmla="+- vc dyE 0" />
-
-
-      <gd name="wtD" fmla="sin rw2 ien2" />
-      <gd name="htD" fmla="cos rh2 ien2" />
-      <gd name="dxD" fmla="cat2 rw2 htD wtD" />
-      <gd name="dyD" fmla="sat2 rh2 htD wtD" />
-      <gd name="xD" fmla="+- hc dxD 0" />
-
-      <gd name="yD" fmla="+- vc dyD 0" />
-
-
-      <gd name="xKp" fmla="?: p5 xE xK" />
-      <gd name="yKp" fmla="?: p5 yE yK" />
-      <gd name="xJp" fmla="?: p5 xD xJ" />
-      <gd name="yJp" fmla="?: p5 yD yJ" />
-
-      <gd name="aL" fmla="+- lptAng 0 cd4" />
-      <gd name="aA" fmla="+- ptAng cd4 0" />
-      <gd name="aB" fmla="+- ptAng cd2 0" />
-      <gd name="aJ" fmla="+- lptAng cd2 0" />
-
-      <gd name="idx" fmla="cos rw1 2700000" />
-      <gd name="idy" fmla="sin rh1 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefAng="adj2" minAng="0" maxAng="maxAng">
-        <pos x="xA" y="yA" />
-      </ahPolar>
-      <ahPolar gdRefAng="adj4" minAng="0" maxAng="21599999">
-        <pos x="xE" y="yE" />
-      </ahPolar>
-      <ahPolar gdRefR="adj1" minR="0" maxR="maxAdj1" gdRefAng="adj3" minAng="0" maxAng="21599999">
-        <pos x="xF" y="yF" />
-      </ahPolar>
-      <ahPolar gdRefR="adj5" minR="0" maxR="25000">
-        <pos x="xB" y="yB" />
-      </ahPolar>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="aL">
-        <pos x="xL" y="yL" />
-      </cxn>
-      <cxn ang="lptAng">
-        <pos x="xKp" y="yKp" />
-      </cxn>
-      <cxn ang="ptAng">
-        <pos x="xGp" y="yGp" />
-      </cxn>
-      <cxn ang="aA">
-        <pos x="xA" y="yA" />
-      </cxn>
-      <cxn ang="aB">
-        <pos x="xBp" y="yBp" />
-      </cxn>
-      <cxn ang="aJ">
-        <pos x="xJp" y="yJp" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="xL" y="yL" />
-        </moveTo>
-        <lnTo>
-          <pt x="xKp" y="yKp" />
-        </lnTo>
-        <lnTo>
-          <pt x="xE" y="yE" />
-        </lnTo>
-        <arcTo wR="rw1" hR="rh1" stAng="st2" swAng="swAng" />
-        <lnTo>
-          <pt x="xGp" y="yGp" />
-        </lnTo>
-        <lnTo>
-          <pt x="xA" y="yA" />
-        </lnTo>
-        <lnTo>
-          <pt x="xBp" y="yBp" />
-        </lnTo>
-        <lnTo>
-          <pt x="xC" y="yC" />
-        </lnTo>
-        <arcTo wR="rw2" hR="rh2" stAng="istAng" swAng="iswAng" />
-        <lnTo>
-          <pt x="xJp" y="yJp" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </leftRightCircularArrow>
-  <leftRightRibbon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-      <gd name="adj3" fmla="val 16667" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a3" fmla="pin 0 adj3 33333" />
-      <gd name="maxAdj1" fmla="+- 100000 0 a3" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-
-      <gd name="w1" fmla="+- wd2 0 wd32" />
-      <gd name="maxAdj2" fmla="*/ 100000 w1 ss" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-
-      <gd name="x1" fmla="*/ ss a2 100000" />
-
-      <gd name="x4" fmla="+- r 0 x1" />
-
-      <gd name="dy1" fmla="*/ h a1 200000" />
-
-      <gd name="dy2" fmla="*/ h a3 -200000" />
-
-      <gd name="ly1" fmla="+- vc dy2 dy1" />
-
-      <gd name="ry4" fmla="+- vc dy1 dy2" />
-
-      <gd name="ly2" fmla="+- ly1 dy1 0" />
-
-      <gd name="ry3" fmla="+- b 0 ly2" />
-
-      <gd name="ly4" fmla="*/ ly2 2 1" />
-
-      <gd name="ry1" fmla="+- b 0 ly4" />
-
-      <gd name="ly3" fmla="+- ly4 0 ly1" />
-
-      <gd name="ry2" fmla="+- b 0 ly3" />
-
-
-      <gd name="hR" fmla="*/ a3 ss 400000" />
-
-      <gd name="x2" fmla="+- hc 0 wd32" />
-
-      <gd name="x3" fmla="+- hc wd32 0" />
-
-      <gd name="y1" fmla="+- ly1 hR 0" />
-
-      <gd name="y2" fmla="+- ry2 0 hR" />
-
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="x4" y="ry2" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="33333">
-        <pos x="x3" y="ry2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="ry3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x4" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="ly4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="ly2" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x4" y="ry1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="ly1" r="x4" b="ry4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="ly2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="ly1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="ly1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd2" />
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x4" y="ry2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="ry1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="ry3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="ry4" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="ry4" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="ly3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="ly3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="ly4" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x3" y="y1" />
-        </moveTo>
-        <arcTo wR="wd32" hR="hR" stAng="0" swAng="cd4" />
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x3" y="ry2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="ly2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="ly1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="ly1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd2" />
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x4" y="ry2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="ry1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="ry3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="ry4" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="ry4" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="ly3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="ly3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="ly4" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x3" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x3" y="ry2" />
-        </lnTo>
-        <moveTo>
-          <pt x="x2" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="ly3" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </leftRightRibbon>
-  <leftRightUpArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="q1" fmla="+- 100000 0 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ q1 1 2" />
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="x1" fmla="*/ ss a3 100000" />
-      <gd name="dx2" fmla="*/ ss a2 100000" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x5" fmla="+- hc dx2 0" />
-      <gd name="dx3" fmla="*/ ss a1 200000" />
-
-      <gd name="x3" fmla="+- hc 0 dx3" />
-      <gd name="x4" fmla="+- hc dx3 0" />
-      <gd name="x6" fmla="+- r 0 x1" />
-
-      <gd name="dy2" fmla="*/ ss a2 50000" />
-
-      <gd name="y2" fmla="+- b 0 dy2" />
-      <gd name="y4" fmla="+- b 0 dx2" />
-      <gd name="y3" fmla="+- y4 0 dx3" />
-      <gd name="y5" fmla="+- y4 dx3 0" />
-      <gd name="il" fmla="*/ dx3 x1 dx2" />
-      <gd name="ir" fmla="+- r 0 il" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="x3" y="x1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="x2" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="x1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y5" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y4" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="y3" r="ir" b="y5" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y4" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </leftRightUpArrow>
-  <leftUpArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="+- 100000 0 maxAdj1" />
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="x1" fmla="*/ ss a3 100000" />
-
-      <gd name="dx2" fmla="*/ ss a2 50000" />
-
-      <gd name="x2" fmla="+- r 0 dx2" />
-      <gd name="y2" fmla="+- b 0 dx2" />
-      <gd name="dx4" fmla="*/ ss a2 100000" />
-
-      <gd name="x4" fmla="+- r 0 dx4" />
-      <gd name="y4" fmla="+- b 0 dx4" />
-      <gd name="dx3" fmla="*/ ss a1 200000" />
-
-      <gd name="x3" fmla="+- x4 0 dx3" />
-      <gd name="x5" fmla="+- x4 dx3 0" />
-      <gd name="y3" fmla="+- y4 0 dx3" />
-      <gd name="y5" fmla="+- y4 dx3 0" />
-      <gd name="il" fmla="*/ dx3 x1 dx4" />
-      <gd name="cx1" fmla="+/ x1 x5 2" />
-      <gd name="cy1" fmla="+/ x1 y5 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="x3" y="y3" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="x2" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="x3" y="x1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x4" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x2" y="x1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="cx1" y="y5" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x5" y="cy1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="x1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="y3" r="x4" b="y5" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y4" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </leftUpArrow>
-  <lightningBolt>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="x1" fmla="*/ w 5022 21600" />
-      <gd name="x3" fmla="*/ w 8472 21600" />
-      <gd name="x4" fmla="*/ w 8757 21600" />
-
-      <gd name="x5" fmla="*/ w 10012 21600" />
-      <gd name="x8" fmla="*/ w 12860 21600" />
-      <gd name="x9" fmla="*/ w 13917 21600" />
-
-      <gd name="x11" fmla="*/ w 16577 21600" />
-      <gd name="y1" fmla="*/ h 3890 21600" />
-      <gd name="y2" fmla="*/ h 6080 21600" />
-      <gd name="y4" fmla="*/ h 7437 21600" />
-
-      <gd name="y6" fmla="*/ h 9705 21600" />
-      <gd name="y7" fmla="*/ h 12007 21600" />
-      <gd name="y10" fmla="*/ h 14277 21600" />
-
-      <gd name="y11" fmla="*/ h 14915 21600" />
-
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x3" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="l" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y6" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x5" y="y11" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="r" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x11" y="y7" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x8" y="y2" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x4" t="y4" r="x9" b="y10" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path w="21600" h="21600">
-        <moveTo>
-          <pt x="8472" y="0" />
-        </moveTo>
-        <lnTo>
-          <pt x="12860" y="6080" />
-        </lnTo>
-        <lnTo>
-          <pt x="11050" y="6797" />
-        </lnTo>
-        <lnTo>
-          <pt x="16577" y="12007" />
-        </lnTo>
-        <lnTo>
-          <pt x="14767" y="12877" />
-        </lnTo>
-        <lnTo>
-          <pt x="21600" y="21600" />
-        </lnTo>
-        <lnTo>
-          <pt x="10012" y="14915" />
-        </lnTo>
-        <lnTo>
-          <pt x="12222" y="13987" />
-        </lnTo>
-        <lnTo>
-          <pt x="5022" y="9705" />
-        </lnTo>
-        <lnTo>
-          <pt x="7602" y="8382" />
-        </lnTo>
-        <lnTo>
-          <pt x="0" y="3890" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </lightningBolt>
-  <line>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="l" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="r" y="b" />
-      </cxn>
-    </cxnLst>
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-      </path>
-    </pathLst>
-  </line>
-  <lineInv>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="r" y="t" />
-      </cxn>
-    </cxnLst>
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-      </path>
-    </pathLst>
-  </lineInv>
-  <mathDivide>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 23520" />
-
-      <gd name="adj2" fmla="val 5880" />
-
-      <gd name="adj3" fmla="val 11760" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-      <gd name="a1" fmla="pin 1000 adj1 36745" />
-      <gd name="ma1" fmla="+- 0 0 a1" />
-
-      <gd name="ma3h" fmla="+/ 73490 ma1 4" />
-
-      <gd name="ma3w" fmla="*/ 36745 w h" />
-
-      <gd name="maxAdj3" fmla="min ma3h ma3w" />
-      <gd name="a3" fmla="pin 1000 adj3 maxAdj3" />
-      <gd name="m4a3" fmla="*/ -4 a3 1" />
-
-      <gd name="maxAdj2" fmla="+- 73490 m4a3 a1" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-
-      <gd name="dy1" fmla="*/ h a1 200000" />
-
-      <gd name="yg" fmla="*/ h a2 100000" />
-
-      <gd name="rad" fmla="*/ h a3 100000" />
-
-      <gd name="dx1" fmla="*/ w 73490 200000" />
-
-
-      <gd name="y3" fmla="+- vc 0 dy1" />
-
-      <gd name="y4" fmla="+- vc dy1 0" />
-
-      <gd name="a" fmla="+- yg rad 0" />
-      <gd name="y2" fmla="+- y3 0 a" />
-
-      <gd name="y1" fmla="+- y2 0 rad" />
-
-      <gd name="y5" fmla="+- b 0 y1" />
-
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-
-      <gd name="x3" fmla="+- hc dx1 0" />
-
-      <gd name="x2" fmla="+- hc 0 rad" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="1000" maxY="36745">
-        <pos x="l" y="y3" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="r" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="1000" maxX="maxAdj3">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x3" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y5" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y3" r="x3" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="hc" y="y1" />
-        </moveTo>
-        <arcTo hR="rad" wR="rad" stAng="3cd4" swAng="21600000" />
-        <close />
-        <moveTo>
-          <pt x="hc" y="y5" />
-        </moveTo>
-        <arcTo hR="rad" wR="rad" stAng="cd4" swAng="21600000" />
-        <close />
-        <moveTo>
-          <pt x="x1" y="y3" />
-        </moveTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </mathDivide>
-  <mathEqual>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 23520" />
-
-      <gd name="adj2" fmla="val 11760" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 36745" />
-
-
-      <gd name="2a1" fmla="*/ a1 2 1" />
-
-      <gd name="mAdj2" fmla="+- 100000 0 2a1" />
-
-      <gd name="a2" fmla="pin 0 adj2 mAdj2" />
-      <gd name="dy1" fmla="*/ h a1 100000" />
-
-      <gd name="dy2" fmla="*/ h a2 200000" />
-
-      <gd name="dx1" fmla="*/ w 73490 200000" />
-
-
-      <gd name="y2" fmla="+- vc 0 dy2" />
-
-      <gd name="y3" fmla="+- vc dy2 0" />
-
-      <gd name="y1" fmla="+- y2 0 dy1" />
-
-      <gd name="y4" fmla="+- y3 dy1 0" />
-
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-
-      <gd name="x2" fmla="+- hc dx1 0" />
-
-
-
-      <gd name="yC1" fmla="+/ y1 y2 2" />
-
-      <gd name="yC2" fmla="+/ y3 y4 2" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="36745">
-        <pos x="l" y="y1" />
-      </ahXY>
-
-      <ahXY gdRefY="adj2" minY="0" maxY="mAdj2">
-        <pos x="r" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x2" y="yC1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="yC2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="yC1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="yC2" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y1" r="x2" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x1" y="y3" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </mathEqual>
-  <mathMinus>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 23520" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="dy1" fmla="*/ h a1 200000" />
-
-      <gd name="dx1" fmla="*/ w 73490 200000" />
-
-
-      <gd name="y1" fmla="+- vc 0 dy1" />
-
-      <gd name="y2" fmla="+- vc dy1 0" />
-
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-
-      <gd name="x2" fmla="+- hc dx1 0" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="l" y="y1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y1" r="x2" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </mathMinus>
-  <mathMultiply>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 23520" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-
-
-
-
-      <gd name="a1" fmla="pin 0 adj1 51965" />
-
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-
-      <gd name="a" fmla="at2 w h" />
-
-      <gd name="sa" fmla="sin 1 a" />
-      <gd name="ca" fmla="cos 1 a" />
-      <gd name="ta" fmla="tan 1 a" />
-
-
-      <gd name="dl" fmla="mod w h 0" />
-
-      <gd name="rw" fmla="*/ dl 51965 100000" />
-
-
-
-      <gd name="lM" fmla="+- dl 0 rw" />
-      <gd name="xM" fmla="*/ ca lM 2" />
-      <gd name="yM" fmla="*/ sa lM 2" />
-
-
-      <gd name="dxAM" fmla="*/ sa th 2" />
-      <gd name="dyAM" fmla="*/ ca th 2" />
-      <gd name="xA" fmla="+- xM 0 dxAM" />
-      <gd name="yA" fmla="+- yM dyAM 0" />
-
-
-      <gd name="xB" fmla="+- xM dxAM 0" />
-      <gd name="yB" fmla="+- yM 0 dyAM" />
-
-
-      <gd name="xBC" fmla="+- hc 0 xB" />
-      <gd name="yBC" fmla="*/ xBC ta 1" />
-      <gd name="yC" fmla="+- yBC yB 0" />
-
-
-      <gd name="xD" fmla="+- r 0 xB" />
-      <gd name="xE" fmla="+- r 0 xA" />
-
-      <gd name="yFE" fmla="+- vc 0 yA" />
-      <gd name="xFE" fmla="*/ yFE 1 ta" />
-      <gd name="xF" fmla="+- xE 0 xFE" />
-      <gd name="xL" fmla="+- xA xFE 0" />
-      <gd name="yG" fmla="+- b 0 yA" />
-      <gd name="yH" fmla="+- b 0 yB" />
-      <gd name="yI" fmla="+- b 0 yC" />
-
-
-      <gd name="xC2" fmla="+- r 0 xM" />
-
-      <gd name="yC3" fmla="+- b 0 yM" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="51965">
-        <pos x="l" y="th" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd2">
-        <pos x="xM" y="yM" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="xC2" y="yM" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="xC2" y="yC3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="xM" y="yC3" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="xA" t="yB" r="xE" b="yH" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="xA" y="yA" />
-        </moveTo>
-        <lnTo>
-          <pt x="xB" y="yB" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="yC" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD" y="yB" />
-        </lnTo>
-        <lnTo>
-          <pt x="xE" y="yA" />
-        </lnTo>
-        <lnTo>
-          <pt x="xF" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="xE" y="yG" />
-        </lnTo>
-        <lnTo>
-          <pt x="xD" y="yH" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="yI" />
-        </lnTo>
-        <lnTo>
-          <pt x="xB" y="yH" />
-        </lnTo>
-        <lnTo>
-          <pt x="xA" y="yG" />
-        </lnTo>
-        <lnTo>
-          <pt x="xL" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </mathMultiply>
-  <mathNotEqual>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 23520" />
-
-      <gd name="adj2" fmla="val 6600000" />
-
-      <gd name="adj3" fmla="val 11760" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="crAng" fmla="pin 4200000 adj2 6600000" />
-
-
-      <gd name="2a1" fmla="*/ a1 2 1" />
-      <gd name="maxAdj3" fmla="+- 100000 0 2a1" />
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-
-      <gd name="dy1" fmla="*/ h a1 100000" />
-
-      <gd name="dy2" fmla="*/ h a3 200000" />
-
-      <gd name="dx1" fmla="*/ w 73490 200000" />
-
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-
-      <gd name="x8" fmla="+- hc dx1 0" />
-
-
-
-      <gd name="y2" fmla="+- vc 0 dy2" />
-
-      <gd name="y3" fmla="+- vc dy2 0" />
-
-      <gd name="y1" fmla="+- y2 0 dy1" />
-
-      <gd name="y4" fmla="+- y3 dy1 0" />
-
-
-      <gd name="cadj2" fmla="+- crAng 0 cd4" />
-      <gd name="xadj2" fmla="tan hd2 cadj2" />
-
-
-
-      <gd name="len" fmla="mod xadj2 hd2 0" />
-
-
-
-      <gd name="bhw" fmla="*/ len dy1 hd2" />
-
-      <gd name="bhw2" fmla="*/ bhw 1 2" />
-      <gd name="x7" fmla="+- hc xadj2 bhw2" />
-
-      <gd name="dx67" fmla="*/ xadj2 y1 hd2" />
-      <gd name="x6" fmla="+- x7 0 dx67" />
-
-      <gd name="dx57" fmla="*/ xadj2 y2 hd2" />
-      <gd name="x5" fmla="+- x7 0 dx57" />
-
-      <gd name="dx47" fmla="*/ xadj2 y3 hd2" />
-      <gd name="x4" fmla="+- x7 0 dx47" />
-
-      <gd name="dx37" fmla="*/ xadj2 y4 hd2" />
-      <gd name="x3" fmla="+- x7 0 dx37" />
-
-      <gd name="dx27" fmla="*/ xadj2 2 1" />
-      <gd name="x2" fmla="+- x7 0 dx27" />
-
-
-      <gd name="rx7" fmla="+- x7 bhw 0" />
-
-      <gd name="rx6" fmla="+- x6 bhw 0" />
-
-      <gd name="rx5" fmla="+- x5 bhw 0" />
-
-      <gd name="rx4" fmla="+- x4 bhw 0" />
-
-      <gd name="rx3" fmla="+- x3 bhw 0" />
-
-      <gd name="rx2" fmla="+- x2 bhw 0" />
-
-
-
-      <gd name="dx7" fmla="*/ dy1 hd2 len" />
-      <gd name="rxt" fmla="+- x7 dx7 0" />
-
-      <gd name="lxt" fmla="+- rx7 0 dx7" />
-
-      <gd name="rx" fmla="?: cadj2 rxt rx7" />
-
-      <gd name="lx" fmla="?: cadj2 x7 lxt" />
-
-
-      <gd name="dy3" fmla="*/ dy1 xadj2 len" />
-      <gd name="dy4" fmla="+- 0 0 dy3" />
-      <gd name="ry" fmla="?: cadj2 dy3 t" />
-
-      <gd name="ly" fmla="?: cadj2 t dy4" />
-
-
-      <gd name="dlx" fmla="+- w 0 rx" />
-
-      <gd name="drx" fmla="+- w 0 lx" />
-
-
-      <gd name="dly" fmla="+- h 0 ry" />
-
-      <gd name="dry" fmla="+- h 0 ly" />
-
-
-
-      <gd name="xC1" fmla="+/ rx lx 2" />
-
-      <gd name="xC2" fmla="+/ drx dlx 2" />
-
-
-      <gd name="yC1" fmla="+/ ry ly 2" />
-
-      <gd name="yC2" fmla="+/ y1 y2 2" />
-
-      <gd name="yC3" fmla="+/ y3 y4 2" />
-
-      <gd name="yC4" fmla="+/ dry dly 2" />
-
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="50000">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahPolar gdRefAng="adj2" minAng="4200000" maxAng="6600000">
-        <pos x="lx" y="t" />
-      </ahPolar>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x8" y="yC2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x8" y="yC3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="xC2" y="yC4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="yC2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="yC3" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="xC1" y="yC1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y1" r="x8" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x6" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="lx" y="ly" />
-        </lnTo>
-        <lnTo>
-          <pt x="rx" y="ry" />
-        </lnTo>
-        <lnTo>
-          <pt x="rx6" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="rx5" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="rx4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="rx3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="drx" y="dry" />
-        </lnTo>
-        <lnTo>
-          <pt x="dlx" y="dly" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </mathNotEqual>
-  <mathPlus>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 23520" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 73490" />
-      <gd name="dx1" fmla="*/ w 73490 200000" />
-
-      <gd name="dy1" fmla="*/ h 73490 200000" />
-
-      <gd name="dx2" fmla="*/ ss a1 200000" />
-
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-
-      <gd name="x3" fmla="+- hc dx2 0" />
-
-      <gd name="x4" fmla="+- hc dx1 0" />
-
-
-      <gd name="y1" fmla="+- vc 0 dy1" />
-
-      <gd name="y2" fmla="+- vc 0 dx2" />
-
-      <gd name="y3" fmla="+- vc dx2 0" />
-
-      <gd name="y4" fmla="+- vc dy1 0" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="73490">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x4" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y2" r="x4" b="y3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </mathPlus>
-  <moon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 50000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 87500" />
-      <gd name="g0" fmla="*/ ss a 100000" />
-      <gd name="g0w" fmla="*/ g0 w ss" />
-      <gd name="g1" fmla="+- ss 0 g0" />
-      <gd name="g2" fmla="*/ g0 g0 g1" />
-      <gd name="g3" fmla="*/ ss ss g1" />
-      <gd name="g4" fmla="*/ g3 2 1" />
-      <gd name="g5" fmla="+- g4 0 g2" />
-      <gd name="g6" fmla="+- g5 0 g0" />
-      <gd name="g6w" fmla="*/ g6 w ss" />
-      <gd name="g7" fmla="*/ g5 1 2" />
-      <gd name="g8" fmla="+- g7 0 g0" />
-      <gd name="dy1" fmla="*/ g8 hd2 ss" />
-
-      <gd name="g10h" fmla="+- vc 0 dy1" />
-      <gd name="g11h" fmla="+- vc dy1 0" />
-      <gd name="g12" fmla="*/ g0 9598 32768" />
-      <gd name="g12w" fmla="*/ g12 w ss" />
-      <gd name="g13" fmla="+- ss 0 g12" />
-      <gd name="q1" fmla="*/ ss ss 1" />
-      <gd name="q2" fmla="*/ g13 g13 1" />
-      <gd name="q3" fmla="+- q1 0 q2" />
-      <gd name="q4" fmla="sqrt q3" />
-      <gd name="dy4" fmla="*/ q4 hd2 ss" />
-      <gd name="g15h" fmla="+- vc 0 dy4" />
-      <gd name="g16h" fmla="+- vc dy4 0" />
-      <gd name="g17w" fmla="+- g6w 0 g0w" />
-      <gd name="g18w" fmla="*/ g17w 1 2" />
-
-
-      <gd name="dx2p" fmla="+- g0w g18w w" />
-      <gd name="dx2" fmla="*/ dx2p -1 1" />
-
-      <gd name="dy2" fmla="*/ hd2 -1 1" />
-
-      <gd name="stAng1" fmla="at2 dx2 dy2" />
-      <gd name="enAngp1" fmla="at2 dx2 hd2" />
-      <gd name="enAng1" fmla="+- enAngp1 0 21600000" />
-      <gd name="swAng1" fmla="+- enAng1 0 stAng1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="87500">
-        <pos x="g0w" y="vc" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="r" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="r" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="g0w" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="g12w" t="g15h" r="g0w" b="g16h" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="r" y="b" />
-        </moveTo>
-        <arcTo wR="w" hR="hd2" stAng="cd4" swAng="cd2" />
-        <arcTo wR="g18w" hR="dy1" stAng="stAng1" swAng="swAng1" />
-        <close />
-      </path>
-    </pathLst>
-
-  </moon>
-  <nonIsoscelesTrapezoid>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 50000 w ss" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj" />
-      <gd name="x1" fmla="*/ ss a1 200000" />
-
-      <gd name="x2" fmla="*/ ss a1 100000" />
-
-      <gd name="dx3" fmla="*/ ss a2 100000" />
-
-      <gd name="x3" fmla="+- r 0 dx3" />
-      <gd name="x4" fmla="+/ r x3 2" />
-      <gd name="il" fmla="*/ wd3 a1 maxAdj" />
-
-      <gd name="adjm" fmla="max a1 a2" />
-      <gd name="it" fmla="*/ hd3 adjm maxAdj" />
-
-      <gd name="irt" fmla="*/ wd3 a2 maxAdj" />
-      <gd name="ir" fmla="+- r 0 irt" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj">
-        <pos x="x2" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj">
-        <pos x="x3" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x4" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-
-    <rect l="il" t="it" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </nonIsoscelesTrapezoid>
-  <noSmoking>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 18750" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dr" fmla="*/ ss a 100000" />
-      <gd name="iwd2" fmla="+- wd2 0 dr" />
-      <gd name="ihd2" fmla="+- hd2 0 dr" />
-      <gd name="ang" fmla="at2 w h" />
-      <gd name="ct" fmla="cos ihd2 ang" />
-      <gd name="st" fmla="sin iwd2 ang" />
-      <gd name="m" fmla="mod ct st 0" />
-      <gd name="n" fmla="*/ iwd2 ihd2 m" />
-      <gd name="drd2" fmla="*/ dr 1 2" />
-      <gd name="dang" fmla="at2 n drd2" />
-      <gd name="2dang" fmla="*/ dang 2 1" />
-      <gd name="swAng" fmla="+- -10800000 2dang 0" />
-      <gd name="t3" fmla="at2 w h" />
-      <gd name="stAng1" fmla="+- t3 0 dang" />
-      <gd name="stAng2" fmla="+- stAng1 0 cd2" />
-      <gd name="ct1" fmla="cos ihd2 stAng1" />
-      <gd name="st1" fmla="sin iwd2 stAng1" />
-      <gd name="m1" fmla="mod ct1 st1 0" />
-      <gd name="n1" fmla="*/ iwd2 ihd2 m1" />
-      <gd name="dx1" fmla="cos n1 stAng1" />
-      <gd name="dy1" fmla="sin n1 stAng1" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc dy1 0" />
-      <gd name="x2" fmla="+- hc 0 dx1" />
-      <gd name="y2" fmla="+- vc 0 dy1" />
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefR="adj" minR="0" maxR="50000">
-        <pos x="dr" y="vc" />
-      </ahPolar>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="3cd4" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <arcTo wR="iwd2" hR="ihd2" stAng="stAng1" swAng="swAng" />
-        <close />
-        <moveTo>
-          <pt x="x2" y="y2" />
-        </moveTo>
-        <arcTo wR="iwd2" hR="ihd2" stAng="stAng2" swAng="swAng" />
-        <close />
-      </path>
-    </pathLst>
-
-  </noSmoking>
-  <notchedRightArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 100000 w ss" />
-
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="dx2" fmla="*/ ss a2 100000" />
-      <gd name="x2" fmla="+- r 0 dx2" />
-      <gd name="dy1" fmla="*/ h a1 200000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc dy1 0" />
-      <gd name="x1" fmla="*/ dy1 dx2 hd2" />
-      <gd name="x3" fmla="+- r 0 x1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="r" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x2" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x1" t="y1" r="x3" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </notchedRightArrow>
-  <octagon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 29289" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="+- r 0 x1" />
-      <gd name="y2" fmla="+- b 0 x1" />
-      <gd name="il" fmla="*/ x1 1 2" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 il" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="x1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="x1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="x1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </octagon>
-  <parallelogram>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 100000 w ss" />
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="x1" fmla="*/ ss a 200000" />
-      <gd name="x2" fmla="*/ ss a 100000" />
-      <gd name="x6" fmla="+- r 0 x1" />
-      <gd name="x5" fmla="+- r 0 x2" />
-      <gd name="x3" fmla="*/ x5 1 2" />
-      <gd name="x4" fmla="+- r 0 x3" />
-      <gd name="il" fmla="*/ wd2 a maxAdj" />
-      <gd name="q1" fmla="*/ 5 a maxAdj" />
-      <gd name="q2" fmla="+/ 1 q1 12" />
-      <gd name="il" fmla="*/ q2 w 1" />
-      <gd name="it" fmla="*/ q2 h 1" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 it" />
-      <gd name="q3" fmla="*/ h hc x2" />
-      <gd name="y1" fmla="pin 0 q3 h" />
-      <gd name="y2" fmla="+- b 0 y1" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="maxAdj">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x4" y="t" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </parallelogram>
-  <pentagon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="hf" fmla="val 105146" />
-      <gd name="vf" fmla="val 110557" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="swd2" fmla="*/ wd2 hf 100000" />
-      <gd name="shd2" fmla="*/ hd2 vf 100000" />
-      <gd name="svc" fmla="*/ vc  vf 100000" />
-      <gd name="dx1" fmla="cos swd2 1080000" />
-      <gd name="dx2" fmla="cos swd2 18360000" />
-      <gd name="dy1" fmla="sin shd2 1080000" />
-      <gd name="dy2" fmla="sin shd2 18360000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- svc 0 dy1" />
-      <gd name="y2" fmla="+- svc 0 dy2" />
-      <gd name="it" fmla="*/ y1 dx2 dx1" />
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="it" r="x3" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </pentagon>
-  <pie>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 0" />
-      <gd name="adj2" fmla="val 16200000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="stAng" fmla="pin 0 adj1 21599999" />
-      <gd name="enAng" fmla="pin 0 adj2 21599999" />
-      <gd name="sw1" fmla="+- enAng 0 stAng" />
-      <gd name="sw2" fmla="+- sw1 21600000 0" />
-      <gd name="swAng" fmla="?: sw1 sw1 sw2" />
-      <gd name="wt1" fmla="sin wd2 stAng" />
-      <gd name="ht1" fmla="cos hd2 stAng" />
-      <gd name="dx1" fmla="cat2 wd2 ht1 wt1" />
-      <gd name="dy1" fmla="sat2 hd2 ht1 wt1" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc dy1 0" />
-      <gd name="wt2" fmla="sin wd2 enAng" />
-      <gd name="ht2" fmla="cos hd2 enAng" />
-      <gd name="dx2" fmla="cat2 wd2 ht2 wt2" />
-      <gd name="dy2" fmla="sat2 hd2 ht2 wt2" />
-      <gd name="x2" fmla="+- hc dx2 0" />
-      <gd name="y2" fmla="+- vc dy2 0" />
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahPolar gdRefAng="adj1" minAng="0" maxAng="21599999">
-        <pos x="x1" y="y1" />
-      </ahPolar>
-      <ahPolar gdRefAng="adj2" minAng="0" maxAng="21599999">
-        <pos x="x2" y="y2" />
-      </ahPolar>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="ir" r="it" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="stAng" swAng="swAng" />
-        <lnTo>
-          <pt x="hc" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </pie>
-  <pieWedge>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="g1" fmla="cos w 13500000" />
-      <gd name="g2" fmla="sin h 13500000" />
-      <gd name="x1" fmla="+- r g1 0" />
-      <gd name="y1" fmla="+- b g2 0" />
-    </gdLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-    </cxnLst>
-    <rect l="x1" t="y1" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <arcTo wR="w" hR="h" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </pieWedge>
-  <plaque>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 16667" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="+- r 0 x1" />
-
-      <gd name="y2" fmla="+- b 0 x1" />
-      <gd name="il" fmla="*/ x1 70711 100000" />
-
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 il" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="x1" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="-5400000" />
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="-5400000" />
-        <close />
-      </path>
-    </pathLst>
-
-  </plaque>
-  <plaqueTabs>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="md" fmla="mod w h 0" />
-      <gd name="dx" fmla="*/ 1 md 20" />
-
-      <gd name="y1" fmla="+- 0 b dx" />
-
-      <gd name="x1" fmla="+- 0 r dx" />
-
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd2">
-        <pos x="l" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="dx" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="dx" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="t" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="dx" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="t" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="dx" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="b" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="dx" t="dx" r="x1" b="y1" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="dx" y="t" />
-        </lnTo>
-        <arcTo wR="dx" hR="dx" stAng="0" swAng="cd4" />
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <arcTo wR="dx" hR="dx" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="r" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="dx" />
-        </lnTo>
-        <arcTo wR="dx" hR="dx" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="x1" y="b" />
-        </moveTo>
-        <arcTo wR="dx" hR="dx" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </plaqueTabs>
-  <plus>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="+- r 0 x1" />
-      <gd name="y2" fmla="+- b 0 x1" />
-      <gd name="d" fmla="+- w 0 h" />
-      <gd name="il" fmla="?: d l x1" />
-      <gd name="ir" fmla="?: d r x2" />
-      <gd name="it" fmla="?: d x1 t" />
-      <gd name="ib" fmla="?: d y2 b" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="x1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </plus>
-  <quadArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 22500" />
-
-      <gd name="adj2" fmla="val 22500" />
-
-      <gd name="adj3" fmla="val 22500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="q1" fmla="+- 100000 0 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ q1 1 2" />
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="x1" fmla="*/ ss a3 100000" />
-      <gd name="dx2" fmla="*/ ss a2 100000" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x5" fmla="+- hc dx2 0" />
-      <gd name="dx3" fmla="*/ ss a1 200000" />
-
-      <gd name="x3" fmla="+- hc 0 dx3" />
-      <gd name="x4" fmla="+- hc dx3 0" />
-      <gd name="x6" fmla="+- r 0 x1" />
-
-      <gd name="y2" fmla="+- vc 0 dx2" />
-      <gd name="y5" fmla="+- vc dx2 0" />
-      <gd name="y3" fmla="+- vc 0 dx3" />
-      <gd name="y4" fmla="+- vc dx3 0" />
-      <gd name="y6" fmla="+- b 0 x1" />
-      <gd name="il" fmla="*/ dx3 x1 dx2" />
-      <gd name="ir" fmla="+- r 0 il" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="x3" y="x1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="x2" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="x1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="y3" r="ir" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="x1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y5" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </quadArrow>
-  <quadArrowCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 18515" />
-
-      <gd name="adj2" fmla="val 18515" />
-
-      <gd name="adj3" fmla="val 18515" />
-
-      <gd name="adj4" fmla="val 48123" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="+- 50000 0 a2" />
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q2" fmla="*/ a3 2 1" />
-
-      <gd name="maxAdj4" fmla="+- 100000 0 q2" />
-
-      <gd name="a4" fmla="pin a1 adj4 maxAdj4" />
-      <gd name="dx2" fmla="*/ ss a2 100000" />
-
-      <gd name="dx3" fmla="*/ ss a1 200000" />
-
-      <gd name="ah" fmla="*/ ss a3 100000" />
-
-      <gd name="dx1" fmla="*/ w a4 200000" />
-
-      <gd name="dy1" fmla="*/ h a4 200000" />
-
-
-      <gd name="x8" fmla="+- r 0 ah" />
-      <gd name="x2" fmla="+- hc 0 dx1" />
-      <gd name="x7" fmla="+- hc dx1 0" />
-      <gd name="x3" fmla="+- hc 0 dx2" />
-      <gd name="x6" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc 0 dx3" />
-      <gd name="x5" fmla="+- hc dx3 0" />
-
-      <gd name="y8" fmla="+- b 0 ah" />
-      <gd name="y2" fmla="+- vc 0 dy1" />
-      <gd name="y7" fmla="+- vc dy1 0" />
-      <gd name="y3" fmla="+- vc 0 dx2" />
-      <gd name="y6" fmla="+- vc dx2 0" />
-      <gd name="y4" fmla="+- vc 0 dx3" />
-      <gd name="y5" fmla="+- vc dx3 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="x4" y="ah" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="x3" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="ah" />
-      </ahXY>
-      <ahXY gdRefY="adj4" minY="a1" maxY="maxAdj4">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="y2" r="x7" b="y7" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="ah" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="ah" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="ah" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="ah" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="ah" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="ah" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="ah" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="ah" y="y6" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </quadArrowCallout>
-  <rect>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </rect>
-  <ribbon>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 16667" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 33333" />
-      <gd name="a2" fmla="pin 25000 adj2 75000" />
-
-
-      <gd name="x10" fmla="+- r 0 wd8" />
-
-      <gd name="dx2" fmla="*/ w a2 200000" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-
-      <gd name="x9" fmla="+- hc dx2 0" />
-
-      <gd name="x3" fmla="+- x2 wd32 0" />
-      <gd name="x8" fmla="+- x9 0 wd32" />
-      <gd name="x5" fmla="+- x2 wd8 0" />
-
-      <gd name="x6" fmla="+- x9 0 wd8" />
-
-      <gd name="x4" fmla="+- x5 0 wd32" />
-      <gd name="x7" fmla="+- x6 wd32 0" />
-      <gd name="y1" fmla="*/ h a1 200000" />
-
-      <gd name="y2" fmla="*/ h a1 100000" />
-
-      <gd name="y4" fmla="+- b 0 y2" />
-
-      <gd name="y3" fmla="*/ y4 1 2" />
-
-      <gd name="hR" fmla="*/ h a1 400000" />
-
-      <gd name="y5" fmla="+- b 0 hR" />
-      <gd name="y6" fmla="+- y2 0 hR" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="33333">
-        <pos x="hc" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="25000" maxX="75000">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd8" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x10" y="y3" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="y2" r="x9" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="t" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x8" y="y2" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x7" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y5" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="x3" y="b" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="wd8" y="y3" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x5" y="hR" />
-        </moveTo>
-        <arcTo wR="wd32" hR="hR" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x5" y="y2" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x6" y="hR" />
-        </moveTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd2" swAng="-5400000" />
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="t" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x8" y="y2" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x7" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y5" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="x3" y="b" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="wd8" y="y3" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x5" y="hR" />
-        </moveTo>
-        <lnTo>
-          <pt x="x5" y="y2" />
-        </lnTo>
-        <moveTo>
-          <pt x="x6" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x6" y="hR" />
-        </lnTo>
-        <moveTo>
-          <pt x="x2" y="y4" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y6" />
-        </lnTo>
-        <moveTo>
-          <pt x="x9" y="y6" />
-        </moveTo>
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </ribbon>
-  <ribbon2>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 16667" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 33333" />
-      <gd name="a2" fmla="pin 25000 adj2 75000" />
-
-
-      <gd name="x10" fmla="+- r 0 wd8" />
-
-      <gd name="dx2" fmla="*/ w a2 200000" />
-
-      <gd name="x2" fmla="+- hc 0 dx2" />
-
-      <gd name="x9" fmla="+- hc dx2 0" />
-
-      <gd name="x3" fmla="+- x2 wd32 0" />
-      <gd name="x8" fmla="+- x9 0 wd32" />
-      <gd name="x5" fmla="+- x2 wd8 0" />
-
-      <gd name="x6" fmla="+- x9 0 wd8" />
-
-      <gd name="x4" fmla="+- x5 0 wd32" />
-      <gd name="x7" fmla="+- x6 wd32 0" />
-      <gd name="dy1" fmla="*/ h a1 200000" />
-
-      <gd name="y1" fmla="+- b 0 dy1" />
-      <gd name="dy2" fmla="*/ h a1 100000" />
-
-      <gd name="y2" fmla="+- b 0 dy2" />
-      <gd name="y4" fmla="+- t dy2 0" />
-
-      <gd name="y3" fmla="+/ y4 b 2" />
-
-      <gd name="hR" fmla="*/ h a1 400000" />
-
-
-      <gd name="y6" fmla="+- b 0 hR" />
-      <gd name="y7" fmla="+- y1 0 hR" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="33333">
-        <pos x="hc" y="y2" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="25000" maxX="75000">
-        <pos x="x2" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="wd8" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x10" y="y3" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x2" t="t" r="x9" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x4" y="b" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x8" y="y2" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x7" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="hR" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="0" swAng="-5400000" />
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="wd8" y="y3" />
-        </lnTo>
-        <close />
-      </path>
-      <path stroke="false" fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x5" y="y6" />
-        </moveTo>
-        <arcTo wR="wd32" hR="hR" stAng="0" swAng="-5400000" />
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x5" y="y2" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x6" y="y6" />
-        </moveTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="wd8" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="hR" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x8" y="t" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="b" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <arcTo wR="wd32" hR="hR" stAng="3cd4" swAng="cd2" />
-        <close />
-        <moveTo>
-          <pt x="x5" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x5" y="y6" />
-        </lnTo>
-        <moveTo>
-          <pt x="x6" y="y6" />
-        </moveTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <moveTo>
-          <pt x="x2" y="y7" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <moveTo>
-          <pt x="x9" y="y4" />
-        </moveTo>
-        <lnTo>
-          <pt x="x9" y="y7" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </ribbon2>
-  <rightArrow>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 100000 w ss" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="dx1" fmla="*/ ss a2 100000" />
-      <gd name="x1" fmla="+- r 0 dx1" />
-      <gd name="dy1" fmla="*/ h a1 200000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc dy1 0" />
-      <gd name="dx2" fmla="*/ y1 dx1 hd2" />
-      <gd name="x2" fmla="+- x1 dx2 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x1" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="y1" r="x2" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </rightArrow>
-  <rightArrowCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 64977" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 h ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ 100000 w ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q2" fmla="*/ a3 ss w" />
-
-      <gd name="maxAdj4" fmla="+- 100000 0 q2" />
-
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-      <gd name="dy1" fmla="*/ ss a2 100000" />
-
-      <gd name="dy2" fmla="*/ ss a1 200000" />
-
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc dy2 0" />
-      <gd name="y4" fmla="+- vc dy1 0" />
-      <gd name="dx3" fmla="*/ ss a3 100000" />
-
-      <gd name="x3" fmla="+- r 0 dx3" />
-      <gd name="x2" fmla="*/ w a4 100000" />
-
-      <gd name="x1" fmla="*/ x2 1 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="x3" y="y2" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="r" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj3" minX="0" maxX="maxAdj3">
-        <pos x="x3" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="0" maxX="maxAdj4">
-        <pos x="x2" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x1" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="x2" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </rightArrowCallout>
-  <rightBrace>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 8333" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 100000" />
-      <gd name="q1" fmla="+- 100000 0 a2" />
-      <gd name="q2" fmla="min q1 a2" />
-      <gd name="q3" fmla="*/ q2 1 2" />
-      <gd name="maxAdj1" fmla="*/ q3 h ss" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="y1" fmla="*/ ss a1 100000" />
-      <gd name="y3" fmla="*/ h a2 100000" />
-      <gd name="y2" fmla="+- y3 0 y1" />
-      <gd name="y4" fmla="+- b 0 y1" />
-      <gd name="dx1" fmla="cos wd2 2700000" />
-      <gd name="dy1" fmla="sin y1 2700000" />
-      <gd name="ir" fmla="+- l dx1 0" />
-      <gd name="it" fmla="+- y1 0 dy1" />
-      <gd name="ib" fmla="+- b dy1 y1" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="maxAdj1">
-        <pos x="hc" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="100000">
-        <pos x="r" y="y3" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="l" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="r" y="y3" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="l" y="b" />
-      </cxn>
-    </cxnLst>
-    <rect l="l" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <arcTo wR="wd2" hR="y1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="hc" y="y2" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd2" swAng="-5400000" />
-        <arcTo wR="wd2" hR="y1" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="hc" y="y4" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <arcTo wR="wd2" hR="y1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="hc" y="y2" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="cd2" swAng="-5400000" />
-        <arcTo wR="wd2" hR="y1" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="hc" y="y4" />
-        </lnTo>
-        <arcTo wR="wd2" hR="y1" stAng="0" swAng="cd4" />
-      </path>
-    </pathLst>
-  </rightBrace>
-  <rightBracket>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 8333" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 50000 h ss" />
-
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="y1" fmla="*/ ss a 100000" />
-
-      <gd name="y2" fmla="+- b 0 y1" />
-
-      <gd name="dx1" fmla="cos w 2700000" />
-      <gd name="dy1" fmla="sin y1 2700000" />
-      <gd name="ir" fmla="+- l dx1 0" />
-      <gd name="it" fmla="+- y1 0 dy1" />
-      <gd name="ib" fmla="+- b dy1 y1" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="maxAdj">
-        <pos x="r" y="y1" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="l" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <arcTo wR="w" hR="y1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <arcTo wR="w" hR="y1" stAng="0" swAng="cd4" />
-        <close />
-      </path>
-      <path fill="none">
-
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <arcTo wR="w" hR="y1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <arcTo wR="w" hR="y1" stAng="0" swAng="cd4" />
-      </path>
-    </pathLst>
-
-  </rightBracket>
-  <round1Rect>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 16667" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dx1" fmla="*/ ss a 100000" />
-      <gd name="x1" fmla="+- r 0 dx1" />
-      <gd name="idx" fmla="*/ dx1 29289 100000" />
-      <gd name="ir" fmla="+- r 0 idx" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <arcTo wR="dx1" hR="dx1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </round1Rect>
-  <round2DiagRect>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 16667" />
-      <gd name="adj2" fmla="val 0" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="x1" fmla="*/ ss a1 100000" />
-      <gd name="y1" fmla="+- b 0 x1" />
-      <gd name="a" fmla="*/ ss a2 100000" />
-      <gd name="x2" fmla="+- r 0 a" />
-      <gd name="y2" fmla="+- b 0 a" />
-      <gd name="dx1" fmla="*/ x1 29289 100000" />
-      <gd name="dx2" fmla="*/ a 29289 100000" />
-      <gd name="d" fmla="+- dx1 0 dx2" />
-      <gd name="dx" fmla="?: d dx1 dx2" />
-      <gd name="ir" fmla="+- r 0 dx" />
-      <gd name="ib" fmla="+- b 0 dx" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="dx" t="dx" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <arcTo wR="a" hR="a" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="a" y="b" />
-        </lnTo>
-        <arcTo wR="a" hR="a" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="l" y="x1" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </round2DiagRect>
-  <round2SameRect>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 16667" />
-      <gd name="adj2" fmla="val 0" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-
-      <gd name="tx1" fmla="*/ ss a1 100000" />
-      <gd name="tx2" fmla="+- r 0 tx1" />
-
-      <gd name="bx1" fmla="*/ ss a2 100000" />
-      <gd name="bx2" fmla="+- r 0 bx1" />
-      <gd name="by1" fmla="+- b 0 bx1" />
-      <gd name="d" fmla="+- tx1 0 bx1" />
-      <gd name="tdx" fmla="*/ tx1 29289 100000" />
-      <gd name="bdx" fmla="*/ bx1 29289 100000" />
-      <gd name="il" fmla="?: d tdx bdx" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 bdx" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="50000">
-        <pos x="tx2" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="bx1" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="tdx" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="tx1" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="tx2" y="t" />
-        </lnTo>
-        <arcTo wR="tx1" hR="tx1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="by1" />
-        </lnTo>
-        <arcTo wR="bx1" hR="bx1" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="bx1" y="b" />
-        </lnTo>
-        <arcTo wR="bx1" hR="bx1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="l" y="tx1" />
-        </lnTo>
-        <arcTo wR="tx1" hR="tx1" stAng="cd2" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </round2SameRect>
-  <roundRect>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 16667" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="x1" fmla="*/ ss a 100000" />
-      <gd name="x2" fmla="+- r 0 x1" />
-      <gd name="y2" fmla="+- b 0 x1" />
-      <gd name="il" fmla="*/ x1 29289 100000" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 il" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="x1" />
-        </moveTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-  </roundRect>
-  <rtTriangle>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="it" fmla="*/ h 7 12" />
-      <gd name="ir" fmla="*/ w 7 12" />
-      <gd name="ib" fmla="*/ h 11 12" />
-    </gdLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="l" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="r" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="hc" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="wd12" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="l" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </rtTriangle>
-  <smileyFace>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 4653" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin -4653 adj 4653" />
-      <gd name="x1" fmla="*/ w 4969 21699" />
-
-      <gd name="x2" fmla="*/ w 6215 21600" />
-
-      <gd name="x3" fmla="*/ w 13135 21600" />
-
-      <gd name="x4" fmla="*/ w 16640 21600" />
-
-      <gd name="y1" fmla="*/ h 7570 21600" />
-
-      <gd name="y3" fmla="*/ h 16515 21600" />
-
-      <gd name="dy2" fmla="*/ h a 100000" />
-
-      <gd name="y2" fmla="+- y3 0 dy2" />
-
-      <gd name="y4" fmla="+- y3 dy2 0" />
-
-      <gd name="dy3" fmla="*/ h a 50000" />
-
-      <gd name="y5" fmla="+- y4 dy3 0" />
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-      <gd name="wR" fmla="*/ w 1125 21600" />
-      <gd name="hR" fmla="*/ h 1125 21600" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="-4653" maxY="4653">
-        <pos x="hc" y="y4" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="21600000" />
-        <close />
-      </path>
-      <path fill="darkenLess" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x2" y="y1" />
-        </moveTo>
-        <arcTo wR="wR" hR="hR" stAng="cd2" swAng="21600000" />
-        <moveTo>
-          <pt x="x3" y="y1" />
-        </moveTo>
-        <arcTo wR="wR" hR="hR" stAng="cd2" swAng="21600000" />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x1" y="y2" />
-        </moveTo>
-        <quadBezTo>
-          <pt x="hc" y="y5" />
-          <pt x="x4" y="y2" />
-        </quadBezTo>
-      </path>
-      <path fill="none">
-
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="21600000" />
-        <close />
-      </path>
-    </pathLst>
-
-  </smileyFace>
-  <snip1Rect>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 16667" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dx1" fmla="*/ ss a 100000" />
-      <gd name="x1" fmla="+- r 0 dx1" />
-      <gd name="it" fmla="*/ dx1 1 2" />
-      <gd name="ir" fmla="+/ x1 r 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="it" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="dx1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </snip1Rect>
-  <snip2DiagRect>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 0" />
-      <gd name="adj2" fmla="val 16667" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="lx1" fmla="*/ ss a1 100000" />
-      <gd name="lx2" fmla="+- r 0 lx1" />
-      <gd name="ly1" fmla="+- b 0 lx1" />
-      <gd name="rx1" fmla="*/ ss a2 100000" />
-      <gd name="rx2" fmla="+- r 0 rx1" />
-      <gd name="ry1" fmla="+- b 0 rx1" />
-      <gd name="d" fmla="+- lx1 0 rx1" />
-      <gd name="dx" fmla="?: d lx1 rx1" />
-      <gd name="il" fmla="*/ dx 1 2" />
-
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 il" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="50000">
-        <pos x="lx1" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="rx2" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="lx1" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="rx2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="rx1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="ly1" />
-        </lnTo>
-        <lnTo>
-          <pt x="lx2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="rx1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="ry1" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="lx1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </snip2DiagRect>
-  <snip2SameRect>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 16667" />
-      <gd name="adj2" fmla="val 0" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="tx1" fmla="*/ ss a1 100000" />
-      <gd name="tx2" fmla="+- r 0 tx1" />
-      <gd name="bx1" fmla="*/ ss a2 100000" />
-      <gd name="bx2" fmla="+- r 0 bx1" />
-      <gd name="by1" fmla="+- b 0 bx1" />
-      <gd name="d" fmla="+- tx1 0 bx1" />
-      <gd name="dx" fmla="?: d tx1 bx1" />
-      <gd name="il" fmla="*/ dx 1 2" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="it" fmla="*/ tx1 1 2" />
-      <gd name="ib" fmla="+/ by1 b 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="50000">
-        <pos x="tx2" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="bx1" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="tx1" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="tx2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="tx1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="by1" />
-        </lnTo>
-        <lnTo>
-          <pt x="bx2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="bx1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="by1" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="tx1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </snip2SameRect>
-  <snipRoundRect>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 16667" />
-      <gd name="adj2" fmla="val 16667" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 50000" />
-      <gd name="a2" fmla="pin 0 adj2 50000" />
-      <gd name="x1" fmla="*/ ss a1 100000" />
-      <gd name="dx2" fmla="*/ ss a2 100000" />
-      <gd name="x2" fmla="+- r 0 dx2" />
-      <gd name="il" fmla="*/ x1 29289 100000" />
-
-      <gd name="ir" fmla="+/ x2 r 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="50000">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="50000">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="il" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="dx2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="x1" />
-        </lnTo>
-        <arcTo wR="x1" hR="x1" stAng="cd2" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </snipRoundRect>
-  <squareTabs>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="md" fmla="mod w h 0" />
-      <gd name="dx" fmla="*/ 1 md 20" />
-
-      <gd name="y1" fmla="+- 0 b dx" />
-
-      <gd name="x1" fmla="+- 0 r dx" />
-
-    </gdLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd2">
-        <pos x="l" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="dx" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="dx" y="dx" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="dx" y="x1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="dx" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="t" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="dx" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="t" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="dx" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x1" y="dx" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x1" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="dx" t="dx" r="x1" b="y1" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="dx" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="dx" y="dx" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="dx" />
-        </lnTo>
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="dx" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="dx" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="x1" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="dx" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="dx" />
-        </lnTo>
-        <close />
-      </path>
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </squareTabs>
-  <star10>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 42533" />
-      <gd name="hf" fmla="val 105146" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="swd2" fmla="*/ wd2 hf 100000" />
-      <gd name="dx1" fmla="*/ swd2 95106 100000" />
-      <gd name="dx2" fmla="*/ swd2 58779 100000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="dy1" fmla="*/ hd2 80902 100000" />
-      <gd name="dy2" fmla="*/ hd2 30902 100000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc dy2 0" />
-      <gd name="y4" fmla="+- vc dy1 0" />
-      <gd name="iwd2" fmla="*/ swd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx1" fmla="*/ iwd2 80902 100000" />
-      <gd name="sdx2" fmla="*/ iwd2 30902 100000" />
-      <gd name="sdy1" fmla="*/ ihd2 95106 100000" />
-      <gd name="sdy2" fmla="*/ ihd2 58779 100000" />
-      <gd name="sx1" fmla="+- hc 0 iwd2" />
-      <gd name="sx2" fmla="+- hc 0 sdx1" />
-      <gd name="sx3" fmla="+- hc 0 sdx2" />
-      <gd name="sx4" fmla="+- hc sdx2 0" />
-      <gd name="sx5" fmla="+- hc sdx1 0" />
-      <gd name="sx6" fmla="+- hc iwd2 0" />
-      <gd name="sy1" fmla="+- vc 0 sdy1" />
-      <gd name="sy2" fmla="+- vc 0 sdy2" />
-      <gd name="sy3" fmla="+- vc sdy2 0" />
-      <gd name="sy4" fmla="+- vc sdy1 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x4" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="y4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x3" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="sx2" t="sy2" r="sx5" b="sy3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx2" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star10>
-  <star12>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 37500" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dx1" fmla="cos wd2 1800000" />
-
-      <gd name="dy1" fmla="sin hd2 3600000" />
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x3" fmla="*/ w 3 4" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y3" fmla="*/ h 3 4" />
-      <gd name="y4" fmla="+- vc dy1 0" />
-      <gd name="iwd2" fmla="*/ wd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx1" fmla="cos iwd2 900000" />
-      <gd name="sdx2" fmla="cos iwd2 2700000" />
-      <gd name="sdx3" fmla="cos iwd2 4500000" />
-      <gd name="sdy1" fmla="sin ihd2 4500000" />
-      <gd name="sdy2" fmla="sin ihd2 2700000" />
-      <gd name="sdy3" fmla="sin ihd2 900000" />
-      <gd name="sx1" fmla="+- hc 0 sdx1" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc 0 sdx3" />
-      <gd name="sx4" fmla="+- hc sdx3 0" />
-      <gd name="sx5" fmla="+- hc sdx2 0" />
-      <gd name="sx6" fmla="+- hc sdx1 0" />
-      <gd name="sy1" fmla="+- vc 0 sdy1" />
-      <gd name="sy2" fmla="+- vc 0 sdy2" />
-      <gd name="sy3" fmla="+- vc 0 sdy3" />
-      <gd name="sy4" fmla="+- vc sdy3 0" />
-      <gd name="sy5" fmla="+- vc sdy2 0" />
-      <gd name="sy6" fmla="+- vc sdy1 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x4" y="hd4" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="wd4" y="y4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="hd4" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="wd4" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x3" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="sx2" t="sy2" r="sx5" b="sy5" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx1" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="hd4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="wd4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="hd4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="wd4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="sy4" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star12>
-  <star16>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 37500" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dx1" fmla="*/ wd2 92388 100000" />
-      <gd name="dx2" fmla="*/ wd2 70711 100000" />
-      <gd name="dx3" fmla="*/ wd2 38268 100000" />
-      <gd name="dy1" fmla="*/ hd2 92388 100000" />
-      <gd name="dy2" fmla="*/ hd2 70711 100000" />
-      <gd name="dy3" fmla="*/ hd2 38268 100000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc 0 dx3" />
-      <gd name="x4" fmla="+- hc dx3 0" />
-      <gd name="x5" fmla="+- hc dx2 0" />
-      <gd name="x6" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc 0 dy3" />
-      <gd name="y4" fmla="+- vc dy3 0" />
-      <gd name="y5" fmla="+- vc dy2 0" />
-      <gd name="y6" fmla="+- vc dy1 0" />
-      <gd name="iwd2" fmla="*/ wd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx1" fmla="*/ iwd2 98079 100000" />
-      <gd name="sdx2" fmla="*/ iwd2 83147 100000" />
-      <gd name="sdx3" fmla="*/ iwd2 55557 100000" />
-      <gd name="sdx4" fmla="*/ iwd2 19509 100000" />
-      <gd name="sdy1" fmla="*/ ihd2 98079 100000" />
-      <gd name="sdy2" fmla="*/ ihd2 83147 100000" />
-      <gd name="sdy3" fmla="*/ ihd2 55557 100000" />
-      <gd name="sdy4" fmla="*/ ihd2 19509 100000" />
-      <gd name="sx1" fmla="+- hc 0 sdx1" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc 0 sdx3" />
-      <gd name="sx4" fmla="+- hc 0 sdx4" />
-      <gd name="sx5" fmla="+- hc sdx4 0" />
-      <gd name="sx6" fmla="+- hc sdx3 0" />
-      <gd name="sx7" fmla="+- hc sdx2 0" />
-      <gd name="sx8" fmla="+- hc sdx1 0" />
-      <gd name="sy1" fmla="+- vc 0 sdy1" />
-      <gd name="sy2" fmla="+- vc 0 sdy2" />
-      <gd name="sy3" fmla="+- vc 0 sdy3" />
-      <gd name="sy4" fmla="+- vc 0 sdy4" />
-      <gd name="sy5" fmla="+- vc sdy4 0" />
-      <gd name="sy6" fmla="+- vc sdy3 0" />
-      <gd name="sy7" fmla="+- vc sdy2 0" />
-      <gd name="sy8" fmla="+- vc sdy1 0" />
-      <gd name="idx" fmla="cos iwd2 2700000" />
-      <gd name="idy" fmla="sin ihd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="ib" fmla="+- vc idy 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x5" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="y3" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="y4" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x5" y="y5" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x4" y="y6" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y6" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x2" y="y5" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y4" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x3" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x4" y="y1" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx1" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx7" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx8" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx8" y="sy5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx7" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy8" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="sy5" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </star16>
-  <star24>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 37500" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dx1" fmla="cos wd2 900000" />
-      <gd name="dx2" fmla="cos wd2 1800000" />
-      <gd name="dx3" fmla="cos wd2 2700000" />
-      <gd name="dx4" fmla="val wd4" />
-      <gd name="dx5" fmla="cos wd2 4500000" />
-      <gd name="dy1" fmla="sin hd2 4500000" />
-      <gd name="dy2" fmla="sin hd2 3600000" />
-      <gd name="dy3" fmla="sin hd2 2700000" />
-      <gd name="dy4" fmla="val hd4" />
-      <gd name="dy5" fmla="sin hd2 900000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc 0 dx3" />
-      <gd name="x4" fmla="+- hc 0 dx4" />
-      <gd name="x5" fmla="+- hc 0 dx5" />
-      <gd name="x6" fmla="+- hc dx5 0" />
-      <gd name="x7" fmla="+- hc dx4 0" />
-      <gd name="x8" fmla="+- hc dx3 0" />
-      <gd name="x9" fmla="+- hc dx2 0" />
-      <gd name="x10" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc 0 dy3" />
-      <gd name="y4" fmla="+- vc 0 dy4" />
-      <gd name="y5" fmla="+- vc 0 dy5" />
-      <gd name="y6" fmla="+- vc dy5 0" />
-      <gd name="y7" fmla="+- vc dy4 0" />
-      <gd name="y8" fmla="+- vc dy3 0" />
-      <gd name="y9" fmla="+- vc dy2 0" />
-      <gd name="y10" fmla="+- vc dy1 0" />
-      <gd name="iwd2" fmla="*/ wd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx1" fmla="*/ iwd2 99144 100000" />
-      <gd name="sdx2" fmla="*/ iwd2 92388 100000" />
-      <gd name="sdx3" fmla="*/ iwd2 79335 100000" />
-      <gd name="sdx4" fmla="*/ iwd2 60876 100000" />
-      <gd name="sdx5" fmla="*/ iwd2 38268 100000" />
-      <gd name="sdx6" fmla="*/ iwd2 13053 100000" />
-      <gd name="sdy1" fmla="*/ ihd2 99144 100000" />
-      <gd name="sdy2" fmla="*/ ihd2 92388 100000" />
-      <gd name="sdy3" fmla="*/ ihd2 79335 100000" />
-      <gd name="sdy4" fmla="*/ ihd2 60876 100000" />
-      <gd name="sdy5" fmla="*/ ihd2 38268 100000" />
-      <gd name="sdy6" fmla="*/ ihd2 13053 100000" />
-      <gd name="sx1" fmla="+- hc 0 sdx1" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc 0 sdx3" />
-      <gd name="sx4" fmla="+- hc 0 sdx4" />
-      <gd name="sx5" fmla="+- hc 0 sdx5" />
-      <gd name="sx6" fmla="+- hc 0 sdx6" />
-      <gd name="sx7" fmla="+- hc sdx6 0" />
-      <gd name="sx8" fmla="+- hc sdx5 0" />
-      <gd name="sx9" fmla="+- hc sdx4 0" />
-      <gd name="sx10" fmla="+- hc sdx3 0" />
-      <gd name="sx11" fmla="+- hc sdx2 0" />
-      <gd name="sx12" fmla="+- hc sdx1 0" />
-      <gd name="sy1" fmla="+- vc 0 sdy1" />
-      <gd name="sy2" fmla="+- vc 0 sdy2" />
-      <gd name="sy3" fmla="+- vc 0 sdy3" />
-      <gd name="sy4" fmla="+- vc 0 sdy4" />
-      <gd name="sy5" fmla="+- vc 0 sdy5" />
-      <gd name="sy6" fmla="+- vc 0 sdy6" />
-      <gd name="sy7" fmla="+- vc sdy6 0" />
-      <gd name="sy8" fmla="+- vc sdy5 0" />
-      <gd name="sy9" fmla="+- vc sdy4 0" />
-      <gd name="sy10" fmla="+- vc sdy3 0" />
-      <gd name="sy11" fmla="+- vc sdy2 0" />
-      <gd name="sy12" fmla="+- vc sdy1 0" />
-      <gd name="idx" fmla="cos iwd2 2700000" />
-      <gd name="idy" fmla="sin ihd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="ib" fmla="+- vc idy 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="ssd2">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx1" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx7" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx8" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx9" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx10" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx11" y="sy5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx12" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx12" y="sy7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx11" y="sy8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx10" y="sy9" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx9" y="sy10" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y9" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx8" y="sy11" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y10" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx7" y="sy12" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy12" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y10" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy11" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y9" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy10" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy9" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="sy7" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star24>
-  <star32>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 37500" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dx1" fmla="*/ wd2 98079 100000" />
-      <gd name="dx2" fmla="*/ wd2 92388 100000" />
-      <gd name="dx3" fmla="*/ wd2 83147 100000" />
-      <gd name="dx4" fmla="cos wd2 2700000" />
-      <gd name="dx5" fmla="*/ wd2 55557 100000" />
-      <gd name="dx6" fmla="*/ wd2 38268 100000" />
-      <gd name="dx7" fmla="*/ wd2 19509 100000" />
-      <gd name="dy1" fmla="*/ hd2 98079 100000" />
-      <gd name="dy2" fmla="*/ hd2 92388 100000" />
-      <gd name="dy3" fmla="*/ hd2 83147 100000" />
-      <gd name="dy4" fmla="sin hd2 2700000" />
-      <gd name="dy5" fmla="*/ hd2 55557 100000" />
-      <gd name="dy6" fmla="*/ hd2 38268 100000" />
-      <gd name="dy7" fmla="*/ hd2 19509 100000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc 0 dx3" />
-      <gd name="x4" fmla="+- hc 0 dx4" />
-      <gd name="x5" fmla="+- hc 0 dx5" />
-      <gd name="x6" fmla="+- hc 0 dx6" />
-      <gd name="x7" fmla="+- hc 0 dx7" />
-      <gd name="x8" fmla="+- hc dx7 0" />
-      <gd name="x9" fmla="+- hc dx6 0" />
-      <gd name="x10" fmla="+- hc dx5 0" />
-      <gd name="x11" fmla="+- hc dx4 0" />
-      <gd name="x12" fmla="+- hc dx3 0" />
-      <gd name="x13" fmla="+- hc dx2 0" />
-      <gd name="x14" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc 0 dy2" />
-      <gd name="y3" fmla="+- vc 0 dy3" />
-      <gd name="y4" fmla="+- vc 0 dy4" />
-      <gd name="y5" fmla="+- vc 0 dy5" />
-      <gd name="y6" fmla="+- vc 0 dy6" />
-      <gd name="y7" fmla="+- vc 0 dy7" />
-      <gd name="y8" fmla="+- vc dy7 0" />
-      <gd name="y9" fmla="+- vc dy6 0" />
-      <gd name="y10" fmla="+- vc dy5 0" />
-      <gd name="y11" fmla="+- vc dy4 0" />
-      <gd name="y12" fmla="+- vc dy3 0" />
-      <gd name="y13" fmla="+- vc dy2 0" />
-      <gd name="y14" fmla="+- vc dy1 0" />
-      <gd name="iwd2" fmla="*/ wd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx1" fmla="*/ iwd2 99518 100000" />
-      <gd name="sdx2" fmla="*/ iwd2 95694 100000" />
-      <gd name="sdx3" fmla="*/ iwd2 88192 100000" />
-      <gd name="sdx4" fmla="*/ iwd2 77301 100000" />
-      <gd name="sdx5" fmla="*/ iwd2 63439 100000" />
-      <gd name="sdx6" fmla="*/ iwd2 47140 100000" />
-      <gd name="sdx7" fmla="*/ iwd2 29028 100000" />
-      <gd name="sdx8" fmla="*/ iwd2 9802 100000" />
-      <gd name="sdy1" fmla="*/ ihd2 99518 100000" />
-      <gd name="sdy2" fmla="*/ ihd2 95694 100000" />
-      <gd name="sdy3" fmla="*/ ihd2 88192 100000" />
-      <gd name="sdy4" fmla="*/ ihd2 77301 100000" />
-      <gd name="sdy5" fmla="*/ ihd2 63439 100000" />
-      <gd name="sdy6" fmla="*/ ihd2 47140 100000" />
-      <gd name="sdy7" fmla="*/ ihd2 29028 100000" />
-      <gd name="sdy8" fmla="*/ ihd2 9802 100000" />
-      <gd name="sx1" fmla="+- hc 0 sdx1" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc 0 sdx3" />
-      <gd name="sx4" fmla="+- hc 0 sdx4" />
-      <gd name="sx5" fmla="+- hc 0 sdx5" />
-      <gd name="sx6" fmla="+- hc 0 sdx6" />
-      <gd name="sx7" fmla="+- hc 0 sdx7" />
-      <gd name="sx8" fmla="+- hc 0 sdx8" />
-      <gd name="sx9" fmla="+- hc sdx8 0" />
-      <gd name="sx10" fmla="+- hc sdx7 0" />
-      <gd name="sx11" fmla="+- hc sdx6 0" />
-      <gd name="sx12" fmla="+- hc sdx5 0" />
-      <gd name="sx13" fmla="+- hc sdx4 0" />
-      <gd name="sx14" fmla="+- hc sdx3 0" />
-      <gd name="sx15" fmla="+- hc sdx2 0" />
-      <gd name="sx16" fmla="+- hc sdx1 0" />
-      <gd name="sy1" fmla="+- vc 0 sdy1" />
-      <gd name="sy2" fmla="+- vc 0 sdy2" />
-      <gd name="sy3" fmla="+- vc 0 sdy3" />
-      <gd name="sy4" fmla="+- vc 0 sdy4" />
-      <gd name="sy5" fmla="+- vc 0 sdy5" />
-      <gd name="sy6" fmla="+- vc 0 sdy6" />
-      <gd name="sy7" fmla="+- vc 0 sdy7" />
-      <gd name="sy8" fmla="+- vc 0 sdy8" />
-      <gd name="sy9" fmla="+- vc sdy8 0" />
-      <gd name="sy10" fmla="+- vc sdy7 0" />
-      <gd name="sy11" fmla="+- vc sdy6 0" />
-      <gd name="sy12" fmla="+- vc sdy5 0" />
-      <gd name="sy13" fmla="+- vc sdy4 0" />
-      <gd name="sy14" fmla="+- vc sdy3 0" />
-      <gd name="sy15" fmla="+- vc sdy2 0" />
-      <gd name="sy16" fmla="+- vc sdy1 0" />
-      <gd name="idx" fmla="cos iwd2 2700000" />
-      <gd name="idy" fmla="sin ihd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="ib" fmla="+- vc idy 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="ssd2">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx1" y="sy8" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx7" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx8" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx9" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx10" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx11" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx12" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x11" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx13" y="sy5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x12" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx14" y="sy6" />
-        </lnTo>
-        <lnTo>
-          <pt x="x13" y="y6" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx15" y="sy7" />
-        </lnTo>
-        <lnTo>
-          <pt x="x14" y="y7" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx16" y="sy8" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx16" y="sy9" />
-        </lnTo>
-        <lnTo>
-          <pt x="x14" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx15" y="sy10" />
-        </lnTo>
-        <lnTo>
-          <pt x="x13" y="y9" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx14" y="sy11" />
-        </lnTo>
-        <lnTo>
-          <pt x="x12" y="y10" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx13" y="sy12" />
-        </lnTo>
-        <lnTo>
-          <pt x="x11" y="y11" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx12" y="sy13" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y12" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx11" y="sy14" />
-        </lnTo>
-        <lnTo>
-          <pt x="x9" y="y13" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx10" y="sy15" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y14" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx9" y="sy16" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx8" y="sy16" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y14" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx7" y="sy15" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y13" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy14" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y12" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy13" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y11" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy12" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y10" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy11" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y9" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy10" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y8" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="sy9" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star32>
-  <star4>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 12500" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="iwd2" fmla="*/ wd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx" fmla="cos iwd2 2700000" />
-      <gd name="sdy" fmla="sin ihd2 2700000" />
-      <gd name="sx1" fmla="+- hc 0 sdx" />
-      <gd name="sx2" fmla="+- hc sdx 0" />
-      <gd name="sy1" fmla="+- vc 0 sdy" />
-      <gd name="sy2" fmla="+- vc sdy 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="sx1" t="sy1" r="sx2" b="sy2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx1" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="sy2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star4>
-  <star5>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 19098" />
-      <gd name="hf" fmla="val 105146" />
-      <gd name="vf" fmla="val 110557" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="swd2" fmla="*/ wd2 hf 100000" />
-      <gd name="shd2" fmla="*/ hd2 vf 100000" />
-      <gd name="svc" fmla="*/ vc  vf 100000" />
-      <gd name="dx1" fmla="cos swd2 1080000" />
-      <gd name="dx2" fmla="cos swd2 18360000" />
-      <gd name="dy1" fmla="sin shd2 1080000" />
-      <gd name="dy2" fmla="sin shd2 18360000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- svc 0 dy1" />
-      <gd name="y2" fmla="+- svc 0 dy2" />
-      <gd name="iwd2" fmla="*/ swd2 a 50000" />
-      <gd name="ihd2" fmla="*/ shd2 a 50000" />
-      <gd name="sdx1" fmla="cos iwd2 20520000" />
-      <gd name="sdx2" fmla="cos iwd2 3240000" />
-      <gd name="sdy1" fmla="sin ihd2 3240000" />
-      <gd name="sdy2" fmla="sin ihd2 20520000" />
-      <gd name="sx1" fmla="+- hc 0 sdx1" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc sdx2 0" />
-      <gd name="sx4" fmla="+- hc sdx1 0" />
-      <gd name="sy1" fmla="+- svc 0 sdy1" />
-      <gd name="sy2" fmla="+- svc 0 sdy2" />
-      <gd name="sy3" fmla="+- svc ihd2 0" />
-      <gd name="yAdj" fmla="+- svc 0 ihd2" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y2" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="y1" />
-      </cxn>
-    </cxnLst>
-    <rect l="sx1" t="sy1" r="sx4" b="sy3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx2" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="sy2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </star5>
-  <star6>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 28868" />
-      <gd name="hf" fmla="val 115470" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="swd2" fmla="*/ wd2 hf 100000" />
-      <gd name="dx1" fmla="cos swd2 1800000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc dx1 0" />
-      <gd name="y2" fmla="+- vc hd4 0" />
-      <gd name="iwd2" fmla="*/ swd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx2" fmla="*/ iwd2 1 2" />
-      <gd name="sx1" fmla="+- hc 0 iwd2" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc sdx2 0" />
-      <gd name="sx4" fmla="+- hc iwd2 0" />
-      <gd name="sdy1" fmla="sin ihd2 3600000" />
-      <gd name="sy1" fmla="+- vc 0 sdy1" />
-      <gd name="sy2" fmla="+- vc sdy1 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x2" y="hd4" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="hd4" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="sx1" t="sy1" r="sx4" b="sy2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="hd4" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx2" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="hd4" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="vc" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star6>
-  <star7>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 34601" />
-      <gd name="hf" fmla="val 102572" />
-      <gd name="vf" fmla="val 105210" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="swd2" fmla="*/ wd2 hf 100000" />
-      <gd name="shd2" fmla="*/ hd2 vf 100000" />
-      <gd name="svc" fmla="*/ vc  vf 100000" />
-      <gd name="dx1" fmla="*/ swd2 97493 100000" />
-      <gd name="dx2" fmla="*/ swd2 78183 100000" />
-      <gd name="dx3" fmla="*/ swd2 43388 100000" />
-      <gd name="dy1" fmla="*/ shd2 62349 100000" />
-      <gd name="dy2" fmla="*/ shd2 22252 100000" />
-      <gd name="dy3" fmla="*/ shd2 90097 100000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc 0 dx3" />
-      <gd name="x4" fmla="+- hc dx3 0" />
-      <gd name="x5" fmla="+- hc dx2 0" />
-      <gd name="x6" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- svc 0 dy1" />
-      <gd name="y2" fmla="+- svc dy2 0" />
-      <gd name="y3" fmla="+- svc dy3 0" />
-      <gd name="iwd2" fmla="*/ swd2 a 50000" />
-      <gd name="ihd2" fmla="*/ shd2 a 50000" />
-      <gd name="sdx1" fmla="*/ iwd2 97493 100000" />
-      <gd name="sdx2" fmla="*/ iwd2 78183 100000" />
-      <gd name="sdx3" fmla="*/ iwd2 43388 100000" />
-      <gd name="sx1" fmla="+- hc 0 sdx1" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc 0 sdx3" />
-      <gd name="sx4" fmla="+- hc sdx3 0" />
-      <gd name="sx5" fmla="+- hc sdx2 0" />
-      <gd name="sx6" fmla="+- hc sdx1 0" />
-      <gd name="sdy1" fmla="*/ ihd2 90097 100000" />
-      <gd name="sdy2" fmla="*/ ihd2 22252 100000" />
-      <gd name="sdy3" fmla="*/ ihd2 62349 100000" />
-      <gd name="sy1" fmla="+- svc 0 sdy1" />
-      <gd name="sy2" fmla="+- svc 0 sdy2" />
-      <gd name="sy3" fmla="+- svc sdy3 0" />
-      <gd name="sy4" fmla="+- svc ihd2 0" />
-      <gd name="yAdj" fmla="+- svc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="x5" y="y1" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x6" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x4" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x3" y="y3" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x2" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="sx2" t="sy1" r="sx5" b="sy3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x1" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx1" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx6" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx5" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy3" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star7>
-  <star8>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 37500" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 50000" />
-      <gd name="dx1" fmla="cos wd2 2700000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc dx1 0" />
-      <gd name="dy1" fmla="sin hd2 2700000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc dy1 0" />
-      <gd name="iwd2" fmla="*/ wd2 a 50000" />
-      <gd name="ihd2" fmla="*/ hd2 a 50000" />
-      <gd name="sdx1" fmla="*/ iwd2 92388 100000" />
-      <gd name="sdx2" fmla="*/ iwd2 38268 100000" />
-      <gd name="sdy1" fmla="*/ ihd2 92388 100000" />
-      <gd name="sdy2" fmla="*/ ihd2 38268 100000" />
-      <gd name="sx1" fmla="+- hc 0 sdx1" />
-      <gd name="sx2" fmla="+- hc 0 sdx2" />
-      <gd name="sx3" fmla="+- hc sdx2 0" />
-      <gd name="sx4" fmla="+- hc sdx1 0" />
-      <gd name="sy1" fmla="+- vc 0 sdy1" />
-      <gd name="sy2" fmla="+- vc 0 sdy2" />
-      <gd name="sy3" fmla="+- vc sdy2 0" />
-      <gd name="sy4" fmla="+- vc sdy1 0" />
-      <gd name="yAdj" fmla="+- vc 0 ihd2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="50000">
-        <pos x="hc" y="yAdj" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x1" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="y1" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x2" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="sx1" t="sy1" r="sx4" b="sy4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="sx1" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx4" y="sy3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx3" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx2" y="sy4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="sx1" y="sy3" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </star8>
-  <straightConnector1>
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path fill="none">
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-      </path>
-    </pathLst>
-  </straightConnector1>
-  <stripedRightArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-
-      <gd name="adj2" fmla="val 50000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 84375 w ss" />
-
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="x4" fmla="*/ ss 5 32" />
-      <gd name="dx5" fmla="*/ ss a2 100000" />
-      <gd name="x5" fmla="+- r 0 dx5" />
-      <gd name="dy1" fmla="*/ h a1 200000" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="y2" fmla="+- vc dy1 0" />
-      <gd name="dx6" fmla="*/ dy1 dx5 hd2" />
-      <gd name="x6" fmla="+- r 0 dx6" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="100000">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x5" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x5" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x5" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x4" t="y1" r="x6" b="y2" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="ssd32" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="ssd32" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="ssd16" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="ssd8" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="ssd8" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="ssd16" y="y2" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x4" y="y1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x5" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="vc" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x5" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </stripedRightArrow>
-  <sun>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 12500 adj 46875" />
-      <gd name="g0" fmla="+- 50000 0 a" />
-      <gd name="g1" fmla="*/ g0 30274 32768" />
-      <gd name="g2" fmla="*/ g0 12540 32768" />
-      <gd name="g3" fmla="+- g1 50000 0" />
-      <gd name="g4" fmla="+- g2 50000 0" />
-      <gd name="g5" fmla="+- 50000 0 g1" />
-      <gd name="g6" fmla="+- 50000 0 g2" />
-      <gd name="g7" fmla="*/ g0 23170 32768" />
-      <gd name="g8" fmla="+- 50000 g7 0" />
-      <gd name="g9" fmla="+- 50000 0 g7" />
-      <gd name="g10" fmla="*/ g5 3 4" />
-      <gd name="g11" fmla="*/ g6 3 4" />
-      <gd name="g12" fmla="+- g10 3662 0" />
-      <gd name="g13" fmla="+- g11 3662 0" />
-      <gd name="g14" fmla="+- g11 12500 0" />
-      <gd name="g15" fmla="+- 100000 0 g10" />
-      <gd name="g16" fmla="+- 100000 0 g12" />
-      <gd name="g17" fmla="+- 100000 0 g13" />
-      <gd name="g18" fmla="+- 100000 0 g14" />
-      <gd name="ox1" fmla="*/ w 18436 21600" />
-      <gd name="oy1" fmla="*/ h 3163 21600" />
-      <gd name="ox2" fmla="*/ w 3163 21600" />
-      <gd name="oy2" fmla="*/ h 18436 21600" />
-      <gd name="x8" fmla="*/ w g8 100000" />
-      <gd name="x9" fmla="*/ w g9 100000" />
-      <gd name="x10" fmla="*/ w g10 100000" />
-      <gd name="x12" fmla="*/ w g12 100000" />
-      <gd name="x13" fmla="*/ w g13 100000" />
-      <gd name="x14" fmla="*/ w g14 100000" />
-      <gd name="x15" fmla="*/ w g15 100000" />
-      <gd name="x16" fmla="*/ w g16 100000" />
-      <gd name="x17" fmla="*/ w g17 100000" />
-      <gd name="x18" fmla="*/ w g18 100000" />
-      <gd name="x19" fmla="*/ w a 100000" />
-      <gd name="wR" fmla="*/ w g0 100000" />
-      <gd name="hR" fmla="*/ h g0 100000" />
-      <gd name="y8" fmla="*/ h g8 100000" />
-      <gd name="y9" fmla="*/ h g9 100000" />
-      <gd name="y10" fmla="*/ h g10 100000" />
-      <gd name="y12" fmla="*/ h g12 100000" />
-      <gd name="y13" fmla="*/ h g13 100000" />
-      <gd name="y14" fmla="*/ h g14 100000" />
-      <gd name="y15" fmla="*/ h g15 100000" />
-      <gd name="y16" fmla="*/ h g16 100000" />
-      <gd name="y17" fmla="*/ h g17 100000" />
-      <gd name="y18" fmla="*/ h g18 100000" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="12500" maxX="46875">
-        <pos x="x19" y="vc" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="x9" t="y9" r="x8" b="y8" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="r" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x15" y="y18" />
-        </lnTo>
-        <lnTo>
-          <pt x="x15" y="y14" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="ox1" y="oy1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x16" y="y13" />
-        </lnTo>
-        <lnTo>
-          <pt x="x17" y="y12" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="hc" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x18" y="y10" />
-        </lnTo>
-        <lnTo>
-          <pt x="x14" y="y10" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="ox2" y="oy1" />
-        </moveTo>
-        <lnTo>
-          <pt x="x13" y="y12" />
-        </lnTo>
-        <lnTo>
-          <pt x="x12" y="y13" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <lnTo>
-          <pt x="x10" y="y14" />
-        </lnTo>
-        <lnTo>
-          <pt x="x10" y="y18" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="ox2" y="oy2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x12" y="y17" />
-        </lnTo>
-        <lnTo>
-          <pt x="x13" y="y16" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="hc" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x14" y="y15" />
-        </lnTo>
-        <lnTo>
-          <pt x="x18" y="y15" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="ox1" y="oy2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x17" y="y16" />
-        </lnTo>
-        <lnTo>
-          <pt x="x16" y="y17" />
-        </lnTo>
-        <close />
-        <moveTo>
-          <pt x="x19" y="vc" />
-        </moveTo>
-        <arcTo wR="wR" hR="hR" stAng="cd2" swAng="21600000" />
-        <close />
-      </path>
-    </pathLst>
-
-  </sun>
-  <swooshArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 16667" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-
-
-      <gd name="a1" fmla="pin 1 adj1 75000" />
-
-      <gd name="maxAdj2" fmla="*/ 70000 w ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="ad1" fmla="*/ h a1 100000" />
-      <gd name="ad2" fmla="*/ ss a2 100000" />
-
-      <gd name="xB" fmla="+- r 0 ad2" />
-      <gd name="yB" fmla="+- t ssd8 0" />
-
-      <gd name="alfa" fmla="*/ cd4 1 14" />
-
-      <gd name="dx0" fmla="tan ssd8 alfa" />
-      <gd name="xC" fmla="+- xB 0 dx0" />
-
-      <gd name="dx1" fmla="tan ad1 alfa" />
-
-      <gd name="yF" fmla="+- yB ad1 0" />
-      <gd name="xF" fmla="+- xB dx1 0" />
-
-      <gd name="xE" fmla="+- xF dx0 0" />
-      <gd name="yE" fmla="+- yF ssd8 0" />
-
-      <gd name="dy2" fmla="+- yE 0 t" />
-      <gd name="dy22" fmla="*/ dy2 1 2" />
-      <gd name="dy3" fmla="*/ h 1 20" />
-      <gd name="yD" fmla="+- t dy22 dy3" />
-
-
-      <gd name="dy4" fmla="*/ hd6 1 1" />
-      <gd name="yP1" fmla="+- hd6 dy4 0" />
-      <gd name="xP1" fmla="val wd6" />
-
-
-      <gd name="dy5" fmla="*/ hd6 1 2" />
-      <gd name="yP2" fmla="+- yF dy5 0" />
-      <gd name="xP2" fmla="val wd4" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="1" maxY="75000">
-        <pos x="xF" y="yF" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="xB" y="yB" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="xC" y="t" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="yD" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="xE" y="yE" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <quadBezTo>
-          <pt x="xP1" y="yP1" />
-          <pt x="xB" y="yB" />
-        </quadBezTo>
-        <lnTo>
-          <pt x="xC" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="yD" />
-        </lnTo>
-        <lnTo>
-          <pt x="xE" y="yE" />
-        </lnTo>
-        <lnTo>
-          <pt x="xF" y="yF" />
-        </lnTo>
-        <quadBezTo>
-          <pt x="xP2" y="yP2" />
-          <pt x="l" y="b" />
-        </quadBezTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </swooshArrow>
-  <teardrop>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 100000" />
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 200000" />
-      <gd name="r2" fmla="sqrt 2" />
-      <gd name="tw" fmla="*/ wd2 r2 1" />
-      <gd name="th" fmla="*/ hd2 r2 1" />
-      <gd name="sw" fmla="*/ tw a 100000" />
-      <gd name="sh" fmla="*/ th a 100000" />
-      <gd name="dx1" fmla="cos sw 2700000" />
-      <gd name="dy1" fmla="sin sh 2700000" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc 0 dy1" />
-      <gd name="x2" fmla="+/ hc x1 2" />
-      <gd name="y2" fmla="+/ vc y1 2" />
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="200000">
-        <pos x="x1" y="t" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="x1" y="y1" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="vc" />
-        </moveTo>
-        <arcTo wR="wd2" hR="hd2" stAng="cd2" swAng="cd4" />
-        <quadBezTo>
-          <pt x="x2" y="t" />
-          <pt x="x1" y="y1" />
-        </quadBezTo>
-        <quadBezTo>
-          <pt x="r" y="y2" />
-          <pt x="r" y="vc" />
-        </quadBezTo>
-        <arcTo wR="wd2" hR="hd2" stAng="0" swAng="cd4" />
-        <arcTo wR="wd2" hR="hd2" stAng="cd4" swAng="cd4" />
-        <close />
-      </path>
-    </pathLst>
-
-  </teardrop>
-  <trapezoid>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 25000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj" fmla="*/ 50000 w ss" />
-      <gd name="a" fmla="pin 0 adj maxAdj" />
-      <gd name="x1" fmla="*/ ss a 200000" />
-      <gd name="x2" fmla="*/ ss a 100000" />
-      <gd name="x3" fmla="+- r 0 x2" />
-      <gd name="x4" fmla="+- r 0 x1" />
-      <gd name="il" fmla="*/ wd3 a maxAdj" />
-      <gd name="it" fmla="*/ hd3 a maxAdj" />
-      <gd name="ir" fmla="+- r 0 il" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="maxAdj">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x4" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </trapezoid>
-  <triangle>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 100000" />
-      <gd name="x1" fmla="*/ w a 200000" />
-      <gd name="x2" fmla="*/ w a 100000" />
-      <gd name="x3" fmla="+- x1 wd2 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj" minX="0" maxX="100000">
-        <pos x="x2" y="t" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="x2" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="l" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x2" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="r" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x3" y="vc" />
-      </cxn>
-    </cxnLst>
-    <rect l="x1" t="vc" r="x3" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </triangle>
-  <upArrowCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 64977" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 w ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ 100000 h ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q2" fmla="*/ a3 ss h" />
-
-      <gd name="maxAdj4" fmla="+- 100000 0 q2" />
-
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-      <gd name="dx1" fmla="*/ ss a2 100000" />
-
-      <gd name="dx2" fmla="*/ ss a1 200000" />
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="*/ ss a3 100000" />
-
-      <gd name="dy2" fmla="*/ h a4 100000" />
-
-      <gd name="y2" fmla="+- b 0 dy2" />
-      <gd name="y3" fmla="+/ y2 b 2" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="x2" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj4" minY="0" maxY="maxAdj4">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y2" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y2" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="y2" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </upArrowCallout>
-  <upArrow>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 h ss" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="y2" fmla="*/ ss a2 100000" />
-      <gd name="y3" fmla="+- b 0 y2" />
-      <gd name="dx1" fmla="*/ w a1 200000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc dx1 0" />
-      <gd name="dy1" fmla="*/ x1 y2 wd2" />
-      <gd name="y1" fmla="+- y2 0 dy1" />
-      <gd name="y4" fmla="+- y3 dy1 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="100000">
-        <pos x="x1" y="y3" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y3" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y2" />
-      </cxn>
-    </cxnLst>
-    <rect l="x1" t="y1" r="x2" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </upArrow>
-  <upDownArrow>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 50000" />
-      <gd name="adj2" fmla="val 50000" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 h ss" />
-      <gd name="a1" fmla="pin 0 adj1 100000" />
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="y2" fmla="*/ ss a2 100000" />
-      <gd name="y3" fmla="+- b 0 y2" />
-      <gd name="dx1" fmla="*/ w a1 200000" />
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc dx1 0" />
-      <gd name="dy1" fmla="*/ x1 y2 wd2" />
-      <gd name="y1" fmla="+- y2 0 dy1" />
-      <gd name="y4" fmla="+- y3 dy1 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="100000">
-        <pos x="x1" y="y3" />
-      </ahXY>
-      <ahXY gdRefY="adj2" minY="0" maxY="maxAdj2">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y2" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="y3" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y3" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x2" y="vc" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y2" />
-      </cxn>
-    </cxnLst>
-    <rect l="x1" t="y1" r="x2" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y2" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </upDownArrow>
-  <upDownArrowCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 48123" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="maxAdj2" fmla="*/ 50000 w ss" />
-
-      <gd name="a2" fmla="pin 0 adj2 maxAdj2" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="maxAdj3" fmla="*/ 50000 h ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q2" fmla="*/ a3 ss hd2" />
-
-      <gd name="maxAdj4" fmla="+- 100000 0 q2" />
-
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-      <gd name="dx1" fmla="*/ ss a2 100000" />
-
-      <gd name="dx2" fmla="*/ ss a1 200000" />
-
-      <gd name="x1" fmla="+- hc 0 dx1" />
-      <gd name="x2" fmla="+- hc 0 dx2" />
-      <gd name="x3" fmla="+- hc dx2 0" />
-      <gd name="x4" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="*/ ss a3 100000" />
-
-      <gd name="y4" fmla="+- b 0 y1" />
-
-      <gd name="dy2" fmla="*/ h a4 200000" />
-
-      <gd name="y2" fmla="+- vc 0 dy2" />
-
-      <gd name="y3" fmla="+- vc dy2 0" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="x2" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="maxAdj2">
-        <pos x="x1" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="r" y="y1" />
-      </ahXY>
-      <ahXY gdRefY="adj4" minY="0" maxY="maxAdj4">
-        <pos x="l" y="y2" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="y2" r="r" b="y3" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="y2" />
-        </moveTo>
-        <lnTo>
-          <pt x="x2" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="x3" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x4" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="hc" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y3" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </upDownArrowCallout>
-  <uturnArrow>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 25000" />
-
-      <gd name="adj2" fmla="val 25000" />
-
-      <gd name="adj3" fmla="val 25000" />
-
-      <gd name="adj4" fmla="val 43750" />
-
-      <gd name="adj5" fmla="val 75000" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a2" fmla="pin 0 adj2 25000" />
-      <gd name="maxAdj1" fmla="*/ a2 2 1" />
-      <gd name="a1" fmla="pin 0 adj1 maxAdj1" />
-      <gd name="q2" fmla="*/ a1 ss h" />
-
-      <gd name="q3" fmla="+- 100000 0 q2" />
-
-      <gd name="maxAdj3" fmla="*/ q3 h ss" />
-
-      <gd name="a3" fmla="pin 0 adj3 maxAdj3" />
-      <gd name="q1" fmla="+- a3 a1 0" />
-      <gd name="minAdj5" fmla="*/ q1 ss h" />
-      <gd name="a5" fmla="pin minAdj5 adj5 100000" />
-      <gd name="th" fmla="*/ ss a1 100000" />
-
-      <gd name="aw2" fmla="*/ ss a2 100000" />
-
-      <gd name="th2" fmla="*/ th 1 2" />
-      <gd name="dh2" fmla="+- aw2 0 th2" />
-
-      <gd name="y5" fmla="*/ h a5 100000" />
-
-      <gd name="ah" fmla="*/ ss a3 100000" />
-
-      <gd name="y4" fmla="+- y5 0 ah" />
-      <gd name="x9" fmla="+- r 0 dh2" />
-
-      <gd name="bw" fmla="*/ x9 1 2" />
-      <gd name="bs" fmla="min bw y4" />
-      <gd name="maxAdj4" fmla="*/ bs 100000 ss" />
-      <gd name="a4" fmla="pin 0 adj4 maxAdj4" />
-
-
-      <gd name="bd" fmla="*/ ss a4 100000" />
-
-
-
-      <gd name="bd3" fmla="+- bd 0 th" />
-      <gd name="bd2" fmla="max bd3 0" />
-      <gd name="x3" fmla="+- th bd2 0" />
-
-      <gd name="x8" fmla="+- r 0 aw2" />
-
-      <gd name="x6" fmla="+- x8 0 aw2" />
-
-      <gd name="x7" fmla="+- x6 dh2 0" />
-
-      <gd name="x4" fmla="+- x9 0 bd" />
-
-      <gd name="x5" fmla="+- x7 0 bd2" />
-
-      <gd name="cx" fmla="+/ th x7 2" />
-
-
-
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="0" maxX="maxAdj1">
-        <pos x="th" y="b" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="0" maxX="25000">
-        <pos x="x6" y="b" />
-      </ahXY>
-      <ahXY gdRefY="adj3" minY="0" maxY="maxAdj3">
-        <pos x="x6" y="y4" />
-      </ahXY>
-      <ahXY gdRefX="adj4" minX="0" maxX="maxAdj4">
-        <pos x="bd" y="t" />
-      </ahXY>
-      <ahXY gdRefY="adj5" minY="minAdj5" maxY="100000">
-        <pos x="r" y="y5" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="x6" y="y4" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="x8" y="y5" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="y4" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="cx" y="t" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="th2" y="b" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="b" />
-        </moveTo>
-        <lnTo>
-          <pt x="l" y="bd" />
-        </lnTo>
-        <arcTo wR="bd" hR="bd" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x4" y="t" />
-        </lnTo>
-        <arcTo wR="bd" hR="bd" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="x9" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x8" y="y5" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="y4" />
-        </lnTo>
-        <lnTo>
-          <pt x="x7" y="x3" />
-        </lnTo>
-        <arcTo wR="bd2" hR="bd2" stAng="0" swAng="-5400000" />
-        <lnTo>
-          <pt x="x3" y="th" />
-        </lnTo>
-        <arcTo wR="bd2" hR="bd2" stAng="3cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="th" y="b" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </uturnArrow>
-  <verticalScroll>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj" fmla="val 12500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a" fmla="pin 0 adj 25000" />
-      <gd name="ch" fmla="*/ ss a 100000" />
-
-      <gd name="ch2" fmla="*/ ch 1 2" />
-
-      <gd name="ch4" fmla="*/ ch 1 4" />
-
-
-
-
-
-      <gd name="x3" fmla="+- ch ch2 0" />
-
-      <gd name="x4" fmla="+- ch ch 0" />
-
-      <gd name="x6" fmla="+- r 0 ch" />
-
-      <gd name="x7" fmla="+- r 0 ch2" />
-
-      <gd name="x5" fmla="+- x6 0 ch2" />
-
-
-
-
-
-      <gd name="y3" fmla="+- b 0 ch" />
-
-      <gd name="y4" fmla="+- b 0 ch2" />
-
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj" minY="0" maxY="25000">
-        <pos x="l" y="ch" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="ch" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x6" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="ch" t="ch" r="x6" b="y4" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="ch2" y="b" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="ch2" y="y4" />
-        </lnTo>
-        <arcTo wR="ch4" hR="ch4" stAng="cd4" swAng="-10800000" />
-        <lnTo>
-          <pt x="ch" y="y3" />
-        </lnTo>
-        <lnTo>
-          <pt x="ch" y="ch2" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x7" y="t" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x6" y="ch" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y4" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd4" />
-        <close />
-        <moveTo>
-          <pt x="x4" y="ch2" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd4" />
-        <arcTo wR="ch4" hR="ch4" stAng="cd4" swAng="cd2" />
-        <close />
-      </path>
-      <path fill="darkenLess" stroke="false" extrusionOk="false">
-
-        <moveTo>
-          <pt x="x4" y="ch2" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd4" />
-        <arcTo wR="ch4" hR="ch4" stAng="cd4" swAng="cd2" />
-        <close />
-        <moveTo>
-          <pt x="ch" y="y4" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="3cd4" />
-        <arcTo wR="ch4" hR="ch4" stAng="3cd4" swAng="cd2" />
-        <close />
-      </path>
-      <path fill="none" extrusionOk="false">
-
-        <moveTo>
-          <pt x="ch" y="y3" />
-        </moveTo>
-        <lnTo>
-          <pt x="ch" y="ch2" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x7" y="t" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x6" y="ch" />
-        </lnTo>
-        <lnTo>
-          <pt x="x6" y="y4" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="ch2" y="b" />
-        </lnTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="cd2" />
-        <close />
-        <moveTo>
-          <pt x="x3" y="t" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="3cd4" swAng="cd2" />
-        <arcTo wR="ch4" hR="ch4" stAng="cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="x4" y="ch2" />
-        </lnTo>
-        <moveTo>
-          <pt x="x6" y="ch" />
-        </moveTo>
-        <lnTo>
-          <pt x="x3" y="ch" />
-        </lnTo>
-        <moveTo>
-          <pt x="ch2" y="y3" />
-        </moveTo>
-        <arcTo wR="ch4" hR="ch4" stAng="3cd4" swAng="cd2" />
-        <lnTo>
-          <pt x="ch" y="y4" />
-        </lnTo>
-        <moveTo>
-          <pt x="ch2" y="b" />
-        </moveTo>
-        <arcTo wR="ch2" hR="ch2" stAng="cd4" swAng="-5400000" />
-        <lnTo>
-          <pt x="ch" y="y3" />
-        </lnTo>
-      </path>
-    </pathLst>
-
-  </verticalScroll>
-  <wave>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val 12500" />
-
-      <gd name="adj2" fmla="val 0" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="a1" fmla="pin 0 adj1 20000" />
-      <gd name="a2" fmla="pin -10000 adj2 10000" />
-      <gd name="y1" fmla="*/ h a1 100000" />
-
-      <gd name="dy2" fmla="*/ y1 10 3" />
-      <gd name="y2" fmla="+- y1 0 dy2" />
-
-      <gd name="y3" fmla="+- y1 dy2 0" />
-
-      <gd name="y4" fmla="+- b 0 y1" />
-
-      <gd name="y5" fmla="+- y4 0 dy2" />
-
-      <gd name="y6" fmla="+- y4 dy2 0" />
-
-      <gd name="dx1" fmla="*/ w a2 100000" />
-
-      <gd name="of2" fmla="*/ w a2 50000" />
-
-      <gd name="x1" fmla="abs dx1" />
-
-      <gd name="dx2" fmla="?: of2 0 of2" />
-      <gd name="x2" fmla="+- l 0 dx2" />
-
-      <gd name="dx5" fmla="?: of2 of2 0" />
-      <gd name="x5" fmla="+- r 0 dx5" />
-
-      <gd name="dx3" fmla="+/ dx2 x5 3" />
-
-      <gd name="x3" fmla="+- x2 dx3 0" />
-
-      <gd name="x4" fmla="+/ x3 x5 2" />
-
-      <gd name="x6" fmla="+- l dx5 0" />
-
-      <gd name="x10" fmla="+- r dx2 0" />
-
-      <gd name="x7" fmla="+- x6 dx3 0" />
-
-      <gd name="x8" fmla="+/ x7 x10 2" />
-
-      <gd name="x9" fmla="+- r 0 x1" />
-
-      <gd name="xAdj" fmla="+- hc dx1 0" />
-      <gd name="xAdj2" fmla="+- hc 0 dx1" />
-      <gd name="il" fmla="max x2 x6" />
-      <gd name="ir" fmla="min x5 x10" />
-      <gd name="it" fmla="*/ h a1 50000" />
-      <gd name="ib" fmla="+- b 0 it" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefY="adj1" minY="0" maxY="20000">
-        <pos x="l" y="y1" />
-      </ahXY>
-      <ahXY gdRefX="adj2" minX="-10000" maxX="10000">
-        <pos x="xAdj" y="b" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="cd4">
-        <pos x="xAdj2" y="y1" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="x1" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="xAdj" y="y4" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="x9" y="vc" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="x2" y="y1" />
-        </moveTo>
-        <cubicBezTo>
-          <pt x="x3" y="y2" />
-          <pt x="x4" y="y3" />
-          <pt x="x5" y="y1" />
-        </cubicBezTo>
-        <lnTo>
-          <pt x="x10" y="y4" />
-        </lnTo>
-        <cubicBezTo>
-          <pt x="x8" y="y6" />
-          <pt x="x7" y="y5" />
-          <pt x="x6" y="y4" />
-        </cubicBezTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </wave>
-  <wedgeEllipseCallout>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val -20833" />
-      <gd name="adj2" fmla="val 62500" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dxPos" fmla="*/ w adj1 100000" />
-      <gd name="dyPos" fmla="*/ h adj2 100000" />
-      <gd name="xPos" fmla="+- hc dxPos 0" />
-      <gd name="yPos" fmla="+- vc dyPos 0" />
-      <gd name="sdx" fmla="*/ dxPos h 1" />
-      <gd name="sdy" fmla="*/ dyPos w 1" />
-      <gd name="pang" fmla="at2 sdx sdy" />
-      <gd name="stAng" fmla="+- pang 660000 0" />
-      <gd name="enAng" fmla="+- pang 0 660000" />
-      <gd name="dx1" fmla="cos wd2 stAng" />
-      <gd name="dy1" fmla="sin hd2 stAng" />
-      <gd name="x1" fmla="+- hc dx1 0" />
-      <gd name="y1" fmla="+- vc dy1 0" />
-      <gd name="dx2" fmla="cos wd2 enAng" />
-      <gd name="dy2" fmla="sin hd2 enAng" />
-      <gd name="x2" fmla="+- hc dx2 0" />
-      <gd name="y2" fmla="+- vc dy2 0" />
-      <gd name="stAng1" fmla="at2 dx1 dy1" />
-      <gd name="enAng1" fmla="at2 dx2 dy2" />
-      <gd name="swAng1" fmla="+- enAng1 0 stAng1" />
-      <gd name="swAng2" fmla="+- swAng1 21600000 0" />
-      <gd name="swAng" fmla="?: swAng1 swAng1 swAng2" />
-      <gd name="idx" fmla="cos wd2 2700000" />
-      <gd name="idy" fmla="sin hd2 2700000" />
-      <gd name="il" fmla="+- hc 0 idx" />
-      <gd name="ir" fmla="+- hc idx 0" />
-      <gd name="it" fmla="+- vc 0 idy" />
-      <gd name="ib" fmla="+- vc idy 0" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647" gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="xPos" y="yPos" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="il" y="it" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="il" y="ib" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="ir" y="ib" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="3cd4">
-        <pos x="ir" y="it" />
-      </cxn>
-      <cxn ang="pang">
-        <pos x="xPos" y="yPos" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="it" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="xPos" y="yPos" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="y1" />
-        </lnTo>
-        <arcTo wR="wd2" hR="hd2" stAng="stAng1" swAng="swAng" />
-        <close />
-      </path>
-    </pathLst>
-  </wedgeEllipseCallout>
-  <wedgeRectCallout>
-
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val -20833" />
-
-      <gd name="adj2" fmla="val 62500" />
-
-    </avLst>
-
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dxPos" fmla="*/ w adj1 100000" />
-      <gd name="dyPos" fmla="*/ h adj2 100000" />
-      <gd name="xPos" fmla="+- hc dxPos 0" />
-      <gd name="yPos" fmla="+- vc dyPos 0" />
-      <gd name="dx" fmla="+- xPos 0 hc" />
-      <gd name="dy" fmla="+- yPos 0 vc" />
-      <gd name="dq" fmla="*/ dxPos h w" />
-      <gd name="ady" fmla="abs dyPos" />
-      <gd name="adq" fmla="abs dq" />
-      <gd name="dz" fmla="+- ady 0 adq" />
-      <gd name="xg1" fmla="?: dxPos 7 2" />
-      <gd name="xg2" fmla="?: dxPos 10 5" />
-      <gd name="x1" fmla="*/ w xg1 12" />
-      <gd name="x2" fmla="*/ w xg2 12" />
-      <gd name="yg1" fmla="?: dyPos 7 2" />
-      <gd name="yg2" fmla="?: dyPos 10 5" />
-      <gd name="y1" fmla="*/ h yg1 12" />
-      <gd name="y2" fmla="*/ h yg2 12" />
-      <gd name="t1" fmla="?: dxPos l xPos" />
-      <gd name="xl" fmla="?: dz l t1" />
-      <gd name="t2" fmla="?: dyPos x1 xPos" />
-      <gd name="xt" fmla="?: dz t2 x1" />
-      <gd name="t3" fmla="?: dxPos xPos r" />
-      <gd name="xr" fmla="?: dz r t3" />
-      <gd name="t4" fmla="?: dyPos xPos x1" />
-      <gd name="xb" fmla="?: dz t4 x1" />
-      <gd name="t5" fmla="?: dxPos y1 yPos" />
-      <gd name="yl" fmla="?: dz y1 t5" />
-      <gd name="t6" fmla="?: dyPos t yPos" />
-      <gd name="yt" fmla="?: dz t6 t" />
-      <gd name="t7" fmla="?: dxPos yPos y1" />
-      <gd name="yr" fmla="?: dz y1 t7" />
-      <gd name="t8" fmla="?: dyPos yPos b" />
-      <gd name="yb" fmla="?: dz t8 b" />
-    </gdLst>
-
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647" gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="xPos" y="yPos" />
-      </ahXY>
-    </ahLst>
-
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="xPos" y="yPos" />
-      </cxn>
-    </cxnLst>
-
-    <rect l="l" t="t" r="r" b="b" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="t" />
-        </moveTo>
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="xt" y="yt" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xr" y="yr" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="xb" y="yb" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xl" y="yl" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-
-  </wedgeRectCallout>
-  <wedgeRoundRectCallout>
-    <avLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="adj1" fmla="val -20833" />
-      <gd name="adj2" fmla="val 62500" />
-      <gd name="adj3" fmla="val 16667" />
-    </avLst>
-    <gdLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <gd name="dxPos" fmla="*/ w adj1 100000" />
-      <gd name="dyPos" fmla="*/ h adj2 100000" />
-      <gd name="xPos" fmla="+- hc dxPos 0" />
-      <gd name="yPos" fmla="+- vc dyPos 0" />
-      <gd name="dq" fmla="*/ dxPos h w" />
-      <gd name="ady" fmla="abs dyPos" />
-      <gd name="adq" fmla="abs dq" />
-      <gd name="dz" fmla="+- ady 0 adq" />
-      <gd name="xg1" fmla="?: dxPos 7 2" />
-      <gd name="xg2" fmla="?: dxPos 10 5" />
-      <gd name="x1" fmla="*/ w xg1 12" />
-      <gd name="x2" fmla="*/ w xg2 12" />
-      <gd name="yg1" fmla="?: dyPos 7 2" />
-      <gd name="yg2" fmla="?: dyPos 10 5" />
-      <gd name="y1" fmla="*/ h yg1 12" />
-      <gd name="y2" fmla="*/ h yg2 12" />
-      <gd name="t1" fmla="?: dxPos l xPos" />
-      <gd name="xl" fmla="?: dz l t1" />
-      <gd name="t2" fmla="?: dyPos x1 xPos" />
-      <gd name="xt" fmla="?: dz t2 x1" />
-      <gd name="t3" fmla="?: dxPos xPos r" />
-      <gd name="xr" fmla="?: dz r t3" />
-      <gd name="t4" fmla="?: dyPos xPos x1" />
-      <gd name="xb" fmla="?: dz t4 x1" />
-      <gd name="t5" fmla="?: dxPos y1 yPos" />
-      <gd name="yl" fmla="?: dz y1 t5" />
-      <gd name="t6" fmla="?: dyPos t yPos" />
-      <gd name="yt" fmla="?: dz t6 t" />
-      <gd name="t7" fmla="?: dxPos yPos y1" />
-      <gd name="yr" fmla="?: dz y1 t7" />
-      <gd name="t8" fmla="?: dyPos yPos b" />
-      <gd name="yb" fmla="?: dz t8 b" />
-      <gd name="u1" fmla="*/ ss adj3 100000" />
-      <gd name="u2" fmla="+- r 0 u1" />
-      <gd name="v2" fmla="+- b 0 u1" />
-      <gd name="il" fmla="*/ u1 29289 100000" />
-      <gd name="ir" fmla="+- r 0 il" />
-      <gd name="ib" fmla="+- b 0 il" />
-    </gdLst>
-    <ahLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <ahXY gdRefX="adj1" minX="-2147483647" maxX="2147483647" gdRefY="adj2" minY="-2147483647" maxY="2147483647">
-        <pos x="xPos" y="yPos" />
-      </ahXY>
-    </ahLst>
-    <cxnLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <cxn ang="3cd4">
-        <pos x="hc" y="t" />
-      </cxn>
-      <cxn ang="cd2">
-        <pos x="l" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="hc" y="b" />
-      </cxn>
-      <cxn ang="0">
-        <pos x="r" y="vc" />
-      </cxn>
-      <cxn ang="cd4">
-        <pos x="xPos" y="yPos" />
-      </cxn>
-    </cxnLst>
-    <rect l="il" t="il" r="ir" b="ib" xmlns="http://schemas.openxmlformats.org/drawingml/2006/main" />
-    <pathLst xmlns="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <path>
-        <moveTo>
-          <pt x="l" y="u1" />
-        </moveTo>
-        <arcTo wR="u1" hR="u1" stAng="cd2" swAng="cd4" />
-        <lnTo>
-          <pt x="x1" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="xt" y="yt" />
-        </lnTo>
-        <lnTo>
-          <pt x="x2" y="t" />
-        </lnTo>
-        <lnTo>
-          <pt x="u2" y="t" />
-        </lnTo>
-        <arcTo wR="u1" hR="u1" stAng="3cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="r" y="y1" />
-        </lnTo>
-        <lnTo>
-          <pt x="xr" y="yr" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="r" y="v2" />
-        </lnTo>
-        <arcTo wR="u1" hR="u1" stAng="0" swAng="cd4" />
-        <lnTo>
-          <pt x="x2" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="xb" y="yb" />
-        </lnTo>
-        <lnTo>
-          <pt x="x1" y="b" />
-        </lnTo>
-        <lnTo>
-          <pt x="u1" y="b" />
-        </lnTo>
-        <arcTo wR="u1" hR="u1" stAng="cd4" swAng="cd4" />
-        <lnTo>
-          <pt x="l" y="y2" />
-        </lnTo>
-        <lnTo>
-          <pt x="xl" y="yl" />
-        </lnTo>
-        <lnTo>
-          <pt x="l" y="y1" />
-        </lnTo>
-        <close />
-      </path>
-    </pathLst>
-  </wedgeRoundRectCallout>
-</presetShapeDefinitons>
diff --git a/trunk/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt b/trunk/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
deleted file mode 100644
index b56f65e..0000000
--- a/trunk/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Created by (org.apache.poi.hssf.record.formula.function.ExcelFileFormatDocFunctionExtractor)
-# from source file 'excelfileformat.odt' (size=356107, md5=0x8f789cb6e75594caf068f8e193004ef4)
-#
-#Columns: (index, name, minParams, maxParams, returnClass, paramClasses, isVolatile, hasFootnote )
-
-# Built-In Sheet Functions in BIFF2
-0	COUNT	0	30	V	R		
-1	IF	2	3	R	V R R		
-2	ISNA	1	1	V	V		
-3	ISERROR	1	1	V	V		
-4	SUM	0	30	V	R		
-5	AVERAGE	1	30	V	R		
-6	MIN	1	30	V	R		
-7	MAX	1	30	V	R		
-8	ROW	0	1	V	R		
-9	COLUMN	0	1	V	R		
-10	NA	0	0	V	-		
-11	NPV	2	30	V	V R		
-12	STDEV	1	30	V	R		
-13	DOLLAR	1	2	V	V V		
-14	FIXED	2	2	V	V V		x
-15	SIN	1	1	V	V		
-16	COS	1	1	V	V		
-17	TAN	1	1	V	V		
-18	ATAN	1	1	V	V		
-19	PI	0	0	V	-		
-20	SQRT	1	1	V	V		
-21	EXP	1	1	V	V		
-22	LN	1	1	V	V		
-23	LOG10	1	1	V	V		
-24	ABS	1	1	V	V		
-25	INT	1	1	V	V		
-26	SIGN	1	1	V	V		
-27	ROUND	2	2	V	V V		
-28	LOOKUP	2	3	V	V R R		
-29	INDEX	2	4	R	R V V V		
-30	REPT	2	2	V	V V		
-31	MID	3	3	V	V V V		
-32	LEN	1	1	V	V		
-33	VALUE	1	1	V	V		
-34	TRUE	0	0	V	-		
-35	FALSE	0	0	V	-		
-36	AND	1	30	V	R		
-37	OR	1	30	V	R		
-38	NOT	1	1	V	V		
-39	MOD	2	2	V	V V		
-40	DCOUNT	3	3	V	R R R		
-41	DSUM	3	3	V	R R R		
-42	DAVERAGE	3	3	V	R R R		
-43	DMIN	3	3	V	R R R		
-44	DMAX	3	3	V	R R R		
-45	DSTDEV	3	3	V	R R R		
-46	VAR	1	30	V	R		
-47	DVAR	3	3	V	R R R		
-48	TEXT	2	2	V	V V		
-49	LINEST	1	2	A	R R		x
-50	TREND	1	3	A	R R R		x
-51	LOGEST	1	2	A	R R		x
-52	GROWTH	1	3	A	R R R		x
-56	PV	3	5	V	V V V V V		
-# Built-In Sheet Functions in BIFF2
-57	FV	3	5	V	V V V V V		
-58	NPER	3	5	V	V V V V V		
-59	PMT	3	5	V	V V V V V		
-60	RATE	3	6	V	V V V V V V		
-61	MIRR	3	3	V	R V V		
-62	IRR	1	2	V	R V		
-63	RAND	0	0	V	-	x	
-64	MATCH	2	3	V	V R R		
-65	DATE	3	3	V	V V V		
-66	TIME	3	3	V	V V V		
-67	DAY	1	1	V	V		
-68	MONTH	1	1	V	V		
-69	YEAR	1	1	V	V		
-70	WEEKDAY	1	1	V	V		x
-71	HOUR	1	1	V	V		
-72	MINUTE	1	1	V	V		
-73	SECOND	1	1	V	V		
-74	NOW	0	0	V	-	x	
-75	AREAS	1	1	V	R		
-76	ROWS	1	1	V	R		
-77	COLUMNS	1	1	V	R		
-78	OFFSET	3	5	R	R V V V V	x	
-82	SEARCH	2	3	V	V V V		
-83	TRANSPOSE	1	1	A	A		
-86	TYPE	1	1	V	V		
-97	ATAN2	2	2	V	V V		
-98	ASIN	1	1	V	V		
-99	ACOS	1	1	V	V		
-100	CHOOSE	2	30	R	V R		
-101	HLOOKUP	3	3	V	V R R		x
-102	VLOOKUP	3	3	V	V R R		x
-105	ISREF	1	1	V	R		
-109	LOG	1	2	V	V V		
-111	CHAR	1	1	V	V		
-112	LOWER	1	1	V	V		
-113	UPPER	1	1	V	V		
-114	PROPER	1	1	V	V		
-115	LEFT	1	2	V	V V		
-116	RIGHT	1	2	V	V V		
-117	EXACT	2	2	V	V V		
-118	TRIM	1	1	V	V		
-119	REPLACE	4	4	V	V V V V		
-120	SUBSTITUTE	3	4	V	V V V V		
-121	CODE	1	1	V	V		
-124	FIND	2	3	V	V V V		
-125	CELL	1	2	V	V R	x	
-126	ISERR	1	1	V	V		
-127	ISTEXT	1	1	V	V		
-128	ISNUMBER	1	1	V	V		
-129	ISBLANK	1	1	V	V		
-130	T	1	1	V	R		
-131	N	1	1	V	R		
-140	DATEVALUE	1	1	V	V		
-141	TIMEVALUE	1	1	V	V		
-142	SLN	3	3	V	V V V		
-143	SYD	4	4	V	V V V V		
-144	DDB	4	5	V	V V V V V		
-148	INDIRECT	1	2	R	V V	x	
-162	CLEAN	1	1	V	V		
-163	MDETERM	1	1	V	A		
-164	MINVERSE	1	1	A	A		
-165	MMULT	2	2	A	A A		
-167	IPMT	4	6	V	V V V V V V		
-168	PPMT	4	6	V	V V V V V V		
-169	COUNTA	0	30	V	R		
-183	PRODUCT	0	30	V	R		
-184	FACT	1	1	V	V		
-189	DPRODUCT	3	3	V	R R R		
-190	ISNONTEXT	1	1	V	V		
-193	STDEVP	1	30	V	R		
-194	VARP	1	30	V	R		
-195	DSTDEVP	3	3	V	R R R		
-196	DVARP	3	3	V	R R R		
-197	TRUNC	1	1	V	V		x
-198	ISLOGICAL	1	1	V	V		
-199	DCOUNTA	3	3	V	R R R		
-# New Built-In Sheet Functions in BIFF3
-49	LINEST	1	4	A	R R V V		x
-50	TREND	1	4	A	R R R V		x
-51	LOGEST	1	4	A	R R V V		x
-52	GROWTH	1	4	A	R R R V		x
-197	TRUNC	1	2	V	V V		x
-204	YEN	1	2	V	V V		x
-205	FINDB	2	3	V	V V V		
-206	SEARCHB	2	3	V	V V V		
-207	REPLACEB	4	4	V	V V V V		
-208	LEFTB	1	2	V	V V		
-209	RIGHTB	1	2	V	V V		
-210	MIDB	3	3	V	V V V		
-211	LENB	1	1	V	V		
-212	ROUNDUP	2	2	V	V V		
-213	ROUNDDOWN	2	2	V	V V		
-214	ASC	1	1	V	V		
-215	JIS	1	1	V	V		x
-219	ADDRESS	2	5	V	V V V V V		
-220	DAYS360	2	2	V	V V		x
-221	TODAY	0	0	V	-	x	
-222	VDB	5	7	V	V V V V V V V		
-227	MEDIAN	1	30	V	R ...		
-228	SUMPRODUCT	1	30	V	A ...		
-229	SINH	1	1	V	V		
-230	COSH	1	1	V	V		
-231	TANH	1	1	V	V		
-232	ASINH	1	1	V	V		
-233	ACOSH	1	1	V	V		
-234	ATANH	1	1	V	V		
-235	DGET	3	3	V	R R R		
-244	INFO	1	1	V	V		
-# New Built-In Sheet Functions in BIFF4
-14	FIXED	2	3	V	V V V		x
-204	USDOLLAR	1	2	V	V V		x
-215	DBCS	1	1	V	V		x
-216	RANK	2	3	V	V R V		
-247	DB	4	5	V	V V V V V		
-252	FREQUENCY	2	2	A	R R		
-261	ERROR.TYPE	1	1	V	V		
-269	AVEDEV	1	30	V	R ...		
-270	BETADIST	3	5	V	V V V V V		
-271	GAMMALN	1	1	V	V		
-272	BETAINV	3	5	V	V V V V V		
-273	BINOMDIST	4	4	V	V V V V		
-274	CHIDIST	2	2	V	V V		
-275	CHIINV	2	2	V	V V		
-276	COMBIN	2	2	V	V V		
-277	CONFIDENCE	3	3	V	V V V		
-278	CRITBINOM	3	3	V	V V V		
-279	EVEN	1	1	V	V		
-280	EXPONDIST	3	3	V	V V V		
-281	FDIST	3	3	V	V V V		
-282	FINV	3	3	V	V V V		
-283	FISHER	1	1	V	V		
-284	FISHERINV	1	1	V	V		
-285	FLOOR	2	2	V	V V		
-286	GAMMADIST	4	4	V	V V V V		
-287	GAMMAINV	3	3	V	V V V		
-288	CEILING	2	2	V	V V		
-289	HYPGEOMDIST	4	4	V	V V V V		
-290	LOGNORMDIST	3	3	V	V V V		
-291	LOGINV	3	3	V	V V V		
-292	NEGBINOMDIST	3	3	V	V V V		
-293	NORMDIST	4	4	V	V V V V		
-294	NORMSDIST	1	1	V	V		
-295	NORMINV	3	3	V	V V V		
-296	NORMSINV	1	1	V	V		
-297	STANDARDIZE	3	3	V	V V V		
-298	ODD	1	1	V	V		
-299	PERMUT	2	2	V	V V		
-300	POISSON	3	3	V	V V V		
-301	TDIST	3	3	V	V V V		
-302	WEIBULL	4	4	V	V V V V		
-303	SUMXMY2	2	2	V	A A		
-304	SUMX2MY2	2	2	V	A A		
-305	SUMX2PY2	2	2	V	A A		
-306	CHITEST	2	2	V	A A		
-307	CORREL	2	2	V	A A		
-308	COVAR	2	2	V	A A		
-309	FORECAST	3	3	V	V A A		
-310	FTEST	2	2	V	A A		
-311	INTERCEPT	2	2	V	A A		
-312	PEARSON	2	2	V	A A		
-313	RSQ	2	2	V	A A		
-314	STEYX	2	2	V	A A		
-315	SLOPE	2	2	V	A A		
-316	TTEST	4	4	V	A A V V		
-317	PROB	3	4	V	A A V V		
-318	DEVSQ	1	30	V	R ...		
-319	GEOMEAN	1	30	V	R ...		
-320	HARMEAN	1	30	V	R ...		
-321	SUMSQ	0	30	V	R ...		
-322	KURT	1	30	V	R ...		
-323	SKEW	1	30	V	R ...		
-324	ZTEST	2	3	V	R V V		
-325	LARGE	2	2	V	R V		
-326	SMALL	2	2	V	R V		
-327	QUARTILE	2	2	V	R V		
-328	PERCENTILE	2	2	V	R V		
-329	PERCENTRANK	2	3	V	R V V		
-330	MODE	1	30	V	A		
-331	TRIMMEAN	2	2	V	R V		
-332	TINV	2	2	V	V V		
-# New Built-In Sheet Functions in BIFF5
-70	WEEKDAY	1	2	V	V V		x
-101	HLOOKUP	3	4	V	V R R V		x
-102	VLOOKUP	3	4	V	V R R V		x
-220	DAYS360	2	3	V	V V V		x
-336	CONCATENATE	0	30	V	V		
-337	POWER	2	2	V	V V		
-342	RADIANS	1	1	V	V		
-343	DEGREES	1	1	V	V		
-344	SUBTOTAL	2	30	V	V R		
-345	SUMIF	2	3	V	R V R		
-346	COUNTIF	2	2	V	R V		
-347	COUNTBLANK	1	1	V	R		
-350	ISPMT	4	4	V	V V V V		
-351	DATEDIF	3	3	V	V V V		
-352	DATESTRING	1	1	V	V		
-353	NUMBERSTRING	2	2	V	V V		
-354	ROMAN	1	2	V	V V		
-# New Built-In Sheet Functions in BIFF8
-358	GETPIVOTDATA	2	30				
-359	HYPERLINK	1	2	V	V V		
-360	PHONETIC	1	1	V	R		
-361	AVERAGEA	1	30	V	R ...		
-362	MAXA	1	30	V	R ...		
-363	MINA	1	30	V	R ...		
-364	STDEVPA	1	30	V	R ...		
-365	VARPA	1	30	V	R ...		
-366	STDEVA	1	30	V	R ...		
-367	VARA	1	30	V	R ...		
diff --git a/trunk/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata.txt b/trunk/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata.txt
deleted file mode 100644
index f9e91a1..0000000
--- a/trunk/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Created by (org.apache.poi.hssf.record.formula.function.ExcelFileFormatDocFunctionExtractor)
-# from source file 'excelfileformat.odt' (size=356107, md5=0x8f789cb6e75594caf068f8e193004ef4)
-#  ! + some manual edits !
-# See https://issues.apache.org/ooo/show_bug.cgi?id=125837 for difference in "FIXED"
-#
-#Columns: (index, name, minParams, maxParams, returnClass, paramClasses, isVolatile, hasFootnote )
-
-# Built-In Sheet Functions in BIFF2
-0	COUNT	0	30	V	R		
-1	IF	2	3	R	V R R		
-2	ISNA	1	1	V	V		
-3	ISERROR	1	1	V	V		
-4	SUM	0	30	V	R		
-5	AVERAGE	1	30	V	R		
-6	MIN	1	30	V	R		
-7	MAX	1	30	V	R		
-8	ROW	0	1	V	R		
-9	COLUMN	0	1	V	R		
-10	NA	0	0	V	-		
-11	NPV	2	30	V	V R		
-12	STDEV	1	30	V	R		
-13	DOLLAR	1	2	V	V V		
-14	FIXED	2	2	V	V V		x
-15	SIN	1	1	V	V		
-16	COS	1	1	V	V		
-17	TAN	1	1	V	V		
-18	ATAN	1	1	V	V		
-19	PI	0	0	V	-		
-20	SQRT	1	1	V	V		
-21	EXP	1	1	V	V		
-22	LN	1	1	V	V		
-23	LOG10	1	1	V	V		
-24	ABS	1	1	V	V		
-25	INT	1	1	V	V		
-26	SIGN	1	1	V	V		
-27	ROUND	2	2	V	V V		
-28	LOOKUP	2	3	V	V R R		
-29	INDEX	2	4	R	R V V V		
-30	REPT	2	2	V	V V		
-31	MID	3	3	V	V V V		
-32	LEN	1	1	V	V		
-33	VALUE	1	1	V	V		
-34	TRUE	0	0	V	-		
-35	FALSE	0	0	V	-		
-36	AND	1	30	V	R		
-37	OR	1	30	V	R		
-38	NOT	1	1	V	V		
-39	MOD	2	2	V	V V		
-40	DCOUNT	3	3	V	R R R		
-41	DSUM	3	3	V	R R R		
-42	DAVERAGE	3	3	V	R R R		
-43	DMIN	3	3	V	R R R		
-44	DMAX	3	3	V	R R R		
-45	DSTDEV	3	3	V	R R R		
-46	VAR	1	30	V	R		
-47	DVAR	3	3	V	R R R		
-48	TEXT	2	2	V	V V		
-49	LINEST	1	2	A	R R		x
-50	TREND	1	3	A	R R R		x
-51	LOGEST	1	2	A	R R		x
-52	GROWTH	1	3	A	R R R		x
-56	PV	3	5	V	V V V V V		
-# Built-In Sheet Functions in BIFF2
-57	FV	3	5	V	V V V V V		
-58	NPER	3	5	V	V V V V V		
-59	PMT	3	5	V	V V V V V		
-60	RATE	3	6	V	V V V V V V		
-61	MIRR	3	3	V	A V V		
-62	IRR	1	2	V	A V		
-63	RAND	0	0	V	-	x	
-64	MATCH	2	3	V	V R R		
-65	DATE	3	3	V	V V V		
-66	TIME	3	3	V	V V V		
-67	DAY	1	1	V	V		
-68	MONTH	1	1	V	V		
-69	YEAR	1	1	V	V		
-70	WEEKDAY	1	1	V	V		x
-71	HOUR	1	1	V	V		
-72	MINUTE	1	1	V	V		
-73	SECOND	1	1	V	V		
-74	NOW	0	0	V	-	x	
-75	AREAS	1	1	V	R		
-76	ROWS	1	1	V	A		
-77	COLUMNS	1	1	V	A		
-78	OFFSET	3	5	R	R V V V V	x	
-82	SEARCH	2	3	V	V V V		
-83	TRANSPOSE	1	1	A	A		
-86	TYPE	1	1	V	V		
-97	ATAN2	2	2	V	V V		
-98	ASIN	1	1	V	V		
-99	ACOS	1	1	V	V		
-100	CHOOSE	2	30	R	V R		
-101	HLOOKUP	3	3	V	V R R		x
-102	VLOOKUP	3	3	V	V R R		x
-105	ISREF	1	1	V	R		
-109	LOG	1	2	V	V V		
-111	CHAR	1	1	V	V		
-112	LOWER	1	1	V	V		
-113	UPPER	1	1	V	V		
-114	PROPER	1	1	V	V		
-115	LEFT	1	2	V	V V		
-116	RIGHT	1	2	V	V V		
-117	EXACT	2	2	V	V V		
-118	TRIM	1	1	V	V		
-119	REPLACE	4	4	V	V V V V		
-120	SUBSTITUTE	3	4	V	V V V V		
-121	CODE	1	1	V	V		
-124	FIND	2	3	V	V V V		
-125	CELL	1	2	V	V R	x	
-126	ISERR	1	1	V	V		
-127	ISTEXT	1	1	V	V		
-128	ISNUMBER	1	1	V	V		
-129	ISBLANK	1	1	V	V		
-130	T	1	1	V	R		
-131	N	1	1	V	R		
-140	DATEVALUE	1	1	V	V		
-141	TIMEVALUE	1	1	V	V		
-142	SLN	3	3	V	V V V		
-143	SYD	4	4	V	V V V V		
-144	DDB	4	5	V	V V V V V		
-148	INDIRECT	1	2	R	V V	x	
-162	CLEAN	1	1	V	V		
-163	MDETERM	1	1	V	A		
-164	MINVERSE	1	1	A	A		
-165	MMULT	2	2	A	A A		
-167	IPMT	4	6	V	V V V V V V		
-168	PPMT	4	6	V	V V V V V V		
-169	COUNTA	0	30	V	R		
-183	PRODUCT	0	30	V	R		
-184	FACT	1	1	V	V		
-189	DPRODUCT	3	3	V	R R R		
-190	ISNONTEXT	1	1	V	V		
-193	STDEVP	1	30	V	R		
-194	VARP	1	30	V	R		
-195	DSTDEVP	3	3	V	R R R		
-196	DVARP	3	3	V	R R R		
-197	TRUNC	1	1	V	V		x
-198	ISLOGICAL	1	1	V	V		
-199	DCOUNTA	3	3	V	R R R		
-# New Built-In Sheet Functions in BIFF3
-49	LINEST	1	4	A	R R V V		x
-50	TREND	1	4	A	R R R V		x
-51	LOGEST	1	4	A	R R V V		x
-52	GROWTH	1	4	A	R R R V		x
-197	TRUNC	1	2	V	V V		x
-204	YEN	1	2	V	V V		x
-205	FINDB	2	3	V	V V V		
-206	SEARCHB	2	3	V	V V V		
-207	REPLACEB	4	4	V	V V V V		
-208	LEFTB	1	2	V	V V		
-209	RIGHTB	1	2	V	V V		
-210	MIDB	3	3	V	V V V		
-211	LENB	1	1	V	V		
-212	ROUNDUP	2	2	V	V V		
-213	ROUNDDOWN	2	2	V	V V		
-214	ASC	1	1	V	V		
-215	JIS	1	1	V	V		x
-219	ADDRESS	2	5	V	V V V V V		
-220	DAYS360	2	2	V	V V		x
-221	TODAY	0	0	V	-	x	
-222	VDB	5	7	V	V V V V V V V		
-227	MEDIAN	1	30	V	R ...		
-228	SUMPRODUCT	1	30	V	A ...		
-229	SINH	1	1	V	V		
-230	COSH	1	1	V	V		
-231	TANH	1	1	V	V		
-232	ASINH	1	1	V	V		
-233	ACOSH	1	1	V	V		
-234	ATANH	1	1	V	V		
-235	DGET	3	3	V	R R R		
-244	INFO	1	1	V	V		
-# New Built-In Sheet Functions in BIFF4
-14	FIXED	1	3	V	V V V		x
-204	USDOLLAR	1	2	V	V V		x
-215	DBCS	1	1	V	V		x
-216	RANK	2	3	V	V R V		
-247	DB	4	5	V	V V V V V		
-252	FREQUENCY	2	2	A	R R		
-261	ERROR.TYPE	1	1	V	V		
-269	AVEDEV	1	30	V	R ...		
-270	BETADIST	3	5	V	V V V V V		
-271	GAMMALN	1	1	V	V		
-272	BETAINV	3	5	V	V V V V V		
-273	BINOMDIST	4	4	V	V V V V		
-274	CHIDIST	2	2	V	V V		
-275	CHIINV	2	2	V	V V		
-276	COMBIN	2	2	V	V V		
-277	CONFIDENCE	3	3	V	V V V		
-278	CRITBINOM	3	3	V	V V V		
-279	EVEN	1	1	V	V		
-280	EXPONDIST	3	3	V	V V V		
-281	FDIST	3	3	V	V V V		
-282	FINV	3	3	V	V V V		
-283	FISHER	1	1	V	V		
-284	FISHERINV	1	1	V	V		
-285	FLOOR	2	2	V	V V		
-286	GAMMADIST	4	4	V	V V V V		
-287	GAMMAINV	3	3	V	V V V		
-288	CEILING	2	2	V	V V		
-289	HYPGEOMDIST	4	4	V	V V V V		
-290	LOGNORMDIST	3	3	V	V V V		
-291	LOGINV	3	3	V	V V V		
-292	NEGBINOMDIST	3	3	V	V V V		
-293	NORMDIST	4	4	V	V V V V		
-294	NORMSDIST	1	1	V	V		
-295	NORMINV	3	3	V	V V V		
-296	NORMSINV	1	1	V	V		
-297	STANDARDIZE	3	3	V	V V V		
-298	ODD	1	1	V	V		
-299	PERMUT	2	2	V	V V		
-300	POISSON	3	3	V	V V V		
-301	TDIST	3	3	V	V V V		
-302	WEIBULL	4	4	V	V V V V		
-303	SUMXMY2	2	2	V	A A		
-304	SUMX2MY2	2	2	V	A A		
-305	SUMX2PY2	2	2	V	A A		
-306	CHITEST	2	2	V	A A		
-307	CORREL	2	2	V	A A		
-308	COVAR	2	2	V	A A		
-309	FORECAST	3	3	V	V A A		
-310	FTEST	2	2	V	A A		
-311	INTERCEPT	2	2	V	A A		
-312	PEARSON	2	2	V	A A		
-313	RSQ	2	2	V	A A		
-314	STEYX	2	2	V	A A		
-315	SLOPE	2	2	V	A A		
-316	TTEST	4	4	V	A A V V		
-317	PROB	3	4	V	A A V V		
-318	DEVSQ	1	30	V	R ...		
-319	GEOMEAN	1	30	V	R ...		
-320	HARMEAN	1	30	V	R ...		
-321	SUMSQ	0	30	V	R ...		
-322	KURT	1	30	V	R ...		
-323	SKEW	1	30	V	R ...		
-324	ZTEST	2	3	V	R V V		
-325	LARGE	2	2	V	R V		
-326	SMALL	2	2	V	R V		
-327	QUARTILE	2	2	V	R V		
-328	PERCENTILE	2	2	V	R V		
-329	PERCENTRANK	2	3	V	R V V		
-330	MODE	1	30	V	A		
-331	TRIMMEAN	2	2	V	R V		
-332	TINV	2	2	V	V V		
-# New Built-In Sheet Functions in BIFF5
-70	WEEKDAY	1	2	V	V V		x
-101	HLOOKUP	3	4	V	V R R V		x
-102	VLOOKUP	3	4	V	V R R V		x
-220	DAYS360	2	3	V	V V V		x
-336	CONCATENATE	0	30	V	V		
-337	POWER	2	2	V	V V		
-342	RADIANS	1	1	V	V		
-343	DEGREES	1	1	V	V		
-344	SUBTOTAL	2	30	V	V R		
-345	SUMIF	2	3	V	R V R		
-346	COUNTIF	2	2	V	R V		
-347	COUNTBLANK	1	1	V	R		
-350	ISPMT	4	4	V	V V V V		
-351	DATEDIF	3	3	V	V V V		
-352	DATESTRING	1	1	V	V		
-353	NUMBERSTRING	2	2	V	V V		
-354	ROMAN	1	2	V	V V		
-# New Built-In Sheet Functions in BIFF8
-358	GETPIVOTDATA	2	30	V	V R ...		
-359	HYPERLINK	1	2	V	V V		
-360	PHONETIC	1	1	V	R		
-361	AVERAGEA	1	30	V	R ...		
-362	MAXA	1	30	V	R ...		
-363	MINA	1	30	V	R ...		
-364	STDEVPA	1	30	V	R ...		
-365	VARPA	1	30	V	R ...		
-366	STDEVA	1	30	V	R ...		
-367	VARA	1	30	V	R ...		
diff --git a/trunk/src/resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx b/trunk/src/resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx
deleted file mode 100644
index ababa93..0000000
--- a/trunk/src/resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml b/trunk/src/resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml
deleted file mode 100644
index 0a8db65..0000000
--- a/trunk/src/resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<p:notesMaster xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main"><p:cSld><p:bg><p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef></p:bg><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Header Placeholder 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="hdr" sz="quarter"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="3962400" cy="342900"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:endParaRPr lang="cs-CZ"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Date Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="5180013" y="0"/><a:ext cx="3962400" cy="342900"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"/><a:lstStyle><a:lvl1pPr algn="r"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{B7268E1E-0E44-426D-905E-8AD9B19D2182}" type="datetimeFigureOut"><a:rPr lang="cs-CZ" smtClean="0"/><a:t>1.7.2013</a:t></a:fld><a:endParaRPr lang="cs-CZ"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Slide Image Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1" noRot="1" noChangeAspect="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldImg" idx="2"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="2857500" y="512763"/><a:ext cx="3429000" cy="2566987"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom><a:noFill/><a:ln w="12700"><a:solidFill><a:prstClr val="black"/></a:solidFill></a:ln></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle/><a:p><a:endParaRPr lang="cs-CZ"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Notes Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" sz="quarter" idx="3"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="914400" y="3251200"/><a:ext cx="7315200" cy="3081338"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"/><a:lstStyle/><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="cs-CZ"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Footer Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="4"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="0" y="6502400"/><a:ext cx="3962400" cy="341313"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="b"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:endParaRPr lang="cs-CZ"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="7" name="Slide Number Placeholder 6"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="5"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="5180013" y="6502400"/><a:ext cx="3962400" cy="341313"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="b"/><a:lstStyle><a:lvl1pPr algn="r"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{871B2431-D351-4C6E-A3CF-9DFAC0E3E050}" type="slidenum"><a:rPr lang="cs-CZ" smtClean="0"/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="cs-CZ"/></a:p></p:txBody></p:sp></p:spTree><p:extLst><p:ext uri="{BB962C8B-B14F-4D97-AF65-F5344CB8AC3E}"><p14:creationId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="1798889115"/></p:ext></p:extLst></p:cSld><p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/><p:notesStyle><a:lvl1pPr marL="0" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="457200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="914400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1371600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="1828800" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2286000" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="2743200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3200400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="3657600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl9pPr></p:notesStyle></p:notesMaster>
\ No newline at end of file
diff --git a/trunk/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl b/trunk/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
deleted file mode 100644
index 7cb715a..0000000
--- a/trunk/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
+++ /dev/null
@@ -1,993 +0,0 @@
-# vsdump: test program to dump and parse content of vsd file
-#
-# Copyright (C) 2006-2007	Valek Filippov (frob@df.ru)
-#
-# This file is dual-licensed (GPLv3 and ASLv2).
-# 
-# =======================================================================
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-# =======================================================================
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of version 3 or later of the GNU General Public
-# License as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-# USA
-# =======================================================================
-#
-# version 0.0.45
-#
-# Need to extend with 'format' field for conversion length (inch->mm), angles(rad->degree) and enums (e.g.
-# for aligns -- left/right/justify etc.
-#
-# The Format description for .tbl file.
-# Lines start with # are comments.
-# Every list of commands starts with 'start ch_type'
-# and ends with 'end'.
-# In between start and end are space-separeted lines
-# with 'type', 'offset', 'name' values.  
-# Atm I use 'atoi', so only decimal value is allowed for ch_type, type and offset.
-# The possible values for 'type' are:
-# 0..7  - flag at bit 0..7 at offset 'offset'
-# 8	  - 1 byte value
-# 9	  - 8 bytes IEEE-754 fraction
-# 10(a) - name of chunk (we must start with a name atm, because with parse for printing)
-# 11(b) - offset to start of blocks 
-# 12(c) - text block
-# 13(d) - some "name" from the list
-# 14(e) - one byte "function" from the list
-# 15(f) - some "function" from the list
-# 16	  - string, next byte is length terminating '0' wasn't added to length
-# 17	  - 'ForeignData'
-# 18	  - Dump it to file as-is
-# 25    - 2 bytes LE
-# 26    - 4 bytes LE
-# 27	  - Tabs? [experimental]
-# 21	- offset to start of blocks in version 11
-# 28    - extension for image files [experimental]
-# 29    - num of parts and type for OLE [experimental]
-# 30    - 3 bytes RGB-color
-# 31    - 9 bytes -- 1st is 'Unit', + 8 bytes IEEE-754 fraction
-
-# Quick workaround for losing of 1st table
-start 10
-end
-
-start 12
-17 0 ForeignData
-end
-
-start 13
-10 0 OLE_Info
-29 0 0
-18 0 0
-end
-
-start 14
-10 0 Text
-12 8 0
-18 0 0
-end
-
-start 16
-10 0 Data1
-12 0 0
-end
-
-start 17
-10 0 Data2
-12 0 0
-end
-
-start 18
-10 0 Data3
-12 0 0
-end
-
-start 21
-10 0 Stream15
-9 53 Center X
-9 61 Center Y
-18 0 0
-end
-
-start 24
-10 0 Stream18
-18 0 0
-end
-
-start 25
-10 0 FaceName
-16 24 0
-end
-
-start 26
-10 0 Stream1a
-18 0 0
-end
-
-start 31
-17 0 OLEData
-end
-
-start 40
-10 0 Unknown 0x28
-9 39 Unknown1
-9 47 Unknown2
-18 0 0
-end
-
-start 44
-10 0 Unknown 0x2c
-18 0 0
-end
-
-#seems to be text string
-start 45
-10 0 Unknown 0x2d
-12 0 0
-end
-
-start 49
-10 0 Stream31
-18 0 0
-end
-
-start 66
-10 0 Unknown 0x42
-18 0 0
-end
-
-start 70
-10 0 PageSheet
-18 0 0
-end
-
-start 71
-10 0 Shape ID Type="Group"
-18 0 0
-end
-
-start 72
-10 0 Shape ID Type="Shape"
-26 53 LineStyle
-26 61 FillStyle
-26 69 TextStyle
-18 0 0
-end
-
-start 74
-10 0 StyleSheet
-26 53 LineStyle
-26 61 FillStyle
-26 69 TextStyle
-18 0 0
-end
-
-start 77
-10 0 Shape ID Type="Guide"
-18 0 0
-end
-
-
-start 78
-10 0 Shape ID Type="Foreign"
-18 0 0
-end
-
-start 79
-10 0 DocumentSheet
-26 53 LineStyle
-26 61 FillStyle
-26 69 TextStyle
-18 0 0
-end
-
-start 100
-10 0 Unknown 0x64
-18 0 0
-end
-
-start 101
-10 0 ShapeList
-18 0 0
-end
-
-start 102
-10 0 Unknown 0x66
-18 0 0
-end
-
-start 103
-10 0 Unknown 0x67
-18 0 0
-end
-
-start 104
-10 0 PropList
-18 0 0
-end
-
-start 105
-10 0 CharList
-18 0 0
-end
-
-start 106
-10 0 ParaList
-18 0 0
-end
-
-start 107
-10 0 Unknown 0x6b
-18 0 0
-end
-
-start 108
-10 0 GeomList
-18 0 0
-end
-
-start 109
-10 0 Unknown 0x6d
-18 0 0
-end
-
-start 110
-10 0 Unknown 0x6e
-18 0 0
-end
-
-start 111
-10 0 Unknown 0x6f
-18 0 0
-end
-
-start 112
-10 0 Unknown 0x70
-18 0 0
-end
-
-start 113
-10 0 ConnectionList
-18 0 0
-end
-
-start 114
-10 0 Unknown 0x72
-18 0 0
-end
-
-start 115
-10 0 Unknown 0x73
-18 0 0
-end
-
-start 116
-10 0 Unknown 0x74
-18 0 0
-end
-
-start 117
-10 0 Unknown 0x75
-18 0 0
-end
-
-start 118
-10 0 Unknown 0x76
-18 0 0
-end
-
-start 130
-10 0 Unknown 0x82
-18 0 0
-end
-
-start 131
-10 0 ShapeID
-18 0 0
-end
-
-start 132
-10 0 Event
-8 20 TheText
-11 36 BlockStarts
-21 36 BlockStarts
-18 0 0
-end
-
-start 133
-10 0 Line
-31 19 LineWeight
-8 28 LineColor
-8 33 LinePattern
-9 35 Rounding
-8 43 EndArrowSize
-8 44 BeginArrow
-8 45 EndArrow
-8 47 BeginArrowSize
-1 50 Color
-2 50 Pattern
-3 50 RoundingCap
-4 50 LineEndEnd
-5 50 LineEndBegin
-6 50 EndSize
-7 50 SqueareCap
-0 51 BeginSize
-11 54 BlockStarts
-21 54 BlockStarts
-18 0 0
-end
-
-start 134
-10 0 Fill
-8 19 FillForegnd
-30 25 FillBkgnd
-8 29 FillPattern
-30 31 ShdwForegnd
-8 35 ShdwBkgnd
-8 40 ShdwPattern
-31 42 ShapeShdwOffsetX
-31 51 ShapeShdwOffsetY
-9 69 ShapeShdwScaleFactor
-11 44 BlockStarts
-21 80 BlockStarts
-18 0 0
-end
-
-start 135
-10 0 TextBlock
-31 19 LeftMargin
-31 28 RightMargin
-31 37 TopMargin
-31 46 BottomMargin
-8 55 VerticalAlign
-30 56 TextBkgnd
-9 62 DefaultTabStop
-8 82 TextDirection
-11 90 BlockStarts
-21 111 BlockStarts
-18 0 0
-end
-
-start 136
-10 0 Tabs
-11 26 BlocksStart
-21 26 BlocksStart
-18 0 0
-end
-
-start 137
-10 0 Geometry
-0 19 NoFill
-1 19 NoLine
-2 19 NoShow
-3 19 NoSnap
-21 22 BlocksStart
-18 0 0
-end
-
-start 138
-10 0 MoveTo
-9 20 X
-9 29 Y
-11 39 BlocksStart
-21 39 BlocksStart
-end
-
-start 139
-10 0 LineTo
-9 20 X
-9 29 Y
-11 39 BlocksStart
-21 39 BlocksStart
-end
-
-start 140
-10 0 ArcTo
-9 20 X
-9 29 Y
-9 38 A
-11 48 BlocksStart
-18 0 0
-end
-
-start 141
-10 0 InfiniteLine
-9 20 X
-9 29 Y
-9 37 A
-9 45 B
-11 57 BlocksStart
-18 0 0
-end
-
-start 143
-10 0 Ellipse
-9 20 X
-9 29 Y
-9 38 A
-9 47 B
-9 56 C
-9 65 D
-11 75 BlocksStart
-18 0 0
-end
-
-start 144
-10 0 EllipticalArcTo
-31 19 X
-31 28 Y
-31 37 A
-31 46 B
-31 55 C
-31 64 D
-11 75 BlocksStart
-18 0 0
-end
-
-start 146
-10 0 PageProps
-9 20 PageWidth
-9 29 PageHeight
-9 38 ShdwOffsetX
-9 47 ShdwOffsetY
-9 56 PageScale
-9 65 DrawingScale
-8 73 DrawingSizeType
-8 74 DrawingScaleType
-0 93 InhibitSnap
-11 150 BlockStarts
-18 0 0
-end
-
-start 147
-10 0 StyleProp
-8 19 EnableLineProps
-8 20 EnableFillProps
-8 21 EnableTextProps
-8 22 HideForApply
-11 26 BlocksStart
-21 26 BlocksStart
-18 0 0
-end
-
-start 148
-10 0 Char
-25 23 FontNum
-30 26 Color
-8 29 Transparency*255/100%
-0 30 Bold
-1 30 Italic
-2 30 Underline
-3 30 Smallcaps
-0 31 AllCaps
-1 31 InitCaps
-0 32 Subscript
-1 32 Superscipt
-25 33 Scale*100 %
-8 35 LangCode
-31 36 Size
-25 46 Spacing pt*200
-25 56 AsianFont
-25 58 ComplexScriptFont
-8 60 LocalizeFont
-25 88 LangID
-11 54 BlocksStart
-21 107 BlocksStart
-18 0 0
-end
-
-start 149
-10 0 Para
-31 23 IndFirst
-31 32 IndLeft
-31 41 IndRight
-31 50 SpLine
-31 59 SpBefore
-31 68 SpAfter
-8 77 HorizAlign
-8 78 Bullet
-11 92 BlockStarts
-21 142 BlockStarts
-18 0 0
-end
-
-start 150
-10 0 Tabs
-27 0 TabsID
-11 48 BlockStarts
-18 0 0
-end
-
-start 151
-10 0 Tabs
-27 0 TabsID
-11 139 BlockStarts
-18 0 0
-end
-
-start 181
-10 0 Tabs
-27 0 TabsID
-11 708 BlockStarts
-18 0 0
-end
-
-start 152
-10 0 Foreign
-9 20 IndFirst
-9 29 IndLeft
-9 38 IndRight
-9 47 SpLine
-28 68 Ext
-18 0 0
-end
-
-start 153
-10 0 Connection
-31 19 Width
-31 28 Height
-31 37 DirX/A
-31 46 DirY/B
-8 55 Type/C
-11 67 BlockStarts
-21 67 BlockStarts
-18 0 0
-end
-
-start 155
-10 0 XForm
-9 20 PinX
-9 29 PinY
-9 38 Width
-9 47 Height
-9 56 LocPinX
-9 65 LocPinY
-9 74 Angle
-8 82 FlipX
-8 83 FlipY
-8 84 ResizeMode
-11 88 BlockStarts
-21 88 BlockStarts
-18 0 0
-end
-
-start 156
-10 0 TextXForm
-9 20 TxtPinX
-9 29 TxtPinY
-31 37 TxtWidth
-9 47 TxtHeight
-9 56 TxtLocPinX
-9 65 TxtLocPinY
-9 74 TxtAngle
-11 88 BlockStarts
-21 88 BlockStarts
-18 0 0
-end
-
-start 157
-10 0 XForm1D
-9 20 BeginX
-9 29 BeginY
-9 38 EndX
-9 47 EndY
-11 57 BlockStarts
-21 57 BlockStarts
-end
-
-start 158
-10 0 Scratch
-9 20 X
-9 29 Y
-9 38 A
-9 47 B
-9 56 C
-9 65 D
-11 75 BlockStarts
-18 0 0
-end
-
-start 159
-10 0 Alignment
-9 20 AlignLeft
-9 29 AlignCenter
-9 38 AlignRight
-9 47 AlignTop
-9 56 AlignMiddle
-9 65 AlignBottom
-11 75 BlockStarts
-21 79 BlockStarts
-18 0 0
-end
-
-start 160
-10 0 Protection
-8 19 LockWidth
-8 20 LockHeight
-8 21 LockMoveX
-8 22 LockMoveY
-8 23 LockAspect
-8 24 LockDelete
-8 25 LockBegin
-8 26 LockEnd
-8 27 LockRotate
-8 28 LockCrop
-8 29 LockVtxEdit
-8 30 LockTextEdit
-8 31 LockFormat
-8 32 LockGroup
-8 33 LockCalcWH
-8 34 LockSelect
-8 35 LockCustProp
-11 43 BlockStarts
-21 43 BlockStarts
-18 0 0
-end
-
-start 161
-10 0 TextFields
-18 0 0
-end
-
-start 162
-10 0 Control
-9 20 X
-9 29 Y
-9 38 XDyn
-9 47 YDyn
-8 55 XCon
-8 56 YCon
-0 57 CanGlue
-11 60 BlockStarts
-21 60 BlockStarts
-18 0 0
-end
-
-start 163
-10 0 Help
-11 49 BlockStarts
-21 49 BlockStarts
-18 0 0
-end
-
-start 164
-10 0 Misc
-0 19 NoObjHandles
-1 19 NonPrinting
-2 19 NoCtlHandles
-3 19 NoAlignBox
-4 19 UpdateAlignBox
-5 19 HideText
-8 20 DynFeedback
-8 21 GlueType
-8 22 WalkPreference
-25 25 ObjType
-0 35 IsDropSource
-1 35 NoLiveDynamics
-25 37 LangID
-11 42 BlockStarts
-21 64 BlockStarts
-18 0 0
-end
-
-start 165
-10 0 SplineStart
-9 20 X
-9 29 Y
-9 37 A
-9 45 B
-9 53 C
-8 61 D
-11 65 BlockStarts
-18 0 0
-end
-
-start 166
-10 0 SplineKnot
-9 20 X
-9 29 Y
-9 37 A
-11 47 BlockStarts
-18 0 0
-end
-
-start 167
-10 0 LayerMem
-11 25 BlockStarts
-21 25 BlockStarts
-18 0 0
-end
-
-# Transparency 255 - 100%
-start 168
-10 0 Layer
-30 27 Color
-8 31 Transparency
-8 33 Visible
-8 34 Print
-8 35 Active
-8 36 Lock
-8 37 Snap
-8 38 Glue
-11 52 BlockStarts
-21 52 BlockStarts
-18 0 0
-end
-
-start 169
-10 0 Act
-8 40 Checked
-8 41 Disabled
-0 42 ReadOnly
-1 42 Invisible
-2 42 BeginGroup
-11 47 BlockStarts
-21 76 BlockStarts
-18 0 0
-end
-
-start 170
-10 0 Control
-9 20 X
-9 29 Y
-9 38 XDyn
-9 47 YDyn
-8 55 XBehavior
-8 56 YBehavior
-0 57 CanGlue
-11 66 BlockStarts
-21 66 BlockStarts
-18 0 0
-end
-
-start 180
-10 0 User-defined Cells
-9 20 Value
-11 34 BlockStarts
-21 34 BlockStarts
-18 0 0
-end
-
-start 182
-10 0 CustomProps
-9 20 Value
-8 44 Type
-0 46 Invisible
-1 46 Ask
-11 55 BlockStarts
-18 0 0
-end
-
-start 183
-10 0 RulerGrid
-8 19 XRulerDensity
-8 20 XRulerDensity
-31 21 Unknown1
-31 30 Unknown2
-31 39 XRulerOrigin
-31 48 YRulerOrigin
-8 57 XGridDensity
-8 58 YGridDensity
-31 59 XGridSpacing
-31 68 YGridSpacing
-31 77 XGridOrigin
-31 86 YGridOrigin
-11 98 BlockStarts
-21 98 BlockStarts
-18 0 0
-end
-
-start 185
-10 0 Connection
-31 19 Width
-31 28 Height
-31 37 DirX/A
-31 46 DirY/B
-8 55 Type/C
-11 67 BlockStarts
-21 67 BlockStarts
-18 0 0
-end
-
-start 186
-10 0 ConnectionPoints
-9 20 Width
-9 29 Height
-11 79 BlockStarts
-18 0 0
-end
-
-start 188
-10 0 DocProps
-25 24 DocLangID
-18 0 0
-end
-
-start 189
-10 0 Image
-9 19 Gamma
-25 27 Contrast*100 (%)
-25 29 Brightness*100 (%)
-25 31 Sharpen*100 (%)
-25 33 Blur*100 (%)
-25 35 Denoise*100 (%)
-25 37 Transparency*100 (%)
-11 64 BlockStarts
-21 64 BlockStarts
-18 0 0
-end
-
-start 190
-10 0 Group
-8 19 SelectMode
-8 20 DisplayMode
-0 21 IsDropTarget
-1 21 IsSnapTarget
-2 21 IsTextEditTarget
-3 21 DontMoveChildren
-11 44 BlocksStart
-21 44 BlocksStart
-end
-
-start 191
-10 0 Layout
-0 19 ShapePermeableX
-1 19 ShapePermeableY
-2 19 ShapePermeablePlace
-8 20 ShapeFixedCode
-8 21 ShapePlowCode
-8 22 ShapeRouteStyle
-8 24 ConFixedCode
-8 25 ConLineJumpCode
-8 26 ConLineJumpStyle
-8 28 ConLineJumpDirX
-8 29 ConLineJumpDirY
-11 57 BlockStarts
-21 57 BlockStarts
-18 0 0
-end
-
-start 192
-10 0 PageLayout
-0 19 ResizePage
-1 19 EnableGrid
-2 19 DynamicOff
-3 19 CtrlAsInput
-8 20 PlaceStyle
-8 21 RouteStyle
-8 22 PlaceDepth
-8 23 PlowCode
-8 24 LineJumpCode
-8 25 LineJumpStyle
-8 26 PageLineJumpDirX
-8 27 PageLineJumpDirY
-9 29 LineToNodeX
-9 38 LineToNodeY
-9 47 BlockSizeX
-9 56 BlockSizeY
-9 65 AvenueSizeX
-9 74 AvenueSizeY
-9 83 LineToLineX
-9 92 LineToLineY
-9 100 LineJumpFactorX
-9 108 LineJumpFactorY
-8 116 LineAdjustFrom
-8 117 LineAdjustTo
-11 163 Blocks start
-21 163 Blocks start
-end
-
-start 193
-10 0 PolylineTo
-9 20 X
-9 29 Y
-18 0 0
-end
-
-
-start 195
-10 0 NURBSTo
-9 20 X
-9 29 Y
-9 37 A
-9 45 B
-9 53 C
-9 61 D
-11 80 BlocksStart
-21 80 BlocksStart
-18 0 0
-end
-
-start 196
-10 0 Hyperlink
-0 39 NewWindow
-2 39 Default
-11 65 BlocksStart
-18 0 0
-end
-
-start 197
-10 0 Reviewer
-8 28 ColorRed
-8 29 ColorGreen
-8 30 ColorBlue
-26 31 ReviewerID
-26 35 CurrentIndex
-11 57 BlocksStart
-21 57 BlocksStart
-18 0 0
-end
-
-start 198
-10 0 Annotation
-18 0 0
-end
-
-start 199
-10 0 SmartTagDef
-18 0 0
-end
-
-start 200
-10 0 PrintProps
-31 19 PageLeftMargin
-31 28 PageRightMargin
-31 37 PageTopMargin
-31 46 PageBottomMargin
-9 55 ScaleX
-9 63 ScaleY
-25 71 PagesX
-25 73 PagesY
-8 76 PrintPageOrientation
-25 77 PaperKind
-25 79 PaperSource
-11 91 BlocksStart
-21 91 BlocksStart
-18 0 0
-end
-
-start 201
-10 0 Unknown 0xc9
-18 0 0
-end
-
-start 209
-10 0 NURBSTo E-cell
-9 35 1st fr of NURBSTo
-9 43 3 bytes are here, need to map
-9 51 2nd fr
-9 59 3rd fr
-9 67 4th byte
-9 75 5th byte
-9 83 4th fr
-9 91 5th fr
-9 99 6th byte
-9 107 7th byte
-9 115 6th fr
-9 123 7th fr
-9 131 8th byte
-9 139 9th byte
-18 0 0
-end
diff --git a/trunk/src/resources/scratchpad/org/apache/poi/hslf/data/empty.ppt b/trunk/src/resources/scratchpad/org/apache/poi/hslf/data/empty.ppt
deleted file mode 100644
index 20d2398..0000000
--- a/trunk/src/resources/scratchpad/org/apache/poi/hslf/data/empty.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/src/resources/version/Version.java.template b/trunk/src/resources/version/Version.java.template
deleted file mode 100644
index 716ec91..0000000
--- a/trunk/src/resources/version/Version.java.template
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-/**
- * Administrative class to keep track of the version number of the 
- *  POI release.
- *
- * This class implements the upcoming standard of having 
- *  org.apache.project-name.Version.getVersion() be a standard 
- *  way to get version information.
- */
-public class Version {
-	private static final String VERSION_STRING = "@VERSION@";
-	private static final String RELEASE_DATE = "@DSTAMP@";
-
-	/**
-	 * Return the basic version string, of the form
-	 *  nn.nn(.nn)
-	 */
-	public static String getVersion() {
-		return VERSION_STRING;
-	}
-
-	/**
-	 * Return the date of the release / build
-	 */
-	public static String getReleaseDate() {
-		return RELEASE_DATE;
-	}
-
-	/**
-	 * Name of product: POI
-	 */
-	public static String getProduct() {
-		return "POI";
-	}
-	/**
-	 * Implementation Language: Java
-	 */
-	public static String getImplementationLanguage() {
-		return "Java";
-	}
-
-	/**
-	 * Prints the version to the command line
-	 */
-	public static void main(String[] args) {
-		System.out.println(
-			"Apache " + getProduct() + " " +
-			getVersion() + " (" + getReleaseDate() + ")"
-		);
-	}
-}
diff --git a/trunk/src/scratchpad/models/poi-hdf.zargo b/trunk/src/scratchpad/models/poi-hdf.zargo
deleted file mode 100644
index dde1132..0000000
--- a/trunk/src/scratchpad/models/poi-hdf.zargo
+++ /dev/null
Binary files differ
diff --git a/trunk/src/scratchpad/src/org/apache/poi/POIReadOnlyDocument.java b/trunk/src/scratchpad/src/org/apache/poi/POIReadOnlyDocument.java
deleted file mode 100644
index 3b3eca5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/POIReadOnlyDocument.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import java.io.File;
-import java.io.OutputStream;
-
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-
-/**
- * This holds the common functionality for all read-only
- *  POI Document classes, i.e. ones which don't support writing.
- *  
- *  @since POI 3.15 beta 3
- */
-public abstract class POIReadOnlyDocument extends POIDocument {
-    public POIReadOnlyDocument(DirectoryNode dir) {
-        super(dir);
-    }
-    public POIReadOnlyDocument(NPOIFSFileSystem fs) {
-        super(fs);
-    }
-    public POIReadOnlyDocument(OPOIFSFileSystem fs) {
-        super(fs);
-    }
-    public POIReadOnlyDocument(POIFSFileSystem fs) {
-        super(fs);
-    }
-
-    /**
-     * Note - writing is not yet supported for this file format, sorry.
-     * 
-     * @throws IllegalStateException If you call the method, as writing is not supported
-     */
-    @Override
-    public void write() {
-        throw new IllegalStateException("Writing is not yet implemented for this Document Format");
-    }
-    /**
-     * Note - writing is not yet supported for this file format, sorry.
-     * 
-     * @throws IllegalStateException If you call the method, as writing is not supported
-     */
-    @Override
-    public void write(File file) {
-        throw new IllegalStateException("Writing is not yet implemented for this Document Format");
-    }
-    /**
-     * Note - writing is not yet supported for this file format, sorry.
-     * 
-     * @throws IllegalStateException If you call the method, as writing is not supported
-     */
-    @Override
-    public void write(OutputStream out) {
-        throw new IllegalStateException("Writing is not yet implemented for this Document Format");
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/extractor/OLE2ScratchpadExtractorFactory.java b/trunk/src/scratchpad/src/org/apache/poi/extractor/OLE2ScratchpadExtractorFactory.java
deleted file mode 100644
index 115b74a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/extractor/OLE2ScratchpadExtractorFactory.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.extractor;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.hdgf.extractor.VisioTextExtractor;
-import org.apache.poi.hpbf.extractor.PublisherTextExtractor;
-import org.apache.poi.hslf.extractor.PowerPointExtractor;
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.extractor.OutlookTextExtactor;
-import org.apache.poi.hwpf.OldWordFileFormatException;
-import org.apache.poi.hwpf.extractor.Word6Extractor;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.Entry;
-
-/**
- * Scratchpad-specific logic for {@link OLE2ExtractorFactory} and
- *  {@link org.apache.poi.extractor.ExtractorFactory}, which permit the other two to run with
- *  no Scratchpad jar (though without functionality!)
- * <p>Note - should not be used standalone, always use via the other
- *  two classes</p>
- */
-@SuppressWarnings("WeakerAccess")
-public class OLE2ScratchpadExtractorFactory {
-    /**
-     * Look for certain entries in the stream, to figure it
-     * out what format is desired
-     * Note - doesn't check for core-supported formats!
-     * Note - doesn't check for OOXML-supported formats
-     */
-    public static POITextExtractor createExtractor(DirectoryNode poifsDir) throws IOException {
-        if (poifsDir.hasEntry("WordDocument")) {
-            // Old or new style word document?
-            try {
-                return new WordExtractor(poifsDir);
-            } catch (OldWordFileFormatException e) {
-                return new Word6Extractor(poifsDir);
-            }
-        }
-
-        if (poifsDir.hasEntry("PowerPoint Document")) {
-            return new PowerPointExtractor(poifsDir);
-        }
-
-        if (poifsDir.hasEntry("VisioDocument")) {
-            return new VisioTextExtractor(poifsDir);
-        }
-
-        if (poifsDir.hasEntry("Quill")) {
-            return new PublisherTextExtractor(poifsDir);
-        }
-
-        final String[] outlookEntryNames = new String[] {
-                // message bodies, saved as plain text (PtypString)
-                // The first short (0x1000, 0x0047, 0x0037) refer to the Property ID (see [MS-OXPROPS].pdf)
-                // the second short (0x001e, 0x001f, 0x0102) refer to the type of data stored in this entry
-                // https://msdn.microsoft.com/endatatypes.Ex-us/library/cc433490(v=exchg.80).aspx
-                // @see org.apache.poi.hsmf.Types.MAPIType
-                "__substg1.0_1000001E", //PidTagBody ASCII
-                "__substg1.0_1000001F", //PidTagBody Unicode
-                "__substg1.0_0047001E", //PidTagMessageSubmissionId ASCII
-                "__substg1.0_0047001F", //PidTagMessageSubmissionId Unicode
-                "__substg1.0_0037001E", //PidTagSubject ASCII
-                "__substg1.0_0037001F", //PidTagSubject Unicode
-        };
-        for (String entryName : outlookEntryNames) {
-            if (poifsDir.hasEntry(entryName)) {
-                return new OutlookTextExtactor(poifsDir);
-            }
-        }
-
-        throw new IllegalArgumentException("No supported documents found in the OLE2 stream");
-    }
-
-    /**
-     * Returns an array of text extractors, one for each of
-     *  the embedded documents in the file (if there are any).
-     * If there are no embedded documents, you'll get back an
-     *  empty array. Otherwise, you'll get one open
-     *  {@link POITextExtractor} for each embedded file.
-     */
-    public static void identifyEmbeddedResources(POIOLE2TextExtractor ext, List<Entry> dirs, List<InputStream> nonPOIFS) throws IOException {
-        // Find all the embedded directories
-        DirectoryEntry root = ext.getRoot();
-        if (root == null) {
-            throw new IllegalStateException("The extractor didn't know which POIFS it came from!");
-        }
-
-        if (ext instanceof WordExtractor) {
-            // These are in ObjectPool -> _... under the root
-            try {
-                DirectoryEntry op = (DirectoryEntry)
-                        root.getEntry("ObjectPool");
-                Iterator<Entry> it = op.getEntries();
-                while(it.hasNext()) {
-                    Entry entry = it.next();
-                    if(entry.getName().startsWith("_")) {
-                        dirs.add(entry);
-                    }
-                }
-            } catch(FileNotFoundException e) {
-                // ignored here
-            }
-            //} else if(ext instanceof PowerPointExtractor) {
-            // Tricky, not stored directly in poifs
-            // TODO
-        } else if (ext instanceof OutlookTextExtactor) {
-            // Stored in the Attachment blocks
-            MAPIMessage msg = ((OutlookTextExtactor)ext).getMAPIMessage();
-            for (AttachmentChunks attachment : msg.getAttachmentFiles()) {
-                if (attachment.attachData != null) {
-                    byte[] data = attachment.attachData.getValue();
-                    nonPOIFS.add( new ByteArrayInputStream(data) );
-                } else if (attachment.attachmentDirectory != null) {
-                    dirs.add(attachment.attachmentDirectory.getDirectory());
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java
deleted file mode 100644
index c852788..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIReadOnlyDocument;
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.hdgf.pointers.PointerFactory;
-import org.apache.poi.hdgf.streams.PointerContainingStream;
-import org.apache.poi.hdgf.streams.Stream;
-import org.apache.poi.hdgf.streams.StringsStream;
-import org.apache.poi.hdgf.streams.TrailerStream;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * See
- *  http://www.redferni.uklinux.net/visio/
- *  http://www.gnome.ru/projects/docs/vsdocs.html
- *  http://www.gnome.ru/projects/docs/slide1.png
- *  http://www.gnome.ru/projects/docs/slide2.png
- */
-public final class HDGFDiagram extends POIReadOnlyDocument {
-	private static final String VISIO_HEADER = "Visio (TM) Drawing\r\n";
-
-	private byte[] _docstream;
-
-	private short version;
-	private long docSize;
-
-	private Pointer trailerPointer;
-	private TrailerStream trailer;
-
-	private ChunkFactory chunkFactory;
-	private PointerFactory ptrFactory;
-
-	public HDGFDiagram(POIFSFileSystem fs) throws IOException {
-		this(fs.getRoot());
-	}
-	public HDGFDiagram(NPOIFSFileSystem fs) throws IOException {
-		this(fs.getRoot());
-	}
-	public HDGFDiagram(DirectoryNode dir) throws IOException {
-		super(dir);
-
-		// Grab the document stream
-		InputStream is = dir.createDocumentInputStream("VisioDocument");
-		_docstream = IOUtils.toByteArray(is);
-		is.close();
-
-		// Check it's really visio
-		String typeString = new String(_docstream, 0, 20, LocaleUtil.CHARSET_1252 );
-		if(! typeString.equals(VISIO_HEADER)) {
-			throw new IllegalArgumentException("Wasn't a valid visio document, started with " + typeString);
-		}
-
-		// Grab the version number, 0x1a -> 0x1b
-		version = LittleEndian.getShort(_docstream, 0x1a);
-		// Grab the document size, 0x1c -> 0x1f
-		docSize = LittleEndian.getUInt(_docstream, 0x1c);
-		// ??? 0x20 -> 0x23
-
-		// Create the Chunk+Pointer Factories for the document version
-		ptrFactory = new PointerFactory(version);
-		chunkFactory = new ChunkFactory(version);
-
-		// Grab the pointer to the trailer
-		trailerPointer = ptrFactory.createPointer(_docstream, 0x24);
-
-		// Now grab the trailer
-		trailer = (TrailerStream)
-			Stream.createStream(trailerPointer, _docstream, chunkFactory, ptrFactory);
-
-		// Finally, find all our streams
-		trailer.findChildren(_docstream);
-	}
-
-	/**
-	 * Returns the TrailerStream, which is at the root of the
-	 *  tree of Streams.
-	 */
-	public TrailerStream getTrailerStream() { return trailer; }
-	/**
-	 * Returns all the top level streams, which are the streams
-	 *  pointed to by the TrailerStream.
-	 */
-	public Stream[] getTopLevelStreams() { return trailer.getPointedToStreams(); }
-	public long getDocumentSize() { return docSize; }
-
-	/**
-	 * Prints out some simple debug on the base contents of the file.
-	 * @see org.apache.poi.hdgf.dev.VSDDumper
-	 */
-	public void debug() {
-		System.err.println("Trailer is at " + trailerPointer.getOffset());
-		System.err.println("Trailer has type " + trailerPointer.getType());
-		System.err.println("Trailer has length " + trailerPointer.getLength());
-		System.err.println("Trailer has format " + trailerPointer.getFormat());
-
-		for(int i=0; i<trailer.getPointedToStreams().length; i++) {
-			Stream stream = trailer.getPointedToStreams()[i];
-			Pointer ptr = stream.getPointer();
-
-			System.err.println("Looking at pointer " + i);
-			System.err.println("\tType is " + ptr.getType() + "\t\t" + Integer.toHexString(ptr.getType()));
-			System.err.println("\tOffset is " + ptr.getOffset() + "\t\t" + Long.toHexString(ptr.getOffset()));
-			System.err.println("\tAddress is " + ptr.getAddress() + "\t" + Long.toHexString(ptr.getAddress()));
-			System.err.println("\tLength is " + ptr.getLength() + "\t\t" + Long.toHexString(ptr.getLength()));
-			System.err.println("\tFormat is " + ptr.getFormat() + "\t\t" + Long.toHexString(ptr.getFormat()));
-			System.err.println("\tCompressed is " + ptr.destinationCompressed());
-			System.err.println("\tStream is " + stream.getClass());
-
-			if(stream instanceof PointerContainingStream) {
-				PointerContainingStream pcs = (PointerContainingStream)stream;
-
-				if(pcs.getPointedToStreams() != null && pcs.getPointedToStreams().length > 0) {
-					System.err.println("\tContains " + pcs.getPointedToStreams().length + " other pointers/streams");
-					for(int j=0; j<pcs.getPointedToStreams().length; j++) {
-						Stream ss = pcs.getPointedToStreams()[j];
-						Pointer sptr = ss.getPointer();
-						System.err.println("\t\t" + j + " - Type is " + sptr.getType() + "\t\t" + Integer.toHexString(sptr.getType()));
-						System.err.println("\t\t" + j + " - Length is " + sptr.getLength() + "\t\t" + Long.toHexString(sptr.getLength()));
-					}
-				}
-			}
-
-			if(stream instanceof StringsStream) {
-				System.err.println("\t\t**strings**");
-				StringsStream ss = (StringsStream)stream;
-				System.err.println("\t\t" + ss._getContentsLength());
-			}
-		}
-	}
-
-	/**
-	 * For testing only
-	 */
-	public static void main(String args[]) throws Exception {
-		NPOIFSFileSystem pfs = new NPOIFSFileSystem(new File(args[0]));
-		HDGFDiagram hdgf = new HDGFDiagram(pfs);
-		hdgf.debug();
-		hdgf.close();
-		pfs.close();
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java
deleted file mode 100644
index e6d4aa2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hdgf;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LZWDecompresser;
-
-/**
- * A decoder for the crazy LZW implementation used
- *  in Visio.
- * According to VSDump, "it's a slightly perverted version of LZW
- *  compression, with inverted meaning of flag byte and 0xFEE as an
- *  'initial shift'". It uses 12 bit codes
- * (http://www.gnome.ru/projects/vsdump_en.html)
- *
- * Two good resources on LZW are:
- *  http://en.wikipedia.org/wiki/LZW
- *  http://marknelson.us/1989/10/01/lzw-data-compression/
- */
-public class HDGFLZW extends LZWDecompresser {
-   public HDGFLZW() {
-      // Out flag is the wrong way round!
-      // Length wise, we're 3 longer than we say, so the max len is 19
-      // Endian wise, we're little endian, so 0x1234 is pos 0x312
-      super(false, 3, false);
-   }
-
-   /**
-    * Compress the given input stream, returning the array of bytes
-    *  of the compressed input
-    */
-   public byte[] compress(InputStream src) throws IOException {
-      ByteArrayOutputStream res = new ByteArrayOutputStream();
-      compress(src,res);
-      return res.toByteArray();
-   }
-
-   /**
-    * We have a slight shift by 18 bytes
-    */
-   @Override
-   protected int adjustDictionaryOffset(int pntr) {
-      if(pntr > 4078) {
-         pntr = pntr - 4078;
-      } else {
-         pntr = pntr + 18;
-      }
-      return pntr;
-   }
-   
-   /**
-    * We want an empty dictionary, so do nothing
-    */
-   @Override
-   protected int populateDictionary(byte[] dict) {
-      return 0;
-   }
-
-   /**
-    * Performs the Visio compatible streaming LZW compression.
-    */
-   public void compress(InputStream src, OutputStream res) throws IOException {
-      HDGFLZWCompressor c = new HDGFLZWCompressor();
-      c.compress(src, res);
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java
deleted file mode 100644
index 53215de..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Helper class to handle the Visio compatible
- *  streaming LZW compression.
- * Need our own class to handle keeping track of the
- *  code buffer, pending bytes to write out etc.
- *  
- * TODO Fix this, as it starts to go wrong on
- *  large streams 
- */
-final class HDGFLZWCompressor {
-	// We use 12 bit codes:
-	// * 0-255 are real bytes
-	// * 256-4095 are the substring codes
-	// Java handily initialises our buffer / dictionary
-	//  to all zeros
-	byte[] dict = new byte[4096];
-
-	// The next block of data to be written out, minus
-	//  its mask byte
-	byte[] buffer = new byte[16];
-	// And how long it is
-	// (Un-compressed codes are 1 byte each, compressed codes
-	//   are two)
-	int bufferLen = 0;
-
-	// The raw length of a code is limited to 4 bits + 2
-	byte[] rawCode = new byte[18];
-	// And how much we're using
-	int rawCodeLen = 0;
-
-	// How far through the input and output streams we are
-	int posInp = 0;
-	int posOut = 0;
-
-	// What the next mask byte to output will be
-	int nextMask = 0;
-	// And how many bits we've already set
-	int maskBitsSet = 0;
-
-	public HDGFLZWCompressor() {}
-	
-/**
- * Returns the last place that the bytes from rawCode are found
- *  at in the buffer, or -1 if they can't be found
- */
-private int findRawCodeInBuffer() {
-	// Work our way through all the codes until we
-   //  find the right one. Visio starts from the end
-	for(int i=4096-rawCodeLen; i>0; i--) {
-		boolean matches = true;
-		for(int j=0; matches && j<rawCodeLen; j++) {
-			if(dict[i+j] == rawCode[j]) {
-				// Fits
-			} else {
-				// Doesn't fit, can't be a match
-				matches = false;
-			}
-		}
-
-		// Was this position a match?
-		if(matches) {
-			return i;
-		}
-	}
-
-	// Not found
-	return -1;
-}
-
-/**
- * Output the compressed representation for the bytes
- *  found in rawCode
- */
-private void outputCompressed(OutputStream res) throws IOException {
-	// It's not worth compressing only 1 or two bytes,
-	//  due to the overheads
-	// So if asked, just output uncompressed
-	if(rawCodeLen < 3) {
-		for(int i=0; i<rawCodeLen; i++) {
-			outputUncompressed(rawCode[i], res);
-		}
-		return;
-	}
-	
-	// Grab where the data lives
-	int codesAt = findRawCodeInBuffer();
-   codesAt -= 18;
-	if(codesAt < 0) {
-	   codesAt += 4096;
-	}
-
-	// Increment the mask bit count, we've done another code
-	maskBitsSet++;
-	
-	// Add the length+code to the buffer
-	// (The position is the first 12 bits, the
-	//  length is the last 4 bits)
-	int bp1 = (codesAt & 255);
-	int bp2 = (rawCodeLen-3) + ((codesAt-bp1) >> 4);
-	buffer[bufferLen] = HDGFLZW.fromInt(bp1);
-	bufferLen++;
-   buffer[bufferLen] = HDGFLZW.fromInt(bp2);
-   bufferLen++;
-   
-   // Copy the data to the dictionary in the new place
-   for(int i=0; i<rawCodeLen; i++) {
-      dict[(posOut&4095)] = rawCode[i];
-      posOut++; 
-   }
-
-	// If we're now at 8 codes, output
-	if(maskBitsSet == 8) {
-		output8Codes(res);
-	}
-}
-/**
- * Output the un-compressed byte
- */
-private void outputUncompressed(byte b, OutputStream res) throws IOException {
-	// Set the mask bit for us
-	nextMask += (1<<maskBitsSet);
-	maskBitsSet++;
-
-	// And add us to the buffer + dictionary
-	buffer[bufferLen] = b;
-	bufferLen++;
-	dict[(posOut&4095)] = b;
-	posOut++;
-
-	// If we're now at 8 codes, output
-	if(maskBitsSet == 8) {
-		output8Codes(res);
-	}
-}
-
-/**
- * We've got 8 code worth to write out, so
- *  output along with the header
- */
-private void output8Codes(OutputStream res) throws IOException {
-	// Output the mask and the data
-	res.write(new byte[] { HDGFLZW.fromInt(nextMask) } );
-	res.write(buffer, 0, bufferLen);
-
-	// Reset things
-	nextMask = 0;
-	maskBitsSet = 0;
-	bufferLen = 0;
-}
-
-/**
- * Does the compression
- */
-public void compress(InputStream src, OutputStream res) throws IOException {
-	// Have we hit the end of the file yet?
-	boolean going = true;
-
-	// This is a byte as looked up in the dictionary
-	// It needs to be signed, as it'll get passed on to
-	//  the output stream
-	byte dataB;
-	// This is an unsigned byte read from the stream
-	// It needs to be unsigned, so that bit stuff works
-	int dataI;
-
-	while( going ) {
-		dataI = src.read();
-		posInp++;
-		if(dataI == -1) { going = false; }
-		dataB = HDGFLZW.fromInt(dataI);
-
-		// If we've run out of data, output anything that's
-		//  pending then finish
-		if(!going) {
-		   if(rawCodeLen > 0) {
-	         outputCompressed(res);
-	         if(maskBitsSet > 0) {
-	            output8Codes(res);
-	         }
-		   }
-			break;
-		}
-
-		// Try adding this new byte onto rawCode, and
-		//  see if all of that is still found in the
-		//  buffer dictionary or not
-		rawCode[rawCodeLen] = dataB;
-		rawCodeLen++;
-		int rawAt = findRawCodeInBuffer();
-		
-		// If we found it and are now at 18 bytes,
-		//  we need to output our pending code block
-		if(rawCodeLen == 18 && rawAt > -1) {
-			outputCompressed(res);
-			rawCodeLen = 0;
-			continue;
-		}
-
-		// If we did find all of rawCode with our new
-		//  byte added on, we can wait to see what happens
-		//  with the next byte
-		if(rawAt > -1) {
-			continue;
-		}
-
-		// If we get here, then the rawCode + this byte weren't
-		// found in the dictionary
-
-		// If there was something in rawCode before, then that was
-		// found in the dictionary, so output that compressed
-		rawCodeLen--;
-		if(rawCodeLen > 0) {
-			// Output the old rawCode
-			outputCompressed(res);
-
-			// Can this byte start a new rawCode, or does
-			//  it need outputting itself?
-			rawCode[0] = dataB;
-			rawCodeLen = 1;
-			if(findRawCodeInBuffer() > -1) {
-				// Fits in, wait for next byte
-				continue;
-			}
-			// Doesn't fit, output
-			outputUncompressed(dataB,res);
-			rawCodeLen = 0;
-		} else {
-			// Nothing in rawCode before, so this byte
-			//  isn't in the buffer dictionary
-			// Output it un-compressed
-			outputUncompressed(dataB,res);
-		}
-	}
-}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
deleted file mode 100644
index 23ec352..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-import java.util.ArrayList;
-
-import org.apache.poi.hdgf.chunks.ChunkFactory.CommandDefinition;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Base of all chunks, which hold data, flags etc
- */
-public final class Chunk {
-	/**
-	 * The contents of the chunk, excluding the header,
-	 * trailer and separator
-	 */
-	private byte[] contents;
-	private ChunkHeader header;
-	/** May be null */
-	private ChunkTrailer trailer;
-	/** May be null */
-	private ChunkSeparator separator;
-	/** The possible different commands we can hold */
-	protected CommandDefinition[] commandDefinitions;
-	/** The command+value pairs we hold */
-	private Command[] commands;
-	/** The blocks (if any) we hold */
-	//private Block[] blocks
-	/** The name of the chunk, as found from the commandDefinitions */
-	private String name;
-
-	/** For logging warnings about the structure of the file */
-	private POILogger logger = POILogFactory.getLogger(Chunk.class);
-
-	public Chunk(ChunkHeader header, ChunkTrailer trailer, ChunkSeparator separator, byte[] contents) {
-		this.header = header;
-		this.trailer = trailer;
-		this.separator = separator;
-		this.contents = contents.clone();
-	}
-
-	public byte[] _getContents() {
-		return contents;
-	}
-	public ChunkHeader getHeader() {
-		return header;
-	}
-	/** Gets the separator between this chunk and the next, if it exists */
-	public ChunkSeparator getSeparator() {
-		return separator;
-	}
-	/** Gets the trailer for this chunk, if it exists */
-	public ChunkTrailer getTrailer() {
-		return trailer;
-	}
-	/**
-	 * Gets the command definitions, which define and describe much
-	 *  of the data held by the chunk.
-	 */
-	public CommandDefinition[] getCommandDefinitions() {
-		return commandDefinitions;
-	}
-	public Command[] getCommands() {
-		return commands;
-	}
-	/**
-	 * Get the name of the chunk, as found from the CommandDefinitions
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the size of the chunk, including any
-	 *  headers, trailers and separators.
-	 */
-	public int getOnDiskSize() {
-		int size = header.getSizeInBytes() + contents.length;
-		if(trailer != null) {
-			size += trailer.trailerData.length;
-		}
-		if(separator != null) {
-			size += separator.separatorData.length;
-		}
-		return size;
-	}
-
-	/**
-	 * Uses our CommandDefinitions to process the commands
-	 *  our chunk type has, and figure out the
-	 *  values for them.
-	 */
-	protected void processCommands() {
-		if(commandDefinitions == null) {
-			throw new IllegalStateException("You must supply the command definitions before calling processCommands!");
-		}
-
-		// Loop over the definitions, building the commands
-		//  and getting their values
-		ArrayList<Command> commandList = new ArrayList<Command>();
-		for(CommandDefinition cdef : commandDefinitions) {
-			int type = cdef.getType();
-			int offset = cdef.getOffset();
-
-			// Handle virtual commands
-			if(type == 10) {
-				name = cdef.getName();
-				continue;
-			} else if(type == 18) {
-				continue;
-			}
-
-
-			// Build the appropriate command for the type
-			Command command;
-			if(type == 11 || type == 21) {
-				command = new BlockOffsetCommand(cdef);
-			} else {
-				command = new Command(cdef);
-			}
-
-			// Bizarely, many of the offsets are from the start of the
-			//  header, not from the start of the chunk body
-			switch(type) {
-			case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-			case 11: case 21:
-			case 12: case 16: case 17: case 18: case 28: case 29:
-				// Offset is from start of chunk
-				break;
-			default:
-				// Offset is from start of header!
-				if(offset >= 19) {
-					offset -= 19;
-				}
-			}
-
-			// Check we seem to have enough data
-			if(offset >= contents.length) {
-				logger.log(POILogger.WARN,
-						"Command offset " + offset + " past end of data at " + contents.length
-				);
-				continue;
-			}
-
-			try {
-				// Process
-				switch(type) {
-				// Types 0->7 = a flat at bit 0->7
-				case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-					int val = contents[offset] & (1<<type);
-					command.value = Boolean.valueOf(val > 0);
-					break;
-				case 8:
-					command.value = Byte.valueOf(contents[offset]);
-					break;
-				case 9:
-					command.value = new Double(
-							LittleEndian.getDouble(contents, offset)
-					);
-					break;
-				case 12:
-					// A Little Endian String
-					// Starts 8 bytes into the data segment
-					// Ends at end of data, or 00 00
-
-					// Ensure we have enough data
-					if(contents.length < 8) {
-						command.value = "";
-						break;
-					}
-
-					// Find the end point
-					int startsAt = 8;
-					int endsAt = startsAt;
-					for(int j=startsAt; j<contents.length-1 && endsAt == startsAt; j++) {
-						if(contents[j] == 0 && contents[j+1] == 0) {
-							endsAt = j;
-						}
-					}
-					if(endsAt == startsAt) {
-						endsAt = contents.length;
-					}
-
-					int strLen = endsAt - startsAt;
-					command.value = new String(contents, startsAt, strLen, header.getChunkCharset().name());
-					break;
-				case 25:
-					command.value = Short.valueOf(
-						LittleEndian.getShort(contents, offset)
-					);
-					break;
-				case 26:
-					command.value = Integer.valueOf(
-							LittleEndian.getInt(contents, offset)
-					);
-					break;
-
-				// Types 11 and 21 hold the offset to the blocks
-				case 11: case 21:
-					if(offset < contents.length - 3) {
-						int bOffset = (int)LittleEndian.getUInt(contents, offset);
-						BlockOffsetCommand bcmd = (BlockOffsetCommand)command;
-						bcmd.setOffset(bOffset);
-					}
-					break;
-
-				default:
-					logger.log(POILogger.INFO,
-							"Command of type " + type + " not processed!");
-				}
-			}
-			catch (Exception e) {
-				logger.log(POILogger.ERROR, "Unexpected error processing command, ignoring and continuing. Command: " +
-						command, e);
-			}
-
-			// Add to the array
-			commandList.add(command);
-		}
-
-		// Save the commands we liked the look of
-		this.commands = commandList.toArray(
-							new Command[commandList.size()] );
-
-		// Now build up the blocks, if we had a command that tells
-		//  us where a block is
-	}
-
-	/**
-	 * A command in the visio file. In order to make things fun,
-	 *  all the chunk actually stores is the value of the command.
-	 * You have to have your own lookup table to figure out what
-	 *  the commands are based on the chunk type.
-	 */
-	public static class Command {
-		protected Object value;
-		private CommandDefinition definition;
-
-		private Command(CommandDefinition definition, Object value) {
-			this.definition = definition;
-			this.value = value;
-		}
-		private Command(CommandDefinition definition) {
-			this(definition, null);
-		}
-
-		public CommandDefinition getDefinition() { return definition; }
-		public Object getValue() { return value; }
-	}
-	/**
-	 * A special kind of command that is an artificat of how we
-	 *  process CommandDefinitions, and so doesn't actually exist
-	 *  in the chunk
-	 */
-//	public static class VirtualCommand extends Command {
-//		private VirtualCommand(CommandDefinition definition) {
-//			super(definition);
-//		}
-//	}
-	/**
-	 * A special kind of command that holds the offset to
-	 *  a block
-	 */
-	private static class BlockOffsetCommand extends Command {
-		private BlockOffsetCommand(CommandDefinition definition) {
-			super(definition, null);
-		}
-		private void setOffset(int offset) {
-			value = Integer.valueOf(offset);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
deleted file mode 100644
index 4b69576..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Factor class to create the appropriate chunks, which
- *  needs the version of the file to process the chunk header
- *  and trailer areas.
- * Makes use of chunks_parse_cmds.tbl from vsdump to be able
- *  to process the chunk value area
- */
-public final class ChunkFactory {
-	/** The version of the currently open document */
-	private int version;
-	/**
-	 * Key is a Chunk's type, value is an array of its CommandDefinitions
-	 */
-	private final Map<Integer, CommandDefinition[]> chunkCommandDefinitions = 
-	      new HashMap<Integer, CommandDefinition[]>();
-	/**
-	 * What the name is of the chunk table definitions file?
-	 * This file comes from the scratchpad resources directory.
-	 */
-	private static final String chunkTableName =
-		"/org/apache/poi/hdgf/chunks_parse_cmds.tbl";
-
-	/** For logging problems we spot with the file */
-	private static final POILogger logger = POILogFactory.getLogger(ChunkFactory.class);
-
-	public ChunkFactory(int version) throws IOException {
-		this.version = version;
-
-		processChunkParseCommands();
-	}
-
-	/**
-	 * Open chunks_parse_cmds.tbl and process it, to get the definitions
-	 *  of all the different possible chunk commands.
-	 */
-	private void processChunkParseCommands() throws IOException {
-		String line;
-		InputStream cpd = null;
-		BufferedReader inp = null;
-		try {
-	        cpd = ChunkFactory.class.getResourceAsStream(chunkTableName);
-	        if(cpd == null) {
-	            throw new IllegalStateException("Unable to find HDGF chunk definition on the classpath - " + chunkTableName);
-	        }
-
-	        inp = new BufferedReader(new InputStreamReader(cpd, LocaleUtil.CHARSET_1252));
-		    
-		    while( (line = inp.readLine()) != null ) {
-    			if (line.isEmpty() || "# \t".contains(line.substring(0,1))) {
-    			    continue;
-    			}
-    
-    			// Start xxx
-    			if(!line.matches("^start [0-9]+$")) {
-    				throw new IllegalStateException("Expecting start xxx, found " + line);
-    			}
-    			int chunkType = Integer.parseInt(line.substring(6));
-    			ArrayList<CommandDefinition> defsL = new ArrayList<CommandDefinition>();
-    
-    			// Data entries
-    			while( (line = inp.readLine()) != null ) {
-    			    if (line.startsWith("end")) {
-    			        break;
-    			    }
-    				StringTokenizer st = new StringTokenizer(line, " ");
-    				int defType = Integer.parseInt(st.nextToken());
-    				int offset = Integer.parseInt(st.nextToken());
-    				String name = st.nextToken("\uffff").substring(1);
-    
-    				CommandDefinition def = new CommandDefinition(defType,offset,name);
-    				defsL.add(def);
-    			}
-    
-    			CommandDefinition[] defs = defsL.toArray(new CommandDefinition[defsL.size()]);
-    
-    			// Add to the map
-    			chunkCommandDefinitions.put(Integer.valueOf(chunkType), defs);
-    		}
-		} finally {
-    		if (inp != null) {
-    		    inp.close();
-    		}
-    		if (cpd != null) {
-    		    cpd.close();
-    		}
-		}
-	}
-
-	public int getVersion() { return version; }
-
-	/**
-	 * Creates the appropriate chunk at the given location.
-	 * @param data
-	 * @param offset
-	 */
-	public Chunk createChunk(byte[] data, int offset) {
-		// Create the header
-		ChunkHeader header =
-			ChunkHeader.createChunkHeader(version, data, offset);
-		// Sanity check
-		if(header.length < 0) {
-			throw new IllegalArgumentException("Found a chunk with a negative length, which isn't allowed");
-		}
-
-		// How far up to look
-		int endOfDataPos = offset + header.getLength() + header.getSizeInBytes();
-
-		// Check we have enough data, and tweak the header size
-		//  as required
-		if(endOfDataPos > data.length) {
-			logger.log(POILogger.WARN,
-				"Header called for " + header.getLength() +" bytes, but that would take us past the end of the data!");
-
-			endOfDataPos = data.length;
-			header.length = data.length - offset - header.getSizeInBytes();
-
-			if(header.hasTrailer()) {
-				header.length -= 8;
-				endOfDataPos  -= 8;
-			}
-			if(header.hasSeparator()) {
-				header.length -= 4;
-				endOfDataPos  -= 4;
-			}
-		}
-
-
-		// Create the trailer and separator, if required
-		ChunkTrailer trailer = null;
-		ChunkSeparator separator = null;
-		if(header.hasTrailer()) {
-			if(endOfDataPos <= data.length-8) {
-				trailer = new ChunkTrailer(
-					data, endOfDataPos);
-				endOfDataPos += 8;
-			} else {
-				logger.log(POILogger.ERROR, "Header claims a length to " + endOfDataPos + " there's then no space for the trailer in the data (" + data.length + ")");
-			}
-		}
-		if(header.hasSeparator()) {
-			if(endOfDataPos <= data.length-4) {
-				separator = new ChunkSeparator(
-						data, endOfDataPos);
-			} else {
-				logger.log(POILogger.ERROR, "Header claims a length to " + endOfDataPos + " there's then no space for the separator in the data (" + data.length + ")");
-			}
-		}
-
-		// Now, create the chunk
-		byte[] contents = new byte[header.getLength()];
-		System.arraycopy(data, offset+header.getSizeInBytes(), contents, 0, contents.length);
-		Chunk chunk = new Chunk(header, trailer, separator, contents);
-
-		// Feed in the stuff from  chunks_parse_cmds.tbl
-		CommandDefinition[] defs = chunkCommandDefinitions.get(Integer.valueOf(header.getType()));
-		if (defs == null) {
-		    defs = new CommandDefinition[0];
-		}
-		chunk.commandDefinitions = defs;
-
-		// Now get the chunk to process its commands
-		chunk.processCommands();
-
-		// All done
-		return chunk;
-	}
-
-	/**
-	 * The definition of a Command, which a chunk may hold.
-	 * The Command holds the value, this describes it.
-	 */
-	public static class CommandDefinition {
-		private int type;
-		private int offset;
-		private String name;
-		public CommandDefinition(int type, int offset, String name) {
-			this.type = type;
-			this.offset = offset;
-			this.name = name;
-		}
-
-		public String getName() {
-			return name;
-		}
-		public int getOffset() {
-			return offset;
-		}
-		public int getType() {
-			return type;
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
deleted file mode 100644
index 4b38366..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-import org.apache.poi.util.LittleEndian;
-
-import java.nio.charset.Charset;
-
-/**
- * A chunk header
- */
-public abstract class ChunkHeader {
-	protected int type;
-	protected int id;
-	protected int length;
-	protected int unknown1;
-
-	/**
-	 * Creates the appropriate ChunkHeader for the Chunk Header at
-	 *  the given location, for the given document version.
-	 */
-	public static ChunkHeader createChunkHeader(int documentVersion, byte[] data, int offset) {
-		if(documentVersion >= 6) {
-			ChunkHeaderV6 ch;
-			if(documentVersion > 6) {
-				ch = new ChunkHeaderV11();
-			} else {
-				ch = new ChunkHeaderV6();
-			}
-			ch.type = (int)LittleEndian.getUInt(data, offset + 0);
-			ch.id   = (int)LittleEndian.getUInt(data, offset + 4);
-			ch.unknown1 = (int)LittleEndian.getUInt(data, offset + 8);
-			ch.length   = (int)LittleEndian.getUInt(data, offset + 12);
-			ch.unknown2 = LittleEndian.getShort(data, offset + 16);
-			ch.unknown3 = LittleEndian.getUByte(data, offset + 18);
-
-			return ch;
-		} else if(documentVersion == 5 || documentVersion == 4) {
-			ChunkHeaderV4V5 ch = new ChunkHeaderV4V5();
-
-			ch.type = LittleEndian.getShort(data, offset + 0);
-			ch.id   = LittleEndian.getShort(data, offset + 2);
-			ch.unknown2 = LittleEndian.getUByte(data, offset + 4);
-			ch.unknown3 = LittleEndian.getUByte(data, offset + 5);
-			ch.unknown1 = LittleEndian.getShort(data, offset + 6);
-			ch.length   = (int)LittleEndian.getUInt(data, offset + 8);
-
-			return ch;
-		} else {
-			throw new IllegalArgumentException("Visio files with versions below 4 are not supported, yours was " + documentVersion);
-		}
-	}
-
-	/**
-	 * Returns the size of a chunk header for the given document version.
-	 */
-	public static int getHeaderSize(int documentVersion) {
-		if(documentVersion > 6) {
-			return ChunkHeaderV11.getHeaderSize();
-		} else if(documentVersion == 6) {
-			return ChunkHeaderV6.getHeaderSize();
-		} else {
-			return ChunkHeaderV4V5.getHeaderSize();
-		}
-	}
-
-	public abstract int getSizeInBytes();
-	public abstract boolean hasTrailer();
-	public abstract boolean hasSeparator();
-	public abstract Charset getChunkCharset();
-
-	/**
-	 * Returns the ID/IX of the chunk
-	 */
-	public int getId() {
-		return id;
-	}
-	/**
-	 * Returns the length of the trunk, excluding the length
-	 *  of the header, trailer or separator.
-	 */
-	public int getLength() {
-		return length;
-	}
-	/**
-	 * Returns the type of the chunk, which affects the
-	 *  mandatory information
-	 */
-	public int getType() {
-		return type;
-	}
-	public int getUnknown1() {
-		return unknown1;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
deleted file mode 100644
index b3d84aa..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-import java.nio.charset.Charset;
-
-/**
- * A chunk header from v11+
- */
-public final class ChunkHeaderV11 extends ChunkHeaderV6 {
-	/**
-	 * Does the chunk have a separator?
-	 */
-	public boolean hasSeparator() {
-		// For some reason, there are two types that don't have a
-		//  separator despite the flags that indicate they do
-		if(type == 0x1f || type == 0xc9) { return false; }
-
-		// If there's a trailer, there's a separator
-		if(hasTrailer()) { return true; }
-
-		if(unknown2 == 2 && unknown3 == 0x55) { return true; }
-		if(unknown2 == 2 && unknown3 == 0x54 && type == 0xa9) { return true; }
-		if(unknown2 == 2 && unknown3 == 0x54 && type == 0xaa) { return true; }
-		if(unknown2 == 2 && unknown3 == 0x54 && type == 0xb4) { return true; }
-		if(unknown2 == 2 && unknown3 == 0x54 && type == 0xb6) { return true; }
-		if(unknown2 == 3 && unknown3 != 0x50) { return true; }
-		if(type == 0x69) { return true; }
-
-		return false;
-	}
-
-	@Override
-	public Charset getChunkCharset() {
-		return Charset.forName("UTF-16LE");
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
deleted file mode 100644
index bba6a87..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-import java.nio.charset.Charset;
-
-/**
- * A chunk header from v4 or v5
- */
-public final class ChunkHeaderV4V5 extends ChunkHeader {
-	protected short unknown2;
-	protected short unknown3;
-
-	public short getUnknown2() {
-		return unknown2;
-	}
-	public short getUnknown3() {
-		return unknown3;
-	}
-
-	protected static int getHeaderSize() {
-		return 12;
-	}
-
-	public int getSizeInBytes() {
-		return getHeaderSize();
-	}
-
-	/**
-	 * Does the chunk have a trailer?
-	 */
-	public boolean hasTrailer() {
-		// V4 and V5 never has trailers
-		return false;
-	}
-
-	/**
-	 * Does the chunk have a separator?
-	 */
-	public boolean hasSeparator() {
-		// V4 and V5 never has separators
-		return false;
-	}
-
-	@Override
-	public Charset getChunkCharset() {
-		return Charset.forName("ASCII");
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
deleted file mode 100644
index 96546c7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-import java.nio.charset.Charset;
-
-/**
- * A chunk header from v6
- */
-public class ChunkHeaderV6 extends ChunkHeader {
-	protected short unknown2;
-	protected short unknown3;
-
-	public short getUnknown2() {
-		return unknown2;
-	}
-	public short getUnknown3() {
-		return unknown3;
-	}
-
-	protected static int getHeaderSize() {
-		// Looks like it ought to be 19...
-		return 19;
-	}
-	public int getSizeInBytes() {
-		return getHeaderSize();
-	}
-
-	/**
-	 * Does the chunk have a trailer?
-	 */
-	public boolean hasTrailer() {
-		if(unknown1 != 0 || type == 0x71 || type == 0x70) {
-			return true;
-		}
-		if(type == 0x6b || type == 0x6a || type == 0x69 || type == 0x66
-				|| type == 0x65 || type == 0x2c) {
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * Does the chunk have a separator?
-	 */
-	public boolean hasSeparator() {
-		// V6 never has separators
-		return false;
-	}
-
-	@Override
-	public Charset getChunkCharset() {
-		return Charset.forName("ASCII");
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java
deleted file mode 100644
index bf49cea..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-/**
- * A separator between the trailer of one chunk, and the
- *  header of the next one
- */
-public final class ChunkSeparator {
-	protected byte[] separatorData;
-
-	public ChunkSeparator(byte[] data, int offset) {
-		separatorData = new byte[4];
-		System.arraycopy(data, offset, separatorData, 0, 4);
-	}
-
-	public String toString() {
-		return "<ChunkSeparator of length " + separatorData.length + ">";
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java
deleted file mode 100644
index ad3441d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-/**
- * A trailer that follows a chunk
- */
-public final class ChunkTrailer {
-	protected byte[] trailerData;
-
-	public ChunkTrailer(byte[] data, int offset) {
-		trailerData = new byte[8];
-		System.arraycopy(data, offset, trailerData, 0, 8);
-	}
-
-	public String toString() {
-		return "<ChunkTrailer of length " + trailerData.length + ">";
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java
deleted file mode 100644
index 62f2b36..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.dev;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.util.Arrays;
-
-import org.apache.poi.hdgf.HDGFDiagram;
-import org.apache.poi.hdgf.chunks.Chunk;
-import org.apache.poi.hdgf.chunks.Chunk.Command;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.hdgf.streams.ChunkStream;
-import org.apache.poi.hdgf.streams.PointerContainingStream;
-import org.apache.poi.hdgf.streams.Stream;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-/**
- * Developer helper class to dump out the pointer+stream structure
- *  of a Visio file
- */
-public final class VSDDumper {
-    final static String tabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-    
-    final PrintStream ps;
-    final HDGFDiagram hdgf;
-    VSDDumper(PrintStream ps, HDGFDiagram hdgf) {
-        this.ps = ps;
-        this.hdgf = hdgf;
-    }
-    
-	public static void main(String[] args) throws Exception {
-		if(args.length == 0) {
-			System.err.println("Use:");
-			System.err.println("  VSDDumper <filename>");
-			System.exit(1);
-		}
-
-		NPOIFSFileSystem poifs = new NPOIFSFileSystem(new File(args[0]));
-		HDGFDiagram hdgf = new HDGFDiagram(poifs);
-
-		PrintStream ps = System.out;
-		ps.println("Opened " + args[0]);
-		VSDDumper vd = new VSDDumper(ps, hdgf);
-		vd.dumpFile();
-		
-		poifs.close();
-	}
-
-	public void dumpFile() {
-        dumpVal("Claimed document size", hdgf.getDocumentSize(), 0);
-        ps.println();
-        dumpStream(hdgf.getTrailerStream(), 0);
-	}
-	
-	private void dumpStream(Stream stream, int indent) {
-		Pointer ptr = stream.getPointer();
-		dumpVal("Stream at", ptr.getOffset(), indent);
-		dumpVal("Type is", ptr.getType(), indent+1);
-		dumpVal("Format is", ptr.getFormat(), indent+1);
-        dumpVal("Length is", ptr.getLength(), indent+1);
-		if(ptr.destinationCompressed()) {
-		    dumpVal("DC.Length is", stream._getContentsLength(), indent+1);
-		}
-		dumpVal("Compressed is", ptr.destinationCompressed(), indent+1);
-		dumpVal("Stream is", stream.getClass().getName(), indent+1);
-
-		byte[] db = stream._getStore()._getContents();
-		String ds = (db.length >= 8) ? Arrays.toString(db) : "[]";
-		dumpVal("First few bytes are", ds, indent+1);
-
-		if (stream instanceof PointerContainingStream) {
-		    Stream streams[] = ((PointerContainingStream)stream).getPointedToStreams();
-			dumpVal("Nbr of children", streams.length, indent+1);
-
-			for(Stream s : streams) {
-				dumpStream(s, indent+1);
-			}
-		}
-		if(stream instanceof ChunkStream) {
-		    Chunk chunks[] = ((ChunkStream)stream).getChunks();
-			dumpVal("Nbr of chunks", chunks.length, indent+1);
-
-			for(Chunk chunk : chunks) {
-			    dumpChunk(chunk, indent+1);
-			}
-		}
-	}
-
-	private void dumpChunk(Chunk chunk, int indent) {
-        dumpVal(chunk.getName(), "", indent);
-        dumpVal("Length is", chunk._getContents().length, indent);
-        dumpVal("OD Size is", chunk.getOnDiskSize(), indent);
-        dumpVal("T / S is", chunk.getTrailer() + " / " + chunk.getSeparator(), indent);
-        Command commands[] = chunk.getCommands();
-        dumpVal("Nbr of commands", commands.length, indent);
-        for(Command command : commands) {
-            dumpVal(command.getDefinition().getName(), ""+command.getValue(), indent+1);
-        }
-	}
-	
-	private void dumpVal(String label, long value, int indent) {
-        ps.print(tabs.substring(0,indent));
-        ps.print(label);
-        ps.print('\t');
-        ps.print(value);
-        ps.print(" (0x");
-        ps.print(Long.toHexString(value));
-        ps.println(")");
-    }
-
-    private void dumpVal(String label, boolean value, int indent) {
-        dumpVal(label, Boolean.toString(value), indent);
-    }
-
-    private void dumpVal(String label, String value, int indent) {
-        ps.print(tabs.substring(0,indent));
-        ps.print(label);
-        ps.print('\t');
-        ps.println(value);      
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java
deleted file mode 100644
index c893bd2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.exceptions;
-
-/**
- * The superclass of all HDGF exceptions
- *
- * @author Yegor Kozlov
- */
-public final class HDGFException extends RuntimeException {
-
-    public HDGFException() {
-	    super();
-    }
-
-   public HDGFException(String message) {
-	    super(message);
-    }
-
-   public HDGFException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public HDGFException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
deleted file mode 100644
index fae6e3f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.extractor;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hdgf.HDGFDiagram;
-import org.apache.poi.hdgf.chunks.Chunk;
-import org.apache.poi.hdgf.chunks.Chunk.Command;
-import org.apache.poi.hdgf.streams.ChunkStream;
-import org.apache.poi.hdgf.streams.PointerContainingStream;
-import org.apache.poi.hdgf.streams.Stream;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Class to find all the text in a Visio file, and return it.
- * Can operate on the command line (outputs to stdout), or
- *  can return the text for you (example: for use with Lucene).
- */
-public final class VisioTextExtractor extends POIOLE2TextExtractor {
-	private HDGFDiagram hdgf;
-
-	public VisioTextExtractor(HDGFDiagram hdgf) {
-		super(hdgf);
-		this.hdgf = hdgf;
-	}
-	public VisioTextExtractor(POIFSFileSystem fs) throws IOException {
-		this(fs.getRoot());
-	}
-	public VisioTextExtractor(NPOIFSFileSystem fs) throws IOException {
-		this(fs.getRoot());
-	}
-	public VisioTextExtractor(DirectoryNode dir) throws IOException {
-		this(new HDGFDiagram(dir));
-	}
-	public VisioTextExtractor(InputStream inp) throws IOException {
-		this(new NPOIFSFileSystem(inp));
-	}
-
-	/**
-	 * Locates all the text entries in the file, and returns their
-	 *  contents.
-	 * 
-	 * @return An array of each Text item in the document
-	 */
-	public String[] getAllText() {
-		ArrayList<String> text = new ArrayList<String>();
-		for(Stream stream : hdgf.getTopLevelStreams()) {
-			findText(stream, text);
-		}
-		return text.toArray( new String[text.size()] );
-	}
-	private void findText(Stream stream, ArrayList<String> text) {
-		if(stream instanceof PointerContainingStream) {
-			PointerContainingStream ps = (PointerContainingStream)stream;
-			for(int i=0; i<ps.getPointedToStreams().length; i++) {
-				findText(ps.getPointedToStreams()[i], text);
-			}
-		}
-		if(stream instanceof ChunkStream) {
-			ChunkStream cs = (ChunkStream)stream;
-			for(int i=0; i<cs.getChunks().length; i++) {
-				Chunk chunk = cs.getChunks()[i];
-				if(chunk != null &&
-						chunk.getName() != null &&
-						chunk.getName().equals("Text") &&
-						chunk.getCommands().length > 0) {
-
-					// First command
-					Command cmd = chunk.getCommands()[0];
-					if(cmd != null && cmd.getValue() != null) {
-						// Capture the text, as long as it isn't
-						//  simply an empty string
-						String str = cmd.getValue().toString();
-						if(str.equals("") || str.equals("\n")) {
-							// Ignore empty strings
-						} else {
-							text.add( str );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the textual contents of the file.
-	 * Each textual object's text will be separated
-	 *  by a newline
-	 *  
-	 * @return All text contained in this document, separated by <code>\n</code>
-	 */
-	@Override
-	public String getText() {
-		StringBuffer text = new StringBuffer();
-		for(String t : getAllText()) {
-			text.append(t);
-			if(!t.endsWith("\r") && !t.endsWith("\n")) {
-				text.append('\n');
-			}
-		}
-		return text.toString();
-	}
-
-	public static void main(String[] args) throws Exception {
-		if(args.length == 0) {
-			System.err.println("Use:");
-			System.err.println("   VisioTextExtractor <file.vsd>");
-			System.exit(1);
-		}
-
-		VisioTextExtractor extractor =
-			new VisioTextExtractor(new FileInputStream(args[0]));
-
-		// Print not PrintLn as already has \n added to it
-		System.out.print(extractor.getText());
-		
-		extractor.close();
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java
deleted file mode 100644
index 69704f2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.pointers;
-
-/**
- * Base class of pointers, which hold metadata and offsets about
- *  blocks elsewhere in the file
- */
-public abstract class Pointer {
-    protected int type;
-    protected int address;
-    protected int offset;
-    protected int length;
-    protected short format;
-
-    public int getAddress() {
-        return address;
-    }
-    public short getFormat() {
-        return format;
-    }
-    public int getLength() {
-        return length;
-    }
-    public int getOffset() {
-        return offset;
-    }
-    public int getType() {
-        return type;
-    }
-
-    public abstract int getSizeInBytes();
-    public abstract int getNumPointersOffset(byte[] data);
-    public abstract int getNumPointers(int offset, byte[] data);
-    public abstract int getPostNumPointersSkip();
-
-    public abstract boolean destinationHasStrings();
-    public abstract boolean destinationHasPointers();
-    public abstract boolean destinationHasChunks();
-    public abstract boolean destinationCompressed();
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java
deleted file mode 100644
index a151334..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.pointers;
-
-import org.apache.poi.hdgf.streams.PointerContainingStream;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Factor class to create the appropriate pointers, based on the version
- *  of the file
- */
-public final class PointerFactory {
-    private int version;
-    public PointerFactory(int version) {
-        this.version = version;
-    }
-    public int getVersion() { return version; }
-
-    /**
-     * Creates a single Pointer from the data at the given offset
-     */
-    public Pointer createPointer(byte[] data, int offset) {
-        Pointer p;
-        if(version >= 6) {
-            p = new PointerV6();
-            p.type = LittleEndian.getInt(data, offset+0);
-            p.address = (int)LittleEndian.getUInt(data, offset+4);
-            p.offset = (int)LittleEndian.getUInt(data, offset+8);
-            p.length = (int)LittleEndian.getUInt(data, offset+12);
-            p.format = LittleEndian.getShort(data, offset+16);
-
-            return p;
-        } else if(version == 5) {
-            p = new PointerV5();
-            p.type = LittleEndian.getShort(data, offset+0);
-            p.format = LittleEndian.getShort(data, offset+2);
-            p.address = (int)LittleEndian.getUInt(data, offset+4);
-            p.offset = (int)LittleEndian.getUInt(data, offset+8);
-            p.length = (int)LittleEndian.getUInt(data, offset+12);
-
-            return p;
-        } else {
-            throw new IllegalArgumentException("Visio files with versions below 5 are not supported, yours was " + version);
-        }
-    }
-
-    /**
-     * Parsers the {@link PointerContainingStream} contents and
-     *  creates all the child Pointers for it
-     */
-    public Pointer[] createContainerPointers(Pointer parent, byte[] data) {
-        // Where in the stream does the "number of pointers" offset live?
-        int numPointersOffset = parent.getNumPointersOffset(data);
-        // How many do we have?
-        int numPointers = parent.getNumPointers(numPointersOffset, data);
-        // How much to skip for the num pointers + any extra data?
-        int skip = parent.getPostNumPointersSkip();
-
-        // Create
-        int pos = numPointersOffset + skip;
-        Pointer[] childPointers = new Pointer[numPointers];
-        for(int i=0; i<numPointers; i++) {
-            childPointers[i] = this.createPointer(data, pos);
-            pos += childPointers[i].getSizeInBytes();
-        }
-
-        return childPointers;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java
deleted file mode 100644
index 6eaf0d4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.pointers;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A Pointer from v5
- */
-public final class PointerV5 extends Pointer {
-    // TODO Are these getters correct?
-    public boolean destinationHasStrings() {
-        return (0x40 <= format && format < 0x50);
-    }
-    public boolean destinationHasPointers() {
-        if(type == 20) {
-            return true;
-        }
-        if(type == 22) {
-            return false;
-        }
-        if(format == 0x1d || format == 0x1e) {
-            return true;
-        }
-        return (0x50 <= format && format < 0x60);
-    }
-    public boolean destinationHasChunks() {
-        if (type == 21) {
-            return true;
-        }
-        if (type == 24) {
-            return true;
-        }
-        return (0xd0 <= format && format < 0xdf);
-    }
-
-    public boolean destinationCompressed() {
-        // Apparently, it's the second least significant bit
-        return (format & 2) > 0;
-    }
-
-    /**
-     * With v6 pointers, the on-disk size is 16 bytes
-     */
-    public int getSizeInBytes() { return 16; }
-
-    /**
-     * Depends on the type only, not stored
-     */
-    public int getNumPointersOffset(byte[] data) {
-        switch (type) {
-            case 0x1d:
-            case 0x4e:
-                return 30;
-            case 0x1e:
-                return 54;
-            case 0x14:
-                return 130;
-        }
-        return 10;
-    }
-    /**
-     * 16 bit int at the given offset
-     */
-    public int getNumPointers(int offset, byte[] data) {
-        // V5 stores it as a 16 bit number at the offset
-        return LittleEndian.getShort(data, offset);
-    }
-    /**
-     * Just the 2 bytes of the number of pointers
-     */
-    public int getPostNumPointersSkip() {
-        return 2;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java
deleted file mode 100644
index b240a0c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.pointers;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A Pointer from v6+
- */
-public final class PointerV6 extends Pointer {
-    public boolean destinationHasStrings() {
-        return (0x40 <= format && format < 0x50);
-    }
-    public boolean destinationHasPointers() {
-        if(type == 20) return true;
-        if(format == 0x1d || format == 0x1e) return true;
-        return (0x50 <= format && format < 0x60);
-    }
-    public boolean destinationHasChunks() {
-        return (0xd0 <= format && format < 0xdf);
-    }
-
-    public boolean destinationCompressed() {
-        // Apparently, it's the second least significant bit
-        return (format & 2) > 0;
-    }
-
-    /**
-     * With v6 pointers, the on-disk size is 18 bytes
-     */
-    public int getSizeInBytes() { return 18; }
-
-    /**
-     * Stored within the data
-     */
-    public int getNumPointersOffset(byte[] data) {
-        return getNumPointersOffsetV6(data);
-    }
-    public static int getNumPointersOffsetV6(byte[] data) {    
-        // V6 stores it as the first value in the stream
-        return (int)LittleEndian.getUInt(data, 0);
-    }
-    /**
-     * 32 bit int at the given offset
-     */
-    public int getNumPointers(int offset, byte[] data) {
-        return getNumPointersV6(offset, data);
-    }
-    public static int getNumPointersV6(int offset, byte[] data) {
-        // V6 stores it a 32 bit number at the offset
-        return (int)LittleEndian.getUInt(data, offset);
-    }
-    /**
-     * 4 bytes of the number, and 4 more unknown bytes
-     */
-    public int getPostNumPointersSkip() {
-        return getPostNumPointersSkipV6();
-    }
-    public static int getPostNumPointersSkipV6() {
-        return 8;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java
deleted file mode 100644
index 9f15e40..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import java.util.ArrayList;
-
-import org.apache.poi.hdgf.chunks.Chunk;
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.chunks.ChunkHeader;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-public final class ChunkStream extends Stream {
-	private static POILogger logger = POILogFactory.getLogger(ChunkStream.class);
-	
-	private ChunkFactory chunkFactory;
-	/** All the Chunks we contain */
-	private Chunk[] chunks;
-
-	protected ChunkStream(Pointer pointer, StreamStore store, ChunkFactory chunkFactory) {
-		super(pointer, store);
-		this.chunkFactory = chunkFactory;
-
-		// For compressed stores, we require all of the data
-		store.copyBlockHeaderToContents();
-	}
-
-	public Chunk[] getChunks() { return chunks; }
-
-	/**
-	 * Process the contents of the stream out into chunks
-	 */
-	public void findChunks() {
-		ArrayList<Chunk> chunksA = new ArrayList<Chunk>();
-
-		if(getPointer().getOffset() == 0x64b3) {
-			int i = 0;
-			i++;
-		}
-
-		int pos = 0;
-		byte[] contents = getStore().getContents();
-		try {
-			while(pos < contents.length) {
-				// Ensure we have enough data to create a chunk from
-				int headerSize = ChunkHeader.getHeaderSize(chunkFactory.getVersion());
-				if(pos+headerSize <= contents.length) {
-					Chunk chunk = chunkFactory.createChunk(contents, pos);
-					chunksA.add(chunk);
-
-					pos += chunk.getOnDiskSize();
-				} else {
-					logger.log(POILogger.WARN, "Needed " + headerSize + " bytes to create the next chunk header, but only found " + (contents.length-pos) + " bytes, ignoring rest of data");
-					pos = contents.length;
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			logger.log(POILogger.ERROR, "Failed to create chunk at " + pos + ", ignoring rest of data." + e);
-		}
-
-		chunks = chunksA.toArray(new Chunk[chunksA.size()]);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java
deleted file mode 100644
index 2fae888..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.apache.poi.hdgf.HDGFLZW;
-
-/**
- * A StreamStore where the data on-disk is compressed,
- *  using the crazy Visio LZW
- */
-public final class CompressedStreamStore extends StreamStore {
-	/** The raw, compressed contents */
-	private byte[] compressedContents;
-	/**
-	 * We're not sure what this is, but it comes before the
-	 *  real contents in the de-compressed data
-	 */
-	private byte[] blockHeader = new byte[4];
-	private boolean blockHeaderInContents = false;
-
-	protected byte[] _getCompressedContents() { return compressedContents; }
-	protected byte[] _getBlockHeader() { return blockHeader; }
-
-	/**
-	 * Creates a new compressed StreamStore, which will handle
-	 *  the decompression.
-	 */
-	protected CompressedStreamStore(byte[] data, int offset, int length) throws IOException {
-		this(decompress(data,offset,length));
-
-		compressedContents = new byte[length];
-		System.arraycopy(data, offset, compressedContents, 0, length);
-	}
-	/**
-	 * Handles passing the de-compressed data onto our superclass.
-	 */
-	private CompressedStreamStore(byte[][] decompressedData) {
-		super(decompressedData[1], 0, decompressedData[1].length);
-		blockHeader = decompressedData[0];
-	}
-
-	/**
-	 * Some kinds of streams expect their 4 byte header to be
-	 *  on the front of the contents.
-	 * They can call this to have it sorted.
-	 */
-	protected void copyBlockHeaderToContents() {
-		if(blockHeaderInContents) return;
-
-		prependContentsWith(blockHeader);
-		blockHeaderInContents = true;
-	}
-
-
-	/**
-	 * Decompresses the given data, returning it as header + contents
-	 */
-	public static byte[][] decompress(byte[] data, int offset, int length) throws IOException {
-		ByteArrayInputStream bais = new ByteArrayInputStream(data, offset, length);
-
-		// Decompress
-		HDGFLZW lzw = new HDGFLZW();
-		byte[] decompressed = lzw.decompress(bais);
-
-		// Split into header and contents
-		byte[][] ret = new byte[2][];
-		ret[0] = new byte[4];
-		ret[1] = new byte[decompressed.length - 4];
-
-		System.arraycopy(decompressed, 0, ret[0], 0, 4);
-		System.arraycopy(decompressed, 4, ret[1], 0, ret[1].length);
-
-		// All done
-		return ret;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java
deleted file mode 100644
index e7f3cf3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.hdgf.pointers.PointerFactory;
-
-/**
- * A stream that holds pointers, possibly in addition to some
- *  other data too.
- */
-public class PointerContainingStream extends Stream { // TODO - instantiable superclass
-	private Pointer[] childPointers;
-	private Stream[] childStreams;
-
-	private ChunkFactory chunkFactory;
-	private PointerFactory pointerFactory;
-
-	protected PointerContainingStream(Pointer pointer, StreamStore store, ChunkFactory chunkFactory, PointerFactory pointerFactory) {
-		super(pointer, store);
-		this.chunkFactory = chunkFactory;
-		this.pointerFactory = pointerFactory;
-		
-		// Have the child pointers identified and created
-		childPointers = pointerFactory.createContainerPointers(pointer, store.getContents());
-	}
-
-	/**
-	 * Returns all the pointers that we contain
-	 */
-	protected Pointer[] getChildPointers() { return childPointers; }
-	/**
-	 * Returns all the "child" streams.
-	 * These are all the streams pointed to by the pointers
-	 *  that we contain.
-	 */
-	public Stream[] getPointedToStreams() { return childStreams; }
-
-	/**
-	 * Performs a recursive search, identifying the pointers we contain,
-	 *  creating the Streams for where they point to, then searching
-	 *  those if appropriate.
-	 */
-	public void findChildren(byte[] documentData) {
-		// For each pointer, generate the Stream it points to
-		childStreams = new Stream[childPointers.length];
-		for(int i=0; i<childPointers.length; i++) {
-			Pointer ptr = childPointers[i];
-			childStreams[i] = Stream.createStream(ptr, documentData, chunkFactory, pointerFactory);
-
-			// Process chunk streams into their chunks
-			if(childStreams[i] instanceof ChunkStream) {
-				ChunkStream child = (ChunkStream)childStreams[i];
-				child.findChunks();
-			}
-
-			// Recurse into pointer containing streams
-			if(childStreams[i] instanceof PointerContainingStream) {
-				PointerContainingStream child =
-					(PointerContainingStream)childStreams[i];
-				child.findChildren(documentData);
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java
deleted file mode 100644
index abd7f19..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import java.io.IOException;
-
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.hdgf.pointers.PointerFactory;
-import org.apache.poi.hdgf.exceptions.HDGFException;
-
-/**
- * Base of all Streams within a HDGF document.
- * Streams are what hold the data (the metadata of a stream
- *  is held in the pointer that points to the stream).
- * A stream may be stored compressed or un-compressed on the
- *  disk, but that doesn't appear to change their use.
- */
-public abstract class Stream {
-	private Pointer pointer;
-	private StreamStore store;
-
-	public Pointer getPointer() { return pointer; }
-	protected StreamStore getStore() { return store; }
-	public StreamStore _getStore() { return store; }
-	public int _getContentsLength() { return store.getContents().length; }
-
-	/**
-	 * Creates a new Stream, having already used the pointer
-	 *  to build a store
-	 */
-	protected Stream(Pointer pointer, StreamStore store) {
-		this.pointer = pointer;
-		this.store = store;
-	}
-
-	/**
-	 * Uses the pointer to locate a Stream within the document
-	 *  data, and creates it.
-	 * @param pointer The Pointer to create a stream for
-	 * @param documentData The raw document data
-	 */
-	public static Stream createStream(Pointer pointer, byte[] documentData, ChunkFactory chunkFactory, PointerFactory pointerFactory) {
-		// Create the store
-		StreamStore store;
-		if(pointer.destinationCompressed()) {
-			try {
-				store = new CompressedStreamStore(
-					documentData, pointer.getOffset(), pointer.getLength()
-				);
-			} catch(IOException e) {
-				// Should never occur
-				throw new HDGFException(e);
-			}
-		} else {
-			store = new StreamStore(
-					documentData, pointer.getOffset(), pointer.getLength()
-			);
-		}
-
-		// Figure out what sort of Stream to create, create and return it
-		if(pointer.getType() == 20) {
-			return new TrailerStream(pointer, store, chunkFactory, pointerFactory);
-		}
-		else if(pointer.destinationHasPointers()) {
-			return new PointerContainingStream(pointer, store, chunkFactory, pointerFactory);
-		}
-		else if(pointer.destinationHasChunks()) {
-			return new ChunkStream(pointer, store, chunkFactory);
-		}
-		else if(pointer.destinationHasStrings()) {
-			return new StringsStream(pointer, store, chunkFactory);
-		}
-
-		// Give up and return a generic one
-		return new UnknownStream(pointer, store);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java
deleted file mode 100644
index 1c4e4e7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-/**
- * Holds the representation of the stream on-disk, and
- *  handles de-compressing it as required.
- * In future, may also handle writing it back out again
- */
-public class StreamStore { // TODO - instantiable superclass
-	private byte[] contents;
-
-	/**
-	 * Creates a new, non compressed Stream Store
-	 */
-	protected StreamStore(byte[] data, int offset, int length) {
-		contents = new byte[length];
-		System.arraycopy(data, offset, contents, 0, length);
-	}
-
-	protected void prependContentsWith(byte[] b) {
-		byte[] newContents = new byte[contents.length + b.length];
-		System.arraycopy(b, 0, newContents, 0, b.length);
-		System.arraycopy(contents, 0, newContents, b.length, contents.length);
-		contents = newContents;
-	}
-	protected void copyBlockHeaderToContents() {}
-
-	protected byte[] getContents() { return contents; }
-	public byte[] _getContents() { return contents; }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java
deleted file mode 100644
index ac6386a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.pointers.Pointer;
-
-/**
- * A Stream which holds Strings. This is just another kind
- *  of ChunkStream, it seems
- */
-public final class StringsStream extends Stream {
-	protected StringsStream(Pointer pointer, StreamStore store, ChunkFactory chunkFactory) {
-		super(pointer, store);
-//		super(pointer, store, chunkFactory);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java
deleted file mode 100644
index 9e772c2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.hdgf.pointers.PointerFactory;
-
-/**
- * The TrailerStream is a special kind of Stream containing pointers,
- *  and some core document settings.
- * These is one of these in each document, and it's pointed to by
- *  a special series of byte near the start of the file.
- */
-public class TrailerStream extends PointerContainingStream { // TODO - instantiable superclass
-	protected TrailerStream(Pointer pointer, StreamStore store, ChunkFactory chunkFactory, PointerFactory pointerFactory) {
-		super(pointer, store, chunkFactory, pointerFactory);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java b/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java
deleted file mode 100644
index e08d7f9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import org.apache.poi.hdgf.pointers.Pointer;
-
-/**
- * A placeholder for a stream where we don't known anything
- *  about how to process / handle it
- */
-public final class UnknownStream extends Stream {
-	protected UnknownStream(Pointer pointer, StreamStore store) {
-		super(pointer, store);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/Attachment.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/Attachment.java
deleted file mode 100644
index 59c90a4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/Attachment.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.MAPIStringAttribute;
-import org.apache.poi.hmef.attribute.TNEFAttribute;
-import org.apache.poi.hmef.attribute.TNEFDateAttribute;
-import org.apache.poi.hmef.attribute.TNEFMAPIAttribute;
-import org.apache.poi.hmef.attribute.TNEFProperty;
-import org.apache.poi.hmef.attribute.TNEFStringAttribute;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-
-
-/**
- * An attachment within a {@link HMEFMessage}. Provides both helper
- *  methods to get at common parts and attributes of the attachment,
- *  and list methods to get all of them.
- */
-public final class Attachment {
-   private final List<TNEFAttribute> attributes = new ArrayList<TNEFAttribute>();
-   private final List<MAPIAttribute> mapiAttributes = new ArrayList<MAPIAttribute>();
-   
-   protected void addAttribute(TNEFAttribute attr) {
-      attributes.add(attr);
-      
-      if(attr instanceof TNEFMAPIAttribute) {
-         TNEFMAPIAttribute tnefMAPI = (TNEFMAPIAttribute)attr;
-         mapiAttributes.addAll( tnefMAPI.getMAPIAttributes() );
-      }
-   }
-   
-   /**
-    * Return the attachment attribute with the given ID,
-    *  or null if there isn't one. 
-    */
-   public TNEFAttribute getAttribute(TNEFProperty id) {
-      for(TNEFAttribute attr : attributes) {
-         if(attr.getProperty() == id) {
-            return attr;
-         }
-      }
-      return null;
-   }
-   
-   /**
-    * Return the attachment MAPI Attribute with the given ID,
-    *  or null if there isn't one. 
-    */
-   public MAPIAttribute getMAPIAttribute(MAPIProperty id) {
-      for(MAPIAttribute attr : mapiAttributes) {
-         if(attr.getProperty() == id) {
-            return attr;
-         }
-      }
-      return null;
-   }
-   
-   /**
-    * Returns all HMEF/TNEF attributes of the attachment, 
-    *  such as filename, icon and contents
-    */
-   public List<TNEFAttribute> getAttributes() {
-      return attributes;
-   }
-   
-   /**
-    * Returns all MAPI attributes of the attachment, 
-    *  such as extension, encoding, size and position
-    */
-   public List<MAPIAttribute> getMAPIAttributes() {
-      return mapiAttributes;
-   }
-   
-   
-   /**
-    * Return the string value of the mapi property, or null
-    *  if it isn't set
-    */
-   private String getString(MAPIProperty id) {
-      return MAPIStringAttribute.getAsString( getMAPIAttribute(id) );
-   }
-   /**
-    * Returns the string value of the TNEF property, or
-    *  null if it isn't set
-    */
-   private String getString(TNEFProperty id) {
-      return TNEFStringAttribute.getAsString( getAttribute(id) );
-   }
-   
-   /**
-    * Returns the short filename
-    */
-   public String getFilename() {
-      return getString(TNEFProperty.ID_ATTACHTITLE);
-   }
-   /**
-    * Returns the long filename
-    */
-   public String getLongFilename() {
-      return getString(MAPIProperty.ATTACH_LONG_FILENAME);
-   }
-   /**
-    * Returns the file extension
-    */
-   public String getExtension() {
-      return getString(MAPIProperty.ATTACH_EXTENSION);
-   }
-   
-   /**
-    * Return when the file was last modified, if known.
-    */
-   public Date getModifiedDate() {
-      return TNEFDateAttribute.getAsDate(
-            getAttribute(TNEFProperty.ID_ATTACHMODIFYDATE)
-      );
-   }
-   
-   /**
-    * Returns the contents of the attachment.
-    *
-    * @throws IllegalArgumentException if there is no AttachmentData available in this Attachment
-    */
-   public byte[] getContents() {
-      TNEFAttribute contents = getAttribute(TNEFProperty.ID_ATTACHDATA);
-      if(contents == null) {
-         throw new IllegalArgumentException("Attachment corrupt - no Data section");
-      }
-      return contents.getData();
-   }
-   
-   /**
-    * Returns the Meta File rendered representation
-    *  of the attachment, or null if not set.
-    */
-   public byte[] getRenderedMetaFile() {
-      TNEFAttribute meta = getAttribute(TNEFProperty.ID_ATTACHMETAFILE);
-      if(meta == null) return null;
-      return meta.getData();
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java
deleted file mode 100644
index ad38755..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LZWDecompresser;
-import org.apache.poi.util.LittleEndian;
-
-
-/**
- * Within a {@link HMEFMessage}, the content is often
- *  stored in as RTF, but LZW compressed. This class
- *  handles decompressing it for you.
- */
-public final class CompressedRTF extends LZWDecompresser {
-   public static final byte[] COMPRESSED_SIGNATURE =
-      new byte[] { (byte)'L', (byte)'Z', (byte)'F', (byte)'u' };
-   public static final byte[] UNCOMPRESSED_SIGNATURE =
-      new byte[] { (byte)'M', (byte)'E', (byte)'L', (byte)'A' };
-   public static final int COMPRESSED_SIGNATURE_INT =
-      LittleEndian.getInt(COMPRESSED_SIGNATURE);
-   public static final int UNCOMPRESSED_SIGNATURE_INT =
-      LittleEndian.getInt(UNCOMPRESSED_SIGNATURE);
-   
-   // The 4096 byte LZW dictionary is pre-loaded with some common
-   //  RTF fragments. These come from RTFLIB32.LIB, which ships
-   //  with older versions of Visual Studio or the EDK
-   public static final String LZW_RTF_PRELOAD = 
-      "{\\rtf1\\ansi\\mac\\deff0\\deftab720{\\fonttbl;}{\\f0\\fnil \\froman \\fswiss " +
-      "\\fmodern \\fscript \\fdecor MS Sans SerifSymbolArialTimes New RomanCourier" +
-      "{\\colortbl\\red0\\green0\\blue0\n\r\\par \\pard\\plain\\f0\\fs20\\b\\i\\u\\tab\\tx";
-
-   private int compressedSize;
-   private int decompressedSize;
-   
-   public CompressedRTF() {
-      // Out flag has the normal meaning
-      // Length wise, we're 2 longer than we say, so the max len is 18
-      // Endian wise, we're big endian, so 0x1234 is pos 0x123
-      super(true, 2, true);
-   }
-
-   /**
-    * Decompresses the whole of the compressed RTF
-    *  stream, outputting the resulting RTF bytes.
-    * Note - will decompress any padding at the end of
-    *  the input, if present, use {@link #getDeCompressedSize()}
-    *  if you need to know how much of the result is
-    *  real. (Padding may be up to 7 bytes).
-    */
-   public void decompress(InputStream src, OutputStream res) throws IOException {
-      // Validate the header on the front of the RTF
-      compressedSize = LittleEndian.readInt(src);
-      decompressedSize = LittleEndian.readInt(src);
-      int compressionType = LittleEndian.readInt(src);
-      /* int dataCRC = */ LittleEndian.readInt(src);
-      
-      // TODO - Handle CRC checking on the output side
-      
-      // Do we need to do anything?
-      if(compressionType == UNCOMPRESSED_SIGNATURE_INT) {
-         // Nope, nothing fancy to do
-         IOUtils.copy(src, res);
-      } else if(compressionType == COMPRESSED_SIGNATURE_INT) {
-         // We need to decompress it below
-      } else {
-         throw new IllegalArgumentException("Invalid compression signature " + compressionType);
-      }
-
-      // Have it processed
-      super.decompress(src, res);
-   }
-   
-   /**
-    * Returns how big the compressed version was.
-    */
-   public int getCompressedSize() {
-      // Return the size less the header
-      return compressedSize - 12;
-   }
-   
-   /**
-    * Returns how big the decompressed version was.
-    */
-   public int getDeCompressedSize() {
-      return decompressedSize;
-   }
-
-   /**
-    * We use regular dictionary offsets, so no
-    *  need to change anything
-    */
-   @Override
-   protected int adjustDictionaryOffset(int offset) {
-      return offset;
-   }
-
-   @Override
-   protected int populateDictionary(byte[] dict) {
-     // Copy in the RTF constants 
-     byte[] preload = LZW_RTF_PRELOAD.getBytes(Charset.forName("US-ASCII"));
-     System.arraycopy(preload, 0, dict, 0, preload.length);
-     
-     // Start adding new codes after the constants
-     return preload.length;
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java
deleted file mode 100644
index 5dd7a82..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.MAPIStringAttribute;
-import org.apache.poi.hmef.attribute.TNEFAttribute;
-import org.apache.poi.hmef.attribute.TNEFMAPIAttribute;
-import org.apache.poi.hmef.attribute.TNEFProperty;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * HMEF - Implementation of the Microsoft TNEF message
- *  encoding format (aka winmail.dat)
- * See:
- *   http://support.microsoft.com/kb/241538
- *   http://en.wikipedia.org/wiki/Transport_Neutral_Encapsulation_Format
- *   http://search.cpan.org/dist/Convert-TNEF/
- */
-public final class HMEFMessage {
-    public static final int HEADER_SIGNATURE = 0x223e9f78;
-    
-    @SuppressWarnings("unused")
-    private int fileId;
-    private final List<TNEFAttribute> messageAttributes = new ArrayList<TNEFAttribute>();
-    private final List<MAPIAttribute> mapiAttributes = new ArrayList<MAPIAttribute>();
-    private final List<Attachment> attachments = new ArrayList<Attachment>();
-    
-    public HMEFMessage(InputStream inp) throws IOException {
-        try {
-            // Check the signature matches
-            int sig = LittleEndian.readInt(inp);
-            if (sig != HEADER_SIGNATURE) {
-                throw new IllegalArgumentException(
-                        "TNEF signature not detected in file, " +
-                        "expected " + HEADER_SIGNATURE + " but got " + sig
-                );
-            }
-            
-            // Read the File ID
-            fileId = LittleEndian.readUShort(inp);
-            
-            // Now begin processing the contents
-            process(inp);
-        } finally {
-            inp.close();
-        }
-    }
-    
-    private void process(InputStream inp) throws IOException {
-       int level;
-       do {
-           // Fetch the level
-           level = inp.read();
-
-           // Decide what to attach it to, based on the levels and IDs
-           switch (level) {
-               case TNEFProperty.LEVEL_MESSAGE:
-                   processMessage(inp);
-                   break;
-                case TNEFProperty.LEVEL_ATTACHMENT:
-                   processAttachment(inp);
-                   break;
-               // ignore trailing newline
-                case '\r':
-                case '\n':
-                case TNEFProperty.LEVEL_END_OF_FILE:
-                    break;
-                default:
-                    throw new IllegalStateException("Unhandled level " + level);
-            }
-        } while (level != TNEFProperty.LEVEL_END_OF_FILE);
-    }
-
-    void processMessage(InputStream inp) throws IOException {
-        // Build the attribute
-        TNEFAttribute attr = TNEFAttribute.create(inp);
-
-        messageAttributes.add(attr);
-
-        if (attr instanceof TNEFMAPIAttribute) {
-            TNEFMAPIAttribute tnefMAPI = (TNEFMAPIAttribute) attr;
-            mapiAttributes.addAll(tnefMAPI.getMAPIAttributes());
-        }
-    }
-
-    void processAttachment(InputStream inp) throws IOException {
-        // Build the attribute
-        TNEFAttribute attr = TNEFAttribute.create(inp);
-
-        // Previous attachment or a new one?
-        if (attachments.isEmpty()
-                || attr.getProperty() == TNEFProperty.ID_ATTACHRENDERDATA) {
-            attachments.add(new Attachment());
-        }
-
-        // Save the attribute for it
-        Attachment attach = attachments.get(attachments.size() - 1);
-        attach.addAttribute(attr);
-    }
-    
-    /**
-     * Returns all HMEF/TNEF attributes of the message. 
-     * Note - In a typical message, most of the interesting properties
-     *  are stored as {@link MAPIAttribute}s - see {@link #getMessageMAPIAttributes()} 
-     */
-    public List<TNEFAttribute> getMessageAttributes() {
-        return Collections.unmodifiableList(messageAttributes);
-    }
-    
-    /**
-     * Returns all MAPI attributes of the message.
-     * Note - A small number of HMEF/TNEF specific attributes normally
-     *  apply to most messages, see {@link #getMessageAttributes()}
-     */
-    public List<MAPIAttribute> getMessageMAPIAttributes() {
-        return Collections.unmodifiableList(mapiAttributes);
-    }
-    
-    /**
-     * Returns all the Attachments of the message.
-     */
-    public List<Attachment> getAttachments() {
-        return Collections.unmodifiableList(attachments);
-    }
-    
-    /**
-     * Return the message attribute with the given ID,
-     *  or null if there isn't one. 
-     */
-    public TNEFAttribute getMessageAttribute(TNEFProperty id) {
-        for (TNEFAttribute attr : messageAttributes) {
-            if (attr.getProperty() == id) {
-                return attr;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Return the message MAPI Attribute with the given ID,
-     *  or null if there isn't one. 
-     */
-    public MAPIAttribute getMessageMAPIAttribute(MAPIProperty id) {
-        for (MAPIAttribute attr : mapiAttributes) {
-            // Because of custom properties, match on ID not literal property object
-            if (attr.getProperty().id == id.id) {
-                return attr;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Return the string value of the mapi property, or null
-     *  if it isn't set
-     */
-    private String getString(MAPIProperty id) {
-        return MAPIStringAttribute.getAsString( getMessageMAPIAttribute(id) );
-    }
-    
-    /**
-     * Returns the Message Subject, or null if the mapi property
-     *  for this isn't set
-     */
-    public String getSubject() {
-        return getString(MAPIProperty.CONVERSATION_TOPIC);
-    }
-    
-    /**
-     * Returns the Message Body, as RTF, or null if the mapi property
-     *  for this isn't set
-     */
-    public String getBody() {
-        return getString(MAPIProperty.RTF_COMPRESSED);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
deleted file mode 100644
index 84161f8..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.Types;
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
-/**
- * A pure-MAPI attribute which applies to a {@link HMEFMessage}
- *  or one of its {@link Attachment}s.
- */
-public class MAPIAttribute {
-   private final MAPIProperty property;
-   private final int type;
-   private final byte[] data;
-   
-   /**
-    * Constructs a single new attribute from
-    *  the contents of the stream
-    */
-   public MAPIAttribute(MAPIProperty property, int type, byte[] data) {
-      this.property = property;
-      this.type = type;
-      this.data = data.clone();
-   }
-
-   public MAPIProperty getProperty() {
-      return property;
-   }
-
-   public int getType() {
-      return type;
-   }
-
-   public byte[] getData() {
-      return data;
-   }
-   
-   public String toString() {
-      String hex;
-      if(data.length <= 16) {
-         hex = HexDump.toHex(data);
-      } else {
-         byte[] d = new byte[16];
-         System.arraycopy(data, 0, d, 0, 16);
-         hex = HexDump.toHex(d);
-         hex = hex.substring(0, hex.length()-1) + ", ....]";
-      }
-      
-      return property.toString() + " " + hex;
-   }
-   
-   /**
-    * Parses a MAPI Properties TNEF Attribute, and returns
-    *  the list of MAPI Attributes contained within it
-    */
-   public static List<MAPIAttribute> create(TNEFAttribute parent) throws IOException {
-      if(parent.getProperty() == TNEFProperty.ID_MAPIPROPERTIES) {
-         // Regular MAPI Properties, normally on the message
-      }
-      else if(parent.getProperty() == TNEFProperty.ID_ATTACHMENT) {
-         // MAPI Properties for an attachment
-      }
-      else {
-         // Something else, oh dear...
-         throw new IllegalArgumentException(
-               "Can only create from a MAPIProperty attribute, " +
-               "instead received a " + parent.getProperty() + " one"
-         );
-      }
-      ByteArrayInputStream inp = new ByteArrayInputStream(parent.getData());
-      
-      // First up, get the number of attributes
-      int count = LittleEndian.readInt(inp);
-      List<MAPIAttribute> attrs = new ArrayList<MAPIAttribute>();
-      
-      // Now, read each one in in turn
-      for(int i=0; i<count; i++) {
-         int typeAndMV = LittleEndian.readUShort(inp);
-         int id = LittleEndian.readUShort(inp);
-         
-         // Is it either Multi-Valued or Variable-Length?
-         boolean isMV = false;
-         boolean isVL = false;
-         int typeId = typeAndMV;
-         if( (typeAndMV & Types.MULTIVALUED_FLAG) != 0 ) {
-            isMV = true;
-            typeId -= Types.MULTIVALUED_FLAG;
-         }
-         if(typeId == Types.ASCII_STRING.getId() || typeId == Types.UNICODE_STRING.getId() ||
-               typeId == Types.BINARY.getId() || typeId == Types.DIRECTORY.getId()) {
-            isVL = true;
-         }
-         
-         // Turn the type ID into a strongly typed thing
-         MAPIType type = Types.getById(typeId);
-         if (type == null) {
-            type = Types.createCustom(typeId);
-         }
-         
-         // If it's a named property, rather than a standard
-         //  MAPI property, grab the details of it
-         MAPIProperty prop = MAPIProperty.get(id);
-         if(id >= 0x8000 && id <= 0xFFFF) {
-            byte[] guid = new byte[16];
-            IOUtils.readFully(inp, guid);
-            int mptype = LittleEndian.readInt(inp);
-            
-            // Get the name of it
-            String name;
-            if(mptype == 0) {
-               // It's based on a normal one
-               int mpid = LittleEndian.readInt(inp);
-               MAPIProperty base = MAPIProperty.get(mpid);
-               name = base.name;
-            } else {
-               // Custom name was stored
-               int mplen = LittleEndian.readInt(inp);
-               byte[] mpdata = new byte[mplen];
-               IOUtils.readFully(inp, mpdata);
-               name = StringUtil.getFromUnicodeLE(mpdata, 0, (mplen/2)-1);
-               skipToBoundary(mplen, inp);
-            }
-            
-            // Now create
-            prop = MAPIProperty.createCustom(id, type, name);
-         }
-         if(prop == MAPIProperty.UNKNOWN) {
-            prop = MAPIProperty.createCustom(id, type, "(unknown " + Integer.toHexString(id) + ")");
-         }
-         
-         // Now read in the value(s)
-         int values = 1;
-         if(isMV || isVL) {
-            values = LittleEndian.readInt(inp);
-         }
-         for(int j=0; j<values; j++) {
-            int len = getLength(type, inp);
-            byte[] data = new byte[len];
-            IOUtils.readFully(inp, data);
-            skipToBoundary(len, inp);
-            
-            // Create
-            MAPIAttribute attr;
-            if(type == Types.UNICODE_STRING || type == Types.ASCII_STRING) {
-               attr = new MAPIStringAttribute(prop, typeId, data);
-            } else if(type == Types.APP_TIME || type == Types.TIME) {
-               attr = new MAPIDateAttribute(prop, typeId, data);
-            } else if(id == MAPIProperty.RTF_COMPRESSED.id) {
-               attr = new MAPIRtfAttribute(prop, typeId, data);
-            } else {
-               attr = new MAPIAttribute(prop, typeId, data);
-            }
-            attrs.add(attr);
-         }
-      }
-      
-      // All done
-      return attrs;
-   }
-   private static int getLength(MAPIType type, InputStream inp) throws IOException {
-      if (type.isFixedLength()) {
-         return type.getLength();
-      }
-      if (type == Types.ASCII_STRING ||
-          type == Types.UNICODE_STRING ||
-          type == Types.DIRECTORY ||
-          type == Types.BINARY) {
-            // Need to read the length, as it varies
-            return LittleEndian.readInt(inp);
-      } else {
-            throw new IllegalArgumentException("Unknown type " + type);
-      }
-   }
-   private static void skipToBoundary(int length, InputStream inp) throws IOException {
-      // Data is always padded out to a 4 byte boundary
-      if(length % 4 != 0) {
-         int skip = 4 - (length % 4);
-         byte[] padding = new byte[skip];
-         IOUtils.readFully(inp, padding);
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
deleted file mode 100644
index 53eb575..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.text.DateFormat;
-import java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hpsf.Util;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * A pure-MAPI attribute holding a Date, which applies 
- * to a {@link HMEFMessage} or one of its {@link Attachment}s.
- * 
- * Timestamps are usually given in UTC.
- * 
- * @see <a href="https://msdn.microsoft.com/en-us/library/cc433482(v=exchg.80).aspx">[MS-OXOMSG]: Email Object Protocol</a>
- * @see <a href="https://msdn.microsoft.com/en-us/library/cc433490(v=exchg.80).aspx">[MS-OXPROPS]: Exchange Server Protocols Master Property List</a>
- */
-public final class MAPIDateAttribute extends MAPIAttribute {
-   private static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class);
-   private Date data;
-   
-   /**
-    * Constructs a single new date attribute from the id, type,
-    *  and the contents of the stream
-    */
-   protected MAPIDateAttribute(MAPIProperty property, int type, byte[] data) {
-      super(property, type, data);
-      
-      // The value is a 64 bit Windows Filetime
-      this.data = Util.filetimeToDate(
-            LittleEndian.getLong(data, 0)
-      );
-   }
-
-   public Date getDate() {
-      return this.data;
-   }
-   
-   public String toString() {
-       DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ROOT);
-       DateFormat df = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dfs);
-       df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-       return getProperty().toString() + " " + df.format(data);
-   }
-   
-   /**
-    * Returns the Date of a Attribute, converting as appropriate
-    */
-   public static Date getAsDate(MAPIAttribute attr) {
-      if(attr == null) {
-         return null;
-      }
-      if(attr instanceof MAPIDateAttribute) {
-         return ((MAPIDateAttribute)attr).getDate();
-      }
-      
-      logger.log(POILogger.WARN, "Warning, non date property found: " + attr.toString());
-      return null;
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
deleted file mode 100644
index cd77383..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.CompressedRTF;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.util.StringUtil;
-
-/**
- * A pure-MAPI attribute holding RTF (compressed or not), which applies 
- *  to a {@link HMEFMessage} or one of its {@link Attachment}s.
- */
-public final class MAPIRtfAttribute extends MAPIAttribute {
-   private final byte[] decompressed;
-   private final String data;
-   
-   public MAPIRtfAttribute(MAPIProperty property, int type, byte[] data) throws IOException {
-      super(property, type, data);
-      
-      // Decompress it, removing any trailing padding as needed
-      CompressedRTF rtf = new CompressedRTF();
-      byte[] tmp = rtf.decompress(new ByteArrayInputStream(data));
-      if(tmp.length > rtf.getDeCompressedSize()) {
-         this.decompressed = new byte[rtf.getDeCompressedSize()];
-         System.arraycopy(tmp, 0, decompressed, 0, decompressed.length);
-      } else {
-         this.decompressed = tmp;
-      }
-      
-      // Turn the RTF data into a more useful string
-      this.data = StringUtil.getFromCompressedUnicode(decompressed, 0, decompressed.length);
-   }
-   
-   /**
-    * Returns the original, compressed RTF
-    */
-   public byte[] getRawData() {
-      return super.getData();
-   }
-   
-   /**
-    * Returns the raw uncompressed RTF data
-    */
-   public byte[] getData() {
-      return decompressed;
-   }
-   
-   /**
-    * Returns the uncompressed RTF as a string
-    */
-   public String getDataString() {
-      return data;
-   }
-   
-   public String toString() {
-      return getProperty().toString() + " " + data;
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
deleted file mode 100644
index 5307e71..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.nio.charset.Charset;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.Types;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * A pure-MAPI attribute holding a String, which applies 
- *  to a {@link HMEFMessage} or one of its {@link Attachment}s.
- */
-public final class MAPIStringAttribute extends MAPIAttribute {
-   private static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class);
-   private static final String CODEPAGE = "CP1252";
-   private final String data;
-   
-   public MAPIStringAttribute(MAPIProperty property, int type, byte[] data) {
-      super(property, type, data);
-      
-      String tmpData = null;
-      if(type == Types.ASCII_STRING.getId()) {
-         tmpData = new String(data, Charset.forName(CODEPAGE));
-      } else if(type == Types.UNICODE_STRING.getId()) {
-         tmpData = StringUtil.getFromUnicodeLE(data);
-      } else {
-         throw new IllegalArgumentException("Not a string type " + type);
-      }
-      
-      // Strip off the null terminator if present
-      if(tmpData.endsWith("\0")) {
-         tmpData = tmpData.substring(0, tmpData.length()-1);
-      }
-      this.data = tmpData;
-   }
-   
-   public String getDataString() {
-      return data;
-   }
-   
-   public String toString() {
-      return getProperty().toString() + " " + data;
-   }
-   
-   /**
-    * Returns the string of a Attribute, converting as appropriate
-    */
-   public static String getAsString(MAPIAttribute attr) {
-      if(attr == null) {
-         return null;
-      }
-      if(attr instanceof MAPIStringAttribute) {
-         return ((MAPIStringAttribute)attr).getDataString();
-      }
-      if(attr instanceof MAPIRtfAttribute) {
-         return ((MAPIRtfAttribute)attr).getDataString();
-      }
-      
-      logger.log(POILogger.WARN, "Warning, non string property found: " + attr.toString());
-      return null;
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java
deleted file mode 100644
index af0ac3d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-
-
-/**
- * An attribute which applies to a {@link HMEFMessage}
- *  or one of its {@link Attachment}s.
- * Note - the types and IDs differ from standard Outlook/MAPI
- *  ones, so we can't just re-use the HSMF ones.
- */
-public class TNEFAttribute {
-   private final TNEFProperty property;
-   private final int type;
-   private final byte[] data;
-   private final int checksum;
-   
-   /**
-    * Constructs a single new attribute from the id, type,
-    *  and the contents of the stream
-    */
-   protected TNEFAttribute(int id, int type, InputStream inp) throws IOException {
-      this.type = type;
-      int length = LittleEndian.readInt(inp);
-      
-      property = TNEFProperty.getBest(id, type);
-      data = new byte[length];
-      IOUtils.readFully(inp, data);
-      
-      checksum = LittleEndian.readUShort(inp);
-   }
-   
-   /**
-    * Creates a new TNEF Attribute by reading data from
-    *  the stream within a {@link HMEFMessage}
-    */
-   public static TNEFAttribute create(InputStream inp) throws IOException {
-      int id   = LittleEndian.readUShort(inp);
-      int type = LittleEndian.readUShort(inp);
-      
-      // Create as appropriate
-      if(id == TNEFProperty.ID_MAPIPROPERTIES.id ||
-            id == TNEFProperty.ID_ATTACHMENT.id) {
-         return new TNEFMAPIAttribute(id, type, inp);
-      }
-      if(type == TNEFProperty.TYPE_STRING ||
-           type == TNEFProperty.TYPE_TEXT) {
-         return new TNEFStringAttribute(id, type, inp);
-      }
-      if(type == TNEFProperty.TYPE_DATE) {
-         return new TNEFDateAttribute(id, type, inp);
-      }
-      return new TNEFAttribute(id, type, inp); 
-   }
-
-   public TNEFProperty getProperty() {
-      return property;
-   }
-
-   public int getType() {
-      return type;
-   }
-
-   public byte[] getData() {
-      return data;
-   }
-   
-   public String toString() {
-      return "Attribute " + property.toString() + ", type=" + type + 
-             ", data length=" + data.length; 
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
deleted file mode 100644
index 1df0d96..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hpsf.Util;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * A Date attribute which applies to a {@link HMEFMessage}
- *  or one of its {@link Attachment}s.
- */
-public final class TNEFDateAttribute extends TNEFAttribute {
-   private static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class);
-   private Date data;
-   
-   /**
-    * Constructs a single new date attribute from the id, type,
-    *  and the contents of the stream
-    */
-   protected TNEFDateAttribute(int id, int type, InputStream inp) throws IOException {
-      super(id, type, inp);
-      
-      byte[] binData = getData();
-      if(binData.length == 8) {
-         // The value is a 64 bit Windows Filetime
-         this.data = Util.filetimeToDate(
-               LittleEndian.getLong(getData(), 0)
-         );
-      } else if(binData.length == 14) {
-         // It's the 7 date fields. We think it's in UTC...
-         Calendar c = LocaleUtil.getLocaleCalendar(LocaleUtil.TIMEZONE_UTC);
-         c.set(Calendar.YEAR, LittleEndian.getUShort(binData, 0));
-         c.set(Calendar.MONTH, LittleEndian.getUShort(binData, 2) - 1); // Java months are 0 based!
-         c.set(Calendar.DAY_OF_MONTH, LittleEndian.getUShort(binData, 4));
-         c.set(Calendar.HOUR_OF_DAY, LittleEndian.getUShort(binData, 6));
-         c.set(Calendar.MINUTE, LittleEndian.getUShort(binData, 8));
-         c.set(Calendar.SECOND, LittleEndian.getUShort(binData, 10));
-         // The 7th field is day of week, which we don't require
-         c.clear(Calendar.MILLISECOND); // Not set in the file
-         this.data = c.getTime();
-      } else {
-         throw new IllegalArgumentException("Invalid date, found " + binData.length + " bytes");
-      }
-   }
-
-   public Date getDate() {
-      return this.data;
-   }
-   
-   public String toString() {
-       DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ROOT);
-       DateFormat df = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dfs);
-       df.setTimeZone(LocaleUtil.TIMEZONE_UTC);       
-      return "Attribute " + getProperty().toString() + ", type=" + getType() + 
-             ", date=" + df.format(data); 
-   }
-   
-   /**
-    * Returns the Date of a Attribute, converting as appropriate
-    */
-   public static Date getAsDate(TNEFAttribute attr) {
-      if(attr == null) {
-         return null;
-      }
-      if(attr instanceof TNEFDateAttribute) {
-         return ((TNEFDateAttribute)attr).getDate();
-      }
-      
-      logger.log(POILogger.WARN, "Warning, non date property found: " + attr.toString());
-      return null;
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
deleted file mode 100644
index 3144981..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-
-/**
- * A TNEF Attribute holding MAPI Attributes, which applies to a 
- *  {@link HMEFMessage} or one of its {@link Attachment}s.
- */
-public final class TNEFMAPIAttribute extends TNEFAttribute {
-   private final List<MAPIAttribute> attributes;
-   
-   /**
-    * Constructs a single new mapi containing attribute from the 
-    *  id, type, and the contents of the stream
-    */
-   protected TNEFMAPIAttribute(int id, int type, InputStream inp) throws IOException {
-      super(id, type, inp);
-      
-      attributes = MAPIAttribute.create(this);
-   }
-
-   public List<MAPIAttribute> getMAPIAttributes() {
-      return attributes;
-   }
-   
-   public String toString() {
-      return "Attribute " + getProperty().toString() + ", type=" + getType() + 
-             ", " + attributes.size() + " MAPI Attributes"; 
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java
deleted file mode 100644
index de4d8a5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Holds the list of TNEF Attributes, and allows lookup
- *  by friendly name, ID and MAPI Property Name.
- *  
- * Note - the types and IDs differ from standard Outlook/MAPI
- *  ones, so we can't just re-use the HSMF ones.
- */
-public final class TNEFProperty {
-   private static Map<Integer, List<TNEFProperty>> properties = new HashMap<Integer, List<TNEFProperty>>();
-   
-   // Types taken from http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefattributetype%28v=EXCHG.140%29.aspx
-   public static final int TYPE_TRIPLES = 0x0000;
-   public static final int TYPE_STRING  = 0x0001;
-   public static final int TYPE_TEXT    = 0x0002;
-   public static final int TYPE_DATE    = 0x0003;
-   public static final int TYPE_SHORT   = 0x0004;
-   public static final int TYPE_LONG    = 0x0005;
-   public static final int TYPE_BYTE    = 0x0006;
-   public static final int TYPE_WORD    = 0x0007;
-   public static final int TYPE_DWORD   = 0x0008;
-   public static final int TYPE_MAX     = 0x0009;
-
-   // Types taken from http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefpropertytype%28v=EXCHG.140%29.aspx
-   /** AppTime - application time value */
-   public static final int PTYPE_APPTIME = 0x0007;
-   /** Binary - counted byte array */
-   public static final int PTYPE_BINARY  = 0x0102;
-   /** Boolean - 16-bit Boolean value. '0' is false. Non-zero is true */
-   public static final int PTYPE_BOOLEAN = 0x000B;
-   /** ClassId - OLE GUID */
-   public static final int PTYPE_CLASSID = 0x0048;
-   /** Currency - signed 64-bit integer that represents a base ten decimal with four digits to the right of the decimal point */
-   public static final int PTYPE_CURRENCY = 0x0006;
-   /** Double - floating point double */
-   public static final int PTYPE_DOUBLE   = 0x0005;
-   /** Error - 32-bit error value */
-   public static final int PTYPE_ERROR = 0x000A;
-   /** I2 - signed 16-bit value */
-   public static final int PTYPE_I2 = 0x0002;
-   /** I8 - 8-byte signed integer */
-   public static final int PTYPE_I8 = 0x0014;
-   /** Long - signed 32-bit value */
-   public static final int PTYPE_LONG = 0x0003;
-   /** MultiValued - Value part contains multiple values */
-   public static final int PTYPE_MULTIVALUED = 0x1000;
-   /** Null - NULL property value */
-   public static final int PTYPE_NULL = 0x0001;
-   /** Object - embedded object in a property */
-   public static final int PTYPE_OBJECT = 0x000D;
-   /** R4 - 4-byte floating point value */
-   public static final int PTYPE_R4 = 0x0004;
-   /** String8 - null-terminated 8-bit character string */
-   public static final int PTYPE_STRING8 = 0x001E;
-   /** SysTime - FILETIME 64-bit integer specifying the number of 100ns periods since Jan 1, 1601 */
-   public static final int PTYPE_SYSTIME = 0x0040;
-   /** Unicode - null-terminated Unicode string */
-   public static final int PTYPE_UNICODE = 0x001F;
-   /** Unspecified */
-   public static final int PTYPE_UNSPECIFIED = 0x0000;
-                    
-
-   // Levels taken from http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefattributelevel%28v=EXCHG.140%29.aspx
-   public static final int LEVEL_MESSAGE     = 0x01;
-   public static final int LEVEL_ATTACHMENT  = 0x02;
-   public static final int LEVEL_END_OF_FILE = -0x01;
-   
-   // ID information taken from http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefattributetag%28v=EXCHG.140%29.aspx
-   public static final TNEFProperty ID_AIDOWNER = 
-      new TNEFProperty(0x0008, TYPE_LONG, "AidOwner", "PR_OWNER_APPT_ID");
-   public static final TNEFProperty ID_ATTACHCREATEDATE = 
-      new TNEFProperty(0x8012, TYPE_DATE, "AttachCreateDate", "PR_CREATION_TIME");
-   public static final TNEFProperty ID_ATTACHDATA = 
-      new TNEFProperty(0x800F, TYPE_BYTE, "AttachData", "PR_ATTACH_DATA_BIN");
-   public static final TNEFProperty ID_ATTACHMENT = 
-      new TNEFProperty(0x9005, TYPE_BYTE, "Attachment", null);
-   public static final TNEFProperty ID_ATTACHMETAFILE = 
-      new TNEFProperty(0x8011, TYPE_BYTE, "AttachMetaFile", "PR_ATTACH_RENDERING");
-   public static final TNEFProperty ID_ATTACHMODIFYDATE = 
-      new TNEFProperty(0x8013, TYPE_DATE, "AttachModifyDate", "PR_LAST_MODIFICATION_TIME");
-   public static final TNEFProperty ID_ATTACHRENDERDATA = 
-      new TNEFProperty(0x9002, TYPE_BYTE, "AttachRenderData", "attAttachRenddata");
-   public static final TNEFProperty ID_ATTACHTITLE = 
-      new TNEFProperty(0x8010, TYPE_STRING, "AttachTitle", "PR_ATTACH_FILENAME");
-   public static final TNEFProperty ID_ATTACHTRANSPORTFILENAME = 
-      new TNEFProperty(0x9001, TYPE_BYTE, "AttachTransportFilename", "PR_ATTACH_TRANSPORT_NAME");
-   public static final TNEFProperty ID_BODY = 
-      new TNEFProperty(0x800C, TYPE_TEXT, "Body", "PR_BODY");
-   public static final TNEFProperty ID_CONVERSATIONID = 
-      new TNEFProperty(0x800B, TYPE_STRING, "ConversationId", "PR_CONVERSATION_KEY");
-   public static final TNEFProperty ID_DATEEND =
-      new TNEFProperty(0x0007, TYPE_DATE, "DateEnd", "PR_END_DATE");
-   public static final TNEFProperty ID_DATEMODIFIED = 
-      new TNEFProperty(0x8020, TYPE_DATE, "DateModified", "PR_LAST_MODIFICATION_TIME ");
-   public static final TNEFProperty ID_DATERECEIVED = 
-      new TNEFProperty(0x8006, TYPE_DATE, "DateReceived", "PR_MESSAGE_DELIVERY_TIME ");
-   public static final TNEFProperty ID_DATESENT = 
-      new TNEFProperty(0x8005, TYPE_DATE, "DateSent", "PR_CLIENT_SUBMIT_TIME ");
-   public static final TNEFProperty ID_DATESTART = 
-      new TNEFProperty(0x0006, TYPE_DATE, "DateStart", "PR_START_DATE ");
-   public static final TNEFProperty ID_DELEGATE = 
-      new TNEFProperty(0x0002, TYPE_BYTE, "Delegate", "PR_RCVD_REPRESENTING_xxx ");
-   public static final TNEFProperty ID_FROM = 
-      new TNEFProperty(0x8000, TYPE_STRING, "From", "PR_SENDER_ENTRYID");
-   public static final TNEFProperty ID_MAPIPROPERTIES = 
-      new TNEFProperty(0x9003, TYPE_BYTE, "MapiProperties", null);
-   public static final TNEFProperty ID_MESSAGECLASS = 
-      new TNEFProperty(0x8008, TYPE_WORD, "MessageClass", "PR_MESSAGE_CLASS ");
-   public static final TNEFProperty ID_MESSAGEID = 
-      new TNEFProperty(0x8009, TYPE_STRING, "MessageId", "PR_SEARCH_KEY");
-   public static final TNEFProperty ID_MESSAGESTATUS = 
-      new TNEFProperty(0x8007, TYPE_BYTE, "MessageStatus", "PR_MESSAGE_FLAGS");
-   public static final TNEFProperty ID_NULL = 
-      new TNEFProperty(0x0000, -1, "Null", null);
-   public static final TNEFProperty ID_OEMCODEPAGE = 
-      new TNEFProperty(0x9007, TYPE_BYTE, "OemCodepage", "AttOemCodepage");
-   public static final TNEFProperty ID_ORIGINALMESSAGECLASS = 
-      new TNEFProperty(0x0006, TYPE_WORD, "OriginalMessageClass", "PR_ORIG_MESSAGE_CLASS"); 
-   public static final TNEFProperty ID_OWNER = 
-      new TNEFProperty(0x0000, TYPE_BYTE, "Owner", "PR_RCVD_REPRESENTING_xxx");
-   public static final TNEFProperty ID_PARENTID = 
-      new TNEFProperty(0x800A, TYPE_STRING, "ParentId", "PR_PARENT_KEY");
-   public static final TNEFProperty ID_PRIORITY = 
-      new TNEFProperty(0x800D, TYPE_SHORT, "Priority", "PR_IMPORTANCE");
-   public static final TNEFProperty ID_RECIPIENTTABLE = 
-      new TNEFProperty(0x9004, TYPE_BYTE, "RecipientTable", "PR_MESSAGE_RECIPIENTS");
-   public static final TNEFProperty ID_REQUESTRESPONSE = 
-      new TNEFProperty(0x009, TYPE_SHORT, "RequestResponse", "PR_RESPONSE_REQUESTED");
-   public static final TNEFProperty ID_SENTFOR = 
-      new TNEFProperty(0x0001, TYPE_BYTE, "SentFor", "PR_SENT_REPRESENTING_xxx");
-   public static final TNEFProperty ID_SUBJECT = 
-      new TNEFProperty(0x8004, TYPE_STRING, "Subject", "PR_SUBJECT");
-   public static final TNEFProperty ID_TNEFVERSION = 
-      new TNEFProperty(0x9006, TYPE_DWORD, "TnefVersion", "attTnefVersion");
-   public static final TNEFProperty ID_UNKNOWN =
-      new TNEFProperty(-1, -1, "Unknown", null);
-   
-   /** The TNEF Property ID */
-   public final int id;
-   /** Usual Type */
-   public final int usualType;
-   /** Property Name */
-   public final String name;
-   /** Equivalent MAPI Property */
-   public final String mapiProperty;
-
-   private TNEFProperty(int id, int usualType, String name, String mapiProperty) {
-      this.id = id;
-      this.usualType = usualType;
-      this.name = name;
-      this.mapiProperty = mapiProperty;
-
-      // Store it for lookup
-      if(! properties.containsKey(id)) {
-         properties.put(id, new ArrayList<TNEFProperty>());
-      }
-      properties.get(id).add(this);
-   }
-   
-   public static TNEFProperty getBest(int id, int type) {
-      List<TNEFProperty> attrs = properties.get(id);
-      if(attrs == null) {
-         return ID_UNKNOWN;
-      }
-
-      // If there's only one, it's easy
-      if(attrs.size() == 1) {
-         return attrs.get(0);
-      }
-
-      // Try by type
-      for(TNEFProperty attr : attrs) {
-         if(attr.usualType == type) return attr;
-      }
-
-      // Go for the first if we can't otherwise decide...
-      return attrs.get(0);
-   }
-   
-   public String toString() {
-      StringBuffer str = new StringBuffer();
-      str.append(name);
-      str.append(" [");
-      str.append(id);
-      str.append("]");
-      if(mapiProperty != null) {
-         str.append(" (");
-         str.append(mapiProperty);
-         str.append(")");
-      }
-      return str.toString();
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
deleted file mode 100644
index 34e1ef3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * A String attribute which applies to a {@link HMEFMessage}
- *  or one of its {@link Attachment}s.
- */
-public final class TNEFStringAttribute extends TNEFAttribute {
-   private static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class);
-   private String data;
-   
-   /**
-    * Constructs a single new string attribute from the id, type,
-    *  and the contents of the stream
-    */
-   protected TNEFStringAttribute(int id, int type, InputStream inp) throws IOException {
-      super(id, type, inp);
-      
-      String tmpData = null;
-      byte[] data = getData();
-      if(getType() == TNEFProperty.TYPE_TEXT) {
-         tmpData = StringUtil.getFromUnicodeLE(data);
-      } else {
-         tmpData = StringUtil.getFromCompressedUnicode(
-              data, 0, data.length
-         );
-      }
-      
-      // Strip off the null terminator if present
-      if(tmpData.endsWith("\0")) {
-         tmpData = tmpData.substring(0, tmpData.length()-1);
-      }
-      this.data = tmpData;
-   }
-
-   public String getString() {
-      return this.data;
-   }
-   
-   public String toString() {
-      return "Attribute " + getProperty().toString() + ", type=" + getType() + 
-             ", data=" + getString(); 
-   }
-   
-   /**
-    * Returns the string of a Attribute, converting as appropriate
-    */
-   public static String getAsString(TNEFAttribute attr) {
-      if(attr == null) {
-         return null;
-      }
-      if(attr instanceof TNEFStringAttribute) {
-         return ((TNEFStringAttribute)attr).getString();
-      }
-      
-      logger.log(POILogger.WARN, "Warning, non string property found: " + attr.toString());
-      return null;
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
deleted file mode 100644
index 3d7bcfe..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.dev;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.TNEFAttribute;
-import org.apache.poi.hmef.attribute.TNEFDateAttribute;
-import org.apache.poi.hmef.attribute.TNEFProperty;
-import org.apache.poi.hmef.attribute.TNEFStringAttribute;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Developer focused raw dumper
- */
-public final class HMEFDumper {
-   public static void main(String[] args) throws Exception {
-      if(args.length < 1) {
-         throw new IllegalArgumentException("Filename must be given");
-      }
-      
-      boolean truncatePropData = true;
-      for(int i=0; i<args.length; i++) {
-         if(args[i].equalsIgnoreCase("--full")) {
-            truncatePropData = false;
-            continue;
-         }
-         
-         HMEFDumper dumper = new HMEFDumper(
-               new FileInputStream(args[i])
-         );
-         dumper.setTruncatePropertyData(truncatePropData);
-         dumper.dump();
-      }
-   }
-   
-   private InputStream inp;
-   private boolean truncatePropertyData;
-   
-   public HMEFDumper(InputStream inp) throws IOException {
-      this.inp = inp;
-      
-      // Check the signature matches
-      int sig = LittleEndian.readInt(inp);
-      if(sig != HMEFMessage.HEADER_SIGNATURE) {
-         throw new IllegalArgumentException(
-               "TNEF signature not detected in file, " +
-               "expected " + HMEFMessage.HEADER_SIGNATURE + 
-               " but got " + sig
-         );
-      }
-      
-      // Skip over the File ID
-      LittleEndian.readUShort(inp);
-   }
-   
-   public void setTruncatePropertyData(boolean truncate) {
-      truncatePropertyData = truncate;
-   }
-   
-   private void dump() throws IOException {
-      int level;
-      int attachments = 0;
-      
-      while(true) {
-         // Fetch the level
-         level = inp.read();
-         if(level == TNEFProperty.LEVEL_END_OF_FILE) {
-            break;
-         }
-       
-         // Build the attribute
-         TNEFAttribute attr = TNEFAttribute.create(inp);
-         
-         // Is it a new attachment?
-         if(level == TNEFProperty.LEVEL_ATTACHMENT && 
-               attr.getProperty() == TNEFProperty.ID_ATTACHRENDERDATA) {
-            attachments++;
-            System.out.println();
-            System.out.println("Attachment # " + attachments);
-            System.out.println();
-         }
-         
-         // Print the attribute into
-         System.out.println(
-               "Level " + level + " : Type " + attr.getType() +
-               " : ID " + attr.getProperty().toString()
-         );
-         
-         // Print the contents
-         String indent = "  ";
-         
-         if(attr instanceof TNEFStringAttribute) {
-            System.out.println(indent + indent + indent + ((TNEFStringAttribute)attr).getString());
-         }
-         if(attr instanceof TNEFDateAttribute) {
-            System.out.println(indent + indent + indent + ((TNEFDateAttribute)attr).getDate());
-         }
-         
-         System.out.println(indent + "Data of length " + attr.getData().length);
-         if(attr.getData().length > 0) {
-            int len = attr.getData().length;
-            if(truncatePropertyData) {
-               len = Math.min( attr.getData().length, 48 );
-            }
-            
-            int loops = len/16;
-            if(loops == 0) loops = 1;
-            
-            for(int i=0; i<loops; i++) {
-               int thisLen = 16;
-               int offset = i*16;
-               if(i == loops-1) {
-                  thisLen = len - offset;
-               }
-
-               byte data[] = new byte[thisLen];
-               System.arraycopy(attr.getData(), offset, data, 0, thisLen);
-               
-               System.out.print(
-                     indent + HexDump.dump(data, 0, 0)
-               );
-            }
-         }
-         System.out.println();
-         
-         if(attr.getProperty() == TNEFProperty.ID_MAPIPROPERTIES ||
-               attr.getProperty() == TNEFProperty.ID_ATTACHMENT) {
-            List<MAPIAttribute> attrs = MAPIAttribute.create(attr);
-            for(MAPIAttribute ma : attrs) {
-               System.out.println(indent + indent + ma);
-            }
-            System.out.println();
-         }
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java b/trunk/src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
deleted file mode 100644
index e945cba..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.extractor;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.MAPIRtfAttribute;
-import org.apache.poi.hmef.attribute.MAPIStringAttribute;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.Types;
-import org.apache.poi.util.StringUtil;
-
-/**
- * A utility for extracting out the message body, and all attachments
- *  from a HMEF/TNEF/winmail.dat file
- */
-public final class HMEFContentsExtractor {
-    /**
-     * Usage: HMEFContentsExtractor &lt;filename&gt; &lt;output dir&gt;
-     */
-    public static void main(String[] args) throws IOException {
-        if(args.length < 2) {
-            System.err.println("Use:");
-            System.err.println("  HMEFContentsExtractor <filename> <output dir>");
-            System.err.println("");
-            System.err.println("");
-            System.err.println("Where <filename> is the winmail.dat file to extract,");
-            System.err.println(" and <output dir> is where to place the extracted files");
-            System.exit(2);
-        }
-        
-        final String filename = args[0];
-        final String outputDir = args[1];
-        
-        HMEFContentsExtractor ext = new HMEFContentsExtractor(new File(filename));
-        
-        File dir = new File(outputDir);
-        File rtf = new File(dir, "message.rtf");
-        if(! dir.exists()) {
-            throw new FileNotFoundException("Output directory " + dir.getName() + " not found");
-        }
-        
-        System.out.println("Extracting...");
-        ext.extractMessageBody(rtf);
-        ext.extractAttachments(dir);
-        System.out.println("Extraction completed");
-    }
-    
-    private final HMEFMessage message;
-    public HMEFContentsExtractor(File filename) throws IOException {
-        this(new HMEFMessage(new FileInputStream(filename)));
-    }
-    public HMEFContentsExtractor(HMEFMessage message) {
-        this.message = message;
-    }
-    
-    /**
-     * Extracts the RTF message body to the supplied file
-     */
-    public void extractMessageBody(File dest) throws IOException {
-        MAPIAttribute body = getBodyAttribute();
-        if (body == null) {
-            System.err.println("No message body found, " + dest + " not created");
-            return;
-        }
-        if (body instanceof MAPIStringAttribute) {
-            String name = dest.toString();
-            if (name.endsWith(".rtf")) { 
-                name = name.substring(0, name.length()-4);
-            }
-            dest = new File(name + ".txt");
-        }
-        
-        OutputStream fout = new FileOutputStream(dest);
-        try {
-            if (body instanceof MAPIStringAttribute) {
-                // Save in a predictable encoding, not raw bytes
-                String text = ((MAPIStringAttribute)body).getDataString();
-                fout.write(text.getBytes(StringUtil.UTF8));
-            } else {
-                // Save the raw bytes, should be raw RTF
-                fout.write(body.getData());
-            }
-        } finally {
-            fout.close();
-        }
-    }
-    
-    protected MAPIAttribute getBodyAttribute() {
-        MAPIAttribute body = message.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-        if (body != null) return body;
-        
-        // See bug #59786 - we'd really like a test file to confirm if this
-        //  is the right properties + if this is truely general or not!
-        MAPIProperty uncompressedBody = 
-                MAPIProperty.createCustom(0x3fd9, Types.ASCII_STRING, "Uncompressed Body");
-        // Return this uncompressed one, or null if that isn't their either
-        return message.getMessageMAPIAttribute(uncompressedBody);
-    }
-    
-    /**
-     * Extracts the RTF message body to the supplied stream. If there is no
-     *  RTF message body, nothing will be written to the stream, but no
-     *  errors or exceptions will be raised.
-     */
-    public void extractMessageBody(OutputStream out) throws IOException {
-        MAPIRtfAttribute body = (MAPIRtfAttribute)
-                message.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-        if (body != null) {
-            out.write(body.getData());
-        }
-    }
-    
-    /**
-     * Extracts all the message attachments to the supplied directory
-     */
-    public void extractAttachments(File dir) throws IOException {
-        int count = 0;
-        for(Attachment att : message.getAttachments()) {
-            count++;
-            
-            // Decide what to call it
-            String filename = att.getLongFilename();
-            if(filename == null || filename.length() == 0) {
-                filename = att.getFilename();
-            }
-            if(filename == null || filename.length() == 0) {
-                filename = "attachment" + count;
-                if(att.getExtension() != null) {
-                    filename += att.getExtension();
-                }
-            }
-            
-            // Save it
-            File file = new File(dir, filename);
-            OutputStream fout = new FileOutputStream(file);
-            try {
-                fout.write( att.getContents() );
-            } finally {
-                fout.close();
-            }
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java
deleted file mode 100644
index 764fa21..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIReadOnlyDocument;
-import org.apache.poi.hpbf.model.EscherDelayStm;
-import org.apache.poi.hpbf.model.EscherStm;
-import org.apache.poi.hpbf.model.MainContents;
-import org.apache.poi.hpbf.model.QuillContents;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * This class provides the basic functionality
- *  for HPBF, our implementation of the publisher
- *  file format.
- */
-public final class HPBFDocument extends POIReadOnlyDocument {
-	private MainContents mainContents;
-	private QuillContents quillContents;
-	private EscherStm escherStm;
-	private EscherDelayStm escherDelayStm;
-
-	/**
-	 * Opens a new publisher document
-	 */
-	public HPBFDocument(POIFSFileSystem fs) throws IOException {
-	   this(fs.getRoot());
-	}
-	public HPBFDocument(NPOIFSFileSystem fs) throws IOException {
-	   this(fs.getRoot());
-	}
-	public HPBFDocument(InputStream inp) throws IOException {
-	   this(new NPOIFSFileSystem(inp));
-	}
-
-	/**
-	 * Opens an embedded publisher document,
-	 *  at the given directory.
-	 */
-	public HPBFDocument(DirectoryNode dir) throws IOException {
-	   super(dir);
-
-	   // Go looking for our interesting child
-	   //  streams
-	   mainContents = new MainContents(dir);
-	   quillContents = new QuillContents(dir);
-
-	   // Now the Escher bits
-	   escherStm = new EscherStm(dir);
-	   escherDelayStm = new EscherDelayStm(dir);
-	}
-
-	public MainContents getMainContents() {
-		return mainContents;
-	}
-	public QuillContents getQuillContents() {
-		return quillContents;
-	}
-	public EscherStm getEscherStm() {
-		return escherStm;
-	}
-	public EscherDelayStm getEscherDelayStm() {
-		return escherDelayStm;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
deleted file mode 100644
index 48ad509..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.StringUtil;
-
-/**
- * For dumping out the contents of HPBF (Publisher)
- *  files, while we try to figure out how they're
- *  constructed.
- */
-public final class HPBFDumper {
-	private NPOIFSFileSystem fs;
-	public HPBFDumper(NPOIFSFileSystem fs) {
-		this.fs = fs;
-	}
-	
-	@SuppressWarnings("resource")
-    public HPBFDumper(InputStream inp) throws IOException {
-		this(new NPOIFSFileSystem(inp));
-	}
-
-	private static byte[] getData(DirectoryNode dir, String name) throws IOException {
-		// Grab the document stream
-		InputStream is = dir.createDocumentInputStream(name);
-		byte[] d = IOUtils.toByteArray(is);
-		is.close();
-
-		// All done
-		return d;
-	}
-
-	/**
-	 * Dumps out the given number of bytes as hex,
-	 *  two chars
-	 */
-	private String dumpBytes(byte[] data, int offset, int len) {
-		StringBuffer ret = new StringBuffer();
-		for(int i=0; i<len; i++) {
-			int j = i + offset;
-			int b = data[j];
-			if(b < 0) { b += 256; }
-
-			String bs = Integer.toHexString(b);
-			if(bs.length() == 1)
-				ret.append('0');
-			ret.append(bs);
-			ret.append(' ');
-		}
-		return ret.toString();
-	}
-
-	@SuppressWarnings("resource")
-    public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Use:");
-			System.err.println("  HPBFDumper <filename>");
-			System.exit(1);
-		}
-		HPBFDumper dump = new HPBFDumper(new NPOIFSFileSystem(new File(args[0])));
-
-		System.out.println("Dumping " + args[0]);
-		dump.dumpContents();
-		dump.dumpEnvelope();
-		dump.dumpEscher();
-		dump.dump001CompObj(dump.fs.getRoot());
-		dump.dumpQuill();
-
-		// Still to go:
-		//  (0x03)Internal
-		//  Objects
-	}
-
-	/**
-	 * Dump out the escher parts of the file.
-	 * Escher -> EscherStm and EscherDelayStm
-	 */
-	public void dumpEscher() throws IOException {
-		DirectoryNode escherDir = (DirectoryNode)
-			fs.getRoot().getEntry("Escher");
-
-		dumpEscherStm(escherDir);
-		dumpEscherDelayStm(escherDir);
-	}
-	private void dumpEscherStream(byte[] data) {
-		DefaultEscherRecordFactory erf =
-			new DefaultEscherRecordFactory();
-
-		// Dump
-		int left = data.length;
-		while(left > 0) {
-			EscherRecord er = erf.createRecord(data, 0);
-			er.fillFields(data, 0, erf);
-			left -= er.getRecordSize();
-
-			System.out.println(er.toString());
-		}
-	}
-	protected void dumpEscherStm(DirectoryNode escherDir) throws IOException {
-		byte[] data = getData(escherDir, "EscherStm");
-		System.out.println("");
-		System.out.println("EscherStm - " + data.length + " bytes long:");
-		if(data.length > 0)
-			dumpEscherStream(data);
-	}
-	protected void dumpEscherDelayStm(DirectoryNode escherDir) throws IOException {
-		byte[] data = getData(escherDir, "EscherDelayStm");
-		System.out.println("");
-		System.out.println("EscherDelayStm - " + data.length + " bytes long:");
-		if(data.length > 0)
-			dumpEscherStream(data);
-	}
-
-	public void dumpEnvelope() throws IOException {
-		byte[] data = getData(fs.getRoot(), "Envelope");
-
-		System.out.println("");
-		System.out.println("Envelope - " + data.length + " bytes long:");
-	}
-
-	public void dumpContents() throws IOException {
-		byte[] data = getData(fs.getRoot(), "Contents");
-
-		System.out.println("");
-		System.out.println("Contents - " + data.length + " bytes long:");
-
-		// 8 bytes, always seems to be
-		// E8 AC 2C 00 E8 03 05 01
-		// E8 AC 2C 00 E8 03 05 01
-
-		// 4 bytes - size of contents
-		// 13/15 00 00 01
-
-		// ....
-
-	    // E8 03 08 08 0C 20 03 00 00 00 00 88 16 00 00 00 ..... ..........
-
-	    // 01 18 27 00 03 20 00 00 E8 03 08 08 0C 20 03 00 ..'.. ....... ..
-
-		// 01 18 30 00 03 20 00 00
-		// E8 03 06 08 07 08 08 08 09 10 01 00 0C 20 04 00
-		// 00 00 00 88 1E 00 00 00
-
-		// 01 18 31 00 03 20 00 00
-		// E8 03 06 08 07 08 08 08 09 10 01 00 0C 20 04 00
-		// 00 00 00 88 1E 00 00 00
-
-		// 01 18 32 00 03 20 00 00
-		// E8 03 06 08 07 08 08 08 09 10 01 00 0C 20 04 00
-		// 00 00 00 88 1E 00 00 00
-	}
-
-	public void dumpCONTENTSraw(DirectoryNode dir) throws IOException {
-		byte[] data = getData(dir, "CONTENTS");
-
-		System.out.println("");
-		System.out.println("CONTENTS - " + data.length + " bytes long:");
-
-		// Between the start and 0x200 we have
-		//  CHNKINK(space) + 24 bytes
-		//  0x1800
-		//  TEXT + 6 bytes
-		//  TEXT + 8 bytes
-		//  0x1800
-		//  STSH + 6 bytes
-		//  STSH + 8 bytes
-		//  0x1800
-		//  STSH + 6 bytes
-		//  STSH + 8 bytes
-		// but towards 0x200 the pattern may
-		//  break down a little bit
-
-		// After the second of a given type,
-		//  it seems to be 4 bytes giving the start,
-		//  then 4 bytes giving the length, then
-		//  18 00
-		System.out.println(
-				new String(data, 0, 8, LocaleUtil.CHARSET_1252) +
-				dumpBytes(data, 8, 0x20-8)
-		);
-
-		int pos = 0x20;
-		boolean sixNotEight = true;
-		while(pos < 0x200) {
-			if(sixNotEight) {
-				System.out.println(
-						dumpBytes(data, pos, 2)
-				);
-				pos += 2;
-			}
-			String text = new String(data, pos, 4, LocaleUtil.CHARSET_1252);
-			int blen = 8;
-			if(sixNotEight)
-				blen = 6;
-			System.out.println(
-					text + " " + dumpBytes(data, pos+4, blen)
-			);
-
-			pos += 4 + blen;
-			sixNotEight = ! sixNotEight;
-		}
-
-		// Text from 0x200 onwards until we get
-		//  to \r(00)\n(00)(00)(00)
-		int textStop = -1;
-		for(int i=0x200; i<data.length-2 && textStop == -1; i++) {
-			if(data[i] == 0 && data[i+1] == 0 && data[i+2] == 0) {
-				textStop = i;
-			}
-		}
-		if(textStop > 0) {
-			int len = (textStop - 0x200) / 2;
-			System.out.println("");
-			System.out.println(
-					StringUtil.getFromUnicodeLE(data, 0x200, len)
-			);
-		}
-
-		// The font list comes slightly later
-
-		// The hyperlinks may come before the fonts,
-		//  or slightly in front
-	}
-	public void dumpCONTENTSguessed(DirectoryNode dir) throws IOException {
-		byte[] data = getData(dir, "CONTENTS");
-
-		System.out.println("");
-		System.out.println("CONTENTS - " + data.length + " bytes long:");
-
-		String[] startType = new String[20];
-		String[] endType = new String[20];
-		int[] optA = new int[20];
-		int[] optB = new int[20];
-		int[] optC = new int[20];
-		int[] from = new int[20];
-		int[] len = new int[20];
-
-		for(int i=0; i<20; i++) {
-			int offset = 0x20 + i*24;
-			if(data[offset] == 0x18 && data[offset+1] == 0x00) {
-				// Has data
-				startType[i] = new String(data, offset+2, 4, LocaleUtil.CHARSET_1252);
-				optA[i] = LittleEndian.getUShort(data, offset+6);
-				optB[i] = LittleEndian.getUShort(data, offset+8);
-				optC[i] = LittleEndian.getUShort(data, offset+10);
-				endType[i] = new String(data, offset+12, 4, LocaleUtil.CHARSET_1252);
-				from[i] = (int)LittleEndian.getUInt(data, offset+16);
-				len[i] = (int)LittleEndian.getUInt(data, offset+20);
-			} else {
-				// Doesn't have data
-			}
-		}
-
-		String text = StringUtil.getFromUnicodeLE(
-				data, from[0], len[0]/2
-		);
-
-		// Dump
-		for(int i=0; i<20; i++) {
-			String num = Integer.toString(i);
-			if(i < 10) {
-				num = "0" + i;
-			}
-			System.out.print(num + " ");
-
-			if(startType[i] == null) {
-				System.out.println("(not present)");
-			} else {
-				System.out.println(
-						"\t" +
-						startType[i] + " " +
-						optA[i] + " " +
-						optB[i] + " " +
-						optC[i]
-				);
-				System.out.println(
-						"\t" +
-						endType[i] + " " +
-						"from: " +
-						Integer.toHexString(from[i]) +
-						" (" + from[i] + ")" +
-						", len: " +
-						Integer.toHexString(len[i]) +
-						" (" + len[i] + ")"
-				);
-			}
-		}
-
-		// Text
-		System.out.println("");
-		System.out.println("TEXT:");
-		System.out.println(text);
-		System.out.println("");
-
-		// All the others
-		for(int i=0; i<20; i++) {
-			if(startType[i] == null) {
-				continue;
-			}
-			int start = from[i];
-
-			System.out.println(
-					startType[i] + " -> " + endType[i] +
-					" @ " + Integer.toHexString(start) +
-					" (" + start + ")"
-			);
-			System.out.println("\t" + dumpBytes(data, start, 4));
-			System.out.println("\t" + dumpBytes(data, start+4, 4));
-			System.out.println("\t" + dumpBytes(data, start+8, 4));
-			System.out.println("\t(etc)");
-		}
-	}
-
-	protected void dump001CompObj(DirectoryNode dir) {
-		// TODO
-	}
-
-	public void dumpQuill() throws IOException {
-		DirectoryNode quillDir = (DirectoryNode)
-			fs.getRoot().getEntry("Quill");
-		DirectoryNode quillSubDir = (DirectoryNode)
-			quillDir.getEntry("QuillSub");
-
-		dump001CompObj(quillSubDir);
-		dumpCONTENTSraw(quillSubDir);
-		dumpCONTENTSguessed(quillSubDir);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java
deleted file mode 100644
index 7625a08..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.dev;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hpbf.HPBFDocument;
-import org.apache.poi.hpbf.model.QuillContents;
-import org.apache.poi.hpbf.model.qcbits.QCBit;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.HexDump;
-
-/**
- * For dumping out the PLC contents of QC Bits of a
- *  HPBF (Publisher) file, while we try to figure out
- *  what the format of them is.
- */
-public final class PLCDumper {
-	private HPBFDocument doc;
-	private QuillContents qc;
-
-	public PLCDumper(HPBFDocument hpbfDoc) {
-		doc = hpbfDoc;
-		qc = doc.getQuillContents();
-	}
-	public PLCDumper(NPOIFSFileSystem fs) throws IOException {
-		this(new HPBFDocument(fs));
-	}
-	public PLCDumper(InputStream inp) throws IOException {
-		this(new NPOIFSFileSystem(inp));
-	}
-
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Use:");
-			System.err.println("  PLCDumper <filename>");
-			System.exit(1);
-		}
-		PLCDumper dump = new PLCDumper(
-				new FileInputStream(args[0])
-		);
-
-		System.out.println("Dumping " + args[0]);
-		dump.dumpPLC();
-	}
-
-	private void dumpPLC() {
-		QCBit[] bits = qc.getBits();
-
-		for(int i=0; i<bits.length; i++) {
-			if(bits[i] == null) continue;
-			if(bits[i].getBitType().equals("PLC ")) {
-				dumpBit(bits[i], i);
-			}
-		}
-	}
-
-	private void dumpBit(QCBit bit, int index) {
-		System.out.println("");
-		System.out.println("Dumping " + bit.getBitType() + " bit at " + index);
-		System.out.println("  Is a " + bit.getThingType() + ", number is " + bit.getOptA());
-		System.out.println("  Starts at " + bit.getDataOffset() + " (0x" + Integer.toHexString(bit.getDataOffset()) + ")");
-		System.out.println("  Runs for  " + bit.getLength() + " (0x" + Integer.toHexString(bit.getLength()) + ")");
-
-		System.out.println(HexDump.dump(bit.getData(), 0, 0));
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
deleted file mode 100644
index 2295f23..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.extractor;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hpbf.HPBFDocument;
-import org.apache.poi.hpbf.model.qcbits.QCBit;
-import org.apache.poi.hpbf.model.qcbits.QCTextBit;
-import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type12;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Extract text from HPBF Publisher files
- */
-public final class PublisherTextExtractor extends POIOLE2TextExtractor {
-   private HPBFDocument doc;
-   private boolean hyperlinksByDefault = false;
-
-   public PublisherTextExtractor(HPBFDocument doc) {
-      super(doc);
-      this.doc = doc;
-   }
-   public PublisherTextExtractor(DirectoryNode dir) throws IOException {
-      this(new HPBFDocument(dir));
-   }
-   public PublisherTextExtractor(POIFSFileSystem fs) throws IOException {
-      this(new HPBFDocument(fs));
-   }
-   public PublisherTextExtractor(NPOIFSFileSystem fs) throws IOException {
-      this(new HPBFDocument(fs));
-   }
-   public PublisherTextExtractor(InputStream is) throws IOException {
-      this(new POIFSFileSystem(is));
-   }
-
-	/**
-	 * Should a call to getText() return hyperlinks inline
-	 *  with the text?
-	 * Default is no
-	 */
-	public void setHyperlinksByDefault(boolean hyperlinksByDefault) {
-		this.hyperlinksByDefault = hyperlinksByDefault;
-	}
-
-
-	public String getText() {
-		StringBuffer text = new StringBuffer();
-
-		// Get the text from the Quill Contents
-		QCBit[] bits = doc.getQuillContents().getBits();
-		for(int i=0; i<bits.length; i++) {
-			if(bits[i] != null && bits[i] instanceof QCTextBit) {
-				QCTextBit t = (QCTextBit)bits[i];
-				text.append( t.getText().replace('\r', '\n') );
-			}
-		}
-
-		// If requested, add in the hyperlinks
-		// Ideally, we'd do these inline, but the hyperlink
-		//  positions are relative to the text area the
-		//  hyperlink is in, and we have yet to figure out
-		//  how to tie that together.
-		if(hyperlinksByDefault) {
-			for(int i=0; i<bits.length; i++) {
-				if(bits[i] != null && bits[i] instanceof Type12) {
-					Type12 hyperlinks = (Type12)bits[i];
-					for(int j=0; j<hyperlinks.getNumberOfHyperlinks(); j++) {
-						text.append("<");
-						text.append(hyperlinks.getHyperlink(j));
-						text.append(">\n");
-					}
-				}
-			}
-		}
-
-		// Get more text
-		// TODO
-
-		return text.toString();
-	}
-
-
-	public static void main(String[] args) throws Exception {
-		if(args.length == 0) {
-			System.err.println("Use:");
-			System.err.println("  PublisherTextExtractor <file.pub>");
-		}
-
-		for(int i=0; i<args.length; i++) {
-			PublisherTextExtractor te = new PublisherTextExtractor(
-					new FileInputStream(args[i])
-			);
-			System.out.println(te.getText());
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java
deleted file mode 100644
index 3f4784a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-/**
- *
- */
-public final class EscherDelayStm extends EscherPart {
-	private static final String[] PATH = { "Escher", "EscherDelayStm", };
-
-	public EscherDelayStm(DirectoryNode baseDir) throws IOException {
-		super(baseDir, PATH);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java
deleted file mode 100644
index 26fb1d6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-
-/**
- * Parent class of all Escher parts
- */
-public abstract class EscherPart extends HPBFPart {
-	private EscherRecord[] records;
-
-	/**
-	 * Creates the Escher Part, and finds our child
-	 *  escher records
-	 */
-	public EscherPart(DirectoryNode baseDir, String[] parts) throws IOException {
-		super(baseDir, parts);
-
-		// Now create our Escher children
-		DefaultEscherRecordFactory erf =
-			new DefaultEscherRecordFactory();
-
-		ArrayList<EscherRecord> ec = new ArrayList<EscherRecord>();
-		int left = data.length;
-		while(left > 0) {
-			EscherRecord er = erf.createRecord(data, 0);
-			er.fillFields(data, 0, erf);
-			left -= er.getRecordSize();
-
-			ec.add(er);
-		}
-
-		records = ec.toArray(new EscherRecord[ec.size()]);
-	}
-
-	public EscherRecord[] getEscherRecords() {
-		return records;
-	}
-
-	/**
-	 * Serialises our Escher children back
-	 *  into bytes.
-	 */
-	protected void generateData() {
-		int size = 0;
-		for(int i=0; i<records.length; i++) {
-			size += records[i].getRecordSize();
-		}
-
-		data = new byte[size];
-		size = 0;
-		for(int i=0; i<records.length; i++) {
-			int thisSize =
-				records[i].serialize(size, data);
-			size += thisSize;
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java
deleted file mode 100644
index 07cd4c6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-/**
- *
- */
-public final class EscherStm extends EscherPart {
-	private static final String[] PATH = { "Escher", "EscherStm", };
-	public EscherStm(DirectoryNode baseDir) throws IOException {
-		super(baseDir, PATH);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java
deleted file mode 100644
index 4379f4a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.util.IOUtils;
-
-/**
- * Parent class of all HPBF sub-parts, handling
- *  the fiddly reading in / writing out bits
- *  for all of them.
- */
-public abstract class HPBFPart {
-	protected byte[] data;
-	/**
-	 * @param path  the path to the part, eg Contents or Quill, QuillSub, CONTENTS
-	 */
-	public HPBFPart(DirectoryNode baseDir, String[] path) throws IOException {
-
-		DirectoryNode dir = getDir(path, baseDir);
-		String name = path[path.length-1];
-
-		if (!dir.hasEntry(name)) {
-            throw new IllegalArgumentException("File invalid - failed to find document entry '" + name + "'");
-		}
-
-		// Grab the data from the part stream
-		InputStream is = dir.createDocumentInputStream(name);
-		data = IOUtils.toByteArray(is);
-		is.close();
-	}
-	private DirectoryNode getDir(String[] path, DirectoryNode baseDir) {
-		DirectoryNode dir = baseDir;
-		for(int i=0; i<path.length-1; i++) {
-			try {
-				dir = (DirectoryNode)dir.getEntry(path[i]);
-			} catch (FileNotFoundException e) {
-				throw new IllegalArgumentException("File invalid - failed to find directory entry '"
-						+ path[i] + "'");
-			}
-		}
-		return dir;
-	}
-
-	public void writeOut(DirectoryNode baseDir) throws IOException {
-		String[] path = getPath();
-
-		// Ensure that all parent directories exist
-		DirectoryNode dir = baseDir;
-		for(int i=0; i<path.length-1; i++) {
-			try {
-				dir = (DirectoryNode)dir.getEntry(path[i]);
-			} catch(FileNotFoundException e) {
-				dir.createDirectory(path[i]);
-			}
-		}
-
-		// Update the byte array with the latest data
-		generateData();
-
-		// Write out
-		ByteArrayInputStream bais = new ByteArrayInputStream(data);
-		dir.createDocument(path[path.length-1], bais);
-	}
-
-	/**
-	 * Called just before writing out, to trigger
-	 *  the data byte array to be updated with the
-	 *  latest contents.
-	 */
-	protected abstract void generateData();
-
-	/**
-	 * Returns the raw data that makes up
-	 *  this document part.
-	 */
-	public byte[] getData() { return data; }
-
-	/**
-	 * Returns
-	 */
-	public final String[] getPath() {return null;}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java
deleted file mode 100644
index d1c5e3f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-
-/**
- * The main Contents. Not yet understood
- */
-public final class MainContents extends HPBFPart {
-	private static final String[] PATH = { "Contents", };
-
-	public MainContents(DirectoryNode baseDir) throws IOException {
-		super(baseDir, PATH);
-	}
-
-	protected void generateData() {
-		// We don't parse the contents, so
-		//  nothing will have changed
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java
deleted file mode 100644
index 3494d98..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.hpbf.model.qcbits.QCBit;
-import org.apache.poi.hpbf.model.qcbits.QCPLCBit;
-import org.apache.poi.hpbf.model.qcbits.QCTextBit;
-import org.apache.poi.hpbf.model.qcbits.UnknownQCBit;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * Quill -> QuillSub -> CONTENTS
- */
-public final class QuillContents extends HPBFPart {
-	private static final String[] PATH = { "Quill", "QuillSub", "CONTENTS", };
-	private QCBit[] bits;
-
-	public QuillContents(DirectoryNode baseDir) throws IOException {
-		super(baseDir, PATH);
-
-		// Now parse the first 512 bytes, and produce
-		//  all our bits
-
-		// Check first 8 bytes
-		String f8 = new String(data, 0, 8, LocaleUtil.CHARSET_1252);
-		if(! f8.equals("CHNKINK ")) {
-			throw new IllegalArgumentException("Expecting 'CHNKINK ' but was '"+f8+"'");
-		}
-		// Ignore the next 24, for now at least
-
-		// Now, parse all our QC Bits
-		bits = new QCBit[20];
-		for(int i=0; i<20; i++) {
-			int offset = 0x20 + i*24;
-			if(data[offset] == 0x18 && data[offset+1] == 0x00) {
-				// Has some data
-				String thingType = new String(data, offset+2, 4, LocaleUtil.CHARSET_1252);
-				int optA = LittleEndian.getUShort(data, offset+6);
-				int optB = LittleEndian.getUShort(data, offset+8);
-				int optC = LittleEndian.getUShort(data, offset+10);
-				String bitType = new String(data, offset+12, 4, LocaleUtil.CHARSET_1252);
-				int from = (int)LittleEndian.getUInt(data, offset+16);
-				int len = (int)LittleEndian.getUInt(data, offset+20);
-
-				byte[] bitData = new byte[len];
-				System.arraycopy(data, from, bitData, 0, len);
-
-				// Create
-				if(bitType.equals("TEXT")) {
-					bits[i] = new QCTextBit(thingType, bitType, bitData);
-				} else if(bitType.equals("PLC ")) {
-					bits[i] = QCPLCBit.createQCPLCBit(thingType, bitType, bitData);
-				} else {
-					bits[i] = new UnknownQCBit(thingType, bitType, bitData);
-				}
-				bits[i].setOptA(optA);
-				bits[i].setOptB(optB);
-				bits[i].setOptC(optC);
-				bits[i].setDataOffset(from);
-			} else {
-				// Doesn't have data
-			}
-		}
-	}
-
-	public QCBit[] getBits() {
-		return bits;
-	}
-
-	protected void generateData() {
-		// TODO
-		throw new IllegalStateException("Not done yet!");
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java
deleted file mode 100644
index c2e5334..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model.qcbits;
-
-/**
- * Parent of all Quill CONTENTS bits
- */
-public abstract class QCBit {
-	protected String thingType;
-	protected String bitType;
-	protected byte[] data;
-
-	protected int optA;
-	protected int optB;
-	protected int optC;
-
-	protected int dataOffset;
-
-	public QCBit(String thingType, String bitType, byte[] data) {
-		this.thingType = thingType;
-		this.bitType = bitType;
-		this.data = data.clone();
-	}
-
-	/**
-	 * Returns the type of the thing, eg TEXT, FONT
-	 *  or TOKN
-	 */
-	public String getThingType() { return thingType; }
-	/**
-	 * Returns the type of the bit data, eg TEXT
-	 *  or PLC
-	 */
-	public String getBitType() { return bitType; }
-	public byte[] getData() { return data; }
-
-	public int getOptA() {
-		return optA;
-	}
-	public void setOptA(int optA) {
-		this.optA = optA;
-	}
-
-	public int getOptB() {
-		return optB;
-	}
-	public void setOptB(int optB) {
-		this.optB = optB;
-	}
-
-	public int getOptC() {
-		return optC;
-	}
-	public void setOptC(int optC) {
-		this.optC = optC;
-	}
-
-	public int getDataOffset() {
-		return dataOffset;
-	}
-	public void setDataOffset(int offset) {
-		this.dataOffset = offset;
-	}
-
-	public int getLength() {
-		return data.length;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
deleted file mode 100644
index 3b79755..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model.qcbits;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
-
-/**
- * A "PLC " (PLC) based bit of Quill Contents. The exact
- *  format is determined by the type of the PLCs.
- */
-public abstract class QCPLCBit extends QCBit {
-	protected int numberOfPLCs;
-	protected int typeOfPLCS;
-	/**
-	 * The data which goes before the main PLC entries.
-	 * This is apparently always made up of 2 byte
-	 *  un-signed ints..
-	 */
-	protected int[] preData;
-	/** The first value of each PLC, normally 4 bytes */
-	protected long[] plcValA;
-	/** The second value of each PLC, normally 4 bytes */
-	protected long[] plcValB;
-
-
-	private QCPLCBit(String thingType, String bitType, byte[] data) {
-		super(thingType, bitType, data);
-
-		// First four bytes are the number
-		numberOfPLCs = (int)LittleEndian.getUInt(data, 0);
-
-		// Next four bytes are the type
-		typeOfPLCS = (int)LittleEndian.getUInt(data, 4);
-
-		// Init the arrays that we can
-		plcValA = new long[numberOfPLCs];
-		plcValB = new long[numberOfPLCs];
-	}
-
-
-
-	public int getNumberOfPLCs() {
-		return numberOfPLCs;
-	}
-	public int getTypeOfPLCS() {
-		return typeOfPLCS;
-	}
-
-	public int[] getPreData() {
-		return preData;
-	}
-
-	public long[] getPlcValA() {
-		return plcValA;
-	}
-	public long[] getPlcValB() {
-		return plcValB;
-	}
-
-
-
-	public static QCPLCBit createQCPLCBit(String thingType, String bitType, byte[] data) {
-		// Grab the type
-		int type = (int)LittleEndian.getUInt(data, 4);
-		switch(type) {
-			case 0:
-				return new Type0(thingType, bitType, data);
-			case 4:
-				return new Type4(thingType, bitType, data);
-			case 8:
-				return new Type8(thingType, bitType, data);
-			case 12: // 0xc
-				return new Type12(thingType, bitType, data);
-			default:
-				throw new IllegalArgumentException("Sorry, I don't know how to deal with PLCs of type " + type);
-		}
-	}
-
-
-	/**
-	 * Type 0 seem to be somewhat rare. They have 8 bytes of pre-data,
-	 *  then 2x 2 byte values.
-	 */
-	public static class Type0 extends QCPLCBit {
-		private Type0(String thingType, String bitType, byte[] data) {
-			super(thingType, bitType, data);
-
-			// Grab our 4x pre-data
-			preData = new int[4];
-			preData[0] = LittleEndian.getUShort(data, 8+0);
-			preData[1] = LittleEndian.getUShort(data, 8+2);
-			preData[2] = LittleEndian.getUShort(data, 8+4);
-			preData[3] = LittleEndian.getUShort(data, 8+6);
-
-			// And grab the 2 byte values
-			for(int i=0; i<numberOfPLCs; i++) {
-				plcValA[i] = LittleEndian.getUShort(data, 16+(4*i));
-				plcValB[i] = LittleEndian.getUShort(data, 16+(4*i)+2);
-			}
-		}
-	}
-
-	/**
-	 * Type 4 is quite common. They have 8 bytes of pre-data,
-	 *  then 2x 4 byte values.
-	 */
-	public static class Type4 extends QCPLCBit {
-		private Type4(String thingType, String bitType, byte[] data) {
-			super(thingType, bitType, data);
-
-			// Grab our 4x pre-data
-			preData = new int[4];
-			preData[0] = LittleEndian.getUShort(data, 8+0);
-			preData[1] = LittleEndian.getUShort(data, 8+2);
-			preData[2] = LittleEndian.getUShort(data, 8+4);
-			preData[3] = LittleEndian.getUShort(data, 8+6);
-
-			// And grab the 4 byte values
-			for(int i=0; i<numberOfPLCs; i++) {
-				plcValA[i] = LittleEndian.getUInt(data, 16+(8*i));
-				plcValB[i] = LittleEndian.getUInt(data, 16+(8*i)+4);
-			}
-		}
-	}
-
-	/**
-	 * Type 8 is quite common. They have 14 bytes of pre-data,
-	 *  then 2x 4 byte values.
-	 */
-	public static class Type8 extends QCPLCBit {
-		private Type8(String thingType, String bitType, byte[] data) {
-			super(thingType, bitType, data);
-
-			// Grab our 7x pre-data
-			preData = new int[7];
-			preData[0] = LittleEndian.getUShort(data, 8+0);
-			preData[1] = LittleEndian.getUShort(data, 8+2);
-			preData[2] = LittleEndian.getUShort(data, 8+4);
-			preData[3] = LittleEndian.getUShort(data, 8+6);
-			preData[4] = LittleEndian.getUShort(data, 8+8);
-			preData[5] = LittleEndian.getUShort(data, 8+10);
-			preData[6] = LittleEndian.getUShort(data, 8+12);
-
-			// And grab the 4 byte values
-			for(int i=0; i<numberOfPLCs; i++) {
-				plcValA[i] = LittleEndian.getUInt(data, 22+(8*i));
-				plcValB[i] = LittleEndian.getUInt(data, 22+(8*i)+4);
-			}
-		}
-	}
-
-	/**
-	 * Type 12 holds hyperlinks, and is very complex.
-	 * There is normally one of these for each text
-	 *  area that contains at least one hyperlinks.
-	 * The character offsets are relative to the start
-	 *  of the text area that this applies to.
-	 */
-	public static class Type12 extends QCPLCBit {
-		private String[] hyperlinks;
-
-		private static final int oneStartsAt = 0x4c;
-		private static final int twoStartsAt = 0x68;
-		private static final int threePlusIncrement = 22;
-
-		private Type12(String thingType, String bitType, byte[] data) {
-			super(thingType, bitType, data);
-
-			// How many hyperlinks do we really have?
-			// (zero hyperlinks gets numberOfPLCs=1)
-			if(data.length == 0x34) {
-				hyperlinks = new String[0];
-			} else {
-				hyperlinks = new String[numberOfPLCs];
-			}
-
-			// We have 4 bytes, then the start point of each
-			//  hyperlink, then the end point of the text.
-			preData = new int[1+numberOfPLCs+1];
-			for(int i=0; i<preData.length; i++) {
-				preData[i] = (int)LittleEndian.getUInt(data, 8+(i*4));
-			}
-
-			// Then we have a whole bunch of stuff, which grows
-			//  with the number of hyperlinks
-			// For now, we think these are shorts
-			int at = 8+4+(numberOfPLCs*4)+4;
-			int until = 0x34;
-			if(numberOfPLCs == 1 && hyperlinks.length == 1) {
-				until = oneStartsAt;
-			} else if(numberOfPLCs >= 2) {
-				until = twoStartsAt + (numberOfPLCs-2)*threePlusIncrement;
-			}
-
-			plcValA = new long[(until-at)/2];
-			plcValB = new long[0];
-			for(int i=0; i<plcValA.length; i++) {
-				plcValA[i] = LittleEndian.getUShort(data, at+(i*2));
-			}
-
-			// Finally, we have a series of lengths + hyperlinks
-			at = until;
-			for(int i=0; i<hyperlinks.length; i++) {
-				int len = LittleEndian.getUShort(data, at);
-				int first = LittleEndian.getUShort(data, at+2);
-				if(first == 0) {
-					// Crazy special case
-					// Length is in bytes, from the start
-					// Hyperlink appears to be empty
-					hyperlinks[i] = "";
-					at += len;
-				} else {
-					// Normal case. Length is in characters
-					hyperlinks[i] = StringUtil.getFromUnicodeLE(data, at+2, len);
-					at += 2 + (2*len);
-				}
-			}
-		}
-
-		/**
-		 * Returns the number of hyperlinks, which should
-		 *  either be zero, or the number of PLC bits
-		 */
-		public int getNumberOfHyperlinks() {
-			return hyperlinks.length;
-		}
-
-		/**
-		 * Returns the URL of the hyperlink at the
-		 *  given index.
-		 * @param number The hyperlink number, zero based
-		 */
-		public String getHyperlink(int number) {
-			return hyperlinks[number];
-		}
-		/**
-		 * Returns where in the text (in characters) the
-		 *  hyperlink at the given index starts
-		 *  applying to.
-		 * This position is relative to the text area that this
-		 *  PLCBit applies to.
-		 * @param number The hyperlink number, zero based
-		 */
-		public int getTextStartAt(int number) {
-			return preData[1+number];
-		}
-		/**
-		 * Returns where in the text that this block
-		 *  of hyperlinks stops applying to. Normally,
-		 *  but not always the end of the text.
-		 * This position is relative to the text area that this
-		 *  PLCBit applies to.
-		 */
-		public int getAllTextEndAt() {
-			return preData[numberOfPLCs+1];
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
deleted file mode 100644
index 9d8c424..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model.qcbits;
-
-import org.apache.poi.util.StringUtil;
-
-/**
- * A Text based bit of Quill Contents
- */
-public final class QCTextBit extends QCBit {
-	public QCTextBit(String thingType, String bitType, byte[] data) {
-		super(thingType, bitType, data);
-	}
-
-	/**
-	 * Returns the text. Note that line endings
-	 *  are \r and not \n
-	 */
-	public String getText() {
-		return StringUtil.getFromUnicodeLE(
-				data, 0, data.length/2
-		);
-	}
-
-	public void setText(String text) {
-		data = new byte[text.length()*2];
-		StringUtil.putUnicodeLE(text, data, 0);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java b/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
deleted file mode 100644
index 64dae7b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model.qcbits;
-
-/**
- * Any Quill Contents bits we don't know
- *  how to handle explicitly
- */
-public final class UnknownQCBit extends QCBit {
-	public UnknownQCBit(String thingType, String bitType, byte[] data) {
-		super(thingType, bitType, data);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java
deleted file mode 100644
index f584bd8..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-import java.awt.Dimension;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.util.Units;
-
-/**
- * Represents a bitmap picture data:  JPEG or PNG.
- * The data is not compressed and the exact file content is written in the stream.
- */
-public abstract class Bitmap extends HSLFPictureData {
-
-    @Override
-    public byte[] getData(){
-        byte[] rawdata = getRawData();
-        int prefixLen = 16*uidInstanceCount+1;
-        byte[] imgdata = new byte[rawdata.length-prefixLen];
-        System.arraycopy(rawdata, prefixLen, imgdata, 0, imgdata.length);
-        return imgdata;
-    }
-
-    @Override
-    public void setData(byte[] data) throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        for (int i=0; i<uidInstanceCount; i++) {
-            byte[] checksum = getChecksum(data);
-            out.write(checksum);
-        }
-        out.write(0);
-        out.write(data);
-
-        setRawData(out.toByteArray());
-    }
-
-    @Override
-    public Dimension getImageDimension() {
-        try {
-            BufferedImage bi = ImageIO.read(new ByteArrayInputStream(getData()));
-            return new Dimension(
-                (int)Units.pixelToPoints(bi.getWidth()),
-                (int)Units.pixelToPoints(bi.getHeight())
-            );
-        } catch (IOException e) {
-            return new Dimension(200,200);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java
deleted file mode 100644
index a0283aa..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-import java.io.IOException;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents a DIB picture data in a PPT file
- */
-public final class DIB extends Bitmap {
-    /**
-     * Size of the BITMAPFILEHEADER structure preceding the actual DIB bytes
-     */
-    private static final int HEADER_SIZE = 14;
-
-    @Override
-    public PictureType getType(){
-        return PictureType.DIB;
-    }
-
-    /**
-     * DIB signature is {@code 0x7A80} or {@code 0x7A90}
-     *
-     * @return DIB signature ({@code 0x7A80} or {@code 0x7A90})
-     */
-    public int getSignature(){
-        return (uidInstanceCount == 1 ? 0x7A80 : 0x7A90);
-    }
-
-    /**
-     * Sets the DIB signature - either {@code 0x7A80} or {@code 0x7A90}
-     */
-    public void setSignature(int signature) {
-        switch (signature) {
-            case 0x7A80:
-                uidInstanceCount = 1;
-                break;
-            case 0x7A90:
-                uidInstanceCount = 2;
-                break;
-            default:
-                throw new IllegalArgumentException(signature+" is not a valid instance/signature value for DIB");
-        }        
-    }    
-    
-    @Override
-    public byte[] getData(){
-        return addBMPHeader ( super.getData() );
-    }
-
-    public static byte[] addBMPHeader(byte[] data){
-        // bitmap file-header, corresponds to a
-        // Windows  BITMAPFILEHEADER structure
-        // (For more information, consult the Windows API Programmer's reference )
-        byte[] header = new byte[HEADER_SIZE];
-        //Specifies the file type. It must be set to the signature word BM (0x4D42) to indicate bitmap.
-        LittleEndian.putInt(header, 0, 0x4D42);
-
-        // read the size of the image and calculate the overall file size
-        // and the offset where the bitmap starts
-        int imageSize = LittleEndian.getInt(data, 0x22 - HEADER_SIZE);
-        int fileSize = data.length + HEADER_SIZE;
-        int offset = fileSize - imageSize;
-        
-		// specifies the size, in bytes, of the bitmap file - must add the length of the header
-        LittleEndian.putInt(header, 2, fileSize); 
-        // Reserved; set to zero
-        LittleEndian.putInt(header, 6, 0);
-        // the offset, i.e. starting address, of the byte where the bitmap data can be found
-        LittleEndian.putInt(header, 10, offset);
-        
-        //DIB data is the header + dib bytes
-        byte[] dib = new byte[header.length + data.length];
-        System.arraycopy(header, 0, dib, 0, header.length);
-        System.arraycopy(data, 0, dib, header.length, data.length);
-
-        return dib;
-    }
-
-    @Override
-    public void setData(byte[] data) throws IOException {
-        //cut off the bitmap file-header
-        byte[] dib = new byte[data.length-HEADER_SIZE];
-        System.arraycopy(data, HEADER_SIZE, dib, 0, dib.length);
-        super.setData(dib);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
deleted file mode 100644
index 4d7de5f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.InflaterInputStream;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.Units;
-
-/**
- * Represents EMF (Windows Enhanced Metafile) picture data.
- */
-public final class EMF extends Metafile {
-
-    public static class NativeHeader {
-        // rectangular inclusive-inclusive bounds, in device units, of the smallest 
-        // rectangle that can be drawn around the image stored in the metafile.
-        private final Rectangle deviceBounds;
-
-        private final static String EMF_SIGNATURE = " EMF"; // 0x464D4520 (LE)
-        
-        public NativeHeader(byte data[], int offset) {
-            int type = (int)LittleEndian.getUInt(data, offset); offset += 4;
-            if (type != 1) {
-                throw new HSLFException("Invalid EMF picture");
-            }
-            // ignore header size
-            offset += 4;
-            int left = LittleEndian.getInt(data, offset); offset += 4;
-            int top = LittleEndian.getInt(data, offset); offset += 4;
-            int right = LittleEndian.getInt(data, offset); offset += 4;
-            int bottom = LittleEndian.getInt(data, offset); offset += 4;
-            deviceBounds = new Rectangle(left, top, right-left, bottom-top);
-            // ignore frame bounds
-            offset += 16;
-            String signature = new String(data, offset, EMF_SIGNATURE.length(), LocaleUtil.CHARSET_1252);
-            if (!EMF_SIGNATURE.equals(signature)) {
-                throw new HSLFException("Invalid EMF picture");
-            }
-        }
-
-        public Dimension getSize() {
-            return deviceBounds.getSize();
-        }
-    }
-    
-    @Override
-    public byte[] getData(){
-        try {
-            byte[] rawdata = getRawData();
-
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            InputStream is = new ByteArrayInputStream( rawdata );
-            Header header = new Header();
-            header.read(rawdata, CHECKSUM_SIZE);
-            long len = is.skip(header.getSize() + CHECKSUM_SIZE);
-            assert(len == header.getSize() + CHECKSUM_SIZE);
-
-            InflaterInputStream inflater = new InflaterInputStream( is );
-            byte[] chunk = new byte[4096];
-            int count;
-            while ((count = inflater.read(chunk)) >=0 ) {
-                out.write(chunk,0,count);
-            }
-            inflater.close();
-            return out.toByteArray();
-        } catch (IOException e){
-            throw new HSLFException(e);
-        }
-    }
-
-    @Override
-    public void setData(byte[] data) throws IOException {
-        byte[] compressed = compress(data, 0, data.length);
-
-        NativeHeader nHeader = new NativeHeader(data, 0);
-        
-        Header header = new Header();
-        header.wmfsize = data.length;
-        header.bounds = nHeader.deviceBounds;
-        Dimension nDim = nHeader.getSize();
-        header.size = new Dimension(Units.toEMU(nDim.getWidth()), Units.toEMU(nDim.getHeight()));
-        header.zipsize = compressed.length;
-
-        byte[] checksum = getChecksum(data);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        out.write(checksum);
-        if (uidInstanceCount == 2) {
-            out.write(checksum);
-        }
-        header.write(out);
-        out.write(compressed);
-
-        setRawData(out.toByteArray());
-    }
-
-    @Override
-    public PictureType getType(){
-        return PictureType.EMF;
-    }
-
-    /**
-     * EMF signature is {@code 0x3D40} or {@code 0x3D50}
-     *
-     * @return EMF signature ({@code 0x3D40} or {@code 0x3D50})
-     */
-    public int getSignature(){
-        return (uidInstanceCount == 1 ? 0x3D40 : 0x3D50);
-    }
-    
-    /**
-     * Sets the EMF signature - either {@code 0x3D40} or {@code 0x3D50}
-     */
-    public void setSignature(int signature) {
-        switch (signature) {
-            case 0x3D40:
-                uidInstanceCount = 1;
-                break;
-            case 0x3D50:
-                uidInstanceCount = 2;
-                break;
-            default:
-                throw new IllegalArgumentException(signature+" is not a valid instance/signature value for EMF");
-        }        
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java
deleted file mode 100644
index 72cac5f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-
-/**
- * Represents a JPEG picture data in a PPT file
- */
-public final class JPEG extends Bitmap {
-
-    public enum ColorSpace { rgb, cymk }
-
-    private ColorSpace colorSpace = ColorSpace.rgb;
-    
-    @Override
-    public PictureType getType(){
-        return PictureType.JPEG;
-    }
-
-    public ColorSpace getColorSpace() {
-        return colorSpace;
-    }
-    
-    public void setColorSpace(ColorSpace colorSpace) {
-        this.colorSpace = colorSpace;
-    }
-    
-    /**
-     * JPEG signature is one of {@code 0x46A0, 0x46B0, 0x6E20, 0x6E30} 
-     *
-     * @return JPEG signature ({@code 0x46A0, 0x46B0, 0x6E20, 0x6E30})
-     */
-    public int getSignature(){
-        return (colorSpace == ColorSpace.rgb)
-            ? (uidInstanceCount == 1 ? 0x46A0 :  0x46B0)
-            : (uidInstanceCount == 1 ? 0x6E20 :  0x6E30);
-    }
-    
-    /**
-     * Sets the PICT signature - either {@code 0x5420} or {@code 0x5430}
-     */
-    public void setSignature(int signature) {
-        switch (signature) {
-            case 0x46A0:
-                uidInstanceCount = 1;
-                colorSpace = ColorSpace.rgb;
-                break;
-            case 0x46B0:
-                uidInstanceCount = 2;
-                colorSpace = ColorSpace.rgb;
-                break;
-            case 0x6E20:
-                uidInstanceCount = 1;
-                colorSpace = ColorSpace.cymk;
-                break;
-            case 0x6E30:
-                uidInstanceCount = 2;
-                colorSpace = ColorSpace.cymk;
-                break;
-            default:
-                throw new IllegalArgumentException(signature+" is not a valid instance/signature value for JPEG");
-        }        
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java
deleted file mode 100644
index 4a6c383..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.zip.DeflaterOutputStream;
-
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Units;
-
-/**
- * Represents a metafile picture which can be one of the following types: EMF, WMF, or PICT.
- * A metafile is stored compressed using the ZIP deflate/inflate algorithm.
- *
- * @author Yegor Kozlov
- */
-public abstract class Metafile extends HSLFPictureData {
-
-    /**
-     *  A structure which represents a 34-byte header preceding the compressed metafile data
-     *
-     * @author Yegor Kozlov
-     */
-    public static class Header{
-
-        /**
-         * size of the original file
-         */
-        public int wmfsize;
-
-        /**
-         * Boundary of the metafile drawing commands
-         */
-        public Rectangle bounds;
-
-        /**
-         *  Size of the metafile in EMUs
-         */
-        public Dimension size;
-
-        /**
-         * size of the compressed metafile data
-         */
-        public int zipsize;
-
-        /**
-         * Reserved. Always 0.
-         */
-        public int compression = 0;
-
-        /**
-         * Reserved. Always 254.
-         */
-        public int filter = 254;
-
-        public void read(byte[] data, int offset){
-            int pos = offset;
-            wmfsize = LittleEndian.getInt(data, pos);   pos += LittleEndian.INT_SIZE;
-
-            int left = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-            int top = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-            int right = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-            int bottom = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-
-            bounds = new Rectangle(left, top, right-left, bottom-top);
-            int width = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-            int height = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-
-            size = new Dimension(width, height);
-
-            zipsize = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-
-            compression = LittleEndian.getUByte(data, pos); pos++;
-            filter = LittleEndian.getUByte(data, pos); pos++;
-        }
-
-        public void write(OutputStream out) throws IOException {
-            byte[] header = new byte[34];
-            int pos = 0;
-            LittleEndian.putInt(header, pos, wmfsize); pos += LittleEndian.INT_SIZE; //hmf
-
-            LittleEndian.putInt(header, pos, bounds.x); pos += LittleEndian.INT_SIZE; //left
-            LittleEndian.putInt(header, pos, bounds.y); pos += LittleEndian.INT_SIZE; //top
-            LittleEndian.putInt(header, pos, bounds.x + bounds.width); pos += LittleEndian.INT_SIZE; //right
-            LittleEndian.putInt(header, pos, bounds.y + bounds.height); pos += LittleEndian.INT_SIZE; //bottom
-            LittleEndian.putInt(header, pos, size.width); pos += LittleEndian.INT_SIZE; //inch
-            LittleEndian.putInt(header, pos, size.height); pos += LittleEndian.INT_SIZE; //inch
-            LittleEndian.putInt(header, pos, zipsize); pos += LittleEndian.INT_SIZE; //inch
-
-            header[pos] = 0; pos ++;
-            header[pos] = (byte)filter; pos ++;
-
-            out.write(header);
-        }
-
-        public int getSize(){
-            return 34;
-        }
-        
-        public int getWmfSize() {
-            return wmfsize;
-        }
-    }
-
-    protected static byte[] compress(byte[] bytes, int offset, int length) throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        DeflaterOutputStream  deflater = new DeflaterOutputStream( out );
-        deflater.write(bytes, offset, length);
-        deflater.close();
-        return out.toByteArray();
-    }
-
-    @Override
-    public Dimension getImageDimension() {
-        int prefixLen = 16*uidInstanceCount;
-        Header header = new Header();
-        header.read(getRawData(), prefixLen);
-        return new Dimension(
-            (int)Math.round(Units.toPoints((long)header.size.getWidth())),
-            (int)Math.round(Units.toPoints((long)header.size.getHeight()))
-        );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java
deleted file mode 100644
index d68b4f7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.zip.InflaterInputStream;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- * Represents Macintosh PICT picture data.
- */
-public final class PICT extends Metafile {
-    private static final POILogger LOG = POILogFactory.getLogger(PICT.class);
-    
-    public static class NativeHeader {
-        /**
-         * skip the first 512 bytes - they are MAC specific crap
-         */
-        public static final int PICT_HEADER_OFFSET = 512;
-        
-        public static final double DEFAULT_RESOLUTION = Units.POINT_DPI;
-        
-        private static final byte V2_HEADER[] = {
-            0x00, 0x11,       // v2 version opcode
-            0x02, (byte)0xFF, // version number of new picture
-            0x0C, 0x00,        // header opcode
-            (byte)0xFF, (byte)0xFE, 0x00, 0x00 // pic size dummy
-        };
-
-        public final Rectangle bounds;
-        public final double hRes, vRes;
-        
-        public NativeHeader(byte data[], int offset) {
-            // http://mirrors.apple2.org.za/apple.cabi.net/Graphics/PICT.and_QT.INFO/PICT.file.format.TI.txt
-
-            // low order 16 bits of picture size - can be ignored
-            offset += 2;
-            // rectangular bounding box of picture, at 72 dpi
-            // rect : 8 bytes (top, left, bottom, right: integer)
-            int y1 = readUnsignedShort(data, offset); offset += 2;
-            int x1 = readUnsignedShort(data, offset); offset += 2;
-            int y2 = readUnsignedShort(data, offset); offset += 2;
-            int x2 = readUnsignedShort(data, offset); offset += 2;
-
-            // check for version 2 ... otherwise we don't read any further
-            boolean isV2 = true;
-            for (byte b : V2_HEADER) {
-                if (b != data[offset++]) {
-                    isV2 = false;
-                    break;
-                }
-            }
-            
-            if (isV2) {
-                // 4 bytes - fixed, horizontal resolution (dpi) of source data
-                hRes = readFixedPoint(data, offset); offset += 4;
-                // 4 bytes - fixed, vertical resolution (dpi) of source data
-                vRes = readFixedPoint(data, offset); offset += 4;
-            } else {
-                hRes = DEFAULT_RESOLUTION;
-                vRes = DEFAULT_RESOLUTION;
-            }
-            
-            bounds = new Rectangle(x1,y1,x2-x1,y2-y1);
-        }
-
-        public Dimension getSize() {
-            int height = (int)Math.round(bounds.height*DEFAULT_RESOLUTION/vRes);
-            int width = (int)Math.round(bounds.width*DEFAULT_RESOLUTION/hRes);
-            return new Dimension(width, height);
-        }
-
-        private static int readUnsignedShort(byte data[], int offset) {
-            int b0 = data[offset] & 0xFF;
-            int b1 = data[offset+1] & 0xFF;
-            return b0 << 8 | b1;
-        }
-
-        private static double readFixedPoint(byte data[], int offset) {
-            int b0 = data[offset] & 0xFF;
-            int b1 = data[offset+1] & 0xFF;
-            int b2 = data[offset+2] & 0xFF;
-            int b3 = data[offset+3] & 0xFF;
-            int i = (b0 << 24) | (b1 << 16) | (b2 << 8) | b3;
-            return i / (double)0x10000;
-        }
-    }
-    
-    @Override
-    public byte[] getData(){
-        byte[] rawdata = getRawData();
-        try {
-            byte[] macheader = new byte[512];
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            out.write(macheader);
-            int pos = CHECKSUM_SIZE*uidInstanceCount;
-            byte[] pict = read(rawdata, pos);
-            out.write(pict);
-            return out.toByteArray();
-        } catch (IOException e){
-            throw new HSLFException(e);
-        }
-    }
-
-    private byte[] read(byte[] data, int pos) throws IOException {
-        ByteArrayInputStream bis = new ByteArrayInputStream(data);
-        Header header = new Header();
-        header.read(data, pos);
-        bis.skip(pos + header.getSize());
-        byte[] chunk = new byte[4096];
-        ByteArrayOutputStream out = new ByteArrayOutputStream(header.getWmfSize());
-        InflaterInputStream inflater = new InflaterInputStream( bis );
-        try {
-            int count;
-            while ((count = inflater.read(chunk)) >=0 ) {
-                out.write(chunk,0,count);
-                // PICT zip-stream can be erroneous, so we clear the array to determine
-                // the maximum of read bytes, after the inflater crashed
-                bytefill(chunk, (byte)0);
-            }
-        } catch (Exception e) {
-            int lastLen;
-            for (lastLen=chunk.length-1; lastLen>=0 && chunk[lastLen] == 0; lastLen--);
-            if (++lastLen > 0) {
-                if (header.getWmfSize() > out.size()) {
-                    // sometimes the wmfsize is smaller than the amount of already successfully read bytes
-                    // in this case we take the lastLen as-is, otherwise we truncate it to the given size
-                    lastLen = Math.min(lastLen, header.getWmfSize() - out.size());
-                }
-                out.write(chunk,0,lastLen);
-            }
-            // End of picture marker for PICT is 0x00 0xFF
-            LOG.log(POILogger.ERROR, "PICT zip-stream is invalid, read as much as possible. Uncompressed length of header: "+header.getWmfSize()+" / Read bytes: "+out.size(), e);
-        } finally {
-            inflater.close();
-        }
-        return out.toByteArray();
-    }
-
-    @Override
-    public void setData(byte[] data) throws IOException {
-        // skip the first 512 bytes - they are MAC specific crap
-        final int nOffset = NativeHeader.PICT_HEADER_OFFSET;
-        NativeHeader nHeader = new NativeHeader(data, nOffset);
-        
-        Header header = new Header();
-        header.wmfsize = data.length - nOffset;
-        byte[] compressed = compress(data, nOffset, header.wmfsize);
-        header.zipsize = compressed.length;
-        header.bounds = nHeader.bounds;
-        Dimension nDim = nHeader.getSize();
-        header.size = new Dimension(Units.toEMU(nDim.getWidth()), Units.toEMU(nDim.getHeight()));
-
-        byte[] checksum = getChecksum(data);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        out.write(checksum);
-        if (uidInstanceCount == 2) {
-            out.write(checksum);
-        }
-        header.write(out);
-        out.write(compressed);
-
-        setRawData(out.toByteArray());
-    }
-
-    @Override
-    public PictureType getType(){
-        return PictureType.PICT;
-    }
-
-    /**
-     * PICT signature is {@code 0x5420} or {@code 0x5430}
-     *
-     * @return PICT signature ({@code 0x5420} or {@code 0x5430})
-     */
-    public int getSignature(){
-        return (uidInstanceCount == 1 ? 0x5420 : 0x5430);
-    }
-
-    /**
-     * Sets the PICT signature - either {@code 0x5420} or {@code 0x5430}
-     */
-    public void setSignature(int signature) {
-        switch (signature) {
-            case 0x5420:
-                uidInstanceCount = 1;
-                break;
-            case 0x5430:
-                uidInstanceCount = 2;
-                break;
-            default:
-                throw new IllegalArgumentException(signature+" is not a valid instance/signature value for PICT");
-        }        
-    }
-    
-    
-    /*
-     * initialize a smaller piece of the array and use the System.arraycopy 
-     * call to fill in the rest of the array in an expanding binary fashion
-     */
-    private static void bytefill(byte[] array, byte value) {
-        // http://stackoverflow.com/questions/9128737/fastest-way-to-set-all-values-of-an-array
-        int len = array.length;
-
-        if (len > 0){
-            array[0] = value;
-        }
-
-        for (int i = 1; i < len; i += i) {
-            System.arraycopy(array, 0, array, i, ((len - i) < i) ? (len - i) : i);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java
deleted file mode 100644
index b338d9d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-import org.apache.poi.util.PngUtils;
-
-/**
- * Represents a PNG picture data in a PPT file
- */
-public final class PNG extends Bitmap {
-
-    @Override
-    public byte[] getData() {
-        byte[] data = super.getData();
-
-        //PNG created on MAC may have a 16-byte prefix which prevents successful reading.
-        //Just cut it off!.
-        if (PngUtils.matchesPngHeader(data, 16)) {
-            byte[] png = new byte[data.length-16];
-            System.arraycopy(data, 16, png, 0, png.length);
-            data = png;
-        }
-
-        return data;
-    }
-
-    @Override
-    public PictureType getType(){
-        return PictureType.PNG;
-    }
-
-    /**
-     * PNG signature is {@code 0x6E00} or {@code 0x6E10}
-     *
-     * @return PNG signature ({@code 0x6E00} or {@code 0x6E10})
-     */
-    public int getSignature(){
-        return (uidInstanceCount == 1 ? 0x6E00 : 0x6E10);
-    }
-    
-    /**
-     * Sets the PNG signature - either {@code 0x6E00} or {@code 0x6E10}
-     */
-    public void setSignature(int signature) {
-        switch (signature) {
-            case 0x6E00:
-                uidInstanceCount = 1;
-                break;
-            case 0x6E10:
-                uidInstanceCount = 2;
-                break;
-            default:
-                throw new IllegalArgumentException(signature+" is not a valid instance/signature value for PNG");
-        }        
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
deleted file mode 100644
index 9dbc7f3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.blip;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.InflaterInputStream;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- * Represents a WMF (Windows Metafile) picture data.
- */
-public final class WMF extends Metafile {
-
-    @Override
-    public byte[] getData(){
-        try {
-            byte[] rawdata = getRawData();
-
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            InputStream is = new ByteArrayInputStream( rawdata );
-            Header header = new Header();
-            header.read(rawdata, CHECKSUM_SIZE*uidInstanceCount);
-            long len = is.skip(header.getSize() + CHECKSUM_SIZE*uidInstanceCount);
-            assert(len == header.getSize() + CHECKSUM_SIZE*uidInstanceCount);
-
-            NativeHeader aldus = new NativeHeader(header.bounds);
-            aldus.write(out);
-
-            InflaterInputStream inflater = new InflaterInputStream( is );
-            byte[] chunk = new byte[4096];
-            int count;
-            while ((count = inflater.read(chunk)) >=0 ) {
-                out.write(chunk,0,count);
-            }
-            inflater.close();
-            return out.toByteArray();
-        } catch (IOException e){
-            throw new HSLFException(e);
-        }
-    }
-
-    @Override
-    public void setData(byte[] data) throws IOException {
-        int pos = 0;
-        NativeHeader nHeader = new NativeHeader(data, pos);
-        pos += nHeader.getLength();
-
-        byte[] compressed = compress(data, pos, data.length-pos);
-
-        Header header = new Header();
-        header.wmfsize = data.length - nHeader.getLength();
-        header.bounds = new Rectangle((short)nHeader.left, (short)nHeader.top, (short)nHeader.right-(short)nHeader.left, (short)nHeader.bottom-(short)nHeader.top);
-        Dimension nDim = nHeader.getSize();
-        header.size = new Dimension(Units.toEMU(nDim.getWidth()), Units.toEMU(nDim.getHeight()));
-        header.zipsize = compressed.length;
-
-        byte[] checksum = getChecksum(data);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        for (int i=0; i<uidInstanceCount; i++) {
-            out.write(checksum);
-        }
-        header.write(out);
-        out.write(compressed);
-
-        setRawData(out.toByteArray());
-    }
-
-    @Override
-    public PictureType getType(){
-        return PictureType.WMF;
-    }
-
-    /**
-     * WMF signature is either {@code 0x2160} or {@code 0x2170}
-     */
-    public int getSignature(){
-        return (uidInstanceCount == 1 ? 0x2160 : 0x2170);
-    }
-
-    /**
-     * Sets the WMF signature - either {@code 0x2160} or {@code 0x2170}
-     */
-    public void setSignature(int signature) {
-        switch (signature) {
-            case 0x2160:
-                uidInstanceCount = 1;
-                break;
-            case 0x2170:
-                uidInstanceCount = 2;
-                break;
-            default:
-                throw new IllegalArgumentException(signature+" is not a valid instance/signature value for WMF");
-        }
-    }
-
-    /**
-     * Aldus Placeable Metafile header - 22 byte structure before WMF data.
-     * <ul>
-     *  <li>int Key;               Magic number (always 9AC6CDD7h)
-     *  <li>short  Handle;         Metafile HANDLE number (always 0)
-     *  <li>short Left;            Left coordinate in metafile units
-     *  <li>short Top;             Top coordinate in metafile units
-     *  <li>short Right;           Right coordinate in metafile units
-     *  <li>short Bottom;          Bottom coordinate in metafile units
-     *  <li>short  Inch;           Number of metafile units per inch
-     *  <li>int Reserved;          Reserved (always 0)
-     *  <li>short  Checksum;       Checksum value for previous 10 shorts
-     * </ul>
-     */
-    @SuppressWarnings("unused")
-    public static class NativeHeader {
-        public static final int APMHEADER_KEY = 0x9AC6CDD7;
-        private static POILogger logger = POILogFactory.getLogger(NativeHeader.class);
-
-        private final int handle;
-        private final int left, top, right, bottom;
-
-        /**
-         * The number of logical units per inch used to represent the image.
-         * This value can be used to scale an image. By convention, an image is
-         * considered to be recorded at 1440 logical units (twips) per inch. 
-         * Thus, a value of 720 specifies that the image SHOULD be rendered at
-         * twice its normal size, and a value of 2880 specifies that the image
-         * SHOULD be rendered at half its normal size.
-         */
-        private final int inch; 
-        private final int reserved;
-        private int checksum;
-        
-        public NativeHeader(Rectangle dim) {
-            handle = 0;
-            left = dim.x;
-            top = dim.y;
-            right = dim.x + dim.width;
-            bottom = dim.y + dim.height;
-            inch = Units.POINT_DPI; //default resolution is 72 dpi
-            reserved = 0;
-        }
-
-        public NativeHeader(byte[] data, int pos) {
-            int key = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE; //header key
-            if (key != APMHEADER_KEY) {
-                logger.log(POILogger.WARN, "WMF file doesn't contain a placeable header - ignore parsing");
-                handle = 0;
-                left = 0;
-                top = 0;
-                right = 200;
-                bottom = 200;
-                inch = Units.POINT_DPI; //default resolution is 72 dpi
-                reserved = 0;
-                return;
-            }
-
-            handle = LittleEndian.getUShort(data, pos); pos += LittleEndian.SHORT_SIZE;
-            left = LittleEndian.getShort(data, pos); pos += LittleEndian.SHORT_SIZE;
-            top = LittleEndian.getShort(data, pos); pos += LittleEndian.SHORT_SIZE;
-            right = LittleEndian.getShort(data, pos); pos += LittleEndian.SHORT_SIZE;
-            bottom = LittleEndian.getShort(data, pos); pos += LittleEndian.SHORT_SIZE;
-
-            inch = LittleEndian.getUShort(data, pos); pos += LittleEndian.SHORT_SIZE;
-            reserved = LittleEndian.getInt(data, pos); pos += LittleEndian.INT_SIZE;
-
-            checksum = LittleEndian.getShort(data, pos); pos += LittleEndian.SHORT_SIZE;
-            if (checksum != getChecksum()){
-                logger.log(POILogger.WARN, "WMF checksum does not match the header data");
-            }
-        }
-
-        /**
-         * Returns a checksum value for the previous 10 shorts in the header.
-         * The checksum is calculated by XORing each short value to an initial value of 0:
-         */
-        public int getChecksum(){
-            int cs = 0;
-            cs ^=  (APMHEADER_KEY & 0x0000FFFF);
-            cs ^= ((APMHEADER_KEY & 0xFFFF0000) >> 16);
-            cs ^= left;
-            cs ^= top;
-            cs ^= right;
-            cs ^= bottom;
-            cs ^= inch;
-            return cs;
-        }
-
-        public void write(OutputStream out) throws IOException {
-            byte[] header = new byte[22];
-            int pos = 0;
-            LittleEndian.putInt(header, pos, APMHEADER_KEY); pos += LittleEndian.INT_SIZE; //header key
-            LittleEndian.putUShort(header, pos, 0); pos += LittleEndian.SHORT_SIZE; //hmf
-            LittleEndian.putUShort(header, pos, left); pos += LittleEndian.SHORT_SIZE; //left
-            LittleEndian.putUShort(header, pos, top); pos += LittleEndian.SHORT_SIZE; //top
-            LittleEndian.putUShort(header, pos, right); pos += LittleEndian.SHORT_SIZE; //right
-            LittleEndian.putUShort(header, pos, bottom); pos += LittleEndian.SHORT_SIZE; //bottom
-            LittleEndian.putUShort(header, pos, inch); pos += LittleEndian.SHORT_SIZE; //inch
-            LittleEndian.putInt(header, pos, 0); pos += LittleEndian.INT_SIZE;  //reserved
-
-            checksum = getChecksum();
-            LittleEndian.putUShort(header, pos, checksum);
-
-            out.write(header);
-        }
-
-        public Dimension getSize() {
-            //coefficient to translate from WMF dpi to 72dpi
-            double coeff = ((double)Units.POINT_DPI)/inch;
-            return new Dimension((int)Math.round((right-left)*coeff), (int)Math.round((bottom-top)*coeff));
-        }
-        
-        public int getLength(){
-            return 22;
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java
deleted file mode 100644
index af05efa..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import org.apache.poi.hslf.record.EscherTextboxWrapper;
-import org.apache.poi.hslf.record.PPDrawing;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-
-
-/**
- * Uses record level code to locate PPDrawing entries.
- * Having found them, it sees if they have DDF Textbox records, and if so,
- *  searches those for text. Prints out any text it finds
- */
-public final class PPDrawingTextListing {
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Need to give a filename");
-			System.exit(1);
-		}
-
-		HSLFSlideShowImpl ss = new HSLFSlideShowImpl(args[0]);
-
-		// Find PPDrawings at any second level position
-		Record[] records = ss.getRecords();
-		for(int i=0; i<records.length; i++) {
-			Record[] children = records[i].getChildRecords();
-			if(children != null && children.length != 0) {
-				for(int j=0; j<children.length; j++) {
-					if(children[j] instanceof PPDrawing) {
-						System.out.println("Found PPDrawing at " + j + " in top level record " + i + " (" + records[i].getRecordType() + ")" );
-
-						// Look for EscherTextboxWrapper's
-						PPDrawing ppd = (PPDrawing)children[j];
-						EscherTextboxWrapper[] wrappers = ppd.getTextboxWrappers();
-						System.out.println("  Has " + wrappers.length + " textbox wrappers within");
-
-						// Loop over the wrappers, showing what they contain
-						for(int k=0; k<wrappers.length; k++) {
-							EscherTextboxWrapper tbw = wrappers[k];
-							System.out.println("    " + k + " has " + tbw.getChildRecords().length + " PPT atoms within");
-
-							// Loop over the records, printing the text
-							Record[] pptatoms = tbw.getChildRecords();
-							for(int l=0; l<pptatoms.length; l++) {
-								String text = null;
-								if(pptatoms[l] instanceof TextBytesAtom) {
-									TextBytesAtom tba = (TextBytesAtom)pptatoms[l];
-									text = tba.getText();
-								}
-								if(pptatoms[l] instanceof TextCharsAtom) {
-									TextCharsAtom tca = (TextCharsAtom)pptatoms[l];
-									text = tca.getText();
-								}
-
-								if(text != null) {
-									text = text.replace('\r','\n');
-									System.out.println("        ''" + text + "''");
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
deleted file mode 100644
index a9fec1b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Utility class which dumps raw contents of a ppt file into XML format
- */
-
-public final class PPTXMLDump {
-    private static final int HEADER_SIZE = 8; //size of the record header
-    private static final int PICT_HEADER_SIZE = 25; //size of the picture header
-    private static final String PPDOC_ENTRY = "PowerPoint Document";
-    private static final String PICTURES_ENTRY = "Pictures";
-    private static final String CR = System.getProperty("line.separator");
-
-    private Writer out;
-    private byte[] docstream;
-    private byte[] pictstream;
-    private boolean hexHeader = true;
-
-    public PPTXMLDump(File ppt) throws IOException {
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(ppt, true);
-        try {
-            docstream = readEntry(fs, PPDOC_ENTRY);
-            pictstream = readEntry(fs, PICTURES_ENTRY);
-        } finally {
-            fs.close();
-        }
-    }
-
-    private static byte[] readEntry(NPOIFSFileSystem fs, String entry)
-    throws IOException {
-        DirectoryNode dn = fs.getRoot();
-        if (!dn.hasEntry(entry)) {
-            return null;
-        }
-        InputStream is = dn.createDocumentInputStream(entry);
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            IOUtils.copy(is, bos);
-            return bos.toByteArray();
-        } finally {
-            is.close();
-        }
-    }
-    
-    /**
-     * Dump the structure of the supplied PPT file into XML
-     * @param outWriter <code>Writer</code> to write out
-     * @throws java.io.IOException
-     */
-    public void dump(Writer outWriter) throws IOException {
-        this.out = outWriter;
-
-        int padding = 0;
-        write(out, "<Presentation>" + CR, padding);
-        padding++;
-        if (pictstream != null){
-            write(out, "<Pictures>" + CR, padding);
-            dumpPictures(pictstream, padding);
-            write(out, "</Pictures>" + CR, padding);
-        }
-        //dump the structure of the powerpoint document
-        write(out, "<PowerPointDocument>" + CR, padding);
-        padding++;
-        dump(docstream, 0, docstream.length, padding);
-        padding--;
-        write(out, "</PowerPointDocument>" + CR, padding);
-        padding--;
-        write(out, "</Presentation>", padding);
-    }
-
-    /**
-     * Dump a part of the document stream into XML
-     * @param data PPT binary data
-     * @param offset offset from the beginning of the document
-     * @param length of the document
-     * @param padding used for formatting results
-     * @throws java.io.IOException
-     */
-    public void dump(byte[] data, int offset, int length, int padding) throws IOException {
-        int pos = offset;
-        while (pos <= (offset + length - HEADER_SIZE)){
-            if (pos < 0) {
-                break;
-            }
-
-            //read record header
-            int info = LittleEndian.getUShort(data, pos);
-            pos += LittleEndian.SHORT_SIZE;
-            int type = LittleEndian.getUShort(data, pos);
-            pos += LittleEndian.SHORT_SIZE;
-            int size = (int)LittleEndian.getUInt(data, pos);
-            pos += LittleEndian.INT_SIZE;
-
-            //get name of the record by type
-            String recname = RecordTypes.forTypeID(type).name();
-            write(out, "<"+recname + " info=\""+info+"\" type=\""+type+"\" size=\""+size+"\" offset=\""+(pos-8)+"\"", padding);
-            if (hexHeader){
-                out.write(" header=\"");
-                dump(out, data, pos-8, 8, 0, false);
-                out.write("\"");
-            }
-            out.write(">" + CR);
-			padding++;
-            //this check works both for Escher and PowerPoint records
-            boolean isContainer = (info & 0x000F) == 0x000F;
-            if (isContainer) {
-                //continue to dump child records
-                dump(data, pos, size, padding);
-            } else {
-                //dump first 100 bytes of the atom data
-                dump(out, data, pos, Math.min(size, data.length-pos), padding, true);
-            }
-			padding--;
-            write(out, "</"+recname + ">" + CR, padding);
-
-            pos += size;
-        }
-    }
-
-    /**
-     * Dumps the Pictures OLE stream into XML.
-     *
-     * @param data from the Pictures OLE data stream
-     * @param padding
-     * @throws java.io.IOException
-     */
-    public void dumpPictures(byte[] data, int padding) throws IOException {
-        int pos = 0;
-        while (pos < data.length) {
-            byte[] header = new byte[PICT_HEADER_SIZE];
-
-            System.arraycopy(data, pos, header, 0, header.length);
-            int size = LittleEndian.getInt(header, 4) - 17;
-            byte[] pictdata = new byte[size];
-            System.arraycopy(data, pos + PICT_HEADER_SIZE, pictdata, 0, pictdata.length);
-            pos += PICT_HEADER_SIZE + size;
-
-            padding++;
-            write(out, "<picture size=\""+size+"\" type=\""+getPictureType(header)+"\">" + CR, padding);
-            padding++;
-            write(out, "<header>" + CR, padding);
-            dump(out, header, 0, header.length, padding, true);
-            write(out, "</header>" + CR, padding);
-            write(out, "<imgdata>" + CR, padding);
-            dump(out, pictdata, 0, Math.min(pictdata.length, 100), padding, true);
-            write(out, "</imgdata>" + CR, padding);
-            padding--;
-            write(out, "</picture>" + CR, padding);
-            padding--;
-
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0){
-            System.out.println(
-                "Usage: PPTXMLDump (options) pptfile\n" +
-                "Where options include:\n" +
-                "    -f     write output to <pptfile>.xml file in the current directory"
-            );
-            return;
-        }
-        boolean outFile = false;
-        for (int i = 0; i < args.length; i++){
-
-            if (args[i].startsWith("-")) {
-                if ("-f".equals(args[i])){
-                    //write ouput to a file
-                    outFile = true;
-                }
-            } else {
-                File ppt = new File(args[i]);
-                PPTXMLDump dump = new PPTXMLDump(ppt);
-                System.out.println("Dumping " + args[i]);
-
-                if (outFile){
-                    FileOutputStream fos = new FileOutputStream(ppt.getName() + ".xml");
-                    OutputStreamWriter out = new OutputStreamWriter(fos, Charset.forName("UTF8"));
-                    dump.dump(out);
-                    out.close();
-                } else {
-                    StringWriter out = new StringWriter();
-                    dump.dump(out);
-                    System.out.println(out.toString());
-                }
-            }
-
-        }
-    }
-
-
-    /**
-     *  write a string to <code>out</code> with the specified padding
-     */
-    private static void write(Writer out, String str, int padding) throws IOException {
-        for (int i = 0; i < padding; i++) out.write("  ");
-        out.write(str);
-    }
-
-    private String getPictureType(byte[] header){
-        String type;
-        int meta = LittleEndian.getUShort(header, 0);
-
-        switch(meta){
-            case 0x46A0: type = "jpeg"; break;
-            case 0x2160: type = "wmf"; break;
-            case 0x6E00: type = "png"; break;
-            default: type = "unknown"; break;
-        }
-        return type;
-    }
-
-    /**
-     *  dump binary data to <code>out</code> with the specified padding
-     */
-    private static void dump(Writer out, byte[] data, int offset, int length, int padding, boolean nl) throws IOException {
-        int linesize = 25;
-        for (int i = 0; i < padding; i++) out.write("  ");
-        int i;
-        for (i = offset; i < (offset + length); i++) {
-            int c = data[i];
-            out.write((char) hexval[(c & 0xF0) >> 4]);
-            out.write((char) hexval[(c & 0x0F) >> 0]);
-            out.write(' ');
-            if((i+1-offset) % linesize == 0 && i != (offset + length-1)) {
-                out.write(CR);
-                for (int j = 0; j < padding; j++) out.write("  ");
-            }
-        }
-        if(nl && length > 0)out.write(CR);
-    }
-
-    private static final byte hexval[] =
-        {(byte) '0', (byte) '1', (byte) '2', (byte) '3',
-         (byte) '4', (byte) '5', (byte) '6', (byte) '7',
-         (byte) '8', (byte) '9', (byte) 'A', (byte) 'B',
-         (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F'};
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java
deleted file mode 100644
index 90f404b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.SlideListWithText;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-
-/**
- * Uses record level code to Documents.
- * Having found them, it sees if they have any SlideListWithTexts,
- *  and reports how many, and what sorts of things they contain
- */
-public final class SLWTListing {
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Need to give a filename");
-			System.exit(1);
-		}
-
-		HSLFSlideShowImpl ss = new HSLFSlideShowImpl(args[0]);
-
-		// Find the documents, and then their SLWT
-		Record[] records = ss.getRecords();
-		for(int i=0; i<records.length; i++) {
-			if(records[i] instanceof Document) {
-				Document doc = (Document)records[i];
-				SlideListWithText[] slwts = doc.getSlideListWithTexts();
-
-				System.out.println("Document at " + i + " had " + slwts.length + " SlideListWithTexts");
-				if(slwts.length == 0) {
-					System.err.println("** Warning: Should have had at least 1! **");
-				}
-				if(slwts.length > 3) {
-					System.err.println("** Warning: Shouldn't have more than 3!");
-				}
-
-				// Check the SLWTs contain what we'd expect
-				for(int j=0; j<slwts.length; j++) {
-					SlideListWithText slwt = slwts[j];
-					Record[] children = slwt.getChildRecords();
-
-					System.out.println(" - SLWT at " + j + " had " + children.length + " children:");
-
-					// Should only have SlideAtomSets if the second one
-					int numSAS = slwt.getSlideAtomsSets().length;
-					if(j == 1) {
-						if(numSAS == 0) {
-							System.err.println("  ** 2nd SLWT didn't have any SlideAtomSets!");
-						} else {
-							System.out.println("  - Contains " + numSAS + " SlideAtomSets");
-						}
-					} else {
-						if(numSAS > 0) {
-							System.err.println("  ** SLWT " + j + " had " + numSAS + " SlideAtomSets! (expected 0)");
-						}
-					}
-
-					// Report the first 5 children, to give a flavour
-					int upTo = 5;
-					if(children.length < 5) { upTo = children.length; }
-					for(int k=0; k<upTo; k++) {
-						Record r = children[k];
-						int typeID = (int)r.getRecordType();
-						String typeName = RecordTypes.forTypeID(typeID).name();
-						System.out.println("   - " + typeID + " (" + typeName + ")");
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java
deleted file mode 100644
index 5ef5956..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.SlideListWithText;
-import org.apache.poi.hslf.record.SlidePersistAtom;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-
-/**
- * Uses record level code to locate SlideListWithText entries.
- * Having found them, it sees if they have any text, and prints out
- *  what it finds.
- */
-public final class SLWTTextListing {
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Need to give a filename");
-			System.exit(1);
-		}
-
-		HSLFSlideShowImpl ss = new HSLFSlideShowImpl(args[0]);
-
-		// Find the documents, and then their SLWT
-		Record[] records = ss.getRecords();
-		for(int i=0; i<records.length; i++) {
-			if(records[i] instanceof Document) {
-				Record docRecord = records[i];
-				Record[] docChildren = docRecord.getChildRecords();
-				for(int j=0; j<docChildren.length; j++) {
-					if(docChildren[j] instanceof SlideListWithText) {
-						System.out.println("Found SLWT at pos " + j + " in the Document at " + i);
-						System.out.println("  Has " + docChildren[j].getChildRecords().length + " children");
-
-						// Grab the SlideAtomSet's, which contain
-						//  a SlidePersistAtom and then a bunch of text
-						//  + related records
-						SlideListWithText slwt = (SlideListWithText)docChildren[j];
-						SlideListWithText.SlideAtomsSet[] thisSets = slwt.getSlideAtomsSets();
-						System.out.println("  Has " + thisSets.length + " AtomSets in it");
-
-						// Loop over the sets, showing what they contain
-						for(int k=0; k<thisSets.length; k++) {
-							SlidePersistAtom spa = thisSets[k].getSlidePersistAtom();
-							System.out.println("    " + k + " has slide id " + spa.getSlideIdentifier() );
-							System.out.println("    " + k + " has ref id " + spa.getRefID() );
-
-							// Loop over the records, printing the text
-							Record[] slwtc = thisSets[k].getSlideRecords();
-							for(int l=0; l<slwtc.length; l++) {
-								String text = null;
-								if(slwtc[l] instanceof TextBytesAtom) {
-									TextBytesAtom tba = (TextBytesAtom)slwtc[l];
-									text = tba.getText();
-								}
-								if(slwtc[l] instanceof TextCharsAtom) {
-									TextCharsAtom tca = (TextCharsAtom)slwtc[l];
-									text = tca.getText();
-								}
-
-								if(text != null) {
-									text = text.replace('\r','\n');
-									System.out.println("        ''" + text + "''");
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
deleted file mode 100644
index bc57100..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import org.apache.poi.hslf.record.Notes;
-import org.apache.poi.hslf.record.NotesAtom;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.Slide;
-import org.apache.poi.hslf.record.SlideAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-
-
-/**
- * Uses record level code to locate Notes and Slide records.
- * Having found them, it asks their SlideAtom or NotesAtom entries
- *  what they are all about. Useful for checking the matching between
- *  Slides, Master Slides and Notes
- */
-public final class SlideAndNotesAtomListing {
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Need to give a filename");
-			System.exit(1);
-		}
-
-		HSLFSlideShowImpl ss = new HSLFSlideShowImpl(args[0]);
-		System.out.println("");
-
-		// Find either Slides or Notes
-		Record[] records = ss.getRecords();
-		for(int i=0; i<records.length; i++) {
-			Record r = records[i];
-
-			// When we find them, print out their IDs
-			if(r instanceof Slide) {
-				Slide s = (Slide)r;
-				SlideAtom sa = s.getSlideAtom();
-				System.out.println("Found Slide at " + i);
-				System.out.println("  Slide's master ID is " + sa.getMasterID());
-				System.out.println("  Slide's notes ID is  " + sa.getNotesID());
-				System.out.println("");
-			}
-			if(r instanceof Notes) {
-				Notes n = (Notes)r;
-				NotesAtom na = n.getNotesAtom();
-				System.out.println("Found Notes at " + i);
-				System.out.println("  Notes ID is " + na.getSlideID());
-				System.out.println("");
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
deleted file mode 100644
index 1398175..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Map;
-
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.hslf.record.Notes;
-import org.apache.poi.hslf.record.NotesAtom;
-import org.apache.poi.hslf.record.PersistPtrHolder;
-import org.apache.poi.hslf.record.PositionDependentRecord;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.Slide;
-import org.apache.poi.hslf.record.SlideAtom;
-import org.apache.poi.hslf.record.SlideListWithText;
-import org.apache.poi.hslf.record.SlidePersistAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Gets all the different things that have Slide IDs (of sorts)
- *  in them, and displays them, so you can try to guess what they
- *  all mean
- */
-public final class SlideIdListing {
-	private static byte[] fileContents;
-
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Need to give a filename");
-			System.exit(1);
-		}
-
-
-		// Create the slideshow object, for normal working with
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(args[0]);
-		HSLFSlideShow ss = new HSLFSlideShow(hss);
-
-		// Grab the base contents
-		fileContents = hss.getUnderlyingBytes();
-		Record[] records = hss.getRecords();
-		Record[] latestRecords = ss.getMostRecentCoreRecords();
-
-		// Grab any records that interest us
-		Document document = null;
-		for(int i=0; i<latestRecords.length; i++) {
-			if(latestRecords[i] instanceof Document) {
-				document = (Document)latestRecords[i];
-			}
-		}
-
-		System.out.println("");
-
-
-		// Look for SlidePersistAtoms, and report what they have to
-		//  say about possible slide IDs
-		SlideListWithText[] slwts = document.getSlideListWithTexts();
-		for(int i=0; i<slwts.length; i++) {
-			Record[] cr = slwts[i].getChildRecords();
-			for(int j=0; j<cr.length; j++) {
-				if(cr[j] instanceof SlidePersistAtom) {
-					SlidePersistAtom spa = (SlidePersistAtom)cr[j];
-					System.out.println("SlidePersistAtom knows about slide:");
-					System.out.println("\t" + spa.getRefID());
-					System.out.println("\t" + spa.getSlideIdentifier());
-				}
-			}
-		}
-
-		System.out.println("");
-
-		// Look for latest core records that are slides or notes
-		for(int i=0; i<latestRecords.length; i++) {
-			if(latestRecords[i] instanceof Slide) {
-				Slide s = (Slide)latestRecords[i];
-				SlideAtom sa = s.getSlideAtom();
-				System.out.println("Found the latest version of a slide record:");
-				System.out.println("\tCore ID is " + s.getSheetId());
-				System.out.println("\t(Core Records count is " + i + ")");
-				System.out.println("\tDisk Position is " + s.getLastOnDiskOffset());
-				System.out.println("\tMaster ID is " + sa.getMasterID());
-				System.out.println("\tNotes ID is " + sa.getNotesID());
-			}
-		}
-		System.out.println("");
-		for(int i=0; i<latestRecords.length; i++) {
-			if(latestRecords[i] instanceof Notes) {
-				Notes n = (Notes)latestRecords[i];
-				NotesAtom na = n.getNotesAtom();
-				System.out.println("Found the latest version of a notes record:");
-				System.out.println("\tCore ID is " + n.getSheetId());
-				System.out.println("\t(Core Records count is " + i + ")");
-				System.out.println("\tDisk Position is " + n.getLastOnDiskOffset());
-				System.out.println("\tMatching slide is " + na.getSlideID());
-			}
-		}
-
-		System.out.println("");
-
-		// Find any persist ones first
-		int pos = 0;
-		for(int i=0; i<records.length; i++) {
-			Record r = records[i];
-
-			if(r.getRecordType() == 6001l) {
-				// PersistPtrFullBlock
-				System.out.println("Found PersistPtrFullBlock at " + pos + " (" + Integer.toHexString(pos) + ")");
-			}
-			if(r.getRecordType() == 6002l) {
-				// PersistPtrIncrementalBlock
-				System.out.println("Found PersistPtrIncrementalBlock at " + pos + " (" + Integer.toHexString(pos) + ")");
-				PersistPtrHolder pph = (PersistPtrHolder)r;
-
-				// Check the sheet offsets
-				int[] sheetIDs = pph.getKnownSlideIDs();
-				Map<Integer,Integer> sheetOffsets = pph.getSlideLocationsLookup();
-				for(int j=0; j<sheetIDs.length; j++) {
-					Integer id = sheetIDs[j];
-					Integer offset = sheetOffsets.get(id);
-
-					System.out.println("  Knows about sheet " + id);
-					System.out.println("    That sheet lives at " + offset);
-
-					Record atPos = findRecordAtPos(offset.intValue());
-					System.out.println("    The record at that pos is of type " + atPos.getRecordType());
-					System.out.println("    The record at that pos has class " + atPos.getClass().getName());
-
-					if(! (atPos instanceof PositionDependentRecord)) {
-						System.out.println("    ** The record class isn't position aware! **");
-					}
-				}
-			}
-
-			// Increase the position by the on disk size
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			r.writeOut(baos);
-			pos += baos.size();
-		}
-
-		System.out.println("");
-	}
-
-
-	// Finds the record at a given position
-	public static Record findRecordAtPos(int pos) {
-		long type = LittleEndian.getUShort(fileContents, pos+2);
-		long rlen = LittleEndian.getUInt(fileContents, pos+4);
-
-		Record r = Record.createRecordForType(type,fileContents,pos,(int)rlen+8);
-
-		return r;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
deleted file mode 100644
index 0cfaa3f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.Locale;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hslf.record.HSLFEscherRecordFactory;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class provides a way to "peek" inside a powerpoint file. It
- *  will print out all the types it find, and for those it know aren't
- *  atoms, what they contain
- *
- * To figure out what things are, and if they are atoms or not, used the
- *  list in hslf.record.RecordTypes
- *
- * To peek inside PPDrawings, which hold Escher drawings, we use the
- *  DDF package from POI (but we can fake it by using the Escher listings
- *  from hslf.record.RecordTypes also)
- */
-public final class SlideShowDumper {
-  private byte[] docstream;
-
-  /** Do we try to use DDF to understand the escher objects? */
-  private boolean ddfEscher = false;
-  /** Do we use our own built-in basic escher groker to understand the escher objects? */
-  private boolean basicEscher = false;
-  
-  private PrintStream out;
-
-  /**
-   *  right now this function takes one parameter: a ppt file, and outputs
-   *  a dump of what it contains
-   */
-  public static void main(String args[]) throws IOException
-  {
-	if(args.length == 0) {
-		System.err.println("Useage: SlideShowDumper [-escher|-basicescher] <filename>");
-		return;
-	}
-
-	String filename = args[0];
-	if(args.length > 1) {
-		filename = args[1];
-	}
-
-	NPOIFSFileSystem poifs = new NPOIFSFileSystem(new File(filename));
-	SlideShowDumper foo = new SlideShowDumper(poifs, System.out);
-    poifs.close();
-
-	if(args.length > 1) {
-		if(args[0].equalsIgnoreCase("-escher")) {
-			foo.setDDFEscher(true);
-		} else {
-			foo.setBasicEscher(true);
-		}
-	}
-
-	foo.printDump();
-  }
-
-  /**
-   * Constructs a Powerpoint dump from a POIFS Filesystem. Parses the
-   * document and dumps out the contents
-   *
-   * @param filesystem the POIFS FileSystem to read from
-   * @throws IOException if there is a problem while parsing the document.
-   */
-  public SlideShowDumper(NPOIFSFileSystem filesystem, PrintStream out) throws IOException {
-	// Grab the document stream
-	InputStream is = filesystem.createDocumentInputStream("PowerPoint Document");
-	docstream = IOUtils.toByteArray(is);
-	is.close();
-	this.out = out;
-  }
-
-  /**
-   * Control dumping of any Escher records found - should DDF be used?
-   */
-  public void setDDFEscher(boolean grok) {
-	ddfEscher = grok;
-	basicEscher = !(grok);
-  }
-
-  /**
-   * Control dumping of any Escher records found - should our built in
-   *  basic groker be used?
-   */
-  public void setBasicEscher(boolean grok) {
-	basicEscher = grok;
-	ddfEscher = !(grok);
-  }
-
-  public void printDump() throws IOException {
-	// The format of records in a powerpoint file are:
-	//   <little endian 2 byte "info">
-	//   <little endian 2 byte "type">
-	//   <little endian 4 byte "length">
-	// If it has a zero length, following it will be another record
-	//		<xx xx yy yy 00 00 00 00> <xx xx yy yy zz zz zz zz>
-	// If it has a length, depending on its type it may have children or data
-	// If it has children, these will follow straight away
-	//		<xx xx yy yy zz zz zz zz <xx xx yy yy zz zz zz zz>>
-	// If it has data, this will come straigh after, and run for the length
-	//      <xx xx yy yy zz zz zz zz dd dd dd dd dd dd dd>
-	// All lengths given exclude the 8 byte record header
-	// (Data records are known as Atoms)
-
-	// Document should start with:
-	//   0F 00 E8 03 ## ## ## ##
-    //     (type 1000 = document, info 00 0f is normal, rest is document length)
-	//   01 00 E9 03 28 00 00 00
-	//     (type 1001 = document atom, info 00 01 normal, 28 bytes long)
-
-	// When parsing a document, look to see if you know about that type
-	//  of the current record. If you know it's a type that has children,
-	//  process the record's data area looking for more records
-	// If you know about the type and it doesn't have children, either do
-	//  something with the data (eg TextRun) or skip over it
-	// Otherwise, check the first byte. If you do a BINARY_AND on it with
-	//  0x0f (15) and get back 0x0f, you know it has children. Otherwise
-	//  it doesn't
-
-	walkTree(0,0,docstream.length);
-}
-
-public void walkTree(int depth, int startPos, int maxLen) throws IOException {
-	int pos = startPos;
-	int endPos = startPos + maxLen;
-	final String ind = (depth == 0) ? "%1$s" : "%1$"+depth+"s";
-	while(pos <= endPos - 8) {
-		long type = LittleEndian.getUShort(docstream,pos+2);
-		long len = LittleEndian.getUInt(docstream,pos+4);
-		byte opt = docstream[pos];
-
-		String fmt = ind+"At position %2$d (%2$04x): type is %3$d (%3$04x), len is %4$d (%4$04x)";
-		out.println(String.format(Locale.ROOT, fmt, "", pos, type, len));
-
-		// See if we know about the type of it
-		String recordName = RecordTypes.forTypeID((short)type).name();
-
-		// Jump over header, and think about going on more
-		pos += 8;
-		out.println(String.format(Locale.ROOT, ind+"That's a %2$s", "", recordName));
-
-		// Now check if it's a container or not
-		int container = opt & 0x0f;
-
-		// BinaryTagData seems to contain records, but it
-		//  isn't tagged as doing so. Try stepping in anyway
-		if(type == 5003L && opt == 0L) {
-			container = 0x0f;
-		}
-
-        out.println();
-		if (type != 0L && container == 0x0f) {
-		    if (type == 1035l || type == 1036l) {
-    			// Special Handling of 1035=PPDrawingGroup and 1036=PPDrawing
-    			if(ddfEscher) {
-    				// Seems to be:
-    				walkEscherDDF((depth+3),pos+8,(int)len-8);
-    			} else if(basicEscher) {
-    				walkEscherBasic((depth+3),pos+8,(int)len-8);
-    			}
-    		} else {
-    			// General container record handling code
-    			walkTree((depth+2),pos,(int)len);
-    		}
-		}
-
-		pos += (int)len;
-	}
-  }
-
-  /**
-   * Use the DDF code to walk the Escher records
-   */
-  public void walkEscherDDF(int indent, int pos, int len) {
-	if(len < 8) { return; }
-
-	final String ind = (indent == 0) ? "%1$s" : "%1$"+indent+"s";
-
-	byte[] contents = new byte[len];
-	System.arraycopy(docstream,pos,contents,0,len);
-	DefaultEscherRecordFactory erf = new HSLFEscherRecordFactory();
-	EscherRecord record = erf.createRecord(contents,0);
-
-	// For now, try filling in the fields
-	record.fillFields(contents,0,erf);
-
-	long atomType = LittleEndian.getUShort(contents,2);
-	// This lacks the 8 byte header size
-	long atomLen = LittleEndian.getUShort(contents,4);
-	// This (should) include the 8 byte header size
-	int recordLen = record.getRecordSize();
-
-    String fmt = ind+"At position %2$d (%2$04x): type is %3$d (%3$04x), len is %4$d (%4$04x) (%5$d) - record claims %6$d";
-    out.println(String.format(Locale.ROOT, fmt, "", pos, atomType, atomLen, atomLen+8, recordLen));
-	
-	
-	// Check for corrupt / lying ones
-	if(recordLen != 8 && (recordLen != (atomLen+8))) {
-		out.println(String.format(Locale.ROOT, ind+"** Atom length of $2d ($3d) doesn't match record length of %4d", "", atomLen, atomLen+8, recordLen));
-	}
-
-	// Print the record's details
-    String recordStr = record.toString().replace("\n", String.format(Locale.ROOT,  "\n"+ind, ""));
-    out.println(String.format(Locale.ROOT, ind+"%2$s", "", recordStr));
-
-    if(record instanceof EscherContainerRecord) {
-		walkEscherDDF((indent+3), pos + 8, (int)atomLen );
-	}
-
-	// Handle records that seem to lie
-	if(atomType == 61451l) {
-		// Normally claims a size of 8
-		recordLen = (int)atomLen + 8;
-	}
-	if(atomType == 61453l) {
-		// Returns EscherContainerRecord, but really msofbtClientTextbox
-		recordLen = (int)atomLen + 8;
-		record.fillFields( contents, 0, erf );
-		if(! (record instanceof EscherTextboxRecord)) {
-			out.println(String.format(Locale.ROOT, ind+"%2$s", "", "** Really a msofbtClientTextbox !"));
-		}
-	}
-
-	// Decide on what to do, based on how the lenghts match up
-	if(recordLen == 8 && atomLen > 8 ) {
-		// Assume it has children, rather than being corrupted
-		walkEscherDDF((indent+3), pos + 8, (int)atomLen );
-
-		// Wind on our length + our header
-		pos += atomLen;
-		pos += 8;
-		len -= atomLen;
-		len -= 8;
-	} else {
-		// No children, wind on our real length
-		pos += atomLen;
-		pos += 8;
-		len -= atomLen;
-		len -= 8;
-	}
-
-	// Move on to the next one, if we're not at the end yet
-	if(len >= 8) {
-		walkEscherDDF(indent, pos, len );
-	}
-  }
-
-  /**
-   * Use the basic record format groking code to walk the Escher records
-   */
-  public void walkEscherBasic(int indent, int pos, int len) throws IOException {
-	if(len < 8) { return; }
-
-	final String ind = (indent == 0) ? "%1$s" : "%1$"+indent+"s";
-
-	long type = LittleEndian.getUShort(docstream,pos+2);
-	long atomlen = LittleEndian.getUInt(docstream,pos+4);
-
-	String fmt = ind+"At position %2$d ($2$04x): type is %3$d (%3$04x), len is %4$d (%4$04x)";
-	out.println(String.format(Locale.ROOT, fmt, "", pos, type, atomlen));
-
-	String typeName = RecordTypes.forTypeID((short)type).name();
-	out.println(String.format(Locale.ROOT, ind+"%2$s", "That's an Escher Record: ", typeName));
-
-	// Record specific dumps
-	if(type == 61453l) {
-		// Text Box. Print out first 8 bytes of data, then 8 4 later
-	    HexDump.dump(docstream, 0, out, pos+8, 8);
-	    HexDump.dump(docstream, 0, out, pos+20, 8);
-		out.println();
-	}
-
-
-	// Blank line before next entry
-	out.println();
-
-	// Look in children if we are a container
-	if(type == 61443l || type == 61444l) {
-		walkEscherBasic((indent+3), pos+8, (int)atomlen);
-	}
-
-	// Keep going if not yet at end
-	if(atomlen < len) {
-		int atomleni = (int)atomlen;
-		walkEscherBasic(indent, pos+atomleni+8, len-atomleni-8);
-	}
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
deleted file mode 100644
index cb3fe81..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hslf.record.EscherTextboxWrapper;
-import org.apache.poi.hslf.record.HSLFEscherRecordFactory;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.StyleTextPropAtom;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.util.HexDump;
-
-/**
- * This class provides a way to view the contents of a powerpoint file.
- * It will use the recored layer to grok the contents of the file, and
- *  will print out what it finds.
- *
- * @author Nick Burch
- */
-public final class SlideShowRecordDumper {
-    final static String tabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-    
-    private boolean optVerbose;
-    private boolean optEscher;
-    private HSLFSlideShowImpl doc;
-    private final PrintStream ps;
-
-    /**
-     * right now this function takes one parameter: a ppt file, and outputs a
-     * dump of what it contains
-     */
-    public static void main(String args[]) throws IOException {
-        String filename = "";
-        boolean verbose = false;
-        boolean escher = false;
-
-        int ndx = 0;
-        for (; ndx < args.length; ndx++) {
-            if (!args[ndx].substring(0, 1).equals("-"))
-                break;
-
-            if (args[ndx].equals("-escher")) {
-                escher = true;
-            } else if (args[ndx].equals("-verbose")) {
-                verbose = true;
-            } else {
-                printUsage();
-                return;
-            }
-        }
-
-        // parsed any options, expect exactly one remaining arg (filename)
-        if (ndx != args.length - 1) {
-            printUsage();
-            return;
-        }
-
-        filename = args[ndx];
-
-        SlideShowRecordDumper foo = new SlideShowRecordDumper(System.out,
-                filename, verbose, escher);
-
-        foo.printDump();
-    }
-
-    public static void printUsage() {
-        System.err.println("Usage: SlideShowRecordDumper [-escher] [-verbose] <filename>");
-        System.err.println("Valid Options:");
-        System.err.println("-escher\t\t: dump contents of escher records");
-        System.err.println("-verbose\t: dump binary contents of each record");
-    }
-
-    /**
-     * Constructs a Powerpoint dump from fileName. Parses the document
-     * and dumps out the contents
-     *
-     * @param fileName The name of the file to read.
-     * @throws IOException if there is a problem while parsing the document.
-     */
-    public SlideShowRecordDumper(PrintStream ps, String fileName, boolean verbose, boolean escher)
-    throws IOException {
-        this.ps = ps;
-        optVerbose = verbose;
-        optEscher = escher;
-        doc = new HSLFSlideShowImpl(fileName);
-    }
-
-
-    public void printDump() throws IOException {
-        // Prints out the records in the tree
-        walkTree(0, 0, doc.getRecords(), 0);
-    }
-
-    public String makeHex(int number, int padding) {
-        String hex = Integer.toHexString(number).toUpperCase(Locale.ROOT);
-        while (hex.length() < padding) {
-            hex = "0" + hex;
-        }
-        return hex;
-    }
-
-    public String reverseHex(String s) {
-        StringBuilder ret = new StringBuilder();
-
-        // Get to a multiple of two
-        int pos = 0;
-        if ((s.length() & 1) == 1) {
-            ret.append(0);
-            pos++;
-        }
-        for (char c : s.toCharArray()) {
-            if (pos > 0 && (pos & 1) == 0) {
-                ret.append(' ');
-            }
-            ret.append(c);
-            pos++;
-        }
-
-        return ret.toString();
-    }
-
-    public int getDiskLen(Record r) throws IOException {
-        int diskLen = 0;
-        if (r != null) {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            r.writeOut(baos);
-            diskLen = baos.size();
-        }
-        return diskLen;
-    }
-
-    public String getPrintableRecordContents(Record r) throws IOException {
-        if (r == null) {
-            return "<<null>>";
-        }
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        r.writeOut(baos);
-        byte[] b = baos.toByteArray();
-        return HexDump.dump(b, 0, 0);
-    }
-
-    public void printEscherRecord(EscherRecord er, int indent) {
-		if (er instanceof EscherContainerRecord) {
-			printEscherContainerRecord( (EscherContainerRecord)er, indent );
-		} else if (er instanceof EscherTextboxRecord) {
-		    printEscherTextBox( (EscherTextboxRecord)er, indent );
-		} else {
-		    ps.print( tabs.substring(0, indent) );
-		    ps.println( er.toString() );
-		}
-    }
-
-    private void printEscherTextBox( EscherTextboxRecord tbRecord, int indent ) {
-        String ind = tabs.substring(0, indent);
-        ps.println(ind+"EscherTextboxRecord:");
-
-        EscherTextboxWrapper etw = new EscherTextboxWrapper(tbRecord);
-        Record prevChild = null;
-        for (Record child : etw.getChildRecords()) {
-            if (child instanceof StyleTextPropAtom) {
-                // need preceding Text[Chars|Bytes]Atom to initialize the data structure
-                String text = null;
-                if (prevChild instanceof TextCharsAtom) {
-                    text = ((TextCharsAtom)prevChild).getText();
-                } else if (prevChild instanceof TextBytesAtom) {
-                    text = ((TextBytesAtom)prevChild).getText();
-                } else {
-                    ps.println(ind+"Error! Couldn't find preceding TextAtom for style");
-                    continue;
-                }
-
-                StyleTextPropAtom tsp = (StyleTextPropAtom)child;
-                tsp.setParentTextSize(text.length());
-            }
-            ps.println(ind+child.toString());
-            prevChild = child;
-        }
- 
-    }
-    
-    private void printEscherContainerRecord( EscherContainerRecord ecr, int indent ) {
-        String ind = tabs.substring(0, indent);
-        ps.println(ind + ecr.getClass().getName() + " (" + ecr.getRecordName() + "):");
-        ps.println(ind + "  isContainer: " + ecr.isContainerRecord());
-        ps.println(ind + "  options: 0x" + HexDump.toHex( ecr.getOptions() ));
-        ps.println(ind + "  recordId: 0x" + HexDump.toHex( ecr.getRecordId() ));
-        
-        List<EscherRecord> childRecords = ecr.getChildRecords();
-        ps.println(ind + "  numchildren: " + childRecords.size());
-        ps.println(ind + "  children: ");
-        int count = 0;
-        for ( EscherRecord record : childRecords ) {
-            ps.println(ind + "   Child " + count + ":");
-            printEscherRecord(record, indent+1);
-            count++;
-        }
-    }
-
-
-    public void walkTree(int depth, int pos, Record[] records, int indent) throws IOException {
-        String ind = tabs.substring(0, indent);
-
-        for (int i = 0; i < records.length; i++) {
-            Record r = records[i];
-            if (r == null) {
-                ps.println(ind + "At position " + pos + " (" + makeHex(pos, 6) + "):");
-                ps.println(ind + "Warning! Null record found.");
-                continue;
-            }
-
-            // Figure out how big it is
-            int len = getDiskLen(r);
-
-            // Grab the type as hex
-            String hexType = makeHex((int) r.getRecordType(), 4);
-            String rHexType = reverseHex(hexType);
-
-		// Grab the hslf.record type
-		Class<? extends Record> c = r.getClass();
-		String cname = c.toString();
-		if(cname.startsWith("class ")) {
-			cname = cname.substring(6);
-		}
-		if(cname.startsWith("org.apache.poi.hslf.record.")) {
-			cname = cname.substring(27);
-		}
-
-		// Display the record
-		ps.println(ind + "At position " + pos + " (" + makeHex(pos,6) + "):");
-		ps.println(ind + " Record is of type " + cname);
-		ps.println(ind + " Type is " + r.getRecordType() + " (" + hexType + " -> " + rHexType + " )");
-		ps.println(ind + " Len is " + (len-8) + " (" + makeHex((len-8),8) + "), on disk len is " + len );
-
-		// print additional information for drawings and atoms
-		if (optEscher && cname.equals("PPDrawing")) {
-			DefaultEscherRecordFactory factory = new HSLFEscherRecordFactory();
-
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			r.writeOut(baos);
-			byte[] b = baos.toByteArray();
-
-			EscherRecord er = factory.createRecord(b, 0);
-			er.fillFields(b, 0, factory);
-
-			printEscherRecord( er, indent+1 );
-
-		} else if(optVerbose && r.getChildRecords() == null) {
-			String recData = getPrintableRecordContents(r);
-			ps.println(ind + recData );
-		}
-
-		ps.println();
-
-		// If it has children, show them
-		if(r.getChildRecords() != null) {
-			walkTree((depth+3),pos+8,r.getChildRecords(), indent+1);
-		}
-
-		// Wind on the position marker
-		pos += len;
-	}
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
deleted file mode 100644
index 14b7706..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import java.util.List;
-
-import org.apache.poi.hslf.model.textproperties.*;
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-
-/**
- * Uses record level code to locate StyleTextPropAtom entries.
- * Having found them, it shows the contents
- */
-public final class TextStyleListing {
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Need to give a filename");
-			System.exit(1);
-		}
-
-		HSLFSlideShowImpl ss = new HSLFSlideShowImpl(args[0]);
-
-		// Find the documents, and then their SLWT
-		Record[] records = ss.getRecords();
-		for(int i=0; i<records.length; i++) {
-			if(records[i].getRecordType() == 1000l) {
-				Record docRecord = records[i];
-				Record[] docChildren = docRecord.getChildRecords();
-				for(int j=0; j<docChildren.length; j++) {
-					if(docChildren[j] instanceof SlideListWithText) {
-						Record[] slwtChildren = docChildren[j].getChildRecords();
-
-						int lastTextLen = -1;
-						for(int k=0; k<slwtChildren.length; k++) {
-							if(slwtChildren[k] instanceof TextCharsAtom) {
-								lastTextLen = ((TextCharsAtom)slwtChildren[k]).getText().length();
-							}
-							if(slwtChildren[k] instanceof TextBytesAtom) {
-								lastTextLen = ((TextBytesAtom)slwtChildren[k]).getText().length();
-							}
-
-							if(slwtChildren[k] instanceof StyleTextPropAtom) {
-								StyleTextPropAtom stpa = (StyleTextPropAtom)slwtChildren[k];
-								stpa.setParentTextSize(lastTextLen);
-								showStyleTextPropAtom(stpa);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public static void showStyleTextPropAtom(StyleTextPropAtom stpa) {
-		System.out.println("\nFound a StyleTextPropAtom");
-
-		List<TextPropCollection> paragraphStyles = stpa.getParagraphStyles();
-		System.out.println("Contains " + paragraphStyles.size() + " paragraph styles:");
-		for(int i=0; i<paragraphStyles.size(); i++) {
-			TextPropCollection tpc = paragraphStyles.get(i);
-			System.out.println(" In paragraph styling " + i + ":");
-			System.out.println("  Characters covered is " + tpc.getCharactersCovered());
-			showTextProps(tpc);
-		}
-
-		List<TextPropCollection> charStyles = stpa.getCharacterStyles();
-		System.out.println("Contains " + charStyles.size() + " character styles:");
-		for(int i=0; i<charStyles.size(); i++) {
-			TextPropCollection tpc = charStyles.get(i);
-			System.out.println("  In character styling " + i + ":");
-			System.out.println("    Characters covered is " + tpc.getCharactersCovered());
-			showTextProps(tpc);
-		}
-	}
-
-	public static void showTextProps(TextPropCollection tpc) {
-		List<TextProp> textProps = tpc.getTextPropList();
-		System.out.println("    Contains " + textProps.size() + " TextProps");
-		for(int i=0; i<textProps.size(); i++) {
-			TextProp tp = textProps.get(i);
-			System.out.println("      " + i + " - " + tp.getName());
-			System.out.println("          = " + tp.getValue());
-			System.out.println("          @ " + tp.getMask());
-
-			if(tp instanceof BitMaskTextProp) {
-				BitMaskTextProp bmtp = (BitMaskTextProp)tp;
-				String[] subPropNames = bmtp.getSubPropNames();
-				boolean[] subPropMatches = bmtp.getSubPropMatches();
-				for(int j=0; j<subPropNames.length; j++) {
-					System.out.println("            -> " + j + " - " + subPropNames[j]);
-					System.out.println("               " + j + " = " + subPropMatches[j]);
-				}
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
deleted file mode 100644
index 34759ea..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.dev;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Map;
-
-import org.apache.poi.hslf.record.CurrentUserAtom;
-import org.apache.poi.hslf.record.PersistPtrHolder;
-import org.apache.poi.hslf.record.PositionDependentRecord;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.UserEditAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Uses record level code to locate UserEditAtom records, and other
- *  persistence related atoms. Tries to match them together, to help
- *  illuminate quite what all the offsets mean
- */
-public final class UserEditAndPersistListing {
-	private static byte[] fileContents;
-
-	public static void main(String[] args) throws Exception {
-		if(args.length < 1) {
-			System.err.println("Need to give a filename");
-			System.exit(1);
-		}
-
-
-		// Create the slideshow object, for normal working with
-		HSLFSlideShowImpl ss = new HSLFSlideShowImpl(args[0]);
-		fileContents = ss.getUnderlyingBytes();
-		System.out.println("");
-
-		// Find any persist ones first
-		Record[] records = ss.getRecords();
-		int pos = 0;
-		for(int i=0; i<records.length; i++) {
-			Record r = records[i];
-
-			if(r.getRecordType() == 6001l) {
-				// PersistPtrFullBlock
-				System.out.println("Found PersistPtrFullBlock at " + pos + " (" + Integer.toHexString(pos) + ")");
-			}
-			if(r.getRecordType() == 6002l) {
-				// PersistPtrIncrementalBlock
-				System.out.println("Found PersistPtrIncrementalBlock at " + pos + " (" + Integer.toHexString(pos) + ")");
-				PersistPtrHolder pph = (PersistPtrHolder)r;
-
-				// Check the sheet offsets
-				int[] sheetIDs = pph.getKnownSlideIDs();
-				Map<Integer,Integer> sheetOffsets = pph.getSlideLocationsLookup();
-				for(int j=0; j<sheetIDs.length; j++) {
-					Integer id = sheetIDs[j];
-					Integer offset = sheetOffsets.get(id);
-
-					System.out.println("  Knows about sheet " + id);
-					System.out.println("    That sheet lives at " + offset);
-
-					Record atPos = findRecordAtPos(offset.intValue());
-					System.out.println("    The record at that pos is of type " + atPos.getRecordType());
-					System.out.println("    The record at that pos has class " + atPos.getClass().getName());
-
-					if(! (atPos instanceof PositionDependentRecord)) {
-						System.out.println("    ** The record class isn't position aware! **");
-					}
-				}
-			}
-
-			// Increase the position by the on disk size
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			r.writeOut(baos);
-			pos += baos.size();
-		}
-
-		System.out.println("");
-
-		pos = 0;
-		// Now look for UserEditAtoms
-		for(int i=0; i<records.length; i++) {
-			Record r = records[i];
-
-			if(r instanceof UserEditAtom) {
-				UserEditAtom uea = (UserEditAtom)r;
-				System.out.println("Found UserEditAtom at " + pos + " (" + Integer.toHexString(pos) + ")");
-				System.out.println("  lastUserEditAtomOffset = " + uea.getLastUserEditAtomOffset() );
-				System.out.println("  persistPointersOffset  = " + uea.getPersistPointersOffset() );
-				System.out.println("  docPersistRef          = " + uea.getDocPersistRef() );
-				System.out.println("  maxPersistWritten      = " + uea.getMaxPersistWritten() );
-			}
-
-			// Increase the position by the on disk size
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			r.writeOut(baos);
-			pos += baos.size();
-		}
-
-		System.out.println("");
-
-
-		// Query the CurrentUserAtom
-		CurrentUserAtom cua = ss.getCurrentUserAtom();
-		System.out.println("Checking Current User Atom");
-		System.out.println("  Thinks the CurrentEditOffset is " + cua.getCurrentEditOffset());
-
-		System.out.println("");
-	}
-
-
-	// Finds the record at a given position
-	public static Record findRecordAtPos(int pos) {
-		long type = LittleEndian.getUShort(fileContents, pos+2);
-		long rlen = LittleEndian.getUInt(fileContents, pos+4);
-
-		Record r = Record.createRecordForType(type,fileContents,pos,(int)rlen+8);
-
-		return r;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
deleted file mode 100644
index 3c61039..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.exceptions;
-
-/**
- * This exception is thrown when we try to open a PowerPoint file, and
- *  something is fundamentally broken about it.
- *
- * @author Nick Burch
- */
-
-public final class CorruptPowerPointFileException extends IllegalStateException
-{
-	public CorruptPowerPointFileException(String s) {
-		super(s);
-	}
-	
-	public CorruptPowerPointFileException(String s, Throwable t) {
-	    super(s,t);
-	}
-
-    public CorruptPowerPointFileException(Throwable t) {
-        super(t);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
deleted file mode 100644
index de9d534..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.exceptions;
-
-import org.apache.poi.EncryptedDocumentException;
-
-/**
- * This exception is thrown when we try to open a PowerPoint file, and
- *  discover that it is encrypted
- */
-public final class EncryptedPowerPointFileException extends EncryptedDocumentException
-{
-	public EncryptedPowerPointFileException(String s) {
-		super(s);
-	}
-	
-	public EncryptedPowerPointFileException(String s, Throwable t) {
-        super(s, t);
-	}
-
-    public EncryptedPowerPointFileException(Throwable t) {
-        super(t);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java
deleted file mode 100644
index f534d9c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.exceptions;
-
-/**
- * A generic exception that can be thrown by HSLF classes
- *
- * @author Yegor Kozlov
- */
-public final class HSLFException extends RuntimeException {
-
-    public HSLFException() {
-	    super();
-    }
-
-   public HSLFException(String message) {
-	    super(message);
-    }
-
-   public HSLFException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public HSLFException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/InvalidRecordFormatException.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/InvalidRecordFormatException.java
deleted file mode 100644
index 46df9c9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/InvalidRecordFormatException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.exceptions;
-
-/**
- * This exception is thrown when we try to create a record, and the
- *  underlying data just doesn't match up
- *
- * @author Nick Burch
- */
-
-public final class InvalidRecordFormatException extends Exception
-{
-	public InvalidRecordFormatException(String s) {
-		super(s);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
deleted file mode 100644
index fbb2f6d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hslf.exceptions;
-
-import org.apache.poi.OldFileFormatException;
-
-/**
- * This exception is thrown when we try to open a PowerPoint file, and
- *  it's too old for us.
- */
-public class OldPowerPointFormatException extends OldFileFormatException {
-	public OldPowerPointFormatException(String s) {
-		super(s);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java
deleted file mode 100644
index 4062aeb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.extractor;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-
-/**
- * Utility to extract pictures from a PowerPoint file.
- *
- * @author Yegor Kozlov
- */
-public final class ImageExtractor {
-    public static void main(String args[]) throws IOException {
-        if (args.length < 1) {
-            System.err.println("Usage:");
-            System.err.println("\tImageExtractor <file>");
-            return;
-        }
-        HSLFSlideShow ppt = new HSLFSlideShow(new HSLFSlideShowImpl(args[0]));
-
-        //extract all pictures contained in the presentation
-        List<HSLFPictureData> pdata = ppt.getPictureData();
-        for (int i = 0; i < pdata.size(); i++) {
-            HSLFPictureData pict = pdata.get(i);
-
-            // picture data
-            byte[] data = pict.getData();
-
-            PictureType type = pict.getType();
-            FileOutputStream out = new FileOutputStream("pict_" + i + type.extension);
-            out.write(data);
-            out.close();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
deleted file mode 100644
index 8085482..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.extractor;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hslf.model.Comment;
-import org.apache.poi.hslf.model.HSLFMetroShape;
-import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.model.OLEShape;
-import org.apache.poi.hslf.usermodel.HSLFMasterSheet;
-import org.apache.poi.hslf.usermodel.HSLFNotes;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideMaster;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.hslf.usermodel.HSLFTable;
-import org.apache.poi.hslf.usermodel.HSLFTableCell;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.hslf.usermodel.HSLFTextShape;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class can be used to extract text from a PowerPoint file. Can optionally
- * also get the notes from one.
- */
-public final class PowerPointExtractor extends POIOLE2TextExtractor {
-   private static final POILogger LOG = POILogFactory.getLogger(PowerPointExtractor.class);
-    
-   private final HSLFSlideShowImpl _hslfshow;
-   private final HSLFSlideShow _show;
-   private final List<HSLFSlide> _slides;
-
-   private boolean _slidesByDefault = true;
-   private boolean _notesByDefault = false;
-   private boolean _commentsByDefault = false;
-   private boolean _masterByDefault = false;
-
-	/**
-	 * Basic extractor. Returns all the text, and optionally all the notes
-	 */
-	public static void main(String args[]) throws IOException {
-		if (args.length < 1) {
-			System.err.println("Useage:");
-			System.err.println("\tPowerPointExtractor [-notes] <file>");
-			System.exit(1);
-		}
-
-		boolean notes = false;
-		boolean comments = false;
-        boolean master = true;
-        
-		String file;
-		if (args.length > 1) {
-			notes = true;
-			file = args[1];
-			if (args.length > 2) {
-				comments = true;
-			}
-		} else {
-			file = args[0];
-		}
-
-		PowerPointExtractor ppe = new PowerPointExtractor(file);
-		System.out.println(ppe.getText(true, notes, comments, master));
-		ppe.close();
-	}
-
-	/**
-	 * Creates a PowerPointExtractor, from a file
-	 *
-	 * @param fileName The name of the file to extract from
-	 */
-	public PowerPointExtractor(String fileName) throws IOException {
-		this(new NPOIFSFileSystem(new File(fileName)));
-	}
-
-	/**
-	 * Creates a PowerPointExtractor, from an Input Stream
-	 *
-	 * @param iStream The input stream containing the PowerPoint document
-	 */
-	public PowerPointExtractor(InputStream iStream) throws IOException {
-		this(new POIFSFileSystem(iStream));
-	}
-
-	/**
-	 * Creates a PowerPointExtractor, from an open POIFSFileSystem
-	 *
-	 * @param fs the POIFSFileSystem containing the PowerPoint document
-	 */
-	public PowerPointExtractor(POIFSFileSystem fs) throws IOException {
-		this(fs.getRoot());
-	}
-
-   /**
-    * Creates a PowerPointExtractor, from an open NPOIFSFileSystem
-    *
-    * @param fs the NPOIFSFileSystem containing the PowerPoint document
-    */
-   public PowerPointExtractor(NPOIFSFileSystem fs) throws IOException {
-      this(fs.getRoot());
-      setFilesystem(fs);
-   }
-
-   /**
-    * Creates a PowerPointExtractor, from a specific place
-    *  inside an open NPOIFSFileSystem
-    *
-    * @param dir the POIFS Directory containing the PowerPoint document
-    */
-   public PowerPointExtractor(DirectoryNode dir) throws IOException {
-      this(new HSLFSlideShowImpl(dir));
-   }
-
-	/**
-	 * Creates a PowerPointExtractor, from a HSLFSlideShow
-	 *
-	 * @param ss the HSLFSlideShow to extract text from
-	 */
-	public PowerPointExtractor(HSLFSlideShowImpl ss) {
-		super(ss);
-		_hslfshow = ss;
-		_show = new HSLFSlideShow(_hslfshow);
-		_slides = _show.getSlides();
-	}
-
-	/**
-	 * Should a call to getText() return slide text? Default is yes
-	 */
-	public void setSlidesByDefault(boolean slidesByDefault) {
-		this._slidesByDefault = slidesByDefault;
-	}
-
-	/**
-	 * Should a call to getText() return notes text? Default is no
-	 */
-	public void setNotesByDefault(boolean notesByDefault) {
-		this._notesByDefault = notesByDefault;
-	}
-
-	/**
-	 * Should a call to getText() return comments text? Default is no
-	 */
-	public void setCommentsByDefault(boolean commentsByDefault) {
-		this._commentsByDefault = commentsByDefault;
-	}
-
-    /**
-     * Should a call to getText() return text from master? Default is no
-     */
-    public void setMasterByDefault(boolean masterByDefault) {
-        this._masterByDefault = masterByDefault;
-    }
-
-	/**
-	 * Fetches all the slide text from the slideshow, but not the notes, unless
-	 * you've called setSlidesByDefault() and setNotesByDefault() to change this
-	 */
-	public String getText() {
-		return getText(_slidesByDefault, _notesByDefault, _commentsByDefault, _masterByDefault);
-	}
-
-	/**
-	 * Fetches all the notes text from the slideshow, but not the slide text
-	 */
-	public String getNotes() {
-		return getText(false, true);
-	}
-
-	public List<OLEShape> getOLEShapes() {
-		List<OLEShape> list = new ArrayList<OLEShape>();
-
-		for (HSLFSlide slide : _slides) {
-			for (HSLFShape shape : slide.getShapes()) {
-				if (shape instanceof OLEShape) {
-					list.add((OLEShape) shape);
-				}
-			}
-		}
-
-		return list;
-	}
-
-	/**
-	 * Fetches text from the slideshow, be it slide text or note text. Because
-	 * the final block of text in a TextRun normally have their last \n
-	 * stripped, we add it back
-	 *
-	 * @param getSlideText fetch slide text
-	 * @param getNoteText fetch note text
-	 */
-	public String getText(boolean getSlideText, boolean getNoteText) {
-		return getText(getSlideText, getNoteText, _commentsByDefault, _masterByDefault);
-	}
-
-	public String getText(boolean getSlideText, boolean getNoteText, boolean getCommentText, boolean getMasterText) {
-		StringBuffer ret = new StringBuffer();
-
-		if (getSlideText) {
-            if (getMasterText) {
-                for (HSLFSlideMaster master : _show.getSlideMasters()) {
-                    for(HSLFShape sh : master.getShapes()){
-                        if(sh instanceof HSLFTextShape){
-                            HSLFTextShape hsh = (HSLFTextShape)sh;
-                            final String text = hsh.getText();
-                            if (text == null || "".equals(text) || "*".equals(text)) {
-                                continue;
-                            }
-                            
-                            if (HSLFMasterSheet.isPlaceholder(sh)) {
-                                // check for metro shape of complex placeholder
-                                boolean isMetro = new HSLFMetroShape<HSLFShape>(sh).hasMetroBlob();
-                                
-                                if (!isMetro) {
-                                    // don't bother about boiler plate text on master sheets
-                                    LOG.log(POILogger.INFO, "Ignoring boiler plate (placeholder) text on slide master:", text);
-                                    continue;
-                                }
-                            }
-                            
-                            ret.append(text);
-                            if (!text.endsWith("\n")) {
-                                ret.append("\n");
-                            }
-                        }
-                    }
-                }
-            }
-
-            for (HSLFSlide slide : _slides) {
-                String headerText = "";
-                String footerText = "";
-                HeadersFooters hf = slide.getHeadersFooters();
-                if (hf != null) {
-                    if (hf.isHeaderVisible()) {
-                        headerText = safeLine(hf.getHeaderText());
-                    }
-                    if (hf.isFooterVisible()) {
-                        footerText = safeLine(hf.getFooterText());
-                    }
-                }
-                
-                // Slide header, if set
-                ret.append(headerText);
-
-                // Slide text
-                textRunsToText(ret, slide.getTextParagraphs());
-
-                // Table text
-                for (HSLFShape shape : slide.getShapes()){
-                    if (shape instanceof HSLFTable){
-                        extractTableText(ret, (HSLFTable)shape);
-                    }
-                }
-                // Slide footer, if set
-                ret.append(footerText);
-
-				// Comments, if requested and present
-				if (getCommentText) {
-					for (Comment comment : slide.getComments()) {
-						ret.append(comment.getAuthor() + " - " + comment.getText() + "\n");
-					}
-				}
-			}
-			if (getNoteText) {
-				ret.append('\n');
-			}
-		}
-
-		if (getNoteText) {
-			// Not currently using _notes, as that can have the notes of
-			// master sheets in. Grab Slide list, then work from there,
-			// but ensure no duplicates
-			Set<Integer> seenNotes = new HashSet<Integer>();
-            String headerText = "";
-            String footerText = "";
-			HeadersFooters hf = _show.getNotesHeadersFooters();
-			if (hf != null) {
-			    if (hf.isHeaderVisible()) {
-			        headerText = safeLine(hf.getHeaderText());
-			    }
-			    if (hf.isFooterVisible()) {
-                    footerText = safeLine(hf.getFooterText());
-			    }
-			}
-			
-
-			for (HSLFSlide slide : _slides) {
-				HSLFNotes notes = slide.getNotes();
-				if (notes == null) {
-					continue;
-				}
-				Integer id = Integer.valueOf(notes._getSheetNumber());
-				if (seenNotes.contains(id)) {
-					continue;
-				}
-				seenNotes.add(id);
-
-				// Repeat the Notes header, if set
-				ret.append(headerText);
-
-				// Notes text
-				textRunsToText(ret, notes.getTextParagraphs());
-
-				// Repeat the notes footer, if set
-				ret.append(footerText);
-			}
-		}
-
-		return ret.toString();
-	}
-	
-	private static String safeLine(String text) {
-	    return (text == null) ? "" : (text+'\n');
-	}
-
-    private void extractTableText(StringBuffer ret, HSLFTable table) {
-        final int nrows = table.getNumberOfRows();
-        final int ncols = table.getNumberOfColumns();
-        for (int row = 0; row < nrows; row++){
-            for (int col = 0; col < ncols; col++){
-                HSLFTableCell cell = table.getCell(row, col);
-                //defensive null checks; don't know if they're necessary
-                if (cell != null){
-                    String txt = cell.getText();
-                    txt = (txt == null) ? "" : txt;
-                    ret.append(txt);
-                    if (col < ncols-1){
-                        ret.append('\t');
-                    }
-                }
-            }
-            ret.append('\n');
-        }
-    }
-    private void textRunsToText(StringBuffer ret, List<List<HSLFTextParagraph>> paragraphs) {
-        if (paragraphs==null) {
-            return;
-        }
-
-        for (List<HSLFTextParagraph> lp : paragraphs) {
-            ret.append(HSLFTextParagraph.getText(lp));
-            if (ret.length() > 0 && ret.charAt(ret.length()-1) != '\n') {
-                ret.append('\n');
-            }
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
deleted file mode 100644
index 1ecc49a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.extractor;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hslf.record.CString;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class will get all the text from a Powerpoint Document, including
- *  all the bits you didn't want, and in a somewhat random order, but will
- *  do it very fast.
- * The class ignores most of the hslf classes, and doesn't use
- *  HSLFSlideShow. Instead, it just does a very basic scan through the
- *  file, grabbing all the text records as it goes. It then returns the
- *  text, either as a single string, or as a vector of all the individual
- *  strings.
- * Because of how it works, it will return a lot of "crud" text that you
- *  probably didn't want! It will return text from master slides. It will
- *  return duplicate text, and some mangled text (powerpoint files often
- *  have duplicate copies of slide text in them). You don't get any idea
- *  what the text was associated with.
- * Almost everyone will want to use @see PowerPointExtractor instead. There
- *  are only a very small number of cases (eg some performance sensitive
- *  lucene indexers) that would ever want to use this!
- */
-public final class QuickButCruddyTextExtractor {
-	private NPOIFSFileSystem fs;
-	private InputStream is;
-	private byte[] pptContents;
-
-	/**
-	 * Really basic text extractor, that will also return lots of crud text.
-	 * Takes a single argument, the file to extract from
-	 */
-	public static void main(String args[]) throws IOException
-	{
-		if(args.length < 1) {
-			System.err.println("Useage:");
-			System.err.println("\tQuickButCruddyTextExtractor <file>");
-			System.exit(1);
-		}
-
-		String file = args[0];
-
-		QuickButCruddyTextExtractor ppe = new QuickButCruddyTextExtractor(file);
-		System.out.println(ppe.getTextAsString());
-		ppe.close();
-	}
-
-	/**
-	 * Creates an extractor from a given file name
-	 * @param fileName
-	 */
-	@SuppressWarnings("resource")
-    public QuickButCruddyTextExtractor(String fileName) throws IOException {
-		this(new NPOIFSFileSystem(new File(fileName)));
-	}
-
-	/**
-	 * Creates an extractor from a given input stream
-	 * @param iStream
-	 */
-    @SuppressWarnings("resource")
-	public QuickButCruddyTextExtractor(InputStream iStream) throws IOException {
-		this(new NPOIFSFileSystem(iStream));
-		is = iStream;
-	}
-
-	/**
-	 * Creates an extractor from a POIFS Filesystem
-	 * @param poifs
-	 */
-	public QuickButCruddyTextExtractor(NPOIFSFileSystem poifs) throws IOException {
-		fs = poifs;
-
-		// Find the PowerPoint bit, and get out the bytes
-		InputStream pptIs = fs.createDocumentInputStream("PowerPoint Document");
-		pptContents = IOUtils.toByteArray(pptIs);
-		pptIs.close();
-	}
-
-
-	/**
-	 * Shuts down the underlying streams
-	 */
-	public void close() throws IOException {
-		if(is != null) { is.close(); }
-		fs = null;
-	}
-
-	/**
-	 * Fetches the ALL the text of the powerpoint file, as a single string
-	 */
-	public String getTextAsString() {
-		StringBuffer ret = new StringBuffer();
-		List<String> textV = getTextAsVector();
-		for(String text : textV) {
-			ret.append(text);
-			if(! text.endsWith("\n")) {
-				ret.append('\n');
-			}
-		}
-		return ret.toString();
-	}
-
-	/**
-	 * Fetches the ALL the text of the powerpoint file, in a List of
-	 *  strings, one per text record
-	 */
-	public List<String> getTextAsVector() {
-	    List<String> textV = new ArrayList<String>();
-
-		// Set to the start of the file
-		int walkPos = 0;
-
-		// Start walking the file, looking for the records
-		while(walkPos != -1) {
-			int newPos = findTextRecords(walkPos,textV);
-			walkPos = newPos;
-		}
-
-		// Return what we find
-		return textV;
-	}
-
-	/**
-	 * For the given position, look if the record is a text record, and wind
-	 *  on after.
-	 * If it is a text record, grabs out the text. Whatever happens, returns
-	 *  the position of the next record, or -1 if no more.
-	 */
-	public int findTextRecords(int startPos, List<String> textV) {
-		// Grab the length, and the first option byte
-		// Note that the length doesn't include the 8 byte atom header
-		int len = (int)LittleEndian.getUInt(pptContents,startPos+4);
-		byte opt = pptContents[startPos];
-
-		// If it's a container, step into it and return
-		// (If it's a container, option byte 1 BINARY_AND 0x0f will be 0x0f)
-		int container = opt & 0x0f;
-		if(container == 0x0f) {
-			return (startPos+8);
-		}
-
-		// Otherwise, check the type to see if it's text
-		int type = LittleEndian.getUShort(pptContents,startPos+2);
-
-		// TextBytesAtom
-		if(type == RecordTypes.TextBytesAtom.typeID) {
-			TextBytesAtom tba = (TextBytesAtom)Record.createRecordForType(type, pptContents, startPos, len+8);
-			String text = HSLFTextParagraph.toExternalString(tba.getText(), -1);
-			textV.add(text);
-		}
-		// TextCharsAtom
-		if(type == RecordTypes.TextCharsAtom.typeID) {
-			TextCharsAtom tca = (TextCharsAtom)Record.createRecordForType(type, pptContents, startPos, len+8);
-            String text = HSLFTextParagraph.toExternalString(tca.getText(), -1);
-            textV.add(text);
-		}
-
-		// CString (doesn't go via a TextRun)
-		if(type == RecordTypes.CString.typeID) {
-			CString cs = (CString)Record.createRecordForType(type, pptContents, startPos, len+8);
-			String text = cs.getText();
-
-			// Ignore the ones we know to be rubbish
-			if(text.equals("___PPT10")) {
-			} else if(text.equals("Default Design")) {
-			} else {
-				textV.add(text);
-			}
-		}
-
-
-		// Wind on by the atom length, and check we're not at the end
-		int newPos = (startPos + 8 + len);
-		if(newPos > (pptContents.length - 8)) {
-			newPos = -1;
-		}
-		return newPos;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
deleted file mode 100644
index 3ba8f6f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherComplexProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.hslf.record.ExControl;
-import org.apache.poi.hslf.record.ExObjList;
-import org.apache.poi.hslf.record.ExObjRefAtom;
-import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFPictureShape;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSheet;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Represents an ActiveX control in a PowerPoint document.
- *
- * TODO: finish
- * @author Yegor Kozlov
- */
-public final class ActiveXShape extends HSLFPictureShape {
-    public static final int DEFAULT_ACTIVEX_THUMBNAIL = -1;
-
-    /**
-     * Create a new <code>Picture</code>
-     *
-    * @param pictureData the picture data
-     */
-    public ActiveXShape(int movieIdx, HSLFPictureData pictureData){
-        super(pictureData, null);
-        setActiveXIndex(movieIdx);
-    }
-
-    /**
-      * Create a <code>Picture</code> object
-      *
-      * @param escherRecord the <code>EscherSpContainer</code> record which holds information about
-      *        this picture in the <code>Slide</code>
-      * @param parent the parent shape of this picture
-      */
-     protected ActiveXShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    /**
-     * Create a new Placeholder and initialize internal structures
-     *
-     * @return the created <code>EscherContainerRecord</code> which holds shape data
-     */
-    protected EscherContainerRecord createSpContainer(int idx, boolean isChild) {
-        _escherContainer = super.createSpContainer(idx, isChild);
-
-        EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
-        spRecord.setFlags(EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HASSHAPETYPE | EscherSpRecord.FLAG_OLESHAPE);
-
-        setShapeType(ShapeType.HOST_CONTROL);
-        setEscherProperty(EscherProperties.BLIP__PICTUREID, idx);
-        setEscherProperty(EscherProperties.LINESTYLE__COLOR, 0x8000001);
-        setEscherProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x80008);
-        setEscherProperty(EscherProperties.SHADOWSTYLE__COLOR, 0x8000002);
-        setEscherProperty(EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, -1);
-
-        HSLFEscherClientDataRecord cldata = getClientData(true);
-        cldata.addChild(new ExObjRefAtom());
-
-        return _escherContainer;
-    }
-
-    /**
-     * Assign a control to this shape
-     *
-     * @see org.apache.poi.hslf.usermodel.HSLFSlideShow#addMovie(String, int)
-     * @param idx  the index of the movie
-     */
-    public void setActiveXIndex(int idx) {
-        ExObjRefAtom oe = getClientDataRecord(RecordTypes.ExObjRefAtom.typeID);
-        if (oe == null) {
-            throw new HSLFException("OEShapeAtom for ActiveX doesn't exist");
-        }
-        oe.setExObjIdRef(idx);
-    }
-
-    public int getControlIndex(){
-        int idx = -1;
-        ExObjRefAtom oe = getClientDataRecord(RecordTypes.ExObjRefAtom.typeID);
-        if(oe != null) idx = oe.getExObjIdRef();
-        return idx;
-    }
-
-    /**
-     * Set a property of this ActiveX control
-     * @param key
-     * @param value
-     */
-    public void setProperty(String key, String value){
-
-    }
-
-    /**
-     * Document-level container that specifies information about an ActiveX control
-     *
-     * @return container that specifies information about an ActiveX control
-     */
-    public ExControl getExControl(){
-        int idx = getControlIndex();
-        ExControl ctrl = null;
-        Document doc = getSheet().getSlideShow().getDocumentRecord();
-        ExObjList lst = (ExObjList)doc.findFirstOfType(RecordTypes.ExObjList.typeID);
-        if(lst != null){
-            Record[] ch = lst.getChildRecords();
-            for (int i = 0; i < ch.length; i++) {
-                if(ch[i] instanceof ExControl){
-                    ExControl c = (ExControl)ch[i];
-                    if(c.getExOleObjAtom().getObjID() == idx){
-                        ctrl = c;
-                        break;
-                    }
-                }
-            }
-        }
-        return ctrl;
-    }
-
-    protected void afterInsert(HSLFSheet sheet){
-        ExControl ctrl = getExControl();
-        ctrl.getExControlAtom().setSlideId(sheet._getSheetNumber());
-
-        String name = ctrl.getProgId() + "-" + getControlIndex() + '\u0000';
-        byte[] data = StringUtil.getToUnicodeLE(name);
-        EscherComplexProperty prop = new EscherComplexProperty(EscherProperties.GROUPSHAPE__SHAPENAME, false, data);
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        opt.addEscherProperty(prop);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Comment.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Comment.java
deleted file mode 100644
index 27afa47..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Comment.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.apache.poi.hslf.record.Comment2000;
-
-/**
- *
- * @author Nick Burch
- */
-public final class Comment {
-	private Comment2000 _comment2000;
-
-	public Comment(Comment2000 comment2000) {
-		_comment2000 = comment2000;
-	}
-
-	protected Comment2000 getComment2000() {
-		return _comment2000;
-	}
-
-	/**
-	 * Get the Author of this comment
-	 */
-	public String getAuthor() {
-		return _comment2000.getAuthor();
-	}
-	/**
-	 * Set the Author of this comment
-	 */
-	public void setAuthor(String author) {
-		_comment2000.setAuthor(author);
-	}
-
-	/**
-	 * Get the Author's Initials of this comment
-	 */
-	public String getAuthorInitials() {
-		return _comment2000.getAuthorInitials();
-	}
-	/**
-	 * Set the Author's Initials of this comment
-	 */
-	public void setAuthorInitials(String initials) {
-		_comment2000.setAuthorInitials(initials);
-	}
-
-	/**
-	 * Get the text of this comment
-	 */
-	public String getText() {
-		return _comment2000.getText();
-	}
-	/**
-	 * Set the text of this comment
-	 */
-	public void setText(String text) {
-		_comment2000.setText(text);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
deleted file mode 100644
index 894818e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import java.lang.reflect.Method;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherComplexProperty;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherTertiaryOptRecord;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Experimental class for metro blobs, i.e. an alternative escher property
- * containing an ooxml representation of the shape
- */
-@Internal
-public class HSLFMetroShape<T extends Shape<?,?>> {
-    private static final POILogger LOGGER = POILogFactory.getLogger(HSLFMetroShape.class);
-    
-    private final HSLFShape shape;
-
-    public HSLFMetroShape(HSLFShape shape) {
-        this.shape = shape;
-    }
-    
-    /**
-     * @return the bytes of the metro blob, which are bytes of an OPCPackage, i.e. a zip stream 
-     */
-    public byte[] getMetroBytes() {
-        EscherComplexProperty ep = getMetroProp();
-        return (ep == null) ? null : ep.getComplexData();
-    }
-
-    /**
-     * @return if there's a metro blob to extract
-     */
-    public boolean hasMetroBlob() {
-        return getMetroProp() != null;
-    }
-    
-    private EscherComplexProperty getMetroProp() {
-        AbstractEscherOptRecord opt = shape.getEscherChild(EscherTertiaryOptRecord.RECORD_ID);
-        return (opt == null) ? null : (EscherComplexProperty)opt.lookup(EscherProperties.GROUPSHAPE__METROBLOB);
-    }
-    
-    /**
-     * @return the metro blob shape or null if either there's no metro blob or the ooxml classes
-     * aren't in the classpath
-     */
-    @SuppressWarnings("unchecked")
-    public T getShape() {
-        byte metroBytes[] = getMetroBytes();
-        if (metroBytes == null) {
-            return null;
-        }
-        
-        // org.apache.poi.xslf.usermodel.XSLFMetroShape
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        try {
-            Class<?> ms = cl.loadClass("org.apache.poi.xslf.usermodel.XSLFMetroShape");
-            Method m = ms.getMethod("parseShape", byte[].class);
-            return (T)m.invoke(null, new Object[]{metroBytes});
-        } catch (Exception e) {
-            LOGGER.log(POILogger.ERROR, "can't process metro blob, check if all dependencies for POI OOXML are in the classpath.", e);
-            return null;
-        }
-    }
-}
-
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java
deleted file mode 100644
index 9bfa5f3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.apache.poi.hslf.record.CString;
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.hslf.record.HeadersFootersAtom;
-import org.apache.poi.hslf.record.HeadersFootersContainer;
-import org.apache.poi.hslf.record.OEPlaceholderAtom;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.SheetContainer;
-import org.apache.poi.hslf.usermodel.HSLFSheet;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextShape;
-
-/**
- * Header / Footer settings.
- *
- * You can get these on slides, or across all notes
- */
-public final class HeadersFooters {
-
-    private static final String _ppt2007tag = "___PPT12";
-
-    private final HeadersFootersContainer _container;
-    private final HSLFSheet _sheet;
-    private final boolean _ppt2007;
-
-
-    public HeadersFooters(HSLFSlideShow ppt, short headerFooterType) {
-        this(ppt.getSlideMasters().get(0), headerFooterType);
-    }
-
-    public HeadersFooters(HSLFSheet sheet, short headerFooterType) {
-        _sheet = sheet;
-        
-        @SuppressWarnings("resource")
-        HSLFSlideShow ppt = _sheet.getSlideShow();
-        Document doc = ppt.getDocumentRecord();
-        
-        // detect if this ppt was saved in Office2007
-        String tag = ppt.getSlideMasters().get(0).getProgrammableTag();
-        _ppt2007 = _ppt2007tag.equals(tag);
-
-        SheetContainer sc = _sheet.getSheetContainer();
-        HeadersFootersContainer hdd = (HeadersFootersContainer)sc.findFirstOfType(RecordTypes.HeadersFooters.typeID);
-        // boolean ppt2007 = sc.findFirstOfType(RecordTypes.RoundTripContentMasterId.typeID) != null;
-
-        if (hdd == null) {
-            for (Record ch : doc.getChildRecords()) {
-                if (ch instanceof HeadersFootersContainer
-                    && ((HeadersFootersContainer) ch).getOptions() == headerFooterType) {
-                    hdd = (HeadersFootersContainer) ch;
-                    break;
-                }
-            }
-        }
-        
-        if (hdd == null) {
-            hdd = new HeadersFootersContainer(headerFooterType);
-            Record lst = doc.findFirstOfType(RecordTypes.List.typeID);
-            doc.addChildAfter(hdd, lst);
-        }
-        _container = hdd;
-    }
-
-    /**
-     * Headers's text
-     *
-     * @return Headers's text
-     */
-    public String getHeaderText(){
-        CString cs = _container == null ? null : _container.getHeaderAtom();
-        return getPlaceholderText(OEPlaceholderAtom.MasterHeader, cs);
-    }
-
-    /**
-     * Sets headers's text
-     *
-     * @param text headers's text
-     */
-    public void setHeaderText(String text){
-        setHeaderVisible(true);
-        CString cs = _container.getHeaderAtom();
-        if (cs == null) {
-            cs = _container.addHeaderAtom();
-        }
-
-        cs.setText(text);
-    }
-
-    /**
-     * Footer's text
-     *
-     * @return Footer's text
-     */
-    public String getFooterText(){
-        CString cs = _container == null ? null : _container.getFooterAtom();
-        return getPlaceholderText(OEPlaceholderAtom.MasterFooter, cs);
-    }
-
-    /**
-     * Sets footers's text
-     *
-     * @param text footers's text
-     */
-    public void setFootersText(String text){
-        setFooterVisible(true);
-        CString cs = _container.getFooterAtom();
-        if (cs == null) {
-            cs = _container.addFooterAtom();
-        }
-
-        cs.setText(text);
-    }
-
-    /**
-     * This is the date that the user wants in the footers, instead of today's date.
-     *
-     * @return custom user date
-     */
-    public String getDateTimeText(){
-        CString cs = _container == null ? null : _container.getUserDateAtom();
-        return getPlaceholderText(OEPlaceholderAtom.MasterDate, cs);
-    }
-
-    /**
-     * Sets custom user date to be displayed instead of today's date.
-     *
-     * @param text custom user date
-     */
-    public void setDateTimeText(String text){
-        setUserDateVisible(true);
-        setDateTimeVisible(true);
-        CString cs = _container.getUserDateAtom();
-        if (cs == null) {
-            cs = _container.addUserDateAtom();
-        }
-
-        cs.setText(text);
-    }
-
-    /**
-     * whether the footer text is displayed.
-     */
-    public boolean isFooterVisible(){
-        return isVisible(HeadersFootersAtom.fHasFooter, OEPlaceholderAtom.MasterFooter);
-    }
-
-    /**
-     * whether the footer text is displayed.
-     */
-    public void setFooterVisible(boolean flag){
-        setFlag(HeadersFootersAtom.fHasFooter, flag);
-    }
-
-    /**
-     * whether the header text is displayed.
-     */
-    public boolean isHeaderVisible(){
-        return isVisible(HeadersFootersAtom.fHasHeader, OEPlaceholderAtom.MasterHeader);
-    }
-
-    /**
-     * whether the header text is displayed.
-     */
-    public void setHeaderVisible(boolean flag){
-        setFlag(HeadersFootersAtom.fHasHeader, flag);
-    }
-
-    /**
-     * whether the date is displayed in the footer.
-     */
-    public boolean isDateTimeVisible(){
-        return isVisible(HeadersFootersAtom.fHasDate, OEPlaceholderAtom.MasterDate);
-    }
-
-    /**
-     * whether the date is displayed in the footer.
-     */
-    public void setDateTimeVisible(boolean flag){
-        setFlag(HeadersFootersAtom.fHasDate, flag);
-    }
-
-    /**
-     * whether the custom user date is used instead of today's date.
-     */
-    public boolean isUserDateVisible(){
-        return isVisible(HeadersFootersAtom.fHasUserDate, OEPlaceholderAtom.MasterDate);
-    }
-
-    /**
-     * whether the date is displayed in the footer.
-     */
-    public void setUserDateVisible(boolean flag){
-        setFlag(HeadersFootersAtom.fHasUserDate, flag);
-    }
-
-    /**
-     * whether the slide number is displayed in the footer.
-     */
-    public boolean isSlideNumberVisible(){
-        return isVisible(HeadersFootersAtom.fHasSlideNumber, OEPlaceholderAtom.MasterSlideNumber);
-    }
-
-    /**
-     * whether the slide number is displayed in the footer.
-     */
-    public void setSlideNumberVisible(boolean flag){
-        setFlag(HeadersFootersAtom.fHasSlideNumber, flag);
-    }
-
-    /**
-     *  An integer that specifies the format ID to be used to style the datetime.
-     *
-     * @return an integer that specifies the format ID to be used to style the datetime.
-     */
-    public int getDateTimeFormat(){
-        return _container.getHeadersFootersAtom().getFormatId();
-    }
-
-    /**
-     *  An integer that specifies the format ID to be used to style the datetime.
-     *
-     * @param formatId an integer that specifies the format ID to be used to style the datetime.
-     */
-    public void setDateTimeFormat(int formatId){
-        _container.getHeadersFootersAtom().setFormatId(formatId);
-    }
-
-    private boolean isVisible(int flag, int placeholderId){
-        boolean visible;
-        if(_ppt2007){
-            HSLFTextShape placeholder = _sheet.getPlaceholder(placeholderId);
-            visible = placeholder != null && placeholder.getText() != null;
-        } else {
-            visible = _container.getHeadersFootersAtom().getFlag(flag);
-        }
-        return visible;
-    }
-
-    private String getPlaceholderText(int placeholderId, CString cs){
-        String text = null;
-        if (_ppt2007) {
-            HSLFTextShape placeholder = _sheet.getPlaceholder(placeholderId);
-            if (placeholder != null) {
-                text = placeholder.getText();
-            }
-
-            // default text in master placeholders is not visible
-            if("*".equals(text)) {
-                text = null;
-            }
-        } else {
-            text = cs == null ? null : cs.getText();
-        }
-        return text;
-    }
-
-    private void setFlag(int type, boolean flag) {
-        _container.getHeadersFootersAtom().setFlag(type, flag);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java
deleted file mode 100644
index 5650b2b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.hslf.record.AnimationInfo;
-import org.apache.poi.hslf.record.AnimationInfoAtom;
-import org.apache.poi.hslf.record.ExMCIMovie;
-import org.apache.poi.hslf.record.ExObjList;
-import org.apache.poi.hslf.record.ExObjRefAtom;
-import org.apache.poi.hslf.record.ExVideoContainer;
-import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
-import org.apache.poi.hslf.record.InteractiveInfo;
-import org.apache.poi.hslf.record.InteractiveInfoAtom;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFPictureShape;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-
-/**
- * Represents a movie in a PowerPoint document.
- *
- * @author Yegor Kozlov
- */
-public final class MovieShape extends HSLFPictureShape {
-    public static final int DEFAULT_MOVIE_THUMBNAIL = -1;
-
-    public static final int MOVIE_MPEG = 1;
-    public static final int MOVIE_AVI  = 2;
-
-    /**
-     * Create a new <code>Picture</code>
-     *
-    * @param pictureData the picture data
-     */
-    public MovieShape(int movieIdx, HSLFPictureData pictureData){
-        super(pictureData, null);
-        setMovieIndex(movieIdx);
-        setAutoPlay(true);
-    }
-
-    /**
-     * Create a new <code>Picture</code>
-     *
-     * @param pictureData the picture data
-     * @param parent the parent shape
-     */
-    public MovieShape(int movieIdx, HSLFPictureData pictureData, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        super(pictureData, parent);
-        setMovieIndex(movieIdx);
-    }
-
-    /**
-      * Create a <code>Picture</code> object
-      *
-      * @param escherRecord the <code>EscherSpContainer</code> record which holds information about
-      *        this picture in the <code>Slide</code>
-      * @param parent the parent shape of this picture
-      */
-    public MovieShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    /**
-     * Create a new Placeholder and initialize internal structures
-     *
-     * @return the created <code>EscherContainerRecord</code> which holds shape data
-     */
-    protected EscherContainerRecord createSpContainer(int idx, boolean isChild) {
-        _escherContainer = super.createSpContainer(idx, isChild);
-
-        setEscherProperty(EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, 0x1000100);
-        setEscherProperty(EscherProperties.FILL__NOFILLHITTEST, 0x10001);
-
-        ExObjRefAtom oe = new ExObjRefAtom();
-        InteractiveInfo info = new InteractiveInfo();
-        InteractiveInfoAtom infoAtom = info.getInteractiveInfoAtom();
-        infoAtom.setAction(InteractiveInfoAtom.ACTION_MEDIA);
-        infoAtom.setHyperlinkType(InteractiveInfoAtom.LINK_NULL);
-
-        AnimationInfo an = new AnimationInfo();
-        AnimationInfoAtom anAtom = an.getAnimationInfoAtom();
-        anAtom.setFlag(AnimationInfoAtom.Automatic, true);
-
-        HSLFEscherClientDataRecord cldata = getClientData(true);
-        cldata.addChild(oe);
-        cldata.addChild(an);
-        cldata.addChild(info);
-
-        return _escherContainer;
-    }
-
-    /**
-     * Assign a movie to this shape
-     *
-     * @see org.apache.poi.hslf.usermodel.HSLFSlideShow#addMovie(String, int)
-     * @param idx  the index of the movie
-     */
-    public void setMovieIndex(int idx){
-        ExObjRefAtom oe = getClientDataRecord(RecordTypes.ExObjRefAtom.typeID);
-        oe.setExObjIdRef(idx);
-
-        AnimationInfo an = getClientDataRecord(RecordTypes.AnimationInfo.typeID);
-        if(an != null) {
-            AnimationInfoAtom ai = an.getAnimationInfoAtom();
-            ai.setDimColor(0x07000000);
-            ai.setFlag(AnimationInfoAtom.Automatic, true);
-            ai.setFlag(AnimationInfoAtom.Play, true);
-            ai.setFlag(AnimationInfoAtom.Synchronous, true);
-            ai.setOrderID(idx + 1);
-        }
-    }
-
-    public void setAutoPlay(boolean flag){
-        AnimationInfo an = getClientDataRecord(RecordTypes.AnimationInfo.typeID);
-        if(an != null){
-            an.getAnimationInfoAtom().setFlag(AnimationInfoAtom.Automatic, flag);
-        }
-    }
-
-    public boolean  isAutoPlay(){
-        AnimationInfo an = getClientDataRecord(RecordTypes.AnimationInfo.typeID);
-        if(an != null){
-            return an.getAnimationInfoAtom().getFlag(AnimationInfoAtom.Automatic);
-        }
-        return false;
-    }
-
-    /**
-     * @return UNC or local path to a video file
-     */
-    @SuppressWarnings("resource")
-    public String getPath(){
-        ExObjRefAtom oe = getClientDataRecord(RecordTypes.ExObjRefAtom.typeID);
-        int idx = oe.getExObjIdRef();
-
-        HSLFSlideShow ppt = getSheet().getSlideShow();
-        ExObjList lst = (ExObjList)ppt.getDocumentRecord().findFirstOfType(RecordTypes.ExObjList.typeID);
-        if(lst == null) {
-            return null;
-        }
-
-        Record[]  r = lst.getChildRecords();
-        for (int i = 0; i < r.length; i++) {
-            if(r[i] instanceof ExMCIMovie){
-                ExMCIMovie mci = (ExMCIMovie)r[i];
-                ExVideoContainer exVideo = mci.getExVideo();
-                int objectId = exVideo.getExMediaAtom().getObjectId();
-                if(objectId == idx){
-                    return exVideo.getPathAtom().getText();
-                }
-            }
-
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
deleted file mode 100644
index 3278026..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hslf.record.ExEmbed;
-import org.apache.poi.hslf.record.ExObjList;
-import org.apache.poi.hslf.record.ExObjRefAtom;
-import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.usermodel.HSLFObjectData;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFPictureShape;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.util.POILogger;
-
-
-/**
- * A shape representing embedded OLE obejct.
- *
- * @author Yegor Kozlov
- */
-public final class OLEShape extends HSLFPictureShape {
-    protected ExEmbed _exEmbed;
-
-    /**
-     * Create a new <code>OLEShape</code>
-     *
-    * @param data the picture data
-     */
-    public OLEShape(HSLFPictureData data){
-        super(data);
-    }
-
-    /**
-     * Create a new <code>OLEShape</code>
-     *
-     * @param data the picture data
-     * @param parent the parent shape
-     */
-    public OLEShape(HSLFPictureData data, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        super(data, parent);
-    }
-
-    /**
-      * Create a <code>OLEShape</code> object
-      *
-      * @param escherRecord the <code>EscherSpContainer</code> record which holds information about
-      *        this picture in the <code>Slide</code>
-      * @param parent the parent shape of this picture
-      */
-    public OLEShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    /**
-     * Returns unique identifier for the OLE object.
-     *
-     * @return the unique identifier for the OLE object
-     */
-    public int getObjectID(){
-        return getEscherProperty(EscherProperties.BLIP__PICTUREID);
-    }
-
-    /**
-     * Set the unique identifier for the OLE object and
-     * register it in the necessary structures
-     * 
-     * @param objectId the unique identifier for the OLE object
-     */
-    public void setObjectID(int objectId){
-    	setEscherProperty(EscherProperties.BLIP__PICTUREID, objectId);
-    	
-    	EscherContainerRecord ecr = getSpContainer();
-    	EscherSpRecord spRecord = ecr.getChildById(EscherSpRecord.RECORD_ID);
-        spRecord.setFlags(spRecord.getFlags()|EscherSpRecord.FLAG_OLESHAPE);
-
-        HSLFEscherClientDataRecord cldata = getClientData(true);
-        ExObjRefAtom uer = null;
-        for (Record r : cldata.getHSLFChildRecords()) {
-            if (r.getRecordType() == RecordTypes.ExObjRefAtom.typeID) {
-                uer = (ExObjRefAtom)r;
-                break;
-            }
-        }
-        if (uer == null) {
-        	uer = new ExObjRefAtom();
-        	cldata.addChild(uer);
-        }
-        uer.setExObjIdRef(objectId);
-    }
-    
-    
-    /**
-     * Returns unique identifier for the OLE object.
-     *
-     * @return the unique identifier for the OLE object
-     */
-    @SuppressWarnings("resource")
-    public HSLFObjectData getObjectData(){
-        HSLFSlideShow ppt = getSheet().getSlideShow();
-        HSLFObjectData[] ole = ppt.getEmbeddedObjects();
-
-        //persist reference
-        ExEmbed exEmbed = getExEmbed();
-        HSLFObjectData data = null;
-        if(exEmbed != null) {
-            int ref = exEmbed.getExOleObjAtom().getObjStgDataRef();
-
-            for (int i = 0; i < ole.length; i++) {
-                if(ole[i].getExOleObjStg().getPersistId() == ref) {
-                    data=ole[i];
-                }
-            }
-        }
-        if (data==null) {
-            logger.log(POILogger.WARN, "OLE data not found");
-        }
-
-        return data;
-    }
-
-    /**
-     * Return the record container for this embedded object.
-     *
-     * <p>
-     * It contains:
-     * 1. ExEmbedAtom.(4045)
-     * 2. ExOleObjAtom (4035)
-     * 3. CString (4026), Instance MenuName (1) used for menus and the Links dialog box.
-     * 4. CString (4026), Instance ProgID (2) that stores the OLE Programmatic Identifier.
-     *     A ProgID is a string that uniquely identifies a given object.
-     * 5. CString (4026), Instance ClipboardName (3) that appears in the paste special dialog.
-     * 6. MetaFile( 4033), optional
-     * </p>
-     */
-    @SuppressWarnings("resource")
-    public ExEmbed getExEmbed(){
-        if(_exEmbed == null){
-            HSLFSlideShow ppt = getSheet().getSlideShow();
-
-            ExObjList lst = ppt.getDocumentRecord().getExObjList(false);
-            if(lst == null){
-                logger.log(POILogger.WARN, "ExObjList not found");
-                return null;
-            }
-
-            int id = getObjectID();
-            Record[] ch = lst.getChildRecords();
-            for (int i = 0; i < ch.length; i++) {
-                if(ch[i] instanceof ExEmbed){
-                    ExEmbed embd = (ExEmbed)ch[i];
-                    if( embd.getExOleObjAtom().getObjID() == id) _exEmbed = embd;
-                }
-            }
-        }
-        return _exEmbed;
-    }
-
-    /**
-     * Returns the instance name of the embedded object, e.g. "Document" or "Workbook".
-     *
-     * @return the instance name of the embedded object
-     */
-    public String getInstanceName(){
-        return getExEmbed().getMenuName();
-    }
-
-    /**
-     * Returns the full name of the embedded object,
-     *  e.g. "Microsoft Word Document" or "Microsoft Office Excel Worksheet".
-     *
-     * @return the full name of the embedded object
-     */
-    public String getFullName(){
-        return getExEmbed().getClipboardName();
-    }
-
-    /**
-     * Returns the ProgID that stores the OLE Programmatic Identifier.
-     * A ProgID is a string that uniquely identifies a given object, for example,
-     * "Word.Document.8" or "Excel.Sheet.8".
-     *
-     * @return the ProgID
-     */
-    public String getProgID(){
-        return getExEmbed().getProgId();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPFont.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPFont.java
deleted file mode 100644
index e6f7a9d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPFont.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.apache.poi.hslf.record.FontEntityAtom;
-
-/**
- * Represents a Font used in a presenation.
- * <p>
- * In PowerPoint Font is a shared resource and can be shared among text object in the presentation.
- * </p>
- * Some commonly used fonts are predefined in static constants.
- *
- * @author Yegor Kozlov
- */
-public final class PPFont {
-    /**
-     * ANSI character set
-     */
-    public final static byte ANSI_CHARSET = 0;
-
-    /**
-     * Default character set.
-     */
-    public final static byte DEFAULT_CHARSET = 1;
-
-    /**
-     * Symbol character set
-     */
-    public final static byte SYMBOL_CHARSET = 2;
-
-
-    /**
-     * Constants for the pitch and family of the font.
-     * The two low-order bits specify the pitch of the font and can be one of the following values
-     */
-    public final static byte DEFAULT_PITCH  = 0;
-    public final static byte FIXED_PITCH    = 1;
-    public final static byte VARIABLE_PITCH = 2;
-
-    /**
-     * Don't care or don't know.
-     */
-    public final static byte FF_DONTCARE    = 0;
-    /**
-     * Fonts with variable stroke width (proportional) and with serifs. Times New Roman is an example.
-     */
-    public final static byte FF_ROMAN       = 16;
-    /**
-     * Fonts with variable stroke width (proportional) and without serifs. Arial is an example.
-     */
-    public final static byte FF_SWISS       = 32;
-    /**
-     * Fonts designed to look like handwriting. Script and Cursive are examples.
-     */
-    public final static byte FF_SCRIPT      = 64;
-    /**
-     * Fonts with constant stroke width (monospace), with or without serifs.
-     * Monospace fonts are usually modern. CourierNew is an example
-     */
-    public final static byte FF_MODERN      = 48;
-    /**
-     * Novelty fonts. Old English is an example
-     */
-    public final static byte FF_DECORATIVE  = 80;
-
-
-    protected int charset;
-    protected int type;
-    protected int flags;
-    protected int pitch;
-    protected String name;
-
-    /**
-     * Creates a new instance of PPFont
-     */
-    public PPFont(){
-
-    }
-
-    /**
-     * Creates a new instance of PPFont and initialize it from the supplied font atom
-     */
-    public PPFont(FontEntityAtom fontAtom){
-        name = fontAtom.getFontName();
-        charset = fontAtom.getCharSet();
-        type = fontAtom.getFontType();
-        flags = fontAtom.getFontFlags();
-        pitch = fontAtom.getPitchAndFamily();
-    }
-
-    /**
-     * set the name for the font (i.e. Arial)
-     *
-     * @param val  String representing the name of the font to use
-     */
-     public void setFontName(String val){
-        name = val;
-    }
-
-    /**
-     * get the name for the font (i.e. Arial)
-     *
-     * @return String representing the name of the font to use
-     */
-    public String getFontName(){
-        return name;
-    }
-
-    /**
-     * set the character set
-     *
-     * @param val - characterset
-     */
-    public void setCharSet(int val){
-        charset = val;
-    }
-
-    /**
-     * get the character set
-     *
-     * @return charset - characterset
-     */
-    public int getCharSet(){
-        return charset;
-    }
-
-    /**
-     * set the font flags
-     * Bit 1: If set, font is subsetted
-     *
-     * @param val - the font flags
-     */
-    public void setFontFlags(int val){
-        flags = val;
-    }
-
-    /**
-     * get the character set
-     * Bit 1: If set, font is subsetted
-     *
-     * @return the font flags
-     */
-    public int getFontFlags(){
-        return flags;
-    }
-
-    /**
-     * set the font type
-     * <p>
-     * Bit 1: Raster Font
-     * Bit 2: Device Font
-     * Bit 3: TrueType Font
-     * </p>
-     *
-     * @param val - the font type
-     */
-    public void setFontType(int val){
-        type = val;
-    }
-
-    /**
-     * get the font type
-     * <p>
-     * Bit 1: Raster Font
-     * Bit 2: Device Font
-     * Bit 3: TrueType Font
-     * </p>
-     *
-     * @return the font type
-     */
-    public int getFontType(){
-        return type;
-    }
-
-    /**
-     * set lfPitchAndFamily
-     *
-     *
-     * @param val - Corresponds to the lfPitchAndFamily field of the Win32 API LOGFONT structure
-     */
-    public void setPitchAndFamily(int val){
-        pitch = val;
-    }
-
-    /**
-     * get lfPitchAndFamily
-     *
-     * @return corresponds to the lfPitchAndFamily field of the Win32 API LOGFONT structure
-     */
-    public int getPitchAndFamily(){
-        return pitch;
-    }
-
-    public static final PPFont ARIAL;
-    public static final PPFont TIMES_NEW_ROMAN ;
-    public static final PPFont COURIER_NEW;
-    public static final PPFont WINGDINGS;
-    static {
-        ARIAL = new PPFont();
-        ARIAL.setFontName("Arial");
-        ARIAL.setCharSet(ANSI_CHARSET);
-        ARIAL.setFontType(4);
-        ARIAL.setFontFlags(0);
-        ARIAL.setPitchAndFamily(VARIABLE_PITCH | FF_SWISS);
-
-        TIMES_NEW_ROMAN = new PPFont();
-        TIMES_NEW_ROMAN.setFontName("Times New Roman");
-        TIMES_NEW_ROMAN.setCharSet(ANSI_CHARSET);
-        TIMES_NEW_ROMAN.setFontType(4);
-        TIMES_NEW_ROMAN.setFontFlags(0);
-        TIMES_NEW_ROMAN.setPitchAndFamily(VARIABLE_PITCH | FF_ROMAN);
-
-        COURIER_NEW = new PPFont();
-        COURIER_NEW.setFontName("Courier New");
-        COURIER_NEW.setCharSet(ANSI_CHARSET);
-        COURIER_NEW.setFontType(4);
-        COURIER_NEW.setFontFlags(0);
-        COURIER_NEW.setPitchAndFamily(FIXED_PITCH | FF_MODERN);
-
-        WINGDINGS = new PPFont();
-        WINGDINGS.setFontName("Wingdings");
-        WINGDINGS.setCharSet(SYMBOL_CHARSET);
-        WINGDINGS.setFontType(4);
-        WINGDINGS.setFontFlags(0);
-        WINGDINGS.setPitchAndFamily(VARIABLE_PITCH | FF_DONTCARE);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
deleted file mode 100644
index 7404767..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
+++ /dev/null
@@ -1,1856 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Paint;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.Toolkit;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.RoundRectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.text.AttributedCharacterIterator;
-import java.util.Map;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.usermodel.HSLFFreeformShape;
-import org.apache.poi.hslf.usermodel.HSLFGroupShape;
-import org.apache.poi.hslf.usermodel.HSLFSimpleShape;
-import org.apache.poi.hslf.usermodel.HSLFTextBox;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.util.NotImplemented;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.SuppressForbidden;
-
-/**
- * Translates Graphics2D calls into PowerPoint.
- *
- * @author Yegor Kozlov
- */
-public final class PPGraphics2D extends Graphics2D implements Cloneable {
-
-    protected POILogger log = POILogFactory.getLogger(this.getClass());
-
-    //The ppt object to write into.
-    private HSLFGroupShape _group;
-
-    private AffineTransform _transform;
-    private Stroke _stroke;
-    private Paint _paint;
-    private Font _font;
-    private Color _foreground;
-    private Color _background;
-    private RenderingHints _hints;
-
-    /**
-     * Construct Java Graphics object which translates graphic calls in ppt drawing layer.
-     *
-     * @param group           The shape group to write the graphics calls into.
-     */
-    public PPGraphics2D(HSLFGroupShape group){
-        this._group = group;
-
-        _transform = new AffineTransform();
-        _stroke = new BasicStroke();
-        _paint = Color.black;
-        _font = new Font("Arial", Font.PLAIN, 12);
-        _background = Color.black;
-        _foreground = Color.white;
-        _hints = new RenderingHints(null);
-    }
-
-    /**
-     * @return  the shape group being used for drawing
-     */
-    public HSLFGroupShape getShapeGroup(){
-        return _group;
-    }
-
-    /**
-     * Gets the current font.
-     * @return    this graphics context's current font.
-     * @see       java.awt.Font
-     * @see       java.awt.Graphics#setFont(Font)
-     */
-    public Font getFont(){
-        return _font;
-    }
-
-    /**
-     * Sets this graphics context's font to the specified font.
-     * All subsequent text operations using this graphics context
-     * use this font.
-     * @param  font   the font.
-     * @see     java.awt.Graphics#getFont
-     * @see     java.awt.Graphics#drawString(java.lang.String, int, int)
-     * @see     java.awt.Graphics#drawBytes(byte[], int, int, int, int)
-     * @see     java.awt.Graphics#drawChars(char[], int, int, int, int)
-    */
-    public void setFont(Font font){
-        this._font = font;
-    }
-
-    /**
-     * Gets this graphics context's current color.
-     * @return    this graphics context's current color.
-     * @see       java.awt.Color
-     * @see       java.awt.Graphics#setColor
-     */
-    public Color getColor(){
-        return _foreground;
-    }
-
-    /**
-     * Sets this graphics context's current color to the specified
-     * color. All subsequent graphics operations using this graphics
-     * context use this specified color.
-     * @param     c   the new rendering color.
-     * @see       java.awt.Color
-     * @see       java.awt.Graphics#getColor
-     */
-    public void setColor(Color c) {
-        setPaint(c);
-    }
-
-    /**
-     * Returns the current <code>Stroke</code> in the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>Graphics2D</code> <code>Stroke</code>,
-     *                 which defines the line style.
-     * @see #setStroke
-     */
-    public Stroke getStroke(){
-        return _stroke;
-    }
-
-    /**
-     * Sets the <code>Stroke</code> for the <code>Graphics2D</code> context.
-     * @param s the <code>Stroke</code> object to be used to stroke a
-     * <code>Shape</code> during the rendering process
-     */
-    public void setStroke(Stroke s){
-        this._stroke = s;
-    }
-
-    /**
-     * Returns the current <code>Paint</code> of the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>Graphics2D</code> <code>Paint</code>,
-     * which defines a color or pattern.
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     */
-    public Paint getPaint(){
-        return _paint;
-    }
-
-    /**
-     * Sets the <code>Paint</code> attribute for the
-     * <code>Graphics2D</code> context.  Calling this method
-     * with a <code>null</code> <code>Paint</code> object does
-     * not have any effect on the current <code>Paint</code> attribute
-     * of this <code>Graphics2D</code>.
-     * @param paint the <code>Paint</code> object to be used to generate
-     * color during the rendering process, or <code>null</code>
-     * @see java.awt.Graphics#setColor
-     */
-    public void setPaint(Paint paint){
-        if(paint == null) return;
-
-        this._paint = paint;
-        if (paint instanceof Color) _foreground = (Color)paint;
-    }
-
-    /**
-     * Returns a copy of the current <code>Transform</code> in the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>AffineTransform</code> in the
-     *             <code>Graphics2D</code> context.
-     * @see #_transform
-     * @see #setTransform
-     */
-    public AffineTransform getTransform(){
-        return new AffineTransform(_transform);
-    }
-
-    /**
-     * Sets the <code>Transform</code> in the <code>Graphics2D</code>
-     * context.
-     * @param Tx the <code>AffineTransform</code> object to be used in the
-     * rendering process
-     * @see #_transform
-     * @see AffineTransform
-     */
-    public void setTransform(AffineTransform Tx) {
-        _transform = new AffineTransform(Tx);
-    }
-
-    /**
-     * Strokes the outline of a <code>Shape</code> using the settings of the
-     * current <code>Graphics2D</code> context.  The rendering attributes
-     * applied include the <code>Clip</code>, <code>Transform</code>,
-     * <code>Paint</code>, <code>Composite</code> and
-     * <code>Stroke</code> attributes.
-     * @param shape the <code>Shape</code> to be rendered
-     * @see #setStroke
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #_transform
-     * @see #setTransform
-     * @see #clip
-     * @see #setClip
-     * @see #setComposite
-     */
-    public void draw(Shape shape){
-        Path2D.Double path = new Path2D.Double(_transform.createTransformedShape(shape));
-        HSLFFreeformShape p = new HSLFFreeformShape(_group);
-        p.setPath(path);
-        p.getFill().setForegroundColor(null);
-        applyStroke(p);
-        if (_paint instanceof Color) {
-            p.setLineColor((Color)_paint);
-        }
-        _group.addShape(p);
-    }
-
-    /**
-     * Renders the text specified by the specified <code>String</code>,
-     * using the current text attribute state in the <code>Graphics2D</code> context.
-     * The baseline of the first character is at position
-     * (<i>x</i>,&nbsp;<i>y</i>) in the User Space.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, <code>Paint</code>, <code>Font</code> and
-     * <code>Composite</code> attributes. For characters in script systems
-     * such as Hebrew and Arabic, the glyphs can be rendered from right to
-     * left, in which case the coordinate supplied is the location of the
-     * leftmost character on the baseline.
-     * @param s the <code>String</code> to be rendered
-     * @param x the x coordinate of the location where the
-     * <code>String</code> should be rendered
-     * @param y the y coordinate of the location where the
-     * <code>String</code> should be rendered
-     * @throws NullPointerException if <code>str</code> is
-     *         <code>null</code>
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see java.awt.Graphics#setFont
-     * @see #setTransform
-     * @see #setComposite
-     * @see #setClip
-     */
-    public void drawString(String s, float x, float y) {
-        HSLFTextBox txt = new HSLFTextBox(_group);
-        txt.setSheet(_group.getSheet());
-        txt.setText(s);
-
-        HSLFTextRun rt = txt.getTextParagraphs().get(0).getTextRuns().get(0);
-        rt.setFontSize((double)_font.getSize());
-        rt.setFontFamily(_font.getFamily());
-
-        if (getColor() != null) rt.setFontColor(DrawPaint.createSolidPaint(getColor()));
-        if (_font.isBold()) rt.setBold(true);
-        if (_font.isItalic()) rt.setItalic(true);
-
-        txt.setBottomInset(0);
-        txt.setTopInset(0);
-        txt.setLeftInset(0);
-        txt.setRightInset(0);
-        txt.setWordWrap(false);
-        txt.setHorizontalCentered(false);
-        txt.setVerticalAlignment(VerticalAlignment.MIDDLE);
-
-
-        TextLayout layout = new TextLayout(s, _font, getFontRenderContext());
-        float ascent = layout.getAscent();
-
-        float width = (float) Math.floor(layout.getAdvance());
-        /**
-         * Even if top and bottom margins are set to 0 PowerPoint
-         * always sets extra space between the text and its bounding box.
-         *
-         * The approximation height = ascent*2 works good enough in most cases
-         */
-        float height = ascent * 2;
-
-        /*
-          In powerpoint anchor of a shape is its top left corner.
-          Java graphics sets string coordinates by the baseline of the first character
-          so we need to shift up by the height of the textbox
-        */
-        y -= height / 2 + ascent / 2;
-
-        /*
-          In powerpoint anchor of a shape is its top left corner.
-          Java graphics sets string coordinates by the baseline of the first character
-          so we need to shift down by the height of the textbox
-        */
-        txt.setAnchor(new Rectangle((int)x, (int)y, (int)width, (int)height));
-
-        _group.addShape(txt);
-    }
-
-    /**
-     * Fills the interior of a <code>Shape</code> using the settings of the
-     * <code>Graphics2D</code> context. The rendering attributes applied
-     * include the <code>Clip</code>, <code>Transform</code>,
-     * <code>Paint</code>, and <code>Composite</code>.
-     * @param shape the <code>Shape</code> to be filled
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip
-     */
-    public void fill(Shape shape){
-        Path2D.Double path = new Path2D.Double(_transform.createTransformedShape(shape));
-        HSLFFreeformShape p = new HSLFFreeformShape(_group);
-        p.setPath(path);
-        applyPaint(p);
-        p.setLineColor(null);   //Fills must be "No Line"
-        _group.addShape(p);
-    }
-
-    /**
-     * Translates the origin of the graphics context to the point
-     * (<i>x</i>,&nbsp;<i>y</i>) in the current coordinate system.
-     * Modifies this graphics context so that its new origin corresponds
-     * to the point (<i>x</i>,&nbsp;<i>y</i>) in this graphics context's
-     * original coordinate system.  All coordinates used in subsequent
-     * rendering operations on this graphics context will be relative
-     * to this new origin.
-     * @param  x   the <i>x</i> coordinate.
-     * @param  y   the <i>y</i> coordinate.
-     */
-    public void translate(int x, int y){
-        _transform.translate(x, y);
-    }
-
-    /**
-     * Intersects the current <code>Clip</code> with the interior of the
-     * specified <code>Shape</code> and sets the <code>Clip</code> to the
-     * resulting intersection.  The specified <code>Shape</code> is
-     * transformed with the current <code>Graphics2D</code>
-     * <code>Transform</code> before being intersected with the current
-     * <code>Clip</code>.  This method is used to make the current
-     * <code>Clip</code> smaller.
-     * To make the <code>Clip</code> larger, use <code>setClip</code>.
-     * The <i>user clip</i> modified by this method is independent of the
-     * clipping associated with device bounds and visibility.  If no clip has
-     * previously been set, or if the clip has been cleared using
-     * {@link java.awt.Graphics#setClip(Shape) setClip} with a
-     * <code>null</code> argument, the specified <code>Shape</code> becomes
-     * the new user clip.
-     * @param s the <code>Shape</code> to be intersected with the current
-     *          <code>Clip</code>.  If <code>s</code> is <code>null</code>,
-     *          this method clears the current <code>Clip</code>.
-     */
-    @NotImplemented
-    public void clip(Shape s){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Gets the current clipping area.
-     * This method returns the user clip, which is independent of the
-     * clipping associated with device bounds and window visibility.
-     * If no clip has previously been set, or if the clip has been
-     * cleared using <code>setClip(null)</code>, this method returns
-     * <code>null</code>.
-     * @return      a <code>Shape</code> object representing the
-     *              current clipping area, or <code>null</code> if
-     *              no clip is set.
-     * @see         java.awt.Graphics#getClipBounds()
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(int, int, int, int)
-     * @see         java.awt.Graphics#setClip(Shape)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public Shape getClip(){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return null;
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a scaling transformation
-     * Subsequent rendering is resized according to the specified scaling
-     * factors relative to the previous scaling.
-     * This is equivalent to calling <code>transform(S)</code>, where S is an
-     * <code>AffineTransform</code> represented by the following matrix:
-     * <pre>
-     *          [   sx   0    0   ]
-     *          [   0    sy   0   ]
-     *          [   0    0    1   ]
-     * </pre>
-     * @param sx the amount by which X coordinates in subsequent
-     * rendering operations are multiplied relative to previous
-     * rendering operations.
-     * @param sy the amount by which Y coordinates in subsequent
-     * rendering operations are multiplied relative to previous
-     * rendering operations.
-     */
-    public void scale(double sx, double sy){
-        _transform.scale(sx, sy);
-    }
-
-    /**
-     * Draws an outlined round-cornered rectangle using this graphics
-     * context's current color. The left and right edges of the rectangle
-     * are at <code>x</code> and <code>x&nbsp;+&nbsp;width</code>,
-     * respectively. The top and bottom edges of the rectangle are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height</code>.
-     * @param      x the <i>x</i> coordinate of the rectangle to be drawn.
-     * @param      y the <i>y</i> coordinate of the rectangle to be drawn.
-     * @param      width the width of the rectangle to be drawn.
-     * @param      height the height of the rectangle to be drawn.
-     * @param      arcWidth the horizontal diameter of the arc
-     *                    at the four corners.
-     * @param      arcHeight the vertical diameter of the arc
-     *                    at the four corners.
-     * @see        java.awt.Graphics#fillRoundRect
-     */
-    public void drawRoundRect(int x, int y, int width, int height,
-                              int arcWidth, int arcHeight){
-        RoundRectangle2D rect = new RoundRectangle2D.Float(x, y, width, height, arcWidth, arcHeight);
-        draw(rect);
-     }
-
-    /**
-     * Draws the text given by the specified string, using this
-     * graphics context's current font and color. The baseline of the
-     * first character is at position (<i>x</i>,&nbsp;<i>y</i>) in this
-     * graphics context's coordinate system.
-     * @param       str      the string to be drawn.
-     * @param       x        the <i>x</i> coordinate.
-     * @param       y        the <i>y</i> coordinate.
-     * @see         java.awt.Graphics#drawBytes
-     * @see         java.awt.Graphics#drawChars
-     */
-    public void drawString(String str, int x, int y){
-        drawString(str, (float)x, (float)y);
-    }
-
-    /**
-     * Fills an oval bounded by the specified rectangle with the
-     * current color.
-     * @param       x the <i>x</i> coordinate of the upper left corner
-     *                     of the oval to be filled.
-     * @param       y the <i>y</i> coordinate of the upper left corner
-     *                     of the oval to be filled.
-     * @param       width the width of the oval to be filled.
-     * @param       height the height of the oval to be filled.
-     * @see         java.awt.Graphics#drawOval
-     */
-    public void fillOval(int x, int y, int width, int height){
-        Ellipse2D oval = new Ellipse2D.Float(x, y, width, height);
-        fill(oval);
-    }
-
-    /**
-     * Fills the specified rounded corner rectangle with the current color.
-     * The left and right edges of the rectangle
-     * are at <code>x</code> and <code>x&nbsp;+&nbsp;width&nbsp;-&nbsp;1</code>,
-     * respectively. The top and bottom edges of the rectangle are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height&nbsp;-&nbsp;1</code>.
-     * @param       x the <i>x</i> coordinate of the rectangle to be filled.
-     * @param       y the <i>y</i> coordinate of the rectangle to be filled.
-     * @param       width the width of the rectangle to be filled.
-     * @param       height the height of the rectangle to be filled.
-     * @param       arcWidth the horizontal diameter
-     *                     of the arc at the four corners.
-     * @param       arcHeight the vertical diameter
-     *                     of the arc at the four corners.
-     * @see         java.awt.Graphics#drawRoundRect
-     */
-    public void fillRoundRect(int x, int y, int width, int height,
-                              int arcWidth, int arcHeight){
-
-        RoundRectangle2D rect = new RoundRectangle2D.Float(x, y, width, height, arcWidth, arcHeight);
-        fill(rect);
-    }
-
-    /**
-     * Fills a circular or elliptical arc covering the specified rectangle.
-     * <p>
-     * The resulting arc begins at <code>startAngle</code> and extends
-     * for <code>arcAngle</code> degrees.
-     * Angles are interpreted such that 0&nbsp;degrees
-     * is at the 3&nbsp;o'clock position.
-     * A positive value indicates a counter-clockwise rotation
-     * while a negative value indicates a clockwise rotation.
-     * <p>
-     * The center of the arc is the center of the rectangle whose origin
-     * is (<i>x</i>,&nbsp;<i>y</i>) and whose size is specified by the
-     * <code>width</code> and <code>height</code> arguments.
-     * <p>
-     * The resulting arc covers an area
-     * <code>width&nbsp;+&nbsp;1</code> pixels wide
-     * by <code>height&nbsp;+&nbsp;1</code> pixels tall.
-     * <p>
-     * The angles are specified relative to the non-square extents of
-     * the bounding rectangle such that 45 degrees always falls on the
-     * line from the center of the ellipse to the upper right corner of
-     * the bounding rectangle. As a result, if the bounding rectangle is
-     * noticeably longer in one axis than the other, the angles to the
-     * start and end of the arc segment will be skewed farther along the
-     * longer axis of the bounds.
-     * @param        x the <i>x</i> coordinate of the
-     *                    upper-left corner of the arc to be filled.
-     * @param        y the <i>y</i>  coordinate of the
-     *                    upper-left corner of the arc to be filled.
-     * @param        width the width of the arc to be filled.
-     * @param        height the height of the arc to be filled.
-     * @param        startAngle the beginning angle.
-     * @param        arcAngle the angular extent of the arc,
-     *                    relative to the start angle.
-     * @see         java.awt.Graphics#drawArc
-     */
-    public void fillArc(int x, int y, int width, int height,
-                        int startAngle, int arcAngle){
-        Arc2D arc = new Arc2D.Float(x, y, width, height, startAngle, arcAngle, Arc2D.PIE);
-        fill(arc);
-    }
-
-    /**
-     * Draws the outline of a circular or elliptical arc
-     * covering the specified rectangle.
-     * <p>
-     * The resulting arc begins at <code>startAngle</code> and extends
-     * for <code>arcAngle</code> degrees, using the current color.
-     * Angles are interpreted such that 0&nbsp;degrees
-     * is at the 3&nbsp;o'clock position.
-     * A positive value indicates a counter-clockwise rotation
-     * while a negative value indicates a clockwise rotation.
-     * <p>
-     * The center of the arc is the center of the rectangle whose origin
-     * is (<i>x</i>,&nbsp;<i>y</i>) and whose size is specified by the
-     * <code>width</code> and <code>height</code> arguments.
-     * <p>
-     * The resulting arc covers an area
-     * <code>width&nbsp;+&nbsp;1</code> pixels wide
-     * by <code>height&nbsp;+&nbsp;1</code> pixels tall.
-     * <p>
-     * The angles are specified relative to the non-square extents of
-     * the bounding rectangle such that 45 degrees always falls on the
-     * line from the center of the ellipse to the upper right corner of
-     * the bounding rectangle. As a result, if the bounding rectangle is
-     * noticeably longer in one axis than the other, the angles to the
-     * start and end of the arc segment will be skewed farther along the
-     * longer axis of the bounds.
-     * @param        x the <i>x</i> coordinate of the
-     *                    upper-left corner of the arc to be drawn.
-     * @param        y the <i>y</i>  coordinate of the
-     *                    upper-left corner of the arc to be drawn.
-     * @param        width the width of the arc to be drawn.
-     * @param        height the height of the arc to be drawn.
-     * @param        startAngle the beginning angle.
-     * @param        arcAngle the angular extent of the arc,
-     *                    relative to the start angle.
-     * @see         java.awt.Graphics#fillArc
-     */
-    public void drawArc(int x, int y, int width, int height,
-                        int startAngle, int arcAngle) {
-        Arc2D arc = new Arc2D.Float(x, y, width, height, startAngle, arcAngle, Arc2D.OPEN);
-        draw(arc);
-    }
-
-
-    /**
-     * Draws a sequence of connected lines defined by
-     * arrays of <i>x</i> and <i>y</i> coordinates.
-     * Each pair of (<i>x</i>,&nbsp;<i>y</i>) coordinates defines a point.
-     * The figure is not closed if the first point
-     * differs from the last point.
-     * @param       xPoints an array of <i>x</i> points
-     * @param       yPoints an array of <i>y</i> points
-     * @param       nPoints the total number of points
-     * @see         java.awt.Graphics#drawPolygon(int[], int[], int)
-     * @since       JDK1.1
-     */
-    public void drawPolyline(int[] xPoints, int[] yPoints,
-                             int nPoints){
-        if(nPoints > 0){
-            GeneralPath path = new GeneralPath();
-            path.moveTo(xPoints[0], yPoints[0]);
-            for(int i=1; i<nPoints; i++)
-                path.lineTo(xPoints[i], yPoints[i]);
-
-            draw(path);
-        }
-    }
-
-    /**
-     * Draws the outline of an oval.
-     * The result is a circle or ellipse that fits within the
-     * rectangle specified by the <code>x</code>, <code>y</code>,
-     * <code>width</code>, and <code>height</code> arguments.
-     * <p>
-     * The oval covers an area that is
-     * <code>width&nbsp;+&nbsp;1</code> pixels wide
-     * and <code>height&nbsp;+&nbsp;1</code> pixels tall.
-     * @param       x the <i>x</i> coordinate of the upper left
-     *                     corner of the oval to be drawn.
-     * @param       y the <i>y</i> coordinate of the upper left
-     *                     corner of the oval to be drawn.
-     * @param       width the width of the oval to be drawn.
-     * @param       height the height of the oval to be drawn.
-     * @see         java.awt.Graphics#fillOval
-     */
-    public void drawOval(int x, int y, int width, int height){
-        Ellipse2D oval = new Ellipse2D.Float(x, y, width, height);
-        draw(oval);
-    }
-
-    /**
-     * Draws as much of the specified image as is currently available.
-     * The image is drawn with its top-left corner at
-     * (<i>x</i>,&nbsp;<i>y</i>) in this graphics context's coordinate
-     * space.  Transparent pixels are drawn in the specified
-     * background color.
-     * <p>
-     * This operation is equivalent to filling a rectangle of the
-     * width and height of the specified image with the given color and then
-     * drawing the image on top of it, but possibly more efficient.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * complete image has not yet been loaded, and it has not been dithered
-     * and converted for the current output device.
-     * <p>
-     * If the image has not yet been completely loaded, then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * @param    img    the specified image to be drawn.
-     * @param    x      the <i>x</i> coordinate.
-     * @param    y      the <i>y</i> coordinate.
-     * @param    bgcolor the background color to paint under the
-     *                         non-opaque portions of the image.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             Color bgcolor,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified image as has already been scaled
-     * to fit inside the specified rectangle.
-     * <p>
-     * The image is drawn inside the specified rectangle of this
-     * graphics context's coordinate space, and is scaled if
-     * necessary. Transparent pixels are drawn in the specified
-     * background color.
-     * This operation is equivalent to filling a rectangle of the
-     * width and height of the specified image with the given color and then
-     * drawing the image on top of it, but possibly more efficient.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * entire image has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * <p>
-     * A scaled version of an image will not necessarily be
-     * available immediately just because an unscaled version of the
-     * image has been constructed for this output device.  Each size of
-     * the image may be cached separately and generated from the original
-     * data in a separate image production sequence.
-     * @param    img       the specified image to be drawn.
-     * @param    x         the <i>x</i> coordinate.
-     * @param    y         the <i>y</i> coordinate.
-     * @param    width     the width of the rectangle.
-     * @param    height    the height of the rectangle.
-     * @param    bgcolor   the background color to paint under the
-     *                         non-opaque portions of the image.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             int width, int height,
-                             Color bgcolor,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Draws as much of the specified area of the specified image as is
-     * currently available, scaling it on the fly to fit inside the
-     * specified area of the destination drawable surface. Transparent pixels
-     * do not affect whatever pixels are already there.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * image area to be drawn has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * <p>
-     * This method always uses the unscaled version of the image
-     * to render the scaled rectangle and performs the required
-     * scaling on the fly. It does not use a cached, scaled version
-     * of the image for this operation. Scaling of the image from source
-     * to destination is performed such that the first coordinate
-     * of the source rectangle is mapped to the first coordinate of
-     * the destination rectangle, and the second source coordinate is
-     * mapped to the second destination coordinate. The subimage is
-     * scaled and flipped as needed to preserve those mappings.
-     * @param       img the specified image to be drawn
-     * @param       dx1 the <i>x</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dy1 the <i>y</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dx2 the <i>x</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       dy2 the <i>y</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       sx1 the <i>x</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sy1 the <i>y</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sx2 the <i>x</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       sy2 the <i>y</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       observer object to be notified as more of the image is
-     *                    scaled and converted.
-     * @see         java.awt.Image
-     * @see         java.awt.image.ImageObserver
-     * @see         java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public boolean drawImage(Image img,
-                             int dx1, int dy1, int dx2, int dy2,
-                             int sx1, int sy1, int sx2, int sy2,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified area of the specified image as is
-     * currently available, scaling it on the fly to fit inside the
-     * specified area of the destination drawable surface.
-     * <p>
-     * Transparent pixels are drawn in the specified background color.
-     * This operation is equivalent to filling a rectangle of the
-     * width and height of the specified image with the given color and then
-     * drawing the image on top of it, but possibly more efficient.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * image area to be drawn has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that draws the image notifies
-     * the specified image observer.
-     * <p>
-     * This method always uses the unscaled version of the image
-     * to render the scaled rectangle and performs the required
-     * scaling on the fly. It does not use a cached, scaled version
-     * of the image for this operation. Scaling of the image from source
-     * to destination is performed such that the first coordinate
-     * of the source rectangle is mapped to the first coordinate of
-     * the destination rectangle, and the second source coordinate is
-     * mapped to the second destination coordinate. The subimage is
-     * scaled and flipped as needed to preserve those mappings.
-     * @param       img the specified image to be drawn
-     * @param       dx1 the <i>x</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dy1 the <i>y</i> coordinate of the first corner of the
-     *                    destination rectangle.
-     * @param       dx2 the <i>x</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       dy2 the <i>y</i> coordinate of the second corner of the
-     *                    destination rectangle.
-     * @param       sx1 the <i>x</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sy1 the <i>y</i> coordinate of the first corner of the
-     *                    source rectangle.
-     * @param       sx2 the <i>x</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       sy2 the <i>y</i> coordinate of the second corner of the
-     *                    source rectangle.
-     * @param       bgcolor the background color to paint under the
-     *                    non-opaque portions of the image.
-     * @param       observer object to be notified as more of the image is
-     *                    scaled and converted.
-     * @see         java.awt.Image
-     * @see         java.awt.image.ImageObserver
-     * @see         java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public boolean drawImage(Image img,
-                             int dx1, int dy1, int dx2, int dy2,
-                             int sx1, int sy1, int sx2, int sy2,
-                             Color bgcolor,
-                             ImageObserver observer){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified image as is currently available.
-     * The image is drawn with its top-left corner at
-     * (<i>x</i>,&nbsp;<i>y</i>) in this graphics context's coordinate
-     * space. Transparent pixels in the image do not affect whatever
-     * pixels are already there.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * complete image has not yet been loaded, and it has not been dithered
-     * and converted for the current output device.
-     * <p>
-     * If the image has completely loaded and its pixels are
-     * no longer being changed, then
-     * <code>drawImage</code> returns <code>true</code>.
-     * Otherwise, <code>drawImage</code> returns <code>false</code>
-     * and as more of
-     * the image becomes available
-     * or it is time to draw another frame of animation,
-     * the process that loads the image notifies
-     * the specified image observer.
-     * @param    img the specified image to be drawn. This method does
-     *               nothing if <code>img</code> is null.
-     * @param    x   the <i>x</i> coordinate.
-     * @param    y   the <i>y</i> coordinate.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @return   <code>false</code> if the image pixels are still changing;
-     *           <code>true</code> otherwise.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             ImageObserver observer) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Disposes of this graphics context and releases
-     * any system resources that it is using.
-     * A <code>Graphics</code> object cannot be used after
-     * <code>dispose</code>has been called.
-     * <p>
-     * When a Java program runs, a large number of <code>Graphics</code>
-     * objects can be created within a short time frame.
-     * Although the finalization process of the garbage collector
-     * also disposes of the same system resources, it is preferable
-     * to manually free the associated resources by calling this
-     * method rather than to rely on a finalization process which
-     * may not run to completion for a long period of time.
-     * <p>
-     * Graphics objects which are provided as arguments to the
-     * <code>paint</code> and <code>update</code> methods
-     * of components are automatically released by the system when
-     * those methods return. For efficiency, programmers should
-     * call <code>dispose</code> when finished using
-     * a <code>Graphics</code> object only if it was created
-     * directly from a component or another <code>Graphics</code> object.
-     * @see         java.awt.Graphics#finalize
-     * @see         java.awt.Component#paint
-     * @see         java.awt.Component#update
-     * @see         java.awt.Component#getGraphics
-     * @see         java.awt.Graphics#create
-     */
-    public void dispose() {
-    }
-
-    /**
-     * Draws a line, using the current color, between the points
-     * <code>(x1,&nbsp;y1)</code> and <code>(x2,&nbsp;y2)</code>
-     * in this graphics context's coordinate system.
-     * @param   x1  the first point's <i>x</i> coordinate.
-     * @param   y1  the first point's <i>y</i> coordinate.
-     * @param   x2  the second point's <i>x</i> coordinate.
-     * @param   y2  the second point's <i>y</i> coordinate.
-     */
-    public void drawLine(int x1, int y1, int x2, int y2){
-        Line2D line = new Line2D.Float(x1, y1, x2, y2);
-        draw(line);
-    }
-
-    /**
-     * Fills a closed polygon defined by
-     * arrays of <i>x</i> and <i>y</i> coordinates.
-     * <p>
-     * This method draws the polygon defined by <code>nPoint</code> line
-     * segments, where the first <code>nPoint&nbsp;-&nbsp;1</code>
-     * line segments are line segments from
-     * <code>(xPoints[i&nbsp;-&nbsp;1],&nbsp;yPoints[i&nbsp;-&nbsp;1])</code>
-     * to <code>(xPoints[i],&nbsp;yPoints[i])</code>, for
-     * 1&nbsp;&le;&nbsp;<i>i</i>&nbsp;&le;&nbsp;<code>nPoints</code>.
-     * The figure is automatically closed by drawing a line connecting
-     * the final point to the first point, if those points are different.
-     * <p>
-     * The area inside the polygon is defined using an
-     * even-odd fill rule, also known as the alternating rule.
-     * @param        xPoints   a an array of <code>x</code> coordinates.
-     * @param        yPoints   a an array of <code>y</code> coordinates.
-     * @param        nPoints   a the total number of points.
-     * @see          java.awt.Graphics#drawPolygon(int[], int[], int)
-     */
-    public void fillPolygon(int[] xPoints, int[] yPoints,
-                            int nPoints){
-        java.awt.Polygon polygon = new java.awt.Polygon(xPoints, yPoints, nPoints);
-        fill(polygon);
-    }
-
-    /**
-     * Fills the specified rectangle.
-     * The left and right edges of the rectangle are at
-     * <code>x</code> and <code>x&nbsp;+&nbsp;width&nbsp;-&nbsp;1</code>.
-     * The top and bottom edges are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height&nbsp;-&nbsp;1</code>.
-     * The resulting rectangle covers an area
-     * <code>width</code> pixels wide by
-     * <code>height</code> pixels tall.
-     * The rectangle is filled using the graphics context's current color.
-     * @param         x   the <i>x</i> coordinate
-     *                         of the rectangle to be filled.
-     * @param         y   the <i>y</i> coordinate
-     *                         of the rectangle to be filled.
-     * @param         width   the width of the rectangle to be filled.
-     * @param         height   the height of the rectangle to be filled.
-     * @see           java.awt.Graphics#clearRect
-     * @see           java.awt.Graphics#drawRect
-     */
-    public void fillRect(int x, int y, int width, int height){
-        Rectangle rect = new Rectangle(x, y, width, height);
-        fill(rect);
-    }
-
-    /**
-     * Draws the outline of the specified rectangle.
-     * The left and right edges of the rectangle are at
-     * <code>x</code> and <code>x&nbsp;+&nbsp;width</code>.
-     * The top and bottom edges are at
-     * <code>y</code> and <code>y&nbsp;+&nbsp;height</code>.
-     * The rectangle is drawn using the graphics context's current color.
-     * @param         x   the <i>x</i> coordinate
-     *                         of the rectangle to be drawn.
-     * @param         y   the <i>y</i> coordinate
-     *                         of the rectangle to be drawn.
-     * @param         width   the width of the rectangle to be drawn.
-     * @param         height   the height of the rectangle to be drawn.
-     * @see          java.awt.Graphics#fillRect
-     * @see          java.awt.Graphics#clearRect
-     */
-    public void drawRect(int x, int y, int width, int height) {
-        Rectangle rect = new Rectangle(x, y, width, height);
-        draw(rect);
-    }
-
-    /**
-     * Draws a closed polygon defined by
-     * arrays of <i>x</i> and <i>y</i> coordinates.
-     * Each pair of (<i>x</i>,&nbsp;<i>y</i>) coordinates defines a point.
-     * <p>
-     * This method draws the polygon defined by <code>nPoint</code> line
-     * segments, where the first <code>nPoint&nbsp;-&nbsp;1</code>
-     * line segments are line segments from
-     * <code>(xPoints[i&nbsp;-&nbsp;1],&nbsp;yPoints[i&nbsp;-&nbsp;1])</code>
-     * to <code>(xPoints[i],&nbsp;yPoints[i])</code>, for
-     * 1&nbsp;&le;&nbsp;<i>i</i>&nbsp;&le;&nbsp;<code>nPoints</code>.
-     * The figure is automatically closed by drawing a line connecting
-     * the final point to the first point, if those points are different.
-     * @param        xPoints   a an array of <code>x</code> coordinates.
-     * @param        yPoints   a an array of <code>y</code> coordinates.
-     * @param        nPoints   a the total number of points.
-     * @see          java.awt.Graphics#fillPolygon(int[],int[],int)
-     * @see          java.awt.Graphics#drawPolyline
-     */
-    public void drawPolygon(int[] xPoints, int[] yPoints,
-                            int nPoints){
-        java.awt.Polygon polygon = new java.awt.Polygon(xPoints, yPoints, nPoints);
-        draw(polygon);
-    }
-
-    /**
-     * Intersects the current clip with the specified rectangle.
-     * The resulting clipping area is the intersection of the current
-     * clipping area and the specified rectangle.  If there is no
-     * current clipping area, either because the clip has never been
-     * set, or the clip has been cleared using <code>setClip(null)</code>,
-     * the specified rectangle becomes the new clip.
-     * This method sets the user clip, which is independent of the
-     * clipping associated with device bounds and window visibility.
-     * This method can only be used to make the current clip smaller.
-     * To set the current clip larger, use any of the setClip methods.
-     * Rendering operations have no effect outside of the clipping area.
-     * @param x the x coordinate of the rectangle to intersect the clip with
-     * @param y the y coordinate of the rectangle to intersect the clip with
-     * @param width the width of the rectangle to intersect the clip with
-     * @param height the height of the rectangle to intersect the clip with
-     * @see #setClip(int, int, int, int)
-     * @see #setClip(Shape)
-     */
-    public void clipRect(int x, int y, int width, int height){
-        clip(new Rectangle(x, y, width, height));
-    }
-
-    /**
-     * Sets the current clipping area to an arbitrary clip shape.
-     * Not all objects that implement the <code>Shape</code>
-     * interface can be used to set the clip.  The only
-     * <code>Shape</code> objects that are guaranteed to be
-     * supported are <code>Shape</code> objects that are
-     * obtained via the <code>getClip</code> method and via
-     * <code>Rectangle</code> objects.  This method sets the
-     * user clip, which is independent of the clipping associated
-     * with device bounds and window visibility.
-     * @param clip the <code>Shape</code> to use to set the clip
-     * @see         java.awt.Graphics#getClip()
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(int, int, int, int)
-     * @since       JDK1.1
-     */
-    @NotImplemented
-    public void setClip(Shape clip) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Returns the bounding rectangle of the current clipping area.
-     * This method refers to the user clip, which is independent of the
-     * clipping associated with device bounds and window visibility.
-     * If no clip has previously been set, or if the clip has been
-     * cleared using <code>setClip(null)</code>, this method returns
-     * <code>null</code>.
-     * The coordinates in the rectangle are relative to the coordinate
-     * system origin of this graphics context.
-     * @return      the bounding rectangle of the current clipping area,
-     *              or <code>null</code> if no clip is set.
-     * @see         java.awt.Graphics#getClip
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(int, int, int, int)
-     * @see         java.awt.Graphics#setClip(Shape)
-     * @since       JDK1.1
-     */
-    public Rectangle getClipBounds(){
-        Shape c = getClip();
-        if (c==null) {
-            return null;
-        }
-        return c.getBounds();
-    }
-
-    /**
-     * Draws the text given by the specified iterator, using this
-     * graphics context's current color. The iterator has to specify a font
-     * for each character. The baseline of the
-     * first character is at position (<i>x</i>,&nbsp;<i>y</i>) in this
-     * graphics context's coordinate system.
-     * @param       iterator the iterator whose text is to be drawn
-     * @param       x        the <i>x</i> coordinate.
-     * @param       y        the <i>y</i> coordinate.
-     * @see         java.awt.Graphics#drawBytes
-     * @see         java.awt.Graphics#drawChars
-     */
-    public void drawString(AttributedCharacterIterator iterator,
-                           int x, int y){
-        drawString(iterator, (float)x, (float)y);
-    }
-
-    /**
-     * Clears the specified rectangle by filling it with the background
-     * color of the current drawing surface. This operation does not
-     * use the current paint mode.
-     * <p>
-     * Beginning with Java&nbsp;1.1, the background color
-     * of offscreen images may be system dependent. Applications should
-     * use <code>setColor</code> followed by <code>fillRect</code> to
-     * ensure that an offscreen image is cleared to a specific color.
-     * @param       x the <i>x</i> coordinate of the rectangle to clear.
-     * @param       y the <i>y</i> coordinate of the rectangle to clear.
-     * @param       width the width of the rectangle to clear.
-     * @param       height the height of the rectangle to clear.
-     * @see         java.awt.Graphics#fillRect(int, int, int, int)
-     * @see         java.awt.Graphics#drawRect
-     * @see         java.awt.Graphics#setColor(java.awt.Color)
-     * @see         java.awt.Graphics#setPaintMode
-     * @see         java.awt.Graphics#setXORMode(java.awt.Color)
-     */
-    public void clearRect(int x, int y, int width, int height) {
-        Paint paint = getPaint();
-        setColor(getBackground());
-        fillRect(x, y, width, height);
-        setPaint(paint);
-    }
-
-    public void copyArea(int x, int y, int width, int height, int dx, int dy) {
-    }
-
-    /**
-     * Sets the current clip to the rectangle specified by the given
-     * coordinates.  This method sets the user clip, which is
-     * independent of the clipping associated with device bounds
-     * and window visibility.
-     * Rendering operations have no effect outside of the clipping area.
-     * @param       x the <i>x</i> coordinate of the new clip rectangle.
-     * @param       y the <i>y</i> coordinate of the new clip rectangle.
-     * @param       width the width of the new clip rectangle.
-     * @param       height the height of the new clip rectangle.
-     * @see         java.awt.Graphics#clipRect
-     * @see         java.awt.Graphics#setClip(Shape)
-     * @since       JDK1.1
-     */
-    public void setClip(int x, int y, int width, int height){
-        setClip(new Rectangle(x, y, width, height));
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a rotation transform.
-     * Subsequent rendering is rotated by the specified radians relative
-     * to the previous origin.
-     * This is equivalent to calling <code>transform(R)</code>, where R is an
-     * <code>AffineTransform</code> represented by the following matrix:
-     * <pre>
-     *          [   cos(theta)    -sin(theta)    0   ]
-     *          [   sin(theta)     cos(theta)    0   ]
-     *          [       0              0         1   ]
-     * </pre>
-     * Rotating with a positive angle theta rotates points on the positive
-     * x axis toward the positive y axis.
-     * @param theta the angle of rotation in radians
-     */
-    public void rotate(double theta){
-        _transform.rotate(theta);
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a translated rotation
-     * transform.  Subsequent rendering is transformed by a transform
-     * which is constructed by translating to the specified location,
-     * rotating by the specified radians, and translating back by the same
-     * amount as the original translation.  This is equivalent to the
-     * following sequence of calls:
-     * <pre>
-     *          translate(x, y);
-     *          rotate(theta);
-     *          translate(-x, -y);
-     * </pre>
-     * Rotating with a positive angle theta rotates points on the positive
-     * x axis toward the positive y axis.
-     * @param theta the angle of rotation in radians
-     * @param x x coordinate of the origin of the rotation
-     * @param y y coordinate of the origin of the rotation
-     */
-    public void rotate(double theta, double x, double y){
-        _transform.rotate(theta, x, y);
-    }
-
-    /**
-     * Concatenates the current <code>Graphics2D</code>
-     * <code>Transform</code> with a shearing transform.
-     * Subsequent renderings are sheared by the specified
-     * multiplier relative to the previous position.
-     * This is equivalent to calling <code>transform(SH)</code>, where SH
-     * is an <code>AffineTransform</code> represented by the following
-     * matrix:
-     * <pre>
-     *          [   1   shx   0   ]
-     *          [  shy   1    0   ]
-     *          [   0    0    1   ]
-     * </pre>
-     * @param shx the multiplier by which coordinates are shifted in
-     * the positive X axis direction as a function of their Y coordinate
-     * @param shy the multiplier by which coordinates are shifted in
-     * the positive Y axis direction as a function of their X coordinate
-     */
-    public void shear(double shx, double shy){
-        _transform.shear(shx, shy);
-    }
-
-    /**
-     * Get the rendering context of the <code>Font</code> within this
-     * <code>Graphics2D</code> context.
-     * The {@link FontRenderContext}
-     * encapsulates application hints such as anti-aliasing and
-     * fractional metrics, as well as target device specific information
-     * such as dots-per-inch.  This information should be provided by the
-     * application when using objects that perform typographical
-     * formatting, such as <code>Font</code> and
-     * <code>TextLayout</code>.  This information should also be provided
-     * by applications that perform their own layout and need accurate
-     * measurements of various characteristics of glyphs such as advance
-     * and line height when various rendering hints have been applied to
-     * the text rendering.
-     *
-     * @return a reference to an instance of FontRenderContext.
-     * @see java.awt.font.FontRenderContext
-     * @see java.awt.Font#createGlyphVector(FontRenderContext,char[])
-     * @see java.awt.font.TextLayout
-     * @since     JDK1.2
-     */
-    public FontRenderContext getFontRenderContext() {
-        boolean isAntiAliased = RenderingHints.VALUE_TEXT_ANTIALIAS_ON.equals(
-                getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING));
-        boolean usesFractionalMetrics = RenderingHints.VALUE_FRACTIONALMETRICS_ON.equals(
-                getRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS));
-
-
-        return new FontRenderContext(new AffineTransform(), isAntiAliased, usesFractionalMetrics);
-    }
-
-    /**
-     * Composes an <code>AffineTransform</code> object with the
-     * <code>Transform</code> in this <code>Graphics2D</code> according
-     * to the rule last-specified-first-applied.  If the current
-     * <code>Transform</code> is Cx, the result of composition
-     * with Tx is a new <code>Transform</code> Cx'.  Cx' becomes the
-     * current <code>Transform</code> for this <code>Graphics2D</code>.
-     * Transforming a point p by the updated <code>Transform</code> Cx' is
-     * equivalent to first transforming p by Tx and then transforming
-     * the result by the original <code>Transform</code> Cx.  In other
-     * words, Cx'(p) = Cx(Tx(p)).  A copy of the Tx is made, if necessary,
-     * so further modifications to Tx do not affect rendering.
-     * @param Tx the <code>AffineTransform</code> object to be composed with
-     * the current <code>Transform</code>
-     * @see #setTransform
-     * @see AffineTransform
-     */
-    public void transform(AffineTransform Tx) {
-        _transform.concatenate(Tx);
-    }
-
-    /**
-     * Renders a <code>BufferedImage</code> that is
-     * filtered with a
-     * {@link BufferedImageOp}.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>
-     * and <code>Composite</code> attributes.  This is equivalent to:
-     * <pre>
-     * img1 = op.filter(img, null);
-     * drawImage(img1, new AffineTransform(1f,0f,0f,1f,x,y), null);
-     * </pre>
-     * @param img the <code>BufferedImage</code> to be rendered
-     * @param op the filter to be applied to the image before rendering
-     * @param x the x coordinate in user space where the image is rendered
-     * @param y the y coordinate in user space where the image is rendered
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip(Shape)
-     */
-    public void drawImage(BufferedImage img,
-                          BufferedImageOp op,
-                          int x,
-                          int y){
-        img = op.filter(img, null);
-        drawImage(img, x, y, null);
-    }
-
-    /**
-     * Sets the background color for the <code>Graphics2D</code> context.
-     * The background color is used for clearing a region.
-     * When a <code>Graphics2D</code> is constructed for a
-     * <code>Component</code>, the background color is
-     * inherited from the <code>Component</code>. Setting the background color
-     * in the <code>Graphics2D</code> context only affects the subsequent
-     * <code>clearRect</code> calls and not the background color of the
-     * <code>Component</code>.  To change the background
-     * of the <code>Component</code>, use appropriate methods of
-     * the <code>Component</code>.
-     * @param color the background color that isused in
-     * subsequent calls to <code>clearRect</code>
-     * @see #getBackground
-     * @see java.awt.Graphics#clearRect
-     */
-    public void setBackground(Color color) {
-        if(color == null)
-            return;
-
-        _background = color;
-    }
-
-    /**
-     * Returns the background color used for clearing a region.
-     * @return the current <code>Graphics2D</code> <code>Color</code>,
-     * which defines the background color.
-     * @see #setBackground
-     */
-    public Color getBackground(){
-        return _background;
-    }
-
-    /**
-     * Sets the <code>Composite</code> for the <code>Graphics2D</code> context.
-     * The <code>Composite</code> is used in all drawing methods such as
-     * <code>drawImage</code>, <code>drawString</code>, <code>draw</code>,
-     * and <code>fill</code>.  It specifies how new pixels are to be combined
-     * with the existing pixels on the graphics device during the rendering
-     * process.
-     * <p>If this <code>Graphics2D</code> context is drawing to a
-     * <code>Component</code> on the display screen and the
-     * <code>Composite</code> is a custom object rather than an
-     * instance of the <code>AlphaComposite</code> class, and if
-     * there is a security manager, its <code>checkPermission</code>
-     * method is called with an <code>AWTPermission("readDisplayPixels")</code>
-     * permission.
-     *
-     * @param comp the <code>Composite</code> object to be used for rendering
-     * @throws SecurityException
-     *         if a custom <code>Composite</code> object is being
-     *         used to render to the screen and a security manager
-     *         is set and its <code>checkPermission</code> method
-     *         does not allow the operation.
-     * @see java.awt.Graphics#setXORMode
-     * @see java.awt.Graphics#setPaintMode
-     * @see java.awt.AlphaComposite
-     */
-    @NotImplemented
-    public void setComposite(Composite comp){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Returns the current <code>Composite</code> in the
-     * <code>Graphics2D</code> context.
-     * @return the current <code>Graphics2D</code> <code>Composite</code>,
-     *              which defines a compositing style.
-     * @see #setComposite
-     */
-    @NotImplemented
-    public Composite getComposite(){
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return null;
-    }
-
-    /**
-     * Returns the value of a single preference for the rendering algorithms.
-     * Hint categories include controls for rendering quality and overall
-     * time/quality trade-off in the rendering process.  Refer to the
-     * <code>RenderingHints</code> class for definitions of some common
-     * keys and values.
-     * @param hintKey the key corresponding to the hint to get.
-     * @return an object representing the value for the specified hint key.
-     * Some of the keys and their associated values are defined in the
-     * <code>RenderingHints</code> class.
-     * @see RenderingHints
-     */
-    public Object getRenderingHint(RenderingHints.Key hintKey){
-        return _hints.get(hintKey);
-    }
-
-    /**
-     * Sets the value of a single preference for the rendering algorithms.
-     * Hint categories include controls for rendering quality and overall
-     * time/quality trade-off in the rendering process.  Refer to the
-     * <code>RenderingHints</code> class for definitions of some common
-     * keys and values.
-     * @param hintKey the key of the hint to be set.
-     * @param hintValue the value indicating preferences for the specified
-     * hint category.
-     * @see RenderingHints
-     */
-    public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue){
-        _hints.put(hintKey, hintValue);
-    }
-
-
-    /**
-     * Renders the text of the specified
-     * {@link GlyphVector} using
-     * the <code>Graphics2D</code> context's rendering attributes.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, <code>Paint</code>, and
-     * <code>Composite</code> attributes.  The <code>GlyphVector</code>
-     * specifies individual glyphs from a {@link Font}.
-     * The <code>GlyphVector</code> can also contain the glyph positions.
-     * This is the fastest way to render a set of characters to the
-     * screen.
-     *
-     * @param g the <code>GlyphVector</code> to be rendered
-     * @param x the x position in user space where the glyphs should be
-     *        rendered
-     * @param y the y position in user space where the glyphs should be
-     *        rendered
-     *
-     * @see java.awt.Font#createGlyphVector(FontRenderContext, char[])
-     * @see java.awt.font.GlyphVector
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #setTransform
-     * @see #setComposite
-     * @see #setClip(Shape)
-     */
-    public void drawGlyphVector(GlyphVector g, float x, float y) {
-        Shape glyphOutline = g.getOutline(x, y);
-        fill(glyphOutline);
-    }
-
-    /**
-     * Returns the device configuration associated with this
-     * <code>Graphics2D</code>.
-     * @return the device configuration
-     */
-    public GraphicsConfiguration getDeviceConfiguration() {
-        return GraphicsEnvironment.getLocalGraphicsEnvironment().
-                getDefaultScreenDevice().getDefaultConfiguration();
-    }
-
-    /**
-     * Sets the values of an arbitrary number of preferences for the
-     * rendering algorithms.
-     * Only values for the rendering hints that are present in the
-     * specified <code>Map</code> object are modified.
-     * All other preferences not present in the specified
-     * object are left unmodified.
-     * Hint categories include controls for rendering quality and
-     * overall time/quality trade-off in the rendering process.
-     * Refer to the <code>RenderingHints</code> class for definitions of
-     * some common keys and values.
-     * @param hints the rendering hints to be set
-     * @see RenderingHints
-     */
-    public void addRenderingHints(Map<?,?> hints){
-        this._hints.putAll(hints);
-    }
-
-    /**
-     * Concatenates the current
-     * <code>Graphics2D</code> <code>Transform</code>
-     * with a translation transform.
-     * Subsequent rendering is translated by the specified
-     * distance relative to the previous position.
-     * This is equivalent to calling transform(T), where T is an
-     * <code>AffineTransform</code> represented by the following matrix:
-     * <pre>
-     *          [   1    0    tx  ]
-     *          [   0    1    ty  ]
-     *          [   0    0    1   ]
-     * </pre>
-     * @param tx the distance to translate along the x-axis
-     * @param ty the distance to translate along the y-axis
-     */
-    public void translate(double tx, double ty){
-        _transform.translate(tx, ty);
-    }
-
-    /**
-     * Renders the text of the specified iterator, using the
-     * <code>Graphics2D</code> context's current <code>Paint</code>. The
-     * iterator must specify a font
-     * for each character. The baseline of the
-     * first character is at position (<i>x</i>,&nbsp;<i>y</i>) in the
-     * User Space.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, <code>Paint</code>, and
-     * <code>Composite</code> attributes.
-     * For characters in script systems such as Hebrew and Arabic,
-     * the glyphs can be rendered from right to left, in which case the
-     * coordinate supplied is the location of the leftmost character
-     * on the baseline.
-     * @param iterator the iterator whose text is to be rendered
-     * @param x the x coordinate where the iterator's text is to be
-     * rendered
-     * @param y the y coordinate where the iterator's text is to be
-     * rendered
-     * @see #setPaint
-     * @see java.awt.Graphics#setColor
-     * @see #setTransform
-     * @see #setComposite
-     * @see #setClip
-     */
-    @NotImplemented
-    public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Checks whether or not the specified <code>Shape</code> intersects
-     * the specified {@link Rectangle}, which is in device
-     * space. If <code>onStroke</code> is false, this method checks
-     * whether or not the interior of the specified <code>Shape</code>
-     * intersects the specified <code>Rectangle</code>.  If
-     * <code>onStroke</code> is <code>true</code>, this method checks
-     * whether or not the <code>Stroke</code> of the specified
-     * <code>Shape</code> outline intersects the specified
-     * <code>Rectangle</code>.
-     * The rendering attributes taken into account include the
-     * <code>Clip</code>, <code>Transform</code>, and <code>Stroke</code>
-     * attributes.
-     * @param rect the area in device space to check for a hit
-     * @param s the <code>Shape</code> to check for a hit
-     * @param onStroke flag used to choose between testing the
-     * stroked or the filled shape.  If the flag is <code>true</code>, the
-     * <code>Stroke</code> oultine is tested.  If the flag is
-     * <code>false</code>, the filled <code>Shape</code> is tested.
-     * @return <code>true</code> if there is a hit; <code>false</code>
-     * otherwise.
-     * @see #setStroke
-     * @see #fill(Shape)
-     * @see #draw(Shape)
-     * @see #_transform
-     * @see #setTransform
-     * @see #clip
-     * @see #setClip(Shape)
-     */
-    public boolean hit(Rectangle rect,
-                       Shape s,
-                       boolean onStroke){
-        if (onStroke) {
-            s = getStroke().createStrokedShape(s);
-        }
-
-        s = getTransform().createTransformedShape(s);
-
-        return s.intersects(rect);
-    }
-
-    /**
-     * Gets the preferences for the rendering algorithms.  Hint categories
-     * include controls for rendering quality and overall time/quality
-     * trade-off in the rendering process.
-     * Returns all of the hint key/value pairs that were ever specified in
-     * one operation.  Refer to the
-     * <code>RenderingHints</code> class for definitions of some common
-     * keys and values.
-     * @return a reference to an instance of <code>RenderingHints</code>
-     * that contains the current preferences.
-     * @see RenderingHints
-     */
-    public RenderingHints getRenderingHints(){
-        return _hints;
-    }
-
-    /**
-     * Replaces the values of all preferences for the rendering
-     * algorithms with the specified <code>hints</code>.
-     * The existing values for all rendering hints are discarded and
-     * the new set of known hints and values are initialized from the
-     * specified {@link Map} object.
-     * Hint categories include controls for rendering quality and
-     * overall time/quality trade-off in the rendering process.
-     * Refer to the <code>RenderingHints</code> class for definitions of
-     * some common keys and values.
-     * @param hints the rendering hints to be set
-     * @see RenderingHints
-     */
-    public void setRenderingHints(Map<?,?> hints){
-        this._hints = new RenderingHints(null);
-        this._hints.putAll(hints);
-    }
-
-    /**
-     * Renders an image, applying a transform from image space into user space
-     * before drawing.
-     * The transformation from user space into device space is done with
-     * the current <code>Transform</code> in the <code>Graphics2D</code>.
-     * The specified transformation is applied to the image before the
-     * transform attribute in the <code>Graphics2D</code> context is applied.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, and <code>Composite</code> attributes.
-     * Note that no rendering is done if the specified transform is
-     * noninvertible.
-     * @param img the <code>Image</code> to be rendered
-     * @param xform the transformation from image space into user space
-     * @param obs the {@link ImageObserver}
-     * to be notified as more of the <code>Image</code>
-     * is converted
-     * @return <code>true</code> if the <code>Image</code> is
-     * fully loaded and completely rendered;
-     * <code>false</code> if the <code>Image</code> is still being loaded.
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip(Shape)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
-         if (log.check(POILogger.WARN)) {
-             log.log(POILogger.WARN, "Not implemented");
-         }
-        return false;
-    }
-
-    /**
-     * Draws as much of the specified image as has already been scaled
-     * to fit inside the specified rectangle.
-     * <p>
-     * The image is drawn inside the specified rectangle of this
-     * graphics context's coordinate space, and is scaled if
-     * necessary. Transparent pixels do not affect whatever pixels
-     * are already there.
-     * <p>
-     * This method returns immediately in all cases, even if the
-     * entire image has not yet been scaled, dithered, and converted
-     * for the current output device.
-     * If the current output representation is not yet complete, then
-     * <code>drawImage</code> returns <code>false</code>. As more of
-     * the image becomes available, the process that loads the image notifies
-     * the image observer by calling its <code>imageUpdate</code> method.
-     * <p>
-     * A scaled version of an image will not necessarily be
-     * available immediately just because an unscaled version of the
-     * image has been constructed for this output device.  Each size of
-     * the image may be cached separately and generated from the original
-     * data in a separate image production sequence.
-     * @param    img    the specified image to be drawn. This method does
-     *                  nothing if <code>img</code> is null.
-     * @param    x      the <i>x</i> coordinate.
-     * @param    y      the <i>y</i> coordinate.
-     * @param    width  the width of the rectangle.
-     * @param    height the height of the rectangle.
-     * @param    observer    object to be notified as more of
-     *                          the image is converted.
-     * @return   <code>false</code> if the image pixels are still changing;
-     *           <code>true</code> otherwise.
-     * @see      java.awt.Image
-     * @see      java.awt.image.ImageObserver
-     * @see      java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
-     */
-    @NotImplemented
-    public boolean drawImage(Image img, int x, int y,
-                             int width, int height,
-                             ImageObserver observer) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-        return false;
-    }
-
-    /**
-     * Creates a new <code>Graphics</code> object that is
-     * a copy of this <code>Graphics</code> object.
-     * @return     a new graphics context that is a copy of
-     *                       this graphics context.
-     */
-    public Graphics create() {
-        try {
-            return (Graphics)clone();
-        } catch (CloneNotSupportedException e){
-            throw new HSLFException(e);
-        }
-    }
-
-    /**
-     * Gets the font metrics for the specified font.
-     * @return    the font metrics for the specified font.
-     * @param     f the specified font
-     * @see       java.awt.Graphics#getFont
-     * @see       java.awt.FontMetrics
-     * @see       java.awt.Graphics#getFontMetrics()
-     */
-    @SuppressWarnings("deprecation")
-    @SuppressForbidden
-    public FontMetrics getFontMetrics(Font f) {
-        return Toolkit.getDefaultToolkit().getFontMetrics(f);
-    }
-
-    /**
-     * Sets the paint mode of this graphics context to alternate between
-     * this graphics context's current color and the new specified color.
-     * This specifies that logical pixel operations are performed in the
-     * XOR mode, which alternates pixels between the current color and
-     * a specified XOR color.
-     * <p>
-     * When drawing operations are performed, pixels which are the
-     * current color are changed to the specified color, and vice versa.
-     * <p>
-     * Pixels that are of colors other than those two colors are changed
-     * in an unpredictable but reversible manner; if the same figure is
-     * drawn twice, then all pixels are restored to their original values.
-     * @param     c1 the XOR alternation color
-     */
-    @NotImplemented
-    public void setXORMode(Color c1) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Sets the paint mode of this graphics context to overwrite the
-     * destination with this graphics context's current color.
-     * This sets the logical pixel operation function to the paint or
-     * overwrite mode.  All subsequent rendering operations will
-     * overwrite the destination with the current color.
-     */
-    @NotImplemented
-    public void setPaintMode() {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Renders a
-     * {@link RenderableImage},
-     * applying a transform from image space into user space before drawing.
-     * The transformation from user space into device space is done with
-     * the current <code>Transform</code> in the <code>Graphics2D</code>.
-     * The specified transformation is applied to the image before the
-     * transform attribute in the <code>Graphics2D</code> context is applied.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, and <code>Composite</code> attributes. Note
-     * that no rendering is done if the specified transform is
-     * noninvertible.
-     *<p>
-     * Rendering hints set on the <code>Graphics2D</code> object might
-     * be used in rendering the <code>RenderableImage</code>.
-     * If explicit control is required over specific hints recognized by a
-     * specific <code>RenderableImage</code>, or if knowledge of which hints
-     * are used is required, then a <code>RenderedImage</code> should be
-     * obtained directly from the <code>RenderableImage</code>
-     * and rendered using
-     *{@link #drawRenderedImage(RenderedImage, AffineTransform) drawRenderedImage}.
-     * @param img the image to be rendered. This method does
-     *            nothing if <code>img</code> is null.
-     * @param xform the transformation from image space into user space
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip
-     * @see #drawRenderedImage
-     */
-    @NotImplemented
-    public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    /**
-     * Renders a {@link RenderedImage},
-     * applying a transform from image
-     * space into user space before drawing.
-     * The transformation from user space into device space is done with
-     * the current <code>Transform</code> in the <code>Graphics2D</code>.
-     * The specified transformation is applied to the image before the
-     * transform attribute in the <code>Graphics2D</code> context is applied.
-     * The rendering attributes applied include the <code>Clip</code>,
-     * <code>Transform</code>, and <code>Composite</code> attributes. Note
-     * that no rendering is done if the specified transform is
-     * noninvertible.
-     * @param img the image to be rendered. This method does
-     *            nothing if <code>img</code> is null.
-     * @param xform the transformation from image space into user space
-     * @see #_transform
-     * @see #setTransform
-     * @see #setComposite
-     * @see #clip
-     * @see #setClip
-     */
-    @NotImplemented
-    public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
-        if (log.check(POILogger.WARN)) {
-            log.log(POILogger.WARN, "Not implemented");
-        }
-    }
-
-    protected void applyStroke(HSLFSimpleShape shape) {
-        if (_stroke instanceof BasicStroke){
-            BasicStroke bs = (BasicStroke)_stroke;
-            shape.setLineWidth(bs.getLineWidth());
-            float[] dash = bs.getDashArray();
-            if (dash != null) {
-                //TODO: implement more dashing styles
-                shape.setLineDash(StrokeStyle.LineDash.DASH);
-            }
-        }
-    }
-
-    protected void applyPaint(HSLFSimpleShape shape) {
-        if (_paint instanceof Color) {
-            shape.getFill().setForegroundColor((Color)_paint);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java
deleted file mode 100644
index 9c2cb24..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hslf.usermodel.*;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Units;
-
-import java.awt.geom.Point2D;
-
-/**
- * A simple closed polygon shape
- *
- * @author Yegor Kozlov
- */
-public final class Polygon extends HSLFAutoShape {
-    /**
-     * Create a Polygon object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord       <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent    the parent of the shape
-     */
-   protected Polygon(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-
-    }
-
-    /**
-     * Create a new Polygon. This constructor is used when a new shape is created.
-     *
-     * @param parent    the parent of this Shape. For example, if this text box is a cell
-     * in a table then the parent is Table.
-     */
-    public Polygon(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super((EscherContainerRecord)null, parent);
-        _escherContainer = createSpContainer(ShapeType.NOT_PRIMITIVE, parent instanceof HSLFGroupShape);
-    }
-
-    /**
-     * Create a new Polygon. This constructor is used when a new shape is created.
-     *
-     */
-    public Polygon(){
-        this(null);
-    }
-
-    /**
-     * Set the polygon vertices
-     *
-     * @param xPoints
-     * @param yPoints
-     */
-    public void setPoints(float[] xPoints, float[] yPoints)
-    {
-        float right  = findBiggest(xPoints);
-        float bottom = findBiggest(yPoints);
-        float left   = findSmallest(xPoints);
-        float top    = findSmallest(yPoints);
-
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__RIGHT, Units.pointsToMaster(right - left)));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__BOTTOM, Units.pointsToMaster(bottom - top)));
-
-        for (int i = 0; i < xPoints.length; i++) {
-            xPoints[i] += -left;
-            yPoints[i] += -top;
-        }
-
-        int numpoints = xPoints.length;
-
-        EscherArrayProperty verticesProp = new EscherArrayProperty(EscherProperties.GEOMETRY__VERTICES, false, new byte[0] );
-        verticesProp.setNumberOfElementsInArray(numpoints+1);
-        verticesProp.setNumberOfElementsInMemory(numpoints+1);
-        verticesProp.setSizeOfElements(0xFFF0);
-        for (int i = 0; i < numpoints; i++)
-        {
-            byte[] data = new byte[4];
-            LittleEndian.putShort(data, 0, (short)Units.pointsToMaster(xPoints[i]));
-            LittleEndian.putShort(data, 2, (short)Units.pointsToMaster(yPoints[i]));
-            verticesProp.setElement(i, data);
-        }
-        byte[] data = new byte[4];
-        LittleEndian.putShort(data, 0, (short)Units.pointsToMaster(xPoints[0]));
-        LittleEndian.putShort(data, 2, (short)Units.pointsToMaster(yPoints[0]));
-        verticesProp.setElement(numpoints, data);
-        opt.addEscherProperty(verticesProp);
-
-        EscherArrayProperty segmentsProp = new EscherArrayProperty(EscherProperties.GEOMETRY__SEGMENTINFO, false, null );
-        segmentsProp.setSizeOfElements(0x0002);
-        segmentsProp.setNumberOfElementsInArray(numpoints * 2 + 4);
-        segmentsProp.setNumberOfElementsInMemory(numpoints * 2 + 4);
-        segmentsProp.setElement(0, new byte[] { (byte)0x00, (byte)0x40 } );
-        segmentsProp.setElement(1, new byte[] { (byte)0x00, (byte)0xAC } );
-        for (int i = 0; i < numpoints; i++)
-        {
-            segmentsProp.setElement(2 + i * 2, new byte[] { (byte)0x01, (byte)0x00 } );
-            segmentsProp.setElement(3 + i * 2, new byte[] { (byte)0x00, (byte)0xAC } );
-        }
-        segmentsProp.setElement(segmentsProp.getNumberOfElementsInArray() - 2, new byte[] { (byte)0x01, (byte)0x60 } );
-        segmentsProp.setElement(segmentsProp.getNumberOfElementsInArray() - 1, new byte[] { (byte)0x00, (byte)0x80 } );
-        opt.addEscherProperty(segmentsProp);
-
-        opt.sortProperties();
-    }
-
-    /**
-     * Set the polygon vertices
-     *
-     * @param points the polygon vertices
-     */
-      public void setPoints(Point2D[] points)
-     {
-        float[] xpoints = new float[points.length];
-        float[] ypoints = new float[points.length];
-        for (int i = 0; i < points.length; i++) {
-            xpoints[i] = (float)points[i].getX();
-            ypoints[i] = (float)points[i].getY();
-
-        }
-
-        setPoints(xpoints, ypoints);
-    }
-
-    private float findBiggest( float[] values )
-    {
-        float result = Float.MIN_VALUE;
-        for ( int i = 0; i < values.length; i++ )
-        {
-            if (values[i] > result)
-                result = values[i];
-        }
-        return result;
-    }
-
-    private float findSmallest( float[] values )
-    {
-        float result = Float.MAX_VALUE;
-        for ( int i = 0; i < values.length; i++ )
-        {
-            if (values[i] < result)
-                result = values[i];
-        }
-        return result;
-    }
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
deleted file mode 100644
index a8847d0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/** 
- * Definition of a special kind of property of some text, or its 
- *  paragraph. For these properties, a flag in the "contains" header 
- *  field tells you the data property family will exist. The value
- *  of the property is itself a mask, encoding several different
- *  (but related) properties
- */
-public abstract class BitMaskTextProp extends TextProp implements Cloneable {
-    protected static final POILogger logger = POILogFactory.getLogger(BitMaskTextProp.class);
-    
-    private String[] subPropNames;
-	private int[] subPropMasks;
-	private boolean[] subPropMatches;
-
-	/** Fetch the list of the names of the sub properties */
-	public String[] getSubPropNames() { return subPropNames; }
-	/** Fetch the list of if the sub properties match or not */
-	public boolean[] getSubPropMatches() { return subPropMatches; }
-
-	protected BitMaskTextProp(int sizeOfDataBlock, int maskInHeader, String overallName, String... subPropNames) {
-		super(sizeOfDataBlock,maskInHeader,"bitmask");
-		this.subPropNames = subPropNames;
-		this.propName = overallName;
-		subPropMasks = new int[subPropNames.length];
-		subPropMatches = new boolean[subPropNames.length];
-		
-		int LSB = Integer.lowestOneBit(maskInHeader);
-		
-		// Initialise the masks list
-		for(int i=0; i<subPropMasks.length; i++) {
-			subPropMasks[i] = (LSB << i);
-		}
-	}
-	
-	/**
-	 * Calculate mask from the subPropMatches.
-	 */
-	@Override
-	public int getWriteMask() {
-	    /*
-	     * The dataValue can't be taken as a mask, as sometimes certain properties
-	     * are explicitly set to false, i.e. the mask says the property is defined
-	     * but in the actually nibble the property is set to false
-	     */ 
-	    int mask = 0, i = 0;
-	    for (int subMask : subPropMasks) {
-	        if (subPropMatches[i++]) mask |= subMask;
-	    }
-		return mask;
-	}
-
-	/**
-	 * Sets the write mask, i.e. which defines the text properties to be considered
-	 *
-	 * @param writeMask the mask, bit values outside the property mask range will be ignored
-	 */
-	public void setWriteMask(int writeMask) {
-        int i = 0;
-        for (int subMask : subPropMasks) {
-            subPropMatches[i++] = ((writeMask & subMask) != 0);
-        }
-	}
-
-	/**
-	 * Return the text property value.
-	 * Clears all bits of the value, which are marked as unset.
-	 * 
-	 * @return the text property value.
-	 */
-	@Override
-	public int getValue() {
-	    return maskValue(dataValue);
-	}
-
-	private int maskValue(int pVal) {
-        int val = pVal, i = 0;
-        for (int mask : subPropMasks) {
-            if (!subPropMatches[i++]) {
-                val &= ~mask;
-            }
-        }
-        return val;
-	}
-	
-	/**
-	 * Set the value of the text property, and recompute the sub
-	 * properties based on it, i.e. all unset subvalues will be cleared.
-	 * Use {@link #setSubValue(boolean, int)} to explicitly set subvalues to {@code false}. 
-	 */
-	@Override
-	public void setValue(int val) { 
-		dataValue = val;
-
-		// Figure out the values of the sub properties
-		int i = 0;
-		for(int mask : subPropMasks) {
-		    subPropMatches[i++] = ((val & mask) != 0);
-		}
-	}
-
-	/**
-	 * Convenience method to set a value with mask, without splitting it into the subvalues
-	 *
-	 * @param val
-	 * @param writeMask
-	 */
-	public void setValueWithMask(int val, int writeMask) {
-	    setWriteMask(writeMask);
-	    dataValue = maskValue(val);
-	    if (val != dataValue) {
-	        logger.log(POILogger.WARN, "Style properties of '"+getName()+"' don't match mask - output will be sanitized");
-	        if (logger.check(POILogger.DEBUG)) {
-	            StringBuilder sb = new StringBuilder("The following style attributes of the '"+getName()+"' property will be ignored:\n");
-	            int i=0;
-	            for (int mask : subPropMasks) {
-	                if (!subPropMatches[i] && (val & mask) != 0) {
-	                    sb.append(subPropNames[i]).append(",");
-	                }
-	                i++;
-	            }
-	            logger.log(POILogger.DEBUG, sb.toString());
-	        }
-	    }
-	}
-	
-	/**
-	 * Fetch the true/false status of the subproperty with the given index
-	 */
-	public boolean getSubValue(int idx) {
-		return subPropMatches[idx] && ((dataValue & subPropMasks[idx]) != 0);
-	}
-
-	/**
-	 * Set the true/false status of the subproperty with the given index
-	 */
-	public void setSubValue(boolean value, int idx) {
-        subPropMatches[idx] = true;
-        if (value) {
-            dataValue |= subPropMasks[idx];
-        } else {
-            dataValue &= ~subPropMasks[idx];
-        }
-	}
-	
-	@Override
-	public BitMaskTextProp clone(){
-		BitMaskTextProp newObj = (BitMaskTextProp)super.clone();
-		
-		// Don't carry over matches, but keep everything 
-		//  else as it was
-		newObj.subPropMatches = new boolean[subPropMatches.length];
-		
-		return newObj;
-	}
-	
-    public BitMaskTextProp cloneAll(){
-        return (BitMaskTextProp)super.clone();
-    }	
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
deleted file mode 100644
index f7cd037..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-/** 
- * Definition for the common character text property bitset, which
- *  handles bold/italic/underline etc.
- */
-public class CharFlagsTextProp extends BitMaskTextProp {
-	public static final int BOLD_IDX = 0;
-	public static final int ITALIC_IDX = 1;
-	public static final int UNDERLINE_IDX = 2;
-	public static final int SHADOW_IDX = 4;
-	public static final int STRIKETHROUGH_IDX = 8;
-	public static final int RELIEF_IDX = 9;
-	public static final int RESET_NUMBERING_IDX = 10;
-	public static final int ENABLE_NUMBERING_1_IDX = 11;
-	public static final int ENABLE_NUMBERING_2_IDX = 12;
-
-    public static final String NAME = "char_flags";
-	public CharFlagsTextProp() {
-		super(2, 0xffff, NAME,
-			"bold",                 // 0x0001  A bit that specifies whether the characters are bold.
-			"italic",               // 0x0002  A bit that specifies whether the characters are italicized.
-			"underline",            // 0x0004  A bit that specifies whether the characters are underlined.
-			"unused1",              // 0x0008  Undefined and MUST be ignored.
-			"shadow",               // 0x0010  A bit that specifies whether the characters have a shadow effect.
-			"fehint",               // 0x0020  A bit that specifies whether characters originated from double-byte input.
-			"unused2",              // 0x0040  Undefined and MUST be ignored.
-			"kumi",                 // 0x0080  A bit that specifies whether Kumimoji are used for vertical text.
-			"strikethrough",        // 0x0100  Undefined and MUST be ignored.
-			"emboss",               // 0x0200  A bit that specifies whether the characters are embossed.
-            "pp9rt_1",              // 0x0400  An unsigned integer that specifies the run grouping of additional text properties in StyleTextProp9Atom record.
-            "pp9rt_2",              // 0x0800
-            "pp9rt_3",              // 0x1000
-            "pp9rt_4",              // 0x2000
-            "unused4_1",            // 0x4000  Undefined and MUST be ignored.
-            "unused4_2"             // 0x8000  Undefined and MUST be ignored.
-		);
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
deleted file mode 100644
index 904feee..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-/**
- * Definition for the font alignment property.
- */
-public class FontAlignmentProp extends TextProp {
-    public static final String NAME = "fontAlign";
-	public static final int BASELINE = 0;
-	public static final int TOP = 1;
-	public static final int CENTER = 2;
-	public static final int BOTTOM = 3;
-
-	public FontAlignmentProp() {
-		super(2, 0x10000, NAME);
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java
deleted file mode 100644
index 40adf46..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-import org.apache.poi.hslf.record.TxMasterStyleAtom;
-
-/** 
- * Definition of the indent level of some text. Defines how many
- *  characters it applies to, and what indent level they share.
- * 
- * This is defined by the slightly confusingly named MasterTextPropRun 
- */
-public class IndentProp  {
-    private int charactersCovered;
-    private short indentLevel;
-
-	/** 
-	 * Generate the definition of a given text indent
-	 */
-	public IndentProp(int charactersCovered, short indentLevel) {
-	    this.charactersCovered = charactersCovered;
-	    this.indentLevel = indentLevel;
-	}
-
-    /** Fetch the number of characters this styling applies to */
-    public int getCharactersCovered() { return charactersCovered; }
-    
-    public int getIndentLevel() {
-        return indentLevel;
-    }
-    
-    /**
-     * Sets the indent level, which can be between 0 and 4
-     */
-    public void setIndentLevel(int indentLevel) {
-        if (indentLevel >= TxMasterStyleAtom.MAX_INDENT ||
-            indentLevel < 0) {
-            throw new IllegalArgumentException("Indent must be between 0 and 4");
-        }
-        this.indentLevel = (short)indentLevel;
-    }
-
-    /**
-     * Update the size of the text that this set of properties
-     *  applies to 
-     */
-    public void updateTextSize(int textSize) {
-        charactersCovered = textSize;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
deleted file mode 100644
index d7c6072..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-/**
- * Definition for the common paragraph text property bitset.
- *
- * @author Yegor Kozlov
- */
-public final class ParagraphFlagsTextProp extends BitMaskTextProp {
-	public static final int BULLET_IDX = 0;
-	public static final int BULLET_HARDFONT_IDX = 1;
-	public static final int BULLET_HARDCOLOR_IDX = 2;
-	public static final int BULLET_HARDSIZE_IDX = 4;
-
-    public static final String NAME = "paragraph_flags";
-
-	public ParagraphFlagsTextProp() {
-		super(2,  0xF, NAME,
-			"bullet",
-            "bullet.hardfont",
-			"bullet.hardcolor",
-            "bullet.hardsize"
-		);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java
deleted file mode 100644
index d1046a1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * Container for tabstop lists
- */
-public class TabStopPropCollection extends TextProp {
-    public enum TabStopType {
-        LEFT(0), CENTER(1), RIGHT(2), DECIMAL(3);
-        private final int val;
-        TabStopType(int val) {
-            this.val = val;
-        }
-        public static TabStopType fromRecordVal(int val)  {
-            for (TabStopType tst : values()) {
-                if (tst.val == val) return tst;
-            }
-            return LEFT;
-        }
-    }
-
-    public static class TabStop {
-        /**
-         * If the TextPFException record that contains this TabStop structure also contains a
-         * leftMargin, then the value of position is relative to the left margin of the paragraph;
-         * otherwise, the value is relative to the left side of the paragraph.
-         * 
-         * If a TextRuler record contains this TabStop structure, the value is relative to the
-         * left side of the text ruler.
-         */
-        private int position;
-
-        /**
-         * A enumeration that specifies how text aligns at the tab stop.
-         */
-        private TabStopType type;
-
-        public TabStop(int position, TabStopType type) {
-            this.position = position;
-            this.type = type;
-        }
-        
-        public int getPosition() {
-            return position;
-        }
-
-        public void setPosition(int position) {
-            this.position = position;
-        }
-
-        public TabStopType getType() {
-            return type;
-        }
-
-        public void setType(TabStopType type) {
-            this.type = type;
-        }
-    }
-    
-    private List<TabStop> tabStops = new ArrayList<TabStop>();
-    
-    public TabStopPropCollection() {
-        super(0, 0x100000, "tabStops");
-    }
-    
-    /**
-     * Parses the tabstops from TxMasterStyle record
-     *
-     * @param data the data stream
-     * @param offset the offset within the data
-     */
-    public void parseProperty(byte data[], int offset) {
-        int count = LittleEndian.getUShort(data, offset);
-        int off = offset + LittleEndianConsts.SHORT_SIZE;
-        for (int i=0; i<count; i++) {
-            int position = LittleEndian.getShort(data, off);
-            off += LittleEndianConsts.SHORT_SIZE;
-            int recVal = LittleEndian.getShort(data, off);
-            TabStopType type = TabStopType.fromRecordVal(recVal);
-            off += LittleEndianConsts.SHORT_SIZE;
-            tabStops.add(new TabStop(position, type));
-            
-        }
-    }
-    
-    @Override
-    public int getSize() {
-        return LittleEndianConsts.SHORT_SIZE + tabStops.size()*LittleEndianConsts.INT_SIZE;
-    }
-    
-    @Override
-    public TabStopPropCollection clone() {
-        TabStopPropCollection other = (TabStopPropCollection)super.clone();
-        other.tabStops = new ArrayList<TabStop>();
-        for (TabStop ts : tabStops) {
-            TabStop tso = new TabStop(ts.getPosition(), ts.getType());
-            other.tabStops.add(tso);
-        }
-        return other;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
deleted file mode 100644
index 82430f0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-/**
- * Definition for the text alignment property.
- */
-public class TextAlignmentProp extends TextProp {
-	/**
-	 * For horizontal text, left aligned.
-	 * For vertical text, top aligned.
-	 */
-    public static final int LEFT = 0;
-    
-    /**
-     * For horizontal text, centered.
-     * For vertical text, middle aligned.
-     */
-	public static final int CENTER = 1;
-	
-	/**
-	 * For horizontal text, right aligned.
-	 * For vertical text, bottom aligned.
-	 */
-	public static final int RIGHT = 2;
-	
-	/**
-	 * For horizontal text, flush left and right.
-	 * For vertical text, flush top and bottom.
-	 */
-	public static final int JUSTIFY = 3;
-	
-	/**
-	 * Distribute space between characters.
-	 */
-	public static final int DISTRIBUTED = 4;
-	
-	/**
-	 * Thai distribution justification.
-	 */
-	public static final int THAIDISTRIBUTED = 5;
-	
-	/**
-	 * Kashida justify low.
-	 */
-	public static final int JUSTIFYLOW = 6;
-
-	public TextAlignmentProp() {
-		super(2, 0x800, "alignment");
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
deleted file mode 100644
index 128bc83..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/**
- * A structure that specifies additional paragraph-level formatting
- * such as Bullet Auto Number Scheme.
- */
-package org.apache.poi.hslf.model.textproperties;
-
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This structure store text autonumber scheme and start number.
- * If a paragraph has an autonumber(fBulletHasAutoNumber = 0x0001) but start number and scheme are empty,
- * this means the default values will be used: statNumber=1 and sheme=ANM_ArabicPeriod
- * @see <a href="http://social.msdn.microsoft.com/Forums/mr-IN/os_binaryfile/thread/650888db-fabd-4b95-88dc-f0455f6e2d28">
- *     http://social.msdn.microsoft.com/Forums/mr-IN/os_binaryfile/thread/650888db-fabd-4b95-88dc-f0455f6e2d28</a>
- *
- * @author Alex Nikiforov [mailto:anikif@gmail.com]
- *
- */
-public class TextPFException9 {
-	//private final byte mask1;
-	//private final byte mask2;
-	private final byte mask3;
-	private final byte mask4;
-	private final Short bulletBlipRef;
-	private final Short fBulletHasAutoNumber;
-	private final AutoNumberingScheme autoNumberScheme;
-	private final static AutoNumberingScheme DEFAULT_AUTONUMBER_SHEME = AutoNumberingScheme.arabicPeriod;
-	private final Short autoNumberStartNumber;
-	private final static Short DEFAULT_START_NUMBER = 1;
-	private final int recordLength;
-	public TextPFException9(final byte[] source, final int startIndex) { // NOSONAR
-		//this.mask1 = source[startIndex];
-		//this.mask2 = source[startIndex + 1];
-		this.mask3 = source[startIndex + 2];
-		this.mask4 = source[startIndex + 3];
-		int length = 4;
-		int index = startIndex + 4;
-		if (0 == (mask3 & (byte)0x80 )) {
-			this.bulletBlipRef = null;
-		} else {
-			this.bulletBlipRef = LittleEndian.getShort(source, index);
-			index +=2;
-			length = 6;
-		}
-		if (0 == (mask4 & 2)) {
-			this.fBulletHasAutoNumber = null;
-		} else {
-			this.fBulletHasAutoNumber = LittleEndian.getShort(source, index);
-			index +=2;
-			length +=2;
-		}
-		if (0 == (mask4 & 1)) {
-			this.autoNumberScheme = null;
-			this.autoNumberStartNumber = null;
-		} else {
-			this.autoNumberScheme = AutoNumberingScheme.forNativeID(LittleEndian.getShort(source, index));
-			index +=2;
-			this.autoNumberStartNumber = LittleEndian.getShort(source, index);
-			index +=2;
-			length +=4;
-		}
-		this.recordLength = length;
-	}
-	public Short getBulletBlipRef() {
-		return bulletBlipRef;
-	}
-	public Short getfBulletHasAutoNumber() {
-		return fBulletHasAutoNumber;
-	}
-	public AutoNumberingScheme getAutoNumberScheme() {
-		if (null != this.autoNumberScheme) {
-			return this.autoNumberScheme;
-		}
-		if (null != this.fBulletHasAutoNumber && 1 == this.fBulletHasAutoNumber.shortValue()) {
-			return DEFAULT_AUTONUMBER_SHEME;
-		}
-		return null;
-	}
-	public Short getAutoNumberStartNumber() {
-		if (null != this.autoNumberStartNumber) {
-			return this.autoNumberStartNumber;
-		}
-		if (null != this.fBulletHasAutoNumber && 1 == this.fBulletHasAutoNumber.shortValue()) {
-			return DEFAULT_START_NUMBER;
-		}
-		return null;
-	}
-	public int getRecordLength() {
-		return recordLength;
-	}
-	@Override
-	public String toString() {
-		final StringBuilder sb = new StringBuilder("Record length: ").append(this.recordLength).append(" bytes\n");
-		sb.append("bulletBlipRef: ").append(this.bulletBlipRef).append("\n");
-		sb.append("fBulletHasAutoNumber: ").append(this.fBulletHasAutoNumber).append("\n");
-		sb.append("autoNumberScheme: ").append(this.autoNumberScheme).append("\n");
-		sb.append("autoNumberStartNumber: ").append(this.autoNumberStartNumber).append("\n");
-		return sb.toString();
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java
deleted file mode 100644
index c6d1589..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-import java.util.Locale;
-
-/** 
- * Definition of a property of some text, or its paragraph. Defines 
- * how to find out if it's present (via the mask on the paragraph or 
- * character "contains" header field), how long the value of it is, 
- * and how to get and set the value.
- * 
- * As the exact form of these (such as mask value, size of data
- *  block etc) is different for StyleTextProps and
- *  TxMasterTextProps, the definitions of the standard
- *  TextProps is stored in the different record classes 
- */
-public class TextProp implements Cloneable {
-	protected int sizeOfDataBlock; // Number of bytes the data part uses
-	protected String propName;
-	protected int dataValue;
-	protected int maskInHeader;
-
-	/** 
-	 * Generate the definition of a given type of text property.
-	 */
-	public TextProp(int sizeOfDataBlock, int maskInHeader, String propName) {
-		this.sizeOfDataBlock = sizeOfDataBlock;
-		this.maskInHeader = maskInHeader;
-		this.propName = propName;
-		this.dataValue = 0;
-	}
-
-	/**
-	 * Clones the property
-	 */
-	public TextProp(TextProp other) {
-	    this.sizeOfDataBlock = other.sizeOfDataBlock;
-	    this.maskInHeader = other.maskInHeader;
-	    this.propName = other.propName;
-	    this.dataValue = other.dataValue;
-	}
-	
-	/**
-	 * Name of the text property
-	 */
-	public String getName() { return propName; }
-
-	/**
-	 * Size of the data section of the text property (2 or 4 bytes)
-	 */
-	public int getSize() { return sizeOfDataBlock; }
-
-	/**
-	 * Mask in the paragraph or character "contains" header field
-	 *  that indicates that this text property is present.
-	 */
-	public int getMask() { return maskInHeader; }
-	/**
-	 * Get the mask that's used at write time. Only differs from
-	 *  the result of getMask() for the mask based properties 
-	 */
-	public int getWriteMask() { return getMask(); }
-
-	/**
-	 * Fetch the value of the text property (meaning is specific to
-	 *  each different kind of text property)
-	 */
-	public int getValue() { return dataValue; }
-
-	/**
-	 * Set the value of the text property.
-	 */
-	public void setValue(int val) { dataValue = val; }
-
-	/**
-	 * Clone, eg when you want to actually make use of one of these.
-	 */
-	@Override
-	public TextProp clone(){
-		try {
-			return (TextProp)super.clone();
-		} catch(CloneNotSupportedException e) {
-			throw new InternalError(e.getMessage());
-		}
-	}
-	
-	@Override
-	public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + dataValue;
-        result = prime * result + maskInHeader;
-        result = prime * result + ((propName == null) ? 0 : propName.hashCode());
-        result = prime * result + sizeOfDataBlock;
-        return result;
-    }
-
-	@Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TextProp other = (TextProp) obj;
-        if (dataValue != other.dataValue) {
-            return false;
-        }
-        if (maskInHeader != other.maskInHeader) {
-            return false;
-        }
-        if (propName == null) {
-            if (other.propName != null) {
-                return false;
-            }
-        } else if (!propName.equals(other.propName)) {
-            return false;
-        }
-        if (sizeOfDataBlock != other.sizeOfDataBlock) {
-            return false;
-        }
-        return true;
-    }
-    
-    @Override
-    public String toString() {
-        int len;
-        switch (sizeOfDataBlock) {
-        case 1: len = 4; break;
-        case 2: len = 6; break;
-        default: len = 10; break;
-        }
-        return String.format(Locale.ROOT, "%s = %d (%0#"+len+"X mask / %d bytes)", propName, dataValue, maskInHeader, sizeOfDataBlock);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
deleted file mode 100644
index e82b966..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.record.StyleTextPropAtom;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * For a given run of characters, holds the properties (which could
- *  be paragraph properties or character properties).
- * Used to hold the number of characters affected, the list of active
- *  properties, and the indent level if required.
- */
-public class TextPropCollection {
-    private static final POILogger LOG = POILogFactory.getLogger(TextPropCollection.class);
-    
-    /** All the different kinds of paragraph properties we might handle */
-    private static final TextProp[] paragraphTextPropTypes = {
-        // TextProp order is according to 2.9.20 TextPFException,
-        // bitmask order can be different
-        new ParagraphFlagsTextProp(),
-        new TextProp(2, 0x80, "bullet.char"),
-        new TextProp(2, 0x10, "bullet.font"),
-        new TextProp(2, 0x40, "bullet.size"),
-        new TextProp(4, 0x20, "bullet.color"),
-        new TextAlignmentProp(),
-        new TextProp(2, 0x1000, "linespacing"),
-        new TextProp(2, 0x2000, "spacebefore"),
-        new TextProp(2, 0x4000, "spaceafter"),
-        new TextProp(2, 0x100, "text.offset"), // left margin
-        // 0x200 - Undefined and MUST be ignored
-        new TextProp(2, 0x400, "bullet.offset"), // indent
-        new TextProp(2, 0x8000, "defaultTabSize"),
-        new TabStopPropCollection(), // tabstops size is variable!
-        new FontAlignmentProp(),
-        new WrapFlagsTextProp(),
-        new TextProp(2, 0x200000, "textDirection"),
-        // 0x400000 MUST be zero and MUST be ignored
-        new TextProp(0, 0x800000, "bullet.blip"), // TODO: check size
-        new TextProp(0, 0x1000000, "bullet.scheme"), // TODO: check size
-        new TextProp(0, 0x2000000, "hasBulletScheme"), // TODO: check size
-        // 0xFC000000 MUST be zero and MUST be ignored
-    };
-    
-    /** All the different kinds of character properties we might handle */
-    private static final TextProp[] characterTextPropTypes = new TextProp[] {
-        new TextProp(0, 0x100000, "pp10ext"),
-        new TextProp(0, 0x1000000, "newAsian.font.index"), // A bit that specifies whether the newEAFontRef field of the TextCFException10 structure that contains this CFMasks exists.
-        new TextProp(0, 0x2000000, "cs.font.index"), // A bit that specifies whether the csFontRef field of the TextCFException10 structure that contains this CFMasks exists.
-        new TextProp(0, 0x4000000, "pp11ext"), // A bit that specifies whether the pp11ext field of the TextCFException10 structure that contains this CFMasks exists.
-        new CharFlagsTextProp(),
-        new TextProp(2, 0x10000, "font.index"),
-        new TextProp(2, 0x200000, "asian.font.index"),
-        new TextProp(2, 0x400000, "ansi.font.index"),
-        new TextProp(2, 0x800000, "symbol.font.index"),
-        new TextProp(2, 0x20000, "font.size"),
-        new TextProp(4, 0x40000, "font.color"),
-        new TextProp(2, 0x80000, "superscript")
-    };
-
-    public enum TextPropType {
-        paragraph, character
-    }
-    
-    private int charactersCovered;
-	
-    // indentLevel is only valid for paragraph collection
-    // if it's set to -1, it must be omitted - see 2.9.36 TextMasterStyleLevel
-    private short indentLevel = 0;
-	private final Map<String,TextProp> textProps = new HashMap<String,TextProp>();
-    private int maskSpecial = 0;
-    private final TextPropType textPropType;
-    
-    /**
-     * Create a new collection of text properties (be they paragraph
-     *  or character) which will be groked via a subsequent call to
-     *  buildTextPropList().
-     */
-    public TextPropCollection(int charactersCovered, TextPropType textPropType) {
-        this.charactersCovered = charactersCovered;
-        this.textPropType = textPropType;
-    }
-
-    public int getSpecialMask() {
-        return maskSpecial;
-    }
-
-	/** Fetch the number of characters this styling applies to */
-	public int getCharactersCovered() {
-	    return charactersCovered;
-    }
-
-	/** Fetch the TextProps that define this styling in the record order */
-	public List<TextProp> getTextPropList() {
-	    List<TextProp> orderedList = new ArrayList<TextProp>();
-        for (TextProp potProp : getPotentialProperties()) {
-            TextProp textProp = textProps.get(potProp.getName());
-            if (textProp != null) {
-                orderedList.add(textProp);
-            }
-        }
-	    return orderedList;
-    }
-	
-	/** Fetch the TextProp with this name, or null if it isn't present */
-	public final TextProp findByName(String textPropName) {
-		return textProps.get(textPropName);
-	}
-
-	public final TextProp removeByName(String name) {
-	    return textProps.remove(name);
-	}
-	
-	public final TextPropType getTextPropType() {
-	    return textPropType;
-	}
-	
-	private TextProp[] getPotentialProperties() {
-	    return (textPropType == TextPropType.paragraph) ? paragraphTextPropTypes : characterTextPropTypes;
-	}
-
-	/**
-	 * Checks the paragraph or character properties for the given property name.
-	 * Throws a HSLFException, if the name doesn't belong into this set of properties 
-	 *
-	 * @param name the property name
-	 * @return if found, the property template to copy from
-	 */
-	private TextProp validatePropName(String name) {
-       for (TextProp tp : getPotentialProperties()) {
-            if (tp.getName().equals(name)) {
-                return tp;
-            }
-        }
-       String errStr = 
-           "No TextProp with name " + name + " is defined to add from. " +
-           "Character and paragraphs have their own properties/names.";
-       throw new HSLFException(errStr);       
-	}
-	
-    /** Add the TextProp with this name to the list */
-    public final TextProp addWithName(String name) {
-        // Find the base TextProp to base on
-        TextProp existing = findByName(name);
-        if (existing != null) return existing;
-        
-        // Add a copy of this property
-        TextProp textProp = validatePropName(name).clone();
-        textProps.put(name,textProp);
-        return textProp;
-    }
-
-	/**
-	 * Add the property at the correct position. Replaces an existing property with the same name.
-	 *
-	 * @param textProp the property to be added
-	 */
-	public final void addProp(TextProp textProp) {
-	    if (textProp == null) {
-	        throw new HSLFException("TextProp must not be null");
-	    }
-
-	    String propName = textProp.getName();
-	    validatePropName(propName);
-	    
-	    textProps.put(propName, textProp);
-	}
-
-	/**
-	 * For an existing set of text properties, build the list of 
-	 *  properties coded for in a given run of properties.
-	 * @return the number of bytes that were used encoding the properties list
-	 */
-	public int buildTextPropList(int containsField, byte[] data, int dataOffset) {
-		int bytesPassed = 0;
-
-		// For each possible entry, see if we match the mask
-		// If we do, decode that, save it, and shuffle on
-		for(TextProp tp : getPotentialProperties()) {
-			// Check there's still data left to read
-
-			// Check if this property is found in the mask
-			if((containsField & tp.getMask()) != 0) {
-                if(dataOffset+bytesPassed >= data.length) {
-                    // Out of data, can't be any more properties to go
-                    // remember the mask and return
-                    maskSpecial |= tp.getMask();
-                    return bytesPassed;
-                }
-
-				// Bingo, data contains this property
-				TextProp prop = tp.clone();
-				int val = 0;
-				if (prop.getSize() == 2) {
-					val = LittleEndian.getShort(data,dataOffset+bytesPassed);
-				} else if(prop.getSize() == 4) {
-					val = LittleEndian.getInt(data,dataOffset+bytesPassed);
-				} else if (prop.getSize() == 0 && !(prop instanceof TabStopPropCollection)) {
-                    //remember "special" bits.
-                    maskSpecial |= tp.getMask();
-                    continue;
-                }
-				
-				if (prop instanceof BitMaskTextProp) {
-				    ((BitMaskTextProp)prop).setValueWithMask(val, containsField);
-				} else if (prop instanceof TabStopPropCollection) {
-				    ((TabStopPropCollection)prop).parseProperty(data, dataOffset+bytesPassed);
-				} else {
-				    prop.setValue(val);
-				}
-				bytesPassed += prop.getSize();
-				addProp(prop);
-			}
-		}
-
-		// Return how many bytes were used
-		return bytesPassed;
-	}
-
-    /**
-     * Clones the given text properties
-     */
-	public void copy(TextPropCollection other) {
-	    if (other == null) {
-	        throw new HSLFException("trying to copy null TextPropCollection");
-	    }
-	    if (this == other) return;
-        this.charactersCovered = other.charactersCovered;
-        this.indentLevel = other.indentLevel;
-        this.maskSpecial = other.maskSpecial;
-        this.textProps.clear();
-        for (TextProp tp : other.textProps.values()) {
-            TextProp tpCopy = (tp instanceof BitMaskTextProp)
-                ? ((BitMaskTextProp)tp).cloneAll()
-                : tp.clone();
-            addProp(tpCopy);
-        }
-	}
-	
-	/**
-	 * Update the size of the text that this set of properties
-	 *  applies to 
-	 */
-	public void updateTextSize(int textSize) {
-		charactersCovered = textSize;
-	}
-
-	   /**
-     * Writes out to disk the header, and then all the properties
-     */
-    public void writeOut(OutputStream o) throws IOException {
-        writeOut(o, false);
-    }
-	
-	/**
-	 * Writes out to disk the header, and then all the properties
-	 */
-	public void writeOut(OutputStream o, boolean isMasterStyle) throws IOException {
-	    if (!isMasterStyle) {
-	        // First goes the number of characters we affect
-	        // MasterStyles don't have this field
-	        StyleTextPropAtom.writeLittleEndian(charactersCovered,o);
-	    }
-
-		// Then we have the indentLevel field if it's a paragraph collection
-		if (textPropType == TextPropType.paragraph && indentLevel > -1) {
-			StyleTextPropAtom.writeLittleEndian(indentLevel, o);
-		}
-
-		// Then the mask field
-		int mask = maskSpecial;
-		for (TextProp textProp : textProps.values()) {
-            mask |= textProp.getWriteMask();
-        }
-		StyleTextPropAtom.writeLittleEndian(mask,o);
-
-		// Then the contents of all the properties
-		for (TextProp textProp : getTextPropList()) {
-            int val = textProp.getValue();
-            if (textProp instanceof BitMaskTextProp && textProp.getWriteMask() == 0) {
-                // don't add empty properties, as they can't be recognized while reading
-                continue;
-            } else if (textProp.getSize() == 2) {
-                StyleTextPropAtom.writeLittleEndian((short)val,o);
-            } else if (textProp.getSize() == 4) {
-                StyleTextPropAtom.writeLittleEndian(val,o);
-            }
-		}
-	}
-
-    public short getIndentLevel(){
-        return indentLevel;
-    }
-
-    public void setIndentLevel(short indentLevel) {
-        if (textPropType == TextPropType.character) {
-            throw new RuntimeException("trying to set an indent on a character collection.");
-        }
-        this.indentLevel = indentLevel;
-    }
-    
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + charactersCovered;
-        result = prime * result + maskSpecial;
-        result = prime * result + indentLevel;
-        result = prime * result + ((textProps == null) ? 0 : textProps.hashCode());
-        return result;
-    }
-    /**
-     * compares most properties apart of the covered characters length
-     */
-    public boolean equals(Object other) {
-        if (this == other) return true;
-        if (other == null) return false;
-        if (getClass() != other.getClass()) return false;
-        
-        TextPropCollection o = (TextPropCollection)other;
-        if (o.maskSpecial != this.maskSpecial || o.indentLevel != this.indentLevel) {
-            return false;
-        }
-
-        return textProps.equals(o.textProps);
-    }
-
-    public String toString() {
-        StringBuilder out = new StringBuilder();
-        out.append("  chars covered: " + getCharactersCovered());
-        out.append("  special mask flags: 0x" + HexDump.toHex(getSpecialMask()) + "\n");
-        if (textPropType == TextPropType.paragraph) {
-            out.append("  indent level: "+getIndentLevel()+"\n");
-        }
-        for(TextProp p : getTextPropList()) {
-            out.append("    " + p.getName() + " = " + p.getValue() );
-            out.append(" (0x" + HexDump.toHex(p.getValue()) + ")\n");
-            if (p instanceof BitMaskTextProp) {
-                BitMaskTextProp bm = (BitMaskTextProp)p;
-                int i = 0;
-                for (String s : bm.getSubPropNames()) {
-                    if (bm.getSubPropMatches()[i]) {
-                        out.append("          " + s + " = " + bm.getSubValue(i) + "\n");
-                    }
-                    i++;
-                }
-            }
-        }
-
-        out.append("  bytes that would be written: \n");
-
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            writeOut(baos);
-            byte[] b = baos.toByteArray();
-            out.append(HexDump.dump(b, 0, 0));
-        } catch (IOException e ) {
-            LOG.log(POILogger.ERROR, "can't dump TextPropCollection", e);
-        }
-        
-        return out.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
deleted file mode 100644
index eaacbff..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model.textproperties;
-
-public class WrapFlagsTextProp extends BitMaskTextProp {
-    public static final int CHAR_WRAP_IDX = 0;
-    public static final int WORD_WRAO_IDX = 1;
-    public static final int OVERFLOW_IDX = 2;
-    
-    public static final String NAME = "wrapFlags";
-    
-    public WrapFlagsTextProp() {
-        super(2, 0xE0000, NAME, "charWrap", "wordWrap", "overflow");
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
deleted file mode 100644
index e9dc5cd..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * A container record that specifies information about animation information for a shape.
- *
- * @author Yegor Kozlov
- */
-public final class AnimationInfo extends RecordContainer {
-	private byte[] _header;
-
-	// Links to our more interesting children
-	private AnimationInfoAtom animationAtom;
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected AnimationInfo(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-		findInterestingChildren();
-	}
-
-	/**
-	 * Go through our child records, picking out the ones that are
-	 *  interesting, and saving those for use by the easy helper
-	 *  methods.
-	 */
-	private void findInterestingChildren() {
-
-		// First child should be the ExMediaAtom
-		if(_children[0] instanceof AnimationInfoAtom) {
-			animationAtom = (AnimationInfoAtom)_children[0];
-		} else {
-			logger.log(POILogger.ERROR, "First child record wasn't a AnimationInfoAtom, was of type " + _children[0].getRecordType());
-		}
-	}
-
-	/**
-	 * Create a new AnimationInfo, with blank fields
-	 */
-	public AnimationInfo() {
-        // Setup our header block
-		_header = new byte[8];
-		_header[0] = 0x0f; // We are a container record
-		LittleEndian.putShort(_header, 2, (short)getRecordType());
-
-        _children = new Record[1];
-		_children[0] = animationAtom = new AnimationInfoAtom();
-	}
-
-	/**
-	 * We are of type 4103
-	 */
-	public long getRecordType() { return RecordTypes.AnimationInfo.typeID; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],getRecordType(),_children,out);
-	}
-
-    /**
-     * Returns the AnimationInfo
-     */
-    public AnimationInfoAtom getAnimationInfoAtom() {
-        return animationAtom;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java
deleted file mode 100644
index a2ed09c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An atom record that specifies the animation information for a shape.
- *
- * @author Yegor Kozlov
- */
-public final class AnimationInfoAtom extends RecordAtom {
-
-    /**
-     * whether the animation plays in the reverse direction
-     */
-    public static final int Reverse = 1;
-    /**
-     * whether the animation starts automatically
-     */
-    public static final int Automatic = 4;
-    /**
-     * whether the animation has an associated sound
-     */
-    public static final int Sound = 16;
-    /**
-     * whether all playing sounds are stopped when this animation begins
-     */
-    public static final int StopSound = 64;
-    /**
-     * whether an associated sound, media or action verb is activated when the shape is clicked.
-     */
-    public static final int Play = 256;
-    /**
-     * specifies that the animation, while playing, stops other slide show actions.
-     */
-    public static final int Synchronous = 1024;
-    /**
-     * whether the shape is hidden while the animation is not playing
-     */
-    public static final int Hide = 4096;
-    /**
-     * whether the background of the shape is animated
-     */
-    public static final int AnimateBg = 16384;
-
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * record data
-     */
-    private byte[] _recdata;
-
-    /**
-     * Constructs a brand new link related atom record.
-     */
-    protected AnimationInfoAtom() {
-        _recdata = new byte[28];
-
-        _header = new byte[8];
-        LittleEndian.putShort(_header, 0, (short)0x01);
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _recdata.length);
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected AnimationInfoAtom(byte[] source, int start, int len) {
-        // Get the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Grab the record data
-        _recdata = new byte[len-8];
-        System.arraycopy(source,start+8,_recdata,0,len-8);
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.AnimationInfoAtom.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_recdata);
-    }
-
-    /**
-     * A rgb structure that specifies a color for the dim effect after the animation is complete.
-     *
-     * @return  color for the dim effect after the animation is complete
-     */
-    public int getDimColor(){
-        return LittleEndian.getInt(_recdata, 0);
-    }
-
-    /**
-     * A rgb structure that specifies a color for the dim effect after the animation is complete.
-     *
-     * @param rgb  color for the dim effect after the animation is complete
-     */
-    public void setDimColor(int rgb){
-         LittleEndian.putInt(_recdata, 0, rgb);
-    }
-
-    /**
-     *  A bit mask specifying options for displaying headers and footers
-     *
-     * @return A bit mask specifying options for displaying headers and footers
-     */
-    public int getMask(){
-        return LittleEndian.getInt(_recdata, 4);
-    }
-
-    /**
-     *  A bit mask specifying options for displaying video
-     *
-     * @param mask A bit mask specifying options for displaying video
-     */
-    public void setMask(int mask){
-        LittleEndian.putInt(_recdata, 4, mask);
-    }
-
-    /**
-     * @param bit the bit to check
-     * @return whether the specified flag is set
-     */
-    public boolean getFlag(int bit){
-        return (getMask() & bit) != 0;
-    }
-
-    /**
-     * @param  bit the bit to set
-     * @param  value whether the specified bit is set
-     */
-    public void setFlag(int bit, boolean value){
-        int mask = getMask();
-        if(value) mask |= bit;
-        else mask &= ~bit;
-        setMask(mask);
-    }
-
-    /**
-     * A 4-byte unsigned integer that specifies a reference to a sound
-     * in the SoundCollectionContainer record to locate the embedded audio
-     *
-     * @return  reference to a sound
-     */
-    public int getSoundIdRef(){
-        return LittleEndian.getInt(_recdata, 8);
-    }
-
-    /**
-     * A 4-byte unsigned integer that specifies a reference to a sound
-     * in the SoundCollectionContainer record to locate the embedded audio
-     *
-     * @param id reference to a sound
-     */
-    public void setSoundIdRef(int id){
-         LittleEndian.putInt(_recdata, 8, id);
-    }
-
-    /**
-     * A signed integer that specifies the delay time, in milliseconds, before the animation starts to play.
-     * If {@link #Automatic} is 0x1, this value MUST be greater than or equal to 0; otherwise, this field MUST be ignored.
-     */
-    public int getDelayTime(){
-        return LittleEndian.getInt(_recdata, 12);
-    }
-    /**
-     * A signed integer that specifies the delay time, in milliseconds, before the animation starts to play.
-     * If {@link #Automatic} is 0x1, this value MUST be greater than or equal to 0; otherwise, this field MUST be ignored.
-     */
-    public void setDelayTime(int id){
-         LittleEndian.putInt(_recdata, 12, id);
-    }
-
-    /**
-     * A signed integer that specifies the order of the animation in the slide.
-     * It MUST be greater than or equal to -2. The value -2 specifies that this animation follows the order of
-     * the corresponding placeholder shape on the main master slide or title master slide.
-     * The value -1 SHOULD NOT <105> be used.
-     */
-    public int getOrderID(){
-        return LittleEndian.getInt(_recdata, 16);
-    }
-
-    /**
-     * A signed integer that specifies the order of the animation in the slide.
-     * It MUST be greater than or equal to -2. The value -2 specifies that this animation follows the order of
-     * the corresponding placeholder shape on the main master slide or title master slide.
-     * The value -1 SHOULD NOT <105> be used.
-     */
-    public void setOrderID(int id){
-         LittleEndian.putInt(_recdata, 16, id);
-    }
-
-    /**
-     * An unsigned integer that specifies the number of slides that this animation continues playing.
-     * This field is utilized only in conjunction with media.
-     * The value 0xFFFFFFFF specifies that the animation plays for one slide.
-     */
-    public int getSlideCount(){
-        return LittleEndian.getInt(_recdata, 18);
-    }
-
-    /**
-     * An unsigned integer that specifies the number of slides that this animation continues playing.
-     * This field is utilized only in conjunction with media.
-     * The value 0xFFFFFFFF specifies that the animation plays for one slide.
-     */
-    public void setSlideCount(int id){
-         LittleEndian.putInt(_recdata, 18, id);
-    }
-
-    public String toString(){
-        StringBuffer buf = new StringBuffer();
-        buf.append("AnimationInfoAtom\n");
-        buf.append("\tDimColor: " + getDimColor() + "\n");
-        int mask = getMask();
-        buf.append("\tMask: " + mask + ", 0x"+Integer.toHexString(mask)+"\n");
-        buf.append("\t  Reverse: " + getFlag(Reverse)+"\n");
-        buf.append("\t  Automatic: " + getFlag(Automatic)+"\n");
-        buf.append("\t  Sound: " + getFlag(Sound)+"\n");
-        buf.append("\t  StopSound: " + getFlag(StopSound)+"\n");
-        buf.append("\t  Play: " + getFlag(Play)+"\n");
-        buf.append("\t  Synchronous: " + getFlag(Synchronous)+"\n");
-        buf.append("\t  Hide: " + getFlag(Hide)+"\n");
-        buf.append("\t  AnimateBg: " + getFlag(AnimateBg)+"\n");
-        buf.append("\tSoundIdRef: " + getSoundIdRef() + "\n");
-        buf.append("\tDelayTime: " + getDelayTime() + "\n");
-        buf.append("\tOrderID: " + getOrderID() + "\n");
-        buf.append("\tSlideCount: " + getSlideCount() + "\n");
-        return buf.toString();
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java
deleted file mode 100644
index 160e2bd..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * If we come across a record we know has children of (potential)
- *  interest, but where the record itself is boring, but where other
- *  records may care about where this one lives, we create one
- *  of these. It allows us to get at the children, and track where on
- *  disk this is, but not much else.
- * Anything done using this should quite quickly be transitioned to its
- *  own proper record class!
- *
- * @author Nick Burch
- */
-
-public final class BinaryTagDataBlob extends PositionDependentRecordContainer
-{
-	private byte[] _header;
-	private long _type;
-
-	/**
-	 * Create a new holder for a boring record with children, but with
-	 *  position dependent characteristics
-	 */
-	protected BinaryTagDataBlob(byte[] source, int start, int len) {
-		// Just grab the header, not the whole contents
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-		_type = LittleEndian.getUShort(_header,2);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-	}
-
-	/**
-	 * Return the value we were given at creation
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CString.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CString.java
deleted file mode 100644
index 0115438..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CString.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
-/**
- * A CString (type 4026). Holds a unicode string, and the first two bytes
- *  of the record header normally encode the count. Typically attached to
- *  some complex sequence of records, eg Commetns.
- *
- * @author Nick Burch
- */
-
-public final class CString extends RecordAtom {
-	private byte[] _header;
-	private static long _type = 4026l;
-
-	/** The bytes that make up the text */
-	private byte[] _text;
-
-	/** Grabs the text. Never <code>null</code> */
-	public String getText() {
-		return StringUtil.getFromUnicodeLE(_text);
-	}
-
-	/** Updates the text in the Atom. */
-	public void setText(String text) {
-		// Convert to little endian unicode
-		_text = new byte[text.length()*2];
-		StringUtil.putUnicodeLE(text,_text,0);
-
-		// Update the size (header bytes 5-8)
-		LittleEndian.putInt(_header,4,_text.length);
-	}
-
-	/**
-	 * Grabs the count, from the first two bytes of the header.
-	 * The meaning of the count is specific to the type of the parent record
-	 */
-	public int getOptions() {
-		return LittleEndian.getShort(_header);
-	}
-
-	/**
-	 * Sets the count
-	 * The meaning of the count is specific to the type of the parent record
-	 */
-	public void setOptions(int count) {
-		LittleEndian.putShort(_header, 0, (short)count);
-	}
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the CStrubg Atom
-	 */
-	protected CString(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 8) { len = 8; }
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the text
-		_text = new byte[len-8];
-		System.arraycopy(source,start+8,_text,0,len-8);
-	}
-	/**
-	 * Create an empty CString
-	 */
-	public CString() {
-		// 0 length header
-		_header = new byte[] {  0, 0, 0xBA-256, 0x0f, 0, 0, 0, 0 };
-		// Empty text
-		_text = new byte[0];
-	}
-
-	/**
-	 * We are of type 4026
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header - size or type unchanged
-		out.write(_header);
-
-		// Write out our text
-		out.write(_text);
-	}
-
-    /**
-     * Gets a string representation of this object, primarily for debugging.
-     * @return a string representation of this object.
-     */
-    public String toString() {
-        return getText();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java
deleted file mode 100644
index 9d14b7b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * A ColorSchemeAtom (type 2032). Holds the 8 RGB values for the different
- *  colours of bits of text, that makes up a given colour scheme.
- * Slides (presumably) link to a given colour scheme atom, and that
- *  defines the colours to be used
- *
- * @author Nick Burch
- */
-public final class ColorSchemeAtom extends RecordAtom {
-	private byte[] _header;
-	private static long _type = 2032l;
-
-	private int backgroundColourRGB;
-	private int textAndLinesColourRGB;
-	private int shadowsColourRGB;
-	private int titleTextColourRGB;
-	private int fillsColourRGB;
-	private int accentColourRGB;
-	private int accentAndHyperlinkColourRGB;
-	private int accentAndFollowingHyperlinkColourRGB;
-
-	/** Fetch the RGB value for Background Colour */
-	public int getBackgroundColourRGB() { return backgroundColourRGB; }
-	/** Set the RGB value for Background Colour */
-	public void setBackgroundColourRGB(int rgb) { backgroundColourRGB = rgb; }
-
-	/** Fetch the RGB value for Text And Lines Colour */
-	public int getTextAndLinesColourRGB() { return textAndLinesColourRGB; }
-	/** Set the RGB value for Text And Lines Colour */
-	public void setTextAndLinesColourRGB(int rgb) { textAndLinesColourRGB = rgb; }
-
-	/** Fetch the RGB value for Shadows Colour */
-	public int getShadowsColourRGB() { return shadowsColourRGB; }
-	/** Set the RGB value for Shadows Colour */
-	public void setShadowsColourRGB(int rgb) { shadowsColourRGB = rgb; }
-
-	/** Fetch the RGB value for Title Text Colour */
-	public int getTitleTextColourRGB() { return titleTextColourRGB; }
-	/** Set the RGB value for Title Text Colour */
-	public void setTitleTextColourRGB(int rgb) { titleTextColourRGB = rgb; }
-
-	/** Fetch the RGB value for Fills Colour */
-	public int getFillsColourRGB() { return fillsColourRGB; }
-	/** Set the RGB value for Fills Colour */
-	public void setFillsColourRGB(int rgb) { fillsColourRGB = rgb; }
-
-	/** Fetch the RGB value for Accent Colour */
-	public int getAccentColourRGB() { return accentColourRGB; }
-	/** Set the RGB value for Accent Colour */
-	public void setAccentColourRGB(int rgb) { accentColourRGB = rgb; }
-
-	/** Fetch the RGB value for Accent And Hyperlink Colour */
-	public int getAccentAndHyperlinkColourRGB()
-		{ return accentAndHyperlinkColourRGB; }
-	/** Set the RGB value for Accent And Hyperlink Colour */
-	public void setAccentAndHyperlinkColourRGB(int rgb)
-			{ accentAndHyperlinkColourRGB = rgb; }
-
-	/** Fetch the RGB value for Accent And Following Hyperlink Colour */
-	public int getAccentAndFollowingHyperlinkColourRGB()
-		{ return accentAndFollowingHyperlinkColourRGB; }
-	/** Set the RGB value for Accent And Following Hyperlink Colour */
-	public void setAccentAndFollowingHyperlinkColourRGB(int rgb)
-			{ accentAndFollowingHyperlinkColourRGB = rgb; }
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the Colour Scheme (ColorSchem) Atom
-	 */
-	protected ColorSchemeAtom(byte[] source, int start, int len) {
-		// Sanity Checking - we're always 40 bytes long
-		if(len < 40) {
-			len = 40;
-			if(source.length - start < 40) {
-				throw new RuntimeException("Not enough data to form a ColorSchemeAtom (always 40 bytes long) - found " + (source.length - start));
-			}
-		}
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the rgb values
-		backgroundColourRGB = LittleEndian.getInt(source,start+8+0);
-		textAndLinesColourRGB = LittleEndian.getInt(source,start+8+4);
-		shadowsColourRGB = LittleEndian.getInt(source,start+8+8);
-		titleTextColourRGB = LittleEndian.getInt(source,start+8+12);
-		fillsColourRGB = LittleEndian.getInt(source,start+8+16);
-		accentColourRGB = LittleEndian.getInt(source,start+8+20);
-		accentAndHyperlinkColourRGB = LittleEndian.getInt(source,start+8+24);
-		accentAndFollowingHyperlinkColourRGB = LittleEndian.getInt(source,start+8+28);
-	}
-
-	/**
-	 * Create a new ColorSchemeAtom, to go with a new Slide
-	 */
-	public ColorSchemeAtom(){
-		_header = new byte[8];
-		LittleEndian.putUShort(_header, 0, 16);
-		LittleEndian.putUShort(_header, 2, (int)_type);
-		LittleEndian.putInt(_header, 4, 32);
-
-		// Setup the default rgb values
-		backgroundColourRGB = 16777215;
-		textAndLinesColourRGB = 0;
-		shadowsColourRGB = 8421504;
-		titleTextColourRGB = 0;
-		fillsColourRGB = 10079232;
-		accentColourRGB = 13382451;
-		accentAndHyperlinkColourRGB = 16764108;
-		accentAndFollowingHyperlinkColourRGB = 11711154;
-	}
-
-
-	/**
-	 * We are of type 3999
-	 */
-	public long getRecordType() { return _type; }
-
-
-	/**
-	 * Convert from an integer RGB value to individual R, G, B 0-255 values
-	 */
-	public static byte[] splitRGB(int rgb) {
-		byte[] ret = new byte[3];
-
-		// Serialise to bytes, then grab the right ones out
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		try {
-			writeLittleEndian(rgb,baos);
-		} catch(IOException ie) {
-			// Should never happen
-			throw new RuntimeException(ie);
-		}
-		byte[] b = baos.toByteArray();
-		System.arraycopy(b,0,ret,0,3);
-
-		return ret;
-	}
-
-	/**
-	 * Convert from split R, G, B values to an integer RGB value
-	 */
-	public static int joinRGB(byte r, byte g, byte b) {
-		return joinRGB(new byte[] { r,g,b });
-	}
-	/**
-	 * Convert from split R, G, B values to an integer RGB value
-	 */
-	public static int joinRGB(byte[] rgb) {
-		if(rgb.length != 3) {
-			throw new RuntimeException("joinRGB accepts a byte array of 3 values, but got one of " + rgb.length + " values!");
-		}
-		byte[] with_zero = new byte[4];
-		System.arraycopy(rgb,0,with_zero,0,3);
-		with_zero[3] = 0;
-		int ret = LittleEndian.getInt(with_zero,0);
-		return ret;
-	}
-
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header - size or type unchanged
-		out.write(_header);
-
-		// Write out the rgb values
-		writeLittleEndian(backgroundColourRGB,out);
-		writeLittleEndian(textAndLinesColourRGB,out);
-		writeLittleEndian(shadowsColourRGB,out);
-		writeLittleEndian(titleTextColourRGB,out);
-		writeLittleEndian(fillsColourRGB,out);
-		writeLittleEndian(accentColourRGB,out);
-		writeLittleEndian(accentAndHyperlinkColourRGB,out);
-		writeLittleEndian(accentAndFollowingHyperlinkColourRGB,out);
-	}
-
-	/**
-	 * Returns color by its index
-	 *
-	 * @param idx 0-based color index
-	 * @return color by its index
-	 */
-	public int getColor(int idx){
-		int[] clr = {backgroundColourRGB, textAndLinesColourRGB, shadowsColourRGB, titleTextColourRGB,
-				fillsColourRGB, accentColourRGB, accentAndHyperlinkColourRGB, accentAndFollowingHyperlinkColourRGB};
-		return clr[idx];
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
deleted file mode 100644
index b64134b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class represents a comment on a slide, in the format used by
- *  PPT 2000/XP/etc. (PPT 97 uses plain Escher Text Boxes for comments)
- * @author Nick Burch
- */
-public final class Comment2000 extends RecordContainer {
-	private byte[] _header;
-	private static long _type = 12000;
-
-	// Links to our more interesting children
-
-    /**
-     * An optional string that specifies the name of the author of the presentation comment.
-     */
-    private CString authorRecord;
-    /**
-     * An optional string record that specifies the text of the presentation comment
-     */
-    private CString authorInitialsRecord;
-    /**
-     * An optional string record that specifies the initials of the author of the presentation comment
-     */
-    private CString commentRecord;
-
-    /**
-     * A Comment2000Atom record that specifies the settings for displaying the presentation comment
-     */
-    private Comment2000Atom commentAtom;
-
-	/**
-	 * Returns the Comment2000Atom of this Comment
-	 */
-	public Comment2000Atom getComment2000Atom() { return commentAtom; }
-
-	/**
-	 * Get the Author of this comment
-	 */
-	public String getAuthor() {
-		return authorRecord == null ? null : authorRecord.getText();
-	}
-	/**
-	 * Set the Author of this comment
-	 */
-	public void setAuthor(String author) {
-		authorRecord.setText(author);
-	}
-
-	/**
-	 * Get the Author's Initials of this comment
-	 */
-	public String getAuthorInitials() {
-		return authorInitialsRecord == null ? null : authorInitialsRecord.getText();
-	}
-	/**
-	 * Set the Author's Initials of this comment
-	 */
-	public void setAuthorInitials(String initials) {
-		authorInitialsRecord.setText(initials);
-	}
-
-	/**
-	 * Get the text of this comment
-	 */
-	public String getText() {
-		return commentRecord == null ? null : commentRecord.getText();
-	}
-	/**
-	 * Set the text of this comment
-	 */
-	public void setText(String text) {
-		commentRecord.setText(text);
-	}
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected Comment2000(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-		findInterestingChildren();
-	}
-
-	/**
-	 * Go through our child records, picking out the ones that are
-	 *  interesting, and saving those for use by the easy helper
-	 *  methods.
-	 */
-	private void findInterestingChildren() {
-
-        for(Record r : _children){
-            if (r instanceof CString){
-                CString cs = (CString)r;
-                int recInstance = cs.getOptions() >> 4;
-                switch(recInstance){
-                    case 0: authorRecord = cs; break;
-                    case 1: commentRecord = cs; break;
-                    case 2: authorInitialsRecord = cs; break;
-                    default: break;
-                }
-            } else if (r instanceof Comment2000Atom){
-                commentAtom = (Comment2000Atom)r;
-            } else {
-                logger.log(POILogger.WARN, "Unexpected record with type="+r.getRecordType()+" in Comment2000: " + r.getClass().getName());
-            }
-        }
-
-	}
-
-	/**
-	 * Create a new Comment2000, with blank fields
-	 */
-	public Comment2000() {
-		_header = new byte[8];
-		_children = new Record[4];
-
-		// Setup our header block
-		_header[0] = 0x0f; // We are a container record
-		LittleEndian.putShort(_header, 2, (short)_type);
-
-		// Setup our child records
-		CString csa = new CString();
-		CString csb = new CString();
-		CString csc = new CString();
-		csa.setOptions(0x00);
-		csb.setOptions(0x10);
-		csc.setOptions(0x20);
-		_children[0] = csa;
-		_children[1] = csb;
-		_children[2] = csc;
-		_children[3] = new Comment2000Atom();
-		findInterestingChildren();
-	}
-
-	/**
-	 * We are of type 1200
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
deleted file mode 100644
index ab38e88..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Date;
-
-import org.apache.poi.hslf.util.SystemTimeUtils;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An atomic record containing information about a comment.
- *
- * @author Daniel Noll
- */
-
-public final class Comment2000Atom extends RecordAtom
-{
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a brand new comment atom record.
-     */
-    protected Comment2000Atom() {
-        _header = new byte[8];
-        _data = new byte[28];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-
-        // It is fine for the other values to be zero
-    }
-
-    /**
-     * Constructs the comment atom record from its source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected Comment2000Atom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-    }
-
-    /**
-     * Gets the comment number (note - each user normally has their own count).
-     * @return the comment number.
-     */
-    public int getNumber() {
-        return LittleEndian.getInt(_data,0);
-    }
-
-    /**
-     * Sets the comment number (note - each user normally has their own count).
-     * @param number the comment number.
-     */
-    public void setNumber(int number) {
-        LittleEndian.putInt(_data,0,number);
-    }
-
-    /**
-     * Gets the date the comment was made.
-     * @return the comment date.
-     */
-    public Date getDate() {
-    	return SystemTimeUtils.getDate(_data,4);
-    }
-
-    /**
-     * Sets the date the comment was made.
-     * @param date the comment date.
-     */
-    public void setDate(Date date) {
-    	SystemTimeUtils.storeDate(date, _data, 4);
-    }
-
-    /**
-     * Gets the X offset of the comment on the page.
-     * @return the X offset.
-     */
-    public int getXOffset() {
-        return LittleEndian.getInt(_data,20);
-    }
-
-    /**
-     * Sets the X offset of the comment on the page.
-     * @param xOffset the X offset.
-     */
-    public void setXOffset(int xOffset) {
-        LittleEndian.putInt(_data,20,xOffset);
-    }
-
-    /**
-     * Gets the Y offset of the comment on the page.
-     * @return the Y offset.
-     */
-    public int getYOffset() {
-        return LittleEndian.getInt(_data,24);
-    }
-
-    /**
-     * Sets the Y offset of the comment on the page.
-     * @param yOffset the Y offset.
-     */
-    public void setYOffset(int yOffset) {
-        LittleEndian.putInt(_data,24,yOffset);
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return RecordTypes.Comment2000Atom.typeID; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java
deleted file mode 100644
index 2d68860..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java
+++ /dev/null
@@ -1,284 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
-import org.apache.poi.hslf.exceptions.OldPowerPointFormatException;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * This is a special kind of Atom, because it doesn't live inside the
- *  PowerPoint document. Instead, it lives in a separate stream in the
- *  document. As such, it has to be treated specially
- */
-public class CurrentUserAtom
-{
-	private static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class);
-
-	/** Standard Atom header */
-	public static final byte[] atomHeader = new byte[] { 0, 0, -10, 15 };
-	/** The PowerPoint magic number for a non-encrypted file */
-	public static final byte[] headerToken = new byte[] { 95, -64, -111, -29 };
-	/** The PowerPoint magic number for an encrypted file */ 
-	public static final byte[] encHeaderToken = new byte[] { -33, -60, -47, -13 };
-	/** The Powerpoint 97 version, major and minor numbers */
-	public static final byte[] ppt97FileVer = new byte[] { 8, 00, -13, 03, 03, 00 };
-
-	/** The version, major and minor numbers */
-	private int docFinalVersion;
-	private byte docMajorNo;
-	private byte docMinorNo;
-
-	/** The Offset into the file for the current edit */
-    private long currentEditOffset;
-	/** The Username of the last person to edit the file */
-	private String lastEditUser;
-	/** The document release version. Almost always 8 */
-	private long releaseVersion;
-
-	/** Only correct after reading in or writing out */
-	private byte[] _contents;
-	
-	/** Flag for encryption state of the whole file */
-	private boolean isEncrypted;
-
-
-	/* ********************* getter/setter follows *********************** */
-
-	public int  getDocFinalVersion() { return docFinalVersion; }
-	public byte getDocMajorNo()       { return docMajorNo; }
-	public byte getDocMinorNo()       { return docMinorNo; }
-
-	public long getReleaseVersion()  { return releaseVersion; }
-	public void setReleaseVersion(long rv) { releaseVersion = rv; }
-
-	/** Points to the UserEditAtom */
-	public long getCurrentEditOffset() { return currentEditOffset; }
-	public void setCurrentEditOffset(long id ) { currentEditOffset = id; }
-
-	public String getLastEditUsername() { return lastEditUser; }
-	public void setLastEditUsername(String u) { lastEditUser = u; }
-
-	public boolean isEncrypted() { return isEncrypted; }
-	public void setEncrypted(boolean isEncrypted) { this.isEncrypted = isEncrypted; }
-	
-
-	/* ********************* real code follows *************************** */
-
-	/**
-	 * Create a new Current User Atom
-	 */
-	public CurrentUserAtom() {
-		_contents = new byte[0];
-
-		// Initialise to empty
-		docFinalVersion = 0x03f4;
-		docMajorNo = 3;
-		docMinorNo = 0;
-		releaseVersion = 8;
-		currentEditOffset = 0;
-		lastEditUser = "Apache POI";
-		isEncrypted = false;
-	}
-
-
-	/** 
-	 * Find the Current User in the filesystem, and create from that
-	 */
-	public CurrentUserAtom(DirectoryNode dir) throws IOException {
-		// Decide how big it is
-		DocumentEntry docProps =
-			(DocumentEntry)dir.getEntry("Current User");
-		
-		// If it's clearly junk, bail out
-		if(docProps.getSize() > 131072) {
-			throw new CorruptPowerPointFileException("The Current User stream is implausably long. It's normally 28-200 bytes long, but was " + docProps.getSize() + " bytes");
-		}
-		
-		// Grab the contents
-		int len = docProps.getSize();
-		_contents = new byte[len];
-		InputStream in = dir.createDocumentInputStream("Current User");
-		int readLen = in.read(_contents);
-		in.close();
-
-        if (len != readLen) {
-            throw new IOException("Current User input stream ended prematurely - expected "+len+" bytes - received "+readLen+" bytes");
-        }
-		
-		
-		// See how long it is. If it's under 28 bytes long, we can't
-		//  read it
-		if(_contents.length < 28) {
-		    boolean isPP95 = dir.hasEntry("PP40");
-		    // PPT95 has 4 byte size, then data
-			if (!isPP95 && _contents.length >= 4) {
-				int size = LittleEndian.getInt(_contents);
-				isPP95 = (size + 4 == _contents.length);
-			}
-
-			if (isPP95) {
-			    throw new OldPowerPointFormatException("Based on the Current User stream, you seem to have supplied a PowerPoint95 file, which isn't supported");
-			} else {
-			    throw new CorruptPowerPointFileException("The Current User stream must be at least 28 bytes long, but was only " + _contents.length);
-			}
-		}
-
-		// Set everything up
-		init();
-	}
-
-	/**
-	 * Actually do the creation from a block of bytes
-	 */
-	private void init() {
-		// First up is the size, in 4 bytes, which is fixed
-		// Then is the header
-		
-	    isEncrypted = (LittleEndian.getInt(encHeaderToken) == LittleEndian.getInt(_contents,12)); 
-	    
-		// Grab the edit offset
-		currentEditOffset = LittleEndian.getUInt(_contents,16);
-
-		// Grab the versions
-		docFinalVersion = LittleEndian.getUShort(_contents,22);
-		docMajorNo = _contents[24];
-		docMinorNo = _contents[25];
-
-		// Get the username length
-		long usernameLen = LittleEndian.getUShort(_contents,20);
-		if(usernameLen > 512) {
-			// Handle the case of it being garbage
-			logger.log(POILogger.WARN, "Warning - invalid username length " + usernameLen + " found, treating as if there was no username set");
-			usernameLen = 0;
-		}
-
-		// Now we know the length of the username, 
-		//  use this to grab the revision
-		if(_contents.length >= 28+(int)usernameLen + 4) {
-			releaseVersion = LittleEndian.getUInt(_contents,28+(int)usernameLen);
-		} else {
-			// No revision given, as not enough data. Odd
-			releaseVersion = 0;
-		}
-
-		// Grab the unicode username, if stored
-		int start = 28+(int)usernameLen+4;
-		int len = 2*(int)usernameLen;
-
-		if(_contents.length >= start+len) {
-			byte[] textBytes = new byte[len];
-			System.arraycopy(_contents,start,textBytes,0,len);
-			lastEditUser = StringUtil.getFromUnicodeLE(textBytes);
-		} else {
-			// Fake from the 8 bit version
-			byte[] textBytes = new byte[(int)usernameLen];
-			System.arraycopy(_contents,28,textBytes,0,(int)usernameLen);
-			lastEditUser = StringUtil.getFromCompressedUnicode(textBytes,0,(int)usernameLen);
-		}
-	}
-
-
-	/**
-	 * Writes ourselves back out
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Decide on the size
-		//  8 = atom header
-		//  20 = up to name
-		//  4 = revision
-		//  3 * len = ascii + unicode
-		int size = 8 + 20 + 4 + (3 * lastEditUser.length());
-		_contents = new byte[size];
-
-		// First we have a 8 byte atom header
-		System.arraycopy(atomHeader,0,_contents,0,4);	
-		// Size is 20+user len + revision len(4)
-		int atomSize = 20+4+lastEditUser.length();
-		LittleEndian.putInt(_contents,4,atomSize);
-
-		// Now we have the size of the details, which is 20
-		LittleEndian.putInt(_contents,8,20);
-
-		// Now the ppt un-encrypted header token (4 bytes)
-		System.arraycopy((isEncrypted ? encHeaderToken : headerToken),0,_contents,12,4);
-
-		// Now the current edit offset
-		LittleEndian.putInt(_contents,16,(int)currentEditOffset);
-
-		// The username gets stored twice, once as US 
-		//  ascii, and again as unicode laster on
-		byte[] asciiUN = new byte[lastEditUser.length()];
-		StringUtil.putCompressedUnicode(lastEditUser,asciiUN,0);
-		
-		// Now we're able to do the length of the last edited user
-		LittleEndian.putShort(_contents,20,(short)asciiUN.length);
-		
-		// Now the file versions, 2+1+1
-		LittleEndian.putShort(_contents,22,(short)docFinalVersion);
-		_contents[24] = docMajorNo;
-		_contents[25] = docMinorNo;
-
-		// 2 bytes blank
-		_contents[26] = 0;
-		_contents[27] = 0;
-
-		// At this point we have the username as us ascii
-		System.arraycopy(asciiUN,0,_contents,28,asciiUN.length);
-
-		// 4 byte release version
-		LittleEndian.putInt(_contents,28+asciiUN.length,(int)releaseVersion);
-
-		// username in unicode
-		byte [] ucUN = new byte[lastEditUser.length()*2];
-		StringUtil.putUnicodeLE(lastEditUser,ucUN,0);
-		System.arraycopy(ucUN,0,_contents,28+asciiUN.length+4,ucUN.length);
-
-		// Write out
-		out.write(_contents);
-	}
-
-	/**
-	 * Writes ourselves back out to a filesystem
-	 */
-	public void writeToFS(NPOIFSFileSystem fs) throws IOException {
-		// Grab contents
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		writeOut(baos);
-		ByteArrayInputStream bais = 
-			new ByteArrayInputStream(baos.toByteArray());
-
-		// Write out
-		fs.createOrUpdateDocument(bais,"Current User");
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java
deleted file mode 100644
index eed1de2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A container record that specifies information about the document and document display settings.
- */
-public final class DocInfoListContainer extends RecordContainer {
-	private byte[] _header;
-	private static long _type = RecordTypes.List.typeID;
-
-	// Links to our more interesting children
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected DocInfoListContainer(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-		findInterestingChildren();
-	}
-
-	/**
-	 * Go through our child records, picking out the ones that are
-	 *  interesting, and saving those for use by the easy helper
-	 *  methods.
-	 */
-	private void findInterestingChildren() {
-
-	}
-
-	/**
-	 * Create a new DocInfoListContainer, with blank fields - not yet supported
-	 */
-	private DocInfoListContainer() {
-		_header = new byte[8];
-		_children = new Record[0];
-
-		// Setup our header block
-		_header[0] = 0x0f; // We are a container record
-		LittleEndian.putShort(_header, 2, (short)_type);
-
-		// Setup our child records
-		findInterestingChildren();
-	}
-
-	/**
-	 * We are of type 0x7D0
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
deleted file mode 100644
index 0c74ae2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.POILogger;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-/**
- * Master container for Document. There is one of these for every
- *  slideshow, and it holds lots of definitions, and some summaries.
- *
- * @author Nick Burch
- */
-
-public final class Document extends PositionDependentRecordContainer
-{
-	private byte[] _header;
-	private static long _type = 1000;
-
-	// Links to our more interesting children
-	private DocumentAtom documentAtom;
-	private Environment environment;
-	private PPDrawingGroup ppDrawing;
-	private SlideListWithText[] slwts;
-	private ExObjList exObjList; // Can be null
-
-	/**
-	 * Returns the DocumentAtom of this Document
-	 */
-	public DocumentAtom getDocumentAtom() { return documentAtom; }
-	
-	/**
-	 * Returns the Environment of this Notes, which lots of
-	 * settings for the document in it
-	 */
-	public Environment getEnvironment() { return environment; }
-	
-	/**
-	 * Returns the PPDrawingGroup, which holds an Escher Structure
-	 * that contains information on pictures in the slides.
-	 */
-	public PPDrawingGroup getPPDrawingGroup() { return ppDrawing; }
-	
-	/**
-	 * Returns the ExObjList, which holds the references to
-	 * external objects used in the slides. This may be null, if
-	 * there are no external references.
-	 *  
-	 * @param create if true, create an ExObjList if it doesn't exist
-	 */
-	public ExObjList getExObjList(boolean create) {
-	    if (exObjList == null && create) {
-	        exObjList = new ExObjList();
-	        addChildAfter(exObjList, getDocumentAtom());
-	    }
-	    return exObjList;
-    }
-
-	/**
-	 * Returns all the SlideListWithTexts that are defined for
-	 *  this Document. They hold the text, and some of the text
-	 *  properties, which are referred to by the slides.
-	 * This will normally return an array of size 2 or 3
-	 */
-	public SlideListWithText[] getSlideListWithTexts() { return slwts; }
-
-    /**
-	 * Returns the SlideListWithText that deals with the
-	 *  Master Slides
-	 */
-	public SlideListWithText getMasterSlideListWithText() {
-        for (int i = 0; i < slwts.length; i++) {
-            if(slwts[i].getInstance() == SlideListWithText.MASTER) {
-                return slwts[i];
-            }
-        }
-        return null;
-    }
-
-	/**
-	 * Returns the SlideListWithText that deals with the
-	 *  Slides, or null if there isn't one
-	 */
-	public SlideListWithText getSlideSlideListWithText() {
-        for (int i = 0; i < slwts.length; i++) {
-            if(slwts[i].getInstance() == SlideListWithText.SLIDES) {
-                return slwts[i];
-            }
-        }
-		return null;
-    }
-	/**
-	 * Returns the SlideListWithText that deals with the
-	 *  notes, or null if there isn't one
-	 */
-	public SlideListWithText getNotesSlideListWithText() {
-        for (int i = 0; i < slwts.length; i++) {
-            if(slwts[i].getInstance() == SlideListWithText.NOTES) {
-                return slwts[i];
-            }
-        }
-		return null;
-    }
-
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected Document(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-
-		// Our first one should be a document atom
-		if(! (_children[0] instanceof DocumentAtom)) {
-			throw new IllegalStateException("The first child of a Document must be a DocumentAtom");
-		}
-		documentAtom = (DocumentAtom)_children[0];
-
-		// Find how many SlideListWithTexts we have
-		// Also, grab the Environment and PPDrawing records
-		//  on our way past
-		int slwtcount = 0;
-		for(int i=1; i<_children.length; i++) {
-			if(_children[i] instanceof SlideListWithText) {
-				slwtcount++;
-			}
-			if(_children[i] instanceof Environment) {
-				environment = (Environment)_children[i];
-			}
-			if(_children[i] instanceof PPDrawingGroup) {
-				ppDrawing = (PPDrawingGroup)_children[i];
-			}
-			if(_children[i] instanceof ExObjList) {
-				exObjList = (ExObjList)_children[i];
-			}
-		}
-
-		// You should only every have 1, 2 or 3 SLWTs
-		//  (normally it's 2, or 3 if you have notes)
-		// Complain if it's not
-		if(slwtcount == 0) {
-			logger.log(POILogger.WARN, "No SlideListWithText's found - there should normally be at least one!");
-		}
-		if(slwtcount > 3) {
-			logger.log(POILogger.WARN, "Found " + slwtcount + " SlideListWithTexts - normally there should only be three!");
-		}
-
-		// Now grab all the SLWTs
-		slwts = new SlideListWithText[slwtcount];
-		slwtcount = 0;
-		for(int i=1; i<_children.length; i++) {
-			if(_children[i] instanceof SlideListWithText) {
-				slwts[slwtcount] = (SlideListWithText)_children[i];
-				slwtcount++;
-			}
-		}
-	}
-
-	/**
-	 * Adds a new SlideListWithText record, at the appropriate
-	 *  point in the child records.
-	 */
-	public void addSlideListWithText(SlideListWithText slwt) {
-		// The new SlideListWithText should go in
-		//  just before the EndDocumentRecord
-		Record endDoc = _children[_children.length - 1];
-		if(endDoc.getRecordType() == RecordTypes.RoundTripCustomTableStyles12Atom.typeID) {
-		    // last record can optionally be a RoundTripCustomTableStyles12Atom
-		    endDoc = _children[_children.length - 2];
-		}
-		if(endDoc.getRecordType() != RecordTypes.EndDocument.typeID) {
-			throw new IllegalStateException("The last child record of a Document should be EndDocument, but it was " + endDoc);
-		}
-
-		// Add in the record
-		addChildBefore(slwt, endDoc);
-
-		// Updated our cached list of SlideListWithText records
-		int newSize = slwts.length + 1;
-		SlideListWithText[] nl = new SlideListWithText[newSize];
-		System.arraycopy(slwts, 0, nl, 0, slwts.length);
-		nl[nl.length-1] = slwt;
-		slwts = nl;
-	}
-
-    public void removeSlideListWithText(SlideListWithText slwt) {
-        ArrayList<SlideListWithText> lst = new ArrayList<SlideListWithText>();
-        for(SlideListWithText s : slwts) {
-            if(s != slwt) lst.add(s);
-            else {
-                removeChild(slwt);
-            }
-        }
-        slwts = lst.toArray(new SlideListWithText[lst.size()]);
-    }
-
-	/**
-	 * We are of type 1000
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java
deleted file mode 100644
index 22a9b7c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * A Document Atom (type 1001). Holds misc information on the PowerPoint
- * document, lots of them size and scale related.
- *
- * @author Nick Burch
- */
-
-public final class DocumentAtom extends RecordAtom
-{
-	private byte[] _header;
-	private static long _type = 1001l;
-
-	private long slideSizeX; // PointAtom, assume 1st 4 bytes = X
-	private long slideSizeY; // PointAtom, assume 2nd 4 bytes = Y
-	private long notesSizeX; // PointAtom, assume 1st 4 bytes = X
-	private long notesSizeY; // PointAtom, assume 2nd 4 bytes = Y
-	private long serverZoomFrom; // RatioAtom, assume 1st 4 bytes = from
-	private long serverZoomTo;   // RatioAtom, assume 2nd 4 bytes = to
-
-	private long notesMasterPersist; // ref to NotesMaster, 0 if none
-	private long handoutMasterPersist; // ref to HandoutMaster, 0 if none
-
-	private int firstSlideNum;
-	private int slideSizeType; // see DocumentAtom.SlideSize
-
-	private byte saveWithFonts;
-	private byte omitTitlePlace;
-	private byte rightToLeft;
-	private byte showComments;
-
-	private byte[] reserved;
-
-
-	public long getSlideSizeX() { return slideSizeX; }
-	public long getSlideSizeY() { return slideSizeY; }
-	public long getNotesSizeX() { return notesSizeX; }
-	public long getNotesSizeY() { return notesSizeY; }
-	public void setSlideSizeX(long x) { slideSizeX = x; }
-	public void setSlideSizeY(long y) { slideSizeY = y; }
-	public void setNotesSizeX(long x) { notesSizeX = x; }
-	public void setNotesSizeY(long y) { notesSizeY = y; }
-
-	public long getServerZoomFrom() { return serverZoomFrom; }
-	public long getServerZoomTo()   { return serverZoomTo; }
-	public void setServerZoomFrom(long zoom) { serverZoomFrom = zoom; }
-	public void setServerZoomTo(long zoom)   { serverZoomTo   = zoom; }
-
-	/** Returns a reference to the NotesMaster, or 0 if none */
-	public long getNotesMasterPersist() { return notesMasterPersist; }
-	/** Returns a reference to the HandoutMaster, or 0 if none */
-	public long getHandoutMasterPersist() { return handoutMasterPersist; }
-
-	public int getFirstSlideNum() { return firstSlideNum; }
-
-	/** The Size of the Document's slides, @see DocumentAtom.SlideSize for values */
-	public int getSlideSizeType() { return slideSizeType; }
-
-	/** Was the document saved with True Type fonts embeded? */
-	public boolean getSaveWithFonts() {
-		return saveWithFonts != 0;
-	}
-
-	/** Have the placeholders on the title slide been omitted? */
-	public boolean getOmitTitlePlace() {
-		return omitTitlePlace != 0;
-	}
-
-	/** Is this a Bi-Directional PPT Doc? */
-	public boolean getRightToLeft() {
-		return rightToLeft != 0;
-	}
-
-	/** Are comment shapes visible? */
-	public boolean getShowComments() {
-		return showComments != 0;
-	}
-
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the Document Atom
-	 */
-	protected DocumentAtom(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 48) { len = 48; }
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Get the sizes and zoom ratios
-		slideSizeX = LittleEndian.getInt(source,start+0+8);
-		slideSizeY = LittleEndian.getInt(source,start+4+8);
-		notesSizeX = LittleEndian.getInt(source,start+8+8);
-		notesSizeY = LittleEndian.getInt(source,start+12+8);
-		serverZoomFrom = LittleEndian.getInt(source,start+16+8);
-		serverZoomTo   = LittleEndian.getInt(source,start+20+8);
-
-		// Get the master persists
-		notesMasterPersist = LittleEndian.getInt(source,start+24+8);
-		handoutMasterPersist = LittleEndian.getInt(source,start+28+8);
-
-		// Get the ID of the first slide
-		firstSlideNum = LittleEndian.getShort(source,start+32+8);
-
-		// Get the slide size type
-		slideSizeType = LittleEndian.getShort(source,start+34+8);
-
-		// Get the booleans as bytes
-		saveWithFonts = source[start+36+8];
-		omitTitlePlace = source[start+37+8];
-		rightToLeft = source[start+38+8];
-		showComments = source[start+39+8];
-
-		// If there's any other bits of data, keep them about
-		reserved = new byte[len-40-8];
-		System.arraycopy(source,start+48,reserved,0,reserved.length);
-	}
-
-	/**
-	 * We are of type 1001
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header
-		out.write(_header);
-
-		// The sizes and zoom ratios
-		writeLittleEndian((int)slideSizeX,out);
-		writeLittleEndian((int)slideSizeY,out);
-		writeLittleEndian((int)notesSizeX,out);
-		writeLittleEndian((int)notesSizeY,out);
-		writeLittleEndian((int)serverZoomFrom,out);
-		writeLittleEndian((int)serverZoomTo,out);
-
-		// The master persists
-		writeLittleEndian((int)notesMasterPersist,out);
-		writeLittleEndian((int)handoutMasterPersist,out);
-
-		// The ID of the first slide
-		writeLittleEndian((short)firstSlideNum,out);
-
-		// The slide size type
-		writeLittleEndian((short)slideSizeType,out);
-
-		// The booleans as bytes
-		out.write(saveWithFonts);
-		out.write(omitTitlePlace);
-		out.write(rightToLeft);
-		out.write(showComments);
-
-		// Reserved data
-		out.write(reserved);
-	}
-
-	/**
-	 * Holds the different Slide Size values
-	 */
-	public static final class SlideSize {
-		public static final int ON_SCREEN = 0;
-		public static final int LETTER_SIZED_PAPER = 1;
-		public static final int A4_SIZED_PAPER = 2;
-		public static final int ON_35MM = 3;
-		public static final int OVERHEAD = 4;
-		public static final int BANNER = 5;
-		public static final int CUSTOM = 6;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
deleted file mode 100644
index 57f0f31..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
-
-import org.apache.poi.poifs.crypt.CipherAlgorithm;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionHeader;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionVerifier;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInputStream;
-
-/**
- * A Document Encryption Atom (type 12052). Holds information
- *  on the Encryption of a Document
- *
- * @author Nick Burch
- */
-public final class DocumentEncryptionAtom extends PositionDependentRecordAtom {
-    private static final long _type = 12052l;
-	private final byte[] _header;
-	private EncryptionInfo ei;
-
-	/**
-	 * For the Document Encryption Atom
-	 */
-	protected DocumentEncryptionAtom(byte[] source, int start, int len) throws IOException {
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		ByteArrayInputStream bis = new ByteArrayInputStream(source, start+8, len-8);
-		LittleEndianInputStream leis = new LittleEndianInputStream(bis);
-		ei = new EncryptionInfo(leis, EncryptionMode.cryptoAPI);
-		leis.close();
-	}
-
-	public DocumentEncryptionAtom() {
-	    _header = new byte[8];
-	    LittleEndian.putShort(_header, 0, (short)0x000F);
-	    LittleEndian.putShort(_header, 2, (short)_type);
-	    // record length not yet known ...
-	    
-	    ei = new EncryptionInfo(EncryptionMode.cryptoAPI);
-	}
-	
-	/**
-	 * Initializes the encryption settings
-	 *
-	 * @param keyBits see {@link CipherAlgorithm#rc4} for allowed values, use -1 for default size
-	 */
-	public void initializeEncryptionInfo(int keyBits) {
-	    ei = new EncryptionInfo(EncryptionMode.cryptoAPI, CipherAlgorithm.rc4, HashAlgorithm.sha1, keyBits, -1, null);
-	}
-	
-	/**
-	 * Return the length of the encryption key, in bits
-	 */
-	public int getKeyLength() {
-		return ei.getHeader().getKeySize();
-	}
-
-	/**
-	 * Return the name of the encryption provider used
-	 */
-	public String getEncryptionProviderName() {
-		return ei.getHeader().getCspName();
-	}
-
-	/**
-	 * @return the {@link EncryptionInfo} object for details about encryption settings
-	 */
-	public EncryptionInfo getEncryptionInfo() {
-	    return ei;
-	}
-	
-	
-	/**
-	 * We are of type 12052
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-
-		// Data
-		byte data[] = new byte[1024];
-		LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(data, 0);
-		bos.writeShort(ei.getVersionMajor());
-		bos.writeShort(ei.getVersionMinor());
-		bos.writeInt(ei.getEncryptionFlags());
-		
-		((CryptoAPIEncryptionHeader)ei.getHeader()).write(bos);
-		((CryptoAPIEncryptionVerifier)ei.getVerifier()).write(bos);
-		
-        // Header
-		LittleEndian.putInt(_header, 4, bos.getWriteIndex());
-        out.write(_header);
-		out.write(data, 0, bos.getWriteIndex());
-		bos.close();
-	}
-
-    @Override
-    public void updateOtherRecordReferences(Map<Integer,Integer> oldToNewReferencesLookup) {
-        // nothing to update
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
deleted file mode 100644
index 285f824..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * If we come across a record we know has children of (potential)
- *  interest, but where the record itself is boring, but where other
- *  records may care about where this one lives, we create one
- *  of these. It allows us to get at the children, and track where on
- *  disk this is, but not much else.
- * Anything done using this should quite quickly be transitioned to its
- *  own proper record class!
- *
- * @author Nick Burch
- */
-
-public final class DummyPositionSensitiveRecordWithChildren extends PositionDependentRecordContainer
-{
-	private byte[] _header;
-	private long _type;
-
-	/**
-	 * Create a new holder for a boring record with children, but with
-	 *  position dependent characteristics
-	 */
-	protected DummyPositionSensitiveRecordWithChildren(byte[] source, int start, int len) {
-		// Just grab the header, not the whole contents
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-		_type = LittleEndian.getUShort(_header,2);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-	}
-
-	/**
-	 * Return the value we were given at creation
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java
deleted file mode 100644
index 18dea58..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * If we come across a record we know has children of (potential)
- *  interest, but where the record itself is boring, we create one
- *  of these. It allows us to get at the children, but not much else
- *
- * @author Nick Burch
- */
-
-public final class DummyRecordWithChildren extends RecordContainer
-{
-	private byte[] _header;
-	private long _type;
-
-	/**
-	 * Create a new holder for a boring record with children
-	 */
-	protected DummyRecordWithChildren(byte[] source, int start, int len) {
-		// Just grab the header, not the whole contents
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-		_type = LittleEndian.getUShort(_header,2);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-	}
-
-	/**
-	 * Return the value we were given at creation
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Environment.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Environment.java
deleted file mode 100644
index eb66f2a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Environment.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Environment, which contains lots of settings for the document.
- *
- * @author Nick Burch
- */
-
-public final class Environment extends PositionDependentRecordContainer
-{
-	private byte[] _header;
-	private static long _type = 1010;
-
-	// Links to our more interesting children
-	private FontCollection fontCollection;
-    //master style for text with type=TextHeaderAtom.OTHER_TYPE
-    private TxMasterStyleAtom txmaster;
-
-	/**
-	 * Returns the FontCollection of this Environment
-	 */
-	public FontCollection getFontCollection() { return fontCollection; }
-
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected Environment(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-
-		// Find our FontCollection record
-		for(int i=0; i<_children.length; i++) {
-			if(_children[i] instanceof FontCollection) {
-				fontCollection = (FontCollection)_children[i];
-			} else if (_children[i] instanceof TxMasterStyleAtom){
-                txmaster = (TxMasterStyleAtom)_children[i];
-            }
-		}
-
-		if(fontCollection == null) {
-			throw new IllegalStateException("Environment didn't contain a FontCollection record!");
-		}
-	}
-
-    public TxMasterStyleAtom getTxMasterStyleAtom(){
-        return txmaster;
-    }
-
-	/**
-	 * We are of type 1010
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java
deleted file mode 100644
index 6aa09b9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.util.*;
-
-/**
- * An atom record that specifies whether a shape is a placeholder shape.
- * The number, position, and type of placeholder shapes are determined by
- * the slide layout as specified in the SlideAtom record.
- */
-public class EscherPlaceholder extends EscherRecord {
-    public static final short RECORD_ID = (short)RecordTypes.OEPlaceholderAtom.typeID;
-    public static final String RECORD_DESCRIPTION = "msofbtClientTextboxPlaceholder";
-
-    int position = -1;
-    byte placementId = 0;
-    byte size = 0;
-    short unused = 0;
-    
-    public EscherPlaceholder() {}
-    
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-
-        position = LittleEndian.getInt(data, offset+8);
-        placementId = data[offset+12];
-        size = data[offset+13];
-        unused = LittleEndian.getShort(data, offset+14);
-        
-        assert(bytesRemaining + 8 == 16);
-        return bytesRemaining + 8;
-    }
-
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-        
-        LittleEndian.putShort(data, offset, getOptions());
-        LittleEndian.putShort(data, offset+2, getRecordId());
-        LittleEndian.putInt(data, offset+4, 8);
-        LittleEndian.putInt(data, offset+8, position);
-        LittleEndian.putByte(data, offset+12, placementId);
-        LittleEndian.putByte(data, offset+13, size);
-        LittleEndian.putShort(data, offset+14, unused);
-        
-        listener.afterRecordSerialize( offset+getRecordSize(), getRecordId(), getRecordSize(), this );
-        return getRecordSize();
-    }
-
-    public int getRecordSize() {
-        return 8 + 8;
-    }
-
-    public String getRecordName() {
-        return "ClientTextboxPlaceholder";
-    }
-
-    
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
deleted file mode 100644
index 10744e4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.ddf.*;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * A wrapper around a DDF (Escher) EscherTextbox Record. Causes the DDF
- *  Record to be accessible as if it were a HSLF record.
- * Note: when asked to write out, will simply put any child records correctly
- *  into the Escher layer. A call to the escher layer to write out (by the
- *  parent PPDrawing) will do the actual write out
- *
- * @author Nick Burch
- */
-public final class EscherTextboxWrapper extends RecordContainer {
-	private EscherTextboxRecord _escherRecord;
-	private long _type;
-	private int shapeId;
-	private StyleTextPropAtom styleTextPropAtom;
-	private StyleTextProp9Atom styleTextProp9Atom;
-
-	/**
-	 * Returns the underlying DDF Escher Record
-	 */
-	public EscherTextboxRecord getEscherRecord() { return _escherRecord; }
-
-	/**
-	 * Creates the wrapper for the given DDF Escher Record and children
-	 */
-	public EscherTextboxWrapper(EscherTextboxRecord textbox) {
-		_escherRecord = textbox;
-		_type = _escherRecord.getRecordId();
-
-		// Find the child records in the escher data
-		byte[] data = _escherRecord.getData();
-		_children = Record.findChildRecords(data,0,data.length);
-		for (Record r : this._children) {
-			if (r instanceof StyleTextPropAtom) { this.styleTextPropAtom = (StyleTextPropAtom) r; }
-		}
-	}
-
-	/**
-	 * Creates a new, empty wrapper for DDF Escher Records and their children
-	 */
-	public EscherTextboxWrapper() {
-		_escherRecord = new EscherTextboxRecord();
-		_escherRecord.setRecordId(EscherTextboxRecord.RECORD_ID);
-		_escherRecord.setOptions((short)15);
-
-		_children = new Record[0];
-	}
-
-
-	/**
-	 * Return the type of the escher record (normally in the 0xFnnn range)
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Stores the data for the child records back into the Escher layer.
-	 * Doesn't actually do the writing out, that's left to the Escher
-	 *  layer to do. Must be called before writeOut/serialize is called
-	 *  on the underlying Escher object!
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Write out our children, and stuff them into the Escher layer
-
-		// Grab the children's data
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		for (Record r : _children) r.writeOut(baos);
-		byte[] data = baos.toByteArray();
-
-		// Save in the escher layer
-		_escherRecord.setData(data);
-	}
-
-	/**
-	 * @return  Shape ID
-	 */
-	public int getShapeId(){
-		return shapeId;
-	}
-
-	/**
-	 *  @param id Shape ID
-	 */
-	public void setShapeId(int id){
-		shapeId = id;
-	}
-
-	public StyleTextPropAtom getStyleTextPropAtom() {
-		return styleTextPropAtom;
-	}
-
-	public void setStyleTextProp9Atom(final StyleTextProp9Atom nineAtom) {
-		this.styleTextProp9Atom = nineAtom;
-	}
-	public StyleTextProp9Atom getStyleTextProp9Atom() {
-		return this.styleTextProp9Atom;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java
deleted file mode 100644
index 62a5c4b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-/**
- * A container record that specifies information about a movie stored externally.
- *
- * @author Yegor Kozlov
- */
-public final class ExAviMovie extends ExMCIMovie {
-
-    /**
-     * Set things up, and find our more interesting children
-     */
-    protected ExAviMovie(byte[] source, int start, int len) {
-        super(source, start, len);
-    }
-
-    /**
-     * Create a new ExAviMovie, with blank fields
-     */
-    public ExAviMovie() {
-        super();
-
-    }
-    /**
-     * We are of type 4102
-     */
-    public long getRecordType() {
-        return RecordTypes.ExAviMovie.typeID;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java
deleted file mode 100644
index 2b0d1e2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-/**
- * A container record that specifies information about an ActiveX control. It contains:
- * <p>
- * 1. ExControlAtom (4091)
- * 2. ExOleObjAtom (4035)
- * 3. CString (4026), Instance MenuName (1) used for menus and the Links dialog box.
- * 4. CString (4026), Instance ProgID (2) that stores the OLE Programmatic Identifier.
- *  A ProgID is a string that uniquely identifies a given object.
- * 5. CString (4026), Instance ClipboardName (3) that appears in the paste special dialog.
- * 6. MetaFile( 4033), optional
- * </p>
- *
- *
- * @author Yegor kozlov
- */
-public final class ExControl extends ExEmbed {
-
-    /**
-     * Set things up, and find our more interesting children
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExControl(byte[] source, int start, int len) {
-        super(source, start, len);
-    }
-
-    /**
-     * Create a new ExEmbed, with blank fields
-     */
-    public ExControl() {
-        super();
-
-        _children[0] = embedAtom = new ExControlAtom();
-    }
-
-    /**
-     * Gets the {@link ExControlAtom}.
-     *
-     * @return the {@link ExControlAtom}.
-     */
-    public ExControlAtom getExControlAtom()
-    {
-        return (ExControlAtom)_children[0];
-    }
-
-    /**
-     * Returns the type (held as a little endian in bytes 3 and 4)
-     * that this class handles.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.ExControl.typeID;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java
deleted file mode 100644
index b5540ce..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An atom record that specifies an ActiveX control.
- *
- * @author Yegor Kozlov
- */
-public final class ExControlAtom extends RecordAtom {
-
-
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * slideId.
-     */
-    private int _id;
-
-    /**
-     * Constructs a brand new embedded object atom record.
-     */
-    protected ExControlAtom() {
-        _header = new byte[8];
-
-        LittleEndian.putShort(_header, 2, (short) getRecordType());
-        LittleEndian.putInt(_header, 4, 4);
-
-    }
-
-    /**
-     * Constructs the ExControlAtom record from its source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start  the start offset into the byte array.
-     * @param len    the length of the slice in the byte array.
-     */
-    protected ExControlAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source, start, _header, 0, 8);
-
-        _id = LittleEndian.getInt(source, start + 8);
-    }
-
-    /**
-     * An integer that specifies which presentation slide is associated with the ActiveX control.
-     * <p>
-     * It MUST be 0x00000000 or equal to the value of the slideId field of a SlidePersistAtom record.
-     * The value 0x00000000 specifies a null reference.
-     * </p>
-     *
-     * @return an integer that specifies which presentation slide is associated with the ActiveX control
-     */
-    public int getSlideId() {
-        return _id;
-    }
-
-    /**
-     * Sets which presentation slide is associated with the ActiveX control.
-     *
-     * @param id an integer that specifies which presentation slide is associated with the ActiveX control
-     * <p>
-     * It MUST be 0x00000000 or equal to the value of the slideId field of a SlidePersistAtom record.
-     * The value 0x00000000 specifies a null reference.
-     * </p>
-     */
-    public void setSlideId(int id) {
-        _id = id;
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.ExControlAtom.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        byte[] data = new byte[4];
-        LittleEndian.putInt(data, 0, _id);
-        out.write(data);
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
deleted file mode 100644
index 7580450..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * This data represents an embedded object in the document.
- *
- * @author Daniel Noll
- */
-public class ExEmbed extends RecordContainer {
-
-    /**
-     * Record header data.
-     */
-    private byte[] _header;
-
-    // Links to our more interesting children
-    protected RecordAtom embedAtom;
-    private ExOleObjAtom oleObjAtom;
-    private CString menuName;
-    private CString progId;
-    private CString clipboardName;
-
-    /**
-     * Set things up, and find our more interesting children
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExEmbed(byte[] source, int start, int len) {
-        // Grab the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Find our children
-        _children = Record.findChildRecords(source,start+8,len-8);
-        findInterestingChildren();
-    }
-
-    /**
-     * Create a new ExEmbed, with blank fields
-     */
-    public ExEmbed() {
-        _header = new byte[8];
-        _children = new Record[5];
-
-        // Setup our header block
-        _header[0] = 0x0f; // We are a container record
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-
-        // Setup our child records
-        CString cs1 = new CString();
-        cs1.setOptions(0x1 << 4);
-        CString cs2 = new CString();
-        cs2.setOptions(0x2 << 4);
-        CString cs3 = new CString();
-        cs3.setOptions(0x3 << 4);
-        _children[0] = new ExEmbedAtom();
-        _children[1] = new ExOleObjAtom();
-        _children[2] = cs1;
-        _children[3] = cs2;
-        _children[4] = cs3;
-        findInterestingChildren();
-    }
-
-    /**
-     * Go through our child records, picking out the ones that are
-     * interesting, and saving those for use by the easy helper methods.
-     */
-    private void findInterestingChildren() {
-
-        // First child should be the ExHyperlinkAtom
-        if(_children[0] instanceof ExEmbedAtom) {
-            embedAtom = (ExEmbedAtom)_children[0];
-        } else {
-            logger.log(POILogger.ERROR, "First child record wasn't a ExEmbedAtom, was of type " + _children[0].getRecordType());
-        }
-
-        // Second child should be the ExOleObjAtom
-        if (_children[1] instanceof ExOleObjAtom) {
-            oleObjAtom = (ExOleObjAtom)_children[1];
-        } else {
-            logger.log(POILogger.ERROR, "Second child record wasn't a ExOleObjAtom, was of type " + _children[1].getRecordType());
-        }
-
-        for (int i = 2; i < _children.length; i++) {
-            if (_children[i] instanceof CString){
-                CString cs = (CString)_children[i];
-                int opts = cs.getOptions() >> 4;
-                switch(opts){
-                    case 0x1: menuName = cs; break;
-                    case 0x2: progId = cs; break;
-                    case 0x3: clipboardName = cs; break;
-                    default: break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Gets the {@link ExEmbedAtom}.
-     *
-     * @return the {@link ExEmbedAtom}.
-     */
-    public ExEmbedAtom getExEmbedAtom()
-    {
-        return (ExEmbedAtom)embedAtom;
-    }
-
-    /**
-     * Gets the {@link ExOleObjAtom}.
-     *
-     * @return the {@link ExOleObjAtom}.
-     */
-    public ExOleObjAtom getExOleObjAtom()
-    {
-        return oleObjAtom;
-    }
-
-    /**
-     * Gets the name used for menus and the Links dialog box.
-     *
-     * @return the name used for menus and the Links dialog box.
-     */
-    public String getMenuName()
-    {
-        return menuName == null ? null : menuName.getText();
-    }
-
-    public void setMenuName(String s)
-    {
-        if(menuName != null) menuName.setText(s);
-    }
-
-    /**
-     * Gets the OLE Programmatic Identifier.
-     * 
-     * @return the OLE Programmatic Identifier.
-     */
-    public String getProgId()
-    {
-        return progId == null ? null : progId.getText();
-    }
-
-    public void setProgId(String s)
-    {
-        if(progId != null) progId.setText(s);
-    }
-    /**
-     * Gets the name that appears in the paste special dialog.
-     *
-     * @return the name that appears in the paste special dialog.
-     */
-    public String getClipboardName()
-    {
-        return clipboardName == null ? null : clipboardName.getText();
-    }
-
-    public void setClipboardName(String s)
-    {
-        if(clipboardName != null) clipboardName.setText(s);
-    }
-    /**
-     * Returns the type (held as a little endian in bytes 3 and 4)
-     * that this class handles.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.ExEmbed.typeID;
-    }
-
-    /**
-     * Have the contents printer out into an OutputStream, used when
-     * writing a file back out to disk.
-     *
-     * @param out the output stream.
-     * @throws IOException if there was an error writing to the stream.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        writeOut(_header[0],_header[1],getRecordType(),_children,out);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java
deleted file mode 100644
index 94aba47..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The atom that holds metadata on a specific embedded object in the document.
- *
- * <!--
- * 0    sint4    followColorScheme  This field indicates how the object follows the color scheme. Valid values are:
- *                                  0 - doesn't follow the color scheme
- *                                  1 - follows the entire color scheme
- *                                  2 - follows the text and background scheme
- *
- * 4    bool1    cantLockServerB    Set if the embedded server can not be locked
- * 5    bool1    noSizeToServerB    Set if don't need to send the dimension to the embedded object
- * 6    Bool1    isTable            Set if the object is a Word table
- * -->
- *
- * @author Daniel Noll
- */
-public class ExEmbedAtom extends RecordAtom {
-
-    /**
-     * Embedded document does not follow the color scheme.
-     */
-    public static final int DOES_NOT_FOLLOW_COLOR_SCHEME = 0;
-
-    /**
-     * Embedded document follows the entire color scheme.
-     */
-    public static final int FOLLOWS_ENTIRE_COLOR_SCHEME = 1;
-
-    /**
-     * Embedded document follows the text and background scheme.
-     */
-    public static final int FOLLOWS_TEXT_AND_BACKGROUND_SCHEME = 2;
-
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a brand new embedded object atom record.
-     */
-    protected ExEmbedAtom() {
-        _header = new byte[8];
-        _data = new byte[8];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-
-        // It is fine for the other values to be zero
-    }
-
-    /**
-     * Constructs the embedded object atom record from its source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExEmbedAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-        // Must be at least 8 bytes long
-        if(_data.length < 8) {
-        	throw new IllegalArgumentException("The length of the data for a ExEmbedAtom must be at least 4 bytes, but was only " + _data.length);
-        }
-    }
-
-    /**
-     * Gets whether the object follows the color scheme.
-     *
-     * @return one of {@link #DOES_NOT_FOLLOW_COLOR_SCHEME},
-     *                {@link #FOLLOWS_ENTIRE_COLOR_SCHEME}, or
-     *                {@link #FOLLOWS_TEXT_AND_BACKGROUND_SCHEME}.
-     */
-    public int getFollowColorScheme() {
-        return LittleEndian.getInt(_data, 0);
-    }
-
-    /**
-     * Gets whether the embedded server cannot be locked.
-     *
-     * @return {@code true} if the embedded server cannot be locked.
-     */
-    public boolean getCantLockServerB() {
-        return _data[4] != 0;
-    }
-
-    public void setCantLockServerB(boolean cantBeLocked) {
-    	_data[4] = (byte)(cantBeLocked ? 1 : 0);
-    }
-    
-    /**
-     * Gets whether it is not required to send the dimensions to the embedded object.
-     *
-     * @return {@code true} if the embedded server does not require the object dimensions.
-     */
-    public boolean getNoSizeToServerB() {
-        return _data[5] != 0;
-    }
-
-    /**
-     * Getswhether the object is a Word table.
-     *
-     * @return {@code true} if the object is a Word table.
-     */
-    public boolean getIsTable() {
-        return _data[6] != 0;
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.ExEmbedAtom.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
deleted file mode 100644
index ca9d68d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class represents the data of a link in the document. 
- * @author Nick Burch
- */
-public class ExHyperlink extends RecordContainer {
-	private byte[] _header;
-	private static long _type = 4055;
-	
-	// Links to our more interesting children
-	private ExHyperlinkAtom linkAtom;
-	private CString linkDetailsA;
-	private CString linkDetailsB;
-	
-	/** 
-	 * Returns the ExHyperlinkAtom of this link
-	 */ 
-	public ExHyperlinkAtom getExHyperlinkAtom() { return linkAtom; }
-	
-	/**
-	 * Returns the URL of the link.
-     *
-     * @return the URL of the link
-	 */
-	public String getLinkURL() {
-		return linkDetailsB == null ? null : linkDetailsB.getText();
-	}
-
-    /**
-     * Returns the hyperlink's user-readable name
-     *
-     * @return the hyperlink's user-readable name
-     */
-    public String getLinkTitle() {
-        return linkDetailsA == null ? null : linkDetailsA.getText();
-    }
-
-	/**
-	 * Sets the URL of the link
-	 * TODO: Figure out if we should always set both
-	 */
-	public void setLinkURL(String url) {
-		if(linkDetailsB != null) {
-			linkDetailsB.setText(url);
-		}
-	}
-	
-    public void setLinkOptions(int options) {
-        if(linkDetailsB != null) {
-            linkDetailsB.setOptions(options);
-        }
-    }
-
-    public void setLinkTitle(String title) {
-        if(linkDetailsA != null) {
-            linkDetailsA.setText(title);
-        }
-    }
-    
-	/**
-	 * Get the link details (field A)
-	 */
-	public String _getDetailsA() {
-		return linkDetailsA == null ? null : linkDetailsA.getText();
-	}
-	/**
-	 * Get the link details (field B)
-	 */
-	public String _getDetailsB() {
-		return linkDetailsB == null ? null : linkDetailsB.getText();
-	}
-
-	/** 
-	 * Set things up, and find our more interesting children
-	 */
-	protected ExHyperlink(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-		findInterestingChildren();
-	}
-
-	/**
-	 * Go through our child records, picking out the ones that are
-	 *  interesting, and saving those for use by the easy helper
-	 *  methods.
-	 */	
-	private void findInterestingChildren() {
-
-		// First child should be the ExHyperlinkAtom
-		if(_children[0] instanceof ExHyperlinkAtom) {
-			linkAtom = (ExHyperlinkAtom)_children[0];
-		} else {
-			logger.log(POILogger.ERROR, "First child record wasn't a ExHyperlinkAtom, was of type " + _children[0].getRecordType());
-		}
-
-        for (int i = 1; i < _children.length; i++) {
-            if (_children[i] instanceof CString){
-                if ( linkDetailsA == null) linkDetailsA = (CString)_children[i];
-                else linkDetailsB = (CString)_children[i];
-            } else {
-                logger.log(POILogger.ERROR, "Record after ExHyperlinkAtom wasn't a CString, was of type " + _children[1].getRecordType());
-            }
-
-        }
-	}
-
-	/**
-	 * Create a new ExHyperlink, with blank fields
-	 */
-	public ExHyperlink() {
-		_header = new byte[8];
-		_children = new Record[3];
-		
-		// Setup our header block
-		_header[0] = 0x0f; // We are a container record
-		LittleEndian.putShort(_header, 2, (short)_type);
-		
-		// Setup our child records
-		CString csa = new CString();
-		CString csb = new CString();
-		csa.setOptions(0x00);
-		csb.setOptions(0x10);
-		_children[0] = new ExHyperlinkAtom();
-		_children[1] = csa;
-		_children[2] = csb;
-		findInterestingChildren();
-	}
-
-	/**
-	 * We are of type 4055
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java
deleted file mode 100644
index 99deafd..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Tne atom that holds metadata on a specific Link in the document.
- * (The actual link is held in a sibling CString record)
- *
- * @author Nick Burch
- */
-public final class ExHyperlinkAtom extends RecordAtom {
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a brand new link related atom record.
-     */
-    protected ExHyperlinkAtom() {
-        _header = new byte[8];
-        _data = new byte[4];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-
-        // It is fine for the other values to be zero
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExHyperlinkAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-        // Must be at least 4 bytes long
-        if(_data.length < 4) {
-        	throw new IllegalArgumentException("The length of the data for a ExHyperlinkAtom must be at least 4 bytes, but was only " + _data.length);
-        }
-    }
-
-    /**
-     * Gets the link number. This will match the one in the
-     *  InteractiveInfoAtom which uses the link.
-     * @return the link number
-     */
-    public int getNumber() {
-        return LittleEndian.getInt(_data,0);
-    }
-
-    /**
-     * Sets the link number
-     * @param number the link number.
-     */
-    public void setNumber(int number) {
-        LittleEndian.putInt(_data,0,number);
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return RecordTypes.ExHyperlinkAtom.typeID; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
deleted file mode 100644
index 7d24175..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * A container record that specifies information about a movie stored externally.
- *
- * @author Yegor Kozlov
- */
-public class ExMCIMovie extends RecordContainer { // TODO - instantiable superclass
-    private byte[] _header;
-
-    //An ExVideoContainer record that specifies information about the MCI movie
-    private ExVideoContainer exVideo;
-
-    /**
-     * Set things up, and find our more interesting children
-     */
-    protected ExMCIMovie(byte[] source, int start, int len) {
-        // Grab the header
-        _header = new byte[8];
-        System.arraycopy(source, start, _header, 0, 8);
-
-        // Find our children
-        _children = Record.findChildRecords(source, start + 8, len - 8);
-        findInterestingChildren();
-    }
-
-    /**
-     * Create a new ExMCIMovie, with blank fields
-     */
-    public ExMCIMovie() {
-        _header = new byte[8];
-        // Setup our header block
-        _header[0] = 0x0f; // We are a container record
-        LittleEndian.putShort(_header, 2, (short) getRecordType());
-
-        exVideo = new ExVideoContainer();
-        _children = new Record[]{exVideo};
-
-    }
-
-    /**
-     * Go through our child records, picking out the ones that are
-     * interesting, and saving those for use by the easy helper
-     * methods.
-     */
-    private void findInterestingChildren() {
-
-        // First child should be the ExVideoContainer
-        if (_children[0] instanceof ExVideoContainer) {
-            exVideo = (ExVideoContainer) _children[0];
-        } else {
-            logger.log(POILogger.ERROR, "First child record wasn't a ExVideoContainer, was of type " + _children[0].getRecordType());
-        }
-    }
-
-    /**
-     * We are of type 4103
-     */
-    public long getRecordType() {
-        return RecordTypes.ExMCIMovie.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        writeOut(_header[0], _header[1], getRecordType(), _children, out);
-    }
-
-    /**
-     * Returns the ExVideoContainer that specifies information about the MCI movie
-     */
-    public ExVideoContainer getExVideo() {
-        return exVideo; }
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java
deleted file mode 100644
index 058f27e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An atom record that specifies information about external audio or video data.
- *
- * @author Yegor Kozlov
- */
-public final class ExMediaAtom extends RecordAtom
-{
-
-    /**
-     * A bit that specifies whether the audio or video data is repeated continuously during playback.
-     */
-    public static final int fLoop = 1;
-    /**
-     * A bit that specifies whether the audio or video data is rewound after playing.
-     */
-    public static final int fRewind = 2;
-    /**
-     * A bit that specifies whether the audio data is recorded narration for the slide show. It MUST be FALSE if this ExMediaAtom record is contained by an ExVideoContainer record.
-     */
-    public static final int fNarration = 4;
-
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * record data
-     */
-    private byte[] _recdata;
-
-    /**
-     * Constructs a brand new link related atom record.
-     */
-    protected ExMediaAtom() {
-        _recdata = new byte[8];
-
-        _header = new byte[8];
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _recdata.length);
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExMediaAtom(byte[] source, int start, int len) {
-        // Get the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Grab the record data
-        _recdata = new byte[len-8];
-        System.arraycopy(source,start+8,_recdata,0,len-8);
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return RecordTypes.ExMediaAtom.typeID; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_recdata);
-    }
-
-    /**
-     * A 4-byte unsigned integer that specifies an ID for an external object.
-     *
-     * @return  A 4-byte unsigned integer that specifies an ID for an external object.
-     */
-    public int getObjectId(){
-        return LittleEndian.getInt(_recdata, 0);
-    }
-
-    /**
-     * A 4-byte unsigned integer that specifies an ID for an external object.
-     *
-     * @param id  A 4-byte unsigned integer that specifies an ID for an external object.
-     */
-    public void setObjectId(int id){
-         LittleEndian.putInt(_recdata, 0, id);
-    }
-
-    /**
-     *  A bit mask specifying options for displaying headers and footers
-     *
-     * @return A bit mask specifying options for displaying headers and footers
-     */
-    public int getMask(){
-        return LittleEndian.getInt(_recdata, 4);
-    }
-
-    /**
-     *  A bit mask specifying options for displaying video
-     *
-     * @param mask A bit mask specifying options for displaying video
-     */
-    public void setMask(int mask){
-        LittleEndian.putInt(_recdata, 4, mask);
-    }
-
-    /**
-     * @param bit the bit to check
-     * @return whether the specified flag is set
-     */
-    public boolean getFlag(int bit){
-        return (getMask() & bit) != 0;
-    }
-
-    /**
-     * @param  bit the bit to set
-     * @param  value whether the specified bit is set
-     */
-    public void setFlag(int bit, boolean value){
-        int mask = getMask();
-        if(value) mask |= bit;
-        else mask &= ~bit;
-        setMask(mask);
-    }
-
-    public String toString(){
-        StringBuffer buf = new StringBuffer();
-        buf.append("ExMediaAtom\n");
-        buf.append("\tObjectId: " + getObjectId() + "\n");
-        buf.append("\tMask    : " + getMask() + "\n");
-        buf.append("\t  fLoop        : " + getFlag(fLoop) + "\n");
-        buf.append("\t  fRewind   : " + getFlag(fRewind) + "\n");
-        buf.append("\t  fNarration    : " + getFlag(fNarration) + "\n");
-        return buf.toString();
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java
deleted file mode 100644
index 6c40ecf..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class holds the links to exernal objects referenced
- *  from the document.
- * @author Nick Burch
- */
-public class ExObjList extends RecordContainer {
-	private byte[] _header;
-	private static long _type = 1033;
-	
-	// Links to our more interesting children
-	private ExObjListAtom exObjListAtom; 
-	
-	/** 
-	 * Returns the ExObjListAtom of this list
-	 */ 
-	public ExObjListAtom getExObjListAtom() { return exObjListAtom; }
-	
-	/**
-	 * Returns all the ExHyperlinks
-	 */
-	public ExHyperlink[] getExHyperlinks() {
-		ArrayList<ExHyperlink> links = new ArrayList<ExHyperlink>();
-		for(int i=0; i<_children.length; i++) {
-			if(_children[i] instanceof ExHyperlink) {
-				links.add( (ExHyperlink)_children[i] );
-			}
-		}
-
-		return links.toArray(new ExHyperlink[links.size()]);
-	}
-
-	/** 
-	 * Set things up, and find our more interesting children
-	 */
-	protected ExObjList(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-		findInterestingChildren();
-	}
-
-	/**
-	 * Go through our child records, picking out the ones that are
-	 *  interesting, and saving those for use by the easy helper
-	 *  methods.
-	 */	
-	private void findInterestingChildren() {
-		// First child should be the atom
-		if(_children[0] instanceof ExObjListAtom) {
-			exObjListAtom = (ExObjListAtom)_children[0];
-		} else {
-			throw new IllegalStateException("First child record wasn't a ExObjListAtom, was of type " + _children[0].getRecordType());
-		}
-	}
-	
-	/**
-	 * Create a new ExObjList, with blank fields
-	 */
-	public ExObjList() {
-		_header = new byte[8];
-		_children = new Record[1];
-		
-		// Setup our header block
-		_header[0] = 0x0f; // We are a container record
-		LittleEndian.putShort(_header, 2, (short)_type);
-		
-		// Setup our child records
-		_children[0] = new ExObjListAtom();
-		findInterestingChildren();
-	}
-
-	/**
-	 * We are of type 1033
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-
-    /**
-     * Lookup a hyperlink by its unique id
-     *
-     * @param id hyperlink id
-     * @return found <code>ExHyperlink</code> or <code>null</code>
-     */
-    public ExHyperlink get(int id){
-        for(int i=0; i<_children.length; i++) {
-            if(_children[i] instanceof ExHyperlink) {
-                ExHyperlink rec = (ExHyperlink)_children[i];
-                if (rec.getExHyperlinkAtom().getNumber() == id){
-                    return rec;
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java
deleted file mode 100644
index 51bb5b4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Tne atom that holds the seed info used by a ExObjList
- *
- * @author Nick Burch
- */
-
-public class ExObjListAtom extends RecordAtom
-{
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a brand new link related atom record.
-     */
-    protected ExObjListAtom() {
-        _header = new byte[8];
-        _data = new byte[4];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-        
-        // It is fine for the other values to be zero
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExObjListAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-        
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-        
-        // Must be at least 4 bytes long
-        if(_data.length < 4) {
-        	throw new IllegalArgumentException("The length of the data for a ExObjListAtom must be at least 4 bytes, but was only " + _data.length);
-        }
-    }
-
-    /**
-     * Gets the object ID seed, which will be used as the unique
-     *  OLE identifier for the next OLE object added
-     * @return the object ID seed
-     */
-    public long getObjectIDSeed() {
-        return LittleEndian.getUInt(_data,0);
-    }
-
-    /**
-     * Sets the object ID seed
-     * @param seed the new ID seed
-     */
-    public void setObjectIDSeed(int seed) {
-        LittleEndian.putInt(_data,0,seed);
-    }
-    
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return RecordTypes.ExObjListAtom.typeID; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjRefAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjRefAtom.java
deleted file mode 100644
index fa362c8..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjRefAtom.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * ExObjRefAtom (3009).
- * <p>
- *  An atom record that specifies a reference to an external object.
- * </p>
- */
-
-public final class ExObjRefAtom extends RecordAtom {
-	private byte[] _header;
-
-	/**
-	 * A 4-byte unsigned integer that specifies a reference to an external object.
-	 * It MUST be equal to the value of the exObjId field of an ExMediaAtom record
-	 * or the value of the exObjId field of an ExOleObjAtom record.
-	 */
-	private int exObjIdRef;
-
-    /**
-     * Create a new instance of <code>ExObjRefAtom</code>
-     */
-    public ExObjRefAtom() {
-        _header = new byte[8];
-        LittleEndian.putUShort(_header, 0, 0);
-        LittleEndian.putUShort(_header, 2, (int)getRecordType());
-        LittleEndian.putInt(_header, 4, 4);
-        exObjIdRef = 0;
-    }
-
-    /**
-     * Build an instance of <code>ExObjRefAtom</code> from on-disk data
-     * 
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-	protected ExObjRefAtom(byte[] source, int start, int len) {
-		_header = new byte[8];
-        int offset = start;
-        System.arraycopy(source,start,_header,0,8);
-        offset += _header.length;
-        exObjIdRef = (int)LittleEndian.getUInt(source, offset);
-	}
-
-    /**
-     * @return type of this record {@link RecordTypes#ExObjRefAtom}.
-     */
-	public long getRecordType() {
-	    return RecordTypes.ExObjRefAtom.typeID;
-    }
-
-    public int getExObjIdRef(){
-        return exObjIdRef;
-    }
-
-   public void setExObjIdRef(int id){
-       exObjIdRef = id;
-    }
-
-   /**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		out.write(_header);
-
-        byte[] recdata = new byte[4];
-        LittleEndian.putUInt(recdata, 0, exObjIdRef);
-
-        out.write(recdata);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java
deleted file mode 100644
index 9f412d2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Atom storing information for an OLE object.
- *
- * <!--
- * offset   type    name         description
- *
- * 0        uint4   drawAspect   Stores whether the object can be completely seen
- *                               (value of 1), or if only the icon is visible (value of 4).
- *
- * 4        sint4    type        Specifies whether the object is embedded or linked.
- *                               0 - embedded
- *                               1 - linked
- *
- * 8        sint4    objID       Unique identifier for the OLE object
- *
- * 2        sint4    subType     This specifies the type of ole object.
- *                               0 - Default object
- *                               1 - Microsoft Clipart Gallery
- *                               2 - Microsoft Word table
- *                               3 - Microsoft Excel
- *                               4 - Microsoft Graph
- *                               5 - Microsoft Organization Chart
- *                               6 - Microsoft Equation Editor
- *                               7 - Microsoft Wordart object
- *                               8 - Sound
- *                               9 - Image
- *                               10 - PowerPoint presentation
- *                               11 - PowerPoint slide
- *                               12 - Microsoft Project
- *                               13 - Microsoft Note-It Ole
- *                               14 - Microsoft Excel chart
- *                               15 - Media Player object
- *
- * 16       sint4    objStgDataRef    Reference to persist object
- *
- * 20       bool1    isBlank          Set if the object's image is blank
- *           (note: KOffice has this as an int.)
- * -->
- *
- * @author Daniel Noll
- */
-public class ExOleObjAtom extends RecordAtom {
-
-    /**
-     * The object) is displayed as an embedded object inside of a container,
-     */
-    public static final int DRAW_ASPECT_VISIBLE = 1;
-    /**
-     *   The object is displayed as a thumbnail image.
-     */
-    public static final int DRAW_ASPECT_THUMBNAIL = 2;
-    /**
-     *   The object is displayed as an icon.
-     */
-    public static final int DRAW_ASPECT_ICON = 4;
-    /**
-     *   The object is displayed on the screen as though it were printed to a printer.
-     */
-    public static final int DRAW_ASPECT_DOCPRINT = 8;
-
-    /**
-     * An embedded OLE object; the object is serialized and saved within the file.
-     */
-    public static final int TYPE_EMBEDDED = 0;
-    /**
-     * A linked OLE object; the object is saved outside of the file.
-     */
-    public static final int TYPE_LINKED = 1;
-    /**
-     * The OLE object is an ActiveX control.
-     */
-    public static final int TYPE_CONTROL = 2;
-
-    public static final int SUBTYPE_DEFAULT = 0;
-    public static final int SUBTYPE_CLIPART_GALLERY = 1;
-    public static final int SUBTYPE_WORD_TABLE = 2;
-    public static final int SUBTYPE_EXCEL = 3;
-    public static final int SUBTYPE_GRAPH = 4;
-    public static final int SUBTYPE_ORGANIZATION_CHART = 5;
-    public static final int SUBTYPE_EQUATION = 6;
-    public static final int SUBTYPE_WORDART = 7;
-    public static final int SUBTYPE_SOUND = 8;
-    public static final int SUBTYPE_IMAGE = 9;
-    public static final int SUBTYPE_POWERPOINT_PRESENTATION = 10;
-    public static final int SUBTYPE_POWERPOINT_SLIDE = 11;
-    public static final int SUBTYPE_PROJECT = 12;
-    public static final int SUBTYPE_NOTEIT = 13;
-    public static final int SUBTYPE_EXCEL_CHART = 14;
-    public static final int SUBTYPE_MEDIA_PLAYER = 15;
-
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a brand new link related atom record.
-     */
-    public ExOleObjAtom() {
-        _header = new byte[8];
-        _data = new byte[24];
-
-        LittleEndian.putShort(_header, 0, (short)1); //MUST be 0x1
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExOleObjAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-        // Must be at least 24 bytes long
-        if(_data.length < 24) {
-        	throw new IllegalArgumentException("The length of the data for a ExOleObjAtom must be at least 24 bytes, but was only " + _data.length);
-        }
-    }
-
-    /**
-     * Gets whether the object can be completely seen, or if only the
-     * icon is visible.
-     *
-     * @return the draw aspect, one of the {@code DRAW_ASPECT_*} constants.
-     */
-    public int getDrawAspect() {
-        return LittleEndian.getInt(_data, 0);
-    }
-
-    /**
-     * Sets whether the object can be completely seen, or if only the
-     * icon is visible.
-     *
-     * @param aspect the draw aspect, one of the {@code DRAW_ASPECT_*} constants.
-     */
-     public void setDrawAspect(int aspect) {
-        LittleEndian.putInt(_data, 0, aspect);
-    }
-
-    /**
-     * Gets whether the object is embedded or linked.
-     *
-     * @return the type, one of the {@code TYPE_EMBEDDED_*} constants.
-     */
-    public int getType() {
-        return LittleEndian.getInt(_data, 4);
-    }
-
-    /**
-     * Sets whether the object is embedded or linked.
-     *
-     * @param type the type, one of the {@code TYPE_EMBEDDED_*} constants.
-     */
-    public void setType(int type) {
-        LittleEndian.putInt(_data, 4, type);
-    }
-
-    /**
-     * Gets the unique identifier for the OLE object.
-     *
-     * @return the object ID.
-     */
-    public int getObjID() {
-        return LittleEndian.getInt(_data, 8);
-    }
-
-    /**
-     * Sets the unique identifier for the OLE object.
-     *
-     * @param id the object ID.
-     */
-    public void setObjID(int id) {
-        LittleEndian.putInt(_data, 8, id);
-    }
-
-    /**
-     * Gets the type of OLE object.
-     * 
-     * @return the sub-type, one of the {@code SUBTYPE_*} constants.
-     */
-    public int getSubType() {
-        return LittleEndian.getInt(_data, 12);
-    }
-
-    /**
-     * Sets the type of OLE object.
-     *
-     * @param type the sub-type, one of the {@code SUBTYPE_*} constants.
-     */
-    public void setSubType(int type) {
-        LittleEndian.putInt(_data, 12, type);
-    }
-
-    /**
-     * Gets the reference to the persistent object
-     *
-     * @return the reference to the persistent object, corresponds with an
-     *         {@code ExOleObjStg} storage container.
-     */
-    public int getObjStgDataRef() {
-        return LittleEndian.getInt(_data, 16);
-    }
-
-    /**
-     * Sets the reference to the persistent object
-     *
-     * @param ref the reference to the persistent object, corresponds with an
-     *         {@code ExOleObjStg} storage container.
-     */
-    public void setObjStgDataRef(int ref) {
-        LittleEndian.putInt(_data, 16, ref);
-    }
-
-    /**
-     * Gets whether the object's image is blank.
-     *
-     * @return {@code true} if the object's image is blank.
-     */
-    public boolean getIsBlank() {
-        // Even though this is a mere boolean, KOffice's code says it's an int.
-        return LittleEndian.getInt(_data, 20) != 0;
-    }
-    
-    /**
-     * Gets misc options (the last four bytes in the atom).
-     *
-     * @return {@code true} if the object's image is blank.
-     */
-    public int getOptions() {
-        // Even though this is a mere boolean, KOffice's code says it's an int.
-        return LittleEndian.getInt(_data, 20);
-    }
-
-    /**
-     * Sets misc options (the last four bytes in the atom).
-     */
-    public void setOptions(int opts) {
-        // Even though this is a mere boolean, KOffice's code says it's an int.
-        LittleEndian.putInt(_data, 20, opts);
-    }
-
-    /**
-     * Returns the type (held as a little endian in bytes 3 and 4)
-     * that this class handles.
-     */
-    public long getRecordType() {
-        return RecordTypes.ExOleObjAtom.typeID;
-    }
-
-    /**
-     * Have the contents printer out into an OutputStream, used when
-     * writing a file back out to disk
-     * (Normally, atom classes will keep their bytes around, but
-     * non atom classes will just request the bytes from their
-     * children, then chuck on their header and return)
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-
-    public String toString(){
-        StringBuffer buf = new StringBuffer();
-        buf.append("ExOleObjAtom\n");
-        buf.append("  drawAspect: " + getDrawAspect() + "\n");
-        buf.append("  type: " + getType() + "\n");
-        buf.append("  objID: " + getObjID() + "\n");
-        buf.append("  subType: " + getSubType() + "\n");
-        buf.append("  objStgDataRef: " + getObjStgDataRef() + "\n");
-        buf.append("  options: " + getOptions() + "\n");
-        return buf.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java
deleted file mode 100644
index e705d24..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.InflaterInputStream;
-
-import org.apache.poi.util.BoundedInputStream;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Storage for embedded OLE objects.
- *
- * @author Daniel Noll
- */
-public class ExOleObjStg extends RecordAtom implements PositionDependentRecord, PersistRecord {
-
-    private int _persistId; // Found from PersistPtrHolder
-
-    /**
-     * Record header.
-     */
-    private final byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a new empty storage container.
-     */
-    public ExOleObjStg() {
-        _header = new byte[8];
-        _data = new byte[0];
-
-        LittleEndian.putShort(_header, 0, (short)0x10);
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected ExOleObjStg(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-    }
-
-    public boolean isCompressed() {
-        return LittleEndian.getShort(_header, 0)!=0;
-    }
-
-    /**
-     * Gets the uncompressed length of the data.
-     *
-     * @return the uncompressed length of the data.
-     */
-    public int getDataLength() {
-        if (isCompressed()) {
-            return LittleEndian.getInt(_data, 0);
-        } else {
-            return _data.length;
-        }
-    }
-
-    /**
-     * Opens an input stream which will decompress the data on the fly.
-     *
-     * @return the data input stream.
-     */
-    public InputStream getData() {
-        if (isCompressed()) {
-            int size = LittleEndian.getInt(_data);
-
-            InputStream compressedStream = new ByteArrayInputStream(_data, 4, _data.length);
-            return new BoundedInputStream(new InflaterInputStream(compressedStream), size);
-        } else {
-            return new ByteArrayInputStream(_data, 0, _data.length);
-        }
-    }
-
-    public byte[] getRawData() {
-        return _data;
-    }
-
-    /**
-     * Sets the embedded data.
-     *
-     * @param data the embedded data.
-     */
-     public void setData(byte[] data) throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        //first four bytes is the length of the raw data
-        byte[] b = new byte[4];
-        LittleEndian.putInt(b, 0, data.length);
-        out.write(b);
-
-        DeflaterOutputStream def = new DeflaterOutputStream(out);
-        def.write(data, 0, data.length);
-        def.finish();
-        _data = out.toByteArray();
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-
-    /**
-     * Gets the record type.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.ExOleObjStg.typeID;
-    }
-
-    /**
-     * Gets the record instance from the header
-     *
-     * @return record instance
-     */
-    public int getRecordInstance() {
-        return (LittleEndian.getUShort(_header, 0) >>> 4);
-    }
-    
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk.
-     *
-     * @param out the output stream to write to.
-     * @throws IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-
-    /**
-     * Fetch our sheet ID, as found from a PersistPtrHolder.
-     * Should match the RefId of our matching SlidePersistAtom
-     */
-    public int getPersistId() {
-        return _persistId;
-    }
-
-    /**
-     * Set our sheet ID, as found from a PersistPtrHolder
-     */
-    public void setPersistId(int id) {
-        _persistId = id;
-    }
-
-    /** Our location on the disk, as of the last write out */
-    protected int myLastOnDiskOffset;
-
-    /** Fetch our location on the disk, as of the last write out */
-    public int getLastOnDiskOffset() { return myLastOnDiskOffset; }
-
-    /**
-     * Update the Record's idea of where on disk it lives, after a write out.
-     * Use with care...
-     */
-    public void setLastOnDiskOffset(int offset) {
-        myLastOnDiskOffset = offset;
-    }
-
-    @Override
-    public void updateOtherRecordReferences(Map<Integer,Integer> oldToNewReferencesLookup) {
-        // nothing to update
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
deleted file mode 100644
index 473201f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * A container record that specifies information about external video data.
- *
- * @author Yegor Kozlov
- */
-public final class ExVideoContainer extends RecordContainer {
-	private byte[] _header;
-
-	// Links to our more interesting children
-	private ExMediaAtom mediaAtom;
-    //the UNC or local path to a video file.
-    private CString pathAtom;
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected ExVideoContainer(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-		findInterestingChildren();
-	}
-
-	/**
-	 * Go through our child records, picking out the ones that are
-	 *  interesting, and saving those for use by the easy helper
-	 *  methods.
-	 */
-	private void findInterestingChildren() {
-
-		// First child should be the ExMediaAtom
-		if(_children[0] instanceof ExMediaAtom) {
-			mediaAtom = (ExMediaAtom)_children[0];
-		} else {
-			logger.log(POILogger.ERROR, "First child record wasn't a ExMediaAtom, was of type " + _children[0].getRecordType());
-		}
-        if(_children[1] instanceof CString) {
-            pathAtom = (CString)_children[1];
-        } else {
-            logger.log(POILogger.ERROR, "Second child record wasn't a CString, was of type " + _children[1].getRecordType());
-        }
-	}
-
-	/**
-	 * Create a new ExVideoContainer, with blank fields
-	 */
-	public ExVideoContainer() {
-        // Setup our header block
-		_header = new byte[8];
-		_header[0] = 0x0f; // We are a container record
-		LittleEndian.putShort(_header, 2, (short)getRecordType());
-
-        _children = new Record[2];
-		_children[0] = mediaAtom = new ExMediaAtom();
-		_children[1] = pathAtom = new CString();
-	}
-
-	/**
-	 * We are of type 4103
-	 */
-	public long getRecordType() { return RecordTypes.ExVideoContainer.typeID; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],getRecordType(),_children,out);
-	}
-
-    /**
-     * Returns the ExMediaAtom of this link
-     */
-    public ExMediaAtom getExMediaAtom() { return mediaAtom; }
-
-    /**
-     * Returns the Path Atom (CString) of this link
-     */
-    public CString getPathAtom() { return pathAtom; }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
deleted file mode 100644
index b90c698..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.hslf.model.PPFont;
-import org.apache.poi.util.POILogger;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * <code>FontCollection</code> ia a container that holds information
- * about all the fonts in the presentation.
- *
- * @author Yegor Kozlov
- */
-
-public final class FontCollection extends RecordContainer {
-    private List<String> fonts;
-    private byte[] _header;
-
-	protected FontCollection(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		_children = Record.findChildRecords(source,start+8,len-8);
-
-		// Save font names into <code>List</code>
-		fonts = new ArrayList<String>();
-		for (int i = 0; i < _children.length; i++){
-			if(_children[i] instanceof FontEntityAtom) {
-	            FontEntityAtom atom = (FontEntityAtom)_children[i];
-	            fonts.add(atom.getFontName());
-			} else {
-				logger.log(POILogger.WARN, "Warning: FontCollection child wasn't a FontEntityAtom, was " + _children[i]);
-			}
-		}
-	}
-
-	/**
-	 * Return the type, which is 2005
-	 */
-	public long getRecordType() {
-        return RecordTypes.FontCollection.typeID;
-    }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],getRecordType(),_children,out);
-	}
-
-    /**
-     * Add font with the specified name to the font collection.
-     * If the font is already present return its index.
-     * @param name of the font
-     * @return zero based index of the font in the collection
-     */
-    public int addFont(String name) {
-        int idx = getFontIndex(name);
-        if (idx != -1) return idx;
-
-        return addFont(name, 0, 0, 4, PPFont.FF_SWISS | PPFont.VARIABLE_PITCH);
-    }
-
-    public int addFont(String name, int charset, int flags, int type, int pitch) {
-        FontEntityAtom fnt = new FontEntityAtom();
-        fnt.setFontIndex(fonts.size() << 4);
-        fnt.setFontName(name);
-        fnt.setCharSet(charset);
-        fnt.setFontFlags(flags);
-        fnt.setFontType(type);
-        fnt.setPitchAndFamily(pitch);
-        fonts.add(name);
-
-        // Append new child to the end
-		appendChildRecord(fnt);
-
-        return fonts.size()-1; //the added font is the last in the list
-    }
-
-    /**
-     * @return zero based index of the font in the collection or -1 if not found
-     */
-    public int getFontIndex(String name) {
-        for (int i = 0; i < fonts.size(); i++) {
-            if(fonts.get(i).equals(name)){
-                //if the font is already present return its index
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    public int getNumberOfFonts() {
-        return fonts.size();
-    }
-
-    /**
-	 * Get the name of the font at the given ID, or null if there is
-	 *  no font at that ID.
-	 * @param id
-	 */
-	public String getFontWithId(int id) {
-		if(id >= fonts.size()) {
-			// No font with that id
-			return null;
-		}
-		return fonts.get(id);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java
deleted file mode 100644
index 23a7fe1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
-/**
- * This atom corresponds exactly to a Windows Logical Font (LOGFONT) structure.
- * It keeps all the information needed to define the attributes of a font,
- * such as height, width, etc. For more information, consult the
- * Windows API Programmer's reference.
- *
- * @author Yegor Kozlov
- */
-
-public final class FontEntityAtom extends RecordAtom {
-	/**
-     * record header
-     */
-    private byte[] _header;
-
-	/**
-     * record data
-     */
-	private byte[] _recdata;
-
-    /**
-     * Build an instance of <code>FontEntityAtom</code> from on-disk data
-     */
-	protected FontEntityAtom(byte[] source, int start, int len) {
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the record data
-		_recdata = new byte[len-8];
-		System.arraycopy(source,start+8,_recdata,0,len-8);
-	}
-
-    /**
-     * Create a new instance of <code>FontEntityAtom</code>
-     */
-    public FontEntityAtom() {
-        _recdata = new byte[68];
-
-        _header = new byte[8];
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _recdata.length);
-    }
-
-    public long getRecordType() {
-        return RecordTypes.FontEntityAtom.typeID;
-    }
-
-    /**
-     * A null-terminated string that specifies the typeface name of the font.
-     * The length of this string must not exceed 32 characters
-	 *  including the null terminator.
-     * @return font name
-     */
-    public String getFontName(){
-    	int maxLen = Math.min(_recdata.length,64);
-        for(int i = 0; i < maxLen; i+=2){
-            //loop until find null-terminated end of the font name
-            if(_recdata[i] == 0 && _recdata[i + 1] == 0) {
-                return StringUtil.getFromUnicodeLE(_recdata, 0, i/2);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Set the name of the font.
-     * The length of this string must not exceed 32 characters
-	 *  including the null terminator.
-	 * Will be converted to null-terminated if not already
-     * @param name of the font
-     */
-    public void setFontName(String name){
-		// Add a null termination if required
-		if(! name.endsWith("\u0000")) {
-			name += '\u0000';
-		}
-
-		// Ensure it's not now too long
-		if(name.length() > 32) {
-			throw new RuntimeException("The length of the font name, including null termination, must not exceed 32 characters");
-		}
-
-		// Everything's happy, so save the name
-        byte[] bytes = StringUtil.getToUnicodeLE(name);
-        System.arraycopy(bytes, 0, _recdata, 0, bytes.length);
-    }
-
-    public void setFontIndex(int idx){
-        LittleEndian.putShort(_header, 0, (short)idx);
-    }
-
-    public int getFontIndex(){
-        return LittleEndian.getShort(_header, 0) >> 4;
-    }
-
-    /**
-     * set the character set
-     *
-     * @param charset - characterset
-     */
-    public void setCharSet(int charset){
-        _recdata[64] = (byte)charset;
-    }
-
-    /**
-     * get the character set
-     *
-     * @return charset - characterset
-     */
-    public int getCharSet(){
-        return _recdata[64];
-    }
-
-    /**
-     * set the font flags
-     * Bit 1: If set, font is subsetted
-     *
-     * @param flags - the font flags
-     */
-    public void setFontFlags(int flags){
-        _recdata[65] = (byte)flags;
-    }
-
-    /**
-     * get the character set
-     * Bit 1: If set, font is subsetted
-     *
-     * @return the font flags
-     */
-    public int getFontFlags(){
-        return _recdata[65];
-    }
-
-    /**
-     * set the font type
-     * <p>
-     * Bit 1: Raster Font
-     * Bit 2: Device Font
-     * Bit 3: TrueType Font
-     * </p>
-     *
-     * @param type - the font type
-     */
-    public void setFontType(int type){
-        _recdata[66] = (byte)type;
-    }
-
-    /**
-     * get the font type
-     * <p>
-     * Bit 1: Raster Font
-     * Bit 2: Device Font
-     * Bit 3: TrueType Font
-     * </p>
-     *
-     * @return the font type
-     */
-    public int getFontType(){
-        return _recdata[66];
-    }
-
-    /**
-     * set lfPitchAndFamily
-     *
-     *
-     * @param val - Corresponds to the lfPitchAndFamily field of the Win32 API LOGFONT structure
-     */
-    public void setPitchAndFamily(int val){
-        _recdata[67] = (byte)val;
-    }
-
-    /**
-     * get lfPitchAndFamily
-     *
-     * @return corresponds to the lfPitchAndFamily field of the Win32 API LOGFONT structure
-     */
-    public int getPitchAndFamily(){
-        return _recdata[67];
-    }
-
-    /**
-	 * Write the contents of the record back, so it can be written to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		out.write(_header);
-		out.write(_recdata);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
deleted file mode 100644
index e6a2cdc..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherClientDataRecord;
-import org.apache.poi.ddf.EscherRecordFactory;
-import org.apache.poi.ddf.EscherSerializationListener;
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An atom record that specifies whether a shape is a placeholder shape.
- * The number, position, and type of placeholder shapes are determined by
- * the slide layout as specified in the SlideAtom record.
- * 
- * @since POI 3.14-Beta2
- */
-public class HSLFEscherClientDataRecord extends EscherClientDataRecord {
-
-    private final List<Record> _childRecords = new ArrayList<Record>();
-    
-    public List<? extends Record> getHSLFChildRecords() { 
-        return _childRecords;
-    }
-    
-    public void removeChild(Class<? extends Record> childClass) {
-        Iterator<Record> iter = _childRecords.iterator();
-        while (iter.hasNext()) {
-            if (childClass.isInstance(iter.next())) {
-                iter.remove();
-            }
-        }
-    }
-    
-    public void addChild(Record childRecord) {
-        _childRecords.add(childRecord);
-    }
-    
-    @Override
-    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
-        int bytesRemaining = readHeader( data, offset );
-        byte remainingData[] = new byte[bytesRemaining];
-        System.arraycopy(data, offset+8, remainingData, 0, bytesRemaining);
-        setRemainingData(remainingData);
-        return bytesRemaining + 8;
-    }
-
-    @Override
-    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
-        listener.beforeRecordSerialize( offset, getRecordId(), this );
-        
-        LittleEndian.putShort(data, offset, getOptions());
-        LittleEndian.putShort(data, offset+2, getRecordId());
-        
-        byte childBytes[] = getRemainingData();
-        
-        LittleEndian.putInt(data, offset+4, childBytes.length);
-        System.arraycopy(childBytes, 0, data, offset+8, childBytes.length);
-        int recordSize = 8+childBytes.length;
-        listener.afterRecordSerialize( offset+recordSize, getRecordId(), recordSize, this );
-        return recordSize;
-    }
-
-    @Override
-    public int getRecordSize() {
-        return 8 + getRemainingData().length;
-    }
-    
-    @Override
-    public byte[] getRemainingData() {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        try {
-            for (Record r : _childRecords) {
-                r.writeOut(bos);
-            }
-        } catch (IOException e) {
-            throw new HSLFException(e);
-        }
-        return bos.toByteArray();
-    }
-
-    @Override
-    public void setRemainingData( byte[] remainingData ) {
-        _childRecords.clear();
-        int offset = 0;
-        while (offset < remainingData.length) {
-            Record r = Record.buildRecordAtOffset(remainingData, offset);
-            _childRecords.add(r);
-            long rlen = LittleEndian.getUInt(remainingData,offset+4);
-            offset += 8 + rlen;
-        }
-    }
-    
-    public String getRecordName() {
-        return "HSLFClientData";
-    }
-
-    
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
deleted file mode 100644
index bd8d507..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.lang.reflect.Constructor;
-import java.util.Map;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Generates escher records when provided the byte array containing those records.
- *
- * @see EscherRecordFactory
- */
-public class HSLFEscherRecordFactory extends DefaultEscherRecordFactory {
-    private static Class<?>[] escherRecordClasses = { EscherPlaceholder.class, HSLFEscherClientDataRecord.class };
-    private static Map<Short, Constructor<? extends EscherRecord>> recordsMap = recordsToMap( escherRecordClasses );
-
-    
-    /**
-     * Creates an instance of the escher record factory
-     */
-    public HSLFEscherRecordFactory() {
-        // no instance initialisation
-    }
-    
-    @Override
-    public EscherRecord createRecord(byte[] data, int offset) {
-        short options = LittleEndian.getShort( data, offset );
-        short recordId = LittleEndian.getShort( data, offset + 2 );
-        // int remainingBytes = LittleEndian.getInt( data, offset + 4 );
-
-        Constructor<? extends EscherRecord> recordConstructor = recordsMap.get(Short.valueOf(recordId));
-        if (recordConstructor == null) {
-            return super.createRecord(data, offset);
-        }
-        EscherRecord escherRecord = null;
-        try {
-            escherRecord = recordConstructor.newInstance(new Object[] {});
-        } catch (Exception e) {
-            return super.createRecord(data, offset);
-        }
-        escherRecord.setRecordId(recordId);
-        escherRecord.setOptions(options);
-        if (escherRecord instanceof EscherContainerRecord) {
-            ((EscherContainerRecord)escherRecord).fillFields(data, offset, this);
-        }
-        
-        return escherRecord;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java
deleted file mode 100644
index b900605..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * An atom record that specifies options for displaying headers and footers
- * on a presentation slide or notes slide.
- *
- * @author Yegor Kozlov
- */
-
-public final class HeadersFootersAtom extends RecordAtom {
-
-    /**
-     * A bit that specifies whether the date is displayed in the footer.
-     * @see #getMask()
-     * @see #setMask(int)
-     */
-    public static final int fHasDate = 1;
-
-    /**
-     * A bit that specifies whether the current datetime is used for displaying the datetime.
-     * @see #getMask()
-     * @see #setMask(int)
-     */
-    public static final int fHasTodayDate = 2;
-
-    /**
-     * A bit that specifies whether the date specified in UserDateAtom record
-     * is used for displaying the datetime.
-     *
-     * @see #getMask()
-     * @see #setMask(int)
-     */
-     public static final int fHasUserDate = 4;
-
-    /**
-     * A bit that specifies whether the slide number is displayed in the footer.
-     *
-     * @see #getMask()
-     * @see #setMask(int)
-     */
-    public static final int fHasSlideNumber = 8;
-
-    /**
-     * bit that specifies whether the header text is displayed.
-     *
-     * @see #getMask()
-     * @see #setMask(int)
-     */
-    public static final int fHasHeader = 16;
-
-    /**
-     * bit that specifies whether the footer text is displayed.
-     *
-     * @see #getMask()
-     * @see #setMask(int)
-     */
-    public static final int fHasFooter = 32;
-
-    /**
-     * record header
-     */
-    private byte[] _header;
-
-	/**
-     * record data
-     */
-	private byte[] _recdata;
-
-    /**
-     * Build an instance of <code>HeadersFootersAtom</code> from on-disk data
-     */
-	protected HeadersFootersAtom(byte[] source, int start, int len) {
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the record data
-		_recdata = new byte[len-8];
-		System.arraycopy(source,start+8,_recdata,0,len-8);
-	}
-
-    /**
-     * Create a new instance of <code>HeadersFootersAtom</code>
-     */
-    public HeadersFootersAtom() {
-        _recdata = new byte[4];
-
-        _header = new byte[8];
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _recdata.length);
-    }
-
-    public long getRecordType() {
-        return RecordTypes.HeadersFootersAtom.typeID;
-    }
-
-    /**
-	 * Write the contents of the record back, so it can be written to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		out.write(_header);
-		out.write(_recdata);
-	}
-
-    /**
-     * A signed integer that specifies the format ID to be used to style the datetime.
-     * <p>
-     * It MUST be in the range [0, 12]. </br>
-     * This value is converted into a string as specified by the index field of the DateTimeMCAtom record.
-     * It MUST be ignored unless fHasTodayDate is TRUE.
-     * </b>
-     *
-     * @return  A signed integer that specifies the format ID to be used to style the datetime.
-     */
-    public int getFormatId(){
-        return LittleEndian.getShort(_recdata, 0);
-    }
-
-    /**
-     * A signed integer that specifies the format ID to be used to style the datetime.
-     *
-     * @param formatId  A signed integer that specifies the format ID to be used to style the datetime.
-     */
-    public void setFormatId(int formatId){
-         LittleEndian.putUShort(_recdata, 0, formatId);
-    }
-
-    /**
-     *  A bit mask specifying options for displaying headers and footers
-     *
-     * <li> A - {@link #fHasDate} (1 bit): A bit that specifies whether the date is displayed in the footer.
-     * <li> B - {@link #fHasTodayDate} (1 bit): A bit that specifies whether the current datetime is used for
-     *      displaying the datetime.
-     * <li> C - {@link #fHasUserDate} (1 bit): A bit that specifies whether the date specified in UserDateAtom record
-     *      is used for displaying the datetime.
-     * <li> D - {@link #fHasSlideNumber} (1 bit): A bit that specifies whether the slide number is displayed in the footer.
-     * <li> E - {@link #fHasHeader} (1 bit): A bit that specifies whether the header text specified by HeaderAtom
-     *      record is displayed.
-     * <li> F - {@link #fHasFooter} (1 bit): A bit that specifies whether the footer text specified by FooterAtom
-     *      record is displayed.
-     * <li> reserved (10 bits): MUST be zero and MUST be ignored.
-     *
-     * @return A bit mask specifying options for displaying headers and footers
-     */
-    public int getMask(){
-        return LittleEndian.getShort(_recdata, 2);
-    }
-
-    /**
-     *  A bit mask specifying options for displaying headers and footers
-     *
-     * @param mask A bit mask specifying options for displaying headers and footers
-     */
-    public void setMask(int mask){
-        LittleEndian.putUShort(_recdata, 2, mask);
-    }
-
-    /**
-     * @param bit the bit to check
-     * @return whether the specified flag is set
-     */
-    public boolean getFlag(int bit){
-        return (getMask() & bit) != 0;
-    }
-
-    /**
-     * @param  bit the bit to set
-     * @param  value whether the specified bit is set
-     */
-    public void setFlag(int bit, boolean value){
-        int mask = getMask();
-        if(value) mask |= bit;
-        else mask &= ~bit;
-        setMask(mask);
-    }
-
-    public String toString(){
-        StringBuffer buf = new StringBuffer();
-        buf.append("HeadersFootersAtom\n");
-        buf.append("\tFormatId: " + getFormatId() + "\n");
-        buf.append("\tMask    : " + getMask() + "\n");
-        buf.append("\t  fHasDate        : " + getFlag(fHasDate) + "\n");
-        buf.append("\t  fHasTodayDate   : " + getFlag(fHasTodayDate) + "\n");
-        buf.append("\t  fHasUserDate    : " + getFlag(fHasUserDate) + "\n");
-        buf.append("\t  fHasSlideNumber : " + getFlag(fHasSlideNumber) + "\n");
-        buf.append("\t  fHasHeader      : " + getFlag(fHasHeader) + "\n");
-        buf.append("\t  fHasFooter      : " + getFlag(fHasFooter) + "\n");
-        return buf.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
deleted file mode 100644
index 9f2a0ee..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * A container record that specifies information about the footers on a presentation slide.
- * <p>
- * It contains:<br>
- * <li> 1. {@link HeadersFootersAtom}
- * <li> 2. {@link CString }, Instance UserDate (0), optional: Stores the user's date.
- *    This is the date that the user wants in the footers, instead of today's date.
- * <li> 3. {@link CString }, Instance Header (1), optional: Stores the Header's contents.
- * <li> 4. {@link CString }, Instance Footer (2), optional: Stores the Footer's contents.
- * </p>
- *
- * @author Yegor Kozlov
- */
-public final class HeadersFootersContainer extends RecordContainer {
-
-    /**
-     * "instance" field in the record header indicating that this HeadersFootersContaine
-     *  is applied for slides
-     */
-    public static final short SlideHeadersFootersContainer = 0x3F;
-    /**
-      * "instance" field in the record header indicating that this HeadersFootersContaine
-     *   is applied for notes and handouts
-      */
-    public static final short NotesHeadersFootersContainer = 0x4F;
-
-    public static final int USERDATEATOM    = 0;
-    public static final int HEADERATOM      = 1;
-    public static final int FOOTERATOM      = 2;
-
-    private byte[] _header;
-    private HeadersFootersAtom hdAtom;
-    private CString csDate, csHeader, csFooter;
-
-    protected HeadersFootersContainer(byte[] source, int start, int len) {
-        // Grab the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        _children = Record.findChildRecords(source,start+8,len-8);
-        for(int i=0; i < _children.length; i++){
-            if(_children[i] instanceof HeadersFootersAtom) hdAtom = (HeadersFootersAtom)_children[i];
-            else if(_children[i] instanceof CString) {
-                CString cs = (CString)_children[i];
-                int opts = cs.getOptions() >> 4;
-                switch(opts){
-                    case USERDATEATOM: csDate = cs; break;
-                    case HEADERATOM: csHeader = cs; break;
-                    case FOOTERATOM: csFooter = cs; break;
-                    default:
-                        logger.log(POILogger.WARN, "Unexpected CString.Options in HeadersFootersContainer: " + opts);
-                        break;
-                }
-            } else {
-                logger.log(POILogger.WARN, "Unexpected record in HeadersFootersContainer: " + _children[i]);
-            }
-        }
-
-    }
-
-    public HeadersFootersContainer(short options) {
-        _header = new byte[8];
-        LittleEndian.putShort(_header, 0, options);
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-
-        hdAtom = new HeadersFootersAtom();
-        _children = new Record[]{
-            hdAtom
-        };
-        csDate = csHeader = csFooter = null;
-
-    }
-
-    /**
-     * Return the type, which is <code>{@link RecordTypes#HeadersFooters}</code>
-     */
-    public long getRecordType() {
-        return RecordTypes.HeadersFooters.typeID;
-    }
-
-    /**
-     * Must be either {@link #SlideHeadersFootersContainer} or {@link #NotesHeadersFootersContainer}
-     *
-     * @return "instance" field in the record header
-     */
-    public int getOptions(){
-        return LittleEndian.getShort(_header, 0);
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written to disk
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        writeOut(_header[0],_header[1],getRecordType(),_children,out);
-    }
-
-    /**
-     * HeadersFootersAtom stores the basic information of the header and footer structure.
-     *
-     * @return <code>HeadersFootersAtom</code>
-     */
-    public HeadersFootersAtom getHeadersFootersAtom(){
-        return hdAtom;
-    }
-
-    /**
-     * A {@link CString} record that stores the user's date.
-     * <p>This is the date that the user wants in the footers, instead of today's date.</p>
-     *
-     * @return A {@link CString} record that stores the user's date or <code>null</code>
-     */
-    public CString getUserDateAtom(){
-        return csDate;
-    }
-
-    /**
-     * A {@link CString} record that stores the Header's contents.
-     *
-     * @return A {@link CString} record that stores the Header's contents or <code>null</code>
-     */
-    public CString getHeaderAtom(){
-        return csHeader;
-    }
-
-    /**
-     * A {@link CString} record that stores the Footers's contents.
-     *
-     * @return A {@link CString} record that stores the Footers's contents or <code>null</code>
-     */
-    public CString getFooterAtom(){
-        return csFooter;
-    }
-
-    /**
-     * Insert a {@link CString} record that stores the user's date.
-     *
-     * @return  the created {@link CString} record that stores the user's date.
-     */
-    public CString addUserDateAtom(){
-        if(csDate != null) return csDate;
-
-        csDate = new CString();
-        csDate.setOptions(USERDATEATOM << 4);
-
-        addChildAfter(csDate, hdAtom);
-
-        return csDate;
-    }
-
-    /**
-     * Insert a {@link CString} record that stores the user's date.
-     *
-     * @return  the created {@link CString} record that stores the user's date.
-     */
-    public CString addHeaderAtom(){
-        if(csHeader != null) return csHeader;
-
-        csHeader = new CString();
-        csHeader.setOptions(HEADERATOM << 4);
-
-        Record r = hdAtom;
-        if(csDate != null) r = hdAtom;
-        addChildAfter(csHeader, r);
-
-        return csHeader;
-    }
-
-    /**
-     * Insert a {@link CString} record that stores the user's date.
-     *
-     * @return  the created {@link CString} record that stores the user's date.
-     */
-    public CString addFooterAtom(){
-        if(csFooter != null) return csFooter;
-
-        csFooter = new CString();
-        csFooter.setOptions(FOOTERATOM << 4);
-
-        Record r = hdAtom;
-        if(csHeader != null) r = csHeader;
-        else if(csDate != null) r = csDate;
-        addChildAfter(csFooter, r);
-
-        return csFooter;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
deleted file mode 100644
index 8ca722d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class represents the metadata of a link in a slide/notes/etc.
- * It normally just holds a InteractiveInfoAtom, with the metadata
- *  in it.
- * @author Nick Burch
- */
-public class InteractiveInfo extends RecordContainer {
-	private byte[] _header;
-	private static long _type = 4082;
-	
-	// Links to our more interesting children
-	private InteractiveInfoAtom infoAtom;
-	
-	/** 
-	 * Returns the InteractiveInfoAtom of this InteractiveInfo
-	 */ 
-	public InteractiveInfoAtom getInteractiveInfoAtom() { return infoAtom; }
-	
-	/** 
-	 * Set things up, and find our more interesting children
-	 */
-	protected InteractiveInfo(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-		findInterestingChildren();
-	}
-
-	/**
-	 * Go through our child records, picking out the ones that are
-	 *  interesting, and saving those for use by the easy helper
-	 *  methods.
-	 */	
-	private void findInterestingChildren() {
-		// First child should be the InteractiveInfoAtom
-	    if (_children == null || _children.length == 0 || !(_children[0] instanceof InteractiveInfoAtom)) {
-	        logger.log(POILogger.WARN, "First child record wasn't a InteractiveInfoAtom - leaving this atom in an invalid state...");
-	        return;
-	    }
-
-	    infoAtom = (InteractiveInfoAtom)_children[0];
-	}
-	
-	/**
-	 * Create a new InteractiveInfo, with blank fields
-	 */
-	public InteractiveInfo() {
-		_header = new byte[8];
-		_children = new Record[1];
-		
-		// Setup our header block
-		_header[0] = 0x0f; // We are a container record
-		LittleEndian.putShort(_header, 2, (short)_type);
-		
-		// Setup our child records
-		infoAtom = new InteractiveInfoAtom();
-		_children[0] = infoAtom;
-	}
-
-	/**
-	 * We are of type 4802
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java
deleted file mode 100644
index 6dd8fcc..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Tne atom that holds metadata on Links in the document.
- * (The actual link is held Document.ExObjList.ExHyperlink)
- *
- * @author Nick Burch
- * @author Yegor Kozlov
- */
-public class InteractiveInfoAtom extends RecordAtom {
-
-    /**
-     * Action Table
-     */
-    public static final byte ACTION_NONE = 0;
-    public static final byte ACTION_MACRO = 1;
-    public static final byte ACTION_RUNPROGRAM = 2;
-    public static final byte ACTION_JUMP = 3;
-    public static final byte ACTION_HYPERLINK = 4;
-    public static final byte ACTION_OLE = 5;
-    public static final byte ACTION_MEDIA = 6;
-    public static final byte ACTION_CUSTOMSHOW = 7;
-
-    /**
-     *  Jump Table
-     */
-    public static final byte JUMP_NONE = 0;
-    public static final byte JUMP_NEXTSLIDE = 1;
-    public static final byte JUMP_PREVIOUSSLIDE = 2;
-    public static final byte JUMP_FIRSTSLIDE = 3;
-    public static final byte JUMP_LASTSLIDE = 4;
-    public static final byte JUMP_LASTSLIDEVIEWED = 5;
-    public static final byte JUMP_ENDSHOW = 6;
-
-    /**
-     * Types of hyperlinks
-     */
-    public static final byte LINK_NextSlide = 0x00;
-    public static final byte LINK_PreviousSlide = 0x01;
-    public static final byte LINK_FirstSlide = 0x02;
-    public static final byte LINK_LastSlide = 0x03;
-    public static final byte LINK_CustomShow = 0x06;
-    public static final byte LINK_SlideNumber = 0x07;
-    public static final byte LINK_Url = 0x08;
-    public static final byte LINK_OtherPresentation = 0x09;
-    public static final byte LINK_OtherFile = 0x0A;
-    public static final byte LINK_NULL = (byte)0xFF;
-
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a brand new link related atom record.
-     */
-    protected InteractiveInfoAtom() {
-        _header = new byte[8];
-        _data = new byte[16];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-
-        // It is fine for the other values to be zero
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected InteractiveInfoAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-        // Must be at least 16 bytes long
-        if(_data.length < 16) {
-        	throw new IllegalArgumentException("The length of the data for a InteractiveInfoAtom must be at least 16 bytes, but was only " + _data.length);
-        }
-
-        // First 4 bytes - no idea, normally 0
-        // Second 4 bytes - the id of the link (from 1 onwards)
-        // Third 4 bytes - no idea, normally 4
-        // Fourth 4 bytes - no idea, normally 8
-    }
-
-    /**
-     * Gets the link number. You will normally look the
-     *  ExHyperlink with this number to get the details.
-     * @return the link number
-     */
-    public int getHyperlinkID() {
-        return LittleEndian.getInt(_data,4);
-    }
-
-    /**
-     * Sets the persistent unique identifier of the link
-     *
-     * @param number the persistent unique identifier of the link
-     */
-    public void setHyperlinkID(int number) {
-        LittleEndian.putInt(_data,4,number);
-    }
-
-    /**
-     * a reference to a sound in the sound collection.
-     */
-    public int getSoundRef() {
-        return LittleEndian.getInt(_data,0);
-    }
-    /**
-     * a reference to a sound in the sound collection.
-     *
-     * @param val a reference to a sound in the sound collection
-     */
-    public void setSoundRef(int val) {
-    	LittleEndian.putInt(_data, 0, val);
-    }
-
-    /**
-     * Hyperlink Action.
-     * <p>
-     * see <code>ACTION_*</code> constants for the list of actions
-     * </p>
-     *
-     * @return hyperlink action.
-     */
-    public byte getAction() {
-        return _data[8];
-    }
-
-    /**
-     * Hyperlink Action
-     * <p>
-     * see <code>ACTION_*</code> constants for the list of actions
-     * </p>
-     *
-     * @param val hyperlink action.
-     */
-    public void setAction(byte val) {
-    	_data[8] = val;
-    }
-
-    /**
-     * Only valid when action == OLEAction. OLE verb to use, 0 = first verb, 1 = second verb, etc.
-     */
-    public byte getOleVerb() {
-        return _data[9];
-    }
-
-    /**
-     * Only valid when action == OLEAction. OLE verb to use, 0 = first verb, 1 = second verb, etc.
-     */
-    public void setOleVerb(byte val) {
-    	_data[9] = val;
-    }
-
-    /**
-     * Jump
-     * <p>
-     * see <code>JUMP_*</code> constants for the list of actions
-     * </p>
-     *
-     * @return jump
-     */
-    public byte getJump() {
-        return _data[10];
-    }
-
-    /**
-     * Jump
-     * <p>
-     * see <code>JUMP_*</code> constants for the list of actions
-     * </p>
-     *
-     * @param val jump
-     */
-    public void setJump(byte val) {
-    	_data[10] = val;
-    }
-
-    /**
-     * Flags
-     * <p>
-     * <li> Bit 1: Animated. If 1, then button is animated
-     * <li> Bit 2: Stop sound. If 1, then stop current sound when button is pressed.
-     * <li> Bit 3: CustomShowReturn. If 1, and this is a jump to custom show,
-     *   then return to this slide after custom show.
-     * </p>
-     */
-    public byte getFlags() {
-        return _data[11];
-    }
-
-    /**
-     * Flags
-     * <p>
-     * <li> Bit 1: Animated. If 1, then button is animated
-     * <li> Bit 2: Stop sound. If 1, then stop current sound when button is pressed.
-     * <li> Bit 3: CustomShowReturn. If 1, and this is a jump to custom show,
-     *   then return to this slide after custom show.
-     * </p>
-     */
-    public void setFlags(byte val) {
-    	_data[11] = val;
-    }
-
-    /**
-     * hyperlink type
-     *
-     * @return hyperlink type
-     */
-    public byte getHyperlinkType() {
-        return _data[12];
-    }
-
-    /**
-     * hyperlink type
-     *
-     * @param val hyperlink type
-     */
-    public void setHyperlinkType(byte val) {
-    	_data[12] = val;
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return RecordTypes.InteractiveInfoAtom.typeID; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java
deleted file mode 100644
index eb1dade..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-/**
- * Master slide
- *
- * @author Yegor Kozlov
- */
-public final class MainMaster extends SheetContainer {
-	private byte[] _header;
-	private static long _type = 1016;
-
-	// Links to our more interesting children
-	private SlideAtom slideAtom;
-	private PPDrawing ppDrawing;
-	private TxMasterStyleAtom[] txmasters;
-	private ColorSchemeAtom[] clrscheme;
-	private ColorSchemeAtom _colorScheme;
-
-	/**
-	 * Returns the SlideAtom of this Slide
-	 */
-	public SlideAtom getSlideAtom() { return slideAtom; }
-
-	/**
-	 * Returns the PPDrawing of this Slide, which has all the
-	 *  interesting data in it
-	 */
-	public PPDrawing getPPDrawing() { return ppDrawing; }
-
-	public TxMasterStyleAtom[] getTxMasterStyleAtoms() { return txmasters; }
-
-	public ColorSchemeAtom[] getColorSchemeAtoms() { return clrscheme; }
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected MainMaster(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-
-		ArrayList<TxMasterStyleAtom> tx = new ArrayList<TxMasterStyleAtom>();
-		ArrayList<ColorSchemeAtom> clr = new ArrayList<ColorSchemeAtom>();
-		// Find the interesting ones in there
-		for(int i=0; i<_children.length; i++) {
-			if(_children[i] instanceof SlideAtom) {
-				slideAtom = (SlideAtom)_children[i];
-			} else if(_children[i] instanceof PPDrawing) {
-				ppDrawing = (PPDrawing)_children[i];
-			} else if(_children[i] instanceof TxMasterStyleAtom) {
-				tx.add( (TxMasterStyleAtom)_children[i] );
-			} else if(_children[i] instanceof ColorSchemeAtom) {
-				clr.add( (ColorSchemeAtom)_children[i] );
-			}
-
-			if(ppDrawing != null && _children[i] instanceof ColorSchemeAtom) {
-				_colorScheme = (ColorSchemeAtom)_children[i];
-			}
-
-		}
-		txmasters = tx.toArray(new TxMasterStyleAtom[tx.size()]);
-		clrscheme = clr.toArray(new ColorSchemeAtom[clr.size()]);
-	}
-
-	/**
-	 * We are of type 1016
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-
-	public ColorSchemeAtom getColorScheme(){
-		return _colorScheme;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java
deleted file mode 100644
index d38b390..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hslf.model.textproperties.IndentProp;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * Specifies the Indent Level for the text
- */
-public final class MasterTextPropAtom extends RecordAtom {
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    // indent details
-    private List<IndentProp> indents;
-
-    /**
-     * Constructs a new empty master text prop atom.
-     */
-    public MasterTextPropAtom() {
-        _header = new byte[8];
-        _data = new byte[0];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-        
-        indents = new ArrayList<IndentProp>();
-    }
-
-    /**
-     * Constructs the ruler atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected MasterTextPropAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-        try {
-            read();
-        } catch (Exception e){
-            logger.log(POILogger.ERROR, "Failed to parse MasterTextPropAtom", e);
-        }
-    }
-
-    /**
-     * Gets the record type.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.MasterTextPropAtom.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk.
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        write();
-        out.write(_header);
-        out.write(_data);
-    }
-    
-    /**
-     * Write the internal variables to the record bytes
-     */
-    private void write() {
-        int pos = 0;
-        _data = new byte[indents.size()*6];
-        for (IndentProp prop : indents) {
-            LittleEndian.putInt(_data, pos, prop.getCharactersCovered());
-            LittleEndian.putShort(_data, pos+4, (short)prop.getIndentLevel());
-            pos += 6;
-        }
-    }
-
-    /**
-     * Read the record bytes and initialize the internal variables
-     */
-    private void read() {
-        int pos = 0;
-        indents = new ArrayList<IndentProp>(_data.length/6);
-        
-        while (pos <= _data.length - 6) {
-            int count = LittleEndian.getInt(_data, pos);
-            short indent = LittleEndian.getShort(_data, pos+4);
-            indents.add(new IndentProp(count, indent));
-            pos += 6;
-        }
-    }
-    
-    /**
-     * Returns the indent that applies at the given text offset
-     */
-    public int getIndentAt(int offset) {
-        int charsUntil = 0;
-        for (IndentProp prop : indents) {
-            charsUntil += prop.getCharactersCovered();
-            if (offset < charsUntil) {
-                return prop.getIndentLevel();
-            }
-        }
-        return -1;
-    }
-    
-    public List<IndentProp> getIndents() {
-        return Collections.unmodifiableList(indents);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java
deleted file mode 100644
index 80ee603..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Master container for Notes. There is one of these for every page of
- *  notes, and they have certain specific children
- *
- * @author Nick Burch
- */
-
-public final class Notes extends SheetContainer
-{
-	private byte[] _header;
-	private static long _type = 1008l;
-
-	// Links to our more interesting children
-	private NotesAtom notesAtom;
-	private PPDrawing ppDrawing;
-    private ColorSchemeAtom _colorScheme;
-
-	/**
-	 * Returns the NotesAtom of this Notes
-	 */
-	public NotesAtom getNotesAtom() { return notesAtom; }
-	/**
-	 * Returns the PPDrawing of this Notes, which has all the
-	 *  interesting data in it
-	 */
-	public PPDrawing getPPDrawing() { return ppDrawing; }
-
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected Notes(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-
-		// Find the interesting ones in there
-		for(int i=0; i<_children.length; i++) {
-			if(_children[i] instanceof NotesAtom) {
-				notesAtom = (NotesAtom)_children[i];
-				//System.out.println("Found notes for sheet " + notesAtom.getSlideID());
-			}
-			if(_children[i] instanceof PPDrawing) {
-				ppDrawing = (PPDrawing)_children[i];
-			}
-            if(ppDrawing != null && _children[i] instanceof ColorSchemeAtom) {
-                _colorScheme = (ColorSchemeAtom)_children[i];
-            }
-		}
-	}
-
-
-	/**
-	 * We are of type 1008
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-
-    public ColorSchemeAtom getColorScheme(){
-        return _colorScheme;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java
deleted file mode 100644
index 7aace80..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * A Notes Atom (type 1009). Holds information on the parent Notes, such
- *  as what slide it is tied to
- *
- * @author Nick Burch
- */
-
-public final class NotesAtom extends RecordAtom
-{
-	private byte[] _header;
-	private static long _type = 1009l;
-
-	private int slideID;
-	private boolean followMasterObjects;
-	private boolean followMasterScheme;
-	private boolean followMasterBackground;
-	private byte[] reserved;
-
-
-	public int getSlideID() { return slideID; }
-	public void setSlideID(int id) { slideID = id; }
-
-	public boolean getFollowMasterObjects()    { return followMasterObjects; }
-	public boolean getFollowMasterScheme()     { return followMasterScheme; }
-	public boolean getFollowMasterBackground() { return followMasterBackground; }
-	public void setFollowMasterObjects(boolean flag)    { followMasterObjects = flag; }
-	public void setFollowMasterScheme(boolean flag)     { followMasterScheme = flag; }
-	public void setFollowMasterBackground(boolean flag) { followMasterBackground = flag; }
-
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the Notes Atom
-	 */
-	protected NotesAtom(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 8) { len = 8; }
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Get the slide ID
-		slideID = LittleEndian.getInt(source,start+8);
-
-		// Grok the flags, stored as bits
-		int flags = LittleEndian.getUShort(source,start+12);
-		if((flags&4) == 4) {
-			followMasterBackground = true;
-		} else {
-			followMasterBackground = false;
-		}
-		if((flags&2) == 2) {
-			followMasterScheme = true;
-		} else {
-			followMasterScheme = false;
-		}
-		if((flags&1) == 1) {
-			followMasterObjects = true;
-		} else {
-			followMasterObjects = false;
-		}
-
-		// There might be 2 more bytes, which are a reserved field
-		reserved = new byte[len-14];
-		System.arraycopy(source,start+14,reserved,0,reserved.length);
-	}
-
-	/**
-	 * We are of type 1009
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header
-		out.write(_header);
-
-		// Slide ID
-		writeLittleEndian(slideID,out);
-
-		// Flags
-		short flags = 0;
-		if(followMasterObjects)    { flags += 1; }
-		if(followMasterScheme)     { flags += 2; }
-		if(followMasterBackground) { flags += 4; }
-		writeLittleEndian(flags,out);
-
-		// Reserved fields
-		out.write(reserved);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java
deleted file mode 100644
index 54d5d86..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * OEPlaceholderAtom (3011).
- * <p>
- *  An atom record that specifies whether a shape is a placeholder shape.
- * </p>
- *
- * @author Yegor Kozlov
- */
-
-public final class OEPlaceholderAtom extends RecordAtom{
-
-    /**
-     * The full size of the master body text placeholder shape.
-     */
-    public static final int PLACEHOLDER_FULLSIZE = 0;
-
-    /**
-     * Half of the size of the master body text placeholder shape.
-     */
-    public static final int PLACEHOLDER_HALFSIZE = 1;
-
-    /**
-     * A quarter of the size of the master body text placeholder shape.
-     */
-    public static final int PLACEHOLDER_QUARTSIZE = 2;
-
-    /**
-     * MUST NOT be used for this field.
-     */
-    public static final byte None = 0;
-
-    /**
-     * The corresponding shape contains the master title text.
-     * The corresponding slide MUST be a main master slide.
-     */
-    public static final byte MasterTitle = 1;
-
-    /**
-     * The corresponding shape contains the master body text.
-     * The corresponding slide MUST be a main master slide.
-     */
-    public static final byte MasterBody = 2;
-
-    /**
-     * The corresponding shape contains the master center title text.
-     * The corresponding slide MUST be a title master slide.
-     */
-    public static final byte MasterCenteredTitle = 3;
-
-    /**
-     * The corresponding shape contains the master sub-title text.
-     * The corresponding slide MUST be a title master slide.
-     */
-    public static final byte MasterSubTitle = 4;
-
-    /**
-     * The corresponding shape contains the shared properties for slide image shapes.
-     * The corresponding slide MUST be a notes master slide.
-     */
-    public static final byte MasterNotesSlideImage = 5;
-
-    /**
-     * The corresponding shape contains the master body text.
-     * The corresponding slide MUST be a notes master slide.
-     */
-    public static final byte MasterNotesBody = 6;
-
-    /**
-     * The corresponding shape contains the date text field.
-     * The corresponding slide MUST be a main master slide, title master slide, notes master slide, or handout master slide.
-     */
-    public static final byte MasterDate = 7;
-
-    /**
-     * The corresponding shape contains a slide number text field.
-     * The corresponding slide MUST be a main master slide, title master slide, notes master slide, or handout master slide.
-     */
-    public static final byte MasterSlideNumber = 8;
-
-    /**
-     * The corresponding shape contains a footer text field.
-     * The corresponding slide MUST be a main master slide, title master slide, notes master slide, or handout master slide.
-     */
-    public static final byte MasterFooter = 9;
-
-    /**
-     * The corresponding shape contains a header text field.
-     * The corresponding slide must be a notes master slide or handout master slide.
-     */
-    public static final byte MasterHeader = 10;
-
-    /**
-     * The corresponding shape contains a presentation slide image.
-     * The corresponding slide MUST be a notes slide.
-     */
-    public static final byte NotesSlideImage = 11;
-
-    /**
-     * The corresponding shape contains the notes text.
-     * The corresponding slide MUST be a notes slide.
-     */
-    public static final byte NotesBody = 12;
-
-    /**
-     *  The corresponding shape contains the title text.
-     *  The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte Title = 13;
-
-    /**
-     * The corresponding shape contains the body text.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte Body = 14;
-
-    /**
-     * The corresponding shape contains the title text.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte CenteredTitle = 15;
-
-    /**
-     * The corresponding shape contains the sub-title text.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte Subtitle = 16;
-
-    /**
-     * The corresponding shape contains the title text with vertical text flow.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte VerticalTextTitle = 17;
-
-    /**
-     * The corresponding shape contains the body text with vertical text flow.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte VerticalTextBody = 18;
-
-    /**
-     *  The corresponding shape contains a generic object.
-     *  The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte Object = 19;
-
-    /**
-     * The corresponding shape contains a chart object.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte Graph = 20;
-
-    /**
-     * The corresponding shape contains a table object.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte Table = 21;
-
-    /**
-     * The corresponding shape contains a clipart object.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte ClipArt = 22;
-
-    /**
-     * The corresponding shape contains an organization chart object.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte OrganizationChart = 23;
-
-    /**
-     * The corresponding shape contains a media object.
-     * The corresponding slide MUST be a presentation slide.
-     */
-    public static final byte MediaClip = 24;
-
-	private byte[] _header;
-
-    private int placementId;
-    private int placeholderId;
-    private int placeholderSize;
-    private short unusedShort = 0;
-
-
-    /**
-     * Create a new instance of <code>OEPlaceholderAtom</code>
-     */
-    public OEPlaceholderAtom(){
-        _header = new byte[8];
-        LittleEndian.putUShort(_header, 0, 0);
-        LittleEndian.putUShort(_header, 2, (int)getRecordType());
-        LittleEndian.putInt(_header, 4, 8);
-
-        placementId = 0;
-        placeholderId = 0;
-        placeholderSize = 0;
-    }
-
-    /**
-     * Build an instance of <code>OEPlaceholderAtom</code> from on-disk data
-     */
-	protected OEPlaceholderAtom(byte[] source, int start, int len) {
-		_header = new byte[8];
-        int offset = start;
-        System.arraycopy(source,start,_header,0,8);
-        offset += _header.length;
-
-        placementId = LittleEndian.getInt(source, offset); offset += 4;
-        placeholderId = LittleEndian.getUByte(source, offset); offset++;
-        placeholderSize = LittleEndian.getUByte(source, offset); offset++;
-        unusedShort = LittleEndian.getShort(source, offset);
-	}
-
-    /**
-     * @return type of this record {@link RecordTypes#OEPlaceholderAtom}.
-     */
-	public long getRecordType() { return RecordTypes.OEPlaceholderAtom.typeID; }
-
-    /**
-     * Returns the placement Id.
-     * <p>
-     * The placement Id is a number assigned to the placeholder. It goes from -1 to the number of placeholders.
-     * It SHOULD be unique among all PlacholderAtom records contained in the corresponding slide.
-     * The value 0xFFFFFFFF specifies that the corresponding shape is not a placeholder shape.
-     * </p>
-     *
-     * @return the placement Id.
-     */
-    public int getPlacementId(){
-        return placementId;
-    }
-
-    /**
-     * Sets the placement Id.
-     * <p>
-     * The placement Id is a number assigned to the placeholder. It goes from -1 to the number of placeholders.
-     * It SHOULD be unique among all PlacholderAtom records contained in the corresponding slide.
-     * The value 0xFFFFFFFF specifies that the corresponding shape is not a placeholder shape.
-     * </p>
-     *
-     * @param id the placement Id.
-     */
-   public void setPlacementId(int id){
-        placementId = id;
-    }
-
-    /**
-     * Returns the placeholder Id.
-     *
-     * <p>
-     * placeholder Id specifies the type of the placeholder shape.
-     * The value MUST be one of the static constants defined in this class
-     * </p>
-     *
-     * @return the placeholder Id.
-     */
-    public int getPlaceholderId(){
-        return placeholderId;
-    }
-
-    /**
-     * Sets the placeholder Id.
-     *
-     * <p>
-     * placeholder Id specifies the type of the placeholder shape.
-     * The value MUST be one of the static constants defined in this class
-     * </p>
-     * @param id the placeholder Id.
-     */
-    public void setPlaceholderId(byte id){
-        placeholderId = id;
-    }
-
-    /**
-     * Returns the placeholder size.
-     * Must be one of the PLACEHOLDER_* static constants defined in this class.
-     *
-     * @return the placeholder size.
-     */
-    public int getPlaceholderSize(){
-        return placeholderSize;
-    }
-
-    /**
-     * Sets the placeholder size.
-     * Must be one of the PLACEHOLDER_* static constants defined in this class.
-     *
-     * @param size the placeholder size.
-     */
-     public void setPlaceholderSize(byte size){
-        placeholderSize = size;
-    }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		out.write(_header);
-
-        byte[] recdata = new byte[8];
-        LittleEndian.putInt(recdata, 0, placementId);
-        recdata[4] = (byte)placeholderId;
-        recdata[5] = (byte)placeholderSize;
-        LittleEndian.putShort(recdata, 6, unusedShort);
-
-        out.write(recdata);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java
deleted file mode 100644
index e44b360..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * OEPlaceholderAtom (3998).
- * <br>
- * What MSDN says about  <code>OutlineTextRefAtom</code>:
- * <p>
- * Appears in a slide to indicate a text that is already contained in the document,
- * in a SlideListWithText containter. Sometimes slide texts are not contained
- * within the slide container to be able to delay loading a slide and still display
- * the title and body text in outline view.
- * </p>
- *
- * @author Yegor Kozlov
- */
-
-public final class OutlineTextRefAtom extends RecordAtom {
-    /**
-     * record header
-     */
-    private byte[] _header;
-
-    /**
-     * the text's index within the SlideListWithText (0 for title, 1..n for the nth body)
-     */
-    private int _index;
-
-    /**
-     * Build an instance of <code>OutlineTextRefAtom</code> from on-disk data
-     */
-    protected OutlineTextRefAtom(byte[] source, int start, int len) {
-        // Get the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Grab the record data
-        _index = LittleEndian.getInt(source, start+8);
-    }
-
-    /**
-     * Create a new instance of <code>FontEntityAtom</code>
-     */
-    protected OutlineTextRefAtom() {
-        _index = 0;
-
-        _header = new byte[8];
-        LittleEndian.putUShort(_header, 0, 0);
-        LittleEndian.putUShort(_header, 2, (int)getRecordType());
-        LittleEndian.putInt(_header, 4, 4);
-    }
-
-    public long getRecordType() {
-        return RecordTypes.OutlineTextRefAtom.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written to disk
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-
-        byte[] recdata = new byte[4];
-        LittleEndian.putInt(recdata, 0, _index);
-        out.write(recdata);
-    }
-
-    /**
-     * Sets text's index within the SlideListWithText container
-     * (0 for title, 1..n for the nth body).
-     *
-     * @param idx 0-based text's index
-     */
-    public void setTextIndex(int idx){
-        _index = idx;
-    }
-
-    /**
-     * Return text's index within the SlideListWithText container
-     * (0 for title, 1..n for the nth body).
-     *
-     * @return idx text's index
-     */
-    public int getTextIndex(){
-        return _index;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
deleted file mode 100644
index ba36989..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherBoolProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherRGBProperty;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.ddf.EscherSpgrRecord;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * These are actually wrappers onto Escher drawings. Make use of
- *  the DDF classes to do useful things with them.
- * For now, creates a tree of the Escher records, and then creates any
- *  PowerPoint (hslf) records found within the EscherTextboxRecord
- *  (msofbtClientTextbox) records.
- * Also provides easy access to the EscherTextboxRecords, so that their
- *  text may be extracted and used in Sheets
- */
-
-// For now, pretending to be an atom. Might not always be, but that
-//  would require a wrapping class
-public final class PPDrawing extends RecordAtom {
-	private byte[] _header;
-	private long _type;
-
-	private final List<EscherRecord> childRecords = new ArrayList<EscherRecord>();
-	private EscherTextboxWrapper[] textboxWrappers;
-
-	//cached EscherDgRecord
-	private EscherDgRecord dg;
-
-	/**
-	 * Get access to the underlying Escher Records
-	 */
-	public List<EscherRecord> getEscherRecords() { return childRecords; }
-
-	/**
-	 * Get access to the atoms inside Textboxes
-	 */
-	public EscherTextboxWrapper[] getTextboxWrappers() { return textboxWrappers; }
-
-
-	/* ******************** record stuff follows ********************** */
-
-    /**
-     * Creates a new, empty, PPDrawing (typically for use with a new Slide
-     *  or Notes)
-     */
-    public PPDrawing() {
-        _header = new byte[8];
-        LittleEndian.putUShort(_header, 0, 15);
-        LittleEndian.putUShort(_header, 2, RecordTypes.PPDrawing.typeID);
-        LittleEndian.putInt(_header, 4, 0);
-
-        textboxWrappers = new EscherTextboxWrapper[]{};
-        create();
-    }
-
-	/**
-	 * Sets everything up, groks the escher etc
-	 */
-	protected PPDrawing(byte[] source, int start, int len) {
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Get the type
-		_type = LittleEndian.getUShort(_header,2);
-
-		// Get the contents for now
-		final byte[] contents = new byte[len];
-		System.arraycopy(source,start,contents,0,len);
-
-		// Build up a tree of Escher records contained within
-		final DefaultEscherRecordFactory erf = new HSLFEscherRecordFactory();
-		findEscherChildren(erf, contents, 8, len-8, childRecords);
-		EscherContainerRecord dgContainer = getDgContainer();
-
-		if (dgContainer != null) {
-			textboxWrappers = findInDgContainer(dgContainer);
-		} else {
-			// Find and EscherTextboxRecord's, and wrap them up
-			final List<EscherTextboxWrapper> textboxes = new ArrayList<EscherTextboxWrapper>();
-			findEscherTextboxRecord(childRecords, textboxes);
-			this.textboxWrappers = textboxes.toArray(new EscherTextboxWrapper[textboxes.size()]);
-		}
-	}
-	private EscherTextboxWrapper[] findInDgContainer(final EscherContainerRecord dgContainer) {
-		final List<EscherTextboxWrapper> found = new LinkedList<EscherTextboxWrapper>();
-		final EscherContainerRecord spgrContainer = findFirstEscherContainerRecordOfType(RecordTypes.EscherSpgrContainer, dgContainer);
-		final EscherContainerRecord[] spContainers = findAllEscherContainerRecordOfType(RecordTypes.EscherSpContainer, spgrContainer);
-		for (EscherContainerRecord spContainer : spContainers) {
-			EscherSpRecord sp = (EscherSpRecord)findFirstEscherRecordOfType(RecordTypes.EscherSp, spContainer);
-			EscherTextboxRecord clientTextbox = (EscherTextboxRecord)findFirstEscherRecordOfType(RecordTypes.EscherClientTextbox, spContainer);
-			if (null == clientTextbox) { continue; }
-
-			EscherTextboxWrapper w = new EscherTextboxWrapper(clientTextbox);
-            StyleTextProp9Atom nineAtom = findInSpContainer(spContainer);
-			w.setStyleTextProp9Atom(nineAtom);
-			if (null != sp) {
-			    w.setShapeId(sp.getShapeId());
-			}
-			found.add(w);
-		}
-		return found.toArray(new EscherTextboxWrapper[found.size()]);
-	}
-	
-	private StyleTextProp9Atom findInSpContainer(final EscherContainerRecord spContainer) {
-        HSLFEscherClientDataRecord cldata = spContainer.getChildById(RecordTypes.EscherClientData.typeID);
-        if (cldata == null) {
-            return null;
-        }
-        DummyPositionSensitiveRecordWithChildren progTags =
-            getChildRecord(cldata.getHSLFChildRecords(), RecordTypes.ProgTags);
-        if (progTags == null) {
-            return null;
-        }
-        DummyPositionSensitiveRecordWithChildren progBinaryTag =
-            (DummyPositionSensitiveRecordWithChildren)progTags.findFirstOfType(RecordTypes.ProgBinaryTag.typeID);
-        if (progBinaryTag == null) {
-            return null;
-        }
-		int size = progBinaryTag.getChildRecords().length;
-		if (2 != size) { return null; }
-
-		final Record r0 = progBinaryTag.getChildRecords()[0];
-		final Record r1 = progBinaryTag.getChildRecords()[1];
-		
-		if (!(r0 instanceof CString)) { return null; }
-		if (!("___PPT9".equals(((CString) r0).getText()))) { return null; }
-		if (!(r1 instanceof BinaryTagDataBlob )) { return null; }
-		final BinaryTagDataBlob blob = (BinaryTagDataBlob) r1;
-		if (1 != blob.getChildRecords().length) { return null; }
-		return (StyleTextProp9Atom) blob.findFirstOfType(RecordTypes.StyleTextProp9Atom.typeID);
-	}
-
-	/**
-	 * Tree walking way of finding Escher Child Records
-	 */
-	private void findEscherChildren(DefaultEscherRecordFactory erf, byte[] source, int startPos, int lenToGo, List<EscherRecord> found) {
-
-		int escherBytes = LittleEndian.getInt( source, startPos + 4 ) + 8;
-
-		// Find the record
-		EscherRecord r = erf.createRecord(source,startPos);
-		// Fill it in
-		r.fillFields( source, startPos, erf );
-		// Save it
-		found.add(r);
-
-		// Wind on
-		int size = r.getRecordSize();
-		if(size < 8) {
-			logger.log(POILogger.WARN, "Hit short DDF record at " + startPos + " - " + size);
-		}
-
-		/**
-		 * Sanity check. Always advance the cursor by the correct value.
-		 *
-		 * getRecordSize() must return exactly the same number of bytes that was written in fillFields.
-		 * Sometimes it is not so, see an example in bug #44770. Most likely reason is that one of ddf records calculates wrong size.
-		 */
-		if(size != escherBytes){
-			logger.log(POILogger.WARN, "Record length=" + escherBytes + " but getRecordSize() returned " + r.getRecordSize() + "; record: " + r.getClass());
-			size = escherBytes;
-		}
-		startPos += size;
-		lenToGo -= size;
-		if(lenToGo >= 8) {
-			findEscherChildren(erf, source, startPos, lenToGo, found);
-		}
-	}
-
-	/**
-	 * Look for EscherTextboxRecords
-	 */
-	private void findEscherTextboxRecord(List<EscherRecord> toSearch, List<EscherTextboxWrapper> found) {
-	    EscherSpRecord sp = null;
-	    for (EscherRecord r : toSearch) {
-	        if (r instanceof EscherSpRecord) {
-	            sp = (EscherSpRecord)r;
-	        } else if (r instanceof EscherTextboxRecord) {
-				EscherTextboxRecord tbr = (EscherTextboxRecord)r;
-				EscherTextboxWrapper w = new EscherTextboxWrapper(tbr);
-				if (sp != null) {
-				    w.setShapeId(sp.getShapeId());
-				}
-				found.add(w);
-			} else if (r.isContainerRecord()) {
-				// If it has children, walk them
-				List<EscherRecord> children = r.getChildRecords();
-				findEscherTextboxRecord(children,found);
-			}
-		}
-	}
-
-	/**
-	 * We are type 1036
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * We're pretending to be an atom, so return null
-	 */
-	public Record[] getChildRecords() { return null; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 * Walks the escher layer to get the contents
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Ensure the escher layer reflects the text changes
-		for (EscherTextboxWrapper w : textboxWrappers) {
-			w.writeOut(null);
-		}
-
-		// Find the new size of the escher children;
-		int newSize = 0;
-		for(EscherRecord er : childRecords) {
-			newSize += er.getRecordSize();
-		}
-
-		// Update the size (header bytes 5-8)
-		LittleEndian.putInt(_header,4,newSize);
-
-		// Write out our header
-		out.write(_header);
-
-		// Now grab the children's data
-		byte[] b = new byte[newSize];
-		int done = 0;
-		for(EscherRecord r : childRecords) {
-		    done += r.serialize( done, b );
-		}
-
-		// Finally, write out the children
-		out.write(b);
-	}
-
-	/**
-	 * Create the Escher records associated with a new PPDrawing
-	 */
-	private void create(){
-		EscherContainerRecord dgContainer = new EscherContainerRecord();
-		dgContainer.setRecordId( EscherContainerRecord.DG_CONTAINER );
-		dgContainer.setOptions((short)15);
-
-		dg = new EscherDgRecord();
-		dg.setOptions((short)16);
-		dg.setNumShapes(1);
-		dgContainer.addChildRecord(dg);
-
-		EscherContainerRecord spgrContainer = new EscherContainerRecord();
-		spgrContainer.setOptions((short)15);
-		spgrContainer.setRecordId(EscherContainerRecord.SPGR_CONTAINER);
-
-		EscherContainerRecord spContainer = new EscherContainerRecord();
-		spContainer.setOptions((short)15);
-		spContainer.setRecordId(EscherContainerRecord.SP_CONTAINER);
-
-		EscherSpgrRecord spgr = new EscherSpgrRecord();
-		spgr.setOptions((short)1);
-		spContainer.addChildRecord(spgr);
-
-		EscherSpRecord sp = new EscherSpRecord();
-		sp.setOptions((short)((ShapeType.NOT_PRIMITIVE.nativeId << 4) + 2));
-		sp.setFlags(EscherSpRecord.FLAG_PATRIARCH | EscherSpRecord.FLAG_GROUP);
-		spContainer.addChildRecord(sp);
-		spgrContainer.addChildRecord(spContainer);
-		dgContainer.addChildRecord(spgrContainer);
-
-		spContainer = new EscherContainerRecord();
-		spContainer.setOptions((short)15);
-		spContainer.setRecordId(EscherContainerRecord.SP_CONTAINER);
-		sp = new EscherSpRecord();
-		sp.setOptions((short)((ShapeType.RECT.nativeId << 4) + 2));
-		sp.setFlags(EscherSpRecord.FLAG_BACKGROUND | EscherSpRecord.FLAG_HASSHAPETYPE);
-		spContainer.addChildRecord(sp);
-
-		EscherOptRecord opt = new EscherOptRecord();
-		opt.setRecordId(EscherOptRecord.RECORD_ID);
-		opt.addEscherProperty(new EscherRGBProperty(EscherProperties.FILL__FILLCOLOR, 134217728));
-		opt.addEscherProperty(new EscherRGBProperty(EscherProperties.FILL__FILLBACKCOLOR, 134217733));
-		opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.FILL__RECTRIGHT, 10064750));
-		opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.FILL__RECTBOTTOM, 7778750));
-		opt.addEscherProperty(new EscherBoolProperty(EscherProperties.FILL__NOFILLHITTEST, 1179666));
-		opt.addEscherProperty(new EscherBoolProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH, 524288));
-		opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.SHAPE__BLACKANDWHITESETTINGS, 9));
-		opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.SHAPE__BACKGROUNDSHAPE, 65537));
-		spContainer.addChildRecord(opt);
-
-		dgContainer.addChildRecord(spContainer);
-		
-		childRecords.add(dgContainer);
-	}
-
-	/**
-	 * Add a new EscherTextboxWrapper to this <code>PPDrawing</code>.
-	 */
-	public void addTextboxWrapper(EscherTextboxWrapper txtbox){
-		EscherTextboxWrapper[] tw = new EscherTextboxWrapper[textboxWrappers.length + 1];
-		System.arraycopy(textboxWrappers, 0, tw, 0, textboxWrappers.length);
-
-		tw[textboxWrappers.length] = txtbox;
-		textboxWrappers = tw;
-	}
-
-	/**
-	 * @return the container record for drawings
-	 * @since POI 3.14-Beta2
-	 */
-	public EscherContainerRecord getDgContainer() {
-	    if (childRecords.isEmpty()) {
-	        return null;
-	    }
-	    EscherRecord r = childRecords.get(0);
-	    if (r instanceof EscherContainerRecord && r.getRecordId() == RecordTypes.EscherDgContainer.typeID) {
-	        return (EscherContainerRecord)r;
-	    } else {
-	        return null;
-	    }
-	}
-	
-	/**
-	 * Return EscherDgRecord which keeps track of the number of shapes and shapeId in this drawing group
-	 *
-	 * @return EscherDgRecord
-	 */
-	public EscherDgRecord getEscherDgRecord(){
-		if(dg == null){
-			for(EscherRecord r : getDgContainer().getChildRecords()){
-				if(r instanceof EscherDgRecord){
-					dg = (EscherDgRecord)r;
-					break;
-				}
-			}
-		}
-		return dg;
-	}
-
-    protected EscherContainerRecord findFirstEscherContainerRecordOfType(RecordTypes type, EscherContainerRecord parent) {
-    	if (null == parent) { return null; }
-		final List<EscherContainerRecord> children = parent.getChildContainers();
-		for (EscherContainerRecord child : children) {
-			if (type.typeID == child.getRecordId()) {
-				return child;
-			}
-		}
-		return null;
-    }
-    protected EscherRecord findFirstEscherRecordOfType(RecordTypes type, EscherContainerRecord parent) {
-    	if (null == parent) { return null; }
-		final List<EscherRecord> children = parent.getChildRecords();
-		for (EscherRecord child : children) {
-			if (type.typeID == child.getRecordId()) {
-				return child;
-			}
-		}
-		return null;
-    }
-    protected EscherContainerRecord[] findAllEscherContainerRecordOfType(RecordTypes type, EscherContainerRecord parent) {
-    	if (null == parent) { return new EscherContainerRecord[0]; }
-		final List<EscherContainerRecord> children = parent.getChildContainers();
-		final List<EscherContainerRecord> result = new LinkedList<EscherContainerRecord>();
-		for (EscherContainerRecord child : children) {
-			if (type.typeID == child.getRecordId()) {
-				result.add(child);
-			}
-		}
-		return result.toArray(new EscherContainerRecord[result.size()]);
-    }
-
-    public StyleTextProp9Atom[] getNumberedListInfo() {
-    	final List<StyleTextProp9Atom> result = new LinkedList<StyleTextProp9Atom>();
-    	EscherContainerRecord dgContainer = getDgContainer();
-		final EscherContainerRecord spgrContainer = findFirstEscherContainerRecordOfType(RecordTypes.EscherSpgrContainer, dgContainer);
-		final EscherContainerRecord[] spContainers = findAllEscherContainerRecordOfType(RecordTypes.EscherSpContainer, spgrContainer);
-		for (EscherContainerRecord spContainer : spContainers) {
-		    StyleTextProp9Atom prop9 = findInSpContainer(spContainer);
-		    if (prop9 != null) {
-		        result.add(prop9);
-		    }
-		}
-    	return result.toArray(new StyleTextProp9Atom[result.size()]);
-	}
-    
-    @SuppressWarnings("unchecked")
-    private static <T extends Record> T getChildRecord(List<? extends Record> children, RecordTypes type) {
-        for (Record r : children) {
-            if (r.getRecordType() == type.typeID) {
-                return (T)r;
-            }
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
deleted file mode 100644
index 0cdb1f6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.util.LittleEndian;
-
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
-
-/**
- * Container records which always exists inside Document.
- * It always acts as a holder for escher DGG container
- *  which may contain which Escher BStore container information
- *  about pictures containes in the presentation (if any).
- *
- * @author Yegor Kozlov
- */
-public final class PPDrawingGroup extends RecordAtom {
-
-    private byte[] _header;
-    private EscherContainerRecord dggContainer;
-    //cached dgg
-    private EscherDggRecord dgg;
-
-    protected PPDrawingGroup(byte[] source, int start, int len) {
-        // Get the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the contents for now
-        byte[] contents = new byte[len];
-        System.arraycopy(source,start,contents,0,len);
-
-        DefaultEscherRecordFactory erf = new HSLFEscherRecordFactory();
-        EscherRecord child = erf.createRecord(contents, 0);
-        child.fillFields( contents, 0, erf );
-        dggContainer = (EscherContainerRecord)child.getChild(0);
-    }
-
-    /**
-     * We are type 1035
-     */
-    public long getRecordType() {
-        return RecordTypes.PPDrawingGroup.typeID;
-    }
-
-    /**
-     * We're pretending to be an atom, so return null
-     */
-    public Record[] getChildRecords() {
-        return null;
-    }
-
-    public void writeOut(OutputStream out) throws IOException {
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        Iterator<EscherRecord> iter = dggContainer.getChildIterator();
-        while (iter.hasNext()) {
-        	EscherRecord r = iter.next();
-            if (r.getRecordId() == EscherContainerRecord.BSTORE_CONTAINER){
-                EscherContainerRecord bstore = (EscherContainerRecord)r;
-
-                ByteArrayOutputStream b2 = new ByteArrayOutputStream();
-                for (Iterator<EscherRecord> it= bstore.getChildIterator(); it.hasNext();) {
-                    EscherBSERecord bse = (EscherBSERecord)it.next();
-                    byte[] b = new byte[36+8];
-                    bse.serialize(0, b);
-                    b2.write(b);
-                }
-                byte[] bstorehead = new byte[8];
-                LittleEndian.putShort(bstorehead, 0, bstore.getOptions());
-                LittleEndian.putShort(bstorehead, 2, bstore.getRecordId());
-                LittleEndian.putInt(bstorehead, 4, b2.size());
-                bout.write(bstorehead);
-                bout.write(b2.toByteArray());
-
-            } else {
-                bout.write(r.serialize());
-            }
-        }
-        int size = bout.size();
-
-        // Update the size (header bytes 5-8)
-        LittleEndian.putInt(_header,4,size+8);
-
-        // Write out our header
-        out.write(_header);
-
-        byte[] dgghead = new byte[8];
-        LittleEndian.putShort(dgghead, 0, dggContainer.getOptions());
-        LittleEndian.putShort(dgghead, 2, dggContainer.getRecordId());
-        LittleEndian.putInt(dgghead, 4, size);
-        out.write(dgghead);
-
-        // Finally, write out the children
-        out.write(bout.toByteArray());
-
-    }
-
-    public EscherContainerRecord getDggContainer(){
-        return dggContainer;
-    }
-
-    public EscherDggRecord getEscherDggRecord(){
-        if(dgg == null){
-            for(Iterator<EscherRecord> it = dggContainer.getChildIterator(); it.hasNext();){
-                EscherRecord r = it.next();
-                if(r instanceof EscherDggRecord){
-                    dgg = (EscherDggRecord)r;
-                    break;
-                }
-            }
-        }
-        return dgg;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java
deleted file mode 100644
index c71699f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-/**
- * Interface to define how a record can indicate it cares about what its
- *  parent is, and how it wants to be told which record is its parent.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public interface ParentAwareRecord {
-	public RecordContainer getParentRecord();
-	public void setParentRecord(RecordContainer parentRecord);
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
deleted file mode 100644
index b800f3e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * General holder for PersistPtrFullBlock and PersistPtrIncrementalBlock
- *  records. We need to handle them specially, since we have to go around
- *  updating UserEditAtoms if they shuffle about on disk
- * These hold references to where slides "live". If the position of a slide
- *  moves, then we have update all of these. If we come up with a new version
- *  of a slide, then we have to add one of these to the end of the chain
- *  (via CurrentUserAtom and UserEditAtom) pointing to the new slide location
- *
- * @author Nick Burch
- */
-
-public final class PersistPtrHolder extends PositionDependentRecordAtom
-{
-	private final byte[] _header;
-	private byte[] _ptrData; // Will need to update this once we allow updates to _slideLocations
-	private long _type;
-
-	/**
-	 * Holds the lookup for slides to their position on disk.
-	 * You always need to check the most recent PersistPtrHolder
-	 *  that knows about a given slide to find the right location
-	 */
-	private Map<Integer,Integer> _slideLocations;
-
-	private static final BitField persistIdFld = new BitField(0X000FFFFF);
-	private static final BitField cntPersistFld  = new BitField(0XFFF00000);
-	
-    /**
-     * Return the value we were given at creation, be it 6001 or 6002
-     */
-    public long getRecordType() { return _type; }
-
-	/**
-	 * Get the list of slides that this PersistPtrHolder knows about.
-	 * (They will be the keys in the map for looking up the positions
-	 *  of these slides)
-	 */
-	public int[] getKnownSlideIDs() {
-		int[] ids = new int[_slideLocations.size()];
-		int i = 0;
-		for (Integer slideId : _slideLocations.keySet()) {
-		    ids[i++] = slideId;
-		}
-		return ids;
-	}
-
-	/**
-	 * Get the lookup from slide numbers to byte offsets, for the slides
-	 *  known about by this PersistPtrHolder.
-	 */
-	public Map<Integer,Integer> getSlideLocationsLookup() {
-		return Collections.unmodifiableMap(_slideLocations);
-	}
-	
-	/**
-	 * Create a new holder for a PersistPtr record
-	 */
-	protected PersistPtrHolder(byte[] source, int start, int len) {
-		// Sanity Checking - including whole header, so treat
-		//  length as based of 0, not 8 (including header size based)
-		if(len < 8) { len = 8; }
-
-		// Treat as an atom, grab and hold everything
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-		_type = LittleEndian.getUShort(_header,2);
-
-		// Try to make sense of the data part:
-		// Data part is made up of a number of these sets:
-		//   32 bit info value
-		//		12 bits count of # of entries
-		//      base number for these entries
-		//   count * 32 bit offsets
-		// Repeat as many times as you have data
-		_slideLocations = new HashMap<Integer,Integer>();
-		_ptrData = new byte[len-8];
-		System.arraycopy(source,start+8,_ptrData,0,_ptrData.length);
-
-		int pos = 0;
-		while(pos < _ptrData.length) {
-		    // Grab the info field
-			int info = LittleEndian.getInt(_ptrData,pos);
-
-			// First 20 bits = offset number
-			// Remaining 12 bits = offset count
-            int offset_no = persistIdFld.getValue(info);
-			int offset_count = cntPersistFld.getValue(info);
-			
-			// Wind on by the 4 byte info header
-			pos += 4;
-
-			// Grab the offsets for each of the sheets
-			for(int i=0; i<offset_count; i++) {
-				int sheet_no = offset_no + i;
-				int sheet_offset = (int)LittleEndian.getUInt(_ptrData,pos);
-				_slideLocations.put(sheet_no, sheet_offset);
-
-				// Wind on by 4 bytes per sheet found
-				pos += 4;
-			}
-		}
-	}
-
-    /**
-     *  remove all slide references
-     *  
-     *  Convenience method provided, for easier reviewing of invocations
-     */
-    public void clear() {
-        _slideLocations.clear();
-    }
-    
-    /**
-     * Adds a new slide, notes or similar, to be looked up by this.
-     */
-    public void addSlideLookup(int slideID, int posOnDisk) {
-        if (_slideLocations.containsKey(slideID)) {
-            throw new CorruptPowerPointFileException("A record with persistId "+slideID+" already exists.");
-        }
-
-        _slideLocations.put(slideID, posOnDisk);
-    }
-
-	/**
-	 * At write-out time, update the references to the sheets to their
-	 *  new positions
-	 */
-	@Override
-	public void updateOtherRecordReferences(Map<Integer,Integer> oldToNewReferencesLookup) {
-		// Loop over all the slides we know about
-		// Find where they used to live, and where they now live
-	    for (Entry<Integer,Integer> me : _slideLocations.entrySet()) {
-	        Integer oldPos = me.getValue();
-	        Integer newPos = oldToNewReferencesLookup.get(oldPos);
-
-            if (newPos == null) {
-                Integer id = me.getKey();
-                logger.log(POILogger.WARN, "Couldn't find the new location of the \"slide\" with id " + id + " that used to be at " + oldPos);
-                logger.log(POILogger.WARN, "Not updating the position of it, you probably won't be able to find it any more (if you ever could!)");
-            } else {
-                me.setValue(newPos);
-            }
-	    }
-	}
-
-	private void normalizePersistDirectory() {
-        TreeMap<Integer,Integer> orderedSlideLocations = new TreeMap<Integer,Integer>(_slideLocations);
-        
-        @SuppressWarnings("resource")
-        BufAccessBAOS bos = new BufAccessBAOS();
-        byte intbuf[] = new byte[4];
-        int lastPersistEntry = -1;
-        int lastSlideId = -1;
-        for (Entry<Integer,Integer> me : orderedSlideLocations.entrySet()) {
-            int nextSlideId = me.getKey();
-            int offset = me.getValue();
-            try {
-                // Building the info block
-                // First 20 bits = offset number = slide ID (persistIdFld, i.e. first slide ID of a continuous group)
-                // Remaining 12 bits = offset count = 1 (cntPersistFld, i.e. continuous entries in a group)
-                
-                if (lastSlideId+1 == nextSlideId) {
-                    // use existing PersistDirectoryEntry, need to increase entry count
-                    assert(lastPersistEntry != -1);
-                    int infoBlock = LittleEndian.getInt(bos.getBuf(), lastPersistEntry);
-                    int entryCnt = cntPersistFld.getValue(infoBlock);
-                    infoBlock = cntPersistFld.setValue(infoBlock, entryCnt+1);
-                    LittleEndian.putInt(bos.getBuf(), lastPersistEntry, infoBlock);
-                } else {
-                    // start new PersistDirectoryEntry
-                    lastPersistEntry = bos.size();
-                    int infoBlock = persistIdFld.setValue(0, nextSlideId);
-                    infoBlock = cntPersistFld.setValue(infoBlock, 1);
-                    LittleEndian.putInt(intbuf, 0, infoBlock);
-                    bos.write(intbuf);
-                }
-                // Add to the ptrData offset lookup hash
-                LittleEndian.putInt(intbuf, 0, offset);
-                bos.write(intbuf);
-                lastSlideId = nextSlideId;
-            } catch (IOException e) {
-                // ByteArrayOutputStream is very unlikely throwing a IO exception (maybe because of OOM ...)
-                throw new RuntimeException(e);
-            }
-        }
-        
-        // Save the new ptr data
-        _ptrData = bos.toByteArray();
-
-        // Update the atom header
-        LittleEndian.putInt(_header,4,bos.size());
-	}
-	
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-	    normalizePersistDirectory();
-		out.write(_header);
-		out.write(_ptrData);
-	}
-	
-    private static class BufAccessBAOS extends ByteArrayOutputStream {
-        public byte[] getBuf() {
-            return buf;
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java
deleted file mode 100644
index 3393318..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-/**
- * A record that can be referenced in PersistPtr storage.
- *
- * @author Yegor Kozlov
- */
-public interface PersistRecord {
-
-    /**
-     * Fetch the persist ID
-     */
-    public int getPersistId();
-
-    /**
-     * Set the persist ID
-     */
-    public void setPersistId(int id);
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java
deleted file mode 100644
index 844c14d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-import java.util.Map;
-
-/**
- * Records which either care about where they are on disk, or have other
- *  records who care about where they are, will implement this interface.
- * Normally, they'll subclass PositionDependentRecordAtom or
- *  PositionDependentRecordContainer, which will do the work of providing
- *  the setting and updating interfaces for them.
- * This is a special (and dangerous) kind of Record. When created, they
- *  need to be pinged with their current location. When written out, they
- *  need to be given their new location, and offered the list of records
- *  which have changed their location.
- *
- * @author Nick Burch
- */
-
-public interface PositionDependentRecord
-{
-	/** Fetch our location on the disk, as of the last write out */
-	public int getLastOnDiskOffset();
-
-	/**
-	 * Update the Record's idea of where on disk it lives, after a write out.
-	 * Use with care...
-	 */
-	public void setLastOnDiskOffset(int offset);
-
-	/**
-	 * Offer the record the list of records that have changed their
-	 *  location as part of the writeout.
-	 */
-	public void updateOtherRecordReferences(Map<Integer,Integer> oldToNewReferencesLookup);
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
deleted file mode 100644
index 76d8f49..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-import java.util.Map;
-
-/**
- * A special (and dangerous) kind of Record Atom that cares about where
- *  it lives on the disk, or who has other Atoms that care about where
- *  this is on the disk.
- *
- * @author Nick Burch
- */
-
-public abstract class PositionDependentRecordAtom extends RecordAtom implements PositionDependentRecord
-{
-	/** Our location on the disk, as of the last write out */
-	protected int myLastOnDiskOffset;
-
-	/** Fetch our location on the disk, as of the last write out */
-	public int getLastOnDiskOffset() { return myLastOnDiskOffset; }
-
-	/**
-	 * Update the Record's idea of where on disk it lives, after a write out.
-	 * Use with care...
-	 */
-	public void setLastOnDiskOffset(int offset) {
-		myLastOnDiskOffset = offset;
-	}
-
-	/**
-	 * Offer the record the list of records that have changed their
-	 *  location as part of the writeout.
-	 * Allows records to update their internal pointers to other records
-	 *  locations
-	 */
-	public abstract void updateOtherRecordReferences(Map<Integer,Integer> oldToNewReferencesLookup);
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
deleted file mode 100644
index 14b1932..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-import java.util.Map;
-
-/**
- * A special (and dangerous) kind of Record Container, for which other
- *  Atoms care about where this one lives on disk.
- * Will track its position on disk.
- *
- * @author Nick Burch
- */
-
-public abstract class PositionDependentRecordContainer extends RecordContainer implements PositionDependentRecord
-{
-	private int sheetId; // Found from PersistPtrHolder
-
-	/**
-	 * Fetch our sheet ID, as found from a PersistPtrHolder.
-	 * Should match the RefId of our matching SlidePersistAtom
-	 */
-	public int getSheetId() { return sheetId; }
-
-	/**
-	 * Set our sheet ID, as found from a PersistPtrHolder
-	 */
-	public void setSheetId(int id) { sheetId = id; }
-
-
-	/** Our location on the disk, as of the last write out */
-	protected int myLastOnDiskOffset;
-
-	/** Fetch our location on the disk, as of the last write out */
-	public int getLastOnDiskOffset() { return myLastOnDiskOffset; }
-
-	/**
-	 * Update the Record's idea of where on disk it lives, after a write out.
-	 * Use with care...
-	 */
-	public void setLastOnDiskOffset(int offset) {
-		myLastOnDiskOffset = offset;
-	}
-
-	/**
-	 * Since we're a container, we don't mind if other records move about.
-	 * If we're told they have, just return straight off.
-	 */
-	public void updateOtherRecordReferences(Map<Integer,Integer> oldToNewReferencesLookup) {
-		return;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
deleted file mode 100644
index e2987b3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This abstract class represents a record in the PowerPoint document.
- * Record classes should extend with RecordContainer or RecordAtom, which
- *  extend this in turn.
- *
- * @author Nick Burch
- */
-
-public abstract class Record
-{
-    // For logging
-	protected static final POILogger logger = POILogFactory.getLogger(Record.class);
-
-	/**
-	 * Is this record type an Atom record (only has data),
-	 *  or is it a non-Atom record (has other records)?
-	 */
-	public abstract boolean isAnAtom();
-
-	/**
-	 * Returns the type (held as a little endian in bytes 3 and 4)
-	 *  that this class handles
-	 */
-	public abstract long getRecordType();
-
-	/**
-	 * Fetch all the child records of this record
-	 * If this record is an atom, will return null
-	 * If this record is a non-atom, but has no children, will return
-	 *  an empty array
-	 */
-	public abstract Record[] getChildRecords();
-
-	/**
-	 * Have the contents printer out into an OutputStream, used when
-	 *  writing a file back out to disk
-	 * (Normally, atom classes will keep their bytes around, but
-	 *  non atom classes will just request the bytes from their
-	 *  children, then chuck on their header and return)
-	 */
-	public abstract void writeOut(OutputStream o) throws IOException;
-
-	/**
-	 * When writing out, write out a signed int (32bit) in Little Endian format
-	 */
-	public static void writeLittleEndian(int i,OutputStream o) throws IOException {
-		byte[] bi = new byte[4];
-		LittleEndian.putInt(bi,0,i);
-		o.write(bi);
-	}
-	/**
-	 * When writing out, write out a signed short (16bit) in Little Endian format
-	 */
-	public static void writeLittleEndian(short s,OutputStream o) throws IOException {
-		byte[] bs = new byte[2];
-		LittleEndian.putShort(bs,0,s);
-		o.write(bs);
-	}
-
-	/**
-	 * Build and return the Record at the given offset.
-	 * Note - does less error checking and handling than findChildRecords
-	 * @param b The byte array to build from
-	 * @param offset The offset to build at
-	 */
-	public static Record buildRecordAtOffset(byte[] b, int offset) {
-		long type = LittleEndian.getUShort(b,offset+2);
-		long rlen = LittleEndian.getUInt(b,offset+4);
-
-		// Sanity check the length
-		int rleni = (int)rlen;
-		if(rleni < 0) { rleni = 0; }
-
-		return createRecordForType(type,b,offset,8+rleni);
-	}
-
-	/**
-	 * Default method for finding child records of a container record
-	 */
-	public static Record[] findChildRecords(byte[] b, int start, int len) {
-		List<Record> children = new ArrayList<Record>(5);
-
-		// Jump our little way along, creating records as we go
-		int pos = start;
-		while(pos <= (start+len-8)) {
-			long type = LittleEndian.getUShort(b,pos+2);
-			long rlen = LittleEndian.getUInt(b,pos+4);
-
-			// Sanity check the length
-			int rleni = (int)rlen;
-			if(rleni < 0) { rleni = 0; }
-
-			// Abort if first record is of type 0000 and length FFFF,
-			//  as that's a sign of a screwed up record
-			if(pos == 0 && type == 0l && rleni == 0xffff) {
-				throw new CorruptPowerPointFileException("Corrupt document - starts with record of type 0000 and length 0xFFFF");
-			}
-
-			Record r = createRecordForType(type,b,pos,8+rleni);
-			if(r != null) {
-				children.add(r);
-			} else {
-				// Record was horribly corrupt
-			}
-			pos += 8;
-			pos += rleni;
-		}
-
-		// Turn the vector into an array, and return
-		Record[] cRecords = children.toArray( new Record[children.size()] );
-		return cRecords;
-	}
-
-	/**
-	 * For a given type (little endian bytes 3 and 4 in record header),
-	 *  byte array, start position and length:
-	 *  will return a Record object that will handle that record
-	 *
-	 * Remember that while PPT stores the record lengths as 8 bytes short
-	 *  (not including the size of the header), this code assumes you're
-	 *  passing in corrected lengths
-	 */
-	public static Record createRecordForType(long type, byte[] b, int start, int len) {
-		Record toReturn = null;
-
-		// Handle case of a corrupt last record, whose claimed length
-		//  would take us passed the end of the file
-		if(start + len > b.length) {
-			logger.log(POILogger.WARN, "Warning: Skipping record of type " + type + " at position " + start + " which claims to be longer than the file! (" + len + " vs " + (b.length-start) + ")");
-			return null;
-		}
-
-		// We use the RecordTypes class to provide us with the right
-		//  class to use for a given type
-		// A spot of reflection gets us the (byte[],int,int) constructor
-		// From there, we instanciate the class
-		// Any special record handling occurs once we have the class
-		Class<? extends Record> c = null;
-		try {
-			c = RecordTypes.forTypeID((short)type).handlingClass;
-			if(c == null) {
-				// How odd. RecordTypes normally substitutes in
-				//  a default handler class if it has heard of the record
-				//  type but there's no support for it. Explicitly request
-				//  that now
-				c = RecordTypes.UnknownRecordPlaceholder.handlingClass;
-			}
-
-			// Grab the right constructor
-			java.lang.reflect.Constructor<? extends Record> con = c.getDeclaredConstructor(new Class[] { byte[].class, Integer.TYPE, Integer.TYPE });
-			// Instantiate
-			toReturn = con.newInstance(new Object[] { b, start, len });
-		} catch(InstantiationException ie) {
-			throw new RuntimeException("Couldn't instantiate the class for type with id " + type + " on class " + c + " : " + ie, ie);
-		} catch(java.lang.reflect.InvocationTargetException ite) {
-			throw new RuntimeException("Couldn't instantiate the class for type with id " + type + " on class " + c + " : " + ite + "\nCause was : " + ite.getCause(), ite);
-		} catch(IllegalAccessException iae) {
-			throw new RuntimeException("Couldn't access the constructor for type with id " + type + " on class " + c + " : " + iae, iae);
-		} catch(NoSuchMethodException nsme) {
-			throw new RuntimeException("Couldn't access the constructor for type with id " + type + " on class " + c + " : " + nsme, nsme);
-		}
-
-		// Handling for special kinds of records follow
-
-		// If it's a position aware record, tell it where it is
-		if(toReturn instanceof PositionDependentRecord) {
-			PositionDependentRecord pdr = (PositionDependentRecord)toReturn;
-			pdr.setLastOnDiskOffset(start);
-		}
-
-		// Return the created record
-		return toReturn;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java
deleted file mode 100644
index 964d3d1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-/**
- * Abstract class which all atom records will extend.
- *
- * @author Nick Burch
- */
-
-public abstract class RecordAtom extends Record
-{
-	/**
-	 * We are an atom
-	 */
-	public boolean isAnAtom() { return true; }
-
-	/**
-	 * We're an atom, returns null
-	 */
-	public Record[] getChildRecords() { return null; }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
deleted file mode 100644
index 3ad7b08..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.ArrayUtil;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hslf.util.MutableByteArrayOutputStream;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-
-/**
- * Abstract class which all container records will extend. Providers
- *  helpful methods for writing child records out to disk
- *
- * @author Nick Burch
- */
-
-public abstract class RecordContainer extends Record
-{
-	protected Record[] _children;
-
-	/**
-	 * Return any children
-	 */
-	public Record[] getChildRecords() { return _children; }
-
-	/**
-	 * We're not an atom
-	 */
-	public boolean isAnAtom() { return false; }
-
-
-	/* ===============================================================
-	 *                   Internal Move Helpers
-	 * ===============================================================
-	 */
-
-	/**
-	 * Finds the location of the given child record
-	 */
-	private int findChildLocation(Record child) {
-	    int i=0;
-		for(Record r : _children) {
-			if (r.equals(child)) {
-				return i;
-			}
-			i++;
-		}
-		return -1;
-	}
-
-	/**
-	 * Adds a child record, at the very end.
-	 * @param newChild The child record to add
-	 */
-	private void appendChild(Record newChild) {
-		// Copy over, and pop the child in at the end
-		Record[] nc = new Record[(_children.length + 1)];
-		System.arraycopy(_children, 0, nc, 0, _children.length);
-		// Switch the arrays
-		nc[_children.length] = newChild;
-		_children = nc;
-	}
-
-	/**
-	 * Adds the given new Child Record at the given location,
-	 *  shuffling everything from there on down by one
-	 * @param newChild
-	 * @param position
-	 */
-	private void addChildAt(Record newChild, int position) {
-		// Firstly, have the child added in at the end
-		appendChild(newChild);
-
-		// Now, have them moved to the right place
-		moveChildRecords( (_children.length-1), position, 1 );
-	}
-
-	/**
-	 * Moves {@code number} child records from {@code oldLoc} to {@code newLoc}. 
-	 * @param oldLoc the current location of the records to move
-	 * @param newLoc the new location for the records
-	 * @param number the number of records to move
-	 */
-	private void moveChildRecords(int oldLoc, int newLoc, int number) {
-		if(oldLoc == newLoc) { return; }
-		if(number == 0) { return; }
-
-		// Check that we're not asked to move too many
-		if(oldLoc+number > _children.length) {
-			throw new IllegalArgumentException("Asked to move more records than there are!");
-		}
-
-		// Do the move
-		ArrayUtil.arrayMoveWithin(_children, oldLoc, newLoc, number);
-	}
-
-
-	/**
-	 * Finds the first child record of the given type,
-	 *  or null if none of the child records are of the
-	 *  given type. Does not descend.
-	 */
-	public Record findFirstOfType(long type) {
-		for (Record r : _children) {
-			if (r.getRecordType() == type) {
-				return r;
-			}
-		}
-		return null;
-	}
-
-    /**
-     * Remove a child record from this record container
-     *
-     * @param ch the child to remove
-     * @return the removed record
-     */
-    public Record removeChild(Record ch) {
-        Record rm = null;
-        ArrayList<Record> lst = new ArrayList<Record>();
-        for(Record r : _children) {
-            if(r != ch) lst.add(r);
-            else rm = r;
-        }
-        _children = lst.toArray(new Record[lst.size()]);
-        return rm;
-    }
-
-    /* ===============================================================
-	 *                   External Move Methods
-	 * ===============================================================
-	 */
-
-	/**
-	 * Add a new child record onto a record's list of children.
-	 */
-	public void appendChildRecord(Record newChild) {
-		appendChild(newChild);
-	}
-
-	/**
-	 * Adds the given Child Record after the supplied record
-	 * @param newChild
-	 * @param after
-	 */
-	public void addChildAfter(Record newChild, Record after) {
-		// Decide where we're going to put it
-		int loc = findChildLocation(after);
-		if(loc == -1) {
-			throw new IllegalArgumentException("Asked to add a new child after another record, but that record wasn't one of our children!");
-		}
-
-		// Add one place after the supplied record
-		addChildAt(newChild, loc+1);
-	}
-
-	/**
-	 * Adds the given Child Record before the supplied record
-	 * @param newChild
-	 * @param before
-	 */
-	public void addChildBefore(Record newChild, Record before) {
-		// Decide where we're going to put it
-		int loc = findChildLocation(before);
-		if(loc == -1) {
-			throw new IllegalArgumentException("Asked to add a new child before another record, but that record wasn't one of our children!");
-		}
-
-		// Add at the place of the supplied record
-		addChildAt(newChild, loc);
-	}
-
-	/**
-	 * Moves the given Child Record to before the supplied record
-	 */
-	public void moveChildBefore(Record child, Record before) {
-		moveChildrenBefore(child, 1, before);
-	}
-
-	/**
-	 * Moves the given Child Records to before the supplied record
-	 */
-	public void moveChildrenBefore(Record firstChild, int number, Record before) {
-		if(number < 1) { return; }
-
-		// Decide where we're going to put them
-		int newLoc = findChildLocation(before);
-		if(newLoc == -1) {
-			throw new IllegalArgumentException("Asked to move children before another record, but that record wasn't one of our children!");
-		}
-
-		// Figure out where they are now
-		int oldLoc = findChildLocation(firstChild);
-		if(oldLoc == -1) {
-			throw new IllegalArgumentException("Asked to move a record that wasn't a child!");
-		}
-
-		// Actually move
-		moveChildRecords(oldLoc, newLoc, number);
-	}
-
-	/**
-	 * Moves the given Child Records to after the supplied record
-	 */
-	public void moveChildrenAfter(Record firstChild, int number, Record after) {
-		if(number < 1) { return; }
-		// Decide where we're going to put them
-		int newLoc = findChildLocation(after);
-		if(newLoc == -1) {
-			throw new IllegalArgumentException("Asked to move children before another record, but that record wasn't one of our children!");
-		}
-		// We actually want after this though
-		newLoc++;
-
-		// Figure out where they are now
-		int oldLoc = findChildLocation(firstChild);
-		if(oldLoc == -1) {
-			throw new IllegalArgumentException("Asked to move a record that wasn't a child!");
-		}
-
-		// Actually move
-		moveChildRecords(oldLoc, newLoc, number);
-	}
-
-    /**
-     * Set child records.
-     *
-     * @param records   the new child records
-     */
-    public void setChildRecord(Record[] records) {
-        this._children = records.clone();
-    }
-
-	/* ===============================================================
-	 *                 External Serialisation Methods
-	 * ===============================================================
-	 */
-
-	/**
-	 * Write out our header, and our children.
-	 * @param headerA the first byte of the header
-	 * @param headerB the second byte of the header
-	 * @param type the record type
-	 * @param children our child records
-	 * @param out the stream to write to
-	 */
-	public void writeOut(byte headerA, byte headerB, long type, Record[] children, OutputStream out) throws IOException {
-		// If we have a mutable output stream, take advantage of that
-		if(out instanceof MutableByteArrayOutputStream) {
-			MutableByteArrayOutputStream mout =
-				(MutableByteArrayOutputStream)out;
-
-			// Grab current size
-			int oldSize = mout.getBytesWritten();
-
-			// Write out our header, less the size
-			mout.write(new byte[] {headerA,headerB});
-			byte[] typeB = new byte[2];
-			LittleEndian.putShort(typeB, 0, (short)type);
-			mout.write(typeB);
-			mout.write(new byte[4]);
-
-			// Write out the children
-			for(int i=0; i<children.length; i++) {
-				children[i].writeOut(mout);
-			}
-
-			// Update our header with the size
-			// Don't forget to knock 8 more off, since we don't include the
-			//  header in the size
-			int length = mout.getBytesWritten() - oldSize - 8;
-			byte[] size = new byte[4];
-			LittleEndian.putInt(size,0,length);
-			mout.overwrite(size, oldSize+4);
-		} else {
-			// Going to have to do it a slower way, because we have
-			// to update the length come the end
-
-			// Create a ByteArrayOutputStream to hold everything in
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-			// Write out our header, less the size
-			baos.write(new byte[] {headerA,headerB});
-			byte[] typeB = new byte[2];
-			LittleEndian.putShort(typeB,0,(short)type);
-			baos.write(typeB);
-			baos.write(new byte[] {0,0,0,0});
-
-			// Write out our children
-			for(int i=0; i<children.length; i++) {
-				children[i].writeOut(baos);
-			}
-
-			// Grab the bytes back
-			byte[] toWrite = baos.toByteArray();
-
-			// Update our header with the size
-			// Don't forget to knock 8 more off, since we don't include the
-			//  header in the size
-			LittleEndian.putInt(toWrite,4,(toWrite.length-8));
-
-			// Write out the bytes
-			out.write(toWrite);
-		}
-	}
-
-    /**
-     * Find the records that are parent-aware, and tell them who their parent is
-     */
-    public static void handleParentAwareRecords(RecordContainer br) {
-        // Loop over child records, looking for interesting ones
-        for (Record record : br.getChildRecords()) {
-            // Tell parent aware records of their parent
-            if (record instanceof ParentAwareRecord) {
-                ((ParentAwareRecord) record).setParentRecord(br);
-            }
-            // Walk on down for the case of container records
-            if (record instanceof RecordContainer) {
-                handleParentAwareRecords((RecordContainer)record);
-            }
-        }
-    }
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
deleted file mode 100644
index 6e39326..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * List of all known record types in a PowerPoint document, and the
- *  classes that handle them.
- * There are two categories of records:
- * <li> PowerPoint records: 0 <= info <= 10002 (will carry class info)
- * <li> Escher records: info >= 0xF000 (handled by DDF, so no class info)
- */
-public enum RecordTypes {
-    Unknown(0,null),
-    UnknownRecordPlaceholder(-1, UnknownRecordPlaceholder.class),
-    Document(1000,Document.class),
-    DocumentAtom(1001,DocumentAtom.class),
-    EndDocument(1002,null),
-    Slide(1006,Slide.class),
-    SlideAtom(1007,SlideAtom.class),
-    Notes(1008,Notes.class),
-    NotesAtom(1009,NotesAtom.class),
-    Environment(1010,Environment.class),
-    SlidePersistAtom(1011,SlidePersistAtom.class),
-    SSlideLayoutAtom(1015,null),
-    MainMaster(1016,MainMaster.class),
-    SSSlideInfoAtom(1017,SSSlideInfoAtom.class),
-    SlideViewInfo(1018,null),
-    GuideAtom(1019,null),
-    ViewInfo(1020,null),
-    ViewInfoAtom(1021,null),
-    SlideViewInfoAtom(1022,null),
-    VBAInfo(1023,VBAInfoContainer.class),
-    VBAInfoAtom(1024,VBAInfoAtom.class),
-    SSDocInfoAtom(1025,null),
-    Summary(1026,null),
-    DocRoutingSlip(1030,null),
-    OutlineViewInfo(1031,null),
-    SorterViewInfo(1032,null),
-    ExObjList(1033,ExObjList.class),
-    ExObjListAtom(1034,ExObjListAtom.class),
-    PPDrawingGroup(1035,PPDrawingGroup.class),
-    PPDrawing(1036,PPDrawing.class),
-    NamedShows(1040,null),
-    NamedShow(1041,null),
-    NamedShowSlides(1042,null),
-    SheetProperties(1044,null),
-    RoundTripCustomTableStyles12Atom(1064,null),
-    List(2000,DocInfoListContainer.class),
-    FontCollection(2005,FontCollection.class),
-    BookmarkCollection(2019,null),
-    SoundCollection(2020,SoundCollection.class),
-    SoundCollAtom(2021,null),
-    Sound(2022,Sound.class),
-    SoundData(2023,SoundData.class),
-    BookmarkSeedAtom(2025,null),
-    ColorSchemeAtom(2032,ColorSchemeAtom.class),
-    ExObjRefAtom(3009,ExObjRefAtom.class),
-    OEPlaceholderAtom(3011,OEPlaceholderAtom.class),
-    GPopublicintAtom(3024,null),
-    GRatioAtom(3031,null),
-    OutlineTextRefAtom(3998,OutlineTextRefAtom.class),
-    TextHeaderAtom(3999,TextHeaderAtom.class),
-    TextCharsAtom(4000,TextCharsAtom.class),
-    StyleTextPropAtom(4001, StyleTextPropAtom.class),//0x0fa1 RT_StyleTextPropAtom
-    MasterTextPropAtom(4002, MasterTextPropAtom.class),
-    TxMasterStyleAtom(4003,TxMasterStyleAtom.class),
-    TxCFStyleAtom(4004,null),
-    TxPFStyleAtom(4005,null),
-    TextRulerAtom(4006,TextRulerAtom.class),
-    TextBookmarkAtom(4007,null),
-    TextBytesAtom(4008,TextBytesAtom.class),
-    TxSIStyleAtom(4009,null),
-    TextSpecInfoAtom(4010, TextSpecInfoAtom.class),
-    DefaultRulerAtom(4011,null),
-    StyleTextProp9Atom(4012, StyleTextProp9Atom.class), //0x0FAC RT_StyleTextProp9Atom
-    FontEntityAtom(4023,FontEntityAtom.class),
-    FontEmbeddedData(4024,null),
-    CString(4026,CString.class),
-    MetaFile(4033,null),
-    ExOleObjAtom(4035,ExOleObjAtom.class),
-    SrKinsoku(4040,null),
-    HandOut(4041,DummyPositionSensitiveRecordWithChildren.class),
-    ExEmbed(4044,ExEmbed.class),
-    ExEmbedAtom(4045,ExEmbedAtom.class),
-    ExLink(4046,null),
-    BookmarkEntityAtom(4048,null),
-    ExLinkAtom(4049,null),
-    SrKinsokuAtom(4050,null),
-    ExHyperlinkAtom(4051,ExHyperlinkAtom.class),
-    ExHyperlink(4055,ExHyperlink.class),
-    SlideNumberMCAtom(4056,null),
-    HeadersFooters(4057,HeadersFootersContainer.class),
-    HeadersFootersAtom(4058,HeadersFootersAtom.class),
-    TxInteractiveInfoAtom(4063,TxInteractiveInfoAtom.class),
-    CharFormatAtom(4066,null),
-    ParaFormatAtom(4067,null),
-    RecolorInfoAtom(4071,null),
-    ExQuickTimeMovie(4074,null),
-    ExQuickTimeMovieData(4075,null),
-    ExControl(4078,ExControl.class),
-    SlideListWithText(4080,SlideListWithText.class),
-    InteractiveInfo(4082,InteractiveInfo.class),
-    InteractiveInfoAtom(4083,InteractiveInfoAtom.class),
-    UserEditAtom(4085,UserEditAtom.class),
-    CurrentUserAtom(4086,null),
-    DateTimeMCAtom(4087,null),
-    GenericDateMCAtom(4088,null),
-    FooterMCAtom(4090,null),
-    ExControlAtom(4091,ExControlAtom.class),
-    ExMediaAtom(4100,ExMediaAtom.class),
-    ExVideoContainer(4101,ExVideoContainer.class),
-    ExAviMovie(4102,ExAviMovie.class),
-    ExMCIMovie(4103,ExMCIMovie.class),
-    ExMIDIAudio(4109,null),
-    ExCDAudio(4110,null),
-    ExWAVAudioEmbedded(4111,null),
-    ExWAVAudioLink(4112,null),
-    ExOleObjStg(4113,ExOleObjStg.class),
-    ExCDAudioAtom(4114,null),
-    ExWAVAudioEmbeddedAtom(4115,null),
-    AnimationInfo(4116,AnimationInfo.class),
-    AnimationInfoAtom(4081,AnimationInfoAtom.class),
-    RTFDateTimeMCAtom(4117,null),
-    ProgTags(5000,DummyPositionSensitiveRecordWithChildren.class),
-    ProgStringTag(5001,null),
-    ProgBinaryTag(5002,DummyPositionSensitiveRecordWithChildren.class),
-    BinaryTagData(5003, BinaryTagDataBlob.class),//0x138b RT_BinaryTagDataBlob
-    PrpublicintOptions(6000,null),
-    PersistPtrFullBlock(6001,PersistPtrHolder.class),
-    PersistPtrIncrementalBlock(6002,PersistPtrHolder.class),
-    GScalingAtom(10001,null),
-    GRColorAtom(10002,null),
-
-    // Records ~12000 seem to be related to the Comments used in PPT 2000/XP
-    // (Comments in PPT97 are normal Escher text boxes)
-    Comment2000(12000,Comment2000.class),
-    Comment2000Atom(12001,Comment2000Atom.class),
-    Comment2000Summary(12004,null),
-    Comment2000SummaryAtom(12005,null),
-
-    // Records ~12050 seem to be related to Document Encryption
-    DocumentEncryptionAtom(12052,DocumentEncryptionAtom.class),
-
-    OriginalMainMasterId(1052,null),
-    CompositeMasterId(1052,null),
-    RoundTripContentMasterInfo12(1054,null),
-    RoundTripShapeId12(1055,null),
-    RoundTripHFPlaceholder12(1056,RoundTripHFPlaceholder12.class),
-    RoundTripContentMasterId(1058,null),
-    RoundTripOArtTextStyles12(1059,null),
-    RoundTripShapeCheckSumForCustomLayouts12(1062,null),
-    RoundTripNotesMasterTextStyles12(1063,null),
-    RoundTripCustomTableStyles12(1064,null),
-
-    // records greater then 0xF000 belong to with Microsoft Office Drawing format also known as Escher
-    EscherDggContainer(0xF000,null),
-    EscherDgg(0xf006,null),
-    EscherCLSID(0xf016,null),
-    EscherOPT(0xf00b,null),
-    EscherBStoreContainer(0xf001,null),
-    EscherBSE(0xf007,null),
-    EscherBlip_START(0xf018,null),
-    EscherBlip_END(0xf117,null),
-    EscherDgContainer(0xf002,null),
-    EscherDg(0xf008,null),
-    EscherRegroupItems(0xf118,null),
-    EscherColorScheme(0xf120,null),
-    EscherSpgrContainer(0xf003,null),
-    EscherSpContainer(0xf004,null),
-    EscherSpgr(0xf009,null),
-    EscherSp(0xf00a,null),
-    EscherTextbox(0xf00c,null),
-    EscherClientTextbox(0xf00d,null),
-    EscherAnchor(0xf00e,null),
-    EscherChildAnchor(0xf00f,null),
-    EscherClientAnchor(0xf010,null),
-    EscherClientData(0xf011,null),
-    EscherSolverContainer(0xf005,null),
-    EscherConnectorRule(0xf012,null),
-    EscherAlignRule(0xf013,null),
-    EscherArcRule(0xf014,null),
-    EscherClientRule(0xf015,null),
-    EscherCalloutRule(0xf017,null),
-    EscherSelection(0xf119,null),
-    EscherColorMRU(0xf11a,null),
-    EscherDeletedPspl(0xf11d,null),
-    EscherSplitMenuColors(0xf11e,null),
-    EscherOleObject(0xf11f,null),
-    EscherUserDefined(0xf122,null);
-
-    private static final Map<Short,RecordTypes> LOOKUP;
-
-    static {
-        LOOKUP = new HashMap<Short,RecordTypes>();
-        for(RecordTypes s : values()) {
-            LOOKUP.put(s.typeID, s);
-        }
-    }    
-    
-    public final short typeID;
-    public final Class<? extends Record> handlingClass;
-
-    private RecordTypes(int typeID, Class<? extends Record> handlingClass) {
-        this.typeID = (short)typeID;
-        this.handlingClass = handlingClass;
-    }
-
-    public static RecordTypes forTypeID(int typeID) {
-        RecordTypes rt = LOOKUP.get((short)typeID);
-        return (rt != null) ? rt : UnknownRecordPlaceholder;
-    }
-
-
-
-    /**
-     * Returns name of the record by its type
-     *
-     * @param type section of the record header
-     * @return name of the record
-     */
-//    public static String recordName(int type) {
-//        String name = typeToName.get(Integer.valueOf(type));
-//        return (name == null) ? ("Unknown" + type) : name;
-//    }
-
-    /**
-     * Returns the class handling a record by its type.
-	 * If given an un-handled PowerPoint record, will return a dummy
-	 *  placeholder class. If given an unknown PowerPoint record, or
-	 *  and Escher record, will return null.
-     *
-     * @param type section of the record header
-     * @return class to handle the record, or null if an unknown (eg Escher) record
-     */
-//	public static Class<? extends Record> recordHandlingClass(int type) {
-//		Class<? extends Record> c = typeToClass.get(Integer.valueOf(type));
-//		return c;
-//	}
-//
-//    static {
-//		typeToName = new HashMap<Integer,String>();
-//		typeToClass = new HashMap<Integer,Class<? extends Record>>();
-//        try {
-//            Field[] f = RecordTypes.class.getFields();
-//            for (int i = 0; i < f.length; i++){
-//               Object val = f[i].get(null);
-//
-//               // Escher record, only store ID -> Name
-//               if (val instanceof Integer) {
-//                  typeToName.put((Integer)val, f[i].getName());
-//               }
-//               // PowerPoint record, store ID -> Name and ID -> Class
-//               if (val instanceof Type) {
-//                  Type t = (Type)val;
-//                  Class<? extends Record> c = t.handlingClass;
-//                  Integer id = Integer.valueOf(t.typeID);
-//                  if(c == null) { c = UnknownRecordPlaceholder.class; }
-//
-//                  typeToName.put(id, f[i].getName());
-//                  typeToClass.put(id, c);
-//               }
-//            }
-//        } catch (IllegalAccessException e){
-//            throw new RuntimeException("Failed to initialize records types");
-//        }
-//    }
-
-
-	/**
-	 * Wrapper for the details of a PowerPoint or Escher record type.
-	 * Contains both the type, and the handling class (if any), and
-	 *  offers methods to get either back out.
-	 */
-//	public static class Type {
-//		public final int typeID;
-//		public final Class<? extends Record> handlingClass;
-//		public Type(int typeID, Class<? extends Record> handlingClass) {
-//			this.typeID = typeID;
-//			this.handlingClass = handlingClass;
-//		}
-//	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
deleted file mode 100644
index e843f1d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An atom record that specifies that a shape is a header or footer placeholder shape
- *
- * @since  PowerPoint 2007
- * @author Yegor Kozlov
- */
-public final class RoundTripHFPlaceholder12 extends RecordAtom {
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Specifies the placeholder shape ID.
-     *
-     * MUST be {@link OEPlaceholderAtom#MasterDate},  {@link OEPlaceholderAtom#MasterSlideNumber},
-     * {@link OEPlaceholderAtom#MasterFooter}, or {@link OEPlaceholderAtom#MasterHeader}
-     */
-    private byte _placeholderId;
-
-    /**
-     * Create a new instance of <code>RoundTripHFPlaceholder12</code>
-     */
-    public RoundTripHFPlaceholder12(){
-        _header = new byte[8];
-        LittleEndian.putUShort(_header, 0, 0);
-        LittleEndian.putUShort(_header, 2, (int)getRecordType());
-        LittleEndian.putInt(_header, 4, 8);
-        _placeholderId = 0;
-    }
-    
-    /**
-     * Constructs the comment atom record from its source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected RoundTripHFPlaceholder12(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _placeholderId = source[start+8];
-    }
-
-    /**
-     * Gets the comment number (note - each user normally has their own count).
-     * @return the comment number.
-     */
-    public int getPlaceholderId() {
-        return _placeholderId;
-    }
-
-    /**
-     * Sets the comment number (note - each user normally has their own count).
-     * @param number the comment number.
-     */
-    public void setPlaceholderId(int number) {
-        _placeholderId = (byte)number;
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return RecordTypes.RoundTripHFPlaceholder12.typeID; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_placeholderId);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java
deleted file mode 100644
index 931f5dc..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * A SlideShowSlideInfo Atom (type 1017).<br/>
- * <br/>
- *  
- * An atom record that specifies which transition effects to perform
- * during a slide show, and how to advance to the next presentation slide.<br/>
- * <br/>
- *
- * Combination of effectType and effectDirection:
- * <table>
- * <tr><th>type</th><th>description</th><th>direction</th></tr>
- * <tr><td>0</td><td>cut</td><td>0x00 = no transition, 0x01 = black transition</td></tr>
- * <tr><td>1</td><td>random</td><td>0x00</td></tr>
- * <tr><td>2</td><td>blinds</td><td>0x00 = vertical, 0x01 = horizontal</td></tr>
- * <tr><td>3</td><td>checker</td><td>like blinds</td></tr>
- * <tr><td>4</td><td>cover</td><td>0x00 = left, 0x01 = up, 0x02 = right, 0x03 = down, 0x04 = left/up, 0x05 = right/up, 0x06 left/down, 0x07 = left/down</td></tr>
- * <tr><td>5</td><td>dissolve</td><td>0x00</td></tr>
- * <tr><td>6</td><td>fade</td><td>0x00</td></tr>
- * <tr><td>7</td><td>uncover</td><td>like cover</td></tr>
- * <tr><td>8</td><td>random bars</td><td>like blinds</td></tr>
- * <tr><td>9</td><td>strips</td><td>like 0x04 - 0x07 of cover</td></tr>
- * <tr><td>10</td><td>wipe</td><td>like 0x00 - 0x03 of cover</td></tr>
- * <tr><td>11</td><td>box in/out</td><td>0x00 = out, 0x01 = in</td></tr>
- * <tr><td>13</td><td>split</td><td>0x00 = horizontally out, 0x01 = horizontally in, 0x02 = vertically out, 0x03 = vertically in</td></tr>
- * <tr><td>17</td><td>diamond</td><td>0x00</td></tr>
- * <tr><td>18</td><td>plus</td><td>0x00</td></tr>
- * <tr><td>19</td><td>wedge</td><td>0x00</td></tr>
- * <tr><td>20</td><td>push</td><td>like 0x00 - 0x03 of cover</td></tr>
- * <tr><td>21</td><td>comb</td><td>like blinds</td></tr>
- * <tr><td>22</td><td>newsflash</td><td>0x00</td></tr>
- * <tr><td>23</td><td>alphafade</td><td>0x00</td></tr>
- * <tr><td>26</td><td>wheel</td><td>number of radial divisions (0x01,0x02,0x03,0x04,0x08)</td></tr>
- * <tr><td>27</td><td>circle</td><td>0x00</td></tr>
- * <tr><td>255</td><td>undefined</td><td>0x00</td></tr>
- * </table>
- */
-public class SSSlideInfoAtom extends RecordAtom {
-    /**
-     * A bit that specifies whether the presentation slide can be
-     * manually advanced by the user during the slide show.
-     */
-    public static final int MANUAL_ADVANCE_BIT     = 1 << 0;
-    
-    /**
-     * A bit that specifies whether the corresponding slide is 
-     * hidden and is not displayed during the slide show.
-     */
-    public static final int HIDDEN_BIT             = 1 << 2;
-    
-    /**
-     * A bit that specifies whether to play the sound specified by soundIfRef.
-     */
-    public static final int SOUND_BIT              = 1 << 4;
-    
-    /**
-     * A bit that specifies whether the sound specified by soundIdRef is
-     * looped continuously when playing until the next sound plays.
-     */
-    public static final int LOOP_SOUND_BIT         = 1 << 6;
-    
-    /**
-     * A bit that specifies whether to stop any currently playing 
-     * sound when the transition starts.
-     */
-    public static final int STOP_SOUND_BIT         = 1 << 8;
-    
-    /**
-     * A bit that specifies whether the slide will automatically
-     * advance after slideTime milliseconds during the slide show.
-     */
-    public static final int AUTO_ADVANCE_BIT       = 1 << 10;
-
-    /**
-     * A bit that specifies whether to display the cursor during
-     * the slide show. 
-     */
-    public static final int CURSOR_VISIBLE_BIT     = 1 << 12;
-    
-    // public static int RESERVED1_BIT       = 1 << 1;
-    // public static int RESERVED2_BIT       = 1 << 3;
-    // public static int RESERVED3_BIT       = 1 << 5;
-    // public static int RESERVED4_BIT       = 1 << 7;
-    // public static int RESERVED5_BIT       = 1 << 9;
-    // public static int RESERVED6_BIT       = 1 << 11;
-    // public static int RESERVED7_BIT       = 1 << 13 | 1 << 14 | 1 << 15;
-    
-    private static final long _type = RecordTypes.SSSlideInfoAtom.typeID;
-
-    private byte[] _header;
-
-    /**
-     * A signed integer that specifies an amount of time, in milliseconds, to wait
-     * before advancing to the next presentation slide. It MUST be greater than or equal to 0 and
-     * less than or equal to 86399000. It MUST be ignored unless AUTO_ADVANCE_BIT is TRUE.
-     */
-    private int _slideTime = 0;
-    
-    /**
-     * A SoundIdRef that specifies which sound to play when the transition starts. 
-     */
-    private int _soundIdRef = 0;
-
-    /**
-     * A byte that specifies the variant of effectType. In combination of the effectType
-     * there are further restriction and specification of this field.
-     */
-    private short _effectDirection = 0; // byte
-    
-    /**
-     * A byte that specifies which transition is used when transitioning to the
-     * next presentation slide during a slide show. Exact rendering of any transition is 
-     * determined by the rendering application. As such, the same transition can have
-     * many variations depending on the implementation.
-     */
-    private short _effectType = 0; // byte
-    
-    /**
-     * Various flags - see bitmask for more details
-     */
-    private short _effectTransitionFlags = 0;
-    
-    /**
-     * A byte value that specifies how long the transition takes to run.
-     * (0x00 = 0.75 seconds, 0x01 = 0.5 seconds, 0x02 = 0.25 seconds) 
-     */
-    private short _speed = 0; // byte
-    private byte[] _unused; // 3-byte
-
-    public SSSlideInfoAtom() {
-        _header = new byte[8];
-        LittleEndian.putShort(_header, 0, (short)0);
-        LittleEndian.putShort(_header, 2, (short)_type);
-        LittleEndian.putShort(_header, 4, (short)0x10);
-        LittleEndian.putShort(_header, 6, (short)0);
-        _unused = new byte[3];
-    }
-    
-    public SSSlideInfoAtom(byte[] source, int offset, int len) {
-        int ofs = offset;
-
-        // Sanity Checking
-        if(len != 24) len = 24;
-        assert(source.length >= offset+len);
-        
-        // Get the header
-        _header = LittleEndian.getByteArray(source,ofs,8);
-        ofs += _header.length;
-        
-        assert(LittleEndian.getShort(_header, 0) == 0);
-        assert(LittleEndian.getShort(_header, 2) == RecordTypes.SSSlideInfoAtom.typeID);
-        assert(LittleEndian.getShort(_header, 4) == 0x10);
-        assert(LittleEndian.getShort(_header, 6) == 0);
-
-        _slideTime = LittleEndian.getInt(source, ofs);
-        assert(0 <= _slideTime && _slideTime <= 86399000);
-        ofs += LittleEndianConsts.INT_SIZE;
-        _soundIdRef = LittleEndian.getInt(source, ofs);
-        ofs += LittleEndianConsts.INT_SIZE;
-        _effectDirection = LittleEndian.getUByte(source, ofs);
-        ofs += LittleEndianConsts.BYTE_SIZE;
-        _effectType = LittleEndian.getUByte(source, ofs);
-        ofs += LittleEndianConsts.BYTE_SIZE;
-        _effectTransitionFlags = LittleEndian.getShort(source, ofs);
-        ofs += LittleEndianConsts.SHORT_SIZE;
-        _speed = LittleEndian.getUByte(source, ofs);
-        ofs += LittleEndianConsts.BYTE_SIZE;
-        _unused = LittleEndian.getByteArray(source,ofs,3);
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     *  to disk
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        // Header - size or type unchanged
-        out.write(_header);
-        writeLittleEndian(_slideTime, out);
-        writeLittleEndian(_soundIdRef, out);
-        
-        byte byteBuf[] = new byte[LittleEndianConsts.BYTE_SIZE];
-        LittleEndian.putUByte(byteBuf, 0, _effectDirection);
-        out.write(byteBuf);
-        LittleEndian.putUByte(byteBuf, 0, _effectType);
-        out.write(byteBuf);
-        
-        writeLittleEndian(_effectTransitionFlags, out);
-        LittleEndian.putUByte(byteBuf, 0, _speed);
-        out.write(byteBuf);
-
-        assert(_unused.length == 3);
-        out.write(_unused);
-    }
-    
-    /**
-     * We are of type 1017
-     */
-    public long getRecordType() { return _type; }
-
-
-    public int getSlideTime() {
-        return _slideTime;
-    }
-
-    public void setSlideTime(int slideTime) {
-        this._slideTime = slideTime;
-    }
-
-    public int getSoundIdRef() {
-        return _soundIdRef;
-    }
-
-    public void setSoundIdRef(int soundIdRef) {
-        this._soundIdRef = soundIdRef;
-    }
-
-    public short getEffectDirection() {
-        return _effectDirection;
-    }
-
-    public void setEffectDirection(short effectDirection) {
-        this._effectDirection = effectDirection;
-    }
-
-    public short getEffectType() {
-        return _effectType;
-    }
-
-    public void setEffectType(short effectType) {
-        this._effectType = effectType;
-    }
-
-    public short getEffectTransitionFlags() {
-        return _effectTransitionFlags;
-    }
-
-    public void setEffectTransitionFlags(short effectTransitionFlags) {
-        this._effectTransitionFlags = effectTransitionFlags;
-    }
-
-    /**
-     * Use one of the bitmasks MANUAL_ADVANCE_BIT ... CURSOR_VISIBLE_BIT
-     * @param bitmask
-     * @param enabled
-     */
-    public void setEffectTransitionFlagByBit(int bitmask, boolean enabled) {
-        if (enabled) {
-            _effectTransitionFlags |= bitmask;
-        } else {
-            _effectTransitionFlags &= (0xFFFF ^ bitmask);
-        }
-    }
-
-    public boolean getEffectTransitionFlagByBit(int bitmask) {
-        return ((_effectTransitionFlags & bitmask) != 0);
-    }
-    
-    public short getSpeed() {
-        return _speed;
-    }
-
-    public void setSpeed(short speed) {
-        this._speed = speed;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java
deleted file mode 100644
index 08c05c4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-/**
- * The superclass of all sheet container records - Slide, Notes, MainMaster, etc.
- */
-public abstract class SheetContainer extends PositionDependentRecordContainer {
-
-    /**
-     * Returns the PPDrawing of this sheet, which has all the
-     *  interesting data in it
-     */
-    public abstract PPDrawing getPPDrawing();
-
-    public abstract ColorSchemeAtom getColorScheme();
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java
deleted file mode 100644
index a833c40..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Master container for Slides. There is one of these for every slide,
- *  and they have certain specific children
- *
- * @author Nick Burch
- */
-
-public final class Slide extends SheetContainer
-{
-	private byte[] _header;
-	private static long _type = 1006l;
-
-	// Links to our more interesting children
-	private SlideAtom slideAtom;
-	private PPDrawing ppDrawing;
-    private ColorSchemeAtom _colorScheme;
-
-	/**
-	 * Returns the SlideAtom of this Slide
-	 */
-	public SlideAtom getSlideAtom() { return slideAtom; }
-
-	/**
-	 * Returns the PPDrawing of this Slide, which has all the
-	 *  interesting data in it
-	 */
-	public PPDrawing getPPDrawing() { return ppDrawing; }
-
-
-	/**
-	 * Set things up, and find our more interesting children
-	 */
-	protected Slide(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-
-		// Find the interesting ones in there
-		for(int i=0; i<_children.length; i++) {
-			if(_children[i] instanceof SlideAtom) {
-				slideAtom = (SlideAtom)_children[i];
-			}
-			else if(_children[i] instanceof PPDrawing) {
-				ppDrawing = (PPDrawing)_children[i];
-			}
-
-            if(ppDrawing != null && _children[i] instanceof ColorSchemeAtom) {
-                _colorScheme = (ColorSchemeAtom)_children[i];
-            }
-		}
-	}
-
-	/**
-	 * Create a new, empty, Slide, along with its required
-	 *  child records.
-	 */
-	public Slide(){
-		_header = new byte[8];
-		LittleEndian.putUShort(_header, 0, 15);
-		LittleEndian.putUShort(_header, 2, (int)_type);
-		LittleEndian.putInt(_header, 4, 0);
-
-		slideAtom = new SlideAtom();
-		ppDrawing = new PPDrawing();
-
-		ColorSchemeAtom colorAtom = new ColorSchemeAtom();
-
-		_children = new Record[] {
-			slideAtom,
-			ppDrawing,
-			colorAtom
-		};
-	}
-
-	/**
-	 * We are of type 1006
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-
-    public ColorSchemeAtom getColorScheme(){
-        return _colorScheme;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java
deleted file mode 100644
index 68f75c0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A Slide Atom (type 1007). Holds information on the parent Slide, what
- *  Master Slide it uses, what Notes is attached to it, that sort of thing.
- *  It also has a SSlideLayoutAtom embeded in it, but without the Atom header
- *
- * @author Nick Burch
- */
-
-public final class SlideAtom extends RecordAtom
-{
-	private byte[] _header;
-	private static long _type = 1007l;
-	public static final int MASTER_SLIDE_ID = 0;
-	public static final int USES_MASTER_SLIDE_ID = -2147483648;
-
-	private int masterID;
-	private int notesID;
-
-	private boolean followMasterObjects;
-	private boolean followMasterScheme;
-	private boolean followMasterBackground;
-	private SSlideLayoutAtom layoutAtom;
-	private byte[] reserved;
-
-
-	/** Get the ID of the master slide used. 0 if this is a master slide, otherwise -2147483648 */
-	public int getMasterID() { return masterID; }
-    /** Change slide master.  */
-    public void setMasterID(int id) { masterID = id; }
-	/** Get the ID of the notes for this slide. 0 if doesn't have one */
-	public int getNotesID()  { return notesID; }
-	/** Get the embeded SSlideLayoutAtom */
-	public SSlideLayoutAtom getSSlideLayoutAtom() { return layoutAtom; }
-
-	/** Change the ID of the notes for this slide. 0 if it no longer has one */
-	public void setNotesID(int id) { notesID = id; }
-
-	public boolean getFollowMasterObjects()    { return followMasterObjects; }
-	public boolean getFollowMasterScheme()     { return followMasterScheme; }
-	public boolean getFollowMasterBackground() { return followMasterBackground; }
-	public void setFollowMasterObjects(boolean flag)    { followMasterObjects = flag; }
-	public void setFollowMasterScheme(boolean flag)     { followMasterScheme = flag; }
-	public void setFollowMasterBackground(boolean flag) { followMasterBackground = flag; }
-
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the Slide Atom
-	 */
-	protected SlideAtom(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 30) { len = 30; }
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the 12 bytes that is "SSlideLayoutAtom"
-		byte[] SSlideLayoutAtomData = new byte[12];
-		System.arraycopy(source,start+8,SSlideLayoutAtomData,0,12);
-		// Use them to build up the SSlideLayoutAtom
-		layoutAtom = new SSlideLayoutAtom(SSlideLayoutAtomData);
-
-		// Get the IDs of the master and notes
-		masterID = LittleEndian.getInt(source,start+12+8);
-		notesID = LittleEndian.getInt(source,start+16+8);
-
-		// Grok the flags, stored as bits
-		int flags = LittleEndian.getUShort(source,start+20+8);
-		if((flags&4) == 4) {
-			followMasterBackground = true;
-		} else {
-			followMasterBackground = false;
-		}
-		if((flags&2) == 2) {
-			followMasterScheme = true;
-		} else {
-			followMasterScheme = false;
-		}
-		if((flags&1) == 1) {
-			followMasterObjects = true;
-		} else {
-			followMasterObjects = false;
-		}
-
-		// If there's any other bits of data, keep them about
-		// 8 bytes header + 20 bytes to flags + 2 bytes flags = 30 bytes
-		reserved = new byte[len-30];
-		System.arraycopy(source,start+30,reserved,0,reserved.length);
-	}
-
-	/**
-	 * Create a new SlideAtom, to go with a new Slide
-	 */
-	public SlideAtom(){
-		_header = new byte[8];
-		LittleEndian.putUShort(_header, 0, 2);
-		LittleEndian.putUShort(_header, 2, (int)_type);
-		LittleEndian.putInt(_header, 4, 24);
-
-		byte[] ssdate = new byte[12];
-		layoutAtom = new SSlideLayoutAtom(ssdate);
-		layoutAtom.setGeometryType(SSlideLayoutAtom.BLANK_SLIDE);
-
-		followMasterObjects = true;
-		followMasterScheme = true;
-		followMasterBackground = true;
-		masterID = -2147483648;
-		notesID = 0;
-		reserved = new byte[2];
-	}
-
-	/**
-	 * We are of type 1007
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header
-		out.write(_header);
-
-		// SSSlideLayoutAtom stuff
-		layoutAtom.writeOut(out);
-
-		// IDs
-		writeLittleEndian(masterID,out);
-		writeLittleEndian(notesID,out);
-
-		// Flags
-		short flags = 0;
-		if(followMasterObjects)    { flags += 1; }
-		if(followMasterScheme)     { flags += 2; }
-		if(followMasterBackground) { flags += 4; }
-		writeLittleEndian(flags,out);
-
-		// Reserved data
-		out.write(reserved);
-	}
-
-
-	/**
-	 * Holds the geometry of the Slide, and the ID of the placeholders
-	 *  on the slide.
-	 * (Embeded inside SlideAtom is a SSlideLayoutAtom, without the
-	 *  usual record header. Since it's a fixed size and tied to
-	 *  the SlideAtom, we'll hold it here.)
-	 */
-	public static class SSlideLayoutAtom {
-		// The different kinds of geometry
-		public static final int TITLE_SLIDE = 0;
-		public static final int TITLE_BODY_SLIDE = 1;
-		public static final int TITLE_MASTER_SLIDE = 2;
-		public static final int MASTER_SLIDE = 3;
-		public static final int MASTER_NOTES = 4;
-		public static final int NOTES_TITLE_BODY = 5;
-		public static final int HANDOUT = 6; // Only header, footer and date placeholders
-		public static final int TITLE_ONLY = 7;
-		public static final int TITLE_2_COLUMN_BODY = 8;
-		public static final int TITLE_2_ROW_BODY = 9;
-		public static final int TITLE_2_COLUNM_RIGHT_2_ROW_BODY = 10;
-		public static final int TITLE_2_COLUNM_LEFT_2_ROW_BODY = 11;
-		public static final int TITLE_2_ROW_BOTTOM_2_COLUMN_BODY = 12;
-		public static final int TITLE_2_ROW_TOP_2_COLUMN_BODY = 13;
-		public static final int FOUR_OBJECTS = 14;
-		public static final int BIG_OBJECT = 15;
-		public static final int BLANK_SLIDE = 16;
-		public static final int VERTICAL_TITLE_BODY_LEFT = 17;
-		public static final int VERTICAL_TITLE_2_ROW_BODY_LEFT = 17;
-
-		/** What geometry type we are */
-		private int geometry;
-		/** What placeholder IDs we have */
-		private byte[] placeholderIDs;
-
-		/** Retrieve the geometry type */
-		public int getGeometryType() { return geometry; }
-		/** Set the geometry type */
-		public void setGeometryType(int geom) { geometry = geom; }
-
-		/**
-		 * Create a new Embeded SSlideLayoutAtom, from 12 bytes of data
-		 */
-		public SSlideLayoutAtom(byte[] data) {
-			if(data.length != 12) {
-				throw new RuntimeException("SSlideLayoutAtom created with byte array not 12 bytes long - was " + data.length + " bytes in size");
-			}
-
-			// Grab out our data
-			geometry = LittleEndian.getInt(data,0);
-			placeholderIDs = new byte[8];
-			System.arraycopy(data,4,placeholderIDs,0,8);
-		}
-
-		/**
-		 * Write the contents of the record back, so it can be written
-		 *  to disk. Skips the record header
-		 */
-		public void writeOut(OutputStream out) throws IOException {
-			// Write the geometry
-			writeLittleEndian(geometry,out);
-			// Write the placeholder IDs
-			out.write(placeholderIDs);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
deleted file mode 100644
index deeee6f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * These are tricky beasts. They contain the text of potentially
- *  many (normal) slides. They are made up of several sets of
- *  - SlidePersistAtom
- *  - TextHeaderAtom
- *  - TextBytesAtom / TextCharsAtom
- *  - StyleTextPropAtom (optional)
- *  - TextSpecInfoAtom (optional)
- *  - InteractiveInfo (optional)
- *  - TxInteractiveInfoAtom (optional)
- * and then the next SlidePersistAtom.
- *
- * Eventually, Slides will find the blocks that interest them from all
- *  the SlideListWithText entries, and refere to them
- *
- * For now, we scan through looking for interesting bits, then creating
- *  the helpful Sheet from model for them
- *
- * @author Nick Burch
- */
-
-// For now, pretend to be an atom
-public final class SlideListWithText extends RecordContainer {
-
-	/**
-	 * Instance filed of the record header indicates that this SlideListWithText stores
-	 * references to slides
-	 */
-	public static final int SLIDES = 0;
-	/**
-	 * Instance filed of the record header indicates that this SlideListWithText stores
-	 * references to master slides
-	 */
-	public static final int MASTER = 1;
-	/**
-	 * Instance filed of the record header indicates that this SlideListWithText stores
-	 * references to notes
-	 */
-	public static final int NOTES = 2;
-
-	private byte[] _header;
-	private static long _type = 4080;
-
-	private SlideAtomsSet[] slideAtomsSets;
-
-	/**
-	 * Create a new holder for slide records
-	 */
-	protected SlideListWithText(byte[] source, int start, int len) {
-		// Grab the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
-
-		// Group our children together into SlideAtomsSets
-		// That way, model layer code can just grab the sets to use,
-		//  without having to try to match the children together
-		List<SlideAtomsSet> sets = new ArrayList<SlideAtomsSet>();
-		for(int i=0; i<_children.length; i++) {
-			if(_children[i] instanceof SlidePersistAtom) {
-				// Find where the next SlidePersistAtom is
-				int endPos = i+1;
-				while(endPos < _children.length && !(_children[endPos] instanceof SlidePersistAtom)) {
-					endPos += 1;
-				}
-
-				int clen = endPos - i - 1;
-
-				// Create a SlideAtomsSets, not caring if they're empty
-				//if(emptySet) { continue; }
-				Record[] spaChildren = new Record[clen];
-				System.arraycopy(_children,i+1,spaChildren,0,clen);
-				SlideAtomsSet set = new SlideAtomsSet((SlidePersistAtom)_children[i],spaChildren);
-				sets.add(set);
-
-				// Wind on
-				i += clen;
-			}
-		}
-
-		// Turn the list into an array
-		slideAtomsSets = sets.toArray( new SlideAtomsSet[sets.size()] );
-	}
-
-	/**
-	 * Create a new, empty, SlideListWithText
-	 */
-	public SlideListWithText(){
-		_header = new byte[8];
-		LittleEndian.putUShort(_header, 0, 15);
-		LittleEndian.putUShort(_header, 2, (int)_type);
-		LittleEndian.putInt(_header, 4, 0);
-
-		// We have no children to start with
-		_children = new Record[0];
-		slideAtomsSets = new SlideAtomsSet[0];
-	}
-
-	/**
-	 * Add a new SlidePersistAtom, to the end of the current list,
-	 *  and update the internal list of SlidePersistAtoms
-	 * @param spa
-	 */
-	public void addSlidePersistAtom(SlidePersistAtom spa) {
-		// Add the new SlidePersistAtom at the end
-		appendChildRecord(spa);
-
-		SlideAtomsSet newSAS = new SlideAtomsSet(spa, new Record[0]);
-
-		// Update our SlideAtomsSets with this
-		SlideAtomsSet[] sas = new SlideAtomsSet[slideAtomsSets.length+1];
-		System.arraycopy(slideAtomsSets, 0, sas, 0, slideAtomsSets.length);
-		sas[sas.length-1] = newSAS;
-		slideAtomsSets = sas;
-	}
-
-	public int getInstance(){
-		return LittleEndian.getShort(_header, 0) >> 4;
-	}
-
-	public void setInstance(int inst){
-		LittleEndian.putShort(_header, 0, (short)((inst << 4) | 0xF));
-	}
-
-	/**
-	 * Get access to the SlideAtomsSets of the children of this record
-	 */
-	public SlideAtomsSet[] getSlideAtomsSets() {
-	    return slideAtomsSets;
-    }
-
-	/**
-	* Get access to the SlideAtomsSets of the children of this record
-	*/
-	public void setSlideAtomsSets( SlideAtomsSet[] sas ) {
-	    slideAtomsSets = sas.clone();
-    }
-
-	/**
-	 * Return the value we were given at creation
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		writeOut(_header[0],_header[1],_type,_children,out);
-	}
-
-	/**
-	 * Inner class to wrap up a matching set of records that hold the
-	 *  text for a given sheet. Contains the leading SlidePersistAtom,
-	 *  and all of the records until the next SlidePersistAtom. This
-	 *  includes sets of TextHeaderAtom and TextBytesAtom/TextCharsAtom,
-	 *  along with some others.
-	 */
-	public static class SlideAtomsSet {
-		private SlidePersistAtom slidePersistAtom;
-		private Record[] slideRecords;
-
-		/** Get the SlidePersistAtom, which gives details on the Slide this text is associated with */
-		public SlidePersistAtom getSlidePersistAtom() { return slidePersistAtom; }
-		/** Get the Text related records for this slide */
-		public Record[] getSlideRecords() { return slideRecords; }
-
-		/** Create one to hold the Records for one Slide's text */
-		public SlideAtomsSet(SlidePersistAtom s, Record[] r) {
-			slidePersistAtom = s;
-			slideRecords = r.clone();
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java
deleted file mode 100644
index 0ac22ad..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * A SlidePersist Atom (type 1011). Holds information on the text of a
- *  given slide, which are stored in the same SlideListWithText
- *
- * @author Nick Burch
- */
-public final class SlidePersistAtom extends RecordAtom {
-	private byte[] _header;
-	private static long _type = 1011l;
-
-	/**
-	 * Slide reference ID. Should correspond to the PersistPtr
-	 *  "sheet ID" of the matching slide/notes record
-	 */
-	private int refID;
-	private boolean hasShapesOtherThanPlaceholders;
-	/** Number of placeholder texts that will follow in the SlideListWithText */
-	private int numPlaceholderTexts;
-	/**
-	 * The internal identifier (256+), which is used to tie slides
-	 *  and notes together
-	 */
-	private int slideIdentifier;
-	/** Reserved fields. Who knows what they do */
-	private byte[] reservedFields;
-
-	public int getRefID() { return refID; }
-	public int getSlideIdentifier() { return slideIdentifier; }
-	public int getNumPlaceholderTexts() { return numPlaceholderTexts; }
-	public boolean getHasShapesOtherThanPlaceholders() { return hasShapesOtherThanPlaceholders; }
-
-	// Only set these if you know what you're doing!
-	public void setRefID(int id) {
-		refID = id;
-	}
-	public void setSlideIdentifier(int id) {
-		slideIdentifier = id;
-	}
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the SlidePersist Atom
-	 */
-	protected SlidePersistAtom(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 8) { len = 8; }
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the reference ID
-		refID = LittleEndian.getInt(source,start+8);
-
-		// Next up is a set of flags, but only bit 3 is used!
-		int flags = LittleEndian.getInt(source,start+12);
-		if(flags == 4) {
-			hasShapesOtherThanPlaceholders = true;
-		} else {
-			hasShapesOtherThanPlaceholders = false;
-		}
-
-		// Now the number of Placeholder Texts
-		numPlaceholderTexts = LittleEndian.getInt(source,start+16);
-
-		// Last useful one is the unique slide identifier
-		slideIdentifier = LittleEndian.getInt(source,start+20);
-
-		// Finally you have typically 4 or 8 bytes of reserved fields,
-		//  all zero running from 24 bytes in to the end
-		reservedFields = new byte[len-24];
-		System.arraycopy(source,start+24,reservedFields,0,reservedFields.length);
-	}
-
-	/**
-	 * Create a new SlidePersistAtom, for use with a new Slide
-	 */
-	public SlidePersistAtom(){
-		_header = new byte[8];
-		LittleEndian.putUShort(_header, 0, 0);
-		LittleEndian.putUShort(_header, 2, (int)_type);
-		LittleEndian.putInt(_header, 4, 20);
-
-		hasShapesOtherThanPlaceholders = true;
-		reservedFields = new byte[4];
-	}
-
-	/**
-	 * We are of type 1011
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header - size or type unchanged
-		out.write(_header);
-
-		// Compute the flags part - only bit 3 is used
-		int flags = 0;
-		if(hasShapesOtherThanPlaceholders) {
-			flags = 4;
-		}
-
-		// Write out our fields
-		writeLittleEndian(refID,out);
-		writeLittleEndian(flags,out);
-		writeLittleEndian(numPlaceholderTexts,out);
-		writeLittleEndian(slideIdentifier,out);
-		out.write(reservedFields);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java
deleted file mode 100644
index f454e4d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.POILogger;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * A container holding information about a sound. It contains:
- * <p>
- * <li>1. CString (4026), Instance 0: Name of sound (e.g. "crash")
- * <li>2. CString (4026), Instance 1: Type of sound (e.g. ".wav")
- * <li>3. CString (4026), Instance 2: Reference id of sound in sound collection
- * <li>4. CString (4026), Instance 3, optional: Built-in id of sound, for sounds we ship. This is the id that?s in the reg file.
- * <li>5. SoundData (2023), optional
- * </p>
- *
- * @author Yegor Kozlov
- */
-public final class Sound extends RecordContainer {
-    /**
-     * Record header data.
-     */
-    private byte[] _header;
-
-    // Links to our more interesting children
-    private CString _name;
-    private CString _type;
-    private SoundData _data;
-
-
-    /**
-     * Set things up, and find our more interesting children
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected Sound(byte[] source, int start, int len) {
-        // Grab the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Find our children
-        _children = Record.findChildRecords(source,start+8,len-8);
-        findInterestingChildren();
-    }
-
-    private void findInterestingChildren() {
-        // First child should be the ExHyperlinkAtom
-        if(_children[0] instanceof CString) {
-            _name = (CString)_children[0];
-        } else {
-            logger.log(POILogger.ERROR, "First child record wasn't a CString, was of type " + _children[0].getRecordType());
-        }
-
-        // Second child should be the ExOleObjAtom
-        if (_children[1] instanceof CString) {
-            _type = (CString)_children[1];
-        } else {
-            logger.log(POILogger.ERROR, "Second child record wasn't a CString, was of type " + _children[1].getRecordType());
-        }
-
-        for (int i = 2; i < _children.length; i++) {
-            if(_children[i] instanceof SoundData){
-                _data = (SoundData)_children[i];
-                break;
-            }
-        }
-
-    }
-
-    /**
-     * Returns the type (held as a little endian in bytes 3 and 4)
-     * that this class handles.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.Sound.typeID;
-    }
-
-    /**
-     * Have the contents printer out into an OutputStream, used when
-     * writing a file back out to disk.
-     *
-     * @param out the output stream.
-     * @throws java.io.IOException if there was an error writing to the stream.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        writeOut(_header[0],_header[1],getRecordType(),_children,out);
-    }
-
-    /**
-     * Name of the sound (e.g. "crash")
-     *
-     * @return name of the sound
-     */
-    public String getSoundName(){
-        return _name.getText();
-    }
-
-    /**
-     * Type of the sound (e.g. ".wav")
-     *
-     * @return type of the sound
-     */
-    public String getSoundType(){
-        return _type.getText();
-    }
-
-    /**
-     * The sound data
-     *
-     * @return the sound data.
-     */
-    public byte[] getSoundData(){
-        return _data == null ? null : _data.getData();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java
deleted file mode 100644
index abea388..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * Is a container for all sound related atoms and containers. It contains:
- *<li>1. SoundCollAtom (2021)
- *<li>2. Sound (2022), for each sound, if any
- *
- * @author Yegor Kozlov
- */
-public final class SoundCollection extends RecordContainer {
-    /**
-     * Record header data.
-     */
-    private byte[] _header;
-
-    /**
-     * Set things up, and find our more interesting children
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected SoundCollection(byte[] source, int start, int len) {
-        // Grab the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Find our children
-        _children = Record.findChildRecords(source,start+8,len-8);
-    }
-
-    /**
-     * Returns the type (held as a little endian in bytes 3 and 4)
-     * that this class handles.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.SoundCollection.typeID;
-    }
-
-    /**
-     * Have the contents printer out into an OutputStream, used when
-     * writing a file back out to disk.
-     *
-     * @param out the output stream.
-     * @throws java.io.IOException if there was an error writing to the stream.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        writeOut(_header[0],_header[1],getRecordType(),_children,out);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java
deleted file mode 100644
index 32aa959..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Storage for embedded sounds.
- *
- * @author Yegor Kozlov
- */
-public final class SoundData extends RecordAtom {
-
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a new empty sound container.
-     */
-    protected SoundData() {
-        _header = new byte[8];
-        _data = new byte[0];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected SoundData(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-    }
-
-    /**
-     * Returns the sound data.
-     *
-     * @return the sound data
-     */
-    public byte[] getData() {
-        return _data;
-    }
-
-    /**
-     * Gets the record type.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.SoundData.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk.
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java
deleted file mode 100644
index 9a5cc7b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.poi.hslf.model.textproperties.TextPFException9;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The atom record that specifies additional text formatting.
- */
-public final class StyleTextProp9Atom extends RecordAtom {
-    private final TextPFException9[] autoNumberSchemes;
-    /** Record header. */
-    private byte[] header;
-    /** Record data. */
-    private byte[] data;
-    private short version;
-    private short recordId;
-    private int length;
-    
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected StyleTextProp9Atom(byte[] source, int start, int len) {
-        // Get the header.
-        final List<TextPFException9> schemes = new LinkedList<TextPFException9>();
-        header = new byte[8];
-        System.arraycopy(source,start, header,0,8);
-        this.version  = LittleEndian.getShort(header, 0);
-        this.recordId = LittleEndian.getShort(header, 2);
-        this.length   = LittleEndian.getInt(header, 4);
-        
-        // Get the record data.
-        data = new byte[len-8];
-        System.arraycopy(source, start+8, data, 0, len-8);
-        for (int i = 0; i < data.length; ) {
-            final TextPFException9 item = new TextPFException9(data, i);
-            schemes.add(item);
-            i += item.getRecordLength();
-            
-            if (i+4 >= data.length) {
-                break;
-            }
-            int textCfException9 = LittleEndian.getInt(data, i );
-            i += 4;
-            //TODO analyze textCfException when have some test data
-            
-            if (i+4 >= data.length) {
-                break;
-            }
-            int textSiException = LittleEndian.getInt(data, i );
-            i += 4;//TextCFException9 + SIException
-            
-            if (0 != (textSiException & 0x40)) { 
-                i += 2; //skip fBidi 
-            }
-            if (i+4 >= data.length) {
-                break;
-            }
-        }
-        this.autoNumberSchemes = schemes.toArray(new TextPFException9[schemes.size()]);
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return this.recordId; }
-
-    public short getVersion() {
-        return version;
-    }
-
-    public int getLength() {
-        return length;
-    }
-    public TextPFException9[] getAutoNumberTypes() {
-        return this.autoNumberSchemes;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(header);
-        out.write(data);
-    }
-
-    /**
-     * Update the text length
-     *
-     * @param size the text length
-     */
-    public void setTextSize(int size){
-        LittleEndian.putInt(data, 0, size);
-    }
-
-    /**
-     * Reset the content to one info run with the default values
-     * @param size  the site of parent text
-     */
-    public void reset(int size){
-        data = new byte[10];
-        // 01 00 00 00
-        LittleEndian.putInt(data, 0, size);
-        // 01 00 00 00
-        LittleEndian.putInt(data, 4, 1); //mask
-        // 00 00
-        LittleEndian.putShort(data, 8, (short)0); //langId
-
-        // Update the size (header bytes 5-8)
-        LittleEndian.putInt(header, 4, data.length);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
deleted file mode 100644
index bfb9d74..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hslf.model.textproperties.*;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;
-import org.apache.poi.util.*;
-
-/**
- * A StyleTextPropAtom (type 4001). Holds basic character properties
- *  (bold, italic, underline, font size etc) and paragraph properties
- *  (alignment, line spacing etc) for the block of text (TextBytesAtom
- *  or TextCharsAtom) that this record follows.
- * You will find two lists within this class.
- *  1 - Paragraph style list (paragraphStyles)
- *  2 - Character style list (charStyles)
- * Both are lists of TextPropCollections. These define how many characters
- *  the style applies to, and what style elements make up the style (another
- *  list, this time of TextProps). Each TextProp has a value, which somehow
- *  encapsulates a property of the style
- *
- * @author Nick Burch
- * @author Yegor Kozlov
- */
-
-public final class StyleTextPropAtom extends RecordAtom
-{
-    private byte[] _header;
-    private static final long _type = RecordTypes.StyleTextPropAtom.typeID;
-    private byte[] reserved;
-
-    private byte[] rawContents; // Holds the contents between write-outs
-
-    /**
-     * Only set to true once setParentTextSize(int) is called.
-     * Until then, no stylings will have been decoded
-     */
-    private boolean initialised = false;
-
-    /**
-     * The list of all the different paragraph stylings we code for.
-     * Each entry is a TextPropCollection, which tells you how many
-     *  Characters the paragraph covers, and also contains the TextProps
-     *  that actually define the styling of the paragraph.
-     */
-    private List<TextPropCollection> paragraphStyles;
-    public List<TextPropCollection> getParagraphStyles() { return paragraphStyles; }
-    /**
-     * Updates the link list of TextPropCollections which make up the
-     *  paragraph stylings
-     */
-    public void setParagraphStyles(List<TextPropCollection> ps) { paragraphStyles = ps; }
-    /**
-     * The list of all the different character stylings we code for.
-     * Each entry is a TextPropCollection, which tells you how many
-     *  Characters the character styling covers, and also contains the
-     *  TextProps that actually define the styling of the characters.
-     */
-    private List<TextPropCollection> charStyles;
-    public List<TextPropCollection> getCharacterStyles() { return charStyles; }
-    /**
-     * Updates the link list of TextPropCollections which make up the
-     *  character stylings
-     */
-    public void setCharacterStyles(List<TextPropCollection> cs) { charStyles = cs; }
-
-    /**
-     * Returns how many characters the paragraph's
-     *  TextPropCollections cover.
-     * (May be one or two more than the underlying text does,
-     *  due to having extra characters meaning something
-     *  special to powerpoint)
-     */
-    public int getParagraphTextLengthCovered() {
-        return getCharactersCovered(paragraphStyles);
-    }
-    /**
-     * Returns how many characters the character's
-     *  TextPropCollections cover.
-     * (May be one or two more than the underlying text does,
-     *  due to having extra characters meaning something
-     *  special to powerpoint)
-     */
-    public int getCharacterTextLengthCovered() {
-        return getCharactersCovered(charStyles);
-    }
-    private int getCharactersCovered(List<TextPropCollection> styles) {
-        int length = 0;
-        for(TextPropCollection tpc : styles) {
-            length += tpc.getCharactersCovered();
-        }
-        return length;
-    }
-
-    /* *************** record code follows ********************** */
-
-    /**
-     * For the Text Style Properties (StyleTextProp) Atom
-     */
-    public StyleTextPropAtom(byte[] source, int start, int len) {
-        // Sanity Checking - we're always at least 8+10 bytes long
-        if(len < 18) {
-            len = 18;
-            if(source.length - start < 18) {
-                throw new RuntimeException("Not enough data to form a StyleTextPropAtom (min size 18 bytes long) - found " + (source.length - start));
-            }
-        }
-
-        // Get the header
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Save the contents of the atom, until we're asked to go and
-        //  decode them (via a call to setParentTextSize(int)
-        rawContents = new byte[len-8];
-        System.arraycopy(source,start+8,rawContents,0,rawContents.length);
-        reserved = new byte[0];
-
-        // Set empty lists, ready for when they call setParentTextSize
-        paragraphStyles = new ArrayList<TextPropCollection>();
-        charStyles = new ArrayList<TextPropCollection>();
-    }
-
-
-    /**
-     * A new set of text style properties for some text without any.
-     */
-    public StyleTextPropAtom(int parentTextSize) {
-        _header = new byte[8];
-        rawContents = new byte[0];
-        reserved = new byte[0];
-
-        // Set our type
-        LittleEndian.putInt(_header,2,(short)_type);
-        // Our initial size is 10
-        LittleEndian.putInt(_header,4,10);
-
-        // Set empty paragraph and character styles
-        paragraphStyles = new ArrayList<TextPropCollection>();
-        charStyles = new ArrayList<TextPropCollection>();
-
-        addParagraphTextPropCollection(parentTextSize);
-        addCharacterTextPropCollection(parentTextSize);
-
-        // Set us as now initialised
-        initialised = true;
-
-        try {
-            updateRawContents();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-    /**
-     * We are of type 4001
-     */
-    public long getRecordType() { return _type; }
-
-
-    /**
-     * Write the contents of the record back, so it can be written
-     *  to disk
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        // First thing to do is update the raw bytes of the contents, based
-        //  on the properties
-        updateRawContents();
-
-        // Write out the (new) header
-        out.write(_header);
-
-        // Write out the styles
-        out.write(rawContents);
-
-        // Write out any extra bits
-        out.write(reserved);
-    }
-
-
-    /**
-     * Tell us how much text the parent TextCharsAtom or TextBytesAtom
-     *  contains, so we can go ahead and initialise ourselves.
-     */
-    public void setParentTextSize(int size) {
-        if (initialised) return;
-        
-        int pos = 0;
-        int textHandled = 0;
-
-        paragraphStyles.clear();
-        charStyles.clear();
-        
-        // While we have text in need of paragraph stylings, go ahead and
-        // grok the contents as paragraph formatting data
-        int prsize = size;
-        while(pos < rawContents.length && textHandled < prsize) {
-            // First up, fetch the number of characters this applies to
-            int textLen = LittleEndian.getInt(rawContents,pos);
-            textLen = checkTextLength(textLen, textHandled, size);
-            textHandled += textLen;
-            pos += 4;
-
-            short indent = LittleEndian.getShort(rawContents,pos);
-            pos += 2;
-
-            // Grab the 4 byte value that tells us what properties follow
-            int paraFlags = LittleEndian.getInt(rawContents,pos);
-            pos += 4;
-
-            // Now make sense of those properties
-            TextPropCollection thisCollection = new TextPropCollection(textLen, TextPropType.paragraph);
-            thisCollection.setIndentLevel(indent);
-            int plSize = thisCollection.buildTextPropList(paraFlags, rawContents, pos);
-            pos += plSize;
-
-            // Save this properties set
-            paragraphStyles.add(thisCollection);
-
-            // Handle extra 1 paragraph styles at the end
-            if(pos < rawContents.length && textHandled == size) {
-                prsize++;
-            }
-
-        }
-        if (rawContents.length > 0 && textHandled != (size+1)){
-            logger.log(POILogger.WARN, "Problem reading paragraph style runs: textHandled = " + textHandled + ", text.size+1 = " + (size+1));
-        }
-
-        // Now do the character stylings
-        textHandled = 0;
-        int chsize = size;
-        while(pos < rawContents.length && textHandled < chsize) {
-            // First up, fetch the number of characters this applies to
-            int textLen = LittleEndian.getInt(rawContents,pos);
-            textLen = checkTextLength(textLen, textHandled, size);
-            textHandled += textLen;
-            pos += 4;
-
-            // Grab the 4 byte value that tells us what properties follow
-            int charFlags = LittleEndian.getInt(rawContents,pos);
-            pos += 4;
-
-            // Now make sense of those properties
-            // (Assuming we actually have some)
-            TextPropCollection thisCollection = new TextPropCollection(textLen, TextPropType.character);
-            int chSize = thisCollection.buildTextPropList(charFlags, rawContents, pos);
-            pos += chSize;
-
-            // Save this properties set
-            charStyles.add(thisCollection);
-
-            // Handle extra 1 char styles at the end
-            if(pos < rawContents.length && textHandled == size) {
-                chsize++;
-            }
-        }
-        if (rawContents.length > 0 && textHandled != (size+1)){
-            logger.log(POILogger.WARN, "Problem reading character style runs: textHandled = " + textHandled + ", text.size+1 = " + (size+1));
-        }
-
-        // Handle anything left over
-        if(pos < rawContents.length) {
-            reserved = new byte[rawContents.length-pos];
-            System.arraycopy(rawContents,pos,reserved,0,reserved.length);
-        }
-
-        initialised = true;
-    }
-    
-    private int checkTextLength(int readLength, int handledSoFar, int overallSize) {
-        if (readLength + handledSoFar > overallSize + 1) {
-            logger.log(POILogger.WARN, "Style length of " + readLength + " at " + handledSoFar + 
-                    " larger than stated size of " + overallSize + ", truncating");
-            return overallSize + 1 - handledSoFar;
-        }
-        return readLength;
-    }
-
-
-    /**
-     * Updates the cache of the raw contents. Serialised the styles out.
-     */
-    private void updateRawContents() throws IOException {
-        if (initialised) {
-            // Only update the style bytes, if the styles have been potentially
-            // changed
-
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    
-            // First up, we need to serialise the paragraph properties
-            for(TextPropCollection tpc : paragraphStyles) {
-                tpc.writeOut(baos);
-            }
-    
-            // Now, we do the character ones
-            for(TextPropCollection tpc : charStyles) {
-                tpc.writeOut(baos);
-            }
-    
-            rawContents = baos.toByteArray();
-        }
-        
-        // Now ensure that the header size is correct
-        int newSize = rawContents.length + reserved.length;
-        LittleEndian.putInt(_header,4,newSize);
-    }
-
-    /**
-     * Clear styles, so new collections can be added
-     */
-    public void clearStyles() {
-        paragraphStyles.clear();
-        charStyles.clear();
-        reserved = new byte[0];
-        initialised = true;
-    }
-    
-    /**
-     * Create a new Paragraph TextPropCollection, and add it to the list
-     * @param charactersCovered The number of characters this TextPropCollection will cover
-     * @return the new TextPropCollection, which will then be in the list
-     */
-    public TextPropCollection addParagraphTextPropCollection(int charactersCovered) {
-        TextPropCollection tpc = new TextPropCollection(charactersCovered, TextPropType.paragraph);
-        paragraphStyles.add(tpc);
-        return tpc;
-    }
-    /**
-     * Create a new Character TextPropCollection, and add it to the list
-     * @param charactersCovered The number of characters this TextPropCollection will cover
-     * @return the new TextPropCollection, which will then be in the list
-     */
-    public TextPropCollection addCharacterTextPropCollection(int charactersCovered) {
-        TextPropCollection tpc = new TextPropCollection(charactersCovered, TextPropType.character);
-        charStyles.add(tpc);
-        return tpc;
-    }
-
-    /* ************************************************************************ */
-
-
-    /**
-     * Dump the record content into <code>StringBuffer</code>
-     *
-     * @return the string representation of the record data
-     */
-    public String toString(){
-        StringBuffer out = new StringBuffer();
-
-        out.append("StyleTextPropAtom:\n");
-        if (!initialised) {
-            out.append("Uninitialised, dumping Raw Style Data\n");
-        } else {
-
-            out.append("Paragraph properties\n");
-            for(TextPropCollection pr : getParagraphStyles()) {
-                out.append(pr);
-            }
-
-            out.append("Character properties\n");
-            for(TextPropCollection pr : getCharacterStyles()) {
-                out.append(pr);
-            }
-            
-            out.append("Reserved bytes\n");
-            out.append( HexDump.dump(reserved, 0, 0) );
-        }
-
-        out.append("  original byte stream \n");
-        
-        byte buf[] = new byte[rawContents.length+reserved.length];
-        System.arraycopy(rawContents, 0, buf, 0, rawContents.length);
-        System.arraycopy(reserved, 0, buf, rawContents.length, reserved.length);
-        out.append( HexDump.dump(buf, 0, 0) );
-
-        return out.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java
deleted file mode 100644
index 43a5abf..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * A TextBytesAtom (type 4008). Holds text in ascii form (unknown
- *  code page, for now assumed to be the default of
- *  org.apache.poi.util.StringUtil, which is the Excel default).
- * The trailing return character is always stripped from this
- *
- * @author Nick Burch
- */
-
-public final class TextBytesAtom extends RecordAtom
-{
-	private byte[] _header;
-	private static long _type = RecordTypes.TextBytesAtom.typeID;
-
-	/** The bytes that make up the text */
-	private byte[] _text;
-
-	/** Grabs the text. Uses the default codepage */
-	public String getText() {
-		return StringUtil.getFromCompressedUnicode(_text,0,_text.length);
-	}
-
-	/** Updates the text in the Atom. Must be 8 bit ascii */
-	public void setText(byte[] b) {
-		// Set the text
-		_text = b.clone();
-
-		// Update the size (header bytes 5-8)
-		LittleEndian.putInt(_header,4,_text.length);
-	}
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the TextBytes Atom
-	 */
-	protected TextBytesAtom(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 8) { len = 8; }
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the text
-		_text = new byte[len-8];
-		System.arraycopy(source,start+8,_text,0,len-8);
-	}
-
-	/**
-	 * Create an empty TextBytes Atom
-	 */
-	public TextBytesAtom() {
-		_header = new byte[8];
-		LittleEndian.putUShort(_header, 0, 0);
-		LittleEndian.putUShort(_header, 2, (int)_type);
-		LittleEndian.putInt(_header, 4, 0);
-
-		_text = new byte[]{};
-	}
-
-	/**
-	 * We are of type 4008
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header - size or type unchanged
-		out.write(_header);
-
-		// Write out our text
-		out.write(_text);
-	}
-
-	/**
-	 * dump debug info; use getText() to return a string
-	 * representation of the atom
-	 */
-	public String toString() {
-        StringBuffer out = new StringBuffer();
-        out.append( "TextBytesAtom:\n");
-		out.append( HexDump.dump(_text, 0, 0) );
-		return out.toString();
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java
deleted file mode 100644
index 3449250..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * A TextCharsAtom (type 4000). Holds text in byte swapped unicode form.
- * The trailing return character is always stripped from this
- *
- * @author Nick Burch
- */
-
-public final class TextCharsAtom extends RecordAtom
-{
-	private byte[] _header;
-	private static long _type = RecordTypes.TextCharsAtom.typeID;
-
-	/** The bytes that make up the text */
-	private byte[] _text;
-
-	/** Grabs the text. */
-	public String getText() {
-		return StringUtil.getFromUnicodeLE(_text);
-	}
-
-	/** Updates the text in the Atom. */
-	public void setText(String text) {
-		// Convert to little endian unicode
-		_text = new byte[text.length()*2];
-		StringUtil.putUnicodeLE(text,_text,0);
-
-		// Update the size (header bytes 5-8)
-		LittleEndian.putInt(_header,4,_text.length);
-	}
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the TextChars Atom
-	 */
-	protected TextCharsAtom(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 8) { len = 8; }
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the text
-		_text = new byte[len-8];
-		System.arraycopy(source,start+8,_text,0,len-8);
-	}
-	/**
-	 * Create an empty TextCharsAtom
-	 */
-	public TextCharsAtom() {
-		// 0 length header
-		_header = new byte[] {  0, 0, 0xA0-256, 0x0f, 0, 0, 0, 0 };
-		// Empty text
-		_text = new byte[0];
-	}
-
-	/**
-	 * We are of type 4000
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header - size or type unchanged
-		out.write(_header);
-
-		// Write out our text
-		out.write(_text);
-	}
-
-	/**
-	 * dump debug info; use getText() to return a string
-	 * representation of the atom
-	 */
-	public String toString() {
-        StringBuffer out = new StringBuffer();
-        out.append( "TextCharsAtom:\n");
-		out.append( HexDump.dump(_text, 0, 0) );
-		return out.toString();
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
deleted file mode 100644
index 3fab236..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * A TextHeaderAtom  (type 3999). Holds information on what kind of
- *  text is contained in the TextBytesAtom / TextCharsAtom that follows
- *  straight after
- *
- * @author Nick Burch
- */
-
-public final class TextHeaderAtom extends RecordAtom implements ParentAwareRecord
-{
-	private byte[] _header;
-	private static long _type = RecordTypes.TextHeaderAtom.typeID;
-	private RecordContainer parentRecord;
-
-	public static final int TITLE_TYPE = 0;
-	public static final int BODY_TYPE = 1;
-	public static final int NOTES_TYPE = 2;
-	public static final int OTHER_TYPE = 4;
-	public static final int CENTRE_BODY_TYPE = 5;
-	public static final int CENTER_TITLE_TYPE = 6;
-	public static final int HALF_BODY_TYPE = 7;
-	public static final int QUARTER_BODY_TYPE = 8;
-
-	/** The kind of text it is */
-	private int textType;
-	/** position in the owning SlideListWithText */
-	private int index = -1;
-
-	public int getTextType() { return textType; }
-	public void setTextType(int type) { textType = type; }
-	
-    /**
-     * @return  0-based index of the text run in the SLWT container
-     */
-	public int getIndex() { return index; }
-
-    /**
-     *  @param index 0-based index of the text run in the SLWT container
-     */
-	public void setIndex(int index) { this.index = index; }
-
-	public RecordContainer getParentRecord() { return parentRecord; }
-	public void setParentRecord(RecordContainer record) { this.parentRecord = record; }
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the TextHeader Atom
-	 */
-	protected TextHeaderAtom(byte[] source, int start, int len) {
-		// Sanity Checking - we're always 12 bytes long
-		if(len < 12) {
-			len = 12;
-			if(source.length - start < 12) {
-				throw new RuntimeException("Not enough data to form a TextHeaderAtom (always 12 bytes long) - found " + (source.length - start));
-			}
-		}
-
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,start,_header,0,8);
-
-		// Grab the type
-		textType = LittleEndian.getInt(source,start+8);
-	}
-
-	/**
-	 * Create a new TextHeader Atom, for an unknown type of text
-	 */
-	public TextHeaderAtom() {
-		_header = new byte[8];
-		LittleEndian.putUShort(_header, 0, 0);
-		LittleEndian.putUShort(_header, 2, (int)_type);
-		LittleEndian.putInt(_header, 4, 4);
-
-		textType = OTHER_TYPE;
-	}
-
-	/**
-	 * We are of type 3999
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header - size or type unchanged
-		out.write(_header);
-
-		// Write out our type
-		writeLittleEndian(textType,out);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
deleted file mode 100644
index 9b40a98..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-/**
- * Ruler of a text as it differs from the style's ruler settings.
- */
-public final class TextRulerAtom extends RecordAtom {
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    //ruler internals
-    private int defaultTabSize;
-    private int numLevels;
-    private int[] tabStops;
-    private int[] bulletOffsets = new int[5];
-    private int[] textOffsets = new int[5];
-
-    /**
-     * Constructs a new empty ruler atom.
-     */
-    public TextRulerAtom() {
-        _header = new byte[8];
-        _data = new byte[0];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-
-    /**
-     * Constructs the ruler atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected TextRulerAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-        try {
-            read();
-        } catch (Exception e){
-            logger.log(POILogger.ERROR, "Failed to parse TextRulerAtom: " + e.getMessage());
-        }
-    }
-
-    /**
-     * Gets the record type.
-     *
-     * @return the record type.
-     */
-    public long getRecordType() {
-        return RecordTypes.TextRulerAtom.typeID;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk.
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-
-    /**
-     * Read the record bytes and initialize the internal variables
-     */
-    private void read(){
-        int pos = 0;
-        short mask = LittleEndian.getShort(_data);  pos += 4;
-        short val;
-        int[] bits = {1, 0, 2, 3, 8, 4, 9, 5, 10, 6, 11, 7, 12};
-        for (int i = 0; i < bits.length; i++) {
-            if((mask & 1 << bits[i]) != 0){
-                switch (bits[i]){
-                    case 0:
-                        //defaultTabSize
-                        defaultTabSize = LittleEndian.getShort(_data, pos); pos += 2;
-                        break;
-                    case 1:
-                        //numLevels
-                        numLevels = LittleEndian.getShort(_data, pos); pos += 2;
-                        break;
-                    case 2:
-                        //tabStops
-                        val = LittleEndian.getShort(_data, pos); pos += 2;
-                        tabStops = new int[val*2];
-                        for (int j = 0; j < tabStops.length; j++) {
-                            tabStops[j] = LittleEndian.getUShort(_data, pos); pos += 2;
-                        }
-                        break;
-                    case 3:
-                    case 4:
-                    case 5:
-                    case 6:
-                    case 7:
-                        //bullet.offset
-                        val = LittleEndian.getShort(_data, pos); pos += 2;
-                        bulletOffsets[bits[i]-3] = val;
-                        break;
-                    case 8:
-                    case 9:
-                    case 10:
-                    case 11:
-                    case 12:
-                        //text.offset
-                        val = LittleEndian.getShort(_data, pos); pos += 2;
-                        textOffsets[bits[i]-8] = val;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Default distance between tab stops, in master coordinates (576 dpi).
-     */
-    public int getDefaultTabSize(){
-        return defaultTabSize;
-    }
-
-    /**
-     * Number of indent levels (maximum 5).
-     */
-    public int getNumberOfLevels(){
-        return numLevels;
-    }
-
-    /**
-     * Default distance between tab stops, in master coordinates (576 dpi).
-     */
-    public int[] getTabStops(){
-        return tabStops;
-    }
-
-    /**
-     * Paragraph's distance from shape's left margin, in master coordinates (576 dpi).
-     */
-    public int[] getTextOffsets(){
-        return textOffsets;
-    }
-
-    /**
-     * First line of paragraph's distance from shape's left margin, in master coordinates (576 dpi).
-     */
-    public int[] getBulletOffsets(){
-        return bulletOffsets;
-    }
-
-    public static TextRulerAtom getParagraphInstance(){
-        byte[] data = new byte[] {
-            0x00, 0x00, (byte)0xA6, 0x0F, 0x0A, 0x00, 0x00, 0x00,
-            0x10, 0x03, 0x00, 0x00, (byte)0xF9, 0x00, 0x41, 0x01, 0x41, 0x01
-        };
-        TextRulerAtom ruler = new TextRulerAtom(data, 0, data.length);
-        return ruler;
-    }
-
-    public void setParagraphIndent(short tetxOffset, short bulletOffset){
-        LittleEndian.putShort(_data, 4, tetxOffset);
-        LittleEndian.putShort(_data, 6, bulletOffset);
-        LittleEndian.putShort(_data, 8, bulletOffset);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
deleted file mode 100644
index df0b323..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-
-/**
- * The special info runs contained in this text.
- * Special info runs consist of character properties which don?t follow styles.
- *
- * @author Yegor Kozlov
- */
-public final class TextSpecInfoAtom extends RecordAtom {
-    private static final long _type = RecordTypes.TextSpecInfoAtom.typeID;
-    
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs an empty atom, with a default run of size 1 
-     */
-    public TextSpecInfoAtom() {
-        _header = new byte[8];
-        LittleEndian.putUInt(_header, 4, _type);
-        reset(1);
-    }
-    
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    public TextSpecInfoAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-    }
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return _type; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-
-    /**
-     * Update the text length
-     *
-     * @param size the text length
-     */
-    public void setTextSize(int size){
-        LittleEndian.putInt(_data, 0, size);
-    }
-
-    /**
-     * Reset the content to one info run with the default values
-     * @param size  the site of parent text
-     */
-    public void reset(int size){
-        TextSpecInfoRun sir = new TextSpecInfoRun(size);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        try {
-            sir.writeOut(bos);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        _data = bos.toByteArray();
-
-        // Update the size (header bytes 5-8)
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-
-    /**
-     * Adapts the size by enlarging the last {@link TextSpecInfoRun}
-     * or chopping the runs to the given length
-     *
-     * @param size
-     */
-    public void setParentSize(int size) {
-        assert(size > 0);
-        int covered = 0;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        TextSpecInfoRun runs[] = getTextSpecInfoRuns();
-        assert(runs.length > 0);
-        for (int i=0; i<runs.length && covered < size; i++) {
-            TextSpecInfoRun run = runs[i];
-            if (covered + run.getLength() > size || i == runs.length-1) {
-                run.setLength(size-covered);
-            }
-            covered += run.getLength();
-            try {
-                run.writeOut(bos);
-            } catch (IOException e) {
-                throw new HSLFException(e);
-            }
-        }
-        _data = bos.toByteArray();
-
-        // Update the size (header bytes 5-8)
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-    
-    /**
-     * Get the number of characters covered by this records
-     *
-     * @return the number of characters covered by this records
-     */
-    public int getCharactersCovered(){
-        int covered = 0;
-        for (TextSpecInfoRun r : getTextSpecInfoRuns()) covered += r.length;
-        return covered;
-    }
-
-    public TextSpecInfoRun[] getTextSpecInfoRuns(){
-        LittleEndianByteArrayInputStream bis = new LittleEndianByteArrayInputStream(_data);
-        List<TextSpecInfoRun> lst = new ArrayList<TextSpecInfoRun>();
-        while (bis.available() > 0) {
-            lst.add(new TextSpecInfoRun(bis));
-        }
-        return lst.toArray(new TextSpecInfoRun[lst.size()]);
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
deleted file mode 100644
index 7b4150a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.*;
-
-public class TextSpecInfoRun {
-    /**
-     * A enum that specifies the spelling status of a run of text.
-     */
-    public enum SpellInfoEnum {
-        /** the text is spelled incorrectly. */
-        error(new BitField(1)),
-        /** the text needs rechecking. */
-        clean(new BitField(2)),
-        /** the text has a grammar error. */
-        grammar(new BitField(4)),
-        /** the text is spelled correct */
-        correct(new BitField(0));
-        
-        final BitField bitField;
-        
-        SpellInfoEnum(BitField bitField) {
-            this.bitField = bitField;
-        }
-    }
-    
-    /** A bit that specifies whether the spellInfo field exists. */
-    private static final BitField spellFld    = new BitField(0X00000001);
-    /** A bit that specifies whether the lid field exists. */
-    private static final BitField langFld     = new BitField(0X00000002);
-    /** A bit that specifies whether the altLid field exists. */
-    private static final BitField altLangFld  = new BitField(0X00000004);
-    // unused1, unused2 - Undefined and MUST be ignored.
-    /** A bit that specifies whether the pp10runid, reserved3, and grammarError fields exist. */
-    private static final BitField pp10extFld  = new BitField(0X00000020);
-    /** A bit that specifies whether the bidi field exists. */
-    private static final BitField bidiFld     = new BitField(0X00000040);
-    // unused3 - Undefined and MUST be ignored.
-    // reserved1 - MUST be zero and MUST be ignored.
-    /** A bit that specifies whether the smartTags field exists. */
-    private static final BitField smartTagFld = new BitField(0X00000200);
-    // reserved2 - MUST be zero and MUST be ignored. 
-
-    /**
-     * An optional unsigned integer that specifies an identifier for a character
-     * run that contains StyleTextProp11 data. It MUST exist if and only if pp10ext is TRUE.
-     **/
-    private static final BitField pp10runidFld = new BitField(0X0000000F);
-    // reserved3 - An optional unsigned integer that MUST be zero, and MUST be ignored. It
-    // MUST exist if and only if fPp10ext is TRUE.
-    /**
-     * An optional bit that specifies a grammar error. It MUST exist if and
-     * only if fPp10ext is TRUE.
-     **/
-    private static final BitField grammarErrorFld = new BitField(0X80000000);
-    
-    //Length of special info run.
-    protected int length;
-
-    //Special info mask of this run;
-    protected int mask;
-
-    // info fields as indicated by the mask.
-    // -1 means the bit is not set
-
-    /**
-     * An optional SpellingFlags structure that specifies the spelling status of this
-     * text. It MUST exist if and only if spell is TRUE.
-     * The spellInfo.grammar sub-field MUST be zero.
-     * <br>
-     * error (1 bit): A bit that specifies whether the text is spelled incorrectly.<br>
-     * clean (1 bit): A bit that specifies whether the text needs rechecking.<br>
-     * grammar (1 bit): A bit that specifies whether the text has a grammar error.<br>
-     * reserved (13 bits): MUST be zero and MUST be ignored.
-     */
-    protected short spellInfo = -1;
-    
-    /**
-     * An optional TxLCID that specifies the language identifier of this text.
-     * It MUST exist if and only if lang is TRUE.
-     * <br>
-     * 0x0000 = No language.<br>
-     * 0x0013 = Any Dutch language is preferred over non-Dutch languages when proofing the text.<br>
-     * 0x0400 = No proofing is performed on the text.<br>
-     * &gt; 0x0400 = A valid LCID as specified by [MS-LCID].
-     */
-    protected short langId = -1;
-    
-    /**
-     * An optional TxLCID that specifies the alternate language identifier of this text.
-     * It MUST exist if and only if altLang is TRUE.
-     */
-    protected short altLangId = -1;
-    
-    /**
-     * An optional signed integer that specifies whether the text contains bidirectional
-     * characters. It MUST exist if and only if fBidi is TRUE.
-     * 0x0000 = Contains no bidirectional characters,
-     * 0x0001 = Contains bidirectional characters.
-     */
-    protected short bidi = -1;
-    
-    protected int pp10extMask = -1;
-    protected byte[] smartTagsBytes = null;
-
-    /**
-     * Inits a TextSpecInfoRun with default values
-     *
-     * @param len the length of the one and only run
-     */
-    public TextSpecInfoRun(int len) {
-        setLength(len);
-        setLangId((short)0);
-    }
-    
-    public TextSpecInfoRun(LittleEndianByteArrayInputStream source) {
-        length = source.readInt();
-        mask = source.readInt();
-        if (spellFld.isSet(mask)) {
-            spellInfo = source.readShort();
-        }
-        if (langFld.isSet(mask)) {
-            langId = source.readShort();
-        }
-        if (altLangFld.isSet(mask)) {
-            altLangId = source.readShort();
-        }
-        if (bidiFld.isSet(mask)) {
-            bidi = source.readShort();
-        }
-        if (pp10extFld.isSet(mask)) {
-            pp10extMask = source.readInt();
-        }
-        if (smartTagFld.isSet(mask)) {
-            // An unsigned integer specifies the count of items in rgSmartTagIndex.
-            int count = source.readInt();
-            smartTagsBytes = new byte[4+count*4];
-            LittleEndian.putInt(smartTagsBytes, 0, count);
-            // An array of SmartTagIndex that specifies the indices.
-            // The count of items in the array is specified by count.
-            source.readFully(smartTagsBytes, 4, count*4);
-        }
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        final byte buf[] = new byte[4];
-        LittleEndian.putInt(buf, 0, length);
-        out.write(buf);
-        LittleEndian.putInt(buf, 0, mask);
-        out.write(buf);
-        Object flds[] = {
-            spellFld, spellInfo, "spell info",
-            langFld, langId, "lang id",
-            altLangFld, altLangId, "alt lang id",
-            bidiFld, bidi, "bidi",
-            pp10extFld, pp10extMask, "pp10 extension field",
-            smartTagFld, smartTagsBytes, "smart tags"
-        };
-        
-        for (int i=0; i<flds.length; i+=3) {
-            BitField fld = (BitField)flds[i+0];
-            Object valO = flds[i+1];
-            if (!fld.isSet(mask)) continue;
-            boolean valid;
-            if (valO instanceof byte[]) {
-                byte bufB[] = (byte[])valO;
-                valid = bufB.length > 0;
-                out.write(bufB);
-            } else if (valO instanceof Integer) {
-                int valI = ((Integer)valO);
-                valid = (valI != -1);
-                LittleEndian.putInt(buf, 0, valI);
-                out.write(buf);
-            } else if (valO instanceof Short) {
-                short valS = ((Short)valO);
-                valid = (valS != -1);
-                LittleEndian.putShort(buf, 0, valS);
-                out.write(buf, 0, 2);
-            } else {
-                valid = false;
-            }
-            if (!valid) {
-                throw new IOException(flds[i+2]+" is activated, but its value is invalid");
-            }
-        }
-    }        
-    
-    /**
-     * @return Spelling status of this text. null if not defined.
-     */
-    public SpellInfoEnum getSpellInfo(){
-        if (spellInfo == -1) return null;
-        for (SpellInfoEnum si : new SpellInfoEnum[]{SpellInfoEnum.clean,SpellInfoEnum.error,SpellInfoEnum.grammar}) {
-            if (si.bitField.isSet(spellInfo)) return si;
-        }
-        return SpellInfoEnum.correct;
-    }
-
-    /**
-     * @param spellInfo Spelling status of this text. null if not defined.
-     */
-    public void setSpellInfo(SpellInfoEnum spellInfo) {
-        this.spellInfo = (spellInfo == null)
-            ? -1
-            : (short)spellInfo.bitField.set(0);
-        mask = spellFld.setBoolean(mask, spellInfo != null);
-    }
-    
-    /**
-     * Windows LANGID for this text.
-     *
-     * @return Windows LANGID for this text, -1 if it's not set
-     */
-    public short getLangId(){
-        return langId;
-    }
-
-    /**
-     * @param langId Windows LANGID for this text, -1 to unset
-     */
-    public void setLangId(short langId) {
-        this.langId = langId;
-        mask = langFld.setBoolean(mask, langId != -1);
-    }
-    
-    /**
-     * Alternate Windows LANGID of this text;
-     * must be a valid non-East Asian LANGID if the text has an East Asian language,
-     * otherwise may be an East Asian LANGID or language neutral (zero).
-     *
-     * @return  Alternate Windows LANGID of this text, -1 if it's not set
-     */
-    public short getAltLangId(){
-        return altLangId;
-    }
-
-    public void setAltLangId(short altLangId) {
-        this.altLangId = altLangId;
-        mask = altLangFld.setBoolean(mask, altLangId != -1);
-    }
-
-    /**
-     * @return Length of special info run.
-     */
-    public int getLength() {
-        return length;
-    }
-
-    /**
-     * @param length Length of special info run.
-     */
-    public void setLength(int length) {
-        this.length = length;
-    }
-
-    /**
-     * @return the bidirectional characters flag. false = not bidi, true = is bidi, null = not set
-     */
-    public Boolean getBidi() {
-        return (bidi == -1 ? null : bidi != 0);
-    }
-
-    /**
-     * @param bidi the bidirectional characters flag. false = not bidi, true = is bidi, null = not set
-     */
-    public void setBidi(Boolean bidi) {
-        this.bidi = (bidi == null) ? -1 : (short)(bidi ? 1 : 0);
-        mask = bidiFld.setBoolean(mask, bidi != null);
-    }
-
-    /**
-     * @return the unparsed smart tags
-     */
-    public byte[] getSmartTagsBytes() {
-        return smartTagsBytes;
-    }
-
-    /**
-     * @param smartTagsBytes the unparsed smart tags, null to unset
-     */
-    public void setSmartTagsBytes(byte[] smartTagsBytes) {
-        this.smartTagsBytes = (smartTagsBytes == null) ? null : smartTagsBytes.clone();
-        mask = smartTagFld.setBoolean(mask, smartTagsBytes != null);
-    }
-    
-    /**
-     * @return an identifier for a character run that contains StyleTextProp11 data.
-     */
-    public int getPP10RunId() {
-        return (pp10extMask == -1 || !pp10extFld.isSet(mask)) ? -1 : pp10runidFld.getValue(pp10extMask);
-        
-    }
-    
-    /**
-     * @param pp10RunId an identifier for a character run that contains StyleTextProp11 data, -1 to unset
-     */
-    public void setPP10RunId(int pp10RunId) {
-        if (pp10RunId == -1) {
-            pp10extMask = (getGrammarError() == null) ? -1 : pp10runidFld.clear(pp10extMask);
-        } else {
-            pp10extMask = pp10runidFld.setValue(pp10extMask, pp10RunId);
-        }
-        // if both parameters are invalid, remove the extension mask
-        mask = pp10extFld.setBoolean(mask, pp10extMask != -1);
-    }
-    
-    public Boolean getGrammarError() {
-        return (pp10extMask == -1 || !pp10extFld.isSet(mask)) ? null : grammarErrorFld.isSet(pp10extMask);
-    }
-    
-    public void getGrammarError(Boolean grammarError) {
-        if (grammarError == null) {
-            pp10extMask = (getPP10RunId() == -1) ? -1 : grammarErrorFld.clear(pp10extMask);
-        } else {
-            pp10extMask = grammarErrorFld.set(pp10extMask);
-        }
-        // if both parameters are invalid, remove the extension mask
-        mask = pp10extFld.setBoolean(mask, pp10extMask != -1);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
deleted file mode 100644
index eb9dd8e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * Tne atom that holds starting and ending character positions of a hyperlink
- *
- * @author Yegor Kozlov
- */
-public final class TxInteractiveInfoAtom extends RecordAtom {
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private byte[] _data;
-
-    /**
-     * Constructs a brand new link related atom record.
-     */
-    public TxInteractiveInfoAtom() {
-        _header = new byte[8];
-        _data = new byte[8];
-
-        LittleEndian.putShort(_header, 2, (short)getRecordType());
-        LittleEndian.putInt(_header, 4, _data.length);
-    }
-
-    /**
-     * Constructs the link related atom record from its
-     *  source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    protected TxInteractiveInfoAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,len-8);
-
-    }
-
-    /**
-     * Gets the beginning character position
-     *
-     * @return the beginning character position
-     */
-    public int getStartIndex() {
-        return LittleEndian.getInt(_data, 0);
-    }
-
-    /**
-     * Sets the beginning character position
-     * @param idx the beginning character position
-     */
-    public void setStartIndex(int idx) {
-        LittleEndian.putInt(_data, 0, idx);
-    }
-
-    /**
-     * Gets the ending character position
-     *
-     * @return the ending character position
-     */
-    public int getEndIndex() {
-        return LittleEndian.getInt(_data, 4);
-    }
-
-    /**
-     * Sets the ending character position
-     *
-     * @param idx the ending character position
-     */
-    public void setEndIndex(int idx) {
-        LittleEndian.putInt(_data, 4, idx);
-    }
-
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return RecordTypes.TxInteractiveInfoAtom.typeID; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        out.write(_data);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
deleted file mode 100644
index b4b8e80..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * TxMasterStyleAtom atom (4003).
- * <p>
- * Stores default character and paragraph styles.
- * The atom instance value is the text type and is encoded like the txstyle field in
- * TextHeaderAtom. The text styles are located in the MainMaster container,
- * except for the "other" style, which is in the Document.Environment container.
- * </p>
- * <p>
- *  This atom can store up to 5 pairs of paragraph+character styles,
- *  each pair describes an indent level. The first pair describes
- *  first-level paragraph with no indentation.
- * </p>
- *
- *  @author Yegor Kozlov
- */
-public final class TxMasterStyleAtom extends RecordAtom {
-    private static final POILogger LOG = POILogFactory.getLogger(TxMasterStyleAtom.class);
-    
-    /**
-     * Maximum number of indentation levels allowed in PowerPoint documents
-     */
-    public static final int MAX_INDENT = 5;
-
-    private byte[] _header;
-    private static long _type = 4003;
-    private byte[] _data;
-
-    private List<TextPropCollection> paragraphStyles;
-    private List<TextPropCollection> charStyles;
-
-    protected TxMasterStyleAtom(byte[] source, int start, int len) {
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        _data = new byte[len-8];
-        System.arraycopy(source,start+8,_data,0,_data.length);
-
-        //read available styles
-        try {
-            init();
-        } catch (Exception e){
-            LOG.log(POILogger.WARN, "Exception when reading available styles", e);
-        }
-    }
-
-    /**
-     * We are of type 4003
-     *
-     * @return type of this record
-     * @see RecordTypes#TxMasterStyleAtom
-     */
-    public long getRecordType() {
-        return _type;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     *  to disk
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        // Write out the (new) header
-        out.write(_header);
-
-        // Write out the record data
-        out.write(_data);
-
-    }
-
-    /**
-     * Returns array of character styles defined in this record.
-     *
-     * @return character styles defined in this record
-     */
-    public List<TextPropCollection> getCharacterStyles(){
-        return charStyles;
-    }
-
-    /**
-     * Returns array of paragraph styles defined in this record.
-     *
-     * @return paragraph styles defined in this record
-     */
-    public List<TextPropCollection> getParagraphStyles(){
-        return paragraphStyles;
-    }
-
-    /**
-     * Return type of the text.
-     * Must be a constant defined in <code>TextHeaderAtom</code>
-     *
-     * @return type of the text
-     * @see TextHeaderAtom
-     */
-    public int getTextType(){
-        //The atom instance value is the text type
-        return LittleEndian.getShort(_header, 0) >> 4;
-    }
-
-    /**
-     * parse the record data and initialize styles
-     */
-    protected void init(){
-        //type of the text
-        int type = getTextType();
-
-        int head;
-        int pos = 0;
-
-        //number of indentation levels
-        short levels = LittleEndian.getShort(_data, 0);
-        pos += LittleEndian.SHORT_SIZE;
-
-        paragraphStyles = new ArrayList<TextPropCollection>(levels);
-        charStyles = new ArrayList<TextPropCollection>(levels);
-
-        for(short i = 0; i < levels; i++) {
-            TextPropCollection prprops = new TextPropCollection(0, TextPropType.paragraph);
-            if (type >= TextHeaderAtom.CENTRE_BODY_TYPE) {
-                // Fetch the 2 byte value, that is safe to ignore for some types of text
-                short indentLevel = LittleEndian.getShort(_data, pos);
-                prprops.setIndentLevel(indentLevel);
-                pos += LittleEndian.SHORT_SIZE;
-            } else {
-                prprops.setIndentLevel((short)-1);
-            }
-
-            head = LittleEndian.getInt(_data, pos);
-            pos += LittleEndian.INT_SIZE;
-            
-            pos += prprops.buildTextPropList( head, _data, pos);
-            paragraphStyles.add(prprops);
-
-            head = LittleEndian.getInt(_data, pos);
-            pos += LittleEndian.INT_SIZE;
-            TextPropCollection chprops = new TextPropCollection(0, TextPropType.character);
-            pos += chprops.buildTextPropList( head, _data, pos);
-            charStyles.add(chprops);
-        }
-    }
-
-    /**
-     * Updates the rawdata from the modified paragraph/character styles
-     * 
-     * @since POI 3.14-beta1
-     */
-    public void updateStyles() {
-        int type = getTextType();
-        
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            LittleEndianOutputStream leos = new LittleEndianOutputStream(bos);
-            int levels = paragraphStyles.size();
-            leos.writeShort(levels);
-            
-            TextPropCollection prdummy = new TextPropCollection(0, TextPropType.paragraph);
-            TextPropCollection chdummy = new TextPropCollection(0, TextPropType.character);
-            
-            for (int i=0; i<levels; i++) {
-                prdummy.copy(paragraphStyles.get(i));
-                chdummy.copy(charStyles.get(i));
-                if (type >= TextHeaderAtom.CENTRE_BODY_TYPE) {
-                    leos.writeShort(prdummy.getIndentLevel());
-                }
-                
-                // Indent level is not written for master styles
-                prdummy.setIndentLevel((short)-1);
-                prdummy.writeOut(bos, true);
-                chdummy.writeOut(bos, true);
-            }
-            
-            _data = bos.toByteArray();
-            leos.close();
-            
-            LittleEndian.putInt(_header, 4, _data.length);
-        } catch (IOException e) {
-            throw new HSLFException("error in updating master style properties", e);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
deleted file mode 100644
index 6df2aa9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * If we come across a record we don't know about, we create one of
- *  these. It allows us to keep track of what it contains, so we can
- *  write it back out to disk unchanged
- *
- * @author Nick Burch
- */
-
-public final class UnknownRecordPlaceholder extends RecordAtom
-{
-	private byte[] _contents;
-	private long _type;
-
-	/**
-	 * Create a new holder for a record we don't grok
-	 */
-	protected UnknownRecordPlaceholder(byte[] source, int start, int len) {
-		// Sanity Checking - including whole header, so treat
-		//  length as based of 0, not 8 (including header size based)
-		if(len < 0) { len = 0; }
-
-		// Treat as an atom, grab and hold everything
-		_contents = new byte[len];
-		System.arraycopy(source,start,_contents,0,len);
-		_type = LittleEndian.getUShort(_contents,2);
-	}
-
-	/**
-	 * Return the value we were given at creation
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		out.write(_contents);
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java
deleted file mode 100644
index b1bd6bb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
-
-/**
- * A UserEdit Atom (type 4085). Holds information which bits of the file
- *  were last used by powerpoint, the version of powerpoint last used etc.
- *
- * ** WARNING ** stores byte offsets from the start of the PPT stream to
- *  other records! If you change the size of any elements before one of
- *  these, you'll need to update the offsets!
- *
- * @author Nick Burch
- */
-
-public final class UserEditAtom extends PositionDependentRecordAtom
-{
-	public static final int LAST_VIEW_NONE = 0;
-	public static final int LAST_VIEW_SLIDE_VIEW = 1;
-	public static final int LAST_VIEW_OUTLINE_VIEW = 2;
-	public static final int LAST_VIEW_NOTES = 3;
-
-	private byte[] _header;
-	private static long _type = 4085l;
-	private short unused;
-
-	private int lastViewedSlideID;
-	private int pptVersion;
-	private int lastUserEditAtomOffset;
-	private int persistPointersOffset;
-	private int docPersistRef;
-	private int maxPersistWritten;
-	private short lastViewType;
-	private int encryptSessionPersistIdRef = -1;
-
-	// Somewhat user facing getters
-	public int getLastViewedSlideID() { return lastViewedSlideID; }
-	public short getLastViewType()    { return lastViewType; }
-
-	// Scary internal getters
-	public int getLastUserEditAtomOffset() { return lastUserEditAtomOffset; }
-	public int getPersistPointersOffset()  { return persistPointersOffset; }
-	public int getDocPersistRef()          { return docPersistRef; }
-	public int getMaxPersistWritten()      { return maxPersistWritten; }
-	public int getEncryptSessionPersistIdRef() { return encryptSessionPersistIdRef; }
-
-	// More scary internal setters
-	public void setLastUserEditAtomOffset(int offset) { lastUserEditAtomOffset = offset; }
-	public void setPersistPointersOffset(int offset)  { persistPointersOffset = offset; }
-	public void setLastViewType(short type)           { lastViewType=type; }
-    public void setMaxPersistWritten(int max)         { maxPersistWritten=max; }
-    public void setEncryptSessionPersistIdRef(int id) {
-        encryptSessionPersistIdRef=id;
-        LittleEndian.putInt(_header,4,(id == -1 ? 28 : 32));
-    }
-
-	/* *************** record code follows ********************** */
-
-	/**
-	 * For the UserEdit Atom
-	 */
-	protected UserEditAtom(byte[] source, int start, int len) {
-		// Sanity Checking
-		if(len < 34) { len = 34; }
-
-		int offset = start;
-		// Get the header
-		_header = new byte[8];
-		System.arraycopy(source,offset,_header,0,8);
-		offset += 8;
-
-		// Get the last viewed slide ID
-		lastViewedSlideID = LittleEndian.getInt(source,offset);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// Get the PPT version
-		pptVersion = LittleEndian.getInt(source,offset);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// Get the offset to the previous incremental save's UserEditAtom
-		// This will be the byte offset on disk where the previous one
-		//  starts, or 0 if this is the first one
-		lastUserEditAtomOffset = LittleEndian.getInt(source,offset);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// Get the offset to the persist pointers
-		// This will be the byte offset on disk where the preceding
-		//  PersistPtrFullBlock or PersistPtrIncrementalBlock starts
-		persistPointersOffset = LittleEndian.getInt(source,offset);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// Get the persist reference for the document persist object
-		// Normally seems to be 1
-		docPersistRef = LittleEndian.getInt(source,offset);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// Maximum number of persist objects written
-		maxPersistWritten = LittleEndian.getInt(source,offset);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// Last view type
-		lastViewType = LittleEndian.getShort(source,offset);
-		offset += LittleEndianConsts.SHORT_SIZE;
-		
-		// unused
-		unused = LittleEndian.getShort(source,offset);
-		offset += LittleEndianConsts.SHORT_SIZE;
-
-		// There might be a few more bytes, which are a reserved field
-		if (offset-start<len) {
-		    encryptSessionPersistIdRef = LittleEndian.getInt(source,offset);
-		    offset += LittleEndianConsts.INT_SIZE;
-		}
-		
-		assert(offset-start == len);
-	}
-
-	/**
-	 * We are of type 4085
-	 */
-	public long getRecordType() { return _type; }
-
-	/**
-	 * At write-out time, update the references to PersistPtrs and
-	 *  other UserEditAtoms to point to their new positions
-	 */
-	public void updateOtherRecordReferences(Map<Integer,Integer> oldToNewReferencesLookup) {
-		// Look up the new positions of our preceding UserEditAtomOffset
-		if(lastUserEditAtomOffset != 0) {
-			Integer newLocation = oldToNewReferencesLookup.get(Integer.valueOf(lastUserEditAtomOffset));
-			if(newLocation == null) {
-				throw new RuntimeException("Couldn't find the new location of the UserEditAtom that used to be at " + lastUserEditAtomOffset);
-			}
-			lastUserEditAtomOffset = newLocation.intValue();
-		}
-
-		// Ditto for our PersistPtr
-		Integer newLocation = oldToNewReferencesLookup.get(Integer.valueOf(persistPointersOffset));
-		if(newLocation == null) {
-			throw new RuntimeException("Couldn't find the new location of the PersistPtr that used to be at " + persistPointersOffset);
-		}
-		persistPointersOffset = newLocation.intValue();
-	}
-
-	/**
-	 * Write the contents of the record back, so it can be written
-	 *  to disk
-	 */
-	public void writeOut(OutputStream out) throws IOException {
-		// Header
-		out.write(_header);
-
-		// Write out the values
-		writeLittleEndian(lastViewedSlideID,out);
-		writeLittleEndian(pptVersion,out);
-		writeLittleEndian(lastUserEditAtomOffset,out);
-		writeLittleEndian(persistPointersOffset,out);
-		writeLittleEndian(docPersistRef,out);
-		writeLittleEndian(maxPersistWritten,out);
-		writeLittleEndian(lastViewType,out);
-		writeLittleEndian(unused,out);
-		if (encryptSessionPersistIdRef != -1) {
-		    // optional field
-		    writeLittleEndian(encryptSessionPersistIdRef,out);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoAtom.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoAtom.java
deleted file mode 100644
index d847c38..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoAtom.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * An atom record that specifies a reference to the VBA project storage.
- */
-public final class VBAInfoAtom extends RecordAtom {
-    private static final long _type = RecordTypes.VBAInfoAtom.typeID;
-    
-    /**
-     * Record header.
-     */
-    private byte[] _header;
-
-    /**
-     * Record data.
-     */
-    private long persistIdRef;
-    private boolean hasMacros;
-    private long version;
-
-    /**
-     * Constructs an empty atom - not yet supported 
-     */
-    private VBAInfoAtom() {
-        _header = new byte[8];
-        // TODO: fix me
-        LittleEndian.putUInt(_header, 0, _type);
-        persistIdRef = 0;
-        hasMacros = true;
-        version = 2;
-    }
-    
-    /**
-     * Constructs the vba atom record from its source data.
-     *
-     * @param source the source data as a byte array.
-     * @param start the start offset into the byte array.
-     * @param len the length of the slice in the byte array.
-     */
-    public VBAInfoAtom(byte[] source, int start, int len) {
-        // Get the header.
-        _header = new byte[8];
-        System.arraycopy(source,start,_header,0,8);
-
-        // Get the record data.
-        persistIdRef = LittleEndian.getUInt(source, start+8);
-        hasMacros = (LittleEndian.getUInt(source, start+12) == 1);
-        version = LittleEndian.getUInt(source, start+16);
-    }
-    /**
-     * Gets the record type.
-     * @return the record type.
-     */
-    public long getRecordType() { return _type; }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     *
-     * @param out the output stream to write to.
-     * @throws java.io.IOException if an error occurs.
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        out.write(_header);
-        LittleEndian.putUInt(persistIdRef, out);
-        LittleEndian.putUInt(hasMacros ? 1 : 0, out);
-        LittleEndian.putUInt(version, out);
-    }
-
-    public long getPersistIdRef() {
-        return persistIdRef;
-    }
-
-    public void setPersistIdRef(long persistIdRef) {
-        this.persistIdRef = persistIdRef;
-    }
-
-    public boolean isHasMacros() {
-        return hasMacros;
-    }
-
-    public void setHasMacros(boolean hasMacros) {
-        this.hasMacros = hasMacros;
-    }
-
-    public long getVersion() {
-        return version;
-    }
-
-    public void setVersion(long version) {
-        this.version = version;
-    }
-
-    
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java
deleted file mode 100644
index 0357765..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A container record that specifies VBA information for the document.
- */
-public final class VBAInfoContainer extends RecordContainer {
-    private byte[] _header;
-    private static long _type = RecordTypes.VBAInfo.typeID;
-
-    // Links to our more interesting children
-
-    /**
-     * Set things up, and find our more interesting children
-     */
-    protected VBAInfoContainer(byte[] source, int start, int len) {
-        // Grab the header
-        _header = new byte[8];
-        System.arraycopy(source, start, _header, 0, 8);
-
-        // Find our children
-        _children = Record.findChildRecords(source, start + 8, len - 8);
-
-        findInterestingChildren();
-    }
-
-    /**
-     * Go through our child records, picking out the ones that are
-     * interesting, and saving those for use by the easy helper
-     * methods.
-     */
-    private void findInterestingChildren() {
-
-    }
-
-    /**
-     * Create a new VBAInfoContainer, with blank fields - not yet supported
-     */
-    private VBAInfoContainer() {
-        _header = new byte[8];
-        _children = new Record[0];
-
-        // Setup our header block
-        _header[0] = 0x0f; // We are a container record
-        LittleEndian.putShort(_header, 2, (short) _type);
-
-        // Setup our child records
-        findInterestingChildren();
-    }
-
-    /**
-     * We are of type 0x3FF
-     */
-    public long getRecordType() {
-        return _type;
-    }
-
-    /**
-     * Write the contents of the record back, so it can be written
-     * to disk
-     */
-    public void writeOut(OutputStream out) throws IOException {
-        writeOut(_header[0], _header[1], _type, _children, out);
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
deleted file mode 100644
index 329f78f4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.sl.usermodel.*;
-import org.apache.poi.ss.usermodel.ShapeTypes;
-
-/**
- * Represents an AutoShape.
- * <p>
- * AutoShapes are drawing objects with a particular shape that may be customized through smart resizing and adjustments.
- * See {@link ShapeTypes}
- * </p>
- *
- *  @author Yegor Kozlov
- */
-public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,HSLFTextParagraph> {
-
-    protected HSLFAutoShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    public HSLFAutoShape(ShapeType type, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(null, parent);
-        _escherContainer = createSpContainer(type, parent instanceof HSLFGroupShape);
-    }
-
-    public HSLFAutoShape(ShapeType type){
-        this(type, null);
-    }
-
-    protected EscherContainerRecord createSpContainer(ShapeType shapeType, boolean isChild){
-        _escherContainer = super.createSpContainer(isChild);
-
-        setShapeType(shapeType);
-
-        //set default properties for an autoshape
-        setEscherProperty(EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, 0x40000);
-        setEscherProperty(EscherProperties.FILL__FILLCOLOR, 0x8000004);
-        setEscherProperty(EscherProperties.FILL__FILLCOLOR, 0x8000004);
-        setEscherProperty(EscherProperties.FILL__FILLBACKCOLOR, 0x8000000);
-        setEscherProperty(EscherProperties.FILL__NOFILLHITTEST, 0x100010);
-        setEscherProperty(EscherProperties.LINESTYLE__COLOR, 0x8000001);
-        setEscherProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x80008);
-        setEscherProperty(EscherProperties.SHADOWSTYLE__COLOR, 0x8000002);
-
-        return _escherContainer;
-    }
-
-    protected void setDefaultTextProperties(HSLFTextParagraph _txtrun){
-        setVerticalAlignment(VerticalAlignment.MIDDLE);
-        setHorizontalCentered(true);
-        setWordWrap(false);
-    }
-
-    /**
-     * Gets adjust value which controls smart resizing of the auto-shape.
-     *
-     * <p>
-     * The adjustment values are given in shape coordinates:
-     * the origin is at the top-left, positive-x is to the right, positive-y is down.
-     * The region from (0,0) to (S,S) maps to the geometry box of the shape (S=21600 is a constant).
-     * </p>
-     *
-     * @param idx the adjust index in the [0, 9] range
-     * @return the adjustment value
-     */
-    public int getAdjustmentValue(int idx){
-        if(idx < 0 || idx > 9) throw new IllegalArgumentException("The index of an adjustment value must be in the [0, 9] range");
-
-        return getEscherProperty((short)(EscherProperties.GEOMETRY__ADJUSTVALUE + idx));
-    }
-
-    /**
-     * Sets adjust value which controls smart resizing of the auto-shape.
-     *
-     * <p>
-     * The adjustment values are given in shape coordinates:
-     * the origin is at the top-left, positive-x is to the right, positive-y is down.
-     * The region from (0,0) to (S,S) maps to the geometry box of the shape (S=21600 is a constant).
-     * </p>
-     *
-     * @param idx the adjust index in the [0, 9] range
-     * @param val the adjustment value
-     */
-    public void setAdjustmentValue(int idx, int val){
-        if(idx < 0 || idx > 9) throw new IllegalArgumentException("The index of an adjustment value must be in the [0, 9] range");
-
-        setEscherProperty((short)(EscherProperties.GEOMETRY__ADJUSTVALUE + idx), val);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java
deleted file mode 100644
index 8f477f9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.sl.usermodel.Background;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-
-/**
- * Background shape
- *
- * @author Yegor Kozlov
- */
-public final class HSLFBackground extends HSLFShape implements Background<HSLFShape,HSLFTextParagraph> {
-
-    protected HSLFBackground(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        super(escherRecord, parent);
-    }
-
-    protected EscherContainerRecord createSpContainer(boolean isChild) {
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
deleted file mode 100644
index 3c26c5a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.sl.usermodel.ConnectorShape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.util.Beta;
-
-/**
- * Specifies a connection shape.
- * 
- * This is currently only a dummy implementation.
- */
-@Beta
-public class HSLFConnectorShape extends HSLFSimpleShape
-implements ConnectorShape<HSLFShape,HSLFTextParagraph> {
-
-    /**
-     * Create a ConnectorShape object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord       <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent    the parent of the shape
-     */
-   protected HSLFConnectorShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-
-    }
-
-    /**
-     * Create a new ConnectorShape. This constructor is used when a new shape is created.
-     *
-     * @param parent    the parent of this Shape. For example, if this text box is a cell
-     * in a table then the parent is Table.
-     */
-    public HSLFConnectorShape(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(null, parent);
-        _escherContainer = createSpContainer(parent instanceof HSLFGroupShape);
-    }
-
-    /**
-     * Create a new ConnectorShape. This constructor is used when a new shape is created.
-     *
-     */
-    public HSLFConnectorShape(){
-        this(null);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
deleted file mode 100644
index 4d68995..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Color;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherArrayProperty;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherColorRef;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.ColorStyle;
-import org.apache.poi.sl.usermodel.FillStyle;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.GradientPaint;
-import org.apache.poi.sl.usermodel.PaintStyle.GradientPaint.GradientType;
-import org.apache.poi.sl.usermodel.PaintStyle.TexturePaint;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- * Represents functionality provided by the 'Fill Effects' dialog in PowerPoint.
- */
-public final class HSLFFill {
-    // For logging
-    protected POILogger logger = POILogFactory.getLogger(this.getClass());
-
-    /**
-     *  Fill with a solid color
-     */
-    public static final int FILL_SOLID = 0;
-
-    /**
-     *  Fill with a pattern (bitmap)
-     */
-    public static final int FILL_PATTERN = 1;
-
-    /**
-     *  A texture (pattern with its own color map)
-     */
-    public static final int FILL_TEXTURE = 2;
-
-    /**
-     *  Center a picture in the shape
-     */
-    public static final int FILL_PICTURE = 3;
-
-    /**
-     *  Shade from start to end points
-     */
-    public static final int FILL_SHADE = 4;
-
-    /**
-     *  Shade from bounding rectangle to end point
-     */
-    public static final int FILL_SHADE_CENTER = 5;
-
-    /**
-     *  Shade from shape outline to end point
-     */
-    public static final int FILL_SHADE_SHAPE = 6;
-
-    /**
-     *  Similar to FILL_SHADE, but the fill angle
-     *  is additionally scaled by the aspect ratio of
-     *  the shape. If shape is square, it is the same as FILL_SHADE
-     */
-    public static final int FILL_SHADE_SCALE = 7;
-
-    /**
-     *  shade to title
-     */
-    public static final int FILL_SHADE_TITLE = 8;
-
-    /**
-     *  Use the background fill color/pattern
-     */
-    public static final int FILL_BACKGROUND = 9;
-
-
-
-    /**
-     * The shape this background applies to
-     */
-    protected HSLFShape shape;
-
-    /**
-     * Construct a <code>Fill</code> object for a shape.
-     * Fill information will be read from shape's escher properties.
-     *
-     * @param shape the shape this background applies to
-     */
-    public HSLFFill(HSLFShape shape){
-        this.shape = shape;
-    }
-
-
-    public FillStyle getFillStyle() {
-        return new FillStyle() {
-            public PaintStyle getPaint() {
-                final int fillType = getFillType();
-                // TODO: fix gradient types, this mismatches with the MS-ODRAW definition ...
-                // need to handle (not only) the type (radial,rectangular,linear),
-                // the direction, e.g. top right, and bounds (e.g. for rectangular boxes)
-                switch (fillType) {
-                    case FILL_SOLID:
-                        return DrawPaint.createSolidPaint(getForegroundColor());
-                    case FILL_SHADE_SHAPE:
-                        return getGradientPaint(GradientType.shape);
-                    case FILL_SHADE_CENTER:
-                    case FILL_SHADE_TITLE:
-                        return getGradientPaint(GradientType.circular);
-                    case FILL_SHADE:
-                    case FILL_SHADE_SCALE:
-                        return getGradientPaint(GradientType.linear);
-                    case FILL_PICTURE:
-                        return getTexturePaint();
-                    default:
-                        logger.log(POILogger.WARN, "unsuported fill type: " + fillType);
-                        return null;
-                }
-            }
-        };
-    }
-    
-    
-
-    private GradientPaint getGradientPaint(final GradientType gradientType) {
-        final AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        final EscherArrayProperty ep = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__SHADECOLORS);
-        final int colorCnt = (ep == null) ? 0 : ep.getNumberOfElementsInArray();
-
-        return new GradientPaint() {
-            public double getGradientAngle() {
-                // A value of type FixedPoint, as specified in [MS-OSHARED] section 2.2.1.6,
-                // that specifies the angle of the gradient fill. Zero degrees represents a vertical vector from
-                // bottom to top. The default value for this property is 0x00000000.
-                int rot = shape.getEscherProperty(EscherProperties.FILL__ANGLE);
-                return 90-Units.fixedPointToDouble(rot);
-            }
-            public ColorStyle[] getGradientColors() {
-                ColorStyle cs[];
-                if (colorCnt == 0) {
-                    cs = new ColorStyle[2];
-                    cs[0] = wrapColor(getBackgroundColor());
-                    cs[1] = wrapColor(getForegroundColor());
-                } else {
-                    cs = new ColorStyle[colorCnt];
-                    int idx = 0;
-                    // TODO: handle palette colors and alpha(?) value 
-                    for (byte data[] : ep) {
-                        EscherColorRef ecr = new EscherColorRef(data, 0, 4);
-                        cs[idx++] = wrapColor(shape.getColor(ecr));
-                    }
-                }
-                return cs;
-            }
-            private ColorStyle wrapColor(Color col) {
-                return (col == null) ? null : DrawPaint.createSolidPaint(col).getSolidColor();
-            }
-            public float[] getGradientFractions() {
-                float frc[];
-                if (colorCnt == 0) {
-                    frc = new float[]{0, 1};
-                } else {
-                    frc = new float[colorCnt];
-                    int idx = 0;
-                    for (byte data[] : ep) {
-                        double pos = Units.fixedPointToDouble(LittleEndian.getInt(data, 4));
-                        frc[idx++] = (float)pos;
-                    }
-                }
-                return frc;
-            }
-            public boolean isRotatedWithShape() {
-                return false;
-            }
-            public GradientType getGradientType() {
-                return gradientType;
-            }
-        };
-    }
-    
-    private TexturePaint getTexturePaint() {
-        final HSLFPictureData pd = getPictureData();
-        if (pd == null) {
-            return null;
-        }
-
-        return new TexturePaint() {
-            public InputStream getImageData() {
-                return new ByteArrayInputStream(pd.getData());
-            }
-
-            public String getContentType() {
-                return pd.getContentType();
-            }
-
-            public int getAlpha() {
-                return (int)(shape.getAlpha(EscherProperties.FILL__FILLOPACITY)*100000.0);
-            }
-        };
-    }
-
-    /**
-     * Returns fill type.
-     * Must be one of the <code>FILL_*</code> constants defined in this class.
-     *
-     * @return type of fill
-     */
-    public int getFillType(){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        EscherSimpleProperty prop = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__FILLTYPE);
-        return prop == null ? FILL_SOLID : prop.getPropertyValue();
-    }
-
-    /**
-     */
-    protected void afterInsert(HSLFSheet sh){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        EscherSimpleProperty p = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__PATTERNTEXTURE);
-        if(p != null) {
-            int idx = p.getPropertyValue();
-            EscherBSERecord bse = getEscherBSERecord(idx);
-            bse.setRef(bse.getRef() + 1);
-        }
-    }
-
-    @SuppressWarnings("resource")
-    protected EscherBSERecord getEscherBSERecord(int idx){
-        HSLFSheet sheet = shape.getSheet();
-        if(sheet == null) {
-            logger.log(POILogger.DEBUG, "Fill has not yet been assigned to a sheet");
-            return null;
-        }
-        HSLFSlideShow ppt = sheet.getSlideShow();
-        Document doc = ppt.getDocumentRecord();
-        EscherContainerRecord dggContainer = doc.getPPDrawingGroup().getDggContainer();
-        EscherContainerRecord bstore = HSLFShape.getEscherChild(dggContainer, EscherContainerRecord.BSTORE_CONTAINER);
-        if(bstore == null) {
-            logger.log(POILogger.DEBUG, "EscherContainerRecord.BSTORE_CONTAINER was not found ");
-            return null;
-        }
-        List<EscherRecord> lst = bstore.getChildRecords();
-        return (EscherBSERecord)lst.get(idx-1);
-    }
-
-    /**
-     * Sets fill type.
-     * Must be one of the <code>FILL_*</code> constants defined in this class.
-     *
-     * @param type type of the fill
-     */
-    public void setFillType(int type){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        HSLFShape.setEscherProperty(opt, EscherProperties.FILL__FILLTYPE, type);
-    }
-
-    /**
-     * Foreground color
-     */
-    public Color getForegroundColor(){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        EscherSimpleProperty p = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__NOFILLHITTEST);
-
-        if(p != null && (p.getPropertyValue() & 0x10) == 0) return null;
-
-        return shape.getColor(EscherProperties.FILL__FILLCOLOR, EscherProperties.FILL__FILLOPACITY, -1);
-
-    }
-
-    /**
-     * Foreground color
-     */
-    public void setForegroundColor(Color color){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        if (color == null) {
-            opt.removeEscherProperty(EscherProperties.FILL__FILLCOLOR);
-            HSLFShape.setEscherProperty(opt, EscherProperties.FILL__NOFILLHITTEST, 0x150000);
-        }
-        else {
-            int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 0).getRGB();
-            HSLFShape.setEscherProperty(opt, EscherProperties.FILL__FILLCOLOR, rgb);
-            int alpha = color.getAlpha();
-            if (alpha == 255) {
-                opt.removeEscherProperty(EscherProperties.FILL__FILLOPACITY);
-            } else {
-                int alphaFP = Units.doubleToFixedPoint(alpha/255d);
-                HSLFShape.setEscherProperty(opt, EscherProperties.FILL__FILLOPACITY, alphaFP);
-            }
-            HSLFShape.setEscherProperty(opt, EscherProperties.FILL__NOFILLHITTEST, 0x150011);
-        }
-    }
-
-    /**
-     * Background color
-     */
-    public Color getBackgroundColor(){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        EscherSimpleProperty p = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__NOFILLHITTEST);
-
-        if(p != null && (p.getPropertyValue() & 0x10) == 0) return null;
-
-        return shape.getColor(EscherProperties.FILL__FILLBACKCOLOR, EscherProperties.FILL__FILLOPACITY, -1);
-    }
-
-    /**
-     * Background color
-     */
-    public void setBackgroundColor(Color color){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        if (color == null) {
-            HSLFShape.setEscherProperty(opt, EscherProperties.FILL__FILLBACKCOLOR, -1);
-        }
-        else {
-            int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 0).getRGB();
-            HSLFShape.setEscherProperty(opt, EscherProperties.FILL__FILLBACKCOLOR, rgb);
-        }
-    }
-
-    /**
-     * <code>PictureData</code> object used in a texture, pattern of picture fill.
-     */
-    @SuppressWarnings("resource")
-    public HSLFPictureData getPictureData(){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        EscherSimpleProperty p = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__PATTERNTEXTURE);
-        if (p == null) return null;
-
-        HSLFSlideShow ppt = shape.getSheet().getSlideShow();
-        List<HSLFPictureData> pict = ppt.getPictureData();
-        Document doc = ppt.getDocumentRecord();
-
-        EscherContainerRecord dggContainer = doc.getPPDrawingGroup().getDggContainer();
-        EscherContainerRecord bstore = HSLFShape.getEscherChild(dggContainer, EscherContainerRecord.BSTORE_CONTAINER);
-
-        java.util.List<EscherRecord> lst = bstore.getChildRecords();
-        int idx = p.getPropertyValue();
-        if (idx == 0){
-            logger.log(POILogger.WARN, "no reference to picture data found ");
-        } else {
-            EscherBSERecord bse = (EscherBSERecord)lst.get(idx - 1);
-            for (HSLFPictureData pd : pict) {
-                if (pd.getOffset() ==  bse.getOffset()){
-                    return pd;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Assign picture used to fill the underlying shape.
-     *
-     * @param data the picture data added to this ppt by {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} method.
-     */
-    public void setPictureData(HSLFPictureData data){
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        HSLFShape.setEscherProperty(opt, (short)(EscherProperties.FILL__PATTERNTEXTURE + 0x4000), (data == null ? 0 : data.getIndex()));
-        if(data != null && shape.getSheet() != null) {
-            EscherBSERecord bse = getEscherBSERecord(data.getIndex());
-            bse.setRef(bse.getRef() + 1);
-        }
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
deleted file mode 100644
index 740d953..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Path2D;
-import java.awt.geom.PathIterator;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherArrayProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.sl.usermodel.FreeformShape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- * A "Freeform" shape.
- *
- * <p>
- * Shapes drawn with the "Freeform" tool have cubic bezier curve segments in the smooth sections
- * and straight-line segments in the straight sections. This object closely corresponds to <code>java.awt.geom.GeneralPath</code>.
- * </p>
- */
-public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformShape<HSLFShape,HSLFTextParagraph> {
-
-    public static final byte[] SEGMENTINFO_MOVETO   = new byte[]{0x00, 0x40};
-    public static final byte[] SEGMENTINFO_LINETO   = new byte[]{0x00, (byte)0xAC};
-    public static final byte[] SEGMENTINFO_ESCAPE   = new byte[]{0x01, 0x00};
-    public static final byte[] SEGMENTINFO_ESCAPE2  = new byte[]{0x01, 0x20};
-    public static final byte[] SEGMENTINFO_CUBICTO  = new byte[]{0x00, (byte)0xAD};
-    public static final byte[] SEGMENTINFO_CUBICTO2 = new byte[]{0x00, (byte)0xB3}; //OpenOffice inserts 0xB3 instead of 0xAD.
-    public static final byte[] SEGMENTINFO_CLOSE    = new byte[]{0x01, (byte)0x60};
-    public static final byte[] SEGMENTINFO_END      = new byte[]{0x00, (byte)0x80};
-
-    private static BitField PATH_INFO = BitFieldFactory.getInstance(0xE000);
-    private static BitField ESCAPE_INFO = BitFieldFactory.getInstance(0x1F00);
-
-    enum PathInfo {
-        lineTo(0),curveTo(1),moveTo(2),close(3),end(4),escape(5),clientEscape(6);
-        int flag;
-        PathInfo(int flag) {
-            this.flag = flag;
-        }
-        static PathInfo valueOf(int flag) {
-            for (PathInfo v : values()) {
-                if (v.flag == flag) {
-                    return v;
-                }
-            }
-            return null;
-        }
-    }
-
-    enum EscapeInfo {
-        EXTENSION(0x0000),
-        ANGLE_ELLIPSE_TO(0x0001),
-        ANGLE_ELLIPSE(0x0002),
-        ARC_TO(0x0003),
-        ARC(0x0004),
-        CLOCKWISE_ARC_TO(0x0005),
-        CLOCKWISE_ARC(0x0006),
-        ELLIPTICAL_QUADRANT_X(0x0007),
-        ELLIPTICAL_QUADRANT_Y(0x0008),
-        QUADRATIC_BEZIER(0x0009),
-        NO_FILL(0X000A),
-        NO_LINE(0X000B),
-        AUTO_LINE(0X000C),
-        AUTO_CURVE(0X000D),
-        CORNER_LINE(0X000E),
-        CORNER_CURVE(0X000F),
-        SMOOTH_LINE(0X0010),
-        SMOOTH_CURVE(0X0011),
-        SYMMETRIC_LINE(0X0012),
-        SYMMETRIC_CURVE(0X0013),
-        FREEFORM(0X0014),
-        FILL_COLOR(0X0015),
-        LINE_COLOR(0X0016);
-
-        int flag;
-        EscapeInfo(int flag) {
-            this.flag = flag;
-        }
-        static EscapeInfo valueOf(int flag) {
-            for (EscapeInfo v : values()) {
-                if (v.flag == flag) {
-                    return v;
-                }
-            }
-            return null;
-        }
-    }
-
-    enum ShapePath {
-        LINES(0),
-        LINES_CLOSED(1),
-        CURVES(2),
-        CURVES_CLOSED(3),
-        COMPLEX(4);
-
-        int flag;
-        ShapePath(int flag) {
-            this.flag = flag;
-        }
-        static ShapePath valueOf(int flag) {
-            for (ShapePath v : values()) {
-                if (v.flag == flag) {
-                    return v;
-                }
-            }
-            return null;
-        }
-    }
-    
-    /**
-     * Create a Freeform object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord       <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent    the parent of the shape
-     */
-   protected HSLFFreeformShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-
-    }
-
-    /**
-     * Create a new Freeform. This constructor is used when a new shape is created.
-     *
-     * @param parent    the parent of this Shape. For example, if this text box is a cell
-     * in a table then the parent is Table.
-     */
-    public HSLFFreeformShape(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super((EscherContainerRecord)null, parent);
-        _escherContainer = createSpContainer(ShapeType.NOT_PRIMITIVE, parent instanceof HSLFGroupShape);
-    }
-
-    /**
-     * Create a new Freeform. This constructor is used when a new shape is created.
-     *
-     */
-    public HSLFFreeformShape(){
-        this(null);
-    }
-
-    @Override
-    public int setPath(Path2D.Double path) {
-        Rectangle2D bounds = path.getBounds2D();
-        PathIterator it = path.getPathIterator(new AffineTransform());
-
-        List<byte[]> segInfo = new ArrayList<byte[]>();
-        List<Point2D.Double> pntInfo = new ArrayList<Point2D.Double>();
-        boolean isClosed = false;
-        int numPoints = 0;
-        while (!it.isDone()) {
-            double[] vals = new double[6];
-            int type = it.currentSegment(vals);
-            switch (type) {
-                case PathIterator.SEG_MOVETO:
-                    pntInfo.add(new Point2D.Double(vals[0], vals[1]));
-                    segInfo.add(SEGMENTINFO_MOVETO);
-                    numPoints++;
-                    break;
-                case PathIterator.SEG_LINETO:
-                    pntInfo.add(new Point2D.Double(vals[0], vals[1]));
-                    segInfo.add(SEGMENTINFO_LINETO);
-                    segInfo.add(SEGMENTINFO_ESCAPE);
-                    numPoints++;
-                    break;
-                case PathIterator.SEG_CUBICTO:
-                    pntInfo.add(new Point2D.Double(vals[0], vals[1]));
-                    pntInfo.add(new Point2D.Double(vals[2], vals[3]));
-                    pntInfo.add(new Point2D.Double(vals[4], vals[5]));
-                    segInfo.add(SEGMENTINFO_CUBICTO);
-                    segInfo.add(SEGMENTINFO_ESCAPE2);
-                    numPoints++;
-                    break;
-                case PathIterator.SEG_QUADTO:
-                    //TODO: figure out how to convert SEG_QUADTO into SEG_CUBICTO
-                    logger.log(POILogger.WARN, "SEG_QUADTO is not supported");
-                    break;
-                case PathIterator.SEG_CLOSE:
-                    pntInfo.add(pntInfo.get(0));
-                    segInfo.add(SEGMENTINFO_LINETO);
-                    segInfo.add(SEGMENTINFO_ESCAPE);
-                    segInfo.add(SEGMENTINFO_LINETO);
-                    segInfo.add(SEGMENTINFO_CLOSE);
-                    isClosed = true;
-                    numPoints++;
-                    break;
-                default:
-                    logger.log(POILogger.WARN, "Ignoring invalid segment type "+type);
-                    break;
-            }
-
-            it.next();
-        }
-        if(!isClosed) segInfo.add(SEGMENTINFO_LINETO);
-        segInfo.add(new byte[]{0x00, (byte)0x80});
-
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__SHAPEPATH, 0x4));
-
-        EscherArrayProperty verticesProp = new EscherArrayProperty((short)(EscherProperties.GEOMETRY__VERTICES + 0x4000), false, null);
-        verticesProp.setNumberOfElementsInArray(pntInfo.size());
-        verticesProp.setNumberOfElementsInMemory(pntInfo.size());
-        verticesProp.setSizeOfElements(8);
-        for (int i = 0; i < pntInfo.size(); i++) {
-            Point2D.Double pnt = pntInfo.get(i);
-            byte[] data = new byte[8];
-            LittleEndian.putInt(data, 0, Units.pointsToMaster(pnt.getX() - bounds.getX()));
-            LittleEndian.putInt(data, 4, Units.pointsToMaster(pnt.getY() - bounds.getY()));
-            verticesProp.setElement(i, data);
-        }
-        opt.addEscherProperty(verticesProp);
-
-        EscherArrayProperty segmentsProp = new EscherArrayProperty((short)(EscherProperties.GEOMETRY__SEGMENTINFO + 0x4000), false, null);
-        segmentsProp.setNumberOfElementsInArray(segInfo.size());
-        segmentsProp.setNumberOfElementsInMemory(segInfo.size());
-        segmentsProp.setSizeOfElements(0x2);
-        for (int i = 0; i < segInfo.size(); i++) {
-            byte[] seg = segInfo.get(i);
-            segmentsProp.setElement(i, seg);
-        }
-        opt.addEscherProperty(segmentsProp);
-
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__RIGHT, Units.pointsToMaster(bounds.getWidth())));
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GEOMETRY__BOTTOM, Units.pointsToMaster(bounds.getHeight())));
-
-        opt.sortProperties();
-
-        setAnchor(bounds);
-
-        return numPoints;
-    }
-
-    @Override
-    public Path2D.Double getPath(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-
-        EscherArrayProperty verticesProp = getShapeProp(opt, EscherProperties.GEOMETRY__VERTICES);
-        EscherArrayProperty segmentsProp = getShapeProp(opt, EscherProperties.GEOMETRY__SEGMENTINFO);
-
-        // return empty path if either GEOMETRY__VERTICES or GEOMETRY__SEGMENTINFO is missing, see Bugzilla 54188
-        Path2D.Double path = new Path2D.Double();
-
-        //sanity check
-        if(verticesProp == null) {
-            logger.log(POILogger.WARN, "Freeform is missing GEOMETRY__VERTICES ");
-            return path;
-        }
-        if(segmentsProp == null) {
-            logger.log(POILogger.WARN, "Freeform is missing GEOMETRY__SEGMENTINFO ");
-            return path;
-        }
-
-        Iterator<byte[]> vertIter = verticesProp.iterator();
-        Iterator<byte[]> segIter = segmentsProp.iterator();
-        double xyPoints[] = new double[2];
-        
-        while (vertIter.hasNext() && segIter.hasNext()) {
-            byte[] segElem = segIter.next();
-            PathInfo pi = getPathInfo(segElem);
-            switch (pi) {
-                case escape: {
-                    handleEscapeInfo(path, segElem, vertIter);
-                    break;
-                }
-                case moveTo: {
-                    fillPoint(vertIter.next(), xyPoints);
-                    double x = xyPoints[0];
-                    double y = xyPoints[1];
-                    path.moveTo(x,y);
-                    break;
-                }
-                case curveTo: {
-                    fillPoint(vertIter.next(), xyPoints);
-                    double x1 = xyPoints[0];
-                    double y1 = xyPoints[1];
-                    fillPoint(vertIter.next(), xyPoints);
-                    double x2 = xyPoints[0];
-                    double y2 = xyPoints[1];
-                    fillPoint(vertIter.next(), xyPoints);
-                    double x3 = xyPoints[0];
-                    double y3 = xyPoints[1];
-                    path.curveTo(x1,y1,x2,y2,x3,y3);
-                    break;
-                }
-                case lineTo:
-                    if (vertIter.hasNext()) {
-                        fillPoint(vertIter.next(), xyPoints);
-                        double x = xyPoints[0];
-                        double y = xyPoints[1];
-                        path.lineTo(x,y);
-                    }
-                    break;
-                case close:
-                    path.closePath();
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        EscherSimpleProperty shapePath = getShapeProp(opt, EscherProperties.GEOMETRY__SHAPEPATH);
-        ShapePath sp = ShapePath.valueOf(shapePath == null ? 1 : shapePath.getPropertyValue());
-        if (sp == ShapePath.LINES_CLOSED || sp == ShapePath.CURVES_CLOSED) {
-            path.closePath();
-        }
-        
-        Rectangle2D anchor = getAnchor();
-        Rectangle2D bounds = path.getBounds2D();
-        AffineTransform at = new AffineTransform();
-        at.translate(anchor.getX(), anchor.getY());
-        at.scale(
-                anchor.getWidth()/bounds.getWidth(),
-                anchor.getHeight()/bounds.getHeight()
-        );
-        return new Path2D.Double(at.createTransformedShape(path));
-    }
-    
-    private void fillPoint(byte xyMaster[], double xyPoints[]) {
-        int masterCnt = (xyMaster == null) ? 0 : xyMaster.length;
-        int pointCnt = (xyPoints == null) ? 0 : xyPoints.length;
-        if ((masterCnt != 4 && masterCnt != 8) || pointCnt != 2) {
-            logger.log(POILogger.WARN, "Invalid number of master bytes for a single point - ignore point");
-            return;
-        }
-        
-        int x, y;
-        if (xyMaster.length == 4) {
-            x = LittleEndian.getShort(xyMaster, 0);
-            y = LittleEndian.getShort(xyMaster, 2);
-        } else {
-            x = LittleEndian.getInt(xyMaster, 0);
-            y = LittleEndian.getInt(xyMaster, 4);
-        }
-        
-        xyPoints[0] = Units.masterToPoints(x);
-        xyPoints[1] = Units.masterToPoints(y);
-    }
-    
-    private static <T extends EscherProperty> T getShapeProp(AbstractEscherOptRecord opt, int propId) {
-        T prop = getEscherProperty(opt, (short)(propId + 0x4000));
-        if (prop == null) {
-            prop = getEscherProperty(opt, propId);
-        }
-        return prop;
-    }
-    
-    // FIXME: FindBugs-JDK8 identified that this method does nothing
-    private void handleEscapeInfo(Path2D path, byte segElem[], Iterator<byte[]> vertIter) {
-        EscapeInfo ei = getEscapeInfo(segElem);
-        switch (ei) {
-            case EXTENSION:
-                break;
-            case ANGLE_ELLIPSE_TO:
-                break;
-            case ANGLE_ELLIPSE:
-                break;
-            case ARC_TO:
-                break;
-            case ARC:
-                break;
-            case CLOCKWISE_ARC_TO:
-                break;
-            case CLOCKWISE_ARC:
-                break;
-            case ELLIPTICAL_QUADRANT_X:
-                break;
-            case ELLIPTICAL_QUADRANT_Y:
-                break;
-            case QUADRATIC_BEZIER:
-                break;
-            case NO_FILL:
-                break;
-            case NO_LINE:
-                break;
-            case AUTO_LINE:
-                break;
-            case AUTO_CURVE:
-                break;
-            case CORNER_LINE:
-                break;
-            case CORNER_CURVE:
-                break;
-            case SMOOTH_LINE:
-                break;
-            case SMOOTH_CURVE:
-                break;
-            case SYMMETRIC_LINE:
-                break;
-            case SYMMETRIC_CURVE:
-                break;
-            case FREEFORM:
-                break;
-            case FILL_COLOR:
-                break;
-            case LINE_COLOR:
-                break;
-            default:
-                break;
-        }
-    }
-    
-
-    private static PathInfo getPathInfo(byte elem[]) {
-        int elemUS = LittleEndian.getUShort(elem, 0);
-        int pathInfo = PATH_INFO.getValue(elemUS);
-        return PathInfo.valueOf(pathInfo);
-    }
-    
-    private static EscapeInfo getEscapeInfo(byte elem[]) {
-        int elemUS = LittleEndian.getUShort(elem, 0);
-        int escInfo = ESCAPE_INFO.getValue(elemUS);
-        return EscapeInfo.valueOf(escInfo);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
deleted file mode 100644
index bae325a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherChildAnchorRecord;
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.ddf.EscherSpgrRecord;
-import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- *  Represents a group of shapes.
- *
- * @author Yegor Kozlov
- */
-public class HSLFGroupShape extends HSLFShape
-implements HSLFShapeContainer, GroupShape<HSLFShape,HSLFTextParagraph> {
-    /**
-      * Create a new ShapeGroup. This constructor is used when a new shape is created.
-      *
-      */
-    public HSLFGroupShape(){
-        this(null, null);
-        _escherContainer = createSpContainer(false);
-    }
-
-    /**
-      * Create a new ShapeGroup. This constructor is used when a new shape is created.
-      *
-      * @param parent    the parent of the shape
-      */
-    public HSLFGroupShape(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        this(null, parent);
-        _escherContainer = createSpContainer(parent instanceof HSLFGroupShape);
-    }
-
-    /**
-      * Create a ShapeGroup object and initialize it from the supplied Record container.
-      *
-      * @param escherRecord       <code>EscherSpContainer</code> container which holds information about this shape
-      * @param parent    the parent of the shape
-      */
-    protected HSLFGroupShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    @Override
-    public void setAnchor(Rectangle2D anchor) {
-        EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-        boolean isInitialized = !(clientAnchor.getDx1() == 0 && clientAnchor.getRow1() == 0);
-        
-        if (isInitialized) {
-            moveAndScale(anchor);
-        } else {
-            setExteriorAnchor(anchor);
-        }
-    }
-
-    @Override
-    public void setInteriorAnchor(Rectangle2D anchor){
-        EscherSpgrRecord spgr = getEscherChild(EscherSpgrRecord.RECORD_ID);
-
-        int x1 = Units.pointsToMaster(anchor.getX());
-        int y1 = Units.pointsToMaster(anchor.getY());
-        int x2 = Units.pointsToMaster(anchor.getX() + anchor.getWidth());
-        int y2 = Units.pointsToMaster(anchor.getY() + anchor.getHeight());
-
-        spgr.setRectX1(x1);
-        spgr.setRectY1(y1);
-        spgr.setRectX2(x2);
-        spgr.setRectY2(y2);
-    }
-
-    @Override
-    public Rectangle2D getInteriorAnchor(){
-        EscherSpgrRecord rec = getEscherChild(EscherSpgrRecord.RECORD_ID);
-        double x1 = Units.masterToPoints(rec.getRectX1());
-        double y1 = Units.masterToPoints(rec.getRectY1());
-        double x2 = Units.masterToPoints(rec.getRectX2());
-        double y2 = Units.masterToPoints(rec.getRectY2());
-        return new Rectangle2D.Double(x1,y1,x2-x1,y2-y1);
-    }
-
-    protected void setExteriorAnchor(Rectangle2D anchor) {
-        EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-        
-        //hack. internal variable EscherClientAnchorRecord.shortRecord can be
-        //initialized only in fillFields(). We need to set shortRecord=false;
-        byte[] header = new byte[16];
-        LittleEndian.putUShort(header, 0, 0);
-        LittleEndian.putUShort(header, 2, 0);
-        LittleEndian.putInt(header, 4, 8);
-        clientAnchor.fillFields(header, 0, null);
-
-        // All coordinates need to be converted to Master units (576 dpi)
-        clientAnchor.setFlag((short)Units.pointsToMaster(anchor.getY()));
-        clientAnchor.setCol1((short)Units.pointsToMaster(anchor.getX()));
-        clientAnchor.setDx1((short)Units.pointsToMaster(anchor.getWidth() + anchor.getX()));
-        clientAnchor.setRow1((short)Units.pointsToMaster(anchor.getHeight() + anchor.getY()));
-
-        // TODO: does this make sense?
-        setInteriorAnchor(anchor);
-    }
-    
-    /**
-     * Create a new ShapeGroup and create an instance of <code>EscherSpgrContainer</code> which represents a group of shapes
-     */
-    protected EscherContainerRecord createSpContainer(boolean isChild) {
-        EscherContainerRecord spgr = new EscherContainerRecord();
-        spgr.setRecordId(EscherContainerRecord.SPGR_CONTAINER);
-        spgr.setOptions((short)15);
-
-        //The group itself is a shape, and always appears as the first EscherSpContainer in the group container.
-        EscherContainerRecord spcont = new EscherContainerRecord();
-        spcont.setRecordId(EscherContainerRecord.SP_CONTAINER);
-        spcont.setOptions((short)15);
-
-        EscherSpgrRecord spg = new EscherSpgrRecord();
-        spg.setOptions((short)1);
-        spcont.addChildRecord(spg);
-
-        EscherSpRecord sp = new EscherSpRecord();
-        short type = (short)((ShapeType.NOT_PRIMITIVE.nativeId << 4) + 2);
-        sp.setOptions(type);
-        sp.setFlags(EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_GROUP);
-        spcont.addChildRecord(sp);
-
-        EscherClientAnchorRecord anchor = new EscherClientAnchorRecord();
-        spcont.addChildRecord(anchor);
-
-        spgr.addChildRecord(spcont);
-        return spgr;
-    }
-
-    /**
-     * Add a shape to this group.
-     *
-     * @param shape - the Shape to add
-     */
-    public void addShape(HSLFShape shape){
-        _escherContainer.addChildRecord(shape.getSpContainer());
-
-        HSLFSheet sheet = getSheet();
-        shape.setSheet(sheet);
-        shape.setShapeId(sheet.allocateShapeId());
-        shape.afterInsert(sheet);
-    }
-
-    /**
-     * Moves and scales this <code>ShapeGroup</code> to the specified anchor.
-     */
-    protected void moveAndScale(Rectangle2D anchorDest){
-        Rectangle2D anchorSrc = getAnchor();
-        double scaleX = (anchorSrc.getWidth() == 0) ? 0 : anchorDest.getWidth() / anchorSrc.getWidth();
-        double scaleY = (anchorSrc.getHeight() == 0) ? 0 : anchorDest.getHeight() / anchorSrc.getHeight();
-
-        setExteriorAnchor(anchorDest);
-        
-        for (HSLFShape shape : getShapes()) {
-            Rectangle2D chanchor = shape.getAnchor();
-            double x = anchorDest.getX()+(chanchor.getX()-anchorSrc.getX())*scaleX;
-            double y = anchorDest.getY()+(chanchor.getY()-anchorSrc.getY())*scaleY;
-            double width = chanchor.getWidth()*scaleX;
-            double height = chanchor.getHeight()*scaleY;
-            shape.setAnchor(new Rectangle2D.Double(x, y, width, height));
-        }
-    }
-
-    /**
-     * Returns the anchor (the bounding box rectangle) of this shape group.
-     * All coordinates are expressed in points (72 dpi).
-     *
-     * @return the anchor of this shape group
-     */
-    public Rectangle2D getAnchor(){
-        EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-        int x1,y1,x2,y2;
-        if(clientAnchor == null){
-            logger.log(POILogger.INFO, "EscherClientAnchorRecord was not found for shape group. Searching for EscherChildAnchorRecord.");
-            EscherChildAnchorRecord rec = getEscherChild(EscherChildAnchorRecord.RECORD_ID);
-            x1 = rec.getDx1();
-            y1 = rec.getDy1();
-            x2 = rec.getDx2();
-            y2 = rec.getDy2();
-        } else {
-            x1 = clientAnchor.getCol1();
-            y1 = clientAnchor.getFlag();
-            x2 = clientAnchor.getDx1();
-            y2 = clientAnchor.getRow1();
-        }
-        Rectangle2D anchor= new Rectangle2D.Double(
-            (x1 == -1 ? -1 : Units.masterToPoints(x1)),
-            (y1 == -1 ? -1 : Units.masterToPoints(y1)),
-            (x2 == -1 ? -1 : Units.masterToPoints(x2-x1)),
-            (y2 == -1 ? -1 : Units.masterToPoints(y2-y1))
-        );
-
-        return anchor;
-    }
-
-    /**
-     * Return type of the shape.
-     * In most cases shape group type is {@link org.apache.poi.sl.usermodel.ShapeType#NOT_PRIMITIVE}
-     *
-     * @return type of the shape.
-     */
-    public ShapeType getShapeType(){
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        int nativeId = spRecord.getOptions() >> 4;
-        return ShapeType.forId(nativeId, false);
-    }
-
-    /**
-     * Returns <code>null</code> - shape groups can't have hyperlinks
-     *
-     * @return <code>null</code>.
-     */
-     public HSLFHyperlink getHyperlink(){
-        return null;
-    }
-
-    @Override
-    public <T extends EscherRecord> T getEscherChild(int recordId){
-        EscherContainerRecord groupInfoContainer = (EscherContainerRecord)_escherContainer.getChild(0);
-        return groupInfoContainer.getChildById((short)recordId);
-    }
-
-    public Iterator<HSLFShape> iterator() {
-        return getShapes().iterator();
-    }
-
-    public boolean removeShape(HSLFShape shape) {
-        // TODO: implement!
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<HSLFShape> getShapes() {
-        // Out escher container record should contain several
-        //  SpContainers, the first of which is the group shape itself
-        Iterator<EscherRecord> iter = _escherContainer.getChildIterator();
-
-        // Don't include the first SpContainer, it is always NotPrimitive
-        if (iter.hasNext()) {
-            iter.next();
-        }
-        List<HSLFShape> shapeList = new ArrayList<HSLFShape>();
-        while (iter.hasNext()) {
-            EscherRecord r = iter.next();
-            if(r instanceof EscherContainerRecord) {
-                // Create the Shape for it
-                EscherContainerRecord container = (EscherContainerRecord)r;
-                HSLFShape shape = HSLFShapeFactory.createShape(container, this);
-                shape.setSheet(getSheet());
-                shapeList.add( shape );
-            } else {
-                // Should we do anything special with these non
-                //  Container records?
-                logger.log(POILogger.ERROR, "Shape contained non container escher record, was " + r.getClass().getName());
-            }
-        }
-
-        return shapeList;
-    }
-
-    @Override
-    public HSLFTextBox createTextBox() {
-        HSLFTextBox s = new HSLFTextBox(this);
-        s.setHorizontalCentered(true);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFAutoShape createAutoShape() {
-        HSLFAutoShape s = new HSLFAutoShape(ShapeType.RECT, this);
-        s.setHorizontalCentered(true);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFFreeformShape createFreeform() {
-        HSLFFreeformShape s = new HSLFFreeformShape(this);
-        s.setHorizontalCentered(true);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFConnectorShape createConnector() {
-        HSLFConnectorShape s = new HSLFConnectorShape(this);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFGroupShape createGroup() {
-        HSLFGroupShape s = new HSLFGroupShape(this);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFPictureShape createPicture(PictureData pictureData) {
-        if (!(pictureData instanceof HSLFPictureData)) {
-            throw new IllegalArgumentException("pictureData needs to be of type HSLFPictureData");
-        }
-        HSLFPictureShape s = new HSLFPictureShape((HSLFPictureData)pictureData, this);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFTable createTable(int numRows, int numCols) {
-        if (numRows < 1 || numCols < 1) {
-            throw new IllegalArgumentException("numRows and numCols must be greater than 0");
-        }
-        HSLFTable s = new HSLFTable(numRows,numCols,this);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
deleted file mode 100644
index 033f3bb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hslf.record.ExHyperlink;
-import org.apache.poi.hslf.record.ExHyperlinkAtom;
-import org.apache.poi.hslf.record.ExObjList;
-import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
-import org.apache.poi.hslf.record.InteractiveInfo;
-import org.apache.poi.hslf.record.InteractiveInfoAtom;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.TxInteractiveInfoAtom;
-import org.apache.poi.sl.usermodel.Hyperlink;
-import org.apache.poi.sl.usermodel.Slide;
-
-/**
- * Represents a hyperlink in a PowerPoint document
- */
-public final class HSLFHyperlink implements Hyperlink<HSLFShape,HSLFTextParagraph> {
-    private final ExHyperlink exHyper;
-    private final InteractiveInfo info;
-    private TxInteractiveInfoAtom txinfo;
-
-    protected HSLFHyperlink(ExHyperlink exHyper, InteractiveInfo info) {
-        this.info = info;
-        this.exHyper = exHyper;
-    }
-
-    public ExHyperlink getExHyperlink() {
-        return exHyper;
-    }
-    
-    public InteractiveInfo getInfo() {
-        return info;
-    }
-    
-    public TxInteractiveInfoAtom getTextRunInfo() {
-        return txinfo;
-    }
-    
-    protected void setTextRunInfo(TxInteractiveInfoAtom txinfo) {
-        this.txinfo = txinfo;
-    }
-
-    /**
-     * Creates a new Hyperlink and assign it to a shape
-     * This is only a helper method - use {@link HSLFSimpleShape#createHyperlink()} instead!
-     *
-     * @param shape the shape which receives the hyperlink
-     * @return the new hyperlink
-     * 
-     * @see HSLFSimpleShape#createHyperlink()
-     */
-    /* package */ static HSLFHyperlink createHyperlink(HSLFSimpleShape shape) {
-        // TODO: check if a hyperlink already exists
-        ExHyperlink exHyper = new ExHyperlink();
-        int linkId = shape.getSheet().getSlideShow().addToObjListAtom(exHyper);
-        ExHyperlinkAtom obj = exHyper.getExHyperlinkAtom();
-        obj.setNumber(linkId);
-        InteractiveInfo info = new InteractiveInfo();
-        info.getInteractiveInfoAtom().setHyperlinkID(linkId);
-        HSLFEscherClientDataRecord cldata = shape.getClientData(true);
-        cldata.addChild(info);
-        HSLFHyperlink hyper = new HSLFHyperlink(exHyper, info);
-        hyper.linkToNextSlide();
-        shape.setHyperlink(hyper);
-        return hyper;
-    }
-
-    /**
-     * Creates a new Hyperlink for a textrun.
-     * This is only a helper method - use {@link HSLFTextRun#createHyperlink()} instead!
-     *
-     * @param run the run which receives the hyperlink
-     * @return the new hyperlink
-     * 
-     * @see HSLFTextRun#createHyperlink()
-     */
-    /* package */ static HSLFHyperlink createHyperlink(HSLFTextRun run) {
-        // TODO: check if a hyperlink already exists
-        ExHyperlink exHyper = new ExHyperlink();
-        int linkId = run.getTextParagraph().getSheet().getSlideShow().addToObjListAtom(exHyper);
-        ExHyperlinkAtom obj = exHyper.getExHyperlinkAtom();
-        obj.setNumber(linkId);
-        InteractiveInfo info = new InteractiveInfo();
-        info.getInteractiveInfoAtom().setHyperlinkID(linkId);
-        // don't add the hyperlink now to text paragraph records
-        // this will be done, when the paragraph is saved
-        HSLFHyperlink hyper = new HSLFHyperlink(exHyper, info);
-        hyper.linkToNextSlide();
-        
-        TxInteractiveInfoAtom txinfo = new TxInteractiveInfoAtom();
-        int startIdx = run.getTextParagraph().getStartIdxOfTextRun(run);
-        int endIdx = startIdx + run.getLength();
-        txinfo.setStartIndex(startIdx);
-        txinfo.setEndIndex(endIdx);
-        hyper.setTextRunInfo(txinfo);
-        
-        run.setHyperlink(hyper);
-        return hyper;
-    }
-    
-
-    /**
-     * Gets the type of the hyperlink action.
-     * Must be a <code>LINK_*</code>  constant</code>
-     *
-     * @return the hyperlink URL
-     * @see InteractiveInfoAtom
-     * @deprecated POI 3.15 beta 3. Use {@link #getTypeEnum()}
-     */
-    @Override
-    public int getType() {
-        return getTypeEnum().getCode();
-    }
-    
-    /**
-     * Gets the type of the hyperlink action.
-     * Must be a <code>LINK_*</code>  constant</code>
-     *
-     * @return the hyperlink URL
-     * @see InteractiveInfoAtom
-     */
-    @Override
-    public HyperlinkType getTypeEnum() {
-        switch (info.getInteractiveInfoAtom().getHyperlinkType()) {
-        case InteractiveInfoAtom.LINK_Url:
-            return (exHyper.getLinkURL().startsWith("mailto:")) ? HyperlinkType.EMAIL : HyperlinkType.URL;
-        case InteractiveInfoAtom.LINK_NextSlide:
-        case InteractiveInfoAtom.LINK_PreviousSlide:
-        case InteractiveInfoAtom.LINK_FirstSlide:
-        case InteractiveInfoAtom.LINK_LastSlide:
-        case InteractiveInfoAtom.LINK_SlideNumber:
-            return HyperlinkType.DOCUMENT;
-        case InteractiveInfoAtom.LINK_CustomShow:
-        case InteractiveInfoAtom.LINK_OtherPresentation:
-        case InteractiveInfoAtom.LINK_OtherFile:
-            return HyperlinkType.FILE;
-        default:
-        case InteractiveInfoAtom.LINK_NULL:
-            return HyperlinkType.NONE;
-        }
-    }
-
-    @Override
-    public void linkToEmail(String emailAddress) {
-        InteractiveInfoAtom iia = info.getInteractiveInfoAtom();
-        iia.setAction(InteractiveInfoAtom.ACTION_HYPERLINK);
-        iia.setJump(InteractiveInfoAtom.JUMP_NONE);
-        iia.setHyperlinkType(InteractiveInfoAtom.LINK_Url);
-        exHyper.setLinkURL("mailto:"+emailAddress);
-        exHyper.setLinkTitle(emailAddress);
-        exHyper.setLinkOptions(0x10);
-    }
-
-    @Override
-    public void linkToUrl(String url) {
-        InteractiveInfoAtom iia = info.getInteractiveInfoAtom();
-        iia.setAction(InteractiveInfoAtom.ACTION_HYPERLINK);
-        iia.setJump(InteractiveInfoAtom.JUMP_NONE);
-        iia.setHyperlinkType(InteractiveInfoAtom.LINK_Url);
-        exHyper.setLinkURL(url);
-        exHyper.setLinkTitle(url);
-        exHyper.setLinkOptions(0x10);
-    }
-
-    @Override
-    public void linkToSlide(Slide<HSLFShape,HSLFTextParagraph> slide) {
-        assert(slide instanceof HSLFSlide);
-        HSLFSlide sl = (HSLFSlide)slide;
-        int slideNum = slide.getSlideNumber();
-        String alias = "Slide "+slideNum;
-
-        InteractiveInfoAtom iia = info.getInteractiveInfoAtom();
-        iia.setAction(InteractiveInfoAtom.ACTION_HYPERLINK);
-        iia.setJump(InteractiveInfoAtom.JUMP_NONE);
-        iia.setHyperlinkType(InteractiveInfoAtom.LINK_SlideNumber);
-
-        linkToDocument(sl._getSheetNumber(),slideNum,alias,0x30);
-    }
-
-    @Override
-    public void linkToNextSlide() {
-        InteractiveInfoAtom iia = info.getInteractiveInfoAtom();
-        iia.setAction(InteractiveInfoAtom.ACTION_JUMP);
-        iia.setJump(InteractiveInfoAtom.JUMP_NEXTSLIDE);
-        iia.setHyperlinkType(InteractiveInfoAtom.LINK_NextSlide);
-
-        linkToDocument(1,-1,"NEXT",0x10);
-    }
-
-    @Override
-    public void linkToPreviousSlide() {
-        InteractiveInfoAtom iia = info.getInteractiveInfoAtom();
-        iia.setAction(InteractiveInfoAtom.ACTION_JUMP);
-        iia.setJump(InteractiveInfoAtom.JUMP_PREVIOUSSLIDE);
-        iia.setHyperlinkType(InteractiveInfoAtom.LINK_PreviousSlide);
-
-        linkToDocument(1,-1,"PREV",0x10);
-    }
-
-    @Override
-    public void linkToFirstSlide() {
-        InteractiveInfoAtom iia = info.getInteractiveInfoAtom();
-        iia.setAction(InteractiveInfoAtom.ACTION_JUMP);
-        iia.setJump(InteractiveInfoAtom.JUMP_FIRSTSLIDE);
-        iia.setHyperlinkType(InteractiveInfoAtom.LINK_FirstSlide);
-
-        linkToDocument(1,-1,"FIRST",0x10);
-    }
-
-    @Override
-    public void linkToLastSlide() {
-        InteractiveInfoAtom iia = info.getInteractiveInfoAtom();
-        iia.setAction(InteractiveInfoAtom.ACTION_JUMP);
-        iia.setJump(InteractiveInfoAtom.JUMP_LASTSLIDE);
-        iia.setHyperlinkType(InteractiveInfoAtom.LINK_LastSlide);
-
-        linkToDocument(1,-1,"LAST",0x10);
-    }
-
-    private void linkToDocument(int sheetNumber, int slideNumber, String alias, int options) {
-        exHyper.setLinkURL(sheetNumber+","+slideNumber+","+alias);
-        exHyper.setLinkTitle(alias);
-        exHyper.setLinkOptions(options);
-    }
-
-    @Override
-    public String getAddress() {
-        return exHyper.getLinkURL();
-    }
-
-    @Override
-    public void setAddress(String str) {
-        exHyper.setLinkURL(str);
-    }
-
-    public int getId() {
-        return exHyper.getExHyperlinkAtom().getNumber();
-    }
-
-    @Override
-    public String getLabel() {
-        return exHyper.getLinkTitle();
-    }
-
-    @Override
-    public void setLabel(String label) {
-        exHyper.setLinkTitle(label);
-    }
-
-    /**
-     * Gets the beginning character position
-     *
-     * @return the beginning character position
-     */
-    public int getStartIndex() {
-        return (txinfo == null) ? -1 : txinfo.getStartIndex();
-    }
-
-    /**
-     * Sets the beginning character position
-     *
-     * @param startIndex the beginning character position
-     */
-    public void setStartIndex(int startIndex) {
-        if (txinfo != null) {
-            txinfo.setStartIndex(startIndex);
-        }
-    }
-
-    /**
-     * Gets the ending character position
-     *
-     * @return the ending character position
-     */
-    public int getEndIndex() {
-        return (txinfo == null) ? -1 : txinfo.getEndIndex();
-    }
-
-    /**
-     * Sets the ending character position
-     *
-     * @param endIndex the ending character position
-     */
-    public void setEndIndex(int endIndex) {
-        if (txinfo != null) {
-            txinfo.setEndIndex(endIndex);
-        }
-    }
-
-    /**
-     * Find hyperlinks in a text shape
-     *
-     * @param shape  <code>TextRun</code> to lookup hyperlinks in
-     * @return found hyperlinks or <code>null</code> if not found
-     */
-    public static List<HSLFHyperlink> find(HSLFTextShape shape){
-        return find(shape.getTextParagraphs());
-    }
-
-    /**
-     * Find hyperlinks in a text paragraph
-     *
-     * @param paragraphs  List of <code>TextParagraph</code> to lookup hyperlinks
-     * @return found hyperlinks
-     */
-    @SuppressWarnings("resource")
-    protected static List<HSLFHyperlink> find(List<HSLFTextParagraph> paragraphs){
-        List<HSLFHyperlink> lst = new ArrayList<HSLFHyperlink>();
-        if (paragraphs == null || paragraphs.isEmpty()) return lst;
-
-        HSLFTextParagraph firstPara = paragraphs.get(0);
-
-        HSLFSlideShow ppt = firstPara.getSheet().getSlideShow();
-        //document-level container which stores info about all links in a presentation
-        ExObjList exobj = ppt.getDocumentRecord().getExObjList(false);
-        if (exobj != null) {
-            Record[] records = firstPara.getRecords();
-            find(Arrays.asList(records), exobj, lst);
-        }
-
-        return lst;
-    }
-
-    /**
-     * Find hyperlink assigned to the supplied shape
-     *
-     * @param shape  <code>Shape</code> to lookup hyperlink in
-     * @return found hyperlink or <code>null</code>
-     */
-    @SuppressWarnings("resource")
-    protected static HSLFHyperlink find(HSLFShape shape){
-        HSLFSlideShow ppt = shape.getSheet().getSlideShow();
-        //document-level container which stores info about all links in a presentation
-        ExObjList exobj = ppt.getDocumentRecord().getExObjList(false);
-        HSLFEscherClientDataRecord cldata = shape.getClientData(false);
-
-        if (exobj != null && cldata != null) {
-            List<HSLFHyperlink> lst = new ArrayList<HSLFHyperlink>();
-            find(cldata.getHSLFChildRecords(), exobj, lst);
-            return lst.isEmpty() ? null : (HSLFHyperlink)lst.get(0);
-        }
-
-        return null;
-    }
-
-    private static void find(List<? extends Record> records, ExObjList exobj, List<HSLFHyperlink> out){
-        ListIterator<? extends Record> iter = records.listIterator();
-        while (iter.hasNext()) {
-            Record r = iter.next();
-            // see if we have InteractiveInfo in the textrun's records
-            if (!(r instanceof InteractiveInfo)) {
-                continue;
-            }
-
-            InteractiveInfo hldr = (InteractiveInfo)r;
-            InteractiveInfoAtom info = hldr.getInteractiveInfoAtom();
-            if (info == null) {
-                continue;
-            }
-            int id = info.getHyperlinkID();
-            ExHyperlink exHyper = exobj.get(id);
-            if (exHyper == null) {
-                continue;
-            }
-
-            HSLFHyperlink link = new HSLFHyperlink(exHyper, hldr);
-            out.add(link);
-
-            if (iter.hasNext()) {
-                r = iter.next();
-                if (!(r instanceof TxInteractiveInfoAtom)) {
-                    iter.previous();
-                    continue;
-                }
-                link.setTextRunInfo((TxInteractiveInfoAtom)r);
-            }
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFLine.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFLine.java
deleted file mode 100644
index 21706db..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFLine.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.sl.usermodel.Line;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-
-/**
- * Represents a line in a PowerPoint drawing
- *
- *  @author Yegor Kozlov
- */
-public final class HSLFLine extends HSLFTextShape implements Line<HSLFShape,HSLFTextParagraph> {
-    public HSLFLine(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    public HSLFLine(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(null, parent);
-        _escherContainer = createSpContainer(parent instanceof HSLFGroupShape);
-    }
-
-    public HSLFLine(){
-        this(null);
-    }
-
-    protected EscherContainerRecord createSpContainer(boolean isChild){
-        _escherContainer = super.createSpContainer(isChild);
-        
-        setShapeType(ShapeType.LINE);
-
-        EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
-        short type = (short)((ShapeType.LINE.nativeId << 4) | 0x2);
-        spRecord.setOptions(type);
-
-        //set default properties for a line
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-
-        //default line properties
-        setEscherProperty(opt, EscherProperties.GEOMETRY__SHAPEPATH, 4);
-        setEscherProperty(opt, EscherProperties.GEOMETRY__FILLOK, 0x10000);
-        setEscherProperty(opt, EscherProperties.FILL__NOFILLHITTEST, 0x100000);
-        setEscherProperty(opt, EscherProperties.LINESTYLE__COLOR, 0x8000001);
-        setEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0xA0008);
-        setEscherProperty(opt, EscherProperties.SHADOWSTYLE__COLOR, 0x8000002);
-
-        return _escherContainer;
-    }
-    
-//    /**
-//     * Sets the orientation of the line, if inverse is false, then line goes
-//     * from top-left to bottom-right, otherwise use inverse equals true 
-//     *
-//     * @param inverse the orientation of the line
-//     */
-//    public void setInverse(boolean inverse) {
-//        setShapeType(inverse ? ShapeType.LINE_INV : ShapeType.LINE);
-//    }
-//    
-//    /**
-//     * Gets the orientation of the line, if inverse is false, then line goes
-//     * from top-left to bottom-right, otherwise inverse equals true 
-//     *
-//     * @return inverse the orientation of the line
-//     */
-//    public boolean isInverse() {
-//        return (getShapeType() == ShapeType.LINE_INV);
-//    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
deleted file mode 100644
index d733746..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.hslf.record.SheetContainer;
-import org.apache.poi.hslf.model.textproperties.TextProp;
-import org.apache.poi.sl.usermodel.MasterSheet;
-
-/**
- * The superclass of all master sheets - Slide masters, Notes masters, etc.
- *
- * For now it's empty. When we understand more about masters in ppt we will add the common functionality here.
- *
- * @author Yegor Kozlov
- */
-public abstract class HSLFMasterSheet extends HSLFSheet implements MasterSheet<HSLFShape,HSLFTextParagraph> {
-    public HSLFMasterSheet(SheetContainer container, int sheetNo){
-        super(container, sheetNo);
-    }
-
-    /**
-     * Pickup a style attribute from the master.
-     * This is the "workhorse" which returns the default style attrubutes.
-     */
-    public abstract TextProp getStyleAttribute(int txtype, int level, String name, boolean isCharacter) ;
-
-
-    /**
-     * Checks if the shape is a placeholder.
-     * (placeholders aren't normal shapes, they are visible only in the Edit Master mode)
-     *
-     *
-     * @return true if the shape is a placeholder
-     */
-    public static boolean isPlaceholder(HSLFShape shape){
-        if(!(shape instanceof HSLFTextShape)) return false;
-
-        HSLFTextShape tx = (HSLFTextShape)shape;
-        return tx.getPlaceholderAtom() != null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java
deleted file mode 100644
index d64775e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.sl.usermodel.Notes;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class represents a slide's notes in a PowerPoint Document. It
- *  allows access to the text within, and the layout. For now, it only
- *  does the text side of things though
- *
- * @author Nick Burch
- */
-
-public final class HSLFNotes extends HSLFSheet implements Notes<HSLFShape,HSLFTextParagraph> {
-    protected static final POILogger logger = POILogFactory.getLogger(HSLFNotes.class);
-    
-    private List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>();
-
-    /**
-     * Constructs a Notes Sheet from the given Notes record.
-     * Initialises TextRuns, to provide easier access to the text
-     * 
-     * @param notes the Notes record to read from
-     */
-    public HSLFNotes(org.apache.poi.hslf.record.Notes notes) {
-        super(notes, notes.getNotesAtom().getSlideID());
-
-        // Now, build up TextRuns from pairs of TextHeaderAtom and
-        // one of TextBytesAtom or TextCharsAtom, found inside
-        // EscherTextboxWrapper's in the PPDrawing
-        for (List<HSLFTextParagraph> l : HSLFTextParagraph.findTextParagraphs(getPPDrawing(), this)) {
-            if (!_paragraphs.contains(l)) _paragraphs.add(l);
-        }
-        
-        if (_paragraphs.isEmpty()) {
-            logger.log(POILogger.WARN, "No text records found for notes sheet");
-        }
-    }
-
-    /**
-     * Returns an array of all the TextParagraphs found
-     */
-    @Override
-    public List<List<HSLFTextParagraph>> getTextParagraphs() {
-        return _paragraphs;
-    }
-
-    /**
-     * Return <code>null</code> - Notes Masters are not yet supported
-     */
-    public HSLFMasterSheet getMasterSheet() {
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java
deleted file mode 100644
index f02ddbe..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hslf.usermodel;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-import org.apache.poi.hslf.record.ExOleObjStg;
-
-/**
- * A class that represents object data embedded in a slide show.
- *
- * @author Daniel Noll
- */
-public class HSLFObjectData {
-    /**
-     * The record that contains the object data.
-     */
-    private ExOleObjStg storage;
-
-    /**
-     * Creates the object data wrapping the record that contains the object data.
-     *
-     * @param storage the record that contains the object data.
-     */
-    public HSLFObjectData(ExOleObjStg storage) {
-        this.storage = storage;
-    }
-
-    /**
-     * Gets an input stream which returns the binary of the embedded data.
-     *
-     * @return the input stream which will contain the binary of the embedded data.
-     */
-    public InputStream getData() {
-        return storage.getData();
-    }
-
-    /**
-     * Sets the embedded data.
-     *
-     * @param data the embedded data.
-     */
-     public void setData(byte[] data) throws IOException {
-        storage.setData(data);    
-    }
-
-    /**
-     * Return the record that contains the object data.
-     *
-     * @return the record that contains the object data.
-     */
-    public ExOleObjStg getExOleObjStg() {
-        return storage;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
deleted file mode 100644
index f3da760..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Dimension;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.MessageDigest;
-
-import org.apache.poi.hslf.blip.*;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.util.*;
-
-/**
- * A class that represents image data contained in a slide show.
- *
- *  @author Yegor Kozlov
- */
-public abstract class HSLFPictureData implements PictureData {
-
-    /**
-     * Size of the image checksum calculated using MD5 algorithm.
-     */
-    protected static final int CHECKSUM_SIZE = 16;
-
-    /**
-    * Binary data of the picture
-    */
-    private byte[] rawdata;
-    /**
-     * The offset to the picture in the stream
-     */
-    protected int offset;
-
-    /**
-     * The instance type/signatures defines if one or two UID instances will be included
-     */
-    protected int uidInstanceCount = 1;
-
-    /**
-     * The 1-based index within the pictures stream 
-     */
-    protected int index = -1;
-    
-    /**
-     * Blip signature.
-     */
-    protected abstract int getSignature();
-
-    public abstract void setSignature(int signature);
-
-    /**
-     * The instance type/signatures defines if one or two UID instances will be included
-     */
-    protected int getUIDInstanceCount() {
-        return uidInstanceCount;
-    }
-
-    /**
-     * Returns the raw binary data of this Picture excluding the first 8 bytes
-     * which hold image signature and size of the image data.
-     *
-     * @return picture data
-     */
-    public byte[] getRawData(){
-        return rawdata;
-    }
-
-    public void setRawData(byte[] data){
-        rawdata = (data == null) ? null : data.clone();
-    }
-
-    /**
-     * File offset in the 'Pictures' stream
-     *
-     * @return offset in the 'Pictures' stream
-     */
-    public int getOffset(){
-        return offset;
-    }
-
-    /**
-     * Set offset of this picture in the 'Pictures' stream.
-     * We need to set it when a new picture is created.
-     *
-     * @param offset in the 'Pictures' stream
-     */
-    public void setOffset(int offset){
-        this.offset = offset;
-    }
-
-    /**
-     * Returns 16-byte checksum of this picture
-     */
-    public byte[] getUID(){
-        byte[] uid = new byte[16];
-        System.arraycopy(rawdata, 0, uid, 0, uid.length);
-        return uid;
-    }
-
-    @Override
-    public byte[] getChecksum() {
-        return getChecksum(getData());
-    }
-        
-    /**
-     * Compute 16-byte checksum of this picture using MD5 algorithm.
-     */
-    public static byte[] getChecksum(byte[] data) {
-        MessageDigest md5 = CryptoFunctions.getMessageDigest(HashAlgorithm.md5);
-        md5.update(data);
-        return md5.digest();
-    }
-
-    /**
-     * Write this picture into <code>OutputStream</code>
-     */
-    public void write(OutputStream out) throws IOException {
-        byte[] data;
-
-        data = new byte[LittleEndian.SHORT_SIZE];
-        LittleEndian.putUShort(data, 0, getSignature());
-        out.write(data);
-
-        data = new byte[LittleEndian.SHORT_SIZE];
-        PictureType pt = getType();
-        LittleEndian.putUShort(data, 0, pt.nativeId + 0xF018);
-        out.write(data);
-
-        byte[] rd = getRawData();
-
-        data = new byte[LittleEndian.INT_SIZE];
-        LittleEndian.putInt(data, 0, rd.length);
-        out.write(data);
-
-        out.write(rd);
-    }
-
-    /**
-     * Create an instance of <code>PictureData</code> by type.
-     *
-     * @param type type of the picture data.
-     * Must be one of the static constants defined in the <code>Picture<code> class.
-     * @return concrete instance of <code>PictureData</code>
-     */
-     public static HSLFPictureData create(PictureType type){
-        HSLFPictureData pict;
-        switch (type){
-            case EMF: pict = new EMF(); break;
-            case WMF: pict = new WMF(); break;
-            case PICT: pict = new PICT(); break;
-            case JPEG: pict = new JPEG(); break;
-            case PNG: pict = new PNG(); break;
-            case DIB: pict = new DIB(); break;
-            default:
-                throw new IllegalArgumentException("Unsupported picture type: " + type);
-        }
-        return pict;
-    }
-
-    /**
-     * Return 24 byte header which preceeds the actual picture data.
-     * <p>
-     * The header consists of 2-byte signature, 2-byte type,
-     * 4-byte image size and 16-byte checksum of the image data.
-     * </p>
-     *
-     * @return the 24 byte header which preceeds the actual picture data.
-     */
-    public byte[] getHeader() {
-        byte[] header = new byte[16 + 8];
-        LittleEndian.putInt(header, 0, getSignature());
-        LittleEndian.putInt(header, 4, getRawData().length);
-        System.arraycopy(rawdata, 0, header, 8, 16);
-        return header;
-    }
-
-    /**
-     * @return the 1-based index of this pictures within the pictures stream
-     */
-    public int getIndex() {
-        return index;
-    }
-
-    /**
-     * @param index sets the 1-based index of this pictures within the pictures stream
-     */
-    public void setIndex(int index) {
-        this.index = index;
-    }
-    
-    @Override
-    public final String getContentType() {
-        return getType().contentType;
-    }
-
-    @Override
-    public Dimension getImageDimensionInPixels() {
-        Dimension dim = getImageDimension();
-        return new Dimension(
-            Units.pointsToPixel(dim.getWidth()),
-            Units.pointsToPixel(dim.getHeight())
-        );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
deleted file mode 100644
index 6f8802d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Insets;
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherComplexProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.sl.draw.DrawPictureShape;
-import org.apache.poi.sl.usermodel.PictureShape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.util.Units;
-
-
-/**
- * Represents a picture in a PowerPoint document.
- *
- * @author Yegor Kozlov
- */
-public class HSLFPictureShape extends HSLFSimpleShape implements PictureShape<HSLFShape,HSLFTextParagraph> {
-
-    /**
-     * Create a new <code>Picture</code>
-     *
-    * @param data the picture data
-     */
-    public HSLFPictureShape(HSLFPictureData data){
-        this(data, null);
-    }
-
-    /**
-     * Create a new <code>Picture</code>
-     *
-     * @param data the picture data
-     * @param parent the parent shape
-     */
-    public HSLFPictureShape(HSLFPictureData data, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        super(null, parent);
-        _escherContainer = createSpContainer(data.getIndex(), parent instanceof HSLFGroupShape);
-    }
-
-    /**
-      * Create a <code>Picture</code> object
-      *
-      * @param escherRecord the <code>EscherSpContainer</code> record which holds information about
-      *        this picture in the <code>Slide</code>
-      * @param parent the parent shape of this picture
-      */
-     protected HSLFPictureShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    /**
-     * Returns index associated with this picture.
-     * Index starts with 1 and points to a EscherBSE record which
-     * holds information about this picture.
-     *
-     * @return the index to this picture (1 based).
-     */
-    public int getPictureIndex(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.BLIP__BLIPTODISPLAY);
-        return prop == null ? 0 : prop.getPropertyValue();
-    }
-
-    /**
-     * Create a new Picture and populate the inital structure of the <code>EscherSp</code> record which holds information about this picture.
-
-     * @param idx the index of the picture which refers to <code>EscherBSE</code> container.
-     * @return the create Picture object
-     */
-    protected EscherContainerRecord createSpContainer(int idx, boolean isChild) {
-        _escherContainer = super.createSpContainer(isChild);
-        _escherContainer.setOptions((short)15);
-
-        EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
-        spRecord.setOptions((short)((ShapeType.FRAME.nativeId << 4) | 0x2));
-
-        //set default properties for a picture
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, 0x800080);
-
-        //another weird feature of powerpoint: for picture id we must add 0x4000.
-        setEscherProperty(opt, (short)(EscherProperties.BLIP__BLIPTODISPLAY + 0x4000), idx);
-
-        return _escherContainer;
-    }
-
-    @SuppressWarnings("resource")
-    @Override
-    public HSLFPictureData getPictureData(){
-        HSLFSlideShow ppt = getSheet().getSlideShow();
-        List<HSLFPictureData> pict = ppt.getPictureData();
-
-        EscherBSERecord bse = getEscherBSERecord();
-        if (bse == null){
-            logger.log(POILogger.ERROR, "no reference to picture data found ");
-        } else {
-            for (HSLFPictureData pd : pict) {
-                if (pd.getOffset() ==  bse.getOffset()){
-                    return pd;
-                }
-            }
-            logger.log(POILogger.ERROR, "no picture found for our BSE offset " + bse.getOffset());
-        }
-        return null;
-    }
-
-    @SuppressWarnings("resource")
-    protected EscherBSERecord getEscherBSERecord(){
-        HSLFSlideShow ppt = getSheet().getSlideShow();
-        Document doc = ppt.getDocumentRecord();
-        EscherContainerRecord dggContainer = doc.getPPDrawingGroup().getDggContainer();
-        EscherContainerRecord bstore = HSLFShape.getEscherChild(dggContainer, EscherContainerRecord.BSTORE_CONTAINER);
-        if(bstore == null) {
-            logger.log(POILogger.DEBUG, "EscherContainerRecord.BSTORE_CONTAINER was not found ");
-            return null;
-        }
-        List<EscherRecord> lst = bstore.getChildRecords();
-        int idx = getPictureIndex();
-        if (idx == 0){
-            logger.log(POILogger.DEBUG, "picture index was not found, returning ");
-            return null;
-        }
-        return (EscherBSERecord)lst.get(idx-1);
-    }
-
-    /**
-     * Name of this picture.
-     *
-     * @return name of this picture
-     */
-    public String getPictureName(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherComplexProperty prop = getEscherProperty(opt, EscherProperties.BLIP__BLIPFILENAME);
-        if (prop == null) return null;
-        String name = StringUtil.getFromUnicodeLE(prop.getComplexData());
-        return name.trim();
-    }
-
-    /**
-     * Name of this picture.
-     *
-     * @param name of this picture
-     */
-    public void setPictureName(String name){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        byte[] data = StringUtil.getToUnicodeLE(name + '\u0000');
-        EscherComplexProperty prop = new EscherComplexProperty(EscherProperties.BLIP__BLIPFILENAME, false, data);
-        opt.addEscherProperty(prop);
-    }
-
-    /**
-     * By default set the orininal image size
-     */
-    protected void afterInsert(HSLFSheet sh){
-        super.afterInsert(sh);
-
-        EscherBSERecord bse = getEscherBSERecord();
-        bse.setRef(bse.getRef() + 1);
-
-        Rectangle2D anchor = getAnchor();
-        if (anchor.isEmpty()){
-            new DrawPictureShape(this).resize();
-        }
-    }
-
-
-    @Override
-    public Insets getClipping() {
-        // The anchor specified by the escher properties is the displayed size,
-        // i.e. the size of the already clipped image
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        
-        double top    = getFractProp(opt, EscherProperties.BLIP__CROPFROMTOP);
-        double bottom = getFractProp(opt, EscherProperties.BLIP__CROPFROMBOTTOM);
-        double left   = getFractProp(opt, EscherProperties.BLIP__CROPFROMLEFT);
-        double right  = getFractProp(opt, EscherProperties.BLIP__CROPFROMRIGHT);
-        
-        // if all crop values are zero (the default) then no crop rectangle is set, return null
-        return (top==0 && bottom==0 && left==0 && right==0)
-            ? null
-            : new Insets((int)(top*100000), (int)(left*100000), (int)(bottom*100000), (int)(right*100000));
-    }
-
-    @Override
-    public ShapeType getShapeType() {
-        // this is kind of a hack, as picture/ole shapes can have a shape type of "frame"
-        // but rendering is handled like a rectangle
-        return ShapeType.RECT;
-    }
-    
-    /**
-     * @return the fractional property or 0 if not defined
-     */
-    private static double getFractProp(AbstractEscherOptRecord opt, short propertyId) {
-        EscherSimpleProperty prop = getEscherProperty(opt, propertyId);
-        if (prop == null) return 0;
-        int fixedPoint = prop.getPropertyValue();
-        return Units.fixedPointToDouble(fixedPoint);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
deleted file mode 100644
index 22b1d90..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-
-/**
- * Represents a Placeholder in PowerPoint.
- *
- * @author Yegor Kozlov
- */
-public final class HSLFPlaceholder extends HSLFTextBox {
-
-    protected HSLFPlaceholder(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    public HSLFPlaceholder(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(parent);
-    }
-
-    public HSLFPlaceholder(){
-        super();
-    }
-
-    /**
-     * Create a new Placeholder and initialize internal structures
-     *
-     * @return the created <code>EscherContainerRecord</code> which holds shape data
-     */
-    protected EscherContainerRecord createSpContainer(boolean isChild){
-        _escherContainer = super.createSpContainer(isChild);
-        
-        setPlaceholder(Placeholder.BODY);
-
-        return _escherContainer;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
deleted file mode 100644
index 51fc33b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherChildAnchorRecord;
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.ddf.EscherColorRef;
-import org.apache.poi.ddf.EscherColorRef.SysIndexProcedure;
-import org.apache.poi.ddf.EscherColorRef.SysIndexSource;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hslf.record.ColorSchemeAtom;
-import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.usermodel.FillStyle;
-import org.apache.poi.sl.usermodel.PresetColor;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- *  <p>
-  * Represents a Shape which is the elemental object that composes a drawing.
- *  This class is a wrapper around EscherSpContainer which holds all information
- *  about a shape in PowerPoint document.
- *  </p>
- *  <p>
- *  When you add a shape, you usually specify the dimensions of the shape and the position
- *  of the upper'left corner of the bounding box for the shape relative to the upper'left
- *  corner of the page, worksheet, or slide. Distances in the drawing layer are measured
- *  in points (72 points = 1 inch).
- *  </p>
- * <p>
- */
-public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> {
-
-    // For logging
-    protected POILogger logger = POILogFactory.getLogger(this.getClass());
-
-    /**
-     * Either EscherSpContainer or EscheSpgrContainer record
-     * which holds information about this shape.
-     */
-    protected EscherContainerRecord _escherContainer;
-
-    /**
-     * Parent of this shape.
-     * <code>null</code> for the topmost shapes.
-     */
-    protected ShapeContainer<HSLFShape,HSLFTextParagraph> _parent;
-
-    /**
-     * The <code>Sheet</code> this shape belongs to
-     */
-    protected HSLFSheet _sheet;
-
-    /**
-     * Fill
-     */
-    protected HSLFFill _fill;
-    
-    /**
-     * Create a Shape object. This constructor is used when an existing Shape is read from from a PowerPoint document.
-     *
-     * @param escherRecord       <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent             the parent of this Shape
-     */
-      protected HSLFShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        _escherContainer = escherRecord;
-        _parent = parent;
-     }
-
-    /**
-     * Creates the lowerlevel escher records for this shape.
-     */
-    protected abstract EscherContainerRecord createSpContainer(boolean isChild);
-
-    /**
-     *  @return the parent of this shape
-     */
-    public ShapeContainer<HSLFShape,HSLFTextParagraph> getParent(){
-        return _parent;
-    }
-
-    /**
-     * @return name of the shape.
-     */
-    public String getShapeName(){
-        return getShapeType().nativeName;
-    }
-
-    public ShapeType getShapeType(){
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        return ShapeType.forId(spRecord.getShapeType(), false);
-    }
-
-    public void setShapeType(ShapeType type){
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        spRecord.setShapeType( (short) type.nativeId );
-        spRecord.setVersion( (short) 0x2 );
-    }
-
-    /**
-     * Returns the anchor (the bounding box rectangle) of this shape.
-     * All coordinates are expressed in points (72 dpi).
-     *
-     * @return the anchor of this shape
-     */
-    public Rectangle2D getAnchor() {
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        int flags = spRecord.getFlags();
-        int x1,y1,x2,y2;
-        EscherChildAnchorRecord childRec = getEscherChild(EscherChildAnchorRecord.RECORD_ID);
-        boolean useChildRec = ((flags & EscherSpRecord.FLAG_CHILD) != 0);
-        if (useChildRec && childRec != null){
-            x1 = childRec.getDx1();
-            y1 = childRec.getDy1();
-            x2 = childRec.getDx2();
-            y2 = childRec.getDy2();
-        } else {
-            if (useChildRec) {
-                logger.log(POILogger.WARN, "EscherSpRecord.FLAG_CHILD is set but EscherChildAnchorRecord was not found");
-            }
-            EscherClientAnchorRecord clientRec = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-            x1 = clientRec.getCol1();
-            y1 = clientRec.getFlag();
-            x2 = clientRec.getDx1();
-            y2 = clientRec.getRow1();
-        }
-
-        // TODO: find out where this -1 value comes from at #57820 (link to ms docs?)
-        Rectangle2D anchor = new Rectangle2D.Double(
-            (x1 == -1 ? -1 : Units.masterToPoints(x1)),
-            (y1 == -1 ? -1 : Units.masterToPoints(y1)),
-            (x2 == -1 ? -1 : Units.masterToPoints(x2-x1)),
-            (y2 == -1 ? -1 : Units.masterToPoints(y2-y1))
-        );
-        
-        return anchor;
-    }
-
-    /**
-     * Sets the anchor (the bounding box rectangle) of this shape.
-     * All coordinates should be expressed in points (72 dpi).
-     *
-     * @param anchor new anchor
-     */
-    public void setAnchor(Rectangle2D anchor){
-        int x = Units.pointsToMaster(anchor.getX());
-        int y = Units.pointsToMaster(anchor.getY());
-        int w = Units.pointsToMaster(anchor.getWidth() + anchor.getX());
-        int h = Units.pointsToMaster(anchor.getHeight() + anchor.getY());
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        int flags = spRecord.getFlags();
-        if ((flags & EscherSpRecord.FLAG_CHILD) != 0){
-            EscherChildAnchorRecord rec = (EscherChildAnchorRecord)getEscherChild(EscherChildAnchorRecord.RECORD_ID);
-            rec.setDx1(x);
-            rec.setDy1(y);
-            rec.setDx2(w);
-            rec.setDy2(h);
-        } else {
-            EscherClientAnchorRecord rec = (EscherClientAnchorRecord)getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-            rec.setCol1((short)x);
-            rec.setFlag((short)y);
-            rec.setDx1((short)w);
-            rec.setRow1((short)h);
-        }
-
-    }
-
-    /**
-     * Moves the top left corner of the shape to the specified point.
-     *
-     * @param x the x coordinate of the top left corner of the shape
-     * @param y the y coordinate of the top left corner of the shape
-     */
-    public final void moveTo(double x, double y) {
-        // This convenience method should be implemented via setAnchor in subclasses
-        // see HSLFGroupShape.setAnchor() for a reference
-        Rectangle2D anchor = getAnchor();
-        anchor.setRect(x, y, anchor.getWidth(), anchor.getHeight());
-        setAnchor(anchor);
-    }
-
-    /**
-     * Helper method to return escher child by record ID
-     *
-     * @return escher record or <code>null</code> if not found.
-     */
-    public static <T extends EscherRecord> T getEscherChild(EscherContainerRecord owner, int recordId){
-        return owner.getChildById((short)recordId);
-    }
-    
-    /**
-     * @since POI 3.14-Beta2
-     */
-    public static <T extends EscherRecord> T getEscherChild(EscherContainerRecord owner, RecordTypes recordId){
-        return getEscherChild(owner, recordId.typeID);
-    }
-
-    public <T extends EscherRecord> T getEscherChild(int recordId){
-        return _escherContainer.getChildById((short)recordId);
-    }
-    
-    /**
-     * @since POI 3.14-Beta2
-     */
-    public <T extends EscherRecord> T getEscherChild(RecordTypes recordId){
-        return getEscherChild(recordId.typeID);
-    }
-    
-    /**
-     * Returns  escher property by id.
-     *
-     * @return escher property or <code>null</code> if not found.
-     */
-     public static <T extends EscherProperty> T getEscherProperty(AbstractEscherOptRecord opt, int propId){
-         return (opt == null) ? null : opt.<T>lookup(propId);
-     }
-
-    /**
-     * Set an escher property for this shape.
-     *
-     * @param opt       The opt record to set the properties to.
-     * @param propId    The id of the property. One of the constants defined in EscherOptRecord.
-     * @param value     value of the property. If value = -1 then the property is removed.
-     */
-     public static void setEscherProperty(AbstractEscherOptRecord opt, short propId, int value){
-        java.util.List<EscherProperty> props = opt.getEscherProperties();
-        for ( Iterator<EscherProperty> iterator = props.iterator(); iterator.hasNext(); ) {
-            if (iterator.next().getPropertyNumber() == propId){
-                iterator.remove();
-                break;
-            }
-        }
-        if (value != -1) {
-            opt.addEscherProperty(new EscherSimpleProperty(propId, value));
-            opt.sortProperties();
-        }
-    }
-
-    /**
-     * Set an simple escher property for this shape.
-     *
-     * @param propId    The id of the property. One of the constants defined in EscherOptRecord.
-     * @param value     value of the property. If value = -1 then the property is removed.
-     */
-    public void setEscherProperty(short propId, int value){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, propId, value);
-    }
-
-    /**
-     * Get the value of a simple escher property for this shape.
-     *
-     * @param propId    The id of the property. One of the constants defined in EscherOptRecord.
-     */
-   public int getEscherProperty(short propId){
-       AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, propId);
-        return prop == null ? 0 : prop.getPropertyValue();
-    }
-
-    /**
-     * Get the value of a simple escher property for this shape.
-     *
-     * @param propId    The id of the property. One of the constants defined in EscherOptRecord.
-     */
-   public int getEscherProperty(short propId, int defaultValue){
-       AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, propId);
-        return prop == null ? defaultValue : prop.getPropertyValue();
-    }
-
-    /**
-     * @return  The shape container and it's children that can represent this
-     *          shape.
-     */
-    public EscherContainerRecord getSpContainer(){
-        return _escherContainer;
-    }
-
-    /**
-     * Event which fires when a shape is inserted in the sheet.
-     * In some cases we need to propagate changes to upper level containers.
-     * <br>
-     * Default implementation does nothing.
-     *
-     * @param sh - owning shape
-     */
-    protected void afterInsert(HSLFSheet sh){
-        if(_fill != null) {
-            _fill.afterInsert(sh);
-        }
-    }
-
-    /**
-     *  @return the <code>SlideShow</code> this shape belongs to
-     */
-    public HSLFSheet getSheet(){
-        return _sheet;
-    }
-
-    /**
-     * Assign the <code>SlideShow</code> this shape belongs to
-     *
-     * @param sheet owner of this shape
-     */
-    public void setSheet(HSLFSheet sheet){
-        _sheet = sheet;
-    }
-
-    Color getColor(short colorProperty, short opacityProperty, int defaultColor){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty p = getEscherProperty(opt, colorProperty);
-        if(p == null && defaultColor == -1) return null;
-
-        int val = (p == null) ? defaultColor : p.getPropertyValue();
-
-        EscherColorRef ecr = new EscherColorRef(val);
-        Color col = getColor(ecr);
-        if (col == null) {
-            return null;
-        }
-
-        double alpha = getAlpha(opacityProperty);
-        return new Color(col.getRed(), col.getGreen(), col.getBlue(), (int)(alpha*255.0));
-    }
-
-    Color getColor(EscherColorRef ecr) {
-        boolean fPaletteIndex = ecr.hasPaletteIndexFlag();
-        boolean fPaletteRGB = ecr.hasPaletteRGBFlag();
-        boolean fSystemRGB = ecr.hasSystemRGBFlag();
-        boolean fSchemeIndex = ecr.hasSchemeIndexFlag();
-        boolean fSysIndex = ecr.hasSysIndexFlag();
-        
-        int rgb[] = ecr.getRGB();
-
-        HSLFSheet sheet = getSheet();
-        if (fSchemeIndex && sheet != null) {
-            //red is the index to the color scheme
-            ColorSchemeAtom ca = sheet.getColorScheme();
-            int schemeColor = ca.getColor(ecr.getSchemeIndex());
-
-            rgb[0] = (schemeColor >> 0) & 0xFF;
-            rgb[1] = (schemeColor >> 8) & 0xFF;
-            rgb[2] = (schemeColor >> 16) & 0xFF;
-        } else if (fPaletteIndex) {
-            //TODO
-        } else if (fPaletteRGB) {
-            //TODO
-        } else if (fSystemRGB) {
-            //TODO
-        } else if (fSysIndex) {
-            Color col = getSysIndexColor(ecr);
-            col = applySysIndexProcedure(ecr, col);
-            return col;
-        }
-        
-        return new Color(rgb[0], rgb[1], rgb[2]);
-    }
-    
-    private Color getSysIndexColor(EscherColorRef ecr) {
-        SysIndexSource sis = ecr.getSysIndexSource();
-        if (sis == null) {
-            int sysIdx = ecr.getSysIndex();
-            PresetColor pc = PresetColor.valueOfNativeId(sysIdx);
-            return (pc != null) ? pc.color : null;
-        }
-        
-        // TODO: check for recursive loops, when color getter also reference
-        // a different color type
-        switch (sis) {
-            case FILL_COLOR: {
-                return getFill().getForegroundColor();
-            }
-            case LINE_OR_FILL_COLOR: {
-                Color col = null;
-                if (this instanceof HSLFSimpleShape) {
-                    col = ((HSLFSimpleShape)this).getLineColor();
-                }
-                if (col == null) {
-                    col = getFill().getForegroundColor();
-                }
-                return col;
-            }
-            case LINE_COLOR: {
-                if (this instanceof HSLFSimpleShape) {
-                    return ((HSLFSimpleShape)this).getLineColor();
-                }
-                break;
-            }
-            case SHADOW_COLOR: {
-                if (this instanceof HSLFSimpleShape) {
-                    return ((HSLFSimpleShape)this).getShadowColor();
-                }
-                break;
-            }
-            case CURRENT_OR_LAST_COLOR: {
-                // TODO ... read from graphics context???
-                break;
-            }
-            case FILL_BACKGROUND_COLOR: {
-                return getFill().getBackgroundColor();
-            }
-            case LINE_BACKGROUND_COLOR: {
-                if (this instanceof HSLFSimpleShape) {
-                    return ((HSLFSimpleShape)this).getLineBackgroundColor();
-                }
-                break;
-            }
-            case FILL_OR_LINE_COLOR: {
-                Color col = getFill().getForegroundColor();
-                if (col == null && this instanceof HSLFSimpleShape) {
-                    col = ((HSLFSimpleShape)this).getLineColor();
-                }
-                return col;
-            }
-            default:
-                break;
-        }
-            
-        return null;
-    }
-        
-    private Color applySysIndexProcedure(EscherColorRef ecr, Color col) {
-        
-        final SysIndexProcedure sip = ecr.getSysIndexProcedure();
-        if (col == null || sip == null) {
-            return col;
-        }
-        
-        switch (sip) {
-            case DARKEN_COLOR: {
-                // see java.awt.Color#darken()
-                double FACTOR = (ecr.getRGB()[2])/255.;
-                int r = (int)Math.rint(col.getRed()*FACTOR);
-                int g = (int)Math.rint(col.getGreen()*FACTOR);
-                int b = (int)Math.rint(col.getBlue()*FACTOR);
-                return new Color(r,g,b);                
-            }
-            case LIGHTEN_COLOR: {
-                double FACTOR = (0xFF-ecr.getRGB()[2])/255.;
-                               
-                int r = col.getRed();
-                int g = col.getGreen();
-                int b = col.getBlue();
-                
-                r += Math.rint((0xFF-r)*FACTOR);
-                g += Math.rint((0xFF-g)*FACTOR);
-                b += Math.rint((0xFF-b)*FACTOR);
-                
-                return new Color(r,g,b);
-            }
-            default:
-                // TODO ...
-                break;
-        }
-        
-        return col;
-    }
-    
-    double getAlpha(short opacityProperty) {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty op = getEscherProperty(opt, opacityProperty);
-        int defaultOpacity = 0x00010000;
-        int opacity = (op == null) ? defaultOpacity : op.getPropertyValue();
-        return Units.fixedPointToDouble(opacity);
-    }
-    
-    Color toRGB(int val){
-        int a = (val >> 24) & 0xFF;
-        int b = (val >> 16) & 0xFF;
-        int g = (val >> 8) & 0xFF;
-        int r = (val >> 0) & 0xFF;
-
-        if(a == 0xFE){
-            // Color is an sRGB value specified by red, green, and blue fields.
-        } else if (a == 0xFF){
-            // Color is undefined.
-        } else {
-            // index in the color scheme
-            ColorSchemeAtom ca = getSheet().getColorScheme();
-            int schemeColor = ca.getColor(a);
-
-            r = (schemeColor >> 0) & 0xFF;
-            g = (schemeColor >> 8) & 0xFF;
-            b = (schemeColor >> 16) & 0xFF;
-        }
-        return new Color(r, g, b);
-    }
-
-    /**
-     * @return id for the shape.
-     */
-    public int getShapeId(){
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        return spRecord == null ? 0 : spRecord.getShapeId();
-    }
-
-    /**
-     * Sets shape ID
-     *
-     * @param id of the shape
-     */
-    public void setShapeId(int id){
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        if(spRecord != null) spRecord.setShapeId(id);
-    }
-
-    /**
-     * Fill properties of this shape
-     *
-     * @return fill properties of this shape
-     */
-    public HSLFFill getFill(){
-        if(_fill == null) {
-            _fill = new HSLFFill(this);
-        }
-        return _fill;
-    }
-
-    public FillStyle getFillStyle() {
-        return getFill().getFillStyle();
-    }
-
-    @Override
-    public void draw(Graphics2D graphics, Rectangle2D bounds){
-        DrawFactory.getInstance(graphics).drawShape(graphics, this, bounds);
-    }
-
-    public AbstractEscherOptRecord getEscherOptRecord() {
-        AbstractEscherOptRecord opt = getEscherChild(RecordTypes.EscherOPT);
-        if (opt == null) {
-            opt = getEscherChild(RecordTypes.EscherUserDefined);
-        }
-        return opt;
-    }
-    
-    public boolean getFlipHorizontal(){
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        return (spRecord.getFlags()& EscherSpRecord.FLAG_FLIPHORIZ) != 0;
-    }
-     
-    public void setFlipHorizontal(boolean flip) {
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        int flag = spRecord.getFlags() | EscherSpRecord.FLAG_FLIPHORIZ;
-        spRecord.setFlags(flag);
-    }
-
-    public boolean getFlipVertical(){
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        return (spRecord.getFlags()& EscherSpRecord.FLAG_FLIPVERT) != 0;
-    }
-    
-    public void setFlipVertical(boolean flip) {
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        int flag = spRecord.getFlags() | EscherSpRecord.FLAG_FLIPVERT;
-        spRecord.setFlags(flag);
-    }
-
-    public double getRotation(){
-        int rot = getEscherProperty(EscherProperties.TRANSFORM__ROTATION);
-        return Units.fixedPointToDouble(rot);
-    }
-    
-    public void setRotation(double theta){
-        int rot = Units.doubleToFixedPoint(theta % 360.0);
-        setEscherProperty(EscherProperties.TRANSFORM__ROTATION, rot);
-    }
-
-    public boolean isPlaceholder() {
-        return false;
-    }
-
-    /**
-     *  Find a record in the underlying EscherClientDataRecord
-     *
-     * @param recordType type of the record to search
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends Record> T getClientDataRecord(int recordType) {
-
-        List<? extends Record> records = getClientRecords();
-        if (records != null) for (Record r : records) {
-            if (r.getRecordType() == recordType){
-                return (T)r;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Search for EscherClientDataRecord, if found, convert its contents into an array of HSLF records
-     *
-     * @return an array of HSLF records contained in the shape's EscherClientDataRecord or <code>null</code>
-     */
-    protected List<? extends Record> getClientRecords() {
-        HSLFEscherClientDataRecord clientData = getClientData(false);
-        return (clientData == null) ? null : clientData.getHSLFChildRecords();
-    }
-
-    /**
-     * Create a new HSLF-specific EscherClientDataRecord
-     *
-     * @param create if true, create the missing record 
-     * @return the client record or null if it was missing and create wasn't activated
-     */
-    protected HSLFEscherClientDataRecord getClientData(boolean create) {
-        HSLFEscherClientDataRecord clientData = getEscherChild(HSLFEscherClientDataRecord.RECORD_ID);
-        if (clientData == null && create) {
-            clientData = new HSLFEscherClientDataRecord();
-            clientData.setOptions((short)15);
-            clientData.setRecordId(HSLFEscherClientDataRecord.RECORD_ID);
-            getSpContainer().addChildBefore(clientData, EscherTextboxRecord.RECORD_ID);
-        }
-        return clientData;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
deleted file mode 100644
index c09e2d6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-
-/**
- * Common interface for shape containers, e.g. sheets or groups of shapes
- */
-public interface HSLFShapeContainer extends ShapeContainer<HSLFShape,HSLFTextParagraph> {
-
-    @Override
-    HSLFAutoShape createAutoShape();
-
-    @Override
-    HSLFFreeformShape createFreeform();
-
-    @Override
-    HSLFTextBox createTextBox();
-
-    @Override
-    HSLFConnectorShape createConnector();
-
-    @Override
-    HSLFGroupShape createGroup();
-
-    @Override
-    HSLFPictureShape createPicture(PictureData pictureData);
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
deleted file mode 100644
index 4797ff5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.util.List;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherClientDataRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherPropertyFactory;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hslf.model.MovieShape;
-import org.apache.poi.hslf.model.OLEShape;
-import org.apache.poi.hslf.record.ExObjRefAtom;
-import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
-import org.apache.poi.hslf.record.InteractiveInfo;
-import org.apache.poi.hslf.record.InteractiveInfoAtom;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Create a <code>Shape</code> object depending on its type
- *
- * @author Yegor Kozlov
- */
-public final class HSLFShapeFactory {
-    // For logging
-    protected static final POILogger logger = POILogFactory.getLogger(HSLFShapeFactory.class);
-
-    /**
-     * Create a new shape from the data provided.
-     */
-    public static HSLFShape createShape(EscherContainerRecord spContainer, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        if (spContainer.getRecordId() == EscherContainerRecord.SPGR_CONTAINER){
-            return createShapeGroup(spContainer, parent);
-        }
-        return createSimpleShape(spContainer, parent);
-    }
-
-    public static HSLFGroupShape createShapeGroup(EscherContainerRecord spContainer, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        boolean isTable = false;
-        EscherContainerRecord ecr = (EscherContainerRecord)spContainer.getChild(0);
-        EscherRecord opt = HSLFShape.getEscherChild(ecr, RecordTypes.EscherUserDefined);
-
-        if (opt != null) {
-            EscherPropertyFactory f = new EscherPropertyFactory();
-            List<EscherProperty> props = f.createProperties( opt.serialize(), 8, opt.getInstance() );
-            for (EscherProperty ep : props) {
-                if (ep.getPropertyNumber() == EscherProperties.GROUPSHAPE__TABLEPROPERTIES
-                    && ep instanceof EscherSimpleProperty
-                    && (((EscherSimpleProperty)ep).getPropertyValue() & 1) == 1) {
-                    isTable = true;
-                    break;
-                }
-            }
-        }
-        
-        HSLFGroupShape group;
-        if (isTable) {
-            group = new HSLFTable(spContainer, parent);
-            
-        } else {
-            group = new HSLFGroupShape(spContainer, parent);
-        }
-        
-        return group;
-     }
-
-    public static HSLFShape createSimpleShape(EscherContainerRecord spContainer, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        HSLFShape shape = null;
-        EscherSpRecord spRecord = spContainer.getChildById(EscherSpRecord.RECORD_ID);
-
-        ShapeType type = ShapeType.forId(spRecord.getShapeType(), false);
-        switch (type){
-            case TEXT_BOX:
-                shape = new HSLFTextBox(spContainer, parent);
-                break;
-            case HOST_CONTROL:
-            case FRAME:
-                shape = createFrame(spContainer, parent);
-                break;
-            case LINE:
-                shape = new HSLFLine(spContainer, parent);
-                break;
-            case NOT_PRIMITIVE:
-                shape = createNonPrimitive(spContainer, parent);
-                break;
-            default:
-                if (parent instanceof HSLFTable) {
-                    EscherTextboxRecord etr = spContainer.getChildById(EscherTextboxRecord.RECORD_ID);
-                    if (etr == null) {
-                        logger.log(POILogger.WARN, "invalid ppt - add EscherTextboxRecord to cell");
-                        etr = new EscherTextboxRecord();
-                        etr.setRecordId(EscherTextboxRecord.RECORD_ID);
-                        etr.setOptions((short)15);
-                        spContainer.addChildRecord(etr);
-                    }
-                    shape = new HSLFTableCell(spContainer, (HSLFTable)parent);
-                } else {
-                    shape = new HSLFAutoShape(spContainer, parent);
-                }
-                break;
-        }
-        return shape;
-    }
-
-    private static HSLFShape createFrame(EscherContainerRecord spContainer, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        InteractiveInfo info = getClientDataRecord(spContainer, RecordTypes.InteractiveInfo.typeID);
-        if(info != null && info.getInteractiveInfoAtom() != null){
-            switch(info.getInteractiveInfoAtom().getAction()){
-                case InteractiveInfoAtom.ACTION_OLE:
-                    return new OLEShape(spContainer, parent);
-                case InteractiveInfoAtom.ACTION_MEDIA:
-                    return new MovieShape(spContainer, parent);
-                default:
-                    break;
-            }
-        }
-        
-        ExObjRefAtom oes = getClientDataRecord(spContainer, RecordTypes.ExObjRefAtom.typeID);
-        return (oes != null)
-            ? new OLEShape(spContainer, parent)
-            : new HSLFPictureShape(spContainer, parent);
-    }
-    
-    private static HSLFShape createNonPrimitive(EscherContainerRecord spContainer, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        AbstractEscherOptRecord opt = HSLFShape.getEscherChild(spContainer, EscherOptRecord.RECORD_ID);
-        EscherProperty prop = HSLFShape.getEscherProperty(opt, EscherProperties.GEOMETRY__VERTICES);
-        if(prop != null) {
-            return new HSLFFreeformShape(spContainer, parent);
-        }
-        
-        logger.log(POILogger.INFO, "Creating AutoShape for a NotPrimitive shape");
-        return new HSLFAutoShape(spContainer, parent);
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected static <T extends Record> T getClientDataRecord(EscherContainerRecord spContainer, int recordType) {
-        HSLFEscherClientDataRecord cldata = spContainer.getChildById(EscherClientDataRecord.RECORD_ID);
-        if (cldata != null) for (Record r : cldata.getHSLFChildRecords()) {
-            if (r.getRecordType() == recordType) {
-                return (T)r;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
deleted file mode 100644
index 7204276..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.record.CString;
-import org.apache.poi.hslf.record.ColorSchemeAtom;
-import org.apache.poi.hslf.record.OEPlaceholderAtom;
-import org.apache.poi.hslf.record.PPDrawing;
-import org.apache.poi.hslf.record.RecordContainer;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.RoundTripHFPlaceholder12;
-import org.apache.poi.hslf.record.SheetContainer;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.Drawable;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.Sheet;
-import org.apache.poi.util.Internal;
-
-/**
- * This class defines the common format of "Sheets" in a powerpoint
- * document. Such sheets could be Slides, Notes, Master etc
- *
- * @author Nick Burch
- * @author Yegor Kozlov
- */
-
-public abstract class HSLFSheet implements HSLFShapeContainer, Sheet<HSLFShape,HSLFTextParagraph> {
-    /**
-     * The <code>SlideShow</code> we belong to
-     */
-    private HSLFSlideShow _slideShow;
-
-    /**
-     * Sheet background
-     */
-    private HSLFBackground _background;
-
-    /**
-     * Record container that holds sheet data.
-     * For slides it is org.apache.poi.hslf.record.Slide,
-     * for notes it is org.apache.poi.hslf.record.Notes,
-     * for slide masters it is org.apache.poi.hslf.record.SlideMaster, etc.
-     */
-    private SheetContainer _container;
-
-    private int _sheetNo;
-
-    public HSLFSheet(SheetContainer container, int sheetNo) {
-        _container = container;
-        _sheetNo = sheetNo;
-    }
-
-    /**
-     * Returns an array of all the TextRuns in the sheet.
-     */
-    public abstract List<List<HSLFTextParagraph>> getTextParagraphs();
-
-    /**
-     * Returns the (internal, RefID based) sheet number, as used
-     * to in PersistPtr stuff.
-     */
-    public int _getSheetRefId() {
-        return _container.getSheetId();
-    }
-
-    /**
-     * Returns the (internal, SlideIdentifier based) sheet number, as used
-     * to reference this sheet from other records.
-     */
-    public int _getSheetNumber() {
-        return _sheetNo;
-    }
-
-    /**
-     * Fetch the PPDrawing from the underlying record
-     */
-    public PPDrawing getPPDrawing() {
-        return _container.getPPDrawing();
-    }
-
-    /**
-     * Fetch the SlideShow we're attached to
-     */
-    public HSLFSlideShow getSlideShow() {
-        return _slideShow;
-    }
-
-    /**
-     * Return record container for this sheet
-     */
-    public SheetContainer getSheetContainer() {
-        return _container;
-    }
-
-    /**
-     * Set the SlideShow we're attached to.
-     * Also passes it on to our child text paragraphs
-     */
-    @Internal
-    protected void setSlideShow(HSLFSlideShow ss) {
-        if (_slideShow != null) {
-            throw new HSLFException("Can't change existing slideshow reference");
-        }
-        
-        _slideShow = ss;
-        List<List<HSLFTextParagraph>> trs = getTextParagraphs();
-        if (trs == null) return;
-        for (List<HSLFTextParagraph> ltp : trs) {
-            HSLFTextParagraph.supplySheet(ltp, this);
-            HSLFTextParagraph.applyHyperlinks(ltp);
-        }
-    }
-
-
-    /**
-     * Returns all shapes contained in this Sheet
-     *
-     * @return all shapes contained in this Sheet (Slide or Notes)
-     */
-    @Override
-    public List<HSLFShape> getShapes() {
-        PPDrawing ppdrawing = getPPDrawing();
-
-        EscherContainerRecord dg = ppdrawing.getDgContainer();
-        EscherContainerRecord spgr = null;
-
-        for (Iterator<EscherRecord> it = dg.getChildIterator(); it.hasNext();) {
-            EscherRecord rec = it.next();
-            if (rec.getRecordId() == EscherContainerRecord.SPGR_CONTAINER) {
-                spgr = (EscherContainerRecord) rec;
-                break;
-            }
-        }
-        if (spgr == null) {
-            throw new IllegalStateException("spgr not found");
-        }
-
-        List<HSLFShape> shapeList = new ArrayList<HSLFShape>();
-        Iterator<EscherRecord> it = spgr.getChildIterator();
-        if (it.hasNext()) {
-            // skip first item
-            it.next();
-        }
-        for (; it.hasNext();) {
-            EscherContainerRecord sp = (EscherContainerRecord) it.next();
-            HSLFShape sh = HSLFShapeFactory.createShape(sp, null);
-            sh.setSheet(this);
-            
-            if (sh instanceof HSLFSimpleShape) {
-                HSLFHyperlink link = HSLFHyperlink.find(sh);
-                if (link != null) {
-                    ((HSLFSimpleShape)sh).setHyperlink(link);
-                }
-            }
-            
-            shapeList.add(sh);
-        }
-
-        return shapeList;
-    }
-
-    /**
-     * Add a new Shape to this Slide
-     *
-     * @param shape - the Shape to add
-     */
-    public void addShape(HSLFShape shape) {
-        PPDrawing ppdrawing = getPPDrawing();
-
-        EscherContainerRecord dgContainer = ppdrawing.getDgContainer();
-        EscherContainerRecord spgr = (EscherContainerRecord) HSLFShape.getEscherChild(dgContainer, EscherContainerRecord.SPGR_CONTAINER);
-        spgr.addChildRecord(shape.getSpContainer());
-
-        shape.setSheet(this);
-        shape.setShapeId(allocateShapeId());
-        shape.afterInsert(this);
-    }
-
-    /**
-     * Allocates new shape id for the new drawing group id.
-     *
-     * @return a new shape id.
-     */
-    public int allocateShapeId()
-    {
-        EscherDggRecord dgg = _slideShow.getDocumentRecord().getPPDrawingGroup().getEscherDggRecord();
-        EscherDgRecord dg = _container.getPPDrawing().getEscherDgRecord();
-
-        dgg.setNumShapesSaved( dgg.getNumShapesSaved() + 1 );
-
-        // Add to existing cluster if space available
-        for (int i = 0; i < dgg.getFileIdClusters().length; i++)
-        {
-            EscherDggRecord.FileIdCluster c = dgg.getFileIdClusters()[i];
-            if (c.getDrawingGroupId() == dg.getDrawingGroupId() && c.getNumShapeIdsUsed() != 1024)
-            {
-                int result = c.getNumShapeIdsUsed() + (1024 * (i+1));
-                c.incrementShapeId();
-                dg.setNumShapes( dg.getNumShapes() + 1 );
-                dg.setLastMSOSPID( result );
-                if (result >= dgg.getShapeIdMax())
-                    dgg.setShapeIdMax( result + 1 );
-                return result;
-            }
-        }
-
-        // Create new cluster
-        dgg.addCluster( dg.getDrawingGroupId(), 0, false );
-        dgg.getFileIdClusters()[dgg.getFileIdClusters().length-1].incrementShapeId();
-        dg.setNumShapes( dg.getNumShapes() + 1 );
-        int result = (1024 * dgg.getFileIdClusters().length);
-        dg.setLastMSOSPID( result );
-        if (result >= dgg.getShapeIdMax())
-            dgg.setShapeIdMax( result + 1 );
-        return result;
-    }
-
-    /**
-     * Removes the specified shape from this sheet.
-     *
-     * @param shape shape to be removed from this sheet, if present.
-     * @return <tt>true</tt> if the shape was deleted.
-     */
-    public boolean removeShape(HSLFShape shape) {
-        PPDrawing ppdrawing = getPPDrawing();
-
-        EscherContainerRecord dg = ppdrawing.getDgContainer();
-        EscherContainerRecord spgr = dg.getChildById(EscherContainerRecord.SPGR_CONTAINER);
-        if(spgr == null) {
-            return false;
-        }
-
-        List<EscherRecord> lst = spgr.getChildRecords();
-        boolean result = lst.remove(shape.getSpContainer());
-        spgr.setChildRecords(lst);
-        return result;
-    }
-
-    /**
-     * Called by SlideShow ater a new sheet is created
-     */
-    public void onCreate(){
-
-    }
-
-    /**
-     * Return the master sheet .
-     */
-    public abstract HSLFMasterSheet getMasterSheet();
-
-    /**
-     * Color scheme for this sheet.
-     */
-    public ColorSchemeAtom getColorScheme() {
-        return _container.getColorScheme();
-    }
-
-    /**
-     * Returns the background shape for this sheet.
-     *
-     * @return the background shape for this sheet.
-     */
-    public HSLFBackground getBackground() {
-        if (_background == null) {
-            PPDrawing ppdrawing = getPPDrawing();
-
-            EscherContainerRecord dg = ppdrawing.getDgContainer();
-            EscherContainerRecord spContainer = dg.getChildById(EscherContainerRecord.SP_CONTAINER);
-            _background = new HSLFBackground(spContainer, null);
-            _background.setSheet(this);
-        }
-        return _background;
-    }
-
-    @Override
-    public void draw(Graphics2D graphics) {
-        DrawFactory drawFact = DrawFactory.getInstance(graphics);
-        Drawable draw = drawFact.getDrawable(this);
-        draw.draw(graphics);
-    }
-
-    /**
-     * Subclasses should call this method and update the array of text runs
-     * when a text shape is added
-     *
-     * @param shape
-     */
-    protected void onAddTextShape(HSLFTextShape shape) {
-    }
-
-    /**
-     * Return placeholder by text type
-     *
-     * @param type  type of text, See {@link org.apache.poi.hslf.record.TextHeaderAtom}
-     * @return  <code>TextShape</code> or <code>null</code>
-     */
-    public HSLFTextShape getPlaceholderByTextType(int type){
-        for (HSLFShape shape : getShapes()) {
-            if(shape instanceof HSLFTextShape){
-                HSLFTextShape tx = (HSLFTextShape)shape;
-                if (tx.getRunType() == type) {
-                    return tx;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Search text placeholer by its type
-     *
-     * @param type  type of placeholder to search. See {@link org.apache.poi.hslf.record.OEPlaceholderAtom}
-     * @return  <code>TextShape</code> or <code>null</code>
-     */
-    public HSLFTextShape getPlaceholder(int type){
-        for (HSLFShape shape : getShapes()) {
-            if(shape instanceof HSLFTextShape){
-                HSLFTextShape tx = (HSLFTextShape)shape;
-                int placeholderId = 0;
-                OEPlaceholderAtom oep = tx.getPlaceholderAtom();
-                if(oep != null) {
-                    placeholderId = oep.getPlaceholderId();
-                } else {
-                    //special case for files saved in Office 2007
-                    RoundTripHFPlaceholder12 hldr = tx.getClientDataRecord(RecordTypes.RoundTripHFPlaceholder12.typeID);
-                    if(hldr != null) placeholderId = hldr.getPlaceholderId();
-                }
-                if(placeholderId == type){
-                    return tx;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return programmable tag associated with this sheet, e.g. <code>___PPT12</code>.
-     *
-     * @return programmable tag associated with this sheet.
-     */
-    public String getProgrammableTag(){
-        String tag = null;
-        RecordContainer progTags = (RecordContainer)
-                getSheetContainer().findFirstOfType(
-                            RecordTypes.ProgTags.typeID
-        );
-        if(progTags != null) {
-            RecordContainer progBinaryTag = (RecordContainer)
-                progTags.findFirstOfType(
-                        RecordTypes.ProgBinaryTag.typeID
-            );
-            if(progBinaryTag != null) {
-                CString binaryTag = (CString)
-                    progBinaryTag.findFirstOfType(
-                            RecordTypes.CString.typeID
-                );
-                if(binaryTag != null) tag = binaryTag.getText();
-            }
-        }
-
-        return tag;
-
-    }
-
-    public Iterator<HSLFShape> iterator() {
-        return getShapes().iterator();
-    }
-
-
-    /**
-     * @return whether shapes on the master sheet should be shown. By default master graphics is turned off.
-     * Sheets that support the notion of master (slide, slideLayout) should override it and
-     * check this setting
-     */
-    public boolean getFollowMasterGraphics() {
-        return false;
-    }
-
-
-    @Override
-    public HSLFTextBox createTextBox() {
-        HSLFTextBox s = new HSLFTextBox();
-        s.setHorizontalCentered(true);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFAutoShape createAutoShape() {
-        HSLFAutoShape s = new HSLFAutoShape(ShapeType.RECT);
-        s.setHorizontalCentered(true);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFFreeformShape createFreeform() {
-        HSLFFreeformShape s = new HSLFFreeformShape();
-        s.setHorizontalCentered(true);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFConnectorShape createConnector() {
-        HSLFConnectorShape s = new HSLFConnectorShape();
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFGroupShape createGroup() {
-        HSLFGroupShape s = new HSLFGroupShape();
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFPictureShape createPicture(PictureData pictureData) {
-        if (!(pictureData instanceof HSLFPictureData)) {
-            throw new IllegalArgumentException("pictureData needs to be of type HSLFPictureData");
-        }
-        HSLFPictureShape s = new HSLFPictureShape((HSLFPictureData)pictureData);
-        s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
-        addShape(s);
-        return s;
-    }
-
-    @Override
-    public HSLFTable createTable(int numRows, int numCols) {
-        if (numRows < 1 || numCols < 1) {
-            throw new IllegalArgumentException("numRows and numCols must be greater than 0");
-        }
-        HSLFTable s = new HSLFTable(numRows,numCols);
-        // anchor is set in constructor based on numRows/numCols
-        addShape(s);
-        return s;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
deleted file mode 100644
index 8ca4678..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Color;
-import java.util.List;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherChildAnchorRecord;
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
-import org.apache.poi.hslf.record.OEPlaceholderAtom;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RoundTripHFPlaceholder12;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.draw.geom.CustomGeometry;
-import org.apache.poi.sl.draw.geom.Guide;
-import org.apache.poi.sl.draw.geom.PresetGeometries;
-import org.apache.poi.sl.usermodel.LineDecoration;
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape;
-import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.Shadow;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.SimpleShape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCap;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- *  An abstract simple (non-group) shape.
- *  This is the parent class for all primitive shapes like Line, Rectangle, etc.
- *
- *  @author Yegor Kozlov
- */
-public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape<HSLFShape,HSLFTextParagraph> {
-
-    public final static double DEFAULT_LINE_WIDTH = 0.75;
-
-    /**
-     * Hyperlink
-     */
-    protected HSLFHyperlink _hyperlink;
-    
-    /**
-     * Create a SimpleShape object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord    <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent    the parent of the shape
-     */
-    protected HSLFSimpleShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    /**
-     * Create a new Shape
-     *
-     * @param isChild   <code>true</code> if the Line is inside a group, <code>false</code> otherwise
-     * @return the record container which holds this shape
-     */
-    protected EscherContainerRecord createSpContainer(boolean isChild) {
-        _escherContainer = new EscherContainerRecord();
-        _escherContainer.setRecordId( EscherContainerRecord.SP_CONTAINER );
-        _escherContainer.setOptions((short)15);
-
-        EscherSpRecord sp = new EscherSpRecord();
-        int flags = EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HASSHAPETYPE;
-        if (isChild) flags |= EscherSpRecord.FLAG_CHILD;
-        sp.setFlags(flags);
-        _escherContainer.addChildRecord(sp);
-
-        AbstractEscherOptRecord opt = new EscherOptRecord();
-        opt.setRecordId(EscherOptRecord.RECORD_ID);
-        _escherContainer.addChildRecord(opt);
-
-        EscherRecord anchor;
-        if(isChild) {
-            anchor = new EscherChildAnchorRecord();
-        } else {
-            anchor = new EscherClientAnchorRecord();
-
-            //hack. internal variable EscherClientAnchorRecord.shortRecord can be
-            //initialized only in fillFields(). We need to set shortRecord=false;
-            byte[] header = new byte[16];
-            LittleEndian.putUShort(header, 0, 0);
-            LittleEndian.putUShort(header, 2, 0);
-            LittleEndian.putInt(header, 4, 8);
-            anchor.fillFields(header, 0, null);
-        }
-        _escherContainer.addChildRecord(anchor);
-
-        return _escherContainer;
-    }
-
-    /**
-     *  Returns width of the line in in points
-     */
-    public double getLineWidth(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINEWIDTH);
-        double width = (prop == null) ? DEFAULT_LINE_WIDTH : Units.toPoints(prop.getPropertyValue());
-        return width;
-    }
-
-    /**
-     *  Sets the width of line in in points
-     *  @param width  the width of line in in points
-     */
-    public void setLineWidth(double width){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINEWIDTH, Units.toEMU(width));
-    }
-
-    /**
-     * Sets the color of line
-     *
-     * @param color new color of the line
-     */
-    public void setLineColor(Color color){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        if (color == null) {
-            setEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x80000);
-        } else {
-            int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 0).getRGB();
-            setEscherProperty(opt, EscherProperties.LINESTYLE__COLOR, rgb);
-            setEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x180018);
-        }
-    }
-
-    /**
-     * @return color of the line. If color is not set returns {@code null}
-     */
-    public Color getLineColor(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-
-        EscherSimpleProperty p = getEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH);
-        if(p != null && (p.getPropertyValue() & 0x8) == 0) return null;
-
-        Color clr = getColor(EscherProperties.LINESTYLE__COLOR, EscherProperties.LINESTYLE__OPACITY, -1);
-        return clr == null ? null : clr;
-    }
-
-    /**
-     * @return background color of the line. If color is not set returns {@code null}
-     */
-    public Color getLineBackgroundColor(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-
-        EscherSimpleProperty p = getEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH);
-        if(p != null && (p.getPropertyValue() & 0x8) == 0) return null;
-
-        Color clr = getColor(EscherProperties.LINESTYLE__BACKCOLOR, EscherProperties.LINESTYLE__OPACITY, -1);
-        return clr == null ? null : clr;
-    }
-
-    /**
-     * Sets the background color of line
-     *
-     * @param color new background color of the line
-     */
-    public void setLineBackgroundColor(Color color){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        if (color == null) {
-            setEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x80000);
-            opt.removeEscherProperty(EscherProperties.LINESTYLE__BACKCOLOR);
-        } else {
-            int rgb = new Color(color.getBlue(), color.getGreen(), color.getRed(), 0).getRGB();
-            setEscherProperty(opt, EscherProperties.LINESTYLE__BACKCOLOR, rgb);
-            setEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x180018);
-        }
-    }
-
-    /**
-     * Gets line cap.
-     *
-     * @return cap of the line.
-     */
-    public LineCap getLineCap(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDCAPSTYLE);
-        return (prop == null) ? LineCap.FLAT : LineCap.fromNativeId(prop.getPropertyValue());
-    }
-
-    /**
-     * Sets line cap.
-     *
-     * @param pen new style of the line.
-     */
-    public void setLineCap(LineCap pen){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDCAPSTYLE, pen == LineCap.FLAT ? -1 : pen.nativeId);
-    }
-
-    /**
-     * Gets line dashing.
-     *
-     * @return dashing of the line.
-     */
-    public LineDash getLineDash(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINEDASHING);
-        return (prop == null) ? LineDash.SOLID : LineDash.fromNativeId(prop.getPropertyValue());
-    }
-
-    /**
-     * Sets line dashing.
-     *
-     * @param pen new style of the line.
-     */
-    public void setLineDash(LineDash pen){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINEDASHING, pen == LineDash.SOLID ? -1 : pen.nativeId);
-    }
-
-    /**
-     * Gets the line compound style
-     *
-     * @return the compound style of the line.
-     */
-    public LineCompound getLineCompound() {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINESTYLE);
-        return (prop == null) ? LineCompound.SINGLE : LineCompound.fromNativeId(prop.getPropertyValue());
-    }
-
-    /**
-     * Sets the line compound style
-     *
-     * @param style new compound style of the line.
-     */
-    public void setLineCompound(LineCompound style){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINESTYLE, style == LineCompound.SINGLE ? -1 : style.nativeId);
-    }
-
-    /**
-     * Returns line style. One of the constants defined in this class.
-     *
-     * @return style of the line.
-     */
-    public StrokeStyle getStrokeStyle(){
-        return new StrokeStyle() {
-            public PaintStyle getPaint() {
-                return DrawPaint.createSolidPaint(HSLFSimpleShape.this.getLineColor());
-            }
-
-            public LineCap getLineCap() {
-                return null;
-            }
-
-            public LineDash getLineDash() {
-                return HSLFSimpleShape.this.getLineDash();
-            }
-
-            public LineCompound getLineCompound() {
-                return HSLFSimpleShape.this.getLineCompound();
-            }
-
-            public double getLineWidth() {
-                return HSLFSimpleShape.this.getLineWidth();
-            }
-
-        };
-    }
-
-    @Override
-    public Color getFillColor() {
-        return getFill().getForegroundColor();
-    }
-
-    @Override
-    public void setFillColor(Color color) {
-        getFill().setForegroundColor(color);
-    }
-
-    public Guide getAdjustValue(String name) {
-        if (name == null || !name.matches("adj([1-9]|10)?")) {
-            logger.log(POILogger.INFO, "Adjust value '"+name+"' not supported. Using default value.");
-            return null;
-        }
-
-        name = name.replace("adj", "");
-        if ("".equals(name)) name = "1";
-
-        short escherProp;
-        switch (Integer.parseInt(name)) {
-            case 1: escherProp = EscherProperties.GEOMETRY__ADJUSTVALUE; break;
-            case 2: escherProp = EscherProperties.GEOMETRY__ADJUST2VALUE; break;
-            case 3: escherProp = EscherProperties.GEOMETRY__ADJUST3VALUE; break;
-            case 4: escherProp = EscherProperties.GEOMETRY__ADJUST4VALUE; break;
-            case 5: escherProp = EscherProperties.GEOMETRY__ADJUST5VALUE; break;
-            case 6: escherProp = EscherProperties.GEOMETRY__ADJUST6VALUE; break;
-            case 7: escherProp = EscherProperties.GEOMETRY__ADJUST7VALUE; break;
-            case 8: escherProp = EscherProperties.GEOMETRY__ADJUST8VALUE; break;
-            case 9: escherProp = EscherProperties.GEOMETRY__ADJUST9VALUE; break;
-            case 10: escherProp = EscherProperties.GEOMETRY__ADJUST10VALUE; break;
-            default: throw new RuntimeException();
-        }
-
-        // TODO: the adjust values need to be corrected somehow depending on the shape width/height
-        // see https://social.msdn.microsoft.com/Forums/en-US/3f69ebb3-62a0-4fdd-b367-64790dfb2491/presetshapedefinitionsxml-does-not-specify-width-and-height-form-some-autoshapes?forum=os_binaryfile
-        
-        // the adjust value can be format dependent, e.g. hexagon has different values,
-        // other shape types have the same adjust values in OOXML and native
-        int adjval = getEscherProperty(escherProp, -1);
-
-        return (adjval == -1) ? null : new Guide(name, "val "+adjval);
-    }
-
-    public CustomGeometry getGeometry() {
-        PresetGeometries dict = PresetGeometries.getInstance();
-        ShapeType st = getShapeType();
-        String name = (st != null) ? st.getOoxmlName() : null;
-        CustomGeometry geom = dict.get(name);
-        if (geom == null) {
-            if (name == null) {
-                name = (st != null) ? st.toString() : "<unknown>";
-            }
-            logger.log(POILogger.WARN, "No preset shape definition for shapeType: "+name);
-        }
-
-        return geom;
-    }
-
-
-    public double getShadowAngle() {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.SHADOWSTYLE__OFFSETX);
-        int offX = (prop == null) ? 0 : prop.getPropertyValue();
-        prop = getEscherProperty(opt, EscherProperties.SHADOWSTYLE__OFFSETY);
-        int offY = (prop == null) ? 0 : prop.getPropertyValue();
-        return Math.toDegrees(Math.atan2(offY, offX));
-    }
-
-    public double getShadowDistance() {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.SHADOWSTYLE__OFFSETX);
-        int offX = (prop == null) ? 0 : prop.getPropertyValue();
-        prop = getEscherProperty(opt, EscherProperties.SHADOWSTYLE__OFFSETY);
-        int offY = (prop == null) ? 0 : prop.getPropertyValue();
-        return Units.toPoints((long)Math.hypot(offX, offY));
-    }
-
-    /**
-     * @return color of the line. If color is not set returns <code>java.awt.Color.black</code>
-     */
-    public Color getShadowColor(){
-        Color clr = getColor(EscherProperties.SHADOWSTYLE__COLOR, EscherProperties.SHADOWSTYLE__OPACITY, -1);
-        return clr == null ? Color.black : clr;
-    }
-
-    public Shadow<HSLFShape,HSLFTextParagraph> getShadow() {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        if (opt == null) return null;
-        EscherProperty shadowType = opt.lookup(EscherProperties.SHADOWSTYLE__TYPE);
-        if (shadowType == null) return null;
-
-        return new Shadow<HSLFShape,HSLFTextParagraph>(){
-            public SimpleShape<HSLFShape,HSLFTextParagraph> getShadowParent() {
-                return HSLFSimpleShape.this;
-            }
-
-            public double getDistance() {
-                return getShadowDistance();
-            }
-
-            public double getAngle() {
-                return getShadowAngle();
-            }
-
-            public double getBlur() {
-                // TODO Auto-generated method stub
-                return 0;
-            }
-
-            public SolidPaint getFillStyle() {
-                return DrawPaint.createSolidPaint(getShadowColor());
-            }
-
-        };
-    }
-
-    public DecorationShape getLineHeadDecoration(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINESTARTARROWHEAD);
-        return (prop == null) ? null : DecorationShape.fromNativeId(prop.getPropertyValue());
-    }
-
-    public void setLineHeadDecoration(DecorationShape decoShape){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINESTARTARROWHEAD, decoShape == null ? -1 : decoShape.nativeId);
-    }
-
-    public DecorationSize getLineHeadWidth(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINESTARTARROWWIDTH);
-        return (prop == null) ? null : DecorationSize.fromNativeId(prop.getPropertyValue());
-    }
-
-    public void setLineHeadWidth(DecorationSize decoSize){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINESTARTARROWWIDTH, decoSize == null ? -1 : decoSize.nativeId);
-    }
-
-    public DecorationSize getLineHeadLength(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINESTARTARROWLENGTH);
-        return (prop == null) ? null : DecorationSize.fromNativeId(prop.getPropertyValue());
-    }
-
-    public void setLineHeadLength(DecorationSize decoSize){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINESTARTARROWLENGTH, decoSize == null ? -1 : decoSize.nativeId);
-    }
-
-    public DecorationShape getLineTailDecoration(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDARROWHEAD);
-        return (prop == null) ? null : DecorationShape.fromNativeId(prop.getPropertyValue());
-    }
-
-    public void setLineTailDecoration(DecorationShape decoShape){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDARROWHEAD, decoShape == null ? -1 : decoShape.nativeId);
-    }
-
-    public DecorationSize getLineTailWidth(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDARROWWIDTH);
-        return (prop == null) ? null : DecorationSize.fromNativeId(prop.getPropertyValue());
-    }
-
-    public void setLineTailWidth(DecorationSize decoSize){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDARROWWIDTH, decoSize == null ? -1 : decoSize.nativeId);
-    }
-
-    public DecorationSize getLineTailLength(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDARROWLENGTH);
-        return (prop == null) ? null : DecorationSize.fromNativeId(prop.getPropertyValue());
-    }
-
-    public void setLineTailLength(DecorationSize decoSize){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.LINESTYLE__LINEENDARROWLENGTH, decoSize == null ? -1 : decoSize.nativeId);
-    }
-
-
-
-    public LineDecoration getLineDecoration() {
-        return new LineDecoration() {
-
-            public DecorationShape getHeadShape() {
-                return HSLFSimpleShape.this.getLineHeadDecoration();
-            }
-
-            public DecorationSize getHeadWidth() {
-                return HSLFSimpleShape.this.getLineHeadWidth();
-            }
-
-            public DecorationSize getHeadLength() {
-                return HSLFSimpleShape.this.getLineHeadLength();
-            }
-
-            public DecorationShape getTailShape() {
-                return HSLFSimpleShape.this.getLineTailDecoration();
-            }
-
-            public DecorationSize getTailWidth() {
-                return HSLFSimpleShape.this.getLineTailWidth();
-            }
-
-            public DecorationSize getTailLength() {
-                return HSLFSimpleShape.this.getLineTailLength();
-            }
-        };
-    }
-
-    @Override
-    public Placeholder getPlaceholder() {
-        List<? extends Record> clRecords = getClientRecords();
-        if (clRecords == null) {
-            return null;
-        }
-        for (Record r : clRecords) {
-            if (r instanceof OEPlaceholderAtom) {
-                OEPlaceholderAtom oep = (OEPlaceholderAtom)r;
-                return Placeholder.lookupNative(oep.getPlaceholderId());
-            } else if (r instanceof RoundTripHFPlaceholder12) {
-                RoundTripHFPlaceholder12 rtp = (RoundTripHFPlaceholder12)r;
-                return Placeholder.lookupNative(rtp.getPlaceholderId());
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public void setPlaceholder(Placeholder placeholder) {
-        EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
-        int flags = spRecord.getFlags();
-        if (placeholder == null) {
-            flags ^= EscherSpRecord.FLAG_HAVEMASTER;
-        } else {
-            flags |= EscherSpRecord.FLAG_HAVEANCHOR | EscherSpRecord.FLAG_HAVEMASTER;
-        }
-        spRecord.setFlags(flags);
-
-        // Placeholders can't be grouped
-        setEscherProperty(EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, (placeholder == null ? -1 : 262144));
-
-        HSLFEscherClientDataRecord clientData = getClientData(false);
-        if (placeholder == null) {
-            if (clientData != null) {
-                clientData.removeChild(OEPlaceholderAtom.class);
-                clientData.removeChild(RoundTripHFPlaceholder12.class);
-                // remove client data if the placeholder was the only child to be carried
-                if (clientData.getChildRecords().isEmpty()) {
-                    getSpContainer().removeChildRecord(clientData);
-                }
-            }
-            return;
-        }
-
-        if (clientData == null) {
-            clientData = getClientData(true);
-        }
-
-        // OEPlaceholderAtom tells powerpoint that this shape is a placeholder
-        OEPlaceholderAtom oep = null;
-        RoundTripHFPlaceholder12 rtp = null;
-        for (Record r : clientData.getHSLFChildRecords()) {
-            if (r instanceof OEPlaceholderAtom) {
-                oep = (OEPlaceholderAtom)r;
-                break;
-            }
-            if (r instanceof RoundTripHFPlaceholder12) {
-                rtp = (RoundTripHFPlaceholder12)r;
-                break;
-            }
-        }
-
-        /**
-         * Extract from MSDN:
-         *
-         * There is a special case when the placeholder does not have a position in the layout.
-         * This occurs when the user has moved the placeholder from its original position.
-         * In this case the placeholder ID is -1.
-         */
-        byte phId;
-        HSLFSheet sheet = getSheet();
-        // TODO: implement/switch NotesMaster
-        if (sheet instanceof HSLFSlideMaster) {
-            phId = (byte)placeholder.nativeSlideMasterId;
-        } else if (sheet instanceof HSLFNotes) {
-            phId = (byte)placeholder.nativeNotesId;
-        } else {
-            phId = (byte)placeholder.nativeSlideId;
-        }
-
-        if (phId == -2) {
-            throw new HSLFException("Placeholder "+placeholder.name()+" not supported for this sheet type ("+sheet.getClass()+")");
-        }
-
-        switch (placeholder) {
-            case HEADER:
-            case FOOTER:
-                if (rtp == null) {
-                    rtp = new RoundTripHFPlaceholder12();
-                    rtp.setPlaceholderId(phId);
-                    clientData.addChild(rtp);
-                }
-                if (oep != null) {
-                    clientData.removeChild(OEPlaceholderAtom.class);
-                }
-                break;
-            default:
-                if (rtp != null) {
-                    clientData.removeChild(RoundTripHFPlaceholder12.class);
-                }
-                if (oep == null) {
-                    oep = new OEPlaceholderAtom();
-                    oep.setPlaceholderSize((byte)OEPlaceholderAtom.PLACEHOLDER_FULLSIZE);
-                    // TODO: placement id only "SHOULD" be unique ... check other placeholders on sheet for unique id
-                    oep.setPlacementId(-1);
-                    oep.setPlaceholderId(phId);
-                    clientData.addChild(oep);
-                }
-                break;
-        }
-    }
-
-
-    @Override
-    public void setStrokeStyle(Object... styles) {
-        if (styles.length == 0) {
-            // remove stroke
-            setLineColor(null);
-            return;
-        }
-
-        // TODO: handle PaintStyle
-        for (Object st : styles) {
-            if (st instanceof Number) {
-                setLineWidth(((Number)st).doubleValue());
-            } else if (st instanceof LineCap) {
-                setLineCap((LineCap)st);
-            } else if (st instanceof LineDash) {
-                setLineDash((LineDash)st);
-            } else if (st instanceof LineCompound) {
-                setLineCompound((LineCompound)st);
-            } else if (st instanceof Color) {
-                setLineColor((Color)st);
-            }
-        }
-    }
-
-    @Override
-    public HSLFHyperlink getHyperlink(){
-        return _hyperlink;
-    }
-    
-    @Override
-    public HSLFHyperlink createHyperlink() {
-        if (_hyperlink == null) {
-            _hyperlink = HSLFHyperlink.createHyperlink(this);
-        }
-        return _hyperlink;
-    }
-    
-    /**
-     * Sets the hyperlink - used when the document is parsed
-     *
-     * @param link the hyperlink
-     */
-    protected void setHyperlink(HSLFHyperlink link) {
-        _hyperlink = link;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
deleted file mode 100644
index d3a6132..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Graphics2D;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hslf.model.Comment;
-import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.record.ColorSchemeAtom;
-import org.apache.poi.hslf.record.Comment2000;
-import org.apache.poi.hslf.record.EscherTextboxWrapper;
-import org.apache.poi.hslf.record.HeadersFootersContainer;
-import org.apache.poi.hslf.record.RecordContainer;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.SSSlideInfoAtom;
-import org.apache.poi.hslf.record.SlideAtom;
-import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet;
-import org.apache.poi.hslf.record.StyleTextProp9Atom;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.Drawable;
-import org.apache.poi.sl.usermodel.Notes;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.Slide;
-
-/**
- * This class represents a slide in a PowerPoint Document. It allows
- *  access to the text within, and the layout. For now, it only does
- *  the text side of things though
- *
- * @author Nick Burch
- * @author Yegor Kozlov
- */
-
-public final class HSLFSlide extends HSLFSheet implements Slide<HSLFShape,HSLFTextParagraph> {
-	private int _slideNo;
-	private SlideAtomsSet _atomSet;
-	private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>();
-	private HSLFNotes _notes; // usermodel needs to set this
-
-	/**
-	 * Constructs a Slide from the Slide record, and the SlideAtomsSet
-	 *  containing the text.
-	 * Initializes TextRuns, to provide easier access to the text
-	 *
-	 * @param slide the Slide record we're based on
-	 * @param notes the Notes sheet attached to us
-	 * @param atomSet the SlideAtomsSet to get the text from
-	 */
-	public HSLFSlide(org.apache.poi.hslf.record.Slide slide, HSLFNotes notes, SlideAtomsSet atomSet, int slideIdentifier, int slideNumber) {
-        super(slide, slideIdentifier);
-
-		_notes = notes;
-		_atomSet = atomSet;
-		_slideNo = slideNumber;
-
-		// For the text coming in from the SlideAtomsSet:
-		// Build up TextRuns from pairs of TextHeaderAtom and
-		//  one of TextBytesAtom or TextCharsAtom
-		if (_atomSet != null && _atomSet.getSlideRecords().length > 0) {
-		    // Grab text from SlideListWithTexts entries
-		    _paragraphs.addAll(HSLFTextParagraph.findTextParagraphs(_atomSet.getSlideRecords()));
-	        if (_paragraphs.isEmpty()) {
-	            throw new RuntimeException("No text records found for slide");
-	        }
-		} else {
-			// No text on the slide, must just be pictures
-		}
-
-		// Grab text from slide's PPDrawing
-		for (List<HSLFTextParagraph> l : HSLFTextParagraph.findTextParagraphs(getPPDrawing(), this)) {
-		    if (!_paragraphs.contains(l)) _paragraphs.add(l);
-		}
-	}
-
-	/**
-	* Create a new Slide instance
-	* @param sheetNumber The internal number of the sheet, as used by PersistPtrHolder
-	* @param slideNumber The user facing number of the sheet
-	*/
-	public HSLFSlide(int sheetNumber, int sheetRefId, int slideNumber){
-		super(new org.apache.poi.hslf.record.Slide(), sheetNumber);
-		_slideNo = slideNumber;
-        getSheetContainer().setSheetId(sheetRefId);
-	}
-
-    /**
-     * Returns the Notes Sheet for this slide, or null if there isn't one
-     */
-    @Override
-    public HSLFNotes getNotes() {
-        return _notes;
-    }
-
-	/**
-	 * Sets the Notes that are associated with this. Updates the
-	 *  references in the records to point to the new ID
-	 */
-	@Override
-	public void setNotes(Notes<HSLFShape,HSLFTextParagraph> notes) {
-        if (notes != null && !(notes instanceof HSLFNotes)) {
-            throw new IllegalArgumentException("notes needs to be of type HSLFNotes");
-        }
-		_notes = (HSLFNotes)notes;
-
-		// Update the Slide Atom's ID of where to point to
-		SlideAtom sa = getSlideRecord().getSlideAtom();
-
-		if(_notes == null) {
-			// Set to 0
-			sa.setNotesID(0);
-		} else {
-			// Set to the value from the notes' sheet id
-			sa.setNotesID(_notes._getSheetNumber());
-		}
-	}
-
-	/**
-	* Changes the Slide's (external facing) page number.
-	* @see org.apache.poi.hslf.usermodel.HSLFSlideShow#reorderSlide(int, int)
-	*/
-	public void setSlideNumber(int newSlideNumber) {
-		_slideNo = newSlideNumber;
-	}
-
-    /**
-     * Called by SlideShow ater a new slide is created.
-     * <p>
-     * For Slide we need to do the following:
-     *  <li> set id of the drawing group.
-     *  <li> set shapeId for the container descriptor and background
-     * </p>
-     */
-    public void onCreate(){
-        //initialize drawing group id
-        EscherDggRecord dgg = getSlideShow().getDocumentRecord().getPPDrawingGroup().getEscherDggRecord();
-        EscherContainerRecord dgContainer = getSheetContainer().getPPDrawing().getDgContainer();
-        EscherDgRecord dg = (EscherDgRecord) HSLFShape.getEscherChild(dgContainer, EscherDgRecord.RECORD_ID);
-        int dgId = dgg.getMaxDrawingGroupId() + 1;
-        dg.setOptions((short)(dgId << 4));
-        dgg.setDrawingsSaved(dgg.getDrawingsSaved() + 1);
-        dgg.setMaxDrawingGroupId(dgId);
-
-        for (EscherContainerRecord c : dgContainer.getChildContainers()) {
-            EscherSpRecord spr = null;
-            switch(c.getRecordId()){
-                case EscherContainerRecord.SPGR_CONTAINER:
-                    EscherContainerRecord dc = (EscherContainerRecord)c.getChild(0);
-                    spr = dc.getChildById(EscherSpRecord.RECORD_ID);
-                    break;
-                case EscherContainerRecord.SP_CONTAINER:
-                    spr = c.getChildById(EscherSpRecord.RECORD_ID);
-                    break;
-                default:
-                    break;
-            }
-            if(spr != null) spr.setShapeId(allocateShapeId());
-        }
-
-        //PPT doen't increment the number of saved shapes for group descriptor and background
-        dg.setNumShapes(1);
-    }
-
-	/**
-	 * Create a <code>TextBox</code> object that represents the slide's title.
-	 *
-	 * @return <code>TextBox</code> object that represents the slide's title.
-	 */
-	public HSLFTextBox addTitle() {
-		HSLFPlaceholder pl = new HSLFPlaceholder();
-		pl.setShapeType(ShapeType.RECT);
-		pl.setPlaceholder(Placeholder.TITLE);
-		pl.setRunType(TextHeaderAtom.TITLE_TYPE);
-		pl.setText("Click to edit title");
-		pl.setAnchor(new java.awt.Rectangle(54, 48, 612, 90));
-		addShape(pl);
-		return pl;
-	}
-
-
-	// Complex Accesser methods follow
-
-	/**
-	 * <p>
-	 * The title is a run of text of type <code>TextHeaderAtom.CENTER_TITLE_TYPE</code> or
-	 * <code>TextHeaderAtom.TITLE_TYPE</code>
-	 * </p>
-	 *
-	 * @see TextHeaderAtom
-	 */
-	@Override
-	public String getTitle(){
-		for (List<HSLFTextParagraph> tp : getTextParagraphs()) {
-		    if (tp.isEmpty()) continue;
-			int type = tp.get(0).getRunType();
-			switch (type) {
-    			case TextHeaderAtom.CENTER_TITLE_TYPE:
-    			case TextHeaderAtom.TITLE_TYPE:
-    			    String str = HSLFTextParagraph.getRawText(tp);
-    			    return HSLFTextParagraph.toExternalString(str, type);
-			}
-		}
-		return null;
-	}
-
-	// Simple Accesser methods follow
-
-	/**
-	 * Returns an array of all the TextRuns found
-	 */
-	public List<List<HSLFTextParagraph>> getTextParagraphs() { return _paragraphs; }
-
-	/**
-	 * Returns the (public facing) page number of this slide
-	 */
-	@Override
-	public int getSlideNumber() { return _slideNo; }
-
-	/**
-	 * Returns the underlying slide record
-	 */
-	public org.apache.poi.hslf.record.Slide getSlideRecord() {
-        return (org.apache.poi.hslf.record.Slide)getSheetContainer();
-    }
-
-	/**
-	 * @return set of records inside <code>SlideListWithtext</code> container
-	 *  which hold text data for this slide (typically for placeholders).
-	 */
-	protected SlideAtomsSet getSlideAtomsSet() { return _atomSet;  }
-
-    /**
-     * Returns master sheet associated with this slide.
-     * It can be either SlideMaster or TitleMaster objects.
-     *
-     * @return the master sheet associated with this slide.
-     */
-     public HSLFMasterSheet getMasterSheet(){
-        int masterId = getSlideRecord().getSlideAtom().getMasterID();
-        for (HSLFSlideMaster sm : getSlideShow().getSlideMasters()) {
-            if (masterId == sm._getSheetNumber()) return sm;
-        }
-        for (HSLFTitleMaster tm : getSlideShow().getTitleMasters()) {
-            if (masterId == tm._getSheetNumber()) return tm;
-        }
-        return null;
-    }
-
-    /**
-     * Change Master of this slide.
-     */
-    public void setMasterSheet(HSLFMasterSheet master){
-        SlideAtom sa = getSlideRecord().getSlideAtom();
-        int sheetNo = master._getSheetNumber();
-        sa.setMasterID(sheetNo);
-    }
-
-    /**
-     * Sets whether this slide follows master background
-     *
-     * @param flag  <code>true</code> if the slide follows master,
-     * <code>false</code> otherwise
-     */
-    public void setFollowMasterBackground(boolean flag){
-        SlideAtom sa = getSlideRecord().getSlideAtom();
-        sa.setFollowMasterBackground(flag);
-    }
-
-    /**
-     * Whether this slide follows master sheet background
-     *
-     * @return <code>true</code> if the slide follows master background,
-     * <code>false</code> otherwise
-     */
-    public boolean getFollowMasterBackground(){
-        SlideAtom sa = getSlideRecord().getSlideAtom();
-        return sa.getFollowMasterBackground();
-    }
-
-    /**
-     * Sets whether this slide draws master sheet objects
-     *
-     * @param flag  <code>true</code> if the slide draws master sheet objects,
-     * <code>false</code> otherwise
-     */
-    public void setFollowMasterObjects(boolean flag){
-        SlideAtom sa = getSlideRecord().getSlideAtom();
-        sa.setFollowMasterObjects(flag);
-    }
-
-    /**
-     * Whether this slide follows master color scheme
-     *
-     * @return <code>true</code> if the slide follows master color scheme,
-     * <code>false</code> otherwise
-     */
-    public boolean getFollowMasterScheme(){
-        SlideAtom sa = getSlideRecord().getSlideAtom();
-        return sa.getFollowMasterScheme();
-    }
-
-    /**
-     * Sets whether this slide draws master color scheme
-     *
-     * @param flag  <code>true</code> if the slide draws master color scheme,
-     * <code>false</code> otherwise
-     */
-    public void setFollowMasterScheme(boolean flag){
-        SlideAtom sa = getSlideRecord().getSlideAtom();
-        sa.setFollowMasterScheme(flag);
-    }
-
-    /**
-     * Whether this slide draws master sheet objects
-     *
-     * @return <code>true</code> if the slide draws master sheet objects,
-     * <code>false</code> otherwise
-     */
-    public boolean getFollowMasterObjects(){
-        SlideAtom sa = getSlideRecord().getSlideAtom();
-        return sa.getFollowMasterObjects();
-    }
-
-    /**
-     * Background for this slide.
-     */
-     public HSLFBackground getBackground() {
-        if(getFollowMasterBackground()) {
-            return getMasterSheet().getBackground();
-        }
-        return super.getBackground();
-    }
-
-    /**
-     * Color scheme for this slide.
-     */
-    public ColorSchemeAtom getColorScheme() {
-        if(getFollowMasterScheme()){
-            return getMasterSheet().getColorScheme();
-        }
-        return super.getColorScheme();
-    }
-
-    /**
-     * Get the comment(s) for this slide.
-     * Note - for now, only works on PPT 2000 and
-     *  PPT 2003 files. Doesn't work for PPT 97
-     *  ones, as they do their comments oddly.
-     */
-    public Comment[] getComments() {
-    	// If there are any, they're in
-    	//  ProgTags -> ProgBinaryTag -> BinaryTagData
-    	RecordContainer progTags = (RecordContainer)
-    			getSheetContainer().findFirstOfType(
-    						RecordTypes.ProgTags.typeID
-    	);
-    	if(progTags != null) {
-    		RecordContainer progBinaryTag = (RecordContainer)
-    			progTags.findFirstOfType(
-    					RecordTypes.ProgBinaryTag.typeID
-    		);
-    		if(progBinaryTag != null) {
-    			RecordContainer binaryTags = (RecordContainer)
-    				progBinaryTag.findFirstOfType(
-    						RecordTypes.BinaryTagData.typeID
-    			);
-    			if(binaryTags != null) {
-    				// This is where they'll be
-    				int count = 0;
-    				for(int i=0; i<binaryTags.getChildRecords().length; i++) {
-    					if(binaryTags.getChildRecords()[i] instanceof Comment2000) {
-    						count++;
-    					}
-    				}
-
-    				// Now build
-    				Comment[] comments = new Comment[count];
-    				count = 0;
-    				for(int i=0; i<binaryTags.getChildRecords().length; i++) {
-    					if(binaryTags.getChildRecords()[i] instanceof Comment2000) {
-    						comments[i] = new Comment(
-    								(Comment2000)binaryTags.getChildRecords()[i]
-    						);
-    						count++;
-    					}
-    				}
-
-    				return comments;
-    			}
-    		}
-    	}
-
-    	// None found
-    	return new Comment[0];
-    }
-
-    /**
-     * Header / Footer settings for this slide.
-     *
-     * @return Header / Footer settings for this slide
-     */
-    public HeadersFooters getHeadersFooters(){
-        return new HeadersFooters(this, HeadersFootersContainer.SlideHeadersFootersContainer);
-    }
-
-    protected void onAddTextShape(HSLFTextShape shape) {
-        List<HSLFTextParagraph> newParas = shape.getTextParagraphs();
-        _paragraphs.add(newParas);
-    }
-
-    /** This will return an atom per TextBox, so if the page has two text boxes the method should return two atoms. */
-    public StyleTextProp9Atom[] getNumberedListInfo() {
-    	return this.getPPDrawing().getNumberedListInfo();
-    }
-
-	public EscherTextboxWrapper[] getTextboxWrappers() {
-		return this.getPPDrawing().getTextboxWrappers();
-	}
-
-	public void setHidden(boolean hidden) {
-		org.apache.poi.hslf.record.Slide cont =	getSlideRecord();
-
-		SSSlideInfoAtom slideInfo =
-			(SSSlideInfoAtom)cont.findFirstOfType(RecordTypes.SSSlideInfoAtom.typeID);
-		if (slideInfo == null) {
-			slideInfo = new SSSlideInfoAtom();
-			cont.addChildAfter(slideInfo, cont.findFirstOfType(RecordTypes.SlideAtom.typeID));
-		}
-
-		slideInfo.setEffectTransitionFlagByBit(SSSlideInfoAtom.HIDDEN_BIT, hidden);
-	}
-
-	public boolean getHidden() {
-		SSSlideInfoAtom slideInfo =
-			(SSSlideInfoAtom)getSlideRecord().findFirstOfType(RecordTypes.SSSlideInfoAtom.typeID);
-		return (slideInfo == null)
-			? false
-			: slideInfo.getEffectTransitionFlagByBit(SSSlideInfoAtom.HIDDEN_BIT);
-	}
-
-    @Override
-    public void draw(Graphics2D graphics) {
-        DrawFactory drawFact = DrawFactory.getInstance(graphics);
-        Drawable draw = drawFact.getDrawable(this);
-        draw.draw(graphics);
-    }
-    
-    public boolean getFollowMasterColourScheme() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void setFollowMasterColourScheme(boolean follow) {
-        // TODO Auto-generated method stub
-
-    }
-    
-    @Override
-    public boolean getFollowMasterGraphics() {
-        return getFollowMasterObjects();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
deleted file mode 100644
index 9b5668f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.model.textproperties.TextProp;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.util.Internal;
-
-/**
- * SlideMaster determines the graphics, layout, and formatting for all the slides in a given presentation.
- * It stores information about default font styles, placeholder sizes and positions,
- * background design, and color schemes.
- *
- * @author Yegor Kozlov
- */
-public final class HSLFSlideMaster extends HSLFMasterSheet {
-    private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>();
-
-    /**
-     * all TxMasterStyleAtoms available in this master
-     */
-    private TxMasterStyleAtom[] _txmaster;
-
-    /**
-     * Constructs a SlideMaster from the MainMaster record,
-     *
-     */
-    public HSLFSlideMaster(MainMaster record, int sheetNo) {
-        super(record, sheetNo);
-
-        for (List<HSLFTextParagraph> l : HSLFTextParagraph.findTextParagraphs(getPPDrawing(), this)) {
-            if (!_paragraphs.contains(l)) _paragraphs.add(l);
-        }
-    }
-
-    /**
-     * Returns an array of all the TextRuns found
-     */
-    public List<List<HSLFTextParagraph>> getTextParagraphs() {
-        return _paragraphs;
-    }
-
-    /**
-     * Returns <code>null</code> since SlideMasters doen't have master sheet.
-     */
-    public HSLFMasterSheet getMasterSheet() {
-        return null;
-    }
-
-    /**
-     * Pickup a style attribute from the master.
-     * This is the "workhorse" which returns the default style attributes.
-     */
-    public TextProp getStyleAttribute(int txtype, int level, String name, boolean isCharacter) {
-        if (_txmaster.length <= txtype) return null;
-        TxMasterStyleAtom t = _txmaster[txtype];
-        List<TextPropCollection> styles = isCharacter ? t.getCharacterStyles() : t.getParagraphStyles();
-        
-        TextProp prop = null;
-        for (int i = Math.min(level, styles.size()-1); prop == null && i >= 0; i--) {
-            prop = styles.get(i).findByName(name);
-        }
-
-        if (prop != null) return prop;
-        
-        switch (txtype) {
-            case TextHeaderAtom.CENTRE_BODY_TYPE:
-            case TextHeaderAtom.HALF_BODY_TYPE:
-            case TextHeaderAtom.QUARTER_BODY_TYPE:
-                txtype = TextHeaderAtom.BODY_TYPE;
-                break;
-            case TextHeaderAtom.CENTER_TITLE_TYPE:
-                txtype = TextHeaderAtom.TITLE_TYPE;
-                break;
-            default:
-                return null;
-        }
-
-        return getStyleAttribute(txtype, level, name, isCharacter);
-    }
-    
-    /**
-     * Assign SlideShow for this slide master.
-     */
-    @Internal
-    @Override
-    protected void setSlideShow(HSLFSlideShow ss) {
-        super.setSlideShow(ss);
-
-        //after the slide show is assigned collect all available style records
-        assert (_txmaster == null);
-        _txmaster = new TxMasterStyleAtom[9];
-
-        TxMasterStyleAtom txdoc = getSlideShow().getDocumentRecord().getEnvironment().getTxMasterStyleAtom();
-        _txmaster[txdoc.getTextType()] = txdoc;
-
-        TxMasterStyleAtom[] txrec = ((MainMaster)getSheetContainer()).getTxMasterStyleAtoms();
-        for (int i = 0; i < txrec.length; i++) {
-            int txType = txrec[i].getTextType();
-            if (txType < _txmaster.length && _txmaster[txType] == null) {
-                _txmaster[txType] = txrec[i];
-            }
-        }
-        
-        for (List<HSLFTextParagraph> paras : getTextParagraphs()) {
-            for (HSLFTextParagraph htp : paras) {
-                int txType = htp.getRunType();
-                if (txType >= _txmaster.length || _txmaster[txType] == null) {
-                    throw new HSLFException("Master styles not initialized");
-                }
-
-                int level = htp.getIndentLevel();
-
-                List<TextPropCollection> charStyles = _txmaster[txType].getCharacterStyles();
-                List<TextPropCollection> paragraphStyles = _txmaster[txType].getParagraphStyles();
-                if (charStyles == null || paragraphStyles == null ||
-                    charStyles.size() <= level || paragraphStyles.size() <= level) {
-                    throw new HSLFException("Master styles not initialized");
-                }
-                
-                htp.setMasterStyleReference(paragraphStyles.get(level));
-                for (HSLFTextRun htr : htp.getTextRuns()) {
-                    htr.setMasterStyleReference(charStyles.get(level));
-                }
-            }
-        }
-    }
-
-    protected void onAddTextShape(HSLFTextShape shape) {
-        List<HSLFTextParagraph> runs = shape.getTextParagraphs();
-        _paragraphs.add(runs);
-    }
-
-    public TxMasterStyleAtom[] getTxMasterStyleAtoms(){
-        return _txmaster;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
deleted file mode 100644
index a17c611..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
+++ /dev/null
@@ -1,1132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Dimension;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.hpsf.ClassID;
-import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.model.MovieShape;
-import org.apache.poi.hslf.model.PPFont;
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.sl.usermodel.MasterSheet;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.Resources;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- * This class is a friendly wrapper on top of the more scary HSLFSlideShow.
- *
- * TODO: - figure out how to match notes to their correct sheet (will involve
- * understanding DocSlideList and DocNotesList) - handle Slide creation cleaner
- *
- * @author Nick Burch
- * @author Yegor kozlov
- */
-public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagraph>, Closeable {
-    enum LoadSavePhase {
-        INIT, LOADED
-	}
-    private static final ThreadLocal<LoadSavePhase> loadSavePhase = new ThreadLocal<LoadSavePhase>();
-    
-    // What we're based on
-	private final HSLFSlideShowImpl _hslfSlideShow;
-
-	// Pointers to the most recent versions of the core records
-	// (Document, Notes, Slide etc)
-	private Record[] _mostRecentCoreRecords;
-	// Lookup between the PersitPtr "sheet" IDs, and the position
-	// in the mostRecentCoreRecords array
-	private Map<Integer,Integer> _sheetIdToCoreRecordsLookup;
-
-	// Records that are interesting
-	private Document _documentRecord;
-
-	// Friendly objects for people to deal with
-	private final List<HSLFSlideMaster> _masters = new ArrayList<HSLFSlideMaster>();
-	private final List<HSLFTitleMaster> _titleMasters = new ArrayList<HSLFTitleMaster>();
-	private final List<HSLFSlide> _slides = new ArrayList<HSLFSlide>();
-	private final List<HSLFNotes> _notes = new ArrayList<HSLFNotes>();
-	private FontCollection _fonts;
-
-	// For logging
-	private static final POILogger logger = POILogFactory.getLogger(HSLFSlideShow.class);
-
-
-	/**
-	 * Constructs a Powerpoint document from the underlying
-	 * HSLFSlideShow object. Finds the model stuff from this
-	 *
-	 * @param hslfSlideShow the HSLFSlideShow to base on
-	 */
-	public HSLFSlideShow(HSLFSlideShowImpl hslfSlideShow) {
-	    loadSavePhase.set(LoadSavePhase.INIT);
-	    
-	    // Get useful things from our base slideshow
-	    _hslfSlideShow = hslfSlideShow;
-
-		// Handle Parent-aware Records
-		for (Record record : _hslfSlideShow.getRecords()) {
-			if(record instanceof RecordContainer){
-                RecordContainer.handleParentAwareRecords((RecordContainer)record);
-            }
-		}
-
-		// Find the versions of the core records we'll want to use
-		findMostRecentCoreRecords();
-
-		// Build up the model level Slides and Notes
-		buildSlidesAndNotes();
-		
-		loadSavePhase.set(LoadSavePhase.LOADED);
-	}
-
-	/**
-	 * Constructs a new, empty, Powerpoint document.
-	 */
-	public HSLFSlideShow() {
-		this(HSLFSlideShowImpl.create());
-	}
-
-	/**
-	 * Constructs a Powerpoint document from an input stream.
-	 */
-	@SuppressWarnings("resource")
-    public HSLFSlideShow(InputStream inputStream) throws IOException {
-		this(new HSLFSlideShowImpl(inputStream));
-	}
-
-    /**
-     * Constructs a Powerpoint document from an POIFSFileSystem.
-     */
-    @SuppressWarnings("resource")
-    public HSLFSlideShow(NPOIFSFileSystem npoifs) throws IOException {
-        this(new HSLFSlideShowImpl(npoifs));
-    }
-
-    /**
-     * Constructs a Powerpoint document from an DirectoryNode.
-     */
-    @SuppressWarnings("resource")
-    public HSLFSlideShow(DirectoryNode root) throws IOException {
-        this(new HSLFSlideShowImpl(root));
-    }
-
-    /**
-     * @return the current loading/saving phase
-     */
-    protected static LoadSavePhase getLoadSavePhase() {
-        return loadSavePhase.get();
-    }
-    
-	/**
-	 * Use the PersistPtrHolder entries to figure out what is the "most recent"
-	 * version of all the core records (Document, Notes, Slide etc), and save a
-	 * record of them. Do this by walking from the oldest PersistPtr to the
-	 * newest, overwriting any references found along the way with newer ones
-	 */
-	private void findMostRecentCoreRecords() {
-		// To start with, find the most recent in the byte offset domain
-		Map<Integer,Integer> mostRecentByBytes = new HashMap<Integer,Integer>();
-		for (Record record : _hslfSlideShow.getRecords()) {
-			if (record instanceof PersistPtrHolder) {
-				PersistPtrHolder pph = (PersistPtrHolder) record;
-
-				// If we've already seen any of the "slide" IDs for this
-				// PersistPtr, remove their old positions
-				int[] ids = pph.getKnownSlideIDs();
-				for (int id : ids) {
-					if (mostRecentByBytes.containsKey(id)) {
-						mostRecentByBytes.remove(id);
-					}
-				}
-
-				// Now, update the byte level locations with their latest values
-				Map<Integer,Integer> thisSetOfLocations = pph.getSlideLocationsLookup();
-				for (int id : ids) {
-					mostRecentByBytes.put(id, thisSetOfLocations.get(id));
-				}
-			}
-		}
-
-		// We now know how many unique special records we have, so init
-		// the array
-		_mostRecentCoreRecords = new Record[mostRecentByBytes.size()];
-
-		// We'll also want to be able to turn the slide IDs into a position
-		// in this array
-		_sheetIdToCoreRecordsLookup = new HashMap<Integer,Integer>();
-		Integer[] allIDs = mostRecentByBytes.keySet().toArray(new Integer[mostRecentByBytes.size()]); 
-		Arrays.sort(allIDs);
-		for (int i = 0; i < allIDs.length; i++) {
-			_sheetIdToCoreRecordsLookup.put(allIDs[i], i);
-		}
-
-		Map<Integer,Integer> mostRecentByBytesRev = new HashMap<Integer,Integer>(mostRecentByBytes.size());
-		for (Map.Entry<Integer,Integer> me : mostRecentByBytes.entrySet()) {
-		    mostRecentByBytesRev.put(me.getValue(), me.getKey());
-		}
-		
-		// Now convert the byte offsets back into record offsets
-		for (Record record : _hslfSlideShow.getRecords()) {
-			if (!(record instanceof PositionDependentRecord)) continue;
-			
-			PositionDependentRecord pdr = (PositionDependentRecord) record;
-			int recordAt = pdr.getLastOnDiskOffset();
-
-			Integer thisID = mostRecentByBytesRev.get(recordAt);
-			
-			if (thisID == null) continue;
-			
-			// Bingo. Now, where do we store it?
-			int storeAt = _sheetIdToCoreRecordsLookup.get(thisID);
-
-			// Tell it its Sheet ID, if it cares
-			if (pdr instanceof PositionDependentRecordContainer) {
-				PositionDependentRecordContainer pdrc = (PositionDependentRecordContainer) record;
-				pdrc.setSheetId(thisID);
-			}
-
-			// Finally, save the record
-			_mostRecentCoreRecords[storeAt] = record;
-		}
-
-		// Now look for the interesting records in there
-		for (Record record : _mostRecentCoreRecords) {
-			// Check there really is a record at this number
-			if (record != null) {
-				// Find the Document, and interesting things in it
-				if (record.getRecordType() == RecordTypes.Document.typeID) {
-					_documentRecord = (Document) record;
-					_fonts = _documentRecord.getEnvironment().getFontCollection();
-				}
-			} /*else {
-				// No record at this number
-				// Odd, but not normally a problem
-			}*/
-		}
-	}
-
-	/**
-	 * For a given SlideAtomsSet, return the core record, based on the refID
-	 * from the SlidePersistAtom
-	 */
-	private Record getCoreRecordForSAS(SlideAtomsSet sas) {
-		SlidePersistAtom spa = sas.getSlidePersistAtom();
-		int refID = spa.getRefID();
-		return getCoreRecordForRefID(refID);
-	}
-
-	/**
-	 * For a given refID (the internal, 0 based numbering scheme), return the
-	 * core record
-	 *
-	 * @param refID
-	 *            the refID
-	 */
-	private Record getCoreRecordForRefID(int refID) {
-		Integer coreRecordId = _sheetIdToCoreRecordsLookup.get(refID);
-		if (coreRecordId != null) {
-			return _mostRecentCoreRecords[coreRecordId];
-		}
-		logger.log(POILogger.ERROR,
-				"We tried to look up a reference to a core record, but there was no core ID for reference ID "
-						+ refID);
-		return null;
-	}
-
-	/**
-	 * Build up model level Slide and Notes objects, from the underlying
-	 * records.
-	 */
-	private void buildSlidesAndNotes() {
-		// Ensure we really found a Document record earlier
-		// If we didn't, then the file is probably corrupt
-		if (_documentRecord == null) {
-			throw new CorruptPowerPointFileException(
-					"The PowerPoint file didn't contain a Document Record in its PersistPtr blocks. It is probably corrupt.");
-		}
-
-		// Fetch the SlideListWithTexts in the most up-to-date Document Record
-		//
-		// As far as we understand it:
-		// * The first SlideListWithText will contain a SlideAtomsSet
-		// for each of the master slides
-		// * The second SlideListWithText will contain a SlideAtomsSet
-		// for each of the slides, in their current order
-		// These SlideAtomsSets will normally contain text
-		// * The third SlideListWithText (if present), will contain a
-		// SlideAtomsSet for each Notes
-		// These SlideAtomsSets will not normally contain text
-		//
-		// Having indentified the masters, slides and notes + their orders,
-		// we have to go and find their matching records
-		// We always use the latest versions of these records, and use the
-		// SlideAtom/NotesAtom to match them with the StyleAtomSet
-
-		findMasterSlides();
-		
-		// Having sorted out the masters, that leaves the notes and slides
-        Map<Integer,Integer> slideIdToNotes = new HashMap<Integer,Integer>();
-
-        // Start by finding the notes records
-        findNotesSlides(slideIdToNotes);
-
-		// Now, do the same thing for our slides
-		findSlides(slideIdToNotes);
-	}
-
-	/**
-     * Find master slides
-     * These can be MainMaster records, but oddly they can also be
-     * Slides or Notes, and possibly even other odd stuff....
-     * About the only thing you can say is that the master details are in the first SLWT.
-	 */
-	private void findMasterSlides() {
-        SlideListWithText masterSLWT = _documentRecord.getMasterSlideListWithText();
-        if (masterSLWT == null) {
-            return;
-        }
-        
-        for (SlideAtomsSet sas : masterSLWT.getSlideAtomsSets()) {
-            Record r = getCoreRecordForSAS(sas);
-            int sheetNo = sas.getSlidePersistAtom().getSlideIdentifier();
-            if (r instanceof Slide) {
-                HSLFTitleMaster master = new HSLFTitleMaster((Slide)r, sheetNo);
-                master.setSlideShow(this);
-                _titleMasters.add(master);
-            } else if (r instanceof MainMaster) {
-                HSLFSlideMaster master = new HSLFSlideMaster((MainMaster)r, sheetNo);
-                master.setSlideShow(this);
-                _masters.add(master);
-            }
-        }
-	}
-	
-	private void findNotesSlides(Map<Integer,Integer> slideIdToNotes) {
-        SlideListWithText notesSLWT = _documentRecord.getNotesSlideListWithText();
-
-        if (notesSLWT == null) {
-            return;
-        }
-        
-        // Match up the records and the SlideAtomSets
-        int idx = -1;
-        for (SlideAtomsSet notesSet : notesSLWT.getSlideAtomsSets()) {
-            idx++;
-            // Get the right core record
-            Record r = getCoreRecordForSAS(notesSet);
-            SlidePersistAtom spa = notesSet.getSlidePersistAtom();
-
-            String loggerLoc = "A Notes SlideAtomSet at "+idx+" said its record was at refID "+spa.getRefID();
-
-            // we need to add null-records, otherwise the index references to other existing don't work anymore
-            if (r == null) {
-                logger.log(POILogger.WARN, loggerLoc+", but that record didn't exist - record ignored.");
-                continue;
-            }
-
-            // Ensure it really is a notes record
-            if (!(r instanceof Notes)) {
-                logger.log(POILogger.ERROR, loggerLoc+", but that was actually a " + r);
-                continue;
-            }
-            
-            Notes notesRecord = (Notes) r;
-
-            // Record the match between slide id and these notes
-            int slideId = spa.getSlideIdentifier();
-            slideIdToNotes.put(slideId, idx);
-            
-            HSLFNotes hn = new HSLFNotes(notesRecord);
-            hn.setSlideShow(this);
-            _notes.add(hn);
-        }
-	}
-
-	private void findSlides(Map<Integer,Integer> slideIdToNotes) {
-        SlideListWithText slidesSLWT = _documentRecord.getSlideSlideListWithText();
-        if (slidesSLWT == null) {
-            return;
-        }
-
-        // Match up the records and the SlideAtomSets
-        int idx = -1;
-        for (SlideAtomsSet sas : slidesSLWT.getSlideAtomsSets()) {
-            idx++;
-            // Get the right core record
-            SlidePersistAtom spa = sas.getSlidePersistAtom();
-            Record r = getCoreRecordForSAS(sas);
-
-            // Ensure it really is a slide record
-            if (!(r instanceof Slide)) {
-                logger.log(POILogger.ERROR, "A Slide SlideAtomSet at " + idx
-                        + " said its record was at refID "
-                        + spa.getRefID()
-                        + ", but that was actually a " + r);
-                continue;
-            }
-            
-            Slide slide = (Slide)r;
-
-            // Do we have a notes for this?
-            HSLFNotes notes = null;
-            // Slide.SlideAtom.notesId references the corresponding notes slide.
-            // 0 if slide has no notes.
-            int noteId = slide.getSlideAtom().getNotesID();
-            if (noteId != 0) {
-                Integer notesPos = slideIdToNotes.get(noteId);
-                if (notesPos != null && 0 <= notesPos && notesPos < _notes.size()) {
-                    notes = _notes.get(notesPos);
-                } else {
-                    logger.log(POILogger.ERROR, "Notes not found for noteId=" + noteId);
-                }
-            }
-
-            // Now, build our slide
-            int slideIdentifier = spa.getSlideIdentifier();
-            HSLFSlide hs = new HSLFSlide(slide, notes, sas, slideIdentifier, (idx + 1));
-            hs.setSlideShow(this);
-            _slides.add(hs);
-        }
-	}
-	
-	@Override
-	public void write(OutputStream out) throws IOException {
-	    // check for text paragraph modifications
-	    for (HSLFSlide sl : getSlides()) {
-	        writeDirtyParagraphs(sl);
-	    }
-
-	    for (HSLFSlideMaster sl : getSlideMasters()) {
-	        boolean isDirty = false;
-	        for (List<HSLFTextParagraph> paras : sl.getTextParagraphs()) {
-	            for (HSLFTextParagraph p : paras) {
-	                isDirty |= p.isDirty();
-	            }
-	        }
-	        if (isDirty) {
-	            for (TxMasterStyleAtom sa : sl.getTxMasterStyleAtoms()) {
-	                if (sa != null) {
-	                    // not all master style atoms are set - index 3 is typically null
-	                    sa.updateStyles();
-	                }
-	            }
-	        }
-	    }
-	    
-		_hslfSlideShow.write(out);
-	}
-	
-	private void writeDirtyParagraphs(HSLFShapeContainer container) {
-        for (HSLFShape sh : container.getShapes()) {
-            if (sh instanceof HSLFShapeContainer) {
-                writeDirtyParagraphs((HSLFShapeContainer)sh);
-            } else if (sh instanceof HSLFTextShape) {
-                HSLFTextShape hts = (HSLFTextShape)sh;
-                boolean isDirty = false;
-                for (HSLFTextParagraph p : hts.getTextParagraphs()) {
-                    isDirty |= p.isDirty();
-                }
-                if (isDirty) hts.storeText();
-            }
-        }
-	}
-
-	/**
-	 * Returns an array of the most recent version of all the interesting
-	 * records
-	 */
-	public Record[] getMostRecentCoreRecords() {
-		return _mostRecentCoreRecords;
-	}
-
-	/**
-	 * Returns an array of all the normal Slides found in the slideshow
-	 */
-	@Override
-	public List<HSLFSlide> getSlides() {
-		return _slides;
-	}
-
-	/**
-	 * Returns an array of all the normal Notes found in the slideshow
-	 */
-	public List<HSLFNotes> getNotes() {
-		return _notes;
-	}
-
-	/**
-	 * Returns an array of all the normal Slide Masters found in the slideshow
-	 */
-	@Override
-	public List<HSLFSlideMaster> getSlideMasters() {
-		return _masters;
-	}
-	
-	/**
-	 * Returns an array of all the normal Title Masters found in the slideshow
-	 */
-	public List<HSLFTitleMaster> getTitleMasters() {
-		return _titleMasters;
-	}
-
-	@Override
-	public List<HSLFPictureData> getPictureData() {
-		return _hslfSlideShow.getPictureData();
-	}
-
-	/**
-	 * Returns the data of all the embedded OLE object in the SlideShow
-	 */
-	public HSLFObjectData[] getEmbeddedObjects() {
-		return _hslfSlideShow.getEmbeddedObjects();
-	}
-
-	/**
-	 * Returns the data of all the embedded sounds in the SlideShow
-	 */
-	public HSLFSoundData[] getSoundData() {
-		return HSLFSoundData.find(_documentRecord);
-	}
-
-	@Override
-	public Dimension getPageSize() {
-		DocumentAtom docatom = _documentRecord.getDocumentAtom();
-		int pgx = (int)Units.masterToPoints((int)docatom.getSlideSizeX());
-		int pgy = (int)Units.masterToPoints((int)docatom.getSlideSizeY());
-		return new Dimension(pgx, pgy);
-	}
-
-	@Override
-	public void setPageSize(Dimension pgsize) {
-		DocumentAtom docatom = _documentRecord.getDocumentAtom();
-		docatom.setSlideSizeX(Units.pointsToMaster(pgsize.width));
-		docatom.setSlideSizeY(Units.pointsToMaster(pgsize.height));
-	}
-
-	/**
-	 * Helper method for usermodel: Get the font collection
-	 */
-	protected FontCollection getFontCollection() {
-		return _fonts;
-	}
-
-	/**
-	 * Helper method for usermodel and model: Get the document record
-	 */
-	public Document getDocumentRecord() {
-		return _documentRecord;
-	}
-
-	/**
-	 * Re-orders a slide, to a new position.
-	 *
-	 * @param oldSlideNumber
-	 *            The old slide number (1 based)
-	 * @param newSlideNumber
-	 *            The new slide number (1 based)
-	 */
-	public void reorderSlide(int oldSlideNumber, int newSlideNumber) {
-		// Ensure these numbers are valid
-		if (oldSlideNumber < 1 || newSlideNumber < 1) {
-			throw new IllegalArgumentException("Old and new slide numbers must be greater than 0");
-		}
-		if (oldSlideNumber > _slides.size() || newSlideNumber > _slides.size()) {
-			throw new IllegalArgumentException(
-					"Old and new slide numbers must not exceed the number of slides ("
-							+ _slides.size() + ")");
-		}
-
-		// The order of slides is defined by the order of slide atom sets in the
-		// SlideListWithText container.
-		SlideListWithText slwt = _documentRecord.getSlideSlideListWithText();
-		SlideAtomsSet[] sas = slwt.getSlideAtomsSets();
-
-		SlideAtomsSet tmp = sas[oldSlideNumber - 1];
-		sas[oldSlideNumber - 1] = sas[newSlideNumber - 1];
-		sas[newSlideNumber - 1] = tmp;
-
-		Collections.swap(_slides, oldSlideNumber - 1, newSlideNumber - 1);
-		_slides.get(newSlideNumber - 1).setSlideNumber(newSlideNumber);
-		_slides.get(oldSlideNumber - 1).setSlideNumber(oldSlideNumber);
-		
-		ArrayList<Record> lst = new ArrayList<Record>();
-		for (SlideAtomsSet s : sas) {
-			lst.add(s.getSlidePersistAtom());
-			lst.addAll(Arrays.asList(s.getSlideRecords()));
-		}
-		
-		Record[] r = lst.toArray(new Record[lst.size()]);
-		slwt.setChildRecord(r);
-	}
-
-	/**
-	 * Removes the slide at the given index (0-based).
-	 * <p>
-	 * Shifts any subsequent slides to the left (subtracts one from their slide
-	 * numbers).
-	 * </p>
-	 *
-	 * @param index
-	 *            the index of the slide to remove (0-based)
-	 * @return the slide that was removed from the slide show.
-	 */
-	public HSLFSlide removeSlide(int index) {
-		int lastSlideIdx = _slides.size() - 1;
-		if (index < 0 || index > lastSlideIdx) {
-			throw new IllegalArgumentException("Slide index (" + index + ") is out of range (0.."
-					+ lastSlideIdx + ")");
-		}
-
-		SlideListWithText slwt = _documentRecord.getSlideSlideListWithText();
-		SlideAtomsSet[] sas = slwt.getSlideAtomsSets();
-
-		List<Record> records = new ArrayList<Record>();
-		List<SlideAtomsSet> sa = new ArrayList<SlideAtomsSet>(Arrays.asList(sas));
-
-		HSLFSlide removedSlide = _slides.remove(index);
-		_notes.remove(removedSlide.getNotes());
-		sa.remove(index);
-		
-		int i=0;
-		for (HSLFSlide s : _slides) s.setSlideNumber(i++);
-		
-		for (SlideAtomsSet s : sa) {
-            records.add(s.getSlidePersistAtom());
-            records.addAll(Arrays.asList(s.getSlideRecords()));
-		}
-		if (sa.isEmpty()) {
-			_documentRecord.removeSlideListWithText(slwt);
-		} else {
-			slwt.setSlideAtomsSets(sa.toArray(new SlideAtomsSet[sa.size()]));
-			slwt.setChildRecord(records.toArray(new Record[records.size()]));
-		}
-
-		// if the removed slide had notes - remove references to them too
-
-        int notesId = removedSlide.getSlideRecord().getSlideAtom().getNotesID();
-		if (notesId != 0) {
-			SlideListWithText nslwt = _documentRecord.getNotesSlideListWithText();
-			records = new ArrayList<Record>();
-			ArrayList<SlideAtomsSet> na = new ArrayList<SlideAtomsSet>();
-			for (SlideAtomsSet ns : nslwt.getSlideAtomsSets()) {
-				if (ns.getSlidePersistAtom().getSlideIdentifier() == notesId) continue;
-				na.add(ns);
-				records.add(ns.getSlidePersistAtom());
-				if (ns.getSlideRecords() != null) {
-					records.addAll(Arrays.asList(ns.getSlideRecords()));
-				}
-			}
-			if (na.isEmpty()) {
-				_documentRecord.removeSlideListWithText(nslwt);
-			} else {
-				nslwt.setSlideAtomsSets(na.toArray(new SlideAtomsSet[na.size()]));
-				nslwt.setChildRecord(records.toArray(new Record[records.size()]));
-			}
-		}
-
-		return removedSlide;
-	}
-
-	/**
-	 * Create a blank <code>Slide</code>.
-	 *
-	 * @return the created <code>Slide</code>
-	 */
-	@Override
-	public HSLFSlide createSlide() {
-		// We need to add the records to the SLWT that deals
-		// with Slides.
-		// Add it, if it doesn't exist
-		SlideListWithText slist = _documentRecord.getSlideSlideListWithText();
-		if (slist == null) {
-			// Need to add a new one
-			slist = new SlideListWithText();
-			slist.setInstance(SlideListWithText.SLIDES);
-			_documentRecord.addSlideListWithText(slist);
-		}
-
-		// Grab the SlidePersistAtom with the highest Slide Number.
-		// (Will stay as null if no SlidePersistAtom exists yet in
-		// the slide, or only master slide's ones do)
-		SlidePersistAtom prev = null;
-		for (SlideAtomsSet sas : slist.getSlideAtomsSets()) {
-			SlidePersistAtom spa = sas.getSlidePersistAtom();
-			if (spa.getSlideIdentifier() < 0) {
-				// This is for a master slide
-				// Odd, since we only deal with the Slide SLWT
-			} else {
-				// Must be for a real slide
-				if (prev == null) {
-					prev = spa;
-				}
-				if (prev.getSlideIdentifier() < spa.getSlideIdentifier()) {
-					prev = spa;
-				}
-			}
-		}
-
-		// Set up a new SlidePersistAtom for this slide
-		SlidePersistAtom sp = new SlidePersistAtom();
-
-		// First slideId is always 256
-		sp.setSlideIdentifier(prev == null ? 256 : (prev.getSlideIdentifier() + 1));
-
-		// Add this new SlidePersistAtom to the SlideListWithText
-		slist.addSlidePersistAtom(sp);
-
-		// Create a new Slide
-		HSLFSlide slide = new HSLFSlide(sp.getSlideIdentifier(), sp.getRefID(), _slides.size() + 1);
-		slide.setSlideShow(this);
-		slide.onCreate();
-
-		// Add in to the list of Slides
-		_slides.add(slide);
-		logger.log(POILogger.INFO, "Added slide " + _slides.size() + " with ref " + sp.getRefID()
-				+ " and identifier " + sp.getSlideIdentifier());
-
-		// Add the core records for this new Slide to the record tree
-		Slide slideRecord = slide.getSlideRecord();
-		int psrId = addPersistentObject(slideRecord);
-		sp.setRefID(psrId);
-		slideRecord.setSheetId(psrId);
-		
-		slide.setMasterSheet(_masters.get(0));
-		// All done and added
-		return slide;
-	}
-
-	@Override
-	public HSLFPictureData addPicture(byte[] data, PictureType format) throws IOException {
-		if (format == null || format.nativeId == -1) {
-			throw new IllegalArgumentException("Unsupported picture format: " + format); 
-		}
-		
-		HSLFPictureData pd = findPictureData(data);
-		if (pd != null) {
-			// identical picture was already added to the SlideShow
-			return pd;
-		}
-		
-		EscherContainerRecord bstore;
-
-		EscherContainerRecord dggContainer = _documentRecord.getPPDrawingGroup().getDggContainer();
-		bstore = (EscherContainerRecord) HSLFShape.getEscherChild(dggContainer,
-				EscherContainerRecord.BSTORE_CONTAINER);
-		if (bstore == null) {
-			bstore = new EscherContainerRecord();
-			bstore.setRecordId(EscherContainerRecord.BSTORE_CONTAINER);
-
-			dggContainer.addChildBefore(bstore, EscherOptRecord.RECORD_ID);
-		}
-
-		HSLFPictureData pict = HSLFPictureData.create(format);
-		pict.setData(data);
-
-		int offset = _hslfSlideShow.addPicture(pict);
-
-		EscherBSERecord bse = new EscherBSERecord();
-		bse.setRecordId(EscherBSERecord.RECORD_ID);
-		bse.setOptions((short) (0x0002 | (format.nativeId << 4)));
-		bse.setSize(pict.getRawData().length + 8);
-		byte[] uid = HSLFPictureData.getChecksum(data);
-		bse.setUid(uid);
-
-		bse.setBlipTypeMacOS((byte) format.nativeId);
-		bse.setBlipTypeWin32((byte) format.nativeId);
-
-		if (format == PictureType.EMF) {
-			bse.setBlipTypeMacOS((byte) PictureType.PICT.nativeId);
-		} else if (format == PictureType.WMF) {
-			bse.setBlipTypeMacOS((byte) PictureType.PICT.nativeId);
-		} else if (format == PictureType.PICT) {
-			bse.setBlipTypeWin32((byte) PictureType.WMF.nativeId);
-		}
-
-		bse.setRef(0);
-		bse.setOffset(offset);
-		bse.setRemainingData(new byte[0]);
-
-		bstore.addChildRecord(bse);
-		int count = bstore.getChildRecords().size();
-		bstore.setOptions((short) ((count << 4) | 0xF));
-
-		return pict;
-	}
-
-	/**
-	 * Adds a picture to the presentation.
-	 *
-	 * @param is	        The stream to read the image from
-	 * @param format        The format of the picture.
-	 *
-	 * @return the picture data.
-	 * @since 3.15 beta 2
-	 */
-	@Override
-	public HSLFPictureData addPicture(InputStream is, PictureType format) throws IOException {
-	    if (format == null || format.nativeId == -1) { // fail early
-	        throw new IllegalArgumentException("Unsupported picture format: " + format);
-	    }
-	    return addPicture(IOUtils.toByteArray(is), format);
-	}
-
-	/**
-	 * Adds a picture to the presentation.
-	 *
-	 * @param pict
-	 *            the file containing the image to add
-	 * @param format
-	 *            The format of the picture.
-	 *
-	 * @return the picture data.
-	 * @since 3.15 beta 2
-	 */
-	@Override
-	public HSLFPictureData addPicture(File pict, PictureType format) throws IOException {
-	    if (format == null || format.nativeId == -1) { // fail early
-	        throw new IllegalArgumentException("Unsupported picture format: " + format);
-	    }
-		int length = (int) pict.length();
-		byte[] data = new byte[length];
-        FileInputStream is = new FileInputStream(pict);
-		try {
-			IOUtils.readFully(is, data);
-		} finally {
-            is.close();
-        }
-		return addPicture(data, format);
-	}
-	
-    /**
-     * check if a picture with this picture data already exists in this presentation
-     * 
-     * @param pictureData The picture data to find in the SlideShow
-     * @return {@code null} if picture data is not found in this slideshow
-     * @since 3.15 beta 3
-     */
-    @Override
-    public HSLFPictureData findPictureData(byte[] pictureData) {
-        byte[] uid = HSLFPictureData.getChecksum(pictureData);
-
-        for (HSLFPictureData pic : getPictureData()) {
-            if (Arrays.equals(pic.getUID(), uid)) {
-                return pic;
-            }
-        }
-        return null;
-    }
-
-	/**
-	 * Add a font in this presentation
-	 *
-	 * @param font
-	 *            the font to add
-	 * @return 0-based index of the font
-	 */
-	public int addFont(PPFont font) {
-		FontCollection fonts = getDocumentRecord().getEnvironment().getFontCollection();
-		int idx = fonts.getFontIndex(font.getFontName());
-		if (idx == -1) {
-			idx = fonts.addFont(font.getFontName(), font.getCharSet(), font.getFontFlags(), font
-					.getFontType(), font.getPitchAndFamily());
-		}
-		return idx;
-	}
-
-	/**
-	 * Get a font by index
-	 *
-	 * @param idx
-	 *            0-based index of the font
-	 * @return of an instance of <code>PPFont</code> or <code>null</code> if not
-	 *         found
-	 */
-	public PPFont getFont(int idx) {
-		FontCollection fonts = getDocumentRecord().getEnvironment().getFontCollection();
-		for (Record ch : fonts.getChildRecords()) {
-			if (ch instanceof FontEntityAtom) {
-				FontEntityAtom atom = (FontEntityAtom) ch;
-				if (atom.getFontIndex() == idx) {
-					return new PPFont(atom);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * get the number of fonts in the presentation
-	 *
-	 * @return number of fonts
-	 */
-	public int getNumberOfFonts() {
-		return getDocumentRecord().getEnvironment().getFontCollection().getNumberOfFonts();
-	}
-
-	/**
-	 * Return Header / Footer settings for slides
-	 *
-	 * @return Header / Footer settings for slides
-	 */
-	public HeadersFooters getSlideHeadersFooters() {
-		return new HeadersFooters(this, HeadersFootersContainer.SlideHeadersFootersContainer);
-	}
-
-	/**
-	 * Return Header / Footer settings for notes
-	 *
-	 * @return Header / Footer settings for notes
-	 */
-	public HeadersFooters getNotesHeadersFooters() {
-	    if (_notes.isEmpty()) {
-	        return new HeadersFooters(this, HeadersFootersContainer.NotesHeadersFootersContainer);
-	    } else {
-	        return new HeadersFooters(_notes.get(0), HeadersFootersContainer.NotesHeadersFootersContainer);
-	    }
-	}
-
-	/**
-	 * Add a movie in this presentation
-	 *
-	 * @param path
-	 *            the path or url to the movie
-	 * @return 0-based index of the movie
-	 */
-	public int addMovie(String path, int type) {
-		ExMCIMovie mci;
-		switch (type) {
-			case MovieShape.MOVIE_MPEG:
-				mci = new ExMCIMovie();
-				break;
-			case MovieShape.MOVIE_AVI:
-				mci = new ExAviMovie();
-				break;
-			default:
-				throw new IllegalArgumentException("Unsupported Movie: " + type);
-		}
-
-		ExVideoContainer exVideo = mci.getExVideo();
-		exVideo.getExMediaAtom().setMask(0xE80000);
-		exVideo.getPathAtom().setText(path);
-
-		int objectId = addToObjListAtom(mci);
-		exVideo.getExMediaAtom().setObjectId(objectId);
-		
-		return objectId;
-	}
-
-	/**
-	 * Add a control in this presentation
-	 *
-	 * @param name
-	 *            name of the control, e.g. "Shockwave Flash Object"
-	 * @param progId
-	 *            OLE Programmatic Identifier, e.g.
-	 *            "ShockwaveFlash.ShockwaveFlash.9"
-	 * @return 0-based index of the control
-	 */
-	public int addControl(String name, String progId) {
-		ExControl ctrl = new ExControl();
-		ctrl.setProgId(progId);
-		ctrl.setMenuName(name);
-		ctrl.setClipboardName(name);
-		
-		ExOleObjAtom oleObj = ctrl.getExOleObjAtom();
-		oleObj.setDrawAspect(ExOleObjAtom.DRAW_ASPECT_VISIBLE);
-		oleObj.setType(ExOleObjAtom.TYPE_CONTROL);
-		oleObj.setSubType(ExOleObjAtom.SUBTYPE_DEFAULT);
-		
-		int objectId = addToObjListAtom(ctrl);
-		oleObj.setObjID(objectId);
-		return objectId;
-	}
-
-	/**
-	 * Add a embedded object to this presentation
-	 *
-	 * @return 0-based index of the embedded object
-	 */
-	public int addEmbed(POIFSFileSystem poiData) {
-        DirectoryNode root = poiData.getRoot();
-        
-        // prepare embedded data
-        if (new ClassID().equals(root.getStorageClsid())) {
-        	// need to set class id
-	        Map<String,ClassID> olemap = getOleMap();
-	        ClassID classID = null;
-	    	for (Map.Entry<String,ClassID> entry : olemap.entrySet()) {
-	    		if (root.hasEntry(entry.getKey())) {
-	    			classID = entry.getValue();
-	    			break;
-	    		}
-	    	}
-	    	if (classID == null) {
-	    		throw new IllegalArgumentException("Unsupported embedded document");    		
-	    	}
-	    	
-	    	root.setStorageClsid(classID);
-        }
-        
-		ExEmbed exEmbed = new ExEmbed();
-        // remove unneccessary infos, so we don't need to specify the type
-        // of the ole object multiple times
-        Record children[] = exEmbed.getChildRecords();
-        exEmbed.removeChild(children[2]);
-        exEmbed.removeChild(children[3]);
-        exEmbed.removeChild(children[4]);
-
-        ExEmbedAtom eeEmbed = exEmbed.getExEmbedAtom();
-        eeEmbed.setCantLockServerB(true);
-
-        ExOleObjAtom eeAtom = exEmbed.getExOleObjAtom();
-        eeAtom.setDrawAspect(ExOleObjAtom.DRAW_ASPECT_VISIBLE);
-        eeAtom.setType(ExOleObjAtom.TYPE_EMBEDDED);
-        // eeAtom.setSubType(ExOleObjAtom.SUBTYPE_EXCEL);
-        // should be ignored?!?, see MS-PPT ExOleObjAtom, but Libre Office sets it ...
-        eeAtom.setOptions(1226240);
-
-        ExOleObjStg exOleObjStg = new ExOleObjStg();
-        try {
-	        final String OLESTREAM_NAME = "\u0001Ole";
-	        if (!root.hasEntry(OLESTREAM_NAME)) {
-	            // the following data was taken from an example libre office document
-	            // beside this "\u0001Ole" record there were several other records, e.g. CompObj,
-	            // OlePresXXX, but it seems, that they aren't neccessary
-	            byte oleBytes[] = { 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-	            poiData.createDocument(new ByteArrayInputStream(oleBytes), OLESTREAM_NAME);
-	        }        
-
-	        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-	        poiData.writeFilesystem(bos);
-	        exOleObjStg.setData(bos.toByteArray());
-        } catch (IOException e) {
-        	throw new HSLFException(e);
-        }
-        
-        int psrId = addPersistentObject(exOleObjStg);
-        exOleObjStg.setPersistId(psrId);
-        eeAtom.setObjStgDataRef(psrId);
-        
-		int objectId = addToObjListAtom(exEmbed);
-		eeAtom.setObjID(objectId);
-		return objectId;
-	}
-
-	protected int addToObjListAtom(RecordContainer exObj) {
-		ExObjList lst = getDocumentRecord().getExObjList(true);
-		ExObjListAtom objAtom = lst.getExObjListAtom();
-		// increment the object ID seed
-		int objectId = (int) objAtom.getObjectIDSeed() + 1;
-		objAtom.setObjectIDSeed(objectId);
-
-		lst.addChildAfter(exObj, objAtom);
-		
-		return objectId;
-	}
-
-    protected static Map<String,ClassID> getOleMap() {
-    	Map<String,ClassID> olemap = new HashMap<String,ClassID>();
-    	olemap.put("PowerPoint Document", ClassID.PPT_SHOW);
-    	olemap.put("Workbook", ClassID.EXCEL97); // as per BIFF8 spec
-    	olemap.put("WORKBOOK", ClassID.EXCEL97); // Typically from third party programs
-    	olemap.put("BOOK", ClassID.EXCEL97); // Typically odd Crystal Reports exports
-    	// ... to be continued
-    	return olemap;
-    }
-
-    protected int addPersistentObject(PositionDependentRecord slideRecord) {
-    	slideRecord.setLastOnDiskOffset(HSLFSlideShowImpl.UNSET_OFFSET);
-		_hslfSlideShow.appendRootLevelRecord((Record)slideRecord);
-
-        // For position dependent records, hold where they were and now are
-        // As we go along, update, and hand over, to any Position Dependent
-        // records we happen across
-		Map<RecordTypes,PositionDependentRecord> interestingRecords =
-                new HashMap<RecordTypes,PositionDependentRecord>();
-
-		try {
-            _hslfSlideShow.updateAndWriteDependantRecords(null,interestingRecords);
-        } catch (IOException e) {
-            throw new HSLFException(e);
-        }
-		
-		PersistPtrHolder ptr = (PersistPtrHolder)interestingRecords.get(RecordTypes.PersistPtrIncrementalBlock);
-		UserEditAtom usr = (UserEditAtom)interestingRecords.get(RecordTypes.UserEditAtom);
-
-		// persist ID is UserEditAtom.maxPersistWritten + 1
-		int psrId = usr.getMaxPersistWritten() + 1;
-
-		// Last view is now of the slide
-		usr.setLastViewType((short) UserEditAtom.LAST_VIEW_SLIDE_VIEW);
-		// increment the number of persistent objects
-		usr.setMaxPersistWritten(psrId);
-
-		// Add the new slide into the last PersistPtr
-		// (Also need to tell it where it is)
-		int slideOffset = slideRecord.getLastOnDiskOffset();
-		slideRecord.setLastOnDiskOffset(slideOffset);
-		ptr.addSlideLookup(psrId, slideOffset);
-		logger.log(POILogger.INFO, "New slide/object ended up at " + slideOffset);
-
-		return psrId;
-    }
-
-    public MasterSheet<HSLFShape,HSLFTextParagraph> createMasterSheet() throws IOException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Resources getResources() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void close() throws IOException {
-        _hslfSlideShow.close();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
deleted file mode 100644
index c2dd420..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
-import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
-import org.apache.poi.hslf.record.DocumentEncryptionAtom;
-import org.apache.poi.hslf.record.PersistPtrHolder;
-import org.apache.poi.hslf.record.PositionDependentRecord;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.UserEditAtom;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.poifs.crypt.ChunkedCipherInputStream;
-import org.apache.poi.poifs.crypt.ChunkedCipherOutputStream;
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIDecryptor;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptor;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-
-/**
- * This class provides helper functions for encrypted PowerPoint documents.
- */
-@Internal
-public class HSLFSlideShowEncrypted implements Closeable {
-    DocumentEncryptionAtom dea;
-    CryptoAPIEncryptor enc = null;
-    CryptoAPIDecryptor dec = null;
-//    Cipher cipher = null;
-    ChunkedCipherOutputStream cyos = null;
-
-    private static final BitField fieldRecInst = new BitField(0xFFF0);
-
-    private static final int BLIB_STORE_ENTRY_PARTS[] = {
-        1,     // btWin32
-        1,     // btMacOS
-        16,    // rgbUid
-        2,     // tag
-        4,     // size
-        4,     // cRef
-        4,     // foDelay
-        1,     // unused1
-        1,     // cbName (@ index 33)
-        1,     // unused2
-        1,     // unused3
-    };
-    
-    protected HSLFSlideShowEncrypted(DocumentEncryptionAtom dea) {
-        this.dea = dea;
-    }
-
-    protected HSLFSlideShowEncrypted(byte[] docstream, NavigableMap<Integer,Record> recordMap) {
-        // check for DocumentEncryptionAtom, which would be at the last offset
-        // need to ignore already set UserEdit and PersistAtoms
-        UserEditAtom userEditAtomWithEncryption = null;
-        for (Map.Entry<Integer, Record> me : recordMap.descendingMap().entrySet()) {
-            Record r = me.getValue();
-            if (!(r instanceof UserEditAtom)) {
-                continue;
-            }
-            UserEditAtom uea = (UserEditAtom)r;
-            if (uea.getEncryptSessionPersistIdRef() != -1) {
-                userEditAtomWithEncryption = uea;
-                break;
-            }
-        }
-
-        if (userEditAtomWithEncryption == null) {
-            dea = null;
-            return;
-        }
-
-        Record r = recordMap.get(userEditAtomWithEncryption.getPersistPointersOffset());
-        assert(r instanceof PersistPtrHolder);
-        PersistPtrHolder ptr = (PersistPtrHolder)r;
-
-        Integer encOffset = ptr.getSlideLocationsLookup().get(userEditAtomWithEncryption.getEncryptSessionPersistIdRef());
-        if (encOffset == null) {
-            // encryption info doesn't exist anymore
-        	// SoftMaker Freeoffice produces such invalid files - check for "SMNativeObjData" ole stream
-            dea = null;
-            return;
-        }
-
-        r = recordMap.get(encOffset);
-        if (r == null) {
-            r = Record.buildRecordAtOffset(docstream, encOffset);
-            recordMap.put(encOffset, r);
-        }
-        assert(r instanceof DocumentEncryptionAtom);
-        this.dea = (DocumentEncryptionAtom)r;
-        decryptInit();
-
-        String pass = Biff8EncryptionKey.getCurrentUserPassword();
-        if(!dec.verifyPassword(pass != null ? pass : Decryptor.DEFAULT_PASSWORD)) {
-            throw new EncryptedPowerPointFileException("PowerPoint file is encrypted. The correct password needs to be set via Biff8EncryptionKey.setCurrentUserPassword()");
-        }
-     }
-
-    public DocumentEncryptionAtom getDocumentEncryptionAtom() {
-        return dea;
-    }
-
-    protected void decryptInit() {
-        if (dec != null) {
-            return;
-        }
-        EncryptionInfo ei = dea.getEncryptionInfo();
-        dec = (CryptoAPIDecryptor)ei.getDecryptor();
-    }
-
-    protected void encryptInit() {
-        if (enc != null) {
-            return;
-        }
-        EncryptionInfo ei = dea.getEncryptionInfo();
-        enc = (CryptoAPIEncryptor)ei.getEncryptor();
-    }
-
-
-
-    protected OutputStream encryptRecord(OutputStream plainStream, int persistId, Record record) {
-        boolean isPlain = (dea == null
-            || record instanceof UserEditAtom
-            || record instanceof PersistPtrHolder
-            || record instanceof DocumentEncryptionAtom
-        );
-
-        try {
-            if (isPlain) {
-                if (cyos != null) {
-                    // write cached data to stream
-                    cyos.flush();
-                }
-                return plainStream;
-            }
-
-            encryptInit();
-
-            if (cyos == null) {
-                enc.setChunkSize(-1);
-                cyos = enc.getDataStream(plainStream, 0);
-            }
-            cyos.initCipherForBlock(persistId, false);
-        } catch (Exception e) {
-            throw new EncryptedPowerPointFileException(e);
-        }
-        return cyos;
-    }
-
-    private static void readFully(ChunkedCipherInputStream ccis, byte[] docstream, int offset, int len) throws IOException {
-        if (IOUtils.readFully(ccis, docstream, offset, len) == -1) {
-            throw new EncryptedPowerPointFileException("unexpected EOF");
-        }
-    }
-
-    protected void decryptRecord(byte[] docstream, int persistId, int offset) {
-        if (dea == null) {
-            return;
-        }
-
-        decryptInit();
-        dec.setChunkSize(-1);
-        LittleEndianByteArrayInputStream lei = new LittleEndianByteArrayInputStream(docstream, offset);
-        ChunkedCipherInputStream ccis = null;
-        try {
-            ccis = dec.getDataStream(lei, docstream.length-offset, 0);
-            ccis.initCipherForBlock(persistId);
-
-            // decrypt header and read length to be decrypted
-            readFully(ccis, docstream, offset, 8);
-            // decrypt the rest of the record
-            int rlen = (int)LittleEndian.getUInt(docstream, offset+4);
-            readFully(ccis, docstream, offset+8, rlen);
-
-        } catch (Exception e) {
-            throw new EncryptedPowerPointFileException(e);
-        } finally {
-            try {
-                if (ccis != null) {
-                    ccis.close();
-                }
-                lei.close();
-            } catch (IOException e) {
-                throw new EncryptedPowerPointFileException(e);
-            }
-        }
-    }
-
-    private void decryptPicBytes(byte[] pictstream, int offset, int len)
-    throws IOException, GeneralSecurityException {
-        // when reading the picture elements, each time a segment is read, the cipher needs
-        // to be reset (usually done when calling Cipher.doFinal)
-        LittleEndianByteArrayInputStream lei = new LittleEndianByteArrayInputStream(pictstream, offset);
-        ChunkedCipherInputStream ccis = dec.getDataStream(lei, len, 0);
-        readFully(ccis, pictstream, offset, len);
-        ccis.close();
-        lei.close();
-    }
-    
-    protected void decryptPicture(byte[] pictstream, int offset) {
-        if (dea == null) {
-            return;
-        }
-
-        decryptInit();
-
-        try {
-            // decrypt header and read length to be decrypted
-            decryptPicBytes(pictstream, offset, 8);
-            int recInst = fieldRecInst.getValue(LittleEndian.getUShort(pictstream, offset));
-            int recType = LittleEndian.getUShort(pictstream, offset+2);
-            int rlen = (int)LittleEndian.getUInt(pictstream, offset+4);
-            offset += 8;
-            int endOffset = offset + rlen;
-
-            if (recType == 0xF007) {
-                // TOOD: get a real example file ... to actual test the FBSE entry
-                // not sure where the foDelay block is
-
-                // File BLIP Store Entry (FBSE)
-                for (int part : BLIB_STORE_ENTRY_PARTS) {
-                    decryptPicBytes(pictstream, offset, part);
-                }
-                offset += 36;
-                
-                int cbName = LittleEndian.getUShort(pictstream, offset-3);
-                if (cbName > 0) {
-                    // read nameData
-                    decryptPicBytes(pictstream, offset, cbName);
-                    offset += cbName;
-                }
-                
-                if (offset == endOffset) {
-                    return; // no embedded blip
-                }
-                // fall through, read embedded blip now
-
-                // update header data
-                decryptPicBytes(pictstream, offset, 8);
-                recInst = fieldRecInst.getValue(LittleEndian.getUShort(pictstream, offset));
-                recType = LittleEndian.getUShort(pictstream, offset+2);
-                // rlen = (int)LittleEndian.getUInt(pictstream, offset+4);
-                offset += 8;
-            }
-
-            int rgbUidCnt = (recInst == 0x217 || recInst == 0x3D5 || recInst == 0x46B || recInst == 0x543 ||
-                recInst == 0x6E1 || recInst == 0x6E3 || recInst == 0x6E5 || recInst == 0x7A9) ? 2 : 1;
-
-            // rgbUid 1/2
-            for (int i=0; i<rgbUidCnt; i++) {
-                decryptPicBytes(pictstream, offset, 16);
-                offset += 16;
-            }
-
-            int nextBytes;
-            if (recType == 0xF01A || recType == 0XF01B || recType == 0XF01C) {
-                // metafileHeader
-                nextBytes = 34;
-            } else {
-                // tag
-                nextBytes = 1;
-            }
-            
-            decryptPicBytes(pictstream, offset, nextBytes);
-            offset += nextBytes;
-
-            int blipLen = endOffset - offset;
-            decryptPicBytes(pictstream, offset, blipLen);
-        } catch (Exception e) {
-            throw new CorruptPowerPointFileException(e);
-        }
-    }
-
-    protected void encryptPicture(byte[] pictstream, int offset) {
-        if (dea == null) {
-            return;
-        }
-
-        encryptInit();
-
-        LittleEndianByteArrayOutputStream los = new LittleEndianByteArrayOutputStream(pictstream, offset);
-        ChunkedCipherOutputStream ccos = null;
-
-        try {
-            enc.setChunkSize(-1);
-            ccos = enc.getDataStream(los, 0);
-            int recInst = fieldRecInst.getValue(LittleEndian.getUShort(pictstream, offset));
-            int recType = LittleEndian.getUShort(pictstream, offset+2);
-            final int rlen = (int)LittleEndian.getUInt(pictstream, offset+4);
-
-            ccos.write(pictstream, offset, 8);
-            ccos.flush();
-            offset += 8;
-            int endOffset = offset + rlen;
-
-            if (recType == 0xF007) {
-                // TOOD: get a real example file ... to actual test the FBSE entry
-                // not sure where the foDelay block is
-
-                // File BLIP Store Entry (FBSE)
-                int cbName = LittleEndian.getUShort(pictstream, offset+33);
-                
-                for (int part : BLIB_STORE_ENTRY_PARTS) {
-                    ccos.write(pictstream, offset, part);
-                    ccos.flush();
-                    offset += part;
-                }
-                
-                if (cbName > 0) {
-                    ccos.write(pictstream, offset, cbName);
-                    ccos.flush();
-                    offset += cbName;
-                }
-                
-                if (offset == endOffset) {
-                    return; // no embedded blip
-                }
-                // fall through, read embedded blip now
-
-                // update header data
-                recInst = fieldRecInst.getValue(LittleEndian.getUShort(pictstream, offset));
-                recType = LittleEndian.getUShort(pictstream, offset+2);
-                ccos.write(pictstream, offset, 8);
-                ccos.flush();
-                offset += 8;
-            }
-
-            int rgbUidCnt = (recInst == 0x217 || recInst == 0x3D5 || recInst == 0x46B || recInst == 0x543 ||
-                recInst == 0x6E1 || recInst == 0x6E3 || recInst == 0x6E5 || recInst == 0x7A9) ? 2 : 1;
-
-            for (int i=0; i<rgbUidCnt; i++) {
-                ccos.write(pictstream, offset, 16); // rgbUid 1/2
-                ccos.flush();
-                offset += 16;
-            }
-
-            if (recType == 0xF01A || recType == 0XF01B || recType == 0XF01C) {
-                ccos.write(pictstream, offset, 34); // metafileHeader
-                offset += 34;
-                ccos.flush();
-            } else {
-                ccos.write(pictstream, offset, 1); // tag
-                offset += 1;
-                ccos.flush();
-            }
-
-            int blipLen = endOffset - offset;
-            ccos.write(pictstream, offset, blipLen);
-            ccos.flush();
-        } catch (Exception e) {
-            throw new EncryptedPowerPointFileException(e);
-        } finally {
-            try {
-                if (ccos != null) {
-                    ccos.close();
-                }
-                los.close();
-            } catch (IOException e) {
-                throw new EncryptedPowerPointFileException(e);
-            }
-        }
-    }
-
-    protected Record[] updateEncryptionRecord(Record records[]) {
-        String password = Biff8EncryptionKey.getCurrentUserPassword();
-        if (password == null) {
-            if (dea == null) {
-                // no password given, no encryption record exits -> done
-                return records;
-            } else {
-                // need to remove password data
-                dea = null;
-                return removeEncryptionRecord(records);
-            }
-        } else {
-            // create password record
-            if (dea == null) {
-                dea = new DocumentEncryptionAtom();
-                enc = null;
-            }
-            encryptInit();
-            EncryptionInfo ei = dea.getEncryptionInfo();
-            byte salt[] = ei.getVerifier().getSalt();
-            if (salt == null) {
-                enc.confirmPassword(password);
-            } else {
-                byte verifier[] = ei.getDecryptor().getVerifier();
-                enc.confirmPassword(password, null, null, verifier, salt, null);
-            }
-
-            // move EncryptionRecord to last slide position
-            records = normalizeRecords(records);
-            return addEncryptionRecord(records, dea);
-        }
-    }
-
-    /**
-     * remove duplicated UserEditAtoms and merge PersistPtrHolder.
-     * Before this method is called, make sure that the offsets are correct,
-     * i.e. call {@link HSLFSlideShowImpl#updateAndWriteDependantRecords(OutputStream, Map)}
-     */
-    protected static Record[] normalizeRecords(Record records[]) {
-        // http://msdn.microsoft.com/en-us/library/office/gg615594(v=office.14).aspx
-        // repeated slideIds can be overwritten, i.e. ignored
-
-        UserEditAtom uea = null;
-        PersistPtrHolder pph = null;
-        TreeMap<Integer,Integer> slideLocations = new TreeMap<Integer,Integer>();
-        TreeMap<Integer,Record> recordMap = new TreeMap<Integer,Record>();
-        List<Integer> obsoleteOffsets = new ArrayList<Integer>();
-        int duplicatedCount = 0;
-        for (Record r : records) {
-            assert(r instanceof PositionDependentRecord);
-            PositionDependentRecord pdr = (PositionDependentRecord)r;
-            if (pdr instanceof UserEditAtom) {
-                uea = (UserEditAtom)pdr;
-                continue;
-            }
-
-            if (pdr instanceof PersistPtrHolder) {
-                if (pph != null) {
-                    duplicatedCount++;
-                }
-                pph = (PersistPtrHolder)pdr;
-                for (Map.Entry<Integer,Integer> me : pph.getSlideLocationsLookup().entrySet()) {
-                    Integer oldOffset = slideLocations.put(me.getKey(), me.getValue());
-                    if (oldOffset != null) {
-                        obsoleteOffsets.add(oldOffset);
-                    }
-                }
-                continue;
-            }
-
-            recordMap.put(pdr.getLastOnDiskOffset(), r);
-        }
-
-        assert(uea != null && pph != null && uea.getPersistPointersOffset() == pph.getLastOnDiskOffset());
-
-        recordMap.put(pph.getLastOnDiskOffset(), pph);
-        recordMap.put(uea.getLastOnDiskOffset(), uea);
-
-        if (duplicatedCount == 0 && obsoleteOffsets.isEmpty()) {
-            return records;
-        }
-
-        uea.setLastUserEditAtomOffset(0);
-        pph.clear();
-        for (Map.Entry<Integer,Integer> me : slideLocations.entrySet()) {
-            pph.addSlideLookup(me.getKey(), me.getValue());
-        }
-
-        for (Integer oldOffset : obsoleteOffsets) {
-            recordMap.remove(oldOffset);
-        }
-
-        return recordMap.values().toArray(new Record[recordMap.size()]);
-    }
-
-
-    protected static Record[] removeEncryptionRecord(Record records[]) {
-        int deaSlideId = -1;
-        int deaOffset = -1;
-        PersistPtrHolder ptr = null;
-        UserEditAtom uea = null;
-        List<Record> recordList = new ArrayList<Record>();
-        for (Record r : records) {
-            if (r instanceof DocumentEncryptionAtom) {
-                deaOffset = ((DocumentEncryptionAtom)r).getLastOnDiskOffset();
-                continue;
-            } else if (r instanceof UserEditAtom) {
-                uea = (UserEditAtom)r;
-                deaSlideId = uea.getEncryptSessionPersistIdRef();
-                uea.setEncryptSessionPersistIdRef(-1);
-            } else if (r instanceof PersistPtrHolder) {
-                ptr = (PersistPtrHolder)r;
-            }
-            recordList.add(r);
-        }
-
-        assert(ptr != null);
-        if (deaSlideId == -1 && deaOffset == -1) {
-            return records;
-        }
-
-        TreeMap<Integer,Integer> tm = new TreeMap<Integer,Integer>(ptr.getSlideLocationsLookup());
-        ptr.clear();
-        int maxSlideId = -1;
-        for (Map.Entry<Integer,Integer> me : tm.entrySet()) {
-            if (me.getKey() == deaSlideId || me.getValue() == deaOffset) {
-                continue;
-            }
-            ptr.addSlideLookup(me.getKey(), me.getValue());
-            maxSlideId = Math.max(me.getKey(), maxSlideId);
-        }
-
-        uea.setMaxPersistWritten(maxSlideId);
-
-        records = recordList.toArray(new Record[recordList.size()]);
-
-        return records;
-    }
-
-
-    protected static Record[] addEncryptionRecord(Record records[], DocumentEncryptionAtom dea) {
-        assert(dea != null);
-        int ueaIdx = -1, ptrIdx = -1, deaIdx = -1, idx = -1;
-        for (Record r : records) {
-            idx++;
-            if (r instanceof UserEditAtom) {
-                ueaIdx = idx;
-            } else if (r instanceof PersistPtrHolder) {
-                ptrIdx = idx;
-            } else if (r instanceof DocumentEncryptionAtom) {
-                deaIdx = idx;
-            }
-        }
-        assert(ueaIdx != -1 && ptrIdx != -1 && ptrIdx < ueaIdx);
-        if (deaIdx != -1) {
-            DocumentEncryptionAtom deaOld = (DocumentEncryptionAtom)records[deaIdx];
-            dea.setLastOnDiskOffset(deaOld.getLastOnDiskOffset());
-            records[deaIdx] = dea;
-            return records;
-        } else {
-            PersistPtrHolder ptr = (PersistPtrHolder)records[ptrIdx];
-            UserEditAtom uea = ((UserEditAtom)records[ueaIdx]);
-            dea.setLastOnDiskOffset(ptr.getLastOnDiskOffset()-1);
-            int nextSlideId = uea.getMaxPersistWritten()+1;
-            ptr.addSlideLookup(nextSlideId, ptr.getLastOnDiskOffset()-1);
-            uea.setEncryptSessionPersistIdRef(nextSlideId);
-            uea.setMaxPersistWritten(nextSlideId);
-
-            Record newRecords[] = new Record[records.length+1];
-            if (ptrIdx > 0) {
-                System.arraycopy(records, 0, newRecords, 0, ptrIdx);
-            }
-            if (ptrIdx < records.length-1) {
-                System.arraycopy(records, ptrIdx, newRecords, ptrIdx+1, records.length-ptrIdx);
-            }
-            newRecords[ptrIdx] = dea;
-            return newRecords;
-        }
-    }
-
-    public void close() throws IOException {
-        if (cyos != null) {
-            cyos.close();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
deleted file mode 100644
index 3ae91f7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.io.IOException;
-
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.util.Internal;
-
-@Internal
-public class HSLFSlideShowFactory extends SlideShowFactory {
-    /**
-     * Creates a HSLFSlideShow from the given NPOIFSFileSystem
-     * <p>Note that in order to properly release resources the
-     *  SlideShow should be closed after use.
-     */
-    public static SlideShow<?,?> createSlideShow(NPOIFSFileSystem fs) throws IOException {
-        return new HSLFSlideShow(fs);
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
deleted file mode 100644
index 493d461..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
+++ /dev/null
@@ -1,900 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import org.apache.poi.POIDocument;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.record.CurrentUserAtom;
-import org.apache.poi.hslf.record.DocumentEncryptionAtom;
-import org.apache.poi.hslf.record.ExOleObjStg;
-import org.apache.poi.hslf.record.PersistPtrHolder;
-import org.apache.poi.hslf.record.PersistRecord;
-import org.apache.poi.hslf.record.PositionDependentRecord;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.UserEditAtom;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptor;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.EntryUtils;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class contains the main functionality for the Powerpoint file
- * "reader". It is only a very basic class for now
- */
-public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
-    public static final int UNSET_OFFSET = -1;
-
-    // For logging
-    private POILogger logger = POILogFactory.getLogger(this.getClass());
-
-    // Holds metadata on where things are in our document
-    private CurrentUserAtom currentUser;
-
-    // Low level contents of the file
-    private byte[] _docstream;
-
-    // Low level contents
-    private Record[] _records;
-
-    // Raw Pictures contained in the pictures stream
-    private List<HSLFPictureData> _pictures;
-
-    // Embedded objects stored in storage records in the document stream, lazily populated.
-    private HSLFObjectData[] _objects;
-
-    /**
-     * Returns the directory in the underlying POIFSFileSystem for the
-     * document that is open.
-     */
-    protected DirectoryNode getPOIFSDirectory() {
-        return directory;
-    }
-
-    /**
-     * Constructs a Powerpoint document from fileName. Parses the document
-     * and places all the important stuff into data structures.
-     *
-     * @param fileName The name of the file to read.
-     * @throws IOException if there is a problem while parsing the document.
-     */
-    @SuppressWarnings("resource")
-    public HSLFSlideShowImpl(String fileName) throws IOException {
-        this(new POIFSFileSystem(new File(fileName)));
-    }
-
-    /**
-     * Constructs a Powerpoint document from an input stream. Parses the
-     * document and places all the important stuff into data structures.
-     *
-     * @param inputStream the source of the data
-     * @throws IOException if there is a problem while parsing the document.
-     */
-    @SuppressWarnings("resource")
-    public HSLFSlideShowImpl(InputStream inputStream) throws IOException {
-        //do Ole stuff
-        this(new POIFSFileSystem(inputStream));
-    }
-
-    /**
-     * Constructs a Powerpoint document from a POIFS Filesystem. Parses the
-     * document and places all the important stuff into data structures.
-     *
-     * @param filesystem the POIFS FileSystem to read from
-     * @throws IOException if there is a problem while parsing the document.
-     */
-    public HSLFSlideShowImpl(POIFSFileSystem filesystem) throws IOException {
-        this(filesystem.getRoot());
-    }
-
-    /**
-     * Constructs a Powerpoint document from a POIFS Filesystem. Parses the
-     * document and places all the important stuff into data structures.
-     *
-     * @param filesystem the POIFS FileSystem to read from
-     * @throws IOException if there is a problem while parsing the document.
-     */
-    public HSLFSlideShowImpl(NPOIFSFileSystem filesystem) throws IOException {
-        this(filesystem.getRoot());
-    }
-
-    /**
-     * Constructs a Powerpoint document from a specific point in a
-     * POIFS Filesystem. Parses the document and places all the
-     * important stuff into data structures.
-     *
-     * @param dir the POIFS directory to read from
-     * @throws IOException if there is a problem while parsing the document.
-     */
-    public HSLFSlideShowImpl(DirectoryNode dir) throws IOException {
-        super(handleDualStorage(dir));
-
-        // First up, grab the "Current User" stream
-        // We need this before we can detect Encrypted Documents
-        readCurrentUserStream();
-
-        // Next up, grab the data that makes up the
-        //  PowerPoint stream
-        readPowerPointStream();
-
-        // Now, build records based on the PowerPoint stream
-        buildRecords();
-
-        // Look for any other streams
-        readOtherStreams();
-    }
-
-    private static DirectoryNode handleDualStorage(DirectoryNode dir) throws IOException {
-        // when there's a dual storage entry, use it, as the outer document can't be read quite probably ...
-        String dualName = "PP97_DUALSTORAGE";
-        if (!dir.hasEntry(dualName)) return dir;
-        dir = (DirectoryNode) dir.getEntry(dualName);
-        return dir;
-    }
-
-    /**
-     * Constructs a new, empty, Powerpoint document.
-     */
-    public static final HSLFSlideShowImpl create() {
-        InputStream is = HSLFSlideShowImpl.class.getResourceAsStream("/org/apache/poi/hslf/data/empty.ppt");
-        if (is == null) {
-            throw new HSLFException("Missing resource 'empty.ppt'");
-        }
-        try {
-            try {
-                return new HSLFSlideShowImpl(is);
-            } finally {
-                is.close();
-            }
-        } catch (IOException e) {
-            throw new HSLFException(e);
-        }
-    }
-
-    /**
-     * Extracts the main PowerPoint document stream from the
-     * POI file, ready to be passed
-     *
-     * @throws IOException
-     */
-    private void readPowerPointStream() throws IOException {
-        // Get the main document stream
-        DocumentEntry docProps =
-                (DocumentEntry) directory.getEntry("PowerPoint Document");
-
-        // Grab the document stream
-        int len = docProps.getSize();
-        InputStream is = directory.createDocumentInputStream("PowerPoint Document");
-        try {
-            _docstream = IOUtils.toByteArray(is, len);
-        } finally {
-            is.close();
-        }
-    }
-
-    /**
-     * Builds the list of records, based on the contents
-     * of the PowerPoint stream
-     */
-    private void buildRecords() {
-        // The format of records in a powerpoint file are:
-        //   <little endian 2 byte "info">
-        //   <little endian 2 byte "type">
-        //   <little endian 4 byte "length">
-        // If it has a zero length, following it will be another record
-        //		<xx xx yy yy 00 00 00 00> <xx xx yy yy zz zz zz zz>
-        // If it has a length, depending on its type it may have children or data
-        // If it has children, these will follow straight away
-        //		<xx xx yy yy zz zz zz zz <xx xx yy yy zz zz zz zz>>
-        // If it has data, this will come straigh after, and run for the length
-        //      <xx xx yy yy zz zz zz zz dd dd dd dd dd dd dd>
-        // All lengths given exclude the 8 byte record header
-        // (Data records are known as Atoms)
-
-        // Document should start with:
-        //   0F 00 E8 03 ## ## ## ##
-        //     (type 1000 = document, info 00 0f is normal, rest is document length)
-        //   01 00 E9 03 28 00 00 00
-        //     (type 1001 = document atom, info 00 01 normal, 28 bytes long)
-        //   80 16 00 00 E0 10 00 00 xx xx xx xx xx xx xx xx
-        //   05 00 00 00 0A 00 00 00 xx xx xx
-        //     (the contents of the document atom, not sure what it means yet)
-        //   (records then follow)
-
-        // When parsing a document, look to see if you know about that type
-        //  of the current record. If you know it's a type that has children,
-        //  process the record's data area looking for more records
-        // If you know about the type and it doesn't have children, either do
-        //  something with the data (eg TextRun) or skip over it
-        // If you don't know about the type, play safe and skip over it (using
-        //  its length to know where the next record will start)
-        //
-
-        _records = read(_docstream, (int) currentUser.getCurrentEditOffset());
-    }
-
-    private Record[] read(byte[] docstream, int usrOffset) {
-        //sort found records by offset.
-        //(it is not necessary but SlideShow.findMostRecentCoreRecords() expects them sorted)
-        NavigableMap<Integer, Record> records = new TreeMap<Integer, Record>(); // offset -> record
-        Map<Integer, Integer> persistIds = new HashMap<Integer, Integer>(); // offset -> persistId
-        initRecordOffsets(docstream, usrOffset, records, persistIds);
-        HSLFSlideShowEncrypted decryptData = new HSLFSlideShowEncrypted(docstream, records);
-
-        for (Map.Entry<Integer, Record> entry : records.entrySet()) {
-            Integer offset = entry.getKey();
-            Record record = entry.getValue();
-            Integer persistId = persistIds.get(offset);
-            if (record == null) {
-                // all plain records have been already added,
-                // only new records need to be decrypted (tbd #35897)
-                decryptData.decryptRecord(docstream, persistId, offset);
-                record = Record.buildRecordAtOffset(docstream, offset);
-                entry.setValue(record);
-            }
-
-            if (record instanceof PersistRecord) {
-                ((PersistRecord) record).setPersistId(persistId);
-            }
-        }
-
-        return records.values().toArray(new Record[records.size()]);
-    }
-
-    private void initRecordOffsets(byte[] docstream, int usrOffset, NavigableMap<Integer, Record> recordMap, Map<Integer, Integer> offset2id) {
-        while (usrOffset != 0) {
-            UserEditAtom usr = (UserEditAtom) Record.buildRecordAtOffset(docstream, usrOffset);
-            recordMap.put(usrOffset, usr);
-
-            int psrOffset = usr.getPersistPointersOffset();
-            PersistPtrHolder ptr = (PersistPtrHolder) Record.buildRecordAtOffset(docstream, psrOffset);
-            recordMap.put(psrOffset, ptr);
-
-            for (Map.Entry<Integer, Integer> entry : ptr.getSlideLocationsLookup().entrySet()) {
-                Integer offset = entry.getValue();
-                Integer id = entry.getKey();
-                recordMap.put(offset, null); // reserve a slot for the record
-                offset2id.put(offset, id);
-            }
-
-            usrOffset = usr.getLastUserEditAtomOffset();
-
-            // check for corrupted user edit atom and try to repair it
-            // if the next user edit atom offset is already known, we would go into an endless loop
-            if (usrOffset > 0 && recordMap.containsKey(usrOffset)) {
-                // a user edit atom is usually located 36 byte before the smallest known record offset 
-                usrOffset = recordMap.firstKey() - 36;
-                // check that we really are located on a user edit atom
-                int ver_inst = LittleEndian.getUShort(docstream, usrOffset);
-                int type = LittleEndian.getUShort(docstream, usrOffset + 2);
-                int len = LittleEndian.getInt(docstream, usrOffset + 4);
-                if (ver_inst == 0 && type == 4085 && (len == 0x1C || len == 0x20)) {
-                    logger.log(POILogger.WARN, "Repairing invalid user edit atom");
-                    usr.setLastUserEditAtomOffset(usrOffset);
-                } else {
-                    throw new CorruptPowerPointFileException("Powerpoint document contains invalid user edit atom");
-                }
-            }
-        }
-    }
-
-    public DocumentEncryptionAtom getDocumentEncryptionAtom() {
-        for (Record r : _records) {
-            if (r instanceof DocumentEncryptionAtom) {
-                return (DocumentEncryptionAtom) r;
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * Find the "Current User" stream, and load it
-     */
-    private void readCurrentUserStream() {
-        try {
-            currentUser = new CurrentUserAtom(directory);
-        } catch (IOException ie) {
-            logger.log(POILogger.ERROR, "Error finding Current User Atom:\n" + ie);
-            currentUser = new CurrentUserAtom();
-        }
-    }
-
-    /**
-     * Find any other streams from the filesystem, and load them
-     */
-    private void readOtherStreams() {
-        // Currently, there aren't any
-    }
-
-    /**
-     * Find and read in pictures contained in this presentation.
-     * This is lazily called as and when we want to touch pictures.
-     */
-    private void readPictures() throws IOException {
-        _pictures = new ArrayList<HSLFPictureData>();
-
-        // if the presentation doesn't contain pictures - will use a null set instead
-        if (!directory.hasEntry("Pictures")) return;
-
-        HSLFSlideShowEncrypted decryptData = new HSLFSlideShowEncrypted(getDocumentEncryptionAtom());
-
-        DocumentEntry entry = (DocumentEntry) directory.getEntry("Pictures");
-        DocumentInputStream is = directory.createDocumentInputStream(entry);
-        byte[] pictstream = IOUtils.toByteArray(is, entry.getSize());
-        is.close();
-
-        int pos = 0;
-        // An empty picture record (length 0) will take up 8 bytes
-        while (pos <= (pictstream.length - 8)) {
-            int offset = pos;
-
-            decryptData.decryptPicture(pictstream, offset);
-
-            // Image signature
-            int signature = LittleEndian.getUShort(pictstream, pos);
-            pos += LittleEndian.SHORT_SIZE;
-            // Image type + 0xF018
-            int type = LittleEndian.getUShort(pictstream, pos);
-            pos += LittleEndian.SHORT_SIZE;
-            // Image size (excluding the 8 byte header)
-            int imgsize = LittleEndian.getInt(pictstream, pos);
-            pos += LittleEndian.INT_SIZE;
-
-            // When parsing the BStoreDelay stream, [MS-ODRAW] says that we
-            //  should terminate if the type isn't 0xf007 or 0xf018->0xf117
-            if (!((type == 0xf007) || (type >= 0xf018 && type <= 0xf117)))
-                break;
-
-            // The image size must be 0 or greater
-            // (0 is allowed, but odd, since we do wind on by the header each
-            //  time, so we won't get stuck)
-            if (imgsize < 0) {
-                throw new CorruptPowerPointFileException("The file contains a picture, at position " + _pictures.size() + ", which has a negatively sized data length, so we can't trust any of the picture data");
-            }
-
-            // If they type (including the bonus 0xF018) is 0, skip it
-            PictureType pt = PictureType.forNativeID(type - 0xF018);
-            if (pt == null) {
-                logger.log(POILogger.ERROR, "Problem reading picture: Invalid image type 0, on picture with length " + imgsize + ".\nYou document will probably become corrupted if you save it!");
-                logger.log(POILogger.ERROR, "" + pos);
-            } else {
-                //The pictstream can be truncated halfway through a picture.
-                //This is not a problem if the pictstream contains extra pictures
-                //that are not used in any slide -- BUG-60305
-                if (pos+imgsize > pictstream.length) {
-                    logger.log(POILogger.WARN, "\"Pictures\" stream may have ended early. In some circumstances, this is not a problem; " +
-                            "in others, this could indicate a corrupt file");
-                    break;
-                }
-                // Build the PictureData object from the data
-                try {
-                    HSLFPictureData pict = HSLFPictureData.create(pt);
-                    pict.setSignature(signature);
-
-                    // Copy the data, ready to pass to PictureData
-                    byte[] imgdata = new byte[imgsize];
-                    System.arraycopy(pictstream, pos, imgdata, 0, imgdata.length);
-                    pict.setRawData(imgdata);
-
-                    pict.setOffset(offset);
-                    pict.setIndex(_pictures.size());
-                    _pictures.add(pict);
-                } catch (IllegalArgumentException e) {
-                    logger.log(POILogger.ERROR, "Problem reading picture: " + e + "\nYou document will probably become corrupted if you save it!");
-                }
-            }
-
-            pos += imgsize;
-        }
-    }
-
-    /**
-     * remove duplicated UserEditAtoms and merge PersistPtrHolder, i.e.
-     * remove document edit history
-     */
-    public void normalizeRecords() {
-        try {
-            updateAndWriteDependantRecords(null, null);
-        } catch (IOException e) {
-            throw new CorruptPowerPointFileException(e);
-        }
-        _records = HSLFSlideShowEncrypted.normalizeRecords(_records);
-    }
-
-
-    /**
-     * This is a helper functions, which is needed for adding new position dependent records
-     * or finally write the slideshow to a file.
-     *
-     * @param os                 the stream to write to, if null only the references are updated
-     * @param interestingRecords a map of interesting records (PersistPtrHolder and UserEditAtom)
-     *                           referenced by their RecordType. Only the very last of each type will be saved to the map.
-     *                           May be null, if not needed.
-     * @throws IOException
-     */
-    public void updateAndWriteDependantRecords(OutputStream os, Map<RecordTypes, PositionDependentRecord> interestingRecords)
-            throws IOException {
-        // For position dependent records, hold where they were and now are
-        // As we go along, update, and hand over, to any Position Dependent
-        //  records we happen across
-        Map<Integer, Integer> oldToNewPositions = new HashMap<Integer, Integer>();
-
-        // First pass - figure out where all the position dependent
-        //   records are going to end up, in the new scheme
-        // (Annoyingly, some powerpoint files have PersistPtrHolders
-        //  that reference slides after the PersistPtrHolder)
-        UserEditAtom usr = null;
-        PersistPtrHolder ptr = null;
-        CountingOS cos = new CountingOS();
-        for (Record record : _records) {
-            // all top level records are position dependent
-            assert (record instanceof PositionDependentRecord);
-            PositionDependentRecord pdr = (PositionDependentRecord) record;
-            int oldPos = pdr.getLastOnDiskOffset();
-            int newPos = cos.size();
-            pdr.setLastOnDiskOffset(newPos);
-            if (oldPos != UNSET_OFFSET) {
-                // new records don't need a mapping, as they aren't in a relation yet
-                oldToNewPositions.put(oldPos, newPos);
-            }
-
-            // Grab interesting records as they come past
-            // this will only save the very last record of each type
-            RecordTypes saveme = null;
-            int recordType = (int) record.getRecordType();
-            if (recordType == RecordTypes.PersistPtrIncrementalBlock.typeID) {
-                saveme = RecordTypes.PersistPtrIncrementalBlock;
-                ptr = (PersistPtrHolder) pdr;
-            } else if (recordType == RecordTypes.UserEditAtom.typeID) {
-                saveme = RecordTypes.UserEditAtom;
-                usr = (UserEditAtom) pdr;
-            }
-            if (interestingRecords != null && saveme != null) {
-                interestingRecords.put(saveme, pdr);
-            }
-
-            // Dummy write out, so the position winds on properly
-            record.writeOut(cos);
-        }
-        cos.close();
-
-        if (usr == null || ptr == null) {
-            throw new HSLFException("UserEditAtom or PersistPtr can't be determined.");
-        }
-
-        Map<Integer, Integer> persistIds = new HashMap<Integer, Integer>();
-        for (Map.Entry<Integer, Integer> entry : ptr.getSlideLocationsLookup().entrySet()) {
-            persistIds.put(oldToNewPositions.get(entry.getValue()), entry.getKey());
-        }
-
-        HSLFSlideShowEncrypted encData = new HSLFSlideShowEncrypted(getDocumentEncryptionAtom());
-
-        for (Record record : _records) {
-            assert (record instanceof PositionDependentRecord);
-            // We've already figured out their new location, and
-            // told them that
-            // Tell them of the positions of the other records though
-            PositionDependentRecord pdr = (PositionDependentRecord) record;
-            Integer persistId = persistIds.get(pdr.getLastOnDiskOffset());
-            if (persistId == null) persistId = 0;
-
-            // For now, we're only handling PositionDependentRecord's that
-            // happen at the top level.
-            // In future, we'll need the handle them everywhere, but that's
-            // a bit trickier
-            pdr.updateOtherRecordReferences(oldToNewPositions);
-
-            // Whatever happens, write out that record tree
-            if (os != null) {
-                record.writeOut(encData.encryptRecord(os, persistId, record));
-            }
-        }
-
-        encData.close();
-
-        // Update and write out the Current User atom
-        int oldLastUserEditAtomPos = (int) currentUser.getCurrentEditOffset();
-        Integer newLastUserEditAtomPos = oldToNewPositions.get(oldLastUserEditAtomPos);
-        if (newLastUserEditAtomPos == null || usr.getLastOnDiskOffset() != newLastUserEditAtomPos) {
-            throw new HSLFException("Couldn't find the new location of the last UserEditAtom that used to be at " + oldLastUserEditAtomPos);
-        }
-        currentUser.setCurrentEditOffset(usr.getLastOnDiskOffset());
-    }
-
-    /**
-     * Writes out the slideshow to the currently open file.
-     * <p>
-     * <p>This will fail (with an {@link IllegalStateException} if the
-     * slideshow was opened read-only, opened from an {@link InputStream}
-     * instead of a File, or if this is not the root document. For those cases,
-     * you must use {@link #write(OutputStream)} or {@link #write(File)} to
-     * write to a brand new document.
-     *
-     * @throws IOException           thrown on errors writing to the file
-     * @throws IllegalStateException if this isn't from a writable File
-     * @since POI 3.15 beta 3
-     */
-    @Override
-    public void write() throws IOException {
-        validateInPlaceWritePossible();
-
-        // Write the PowerPoint streams to the current FileSystem
-        // No need to do anything to other streams, already there! 
-        write(directory.getFileSystem(), false);
-
-        // Sync with the File on disk
-        directory.getFileSystem().writeFilesystem();
-    }
-
-    /**
-     * Writes out the slideshow file the is represented by an instance
-     * of this class.
-     * <p>This will write out only the common OLE2 streams. If you require all
-     * streams to be written out, use {@link #write(File, boolean)}
-     * with <code>preserveNodes</code> set to <code>true</code>.
-     *
-     * @param newFile The File to write to.
-     * @throws IOException If there is an unexpected IOException from writing to the File
-     */
-    @Override
-    public void write(File newFile) throws IOException {
-        // Write out, but only the common streams
-        write(newFile, false);
-    }
-
-    /**
-     * Writes out the slideshow file the is represented by an instance
-     * of this class.
-     * If you require all streams to be written out (eg Marcos, embeded
-     * documents), then set <code>preserveNodes</code> set to <code>true</code>
-     *
-     * @param newFile       The File to write to.
-     * @param preserveNodes Should all OLE2 streams be written back out, or only the common ones?
-     * @throws IOException If there is an unexpected IOException from writing to the File
-     */
-    public void write(File newFile, boolean preserveNodes) throws IOException {
-        // Get a new FileSystem to write into
-        POIFSFileSystem outFS = POIFSFileSystem.create(newFile);
-
-        try {
-            // Write into the new FileSystem
-            write(outFS, preserveNodes);
-
-            // Send the POIFSFileSystem object out to the underlying stream
-            outFS.writeFilesystem();
-        } finally {
-            outFS.close();
-        }
-    }
-
-    /**
-     * Writes out the slideshow file the is represented by an instance
-     * of this class.
-     * <p>This will write out only the common OLE2 streams. If you require all
-     * streams to be written out, use {@link #write(OutputStream, boolean)}
-     * with <code>preserveNodes</code> set to <code>true</code>.
-     *
-     * @param out The OutputStream to write to.
-     * @throws IOException If there is an unexpected IOException from
-     *                     the passed in OutputStream
-     */
-    @Override
-    public void write(OutputStream out) throws IOException {
-        // Write out, but only the common streams
-        write(out, false);
-    }
-
-    /**
-     * Writes out the slideshow file the is represented by an instance
-     * of this class.
-     * If you require all streams to be written out (eg Marcos, embeded
-     * documents), then set <code>preserveNodes</code> set to <code>true</code>
-     *
-     * @param out           The OutputStream to write to.
-     * @param preserveNodes Should all OLE2 streams be written back out, or only the common ones?
-     * @throws IOException If there is an unexpected IOException from
-     *                     the passed in OutputStream
-     */
-    public void write(OutputStream out, boolean preserveNodes) throws IOException {
-        // Get a new FileSystem to write into
-        POIFSFileSystem outFS = new POIFSFileSystem();
-
-        try {
-            // Write into the new FileSystem
-            write(outFS, preserveNodes);
-
-            // Send the POIFSFileSystem object out to the underlying stream
-            outFS.writeFilesystem(out);
-        } finally {
-            outFS.close();
-        }
-    }
-
-    private void write(NPOIFSFileSystem outFS, boolean copyAllOtherNodes) throws IOException {
-        // read properties and pictures, with old encryption settings where appropriate 
-        if (_pictures == null) {
-            readPictures();
-        }
-        getDocumentSummaryInformation();
-
-        // set new encryption settings
-        HSLFSlideShowEncrypted encryptedSS = new HSLFSlideShowEncrypted(getDocumentEncryptionAtom());
-        _records = encryptedSS.updateEncryptionRecord(_records);
-
-        // The list of entries we've written out
-        List<String> writtenEntries = new ArrayList<String>(1);
-
-        // Write out the Property Streams
-        writeProperties(outFS, writtenEntries);
-
-        BufAccessBAOS baos = new BufAccessBAOS();
-
-        // For position dependent records, hold where they were and now are
-        // As we go along, update, and hand over, to any Position Dependent
-        // records we happen across
-        updateAndWriteDependantRecords(baos, null);
-
-        // Update our cached copy of the bytes that make up the PPT stream
-        _docstream = new byte[baos.size()];
-        System.arraycopy(baos.getBuf(), 0, _docstream, 0, baos.size());
-        baos.close();
-
-        // Write the PPT stream into the POIFS layer
-        ByteArrayInputStream bais = new ByteArrayInputStream(_docstream);
-        outFS.createOrUpdateDocument(bais, "PowerPoint Document");
-        writtenEntries.add("PowerPoint Document");
-
-        currentUser.setEncrypted(encryptedSS.getDocumentEncryptionAtom() != null);
-        currentUser.writeToFS(outFS);
-        writtenEntries.add("Current User");
-
-
-        if (_pictures.size() > 0) {
-            BufAccessBAOS pict = new BufAccessBAOS();
-            for (HSLFPictureData p : _pictures) {
-                int offset = pict.size();
-                p.write(pict);
-                encryptedSS.encryptPicture(pict.getBuf(), offset);
-            }
-            outFS.createOrUpdateDocument(
-                    new ByteArrayInputStream(pict.getBuf(), 0, pict.size()), "Pictures"
-            );
-            writtenEntries.add("Pictures");
-            pict.close();
-        }
-
-        // If requested, copy over any other streams we spot, eg Macros
-        if (copyAllOtherNodes) {
-            EntryUtils.copyNodes(directory.getFileSystem(), outFS, writtenEntries);
-        }
-    }
-
-    /**
-     * For a given named property entry, either return it or null if
-     * if it wasn't found
-     *
-     * @param setName The property to read
-     * @return The value of the given property or null if it wasn't found.
-     */
-    protected PropertySet getPropertySet(String setName) {
-        DocumentEncryptionAtom dea = getDocumentEncryptionAtom();
-        return (dea == null)
-                ? super.getPropertySet(setName)
-                : super.getPropertySet(setName, dea.getEncryptionInfo());
-    }
-
-    /**
-     * Writes out the standard Documment Information Properties (HPSF)
-     *
-     * @param outFS          the POIFSFileSystem to write the properties into
-     * @param writtenEntries a list of POIFS entries to add the property names too
-     * @throws IOException if an error when writing to the
-     *                     {@link POIFSFileSystem} occurs
-     */
-    protected void writeProperties(NPOIFSFileSystem outFS, List<String> writtenEntries) throws IOException {
-        super.writeProperties(outFS, writtenEntries);
-        DocumentEncryptionAtom dea = getDocumentEncryptionAtom();
-        if (dea != null) {
-            CryptoAPIEncryptor enc = (CryptoAPIEncryptor) dea.getEncryptionInfo().getEncryptor();
-            try {
-                enc.getSummaryEntries(outFS.getRoot()); // ignore OutputStream
-            } catch (IOException e) {
-                throw e;
-            } catch (GeneralSecurityException e) {
-                throw new IOException(e);
-            }
-        }
-    }
-    
-    /* ******************* adding methods follow ********************* */
-
-    /**
-     * Adds a new root level record, at the end, but before the last
-     * PersistPtrIncrementalBlock.
-     */
-    public synchronized int appendRootLevelRecord(Record newRecord) {
-        int addedAt = -1;
-        Record[] r = new Record[_records.length + 1];
-        boolean added = false;
-        for (int i = (_records.length - 1); i >= 0; i--) {
-            if (added) {
-                // Just copy over
-                r[i] = _records[i];
-            } else {
-                r[(i + 1)] = _records[i];
-                if (_records[i] instanceof PersistPtrHolder) {
-                    r[i] = newRecord;
-                    added = true;
-                    addedAt = i;
-                }
-            }
-        }
-        _records = r;
-        return addedAt;
-    }
-
-    /**
-     * Add a new picture to this presentation.
-     *
-     * @return offset of this picture in the Pictures stream
-     */
-    public int addPicture(HSLFPictureData img) {
-        // Process any existing pictures if we haven't yet
-        if (_pictures == null) {
-            try {
-                readPictures();
-            } catch (IOException e) {
-                throw new CorruptPowerPointFileException(e.getMessage());
-            }
-        }
-
-        // Add the new picture in
-        int offset = 0;
-        if (_pictures.size() > 0) {
-            HSLFPictureData prev = _pictures.get(_pictures.size() - 1);
-            offset = prev.getOffset() + prev.getRawData().length + 8;
-        }
-        img.setOffset(offset);
-        img.setIndex(_pictures.size() + 1);
-        _pictures.add(img);
-        return offset;
-    }
-
-	/* ******************* fetching methods follow ********************* */
-
-
-    /**
-     * Returns an array of all the records found in the slideshow
-     */
-    public Record[] getRecords() {
-        return _records;
-    }
-
-    /**
-     * Returns an array of the bytes of the file. Only correct after a
-     * call to open or write - at all other times might be wrong!
-     */
-    public byte[] getUnderlyingBytes() {
-        return _docstream;
-    }
-
-    /**
-     * Fetch the Current User Atom of the document
-     */
-    public CurrentUserAtom getCurrentUserAtom() {
-        return currentUser;
-    }
-
-    /**
-     * Return list of pictures contained in this presentation
-     *
-     * @return list with the read pictures or an empty list if the
-     * presentation doesn't contain pictures.
-     */
-    public List<HSLFPictureData> getPictureData() {
-        if (_pictures == null) {
-            try {
-                readPictures();
-            } catch (IOException e) {
-                throw new CorruptPowerPointFileException(e.getMessage());
-            }
-        }
-
-        return Collections.unmodifiableList(_pictures);
-    }
-
-    /**
-     * Gets embedded object data from the slide show.
-     *
-     * @return the embedded objects.
-     */
-    public HSLFObjectData[] getEmbeddedObjects() {
-        if (_objects == null) {
-            List<HSLFObjectData> objects = new ArrayList<HSLFObjectData>();
-            for (Record r : _records) {
-                if (r instanceof ExOleObjStg) {
-                    objects.add(new HSLFObjectData((ExOleObjStg) r));
-                }
-            }
-            _objects = objects.toArray(new HSLFObjectData[objects.size()]);
-        }
-        return _objects;
-    }
-
-    @Override
-    public void close() throws IOException {
-        NPOIFSFileSystem fs = directory.getFileSystem();
-        if (fs != null) {
-            fs.close();
-        }
-    }
-
-
-    private static class BufAccessBAOS extends ByteArrayOutputStream {
-        public byte[] getBuf() {
-            return buf;
-        }
-    }
-
-    private static class CountingOS extends OutputStream {
-        int count = 0;
-
-        public void write(int b) throws IOException {
-            count++;
-        }
-
-        public void write(byte[] b) throws IOException {
-            count += b.length;
-        }
-
-        public void write(byte[] b, int off, int len) throws IOException {
-            count += len;
-        }
-
-        public int size() {
-            return count;
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
deleted file mode 100644
index 7750b25..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.hslf.record.*;
-
-import java.util.ArrayList;
-
-/**
- * A class that represents sound data embedded in a slide show.
- *
- * @author Yegor Kozlov
- */
-public final class HSLFSoundData {
-    /**
-     * The record that contains the object data.
-     */
-    private Sound _container;
-
-    /**
-     * Creates the object data wrapping the record that contains the sound data.
-     *
-     * @param container the record that contains the sound data.
-     */
-    public HSLFSoundData(Sound container) {
-        this._container = container;
-    }
-
-    /**
-     * Name of the sound (e.g. "crash")
-     *
-     * @return name of the sound
-     */
-    public String getSoundName(){
-        return _container.getSoundName();
-    }
-
-    /**
-     * Type of the sound (e.g. ".wav")
-     *
-     * @return type of the sound
-     */
-    public String getSoundType(){
-        return _container.getSoundType();
-    }
-
-    /**
-     * Gets an input stream which returns the binary of the sound data.
-     *
-     * @return the input stream which will contain the binary of the sound data.
-     */
-    public byte[] getData() {
-        return _container.getSoundData();
-    }
-
-    /**
-     * Find all sound records in the supplied Document records
-     *
-     * @param document the document to find in
-     * @return the array with the sound data
-     */
-    public static HSLFSoundData[] find(Document document){
-        ArrayList<HSLFSoundData> lst = new ArrayList<HSLFSoundData>();
-        Record[] ch = document.getChildRecords();
-        for (int i = 0; i < ch.length; i++) {
-            if(ch[i].getRecordType() == RecordTypes.SoundCollection.typeID){
-                RecordContainer col = (RecordContainer)ch[i];
-                Record[] sr = col.getChildRecords();
-                for (int j = 0; j < sr.length; j++) {
-                    if(sr[j] instanceof Sound){
-                        lst.add(new HSLFSoundData((Sound)sr[j]));
-                    }
-                }
-            }
-
-        }
-        return lst.toArray(new HSLFSoundData[lst.size()]);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
deleted file mode 100644
index f007dd9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherArrayProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.TableShape;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.Units;
-
-/**
- * Represents a table in a PowerPoint presentation
- *
- * @author Yegor Kozlov
- */
-public final class HSLFTable extends HSLFGroupShape
-implements HSLFShapeContainer, TableShape<HSLFShape,HSLFTextParagraph> {
-
-    protected static final int BORDERS_ALL = 5;
-    protected static final int BORDERS_OUTSIDE = 6;
-    protected static final int BORDERS_INSIDE = 7;
-    protected static final int BORDERS_NONE = 8;
-
-
-    protected HSLFTableCell[][] cells;
-    private int columnCount = -1;
-
-    /**
-     * Create a new Table of the given number of rows and columns
-     *
-     * @param numRows the number of rows
-     * @param numCols the number of columns
-     */
-    protected HSLFTable(int numRows, int numCols) {
-        this(numRows, numCols, null);
-    }
-
-    /**
-     * Create a new Table of the given number of rows and columns
-     *
-     * @param numRows the number of rows
-     * @param numCols the number of columns
-     * @param parent the parent shape, or null if table is added to sheet
-     */
-    protected HSLFTable(int numRows, int numCols, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        super(parent);
-
-        if(numRows < 1) throw new IllegalArgumentException("The number of rows must be greater than 1");
-        if(numCols < 1) throw new IllegalArgumentException("The number of columns must be greater than 1");
-
-        double x=0, y=0, tblWidth=0, tblHeight=0;
-        cells = new HSLFTableCell[numRows][numCols];
-        for (int i = 0; i < cells.length; i++) {
-            x = 0;
-            for (int j = 0; j < cells[i].length; j++) {
-                cells[i][j] = new HSLFTableCell(this);
-                Rectangle2D anchor = new Rectangle2D.Double(x, y, HSLFTableCell.DEFAULT_WIDTH, HSLFTableCell.DEFAULT_HEIGHT);
-                cells[i][j].setAnchor(anchor);
-                x += HSLFTableCell.DEFAULT_WIDTH;
-            }
-            y += HSLFTableCell.DEFAULT_HEIGHT;
-        }
-        tblWidth = x;
-        tblHeight = y;
-        setExteriorAnchor(new Rectangle2D.Double(0, 0, tblWidth, tblHeight));
-
-        EscherContainerRecord spCont = (EscherContainerRecord) getSpContainer().getChild(0);
-        AbstractEscherOptRecord opt = new EscherOptRecord();
-        opt.setRecordId(RecordTypes.EscherUserDefined.typeID);
-        opt.addEscherProperty(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__TABLEPROPERTIES, 1));
-        EscherArrayProperty p = new EscherArrayProperty((short)(0x4000 | EscherProperties.GROUPSHAPE__TABLEROWPROPERTIES), false, null);
-        p.setSizeOfElements(0x0004);
-        p.setNumberOfElementsInArray(numRows);
-        p.setNumberOfElementsInMemory(numRows);
-        opt.addEscherProperty(p);
-        spCont.addChildBefore(opt, RecordTypes.EscherClientAnchor.typeID);
-    }
-
-    /**
-     * Create a Table object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent       the parent of the shape
-     */
-    protected HSLFTable(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
-        super(escherRecord, parent);
-    }
-
-    @Override
-    public HSLFTableCell getCell(int row, int col) {
-        if (row < 0 || cells.length <= row) {
-            return null;
-        }
-        HSLFTableCell[] r = cells[row];
-        if (r == null || col < 0 || r.length <= col) {
-            // empty row
-            return null;
-        }
-        // cell can be potentially empty ...
-        return r[col];
-    }
-
-    @Override
-    public int getNumberOfColumns() {
-        if (columnCount == -1) {
-            // check all rows in case of merged rows
-            for (HSLFTableCell[] hc : cells) {
-                if (hc != null) {
-                    columnCount = Math.max(columnCount, hc.length);
-                }
-            }
-        }
-        return columnCount;
-    }
-
-    @Override
-    public int getNumberOfRows() {
-        return cells.length;
-    }
-
-    protected void afterInsert(HSLFSheet sh){
-        super.afterInsert(sh);
-
-        Set<HSLFLine> lineSet = new HashSet<HSLFLine>();
-        for (HSLFTableCell row[] : cells) {
-            for (HSLFTableCell c : row) {
-                addShape(c);
-                for (HSLFLine bt : new HSLFLine[]{ c.borderTop, c.borderRight, c.borderBottom, c.borderLeft }) {
-                    if (bt != null) {
-                        lineSet.add(bt);
-                    }
-                }
-            }
-        }
-
-        for (HSLFLine l : lineSet) {
-            addShape(l);
-        }
-
-        updateRowHeightsProperty();
-    }
-
-    private void cellListToArray() {
-        List<HSLFTableCell> htc = new ArrayList<HSLFTableCell>();
-        for (HSLFShape h : getShapes()) {
-            if (h instanceof HSLFTableCell) {
-                htc.add((HSLFTableCell)h);
-            }
-        }
-
-        if (htc.isEmpty()) {
-            throw new IllegalStateException("HSLFTable without HSLFTableCells");
-        }
-        
-        SortedSet<Double> colSet = new TreeSet<Double>();
-        SortedSet<Double> rowSet = new TreeSet<Double>();
-        
-        // #1 pass - determine cols and rows
-        for (HSLFTableCell sh : htc) {
-            Rectangle2D anchor = sh.getAnchor();
-            colSet.add(anchor.getX());
-            rowSet.add(anchor.getY());
-        }
-        cells = new HSLFTableCell[rowSet.size()][colSet.size()];
-        
-        List<Double> colLst = new ArrayList<Double>(colSet);
-        List<Double> rowLst = new ArrayList<Double>(rowSet);
-        
-        // #2 pass - assign shape to table cells
-        for (HSLFTableCell sh : htc) {
-            Rectangle2D anchor = sh.getAnchor();
-            int row = rowLst.indexOf(anchor.getY());
-            int col = colLst.indexOf(anchor.getX());
-            assert(row != -1 && col != -1);
-            cells[row][col] = sh;
-            
-            // determine gridSpan / rowSpan
-            int gridSpan = calcSpan(colLst, anchor.getWidth(), col);
-            int rowSpan = calcSpan(rowLst, anchor.getHeight(), row);
-            
-            sh.setGridSpan(gridSpan);
-            sh.setRowSpan(rowSpan);
-        }        
-    }
-
-    private int calcSpan(List<Double> spaces, double totalSpace, int idx) {
-        if (idx == spaces.size()-1) {
-            return 1;
-        }
-        int span = 0;
-        double remainingSpace = totalSpace;
-        while (idx+1 < spaces.size() && remainingSpace > 0) {
-            remainingSpace -= spaces.get(idx+1)-spaces.get(idx);
-            span++;
-            idx++;
-        }
-        return span;
-    }
-    
-    static class LineRect {
-        final HSLFLine l;
-        final double lx1, lx2, ly1, ly2;
-        LineRect(HSLFLine l) {
-            this.l = l;
-            Rectangle2D r = l.getAnchor();
-            lx1 = r.getMinX();
-            lx2 = r.getMaxX();
-            ly1 = r.getMinY();
-            ly2 = r.getMaxY();
-        }
-        int leftFit(double x1, double x2, double y1, double y2) {
-            return (int)(Math.abs(x1-lx1)+Math.abs(y1-ly1)+Math.abs(x1-lx2)+Math.abs(y2-ly2));
-        }
-        int topFit(double x1, double x2, double y1, double y2) {
-            return (int)(Math.abs(x1-lx1)+Math.abs(y1-ly1)+Math.abs(x2-lx2)+Math.abs(y1-ly2));
-        }
-        int rightFit(double x1, double x2, double y1, double y2) {
-            return (int)(Math.abs(x2-lx1)+Math.abs(y1-ly1)+Math.abs(x2-lx2)+Math.abs(y2-ly2));
-        }
-        int bottomFit(double x1, double x2, double y1, double y2) {
-            return (int)(Math.abs(x1-lx1)+Math.abs(y2-ly1)+Math.abs(x2-lx2)+Math.abs(y2-ly2));
-        }
-    }
-
-    private void fitLinesToCells() {
-        List<LineRect> lines = new ArrayList<LineRect>();
-        for (HSLFShape h : getShapes()) {
-            if (h instanceof HSLFLine) {
-                lines.add(new LineRect((HSLFLine)h));
-            }
-        }
-
-        final int threshold = 5;
-
-        // TODO: this only works for non-rotated tables
-        for (HSLFTableCell[] tca : cells) {
-            for (HSLFTableCell tc : tca) {
-                if (tc == null) {
-                    continue;
-                }
-                final Rectangle2D cellAnchor = tc.getAnchor();
-
-                /**
-                 * x1/y1 --------+
-                 *   |           |
-                 *   +---------x2/y2
-                 */
-                final double x1 = cellAnchor.getMinX();
-                final double x2 = cellAnchor.getMaxX();
-                final double y1 = cellAnchor.getMinY();
-                final double y2 = cellAnchor.getMaxY();
-
-                LineRect lline = null, tline = null, rline = null, bline = null;
-                int lfit = Integer.MAX_VALUE, tfit = Integer.MAX_VALUE, rfit = Integer.MAX_VALUE, bfit = Integer.MAX_VALUE;
-
-                for (LineRect lr : lines) {
-                    // calculate border fit
-                    int lfitx = lr.leftFit(x1, x2, y1, y2);
-                    if (lfitx < lfit) {
-                        lfit = lfitx;
-                        lline = lr;
-                    }
-
-                    int tfitx = lr.topFit(x1, x2, y1, y2);
-                    if (tfitx < tfit) {
-                        tfit = tfitx;
-                        tline = lr;
-                    }
-
-                    int rfitx = lr.rightFit(x1, x2, y1, y2);
-                    if (rfitx < rfit) {
-                        rfit = rfitx;
-                        rline = lr;
-                    }
-
-                    int bfitx = lr.bottomFit(x1, x2, y1, y2);
-                    if (bfitx < bfit) {
-                        bfit = bfitx;
-                        bline = lr;
-                    }
-                }
-
-                if (lfit < threshold) {
-                    tc.borderLeft = lline.l;
-                }
-                if (tfit < threshold) {
-                    tc.borderTop = tline.l;
-                }
-                if (rfit < threshold) {
-                    tc.borderRight = rline.l;
-                }
-                if (bfit < threshold) {
-                    tc.borderBottom = bline.l;
-                }
-            }
-        }
-    }
-
-    protected void initTable(){
-        cellListToArray();
-        fitLinesToCells();
-    }
-
-    /**
-     * Assign the <code>SlideShow</code> this shape belongs to
-     *
-     * @param sheet owner of this shape
-     */
-    public void setSheet(HSLFSheet sheet){
-        super.setSheet(sheet);
-        if (cells == null) {
-            initTable();
-        } else {
-            for (HSLFTableCell cols[] : cells) {
-                for (HSLFTableCell col : cols) {
-                    col.setSheet(sheet);
-                }
-            }
-        }
-    }
-
-    @Override
-    public double getRowHeight(int row) {
-        if (row < 0 || row >= cells.length) {
-            throw new IllegalArgumentException("Row index '"+row+"' is not within range [0-"+(cells.length-1)+"]");
-        }
-        
-        return cells[row][0].getAnchor().getHeight();
-    }
-    
-    @Override
-    public void setRowHeight(int row, double height) {
-        if (row < 0 || row >= cells.length) {
-            throw new IllegalArgumentException("Row index '"+row+"' is not within range [0-"+(cells.length-1)+"]");
-        }
-
-        int pxHeight = Units.pointsToPixel(height);
-        double currentHeight = cells[row][0].getAnchor().getHeight();
-        double dy = pxHeight - currentHeight;
-
-        for (int i = row; i < cells.length; i++) {
-            for (int j = 0; j < cells[i].length; j++) {
-                Rectangle2D anchor = cells[i][j].getAnchor();
-                if(i == row) {
-                    anchor.setRect(anchor.getX(), anchor.getY(), anchor.getWidth(), pxHeight);
-                } else {
-                    anchor.setRect(anchor.getX(), anchor.getY()+dy, anchor.getWidth(), pxHeight);
-                }
-                cells[i][j].setAnchor(anchor);
-            }
-        }
-        Rectangle2D tblanchor = getAnchor();
-        tblanchor.setRect(tblanchor.getX(), tblanchor.getY(), tblanchor.getWidth(), tblanchor.getHeight() + dy);
-        setExteriorAnchor(tblanchor);
-
-    }
-
-    @Override
-    public double getColumnWidth(int col) {
-        if (col < 0 || col >= cells[0].length) {
-            throw new IllegalArgumentException("Column index '"+col+"' is not within range [0-"+(cells[0].length-1)+"]");
-        }
-        
-        // TODO: check for merged cols
-        double width = cells[0][col].getAnchor().getWidth();
-        return width;
-    }
-
-    @Override
-    public void setColumnWidth(int col, final double width){
-        if (col < 0 || col >= cells[0].length) {
-            throw new IllegalArgumentException("Column index '"+col+"' is not within range [0-"+(cells[0].length-1)+"]");
-        }
-        double currentWidth = cells[0][col].getAnchor().getWidth();
-        double dx = width - currentWidth;
-        for (HSLFTableCell cols[] : cells) {
-            Rectangle2D anchor = cols[col].getAnchor();
-            anchor.setRect(anchor.getX(), anchor.getY(), width, anchor.getHeight());
-            cols[col].setAnchor(anchor);
-
-            if (col < cols.length - 1) {
-                for (int j = col+1; j < cols.length; j++) {
-                    anchor = cols[j].getAnchor();
-                    anchor.setRect(anchor.getX()+dx, anchor.getY(), anchor.getWidth(), anchor.getHeight());
-                    cols[j].setAnchor(anchor);
-                }
-            }
-        }
-        Rectangle2D tblanchor = getAnchor();
-        tblanchor.setRect(tblanchor.getX(), tblanchor.getY(), tblanchor.getWidth() + dx, tblanchor.getHeight());
-        setExteriorAnchor(tblanchor);
-    }
-
-    protected HSLFTableCell getRelativeCell(HSLFTableCell origin, int row, int col) {
-        int thisRow = 0, thisCol = 0;
-        boolean found = false;
-        outer: for (HSLFTableCell[] tca : cells) {
-            thisCol = 0;
-            for (HSLFTableCell tc : tca) {
-                if (tc == origin) {
-                    found = true;
-                    break outer;
-                }
-                thisCol++;
-            }
-            thisRow++;
-        }
-
-        int otherRow = thisRow + row;
-        int otherCol = thisCol + col;
-        return (found
-            && 0 <= otherRow && otherRow < cells.length
-            && 0 <= otherCol && otherCol < cells[otherRow].length)
-            ? cells[otherRow][otherCol] : null;
-    }
-
-    @Override
-    protected void moveAndScale(Rectangle2D anchorDest){
-        super.moveAndScale(anchorDest);
-        updateRowHeightsProperty();
-    }
-
-    private void updateRowHeightsProperty() {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherArrayProperty p = opt.lookup(EscherProperties.GROUPSHAPE__TABLEROWPROPERTIES);
-        byte[] val = new byte[4];
-        for (int rowIdx = 0; rowIdx < cells.length; rowIdx++) {
-            int rowHeight = Units.pointsToMaster(cells[rowIdx][0].getAnchor().getHeight());
-            LittleEndian.putInt(val, 0, rowHeight);
-            p.setElement(rowIdx, val);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java
deleted file mode 100644
index a8e3294..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.apache.poi.sl.usermodel.TableCell;
-
-/**
- * Represents a cell in a ppt table
- */
-public final class HSLFTableCell extends HSLFTextBox implements TableCell<HSLFShape,HSLFTextParagraph> {
-    protected static final int DEFAULT_WIDTH = 100;
-    protected static final int DEFAULT_HEIGHT = 40;
-
-    /* package */ HSLFLine borderLeft;
-    /* package */ HSLFLine borderRight;
-    /* package */ HSLFLine borderTop;
-    /* package */ HSLFLine borderBottom;
-
-    /**
-     * The number of columns to be spanned/merged
-     */
-    private int gridSpan = 1;
-
-    /**
-     * The number of columns to be spanned/merged
-     */
-    private int rowSpan = 1;
-
-    /**
-     * Create a TableCell object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord       EscherSpContainer which holds information about this shape
-     * @param parent    the parent of the shape
-     */
-   protected HSLFTableCell(EscherContainerRecord escherRecord, HSLFTable parent){
-        super(escherRecord, parent);
-    }
-
-    /**
-     * Create a new TableCell. This constructor is used when a new shape is created.
-     *
-     * @param parent    the parent of this Shape. For example, if this text box is a cell
-     * in a table then the parent is Table.
-     */
-    public HSLFTableCell(HSLFTable parent){
-        super(parent);
-
-        setShapeType(ShapeType.RECT);
-        //_txtrun.setRunType(TextHeaderAtom.HALF_BODY_TYPE);
-        //_txtrun.getRichTextRuns()[0].setFlag(false, 0, false);
-    }
-
-    protected EscherContainerRecord createSpContainer(boolean isChild){
-        _escherContainer = super.createSpContainer(isChild);
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.TEXT__TEXTID, 0);
-        setEscherProperty(opt, EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 0x20000);
-        setEscherProperty(opt, EscherProperties.FILL__NOFILLHITTEST, 0x150001);
-        setEscherProperty(opt, EscherProperties.SHADOWSTYLE__SHADOWOBSURED, 0x20000);
-        setEscherProperty(opt, EscherProperties.PROTECTION__LOCKAGAINSTGROUPING, 0x40000);
-
-        return _escherContainer;
-    }
-
-    private void anchorBorder(BorderEdge edge, final HSLFLine line) {
-        if (line == null) {
-            return;
-        }
-        Rectangle2D cellAnchor = getAnchor();
-        double x,y,w,h;
-        switch(edge){
-            case top:
-                x = cellAnchor.getX();
-                y = cellAnchor.getY();
-                w = cellAnchor.getWidth();
-                h = 0;
-                break;
-            case right:
-                x = cellAnchor.getX() + cellAnchor.getWidth();
-                y = cellAnchor.getY();
-                w = 0;
-                h = cellAnchor.getHeight();
-                break;
-            case bottom:
-                x = cellAnchor.getX();
-                y = cellAnchor.getY() + cellAnchor.getHeight();
-                w = cellAnchor.getWidth();
-                h = 0;
-                break;
-            case left:
-                x = cellAnchor.getX();
-                y = cellAnchor.getY();
-                w = 0;
-                h = cellAnchor.getHeight();
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-        line.setAnchor(new Rectangle2D.Double(x,y,w,h));
-    }
-
-    public void setAnchor(Rectangle2D anchor){
-        super.setAnchor(anchor);
-
-        anchorBorder(BorderEdge.top, borderTop);
-        anchorBorder(BorderEdge.right, borderRight);
-        anchorBorder(BorderEdge.bottom, borderBottom);
-        anchorBorder(BorderEdge.left, borderLeft);
-    }
-
-    @Override
-    public StrokeStyle getBorderStyle(final BorderEdge edge) {
-        final Double width = getBorderWidth(edge);
-        return (width == null) ? null : new StrokeStyle() {
-            public PaintStyle getPaint() {
-                return DrawPaint.createSolidPaint(getBorderColor(edge));
-            }
-
-            public LineCap getLineCap() {
-                return null;
-            }
-
-            public LineDash getLineDash() {
-                return getBorderDash(edge);
-            }
-
-            public LineCompound getLineCompound() {
-                return getBorderCompound(edge);
-            }
-
-            public double getLineWidth() {
-                return width;
-            }
-        };
-    }
-
-    @Override
-    public void setBorderStyle(BorderEdge edge, StrokeStyle style) {
-        if (style == null) {
-            throw new IllegalArgumentException("StrokeStyle needs to be specified.");
-        }
-
-        // setting the line cap is not implemented, as the border lines aren't connected
-
-        LineCompound compound = style.getLineCompound();
-        if (compound != null) {
-            setBorderCompound(edge, compound);
-        }
-
-        LineDash dash = style.getLineDash();
-        if (dash != null) {
-            setBorderDash(edge, dash);
-        }
-
-        double width = style.getLineWidth();
-        setBorderWidth(edge, width);
-    }
-
-
-    public Double getBorderWidth(BorderEdge edge) {
-        HSLFLine l;
-        switch (edge) {
-            case bottom: l = borderBottom; break;
-            case top: l = borderTop; break;
-            case right: l = borderRight; break;
-            case left: l = borderLeft; break;
-            default: throw new IllegalArgumentException();
-        }
-        return (l == null) ? null : l.getLineWidth();
-    }
-
-    @Override
-    public void setBorderWidth(BorderEdge edge, double width) {
-        HSLFLine l = addLine(edge);
-        l.setLineWidth(width);
-    }
-
-    public Color getBorderColor(BorderEdge edge) {
-        HSLFLine l;
-        switch (edge) {
-            case bottom: l = borderBottom; break;
-            case top: l = borderTop; break;
-            case right: l = borderRight; break;
-            case left: l = borderLeft; break;
-            default: throw new IllegalArgumentException();
-        }
-        return (l == null) ? null : l.getLineColor();
-    }
-
-    @Override
-    public void setBorderColor(BorderEdge edge, Color color) {
-        if (edge == null || color == null) {
-            throw new IllegalArgumentException("BorderEdge and/or Color need to be specified.");
-        }
-
-        HSLFLine l = addLine(edge);
-        l.setLineColor(color);
-    }
-
-    public LineDash getBorderDash(BorderEdge edge) {
-        HSLFLine l;
-        switch (edge) {
-            case bottom: l = borderBottom; break;
-            case top: l = borderTop; break;
-            case right: l = borderRight; break;
-            case left: l = borderLeft; break;
-            default: throw new IllegalArgumentException();
-        }
-        return (l == null) ? null : l.getLineDash();
-    }
-
-    @Override
-    public void setBorderDash(BorderEdge edge, LineDash dash) {
-        if (edge == null || dash == null) {
-            throw new IllegalArgumentException("BorderEdge and/or LineDash need to be specified.");
-        }
-
-        HSLFLine l = addLine(edge);
-        l.setLineDash(dash);
-    }
-
-    public LineCompound getBorderCompound(BorderEdge edge) {
-        HSLFLine l;
-        switch (edge) {
-            case bottom: l = borderBottom; break;
-            case top: l = borderTop; break;
-            case right: l = borderRight; break;
-            case left: l = borderLeft; break;
-            default: throw new IllegalArgumentException();
-        }
-        return (l == null) ? null : l.getLineCompound();
-    }
-
-    @Override
-    public void setBorderCompound(BorderEdge edge, LineCompound compound) {
-        if (edge == null || compound == null) {
-            throw new IllegalArgumentException("BorderEdge and/or LineCompound need to be specified.");
-        }
-
-        HSLFLine l = addLine(edge);
-        l.setLineCompound(compound);
-    }
-
-
-    protected HSLFLine addLine(BorderEdge edge) {
-        switch (edge) {
-            case bottom: {
-                if (borderBottom == null) {
-                    borderBottom = createBorder(edge);
-                    HSLFTableCell c = getSiblingCell(1,0);
-                    if (c != null) {
-                        assert(c.borderTop == null);
-                        c.borderTop = borderBottom;
-                    }
-                }
-                return borderBottom;
-            }
-            case top: {
-                if (borderTop == null) {
-                    borderTop = createBorder(edge);
-                    HSLFTableCell c = getSiblingCell(-1,0);
-                    if (c != null) {
-                        assert(c.borderBottom == null);
-                        c.borderBottom = borderTop;
-                    }
-                }
-                return borderTop;
-            }
-            case right: {
-                if (borderRight == null) {
-                    borderRight = createBorder(edge);
-                    HSLFTableCell c = getSiblingCell(0,1);
-                    if (c != null) {
-                        assert(c.borderLeft == null);
-                        c.borderLeft = borderRight;
-                    }
-                }
-                return borderRight;
-            }
-            case left: {
-                if (borderLeft == null) {
-                    borderLeft = createBorder(edge);
-                    HSLFTableCell c = getSiblingCell(0,-1);
-                    if (c != null) {
-                        assert(c.borderRight == null);
-                        c.borderRight = borderLeft;
-                    }
-                }
-                return borderLeft;
-            }
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    @Override
-    public void removeBorder(BorderEdge edge) {
-        switch (edge) {
-            case bottom: {
-                if (borderBottom == null) break;
-                getParent().removeShape(borderBottom);
-                borderBottom = null;
-                HSLFTableCell c = getSiblingCell(1,0);
-                if (c != null) {
-                    c.borderTop = null;
-                }
-                break;
-            }
-            case top: {
-                if (borderTop == null) break;
-                getParent().removeShape(borderTop);
-                borderTop = null;
-                HSLFTableCell c = getSiblingCell(-1,0);
-                if (c != null) {
-                    c.borderBottom = null;
-                }
-                break;
-            }
-            case right: {
-                if (borderRight == null) break;
-                getParent().removeShape(borderRight);
-                borderRight = null;
-                HSLFTableCell c = getSiblingCell(0,1);
-                if (c != null) {
-                    c.borderLeft = null;
-                }
-                break;
-            }
-            case left: {
-                if (borderLeft == null) break;
-                getParent().removeShape(borderLeft);
-                borderLeft = null;
-                HSLFTableCell c = getSiblingCell(0,-1);
-                if (c != null) {
-                    c.borderRight = null;
-                }
-                break;
-            }
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    protected HSLFTableCell getSiblingCell(int row, int col) {
-        return getParent().getRelativeCell(this, row, col);
-    }
-
-    /**
-     * Create a border to format this table
-     *
-     * @return the created border
-     */
-    private HSLFLine createBorder(BorderEdge edge) {
-        HSLFTable table = getParent();
-        HSLFLine line = new HSLFLine(table);
-        table.addShape(line);
-
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        setEscherProperty(opt, EscherProperties.GEOMETRY__SHAPEPATH, -1);
-        setEscherProperty(opt, EscherProperties.GEOMETRY__FILLOK, -1);
-        setEscherProperty(opt, EscherProperties.SHADOWSTYLE__SHADOWOBSURED, 0x20000);
-        setEscherProperty(opt, EscherProperties.THREED__LIGHTFACE, 0x80000);
-
-        anchorBorder(edge, line);
-
-        return line;
-    }
-
-    protected void applyLineProperties(BorderEdge edge, HSLFLine other) {
-        HSLFLine line = addLine(edge);
-        line.setLineWidth(other.getLineWidth());
-        line.setLineColor(other.getLineColor());
-        // line.setLineCompound(other.getLineCompound());
-        // line.setLineDashing(other.getLineDashing());
-    }
-
-    @Override
-    public HSLFTable getParent() {
-        return (HSLFTable)super.getParent();
-    }
-
-    /**
-     * Set the gridSpan (aka col-span)
-     *
-     * @param gridSpan the number of columns to be spanned/merged
-     *
-     * @since POI 3.15-beta2
-     */
-    protected void setGridSpan(int gridSpan) {
-        this.gridSpan = gridSpan;
-    }
-
-    /**
-     * Set the rowSpan
-     *
-     * @param rowSpan the number of rows to be spanned/merged
-     *
-     * @since POI 3.15-beta2
-     */
-    protected void setRowSpan(int rowSpan) {
-        this.rowSpan = rowSpan;
-    }
-
-    @Override
-    public int getGridSpan() {
-        return gridSpan;
-    }
-
-    @Override
-    public int getRowSpan() {
-        return rowSpan;
-    }
-
-    @Override
-    public boolean isMerged() {
-        // if a hslf cell is merged, it won't appear in the cell matrix, i.e. it doesn't exist
-        // therefore this is always false 
-        return false;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java
deleted file mode 100644
index 3872ecf..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.TextBox;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-
-/**
- * Represents a TextFrame shape in PowerPoint.
- * <p>
- * Contains the text in a text frame as well as the properties and methods
- * that control alignment and anchoring of the text.
- * </p>
- *
- * @author Yegor Kozlov
- */
-public class HSLFTextBox extends HSLFTextShape implements TextBox<HSLFShape,HSLFTextParagraph> {
-
-    /**
-     * Create a TextBox object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord       <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent    the parent of the shape
-     */
-   protected HSLFTextBox(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-
-    }
-
-    /**
-     * Create a new TextBox. This constructor is used when a new shape is created.
-     *
-     * @param parent    the parent of this Shape. For example, if this text box is a cell
-     * in a table then the parent is Table.
-     */
-    public HSLFTextBox(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(parent);
-    }
-
-    /**
-     * Create a new TextBox. This constructor is used when a new shape is created.
-     *
-     */
-    public HSLFTextBox(){
-        this(null);
-    }
-
-    /**
-     * Create a new TextBox and initialize its internal structures
-     *
-     * @return the created <code>EscherContainerRecord</code> which holds shape data
-     */
-    protected EscherContainerRecord createSpContainer(boolean isChild){
-        _escherContainer = super.createSpContainer(isChild);
-
-        setShapeType(ShapeType.TEXT_BOX);
-
-        //set default properties for a TextBox
-        setEscherProperty(EscherProperties.FILL__FILLCOLOR, 0x8000004);
-        setEscherProperty(EscherProperties.FILL__FILLBACKCOLOR, 0x8000000);
-        setEscherProperty(EscherProperties.FILL__NOFILLHITTEST, 0x100000);
-        setEscherProperty(EscherProperties.LINESTYLE__COLOR, 0x8000001);
-        setEscherProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH, 0x80000);
-        setEscherProperty(EscherProperties.SHADOWSTYLE__COLOR, 0x8000002);
-
-        // init paragraphs
-        getTextParagraphs();
-
-        return _escherContainer;
-    }
-
-    protected void setDefaultTextProperties(HSLFTextParagraph _txtrun){
-        setVerticalAlignment(VerticalAlignment.TOP);
-        setEscherProperty(EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 0x20002);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
deleted file mode 100644
index 322cb10..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
+++ /dev/null
@@ -1,1603 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.apache.poi.hslf.record.RecordTypes.OutlineTextRefAtom;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.model.PPFont;
-import org.apache.poi.hslf.model.textproperties.BitMaskTextProp;
-import org.apache.poi.hslf.model.textproperties.FontAlignmentProp;
-import org.apache.poi.hslf.model.textproperties.IndentProp;
-import org.apache.poi.hslf.model.textproperties.ParagraphFlagsTextProp;
-import org.apache.poi.hslf.model.textproperties.TextAlignmentProp;
-import org.apache.poi.hslf.model.textproperties.TextPFException9;
-import org.apache.poi.hslf.model.textproperties.TextProp;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;
-import org.apache.poi.hslf.record.ColorSchemeAtom;
-import org.apache.poi.hslf.record.EscherTextboxWrapper;
-import org.apache.poi.hslf.record.FontCollection;
-import org.apache.poi.hslf.record.InteractiveInfo;
-import org.apache.poi.hslf.record.MasterTextPropAtom;
-import org.apache.poi.hslf.record.OEPlaceholderAtom;
-import org.apache.poi.hslf.record.OutlineTextRefAtom;
-import org.apache.poi.hslf.record.PPDrawing;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordContainer;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.RoundTripHFPlaceholder12;
-import org.apache.poi.hslf.record.SlideListWithText;
-import org.apache.poi.hslf.record.SlidePersistAtom;
-import org.apache.poi.hslf.record.StyleTextProp9Atom;
-import org.apache.poi.hslf.record.StyleTextPropAtom;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.record.TextRulerAtom;
-import org.apache.poi.hslf.record.TextSpecInfoAtom;
-import org.apache.poi.hslf.record.TxInteractiveInfoAtom;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.util.Units;
-
-/**
- * This class represents a run of text in a powerpoint document. That
- *  run could be text on a sheet, or text in a note.
- *  It is only a very basic class for now
- *
- * @author Nick Burch
- */
-
-public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFTextParagraph,HSLFTextRun> {
-    protected static final POILogger logger = POILogFactory.getLogger(HSLFTextParagraph.class);
-
-    /**
-     * How to align the text
-     */
-    /* package */static final int AlignLeft = 0;
-    /* package */static final int AlignCenter = 1;
-    /* package */static final int AlignRight = 2;
-    /* package */static final int AlignJustify = 3;
-
-    // Note: These fields are protected to help with unit testing
-    // Other classes shouldn't really go playing with them!
-    private final TextHeaderAtom _headerAtom;
-    private TextBytesAtom _byteAtom;
-    private TextCharsAtom _charAtom;
-    private TextPropCollection _paragraphStyle = new TextPropCollection(1, TextPropType.paragraph);
-
-    protected TextRulerAtom _ruler;
-    protected final List<HSLFTextRun> _runs = new ArrayList<HSLFTextRun>();
-    protected HSLFTextShape _parentShape;
-    private HSLFSheet _sheet;
-    private int shapeId;
-
-    private StyleTextProp9Atom styleTextProp9Atom;
-
-    private boolean _dirty = false;
-
-    private final List<HSLFTextParagraph> parentList;
-
-    /**
-    * Constructs a Text Run from a Unicode text block.
-    * Either a {@link TextCharsAtom} or a {@link TextBytesAtom} needs to be provided.
-     *
-    * @param tha the TextHeaderAtom that defines what's what
-    * @param tba the TextBytesAtom containing the text or null if {@link TextCharsAtom} is provided
-    * @param tca the TextCharsAtom containing the text or null if {@link TextBytesAtom} is provided
-    * @param parentList the list which contains this paragraph
-     */
-    /* package */ HSLFTextParagraph(
-        TextHeaderAtom tha,
-        TextBytesAtom tba,
-        TextCharsAtom tca,
-        List<HSLFTextParagraph> parentList
-    ) {
-        if (tha == null) {
-            throw new IllegalArgumentException("TextHeaderAtom must be set.");
-        }
-        _headerAtom = tha;
-        _byteAtom = tba;
-        _charAtom = tca;
-        this.parentList = parentList;
-    }
-
-    /* package */HSLFTextParagraph(HSLFTextParagraph other) {
-        _headerAtom = other._headerAtom;
-        _byteAtom = other._byteAtom;
-        _charAtom = other._charAtom;
-        _parentShape = other._parentShape;
-        _sheet = other._sheet;
-        _ruler = other._ruler;
-        shapeId = other.shapeId;
-        _paragraphStyle.copy(other._paragraphStyle);
-        parentList = other.parentList;
-    }
-
-    public void addTextRun(HSLFTextRun run) {
-        _runs.add(run);
-    }
-
-    @Override
-    public List<HSLFTextRun> getTextRuns() {
-        return _runs;
-    }
-
-    public TextPropCollection getParagraphStyle() {
-        return _paragraphStyle;
-    }
-
-    public void setParagraphStyle(TextPropCollection paragraphStyle) {
-        _paragraphStyle.copy(paragraphStyle);
-    }
-
-    /**
-     * Setting a master style reference
-     *
-     * @param paragraphStyle the master style reference
-     *
-     * @since POI 3.14-Beta1
-     */
-    @Internal
-    /* package */ void setMasterStyleReference(TextPropCollection paragraphStyle) {
-        _paragraphStyle = paragraphStyle;
-    }
-
-    /**
-     * Supply the Sheet we belong to, which might have an assigned SlideShow
-     * Also passes it on to our child RichTextRuns
-     */
-    public static void supplySheet(List<HSLFTextParagraph> paragraphs, HSLFSheet sheet) {
-        if (paragraphs == null) {
-            return;
-        }
-        for (HSLFTextParagraph p : paragraphs) {
-            p.supplySheet(sheet);
-        }
-
-        assert(sheet.getSlideShow() != null);
-    }
-
-    /**
-     * Supply the Sheet we belong to, which might have an assigned SlideShow
-     * Also passes it on to our child RichTextRuns
-     */
-    private void supplySheet(HSLFSheet sheet) {
-        this._sheet = sheet;
-
-        if (_runs == null) return;
-        for (HSLFTextRun rt : _runs) {
-            rt.updateSheet();
-        }
-    }
-
-    public HSLFSheet getSheet() {
-        return this._sheet;
-    }
-
-    /**
-     * @return Shape ID
-     */
-    protected int getShapeId() {
-        return shapeId;
-    }
-
-    /**
-     * @param id Shape ID
-     */
-    protected void setShapeId(int id) {
-        shapeId = id;
-    }
-
-    /**
-     * @return 0-based index of the text run in the SLWT container
-     */
-    protected int getIndex() {
-        return (_headerAtom != null) ? _headerAtom.getIndex() : -1;
-    }
-
-    /**
-     * Sets the index of the paragraph in the SLWT container
-     *
-     * @param index
-     */
-    protected void setIndex(int index) {
-        if (_headerAtom != null) _headerAtom.setIndex(index);
-    }
-
-    /**
-     * Returns the type of the text, from the TextHeaderAtom.
-     * Possible values can be seen from TextHeaderAtom
-     * @see org.apache.poi.hslf.record.TextHeaderAtom
-     */
-    public int getRunType() {
-        return (_headerAtom != null) ? _headerAtom.getTextType() : -1;
-    }
-
-    public void setRunType(int runType) {
-        if (_headerAtom != null) _headerAtom.setTextType(runType);
-    }
-
-    /**
-     * Is this Text Run one from a {@link PPDrawing}, or is it
-     *  one from the {@link SlideListWithText}?
-     */
-    public boolean isDrawingBased() {
-        return (getIndex() == -1);
-    }
-
-    public TextRulerAtom getTextRuler() {
-        return _ruler;
-    }
-
-    public TextRulerAtom createTextRuler() {
-        _ruler = getTextRuler();
-        if (_ruler == null) {
-            _ruler = TextRulerAtom.getParagraphInstance();
-            Record childAfter = _byteAtom;
-            if (childAfter == null) childAfter = _charAtom;
-            if (childAfter == null) childAfter = _headerAtom;
-            _headerAtom.getParentRecord().addChildAfter(_ruler, childAfter);
-        }
-        return _ruler;
-    }
-
-    /**
-     * Returns records that make up the list of text paragraphs
-     * (there can be misc InteractiveInfo, TxInteractiveInfo and other records)
-     *
-     * @return text run records
-     */
-    public Record[] getRecords() {
-        Record r[] = _headerAtom.getParentRecord().getChildRecords();
-        return getRecords(r, new int[] { 0 }, _headerAtom);
-    }
-
-    private static Record[] getRecords(Record[] records, int[] startIdx, TextHeaderAtom headerAtom) {
-        if (records == null) {
-            throw new NullPointerException("records need to be set.");
-        }
-
-        for (; startIdx[0] < records.length; startIdx[0]++) {
-            Record r = records[startIdx[0]];
-            if (r instanceof TextHeaderAtom && (headerAtom == null || r == headerAtom)) break;
-        }
-
-        if (startIdx[0] >= records.length) {
-            logger.log(POILogger.INFO, "header atom wasn't found - container might contain only an OutlineTextRefAtom");
-            return new Record[0];
-        }
-
-        int length;
-        for (length = 1; startIdx[0] + length < records.length; length++) {
-            Record r = records[startIdx[0]+length];
-            if (r instanceof TextHeaderAtom || r instanceof SlidePersistAtom) break;
-        }
-
-        Record result[] = new Record[length];
-        System.arraycopy(records, startIdx[0], result, 0, length);
-        startIdx[0] += length;
-
-        return result;
-    }
-
-    /** Numbered List info */
-    public void setStyleTextProp9Atom(final StyleTextProp9Atom styleTextProp9Atom) {
-        this.styleTextProp9Atom = styleTextProp9Atom;
-    }
-
-    /** Numbered List info */
-    public StyleTextProp9Atom getStyleTextProp9Atom() {
-        return this.styleTextProp9Atom;
-    }
-
-    @Override
-    public Iterator<HSLFTextRun> iterator() {
-        return _runs.iterator();
-    }
-
-    @Override
-    public Double getLeftMargin() {
-        TextProp val = getPropVal(_paragraphStyle, "text.offset", this);
-        return (val == null) ? null : Units.masterToPoints(val.getValue());
-    }
-
-    @Override
-    public void setLeftMargin(Double leftMargin) {
-        Integer val = (leftMargin == null) ? null : Units.pointsToMaster(leftMargin);
-        setParagraphTextPropVal("text.offset", val);
-    }
-
-    @Override
-    public Double getRightMargin() {
-        // TODO: find out, how to determine this value
-        return null;
-    }
-
-    @Override
-    public void setRightMargin(Double rightMargin) {
-        // TODO: find out, how to set this value
-    }
-
-    @Override
-    public Double getIndent() {
-        TextProp val = getPropVal(_paragraphStyle, "bullet.offset", this);
-        return (val == null) ? null : Units.masterToPoints(val.getValue());
-    }
-
-    @Override
-    public void setIndent(Double indent) {
-        Integer val = (indent == null) ? null : Units.pointsToMaster(indent);
-        setParagraphTextPropVal("bullet.offset", val);
-    }
-
-    @Override
-    public String getDefaultFontFamily() {
-        String typeface = null;
-        if (!_runs.isEmpty()) {
-            typeface = _runs.get(0).getFontFamily();
-        }
-        return (typeface != null) ? typeface : "Arial";
-    }
-
-    @Override
-    public Double getDefaultFontSize() {
-        Double d = null;
-        if (!_runs.isEmpty()) {
-            d = _runs.get(0).getFontSize();
-        }
-
-        return (d != null) ? d : 12d;
-    }
-
-    @Override
-    public void setTextAlign(TextAlign align) {
-        Integer alignInt = null;
-        if (align != null) switch (align) {
-            default:
-            case LEFT: alignInt = TextAlignmentProp.LEFT;break;
-            case CENTER: alignInt = TextAlignmentProp.CENTER; break;
-            case RIGHT: alignInt = TextAlignmentProp.RIGHT; break;
-            case DIST: alignInt = TextAlignmentProp.DISTRIBUTED; break;
-            case JUSTIFY: alignInt = TextAlignmentProp.JUSTIFY; break;
-            case JUSTIFY_LOW: alignInt = TextAlignmentProp.JUSTIFYLOW; break;
-            case THAI_DIST: alignInt = TextAlignmentProp.THAIDISTRIBUTED; break;
-        }
-        setParagraphTextPropVal("alignment", alignInt);
-    }
-
-    @Override
-    public TextAlign getTextAlign() {
-        TextProp tp = getPropVal(_paragraphStyle, "alignment", this);
-        if (tp == null) return null;
-        switch (tp.getValue()) {
-            default:
-            case TextAlignmentProp.LEFT: return TextAlign.LEFT;
-            case TextAlignmentProp.CENTER: return TextAlign.CENTER;
-            case TextAlignmentProp.RIGHT: return TextAlign.RIGHT;
-            case TextAlignmentProp.JUSTIFY: return TextAlign.JUSTIFY;
-            case TextAlignmentProp.JUSTIFYLOW: return TextAlign.JUSTIFY_LOW;
-            case TextAlignmentProp.DISTRIBUTED: return TextAlign.DIST;
-            case TextAlignmentProp.THAIDISTRIBUTED: return TextAlign.THAI_DIST;
-        }
-    }
-
-    @Override
-    public FontAlign getFontAlign() {
-        TextProp tp = getPropVal(_paragraphStyle, FontAlignmentProp.NAME, this);
-        if (tp == null) return null;
-
-        switch (tp.getValue()) {
-            case FontAlignmentProp.BASELINE: return FontAlign.BASELINE;
-            case FontAlignmentProp.TOP: return FontAlign.TOP;
-            case FontAlignmentProp.CENTER: return FontAlign.CENTER;
-            case FontAlignmentProp.BOTTOM: return FontAlign.BOTTOM;
-            default: return FontAlign.AUTO;
-        }
-    }
-
-    public AutoNumberingScheme getAutoNumberingScheme() {
-        if (styleTextProp9Atom == null) return null;
-        TextPFException9[] ant = styleTextProp9Atom.getAutoNumberTypes();
-        int level = getIndentLevel();
-        if (ant == null || level == -1 || level  >= ant.length) return null;
-        return ant[level].getAutoNumberScheme();
-    }
-
-    public Integer getAutoNumberingStartAt() {
-        if (styleTextProp9Atom == null) return null;
-        TextPFException9[] ant = styleTextProp9Atom.getAutoNumberTypes();
-        int level = getIndentLevel();
-        if (ant == null || level  >= ant.length) return null;
-        Short startAt = ant[level].getAutoNumberStartNumber();
-        assert(startAt != null);
-        return startAt.intValue();
-    }
-
-
-    @Override
-    public BulletStyle getBulletStyle() {
-        if (!isBullet() && getAutoNumberingScheme() == null) return null;
-
-        return new BulletStyle() {
-            @Override
-            public String getBulletCharacter() {
-                Character chr = HSLFTextParagraph.this.getBulletChar();
-                return (chr == null || chr == 0) ? "" : "" + chr;
-            }
-
-            @Override
-            public String getBulletFont() {
-                return HSLFTextParagraph.this.getBulletFont();
-            }
-
-            @Override
-            public Double getBulletFontSize() {
-                return HSLFTextParagraph.this.getBulletSize();
-            }
-
-            @Override
-            public void setBulletFontColor(Color color) {
-                setBulletFontColor(DrawPaint.createSolidPaint(color));
-            }
-
-            @Override
-            public void setBulletFontColor(PaintStyle color) {
-                if (!(color instanceof SolidPaint)) {
-                    throw new IllegalArgumentException("HSLF only supports SolidPaint");
-                }
-                SolidPaint sp = (SolidPaint)color;
-                Color col = DrawPaint.applyColorTransform(sp.getSolidColor());
-                HSLFTextParagraph.this.setBulletColor(col);
-            }
-
-            @Override
-            public PaintStyle getBulletFontColor() {
-                Color col = HSLFTextParagraph.this.getBulletColor();
-                return DrawPaint.createSolidPaint(col);
-            }
-
-            @Override
-            public AutoNumberingScheme getAutoNumberingScheme() {
-                return HSLFTextParagraph.this.getAutoNumberingScheme();
-            }
-
-            @Override
-            public Integer getAutoNumberingStartAt() {
-                return HSLFTextParagraph.this.getAutoNumberingStartAt();
-            }
-        };
-    }
-
-    @Override
-    public void setBulletStyle(Object... styles) {
-        if (styles.length == 0) {
-            setBullet(false);
-        } else {
-            setBullet(true);
-            for (Object ostyle : styles) {
-                if (ostyle instanceof Number) {
-                    setBulletSize(((Number)ostyle).doubleValue());
-                } else if (ostyle instanceof Color) {
-                    setBulletColor((Color)ostyle);
-                } else if (ostyle instanceof Character) {
-                    setBulletChar((Character)ostyle);
-                } else if (ostyle instanceof String) {
-                    setBulletFont((String)ostyle);
-                } else if (ostyle instanceof AutoNumberingScheme) {
-                    throw new HSLFException("setting bullet auto-numberin scheme for HSLF not supported ... yet");
-                }
-            }
-        }
-    }
-
-    @Override
-    public HSLFTextShape getParentShape() {
-        return _parentShape;
-    }
-
-    public void setParentShape(HSLFTextShape parentShape) {
-        _parentShape = parentShape;
-    }
-
-    @Override
-    public int getIndentLevel() {
-        return _paragraphStyle == null ? 0 : _paragraphStyle.getIndentLevel();
-    }
-
-    @Override
-    public void setIndentLevel(int level) {
-       if( _paragraphStyle != null ) _paragraphStyle.setIndentLevel((short)level);
-    }
-
-    /**
-     * Sets whether this rich text run has bullets
-     */
-    public void setBullet(boolean flag) {
-        setFlag(ParagraphFlagsTextProp.BULLET_IDX, flag);
-    }
-
-    /**
-     * Returns whether this rich text run has bullets
-     */
-    public boolean isBullet() {
-        return getFlag(ParagraphFlagsTextProp.BULLET_IDX);
-    }
-
-    /**
-     * Sets the bullet character
-     */
-    public void setBulletChar(Character c) {
-        Integer val = (c == null) ? null : (int)c.charValue();
-        setParagraphTextPropVal("bullet.char", val);
-    }
-
-    /**
-     * Returns the bullet character
-     */
-    public Character getBulletChar() {
-        TextProp tp = getPropVal(_paragraphStyle, "bullet.char", this);
-        return (tp == null) ? null : (char)tp.getValue();
-    }
-
-    /**
-     * Sets the bullet size
-     */
-    public void setBulletSize(Double size) {
-        setPctOrPoints("bullet.size", size);
-    }
-
-    /**
-     * Returns the bullet size, null if unset
-     */
-    public Double getBulletSize() {
-        return getPctOrPoints("bullet.size");
-    }
-
-    /**
-     * Sets the bullet color
-     */
-    public void setBulletColor(Color color) {
-        Integer val = (color == null) ? null : new Color(color.getBlue(), color.getGreen(), color.getRed(), 254).getRGB();
-        setParagraphTextPropVal("bullet.color", val);
-        setFlag(ParagraphFlagsTextProp.BULLET_HARDCOLOR_IDX, (color != null));
-    }
-
-    /**
-     * Returns the bullet color
-     */
-    public Color getBulletColor() {
-        TextProp tp = getPropVal(_paragraphStyle, "bullet.color", this);
-        boolean hasColor = getFlag(ParagraphFlagsTextProp.BULLET_HARDCOLOR_IDX);
-        if (tp == null || !hasColor) {
-            // if bullet color is undefined, return color of first run
-            if (_runs.isEmpty()) {
-                return null;
-            }
-
-            SolidPaint sp = _runs.get(0).getFontColor();
-            if(sp == null) {
-                return null;
-            }
-
-            return DrawPaint.applyColorTransform(sp.getSolidColor());
-        }
-
-        return getColorFromColorIndexStruct(tp.getValue(), _sheet);
-    }
-
-    /**
-     * Sets the bullet font
-     */
-    public void setBulletFont(String typeface) {
-        if (typeface == null) {
-            setPropVal(_paragraphStyle, "bullet.font", null);
-            setFlag(ParagraphFlagsTextProp.BULLET_HARDFONT_IDX, false);
-        }
-
-        FontCollection fc = getSheet().getSlideShow().getFontCollection();
-        int idx = fc.addFont(typeface);
-
-        setParagraphTextPropVal("bullet.font", idx);
-        setFlag(ParagraphFlagsTextProp.BULLET_HARDFONT_IDX, true);
-    }
-
-    /**
-     * Returns the bullet font
-     */
-    public String getBulletFont() {
-        TextProp tp = getPropVal(_paragraphStyle, "bullet.font", this);
-        boolean hasFont = getFlag(ParagraphFlagsTextProp.BULLET_HARDFONT_IDX);
-        if (tp == null || !hasFont) return getDefaultFontFamily();
-        PPFont ppFont = getSheet().getSlideShow().getFont(tp.getValue());
-        assert(ppFont != null);
-        return ppFont.getFontName();
-    }
-
-    @Override
-    public void setLineSpacing(Double lineSpacing) {
-        setPctOrPoints("linespacing", lineSpacing);
-    }
-
-    @Override
-    public Double getLineSpacing() {
-        return getPctOrPoints("linespacing");
-    }
-
-    @Override
-    public void setSpaceBefore(Double spaceBefore) {
-        setPctOrPoints("spacebefore", spaceBefore);
-    }
-
-    @Override
-    public Double getSpaceBefore() {
-        return getPctOrPoints("spacebefore");
-    }
-
-    @Override
-    public void setSpaceAfter(Double spaceAfter) {
-        setPctOrPoints("spaceafter", spaceAfter);
-    }
-
-    @Override
-    public Double getSpaceAfter() {
-        return getPctOrPoints("spaceafter");
-    }
-
-    @Override
-    public Double getDefaultTabSize() {
-        // TODO: implement
-        return null;
-    }
-
-    private Double getPctOrPoints(String propName) {
-        TextProp tp = getPropVal(_paragraphStyle, propName, this);
-        if (tp == null) return null;
-        int val = tp.getValue();
-        return (val < 0) ? Units.masterToPoints(val) : val;
-    }
-
-    private void setPctOrPoints(String propName, Double dval) {
-        Integer ival = null;
-        if (dval != null) {
-            ival = (dval < 0) ? Units.pointsToMaster(dval) : dval.intValue();
-        }
-        setParagraphTextPropVal(propName, ival);
-    }
-
-    private boolean getFlag(int index) {
-        BitMaskTextProp tp = (BitMaskTextProp)getPropVal(_paragraphStyle, ParagraphFlagsTextProp.NAME, this);
-        return (tp == null) ? false : tp.getSubValue(index);
-    }
-
-    private void setFlag(int index, boolean value) {
-        BitMaskTextProp tp = (BitMaskTextProp)_paragraphStyle.addWithName(ParagraphFlagsTextProp.NAME);
-        tp.setSubValue(value, index);
-        setDirty();
-    }
-
-    /**
-     * Fetch the value of the given Paragraph related TextProp. Returns null if
-     * that TextProp isn't present. If the TextProp isn't present, the value
-     * from the appropriate Master Sheet will apply.
-     *
-     * The propName can be a comma-separated list, in case multiple equivalent values
-     * are queried
-     */
-    protected static TextProp getPropVal(TextPropCollection props, String propName, HSLFTextParagraph paragraph) {
-        String propNames[] = propName.split(",");
-        for (String pn : propNames) {
-            TextProp prop = props.findByName(pn);
-            if (prop == null) {
-                continue;
-            }
-
-            // Font properties (maybe other too???) can have an index of -1
-            // so we check the master for this font index then
-            if (pn.contains("font") && prop.getValue() == -1) {
-                return getMasterPropVal(props, pn, paragraph);
-            }
-            
-            return prop;
-        }
-        
-        return getMasterPropVal(props, propName, paragraph);
-    }
-    
-    private static TextProp getMasterPropVal(TextPropCollection props, String propName, HSLFTextParagraph paragraph) {
-        String propNames[] = propName.split(",");
-        
-        BitMaskTextProp maskProp = (BitMaskTextProp) props.findByName(ParagraphFlagsTextProp.NAME);
-        boolean hardAttribute = (maskProp != null && maskProp.getValue() == 0);
-        if (hardAttribute) return null;
-
-        HSLFSheet sheet = paragraph.getSheet();
-        int txtype = paragraph.getRunType();
-        HSLFMasterSheet master = sheet.getMasterSheet();
-        if (master == null) {
-            logger.log(POILogger.WARN, "MasterSheet is not available");
-            return null;
-        }
-
-        boolean isChar = props.getTextPropType() == TextPropType.character;
-
-        for (String pn : propNames) {
-            TextProp prop = master.getStyleAttribute(txtype, paragraph.getIndentLevel(), pn, isChar);
-            if (prop != null) return prop;
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the named TextProp, either by fetching it (if it exists) or
-     * adding it (if it didn't)
-     *
-     * @param props the TextPropCollection to fetch from / add into
-     * @param name the name of the TextProp to fetch/add
-     * @param val the value, null if unset
-     */
-    protected static void setPropVal(TextPropCollection props, String name, Integer val) {
-        if (val == null) {
-            props.removeByName(name);
-            return;
-        }
-
-        // Fetch / Add the TextProp
-        TextProp tp = props.addWithName(name);
-        tp.setValue(val);
-    }
-
-    /**
-     * Check and add linebreaks to text runs leading other paragraphs
-     *
-     * @param paragraphs
-     */
-    protected static void fixLineEndings(List<HSLFTextParagraph> paragraphs) {
-        HSLFTextRun lastRun = null;
-        for (HSLFTextParagraph p : paragraphs) {
-            if (lastRun != null && !lastRun.getRawText().endsWith("\r")) {
-                lastRun.setText(lastRun.getRawText() + "\r");
-            }
-            List<HSLFTextRun> ltr = p.getTextRuns();
-            if (ltr.isEmpty()) {
-                throw new RuntimeException("paragraph without textruns found");
-            }
-            lastRun = ltr.get(ltr.size() - 1);
-            assert (lastRun.getRawText() != null);
-        }
-    }
-
-    /**
-     * Search for a StyleTextPropAtom is for this text header (list of paragraphs)
-     *
-     * @param header the header
-     * @param textLen the length of the rawtext, or -1 if the length is not known
-     */
-    private static StyleTextPropAtom findStyleAtomPresent(TextHeaderAtom header, int textLen) {
-        boolean afterHeader = false;
-        StyleTextPropAtom style = null;
-        for (Record record : header.getParentRecord().getChildRecords()) {
-            long rt = record.getRecordType();
-            if (afterHeader && rt == RecordTypes.TextHeaderAtom.typeID) {
-                // already on the next header, quit searching
-                break;
-            }
-            afterHeader |= (header == record);
-            if (afterHeader && rt == RecordTypes.StyleTextPropAtom.typeID) {
-                // found it
-                style = (StyleTextPropAtom) record;
-            }
-        }
-
-        if (style == null) {
-            logger.log(POILogger.INFO, "styles atom doesn't exist. Creating dummy record for later saving.");
-            style = new StyleTextPropAtom((textLen < 0) ? 1 : textLen);
-        } else {
-            if (textLen >= 0) {
-                style.setParentTextSize(textLen);
-            }
-        }
-
-        return style;
-    }
-
-    /**
-     * Saves the modified paragraphs/textrun to the records.
-     * Also updates the styles to the correct text length.
-     */
-    protected static void storeText(List<HSLFTextParagraph> paragraphs) {
-        fixLineEndings(paragraphs);
-        updateTextAtom(paragraphs);
-        updateStyles(paragraphs);
-        updateHyperlinks(paragraphs);
-        refreshRecords(paragraphs);
-
-        for (HSLFTextParagraph p : paragraphs) {
-            p._dirty = false;
-        }
-    }
-
-    /**
-     * Set the correct text atom depending on the multibyte usage
-     */
-    private static void updateTextAtom(List<HSLFTextParagraph> paragraphs) {
-        final String rawText = toInternalString(getRawText(paragraphs));
-
-        // Will it fit in a 8 bit atom?
-        boolean isUnicode = StringUtil.hasMultibyte(rawText);
-        // isUnicode = true;
-
-        TextHeaderAtom headerAtom = paragraphs.get(0)._headerAtom;
-        TextBytesAtom byteAtom = paragraphs.get(0)._byteAtom;
-        TextCharsAtom charAtom = paragraphs.get(0)._charAtom;
-        StyleTextPropAtom styleAtom = findStyleAtomPresent(headerAtom, rawText.length());
-
-        // Store in the appropriate record
-        Record oldRecord = null, newRecord = null;
-        if (isUnicode) {
-            if (byteAtom != null || charAtom == null) {
-                oldRecord = byteAtom;
-                charAtom = new TextCharsAtom();
-            }
-            newRecord = charAtom;
-            charAtom.setText(rawText);
-        } else {
-            if (charAtom != null || byteAtom == null) {
-                oldRecord = charAtom;
-                byteAtom = new TextBytesAtom();
-            }
-            newRecord = byteAtom;
-            byte[] byteText = new byte[rawText.length()];
-            StringUtil.putCompressedUnicode(rawText, byteText, 0);
-            byteAtom.setText(byteText);
-        }
-        assert (newRecord != null);
-
-        RecordContainer _txtbox = headerAtom.getParentRecord();
-        Record[] cr = _txtbox.getChildRecords();
-        int /* headerIdx = -1, */ textIdx = -1, styleIdx = -1;
-        for (int i = 0; i < cr.length; i++) {
-            Record r = cr[i];
-            if (r == headerAtom) ; // headerIdx = i;
-            else if (r == oldRecord || r == newRecord) textIdx = i;
-            else if (r == styleAtom) styleIdx = i;
-        }
-
-        if (textIdx == -1) {
-            // the old record was never registered, ignore it
-            _txtbox.addChildAfter(newRecord, headerAtom);
-            // textIdx = headerIdx + 1;
-        } else {
-            // swap not appropriated records - noop if unchanged
-            cr[textIdx] = newRecord;
-        }
-
-        if (styleIdx == -1) {
-            // Add the new StyleTextPropAtom after the TextCharsAtom / TextBytesAtom
-            _txtbox.addChildAfter(styleAtom, newRecord);
-        }
-
-        for (HSLFTextParagraph p : paragraphs) {
-            if (newRecord == byteAtom) {
-                p._byteAtom = byteAtom;
-                p._charAtom = null;
-            } else {
-                p._byteAtom = null;
-                p._charAtom = charAtom;
-            }
-        }
-
-    }
-
-    /**
-     * Update paragraph and character styles - merges them when subsequential styles match
-     */
-    private static void updateStyles(List<HSLFTextParagraph> paragraphs) {
-        final String rawText = toInternalString(getRawText(paragraphs));
-        TextHeaderAtom headerAtom = paragraphs.get(0)._headerAtom;
-        StyleTextPropAtom styleAtom = findStyleAtomPresent(headerAtom, rawText.length());
-
-        // Update the text length for its Paragraph and Character stylings
-        // * reset the length, to the new string's length
-        // * add on +1 if the last block
-
-        styleAtom.clearStyles();
-
-        TextPropCollection lastPTPC = null, lastRTPC = null, ptpc = null, rtpc = null;
-        for (HSLFTextParagraph para : paragraphs) {
-            ptpc = para.getParagraphStyle();
-            ptpc.updateTextSize(0);
-            if (!ptpc.equals(lastPTPC)) {
-                lastPTPC = styleAtom.addParagraphTextPropCollection(0);
-                lastPTPC.copy(ptpc);
-            }
-            for (HSLFTextRun tr : para.getTextRuns()) {
-                rtpc = tr.getCharacterStyle();
-                rtpc.updateTextSize(0);
-                if (!rtpc.equals(lastRTPC)) {
-                    lastRTPC = styleAtom.addCharacterTextPropCollection(0);
-                    lastRTPC.copy(rtpc);
-                }
-                int len = tr.getLength();
-                ptpc.updateTextSize(ptpc.getCharactersCovered() + len);
-                rtpc.updateTextSize(len);
-                lastPTPC.updateTextSize(lastPTPC.getCharactersCovered() + len);
-                lastRTPC.updateTextSize(lastRTPC.getCharactersCovered() + len);
-            }
-        }
-
-        assert (lastPTPC != null && lastRTPC != null && ptpc != null && rtpc != null);
-        ptpc.updateTextSize(ptpc.getCharactersCovered() + 1);
-        rtpc.updateTextSize(rtpc.getCharactersCovered() + 1);
-        lastPTPC.updateTextSize(lastPTPC.getCharactersCovered() + 1);
-        lastRTPC.updateTextSize(lastRTPC.getCharactersCovered() + 1);
-
-        /**
-         * If TextSpecInfoAtom is present, we must update the text size in it,
-         * otherwise the ppt will be corrupted
-         */
-        for (Record r : paragraphs.get(0).getRecords()) {
-            if (r instanceof TextSpecInfoAtom) {
-                ((TextSpecInfoAtom) r).setParentSize(rawText.length() + 1);
-                break;
-            }
-        }
-    }
-
-    private static void updateHyperlinks(List<HSLFTextParagraph> paragraphs) {
-        TextHeaderAtom headerAtom = paragraphs.get(0)._headerAtom;
-        RecordContainer _txtbox = headerAtom.getParentRecord();
-        // remove existing hyperlink records
-        for (Record r : _txtbox.getChildRecords()) {
-            if (r instanceof InteractiveInfo || r instanceof TxInteractiveInfoAtom) {
-                _txtbox.removeChild(r);
-            }
-        }
-        // now go through all the textruns and check for hyperlinks
-        HSLFHyperlink lastLink = null;
-        for (HSLFTextParagraph para : paragraphs) {
-            for (HSLFTextRun run : para) {
-                HSLFHyperlink thisLink = run.getHyperlink();
-                if (thisLink != null && thisLink == lastLink) {
-                    // the hyperlink extends over this text run, increase its length
-                    // TODO: the text run might be longer than the hyperlink
-                    thisLink.setEndIndex(thisLink.getEndIndex()+run.getLength());
-                } else {
-                    if (lastLink != null) {
-                        InteractiveInfo info = lastLink.getInfo();
-                        TxInteractiveInfoAtom txinfo = lastLink.getTextRunInfo();
-                        assert(info != null && txinfo != null);
-                        _txtbox.appendChildRecord(info);
-                        _txtbox.appendChildRecord(txinfo);
-                    }
-                }
-                lastLink = thisLink;
-            }
-        }
-
-        if (lastLink != null) {
-            InteractiveInfo info = lastLink.getInfo();
-            TxInteractiveInfoAtom txinfo = lastLink.getTextRunInfo();
-            assert(info != null && txinfo != null);
-            _txtbox.appendChildRecord(info);
-            _txtbox.appendChildRecord(txinfo);
-        }    
-    }
-    
-    /**
-     * Writes the textbox records back to the document record 
-     */
-    private static void refreshRecords(List<HSLFTextParagraph> paragraphs) {
-        TextHeaderAtom headerAtom = paragraphs.get(0)._headerAtom;
-        RecordContainer _txtbox = headerAtom.getParentRecord();
-        if (_txtbox instanceof EscherTextboxWrapper) {
-            try {
-                ((EscherTextboxWrapper) _txtbox).writeOut(null);
-            } catch (IOException e) {
-                throw new RuntimeException("failed dummy write", e);
-            }
-        }
-    }
-
-    /**
-     * Adds the supplied text onto the end of the TextParagraphs,
-     * creating a new RichTextRun for it to sit in.
-     *
-     * @param text the text string used by this object.
-     */
-    protected static HSLFTextRun appendText(List<HSLFTextParagraph> paragraphs, String text, boolean newParagraph) {
-        text = toInternalString(text);
-
-        // check paragraphs
-        assert(!paragraphs.isEmpty() && !paragraphs.get(0).getTextRuns().isEmpty());
-
-        HSLFTextParagraph htp = paragraphs.get(paragraphs.size() - 1);
-        HSLFTextRun htr = htp.getTextRuns().get(htp.getTextRuns().size() - 1);
-
-        boolean addParagraph = newParagraph;
-        for (String rawText : text.split("(?<=\r)")) {
-            // special case, if last text paragraph or run is empty, we will reuse it
-            boolean lastRunEmpty = (htr.getLength() == 0);
-            boolean lastParaEmpty = lastRunEmpty && (htp.getTextRuns().size() == 1);
-
-            if (addParagraph && !lastParaEmpty) {
-                TextPropCollection tpc = htp.getParagraphStyle();
-                HSLFTextParagraph prevHtp = htp;
-                htp = new HSLFTextParagraph(htp._headerAtom, htp._byteAtom, htp._charAtom, paragraphs);
-                htp.getParagraphStyle().copy(tpc);
-                htp.setParentShape(prevHtp.getParentShape());
-                htp.setShapeId(prevHtp.getShapeId());
-                htp.supplySheet(prevHtp.getSheet());
-                paragraphs.add(htp);
-            }
-            addParagraph = true;
-
-            if (!lastRunEmpty) {
-                TextPropCollection tpc = htr.getCharacterStyle();
-                htr = new HSLFTextRun(htp);
-                htr.getCharacterStyle().copy(tpc);
-                htp.addTextRun(htr);
-            }
-            htr.setText(rawText);
-        }
-
-        storeText(paragraphs);
-
-        return htr;
-    }
-
-    /**
-     * Sets (overwrites) the current text.
-     * Uses the properties of the first paragraph / textrun
-     *
-     * @param text the text string used by this object.
-     */
-    public static HSLFTextRun setText(List<HSLFTextParagraph> paragraphs, String text) {
-        // check paragraphs
-        assert(!paragraphs.isEmpty() && !paragraphs.get(0).getTextRuns().isEmpty());
-
-        Iterator<HSLFTextParagraph> paraIter = paragraphs.iterator();
-        HSLFTextParagraph htp = paraIter.next(); // keep first
-        assert (htp != null);
-        while (paraIter.hasNext()) {
-            paraIter.next();
-            paraIter.remove();
-        }
-
-        Iterator<HSLFTextRun> runIter = htp.getTextRuns().iterator();
-        if (runIter.hasNext()) {
-            HSLFTextRun htr = runIter.next();
-            htr.setText("");
-            while (runIter.hasNext()) {
-                runIter.next();
-                runIter.remove();
-            }
-        } else {
-            HSLFTextRun trun = new HSLFTextRun(htp);
-            htp.addTextRun(trun);
-        }
-
-        return appendText(paragraphs, text, false);
-    }
-
-    public static String getText(List<HSLFTextParagraph> paragraphs) {
-        assert (!paragraphs.isEmpty());
-        String rawText = getRawText(paragraphs);
-        return toExternalString(rawText, paragraphs.get(0).getRunType());
-    }
-
-    public static String getRawText(List<HSLFTextParagraph> paragraphs) {
-        StringBuilder sb = new StringBuilder();
-        for (HSLFTextParagraph p : paragraphs) {
-            for (HSLFTextRun r : p.getTextRuns()) {
-                sb.append(r.getRawText());
-            }
-        }
-        return sb.toString();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        for (HSLFTextRun r : getTextRuns()) {
-            sb.append(r.getRawText());
-        }
-        return toExternalString(sb.toString(), getRunType());
-    }
-
-    /**
-     * Returns a new string with line breaks converted into internal ppt
-     * representation
-     */
-    protected static String toInternalString(String s) {
-        String ns = s.replaceAll("\\r?\\n", "\r");
-        return ns;
-    }
-
-    /**
-     * Converts raw text from the text paragraphs to a formatted string,
-     * i.e. it converts certain control characters used in the raw txt
-     *
-     * @param rawText the raw text
-     * @param runType the run type of the shape, paragraph or headerAtom.
-     *        use -1 if unknown
-     * @return the formatted string
-     */
-    public static String toExternalString(String rawText, int runType) {
-        // PowerPoint seems to store files with \r as the line break
-        // The messes things up on everything but a Mac, so translate
-        // them to \n
-        String text = rawText.replace('\r', '\n');
-
-        switch (runType) {
-        // 0xB acts like cariage return in page titles and like blank in the
-        // others
-        case -1:
-        case org.apache.poi.hslf.record.TextHeaderAtom.TITLE_TYPE:
-        case org.apache.poi.hslf.record.TextHeaderAtom.CENTER_TITLE_TYPE:
-            text = text.replace((char) 0x0B, '\n');
-            break;
-        default:
-            text = text.replace((char) 0x0B, ' ');
-            break;
-        }
-
-        return text;
-    }
-
-    /**
-     * For a given PPDrawing, grab all the TextRuns
-     */
-   public static List<List<HSLFTextParagraph>> findTextParagraphs(PPDrawing ppdrawing, HSLFSheet sheet) {
-        List<List<HSLFTextParagraph>> runsV = new ArrayList<List<HSLFTextParagraph>>();
-        for (EscherTextboxWrapper wrapper : ppdrawing.getTextboxWrappers()) {
-            List<HSLFTextParagraph> p = findTextParagraphs(wrapper, sheet);
-            if (p != null) runsV.add(p);
-        }
-        return runsV;
-    }
-
-    /**
-     * Scans through the supplied record array, looking for
-     * a TextHeaderAtom followed by one of a TextBytesAtom or
-     * a TextCharsAtom. Builds up TextRuns from these
-     *
-     * @param wrapper an EscherTextboxWrapper
-     */
-    protected static List<HSLFTextParagraph> findTextParagraphs(EscherTextboxWrapper wrapper, HSLFSheet sheet) {
-        // propagate parents to parent-aware records
-        RecordContainer.handleParentAwareRecords(wrapper);
-        int shapeId = wrapper.getShapeId();
-        List<HSLFTextParagraph> rv = null;
-
-        OutlineTextRefAtom ota = (OutlineTextRefAtom)wrapper.findFirstOfType(OutlineTextRefAtom.typeID);
-        if (ota != null) {
-            // if we are based on an outline, there are no further records to be parsed from the wrapper
-            if (sheet == null) {
-                throw new RuntimeException("Outline atom reference can't be solved without a sheet record");
-            }
-
-            List<List<HSLFTextParagraph>> sheetRuns = sheet.getTextParagraphs();
-            assert (sheetRuns != null);
-
-            int idx = ota.getTextIndex();
-            for (List<HSLFTextParagraph> r : sheetRuns) {
-                if (r.isEmpty()) continue;
-                int ridx = r.get(0).getIndex();
-                if (ridx > idx) break;
-                if (ridx == idx) {
-                    if (rv == null) {
-                        rv = r;
-                    } else {
-                        // create a new container
-                        // TODO: ... is this case really happening?
-                        rv = new ArrayList<HSLFTextParagraph>(rv);
-                        rv.addAll(r);
-                    }
-                }
-            }
-            if (rv == null || rv.isEmpty()) {
-                logger.log(POILogger.WARN, "text run not found for OutlineTextRefAtom.TextIndex=" + idx);
-            }
-        } else {
-            if (sheet != null) {
-                // check sheet runs first, so we get exactly the same paragraph list
-                List<List<HSLFTextParagraph>> sheetRuns = sheet.getTextParagraphs();
-                assert (sheetRuns != null);
-
-                for (List<HSLFTextParagraph> paras : sheetRuns) {
-                   if (!paras.isEmpty() && paras.get(0)._headerAtom.getParentRecord() == wrapper) {
-                        rv = paras;
-                        break;
-                    }
-                }
-            }
-
-            if (rv == null) {
-                // if we haven't found the wrapper in the sheet runs, create a new paragraph list from its record
-                List<List<HSLFTextParagraph>> rvl = findTextParagraphs(wrapper.getChildRecords());
-                switch (rvl.size()) {
-                case 0: break; // nothing found
-                case 1: rv = rvl.get(0); break; // normal case
-                default:
-                    throw new RuntimeException("TextBox contains more than one list of paragraphs.");
-                }
-            }
-        }
-
-        if (rv != null) {
-            StyleTextProp9Atom styleTextProp9Atom = wrapper.getStyleTextProp9Atom();
-
-            for (HSLFTextParagraph htp : rv) {
-                htp.setShapeId(shapeId);
-                htp.setStyleTextProp9Atom(styleTextProp9Atom);
-            }
-        }
-        return rv;
-    }
-
-    /**
-     * Scans through the supplied record array, looking for
-     * a TextHeaderAtom followed by one of a TextBytesAtom or
-     * a TextCharsAtom. Builds up TextRuns from these
-     *
-     * @param records the records to build from
-     */
-    protected static List<List<HSLFTextParagraph>> findTextParagraphs(Record[] records) {
-        List<List<HSLFTextParagraph>> paragraphCollection = new ArrayList<List<HSLFTextParagraph>>();
-
-        int[] recordIdx = { 0 };
-
-        for (int slwtIndex = 0; recordIdx[0] < records.length; slwtIndex++) {
-            TextHeaderAtom header = null;
-            TextBytesAtom tbytes = null;
-            TextCharsAtom tchars = null;
-            TextRulerAtom ruler = null;
-            MasterTextPropAtom indents = null;
-
-            for (Record r : getRecords(records, recordIdx, null)) {
-                long rt = r.getRecordType();
-                if (RecordTypes.TextHeaderAtom.typeID == rt) {
-                    header = (TextHeaderAtom) r;
-                } else if (RecordTypes.TextBytesAtom.typeID == rt) {
-                    tbytes = (TextBytesAtom) r;
-                } else if (RecordTypes.TextCharsAtom.typeID == rt) {
-                    tchars = (TextCharsAtom) r;
-                } else if (RecordTypes.TextRulerAtom.typeID == rt) {
-                    ruler = (TextRulerAtom) r;
-                } else if (RecordTypes.MasterTextPropAtom.typeID == rt) {
-                    indents = (MasterTextPropAtom) r;
-                }
-                // don't search for RecordTypes.StyleTextPropAtom.typeID here ... see findStyleAtomPresent below
-            }
-
-            if (header == null) break;
-
-            if (header.getParentRecord() instanceof SlideListWithText) {
-                // runs found in PPDrawing are not linked with SlideListWithTexts
-                header.setIndex(slwtIndex);
-            }
-
-            if (tbytes == null && tchars == null) {
-                tbytes = new TextBytesAtom();
-                // don't add record yet - set it in storeText
-                logger.log(POILogger.INFO, "bytes nor chars atom doesn't exist. Creating dummy record for later saving.");
-            }
-
-            String rawText = (tchars != null) ? tchars.getText() : tbytes.getText();
-            StyleTextPropAtom styles = findStyleAtomPresent(header, rawText.length());
-
-            List<HSLFTextParagraph> paragraphs = new ArrayList<HSLFTextParagraph>();
-            paragraphCollection.add(paragraphs);
-
-            // split, but keep delimiter
-            for (String para : rawText.split("(?<=\r)")) {
-                HSLFTextParagraph tpara = new HSLFTextParagraph(header, tbytes, tchars, paragraphs);
-                paragraphs.add(tpara);
-                tpara._ruler = ruler;
-                tpara.getParagraphStyle().updateTextSize(para.length());
-
-                HSLFTextRun trun = new HSLFTextRun(tpara);
-                tpara.addTextRun(trun);
-                trun.setText(para);
-            }
-
-            applyCharacterStyles(paragraphs, styles.getCharacterStyles());
-            applyParagraphStyles(paragraphs, styles.getParagraphStyles());
-            if (indents != null) {
-                applyParagraphIndents(paragraphs, indents.getIndents());
-            }
-        }
-
-        if (paragraphCollection.isEmpty()) {
-            logger.log(POILogger.DEBUG, "No text records found.");
-        }
-
-        return paragraphCollection;
-    }
-
-    protected static void applyHyperlinks(List<HSLFTextParagraph> paragraphs) {
-        List<HSLFHyperlink> links = HSLFHyperlink.find(paragraphs);
-
-        for (HSLFHyperlink h : links) {
-            int csIdx = 0;
-            for (HSLFTextParagraph p : paragraphs) {
-                if (csIdx > h.getEndIndex()) break;
-                List<HSLFTextRun> runs = p.getTextRuns();
-                for (int rlen=0,rIdx=0; rIdx < runs.size(); csIdx+=rlen, rIdx++) {
-                    HSLFTextRun run = runs.get(rIdx);
-                    rlen = run.getLength();
-                    if (csIdx < h.getEndIndex() && h.getStartIndex() < csIdx+rlen) {
-                        String rawText = run.getRawText();
-                        int startIdx = h.getStartIndex()-csIdx;
-                        if (startIdx > 0) {
-                            // hyperlink starts within current textrun
-                            HSLFTextRun newRun = new HSLFTextRun(p);
-                            newRun.setCharacterStyle(run.getCharacterStyle());
-                            newRun.setText(rawText.substring(startIdx));
-                            run.setText(rawText.substring(0, startIdx));
-                            runs.add(rIdx+1, newRun);
-                            rlen = startIdx;
-                            continue;
-                        }
-                        int endIdx = Math.min(rlen, h.getEndIndex()-h.getStartIndex());
-                        if (endIdx < rlen) {
-                            // hyperlink ends before end of current textrun
-                            HSLFTextRun newRun = new HSLFTextRun(p);
-                            newRun.setCharacterStyle(run.getCharacterStyle());
-                            newRun.setText(rawText.substring(0, endIdx));
-                            run.setText(rawText.substring(endIdx));
-                            runs.add(rIdx, newRun);
-                            rlen = endIdx;
-                            run = newRun;
-                        }
-                        run.setHyperlink(h);
-                    }
-                }
-            }
-        }
-    }
-
-    protected static void applyCharacterStyles(List<HSLFTextParagraph> paragraphs, List<TextPropCollection> charStyles) {
-        int paraIdx = 0, runIdx = 0;
-        HSLFTextRun trun;
-
-        for (int csIdx = 0; csIdx < charStyles.size(); csIdx++) {
-            TextPropCollection p = charStyles.get(csIdx);
-            for (int ccRun = 0, ccStyle = p.getCharactersCovered(); ccRun < ccStyle;) {
-                HSLFTextParagraph para = paragraphs.get(paraIdx);
-                List<HSLFTextRun> runs = para.getTextRuns();
-                trun = runs.get(runIdx);
-                final int len = trun.getLength();
-
-                if (ccRun + len <= ccStyle) {
-                    ccRun += len;
-                } else {
-                    String text = trun.getRawText();
-                    trun.setText(text.substring(0, ccStyle - ccRun));
-
-                    HSLFTextRun nextRun = new HSLFTextRun(para);
-                    nextRun.setText(text.substring(ccStyle - ccRun));
-                    runs.add(runIdx + 1, nextRun);
-
-                    ccRun += ccStyle - ccRun;
-                }
-
-                trun.setCharacterStyle(p);
-
-                if (paraIdx == paragraphs.size()-1 && runIdx == runs.size()-1) {
-                    if (csIdx < charStyles.size() - 1) {
-                        // special case, empty trailing text run
-                        HSLFTextRun nextRun = new HSLFTextRun(para);
-                        nextRun.setText("");
-                        runs.add(nextRun);
-                        ccRun++;
-                    } else {
-                        // need to add +1 to the last run of the last paragraph
-                        trun.getCharacterStyle().updateTextSize(trun.getLength()+1);
-                        ccRun++;
-                    }
-                }
-
-                // need to compare it again, in case a run has been added after
-                if (++runIdx == runs.size()) {
-                    paraIdx++;
-                    runIdx = 0;
-                }
-            }
-        }
-    }
-
-    protected static void applyParagraphStyles(List<HSLFTextParagraph> paragraphs, List<TextPropCollection> paraStyles) {
-        int paraIdx = 0;
-        for (TextPropCollection p : paraStyles) {
-            for (int ccPara = 0, ccStyle = p.getCharactersCovered(); ccPara < ccStyle; paraIdx++) {
-                if (paraIdx >= paragraphs.size()) return;
-                HSLFTextParagraph htp = paragraphs.get(paraIdx);
-                TextPropCollection pCopy = new TextPropCollection(0, TextPropType.paragraph);
-                pCopy.copy(p);
-                htp.setParagraphStyle(pCopy);
-                int len = 0;
-                for (HSLFTextRun trun : htp.getTextRuns()) {
-                    len += trun.getLength();
-                }
-                if (paraIdx == paragraphs.size()-1) len++;
-                pCopy.updateTextSize(len);
-                ccPara += len;
-            }
-        }
-    }
-
-    protected static void applyParagraphIndents(List<HSLFTextParagraph> paragraphs, List<IndentProp> paraStyles) {
-        int paraIdx = 0;
-        for (IndentProp p : paraStyles) {
-            for (int ccPara = 0, ccStyle = p.getCharactersCovered(); ccPara < ccStyle; paraIdx++) {
-                if (paraIdx >= paragraphs.size() || ccPara >= ccStyle-1) return;
-                HSLFTextParagraph para = paragraphs.get(paraIdx);
-                int len = 0;
-                for (HSLFTextRun trun : para.getTextRuns()) {
-                    len += trun.getLength();
-                }
-                para.setIndentLevel(p.getIndentLevel());
-                ccPara += len + 1;
-            }
-        }
-    }
-
-    protected static List<HSLFTextParagraph> createEmptyParagraph() {
-        EscherTextboxWrapper wrapper = new EscherTextboxWrapper();
-        return createEmptyParagraph(wrapper);
-    }
-
-    protected static List<HSLFTextParagraph> createEmptyParagraph(EscherTextboxWrapper wrapper) {
-        TextHeaderAtom tha = new TextHeaderAtom();
-        tha.setParentRecord(wrapper);
-        wrapper.appendChildRecord(tha);
-
-        TextBytesAtom tba = new TextBytesAtom();
-        tba.setText("".getBytes(LocaleUtil.CHARSET_1252));
-        wrapper.appendChildRecord(tba);
-
-        StyleTextPropAtom sta = new StyleTextPropAtom(1);
-        TextPropCollection paraStyle = sta.addParagraphTextPropCollection(1);
-        TextPropCollection charStyle = sta.addCharacterTextPropCollection(1);
-        wrapper.appendChildRecord(sta);
-
-        List<HSLFTextParagraph> paragraphs = new ArrayList<HSLFTextParagraph>(1);
-        HSLFTextParagraph htp = new HSLFTextParagraph(tha, tba, null, paragraphs);
-        htp.setParagraphStyle(paraStyle);
-        paragraphs.add(htp);
-
-        HSLFTextRun htr = new HSLFTextRun(htp);
-        htr.setCharacterStyle(charStyle);
-        htr.setText("");
-        htp.addTextRun(htr);
-
-        return paragraphs;
-    }
-
-    public EscherTextboxWrapper getTextboxWrapper() {
-        return (EscherTextboxWrapper) _headerAtom.getParentRecord();
-    }
-
-    protected static Color getColorFromColorIndexStruct(int rgb, HSLFSheet sheet) {
-        int cidx = rgb >>> 24;
-        Color tmp;
-        switch (cidx) {
-            // Background ... Accent 3 color
-            case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-                if (sheet == null) return null;
-                ColorSchemeAtom ca = sheet.getColorScheme();
-                tmp = new Color(ca.getColor(cidx), true);
-                break;
-            // Color is an sRGB value specified by red, green, and blue fields.
-            case 0xFE:
-                tmp = new Color(rgb, true);
-                break;
-            // Color is undefined.
-            default:
-            case 0xFF:
-                return null;
-        }
-        return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());
-    }
-
-    /**
-     * Sets the value of the given Paragraph TextProp, add if required
-     * @param propName The name of the Paragraph TextProp
-     * @param val The value to set for the TextProp
-     */
-    public void setParagraphTextPropVal(String propName, Integer val) {
-        setPropVal(_paragraphStyle, propName, val);
-        setDirty();
-    }
-
-    /**
-     * marks this paragraph dirty, so its records will be renewed on save
-     */
-    public void setDirty() {
-        _dirty = true;
-    }
-
-    public boolean isDirty() {
-        return _dirty;
-    }
-
-    /**
-     * Calculates the start index of the given text run
-     *
-     * @param textrun the text run to search for
-     * @return the start index with the paragraph collection or -1 if not found
-     */
-    /* package */ int getStartIdxOfTextRun(HSLFTextRun textrun) {
-        int idx = 0;
-        for (HSLFTextParagraph p : parentList) {
-            for (HSLFTextRun r : p) {
-                if (r == textrun) {
-                    return idx;
-                }
-                idx += r.getLength();
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * {@inheritDoc}
-     * 
-     * @see RoundTripHFPlaceholder12
-     */
-    @Override
-    public boolean isHeaderOrFooter() {
-        HSLFShape s = getParentShape();
-        if (s == null) {
-            return false;
-        }
-        RoundTripHFPlaceholder12 hfPl = s.getClientDataRecord(RecordTypes.RoundTripHFPlaceholder12.typeID);
-        if (hfPl == null) {
-            return false;
-        }
-
-        int plId = hfPl.getPlaceholderId();
-        switch (plId) {
-            case OEPlaceholderAtom.MasterDate:
-            case OEPlaceholderAtom.MasterSlideNumber:
-            case OEPlaceholderAtom.MasterFooter:
-            case OEPlaceholderAtom.MasterHeader:
-                return true;
-            default:
-                return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
deleted file mode 100644
index 427e2d2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.apache.poi.hslf.usermodel.HSLFTextParagraph.getPropVal;
-
-import java.awt.Color;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.model.textproperties.BitMaskTextProp;
-import org.apache.poi.hslf.model.textproperties.CharFlagsTextProp;
-import org.apache.poi.hslf.model.textproperties.TextProp;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-
-/**
- * Represents a run of text, all with the same style
- *
- */
-public final class HSLFTextRun implements TextRun {
-	protected POILogger logger = POILogFactory.getLogger(this.getClass());
-
-	/** The TextRun we belong to */
-	private HSLFTextParagraph parentParagraph;
-	private String _runText = "";
-	private String _fontFamily;
-	private HSLFHyperlink link;
-	
-	/**
-	 * Our paragraph and character style.
-	 * Note - we may share these styles with other RichTextRuns
-	 */
-	private TextPropCollection characterStyle = new TextPropCollection(1, TextPropType.character);
-
-	/**
-	 * Create a new wrapper around a rich text string
-	 * @param parentParagraph the parent paragraph
-	 */
-	public HSLFTextRun(HSLFTextParagraph parentParagraph) {
-		this.parentParagraph = parentParagraph;
-	}
-	
-	public TextPropCollection getCharacterStyle() {
-	    return characterStyle;
-	}
-
-	public void setCharacterStyle(TextPropCollection characterStyle) {
-	    this.characterStyle.copy(characterStyle);
-	    this.characterStyle.updateTextSize(_runText.length());
-	}
-	
-    /**
-     * Setting a master style reference
-     *
-     * @param characterStyle the master style reference
-     * 
-     * @since POI 3.14-Beta1
-     */
-	@Internal
-    /* package */ void setMasterStyleReference(TextPropCollection characterStyle) {
-        this.characterStyle = characterStyle;
-    }
- 
-	
-	/**
-	 * Supply the SlideShow we belong to
-	 */
-	public void updateSheet() {
-		if (_fontFamily != null) {
-			setFontFamily(_fontFamily);
-			_fontFamily = null;
-		}
-	}
-
-	/**
-	 * Get the length of the text
-	 */
-	public int getLength() {
-		return _runText.length();
-	}
-
-	/**
-	 * Fetch the text, in raw storage form
-	 */
-	public String getRawText() {
-		return _runText;
-	}
-
-	/**
-	 * Change the text
-	 */
-	public void setText(String text) {
-	    if (text == null) {
-	        throw new HSLFException("text must not be null");
-	    }
-	    String newText = HSLFTextParagraph.toInternalString(text);
-	    if (!newText.equals(_runText)) {
-	        _runText = newText;
-	        if (HSLFSlideShow.getLoadSavePhase() == HSLFSlideShow.LoadSavePhase.LOADED) {
-	            parentParagraph.setDirty();
-	        }
-	    }
-	}
-
-	// --------------- Internal helpers on rich text properties -------
-
-	/**
-	 * Fetch the value of the given flag in the CharFlagsTextProp.
-	 * Returns false if the CharFlagsTextProp isn't present, since the
-	 *  text property won't be set if there's no CharFlagsTextProp.
-	 */
-	private boolean isCharFlagsTextPropVal(int index) {
-		return getFlag(index);
-	}
-
-	protected boolean getFlag(int index) {
-	    if (characterStyle == null) return false;
-
-		BitMaskTextProp prop = (BitMaskTextProp)characterStyle.findByName(CharFlagsTextProp.NAME);
-
-		if (prop == null || !prop.getSubPropMatches()[index]) {
-            int txtype = parentParagraph.getRunType();
-			HSLFSheet sheet = parentParagraph.getSheet();
-			if (sheet != null) {
-				HSLFMasterSheet master = sheet.getMasterSheet();
-				if (master != null){
-					prop = (BitMaskTextProp)master.getStyleAttribute(txtype, parentParagraph.getIndentLevel(), CharFlagsTextProp.NAME, true);
-				}
-			} else {
-				logger.log(POILogger.WARN, "MasterSheet is not available");
-			}
-		}
-
-		return prop == null ? false : prop.getSubValue(index);
-	}
-
-	/**
-	 * Set the value of the given flag in the CharFlagsTextProp, adding
-	 *  it if required.
-	 */
-	private void setCharFlagsTextPropVal(int index, boolean value) {
-	    // TODO: check if paragraph/chars can be handled the same ...
-		if (getFlag(index) != value) {
-		    setFlag(index, value);
-		    parentParagraph.setDirty();
-		}
-	}
-
-	/**
-	 * Sets the value of the given Paragraph TextProp, add if required
-	 * @param propName The name of the Paragraph TextProp
-	 * @param val The value to set for the TextProp
-	 */
-	public void setCharTextPropVal(String propName, Integer val) {
-	    HSLFTextParagraph.setPropVal(characterStyle, propName, val);
-	    parentParagraph.setDirty();
-	}
-
-
-	// --------------- Friendly getters / setters on rich text properties -------
-
-	@Override
-	public boolean isBold() {
-		return isCharFlagsTextPropVal(CharFlagsTextProp.BOLD_IDX);
-	}
-
-	@Override
-	public void setBold(boolean bold) {
-		setCharFlagsTextPropVal(CharFlagsTextProp.BOLD_IDX, bold);
-	}
-
-	@Override
-	public boolean isItalic() {
-		return isCharFlagsTextPropVal(CharFlagsTextProp.ITALIC_IDX);
-	}
-
-	@Override
-	public void setItalic(boolean italic) {
-		setCharFlagsTextPropVal(CharFlagsTextProp.ITALIC_IDX, italic);
-	}
-
-	@Override
-	public boolean isUnderlined() {
-		return isCharFlagsTextPropVal(CharFlagsTextProp.UNDERLINE_IDX);
-	}
-
-	@Override
-	public void setUnderlined(boolean underlined) {
-		setCharFlagsTextPropVal(CharFlagsTextProp.UNDERLINE_IDX, underlined);
-	}
-
-	/**
-	 * Does the text have a shadow?
-	 */
-	public boolean isShadowed() {
-		return isCharFlagsTextPropVal(CharFlagsTextProp.SHADOW_IDX);
-	}
-
-	/**
-	 * Does the text have a shadow?
-	 */
-	public void setShadowed(boolean flag) {
-		setCharFlagsTextPropVal(CharFlagsTextProp.SHADOW_IDX, flag);
-	}
-
-	/**
-	 * Is this text embossed?
-	 */
-	 public boolean isEmbossed() {
-		return isCharFlagsTextPropVal(CharFlagsTextProp.RELIEF_IDX);
-	}
-
-	/**
-	 * Is this text embossed?
-	 */
-	 public void setEmbossed(boolean flag) {
-		setCharFlagsTextPropVal(CharFlagsTextProp.RELIEF_IDX, flag);
-	}
-
-	@Override
-	public boolean isStrikethrough() {
-		return isCharFlagsTextPropVal(CharFlagsTextProp.STRIKETHROUGH_IDX);
-	}
-
-	@Override
-	public void setStrikethrough(boolean flag) {
-		setCharFlagsTextPropVal(CharFlagsTextProp.STRIKETHROUGH_IDX, flag);
-	}
-
-	/**
-	 * Gets the subscript/superscript option
-	 *
-	 * @return the percentage of the font size. If the value is positive, it is superscript, otherwise it is subscript
-	 */
-	public int getSuperscript() {
-		TextProp tp = getPropVal(characterStyle, "superscript", parentParagraph);
-		return tp == null ? 0 : tp.getValue();
-	}
-
-	/**
-	 * Sets the subscript/superscript option
-	 *
-	 * @param val the percentage of the font size. If the value is positive, it is superscript, otherwise it is subscript
-	 */
-	public void setSuperscript(int val) {
-	    setCharTextPropVal("superscript", val);
-	}
-
-    @Override
-	public Double getFontSize() {
-        TextProp tp = getPropVal(characterStyle, "font.size", parentParagraph);
-        return tp == null ? null : (double)tp.getValue();
-	}
-
-
-	@Override
-	public void setFontSize(Double fontSize) {
-	    Integer iFontSize = (fontSize == null) ? null : fontSize.intValue();
-		setCharTextPropVal("font.size", iFontSize);
-	}
-
-	/**
-	 * Gets the font index
-	 */
-	public int getFontIndex() {
-        TextProp tp = getPropVal(characterStyle, "font.index", parentParagraph);
-        return tp == null ? -1 : tp.getValue();
-	}
-
-	/**
-	 * Sets the font index
-	 */
-	public void setFontIndex(int idx) {
-		setCharTextPropVal("font.index", idx);
-	}
-
-	@Override
-	public void setFontFamily(String fontFamily) {
-	    HSLFSheet sheet = parentParagraph.getSheet();
-	    @SuppressWarnings("resource")
-        HSLFSlideShow slideShow = (sheet == null) ? null : sheet.getSlideShow();
-		if (sheet == null || slideShow == null) {
-			//we can't set font since slideshow is not assigned yet
-			_fontFamily = fontFamily;
-			return;
-		}
-		// Get the index for this font (adding if needed)
-		Integer fontIdx = (fontFamily == null) ? null : slideShow.getFontCollection().addFont(fontFamily);
-		setCharTextPropVal("font.index", fontIdx);
-	}
-
-	@Override
-	public String getFontFamily() {
-        HSLFSheet sheet = parentParagraph.getSheet();
-        @SuppressWarnings("resource")
-        HSLFSlideShow slideShow = (sheet == null) ? null : sheet.getSlideShow();
-		if (sheet == null || slideShow == null) {
-			return _fontFamily;
-		}
-        TextProp tp = getPropVal(characterStyle, "font.index,asian.font.index,ansi.font.index,symbol.font.index", parentParagraph);
-        if (tp == null) { return null; }
-		return slideShow.getFontCollection().getFontWithId(tp.getValue());
-	}
-
-	/**
-	 * @return font color as PaintStyle
-	 */
-	@Override
-	public SolidPaint getFontColor() {
-		TextProp tp = getPropVal(characterStyle, "font.color", parentParagraph);
-		if (tp == null) return null;
-		Color color = HSLFTextParagraph.getColorFromColorIndexStruct(tp.getValue(), parentParagraph.getSheet());
-		SolidPaint ps = DrawPaint.createSolidPaint(color);
-		return ps;
-	}
-
-	/**
-	 * Sets color of the text, as a int bgr.
-	 * (PowerPoint stores as BlueGreenRed, not the more
-	 *  usual RedGreenBlue)
-	 * @see java.awt.Color
-	 */
-	public void setFontColor(int bgr) {
-		setCharTextPropVal("font.color", bgr);
-	}
-
-
-    @Override
-    public void setFontColor(Color color) {
-        setFontColor(DrawPaint.createSolidPaint(color));
-    }
-	
-	@Override
-	public void setFontColor(PaintStyle color) {
-	    if (!(color instanceof SolidPaint)) {
-	        throw new IllegalArgumentException("HSLF only supports solid paint");
-	    }
-		// In PowerPont RGB bytes are swapped, as BGR
-	    SolidPaint sp = (SolidPaint)color;
-	    Color c = DrawPaint.applyColorTransform(sp.getSolidColor());
-		int rgb = new Color(c.getBlue(), c.getGreen(), c.getRed(), 254).getRGB();
-		setFontColor(rgb);
-	}
-
-    protected void setFlag(int index, boolean value) {
-        BitMaskTextProp prop = (BitMaskTextProp)characterStyle.addWithName(CharFlagsTextProp.NAME);
-        prop.setSubValue(value, index);
-    }
-
-    public HSLFTextParagraph getTextParagraph() {
-        return parentParagraph;
-    }
-    
-    public TextCap getTextCap() {
-        return TextCap.NONE;
-    }
-
-    @Override
-    public boolean isSubscript() {
-        return getSuperscript() < 0;
-    }
-
-    @Override
-    public boolean isSuperscript() {
-        return getSuperscript() > 0;
-    }
-
-    public byte getPitchAndFamily() {
-        return 0;
-    }
-
-    /**
-     * Sets the hyperlink - used when parsing the document
-     *
-     * @param link the hyperlink
-     */
-    protected void setHyperlink(HSLFHyperlink link) {
-        this.link = link;
-    }
-    
-    @Override
-    public HSLFHyperlink getHyperlink() {
-        return link;
-    }
-    
-    @Override
-    public HSLFHyperlink createHyperlink() {
-        if (link == null) {
-            link = HSLFHyperlink.createHyperlink(this);
-            parentParagraph.setDirty();
-        }
-        return link;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
deleted file mode 100644
index b26b3df..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
+++ /dev/null
@@ -1,851 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.apache.poi.hslf.record.RecordTypes.OEPlaceholderAtom;
-import static org.apache.poi.hslf.record.RecordTypes.RoundTripHFPlaceholder12;
-
-import java.awt.font.FontRenderContext;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.model.HSLFMetroShape;
-import org.apache.poi.hslf.record.EscherTextboxWrapper;
-import org.apache.poi.hslf.record.OEPlaceholderAtom;
-import org.apache.poi.hslf.record.PPDrawing;
-import org.apache.poi.hslf.record.RoundTripHFPlaceholder12;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.DrawTextShape;
-import org.apache.poi.sl.usermodel.Insets2D;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.ShapeContainer;
-import org.apache.poi.sl.usermodel.TextShape;
-import org.apache.poi.sl.usermodel.VerticalAlignment;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-/**
- * A common superclass of all shapes that can hold text.
- */
-public abstract class HSLFTextShape extends HSLFSimpleShape
-implements TextShape<HSLFShape,HSLFTextParagraph> {
-
-    /**
-     * How to anchor the text
-     */
-    private enum HSLFTextAnchor {
-        TOP                   (0, VerticalAlignment.TOP,    false, false),
-        MIDDLE                (1, VerticalAlignment.MIDDLE, false, false),
-        BOTTOM                (2, VerticalAlignment.BOTTOM, false, false),
-        TOP_CENTER            (3, VerticalAlignment.TOP,    true,  false),
-        MIDDLE_CENTER         (4, VerticalAlignment.MIDDLE, true,  false),
-        BOTTOM_CENTER         (5, VerticalAlignment.BOTTOM, true,  false),
-        TOP_BASELINE          (6, VerticalAlignment.TOP,    false, true),
-        BOTTOM_BASELINE       (7, VerticalAlignment.BOTTOM, false, true),
-        TOP_CENTER_BASELINE   (8, VerticalAlignment.TOP,    true,  true),
-        BOTTOM_CENTER_BASELINE(9, VerticalAlignment.BOTTOM, true,  true);
-        
-        public final int nativeId;
-        public final VerticalAlignment vAlign;
-        public final boolean centered;
-        public final Boolean baseline;
-        
-        HSLFTextAnchor(int nativeId, VerticalAlignment vAlign, boolean centered, Boolean baseline) {
-            this.nativeId = nativeId;
-            this.vAlign = vAlign;
-            this.centered = centered;
-            this.baseline = baseline;
-        }
-
-        static HSLFTextAnchor fromNativeId(int nativeId) {
-            for (HSLFTextAnchor ta : values()) {
-                if (ta.nativeId == nativeId) return ta;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Specifies that a line of text will continue on subsequent lines instead
-     * of extending into or beyond a margin.
-     * Office Excel 2007, Excel 2010, PowerPoint 97, and PowerPoint 2010 read
-     * and use this value properly but do not write it.
-     */
-    public static final int WrapSquare = 0;
-    /**
-     * Specifies a wrapping rule that is equivalent to that of WrapSquare
-     * Excel 97, Excel 2000, Excel 2002, and Office Excel 2003 use this value.
-     * All other product versions listed at the beginning of this appendix ignore this value.
-     */
-    public static final int WrapByPoints = 1;
-    /**
-     * Specifies that a line of text will extend into or beyond a margin instead
-     * of continuing on subsequent lines.
-     * Excel 97, Word 97, Excel 2000, Word 2000, Excel 2002,
-     * and Office Excel 2003 do not use this value.
-     */
-    public static final int WrapNone = 2;
-    /**
-     * Specifies a wrapping rule that is undefined and MUST be ignored.
-     */
-    public static final int WrapTopBottom = 3;
-    /**
-     * Specifies a wrapping rule that is undefined and MUST be ignored.
-     */
-    public static final int WrapThrough = 4;
-
-
-    /**
-     * TextRun object which holds actual text and format data
-     */
-    protected List<HSLFTextParagraph> _paragraphs = new ArrayList<HSLFTextParagraph>();
-
-    /**
-     * Escher container which holds text attributes such as
-     * TextHeaderAtom, TextBytesAtom ot TextCharsAtom, StyleTextPropAtom etc.
-     */
-    protected EscherTextboxWrapper _txtbox;
-
-    /**
-     * This setting is used for supporting a deprecated alignment
-     *
-     * @see <a href=""></a>
-     */
-//    boolean alignToBaseline = false;
-
-    /**
-     * Used to calculate text bounds
-     */
-    protected static final FontRenderContext _frc = new FontRenderContext(null, true, true);
-
-    /**
-     * Create a TextBox object and initialize it from the supplied Record container.
-     *
-     * @param escherRecord       <code>EscherSpContainer</code> container which holds information about this shape
-     * @param parent    the parent of the shape
-     */
-    protected HSLFTextShape(EscherContainerRecord escherRecord, ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(escherRecord, parent);
-    }
-
-    /**
-     * Create a new TextBox. This constructor is used when a new shape is created.
-     *
-     * @param parent    the parent of this Shape. For example, if this text box is a cell
-     * in a table then the parent is Table.
-     */
-    public HSLFTextShape(ShapeContainer<HSLFShape,HSLFTextParagraph> parent){
-        super(null, parent);
-        _escherContainer = createSpContainer(parent instanceof HSLFGroupShape);
-    }
-
-    /**
-     * Create a new TextBox. This constructor is used when a new shape is created.
-     *
-     */
-    public HSLFTextShape(){
-        this(null);
-    }
-
-    /**
-     * Set default properties for the  TextRun.
-     * Depending on the text and shape type the defaults are different:
-     *   TextBox: align=left, valign=top
-     *   AutoShape: align=center, valign=middle
-     *
-     */
-    protected void setDefaultTextProperties(HSLFTextParagraph _txtrun){
-
-    }
-
-    /**
-     * When a textbox is added to  a sheet we need to tell upper-level
-     * <code>PPDrawing</code> about it.
-     *
-     * @param sh the sheet we are adding to
-     */
-    protected void afterInsert(HSLFSheet sh){
-        super.afterInsert(sh);
-
-        storeText();
-
-        EscherTextboxWrapper thisTxtbox = getEscherTextboxWrapper();
-        if(thisTxtbox != null){
-            _escherContainer.addChildRecord(thisTxtbox.getEscherRecord());
-
-            PPDrawing ppdrawing = sh.getPPDrawing();
-            ppdrawing.addTextboxWrapper(thisTxtbox);
-            // Ensure the escher layer knows about the added records
-            try {
-                thisTxtbox.writeOut(null);
-            } catch (IOException e){
-                throw new HSLFException(e);
-            }
-            boolean isInitialAnchor = getAnchor().equals(new Rectangle2D.Double());
-            boolean isFilledTxt = !"".equals(getText());
-            if (isInitialAnchor && isFilledTxt) {
-                resizeToFitText();
-            }
-        }
-        for (HSLFTextParagraph htp : _paragraphs) {
-            htp.setShapeId(getShapeId());
-        }
-        sh.onAddTextShape(this);
-    }
-
-    protected EscherTextboxWrapper getEscherTextboxWrapper(){
-        if(_txtbox != null) return _txtbox;
-
-        EscherTextboxRecord textRecord = getEscherChild(EscherTextboxRecord.RECORD_ID);
-        if (textRecord == null) return null;
-
-        HSLFSheet sheet = getSheet();
-        if (sheet != null) {
-            PPDrawing drawing = sheet.getPPDrawing();
-            if (drawing != null) {
-                EscherTextboxWrapper wrappers[] = drawing.getTextboxWrappers();
-                if (wrappers != null) {
-                    for (EscherTextboxWrapper w : wrappers) {
-                        // check for object identity
-                        if (textRecord == w.getEscherRecord()) {
-                            _txtbox = w;
-                            return _txtbox;
-                        }
-                    }
-                }
-            }
-        }
-
-        _txtbox = new EscherTextboxWrapper(textRecord);
-        return _txtbox;
-    }
-
-    /**
-     * Adjust the size of the shape so it encompasses the text inside it.
-     *
-     * @return a <code>Rectangle2D</code> that is the bounds of this shape.
-     */
-    public Rectangle2D resizeToFitText(){
-        Rectangle2D anchor = getAnchor();
-        if(anchor.getWidth() == 0.) {
-            logger.log(POILogger.WARN, "Width of shape wasn't set. Defaulting to 200px");
-            anchor.setRect(anchor.getX(), anchor.getY(), 200., anchor.getHeight());
-            setAnchor(anchor);
-        }
-        double height = getTextHeight();
-        height += 1; // add a pixel to compensate rounding errors
-
-        anchor.setRect(anchor.getX(), anchor.getY(), anchor.getWidth(), height);
-        setAnchor(anchor);
-
-        return anchor;
-    }
-
-    /**
-    * Returns the type of the text, from the TextHeaderAtom.
-    * Possible values can be seen from TextHeaderAtom
-    * @see org.apache.poi.hslf.record.TextHeaderAtom
-    */
-    public int getRunType() {
-        getEscherTextboxWrapper();
-        if (_txtbox == null) return -1;
-        List<HSLFTextParagraph> paras = HSLFTextParagraph.findTextParagraphs(_txtbox, getSheet());
-        return (paras.isEmpty()) ? -1 : paras.get(0).getRunType();
-    }
-
-    /**
-    * Changes the type of the text. Values should be taken
-    *  from TextHeaderAtom. No checking is done to ensure you
-    *  set this to a valid value!
-    * @see org.apache.poi.hslf.record.TextHeaderAtom
-    */
-    public void setRunType(int type) {
-        getEscherTextboxWrapper();
-        if (_txtbox == null) return;
-        List<HSLFTextParagraph> paras = HSLFTextParagraph.findTextParagraphs(_txtbox, getSheet());
-        if (!paras.isEmpty()) {
-            paras.get(0).setRunType(type);
-        }
-    }
-
-    /**
-     * Returns the type of vertical alignment for the text.
-     * One of the <code>Anchor*</code> constants defined in this class.
-     *
-     * @return the type of alignment
-     */
-    /* package */ HSLFTextAnchor getAlignment(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.TEXT__ANCHORTEXT);
-        HSLFTextAnchor align = HSLFTextAnchor.TOP;
-        if (prop == null){
-            /**
-             * If vertical alignment was not found in the shape properties then try to
-             * fetch the master shape and search for the align property there.
-             */
-            int type = getRunType();
-            HSLFSheet sh = getSheet();
-            HSLFMasterSheet master = (sh != null) ? sh.getMasterSheet() : null;
-            HSLFTextShape masterShape = (master != null) ? master.getPlaceholderByTextType(type) : null;
-            if (masterShape != null && type != TextHeaderAtom.OTHER_TYPE) {
-                align = masterShape.getAlignment();
-            } else {
-                //not found in the master sheet. Use the hardcoded defaults.
-                switch (type){
-                     case TextHeaderAtom.TITLE_TYPE:
-                     case TextHeaderAtom.CENTER_TITLE_TYPE:
-                         align = HSLFTextAnchor.MIDDLE;
-                         break;
-                     default:
-                         align = HSLFTextAnchor.TOP;
-                         break;
-                 }
-            }
-        } else {
-            align = HSLFTextAnchor.fromNativeId(prop.getPropertyValue());
-        }
-
-        if (align == null) {
-            align = HSLFTextAnchor.TOP;
-        }
-
-        return align;
-    }
-
-    /**
-     * Sets the type of alignment for the text.
-     * One of the <code>Anchor*</code> constants defined in this class.
-     *
-     * @param isCentered horizontal centered?
-     * @param vAlign vertical alignment
-     * @param baseline aligned to baseline?
-     */
-    /* package */ void setAlignment(Boolean isCentered, VerticalAlignment vAlign, boolean baseline) {
-        for (HSLFTextAnchor hta : HSLFTextAnchor.values()) {
-            if (
-                (hta.centered == (isCentered != null && isCentered)) &&
-                (hta.vAlign == vAlign) &&
-                (hta.baseline == null || hta.baseline == baseline)
-            ) {
-                setEscherProperty(EscherProperties.TEXT__ANCHORTEXT, hta.nativeId);
-                break;
-            }
-        }
-    }
-
-    /**
-     * @return true, if vertical alignment is relative to baseline
-     * this is only used for older versions less equals Office 2003
-     */
-    public boolean isAlignToBaseline() {
-        return getAlignment().baseline;
-    }
-
-    /**
-     * Sets the vertical alignment relative to the baseline
-     *
-     * @param alignToBaseline if true, vertical alignment is relative to baseline
-     */
-    public void setAlignToBaseline(boolean alignToBaseline) {
-        setAlignment(isHorizontalCentered(), getVerticalAlignment(), alignToBaseline);
-    }
-
-    @Override
-    public boolean isHorizontalCentered() {
-        return getAlignment().centered;
-    }
-
-    @Override
-    public void setHorizontalCentered(Boolean isCentered) {
-        setAlignment(isCentered, getVerticalAlignment(), getAlignment().baseline);
-    }
-
-    @Override
-    public VerticalAlignment getVerticalAlignment() {
-        return getAlignment().vAlign;
-    }
-
-    @Override
-    public void setVerticalAlignment(VerticalAlignment vAlign) {
-        setAlignment(isHorizontalCentered(), vAlign, getAlignment().baseline);
-    }
-
-    /**
-     * Returns the distance (in points) between the bottom of the text frame
-     * and the bottom of the inscribed rectangle of the shape that contains the text.
-     * Default value is 1/20 inch.
-     *
-     * @return the botom margin
-     */
-    public double getBottomInset(){
-        return getInset(EscherProperties.TEXT__TEXTBOTTOM, .05);
-    }
-
-    /**
-     * Sets the botom margin.
-     * @see #getBottomInset()
-     *
-     * @param margin    the bottom margin
-     */
-    public void setBottomInset(double margin){
-        setInset(EscherProperties.TEXT__TEXTBOTTOM, margin);
-    }
-
-    /**
-     *  Returns the distance (in points) between the left edge of the text frame
-     *  and the left edge of the inscribed rectangle of the shape that contains
-     *  the text.
-     *  Default value is 1/10 inch.
-     *
-     * @return the left margin
-     */
-    public double getLeftInset(){
-        return getInset(EscherProperties.TEXT__TEXTLEFT, .1);
-    }
-
-    /**
-     * Sets the left margin.
-     * @see #getLeftInset()
-     *
-     * @param margin    the left margin
-     */
-    public void setLeftInset(double margin){
-        setInset(EscherProperties.TEXT__TEXTLEFT, margin);
-    }
-
-    /**
-     *  Returns the distance (in points) between the right edge of the
-     *  text frame and the right edge of the inscribed rectangle of the shape
-     *  that contains the text.
-     *  Default value is 1/10 inch.
-     *
-     * @return the right margin
-     */
-    public double getRightInset(){
-        return getInset(EscherProperties.TEXT__TEXTRIGHT, .1);
-    }
-
-    /**
-     * Sets the right margin.
-     * @see #getRightInset()
-     *
-     * @param margin    the right margin
-     */
-    public void setRightInset(double margin){
-        setInset(EscherProperties.TEXT__TEXTRIGHT, margin);
-    }
-
-     /**
-     *  Returns the distance (in points) between the top of the text frame
-     *  and the top of the inscribed rectangle of the shape that contains the text.
-     *  Default value is 1/20 inch.
-     *
-     * @return the top margin
-     */
-    public double getTopInset(){
-        return getInset(EscherProperties.TEXT__TEXTTOP, .05);
-    }
-
-   /**
-     * Sets the top margin.
-     * @see #getTopInset()
-     *
-     * @param margin    the top margin
-     */
-    public void setTopInset(double margin){
-        setInset(EscherProperties.TEXT__TEXTTOP, margin);
-    }
-
-    /**
-     * Returns the distance (in points) between the edge of the text frame
-     * and the edge of the inscribed rectangle of the shape that contains the text.
-     * Default value is 1/20 inch.
-     *
-     * @param propId the id of the inset edge
-     * @return the inset in points
-     */
-    private double getInset(short propId, double defaultInch) {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, propId);
-        int val = prop == null ? (int)(Units.toEMU(Units.POINT_DPI)*defaultInch) : prop.getPropertyValue();
-        return Units.toPoints(val);
-    }
-
-    /**
-     * @param propId the id of the inset edge
-     * @param margin the inset in points
-     */
-    private void setInset(short propId, double margin){
-        setEscherProperty(propId, Units.toEMU(margin));
-    }
-
-    /**
-     * Returns the value indicating word wrap.
-     *
-     * @return the value indicating word wrap.
-     *  Must be one of the <code>Wrap*</code> constants defined in this class.
-     *
-     * @see <a href="https://msdn.microsoft.com/en-us/library/dd948168(v=office.12).aspx">MSOWRAPMODE</a>
-     */
-    public int getWordWrapEx() {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.TEXT__WRAPTEXT);
-        return prop == null ? WrapSquare : prop.getPropertyValue();
-    }
-
-    /**
-     *  Specifies how the text should be wrapped
-     *
-     * @param wrap  the value indicating how the text should be wrapped.
-     *  Must be one of the <code>Wrap*</code> constants defined in this class.
-     */
-    public void setWordWrapEx(int wrap){
-        setEscherProperty(EscherProperties.TEXT__WRAPTEXT, wrap);
-    }
-
-    @Override
-    public boolean getWordWrap(){
-        int ww = getWordWrapEx();
-        return (ww != WrapNone);
-    }
-
-    @Override
-    public void setWordWrap(boolean wrap) {
-        setWordWrapEx(wrap ? WrapSquare : WrapNone);
-    }
-
-    /**
-     * @return id for the text.
-     */
-    public int getTextId(){
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.TEXT__TEXTID);
-        return prop == null ? 0 : prop.getPropertyValue();
-    }
-
-    /**
-     * Sets text ID
-     *
-     * @param id of the text
-     */
-    public void setTextId(int id){
-        setEscherProperty(EscherProperties.TEXT__TEXTID, id);
-    }
-
-    @Override
-    public List<HSLFTextParagraph> getTextParagraphs(){
-        if (!_paragraphs.isEmpty()) return _paragraphs;
-
-        _txtbox = getEscherTextboxWrapper();
-        if (_txtbox == null) {
-            _paragraphs.addAll(HSLFTextParagraph.createEmptyParagraph());
-            _txtbox = _paragraphs.get(0).getTextboxWrapper();
-        } else {
-            _paragraphs = HSLFTextParagraph.findTextParagraphs(_txtbox, getSheet());
-            if (_paragraphs == null) {
-                // there are actually TextBoxRecords without extra data - see #54722
-                _paragraphs = HSLFTextParagraph.createEmptyParagraph(_txtbox);
-            }
-
-            if (_paragraphs.isEmpty()) {
-                logger.log(POILogger.WARN, "TextRecord didn't contained any text lines");
-            }
-        }
-
-        for (HSLFTextParagraph p : _paragraphs) {
-            p.setParentShape(this);
-        }
-
-        return _paragraphs;
-    }
-
-    public void setSheet(HSLFSheet sheet) {
-        _sheet = sheet;
-
-        // Initialize _txtrun object.
-        // (We can't do it in the constructor because the sheet
-        //  is not assigned then, it's only built once we have
-        //  all the records)
-        List<HSLFTextParagraph> ltp = getTextParagraphs();
-        HSLFTextParagraph.supplySheet(ltp, sheet);
-    }
-
-    /**
-     * Return {@link OEPlaceholderAtom}, the atom that describes a placeholder.
-     *
-     * @return {@link OEPlaceholderAtom} or {@code null} if not found
-     */
-    public OEPlaceholderAtom getPlaceholderAtom(){
-        return getClientDataRecord(OEPlaceholderAtom.typeID);
-    }
-
-    /**
-     * Return {@link RoundTripHFPlaceholder12}, the atom that describes a header/footer placeholder.
-     * Compare the {@link RoundTripHFPlaceholder12#getPlaceholderId()} with
-     * {@link OEPlaceholderAtom#MasterHeader} or {@link OEPlaceholderAtom#MasterFooter}, to find out
-     * what kind of placeholder this is.
-     *
-     * @return {@link RoundTripHFPlaceholder12} or {@code null} if not found
-     * 
-     * @since POI 3.14-Beta2
-     */
-    public RoundTripHFPlaceholder12 getHFPlaceholderAtom() {
-        // special case for files saved in Office 2007
-        return getClientDataRecord(RoundTripHFPlaceholder12.typeID);
-    }
-    
-    @Override
-    public boolean isPlaceholder() {
-        OEPlaceholderAtom oep = getPlaceholderAtom();
-        if (oep != null) return true;
-
-        //special case for files saved in Office 2007
-        RoundTripHFPlaceholder12 hldr = getHFPlaceholderAtom();
-        if (hldr != null) return true;
-
-        return false;
-    }
-
-
-    @Override
-    public Iterator<HSLFTextParagraph> iterator() {
-        return _paragraphs.iterator();
-    }
-
-    @Override
-    public Insets2D getInsets() {
-        Insets2D insets = new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset());
-        return insets;
-    }
-
-    @Override
-    public void setInsets(Insets2D insets) {
-        setTopInset(insets.top);
-        setLeftInset(insets.left);
-        setBottomInset(insets.bottom);
-        setRightInset(insets.right);
-    }
-
-    @Override
-    public double getTextHeight(){
-        DrawFactory drawFact = DrawFactory.getInstance(null);
-        DrawTextShape dts = drawFact.getDrawable(this);
-        return dts.getTextHeight();
-    }
-
-    @Override
-    public TextDirection getTextDirection() {
-        // see 2.4.5 MSOTXFL
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.TEXT__TEXTFLOW);
-        int msotxfl = (prop == null) ? 0 : prop.getPropertyValue();
-        switch (msotxfl) {
-            default:
-            case 0: // msotxflHorzN
-            case 4: // msotxflHorzA
-                return TextDirection.HORIZONTAL;
-            case 1: // msotxflTtoBA
-            case 3: // msotxflTtoBN
-            case 5: // msotxflVertN
-                return TextDirection.VERTICAL;
-            case 2: // msotxflBtoT
-                return TextDirection.VERTICAL_270;
-            // TextDirection.STACKED is not supported
-        }
-    }
-
-    @Override
-    public void setTextDirection(TextDirection orientation) {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        int msotxfl;
-        if (orientation == null) {
-            msotxfl = -1;
-        } else {
-            switch (orientation) {
-                default:
-                case STACKED:
-                    // not supported -> remove
-                    msotxfl = -1;
-                    break;
-                case HORIZONTAL:
-                    msotxfl = 0;
-                    break;
-                case VERTICAL:
-                    msotxfl = 1;
-                    break;
-                case VERTICAL_270:
-                    // always interpreted as horizontal
-                    msotxfl = 2;
-                    break;
-            }
-        }
-        setEscherProperty(opt, EscherProperties.TEXT__TEXTFLOW, msotxfl);
-    }
-    
-    @Override
-    public Double getTextRotation() {
-        // see 2.4.6 MSOCDIR
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.TEXT__FONTROTATION);
-        return (prop == null) ? null : (90. * prop.getPropertyValue());
-    }
-    
-    @Override
-    public void setTextRotation(Double rotation) {
-        AbstractEscherOptRecord opt = getEscherOptRecord();
-        if (rotation == null) {
-            opt.removeEscherProperty(EscherProperties.TEXT__FONTROTATION);
-        } else {
-            int rot = (int)(Math.round(rotation / 90.) % 4L);
-            setEscherProperty(EscherProperties.TEXT__FONTROTATION, rot);
-        }
-    }
-    
-    /**
-     * Returns the raw text content of the shape. This hasn't had any
-     * changes applied to it, and so is probably unlikely to print
-     * out nicely.
-     */
-    public String getRawText() {
-        return HSLFTextParagraph.getRawText(getTextParagraphs());
-    }
-
-    @Override
-    public String getText() {
-        String rawText = getRawText();
-        return HSLFTextParagraph.toExternalString(rawText, getRunType());
-    }
-
-    @Override
-    public HSLFTextRun appendText(String text, boolean newParagraph) {
-        // init paragraphs
-        List<HSLFTextParagraph> paras = getTextParagraphs();
-        HSLFTextRun htr = HSLFTextParagraph.appendText(paras, text, newParagraph);
-        setTextId(getRawText().hashCode());
-        return htr; 
-    }
-
-    @Override
-    public HSLFTextRun setText(String text) {
-        // init paragraphs
-        List<HSLFTextParagraph> paras = getTextParagraphs();
-        HSLFTextRun htr = HSLFTextParagraph.setText(paras, text);
-        setTextId(getRawText().hashCode());
-        return htr;
-    }
-
-    /**
-     * Saves the modified paragraphs/textrun to the records.
-     * Also updates the styles to the correct text length.
-     */
-    protected void storeText() {
-        List<HSLFTextParagraph> paras = getTextParagraphs();
-        HSLFTextParagraph.storeText(paras);
-    }
-
-    /**
-     * Returns the array of all hyperlinks in this text run
-     *
-     * @return the array of all hyperlinks in this text run or <code>null</code>
-     *         if not found.
-     */
-    public List<HSLFHyperlink> getHyperlinks() {
-        return HSLFHyperlink.find(this);
-    }
-
-    @Override
-    public void setTextPlaceholder(TextPlaceholder placeholder) {
-        // TOOD: check for correct placeholder handling - see org.apache.poi.hslf.model.Placeholder
-        Placeholder ph = null;
-        int runType;
-        switch (placeholder) {
-            default:
-            case BODY:
-                runType = TextHeaderAtom.BODY_TYPE;
-                ph = Placeholder.BODY;
-                break;
-            case TITLE:
-                runType = TextHeaderAtom.TITLE_TYPE;
-                ph = Placeholder.TITLE;
-                break;
-            case CENTER_BODY:
-                runType = TextHeaderAtom.CENTRE_BODY_TYPE;
-                ph = Placeholder.BODY;
-                break;
-            case CENTER_TITLE:
-                runType = TextHeaderAtom.CENTER_TITLE_TYPE;
-                ph = Placeholder.TITLE;
-                break;
-            case HALF_BODY:
-                runType = TextHeaderAtom.HALF_BODY_TYPE;
-                ph = Placeholder.BODY;
-                break;
-            case QUARTER_BODY:
-                runType = TextHeaderAtom.QUARTER_BODY_TYPE;
-                ph = Placeholder.BODY;
-                break;
-            case NOTES:
-                runType = TextHeaderAtom.NOTES_TYPE;
-                break;
-            case OTHER:
-                runType = TextHeaderAtom.OTHER_TYPE;
-                break;
-        }
-        setRunType(runType);
-        if (ph != null) {
-            setPlaceholder(ph);
-        }
-    }
-
-    @Override
-    public TextPlaceholder getTextPlaceholder() {
-        switch (getRunType()) {
-            default:
-            case TextHeaderAtom.BODY_TYPE: return TextPlaceholder.BODY;
-            case TextHeaderAtom.TITLE_TYPE: return TextPlaceholder.TITLE;
-            case TextHeaderAtom.NOTES_TYPE: return TextPlaceholder.NOTES;
-            case TextHeaderAtom.OTHER_TYPE: return TextPlaceholder.OTHER;
-            case TextHeaderAtom.CENTRE_BODY_TYPE: return TextPlaceholder.CENTER_BODY;
-            case TextHeaderAtom.CENTER_TITLE_TYPE: return TextPlaceholder.CENTER_TITLE;
-            case TextHeaderAtom.HALF_BODY_TYPE: return TextPlaceholder.HALF_BODY;
-            case TextHeaderAtom.QUARTER_BODY_TYPE: return TextPlaceholder.QUARTER_BODY;
-        }
-    }
-
-
-    /**
-     * Get alternative representation of text shape stored as metro blob escher property.
-     * The returned shape is the first shape in stored group shape of the metro blob
-     *
-     * @return null, if there's no alternative representation, otherwise the text shape
-     */
-    public TextShape<?,?> getMetroShape() {
-        HSLFMetroShape<TextShape<?,?>> mbs = new HSLFMetroShape<TextShape<?,?>>(this);
-        return mbs.getShape();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
deleted file mode 100644
index b1e38d9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hslf.model.textproperties.TextProp;
-import org.apache.poi.hslf.record.SlideAtom;
-
-/**
- * Title masters define the design template for slides with a Title Slide layout.
- *
- * @author Yegor Kozlov
- */
-public final class HSLFTitleMaster extends HSLFMasterSheet {
-    private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>();
-
-    /**
-     * Constructs a TitleMaster
-     *
-     */
-    public HSLFTitleMaster(org.apache.poi.hslf.record.Slide record, int sheetNo) {
-        super(record, sheetNo);
-
-        for (List<HSLFTextParagraph> l : HSLFTextParagraph.findTextParagraphs(getPPDrawing(), this)) {
-            if (!_paragraphs.contains(l)) _paragraphs.add(l);
-        }
-    }
-
-    /**
-     * Returns an array of all the TextRuns found
-     */
-    public List<List<HSLFTextParagraph>> getTextParagraphs() {
-        return _paragraphs;
-    }
-
-    /**
-     * Delegate the call to the underlying slide master.
-     */
-    public TextProp getStyleAttribute(int txtype, int level, String name, boolean isCharacter) {
-        HSLFMasterSheet master = getMasterSheet();
-        return master == null ? null : master.getStyleAttribute(txtype, level, name, isCharacter);
-    }
-
-    /**
-     * Returns the slide master for this title master.
-     */
-    public HSLFMasterSheet getMasterSheet(){
-        List<HSLFSlideMaster> master = getSlideShow().getSlideMasters();
-        SlideAtom sa = ((org.apache.poi.hslf.record.Slide)getSheetContainer()).getSlideAtom();
-        int masterId = sa.getMasterID();
-        for (HSLFSlideMaster sm : master) {
-            if (masterId == sm._getSheetNumber()) return sm;
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/util/MutableByteArrayOutputStream.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/util/MutableByteArrayOutputStream.java
deleted file mode 100644
index be7c046..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/util/MutableByteArrayOutputStream.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.util;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * This class doesn't work yet, but is here to show the idea of a
- *  ByteArrayOutputStream where you can track how many bytes you've
- *  already written, and go back and write over a previous part of the stream
- *
- * @author Nick Burch
- */
-
-public final class MutableByteArrayOutputStream extends ByteArrayOutputStream
-{
-	/** Return how many bytes we've stuffed in so far */
-	public int getBytesWritten() { return -1; }
-
-	/** Write some bytes to the array */
-	public void write(byte[] b) {}
-	public void write(int b) {}
-
-	/** Write some bytes to an earlier bit of the array */
-	public void overwrite(byte[] b, int startPos) {}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java
deleted file mode 100644
index 10b566a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * A helper class for dealing with SystemTime Structs, as defined at
- * http://msdn.microsoft.com/library/en-us/sysinfo/base/systemtime_str.asp .
- *
- * Discrepancies between Calendar and SYSTEMTIME:
- *  - that January = 1 in SYSTEMTIME, 0 in Calendar.
- *  - that the day of the week (0) starts on Sunday in SYSTEMTIME, and Monday in Calendar
- * It is also the case that this does not store the timezone, and no... it is not
- * stored as UTC either, but rather the local system time (yuck.)
- */
-public final class SystemTimeUtils {
-	/**
-	 * Get the date found in the byte array, as a java Data object
-	 */
-	public static Date getDate(byte[] data) {
-		return getDate(data,0);
-	}
-	/**
-	 * Get the date found in the byte array, as a java Data object
-	 */
-	public static Date getDate(byte[] data, int offset) {
-        Calendar cal = LocaleUtil.getLocaleCalendar();
-
-        cal.set(Calendar.YEAR,         LittleEndian.getShort(data,offset));
-        cal.set(Calendar.MONTH,        LittleEndian.getShort(data,offset+2)-1);
-        // Not actually needed - can be found from day of month
-        //cal.set(Calendar.DAY_OF_WEEK,  LittleEndian.getShort(data,offset+4)+1);
-        cal.set(Calendar.DAY_OF_MONTH, LittleEndian.getShort(data,offset+6));
-        cal.set(Calendar.HOUR_OF_DAY,  LittleEndian.getShort(data,offset+8));
-        cal.set(Calendar.MINUTE,       LittleEndian.getShort(data,offset+10));
-        cal.set(Calendar.SECOND,       LittleEndian.getShort(data,offset+12));
-        cal.set(Calendar.MILLISECOND,  LittleEndian.getShort(data,offset+14));
-
-        return cal.getTime();
-	}
-
-	/**
-	 * Convert the supplied java Date into a SystemTime struct, and write it
-	 *  into the supplied byte array.
-	 */
-	public static void storeDate(Date date, byte[] dest) {
-		storeDate(date, dest, 0);
-	}
-	/**
-	 * Convert the supplied java Date into a SystemTime struct, and write it
-	 *  into the supplied byte array.
-	 */
-	public static void storeDate(Date date, byte[] dest, int offset) {
-        Calendar cal = LocaleUtil.getLocaleCalendar();
-        cal.setTime(date);
-
-        LittleEndian.putShort(dest, offset + 0, (short) cal.get(Calendar.YEAR));
-        LittleEndian.putShort(dest, offset + 2, (short)(cal.get(Calendar.MONTH) + 1));
-        LittleEndian.putShort(dest, offset + 4, (short)(cal.get(Calendar.DAY_OF_WEEK)-1));
-        LittleEndian.putShort(dest, offset + 6, (short) cal.get(Calendar.DAY_OF_MONTH));
-        LittleEndian.putShort(dest, offset + 8, (short) cal.get(Calendar.HOUR_OF_DAY));
-        LittleEndian.putShort(dest, offset + 10,(short) cal.get(Calendar.MINUTE));
-        LittleEndian.putShort(dest, offset + 12,(short) cal.get(Calendar.SECOND));
-        LittleEndian.putShort(dest, offset + 14,(short) cal.get(Calendar.MILLISECOND));
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
deleted file mode 100644
index a1bf162..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.POIReadOnlyDocument;
-import org.apache.poi.hmef.attribute.MAPIRtfAttribute;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks.AttachmentChunksSorter;
-import org.apache.poi.hsmf.datatypes.ByteChunk;
-import org.apache.poi.hsmf.datatypes.Chunk;
-import org.apache.poi.hsmf.datatypes.ChunkGroup;
-import org.apache.poi.hsmf.datatypes.Chunks;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.NameIdChunks;
-import org.apache.poi.hsmf.datatypes.PropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.LongPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.TimePropertyValue;
-import org.apache.poi.hsmf.datatypes.RecipientChunks;
-import org.apache.poi.hsmf.datatypes.RecipientChunks.RecipientChunksSorter;
-import org.apache.poi.hsmf.datatypes.StringChunk;
-import org.apache.poi.hsmf.datatypes.Types;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.hsmf.parsers.POIFSChunkParser;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Reads an Outlook MSG File in and provides hooks into its data structure.
- * 
- * If you want to develop with HSMF, you might find it worth getting
- *  some of the Microsoft public documentation, such as:
- *  
- * [MS-OXCMSG]: Message and Attachment Object Protocol Specification
- */
-public class MAPIMessage extends POIReadOnlyDocument {
-   /** For logging problems we spot with the file */
-   private POILogger logger = POILogFactory.getLogger(MAPIMessage.class);
-   
-   private Chunks mainChunks;
-   private NameIdChunks nameIdChunks;
-   private RecipientChunks[] recipientChunks;
-   private AttachmentChunks[] attachmentChunks;
-
-   private boolean returnNullOnMissingChunk = false;
-
-   /**
-    * Constructor for creating new files.
-    */
-   public MAPIMessage() {
-      // TODO - make writing possible
-      super(new NPOIFSFileSystem());
-   }
-
-
-   /**
-    * Constructor for reading MSG Files from the file system.
-    * 
-    * @param filename Name of the file to read
-    * @throws IOException
-    */
-   public MAPIMessage(String filename) throws IOException {
-      this(new File(filename));
-   }
-   /**
-    * Constructor for reading MSG Files from the file system.
-    * 
-    * @param file The file to read from
-    * @throws IOException
-    */
-   public MAPIMessage(File file) throws IOException {
-      this(new NPOIFSFileSystem(file));
-   }
-
-   /**
-    * Constructor for reading MSG Files from an input stream.
-    * 
-    * <p>Note - this will buffer the whole message into memory
-    *  in order to process. For lower memory use, use {@link #MAPIMessage(File)}
-    *  
-    * @param in The InputStream to buffer then read from
-    * @throws IOException
-    */
-   public MAPIMessage(InputStream in) throws IOException {
-      this(new NPOIFSFileSystem(in));
-   }
-   /**
-    * Constructor for reading MSG Files from a POIFS filesystem
-    * 
-    * @param fs Open POIFS FileSystem containing the message
-    * @throws IOException
-    */
-   public MAPIMessage(NPOIFSFileSystem fs) throws IOException {
-      this(fs.getRoot());
-   }
-   /**
-    * @deprecated Use {@link #MAPIMessage(DirectoryNode)} instead
-    */
-   @Deprecated
-   public MAPIMessage(DirectoryNode poifsDir, POIFSFileSystem fs) throws IOException {
-      this(poifsDir);
-   }
-   /**
-    * Constructor for reading MSG Files from a certain
-    *  point within a POIFS filesystem
-    * @param poifsDir Directory containing the message
-    * @throws IOException
-    */
-   public MAPIMessage(DirectoryNode poifsDir) throws IOException {
-      super(poifsDir);
-
-      // Grab all the chunks
-      ChunkGroup[] chunkGroups = POIFSChunkParser.parse(poifsDir);
-
-      // Grab interesting bits
-      ArrayList<AttachmentChunks> attachments = new ArrayList<AttachmentChunks>();
-      ArrayList<RecipientChunks>  recipients  = new ArrayList<RecipientChunks>();
-      for(ChunkGroup group : chunkGroups) {
-         // Should only ever be one of each of these
-         if(group instanceof Chunks) {
-            mainChunks = (Chunks)group;
-         } else if(group instanceof NameIdChunks) {
-            nameIdChunks = (NameIdChunks)group;
-         } else if(group instanceof RecipientChunks) {
-            recipients.add( (RecipientChunks)group );
-         }
-
-         // Can be multiple of these - add to list(s)
-         if(group instanceof AttachmentChunks) {
-            attachments.add( (AttachmentChunks)group );
-         }
-      }
-      attachmentChunks = attachments.toArray(new AttachmentChunks[attachments.size()]);
-      recipientChunks  = recipients.toArray(new RecipientChunks[recipients.size()]);
-
-      // Now sort these chunks lists so they're in ascending order,
-      //  rather than in random filesystem order
-      Arrays.sort(attachmentChunks, new AttachmentChunksSorter());
-      Arrays.sort(recipientChunks, new RecipientChunksSorter());
-   }
-
-
-   /**
-    * Gets a string value based on the passed chunk.
-    * @throws ChunkNotFoundException if the chunk isn't there
-    */
-   public String getStringFromChunk(StringChunk chunk) throws ChunkNotFoundException {
-      if(chunk == null) {
-         if(returnNullOnMissingChunk) {
-            return null;
-         } else {
-            throw new ChunkNotFoundException();
-         }
-      }
-      return chunk.getValue();
-   }
-
-
-   /**
-    * Gets the plain text body of this Outlook Message
-    * @return The string representation of the 'text' version of the body, if available.
-    * @throws ChunkNotFoundException
-    */
-   public String getTextBody() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.textBodyChunk);
-   }
-
-   /**
-    * Gets the html body of this Outlook Message, if this email
-    *  contains a html version.
-    * @return The string representation of the 'html' version of the body, if available.
-    * @throws ChunkNotFoundException
-    */
-   public String getHtmlBody() throws ChunkNotFoundException {
-      if(mainChunks.htmlBodyChunkBinary != null) {
-         return mainChunks.htmlBodyChunkBinary.getAs7bitString();
-      }
-      return getStringFromChunk(mainChunks.htmlBodyChunkString);
-   }
-   @Deprecated
-   public String getHmtlBody() throws ChunkNotFoundException {
-      return getHtmlBody();
-   }
-
-   /**
-    * Gets the RTF Rich Message body of this Outlook Message, if this email
-    *  contains a RTF (rich) version.
-    * @return The string representation of the 'RTF' version of the body, if available.
-    * @throws ChunkNotFoundException
-    */
-   public String getRtfBody() throws ChunkNotFoundException {
-      ByteChunk chunk = mainChunks.rtfBodyChunk;
-      if(chunk == null) {
-         if(returnNullOnMissingChunk) {
-            return null;
-         } else {
-            throw new ChunkNotFoundException();
-         }
-      }
-      
-      try {
-         MAPIRtfAttribute rtf = new MAPIRtfAttribute(
-               MAPIProperty.RTF_COMPRESSED, Types.BINARY.getId(), chunk.getValue()
-         );
-         return rtf.getDataString();
-      } catch(IOException e) {
-         throw new RuntimeException("Shouldn't happen", e);
-      }
-   }
-
-   /**
-    * Gets the subject line of the Outlook Message
-    * @throws ChunkNotFoundException
-    */
-   public String getSubject() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.subjectChunk);
-   }
-
-   /**
-    * Gets the display value of the "FROM" line of the outlook message
-    * This is not the actual address that was sent from but the formated display of the user name.
-    * @throws ChunkNotFoundException
-    */
-   public String getDisplayFrom() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.displayFromChunk);
-   }
-
-   /**
-    * Gets the display value of the "TO" line of the outlook message.
-    * If there are multiple recipients, they will be separated
-    *  by semicolons. 
-    * This is not the actual list of addresses/values that will be 
-    *  sent to if you click Reply in the email - those are stored
-    *  in {@link RecipientChunks}.
-    * @throws ChunkNotFoundException
-    */
-   public String getDisplayTo() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.displayToChunk);
-   }
-
-   /**
-    * Gets the display value of the "CC" line of the outlook message.
-    * If there are multiple recipients, they will be separated
-    *  by semicolons. 
-    * This is not the actual list of addresses/values that will be 
-    *  sent to if you click Reply in the email - those are stored
-    *  in {@link RecipientChunks}.
-    * @throws ChunkNotFoundException
-    */
-   public String getDisplayCC() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.displayCCChunk);
-   }
-
-   /**
-    * Gets the display value of the "BCC" line of the outlook message.
-    * If there are multiple recipients, they will be separated
-    *  by semicolons. 
-    * This is not the actual list of addresses/values that will be 
-    *  sent to if you click Reply in the email - those are stored
-    *  in {@link RecipientChunks}.
-    * This will only be present in sent emails, not received ones!
-    * @throws ChunkNotFoundException
-    */
-   public String getDisplayBCC() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.displayBCCChunk);
-   }
-
-   /**
-    * Returns all the recipients' email address, separated by
-    *  semicolons. Checks all the likely chunks in search of 
-    *  the addresses.
-    */
-   public String getRecipientEmailAddress() throws ChunkNotFoundException {
-      return toSemicolonList(getRecipientEmailAddressList());
-   }
-   /**
-    * Returns an array of all the recipient's email address, normally
-    *  in TO then CC then BCC order.
-    * Checks all the likely chunks in search of the addresses. 
-    */
-   public String[] getRecipientEmailAddressList() throws ChunkNotFoundException {
-      if(recipientChunks == null || recipientChunks.length == 0) {
-         throw new ChunkNotFoundException("No recipients section present");
-      }
-
-      String[] emails = new String[recipientChunks.length];
-      for(int i=0; i<emails.length; i++) {
-         RecipientChunks rc = recipientChunks[i];
-         String email = rc.getRecipientEmailAddress();
-         if(email != null) {
-            emails[i] = email;
-         } else {
-            if(returnNullOnMissingChunk) {
-               emails[i] = null;
-            } else {
-               throw new ChunkNotFoundException("No email address holding chunks found for the " + (i+1) + "th recipient");
-            }
-         }
-      }
-
-      return emails;
-   }
-
-
-   /**
-    * Returns all the recipients' names, separated by
-    *  semicolons. Checks all the likely chunks in search of 
-    *  the names.
-    * See also {@link #getDisplayTo()}, {@link #getDisplayCC()}
-    *  and {@link #getDisplayBCC()}.
-    */
-   public String getRecipientNames() throws ChunkNotFoundException {
-      return toSemicolonList(getRecipientNamesList());
-   }
-   /**
-    * Returns an array of all the recipient's names, normally
-    *  in TO then CC then BCC order.
-    * Checks all the likely chunks in search of the names. 
-    * See also {@link #getDisplayTo()}, {@link #getDisplayCC()}
-    *  and {@link #getDisplayBCC()}.
-    */
-   public String[] getRecipientNamesList() throws ChunkNotFoundException {
-      if(recipientChunks == null || recipientChunks.length == 0) {
-         throw new ChunkNotFoundException("No recipients section present");
-      }
-
-      String[] names = new String[recipientChunks.length];
-      for(int i=0; i<names.length; i++) {
-         RecipientChunks rc = recipientChunks[i];
-         String name = rc.getRecipientName();
-         if(name != null) {
-            names[i] = name;
-         } else {
-            throw new ChunkNotFoundException("No display name holding chunks found for the " + (i+1) + "th recipient");
-         }
-      }
-
-      return names;
-   }
-   
-   /**
-    * Tries to identify the correct encoding for 7-bit (non-unicode)
-    *  strings in the file.
-    * <p>Many messages store their strings as unicode, which is
-    *  nice and easy. Some use one-byte encodings for their
-    *  strings, but don't always store the encoding anywhere
-    *  helpful in the file.</p>
-    * <p>This method checks for codepage properties, and failing that
-    *  looks at the headers for the message, and uses these to 
-    *  guess the correct encoding for your file.</p>
-    * <p>Bug #49441 has more on why this is needed</p>
-    */
-   public void guess7BitEncoding() {
-      // First choice is a codepage property
-      for (MAPIProperty prop : new MAPIProperty[] {
-               MAPIProperty.MESSAGE_CODEPAGE,
-               MAPIProperty.INTERNET_CPID
-      }) {
-        List<PropertyValue> val = mainChunks.getProperties().get(prop);
-        if (val != null && val.size() > 0) {
-           int codepage = ((LongPropertyValue)val.get(0)).getValue();
-           try {
-               String encoding = CodePageUtil.codepageToEncoding(codepage, true);
-               set7BitEncoding(encoding);
-               return;
-            } catch(UnsupportedEncodingException e) {
-               logger.log(POILogger.WARN, "Invalid codepage ID ", codepage, 
-                          " set for the message via ", prop, ", ignoring");
-            }
-         }
-      }
-     
-       
-      // Second choice is a charset on a content type header
-      try {
-         String[] headers = getHeaders();
-         if(headers != null && headers.length > 0) {
-            // Look for a content type with a charset
-            Pattern p = Pattern.compile("Content-Type:.*?charset=[\"']?([^;'\"]+)[\"']?", Pattern.CASE_INSENSITIVE);
-
-            for(String header : headers) {
-               if(header.startsWith("Content-Type")) {
-                  Matcher m = p.matcher(header);
-                  if(m.matches()) {
-                     // Found it! Tell all the string chunks
-                     String charset = m.group(1);
-
-                     if (!charset.equalsIgnoreCase("utf-8")) { 
-                        set7BitEncoding(charset);
-                     }
-                     return;
-                  }
-               }
-            }
-         }
-      } catch(ChunkNotFoundException e) {}
-      
-      // Nothing suitable in the headers, try HTML
-      try {
-         String html = getHmtlBody();
-         if(html != null && html.length() > 0) {
-            // Look for a content type in the meta headers
-            Pattern p = Pattern.compile(
-                  "<META\\s+HTTP-EQUIV=\"Content-Type\"\\s+CONTENT=\"text/html;\\s+charset=(.*?)\""
-            );
-            Matcher m = p.matcher(html);
-            if(m.find()) {
-               // Found it! Tell all the string chunks
-               String charset = m.group(1);
-               set7BitEncoding(charset);
-               return;
-            }
-         }
-      } catch(ChunkNotFoundException e) {}
-   }
-
-   /**
-    * Many messages store their strings as unicode, which is
-    *  nice and easy. Some use one-byte encodings for their
-    *  strings, but don't easily store the encoding anywhere
-    *  in the file!
-    * If you know what the encoding is of your file, you can
-    *  use this method to set the 7 bit encoding for all
-    *  the non unicode strings in the file.
-    * @see #guess7BitEncoding()
-    */
-   public void set7BitEncoding(String charset) {
-      for(Chunk c : mainChunks.getChunks()) {
-         if(c instanceof StringChunk) {
-            ((StringChunk)c).set7BitEncoding(charset);
-         }
-      }
-
-      if (nameIdChunks!=null) {
-         for(Chunk c : nameIdChunks.getChunks()) {
-            if(c instanceof StringChunk) {
-                ((StringChunk)c).set7BitEncoding(charset);
-            }
-         }
-      }
-
-      for(RecipientChunks rc : recipientChunks) {
-         for(Chunk c : rc.getAll()) {
-            if(c instanceof StringChunk) {
-               ((StringChunk)c).set7BitEncoding(charset);
-            }
-         }
-      }
-   }
-   
-   /**
-    * Does this file contain any strings that
-    *  are stored as 7 bit rather than unicode?
-    */
-   public boolean has7BitEncodingStrings() {
-      for(Chunk c : mainChunks.getChunks()) {
-         if(c instanceof StringChunk) {
-            if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
-               return true;
-            }
-         }
-      }
-      
-      if (nameIdChunks!=null) {
-         for(Chunk c : nameIdChunks.getChunks()) {
-            if(c instanceof StringChunk) {
-               if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
-                  return true;
-               }
-            }
-         }
-      }
-      
-      for(RecipientChunks rc : recipientChunks) {
-         for(Chunk c : rc.getAll()) {
-            if(c instanceof StringChunk) {
-               if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
-                  return true;
-               }
-            }
-         }
-      }
-      return false;
-   }
-   
-   /**
-    * Returns all the headers, one entry per line
-    */
-   public String[] getHeaders() throws ChunkNotFoundException {
-      String headers = getStringFromChunk(mainChunks.messageHeaders);
-      if(headers == null) {
-         return null;
-      }
-      return headers.split("\\r?\\n");
-   }
-
-   /**
-    * Gets the conversation topic of the parsed Outlook Message.
-    * This is the part of the subject line that is after the RE: and FWD:
-    * @throws ChunkNotFoundException
-    */
-   public String getConversationTopic() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.conversationTopic);
-   }
-
-   /**
-    * Gets the message class of the parsed Outlook Message.
-    * (Yes, you can use this to determine if a message is a calendar 
-    *  item, note, or actual outlook Message)
-    * For emails the class will be IPM.Note
-    *
-    * @throws ChunkNotFoundException
-    */
-   public String getMessageClass() throws ChunkNotFoundException {
-      return getStringFromChunk(mainChunks.messageClass);
-   }
-
-   /**
-    * Gets the date that the message was accepted by the
-    *  server on.
-    */
-   public Calendar getMessageDate() throws ChunkNotFoundException {
-      if (mainChunks.submissionChunk != null) {
-         return mainChunks.submissionChunk.getAcceptedAtTime();
-      }
-      else {
-         // Try a few likely suspects...
-         for (MAPIProperty prop : new MAPIProperty[] {
-               MAPIProperty.CLIENT_SUBMIT_TIME, MAPIProperty.LAST_MODIFICATION_TIME,
-               MAPIProperty.CREATION_TIME
-         }) {
-            List<PropertyValue> val = mainChunks.getProperties().get(prop);
-            if (val != null && val.size() > 0) {
-               return ((TimePropertyValue)val.get(0)).getValue();
-            }
-         }
-      }
-      
-      if(returnNullOnMissingChunk)
-         return null;
-      throw new ChunkNotFoundException();
-   }
-
-
-   /**
-    * Gets the main, core details chunks
-    */
-   public Chunks getMainChunks() {
-      return mainChunks;
-   }
-   /**
-    * Gets all the recipient details chunks.
-    * These will normally be in the order of:
-    *  * TO recipients, in the order returned by {@link #getDisplayTo()}
-    *  * CC recipients, in the order returned by {@link #getDisplayCC()}
-    *  * BCC recipients, in the order returned by {@link #getDisplayBCC()}
-    */
-   public RecipientChunks[] getRecipientDetailsChunks() {
-      return recipientChunks;
-   }
-   /**
-    * Gets the Name ID chunks, or
-    *  null if there aren't any
-    */
-   public NameIdChunks getNameIdChunks() {
-      return nameIdChunks;
-   }
-   /**
-    * Gets the message attachments.
-    */
-   public AttachmentChunks[] getAttachmentFiles() {
-      return attachmentChunks;
-   }
-
-
-   /**
-    * Will you get a null on a missing chunk, or a 
-    *  {@link ChunkNotFoundException} (default is the
-    *  exception).
-    */
-   public boolean isReturnNullOnMissingChunk() {
-      return returnNullOnMissingChunk;
-   }
-
-   /**
-    * Sets whether on asking for a missing chunk,
-    *  you get back null or a {@link ChunkNotFoundException}
-    *  (default is the exception). 
-    */
-   public void setReturnNullOnMissingChunk(boolean returnNullOnMissingChunk) {
-      this.returnNullOnMissingChunk = returnNullOnMissingChunk;
-   }
-
-
-   private String toSemicolonList(String[] l) {
-      StringBuffer list = new StringBuffer();
-      boolean first = true;
-
-      for(String s : l) {
-         if(s == null) continue;
-         if(first) {
-            first = false;
-         } else {
-            list.append("; ");
-         }
-         list.append(s);
-      }
-
-      return list.toString();
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
deleted file mode 100644
index 51adf8f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hsmf.datatypes;
-
-import static org.apache.poi.hsmf.datatypes.MAPIProperty.ATTACH_DATA;
-import static org.apache.poi.hsmf.datatypes.MAPIProperty.ATTACH_EXTENSION;
-import static org.apache.poi.hsmf.datatypes.MAPIProperty.ATTACH_FILENAME;
-import static org.apache.poi.hsmf.datatypes.MAPIProperty.ATTACH_LONG_FILENAME;
-import static org.apache.poi.hsmf.datatypes.MAPIProperty.ATTACH_MIME_TAG;
-import static org.apache.poi.hsmf.datatypes.MAPIProperty.ATTACH_RENDERING;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Collection of convenience chunks for standard parts of the MSG file attachment.
- */
-public class AttachmentChunks implements ChunkGroup {
-   private static POILogger logger = POILogFactory.getLogger(AttachmentChunks.class);
-   public static final String PREFIX = "__attach_version1.0_#";
-   
-   public ByteChunk attachData;
-   public StringChunk attachExtension;
-   public StringChunk attachFileName;
-   public StringChunk attachLongFileName;
-   public StringChunk attachMimeTag;
-   public DirectoryChunk attachmentDirectory;
-   
-   /** 
-    * This is in WMF Format. You'll probably want to pass it
-    *  to Apache Batik to turn it into a SVG that you can
-    *  then display. 
-    */
-   public ByteChunk attachRenderingWMF;
-   
-   /**
-    * What the POIFS name of this attachment is.
-    */
-   private String poifsName;
-
-   /** Holds all the chunks that were found. */
-   private List<Chunk> allChunks = new ArrayList<Chunk>();
-
-   
-   public AttachmentChunks(String poifsName) {
-      this.poifsName = poifsName;
-   }
-   
-   
-   /**
-    * Is this Attachment an embedded MAPI message?
-    */
-   public boolean isEmbeddedMessage() {
-      return (attachmentDirectory != null);
-   }
-   /**
-    * Returns the embedded MAPI message, if the attachment
-    *  is an embedded message, or null otherwise
-    */
-   public MAPIMessage getEmbeddedMessage() throws IOException {
-      if (attachmentDirectory != null) {
-         return attachmentDirectory.getAsEmbededMessage();
-      }
-      return null;
-   }
-   
-   /**
-    * Returns the embedded object, if the attachment is an
-    *  object based embedding (image, document etc), or null
-    *  if it's an embedded message
-    */
-   public byte[] getEmbeddedAttachmentObject() {
-      if (attachData != null) {
-         return attachData.getValue();
-      }
-      return null;
-   }
-   
-   public Chunk[] getAll() {
-      return allChunks.toArray(new Chunk[allChunks.size()]);
-   }
-   public Chunk[] getChunks() {
-      return getAll();
-   }
-   
-   public String getPOIFSName() {
-      return poifsName;
-   }
-   
-   /**
-    * Called by the parser whenever a chunk is found.
-    */
-   public void record(Chunk chunk) {
-      // TODO: add further members for other properties like:
-      // - ATTACH_ADDITIONAL_INFO
-      // - ATTACH_CONTENT_BASE
-      // - ATTACH_CONTENT_LOCATION
-      // - ATTACH_DISPOSITION
-      // - ATTACH_ENCODING
-      // - ATTACH_FLAGS
-      // - ATTACH_LONG_PATHNAME
-      // - ATTACH_SIZE
-      final int chunkId = chunk.getChunkId();
-      if (chunkId == ATTACH_DATA.id) {
-         if(chunk instanceof ByteChunk) {
-             attachData = (ByteChunk)chunk;
-         } else if(chunk instanceof DirectoryChunk) {
-             attachmentDirectory = (DirectoryChunk)chunk;
-         } else {
-        	 logger.log(POILogger.ERROR, "Unexpected data chunk of type " + chunk);
-         }
-      } else if(chunkId == ATTACH_EXTENSION.id) {
-         attachExtension = (StringChunk)chunk;
-      } else if(chunkId == ATTACH_FILENAME.id) {
-         attachFileName = (StringChunk)chunk;
-      } else if(chunkId == ATTACH_LONG_FILENAME.id) {
-         attachLongFileName = (StringChunk)chunk;
-      } else if(chunkId == ATTACH_MIME_TAG.id) {
-         attachMimeTag = (StringChunk)chunk;
-      } else if(chunkId == ATTACH_RENDERING.id) {
-         attachRenderingWMF = (ByteChunk)chunk;
-      }
-
-      // And add to the main list
-      allChunks.add(chunk);
-   }
-
-   /**
-    * Used to flag that all the chunks of the attachment
-    *  have now been located.
-    */
-   public void chunksComplete() {
-      // Currently, we don't need to do anything special once
-      //  all the chunks have been located
-   }
-
-
-   /**
-    * Orders by the attachment number.
-    */
-   public static class AttachmentChunksSorter implements Comparator<AttachmentChunks>, Serializable {
-      public int compare(AttachmentChunks a, AttachmentChunks b) {
-         return a.poifsName.compareTo(b.poifsName);
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java
deleted file mode 100644
index 25a525a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-import org.apache.poi.util.IOUtils;
-
-/**
- * A Chunk that holds binary data, normally unparsed.
- * Generally as we know how to make sense of the
- *  contents, we create a new Chunk class and add
- *  a special case in the parser for them.
- */
-
-public class ByteChunk extends Chunk {
-   private byte[] value;
-
-   /**
-    * Creates a Byte Chunk.
-    */
-   public ByteChunk(String namePrefix, int chunkId, MAPIType type) {
-      super(namePrefix, chunkId, type);
-   }
-   /**
-    * Create a Byte Chunk, with the specified
-    *  type.
-    */
-   public ByteChunk(int chunkId, MAPIType type) {
-      super(chunkId, type);
-   }
-
-   public void readValue(InputStream value) throws IOException {
-      this.value = IOUtils.toByteArray(value);
-   }
-
-   public void writeValue(OutputStream out) throws IOException {
-      out.write(value);
-   }
-
-   public byte[] getValue() {
-      return value;
-   }
-   public void setValue(byte[] value) {
-      this.value = value;
-   }
-   
-   /**
-    * Returns the data in a debug-friendly string format
-    */
-   public String toString() {
-       return toDebugFriendlyString(value);
-   }
-   
-   /**
-    * Formats the byte array in a debug-friendly way,
-    *  showing all of a short array, and the start of a 
-    *  longer one.
-    */
-   protected static String toDebugFriendlyString(byte[] value) {
-      if (value == null)
-         return "(Null Byte Array)";
-          
-      StringBuffer text = new StringBuffer();
-      text.append("Bytes len=").append(value.length);
-      text.append(" [");
-      
-      int limit = Math.min(value.length, 16);
-      if (value.length > 16) {
-          limit = 12;
-      }
-      for (int i=0; i<limit; i++) {
-          if (i > 0)
-              text.append(',');
-          text.append(value[i]);
-      }
-      if (value.length > 16) {
-          text.append(",....");
-      }
-      text.append("]");
-      return text.toString();
-   }
-   
-   /**
-    * Returns the data, formatted as a string assuming it
-    *  was a non-unicode string.
-    * If your data isn't in fact stored as basically
-    *  ASCII, don't expect this to return much of any
-    *  sense.... 
-    * @return  the data formatted as a string
-    */
-   public String getAs7bitString() {
-      return StringChunk.parseAs7BitData(value);
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java
deleted file mode 100644
index b6ef90d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Locale;
-
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-
-public abstract class Chunk {
-   public static final String DEFAULT_NAME_PREFIX = "__substg1.0_";
-   
-   protected int chunkId;
-   protected MAPIType type;
-   protected String namePrefix;
-	
-   protected Chunk(String namePrefix, int chunkId, MAPIType type) {
-      this.namePrefix = namePrefix;
-      this.chunkId = chunkId;
-      this.type = type;
-   }
-   protected Chunk(int chunkId, MAPIType type) {
-       this(DEFAULT_NAME_PREFIX, chunkId, type);
-   }
-
-   /**
-    * Gets the id of this chunk
-    */
-   public int getChunkId() {
-       return this.chunkId;
-   }
-
-   /**
-    * Gets the numeric type of this chunk.
-    */
-   public MAPIType getType() {
-       return this.type;
-   }
-
-   /**
-    * Creates a string to use to identify this chunk in the POI file system object.
-    */
-   public String getEntryName() {
-       String type = this.type.asFileEnding();
-
-       String chunkId = Integer.toHexString(this.chunkId);
-       while(chunkId.length() < 4) chunkId = "0" + chunkId;
-
-       return this.namePrefix + chunkId.toUpperCase(Locale.ROOT)
-              + type.toUpperCase(Locale.ROOT);
-   }
-
-   /**
-    * Writes the value of this chunk back out again.
-    */
-   public abstract void writeValue(OutputStream out) throws IOException;
-
-   /**
-    * Reads the value of this chunk using an InputStream
-    */
-   public abstract void readValue(InputStream value) throws IOException;
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
deleted file mode 100644
index 36c723b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-
-/**
- * A variable length {@link PropertyValue} that is
- *  backed by a {@link Chunk}
- * TODO Provide a way to link these up with the chunks
- */
-public class ChunkBasedPropertyValue extends PropertyValue {
-   public ChunkBasedPropertyValue(MAPIProperty property, long flags, byte[] offsetData) {
-      super(property, flags, offsetData);
-   }
-
-   @Override
-   public Chunk getValue() {
-      // TODO Decode the value into an offset
-      // TODO Look up the chunk based on that
-      return null;
-   }
-   
-   /**
-    * Stores the offset of the chunk as the property value
-    */
-   public void setValue(Chunk chunk) {
-      // TODO
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java
deleted file mode 100644
index 0bd7dc0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-/**
- * A group of chunks, that are at the same point in the
- *  file structure.
- */
-public interface ChunkGroup {
-   /**
-    * Returns the chunks that make up the group.
-    * Should certainly contain all the interesting Chunks,
-    *  but needn't always contain all of the Chunks.
-    */
-    public Chunk[] getChunks();
-
-    /**
-     * Called by the parser whenever a chunk is found.
-     */
-    public void record(Chunk chunk);
-
-    /**
-     * Called by the parser when all chunks have been found.
-     */
-    public void chunksComplete();
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
deleted file mode 100644
index 3d99ea3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * A group of chunks which is indexable by {@link MAPIProperty}
- *  entries.
- */
-public interface ChunkGroupWithProperties extends ChunkGroup {
-   /**
-    * Returns all the Properties contained in the Chunk, along
-    *  with their Values.
-    * Normally, each property will have one value, sometimes
-    *  none, and rarely multiple (normally for Unknown etc).
-    * For fixed sized properties, the value can be fetched 
-    *  straight from the {@link PropertyValue}. For variable
-    *  sized properties, you'll need to go via the chunk.
-    */
-   public Map<MAPIProperty,List<PropertyValue>> getProperties();
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java
deleted file mode 100644
index 19165a0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-
-/**
- * Collection of convenience chunks for standard parts of the MSG file.
- * 
- * Not all of these will be present in any given file.
- * 
- * A partial list is available at:
- *  http://msdn.microsoft.com/en-us/library/ms526356%28v=exchg.10%29.aspx
- *  
- * TODO Deprecate the public Chunks in favour of Property Lookups
- */
-public final class Chunks implements ChunkGroupWithProperties {
-   private static POILogger logger = POILogFactory.getLogger(Chunks.class);
-
-   /** 
-    * Holds all the chunks that were found, indexed by their MAPIProperty.
-    * Normally a property will have zero chunks (fixed sized) or one chunk 
-    *  (variable size), but in some cases (eg Unknown) you may get more.
-    */
-   private Map<MAPIProperty,List<Chunk>> allChunks = new HashMap<MAPIProperty,List<Chunk>>();
-   
-   /** Type of message that the MSG represents (ie. IPM.Note) */
-   public StringChunk messageClass;
-   /** BODY Chunk, for plain/text messages */
-   public StringChunk textBodyChunk;
-   /** BODY Html Chunk, for html messages */
-   public StringChunk htmlBodyChunkString;
-   public ByteChunk htmlBodyChunkBinary;
-   /** BODY Rtf Chunk, for Rtf (Rich) messages */
-   public ByteChunk rtfBodyChunk;
-   /** Subject link chunk, in plain/text */
-   public StringChunk subjectChunk;
-   /** 
-    * Value that is in the TO field (not actually the addresses as they are 
-    * stored in recip directory nodes 
-    */
-   public StringChunk displayToChunk;
-   /** Value that is in the FROM field */
-   public StringChunk displayFromChunk;
-   /** value that shows in the CC field */
-   public StringChunk displayCCChunk;
-   /** Value that shows in the BCC field */
-   public StringChunk displayBCCChunk;
-   /** Sort of like the subject line, but without the RE: and FWD: parts. */
-   public StringChunk conversationTopic;
-   /** Type of server that the message originated from (SMTP, etc). */
-   public StringChunk sentByServerType;
-   /** The email headers */
-   public StringChunk messageHeaders;
-   /** TODO */
-   public MessageSubmissionChunk submissionChunk; 
-   /** TODO */
-   public StringChunk emailFromChunk; 
-   /** The message ID */
-   public StringChunk messageId;
-   /** The message properties */
-   private MessagePropertiesChunk messageProperties;
-
-   public Map<MAPIProperty,List<PropertyValue>> getProperties() {
-      if (messageProperties != null) {
-         return messageProperties.getProperties();
-      }
-      else return Collections.emptyMap();
-   }
-   public Map<MAPIProperty, PropertyValue> getRawProperties() {
-      if (messageProperties != null) {
-         return messageProperties.getRawProperties();
-      }
-      else return Collections.emptyMap();
-   }
-   
-   public Map<MAPIProperty,List<Chunk>> getAll() {
-      return allChunks;
-   }
-   public Chunk[] getChunks() {
-      ArrayList<Chunk> chunks = new ArrayList<Chunk>(allChunks.size());
-      for (List<Chunk> c : allChunks.values()) {
-         chunks.addAll(c);
-      }
-      return chunks.toArray(new Chunk[chunks.size()]);
-   }
-	
-   /**
-    * Called by the parser whenever a chunk is found.
-    */
-   public void record(Chunk chunk) {
-      // Work out what MAPIProperty this corresponds to
-      MAPIProperty prop = MAPIProperty.get(chunk.getChunkId());
-      
-      // Assign it for easy lookup, as best we can
-      if(prop == MAPIProperty.MESSAGE_CLASS) {
-         messageClass = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.INTERNET_MESSAGE_ID) {
-         messageId = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.MESSAGE_SUBMISSION_ID) {
-         // TODO - parse
-         submissionChunk = (MessageSubmissionChunk)chunk;
-      }
-      else if(prop == MAPIProperty.RECEIVED_BY_ADDRTYPE) {
-         sentByServerType = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.TRANSPORT_MESSAGE_HEADERS) {
-         messageHeaders = (StringChunk)chunk;
-      }
-      
-      else if(prop == MAPIProperty.CONVERSATION_TOPIC) {
-         conversationTopic = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.SUBJECT) {
-         subjectChunk = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.ORIGINAL_SUBJECT) {
-         // TODO
-      }
-      
-      else if(prop == MAPIProperty.DISPLAY_TO) {
-         displayToChunk = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.DISPLAY_CC) {
-         displayCCChunk = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.DISPLAY_BCC) {
-         displayBCCChunk = (StringChunk)chunk;
-      }
-      
-      else if(prop == MAPIProperty.SENDER_EMAIL_ADDRESS) {
-         emailFromChunk = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.SENDER_NAME) {
-         displayFromChunk = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.BODY) {
-         textBodyChunk = (StringChunk)chunk;
-      }
-      else if(prop == MAPIProperty.BODY_HTML) {
-         if(chunk instanceof StringChunk) {
-            htmlBodyChunkString = (StringChunk)chunk;
-         }
-         if(chunk instanceof ByteChunk) {
-            htmlBodyChunkBinary = (ByteChunk)chunk;
-         }
-      }
-      else if(prop == MAPIProperty.RTF_COMPRESSED) {
-         rtfBodyChunk = (ByteChunk)chunk;
-      }
-      else if(chunk instanceof MessagePropertiesChunk) {
-         messageProperties = (MessagePropertiesChunk) chunk;
-      }
-      
-      // And add to the main list
-      if (allChunks.get(prop) == null) {
-         allChunks.put(prop, new ArrayList<Chunk>());
-      }
-      allChunks.get(prop).add(chunk);
-   }
-   
-   public void chunksComplete() {
-      if (messageProperties != null) {
-         messageProperties.matchVariableSizedPropertiesToChunks();
-      } else {
-         logger.log(POILogger.WARN, "Message didn't contain a root list of properties!");
-      }
-   }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
deleted file mode 100644
index 5365a63..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-
-/**
- * A Chunk that is just a placeholder in the
- *  MAPIMessage directory structure, which
- *  contains children.
- * This is most commonly used with nested
- *  MAPIMessages
- */
-public class DirectoryChunk extends Chunk {
-    private DirectoryNode dir;
-    
-    public DirectoryChunk(DirectoryNode dir, String namePrefix, int chunkId, MAPIType type) {
-        super(namePrefix, chunkId, type);
-        this.dir = dir;
-    }
-    
-    /**
-     * Returns the directory entry for this chunk.
-     * You can then use standard POIFS methods to
-     *  enumerate the entries in it.
-     */
-    public DirectoryNode getDirectory() {
-        return dir;
-    }
-    
-    /**
-     * Treats the directory as an embeded MAPIMessage
-     *  (it normally is one), and returns a MAPIMessage
-     *  object to process it with.
-     */
-    public MAPIMessage getAsEmbededMessage() throws IOException {
-        return new MAPIMessage(dir);
-    }
-
-    @Override
-    public void readValue(InputStream value) {
-        // DirectoryChunks have 0 byte contents
-    }
-
-    @Override
-    public void writeValue(OutputStream out) {
-        // DirectoryChunks have 0 byte contents
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java
deleted file mode 100644
index ae47398..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java
+++ /dev/null
@@ -1,1106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import static org.apache.poi.hsmf.datatypes.Types.ASCII_STRING;
-import static org.apache.poi.hsmf.datatypes.Types.BINARY;
-import static org.apache.poi.hsmf.datatypes.Types.BOOLEAN;
-import static org.apache.poi.hsmf.datatypes.Types.CLS_ID;
-import static org.apache.poi.hsmf.datatypes.Types.DIRECTORY;
-import static org.apache.poi.hsmf.datatypes.Types.LONG;
-import static org.apache.poi.hsmf.datatypes.Types.LONG_LONG;
-import static org.apache.poi.hsmf.datatypes.Types.SHORT;
-import static org.apache.poi.hsmf.datatypes.Types.TIME;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-
-/**
- * Holds the list of MAPI Attributes, and allows lookup
- *  by friendly name, ID and MAPI Property Name.
- * 
- * These are taken from the following MSDN resources:
- *  https://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefpropertyid(v=exchg.150).aspx
- *  http://msdn.microsoft.com/en-us/library/ms526356%28v=exchg.10%29.aspx
- */
-public class MAPIProperty {
-   private static Map<Integer, MAPIProperty> attributes = new HashMap<Integer, MAPIProperty>();
-   
-   public static final MAPIProperty AB_DEFAULT_DIR =
-      new MAPIProperty(0x3d06, BINARY, "AbDefaultDir", "PR_AB_DEFAULT_DIR");
-   public static final MAPIProperty AB_DEFAULT_PAB =
-      new MAPIProperty(0x3d07, BINARY, "AbDefaultPab", "PR_AB_DEFAULT_PAB");
-   public static final MAPIProperty AB_PROVIDER_ID =
-      new MAPIProperty(0x3615, BINARY, "AbProviderId", "PR_AB_PROVIDER_ID");
-   public static final MAPIProperty AB_PROVIDERS =
-      new MAPIProperty(0x3d01, BINARY, "AbProviders", "PR_AB_PROVIDERS");
-   public static final MAPIProperty AB_SEARCH_PATH =
-      new MAPIProperty(0x3d05, Types.createCustom(4354), "AbSearchPath", "PR_AB_SEARCH_PATH");
-   public static final MAPIProperty AB_SEARCH_PATH_UPDATE =
-      new MAPIProperty(0x3d11, BINARY, "AbSearchPathUpdate", "PR_AB_SEARCH_PATH_UPDATE");
-   public static final MAPIProperty ACCESS =
-      new MAPIProperty(0xff4, LONG, "Access", "PR_ACCESS");
-   public static final MAPIProperty ACCESS_LEVEL =
-      new MAPIProperty(0xff7, LONG, "AccessLevel", "PR_ACCESS_LEVEL");
-   public static final MAPIProperty ACCOUNT =
-      new MAPIProperty(0x3a00, ASCII_STRING, "Account", "PR_ACCOUNT");
-   public static final MAPIProperty ADDRTYPE =
-      new MAPIProperty(0x3002, ASCII_STRING, "Addrtype", "PR_ADDRTYPE");
-   public static final MAPIProperty ALTERNATE_RECIPIENT =
-      new MAPIProperty(0x3a01, BINARY, "AlternateRecipient", "PR_ALTERNATE_RECIPIENT");
-   public static final MAPIProperty ALTERNATE_RECIPIENT_ALLOWED =
-      new MAPIProperty(2, BOOLEAN, "AlternateRecipientAllowed", "PR_ALTERNATE_RECIPIENT_ALLOWED");
-   public static final MAPIProperty ANR =
-      new MAPIProperty(0x360c, ASCII_STRING, "Anr", "PR_ANR");
-   public static final MAPIProperty ASSISTANT =
-      new MAPIProperty(0x3a30, ASCII_STRING, "Assistant", "PR_ASSISTANT");
-   public static final MAPIProperty ASSISTANT_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a2e, ASCII_STRING, "AssistantTelephoneNumber", "PR_ASSISTANT_TELEPHONE_NUMBER");
-   public static final MAPIProperty ASSOC_CONTENT_COUNT =
-      new MAPIProperty(0x3617, LONG, "AssocContentCount", "PR_ASSOC_CONTENT_COUNT");
-   public static final MAPIProperty ATTACH_ADDITIONAL_INFO =
-      new MAPIProperty(0x370f, BINARY, "AttachAdditionalInfo", "PR_ATTACH_ADDITIONAL_INFO");
-   public static final MAPIProperty ATTACH_CONTENT_BASE =
-      new MAPIProperty(0x3711, Types.UNKNOWN,  "AttachContentBase", "PR_ATTACH_CONTENT_BASE");
-   public static final MAPIProperty ATTACH_CONTENT_ID =
-      new MAPIProperty(0x3712, Types.UNKNOWN,  "AttachContentId", "PR_ATTACH_CONTENT_ID");
-   public static final MAPIProperty ATTACH_CONTENT_LOCATION =
-      new MAPIProperty(0x3713, Types.UNKNOWN,  "AttachContentLocation", "PR_ATTACH_CONTENT_LOCATION");
-   public static final MAPIProperty ATTACH_DATA =
-      new MAPIProperty(0x3701, BINARY, "AttachData", "PR_ATTACH_DATA_OBJ");
-   public static final MAPIProperty ATTACH_DISPOSITION =
-      new MAPIProperty(0x3716, Types.UNKNOWN,  "AttachDisposition", "PR_ATTACH_DISPOSITION");
-   public static final MAPIProperty ATTACH_ENCODING =
-      new MAPIProperty(0x3702, BINARY, "AttachEncoding", "PR_ATTACH_ENCODING");
-   public static final MAPIProperty ATTACH_EXTENSION =
-      new MAPIProperty(0x3703, ASCII_STRING, "AttachExtension", "PR_ATTACH_EXTENSION");
-   public static final MAPIProperty ATTACH_FILENAME =
-      new MAPIProperty(0x3704, ASCII_STRING, "AttachFilename", "PR_ATTACH_FILENAME");
-   public static final MAPIProperty ATTACH_FLAGS =
-      new MAPIProperty(0x3714, Types.UNKNOWN,  "AttachFlags", "PR_ATTACH_FLAGS");
-   public static final MAPIProperty ATTACH_LONG_FILENAME =
-      new MAPIProperty(0x3707, ASCII_STRING, "AttachLongFilename", "PR_ATTACH_LONG_FILENAME");
-   public static final MAPIProperty ATTACH_LONG_PATHNAME =
-      new MAPIProperty(0x370d, ASCII_STRING, "AttachLongPathname", "PR_ATTACH_LONG_PATHNAME");
-   public static final MAPIProperty ATTACH_METHOD =
-      new MAPIProperty(0x3705, LONG, "AttachMethod", "PR_ATTACH_METHOD");
-   public static final MAPIProperty ATTACH_MIME_SEQUENCE =
-      new MAPIProperty(0x3710, Types.UNKNOWN,  "AttachMimeSequence", "PR_ATTACH_MIME_SEQUENCE");
-   public static final MAPIProperty ATTACH_MIME_TAG =
-      new MAPIProperty(0x370e, ASCII_STRING, "AttachMimeTag", "PR_ATTACH_MIME_TAG");
-   public static final MAPIProperty ATTACH_NETSCAPE_MAC_INFO =
-      new MAPIProperty(0x3715, Types.UNKNOWN,  "AttachNetscapeMacInfo", "PR_ATTACH_NETSCAPE_MAC_INFO");
-   public static final MAPIProperty ATTACH_NUM =
-      new MAPIProperty(0xe21, LONG, "AttachNum", "PR_ATTACH_NUM");
-   public static final MAPIProperty ATTACH_PATHNAME =
-      new MAPIProperty(0x3708, ASCII_STRING, "AttachPathname", "PR_ATTACH_PATHNAME");
-   public static final MAPIProperty ATTACH_RENDERING =
-      new MAPIProperty(0x3709, BINARY, "AttachRendering", "PR_ATTACH_RENDERING");
-   public static final MAPIProperty ATTACH_SIZE =
-      new MAPIProperty(0xe20, LONG, "AttachSize", "PR_ATTACH_SIZE");
-   public static final MAPIProperty ATTACH_TAG =
-      new MAPIProperty(0x370a, BINARY, "AttachTag", "PR_ATTACH_TAG");
-   public static final MAPIProperty ATTACH_TRANSPORT_NAME =
-      new MAPIProperty(0x370c, ASCII_STRING, "AttachTransportName", "PR_ATTACH_TRANSPORT_NAME");
-   public static final MAPIProperty ATTACHMENT_X400_PARAMETERS =
-      new MAPIProperty(0x3700, BINARY, "AttachmentX400Parameters", "PR_ATTACHMENT_X400_PARAMETERS");
-   public static final MAPIProperty AUTHORIZING_USERS =
-      new MAPIProperty(3, BINARY, "AuthorizingUsers", "PR_AUTHORIZING_USERS");
-   public static final MAPIProperty AUTO_FORWARD_COMMENT =
-      new MAPIProperty(4, ASCII_STRING, "AutoForwardComment", "PR_AUTO_FORWARD_COMMENT");
-   public static final MAPIProperty AUTO_FORWARDED =
-      new MAPIProperty(5, BOOLEAN, "AutoForwarded", "PR_AUTO_FORWARDED");
-   public static final MAPIProperty AUTO_RESPONSE_SUPPRESS =
-      new MAPIProperty(0x3fdf, Types.UNKNOWN,  "AutoResponseSuppress", "PR_AUTO_RESPONSE_SUPPRESS");
-   public static final MAPIProperty BIRTHDAY =
-      new MAPIProperty(0x3a42, TIME, "Birthday", "PR_BIRTHDAY");
-   public static final MAPIProperty BODY =
-      new MAPIProperty(0x1000, ASCII_STRING, "Body", "PR_BODY");
-   public static final MAPIProperty BODY_CONTENT_ID =
-      new MAPIProperty(0x1015, Types.UNKNOWN,  "BodyContentId", "PR_BODY_CONTENT_ID");
-   public static final MAPIProperty BODY_CONTENT_LOCATION =
-      new MAPIProperty(0x1014, Types.UNKNOWN,  "BodyContentLocation", "PR_BODY_CONTENT_LOCATION");
-   public static final MAPIProperty BODY_CRC =
-      new MAPIProperty(0xe1c, LONG, "BodyCrc", "PR_BODY_CRC");
-   public static final MAPIProperty BODY_HTML =
-      new MAPIProperty(0x1013, Types.UNKNOWN,  "BodyHtml", "data");
-   public static final MAPIProperty BUSINESS_FAX_NUMBER =
-      new MAPIProperty(0x3a24, ASCII_STRING, "BusinessFaxNumber", "PR_BUSINESS_FAX_NUMBER");
-   public static final MAPIProperty BUSINESS_HOME_PAGE =
-      new MAPIProperty(0x3a51, ASCII_STRING, "BusinessHomePage", "PR_BUSINESS_HOME_PAGE");
-   public static final MAPIProperty CALLBACK_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a02, ASCII_STRING, "CallbackTelephoneNumber", "PR_CALLBACK_TELEPHONE_NUMBER");
-   public static final MAPIProperty CAR_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a1e, ASCII_STRING, "CarTelephoneNumber", "PR_CAR_TELEPHONE_NUMBER");
-   public static final MAPIProperty CHILDRENS_NAMES =
-      new MAPIProperty(0x3a58, Types.createCustom(4126), "ChildrensNames", "PR_CHILDRENS_NAMES");
-   public static final MAPIProperty CLIENT_SUBMIT_TIME =
-      new MAPIProperty(0x39, TIME, "ClientSubmitTime", "PR_CLIENT_SUBMIT_TIME");
-   public static final MAPIProperty COMMENT =
-      new MAPIProperty(0x3004, ASCII_STRING, "Comment", "PR_COMMENT");
-   public static final MAPIProperty COMMON_VIEWS_ENTRY_ID =
-      new MAPIProperty(0x35e6, BINARY, "CommonViewsEntryId", "PR_COMMON_VIEWS_ENTRYID");
-   public static final MAPIProperty COMPANY_MAIN_PHONE_NUMBER =
-      new MAPIProperty(0x3a57, ASCII_STRING, "CompanyMainPhoneNumber", "PR_COMPANY_MAIN_PHONE_NUMBER");
-   public static final MAPIProperty COMPANY_NAME =
-      new MAPIProperty(0x3a16, ASCII_STRING, "CompanyName", "PR_COMPANY_NAME");
-   public static final MAPIProperty COMPUTER_NETWORK_NAME =
-      new MAPIProperty(0x3a49, ASCII_STRING, "ComputerNetworkName", "PR_COMPUTER_NETWORK_NAME");
-   public static final MAPIProperty CONTACT_ADDRTYPES =
-      new MAPIProperty(0x3a54, Types.createCustom(4126), "ContactAddrtypes", "PR_CONTACT_ADDRTYPES");
-   public static final MAPIProperty CONTACT_DEFAULT_ADDRESS_INDEX =
-      new MAPIProperty(0x3a55, LONG, "ContactDefaultAddressIndex", "PR_CONTACT_DEFAULT_ADDRESS_INDEX");
-   public static final MAPIProperty CONTACT_EMAIL_ADDRESSES =
-      new MAPIProperty(0x3a56, Types.createCustom(4126), "ContactEmailAddresses", "PR_CONTACT_EMAIL_ADDRESSES");
-   public static final MAPIProperty CONTACT_ENTRY_IDS =
-      new MAPIProperty(0x3a53, Types.createCustom(4354), "ContactEntryIds", "PR_CONTACT_ENTRYIDS");
-   public static final MAPIProperty CONTACT_VERSION =
-      new MAPIProperty(0x3a52, CLS_ID, "ContactVersion", "PR_CONTACT_VERSION");
-   public static final MAPIProperty CONTAINER_CLASS =
-      new MAPIProperty(0x3613, ASCII_STRING, "ContainerClass", "PR_CONTAINER_CLASS");
-   public static final MAPIProperty CONTAINER_CONTENTS =
-      new MAPIProperty(0x360f, DIRECTORY, "ContainerContents", "PR_CONTAINER_CONTENTS");
-   public static final MAPIProperty CONTAINER_FLAGS =
-      new MAPIProperty(0x3600, LONG, "ContainerFlags", "PR_CONTAINER_FLAGS");
-   public static final MAPIProperty CONTAINER_HIERARCHY =
-      new MAPIProperty(0x360e, DIRECTORY, "ContainerHierarchy", "PR_CONTAINER_HIERARCHY");
-   public static final MAPIProperty CONTAINER_MODIFY_VERSION =
-      new MAPIProperty(0x3614, LONG_LONG, "ContainerModifyVersion", "PR_CONTAINER_MODIFY_VERSION");
-   public static final MAPIProperty CONTENT_CONFIDENTIALITY_ALGORITHM_ID =
-      new MAPIProperty(6, BINARY, "ContentConfidentialityAlgorithmId", "PR_CONTENT_CONFIDENTIALITY_ALGORITHM_ID");
-   public static final MAPIProperty CONTENT_CORRELATOR =
-      new MAPIProperty(7, BINARY, "ContentCorrelator", "PR_CONTENT_CORRELATOR");
-   public static final MAPIProperty CONTENT_COUNT =
-      new MAPIProperty(0x3602, LONG, "ContentCount", "PR_CONTENT_COUNT");
-   public static final MAPIProperty CONTENT_IDENTIFIER =
-      new MAPIProperty(8, ASCII_STRING, "ContentIdentifier", "PR_CONTENT_IDENTIFIER");
-   public static final MAPIProperty CONTENT_INTEGRITY_CHECK =
-      new MAPIProperty(0xc00, BINARY, "ContentIntegrityCheck", "PR_CONTENT_INTEGRITY_CHECK");
-   public static final MAPIProperty CONTENT_LENGTH =
-      new MAPIProperty(9, LONG, "ContentLength", "PR_CONTENT_LENGTH");
-   public static final MAPIProperty CONTENT_RETURN_REQUESTED =
-      new MAPIProperty(10, BOOLEAN, "ContentReturnRequested", "PR_CONTENT_RETURN_REQUESTED");
-   public static final MAPIProperty CONTENT_UNREAD =
-      new MAPIProperty(0x3603, LONG, "ContentUnread", "PR_CONTENT_UNREAD");
-   public static final MAPIProperty CONTENTS_SORT_ORDER =
-      new MAPIProperty(0x360d, Types.createCustom(4099), "ContentsSortOrder", "PR_CONTENTS_SORT_ORDER");
-   public static final MAPIProperty CONTROL_FLAGS =
-      new MAPIProperty(0x3f00, LONG, "ControlFlags", "PR_CONTROL_FLAGS");
-   public static final MAPIProperty CONTROL_ID =
-      new MAPIProperty(0x3f07, BINARY, "ControlId", "PR_CONTROL_ID");
-   public static final MAPIProperty CONTROL_STRUCTURE =
-      new MAPIProperty(0x3f01, BINARY, "ControlStructure", "PR_CONTROL_STRUCTURE");
-   public static final MAPIProperty CONTROL_TYPE =
-      new MAPIProperty(0x3f02, LONG, "ControlType", "PR_CONTROL_TYPE");
-   public static final MAPIProperty CONVERSATION_INDEX =
-      new MAPIProperty(0x71, BINARY, "ConversationIndex", "PR_CONVERSATION_INDEX");
-   public static final MAPIProperty CONVERSATION_KEY =
-      new MAPIProperty(11, BINARY, "ConversationKey", "PR_CONVERSATION_KEY");
-   public static final MAPIProperty CONVERSATION_TOPIC =
-      new MAPIProperty(0x70, ASCII_STRING, "ConversationTopic", "PR_CONVERSATION_TOPIC");
-   public static final MAPIProperty CONVERSION_EITS =
-      new MAPIProperty(12, BINARY, "ConversionEits", "PR_CONVERSION_EITS");
-   public static final MAPIProperty CONVERSION_PROHIBITED =
-      new MAPIProperty(0x3a03, BOOLEAN, "ConversionProhibited", "PR_CONVERSION_PROHIBITED");
-   public static final MAPIProperty CONVERSION_WITH_LOSS_PROHIBITED =
-      new MAPIProperty(13, BOOLEAN, "ConversionWithLossProhibited", "PR_CONVERSION_WITH_LOSS_PROHIBITED");
-   public static final MAPIProperty CONVERTED_EITS =
-      new MAPIProperty(14, BINARY, "ConvertedEits", "PR_CONVERTED_EITS");
-   public static final MAPIProperty CORRELATE =
-      new MAPIProperty(0xe0c, BOOLEAN, "Correlate", "PR_CORRELATE");
-   public static final MAPIProperty CORRELATE_MTSID =
-      new MAPIProperty(0xe0d, BINARY, "CorrelateMtsid", "PR_CORRELATE_MTSID");
-   public static final MAPIProperty COUNTRY =
-      new MAPIProperty(0x3a26, ASCII_STRING, "Country", "PR_COUNTRY");
-   public static final MAPIProperty CREATE_TEMPLATES =
-      new MAPIProperty(0x3604, DIRECTORY, "CreateTemplates", "PR_CREATE_TEMPLATES");
-   public static final MAPIProperty CREATION_TIME =
-      new MAPIProperty(0x3007, TIME, "CreationTime", "PR_CREATION_TIME");
-   public static final MAPIProperty CREATION_VERSION =
-      new MAPIProperty(0xe19, LONG_LONG, "CreationVersion", "PR_CREATION_VERSION");
-   public static final MAPIProperty CURRENT_VERSION =
-      new MAPIProperty(0xe00, LONG_LONG, "CurrentVersion", "PR_CURRENT_VERSION");
-   public static final MAPIProperty CUSTOMER_ID =
-      new MAPIProperty(0x3a4a, ASCII_STRING, "CustomerId", "PR_CUSTOMER_ID");
-   public static final MAPIProperty DEF_CREATE_DL =
-      new MAPIProperty(0x3611, BINARY, "DefCreateDl", "PR_DEF_CREATE_DL");
-   public static final MAPIProperty DEF_CREATE_MAILUSER =
-      new MAPIProperty(0x3612, BINARY, "DefCreateMailuser", "PR_DEF_CREATE_MAILUSER");
-   public static final MAPIProperty DEFAULT_PROFILE =
-      new MAPIProperty(0x3d04, BOOLEAN, "DefaultProfile", "PR_DEFAULT_PROFILE");
-   public static final MAPIProperty DEFAULT_STORE =
-      new MAPIProperty(0x3400, BOOLEAN, "DefaultStore", "PR_DEFAULT_STORE");
-   public static final MAPIProperty DEFAULT_VIEW_ENTRY_ID =
-      new MAPIProperty(0x3616, BINARY, "DefaultViewEntryId", "PR_DEFAULT_VIEW_ENTRYID");
-   public static final MAPIProperty DEFERRED_DELIVERY_TIME =
-      new MAPIProperty(15, TIME, "DeferredDeliveryTime", "PR_DEFERRED_DELIVERY_TIME");
-   public static final MAPIProperty DELEGATION =
-      new MAPIProperty(0x7e, BINARY, "Delegation", "PR_DELEGATION");
-   public static final MAPIProperty DELETE_AFTER_SUBMIT =
-      new MAPIProperty(0xe01, BOOLEAN, "DeleteAfterSubmit", "PR_DELETE_AFTER_SUBMIT");
-   public static final MAPIProperty DELIVER_TIME =
-      new MAPIProperty(0x10, TIME, "DeliverTime", "PR_DELIVER_TIME");
-   public static final MAPIProperty DELIVERY_POINT =
-      new MAPIProperty(0xc07, LONG, "DeliveryPoint", "PR_DELIVERY_POINT");
-   public static final MAPIProperty DELTAX =
-      new MAPIProperty(0x3f03, LONG, "Deltax", "PR_DELTAX");
-   public static final MAPIProperty DELTAY =
-      new MAPIProperty(0x3f04, LONG, "Deltay", "PR_DELTAY");
-   public static final MAPIProperty DEPARTMENT_NAME =
-      new MAPIProperty(0x3a18, ASCII_STRING, "DepartmentName", "PR_DEPARTMENT_NAME");
-   public static final MAPIProperty DEPTH =
-      new MAPIProperty(0x3005, LONG, "Depth", "PR_DEPTH");
-   public static final MAPIProperty DETAILS_TABLE =
-      new MAPIProperty(0x3605, DIRECTORY, "DetailsTable", "PR_DETAILS_TABLE");
-   public static final MAPIProperty DISC_VAL =
-      new MAPIProperty(0x4a, BOOLEAN, "DiscVal", "PR_DISC_VAL");
-   public static final MAPIProperty DISCARD_REASON =
-      new MAPIProperty(0x11, LONG, "DiscardReason", "PR_DISCARD_REASON");
-   public static final MAPIProperty DISCLOSE_RECIPIENTS =
-      new MAPIProperty(0x3a04, BOOLEAN, "DiscloseRecipients", "PR_DISCLOSE_RECIPIENTS");
-   public static final MAPIProperty DISCLOSURE_OF_RECIPIENTS =
-      new MAPIProperty(0x12, BOOLEAN, "DisclosureOfRecipients", "PR_DISCLOSURE_OF_RECIPIENTS");
-   public static final MAPIProperty DISCRETE_VALUES =
-      new MAPIProperty(0xe0e, BOOLEAN, "DiscreteValues", "PR_DISCRETE_VALUES");
-   public static final MAPIProperty DISPLAY_BCC =
-      new MAPIProperty(0xe02, ASCII_STRING, "DisplayBcc", "PR_DISPLAY_BCC");
-   public static final MAPIProperty DISPLAY_CC =
-      new MAPIProperty(0xe03, ASCII_STRING, "DisplayCc", "PR_DISPLAY_CC");
-   public static final MAPIProperty DISPLAY_NAME =
-      new MAPIProperty(0x3001, ASCII_STRING, "DisplayName", "PR_DISPLAY_NAME");
-   public static final MAPIProperty DISPLAY_NAME_PREFIX =
-      new MAPIProperty(0x3a45, ASCII_STRING, "DisplayNamePrefix", "PR_DISPLAY_NAME_PREFIX");
-   public static final MAPIProperty DISPLAY_TO =
-      new MAPIProperty(0xe04, ASCII_STRING, "DisplayTo", "PR_DISPLAY_TO");
-   public static final MAPIProperty DISPLAY_TYPE =
-      new MAPIProperty(0x3900, LONG, "DisplayType", "PR_DISPLAY_TYPE");
-   public static final MAPIProperty DL_EXPANSION_HISTORY =
-      new MAPIProperty(0x13, BINARY, "DlExpansionHistory", "PR_DL_EXPANSION_HISTORY");
-   public static final MAPIProperty DL_EXPANSION_PROHIBITED =
-      new MAPIProperty(20, BOOLEAN, "DlExpansionProhibited", "PR_DL_EXPANSION_PROHIBITED");
-   public static final MAPIProperty EMAIL_ADDRESS =
-      new MAPIProperty(0x3003, ASCII_STRING, "EmailAddress", "PR_EMAIL_ADDRESS");
-   public static final MAPIProperty END_DATE =
-      new MAPIProperty(0x61, TIME, "EndDate", "PR_END_DATE");
-   public static final MAPIProperty ENTRY_ID =
-      new MAPIProperty(0xfff, BINARY, "EntryId", "PR_ENTRYID");
-   public static final MAPIProperty EXPAND_BEGIN_TIME =
-      new MAPIProperty(0x3618, Types.UNKNOWN,  "ExpandBeginTime", "PR_EXPAND_BEGIN_TIME");
-   public static final MAPIProperty EXPAND_END_TIME =
-      new MAPIProperty(0x3619, Types.UNKNOWN,  "ExpandEndTime", "PR_EXPAND_END_TIME");
-   public static final MAPIProperty EXPANDED_BEGIN_TIME =
-      new MAPIProperty(0x361a, Types.UNKNOWN,  "ExpandedBeginTime", "PR_EXPANDED_BEGIN_TIME");
-   public static final MAPIProperty EXPANDED_END_TIME =
-      new MAPIProperty(0x361b, Types.UNKNOWN,  "ExpandedEndTime", "PR_EXPANDED_END_TIME");
-   public static final MAPIProperty EXPIRY_TIME =
-      new MAPIProperty(0x15, TIME, "ExpiryTime", "PR_EXPIRY_TIME");
-   public static final MAPIProperty EXPLICIT_CONVERSION =
-      new MAPIProperty(0xc01, LONG, "ExplicitConversion", "PR_EXPLICIT_CONVERSION");
-   public static final MAPIProperty FILTERING_HOOKS =
-      new MAPIProperty(0x3d08, BINARY, "FilteringHooks", "PR_FILTERING_HOOKS");
-   public static final MAPIProperty FINDER_ENTRY_ID =
-      new MAPIProperty(0x35e7, BINARY, "FinderEntryId", "PR_FINDER_ENTRYID");
-   public static final MAPIProperty FOLDER_ASSOCIATED_CONTENTS =
-      new MAPIProperty(0x3610, DIRECTORY, "FolderAssociatedContents", "PR_FOLDER_ASSOCIATED_CONTENTS");
-   public static final MAPIProperty FOLDER_TYPE =
-      new MAPIProperty(0x3601, LONG, "FolderType", "PR_FOLDER_TYPE");
-   public static final MAPIProperty FORM_CATEGORY =
-      new MAPIProperty(0x3304, ASCII_STRING, "FormCategory", "PR_FORM_CATEGORY");
-   public static final MAPIProperty FORM_CATEGORY_SUB =
-      new MAPIProperty(0x3305, ASCII_STRING, "FormCategorySub", "PR_FORM_CATEGORY_SUB");
-   public static final MAPIProperty FORM_CLSID =
-      new MAPIProperty(0x3302, CLS_ID, "FormClsid", "PR_FORM_ClsID");
-   public static final MAPIProperty FORM_CONTACT_NAME =
-      new MAPIProperty(0x3303, ASCII_STRING, "FormContactName", "PR_FORM_CONTACT_NAME");
-   public static final MAPIProperty FORM_DESIGNER_GUID =
-      new MAPIProperty(0x3309, CLS_ID, "FormDesignerGuid", "PR_FORM_DESIGNER_GUID");
-   public static final MAPIProperty FORM_DESIGNER_NAME =
-      new MAPIProperty(0x3308, ASCII_STRING, "FormDesignerName", "PR_FORM_DESIGNER_NAME");
-   public static final MAPIProperty FORM_HIDDEN =
-      new MAPIProperty(0x3307, BOOLEAN, "FormHidden", "PR_FORM_HIDDEN");
-   public static final MAPIProperty FORM_HOST_MAP =
-      new MAPIProperty(0x3306, Types.createCustom(4099), "FormHostMap", "PR_FORM_HOST_MAP");
-   public static final MAPIProperty FORM_MESSAGE_BEHAVIOR =
-      new MAPIProperty(0x330a, LONG, "FormMessageBehavior", "PR_FORM_MESSAGE_BEHAVIOR");
-   public static final MAPIProperty FORM_VERSION =
-      new MAPIProperty(0x3301, ASCII_STRING, "FormVersion", "PR_FORM_VERSION");
-   public static final MAPIProperty FTP_SITE =
-      new MAPIProperty(0x3a4c, ASCII_STRING, "FtpSite", "PR_FTP_SITE");
-   public static final MAPIProperty GENDER =
-      new MAPIProperty(0x3a4d, SHORT, "Gender", "PR_GENDER");
-   public static final MAPIProperty GENERATION =
-      new MAPIProperty(0x3a05, ASCII_STRING, "Generation", "PR_GENERATION");
-   public static final MAPIProperty GIVEN_NAME =
-      new MAPIProperty(0x3a06, ASCII_STRING, "GivenName", "PR_GIVEN_NAME");
-   public static final MAPIProperty GOVERNMENT_ID_NUMBER =
-      new MAPIProperty(0x3a07, ASCII_STRING, "GovernmentIdNumber", "PR_GOVERNMENT_ID_NUMBER");
-   public static final MAPIProperty HASATTACH =
-      new MAPIProperty(0xe1b, BOOLEAN, "Hasattach", "PR_HASATTACH");
-   public static final MAPIProperty HEADER_FOLDER_ENTRY_ID =
-      new MAPIProperty(0x3e0a, BINARY, "HeaderFolderEntryId", "PR_HEADER_FOLDER_ENTRYID");
-   public static final MAPIProperty HOBBIES =
-      new MAPIProperty(0x3a43, ASCII_STRING, "Hobbies", "PR_HOBBIES");
-   public static final MAPIProperty HOME2_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a2f, ASCII_STRING, "Home2TelephoneNumber", "PR_HOME2_TELEPHONE_NUMBER");
-   public static final MAPIProperty HOME_ADDRESS_CITY =
-      new MAPIProperty(0x3a59, ASCII_STRING, "HomeAddressCity", "PR_HOME_ADDRESS_CITY");
-   public static final MAPIProperty HOME_ADDRESS_COUNTRY =
-      new MAPIProperty(0x3a5a, ASCII_STRING, "HomeAddressCountry", "PR_HOME_ADDRESS_COUNTRY");
-   public static final MAPIProperty HOME_ADDRESS_POST_OFFICE_BOX =
-      new MAPIProperty(0x3a5e, ASCII_STRING, "HomeAddressPostOfficeBox", "PR_HOME_ADDRESS_POST_OFFICE_BOX");
-   public static final MAPIProperty HOME_ADDRESS_POSTAL_CODE =
-      new MAPIProperty(0x3a5b, ASCII_STRING, "HomeAddressPostalCode", "PR_HOME_ADDRESS_POSTAL_CODE");
-   public static final MAPIProperty HOME_ADDRESS_STATE_OR_PROVINCE =
-      new MAPIProperty(0x3a5c, ASCII_STRING, "HomeAddressStateOrProvince", "PR_HOME_ADDRESS_STATE_OR_PROVINCE");
-   public static final MAPIProperty HOME_ADDRESS_STREET =
-      new MAPIProperty(0x3a5d, ASCII_STRING, "HomeAddressStreet", "PR_HOME_ADDRESS_STREET");
-   public static final MAPIProperty HOME_FAX_NUMBER =
-      new MAPIProperty(0x3a25, ASCII_STRING, "HomeFaxNumber", "PR_HOME_FAX_NUMBER");
-   public static final MAPIProperty HOME_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a09, ASCII_STRING, "HomeTelephoneNumber", "PR_HOME_TELEPHONE_NUMBER");
-   public static final MAPIProperty INET_MAIL_OVERRIDE_CHARSET =
-      new MAPIProperty(0x5903, Types.UNKNOWN,  "INetMailOverrideCharset", "Charset");
-   public static final MAPIProperty INET_MAIL_OVERRIDE_FORMAT =
-      new MAPIProperty(0x5902, Types.UNKNOWN,  "INetMailOverrideFormat", "Format");
-   public static final MAPIProperty ICON =
-      new MAPIProperty(0xffd, BINARY, "Icon", "PR_ICON");
-   public static final MAPIProperty IDENTITY_DISPLAY =
-      new MAPIProperty(0x3e00, ASCII_STRING, "IdentityDisplay", "PR_IDENTITY_DISPLAY");
-   public static final MAPIProperty IDENTITY_ENTRY_ID =
-      new MAPIProperty(0x3e01, BINARY, "IdentityEntryId", "PR_IDENTITY_ENTRYID");
-   public static final MAPIProperty IDENTITY_SEARCH_KEY =
-      new MAPIProperty(0x3e05, BINARY, "IdentitySearchKey", "PR_IDENTITY_SEARCH_KEY");
-   public static final MAPIProperty IMPLICIT_CONVERSION_PROHIBITED =
-      new MAPIProperty(0x16, BOOLEAN, "ImplicitConversionProhibited", "PR_IMPLICIT_CONVERSION_PROHIBITED");
-   public static final MAPIProperty IMPORTANCE =
-      new MAPIProperty(0x17, LONG, "Importance", "PR_IMPORTANCE");
-   public static final MAPIProperty IN_REPLY_TO_ID =
-      new MAPIProperty(0x1042, Types.UNKNOWN,  "InReplyToId", "PR_IN_REPLY_TO_ID");
-   public static final MAPIProperty INCOMPLETE_COPY =
-      new MAPIProperty(0x35, BOOLEAN, "IncompleteCopy", "PR_INCOMPLETE_COPY");
-   public static final MAPIProperty INITIAL_DETAILS_PANE =
-      new MAPIProperty(0x3f08, LONG, "InitialDetailsPane", "PR_INITIAL_DETAILS_PANE");
-   public static final MAPIProperty INITIALS =
-      new MAPIProperty(0x3a0a, ASCII_STRING, "Initials", "PR_INITIALS");
-   public static final MAPIProperty INSTANCE_KEY =
-      new MAPIProperty(0xff6, BINARY, "InstanceKey", "PR_INSTANCE_KEY");
-   public static final MAPIProperty INTERNET_APPROVED =
-      new MAPIProperty(0x1030, ASCII_STRING, "InternetApproved", "PR_INTERNET_APPROVED");
-   public static final MAPIProperty INTERNET_ARTICLE_NUMBER =
-      new MAPIProperty(0xe23, LONG, "InternetArticleNumber", "PR_INTERNET_ARTICLE_NUMBER");
-   public static final MAPIProperty INTERNET_CPID =
-      new MAPIProperty(0x3fde, Types.LONG,  "InternetCPID", "PR_INTERNET_CPID");
-   public static final MAPIProperty INTERNET_CONTROL =
-      new MAPIProperty(0x1031, ASCII_STRING, "InternetControl", "PR_INTERNET_CONTROL");
-   public static final MAPIProperty INTERNET_DISTRIBUTION =
-      new MAPIProperty(0x1032, ASCII_STRING, "InternetDistribution", "PR_INTERNET_DISTRIBUTION");
-   public static final MAPIProperty INTERNET_FOLLOWUP_TO =
-      new MAPIProperty(0x1033, ASCII_STRING, "InternetFollowupTo", "PR_INTERNET_FOLLOWUP_TO");
-   public static final MAPIProperty INTERNET_LINES =
-      new MAPIProperty(0x1034, LONG, "InternetLines", "PR_INTERNET_LINES");
-   public static final MAPIProperty INTERNET_MESSAGE_ID =
-      new MAPIProperty(0x1035, ASCII_STRING, "InternetMessageId", "PR_INTERNET_MESSAGE_ID");
-   public static final MAPIProperty INTERNET_NEWSGROUPS =
-      new MAPIProperty(0x1036, ASCII_STRING, "InternetNewsgroups", "PR_INTERNET_NEWSGROUPS");
-   public static final MAPIProperty INTERNET_NNTP_PATH =
-      new MAPIProperty(0x1038, ASCII_STRING, "InternetNntpPath", "PR_INTERNET_NNTP_PATH");
-   public static final MAPIProperty INTERNET_ORGANIZATION =
-      new MAPIProperty(0x1037, ASCII_STRING, "InternetOrganization", "PR_INTERNET_ORGANIZATION");
-   public static final MAPIProperty INTERNET_PRECEDENCE =
-      new MAPIProperty(0x1041, ASCII_STRING, "InternetPrecedence", "PR_INTERNET_PRECEDENCE");
-   public static final MAPIProperty INTERNET_REFERENCES =
-      new MAPIProperty(0x1039, ASCII_STRING, "InternetReferences", "PR_INTERNET_REFERENCES");
-   public static final MAPIProperty IPM_ID =
-      new MAPIProperty(0x18, BINARY, "IpmId", "PR_IPM_ID");
-   public static final MAPIProperty IPM_OUTBOX_ENTRY_ID =
-      new MAPIProperty(0x35e2, BINARY, "IpmOutboxEntryId", "PR_IPM_OUTBOX_ENTRYID");
-   public static final MAPIProperty IPM_OUTBOX_SEARCH_KEY =
-      new MAPIProperty(0x3411, BINARY, "IpmOutboxSearchKey", "PR_IPM_OUTBOX_SEARCH_KEY");
-   public static final MAPIProperty IPM_RETURN_REQUESTED =
-      new MAPIProperty(0xc02, BOOLEAN, "IpmReturnRequested", "PR_IPM_RETURN_REQUESTED");
-   public static final MAPIProperty IPM_SENTMAIL_ENTRY_ID =
-      new MAPIProperty(0x35e4, BINARY, "IpmSentmailEntryId", "PR_IPM_SENTMAIL_ENTRYID");
-   public static final MAPIProperty IPM_SENTMAIL_SEARCH_KEY =
-      new MAPIProperty(0x3413, BINARY, "IpmSentmailSearchKey", "PR_IPM_SENTMAIL_SEARCH_KEY");
-   public static final MAPIProperty IPM_SUBTREE_ENTRY_ID =
-      new MAPIProperty(0x35e0, BINARY, "IpmSubtreeEntryId", "PR_IPM_SUBTREE_ENTRYID");
-   public static final MAPIProperty IPM_SUBTREE_SEARCH_KEY =
-      new MAPIProperty(0x3410, BINARY, "IpmSubtreeSearchKey", "PR_IPM_SUBTREE_SEARCH_KEY");
-   public static final MAPIProperty IPM_WASTEBASKET_ENTRY_ID =
-      new MAPIProperty(0x35e3, BINARY, "IpmWastebasketEntryId", "PR_IPM_WASTEBASKET_ENTRYID");
-   public static final MAPIProperty IPM_WASTEBASKET_SEARCH_KEY =
-      new MAPIProperty(0x3412, BINARY, "IpmWastebasketSearchKey", "PR_IPM_WASTEBASKET_SEARCH_KEY");
-   public static final MAPIProperty ISDN_NUMBER =
-      new MAPIProperty(0x3a2d, ASCII_STRING, "IsdnNumber", "PR_ISDN_NUMBER");
-   public static final MAPIProperty KEYWORD =
-      new MAPIProperty(0x3a0b, ASCII_STRING, "Keyword", "PR_KEYWORD");
-   public static final MAPIProperty LANGUAGE =
-      new MAPIProperty(0x3a0c, ASCII_STRING, "Language", "PR_LANGUAGE");
-   public static final MAPIProperty LANGUAGES =
-      new MAPIProperty(0x2f, ASCII_STRING, "Languages", "PR_LANGUAGES");
-   public static final MAPIProperty LAST_MODIFICATION_TIME =
-      new MAPIProperty(0x3008, TIME, "LastModificationTime", "PR_LAST_MODIFICATION_TIME");
-   public static final MAPIProperty LATEST_DELIVERY_TIME =
-      new MAPIProperty(0x19, TIME, "LatestDeliveryTime", "PR_LATEST_DELIVERY_TIME");
-   public static final MAPIProperty LIST_HELP =
-      new MAPIProperty(0x1043, Types.UNKNOWN,  "ListHelp", "PR_LIST_HELP");
-   public static final MAPIProperty LIST_SUBSCRIBE =
-      new MAPIProperty(0x1044, Types.UNKNOWN,  "ListSubscribe", "PR_LIST_SUBSCRIBE");
-   public static final MAPIProperty LIST_UNSUBSCRIBE =
-      new MAPIProperty(0x1045, Types.UNKNOWN,  "ListUnsubscribe", "PR_LIST_UNSUBSCRIBE");
-   public static final MAPIProperty LOCALITY =
-      new MAPIProperty(0x3a27, ASCII_STRING, "Locality", "PR_LOCALITY");
-   public static final MAPIProperty LOCALLY_DELIVERED =
-      new MAPIProperty(0x6745, Types.UNKNOWN,  "LocallyDelivered", "ptagLocallyDelivered");
-   public static final MAPIProperty LOCATION =
-      new MAPIProperty(0x3a0d, ASCII_STRING, "Location", "PR_LOCATION");
-   public static final MAPIProperty LOCK_BRANCH_ID =
-      new MAPIProperty(0x3800, Types.UNKNOWN,  "LockBranchId", "PR_LOCK_BRANCH_ID");
-   public static final MAPIProperty LOCK_DEPTH =
-      new MAPIProperty(0x3808, Types.UNKNOWN,  "LockDepth", "PR_LOCK_DEPTH");
-   public static final MAPIProperty LOCK_ENLISTMENT_CONTEXT =
-      new MAPIProperty(0x3804, Types.UNKNOWN,  "LockEnlistmentContext", "PR_LOCK_ENLISTMENT_CONTEXT");
-   public static final MAPIProperty LOCK_EXPIRY_TIME =
-      new MAPIProperty(0x380a, Types.UNKNOWN,  "LockExpiryTime", "PR_LOCK_EXPIRY_TIME");
-   public static final MAPIProperty LOCK_PERSISTENT =
-      new MAPIProperty(0x3807, Types.UNKNOWN,  "LockPersistent", "PR_LOCK_PERSISTENT");
-   public static final MAPIProperty LOCK_RESOURCE_DID =
-      new MAPIProperty(0x3802, Types.UNKNOWN,  "LockResourceDid", "PR_LOCK_RESOURCE_DID");
-   public static final MAPIProperty LOCK_RESOURCE_FID =
-      new MAPIProperty(0x3801, Types.UNKNOWN,  "LockResourceFid", "PR_LOCK_RESOURCE_FID");
-   public static final MAPIProperty LOCK_RESOURCE_MID =
-      new MAPIProperty(0x3803, Types.UNKNOWN,  "LockResourceMid", "PR_LOCK_RESOURCE_MID");
-   public static final MAPIProperty LOCK_SCOPE =
-      new MAPIProperty(0x3806, Types.UNKNOWN,  "LockScope", "PR_LOCK_SCOPE");
-   public static final MAPIProperty LOCK_TIMEOUT =
-      new MAPIProperty(0x3809, Types.UNKNOWN,  "LockTimeout", "PR_LOCK_TIMEOUT");
-   public static final MAPIProperty LOCK_TYPE =
-      new MAPIProperty(0x3805, Types.UNKNOWN,  "LockType", "PR_LOCK_TYPE");
-   public static final MAPIProperty MAIL_PERMISSION =
-      new MAPIProperty(0x3a0e, BOOLEAN, "MailPermission", "PR_MAIL_PERMISSION");
-   public static final MAPIProperty MANAGER_NAME =
-      new MAPIProperty(0x3a4e, ASCII_STRING, "ManagerName", "PR_MANAGER_NAME");
-   public static final MAPIProperty MAPPING_SIGNATURE =
-      new MAPIProperty(0xff8, BINARY, "MappingSignature", "PR_MAPPING_SIGNATURE");
-   public static final MAPIProperty MDB_PROVIDER =
-      new MAPIProperty(0x3414, BINARY, "MdbProvider", "PR_MDB_PROVIDER");
-   public static final MAPIProperty MESSAGE_ATTACHMENTS =
-      new MAPIProperty(0xe13, DIRECTORY, "MessageAttachments", "PR_MESSAGE_ATTACHMENTS");
-   public static final MAPIProperty MESSAGE_CC_ME =
-      new MAPIProperty(0x58, BOOLEAN, "MessageCcMe", "PR_MESSAGE_CC_ME");
-   public static final MAPIProperty MESSAGE_CLASS =
-      new MAPIProperty(0x1a, ASCII_STRING, "MessageClass", "PR_MESSAGE_CLASS");
-   public static final MAPIProperty MESSAGE_CODEPAGE =
-      new MAPIProperty(0x3ffd, Types.LONG,  "MessageCodepage", "PR_MESSAGE_CODEPAGE");
-   public static final MAPIProperty MESSAGE_DELIVERY_ID =
-      new MAPIProperty(0x1b, BINARY, "MessageDeliveryId", "PR_MESSAGE_DELIVERY_ID");
-   public static final MAPIProperty MESSAGE_DELIVERY_TIME =
-      new MAPIProperty(0xe06, TIME, "MessageDeliveryTime", "PR_MESSAGE_DELIVERY_TIME");
-   public static final MAPIProperty MESSAGE_DOWNLOAD_TIME =
-      new MAPIProperty(0xe18, LONG, "MessageDownloadTime", "PR_MESSAGE_DOWNLOAD_TIME");
-   public static final MAPIProperty MESSAGE_FLAGS =
-      new MAPIProperty(0xe07, LONG, "MessageFlags", "PR_MESSAGE_FLAGS");
-   public static final MAPIProperty MESSAGE_RECIP_ME =
-      new MAPIProperty(0x59, BOOLEAN, "MessageRecipMe", "PR_MESSAGE_RECIP_ME");
-   public static final MAPIProperty MESSAGE_RECIPIENTS =
-      new MAPIProperty(0xe12, DIRECTORY, "MessageRecipients", "PR_MESSAGE_RECIPIENTS");
-   public static final MAPIProperty MESSAGE_SECURITY_LABEL =
-      new MAPIProperty(30, BINARY, "MessageSecurityLabel", "PR_MESSAGE_SECURITY_LABEL");
-   public static final MAPIProperty MESSAGE_SIZE =
-      new MAPIProperty(0xe08, LONG, "MessageSize", "PR_MESSAGE_SIZE");
-   public static final MAPIProperty MESSAGE_SUBMISSION_ID =
-      new MAPIProperty(0x47, BINARY, "MessageSubmissionId", "PR_MESSAGE_SUBMISSION_ID");
-   public static final MAPIProperty MESSAGE_TO_ME =
-      new MAPIProperty(0x57, BOOLEAN, "MessageToMe", "PR_MESSAGE_TO_ME");
-   public static final MAPIProperty MESSAGE_TOKEN =
-      new MAPIProperty(0xc03, BINARY, "MessageToken", "PR_MESSAGE_TOKEN");
-   public static final MAPIProperty MHS_COMMON_NAME =
-      new MAPIProperty(0x3a0f, ASCII_STRING, "MhsCommonName", "PR_MHS_COMMON_NAME");
-   public static final MAPIProperty MIDDLE_NAME =
-      new MAPIProperty(0x3a44, ASCII_STRING, "MiddleName", "PR_MIDDLE_NAME");
-   public static final MAPIProperty MINI_ICON =
-      new MAPIProperty(0xffc, BINARY, "MiniIcon", "PR_MINI_ICON");
-   public static final MAPIProperty MOBILE_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a1c, ASCII_STRING, "MobileTelephoneNumber", "PR_MOBILE_TELEPHONE_NUMBER");
-   public static final MAPIProperty MODIFY_VERSION =
-      new MAPIProperty(0xe1a, LONG_LONG, "ModifyVersion", "PR_MODIFY_VERSION");
-   public static final MAPIProperty MSG_STATUS =
-      new MAPIProperty(0xe17, LONG, "MsgStatus", "PR_MSG_STATUS");
-   public static final MAPIProperty NDR_DIAG_CODE =
-      new MAPIProperty(0xc05, LONG, "NdrDiagCode", "PR_NDR_DIAG_CODE");
-   public static final MAPIProperty NDR_REASON_CODE =
-      new MAPIProperty(0xc04, LONG, "NdrReasonCode", "PR_NDR_REASON_CODE");
-   public static final MAPIProperty NDR_STATUS_CODE =
-      new MAPIProperty(0xc20, Types.UNKNOWN,  "NdrStatusCode", "PR_NDR_STATUS_CODE");
-   public static final MAPIProperty NEWSGROUP_NAME =
-      new MAPIProperty(0xe24, ASCII_STRING, "NewsgroupName", "PR_NEWSGROUP_NAME");
-   public static final MAPIProperty NICKNAME =
-      new MAPIProperty(0x3a4f, ASCII_STRING, "Nickname", "PR_NICKNAME");
-   public static final MAPIProperty NNTP_XREF =
-      new MAPIProperty(0x1040, ASCII_STRING, "NntpXref", "PR_NNTP_XREF");
-   public static final MAPIProperty NON_RECEIPT_NOTIFICATION_REQUESTED =
-      new MAPIProperty(0xc06, BOOLEAN, "NonReceiptNotificationRequested", "PR_NON_RECEIPT_NOTIFICATION_REQUESTED");
-   public static final MAPIProperty NON_RECEIPT_REASON =
-      new MAPIProperty(0x3e, LONG, "NonReceiptReason", "PR_NON_RECEIPT_REASON");
-   public static final MAPIProperty NORMALIZED_SUBJECT =
-      new MAPIProperty(0xe1d, ASCII_STRING, "NormalizedSubject", "PR_NORMALIZED_SUBJECT");
-   public static final MAPIProperty NT_SECURITY_DESCRIPTOR =
-      new MAPIProperty(0xe27, Types.UNKNOWN,  "NtSecurityDescriptor", "PR_NT_SECURITY_DESCRIPTOR");
-   public static final MAPIProperty NULL =
-      new MAPIProperty(1, LONG, "Null", "PR_NULL");
-   public static final MAPIProperty OBJECT_TYPE =
-      new MAPIProperty(0xffe, LONG, "ObjectType", "PR_Object_TYPE");
-   public static final MAPIProperty OBSOLETED_IPMS =
-      new MAPIProperty(0x1f, BINARY, "ObsoletedIpms", "PR_OBSOLETED_IPMS");
-   public static final MAPIProperty OFFICE2_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a1b, ASCII_STRING, "Office2TelephoneNumber", "PR_OFFICE2_TELEPHONE_NUMBER");
-   public static final MAPIProperty OFFICE_LOCATION =
-      new MAPIProperty(0x3a19, ASCII_STRING, "OfficeLocation", "PR_OFFICE_LOCATION");
-   public static final MAPIProperty OFFICE_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a08, ASCII_STRING, "OfficeTelephoneNumber", "PR_OFFICE_TELEPHONE_NUMBER");
-   public static final MAPIProperty OOF_REPLY_TYPE =
-      new MAPIProperty(0x4080, Types.UNKNOWN,  "OofReplyType", "PR_OOF_REPLY_TYPE");
-   public static final MAPIProperty ORGANIZATIONAL_ID_NUMBER =
-      new MAPIProperty(0x3a10, ASCII_STRING, "OrganizationalIdNumber", "PR_ORGANIZATIONAL_ID_NUMBER");
-   public static final MAPIProperty ORIG_ENTRY_ID =
-      new MAPIProperty(0x300f, Types.UNKNOWN,  "OrigEntryId", "PR_ORIG_ENTRYID");
-   public static final MAPIProperty ORIG_MESSAGE_CLASS =
-      new MAPIProperty(0x4b, ASCII_STRING, "OrigMessageClass", "PR_ORIG_MESSAGE_CLASS");
-   public static final MAPIProperty ORIGIN_CHECK =
-      new MAPIProperty(0x27, BINARY, "OriginCheck", "PR_ORIGIN_CHECK");
-   public static final MAPIProperty ORIGINAL_AUTHOR_ADDRTYPE =
-      new MAPIProperty(0x79, ASCII_STRING, "OriginalAuthorAddrtype", "PR_ORIGINAL_AUTHOR_ADDRTYPE");
-   public static final MAPIProperty ORIGINAL_AUTHOR_EMAIL_ADDRESS =
-      new MAPIProperty(0x7a, ASCII_STRING, "OriginalAuthorEmailAddress", "PR_ORIGINAL_AUTHOR_EMAIL_ADDRESS");
-   public static final MAPIProperty ORIGINAL_AUTHOR_ENTRY_ID =
-      new MAPIProperty(0x4c, BINARY, "OriginalAuthorEntryId", "PR_ORIGINAL_AUTHOR_ENTRYID");
-   public static final MAPIProperty ORIGINAL_AUTHOR_NAME =
-      new MAPIProperty(0x4d, ASCII_STRING, "OriginalAuthorName", "PR_ORIGINAL_AUTHOR_NAME");
-   public static final MAPIProperty ORIGINAL_AUTHOR_SEARCH_KEY =
-      new MAPIProperty(0x56, BINARY, "OriginalAuthorSearchKey", "PR_ORIGINAL_AUTHOR_SEARCH_KEY");
-   public static final MAPIProperty ORIGINAL_DELIVERY_TIME =
-      new MAPIProperty(0x55, TIME, "OriginalDeliveryTime", "PR_ORIGINAL_DELIVERY_TIME");
-   public static final MAPIProperty ORIGINAL_DISPLAY_BCC =
-      new MAPIProperty(0x72, ASCII_STRING, "OriginalDisplayBcc", "PR_ORIGINAL_DISPLAY_BCC");
-   public static final MAPIProperty ORIGINAL_DISPLAY_CC =
-      new MAPIProperty(0x73, ASCII_STRING, "OriginalDisplayCc", "PR_ORIGINAL_DISPLAY_CC");
-   public static final MAPIProperty ORIGINAL_DISPLAY_NAME =
-      new MAPIProperty(0x3a13, ASCII_STRING, "OriginalDisplayName", "PR_ORIGINAL_DISPLAY_NAME");
-   public static final MAPIProperty ORIGINAL_DISPLAY_TO =
-      new MAPIProperty(0x74, ASCII_STRING, "OriginalDisplayTo", "PR_ORIGINAL_DISPLAY_TO");
-   public static final MAPIProperty ORIGINAL_EITS =
-      new MAPIProperty(0x21, BINARY, "OriginalEits", "PR_ORIGINAL_EITS");
-   public static final MAPIProperty ORIGINAL_ENTRY_ID =
-      new MAPIProperty(0x3a12, BINARY, "OriginalEntryId", "PR_ORIGINAL_ENTRYID");
-   public static final MAPIProperty ORIGINAL_SEARCH_KEY =
-      new MAPIProperty(0x3a14, BINARY, "OriginalSearchKey", "PR_ORIGINAL_SEARCH_KEY");
-   public static final MAPIProperty ORIGINAL_SENDER_ADDRTYPE =
-      new MAPIProperty(0x66, ASCII_STRING, "OriginalSenderAddrtype", "PR_ORIGINAL_SENDER_ADDRTYPE");
-   public static final MAPIProperty ORIGINAL_SENDER_EMAIL_ADDRESS =
-      new MAPIProperty(0x67, ASCII_STRING, "OriginalSenderEmailAddress", "PR_ORIGINAL_SENDER_EMAIL_ADDRESS");
-   public static final MAPIProperty ORIGINAL_SENDER_ENTRY_ID =
-      new MAPIProperty(0x5b, BINARY, "OriginalSenderEntryId", "PR_ORIGINAL_SENDER_ENTRYID");
-   public static final MAPIProperty ORIGINAL_SENDER_NAME =
-      new MAPIProperty(90, ASCII_STRING, "OriginalSenderName", "PR_ORIGINAL_SENDER_NAME");
-   public static final MAPIProperty ORIGINAL_SENDER_SEARCH_KEY =
-      new MAPIProperty(0x5c, BINARY, "OriginalSenderSearchKey", "PR_ORIGINAL_SENDER_SEARCH_KEY");
-   public static final MAPIProperty ORIGINAL_SENSITIVITY =
-      new MAPIProperty(0x2e, LONG, "OriginalSensitivity", "PR_ORIGINAL_SENSITIVITY");
-   public static final MAPIProperty ORIGINAL_SENT_REPRESENTING_ADDRTYPE =
-      new MAPIProperty(0x68, ASCII_STRING, "OriginalSentRepresentingAddrtype", "PR_ORIGINAL_SENT_REPRESENTING_ADDRTYPE");
-   public static final MAPIProperty ORIGINAL_SENT_REPRESENTING_EMAIL_ADDRESS =
-      new MAPIProperty(0x69, ASCII_STRING, "OriginalSentRepresentingEmailAddress", "PR_ORIGINAL_SENT_REPRESENTING_EMAIL_ADDRESS");
-   public static final MAPIProperty ORIGINAL_SENT_REPRESENTING_ENTRY_ID =
-      new MAPIProperty(0x5e, BINARY, "OriginalSentRepresentingEntryId", "PR_ORIGINAL_SENT_REPRESENTING_ENTRYID");
-   public static final MAPIProperty ORIGINAL_SENT_REPRESENTING_NAME =
-      new MAPIProperty(0x5d, ASCII_STRING, "OriginalSentRepresentingName", "PR_ORIGINAL_SENT_REPRESENTING_NAME");
-   public static final MAPIProperty ORIGINAL_SENT_REPRESENTING_SEARCH_KEY =
-      new MAPIProperty(0x5f, BINARY, "OriginalSentRepresentingSearchKey", "PR_ORIGINAL_SENT_REPRESENTING_SEARCH_KEY");
-   public static final MAPIProperty ORIGINAL_SUBJECT =
-      new MAPIProperty(0x49, ASCII_STRING, "OriginalSubject", "PR_ORIGINAL_SUBJECT");
-   public static final MAPIProperty ORIGINAL_SUBMIT_TIME =
-      new MAPIProperty(0x4e, TIME, "OriginalSubmitTime", "PR_ORIGINAL_SUBMIT_TIME");
-   public static final MAPIProperty ORIGINALLY_INTENDED_RECIP_ADDRTYPE =
-      new MAPIProperty(0x7b, ASCII_STRING, "OriginallyIntendedRecipAddrtype", "PR_ORIGINALLY_INTENDED_RECIP_ADDRTYPE");
-   public static final MAPIProperty ORIGINALLY_INTENDED_RECIP_EMAIL_ADDRESS =
-      new MAPIProperty(0x7c, ASCII_STRING, "OriginallyIntendedRecipEmailAddress", "PR_ORIGINALLY_INTENDED_RECIP_EMAIL_ADDRESS");
-   public static final MAPIProperty ORIGINALLY_INTENDED_RECIP_ENTRY_ID =
-      new MAPIProperty(0x1012, BINARY, "OriginallyIntendedRecipEntryId", "PR_ORIGINALLY_INTENDED_RECIP_ENTRYID");
-   public static final MAPIProperty ORIGINALLY_INTENDED_RECIPIENT_NAME =
-      new MAPIProperty(0x20, BINARY, "OriginallyIntendedRecipientName", "PR_ORIGINALLY_INTENDED_RECIPIENT_NAME");
-   public static final MAPIProperty ORIGINATING_MTA_CERTIFICATE =
-      new MAPIProperty(0xe25, BINARY, "OriginatingMtaCertificate", "PR_ORIGINATING_MTA_CERTIFICATE");
-   public static final MAPIProperty ORIGINATOR_AND_DL_EXPANSION_HISTORY =
-      new MAPIProperty(0x1002, BINARY, "OriginatorAndDlExpansionHistory", "PR_ORIGINATOR_AND_DL_EXPANSION_HISTORY");
-   public static final MAPIProperty ORIGINATOR_CERTIFICATE =
-      new MAPIProperty(0x22, BINARY, "OriginatorCertificate", "PR_ORIGINATOR_CERTIFICATE");
-   public static final MAPIProperty ORIGINATOR_DELIVERY_REPORT_REQUESTED =
-      new MAPIProperty(0x23, BOOLEAN, "OriginatorDeliveryReportRequested", "PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED");
-   public static final MAPIProperty ORIGINATOR_NON_DELIVERY_REPORT_REQUESTED =
-      new MAPIProperty(0xc08, BOOLEAN, "OriginatorNonDeliveryReportRequested", "PR_ORIGINATOR_NON_DELIVERY_REPORT_REQUESTED");
-   public static final MAPIProperty ORIGINATOR_REQUESTED_ALTERNATE_RECIPIENT =
-      new MAPIProperty(0xc09, BINARY, "OriginatorRequestedAlternateRecipient", "PR_ORIGINATOR_REQUESTED_ALTERNATE_RECIPIENT");
-   public static final MAPIProperty ORIGINATOR_RETURN_ADDRESS =
-      new MAPIProperty(0x24, BINARY, "OriginatorReturnAddress", "PR_ORIGINATOR_RETURN_ADDRESS");
-   public static final MAPIProperty OTHER_ADDRESS_CITY =
-      new MAPIProperty(0x3a5f, ASCII_STRING, "OtherAddressCity", "PR_OTHER_ADDRESS_CITY");
-   public static final MAPIProperty OTHER_ADDRESS_COUNTRY =
-      new MAPIProperty(0x3a60, ASCII_STRING, "OtherAddressCountry", "PR_OTHER_ADDRESS_COUNTRY");
-   public static final MAPIProperty OTHER_ADDRESS_POST_OFFICE_BOX =
-      new MAPIProperty(0x3a64, ASCII_STRING, "OtherAddressPostOfficeBox", "PR_OTHER_ADDRESS_POST_OFFICE_BOX");
-   public static final MAPIProperty OTHER_ADDRESS_POSTAL_CODE =
-      new MAPIProperty(0x3a61, ASCII_STRING, "OtherAddressPostalCode", "PR_OTHER_ADDRESS_POSTAL_CODE");
-   public static final MAPIProperty OTHER_ADDRESS_STATE_OR_PROVINCE =
-      new MAPIProperty(0x3a62, ASCII_STRING, "OtherAddressStateOrProvince", "PR_OTHER_ADDRESS_STATE_OR_PROVINCE");
-   public static final MAPIProperty OTHER_ADDRESS_STREET =
-      new MAPIProperty(0x3a63, ASCII_STRING, "OtherAddressStreet", "PR_OTHER_ADDRESS_STREET");
-   public static final MAPIProperty OTHER_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a1f, ASCII_STRING, "OtherTelephoneNumber", "PR_OTHER_TELEPHONE_NUMBER");
-   public static final MAPIProperty OWN_STORE_ENTRY_ID =
-      new MAPIProperty(0x3e06, BINARY, "OwnStoreEntryId", "PR_OWN_STORE_ENTRYID");
-   public static final MAPIProperty OWNER_APPT_ID =
-      new MAPIProperty(0x62, LONG, "OwnerApptId", "PR_OWNER_APPT_ID");
-   public static final MAPIProperty PAGER_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a21, ASCII_STRING, "PagerTelephoneNumber", "PR_PAGER_TELEPHONE_NUMBER");
-   public static final MAPIProperty PARENT_DISPLAY =
-      new MAPIProperty(0xe05, ASCII_STRING, "ParentDisplay", "PR_PARENT_DISPLAY");
-   public static final MAPIProperty PARENT_ENTRY_ID =
-      new MAPIProperty(0xe09, BINARY, "ParentEntryId", "PR_PARENT_ENTRYID");
-   public static final MAPIProperty PARENT_KEY =
-      new MAPIProperty(0x25, BINARY, "ParentKey", "PR_PARENT_KEY");
-   public static final MAPIProperty PERSONAL_HOME_PAGE =
-      new MAPIProperty(0x3a50, ASCII_STRING, "PersonalHomePage", "PR_PERSONAL_HOME_PAGE");
-   public static final MAPIProperty PHYSICAL_DELIVERY_BUREAU_FAX_DELIVERY =
-      new MAPIProperty(0xc0a, BOOLEAN, "PhysicalDeliveryBureauFaxDelivery", "PR_PHYSICAL_DELIVERY_BUREAU_FAX_DELIVERY");
-   public static final MAPIProperty PHYSICAL_DELIVERY_MODE =
-      new MAPIProperty(0xc0b, LONG, "PhysicalDeliveryMode", "PR_PHYSICAL_DELIVERY_MODE");
-   public static final MAPIProperty PHYSICAL_DELIVERY_REPORT_REQUEST =
-      new MAPIProperty(0xc0c, LONG, "PhysicalDeliveryReportRequest", "PR_PHYSICAL_DELIVERY_REPORT_REQUEST");
-   public static final MAPIProperty PHYSICAL_FORWARDING_ADDRESS =
-      new MAPIProperty(0xc0d, BINARY, "PhysicalForwardingAddress", "PR_PHYSICAL_FORWARDING_ADDRESS");
-   public static final MAPIProperty PHYSICAL_FORWARDING_ADDRESS_REQUESTED =
-      new MAPIProperty(0xc0e, BOOLEAN, "PhysicalForwardingAddressRequested", "PR_PHYSICAL_FORWARDING_ADDRESS_REQUESTED");
-   public static final MAPIProperty PHYSICAL_FORWARDING_PROHIBITED =
-      new MAPIProperty(0xc0f, BOOLEAN, "PhysicalForwardingProhibited", "PR_PHYSICAL_FORWARDING_PROHIBITED");
-   public static final MAPIProperty PHYSICAL_RENDITION_ATTRIBUTES =
-      new MAPIProperty(0xc10, BINARY, "PhysicalRenditionAttributes", "PR_PHYSICAL_RENDITION_ATTRIBUTES");
-   public static final MAPIProperty POST_FOLDER_ENTRIES =
-      new MAPIProperty(0x103b, BINARY, "PostFolderEntries", "PR_POST_FOLDER_ENTRIES");
-   public static final MAPIProperty POST_FOLDER_NAMES =
-      new MAPIProperty(0x103c, ASCII_STRING, "PostFolderNames", "PR_POST_FOLDER_NAMES");
-   public static final MAPIProperty POST_OFFICE_BOX =
-      new MAPIProperty(0x3a2b, ASCII_STRING, "PostOfficeBox", "PR_POST_OFFICE_BOX");
-   public static final MAPIProperty POST_REPLY_DENIED =
-      new MAPIProperty(0x103f, BINARY, "PostReplyDenied", "PR_POST_REPLY_DENIED");
-   public static final MAPIProperty POST_REPLY_FOLDER_ENTRIES =
-      new MAPIProperty(0x103d, BINARY, "PostReplyFolderEntries", "PR_POST_REPLY_FOLDER_ENTRIES");
-   public static final MAPIProperty POST_REPLY_FOLDER_NAMES =
-      new MAPIProperty(0x103e, ASCII_STRING, "PostReplyFolderNames", "PR_POST_REPLY_FOLDER_NAMES");
-   public static final MAPIProperty POSTAL_ADDRESS =
-      new MAPIProperty(0x3a15, ASCII_STRING, "PostalAddress", "PR_POSTAL_ADDRESS");
-   public static final MAPIProperty POSTAL_CODE =
-      new MAPIProperty(0x3a2a, ASCII_STRING, "PostalCode", "PR_POSTAL_CODE");
-   public static final MAPIProperty PREPROCESS =
-      new MAPIProperty(0xe22, BOOLEAN, "Preprocess", "PR_PREPROCESS");
-   public static final MAPIProperty PRIMARY_CAPABILITY =
-      new MAPIProperty(0x3904, BINARY, "PrimaryCapability", "PR_PRIMARY_CAPABILITY");
-   public static final MAPIProperty PRIMARY_FAX_NUMBER =
-      new MAPIProperty(0x3a23, ASCII_STRING, "PrimaryFaxNumber", "PR_PRIMARY_FAX_NUMBER");
-   public static final MAPIProperty PRIMARY_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a1a, ASCII_STRING, "PrimaryTelephoneNumber", "PR_PRIMARY_TELEPHONE_NUMBER");
-   public static final MAPIProperty PRIORITY =
-      new MAPIProperty(0x26, LONG, "Priority", "PR_PRIORITY");
-   public static final MAPIProperty PROFESSION =
-      new MAPIProperty(0x3a46, ASCII_STRING, "Profession", "PR_PROFESSION");
-   public static final MAPIProperty PROFILE_NAME =
-      new MAPIProperty(0x3d12, ASCII_STRING, "ProfileName", "PR_PROFILE_NAME");
-   public static final MAPIProperty PROOF_OF_DELIVERY =
-      new MAPIProperty(0xc11, BINARY, "ProofOfDelivery", "PR_PROOF_OF_DELIVERY");
-   public static final MAPIProperty PROOF_OF_DELIVERY_REQUESTED =
-      new MAPIProperty(0xc12, BOOLEAN, "ProofOfDeliveryRequested", "PR_PROOF_OF_DELIVERY_REQUESTED");
-   public static final MAPIProperty PROOF_OF_SUBMISSION =
-      new MAPIProperty(0xe26, BINARY, "ProofOfSubmission", "PR_PROOF_OF_SUBMISSION");
-   public static final MAPIProperty PROOF_OF_SUBMISSION_REQUESTED =
-      new MAPIProperty(40, BOOLEAN, "ProofOfSubmissionRequested", "PR_PROOF_OF_SUBMISSION_REQUESTED");
-   public static final MAPIProperty PROP_ID_SECURE_MAX =
-      new MAPIProperty(0x67ff, Types.UNKNOWN,  "PropIdSecureMax", "PROP_ID_SECURE_MAX");
-   public static final MAPIProperty PROP_ID_SECURE_MIN =
-      new MAPIProperty(0x67f0, Types.UNKNOWN,  "PropIdSecureMin", "PROP_ID_SECURE_MIN");
-   public static final MAPIProperty PROVIDER_DISPLAY =
-      new MAPIProperty(0x3006, ASCII_STRING, "ProviderDisplay", "PR_PROVIDER_DISPLAY");
-   public static final MAPIProperty PROVIDER_DLL_NAME =
-      new MAPIProperty(0x300a, ASCII_STRING, "ProviderDllName", "PR_PROVIDER_DLL_NAME");
-   public static final MAPIProperty PROVIDER_ORDINAL =
-      new MAPIProperty(0x300d, LONG, "ProviderOrdinal", "PR_PROVIDER_ORDINAL");
-   public static final MAPIProperty PROVIDER_SUBMIT_TIME =
-      new MAPIProperty(0x48, TIME, "ProviderSubmitTime", "PR_PROVIDER_SUBMIT_TIME");
-   public static final MAPIProperty PROVIDER_UID =
-      new MAPIProperty(0x300c, BINARY, "ProviderUid", "PR_PROVIDER_UID");
-   public static final MAPIProperty PUID =
-      new MAPIProperty(0x300e, Types.UNKNOWN, "Puid", "PR_PUID");
-   public static final MAPIProperty RADIO_TELEPHONE_NUMBER =
-      new MAPIProperty(0x3a1d, ASCII_STRING, "RadioTelephoneNumber", "PR_RADIO_TELEPHONE_NUMBER");
-   public static final MAPIProperty RCVD_REPRESENTING_ADDRTYPE =
-      new MAPIProperty(0x77, ASCII_STRING, "RcvdRepresentingAddrtype", "PR_RCVD_REPRESENTING_ADDRTYPE");
-   public static final MAPIProperty RCVD_REPRESENTING_EMAIL_ADDRESS =
-      new MAPIProperty(120, ASCII_STRING, "RcvdRepresentingEmailAddress", "PR_RCVD_REPRESENTING_EMAIL_ADDRESS");
-   public static final MAPIProperty RCVD_REPRESENTING_ENTRY_ID =
-      new MAPIProperty(0x43, BINARY, "RcvdRepresentingEntryId", "PR_RCVD_REPRESENTING_ENTRYID");
-   public static final MAPIProperty RCVD_REPRESENTING_NAME =
-      new MAPIProperty(0x44, ASCII_STRING, "RcvdRepresentingName", "PR_RCVD_REPRESENTING_NAME");
-   public static final MAPIProperty RCVD_REPRESENTING_SEARCH_KEY =
-      new MAPIProperty(0x52, BINARY, "RcvdRepresentingSearchKey", "PR_RCVD_REPRESENTING_SEARCH_KEY");
-   public static final MAPIProperty READ_RECEIPT_ENTRY_ID =
-      new MAPIProperty(70, BINARY, "ReadReceiptEntryId", "PR_READ_RECEIPT_ENTRYID");
-   public static final MAPIProperty READ_RECEIPT_REQUESTED =
-      new MAPIProperty(0x29, BOOLEAN, "ReadReceiptRequested", "PR_READ_RECEIPT_REQUESTED");
-   public static final MAPIProperty READ_RECEIPT_SEARCH_KEY =
-      new MAPIProperty(0x53, BINARY, "ReadReceiptSearchKey", "PR_READ_RECEIPT_SEARCH_KEY");
-   public static final MAPIProperty RECEIPT_TIME =
-      new MAPIProperty(0x2a, TIME, "ReceiptTime", "PR_RECEIPT_TIME");
-   public static final MAPIProperty RECEIVE_FOLDER_SETTINGS =
-      new MAPIProperty(0x3415, DIRECTORY, "ReceiveFolderSettings", "PR_RECEIVE_FOLDER_SETTINGS");
-   public static final MAPIProperty RECEIVED_BY_ADDRTYPE =
-      new MAPIProperty(0x75, ASCII_STRING, "ReceivedByAddrtype", "PR_RECEIVED_BY_ADDRTYPE");
-   public static final MAPIProperty RECEIVED_BY_EMAIL_ADDRESS =
-      new MAPIProperty(0x76, ASCII_STRING, "ReceivedByEmailAddress", "PR_RECEIVED_BY_EMAIL_ADDRESS");
-   public static final MAPIProperty RECEIVED_BY_ENTRY_ID =
-      new MAPIProperty(0x3f, BINARY, "ReceivedByEntryId", "PR_RECEIVED_BY_ENTRYID");
-   public static final MAPIProperty RECEIVED_BY_NAME =
-      new MAPIProperty(0x40, ASCII_STRING, "ReceivedByName", "PR_RECEIVED_BY_NAME");
-   public static final MAPIProperty RECIPIENT_DISPLAY_NAME =
-      new MAPIProperty(0x5ff6, Types.UNICODE_STRING, "RecipientDisplayName", null);
-   public static final MAPIProperty RECIPIENT_ENTRY_ID =
-      new MAPIProperty(0x5ff7, Types.UNKNOWN, "RecipientEntryId", null);
-   public static final MAPIProperty RECIPIENT_FLAGS =
-      new MAPIProperty(0x5ffd, Types.UNKNOWN, "RecipientFlags", null);
-   public static final MAPIProperty RECEIVED_BY_SEARCH_KEY =
-      new MAPIProperty(0x51, BINARY, "ReceivedBySearchKey", "PR_RECEIVED_BY_SEARCH_KEY");
-   public static final MAPIProperty RECIPIENT_CERTIFICATE =
-      new MAPIProperty(0xc13, BINARY, "RecipientCertificate", "PR_RECIPIENT_CERTIFICATE");
-   public static final MAPIProperty RECIPIENT_NUMBER_FOR_ADVICE =
-      new MAPIProperty(0xc14, ASCII_STRING, "RecipientNumberForAdvice", "PR_RECIPIENT_NUMBER_FOR_ADVICE");
-   public static final MAPIProperty RECIPIENT_REASSIGNMENT_PROHIBITED =
-      new MAPIProperty(0x2b, BOOLEAN, "RecipientReassignmentProhibited", "PR_RECIPIENT_REASSIGNMENT_PROHIBITED");
-   public static final MAPIProperty RECIPIENT_STATUS =
-      new MAPIProperty(0xe15, LONG, "RecipientStatus", "PR_RECIPIENT_STATUS");
-   public static final MAPIProperty RECIPIENT_TYPE =
-      new MAPIProperty(0xc15, LONG, "RecipientType", "PR_RECIPIENT_TYPE");
-   public static final MAPIProperty RECORD_KEY =
-      new MAPIProperty(0xff9, BINARY, "RecordKey", "PR_RECORD_KEY");
-   public static final MAPIProperty REDIRECTION_HISTORY =
-      new MAPIProperty(0x2c, BINARY, "RedirectionHistory", "PR_REDIRECTION_HISTORY");
-   public static final MAPIProperty REFERRED_BY_NAME =
-      new MAPIProperty(0x3a47, ASCII_STRING, "ReferredByName", "PR_REFERRED_BY_NAME");
-   public static final MAPIProperty REGISTERED_MAIL_TYPE =
-      new MAPIProperty(0xc16, LONG, "RegisteredMailType", "PR_REGISTERED_MAIL_TYPE");
-   public static final MAPIProperty RELATED_IPMS =
-      new MAPIProperty(0x2d, BINARY, "RelatedIpms", "PR_RELATED_IPMS");
-   public static final MAPIProperty REMOTE_PROGRESS =
-      new MAPIProperty(0x3e0b, LONG, "RemoteProgress", "PR_REMOTE_PROGRESS");
-   public static final MAPIProperty REMOTE_PROGRESS_TEXT =
-      new MAPIProperty(0x3e0c, ASCII_STRING, "RemoteProgressText", "PR_REMOTE_PROGRESS_TEXT");
-   public static final MAPIProperty REMOTE_VALIDATE_OK =
-      new MAPIProperty(0x3e0d, BOOLEAN, "RemoteValidateOk", "PR_REMOTE_VALIDATE_OK");
-   public static final MAPIProperty RENDERING_POSITION =
-      new MAPIProperty(0x370b, LONG, "RenderingPosition", "PR_RENDERING_POSITION");
-   public static final MAPIProperty REPLY_RECIPIENT_ENTRIES =
-      new MAPIProperty(0x4f, BINARY, "ReplyRecipientEntries", "PR_REPLY_RECIPIENT_ENTRIES");
-   public static final MAPIProperty REPLY_RECIPIENT_NAMES =
-      new MAPIProperty(80, ASCII_STRING, "ReplyRecipientNames", "PR_REPLY_RECIPIENT_NAMES");
-   public static final MAPIProperty REPLY_REQUESTED =
-      new MAPIProperty(0xc17, BOOLEAN, "ReplyRequested", "PR_REPLY_REQUESTED");
-   public static final MAPIProperty REPLY_TIME =
-      new MAPIProperty(0x30, TIME, "ReplyTime", "PR_REPLY_TIME");
-   public static final MAPIProperty REPORT_ENTRY_ID =
-      new MAPIProperty(0x45, BINARY, "ReportEntryId", "PR_REPORT_ENTRYID");
-   public static final MAPIProperty REPORT_NAME =
-      new MAPIProperty(0x3a, ASCII_STRING, "ReportName", "PR_REPORT_NAME");
-   public static final MAPIProperty REPORT_SEARCH_KEY =
-      new MAPIProperty(0x54, BINARY, "ReportSearchKey", "PR_REPORT_SEARCH_KEY");
-   public static final MAPIProperty REPORT_TAG =
-      new MAPIProperty(0x31, BINARY, "ReportTag", "PR_REPORT_TAG");
-   public static final MAPIProperty REPORT_TEXT =
-      new MAPIProperty(0x1001, ASCII_STRING, "ReportText", "PR_REPORT_TEXT");
-   public static final MAPIProperty REPORT_TIME =
-      new MAPIProperty(50, TIME, "ReportTime", "PR_REPORT_TIME");
-   public static final MAPIProperty REPORTING_DL_NAME =
-      new MAPIProperty(0x1003, BINARY, "ReportingDlName", "PR_REPORTING_DL_NAME");
-   public static final MAPIProperty REPORTING_MTA_CERTIFICATE =
-      new MAPIProperty(0x1004, BINARY, "ReportingMtaCertificate", "PR_REPORTING_MTA_CERTIFICATE");
-   public static final MAPIProperty REQUESTED_DELIVERY_METHOD =
-      new MAPIProperty(0xc18, LONG, "RequestedDeliveryMethod", "PR_REQUESTED_DELIVERY_METHOD");
-   public static final MAPIProperty RESOURCE_FLAGS =
-      new MAPIProperty(0x3009, LONG, "ResourceFlags", "PR_RESOURCE_FLAGS");
-   public static final MAPIProperty RESOURCE_METHODS =
-      new MAPIProperty(0x3e02, LONG, "ResourceMethods", "PR_RESOURCE_METHODS");
-   public static final MAPIProperty RESOURCE_PATH =
-      new MAPIProperty(0x3e07, ASCII_STRING, "ResourcePath", "PR_RESOURCE_PATH");
-   public static final MAPIProperty RESOURCE_TYPE =
-      new MAPIProperty(0x3e03, LONG, "ResourceType", "PR_RESOURCE_TYPE");
-   public static final MAPIProperty RESPONSE_REQUESTED =
-      new MAPIProperty(0x63, BOOLEAN, "ResponseRequested", "PR_RESPONSE_REQUESTED");
-   public static final MAPIProperty RESPONSIBILITY =
-      new MAPIProperty(0xe0f, BOOLEAN, "Responsibility", "PR_RESPONSIBILITY");
-   public static final MAPIProperty RETURNED_IPM =
-      new MAPIProperty(0x33, BOOLEAN, "ReturnedIpm", "PR_RETURNED_IPM");
-   public static final MAPIProperty ROW_TYPE =
-      new MAPIProperty(0xff5, LONG, "RowType", "PR_ROW_TYPE");
-   public static final MAPIProperty ROWID =
-      new MAPIProperty(0x3000, LONG, "Rowid", "PR_ROWID");
-   public static final MAPIProperty RTF_COMPRESSED =
-      new MAPIProperty(0x1009, BINARY, "RtfCompressed", "PR_RTF_COMPRESSED");
-   public static final MAPIProperty RTF_IN_SYNC =
-      new MAPIProperty(0xe1f, BOOLEAN, "RtfInSync", "PR_RTF_IN_SYNC");
-   public static final MAPIProperty RTF_SYNC_BODY_COUNT =
-      new MAPIProperty(0x1007, LONG, "RtfSyncBodyCount", "PR_RTF_SYNC_BODY_COUNT");
-   public static final MAPIProperty RTF_SYNC_BODY_CRC =
-      new MAPIProperty(0x1006, LONG, "RtfSyncBodyCrc", "PR_RTF_SYNC_BODY_CRC");
-   public static final MAPIProperty RTF_SYNC_BODY_TAG =
-      new MAPIProperty(0x1008, ASCII_STRING, "RtfSyncBodyTag", "PR_RTF_SYNC_BODY_TAG");
-   public static final MAPIProperty RTF_SYNC_PREFIX_COUNT =
-      new MAPIProperty(0x1010, LONG, "RtfSyncPrefixCount", "PR_RTF_SYNC_PREFIX_COUNT");
-   public static final MAPIProperty RTF_SYNC_TRAILING_COUNT =
-      new MAPIProperty(0x1011, LONG, "RtfSyncTrailingCount", "PR_RTF_SYNC_TRAILING_COUNT");
-   public static final MAPIProperty SEARCH =
-      new MAPIProperty(0x3607, DIRECTORY, "Search", "PR_SEARCH");
-   public static final MAPIProperty SEARCH_KEY =
-      new MAPIProperty(0x300b, BINARY, "SearchKey", "PR_SEARCH_KEY");
-   public static final MAPIProperty SECURITY =
-      new MAPIProperty(0x34, LONG, "Security", "PR_SECURITY");
-   public static final MAPIProperty SELECTABLE =
-      new MAPIProperty(0x3609, BOOLEAN, "Selectable", "PR_SELECTABLE");
-   public static final MAPIProperty SEND_INTERNET_ENCODING =
-      new MAPIProperty(0x3a71, LONG, "SendInternetEncoding", "PR_SEND_INTERNET_ENCODING");
-   public static final MAPIProperty SEND_RECALL_REPORT =
-      new MAPIProperty(0x6803, Types.UNKNOWN, "SendRecallReport", "messages");
-   public static final MAPIProperty SEND_RICH_INFO =
-      new MAPIProperty(0x3a40, BOOLEAN, "SendRichInfo", "PR_SEND_RICH_INFO");
-   public static final MAPIProperty SENDER_ADDRTYPE =
-      new MAPIProperty(0xc1e, ASCII_STRING, "SenderAddrtype", "PR_SENDER_ADDRTYPE");
-   public static final MAPIProperty SENDER_EMAIL_ADDRESS =
-      new MAPIProperty(0xc1f, ASCII_STRING, "SenderEmailAddress", "PR_SENDER_EMAIL_ADDRESS");
-   public static final MAPIProperty SENDER_ENTRY_ID =
-      new MAPIProperty(0xc19, BINARY, "SenderEntryId", "PR_SENDER_ENTRYID");
-   public static final MAPIProperty SENDER_NAME =
-      new MAPIProperty(0xc1a, ASCII_STRING, "SenderName", "PR_SENDER_NAME");
-   public static final MAPIProperty SENDER_SEARCH_KEY =
-      new MAPIProperty(0xc1d, BINARY, "SenderSearchKey", "PR_SENDER_SEARCH_KEY");
-   public static final MAPIProperty SENSITIVITY =
-      new MAPIProperty(0x36, LONG, "Sensitivity", "PR_SENSITIVITY");
-   public static final MAPIProperty SENT_REPRESENTING_ADDRTYPE =
-      new MAPIProperty(100, ASCII_STRING, "SentRepresentingAddrtype", "PR_SENT_REPRESENTING_ADDRTYPE");
-   public static final MAPIProperty SENT_REPRESENTING_EMAIL_ADDRESS =
-      new MAPIProperty(0x65, ASCII_STRING, "SentRepresentingEmailAddress", "PR_SENT_REPRESENTING_EMAIL_ADDRESS");
-   public static final MAPIProperty SENT_REPRESENTING_ENTRY_ID =
-      new MAPIProperty(0x41, BINARY, "SentRepresentingEntryId", "PR_SENT_REPRESENTING_ENTRYID");
-   public static final MAPIProperty SENT_REPRESENTING_NAME =
-      new MAPIProperty(0x42, ASCII_STRING, "SentRepresentingName", "PR_SENT_REPRESENTING_NAME");
-   public static final MAPIProperty SENT_REPRESENTING_SEARCH_KEY =
-      new MAPIProperty(0x3b, BINARY, "SentRepresentingSearchKey", "PR_SENT_REPRESENTING_SEARCH_KEY");
-   public static final MAPIProperty SENTMAIL_ENTRY_ID =
-      new MAPIProperty(0xe0a, BINARY, "SentmailEntryId", "PR_SENTMAIL_ENTRYID");
-   public static final MAPIProperty SERVICE_DELETE_FILES =
-      new MAPIProperty(0x3d10, Types.createCustom(4126), "ServiceDeleteFiles", "PR_SERVICE_DELETE_FILES");
-   public static final MAPIProperty SERVICE_DLL_NAME =
-      new MAPIProperty(0x3d0a, ASCII_STRING, "ServiceDllName", "PR_SERVICE_DLL_NAME");
-   public static final MAPIProperty SERVICE_ENTRY_NAME =
-      new MAPIProperty(0x3d0b, ASCII_STRING, "ServiceEntryName", "PR_SERVICE_ENTRY_NAME");
-   public static final MAPIProperty SERVICE_EXTRA_UIDS =
-      new MAPIProperty(0x3d0d, BINARY, "ServiceExtraUids", "PR_SERVICE_EXTRA_UIDS");
-   public static final MAPIProperty SERVICE_NAME =
-      new MAPIProperty(0x3d09, ASCII_STRING, "ServiceName", "PR_SERVICE_NAME");
-   public static final MAPIProperty SERVICE_SUPPORT_FILES =
-      new MAPIProperty(0x3d0f, Types.createCustom(4126), "ServiceSupportFiles", "PR_SERVICE_SUPPORT_FILES");
-   public static final MAPIProperty SERVICE_UID =
-      new MAPIProperty(0x3d0c, BINARY, "ServiceUid", "PR_SERVICE_UID");
-   public static final MAPIProperty SERVICES =
-      new MAPIProperty(0x3d0e, BINARY, "Services", "PR_SERVICES");
-   public static final MAPIProperty SEVEN_BIT_DISPLAY_NAME =
-      new MAPIProperty(0x39ff, ASCII_STRING, "SevenBitDisplayName", "PR_SEVEN_BIT_DISPLAY_NAME");
-   public static final MAPIProperty SMTP_ADDRESS =
-      new MAPIProperty(0x39fe, Types.UNICODE_STRING, "SmtpAddress", "PR_SMTP_ADDRESS");
-   public static final MAPIProperty SPOOLER_STATUS =
-      new MAPIProperty(0xe10, LONG, "SpoolerStatus", "PR_SPOOLER_STATUS");
-   public static final MAPIProperty SPOUSE_NAME =
-      new MAPIProperty(0x3a48, ASCII_STRING, "SpouseName", "PR_SPOUSE_NAME");
-   public static final MAPIProperty START_DATE =
-      new MAPIProperty(0x60, TIME, "StartDate", "PR_START_DATE");
-   public static final MAPIProperty STATE_OR_PROVINCE =
-      new MAPIProperty(0x3a28, ASCII_STRING, "StateOrProvince", "PR_STATE_OR_PROVINCE");
-   public static final MAPIProperty STATUS =
-      new MAPIProperty(0x360b, LONG, "Status", "PR_STATUS");
-   public static final MAPIProperty STATUS_CODE =
-      new MAPIProperty(0x3e04, LONG, "StatusCode", "PR_STATUS_CODE");
-   public static final MAPIProperty STATUS_STRING =
-      new MAPIProperty(0x3e08, ASCII_STRING, "StatusString", "PR_STATUS_STRING");
-   public static final MAPIProperty STORE_ENTRY_ID =
-      new MAPIProperty(0xffb, BINARY, "StoreEntryId", "PR_STORE_ENTRYID");
-   public static final MAPIProperty STORE_PROVIDERS =
-      new MAPIProperty(0x3d00, BINARY, "StoreProviders", "PR_STORE_PROVIDERS");
-   public static final MAPIProperty STORE_RECORD_KEY =
-      new MAPIProperty(0xffa, BINARY, "StoreRecordKey", "PR_STORE_RECORD_KEY");
-   public static final MAPIProperty STORE_STATE =
-      new MAPIProperty(0x340e, LONG, "StoreState", "PR_STORE_STATE");
-   public static final MAPIProperty STORE_SUPPORT_MASK =
-      new MAPIProperty(0x340d, LONG, "StoreSupportMask", "PR_STORE_SUPPORT_MASK");
-   public static final MAPIProperty STREET_ADDRESS =
-      new MAPIProperty(0x3a29, ASCII_STRING, "StreetAddress", "PR_STREET_ADDRESS");
-   public static final MAPIProperty SUBFOLDERS =
-      new MAPIProperty(0x360a, BOOLEAN, "Subfolders", "PR_SUBFOLDERS");
-   public static final MAPIProperty SUBJECT =
-      new MAPIProperty(0x37, ASCII_STRING, "Subject", "PR_SUBJECT");
-   public static final MAPIProperty SUBJECT_IPM =
-      new MAPIProperty(0x38, BINARY, "SubjectIpm", "PR_SUBJECT_IPM");
-   public static final MAPIProperty SUBJECT_PREFIX =
-      new MAPIProperty(0x3d, ASCII_STRING, "SubjectPrefix", "PR_SUBJECT_PREFIX");
-   public static final MAPIProperty SUBMIT_FLAGS =
-      new MAPIProperty(0xe14, LONG, "SubmitFlags", "PR_SUBMIT_FLAGS");
-   public static final MAPIProperty SUPERSEDES =
-      new MAPIProperty(0x103a, ASCII_STRING, "Supersedes", "PR_SUPERSEDES");
-   public static final MAPIProperty SUPPLEMENTARY_INFO =
-      new MAPIProperty(0xc1b, ASCII_STRING, "SupplementaryInfo", "PR_SUPPLEMENTARY_INFO");
-   public static final MAPIProperty SURNAME =
-      new MAPIProperty(0x3a11, ASCII_STRING, "Surname", "PR_SURNAME");
-   public static final MAPIProperty TELEX_NUMBER =
-      new MAPIProperty(0x3a2c, ASCII_STRING, "TelexNumber", "PR_TELEX_NUMBER");
-   public static final MAPIProperty TEMPLATEID =
-      new MAPIProperty(0x3902, BINARY, "Templateid", "PR_TEMPLATEID");
-   public static final MAPIProperty TITLE =
-      new MAPIProperty(0x3a17, ASCII_STRING, "Title", "PR_TITLE");
-   public static final MAPIProperty TNEF_CORRELATION_KEY =
-      new MAPIProperty(0x7f, BINARY, "TnefCorrelationKey", "PR_TNEF_CORRELATION_KEY");
-   public static final MAPIProperty TRANSMITABLE_DISPLAY_NAME =
-      new MAPIProperty(0x3a20, ASCII_STRING, "TransmitableDisplayName", "PR_TRANSMITABLE_DISPLAY_NAME");
-   public static final MAPIProperty TRANSPORT_KEY =
-      new MAPIProperty(0xe16, LONG, "TransportKey", "PR_TRANSPORT_KEY");
-   public static final MAPIProperty TRANSPORT_MESSAGE_HEADERS =
-      new MAPIProperty(0x7d, ASCII_STRING, "TransportMessageHeaders", "PR_TRANSPORT_MESSAGE_HEADERS");
-   public static final MAPIProperty TRANSPORT_PROVIDERS =
-      new MAPIProperty(0x3d02, BINARY, "TransportProviders", "PR_TRANSPORT_PROVIDERS");
-   public static final MAPIProperty TRANSPORT_STATUS =
-      new MAPIProperty(0xe11, LONG, "TransportStatus", "PR_TRANSPORT_STATUS");
-   public static final MAPIProperty TTYTDD_PHONE_NUMBER =
-      new MAPIProperty(0x3a4b, ASCII_STRING, "TtytddPhoneNumber", "PR_TTYTDD_PHONE_NUMBER");
-   public static final MAPIProperty TYPE_OF_MTS_USER =
-      new MAPIProperty(0xc1c, LONG, "TypeOfMtsUser", "PR_TYPE_OF_MTS_USER");
-   public static final MAPIProperty USER_CERTIFICATE =
-      new MAPIProperty(0x3a22, BINARY, "UserCertificate", "PR_USER_CERTIFICATE");
-   public static final MAPIProperty USER_X509_CERTIFICATE =
-      new MAPIProperty(0x3a70, Types.createCustom(4354), "UserX509Certificate", "PR_USER_X509_CERTIFICATE");
-   public static final MAPIProperty VALID_FOLDER_MASK =
-      new MAPIProperty(0x35df, LONG, "ValidFolderMask", "PR_VALID_FOLDER_MASK");
-   public static final MAPIProperty VIEWS_ENTRY_ID =
-      new MAPIProperty(0x35e5, BINARY, "ViewsEntryId", "PR_VIEWS_ENTRYID");
-   public static final MAPIProperty WEDDING_ANNIVERSARY =
-      new MAPIProperty(0x3a41, TIME, "WeddingAnniversary", "PR_WEDDING_ANNIVERSARY");
-   public static final MAPIProperty X400_CONTENT_TYPE =
-      new MAPIProperty(60, BINARY, "X400ContentType", "PR_X400_CONTENT_TYPE");
-   public static final MAPIProperty X400_DEFERRED_DELIVERY_CANCEL =
-      new MAPIProperty(0x3e09, BOOLEAN, "X400DeferredDeliveryCancel", "PR_X400_DEFERRED_DELIVERY_CANCEL");
-   public static final MAPIProperty XPOS =
-      new MAPIProperty(0x3f05, LONG, "Xpos", "PR_XPOS");
-   public static final MAPIProperty YPOS =
-      new MAPIProperty(0x3f06, LONG, "Ypos", "PR_YPOS");
-   
-   public static final MAPIProperty UNKNOWN =
-      new MAPIProperty(-1, Types.UNKNOWN, "Unknown", null);
-   
-   // 0x8??? ones are outlook specific, and not standard MAPI
-   // TODO See http://msdn.microsoft.com/en-us/library/ee157150%28v=exchg.80%29 for some
-   //  info on how we might decode them properly in the future
-   private static final int ID_FIRST_CUSTOM = 0x8000;
-   private static final int ID_LAST_CUSTOM = 0xFFFE;
-   
-   /* ---------------------------------------------------------------------  */
-   
-   public final int id;
-   public final MAPIType usualType;
-   public final String name;
-   public final String mapiProperty;
-   
-   private MAPIProperty(int id, MAPIType usualType, String name, String mapiProperty) {
-      this.id = id;
-      this.usualType = usualType;
-      this.name = name;
-      this.mapiProperty = mapiProperty;
-      
-      // If it isn't unknown or custom, store it for lookup
-      if(id == -1 || (id >= ID_FIRST_CUSTOM && id <= ID_LAST_CUSTOM) 
-            || (this instanceof CustomMAPIProperty)) {
-         // Custom/Unknown, skip
-      } else {
-         if(attributes.containsKey(id)) {
-            throw new IllegalArgumentException(
-                  "Duplicate MAPI Property with ID " + id + " : " +
-                  toString() + " vs " + attributes.get(id).toString()
-            );
-         }
-         attributes.put(id, this);
-      }
-   }
-   
-   public String asFileName() {
-      String str = Integer.toHexString(id).toUpperCase(Locale.ROOT);
-      while(str.length() < 4) {
-         str = "0" + str;
-      }
-      return str + usualType.asFileEnding();
-   }
-
-   public String toString() {
-      StringBuffer str = new StringBuffer();
-      str.append(name);
-      str.append(" [");
-      str.append(id);
-      str.append("]");
-      if(mapiProperty != null) {
-         str.append(" (");
-         str.append(mapiProperty);
-         str.append(")");
-      }
-      return str.toString();
-   }
-   
-   public static MAPIProperty get(int id) {
-      MAPIProperty attr = attributes.get(id);
-      if(attr != null) {
-         return attr;
-      } else {
-         return UNKNOWN;
-      }
-   }
-   public static Collection<MAPIProperty> getAll() {
-      return Collections.unmodifiableCollection( attributes.values() );
-   }
-   
-   public static MAPIProperty createCustom(int id, MAPIType type, String name) {
-      return new CustomMAPIProperty(id, type, name, null);
-   }
-   
-   private static class CustomMAPIProperty extends MAPIProperty {
-      private CustomMAPIProperty(int id, MAPIType usualType, String name, String mapiProperty) {
-         super(id, usualType, name, mapiProperty);
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
deleted file mode 100644
index dbf77c5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A {@link PropertiesChunk} for a Message or Embedded-Message.
- * This has a 32 byte header
- */
-public class MessagePropertiesChunk extends PropertiesChunk {
-   private long nextRecipientId;
-   private long nextAttachmentId;
-   private long recipientCount;
-   private long attachmentCount;
-
-   public MessagePropertiesChunk(ChunkGroup parentGroup) {
-      super(parentGroup);
-   }
-   
-   public long getNextRecipientId() {
-      return nextRecipientId;
-   }
-   public long getNextAttachmentId() {
-      return nextAttachmentId;
-   }
-
-   public long getRecipientCount() {
-      return recipientCount;
-   }
-   public long getAttachmentCount() {
-      return attachmentCount;
-   }
-
-   @Override
-   public void readValue(InputStream stream) throws IOException {
-      // 8 bytes of reserved zeros
-      LittleEndian.readLong(stream);
-      
-      // Nexts and counts
-      nextRecipientId = LittleEndian.readUInt(stream);
-      nextAttachmentId = LittleEndian.readUInt(stream);
-      recipientCount = LittleEndian.readUInt(stream);
-      attachmentCount = LittleEndian.readUInt(stream);
-      
-      // 8 bytes of reserved zeros
-      LittleEndian.readLong(stream);
-      
-      // Now properties
-      readProperties(stream);
-   }
-
-   @Override
-   public void writeValue(OutputStream out) throws IOException {
-      // 8 bytes of reserved zeros
-      out.write(new byte[8]);
-      
-      // Nexts and counts
-      LittleEndian.putUInt(nextRecipientId, out);
-      LittleEndian.putUInt(nextAttachmentId, out);
-      LittleEndian.putUInt(recipientCount, out);
-      LittleEndian.putUInt(attachmentCount, out);
-      
-      // 8 bytes of reserved zeros
-      out.write(new byte[8]);
-      
-      // Now properties
-      writeProperties(out);
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
deleted file mode 100644
index fa81d55..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.Calendar;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * A Chunk that holds the details given back by the
- *  server at submission time.
- * This includes the date the message was given to the
- *  server, and an ID that's used if you want to cancel
- *  a message or similar
- */
-public class MessageSubmissionChunk extends Chunk {
-   private static POILogger logger = POILogFactory.getLogger(MessageSubmissionChunk.class);
-   private String rawId;
-   private Calendar date;
-
-   private static final Pattern datePatern = 
-            Pattern.compile("(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)Z?"); 
-
-   /**
-    * Creates a Byte Chunk.
-    */
-   public MessageSubmissionChunk(String namePrefix, int chunkId, MAPIType type) {
-      super(namePrefix, chunkId, type);
-   }
-
-   /**
-    * Create a Byte Chunk, with the specified
-    *  type.
-    */
-   public MessageSubmissionChunk(int chunkId, MAPIType type) {
-      super(chunkId, type);
-   }
-
-   public void readValue(InputStream value) throws IOException {
-      // Stored in the file as us-ascii
-     byte[] data = IOUtils.toByteArray(value); 
-     rawId = new String(data, Charset.forName("ASCII"));
-      
-      // Now process the date
-      String[] parts = rawId.split(";");
-      for(String part : parts) {
-         if(part.startsWith("l=")) {
-            // Format of this bit appears to be l=<id>-<time>-<number>
-            // ID may contain hyphens.
-
-            String dateS = null;
-            final int numberPartBegin = part.lastIndexOf('-');
-            if (numberPartBegin != -1) {
-                final int datePartBegin = part.lastIndexOf('-', numberPartBegin-1);
-                if (datePartBegin != -1 && 
-                        // cannot extract date if only one hyphen is in the string...
-                        numberPartBegin > datePartBegin) {
-                    dateS = part.substring(datePartBegin + 1, numberPartBegin);
-                }
-            }
-            if (dateS != null) {
-               // Should be yymmddhhmmssZ
-               Matcher m = datePatern.matcher(dateS);
-               if(m.matches()) {
-                  date = LocaleUtil.getLocaleCalendar();
-
-                  // work around issues with dates like 1989, which appear as "89" here
-                  int year = Integer.parseInt(m.group(1));
-                  date.set(Calendar.YEAR,  year + (year > 80 ? 1900 : 2000));
-
-                  date.set(Calendar.MONTH, Integer.parseInt(m.group(2)) - 1); // Java is 0 based
-                  date.set(Calendar.DATE,  Integer.parseInt(m.group(3)));
-                  date.set(Calendar.HOUR_OF_DAY, Integer.parseInt(m.group(4)));
-                  date.set(Calendar.MINUTE,      Integer.parseInt(m.group(5)));
-                  date.set(Calendar.SECOND,      Integer.parseInt(m.group(6)));
-                  date.clear(Calendar.MILLISECOND);
-               } else {
-            	   logger.log(POILogger.WARN, "Warning - unable to make sense of date " + dateS);
-               }
-            }
-         }
-      }
-   }
-
-   public void writeValue(OutputStream out) throws IOException {
-     byte[] data = rawId.getBytes(Charset.forName("ASCII")); 
-     out.write(data);
-   }
-   
-   /**
-    * @return the date that the server accepted the
-    *  message, as found from the message ID it generated.
-    *
-    */
-   public Calendar getAcceptedAtTime() {
-      return date;
-   }
-   
-   /**
-    * @return the full ID that the server generated when
-    *  it accepted the message.
-    */
-   public String getSubmissionId() {
-      return rawId;
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java
deleted file mode 100644
index a976d93..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Collection of convenience chunks for the
- *  NameID part of an outlook file
- */
-public final class NameIdChunks implements ChunkGroup {
-   public static final String NAME = "__nameid_version1.0";
-   
-   /** Holds all the chunks that were found. */
-   private List<Chunk> allChunks = new ArrayList<Chunk>();
-   
-   public Chunk[] getAll() {
-      return allChunks.toArray(new Chunk[allChunks.size()]);
-   }
-   public Chunk[] getChunks() {
-      return getAll();
-   }
-	
-   /**
-    * Called by the parser whenever a chunk is found.
-    */
-   public void record(Chunk chunk) {
-      allChunks.add(chunk);
-   }
-   
-   /**
-    * Used to flag that all the chunks of the NameID
-    *  have now been located.
-    */
-   public void chunksComplete() {
-      // Currently, we don't need to do anything special once
-      //  all the chunks have been located
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
deleted file mode 100644
index 076c15f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hsmf.datatypes.PropertyValue.BooleanPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.CurrencyPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.DoublePropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.FloatPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.LongLongPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.LongPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.NullPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.ShortPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.TimePropertyValue;
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndian.BufferUnderrunException;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * <p>A Chunk which holds (single) fixed-length properties, and pointer
- *  to the variable length ones / multi-valued ones (which get their 
- *  own chunk).
- * <p>There are two kinds of PropertiesChunks, which differ only in 
- *  their headers.
- */
-public abstract class PropertiesChunk extends Chunk {
-   public static final String NAME = "__properties_version1.0";
-   
-   /** For logging problems we spot with the file */
-   private POILogger logger = POILogFactory.getLogger(PropertiesChunk.class);
-
-   /**
-    * Holds properties, indexed by type. If a property is multi-valued,
-    *  or variable length, it will be held via a {@link ChunkBasedPropertyValue}.
-    */
-   private Map<MAPIProperty, PropertyValue> properties = 
-         new HashMap<MAPIProperty, PropertyValue>();
-
-   /**
-    * The ChunkGroup that these properties apply to. Used when
-    *  matching chunks to variable sized and multi-valued properties
-    */
-   private ChunkGroup parentGroup;
-   
-   /**
-    * Creates a Properties Chunk.
-    */
-   protected PropertiesChunk(ChunkGroup parentGroup) {
-       super(NAME, -1, Types.UNKNOWN);
-       this.parentGroup = parentGroup;
-   }
-
-   @Override
-   public String getEntryName() {
-       return NAME;
-   }
-	
-   /**
-    * Returns all the properties in the chunk, without
-    *  looking up any chunk-based values
-    */
-   public Map<MAPIProperty, PropertyValue> getRawProperties() {
-      return properties;
-   }
-
-   /**
-    * <p>Returns all the properties in the chunk, along with their
-    *  values.
-    * <p>Any chunk-based values will be looked up and returned as such
-    */
-   public Map<MAPIProperty, List<PropertyValue>> getProperties() {
-       Map<MAPIProperty, List<PropertyValue>> props = 
-               new HashMap<MAPIProperty, List<PropertyValue>>(properties.size());
-       for (MAPIProperty prop : properties.keySet()) {
-           props.put(prop, getValues(prop));
-       }
-       return props;
-   }
-
-   /**
-    * Returns all values for the given property, looking up chunk based
-    *  ones as required, of null if none exist
-    */
-   public List<PropertyValue> getValues(MAPIProperty property) {
-       PropertyValue val = properties.get(property);
-       if (val == null) {
-           return null;
-       }
-       if (val instanceof ChunkBasedPropertyValue) {
-           // ChunkBasedPropertyValue cval = (ChunkBasedPropertyValue)val;
-           // TODO Lookup
-           return Collections.emptyList();
-       } else {
-           return Collections.singletonList(val);
-       }
-   }
-
-   /**
-    * Returns the value / pointer to the value chunk of 
-    *  the property, or null if none exists
-    */
-   public PropertyValue getRawValue(MAPIProperty property) {
-       return properties.get(property);
-   }
-	
-   /**
-    * Called once the parent ChunkGroup has been populated, to match
-    *  up the Chunks in it with our Variable Sized Properties.
-    */
-   protected void matchVariableSizedPropertiesToChunks() {
-      // Index the Parent Group chunks for easy lookup
-      // TODO Is this the right way?
-      Map<Integer,Chunk> chunks = new HashMap<Integer, Chunk>();
-      for (Chunk chunk : parentGroup.getChunks()) {
-         chunks.put(chunk.chunkId, chunk);
-      }
-      
-      // Loop over our values, looking for chunk based ones
-      for (PropertyValue val : properties.values()) {
-           if (val instanceof ChunkBasedPropertyValue) {
-              ChunkBasedPropertyValue cVal = (ChunkBasedPropertyValue)val;
-              Chunk chunk = chunks.get(cVal.getProperty().id);
-//System.err.println(cVal.getProperty() + " = " + cVal + " -> " + HexDump.toHex(cVal.data));                  
-                  
-              // TODO Make sense of the raw offset value
-              
-              if (chunk != null) {
-                 cVal.setValue(chunk);
-              } else {
-                 logger.log(POILogger.WARN, "No chunk found matching Property " + cVal);
-              }
-         }
-      }
-   }
-
-   protected void readProperties(InputStream value) throws IOException {
-      boolean going = true;
-      while (going) {
-         try {
-            // Read in the header
-            int typeID = LittleEndian.readUShort(value);
-            int id     = LittleEndian.readUShort(value);
-            long flags = LittleEndian.readUInt(value);
-            
-            // Turn the Type and ID into helper objects
-            MAPIType type = Types.getById(typeID);
-            MAPIProperty prop = MAPIProperty.get(id);
-            
-            // Wrap properties we don't know about as custom ones
-            if (prop == MAPIProperty.UNKNOWN) {
-                prop = MAPIProperty.createCustom(id, type, "Unknown " + id);
-            }
-            if (type == null) {
-                logger.log(POILogger.WARN, "Invalid type found, expected ", prop.usualType, 
-                        " but got ", typeID, " for property ", prop);
-                going = false;
-                break;
-            }
-            
-            // Sanity check the property's type against the value's type
-            if (prop.usualType != type) {
-                // Is it an allowed substitution?
-                if (type == Types.ASCII_STRING && prop.usualType == Types.UNICODE_STRING ||
-                    type == Types.UNICODE_STRING && prop.usualType == Types.ASCII_STRING) {
-                    // It's fine to go with the specified instead of the normal
-                } else if (prop.usualType == Types.UNKNOWN) {
-                    // We don't know what this property normally is, but it has come
-                    // through with a valid type, so use that
-                    logger.log(POILogger.INFO, "Property definition for ", prop, 
-                            " is missing a type definition, found a value with type ", type);
-                } else {
-                   // Oh dear, something has gone wrong...
-                   logger.log(POILogger.WARN, "Type mismatch, expected ", prop.usualType, 
-                              " but got ", type, " for property ", prop);
-                   going = false;
-                   break;
-                }
-            }
-            
-            // TODO Detect if it is multi-valued, since if it is
-            //  then even fixed-length strings store their multiple
-            //  values in another chunk (much as variable length ones)
-            
-            // Work out how long the "data" is
-            // This might be the actual data, or just a pointer
-            //  to another chunk which holds the data itself
-            boolean isPointer = false;
-            int length = type.getLength();
-            if (! type.isFixedLength()) {
-               isPointer = true;
-               length = 8;
-            }
-            
-            // Grab the data block
-            byte[] data = new byte[length];
-            IOUtils.readFully(value, data);
-            
-            // Skip over any padding
-            if (length < 8) {
-                byte[] padding = new byte[8-length];
-                IOUtils.readFully(value, padding);
-            }
-            
-            // Wrap and store
-            PropertyValue propVal = null;
-            if (isPointer) {
-                // We'll match up the chunk later
-                propVal = new ChunkBasedPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.NULL) {
-                propVal = new NullPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.BOOLEAN) {
-                propVal = new BooleanPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.SHORT) {
-                propVal = new ShortPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.LONG) {
-                propVal = new LongPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.LONG_LONG) {
-                propVal = new LongLongPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.FLOAT) {
-                propVal = new FloatPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.DOUBLE) {
-                propVal = new DoublePropertyValue(prop, flags, data);
-            }
-            else if (type == Types.CURRENCY) {
-                propVal = new CurrencyPropertyValue(prop, flags, data);
-            }
-            else if (type == Types.TIME) {
-                propVal = new TimePropertyValue(prop, flags, data);
-            }
-            // TODO Add in the rest of the types
-            else {
-                propVal = new PropertyValue(prop, flags, data);
-            }
-
-            if (properties.get(prop) != null) {
-                logger.log(POILogger.WARN, "Duplicate values found for " + prop);
-            }
-            properties.put(prop, propVal);
-         } catch (BufferUnderrunException e) {
-            // Invalid property, ended short
-            going = false;
-         }
-      }
-   }
-
-   protected void writeProperties(OutputStream out) throws IOException {
-       // TODO
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java
deleted file mode 100644
index a22927c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.math.BigInteger;
-import java.util.Calendar;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * An instance of a {@link MAPIProperty} inside a {@link PropertiesChunk}.
- * Where the {@link Types} type is a fixed length one, this will contain the
- *  actual value.
- * Where the {@link Types} type is a variable length one, this will contain
- *  the length of the property, and the value will be in the associated {@link Chunk}.
- */
-public class PropertyValue {
-   private MAPIProperty property;
-   private long flags;
-   protected byte[] data;
-   
-   public PropertyValue(MAPIProperty property, long flags, byte[] data) {
-      this.property = property;
-      this.flags = flags;
-      this.data = data;
-   }
-   
-   public MAPIProperty getProperty() {
-      return property;
-   }
-
-   /**
-    * Get the raw value flags.
-    * TODO Also provide getters for the flag meanings
-    */
-   public long getFlags() {
-      return flags;
-   }
-
-   public Object getValue() {
-      return data;
-   }
-   public void setRawValue(byte[] value) {
-      this.data = value;
-   }
-   
-   public String toString() {
-      Object v = getValue();
-      if (v == null)
-          return "(No value available)";
-      
-      if (v instanceof byte[]) {
-          return ByteChunk.toDebugFriendlyString((byte[])v);
-      } else {
-          // Just use the normal toString on the value
-          return v.toString();
-      }
-   }
-   
-   public static class NullPropertyValue extends PropertyValue {
-       public NullPropertyValue(MAPIProperty property, long flags, byte[] data) {
-          super(property, flags, data);
-       }
-       
-       public Void getValue() {
-           return null;
-       }
-   }
-   
-   public static class BooleanPropertyValue extends PropertyValue {
-       public BooleanPropertyValue(MAPIProperty property, long flags, byte[] data) {
-          super(property, flags, data);
-       }
-       
-       public Boolean getValue() {
-          short val = LittleEndian.getShort(data);
-          return val > 0;
-       }
-       public void setValue(boolean value) {
-          if (data.length != 2) {
-             data = new byte[2];
-          }
-          if (value) {
-              LittleEndian.putShort(data, 0, (short)1);
-          }
-       }
-   }
-    
-   public static class ShortPropertyValue extends PropertyValue {
-       public ShortPropertyValue(MAPIProperty property, long flags, byte[] data) {
-          super(property, flags, data);
-       }
-       
-       public Short getValue() {
-          return LittleEndian.getShort(data);
-       }
-       public void setValue(short value) {
-          if (data.length != 2) {
-             data = new byte[2];
-          }
-          LittleEndian.putShort(data, 0, value);
-       }
-   }
-    
-   public static class LongPropertyValue extends PropertyValue {
-       public LongPropertyValue(MAPIProperty property, long flags, byte[] data) {
-          super(property, flags, data);
-       }
-       
-       public Integer getValue() {
-          return LittleEndian.getInt(data);
-       }
-       public void setValue(int value) {
-          if (data.length != 4) {
-             data = new byte[4];
-          }
-          LittleEndian.putInt(data, 0, value);
-       }
-    }
-    
-   public static class LongLongPropertyValue extends PropertyValue {
-      public LongLongPropertyValue(MAPIProperty property, long flags, byte[] data) {
-         super(property, flags, data);
-      }
-      
-      public Long getValue() {
-         return LittleEndian.getLong(data);
-      }
-      public void setValue(long value) {
-         if (data.length != 8) {
-            data = new byte[8];
-         }
-         LittleEndian.putLong(data, 0, value);
-      }
-   }
-   
-   public static class FloatPropertyValue extends PropertyValue {
-       public FloatPropertyValue(MAPIProperty property, long flags, byte[] data) {
-          super(property, flags, data);
-       }
-       
-       public Float getValue() {
-          return LittleEndian.getFloat(data);
-       }
-       public void setValue(float value) {
-          if (data.length != 4) {
-             data = new byte[4];
-          }
-          LittleEndian.putFloat(data, 0, value);
-       }
-   }
-    
-   public static class DoublePropertyValue extends PropertyValue {
-       public DoublePropertyValue(MAPIProperty property, long flags, byte[] data) {
-          super(property, flags, data);
-       }
-       
-       public Double getValue() {
-          return LittleEndian.getDouble(data);
-       }
-       public void setValue(double value) {
-          if (data.length != 8) {
-             data = new byte[8];
-          }
-          LittleEndian.putDouble(data, 0, value);
-       }
-   }
-    
-   /**
-    * signed 64-bit integer that represents a base ten decimal, 
-    * with four digits to the right of the decimal point
-    */
-   public static class CurrencyPropertyValue extends PropertyValue {
-       private static final BigInteger SHIFT = BigInteger.valueOf(10000);
-       public CurrencyPropertyValue(MAPIProperty property, long flags, byte[] data) {
-          super(property, flags, data);
-       }
-       
-       public BigInteger getValue() {
-           long unshifted = LittleEndian.getLong(data);
-           return BigInteger.valueOf(unshifted).divide(SHIFT);
-       }
-       public void setValue(BigInteger value) {
-          if (data.length != 8) {
-             data = new byte[8];
-          }
-          long shifted = value.multiply(SHIFT).longValue();
-          LittleEndian.putLong(data, 0, shifted);
-       }
-   }
-    
-   /**
-    * 64-bit integer specifying the number of 100ns periods since Jan 1, 1601
-    */
-   public static class TimePropertyValue extends PropertyValue {
-      private static final long OFFSET = 1000L * 60L * 60L * 24L * (365L * 369L + 89L);
-      public TimePropertyValue(MAPIProperty property, long flags, byte[] data) {
-         super(property, flags, data);
-      }
-      
-      public Calendar getValue() {
-         long time = LittleEndian.getLong(data);
-         time = (time / 10 / 1000) - OFFSET;
-
-         Calendar timeC = LocaleUtil.getLocaleCalendar();
-         timeC.setTimeInMillis(time);
-
-         return timeC;
-      }
-      public void setValue(Calendar value) {
-         if (data.length != 8) {
-            data = new byte[8];
-         }
-         long time = value.getTimeInMillis();
-         time = (time + OFFSET) *10*1000;
-         LittleEndian.putLong(data, 0, time);
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java
deleted file mode 100644
index 2cfd3c4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-
-/**
- * Collection of convenience chunks for the
- *  Recip(ient) part of an outlook file.
- * 
- * If a message has multiple recipients, there will be
- *  several of these.
- */
-public final class RecipientChunks implements ChunkGroupWithProperties {
-   private static POILogger logger = POILogFactory.getLogger(RecipientChunks.class);
-
-   public static final String PREFIX = "__recip_version1.0_#";
-   
-   public static final MAPIProperty RECIPIENT_NAME   = MAPIProperty.DISPLAY_NAME;
-   public static final MAPIProperty DELIVERY_TYPE    = MAPIProperty.ADDRTYPE;
-   public static final MAPIProperty RECIPIENT_EMAIL_ADDRESS = MAPIProperty.EMAIL_ADDRESS;
-   public static final MAPIProperty RECIPIENT_SEARCH        = MAPIProperty.SEARCH_KEY;
-   public static final MAPIProperty RECIPIENT_SMTP_ADDRESS  = MAPIProperty.SMTP_ADDRESS;
-   public static final MAPIProperty RECIPIENT_DISPLAY_NAME  = MAPIProperty.RECIPIENT_DISPLAY_NAME;
-   
-   /** Our 0 based position in the list of recipients */
-   public int recipientNumber;
-   
-   /** TODO */
-   public ByteChunk recipientSearchChunk;
-   /**
-    * The "name", which could be their name if an
-    *  internal person, or their email address
-    *  if an external person
-    */
-   public StringChunk recipientNameChunk;
-   /** 
-    * The email address of the recipient, which
-    *  could be in SMTP or SEARCH format, but
-    *  isn't always present...
-    */
-   public StringChunk recipientEmailChunk;
-   /** 
-    * The smtp destination email address of
-    *  the recipient, but isn't always present...
-    */
-   public StringChunk recipientSMTPChunk;
-   /**
-    * Normally EX or SMTP. Will generally affect
-    *  where the email address ends up.
-    */
-   public StringChunk deliveryTypeChunk;
-   /**
-    * The display name of the recipient.
-    * Normally seems to hold the same value
-    *  as in recipientNameChunk
-    */
-   public StringChunk recipientDisplayNameChunk;
-   /**
-    * Holds the fixed sized properties, and the
-    *  pointers to the data of variable sized ones
-    */
-   private PropertiesChunk recipientProperties;
-   
-   public RecipientChunks(String name) {
-      recipientNumber = -1;
-      int splitAt = name.lastIndexOf('#');
-      if(splitAt > -1) {
-         String number = name.substring(splitAt+1);
-         try {
-            recipientNumber = Integer.parseInt(number, 16);
-         } catch(NumberFormatException e) {
-        	 logger.log(POILogger.ERROR, "Invalid recipient number in name " + name);
-         }
-      }
-   }
-   
-   /**
-    * Tries to find their name,
-    *  in whichever chunk holds it.
-    */
-   public String getRecipientName() {
-      if(recipientNameChunk != null) {
-         return recipientNameChunk.getValue();
-      }
-      if(recipientDisplayNameChunk != null) {
-         return recipientDisplayNameChunk.getValue();
-      }
-      
-      // Can't find it
-      return null;
-   }
-   
-   /**
-    * Tries to find their email address, in
-    *  whichever chunk holds it given the
-    *  delivery type.
-    */
-   public String getRecipientEmailAddress() {
-      // If we have this, it really has the email 
-      if(recipientSMTPChunk != null) {
-         return recipientSMTPChunk.getValue();
-      }
-      
-      // This might be a real email, or might be
-      //  in CN=... format
-      if(recipientEmailChunk != null) {
-         String email = recipientEmailChunk.getValue();
-         int cne = email.indexOf("/CN="); 
-         if(cne == -1) {
-            // Normal smtp address
-            return email;
-         } else {
-            // /O=..../CN=em@ail
-            return email.substring(cne+4);
-         }
-      }
-      
-      // Might be in the name field, check there
-      if(recipientNameChunk != null) {
-         String name = recipientNameChunk.getValue();
-         if(name.indexOf('@') > -1) {
-            // Strip leading and trailing quotes if needed
-            if(name.startsWith("'") && name.endsWith("'")) {
-               return name.substring(1, name.length()-1);
-            }
-            return name;
-         }
-      }
-      
-      // Check the search chunk, see if it's 
-      //  encoded as a SMTP destination in there.
-      if(recipientSearchChunk != null) {
-         String search = recipientSearchChunk.getAs7bitString();
-         if(search.indexOf("SMTP:") != -1) {
-            return search.substring(search.indexOf("SMTP:") + 5);
-         }
-      }
-      
-      // Can't find it
-      return null;
-   }
-   
-   /** Holds all the chunks that were found. */
-   private List<Chunk> allChunks = new ArrayList<Chunk>();
-
-   public Map<MAPIProperty,List<PropertyValue>> getProperties() {
-      if (recipientProperties != null) {
-         return recipientProperties.getProperties();
-      }
-      else return Collections.emptyMap();
-   }
-   public Chunk[] getAll() {
-      return allChunks.toArray(new Chunk[allChunks.size()]);
-   }
-   public Chunk[] getChunks() {
-      return getAll();
-   }
-	
-   /**
-    * Called by the parser whenever a chunk is found.
-    */
-   public void record(Chunk chunk) {
-      if(chunk.getChunkId() == RECIPIENT_SEARCH.id) {
-         // TODO - parse
-         recipientSearchChunk = (ByteChunk)chunk;
-      }
-      else if(chunk.getChunkId() == RECIPIENT_NAME.id) {
-         recipientDisplayNameChunk = (StringChunk)chunk;
-      }
-      else if(chunk.getChunkId() == RECIPIENT_DISPLAY_NAME.id) {
-         recipientNameChunk = (StringChunk)chunk;
-      }
-      else if(chunk.getChunkId() == RECIPIENT_EMAIL_ADDRESS.id) {
-         recipientEmailChunk = (StringChunk)chunk;
-      }
-      else if(chunk.getChunkId() == RECIPIENT_SMTP_ADDRESS.id) {
-         recipientSMTPChunk = (StringChunk)chunk;
-      }
-      else if(chunk.getChunkId() == DELIVERY_TYPE.id) {
-         deliveryTypeChunk = (StringChunk)chunk;
-      }
-      else if(chunk instanceof PropertiesChunk) {
-         recipientProperties = (PropertiesChunk) chunk;
-      }
-
-      // And add to the main list
-      allChunks.add(chunk);
-   }
-   
-   public void chunksComplete() {
-      if (recipientProperties != null) {
-         recipientProperties.matchVariableSizedPropertiesToChunks();
-      } else {
-         logger.log(POILogger.WARN, "Recipeints Chunk didn't contain a list of properties!");
-      }
-   }
-
-   /**
-    * Orders by the recipient number.
-    */
-   public static class RecipientChunksSorter implements Comparator<RecipientChunks>, Serializable {
-      public int compare(RecipientChunks a, RecipientChunks b) {
-         if(a.recipientNumber < b.recipientNumber)
-            return -1;
-         if(a.recipientNumber > b.recipientNumber)
-            return +1;
-         return 0;
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
deleted file mode 100644
index 5cb0d4b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * A {@link PropertiesChunk} for a Storage Properties, such as
- *  Attachments and Recipients.
- * This only has a 8 byte header
- */
-public class StoragePropertiesChunk extends PropertiesChunk {
-   public StoragePropertiesChunk(ChunkGroup parentGroup) {
-      super(parentGroup);
-   }
-   
-   @Override
-   public void readValue(InputStream stream) throws IOException {
-      // 8 bytes of reserved zeros
-      LittleEndian.readLong(stream);
-      
-      // Now properties
-      readProperties(stream);
-   }
-
-   @Override
-   public void writeValue(OutputStream out) throws IOException {
-      // 8 bytes of reserved zeros
-      out.write(new byte[8]);
-      
-      // Now properties
-      writeProperties(out);
-   }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java
deleted file mode 100644
index be541ec..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.StringUtil;
-
-/**
- * A Chunk made up of a single string.
- */
-public class StringChunk extends Chunk {
-   private static final String DEFAULT_ENCODING = "CP1252"; 
-   private String encoding7Bit = DEFAULT_ENCODING;
-   private byte[] rawValue;
-   private String value;
-
-   /**
-    * Creates a String Chunk.
-    */
-   public StringChunk(String namePrefix, int chunkId, MAPIType type) {
-      super(namePrefix, chunkId, type);
-   }
-
-   /**
-    * Create a String Chunk, with the specified
-    *  type.
-    */
-   public StringChunk(int chunkId, MAPIType type) {
-      super(chunkId, type);
-   }
-
-   /**
-    * Returns the Encoding that will be used to
-    *  decode any "7 bit" (non unicode) data.
-    * Most files default to CP1252
-    */
-   public String get7BitEncoding() {
-      return encoding7Bit;
-   }
-
-   /**
-    * Sets the Encoding that will be used to
-    *  decode any "7 bit" (non unicode) data.
-    * This doesn't appear to be stored anywhere
-    *  specific in the file, so you may need
-    *  to guess by looking at headers etc
-    */
-   public void set7BitEncoding(String encoding) {
-      this.encoding7Bit = encoding;
-
-      // Re-read the String if we're a 7 bit one
-      if(type == Types.ASCII_STRING) {
-         parseString();
-      }
-   }
-
-   public void readValue(InputStream value) throws IOException {
-      rawValue = IOUtils.toByteArray(value);
-      parseString();
-   }
-   private void parseString() {
-      String tmpValue;
-      if (type == Types.ASCII_STRING) {
-         tmpValue = parseAs7BitData(rawValue, encoding7Bit);
-      } else if (type == Types.UNICODE_STRING) {
-         tmpValue = StringUtil.getFromUnicodeLE(rawValue);
-      } else {
-         throw new IllegalArgumentException("Invalid type " + type + " for String Chunk");
-      }
-
-      // Clean up
-      this.value = tmpValue.replace("\0", "");
-   }
-
-   public void writeValue(OutputStream out) throws IOException {
-      out.write(rawValue);
-   }
-   private void storeString() {
-      if (type == Types.ASCII_STRING) {
-         rawValue = value.getBytes(Charset.forName(encoding7Bit));
-      } else if (type == Types.UNICODE_STRING) {
-         rawValue = StringUtil.getToUnicodeLE(value);
-      } else {
-         throw new IllegalArgumentException("Invalid type " + type + " for String Chunk");
-      }
-   }
-
-   /**
-    * Returns the Text value of the chunk
-    */
-   public String getValue() {
-      return this.value;
-   }
-
-   public byte[] getRawValue() {
-      return this.rawValue;
-   }
-
-   public void setValue(String str) {
-      this.value = str;
-      storeString();
-   }
-
-   public String toString() {
-      return this.value;
-   }
-   
-   /**
-    * Parses as non-unicode, supposedly 7 bit CP1252 data
-    *  and returns the string that that yields.
-    */
-   protected static String parseAs7BitData(byte[] data) {
-      return parseAs7BitData(data, DEFAULT_ENCODING);
-   }
-   /**
-    * Parses as non-unicode, supposedly 7 bit data
-    *  and returns the string that that yields.
-    */
-   protected static String parseAs7BitData(byte[] data, String encoding) {
-      // Handle any encoding aliases, where outlook describes it differently
-      if ("ansi".equals(encoding)) {
-          encoding = DEFAULT_ENCODING;
-      }
-      
-      // Decode
-      return new String(data, Charset.forName(encoding));
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java
deleted file mode 100644
index 4716cc1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * The types list and details are available from
- *  http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefpropertytype%28v=EXCHG.140%29.aspx
- */
-public final class Types {
-   private static Map<Integer, MAPIType> builtInTypes = new HashMap<Integer, MAPIType>();
-   private static Map<Integer, MAPIType> customTypes = new HashMap<Integer, Types.MAPIType>();
-
-   /** Unspecified */
-   public static final MAPIType UNSPECIFIED = new MAPIType(0x0000, "Unspecified", -1);
-   /** Unknown */
-   public static final MAPIType UNKNOWN = new MAPIType(-1, "Unknown", -1);
-
-   /** Null - NULL property value */
-   public static final MAPIType NULL = new MAPIType(0x0001, "Null", 0);
-   /** I2 - signed 16-bit value */
-   public static final MAPIType SHORT = new MAPIType(0x0002, "Short", 2);
-   /** Long - signed 32-bit value */
-   public static final MAPIType LONG = new MAPIType(0x0003, "Long", 4);
-   /** R4 - 4-byte floating point value */
-   public static final MAPIType FLOAT = new MAPIType(0x0004, "Float", 4);
-   /** Double - floating point double */
-   public static final MAPIType DOUBLE = new MAPIType(0x0005, "Double", 8);
-   /** Currency - signed 64-bit integer that represents a base ten decimal with four digits to the right of the decimal point */
-   public static final MAPIType CURRENCY = new MAPIType(0x0006, "Currency", 8);
-   /** AppTime - application time value */
-   public static final MAPIType APP_TIME = new MAPIType(0x0007, "Application Time", 8);
-   /** Error - 32-bit error value */
-   public static final MAPIType ERROR = new MAPIType(0x000A, "Error", 4);
-   /** Boolean - 16-bit Boolean value. '0' is false. Non-zero is true */
-   public static final MAPIType BOOLEAN = new MAPIType(0x000B, "Boolean", 2);
-   /** Object/Directory - embedded object in a property */
-   public static final MAPIType DIRECTORY = new MAPIType(0x000D, "Directory", -1);
-   /** I8 - 8-byte signed integer */
-   public static final MAPIType LONG_LONG = new MAPIType(0x0014, "Long Long", 8);
-   /** SysTime - FILETIME 64-bit integer specifying the number of 100ns periods since Jan 1, 1601 */
-   public static final MAPIType TIME = new MAPIType(0x0040, "Time", 8);
-   /** ClassId - OLE GUID */
-   public static final MAPIType CLS_ID = new MAPIType(0x0048, "CLS ID GUID", 16);
-
-   /** Binary - counted byte array */
-   public static final MAPIType BINARY = new MAPIType(0x0102, "Binary", -1);
-
-   /** 
-    * An 8-bit string, probably in CP1252, but don't quote us...
-    * Normally used for everything before Outlook 3.0, and some
-    *  fields in Outlook 3.0.
-    */
-   public static final MAPIType ASCII_STRING = new MAPIType(0x001E, "ASCII String", -1);
-   /** A string, from Outlook 3.0 onwards. Normally unicode */
-   public static final MAPIType UNICODE_STRING = new MAPIType(0x001F, "Unicode String", -1);
-
-   /** MultiValued - Value part contains multiple values */
-   public static final int MULTIVALUED_FLAG = 0x1000;
-
-   public static final class MAPIType {
-      private final int id;
-      private final String name;
-      private final int length;
-   
-      /**
-       * Creates a standard, built-in type
-       */
-      private MAPIType(int id, String name, int length) {
-         this.id = id;
-         this.name = name;
-         this.length = length;
-         builtInTypes.put(id, this);
-      }
-      /**
-       * Creates a custom type
-       */
-      private MAPIType(int id, int length) {
-         this.id = id;
-         this.name = asCustomName(id);
-         this.length = length;
-         customTypes.put(id, this);
-      }
-      
-      /**
-       * Returns the length, in bytes, of values of this type, or
-       *  -1 if it is a variable length type.
-       */
-      public int getLength() {
-         return length;
-      }
-      /**
-       * Is this type a fixed-length type, or a variable-length one?
-       */
-      public boolean isFixedLength() {
-         return (length != -1);
-      }
-      
-      public int getId() {
-         return id;
-      }
-      public String getName() {
-         return name;
-      }
-      
-      public String toString() {
-         return id + " / 0x" + asFileEnding() + " - " + name + " @ " + length;
-      }
-      
-      /**
-       * Return the 4 character hex encoded version,
-       *  as used in file endings
-       */
-      public String asFileEnding() {
-         return Types.asFileEnding(id);
-      }
-   }
-   
-   public static MAPIType getById(int typeId) {
-      return builtInTypes.get(typeId);
-   }
-
-   public static String asFileEnding(int type) {
-      String str = Integer.toHexString(type).toUpperCase(Locale.ROOT);
-      while(str.length() < 4) {
-         str = "0" + str;
-      }
-      return str;
-   }
-   public static String asName(int typeId) {
-      MAPIType type = builtInTypes.get(typeId);
-      if (type != null) {
-         return type.name;
-      }
-      return asCustomName(typeId);
-   }
-   private static String asCustomName(int typeId) {
-      return "0x" + Integer.toHexString(typeId);
-   }
-   
-   public static MAPIType createCustom(int typeId) {
-      // Check they're not being silly, and asking for a built-in one...
-      if (getById(typeId) != null) {
-         return getById(typeId);
-      }
-      
-      // Try to get an existing definition of this
-      MAPIType type = customTypes.get(typeId);
-      
-      // If none, do a thread-safe creation
-      if (type == null) {
-         synchronized (customTypes) {
-            type = customTypes.get(typeId);
-            if (type == null) {
-               type = new MAPIType(typeId, -1);
-            }
-         }
-      }
-      
-      return type;
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
deleted file mode 100644
index 0566801..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.apache.poi.hsmf.datatypes.Chunk;
-import org.apache.poi.hsmf.datatypes.ChunkGroup;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.PropertiesChunk;
-import org.apache.poi.hsmf.datatypes.PropertyValue;
-import org.apache.poi.hsmf.parsers.POIFSChunkParser;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-/**
- * Dumps out the chunk details, and where possible contents
- */
-public class HSMFDump {
-   private NPOIFSFileSystem fs;
-   public HSMFDump(NPOIFSFileSystem fs) {
-      this.fs = fs;
-   }
-   
-   public void dump() throws IOException {
-      dump(System.out);
-   }
-   public void dump(PrintStream out) throws IOException {
-      ChunkGroup[] chunkGroups = POIFSChunkParser.parse(fs);
-      for(ChunkGroup chunks : chunkGroups) {
-         out.println(chunks.getClass().getSimpleName());
-         for(Chunk chunk : chunks.getChunks()) {
-            MAPIProperty attr = MAPIProperty.get(chunk.getChunkId());
-            
-            if (chunk instanceof PropertiesChunk) {
-               PropertiesChunk props = (PropertiesChunk)chunk;
-               out.println(
-                     "   Properties - " + props.getProperties().size() + ":"
-               );
-               
-               for (MAPIProperty prop : props.getProperties().keySet()) {
-                  out.println(
-                        "       * " + prop
-                  );
-                  for (PropertyValue v : props.getValues(prop)) {
-                     out.println(
-                           "        = " + v.toString()
-                     );
-                  }
-               }
-            } else {
-               String idName = attr.id + " - " + attr.name;
-               if(attr == MAPIProperty.UNKNOWN) {
-                  idName = chunk.getChunkId() + " - (unknown)";
-               }
-               
-               out.println(
-                     "   " + idName + " - " + chunk.getType().getName()
-               );
-               out.println(
-                     "       " + chunk.toString()
-               );
-            }
-         }
-         out.println();
-      }
-   }
-   
-   public static void main(String[] args) throws Exception {
-      for(String file : args) {
-         NPOIFSFileSystem fs = new NPOIFSFileSystem(new File(file), true);
-         HSMFDump dump = new HSMFDump(fs);
-         dump.dump();
-         fs.close();
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java
deleted file mode 100644
index 39b0ebc..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.dev;
-
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-
-/**
- * Lists the different MAPI types
- */
-public class TypesLister {
-   public TypesLister() {}
-   
-   public void listByName(PrintStream out) {
-      ArrayList<MAPIProperty> all = new ArrayList<MAPIProperty>(MAPIProperty.getAll());
-      Collections.sort(all, new Comparator<MAPIProperty>() {
-         public int compare(MAPIProperty a, MAPIProperty b) {
-            return a.name.compareTo(b.name);
-         }
-      });
-      list(all, out);
-   }
-   public void listById(PrintStream out) {
-      ArrayList<MAPIProperty> all = new ArrayList<MAPIProperty>(MAPIProperty.getAll());
-      Collections.sort(all, new Comparator<MAPIProperty>() {
-         public int compare(MAPIProperty a, MAPIProperty b) {
-            if(a.id < b.id) return -1;
-            if(a.id > b.id) return +1;
-            return 0;
-         }
-      });
-      list(all, out);
-   }
-   private void list(ArrayList<MAPIProperty> list, PrintStream out) {
-      for(MAPIProperty attr : list) {
-         String id = Integer.toHexString(attr.id);
-         while(id.length() < 4) { id = "0"+id; }
-         
-         int typeId = attr.usualType.getId();
-         String typeIdStr = Integer.toString(typeId);
-         if (typeId > 0) {
-            typeIdStr = typeIdStr + " / 0x" + Integer.toHexString(typeId);
-         }
-         
-         out.println("0x" + id + " - " + attr.name);
-         out.println("   " + attr.id + " - " + attr.usualType.getName() + 
-                     " (" + typeIdStr + ") - " + attr.mapiProperty);
-      }
-   }
-   
-   public static void main(String[] args) {
-      TypesLister lister = new TypesLister();
-      
-      lister.listByName(System.out);
-      System.out.println();
-      lister.listById(System.out);
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
deleted file mode 100644
index 9f00435..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.exceptions;
-
-public final class ChunkNotFoundException extends Exception {
-	private static final long serialVersionUID = 1L;
-
-	public ChunkNotFoundException() {
-	   super("Chunk not found");
-	}
-	public ChunkNotFoundException(String chunkName) {
-		super(chunkName + " was named, but not found in POIFS object");
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/exceptions/DirectoryChunkNotFoundException.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/exceptions/DirectoryChunkNotFoundException.java
deleted file mode 100644
index 0c33901..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/exceptions/DirectoryChunkNotFoundException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.exceptions;
-
-/**
- * Exception for when a directory chunk is not found but is expected.
- * @author Travis Ferguson
- */
-public final class DirectoryChunkNotFoundException extends Exception {
-	private static final long serialVersionUID = 1L;
-
-	public DirectoryChunkNotFoundException(String directory) {
-		super("Directory Chunk " + directory + " was not found!");
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
deleted file mode 100644
index 0d949df..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hsmf.extractor;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.datatypes.StringChunk;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.StringUtil.StringsIterator;
-
-/**
- * A text extractor for HSMF (Outlook) .msg files.
- * Outputs in a format somewhat like a plain text email.
- */
-public class OutlookTextExtactor extends POIOLE2TextExtractor {
-   public OutlookTextExtactor(MAPIMessage msg) {
-      super(msg);
-   }
-   /**
-    * Use {@link #OutlookTextExtactor(DirectoryNode)} instead
-    */
-   @Deprecated
-   public OutlookTextExtactor(DirectoryNode poifsDir, POIFSFileSystem fs) throws IOException {
-      this(new MAPIMessage(poifsDir, fs));
-   }
-   public OutlookTextExtactor(DirectoryNode poifsDir) throws IOException {
-      this(new MAPIMessage(poifsDir));
-   }
-   public OutlookTextExtactor(NPOIFSFileSystem fs) throws IOException {
-      this(new MAPIMessage(fs));
-   }
-   public OutlookTextExtactor(InputStream inp) throws IOException {
-      this(new MAPIMessage(inp));
-   }
-   
-   public static void main(String[] args) throws Exception {
-      for(String filename : args) {
-         NPOIFSFileSystem poifs = null;
-         OutlookTextExtactor extractor = null;
-         try {
-             poifs = new NPOIFSFileSystem(new File(filename));
-             extractor = new OutlookTextExtactor(poifs);
-             System.out.println( extractor.getText() );
-         } finally {
-             if (extractor != null) extractor.close();
-             if (poifs != null) poifs.close();
-         }
-      }
-   }
-
-   /**
-    * Returns the underlying MAPI message
-    */
-   public MAPIMessage getMAPIMessage() {
-      return (MAPIMessage)document;
-   }
-      
-   /**
-    * Outputs something a little like a RFC822 email
-    */
-   public String getText() {
-      MAPIMessage msg = (MAPIMessage)document;
-      StringBuffer s = new StringBuffer();
-      
-      // See if we can get a suitable encoding for any
-      //  non unicode text in the file
-      msg.guess7BitEncoding();
-      
-      // Off we go
-      StringsIterator emails;
-      try {
-         emails = new StringsIterator(
-               msg.getRecipientEmailAddressList()
-         );
-      } catch(ChunkNotFoundException e) {
-         emails = new StringsIterator(new String[0]);
-      }
-      
-      try {
-         s.append("From: " + msg.getDisplayFrom() + "\n");
-      } catch(ChunkNotFoundException e) {}
-      
-      // For To, CC and BCC, try to match the names
-      //  up with their email addresses. Relies on the
-      //  Recipient Chunks being in the same order as
-      //  people in To + CC + BCC.
-      try {
-         handleEmails(s, "To", msg.getDisplayTo(), emails);
-      } catch(ChunkNotFoundException e) {}
-      try {
-         handleEmails(s, "CC", msg.getDisplayCC(), emails);
-      } catch(ChunkNotFoundException e) {}
-      try {
-         handleEmails(s, "BCC", msg.getDisplayBCC(), emails);
-      } catch(ChunkNotFoundException e) {}
-      
-      // Date - try two ways to find it
-      try {
-         // First try via the proper chunk
-         SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z", Locale.ROOT);
-         f.setTimeZone(LocaleUtil.getUserTimeZone());
-         s.append("Date: " + f.format(msg.getMessageDate().getTime()) + "\n");
-      } catch(ChunkNotFoundException e) {
-         try {
-            // Failing that try via the raw headers 
-            String[] headers = msg.getHeaders();
-            for(String header: headers) {
-               if(header.toLowerCase(Locale.ROOT).startsWith("date:")) {
-                  s.append(
-                        "Date:" + 
-                        header.substring(header.indexOf(':')+1) +
-                        "\n"
-                  );
-                  break;
-               }
-            }
-         } catch(ChunkNotFoundException he) {
-            // We can't find the date, sorry...
-         }
-      }
-      
-      try {
-         s.append("Subject: " + msg.getSubject() + "\n");
-      } catch(ChunkNotFoundException e) {}
-      
-      // Display attachment names
-      // To get the attachments, use ExtractorFactory
-      for(AttachmentChunks att : msg.getAttachmentFiles()) {
-         StringChunk name = att.attachLongFileName;
-         if (name == null) name = att.attachFileName;
-         String attName = name == null ? null : name.getValue();
-          
-         if(att.attachMimeTag != null && 
-               att.attachMimeTag.getValue() != null) {
-             attName = att.attachMimeTag.getValue() + " = " + attName; 
-         }
-         s.append("Attachment: " + attName + "\n");
-      }
-      
-      try {
-         s.append("\n" + msg.getTextBody() + "\n");
-      } catch(ChunkNotFoundException e) {}
-      
-      return s.toString();
-   }
-   
-   /**
-    * Takes a Display focused string, eg "Nick; Jim" and an iterator
-    *  of emails, and does its best to return something like
-    *  "Nick <nick@example.com>; Jim <jim@example.com>"
-    */
-   protected void handleEmails(StringBuffer s, String type, String displayText, StringsIterator emails) {
-      if(displayText == null || displayText.length() == 0) {
-         return;
-      }
-      
-      String[] names = displayText.split(";\\s*");
-      boolean first = true;
-      
-      s.append(type + ": ");
-      for(String name : names) {
-         if(first) {
-            first = false;
-         } else {
-            s.append("; ");
-         }
-         
-         s.append(name);
-         if(emails.hasNext()) {
-            String email = emails.next();
-            // Append the email address in <>, assuming
-            //  the name wasn't already the email address
-            if(! email.equals(name)) {
-               s.append( " <" + email + ">");
-            }
-         }
-      }
-      s.append("\n");
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
deleted file mode 100644
index c44f494..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.parsers;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.datatypes.ByteChunk;
-import org.apache.poi.hsmf.datatypes.Chunk;
-import org.apache.poi.hsmf.datatypes.ChunkGroup;
-import org.apache.poi.hsmf.datatypes.Chunks;
-import org.apache.poi.hsmf.datatypes.DirectoryChunk;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.MessagePropertiesChunk;
-import org.apache.poi.hsmf.datatypes.MessageSubmissionChunk;
-import org.apache.poi.hsmf.datatypes.NameIdChunks;
-import org.apache.poi.hsmf.datatypes.PropertiesChunk;
-import org.apache.poi.hsmf.datatypes.RecipientChunks;
-import org.apache.poi.hsmf.datatypes.StoragePropertiesChunk;
-import org.apache.poi.hsmf.datatypes.StringChunk;
-import org.apache.poi.hsmf.datatypes.Types;
-import org.apache.poi.hsmf.datatypes.Types.MAPIType;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Processes a POIFS of a .msg file into groups of Chunks, such as
- * core data, attachment #1 data, attachment #2 data, recipient
- * data and so on.
- */
-public final class POIFSChunkParser {
-   private static POILogger logger = POILogFactory.getLogger(POIFSChunkParser.class);
-
-   public static ChunkGroup[] parse(NPOIFSFileSystem fs) throws IOException {
-      return parse(fs.getRoot());
-   }
-   public static ChunkGroup[] parse(DirectoryNode node) throws IOException {
-      Chunks mainChunks = new Chunks();
-      
-      ArrayList<ChunkGroup> groups = new ArrayList<ChunkGroup>();
-      groups.add(mainChunks);
-
-      // Find our top level children
-      // Note - we don't handle children of children yet, as
-      //  there doesn't seem to be any use of that in Outlook
-      for(Entry entry : node) {
-         if(entry instanceof DirectoryNode) {
-            DirectoryNode dir = (DirectoryNode)entry;
-            ChunkGroup group = null;
-            
-            // Do we know what to do with it?
-            if(dir.getName().startsWith(AttachmentChunks.PREFIX)) {
-               group = new AttachmentChunks(dir.getName());
-            }
-            if(dir.getName().startsWith(NameIdChunks.NAME)) {
-               group = new NameIdChunks();
-            }
-            if(dir.getName().startsWith(RecipientChunks.PREFIX)) {
-               group = new RecipientChunks(dir.getName());
-            }
-            
-            if(group != null) {
-               processChunks(dir, group);
-               groups.add(group);
-            } else {
-               // Unknown directory, skip silently
-            }
-         }
-      }
-      
-      // Now do the top level chunks
-      processChunks(node, mainChunks);
-      
-      // All chunks are now processed, have the ChunkGroup
-      // match up variable-length properties and their chunks
-      for (ChunkGroup group : groups) {
-         group.chunksComplete();
-      }
-      
-      // Finish
-      return groups.toArray(new ChunkGroup[groups.size()]);
-   }
-   
-   /**
-    * Creates all the chunks for a given Directory, but
-    *  doesn't recurse or descend 
-    */
-   protected static void processChunks(DirectoryNode node, ChunkGroup grouping) {
-      for(Entry entry : node) {
-         if(entry instanceof DocumentNode) {
-            process(entry, grouping);
-         } else if(entry instanceof DirectoryNode) {
-             if(entry.getName().endsWith(Types.DIRECTORY.asFileEnding())) {
-                 process(entry, grouping);
-             }
-         }
-      }
-   }
-   
-   /**
-    * Creates a chunk, and gives it to its parent group 
-    */
-   protected static void process(Entry entry, ChunkGroup grouping) {
-      String entryName = entry.getName();
-      Chunk chunk = null;
-      
-      // Is it a properties chunk? (They have special names)
-      if (entryName.equals(PropertiesChunk.NAME)) {
-         if (grouping instanceof Chunks) {
-            // These should be the properties for the message itself
-            chunk = new MessagePropertiesChunk(grouping);
-         } else {
-            // Will be properties on an attachment or recipient
-            chunk = new StoragePropertiesChunk(grouping);
-         }
-      } else {
-         // Check it's a regular chunk
-         if(entryName.length() < 9) {
-            // Name in the wrong format
-            return;
-         }
-         if(entryName.indexOf('_') == -1) {
-            // Name in the wrong format
-            return;
-         }
-         
-         // Split it into its parts
-         int splitAt = entryName.lastIndexOf('_');
-         String namePrefix = entryName.substring(0, splitAt+1);
-         String ids = entryName.substring(splitAt+1);
-         
-         // Make sure we got what we expected, should be of 
-         //  the form __<name>_<id><type>
-         if(namePrefix.equals("Olk10SideProps") ||
-            namePrefix.equals("Olk10SideProps_")) {
-            // This is some odd Outlook 2002 thing, skip
-            return;
-         } else if(splitAt <= entryName.length()-8) {
-            // In the right form for a normal chunk
-            // We'll process this further in a little bit
-         } else {
-            // Underscores not the right place, something's wrong
-            throw new IllegalArgumentException("Invalid chunk name " + entryName);
-         }
-         
-         // Now try to turn it into id + type
-         try {
-            int chunkId = Integer.parseInt(ids.substring(0, 4), 16);
-            int typeId  = Integer.parseInt(ids.substring(4, 8), 16);
-            
-            MAPIType type = Types.getById(typeId);
-            if (type == null) {
-               type = Types.createCustom(typeId);
-            }
-            
-            // Special cases based on the ID
-            if(chunkId == MAPIProperty.MESSAGE_SUBMISSION_ID.id) {
-               chunk = new MessageSubmissionChunk(namePrefix, chunkId, type);
-            } 
-            else {
-               // Nothing special about this ID
-               // So, do the usual thing which is by type
-               if (type == Types.BINARY) {
-                  chunk = new ByteChunk(namePrefix, chunkId, type);
-               }
-               else if (type == Types.DIRECTORY) {
-                  if(entry instanceof DirectoryNode) {
-                      chunk = new DirectoryChunk((DirectoryNode)entry, namePrefix, chunkId, type);
-                  }
-               }
-               else if (type == Types.ASCII_STRING ||
-                        type == Types.UNICODE_STRING) {
-                  chunk = new StringChunk(namePrefix, chunkId, type);
-               } 
-               else {
-                  // Type of an unsupported type! Skipping... 
-               }
-            }
-         } catch(NumberFormatException e) {
-            // Name in the wrong format
-            return;
-         }
-      }
-         
-      if(chunk != null) {
-          if(entry instanceof DocumentNode) {
-             DocumentInputStream inp = null;
-             try {
-                inp = new DocumentInputStream((DocumentNode)entry);
-                chunk.readValue(inp);
-                grouping.record(chunk);
-             } catch(IOException e) {
-            	 logger.log(POILogger.ERROR, "Error reading from part " + entry.getName() + " - " + e.toString());
-             } finally {
-                 if (inp != null) inp.close();
-             }
-          } else {
-             grouping.record(chunk);
-          }
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java b/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
deleted file mode 100644
index a3d1624..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.converter;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hwpf.converter.AbstractWordConverter;
-import org.apache.poi.hwpf.converter.DefaultFontReplacer;
-import org.apache.poi.hwpf.converter.FontReplacer;
-import org.apache.poi.hwpf.converter.NumberFormatter;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.util.Beta;
-import org.w3c.dom.Document;
-
-/**
- * Common class for {@link ExcelToFoConverter} and {@link ExcelToHtmlConverter}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- * @see AbstractWordConverter
- */
-@Beta
-public abstract class AbstractExcelConverter
-{
-    protected static int getColumnWidth( HSSFSheet sheet, int columnIndex )
-    {
-        return ExcelToHtmlUtils.getColumnWidthInPx( sheet
-                .getColumnWidth( columnIndex ) );
-    }
-
-    protected static int getDefaultColumnWidth( HSSFSheet sheet )
-    {
-        return ExcelToHtmlUtils.getColumnWidthInPx( sheet
-                .getDefaultColumnWidth() );
-    }
-
-    protected final HSSFDataFormatter _formatter = new HSSFDataFormatter();
-
-    private FontReplacer fontReplacer = new DefaultFontReplacer();
-
-    private boolean outputColumnHeaders = true;
-
-    private boolean outputHiddenColumns = false;
-
-    private boolean outputHiddenRows = false;
-
-    private boolean outputLeadingSpacesAsNonBreaking = true;
-
-    private boolean outputRowNumbers = true;
-
-    /**
-     * Generates name for output as column header in case
-     * <tt>{@link #isOutputColumnHeaders()} == true</tt>
-     * 
-     * @param columnIndex
-     *            0-based column index
-     */
-    protected String getColumnName( int columnIndex )
-    {
-        return NumberFormatter.getNumber( columnIndex + 1, 3 );
-    }
-
-    protected abstract Document getDocument();
-
-    public FontReplacer getFontReplacer()
-    {
-        return fontReplacer;
-    }
-
-    /**
-     * Generates name for output as row number in case
-     * <tt>{@link #isOutputRowNumbers()} == true</tt>
-     */
-    protected String getRowName( HSSFRow row )
-    {
-        return String.valueOf( row.getRowNum() + 1 );
-    }
-
-    public boolean isOutputColumnHeaders()
-    {
-        return outputColumnHeaders;
-    }
-
-    public boolean isOutputHiddenColumns()
-    {
-        return outputHiddenColumns;
-    }
-
-    public boolean isOutputHiddenRows()
-    {
-        return outputHiddenRows;
-    }
-
-    public boolean isOutputLeadingSpacesAsNonBreaking()
-    {
-        return outputLeadingSpacesAsNonBreaking;
-    }
-
-    public boolean isOutputRowNumbers()
-    {
-        return outputRowNumbers;
-    }
-
-    protected boolean isTextEmpty( HSSFCell cell )
-    {
-        final String value;
-        switch ( cell.getCellTypeEnum() )
-        {
-        case STRING:
-            // XXX: enrich
-            value = cell.getRichStringCellValue().getString();
-            break;
-        case FORMULA:
-            switch ( cell.getCachedFormulaResultTypeEnum() )
-            {
-            case STRING:
-                HSSFRichTextString str = cell.getRichStringCellValue();
-                if ( str == null || str.length() <= 0 )
-                    return false;
-
-                value = str.toString();
-                break;
-            case NUMERIC:
-                HSSFCellStyle style = cell.getCellStyle();
-                double nval = cell.getNumericCellValue();
-                short df = style.getDataFormat();
-                String dfs = style.getDataFormatString();
-                value = _formatter.formatRawCellContents(nval, df, dfs);
-                break;
-            case BOOLEAN:
-                value = String.valueOf( cell.getBooleanCellValue() );
-                break;
-            case ERROR:
-                value = ErrorEval.getText( cell.getErrorCellValue() );
-                break;
-            default:
-                value = ExcelToHtmlUtils.EMPTY;
-                break;
-            }
-            break;
-        case BLANK:
-            value = ExcelToHtmlUtils.EMPTY;
-            break;
-        case NUMERIC:
-            value = _formatter.formatCellValue( cell );
-            break;
-        case BOOLEAN:
-            value = String.valueOf( cell.getBooleanCellValue() );
-            break;
-        case ERROR:
-            value = ErrorEval.getText( cell.getErrorCellValue() );
-            break;
-        default:
-            return true;
-        }
-
-        return ExcelToHtmlUtils.isEmpty( value );
-    }
-
-    public void setFontReplacer( FontReplacer fontReplacer )
-    {
-        this.fontReplacer = fontReplacer;
-    }
-
-    public void setOutputColumnHeaders( boolean outputColumnHeaders )
-    {
-        this.outputColumnHeaders = outputColumnHeaders;
-    }
-
-    public void setOutputHiddenColumns( boolean outputZeroWidthColumns )
-    {
-        this.outputHiddenColumns = outputZeroWidthColumns;
-    }
-
-    public void setOutputHiddenRows( boolean outputZeroHeightRows )
-    {
-        this.outputHiddenRows = outputZeroHeightRows;
-    }
-
-    public void setOutputLeadingSpacesAsNonBreaking(
-            boolean outputPrePostSpacesAsNonBreaking )
-    {
-        this.outputLeadingSpacesAsNonBreaking = outputPrePostSpacesAsNonBreaking;
-    }
-
-    public void setOutputRowNumbers( boolean outputRowNumbers )
-    {
-        this.outputRowNumbers = outputRowNumbers;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
deleted file mode 100644
index e9bd91b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.converter;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.hwpf.converter.AbstractWordUtils;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-
-/**
- * Common class for {@link ExcelToFoUtils} and {@link ExcelToHtmlUtils}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- * @see AbstractWordUtils
- * @since POI 3.8 beta 5
- */
-@Beta
-public class AbstractExcelUtils
-{
-    /*package*/ static final String EMPTY = "";
-    private static final short EXCEL_COLUMN_WIDTH_FACTOR = 256;
-    private static final int UNIT_OFFSET_LENGTH = 7;
-    
-    /**
-     * @param alignment The horizontal alignment. See {@link HorizontalAlignment}.
-     * @return a friendly string representation of the alignment code
-     * @deprecated POI 3.15 beta 3. Use {@link #getAlign(HorizontalAlignment)} instead.
-     */
-    public static String getAlign( short alignment )
-    {
-        return getAlign(HorizontalAlignment.forInt(alignment));
-    }
-    public static String getAlign( HorizontalAlignment alignment )
-    {
-        switch ( alignment )
-        {
-        case CENTER:
-            return "center";
-        case CENTER_SELECTION:
-            return "center";
-        case FILL:
-            // XXX: shall we support fill?
-            return "";
-        case GENERAL:
-            return "";
-        case JUSTIFY:
-            return "justify";
-        case LEFT:
-            return "left";
-        case RIGHT:
-            return "right";
-        default:
-            return "";
-        }
-    }
-
-    public static String getBorderStyle( BorderStyle xlsBorder )
-    {
-        final String borderStyle;
-        switch ( xlsBorder )
-        {
-        case NONE:
-            borderStyle = "none";
-            break;
-        case DASH_DOT:
-        case DASH_DOT_DOT:
-        case DOTTED:
-        case HAIR:
-        case MEDIUM_DASH_DOT:
-        case MEDIUM_DASH_DOT_DOT:
-        case SLANTED_DASH_DOT:
-            borderStyle = "dotted";
-            break;
-        case DASHED:
-        case MEDIUM_DASHED:
-            borderStyle = "dashed";
-            break;
-        case DOUBLE:
-            borderStyle = "double";
-            break;
-        default:
-            borderStyle = "solid";
-            break;
-        }
-        return borderStyle;
-    }
-
-    public static String getBorderWidth( BorderStyle xlsBorder )
-    {
-        final String borderWidth;
-        switch ( xlsBorder )
-        {
-        case MEDIUM_DASH_DOT:
-        case MEDIUM_DASH_DOT_DOT:
-        case MEDIUM_DASHED:
-            borderWidth = "2pt";
-            break;
-        case THICK:
-            borderWidth = "thick";
-            break;
-        default:
-            borderWidth = "thin";
-            break;
-        }
-        return borderWidth;
-    }
-
-    public static String getColor( HSSFColor color )
-    {
-        StringBuilder stringBuilder = new StringBuilder( 7 );
-        stringBuilder.append( '#' );
-        for ( short s : color.getTriplet() )
-        {
-            if ( s < 10 )
-                stringBuilder.append( '0' );
-
-            stringBuilder.append( Integer.toHexString( s ) );
-        }
-        String result = stringBuilder.toString();
-
-        if ( result.equals( "#ffffff" ) )
-            return "white";
-
-        if ( result.equals( "#c0c0c0" ) )
-            return "silver";
-
-        if ( result.equals( "#808080" ) )
-            return "gray";
-
-        if ( result.equals( "#000000" ) )
-            return "black";
-
-        return result;
-    }
-
-    /**
-     * See <a href=
-     * "http://apache-poi.1045710.n5.nabble.com/Excel-Column-Width-Unit-Converter-pixels-excel-column-width-units-td2301481.html"
-     * >here</a> for Xio explanation and details
-     */
-    public static int getColumnWidthInPx( int widthUnits )
-    {
-        int pixels = ( widthUnits / EXCEL_COLUMN_WIDTH_FACTOR )
-                * UNIT_OFFSET_LENGTH;
-
-        int offsetWidthUnits = widthUnits % EXCEL_COLUMN_WIDTH_FACTOR;
-        pixels += Math.round( offsetWidthUnits
-                / ( (float) EXCEL_COLUMN_WIDTH_FACTOR / UNIT_OFFSET_LENGTH ) );
-
-        return pixels;
-    }
-
-    /**
-     * @param mergedRanges
-     *            map of sheet merged ranges built with
-     *            {@link ExcelToHtmlUtils#buildMergedRangesMap(HSSFSheet)}
-     * @return {@link CellRangeAddress} from map if cell with specified row and
-     *         column numbers contained in found range, <tt>null</tt> otherwise
-     */
-    public static CellRangeAddress getMergedRange(
-            CellRangeAddress[][] mergedRanges, int rowNumber, int columnNumber )
-    {
-        CellRangeAddress[] mergedRangeRowInfo = rowNumber < mergedRanges.length ? mergedRanges[rowNumber]
-                : null;
-        CellRangeAddress cellRangeAddress = mergedRangeRowInfo != null
-                && columnNumber < mergedRangeRowInfo.length ? mergedRangeRowInfo[columnNumber]
-                : null;
-
-        return cellRangeAddress;
-    }
-
-    static boolean isEmpty( String str )
-    {
-        return str == null || str.length() == 0;
-    }
-
-    static boolean isNotEmpty( String str )
-    {
-        return !isEmpty( str );
-    }
-
-    public static HSSFWorkbook loadXls( File xlsFile ) throws IOException
-    {
-        final FileInputStream inputStream = new FileInputStream( xlsFile );
-        try
-        {
-            return new HSSFWorkbook( inputStream );
-        }
-        finally
-        {
-            IOUtils.closeQuietly( inputStream );
-        }
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
deleted file mode 100644
index 29d7ffc..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
+++ /dev/null
@@ -1,817 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.converter;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.hwpf.converter.FoDocumentFacade;
-import org.apache.poi.hwpf.converter.FontReplacer.Triplet;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.XMLHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * Converts xls files (97-2007) to XSL FO.
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Beta
-public class ExcelToFoConverter extends AbstractExcelConverter
-{
-    private static final float CM_PER_INCH = 2.54f;
-
-    private static final float DPI = 72;
-
-    private static final POILogger logger = POILogFactory
-            .getLogger( ExcelToFoConverter.class );
-
-    private static final float PAPER_A4_HEIGHT_INCHES = 29.4f / CM_PER_INCH;
-
-    private static final float PAPER_A4_WIDTH_INCHES = 21.0f / CM_PER_INCH;
-
-    /**
-     * Java main() interface to interact with {@link ExcelToFoConverter}
-     * 
-     * <p>
-     * Usage: ExcelToHtmlConverter infile outfile
-     * </p>
-     * Where infile is an input .xls file ( Word 97-2007) which will be rendered
-     * as XSL FO into outfile
-     */
-    public static void main( String[] args ) throws Exception {
-        if ( args.length < 2 ) {
-            System.err.println( "Usage: ExcelToFoConverter <inputFile.xls> <saveTo.xml>" );
-            return;
-        }
-
-        System.out.println( "Converting " + args[0] );
-        System.out.println( "Saving output to " + args[1] );
-
-        Document doc = ExcelToHtmlConverter.process( new File( args[0] ) );
-
-        DOMSource domSource = new DOMSource( doc );
-        StreamResult streamResult = new StreamResult( new File(args[1]) );
-
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer serializer = tf.newTransformer();
-        // TODO set encoding from a command argument
-        serializer.setOutputProperty( OutputKeys.ENCODING, "UTF-8" );
-        serializer.setOutputProperty( OutputKeys.INDENT, "no" );
-        serializer.setOutputProperty( OutputKeys.METHOD, "xml" );
-        serializer.transform( domSource, streamResult );
-    }
-
-    /**
-     * Converts Excel file (97-2007) into XSL FO file.
-     * 
-     * @param xlsFile
-     *            file to process
-     * @return DOM representation of result XSL FO
-     */
-    public static Document process( File xlsFile ) throws Exception
-    {
-        final HSSFWorkbook workbook = ExcelToFoUtils.loadXls( xlsFile );
-        ExcelToFoConverter excelToHtmlConverter = new ExcelToFoConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder()
-                        .newDocument() );
-        excelToHtmlConverter.processWorkbook( workbook );
-        Document doc = excelToHtmlConverter.getDocument();
-        workbook.close();
-        return doc;
-    }
-
-    private final FoDocumentFacade foDocumentFacade;
-
-    private float pageMarginInches = 0.4f;
-
-    public ExcelToFoConverter( Document document )
-    {
-        this.foDocumentFacade = new FoDocumentFacade( document );
-    }
-
-    public ExcelToFoConverter( FoDocumentFacade foDocumentFacade )
-    {
-        this.foDocumentFacade = foDocumentFacade;
-    }
-
-    protected String createPageMaster( float tableWidthIn, String pageMasterName )
-    {
-        final float paperHeightIn;
-        final float paperWidthIn;
-        {
-            float requiredWidthIn = tableWidthIn + 2 * getPageMarginInches();
-
-            if ( requiredWidthIn < PAPER_A4_WIDTH_INCHES )
-            {
-                // portrait orientation
-                paperWidthIn = PAPER_A4_WIDTH_INCHES;
-                paperHeightIn = PAPER_A4_HEIGHT_INCHES;
-            }
-            else
-            {
-                // landscape orientation
-                paperWidthIn = requiredWidthIn;
-                paperHeightIn = paperWidthIn
-                        * ( PAPER_A4_WIDTH_INCHES / PAPER_A4_HEIGHT_INCHES );
-            }
-        }
-
-        final float leftMargin = getPageMarginInches();
-        final float rightMargin = getPageMarginInches();
-        final float topMargin = getPageMarginInches();
-        final float bottomMargin = getPageMarginInches();
-
-        Element pageMaster = foDocumentFacade
-                .addSimplePageMaster( pageMasterName );
-        pageMaster.setAttribute( "page-height", paperHeightIn + "in" );
-        pageMaster.setAttribute( "page-width", paperWidthIn + "in" );
-
-        Element regionBody = foDocumentFacade.addRegionBody( pageMaster );
-        regionBody.setAttribute( "margin", topMargin + "in " + rightMargin
-                + "in " + bottomMargin + "in " + leftMargin + "in" );
-
-        return pageMasterName;
-    }
-
-    @Override
-    protected Document getDocument()
-    {
-        return foDocumentFacade.getDocument();
-    }
-
-    public float getPageMarginInches()
-    {
-        return pageMarginInches;
-    }
-
-    /**
-     * Returns <tt>false</tt> if cell style by itself (without text, i.e.
-     * borders, fill, etc.) worth a mention, <tt>true</tt> otherwise
-     * 
-     * @return <tt>false</tt> if cell style by itself (without text, i.e.
-     *         borders, fill, etc.) worth a mention, <tt>true</tt> otherwise
-     */
-    protected boolean isEmptyStyle( CellStyle cellStyle ) {
-        return cellStyle == null || (
-               cellStyle.getFillPattern() == 0
-            && cellStyle.getBorderTopEnum() == BorderStyle.NONE
-            && cellStyle.getBorderRightEnum() == BorderStyle.NONE
-            && cellStyle.getBorderBottomEnum() == BorderStyle.NONE
-            && cellStyle.getBorderLeftEnum() == BorderStyle.NONE
-        );
-    }
-
-    protected boolean processCell( HSSFWorkbook workbook, HSSFCell cell,
-            Element tableCellElement, int normalWidthPx, int maxSpannedWidthPx,
-            float normalHeightPt )
-    {
-        final HSSFCellStyle cellStyle = cell.getCellStyle();
-
-        String value;
-        switch ( cell.getCellTypeEnum() )
-        {
-        case STRING:
-            // XXX: enrich
-            value = cell.getRichStringCellValue().getString();
-            break;
-        case FORMULA:
-            switch ( cell.getCachedFormulaResultTypeEnum() )
-            {
-            case STRING:
-                HSSFRichTextString str = cell.getRichStringCellValue();
-                if ( str != null && str.length() > 0 )
-                {
-                    value = ( str.toString() );
-                }
-                else
-                {
-                    value = ExcelToHtmlUtils.EMPTY;
-                }
-                break;
-            case NUMERIC:
-                double nValue = cell.getNumericCellValue();
-                short df = cellStyle.getDataFormat();
-                String dfs = cellStyle.getDataFormatString();
-                value = _formatter.formatRawCellContents(nValue, df, dfs );
-                break;
-            case BOOLEAN:
-                value = Boolean.toString( cell.getBooleanCellValue() );
-                break;
-            case ERROR:
-                value = ErrorEval.getText( cell.getErrorCellValue() );
-                break;
-            default:
-                logger.log(
-                        POILogger.WARN,
-                        "Unexpected cell cachedFormulaResultType ("
-                                + cell.getCachedFormulaResultTypeEnum() + ")" );
-                value = ExcelToHtmlUtils.EMPTY;
-                break;
-            }
-            break;
-        case BLANK:
-            value = ExcelToHtmlUtils.EMPTY;
-            break;
-        case NUMERIC:
-            value = _formatter.formatCellValue( cell );
-            break;
-        case BOOLEAN:
-            value = Boolean.toString( cell.getBooleanCellValue() );
-            break;
-        case ERROR:
-            value = ErrorEval.getText( cell.getErrorCellValue() );
-            break;
-        default:
-            logger.log( POILogger.WARN,
-                    "Unexpected cell type (" + cell.getCellTypeEnum() + ")" );
-            return true;
-        }
-
-        final boolean noText = ExcelToHtmlUtils.isEmpty( value );
-        final boolean wrapInDivs = !noText && !cellStyle.getWrapText();
-
-        final boolean emptyStyle = isEmptyStyle( cellStyle );
-        if ( !emptyStyle && noText ) {
-            /*
-             * if cell style is defined (like borders, etc.) but cell text
-             * is empty, add "&nbsp;" to output, so browser won't collapse
-             * and ignore cell
-             */
-            value = "\u00A0";
-        }
-
-        if ( isOutputLeadingSpacesAsNonBreaking() && value.startsWith( " " ) )
-        {
-            StringBuilder builder = new StringBuilder();
-            for ( int c = 0; c < value.length(); c++ )
-            {
-                if ( value.charAt( c ) != ' ' ) {
-                    break;
-                }
-                builder.append( '\u00a0' );
-            }
-
-            if ( value.length() != builder.length() ) {
-                builder.append( value.substring( builder.length() ) );
-            }
-
-            value = builder.toString();
-        }
-
-        Text text = foDocumentFacade.createText( value );
-        Element block = foDocumentFacade.createBlock();
-
-        if ( wrapInDivs )
-        {
-            block.setAttribute( "absolute-position", "fixed" );
-            block.setAttribute( "left", "0px" );
-            block.setAttribute( "top", "0px" );
-            block.setAttribute( "bottom", "0px" );
-            block.setAttribute( "min-width", normalWidthPx + "px" );
-
-            if ( maxSpannedWidthPx != Integer.MAX_VALUE )
-            {
-                block.setAttribute( "max-width", maxSpannedWidthPx + "px" );
-            }
-
-            block.setAttribute( "overflow", "hidden" );
-            block.setAttribute( "height", normalHeightPt + "pt" );
-            block.setAttribute( "keep-together.within-line", "always" );
-            block.setAttribute( "wrap-option", "no-wrap" );
-        }
-
-        processCellStyle( workbook, cell.getCellStyle(), tableCellElement,
-                block );
-
-        block.appendChild( text );
-        tableCellElement.appendChild( block );
-
-        return ExcelToHtmlUtils.isEmpty( value ) && emptyStyle;
-    }
-
-    protected void processCellStyle( HSSFWorkbook workbook,
-            HSSFCellStyle cellStyle, Element cellTarget, Element blockTarget )
-    {
-        blockTarget.setAttribute( "white-space-collapse", "false" );
-        {
-            String textAlign = ExcelToFoUtils.getAlign( cellStyle
-                    .getAlignment() );
-            if ( ExcelToFoUtils.isNotEmpty( textAlign ) )
-                blockTarget.setAttribute( "text-align", textAlign );
-        }
-
-        if ( cellStyle.getFillPattern() == 0 )
-        {
-            // no fill
-        }
-        else if ( cellStyle.getFillPattern() == 1 )
-        {
-            final HSSFColor foregroundColor = cellStyle
-                    .getFillForegroundColorColor();
-            if ( foregroundColor != null )
-                cellTarget.setAttribute( "background-color",
-                        ExcelToFoUtils.getColor( foregroundColor ) );
-        }
-        else
-        {
-            final HSSFColor backgroundColor = cellStyle
-                    .getFillBackgroundColorColor();
-            if ( backgroundColor != null )
-                cellTarget.setAttribute( "background-color",
-                        ExcelToHtmlUtils.getColor( backgroundColor ) );
-        }
-
-        processCellStyleBorder( workbook, cellTarget, "top",
-                cellStyle.getBorderTopEnum(), cellStyle.getTopBorderColor() );
-        processCellStyleBorder( workbook, cellTarget, "right",
-                cellStyle.getBorderRightEnum(), cellStyle.getRightBorderColor() );
-        processCellStyleBorder( workbook, cellTarget, "bottom",
-                cellStyle.getBorderBottomEnum(), cellStyle.getBottomBorderColor() );
-        processCellStyleBorder( workbook, cellTarget, "left",
-                cellStyle.getBorderLeftEnum(), cellStyle.getLeftBorderColor() );
-
-        HSSFFont font = cellStyle.getFont( workbook );
-        processCellStyleFont( workbook, blockTarget, font );
-
-    }
-
-    protected void processCellStyleBorder( HSSFWorkbook workbook,
-            Element cellTarget, String type, BorderStyle xlsBorder, short borderColor )
-    {
-        if ( xlsBorder == BorderStyle.NONE )
-            return;
-
-        StringBuilder borderStyle = new StringBuilder();
-        borderStyle.append( ExcelToHtmlUtils.getBorderWidth( xlsBorder ) );
-
-        final HSSFColor color = workbook.getCustomPalette().getColor(
-                borderColor );
-        if ( color != null )
-        {
-            borderStyle.append( ' ' );
-            borderStyle.append( ExcelToHtmlUtils.getColor( color ) );
-
-            borderStyle.append( ' ' );
-            borderStyle.append( ExcelToHtmlUtils.getBorderStyle( xlsBorder ) );
-        }
-
-        cellTarget.setAttribute( "border-" + type, borderStyle.toString() );
-    }
-
-    protected void processCellStyleFont( HSSFWorkbook workbook,
-            Element blockTarget, HSSFFont font )
-    {
-        Triplet triplet = new Triplet();
-        triplet.fontName = font.getFontName();
-
-        switch ( font.getBoldweight() )
-        {
-        case HSSFFont.BOLDWEIGHT_BOLD:
-            triplet.bold = true;
-            break;
-        case HSSFFont.BOLDWEIGHT_NORMAL:
-        default:
-            triplet.bold = false;
-            break;
-        }
-
-        if ( font.getItalic() )
-        {
-            triplet.italic = true;
-        }
-
-        getFontReplacer().update( triplet );
-        setBlockProperties( blockTarget, triplet );
-
-        final HSSFColor fontColor = workbook.getCustomPalette().getColor(
-                font.getColor() );
-        if ( fontColor != null )
-            blockTarget.setAttribute( "color",
-                    ExcelToHtmlUtils.getColor( fontColor ) );
-
-        if ( font.getFontHeightInPoints() != 0 )
-            blockTarget.setAttribute( "font-size", font.getFontHeightInPoints()
-                    + "pt" );
-
-    }
-
-    protected void processColumnHeaders( HSSFSheet sheet, int maxSheetColumns,
-            Element table )
-    {
-        Element tableHeader = foDocumentFacade.createTableHeader();
-        Element row = foDocumentFacade.createTableRow();
-
-        if ( isOutputRowNumbers() )
-        {
-            // empty cell at left-top corner
-            final Element tableCellElement = foDocumentFacade.createTableCell();
-            tableCellElement.appendChild( foDocumentFacade.createBlock() );
-            row.appendChild( tableCellElement );
-        }
-
-        for ( int c = 0; c < maxSheetColumns; c++ )
-        {
-            if ( !isOutputHiddenColumns() && sheet.isColumnHidden( c ) )
-                continue;
-
-            Element cell = foDocumentFacade.createTableCell();
-            Element block = foDocumentFacade.createBlock();
-            block.setAttribute( "text-align", "center" );
-            block.setAttribute( "font-weight", "bold" );
-
-            String text = getColumnName( c );
-            block.appendChild( foDocumentFacade.createText( text ) );
-
-            cell.appendChild( block );
-            row.appendChild( cell );
-        }
-
-        tableHeader.appendChild( row );
-        table.appendChild( tableHeader );
-    }
-
-    /**
-     * Creates COLGROUP element with width specified for all columns. (Except
-     * first if <tt>{@link #isOutputRowNumbers()}==true</tt>)
-     * 
-     * @return table width in inches
-     */
-    protected float processColumnWidths( HSSFSheet sheet, int maxSheetColumns,
-            Element table )
-    {
-        float tableWidth = 0;
-
-        if ( isOutputRowNumbers() )
-        {
-            final float columnWidthIn = getDefaultColumnWidth( sheet ) / DPI;
-
-            final Element rowNumberColumn = foDocumentFacade
-                    .createTableColumn();
-            rowNumberColumn.setAttribute( "column-width", columnWidthIn + "in" );
-            table.appendChild( rowNumberColumn );
-
-            tableWidth += columnWidthIn;
-        }
-
-        for ( int c = 0; c < maxSheetColumns; c++ )
-        {
-            if ( !isOutputHiddenColumns() && sheet.isColumnHidden( c ) )
-                continue;
-
-            final float columnWidthIn = getColumnWidth( sheet, c ) / DPI;
-
-            Element col = foDocumentFacade.createTableColumn();
-            col.setAttribute( "column-width", columnWidthIn + "in" );
-            table.appendChild( col );
-
-            tableWidth += columnWidthIn;
-        }
-
-        table.setAttribute( "width", tableWidth + "in" );
-        return tableWidth;
-    }
-
-    protected void processDocumentInformation(
-            SummaryInformation summaryInformation )
-    {
-        if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getTitle() ) )
-            foDocumentFacade.setTitle( summaryInformation.getTitle() );
-
-        if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getAuthor() ) )
-            foDocumentFacade.setCreator( summaryInformation.getAuthor() );
-
-        if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getKeywords() ) )
-            foDocumentFacade.setKeywords( summaryInformation.getKeywords() );
-
-        if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getComments() ) )
-            foDocumentFacade.setDescription( summaryInformation.getComments() );
-    }
-
-    /**
-     * @return maximum 1-base index of column that were rendered, zero if none
-     */
-    protected int processRow( HSSFWorkbook workbook,
-            CellRangeAddress[][] mergedRanges, HSSFRow row,
-            Element tableRowElement )
-    {
-        final HSSFSheet sheet = row.getSheet();
-        final short maxColIx = row.getLastCellNum();
-        if ( maxColIx <= 0 )
-        {
-            return 0;
-        }
-
-        final List<Element> emptyCells = new ArrayList<Element>( maxColIx );
-
-        if ( isOutputRowNumbers() )
-        {
-            Element tableRowNumberCellElement = processRowNumber( row );
-            emptyCells.add( tableRowNumberCellElement );
-        }
-
-        int maxRenderedColumn = 0;
-        for ( int colIx = 0; colIx < maxColIx; colIx++ )
-        {
-            if ( !isOutputHiddenColumns() && sheet.isColumnHidden( colIx ) )
-                continue;
-
-            CellRangeAddress range = ExcelToHtmlUtils.getMergedRange(
-                    mergedRanges, row.getRowNum(), colIx );
-
-            if ( range != null
-                    && ( range.getFirstColumn() != colIx || range.getFirstRow() != row
-                            .getRowNum() ) )
-                continue;
-
-            HSSFCell cell = row.getCell( colIx );
-
-            // spanning using overlapping blocks
-            int divWidthPx = 0;
-            {
-                divWidthPx = getColumnWidth( sheet, colIx );
-
-                boolean hasBreaks = false;
-                for ( int nextColumnIndex = colIx + 1; nextColumnIndex < maxColIx; nextColumnIndex++ )
-                {
-                    if ( !isOutputHiddenColumns()
-                            && sheet.isColumnHidden( nextColumnIndex ) )
-                        continue;
-
-                    if ( row.getCell( nextColumnIndex ) != null
-                            && !isTextEmpty( row.getCell( nextColumnIndex ) ) )
-                    {
-                        hasBreaks = true;
-                        break;
-                    }
-
-                    divWidthPx += getColumnWidth( sheet, nextColumnIndex );
-                }
-
-                if ( !hasBreaks )
-                    divWidthPx = Integer.MAX_VALUE;
-            }
-
-            Element tableCellElement = foDocumentFacade.createTableCell();
-
-            if ( range != null )
-            {
-                if ( range.getFirstColumn() != range.getLastColumn() )
-                    tableCellElement.setAttribute(
-                            "number-columns-spanned",
-                            String.valueOf( range.getLastColumn()
-                                    - range.getFirstColumn() + 1 ) );
-                if ( range.getFirstRow() != range.getLastRow() )
-                    tableCellElement.setAttribute(
-                            "number-rows-spanned",
-                            String.valueOf( range.getLastRow()
-                                    - range.getFirstRow() + 1 ) );
-            }
-
-            boolean emptyCell;
-            if ( cell != null )
-            {
-                emptyCell = processCell( workbook, cell, tableCellElement,
-                        getColumnWidth( sheet, colIx ), divWidthPx,
-                        row.getHeight() / 20f );
-            }
-            else
-            {
-                tableCellElement.appendChild( foDocumentFacade.createBlock() );
-                emptyCell = true;
-            }
-
-            if ( emptyCell )
-            {
-                emptyCells.add( tableCellElement );
-            }
-            else
-            {
-                for ( Element emptyCellElement : emptyCells )
-                {
-                    tableRowElement.appendChild( emptyCellElement );
-                }
-                emptyCells.clear();
-
-                tableRowElement.appendChild( tableCellElement );
-                maxRenderedColumn = colIx;
-            }
-        }
-
-        return maxRenderedColumn + 1;
-    }
-
-    protected Element processRowNumber( HSSFRow row )
-    {
-        Element tableRowNumberCellElement = foDocumentFacade.createTableCell();
-
-        Element block = foDocumentFacade.createBlock();
-        block.setAttribute( "text-align", "right" );
-        block.setAttribute( "font-weight", "bold" );
-
-        Text text = foDocumentFacade.createText( getRowName( row ) );
-        block.appendChild( text );
-
-        tableRowNumberCellElement.appendChild( block );
-        return tableRowNumberCellElement;
-    }
-
-    protected float processSheet( HSSFWorkbook workbook, HSSFSheet sheet,
-            Element flow )
-    {
-        final int physicalNumberOfRows = sheet.getPhysicalNumberOfRows();
-        if ( physicalNumberOfRows <= 0 )
-            return 0;
-
-        processSheetName( sheet, flow );
-
-        Element table = foDocumentFacade.createTable();
-        table.setAttribute( "table-layout", "fixed" );
-
-        Element tableBody = foDocumentFacade.createTableBody();
-
-        final CellRangeAddress[][] mergedRanges = ExcelToHtmlUtils
-                .buildMergedRangesMap( sheet );
-
-        final List<Element> emptyRowElements = new ArrayList<Element>(
-                physicalNumberOfRows );
-        int maxSheetColumns = 1;
-        for ( int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++ )
-        {
-            HSSFRow row = sheet.getRow( r );
-
-            if ( row == null )
-                continue;
-
-            if ( !isOutputHiddenRows() && row.getZeroHeight() )
-                continue;
-
-            Element tableRowElement = foDocumentFacade.createTableRow();
-            tableRowElement.setAttribute( "height", row.getHeight() / 20f
-                    + "pt" );
-
-            int maxRowColumnNumber = processRow( workbook, mergedRanges, row,
-                    tableRowElement );
-
-            if ( tableRowElement.getChildNodes().getLength() == 0 )
-            {
-                Element emptyCellElement = foDocumentFacade.createTableCell();
-                emptyCellElement.appendChild( foDocumentFacade.createBlock() );
-                tableRowElement.appendChild( emptyCellElement );
-            }
-
-            if ( maxRowColumnNumber == 0 )
-            {
-                emptyRowElements.add( tableRowElement );
-            }
-            else
-            {
-                if ( !emptyRowElements.isEmpty() )
-                {
-                    for ( Element emptyRowElement : emptyRowElements )
-                    {
-                        tableBody.appendChild( emptyRowElement );
-                    }
-                    emptyRowElements.clear();
-                }
-
-                tableBody.appendChild( tableRowElement );
-            }
-            maxSheetColumns = Math.max( maxSheetColumns, maxRowColumnNumber );
-        }
-
-        float tableWidthIn = processColumnWidths( sheet, maxSheetColumns, table );
-
-        if ( isOutputColumnHeaders() )
-        {
-            processColumnHeaders( sheet, maxSheetColumns, table );
-        }
-
-        table.appendChild( tableBody );
-        flow.appendChild( table );
-
-        return tableWidthIn;
-    }
-
-    /**
-     * Process single sheet (as specified by 0-based sheet index)
-     * 
-     * @return <tt>true</tt> if result were added to FO document, <tt>false</tt>
-     *         otherwise
-     */
-    protected boolean processSheet( HSSFWorkbook workbook, int sheetIndex )
-    {
-        String pageMasterName = "sheet-" + sheetIndex;
-
-        Element pageSequence = foDocumentFacade
-                .createPageSequence( pageMasterName );
-        Element flow = foDocumentFacade.addFlowToPageSequence( pageSequence,
-                "xsl-region-body" );
-
-        HSSFSheet sheet = workbook.getSheetAt( sheetIndex );
-        float tableWidthIn = processSheet( workbook, sheet, flow );
-
-        if ( tableWidthIn == 0 )
-            return false;
-
-        createPageMaster( tableWidthIn, pageMasterName );
-        foDocumentFacade.addPageSequence( pageSequence );
-        return true;
-    }
-
-    protected void processSheetName( HSSFSheet sheet, Element flow )
-    {
-        Element titleBlock = foDocumentFacade.createBlock();
-
-        Triplet triplet = new Triplet();
-        triplet.bold = true;
-        triplet.italic = false;
-        triplet.fontName = "Arial";
-        getFontReplacer().update( triplet );
-
-        setBlockProperties( titleBlock, triplet );
-        titleBlock.setAttribute( "font-size", "200%" );
-
-        Element titleInline = foDocumentFacade.createInline();
-        titleInline.appendChild( foDocumentFacade.createText( sheet
-                .getSheetName() ) );
-        titleBlock.appendChild( titleInline );
-        flow.appendChild( titleBlock );
-
-        Element titleBlock2 = foDocumentFacade.createBlock();
-        Element titleInline2 = foDocumentFacade.createInline();
-        titleBlock2.appendChild( titleInline2 );
-        flow.appendChild( titleBlock2 );
-    }
-
-    public void processWorkbook( HSSFWorkbook workbook )
-    {
-        final SummaryInformation summaryInformation = workbook
-                .getSummaryInformation();
-        if ( summaryInformation != null )
-        {
-            processDocumentInformation( summaryInformation );
-        }
-
-        for ( int s = 0; s < workbook.getNumberOfSheets(); s++ )
-        {
-            processSheet( workbook, s );
-        }
-    }
-
-    private void setBlockProperties( Element textBlock, Triplet triplet )
-    {
-        if ( triplet.bold )
-            textBlock.setAttribute( "font-weight", "bold" );
-
-        if ( triplet.italic )
-            textBlock.setAttribute( "font-style", "italic" );
-
-        if ( ExcelToFoUtils.isNotEmpty( triplet.fontName ) )
-            textBlock.setAttribute( "font-family", triplet.fontName );
-    }
-
-    public void setPageMarginInches( float pageMarginInches )
-    {
-        this.pageMarginInches = pageMarginInches;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoUtils.java
deleted file mode 100644
index 2682550..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoUtils.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.converter;
-
-import org.apache.poi.util.Beta;
-
-@Beta
-public class ExcelToFoUtils extends AbstractExcelUtils
-{
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
deleted file mode 100644
index 5019339..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
+++ /dev/null
@@ -1,761 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.converter;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.hwpf.converter.HtmlDocumentFacade;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.XMLHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * Converts xls files (97-2007) to HTML file.
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Beta
-public class ExcelToHtmlConverter extends AbstractExcelConverter
-{
-
-    private static final POILogger logger = POILogFactory
-            .getLogger( ExcelToHtmlConverter.class );
-
-    /**
-     * Java main() interface to interact with {@link ExcelToHtmlConverter}
-     * 
-     * <p>
-     * Usage: ExcelToHtmlConverter infile outfile
-     * </p>
-     * Where infile is an input .xls file ( Word 97-2007) which will be rendered
-     * as HTML into outfile
-     * @throws TransformerException 
-     * @throws Exception 
-     */
-    public static void main( String[] args )
-    throws IOException, ParserConfigurationException, TransformerException
-    {
-        if ( args.length < 2 )
-        {
-            System.err
-                    .println( "Usage: ExcelToHtmlConverter <inputFile.xls> <saveTo.html>" );
-            return;
-        }
-
-        System.out.println( "Converting " + args[0] );
-        System.out.println( "Saving output to " + args[1] );
-
-        Document doc = ExcelToHtmlConverter.process( new File( args[0] ) );
-
-        DOMSource domSource = new DOMSource( doc );
-        StreamResult streamResult = new StreamResult( new File(args[1]) );
-
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer serializer = tf.newTransformer();
-        // TODO set encoding from a command argument
-        serializer.setOutputProperty( OutputKeys.ENCODING, "UTF-8" );
-        serializer.setOutputProperty( OutputKeys.INDENT, "no" );
-        serializer.setOutputProperty( OutputKeys.METHOD, "html" );
-        serializer.transform( domSource, streamResult );
-    }
-
-    /**
-     * Converts Excel file (97-2007) into HTML file.
-     * 
-     * @param xlsFile
-     *            file to process
-     * @return DOM representation of result HTML
-     * @throws IOException 
-     * @throws ParserConfigurationException 
-     */
-    public static Document process( File xlsFile ) throws IOException, ParserConfigurationException
-    {
-        final HSSFWorkbook workbook = ExcelToHtmlUtils.loadXls( xlsFile );
-        ExcelToHtmlConverter excelToHtmlConverter = new ExcelToHtmlConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder()
-                        .newDocument() );
-        excelToHtmlConverter.processWorkbook( workbook );
-        Document doc = excelToHtmlConverter.getDocument();
-        workbook.close();
-        return doc;
-    }
-
-    private String cssClassContainerCell = null;
-
-    private String cssClassContainerDiv = null;
-
-    private String cssClassPrefixCell = "c";
-
-    private String cssClassPrefixDiv = "d";
-
-    private String cssClassPrefixRow = "r";
-
-    private String cssClassPrefixTable = "t";
-
-    private Map<Short, String> excelStyleToClass = new LinkedHashMap<Short, String>();
-
-    private final HtmlDocumentFacade htmlDocumentFacade;
-
-    private boolean useDivsToSpan = false;
-
-    public ExcelToHtmlConverter( Document doc )
-    {
-        htmlDocumentFacade = new HtmlDocumentFacade( doc );
-    }
-
-    public ExcelToHtmlConverter( HtmlDocumentFacade htmlDocumentFacade )
-    {
-        this.htmlDocumentFacade = htmlDocumentFacade;
-    }
-
-    protected String buildStyle( HSSFWorkbook workbook, HSSFCellStyle cellStyle )
-    {
-        StringBuilder style = new StringBuilder();
-
-        style.append( "white-space:pre-wrap;" );
-        ExcelToHtmlUtils.appendAlign( style, cellStyle.getAlignment() );
-
-        switch (cellStyle.getFillPattern()) {
-            // no fill
-            case 0: break;
-            case 1:
-                final HSSFColor foregroundColor = cellStyle.getFillForegroundColorColor();
-                if ( foregroundColor == null ) break;
-                String fgCol = ExcelToHtmlUtils.getColor( foregroundColor );
-                style.append( "background-color:" + fgCol + ";" );
-                break;
-            default:
-                final HSSFColor backgroundColor = cellStyle.getFillBackgroundColorColor();
-                if ( backgroundColor == null ) break;
-                String bgCol = ExcelToHtmlUtils.getColor( backgroundColor );
-                style.append( "background-color:" + bgCol + ";" );
-                break;
-        }
-
-        buildStyle_border( workbook, style, "top", cellStyle.getBorderTopEnum(),
-                cellStyle.getTopBorderColor() );
-        buildStyle_border( workbook, style, "right",
-                cellStyle.getBorderRightEnum(), cellStyle.getRightBorderColor() );
-        buildStyle_border( workbook, style, "bottom",
-                cellStyle.getBorderBottomEnum(), cellStyle.getBottomBorderColor() );
-        buildStyle_border( workbook, style, "left", cellStyle.getBorderLeftEnum(),
-                cellStyle.getLeftBorderColor() );
-
-        HSSFFont font = cellStyle.getFont( workbook );
-        buildStyle_font( workbook, style, font );
-
-        return style.toString();
-    }
-
-    private void buildStyle_border( HSSFWorkbook workbook, StringBuilder style,
-            String type, BorderStyle xlsBorder, short borderColor )
-    {
-        if ( xlsBorder == BorderStyle.NONE ) {
-            return;
-        }
-
-        StringBuilder borderStyle = new StringBuilder();
-        borderStyle.append( ExcelToHtmlUtils.getBorderWidth( xlsBorder ) );
-        borderStyle.append( ' ' );
-        borderStyle.append( ExcelToHtmlUtils.getBorderStyle( xlsBorder ) );
-
-        final HSSFColor color = workbook.getCustomPalette().getColor(
-                borderColor );
-        if ( color != null )
-        {
-            borderStyle.append( ' ' );
-            borderStyle.append( ExcelToHtmlUtils.getColor( color ) );
-        }
-
-        style.append( "border-" + type + ":" + borderStyle + ";" );
-    }
-
-    void buildStyle_font( HSSFWorkbook workbook, StringBuilder style,
-            HSSFFont font )
-    {
-        switch ( font.getBoldweight() )
-        {
-        case HSSFFont.BOLDWEIGHT_BOLD:
-            style.append( "font-weight:bold;" );
-            break;
-        case HSSFFont.BOLDWEIGHT_NORMAL:
-            // by default, not not increase HTML size
-            // style.append( "font-weight: normal; " );
-            break;
-        }
-
-        final HSSFColor fontColor = workbook.getCustomPalette().getColor(
-                font.getColor() );
-        if ( fontColor != null )
-            style.append( "color: " + ExcelToHtmlUtils.getColor( fontColor )
-                    + "; " );
-
-        if ( font.getFontHeightInPoints() != 0 )
-            style.append( "font-size:" + font.getFontHeightInPoints() + "pt;" );
-
-        if ( font.getItalic() )
-        {
-            style.append( "font-style:italic;" );
-        }
-    }
-
-    public String getCssClassPrefixCell()
-    {
-        return cssClassPrefixCell;
-    }
-
-    public String getCssClassPrefixDiv()
-    {
-        return cssClassPrefixDiv;
-    }
-
-    public String getCssClassPrefixRow()
-    {
-        return cssClassPrefixRow;
-    }
-
-    public String getCssClassPrefixTable()
-    {
-        return cssClassPrefixTable;
-    }
-
-    public Document getDocument()
-    {
-        return htmlDocumentFacade.getDocument();
-    }
-
-    protected String getStyleClassName( HSSFWorkbook workbook,
-            HSSFCellStyle cellStyle )
-    {
-        final Short cellStyleKey = Short.valueOf( cellStyle.getIndex() );
-
-        String knownClass = excelStyleToClass.get( cellStyleKey );
-        if ( knownClass != null )
-            return knownClass;
-
-        String cssStyle = buildStyle( workbook, cellStyle );
-        String cssClass = htmlDocumentFacade.getOrCreateCssClass(
-                cssClassPrefixCell, cssStyle );
-        excelStyleToClass.put( cellStyleKey, cssClass );
-        return cssClass;
-    }
-
-    public boolean isUseDivsToSpan()
-    {
-        return useDivsToSpan;
-    }
-
-    protected boolean processCell( HSSFCell cell, Element tableCellElement,
-            int normalWidthPx, int maxSpannedWidthPx, float normalHeightPt )
-    {
-        final HSSFCellStyle cellStyle = cell.getCellStyle();
-
-        String value;
-        switch ( cell.getCellTypeEnum() )
-        {
-        case STRING:
-            // XXX: enrich
-            value = cell.getRichStringCellValue().getString();
-            break;
-        case FORMULA:
-            switch ( cell.getCachedFormulaResultTypeEnum() )
-            {
-            case STRING:
-                HSSFRichTextString str = cell.getRichStringCellValue();
-                if ( str != null && str.length() > 0 )
-                {
-                    value = ( str.toString() );
-                }
-                else
-                {
-                    value = ExcelToHtmlUtils.EMPTY;
-                }
-                break;
-            case NUMERIC:
-                double nValue = cell.getNumericCellValue();
-                short df = cellStyle.getDataFormat();
-                String dfs = cellStyle.getDataFormatString();
-                value = _formatter.formatRawCellContents(nValue, df, dfs);
-                break;
-            case BOOLEAN:
-                value = String.valueOf( cell.getBooleanCellValue() );
-                break;
-            case ERROR:
-                value = ErrorEval.getText( cell.getErrorCellValue() );
-                break;
-            default:
-                logger.log(
-                        POILogger.WARN,
-                        "Unexpected cell cachedFormulaResultType ("
-                                + cell.getCachedFormulaResultTypeEnum() + ")" );
-                value = ExcelToHtmlUtils.EMPTY;
-                break;
-            }
-            break;
-        case BLANK:
-            value = ExcelToHtmlUtils.EMPTY;
-            break;
-        case NUMERIC:
-            value = _formatter.formatCellValue( cell );
-            break;
-        case BOOLEAN:
-            value = String.valueOf( cell.getBooleanCellValue() );
-            break;
-        case ERROR:
-            value = ErrorEval.getText( cell.getErrorCellValue() );
-            break;
-        default:
-            logger.log( POILogger.WARN,
-                    "Unexpected cell type (" + cell.getCellTypeEnum() + ")" );
-            return true;
-        }
-
-        final boolean noText = ExcelToHtmlUtils.isEmpty( value );
-        final boolean wrapInDivs = !noText && isUseDivsToSpan() && !cellStyle.getWrapText();
-
-        if ( cellStyle.getIndex() != 0 )
-        {
-            @SuppressWarnings("resource")
-            HSSFWorkbook workbook = cell.getRow().getSheet().getWorkbook();
-            String mainCssClass = getStyleClassName( workbook, cellStyle );
-            
-            if ( wrapInDivs ) {
-                tableCellElement.setAttribute( "class", mainCssClass + " "
-                        + cssClassContainerCell );
-            } else {
-                tableCellElement.setAttribute( "class", mainCssClass );
-            }
-
-            if ( noText ) {
-                /*
-                 * if cell style is defined (like borders, etc.) but cell text
-                 * is empty, add "&nbsp;" to output, so browser won't collapse
-                 * and ignore cell
-                 */
-                value = "\u00A0";
-            }
-        }
-
-        if ( isOutputLeadingSpacesAsNonBreaking() && value.startsWith( " " ) )
-        {
-            StringBuilder builder = new StringBuilder();
-            for ( int c = 0; c < value.length(); c++ )
-            {
-                if ( value.charAt( c ) != ' ' )
-                    break;
-                builder.append( '\u00a0' );
-            }
-
-            if ( value.length() != builder.length() )
-                builder.append( value.substring( builder.length() ) );
-
-            value = builder.toString();
-        }
-
-        Text text = htmlDocumentFacade.createText( value );
-
-        if ( wrapInDivs )
-        {
-            Element outerDiv = htmlDocumentFacade.createBlock();
-            outerDiv.setAttribute( "class", this.cssClassContainerDiv );
-
-            Element innerDiv = htmlDocumentFacade.createBlock();
-            StringBuilder innerDivStyle = new StringBuilder();
-            innerDivStyle.append( "position:absolute;min-width:" );
-            innerDivStyle.append( normalWidthPx );
-            innerDivStyle.append( "px;" );
-            if ( maxSpannedWidthPx != Integer.MAX_VALUE )
-            {
-                innerDivStyle.append( "max-width:" );
-                innerDivStyle.append( maxSpannedWidthPx );
-                innerDivStyle.append( "px;" );
-            }
-            innerDivStyle.append( "overflow:hidden;max-height:" );
-            innerDivStyle.append( normalHeightPt );
-            innerDivStyle.append( "pt;white-space:nowrap;" );
-            ExcelToHtmlUtils.appendAlign( innerDivStyle, cellStyle.getAlignment() );
-            htmlDocumentFacade.addStyleClass( outerDiv, cssClassPrefixDiv,
-                    innerDivStyle.toString() );
-
-            innerDiv.appendChild( text );
-            outerDiv.appendChild( innerDiv );
-            tableCellElement.appendChild( outerDiv );
-        }
-        else
-        {
-            tableCellElement.appendChild( text );
-        }
-
-        return ExcelToHtmlUtils.isEmpty( value ) && (cellStyle.getIndex() == 0);
-    }
-
-    protected void processColumnHeaders( HSSFSheet sheet, int maxSheetColumns,
-            Element table )
-    {
-        Element tableHeader = htmlDocumentFacade.createTableHeader();
-        table.appendChild( tableHeader );
-
-        Element tr = htmlDocumentFacade.createTableRow();
-
-        if ( isOutputRowNumbers() )
-        {
-            // empty row at left-top corner
-            tr.appendChild( htmlDocumentFacade.createTableHeaderCell() );
-        }
-
-        for ( int c = 0; c < maxSheetColumns; c++ )
-        {
-            if ( !isOutputHiddenColumns() && sheet.isColumnHidden( c ) )
-                continue;
-
-            Element th = htmlDocumentFacade.createTableHeaderCell();
-            String text = getColumnName( c );
-            th.appendChild( htmlDocumentFacade.createText( text ) );
-            tr.appendChild( th );
-        }
-        tableHeader.appendChild( tr );
-    }
-
-    /**
-     * Creates COLGROUP element with width specified for all columns. (Except
-     * first if <tt>{@link #isOutputRowNumbers()}==true</tt>)
-     */
-    protected void processColumnWidths( HSSFSheet sheet, int maxSheetColumns,
-            Element table )
-    {
-        // draw COLS after we know max column number
-        Element columnGroup = htmlDocumentFacade.createTableColumnGroup();
-        if ( isOutputRowNumbers() )
-        {
-            columnGroup.appendChild( htmlDocumentFacade.createTableColumn() );
-        }
-        for ( int c = 0; c < maxSheetColumns; c++ )
-        {
-            if ( !isOutputHiddenColumns() && sheet.isColumnHidden( c ) )
-                continue;
-
-            Element col = htmlDocumentFacade.createTableColumn();
-            col.setAttribute( "width",
-                    String.valueOf( getColumnWidth( sheet, c ) ) );
-            columnGroup.appendChild( col );
-        }
-        table.appendChild( columnGroup );
-    }
-
-    protected void processDocumentInformation(
-            SummaryInformation summaryInformation )
-    {
-        if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getTitle() ) )
-            htmlDocumentFacade.setTitle( summaryInformation.getTitle() );
-
-        if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getAuthor() ) )
-            htmlDocumentFacade.addAuthor( summaryInformation.getAuthor() );
-
-        if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getKeywords() ) )
-            htmlDocumentFacade.addKeywords( summaryInformation.getKeywords() );
-
-        if ( ExcelToHtmlUtils.isNotEmpty( summaryInformation.getComments() ) )
-            htmlDocumentFacade
-                    .addDescription( summaryInformation.getComments() );
-    }
-
-    /**
-     * @return maximum 1-base index of column that were rendered, zero if none
-     */
-    protected int processRow( CellRangeAddress[][] mergedRanges, HSSFRow row,
-            Element tableRowElement )
-    {
-        final HSSFSheet sheet = row.getSheet();
-        final short maxColIx = row.getLastCellNum();
-        if ( maxColIx <= 0 )
-            return 0;
-
-        final List<Element> emptyCells = new ArrayList<Element>( maxColIx );
-
-        if ( isOutputRowNumbers() )
-        {
-            Element tableRowNumberCellElement = htmlDocumentFacade
-                    .createTableHeaderCell();
-            processRowNumber( row, tableRowNumberCellElement );
-            emptyCells.add( tableRowNumberCellElement );
-        }
-
-        int maxRenderedColumn = 0;
-        for ( int colIx = 0; colIx < maxColIx; colIx++ )
-        {
-            if ( !isOutputHiddenColumns() && sheet.isColumnHidden( colIx ) )
-                continue;
-
-            CellRangeAddress range = ExcelToHtmlUtils.getMergedRange(
-                    mergedRanges, row.getRowNum(), colIx );
-
-            if ( range != null
-                    && ( range.getFirstColumn() != colIx || range.getFirstRow() != row
-                            .getRowNum() ) )
-                continue;
-
-            HSSFCell cell = row.getCell( colIx );
-
-            int divWidthPx = 0;
-            if ( isUseDivsToSpan() )
-            {
-                divWidthPx = getColumnWidth( sheet, colIx );
-
-                boolean hasBreaks = false;
-                for ( int nextColumnIndex = colIx + 1; nextColumnIndex < maxColIx; nextColumnIndex++ )
-                {
-                    if ( !isOutputHiddenColumns()
-                            && sheet.isColumnHidden( nextColumnIndex ) )
-                        continue;
-
-                    if ( row.getCell( nextColumnIndex ) != null
-                            && !isTextEmpty( row.getCell( nextColumnIndex ) ) )
-                    {
-                        hasBreaks = true;
-                        break;
-                    }
-
-                    divWidthPx += getColumnWidth( sheet, nextColumnIndex );
-                }
-
-                if ( !hasBreaks )
-                    divWidthPx = Integer.MAX_VALUE;
-            }
-
-            Element tableCellElement = htmlDocumentFacade.createTableCell();
-
-            if ( range != null )
-            {
-                if ( range.getFirstColumn() != range.getLastColumn() )
-                    tableCellElement.setAttribute(
-                            "colspan",
-                            String.valueOf( range.getLastColumn()
-                                    - range.getFirstColumn() + 1 ) );
-                if ( range.getFirstRow() != range.getLastRow() )
-                    tableCellElement.setAttribute(
-                            "rowspan",
-                            String.valueOf( range.getLastRow()
-                                    - range.getFirstRow() + 1 ) );
-            }
-
-            boolean emptyCell;
-            if ( cell != null )
-            {
-                emptyCell = processCell( cell, tableCellElement,
-                        getColumnWidth( sheet, colIx ), divWidthPx,
-                        row.getHeight() / 20f );
-            }
-            else
-            {
-                emptyCell = true;
-            }
-
-            if ( emptyCell )
-            {
-                emptyCells.add( tableCellElement );
-            }
-            else
-            {
-                for ( Element emptyCellElement : emptyCells )
-                {
-                    tableRowElement.appendChild( emptyCellElement );
-                }
-                emptyCells.clear();
-
-                tableRowElement.appendChild( tableCellElement );
-                maxRenderedColumn = colIx;
-            }
-        }
-
-        return maxRenderedColumn + 1;
-    }
-
-    protected void processRowNumber( HSSFRow row,
-            Element tableRowNumberCellElement )
-    {
-        tableRowNumberCellElement.setAttribute( "class", "rownumber" );
-        Text text = htmlDocumentFacade.createText( getRowName( row ) );
-        tableRowNumberCellElement.appendChild( text );
-    }
-
-    protected void processSheet( HSSFSheet sheet )
-    {
-        processSheetHeader( htmlDocumentFacade.getBody(), sheet );
-
-        final int physicalNumberOfRows = sheet.getPhysicalNumberOfRows();
-        if ( physicalNumberOfRows <= 0 )
-            return;
-
-        Element table = htmlDocumentFacade.createTable();
-        htmlDocumentFacade.addStyleClass( table, cssClassPrefixTable,
-                "border-collapse:collapse;border-spacing:0;" );
-
-        Element tableBody = htmlDocumentFacade.createTableBody();
-
-        final CellRangeAddress[][] mergedRanges = ExcelToHtmlUtils
-                .buildMergedRangesMap( sheet );
-
-        final List<Element> emptyRowElements = new ArrayList<Element>(
-                physicalNumberOfRows );
-        int maxSheetColumns = 1;
-        for ( int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++ )
-        {
-            HSSFRow row = sheet.getRow( r );
-
-            if ( row == null )
-                continue;
-
-            if ( !isOutputHiddenRows() && row.getZeroHeight() )
-                continue;
-
-            Element tableRowElement = htmlDocumentFacade.createTableRow();
-            htmlDocumentFacade.addStyleClass( tableRowElement,
-                    cssClassPrefixRow, "height:" + ( row.getHeight() / 20f )
-                            + "pt;" );
-
-            int maxRowColumnNumber = processRow( mergedRanges, row,
-                    tableRowElement );
-
-            if ( maxRowColumnNumber == 0 )
-            {
-                emptyRowElements.add( tableRowElement );
-            }
-            else
-            {
-                if ( !emptyRowElements.isEmpty() )
-                {
-                    for ( Element emptyRowElement : emptyRowElements )
-                    {
-                        tableBody.appendChild( emptyRowElement );
-                    }
-                    emptyRowElements.clear();
-                }
-
-                tableBody.appendChild( tableRowElement );
-            }
-            maxSheetColumns = Math.max( maxSheetColumns, maxRowColumnNumber );
-        }
-
-        processColumnWidths( sheet, maxSheetColumns, table );
-
-        if ( isOutputColumnHeaders() )
-        {
-            processColumnHeaders( sheet, maxSheetColumns, table );
-        }
-
-        table.appendChild( tableBody );
-
-        htmlDocumentFacade.getBody().appendChild( table );
-    }
-
-    protected void processSheetHeader( Element htmlBody, HSSFSheet sheet )
-    {
-        Element h2 = htmlDocumentFacade.createHeader2();
-        h2.appendChild( htmlDocumentFacade.createText( sheet.getSheetName() ) );
-        htmlBody.appendChild( h2 );
-    }
-
-    public void processWorkbook( HSSFWorkbook workbook )
-    {
-        final SummaryInformation summaryInformation = workbook
-                .getSummaryInformation();
-        if ( summaryInformation != null )
-        {
-            processDocumentInformation( summaryInformation );
-        }
-
-        if ( isUseDivsToSpan() )
-        {
-            // prepare CSS classes for later usage
-            this.cssClassContainerCell = htmlDocumentFacade
-                    .getOrCreateCssClass( cssClassPrefixCell,
-                            "padding:0;margin:0;align:left;vertical-align:top;" );
-            this.cssClassContainerDiv = htmlDocumentFacade.getOrCreateCssClass(
-                    cssClassPrefixDiv, "position:relative;" );
-        }
-
-        for ( int s = 0; s < workbook.getNumberOfSheets(); s++ )
-        {
-            HSSFSheet sheet = workbook.getSheetAt( s );
-            processSheet( sheet );
-        }
-
-        htmlDocumentFacade.updateStylesheet();
-    }
-
-    public void setCssClassPrefixCell( String cssClassPrefixCell )
-    {
-        this.cssClassPrefixCell = cssClassPrefixCell;
-    }
-
-    public void setCssClassPrefixDiv( String cssClassPrefixDiv )
-    {
-        this.cssClassPrefixDiv = cssClassPrefixDiv;
-    }
-
-    public void setCssClassPrefixRow( String cssClassPrefixRow )
-    {
-        this.cssClassPrefixRow = cssClassPrefixRow;
-    }
-
-    public void setCssClassPrefixTable( String cssClassPrefixTable )
-    {
-        this.cssClassPrefixTable = cssClassPrefixTable;
-    }
-
-    /**
-     * Allows converter to wrap content into two additional DIVs with tricky
-     * styles, so it will wrap across empty cells (like in Excel).
-     * <p>
-     * <b>Warning:</b> after enabling this mode do not serialize result HTML
-     * with INDENT=YES option, because line breaks will make additional
-     * (unwanted) changes
-     */
-    public void setUseDivsToSpan( boolean useDivsToSpan )
-    {
-        this.useDivsToSpan = useDivsToSpan;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
deleted file mode 100644
index f19023f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.converter;
-
-import java.util.Arrays;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Beta;
-
-@Beta
-public class ExcelToHtmlUtils extends AbstractExcelUtils
-{
-    public static void appendAlign( StringBuilder style, short alignment )
-    {
-        String cssAlign = getAlign( alignment );
-        if ( isEmpty( cssAlign ) )
-            return;
-
-        style.append( "text-align:" );
-        style.append( cssAlign );
-        style.append( ";" );
-    }
-
-    /**
-     * Creates a map (i.e. two-dimensional array) filled with ranges. Allow fast
-     * retrieving {@link CellRangeAddress} of any cell, if cell is contained in
-     * range.
-     * 
-     * @see #getMergedRange(CellRangeAddress[][], int, int)
-     */
-    public static CellRangeAddress[][] buildMergedRangesMap( HSSFSheet sheet )
-    {
-        CellRangeAddress[][] mergedRanges = new CellRangeAddress[1][];
-        for ( final CellRangeAddress cellRangeAddress : sheet.getMergedRegions() )
-        {
-            final int requiredHeight = cellRangeAddress.getLastRow() + 1;
-            if ( mergedRanges.length < requiredHeight )
-            {
-                CellRangeAddress[][] newArray = new CellRangeAddress[requiredHeight][];
-                System.arraycopy( mergedRanges, 0, newArray, 0,
-                        mergedRanges.length );
-                mergedRanges = newArray;
-            }
-
-            for ( int r = cellRangeAddress.getFirstRow(); r <= cellRangeAddress
-                    .getLastRow(); r++ )
-            {
-                final int requiredWidth = cellRangeAddress.getLastColumn() + 1;
-
-                CellRangeAddress[] rowMerged = mergedRanges[r];
-                if ( rowMerged == null )
-                {
-                    rowMerged = new CellRangeAddress[requiredWidth];
-                    mergedRanges[r] = rowMerged;
-                }
-                else
-                {
-                    final int rowMergedLength = rowMerged.length;
-                    if ( rowMergedLength < requiredWidth )
-                    {
-                        final CellRangeAddress[] newRow = new CellRangeAddress[requiredWidth];
-                        System.arraycopy( rowMerged, 0, newRow, 0,
-                                rowMergedLength );
-
-                        mergedRanges[r] = newRow;
-                        rowMerged = newRow;
-                    }
-                }
-
-                Arrays.fill( rowMerged, cellRangeAddress.getFirstColumn(),
-                        cellRangeAddress.getLastColumn() + 1, cellRangeAddress );
-            }
-        }
-        return mergedRanges;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java b/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
deleted file mode 100644
index a919b04..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
+++ /dev/null
@@ -1,1374 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.FooterRecord;
-import org.apache.poi.hssf.record.HCenterRecord;
-import org.apache.poi.hssf.record.HeaderRecord;
-import org.apache.poi.hssf.record.PrintSetupRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.hssf.record.VCenterRecord;
-import org.apache.poi.hssf.record.chart.AreaFormatRecord;
-import org.apache.poi.hssf.record.chart.AxisLineFormatRecord;
-import org.apache.poi.hssf.record.chart.AxisOptionsRecord;
-import org.apache.poi.hssf.record.chart.AxisParentRecord;
-import org.apache.poi.hssf.record.chart.AxisRecord;
-import org.apache.poi.hssf.record.chart.AxisUsedRecord;
-import org.apache.poi.hssf.record.chart.BarRecord;
-import org.apache.poi.hssf.record.chart.BeginRecord;
-import org.apache.poi.hssf.record.chart.CategorySeriesAxisRecord;
-import org.apache.poi.hssf.record.chart.ChartFormatRecord;
-import org.apache.poi.hssf.record.chart.ChartRecord;
-import org.apache.poi.hssf.record.chart.ChartTitleFormatRecord;
-import org.apache.poi.hssf.record.chart.DataFormatRecord;
-import org.apache.poi.hssf.record.chart.DefaultDataLabelTextPropertiesRecord;
-import org.apache.poi.hssf.record.chart.EndRecord;
-import org.apache.poi.hssf.record.chart.FontBasisRecord;
-import org.apache.poi.hssf.record.chart.FontIndexRecord;
-import org.apache.poi.hssf.record.chart.FrameRecord;
-import org.apache.poi.hssf.record.chart.LegendRecord;
-import org.apache.poi.hssf.record.chart.LineFormatRecord;
-import org.apache.poi.hssf.record.chart.LinkedDataRecord;
-import org.apache.poi.hssf.record.chart.PlotAreaRecord;
-import org.apache.poi.hssf.record.chart.PlotGrowthRecord;
-import org.apache.poi.hssf.record.chart.SeriesIndexRecord;
-import org.apache.poi.hssf.record.chart.SeriesRecord;
-import org.apache.poi.hssf.record.chart.SeriesTextRecord;
-import org.apache.poi.hssf.record.chart.SeriesToChartGroupRecord;
-import org.apache.poi.hssf.record.chart.SheetPropertiesRecord;
-import org.apache.poi.hssf.record.chart.TextRecord;
-import org.apache.poi.hssf.record.chart.TickRecord;
-import org.apache.poi.hssf.record.chart.UnitsRecord;
-import org.apache.poi.hssf.record.chart.ValueRangeRecord;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtgBase;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressBase;
-
-/**
- * Has methods for construction of a chart object.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class HSSFChart {
-	private HSSFSheet sheet;
-	private ChartRecord chartRecord;
-
-	private LegendRecord legendRecord;
-	@SuppressWarnings("unused")
-    private ChartTitleFormatRecord chartTitleFormat;
-	private SeriesTextRecord chartTitleText;
-	private List<ValueRangeRecord> valueRanges = new ArrayList<ValueRangeRecord>(); 
-	
-	private HSSFChartType type = HSSFChartType.Unknown;
-	
-	private List<HSSFSeries> series = new ArrayList<HSSFSeries>();
-
-	public enum HSSFChartType {
-		Area {
-			@Override
-			public short getSid() {
-				return 0x101A;
-			}
-		},
-		Bar {
-			@Override
-			public short getSid() {
-				return 0x1017;
-			}
-		},
-		Line {
-			@Override
-			public short getSid() {
-				return 0x1018;
-			}
-		},
-		Pie {
-			@Override
-			public short getSid() {
-				return 0x1019;
-			}
-		},
-		Scatter {
-			@Override
-			public short getSid() {
-				return 0x101B;
-			}
-		},
-		Unknown {
-			@Override
-			public short getSid() {
-				return 0;
-			}
-		};
-		
-		public abstract short getSid();
-	}
-
-	private HSSFChart(HSSFSheet sheet, ChartRecord chartRecord) {
-		this.chartRecord = chartRecord;
-		this.sheet = sheet;
-	}
-
-	/**
-	 * Creates a bar chart.  API needs some work. :)
-	 * <p>
-	 * NOTE:  Does not yet work...  checking it in just so others
-	 * can take a look.
-	 */
-	public void createBarChart( HSSFWorkbook workbook, HSSFSheet parentSheet )
-	{
-
-		List<Record> records = new ArrayList<Record>();
-		records.add( createMSDrawingObjectRecord() );
-		records.add( createOBJRecord() );
-		records.add( createBOFRecord() );
-		records.add(new HeaderRecord(""));
-		records.add(new FooterRecord(""));
-		records.add( createHCenterRecord() );
-		records.add( createVCenterRecord() );
-		records.add( createPrintSetupRecord() );
-		// unknown 33
-		records.add( createFontBasisRecord1() );
-		records.add( createFontBasisRecord2() );
-		records.add(new ProtectRecord(false));
-		records.add( createUnitsRecord() );
-		records.add( createChartRecord( 0, 0, 30434904, 19031616 ) );
-		records.add( createBeginRecord() );
-		records.add( createSCLRecord( (short) 1, (short) 1 ) );
-		records.add( createPlotGrowthRecord( 65536, 65536 ) );
-		records.add( createFrameRecord1() );
-		records.add( createBeginRecord() );
-		records.add( createLineFormatRecord(true) );
-		records.add( createAreaFormatRecord1() );
-		records.add( createEndRecord() );
-		records.add( createSeriesRecord() );
-		records.add( createBeginRecord() );
-		records.add( createTitleLinkedDataRecord() );
-		records.add( createValuesLinkedDataRecord() );
-		records.add( createCategoriesLinkedDataRecord() );
-		records.add( createDataFormatRecord() );
-		//		records.add(createBeginRecord());
-		// unknown
-		//		records.add(createEndRecord());
-		records.add( createSeriesToChartGroupRecord() );
-		records.add( createEndRecord() );
-		records.add( createSheetPropsRecord() );
-		records.add( createDefaultTextRecord( DefaultDataLabelTextPropertiesRecord.CATEGORY_DATA_TYPE_ALL_TEXT_CHARACTERISTIC ) );
-		records.add( createAllTextRecord() );
-		records.add( createBeginRecord() );
-		// unknown
-		records.add( createFontIndexRecord( 5 ) );
-		records.add( createDirectLinkRecord() );
-		records.add( createEndRecord() );
-		records.add( createDefaultTextRecord( (short) 3 ) ); // eek, undocumented text type
-		records.add( createUnknownTextRecord() );
-		records.add( createBeginRecord() );
-		records.add( createFontIndexRecord( (short) 6 ) );
-		records.add( createDirectLinkRecord() );
-		records.add( createEndRecord() );
-
-		records.add( createAxisUsedRecord( (short) 1 ) );
-		createAxisRecords( records );
-
-		records.add( createEndRecord() );
-		records.add( createDimensionsRecord() );
-		records.add( createSeriesIndexRecord(2) );
-		records.add( createSeriesIndexRecord(1) );
-		records.add( createSeriesIndexRecord(3) );
-		records.add(EOFRecord.instance);
-
-
-
-		parentSheet.insertChartRecords( records );
-		workbook.insertChartRecord();
-	}
-
-	/**
-	 * Returns all the charts for the given sheet.
-	 *
-	 * NOTE: You won't be able to do very much with
-	 *  these charts yet, as this is very limited support
-	 */
-	public static HSSFChart[] getSheetCharts(HSSFSheet sheet) {
-		List<HSSFChart> charts = new ArrayList<HSSFChart>();
-		HSSFChart lastChart = null;
-		HSSFSeries lastSeries = null;
-		// Find records of interest
-		List<RecordBase> records = sheet.getSheet().getRecords();
-		for(RecordBase r : records) {
-
-			if(r instanceof ChartRecord) {
-				lastSeries = null;
-				
-				lastChart = new HSSFChart(sheet,(ChartRecord)r);
-				charts.add(lastChart);
-			} else if(r instanceof LegendRecord) {
-				lastChart.legendRecord = (LegendRecord)r;
-			} else if(r instanceof SeriesRecord) {
-				HSSFSeries series = new HSSFSeries( (SeriesRecord)r );
-				lastChart.series.add(series);
-				lastSeries = series;
-			} else if(r instanceof ChartTitleFormatRecord) {
-				lastChart.chartTitleFormat =
-					(ChartTitleFormatRecord)r;
-			} else if(r instanceof SeriesTextRecord) {
-				// Applies to a series, unless we've seen
-				//  a legend already
-				SeriesTextRecord str = (SeriesTextRecord)r;
-				if(lastChart.legendRecord == null &&
-						lastChart.series.size() > 0) {
-					HSSFSeries series = lastChart.series.get(lastChart.series.size()-1);
-					series.seriesTitleText = str;
-				} else {
-					lastChart.chartTitleText = str;
-				}
-			} else if (r instanceof LinkedDataRecord) {
-				LinkedDataRecord linkedDataRecord = (LinkedDataRecord) r;
-				if (lastSeries != null) {
-					lastSeries.insertData(linkedDataRecord);
-				}
-			} else if(r instanceof ValueRangeRecord){
-				lastChart.valueRanges.add((ValueRangeRecord)r);
-			} else if (r instanceof Record) {
-				if (lastChart != null)
-				{
-					Record record = (Record) r;
-					for (HSSFChartType type : HSSFChartType.values()) {
-						if (type == HSSFChartType.Unknown)
-						{
-							continue;
-						}
-						if (record.getSid() == type.getSid()) {
-							lastChart.type = type ;
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return charts.toArray( new HSSFChart[charts.size()] );
-	}
-
-	/** Get the X offset of the chart */
-	public int getChartX() { return chartRecord.getX(); }
-	/** Get the Y offset of the chart */
-	public int getChartY() { return chartRecord.getY(); }
-	/** Get the width of the chart. {@link ChartRecord} */
-	public int getChartWidth() { return chartRecord.getWidth(); }
-	/** Get the height of the chart. {@link ChartRecord} */
-	public int getChartHeight() { return chartRecord.getHeight(); }
-
-	/** Sets the X offset of the chart */
-	public void setChartX(int x) { chartRecord.setX(x); }
-	/** Sets the Y offset of the chart */
-	public void setChartY(int y) { chartRecord.setY(y); }
-	/** Sets the width of the chart. {@link ChartRecord} */
-	public void setChartWidth(int width) { chartRecord.setWidth(width); }
-	/** Sets the height of the chart. {@link ChartRecord} */
-	public void setChartHeight(int height) { chartRecord.setHeight(height); }
-
-	/**
-	 * Returns the series of the chart
-	 */
-	public HSSFSeries[] getSeries() {
-		return series.toArray(new HSSFSeries[series.size()]);
-	}
-
-	/**
-	 * Returns the chart's title, if there is one,
-	 *  or null if not
-	 */
-	public String getChartTitle() {
-		if(chartTitleText != null) {
-			return chartTitleText.getText();
-		}
-		return null;
-	}
-
-	/**
-	 * Changes the chart's title, but only if there
-	 *  was one already.
-	 * TODO - add in the records if not
-	 */
-	public void setChartTitle(String title) {
-		if(chartTitleText != null) {
-			chartTitleText.setText(title);
-		} else {
-			throw new IllegalStateException("No chart title found to change");
-		}
-	}
-	
-	/**
-	 * Set value range (basic Axis Options) 
-	 * @param axisIndex 0 - primary axis, 1 - secondary axis
-	 * @param minimum minimum value; Double.NaN - automatic; null - no change
-	 * @param maximum maximum value; Double.NaN - automatic; null - no change
-	 * @param majorUnit major unit value; Double.NaN - automatic; null - no change
-	 * @param minorUnit minor unit value; Double.NaN - automatic; null - no change
-	 */
-	public void setValueRange( int axisIndex, Double minimum, Double maximum, Double majorUnit, Double minorUnit){
-		ValueRangeRecord valueRange = valueRanges.get( axisIndex );
-		if( valueRange == null ) return;
-		if( minimum != null ){
-			valueRange.setAutomaticMinimum(minimum.isNaN());
-			valueRange.setMinimumAxisValue(minimum);
-		}
-		if( maximum != null ){
-			valueRange.setAutomaticMaximum(maximum.isNaN());
-			valueRange.setMaximumAxisValue(maximum);
-		}
-		if( majorUnit != null ){
-			valueRange.setAutomaticMajor(majorUnit.isNaN());
-			valueRange.setMajorIncrement(majorUnit);
-		}
-		if( minorUnit != null ){
-			valueRange.setAutomaticMinor(minorUnit.isNaN());
-			valueRange.setMinorIncrement(minorUnit);
-		}
-	}
-
-	private SeriesIndexRecord createSeriesIndexRecord( int index )
-	{
-		SeriesIndexRecord r = new SeriesIndexRecord();
-		r.setIndex((short)index);
-		return r;
-	}
-
-	private DimensionsRecord createDimensionsRecord()
-	{
-		DimensionsRecord r = new DimensionsRecord();
-		r.setFirstRow(0);
-		r.setLastRow(31);
-		r.setFirstCol((short)0);
-		r.setLastCol((short)1);
-		return r;
-	}
-
-	private HCenterRecord createHCenterRecord()
-	{
-		HCenterRecord r = new HCenterRecord();
-		r.setHCenter(false);
-		return r;
-	}
-
-	private VCenterRecord createVCenterRecord()
-	{
-		VCenterRecord r = new VCenterRecord();
-		r.setVCenter(false);
-		return r;
-	}
-
-	private PrintSetupRecord createPrintSetupRecord()
-	{
-		PrintSetupRecord r = new PrintSetupRecord();
-		r.setPaperSize((short)0);
-		r.setScale((short)18);
-		r.setPageStart((short)1);
-		r.setFitWidth((short)1);
-		r.setFitHeight((short)1);
-		r.setLeftToRight(false);
-		r.setLandscape(false);
-		r.setValidSettings(true);
-		r.setNoColor(false);
-		r.setDraft(false);
-		r.setNotes(false);
-		r.setNoOrientation(false);
-		r.setUsePage(false);
-		r.setHResolution((short)0);
-		r.setVResolution((short)0);
-		r.setHeaderMargin(0.5);
-		r.setFooterMargin(0.5);
-		r.setCopies((short)15); // what the ??
-		return r;
-	}
-
-	private FontBasisRecord createFontBasisRecord1()
-	{
-		FontBasisRecord r = new FontBasisRecord();
-		r.setXBasis((short)9120);
-		r.setYBasis((short)5640);
-		r.setHeightBasis((short)200);
-		r.setScale((short)0);
-		r.setIndexToFontTable((short)5);
-		return r;
-	}
-
-	private FontBasisRecord createFontBasisRecord2()
-	{
-		FontBasisRecord r = createFontBasisRecord1();
-		r.setIndexToFontTable((short)6);
-		return r;
-	}
-
-	private BOFRecord createBOFRecord()
-	{
-		BOFRecord r = new BOFRecord();
-		r.setVersion((short)600);
-		r.setType((short)20);
-		r.setBuild((short)0x1CFE);
-		r.setBuildYear((short)1997);
-		r.setHistoryBitMask(0x40C9);
-		r.setRequiredVersion(106);
-		return r;
-	}
-
-	private UnknownRecord createOBJRecord()
-	{
-		byte[] data = {
-			(byte) 0x15, (byte) 0x00, (byte) 0x12, (byte) 0x00, (byte) 0x05, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x11, (byte) 0x60, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xB8, (byte) 0x03,
-			(byte) 0x87, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-		};
-
-		return new UnknownRecord( (short) 0x005D, data );
-	}
-
-	private UnknownRecord createMSDrawingObjectRecord()
-	{
-		// Since we haven't created this object yet we'll just put in the raw
-		// form for the moment.
-
-		byte[] data = {
-			(byte)0x0F, (byte)0x00, (byte)0x02, (byte)0xF0, (byte)0xC0, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x10, (byte)0x00, (byte)0x08, (byte)0xF0, (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x02, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x02, (byte)0x04, (byte)0x00, (byte)0x00, (byte)0x0F, (byte)0x00, (byte)0x03, (byte)0xF0, (byte)0xA8, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x0F, (byte)0x00, (byte)0x04, (byte)0xF0, (byte)0x28, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x09, (byte)0xF0, (byte)0x10, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x02, (byte)0x00, (byte)0x0A, (byte)0xF0, (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x00, (byte)0x00, (byte)0x05, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x0F, (byte)0x00, (byte)0x04, (byte)0xF0, (byte)0x70, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x92, (byte)0x0C, (byte)0x0A, (byte)0xF0, (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x02, (byte)0x04, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x0A, (byte)0x00, (byte)0x00, (byte)0x93, (byte)0x00, (byte)0x0B, (byte)0xF0, (byte)0x36, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x7F, (byte)0x00, (byte)0x04, (byte)0x01, (byte)0x04, (byte)0x01, (byte)0xBF, (byte)0x00, (byte)0x08, (byte)0x00, (byte)0x08, (byte)0x00, (byte)0x81, (byte)0x01, (byte)0x4E, (byte)0x00,
-			(byte)0x00, (byte)0x08, (byte)0x83, (byte)0x01, (byte)0x4D, (byte)0x00, (byte)0x00, (byte)0x08, (byte)0xBF, (byte)0x01, (byte)0x10, (byte)0x00, (byte)0x11, (byte)0x00, (byte)0xC0, (byte)0x01,
-			(byte)0x4D, (byte)0x00, (byte)0x00, (byte)0x08, (byte)0xFF, (byte)0x01, (byte)0x08, (byte)0x00, (byte)0x08, (byte)0x00, (byte)0x3F, (byte)0x02, (byte)0x00, (byte)0x00, (byte)0x02, (byte)0x00,
-			(byte)0xBF, (byte)0x03, (byte)0x00, (byte)0x00, (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x10, (byte)0xF0, (byte)0x12, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
-			(byte)0x04, (byte)0x00, (byte)0xC0, (byte)0x02, (byte)0x0A, (byte)0x00, (byte)0xF4, (byte)0x00, (byte)0x0E, (byte)0x00, (byte)0x66, (byte)0x01, (byte)0x20, (byte)0x00, (byte)0xE9, (byte)0x00,
-			(byte)0x00, (byte)0x00, (byte)0x11, (byte)0xF0, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00
-		};
-
-		return new UnknownRecord((short)0x00EC, data);
-	}
-
-	private void createAxisRecords( List<Record> records )
-	{
-		records.add( createAxisParentRecord() );
-		records.add( createBeginRecord() );
-		records.add( createAxisRecord( AxisRecord.AXIS_TYPE_CATEGORY_OR_X_AXIS ) );
-		records.add( createBeginRecord() );
-		records.add( createCategorySeriesAxisRecord() );
-		records.add( createAxisOptionsRecord() );
-		records.add( createTickRecord1() );
-		records.add( createEndRecord() );
-		records.add( createAxisRecord( AxisRecord.AXIS_TYPE_VALUE_AXIS ) );
-		records.add( createBeginRecord() );
-		records.add( createValueRangeRecord() );
-		records.add( createTickRecord2() );
-		records.add( createAxisLineFormatRecord( AxisLineFormatRecord.AXIS_TYPE_MAJOR_GRID_LINE ) );
-		records.add( createLineFormatRecord(false) );
-		records.add( createEndRecord() );
-		records.add( createPlotAreaRecord() );
-		records.add( createFrameRecord2() );
-		records.add( createBeginRecord() );
-		records.add( createLineFormatRecord2() );
-		records.add( createAreaFormatRecord2() );
-		records.add( createEndRecord() );
-		records.add( createChartFormatRecord() );
-		records.add( createBeginRecord() );
-		records.add( createBarRecord() );
-		// unknown 1022
-		records.add( createLegendRecord() );
-		records.add( createBeginRecord() );
-		// unknown 104f
-		records.add( createTextRecord() );
-		records.add( createBeginRecord() );
-		// unknown 104f
-		records.add( createLinkedDataRecord() );
-		records.add( createEndRecord() );
-		records.add( createEndRecord() );
-		records.add( createEndRecord() );
-		records.add( createEndRecord() );
-	}
-
-	private LinkedDataRecord createLinkedDataRecord()
-	{
-		LinkedDataRecord r = new LinkedDataRecord();
-		r.setLinkType(LinkedDataRecord.LINK_TYPE_TITLE_OR_TEXT);
-		r.setReferenceType(LinkedDataRecord.REFERENCE_TYPE_DIRECT);
-		r.setCustomNumberFormat(false);
-		r.setIndexNumberFmtRecord((short)0);
-		r.setFormulaOfLink(null);
-		return r;
-	}
-
-	private TextRecord createTextRecord()
-	{
-		TextRecord r = new TextRecord();
-		r.setHorizontalAlignment(TextRecord.HORIZONTAL_ALIGNMENT_CENTER);
-		r.setVerticalAlignment(TextRecord.VERTICAL_ALIGNMENT_CENTER);
-		r.setDisplayMode((short)1);
-		r.setRgbColor(0x00000000);
-		r.setX(-37);
-		r.setY(-60);
-		r.setWidth(0);
-		r.setHeight(0);
-		r.setAutoColor(true);
-		r.setShowKey(false);
-		r.setShowValue(false);
-		r.setVertical(false);
-		r.setAutoGeneratedText(true);
-		r.setGenerated(true);
-		r.setAutoLabelDeleted(false);
-		r.setAutoBackground(true);
-		r.setRotation((short)0);
-		r.setShowCategoryLabelAsPercentage(false);
-		r.setShowValueAsPercentage(false);
-		r.setShowBubbleSizes(false);
-		r.setShowLabel(false);
-		r.setIndexOfColorValue((short)77);
-		r.setDataLabelPlacement((short)0);
-		r.setTextRotation((short)0);
-		return r;
-	}
-
-	private LegendRecord createLegendRecord()
-	{
-		LegendRecord r = new LegendRecord();
-		r.setXAxisUpperLeft(3542);
-		r.setYAxisUpperLeft(1566);
-		r.setXSize(437);
-		r.setYSize(213);
-		r.setType(LegendRecord.TYPE_RIGHT);
-		r.setSpacing(LegendRecord.SPACING_MEDIUM);
-		r.setAutoPosition(true);
-		r.setAutoSeries(true);
-		r.setAutoXPositioning(true);
-		r.setAutoYPositioning(true);
-		r.setVertical(true);
-		r.setDataTable(false);
-		return r;
-	}
-
-	private BarRecord createBarRecord()
-	{
-		BarRecord r = new BarRecord();
-		r.setBarSpace((short)0);
-		r.setCategorySpace((short)150);
-		r.setHorizontal(false);
-		r.setStacked(false);
-		r.setDisplayAsPercentage(false);
-		r.setShadow(false);
-		return r;
-	}
-
-	private ChartFormatRecord createChartFormatRecord()
-	{
-		ChartFormatRecord r = new ChartFormatRecord();
-		r.setXPosition(0);
-		r.setYPosition(0);
-		r.setWidth(0);
-		r.setHeight(0);
-		r.setVaryDisplayPattern(false);
-		return r;
-	}
-
-	private PlotAreaRecord createPlotAreaRecord()
-	{
-		PlotAreaRecord r = new PlotAreaRecord(  );
-		return r;
-	}
-
-	private AxisLineFormatRecord createAxisLineFormatRecord( short format )
-	{
-		AxisLineFormatRecord r = new AxisLineFormatRecord();
-		r.setAxisType( format );
-		return r;
-	}
-
-	private ValueRangeRecord createValueRangeRecord()
-	{
-		ValueRangeRecord r = new ValueRangeRecord();
-		r.setMinimumAxisValue( 0.0 );
-		r.setMaximumAxisValue( 0.0 );
-		r.setMajorIncrement( 0 );
-		r.setMinorIncrement( 0 );
-		r.setCategoryAxisCross( 0 );
-		r.setAutomaticMinimum( true );
-		r.setAutomaticMaximum( true );
-		r.setAutomaticMajor( true );
-		r.setAutomaticMinor( true );
-		r.setAutomaticCategoryCrossing( true );
-		r.setLogarithmicScale( false );
-		r.setValuesInReverse( false );
-		r.setCrossCategoryAxisAtMaximum( false );
-		r.setReserved( true );	// what's this do??
-		return r;
-	}
-
-	private TickRecord createTickRecord1()
-	{
-		TickRecord r = new TickRecord();
-		r.setMajorTickType( (byte) 2 );
-		r.setMinorTickType( (byte) 0 );
-		r.setLabelPosition( (byte) 3 );
-		r.setBackground( (byte) 1 );
-		r.setLabelColorRgb( 0 );
-		r.setZero1( (short) 0 );
-		r.setZero2( (short) 0 );
-		r.setZero3( (short) 45 );
-		r.setAutorotate( true );
-		r.setAutoTextBackground( true );
-		r.setRotation( (short) 0 );
-		r.setAutorotate( true );
-		r.setTickColor( (short) 77 );
-		return r;
-	}
-
-	private TickRecord createTickRecord2()
-	{
-		TickRecord r = createTickRecord1();
-		r.setZero3((short)0);
-		return r;
-	}
-
-	private AxisOptionsRecord createAxisOptionsRecord()
-	{
-		AxisOptionsRecord r = new AxisOptionsRecord();
-		r.setMinimumCategory( (short) -28644 );
-		r.setMaximumCategory( (short) -28715 );
-		r.setMajorUnitValue( (short) 2 );
-		r.setMajorUnit( (short) 0 );
-		r.setMinorUnitValue( (short) 1 );
-		r.setMinorUnit( (short) 0 );
-		r.setBaseUnit( (short) 0 );
-		r.setCrossingPoint( (short) -28644 );
-		r.setDefaultMinimum( true );
-		r.setDefaultMaximum( true );
-		r.setDefaultMajor( true );
-		r.setDefaultMinorUnit( true );
-		r.setIsDate( true );
-		r.setDefaultBase( true );
-		r.setDefaultCross( true );
-		r.setDefaultDateSettings( true );
-		return r;
-	}
-
-	private CategorySeriesAxisRecord createCategorySeriesAxisRecord()
-	{
-		CategorySeriesAxisRecord r = new CategorySeriesAxisRecord();
-		r.setCrossingPoint( (short) 1 );
-		r.setLabelFrequency( (short) 1 );
-		r.setTickMarkFrequency( (short) 1 );
-		r.setValueAxisCrossing( true );
-		r.setCrossesFarRight( false );
-		r.setReversed( false );
-		return r;
-	}
-
-	private AxisRecord createAxisRecord( short axisType )
-	{
-		AxisRecord r = new AxisRecord();
-		r.setAxisType( axisType );
-		return r;
-	}
-
-	private AxisParentRecord createAxisParentRecord()
-	{
-		AxisParentRecord r = new AxisParentRecord();
-		r.setAxisType( AxisParentRecord.AXIS_TYPE_MAIN );
-		r.setX( 479 );
-		r.setY( 221 );
-		r.setWidth( 2995 );
-		r.setHeight( 2902 );
-		return r;
-	}
-
-	private AxisUsedRecord createAxisUsedRecord( short numAxis )
-	{
-		AxisUsedRecord r = new AxisUsedRecord();
-		r.setNumAxis( numAxis );
-		return r;
-	}
-
-	private LinkedDataRecord createDirectLinkRecord()
-	{
-		LinkedDataRecord r = new LinkedDataRecord();
-		r.setLinkType( LinkedDataRecord.LINK_TYPE_TITLE_OR_TEXT );
-		r.setReferenceType( LinkedDataRecord.REFERENCE_TYPE_DIRECT );
-		r.setCustomNumberFormat( false );
-		r.setIndexNumberFmtRecord( (short) 0 );
-		r.setFormulaOfLink(null);
-		return r;
-	}
-
-	private FontIndexRecord createFontIndexRecord( int index )
-	{
-		FontIndexRecord r = new FontIndexRecord();
-		r.setFontIndex( (short) index );
-		return r;
-	}
-
-	private TextRecord createAllTextRecord()
-	{
-		TextRecord r = new TextRecord();
-		r.setHorizontalAlignment( TextRecord.HORIZONTAL_ALIGNMENT_CENTER );
-		r.setVerticalAlignment( TextRecord.VERTICAL_ALIGNMENT_CENTER );
-		r.setDisplayMode( TextRecord.DISPLAY_MODE_TRANSPARENT );
-		r.setRgbColor( 0 );
-		r.setX( -37 );
-		r.setY( -60 );
-		r.setWidth( 0 );
-		r.setHeight( 0 );
-		r.setAutoColor( true );
-		r.setShowKey( false );
-		r.setShowValue( true );
-		r.setVertical( false );
-		r.setAutoGeneratedText( true );
-		r.setGenerated( true );
-		r.setAutoLabelDeleted( false );
-		r.setAutoBackground( true );
-		r.setRotation( (short) 0 );
-		r.setShowCategoryLabelAsPercentage( false );
-		r.setShowValueAsPercentage( false );
-		r.setShowBubbleSizes( false );
-		r.setShowLabel( false );
-		r.setIndexOfColorValue( (short) 77 );
-		r.setDataLabelPlacement( (short) 0 );
-		r.setTextRotation( (short) 0 );
-		return r;
-	}
-
-	private TextRecord createUnknownTextRecord()
-	{
-		TextRecord r = new TextRecord();
-		r.setHorizontalAlignment( TextRecord.HORIZONTAL_ALIGNMENT_CENTER );
-		r.setVerticalAlignment( TextRecord.VERTICAL_ALIGNMENT_CENTER );
-		r.setDisplayMode( TextRecord.DISPLAY_MODE_TRANSPARENT );
-		r.setRgbColor( 0 );
-		r.setX( -37 );
-		r.setY( -60 );
-		r.setWidth( 0 );
-		r.setHeight( 0 );
-		r.setAutoColor( true );
-		r.setShowKey( false );
-		r.setShowValue( false );
-		r.setVertical( false );
-		r.setAutoGeneratedText( true );
-		r.setGenerated( true );
-		r.setAutoLabelDeleted( false );
-		r.setAutoBackground( true );
-		r.setRotation( (short) 0 );
-		r.setShowCategoryLabelAsPercentage( false );
-		r.setShowValueAsPercentage( false );
-		r.setShowBubbleSizes( false );
-		r.setShowLabel( false );
-		r.setIndexOfColorValue( (short) 77 );
-		r.setDataLabelPlacement( (short) 11088 );
-		r.setTextRotation( (short) 0 );
-		return r;
-	}
-
-	private DefaultDataLabelTextPropertiesRecord createDefaultTextRecord( short categoryDataType )
-	{
-		DefaultDataLabelTextPropertiesRecord r = new DefaultDataLabelTextPropertiesRecord();
-		r.setCategoryDataType( categoryDataType );
-		return r;
-	}
-
-	private SheetPropertiesRecord createSheetPropsRecord()
-	{
-		SheetPropertiesRecord r = new SheetPropertiesRecord();
-		r.setChartTypeManuallyFormatted( false );
-		r.setPlotVisibleOnly( true );
-		r.setDoNotSizeWithWindow( false );
-		r.setDefaultPlotDimensions( true );
-		r.setAutoPlotArea( false );
-		return r;
-	}
-
-	private SeriesToChartGroupRecord createSeriesToChartGroupRecord()
-	{
-		return new SeriesToChartGroupRecord();
-	}
-
-	private DataFormatRecord createDataFormatRecord()
-	{
-		DataFormatRecord r = new DataFormatRecord();
-		r.setPointNumber( (short) -1 );
-		r.setSeriesIndex( (short) 0 );
-		r.setSeriesNumber( (short) 0 );
-		r.setUseExcel4Colors( false );
-		return r;
-	}
-
-	private LinkedDataRecord createCategoriesLinkedDataRecord()
-	{
-		LinkedDataRecord r = new LinkedDataRecord();
-		r.setLinkType( LinkedDataRecord.LINK_TYPE_CATEGORIES );
-		r.setReferenceType( LinkedDataRecord.REFERENCE_TYPE_WORKSHEET );
-		r.setCustomNumberFormat( false );
-		r.setIndexNumberFmtRecord( (short) 0 );
-		Area3DPtg p = new Area3DPtg(0, 31, 1, 1,
-		        false, false, false, false, 0);
-		r.setFormulaOfLink(new Ptg[] { p, });
-		return r;
-	}
-
-	private LinkedDataRecord createValuesLinkedDataRecord()
-	{
-		LinkedDataRecord r = new LinkedDataRecord();
-		r.setLinkType( LinkedDataRecord.LINK_TYPE_VALUES );
-		r.setReferenceType( LinkedDataRecord.REFERENCE_TYPE_WORKSHEET );
-		r.setCustomNumberFormat( false );
-		r.setIndexNumberFmtRecord( (short) 0 );
-		Area3DPtg p = new Area3DPtg(0, 31, 0, 0,
-				false, false, false, false, 0);
-		r.setFormulaOfLink(new Ptg[] { p, });
-		return r;
-	}
-
-	private LinkedDataRecord createTitleLinkedDataRecord()
-	{
-		LinkedDataRecord r = new LinkedDataRecord();
-		r.setLinkType( LinkedDataRecord.LINK_TYPE_TITLE_OR_TEXT );
-		r.setReferenceType( LinkedDataRecord.REFERENCE_TYPE_DIRECT );
-		r.setCustomNumberFormat( false );
-		r.setIndexNumberFmtRecord( (short) 0 );
-		r.setFormulaOfLink(null);
-		return r;
-	}
-
-	private SeriesRecord createSeriesRecord()
-	{
-		SeriesRecord r = new SeriesRecord();
-		r.setCategoryDataType( SeriesRecord.CATEGORY_DATA_TYPE_NUMERIC );
-		r.setValuesDataType( SeriesRecord.VALUES_DATA_TYPE_NUMERIC );
-		r.setNumCategories( (short) 32 );
-		r.setNumValues( (short) 31 );
-		r.setBubbleSeriesType( SeriesRecord.BUBBLE_SERIES_TYPE_NUMERIC );
-		r.setNumBubbleValues( (short) 0 );
-		return r;
-	}
-
-	private EndRecord createEndRecord()
-	{
-		return new EndRecord();
-	}
-
-	private AreaFormatRecord createAreaFormatRecord1()
-	{
-		AreaFormatRecord r = new AreaFormatRecord();
-		r.setForegroundColor( 16777215 );	 // RGB Color
-		r.setBackgroundColor( 0 );			// RGB Color
-		r.setPattern( (short) 1 );			 // TODO: Add Pattern constants to record
-		r.setAutomatic( true );
-		r.setInvert( false );
-		r.setForecolorIndex( (short) 78 );
-		r.setBackcolorIndex( (short) 77 );
-		return r;
-	}
-
-	private AreaFormatRecord createAreaFormatRecord2()
-	{
-		AreaFormatRecord r = new AreaFormatRecord();
-		r.setForegroundColor(0x00c0c0c0);
-		r.setBackgroundColor(0x00000000);
-		r.setPattern((short)1);
-		r.setAutomatic(false);
-		r.setInvert(false);
-		r.setForecolorIndex((short)22);
-		r.setBackcolorIndex((short)79);
-		return r;
-	}
-
-	private LineFormatRecord createLineFormatRecord( boolean drawTicks )
-	{
-		LineFormatRecord r = new LineFormatRecord();
-		r.setLineColor( 0 );
-		r.setLinePattern( LineFormatRecord.LINE_PATTERN_SOLID );
-		r.setWeight( (short) -1 );
-		r.setAuto( true );
-		r.setDrawTicks( drawTicks );
-		r.setColourPaletteIndex( (short) 77 );  // what colour is this?
-		return r;
-	}
-
-	private LineFormatRecord createLineFormatRecord2()
-	{
-		LineFormatRecord r = new LineFormatRecord();
-		r.setLineColor( 0x00808080 );
-		r.setLinePattern( (short) 0 );
-		r.setWeight( (short) 0 );
-		r.setAuto( false );
-		r.setDrawTicks( false );
-		r.setUnknown( false );
-		r.setColourPaletteIndex( (short) 23 );
-		return r;
-	}
-
-	private FrameRecord createFrameRecord1()
-	{
-		FrameRecord r = new FrameRecord();
-		r.setBorderType( FrameRecord.BORDER_TYPE_REGULAR );
-		r.setAutoSize( false );
-		r.setAutoPosition( true );
-		return r;
-	}
-
-	private FrameRecord createFrameRecord2()
-	{
-		FrameRecord r = new FrameRecord();
-		r.setBorderType( FrameRecord.BORDER_TYPE_REGULAR );
-		r.setAutoSize( true );
-		r.setAutoPosition( true );
-		return r;
-	}
-
-	private PlotGrowthRecord createPlotGrowthRecord( int horizScale, int vertScale )
-	{
-		PlotGrowthRecord r = new PlotGrowthRecord();
-		r.setHorizontalScale( horizScale );
-		r.setVerticalScale( vertScale );
-		return r;
-	}
-
-	private SCLRecord createSCLRecord( short numerator, short denominator )
-	{
-		SCLRecord r = new SCLRecord();
-		r.setDenominator( denominator );
-		r.setNumerator( numerator );
-		return r;
-	}
-
-	private BeginRecord createBeginRecord()
-	{
-		return new BeginRecord();
-	}
-
-	private ChartRecord createChartRecord( int x, int y, int width, int height )
-	{
-		ChartRecord r = new ChartRecord();
-		r.setX( x );
-		r.setY( y );
-		r.setWidth( width );
-		r.setHeight( height );
-		return r;
-	}
-
-	private UnitsRecord createUnitsRecord()
-	{
-		UnitsRecord r = new UnitsRecord();
-		r.setUnits( (short) 0 );
-		return r;
-	}
-
-
-	/**
-	 * A series in a chart
-	 */
-	public static class HSSFSeries {
-		private SeriesRecord series;
-		private SeriesTextRecord seriesTitleText;
-		private LinkedDataRecord dataName;
-		private LinkedDataRecord dataValues;
-		private LinkedDataRecord dataCategoryLabels;
-		private LinkedDataRecord dataSecondaryCategoryLabels;
-
-		/* package */ HSSFSeries(SeriesRecord series) {
-			this.series = series;
-		}
-
-		/* package */ void insertData(LinkedDataRecord data){
-			switch(data.getLinkType()){
-			
-				case LinkedDataRecord.LINK_TYPE_TITLE_OR_TEXT:
-					dataName = data;
-					break;
-				case LinkedDataRecord.LINK_TYPE_VALUES:
-					dataValues = data;
-					break;
-				case LinkedDataRecord.LINK_TYPE_CATEGORIES:
-					dataCategoryLabels = data;
-					break;
-				case LinkedDataRecord.LINK_TYPE_SECONDARY_CATEGORIES:
-					dataSecondaryCategoryLabels = data;
-					break;
-				default:
-					throw new IllegalStateException("Invalid link type: " + data.getLinkType());
-			}
-		}
-		
-		/* package */ void setSeriesTitleText(SeriesTextRecord seriesTitleText)
-		{
-			this.seriesTitleText = seriesTitleText;
-		}
-		
-		public short getNumValues() {
-			return series.getNumValues();
-		}
-		/**
-		 * See {@link SeriesRecord}
-		 */
-		public short getValueType() {
-			return series.getValuesDataType();
-		}
-
-		/**
-		 * Returns the series' title, if there is one,
-		 *  or null if not
-		 */
-		public String getSeriesTitle() {
-			if(seriesTitleText != null) {
-				return seriesTitleText.getText();
-			}
-			return null;
-		}
-
-		/**
-		 * Changes the series' title, but only if there
-		 *  was one already.
-		 * TODO - add in the records if not
-		 */
-		public void setSeriesTitle(String title) {
-			if(seriesTitleText != null) {
-				seriesTitleText.setText(title);
-			} else {
-				throw new IllegalStateException("No series title found to change");
-			}
-		}
-
-		/**
-		 * @return record with data names
-		 */
-		public LinkedDataRecord getDataName(){
-			return dataName;
-		}
-		
-		/**
-		 * @return record with data values
-		 */
-		public LinkedDataRecord getDataValues(){
-			return dataValues;
-		}
-		
-		/**
-		 * @return record with data category labels
-		 */
-		public LinkedDataRecord getDataCategoryLabels(){
-			return dataCategoryLabels;
-		}
-		
-		/**
-		 * @return record with data secondary category labels
-		 */
-		public LinkedDataRecord getDataSecondaryCategoryLabels() {
-			return dataSecondaryCategoryLabels;
-		}
-		
-		/**
-		 * @return record with series
-		 */
-		public SeriesRecord getSeries() {
-			return series;
-		}
-		
-		private CellRangeAddressBase getCellRange(LinkedDataRecord linkedDataRecord) {
-			if (linkedDataRecord == null)
-			{
-				return null ;
-			}
-			
-			int firstRow = 0;
-			int lastRow = 0;
-			int firstCol = 0;
-			int lastCol = 0;
-			
-			for (Ptg ptg : linkedDataRecord.getFormulaOfLink()) {
-				if (ptg instanceof AreaPtgBase) {
-					AreaPtgBase areaPtg = (AreaPtgBase) ptg;
-					
-					firstRow = areaPtg.getFirstRow();
-					lastRow = areaPtg.getLastRow();
-					
-					firstCol = areaPtg.getFirstColumn();
-					lastCol = areaPtg.getLastColumn();
-				}
-			}
-			
-			return new CellRangeAddress(firstRow, lastRow, firstCol, lastCol);
-		}
-		
-		public CellRangeAddressBase getValuesCellRange() {
-			return getCellRange(dataValues);
-		}
-	
-		public CellRangeAddressBase getCategoryLabelsCellRange() {
-			return getCellRange(dataCategoryLabels);
-		}
-	
-		private Integer setVerticalCellRange(LinkedDataRecord linkedDataRecord,
-				                             CellRangeAddressBase range) {
-			if (linkedDataRecord == null)
-			{
-				return null;
-			}
-			
-			List<Ptg> ptgList = new ArrayList<Ptg>();
-			
-			int rowCount = (range.getLastRow() - range.getFirstRow()) + 1;
-			int colCount = (range.getLastColumn() - range.getFirstColumn()) + 1;
-			
-			for (Ptg ptg : linkedDataRecord.getFormulaOfLink()) {
-				if (ptg instanceof AreaPtgBase) {
-					AreaPtgBase areaPtg = (AreaPtgBase) ptg;
-					
-					areaPtg.setFirstRow(range.getFirstRow());
-					areaPtg.setLastRow(range.getLastRow());
-					
-					areaPtg.setFirstColumn(range.getFirstColumn());
-					areaPtg.setLastColumn(range.getLastColumn());
-					ptgList.add(areaPtg);
-				}
-			}
-			
-			linkedDataRecord.setFormulaOfLink(ptgList.toArray(new Ptg[ptgList.size()]));
-			
-			return rowCount * colCount;
-		}
-		
-		public void setValuesCellRange(CellRangeAddressBase range) {
-			Integer count = setVerticalCellRange(dataValues, range);
-			if (count == null)
-			{
-				return;
-			}
-			
-			series.setNumValues((short)(int)count);
-		}
-		
-		public void setCategoryLabelsCellRange(CellRangeAddressBase range) {
-			Integer count = setVerticalCellRange(dataCategoryLabels, range);
-			if (count == null)
-			{
-				return;
-			}
-			
-			series.setNumCategories((short)(int)count);
-		}
-	}
-	
-	public HSSFSeries createSeries() throws Exception {
-		ArrayList<RecordBase> seriesTemplate = new ArrayList<RecordBase>();
-		boolean seriesTemplateFilled = false;
-		
-		int idx = 0;
-		int deep = 0;
-		int chartRecordIdx = -1;
-		int chartDeep = -1;
-		int lastSeriesDeep = -1;
-		int endSeriesRecordIdx = -1;
-		int seriesIdx = 0;
-		final List<RecordBase> records = sheet.getSheet().getRecords();
-		
-		/* store first series as template and find last series index */
-		for(final RecordBase record : records) {		
-			
-			idx++;
-			
-			if (record instanceof BeginRecord) {
-				deep++;
-			} else if (record instanceof EndRecord) {
-				deep--;
-				
-				if (lastSeriesDeep == deep) {
-					lastSeriesDeep = -1;
-					endSeriesRecordIdx = idx;
-					if (!seriesTemplateFilled) {
-						seriesTemplate.add(record);
-						seriesTemplateFilled = true;
-					}
-				}
-				
-				if (chartDeep == deep) {
-					break;
-				}
-			}
-			
-			if (record instanceof ChartRecord) {
-				if (record == chartRecord) {
-					chartRecordIdx = idx;
-					chartDeep = deep;
-				}
-			} else if (record instanceof SeriesRecord) {
-				if (chartRecordIdx != -1) {
-					seriesIdx++;
-					lastSeriesDeep = deep;
-				}
-			}
-			
-			if (lastSeriesDeep != -1 && !seriesTemplateFilled) {
-				seriesTemplate.add(record) ;
-			}
-		}
-		
-		/* check if a series was found */
-		if (endSeriesRecordIdx == -1) {
-			return null;
-		}
-		
-		/* next index in the records list where the new series can be inserted */
-		idx = endSeriesRecordIdx + 1;
-
-		HSSFSeries newSeries = null;
-		
-		/* duplicate record of the template series */
-		ArrayList<RecordBase> clonedRecords = new ArrayList<RecordBase>();
-		for(final RecordBase record : seriesTemplate) {		
-			
-			Record newRecord = null;
-			
-			if (record instanceof BeginRecord) {
-				newRecord = new BeginRecord();
-			} else if (record instanceof EndRecord) {
-				newRecord = new EndRecord();
-			} else if (record instanceof SeriesRecord) {
-				SeriesRecord seriesRecord = (SeriesRecord) ((SeriesRecord)record).clone();
-				newSeries = new HSSFSeries(seriesRecord);
-				newRecord = seriesRecord;
-			} else if (record instanceof LinkedDataRecord) {
-				LinkedDataRecord linkedDataRecord = ((LinkedDataRecord)record).clone();
-				if (newSeries != null) {
-					newSeries.insertData(linkedDataRecord);
-				}
-				newRecord = linkedDataRecord;
-			} else if (record instanceof DataFormatRecord) {
-				DataFormatRecord dataFormatRecord = ((DataFormatRecord)record).clone();
-				
-				dataFormatRecord.setSeriesIndex((short)seriesIdx) ;
-				dataFormatRecord.setSeriesNumber((short)seriesIdx) ;
-				
-				newRecord = dataFormatRecord;
-			} else if (record instanceof SeriesTextRecord) {
-				SeriesTextRecord seriesTextRecord = (SeriesTextRecord) ((SeriesTextRecord)record).clone();
-				if (newSeries != null) {
-					newSeries.setSeriesTitleText(seriesTextRecord);
-				}
-				newRecord = seriesTextRecord;
-			} else if (record instanceof Record) {
-				newRecord = (Record) ((Record)record).clone();
-			}
-			
-			if (newRecord != null)
-			{
-				clonedRecords.add(newRecord);
-			}
-		}
-		
-		/* check if a user model series object was created */
-		if (newSeries == null)
-		{
-			return null;
-		}
-		
-		/* transfer series to record list */
-		for(final RecordBase record : clonedRecords) {		
-			records.add(idx++, record);
-		}
-		
-		return newSeries;
-	}
-	
-	public boolean removeSeries(HSSFSeries remSeries) {
-		int deep = 0;
-		int chartDeep = -1;
-		int lastSeriesDeep = -1;
-		int seriesIdx = -1;
-		boolean removeSeries = false;
-		boolean chartEntered = false;
-		boolean result = false;
-		final List<RecordBase> records = sheet.getSheet().getRecords();
-		
-		/* store first series as template and find last series index */
-		Iterator<RecordBase> iter = records.iterator();
-		while (iter.hasNext()) {		
-			RecordBase record = iter.next();
-			
-			if (record instanceof BeginRecord) {
-				deep++;
-			} else if (record instanceof EndRecord) {
-				deep--;
-				
-				if (lastSeriesDeep == deep) {
-					lastSeriesDeep = -1;
-					
-					if (removeSeries) {
-						removeSeries = false;
-						result = true;
-						iter.remove();
-					}
-				}
-				
-				if (chartDeep == deep) {
-					break;
-				}
-			}
-			
-			if (record instanceof ChartRecord) {
-				if (record == chartRecord) {
-					chartDeep = deep;
-					chartEntered = true;
-				}
-			} else if (record instanceof SeriesRecord) {
-				if (chartEntered) {
-					if (remSeries.series == record) {
-						lastSeriesDeep = deep;
-						removeSeries = true;
-					} else {
-						seriesIdx++;
-					}
-				}
-			} else if (record instanceof DataFormatRecord) {
-				if (chartEntered && !removeSeries) {
-					DataFormatRecord dataFormatRecord = (DataFormatRecord) record;
-					dataFormatRecord.setSeriesIndex((short) seriesIdx);
-					dataFormatRecord.setSeriesNumber((short) seriesIdx);
-				}
-			}
-			
-			if (removeSeries) {
-				iter.remove();
-			}
-		}
-		
-		return result;
-	}
-	
-	public HSSFChartType getType() {
-		return type;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
deleted file mode 100644
index 88a9766..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.draw;
-
-import java.awt.Color;
-import java.awt.Shape;
-import java.awt.geom.Area;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.WritableRaster;
-import java.util.List;
-
-import org.apache.poi.hwmf.record.HwmfBrushStyle;
-import org.apache.poi.hwmf.record.HwmfColorRef;
-import org.apache.poi.hwmf.record.HwmfFont;
-import org.apache.poi.hwmf.record.HwmfFill.WmfSetPolyfillMode.HwmfPolyfillMode;
-import org.apache.poi.hwmf.record.HwmfHatchStyle;
-import org.apache.poi.hwmf.record.HwmfMapMode;
-import org.apache.poi.hwmf.record.HwmfMisc.WmfSetBkMode.HwmfBkMode;
-import org.apache.poi.hwmf.record.HwmfPalette.PaletteEntry;
-import org.apache.poi.hwmf.record.HwmfPenStyle;
-import org.apache.poi.hwmf.record.HwmfText.HwmfTextAlignment;
-import org.apache.poi.hwmf.record.HwmfText.HwmfTextVerticalAlignment;
-
-public class HwmfDrawProperties {
-    private final Rectangle2D window;
-    private Rectangle2D viewport = null;
-    private final Point2D location;
-    private HwmfMapMode mapMode = HwmfMapMode.MM_ANISOTROPIC;
-    private HwmfColorRef backgroundColor = new HwmfColorRef(Color.BLACK);
-    private HwmfBrushStyle brushStyle = HwmfBrushStyle.BS_SOLID;
-    private HwmfColorRef brushColor = new HwmfColorRef(Color.BLACK);
-    private HwmfHatchStyle brushHatch = HwmfHatchStyle.HS_HORIZONTAL;
-    private BufferedImage brushBitmap = null;
-    private double penWidth = 1;
-    private HwmfPenStyle penStyle = HwmfPenStyle.valueOf(0);
-    private HwmfColorRef penColor = new HwmfColorRef(Color.BLACK);
-    private double penMiterLimit = 10;
-    private HwmfBkMode bkMode = HwmfBkMode.OPAQUE;
-    private HwmfPolyfillMode polyfillMode = HwmfPolyfillMode.WINDING;
-    private Shape region = null;
-    private List<PaletteEntry> palette = null;
-    private int paletteOffset = 0;
-    private HwmfFont font = null;
-    private HwmfColorRef textColor = new HwmfColorRef(Color.BLACK);
-    private HwmfTextAlignment textAlignLatin = HwmfTextAlignment.LEFT;
-    private HwmfTextVerticalAlignment textVAlignLatin = HwmfTextVerticalAlignment.TOP;
-    private HwmfTextAlignment textAlignAsian = HwmfTextAlignment.RIGHT;
-    private HwmfTextVerticalAlignment textVAlignAsian = HwmfTextVerticalAlignment.TOP;
-
-    public HwmfDrawProperties() {
-        window = new Rectangle2D.Double(0, 0, 1, 1);
-        viewport = null;
-        location = new Point2D.Double(0,0);
-    }
-    
-    public HwmfDrawProperties(HwmfDrawProperties other) {
-        this.window = (Rectangle2D)other.window.clone();
-        this.viewport = (other.viewport == null) ? null : (Rectangle2D)other.viewport.clone();
-        this.location = (Point2D)other.location.clone();
-        this.mapMode = other.mapMode;
-        this.backgroundColor = (other.backgroundColor == null) ? null : other.backgroundColor.clone();
-        this.brushStyle = other.brushStyle;
-        this.brushColor = other.brushColor.clone();
-        this.brushHatch = other.brushHatch;
-        if (other.brushBitmap != null) {
-            ColorModel cm = other.brushBitmap.getColorModel();
-            boolean isAlphaPremultiplied = cm.isAlphaPremultiplied();
-            WritableRaster raster = other.brushBitmap.copyData(null);
-            this.brushBitmap = new BufferedImage(cm, raster, isAlphaPremultiplied, null);            
-        }
-        this.penWidth = 1;
-        this.penStyle = (other.penStyle == null) ? null : other.penStyle.clone();
-        this.penColor = (other.penColor == null) ? null : other.penColor.clone();
-        this.penMiterLimit = other.penMiterLimit;
-        this.bkMode = other.bkMode;
-        this.polyfillMode = other.polyfillMode;
-        if (other.region instanceof Rectangle2D) {
-            this.region = ((Rectangle2D)other.region).getBounds2D();
-        } else if (other.region instanceof Area) {
-            this.region = new Area(other.region);
-        }
-        this.palette = other.palette;
-        this.paletteOffset = other.paletteOffset;
-        this.font = other.font;
-        this.textColor = (other.textColor == null) ? null : other.textColor.clone();
-    }
-    
-    public void setViewportExt(double width, double height) {
-        if (viewport == null) {
-            viewport = (Rectangle2D)window.clone();
-        }
-        double x = viewport.getX();
-        double y = viewport.getY();
-        double w = (width != 0) ? width : viewport.getWidth();
-        double h = (height != 0) ? height : viewport.getHeight();
-        viewport.setRect(x, y, w, h);
-    }
-
-    public void setViewportOrg(double x, double y) {
-        if (viewport == null) {
-            viewport = (Rectangle2D)window.clone();
-        }
-        double w = viewport.getWidth();
-        double h = viewport.getHeight();
-        viewport.setRect(x, y, w, h);
-    }
-
-    public Rectangle2D getViewport() {
-        return (viewport == null) ? null : (Rectangle2D)viewport.clone();
-    }
-
-    public void setWindowExt(double width, double height) {
-        double x = window.getX();
-        double y = window.getY();
-        double w = (width != 0) ? width : window.getWidth();
-        double h = (height != 0) ? height : window.getHeight();
-        window.setRect(x, y, w, h);
-    }
-
-    public void setWindowOrg(double x, double y) {
-        double w = window.getWidth();
-        double h = window.getHeight();
-        window.setRect(x, y, w, h);
-    }
-
-    public Rectangle2D getWindow() {
-        return (Rectangle2D)window.clone();
-    }
-
-    public void setLocation(double x, double y) {
-        location.setLocation(x, y);
-    }
-
-    public Point2D getLocation() {
-        return (Point2D)location.clone();
-    }
-
-    public void setMapMode(HwmfMapMode mapMode) {
-        this.mapMode = mapMode;
-    }
-
-    public HwmfMapMode getMapMode() {
-        return mapMode;
-    }
-
-    public HwmfBrushStyle getBrushStyle() {
-        return brushStyle;
-    }
-
-    public void setBrushStyle(HwmfBrushStyle brushStyle) {
-        this.brushStyle = brushStyle;
-    }
-
-    public HwmfHatchStyle getBrushHatch() {
-        return brushHatch;
-    }
-
-    public void setBrushHatch(HwmfHatchStyle brushHatch) {
-        this.brushHatch = brushHatch;
-    }
-
-    public HwmfColorRef getBrushColor() {
-        return brushColor;
-    }
-
-    public void setBrushColor(HwmfColorRef brushColor) {
-        this.brushColor = brushColor;
-    }
-
-    public HwmfBkMode getBkMode() {
-        return bkMode;
-    }
-
-    public void setBkMode(HwmfBkMode bkMode) {
-        this.bkMode = bkMode;
-    }
-
-    public HwmfPenStyle getPenStyle() {
-        return penStyle;
-    }
-
-    public void setPenStyle(HwmfPenStyle penStyle) {
-        this.penStyle = penStyle;
-    }
-
-    public HwmfColorRef getPenColor() {
-        return penColor;
-    }
-
-    public void setPenColor(HwmfColorRef penColor) {
-        this.penColor = penColor;
-    }
-
-    public double getPenWidth() {
-        return penWidth;
-    }
-
-    public void setPenWidth(double penWidth) {
-        this.penWidth = penWidth;
-    }
-
-    public double getPenMiterLimit() {
-        return penMiterLimit;
-    }
-
-    public void setPenMiterLimit(double penMiterLimit) {
-        this.penMiterLimit = penMiterLimit;
-    }
-
-    public HwmfColorRef getBackgroundColor() {
-        return backgroundColor;
-    }
-
-    public void setBackgroundColor(HwmfColorRef backgroundColor) {
-        this.backgroundColor = backgroundColor;
-    }
-
-    public HwmfPolyfillMode getPolyfillMode() {
-        return polyfillMode;
-    }
-
-    public void setPolyfillMode(HwmfPolyfillMode polyfillMode) {
-        this.polyfillMode = polyfillMode;
-    }
-
-    public BufferedImage getBrushBitmap() {
-        return brushBitmap;
-    }
-
-    public void setBrushBitmap(BufferedImage brushBitmap) {
-        this.brushBitmap = brushBitmap;
-    }
-
-
-    /**
-     * Gets the last stored region
-     *
-     * @return the last stored region
-     */
-    public Shape getRegion() {
-        return region;
-    }
-
-    /**
-     * Sets a region for further usage
-     *
-     * @param region a region object which is usually a rectangle
-     */
-    public void setRegion(Shape region) {
-        this.region = region;
-    }
-
-    /**
-     * Returns the current palette.
-     * Callers may modify the palette.
-     * 
-     * @return the current palette or null, if it hasn't been set
-     */
-    public List<PaletteEntry> getPalette() {
-        return palette;
-    }
-
-    /**
-     * Sets the current palette.
-     * It's the callers duty to set a modifiable copy of the palette.
-     *
-     * @param palette
-     */
-    public void setPalette(List<PaletteEntry> palette) {
-        this.palette = palette;
-    }
-
-    public int getPaletteOffset() {
-        return paletteOffset;
-    }
-
-    public void setPaletteOffset(int paletteOffset) {
-        this.paletteOffset = paletteOffset;
-    }
-
-    public HwmfColorRef getTextColor() {
-        return textColor;
-    }
-
-    public void setTextColor(HwmfColorRef textColor) {
-        this.textColor = textColor;
-    }
-
-    public HwmfFont getFont() {
-        return font;
-    }
-
-    public void setFont(HwmfFont font) {
-        this.font = font;
-    }
-
-    public HwmfTextAlignment getTextAlignLatin() {
-        return textAlignLatin;
-    }
-
-    public void setTextAlignLatin(HwmfTextAlignment textAlignLatin) {
-        this.textAlignLatin = textAlignLatin;
-    }
-
-    public HwmfTextVerticalAlignment getTextVAlignLatin() {
-        return textVAlignLatin;
-    }
-
-    public void setTextVAlignLatin(HwmfTextVerticalAlignment textVAlignLatin) {
-        this.textVAlignLatin = textVAlignLatin;
-    }
-
-    public HwmfTextAlignment getTextAlignAsian() {
-        return textAlignAsian;
-    }
-
-    public void setTextAlignAsian(HwmfTextAlignment textAlignAsian) {
-        this.textAlignAsian = textAlignAsian;
-    }
-
-    public HwmfTextVerticalAlignment getTextVAlignAsian() {
-        return textVAlignAsian;
-    }
-
-    public void setTextVAlignAsian(HwmfTextVerticalAlignment textVAlignAsian) {
-        this.textVAlignAsian = textVAlignAsian;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
deleted file mode 100644
index 5c0f35b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.draw;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Paint;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.TexturePaint;
-import java.awt.font.TextAttribute;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.text.AttributedString;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import org.apache.poi.hwmf.record.HwmfBrushStyle;
-import org.apache.poi.hwmf.record.HwmfFont;
-import org.apache.poi.hwmf.record.HwmfHatchStyle;
-import org.apache.poi.hwmf.record.HwmfMapMode;
-import org.apache.poi.hwmf.record.HwmfMisc.WmfSetBkMode.HwmfBkMode;
-import org.apache.poi.hwmf.record.HwmfObjectTableEntry;
-import org.apache.poi.hwmf.record.HwmfPenStyle;
-import org.apache.poi.hwmf.record.HwmfPenStyle.HwmfLineDash;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.DrawFontManager;
-import org.apache.poi.sl.draw.Drawable;
-
-public class HwmfGraphics {
-    private final Graphics2D graphicsCtx;
-    private final List<HwmfDrawProperties> propStack = new LinkedList<HwmfDrawProperties>();
-    private HwmfDrawProperties prop = new HwmfDrawProperties();
-    private List<HwmfObjectTableEntry> objectTable = new ArrayList<HwmfObjectTableEntry>();
-    /** Bounding box from the placeable header */ 
-    private final Rectangle2D bbox;
-    private final AffineTransform initialAT;
-
-    /**
-     * Initialize a graphics context for wmf rendering
-     *
-     * @param graphicsCtx the graphics context to delegate drawing calls
-     * @param bbox the bounding box of the wmf (taken from the placeable header)
-     */
-    public HwmfGraphics(Graphics2D graphicsCtx, Rectangle2D bbox) {
-        this.graphicsCtx = graphicsCtx;
-        this.bbox = (Rectangle2D)bbox.clone();
-        this.initialAT = graphicsCtx.getTransform();
-        DrawFactory.getInstance(graphicsCtx).fixFonts(graphicsCtx);
-    }
-
-    public HwmfDrawProperties getProperties() {
-        return prop;
-    }
-
-    public void draw(Shape shape) {
-        HwmfLineDash lineDash = prop.getPenStyle().getLineDash();
-        if (lineDash == HwmfLineDash.NULL) {
-            // line is not drawn
-            return;
-        }
-
-        BasicStroke stroke = getStroke();
-
-        // first draw a solid background line (depending on bkmode)
-        // only makes sense if the line is not solid
-        if (prop.getBkMode() == HwmfBkMode.OPAQUE && (lineDash != HwmfLineDash.SOLID && lineDash != HwmfLineDash.INSIDEFRAME)) {
-            graphicsCtx.setStroke(new BasicStroke(stroke.getLineWidth()));
-            graphicsCtx.setColor(prop.getBackgroundColor().getColor());
-            graphicsCtx.draw(shape);
-        }
-
-        // then draw the (dashed) line
-        graphicsCtx.setStroke(stroke);
-        graphicsCtx.setColor(prop.getPenColor().getColor());
-        graphicsCtx.draw(shape);
-    }
-
-    public void fill(Shape shape) {
-        if (prop.getBrushStyle() != HwmfBrushStyle.BS_NULL) {
-//            GeneralPath gp = new GeneralPath(shape);
-//            gp.setWindingRule(prop.getPolyfillMode().awtFlag);
-            graphicsCtx.setPaint(getFill());
-            graphicsCtx.fill(shape);
-        }
-
-        draw(shape);
-    }
-
-    protected BasicStroke getStroke() {
-        // TODO: fix line width calculation
-        float width = (float)prop.getPenWidth();
-        if (width == 0) {
-            width = 1;
-        }
-        HwmfPenStyle ps = prop.getPenStyle();
-        int cap = ps.getLineCap().awtFlag;
-        int join = ps.getLineJoin().awtFlag;
-        float miterLimit = (float)prop.getPenMiterLimit();
-        float dashes[] = ps.getLineDash().dashes;
-        boolean dashAlt = ps.isAlternateDash();
-        // This value is not an integer index into the dash pattern array.
-        // Instead, it is a floating-point value that specifies a linear distance.
-        float dashStart = (dashAlt && dashes != null && dashes.length > 1) ? dashes[0] : 0;
-
-        return new BasicStroke(width, cap, join, miterLimit, dashes, dashStart);
-    }
-
-    protected Paint getFill() {
-        switch (prop.getBrushStyle()) {
-        default:
-        case BS_INDEXED:
-        case BS_PATTERN8X8:
-        case BS_DIBPATTERN8X8:
-        case BS_MONOPATTERN:
-        case BS_NULL: return null;
-        case BS_PATTERN:
-        case BS_DIBPATTERN:
-        case BS_DIBPATTERNPT: return getPatternPaint();
-        case BS_SOLID: return getSolidFill();
-        case BS_HATCHED: return getHatchedFill();
-        }
-    }
-
-    protected Paint getSolidFill() {
-        return prop.getBrushColor().getColor();
-    }
-
-    protected Paint getHatchedFill() {
-        int dim = 7, mid = 3;
-        BufferedImage bi = new BufferedImage(dim, dim, BufferedImage.TYPE_4BYTE_ABGR);
-        Graphics2D g = bi.createGraphics();
-        Color c = (prop.getBkMode() == HwmfBkMode.TRANSPARENT)
-            ? new Color(0, true)
-            : prop.getBackgroundColor().getColor();
-        g.setColor(c);
-        g.fillRect(0, 0, dim, dim);
-        g.setColor(prop.getBrushColor().getColor());
-        HwmfHatchStyle h = prop.getBrushHatch();
-        if (h == HwmfHatchStyle.HS_HORIZONTAL || h == HwmfHatchStyle.HS_CROSS) {
-            g.drawLine(0, mid, dim, mid);
-        }
-        if (h == HwmfHatchStyle.HS_VERTICAL || h == HwmfHatchStyle.HS_CROSS) {
-            g.drawLine(mid, 0, mid, dim);
-        }
-        if (h == HwmfHatchStyle.HS_FDIAGONAL || h == HwmfHatchStyle.HS_DIAGCROSS) {
-            g.drawLine(0, 0, dim, dim);
-        }
-        if (h == HwmfHatchStyle.HS_BDIAGONAL || h == HwmfHatchStyle.HS_DIAGCROSS) {
-            g.drawLine(0, dim, dim, 0);
-        }
-        g.dispose();
-        return new TexturePaint(bi, new Rectangle(0,0,dim,dim));
-    }
-
-    protected Paint getPatternPaint() {
-        BufferedImage bi = prop.getBrushBitmap();
-        return (bi == null) ? null
-            : new TexturePaint(bi, new Rectangle(0,0,bi.getWidth(),bi.getHeight()));
-    }
-
-    /**
-     * Adds an record of type {@link HwmfObjectTableEntry} to the object table.
-     *
-     * Every object is assigned the lowest available index-that is, the smallest
-     * numerical value-in the WMF Object Table. This binding happens at object creation,
-     * not when the object is used.
-     * Moreover, each object table index uniquely refers to an object.
-     * Indexes in the WMF Object Table always start at 0.
-     *
-     * @param entry
-     */
-    public void addObjectTableEntry(HwmfObjectTableEntry entry) {
-        ListIterator<HwmfObjectTableEntry> oIter = objectTable.listIterator();
-        while (oIter.hasNext()) {
-            HwmfObjectTableEntry tableEntry = oIter.next();
-            if (tableEntry == null) {
-                oIter.set(entry);
-                return;
-            }
-        }
-        objectTable.add(entry);
-    }
-
-    /**
-     * Applies the object table entry
-     *
-     * @param index the index of the object table entry (0-based)
-     * 
-     * @throws IndexOutOfBoundsException if the index is out of range
-     * @throws NoSuchElementException if the entry was deleted before
-     */
-    public void applyObjectTableEntry(int index) {
-        HwmfObjectTableEntry ote = objectTable.get(index);
-        if (ote == null) {
-            throw new NoSuchElementException("WMF reference exception - object table entry on index "+index+" was deleted before.");
-        }
-        ote.applyObject(this);
-    }
-    
-    /**
-     * Unsets (deletes) the object table entry for further usage
-     * 
-     * When a META_DELETEOBJECT record (section 2.3.4.7) is received that specifies this
-     * object's particular index, the object's resources are released, the binding to its
-     * WMF Object Table index is ended, and the index value is returned to the pool of
-     * available indexes. The index will be reused, if needed, by a subsequent object
-     * created by another Object Record Type record.
-     *
-     * @param index the index (0-based)
-     * 
-     * @throws IndexOutOfBoundsException if the index is out of range
-     */
-    public void unsetObjectTableEntry(int index) {
-        objectTable.set(index, null);
-    }
-    
-    /**
-     * Saves the current properties to the stack
-     */
-    public void saveProperties() {
-        propStack.add(prop);
-        prop = new HwmfDrawProperties(prop);  
-    }
-    
-    /**
-     * Restores the properties from the stack
-     *
-     * @param index if the index is positive, the n-th element from the start is activated.
-     *      If the index is negative, the n-th previous element relative to the current properties element is activated.
-     */
-    public void restoreProperties(int index) {
-        if (index == 0) {
-            return;
-        }
-        int stackIndex = index;
-        if (stackIndex < 0) {
-            int curIdx = propStack.indexOf(prop);
-            if (curIdx == -1) {
-                // the current element is not pushed to the stacked, i.e. it's the last
-                curIdx = propStack.size();
-            }
-            stackIndex = curIdx + index;
-        }
-        if (stackIndex == -1) {
-            // roll to last when curIdx == 0
-            stackIndex = propStack.size()-1;
-        }
-        prop = propStack.get(stackIndex);
-    }
-
-    /**
-     * After setting various window and viewport related properties,
-     * the underlying graphics context needs to be adapted.
-     * This methods gathers and sets the corresponding graphics transformations.
-     */
-    public void updateWindowMapMode() {
-        Rectangle2D win = prop.getWindow();
-        HwmfMapMode mapMode = prop.getMapMode();
-        graphicsCtx.setTransform(initialAT);
-
-        switch (mapMode) {
-        default:
-        case MM_ANISOTROPIC:
-            // scale window bounds to output bounds
-            graphicsCtx.scale(bbox.getWidth()/win.getWidth(), bbox.getHeight()/win.getHeight());
-            graphicsCtx.translate(-win.getX(), -win.getY());
-            break;
-        case MM_ISOTROPIC:
-            // TODO: to be validated ...
-            // like anisotropic, but use x-axis as reference
-            graphicsCtx.scale(bbox.getWidth()/win.getWidth(), bbox.getWidth()/win.getWidth());
-            graphicsCtx.translate(-win.getX(), -win.getY());
-            break;
-        case MM_LOMETRIC:
-        case MM_HIMETRIC:
-        case MM_LOENGLISH:
-        case MM_HIENGLISH:
-        case MM_TWIPS: {
-            // TODO: to be validated ...
-            GraphicsConfiguration gc = graphicsCtx.getDeviceConfiguration();
-            graphicsCtx.transform(gc.getNormalizingTransform());
-            graphicsCtx.scale(1./mapMode.scale, -1./mapMode.scale);
-            graphicsCtx.translate(-win.getX(), -win.getY());
-            break;
-        }
-        case MM_TEXT:
-            // TODO: to be validated ...
-            break;
-        }
-    }
-    
-    public void drawString(String text, Rectangle2D bounds) {
-        drawString(text, bounds, null);
-    }
-    
-    public void drawString(String text, Rectangle2D bounds, int dx[]) {
-        HwmfFont font = prop.getFont();
-        if (font == null || text == null || text.isEmpty()) {
-            return;
-        }
-        
-        double fontH = getFontHeight(font);
-        // TODO: another approx. ...
-        double fontW = fontH/1.8;
-        
-        int len = text.length();
-        AttributedString as = new AttributedString(text);
-        if (dx == null || dx.length == 0) {
-            addAttributes(as, font);
-        } else {
-            for (int i=0; i<len; i++) {
-                addAttributes(as, font);
-                // Tracking works as a prefix/advance space on characters whereas
-                // dx[...] is the complete width of the current char
-                // therefore we need to add the additional/suffix width to the next char
-                if (i<len-1) {
-                    as.addAttribute(TextAttribute.TRACKING, (dx[i]-fontW)/fontH, i+1, i+2);
-                }
-            }
-        }
-        
-        
-        double angle = Math.toRadians(-font.getEscapement()/10.);
-        
-        
-        final AffineTransform at = graphicsCtx.getTransform();
-        try {
-            graphicsCtx.translate(bounds.getX(), bounds.getY()+fontH);
-            graphicsCtx.rotate(angle);
-            if (prop.getBkMode() == HwmfBkMode.OPAQUE) {
-                // TODO: validate bounds
-                graphicsCtx.setBackground(prop.getBackgroundColor().getColor());
-                graphicsCtx.fill(new Rectangle2D.Double(0, 0, bounds.getWidth(), bounds.getHeight()));
-            }
-            graphicsCtx.setColor(prop.getTextColor().getColor());
-            graphicsCtx.drawString(as.getIterator(), 0, 0); // (float)bounds.getX(), (float)bounds.getY());
-        } finally {
-            graphicsCtx.setTransform(at);
-        }
-    }
-    
-    private void addAttributes(AttributedString as, HwmfFont font) {
-        DrawFontManager fontHandler = (DrawFontManager)graphicsCtx.getRenderingHint(Drawable.FONT_HANDLER);
-        String fontFamily = null;
-        @SuppressWarnings("unchecked")
-        Map<String,String> fontMap = (Map<String,String>)graphicsCtx.getRenderingHint(Drawable.FONT_MAP);
-        if (fontMap != null && fontMap.containsKey(font.getFacename())) {
-            fontFamily = fontMap.get(font.getFacename());
-        }
-        if (fontHandler != null) {
-            fontFamily = fontHandler.getRendererableFont(font.getFacename(), font.getPitchAndFamily());
-        }
-        if (fontFamily == null) {
-            fontFamily = font.getFacename();
-        }
-        
-        as.addAttribute(TextAttribute.FAMILY, fontFamily);
-        as.addAttribute(TextAttribute.SIZE, getFontHeight(font));
-        as.addAttribute(TextAttribute.STRIKETHROUGH, font.isStrikeOut());
-        if (font.isUnderline()) {
-            as.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
-        }
-        if (font.isItalic()) {
-            as.addAttribute(TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE);
-        }
-        as.addAttribute(TextAttribute.WEIGHT, font.getWeight());
-    }
-    
-    private double getFontHeight(HwmfFont font) {
-        // see HwmfFont#height for details
-        double fontHeight = font.getHeight();
-        if (fontHeight == 0) {
-            return 12;
-        } else if (fontHeight < 0) {
-            return -fontHeight;
-        } else {
-            // TODO: fix font height calculation 
-            // the height is given as font size + ascent + descent
-            // as an approximation we reduce the height by a static factor 
-            return fontHeight*3/4;
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfSLImageRenderer.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfSLImageRenderer.java
deleted file mode 100644
index ab69ea6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfSLImageRenderer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.draw;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.RenderingHints;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.RescaleOp;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hwmf.usermodel.HwmfPicture;
-import org.apache.poi.sl.draw.ImageRenderer;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.util.Units;
-
-public class HwmfSLImageRenderer implements ImageRenderer {
-    HwmfPicture image = null;
-    double alpha = 0;
-    
-    @Override
-    public void loadImage(InputStream data, String contentType) throws IOException {
-        if (!PictureData.PictureType.WMF.contentType.equals(contentType)) {
-            throw new IOException("Invalid picture type");
-        }
-        image = new HwmfPicture(data);
-    }
-
-    @Override
-    public void loadImage(byte[] data, String contentType) throws IOException {
-        if (!PictureData.PictureType.WMF.contentType.equals(contentType)) {
-            throw new IOException("Invalid picture type");
-        }
-        image = new HwmfPicture(new ByteArrayInputStream(data));
-    }
-
-    @Override
-    public Dimension getDimension() {
-        int width = 0, height = 0;
-        if (image != null) {
-            Dimension dim = image.getSize();
-            width = Units.pointsToPixel(dim.getWidth());
-            // keep aspect ratio for height
-            height = Units.pointsToPixel(dim.getHeight());
-        }
-        return new Dimension(width, height);
-    }
-
-    @Override
-    public void setAlpha(double alpha) {
-        this.alpha = alpha;
-    }
-
-    @Override
-    public BufferedImage getImage() {
-        return getImage(getDimension());
-    }
-
-    @Override
-    public BufferedImage getImage(Dimension dim) {
-        if (image == null) {
-            return new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB); 
-        }
-        
-        BufferedImage bufImg = new BufferedImage((int)dim.getWidth(), (int)dim.getHeight(), BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = bufImg.createGraphics();
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-        g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        image.draw(g, new Rectangle2D.Double(0,0,dim.getWidth(),dim.getHeight()));
-        g.dispose();
-        
-        if (alpha != 0) {
-            BufferedImage newImg = new BufferedImage((int)dim.getWidth(), (int)dim.getHeight(), BufferedImage.TYPE_INT_ARGB);
-            g = newImg.createGraphics();
-            RescaleOp op = new RescaleOp(new float[]{1.0f, 1.0f, 1.0f, (float)alpha}, new float[]{0,0,0,0}, null);
-            g.drawImage(bufImg, op, 0, 0);
-            g.dispose();
-            bufImg = newImg;
-        }
-        
-        return bufImg;
-    }
-    
-    @Override
-    public boolean drawImage(Graphics2D graphics, Rectangle2D anchor) {
-        return drawImage(graphics, anchor, null);
-    }
-
-    @Override
-    public boolean drawImage(Graphics2D graphics, Rectangle2D anchor, Insets clip) {
-        if (image == null) {
-            return false;
-        } else {
-            image.draw(graphics, anchor);
-            return true;
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
deleted file mode 100644
index 31ddcd7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-/**
- * The BinaryRasterOperation Enumeration section lists the binary raster-operation codes.
- * Rasteroperation codes define how metafile processing combines the bits from the selected
- * pen with the bits in the destination bitmap.
- *
- * Each raster-operation code represents a Boolean operation in which the values of the pixels in the
- * selected pen and the destination bitmap are combined. Following are the two operands used in these
- * operations.
- *
- * <table>
- * <tr><th>Operand</th><th>Meaning</th></tr>
- * <tr><td>P</td><td>Selected pen</td></tr>
- * <tr><td>D</td><td>Destination bitmap</td></tr>
- * </table>
- *
- * Following are the Boolean operators used in these operations.
- * <table>
- * <tr><th>Operand</th><th>Meaning</th></tr>
- * <tr><td>a</td><td>Bitwise AND</td></tr>
- * <tr><td>n</td><td>Bitwise NOT (inverse)</td></tr>
- * <tr><td>o</td><td>Bitwise OR</td></tr>
- * <tr><td>x</td><td>Bitwise exclusive OR (XOR)</td></tr>
- * </table>
- *
- * All Boolean operations are presented in reverse Polish notation. For example, the following
- * operation replaces the values of the pixels in the destination bitmap with a combination of the pixel
- * values of the pen and the selected brush: DPo.
- *
- * Each raster-operation code is a 32-bit integer whose high-order word is a Boolean operation index and
- * whose low-order word is the operation code. The 16-bit operation index is a zero-extended, 8-bit
- * value that represents all possible outcomes resulting from the Boolean operation on two parameters
- * (in this case, the pen and destination values). For example, the operation indexes for the DPo and
- * DPan operations are shown in the following list.
- *
- * <table>
- * <tr><th>P</th><th>D</th><th>DPo</th><th>DPan</th></tr>
- * <tr><td>0</td><td>0</td><td>0</td><td>1</td></tr>
- * <tr><td>0</td><td>1</td><td>1</td><td>1</td></tr>
- * <tr><td>1</td><td>0</td><td>1</td><td>1</td></tr>
- * <tr><td>1</td><td>1</td><td>1</td><td>0</td></tr>
- * </table>
- *
- */
-public enum HwmfBinaryRasterOp {
-    /** 0, Pixel is always 0 */
-    R2_BLACK(0x0001),
-    /** DPon, Pixel is the inverse of the R2_MERGEPEN color. */
-    R2_NOTMERGEPEN(0x0002),
-    /** DPna, Pixel is a combination of the screen color and the inverse of the pen color. */
-    R2_MASKNOTPEN(0x0003),
-    /** Pn, Pixel is the inverse of the pen color. */
-    R2_NOTCOPYPEN(0x0004),
-    /** PDna, Pixel is a combination of the colors common to both the pen and the inverse of the screen. */
-    R2_MASKPENNOT(0x0005),
-    /** Dn, Pixel is the inverse of the screen color. */
-    R2_NOT(0x0006),
-    /** DPx, Pixel is a combination of the colors in the pen or in the screen, but not in both. */
-    R2_XORPEN(0x0007),
-    /** DPan, Pixel is the inverse of the R2_MASKPEN color. */
-    R2_NOTMASKPEN(0x0008),
-    /** DPa, Pixel is a combination of the colors common to both the pen and the screen. */
-    R2_MASKPEN(0x0009),
-    /** DPxn, Pixel is the inverse of the R2_XORPEN color. */
-    R2_NOTXORPEN(0x000A),
-    /** D, Pixel remains unchanged. */
-    R2_NOP(0x000B),
-    /** DPno, Pixel is a combination of the colors common to both the screen and the inverse of the pen. */
-    R2_MERGENOTPEN(0x000C),
-    /** P, Pixel is the pen color. */
-    R2_COPYPEN(0x000D),
-    /** PDno, Pixel is a combination of the pen color and the inverse of the screen color.*/
-    R2_MERGEPENNOT(0x000E),
-    /** DPo, Pixel is a combination of the pen color and the screen color. */
-    R2_MERGEPEN(0x000F),
-    /** 1, Pixel is always 1 */
-    R2_WHITE(0x0010);
-
-    int opIndex;
-
-    HwmfBinaryRasterOp(int opIndex) {
-        this.opIndex=opIndex;
-    }
-
-    public static HwmfBinaryRasterOp valueOf(int opIndex) {
-        for (HwmfBinaryRasterOp bb : HwmfBinaryRasterOp.values()) {
-            if (bb.opIndex == opIndex) {
-                return bb;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java
deleted file mode 100644
index 3a774af..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfBitmap16 {
-    final boolean isPartial;
-    int type;
-    int width;
-    int height;
-    int widthBytes;
-    int planes;
-    int bitsPixel;
-    
-    public HwmfBitmap16() {
-        this(false);
-    }
-    
-    public HwmfBitmap16(boolean isPartial) {
-        this.isPartial = isPartial;
-    }
-    
-    public int init(LittleEndianInputStream leis) throws IOException {
-        // A 16-bit signed integer that defines the bitmap type.
-        type = leis.readShort();
-        
-        // A 16-bit signed integer that defines the width of the bitmap in pixels.
-        width = leis.readShort();
-        
-        // A 16-bit signed integer that defines the height of the bitmap in scan lines.
-        height = leis.readShort();
-        
-        // A 16-bit signed integer that defines the number of bytes per scan line.
-        widthBytes = leis.readShort();
-        
-        // An 8-bit unsigned integer that defines the number of color planes in the 
-        // bitmap. The value of this field MUST be 0x01.
-        planes = leis.readUByte();
-        
-        // An 8-bit unsigned integer that defines the number of adjacent color bits on 
-        // each plane.
-        bitsPixel = leis.readUByte();
-
-        int size = 2*LittleEndianConsts.BYTE_SIZE+4*LittleEndianConsts.SHORT_SIZE;
-        if (isPartial) {
-            // Bits (4 bytes): This field MUST be ignored.
-            long skipSize = leis.skip(LittleEndianConsts.INT_SIZE);
-            assert(skipSize == LittleEndianConsts.INT_SIZE);
-            // Reserved (18 bytes): This field MUST be ignored.
-            skipSize = leis.skip(18);
-            assert(skipSize == 18);
-            size += 18+LittleEndianConsts.INT_SIZE;
-        }
-
-        int length = (((width * bitsPixel + 15) >> 4) << 1) * height;
-        @SuppressWarnings("unused")
-        byte buf[] = IOUtils.toByteArray(leis, length);
-        
-        // TODO: this is not implemented ... please provide a sample, if it
-        // ever happens to you, to come here ...
-        
-        return size;
-    }
-
-    public BufferedImage getImage() {
-        return new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java
deleted file mode 100644
index ba935f3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.RecordFormatException;
-
-/**
- * The DeviceIndependentBitmap Object defines an image in device-independent bitmap (DIB) format.
- */
-public class HwmfBitmapDib {
-    public static enum BitCount {
-        /**
-         * The image SHOULD be in either JPEG or PNG format. <6> Neither of these formats includes
-         *  a color table, so this value specifies that no color table is present. See [JFIF] and [RFC2083]
-         *  for more information concerning JPEG and PNG compression formats.
-         */
-        BI_BITCOUNT_0(0x0000),
-        /**
-         * Each pixel in the bitmap is represented by a single bit. If the bit is clear, the pixel is displayed
-         *  with the color of the first entry in the color table; if the bit is set, the pixel has the color of the
-         *  second entry in the table.
-         */
-        BI_BITCOUNT_1(0x0001),
-        /**
-         * Each pixel in the bitmap is represented by a 4-bit index into the color table, and each byte
-         *  contains 2 pixels.
-         */
-        BI_BITCOUNT_2(0x0004),
-        /**
-         * Each pixel in the bitmap is represented by an 8-bit index into the color table, and each byte
-         *  contains 1 pixel.
-         */
-        BI_BITCOUNT_3(0x0008),
-        /**
-         * Each pixel in the bitmap is represented by a 16-bit value.
-         * <br/>
-         * If the Compression field of the BitmapInfoHeader Object is BI_RGB, the Colors field of DIB
-         *  is NULL. Each WORD in the bitmap array represents a single pixel. The relative intensities of
-         *  red, green, and blue are represented with 5 bits for each color component. The value for blue
-         *  is in the least significant 5 bits, followed by 5 bits each for green and red. The most significant
-         *  bit is not used. The color table is used for optimizing colors on palette-based devices, and
-         *  contains the number of entries specified by the ColorUsed field of the BitmapInfoHeader
-         *  Object.
-         * <br/>
-         * If the Compression field of the BitmapInfoHeader Object is BI_BITFIELDS, the Colors field
-         *  contains three DWORD color masks that specify the red, green, and blue components,
-         *  respectively, of each pixel. Each WORD in the bitmap array represents a single pixel.
-         * <br/>
-         * When the Compression field is set to BI_BITFIELDS, bits set in each DWORD mask MUST be
-         *  contiguous and SHOULD NOT overlap the bits of another mask.
-         */
-        BI_BITCOUNT_4(0x0010),
-        /**
-         * The bitmap has a maximum of 2^24 colors, and the Colors field of DIB is
-         *  NULL. Each 3-byte triplet in the bitmap array represents the relative intensities of blue, green,
-         *  and red, respectively, for a pixel. The Colors color table is used for optimizing colors used on
-         *  palette-based devices, and MUST contain the number of entries specified by the ColorUsed
-         *  field of the BitmapInfoHeader Object.
-         */
-        BI_BITCOUNT_5(0x0018),
-        /**
-         * The bitmap has a maximum of 2^24 colors.
-         * <br/>
-         * If the Compression field of the BitmapInfoHeader Object is set to BI_RGB, the Colors field
-         *  of DIB is set to NULL. Each DWORD in the bitmap array represents the relative intensities of
-         *  blue, green, and red, respectively, for a pixel. The high byte in each DWORD is not used. The
-         *  Colors color table is used for optimizing colors used on palette-based devices, and MUST
-         *  contain the number of entries specified by the ColorUsed field of the BitmapInfoHeader
-         *  Object.
-         * <br/>
-         * If the Compression field of the BitmapInfoHeader Object is set to BI_BITFIELDS, the Colors
-         *  field contains three DWORD color masks that specify the red, green, and blue components,
-         *  respectively, of each pixel. Each DWORD in the bitmap array represents a single pixel.
-         * <br/>
-         * When the Compression field is set to BI_BITFIELDS, bits set in each DWORD mask must be
-         *  contiguous and should not overlap the bits of another mask. All the bits in the pixel do not
-         *  need to be used.
-         */
-        BI_BITCOUNT_6(0x0020);
-
-        int flag;
-        BitCount(int flag) {
-            this.flag = flag;
-        }
-        static BitCount valueOf(int flag) {
-            for (BitCount bc : values()) {
-                if (bc.flag == flag) return bc;
-            }
-            return null;
-        }
-    }
-
-    public static enum Compression {
-        /**
-         * The bitmap is in uncompressed red green blue (RGB) format that is not compressed
-         * and does not use color masks.
-         */
-        BI_RGB(0x0000),
-        /**
-         * An RGB format that uses run-length encoding (RLE) compression for bitmaps
-         * with 8 bits per pixel. The compression uses a 2-byte format consisting of a count byte
-         * followed by a byte containing a color index.
-         */
-        BI_RLE8(0x0001),
-        /**
-         * An RGB format that uses RLE compression for bitmaps with 4 bits per pixel. The
-         * compression uses a 2-byte format consisting of a count byte followed by two word-length
-         * color indexes.
-         */
-        BI_RLE4(0x0002),
-        /**
-         * The bitmap is not compressed and the color table consists of three DWORD
-         * color masks that specify the red, green, and blue components, respectively, of each pixel.
-         * This is valid when used with 16 and 32-bits per pixel bitmaps.
-         */
-        BI_BITFIELDS(0x0003),
-        /**
-         * The image is a JPEG image, as specified in [JFIF]. This value SHOULD only be used in
-         * certain bitmap operations, such as JPEG pass-through. The application MUST query for the
-         * pass-through support, since not all devices support JPEG pass-through. Using non-RGB
-         * bitmaps MAY limit the portability of the metafile to other devices. For instance, display device
-         * contexts generally do not support this pass-through.
-         */
-        BI_JPEG(0x0004),
-        /**
-         * The image is a PNG image, as specified in [RFC2083]. This value SHOULD only be
-         * used certain bitmap operations, such as JPEG/PNG pass-through. The application MUST query
-         * for the pass-through support, because not all devices support JPEG/PNG pass-through. Using
-         * non-RGB bitmaps MAY limit the portability of the metafile to other devices. For instance,
-         * display device contexts generally do not support this pass-through.
-         */
-        BI_PNG(0x0005),
-        /**
-         * The image is an uncompressed CMYK format.
-         */
-        BI_CMYK(0x000B),
-        /**
-         * A CMYK format that uses RLE compression for bitmaps with 8 bits per pixel.
-         * The compression uses a 2-byte format consisting of a count byte followed by a byte containing
-         * a color index.
-         */
-        BI_CMYKRLE8(0x000C),
-        /**
-         * A CMYK format that uses RLE compression for bitmaps with 4 bits per pixel.
-         * The compression uses a 2-byte format consisting of a count byte followed by two word-length
-         * color indexes.
-         */
-        BI_CMYKRLE4(0x000D);
-
-        int flag;
-        Compression(int flag) {
-            this.flag = flag;
-        }
-        static Compression valueOf(int flag) {
-            for (Compression c : values()) {
-                if (c.flag == flag) return c;
-            }
-            return null;
-        }
-    }
-
-    private static POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class);
-    private static final int BMP_HEADER_SIZE = 14;
-    
-    private int headerSize;
-    private int headerWidth;
-    private int headerHeight;
-    private int headerPlanes;
-    private BitCount headerBitCount;
-    private Compression headerCompression;
-    private long headerImageSize = -1;
-    @SuppressWarnings("unused")
-    private int headerXPelsPerMeter = -1;
-    @SuppressWarnings("unused")
-    private int headerYPelsPerMeter = -1;
-    private long headerColorUsed = -1;
-    @SuppressWarnings("unused")
-    private long headerColorImportant = -1;
-    private Color colorTable[];
-    @SuppressWarnings("unused")
-    private int colorMaskR=0,colorMaskG=0,colorMaskB=0;
-
-    // size of header and color table, for start of image data calculation
-    private int introSize;
-    private byte imageData[];
-
-    public int init(LittleEndianInputStream leis, int recordSize) throws IOException {
-        leis.mark(10000);
-        
-        // need to read the header to calculate start of bitmap data correct
-        introSize = readHeader(leis);
-        assert(introSize == headerSize);
-        introSize += readColors(leis);
-        assert(introSize < 10000);
-
-        int fileSize = (headerImageSize < headerSize) ? recordSize : (int)Math.min(introSize+headerImageSize,recordSize);
-        
-        leis.reset();
-        imageData = IOUtils.toByteArray(leis, fileSize);
-        
-        assert( headerSize != 0x0C || ((((headerWidth * headerPlanes * headerBitCount.flag + 31) & ~31) / 8) * Math.abs(headerHeight)) == headerImageSize);
-
-        return fileSize;
-    }
-
-    protected int readHeader(LittleEndianInputStream leis) throws IOException {
-        int size = 0;
-
-        /**
-         * DIBHeaderInfo (variable): Either a BitmapCoreHeader Object or a
-         * BitmapInfoHeader Object that specifies information about the image.
-         *
-         * The first 32 bits of this field is the HeaderSize value.
-         * If it is 0x0000000C, then this is a BitmapCoreHeader; otherwise, this is a BitmapInfoHeader.
-         */
-        headerSize = leis.readInt();
-        size += LittleEndianConsts.INT_SIZE;
-
-        if (headerSize == 0x0C) {
-            // BitmapCoreHeader
-            // A 16-bit unsigned integer that defines the width of the DIB, in pixels.
-            headerWidth = leis.readUShort();
-            // A 16-bit unsigned integer that defines the height of the DIB, in pixels.
-            headerHeight = leis.readUShort();
-            // A 16-bit unsigned integer that defines the number of planes for the target
-            // device. This value MUST be 0x0001.
-            headerPlanes = leis.readUShort();
-            // A 16-bit unsigned integer that defines the format of each pixel, and the
-            // maximum number of colors in the DIB.
-            headerBitCount = BitCount.valueOf(leis.readUShort());
-            size += 4*LittleEndianConsts.SHORT_SIZE;
-        } else {
-            // BitmapInfoHeader
-            // A 32-bit signed integer that defines the width of the DIB, in pixels.
-            // This value MUST be positive.
-            // This field SHOULD specify the width of the decompressed image file,
-            // if the Compression value specifies JPEG or PNG format.
-            headerWidth = leis.readInt();
-            // A 32-bit signed integer that defines the height of the DIB, in pixels.
-            // This value MUST NOT be zero.
-            // - If this value is positive, the DIB is a bottom-up bitmap,
-            //   and its origin is the lower-left corner.
-            //   This field SHOULD specify the height of the decompressed image file,
-            //   if the Compression value specifies JPEG or PNG format.
-            // - If this value is negative, the DIB is a top-down bitmap,
-            //   and its origin is the upper-left corner. Top-down bitmaps do not support compression.
-            headerHeight = leis.readInt();
-            // A 16-bit unsigned integer that defines the number of planes for the target
-            // device. This value MUST be 0x0001.
-            headerPlanes = leis.readUShort();
-            // A 16-bit unsigned integer that defines the format of each pixel, and the
-            // maximum number of colors in the DIB.
-            headerBitCount = BitCount.valueOf(leis.readUShort());
-            // A 32-bit unsigned integer that defines the compression mode of the DIB.
-            // This value MUST NOT specify a compressed format if the DIB is a top-down bitmap,
-            // as indicated by the Height value.
-            headerCompression = Compression.valueOf((int)leis.readUInt());
-            // A 32-bit unsigned integer that defines the size, in bytes, of the image.
-            // If the Compression value is BI_RGB, this value SHOULD be zero and MUST be ignored.
-            // If the Compression value is BI_JPEG or BI_PNG, this value MUST specify the size of the JPEG
-            // or PNG image buffer, respectively.
-            headerImageSize = leis.readUInt();
-            // A 32-bit signed integer that defines the horizontal resolution,
-            // in pixels-per-meter, of the target device for the DIB.
-            headerXPelsPerMeter = leis.readInt();
-            // A 32-bit signed integer that defines the vertical resolution,
-            headerYPelsPerMeter = leis.readInt();
-            // A 32-bit unsigned integer that specifies the number of indexes in the
-            // color table used by the DIB
-            // in pixelsper-meter, of the target device for the DIB.
-            headerColorUsed = leis.readUInt();
-            // A 32-bit unsigned integer that defines the number of color indexes that are
-            // required for displaying the DIB. If this value is zero, all color indexes are required.
-            headerColorImportant = leis.readUInt();
-            size += 8*LittleEndianConsts.INT_SIZE+2*LittleEndianConsts.SHORT_SIZE;
-        }
-        assert(size == headerSize);
-        return size;
-    }
-
-    protected int readColors(LittleEndianInputStream leis) throws IOException {
-        switch (headerBitCount) {
-        default:
-        case BI_BITCOUNT_0:
-            // no table
-            return 0;
-        case BI_BITCOUNT_1:
-            // 2 colors
-            return readRGBQuad(leis, (int)(headerColorUsed == 0 ? 2 : Math.min(headerColorUsed,2)));
-        case BI_BITCOUNT_2:
-            // 16 colors
-            return readRGBQuad(leis, (int)(headerColorUsed == 0 ? 16 : Math.min(headerColorUsed,16)));
-        case BI_BITCOUNT_3:
-            // 256 colors
-            return readRGBQuad(leis, (int)(headerColorUsed == 0 ? 256 : Math.min(headerColorUsed,256)));
-        case BI_BITCOUNT_4:
-            switch (headerCompression) {
-            case BI_RGB:
-                colorMaskB = 0x1F;
-                colorMaskG = 0x1F<<5;
-                colorMaskR = 0x1F<<10;
-                return 0;
-            case BI_BITFIELDS:
-                colorMaskB = leis.readInt();
-                colorMaskG = leis.readInt();
-                colorMaskR = leis.readInt();
-                return 3*LittleEndianConsts.INT_SIZE;
-            default:
-                throw new IOException("Invalid compression option ("+headerCompression+") for bitcount ("+headerBitCount+").");
-            }
-        case BI_BITCOUNT_5:
-        case BI_BITCOUNT_6:
-            switch (headerCompression) {
-            case BI_RGB:
-                colorMaskR=0xFF;
-                colorMaskG=0xFF;
-                colorMaskB=0xFF;
-                return 0;
-            case BI_BITFIELDS:
-                colorMaskB = leis.readInt();
-                colorMaskG = leis.readInt();
-                colorMaskR = leis.readInt();
-                return 3*LittleEndianConsts.INT_SIZE;
-            default:
-                throw new IOException("Invalid compression option ("+headerCompression+") for bitcount ("+headerBitCount+").");
-            }
-        }
-    }
-
-    protected int readRGBQuad(LittleEndianInputStream leis, int count) throws IOException {
-        int size = 0;
-        colorTable = new Color[count];
-        for (int i=0; i<count; i++) {
-            int blue = leis.readUByte();
-            int green = leis.readUByte();
-            int red = leis.readUByte();
-            @SuppressWarnings("unused")
-            int reserved = leis.readUByte();
-            colorTable[i] = new Color(red, green, blue);
-            size += 4 * LittleEndianConsts.BYTE_SIZE;
-        }
-        return size;
-    }
-
-    public InputStream getBMPStream() {
-        return new ByteArrayInputStream(getBMPData());
-    }
-
-    private byte[] getBMPData() {
-        if (imageData == null) {
-            throw new RecordFormatException("bitmap not initialized ... need to call init() before");
-        }
-
-        // sometimes there are missing bytes after the imageData which will be 0-filled
-        int imageSize = (int)Math.max(imageData.length, introSize+headerImageSize);
-        
-        // create the image data and leave the parsing to the ImageIO api
-        byte buf[] = new byte[BMP_HEADER_SIZE+imageSize];
-
-        // https://en.wikipedia.org/wiki/BMP_file_format #  Bitmap file header
-        buf[0] = (byte)'B';
-        buf[1] = (byte)'M';
-        // the full size of the bmp
-        LittleEndian.putInt(buf, 2, BMP_HEADER_SIZE+imageSize);
-        // the next 4 bytes are unused
-        LittleEndian.putInt(buf, 6, 0);
-        // start of image = BMP header length + dib header length + color tables length
-        LittleEndian.putInt(buf, 10, BMP_HEADER_SIZE + introSize);
-        // fill the "known" image data
-        System.arraycopy(imageData, 0, buf, BMP_HEADER_SIZE, imageData.length);
-        
-        return buf;
-    }
-    
-    public BufferedImage getImage() {
-        try {
-            return ImageIO.read(getBMPStream());
-        } catch (IOException e) {
-            logger.log(POILogger.ERROR, "invalid bitmap data - returning black opaque image");
-            BufferedImage bi = new BufferedImage(headerWidth, headerHeight, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D g = bi.createGraphics();
-            g.setPaint(Color.black);
-            g.fillRect(0, 0, headerWidth, headerHeight);
-            g.dispose();
-            return bi;
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBrushStyle.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBrushStyle.java
deleted file mode 100644
index 5568e2b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBrushStyle.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-/**
- * A 16-bit unsigned integer that defines the brush style. The legal values for this
- * field are defined as follows: if the value is not BS_PATTERN, BS_DIBPATTERNPT MUST be
- * assumed.
- */
-public enum HwmfBrushStyle {
-    /**
-     * A brush that paints a single, constant color, either solid or dithered.
-     */
-    BS_SOLID(0x0000),
-    /**
-     * A brush that does nothing. Using a BS_NULL brush in a graphics operation
-     * MUST have the same effect as using no brush at all.
-     */
-    BS_NULL(0x0001),
-    /**
-     * A brush that paints a predefined simple pattern, or "hatch", onto a solid background.
-     */
-    BS_HATCHED(0x0002),
-    /**
-     * A brush that paints a pattern defined by a bitmap, which MAY be a Bitmap16
-     * Object or a DeviceIndependentBitmap (DIB) Object.
-     */
-    BS_PATTERN(0x0003),
-    /**
-     * Not supported
-     */
-    BS_INDEXED(0x0004),
-    /**
-     * A pattern brush specified by a DIB.
-     */
-    BS_DIBPATTERN(0x0005),
-    /**
-     * A pattern brush specified by a DIB.
-     */
-    BS_DIBPATTERNPT(0x0006),
-    /**
-     * Not supported
-     */
-    BS_PATTERN8X8(0x0007),
-    /**
-     * Not supported
-     */
-    BS_DIBPATTERN8X8(0x0008),
-    /**
-     * Not supported
-     */
-    BS_MONOPATTERN(0x0009);
-
-    int flag;
-    HwmfBrushStyle(int flag) {
-        this.flag = flag;
-    }
-
-    static HwmfBrushStyle valueOf(int flag) {
-        for (HwmfBrushStyle bs : values()) {
-            if (bs.flag == flag) return bs;
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java
deleted file mode 100644
index a3b1aa2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.Color;
-import java.io.IOException;
-
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-/**
- * A 32-bit ColorRef Object that defines the color value.
- * Red (1 byte):  An 8-bit unsigned integer that defines the relative intensity of red.
- * Green (1 byte):  An 8-bit unsigned integer that defines the relative intensity of green.
- * Blue (1 byte):  An 8-bit unsigned integer that defines the relative intensity of blue.
- * Reserved (1 byte):  An 8-bit unsigned integer that MUST be 0x00.
- */
-public class HwmfColorRef implements Cloneable {
-    private Color colorRef = Color.BLACK;
-    
-    public HwmfColorRef() {}
-    
-    public HwmfColorRef(Color colorRef) {
-        this.colorRef = colorRef;
-    }
-    
-    public int init(LittleEndianInputStream leis) throws IOException {
-        int red = leis.readUByte();
-        int green = leis.readUByte();
-        int blue = leis.readUByte();
-        /*int reserved =*/ leis.readUByte();
-
-        colorRef = new Color(red, green, blue);
-        return 4*LittleEndianConsts.BYTE_SIZE;
-    }
-
-    public Color getColor() {
-        return colorRef;
-    }
-
-    /**
-     * Creates a new object of the same class and with the
-     * same contents as this object.
-     * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
-     * @see        java.lang.Cloneable
-     */
-    @Override
-    public HwmfColorRef clone() {
-        try {
-            return (HwmfColorRef)super.clone();
-        } catch (CloneNotSupportedException e) {
-            // this shouldn't happen, since we are Cloneable
-            throw new InternalError();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
deleted file mode 100644
index d8c7cfe..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
+++ /dev/null
@@ -1,698 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.Shape;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Line2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfDraw {
-    /**
-     * The META_MOVETO record sets the output position in the playback device context to a specified
-     * point.
-     */
-    public static class WmfMoveTo implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units.
-         */
-        private int y;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units.
-         */
-        private int x;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.moveTo;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            y = leis.readShort();
-            x = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setLocation(x, y);
-        }
-    }
-
-    /**
-     * The META_LINETO record draws a line from the drawing position that is defined in the playback
-     * device context up to, but not including, the specified point.
-     */
-    public static class WmfLineTo implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the vertical component of the drawing
-         * destination position, in logical units.
-         */
-        private int y;
-
-        /**
-         * A 16-bit signed integer that defines the horizontal component of the drawing
-         * destination position, in logical units.
-         */
-        private int x;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.lineTo;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            y = leis.readShort();
-            x = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Point2D start = ctx.getProperties().getLocation();
-            Line2D line = new Line2D.Double(start.getX(), start.getY(), x, y);
-            ctx.draw(line);
-            ctx.getProperties().setLocation(x, y);
-        }
-    }
-
-    /**
-     * The META_POLYGON record paints a polygon consisting of two or more vertices connected by
-     * straight lines. The polygon is outlined by using the pen and filled by using the brush and polygon fill
-     * mode that are defined in the playback device context.
-     */
-    public static class WmfPolygon implements HwmfRecord {
-
-        private Path2D poly = new Path2D.Double();
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.polygon;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            /**
-             * A 16-bit signed integer that defines the number of points in the array.
-             */
-            int numberofPoints = leis.readShort();
-
-            for (int i=0; i<numberofPoints; i++) {
-                // A 16-bit signed integer that defines the horizontal (x) coordinate of the point.
-                int x = leis.readShort();
-                // A 16-bit signed integer that defines the vertical (y) coordinate of the point.
-                int y = leis.readShort();
-                if (i==0) {
-                    poly.moveTo(x, y);
-                } else {
-                    poly.lineTo(x, y);
-                }
-            }
-
-            return LittleEndianConsts.SHORT_SIZE+numberofPoints*LittleEndianConsts.INT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Path2D shape = getShape();
-//            shape.closePath();
-            Path2D p = (Path2D)shape.clone();
-            p.setWindingRule(getWindingRule(ctx));
-            ctx.fill(p);
-        }
-
-        protected Path2D getShape() {
-            return (Path2D)poly.clone();
-        }
-    }
-
-    /**
-     * The META_POLYLINE record draws a series of line segments by connecting the points in the
-     * specified array.
-     */
-    public static class WmfPolyline extends WmfPolygon {
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.polyline;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Path2D shape = getShape();
-            Path2D p = (Path2D)shape.clone();
-            p.setWindingRule(getWindingRule(ctx));
-            ctx.draw(p);
-        }
-    }
-
-    /**
-     * The META_ELLIPSE record draws an ellipse. The center of the ellipse is the center of the specified
-     * bounding rectangle. The ellipse is outlined by using the pen and is filled by using the brush; these
-     * are defined in the playback device context.
-     */
-    public static class WmfEllipse implements HwmfRecord {
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of
-         * the lower-right corner of the bounding rectangle.
-         */
-        private int bottomRect;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the lower-right corner of the bounding rectangle.
-         */
-        private int rightRect;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the bounding rectangle.
-         */
-        private int topRect;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the upper-left corner of the bounding rectangle.
-         */
-        private int leftRect;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.ellipse;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            bottomRect = leis.readShort();
-            rightRect = leis.readShort();
-            topRect = leis.readShort();
-            leftRect = leis.readShort();
-            return 4*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            int x = Math.min(leftRect, rightRect);
-            int y = Math.min(topRect, bottomRect);
-            int w = Math.abs(leftRect - rightRect - 1);
-            int h = Math.abs(topRect - bottomRect - 1);
-            Shape s = new Ellipse2D.Double(x, y, w, h);
-            ctx.fill(s);
-        }
-    }
-
-
-    /**
-     * The META_FRAMEREGION record draws a border around a specified region using a specified brush.
-     */
-    public static class WmfFrameRegion implements HwmfRecord {
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get
-         * the region to be framed.
-         */
-        private int regionIndex;
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get the
-         * Brush to use for filling the region.
-         */
-        private int brushIndex;
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the
-         * region frame.
-         */
-        private int height;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the
-         * region frame.
-         */
-        private int width;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.frameRegion;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            regionIndex = leis.readUShort();
-            brushIndex = leis.readUShort();
-            height = leis.readShort();
-            width = leis.readShort();
-            return 4*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.applyObjectTableEntry(brushIndex);
-            ctx.applyObjectTableEntry(regionIndex);
-            Rectangle2D inner = ctx.getProperties().getRegion().getBounds();
-            double x = inner.getX()-width;
-            double y = inner.getY()-height;
-            double w = inner.getWidth()+2*width;
-            double h = inner.getHeight()+2*height;
-            Rectangle2D outer = new Rectangle2D.Double(x,y,w,h);
-            Area frame = new Area(outer);
-            frame.subtract(new Area(inner));
-            ctx.fill(frame);
-        }
-    }
-
-    /**
-     * The META_POLYPOLYGON record paints a series of closed polygons. Each polygon is outlined by
-     * using the pen and filled by using the brush and polygon fill mode; these are defined in the playback
-     * device context. The polygons drawn by this function can overlap.
-     */
-    public static class WmfPolyPolygon implements HwmfRecord {
-
-        private List<Path2D> polyList = new ArrayList<Path2D>();
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.polyPolygon;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            // see http://secunia.com/gfx/pdf/SA31675_BA.pdf ;)
-            /**
-             * A 16-bit unsigned integer that defines the number of polygons in the object.
-             */
-            int numberOfPolygons = leis.readUShort();
-            /**
-             * A NumberOfPolygons array of 16-bit unsigned integers that define the number of
-             * points for each polygon in the object.
-             */
-            int[] pointsPerPolygon = new int[numberOfPolygons];
-
-            int size = LittleEndianConsts.SHORT_SIZE;
-
-            for (int i=0; i<numberOfPolygons; i++) {
-                pointsPerPolygon[i] = leis.readUShort();
-                size += LittleEndianConsts.SHORT_SIZE;
-            }
-
-            for (int nPoints : pointsPerPolygon) {
-                /**
-                 * An array of 16-bit signed integers that define the coordinates of the polygons.
-                 * (Note: MS-WMF wrongly says unsigned integers ...)
-                 */
-                Path2D poly = new Path2D.Double();
-                for (int i=0; i<nPoints; i++) {
-                    int x = leis.readShort();
-                    int y = leis.readShort();
-                    size += 2*LittleEndianConsts.SHORT_SIZE;
-                    if (i == 0) {
-                        poly.moveTo(x, y);
-                    } else {
-                        poly.lineTo(x, y);
-                    }
-                }
-                poly.closePath();
-                polyList.add(poly);
-            }
-
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            if (polyList.isEmpty()) {
-                return;
-            }
-            
-            int windingRule = getWindingRule(ctx);
-            Area area = null;
-            for (Path2D poly : polyList) {
-                Path2D p = (Path2D)poly.clone();
-                p.setWindingRule(windingRule);
-                Area newArea = new Area(p);
-                if (area == null) {
-                    area = newArea;
-                } else {
-                    area.exclusiveOr(newArea);
-                }
-            }
-            ctx.fill(area);
-        }
-    }
-
-    /**
-     * The META_RECTANGLE record paints a rectangle. The rectangle is outlined by using the pen and
-     * filled by using the brush that are defined in the playback device context.
-     */
-    public static class WmfRectangle implements HwmfRecord {
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of
-         * the lower-right corner of the rectangle.
-         */
-        private int bottomRect;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the lower-right corner of the rectangle.
-         */
-        private int rightRect;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int topRect;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the upper-left corner of the rectangle.
-         */
-        private int leftRect;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.frameRegion;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            bottomRect = leis.readShort();
-            rightRect = leis.readShort();
-            topRect = leis.readShort();
-            leftRect = leis.readShort();
-            return 4*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            int x = Math.min(leftRect, rightRect);
-            int y = Math.min(topRect, bottomRect);
-            int w = Math.abs(leftRect - rightRect - 1);
-            int h = Math.abs(topRect - bottomRect - 1);
-            Shape s = new Rectangle2D.Double(x, y, w, h);
-            ctx.fill(s);
-        }
-    }
-
-    /**
-     * The META_RECTANGLE record paints a rectangle. The rectangle is outlined by using the pen and
-     * filled by using the brush that are defined in the playback device context.
-     */
-    public static class WmfSetPixel implements HwmfRecord {
-        /**
-         * A ColorRef Object that defines the color value.
-         */
-        HwmfColorRef colorRef;
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the point
-         * to be set.
-         */
-        private int y;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the point
-         * to be set.
-         */
-        private int x;
-
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setPixel;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            colorRef = new HwmfColorRef();
-            int size = colorRef.init(leis);
-            y = leis.readShort();
-            x = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE+size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Shape s = new Rectangle2D.Double(x, y, 1, 1);
-            ctx.fill(s);
-        }
-    }
-
-    /**
-     * The META_ROUNDRECT record paints a rectangle with rounded corners. The rectangle is outlined
-     * using the pen and filled using the brush, as defined in the playback device context.
-     */
-    public static class WmfRoundRect implements HwmfRecord {
-        /**
-         * A 16-bit signed integer that defines the height, in logical coordinates, of the
-         * ellipse used to draw the rounded corners.
-         */
-        private int height;
-
-        /**
-         * A 16-bit signed integer that defines the width, in logical coordinates, of the
-         * ellipse used to draw the rounded corners.
-         */
-        private int width;
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of
-         * the lower-right corner of the rectangle.
-         */
-        private int bottomRect;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the lower-right corner of the rectangle.
-         */
-        private int rightRect;
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int topRect;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the upper-left corner of the rectangle.
-         */
-        private int leftRect;
-
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.roundRect;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            height = leis.readShort();
-            width = leis.readShort();
-            bottomRect = leis.readShort();
-            rightRect = leis.readShort();
-            topRect = leis.readShort();
-            leftRect = leis.readShort();
-            return 6*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            int x = Math.min(leftRect, rightRect);
-            int y = Math.min(topRect, bottomRect);
-            int w = Math.abs(leftRect - rightRect - 1);
-            int h = Math.abs(topRect - bottomRect - 1);
-            Shape s = new RoundRectangle2D.Double(x, y, w, h, width, height);
-            ctx.fill(s);
-        }
-    }
-
-
-    /**
-     * The META_ARC record draws an elliptical arc.
-     */
-    public static class WmfArc implements HwmfRecord {
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of
-         * the ending point of the radial line defining the ending point of the arc.
-         */
-        private int yEndArc;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the ending point of the radial line defining the ending point of the arc.
-         */
-        private int xEndArc;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of
-         * the ending point of the radial line defining the starting point of the arc.
-         */
-        private int yStartArc;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the ending point of the radial line defining the starting point of the arc.
-         */
-        private int xStartArc;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of
-         * the lower-right corner of the bounding rectangle.
-         */
-        private int bottomRect;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the lower-right corner of the bounding rectangle.
-         */
-        private int rightRect;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the bounding rectangle.
-         */
-        private int topRect;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of
-         * the upper-left corner of the bounding rectangle.
-         */
-        private int leftRect;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.arc;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            yEndArc = leis.readShort();
-            xEndArc = leis.readShort();
-            yStartArc = leis.readShort();
-            xStartArc = leis.readShort();
-            bottomRect = leis.readShort();
-            rightRect = leis.readShort();
-            topRect = leis.readShort();
-            leftRect = leis.readShort();
-            return 8*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            int x = Math.min(leftRect, rightRect);
-            int y = Math.min(topRect, bottomRect);
-            int w = Math.abs(leftRect - rightRect - 1);
-            int h = Math.abs(topRect - bottomRect - 1);
-            double startAngle = Math.toDegrees(Math.atan2(-(yStartArc - (topRect + h / 2.)), xStartArc - (leftRect + w / 2.)));
-            double endAngle =   Math.toDegrees(Math.atan2(-(yEndArc - (topRect + h / 2.)), xEndArc - (leftRect + w / 2.)));
-            double arcAngle = (endAngle - startAngle) + (endAngle - startAngle > 0 ? 0 : 360);
-            if (startAngle < 0) {
-                startAngle += 360;
-            }
-
-            boolean fillShape;
-            int arcClosure;
-            switch (getRecordType()) {
-                default:
-                case arc:
-                    arcClosure = Arc2D.OPEN;
-                    fillShape = false;
-                    break;
-                case chord:
-                    arcClosure = Arc2D.CHORD;
-                    fillShape = true;
-                    break;
-                case pie:
-                    arcClosure = Arc2D.PIE;
-                    fillShape = true;
-                    break;
-            }
-            
-            Shape s = new Arc2D.Double(x, y, w, h, startAngle, arcAngle, arcClosure);
-            if (fillShape) {
-                ctx.fill(s);
-            } else {
-                ctx.draw(s);
-            }
-        }
-    }
-
-    /**
-     * The META_PIE record draws a pie-shaped wedge bounded by the intersection of an ellipse and two
-     * radials. The pie is outlined by using the pen and filled by using the brush that are defined in the
-     * playback device context.
-     */
-    public static class WmfPie extends WmfArc {
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.pie;
-        }
-    }
-
-    /**
-     * The META_CHORD record draws a chord, which is defined by a region bounded by the intersection of
-     * an ellipse with a line segment. The chord is outlined using the pen and filled using the brush
-     * that are defined in the playback device context.
-     */
-    public static class WmfChord extends WmfArc {
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.chord;
-        }
-    }
-
-
-    /**
-     * The META_SELECTOBJECT record specifies a graphics object for the playback device context. The
-     * new object replaces the previous object of the same type, unless if the previous object is a palette
-     * object. If the previous object is a palette object, then the META_SELECTPALETTE record must be
-     * used instead of the META_SELECTOBJECT record, as the META_SELECTOBJECT record does not
-     * support replacing the palette object type.
-     */
-    public static class WmfSelectObject implements HwmfRecord {
-
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to
-         * get the object to be selected.
-         */
-        private int objectIndex;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.selectObject;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            objectIndex = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.applyObjectTableEntry(objectIndex);
-        }
-    }
-    
-    private static int getWindingRule(HwmfGraphics ctx) {
-        return ctx.getProperties().getPolyfillMode().awtFlag;
-    }
- }
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
deleted file mode 100644
index c171467..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.io.IOException;
-
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-/**
- * The MetafileEscapes specifies printer driver functionality that
- * might not be directly accessible through WMF records
- */
-public class HwmfEscape implements HwmfRecord {
-    
-    public enum EscapeFunction {
-        /** Notifies the printer driver that the application has finished writing to a page. */
-        NEWFRAME(0x0001),
-        /** Stops processing the current document. */
-        ABORTDOC(0x0002),
-        /** Notifies the printer driver that the application has finished writing to a band. */
-        NEXTBAND(0x0003),
-        /** Sets color table values. */
-        SETCOLORTABLE(0x0004),
-        /** Gets color table values. */
-        GETCOLORTABLE(0x0005),
-        /** Causes all pending output to be flushed to the output device. */
-        FLUSHOUT(0x0006),
-        /** Indicates that the printer driver SHOULD print text only, and no graphics. */
-        DRAFTMODE(0x0007),
-        /** Queries a printer driver to determine whether a specific escape function is supported on the output device it drives. */
-        QUERYESCSUPPORT(0x0008),
-        /** Sets the application-defined function that allows a print job to be canceled during printing. */
-        SETABORTPROC(0x0009),
-        /** Notifies the printer driver that a new print job is starting. */
-        STARTDOC(0x000A),
-        /** Notifies the printer driver that the current print job is ending. */
-        ENDDOC(0x000B),
-        /** Retrieves the physical page size currently selected on an output device. */
-        GETPHYSPAGESIZE(0x000C),
-        /** Retrieves the offset from the upper-left corner of the physical page where the actual printing or drawing begins. */
-        GETPRINTINGOFFSET(0x000D),
-        /** Retrieves the scaling factors for the x-axis and the y-axis of a printer. */
-        GETSCALINGFACTOR(0x000E),
-        /** Used to embed an enhanced metafile format (EMF) metafile within a WMF metafile. */
-        META_ESCAPE_ENHANCED_METAFILE(0x000F),
-        /** Sets the width of a pen in pixels. */
-        SETPENWIDTH(0x0010),
-        /** Sets the number of copies. */
-        SETCOPYCOUNT(0x0011),
-        /** Sets the source, such as a particular paper tray or bin on a printer, for output forms. */
-        SETPAPERSOURCE(0x0012),
-        /** This record passes through arbitrary data. */
-        PASSTHROUGH(0x0013),
-        /** Gets information concerning graphics technology that is supported on a device. */
-        GETTECHNOLOGY(0x0014),
-        /** Specifies the line-drawing mode to use in output to a device. */
-        SETLINECAP(0x0015),
-        /** Specifies the line-joining mode to use in output to a device. */
-        SETLINEJOIN(0x0016),
-        /** Sets the limit for the length of miter joins to use in output to a device. */
-        SETMITERLIMIT(0x0017),
-        /** Retrieves or specifies settings concerning banding on a device, such as the number of bands. */
-        BANDINFO(0x0018),
-        /** Draws a rectangle with a defined pattern. */
-        DRAWPATTERNRECT(0x0019),
-        /** Retrieves the physical pen size currently defined on a device. */
-        GETVECTORPENSIZE(0x001A),
-        /** Retrieves the physical brush size currently defined on a device. */
-        GETVECTORBRUSHSIZE(0x001B),
-        /** Enables or disables double-sided (duplex) printing on a device. */
-        ENABLEDUPLEX(0x001C),
-        /** Retrieves or specifies the source of output forms on a device. */
-        GETSETPAPERBINS(0x001D),
-        /** Retrieves or specifies the paper orientation on a device. */
-        GETSETPRINTORIENT(0x001E),
-        /** Retrieves information concerning the sources of different forms on an output device. */
-        ENUMPAPERBINS(0x001F),
-        /** Specifies the scaling of device-independent bitmaps (DIBs). */
-        SETDIBSCALING(0x0020),
-        /** Indicates the start and end of an encapsulated PostScript (EPS) section. */
-        EPSPRINTING(0x0021),
-        /** Queries a printer driver for paper dimensions and other forms data. */
-        ENUMPAPERMETRICS(0x0022),
-        /** Retrieves or specifies paper dimensions and other forms data on an output device. */
-        GETSETPAPERMETRICS(0x0023),
-        /** Sends arbitrary PostScript data to an output device. */
-        POSTSCRIPT_DATA(0x0025),
-        /** Notifies an output device to ignore PostScript data. */
-        POSTSCRIPT_IGNORE(0x0026),
-        /** Gets the device units currently configured on an output device. */
-        GETDEVICEUNITS(0x002A),
-        /** Gets extended text metrics currently configured on an output device. */
-        GETEXTENDEDTEXTMETRICS(0x0100),
-        /** Gets the font kern table currently defined on an output device. */
-        GETPAIRKERNTABLE(0x0102),
-        /** Draws text using the currently selected font, background color, and text color. */
-        EXTTEXTOUT(0x0200),
-        /** Gets the font face name currently configured on a device. */
-        GETFACENAME(0x0201),
-        /** Sets the font face name on a device. */
-        DOWNLOADFACE(0x0202),
-        /** Queries a printer driver about the support for metafiles on an output device. */
-        METAFILE_DRIVER(0x0801),
-        /** Queries the printer driver about its support for DIBs on an output device. */
-        QUERYDIBSUPPORT(0x0C01),
-        /** Opens a path. */
-        BEGIN_PATH(0x1000),
-        /** Defines a clip region that is bounded by a path. The input MUST be a 16-bit quantity that defines the action to take. */
-        CLIP_TO_PATH(0x1001),
-        /** Ends a path. */
-        END_PATH(0x1002),
-        /** The same as STARTDOC specified with a NULL document and output filename, data in raw mode, and a type of zero. */
-        OPEN_CHANNEL(0x100E),
-        /** Instructs the printer driver to download sets of PostScript procedures. */
-        DOWNLOADHEADER(0x100F),
-        /** The same as ENDDOC. See OPEN_CHANNEL. */
-        CLOSE_CHANNEL(0x1010),
-        /** Sends arbitrary data directly to a printer driver, which is expected to process this data only when in PostScript mode. */
-        POSTSCRIPT_PASSTHROUGH(0x1013),
-        /** Sends arbitrary data directly to the printer driver. */
-        ENCAPSULATED_POSTSCRIPT(0x1014),
-        /** Sets the printer driver to either PostScript or GDI mode. */
-        POSTSCRIPT_IDENTIFY(0x1015),
-        /** Inserts a block of raw data into a PostScript stream. The input MUST be
-        a 32-bit quantity specifying the number of bytes to inject, a 16-bit quantity specifying the
-        injection point, and a 16-bit quantity specifying the page number, followed by the bytes to
-        inject. */
-        POSTSCRIPT_INJECTION(0x1016),
-        /** Checks whether the printer supports a JPEG image. */
-        CHECKJPEGFORMAT(0x1017),
-        /** Checks whether the printer supports a PNG image */
-        CHECKPNGFORMAT(0x1018),
-        /** Gets information on a specified feature setting for a PostScript printer driver. */
-        GET_PS_FEATURESETTING(0x1019),
-        /** Enables applications to write documents to a file or to a printer in XML Paper Specification (XPS) format. */
-        MXDC_ESCAPE(0x101A),
-        /** Enables applications to include private procedures and other arbitrary data in documents. */
-        SPCLPASSTHROUGH2(0x11D8);
-        
-        int flag;
-        EscapeFunction(int flag) {
-            this.flag = flag;
-        }
-
-        static EscapeFunction valueOf(int flag) {
-            for (EscapeFunction hs : values()) {
-                if (hs.flag == flag) return hs;
-            }
-            return null;
-        }
-    }
-    
-    /**
-     * A 16-bit unsigned integer that defines the escape function. The 
-     * value MUST be from the MetafileEscapes enumeration.
-     */
-    private EscapeFunction escapeFunction;
-    /**
-     * A 16-bit unsigned integer that specifies the size, in bytes, of the 
-     * EscapeData field.
-     */
-    private int byteCount;
-    /**
-     * An array of bytes of size ByteCount.
-     */
-    private byte escapeData[];
-    
-    @Override
-    public HwmfRecordType getRecordType() {
-        return HwmfRecordType.escape;
-    }
-    
-    @Override
-    public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-        escapeFunction = EscapeFunction.valueOf(leis.readUShort());
-        byteCount = leis.readUShort();
-        escapeData = IOUtils.toByteArray(leis,byteCount);
-
-        return 2*LittleEndianConsts.SHORT_SIZE+byteCount;
-    }
-
-    @Override
-    public void draw(HwmfGraphics ctx) {
-        
-    }
-    
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("escape - function: "+escapeFunction+"\n");
-        sb.append(HexDump.dump(escapeData, 0, 0));
-        return sb.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
deleted file mode 100644
index 4b227f7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
+++ /dev/null
@@ -1,1010 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.Shape;
-import java.awt.geom.Path2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfFill {
-    /**
-     * A record which contains an image (to be extracted)
-     */
-    public interface HwmfImageRecord {
-        BufferedImage getImage();
-    }
-    
-    /**
-     * The ColorUsage Enumeration (a 16-bit unsigned integer) specifies whether a color table
-     * exists in a device-independent bitmap (DIB) and how to interpret its values,
-     * i.e. if contains explicit RGB values or indexes into a palette.
-     */
-    public enum ColorUsage {
-        /**
-         * The color table contains RGB values
-         */
-        DIB_RGB_COLORS(0x0000),
-        /**
-         * The color table contains 16-bit indices into the current logical palette in
-         * the playback device context.
-         */
-        DIB_PAL_COLORS(0x0001),
-        /**
-         * No color table exists. The pixels in the DIB are indices into the current
-         * logical palette in the playback device context.
-         */
-        DIB_PAL_INDICES(0x0002)
-        ;
-
-
-        public final int flag;
-        ColorUsage(int flag) {
-            this.flag = flag;
-        }
-
-        static ColorUsage valueOf(int flag) {
-            for (ColorUsage bs : values()) {
-                if (bs.flag == flag) return bs;
-            }
-            return null;
-        }
-    }
-    
-    
-    /**
-     * The META_FILLREGION record fills a region using a specified brush.
-     */
-    public static class WmfFillRegion implements HwmfRecord {
-        
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get
-         * the region to be filled.
-         */
-        private int regionIndex;
-
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get the
-         * brush to use for filling the region.
-         */
-        private int brushIndex;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.fillRegion;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            regionIndex = leis.readUShort();
-            brushIndex = leis.readUShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.applyObjectTableEntry(regionIndex);
-            ctx.applyObjectTableEntry(brushIndex);
-            
-            Shape region = ctx.getProperties().getRegion();
-            if (region != null) {
-                ctx.fill(region);
-            }
-            
-        }
-    }
-
-    /**
-     * The META_PAINTREGION record paints the specified region by using the brush that is
-     * defined in the playback device context.
-     */
-    public static class WmfPaintRegion implements HwmfRecord {
-        
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get
-         * the region to be painted.
-         */
-        int regionIndex;
-
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.paintRegion;
-        }
-        
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            regionIndex = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.applyObjectTableEntry(regionIndex);
-
-            Shape region = ctx.getProperties().getRegion();
-            if (region != null) {
-                ctx.fill(region);
-            }        
-        }
-    }
-    
-    
-    /**
-     * The META_FLOODFILL record fills an area of the output surface with the brush that
-     * is defined in the playback device context.
-     */
-    public static class WmfFloodFill implements HwmfRecord {
-        
-        /**
-         * A 32-bit ColorRef Object that defines the color value.
-         */
-        private HwmfColorRef colorRef;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * point where filling is to start.
-         */
-        private int yStart;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * point where filling is to start.
-         */
-        private int xStart;
-        
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.floodFill;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            colorRef = new HwmfColorRef();
-            int size = colorRef.init(leis);
-            yStart = leis.readShort();
-            xStart = leis.readShort();
-            return size+2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            
-        }
-    }
-
-    /**
-     * The META_SETPOLYFILLMODE record sets polygon fill mode in the playback device context for
-     * graphics operations that fill polygons.
-     */
-    public static class WmfSetPolyfillMode implements HwmfRecord {
-        /**
-         * A 16-bit unsigned integer that defines polygon fill mode.
-         * This MUST be one of the values: ALTERNATE = 0x0001, WINDING = 0x0002
-         */
-        public enum HwmfPolyfillMode {
-            /**
-             * Selects alternate mode (fills the area between odd-numbered and
-             * even-numbered polygon sides on each scan line).
-             */
-            ALTERNATE(0x0001, Path2D.WIND_EVEN_ODD),
-            /**
-             * Selects winding mode (fills any region with a nonzero winding value).
-             */
-            WINDING(0x0002, Path2D.WIND_NON_ZERO);
-
-            public final int wmfFlag;
-            public final int awtFlag;
-            HwmfPolyfillMode(int wmfFlag, int awtFlag) {
-                this.wmfFlag = wmfFlag;
-                this.awtFlag = awtFlag;
-            }
-
-            static HwmfPolyfillMode valueOf(int wmfFlag) {
-                for (HwmfPolyfillMode pm : values()) {
-                    if (pm.wmfFlag == wmfFlag) return pm;
-                }
-                return null;
-            }
-        }
-        
-        /**
-         * A 16-bit unsigned integer that defines polygon fill mode.
-         * This MUST be one of the values: ALTERNATE = 0x0001, WINDING = 0x0002
-         */
-        private HwmfPolyfillMode polyfillMode;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setPolyFillMode;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            polyfillMode = HwmfPolyfillMode.valueOf(leis.readUShort() & 3);
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setPolyfillMode(polyfillMode);
-        }
-    }
-
-
-    /**
-     * The META_EXTFLOODFILL record fills an area with the brush that is defined in
-     * the playback device context.
-     */
-    public static class WmfExtFloodFill implements HwmfRecord {
-        
-        /**
-         * A 16-bit unsigned integer that defines the fill operation to be performed. This
-         * member MUST be one of the values in the FloodFill Enumeration table:
-         * 
-         * FLOODFILLBORDER = 0x0000:
-         * The fill area is bounded by the color specified by the Color member.
-         * This style is identical to the filling performed by the META_FLOODFILL record.
-         * 
-         * FLOODFILLSURFACE = 0x0001:
-         * The fill area is bounded by the color that is specified by the Color member.
-         * Filling continues outward in all directions as long as the color is encountered.
-         * This style is useful for filling areas with multicolored boundaries.
-         */
-        private int mode;
-        
-        /**
-         * A 32-bit ColorRef Object that defines the color value.
-         */
-        private HwmfColorRef colorRef;
-        
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the point
-         * to be set.
-         */
-        private int y;
-        
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the point
-         * to be set.
-         */
-        private int x;  
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.extFloodFill;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            mode = leis.readUShort();
-            colorRef = new HwmfColorRef();
-            int size = colorRef.init(leis);
-            y = leis.readShort();
-            x = leis.readShort();
-            return size+3*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            
-        }
-    }
-
-    /**
-     * The META_INVERTREGION record draws a region in which the colors are inverted.
-     */
-    public static class WmfInvertRegion implements HwmfRecord {
-        
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get
-         * the region to be inverted.
-         */
-        private int region;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.invertRegion;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            region = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            
-        }
-    }
-    
-
-    /**
-     * The META_PATBLT record paints a specified rectangle using the brush that is defined in the playback
-     * device context. The brush color and the surface color or colors are combined using the specified
-     * raster operation.
-     */
-    public static class WmfPatBlt implements HwmfRecord {
-        
-        /**
-         * A 32-bit unsigned integer that defines the raster operation code.
-         * This code MUST be one of the values in the Ternary Raster Operation enumeration table.
-         */
-        private HwmfTernaryRasterOp rasterOperation;
-        
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the rectangle.
-         */
-        private int height;
-        
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the rectangle.
-         */
-        private int width;
-        
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the rectangle to be filled.
-         */
-        private int yLeft;
-        
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * upper-left corner of the rectangle to be filled.
-         */
-        private int xLeft;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.patBlt;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            int rasterOpCode = leis.readUShort();
-            int rasterOpIndex = leis.readUShort();
-
-            rasterOperation = HwmfTernaryRasterOp.valueOf(rasterOpIndex);
-            assert(rasterOpCode == rasterOperation.opCode);
-            
-            height = leis.readShort();
-            width = leis.readShort();
-            yLeft = leis.readShort();
-            xLeft = leis.readShort();
-
-            return 6*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            
-        }
-    }
-
-    /**
-     * The META_STRETCHBLT record specifies the transfer of a block of pixels according to a raster
-     * operation, with possible expansion or contraction.
-     * The destination of the transfer is the current output region in the playback device context.
-     * There are two forms of META_STRETCHBLT, one which specifies a bitmap as the source, and the other
-     * which uses the playback device context as the source. Definitions follow for the fields that are the
-     * same in the two forms of META_STRETCHBLT are defined below. The subsections that follow specify
-     * the packet structures of the two forms of META_STRETCHBLT.
-     * The expansion or contraction is performed according to the stretching mode currently set in the
-     * playback device context, which MUST be a value from the StretchMode.
-     */
-    public static class WmfStretchBlt implements HwmfRecord {
-        /**
-         * A 32-bit unsigned integer that defines how the source pixels, the current brush
-         * in the playback device context, and the destination pixels are to be combined to form the new 
-         * image. This code MUST be one of the values in the Ternary Raster Operation Enumeration
-         */
-        private HwmfTernaryRasterOp rasterOperation;
-        
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the source rectangle.
-         */
-        private int srcHeight; 
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the source rectangle.
-         */
-        private int srcWidth; 
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the upper-left corner 
-         * of the source rectangle.
-         */
-        private int ySrc;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the upper-left corner 
-         * of the source rectangle.
-         */
-        private int xSrc;
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the destination rectangle.
-         */
-        private int destHeight;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the destination rectangle.
-         */
-        private int destWidth;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the upper-left 
-         * corner of the destination rectangle.
-         */
-        private int yDest;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the upper-left 
-         * corner of the destination rectangle.
-         */
-        private int xDest;
-        
-        /**
-         * A variable-sized Bitmap16 Object that defines source image content.
-         * This object MUST be specified, even if the raster operation does not require a source.
-         */
-        HwmfBitmap16 target;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.stretchBlt;
-        }
-        
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            boolean hasBitmap = (recordSize > ((recordFunction >> 8) + 3));
-
-            int size = 0;
-            int rasterOpCode = leis.readUShort();
-            int rasterOpIndex = leis.readUShort();
-            
-            rasterOperation = HwmfTernaryRasterOp.valueOf(rasterOpIndex);
-            assert(rasterOpCode == rasterOperation.opCode);
-
-            srcHeight = leis.readShort();
-            srcWidth = leis.readShort();
-            ySrc = leis.readShort();
-            xSrc = leis.readShort();
-            size = 6*LittleEndianConsts.SHORT_SIZE;
-            if (!hasBitmap) {
-                /*int reserved =*/ leis.readShort();
-                size += LittleEndianConsts.SHORT_SIZE;
-            }
-            destHeight = leis.readShort();
-            destWidth = leis.readShort();
-            yDest = leis.readShort();
-            xDest = leis.readShort();
-            size += 4*LittleEndianConsts.SHORT_SIZE;
-            if (hasBitmap) {
-                target = new HwmfBitmap16();
-                size += target.init(leis);
-            }
-            
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            
-        }
-    }
-
-    /**
-     * The META_STRETCHDIB record specifies the transfer of color data from a
-     * block of pixels in device independent format according to a raster operation,
-     * with possible expansion or contraction.
-     * The source of the color data is a DIB, and the destination of the transfer is
-     * the current output region in the playback device context.
-     */
-    public static class WmfStretchDib implements HwmfRecord, HwmfImageRecord, HwmfObjectTableEntry {
-        /**
-         * A 32-bit unsigned integer that defines how the source pixels, the current brush in
-         * the playback device context, and the destination pixels are to be combined to
-         * form the new image.
-         */
-        private HwmfTernaryRasterOp rasterOperation;
-
-        /**
-         * A 16-bit unsigned integer that defines whether the Colors field of the
-         * DIB contains explicit RGB values or indexes into a palette.
-         */
-        private ColorUsage colorUsage;
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the
-         * source rectangle.
-         */
-        private int srcHeight;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the
-         * source rectangle.
-         */
-        private int srcWidth; 
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * source rectangle.
-         */
-        private int ySrc;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the 
-         * source rectangle.
-         */
-        private int xSrc;
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the 
-         * destination rectangle.
-         */
-        private int destHeight;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the 
-         * destination rectangle.
-         */
-        private int destWidth;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the 
-         * upper-left corner of the destination rectangle.
-         */
-        private int yDst;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the 
-         * upper-left corner of the destination rectangle.
-         */
-        private int xDst;
-        /**
-         * A variable-sized DeviceIndependentBitmap Object (section 2.2.2.9) that is the 
-         * source of the color data.
-         */
-        private HwmfBitmapDib dib;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.stretchDib;
-        }
-        
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            int rasterOpCode = leis.readUShort();
-            int rasterOpIndex = leis.readUShort();
-            
-            rasterOperation = HwmfTernaryRasterOp.valueOf(rasterOpIndex);
-            assert(rasterOpCode == rasterOperation.opCode);
-
-            colorUsage = ColorUsage.valueOf(leis.readUShort());
-            srcHeight = leis.readShort();
-            srcWidth = leis.readShort();
-            ySrc = leis.readShort();
-            xSrc = leis.readShort();
-            destHeight = leis.readShort();
-            destWidth = leis.readShort();
-            yDst = leis.readShort();
-            xDst = leis.readShort();
-            
-            int size = 11*LittleEndianConsts.SHORT_SIZE;
-            dib = new HwmfBitmapDib();
-            size += dib.init(leis, (int)(recordSize-6-size));
-
-            return size;
-        }        
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            
-        }
-
-        @Override
-        public BufferedImage getImage() {
-            return dib.getImage();
-        }
-    }
-    
-    public static class WmfBitBlt implements HwmfRecord {
-
-        /**
-         * A 32-bit unsigned integer that defines how the source pixels, the current brush in the playback 
-         * device context, and the destination pixels are to be combined to form the new image.
-         */
-        private HwmfTernaryRasterOp rasterOperation;
-        
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the upper-left corner 
-        of the source rectangle.
-         */
-        private int ySrc; 
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the upper-left corner 
-        of the source rectangle.
-         */
-        private int xSrc; 
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the source and 
-        destination rectangles.
-         */
-        private int height;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the source and destination 
-        rectangles.
-         */
-        private int width;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the upper-left 
-        corner of the destination rectangle.
-         */
-        private int yDest;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the upper-left 
-        corner of the destination rectangle.
-         */
-        private int xDest;
-        
-        /**
-         * A variable-sized Bitmap16 Object that defines source image content.
-         * This object MUST be specified, even if the raster operation does not require a source.
-         */
-        private HwmfBitmap16 target;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.bitBlt;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            boolean hasBitmap = (recordSize/2 != ((recordFunction >> 8) + 3));
-
-            int size = 0;
-            int rasterOpCode = leis.readUShort();
-            int rasterOpIndex = leis.readUShort();
-            
-            rasterOperation = HwmfTernaryRasterOp.valueOf(rasterOpIndex);
-            assert(rasterOpCode == rasterOperation.opCode);
-
-            ySrc = leis.readShort();
-            xSrc = leis.readShort();
-
-            size = 4*LittleEndianConsts.SHORT_SIZE;
-            
-            if (!hasBitmap) {
-                /*int reserved =*/ leis.readShort();
-                size += LittleEndianConsts.SHORT_SIZE;
-            }
-            
-            height = leis.readShort();
-            width = leis.readShort();
-            yDest = leis.readShort();
-            xDest = leis.readShort();
-
-            size += 4*LittleEndianConsts.SHORT_SIZE;
-            if (hasBitmap) {
-                target = new HwmfBitmap16();
-                size += target.init(leis);
-            }
-            
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            
-        }
-    }
-
-
-    /**
-     * The META_SETDIBTODEV record sets a block of pixels in the playback device context
-     * using deviceindependent color data.
-     * The source of the color data is a DIB
-     */
-    public static class WmfSetDibToDev implements HwmfRecord, HwmfImageRecord, HwmfObjectTableEntry {
-
-        /**
-         * A 16-bit unsigned integer that defines whether the Colors field of the
-         * DIB contains explicit RGB values or indexes into a palette.
-         */
-        private ColorUsage colorUsage;  
-        /**
-         * A 16-bit unsigned integer that defines the number of scan lines in the source.
-         */
-        private int scanCount;
-        /**
-         * A 16-bit unsigned integer that defines the starting scan line in the source.
-         */
-        private int startScan;  
-        /**
-         * A 16-bit unsigned integer that defines the y-coordinate, in logical units, of the
-         * source rectangle.
-         */
-        private int yDib;  
-        /**
-         * A 16-bit unsigned integer that defines the x-coordinate, in logical units, of the
-         * source rectangle.
-         */
-        private int xDib;  
-        /**
-         * A 16-bit unsigned integer that defines the height, in logical units, of the
-         * source and destination rectangles.
-         */
-        private int height;
-        /**
-         * A 16-bit unsigned integer that defines the width, in logical units, of the
-         * source and destination rectangles.
-         */
-        private int width;
-        /**
-         * A 16-bit unsigned integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the destination rectangle.
-         */
-        private int yDest;
-        /**
-         * A 16-bit unsigned integer that defines the x-coordinate, in logical units, of the
-         * upper-left corner of the destination rectangle.
-         */
-        private int xDest;
-        /**
-         * A variable-sized DeviceIndependentBitmap Object that is the source of the color data.
-         */
-        private HwmfBitmapDib dib;        
-        
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setDibToDev;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            colorUsage = ColorUsage.valueOf(leis.readUShort());
-            scanCount = leis.readUShort();
-            startScan = leis.readUShort();
-            yDib = leis.readUShort();
-            xDib = leis.readUShort();
-            height = leis.readUShort();
-            width = leis.readUShort();
-            yDest = leis.readUShort();
-            xDest = leis.readUShort();
-            
-            int size = 9*LittleEndianConsts.SHORT_SIZE;
-            dib = new HwmfBitmapDib();
-            size += dib.init(leis, (int)(recordSize-6-size));
-            
-            return size;
-        }        
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            
-        }
-
-        @Override
-        public BufferedImage getImage() {
-            return dib.getImage();
-        }
-    }
-
-
-    public static class WmfDibBitBlt implements HwmfRecord, HwmfImageRecord, HwmfObjectTableEntry {
-
-        /**
-         * A 32-bit unsigned integer that defines how the source pixels, the current brush
-         * in the playback device context, and the destination pixels are to be combined to form the
-         * new image. This code MUST be one of the values in the Ternary Raster Operation Enumeration.
-         */
-        HwmfTernaryRasterOp rasterOperation;  
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the source rectangle.
-         */
-        private int ySrc;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the source rectangle.
-         */
-        private int xSrc;
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the source and 
-         * destination rectangles.
-         */
-        private int height;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the source and destination
-         * rectangles.
-         */
-        private int width;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the upper-left
-         * corner of the destination rectangle.
-         */
-        private int yDest;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the upper-left 
-         * corner of the destination rectangle.
-         */
-        private int xDest;
-        
-        /**
-         * A variable-sized DeviceIndependentBitmap Object that defines image content.
-         * This object MUST be specified, even if the raster operation does not require a source.
-         */
-        private HwmfBitmapDib target;
-        
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.dibBitBlt;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            boolean hasBitmap = (recordSize/2 != ((recordFunction >> 8) + 3));
-
-            int size = 0;
-            int rasterOpCode = leis.readUShort();
-            int rasterOpIndex = leis.readUShort();
-            
-            rasterOperation = HwmfTernaryRasterOp.valueOf(rasterOpIndex);
-            assert(rasterOpCode == rasterOperation.opCode);
-
-            ySrc = leis.readShort();
-            xSrc = leis.readShort();
-            size = 4*LittleEndianConsts.SHORT_SIZE;
-            if (!hasBitmap) {
-                /*int reserved =*/ leis.readShort();
-                size += LittleEndianConsts.SHORT_SIZE;
-            }
-            height = leis.readShort();
-            width = leis.readShort();
-            yDest = leis.readShort();
-            xDest = leis.readShort();
-            
-            size += 4*LittleEndianConsts.SHORT_SIZE;
-            if (hasBitmap) {
-                target = new HwmfBitmapDib();
-                size += target.init(leis, (int)(recordSize-6-size));
-            }
-            
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            
-        }
-
-        @Override
-        public BufferedImage getImage() {
-            return (target == null) ? null : target.getImage();
-        }
-    }
-
-    public static class WmfDibStretchBlt implements HwmfRecord, HwmfImageRecord, HwmfObjectTableEntry {
-        /**
-         * A 32-bit unsigned integer that defines how the source pixels, the current brush
-         * in the playback device context, and the destination pixels are to be combined to form the
-         * new image. This code MUST be one of the values in the Ternary Raster Operation Enumeration.
-         */
-        private HwmfTernaryRasterOp rasterOperation;
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the source rectangle.
-         */
-        private int srcHeight;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the source rectangle.
-         */
-        private int srcWidth;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the source rectangle.
-         */
-        private int ySrc;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * upper-left corner of the source rectangle.
-         */
-        private int xSrc;
-        /**
-         * A 16-bit signed integer that defines the height, in logical units, of the
-         * destination rectangle.
-         */
-        private int destHeight;
-        /**
-         * A 16-bit signed integer that defines the width, in logical units, of the
-         * destination rectangle.
-         */
-        private int destWidth;
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units,
-         * of the upper-left corner of the destination rectangle.
-         */
-        private int yDest;
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units,
-         * of the upper-left corner of the destination rectangle.
-         */
-        private int xDest;
-        /**
-         * A variable-sized DeviceIndependentBitmap Object that defines image content.
-         * This object MUST be specified, even if the raster operation does not require a source.
-         */
-        HwmfBitmapDib target;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.dibStretchBlt;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            boolean hasBitmap = (recordSize > ((recordFunction >> 8) + 3));
-
-            int size = 0;
-            int rasterOpCode = leis.readUShort();
-            int rasterOpIndex = leis.readUShort();
-            
-            rasterOperation = HwmfTernaryRasterOp.valueOf(rasterOpIndex);
-            assert(rasterOpCode == rasterOperation.opCode);
-
-            srcHeight = leis.readShort();
-            srcWidth = leis.readShort();
-            ySrc = leis.readShort();
-            xSrc = leis.readShort();
-            size = 6*LittleEndianConsts.SHORT_SIZE;
-            if (!hasBitmap) {
-                /*int reserved =*/ leis.readShort();
-                size += LittleEndianConsts.SHORT_SIZE;
-            }
-            destHeight = leis.readShort();
-            destWidth = leis.readShort();
-            yDest = leis.readShort();
-            xDest = leis.readShort();
-            size += 4*LittleEndianConsts.SHORT_SIZE;
-            if (hasBitmap) {
-                target = new HwmfBitmapDib();
-                size += target.init(leis, (int)(recordSize-6-size));
-            }
-            
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            
-        }
-
-        @Override
-        public BufferedImage getImage() {
-            return target.getImage();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java
deleted file mode 100644
index fce75a3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-/**
- * The Font object specifies the attributes of a logical font
- */
-public class HwmfFont {
-    public enum WmfCharset {
-        /** Specifies the English character set. */
-        ANSI_CHARSET(0x00000000),
-        /**
-         * Specifies a character set based on the current system locale;
-         * for example, when the system locale is United States English,
-         * the default character set is ANSI_CHARSET.
-         */
-        DEFAULT_CHARSET(0x00000001),
-        /** Specifies a character set of symbols. */
-        SYMBOL_CHARSET(0x00000002),
-        /** Specifies the Apple Macintosh character set. */
-        MAC_CHARSET(0x0000004D),
-        /** Specifies the Japanese character set. */
-        SHIFTJIS_CHARSET(0x00000080),
-        /** Also spelled "Hangeul". Specifies the Hangul Korean character set. */
-        HANGUL_CHARSET(0x00000081),
-        /** Also spelled "Johap". Specifies the Johab Korean character set. */
-        JOHAB_CHARSET(0x00000082),
-        /** Specifies the "simplified" Chinese character set for People's Republic of China. */
-        GB2312_CHARSET(0x00000086),
-        /**
-         * Specifies the "traditional" Chinese character set, used mostly in
-         * Taiwan and in the Hong Kong and Macao Special Administrative Regions.
-         */
-        CHINESEBIG5_CHARSET(0x00000088),
-        /** Specifies the Greek character set. */
-        GREEK_CHARSET(0x000000A1),
-        /** Specifies the Turkish character set. */
-        TURKISH_CHARSET(0x000000A2),
-        /** Specifies the Vietnamese character set. */
-        VIETNAMESE_CHARSET(0x000000A3),
-        /** Specifies the Hebrew character set. */
-        HEBREW_CHARSET(0x000000B1),
-        /** Specifies the Arabic character set. */
-        ARABIC_CHARSET(0x000000B2),
-        /** Specifies the Baltic (Northeastern European) character set. */
-        BALTIC_CHARSET(0x000000BA),
-        /** Specifies the Russian Cyrillic character set. */
-        RUSSIAN_CHARSET(0x000000CC),
-        /** Specifies the Thai character set. */
-        THAI_CHARSET(0x000000DE),
-        /** Specifies a Eastern European character set. */
-        EASTEUROPE_CHARSET(0x000000EE),
-        /**
-         * Specifies a mapping to one of the OEM code pages,
-         * according to the current system locale setting.
-         */
-        OEM_CHARSET(0x000000FF);
-
-        int flag;
-        WmfCharset(int flag) {
-            this.flag = flag;
-        }
-
-        static WmfCharset valueOf(int flag) {
-            for (WmfCharset cs : values()) {
-                if (cs.flag == flag) return cs;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * The output precision defines how closely the output must match the requested font's height,
-     * width, character orientation, escapement, pitch, and font type.
-     */
-    public enum WmfOutPrecision {
-        /**
-         * A value that specifies default behavior.
-         */
-        OUT_DEFAULT_PRECIS(0x00000000),
-        /**
-         * A value that is returned when rasterized fonts are enumerated.
-         */
-        OUT_STRING_PRECIS(0x00000001),
-        /**
-         * A value that is returned when TrueType and other outline fonts, and
-         * vector fonts are enumerated.
-         */
-        OUT_STROKE_PRECIS(0x00000003),
-        /**
-         * A value that specifies the choice of a TrueType font when the system
-         * contains multiple fonts with the same name.
-         */
-        OUT_TT_PRECIS(0x00000004),
-        /**
-         * A value that specifies the choice of a device font when the system
-         * contains multiple fonts with the same name.
-         */
-        OUT_DEVICE_PRECIS(0x00000005),
-        /**
-         * A value that specifies the choice of a rasterized font when the system
-         * contains multiple fonts with the same name.
-         */
-        OUT_RASTER_PRECIS(0x00000006),
-        /**
-         * A value that specifies the requirement for only TrueType fonts. If
-         * there are no TrueType fonts installed in the system, default behavior is specified.
-         */
-        OUT_TT_ONLY_PRECIS(0x00000007),
-        /**
-         * A value that specifies the requirement for TrueType and other outline fonts.
-         */
-        OUT_OUTLINE_PRECIS (0x00000008),
-        /**
-         * A value that specifies a preference for TrueType and other outline fonts.
-         */
-        OUT_SCREEN_OUTLINE_PRECIS (0x00000009),
-        /**
-         * A value that specifies a requirement for only PostScript fonts. If there
-         * are no PostScript fonts installed in the system, default behavior is specified.
-         */
-        OUT_PS_ONLY_PRECIS (0x0000000A);
-
-
-        int flag;
-        WmfOutPrecision(int flag) {
-            this.flag = flag;
-        }
-
-        static WmfOutPrecision valueOf(int flag) {
-            for (WmfOutPrecision op : values()) {
-                if (op.flag == flag) return op;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * ClipPrecision Flags specify clipping precision, which defines how to clip characters that are
-     * partially outside a clipping region. These flags can be combined to specify multiple options.
-     */
-    public enum WmfClipPrecision {
-
-        /**
-         * Specifies that default clipping MUST be used.
-         */
-        CLIP_DEFAULT_PRECIS (0x00000000),
-
-        /**
-         * This value SHOULD NOT be used.
-         */
-        CLIP_CHARACTER_PRECIS (0x00000001),
-
-        /**
-         * This value MAY be returned when enumerating rasterized, TrueType and vector fonts.
-         */
-        CLIP_STROKE_PRECIS (0x00000002),
-
-        /**
-         * This value is used to control font rotation, as follows:
-         * If set, the rotation for all fonts SHOULD be determined by the orientation of the coordinate system;
-         * that is, whether the orientation is left-handed or right-handed.
-         *
-         * If clear, device fonts SHOULD rotate counterclockwise, but the rotation of other fonts
-         * SHOULD be determined by the orientation of the coordinate system.
-         */
-        CLIP_LH_ANGLES (0x00000010),
-
-        /**
-         * This value SHOULD NOT be used.
-         */
-        CLIP_TT_ALWAYS (0x00000020),
-
-        /**
-         * This value specifies that font association SHOULD< be turned off.
-         */
-        CLIP_DFA_DISABLE (0x00000040),
-
-        /**
-         * This value specifies that font embedding MUST be used to render document content;
-         * embedded fonts are read-only.
-         */
-        CLIP_EMBEDDED (0x00000080);
-
-
-        int flag;
-        WmfClipPrecision(int flag) {
-            this.flag = flag;
-        }
-
-        static WmfClipPrecision valueOf(int flag) {
-            for (WmfClipPrecision cp : values()) {
-                if (cp.flag == flag) return cp;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * The output quality defines how carefully to attempt to match the logical font attributes to those of an actual
-     * physical font.
-     */
-    public enum WmfFontQuality {
-        /**
-         * Specifies that the character quality of the font does not matter, so DRAFT_QUALITY can be used.
-         */
-        DEFAULT_QUALITY (0x00),
-        
-        /**
-         * Specifies that the character quality of the font is less important than the
-         * matching of logical attribuetes. For rasterized fonts, scaling SHOULD be enabled, which
-         * means that more font sizes are available.
-         */
-        DRAFT_QUALITY (0x01),
-        
-        /**
-         * Specifies that the character quality of the font is more important than the
-         * matching of logical attributes. For rasterized fonts, scaling SHOULD be disabled, and the font
-         * closest in size SHOULD be chosen.
-         */
-        PROOF_QUALITY (0x02),
-        
-        /**
-         * Specifies that anti-aliasing SHOULD NOT be used when rendering text.
-         */
-        NONANTIALIASED_QUALITY (0x03),
-        
-        /**
-         * Specifies that anti-aliasing SHOULD be used when rendering text, if the font supports it.
-         */
-        ANTIALIASED_QUALITY (0x04),
-        
-        /**
-         * Specifies that ClearType anti-aliasing SHOULD be used when rendering text, if the font supports it.
-         * 
-         * Fonts that do not support ClearType anti-aliasing include type 1 fonts, PostScript fonts,
-         * OpenType fonts without TrueType outlines, rasterized fonts, vector fonts, and device fonts.
-         */
-        CLEARTYPE_QUALITY (0x05);
-        
-        int flag;
-        WmfFontQuality(int flag) {
-            this.flag = flag;
-        }
-
-        static WmfFontQuality valueOf(int flag) {
-            for (WmfFontQuality fq : values()) {
-                if (fq.flag == flag) return fq;
-            }
-            return null;
-        }
-    }
-    
-    /**
-     * A property of a font that describes its general appearance.
-     */
-    public enum WmfFontFamilyClass {
-        /**
-         * The default font is specified, which is implementation-dependent.
-         */
-        FF_DONTCARE (0x00),
-        /**
-         * Fonts with variable stroke widths, which are proportional to the actual widths of
-         * the glyphs, and which have serifs. "MS Serif" is an example.
-         */
-        FF_ROMAN (0x01),
-        /**
-         * Fonts with variable stroke widths, which are proportional to the actual widths of the
-         * glyphs, and which do not have serifs. "MS Sans Serif" is an example.
-         */
-        FF_SWISS (0x02),
-        /**
-         * Fonts with constant stroke width, with or without serifs. Fixed-width fonts are
-         * usually modern. "Pica", "Elite", and "Courier New" are examples.
-         */
-        FF_MODERN (0x03),
-        /**
-         * Fonts designed to look like handwriting. "Script" and "Cursive" are examples.
-         */
-        FF_SCRIPT (0x04),
-        /**
-         * Novelty fonts. "Old English" is an example.
-         */
-        FF_DECORATIVE (0x05);
-        
-        int flag;
-        WmfFontFamilyClass(int flag) {
-            this.flag = flag;
-        }
-
-        static WmfFontFamilyClass valueOf(int flag) {
-            for (WmfFontFamilyClass ff : values()) {
-                if (ff.flag == flag) return ff;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * A property of a font that describes the pitch, of the characters.
-     */
-    public enum WmfFontPitch {
-        /**
-         * The default pitch, which is implementation-dependent.
-         */
-        DEFAULT_PITCH (0x00),
-        /**
-         * A fixed pitch, which means that all the characters in the font occupy the same
-         * width when output in a string.
-         */
-        FIXED_PITCH (0x01),
-        /**
-         * A variable pitch, which means that the characters in the font occupy widths
-         * that are proportional to the actual widths of the glyphs when output in a string. For example,
-         * the "i" and space characters usually have much smaller widths than a "W" or "O" character.
-         */
-        VARIABLE_PITCH (0x02);
-        
-        int flag;
-        WmfFontPitch(int flag) {
-            this.flag = flag;
-        }
-
-        static WmfFontPitch valueOf(int flag) {
-            for (WmfFontPitch fp : values()) {
-                if (fp.flag == flag) return fp;
-            }
-            return null;
-        }        
-    }
-    
-    /**
-     * A 16-bit signed integer that specifies the height, in logical units, of the font's
-     * character cell. The character height is computed as the character cell height minus the
-     * internal leading. The font mapper SHOULD interpret the height as follows.
-     *
-     * negative value:
-     * The font mapper SHOULD transform this value into device units and match its
-     * absolute value against the character height of available fonts.
-     *
-     * zero value:
-     * A default height value MUST be used when creating a physical font.
-     *
-     * positive value:
-     * The font mapper SHOULD transform this value into device units and match it
-     * against the cell height of available fonts.
-     *
-     * For all height comparisons, the font mapper SHOULD find the largest physical
-     * font that does not exceed the requested size.
-     */
-    int height;
-
-    /**
-     * A 16-bit signed integer that defines the average width, in logical units, of
-     * characters in the font. If Width is 0x0000, the aspect ratio of the device SHOULD be matched
-     * against the digitization aspect ratio of the available fonts to find the closest match,
-     * determined by the absolute value of the difference.
-     */
-    int width;
-
-    /**
-     * A 16-bit signed integer that defines the angle, in tenths of degrees, between the
-     * escapement vector and the x-axis of the device. The escapement vector is parallel
-     * to the base line of a row of text.
-     */
-    int escapement;
-
-    /**
-     * A 16-bit signed integer that defines the angle, in tenths of degrees,
-     * between each character's base line and the x-axis of the device.
-     */
-    int orientation;
-
-    /**
-     * A 16-bit signed integer that defines the weight of the font in the range 0
-     * through 1000. For example, 400 is normal and 700 is bold. If this value is 0x0000,
-     * a default weight SHOULD be used.
-     */
-    int weight;
-
-    /**
-     * A 8-bit Boolean value that specifies the italic attribute of the font.
-     * 0 = not italic / 1 = italic.
-     */
-    boolean italic;
-
-    /**
-     * An 8-bit Boolean value that specifies the underline attribute of the font.
-     * 0 = not underlined / 1 = underlined
-     */
-    boolean underline;
-
-    /**
-     * An 8-bit Boolean value that specifies the strike out attribute of the font.
-     * 0 = not striked out / 1 = striked out
-     */
-    boolean strikeOut;
-
-    /**
-     * An 8-bit unsigned integer that defines the character set.
-     * It SHOULD be set to a value in the {@link WmfCharset} Enumeration.
-     *
-     * The DEFAULT_CHARSET value MAY be used to allow the name and size of a font to fully
-     * describe the logical font. If the specified font name does not exist, a font in another character
-     * set MAY be substituted. The DEFAULT_CHARSET value is set to a value based on the current
-     * system locale. For example, when the system locale is United States, it is set to ANSI_CHARSET.
-     * If a typeface name in the FaceName field is specified, the CharSet value MUST match the
-     * character set of that typeface.
-     */
-    WmfCharset charSet;
-
-    /**
-     * An 8-bit unsigned integer that defines the output precision.
-     */
-    WmfOutPrecision outPrecision;
-
-    /**
-     * An 8-bit unsigned integer that defines the clipping precision.
-     * These flags can be combined to specify multiple options.
-     *
-     * @see WmfClipPrecision
-     */
-    WmfClipPrecision clipPrecision;
-
-    /**
-     * An 8-bit unsigned integer that defines the output quality.
-     */
-    WmfFontQuality quality;
-
-    /**
-     * A PitchAndFamily object that defines the pitch and the family of the font.
-     * Font families specify the look of fonts in a general way and are intended for
-     * specifying fonts when the exact typeface wanted is not available.
-     */
-    int pitchAndFamily;
-    
-    /**
-     * Font families specify the look of fonts in a general way and are
-     * intended for specifying fonts when the exact typeface wanted is not available.
-     * (LSB 4 bits)
-     */
-    WmfFontFamilyClass family;
-    
-    /**
-     * A property of a font that describes the pitch (MSB 2 bits)
-     */
-    WmfFontPitch pitch;
-
-    /**
-     * A null-terminated string of 8-bit Latin-1 [ISO/IEC-8859-1] ANSI
-     * characters that specifies the typeface name of the font. The length of this string MUST NOT
-     * exceed 32 8-bit characters, including the terminating null.
-     */
-    String facename;
-
-    public int init(LittleEndianInputStream leis) throws IOException {
-        height = leis.readShort();
-        width = leis.readShort();
-        escapement = leis.readShort();
-        orientation = leis.readShort();
-        weight = leis.readShort();
-        italic = leis.readByte() != 0;
-        underline = leis.readByte() != 0;
-        strikeOut = leis.readByte() != 0;
-        charSet = WmfCharset.valueOf(leis.readUByte());
-        outPrecision = WmfOutPrecision.valueOf(leis.readUByte());
-        clipPrecision = WmfClipPrecision.valueOf(leis.readUByte());
-        quality = WmfFontQuality.valueOf(leis.readUByte());
-        pitchAndFamily = leis.readUByte();
-        
-        byte buf[] = new byte[32], b, readBytes = 0;
-        do {
-            if (readBytes == 32) {
-                throw new IOException("Font facename can't be determined.");
-            }
-
-            buf[readBytes++] = b = leis.readByte();
-        } while (b != 0 && b != -1 && readBytes <= 32);
-        
-        facename = new String(buf, 0, readBytes-1, Charset.forName("ISO-8859-1"));
-        
-        return 5*LittleEndianConsts.SHORT_SIZE+8*LittleEndianConsts.BYTE_SIZE+readBytes;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public int getEscapement() {
-        return escapement;
-    }
-
-    public int getOrientation() {
-        return orientation;
-    }
-
-    public int getWeight() {
-        return weight;
-    }
-
-    public boolean isItalic() {
-        return italic;
-    }
-
-    public boolean isUnderline() {
-        return underline;
-    }
-
-    public boolean isStrikeOut() {
-        return strikeOut;
-    }
-
-    public WmfCharset getCharSet() {
-        return charSet;
-    }
-
-    public WmfOutPrecision getOutPrecision() {
-        return outPrecision;
-    }
-
-    public WmfClipPrecision getClipPrecision() {
-        return clipPrecision;
-    }
-
-    public WmfFontQuality getQuality() {
-        return quality;
-    }
-
-    public int getPitchAndFamily() {
-        return pitchAndFamily;
-    }
-
-    public WmfFontFamilyClass getFamily() {
-        return WmfFontFamilyClass.valueOf(pitchAndFamily & 0xF);
-    }
-
-    public WmfFontPitch getPitch() {
-        return WmfFontPitch.valueOf((pitchAndFamily >>> 6) & 3);
-    }
-
-    public String getFacename() {
-        return facename;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java
deleted file mode 100644
index 00108c4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-/**
- * The HatchStyle Enumeration specifies the hatch pattern.
- */
-public enum HwmfHatchStyle {
-    /** ----- - A horizontal hatch */
-    HS_HORIZONTAL(0x0000),
-    /** ||||| - A vertical hatch */
-    HS_VERTICAL(0x0001),
-    /** \\\\\ - A 45-degree downward, left-to-right hatch. */
-    HS_FDIAGONAL(0x0002),
-    /** ///// - A 45-degree upward, left-to-right hatch. */
-    HS_BDIAGONAL(0x0003),
-    /** +++++ - A horizontal and vertical cross-hatch. */
-    HS_CROSS(0x0004),
-    /** xxxxx - A 45-degree crosshatch. */
-    HS_DIAGCROSS(0x0005);
-
-    int flag;
-    HwmfHatchStyle(int flag) {
-        this.flag = flag;
-    }
-
-    static HwmfHatchStyle valueOf(int flag) {
-        for (HwmfHatchStyle hs : values()) {
-            if (hs.flag == flag) return hs;
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java
deleted file mode 100644
index 247f22b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.io.IOException;
-
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfHeader {
-    private int type;
-    private int recordSize;
-    private int version;
-    private int filesize;
-    private int numberOfObjects;
-    private long maxRecord;
-    private int numberOfMembers;
-    
-    public HwmfHeader(LittleEndianInputStream leis) throws IOException {
-        // Type (2 bytes):  A 16-bit unsigned integer that defines the type of metafile
-        // MEMORYMETAFILE = 0x0001, DISKMETAFILE = 0x0002 
-        type = leis.readUShort();
-
-        // HeaderSize (2 bytes):  A 16-bit unsigned integer that defines the number
-        // of 16-bit words in the header.
-        recordSize = leis.readUShort();
-        int bytesLeft = recordSize*LittleEndianConsts.SHORT_SIZE-4;
-        
-        // Version (2 bytes):  A 16-bit unsigned integer that defines the metafile version.
-        // METAVERSION100 = 0x0100, METAVERSION300 = 0x0300
-        version = leis.readUShort();
-        bytesLeft -= LittleEndianConsts.SHORT_SIZE;
-        
-        // SizeLow (2 bytes):  A 16-bit unsigned integer that defines the low-order word
-        // of the number of 16-bit words in the entire metafile.
-        // SizeHigh (2 bytes):  A 16-bit unsigned integer that defines the high-order word
-        // of the number of 16-bit words in the entire metafile.
-        filesize = leis.readInt();
-        bytesLeft -= LittleEndianConsts.INT_SIZE;
-        
-        // NumberOfObjects (2 bytes):  A 16-bit unsigned integer that specifies the number
-        // of graphics objects that are defined in the entire metafile. These objects include
-        // brushes, pens, and the other objects
-        numberOfObjects = leis.readUShort();
-        bytesLeft -= LittleEndianConsts.SHORT_SIZE;
-        
-        // MaxRecord (4 bytes):  A 32-bit unsigned integer that specifies the size of the
-        // largest record used in the metafile (in 16-bit elements).
-        maxRecord = leis.readUInt();
-        bytesLeft -= LittleEndianConsts.INT_SIZE;
-        
-        // NumberOfMembers (2 bytes):  A 16-bit unsigned integer that is not used.
-        // It SHOULD be 0x0000.
-        numberOfMembers = leis.readUShort();
-        bytesLeft -= LittleEndianConsts.SHORT_SIZE;
-        
-        if (bytesLeft > 0) {
-            long len = leis.skip(bytesLeft);
-            assert(len == bytesLeft);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMapMode.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMapMode.java
deleted file mode 100644
index cae700e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMapMode.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-/**
- * A 16-bit unsigned integer that defines the mapping mode.
- *
- * The MapMode defines how logical units are mapped to physical units;
- * that is, assuming that the origins in both the logical and physical coordinate systems
- * are at the same point on the drawing surface, what is the physical coordinate (x',y')
- * that corresponds to logical coordinate (x,y).
- *
- * For example, suppose the mapping mode is MM_TEXT. Given the following definition of that
- * mapping mode, and an origin (0,0) at the top left corner of the drawing surface, logical
- * coordinate (4,5) would map to physical coordinate (4,5) in pixels.
- *
- * Now suppose the mapping mode is MM_LOENGLISH, with the same origin as the previous
- * example. Given the following definition of that mapping mode, logical coordinate (4,-5)
- * would map to physical coordinate (0.04,0.05) in inches.
- */
-public enum HwmfMapMode {
-    /**
-     *  Each logical unit is mapped to one device pixel.
-     *  Positive x is to the right; positive y is down.
-     */
-    MM_TEXT(0x0001, 0),
-    
-    /**
-     *  Each logical unit is mapped to 0.1 millimeter.
-     *  Positive x is to the right; positive y is up.
-     */
-    MM_LOMETRIC(0x0002, 254),
-    
-    /**
-     *  Each logical unit is mapped to 0.01 millimeter.
-     *  Positive x is to the right; positive y is up.
-     */
-    MM_HIMETRIC(0x0003, 2540),
-    
-    /**
-     *  Each logical unit is mapped to 0.01 inch.
-     *  Positive x is to the right; positive y is up.
-     */
-    MM_LOENGLISH(0x0004, 100),
-    
-    /**
-     *  Each logical unit is mapped to 0.001 inch.
-     *  Positive x is to the right; positive y is up.
-     */
-    MM_HIENGLISH(0x0005, 1000),
-    
-    /**
-     *  Each logical unit is mapped to one twentieth (1/20) of a point.
-     *  In printing, a point is 1/72 of an inch; therefore, 1/20 of a point is 1/1440 of an inch.
-     *  This unit is also known as a "twip".
-     *  Positive x is to the right; positive y is up.
-     */
-    MM_TWIPS(0x0006, 1440),
-    
-    /**
-     *  Logical units are mapped to arbitrary device units with equally scaled axes;
-     *  that is, one unit along the x-axis is equal to one unit along the y-axis.
-     *  The META_SETWINDOWEXT and META_SETVIEWPORTEXT records specify the units and the
-     *  orientation of the axes.
-     *  The processing application SHOULD make adjustments as necessary to ensure the x and y
-     *  units remain the same size. For example, when the window extent is set, the viewport
-     *  SHOULD be adjusted to keep the units isotropic.
-     */
-    MM_ISOTROPIC(0x0007, -1),
-    
-    /**
-     *  Logical units are mapped to arbitrary units with arbitrarily scaled axes.
-     */
-    MM_ANISOTROPIC(0x0008, -1);
-    
-    /**
-     * native flag
-     */
-    public final int flag;
-    
-    /**
-     * transformation units - usually scale relative to current dpi.
-     * when scale == 0, then don't scale
-     * when scale == -1, then scale relative to window dimension. 
-     */
-    public final int scale;
-    
-    HwmfMapMode(int flag, int scale) {
-        this.flag = flag;
-        this.scale = scale;
-    }
-
-    static HwmfMapMode valueOf(int flag) {
-        for (HwmfMapMode mm : values()) {
-            if (mm.flag == flag) return mm;
-        }
-        return MM_ISOTROPIC;
-    }        
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java
deleted file mode 100644
index c8f280e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java
+++ /dev/null
@@ -1,581 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.poi.hwmf.draw.HwmfDrawProperties;
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.hwmf.record.HwmfFill.ColorUsage;
-import org.apache.poi.hwmf.record.HwmfFill.HwmfImageRecord;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfMisc {
-
-    /**
-     * The META_SAVEDC record saves the playback device context for later retrieval.
-     */
-    public static class WmfSaveDc implements HwmfRecord {
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.saveDc;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            return 0;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.saveProperties();
-        }
-    }
-
-    /**
-     * The META_SETRELABS record is reserved and not supported.
-     */
-    public static class WmfSetRelabs implements HwmfRecord {
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setRelabs;
-        }
-
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            return 0;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-
-    /**
-     * The META_RESTOREDC record restores the playback device context from a previously saved device
-     * context.
-     */
-    public static class WmfRestoreDc implements HwmfRecord {
-
-        /**
-         * nSavedDC (2 bytes):  A 16-bit signed integer that defines the saved state to be restored. If this
-         * member is positive, nSavedDC represents a specific instance of the state to be restored. If
-         * this member is negative, nSavedDC represents an instance relative to the current state.
-         */
-        private int nSavedDC;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.restoreDc;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            nSavedDC = leis.readShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.restoreProperties(nSavedDC);
-        }
-    }
-
-    /**
-     * The META_SETBKCOLOR record sets the background color in the playback device context to a
-     * specified color, or to the nearest physical color if the device cannot represent the specified color.
-     */
-    public static class WmfSetBkColor implements HwmfRecord {
-
-        private HwmfColorRef colorRef;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setBkColor;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            colorRef = new HwmfColorRef();
-            return colorRef.init(leis);
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setBackgroundColor(colorRef);
-        }
-    }
-
-    /**
-     * The META_SETBKMODE record defines the background raster operation mix mode in the playback
-     * device context. The background mix mode is the mode for combining pens, text, hatched brushes,
-     * and interiors of filled objects with background colors on the output surface.
-     */
-    public static class WmfSetBkMode implements HwmfRecord {
-
-        /**
-         * A 16-bit unsigned integer that defines background mix mode.
-         */
-        public enum HwmfBkMode {
-            TRANSPARENT(0x0001), OPAQUE(0x0002);
-
-            int flag;
-            HwmfBkMode(int flag) {
-                this.flag = flag;
-            }
-
-            static HwmfBkMode valueOf(int flag) {
-                for (HwmfBkMode bs : values()) {
-                    if (bs.flag == flag) return bs;
-                }
-                return null;
-            }
-        }
-
-        private HwmfBkMode bkMode;
-
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setBkMode;
-        }
-
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            bkMode = HwmfBkMode.valueOf(leis.readUShort());
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setBkMode(bkMode);
-        }
-    }
-
-    /**
-     * The META_SETLAYOUT record defines the layout orientation in the playback device context.
-     * The layout orientation determines the direction in which text and graphics are drawn
-     */
-    public static class WmfSetLayout implements HwmfRecord {
-
-        /**
-         * A 16-bit unsigned integer that defines the layout of text and graphics.
-         * LAYOUT_LTR = 0x0000
-         * LAYOUT_RTL = 0x0001
-         * LAYOUT_BITMAPORIENTATIONPRESERVED = 0x0008
-         */
-        private int layout;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setLayout;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            layout = leis.readUShort();
-            // A 16-bit field that MUST be ignored.
-            /*int reserved =*/ leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-
-    /**
-     * The META_SETMAPMODE record defines the mapping mode in the playback device context.
-     * The mapping mode defines the unit of measure used to transform page-space units into
-     * device-space units, and also defines the orientation of the device's x and y axes.
-     */
-    public static class WmfSetMapMode implements HwmfRecord {
-
-        private HwmfMapMode mapMode;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setMapMode;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            mapMode = HwmfMapMode.valueOf(leis.readUShort());
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setMapMode(mapMode);
-            ctx.updateWindowMapMode();
-        }
-    }
-
-    /**
-     * The META_SETMAPPERFLAGS record defines the algorithm that the font mapper uses when it maps
-     * logical fonts to physical fonts.
-     */
-    public static class WmfSetMapperFlags implements HwmfRecord {
-
-        /**
-         * A 32-bit unsigned integer that defines whether the font mapper should attempt to
-         * match a font's aspect ratio to the current device's aspect ratio. If bit 0 is
-         * set, the mapper selects only matching fonts.
-         */
-        private long mapperValues;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setMapperFlags;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            mapperValues = leis.readUInt();
-            return LittleEndianConsts.INT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-
-    /**
-     * The META_SETROP2 record defines the foreground raster operation mix mode in the playback device
-     * context. The foreground mix mode is the mode for combining pens and interiors of filled objects with
-     * foreground colors on the output surface.
-     */
-    public static class WmfSetRop2 implements HwmfRecord {
-
-        /**
-         * A 16-bit unsigned integer that defines the foreground binary raster
-         * operation mixing mode
-         */
-        private HwmfBinaryRasterOp drawMode;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setRop2;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            drawMode = HwmfBinaryRasterOp.valueOf(leis.readUShort());
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-
-    /**
-     * The META_SETSTRETCHBLTMODE record defines the bitmap stretching mode in the playback device
-     * context.
-     */
-    public static class WmfSetStretchBltMode implements HwmfRecord {
-
-        /**
-         * A 16-bit unsigned integer that defines bitmap stretching mode.
-         * This MUST be one of the values:
-         * BLACKONWHITE = 0x0001,
-         * WHITEONBLACK = 0x0002,
-         * COLORONCOLOR = 0x0003,
-         * HALFTONE = 0x0004
-         */
-        private int setStretchBltMode;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setStretchBltMode;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            setStretchBltMode = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-
-    /**
-     * The META_DIBCREATEPATTERNBRUSH record creates a Brush Object with a
-     * pattern specified by a DeviceIndependentBitmap (DIB) Object
-     */
-    public static class WmfDibCreatePatternBrush implements HwmfRecord, HwmfImageRecord, HwmfObjectTableEntry {
-
-        private HwmfBrushStyle style;
-
-        /**
-         * A 16-bit unsigned integer that defines whether the Colors field of a DIB
-         * Object contains explicit RGB values, or indexes into a palette.
-         *
-         * If the Style field specifies BS_PATTERN, a ColorUsage value of DIB_RGB_COLORS MUST be
-         * used regardless of the contents of this field.
-         *
-         * If the Style field specified anything but BS_PATTERN, this field MUST be one of the ColorUsage values.
-         */
-        private ColorUsage colorUsage;
-
-        private HwmfBitmapDib patternDib;
-        private HwmfBitmap16 pattern16;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.dibCreatePatternBrush;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            style = HwmfBrushStyle.valueOf(leis.readUShort());
-            colorUsage = ColorUsage.valueOf(leis.readUShort());
-            int size = 2*LittleEndianConsts.SHORT_SIZE;
-            switch (style) {
-            case BS_SOLID:
-            case BS_NULL:
-            case BS_DIBPATTERN:
-            case BS_DIBPATTERNPT:
-            case BS_HATCHED:
-            case BS_PATTERN:
-                patternDib = new HwmfBitmapDib();
-                size += patternDib.init(leis, (int)(recordSize-6-size));
-                break;
-            case BS_INDEXED:
-            case BS_DIBPATTERN8X8:
-            case BS_MONOPATTERN:
-            case BS_PATTERN8X8:
-                throw new RuntimeException("pattern not supported");
-            }
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            HwmfDrawProperties prop = ctx.getProperties();
-            prop.setBrushStyle(style);
-            prop.setBrushBitmap(getImage());
-        }
-
-        @Override
-        public BufferedImage getImage() {
-            if (patternDib != null) {
-                return patternDib.getImage();
-            } else if (pattern16 != null) {
-                return pattern16.getImage();
-            } else {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * The META_DELETEOBJECT record deletes an object, including Bitmap16, Brush,
-     * DeviceIndependentBitmap, Font, Palette, Pen, and Region. After the object is deleted,
-     * its index in the WMF Object Table is no longer valid but is available to be reused.
-     */
-    public static class WmfDeleteObject implements HwmfRecord {
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to
-         * get the object to be deleted.
-         */
-        private int objectIndex;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.deleteObject;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            objectIndex = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.unsetObjectTableEntry(objectIndex);
-        }
-    }
-
-    public static class WmfCreatePatternBrush implements HwmfRecord, HwmfObjectTableEntry {
-
-        private HwmfBitmap16 pattern;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.createPatternBrush;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            pattern = new HwmfBitmap16(true);
-            return pattern.init(leis);
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            HwmfDrawProperties dp = ctx.getProperties();
-            dp.setBrushBitmap(pattern.getImage());
-            dp.setBrushStyle(HwmfBrushStyle.BS_PATTERN);
-        }
-    }
-
-    public static class WmfCreatePenIndirect implements HwmfRecord, HwmfObjectTableEntry {
-
-        private HwmfPenStyle penStyle;
-        /**
-         * A 32-bit PointS Object that specifies a point for the object dimensions.
-         * The x-coordinate is the pen width. The y-coordinate is ignored.
-         */
-        private int xWidth;
-        @SuppressWarnings("unused")
-        private int yWidth;
-        /**
-         * A 32-bit ColorRef Object that specifies the pen color value.
-         */
-        private HwmfColorRef colorRef;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.createPenIndirect;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            penStyle = HwmfPenStyle.valueOf(leis.readUShort());
-            xWidth = leis.readShort();
-            yWidth = leis.readShort();
-            colorRef = new HwmfColorRef();
-            int size = colorRef.init(leis);
-            return size+3*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            HwmfDrawProperties p = ctx.getProperties();
-            p.setPenStyle(penStyle);
-            p.setPenColor(colorRef);
-            p.setPenWidth(xWidth);
-        }
-    }
-
-    /**
-     * The META_CREATEBRUSHINDIRECT record creates a Brush Object
-     * from a LogBrush Object.
-     *
-     * The following table shows the relationship between values in the BrushStyle,
-     * ColorRef and BrushHatch fields in a LogBrush Object. Only supported brush styles are listed.
-     *
-     * <table>
-     * <tr>
-     *   <th>BrushStyle</th>
-     *   <th>ColorRef</th>
-     *   <th>BrushHatch</th>
-     * </tr>
-     * <tr>
-     *   <td>BS_SOLID</td>
-     *   <td>SHOULD be a ColorRef Object, which determines the color of the brush.</td>
-     *   <td>Not used, and SHOULD be ignored.</td>
-     * </tr>
-     * <tr>
-     *   <td>BS_NULL</td>
-     *   <td>Not used, and SHOULD be ignored.</td>
-     *   <td>Not used, and SHOULD be ignored.</td>
-     * </tr>
-     * <tr>
-     *   <td>BS_PATTERN</td>
-     *   <td>Not used, and SHOULD be ignored.</td>
-     *   <td>Not used. A default object, such as a solidcolor black Brush Object, MAY be created.</td>
-     * </tr>
-     * <tr>
-     *   <td>BS_DIBPATTERN</td>
-     *   <td>Not used, and SHOULD be ignored.</td>
-     *   <td>Not used. A default object, such as a solidcolor black Brush Object, MAY be created</td>
-     * </tr>
-     * <tr>
-     *   <td>BS_DIBPATTERNPT</td>
-     *   <td>Not used, and SHOULD be ignored.</td>
-     *   <td>Not used. A default object, such as a solidcolor black Brush Object, MAY be created.</td>
-     * </tr>
-     * <tr>
-     *   <td>BS_HATCHED</td>
-     *   <td>SHOULD be a ColorRef Object, which determines the foreground color of the hatch pattern.</td>
-     *   <td>A value from the {@link HwmfHatchStyle} Enumeration that specifies the orientation of lines used to create the hatch.</td>
-     * </tr>
-     * </table>
-     */
-    public static class WmfCreateBrushIndirect implements HwmfRecord, HwmfObjectTableEntry {
-        private HwmfBrushStyle brushStyle;
-
-        private HwmfColorRef colorRef;
-
-        /**
-         * A 16-bit field that specifies the brush hatch type.
-         * Its interpretation depends on the value of BrushStyle.
-         *
-         */
-        private HwmfHatchStyle brushHatch;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.createBrushIndirect;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            brushStyle = HwmfBrushStyle.valueOf(leis.readUShort());
-            colorRef = new HwmfColorRef();
-            int size = colorRef.init(leis);
-            brushHatch = HwmfHatchStyle.valueOf(leis.readUShort());
-            return size+2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            HwmfDrawProperties p = ctx.getProperties();
-            p.setBrushStyle(brushStyle);
-            p.setBrushColor(colorRef);
-            p.setBrushHatch(brushHatch);
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
deleted file mode 100644
index f05e690..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-
-/**
- * Marker interface for Records, which should be added to the
- * WMF object table for further selection 
- */
-public interface HwmfObjectTableEntry {
-    public void applyObject(HwmfGraphics ctx);
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java
deleted file mode 100644
index eb6139c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hwmf.draw.HwmfDrawProperties;
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfPalette {
-
-    public static class PaletteEntry {
-        private static final BitField PC_RESERVED   = BitFieldFactory.getInstance(0x01);
-        private static final BitField PC_EXPLICIT   = BitFieldFactory.getInstance(0x02);
-        private static final BitField PC_NOCOLLAPSE = BitFieldFactory.getInstance(0x04);
-
-        private int values;
-        private Color colorRef;
-
-        private PaletteEntry() {
-            this.values = PC_RESERVED.set(0);
-            this.colorRef = Color.BLACK;
-        }
-
-        private PaletteEntry(PaletteEntry other) {
-            this.values = other.values;
-            this.colorRef = other.colorRef;
-        }
-
-        public int init(LittleEndianInputStream leis) throws IOException {
-            // Values (1 byte):  An 8-bit unsigned integer that defines how the palette entry is to be used.
-            // The Values field MUST be 0x00 or one of the values in the PaletteEntryFlag Enumeration table.
-            values = leis.readUByte();
-            // Blue (1 byte): An 8-bit unsigned integer that defines the blue intensity value for the palette entry.
-            int blue = leis.readUByte();
-            // Green (1 byte): An 8-bit unsigned integer that defines the green intensity value for the palette entry.
-            int green = leis.readUByte();
-            // Red (1 byte): An 8-bit unsigned integer that defines the red intensity value for the palette entry.
-            int red = leis.readUByte();
-            colorRef = new Color(red, green, blue);
-
-            return 4*LittleEndianConsts.BYTE_SIZE;
-        }
-
-        /**
-         * Specifies that the logical palette entry be used for palette animation. This value
-         * prevents other windows from matching colors to the palette entry because the color frequently
-         * changes. If an unused system-palette entry is available, the color is placed in that entry.
-         * Otherwise, the color is not available for animation.
-         */
-        public boolean isReserved() {
-            return PC_RESERVED.isSet(values);
-        }
-
-        /**
-         * Specifies that the low-order word of the logical palette entry designates a hardware
-         * palette index. This value allows the application to show the contents of the display device palette.
-         */
-        public boolean isExplicit() {
-            return PC_EXPLICIT.isSet(values);
-        }
-
-        /**
-         * Specifies that the color be placed in an unused entry in the system palette
-         * instead of being matched to an existing color in the system palette. If there are no unused entries
-         * in the system palette, the color is matched normally. Once this color is in the system palette,
-         * colors in other logical palettes can be matched to this color.
-         */
-        public boolean isNoCollapse() {
-            return PC_NOCOLLAPSE.isSet(values);
-        }
-    }
-
-    public static abstract class WmfPaletteParent implements HwmfRecord, HwmfObjectTableEntry  {
-
-        /**
-         * Start (2 bytes):  A 16-bit unsigned integer that defines the offset into the Palette Object when
-         * used with the META_SETPALENTRIES and META_ANIMATEPALETTE record types.
-         * When used with META_CREATEPALETTE, it MUST be 0x0300
-         */
-        private int start;
-
-        private List<PaletteEntry> palette = new ArrayList<PaletteEntry>();
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            start = leis.readUShort();
-            /**
-             * NumberOfEntries (2 bytes):  A 16-bit unsigned integer that defines the number of objects in
-             * aPaletteEntries.
-             */
-            int numberOfEntries = leis.readUShort();
-            int size = 2*LittleEndianConsts.SHORT_SIZE;
-            for (int i=0; i<numberOfEntries; i++) {
-                PaletteEntry pe = new PaletteEntry();
-                size += pe.init(leis);
-                palette.add(pe);
-            }
-            return size;
-        }
-
-        @Override
-        public final void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        protected List<PaletteEntry> getPaletteCopy() {
-            List<PaletteEntry> newPalette = new ArrayList<PaletteEntry>();
-            for (PaletteEntry et : palette) {
-                newPalette.add(new PaletteEntry(et));
-            }
-            return newPalette;
-        }
-
-        protected int getPaletteStart() {
-            return start;
-        }
-    }
-
-    /**
-     * The META_CREATEPALETTE record creates a Palette Object
-     */
-    public static class WmfCreatePalette extends WmfPaletteParent implements HwmfObjectTableEntry {
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.createPalette;
-        }
-
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            ctx.getProperties().setPalette(getPaletteCopy());
-        }
-    }
-
-    /**
-     * The META_SETPALENTRIES record defines RGB color values in a range of entries in the logical
-     * palette that is defined in the playback device context.
-     */
-    public static class WmfSetPaletteEntries extends WmfPaletteParent {
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setPalEntries;
-        }
-
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            HwmfDrawProperties props = ctx.getProperties();
-            List<PaletteEntry> palette = props.getPalette();
-            if (palette == null) {
-                palette = new ArrayList<PaletteEntry>();
-            }
-            int start = getPaletteStart();
-            for (int i=palette.size(); i<start; i++) {
-                palette.add(new PaletteEntry());
-            }
-            int index = start;
-            for (PaletteEntry palCopy : getPaletteCopy()) {
-                if (palette.size() <= index) {
-                    palette.add(palCopy);
-                } else {
-                    palette.set(index, palCopy);
-                }
-                index++;
-            }
-            props.setPalette(palette);
-        }
-    }
-
-    /**
-     * The META_RESIZEPALETTE record redefines the size of the logical palette that is defined in the
-     * playback device context.
-     */
-    public static class WmfResizePalette implements HwmfRecord, HwmfObjectTableEntry {
-        /**
-         * A 16-bit unsigned integer that defines the number of entries in
-         * the logical palette.
-         */
-        int numberOfEntries;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.resizePalette;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            numberOfEntries = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            HwmfDrawProperties props = ctx.getProperties();
-            List<PaletteEntry> palette = props.getPalette();
-            if (palette == null) {
-                palette = new ArrayList<PaletteEntry>();
-            }
-            for (int i=palette.size(); i<numberOfEntries; i++) {
-                palette.add(new PaletteEntry());
-            }
-            palette = palette.subList(0, numberOfEntries);
-            props.setPalette(palette);
-        }
-    }
-
-    /**
-     * The META_SELECTPALETTE record defines the current logical palette with a specified Palette Object.
-     */
-    public static class WmfSelectPalette implements HwmfRecord {
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get
-         * the Palette Object to be selected.
-         */
-        private int paletteIndex;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.selectPalette;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            paletteIndex = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.applyObjectTableEntry(paletteIndex);
-        }
-    }
-
-    /**
-     * The META_REALIZEPALETTE record maps entries from the logical palette that
-     * is defined in the playback device context to the system palette.
-     */
-    public static class WmfRealizePalette implements HwmfRecord {
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.realizePalette;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            return 0;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-
-    /**
-     * The META_ANIMATEPALETTE record redefines entries in the logical palette that
-     * is defined in the playback device context with the specified Palette object
-     *
-     * The logical palette that is specified by the Palette object in this record is the
-     * source of the palette changes, and the logical palette that is currently selected
-     * into the playback device context is the destination. Entries in the destination
-     * palette with the PC_RESERVED PaletteEntryFlag set SHOULD be modified by this record,
-     * and entries with that flag clear SHOULD NOT be modified.
-     * If none of the entries in the destination palette have the PC_RESERVED flag set, then
-     * this record SHOULD have no effect.
-     */
-    public static class WmfAnimatePalette extends WmfPaletteParent {
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.animatePalette;
-        }
-
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            HwmfDrawProperties props = ctx.getProperties();
-            List<PaletteEntry> dest = props.getPalette();
-            List<PaletteEntry> src = getPaletteCopy();
-            int start = getPaletteStart();
-            if (dest == null) {
-                dest = new ArrayList<PaletteEntry>();
-            }
-            for (int i=dest.size(); i<start; i++) {
-                dest.add(new PaletteEntry());
-            }
-            for (int i=0; i<src.size(); i++) {
-                PaletteEntry pe = src.get(i);
-                if (dest.size() <= start+i) {
-                    dest.add(pe);
-                } else {
-                    PaletteEntry peDst = dest.get(start+i);
-                    if (peDst.isReserved()) {
-                        dest.set(start+i, pe);
-                    }
-                }
-            }
-            props.setPalette(dest);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java
deleted file mode 100644
index a881c44..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.BasicStroke;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-
-/**
- * The 16-bit PenStyle Enumeration is used to specify different types of pens
- * that can be used in graphics operations.
- * 
- * Various styles can be combined by using a logical OR statement, one from
- * each subsection of Style, EndCap, Join, and Type (Cosmetic).
- * 
- * The defaults in case the other values of the subsection aren't set are
- * solid, round end caps, round joins and cosmetic type.
- */
-public class HwmfPenStyle implements Cloneable {
-    public enum HwmfLineCap {
-        /** Rounded ends */
-        ROUND(0, BasicStroke.CAP_ROUND),
-        /** Square protrudes by half line width */
-        SQUARE(1, BasicStroke.CAP_SQUARE),
-        /** Line ends at end point*/
-        FLAT(2, BasicStroke.CAP_BUTT);        
-
-        public final int wmfFlag;
-        public final int awtFlag;
-        HwmfLineCap(int wmfFlag, int awtFlag) {
-            this.wmfFlag = wmfFlag;
-            this.awtFlag = awtFlag;
-        }
-
-        static HwmfLineCap valueOf(int wmfFlag) {
-            for (HwmfLineCap hs : values()) {
-                if (hs.wmfFlag == wmfFlag) return hs;
-            }
-            return null;
-        }    
-    }
-    
-    public enum HwmfLineJoin {
-        /**Line joins are round. */
-        ROUND(0, BasicStroke.JOIN_ROUND),
-        /** Line joins are beveled. */
-        BEVEL(1, BasicStroke.JOIN_BEVEL),
-        /**
-         * Line joins are mitered when they are within the current limit set by the
-         * SETMITERLIMIT META_ESCAPE record. A join is beveled when it would exceed the limit
-         */
-        MITER(2, BasicStroke.JOIN_MITER);
-
-        public final int wmfFlag;
-        public final int awtFlag;
-        HwmfLineJoin(int wmfFlag, int awtFlag) {
-            this.wmfFlag = wmfFlag;
-            this.awtFlag = awtFlag;
-        }
-
-        static HwmfLineJoin valueOf(int wmfFlag) {
-            for (HwmfLineJoin hs : values()) {
-                if (hs.wmfFlag == wmfFlag) return hs;
-            }
-            return null;
-        }    
-    }
-    
-    public enum HwmfLineDash {
-        /**
-         * The pen is solid.
-         */
-        SOLID(0x0000, null),
-        /**
-         * The pen is dashed. (-----) 
-         */
-        DASH(0x0001, 10, 8),
-        /**
-         * The pen is dotted. (.....)
-         */
-        DOT(0x0002, 2, 4),
-        /**
-         * The pen has alternating dashes and dots. (_._._._)
-         */
-        DASHDOT(0x0003, 10, 8, 2, 8),
-        /**
-         * The pen has dashes and double dots. (_.._.._)
-         */
-        DASHDOTDOT(0x0004, 10, 4, 2, 4, 2, 4),
-        /**
-         * The pen is invisible.
-         */
-        NULL(0x0005, null),
-        /**
-         * The pen is solid. When this pen is used in any drawing record that takes a
-         * bounding rectangle, the dimensions of the figure are shrunk so that it fits
-         * entirely in the bounding rectangle, taking into account the width of the pen.
-         */
-        INSIDEFRAME(0x0006, null),
-        /**
-         * The pen uses a styling array supplied by the user.
-         * (this is currently not supported and drawn as solid ... no idea where the user
-         * styling is supposed to come from ...)
-         */
-        USERSTYLE(0x0007, null);
-        
-
-        public final int wmfFlag;
-        public final float[] dashes;
-        HwmfLineDash(int wmfFlag, float... dashes) {
-            this.wmfFlag = wmfFlag;
-            this.dashes = dashes;
-        }
-
-        static HwmfLineDash valueOf(int wmfFlag) {
-            for (HwmfLineDash hs : values()) {
-                if (hs.wmfFlag == wmfFlag) return hs;
-            }
-            return null;
-        }    
-    }
-    
-    private static final BitField SUBSECTION_DASH      = BitFieldFactory.getInstance(0x0007);
-    private static final BitField SUBSECTION_ALTERNATE = BitFieldFactory.getInstance(0x0008);
-    private static final BitField SUBSECTION_ENDCAP    = BitFieldFactory.getInstance(0x0300);
-    private static final BitField SUBSECTION_JOIN      = BitFieldFactory.getInstance(0x3000);
-    
-    private int flag;
-    
-    public static HwmfPenStyle valueOf(int flag) {
-        HwmfPenStyle ps = new HwmfPenStyle();
-        ps.flag = flag;
-        return ps;
-    }
-    
-    public HwmfLineCap getLineCap() {
-        return HwmfLineCap.valueOf(SUBSECTION_ENDCAP.getValue(flag));
-    }
-
-    public HwmfLineJoin getLineJoin() {
-        return HwmfLineJoin.valueOf(SUBSECTION_JOIN.getValue(flag));
-    }
-    
-    public HwmfLineDash getLineDash() {
-        return HwmfLineDash.valueOf(SUBSECTION_DASH.getValue(flag));
-    }
-    
-
-    /**
-     * The pen sets every other pixel (this style is applicable only for cosmetic pens).
-     */
-    public boolean isAlternateDash() {
-        return SUBSECTION_ALTERNATE.isSet(flag);
-    }
-
-
-    /**
-     * Creates a new object of the same class and with the
-     * same contents as this object.
-     * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
-     * @see        java.lang.Cloneable
-     */
-    @Override
-    public HwmfPenStyle clone() {
-        try {
-            return (HwmfPenStyle)super.clone();
-        } catch (CloneNotSupportedException e) {
-            // this shouldn't happen, since we are Cloneable
-            throw new InternalError();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
deleted file mode 100644
index 2ca0cea..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfPlaceableHeader {
-    public static final int WMF_HEADER_MAGIC = 0x9AC6CDD7;
-    
-    final Rectangle2D bounds;
-    final int unitsPerInch;
-    
-    protected HwmfPlaceableHeader(LittleEndianInputStream leis) throws IOException {
-        /*
-         * HWmf (2 bytes):  The resource handle to the metafile, when the metafile is in memory. When
-         * the metafile is on disk, this field MUST contain 0x0000. This attribute of the metafile is
-         * specified in the Type field of the META_HEADER record.
-         */
-        leis.readShort(); // ignore
-        
-        /*
-         * BoundingBox (8 bytes):  The destination rectangle, measured in logical units, for displaying
-         * the metafile. The size of a logical unit is specified by the Inch field.
-         */
-        int x1 = leis.readShort();
-        int y1 = leis.readShort();
-        int x2 = leis.readShort();
-        int y2 = leis.readShort();
-        bounds = new Rectangle2D.Double(Math.min(x1,x2), Math.min(y1,y2), Math.abs(x2-x1), Math.abs(y2-y1));
-        
-        /*
-         * Inch (2 bytes):  The number of logical units per inch used to represent the image.
-         * This value can be used to scale an image.
-         * By convention, an image is considered to be recorded at 1440 logical units (twips) per inch.
-         * Thus, a value of 720 specifies that the image SHOULD be rendered at twice its normal size,
-         * and a value of 2880 specifies that the image SHOULD be rendered at half its normal size.
-         */
-        unitsPerInch = leis.readShort();
-        
-        /*
-         * Reserved (4 bytes):  A field that is not used and MUST be set to 0x00000000.
-         */
-        leis.readInt();
-        
-        /*
-         * Checksum (2 bytes):  A checksum for the previous 10 16-bit values in the header.
-         * This value can be used to determine whether the metafile has become corrupted.
-         */
-        leis.readShort();
-        
-    }
-    
-    public static HwmfPlaceableHeader readHeader(LittleEndianInputStream leis) throws IOException {
-        leis.mark(LittleEndianConsts.INT_SIZE);
-        int magic = leis.readInt();
-        if (magic == WMF_HEADER_MAGIC) {
-            return new HwmfPlaceableHeader(leis);
-        } else {
-            leis.reset();
-            return null;
-        }
-    }
-
-    public Rectangle2D getBounds() {
-        return bounds;
-    }
-
-    public int getUnitsPerInch() {
-        return unitsPerInch;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecord.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecord.java
deleted file mode 100644
index 7fd5ba5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecord.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.io.IOException;
-
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public interface HwmfRecord {
-    HwmfRecordType getRecordType();
-
-    /**
-     * Init record from stream
-     *
-     * @param leis the little endian input stream
-     * @return count of processed bytes
-     * @throws IOException
-     */
-    int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException;
-    
-    /**
-     * Apply the record settings to the graphics context
-     *
-     * @param ctx the graphics context to modify
-     */
-    void draw(HwmfGraphics ctx);
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecordType.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecordType.java
deleted file mode 100644
index edc2e6f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecordType.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-/**
- * Available record types for WMF
- * 
- * @see <a href="http://www.symantec.com/avcenter/reference/inside.the.windows.meta.file.format.pdf">Inside the Windows Meta File Format</a>
- */
-public enum HwmfRecordType {
-     eof(0x0000, null)
-    ,animatePalette(0x0436, HwmfPalette.WmfAnimatePalette.class)
-    ,arc(0x0817, HwmfDraw.WmfArc.class)
-    ,bitBlt(0x0922, HwmfFill.WmfBitBlt.class)
-    ,chord(0x0830, HwmfDraw.WmfChord.class)
-    ,createBrushIndirect(0x02fc, HwmfMisc.WmfCreateBrushIndirect.class)
-    ,createFontIndirect(0x02fb, HwmfText.WmfCreateFontIndirect.class)
-    ,createPalette(0x00f7, HwmfPalette.WmfCreatePalette.class)
-    ,createPatternBrush(0x01f9, HwmfMisc.WmfCreatePatternBrush.class)
-    ,createPenIndirect(0x02fa, HwmfMisc.WmfCreatePenIndirect.class)
-    ,createRegion(0x06ff, HwmfWindowing.WmfCreateRegion.class)
-    ,deleteObject(0x01f0, HwmfMisc.WmfDeleteObject.class)
-    ,dibBitBlt(0x0940, HwmfFill.WmfDibBitBlt.class)
-    ,dibCreatePatternBrush(0x0142, HwmfMisc.WmfDibCreatePatternBrush.class)
-    ,dibStretchBlt(0x0b41, HwmfFill.WmfDibStretchBlt.class)
-    ,ellipse(0x0418, HwmfDraw.WmfEllipse.class)
-    ,escape(0x0626, HwmfEscape.class)
-    ,excludeClipRect(0x0415, HwmfWindowing.WmfExcludeClipRect.class)
-    ,extFloodFill(0x0548, HwmfFill.WmfExtFloodFill.class)
-    ,extTextOut(0x0a32, HwmfText.WmfExtTextOut.class)
-    ,fillRegion(0x0228, HwmfFill.WmfFillRegion.class)
-    ,floodFill(0x0419, HwmfFill.WmfFloodFill.class)
-    ,frameRegion(0x0429, HwmfDraw.WmfFrameRegion.class)
-    ,intersectClipRect(0x0416, HwmfWindowing.WmfIntersectClipRect.class)
-    ,invertRegion(0x012a, HwmfFill.WmfInvertRegion.class)
-    ,lineTo(0x0213, HwmfDraw.WmfLineTo.class)
-    ,moveTo(0x0214, HwmfDraw.WmfMoveTo.class)
-    ,offsetClipRgn(0x0220, HwmfWindowing.WmfOffsetClipRgn.class)
-    ,offsetViewportOrg(0x0211, HwmfWindowing.WmfOffsetViewportOrg.class)
-    ,offsetWindowOrg(0x020f, HwmfWindowing.WmfOffsetWindowOrg.class)
-    ,paintRegion(0x012b, HwmfFill.WmfPaintRegion.class)
-    ,patBlt(0x061d, HwmfFill.WmfPatBlt.class)
-    ,pie(0x081a, HwmfDraw.WmfPie.class)
-    ,polygon(0x0324, HwmfDraw.WmfPolygon.class)
-    ,polyline(0x0325, HwmfDraw.WmfPolyline.class)
-    ,polyPolygon(0x0538, HwmfDraw.WmfPolyPolygon.class)
-    ,realizePalette(0x0035, HwmfPalette.WmfRealizePalette.class)
-    ,rectangle(0x041b, HwmfDraw.WmfRectangle.class)
-    ,resizePalette(0x0139, HwmfPalette.WmfResizePalette.class)
-    ,restoreDc(0x0127, HwmfMisc.WmfRestoreDc.class)
-    ,roundRect(0x061c, HwmfDraw.WmfRoundRect.class)
-    ,saveDc(0x001e, HwmfMisc.WmfSaveDc.class)
-    ,scaleViewportExt(0x0412, HwmfWindowing.WmfScaleViewportExt.class) 
-    ,scaleWindowExt(0x0410, HwmfWindowing.WmfScaleWindowExt.class)
-    ,selectClipRegion(0x012c, HwmfWindowing.WmfSelectClipRegion.class)
-    ,selectObject(0x012d, HwmfDraw.WmfSelectObject.class)
-    ,selectPalette(0x0234, HwmfPalette.WmfSelectPalette.class)
-    ,setBkColor(0x0201, HwmfMisc.WmfSetBkColor.class)
-    ,setBkMode(0x0102, HwmfMisc.WmfSetBkMode.class)
-    ,setDibToDev(0x0d33, HwmfFill.WmfSetDibToDev.class)
-    ,setLayout(0x0149, HwmfMisc.WmfSetLayout.class)
-    ,setMapMode(0x0103, HwmfMisc.WmfSetMapMode.class)
-    ,setMapperFlags(0x0231, HwmfMisc.WmfSetMapperFlags.class)
-    ,setPalEntries(0x0037, HwmfPalette.WmfSetPaletteEntries.class)
-    ,setPixel(0x041f, HwmfDraw.WmfSetPixel.class)
-    ,setPolyFillMode(0x0106, HwmfFill.WmfSetPolyfillMode.class)
-    ,setRelabs(0x0105, HwmfMisc.WmfSetRelabs.class)
-    ,setRop2(0x0104, HwmfMisc.WmfSetRop2.class)
-    ,setStretchBltMode(0x0107, HwmfMisc.WmfSetStretchBltMode.class)
-    ,setTextAlign(0x012e, HwmfText.WmfSetTextAlign.class)
-    ,setTextCharExtra(0x0108, HwmfText.WmfSetTextCharExtra.class)
-    ,setTextColor(0x0209, HwmfText.WmfSetTextColor.class)
-    ,setTextJustification(0x020a, HwmfText.WmfSetTextJustification.class)
-    ,setViewportExt(0x020e, HwmfWindowing.WmfSetViewportExt.class)
-    ,setViewportOrg(0x020d, HwmfWindowing.WmfSetViewportOrg.class)
-    ,setWindowExt(0x020c, HwmfWindowing.WmfSetWindowExt.class)
-    ,setWindowOrg(0x020b, HwmfWindowing.WmfSetWindowOrg.class)
-    ,stretchBlt(0x0b23, HwmfFill.WmfStretchBlt.class)
-    ,stretchDib(0x0f43, HwmfFill.WmfStretchDib.class)
-    ,textOut(0x0521, HwmfText.WmfTextOut.class)
-    ;
-    
-    public final int id;
-    public final Class<? extends HwmfRecord> clazz;
-    
-    HwmfRecordType(int id, Class<? extends HwmfRecord> clazz) {
-        this.id = id;
-        this.clazz = clazz;
-    }
-    
-    public static HwmfRecordType getById(int id) {
-        for (HwmfRecordType wrt : values()) {
-            if (wrt.id == id) return wrt;
-        }
-        return null;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
deleted file mode 100644
index 9cd9b1e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-/**
- * Each ternary raster operation code represents a Boolean operation in which the values of the pixels in
- * the source, the selected brush, and the destination are combined. Following are the three operands
- * used in these operations.
- *
- * <table>
- * <tr><th>Operand</th><th>Meaning</th></tr>
- * <tr><td>D</td><td>Destination bitmap</td></tr>
- * <tr><td>P</td><td>Selected brush (also called pattern)</td></tr>
- * <tr><td>S</td><td>Source bitmap</td></tr>
- * </table>
- *
- * Following are the Boolean operators used in these operations.
- * <table>
- * <tr><th>Operand</th><th>Meaning</th></tr>
- * <tr><td>a</td><td>Bitwise AND</td></tr>
- * <tr><td>n</td><td>Bitwise NOT (inverse)</td></tr>
- * <tr><td>o</td><td>Bitwise OR</td></tr>
- * <tr><td>x</td><td>Bitwise exclusive OR (XOR)</td></tr>
- * </table>
- *
- * All Boolean operations are presented in reverse Polish notation. For example, the following operation
- * replaces the values of the pixels in the destination bitmap with a combination of the pixel values of the
- * source and brush: PSo.
- * 
- * The following operation combines the values of the pixels in the source and brush with the pixel values
- * of the destination bitmap: DPSoo (there are alternative spellings of some functions, so although a
- * particular spelling MAY NOT be listed in the enumeration, an equivalent form SHOULD be).
- * 
- * Each raster operation code is a 32-bit integer whose high-order word is a Boolean operation index and
- * whose low-order word is the operation code. The 16-bit operation index is a zero-extended, 8-bit
- * value that represents the result of the Boolean operation on predefined brush, source, and destination
- * values. For example, the operation indexes for the PSo and DPSoo operations are shown in the
- * following list.
- * 
- * <table>
- * <tr><th>P</th><th>S</th><th>D</th><th>DPo</th><th>DPan</th></tr>
- * <tr><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
- * <tr><td>0</td><td>0</td><td>1</td><td>0</td><td>1</td></tr>
- * <tr><td>0</td><td>1</td><td>0</td><td>1</td><td>1</td></tr>
- * <tr><td>0</td><td>1</td><td>1</td><td>1</td><td>1</td></tr>
- * <tr><td>1</td><td>0</td><td>0</td><td>1</td><td>1</td></tr>
- * <tr><td>1</td><td>0</td><td>1</td><td>1</td><td>1</td></tr>
- * <tr><td>1</td><td>1</td><td>0</td><td>1</td><td>1</td></tr>
- * <tr><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td></tr>
- * </table>
- * 
- * The operation indexes are determined by reading the binary values in a column of the table from the
- * bottom up. For example, in the PSo column, the binary value is 11111100, which is equivalent to 00FC
- * (hexadecimal is implicit for these values), which is the operation index for PSo.
- * 
- * Using this method, DPSoo can be seen to have the operation index 00FE. Operation indexes define the
- * locations of corresponding raster operation codes in the preceding enumeration. The PSo operation is
- * in line 252 (0x00FC) of the enumeration; DPSoo is in line 254 (0x00FE).
- * 
- * The most commonly used raster operations have been given explicit enumeration names, which
- * SHOULD be used; examples are PATCOPY and WHITENESS.
- * 
- * When the source and destination bitmaps are monochrome, a bit value of 0 represents a black pixel
- * and a bit value of 1 represents a white pixel. When the source and the destination bitmaps are color,
- * those colors are represented with red green blue (RGB) values.
- */
-public enum HwmfTernaryRasterOp {
-    BLACKNESS(0x0000,0x0042,"0"),
-    DPSOON(0x0001,0x0289,"DPSoon"),
-    DPSONA(0x0002,0x0C89,"DPSona"),
-    PSON(0x0003,0x00AA,"PSon"),
-    SDPONA(0x0004,0x0C88,"SDPona"),
-    DPON(0x0005,0x00A9,"DPon"),
-    PDSXNON(0x0006,0x0865,"PDSxnon"),
-    PDSAON(0x0007,0x02C5,"PDSaon"),
-    SDPNAA(0x0008,0x0F08,"SDPnaa"),
-    PDSXON(0x0009,0x0245,"PDSxon"),
-    DPNA(0x000A,0x0329,"DPna"),
-    PSDNAON(0x000B,0x0B2A,"PSDnaon"),
-    SPNA(0x000C,0x0324,"SPna"),
-    PDSNAON(0x000D,0x0B25,"PDSnaon"),
-    PDSONON(0x000E,0x08A5,"PDSonon"),
-    PN(0x000F,0x0001,"Pn"),
-    PDSONA(0x0010,0x0C85,"PDSona"),
-    NOTSRCERASE(0x0011,0x00A6,"DSon"),
-    SDPXNON(0x0012,0x0868,"SDPxnon"),
-    SDPAON(0x0013,0x02C8,"SDPaon"),
-    DPSXNON(0x0014,0x0869,"DPSxnon"),
-    DPSAON(0x0015,0x02C9,"DPSaon"),
-    PSDPSANAXX(0x0016,0x5CCA,"PSDPSanaxx"),
-    SSPXDSXAXN(0x0017,0x1D54,"SSPxDSxaxn"),
-    SPXPDXA(0x0018,0x0D59,"SPxPDxa"),
-    SDPSANAXN(0x0019,0x1CC8,"SDPSanaxn"),
-    PDSPAOX(0x001A,0x06C5,"PDSPaox"),
-    SDPSXAXN(0x001B,0x0768,"SDPSxaxn"),
-    PSDPAOX(0x001C,0x06CA,"PSDPaox"),
-    DSPDXAXN(0x001D,0x0766,"DSPDxaxn"),
-    PDSOX(0x001E,0x01A5,"PDSox"),
-    PDSOAN(0x001F,0x0385,"PDSoan"),
-    DPSNAA(0x0020,0x0F09,"DPSnaa"),
-    SDPXON(0x0021,0x0248,"SDPxon"),
-    DSNA(0x0022,0x0326,"DSna"),
-    SPDNAON(0x0023,0x0B24,"SPDnaon"),
-    SPXDSXA(0x0024,0x0D55,"SPxDSxa"),
-    PDSPANAXN(0x0025,0x1CC5,"PDSPanaxn"),
-    SDPSAOX(0x0026,0x06C8,"SDPSaox"),
-    SDPSXNOX(0x0027,0x1868,"SDPSxnox"),
-    DPSXA(0x0028,0x0369,"DPSxa"),
-    PSDPSAOXXN(0x0029,0x16CA,"PSDPSaoxxn"),
-    DPSANA(0x002A,0x0CC9,"DPSana"),
-    SSPXPDXAXN(0x002B,0x1D58,"SSPxPDxaxn"),
-    SPDSOAX(0x002C,0x0784,"SPDSoax"),
-    PSDNOX(0x002D,0x060A,"PSDnox"),
-    PSDPXOX(0x002E,0x064A,"PSDPxox"),
-    PSDNOAN(0x002F,0x0E2A,"PSDnoan"),
-    PSNA(0x0030,0x032A,"PSna"),
-    SDPNAON(0x0031,0x0B28,"SDPnaon"),
-    SDPSOOX(0x0032,0x0688,"SDPSoox"),
-    NOTSRCCOPY(0x0033,0x0008,"Sn"),
-    SPDSAOX(0x0034,0x06C4,"SPDSaox"),
-    SPDSXNOX(0x0035,0x1864,"SPDSxnox"),
-    SDPOX(0x0036,0x01A8,"SDPox"),
-    SDPOAN(0x0037,0x0388,"SDPoan"),
-    PSDPOAX(0x0038,0x078A,"PSDPoax"),
-    SPDNOX(0x0390,0x604,"SPDnox"),
-    SPDSXOX(0x003A,0x0644,"SPDSxox"),
-    SPDNOAN(0x003B,0x0E24,"SPDnoan"),
-    PSX(0x003C,0x004A,"PSx"),
-    SPDSONOX(0x003D,0x18A4,"SPDSonox"),
-    SPDSNAOX(0x003E,0x1B24,"SPDSnaox"),
-    PSAN(0x003F,0x00EA,"PSan"),
-    PSDNAA(0x0040,0x0F0A,"PSDnaa"),
-    DPSXON(0x0041,0x0249,"DPSxon"),
-    SDXPDXA(0x0042,0x0D5D,"SDxPDxa"),
-    SPDSANAXN(0x0043,0x1CC4,"SPDSanaxn"),
-    SRCERASE(0x0044,0x0328,"SDna"),
-    DPSNAON(0x0045,0x0B29,"DPSnaon"),
-    DSPDAOX(0x0046,0x06C6,"DSPDaox"),
-    PSDPXAXN(0x0047,0x076A,"PSDPxaxn"),
-    SDPXA(0x0048,0x0368,"SDPxa"),
-    PDSPDAOXXN(0x0049,0x16C5,"PDSPDaoxxn"),
-    DPSDOAX(0x004A,0x0789,"DPSDoax"),
-    PDSNOX(0x004B,0x0605,"PDSnox"),
-    SDPANA(0x004C,0x0CC8,"SDPana"),
-    SSPXDSXOXN(0x004D,0x1954,"SSPxDSxoxn"),
-    PDSPXOX(0x004E,0x0645,"PDSPxox"),
-    PDSNOAN(0x004F,0x0E25,"PDSnoan"),
-    PDNA(0x0050,0x0325,"PDna"),
-    DSPNAON(0x0051,0x0B26,"DSPnaon"),
-    DPSDAOX(0x0052,0x06C9,"DPSDaox"),
-    SPDSXAXN(0x0053,0x0764,"SPDSxaxn"),
-    DPSONON(0x0054,0x08A9,"DPSonon"),
-    DSTINVERT(0x0055,0x0009,"Dn"),
-    DPSOX(0x0056,0x01A9,"DPSox"),
-    DPSOAN(0x0005,0x70389,"DPSoan"),
-    PDSPOAX(0x0058,0x0785,"PDSPoax"),
-    DPSNOX(0x0059,0x0609,"DPSnox"),
-    PATINVERT(0x005A,0x0049,"DPx"),
-    DPSDONOX(0x005B,0x18A9,"DPSDonox"),
-    DPSDXOX(0x005C,0x0649,"DPSDxox"),
-    DPSNOAN(0x005D,0x0E29,"DPSnoan"),
-    DPSDNAOX(0x005E,0x1B29,"DPSDnaox"),
-    DPAN(0x005F,0x00E9,"DPan"),
-    PDSXA(0x0060,0x0365,"PDSxa"),
-    DSPDSAOXXN(0x0061,0x16C6,"DSPDSaoxxn"),
-    DSPDOAX(0x0062,0x0786,"DSPDoax"),
-    SDPNOX(0x0063,0x0608,"SDPnox"),
-    SDPSOAX(0x0064,0x0788,"SDPSoax"),
-    DSPNOX(0x0065,0x0606,"DSPnox"),
-    SRCINVERT(0x0066,0x0046,"DSx"),
-    SDPSONOX(0x0067,0x18A8,"SDPSonox"),
-    DSPDSONOXXN(0x0068,0x58A6,"DSPDSonoxxn"),
-    PDSXXN(0x0069,0x0145,"PDSxxn"),
-    DPSAX(0x006A,0x01E9,"DPSax"),
-    PSDPSOAXXN(0x006B,0x178A,"PSDPSoaxxn"),
-    SDPAX(0x006C,0x01E8,"SDPax"),
-    PDSPDOAXXN(0x006D,0x1785,"PDSPDoaxxn"),
-    SDPSNOAX(0x006E,0x1E28,"SDPSnoax"),
-    // PDXNAN(0x006F,0x0C65,"PDXnan"), // invalid combo
-    PDSANA(0x0070,0x0CC5,"PDSana"),
-    SSDXPDXAXN(0x0071,0x1D5C,"SSDxPDxaxn"),
-    SDPSXOX(0x0072,0x0648,"SDPSxox"),
-    SDPNOAN(0x0073,0x0E28,"SDPnoan"),
-    DSPDXOX(0x0074,0x0646,"DSPDxox"),
-    DSPNOAN(0x0075,0x0E26,"DSPnoan"),
-    SDPSNAOX(0x0076,0x1B28,"SDPSnaox"),
-    DSAN(0x0077,0x00E6,"DSan"),
-    PDSAX(0x0078,0x01E5,"PDSax"),
-    DSPDSOAXXN(0x0079,0x1786,"DSPDSoaxxn"),
-    DPSDNOAX(0x007A,0x1E29,"DPSDnoax"),
-    SDPXNAN(0x007B,0x0C68,"SDPxnan"),
-    SPDSNOAX(0x007C,0x1E24,"SPDSnoax"),
-    DPSXNAN(0x007D,0x0C69,"DPSxnan"),
-    SPXDSXO(0x007E,0x0955,"SPxDSxo"),
-    DPSAAN(0x007F,0x03C9,"DPSaan"),
-    DPSAA(0x0080,0x03E9,"DPSaa"),
-    SPXDSXON(0x0081,0x0975,"SPxDSxon"),
-    DPSXNA(0x0082,0x0C49,"DPSxna"),
-    SPDSNOAXN(0x0083,0x1E04,"SPDSnoaxn"),
-    SDPXNA(0x0084,0x0C48,"SDPxna"),
-    PDSPNOAXN(0x0085,0x1E05,"PDSPnoaxn"),
-    DSPDSOAXX(0x0086,0x17A6,"DSPDSoaxx"),
-    PDSAXN(0x0087,0x01C5,"PDSaxn"),
-    SRCAND(0x0088,0x00C6,"DSa"),
-    SDPSNAOXN(0x0089,0x1B08,"SDPSnaoxn"),
-    DSPNOA(0x008A,0x0E06,"DSPnoa"),
-    DSPDXOXN(0x008B,0x0666,"DSPDxoxn"),
-    SDPNOA(0x008C,0x0E08,"SDPnoa"),
-    SDPSXOXN(0x008D,0x0668,"SDPSxoxn"),
-    SSDXPDXAX(0x008E,0x1D7C,"SSDxPDxax"),
-    PDSANAN(0x008F,0x0CE5,"PDSanan"),
-    PDSXNA(0x0090,0x0C45,"PDSxna"),
-    SDPSNOAXN(0x0091,0x1E08,"SDPSnoaxn"),
-    DPSDPOAXX(0x0092,0x17A9,"DPSDPoaxx"),
-    SPDAXN(0x0093,0x01C4,"SPDaxn"),
-    PSDPSOAXX(0x0094,0x17AA,"PSDPSoaxx"),
-    DPSAXN(0x0095,0x01C9,"DPSaxn"),
-    DPSXX(0x0096,0x0169,"DPSxx"),
-    PSDPSONOXX(0x0097,0x588A,"PSDPSonoxx"),
-    SDPSONOXN(0x0098,0x1888,"SDPSonoxn"),
-    DSXN(0x0099,0x0066,"DSxn"),
-    DPSNAX(0x009A,0x0709,"DPSnax"),
-    SDPSOAXN(0x009B,0x07A8,"SDPSoaxn"),
-    SPDNAX(0x009C,0x0704,"SPDnax"),
-    DSPDOAXN(0x009D,0x07A6,"DSPDoaxn"),
-    DSPDSAOXX(0x009E,0x16E6,"DSPDSaoxx"),
-    PDSXAN(0x009F,0x0345,"PDSxan"),
-    DPA(0x00A0,0x00C9,"DPa"),
-    PDSPNAOXN(0x00A1,0x1B05,"PDSPnaoxn"),
-    DPSNOA(0x00A2,0x0E09,"DPSnoa"),
-    DPSDXOXN(0x00A3,0x0669,"DPSDxoxn"),
-    PDSPONOXN(0x00A4,0x1885,"PDSPonoxn"),
-    PDXN(0x00A5,0x0065,"PDxn"),
-    DSPNAX(0x00A6,0x0706,"DSPnax"),
-    PDSPOAXN(0x00A7,0x07A5,"PDSPoaxn"),
-    DPSOA(0x00A8,0x03A9,"DPSoa"),
-    DPSOXN(0x00A9,0x0189,"DPSoxn"),
-    D(0x00AA,0x0029,"D"),
-    DPSONO(0x00AB,0x0889,"DPSono"),
-    SPDSXAX(0x00AC,0x0744,"SPDSxax"),
-    DPSDAOXN(0x00AD,0x06E9,"DPSDaoxn"),
-    DSPNAO(0x00AE,0x0B06,"DSPnao"),
-    DPNO(0x00AF,0x0229,"DPno"),
-    PDSNOA(0x00B0,0x0E05,"PDSnoa"),
-    PDSPXOXN(0x00B1,0x0665,"PDSPxoxn"),
-    SSPXDSXOX(0x00B2,0x1974,"SSPxDSxox"),
-    SDPANAN(0x00B3,0x0CE8,"SDPanan"),
-    PSDNAX(0x00B4,0x070A,"PSDnax"),
-    DPSDOAXN(0x00B5,0x07A9,"DPSDoaxn"),
-    DPSDPAOXX(0x00B6,0x16E9,"DPSDPaoxx"),
-    SDPXAN(0x00B7,0x0348,"SDPxan"),
-    PSDPXAX(0x00B8,0x074A,"PSDPxax"),
-    DSPDAOXN(0x00B9,0x06E6,"DSPDaoxn"),
-    DPSNAO(0x00BA,0x0B09,"DPSnao"),
-    MERGEPAINT(0x00BB,0x0226,"DSno"),
-    SPDSANAX(0x00BC,0x1CE4,"SPDSanax"),
-    SDXPDXAN(0x00BD,0x0D7D,"SDxPDxan"),
-    DPSXO(0x00BE,0x0269,"DPSxo"),
-    DPSANO(0x00BF,0x08C9,"DPSano"),
-    MERGECOPY(0x00C0,0x00CA,"PSa"),
-    SPDSNAOXN(0x00C1,0x1B04,"SPDSnaoxn"),
-    SPDSONOXN(0x00C2,0x1884,"SPDSonoxn"),
-    PSXN(0x00C3,0x006A,"PSxn"),
-    SPDNOA(0x00C4,0x0E04,"SPDnoa"),
-    SPDSXOXN(0x00C5,0x0664,"SPDSxoxn"),
-    SDPNAX(0x00C6,0x0708,"SDPnax"),
-    PSDPOAXN(0x00C7,0x07AA,"PSDPoaxn"),
-    SDPOA(0x00C8,0x03A8,"SDPoa"),
-    SPDOXN(0x00C9,0x0184,"SPDoxn"),
-    DPSDXAX(0x00CA,0x0749,"DPSDxax"),
-    SPDSAOXN(0x00CB,0x06E4,"SPDSaoxn"),
-    SRCCOPY(0x00CC,0x0020,"S"),
-    SDPONO(0x00CD,0x0888,"SDPono"),
-    SDPNAO(0x00CE,0x0B08,"SDPnao"),
-    SPNO(0x00CF,0x0224,"SPno"),
-    PSDNOA(0x00D0,0x0E0A,"PSDnoa"),
-    PSDPXOXN(0x00D1,0x066A,"PSDPxoxn"),
-    PDSNAX(0x00D2,0x0705,"PDSnax"),
-    SPDSOAXN(0x00D3,0x07A4,"SPDSoaxn"),
-    SSPXPDXAX(0x00D4,0x1D78,"SSPxPDxax"),
-    DPSANAN(0x00D5,0x0CE9,"DPSanan"),
-    PSDPSAOXX(0x00D6,0x16EA,"PSDPSaoxx"),
-    DPSXAN(0x00D7,0x0349,"DPSxan"),
-    PDSPXAX(0x00D8,0x0745,"PDSPxax"),
-    SDPSAOXN(0x00D9,0x06E8,"SDPSaoxn"),
-    DPSDANAX(0x00DA,0x1CE9,"DPSDanax"),
-    SPXDSXAN(0x00DB,0x0D75,"SPxDSxan"),
-    SPDNAO(0x00DC,0x0B04,"SPDnao"),
-    SDNO(0x00DD,0x0228,"SDno"),
-    SDPXO(0x00DE,0x0268,"SDPxo"),
-    SDPANO(0x00DF,0x08C8,"SDPano"),
-    PDSOA(0x00E0,0x03A5,"PDSoa"),
-    PDSOXN(0x00E1,0x0185,"PDSoxn"),
-    DSPDXAX(0x00E2,0x0746,"DSPDxax"),
-    PSDPAOXN(0x00E3,0x06EA,"PSDPaoxn"),
-    SDPSXAX(0x00E4,0x0748,"SDPSxax"),
-    PDSPAOXN(0x00E5,0x06E5,"PDSPaoxn"),
-    SDPSANAX(0x00E6,0x1CE8,"SDPSanax"),
-    SPXPDXAN(0x00E7,0x0D79,"SPxPDxan"),
-    SSPXDSXAX(0x00E8,0x1D74,"SSPxDSxax"),
-    DSPDSANAXXN(0x00E9,0x5CE6,"DSPDSanaxxn"),
-    DPSAO(0x00EA,0x02E9,"DPSao"),
-    DPSXNO(0x00EB,0x0849,"DPSxno"),
-    SDPAO(0x00EC,0x02E8,"SDPao"),
-    SDPXNO(0x00ED,0x0848,"SDPxno"),
-    SRCPAINT(0x00EE,0x0086,"DSo"),
-    SDPNOO(0x00EF,0x0A08,"SDPnoo"),
-    PATCOPY(0x00F0,0x0021,"P"),
-    PDSONO(0x00F1,0x0885,"PDSono"),
-    PDSNAO(0x00F2,0x0B05,"PDSnao"),
-    PSNO(0x00F3,0x022A,"PSno"),
-    PSDNAO(0x00F4,0x0B0A,"PSDnao"),
-    PDNO(0x00F5,0x0225,"PDno"),
-    PDSXO(0x00F6,0x0265,"PDSxo"),
-    PDSANO(0x00F7,0x08C5,"PDSano"),
-    PDSAO(0x00F8,0x02E5,"PDSao"),
-    PDSXNO(0x00F9,0x0845,"PDSxno"),
-    DPO(0x00FA,0x0089,"DPo"),
-    PATPAINT(0x00FB,0x0A09,"DPSnoo"),
-    PSO(0x00FC,0x008A,"PSo"),
-    PSDNOO(0x00FD,0x0A0A,"PSDnoo"),
-    DPSOO(0x00FE,0x02A9,"DPSoo"),
-    WHITENESS(0x00FF,0x0062,"1");
-
-    int opIndex;
-    int opCode;
-    String opCmd;
-
-    HwmfTernaryRasterOp(int opIndex, int opCode, String opCmd) {
-        this.opIndex=opIndex;
-        this.opCode=opCode;
-        this.opCmd=opCmd;
-    }
-
-    public static HwmfTernaryRasterOp valueOf(int opIndex) {
-        for (HwmfTernaryRasterOp bb : HwmfTernaryRasterOp.values()) {
-            if (bb.opIndex == opIndex) {
-                return bb;
-            }
-        }
-        return null;
-    }
-
-    public String describeCmd() {
-        String stack[] = new String[10];
-        int stackPnt = 0;
-
-        for (char c : opCmd.toCharArray()) {
-            switch (c) {
-                case 'S':
-                case 'D':
-                case 'P':
-                    stack[stackPnt++] = ""+c;
-                    break;
-                case 'n':
-                    stack[stackPnt-1] = "not("+stack[stackPnt-1]+")";
-                    break;
-                case 'a':
-                    stack[stackPnt-2] = "("+stack[stackPnt-1]+" and "+stack[stackPnt-2]+")";
-                    stackPnt--;
-                    break;
-                case 'o':
-                    stack[stackPnt-2] = "("+stack[stackPnt-1]+" or "+stack[stackPnt-2]+")";
-                    stackPnt--;
-                    break;
-                case 'x':
-                    stack[stackPnt-2] = "("+stack[stackPnt-1]+" xor "+stack[stackPnt-2]+")";
-                    stackPnt--;
-                    break;
-                case '1':
-                    stack[stackPnt++] = "all white";
-                    break;
-                case '0':
-                    stack[stackPnt++] = "all black";
-                    break;
-                default:
-                    throw new RuntimeException("unknown cmd '"+c+"'.");
-            }
-        }
-
-        return stack[--stackPnt];
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java
deleted file mode 100644
index 03ebc35..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.poi.hwmf.draw.HwmfDrawProperties;
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.hwmf.record.HwmfMisc.WmfSetMapMode;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-public class HwmfText {
-    private static final POILogger logger = POILogFactory.getLogger(HwmfText.class);
-    
-    /**
-     * The META_SETTEXTCHAREXTRA record defines inter-character spacing for text justification in the 
-     * playback device context. Spacing is added to the white space between each character, including
-     * break characters, when a line of justified text is output.
-     */
-    public static class WmfSetTextCharExtra implements HwmfRecord {
-        
-        /**
-         * A 16-bit unsigned integer that defines the amount of extra space, in
-         * logical units, to be added to each character. If the current mapping mode is not MM_TEXT,
-         * this value is transformed and rounded to the nearest pixel. For details about setting the
-         * mapping mode, see META_SETMAPMODE
-         */
-        private int charExtra;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setTextCharExtra;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            charExtra = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-    
-    /**
-     * The META_SETTEXTCOLOR record defines the text foreground color in the playback device context.
-     */
-    public static class WmfSetTextColor implements HwmfRecord {
-        
-        private HwmfColorRef colorRef;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setTextColor;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            colorRef = new HwmfColorRef();
-            return colorRef.init(leis);
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setTextColor(colorRef);
-        }
-    }
-    
-    /**
-     * The META_SETTEXTJUSTIFICATION record defines the amount of space to add to break characters
-     * in a string of justified text.
-     */
-    public static class WmfSetTextJustification implements HwmfRecord {
-        
-        /**
-         * A 16-bit unsigned integer that specifies the number of space characters in the line.
-         */
-        private int breakCount;
-        
-        /**
-         * A 16-bit unsigned integer that specifies the total extra space, in logical
-         * units, to be added to the line of text. If the current mapping mode is not MM_TEXT, the value
-         * identified by the BreakExtra member is transformed and rounded to the nearest pixel. For
-         * details about setting the mapping mode, see {@link WmfSetMapMode}.
-         */
-        private int breakExtra;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setBkColor;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            breakCount = leis.readUShort();
-            breakExtra = leis.readUShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-    
-    /**
-     * The META_TEXTOUT record outputs a character string at the specified location by using the font,
-     * background color, and text color that are defined in the playback device context.
-     */
-    public static class WmfTextOut implements HwmfRecord {
-        /**
-         * A 16-bit signed integer that defines the length of the string, in bytes, pointed to by String.
-         */
-        private int stringLength;
-        /**
-         * The size of this field MUST be a multiple of two. If StringLength is an odd
-         * number, then this field MUST be of a size greater than or equal to StringLength + 1.
-         * A variable-length string that specifies the text to be drawn.
-         * The string does not need to be null-terminated, because StringLength specifies the
-         * length of the string.
-         * The string is written at the location specified by the XStart and YStart fields.
-         */
-        private String text;
-        /**
-         * A 16-bit signed integer that defines the vertical (y-axis) coordinate, in logical
-         * units, of the point where drawing is to start.
-         */
-        private int yStart;
-        /**
-         * A 16-bit signed integer that defines the horizontal (x-axis) coordinate, in
-         * logical units, of the point where drawing is to start.
-         */
-        private int xStart;  
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.textOut;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            stringLength = leis.readShort();
-            byte buf[] = new byte[stringLength+(stringLength&1)];
-            leis.readFully(buf);
-            text = new String(buf, 0, stringLength, LocaleUtil.CHARSET_1252).trim();
-            yStart = leis.readShort();
-            xStart = leis.readShort();
-            return 3*LittleEndianConsts.SHORT_SIZE+buf.length;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Rectangle2D bounds = new Rectangle2D.Double(xStart, yStart, 0, 0);
-            ctx.drawString(text, bounds);
-        }
-    }
-    
-    /**
-     * The META_EXTTEXTOUT record outputs text by using the font, background color, and text color that
-     * are defined in the playback device context. Optionally, dimensions can be provided for clipping,
-     * opaquing, or both.
-     */
-    public static class WmfExtTextOut implements HwmfRecord {
-
-        /**
-         * Indicates that the background color that is defined in the playback device context 
-         * SHOULD be used to fill the rectangle.
-         */ 
-        private static final BitField ETO_OPAQUE = BitFieldFactory.getInstance(0x0002);
-        
-        /**
-         * Indicates that the text SHOULD be clipped to the rectangle.
-         */
-        private static final BitField ETO_CLIPPED = BitFieldFactory.getInstance(0x0004);
-
-        /**
-         * Indicates that the string to be output SHOULD NOT require further processing 
-         * with respect to the placement of the characters, and an array of character 
-         * placement values SHOULD be provided. This character placement process is 
-         * useful for fonts in which diacritical characters affect character spacing.
-         */
-        private static final BitField ETO_GLYPH_INDEX = BitFieldFactory.getInstance(0x0010);
-
-        /**
-         * Indicates that the text MUST be laid out in right-to-left reading order, instead of 
-         * the default left-to-right order. This SHOULD be applied only when the font that is 
-         * defined in the playback device context is either Hebrew or Arabic.
-         */
-        private static final BitField ETO_RTLREADING = BitFieldFactory.getInstance(0x0080);
-
-        /**
-         * Indicates that to display numbers, digits appropriate to the locale SHOULD be used.
-         */
-        private static final BitField ETO_NUMERICSLOCAL = BitFieldFactory.getInstance(0x0400);
-
-        /**
-         * Indicates that to display numbers, European digits SHOULD be used.
-         */
-        private static final BitField ETO_NUMERICSLATIN = BitFieldFactory.getInstance(0x0800);
-
-        /**
-         * Indicates that both horizontal and vertical character displacement values 
-         * SHOULD be provided.
-         */
-        private static final BitField ETO_PDY = BitFieldFactory.getInstance(0x2000);
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, where the 
-        text string is to be located.
-         */
-        private int y;  
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, where the 
-        text string is to be located.
-         */
-        private int x;  
-        /**
-         * A 16-bit signed integer that defines the length of the string.
-         */
-        private int stringLength;
-
-         /**
-          * A 16-bit unsigned integer that defines the use of the application-defined 
-          * rectangle. This member can be a combination of one or more values in the 
-          * ExtTextOutOptions Flags (ETO_*)
-          */
-        private int fwOpts;
-        /**
-         * An optional 8-byte Rect Object (section 2.2.2.18) that defines the 
-         * dimensions, in logical coordinates, of a rectangle that is used for clipping, opaquing, or both.
-         * 
-         * The corners are given in the order left, top, right, bottom.
-         * Each value is a 16-bit signed integer that defines the coordinate, in logical coordinates, of 
-         * the upper-left corner of the rectangle
-         */
-        private int left,top,right,bottom;
-        /**
-         * A variable-length string that specifies the text to be drawn. The string does 
-         * not need to be null-terminated, because StringLength specifies the length of the string. If 
-         * the length is odd, an extra byte is placed after it so that the following member (optional Dx) is 
-         * aligned on a 16-bit boundary.
-         */
-        private String text;
-        /**
-         * An optional array of 16-bit signed integers that indicate the distance between 
-         * origins of adjacent character cells. For example, Dx[i] logical units separate the origins of 
-         * character cell i and character cell i + 1. If this field is present, there MUST be the same 
-         * number of values as there are characters in the string.
-         */
-        private int dx[];
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.extTextOut;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            // -6 bytes of record function and length header
-            final int remainingRecordSize = (int)(recordSize-6);
-            
-            y = leis.readShort();
-            x = leis.readShort();
-            stringLength = leis.readShort();
-            fwOpts = leis.readUShort();
-            
-            int size = 4*LittleEndianConsts.SHORT_SIZE;
-            
-            // Check if we have a rectangle
-            if ((ETO_OPAQUE.isSet(fwOpts) || ETO_CLIPPED.isSet(fwOpts)) && size+8<=remainingRecordSize) {
-                // the bounding rectangle is optional and only read when fwOpts are given
-                left = leis.readShort();
-                top = leis.readShort();
-                right = leis.readShort();
-                bottom = leis.readShort();
-                size += 4*LittleEndianConsts.SHORT_SIZE;
-            }
-            
-            byte buf[] = new byte[stringLength+(stringLength&1)];
-            leis.readFully(buf);
-            text = new String(buf, 0, stringLength, LocaleUtil.CHARSET_1252);
-            size += buf.length;
-            
-            if (size >= remainingRecordSize) {
-                logger.log(POILogger.INFO, "META_EXTTEXTOUT doesn't contain character tracking info");
-                return size;
-            }
-            
-            int dxLen = Math.min(stringLength, (remainingRecordSize-size)/LittleEndianConsts.SHORT_SIZE);
-            if (dxLen < stringLength) {
-                logger.log(POILogger.WARN, "META_EXTTEXTOUT tracking info doesn't cover all characters");
-            }
-
-            dx = new int[stringLength]; 
-            for (int i=0; i<dxLen; i++) {
-                dx[i] = leis.readShort();
-                size += LittleEndianConsts.SHORT_SIZE;
-            }
-            
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Rectangle2D bounds = new Rectangle2D.Double(x, y, 0, 0);
-            ctx.drawString(text, bounds, dx);
-        }
-    }
-    
-    public enum HwmfTextAlignment {
-        LEFT,
-        RIGHT,
-        CENTER
-    }
-    
-    public enum HwmfTextVerticalAlignment {
-        TOP,
-        BOTTOM,
-        BASELINE
-    }
-    
-    /**
-     * The META_SETTEXTALIGN record defines text-alignment values in the playback device context.
-     */
-    public static class WmfSetTextAlign implements HwmfRecord {
-        
-        // ***********************************************************************************
-        // TextAlignmentMode Flags:
-        // ***********************************************************************************
-        
-        /** 
-         * The drawing position in the playback device context MUST NOT be updated after each
-         * text output call. The reference point MUST be passed to the text output function.
-         */
-        @SuppressWarnings("unused")
-        private static final BitField TA_NOUPDATECP = BitFieldFactory.getInstance(0x0000);
-        
-        /**
-         * The reference point MUST be on the left edge of the bounding rectangle.
-         */
-        @SuppressWarnings("unused")
-        private static final BitField TA_LEFT = BitFieldFactory.getInstance(0x0000);
-        
-        /**
-         * The reference point MUST be on the top edge of the bounding rectangle.
-         */
-        @SuppressWarnings("unused")
-        private static final BitField TA_TOP = BitFieldFactory.getInstance(0x0000);
-        
-        /**
-         * The drawing position in the playback device context MUST be updated after each text
-         * output call. It MUST be used as the reference point.
-         */
-        @SuppressWarnings("unused")
-        private static final BitField TA_UPDATECP = BitFieldFactory.getInstance(0x0001);
-        
-        /**
-         * The reference point MUST be on the right edge of the bounding rectangle.
-         */
-        private static final BitField TA_RIGHT = BitFieldFactory.getInstance(0x0002);
-        
-        /**
-         * The reference point MUST be aligned horizontally with the center of the bounding
-         * rectangle.
-         */
-        private static final BitField TA_CENTER = BitFieldFactory.getInstance(0x0006);
-        
-        /**
-         * The reference point MUST be on the bottom edge of the bounding rectangle.
-         */
-        private static final BitField TA_BOTTOM = BitFieldFactory.getInstance(0x0008);
-        
-        /**
-         * The reference point MUST be on the baseline of the text.
-         */
-        private static final BitField TA_BASELINE = BitFieldFactory.getInstance(0x0018);
-        
-        /**
-         * The text MUST be laid out in right-to-left reading order, instead of the default
-         * left-to-right order. This SHOULD be applied only when the font that is defined in the
-         * playback device context is either Hebrew or Arabic.
-         */
-        @SuppressWarnings("unused")
-        private static final BitField TA_RTLREADING = BitFieldFactory.getInstance(0x0100);
-        
-        // ***********************************************************************************
-        // VerticalTextAlignmentMode Flags (e.g. for Kanji fonts)
-        // ***********************************************************************************
-        
-        /**
-         * The reference point MUST be on the top edge of the bounding rectangle.
-         */
-        @SuppressWarnings("unused")
-        private static final BitField VTA_TOP = BitFieldFactory.getInstance(0x0000);
-        
-        /**
-         * The reference point MUST be on the right edge of the bounding rectangle.
-         */
-        @SuppressWarnings("unused")
-        private static final BitField VTA_RIGHT = BitFieldFactory.getInstance(0x0000);
-        
-        /**
-         * The reference point MUST be on the bottom edge of the bounding rectangle.
-         */
-        private static final BitField VTA_BOTTOM = BitFieldFactory.getInstance(0x0002);
-        
-        /**
-         * The reference point MUST be aligned vertically with the center of the bounding
-         * rectangle.
-         */
-        private static final BitField VTA_CENTER = BitFieldFactory.getInstance(0x0006);
-        
-        /**
-         * The reference point MUST be on the left edge of the bounding rectangle.
-         */
-        private static final BitField VTA_LEFT = BitFieldFactory.getInstance(0x0008);
-        
-        /**
-         * The reference point MUST be on the baseline of the text.
-         */
-        private static final BitField VTA_BASELINE = BitFieldFactory.getInstance(0x0018);
-        
-        /**
-         * A 16-bit unsigned integer that defines text alignment.
-         * This value MUST be a combination of one or more TextAlignmentMode Flags
-         * for text with a horizontal baseline, and VerticalTextAlignmentMode Flags
-         * for text with a vertical baseline.
-         */
-        private int textAlignmentMode;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setTextAlign;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            textAlignmentMode = leis.readUShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            HwmfDrawProperties props = ctx.getProperties();
-            if (TA_CENTER.isSet(textAlignmentMode)) {
-                props.setTextAlignLatin(HwmfTextAlignment.CENTER);
-            } else if (TA_RIGHT.isSet(textAlignmentMode)) {
-                props.setTextAlignLatin(HwmfTextAlignment.RIGHT);
-            } else {
-                props.setTextAlignLatin(HwmfTextAlignment.LEFT);
-            }
-
-            if (VTA_CENTER.isSet(textAlignmentMode)) {
-                props.setTextAlignAsian(HwmfTextAlignment.CENTER);
-            } else if (VTA_LEFT.isSet(textAlignmentMode)) {
-                props.setTextAlignAsian(HwmfTextAlignment.LEFT);
-            } else {
-                props.setTextAlignAsian(HwmfTextAlignment.RIGHT);
-            }
-
-            if (TA_BASELINE.isSet(textAlignmentMode)) {
-                props.setTextVAlignLatin(HwmfTextVerticalAlignment.BASELINE);
-            } else if (TA_BOTTOM.isSet(textAlignmentMode)) {
-                props.setTextVAlignLatin(HwmfTextVerticalAlignment.BOTTOM);
-            } else {
-                props.setTextVAlignLatin(HwmfTextVerticalAlignment.TOP);
-            }
-
-            if (VTA_BASELINE.isSet(textAlignmentMode)) {
-                props.setTextVAlignAsian(HwmfTextVerticalAlignment.BASELINE);
-            } else if (VTA_BOTTOM.isSet(textAlignmentMode)) {
-                props.setTextVAlignAsian(HwmfTextVerticalAlignment.BOTTOM);
-            } else {
-                props.setTextVAlignAsian(HwmfTextVerticalAlignment.TOP);
-            }
-        }
-    }
-    
-    public static class WmfCreateFontIndirect implements HwmfRecord, HwmfObjectTableEntry {
-        private HwmfFont font;
-        
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.createFontIndirect;
-        }
-        
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            font = new HwmfFont();
-            return font.init(leis);
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            ctx.getProperties().setFont(font);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java
deleted file mode 100644
index 0455d16..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java
+++ /dev/null
@@ -1,710 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.record;
-
-import java.awt.Shape;
-import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInputStream;
-
-public class HwmfWindowing {
-
-    /**
-     * The META_SETVIEWPORTORG record defines the viewport origin in the playback device context.
-     */
-    public static class WmfSetViewportOrg implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the vertical offset, in device units.
-         */
-        private int y;
-
-        /**
-         * A 16-bit signed integer that defines the horizontal offset, in device units.
-         */
-        private int x;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setViewportOrg;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            y = leis.readShort();
-            x = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setViewportOrg(x, y);
-        }
-    }
-
-    /**
-     * The META_SETVIEWPORTEXT record sets the horizontal and vertical extents
-     * of the viewport in the playback device context.
-     */
-    public static class WmfSetViewportExt implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the vertical extent
-         * of the viewport in device units.
-         */
-        private int height;
-
-        /**
-         * A 16-bit signed integer that defines the horizontal extent
-         * of the viewport in device units.
-         */
-        private int width;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setViewportExt;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            height = leis.readShort();
-            width = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setViewportExt(width, height);
-        }
-    }
-
-    /**
-     * The META_OFFSETVIEWPORTORG record moves the viewport origin in the playback device context
-     * by specified horizontal and vertical offsets.
-     */
-    public static class WmfOffsetViewportOrg implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the vertical offset, in device units.
-         */
-        private int yOffset;
-
-        /**
-         * A 16-bit signed integer that defines the horizontal offset, in device units.
-         */
-        private int xOffset;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.offsetViewportOrg;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            yOffset = leis.readShort();
-            xOffset = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Rectangle2D viewport = ctx.getProperties().getViewport();
-            double x = (viewport == null) ? 0 : viewport.getX();
-            double y = (viewport == null) ? 0 : viewport.getY();
-            ctx.getProperties().setViewportOrg(x+xOffset, y+yOffset);
-        }
-    }
-
-    /**
-     * The META_SETWINDOWORG record defines the output window origin in the playback device context.
-     */
-    public static class WmfSetWindowOrg implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units.
-         */
-        private int y;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units.
-         */
-        private int x;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setWindowOrg;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            y = leis.readShort();
-            x = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setWindowOrg(x, y);
-            ctx.updateWindowMapMode();
-        }
-
-        public int getY() {
-            return y;
-        }
-
-        public int getX() {
-            return x;
-        }
-    }
-
-    /**
-     * The META_SETWINDOWEXT record defines the horizontal and vertical extents
-     * of the output window in the playback device context.
-     */
-    public static class WmfSetWindowExt implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the vertical extent of
-         * the window in logical units.
-         */
-        private int height;
-
-        /**
-         * A 16-bit signed integer that defines the horizontal extent of
-         * the window in logical units.
-         */
-        private int width;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.setWindowExt;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            height = leis.readShort();
-            width = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.getProperties().setWindowExt(width, height);
-            ctx.updateWindowMapMode();
-        }
-
-        public int getHeight() {
-            return height;
-        }
-
-        public int getWidth() {
-            return width;
-        }
-    }
-
-    /**
-     * The META_OFFSETWINDOWORG record moves the output window origin in the
-     * playback device context by specified horizontal and vertical offsets.
-     */
-    public static class WmfOffsetWindowOrg implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the vertical offset, in device units.
-         */
-        private int yOffset;
-
-        /**
-         * A 16-bit signed integer that defines the horizontal offset, in device units.
-         */
-        private int xOffset;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.offsetWindowOrg;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            yOffset = leis.readShort();
-            xOffset = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Rectangle2D window = ctx.getProperties().getWindow();
-            ctx.getProperties().setWindowOrg(window.getX()+xOffset, window.getY()+yOffset);
-            ctx.updateWindowMapMode();
-        }
-    }
-
-    /**
-     * The META_OFFSETWINDOWORG record moves the output window origin in the
-     * playback device context by specified horizontal and vertical offsets.
-     */
-    public static class WmfScaleWindowExt implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to divide the
-         * result of multiplying the current y-extent by the value of the yNum member.
-         */
-        private int yDenom;
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to multiply the
-         * current y-extent.
-         */
-        private int yNum;
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to divide the
-         * result of multiplying the current x-extent by the value of the xNum member.
-         */
-        private int xDenom;
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to multiply the
-         * current x-extent.
-         */
-        private int xNum;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.scaleWindowExt;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            yDenom = leis.readShort();
-            yNum = leis.readShort();
-            xDenom = leis.readShort();
-            xNum = leis.readShort();
-            return 4*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Rectangle2D window = ctx.getProperties().getWindow();
-            double width = window.getWidth() * xNum / xDenom;
-            double height = window.getHeight() * yNum / yDenom;
-            ctx.getProperties().setWindowExt(width, height);
-            ctx.updateWindowMapMode();
-        }
-    }
-
-
-    /**
-     * The META_SCALEVIEWPORTEXT record scales the horizontal and vertical extents of the viewport
-     * that is defined in the playback device context by using the ratios formed by the specified
-     * multiplicands and divisors.
-     */
-    public static class WmfScaleViewportExt implements HwmfRecord {
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to divide the
-         * result of multiplying the current y-extent by the value of the yNum member.
-         */
-        private int yDenom;
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to multiply the
-         * current y-extent.
-         */
-        private int yNum;
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to divide the
-         * result of multiplying the current x-extent by the value of the xNum member.
-         */
-        private int xDenom;
-
-        /**
-         * A 16-bit signed integer that defines the amount by which to multiply the
-         * current x-extent.
-         */
-        private int xNum;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.scaleViewportExt;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            yDenom = leis.readShort();
-            yNum = leis.readShort();
-            xDenom = leis.readShort();
-            xNum = leis.readShort();
-            return 4*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            Rectangle2D viewport = ctx.getProperties().getViewport();
-            if (viewport == null) {
-                viewport = ctx.getProperties().getWindow();
-            }
-            double width = viewport.getWidth() * xNum / xDenom;
-            double height = viewport.getHeight() * yNum / yDenom;
-            ctx.getProperties().setViewportExt(width, height);
-        }
-    }
-
-    /**
-     * The META_OFFSETCLIPRGN record moves the clipping region in the playback device context by the
-     * specified offsets.
-     */
-    public static class WmfOffsetClipRgn implements HwmfRecord, HwmfObjectTableEntry {
-
-        /**
-         * A 16-bit signed integer that defines the number of logical units to move up or down.
-         */
-        private int yOffset;
-
-        /**
-         * A 16-bit signed integer that defines the number of logical units to move left or right.
-         */
-        private int xOffset;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.offsetClipRgn;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            yOffset = leis.readShort();
-            xOffset = leis.readShort();
-            return 2*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-        }
-    }
-
-    /**
-     * The META_EXCLUDECLIPRECT record sets the clipping region in the playback device context to the
-     * existing clipping region minus the specified rectangle.
-     */
-    public static class WmfExcludeClipRect implements HwmfRecord, HwmfObjectTableEntry {
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * lower-right corner of the rectangle.
-         */
-        private int bottom;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * lower-right corner of the rectangle.
-         */
-        private int right;
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int top;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int left;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.excludeClipRect;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            bottom = leis.readShort();
-            right = leis.readShort();
-            top = leis.readShort();
-            left = leis.readShort();
-            return 4*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-        }
-    }
-
-
-    /**
-     * The META_INTERSECTCLIPRECT record sets the clipping region in the playback device context to the
-     * intersection of the existing clipping region and the specified rectangle.
-     */
-    public static class WmfIntersectClipRect implements HwmfRecord, HwmfObjectTableEntry {
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * lower-right corner of the rectangle.
-         */
-        private int bottom;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * lower-right corner of the rectangle.
-         */
-        private int right;
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int top;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int left;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.intersectClipRect;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            bottom = leis.readShort();
-            right = leis.readShort();
-            top = leis.readShort();
-            left = leis.readShort();
-            return 4*LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-        }
-    }
-
-    /**
-     * The META_SELECTCLIPREGION record specifies a Region Object to be the current clipping region.
-     */
-    public static class WmfSelectClipRegion implements HwmfRecord {
-
-        /**
-         * A 16-bit unsigned integer used to index into the WMF Object Table to get
-         * the region to be clipped.
-         */
-        private int region;
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.selectClipRegion;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            region = leis.readShort();
-            return LittleEndianConsts.SHORT_SIZE;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-
-        }
-    }
-
-    public static class WmfScanObject {
-        /**
-         * A 16-bit unsigned integer that specifies the number of horizontal (x-axis)
-         * coordinates in the ScanLines array. This value MUST be a multiple of 2, since left and right
-         * endpoints are required to specify each scanline.
-         */
-        private int count;
-        /**
-         * A 16-bit unsigned integer that defines the vertical (y-axis) coordinate, in logical units, of the top scanline.
-         */
-        private int top;
-        /**
-         * A 16-bit unsigned integer that defines the vertical (y-axis) coordinate, in logical units, of the bottom scanline.
-         */
-        private int bottom;
-        /**
-         * A 16-bit unsigned integer that defines the horizontal (x-axis) coordinate,
-         * in logical units, of the left endpoint of the scanline.
-         */
-        private int left_scanline[];
-        /**
-         * A 16-bit unsigned integer that defines the horizontal (x-axis) coordinate,
-         * in logical units, of the right endpoint of the scanline.
-         */
-        private int right_scanline[];
-        /**
-         * A 16-bit unsigned integer that MUST be the same as the value of the Count
-         * field; it is present to allow upward travel in the structure.
-         */
-        private int count2;
-
-        public int init(LittleEndianInputStream leis) {
-            count = leis.readUShort();
-            top = leis.readUShort();
-            bottom = leis.readUShort();
-            int size = 3*LittleEndianConsts.SHORT_SIZE;
-            left_scanline = new int[count/2];
-            right_scanline = new int[count/2];
-            for (int i=0; i<count/2; i++) {
-                left_scanline[i] = leis.readUShort();
-                right_scanline[i] = leis.readUShort();
-                size += 2*LittleEndianConsts.SHORT_SIZE;
-            }
-            count2 = leis.readUShort();
-            size += LittleEndianConsts.SHORT_SIZE;
-            return size;
-        }
-    }
-
-    public static class WmfCreateRegion implements HwmfRecord, HwmfObjectTableEntry {
-        /**
-         * A 16-bit signed integer. A value that MUST be ignored.
-         */
-        private int nextInChain;
-        /**
-         * A 16-bit signed integer that specifies the region identifier. It MUST be 0x0006.
-         */
-        private int objectType;
-        /**
-         * A 32-bit unsigned integer. A value that MUST be ignored.
-         */
-        private int objectCount;
-        /**
-         * A 16-bit signed integer that defines the size of the region in bytes plus the size of aScans in bytes.
-         */
-        private int regionSize;
-        /**
-         * A 16-bit signed integer that defines the number of scanlines composing the region.
-         */
-        private int scanCount;
-
-        /**
-         * A 16-bit signed integer that defines the maximum number of points in any one scan in this region.
-         */
-        private int maxScan;
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * lower-right corner of the rectangle.
-         */
-        private int bottom;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * lower-right corner of the rectangle.
-         */
-        private int right;
-
-        /**
-         * A 16-bit signed integer that defines the y-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int top;
-
-        /**
-         * A 16-bit signed integer that defines the x-coordinate, in logical units, of the
-         * upper-left corner of the rectangle.
-         */
-        private int left;
-
-        /**
-         * An array of Scan objects that define the scanlines in the region.
-         */
-        private WmfScanObject scanObjects[];
-
-        @Override
-        public HwmfRecordType getRecordType() {
-            return HwmfRecordType.createRegion;
-        }
-
-        @Override
-        public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
-            nextInChain = leis.readShort();
-            objectType = leis.readShort();
-            objectCount = leis.readInt();
-            regionSize = leis.readShort();
-            scanCount = leis.readShort();
-            maxScan = leis.readShort();
-            left = leis.readShort();
-            top = leis.readShort();
-            right = leis.readShort();
-            bottom = leis.readShort();
-            
-            int size = 9*LittleEndianConsts.SHORT_SIZE+LittleEndianConsts.INT_SIZE;
-
-            scanObjects = new WmfScanObject[scanCount];
-            for (int i=0; i<scanCount; i++) {
-                size += (scanObjects[i] = new WmfScanObject()).init(leis);
-            }
-
-            return size;
-        }
-
-        @Override
-        public void draw(HwmfGraphics ctx) {
-            ctx.addObjectTableEntry(this);
-        }
-        
-        @Override
-        public void applyObject(HwmfGraphics ctx) {
-            Rectangle2D lastRect = null;
-            Area scanLines = new Area();
-            int count = 0;
-            for (WmfScanObject so : scanObjects) {
-                int y = Math.min(so.top, so.bottom);
-                int h = Math.abs(so.top - so.bottom - 1);
-                for (int i=0; i<so.count/2; i++) {
-                    int x = Math.min(so.left_scanline[i], so.right_scanline[i]);
-                    int w = Math.abs(so.right_scanline[i] - so.left_scanline[i] - 1);
-                    lastRect = new Rectangle2D.Double(x,y,w,h);
-                    scanLines.add(new Area(lastRect));
-                    count++;
-                }
-            }
-            
-            Shape region = null;
-            if (count > 0) {
-                region = (count == 1) ? lastRect : scanLines;
-            }
-
-            ctx.getProperties().setRegion(region);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
deleted file mode 100644
index 5b7601f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf.usermodel;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hwmf.draw.HwmfGraphics;
-import org.apache.poi.hwmf.record.HwmfHeader;
-import org.apache.poi.hwmf.record.HwmfPlaceableHeader;
-import org.apache.poi.hwmf.record.HwmfRecord;
-import org.apache.poi.hwmf.record.HwmfRecordType;
-import org.apache.poi.hwmf.record.HwmfWindowing.WmfSetWindowExt;
-import org.apache.poi.hwmf.record.HwmfWindowing.WmfSetWindowOrg;
-import org.apache.poi.util.LittleEndianInputStream;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Units;
-
-public class HwmfPicture {
-    private static final POILogger logger = POILogFactory.getLogger(HwmfPicture.class);
-    
-    final List<HwmfRecord> records = new ArrayList<HwmfRecord>();
-    final HwmfPlaceableHeader placeableHeader;
-    final HwmfHeader header;
-    
-    public HwmfPicture(InputStream inputStream) throws IOException {
-        BufferedInputStream bis = new BufferedInputStream(inputStream, 10000);
-        LittleEndianInputStream leis = new LittleEndianInputStream(bis);
-        placeableHeader = HwmfPlaceableHeader.readHeader(leis);
-        header = new HwmfHeader(leis);
-        
-        for (;;) {
-            if (leis.available() < 6) {
-                logger.log(POILogger.ERROR, "unexpected eof - wmf file was truncated");
-                break;
-            }
-            // recordSize in DWORDs
-            long recordSize = leis.readUInt()*2;
-            int recordFunction = leis.readShort();
-            // 4 bytes (recordSize) + 2 bytes (recordFunction)
-            int consumedSize = 6;
-            HwmfRecordType wrt = HwmfRecordType.getById(recordFunction);
-            if (wrt == null) {
-                throw new IOException("unexpected record type: "+recordFunction);
-            }
-            if (wrt == HwmfRecordType.eof) break;
-            if (wrt.clazz == null) {
-                throw new IOException("unsupported record type: "+recordFunction);
-            }
-            
-            HwmfRecord wr;
-            try {
-                wr = wrt.clazz.newInstance();
-                records.add(wr);
-            } catch (Exception e) {
-                throw (IOException)new IOException("can't create wmf record").initCause(e);
-            }
-            
-            consumedSize += wr.init(leis, recordSize, recordFunction);
-            int remainingSize = (int)(recordSize - consumedSize);
-            assert(remainingSize >= 0);
-            if (remainingSize > 0) {
-            	// skip size in loops, because not always all bytes are skipped in one call 
-                for (int i=remainingSize; i>0; i-=leis.skip(i));
-            }
-        }
-    }
-
-    public List<HwmfRecord> getRecords() {
-        return Collections.unmodifiableList(records);
-    }
-
-    public void draw(Graphics2D ctx) {
-        Dimension dim = getSize();
-        int width = Units.pointsToPixel(dim.getWidth());
-        // keep aspect ratio for height
-        int height = Units.pointsToPixel(dim.getHeight());
-        Rectangle2D bounds = new Rectangle2D.Double(0,0,width,height);
-        draw(ctx, bounds);
-    }
-    
-    public void draw(Graphics2D ctx, Rectangle2D graphicsBounds) {
-        AffineTransform at = ctx.getTransform();
-        try {
-            Rectangle2D wmfBounds = getBounds();
-            // scale output bounds to image bounds
-            ctx.translate(graphicsBounds.getX(), graphicsBounds.getY());
-            ctx.scale(graphicsBounds.getWidth()/wmfBounds.getWidth(), graphicsBounds.getHeight()/wmfBounds.getHeight());
-            
-            HwmfGraphics g = new HwmfGraphics(ctx, wmfBounds);
-            for (HwmfRecord r : records) {
-                r.draw(g);
-            }
-        } finally {
-            ctx.setTransform(at);
-        }
-    }
-
-    /**
-     * Returns the bounding box in device-independent units. Usually this is taken from the placeable header.
-     * 
-     * @return the bounding box
-     */
-    public Rectangle2D getBounds() {
-        if (placeableHeader != null) {
-            return placeableHeader.getBounds();
-        } else {
-            WmfSetWindowOrg wOrg = null;
-            WmfSetWindowExt wExt = null;
-            for (HwmfRecord r : getRecords()) {
-                if (wOrg != null && wExt != null) {
-                    break;
-                }
-                if (r instanceof WmfSetWindowOrg) {
-                    wOrg = (WmfSetWindowOrg)r;
-                } else if (r instanceof WmfSetWindowExt) {
-                    wExt = (WmfSetWindowExt)r;
-                }
-            }
-            if (wOrg == null || wExt == null) {
-                throw new RuntimeException("invalid wmf file - window records are incomplete.");
-            }
-            return new Rectangle2D.Double(wOrg.getX(), wOrg.getY(), wExt.getWidth(), wExt.getHeight());
-        }        
-    }
-    
-    public HwmfPlaceableHeader getPlaceableHeader() {
-        return placeableHeader;
-    }
-
-    public HwmfHeader getHeader() {
-        return header;
-    }
-    
-    /**
-     * Return the image size in points
-     *
-     * @return the image size in points
-     */
-    public Dimension getSize() {
-        double inch = (placeableHeader == null) ? 1440 : placeableHeader.getUnitsPerInch();
-        Rectangle2D bounds = getBounds();
-        
-        //coefficient to translate from WMF dpi to 72dpi
-        double coeff = Units.POINT_DPI/inch;
-        return new Dimension((int)Math.round(bounds.getWidth()*coeff), (int)Math.round(bounds.getHeight()*coeff));
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
deleted file mode 100644
index ce9d58f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ /dev/null
@@ -1,1020 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hwpf.model.*;
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.hwpf.usermodel.Bookmarks;
-import org.apache.poi.hwpf.usermodel.BookmarksImpl;
-import org.apache.poi.hwpf.usermodel.Field;
-import org.apache.poi.hwpf.usermodel.Fields;
-import org.apache.poi.hwpf.usermodel.FieldsImpl;
-import org.apache.poi.hwpf.usermodel.HWPFList;
-import org.apache.poi.hwpf.usermodel.Notes;
-import org.apache.poi.hwpf.usermodel.NotesImpl;
-import org.apache.poi.hwpf.usermodel.OfficeDrawings;
-import org.apache.poi.hwpf.usermodel.OfficeDrawingsImpl;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.EntryUtils;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-
-/**
- *
- * This class acts as the bucket that we throw all of the Word data structures
- * into.
- */
-public final class HWPFDocument extends HWPFDocumentCore {
-    /*package*/ static final String PROPERTY_PRESERVE_BIN_TABLES = "org.apache.poi.hwpf.preserveBinTables";
-    private static final String PROPERTY_PRESERVE_TEXT_TABLE = "org.apache.poi.hwpf.preserveTextTable";
-
-    private static final String STREAM_DATA = "Data";
-    private static final String STREAM_TABLE_0 = "0Table";
-    private static final String STREAM_TABLE_1 = "1Table";
-
-    /** table stream buffer*/
-    protected byte[] _tableStream;
-
-    /** data stream buffer*/
-    protected byte[] _dataStream;
-
-    /** Document wide Properties*/
-    protected DocumentProperties _dop;
-
-    /** Contains text of the document wrapped in a obfuscated Word data
-     * structure*/
-    protected ComplexFileTable _cft;
-
-    /** Contains text buffer linked directly to single-piece document text piece */
-    protected StringBuilder _text;
-
-    /** Holds the save history for this document. */
-    protected SavedByTable _sbt;
-
-    /** Holds the revision mark authors for this document. */
-    protected RevisionMarkAuthorTable _rmat;
-
-    /** Holds FSBA (shape) information */
-    private FSPATable _fspaHeaders;
-
-    /** Holds FSBA (shape) information */
-    private FSPATable _fspaMain;
-
-    /** Escher Drawing Group information */
-    protected EscherRecordHolder _escherRecordHolder;
-
-    /** Holds pictures table */
-    protected PicturesTable _pictures;
-
-    /** Holds Office Art objects */
-    protected OfficeDrawingsImpl _officeDrawingsHeaders;
-
-    /** Holds Office Art objects */
-    protected OfficeDrawingsImpl _officeDrawingsMain;
-
-    /** Holds the bookmarks tables */
-    protected BookmarksTables _bookmarksTables;
-
-    /** Holds the bookmarks */
-    protected Bookmarks _bookmarks;
-
-    /** Holds the ending notes tables */
-    protected NotesTables _endnotesTables = new NotesTables( NoteType.ENDNOTE );
-
-    /** Holds the footnotes */
-    protected Notes _endnotes = new NotesImpl( _endnotesTables );
-
-    /** Holds the footnotes tables */
-    protected NotesTables _footnotesTables = new NotesTables( NoteType.FOOTNOTE );
-
-    /** Holds the footnotes */
-    protected Notes _footnotes = new NotesImpl( _footnotesTables );
-
-    /** Holds the fields PLCFs */
-    protected FieldsTables _fieldsTables;
-
-    /** Holds the fields */
-    protected Fields _fields;
-
-    protected HWPFDocument()
-    {
-        super();
-        this._text = new StringBuilder("\r");
-    }
-
-    /**
-     * This constructor loads a Word document from an InputStream.
-     *
-     * @param istream The InputStream that contains the Word document.
-     * @throws IOException If there is an unexpected IOException from the passed
-     *         in InputStream.
-     */
-    public HWPFDocument(InputStream istream) throws IOException
-    {
-        //do Ole stuff
-        this( verifyAndBuildPOIFS(istream) );
-    }
-
-    /**
-     * This constructor loads a Word document from a POIFSFileSystem
-     *
-     * @param pfilesystem The POIFSFileSystem that contains the Word document.
-     * @throws IOException If there is an unexpected IOException from the passed
-     *         in POIFSFileSystem.
-     */
-    public HWPFDocument(POIFSFileSystem pfilesystem) throws IOException
-    {
-        this(pfilesystem.getRoot());
-    }
-
-    /**
-     * This constructor loads a Word document from a specific point
-     *  in a POIFSFileSystem, probably not the default.
-     * Used typically to open embeded documents.
-     *
-     * @param directory The DirectoryNode that contains the Word document.
-     * @throws IOException If there is an unexpected IOException from the passed
-     *         in POIFSFileSystem.
-     */
-    public HWPFDocument(DirectoryNode directory) throws IOException
-    {
-        // Load the main stream and FIB
-        // Also handles HPSF bits
-        super(directory);
-
-        // Is this document too old for us?
-        if(_fib.getFibBase().getNFib() < 106) {
-            throw new OldWordFileFormatException("The document is too old - Word 95 or older. Try HWPFOldDocument instead?");
-        }
-
-        // use the fib to determine the name of the table stream.
-        String name = STREAM_TABLE_0;
-        if (_fib.getFibBase().isFWhichTblStm())
-        {
-            name = STREAM_TABLE_1;
-        }
-
-        // Grab the table stream.
-        if (!directory.hasEntry(name)) {
-            throw new IllegalStateException("Table Stream '" + name + "' wasn't found - Either the document is corrupt, or is Word95 (or earlier)");
-        }
-
-        // read in the table stream.
-        InputStream is = directory.createDocumentInputStream(name);
-        _tableStream = IOUtils.toByteArray(is);
-        is.close();
-
-        _fib.fillVariableFields(_mainStream, _tableStream);
-
-        // read in the data stream.
-        InputStream dis = null;
-        try {
-            DocumentEntry dataProps = (DocumentEntry)directory.getEntry(STREAM_DATA);
-            dis = directory.createDocumentInputStream(STREAM_DATA);
-            _dataStream = IOUtils.toByteArray(dis, dataProps.getSize());
-        } catch(IOException e) {
-            _dataStream = new byte[0];
-        } finally {
-            if (dis != null) {
-                dis.close();
-            }
-        }
-
-        // Get the cp of the start of text in the main stream
-        // The latest spec doc says this is always zero!
-        int fcMin = 0;
-        //fcMin = _fib.getFcMin()
-
-        // Start to load up our standard structures.
-        _dop = new DocumentProperties(_tableStream, _fib.getFcDop(), _fib.getLcbDop() );
-        _cft = new ComplexFileTable(_mainStream, _tableStream, _fib.getFcClx(), fcMin);
-        TextPieceTable _tpt = _cft.getTextPieceTable();
-
-        // Now load the rest of the properties, which need to be adjusted
-        //  for where text really begin
-        _cbt = new CHPBinTable(_mainStream, _tableStream, _fib.getFcPlcfbteChpx(), _fib.getLcbPlcfbteChpx(), _tpt);
-        _pbt = new PAPBinTable(_mainStream, _tableStream, _dataStream, _fib.getFcPlcfbtePapx(), _fib.getLcbPlcfbtePapx(), _tpt);
-
-        _text = _tpt.getText();
-
-        /*
-         * in this mode we preserving PAPX/CHPX structure from file, so text may
-         * miss from output, and text order may be corrupted
-         */
-        boolean preserveBinTables = false;
-        try {
-            preserveBinTables = Boolean.parseBoolean( System
-                    .getProperty( PROPERTY_PRESERVE_BIN_TABLES ) );
-        } catch ( Exception exc ) {
-            // ignore;
-        }
-
-        if ( !preserveBinTables ) {
-            _cbt.rebuild( _cft );
-            _pbt.rebuild( _text, _cft );
-        }
-
-        /*
-         * Property to disable text rebuilding. In this mode changing the text
-         * will lead to unpredictable behavior
-         */
-        boolean preserveTextTable = false;
-        try {
-            preserveTextTable = Boolean.parseBoolean( System
-                    .getProperty( PROPERTY_PRESERVE_TEXT_TABLE ) );
-        } catch ( Exception exc ) {
-            // ignore;
-        }
-        if ( !preserveTextTable ) {
-            _cft = new ComplexFileTable();
-            _tpt = _cft.getTextPieceTable();
-            final TextPiece textPiece = new SinglentonTextPiece( _text );
-            _tpt.add( textPiece );
-            _text = textPiece.getStringBuilder();
-        }
-
-        // Read FSPA and Escher information
-        // _fspa = new FSPATable(_tableStream, _fib.getFcPlcspaMom(),
-        // _fib.getLcbPlcspaMom(), getTextTable().getTextPieces());
-        _fspaHeaders = new FSPATable( _tableStream, _fib,
-                FSPADocumentPart.HEADER );
-        _fspaMain = new FSPATable( _tableStream, _fib, FSPADocumentPart.MAIN );
-
-        if (_fib.getFcDggInfo() != 0)
-        {
-            _escherRecordHolder = new EscherRecordHolder(_tableStream, _fib.getFcDggInfo(), _fib.getLcbDggInfo());
-        } else
-        {
-            _escherRecordHolder = new EscherRecordHolder();
-        }
-
-        // read in the pictures stream
-        _pictures = new PicturesTable(this, _dataStream, _mainStream, _fspaMain, _escherRecordHolder);
-
-        // And escher pictures
-        _officeDrawingsHeaders = new OfficeDrawingsImpl( _fspaHeaders, _escherRecordHolder, _mainStream );
-        _officeDrawingsMain = new OfficeDrawingsImpl( _fspaMain , _escherRecordHolder, _mainStream);
-
-        _st = new SectionTable(_mainStream, _tableStream, _fib.getFcPlcfsed(), _fib.getLcbPlcfsed(), fcMin, _tpt, _fib.getSubdocumentTextStreamLength( SubdocumentType.MAIN));
-        _ss = new StyleSheet(_tableStream, _fib.getFcStshf());
-        _ft = new FontTable(_tableStream, _fib.getFcSttbfffn(), _fib.getLcbSttbfffn());
-
-        int listOffset = _fib.getFcPlfLst();
-        // int lfoOffset = _fib.getFcPlfLfo();
-        if ( listOffset != 0 && _fib.getLcbPlfLst() != 0 )
-        {
-            _lt = new ListTables( _tableStream, listOffset, _fib.getFcPlfLfo(),
-                    _fib.getLcbPlfLfo() );
-        }
-
-        int sbtOffset = _fib.getFcSttbSavedBy();
-        int sbtLength = _fib.getLcbSttbSavedBy();
-        if (sbtOffset != 0 && sbtLength != 0)
-        {
-            _sbt = new SavedByTable(_tableStream, sbtOffset, sbtLength);
-        }
-
-        int rmarkOffset = _fib.getFcSttbfRMark();
-        int rmarkLength = _fib.getLcbSttbfRMark();
-        if (rmarkOffset != 0 && rmarkLength != 0)
-        {
-            _rmat = new RevisionMarkAuthorTable(_tableStream, rmarkOffset, rmarkLength);
-        }
-
-        _bookmarksTables = new BookmarksTables( _tableStream, _fib );
-        _bookmarks = new BookmarksImpl( _bookmarksTables );
-
-        _endnotesTables = new NotesTables( NoteType.ENDNOTE, _tableStream, _fib );
-        _endnotes = new NotesImpl( _endnotesTables );
-        _footnotesTables = new NotesTables( NoteType.FOOTNOTE, _tableStream, _fib );
-        _footnotes = new NotesImpl( _footnotesTables );
-
-        _fieldsTables = new FieldsTables(_tableStream, _fib);
-        _fields = new FieldsImpl(_fieldsTables);
-    }
-
-    @Internal
-    public TextPieceTable getTextTable()
-    {
-        return _cft.getTextPieceTable();
-    }
-
-    @Internal
-    @Override
-    public StringBuilder getText()
-    {
-        return _text;
-    }
-
-    public DocumentProperties getDocProperties()
-    {
-        return _dop;
-    }
-
-    public Range getOverallRange() {
-        return new Range(0, _text.length(), this);
-    }
-
-    /**
-     * Returns the range which covers the whole of the document, but excludes
-     * any headers and footers.
-     */
-    public Range getRange()
-    {
-        // // First up, trigger a full-recalculate
-        // // Needed in case of deletes etc
-        // getOverallRange();
-        //
-        // if ( getFileInformationBlock().isFComplex() )
-        // {
-        // /*
-        // * Page 31:
-        // *
-        // * main document must be found by examining the piece table entries
-        // * from the 0th piece table entry from the piece table entry that
-        // * describes cp=fib.ccpText.
-        // */
-        // // TODO: review
-        // return new Range( _cpSplit.getMainDocumentStart(),
-        // _cpSplit.getMainDocumentEnd(), this );
-        // }
-        //
-        // /*
-        // * Page 31:
-        // *
-        // * "In a non-complex file, this means text of the: main document
-        // begins
-        // * at fib.fcMin in the file and continues through
-        // * fib.fcMin+fib.ccpText."
-        // */
-        // int bytesStart = getFileInformationBlock().getFcMin();
-        //
-        // int charsStart = getTextTable().getCharIndex( bytesStart );
-        // int charsEnd = charsStart
-        // + getFileInformationBlock().getSubdocumentTextStreamLength(
-        // SubdocumentType.MAIN );
-
-        // it seems much simpler -- sergey
-        return getRange(SubdocumentType.MAIN);
-    }
-
-    private Range getRange( SubdocumentType subdocument )
-    {
-        int startCp = 0;
-        for ( SubdocumentType previos : SubdocumentType.ORDERED )
-        {
-            int length = getFileInformationBlock()
-                    .getSubdocumentTextStreamLength( previos );
-            if ( subdocument == previos )
-                return new Range( startCp, startCp + length, this );
-            startCp += length;
-        }
-        throw new UnsupportedOperationException(
-                "Subdocument type not supported: " + subdocument );
-    }
-
-    /**
-     * Returns the {@link Range} which covers all the Footnotes.
-     * 
-     * @return the {@link Range} which covers all the Footnotes.
-     */
-    public Range getFootnoteRange()
-    {
-        return getRange( SubdocumentType.FOOTNOTE );
-    }
-
-    /**
-     * Returns the {@link Range} which covers all endnotes.
-     * 
-     * @return the {@link Range} which covers all endnotes.
-     */
-    public Range getEndnoteRange()
-    {
-        return getRange( SubdocumentType.ENDNOTE );
-    }
-
-    /**
-     * Returns the {@link Range} which covers all annotations.
-     * 
-     * @return the {@link Range} which covers all annotations.
-     */
-    public Range getCommentsRange()
-    {
-        return getRange( SubdocumentType.ANNOTATION );
-    }
-
-    /**
-     * Returns the {@link Range} which covers all textboxes.
-     * 
-     * @return the {@link Range} which covers all textboxes.
-     */
-    public Range getMainTextboxRange()
-    {
-        return getRange( SubdocumentType.TEXTBOX );
-    }
-
-  /**
-   * Returns the range which covers all "Header Stories".
-   * A header story contains a header, footer, end note
-   *  separators and footnote separators.
-   */
-  public Range getHeaderStoryRange() {
-      return getRange( SubdocumentType.HEADER );
-  }
-
-  /**
-   * Returns the character length of a document.
-   * @return the character length of a document
-   */
-  public int characterLength()
-  {
-      return _text.length();
-  }
-
-  /**
-   * Gets a reference to the saved -by table, which holds the save history for the document.
-   *
-   * @return the saved-by table.
-   */
-  @Internal
-  public SavedByTable getSavedByTable()
-  {
-    return _sbt;
-  }
-
-  /**
-   * Gets a reference to the revision mark author table, which holds the revision mark authors for the document.
-   *
-   * @return the saved-by table.
-   */
-  @Internal
-  public RevisionMarkAuthorTable getRevisionMarkAuthorTable()
-  {
-    return _rmat;
-  }
-  
-  /**
-   * @return PicturesTable object, that is able to extract images from this document
-   */
-  public PicturesTable getPicturesTable() {
-      return _pictures;
-  }
-
-  @Internal
-  public EscherRecordHolder getEscherRecordHolder() {
-      return _escherRecordHolder;
-  }
-
-    public OfficeDrawings getOfficeDrawingsHeaders()
-    {
-        return _officeDrawingsHeaders;
-    }
-
-    public OfficeDrawings getOfficeDrawingsMain()
-    {
-        return _officeDrawingsMain;
-    }
-
-    /**
-     * @return user-friendly interface to access document bookmarks
-     */
-    public Bookmarks getBookmarks()
-    {
-        return _bookmarks;
-    }
-
-    /**
-     * @return user-friendly interface to access document endnotes
-     */
-    public Notes getEndnotes()
-    {
-        return _endnotes;
-    }
-
-    /**
-     * @return user-friendly interface to access document footnotes
-     */
-    public Notes getFootnotes()
-    {
-        return _footnotes;
-    }
-
-  /**
-   * @return FieldsTables object, that is able to extract fields descriptors from this document
-   * @deprecated POI 3.8.
-   */
-    @Deprecated
-    @Internal
-  public FieldsTables getFieldsTables() {
-      return _fieldsTables;
-  }
-
-    /**
-     * Returns user-friendly interface to access document {@link Field}s
-     * 
-     * @return user-friendly interface to access document {@link Field}s
-     */
-    public Fields getFields()
-    {
-        return _fields;
-    }
-
-    /**
-     * Write out the word file that is represented by this class, to the 
-     *  currently open {@link File}, via the writeable {@link POIFSFileSystem}
-     *  it was opened as. 
-     *  
-     * <p>This will fail (with an {@link IllegalStateException} if the
-     *  Document was opened read-only, opened from an {@link InputStream}
-     *   instead of a File, or if this is not the root document. For those cases, 
-     *   you must use {@link #write(OutputStream)} or {@link #write(File)} to 
-     *   write to a brand new document.
-     *         
-     * @since 3.15
-     */
-    @Override
-    public void write() throws IOException {
-        validateInPlaceWritePossible();
-        
-        // Update the Document+Properties streams in the file
-        write(directory.getFileSystem(), false);
-        
-        // Sync with the File on disk
-        directory.getFileSystem().writeFilesystem();
-    }
-    
-    /**
-     * Writes out the word file that is represented by an instance of this class.
-     * 
-     * If the {@link File} exists, it will be replaced, otherwise a new one 
-     * will be created
-     *
-     * @param newFile The File to write to.
-     * @throws IOException If there is an unexpected IOException from writing
-     *         to the File.
-     *         
-     * @since 3.15 beta 3
-     */
-    @Override
-    public void write(File newFile) throws IOException {
-        NPOIFSFileSystem pfs = POIFSFileSystem.create(newFile);
-        write(pfs, true);
-        pfs.writeFilesystem();
-    }
-
-    /**
-     * Writes out the word file that is represented by an instance of this class.
-     * 
-     * For better performance when writing to files, use {@link #write(File)}.
-     * If {@code stream} has a high cost/latency associated with each written byte,
-     * consider wrapping the OutputStream in a {@link java.io.BufferedOutputStream}
-     * to improve write performance.
-     *
-     * @param out The OutputStream to write to.
-     * @throws IOException If there is an unexpected IOException from the passed
-     *         in OutputStream.
-     */
-    public void write(OutputStream out) throws IOException {
-        NPOIFSFileSystem pfs = new NPOIFSFileSystem();
-        write(pfs, true);
-        pfs.writeFilesystem( out );
-    }
-    private void write(NPOIFSFileSystem pfs, boolean copyOtherEntries) throws IOException {
-        // initialize our streams for writing.
-        HWPFFileSystem docSys = new HWPFFileSystem();
-        HWPFOutputStream wordDocumentStream = docSys.getStream(STREAM_WORD_DOCUMENT);
-        HWPFOutputStream tableStream = docSys.getStream(STREAM_TABLE_1);
-        //HWPFOutputStream dataStream = docSys.getStream("Data");
-        int tableOffset = 0;
-
-        // FileInformationBlock fib = (FileInformationBlock)_fib.clone();
-        // clear the offsets and sizes in our FileInformationBlock.
-        _fib.clearOffsetsSizes();
-
-        // determine the FileInformationBLock size
-        int fibSize = _fib.getSize();
-        fibSize  += POIFSConstants.SMALLER_BIG_BLOCK_SIZE -
-                (fibSize % POIFSConstants.SMALLER_BIG_BLOCK_SIZE);
-
-        // preserve space for the FileInformationBlock because we will be writing
-        // it after we write everything else.
-        byte[] placeHolder = new byte[fibSize];
-        wordDocumentStream.write(placeHolder);
-        int mainOffset = wordDocumentStream.getOffset();
-
-        // write out the StyleSheet.
-        _fib.setFcStshf(tableOffset);
-        _ss.writeTo(tableStream);
-        _fib.setLcbStshf(tableStream.getOffset() - tableOffset);
-        tableOffset = tableStream.getOffset();
-
-        // get fcMin and fcMac because we will be writing the actual text with the
-        // complex table.
-        int fcMin = mainOffset;
-
-        /*
-         * clx (encoding of the sprm lists for a complex file and piece table
-         * for a any file) Written immediately after the end of the previously
-         * recorded structure. This is recorded in all Word documents
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 23 of 210
-         */
-
-        // write out the Complex table, includes text.
-        _fib.setFcClx(tableOffset);
-        _cft.writeTo(wordDocumentStream, tableStream);
-        _fib.setLcbClx(tableStream.getOffset() - tableOffset);
-        tableOffset = tableStream.getOffset();
-        int fcMac = wordDocumentStream.getOffset();
-
-        /*
-         * dop (document properties record) Written immediately after the end of
-         * the previously recorded structure. This is recorded in all Word
-         * documents
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 23 of 210
-         */
-
-        // write out the DocumentProperties.
-        _fib.setFcDop(tableOffset);
-        _dop.writeTo(tableStream);
-        _fib.setLcbDop(tableStream.getOffset() - tableOffset);
-        tableOffset = tableStream.getOffset();
-
-        /*
-         * plcfBkmkf (table recording beginning CPs of bookmarks) Written
-         * immediately after the sttbfBkmk, if the document contains bookmarks.
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 24 of 210
-         */
-        if ( _bookmarksTables != null )
-        {
-            _bookmarksTables.writePlcfBkmkf( _fib, tableStream );
-            tableOffset = tableStream.getOffset();
-        }
-
-        /*
-         * plcfBkmkl (table recording limit CPs of bookmarks) Written
-         * immediately after the plcfBkmkf, if the document contains bookmarks.
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 24 of 210
-         */
-        if ( _bookmarksTables != null )
-        {
-            _bookmarksTables.writePlcfBkmkl( _fib, tableStream );
-            tableOffset = tableStream.getOffset();
-        }
-
-        /*
-         * plcfbteChpx (bin table for CHP FKPs) Written immediately after the
-         * previously recorded table. This is recorded in all Word documents.
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 24 of 210
-         */
-
-        // write out the CHPBinTable.
-        _fib.setFcPlcfbteChpx(tableOffset);
-        _cbt.writeTo(wordDocumentStream, tableStream, fcMin, _cft.getTextPieceTable());
-        _fib.setLcbPlcfbteChpx(tableStream.getOffset() - tableOffset);
-        tableOffset = tableStream.getOffset();
-
-        /*
-         * plcfbtePapx (bin table for PAP FKPs) Written immediately after the
-         * plcfbteChpx. This is recorded in all Word documents.
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 24 of 210
-         */
-
-        // write out the PAPBinTable.
-        _fib.setFcPlcfbtePapx(tableOffset);
-        _pbt.writeTo(wordDocumentStream, tableStream, _cft.getTextPieceTable());
-        _fib.setLcbPlcfbtePapx(tableStream.getOffset() - tableOffset);
-        tableOffset = tableStream.getOffset();
-
-        /*
-         * plcfendRef (endnote reference position table) Written immediately
-         * after the previously recorded table if the document contains endnotes
-         * 
-         * plcfendTxt (endnote text position table) Written immediately after
-         * the plcfendRef if the document contains endnotes
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 24 of 210
-         */
-        _endnotesTables.writeRef( _fib, tableStream );
-        _endnotesTables.writeTxt( _fib, tableStream );
-        tableOffset = tableStream.getOffset();
-
-        /*
-         * plcffld*** (table of field positions and statuses for annotation
-         * subdocument) Written immediately after the previously recorded table,
-         * if the ******* subdocument contains fields.
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 24 of 210
-         */
-
-        if ( _fieldsTables != null )
-        {
-            _fieldsTables.write( _fib, tableStream );
-            tableOffset = tableStream.getOffset();
-        }
-
-        /*
-         * plcffndRef (footnote reference position table) Written immediately
-         * after the stsh if the document contains footnotes
-         * 
-         * plcffndTxt (footnote text position table) Written immediately after
-         * the plcffndRef if the document contains footnotes
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 24 of 210
-         */
-        _footnotesTables.writeRef( _fib, tableStream );
-        _footnotesTables.writeTxt( _fib, tableStream );
-        tableOffset = tableStream.getOffset();
-
-        /*
-         * plcfsed (section table) Written immediately after the previously
-         * recorded table. Recorded in all Word documents
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 25 of 210
-         */
-
-        // write out the SectionTable.
-        _fib.setFcPlcfsed(tableOffset);
-        _st.writeTo(wordDocumentStream, tableStream);
-        _fib.setLcbPlcfsed(tableStream.getOffset() - tableOffset);
-        tableOffset = tableStream.getOffset();
-
-        // write out the list tables
-        if ( _lt != null )
-        {
-            /*
-             * plcflst (list formats) Written immediately after the end of the
-             * previously recorded, if there are any lists defined in the
-             * document. This begins with a short count of LSTF structures
-             * followed by those LSTF structures. This is immediately followed
-             * by the allocated data hanging off the LSTFs. This data consists
-             * of the array of LVLs for each LSTF. (Each LVL consists of an LVLF
-             * followed by two grpprls and an XST.)
-             * 
-             * Microsoft Office Word 97-2007 Binary File Format (.doc)
-             * Specification; Page 25 of 210
-             */
-            _lt.writeListDataTo( _fib, tableStream );
-            tableOffset = tableStream.getOffset();
-
-            /*
-             * plflfo (more list formats) Written immediately after the end of
-             * the plcflst and its accompanying data, if there are any lists
-             * defined in the document. This consists first of a PL of LFO
-             * records, followed by the allocated data (if any) hanging off the
-             * LFOs. The allocated data consists of the array of LFOLVLFs for
-             * each LFO (and each LFOLVLF is immediately followed by some LVLs).
-             * 
-             * Microsoft Office Word 97-2007 Binary File Format (.doc)
-             * Specification; Page 26 of 210
-             */
-            _lt.writeListOverridesTo( _fib, tableStream );
-            tableOffset = tableStream.getOffset();
-        }
-
-        /*
-         * sttbfBkmk (table of bookmark name strings) Written immediately after
-         * the previously recorded table, if the document contains bookmarks.
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 27 of 210
-         */
-        if ( _bookmarksTables != null )
-        {
-            _bookmarksTables.writeSttbfBkmk( _fib, tableStream );
-            tableOffset = tableStream.getOffset();
-        }
-
-        /*
-         * sttbSavedBy (last saved by string table) Written immediately after
-         * the previously recorded table.
-         * 
-         * Microsoft Office Word 97-2007 Binary File Format (.doc)
-         * Specification; Page 27 of 210
-         */
-
-        // write out the saved-by table.
-        if (_sbt != null)
-        {
-            _fib.setFcSttbSavedBy(tableOffset);
-            _sbt.writeTo(tableStream);
-            _fib.setLcbSttbSavedBy(tableStream.getOffset() - tableOffset);
-
-            tableOffset = tableStream.getOffset();
-        }
-
-        // write out the revision mark authors table.
-        if (_rmat != null)
-        {
-            _fib.setFcSttbfRMark(tableOffset);
-            _rmat.writeTo(tableStream);
-            _fib.setLcbSttbfRMark(tableStream.getOffset() - tableOffset);
-
-            tableOffset = tableStream.getOffset();
-        }
-
-        // write out the FontTable.
-        _fib.setFcSttbfffn(tableOffset);
-        _ft.writeTo(tableStream);
-        _fib.setLcbSttbfffn(tableStream.getOffset() - tableOffset);
-        tableOffset = tableStream.getOffset();
-
-        // set some variables in the FileInformationBlock.
-        _fib.getFibBase().setFcMin(fcMin);
-        _fib.getFibBase().setFcMac(fcMac);
-        _fib.setCbMac(wordDocumentStream.getOffset());
-
-        // make sure that the table, doc and data streams use big blocks.
-        byte[] mainBuf = wordDocumentStream.toByteArray();
-        if (mainBuf.length < 4096)
-        {
-            byte[] tempBuf = new byte[4096];
-            System.arraycopy(mainBuf, 0, tempBuf, 0, mainBuf.length);
-            mainBuf = tempBuf;
-        }
-
-        // Table1 stream will be used
-        _fib.getFibBase().setFWhichTblStm( true );
-
-        // write out the FileInformationBlock.
-        //_fib.serialize(mainBuf, 0);
-        _fib.writeTo(mainBuf, tableStream);
-
-        byte[] tableBuf = tableStream.toByteArray();
-        if (tableBuf.length < 4096)
-        {
-            byte[] tempBuf = new byte[4096];
-            System.arraycopy(tableBuf, 0, tempBuf, 0, tableBuf.length);
-            tableBuf = tempBuf;
-        }
-
-        byte[] dataBuf = _dataStream;
-        if (dataBuf == null)
-        {
-            dataBuf = new byte[4096];
-        }
-        if (dataBuf.length < 4096)
-        {
-            byte[] tempBuf = new byte[4096];
-            System.arraycopy(dataBuf, 0, tempBuf, 0, dataBuf.length);
-            dataBuf = tempBuf;
-        }
-
-        // Create a new document preserving order of entries / Update existing
-        boolean docWritten = false;
-        boolean dataWritten = false;
-        boolean objectPoolWritten = false;
-        boolean tableWritten = false;
-        boolean propertiesWritten = false;
-        for (Entry entry : directory) {
-            if ( entry.getName().equals( STREAM_WORD_DOCUMENT ) )
-            {
-                if ( !docWritten )
-                {
-                    write(pfs, mainBuf, STREAM_WORD_DOCUMENT);
-                    docWritten = true;
-                }
-            }
-            else if ( entry.getName().equals( STREAM_OBJECT_POOL ) )
-            {
-                if ( !objectPoolWritten )
-                {
-                    if ( copyOtherEntries ) {
-                        _objectPool.writeTo( pfs.getRoot() );
-                    } else {
-                        // Object pool is already there, no need to change/copy
-                    }
-                    objectPoolWritten = true;
-                }
-            }
-            else if ( entry.getName().equals( STREAM_TABLE_0 )
-                    || entry.getName().equals( STREAM_TABLE_1 ) )
-            {
-                if ( !tableWritten )
-                {
-                    write(pfs, tableBuf, STREAM_TABLE_1);
-                    tableWritten = true;
-                }
-            }
-            else if ( entry.getName().equals(
-                    SummaryInformation.DEFAULT_STREAM_NAME )
-                    || entry.getName().equals(
-                            DocumentSummaryInformation.DEFAULT_STREAM_NAME ) )
-            {
-                if ( !propertiesWritten )
-                {
-                    writeProperties( pfs );
-                    propertiesWritten = true;
-                }
-            }
-            else if ( entry.getName().equals( STREAM_DATA ) )
-            {
-                if ( !dataWritten )
-                {
-                    write(pfs, dataBuf, STREAM_DATA);
-                    dataWritten = true;
-                }
-            }
-            else if ( copyOtherEntries )
-            {
-                EntryUtils.copyNodeRecursively( entry, pfs.getRoot() );
-            }
-        }
-
-        if ( !docWritten )
-            write(pfs, mainBuf, STREAM_WORD_DOCUMENT);
-        if ( !tableWritten )
-            write(pfs, tableBuf, STREAM_TABLE_1);
-        if ( !propertiesWritten )
-            writeProperties( pfs );
-        if ( !dataWritten )
-            write(pfs, dataBuf, STREAM_DATA);
-        if ( !objectPoolWritten && copyOtherEntries )
-            _objectPool.writeTo( pfs.getRoot() );
-
-        this.directory = pfs.getRoot();
-
-        /*
-         * since we updated all references in FIB and etc, using new arrays to
-         * access data
-         */
-        this.directory = pfs.getRoot();
-        this._tableStream = tableStream.toByteArray();
-        this._dataStream = dataBuf;
-    }
-    private static void write(NPOIFSFileSystem pfs, byte[] data, String name) throws IOException {
-        pfs.createOrUpdateDocument(new ByteArrayInputStream(data), name);
-    }
-
-    @Internal
-    public byte[] getDataStream()
-    {
-        return _dataStream;
-    }
-    @Internal
-    public byte[] getTableStream()
-    {
-        return _tableStream;
-    }
-
-    public int registerList( HWPFList list )
-    {
-        if ( _lt == null )
-        {
-            _lt = new ListTables();
-        }
-        return _lt.addList( list.getListData(), list.getLFO(),
-                list.getLFOData() );
-    }
-
-  public void delete(int start, int length)
-  {
-    Range r = new Range(start, start + length, this);
-    r.delete();
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
deleted file mode 100644
index 69c1997..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-
-import org.apache.poi.POIDocument;
-import org.apache.poi.hwpf.model.CHPBinTable;
-import org.apache.poi.hwpf.model.FileInformationBlock;
-import org.apache.poi.hwpf.model.FontTable;
-import org.apache.poi.hwpf.model.ListTables;
-import org.apache.poi.hwpf.model.PAPBinTable;
-import org.apache.poi.hwpf.model.SectionTable;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.model.TextPieceTable;
-import org.apache.poi.hwpf.usermodel.ObjectPoolImpl;
-import org.apache.poi.hwpf.usermodel.ObjectsPool;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.Internal;
-
-
-/**
- * This class holds much of the core of a Word document, but
- *  without some of the table structure information.
- * You generally want to work with one of
- *  {@link HWPFDocument} or {@link HWPFOldDocument} 
- */
-public abstract class HWPFDocumentCore extends POIDocument
-{
-    protected static final String STREAM_OBJECT_POOL = "ObjectPool";
-    protected static final String STREAM_WORD_DOCUMENT = "WordDocument";
-
-  /** Holds OLE2 objects */
-  protected ObjectPoolImpl _objectPool;
-
-  /** The FIB */
-  protected FileInformationBlock _fib;
-
-  /** Holds styles for this document.*/
-  protected StyleSheet _ss;
-
-  /** Contains formatting properties for text*/
-  protected CHPBinTable _cbt;
-
-  /** Contains formatting properties for paragraphs*/
-  protected PAPBinTable _pbt;
-
-  /** Contains formatting properties for sections.*/
-  protected SectionTable _st;
-
-  /** Holds fonts for this document.*/
-  protected FontTable _ft;
-
-  /** Hold list tables */
-  protected ListTables _lt;
-
-  /** main document stream buffer*/
-  protected byte[] _mainStream;
-
-  protected HWPFDocumentCore()
-  {
-     super((DirectoryNode)null);
-  }
-
-  /**
-   * Takes an InputStream, verifies that it's not RTF or PDF, builds a
-   *  POIFSFileSystem from it, and returns that.
-   */
-  public static POIFSFileSystem verifyAndBuildPOIFS(InputStream istream) throws IOException {
-	// Open a PushbackInputStream, so we can peek at the first few bytes
-	PushbackInputStream pis = new PushbackInputStream(istream,6);
-	byte[] first6 = IOUtils.toByteArray(pis, 6);
-
-	// Does it start with {\rtf ? If so, it's really RTF
-	if(first6[0] == '{' && first6[1] == '\\' && first6[2] == 'r'
-		&& first6[3] == 't' && first6[4] == 'f') {
-		throw new IllegalArgumentException("The document is really a RTF file");
-	} else if(first6[0] == '%' && first6[1] == 'P' && first6[2] == 'D' && first6[3] == 'F' ) {
-		throw new IllegalArgumentException("The document is really a PDF file");
-	}
-
-	// OK, so it's neither RTF nor PDF
-	// Open a POIFSFileSystem on the (pushed back) stream
-	pis.unread(first6);
-	return new POIFSFileSystem(pis);
-  }
-
-  /**
-   * This constructor loads a Word document from an InputStream.
-   *
-   * @param istream The InputStream that contains the Word document.
-   * @throws IOException If there is an unexpected IOException from the passed
-   *         in InputStream.
-   */
-  public HWPFDocumentCore(InputStream istream) throws IOException
-  {
-    //do Ole stuff
-    this( verifyAndBuildPOIFS(istream) );
-  }
-
-  /**
-   * This constructor loads a Word document from a POIFSFileSystem
-   *
-   * @param pfilesystem The POIFSFileSystem that contains the Word document.
-   * @throws IOException If there is an unexpected IOException from the passed
-   *         in POIFSFileSystem.
-   */
-  public HWPFDocumentCore(POIFSFileSystem pfilesystem) throws IOException
-  {
-	this(pfilesystem.getRoot());
-  }
-
-  /**
-   * This constructor loads a Word document from a specific point
-   *  in a POIFSFileSystem, probably not the default.
-   * Used typically to open embeded documents.
-   *
-   * @param directory The DirectoryNode that contains the Word document.
-   * @throws IOException If there is an unexpected IOException from the passed
-   *         in POIFSFileSystem.
-   */
-  public HWPFDocumentCore(DirectoryNode directory) throws IOException {
-    // Sort out the hpsf properties
-    super(directory);
-
-    // read in the main stream.
-    DocumentEntry documentProps = (DocumentEntry)directory.getEntry("WordDocument");
-    DocumentInputStream dis = null;
-    try {
-        dis = directory.createDocumentInputStream(STREAM_WORD_DOCUMENT);
-        _mainStream = IOUtils.toByteArray(dis, documentProps.getSize());
-    } finally {
-        if (dis != null) {
-            dis.close();
-        }
-    }
-
-    // Create our FIB, and check for the doc being encrypted
-    _fib = new FileInformationBlock(_mainStream);
-
-    DirectoryEntry objectPoolEntry;
-    try {
-      objectPoolEntry = (DirectoryEntry) directory
-              .getEntry(STREAM_OBJECT_POOL);
-    } catch (FileNotFoundException exc) {
-      objectPoolEntry = null;
-    }
-    _objectPool = new ObjectPoolImpl(objectPoolEntry);
-  }
-
-  /**
-     * Returns the range which covers the whole of the document, but excludes
-     * any headers and footers.
-     */
-    public abstract Range getRange();
-
-    /**
-     * Returns the range that covers all text in the file, including main text,
-     * footnotes, headers and comments
-     */
-    public abstract Range getOverallRange();
-
-    /**
-     * Returns document text, i.e. text information from all text pieces,
-     * including OLE descriptions and field codes
-     */
-    public String getDocumentText() {
-        return getText().toString();
-    }
-
-    /**
-     * Internal method to access document text
-     */
-    @Internal
-    public abstract StringBuilder getText();
-
-  public CHPBinTable getCharacterTable()
-  {
-    return _cbt;
-  }
-
-  public PAPBinTable getParagraphTable()
-  {
-    return _pbt;
-  }
-
-  public SectionTable getSectionTable()
-  {
-    return _st;
-  }
-
-  public StyleSheet getStyleSheet()
-  {
-    return _ss;
-  }
-
-  public ListTables getListTables()
-  {
-    return _lt;
-  }
-
-  public FontTable getFontTable()
-  {
-    return _ft;
-  }
-
-  public FileInformationBlock getFileInformationBlock()
-  {
-    return _fib;
-  }
-
-    public ObjectsPool getObjectsPool()
-    {
-        return _objectPool;
-    }
-
-    public abstract TextPieceTable getTextTable();
-
-    @Internal
-    public byte[] getMainStream() {
-        return _mainStream;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
deleted file mode 100644
index 6ff9f29..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.hwpf.model.ComplexFileTable;
-import org.apache.poi.hwpf.model.OldCHPBinTable;
-import org.apache.poi.hwpf.model.OldPAPBinTable;
-import org.apache.poi.hwpf.model.OldSectionTable;
-import org.apache.poi.hwpf.model.PieceDescriptor;
-import org.apache.poi.hwpf.model.TextPiece;
-import org.apache.poi.hwpf.model.TextPieceTable;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Provides very simple support for old (Word 6 / Word 95)
- *  files.
- */
-public class HWPFOldDocument extends HWPFDocumentCore {
-    private TextPieceTable tpt;
-    
-    private StringBuilder _text;
-    
-    public HWPFOldDocument(POIFSFileSystem fs) throws IOException {
-        this(fs.getRoot());
-    }
-
-    public HWPFOldDocument(DirectoryNode directory)
-            throws IOException {
-        super(directory);
-        
-        // Where are things?
-        int sedTableOffset = LittleEndian.getInt(_mainStream, 0x88);
-        int sedTableSize   = LittleEndian.getInt(_mainStream, 0x8c);
-        int chpTableOffset = LittleEndian.getInt(_mainStream, 0xb8);
-        int chpTableSize   = LittleEndian.getInt(_mainStream, 0xbc);
-        int papTableOffset = LittleEndian.getInt(_mainStream, 0xc0);
-        int papTableSize   = LittleEndian.getInt(_mainStream, 0xc4);
-        //int shfTableOffset = LittleEndian.getInt(_mainStream, 0x60);
-        //int shfTableSize   = LittleEndian.getInt(_mainStream, 0x64);
-        int complexTableOffset = LittleEndian.getInt(_mainStream, 0x160);
-        
-        // We need to get hold of the text that makes up the
-        //  document, which might be regular or fast-saved
-        ComplexFileTable cft = null;
-        StringBuffer text = new StringBuffer();
-        if(_fib.getFibBase().isFComplex()) {
-            cft = new ComplexFileTable(
-                    _mainStream, _mainStream,
-                    complexTableOffset, _fib.getFibBase().getFcMin()
-            );
-            tpt = cft.getTextPieceTable();
-            
-            for(TextPiece tp : tpt.getTextPieces()) {
-                text.append( tp.getStringBuilder() );
-            }
-        } else {
-            // TODO Discover if these older documents can ever hold Unicode Strings?
-            //  (We think not, because they seem to lack a Piece table)
-            // TODO Build the Piece Descriptor properly
-            //  (We have to fake it, as they don't seem to have a proper Piece table)
-            PieceDescriptor pd = new PieceDescriptor(new byte[] {0,0, 0,0,0,127, 0,0}, 0);
-            pd.setFilePosition(_fib.getFibBase().getFcMin());
-
-            // Generate a single Text Piece Table, with a single Text Piece
-            //  which covers all the (8 bit only) text in the file
-            tpt = new TextPieceTable();
-            byte[] textData = new byte[_fib.getFibBase().getFcMac()-_fib.getFibBase().getFcMin()];
-            System.arraycopy(_mainStream, _fib.getFibBase().getFcMin(), textData, 0, textData.length);
-            TextPiece tp = new TextPiece(
-                    0, textData.length, textData, pd
-            );
-            tpt.add(tp);
-            
-            text.append(tp.getStringBuilder());
-        }
-        
-        _text = tpt.getText();
-
-        // Now we can fetch the character and paragraph properties
-        _cbt = new OldCHPBinTable(
-                _mainStream, chpTableOffset, chpTableSize,
-                _fib.getFibBase().getFcMin(), tpt
-        );
-        _pbt = new OldPAPBinTable(
-                _mainStream, papTableOffset, papTableSize,
-                _fib.getFibBase().getFcMin(), tpt
-        );
-        _st = new OldSectionTable(
-                _mainStream, sedTableOffset, sedTableSize,
-                _fib.getFibBase().getFcMin(), tpt
-        );
-
-        /*
-         * in this mode we preserving PAPX/CHPX structure from file, so text may
-         * miss from output, and text order may be corrupted
-         */
-        boolean preserveBinTables = false;
-        try
-        {
-            preserveBinTables = Boolean.parseBoolean( System
-                    .getProperty( HWPFDocument.PROPERTY_PRESERVE_BIN_TABLES ) );
-        }
-        catch ( Exception exc )
-        {
-            // ignore;
-        }
-
-        if ( !preserveBinTables )
-        {
-            _cbt.rebuild( cft );
-            _pbt.rebuild( _text, cft );
-        }
-    }
-
-    public Range getOverallRange()
-    {
-        // Life is easy when we have no footers, headers or unicode!
-        return new Range( 0, _fib.getFibBase().getFcMac() - _fib.getFibBase().getFcMin(), this );
-    }
-
-    public Range getRange()
-    {
-        return getOverallRange();
-    }
-
-    public TextPieceTable getTextTable()
-    {
-      return tpt;
-    }
-
-    @Override
-    public StringBuilder getText()
-    {
-        return _text;
-    }
-
-    @Override
-    public void write() throws IOException {
-        throw new IllegalStateException("Writing is not available for the older file formats");
-    }
-    @Override
-    public void write(File out) throws IOException {
-        throw new IllegalStateException("Writing is not available for the older file formats");
-    }
-    @Override
-    public void write(OutputStream out) throws IOException {
-        throw new IllegalStateException("Writing is not available for the older file formats");
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java
deleted file mode 100644
index cfa97bc..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf;
-
-import org.apache.poi.OldFileFormatException;
-
-public class OldWordFileFormatException extends OldFileFormatException {
-    public OldWordFileFormatException(String s) {
-        super(s);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java
deleted file mode 100644
index eeb17ab..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.hwpf.usermodel.Section;
-
-public final class QuickTest
-{
-  public QuickTest()
-  {
-  }
-
-  public static void main(String[] args) throws IOException
-  {
-      HWPFDocument doc = new HWPFDocument (new FileInputStream (args[0]));
-      Range r = doc.getRange();
-
-      System.out.println("Example you supplied:");
-      System.out.println("---------------------");
-      for (int x = 0; x < r.numSections(); x++)
-      {
-        Section s = r.getSection(x);
-        for (int y = 0; y < s.numParagraphs(); y++)
-        {
-          Paragraph p = s.getParagraph(y);
-          for (int z = 0; z < p.numCharacterRuns(); z++)
-          {
-            //character run
-            CharacterRun run = p.getCharacterRun(z);
-            //character run text
-            String text = run.text();
-            // show us the text
-            System.out.print(text);
-          }
-          // use a new line at the paragraph break
-          System.out.println();
-        }
-      }
-
-
-//      System.out.println("\n\nExample using new method:");
-//      System.out.println("-------------------------");
-//      for (int x = 0; x < r.numSections(); x++)
-//      {
-//        Section s = r.getSection(x);
-//        for (int y = 0; y < s.numParagraphs(); y++)
-//        {
-//          Paragraph p = s.getParagraph(y);
-//          for (int z = 0; z < p.numCharacterRuns(); z++)
-//          {
-//             //character run
-//             CharacterRun run = p.getCharacterRun(z);
-//             //** get character run/paragraph common text **
-//             String text = run.commonText(p);
-//             // show us the text
-//             System.out.print(text);
-//          }
-//          // use a new line at the paragraph break
-//          System.out.println();
-//        }
-//      }
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
deleted file mode 100644
index 02b2dbd..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
+++ /dev/null
@@ -1,1217 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.converter.AbstractWordUtils.NumberingState;
-import org.apache.poi.hwpf.converter.FontReplacer.Triplet;
-import org.apache.poi.hwpf.model.FieldsDocumentPart;
-import org.apache.poi.hwpf.usermodel.Bookmark;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.Field;
-import org.apache.poi.hwpf.usermodel.HWPFList;
-import org.apache.poi.hwpf.usermodel.Notes;
-import org.apache.poi.hwpf.usermodel.OfficeDrawing;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.PictureType;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.hwpf.usermodel.Section;
-import org.apache.poi.hwpf.usermodel.Table;
-import org.apache.poi.hwpf.usermodel.TableCell;
-import org.apache.poi.hwpf.usermodel.TableRow;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-@Beta
-public abstract class AbstractWordConverter
-{
-    private static class DeadFieldBoundaries
-    {
-        final int beginMark;
-        final int endMark;
-        final int separatorMark;
-
-        public DeadFieldBoundaries( int beginMark, int separatorMark,
-                int endMark )
-        {
-            this.beginMark = beginMark;
-            this.separatorMark = separatorMark;
-            this.endMark = endMark;
-        }
-    }
-
-    private static final class Structure implements Comparable<Structure>
-    {
-        final int end;
-        final int start;
-        final Object structure;
-
-        Structure( Bookmark bookmark )
-        {
-            this.start = bookmark.getStart();
-            this.end = bookmark.getEnd();
-            this.structure = bookmark;
-        }
-
-        Structure( DeadFieldBoundaries deadFieldBoundaries, int start, int end )
-        {
-            this.start = start;
-            this.end = end;
-            this.structure = deadFieldBoundaries;
-        }
-
-        Structure( Field field )
-        {
-            this.start = field.getFieldStartOffset();
-            this.end = field.getFieldEndOffset();
-            this.structure = field;
-        }
-
-        public int compareTo( Structure o )
-        {
-            return start < o.start ? -1 : start == o.start ? 0 : 1;
-        }
-
-        @Override
-        public String toString()
-        {
-            return "Structure [" + start + "; " + end + "): "
-                    + structure.toString();
-        }
-    }
-
-    private static final byte BEL_MARK = 7;
-
-    private static final byte FIELD_BEGIN_MARK = 19;
-
-    private static final byte FIELD_END_MARK = 21;
-
-    private static final byte FIELD_SEPARATOR_MARK = 20;
-
-    private static final POILogger logger = POILogFactory
-            .getLogger( AbstractWordConverter.class );
-
-    private static final Pattern PATTERN_HYPERLINK_EXTERNAL = Pattern
-            .compile( "^[ \\t\\r\\n]*HYPERLINK \"(.*)\".*$" );
-
-    private static final Pattern PATTERN_HYPERLINK_LOCAL = Pattern
-            .compile( "^[ \\t\\r\\n]*HYPERLINK \\\\l \"(.*)\"[ ](.*)$" );
-
-    private static final Pattern PATTERN_PAGEREF = Pattern
-            .compile( "^[ \\t\\r\\n]*PAGEREF ([^ ]*)[ \\t\\r\\n]*\\\\h.*$" );
-
-    private static final byte SPECCHAR_AUTONUMBERED_FOOTNOTE_REFERENCE = 2;
-
-    private static final byte SPECCHAR_DRAWN_OBJECT = 8;
-
-    protected static final char UNICODECHAR_NO_BREAK_SPACE = '\u00a0';
-
-    protected static final char UNICODECHAR_NONBREAKING_HYPHEN = '\u2011';
-
-    protected static final char UNICODECHAR_ZERO_WIDTH_SPACE = '\u200b';
-
-    private static void addToStructures( List<Structure> structures,
-            Structure structure )
-    {
-        for ( Iterator<Structure> iterator = structures.iterator(); iterator
-                .hasNext(); )
-        {
-            Structure another = iterator.next();
-
-            if ( another.start <= structure.start
-                    && another.end >= structure.start )
-            {
-                return;
-            }
-
-            if ( ( structure.start < another.start && another.start < structure.end )
-                    || ( structure.start < another.start && another.end <= structure.end )
-                    || ( structure.start <= another.start && another.end < structure.end ) )
-            {
-                iterator.remove();
-                continue;
-            }
-        }
-        structures.add( structure );
-    }
-
-    private final Set<Bookmark> bookmarkStack = new LinkedHashSet<Bookmark>();
-
-    private FontReplacer fontReplacer = new DefaultFontReplacer();
-
-    private POILogger log = POILogFactory.getLogger( getClass() );
-
-    private NumberingState numberingState = new NumberingState();
-
-    private PicturesManager picturesManager;
-
-    /**
-     * Special actions that need to be called after processing complete, like
-     * updating stylesheets or building document notes list. Usually they are
-     * called once, but it's okay to call them several times.
-     */
-    protected void afterProcess()
-    {
-        // by default no such actions needed
-    }
-
-    protected Triplet getCharacterRunTriplet( CharacterRun characterRun )
-    {
-        Triplet original = new Triplet();
-        original.bold = characterRun.isBold();
-        original.italic = characterRun.isItalic();
-        original.fontName = characterRun.getFontName();
-        Triplet updated = getFontReplacer().update( original );
-        return updated;
-    }
-
-    public abstract Document getDocument();
-
-    public FontReplacer getFontReplacer()
-    {
-        return fontReplacer;
-    }
-
-    protected int getNumberColumnsSpanned( int[] tableCellEdges,
-            int currentEdgeIndex, TableCell tableCell )
-    {
-        int nextEdgeIndex = currentEdgeIndex;
-        int colSpan = 0;
-        int cellRightEdge = tableCell.getLeftEdge() + tableCell.getWidth();
-        while ( tableCellEdges[nextEdgeIndex] < cellRightEdge )
-        {
-            colSpan++;
-            nextEdgeIndex++;
-        }
-        return colSpan;
-    }
-
-    protected int getNumberRowsSpanned( Table table,
-            final int[] tableCellEdges, int currentRowIndex,
-            int currentColumnIndex, TableCell tableCell )
-    {
-        if ( !tableCell.isFirstVerticallyMerged() )
-            return 1;
-
-        final int numRows = table.numRows();
-
-        int count = 1;
-        for ( int r1 = currentRowIndex + 1; r1 < numRows; r1++ )
-        {
-            TableRow nextRow = table.getRow( r1 );
-            if ( currentColumnIndex >= nextRow.numCells() )
-                break;
-
-            // we need to skip row if he don't have cells at all
-            boolean hasCells = false;
-            int currentEdgeIndex = 0;
-            for ( int c = 0; c < nextRow.numCells(); c++ )
-            {
-                TableCell nextTableCell = nextRow.getCell( c );
-                if ( !nextTableCell.isVerticallyMerged()
-                        || nextTableCell.isFirstVerticallyMerged() )
-                {
-                    int colSpan = getNumberColumnsSpanned( tableCellEdges,
-                            currentEdgeIndex, nextTableCell );
-                    currentEdgeIndex += colSpan;
-
-                    if ( colSpan != 0 )
-                    {
-                        hasCells = true;
-                        break;
-                    }
-                }
-                else
-                {
-                    currentEdgeIndex += getNumberColumnsSpanned(
-                            tableCellEdges, currentEdgeIndex, nextTableCell );
-                }
-            }
-            if ( !hasCells )
-                continue;
-
-            TableCell nextCell = nextRow.getCell( currentColumnIndex );
-            if ( !nextCell.isVerticallyMerged()
-                    || nextCell.isFirstVerticallyMerged() )
-                break;
-            count++;
-        }
-        return count;
-    }
-
-    public PicturesManager getPicturesManager()
-    {
-        return picturesManager;
-    }
-
-    protected abstract void outputCharacters( Element block,
-            CharacterRun characterRun, String text );
-
-    /**
-     * Wrap range into bookmark(s) and process it. All bookmarks have starts
-     * equal to range start and ends equal to range end. Usually it's only one
-     * bookmark.
-     */
-    protected abstract void processBookmarks( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range range, int currentTableLevel,
-            List<Bookmark> rangeBookmarks );
-
-    protected boolean processCharacters( final HWPFDocumentCore wordDocument,
-            final int currentTableLevel, final Range range, final Element block )
-    {
-        if ( range == null )
-            return false;
-
-        boolean haveAnyText = false;
-
-        /*
-         * In text there can be fields, bookmarks, may be other structures (code
-         * below allows extension). Those structures can overlaps, so either we
-         * should process char-by-char (slow) or find a correct way to
-         * reconstruct the structure of range -- sergey
-         */
-        List<Structure> structures = new LinkedList<Structure>();
-        if ( wordDocument instanceof HWPFDocument )
-        {
-            final HWPFDocument doc = (HWPFDocument) wordDocument;
-
-            Map<Integer, List<Bookmark>> rangeBookmarks = doc.getBookmarks()
-                    .getBookmarksStartedBetween( range.getStartOffset(),
-                            range.getEndOffset() );
-
-            if ( rangeBookmarks != null )
-            {
-                for ( List<Bookmark> lists : rangeBookmarks.values() )
-                {
-                    for ( Bookmark bookmark : lists )
-                    {
-                        if ( !bookmarkStack.contains( bookmark ) )
-                            addToStructures( structures, new Structure(
-                                    bookmark ) );
-                    }
-                }
-            }
-
-            // TODO: dead fields?
-            int skipUntil = -1;
-            for ( int c = 0; c < range.numCharacterRuns(); c++ )
-            {
-                CharacterRun characterRun = range.getCharacterRun( c );
-                if ( characterRun == null )
-                    throw new AssertionError();
-                if ( characterRun.getStartOffset() < skipUntil )
-                    continue;
-                String text = characterRun.text();
-                if ( text == null || text.length() == 0
-                        || text.charAt( 0 ) != FIELD_BEGIN_MARK )
-                    continue;
-
-                Field aliveField = ( (HWPFDocument) wordDocument ).getFields()
-                        .getFieldByStartOffset( FieldsDocumentPart.MAIN,
-                                characterRun.getStartOffset() );
-                if ( aliveField != null )
-                {
-                    addToStructures( structures, new Structure( aliveField ) );
-                }
-                else
-                {
-                    int[] separatorEnd = tryDeadField_lookupFieldSeparatorEnd(
-                            wordDocument, range, c );
-                    if ( separatorEnd != null )
-                    {
-                        addToStructures(
-                                structures,
-                                new Structure( new DeadFieldBoundaries( c,
-                                        separatorEnd[0], separatorEnd[1] ),
-                                        characterRun.getStartOffset(), range
-                                                .getCharacterRun(
-                                                        separatorEnd[1] )
-                                                .getEndOffset() ) );
-                        c = separatorEnd[1];
-                    }
-                }
-            }
-        }
-
-        structures = new ArrayList<Structure>( structures );
-        Collections.sort( structures );
-
-        int previous = range.getStartOffset();
-        for ( Structure structure : structures )
-        {
-            if ( structure.start != previous )
-            {
-                Range subrange = new Range( previous, structure.start, range )
-                {
-                    @Override
-                    public String toString()
-                    {
-                        return "BetweenStructuresSubrange " + super.toString();
-                    }
-                };
-                processCharacters( wordDocument, currentTableLevel, subrange,
-                        block );
-            }
-
-            if ( structure.structure instanceof Bookmark )
-            {
-                // other bookmarks with same boundaries
-                List<Bookmark> bookmarks = new LinkedList<Bookmark>();
-                for ( Bookmark bookmark : ( (HWPFDocument) wordDocument )
-                        .getBookmarks()
-                        .getBookmarksStartedBetween( structure.start,
-                                structure.start + 1 ).values().iterator()
-                        .next() )
-                {
-                    if ( bookmark.getStart() == structure.start
-                            && bookmark.getEnd() == structure.end )
-                    {
-                        bookmarks.add( bookmark );
-                    }
-                }
-
-                bookmarkStack.addAll( bookmarks );
-                try
-                {
-                    int end = Math.min( range.getEndOffset(), structure.end );
-                    Range subrange = new Range( structure.start, end, range )
-                    {
-                        @Override
-                        public String toString()
-                        {
-                            return "BookmarksSubrange " + super.toString();
-                        }
-                    };
-
-                    processBookmarks( wordDocument, block, subrange,
-                            currentTableLevel, bookmarks );
-                }
-                finally
-                {
-                    bookmarkStack.removeAll( bookmarks );
-                }
-            }
-            else if ( structure.structure instanceof Field )
-            {
-                Field field = (Field) structure.structure;
-                processField( (HWPFDocument) wordDocument, range,
-                        currentTableLevel, field, block );
-            }
-            else if ( structure.structure instanceof DeadFieldBoundaries )
-            {
-                DeadFieldBoundaries boundaries = (DeadFieldBoundaries) structure.structure;
-                processDeadField( wordDocument, block, range,
-                        currentTableLevel, boundaries.beginMark,
-                        boundaries.separatorMark, boundaries.endMark );
-            }
-            else
-            {
-                throw new UnsupportedOperationException( "NYI: "
-                        + structure.structure.getClass() );
-            }
-
-            previous = Math.min( range.getEndOffset(), structure.end );
-        }
-
-        if ( previous != range.getStartOffset() )
-        {
-            if ( previous > range.getEndOffset() )
-            {
-                logger.log( POILogger.WARN, "Latest structure in ", range,
-                        " ended at #" + previous, " after range boundaries [",
-                        range.getStartOffset() + "; " + range.getEndOffset(),
-                        ")" );
-                return true;
-            }
-
-            if ( previous < range.getEndOffset() )
-            {
-                Range subrange = new Range( previous, range.getEndOffset(),
-                        range )
-                {
-                    @Override
-                    public String toString()
-                    {
-                        return "AfterStructureSubrange " + super.toString();
-                    }
-                };
-                processCharacters( wordDocument, currentTableLevel, subrange,
-                        block );
-            }
-            return true;
-        }
-
-        for ( int c = 0; c < range.numCharacterRuns(); c++ )
-        {
-            CharacterRun characterRun = range.getCharacterRun( c );
-
-            if ( characterRun == null )
-                throw new AssertionError();
-
-            if ( wordDocument instanceof HWPFDocument
-                    && ( (HWPFDocument) wordDocument ).getPicturesTable()
-                            .hasPicture( characterRun ) )
-            {
-                HWPFDocument newFormat = (HWPFDocument) wordDocument;
-                Picture picture = newFormat.getPicturesTable().extractPicture(
-                        characterRun, true );
-
-                processImage( block, characterRun.text().charAt( 0 ) == 0x01,
-                        picture );
-                continue;
-            }
-
-            String text = characterRun.text();
-            if ( text.isEmpty() ) continue;
-
-            if ( characterRun.isSpecialCharacter() )
-            {
-                if ( text.charAt( 0 ) == SPECCHAR_AUTONUMBERED_FOOTNOTE_REFERENCE
-                        && ( wordDocument instanceof HWPFDocument ) )
-                {
-                    HWPFDocument doc = (HWPFDocument) wordDocument;
-                    processNoteAnchor( doc, characterRun, block );
-                    continue;
-                }
-                if ( text.charAt( 0 ) == SPECCHAR_DRAWN_OBJECT
-                        && ( wordDocument instanceof HWPFDocument ) )
-                {
-                    HWPFDocument doc = (HWPFDocument) wordDocument;
-                    processDrawnObject( doc, characterRun, block );
-                    continue;
-                }
-                if ( characterRun.isOle2()
-                        && ( wordDocument instanceof HWPFDocument ) )
-                {
-                    HWPFDocument doc = (HWPFDocument) wordDocument;
-                    processOle2( doc, characterRun, block );
-                    continue;
-                }
-                if ( characterRun.isSymbol()
-                        && ( wordDocument instanceof HWPFDocument ) )
-                {
-                    HWPFDocument doc = (HWPFDocument) wordDocument;
-                    processSymbol( doc, characterRun, block );
-                    continue;
-                }
-            }
-
-            if ( text.charAt(0) == FIELD_BEGIN_MARK )
-            {
-                if ( wordDocument instanceof HWPFDocument )
-                {
-                    Field aliveField = ( (HWPFDocument) wordDocument )
-                            .getFields().getFieldByStartOffset(
-                                    FieldsDocumentPart.MAIN,
-                                    characterRun.getStartOffset() );
-                    if ( aliveField != null )
-                    {
-                        processField( ( (HWPFDocument) wordDocument ), range,
-                                currentTableLevel, aliveField, block );
-
-                        int continueAfter = aliveField.getFieldEndOffset();
-                        while ( c < range.numCharacterRuns()
-                                && range.getCharacterRun( c ).getEndOffset() <= continueAfter )
-                            c++;
-
-                        if ( c < range.numCharacterRuns() )
-                            c--;
-
-                        continue;
-                    }
-                }
-
-                int skipTo = tryDeadField( wordDocument, range,
-                        currentTableLevel, c, block );
-
-                if ( skipTo != c )
-                {
-                    c = skipTo;
-                    continue;
-                }
-
-                continue;
-            }
-            if ( text.charAt(0) == FIELD_SEPARATOR_MARK )
-            {
-                // shall not appear without FIELD_BEGIN_MARK
-                continue;
-            }
-            if ( text.charAt(0) == FIELD_END_MARK )
-            {
-                // shall not appear without FIELD_BEGIN_MARK
-                continue;
-            }
-
-            if ( characterRun.isSpecialCharacter() || characterRun.isObj()
-                    || characterRun.isOle2() )
-            {
-                continue;
-            }
-
-            if ( text.endsWith( "\r" )
-                    || ( text.charAt( text.length() - 1 ) == BEL_MARK && currentTableLevel != Integer.MIN_VALUE ) )
-                text = text.substring( 0, text.length() - 1 );
-
-            {
-                // line breaks
-                StringBuilder stringBuilder = new StringBuilder();
-                for ( char charChar : text.toCharArray() )
-                {
-                    if ( charChar == 11 )
-                    {
-                        if ( stringBuilder.length() > 0 )
-                        {
-                            outputCharacters( block, characterRun,
-                                    stringBuilder.toString() );
-                            stringBuilder.setLength( 0 );
-                        }
-                        processLineBreak( block, characterRun );
-                    }
-                    else if ( charChar == 30 )
-                    {
-                        // Non-breaking hyphens are stored as ASCII 30
-                        stringBuilder.append( UNICODECHAR_NONBREAKING_HYPHEN );
-                    }
-                    else if ( charChar == 31 )
-                    {
-                        // Non-required hyphens to zero-width space
-                        stringBuilder.append( UNICODECHAR_ZERO_WIDTH_SPACE );
-                    }
-                    else if ( charChar >= 0x20 || charChar == 0x09
-                            || charChar == 0x0A || charChar == 0x0D )
-                    {
-                        stringBuilder.append( charChar );
-                    }
-                }
-                if ( stringBuilder.length() > 0 )
-                {
-                    outputCharacters( block, characterRun,
-                            stringBuilder.toString() );
-                    stringBuilder.setLength( 0 );
-                }
-            }
-
-            haveAnyText |= text.trim().length() != 0;
-        }
-
-        return haveAnyText;
-    }
-
-    protected void processDeadField( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range range, int currentTableLevel,
-            int beginMark, int separatorMark, int endMark )
-    {
-        if ( beginMark + 1 < separatorMark && separatorMark + 1 < endMark )
-        {
-            Range formulaRange = new Range( range.getCharacterRun(
-                    beginMark + 1 ).getStartOffset(), range.getCharacterRun(
-                    separatorMark - 1 ).getEndOffset(), range )
-            {
-                @Override
-                public String toString()
-                {
-                    return "Dead field formula subrange: " + super.toString();
-                }
-            };
-            Range valueRange = new Range( range.getCharacterRun(
-                    separatorMark + 1 ).getStartOffset(), range
-                    .getCharacterRun( endMark - 1 ).getEndOffset(), range )
-            {
-                @Override
-                public String toString()
-                {
-                    return "Dead field value subrange: " + super.toString();
-                }
-            };
-            String formula = formulaRange.text();
-            final Matcher matcher = PATTERN_HYPERLINK_LOCAL.matcher( formula );
-            if ( matcher.matches() )
-            {
-                String localref = matcher.group( 1 );
-                processPageref( wordDocument, currentBlock, valueRange,
-                        currentTableLevel, localref );
-                return;
-            }
-        }
-
-        StringBuilder debug = new StringBuilder( "Unsupported field type: \n" );
-        for ( int i = beginMark; i <= endMark; i++ )
-        {
-            debug.append( "\t" );
-            debug.append( range.getCharacterRun( i ) );
-            debug.append( "\n" );
-        }
-        logger.log( POILogger.WARN, debug );
-
-        Range deadFieldValueSubrage = new Range( range.getCharacterRun(
-                separatorMark ).getStartOffset() + 1, range.getCharacterRun(
-                endMark ).getStartOffset(), range )
-        {
-            @Override
-            public String toString()
-            {
-                return "DeadFieldValueSubrange (" + super.toString() + ")";
-            }
-        };
-
-        // just output field value
-        if ( separatorMark + 1 < endMark )
-            processCharacters( wordDocument, currentTableLevel,
-                    deadFieldValueSubrage, currentBlock );
-
-        return;
-    }
-
-    public void processDocument( HWPFDocumentCore wordDocument )
-    {
-        try
-        {
-            final SummaryInformation summaryInformation = wordDocument
-                    .getSummaryInformation();
-            if ( summaryInformation != null )
-            {
-                processDocumentInformation( summaryInformation );
-            }
-        }
-        catch ( Exception exc )
-        {
-            logger.log( POILogger.WARN,
-                    "Unable to process document summary information: ", exc,
-                    exc );
-        }
-
-        final Range docRange = wordDocument.getRange();
-
-        if ( docRange.numSections() == 1 )
-        {
-            processSingleSection( wordDocument, docRange.getSection( 0 ) );
-            afterProcess();
-            return;
-        }
-
-        processDocumentPart( wordDocument, docRange );
-        afterProcess();
-    }
-
-    protected abstract void processDocumentInformation(
-            SummaryInformation summaryInformation );
-
-    protected void processDocumentPart( HWPFDocumentCore wordDocument,
-            final Range range )
-    {
-        for ( int s = 0; s < range.numSections(); s++ )
-        {
-            processSection( wordDocument, range.getSection( s ), s );
-        }
-    }
-
-    protected void processDrawnObject( HWPFDocument doc,
-            CharacterRun characterRun, Element block )
-    {
-        if ( getPicturesManager() == null )
-            return;
-
-        // TODO: support headers
-        OfficeDrawing officeDrawing = doc.getOfficeDrawingsMain()
-                .getOfficeDrawingAt( characterRun.getStartOffset() );
-        if ( officeDrawing == null )
-        {
-            logger.log( POILogger.WARN, "Characters #" + characterRun
-                    + " references missing drawn object" );
-            return;
-        }
-
-        byte[] pictureData = officeDrawing.getPictureData();
-        if ( pictureData == null )
-            // usual shape?
-            return;
-
-        float width = ( officeDrawing.getRectangleRight() - officeDrawing
-                .getRectangleLeft() ) / AbstractWordUtils.TWIPS_PER_INCH;
-        float height = ( officeDrawing.getRectangleBottom() - officeDrawing
-                .getRectangleTop() ) / AbstractWordUtils.TWIPS_PER_INCH;
-
-        final PictureType type = PictureType.findMatchingType( pictureData );
-        String path = getPicturesManager()
-                .savePicture( pictureData, type,
-                        "s" + characterRun.getStartOffset() + "." + type,
-                        width, height );
-
-        processDrawnObject( doc, characterRun, officeDrawing, path, block );
-    }
-
-    protected abstract void processDrawnObject( HWPFDocument doc,
-            CharacterRun characterRun, OfficeDrawing officeDrawing,
-            String path, Element block );
-
-    protected void processDropDownList( Element block,
-            CharacterRun characterRun, String[] values, int defaultIndex )
-    {
-        outputCharacters( block, characterRun, values[defaultIndex] );
-    }
-
-    protected abstract void processEndnoteAutonumbered(
-            HWPFDocument wordDocument, int noteIndex, Element block,
-            Range endnoteTextRange );
-
-    protected void processField( HWPFDocument wordDocument, Range parentRange,
-            int currentTableLevel, Field field, Element currentBlock )
-    {
-        switch ( field.getType() )
-        {
-        case 37: // page reference
-        {
-            final Range firstSubrange = field.firstSubrange( parentRange );
-            if ( firstSubrange != null )
-            {
-                String formula = firstSubrange.text();
-                Matcher matcher = PATTERN_PAGEREF.matcher( formula );
-                if ( matcher.find() )
-                {
-                    String pageref = matcher.group( 1 );
-                    processPageref( wordDocument, currentBlock,
-                            field.secondSubrange( parentRange ),
-                            currentTableLevel, pageref );
-                    return;
-                }
-            }
-            break;
-        }
-        case 58: // Embedded Object
-        {
-            if ( !field.hasSeparator() )
-            {
-                logger.log( POILogger.WARN, parentRange + " contains " + field
-                        + " with 'Embedded Object' but without separator mark" );
-                return;
-            }
-
-            CharacterRun separator = field
-                    .getMarkSeparatorCharacterRun( parentRange );
-
-            if ( separator.isOle2() )
-            {
-                // the only supported so far
-                boolean processed = processOle2( wordDocument, separator,
-                        currentBlock );
-
-                // if we didn't output OLE - output field value
-                if ( !processed )
-                {
-                    processCharacters( wordDocument, currentTableLevel,
-                            field.secondSubrange( parentRange ), currentBlock );
-                }
-
-                return;
-            }
-
-            break;
-        }
-        case 83: // drop down
-        {
-            Range fieldContent = field.firstSubrange( parentRange );
-            CharacterRun cr = fieldContent.getCharacterRun( fieldContent
-                    .numCharacterRuns() - 1 );
-            String[] values = cr.getDropDownListValues();
-            Integer defIndex = cr.getDropDownListDefaultItemIndex();
-
-            if ( values != null && values.length > 0 )
-            {
-                processDropDownList( currentBlock, cr, values,
-                        defIndex == null ? -1 : defIndex.intValue() );
-                return;
-            }
-            break;
-        }
-        case 88: // hyperlink
-        {
-            final Range firstSubrange = field.firstSubrange( parentRange );
-            if ( firstSubrange != null )
-            {
-                String formula = firstSubrange.text();
-                Matcher matcher = PATTERN_HYPERLINK_EXTERNAL.matcher( formula );
-                if ( matcher.matches() )
-                {
-                    String hyperlink = matcher.group( 1 );
-                    processHyperlink( wordDocument, currentBlock,
-                            field.secondSubrange( parentRange ),
-                            currentTableLevel, hyperlink );
-                    return;
-                }
-                matcher.usePattern( PATTERN_HYPERLINK_LOCAL );
-                if ( matcher.matches() )
-                {
-                    String hyperlink = matcher.group( 1 );
-                    Range textRange = null;
-                    String text = matcher.group( 2 );
-                    if ( AbstractWordUtils.isNotEmpty( text ) )
-                    {
-                        textRange = new Range( firstSubrange.getStartOffset()
-                                + matcher.start( 2 ),
-                                firstSubrange.getStartOffset()
-                                        + matcher.end( 2 ), firstSubrange )
-                        {
-                            @Override
-                            public String toString()
-                            {
-                                return "Local hyperlink text";
-                            }
-                        };
-                    }
-                    processPageref( wordDocument, currentBlock, textRange,
-                            currentTableLevel, hyperlink );
-                    return;
-                }
-            }
-            break;
-        }
-        }
-
-        logger.log( POILogger.WARN, parentRange + " contains " + field
-                + " with unsupported type or format" );
-        processCharacters( wordDocument, currentTableLevel,
-                field.secondSubrange( parentRange ), currentBlock );
-    }
-
-    protected abstract void processFootnoteAutonumbered(
-            HWPFDocument wordDocument, int noteIndex, Element block,
-            Range footnoteTextRange );
-
-    protected abstract void processHyperlink( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String hyperlink );
-
-    protected void processImage( Element currentBlock, boolean inlined, Picture picture ) {
-        PicturesManager fileManager = getPicturesManager();
-        if ( fileManager != null ) {
-            final float aspectRatioX = picture.getHorizontalScalingFactor();
-            final float aspectRatioY = picture.getVerticalScalingFactor();
-
-            float imageWidth = picture.getDxaGoal();
-            if (aspectRatioX > 0) {
-                imageWidth *= aspectRatioX / 1000f;
-            }
-            imageWidth /= AbstractWordUtils.TWIPS_PER_INCH;
-            
-            float imageHeight = picture.getDyaGoal();
-            if (aspectRatioY > 0) {
-                imageHeight *= aspectRatioY / 1000f;
-            }
-            imageHeight /= AbstractWordUtils.TWIPS_PER_INCH;
-
-            String url = fileManager.savePicture( picture.getContent(),
-                    picture.suggestPictureType(),
-                    picture.suggestFullFileName(), imageWidth, imageHeight );
-
-            if ( WordToFoUtils.isNotEmpty( url ) )
-            {
-                processImage( currentBlock, inlined, picture, url );
-                return;
-            }
-        }
-
-        processImageWithoutPicturesManager( currentBlock, inlined, picture );
-
-    }
-
-    protected abstract void processImage( Element currentBlock,
-            boolean inlined, Picture picture, String url );
-
-    @Internal
-    protected abstract void processImageWithoutPicturesManager(
-            Element currentBlock, boolean inlined, Picture picture );
-
-    protected abstract void processLineBreak( Element block,
-            CharacterRun characterRun );
-
-    protected void processNoteAnchor( HWPFDocument doc,
-            CharacterRun characterRun, final Element block )
-    {
-        {
-            Notes footnotes = doc.getFootnotes();
-            int noteIndex = footnotes
-                    .getNoteIndexByAnchorPosition( characterRun
-                            .getStartOffset() );
-            if ( noteIndex != -1 )
-            {
-                Range footnoteRange = doc.getFootnoteRange();
-                int rangeStartOffset = footnoteRange.getStartOffset();
-                int noteTextStartOffset = footnotes
-                        .getNoteTextStartOffset( noteIndex );
-                int noteTextEndOffset = footnotes
-                        .getNoteTextEndOffset( noteIndex );
-
-                Range noteTextRange = new Range( rangeStartOffset
-                        + noteTextStartOffset, rangeStartOffset
-                        + noteTextEndOffset, doc );
-
-                processFootnoteAutonumbered( doc, noteIndex, block,
-                        noteTextRange );
-                return;
-            }
-        }
-        {
-            Notes endnotes = doc.getEndnotes();
-            int noteIndex = endnotes.getNoteIndexByAnchorPosition( characterRun
-                    .getStartOffset() );
-            if ( noteIndex != -1 )
-            {
-                Range endnoteRange = doc.getEndnoteRange();
-                int rangeStartOffset = endnoteRange.getStartOffset();
-                int noteTextStartOffset = endnotes
-                        .getNoteTextStartOffset( noteIndex );
-                int noteTextEndOffset = endnotes
-                        .getNoteTextEndOffset( noteIndex );
-
-                Range noteTextRange = new Range( rangeStartOffset
-                        + noteTextStartOffset, rangeStartOffset
-                        + noteTextEndOffset, doc );
-
-                processEndnoteAutonumbered( doc, noteIndex, block,
-                        noteTextRange );
-                return;
-            }
-        }
-    }
-
-    private boolean processOle2( HWPFDocument doc, CharacterRun characterRun,
-            Element block )
-    {
-        Entry entry = doc.getObjectsPool().getObjectById(
-                "_" + characterRun.getPicOffset() );
-        if ( entry == null )
-        {
-            logger.log( POILogger.WARN, "Referenced OLE2 object '",
-                    Integer.valueOf( characterRun.getPicOffset() ),
-                    "' not found in ObjectPool" );
-            return false;
-        }
-
-        try
-        {
-            return processOle2( doc, block, entry );
-        }
-        catch ( Exception exc )
-        {
-            logger.log( POILogger.WARN,
-                    "Unable to convert internal OLE2 object '",
-                    Integer.valueOf( characterRun.getPicOffset() ), "': ", exc,
-                    exc );
-            return false;
-        }
-    }
-
-    protected boolean processOle2( HWPFDocument wordDocument, Element block,
-            Entry entry ) throws Exception
-    {
-        return false;
-    }
-
-    protected abstract void processPageBreak( HWPFDocumentCore wordDocument,
-            Element flow );
-
-    protected abstract void processPageref( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String pageref );
-
-    protected abstract void processParagraph( HWPFDocumentCore wordDocument,
-            Element parentElement, int currentTableLevel, Paragraph paragraph,
-            String bulletText );
-
-    protected void processParagraphes( HWPFDocumentCore wordDocument,
-            Element flow, Range range, int currentTableLevel )
-    {
-        final int paragraphs = range.numParagraphs();
-        for ( int p = 0; p < paragraphs; p++ )
-        {
-            Paragraph paragraph = range.getParagraph( p );
-
-            if ( paragraph.isInTable()
-                    && paragraph.getTableLevel() != currentTableLevel )
-            {
-                if ( paragraph.getTableLevel() < currentTableLevel )
-                    throw new IllegalStateException(
-                            "Trying to process table cell with higher level ("
-                                    + paragraph.getTableLevel()
-                                    + ") than current table level ("
-                                    + currentTableLevel
-                                    + ") as inner table part" );
-
-                Table table = range.getTable( paragraph );
-                processTable( wordDocument, flow, table );
-
-                p += table.numParagraphs();
-                p--;
-                continue;
-            }
-
-            if ( paragraph.text().equals( "\u000c" ) )
-            {
-                processPageBreak( wordDocument, flow );
-            }
-
-            boolean processed = false;
-            if ( paragraph.isInList() )
-            {
-                try
-                {
-                    HWPFList hwpfList = paragraph.getList();
-
-                    String label = AbstractWordUtils.getBulletText(
-                            numberingState, hwpfList,
-                            (char) paragraph.getIlvl() );
-
-                    processParagraph( wordDocument, flow, currentTableLevel,
-                            paragraph, label );
-                    processed = true;
-                }
-                catch ( Exception exc )
-                {
-                    log.log(
-                            POILogger.WARN,
-                            "Can't process paragraph as list entry, will be processed without list information",
-                            exc );
-                }
-            }
-
-            if ( processed == false )
-            {
-                processParagraph( wordDocument, flow, currentTableLevel,
-                        paragraph, AbstractWordUtils.EMPTY );
-            }
-        }
-
-    }
-
-    protected abstract void processSection( HWPFDocumentCore wordDocument,
-            Section section, int s );
-
-    protected void processSingleSection( HWPFDocumentCore wordDocument,
-            Section section )
-    {
-        processSection( wordDocument, section, 0 );
-    }
-
-    protected void processSymbol( HWPFDocument doc, CharacterRun characterRun,
-            Element block )
-    {
-
-    }
-
-    protected abstract void processTable( HWPFDocumentCore wordDocument,
-            Element flow, Table table );
-
-    public void setFontReplacer( FontReplacer fontReplacer )
-    {
-        this.fontReplacer = fontReplacer;
-    }
-
-    public void setPicturesManager( PicturesManager fileManager )
-    {
-        this.picturesManager = fileManager;
-    }
-
-    protected int tryDeadField( HWPFDocumentCore wordDocument, Range range,
-            int currentTableLevel, int beginMark, Element currentBlock )
-    {
-        int[] separatorEnd = tryDeadField_lookupFieldSeparatorEnd(
-                wordDocument, range, beginMark );
-        if ( separatorEnd == null )
-            return beginMark;
-
-        processDeadField( wordDocument, currentBlock, range, currentTableLevel,
-                beginMark, separatorEnd[0], separatorEnd[1] );
-
-        return separatorEnd[1];
-    }
-
-    private int[] tryDeadField_lookupFieldSeparatorEnd(
-            HWPFDocumentCore wordDocument, Range range, int beginMark )
-    {
-        int separatorMark = -1;
-        int endMark = -1;
-        for ( int c = beginMark + 1; c < range.numCharacterRuns(); c++ )
-        {
-            CharacterRun characterRun = range.getCharacterRun( c );
-
-            String text = characterRun.text();
-            if ( text.isEmpty() ) continue;
-
-            final char firstByte = text.charAt(0);
-            if ( firstByte == FIELD_BEGIN_MARK )
-            {
-                int[] nested = tryDeadField_lookupFieldSeparatorEnd(
-                        wordDocument, range, c );
-                if ( nested != null )
-                {
-                    c = nested[1];
-                }
-                continue;
-            }
-
-            if ( firstByte == FIELD_SEPARATOR_MARK )
-            {
-                if ( separatorMark != -1 )
-                {
-                    // double; incorrect format
-                    return null;
-                }
-
-                separatorMark = c;
-                continue;
-            }
-
-            if ( firstByte == FIELD_END_MARK )
-            {
-                if ( endMark != -1 )
-                {
-                    // double;
-                    return null;
-                }
-
-                endMark = c;
-                break;
-            }
-        }
-
-        if ( separatorMark == -1 || endMark == -1 )
-            return null;
-
-        return new int[] { separatorMark, endMark };
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
deleted file mode 100644
index aff9519..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.HWPFOldDocument;
-import org.apache.poi.hwpf.OldWordFileFormatException;
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.HWPFList;
-import org.apache.poi.hwpf.usermodel.Table;
-import org.apache.poi.hwpf.usermodel.TableCell;
-import org.apache.poi.hwpf.usermodel.TableRow;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-@Beta
-public class AbstractWordUtils
-{
-    static final String EMPTY = "";
-
-    private static final POILogger logger = POILogFactory
-            .getLogger( AbstractWordUtils.class );
-
-    public static final float TWIPS_PER_INCH = 1440.0f;
-    public static final int TWIPS_PER_PT = 20;
-
-    /**
-     * Creates array of all possible cell edges. In HTML (and FO) cells from
-     * different rows and same column should have same width, otherwise spanning
-     * shall be used.
-     * 
-     * @param table
-     *            table to build cell edges array from
-     * @return array of cell edges (including leftest one) in twips
-     */
-    static int[] buildTableCellEdgesArray( Table table )
-    {
-        Set<Integer> edges = new TreeSet<Integer>();
-
-        for ( int r = 0; r < table.numRows(); r++ )
-        {
-            TableRow tableRow = table.getRow( r );
-            for ( int c = 0; c < tableRow.numCells(); c++ )
-            {
-                TableCell tableCell = tableRow.getCell( c );
-
-                edges.add( Integer.valueOf( tableCell.getLeftEdge() ) );
-                edges.add( Integer.valueOf( tableCell.getLeftEdge()
-                        + tableCell.getWidth() ) );
-            }
-        }
-
-        Integer[] sorted = edges.toArray( new Integer[edges.size()] );
-        int[] result = new int[sorted.length];
-        for ( int i = 0; i < sorted.length; i++ )
-        {
-            result[i] = sorted[i].intValue();
-        }
-
-        return result;
-    }
-
-    static boolean canBeMerged( Node node1, Node node2, String requiredTagName )
-    {
-        if ( node1.getNodeType() != Node.ELEMENT_NODE
-                || node2.getNodeType() != Node.ELEMENT_NODE )
-            return false;
-
-        Element element1 = (Element) node1;
-        Element element2 = (Element) node2;
-
-        if ( !equals( requiredTagName, element1.getTagName() )
-                || !equals( requiredTagName, element2.getTagName() ) )
-            return false;
-
-        NamedNodeMap attributes1 = element1.getAttributes();
-        NamedNodeMap attributes2 = element2.getAttributes();
-
-        if ( attributes1.getLength() != attributes2.getLength() )
-            return false;
-
-        for ( int i = 0; i < attributes1.getLength(); i++ )
-        {
-            final Attr attr1 = (Attr) attributes1.item( i );
-            final Attr attr2;
-            if ( isNotEmpty( attr1.getNamespaceURI() ) )
-                attr2 = (Attr) attributes2.getNamedItemNS(
-                        attr1.getNamespaceURI(), attr1.getLocalName() );
-            else
-                attr2 = (Attr) attributes2.getNamedItem( attr1.getName() );
-
-            if ( attr2 == null
-                    || !equals( attr1.getTextContent(), attr2.getTextContent() ) )
-                return false;
-        }
-
-        return true;
-    }
-
-    static void compactChildNodesR( Element parentElement, String childTagName )
-    {
-        NodeList childNodes = parentElement.getChildNodes();
-        for ( int i = 0; i < childNodes.getLength() - 1; i++ )
-        {
-            Node child1 = childNodes.item( i );
-            Node child2 = childNodes.item( i + 1 );
-            if ( !WordToFoUtils.canBeMerged( child1, child2, childTagName ) )
-                continue;
-
-            // merge
-            while ( child2.getChildNodes().getLength() > 0 )
-                child1.appendChild( child2.getFirstChild() );
-            child2.getParentNode().removeChild( child2 );
-            i--;
-        }
-
-        childNodes = parentElement.getChildNodes();
-        for ( int i = 0; i < childNodes.getLength() - 1; i++ )
-        {
-            Node child = childNodes.item( i );
-            if ( child instanceof Element )
-            {
-                compactChildNodesR( (Element) child, childTagName );
-            }
-        }
-    }
-
-    static boolean equals( String str1, String str2 )
-    {
-        return str1 == null ? str2 == null : str1.equals( str2 );
-    }
-
-    public static String getBorderType( BorderCode borderCode )
-    {
-        if ( borderCode == null )
-            throw new IllegalArgumentException( "borderCode is null" );
-
-        switch ( borderCode.getBorderType() )
-        {
-        case 1:
-        case 2:
-            return "solid";
-        case 3:
-            return "double";
-        case 5:
-            return "solid";
-        case 6:
-            return "dotted";
-        case 7:
-        case 8:
-            return "dashed";
-        case 9:
-            return "dotted";
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-        case 17:
-        case 18:
-        case 19:
-            return "double";
-        case 20:
-            return "solid";
-        case 21:
-            return "double";
-        case 22:
-            return "dashed";
-        case 23:
-            return "dashed";
-        case 24:
-            return "ridge";
-        case 25:
-            return "grooved";
-        default:
-            return "solid";
-        }
-    }
-
-    public static String getBorderWidth( BorderCode borderCode )
-    {
-        int lineWidth = borderCode.getLineWidth();
-        int pt = lineWidth / 8;
-        int pte = lineWidth - pt * 8;
-
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append( pt );
-        stringBuilder.append( "." );
-        stringBuilder.append( 1000 / 8 * pte );
-        stringBuilder.append( "pt" );
-        return stringBuilder.toString();
-    }
-
-    public static class NumberingState
-    {
-
-        private final Map<String, Integer> levels = new HashMap<String, Integer>();
-
-    }
-
-    public static String getBulletText( NumberingState numberingState,
-            HWPFList list, char level )
-    {
-        StringBuffer bulletBuffer = new StringBuffer();
-        char[] xst = list.getNumberText( level ).toCharArray();
-        for ( char element : xst )
-        {
-            if ( element < 9 )
-            {
-                int lsid = list.getLsid();
-                final String key = lsid + "#" + ( (int) element );
-                int num;
-
-                if ( !list.isStartAtOverriden( element )
-                        && numberingState.levels.containsKey( key ) )
-                {
-                    num = numberingState.levels.get( key ).intValue();
-                    if ( level == element )
-                    {
-                        num++;
-                        numberingState.levels.put( key, Integer.valueOf( num ) );
-                    }
-                }
-                else
-                {
-                    num = list.getStartAt( element );
-                    numberingState.levels.put( key, Integer.valueOf( num ) );
-                }
-
-                if ( level == element )
-                {
-                    // cleaning states of nested levels to reset numbering
-                    for ( int i = element + 1; i < 9; i++ )
-                    {
-                        final String childKey = lsid + "#" + i;
-                        numberingState.levels.remove( childKey );
-                    }
-                }
-                
-                bulletBuffer.append( NumberFormatter.getNumber( num,
-                        list.getNumberFormat( level ) ) );
-            }
-            else
-            {
-                bulletBuffer.append( element );
-            }
-        }
-
-        byte follow = list.getTypeOfCharFollowingTheNumber( level );
-        switch ( follow )
-        {
-        case 0:
-            bulletBuffer.append( "\t" );
-            break;
-        case 1:
-            bulletBuffer.append( " " );
-            break;
-        default:
-            break;
-        }
-
-        return bulletBuffer.toString();
-    }
-
-    public static String getColor( int ico )
-    {
-        switch ( ico )
-        {
-        case 1:
-            return "black";
-        case 2:
-            return "blue";
-        case 3:
-            return "cyan";
-        case 4:
-            return "green";
-        case 5:
-            return "magenta";
-        case 6:
-            return "red";
-        case 7:
-            return "yellow";
-        case 8:
-            return "white";
-        case 9:
-            return "darkblue";
-        case 10:
-            return "darkcyan";
-        case 11:
-            return "darkgreen";
-        case 12:
-            return "darkmagenta";
-        case 13:
-            return "darkred";
-        case 14:
-            return "darkyellow";
-        case 15:
-            return "darkgray";
-        case 16:
-            return "lightgray";
-        default:
-            return "black";
-        }
-    }
-
-    public static String getOpacity( int argbValue )
-    {
-        int opacity = (int) ( ( argbValue & 0xFF000000l ) >>> 24 );
-        if ( opacity == 0 || opacity == 0xFF )
-            return ".0";
-
-        return "" + ( opacity / (float) 0xFF );
-    }
-
-    public static String getColor24( int argbValue )
-    {
-        if ( argbValue == -1 )
-            throw new IllegalArgumentException( "This colorref is empty" );
-
-        int bgrValue = argbValue & 0x00FFFFFF;
-        int rgbValue = ( bgrValue & 0x0000FF ) << 16 | ( bgrValue & 0x00FF00 )
-                | ( bgrValue & 0xFF0000 ) >> 16;
-
-        // http://www.w3.org/TR/REC-html40/types.html#h-6.5
-        switch ( rgbValue )
-        {
-        case 0xFFFFFF:
-            return "white";
-        case 0xC0C0C0:
-            return "silver";
-        case 0x808080:
-            return "gray";
-        case 0x000000:
-            return "black";
-        case 0xFF0000:
-            return "red";
-        case 0x800000:
-            return "maroon";
-        case 0xFFFF00:
-            return "yellow";
-        case 0x808000:
-            return "olive";
-        case 0x00FF00:
-            return "lime";
-        case 0x008000:
-            return "green";
-        case 0x00FFFF:
-            return "aqua";
-        case 0x008080:
-            return "teal";
-        case 0x0000FF:
-            return "blue";
-        case 0x000080:
-            return "navy";
-        case 0xFF00FF:
-            return "fuchsia";
-        case 0x800080:
-            return "purple";
-        }
-
-        StringBuilder result = new StringBuilder( "#" );
-        String hex = Integer.toHexString( rgbValue );
-        for ( int i = hex.length(); i < 6; i++ )
-        {
-            result.append( '0' );
-        }
-        result.append( hex );
-        return result.toString();
-    }
-
-    public static String getJustification( int js )
-    {
-        switch ( js )
-        {
-        case 0:
-            return "start";
-        case 1:
-            return "center";
-        case 2:
-            return "end";
-        case 3:
-        case 4:
-            return "justify";
-        case 5:
-            return "center";
-        case 6:
-            return "left";
-        case 7:
-            return "start";
-        case 8:
-            return "end";
-        case 9:
-            return "justify";
-        }
-        return "";
-    }
-
-    public static String getLanguage( int languageCode )
-    {
-        switch ( languageCode )
-        {
-        case 1024:
-            return EMPTY;
-        case 1033:
-            return "en-us";
-        case 1049:
-            return "ru-ru";
-        case 2057:
-            return "en-uk";
-        default:
-            logger.log( POILogger.WARN, "Uknown or unmapped language code: ",
-                    Integer.valueOf( languageCode ) );
-            return EMPTY;
-        }
-    }
-
-    public static String getListItemNumberLabel( int number, int format )
-    {
-
-        if ( format != 0 )
-        	logger.log( POILogger.INFO, "NYI: toListItemNumberLabel(): " + format );
-
-        return String.valueOf( number );
-    }
-
-    static boolean isEmpty( String str )
-    {
-        return str == null || str.length() == 0;
-    }
-
-    static boolean isNotEmpty( String str )
-    {
-        return !isEmpty( str );
-    }
-
-    public static HWPFDocumentCore loadDoc( final DirectoryNode root )
-            throws IOException
-    {
-        try
-        {
-            return new HWPFDocument( root );
-        }
-        catch ( OldWordFileFormatException exc )
-        {
-            return new HWPFOldDocument( root );
-        }
-    }
-
-    public static HWPFDocumentCore loadDoc( File docFile ) throws IOException
-    {
-        final FileInputStream istream = new FileInputStream( docFile );
-        try {
-            return loadDoc( istream );
-        } finally {
-            istream.close();
-        }
-    }
-
-    public static HWPFDocumentCore loadDoc( InputStream inputStream )
-            throws IOException
-    {
-        return loadDoc( HWPFDocumentCore.verifyAndBuildPOIFS( inputStream ) );
-    }
-
-    public static HWPFDocumentCore loadDoc(
-            final POIFSFileSystem poifsFileSystem ) throws IOException
-    {
-        return loadDoc( poifsFileSystem.getRoot() );
-    }
-
-    static String substringBeforeLast( String str, String separator )
-    {
-        if ( isEmpty( str ) || isEmpty( separator ) )
-        {
-            return str;
-        }
-        int pos = str.lastIndexOf( separator );
-        if ( pos == -1 )
-        {
-            return str;
-        }
-        return str.substring( 0, pos );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
deleted file mode 100644
index c7392c4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.util.Beta;
-
-@Beta
-public class DefaultFontReplacer implements FontReplacer
-{
-    public Triplet update( Triplet original )
-    {
-        if ( AbstractWordUtils.isNotEmpty( original.fontName ) )
-        {
-            String fontName = original.fontName;
-
-            if ( fontName.endsWith( " Regular" ) )
-                fontName = AbstractWordUtils.substringBeforeLast( fontName,
-                        " Regular" );
-
-            if ( fontName
-                    .endsWith( " \u041F\u043E\u043B\u0443\u0436\u0438\u0440\u043D\u044B\u0439" ) )
-                fontName = AbstractWordUtils
-                        .substringBeforeLast( fontName,
-                                " \u041F\u043E\u043B\u0443\u0436\u0438\u0440\u043D\u044B\u0439" )
-                        + " Bold";
-
-            if ( fontName
-                    .endsWith( " \u041F\u043E\u043B\u0443\u0436\u0438\u0440\u043D\u044B\u0439 \u041A\u0443\u0440\u0441\u0438\u0432" ) )
-                fontName = AbstractWordUtils
-                        .substringBeforeLast(
-                                fontName,
-                                " \u041F\u043E\u043B\u0443\u0436\u0438\u0440\u043D\u044B\u0439 \u041A\u0443\u0440\u0441\u0438\u0432" )
-                        + " Bold Italic";
-
-            if ( fontName.endsWith( " \u041A\u0443\u0440\u0441\u0438\u0432" ) )
-                fontName = AbstractWordUtils.substringBeforeLast( fontName,
-                        " \u041A\u0443\u0440\u0441\u0438\u0432" ) + " Italic";
-
-            original.fontName = fontName;
-        }
-
-        if ( AbstractWordUtils.isNotEmpty( original.fontName ) )
-        {
-            if ( "Times Regular".equals( original.fontName )
-                    || "Times-Regular".equals( original.fontName )
-                    || "Times Roman".equals( original.fontName ) )
-            {
-                original.fontName = "Times";
-                original.bold = false;
-                original.italic = false;
-            }
-            if ( "Times Bold".equals( original.fontName )
-                    || "Times-Bold".equals( original.fontName ) )
-            {
-                original.fontName = "Times";
-                original.bold = true;
-                original.italic = false;
-            }
-            if ( "Times Italic".equals( original.fontName )
-                    || "Times-Italic".equals( original.fontName ) )
-            {
-                original.fontName = "Times";
-                original.bold = false;
-                original.italic = true;
-            }
-            if ( "Times Bold Italic".equals( original.fontName )
-                    || "Times-BoldItalic".equals( original.fontName ) )
-            {
-                original.fontName = "Times";
-                original.bold = true;
-                original.italic = true;
-            }
-        }
-
-        return original;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
deleted file mode 100644
index a60eb89..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.util.Beta;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-@Beta
-public class FoDocumentFacade
-{
-    private static final String NS_RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-
-    private static final String NS_XSLFO = "http://www.w3.org/1999/XSL/Format";
-
-    protected final Element declarations;
-    protected final Document document;
-    protected final Element layoutMasterSet;
-    protected Element propertiesRoot;
-    protected final Element root;
-
-    public FoDocumentFacade( Document document )
-    {
-        this.document = document;
-
-        root = document.createElementNS( NS_XSLFO, "fo:root" );
-        document.appendChild( root );
-
-        layoutMasterSet = document.createElementNS( NS_XSLFO,
-                "fo:layout-master-set" );
-        root.appendChild( layoutMasterSet );
-
-        declarations = document.createElementNS( NS_XSLFO, "fo:declarations" );
-        root.appendChild( declarations );
-    }
-
-    public Element addFlowToPageSequence( final Element pageSequence,
-            String flowName )
-    {
-        final Element flow = document.createElementNS( NS_XSLFO, "fo:flow" );
-        flow.setAttribute( "flow-name", flowName );
-        pageSequence.appendChild( flow );
-
-        return flow;
-    }
-
-    public Element addListItem( Element listBlock )
-    {
-        Element result = createListItem();
-        listBlock.appendChild( result );
-        return result;
-    }
-
-    public Element addListItemBody( Element listItem )
-    {
-        Element result = createListItemBody();
-        listItem.appendChild( result );
-        return result;
-    }
-
-    public Element addListItemLabel( Element listItem, String text )
-    {
-        Element result = createListItemLabel( text );
-        listItem.appendChild( result );
-        return result;
-    }
-
-    public void addPageSequence( Element pageSequence )
-    {
-        root.appendChild( pageSequence );
-    }
-
-    public Element addPageSequence( String pageMaster )
-    {
-        final Element pageSequence = createPageSequence( pageMaster );
-        root.appendChild( pageSequence );
-        return pageSequence;
-    }
-
-    public Element addRegionBody( Element pageMaster )
-    {
-        final Element regionBody = document.createElementNS( NS_XSLFO,
-                "fo:region-body" );
-        pageMaster.appendChild( regionBody );
-
-        return regionBody;
-    }
-
-    public Element addSimplePageMaster( String masterName )
-    {
-        final Element simplePageMaster = document.createElementNS( NS_XSLFO,
-                "fo:simple-page-master" );
-        simplePageMaster.setAttribute( "master-name", masterName );
-        layoutMasterSet.appendChild( simplePageMaster );
-
-        return simplePageMaster;
-    }
-
-    public Element createBasicLinkExternal( String externalDestination )
-    {
-        final Element basicLink = document.createElementNS( NS_XSLFO,
-                "fo:basic-link" );
-        basicLink.setAttribute( "external-destination", externalDestination );
-        return basicLink;
-    }
-
-    public Element createBasicLinkInternal( String internalDestination )
-    {
-        final Element basicLink = document.createElementNS( NS_XSLFO,
-                "fo:basic-link" );
-        basicLink.setAttribute( "internal-destination", internalDestination );
-        return basicLink;
-    }
-
-    public Element createBlock()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:block" );
-    }
-
-    public Element createExternalGraphic( String source )
-    {
-        Element result = document.createElementNS( NS_XSLFO,
-                "fo:external-graphic" );
-        result.setAttribute( "src", "url('" + source + "')" );
-        return result;
-    }
-
-    public Element createFootnote()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:footnote" );
-    }
-
-    public Element createFootnoteBody()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:footnote-body" );
-    }
-
-    public Element createInline()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:inline" );
-    }
-
-    public Element createLeader()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:leader" );
-    }
-
-    public Element createListBlock()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:list-block" );
-    }
-
-    public Element createListItem()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:list-item" );
-    }
-
-    public Element createListItemBody()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:list-item-body" );
-    }
-
-    public Element createListItemLabel( String text )
-    {
-        Element result = document.createElementNS( NS_XSLFO,
-                "fo:list-item-label" );
-        Element block = createBlock();
-        block.appendChild( document.createTextNode( text ) );
-        result.appendChild( block );
-        return result;
-    }
-
-    public Element createPageSequence( String pageMaster )
-    {
-        final Element pageSequence = document.createElementNS( NS_XSLFO,
-                "fo:page-sequence" );
-        pageSequence.setAttribute( "master-reference", pageMaster );
-        return pageSequence;
-    }
-
-    public Element createTable()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:table" );
-    }
-
-    public Element createTableBody()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:table-body" );
-    }
-
-    public Element createTableCell()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:table-cell" );
-    }
-
-    public Element createTableColumn()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:table-column" );
-    }
-
-    public Element createTableHeader()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:table-header" );
-    }
-
-    public Element createTableRow()
-    {
-        return document.createElementNS( NS_XSLFO, "fo:table-row" );
-    }
-
-    public Text createText( String data )
-    {
-        return document.createTextNode( data );
-    }
-
-    public Document getDocument()
-    {
-        return document;
-    }
-
-    protected Element getOrCreatePropertiesRoot()
-    {
-        if ( propertiesRoot != null )
-            return propertiesRoot;
-
-        // See http://xmlgraphics.apache.org/fop/0.95/metadata.html
-
-        Element xmpmeta = document.createElementNS( "adobe:ns:meta/",
-                "x:xmpmeta" );
-        declarations.appendChild( xmpmeta );
-
-        Element rdf = document.createElementNS( NS_RDF, "rdf:RDF" );
-        xmpmeta.appendChild( rdf );
-
-        propertiesRoot = document.createElementNS( NS_RDF, "rdf:Description" );
-        propertiesRoot.setAttributeNS( NS_RDF, "rdf:about", "" );
-        rdf.appendChild( propertiesRoot );
-
-        return propertiesRoot;
-    }
-
-    public void setCreator( String value )
-    {
-        setDublinCoreProperty( "creator", value );
-    }
-
-    public void setCreatorTool( String value )
-    {
-        setXmpProperty( "CreatorTool", value );
-    }
-
-    public void setDescription( String value )
-    {
-        Element element = setDublinCoreProperty( "description", value );
-
-        if ( element != null )
-        {
-            element.setAttributeNS( "http://www.w3.org/XML/1998/namespace",
-                    "xml:lang", "x-default" );
-        }
-    }
-
-    public Element setDublinCoreProperty( String name, String value )
-    {
-        return setProperty( "http://purl.org/dc/elements/1.1/", "dc", name,
-                value );
-    }
-
-    public void setKeywords( String value )
-    {
-        setPdfProperty( "Keywords", value );
-    }
-
-    public Element setPdfProperty( String name, String value )
-    {
-        return setProperty( "http://ns.adobe.com/pdf/1.3/", "pdf", name, value );
-    }
-
-    public void setProducer( String value )
-    {
-        setPdfProperty( "Producer", value );
-    }
-
-    protected Element setProperty( String namespace, String prefix,
-            String name, String value )
-    {
-        Element propertiesRoot = getOrCreatePropertiesRoot();
-        NodeList existingChildren = propertiesRoot.getChildNodes();
-        for ( int i = 0; i < existingChildren.getLength(); i++ )
-        {
-            Node child = existingChildren.item( i );
-            if ( child.getNodeType() == Node.ELEMENT_NODE )
-            {
-                Element childElement = (Element) child;
-                if ( WordToFoUtils.isNotEmpty( childElement.getNamespaceURI() )
-                        && WordToFoUtils.isNotEmpty( childElement
-                                .getLocalName() )
-                        && namespace.equals( childElement.getNamespaceURI() )
-                        && name.equals( childElement.getLocalName() ) )
-                {
-                    propertiesRoot.removeChild( childElement );
-                    break;
-                }
-            }
-        }
-
-        if ( WordToFoUtils.isNotEmpty( value ) )
-        {
-            Element property = document.createElementNS( namespace, prefix
-                    + ":" + name );
-            property.appendChild( document.createTextNode( value ) );
-            propertiesRoot.appendChild( property );
-            return property;
-        }
-
-        return null;
-    }
-
-    public void setSubject( String value )
-    {
-        setDublinCoreProperty( "title", value );
-    }
-
-    public void setTitle( String value )
-    {
-        setDublinCoreProperty( "title", value );
-    }
-
-    public Element setXmpProperty( String name, String value )
-    {
-        return setProperty( "http://ns.adobe.com/xap/1.0/", "xmp", name, value );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java
deleted file mode 100644
index 24bb97f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.util.Beta;
-
-@Beta
-public interface FontReplacer
-{
-    public class Triplet
-    {
-        public String fontName;
-        public boolean bold;
-        public boolean italic;
-    }
-
-    public Triplet update( Triplet original );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
deleted file mode 100644
index 67f6ea1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.poi.util.Beta;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-@Beta
-public class HtmlDocumentFacade
-{
-    protected final Element body;
-    protected final Document document;
-    protected final Element head;
-    protected final Element html;
-
-    /**
-     * Map from tag name, to map linking known styles and css class names
-     */
-    private Map<String, Map<String, String>> stylesheet = new LinkedHashMap<String, Map<String, String>>();
-    private Element stylesheetElement;
-
-    protected Element title;
-    protected Text titleText;
-
-    public HtmlDocumentFacade( Document document )
-    {
-        this.document = document;
-
-        html = document.createElement( "html" );
-        document.appendChild( html );
-
-        body = document.createElement( "body" );
-        head = document.createElement( "head" );
-        stylesheetElement = document.createElement( "style" );
-        stylesheetElement.setAttribute( "type", "text/css" );
-
-        html.appendChild( head );
-        html.appendChild( body );
-        head.appendChild( stylesheetElement );
-
-        addStyleClass( body, "b", "white-space-collapsing:preserve;" );
-    }
-
-    public void addAuthor( String value )
-    {
-        addMeta( "author", value );
-    }
-
-    public void addDescription( String value )
-    {
-        addMeta( "description", value );
-    }
-
-    public void addKeywords( String value )
-    {
-        addMeta( "keywords", value );
-    }
-
-    public void addMeta( final String name, String value )
-    {
-        Element meta = document.createElement( "meta" );
-        meta.setAttribute( "name", name );
-        meta.setAttribute( "content", value );
-        head.appendChild( meta );
-    }
-
-    public void addStyleClass( Element element, String classNamePrefix,
-            String style )
-    {
-        String exising = element.getAttribute( "class" );
-        String addition = getOrCreateCssClass( classNamePrefix, style );
-        String newClassValue = WordToHtmlUtils.isEmpty( exising ) ? addition
-                : ( exising + " " + addition );
-        element.setAttribute( "class", newClassValue );
-    }
-
-    protected String buildStylesheet(
-            final Map<String, Map<String, String>> prefixToMapOfStyles )
-    {
-        StringBuilder stringBuilder = new StringBuilder();
-        for ( Map<String, String> byPrefix : prefixToMapOfStyles.values() )
-        {
-            for ( Map.Entry<String, String> byStyle : byPrefix.entrySet() )
-            {
-                String style = byStyle.getKey();
-                String className = byStyle.getValue();
-
-                stringBuilder.append( "." );
-                stringBuilder.append( className );
-                stringBuilder.append( "{" );
-                stringBuilder.append( style );
-                stringBuilder.append( "}\n" );
-            }
-        }
-        final String stylesheetText = stringBuilder.toString();
-        return stylesheetText;
-    }
-
-    public Element createBlock()
-    {
-        return document.createElement( "div" );
-    }
-
-    public Element createBookmark( String name )
-    {
-        final Element basicLink = document.createElement( "a" );
-        basicLink.setAttribute( "name", name );
-        return basicLink;
-    }
-
-    public Element createHeader1()
-    {
-        return document.createElement( "h1" );
-    }
-
-    public Element createHeader2()
-    {
-        return document.createElement( "h2" );
-    }
-
-    public Element createHyperlink( String internalDestination )
-    {
-        final Element basicLink = document.createElement( "a" );
-        basicLink.setAttribute( "href", internalDestination );
-        return basicLink;
-    }
-
-    public Element createImage( String src )
-    {
-        Element result = document.createElement( "img" );
-        result.setAttribute( "src", src );
-        return result;
-    }
-
-    public Element createLineBreak()
-    {
-        return document.createElement( "br" );
-    }
-
-    public Element createListItem()
-    {
-        return document.createElement( "li" );
-    }
-
-    public Element createOption( String value, boolean selected )
-    {
-        Element result = document.createElement( "option" );
-        result.appendChild( createText( value ) );
-        if ( selected )
-        {
-            result.setAttribute( "selected", "selected" );
-        }
-        return result;
-    }
-
-    public Element createParagraph()
-    {
-        return document.createElement( "p" );
-    }
-
-    public Element createSelect()
-    {
-        Element result = document.createElement( "select" );
-        return result;
-    }
-
-    public Element createTable()
-    {
-        return document.createElement( "table" );
-    }
-
-    public Element createTableBody()
-    {
-        return document.createElement( "tbody" );
-    }
-
-    public Element createTableCell()
-    {
-        return document.createElement( "td" );
-    }
-
-    public Element createTableColumn()
-    {
-        return document.createElement( "col" );
-    }
-
-    public Element createTableColumnGroup()
-    {
-        return document.createElement( "colgroup" );
-    }
-
-    public Element createTableHeader()
-    {
-        return document.createElement( "thead" );
-    }
-
-    public Element createTableHeaderCell()
-    {
-        return document.createElement( "th" );
-    }
-
-    public Element createTableRow()
-    {
-        return document.createElement( "tr" );
-    }
-
-    public Text createText( String data )
-    {
-        return document.createTextNode( data );
-    }
-
-    public Element createUnorderedList()
-    {
-        return document.createElement( "ul" );
-    }
-
-    public Element getBody()
-    {
-        return body;
-    }
-
-    public Document getDocument()
-    {
-        return document;
-    }
-
-    public Element getHead()
-    {
-        return head;
-    }
-
-    public String getOrCreateCssClass( String classNamePrefix, String style )
-    {
-        if ( !stylesheet.containsKey( classNamePrefix ) )
-            stylesheet.put( classNamePrefix, new LinkedHashMap<String, String>(
-                    1 ) );
-
-        Map<String, String> styleToClassName = stylesheet.get( classNamePrefix );
-        String knownClass = styleToClassName.get( style );
-        if ( knownClass != null )
-            return knownClass;
-
-        String newClassName = classNamePrefix + ( styleToClassName.size() + 1 );
-        styleToClassName.put( style, newClassName );
-        return newClassName;
-    }
-
-    public String getTitle()
-    {
-        if ( title == null )
-            return null;
-
-        return titleText.getTextContent();
-    }
-
-    public void setTitle( String titleText )
-    {
-        if ( WordToHtmlUtils.isEmpty( titleText ) && this.title != null )
-        {
-            this.head.removeChild( this.title );
-            this.title = null;
-            this.titleText = null;
-        }
-
-        if ( this.title == null )
-        {
-            this.title = document.createElement( "title" );
-            this.titleText = document.createTextNode( titleText );
-            this.title.appendChild( this.titleText );
-            this.head.appendChild( title );
-        }
-
-        this.titleText.setData( titleText );
-    }
-
-    public void updateStylesheet()
-    {
-        stylesheetElement.setTextContent( buildStylesheet( stylesheet ) );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java
deleted file mode 100644
index ec7ed1c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hwpf.converter;
-
-import java.util.Locale;
-
-import org.apache.poi.util.Beta;
-
-/**
- * Utility class to translate numbers in letters, usually for lists.
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Beta
-public final class NumberFormatter {
-    private static final String[] ROMAN_LETTERS = { "m", "cm", "d", "cd", "c",
-            "xc", "l", "xl", "x", "ix", "v", "iv", "i" };
-
-    private static final int[] ROMAN_VALUES = { 1000, 900, 500, 400, 100, 90,
-            50, 40, 10, 9, 5, 4, 1 };
-
-    private static final int T_ARABIC = 0;
-    private static final int T_LOWER_LETTER = 4;
-    private static final int T_LOWER_ROMAN = 2;
-    private static final int T_ORDINAL = 5;
-    private static final int T_UPPER_LETTER = 3;
-    private static final int T_UPPER_ROMAN = 1;
-
-    public static String getNumber( int num, int style )
-    {
-        switch ( style )
-        {
-        case T_UPPER_ROMAN:
-            return toRoman( num ).toUpperCase(Locale.ROOT);
-        case T_LOWER_ROMAN:
-            return toRoman( num );
-        case T_UPPER_LETTER:
-            return toLetters( num ).toUpperCase(Locale.ROOT);
-        case T_LOWER_LETTER:
-            return toLetters( num );
-        case T_ARABIC:
-        case T_ORDINAL:
-        default:
-            return String.valueOf( num );
-        }
-    }
-    
-    private static String toLetters(int number) {
-        if ( number <= 0 ) {
-            throw new IllegalArgumentException( "Unsupported number: " + number );
-        }
-
-        int num = number;
-        final int radix = 26;
-
-        char buf[] = new char[33];
-        int charPos = buf.length;
-
-        while (num > 0) {
-            num--; // 1 => a, not 0 => a
-            int remainder = num % radix;
-            buf[--charPos] = (char)('a'+remainder);
-            num = (num - remainder) / radix;
-        }
-
-        return new String(buf, charPos, (buf.length - charPos));
-    }
-
-    private static String toRoman( int number )
-    {
-        if ( number <= 0 )
-            throw new IllegalArgumentException( "Unsupported number: " + number );
-
-        StringBuilder result = new StringBuilder();
-
-        for ( int i = 0; i < ROMAN_LETTERS.length; i++ )
-        {
-            String letter = ROMAN_LETTERS[i];
-            int value = ROMAN_VALUES[i];
-            while ( number >= value )
-            {
-                number -= value;
-                result.append( letter );
-            }
-        }
-        return result.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java
deleted file mode 100644
index e8bb2e2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.hwpf.usermodel.PictureType;
-import org.apache.poi.util.Beta;
-
-/**
- * User-implemented pictures manager to store images on-disk
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Beta
-public interface PicturesManager
-{
-    /**
-     * Stores image (probably on disk). Please, note that different output
-     * format support different file types, so image conversion may be required.
-     * For example, HTML browsers usually supports {@link PictureType#GIF},
-     * {@link PictureType#JPEG}, {@link PictureType#PNG},
-     * {@link PictureType#TIFF}, but rarely {@link PictureType#EMF} or
-     * {@link PictureType#WMF}. FO (Apache FOP) supports at least PNG and SVG
-     * types.
-     * 
-     * @param content
-     *            picture content
-     * @param pictureType
-     *            detected picture type (may be {@link PictureType#UNKNOWN}
-     * @param suggestedName
-     *            suggested picture name (based on picture offset in file),
-     *            supposed to be unique
-     * @param widthInches
-     *            display width in inches (scaled). May be useful for rendering
-     *            vector images (such as EMF or WMF)
-     * @param heightInches
-     *            display height in inches (scaled). May be useful for rendering
-     *            vector images (such as EMF or WMF)
-     * @return path to file that can be used as reference in HTML (img's src) of
-     *         XLS FO (fo:external-graphic's src) or <tt>null</tt> if image were
-     *         not saved and should not be referenced from result HTML / FO.
-     */
-    String savePicture( byte[] content, PictureType pictureType,
-            String suggestedName, float widthInches, float heightInches );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java
deleted file mode 100644
index 4eb352c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.util.Beta;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-@Beta
-public class TextDocumentFacade
-{
-    protected final Element body;
-    protected final Document document;
-    protected final Element head;
-    protected final Element root;
-
-    protected Element title;
-    protected Text titleText;
-
-    public TextDocumentFacade( Document document )
-    {
-        this.document = document;
-
-        root = document.createElement( "html" );
-        document.appendChild( root );
-
-        body = document.createElement( "body" );
-        head = document.createElement( "head" );
-
-        root.appendChild( head );
-        root.appendChild( body );
-        
-        title = document.createElement( "title" );
-        titleText = document.createTextNode( "" );
-        head.appendChild( title );
-    }
-
-    public void addAuthor( String value )
-    {
-        addMeta( "Author", value );
-    }
-
-    public void addDescription( String value )
-    {
-        addMeta( "Description", value );
-    }
-
-    public void addKeywords( String value )
-    {
-        addMeta( "Keywords", value );
-    }
-
-    public void addMeta( final String name, String value )
-    {
-        Element meta = document.createElement( "meta" );
-
-        Element metaName = document.createElement( "name" );
-        metaName.appendChild( document.createTextNode( name + ": " ) );
-        meta.appendChild( metaName );
-
-        Element metaValue = document.createElement( "value" );
-        metaValue.appendChild( document.createTextNode( value + "\n" ) );
-        meta.appendChild( metaValue );
-
-        head.appendChild( meta );
-    }
-
-    public Element createBlock()
-    {
-        return document.createElement( "div" );
-    }
-
-    public Element createHeader1()
-    {
-        Element result = document.createElement( "h1" );
-        result.appendChild( document.createTextNode( "        " ) );
-        return result;
-    }
-
-    public Element createHeader2()
-    {
-        Element result = document.createElement( "h2" );
-        result.appendChild( document.createTextNode( "    " ) );
-        return result;
-    }
-
-    public Element createParagraph()
-    {
-        return document.createElement( "p" );
-    }
-
-    public Element createTable()
-    {
-        return document.createElement( "table" );
-    }
-
-    public Element createTableBody()
-    {
-        return document.createElement( "tbody" );
-    }
-
-    public Element createTableCell()
-    {
-        return document.createElement( "td" );
-    }
-
-    public Element createTableRow()
-    {
-        return document.createElement( "tr" );
-    }
-
-    public Text createText( String data )
-    {
-        return document.createTextNode( data );
-    }
-
-    public Element createUnorderedList()
-    {
-        return document.createElement( "ul" );
-    }
-
-    public Element getBody()
-    {
-        return body;
-    }
-
-    public Document getDocument()
-    {
-        return document;
-    }
-
-    public Element getHead()
-    {
-        return head;
-    }
-
-    public String getTitle()
-    {
-        if ( title == null )
-            return null;
-
-        return titleText.getTextContent();
-    }
-
-    public void setTitle( String titleText )
-    {
-        if ( WordToHtmlUtils.isEmpty( titleText ) && this.title != null )
-        {
-            this.head.removeChild( this.title );
-            this.title = null;
-            this.titleText = null;
-        }
-
-        if ( this.title == null )
-        {
-            this.title = document.createElement( "title" );
-            this.titleText = document.createTextNode( titleText );
-            this.title.appendChild( this.titleText );
-            this.head.appendChild( title );
-        }
-
-        this.titleText.setData( titleText );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
deleted file mode 100644
index 3386f4e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
+++ /dev/null
@@ -1,613 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.converter.FontReplacer.Triplet;
-import org.apache.poi.hwpf.usermodel.Bookmark;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.OfficeDrawing;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.hwpf.usermodel.Section;
-import org.apache.poi.hwpf.usermodel.Table;
-import org.apache.poi.hwpf.usermodel.TableCell;
-import org.apache.poi.hwpf.usermodel.TableRow;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.XMLHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-/**
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Beta
-public class WordToFoConverter extends AbstractWordConverter
-{
-
-    private static final POILogger logger = POILogFactory
-            .getLogger( WordToFoConverter.class );
-
-    /**
-     * Java main() interface to interact with {@link WordToFoConverter}
-     * 
-     * <p>
-     * Usage: WordToFoConverter infile outfile
-     * </p>
-     * Where infile is an input .doc file ( Word 97-2007) which will be rendered
-     * as XSL-FO into outfile
-     */
-    public static void main( String[] args ) throws Exception {
-        if ( args.length < 2 )
-        {
-            System.err.println( "Usage: WordToFoConverter <inputFile.doc> <saveTo.fo>" );
-            return;
-        }
-
-        System.out.println( "Converting " + args[0] );
-        System.out.println( "Saving output to " + args[1] );
-        Document doc = WordToFoConverter.process( new File( args[0] ) );
-
-        DOMSource domSource = new DOMSource( doc );
-        StreamResult streamResult = new StreamResult( new File( args[1] ) );
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer serializer = tf.newTransformer();
-        // TODO set encoding from a command argument
-        serializer.setOutputProperty( OutputKeys.ENCODING, "UTF-8" );
-        serializer.setOutputProperty( OutputKeys.INDENT, "yes" );
-        serializer.transform( domSource, streamResult );
-    }
-
-    static Document process( File docFile ) throws Exception
-    {
-        final HWPFDocumentCore hwpfDocument = WordToFoUtils.loadDoc( docFile );
-        WordToFoConverter wordToFoConverter = new WordToFoConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder()
-                        .newDocument() );
-        wordToFoConverter.processDocument( hwpfDocument );
-        return wordToFoConverter.getDocument();
-    }
-
-    private List<Element> endnotes = new ArrayList<Element>( 0 );
-
-    protected final FoDocumentFacade foDocumentFacade;
-
-    private AtomicInteger internalLinkCounter = new AtomicInteger( 0 );
-
-    private boolean outputCharactersLanguage = false;
-
-    private Set<String> usedIds = new LinkedHashSet<String>();
-
-    /**
-     * Creates new instance of {@link WordToFoConverter}. Can be used for output
-     * several {@link HWPFDocument}s into single FO document.
-     * 
-     * @param document
-     *            XML DOM Document used as XSL FO document. Shall support
-     *            namespaces
-     */
-    public WordToFoConverter( Document document )
-    {
-        this.foDocumentFacade = new FoDocumentFacade( document );
-    }
-
-    public WordToFoConverter( FoDocumentFacade foDocumentFacade )
-    {
-        this.foDocumentFacade = foDocumentFacade;
-    }
-
-    protected Element createNoteInline( String noteIndexText )
-    {
-        Element inline = foDocumentFacade.createInline();
-        inline.setTextContent( noteIndexText );
-        inline.setAttribute( "baseline-shift", "super" );
-        inline.setAttribute( "font-size", "smaller" );
-        return inline;
-    }
-
-    protected String createPageMaster( Section section, String type,
-            int sectionIndex )
-    {
-        float height = section.getPageHeight() / WordToFoUtils.TWIPS_PER_INCH;
-        float width = section.getPageWidth() / WordToFoUtils.TWIPS_PER_INCH;
-        float leftMargin = section.getMarginLeft()
-                / WordToFoUtils.TWIPS_PER_INCH;
-        float rightMargin = section.getMarginRight()
-                / WordToFoUtils.TWIPS_PER_INCH;
-        float topMargin = section.getMarginTop() / WordToFoUtils.TWIPS_PER_INCH;
-        float bottomMargin = section.getMarginBottom()
-                / WordToFoUtils.TWIPS_PER_INCH;
-
-        // add these to the header
-        String pageMasterName = type + "-page" + sectionIndex;
-
-        Element pageMaster = foDocumentFacade
-                .addSimplePageMaster( pageMasterName );
-        pageMaster.setAttribute( "page-height", height + "in" );
-        pageMaster.setAttribute( "page-width", width + "in" );
-
-        Element regionBody = foDocumentFacade.addRegionBody( pageMaster );
-        regionBody.setAttribute( "margin", topMargin + "in " + rightMargin
-                + "in " + bottomMargin + "in " + leftMargin + "in" );
-
-        /*
-         * 6.4.14 fo:region-body
-         * 
-         * The values of the padding and border-width traits must be "0".
-         */
-        // WordToFoUtils.setBorder(regionBody, sep.getBrcTop(), "top");
-        // WordToFoUtils.setBorder(regionBody, sep.getBrcBottom(), "bottom");
-        // WordToFoUtils.setBorder(regionBody, sep.getBrcLeft(), "left");
-        // WordToFoUtils.setBorder(regionBody, sep.getBrcRight(), "right");
-
-        if ( section.getNumColumns() > 1 )
-        {
-            regionBody.setAttribute( "column-count",
-                    "" + ( section.getNumColumns() ) );
-            if ( section.isColumnsEvenlySpaced() )
-            {
-                float distance = section.getDistanceBetweenColumns()
-                        / WordToFoUtils.TWIPS_PER_INCH;
-                regionBody.setAttribute( "column-gap", distance + "in" );
-            }
-            else
-            {
-                regionBody.setAttribute( "column-gap", "0.25in" );
-            }
-        }
-
-        return pageMasterName;
-    }
-
-    public Document getDocument()
-    {
-        return foDocumentFacade.getDocument();
-    }
-
-    public boolean isOutputCharactersLanguage()
-    {
-        return outputCharactersLanguage;
-    }
-
-    @Override
-    protected void outputCharacters( Element block, CharacterRun characterRun,
-            String text )
-    {
-        Element inline = foDocumentFacade.createInline();
-
-        Triplet triplet = getCharacterRunTriplet( characterRun );
-
-        if ( WordToFoUtils.isNotEmpty( triplet.fontName ) )
-            WordToFoUtils.setFontFamily( inline, triplet.fontName );
-        WordToFoUtils.setBold( inline, triplet.bold );
-        WordToFoUtils.setItalic( inline, triplet.italic );
-        WordToFoUtils.setFontSize( inline, characterRun.getFontSize() / 2 );
-        WordToFoUtils.setCharactersProperties( characterRun, inline );
-
-        if ( isOutputCharactersLanguage() )
-            WordToFoUtils.setLanguage( characterRun, inline );
-
-        block.appendChild( inline );
-
-        Text textNode = foDocumentFacade.createText( text );
-        inline.appendChild( textNode );
-    }
-
-    @Override
-    protected void processBookmarks( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range range, int currentTableLevel,
-            List<Bookmark> rangeBookmarks )
-    {
-        Element parent = currentBlock;
-        for ( Bookmark bookmark : rangeBookmarks )
-        {
-            Element bookmarkElement = foDocumentFacade.createInline();
-            final String idName = "bookmark_" + bookmark.getName();
-            // make sure ID used once
-            if ( setId( bookmarkElement, idName ) )
-            {
-                /*
-                 * if it just empty fo:inline without "id" attribute doesn't
-                 * making sense to add it to DOM
-                 */
-                parent.appendChild( bookmarkElement );
-                parent = bookmarkElement;
-            }
-        }
-
-        if ( range != null )
-            processCharacters( wordDocument, currentTableLevel, range, parent );
-    }
-
-    @Override
-    protected void processDocumentInformation(
-            SummaryInformation summaryInformation )
-    {
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getTitle() ) )
-            foDocumentFacade.setTitle( summaryInformation.getTitle() );
-
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getAuthor() ) )
-            foDocumentFacade.setCreator( summaryInformation.getAuthor() );
-
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getKeywords() ) )
-            foDocumentFacade.setKeywords( summaryInformation.getKeywords() );
-
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getComments() ) )
-            foDocumentFacade.setDescription( summaryInformation.getComments() );
-    }
-
-    @Override
-    protected void processDrawnObject( HWPFDocument doc,
-            CharacterRun characterRun, OfficeDrawing officeDrawing,
-            String path, Element block )
-    {
-        final Element externalGraphic = foDocumentFacade
-                .createExternalGraphic( path );
-        block.appendChild( externalGraphic );
-    }
-
-    @Override
-    protected void processEndnoteAutonumbered( HWPFDocument wordDocument,
-            int noteIndex, Element block, Range endnoteTextRange )
-    {
-        final String textIndex = String.valueOf( internalLinkCounter
-                .incrementAndGet() );
-        final String forwardLinkName = "endnote_" + textIndex;
-        final String backwardLinkName = "endnote_back_" + textIndex;
-
-        Element forwardLink = foDocumentFacade
-                .createBasicLinkInternal( forwardLinkName );
-        forwardLink.appendChild( createNoteInline( textIndex ) );
-        setId( forwardLink, backwardLinkName );
-        block.appendChild( forwardLink );
-
-        Element endnote = foDocumentFacade.createBlock();
-        Element backwardLink = foDocumentFacade
-                .createBasicLinkInternal( backwardLinkName );
-        backwardLink.appendChild( createNoteInline( textIndex + " " ) );
-        setId( backwardLink, forwardLinkName );
-        endnote.appendChild( backwardLink );
-
-        processCharacters( wordDocument, Integer.MIN_VALUE, endnoteTextRange,
-                endnote );
-
-        WordToFoUtils.compactInlines( endnote );
-        this.endnotes.add( endnote );
-    }
-
-    @Override
-    protected void processFootnoteAutonumbered( HWPFDocument wordDocument,
-            int noteIndex, Element block, Range footnoteTextRange )
-    {
-        final String textIndex = String.valueOf( internalLinkCounter
-                .incrementAndGet() );
-        final String forwardLinkName = "footnote_" + textIndex;
-        final String backwardLinkName = "footnote_back_" + textIndex;
-
-        Element footNote = foDocumentFacade.createFootnote();
-        block.appendChild( footNote );
-
-        Element inline = foDocumentFacade.createInline();
-        Element forwardLink = foDocumentFacade
-                .createBasicLinkInternal( forwardLinkName );
-        forwardLink.appendChild( createNoteInline( textIndex ) );
-        setId( forwardLink, backwardLinkName );
-        inline.appendChild( forwardLink );
-        footNote.appendChild( inline );
-
-        Element footnoteBody = foDocumentFacade.createFootnoteBody();
-        Element footnoteBlock = foDocumentFacade.createBlock();
-        Element backwardLink = foDocumentFacade
-                .createBasicLinkInternal( backwardLinkName );
-        backwardLink.appendChild( createNoteInline( textIndex + " " ) );
-        setId( backwardLink, forwardLinkName );
-        footnoteBlock.appendChild( backwardLink );
-        footnoteBody.appendChild( footnoteBlock );
-        footNote.appendChild( footnoteBody );
-
-        processCharacters( wordDocument, Integer.MIN_VALUE, footnoteTextRange,
-                footnoteBlock );
-
-        WordToFoUtils.compactInlines( footnoteBlock );
-    }
-
-    protected void processHyperlink( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String hyperlink )
-    {
-        Element basicLink = foDocumentFacade
-                .createBasicLinkExternal( hyperlink );
-        currentBlock.appendChild( basicLink );
-
-        if ( textRange != null )
-            processCharacters( wordDocument, currentTableLevel, textRange,
-                    basicLink );
-    }
-
-    protected void processImage( Element currentBlock, boolean inlined,
-            Picture picture, String url )
-    {
-        final Element externalGraphic = foDocumentFacade
-                .createExternalGraphic( url );
-        WordToFoUtils.setPictureProperties( picture, externalGraphic );
-        currentBlock.appendChild( externalGraphic );
-    }
-
-    @Override
-    protected void processImageWithoutPicturesManager( Element currentBlock,
-            boolean inlined, Picture picture )
-    {
-        // no default implementation -- skip
-        currentBlock.appendChild( foDocumentFacade.document
-                .createComment( "Image link to '"
-                        + picture.suggestFullFileName() + "' can be here" ) );
-    }
-
-    @Override
-    protected void processLineBreak( Element block, CharacterRun characterRun )
-    {
-        block.appendChild( foDocumentFacade.createBlock() );
-    }
-
-    @Override
-    protected void processPageBreak( HWPFDocumentCore wordDocument, Element flow )
-    {
-        Element block = null;
-        NodeList childNodes = flow.getChildNodes();
-        if ( childNodes.getLength() > 0 )
-        {
-            Node lastChild = childNodes.item( childNodes.getLength() - 1 );
-            if ( lastChild instanceof Element )
-            {
-                Element lastElement = (Element) lastChild;
-                if ( !lastElement.hasAttribute( "break-after" ) )
-                {
-                    block = lastElement;
-                }
-            }
-        }
-
-        if ( block == null )
-        {
-            block = foDocumentFacade.createBlock();
-            flow.appendChild( block );
-        }
-        block.setAttribute( "break-after", "page" );
-    }
-
-    protected void processPageref( HWPFDocumentCore hwpfDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String pageref )
-    {
-        Element basicLink = foDocumentFacade
-                .createBasicLinkInternal( "bookmark_" + pageref );
-        currentBlock.appendChild( basicLink );
-
-        if ( textRange != null )
-            processCharacters( hwpfDocument, currentTableLevel, textRange,
-                    basicLink );
-    }
-
-    protected void processParagraph( HWPFDocumentCore hwpfDocument,
-            Element parentFopElement, int currentTableLevel,
-            Paragraph paragraph, String bulletText )
-    {
-        final Element block = foDocumentFacade.createBlock();
-        parentFopElement.appendChild( block );
-
-        WordToFoUtils.setParagraphProperties( paragraph, block );
-
-        final int charRuns = paragraph.numCharacterRuns();
-
-        if ( charRuns == 0 )
-        {
-            return;
-        }
-
-        boolean haveAnyText = false;
-
-        if ( WordToFoUtils.isNotEmpty( bulletText ) )
-        {
-            Element inline = foDocumentFacade.createInline();
-            block.appendChild( inline );
-
-            Text textNode = foDocumentFacade.createText( bulletText );
-            inline.appendChild( textNode );
-
-            haveAnyText |= bulletText.trim().length() != 0;
-        }
-
-        haveAnyText = processCharacters( hwpfDocument, currentTableLevel,
-                paragraph, block );
-
-        if ( !haveAnyText )
-        {
-            Element leader = foDocumentFacade.createLeader();
-            block.appendChild( leader );
-        }
-
-        WordToFoUtils.compactInlines( block );
-        return;
-    }
-
-    protected void processSection( HWPFDocumentCore wordDocument,
-            Section section, int sectionCounter )
-    {
-        String regularPage = createPageMaster( section, "page", sectionCounter );
-
-        Element pageSequence = foDocumentFacade.addPageSequence( regularPage );
-        Element flow = foDocumentFacade.addFlowToPageSequence( pageSequence,
-                "xsl-region-body" );
-
-        processParagraphes( wordDocument, flow, section, Integer.MIN_VALUE );
-
-        if ( endnotes != null && !endnotes.isEmpty() )
-        {
-            for ( Element endnote : endnotes )
-                flow.appendChild( endnote );
-            endnotes.clear();
-        }
-    }
-
-    protected void processTable( HWPFDocumentCore wordDocument, Element flow,
-            Table table )
-    {
-        Element tableHeader = foDocumentFacade.createTableHeader();
-        Element tableBody = foDocumentFacade.createTableBody();
-
-        final int[] tableCellEdges = WordToHtmlUtils
-                .buildTableCellEdgesArray( table );
-        final int tableRows = table.numRows();
-
-        int maxColumns = Integer.MIN_VALUE;
-        for ( int r = 0; r < tableRows; r++ )
-        {
-            maxColumns = Math.max( maxColumns, table.getRow( r ).numCells() );
-        }
-
-        for ( int r = 0; r < tableRows; r++ )
-        {
-            TableRow tableRow = table.getRow( r );
-
-            Element tableRowElement = foDocumentFacade.createTableRow();
-            WordToFoUtils.setTableRowProperties( tableRow, tableRowElement );
-
-            // index of current element in tableCellEdges[]
-            int currentEdgeIndex = 0;
-            final int rowCells = tableRow.numCells();
-            for ( int c = 0; c < rowCells; c++ )
-            {
-                TableCell tableCell = tableRow.getCell( c );
-
-                if ( tableCell.isVerticallyMerged()
-                        && !tableCell.isFirstVerticallyMerged() )
-                {
-                    currentEdgeIndex += getNumberColumnsSpanned(
-                            tableCellEdges, currentEdgeIndex, tableCell );
-                    continue;
-                }
-
-                Element tableCellElement = foDocumentFacade.createTableCell();
-                WordToFoUtils.setTableCellProperties( tableRow, tableCell,
-                        tableCellElement, r == 0, r == tableRows - 1, c == 0,
-                        c == rowCells - 1 );
-
-                int colSpan = getNumberColumnsSpanned( tableCellEdges,
-                        currentEdgeIndex, tableCell );
-                currentEdgeIndex += colSpan;
-
-                if ( colSpan == 0 )
-                    continue;
-
-                if ( colSpan != 1 )
-                    tableCellElement.setAttribute( "number-columns-spanned",
-                            String.valueOf( colSpan ) );
-
-                final int rowSpan = getNumberRowsSpanned( table,
-                        tableCellEdges, r, c, tableCell );
-                if ( rowSpan > 1 )
-                    tableCellElement.setAttribute( "number-rows-spanned",
-                            String.valueOf( rowSpan ) );
-
-                processParagraphes( wordDocument, tableCellElement, tableCell,
-                        table.getTableLevel() );
-
-                if ( !tableCellElement.hasChildNodes() )
-                {
-                    tableCellElement.appendChild( foDocumentFacade
-                            .createBlock() );
-                }
-
-                tableRowElement.appendChild( tableCellElement );
-            }
-
-            if ( tableRowElement.hasChildNodes() )
-            {
-                if ( tableRow.isTableHeader() )
-                {
-                    tableHeader.appendChild( tableRowElement );
-                }
-                else
-                {
-                    tableBody.appendChild( tableRowElement );
-                }
-            }
-        }
-
-        final Element tableElement = foDocumentFacade.createTable();
-        tableElement.setAttribute( "table-layout", "fixed" );
-        if ( tableHeader.hasChildNodes() )
-        {
-            tableElement.appendChild( tableHeader );
-        }
-        if ( tableBody.hasChildNodes() )
-        {
-            tableElement.appendChild( tableBody );
-            flow.appendChild( tableElement );
-        }
-        else
-        {
-            logger.log(
-                    POILogger.WARN,
-                    "Table without body starting on offset "
-                            + table.getStartOffset() + " -- "
-                            + table.getEndOffset() );
-        }
-    }
-
-    protected boolean setId( Element element, final String id )
-    {
-        // making sure ID used once
-        if ( usedIds.contains( id ) )
-        {
-            logger.log( POILogger.WARN,
-                    "Tried to create element with same ID '", id, "'. Skipped" );
-            return false;
-        }
-
-        element.setAttribute( "id", id );
-        usedIds.add( id );
-        return true;
-    }
-
-    public void setOutputCharactersLanguage( boolean outputCharactersLanguage )
-    {
-        this.outputCharactersLanguage = outputCharactersLanguage;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java
deleted file mode 100644
index 32cf161..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.TableCell;
-import org.apache.poi.hwpf.usermodel.TableRow;
-import org.apache.poi.util.Beta;
-import org.w3c.dom.Element;
-
-@Beta
-public class WordToFoUtils extends AbstractWordUtils
-{
-    static void compactInlines( Element blockElement )
-    {
-        compactChildNodesR( blockElement, "fo:inline" );
-    }
-
-    public static void setBold( final Element element, final boolean bold )
-    {
-        element.setAttribute( "font-weight", bold ? "bold" : "normal" );
-    }
-
-    public static void setBorder( Element element, BorderCode borderCode,
-            String where )
-    {
-        if ( element == null )
-            throw new IllegalArgumentException( "element is null" );
-
-        if ( borderCode == null || borderCode.isEmpty() )
-            return;
-
-        if ( isEmpty( where ) )
-        {
-            element.setAttribute( "border-style", getBorderType( borderCode ) );
-            element.setAttribute( "border-color",
-                    getColor( borderCode.getColor() ) );
-            element.setAttribute( "border-width", getBorderWidth( borderCode ) );
-        }
-        else
-        {
-            element.setAttribute( "border-" + where + "-style",
-                    getBorderType( borderCode ) );
-            element.setAttribute( "border-" + where + "-color",
-                    getColor( borderCode.getColor() ) );
-            element.setAttribute( "border-" + where + "-width",
-                    getBorderWidth( borderCode ) );
-        }
-    }
-
-    public static void setCharactersProperties(
-            final CharacterRun characterRun, final Element inline )
-    {
-        StringBuilder textDecorations = new StringBuilder();
-
-        setBorder( inline, characterRun.getBorder(), EMPTY );
-
-        if ( characterRun.getIco24() != -1 )
-        {
-            inline.setAttribute( "color", getColor24( characterRun.getIco24() ) );
-        }
-        /* XLS FO 1.1 doesn't support opacity -- sergey */
-        // final int opacity = (int) ( characterRun.getIco24() & 0xFF000000l )
-        // >>> 24;
-        // if ( opacity != 0 && opacity != 0xFF )
-        // {
-        // inline.setAttribute( "opacity",
-        // getOpacity( characterRun.getIco24() ) );
-        // }
-        if ( characterRun.isCapitalized() )
-        {
-            inline.setAttribute( "text-transform", "uppercase" );
-        }
-        if ( characterRun.isHighlighted() )
-        {
-            inline.setAttribute( "background-color",
-                    getColor( characterRun.getHighlightedColor() ) );
-        }
-        if ( characterRun.isStrikeThrough() )
-        {
-            if ( textDecorations.length() > 0 )
-                textDecorations.append( " " );
-            textDecorations.append( "line-through" );
-        }
-        if ( characterRun.isShadowed() )
-        {
-            inline.setAttribute( "text-shadow", characterRun.getFontSize() / 24
-                    + "pt" );
-        }
-        if ( characterRun.isSmallCaps() )
-        {
-            inline.setAttribute( "font-variant", "small-caps" );
-        }
-        if ( characterRun.getSubSuperScriptIndex() == 1 )
-        {
-            inline.setAttribute( "baseline-shift", "super" );
-            inline.setAttribute( "font-size", "smaller" );
-        }
-        if ( characterRun.getSubSuperScriptIndex() == 2 )
-        {
-            inline.setAttribute( "baseline-shift", "sub" );
-            inline.setAttribute( "font-size", "smaller" );
-        }
-        if ( characterRun.getUnderlineCode() > 0 )
-        {
-            if ( textDecorations.length() > 0 )
-                textDecorations.append( " " );
-            textDecorations.append( "underline" );
-        }
-        if ( characterRun.isVanished() )
-        {
-            inline.setAttribute( "visibility", "hidden" );
-        }
-        if ( textDecorations.length() > 0 )
-        {
-            inline.setAttribute( "text-decoration", textDecorations.toString() );
-        }
-    }
-
-    public static void setFontFamily( final Element element,
-            final String fontFamily )
-    {
-        if ( isEmpty( fontFamily ) )
-            return;
-
-        element.setAttribute( "font-family", fontFamily );
-    }
-
-    public static void setFontSize( final Element element, final int fontSize )
-    {
-        element.setAttribute( "font-size", String.valueOf( fontSize ) );
-    }
-
-    public static void setIndent( Paragraph paragraph, Element block )
-    {
-        if ( paragraph.getFirstLineIndent() != 0 )
-        {
-            block.setAttribute(
-                    "text-indent",
-                    paragraph.getFirstLineIndent()
-                            / TWIPS_PER_PT
-                            + "pt" );
-        }
-        if ( paragraph.getIndentFromLeft() != 0 )
-        {
-            block.setAttribute(
-                    "start-indent",
-                    paragraph.getIndentFromLeft()
-                            / TWIPS_PER_PT
-                            + "pt" );
-        }
-        if ( paragraph.getIndentFromRight() != 0 )
-        {
-            block.setAttribute(
-                    "end-indent",
-                    paragraph.getIndentFromRight()
-                            / TWIPS_PER_PT
-                            + "pt" );
-        }
-        if ( paragraph.getSpacingBefore() != 0 )
-        {
-            block.setAttribute(
-                    "space-before",
-                    paragraph.getSpacingBefore() / TWIPS_PER_PT
-                            + "pt" );
-        }
-        if ( paragraph.getSpacingAfter() != 0 )
-        {
-            block.setAttribute( "space-after",
-                    paragraph.getSpacingAfter() / TWIPS_PER_PT
-                            + "pt" );
-        }
-    }
-
-    public static void setItalic( final Element element, final boolean italic )
-    {
-        element.setAttribute( "font-style", italic ? "italic" : "normal" );
-    }
-
-    public static void setJustification( Paragraph paragraph,
-            final Element element )
-    {
-        String justification = getJustification( paragraph.getJustification() );
-        if ( isNotEmpty( justification ) )
-            element.setAttribute( "text-align", justification );
-    }
-
-    public static void setLanguage( final CharacterRun characterRun,
-            final Element inline )
-    {
-        if ( characterRun.getLanguageCode() != 0 )
-        {
-            final String language = getLanguage( characterRun.getLanguageCode() );
-            if ( isNotEmpty( language ) )
-                inline.setAttribute( "language", language );
-        }
-    }
-
-    public static void setParagraphProperties( Paragraph paragraph,
-            Element block )
-    {
-        setIndent( paragraph, block );
-        setJustification( paragraph, block );
-
-        setBorder( block, paragraph.getBottomBorder(), "bottom" );
-        setBorder( block, paragraph.getLeftBorder(), "left" );
-        setBorder( block, paragraph.getRightBorder(), "right" );
-        setBorder( block, paragraph.getTopBorder(), "top" );
-
-        if ( paragraph.pageBreakBefore() )
-        {
-            block.setAttribute( "break-before", "page" );
-        }
-
-        block.setAttribute( "hyphenate",
-                String.valueOf( paragraph.isAutoHyphenated() ) );
-
-        if ( paragraph.keepOnPage() )
-        {
-            block.setAttribute( "keep-together.within-page", "always" );
-        }
-
-        if ( paragraph.keepWithNext() )
-        {
-            block.setAttribute( "keep-with-next.within-page", "always" );
-        }
-
-        block.setAttribute( "linefeed-treatment", "preserve" );
-        block.setAttribute( "white-space-collapse", "false" );
-    }
-
-    public static void setPictureProperties( Picture picture,
-            Element graphicElement )
-    {
-        final int horizontalScale = picture.getHorizontalScalingFactor();
-        final int verticalScale = picture.getVerticalScalingFactor();
-
-        if ( horizontalScale > 0 )
-        {
-            graphicElement
-                    .setAttribute( "content-width", ( ( picture.getDxaGoal()
-                            * horizontalScale / 1000 ) / TWIPS_PER_PT )
-                            + "pt" );
-        }
-        else
-            graphicElement.setAttribute( "content-width",
-                    ( picture.getDxaGoal() / TWIPS_PER_PT ) + "pt" );
-
-        if ( verticalScale > 0 )
-            graphicElement
-                    .setAttribute( "content-height", ( ( picture.getDyaGoal()
-                            * verticalScale / 1000 ) / TWIPS_PER_PT )
-                            + "pt" );
-        else
-            graphicElement.setAttribute( "content-height",
-                    ( picture.getDyaGoal() / TWIPS_PER_PT ) + "pt" );
-
-        if ( horizontalScale <= 0 || verticalScale <= 0 )
-        {
-            graphicElement.setAttribute( "scaling", "uniform" );
-        }
-        else
-        {
-            graphicElement.setAttribute( "scaling", "non-uniform" );
-        }
-
-        graphicElement.setAttribute( "vertical-align", "text-bottom" );
-
-        if ( picture.getDyaCropTop() != 0 || picture.getDxaCropRight() != 0
-                || picture.getDyaCropBottom() != 0
-                || picture.getDxaCropLeft() != 0 )
-        {
-            int rectTop = picture.getDyaCropTop() / TWIPS_PER_PT;
-            int rectRight = picture.getDxaCropRight() / TWIPS_PER_PT;
-            int rectBottom = picture.getDyaCropBottom() / TWIPS_PER_PT;
-            int rectLeft = picture.getDxaCropLeft() / TWIPS_PER_PT;
-            graphicElement.setAttribute( "clip", "rect(" + rectTop + "pt, "
-                    + rectRight + "pt, " + rectBottom + "pt, " + rectLeft
-                    + "pt)" );
-            graphicElement.setAttribute( "overflow", "hidden" );
-        }
-    }
-
-    public static void setTableCellProperties( TableRow tableRow,
-            TableCell tableCell, Element element, boolean toppest,
-            boolean bottomest, boolean leftest, boolean rightest )
-    {
-        element.setAttribute( "width", ( tableCell.getWidth() / TWIPS_PER_INCH )
-                + "in" );
-        element.setAttribute( "padding-start",
-                ( tableRow.getGapHalf() / TWIPS_PER_INCH ) + "in" );
-        element.setAttribute( "padding-end",
-                ( tableRow.getGapHalf() / TWIPS_PER_INCH ) + "in" );
-
-        BorderCode top = tableCell.getBrcTop() != null
-                && tableCell.getBrcTop().getBorderType() != 0 ? tableCell
-                .getBrcTop() : toppest ? tableRow.getTopBorder() : tableRow
-                .getHorizontalBorder();
-        BorderCode bottom = tableCell.getBrcBottom() != null
-                && tableCell.getBrcBottom().getBorderType() != 0 ? tableCell
-                .getBrcBottom() : bottomest ? tableRow.getBottomBorder()
-                : tableRow.getHorizontalBorder();
-
-        BorderCode left = tableCell.getBrcLeft() != null
-                && tableCell.getBrcLeft().getBorderType() != 0 ? tableCell
-                .getBrcLeft() : leftest ? tableRow.getLeftBorder() : tableRow
-                .getVerticalBorder();
-        BorderCode right = tableCell.getBrcRight() != null
-                && tableCell.getBrcRight().getBorderType() != 0 ? tableCell
-                .getBrcRight() : rightest ? tableRow.getRightBorder()
-                : tableRow.getVerticalBorder();
-
-        setBorder( element, bottom, "bottom" );
-        setBorder( element, left, "left" );
-        setBorder( element, right, "right" );
-        setBorder( element, top, "top" );
-    }
-
-    public static void setTableRowProperties( TableRow tableRow,
-            Element tableRowElement )
-    {
-        if ( tableRow.getRowHeight() > 0 )
-        {
-            tableRowElement.setAttribute( "height",
-                    ( tableRow.getRowHeight() / TWIPS_PER_INCH ) + "in" );
-        }
-        if ( !tableRow.cantSplit() )
-        {
-            tableRowElement.setAttribute( "keep-together.within-column",
-                    "always" );
-        }
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
deleted file mode 100644
index 1e10bd6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
+++ /dev/null
@@ -1,737 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import static org.apache.poi.hwpf.converter.AbstractWordUtils.TWIPS_PER_INCH;
-
-import java.io.File;
-import java.util.List;
-import java.util.Stack;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.converter.FontReplacer.Triplet;
-import org.apache.poi.hwpf.usermodel.Bookmark;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.OfficeDrawing;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.hwpf.usermodel.Section;
-import org.apache.poi.hwpf.usermodel.Table;
-import org.apache.poi.hwpf.usermodel.TableCell;
-import org.apache.poi.hwpf.usermodel.TableRow;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.XMLHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * Converts Word files (95-2007) into HTML files.
- * <p>
- * This implementation doesn't create images or links to them. This can be
- * changed by overriding {@link #processImage(Element, boolean, Picture)}
- * method.
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Beta
-public class WordToHtmlConverter extends AbstractWordConverter
-{
-    /**
-     * Holds properties values, applied to current <tt>p</tt> element. Those
-     * properties shall not be doubled in children <tt>span</tt> elements.
-     */
-    private static class BlockProperies
-    {
-        final String pFontName;
-        final int pFontSize;
-
-        public BlockProperies( String pFontName, int pFontSize )
-        {
-            this.pFontName = pFontName;
-            this.pFontSize = pFontSize;
-        }
-    }
-
-    private static final POILogger logger = POILogFactory
-            .getLogger( WordToHtmlConverter.class );
-
-    
-    private static String getSectionStyle( Section section )
-    {
-        float leftMargin = section.getMarginLeft() / TWIPS_PER_INCH;
-        float rightMargin = section.getMarginRight() / TWIPS_PER_INCH;
-        float topMargin = section.getMarginTop() / TWIPS_PER_INCH;
-        float bottomMargin = section.getMarginBottom() / TWIPS_PER_INCH;
-
-        String style = "margin: " + topMargin + "in " + rightMargin + "in "
-                + bottomMargin + "in " + leftMargin + "in;";
-
-        if ( section.getNumColumns() > 1 )
-        {
-            style += "column-count: " + ( section.getNumColumns() ) + ";";
-            if ( section.isColumnsEvenlySpaced() )
-            {
-                float distance = section.getDistanceBetweenColumns()
-                        / TWIPS_PER_INCH;
-                style += "column-gap: " + distance + "in;";
-            }
-            else
-            {
-                style += "column-gap: 0.25in;";
-            }
-        }
-        return style;
-    }
-
-    /**
-     * Java main() interface to interact with {@link WordToHtmlConverter}
-     * 
-     * <p>
-     * Usage: WordToHtmlConverter infile outfile
-     * </p>
-     * Where infile is an input .doc file ( Word 95-2007) which will be rendered
-     * as HTML into outfile
-     */
-    public static void main( String[] args ) throws Exception
-    {
-        if ( args.length < 2 )
-        {
-            System.err
-                    .println( "Usage: WordToHtmlConverter <inputFile.doc> <saveTo.html>" );
-            return;
-        }
-
-        System.out.println( "Converting " + args[0] );
-        System.out.println( "Saving output to " + args[1] );
-
-        Document doc = WordToHtmlConverter.process( new File( args[0] ) );
-
-        DOMSource domSource = new DOMSource( doc );
-        StreamResult streamResult = new StreamResult( new File(args[1]) );
-
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer serializer = tf.newTransformer();
-        // TODO set encoding from a command argument
-        serializer.setOutputProperty( OutputKeys.ENCODING, "UTF-8" );
-        serializer.setOutputProperty( OutputKeys.INDENT, "yes" );
-        serializer.setOutputProperty( OutputKeys.METHOD, "html" );
-        serializer.transform( domSource, streamResult );
-    }
-
-    static Document process( File docFile ) throws Exception
-    {
-        final HWPFDocumentCore wordDocument = WordToHtmlUtils.loadDoc( docFile );
-        WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder()
-                        .newDocument() );
-        wordToHtmlConverter.processDocument( wordDocument );
-        return wordToHtmlConverter.getDocument();
-    }
-
-    private final Stack<BlockProperies> blocksProperies = new Stack<BlockProperies>();
-
-    private final HtmlDocumentFacade htmlDocumentFacade;
-
-    private Element notes = null;
-
-    /**
-     * Creates new instance of {@link WordToHtmlConverter}. Can be used for
-     * output several {@link HWPFDocument}s into single HTML document.
-     * 
-     * @param document
-     *            XML DOM Document used as HTML document
-     */
-    public WordToHtmlConverter( Document document )
-    {
-        this.htmlDocumentFacade = new HtmlDocumentFacade( document );
-    }
-
-    public WordToHtmlConverter( HtmlDocumentFacade htmlDocumentFacade )
-    {
-        this.htmlDocumentFacade = htmlDocumentFacade;
-    }
-
-    @Override
-    protected void afterProcess()
-    {
-        if ( notes != null )
-            htmlDocumentFacade.getBody().appendChild( notes );
-
-        htmlDocumentFacade.updateStylesheet();
-    }
-
-    public Document getDocument()
-    {
-        return htmlDocumentFacade.getDocument();
-    }
-
-    @Override
-    protected void outputCharacters( Element pElement,
-            CharacterRun characterRun, String text )
-    {
-        Element span = htmlDocumentFacade.document.createElement( "span" );
-        pElement.appendChild( span );
-
-        StringBuilder style = new StringBuilder();
-        BlockProperies blockProperies = this.blocksProperies.peek();
-        Triplet triplet = getCharacterRunTriplet( characterRun );
-
-        if ( WordToHtmlUtils.isNotEmpty( triplet.fontName )
-                && !WordToHtmlUtils.equals( triplet.fontName,
-                        blockProperies.pFontName ) )
-        {
-            style.append( "font-family:" + triplet.fontName + ";" );
-        }
-        if ( characterRun.getFontSize() / 2 != blockProperies.pFontSize )
-        {
-            style.append( "font-size:" + characterRun.getFontSize() / 2 + "pt;" );
-        }
-        if ( triplet.bold )
-        {
-            style.append( "font-weight:bold;" );
-        }
-        if ( triplet.italic )
-        {
-            style.append( "font-style:italic;" );
-        }
-
-        WordToHtmlUtils.addCharactersProperties( characterRun, style );
-        if ( style.length() != 0 )
-            htmlDocumentFacade.addStyleClass( span, "s", style.toString() );
-
-        Text textNode = htmlDocumentFacade.createText( text );
-        span.appendChild( textNode );
-    }
-
-    @Override
-    protected void processBookmarks( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range range, int currentTableLevel,
-            List<Bookmark> rangeBookmarks )
-    {
-        Element parent = currentBlock;
-        for ( Bookmark bookmark : rangeBookmarks )
-        {
-            Element bookmarkElement = htmlDocumentFacade
-                    .createBookmark( bookmark.getName() );
-            parent.appendChild( bookmarkElement );
-            parent = bookmarkElement;
-        }
-
-        if ( range != null )
-            processCharacters( wordDocument, currentTableLevel, range, parent );
-    }
-
-    @Override
-    protected void processDocumentInformation(
-            SummaryInformation summaryInformation )
-    {
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getTitle() ) )
-            htmlDocumentFacade.setTitle( summaryInformation.getTitle() );
-
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getAuthor() ) )
-            htmlDocumentFacade.addAuthor( summaryInformation.getAuthor() );
-
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getKeywords() ) )
-            htmlDocumentFacade.addKeywords( summaryInformation.getKeywords() );
-
-        if ( WordToHtmlUtils.isNotEmpty( summaryInformation.getComments() ) )
-            htmlDocumentFacade
-                    .addDescription( summaryInformation.getComments() );
-    }
-
-    @Override
-    public void processDocumentPart( HWPFDocumentCore wordDocument, Range range )
-    {
-        super.processDocumentPart( wordDocument, range );
-        afterProcess();
-    }
-
-    @Override
-    protected void processDropDownList( Element block,
-            CharacterRun characterRun, String[] values, int defaultIndex )
-    {
-        Element select = htmlDocumentFacade.createSelect();
-        for ( int i = 0; i < values.length; i++ )
-        {
-            select.appendChild( htmlDocumentFacade.createOption( values[i],
-                    defaultIndex == i ) );
-        }
-        block.appendChild( select );
-    }
-
-    @Override
-    protected void processDrawnObject( HWPFDocument doc,
-            CharacterRun characterRun, OfficeDrawing officeDrawing,
-            String path, Element block )
-    {
-        Element img = htmlDocumentFacade.createImage( path );
-        block.appendChild( img );
-    }
-
-    @Override
-    protected void processEndnoteAutonumbered( HWPFDocument wordDocument,
-            int noteIndex, Element block, Range endnoteTextRange )
-    {
-        processNoteAutonumbered( wordDocument, "end", noteIndex, block,
-                endnoteTextRange );
-    }
-
-    @Override
-    protected void processFootnoteAutonumbered( HWPFDocument wordDocument,
-            int noteIndex, Element block, Range footnoteTextRange )
-    {
-        processNoteAutonumbered( wordDocument, "foot", noteIndex, block,
-                footnoteTextRange );
-    }
-
-    @Override
-    protected void processHyperlink( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String hyperlink )
-    {
-        Element basicLink = htmlDocumentFacade.createHyperlink( hyperlink );
-        currentBlock.appendChild( basicLink );
-
-        if ( textRange != null )
-            processCharacters( wordDocument, currentTableLevel, textRange,
-                    basicLink );
-    }
-
-    protected void processImage( Element currentBlock, boolean inlined,
-            Picture picture, String imageSourcePath )
-    {
-        final int aspectRatioX = picture.getHorizontalScalingFactor();
-        final int aspectRatioY = picture.getVerticalScalingFactor();
-
-        StringBuilder style = new StringBuilder();
-
-        final float imageWidth;
-        final float imageHeight;
-
-        final float cropTop;
-        final float cropBottom;
-        final float cropLeft;
-        final float cropRight;
-
-        if ( aspectRatioX > 0 )
-        {
-            imageWidth = picture.getDxaGoal() * aspectRatioX / 1000.f
-                    / TWIPS_PER_INCH;
-            cropRight = picture.getDxaCropRight() * aspectRatioX / 1000.f
-                    / TWIPS_PER_INCH;
-            cropLeft = picture.getDxaCropLeft() * aspectRatioX / 1000.f
-                    / TWIPS_PER_INCH;
-        }
-        else
-        {
-            imageWidth = picture.getDxaGoal() / TWIPS_PER_INCH;
-            cropRight = picture.getDxaCropRight() / TWIPS_PER_INCH;
-            cropLeft = picture.getDxaCropLeft() / TWIPS_PER_INCH;
-        }
-
-        if ( aspectRatioY > 0 )
-        {
-            imageHeight = picture.getDyaGoal() * aspectRatioY / 1000.f
-                    / TWIPS_PER_INCH;
-            cropTop = picture.getDyaCropTop() * aspectRatioY / 1000.f
-                    / TWIPS_PER_INCH;
-            cropBottom = picture.getDyaCropBottom() * aspectRatioY / 1000.f
-                    / TWIPS_PER_INCH;
-        }
-        else
-        {
-            imageHeight = picture.getDyaGoal() / TWIPS_PER_INCH;
-            cropTop = picture.getDyaCropTop() / TWIPS_PER_INCH;
-            cropBottom = picture.getDyaCropBottom() / TWIPS_PER_INCH;
-        }
-
-        Element root;
-        if ( cropTop != 0 || cropRight != 0 || cropBottom != 0 || cropLeft != 0 )
-        {
-            float visibleWidth = Math
-                    .max( 0, imageWidth - cropLeft - cropRight );
-            float visibleHeight = Math.max( 0, imageHeight - cropTop
-                    - cropBottom );
-
-            root = htmlDocumentFacade.createBlock();
-            htmlDocumentFacade.addStyleClass( root, "d",
-                    "vertical-align:text-bottom;width:" + visibleWidth
-                            + "in;height:" + visibleHeight + "in;" );
-
-            // complex
-            Element inner = htmlDocumentFacade.createBlock();
-            htmlDocumentFacade.addStyleClass( inner, "d",
-                    "position:relative;width:" + visibleWidth + "in;height:"
-                            + visibleHeight + "in;overflow:hidden;" );
-            root.appendChild( inner );
-
-            Element image = htmlDocumentFacade.createImage( imageSourcePath );
-            htmlDocumentFacade.addStyleClass( image, "i",
-                    "position:absolute;left:-" + cropLeft + ";top:-" + cropTop
-                            + ";width:" + imageWidth + "in;height:"
-                            + imageHeight + "in;" );
-            inner.appendChild( image );
-
-            style.append( "overflow:hidden;" );
-        }
-        else
-        {
-            root = htmlDocumentFacade.createImage( imageSourcePath );
-            root.setAttribute( "style", "width:" + imageWidth + "in;height:"
-                    + imageHeight + "in;vertical-align:text-bottom;" );
-        }
-
-        currentBlock.appendChild( root );
-    }
-
-    @Override
-    protected void processImageWithoutPicturesManager( Element currentBlock,
-            boolean inlined, Picture picture )
-    {
-        // no default implementation -- skip
-        currentBlock.appendChild( htmlDocumentFacade.document
-                .createComment( "Image link to '"
-                        + picture.suggestFullFileName() + "' can be here" ) );
-    }
-
-    @Override
-    protected void processLineBreak( Element block, CharacterRun characterRun )
-    {
-        block.appendChild( htmlDocumentFacade.createLineBreak() );
-    }
-
-    protected void processNoteAutonumbered( HWPFDocument doc, String type,
-            int noteIndex, Element block, Range noteTextRange )
-    {
-        final String textIndex = String.valueOf( noteIndex + 1 );
-        final String textIndexClass = htmlDocumentFacade.getOrCreateCssClass(
-                "a", "vertical-align:super;font-size:smaller;" );
-        final String forwardNoteLink = type + "note_" + textIndex;
-        final String backwardNoteLink = type + "note_back_" + textIndex;
-
-        Element anchor = htmlDocumentFacade.createHyperlink( "#"
-                + forwardNoteLink );
-        anchor.setAttribute( "name", backwardNoteLink );
-        anchor.setAttribute( "class", textIndexClass + " " + type
-                + "noteanchor" );
-        anchor.setTextContent( textIndex );
-        block.appendChild( anchor );
-
-        if ( notes == null )
-        {
-            notes = htmlDocumentFacade.createBlock();
-            notes.setAttribute( "class", "notes" );
-        }
-
-        Element note = htmlDocumentFacade.createBlock();
-        note.setAttribute( "class", type + "note" );
-        notes.appendChild( note );
-
-        Element bookmark = htmlDocumentFacade.createBookmark( forwardNoteLink );
-        bookmark.setAttribute( "href", "#" + backwardNoteLink );
-        bookmark.setTextContent( textIndex );
-        bookmark.setAttribute( "class", textIndexClass + " " + type
-                + "noteindex" );
-        note.appendChild( bookmark );
-        note.appendChild( htmlDocumentFacade.createText( " " ) );
-
-        Element span = htmlDocumentFacade.getDocument().createElement( "span" );
-        span.setAttribute( "class", type + "notetext" );
-        note.appendChild( span );
-
-        this.blocksProperies.add( new BlockProperies( "", -1 ) );
-        try
-        {
-            processCharacters( doc, Integer.MIN_VALUE, noteTextRange, span );
-        }
-        finally
-        {
-            this.blocksProperies.pop();
-        }
-    }
-
-    @Override
-    protected void processPageBreak( HWPFDocumentCore wordDocument, Element flow )
-    {
-        flow.appendChild( htmlDocumentFacade.createLineBreak() );
-    }
-
-    protected void processPageref( HWPFDocumentCore hwpfDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String pageref )
-    {
-        Element basicLink = htmlDocumentFacade.createHyperlink( "#" + pageref );
-        currentBlock.appendChild( basicLink );
-
-        if ( textRange != null )
-            processCharacters( hwpfDocument, currentTableLevel, textRange,
-                    basicLink );
-    }
-
-    protected void processParagraph( HWPFDocumentCore hwpfDocument,
-            Element parentElement, int currentTableLevel, Paragraph paragraph,
-            String bulletText )
-    {
-        final Element pElement = htmlDocumentFacade.createParagraph();
-        parentElement.appendChild( pElement );
-
-        StringBuilder style = new StringBuilder();
-        WordToHtmlUtils.addParagraphProperties( paragraph, style );
-
-        final int charRuns = paragraph.numCharacterRuns();
-
-        if ( charRuns == 0 )
-        {
-            return;
-        }
-
-        {
-            final String pFontName;
-            final int pFontSize;
-            final CharacterRun characterRun = paragraph.getCharacterRun( 0 );
-            if ( characterRun != null )
-            {
-                Triplet triplet = getCharacterRunTriplet( characterRun );
-                pFontSize = characterRun.getFontSize() / 2;
-                pFontName = triplet.fontName;
-                WordToHtmlUtils.addFontFamily( pFontName, style );
-                WordToHtmlUtils.addFontSize( pFontSize, style );
-            }
-            else
-            {
-                pFontSize = -1;
-                pFontName = WordToHtmlUtils.EMPTY;
-            }
-            blocksProperies.push( new BlockProperies( pFontName, pFontSize ) );
-        }
-        try
-        {
-            if ( WordToHtmlUtils.isNotEmpty( bulletText ) )
-            {
-                if ( bulletText.endsWith( "\t" ) )
-                {
-                    /*
-                     * We don't know how to handle all cases in HTML, but at
-                     * least simplest case shall be handled
-                     */
-                    final float defaultTab = TWIPS_PER_INCH / 2;
-                    float firstLinePosition = paragraph.getIndentFromLeft()
-                            + paragraph.getFirstLineIndent() + 20; // char have
-                                                                   // some space
-
-                    float nextStop = (float) ( Math.ceil( firstLinePosition
-                            / defaultTab ) * defaultTab );
-
-                    final float spanMinWidth = nextStop - firstLinePosition;
-
-                    Element span = htmlDocumentFacade.getDocument()
-                            .createElement( "span" );
-                    htmlDocumentFacade
-                            .addStyleClass( span, "s",
-                                    "display: inline-block; text-indent: 0; min-width: "
-                                            + ( spanMinWidth / TWIPS_PER_INCH )
-                                            + "in;" );
-                    pElement.appendChild( span );
-
-                    Text textNode = htmlDocumentFacade.createText( bulletText
-                            .substring( 0, bulletText.length() - 1 )
-                            + UNICODECHAR_ZERO_WIDTH_SPACE
-                            + UNICODECHAR_NO_BREAK_SPACE );
-                    span.appendChild( textNode );
-                }
-                else
-                {
-                    Text textNode = htmlDocumentFacade.createText( bulletText
-                            .substring( 0, bulletText.length() - 1 ) );
-                    pElement.appendChild( textNode );
-                }
-            }
-
-            processCharacters( hwpfDocument, currentTableLevel, paragraph,
-                    pElement );
-        }
-        finally
-        {
-            blocksProperies.pop();
-        }
-
-        if ( style.length() > 0 )
-            htmlDocumentFacade.addStyleClass( pElement, "p", style.toString() );
-
-        WordToHtmlUtils.compactSpans( pElement );
-        return;
-    }
-
-    protected void processSection( HWPFDocumentCore wordDocument,
-            Section section, int sectionCounter )
-    {
-        Element div = htmlDocumentFacade.createBlock();
-        htmlDocumentFacade.addStyleClass( div, "d", getSectionStyle( section ) );
-        htmlDocumentFacade.body.appendChild( div );
-
-        processParagraphes( wordDocument, div, section, Integer.MIN_VALUE );
-    }
-
-    @Override
-    protected void processSingleSection( HWPFDocumentCore wordDocument,
-            Section section )
-    {
-        htmlDocumentFacade.addStyleClass( htmlDocumentFacade.body, "b",
-                getSectionStyle( section ) );
-
-        processParagraphes( wordDocument, htmlDocumentFacade.body, section,
-                Integer.MIN_VALUE );
-    }
-
-    protected void processTable( HWPFDocumentCore hwpfDocument, Element flow,
-            Table table )
-    {
-        Element tableHeader = htmlDocumentFacade.createTableHeader();
-        Element tableBody = htmlDocumentFacade.createTableBody();
-
-        final int[] tableCellEdges = WordToHtmlUtils
-                .buildTableCellEdgesArray( table );
-        final int tableRows = table.numRows();
-
-        int maxColumns = Integer.MIN_VALUE;
-        for ( int r = 0; r < tableRows; r++ )
-        {
-            maxColumns = Math.max( maxColumns, table.getRow( r ).numCells() );
-        }
-
-        for ( int r = 0; r < tableRows; r++ )
-        {
-            TableRow tableRow = table.getRow( r );
-
-            Element tableRowElement = htmlDocumentFacade.createTableRow();
-            StringBuilder tableRowStyle = new StringBuilder();
-            WordToHtmlUtils.addTableRowProperties( tableRow, tableRowStyle );
-
-            // index of current element in tableCellEdges[]
-            int currentEdgeIndex = 0;
-            final int rowCells = tableRow.numCells();
-            for ( int c = 0; c < rowCells; c++ )
-            {
-                TableCell tableCell = tableRow.getCell( c );
-
-                if ( tableCell.isVerticallyMerged()
-                        && !tableCell.isFirstVerticallyMerged() )
-                {
-                    currentEdgeIndex += getNumberColumnsSpanned(
-                            tableCellEdges, currentEdgeIndex, tableCell );
-                    continue;
-                }
-
-                Element tableCellElement;
-                if ( tableRow.isTableHeader() )
-                {
-                    tableCellElement = htmlDocumentFacade
-                            .createTableHeaderCell();
-                }
-                else
-                {
-                    tableCellElement = htmlDocumentFacade.createTableCell();
-                }
-                StringBuilder tableCellStyle = new StringBuilder();
-                WordToHtmlUtils.addTableCellProperties( tableRow, tableCell,
-                        r == 0, r == tableRows - 1, c == 0, c == rowCells - 1,
-                        tableCellStyle );
-
-                int colSpan = getNumberColumnsSpanned( tableCellEdges,
-                        currentEdgeIndex, tableCell );
-                currentEdgeIndex += colSpan;
-
-                if ( colSpan == 0 )
-                    continue;
-
-                if ( colSpan != 1 )
-                    tableCellElement.setAttribute( "colspan",
-                            String.valueOf( colSpan ) );
-
-                final int rowSpan = getNumberRowsSpanned( table,
-                        tableCellEdges, r, c, tableCell );
-                if ( rowSpan > 1 )
-                    tableCellElement.setAttribute( "rowspan",
-                            String.valueOf( rowSpan ) );
-
-                processParagraphes( hwpfDocument, tableCellElement, tableCell,
-                        table.getTableLevel() );
-
-                if ( !tableCellElement.hasChildNodes() )
-                {
-                    tableCellElement.appendChild( htmlDocumentFacade
-                            .createParagraph() );
-                }
-                if ( tableCellStyle.length() > 0 )
-                    htmlDocumentFacade.addStyleClass( tableCellElement,
-                            tableCellElement.getTagName(),
-                            tableCellStyle.toString() );
-
-                tableRowElement.appendChild( tableCellElement );
-            }
-
-            if ( tableRowStyle.length() > 0 )
-                tableRowElement.setAttribute( "class", htmlDocumentFacade
-                        .getOrCreateCssClass( "r", tableRowStyle.toString() ) );
-
-            if ( tableRow.isTableHeader() )
-            {
-                tableHeader.appendChild( tableRowElement );
-            }
-            else
-            {
-                tableBody.appendChild( tableRowElement );
-            }
-        }
-
-        final Element tableElement = htmlDocumentFacade.createTable();
-        tableElement
-                .setAttribute(
-                        "class",
-                        htmlDocumentFacade
-                                .getOrCreateCssClass( "t",
-                                        "table-layout:fixed;border-collapse:collapse;border-spacing:0;" ) );
-        if ( tableHeader.hasChildNodes() )
-        {
-            tableElement.appendChild( tableHeader );
-        }
-        if ( tableBody.hasChildNodes() )
-        {
-            tableElement.appendChild( tableBody );
-            flow.appendChild( tableElement );
-        }
-        else
-        {
-            logger.log( POILogger.WARN, "Table without body starting at [",
-                    Integer.valueOf( table.getStartOffset() ), "; ",
-                    Integer.valueOf( table.getEndOffset() ), ")" );
-        }
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
deleted file mode 100644
index 484d367..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.TableCell;
-import org.apache.poi.hwpf.usermodel.TableRow;
-import org.apache.poi.util.Beta;
-import org.w3c.dom.Element;
-
-@Beta
-public class WordToHtmlUtils extends AbstractWordUtils
-{
-    public static void addBold( final boolean bold, StringBuilder style )
-    {
-        style.append( "font-weight:" + ( bold ? "bold" : "normal" ) + ";" );
-    }
-
-    public static void addBorder( BorderCode borderCode, String where,
-            StringBuilder style )
-    {
-        if ( borderCode == null || borderCode.isEmpty() )
-            return;
-
-        if ( isEmpty( where ) )
-        {
-            style.append( "border:" );
-        }
-        else
-        {
-            style.append( "border-" );
-            style.append( where );
-        }
-
-        style.append( ":" );
-        if ( borderCode.getLineWidth() < 8 )
-            style.append( "thin" );
-        else
-            style.append( getBorderWidth( borderCode ) );
-        style.append( ' ' );
-        style.append( getBorderType( borderCode ) );
-        style.append( ' ' );
-        style.append( getColor( borderCode.getColor() ) );
-        style.append( ';' );
-    }
-
-    public static void addCharactersProperties(
-            final CharacterRun characterRun, StringBuilder style )
-    {
-        addBorder( characterRun.getBorder(), EMPTY, style );
-
-        if ( characterRun.isCapitalized() )
-        {
-            style.append( "text-transform:uppercase;" );
-        }
-        if ( characterRun.getIco24() != -1 )
-        {
-            style.append( "color:" + getColor24( characterRun.getIco24() )
-                    + ";" );
-        }
-        if ( characterRun.isHighlighted() )
-        {
-            style.append( "background-color:"
-                    + getColor( characterRun.getHighlightedColor() ) + ";" );
-        }
-        if ( characterRun.isStrikeThrough() )
-        {
-            style.append( "text-decoration:line-through;" );
-        }
-        if ( characterRun.isShadowed() )
-        {
-            style.append( "text-shadow:" + characterRun.getFontSize() / 24
-                    + "pt;" );
-        }
-        if ( characterRun.isSmallCaps() )
-        {
-            style.append( "font-variant:small-caps;" );
-        }
-        if ( characterRun.getSubSuperScriptIndex() == 1 )
-        {
-            style.append( "vertical-align:super;" );
-            style.append( "font-size:smaller;" );
-        }
-        if ( characterRun.getSubSuperScriptIndex() == 2 )
-        {
-            style.append( "vertical-align:sub;" );
-            style.append( "font-size:smaller;" );
-        }
-        if ( characterRun.getUnderlineCode() > 0 )
-        {
-            style.append( "text-decoration:underline;" );
-        }
-        if ( characterRun.isVanished() )
-        {
-            style.append( "visibility:hidden;" );
-        }
-    }
-
-    public static void addFontFamily( final String fontFamily,
-            StringBuilder style )
-    {
-        if ( isEmpty( fontFamily ) )
-            return;
-
-        style.append( "font-family:" + fontFamily + ";" );
-    }
-
-    public static void addFontSize( final int fontSize, StringBuilder style )
-    {
-        style.append( "font-size:" + fontSize + "pt;" );
-    }
-
-    public static void addIndent( Paragraph paragraph, StringBuilder style )
-    {
-        addIndent( style, "text-indent", paragraph.getFirstLineIndent() );
-
-        addIndent( style, "margin-left", paragraph.getIndentFromLeft() );
-        addIndent( style, "margin-right", paragraph.getIndentFromRight() );
-
-        addIndent( style, "margin-top", paragraph.getSpacingBefore() );
-        addIndent( style, "margin-bottom", paragraph.getSpacingAfter() );
-    }
-
-    private static void addIndent( StringBuilder style, final String cssName,
-            final int twipsValue )
-    {
-        if ( twipsValue == 0 )
-            return;
-
-        style.append( cssName + ":" + ( twipsValue / TWIPS_PER_INCH ) + "in;" );
-    }
-
-    public static void addJustification( Paragraph paragraph,
-            final StringBuilder style )
-    {
-        String justification = getJustification( paragraph.getJustification() );
-        if ( isNotEmpty( justification ) )
-            style.append( "text-align:" + justification + ";" );
-    }
-
-    public static void addParagraphProperties( Paragraph paragraph,
-            StringBuilder style )
-    {
-        addIndent( paragraph, style );
-        addJustification( paragraph, style );
-
-        addBorder( paragraph.getBottomBorder(), "bottom", style );
-        addBorder( paragraph.getLeftBorder(), "left", style );
-        addBorder( paragraph.getRightBorder(), "right", style );
-        addBorder( paragraph.getTopBorder(), "top", style );
-
-        if ( paragraph.pageBreakBefore() )
-        {
-            style.append( "break-before:page;" );
-        }
-
-        style.append( "hyphenate:"
-                + ( paragraph.isAutoHyphenated() ? "auto" : "none" ) + ";" );
-
-        if ( paragraph.keepOnPage() )
-        {
-            style.append( "keep-together.within-page:always;" );
-        }
-
-        if ( paragraph.keepWithNext() )
-        {
-            style.append( "keep-with-next.within-page:always;" );
-        }
-    }
-
-    public static void addTableCellProperties( TableRow tableRow,
-            TableCell tableCell, boolean toppest, boolean bottomest,
-            boolean leftest, boolean rightest, StringBuilder style )
-    {
-        style.append( "width:" + ( tableCell.getWidth() / TWIPS_PER_INCH )
-                + "in;" );
-        style.append( "padding-start:"
-                + ( tableRow.getGapHalf() / TWIPS_PER_INCH ) + "in;" );
-        style.append( "padding-end:"
-                + ( tableRow.getGapHalf() / TWIPS_PER_INCH ) + "in;" );
-
-        BorderCode top = tableCell.getBrcTop() != null
-                && tableCell.getBrcTop().getBorderType() != 0 ? tableCell
-                .getBrcTop() : toppest ? tableRow.getTopBorder() : tableRow
-                .getHorizontalBorder();
-        BorderCode bottom = tableCell.getBrcBottom() != null
-                && tableCell.getBrcBottom().getBorderType() != 0 ? tableCell
-                .getBrcBottom() : bottomest ? tableRow.getBottomBorder()
-                : tableRow.getHorizontalBorder();
-
-        BorderCode left = tableCell.getBrcLeft() != null
-                && tableCell.getBrcLeft().getBorderType() != 0 ? tableCell
-                .getBrcLeft() : leftest ? tableRow.getLeftBorder() : tableRow
-                .getVerticalBorder();
-        BorderCode right = tableCell.getBrcRight() != null
-                && tableCell.getBrcRight().getBorderType() != 0 ? tableCell
-                .getBrcRight() : rightest ? tableRow.getRightBorder()
-                : tableRow.getVerticalBorder();
-
-        addBorder( bottom, "bottom", style );
-        addBorder( left, "left", style );
-        addBorder( right, "right", style );
-        addBorder( top, "top", style );
-    }
-
-    public static void addTableRowProperties( TableRow tableRow,
-            StringBuilder style )
-    {
-        if ( tableRow.getRowHeight() > 0 )
-        {
-            style.append( "height:"
-                    + ( tableRow.getRowHeight() / TWIPS_PER_INCH ) + "in;" );
-        }
-        if ( !tableRow.cantSplit() )
-        {
-            style.append( "keep-together:always;" );
-        }
-    }
-
-    static void compactSpans( Element pElement )
-    {
-        compactChildNodesR( pElement, "span" );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
deleted file mode 100644
index ba88a90..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import java.io.File;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.usermodel.Bookmark;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.OfficeDrawing;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.hwpf.usermodel.Section;
-import org.apache.poi.hwpf.usermodel.Table;
-import org.apache.poi.hwpf.usermodel.TableCell;
-import org.apache.poi.hwpf.usermodel.TableRow;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.XMLHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-@Beta
-public class WordToTextConverter extends AbstractWordConverter
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( WordToTextConverter.class );
-
-    public static String getText( DirectoryNode root ) throws Exception
-    {
-        final HWPFDocumentCore wordDocument = AbstractWordUtils.loadDoc( root );
-        return getText( wordDocument );
-    }
-
-    public static String getText( File docFile ) throws Exception
-    {
-        final HWPFDocumentCore wordDocument = AbstractWordUtils
-                .loadDoc( docFile );
-        return getText( wordDocument );
-    }
-
-    public static String getText( final HWPFDocumentCore wordDocument )
-            throws Exception
-    {
-        WordToTextConverter wordToTextConverter = new WordToTextConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        wordToTextConverter.processDocument( wordDocument );
-        return wordToTextConverter.getText();
-    }
-
-    /**
-     * Java main() interface to interact with {@link WordToTextConverter}
-     * 
-     * <p>
-     * Usage: WordToTextConverter infile outfile
-     * </p>
-     * Where infile is an input .doc file ( Word 95-2007) which will be rendered
-     * as plain text into outfile
-     */
-    public static void main( String[] args ) throws Exception {
-        if ( args.length < 2 )
-        {
-            System.err.println( "Usage: WordToTextConverter <inputFile.doc> <saveTo.txt>" );
-            return;
-        }
-
-        System.out.println( "Converting " + args[0] );
-        System.out.println( "Saving output to " + args[1] );
-
-        Document doc = WordToTextConverter.process( new File( args[0] ) );
-
-        DOMSource domSource = new DOMSource( doc );
-        StreamResult streamResult = new StreamResult( new File( args[1] ) );
-
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer serializer = tf.newTransformer();
-        // TODO set encoding from a command argument
-        serializer.setOutputProperty( OutputKeys.ENCODING, "UTF-8" );
-        serializer.setOutputProperty( OutputKeys.INDENT, "no" );
-        serializer.setOutputProperty( OutputKeys.METHOD, "text" );
-        serializer.transform( domSource, streamResult );
-    }
-
-    static Document process( File docFile ) throws Exception
-    {
-        final HWPFDocumentCore wordDocument = AbstractWordUtils
-                .loadDoc( docFile );
-        WordToTextConverter wordToTextConverter = new WordToTextConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        wordToTextConverter.processDocument( wordDocument );
-        return wordToTextConverter.getDocument();
-    }
-
-    private AtomicInteger noteCounters = new AtomicInteger( 1 );
-
-    private Element notes = null;
-
-    private boolean outputSummaryInformation = false;
-
-    private final TextDocumentFacade textDocumentFacade;
-
-    /**
-     * Creates new instance of {@link WordToTextConverter}. Can be used for
-     * output several {@link HWPFDocument}s into single text document.
-     * 
-     * @throws ParserConfigurationException
-     *             if an internal {@link DocumentBuilder} cannot be created
-     */
-    public WordToTextConverter() throws ParserConfigurationException
-    {
-        this.textDocumentFacade = new TextDocumentFacade(
-                DocumentBuilderFactory.newInstance().newDocumentBuilder()
-                        .newDocument() );
-    }
-
-    /**
-     * Creates new instance of {@link WordToTextConverter}. Can be used for
-     * output several {@link HWPFDocument}s into single text document.
-     * 
-     * @param document
-     *            XML DOM Document used as storage for text pieces
-     */
-    public WordToTextConverter( Document document )
-    {
-        this.textDocumentFacade = new TextDocumentFacade( document );
-    }
-
-    public WordToTextConverter( TextDocumentFacade textDocumentFacade )
-    {
-        this.textDocumentFacade = textDocumentFacade;
-    }
-
-    @Override
-    protected void afterProcess()
-    {
-        if ( notes != null )
-            textDocumentFacade.getBody().appendChild( notes );
-    }
-
-    public Document getDocument()
-    {
-        return textDocumentFacade.getDocument();
-    }
-
-    public String getText() throws Exception
-    {
-        StringWriter stringWriter = new StringWriter();
-        DOMSource domSource = new DOMSource( getDocument() );
-        StreamResult streamResult = new StreamResult( stringWriter );
-
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer serializer = tf.newTransformer();
-        // TODO set encoding from a command argument
-        serializer.setOutputProperty( OutputKeys.ENCODING, "UTF-8" );
-        serializer.setOutputProperty( OutputKeys.INDENT, "no" );
-        serializer.setOutputProperty( OutputKeys.METHOD, "text" );
-        serializer.transform( domSource, streamResult );
-
-        return stringWriter.toString();
-    }
-
-    public boolean isOutputSummaryInformation()
-    {
-        return outputSummaryInformation;
-    }
-
-    @Override
-    protected void outputCharacters( Element block, CharacterRun characterRun,
-            String text )
-    {
-        block.appendChild( textDocumentFacade.createText( text ) );
-    }
-
-    @Override
-    protected void processBookmarks( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range range, int currentTableLevel,
-            List<Bookmark> rangeBookmarks )
-    {
-        processCharacters( wordDocument, currentTableLevel, range, currentBlock );
-    }
-
-    @Override
-    protected void processDocumentInformation(
-            SummaryInformation summaryInformation )
-    {
-        if ( isOutputSummaryInformation() )
-        {
-            if ( AbstractWordUtils.isNotEmpty( summaryInformation.getTitle() ) )
-                textDocumentFacade.setTitle( summaryInformation.getTitle() );
-
-            if ( AbstractWordUtils.isNotEmpty( summaryInformation.getAuthor() ) )
-                textDocumentFacade.addAuthor( summaryInformation.getAuthor() );
-
-            if ( AbstractWordUtils
-                    .isNotEmpty( summaryInformation.getComments() ) )
-                textDocumentFacade.addDescription( summaryInformation
-                        .getComments() );
-
-            if ( AbstractWordUtils
-                    .isNotEmpty( summaryInformation.getKeywords() ) )
-                textDocumentFacade.addKeywords( summaryInformation
-                        .getKeywords() );
-        }
-    }
-
-    @Override
-    public void processDocumentPart( HWPFDocumentCore wordDocument, Range range )
-    {
-        super.processDocumentPart( wordDocument, range );
-        afterProcess();
-    }
-
-    @Override
-    protected void processDrawnObject( HWPFDocument doc,
-            CharacterRun characterRun, OfficeDrawing officeDrawing,
-            String path, Element block )
-    {
-        // ignore
-    }
-
-    @Override
-    protected void processEndnoteAutonumbered( HWPFDocument wordDocument,
-            int noteIndex, Element block, Range endnoteTextRange )
-    {
-        processNote( wordDocument, block, endnoteTextRange );
-    }
-
-    @Override
-    protected void processFootnoteAutonumbered( HWPFDocument wordDocument,
-            int noteIndex, Element block, Range footnoteTextRange )
-    {
-        processNote( wordDocument, block, footnoteTextRange );
-    }
-
-    @Override
-    protected void processHyperlink( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String hyperlink )
-    {
-        processCharacters( wordDocument, currentTableLevel, textRange,
-                currentBlock );
-
-        currentBlock.appendChild( textDocumentFacade.createText( " ("
-                + UNICODECHAR_ZERO_WIDTH_SPACE
-                + hyperlink.replaceAll( "\\/", UNICODECHAR_ZERO_WIDTH_SPACE
-                        + "\\/" + UNICODECHAR_ZERO_WIDTH_SPACE )
-                + UNICODECHAR_ZERO_WIDTH_SPACE + ")" ) );
-    }
-
-    @Override
-    protected void processImage( Element currentBlock, boolean inlined,
-            Picture picture )
-    {
-        // ignore
-    }
-
-    @Override
-    protected void processImage( Element currentBlock, boolean inlined,
-            Picture picture, String url )
-    {
-        // ignore
-    }
-
-    @Override
-    protected void processImageWithoutPicturesManager( Element currentBlock,
-            boolean inlined, Picture picture )
-    {
-        // ignore
-    }
-
-    @Override
-    protected void processLineBreak( Element block, CharacterRun characterRun )
-    {
-        block.appendChild( textDocumentFacade.createText( "\n" ) );
-    }
-
-    protected void processNote( HWPFDocument wordDocument, Element block,
-            Range noteTextRange )
-    {
-        final int noteIndex = noteCounters.getAndIncrement();
-        block.appendChild( textDocumentFacade
-                .createText( UNICODECHAR_ZERO_WIDTH_SPACE + "[" + noteIndex
-                        + "]" + UNICODECHAR_ZERO_WIDTH_SPACE ) );
-
-        if ( notes == null )
-            notes = textDocumentFacade.createBlock();
-
-        Element note = textDocumentFacade.createBlock();
-        notes.appendChild( note );
-
-        note.appendChild( textDocumentFacade.createText( "^" + noteIndex
-                + "\t " ) );
-        processCharacters( wordDocument, Integer.MIN_VALUE, noteTextRange, note );
-        note.appendChild( textDocumentFacade.createText( "\n" ) );
-    }
-
-    @Override
-    protected boolean processOle2( HWPFDocument wordDocument, Element block,
-            Entry entry ) throws Exception
-    {
-        if ( !( entry instanceof DirectoryNode ) )
-            return false;
-        DirectoryNode directoryNode = (DirectoryNode) entry;
-
-        /*
-         * even if there is no ExtractorFactory in classpath, still support
-         * included Word's objects
-         */
-        if ( directoryNode.hasEntry( "WordDocument" ) )
-        {
-            String text = WordToTextConverter.getText( (DirectoryNode) entry );
-            block.appendChild( textDocumentFacade
-                    .createText( UNICODECHAR_ZERO_WIDTH_SPACE + text
-                            + UNICODECHAR_ZERO_WIDTH_SPACE ) );
-            return true;
-        }
-
-        Object extractor;
-        try
-        {
-            Class<?> cls = Class
-                    .forName( "org.apache.poi.extractor.ExtractorFactory" );
-            Method createExtractor = cls.getMethod( "createExtractor",
-                    DirectoryNode.class );
-            extractor = createExtractor.invoke( null, directoryNode );
-        }
-        catch ( Exception exc )
-        {
-            // no extractor in classpath
-            logger.log( POILogger.WARN, "There is an OLE object entry '",
-                    entry.getName(),
-                    "', but there is no text extractor for this object type ",
-                    "or text extractor factory is not available: ", "" + exc );
-            return false;
-        }
-
-        try
-        {
-            Method getText = extractor.getClass().getMethod( "getText" );
-            String text = (String) getText.invoke( extractor );
-
-            block.appendChild( textDocumentFacade
-                    .createText( UNICODECHAR_ZERO_WIDTH_SPACE + text
-                            + UNICODECHAR_ZERO_WIDTH_SPACE ) );
-            return true;
-        }
-        catch ( Exception exc )
-        {
-            logger.log( POILogger.ERROR,
-                    "Unable to extract text from OLE entry '", entry.getName(),
-                    "': ", exc, exc );
-            return false;
-        }
-    }
-
-    @Override
-    protected void processPageBreak( HWPFDocumentCore wordDocument, Element flow )
-    {
-        Element block = textDocumentFacade.createBlock();
-        block.appendChild( textDocumentFacade.createText( "\n" ) );
-        flow.appendChild( block );
-    }
-
-    @Override
-    protected void processPageref( HWPFDocumentCore wordDocument,
-            Element currentBlock, Range textRange, int currentTableLevel,
-            String pageref )
-    {
-        processCharacters( wordDocument, currentTableLevel, textRange,
-                currentBlock );
-    }
-
-    @Override
-    protected void processParagraph( HWPFDocumentCore wordDocument,
-            Element parentElement, int currentTableLevel, Paragraph paragraph,
-            String bulletText )
-    {
-        Element pElement = textDocumentFacade.createParagraph();
-        pElement.appendChild( textDocumentFacade.createText( bulletText ) );
-        processCharacters( wordDocument, currentTableLevel, paragraph, pElement );
-        pElement.appendChild( textDocumentFacade.createText( "\n" ) );
-        parentElement.appendChild( pElement );
-    }
-
-    @Override
-    protected void processSection( HWPFDocumentCore wordDocument,
-            Section section, int s )
-    {
-        Element sectionElement = textDocumentFacade.createBlock();
-        processParagraphes( wordDocument, sectionElement, section,
-                Integer.MIN_VALUE );
-        sectionElement.appendChild( textDocumentFacade.createText( "\n" ) );
-        textDocumentFacade.body.appendChild( sectionElement );
-    }
-
-    protected void processTable( HWPFDocumentCore wordDocument, Element flow,
-            Table table )
-    {
-        final int tableRows = table.numRows();
-        for ( int r = 0; r < tableRows; r++ )
-        {
-            TableRow tableRow = table.getRow( r );
-
-            Element tableRowElement = textDocumentFacade.createTableRow();
-
-            final int rowCells = tableRow.numCells();
-            for ( int c = 0; c < rowCells; c++ )
-            {
-                TableCell tableCell = tableRow.getCell( c );
-
-                Element tableCellElement = textDocumentFacade.createTableCell();
-
-                if ( c != 0 )
-                    tableCellElement.appendChild( textDocumentFacade
-                            .createText( "\t" ) );
-
-                processCharacters( wordDocument, table.getTableLevel(),
-                        tableCell, tableCellElement );
-                tableRowElement.appendChild( tableCellElement );
-            }
-
-            tableRowElement.appendChild( textDocumentFacade.createText( "\n" ) );
-            flow.appendChild( tableRowElement );
-        }
-    }
-
-    public void setOutputSummaryInformation( boolean outputDocumentInformation )
-    {
-        this.outputSummaryInformation = outputDocumentInformation;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java
deleted file mode 100644
index 1c15980..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.dev;
-
-import org.apache.poi.util.Internal;
-
-/**
- * <p>
- * For iterating through our fields. Used during model classes autogeneration.
- * </p>
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-@Internal
-public class FieldIterator
-{
-
-    protected int offset;
-
-    public FieldIterator()
-    {
-    }
-
-    public String calcSize( int fieldNumber, String fieldName, String size,
-            String type )
-    {
-        String result = " + ";
-        if ( type.startsWith( "custom:" ) )
-        {
-            String javaFieldName = RecordUtil.getFieldName( fieldNumber,
-                    fieldName, 0 );
-            return result + javaFieldName + ".getSize()";
-        }
-        else if ( "var".equals( size ) )
-        {
-            String javaFieldName = RecordUtil.getFieldName( fieldNumber,
-                    fieldName, 0 );
-            return result + " ( " + javaFieldName + ".length() *2)";
-        }
-        else if ( "varword".equals( size ) )
-        {
-            String javaFieldName = RecordUtil.getFieldName( fieldNumber,
-                    fieldName, 0 );
-            return result + javaFieldName + ".length * 2 + 2";
-        }
-        else
-        {
-            return result + size;
-        }
-    }
-
-    public String fillDecoder( String size, String type )
-    {
-
-        String result = "";
-
-        if ( type.equals( "short[]" ) )
-            result = "LittleEndian.getShortArray( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset, " + size
-                    + " )";
-        else if ( type.equals( "byte[]" ) )
-            result = "LittleEndian.getByteArray( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset," + size
-                    + " )";
-        else if ( type.equals( "BorderCode" ) )
-            result = "new BorderCode( data, 0x" + Integer.toHexString( offset )
-                    + " + offset )";
-        else if ( type.equals( "Colorref" ) )
-            result = "new Colorref( data, 0x" + Integer.toHexString( offset )
-                    + " + offset )";
-        else if ( type.equals( "DateAndTime" ) )
-            result = "new DateAndTime( data, 0x" + Integer.toHexString( offset )
-                    + " + offset )";
-        else if ( type.equals( "Grfhic" ) )
-            result = "new Grfhic( data, 0x" + Integer.toHexString( offset )
-                    + " + offset )";
-        else if ( size.equals( "2" ) )
-            result = "LittleEndian.getShort( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset )";
-        else if ( size.equals( "4" ) )
-            if ( type.equals( "long" ) )
-            {
-                result = "LittleEndian.getUInt( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset )";
-            }
-            else
-            {
-                result = "LittleEndian.getInt( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset )";
-            }
-        else if ( size.equals( "1" ) )
-            if ( type.equals( "short" ) )
-            {
-                result = "LittleEndian.getUByte( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset )";
-            }
-            else if ( type.equals( "int" ) || type.equals( "long" ) )
-            {
-                result = "LittleEndian.getUnsignedByte( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset )";
-            }
-            else
-            {
-                result = "data[ 0x" + Integer.toHexString( offset )
-                        + " + offset ]";
-            }
-        else if ( type.equals( "double" ) )
-            result = "LittleEndian.getDouble(data, 0x"
-                    + Integer.toHexString( offset ) + " + offset )";
-
-        try
-        {
-            offset += Integer.parseInt( size );
-        }
-        catch ( NumberFormatException ignore )
-        {
-        }
-        return result;
-    }
-
-    public String serialiseEncoder( int fieldNumber, String fieldName,
-            String size, String type )
-    {
-        // String javaType = RecordUtil.getType(size, type, 0);
-        String javaFieldName = RecordUtil.getFieldName( fieldNumber, fieldName,
-                0 );
-
-        String result = "";
-
-        if ( type.equals( "short[]" ) )
-            result = "LittleEndian.putShortArray( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset, "
-                    + javaFieldName + " );";
-        else if ( type.equals( "byte[]" ) )
-            result = "System.arraycopy( " + javaFieldName + ", 0, data, 0x"
-                    + Integer.toHexString( offset ) + " + offset, "
-                    + javaFieldName + ".length );";
-        else if ( type.equals( "BorderCode" ) )
-            result = javaFieldName + ".serialize( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset );";
-        else if ( type.equals( "Colorref" ) )
-            result = javaFieldName + ".serialize( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset );";
-        else if ( type.equals( "DateAndTime" ) )
-            result = javaFieldName + ".serialize( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset );";
-        else if ( type.equals( "Grfhic" ) )
-            result = javaFieldName + ".serialize( data, 0x"
-                    + Integer.toHexString( offset ) + " + offset );";
-        else if ( size.equals( "2" ) )
-            if ( type.equals( "short" ) )
-            {
-                result = "LittleEndian.putShort( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset, "
-                        + javaFieldName + " );";
-            }
-            else if ( type.equals( "int" ) )
-            {
-                result = "LittleEndian.putUShort( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset, "
-                        + javaFieldName + " );";
-            }
-            else
-            {
-                result = "LittleEndian.putShort( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset, (short)"
-                        + javaFieldName + " );";
-            }
-        else if ( size.equals( "4" ) )
-            if ( type.equals( "long" ) )
-            {
-                result = "LittleEndian.putUInt( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset, "
-                        + javaFieldName + " );";
-            }
-            else
-            {
-                result = "LittleEndian.putInt( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset, "
-                        + javaFieldName + " );";
-            }
-        else if ( size.equals( "1" ) )
-            if ( type.equals( "byte" ) )
-            {
-                result = "data[ 0x" + Integer.toHexString( offset )
-                        + " + offset ] = " + javaFieldName + ";";
-            }
-            else
-            {
-                result = "LittleEndian.putUByte( data, 0x"
-                        + Integer.toHexString( offset ) + " + offset, "
-                        + javaFieldName + " );";
-            }
-        else if ( type.equals( "double" ) )
-            result = "LittleEndian.putDouble(data, 0x"
-                    + Integer.toHexString( offset ) + " + offset, "
-                    + javaFieldName + " );";
-
-        try
-        {
-            offset += Integer.parseInt( size );
-        }
-        catch ( NumberFormatException ignore )
-        {
-        }
-        return result;
-
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
deleted file mode 100644
index e89efe7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
+++ /dev/null
@@ -1,739 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.dev;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.HWPFOldDocument;
-import org.apache.poi.hwpf.OldWordFileFormatException;
-import org.apache.poi.hwpf.model.CHPX;
-import org.apache.poi.hwpf.model.FieldsDocumentPart;
-import org.apache.poi.hwpf.model.FileInformationBlock;
-import org.apache.poi.hwpf.model.GenericPropertyNode;
-import org.apache.poi.hwpf.model.LFO;
-import org.apache.poi.hwpf.model.LFOData;
-import org.apache.poi.hwpf.model.ListLevel;
-import org.apache.poi.hwpf.model.ListTables;
-import org.apache.poi.hwpf.model.PAPFormattedDiskPage;
-import org.apache.poi.hwpf.model.PAPX;
-import org.apache.poi.hwpf.model.PlexOfCps;
-import org.apache.poi.hwpf.model.StyleDescription;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.model.TextPiece;
-import org.apache.poi.hwpf.sprm.SprmIterator;
-import org.apache.poi.hwpf.sprm.SprmOperation;
-import org.apache.poi.hwpf.usermodel.Bookmark;
-import org.apache.poi.hwpf.usermodel.Bookmarks;
-import org.apache.poi.hwpf.usermodel.Field;
-import org.apache.poi.hwpf.usermodel.OfficeDrawing;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.Beta;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Used by developers to list out key information on a HWPF file. End users will
- * probably never need to use this program.
- * 
- * @author Nick Burch (nick at torchbox dot com)
- * @author Sergey Vladimirov (vlsergey at gmail dot com)
- */
-@Beta
-public final class HWPFLister
-{
-    private static HWPFDocumentCore loadDoc( File docFile ) throws IOException
-    {
-        final FileInputStream istream = new FileInputStream( docFile );
-        try
-        {
-            return loadDoc( istream );
-        }
-        finally
-        {
-            IOUtils.closeQuietly( istream );
-        }
-    }
-
-    private static HWPFDocumentCore loadDoc( InputStream inputStream )
-            throws IOException
-    {
-        final POIFSFileSystem poifsFileSystem = HWPFDocumentCore
-                .verifyAndBuildPOIFS( inputStream );
-        try
-        {
-            return new HWPFDocument( poifsFileSystem );
-        }
-        catch ( OldWordFileFormatException exc )
-        {
-            return new HWPFOldDocument( poifsFileSystem );
-        }
-    }
-
-    public static void main( String[] args ) throws Exception
-    {
-        if ( args.length == 0 )
-        {
-            System.err.println( "Use:" );
-            System.err.println( "\tHWPFLister <filename>\n" + "\t\t[--dop]\n"
-                    + "\t\t[--textPieces] [--textPiecesText]\n"
-                    + "\t\t[--chpx] [--chpxProperties] [--chpxSprms]\n"
-                    + "\t\t[--papx] [--papxProperties] [--papxSprms]\n"
-                    + "\t\t[--paragraphs] [--paragraphsText]\n"
-                    + "\t\t[--bookmarks]\n" + "\t\t[--escher]\n"
-                    + "\t\t[--fields]\n" + "\t\t[--pictures]\n"
-                    + "\t\t[--officeDrawings]\n" + "\t\t[--styles]\n"
-                    + "\t\t[--writereadback]\n" );
-            System.exit( 1 );
-        }
-
-        boolean outputDop = false;
-
-        boolean outputTextPieces = false;
-        boolean outputTextPiecesText = false;
-
-        boolean outputChpx = false;
-        boolean outputChpxProperties = false;
-        boolean outputChpxSprms = false;
-
-        boolean outputParagraphs = false;
-        boolean outputParagraphsText = false;
-
-        boolean outputPapx = false;
-        boolean outputPapxSprms = false;
-        boolean outputPapxProperties = false;
-
-        boolean outputBookmarks = false;
-        boolean outputEscher = false;
-        boolean outputFields = false;
-        boolean outputPictures = false;
-        boolean outputOfficeDrawings = false;
-        boolean outputStyles = false;
-
-        boolean writereadback = false;
-
-        for ( String arg : Arrays.asList( args ).subList( 1, args.length ) )
-        {
-            if ( "--dop".equals( arg ) )
-                outputDop = true;
-
-            if ( "--textPieces".equals( arg ) )
-                outputTextPieces = true;
-            if ( "--textPiecesText".equals( arg ) )
-                outputTextPiecesText = true;
-
-            if ( "--chpx".equals( arg ) )
-                outputChpx = true;
-            if ( "--chpxProperties".equals( arg ) )
-                outputChpxProperties = true;
-            if ( "--chpxSprms".equals( arg ) )
-                outputChpxSprms = true;
-
-            if ( "--paragraphs".equals( arg ) )
-                outputParagraphs = true;
-            if ( "--paragraphsText".equals( arg ) )
-                outputParagraphsText = true;
-
-            if ( "--papx".equals( arg ) )
-                outputPapx = true;
-            if ( "--papxProperties".equals( arg ) )
-                outputPapxProperties = true;
-            if ( "--papxSprms".equals( arg ) )
-                outputPapxSprms = true;
-
-            if ( "--bookmarks".equals( arg ) )
-                outputBookmarks = true;
-            if ( "--escher".equals( arg ) )
-                outputEscher = true;
-            if ( "--fields".equals( arg ) )
-                outputFields = true;
-            if ( "--pictures".equals( arg ) )
-                outputPictures = true;
-            if ( "--officeDrawings".equals( arg ) )
-                outputOfficeDrawings = true;
-            if ( "--styles".equals( arg ) )
-                outputStyles = true;
-
-            if ( "--writereadback".equals( arg ) )
-                writereadback = true;
-        }
-
-        HWPFDocumentCore doc = loadDoc( new File( args[0] ) );
-        if ( writereadback )
-            doc = writeOutAndReadBack( doc );
-
-        HWPFDocumentCore original;
-        {
-            System.setProperty( "org.apache.poi.hwpf.preserveBinTables",
-                    Boolean.TRUE.toString() );
-            System.setProperty( "org.apache.poi.hwpf.preserveTextTable",
-                    Boolean.TRUE.toString() );
-
-            original = loadDoc( new File( args[0] ) );
-            if ( writereadback )
-                original = writeOutAndReadBack( original );
-        }
-
-        HWPFLister listerOriginal = new HWPFLister( original );
-        HWPFLister listerRebuilded = new HWPFLister( doc );
-
-        System.out.println( "== OLE streams ==" );
-        listerOriginal.dumpFileSystem();
-
-        System.out.println( "== FIB (original) ==" );
-        listerOriginal.dumpFIB();
-
-        if ( outputDop )
-        {
-            System.out.println( "== Document properties ==" );
-            listerOriginal.dumpDop();
-        }
-
-        if ( outputTextPieces )
-        {
-            System.out.println( "== Text pieces (original) ==" );
-            listerOriginal.dumpTextPieces( outputTextPiecesText );
-        }
-
-        if ( outputChpx )
-        {
-            System.out.println( "== CHPX (original) ==" );
-            listerOriginal.dumpChpx( outputChpxProperties, outputChpxSprms );
-
-            System.out.println( "== CHPX (rebuilded) ==" );
-            listerRebuilded.dumpChpx( outputChpxProperties, outputChpxSprms );
-        }
-
-        if ( outputPapx )
-        {
-            System.out.println( "== PAPX (original) ==" );
-            listerOriginal.dumpPapx( outputPapxProperties, outputPapxSprms );
-
-            System.out.println( "== PAPX (rebuilded) ==" );
-            listerRebuilded.dumpPapx( outputPapxProperties, outputPapxSprms );
-        }
-
-        if ( outputParagraphs )
-        {
-            System.out.println( "== Text paragraphs (original) ==" );
-            listerRebuilded.dumpParagraphs( true );
-
-            System.out.println( "== DOM paragraphs (rebuilded) ==" );
-            listerRebuilded.dumpParagraphsDom( outputParagraphsText );
-        }
-
-        if ( outputBookmarks )
-        {
-            System.out.println( "== BOOKMARKS (rebuilded) ==" );
-            listerRebuilded.dumpBookmarks();
-        }
-
-        if ( outputEscher )
-        {
-            System.out.println( "== ESCHER PROPERTIES (rebuilded) ==" );
-            listerRebuilded.dumpEscher();
-        }
-
-        if ( outputFields )
-        {
-            System.out.println( "== FIELDS (rebuilded) ==" );
-            listerRebuilded.dumpFields();
-        }
-
-        if ( outputOfficeDrawings )
-        {
-            System.out.println( "== OFFICE DRAWINGS (rebuilded) ==" );
-            listerRebuilded.dumpOfficeDrawings();
-        }
-
-        if ( outputPictures )
-        {
-            System.out.println( "== PICTURES (rebuilded) ==" );
-            listerRebuilded.dumpPictures();
-        }
-
-        if ( outputStyles )
-        {
-            System.out.println( "== STYLES (rebuilded) ==" );
-            listerRebuilded.dumpStyles();
-        }
-    }
-
-    private static HWPFDocumentCore writeOutAndReadBack(
-            HWPFDocumentCore original )
-    {
-        try
-        {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream( 4096 );
-            original.write( baos );
-            ByteArrayInputStream bais = new ByteArrayInputStream(
-                    baos.toByteArray() );
-            return loadDoc( bais );
-        }
-        catch ( IOException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    private final HWPFDocumentCore _doc;
-
-    private LinkedHashMap<Integer, String> paragraphs;
-
-    public HWPFLister( HWPFDocumentCore doc )
-    {
-        _doc = doc;
-
-        buildParagraphs();
-    }
-
-    private void buildParagraphs()
-    {
-        paragraphs = new LinkedHashMap<Integer, String>();
-
-        StringBuilder part = new StringBuilder();
-        String text = _doc.getDocumentText();
-        for ( int charIndex = 0; charIndex < text.length(); charIndex++ )
-        {
-            char c = text.charAt( charIndex );
-            part.append( c );
-            if ( c == 13 || c == 7 || c == 12 )
-            {
-                paragraphs.put( Integer.valueOf( charIndex ), part.toString() );
-                part.setLength( 0 );
-            }
-        }
-    }
-
-    private void dumpBookmarks()
-    {
-        if ( !( _doc instanceof HWPFDocument ) )
-        {
-            System.out.println( "Word 95 not supported so far" );
-            return;
-        }
-
-        HWPFDocument document = (HWPFDocument) _doc;
-        Bookmarks bookmarks = document.getBookmarks();
-        for ( int b = 0; b < bookmarks.getBookmarksCount(); b++ )
-        {
-            Bookmark bookmark = bookmarks.getBookmark( b );
-            System.out.println( "[" + bookmark.getStart() + "; "
-                    + bookmark.getEnd() + "): " + bookmark.getName() );
-        }
-    }
-
-    public void dumpChpx( boolean withProperties, boolean withSprms )
-    {
-        for ( CHPX chpx : _doc.getCharacterTable().getTextRuns() )
-        {
-            System.out.println( chpx );
-
-            if ( withProperties )
-            {
-                System.out.println( chpx.getCharacterProperties(
-                        _doc.getStyleSheet(), (short) StyleSheet.NIL_STYLE ) );
-            }
-
-            if ( withSprms )
-            {
-                SprmIterator sprmIt = new SprmIterator( chpx.getGrpprl(), 0 );
-                while ( sprmIt.hasNext() )
-                {
-                    SprmOperation sprm = sprmIt.next();
-                    System.out.println( "\t" + sprm.toString() );
-                }
-            }
-
-            String text = new Range( chpx.getStart(), chpx.getEnd(),
-                    _doc.getOverallRange() )
-            {
-                public String toString()
-                {
-                    return "CHPX range (" + super.toString() + ")";
-                }
-            }.text();
-            StringBuilder stringBuilder = new StringBuilder();
-            for ( char c : text.toCharArray() )
-            {
-                if ( c < 30 )
-                    stringBuilder
-                            .append( "\\0x" + Integer.toHexString( c ) );
-                else
-                    stringBuilder.append( c );
-            }
-            System.out.println( stringBuilder );
-        }
-    }
-
-    private void dumpDop()
-    {
-        if ( !( _doc instanceof HWPFDocument ) )
-        {
-            System.out.println( "Word 95 not supported so far" );
-            return;
-        }
-
-        System.out.println( ( (HWPFDocument) _doc ).getDocProperties() );
-    }
-
-    private void dumpEscher()
-    {
-        if ( _doc instanceof HWPFOldDocument )
-        {
-            System.out.println( "Word 95 not supported so far" );
-            return;
-        }
-
-        System.out.println( ( (HWPFDocument) _doc ).getEscherRecordHolder() );
-    }
-
-    public void dumpFIB()
-    {
-        FileInformationBlock fib = _doc.getFileInformationBlock();
-        System.out.println( fib );
-
-    }
-
-    private void dumpFields()
-    {
-        if ( !( _doc instanceof HWPFDocument ) )
-        {
-            System.out.println( "Word 95 not supported so far" );
-            return;
-        }
-
-        HWPFDocument document = (HWPFDocument) _doc;
-
-        for ( FieldsDocumentPart part : FieldsDocumentPart.values() )
-        {
-            System.out.println( "=== Document part: " + part + " ===" );
-            for ( Field field : document.getFields().getFields( part ) )
-            {
-                System.out.println( field );
-            }
-        }
-    }
-
-    public void dumpFileSystem() throws Exception
-    {
-        System.out.println( dumpFileSystem( _doc.getDirectory() ) );
-    }
-
-    private String dumpFileSystem( DirectoryEntry directory )
-    {
-        StringBuilder result = new StringBuilder();
-        result.append( "+ " );
-        result.append( directory.getName() );
-        for ( Iterator<Entry> iterator = directory.getEntries(); iterator
-                .hasNext(); )
-        {
-            Entry entry = iterator.next();
-            String entryToString = "\n" + dumpFileSystem( entry );
-            entryToString = entryToString.replaceAll( "\n", "\n+---" );
-            result.append( entryToString );
-        }
-        result.append( "\n" );
-        return result.toString();
-    }
-
-    private String dumpFileSystem( Entry entry )
-    {
-        if ( entry instanceof DirectoryEntry )
-            return dumpFileSystem( (DirectoryEntry) entry );
-
-        return entry.getName();
-    }
-
-    private void dumpOfficeDrawings()
-    {
-        if ( !( _doc instanceof HWPFDocument ) )
-        {
-            System.out.println( "Word 95 not supported so far" );
-            return;
-        }
-
-        HWPFDocument document = (HWPFDocument) _doc;
-
-        if ( document.getOfficeDrawingsHeaders() != null )
-        {
-            System.out.println( "=== Document part: HEADER ===" );
-            for ( OfficeDrawing officeDrawing : document
-                    .getOfficeDrawingsHeaders().getOfficeDrawings() )
-            {
-                System.out.println( officeDrawing );
-            }
-        }
-
-        if ( document.getOfficeDrawingsHeaders() != null )
-        {
-            System.out.println( "=== Document part: MAIN ===" );
-            for ( OfficeDrawing officeDrawing : document
-                    .getOfficeDrawingsMain().getOfficeDrawings() )
-            {
-                System.out.println( officeDrawing );
-            }
-        }
-    }
-
-    public void dumpPapx( boolean withProperties, boolean withSprms )
-            throws Exception
-    {
-        if ( _doc instanceof HWPFDocument )
-        {
-            System.out.println( "binary PAP pages " );
-
-            HWPFDocument doc = (HWPFDocument) _doc;
-
-            byte[] mainStream = _doc.getMainStream();
-
-            PlexOfCps binTable = new PlexOfCps( doc.getTableStream(), doc
-                    .getFileInformationBlock().getFcPlcfbtePapx(), doc
-                    .getFileInformationBlock().getLcbPlcfbtePapx(), 4 );
-
-            List<PAPX> papxs = new ArrayList<PAPX>();
-
-            int length = binTable.length();
-            for ( int x = 0; x < length; x++ )
-            {
-                GenericPropertyNode node = binTable.getProperty( x );
-
-                int pageNum = LittleEndian.getInt( node.getBytes() );
-                int pageOffset = POIFSConstants.SMALLER_BIG_BLOCK_SIZE
-                        * pageNum;
-
-                PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(
-                        mainStream, doc.getDataStream(), pageOffset,
-                        doc.getTextTable() );
-
-                System.out.println( "* PFKP: " + pfkp );
-
-                for ( PAPX papx : pfkp.getPAPXs() )
-                {
-                    System.out.println( "** " + papx );
-                    papxs.add( papx );
-                    if ( papx != null && withSprms )
-                    {
-                        SprmIterator sprmIt = new SprmIterator(
-                                papx.getGrpprl(), 2 );
-                        dumpSprms( sprmIt, "*** " );
-                    }
-
-                }
-            }
-
-            Collections.sort( papxs );
-            System.out.println( "* Sorted by END" );
-            for ( PAPX papx : papxs )
-            {
-                System.out.println( "** " + papx );
-                if ( papx != null && withSprms )
-                {
-                    SprmIterator sprmIt = new SprmIterator( papx.getGrpprl(), 2 );
-                    dumpSprms( sprmIt, "*** " );
-                }
-            }
-        }
-
-
-        for ( PAPX papx : _doc.getParagraphTable().getParagraphs() )
-        {
-            System.out.println( papx );
-
-            if ( withProperties )
-            {
-                Paragraph paragraph = Paragraph.newParagraph( _doc.getOverallRange(), papx );
-                System.out.println( paragraph.getProps() );
-            }
-
-            SprmIterator sprmIt = new SprmIterator( papx.getGrpprl(), 2 );
-            dumpSprms( sprmIt, "\t" );
-        }
-    }
-
-    public void dumpParagraphs( boolean dumpAssotiatedPapx )
-    {
-        for ( Map.Entry<Integer, String> entry : paragraphs.entrySet() )
-        {
-            Integer endOfParagraphCharOffset = entry.getKey();
-            System.out.println( "[...; " + ( endOfParagraphCharOffset + 1 )
-                    + "): " + entry.getValue() );
-
-            if ( dumpAssotiatedPapx )
-            {
-                boolean hasAssotiatedPapx = false;
-                for ( PAPX papx : _doc.getParagraphTable().getParagraphs() )
-                {
-                    if ( papx.getStart() <= endOfParagraphCharOffset.intValue()
-                            && endOfParagraphCharOffset.intValue() < papx
-                                    .getEnd() )
-                    {
-                        hasAssotiatedPapx = true;
-                        System.out.println( "* " + papx );
-
-                        SprmIterator sprmIt = new SprmIterator(
-                                papx.getGrpprl(), 2 );
-                        dumpSprms( sprmIt, "** " );
-                    }
-                }
-                if ( !hasAssotiatedPapx )
-                {
-                    System.out.println( "* "
-                            + "NO PAPX ASSOTIATED WITH PARAGRAPH!" );
-                }
-            }
-        }
-    }
-
-    protected void dumpSprms( SprmIterator sprmIt, String linePrefix )
-    {
-        while ( sprmIt.hasNext() )
-        {
-            SprmOperation sprm = sprmIt.next();
-            System.out.println( linePrefix + sprm.toString() );
-        }
-    }
-
-    public void dumpParagraphsDom( boolean withText )
-    {
-        Range range = _doc.getOverallRange();
-        for ( int p = 0; p < range.numParagraphs(); p++ )
-        {
-            Paragraph paragraph = range.getParagraph( p );
-            System.out.println( p + ":\t" + paragraph.toString() );
-
-            if ( withText )
-                System.out.println( paragraph.text() );
-        }
-    }
-
-    private void dumpPictures()
-    {
-        if ( _doc instanceof HWPFOldDocument )
-        {
-            System.out.println( "Word 95 not supported so far" );
-            return;
-        }
-
-        List<Picture> allPictures = ( (HWPFDocument) _doc ).getPicturesTable()
-                .getAllPictures();
-        for ( Picture picture : allPictures )
-        {
-            System.out.println( picture.toString() );
-        }
-    }
-
-    private void dumpStyles()
-    {
-        if ( _doc instanceof HWPFOldDocument )
-        {
-            System.out.println( "Word 95 not supported so far" );
-            return;
-        }
-        HWPFDocument hwpfDocument = (HWPFDocument) _doc;
-
-        for ( int s = 0; s < hwpfDocument.getStyleSheet().numStyles(); s++ )
-        {
-            StyleDescription styleDescription = hwpfDocument.getStyleSheet()
-                    .getStyleDescription( s );
-            if ( styleDescription == null )
-                continue;
-
-            System.out.println( "=== Style #" + s + " '"
-                    + styleDescription.getName() + "' ===" );
-            System.out.println( styleDescription );
-
-            if ( styleDescription.getPAPX() != null )
-                dumpSprms( new SprmIterator( styleDescription.getPAPX(), 2 ),
-                        "Style's PAP SPRM: " );
-
-            if ( styleDescription.getCHPX() != null )
-                dumpSprms( new SprmIterator( styleDescription.getCHPX(), 0 ),
-                        "Style's CHP SPRM: " );
-        }
-    }
-
-    protected void dumpParagraphLevels( ListTables listTables,
-            ParagraphProperties paragraph )
-    {
-        if ( paragraph.getIlfo() != 0 )
-        {
-            final LFO lfo = listTables.getLfo( paragraph.getIlfo() );
-            System.out.println( "PAP's LFO: " + lfo );
-
-            final LFOData lfoData = listTables.getLfoData( paragraph.getIlfo() );
-            System.out.println( "PAP's LFOData: " + lfoData );
-
-            if ( lfo != null )
-            {
-                final ListLevel listLevel = listTables.getLevel( lfo.getLsid(),
-                        paragraph.getIlvl() );
-
-                System.out.println( "PAP's ListLevel: " + listLevel );
-                if ( listLevel.getGrpprlPapx() != null )
-                {
-                    System.out.println( "PAP's ListLevel PAPX:" );
-                    dumpSprms(
-                            new SprmIterator( listLevel.getGrpprlPapx(), 0 ),
-                            "* " );
-                }
-
-                if ( listLevel.getGrpprlPapx() != null )
-                {
-                    System.out.println( "PAP's ListLevel CHPX:" );
-                    dumpSprms(
-                            new SprmIterator( listLevel.getGrpprlChpx(), 0 ),
-                            "* " );
-                }
-            }
-        }
-    }
-
-    public void dumpTextPieces( boolean withText )
-    {
-        for ( TextPiece textPiece : _doc.getTextTable().getTextPieces() )
-        {
-            System.out.println( textPiece );
-
-            if ( withText )
-            {
-                System.out.println( "\t" + textPiece.getStringBuilder() );
-            }
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java
deleted file mode 100644
index a170256..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.dev;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Helper functions for the record transformations. Used during model classes
- * autogeneration.
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-@Internal
-public class RecordUtil
-{
-
-    public static String getBitFieldFunction( String name, String bitMask,
-            String parentType, String withType )
-    {
-        String type = getBitFieldType( name, bitMask, parentType );
-
-        String retVal = "";
-        if ( withType.equals( "true" ) )
-        {
-            retVal = type + " ";
-        }
-        if ( type.equals( "boolean" ) )
-        {
-            retVal += "is" + getFieldName1stCap( name, 0 );
-        }
-        else
-        {
-            retVal += "get" + getFieldName1stCap( name, 0 );
-        }
-        return retVal;
-
-    }
-
-    public static String getBitFieldGet( String name, String bitMask,
-            String parentType, String parentField )
-    {
-        String type = getBitFieldType( name, bitMask, parentType );
-
-        String retVal = null;
-
-        if ( type.equals( "boolean" ) )
-            retVal = name + ".isSet(" + parentField + ");";
-        else
-            retVal = "( " + type + " )" + name + ".getValue(" + parentField
-                    + ");";
-
-        return retVal;
-    }
-
-    public static String getBitFieldSet( String name, String bitMask,
-            String parentType, String parentField )
-    {
-        String type = getBitFieldType( name, bitMask, parentType );
-
-        String retVal = null;
-
-        if ( type.equals( "boolean" ) )
-            if ( parentType.equals( "int" ) )
-            {
-                retVal = getFieldName( name, 0 ) + ".setBoolean(" + parentField
-                        + ", value)";
-            }
-            else
-            {
-                retVal = "(" + parentType + ")" + getFieldName( name, 0 )
-                        + ".setBoolean(" + parentField + ", value)";
-            }
-        else
-        {
-            if ( parentType.equals( "int" ) )
-            {
-                retVal = getFieldName( name, 0 ) + ".setValue(" + parentField
-                        + ", value)";
-            }
-            else
-            {
-                retVal = "(" + parentType + ")" + getFieldName( name, 0 )
-                        + ".setValue(" + parentField + ", value)";
-            }
-        }
-        return retVal;
-    }
-
-    public static String getBitFieldType( String name, String bitMask,
-            String parentType )
-    {
-        byte parentSize = 0;
-        byte numBits = 0;
-        int mask = (int) Long.parseLong( bitMask.substring( 2 ), 16 );
-
-        if ( parentType.equals( "byte" ) )
-            parentSize = 8;
-        else if ( parentType.equals( "short" ) )
-            parentSize = 16;
-        else if ( parentType.equals( "int" ) )
-            parentSize = 32;
-
-        for ( int x = 0; x < parentSize; x++ )
-        {
-            int temp = mask;
-            numBits += ( temp >> x ) & 0x1;
-        }
-
-        if ( numBits == 1 )
-        {
-            return "boolean";
-        }
-        else if ( numBits < 8 )
-        {
-            return "byte";
-        }
-        else if ( numBits < 16 )
-        {
-            return "short";
-        }
-        else
-        {
-            return "int";
-        }
-    }
-
-    public static String getConstName( String parentName, String constName,
-            int padTo )
-    {
-        StringBuffer fieldName = new StringBuffer();
-        toConstIdentifier( parentName, fieldName );
-        fieldName.append( '_' );
-        toConstIdentifier( constName, fieldName );
-        pad( fieldName, padTo );
-        return fieldName.toString();
-    }
-
-    public static String getFieldName( int position, String name, int padTo )
-    {
-        StringBuffer fieldName = new StringBuffer( "field_" + position + "_" );
-        toIdentifier( name, fieldName );
-        pad( fieldName, padTo );
-
-        return fieldName.toString();
-    }
-
-    public static String getFieldName( String name, int padTo )
-    {
-        StringBuffer fieldName = new StringBuffer();
-        toIdentifier( name, fieldName );
-        pad( fieldName, padTo );
-
-        return fieldName.toString();
-    }
-
-    public static String getFieldName1stCap( String name, int padTo )
-    {
-        StringBuffer fieldName = new StringBuffer();
-        toIdentifier( name, fieldName );
-        fieldName.setCharAt( 0, Character.toUpperCase( fieldName.charAt( 0 ) ) );
-        pad( fieldName, padTo );
-
-        return fieldName.toString();
-    }
-
-    public static String getType1stCap( String size, String type, int padTo )
-    {
-        StringBuffer result = new StringBuffer();
-        result.append( type );
-        result = pad( result, padTo );
-        result.setCharAt( 0, Character.toUpperCase( result.charAt( 0 ) ) );
-
-        return result.toString();
-    }
-
-    protected static StringBuffer pad( StringBuffer fieldName, int padTo )
-    {
-        for ( int i = fieldName.length(); i < padTo; i++ )
-            fieldName.append( ' ' );
-        return fieldName;
-    }
-
-    private static void toConstIdentifier( String name, StringBuffer fieldName )
-    {
-        for ( int i = 0; i < name.length(); i++ )
-        {
-            if ( name.charAt( i ) == ' ' )
-                fieldName.append( '_' );
-            else
-                fieldName.append( Character.toUpperCase( name.charAt( i ) ) );
-        }
-    }
-
-    private static void toIdentifier( String name, StringBuffer fieldName )
-    {
-        for ( int i = 0; i < name.length(); i++ )
-        {
-            if ( name.charAt( i ) == ' ' )
-                fieldName.append( Character.toUpperCase( name.charAt( ++i ) ) );
-            else
-                fieldName.append( name.charAt( i ) );
-        }
-    }
-
-    public RecordUtil()
-    {
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java
deleted file mode 100644
index 2cf1ebb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.extractor;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hwpf.converter.WordToTextConverter;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hwpf.HWPFOldDocument;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Class to extract the text from old (Word 6 / Word 95) Word Documents.
- *
- * This should only be used on the older files, for most uses you
- *  should call {@link WordExtractor} which deals properly 
- *  with HWPF.
- *
- * @author Nick Burch
- */
-public final class Word6Extractor extends POIOLE2TextExtractor {
-	private HWPFOldDocument doc;
-
-	/**
-	 * Create a new Word Extractor
-	 * @param is InputStream containing the word file
-	 */
-	public Word6Extractor(InputStream is) throws IOException {
-		this( new POIFSFileSystem(is) );
-	}
-
-    /**
-     * Create a new Word Extractor
-     * 
-     * @param fs
-     *            POIFSFileSystem containing the word file
-     */
-    public Word6Extractor( POIFSFileSystem fs ) throws IOException
-    {
-        this( fs.getRoot() );
-    }
-
-    /**
-     * @deprecated Use {@link #Word6Extractor(DirectoryNode)} instead
-     */
-    @Deprecated
-    public Word6Extractor( DirectoryNode dir, POIFSFileSystem fs )
-            throws IOException
-    {
-        this( dir );
-    }
-
-    public Word6Extractor( DirectoryNode dir ) throws IOException
-    {
-        this( new HWPFOldDocument( dir ) );
-    }
-
-	/**
-	 * Create a new Word Extractor
-	 * @param doc The HWPFOldDocument to extract from
-	 */
-	public Word6Extractor(HWPFOldDocument doc) {
-		super(doc);
-		this.doc = doc;
-	}
-
-    /**
-     * Get the text from the word file, as an array with one String
-     *  per paragraph
-     */
-	@Deprecated
-	public String[] getParagraphText() {
-	    String[] ret;
-
-	    // Extract using the model code
-	    try {
-	        Range r = doc.getRange();
-
-	        ret = WordExtractor.getParagraphText(r);
-	    } catch (Exception e) {
-            // Something's up with turning the text pieces into paragraphs
-            // Fall back to ripping out the text pieces
-	        ret = new String[doc.getTextTable().getTextPieces().size()];
-	        for(int i=0; i<ret.length; i++) {
-	            ret[i] = doc.getTextTable().getTextPieces().get(i).getStringBuilder().toString();
-	            
-	            // Fix the line endings
-	            ret[i] = ret[i].replaceAll("\r", "\ufffe");
-	            ret[i] = ret[i].replaceAll("\ufffe","\r\n");
-	        }
-	    }
-
-	    return ret;
-	}
-
-    public String getText()
-    {
-        try
-        {
-            WordToTextConverter wordToTextConverter = new WordToTextConverter();
-            wordToTextConverter.processDocument( doc );
-            return wordToTextConverter.getText();
-        }
-        catch ( Exception exc )
-        {
-            // fall-back
-            StringBuffer text = new StringBuffer();
-
-            for ( String t : getParagraphText() )
-            {
-                text.append( t );
-            }
-
-            return text.toString();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
deleted file mode 100644
index d5dc068..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.extractor;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIOLE2TextExtractor;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.converter.WordToTextConverter;
-import org.apache.poi.hwpf.usermodel.HeaderStories;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Class to extract the text from a Word Document.
- * 
- * You should use either getParagraphText() or getText() unless you have a
- * strong reason otherwise.
- * 
- * @author Nick Burch
- */
-public final class WordExtractor extends POIOLE2TextExtractor
-{
-    private HWPFDocument doc;
-
-    /**
-     * Create a new Word Extractor
-     * 
-     * @param is
-     *            InputStream containing the word file
-     */
-    public WordExtractor( InputStream is ) throws IOException
-    {
-        this( HWPFDocument.verifyAndBuildPOIFS( is ) );
-    }
-
-    /**
-     * Create a new Word Extractor
-     * 
-     * @param fs
-     *            POIFSFileSystem containing the word file
-     */
-    public WordExtractor( POIFSFileSystem fs ) throws IOException
-    {
-        this( new HWPFDocument( fs ) );
-    }
-
-    public WordExtractor( DirectoryNode dir ) throws IOException
-    {
-        this( new HWPFDocument( dir ) );
-    }
-
-    /**
-     * Create a new Word Extractor
-     * 
-     * @param doc
-     *            The HWPFDocument to extract from
-     */
-    public WordExtractor( HWPFDocument doc )
-    {
-        super( doc );
-        this.doc = doc;
-    }
-
-    /**
-     * Command line extractor, so people will stop moaning that they can't just
-     * run this.
-     */
-    public static void main( String[] args ) throws IOException
-    {
-        if ( args.length == 0 )
-        {
-            System.err.println( "Use:" );
-            System.err
-                    .println( "   java org.apache.poi.hwpf.extractor.WordExtractor <filename>" );
-            System.exit( 1 );
-        }
-
-        // Process the first argument as a file
-        FileInputStream fin = new FileInputStream( args[0] );
-        WordExtractor extractor = new WordExtractor( fin );
-        try {
-        	System.out.println( extractor.getText() );
-        } finally {
-        	extractor.close();
-        }
-    }
-
-    /**
-     * Get the text from the word file, as an array with one String per
-     * paragraph
-     */
-    public String[] getParagraphText()
-    {
-        String[] ret;
-
-        // Extract using the model code
-        try
-        {
-            Range r = doc.getRange();
-
-            ret = getParagraphText( r );
-        }
-        catch ( Exception e )
-        {
-            // Something's up with turning the text pieces into paragraphs
-            // Fall back to ripping out the text pieces
-            ret = new String[1];
-            ret[0] = getTextFromPieces();
-        }
-
-        return ret;
-    }
-
-    public String[] getFootnoteText()
-    {
-        Range r = doc.getFootnoteRange();
-
-        return getParagraphText( r );
-    }
-
-    public String[] getMainTextboxText()
-    {
-        Range r = doc.getMainTextboxRange();
-
-        return getParagraphText( r );
-    }
-
-    public String[] getEndnoteText()
-    {
-        Range r = doc.getEndnoteRange();
-
-        return getParagraphText( r );
-    }
-
-    public String[] getCommentsText()
-    {
-        Range r = doc.getCommentsRange();
-
-        return getParagraphText( r );
-    }
-
-    protected static String[] getParagraphText( Range r )
-    {
-        String[] ret;
-        ret = new String[r.numParagraphs()];
-        for ( int i = 0; i < ret.length; i++ )
-        {
-            Paragraph p = r.getParagraph( i );
-            ret[i] = p.text();
-
-            // Fix the line ending
-            if ( ret[i].endsWith( "\r" ) )
-            {
-                ret[i] = ret[i] + "\n";
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Add the header/footer text, if it's not empty
-     */
-    private void appendHeaderFooter( String text, StringBuffer out )
-    {
-        if ( text == null || text.length() == 0 )
-            return;
-
-        text = text.replace( '\r', '\n' );
-        if ( !text.endsWith( "\n" ) )
-        {
-            out.append( text );
-            out.append( '\n' );
-            return;
-        }
-        if ( text.endsWith( "\n\n" ) )
-        {
-            out.append( text.substring( 0, text.length() - 1 ) );
-            return;
-        }
-        out.append( text );
-        return;
-    }
-
-    /**
-     * Grab the text from the headers
-     * @deprecated 3.8 beta 4
-     */
-    @Deprecated
-    public String getHeaderText()
-    {
-        HeaderStories hs = new HeaderStories( doc );
-
-        StringBuffer ret = new StringBuffer();
-        if ( hs.getFirstHeader() != null )
-        {
-            appendHeaderFooter( hs.getFirstHeader(), ret );
-        }
-        if ( hs.getEvenHeader() != null )
-        {
-            appendHeaderFooter( hs.getEvenHeader(), ret );
-        }
-        if ( hs.getOddHeader() != null )
-        {
-            appendHeaderFooter( hs.getOddHeader(), ret );
-        }
-
-        return ret.toString();
-    }
-
-    /**
-     * Grab the text from the footers
-     * @deprecated 3.8 beta 4
-     */
-    @Deprecated
-    public String getFooterText()
-    {
-        HeaderStories hs = new HeaderStories( doc );
-
-        StringBuffer ret = new StringBuffer();
-        if ( hs.getFirstFooter() != null )
-        {
-            appendHeaderFooter( hs.getFirstFooter(), ret );
-        }
-        if ( hs.getEvenFooter() != null )
-        {
-            appendHeaderFooter( hs.getEvenFooter(), ret );
-        }
-        if ( hs.getOddFooter() != null )
-        {
-            appendHeaderFooter( hs.getOddFooter(), ret );
-        }
-
-        return ret.toString();
-    }
-
-    /**
-     * Grab the text out of the text pieces. Might also include various bits of
-     * crud, but will work in cases where the text piece -> paragraph mapping is
-     * broken. Fast too.
-     */
-    public String getTextFromPieces()
-    {
-        String text = doc.getDocumentText();
-
-        // Fix line endings (Note - won't get all of them
-        text = text.replaceAll( "\r\r\r", "\r\n\r\n\r\n" );
-        text = text.replaceAll( "\r\r", "\r\n\r\n" );
-
-        if ( text.endsWith( "\r" ) )
-        {
-            text += "\n";
-        }
-
-        return text;
-    }
-
-    /**
-     * Grab the text, based on the WordToTextConverter. Shouldn't include any
-     * crud, but slower than getTextFromPieces().
-     */
-    public String getText()
-    {
-        try
-        {
-            WordToTextConverter wordToTextConverter = new WordToTextConverter();
-
-            HeaderStories hs = new HeaderStories( doc );
-
-            if ( hs.getFirstHeaderSubrange() != null )
-                wordToTextConverter.processDocumentPart( doc,
-                        hs.getFirstHeaderSubrange() );
-            if ( hs.getEvenHeaderSubrange() != null )
-                wordToTextConverter.processDocumentPart( doc,
-                        hs.getEvenHeaderSubrange() );
-            if ( hs.getOddHeaderSubrange() != null )
-                wordToTextConverter.processDocumentPart( doc,
-                        hs.getOddHeaderSubrange() );
-
-            wordToTextConverter.processDocument( doc );
-            wordToTextConverter.processDocumentPart( doc,
-                    doc.getMainTextboxRange() );
-
-            if ( hs.getFirstFooterSubrange() != null )
-                wordToTextConverter.processDocumentPart( doc,
-                        hs.getFirstFooterSubrange() );
-            if ( hs.getEvenFooterSubrange() != null )
-                wordToTextConverter.processDocumentPart( doc,
-                        hs.getEvenFooterSubrange() );
-            if ( hs.getOddFooterSubrange() != null )
-                wordToTextConverter.processDocumentPart( doc,
-                        hs.getOddFooterSubrange() );
-
-            return wordToTextConverter.getText();
-        }
-        catch ( Exception exc )
-        {
-            throw new RuntimeException( exc );
-        }
-    }
-
-    /**
-     * Removes any fields (eg macros, page markers etc) from the string.
-     */
-    public static String stripFields( String text )
-    {
-        return Range.stripFields( text );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
deleted file mode 100644
index 401fe5c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.BKFAbstractType;
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class BookmarkFirstDescriptor extends BKFAbstractType implements
-        Cloneable
-{
-    public BookmarkFirstDescriptor()
-    {
-    }
-
-    public BookmarkFirstDescriptor( byte[] data, int offset )
-    {
-        fillFields( data, offset );
-    }
-
-    @Override
-    protected BookmarkFirstDescriptor clone()
-    {
-        try
-        {
-            return (BookmarkFirstDescriptor) super.clone();
-        }
-        catch ( CloneNotSupportedException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        BookmarkFirstDescriptor other = (BookmarkFirstDescriptor) obj;
-        if ( field_1_ibkl != other.field_1_ibkl )
-            return false;
-        if ( field_2_bkf_flags != other.field_2_bkf_flags )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_ibkl;
-        result = prime * result + field_2_bkf_flags;
-        return result;
-    }
-
-    public boolean isEmpty()
-    {
-        return field_1_ibkl == 0 && field_2_bkf_flags == 0;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[BKF] EMPTY";
-
-        return super.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java
deleted file mode 100644
index 29910b0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-public class BookmarksTables
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( BookmarksTables.class );
-
-    private PlexOfCps descriptorsFirst = new PlexOfCps( 4 );
-
-    private PlexOfCps descriptorsLim = new PlexOfCps( 0 );
-
-    private List<String> names = new ArrayList<String>( 0 );
-
-    public BookmarksTables( byte[] tableStream, FileInformationBlock fib )
-    {
-        read( tableStream, fib );
-    }
-
-    public void afterDelete( int startCp, int length )
-    {
-        descriptorsFirst.adjust( startCp, -length );
-        descriptorsLim.adjust( startCp, -length );
-        for ( int i = 0; i < descriptorsFirst.length(); i++ )
-        {
-            GenericPropertyNode startNode = descriptorsFirst.getProperty( i );
-            GenericPropertyNode endNode = descriptorsLim.getProperty( i );
-            if ( startNode.getStart() == endNode.getStart() )
-            {
-                logger.log( POILogger.DEBUG, "Removing bookmark #",
-                        Integer.valueOf( i ), "..." );
-                remove( i );
-                i--;
-                continue;
-            }
-        }
-    }
-
-    public void afterInsert( int startCp, int length )
-    {
-        descriptorsFirst.adjust( startCp, length );
-        descriptorsLim.adjust( startCp - 1, length );
-    }
-
-    public int getBookmarksCount()
-    {
-        return descriptorsFirst.length();
-    }
-
-    public GenericPropertyNode getDescriptorFirst( int index )
-            throws IndexOutOfBoundsException
-    {
-        return descriptorsFirst.getProperty( index );
-    }
-
-    public int getDescriptorFirstIndex( GenericPropertyNode descriptorFirst )
-    {
-        // TODO: very non-optimal
-        return Arrays.asList( descriptorsFirst.toPropertiesArray() ).indexOf(
-                descriptorFirst );
-    }
-
-    public GenericPropertyNode getDescriptorLim( int index )
-            throws IndexOutOfBoundsException
-    {
-        return descriptorsLim.getProperty( index );
-    }
-
-    public int getDescriptorsFirstCount()
-    {
-        return descriptorsFirst.length();
-    }
-
-    public int getDescriptorsLimCount()
-    {
-        return descriptorsLim.length();
-    }
-
-    public String getName( int index )
-    {
-        return names.get( index );
-    }
-
-    public int getNamesCount()
-    {
-        return names.size();
-    }
-
-    private void read( byte[] tableStream, FileInformationBlock fib )
-    {
-        int namesStart = fib.getFcSttbfbkmk();
-        int namesLength = fib.getLcbSttbfbkmk();
-
-        if ( namesStart != 0 && namesLength != 0 )
-            this.names = new ArrayList<String>( Arrays.asList( SttbUtils
-                    .readSttbfBkmk( tableStream, namesStart ) ) );
-
-        int firstDescriptorsStart = fib.getFcPlcfbkf();
-        int firstDescriptorsLength = fib.getLcbPlcfbkf();
-        if ( firstDescriptorsStart != 0 && firstDescriptorsLength != 0 )
-            descriptorsFirst = new PlexOfCps( tableStream,
-                    firstDescriptorsStart, firstDescriptorsLength,
-                    BookmarkFirstDescriptor.getSize() );
-
-        int limDescriptorsStart = fib.getFcPlcfbkl();
-        int limDescriptorsLength = fib.getLcbPlcfbkl();
-        if ( limDescriptorsStart != 0 && limDescriptorsLength != 0 )
-            descriptorsLim = new PlexOfCps( tableStream, limDescriptorsStart,
-                    limDescriptorsLength, 0 );
-    }
-
-    public void remove( int index )
-    {
-        descriptorsFirst.remove( index );
-        descriptorsLim.remove( index );
-        names.remove( index );
-    }
-
-    public void setName( int index, String name )
-    {
-        names.set( index, name );
-    }
-
-    public void writePlcfBkmkf( FileInformationBlock fib,
-            HWPFOutputStream tableStream ) throws IOException
-    {
-        if ( descriptorsFirst == null || descriptorsFirst.length() == 0 )
-        {
-            fib.setFcPlcfbkf( 0 );
-            fib.setLcbPlcfbkf( 0 );
-            return;
-        }
-
-        int start = tableStream.getOffset();
-        tableStream.write( descriptorsFirst.toByteArray() );
-        int end = tableStream.getOffset();
-
-        fib.setFcPlcfbkf( start );
-        fib.setLcbPlcfbkf( end - start );
-    }
-
-    public void writePlcfBkmkl( FileInformationBlock fib,
-            HWPFOutputStream tableStream ) throws IOException
-    {
-        if ( descriptorsLim == null || descriptorsLim.length() == 0 )
-        {
-            fib.setFcPlcfbkl( 0 );
-            fib.setLcbPlcfbkl( 0 );
-            return;
-        }
-
-        int start = tableStream.getOffset();
-        tableStream.write( descriptorsLim.toByteArray() );
-        int end = tableStream.getOffset();
-
-        fib.setFcPlcfbkl( start );
-        fib.setLcbPlcfbkl( end - start );
-    }
-
-    public void writeSttbfBkmk( FileInformationBlock fib,
-            HWPFOutputStream tableStream ) throws IOException
-    {
-        if ( names == null || names.isEmpty() )
-        {
-            fib.setFcSttbfbkmk( 0 );
-            fib.setLcbSttbfbkmk( 0 );
-            return;
-        }
-
-        int start = tableStream.getOffset();
-        SttbUtils.writeSttbfBkmk( names.toArray( new String[names.size()] ),
-                tableStream );
-        int end = tableStream.getOffset();
-
-        fib.setFcSttbfbkmk( start );
-        fib.setLcbSttbfbkmk( end - start );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java
deleted file mode 100644
index d0bf3ef..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-/**
- * Normally PropertyNodes only ever work in characters, but
- *  a few cases actually store bytes, and this lets everything
- *  still work despite that.
- * It handles the conversion as required between bytes
- *  and characters.
- *  
- *  @deprecated byte positions shall not be saved in memory
- */
-@Deprecated
-public abstract class BytePropertyNode<T extends BytePropertyNode<T>> extends
-        PropertyNode<T>
-{
-        private final int startBytes;
-        private final int endBytes;
-
-	/**
-	 * @param fcStart The start of the text for this property, in _bytes_
-	 * @param fcEnd The end of the text for this property, in _bytes_
-	 * @deprecated
-	 */
-	public BytePropertyNode(int fcStart, int fcEnd, CharIndexTranslator translator, Object buf) {
-		super(
-				translator.getCharIndex(fcStart),
-				translator.getCharIndex(fcEnd, translator.getCharIndex(fcStart)),
-				buf
-		);
-
-        if ( fcStart > fcEnd )
-            throw new IllegalArgumentException( "fcStart (" + fcStart
-                    + ") > fcEnd (" + fcEnd + ")" );
-
-                this.startBytes = fcStart;
-                this.endBytes = fcEnd;
-	}
-
-    public BytePropertyNode( int charStart, int charEnd, Object buf )
-    {
-        super( charStart, charEnd, buf );
-
-        if ( charStart > charEnd )
-            throw new IllegalArgumentException( "charStart (" + charStart
-                    + ") > charEnd (" + charEnd + ")" );
-
-        this.startBytes = -1;
-        this.endBytes = -1;
-    }
-
-    /**
-     * @deprecated Though bytes are actually stored in file, it is advised to
-     *             use char positions for all operations. Including save
-     *             operations, because only char positions are preserved.
-     */
-	@Deprecated
-    public int getStartBytes()
-    {
-        return startBytes;
-    }
-
-    /**
-     * @deprecated Though bytes are actually stored in file, it is advised to
-     *             use char positions for all operations. Including save
-     *             operations, because only char positions are preserved.
-     */
-    @Deprecated
-    public int getEndBytes()
-    {
-        return endBytes;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
deleted file mode 100644
index ee4a377..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.hwpf.sprm.SprmIterator;
-import org.apache.poi.hwpf.sprm.SprmOperation;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class holds all of the character formatting properties.
- *
- * @author Ryan Ackley
- */
-@Internal
-public class CHPBinTable
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( CHPBinTable.class );
-
-  /** List of character properties.*/
-  protected List<CHPX> _textRuns = new ArrayList<CHPX>();
-
-  public CHPBinTable()
-  {
-  }
-
-    /**
-     * Constructor used to read a binTable in from a Word document.
-     * 
-     * @deprecated Use
-     *             {@link #CHPBinTable(byte[], byte[], int, int, CharIndexTranslator)}
-     *             instead
-     */
-    public CHPBinTable( byte[] documentStream, byte[] tableStream, int offset,
-            int size, int fcMin, TextPieceTable tpt )
-    {
-        this( documentStream, tableStream, offset, size, tpt );
-    }
-
-    /**
-     * Constructor used to read a binTable in from a Word document.
-     */
-    public CHPBinTable( byte[] documentStream, byte[] tableStream, int offset,
-            int size, CharIndexTranslator translator )
-    {
-        long start = System.currentTimeMillis();
-        /*
-         * Page 35:
-         * 
-         * "Associated with each interval is a BTE. A BTE holds a four-byte PN
-         * (page number) which identifies the FKP page in the file which
-         * contains the formatting information for that interval. A CHPX FKP
-         * further partitions an interval into runs of exception text."
-         */
-        PlexOfCps bte = new PlexOfCps( tableStream, offset, size, 4 );
-
-    int length = bte.length();
-    for (int x = 0; x < length; x++)
-    {
-      GenericPropertyNode node = bte.getProperty(x);
-
-      int pageNum = LittleEndian.getInt(node.getBytes());
-      int pageOffset = POIFSConstants.SMALLER_BIG_BLOCK_SIZE * pageNum;
-
-      CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage(documentStream,
-        pageOffset, translator);
-
-            for ( CHPX chpx : cfkp.getCHPXs() )
-            {
-                if ( chpx != null )
-                    _textRuns.add( chpx );
-            }
-    }
-        logger.log( POILogger.DEBUG, "CHPX FKPs loaded in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms (",
-                Integer.valueOf( _textRuns.size() ), " elements)" );
-
-        if ( _textRuns.isEmpty() )
-        {
-            logger.log( POILogger.WARN, "CHPX FKPs are empty" );
-            _textRuns.add( new CHPX( 0, 0, new SprmBuffer( 0 ) ) );
-        }
-    }
-
-    public void rebuild( ComplexFileTable complexFileTable )
-    {
-        long start = System.currentTimeMillis();
-
-        if ( complexFileTable != null )
-        {
-            SprmBuffer[] sprmBuffers = complexFileTable.getGrpprls();
-
-            // adding CHPX from fast-saved SPRMs
-            for ( TextPiece textPiece : complexFileTable.getTextPieceTable()
-                    .getTextPieces() )
-            {
-                PropertyModifier prm = textPiece.getPieceDescriptor().getPrm();
-                if ( !prm.isComplex() )
-                    continue;
-                int igrpprl = prm.getIgrpprl();
-
-                if ( igrpprl < 0 || igrpprl >= sprmBuffers.length )
-                {
-                    logger.log( POILogger.WARN, textPiece
-                            + "'s PRM references to unknown grpprl" );
-                    continue;
-                }
-
-                boolean hasChp = false;
-                SprmBuffer sprmBuffer = sprmBuffers[igrpprl];
-                for ( SprmIterator iterator = sprmBuffer.iterator(); iterator
-                        .hasNext(); )
-                {
-                    SprmOperation sprmOperation = iterator.next();
-                    if ( sprmOperation.getType() == SprmOperation.TYPE_CHP )
-                    {
-                        hasChp = true;
-                        break;
-                    }
-                }
-
-                if ( hasChp )
-                {
-                    SprmBuffer newSprmBuffer = sprmBuffer.clone();
-
-                    CHPX chpx = new CHPX( textPiece.getStart(),
-                            textPiece.getEnd(), newSprmBuffer );
-                    _textRuns.add( chpx );
-                }
-            }
-            logger.log( POILogger.DEBUG,
-                    "Merged with CHPX from complex file table in ",
-                    Long.valueOf( System.currentTimeMillis() - start ),
-                    " ms (", Integer.valueOf( _textRuns.size() ),
-                    " elements in total)" );
-            start = System.currentTimeMillis();
-        }
-
-        List<CHPX> oldChpxSortedByStartPos = new ArrayList<CHPX>( _textRuns );
-        Collections.sort( oldChpxSortedByStartPos,
-                PropertyNode.StartComparator.instance );
-
-        logger.log( POILogger.DEBUG, "CHPX sorted by start position in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms" );
-        start = System.currentTimeMillis();
-
-        final Map<CHPX, Integer> chpxToFileOrder = new IdentityHashMap<CHPX, Integer>();
-        {
-            int counter = 0;
-            for ( CHPX chpx : _textRuns )
-            {
-                chpxToFileOrder.put( chpx, Integer.valueOf( counter++ ) );
-            }
-        }
-        final Comparator<CHPX> chpxFileOrderComparator = new Comparator<CHPX>()
-        {
-            public int compare( CHPX o1, CHPX o2 )
-            {
-                Integer i1 = chpxToFileOrder.get( o1 );
-                Integer i2 = chpxToFileOrder.get( o2 );
-                return i1.compareTo( i2 );
-            }
-        };
-
-        logger.log( POILogger.DEBUG, "CHPX's order map created in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms" );
-        start = System.currentTimeMillis();
-
-        List<Integer> textRunsBoundariesList;
-        {
-            Set<Integer> textRunsBoundariesSet = new HashSet<Integer>();
-            for ( CHPX chpx : _textRuns )
-            {
-                textRunsBoundariesSet.add( Integer.valueOf( chpx.getStart() ) );
-                textRunsBoundariesSet.add( Integer.valueOf( chpx.getEnd() ) );
-            }
-            textRunsBoundariesSet.remove( Integer.valueOf( 0 ) );
-            textRunsBoundariesList = new ArrayList<Integer>(
-                    textRunsBoundariesSet );
-            Collections.sort( textRunsBoundariesList );
-        }
-
-        logger.log( POILogger.DEBUG, "Texts CHPX boundaries collected in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms" );
-        start = System.currentTimeMillis();
-
-        List<CHPX> newChpxs = new LinkedList<CHPX>();
-        int lastTextRunStart = 0;
-        for ( Integer objBoundary : textRunsBoundariesList )
-        {
-            final int boundary = objBoundary.intValue();
-
-            final int startInclusive = lastTextRunStart;
-            final int endExclusive = boundary;
-            lastTextRunStart = endExclusive;
-
-            int startPosition = binarySearch( oldChpxSortedByStartPos, boundary );
-            startPosition = Math.abs( startPosition );
-            while ( startPosition >= oldChpxSortedByStartPos.size() )
-                startPosition--;
-            while ( startPosition > 0
-                    && oldChpxSortedByStartPos.get( startPosition ).getStart() >= boundary )
-                startPosition--;
-
-            List<CHPX> chpxs = new LinkedList<CHPX>();
-            for ( int c = startPosition; c < oldChpxSortedByStartPos.size(); c++ )
-            {
-                CHPX chpx = oldChpxSortedByStartPos.get( c );
-
-                if ( boundary < chpx.getStart() )
-                    break;
-
-                int left = Math.max( startInclusive, chpx.getStart() );
-                int right = Math.min( endExclusive, chpx.getEnd() );
-
-                if ( left < right )
-                {
-                    chpxs.add( chpx );
-                }
-            }
-
-            if ( chpxs.size() == 0 )
-            {
-                logger.log( POILogger.WARN, "Text piece [",
-                        Integer.valueOf( startInclusive ), "; ",
-                        Integer.valueOf( endExclusive ),
-                        ") has no CHPX. Creating new one." );
-                // create it manually
-                CHPX chpx = new CHPX( startInclusive, endExclusive,
-                        new SprmBuffer( 0 ) );
-                newChpxs.add( chpx );
-                continue;
-            }
-
-            if ( chpxs.size() == 1 )
-            {
-                // can we reuse existing?
-                CHPX existing = chpxs.get( 0 );
-                if ( existing.getStart() == startInclusive
-                        && existing.getEnd() == endExclusive )
-                {
-                    newChpxs.add( existing );
-                    continue;
-                }
-            }
-
-            Collections.sort( chpxs, chpxFileOrderComparator );
-
-            SprmBuffer sprmBuffer = new SprmBuffer( 0 );
-            for ( CHPX chpx : chpxs )
-            {
-                sprmBuffer.append( chpx.getGrpprl(), 0 );
-            }
-            CHPX newChpx = new CHPX( startInclusive, endExclusive, sprmBuffer );
-            newChpxs.add( newChpx );
-
-            continue;
-        }
-        this._textRuns = new ArrayList<CHPX>( newChpxs );
-
-        logger.log( POILogger.DEBUG, "CHPX rebuilded in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms (",
-                Integer.valueOf( _textRuns.size() ), " elements)" );
-        start = System.currentTimeMillis();
-
-        CHPX previous = null;
-        for ( Iterator<CHPX> iterator = _textRuns.iterator(); iterator
-                .hasNext(); )
-        {
-            CHPX current = iterator.next();
-            if ( previous == null )
-            {
-                previous = current;
-                continue;
-            }
-
-            if ( previous.getEnd() == current.getStart()
-                    && Arrays
-                            .equals( previous.getGrpprl(), current.getGrpprl() ) )
-            {
-                previous.setEnd( current.getEnd() );
-                iterator.remove();
-                continue;
-            }
-
-            previous = current;
-        }
-
-        logger.log( POILogger.DEBUG, "CHPX compacted in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms (",
-                Integer.valueOf( _textRuns.size() ), " elements)" );
-    }
-
-    private static int binarySearch( List<CHPX> chpxs, int startPosition )
-    {
-        int low = 0;
-        int high = chpxs.size() - 1;
-
-        while ( low <= high )
-        {
-            int mid = ( low + high ) >>> 1;
-            CHPX midVal = chpxs.get( mid );
-            int midValue = midVal.getStart();
-
-            if ( midValue < startPosition )
-                low = mid + 1;
-            else if ( midValue > startPosition )
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -( low + 1 ); // key not found.
-    }
-
-  public void adjustForDelete(int listIndex, int offset, int length)
-  {
-    int size = _textRuns.size();
-    int endMark = offset + length;
-    int endIndex = listIndex;
-
-    CHPX chpx = _textRuns.get(endIndex);
-    while (chpx.getEnd() < endMark)
-    {
-      chpx = _textRuns.get(++endIndex);
-    }
-    if (listIndex == endIndex)
-    {
-      chpx = _textRuns.get(endIndex);
-      chpx.setEnd((chpx.getEnd() - endMark) + offset);
-    }
-    else
-    {
-      chpx = _textRuns.get(listIndex);
-      chpx.setEnd(offset);
-      for (int x = listIndex + 1; x < endIndex; x++)
-      {
-        chpx = _textRuns.get(x);
-        chpx.setStart(offset);
-        chpx.setEnd(offset);
-      }
-      chpx = _textRuns.get(endIndex);
-      chpx.setEnd((chpx.getEnd() - endMark) + offset);
-    }
-
-    for (int x = endIndex + 1; x < size; x++)
-    {
-      chpx = _textRuns.get(x);
-      chpx.setStart(chpx.getStart() - length);
-      chpx.setEnd(chpx.getEnd() - length);
-    }
-  }
-
-  public void insert(int listIndex, int cpStart, SprmBuffer buf)
-  {
-
-    CHPX insertChpx = new CHPX(0, 0, buf);
-
-    // Ensure character offsets are really characters
-    insertChpx.setStart(cpStart);
-    insertChpx.setEnd(cpStart);
-
-    if (listIndex == _textRuns.size())
-    {
-      _textRuns.add(insertChpx);
-    }
-    else
-    {
-      CHPX chpx = _textRuns.get(listIndex);
-      if (chpx.getStart() < cpStart)
-      {
-    	// Copy the properties of the one before to afterwards
-    	// Will go:
-    	//  Original, until insert at point
-    	//  New one
-    	//  Clone of original, on to the old end
-        CHPX clone = new CHPX(0, 0, chpx.getSprmBuf());
-        // Again ensure contains character based offsets no matter what
-        clone.setStart(cpStart);
-        clone.setEnd(chpx.getEnd());
-
-        chpx.setEnd(cpStart);
-
-        _textRuns.add(listIndex + 1, insertChpx);
-        _textRuns.add(listIndex + 2, clone);
-      }
-      else
-      {
-        _textRuns.add(listIndex, insertChpx);
-      }
-    }
-  }
-
-  public void adjustForInsert(int listIndex, int length)
-  {
-    int size = _textRuns.size();
-    CHPX chpx = _textRuns.get(listIndex);
-    chpx.setEnd(chpx.getEnd() + length);
-
-    for (int x = listIndex + 1; x < size; x++)
-    {
-      chpx = _textRuns.get(x);
-      chpx.setStart(chpx.getStart() + length);
-      chpx.setEnd(chpx.getEnd() + length);
-    }
-  }
-
-  public List<CHPX> getTextRuns()
-  {
-    return _textRuns;
-  }
-
-    @Deprecated
-    public void writeTo( HWPFFileSystem sys, int fcMin,
-            CharIndexTranslator translator ) throws IOException
-    {
-        HWPFOutputStream docStream = sys.getStream( "WordDocument" );
-        HWPFOutputStream tableStream = sys.getStream( "1Table" );
-
-        writeTo( docStream, tableStream, fcMin, translator );
-    }
-
-    public void writeTo( HWPFOutputStream wordDocumentStream,
-            HWPFOutputStream tableStream, int fcMin,
-            CharIndexTranslator translator ) throws IOException
-    {
-
-        /*
-         * Page 35:
-         * 
-         * "Associated with each interval is a BTE. A BTE holds a four-byte PN
-         * (page number) which identifies the FKP page in the file which
-         * contains the formatting information for that interval. A CHPX FKP
-         * further partitions an interval into runs of exception text."
-         */
-        PlexOfCps bte = new PlexOfCps( 4 );
-
-    // each FKP must start on a 512 byte page.
-    int docOffset = wordDocumentStream.getOffset();
-    int mod = docOffset % POIFSConstants.SMALLER_BIG_BLOCK_SIZE;
-    if (mod != 0)
-    {
-      byte[] padding = new byte[POIFSConstants.SMALLER_BIG_BLOCK_SIZE - mod];
-      wordDocumentStream.write(padding);
-    }
-
-    // get the page number for the first fkp
-    docOffset = wordDocumentStream.getOffset();
-    int pageNum = docOffset/POIFSConstants.SMALLER_BIG_BLOCK_SIZE;
-
-        // get the ending fc
-        // CHPX lastRun = _textRuns.get(_textRuns.size() - 1);
-        // int endingFc = lastRun.getEnd();
-        // endingFc += fcMin;
-        int endingFc = translator.getByteIndex( _textRuns.get(
-                _textRuns.size() - 1 ).getEnd() );
-
-    List<CHPX> overflow = _textRuns;
-    do
-    {
-      CHPX startingProp = overflow.get(0);
-            // int start = startingProp.getStart() + fcMin;
-            int start = translator.getByteIndex( startingProp.getStart() );
-
-      CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage();
-      cfkp.fill(overflow);
-
-            byte[] bufFkp = cfkp.toByteArray( translator );
-      wordDocumentStream.write(bufFkp);
-      overflow = cfkp.getOverflow();
-
-      int end = endingFc;
-      if (overflow != null)
-      {
-          // end = overflow.get(0).getStart() + fcMin;
-          end = translator.getByteIndex( overflow.get( 0 ).getStart() );
-      }
-
-      byte[] intHolder = new byte[4];
-      LittleEndian.putInt(intHolder, 0, pageNum++);
-      bte.addProperty(new GenericPropertyNode(start, end, intHolder));
-
-    }
-    while (overflow != null);
-    tableStream.write(bte.toByteArray());
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
deleted file mode 100644
index 8c63dce..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents a CHP fkp. The style properties for paragraph and character runs
- * are stored in fkps. There are PAP fkps for paragraph properties and CHP fkps
- * for character run properties. The first part of the fkp for both CHP and PAP
- * fkps consists of an array of 4 byte int offsets that represent a
- * Paragraph's or Character run's text offset in the main stream. The ending
- * offset is the next value in the array. For example, if an fkp has X number of
- * Paragraph's stored in it then there are (x + 1) 4 byte ints in the beginning
- * array. The number X is determined by the last byte in a 512 byte fkp.
- *
- * CHP and PAP fkps also store the compressed styles(grpprl) that correspond to
- * the offsets on the front of the fkp. The offset of the grpprls is determined
- * differently for CHP fkps and PAP fkps.
- *
- * @author Ryan Ackley
- */
-@Internal
-public final class CHPFormattedDiskPage extends FormattedDiskPage
-{
-    private static final int FC_SIZE = 4;
-
-    private ArrayList<CHPX> _chpxList = new ArrayList<CHPX>();
-    private ArrayList<CHPX> _overFlow;
-
-
-    public CHPFormattedDiskPage()
-    {
-    }
-
-    /**
-     * This constructs a CHPFormattedDiskPage from a raw fkp (512 byte array
-     * read from a Word file).
-     * 
-     * @deprecated Use
-     *             {@link #CHPFormattedDiskPage(byte[], int, CharIndexTranslator)}
-     *             instead
-     */
-    public CHPFormattedDiskPage( byte[] documentStream, int offset, int fcMin,
-            TextPieceTable tpt )
-    {
-        this( documentStream, offset, tpt );
-    }
-
-    /**
-     * This constructs a CHPFormattedDiskPage from a raw fkp (512 byte array
-     * read from a Word file).
-     */
-    public CHPFormattedDiskPage( byte[] documentStream, int offset,
-            CharIndexTranslator translator )
-    {
-        super( documentStream, offset );
-
-        for ( int x = 0; x < _crun; x++ )
-        {
-            int bytesStartAt = getStart( x );
-            int bytesEndAt = getEnd( x );
-
-            // int charStartAt = translator.getCharIndex( bytesStartAt );
-            // int charEndAt = translator.getCharIndex( bytesEndAt, charStartAt
-            // );
-
-            for ( int[] range : translator.getCharIndexRanges( bytesStartAt,
-                    bytesEndAt ) )
-            {
-                CHPX chpx = new CHPX( range[0], range[1], new SprmBuffer(
-                        getGrpprl( x ), 0 ) );
-                _chpxList.add( chpx );
-            }
-        }
-    }
-
-    public CHPX getCHPX(int index)
-    {
-      return _chpxList.get(index);
-    }
-
-    public List<CHPX> getCHPXs()
-    {
-        return Collections.unmodifiableList( _chpxList );
-    }
-
-    public void fill(List<CHPX> filler)
-    {
-      _chpxList.addAll(filler);
-    }
-
-    public ArrayList<CHPX> getOverflow()
-    {
-      return _overFlow;
-    }
-
-    /**
-     * Gets the chpx for the character run at index in this fkp.
-     *
-     * @param index The index of the chpx to get.
-     * @return a chpx grpprl.
-     */
-    protected byte[] getGrpprl(int index)
-    {
-        int chpxOffset = 2 * LittleEndian.getUByte(_fkp, _offset + (((_crun + 1) * 4) + index));
-
-        //optimization if offset == 0 use "Normal" style
-        if(chpxOffset == 0)
-        {
-            return new byte[0];
-        }
-
-        int size = LittleEndian.getUByte(_fkp, _offset + chpxOffset);
-
-        byte[] chpx = new byte[size];
-
-        System.arraycopy(_fkp, _offset + ++chpxOffset, chpx, 0, size);
-        return chpx;
-    }
-
-    /**
-     * @deprecated Use {@link #toByteArray(CharIndexTranslator)} instead
-     */
-    @Deprecated
-    protected byte[] toByteArray(CharIndexTranslator translator, int fcMin)
-    {
-        return toByteArray( translator );
-    }
-
-    protected byte[] toByteArray( CharIndexTranslator translator )
-    {
-        byte[] buf = new byte[512];
-        int size = _chpxList.size();
-        int grpprlOffset = 511;
-        int offsetOffset = 0;
-        int fcOffset = 0;
-
-        // total size is currently the size of one FC
-        int totalSize = FC_SIZE + 2;
-
-        int index = 0;
-        for ( ; index < size; index++ )
-        {
-            int grpprlLength = ( _chpxList.get( index ) ).getGrpprl().length;
-
-            // check to see if we have enough room for an FC, the grpprl offset,
-            // the grpprl size byte and the grpprl.
-            totalSize += ( FC_SIZE + 2 + grpprlLength );
-            // if size is uneven we will have to add one so the first grpprl
-            // falls
-            // on a word boundary
-            if ( totalSize > 511 + ( index % 2 ) )
-            {
-                totalSize -= ( FC_SIZE + 2 + grpprlLength );
-                break;
-            }
-
-            // grpprls must fall on word boundaries
-            if ( ( 1 + grpprlLength ) % 2 > 0 )
-            {
-                totalSize += 1;
-            }
-        }
-
-        // see if we couldn't fit some
-        if ( index != size )
-        {
-            _overFlow = new ArrayList<CHPX>();
-            _overFlow.addAll( _chpxList.subList( index, size ) );
-        }
-
-        // index should equal number of CHPXs that will be in this fkp now.
-        buf[511] = (byte) index;
-
-        offsetOffset = ( FC_SIZE * index ) + FC_SIZE;
-        // grpprlOffset = offsetOffset + index + (grpprlOffset % 2);
-
-        CHPX chpx = null;
-        for ( int x = 0; x < index; x++ )
-        {
-            chpx = _chpxList.get( x );
-            byte[] grpprl = chpx.getGrpprl();
-
-            LittleEndian.putInt( buf, fcOffset,
-                    translator.getByteIndex( chpx.getStart() ) );
-
-            grpprlOffset -= ( 1 + grpprl.length );
-            grpprlOffset -= ( grpprlOffset % 2 );
-            buf[offsetOffset] = (byte) ( grpprlOffset / 2 );
-            buf[grpprlOffset] = (byte) grpprl.length;
-            System.arraycopy( grpprl, 0, buf, grpprlOffset + 1, grpprl.length );
-
-            offsetOffset += 1;
-            fcOffset += FC_SIZE;
-        }
-        // put the last chpx's end in
-        LittleEndian.putInt( buf, fcOffset,
-                translator.getByteIndex( chpx.getEnd() ) );
-        return buf;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java
deleted file mode 100644
index c7d4a30..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.util.Internal;
-
-/**
- * DANGER - works in bytes!
- *
- * Make sure you call getStart() / getEnd() when you want characters
- *  (normal use), but getStartByte() / getEndByte() when you're
- *  reading in / writing out!
- *
- * @author Ryan Ackley
- */
-@Internal
-@SuppressWarnings( "deprecation" )
-public final class CHPX extends BytePropertyNode<CHPX>
-{
-
-    @Deprecated
-  public CHPX(int fcStart, int fcEnd, CharIndexTranslator translator, byte[] grpprl)
-  {
-    super(fcStart, translator.lookIndexBackward(fcEnd), translator, new SprmBuffer(grpprl, 0));
-  }
-
-  @Deprecated
-  public CHPX(int fcStart, int fcEnd, CharIndexTranslator translator, SprmBuffer buf)
-  {
-    super(fcStart, translator.lookIndexBackward(fcEnd), translator ,buf);
-  }
-
-    CHPX( int charStart, int charEnd, SprmBuffer buf )
-    {
-        super( charStart, charEnd, buf );
-    }
-
-  public byte[] getGrpprl()
-  {
-    return ((SprmBuffer)_buf).toByteArray();
-  }
-
-  public SprmBuffer getSprmBuf()
-  {
-    return (SprmBuffer)_buf;
-  }
-
-    public CharacterProperties getCharacterProperties( StyleSheet ss, short istd )
-    {
-        if ( ss == null )
-        {
-            // TODO Fix up for Word 6/95
-            return new CharacterProperties();
-        }
-
-        CharacterProperties baseStyle = ss.getCharacterStyle( istd );
-        CharacterProperties props = CharacterSprmUncompressor.uncompressCHP(
-                ss, baseStyle, getGrpprl(), 0 );
-        return props;
-    }
-
-  public String toString() {
-      return "CHPX from " + getStart() + " to " + getEnd() + 
-         " (in bytes " + getStartBytes() + " to " + getEndBytes() + ")";
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java
deleted file mode 100644
index f6b0f06..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.lang.ref.SoftReference;
-
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class CachedPropertyNode
-  extends PropertyNode<CachedPropertyNode>
-{
-  protected SoftReference<Object> _propCache;
-
-  public CachedPropertyNode(int start, int end, SprmBuffer buf)
-  {
-    super(start, end, buf);
-  }
-
-  protected void fillCache(Object ref)
-  {
-    _propCache = new SoftReference<Object>(ref);
-  }
-
-  protected Object getCacheContents()
-  {
-    return _propCache == null ? null : _propCache.get();
-  }
-
-  /**
-   * @return This property's property in compressed form.
-   */
-  public SprmBuffer getSprmBuf()
-  {
-    return (SprmBuffer)_buf;
-  }
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java
deleted file mode 100644
index 29cd5d6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public interface CharIndexTranslator {
-    /**
-     * Calculates the byte index of the given char index.
-     * 
-     * @param charPos
-     *            The char position
-     * @return The byte index
-     */
-    int getByteIndex( int charPos );
-
-    /**
-     * Calculates the char index of the given byte index. Look forward if index
-     * is not in table
-     * 
-     * @param bytePos
-     *            The character offset to check
-     * @return the char index
-     * @deprecated This API were based on incorrect assumption that single byte
-     *             offset corresponds to single char offset
-     */
-    @Deprecated
-    int getCharIndex(int bytePos);
-
-    /**
-     * Calculates the char index of the given byte index.
-     * Look forward if index is not in table
-     *
-     * @param bytePos The character offset to check
-     * @param startCP look from this characted position 
-     * @return the char index
-     * @deprecated This API were based on incorrect assumption that single byte
-     *             offset corresponds to single char offset
-     */
-    @Deprecated
-    int getCharIndex(int bytePos, int startCP);
-
-    /**
-     * Finds character ranges that includes specified byte range.
-     * 
-     * @param startBytePosInclusive
-     *            start byte range
-     * @param endBytePosExclusive
-     *            end byte range
-     */
-    int[][] getCharIndexRanges( int startBytePosInclusive,
-            int endBytePosExclusive );
-
-    /**
-     * Check if index is in table
-     * 
-     * @param bytePos
-     * @return true if index in table, false if not
-     */
-    boolean isIndexInTable(int bytePos);
-
-    /**
-     * Return first index >= bytePos that is in table
-     *
-     * @param bytePos
-     * @return  first index greater or equal to bytePos that is in table
-     */
-    int lookIndexForward(int bytePos);
-
-    /**
-     * Return last index <= bytePos that is in table
-     *
-     * @param bytePos
-     * @return last index less of equal to bytePos that is in table
-     */
-    int lookIndexBackward(int bytePos);
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java
deleted file mode 100644
index 95178c6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * 24-bit color structure
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-public class Colorref implements Cloneable
-{
-    public static Colorref valueOfIco( int ico )
-    {
-
-        switch ( ico )
-        {
-        case 1:
-            return new Colorref( 0x00000000 );
-        case 2:
-            return new Colorref( 0x00FF0000 );
-        case 3:
-            return new Colorref( 0x00FFFF00 );
-        case 4:
-            return new Colorref( 0x0000FF00 );
-        case 5:
-            return new Colorref( 0x00FF00FF );
-        case 6:
-            return new Colorref( 0x000000FF );
-        case 7:
-            return new Colorref( 0x0000FFFF );
-        case 8:
-            return new Colorref( 0x00FFFFFF );
-        case 9:
-            return new Colorref( 0x008B0000 );
-        case 10:
-            return new Colorref( 0x008B8B00 );
-        case 11:
-            return new Colorref( 0x00006400 );
-        case 12:
-            return new Colorref( 0x008B008B );
-        case 13:
-            return new Colorref( 0x0000008B );
-        case 14:
-            return new Colorref( 0x0000CCFF );
-        case 15:
-            return new Colorref( 0x00A9A9A9 );
-        case 16:
-            return new Colorref( 0x00C0C0C0 );
-        default:
-            return new Colorref( 0x00000000 );
-        }
-    }
-
-    private int value;
-
-    public Colorref()
-    {
-        this.value = -1;
-    }
-
-    public Colorref( byte[] data, int offset )
-    {
-        this.value = LittleEndian.getInt( data, offset );
-    }
-
-    public Colorref( int value )
-    {
-        this.value = value;
-    }
-
-    @Override
-    public Colorref clone() throws CloneNotSupportedException
-    {
-        return (Colorref)super.clone();
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        Colorref other = (Colorref) obj;
-        if ( value != other.value )
-            return false;
-        return true;
-    }
-
-    public int getValue()
-    {
-        return value;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return value;
-    }
-
-    public boolean isEmpty()
-    {
-        return value == -1;
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, offset, this.value );
-    }
-
-    public void setValue( int value )
-    {
-        this.value = value;
-    }
-
-    public byte[] toByteArray()
-    {
-        if ( isEmpty() )
-            throw new IllegalStateException(
-                    "Structure state (EMPTY) is not good for serialization" );
-
-        byte[] bs = new byte[4];
-        serialize( bs, 0 );
-        return bs;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[COLORREF] EMPTY";
-
-        return "[COLORREF] 0x" + Integer.toHexString( value );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
deleted file mode 100644
index f980251..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class ComplexFileTable
-{
-
-  private static final byte GRPPRL_TYPE = 1;
-  private static final byte TEXT_PIECE_TABLE_TYPE = 2;
-
-  protected TextPieceTable _tpt;
-
-  private SprmBuffer[] _grpprls;
-  
-  public ComplexFileTable()
-  {
-    _tpt = new TextPieceTable();
-  }
-
-  public ComplexFileTable(byte[] documentStream, byte[] tableStream, int offset, int fcMin) throws IOException
-  {
-    //skips through the prms before we reach the piece table. These contain data
-    //for actual fast saved files
-        List<SprmBuffer> sprmBuffers = new LinkedList<SprmBuffer>();
-        while ( tableStream[offset] == GRPPRL_TYPE )
-        {
-            offset++;
-            int size = LittleEndian.getShort( tableStream, offset );
-            offset += LittleEndian.SHORT_SIZE;
-            byte[] bs = LittleEndian.getByteArray( tableStream, offset, size );
-            offset += size;
-
-            SprmBuffer sprmBuffer = new SprmBuffer( bs, false, 0 );
-            sprmBuffers.add( sprmBuffer );
-        }
-        this._grpprls = sprmBuffers.toArray( new SprmBuffer[sprmBuffers.size()] );
-
-    if(tableStream[offset] != TEXT_PIECE_TABLE_TYPE)
-    {
-      throw new IOException("The text piece table is corrupted");
-    }
-    int pieceTableSize = LittleEndian.getInt(tableStream, ++offset);
-    offset += LittleEndian.INT_SIZE;
-    _tpt = new TextPieceTable(documentStream, tableStream, offset, pieceTableSize, fcMin);
-  }
-
-  public TextPieceTable getTextPieceTable()
-  {
-    return _tpt;
-  }
-
-    public SprmBuffer[] getGrpprls()
-    {
-        return _grpprls;
-    }
-
-    @Deprecated
-    public void writeTo( HWPFFileSystem sys ) throws IOException
-    {
-        HWPFOutputStream docStream = sys.getStream( "WordDocument" );
-        HWPFOutputStream tableStream = sys.getStream( "1Table" );
-
-        writeTo( docStream, tableStream );
-    }
-
-    public void writeTo( HWPFOutputStream wordDocumentStream,
-            HWPFOutputStream tableStream ) throws IOException
-    {
-        tableStream.write( TEXT_PIECE_TABLE_TYPE );
-
-        byte[] table = _tpt.writeTo( wordDocumentStream );
-
-        byte[] numHolder = new byte[LittleEndian.INT_SIZE];
-        LittleEndian.putInt( numHolder, 0, table.length );
-        tableStream.write( numHolder );
-        tableStream.write( table );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java
deleted file mode 100644
index dc2e366..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.hwpf.model.types.DOPAbstractType;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Comment me
- * 
- * @author Ryan Ackley
- */
-@Internal
-public final class DocumentProperties extends DOPAbstractType
-{
-
-    private byte[] _preserved;
-
-    /**
-     * @deprecated Use {@link #DocumentProperties(byte[],int,int)} instead
-     */
-    public DocumentProperties( byte[] tableStream, int offset )
-    {
-        this( tableStream, offset, DOPAbstractType.getSize() );
-    }
-
-    public DocumentProperties( byte[] tableStream, int offset, int length )
-    {
-        super.fillFields( tableStream, offset );
-
-        final int supportedSize = DOPAbstractType.getSize();
-        if ( length != supportedSize )
-        {
-            this._preserved = LittleEndian.getByteArray( tableStream, offset
-                    + supportedSize, length - supportedSize );
-        }
-        else
-        {
-            _preserved = new byte[0];
-        }
-    }
-
-    @Override
-    public void serialize( byte[] data, int offset )
-    {
-        super.serialize( data, offset );
-    }
-
-    public void writeTo( HWPFOutputStream tableStream ) throws IOException
-    {
-        byte[] supported = new byte[getSize()];
-        serialize( supported, 0 );
-
-        tableStream.write( supported );
-        tableStream.write( _preserved );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java
deleted file mode 100644
index e993efc..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherRecordFactory;
-import org.apache.poi.util.Internal;
-
-/**
- * Based on AbstractEscherRecordHolder from HSSF.
- *
- * @author Squeeself
- */
-@Internal
-public final class EscherRecordHolder {
-	private final ArrayList<EscherRecord> escherRecords;
-
-	public EscherRecordHolder() {
-		escherRecords = new ArrayList<EscherRecord>();
-	}
-
-	public EscherRecordHolder(byte[] data, int offset, int size) {
-		this();
-		fillEscherRecords(data, offset, size);
-	}
-
-	private void fillEscherRecords(byte[] data, int offset, int size)
-	{
-		EscherRecordFactory recordFactory = new DefaultEscherRecordFactory();
-		int pos = offset;
-		while ( pos < offset + size)
-		{
-			EscherRecord r = recordFactory.createRecord(data, pos);
-			escherRecords.add(r);
-			int bytesRead = r.fillFields(data, pos, recordFactory);
-			pos += bytesRead + 1; // There is an empty byte between each top-level record in a Word doc
-		}
-	}
-
-	public List<EscherRecord> getEscherRecords() {
-		return escherRecords;
-	}
-
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-
-		if (escherRecords.size() == 0) {
-			buffer.append("No Escher Records Decoded").append("\n");
-		}
-		Iterator<EscherRecord> iterator = escherRecords.iterator();
-		while (iterator.hasNext()) {
-			EscherRecord r = iterator.next();
-			buffer.append(r.toString());
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 * If we have a EscherContainerRecord as one of our
-	 *  children (and most top level escher holders do),
-	 *  then return that.
-	 */
-	public EscherContainerRecord getEscherContainer() {
-		for(Iterator<EscherRecord> it = escherRecords.iterator(); it.hasNext();) {
-			Object er = it.next();
-			if(er instanceof EscherContainerRecord) {
-				return (EscherContainerRecord)er;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Descends into all our children, returning the
-	 *  first EscherRecord with the given id, or null
-	 *  if none found
-	 */
-	public EscherRecord findFirstWithId(short id) {
-		return findFirstWithId(id, getEscherRecords());
-	}
-	private static EscherRecord findFirstWithId(short id, List<EscherRecord> records) {
-		// Check at our level
-		for(Iterator<EscherRecord> it = records.iterator(); it.hasNext();) {
-			EscherRecord r = it.next();
-			if(r.getRecordId() == id) {
-				return r;
-			}
-		}
-
-		// Then check our children in turn
-		for(Iterator<EscherRecord> it = records.iterator(); it.hasNext();) {
-			EscherRecord r = it.next();
-			if(r.isContainerRecord()) {
-				EscherRecord found = findFirstWithId(id, r.getChildRecords());
-				if(found != null) {
-					return found;
-				}
-			}
-		}
-
-		// Not found in this lot
-		return null;
-	}
-
-    public List<? extends EscherContainerRecord> getDgContainers()
-    {
-        List<EscherContainerRecord> dgContainers = new ArrayList<EscherContainerRecord>(
-                1 );
-        for ( EscherRecord escherRecord : getEscherRecords() )
-        {
-            if ( escherRecord.getRecordId() == (short) 0xF002 )
-            {
-                dgContainers.add( (EscherContainerRecord) escherRecord );
-            }
-        }
-        return dgContainers;
-    }
-
-    public List<? extends EscherContainerRecord> getDggContainers()
-    {
-        List<EscherContainerRecord> dggContainers = new ArrayList<EscherContainerRecord>(
-                1 );
-        for ( EscherRecord escherRecord : getEscherRecords() )
-        {
-            if ( escherRecord.getRecordId() == (short) 0xF000 )
-            {
-                dggContainers.add( (EscherContainerRecord) escherRecord );
-            }
-        }
-        return dggContainers;
-    }
-
-    public List<? extends EscherContainerRecord> getBStoreContainers()
-    {
-        List<EscherContainerRecord> bStoreContainers = new ArrayList<EscherContainerRecord>(
-                1 );
-        for ( EscherContainerRecord dggContainer : getDggContainers() )
-        {
-            for ( EscherRecord escherRecord : dggContainer.getChildRecords() )
-            {
-                if ( escherRecord.getRecordId() == (short) 0xF001 )
-                {
-                    bStoreContainers.add( (EscherContainerRecord) escherRecord );
-                }
-            }
-        }
-        return bStoreContainers;
-    }
-
-    public List<? extends EscherContainerRecord> getSpgrContainers()
-    {
-        List<EscherContainerRecord> spgrContainers = new ArrayList<EscherContainerRecord>(
-                1 );
-        for ( EscherContainerRecord dgContainer : getDgContainers() )
-        {
-            for ( EscherRecord escherRecord : dgContainer.getChildRecords() )
-            {
-                if ( escherRecord.getRecordId() == (short) 0xF003 )
-                {
-                    spgrContainers.add( (EscherContainerRecord) escherRecord );
-                }
-            }
-        }
-        return spgrContainers;
-    }
-
-    public List<? extends EscherContainerRecord> getSpContainers()
-    {
-        List<EscherContainerRecord> spContainers = new ArrayList<EscherContainerRecord>(
-                1 );
-        for ( EscherContainerRecord spgrContainer : getSpgrContainers() )
-        {
-            for ( EscherRecord escherRecord : spgrContainer.getChildRecords() )
-            {
-                if ( escherRecord.getRecordId() == (short) 0xF004 )
-                {
-                    spContainers.add( (EscherContainerRecord) escherRecord );
-                }
-            }
-        }
-        return spContainers;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java
deleted file mode 100644
index 1ed09aa..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The FFData structure specifies form field data for a text box, check box, or
- * drop-down list box.
- * <p>
- * Class and fields descriptions are quoted from [MS-DOC] -- v20121003 Word
- * (.doc) Binary File Format; Copyright (c) 2012 Microsoft Corporation; Release:
- * October 8, 2012
- * <p>
- * This class is internal. It content or properties may change without notice
- * due to changes in our knowledge of internal Microsoft Word binary structures.
- * 
- * @author Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word (.doc)
- *         Binary File Format; Copyright (c) 2012 Microsoft Corporation;
- *         Release: October 8, 2012
- */
-@Internal
-public class FFData
-{
-    private FFDataBase _base;
-
-    /**
-     * An optional STTB that specifies the entries in the dropdown list box.
-     * This MUST exist if and only if bits.iType is iTypeDrop (2). The entries
-     * are Unicode strings and do not have extra data. This MUST NOT exceed 25
-     * elements.
-     */
-    private Sttb _hsttbDropList;
-
-    /**
-     * An optional unsigned integer that specifies the default state of the
-     * checkbox or dropdown list box. This value MUST exist if and only if
-     * bits.iType is iTypeChck (1) or iTypeDrop (2). If bits.iType is iTypeChck
-     * (1), wDef MUST be 0 or 1 and specify the default state of the checkbox as
-     * unchecked or checked, respectively. If bits.iType is iTypeDrop (2), wDef
-     * MUST be less than the number of items in the dropdown list box and
-     * specify the default item selected (zero-based index).
-     */
-    private Integer _wDef;
-
-    private Xstz _xstzEntryMcr;
-
-    private Xstz _xstzExitMcr;
-
-    private Xstz _xstzHelpText;
-
-    /**
-     * An Xstz that specifies the name of this form field. xstzName.cch MUST NOT
-     * exceed 20.
-     */
-    private Xstz _xstzName;
-
-    private Xstz _xstzStatText;
-
-    /**
-     * An optional Xstz that specifies the default text of this textbox. This
-     * structure MUST exist if and only if bits.iType is iTypeTxt (0).
-     * xstzTextDef.cch MUST NOT exceed 255. If bits.iTypeTxt is either
-     * iTypeTxtCurDate (3) or iTypeTxtCurTime (4), xstzTextDef MUST be an empty
-     * string. If bits.iTypeTxt is iTypeTxtCalc (5), xstzTextDef specifies an
-     * expression to calculate.
-     */
-    private Xstz _xstzTextDef;
-
-    private Xstz _xstzTextFormat;
-
-    public FFData( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    public void fillFields( final byte[] std, final int startOffset ) // NOSONAR
-    {
-        int offset = startOffset;
-
-        this._base = new FFDataBase( std, offset );
-        offset += FFDataBase.getSize();
-
-        this._xstzName = new Xstz( std, offset );
-        offset += this._xstzName.getSize();
-
-        if ( _base.getIType() == FFDataBase.ITYPE_TEXT )
-        {
-            _xstzTextDef = new Xstz( std, offset );
-            offset += this._xstzTextDef.getSize();
-        }
-        else
-        {
-            this._xstzTextDef = null;
-        }
-
-        if ( _base.getIType() == FFDataBase.ITYPE_CHCK
-                || _base.getIType() == FFDataBase.ITYPE_DROP )
-        {
-            this._wDef = Integer
-                    .valueOf( LittleEndian.getUShort( std, offset ) );
-            offset += LittleEndian.SHORT_SIZE;
-        }
-        else
-        {
-            this._wDef = null;
-        }
-
-        _xstzTextFormat = new Xstz( std, offset );
-        offset += this._xstzTextFormat.getSize();
-
-        _xstzHelpText = new Xstz( std, offset );
-        offset += this._xstzHelpText.getSize();
-
-        _xstzStatText = new Xstz( std, offset );
-        offset += this._xstzStatText.getSize();
-
-        _xstzEntryMcr = new Xstz( std, offset );
-        offset += this._xstzEntryMcr.getSize();
-
-        _xstzExitMcr = new Xstz( std, offset );
-        offset += this._xstzExitMcr.getSize();
-
-        if ( _base.getIType() == FFDataBase.ITYPE_DROP )
-        {
-            _hsttbDropList = new Sttb( std, offset );
-            offset += _hsttbDropList.getSize();
-        }
-    }
-
-    /**
-     * specify the default item selected (zero-based index).
-     */
-    public int getDefaultDropDownItemIndex()
-    {
-        return _wDef.intValue();
-    }
-
-    public String[] getDropList()
-    {
-        return _hsttbDropList.getData();
-    }
-
-    public int getSize()
-    {
-        int size = FFDataBase.getSize();
-
-        size += _xstzName.getSize();
-
-        if ( _base.getIType() == FFDataBase.ITYPE_TEXT )
-        {
-            size += _xstzTextDef.getSize();
-        }
-
-        if ( _base.getIType() == FFDataBase.ITYPE_CHCK
-                || _base.getIType() == FFDataBase.ITYPE_DROP )
-        {
-            size += LittleEndian.SHORT_SIZE;
-        }
-
-        size += _xstzTextFormat.getSize();
-        size += _xstzHelpText.getSize();
-        size += _xstzStatText.getSize();
-        size += _xstzEntryMcr.getSize();
-        size += _xstzExitMcr.getSize();
-
-        if ( _base.getIType() == FFDataBase.ITYPE_DROP )
-        {
-            size += _hsttbDropList.getSize();
-        }
-
-        return size;
-    }
-
-    public String getTextDef()
-    {
-        return _xstzTextDef.getAsJavaString();
-    }
-
-    public byte[] serialize()
-    {
-        byte[] buffer = new byte[getSize()];
-        int offset = 0;
-
-        _base.serialize( buffer, offset );
-        offset += FFDataBase.getSize();
-
-        offset += _xstzName.serialize( buffer, offset );
-
-        if ( _base.getIType() == FFDataBase.ITYPE_TEXT )
-        {
-            offset += _xstzTextDef.serialize( buffer, offset );
-        }
-
-        if ( _base.getIType() == FFDataBase.ITYPE_CHCK
-                || _base.getIType() == FFDataBase.ITYPE_DROP )
-        {
-            LittleEndian.putUShort( buffer, offset, _wDef );
-            offset += LittleEndian.SHORT_SIZE;
-        }
-
-        offset += _xstzTextFormat.serialize( buffer, offset );
-        offset += _xstzHelpText.serialize( buffer, offset );
-        offset += _xstzStatText.serialize( buffer, offset );
-        offset += _xstzEntryMcr.serialize( buffer, offset );
-        offset += _xstzExitMcr.serialize( buffer, offset );
-
-        if ( _base.getIType() == FFDataBase.ITYPE_DROP )
-        {
-            offset += _hsttbDropList.serialize( buffer, offset );
-        }
-
-        return buffer;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java
deleted file mode 100644
index d0e542f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FFDataBaseAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The FFData structure specifies form field data for a text box, check box, or
- * drop-down list box.
- * <p>
- * Class and fields descriptions are quoted from [MS-DOC] -- v20121003 Word
- * (.doc) Binary File Format; Copyright (c) 2012 Microsoft Corporation; Release:
- * October 8, 2012
- * <p>
- * This class is internal. It content or properties may change without notice
- * due to changes in our knowledge of internal Microsoft Word binary structures.
- * 
- * @author Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word (.doc)
- *         Binary File Format; Copyright (c) 2012 Microsoft Corporation;
- *         Release: October 8, 2012
- */
-@Internal
-public class FFDataBase extends FFDataBaseAbstractType
-{
-    public FFDataBase()
-    {
-        super();
-    }
-
-    public FFDataBase( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
deleted file mode 100644
index ec422d9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-public final class FIBFieldHandler
-{
-    // 154 == 0x009A; 158 == 0x009E
-  public static final int STSHFORIG = 0;
-  public static final int STSHF = 1;
-  public static final int PLCFFNDREF = 2;
-  public static final int PLCFFNDTXT = 3;
-  public static final int PLCFANDREF = 4;
-  public static final int PLCFANDTXT = 5;
-  public static final int PLCFSED = 6;
-  public static final int PLCFPAD = 7;
-  public static final int PLCFPHE = 8;
-  public static final int STTBGLSY = 9;
-  // 234 == 0x00EA; 238 == 0x00EE
-  public static final int PLCFGLSY = 10;
-  // 242 == 0200F2; 246 == 0x00F6
-  public static final int PLCFHDD = 11;
-  public static final int PLCFBTECHPX = 12;
-  public static final int PLCFBTEPAPX = 13;
-  public static final int PLCFSEA = 14;
-  public static final int STTBFFFN = 15;
-  public static final int PLCFFLDMOM = 16;
-  public static final int PLCFFLDHDR = 17;
-  // 298 == 0x12A; 302 == 0x12E
-  public static final int PLCFFLDFTN = 18;
-  // 306 == 0x132; 310 == 0x0136
-  public static final int PLCFFLDATN = 19;
-  // 314 == 0x013A; 318 == 0x013E
-  public static final int PLCFFLDMCR = 20;
-  // 322 == 0x0142; 326 == 0x0146
-  public static final int STTBFBKMK = 21;
-  // 330 == 0x014A; 334 == 0x014E
-  public static final int PLCFBKF = 22;
-  public static final int PLCFBKL = 23;
-  public static final int CMDS = 24;
-  public static final int PLCMCR = 25;
-  public static final int STTBFMCR = 26;
-  public static final int PRDRVR = 27;
-  public static final int PRENVPORT = 28;
-  public static final int PRENVLAND = 29;
-  public static final int WSS = 30;
-  // 402 == 0x0192; 406 == 0x0196
-  public static final int DOP = 31;
-  public static final int STTBFASSOC = 32;
-  public static final int CLX = 33;
-  public static final int PLCFPGDFTN = 34;
-  public static final int AUTOSAVESOURCE = 35;
-  public static final int GRPXSTATNOWNERS = 36;//validated
-  public static final int STTBFATNBKMK = 37;
-  public static final int PLCFDOAMOM = 38;
-  public static final int PLCDOAHDR = 39;
-    // 474 == 0x01DA; 478 == 0x01DE
-    public static final int PLCSPAMOM = 40;
-    // 482 == 0x01E2; 490 == 0x01E6
-    public static final int PLCSPAHDR = 41;
-    public static final int PLCFATNBKF = 42;
-    // 498 == 0x01F2; 502 == 0x01F6
-    public static final int PLCFATNBKL = 43;
-    // 506 == 0x01FA; 510 == 0x01FE
-    public static final int PMS = 44;
-    // 514 == 0x0202; 518 == 0x0206
-    public static final int FORMFLDSTTBS = 45;
-  public static final int PLCFENDREF = 46;
-  public static final int PLCFENDTXT = 47;
-  public static final int PLCFFLDEDN = 48;
-  public static final int PLCFPGDEDN = 49;
-    // 554 == 0x022A; 558 == 0x022E -- long
-    public static final int DGGINFO = 50;
-  public static final int STTBFRMARK = 51;
-  public static final int STTBCAPTION = 52;
-  public static final int STTBAUTOCAPTION = 53;
-  public static final int PLCFWKB = 54;
-  public static final int PLCFSPL = 55;
-  public static final int PLCFTXBXTXT = 56;
-    // 610 -- 0x0262; 614 == 0x0266
-    public static final int PLCFFLDTXBX = 57;// validated
-  public static final int PLCFHDRTXBXTXT = 58;
-  public static final int PLCFFLDHDRTXBX = 59;
-  public static final int STWUSER = 60;
-  public static final int STTBTTMBD = 61;
-  public static final int UNUSED = 62;
-  public static final int PGDMOTHER = 63;
-  public static final int BKDMOTHER = 64;
-  public static final int PGDFTN = 65;
-  public static final int BKDFTN = 66;
-  public static final int PGDEDN = 67;
-  public static final int BKDEDN = 68;
-  public static final int STTBFINTFLD = 69;
-  public static final int ROUTESLIP = 70;
-  public static final int STTBSAVEDBY = 71;
-  public static final int STTBFNM = 72;
-  public static final int PLFLST = 73;
-  @Deprecated
-  public static final int PLCFLST = PLFLST;
-  public static final int PLFLFO = 74;
-  public static final int PLCFTXBXBKD = 75;//validated
-  public static final int PLCFTXBXHDRBKD = 76;
-  public static final int DOCUNDO = 77;
-  public static final int RGBUSE = 78;
-  public static final int USP = 79;
-  public static final int USKF = 80;
-  public static final int PLCUPCRGBUSE = 81;
-  public static final int PLCUPCUSP = 82;
-  public static final int STTBGLSYSTYLE = 83;
-  public static final int PLGOSL = 84;
-  public static final int PLCOCX = 85;
-  public static final int PLCFBTELVC = 86;
-  public static final int MODIFIED = 87;
-  public static final int PLCFLVC = 88;
-  public static final int PLCASUMY = 89;
-  public static final int PLCFGRAM = 90;
-  public static final int STTBLISTNAMES = 91;
-  public static final int STTBFUSSR = 92;
-
-  private static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class);
-
-  private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2;
-
-  private Map<Integer, UnhandledDataStructure> _unknownMap = new HashMap<Integer, UnhandledDataStructure>();
-  private int[] _fields;
-
-
-  FIBFieldHandler(byte[] mainStream, int offset, int cbRgFcLcb, byte[] tableStream,
-                         HashSet<Integer> offsetList, boolean areKnown)
-  {
-    _fields = new int[cbRgFcLcb * 2];
-
-    for (int x = 0; x < cbRgFcLcb; x++)
-    {
-      int fieldOffset = (x * FIELD_SIZE) + offset;
-      int dsOffset = LittleEndian.getInt(mainStream, fieldOffset);
-      fieldOffset += LittleEndian.INT_SIZE;
-      int dsSize = LittleEndian.getInt(mainStream, fieldOffset);
-
-      if (offsetList.contains(Integer.valueOf(x)) ^ areKnown)
-      {
-        if (dsSize > 0)
-        {
-          if (dsOffset + dsSize > tableStream.length)
-          {
-              if (log.check(POILogger.WARN)) {
-                  log.log(POILogger.WARN, "Unhandled data structure points to outside the buffer. " +
-                          "offset = " + dsOffset + ", length = " + dsSize +
-                          ", buffer length = " + tableStream.length);
-              }
-          }
-          else
-          {
-            UnhandledDataStructure unhandled = new UnhandledDataStructure(
-              tableStream, dsOffset, dsSize);
-            _unknownMap.put(Integer.valueOf(x), unhandled);
-          }
-        }
-      }
-      _fields[x*2] = dsOffset;
-      _fields[(x*2) + 1] = dsSize;
-    }
-  }
-
-  public void clearFields()
-  {
-    Arrays.fill(_fields, 0);
-  }
-
-  public int getFieldOffset(int field)
-  {
-    return _fields[field*2];
-  }
-
-  public int getFieldSize(int field)
-  {
-    return _fields[(field*2) + 1];
-  }
-
-  public void setFieldOffset(int field, int offset)
-  {
-    _fields[field*2] = offset;
-  }
-
-  public void setFieldSize(int field, int size)
-  {
-    _fields[(field*2) + 1] = size;
-  }
-
-  public int sizeInBytes()
-  {
-    return (_fields.length * LittleEndian.INT_SIZE);
-  }
-
-  public int getFieldsCount() {
-      return _fields.length / 2;
-  }
-  
-  void writeTo(byte[] mainStream, int offset, HWPFOutputStream tableStream)
-    throws IOException
-  {
-    for (int x = 0; x < _fields.length/2; x++)
-    {
-      UnhandledDataStructure ds = _unknownMap.get(Integer.valueOf(x));
-      if (ds != null)
-      {
-        _fields[x * 2] = tableStream.getOffset();
-        LittleEndian.putInt(mainStream, offset, tableStream.getOffset());
-        offset += LittleEndian.INT_SIZE;
-
-        byte[] buf = ds.getBuf();
-        tableStream.write(buf);
-
-        _fields[(x * 2) + 1] = buf.length;
-        LittleEndian.putInt(mainStream, offset, buf.length);
-        offset += LittleEndian.INT_SIZE;
-      }
-      else
-      {
-        LittleEndian.putInt(mainStream, offset, _fields[x * 2]);
-        offset += LittleEndian.INT_SIZE;
-        LittleEndian.putInt(mainStream, offset, _fields[(x * 2) + 1]);
-        offset += LittleEndian.INT_SIZE;
-      }
-    }
-  }
-
-    private static String leftPad( String text, int value, char padChar )
-    {
-        if ( text.length() >= value )
-            return text;
-
-        StringBuilder result = new StringBuilder();
-        for ( int i = 0; i < ( value - text.length() ); i++ )
-        {
-            result.append( padChar );
-        }
-        result.append( text );
-        return result.toString();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder result = new StringBuilder();
-        result.append( "[FIBFieldHandler]:\n" );
-
-        result.append( "\tFields:\n" );
-        result.append( "\t" );
-        result.append( leftPad( "Index", 8, ' ' ) );
-        result.append( leftPad( "FIB offset", 15, ' ' ) );
-        result.append( leftPad( "Offset", 8, ' ' ) );
-        result.append( leftPad( "Size", 8, ' ' ) );
-        result.append( '\n' );
-        for ( int x = 0; x < _fields.length / 2; x++ )
-        {
-            result.append( '\t' );
-            result.append( leftPad( Integer.toString( x ), 8, ' ' ) );
-            result.append( leftPad( Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6, ' ' ) );
-            result.append( "   0x" );
-            result.append( leftPad( Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ), 4, '0' ) );
-            result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8, ' ' ) );
-            result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8, ' ' ) );
-
-            UnhandledDataStructure structure = _unknownMap.get( Integer.valueOf( x ) );
-            if ( structure != null )
-            {
-                result.append( " => Unknown structure of size " );
-                result.append( structure.getBuf().length );
-            }
-            result.append( '\n' );
-        }
-        return result.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java
deleted file mode 100644
index d914f82..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FSPAAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * File Shape Address structure
- * 
- * @author Squeeself
- */
-@Internal
-public final class FSPA extends FSPAAbstractType
-{
-    @Deprecated
-    public static final int FSPA_SIZE = getSize(); // 26
-
-    public FSPA()
-    {
-    }
-
-    public FSPA( byte[] bytes, int offset )
-    {
-        fillFields( bytes, offset );
-    }
-
-    public byte[] toByteArray()
-    {
-        byte[] buf = new byte[FSPA_SIZE];
-        serialize( buf, 0 );
-        return buf;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java
deleted file mode 100644
index 287b64d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public enum FSPADocumentPart {
-    HEADER( FIBFieldHandler.PLCSPAHDR ),
-
-    MAIN( FIBFieldHandler.PLCSPAMOM );
-
-    private final int fibFieldsField;
-
-    private FSPADocumentPart( final int fibHandlerField )
-    {
-        this.fibFieldsField = fibHandlerField;
-    }
-
-    public int getFibFieldsField()
-    {
-        return fibFieldsField;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java
deleted file mode 100644
index c192b3e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.util.Internal;
-
-/**
- * This class holds all the FSPA (File Shape Address) structures.
- * 
- * @author Squeeself
- */
-@Internal
-public final class FSPATable
-{
-
-    private final Map<Integer, GenericPropertyNode> _byStart = new LinkedHashMap<Integer, GenericPropertyNode>();
-
-    public FSPATable( byte[] tableStream, FileInformationBlock fib,
-            FSPADocumentPart part )
-    {
-        int offset = fib.getFSPAPlcfOffset( part );
-        int length = fib.getFSPAPlcfLength( part );
-
-        PlexOfCps plex = new PlexOfCps( tableStream, offset, length,
-                FSPA.getSize() );
-        for ( int i = 0; i < plex.length(); i++ )
-        {
-            GenericPropertyNode property = plex.getProperty( i );
-            _byStart.put( Integer.valueOf( property.getStart() ), property );
-        }
-    }
-
-    @Deprecated
-    public FSPATable( byte[] tableStream, int fcPlcspa, int lcbPlcspa,
-            List<TextPiece> tpt )
-    {
-        // Will be 0 if no drawing objects in document
-        if ( fcPlcspa == 0 )
-            return;
-
-        PlexOfCps plex = new PlexOfCps( tableStream, fcPlcspa, lcbPlcspa,
-                FSPA.FSPA_SIZE );
-        for ( int i = 0; i < plex.length(); i++ )
-        {
-            GenericPropertyNode property = plex.getProperty( i );
-            _byStart.put( Integer.valueOf( property.getStart() ), property );
-        }
-    }
-
-    public FSPA getFspaFromCp( int cp )
-    {
-        GenericPropertyNode propertyNode = _byStart.get( Integer.valueOf( cp ) );
-        if ( propertyNode == null )
-        {
-            return null;
-        }
-        return new FSPA( propertyNode.getBytes(), 0 );
-    }
-
-    public FSPA[] getShapes()
-    {
-        List<FSPA> result = new ArrayList<FSPA>( _byStart.size() );
-        for ( GenericPropertyNode propertyNode : _byStart.values() )
-        {
-            result.add( new FSPA( propertyNode.getBytes(), 0 ) );
-        }
-        return result.toArray( new FSPA[result.size()] );
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        buf.append( "[FPSA PLC size=" ).append( _byStart.size() )
-                .append( "]\n" );
-
-        for ( Map.Entry<Integer, GenericPropertyNode> entry : _byStart
-                .entrySet() )
-        {
-            Integer i = entry.getKey();
-            buf.append( "  " ).append( i.toString() ).append( " => \t" );
-
-            try
-            {
-                FSPA fspa = getFspaFromCp( i.intValue() );
-                buf.append( fspa.toString() );
-            }
-            catch ( Exception exc )
-            {
-                buf.append( exc.getMessage() );
-            }
-            buf.append( "\n" );
-        }
-        buf.append( "[/FSPA PLC]" );
-        return buf.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java
deleted file mode 100644
index 935d408..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * FFN - Font Family Name. FFN is a data structure that stores the names of the Main
- * Font and that of Alternate font as an array of characters. It has also a header
- * that stores info about the whole structure and the fonts
- *
- * @author Praveen Mathew
- */
-@Internal
-public final class Ffn
-{
-  private int _cbFfnM1;//total length of FFN - 1.
-  private byte _info;
-    private static BitField _prq = BitFieldFactory.getInstance(0x0003);// pitch request
-    private static BitField _fTrueType = BitFieldFactory.getInstance(0x0004);// when 1, font is a TrueType font
-    private static BitField _ff = BitFieldFactory.getInstance(0x0070);
-  private short _wWeight;// base weight of font
-  private byte _chs;// character set identifier
-  private byte _ixchSzAlt;  // index into ffn.szFfn to the name of
-                                  // the alternate font
-  private byte [] _panose = new byte[10];//????
-  private byte [] _fontSig = new byte[24];//????
-
-  // zero terminated string that records name of font, cuurently not
-  // supporting Extended chars
-  private char [] _xszFfn;
-
-  // extra facilitator members
-  private int _xszFfnLength;
-
-  public Ffn(byte[] buf, int offset)
-  {
-    int offsetTmp = offset;
-
-    _cbFfnM1 = LittleEndian.getUByte(buf,offset);
-    offset += LittleEndian.BYTE_SIZE;
-    _info = buf[offset];
-    offset += LittleEndian.BYTE_SIZE;
-    _wWeight = LittleEndian.getShort(buf, offset);
-    offset += LittleEndian.SHORT_SIZE;
-    _chs = buf[offset];
-    offset += LittleEndian.BYTE_SIZE;
-    _ixchSzAlt = buf[offset];
-    offset += LittleEndian.BYTE_SIZE;
-
-    // read panose and fs so we can write them back out.
-    System.arraycopy(buf, offset, _panose, 0, _panose.length);
-    offset += _panose.length;
-    System.arraycopy(buf, offset, _fontSig, 0, _fontSig.length);
-    offset += _fontSig.length;
-
-    offsetTmp = offset - offsetTmp;
-    _xszFfnLength = (this.getSize() - offsetTmp)/2;
-    _xszFfn = new char[_xszFfnLength];
-
-    for(int i = 0; i < _xszFfnLength; i++)
-    {
-      _xszFfn[i] = (char)LittleEndian.getShort(buf, offset);
-      offset += LittleEndian.SHORT_SIZE;
-    }
-
-
-  }
-
-  public int get_cbFfnM1()
-  {
-    return  _cbFfnM1;
-  }
-
-  public short getWeight()
-  {
-	  return  _wWeight;
-  }
-
-  public byte getChs()
-  {
-	  return  _chs;
-  }
-
-  public byte [] getPanose()
-  {
-	  return  _panose;
-  }
-
-  public byte [] getFontSig()
-  {
-	  return  _fontSig;
-  }
-
-  public int getSize()
-  {
-    return (_cbFfnM1 + 1);
-  }
-
-  public String getMainFontName()
-  {
-    int index = 0;
-    for (;index < _xszFfnLength; index++)
-    {
-      if (_xszFfn[index] == '\0')
-      {
-        break;
-      }
-    }
-    return new String(_xszFfn, 0, index);
-  }
-
-  public String getAltFontName()
-  {
-    int index = _ixchSzAlt;
-    for (;index < _xszFfnLength; index++)
-    {
-      if (_xszFfn[index] == '\0')
-      {
-        break;
-      }
-    }
-    return new String(_xszFfn, _ixchSzAlt, index);
-
-  }
-
-  public void set_cbFfnM1(int _cbFfnM1)
-  {
-    this._cbFfnM1 = _cbFfnM1;
-  }
-
-  // changed protected to public
-  public byte[] toByteArray()
-  {
-    int offset = 0;
-    byte[] buf = new byte[this.getSize()];
-
-    buf[offset] = (byte)_cbFfnM1;
-    offset += LittleEndian.BYTE_SIZE;
-    buf[offset] = _info;
-    offset += LittleEndian.BYTE_SIZE;
-    LittleEndian.putShort(buf, offset, _wWeight);
-    offset += LittleEndian.SHORT_SIZE;
-    buf[offset] = _chs;
-    offset += LittleEndian.BYTE_SIZE;
-    buf[offset] = _ixchSzAlt;
-    offset += LittleEndian.BYTE_SIZE;
-
-    System.arraycopy(_panose,0,buf, offset,_panose.length);
-    offset += _panose.length;
-    System.arraycopy(_fontSig,0,buf, offset, _fontSig.length);
-    offset += _fontSig.length;
-
-    for(int i = 0; i < _xszFfn.length; i++)
-    {
-      LittleEndian.putShort(buf, offset, (short)_xszFfn[i]);
-      offset += LittleEndian.SHORT_SIZE;
-    }
-
-    return buf;
-
-  }
-
-  @Override
-  public boolean equals(Object other) {
-      if (!(other instanceof Ffn)) return false;
-      Ffn o = (Ffn)other;
-      
-      return (
-             o._cbFfnM1 == this._cbFfnM1
-          && o._info == this._info
-          && o._wWeight == _wWeight
-          && o._chs == _chs
-          && o._ixchSzAlt == _ixchSzAlt
-          && Arrays.equals(o._panose,_panose)
-          && Arrays.equals(o._fontSig,_fontSig)
-          && Arrays.equals(o._xszFfn,_xszFfn)
-      );
-  }
-
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-    }
-}
-
-
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java
deleted file mode 100644
index e7734a9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FibBaseAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * Base part of the File information Block (FibBase). Holds the core part of the
- * FIB, from the first 32 bytes.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format.
- * 
- * @author Andrew C. Oliver; Sergey Vladimirov; according to Microsoft Office
- *         Word 97-2007 Binary File Format Specification [*.doc] and [MS-DOC] -
- *         v20110608 Word (.doc) Binary File Format
- */
-@Internal
-public class FibBase extends FibBaseAbstractType
-{
-
-    public FibBase()
-    {
-    }
-
-    public FibBase( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @Override
-    @SuppressWarnings( "deprecation" )
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        FibBase other = (FibBase) obj;
-        if ( field_10_flags2 != other.field_10_flags2 )
-            return false;
-        if ( field_11_Chs != other.field_11_Chs )
-            return false;
-        if ( field_12_chsTables != other.field_12_chsTables )
-            return false;
-        if ( field_13_fcMin != other.field_13_fcMin )
-            return false;
-        if ( field_14_fcMac != other.field_14_fcMac )
-            return false;
-        if ( field_1_wIdent != other.field_1_wIdent )
-            return false;
-        if ( field_2_nFib != other.field_2_nFib )
-            return false;
-        if ( field_3_unused != other.field_3_unused )
-            return false;
-        if ( field_4_lid != other.field_4_lid )
-            return false;
-        if ( field_5_pnNext != other.field_5_pnNext )
-            return false;
-        if ( field_6_flags1 != other.field_6_flags1 )
-            return false;
-        if ( field_7_nFibBack != other.field_7_nFibBack )
-            return false;
-        if ( field_8_lKey != other.field_8_lKey )
-            return false;
-        if ( field_9_envr != other.field_9_envr )
-            return false;
-        return true;
-    }
-
-    @Override
-    @SuppressWarnings( "deprecation" )
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_10_flags2;
-        result = prime * result + field_11_Chs;
-        result = prime * result + field_12_chsTables;
-        result = prime * result + field_13_fcMin;
-        result = prime * result + field_14_fcMac;
-        result = prime * result + field_1_wIdent;
-        result = prime * result + field_2_nFib;
-        result = prime * result + field_3_unused;
-        result = prime * result + field_4_lid;
-        result = prime * result + field_5_pnNext;
-        result = prime * result + field_6_flags1;
-        result = prime * result + field_7_nFibBack;
-        result = prime * result + field_8_lKey;
-        result = prime * result + field_9_envr;
-        return result;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java
deleted file mode 100644
index d6bb805..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-public interface FibRgLw
-{
-    int getCbMac();
-
-    int getSubdocumentTextStreamLength( SubdocumentType subdocumentType );
-
-    void setCbMac( int cbMac );
-
-    void setSubdocumentTextStreamLength( SubdocumentType subdocumentType,
-            int newLength );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java
deleted file mode 100644
index f2834ef..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FibRgLw95AbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The FibRgLw97 structure is the third section of the FIB. This contains an
- * array of 4-byte values.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc] and [MS-DOC] - v20110608 Word
- *         (.doc) Binary File Format
- */
-@Internal
-class FibRgLw95 extends FibRgLw95AbstractType implements FibRgLw 
-{
-
-    public FibRgLw95()
-    {
-    }
-
-    public FibRgLw95( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @SuppressWarnings( "deprecation" )
-    public int getSubdocumentTextStreamLength( SubdocumentType subdocumentType )
-    {
-        switch ( subdocumentType )
-        {
-        case MAIN:
-            return getCcpText();
-        case FOOTNOTE:
-            return getCcpFtn();
-        case HEADER:
-            return getCcpHdd();
-        case MACRO:
-            return getCcpMcr();
-        case ANNOTATION:
-            return getCcpAtn();
-        case ENDNOTE:
-            return getCcpEdn();
-        case TEXTBOX:
-            return getCcpTxbx();
-        case HEADER_TEXTBOX:
-            return getCcpHdrTxbx();
-        }
-        throw new UnsupportedOperationException( "Unsupported: "
-                + subdocumentType );
-    }
-
-    @SuppressWarnings( "deprecation" )
-    public void setSubdocumentTextStreamLength(
-            SubdocumentType subdocumentType, int newLength )
-    {
-        switch ( subdocumentType )
-        {
-        case MAIN:
-            setCcpText( newLength );
-            return;
-        case FOOTNOTE:
-            setCcpFtn( newLength );
-            return;
-        case HEADER:
-            setCcpHdd( newLength );
-            return;
-        case MACRO:
-            setCbMac( newLength );
-            return;
-        case ANNOTATION:
-            setCcpAtn( newLength );
-            return;
-        case ENDNOTE:
-            setCcpEdn( newLength );
-            return;
-        case TEXTBOX:
-            setCcpTxbx( newLength );
-            return;
-        case HEADER_TEXTBOX:
-            setCcpHdrTxbx( newLength );
-            return;
-        }
-        throw new UnsupportedOperationException( "Unsupported: "
-                + subdocumentType );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java
deleted file mode 100644
index 933afd0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FibRgLw97AbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The FibRgLw97 structure is the third section of the FIB. This contains an
- * array of 4-byte values.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc] and [MS-DOC] - v20110608 Word
- *         (.doc) Binary File Format
- */
-@Internal
-public class FibRgLw97 extends FibRgLw97AbstractType implements FibRgLw
-{
-
-    public FibRgLw97()
-    {
-    }
-
-    public FibRgLw97( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @SuppressWarnings( "deprecation" )
-    public int getSubdocumentTextStreamLength( SubdocumentType subdocumentType )
-    {
-        switch ( subdocumentType )
-        {
-        case MAIN:
-            return getCcpText();
-        case FOOTNOTE:
-            return getCcpFtn();
-        case HEADER:
-            return getCcpHdd();
-        case MACRO:
-            return field_7_reserved3;
-        case ANNOTATION:
-            return getCcpAtn();
-        case ENDNOTE:
-            return getCcpEdn();
-        case TEXTBOX:
-            return getCcpTxbx();
-        case HEADER_TEXTBOX:
-            return getCcpHdrTxbx();
-        }
-        throw new UnsupportedOperationException( "Unsupported: "
-                + subdocumentType );
-    }
-
-    @SuppressWarnings( "deprecation" )
-    public void setSubdocumentTextStreamLength(
-            SubdocumentType subdocumentType, int newLength )
-    {
-        switch ( subdocumentType )
-        {
-        case MAIN:
-            setCcpText( newLength );
-            return;
-        case FOOTNOTE:
-            setCcpFtn( newLength );
-            return;
-        case HEADER:
-            setCcpHdd( newLength );
-            return;
-        case MACRO:
-            field_7_reserved3 = newLength;
-            return;
-        case ANNOTATION:
-            setCcpAtn( newLength );
-            return;
-        case ENDNOTE:
-            setCcpEdn( newLength );
-            return;
-        case TEXTBOX:
-            setCcpTxbx( newLength );
-            return;
-        case HEADER_TEXTBOX:
-            setCcpHdrTxbx( newLength );
-            return;
-        }
-        throw new UnsupportedOperationException( "Unsupported: "
-                + subdocumentType );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java
deleted file mode 100644
index fcf3527..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FibRgW97AbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The FibRgW97 structure is a variable-length portion of the Fib.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format.
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc] and [MS-DOC] - v20110608 Word
- *         (.doc) Binary File Format
- */
-@Internal
-public class FibRgW97 extends FibRgW97AbstractType
-{
-
-    public FibRgW97()
-    {
-    }
-
-    public FibRgW97( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @Override
-    @SuppressWarnings( "deprecation" )
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        FibRgW97 other = (FibRgW97) obj;
-        if ( field_10_reserved10 != other.field_10_reserved10 )
-            return false;
-        if ( field_11_reserved11 != other.field_11_reserved11 )
-            return false;
-        if ( field_12_reserved12 != other.field_12_reserved12 )
-            return false;
-        if ( field_13_reserved13 != other.field_13_reserved13 )
-            return false;
-        if ( field_14_lidFE != other.field_14_lidFE )
-            return false;
-        if ( field_1_reserved1 != other.field_1_reserved1 )
-            return false;
-        if ( field_2_reserved2 != other.field_2_reserved2 )
-            return false;
-        if ( field_3_reserved3 != other.field_3_reserved3 )
-            return false;
-        if ( field_4_reserved4 != other.field_4_reserved4 )
-            return false;
-        if ( field_5_reserved5 != other.field_5_reserved5 )
-            return false;
-        if ( field_6_reserved6 != other.field_6_reserved6 )
-            return false;
-        if ( field_7_reserved7 != other.field_7_reserved7 )
-            return false;
-        if ( field_8_reserved8 != other.field_8_reserved8 )
-            return false;
-        if ( field_9_reserved9 != other.field_9_reserved9 )
-            return false;
-        return true;
-    }
-
-    @Override
-    @SuppressWarnings( "deprecation" )
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_10_reserved10;
-        result = prime * result + field_11_reserved11;
-        result = prime * result + field_12_reserved12;
-        result = prime * result + field_13_reserved13;
-        result = prime * result + field_14_lidFE;
-        result = prime * result + field_1_reserved1;
-        result = prime * result + field_2_reserved2;
-        result = prime * result + field_3_reserved3;
-        result = prime * result + field_4_reserved4;
-        result = prime * result + field_5_reserved5;
-        result = prime * result + field_6_reserved6;
-        result = prime * result + field_7_reserved7;
-        result = prime * result + field_8_reserved8;
-        result = prime * result + field_9_reserved9;
-        return result;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java
deleted file mode 100644
index 58e55a4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FLDAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * Class for the FLD structure.
- * 
- * @author Cedric Bosdonnat <cbosdonnat@novell.com>
- */
-@Internal
-public final class FieldDescriptor extends FLDAbstractType
-{
-    public static final int FIELD_BEGIN_MARK = 0x13;
-    public static final int FIELD_SEPARATOR_MARK = 0x14;
-    public static final int FIELD_END_MARK = 0x15;
-
-    public FieldDescriptor( byte[] data )
-    {
-        fillFields( data, 0 );
-    }
-
-    public int getBoundaryType()
-    {
-        return getCh();
-    }
-
-    public int getFieldType()
-    {
-        if ( getCh() != FIELD_BEGIN_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for begin marks." );
-        return getFlt();
-    }
-
-    public boolean isZombieEmbed()
-    {
-        if ( getCh() != FIELD_END_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for end marks." );
-        return isFZombieEmbed();
-    }
-
-    public boolean isResultDirty()
-    {
-        if ( getCh() != FIELD_END_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for end marks." );
-        return isFResultDirty();
-    }
-
-    public boolean isResultEdited()
-    {
-        if ( getCh() != FIELD_END_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for end marks." );
-        return isFResultEdited();
-    }
-
-    public boolean isLocked()
-    {
-        if ( getCh() != FIELD_END_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for end marks." );
-        return isFLocked();
-    }
-
-    public boolean isPrivateResult()
-    {
-        if ( getCh() != FIELD_END_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for end marks." );
-        return isFPrivateResult();
-    }
-
-    public boolean isNested()
-    {
-        if ( getCh() != FIELD_END_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for end marks." );
-        return isFNested();
-    }
-
-    public boolean isHasSep()
-    {
-        if ( getCh() != FIELD_END_MARK )
-            throw new UnsupportedOperationException(
-                    "This field is only defined for end marks." );
-        return isFHasSep();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java
deleted file mode 100644
index 0a3de30..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public enum FieldsDocumentPart {
-
-    /**
-     * annotation subdocument
-     */
-    ANNOTATIONS( FIBFieldHandler.PLCFFLDATN ),
-
-    /**
-     * endnote subdocument
-     */
-    ENDNOTES( FIBFieldHandler.PLCFFLDEDN ),
-
-    /**
-     * footnote subdocument
-     */
-    FOOTNOTES( FIBFieldHandler.PLCFFLDFTN ),
-
-    /**
-     * header subdocument
-     */
-    HEADER( FIBFieldHandler.PLCFFLDHDR ),
-
-    /**
-     * header textbox subdoc
-     */
-    HEADER_TEXTBOX( FIBFieldHandler.PLCFFLDHDRTXBX ),
-
-    /**
-     * main document
-     */
-    MAIN( FIBFieldHandler.PLCFFLDMOM ),
-
-    /**
-     * textbox subdoc
-     */
-    TEXTBOX( FIBFieldHandler.PLCFFLDTXBX );
-
-    private final int fibFieldsField;
-
-    private FieldsDocumentPart( final int fibHandlerField )
-    {
-        this.fibFieldsField = fibHandlerField;
-    }
-
-    public int getFibFieldsField()
-    {
-        return fibFieldsField;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java
deleted file mode 100644
index 4206ce8..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-
-/**
- * This class provides access to all the fields Plex.
- * 
- * @author Cedric Bosdonnat <cbosdonnat@novell.com>
- * 
- */
-@Internal
-public class FieldsTables
-{
-    // The size in bytes of the FLD data structure
-    private static final int FLD_SIZE = 2;
-
-    /**
-     * annotation subdocument
-     */
-    @Deprecated
-    public static final int PLCFFLDATN = 0;
-
-    /**
-     * endnote subdocument
-     */
-    @Deprecated
-    public static final int PLCFFLDEDN = 1;
-    /**
-     * footnote subdocument
-     */
-    @Deprecated
-    public static final int PLCFFLDFTN = 2;
-    /**
-     * header subdocument
-     */
-    @Deprecated
-    public static final int PLCFFLDHDR = 3;
-    /**
-     * header textbox subdoc
-     */
-    @Deprecated
-    public static final int PLCFFLDHDRTXBX = 4;
-    /**
-     * main document
-     */
-    @Deprecated
-    public static final int PLCFFLDMOM = 5;
-    /**
-     * textbox subdoc
-     */
-    @Deprecated
-    public static final int PLCFFLDTXBX = 6;
-
-    private static ArrayList<PlexOfField> toArrayList( PlexOfCps plexOfCps )
-    {
-        if ( plexOfCps == null )
-            return new ArrayList<PlexOfField>();
-
-        ArrayList<PlexOfField> fields = new ArrayList<PlexOfField>(
-                plexOfCps.length() );
-        for ( int i = 0; i < plexOfCps.length(); i++ )
-        {
-            GenericPropertyNode propNode = plexOfCps.getProperty( i );
-            PlexOfField plex = new PlexOfField( propNode );
-            fields.add( plex );
-        }
-
-        return fields;
-    }
-
-    private Map<FieldsDocumentPart, PlexOfCps> _tables;
-
-    public FieldsTables( byte[] tableStream, FileInformationBlock fib )
-    {
-        _tables = new HashMap<FieldsDocumentPart, PlexOfCps>(
-                FieldsDocumentPart.values().length );
-
-        for ( FieldsDocumentPart part : FieldsDocumentPart.values() )
-        {
-            final PlexOfCps plexOfCps = readPLCF( tableStream, fib, part );
-            _tables.put( part, plexOfCps );
-        }
-    }
-
-    public ArrayList<PlexOfField> getFieldsPLCF( FieldsDocumentPart part )
-    {
-        return toArrayList( _tables.get( part ) );
-    }
-
-    @Deprecated
-    public ArrayList<PlexOfField> getFieldsPLCF( int partIndex )
-    {
-        return getFieldsPLCF( FieldsDocumentPart.values()[partIndex] );
-    }
-
-    private PlexOfCps readPLCF( byte[] tableStream, FileInformationBlock fib,
-            FieldsDocumentPart documentPart )
-    {
-        int start = fib.getFieldsPlcfOffset( documentPart );
-        int length = fib.getFieldsPlcfLength( documentPart );
-
-        if ( start <= 0 || length <= 0 )
-            return null;
-
-        return new PlexOfCps( tableStream, start, length, FLD_SIZE );
-    }
-
-    private int savePlex( FileInformationBlock fib, FieldsDocumentPart part,
-            PlexOfCps plexOfCps, HWPFOutputStream outputStream )
-            throws IOException
-    {
-        if ( plexOfCps == null || plexOfCps.length() == 0 )
-        {
-            fib.setFieldsPlcfOffset( part, outputStream.getOffset() );
-            fib.setFieldsPlcfLength( part, 0 );
-            return 0;
-        }
-
-        byte[] data = plexOfCps.toByteArray();
-
-        int start = outputStream.getOffset();
-        int length = data.length;
-
-        outputStream.write( data );
-
-        fib.setFieldsPlcfOffset( part, start );
-        fib.setFieldsPlcfLength( part, length );
-
-        return length;
-    }
-
-    public void write( FileInformationBlock fib, HWPFOutputStream tableStream )
-            throws IOException
-    {
-        for ( FieldsDocumentPart part : FieldsDocumentPart.values() )
-        {
-            PlexOfCps plexOfCps = _tables.get( part );
-            savePlex( fib, part, plexOfCps, tableStream );
-        }
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
deleted file mode 100644
index 0c14ca0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
+++ /dev/null
@@ -1,1127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashSet;
-import java.util.Locale;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * <p>The File Information Block (FIB). Holds pointers
- *  to various bits of the file, and lots of flags which
- *  specify properties of the document.<p>
- * <ul>
- * <li>The {@link FibBase} class, holds the first 32 bytes.</li>
- * <li>The next part, the fibRgW / FibRgW97, is handled by the {@link FibRgW97}.</li>
- * <li>The next part, the fibRgLw / FibRgLw97, is handled by the {@link FibRgLw97}.</li>
- * <li>Finally, the rest of the fields are handled by the {@link FIBFieldHandler}.</li>
- * </ul>
- */
-@Internal
-public final class FileInformationBlock
-{
-    public static final POILogger logger = POILogFactory
-            .getLogger( FileInformationBlock.class );
-
-    private FibBase _fibBase;
-    private int _csw;
-    private FibRgW97 _fibRgW;
-    private int _cslw;
-    private FibRgLw _fibRgLw;
-    private int _cbRgFcLcb;
-    private FIBFieldHandler _fieldHandler;
-    private int _cswNew;
-    private int _nFibNew;
-    private byte[] _fibRgCswNew;
-
-    /** Creates a new instance of FileInformationBlock */
-    public FileInformationBlock( byte[] mainDocument )
-    {
-        int offset = 0;
-
-        _fibBase = new FibBase( mainDocument, offset );
-        offset = FibBase.getSize();
-        assert offset == 32;
-
-        if ( _fibBase.isFEncrypted() )
-        {
-            throw new EncryptedDocumentException(
-                    "Cannot process encrypted word file" );
-        }
-
-        _csw = LittleEndian.getUShort( mainDocument, offset );
-        offset += LittleEndian.SHORT_SIZE;
-        assert offset == 34;
-
-        _fibRgW = new FibRgW97( mainDocument, offset );
-        offset += FibRgW97.getSize();
-        assert offset == 62;
-
-        _cslw = LittleEndian.getUShort( mainDocument, offset );
-        offset += LittleEndian.SHORT_SIZE;
-        assert offset == 64;
-
-        if ( _fibBase.getNFib() < 105 )
-        {
-            _fibRgLw = new FibRgLw95( mainDocument, offset );
-            offset += FibRgLw97.getSize();
-
-            // magic number, run tests after changes
-            _cbRgFcLcb = 74;
-
-            // skip fibRgFcLcbBlob (read later at fillVariableFields)
-            offset += _cbRgFcLcb * LittleEndian.INT_SIZE * 2;
-
-            _cswNew = LittleEndian.getUShort( mainDocument, offset );
-            offset += LittleEndian.SHORT_SIZE;
-
-            _cswNew = 0;
-            _nFibNew = -1;
-            _fibRgCswNew = new byte[0];
-
-            return;
-        }
-
-        _fibRgLw = new FibRgLw97( mainDocument, offset );
-        offset += FibRgLw97.getSize();
-        assert offset == 152;
-
-        _cbRgFcLcb = LittleEndian.getUShort( mainDocument, offset );
-        offset += LittleEndian.SHORT_SIZE;
-        assert offset == 154;
-
-        // skip fibRgFcLcbBlob (read later at fillVariableFields)
-        offset += _cbRgFcLcb * LittleEndian.INT_SIZE * 2;
-
-        _cswNew = LittleEndian.getUShort( mainDocument, offset );
-        offset += LittleEndian.SHORT_SIZE;
-
-        if ( _cswNew != 0 )
-        {
-            _nFibNew = LittleEndian.getUShort( mainDocument, offset );
-            offset += LittleEndian.SHORT_SIZE;
-
-            // first short is already read as _nFibNew
-            final int fibRgCswNewLength = ( _cswNew - 1 )
-                    * LittleEndian.SHORT_SIZE;
-            _fibRgCswNew = new byte[fibRgCswNewLength];
-            LittleEndian.getByteArray( mainDocument, offset, fibRgCswNewLength );
-            offset += fibRgCswNewLength;
-        }
-        else
-        {
-            _nFibNew = -1;
-            _fibRgCswNew = new byte[0];
-        }
-
-        assertCbRgFcLcb();
-        assertCswNew();
-    }
-
-    private void assertCbRgFcLcb()
-    {
-        int nfib = getNFib();
-        String nfibHex = String.format(Locale.ROOT, "%04X", nfib);
-        
-        // Note - CommonCrawl shows there's more variation in these than
-        //        the documentation suggests, so accept common clusters around
-        //        the "correct" value as well
-        switch ( nfib )
-        {
-        case 0x0071:
-            // Found in CommonCrawl corpus but not in the docs...
-            break;
-        case 0x00BE:
-        case 0x00BF:
-        case 0x00C0:
-        case 0x00C1: // Docs "official"
-        case 0x00C2:
-        case 0x00C3:
-            assertCbRgFcLcb(nfibHex, 0x005D, "0x005D", _cbRgFcLcb );
-            break;
-        case 0x00D8:
-        case 0x00D9: //  Docs "official"
-            assertCbRgFcLcb(nfibHex, 0x006C, "0x006C", _cbRgFcLcb );
-            break;
-        case 0x0101:
-            assertCbRgFcLcb( "0x0101", 0x0088, "0x0088", _cbRgFcLcb );
-            break;
-        // TODO Is CommonCrawl 265 = 0x109 the one above or below?
-        case 0x010B:
-        case 0x010C: //  Docs "official"
-            assertCbRgFcLcb(nfibHex, 0x00A4, "0x00A4", _cbRgFcLcb );
-            break;
-        case 0x0112:
-            assertCbRgFcLcb( "0x0112", 0x00B7, "0x00B7", _cbRgFcLcb );
-            break;
-        default:
-            /* The Word spec has a much smaller list of "valid" values
-             * to what the large CommonCrawl corpus contains!
-             */
-            logger.log(POILogger.WARN, "Invalid file format version number: " + nfib + "("+nfibHex+")");
-        }
-    }
-
-    private static void assertCbRgFcLcb( final String strNFib,
-            final int expectedCbRgFcLcb, final String strCbRgFcLcb,
-            final int cbRgFcLcb )
-    {
-        if ( cbRgFcLcb == expectedCbRgFcLcb )
-            return;
-
-        logger.log( POILogger.WARN, "Since FIB.nFib == ", strNFib,
-                " value of FIB.cbRgFcLcb MUST be ", strCbRgFcLcb + ", not 0x",
-                Integer.toHexString( cbRgFcLcb ) );
-    }
-
-    private void assertCswNew()
-    {
-        switch ( getNFib() )
-        {
-        case 0x00C1:
-            assertCswNew( "0x00C1", 0x0000, "0x0000", _cswNew );
-            break;
-        case 0x00D9:
-            assertCswNew( "0x00D9", 0x0002, "0x0002", _cswNew );
-            break;
-        case 0x0101:
-            assertCswNew( "0x0101", 0x0002, "0x0002", _cswNew );
-            break;
-        case 0x010C:
-            assertCswNew( "0x010C", 0x0002, "0x0002", _cswNew );
-            break;
-        case 0x0112:
-            assertCswNew( "0x0112", 0x0005, "0x0005", _cswNew );
-            break;
-        default:
-            logger.log(POILogger.WARN, "Invalid file format version number: " + getNFib());
-        }
-    }
-
-    private static void assertCswNew( final String strNFib,
-            final int expectedCswNew, final String strExpectedCswNew,
-            final int cswNew )
-    {
-        if ( cswNew == expectedCswNew )
-            return;
-
-        logger.log( POILogger.WARN, "Since FIB.nFib == ", strNFib,
-                " value of FIB.cswNew MUST be ",
-                strExpectedCswNew + ", not 0x", Integer.toHexString( cswNew ) );
-    }
-
-    public void fillVariableFields( byte[] mainDocument, byte[] tableStream )
-    {
-        /*
-         * Listed fields won't be treat as UnhandledDataStructure. For all other
-         * fields FIBFieldHandler will load it content into
-         * UnhandledDataStructure and save them on save.
-         */
-        HashSet<Integer> knownFieldSet = new HashSet<Integer>();
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STSHF ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.CLX ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.DOP ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFBTECHPX ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFBTEPAPX ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFSED ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLFLST ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLFLFO ) );
-
-        // field info
-        for ( FieldsDocumentPart part : FieldsDocumentPart.values() )
-            knownFieldSet.add( Integer.valueOf( part.getFibFieldsField() ) );
-
-        // bookmarks
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFBKF ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.PLCFBKL ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBFBKMK ) );
-
-        // notes
-        for ( NoteType noteType : NoteType.values() )
-        {
-            knownFieldSet.add( Integer.valueOf( noteType
-                    .getFibDescriptorsFieldIndex() ) );
-            knownFieldSet.add( Integer.valueOf( noteType
-                    .getFibTextPositionsFieldIndex() ) );
-        }
-
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBFFFN ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBFRMARK ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.STTBSAVEDBY ) );
-        knownFieldSet.add( Integer.valueOf( FIBFieldHandler.MODIFIED ) );
-
-        _fieldHandler = new FIBFieldHandler( mainDocument, 154, _cbRgFcLcb,
-                tableStream, knownFieldSet, true );
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder stringBuilder = new StringBuilder(  );
-        stringBuilder.append( _fibBase );
-        stringBuilder.append( "[FIB2]\n" );
-        stringBuilder.append( "\tSubdocuments info:\n" );
-        for ( SubdocumentType type : SubdocumentType.values() )
-        {
-            stringBuilder.append( "\t\t" );
-            stringBuilder.append( type );
-            stringBuilder.append( " has length of " );
-            stringBuilder.append( getSubdocumentTextStreamLength( type ) );
-            stringBuilder.append( " char(s)\n" );
-        }
-        stringBuilder.append( "\tFields PLCF info:\n" );
-        for ( FieldsDocumentPart part : FieldsDocumentPart.values() )
-        {
-            stringBuilder.append( "\t\t" );
-            stringBuilder.append( part );
-            stringBuilder.append( ": PLCF starts at " );
-            stringBuilder.append( getFieldsPlcfOffset( part ) );
-            stringBuilder.append( " and have length of " );
-            stringBuilder.append( getFieldsPlcfLength( part ) );
-            stringBuilder.append( "\n" );
-        }
-        stringBuilder.append( "\tNotes PLCF info:\n" );
-        for ( NoteType noteType : NoteType.values() )
-        {
-            stringBuilder.append( "\t\t" );
-            stringBuilder.append( noteType );
-            stringBuilder.append( ": descriptions starts " );
-            stringBuilder.append( getNotesDescriptorsOffset( noteType ) );
-            stringBuilder.append( " and have length of " );
-            stringBuilder.append( getNotesDescriptorsSize( noteType ) );
-            stringBuilder.append( " bytes\n" );
-            stringBuilder.append( "\t\t" );
-            stringBuilder.append( noteType );
-            stringBuilder.append( ": text positions starts " );
-            stringBuilder.append( getNotesTextPositionsOffset( noteType ) );
-            stringBuilder.append( " and have length of " );
-            stringBuilder.append( getNotesTextPositionsSize( noteType ) );
-            stringBuilder.append( " bytes\n" );
-        }
-        stringBuilder.append( _fieldHandler );
-        try
-        {
-            stringBuilder.append( "\tJava reflection info:\n" );
-            for ( Method method : FileInformationBlock.class.getMethods() )
-            {
-                if ( !method.getName().startsWith( "get" )
-                        || !Modifier.isPublic( method.getModifiers() )
-                        || Modifier.isStatic( method.getModifiers() )
-                        || method.getParameterTypes().length > 0 )
-                    continue;
-                stringBuilder.append( "\t\t" );
-                stringBuilder.append( method.getName() );
-                stringBuilder.append( " => " );
-                stringBuilder.append( method.invoke( this ) );
-                stringBuilder.append( "\n" );
-            }
-        }
-        catch ( Exception exc )
-        {
-            stringBuilder.append("(exc: ").append(exc.getMessage()).append(")");
-        }
-        stringBuilder.append( "[/FIB2]\n" );
-        return stringBuilder.toString();
-    }
-
-    public int getNFib()
-    {
-        if ( _cswNew == 0 )
-            return _fibBase.getNFib();
-
-        return _nFibNew;
-    }
-
-    public int getFcDop()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.DOP);
-    }
-
-    public void setFcDop(int fcDop)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.DOP, fcDop);
-    }
-
-    public int getLcbDop()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.DOP);
-    }
-
-    public void setLcbDop(int lcbDop)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.DOP, lcbDop);
-    }
-
-    public int getFcStshf()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.STSHF);
-    }
-
-    public int getLcbStshf()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.STSHF);
-    }
-
-    public void setFcStshf(int fcStshf)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.STSHF, fcStshf);
-    }
-
-    public void setLcbStshf(int lcbStshf)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.STSHF, lcbStshf);
-    }
-
-    public int getFcClx()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.CLX);
-    }
-
-    public int getLcbClx()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.CLX);
-    }
-
-    public void setFcClx(int fcClx)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.CLX, fcClx);
-    }
-
-    public void setLcbClx(int lcbClx)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.CLX, lcbClx);
-    }
-
-    public int getFcPlcfbteChpx()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFBTECHPX);
-    }
-
-    public int getLcbPlcfbteChpx()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFBTECHPX);
-    }
-
-    public void setFcPlcfbteChpx(int fcPlcfBteChpx)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.PLCFBTECHPX, fcPlcfBteChpx);
-    }
-
-    public void setLcbPlcfbteChpx(int lcbPlcfBteChpx)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.PLCFBTECHPX, lcbPlcfBteChpx);
-    }
-
-    public int getFcPlcfbtePapx()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFBTEPAPX);
-    }
-
-    public int getLcbPlcfbtePapx()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFBTEPAPX);
-    }
-
-    public void setFcPlcfbtePapx(int fcPlcfBtePapx)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.PLCFBTEPAPX, fcPlcfBtePapx);
-    }
-
-    public void setLcbPlcfbtePapx(int lcbPlcfBtePapx)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.PLCFBTEPAPX, lcbPlcfBtePapx);
-    }
-
-    public int getFcPlcfsed()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFSED);
-    }
-
-    public int getLcbPlcfsed()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFSED);
-    }
-
-    public void setFcPlcfsed(int fcPlcfSed)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.PLCFSED, fcPlcfSed);
-    }
-
-    public void setLcbPlcfsed(int lcbPlcfSed)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.PLCFSED, lcbPlcfSed);
-    }
-
-    @Deprecated
-    public int getFcPlcfLst()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFLST);
-    }
-
-    /**
-     * An unsigned integer that specifies an offset in the Table Stream. A
-     * PlfLst that contains list formatting information begins at this offset.
-     * An array of LVLs is appended to the PlfLst. lcbPlfLst does not account
-     * for the array of LVLs. The size of the array of LVLs is specified by the
-     * LSTFs in PlfLst. For each LSTF whose fSimpleList is set to 0x1, there is
-     * one LVL in the array of LVLs that specifies the level formatting of the
-     * single level in the list which corresponds to the LSTF. And, for each
-     * LSTF whose fSimpleList is set to 0x0, there are 9 LVLs in the array of
-     * LVLs that specify the level formatting of the respective levels in the
-     * list which corresponds to the LSTF. This array of LVLs is in the same
-     * respective order as the LSTFs in PlfLst. If lcbPlfLst is 0, fcPlfLst is
-     * undefined and MUST be ignored.
-     * <p>
-     * Quote from
-     * "[MS-DOC] -- v20110315, Word (.doc) Binary File Format; page 76 / 621"
-     */
-    public int getFcPlfLst()
-    {
-        return _fieldHandler.getFieldOffset( FIBFieldHandler.PLFLST );
-    }
-
-    @Deprecated
-    public int getLcbPlcfLst()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFLST);
-    }
-
-    public int getLcbPlfLst()
-    {
-        return _fieldHandler.getFieldSize( FIBFieldHandler.PLFLST );
-    }
-
-    @Deprecated
-    public void setFcPlcfLst( int fcPlcfLst )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFLST, fcPlcfLst );
-    }
-
-    public void setFcPlfLst( int fcPlfLst )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLFLST, fcPlfLst );
-    }
-
-    @Deprecated
-    public void setLcbPlcfLst( int lcbPlcfLst )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFLST, lcbPlcfLst );
-    }
-
-    public void setLcbPlfLst( int lcbPlfLst )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLFLST, lcbPlfLst );
-    }
-
-    /**
-     * An unsigned integer that specifies an offset in the Table Stream. A
-     * PlfLfo that contains list formatting override information begins at this
-     * offset. If lcbPlfLfo is zero, fcPlfLfo is undefined and MUST be ignored.
-     * <p>
-     * Quote from
-     * "[MS-DOC] -- v20110315, Word (.doc) Binary File Format; page 76 / 621"
-     */
-    public int getFcPlfLfo()
-    {
-        return _fieldHandler.getFieldOffset( FIBFieldHandler.PLFLFO );
-    }
-
-    public int getLcbPlfLfo()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLFLFO);
-    }
-
-    /**
-     * @return Offset in table stream of the STTBF that records bookmark names
-     *         in the main document
-     */
-    public int getFcSttbfbkmk()
-    {
-        return _fieldHandler.getFieldOffset( FIBFieldHandler.STTBFBKMK );
-    }
-
-    public void setFcSttbfbkmk( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.STTBFBKMK, offset );
-    }
-
-    /**
-     * @return Count of bytes in Sttbfbkmk
-     */
-    public int getLcbSttbfbkmk()
-    {
-        return _fieldHandler.getFieldSize( FIBFieldHandler.STTBFBKMK );
-    }
-
-    public void setLcbSttbfbkmk( int length )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.STTBFBKMK, length );
-    }
-
-    /**
-     * @return Offset in table stream of the PLCF that records the beginning CP
-     *         offsets of bookmarks in the main document. See BKF structure
-     *         definition.
-     */
-    public int getFcPlcfbkf()
-    {
-        return _fieldHandler.getFieldOffset( FIBFieldHandler.PLCFBKF );
-    }
-
-    public void setFcPlcfbkf( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFBKF, offset );
-    }
-
-    /**
-     * @return Count of bytes in Plcfbkf
-     */
-    public int getLcbPlcfbkf()
-    {
-        return _fieldHandler.getFieldSize( FIBFieldHandler.PLCFBKF );
-    }
-
-    public void setLcbPlcfbkf( int length )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFBKF, length );
-    }
-
-    /**
-     * @return Offset in table stream of the PLCF that records the ending CP
-     *         offsets of bookmarks recorded in the main document. No structure
-     *         is stored in this PLCF.
-     */
-    public int getFcPlcfbkl()
-    {
-        return _fieldHandler.getFieldOffset( FIBFieldHandler.PLCFBKL );
-    }
-
-    public void setFcPlcfbkl( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFBKL, offset );
-    }
-
-    /**
-     * @return Count of bytes in Plcfbkl
-     */
-    public int getLcbPlcfbkl()
-    {
-        return _fieldHandler.getFieldSize( FIBFieldHandler.PLCFBKL );
-    }
-
-    public void setLcbPlcfbkl( int length )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFBKL, length );
-    }
-
-    public void setFcPlfLfo(int fcPlfLfo)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.PLFLFO, fcPlfLfo);
-    }
-
-    public void setLcbPlfLfo(int lcbPlfLfo)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.PLFLFO, lcbPlfLfo);
-    }
-
-    public int getFcSttbfffn()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.STTBFFFN);
-    }
-
-    public int getLcbSttbfffn()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.STTBFFFN);
-    }
-
-    public void setFcSttbfffn(int fcSttbFffn)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.STTBFFFN, fcSttbFffn);
-    }
-
-    public void setLcbSttbfffn(int lcbSttbFffn)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.STTBFFFN, lcbSttbFffn);
-    }
-    
-    public int getFcSttbfRMark()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.STTBFRMARK);
-    }
-
-    public int getLcbSttbfRMark()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.STTBFRMARK);
-    }
-    
-    public void setFcSttbfRMark(int fcSttbfRMark)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.STTBFRMARK, fcSttbfRMark);
-    }
-
-    public void setLcbSttbfRMark(int lcbSttbfRMark)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.STTBFRMARK, lcbSttbfRMark);
-    }
-
-    /**
-     * Return the offset to the PlcfHdd, in the table stream,
-     * i.e. fcPlcfHdd
-     */
-    public int getPlcfHddOffset() {
-       return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFHDD);
-    }
-    /**
-     * Return the size of the PlcfHdd, in the table stream,
-     * i.e. lcbPlcfHdd
-     */
-    public int getPlcfHddSize() {
-    	return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFHDD);
-    }
-    public void setPlcfHddOffset(int fcPlcfHdd) {
-    	_fieldHandler.setFieldOffset(FIBFieldHandler.PLCFHDD, fcPlcfHdd);
-    }
-    public void setPlcfHddSize(int lcbPlcfHdd) {
-    	_fieldHandler.setFieldSize(FIBFieldHandler.PLCFHDD, lcbPlcfHdd);
-    }
-
-    public int getFcSttbSavedBy()
-    {
-        return _fieldHandler.getFieldOffset(FIBFieldHandler.STTBSAVEDBY);
-    }
-
-    public int getLcbSttbSavedBy()
-    {
-        return _fieldHandler.getFieldSize(FIBFieldHandler.STTBSAVEDBY);
-    }
-
-    public void setFcSttbSavedBy(int fcSttbSavedBy)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.STTBSAVEDBY, fcSttbSavedBy);
-    }
-
-    public void setLcbSttbSavedBy(int fcSttbSavedBy)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.STTBSAVEDBY, fcSttbSavedBy);
-    }
-
-    public int getModifiedLow()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLFLFO);
-    }
-
-    public int getModifiedHigh()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLFLFO);
-    }
-
-    public void setModifiedLow(int modifiedLow)
-    {
-      _fieldHandler.setFieldOffset(FIBFieldHandler.PLFLFO, modifiedLow);
-    }
-
-    public void setModifiedHigh(int modifiedHigh)
-    {
-      _fieldHandler.setFieldSize(FIBFieldHandler.PLFLFO, modifiedHigh);
-    }
-    
-    /**
-     * How many bytes of the main stream contain real data.
-     */
-    public int getCbMac()
-    {
-        return _fibRgLw.getCbMac();
-    }
-
-    /**
-     * Updates the count of the number of bytes in the
-     * main stream which contain real data
-     */
-    public void setCbMac( int cbMac )
-    {
-        _fibRgLw.setCbMac( cbMac );
-    }
-
-    /**
-     * @return length of specified subdocument text stream in characters
-     */
-    public int getSubdocumentTextStreamLength( SubdocumentType type )
-    {
-        if ( type == null )
-            throw new IllegalArgumentException( "argument 'type' is null" );
-
-        return _fibRgLw.getSubdocumentTextStreamLength( type );
-    }
-
-    public void setSubdocumentTextStreamLength( SubdocumentType type, int length )
-    {
-        if ( type == null )
-            throw new IllegalArgumentException( "argument 'type' is null" );
-        if ( length < 0 )
-            throw new IllegalArgumentException(
-                    "Subdocument length can't be less than 0 (passed value is "
-                            + length + "). " + "If there is no subdocument "
-                            + "length must be set to zero." );
-
-        _fibRgLw.setSubdocumentTextStreamLength( type, length );
-    }
-
-    public void clearOffsetsSizes()
-    {
-      _fieldHandler.clearFields();
-    }
-
-    public int getFieldsPlcfOffset( FieldsDocumentPart part )
-    {
-        return _fieldHandler.getFieldOffset( part.getFibFieldsField() );
-    }
-
-    public int getFieldsPlcfLength( FieldsDocumentPart part )
-    {
-        return _fieldHandler.getFieldSize( part.getFibFieldsField() );
-    }
-
-    public void setFieldsPlcfOffset( FieldsDocumentPart part, int offset )
-    {
-        _fieldHandler.setFieldOffset( part.getFibFieldsField(), offset );
-    }
-
-    public void setFieldsPlcfLength( FieldsDocumentPart part, int length )
-    {
-        _fieldHandler.setFieldSize( part.getFibFieldsField(), length );
-    }
-
-    @Deprecated
-    public int getFcPlcffldAtn()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFFLDATN);
-    }
-
-    @Deprecated
-    public int getLcbPlcffldAtn()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFFLDATN);
-    }
-
-    @Deprecated
-    public void setFcPlcffldAtn( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFFLDATN, offset );
-    }
-
-    @Deprecated
-    public void setLcbPlcffldAtn( int size )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFFLDATN, size );
-    }
-
-    @Deprecated
-    public int getFcPlcffldEdn()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFFLDEDN);
-    }
-
-    @Deprecated
-    public int getLcbPlcffldEdn()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFFLDEDN);
-    }
-
-    @Deprecated
-    public void setFcPlcffldEdn( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFFLDEDN, offset );
-    }
-
-    @Deprecated
-    public void setLcbPlcffldEdn( int size )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFFLDEDN, size );
-    }
-
-    @Deprecated
-    public int getFcPlcffldFtn()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFFLDFTN);
-    }
-
-    @Deprecated
-    public int getLcbPlcffldFtn()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFFLDFTN);
-    }
-
-    @Deprecated
-    public void setFcPlcffldFtn( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFFLDFTN, offset );
-    }
-
-    @Deprecated
-    public void setLcbPlcffldFtn( int size )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFFLDFTN, size );
-    }
-
-    @Deprecated
-    public int getFcPlcffldHdr()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFFLDHDR);
-    }
-
-    @Deprecated
-    public int getLcbPlcffldHdr()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFFLDHDR);
-    }
-
-    @Deprecated
-    public void setFcPlcffldHdr( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFFLDHDR, offset );
-    }
-
-    @Deprecated
-    public void setLcbPlcffldHdr( int size )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFFLDHDR, size );
-    }
-
-    @Deprecated
-    public int getFcPlcffldHdrtxbx()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFFLDHDRTXBX);
-    }
-
-    @Deprecated
-    public int getLcbPlcffldHdrtxbx()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFFLDHDRTXBX);
-    }
-
-    @Deprecated
-    public void setFcPlcffldHdrtxbx( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFFLDHDRTXBX, offset );
-    }
-
-    @Deprecated
-    public void setLcbPlcffldHdrtxbx( int size )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFFLDHDRTXBX, size );
-    }
-
-    @Deprecated
-    public int getFcPlcffldMom()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFFLDMOM);
-    }
-
-    @Deprecated
-    public int getLcbPlcffldMom()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFFLDMOM);
-    }
-
-    @Deprecated
-    public void setFcPlcffldMom( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFFLDMOM, offset );
-    }
-
-    @Deprecated
-    public void setLcbPlcffldMom( int size )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFFLDMOM, size );
-    }
-
-    @Deprecated
-    public int getFcPlcffldTxbx()
-    {
-      return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCFFLDTXBX);
-    }
-
-    @Deprecated
-    public int getLcbPlcffldTxbx()
-    {
-      return _fieldHandler.getFieldSize(FIBFieldHandler.PLCFFLDTXBX);
-    }
-
-    @Deprecated
-    public void setFcPlcffldTxbx( int offset )
-    {
-        _fieldHandler.setFieldOffset( FIBFieldHandler.PLCFFLDTXBX, offset );
-    }
-
-    @Deprecated
-    public void setLcbPlcffldTxbx( int size )
-    {
-        _fieldHandler.setFieldSize( FIBFieldHandler.PLCFFLDTXBX, size );
-    }
-
-
-    public int getFSPAPlcfOffset( FSPADocumentPart part )
-    {
-        return _fieldHandler.getFieldOffset( part.getFibFieldsField() );
-    }
-
-    public int getFSPAPlcfLength( FSPADocumentPart part )
-    {
-        return _fieldHandler.getFieldSize( part.getFibFieldsField() );
-    }
-
-    public void setFSPAPlcfOffset( FSPADocumentPart part, int offset )
-    {
-        _fieldHandler.setFieldOffset( part.getFibFieldsField(), offset );
-    }
-
-    public void setFSPAPlcfLength( FSPADocumentPart part, int length )
-    {
-        _fieldHandler.setFieldSize( part.getFibFieldsField(), length );
-    }
-
-    @Deprecated
-    public int getFcPlcspaMom()
-    {
-        return _fieldHandler.getFieldOffset(FIBFieldHandler.PLCSPAMOM);
-    }
-
-    @Deprecated
-    public int getLcbPlcspaMom()
-    {
-        return _fieldHandler.getFieldSize(FIBFieldHandler.PLCSPAMOM);
-    }
-
-    public int getFcDggInfo()
-    {
-        return _fieldHandler.getFieldOffset(FIBFieldHandler.DGGINFO);
-    }
-
-    public int getLcbDggInfo()
-    {
-        return _fieldHandler.getFieldSize(FIBFieldHandler.DGGINFO);
-    }
-
-    public int getNotesDescriptorsOffset( NoteType noteType )
-    {
-        return _fieldHandler.getFieldOffset( noteType
-                .getFibDescriptorsFieldIndex() );
-    }
-
-    public void setNotesDescriptorsOffset( NoteType noteType, int offset )
-    {
-        _fieldHandler.setFieldOffset( noteType.getFibDescriptorsFieldIndex(),
-                offset );
-    }
-
-    public int getNotesDescriptorsSize( NoteType noteType )
-    {
-        return _fieldHandler.getFieldSize( noteType
-                .getFibDescriptorsFieldIndex() );
-    }
-
-    public void setNotesDescriptorsSize( NoteType noteType, int offset )
-    {
-        _fieldHandler.setFieldSize( noteType.getFibDescriptorsFieldIndex(),
-                offset );
-    }
-
-    public int getNotesTextPositionsOffset( NoteType noteType )
-    {
-        return _fieldHandler.getFieldOffset( noteType
-                .getFibTextPositionsFieldIndex() );
-    }
-
-    public void setNotesTextPositionsOffset( NoteType noteType, int offset )
-    {
-        _fieldHandler.setFieldOffset( noteType.getFibTextPositionsFieldIndex(),
-                offset );
-    }
-
-    public int getNotesTextPositionsSize( NoteType noteType )
-    {
-        return _fieldHandler.getFieldSize( noteType
-                .getFibTextPositionsFieldIndex() );
-    }
-
-    public void setNotesTextPositionsSize( NoteType noteType, int offset )
-    {
-        _fieldHandler.setFieldSize( noteType.getFibTextPositionsFieldIndex(),
-                offset );
-    }
-
-    public void writeTo( byte[] mainStream, HWPFOutputStream tableStream )
-            throws IOException
-    {
-        _cbRgFcLcb = _fieldHandler.getFieldsCount();
-
-        _fibBase.serialize( mainStream, 0 );
-        int offset = FibBase.getSize();
-
-        LittleEndian.putUShort( mainStream, offset, _csw );
-        offset += LittleEndian.SHORT_SIZE;
-
-        _fibRgW.serialize( mainStream, offset );
-        offset += FibRgW97.getSize();
-
-        LittleEndian.putUShort( mainStream, offset, _cslw );
-        offset += LittleEndian.SHORT_SIZE;
-
-        ( (FibRgLw97) _fibRgLw ).serialize( mainStream, offset );
-        offset += FibRgLw97.getSize();
-
-        LittleEndian.putUShort( mainStream, offset, _cbRgFcLcb );
-        offset += LittleEndian.SHORT_SIZE;
-
-        _fieldHandler.writeTo( mainStream, offset, tableStream );
-        offset += _cbRgFcLcb * LittleEndian.INT_SIZE * 2;
-
-        LittleEndian.putUShort( mainStream, offset, _cswNew );
-        offset += LittleEndian.SHORT_SIZE;
-        if ( _cswNew != 0 )
-        {
-            LittleEndian.putUShort( mainStream, offset, _nFibNew );
-            offset += LittleEndian.SHORT_SIZE;
-
-            System.arraycopy( _fibRgCswNew, 0, mainStream, offset,
-                    _fibRgCswNew.length );
-            offset += _fibRgCswNew.length;
-        }
-    }
-
-    public int getSize()
-    {
-        return FibBase.getSize() + LittleEndian.SHORT_SIZE + FibRgW97.getSize()
-                + LittleEndian.SHORT_SIZE + FibRgLw97.getSize()
-                + LittleEndian.SHORT_SIZE + _fieldHandler.sizeInBytes();
-    }
-
-    public FibBase getFibBase()
-    {
-        return _fibBase;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java
deleted file mode 100644
index 6f6d3b9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-     Licensed to the Apache Software Foundation (ASF) under one or more
-     contributor license agreements.    See the NOTICE file distributed with
-     this work for additional information regarding copyright ownership.
-     The ASF licenses this file to You under the Apache License, Version 2.0
-     (the "License"); you may not use this file except in compliance with
-     the License.    You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * FontTable or in MS terminology sttbfffn is a common data structure written in all
- * Word files. The sttbfffn is an sttbf where each string is an FFN structure instead
- * of pascal-style strings. An sttbf is a string Table stored in file. Thus sttbffn
- * is like an Sttbf with an array of FFN structures that stores the font name strings
- *
- * @author Praveen Mathew
- */
-@Internal
-public final class FontTable
-{
-    private final static POILogger _logger = POILogFactory.getLogger(FontTable.class);
-    private short _stringCount;// how many strings are included in the string table
-    private short _extraDataSz;// size in bytes of the extra data
-
-    // added extra facilitator members
-    private int lcbSttbfffn;// count of bytes in sttbfffn
-    private int fcSttbfffn;// table stream offset for sttbfffn
-
-    // FFN structure containing strings of font names
-    private Ffn[] _fontNames = null;
-
-
-    public FontTable(byte[] buf, int offset, int lcbSttbfffn)
-    {
-        this.lcbSttbfffn = lcbSttbfffn;
-        this.fcSttbfffn = offset;
-
-        _stringCount = LittleEndian.getShort(buf, offset);
-        offset += LittleEndian.SHORT_SIZE;
-        _extraDataSz = LittleEndian.getShort(buf, offset);
-        offset += LittleEndian.SHORT_SIZE;
-
-        _fontNames = new Ffn[_stringCount]; //Ffn corresponds to a Pascal style String in STTBF.
-
-        for(int i = 0;i<_stringCount; i++)
-        {
-            _fontNames[i] = new Ffn(buf,offset);
-            offset += _fontNames[i].getSize();
-        }
-    }
-
-    public short getStringCount()
-    {
-        return _stringCount;
-    }
-
-    public short getExtraDataSz()
-    {
-        return _extraDataSz;
-    }
-
-    public Ffn[] getFontNames()
-    {
-        return _fontNames;
-    }
-
-    public int getSize()
-    {
-        return lcbSttbfffn;
-    }
-
-    public String getMainFont(int chpFtc )
-    {
-        if(chpFtc >= _stringCount)
-        {
-            _logger.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
-            return null;
-        }
-
-        return _fontNames[chpFtc].getMainFontName();
-    }
-
-    public String getAltFont(int chpFtc )
-    {
-        if(chpFtc >= _stringCount)
-        {
-            _logger.log(POILogger.INFO, "Mismatch in chpFtc with stringCount");
-            return null;
-        }
-
-        return _fontNames[chpFtc].getAltFontName();
-    }
-
-    public void setStringCount(short stringCount)
-    {
-        this._stringCount = stringCount;
-    }
-
-    @Deprecated
-    public void writeTo( HWPFFileSystem sys ) throws IOException
-    {
-        HWPFOutputStream tableStream = sys.getStream( "1Table" );
-        writeTo( tableStream );
-    }
-
-    public void writeTo( HWPFOutputStream tableStream ) throws IOException
-    {
-        byte[] buf = new byte[LittleEndian.SHORT_SIZE];
-        LittleEndian.putShort(buf, 0, _stringCount);
-        tableStream.write(buf);
-        LittleEndian.putShort(buf, 0, _extraDataSz);
-        tableStream.write(buf);
-
-        for(int i = 0; i < _fontNames.length; i++)
-        {
-            tableStream.write(_fontNames[i].toByteArray());
-        }
-
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (!(other instanceof FontTable)) return false;
-        FontTable o = (FontTable)other;
-
-        if (o._stringCount != this._stringCount
-                || o._extraDataSz != this._extraDataSz
-                || o._fontNames.length != this._fontNames.length
-        ) return false;
-        
-        for (int i=0; i<o._fontNames.length; i++) {
-            if (!o._fontNames[i].equals(this._fontNames[i])) return false;
-        }
-        
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
deleted file mode 100644
index 326cf95..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.FRDAbstractType;
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class FootnoteReferenceDescriptor extends FRDAbstractType
-        implements Cloneable
-{
-    public FootnoteReferenceDescriptor()
-    {
-    }
-
-    public FootnoteReferenceDescriptor( byte[] data, int offset )
-    {
-        fillFields( data, offset );
-    }
-
-    @Override
-    protected FootnoteReferenceDescriptor clone()
-    {
-        try
-        {
-            return (FootnoteReferenceDescriptor) super.clone();
-        }
-        catch ( CloneNotSupportedException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        FootnoteReferenceDescriptor other = (FootnoteReferenceDescriptor) obj;
-        if ( field_1_nAuto != other.field_1_nAuto )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_nAuto;
-        return result;
-    }
-
-    public boolean isEmpty()
-    {
-        return field_1_nAuto == 0;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[FRD] EMPTY";
-
-        return super.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java
deleted file mode 100644
index 0d06383..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents an FKP data structure. This data structure is used to store the
- * grpprls of the paragraph and character properties of the document. A grpprl
- * is a list of sprms(decompression operations) to perform on a parent style.
- *
- * The style properties for paragraph and character runs
- * are stored in fkps. There are PAP fkps for paragraph properties and CHP fkps
- * for character run properties. The first part of the fkp for both CHP and PAP
- * fkps consists of an array of 4 byte int offsets in the main stream for that
- * Paragraph's or Character run's text. The ending offset is the next
- * value in the array. For example, if an fkp has X number of Paragraph's
- * stored in it then there are (x + 1) 4 byte ints in the beginning array. The
- * number X is determined by the last byte in a 512 byte fkp.
- *
- * CHP and PAP fkps also store the compressed styles(grpprl) that correspond to
- * the offsets on the front of the fkp. The offset of the grpprls is determined
- * differently for CHP fkps and PAP fkps.
- *
- * @author Ryan Ackley
- */
-@Internal
-public abstract class FormattedDiskPage
-{
-    protected byte[] _fkp;
-    protected int _crun;
-    protected int _offset;
-
-
-    public FormattedDiskPage()
-    {
-
-    }
-
-    /**
-     * Uses a 512-byte array to create a FKP
-     */
-    public FormattedDiskPage(byte[] documentStream, int offset)
-    {
-        _crun = LittleEndian.getUByte(documentStream, offset + 511);
-        _fkp = documentStream;
-        _offset = offset;
-    }
-    /**
-     * Used to get a text offset corresponding to a grpprl in this fkp.
-     * @param index The index of the property in this FKP
-     * @return an int representing an offset in the "WordDocument" stream
-     */
-    protected int getStart(int index)
-    {
-        return LittleEndian.getInt(_fkp, _offset + (index * 4));
-    }
-    /**
-     * Used to get the end of the text corresponding to a grpprl in this fkp.
-     * @param index The index of the property in this fkp.
-     * @return an int representing an offset in the "WordDocument" stream
-     */
-    protected int getEnd(int index)
-    {
-        return LittleEndian.getInt(_fkp, _offset + ((index + 1) * 4));
-    }
-    /**
-     * Used to get the total number of grrprl's stored int this FKP
-     * @return The number of grpprls in this FKP
-     */
-    public int size()
-    {
-        return _crun;
-    }
-
-    protected abstract byte[] getGrpprl(int index);
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java
deleted file mode 100644
index 806a7e7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class GenericPropertyNode
-  extends PropertyNode<GenericPropertyNode>
-{
-  public GenericPropertyNode(int start, int end, byte[] buf)
-  {
-    super(start, end, buf);
-  }
-
-  public byte[] getBytes()
-  {
-    return (byte[])_buf;
-  }
-
-    @Override
-    public String toString()
-    {
-        return "GenericPropertyNode ["
-                + getStart()
-                + "; "
-                + getEnd()
-                + ") "
-                + ( getBytes() != null ? getBytes().length + " byte(s)"
-                        : "null" );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java
deleted file mode 100644
index f627289..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.GrfhicAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The grfhic structure is a set of HTML incompatibility flags that specify the
- * HTML incompatibilities of a list structure. The values specify possible
- * incompatibilities between an LVL or LVLF and HTML lists. The values do not
- * define list properties.
- * <p>
- * Class and fields descriptions are quoted from [MS-DOC] -- v20110315 Word
- * (.doc) Binary File Format specification
- * <p>
- * This class is internal. It content or properties may change without notice
- * due to changes in our knowledge of internal Microsoft Word binary structures.
- * 
- * @author Sergey Vladimirov; according to [MS-DOC] -- v20110315 Word (.doc)
- *         Binary File Format specification
- */
-@Internal
-public class Grfhic extends GrfhicAbstractType
-{
-
-    public Grfhic()
-    {
-    }
-
-    public Grfhic( byte[] bytes, int offset )
-    {
-        fillFields( bytes, offset );
-    }
-
-    public byte[] toByteArray()
-    {
-        byte[] buf = new byte[getSize()];
-        serialize( buf, 0 );
-        return buf;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java
deleted file mode 100644
index aabf024..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-/**
- *
- * @author  andy
- */
-@Internal
-@Deprecated
-public interface HDFType {
-
-}
-
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java
deleted file mode 100644
index 0860a38..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.HRESIAbstractType;
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Hyphenation. Substructure of the {@link CharacterProperties}.
- * 
- * @author Sergey Vladimirov ( vlsergey {at} gmail {dot} com )
- */
-@Internal
-public final class Hyphenation extends HRESIAbstractType implements Cloneable
-{
-    public Hyphenation()
-    {
-        super();
-    }
-
-    public Hyphenation( short hres )
-    {
-        byte[] data = new byte[2];
-        LittleEndian.putShort( data, 0, hres );
-        fillFields( data, 0 );
-    }
-
-    public Hyphenation clone()
-    {
-        try
-        {
-            return (Hyphenation) super.clone();
-        }
-        catch ( CloneNotSupportedException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        Hyphenation other = (Hyphenation) obj;
-        if ( field_1_hres != other.field_1_hres )
-            return false;
-        if ( field_2_chHres != other.field_2_chHres )
-            return false;
-        return true;
-    }
-
-    public short getValue()
-    {
-        byte[] data = new byte[2];
-        serialize( data, 0 );
-        return LittleEndian.getShort( data );
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_hres;
-        result = prime * result + field_2_chHres;
-        return result;
-    }
-
-    public boolean isEmpty()
-    {
-        return field_1_hres == 0 && field_2_chHres == 0;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[HRESI] EMPTY";
-
-        return super.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java
deleted file mode 100644
index edc0699..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-import org.apache.poi.hwpf.model.types.LFOAbstractType;
-
-/**
- * "The LFO structure specifies the LSTF element that corresponds to a list that
- * contains a paragraph. An LFO can also specify formatting information that
- * overrides the LSTF element to which it corresponds." -- [MS-DOC] -- v20110315
- * Word (.doc) Binary File Format
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-public class LFO extends LFOAbstractType
-{
-    public LFO()
-    {
-    }
-
-    public LFO( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java
deleted file mode 100644
index 89f822b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The LFOData structure contains the Main Document CP of the corresponding LFO,
- * as well as an array of LVL override data.
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-public class LFOData
-{
-    private int _cp;
-
-    private ListFormatOverrideLevel[] _rgLfoLvl;
-
-    public LFOData()
-    {
-        _cp = 0;
-        _rgLfoLvl = new ListFormatOverrideLevel[0];
-    }
-
-    LFOData( byte[] buf, int startOffset, int cLfolvl )
-    {
-        int offset = startOffset;
-
-        _cp = LittleEndian.getInt( buf, offset );
-        offset += LittleEndian.INT_SIZE;
-
-        _rgLfoLvl = new ListFormatOverrideLevel[cLfolvl];
-        for ( int x = 0; x < cLfolvl; x++ )
-        {
-            _rgLfoLvl[x] = new ListFormatOverrideLevel( buf, offset );
-            offset += _rgLfoLvl[x].getSizeInBytes();
-        }
-    }
-
-    public int getCp()
-    {
-        return _cp;
-    }
-
-    public ListFormatOverrideLevel[] getRgLfoLvl()
-    {
-        return _rgLfoLvl;
-    }
-
-    public int getSizeInBytes()
-    {
-        int result = 0;
-        result += LittleEndian.INT_SIZE;
-
-        for ( ListFormatOverrideLevel lfolvl : _rgLfoLvl )
-            result += lfolvl.getSizeInBytes();
-
-        return result;
-    }
-
-    void writeTo( HWPFOutputStream tableStream ) throws IOException
-    {
-        LittleEndian.putInt( _cp, tableStream );
-        for ( ListFormatOverrideLevel lfolvl : _rgLfoLvl )
-        {
-            tableStream.write( lfolvl.toByteArray() );
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        LFOData lfoData = (LFOData) o;
-
-        if (_cp != lfoData._cp) return false;
-        // Probably incorrect - comparing Object[] arrays with Arrays.equals
-        return Arrays.equals(_rgLfoLvl, lfoData._rgLfoLvl);
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = _cp;
-        result = 31 * result + Arrays.hashCode(_rgLfoLvl);
-        return result;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java
deleted file mode 100644
index 3a50a7c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.LFOLVLBaseAbstractType;
-
-/**
- * The LFOLVL structure contains information that is used to override the
- * formatting information of a corresponding LVL.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc] and [MS-DOC] - v20110608 Word
- *         (.doc) Binary File Format
- */
-class LFOLVLBase extends LFOLVLBaseAbstractType
-{
-    LFOLVLBase()
-    {
-    }
-
-    LFOLVLBase( byte[] buf, int offset )
-    {
-        fillFields( buf, offset );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java
deleted file mode 100644
index 9e00ffe..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.LSTFAbstractType;
-
-/**
- * The LSTF structure contains formatting properties that apply to an entire
- * list.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc] and [MS-DOC] - v20110608 Word
- *         (.doc) Binary File Format
- */
-class LSTF extends LSTFAbstractType
-{
-    LSTF()
-    {
-    }
-
-    LSTF( byte[] buf, int offset )
-    {
-        super();
-        fillFields( buf, offset );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java
deleted file mode 100644
index 38192d2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.LVLFAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The LVLF structure contains formatting properties for an individual level in
- * a list
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc] and [MS-DOC] - v20110608 Word
- *         (.doc) Binary File Format
- */
-@Internal
-class LVLF extends LVLFAbstractType
-{
-
-    public LVLF()
-    {
-    }
-
-    public LVLF( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java
deleted file mode 100644
index 9893504..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class ListData
-{
-    private ListLevel[] _levels;
-
-    private LSTF _lstf;
-
-    ListData( byte[] buf, int offset )
-    {
-        _lstf = new LSTF( buf, offset );
-
-        if ( _lstf.isFSimpleList() )
-        {
-            _levels = new ListLevel[1];
-        }
-        else
-        {
-            _levels = new ListLevel[9];
-        }
-    }
-
-    public ListData( int listID, boolean numbered )
-    {
-        _lstf = new LSTF();
-        _lstf.setLsid( listID );
-        _lstf.setRgistdPara( new short[9] );
-        Arrays.fill( _lstf.getRgistdPara(), (short) StyleSheet.NIL_STYLE );
-
-        _levels = new ListLevel[9];
-        for ( int x = 0; x < _levels.length; x++ )
-        {
-            _levels[x] = new ListLevel( x, numbered );
-        }
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        ListData other = (ListData) obj;
-        if ( !Arrays.equals( _levels, other._levels ) )
-            return false;
-        if ( _lstf == null )
-        {
-            if ( other._lstf != null )
-                return false;
-        }
-        else if ( !_lstf.equals( other._lstf ) )
-            return false;
-        return true;
-    }
-
-    /**
-     * Gets the level associated to a particular List at a particular index.
-     * 
-     * @param index
-     *            1-based index
-     * @return a list level
-     */
-    public ListLevel getLevel( int index )
-    {
-        return _levels[index - 1];
-    }
-
-    public ListLevel[] getLevels()
-    {
-        return _levels;
-    }
-
-    public int getLevelStyle( int index )
-    {
-        return _lstf.getRgistdPara()[index];
-    }
-
-    public int getLsid()
-    {
-        return _lstf.getLsid();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Arrays.hashCode( _levels );
-        result = prime * result + ( ( _lstf == null ) ? 0 : _lstf.hashCode() );
-        return result;
-    }
-
-    public int numLevels()
-    {
-        return _levels.length;
-    }
-
-    int resetListID()
-    {
-        _lstf.setLsid( (int) ( Math.random() * System.currentTimeMillis() ) );
-        return _lstf.getLsid();
-    }
-
-    public void setLevel( int index, ListLevel level )
-    {
-        _levels[index] = level;
-    }
-
-    public void setLevelStyle( int index, int styleIndex )
-    {
-        _lstf.getRgistdPara()[index] = (short) styleIndex;
-    }
-
-    public byte[] toByteArray()
-    {
-        return _lstf.serialize();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
deleted file mode 100644
index bcffbe8..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-/**
- * The LFOLVL structure contains information that is used to override the
- * formatting information of a corresponding LVL.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
- */
-@Internal
-public final class ListFormatOverrideLevel
-{
-    private LFOLVLBase _base;
-    private ListLevel _lvl;
-
-    public ListFormatOverrideLevel( byte[] buf, int offset )
-    {
-        _base = new LFOLVLBase( buf, offset );
-        offset += LFOLVLBase.getSize();
-
-        if ( _base.isFFormatting() )
-        {
-            _lvl = new ListLevel( buf, offset );
-        }
-    }
-
-    public boolean equals( Object obj )
-    {
-        if (!(obj instanceof ListFormatOverrideLevel)) return false;
-        ListFormatOverrideLevel lfolvl = (ListFormatOverrideLevel) obj;
-        boolean lvlEquality = false;
-        if ( _lvl != null )
-        {
-            lvlEquality = _lvl.equals( lfolvl._lvl );
-        }
-        else
-        {
-            lvlEquality = lfolvl._lvl == null;
-        }
-
-        return lvlEquality && lfolvl._base.equals( _base );
-    }
-
-    public int getIStartAt()
-    {
-        return _base.getIStartAt();
-    }
-
-    public ListLevel getLevel()
-    {
-        return _lvl;
-    }
-
-    public int getLevelNum()
-    {
-        return _base.getILvl();
-    }
-
-    public int getSizeInBytes()
-    {
-        return _lvl == null ? LFOLVLBase.getSize() : LFOLVLBase.getSize()
-                + _lvl.getSizeInBytes();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + _base.hashCode();
-        result = prime * result + ( _lvl != null ? _lvl.hashCode() : 0 );
-        return result;
-    }
-
-    public boolean isFormatting()
-    {
-        return _base.isFFormatting();
-    }
-
-    public boolean isStartAt()
-    {
-        return _base.isFStartAt();
-    }
-
-    public byte[] toByteArray()
-    {
-        int offset = 0;
-
-        byte[] buf = new byte[getSizeInBytes()];
-        _base.serialize( buf, offset );
-        offset += LFOLVLBase.getSize();
-
-        if ( _lvl != null )
-        {
-            byte[] levelBuf = _lvl.toByteArray();
-            System.arraycopy( levelBuf, 0, buf, offset, levelBuf.length );
-        }
-
-        return buf;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
deleted file mode 100644
index 0e710a1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * "The LVL structure contains formatting information about a specific level in
- * a list. When a paragraph is formatted as part of this level, each placeholder
- * in xst is replaced with the inherited level number of the most recent or
- * current paragraph in the same list that is in the zero-based level specified
- * by that placeholder. The level number that replaces a placeholder is
- * formatted according to the lvlf.nfc of the LVL structure that corresponds to
- * the level that the placeholder specifies, unless the lvlf.fLegal of this LVL
- * structure is nonzero." -- Page 388 of 621 -- [MS-DOC] -- v20110315 Word
- * (.doc) Binary File Format
- */
-@Internal
-public final class ListLevel
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( ListLevel.class );
-
-    private byte[] _grpprlChpx;
-    private byte[] _grpprlPapx;
-    private LVLF _lvlf;
-    /**
-     * An Xst that specifies the number text that begins each paragraph in this
-     * level. This can contain placeholders for level numbers that are inherited
-     * from the other paragraphs in the list. Any element in the rgtchar field
-     * of this Xst can be a placeholder. Each placeholder is an unsigned 2-byte
-     * integer that specifies the zero-based level that the placeholder is for.
-     * 
-     * Each placeholder MUST have a value that is less than or equal to the
-     * zero-based level of the list that this LVL represents. The indexes of the
-     * placeholders are specified by lvlf.rgbxchNums. Placeholders that
-     * correspond to levels that do not have a number sequence (see lvlf.nfc)
-     * MUST be ignored. If this level uses bullets (see lvlf.nfc), the cch field
-     * of this Xst MUST be equal to 0x0001, and this MUST NOT contain any
-     * placeholders.
-     */
-    private Xst _xst = new Xst();
-
-    ListLevel()
-    {
-
-    }
-
-    @Deprecated
-    public ListLevel( final byte[] buf, final int startOffset )
-    {
-        read( buf, startOffset );
-    }
-
-    public ListLevel( int level, boolean numbered )
-    {
-        _lvlf = new LVLF();
-        setStartAt( 1 );
-        _grpprlPapx = new byte[0];
-        _grpprlChpx = new byte[0];
-
-        if ( numbered )
-        {
-            _lvlf.getRgbxchNums()[0] = 1;
-            _xst = new Xst("" + (char) level + ".");
-        }
-        else
-        {
-            _xst = new Xst("\u2022");
-        }
-    }
-
-    public ListLevel( int startAt, int numberFormatCode, int alignment,
-            byte[] numberProperties, byte[] entryProperties, String numberText )
-    {
-        _lvlf = new LVLF();
-        setStartAt( startAt );
-        _lvlf.setNfc( (byte) numberFormatCode );
-        _lvlf.setJc( (byte) alignment );
-        _grpprlChpx = numberProperties.clone();
-        _grpprlPapx = entryProperties.clone();
-        _xst = new Xst(numberText);
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if (!(obj instanceof ListLevel)) return false;
-
-        ListLevel lvl = (ListLevel) obj;
-        return lvl._lvlf.equals( this._lvlf )
-                && Arrays.equals( lvl._grpprlChpx, _grpprlChpx )
-                && Arrays.equals( lvl._grpprlPapx, _grpprlPapx )
-                && lvl._xst.equals( this._xst );
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-      }
-
-    /**
-     * "Alignment (left, right, or centered) of the paragraph number."
-     */
-    public int getAlignment()
-    {
-        return _lvlf.getJc();
-    }
-
-    public byte[] getGrpprlChpx()
-    {
-        return _grpprlChpx;
-    }
-
-    public byte[] getGrpprlPapx()
-    {
-        return _grpprlPapx;
-    }
-
-    public byte[] getLevelProperties()
-    {
-        return _grpprlPapx;
-    }
-
-    /**
-     * "Number format code (see anld.nfc for a list of options)"
-     */
-    public int getNumberFormat()
-    {
-        return _lvlf.getNfc();
-    }
-
-    public String getNumberText()
-    {
-        return _xst.getAsJavaString();
-    }
-
-    public int getSizeInBytes()
-    {
-        return LVLF.getSize() + _lvlf.getCbGrpprlChpx()
-                + _lvlf.getCbGrpprlPapx() + _xst.getSize();
-    }
-
-    public int getStartAt()
-    {
-        return _lvlf.getIStartAt();
-    }
-
-    /**
-     * "The type of character following the number text for the paragraph: 0 == tab, 1 == space, 2 == nothing."
-     */
-    public byte getTypeOfCharFollowingTheNumber()
-    {
-        return _lvlf.getIxchFollow();
-    }
-
-    /**
-     * An unsigned integer that specifies the first (most-significant) zero-based level after which the number sequence of this level does not restart. The number sequence of this level does restart after any level that is more significant than the specified level. This MUST be less than or equal to the zero-based level of the list to which this LVLF corresponds.
-     * <p>see [MS-DOC], v20140721, 2.9.150</p>
-     * 
-     * @return the first ({@code 0} is the most significant) level after which
-     * the numbering does not restart or {@code -1} if no restart is applicable
-     */
-    public short getRestart() {    	
-    	return _lvlf.isFNoRestart() ? _lvlf.getIlvlRestartLim() : -1;
-    }
-    
-    /**
-     * Determines if the number formatting shall be overridden by
-     * {@code msonfcArabic}; unless it originally was {@code msonfcArabicLZ}
-     * in which case it is preserved.
-     * <p>see [MS-DOC], v20140721, 2.9.150 and [MS-OSHARED], v20140721, 2.2.1.3</p>
-     * 
-     * @return {@code true} if the level numbering of this and all more
-     * significant levels must be overridden; {@code false} otherwise
-     */
-    public boolean isLegalNumbering() {
-    	return _lvlf.isFLegal();
-    }
-    
-    /**
-     * Array which specifies the character offsets of the level numbers in a
-     * level numbering string.
-     * <p>see [MS-DOC], v20140721, 2.9.150</p>
-     * 
-     * @return {@code 0}-terminated array, unless it is full 
-     */
-    public byte[] getLevelNumberingPlaceholderOffsets() {    	
-    	return _lvlf.getRgbxchNums();
-    }
-
-    int read( final byte[] data, final int startOffset )
-    {
-        int offset = startOffset;
-
-        _lvlf = new LVLF( data, offset );
-        offset += LVLF.getSize();
-
-        _grpprlPapx = new byte[_lvlf.getCbGrpprlPapx()];
-        System.arraycopy( data, offset, _grpprlPapx, 0, _lvlf.getCbGrpprlPapx() );
-        offset += _lvlf.getCbGrpprlPapx();
-
-        _grpprlChpx = new byte[_lvlf.getCbGrpprlChpx()];
-        System.arraycopy( data, offset, _grpprlChpx, 0, _lvlf.getCbGrpprlChpx() );
-        offset += _lvlf.getCbGrpprlChpx();
-
-        _xst = new Xst( data, offset );
-        offset += _xst.getSize();
-
-        /*
-         * "If this level uses bullets (see lvlf.nfc), the cch field of this Xst
-         * MUST be equal to 0x0001, and this MUST NOT contain any placeholders."
-         * -- page 389 of 621 -- [MS-DOC] -- v20110315 Word (.doc) Binary File
-         * Format
-         */
-        if ( _lvlf.getNfc() == 0x17 )
-        {
-            if ( _xst.getCch() != 1 )
-            {
-                logger.log( POILogger.WARN, "LVL at offset ",
-                        Integer.valueOf( startOffset ),
-                        " has nfc == 0x17 (bullets), but cch != 1 (",
-                        Integer.valueOf( _xst.getCch() ), ")" );
-            }
-        }
-
-        return offset - startOffset;
-    }
-
-    public void setAlignment( int alignment )
-    {
-        _lvlf.setJc( (byte) alignment );
-    }
-
-    public void setLevelProperties( byte[] grpprl )
-    {
-        _grpprlPapx = grpprl;
-    }
-
-    public void setNumberFormat( int numberFormatCode )
-    {
-        _lvlf.setNfc( (byte) numberFormatCode );
-    }
-
-    public void setNumberProperties( byte[] grpprl )
-    {
-        _grpprlChpx = grpprl;
-    }
-
-    public void setStartAt( int startAt )
-    {
-        _lvlf.setIStartAt( startAt );
-    }
-
-    public void setTypeOfCharFollowingTheNumber( byte value )
-    {
-        _lvlf.setIxchFollow( value );
-    }
-
-    public byte[] toByteArray()
-    {
-        byte[] buf = new byte[getSizeInBytes()];
-        int offset = 0;
-
-        _lvlf.setCbGrpprlChpx( (short) _grpprlChpx.length );
-        _lvlf.setCbGrpprlPapx( (short) _grpprlPapx.length );
-        _lvlf.serialize( buf, offset );
-        offset += LVLF.getSize();
-
-        System.arraycopy( _grpprlPapx, 0, buf, offset, _grpprlPapx.length );
-        offset += _grpprlPapx.length;
-        System.arraycopy( _grpprlChpx, 0, buf, offset, _grpprlChpx.length );
-        offset += _grpprlChpx.length;
-
-        _xst.serialize( buf, offset );
-        offset += _xst.getSize();
-
-        return buf;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "LVL: " + ( "\n" + _lvlf ).replaceAll( "\n", "\n    " )
-                + "\n"
-                + ( "PAPX's grpprl: " + Arrays.toString( _grpprlPapx ) + "\n" )
-                + ( "CHPX's grpprl: " + Arrays.toString( _grpprlChpx ) + "\n" )
-                + ( "xst: " + _xst + "\n" );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
deleted file mode 100644
index 5ec0253..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.NoSuchElementException;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * @author Ryan Ackley
- */
-@Internal
-public final class ListTables
-{
-  private static POILogger log = POILogFactory.getLogger(ListTables.class);
-
-    /**
-     * Both PlfLst and the following LVLs
-     */
-    private final LinkedHashMap<Integer, ListData> _listMap = new LinkedHashMap<Integer, ListData>();
-    private PlfLfo _plfLfo;
-
-  public ListTables()
-  {
-
-  }
-
-    public ListTables( byte[] tableStream, final int lstOffset,
-            final int fcPlfLfo, final int lcbPlfLfo )
-    {
-
-        /*
-         * The PlfLst structure contains the list formatting information for the
-         * document. -- Page 425 of 621. [MS-DOC] -- v20110315 Word (.doc)
-         * Binary File Format
-         */
-        int offset = lstOffset;
-
-        int cLst = LittleEndian.getShort( tableStream, offset );
-        offset += LittleEndian.SHORT_SIZE;
-        int levelOffset = offset + ( cLst * LSTF.getSize() );
-
-        for ( int x = 0; x < cLst; x++ )
-        {
-            ListData lst = new ListData( tableStream, offset );
-            _listMap.put( Integer.valueOf( lst.getLsid() ), lst );
-            offset += LSTF.getSize();
-
-            int num = lst.numLevels();
-            for ( int y = 0; y < num; y++ )
-            {
-                ListLevel lvl = new ListLevel();
-                levelOffset += lvl.read( tableStream, levelOffset );
-                lst.setLevel( y, lvl );
-            }
-        }
-
-        this._plfLfo = new PlfLfo( tableStream, fcPlfLfo, lcbPlfLfo );
-    }
-
-    public void writeListDataTo( FileInformationBlock fib,
-            HWPFOutputStream tableStream ) throws IOException
-    {
-        final int startOffset = tableStream.getOffset();
-        fib.setFcPlfLst( startOffset );
-
-    int listSize = _listMap.size();
-
-    // use this stream as a buffer for the levels since their size varies.
-    ByteArrayOutputStream levelBuf = new ByteArrayOutputStream();
-
-    byte[] shortHolder = new byte[2];
-    LittleEndian.putShort(shortHolder, 0, (short)listSize);
-    tableStream.write(shortHolder);
-
-    for(ListData lst : _listMap.values()) {
-      tableStream.write(lst.toByteArray());
-      ListLevel[] lvls = lst.getLevels();
-      for (int y = 0; y < lvls.length; y++)
-      {
-        levelBuf.write(lvls[y].toByteArray());
-      }
-    }
-
-        /*
-         * An array of LVLs is appended to the PlfLst. lcbPlfLst does not
-         * account for the array of LVLs. -- Page 76 of 621 -- [MS-DOC] --
-         * v20110315 Word (.doc) Binary File Format
-         */
-        fib.setLcbPlfLst( tableStream.getOffset() - startOffset );
-        tableStream.write( levelBuf.toByteArray() );
-    }
-
-    public void writeListOverridesTo( FileInformationBlock fib,
-            HWPFOutputStream tableStream ) throws IOException
-    {
-        _plfLfo.writeTo( fib, tableStream );
-    }
-
-    public LFO getLfo( int ilfo ) throws NoSuchElementException
-    {
-        return _plfLfo.getLfo( ilfo );
-    }
-
-    public LFOData getLfoData( int ilfo ) throws NoSuchElementException
-    {
-        return _plfLfo.getLfoData( ilfo );
-    }
-
-    public int getOverrideIndexFromListID( int lsid )
-            throws NoSuchElementException
-    {
-        return _plfLfo.getIlfoByLsid( lsid );
-    }
-
-  public ListLevel getLevel(int lsid, int level)
-  {
-    ListData lst = _listMap.get(Integer.valueOf(lsid));
-    if(level < lst.numLevels()) {
-    	ListLevel lvl = lst.getLevels()[level];
-    	return lvl;
-    }
-    if (log.check(POILogger.WARN)) {
-        log.log(POILogger.WARN, "Requested level " + level + " which was greater than the maximum defined (" + lst.numLevels() + ")");
-    }
-	return null;
-  }
-
-  public ListData getListData(int lsid)
-  {
-    return _listMap.get(Integer.valueOf(lsid));
-  }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result
-                + ( ( _listMap == null ) ? 0 : _listMap.hashCode() );
-        result = prime * result
-                + ( ( _plfLfo == null ) ? 0 : _plfLfo.hashCode() );
-        return result;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        ListTables other = (ListTables) obj;
-        if ( _listMap == null )
-        {
-            if ( other._listMap != null )
-                return false;
-        }
-        else if ( !_listMap.equals( other._listMap ) )
-            return false;
-        if ( _plfLfo == null )
-        {
-            if ( other._plfLfo != null )
-                return false;
-        }
-        else if ( !_plfLfo.equals( other._plfLfo ) )
-            return false;
-        return true;
-    }
-
-    public int addList( ListData lst, LFO lfo, LFOData lfoData )
-    {
-        int lsid = lst.getLsid();
-        while ( _listMap.get( Integer.valueOf( lsid ) ) != null )
-        {
-            lsid = lst.resetListID();
-            lfo.setLsid( lsid );
-        }
-        _listMap.put( Integer.valueOf( lsid ), lst );
-
-        if ( lfo == null && lfoData != null )
-        {
-            throw new IllegalArgumentException(
-                    "LFO and LFOData should be specified both or noone" );
-        }
-        if ( lfo != null )
-        {
-            _plfLfo.add( lfo, lfoData );
-        }
-        return lsid;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java
deleted file mode 100644
index 918afdb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-import java.util.Arrays;
-
-public class NilPICFAndBinData
-{
-
-    private static final POILogger log = POILogFactory
-            .getLogger( NilPICFAndBinData.class );
-
-    private byte[] _binData;
-
-    public NilPICFAndBinData( byte[] data, int offset )
-    {
-        fillFields( data, offset );
-    }
-
-    public void fillFields( byte[] data, int offset )
-    {
-        int lcb = LittleEndian.getInt( data, offset );
-        int cbHeader = LittleEndian.getUShort( data, offset
-                + LittleEndian.INT_SIZE );
-
-        if ( cbHeader != 0x44 )
-        {
-            if (log.check(POILogger.WARN)) {
-                log.log(POILogger.WARN, "NilPICFAndBinData at offset ", offset,
-                        " cbHeader 0x" + Integer.toHexString(cbHeader)
-                                + " != 0x44"
-                );
-            }
-        }
-
-        // skip the 62 ignored bytes
-        int binaryLength = lcb - cbHeader;
-        this._binData = Arrays.copyOfRange(data, offset + cbHeader,
-                offset + cbHeader + binaryLength);
-    }
-
-    public byte[] getBinData()
-    {
-        return _binData;
-    }
-
-    public byte[] serialize()
-    {
-        byte[] bs = new byte[_binData.length + 0x44];
-        LittleEndian.putInt( bs, 0, _binData.length + 0x44 );
-        System.arraycopy( _binData, 0, bs, 0x44, _binData.length );
-        return bs;
-    }
-
-    public int serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, offset, _binData.length + 0x44 );
-        System.arraycopy( _binData, 0, data, offset + 0x44, _binData.length );
-        return 0x44 + _binData.length;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java
deleted file mode 100644
index 8168e96..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-/**
- * Word document notes types (and their FIB field indices)
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {doc} com)
- */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public enum NoteType {
-    /** Ending note */
-    ENDNOTE( FIBFieldHandler.PLCFENDREF, FIBFieldHandler.PLCFENDTXT ),
-
-    /** Footnote */
-    FOOTNOTE( FIBFieldHandler.PLCFFNDREF, FIBFieldHandler.PLCFFNDTXT );
-
-    private final int fibDescriptorsFieldIndex;
-    private final int fibTextPositionsFieldIndex;
-
-    private NoteType( int fibDescriptorsFieldIndex,
-            int fibTextPositionsFieldIndex )
-    {
-        this.fibDescriptorsFieldIndex = fibDescriptorsFieldIndex;
-        this.fibTextPositionsFieldIndex = fibTextPositionsFieldIndex;
-    }
-
-    public int getFibDescriptorsFieldIndex()
-    {
-        return fibDescriptorsFieldIndex;
-    }
-
-    public int getFibTextPositionsFieldIndex()
-    {
-        return fibTextPositionsFieldIndex;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java
deleted file mode 100644
index eb5a100..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-
-/**
- * Holds information about document notes (footnotes or ending notes)
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {doc} com)
- */
-@Internal
-public class NotesTables
-{
-    private PlexOfCps descriptors = new PlexOfCps(
-            FootnoteReferenceDescriptor.getSize() );
-
-    private final NoteType noteType;
-
-    private PlexOfCps textPositions = new PlexOfCps( 0 );
-
-    public NotesTables( final NoteType noteType )
-    {
-        this.noteType = noteType;
-        textPositions
-                .addProperty( new GenericPropertyNode( 0, 1, new byte[0] ) );
-    }
-
-    public NotesTables( final NoteType noteType, byte[] tableStream,
-            FileInformationBlock fib )
-    {
-        this.noteType = noteType;
-        read( tableStream, fib );
-    }
-
-    public GenericPropertyNode getDescriptor( int index )
-    {
-        return descriptors.getProperty( index );
-    }
-
-    public int getDescriptorsCount()
-    {
-        return descriptors.length();
-    }
-
-    public GenericPropertyNode getTextPosition( int index )
-    {
-        return textPositions.getProperty( index );
-    }
-
-    private void read( byte[] tableStream, FileInformationBlock fib )
-    {
-        int referencesStart = fib.getNotesDescriptorsOffset( noteType );
-        int referencesLength = fib.getNotesDescriptorsSize( noteType );
-
-        if ( referencesStart != 0 && referencesLength != 0 )
-            this.descriptors = new PlexOfCps( tableStream, referencesStart,
-                    referencesLength, FootnoteReferenceDescriptor.getSize() );
-
-        int textPositionsStart = fib.getNotesTextPositionsOffset( noteType );
-        int textPositionsLength = fib.getNotesTextPositionsSize( noteType );
-
-        if ( textPositionsStart != 0 && textPositionsLength != 0 )
-            this.textPositions = new PlexOfCps( tableStream,
-                    textPositionsStart, textPositionsLength, 0 );
-    }
-
-    public void writeRef( FileInformationBlock fib, HWPFOutputStream tableStream )
-            throws IOException
-    {
-        if ( descriptors == null || descriptors.length() == 0 )
-        {
-            fib.setNotesDescriptorsOffset( noteType, tableStream.getOffset() );
-            fib.setNotesDescriptorsSize( noteType, 0 );
-            return;
-        }
-
-        int start = tableStream.getOffset();
-        tableStream.write( descriptors.toByteArray() );
-        int end = tableStream.getOffset();
-
-        fib.setNotesDescriptorsOffset( noteType, start );
-        fib.setNotesDescriptorsSize( noteType, end - start );
-    }
-
-    public void writeTxt( FileInformationBlock fib, HWPFOutputStream tableStream )
-            throws IOException
-    {
-        if ( textPositions == null || textPositions.length() == 0 )
-        {
-            fib.setNotesTextPositionsOffset( noteType, tableStream.getOffset() );
-            fib.setNotesTextPositionsSize( noteType, 0 );
-            return;
-        }
-
-        int start = tableStream.getOffset();
-        tableStream.write( textPositions.toByteArray() );
-        int end = tableStream.getOffset();
-
-        fib.setNotesTextPositionsOffset( noteType, start );
-        fib.setNotesTextPositionsSize( noteType, end - start );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
deleted file mode 100644
index bc3f486..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Collections;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class holds all of the character formatting 
- *  properties from Old (Word 6 / Word 95) documents.
- * Unlike with Word 97+, it all gets held in the
- *  same stream.
- * In common with the rest of the old support, it 
- *  is read only
- */
-@Internal
-public final class OldCHPBinTable extends CHPBinTable
-{
-  /**
-   * Constructor used to read an old-style binTable
-   *  in from a Word document.
-   *
-   * @param documentStream
-   * @param offset
-   * @param size
-   * @param fcMin
-   */
-  public OldCHPBinTable(byte[] documentStream, int offset,
-                     int size, int fcMin, TextPieceTable tpt)
-  {
-    PlexOfCps binTable = new PlexOfCps(documentStream, offset, size, 2);
-
-    int length = binTable.length();
-    for (int x = 0; x < length; x++)
-    {
-      GenericPropertyNode node = binTable.getProperty(x);
-
-      int pageNum = LittleEndian.getUShort(node.getBytes());
-      int pageOffset = POIFSConstants.SMALLER_BIG_BLOCK_SIZE * pageNum;
-
-      CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage(documentStream,
-        pageOffset, tpt);
-
-            for ( CHPX chpx : cfkp.getCHPXs() )
-            {
-                if ( chpx != null )
-                    _textRuns.add( chpx );
-            }
-    }
-    Collections.sort( _textRuns, PropertyNode.StartComparator.instance );
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
deleted file mode 100644
index 0f7c90d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class holds all of the paragraph formatting 
- *  properties from Old (Word 6 / Word 95) documents.
- * Unlike with Word 97+, it all gets held in the
- *  same stream.
- * In common with the rest of the old support, it 
- *  is read only
- */
-@Internal
-public final class OldPAPBinTable extends PAPBinTable
-{
-
-  public OldPAPBinTable(byte[] documentStream, int offset,
-                     int size, int fcMin, TextPieceTable tpt)
-  {
-    PlexOfCps binTable = new PlexOfCps(documentStream, offset, size, 2);
-
-    int length = binTable.length();
-    for (int x = 0; x < length; x++)
-    {
-      GenericPropertyNode node = binTable.getProperty(x);
-
-      int pageNum = LittleEndian.getUShort(node.getBytes());
-      int pageOffset = POIFSConstants.SMALLER_BIG_BLOCK_SIZE * pageNum;
-
-      PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(documentStream,
-        documentStream, pageOffset, tpt);
-
-            for ( PAPX papx : pfkp.getPAPXs() )
-            {
-                if ( papx != null )
-                    _paragraphs.add( papx );
-            }
-    }
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java
deleted file mode 100644
index 110a7ef..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Collections;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class holds all of the section formatting 
- *  properties from Old (Word 6 / Word 95) documents.
- * Unlike with Word 97+, it all gets held in the
- *  same stream.
- * In common with the rest of the old support, it 
- *  is read only
- */
-@Internal
-public final class OldSectionTable extends SectionTable
-{
-    /**
-     * @deprecated Use {@link #OldSectionTable(byte[],int,int)} instead
-     */
-    @Deprecated
-    public OldSectionTable( byte[] documentStream, int offset, int size,
-            int fcMin, TextPieceTable tpt )
-    {
-        this( documentStream, offset, size );
-    }
-
-    public OldSectionTable( byte[] documentStream, int offset, int size )
-    {
-    PlexOfCps sedPlex = new PlexOfCps( documentStream, offset, size, 12 );
-
-    int length = sedPlex.length();
-
-    for (int x = 0; x < length; x++)
-    {
-      GenericPropertyNode node = sedPlex.getProperty(x);
-      SectionDescriptor sed = new SectionDescriptor(node.getBytes(), 0);
-
-      int fileOffset = sed.getFc();
-      int startAt = node.getStart();
-      int endAt = node.getEnd();
-
-      SEPX sepx;
-      // check for the optimization
-      if (fileOffset == 0xffffffff)
-      {
-        sepx = new SEPX(sed, startAt, endAt, new byte[0]);
-      }
-      else
-      {
-        // The first short at the offset is the size of the grpprl.
-        int sepxSize = LittleEndian.getShort(documentStream, fileOffset);
-        // Because we don't properly know about all the details of the old
-        //  section properties, and we're trying to decode them as if they
-        //  were the new ones, we sometimes "need" more data than we have.
-        // As a workaround, have a few extra 0 bytes on the end!
-        byte[] buf = new byte[sepxSize+2];
-        fileOffset += LittleEndian.SHORT_SIZE;
-        System.arraycopy(documentStream, fileOffset, buf, 0, buf.length);
-        sepx = new SEPX(sed, startAt, endAt, buf);
-      }
-
-            _sections.add( sepx );
-    }
-    Collections.sort( _sections, PropertyNode.StartComparator.instance );
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
deleted file mode 100644
index 34c2951..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.IdentityHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.hwpf.sprm.SprmIterator;
-import org.apache.poi.hwpf.sprm.SprmOperation;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class represents the bin table of Word document but it also serves as a
- * holder for all of the paragraphs of document that have been loaded into
- * memory.
- *
- * @author Ryan Ackley
- */
-@Internal
-public class PAPBinTable
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( PAPBinTable.class );
-
-    protected final ArrayList<PAPX> _paragraphs = new ArrayList<PAPX>();
-
-    public PAPBinTable()
-    {
-    }
-
-    public PAPBinTable( byte[] documentStream, byte[] tableStream,
-            byte[] dataStream, int offset, int size,
-            CharIndexTranslator charIndexTranslator )
-    {
-        long start = System.currentTimeMillis();
-
-        {
-            PlexOfCps binTable = new PlexOfCps( tableStream, offset, size, 4 );
-
-            int length = binTable.length();
-            for ( int x = 0; x < length; x++ )
-            {
-                GenericPropertyNode node = binTable.getProperty( x );
-
-                int pageNum = LittleEndian.getInt( node.getBytes() );
-                int pageOffset = POIFSConstants.SMALLER_BIG_BLOCK_SIZE * pageNum;
-
-                PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(
-                        documentStream, dataStream, pageOffset,
-                        charIndexTranslator );
-
-                for ( PAPX papx : pfkp.getPAPXs() )
-                {
-                    if ( papx != null )
-                        _paragraphs.add( papx );
-                }
-            }
-        }
-
-        logger.log( POILogger.DEBUG, "PAPX tables loaded in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms (",
-                Integer.valueOf( _paragraphs.size() ), " elements)" );
-
-        if ( _paragraphs.isEmpty() )
-        {
-            logger.log( POILogger.WARN, "PAPX FKPs are empty" );
-            _paragraphs.add( new PAPX( 0, 0, new SprmBuffer( 2 ) ) );
-        }
-    }
-
-    public void rebuild( final StringBuilder docText,
-            ComplexFileTable complexFileTable )
-    {
-        rebuild( docText, complexFileTable, _paragraphs );
-    }
-
-    static void rebuild( final StringBuilder docText,
-            ComplexFileTable complexFileTable, List<PAPX> paragraphs )
-    {
-        long start = System.currentTimeMillis();
-
-        if ( complexFileTable != null )
-        {
-            SprmBuffer[] sprmBuffers = complexFileTable.getGrpprls();
-
-            // adding PAPX from fast-saved SPRMs
-            for ( TextPiece textPiece : complexFileTable.getTextPieceTable()
-                    .getTextPieces() )
-            {
-                PropertyModifier prm = textPiece.getPieceDescriptor().getPrm();
-                if ( !prm.isComplex() )
-                    continue;
-                int igrpprl = prm.getIgrpprl();
-
-                if ( igrpprl < 0 || igrpprl >= sprmBuffers.length )
-                {
-                    logger.log( POILogger.WARN, textPiece
-                            + "'s PRM references to unknown grpprl" );
-                    continue;
-                }
-
-                boolean hasPap = false;
-                SprmBuffer sprmBuffer = sprmBuffers[igrpprl];
-                for ( SprmIterator iterator = sprmBuffer.iterator(); iterator
-                        .hasNext(); )
-                {
-                    SprmOperation sprmOperation = iterator.next();
-                    if ( sprmOperation.getType() == SprmOperation.TYPE_PAP )
-                    {
-                        hasPap = true;
-                        break;
-                    }
-                }
-
-                if ( hasPap )
-                {
-                    SprmBuffer newSprmBuffer = new SprmBuffer( 2 );
-                    newSprmBuffer.append( sprmBuffer.toByteArray() );
-
-                    PAPX papx = new PAPX( textPiece.getStart(),
-                            textPiece.getEnd(), newSprmBuffer );
-                    paragraphs.add( papx );
-                }
-            }
-
-            logger.log( POILogger.DEBUG,
-                    "Merged (?) with PAPX from complex file table in ",
-                    Long.valueOf( System.currentTimeMillis() - start ),
-                    " ms (", Integer.valueOf( paragraphs.size() ),
-                    " elements in total)" );
-            start = System.currentTimeMillis();
-        }
-
-        List<PAPX> oldPapxSortedByEndPos = new ArrayList<PAPX>( paragraphs );
-        Collections.sort( oldPapxSortedByEndPos,
-                PropertyNode.EndComparator.instance );
-
-        logger.log( POILogger.DEBUG, "PAPX sorted by end position in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms" );
-        start = System.currentTimeMillis();
-
-        final Map<PAPX, Integer> papxToFileOrder = new IdentityHashMap<PAPX, Integer>();
-        {
-            int counter = 0;
-            for ( PAPX papx : paragraphs )
-            {
-                papxToFileOrder.put( papx, Integer.valueOf( counter++ ) );
-            }
-        }
-        final Comparator<PAPX> papxFileOrderComparator = new Comparator<PAPX>()
-        {
-            public int compare( PAPX o1, PAPX o2 )
-            {
-                Integer i1 = papxToFileOrder.get( o1 );
-                Integer i2 = papxToFileOrder.get( o2 );
-                return i1.compareTo( i2 );
-            }
-        };
-
-        logger.log( POILogger.DEBUG, "PAPX's order map created in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms" );
-        start = System.currentTimeMillis();
-
-        List<PAPX> newPapxs = new LinkedList<PAPX>();
-        int lastParStart = 0;
-        int lastPapxIndex = 0;
-        for ( int charIndex = 0; charIndex < docText.length(); charIndex++ )
-        {
-            final char c = docText.charAt( charIndex );
-            if ( c != 13 && c != 7 && c != 12 )
-                continue;
-
-            final int startInclusive = lastParStart;
-            final int endExclusive = charIndex + 1;
-
-            boolean broken = false;
-            List<PAPX> papxs = new LinkedList<PAPX>();
-            for ( int papxIndex = lastPapxIndex; papxIndex < oldPapxSortedByEndPos
-                    .size(); papxIndex++ )
-            {
-                broken = false;
-                PAPX papx = oldPapxSortedByEndPos.get( papxIndex );
-
-                assert startInclusive == 0
-                        || papxIndex + 1 == oldPapxSortedByEndPos.size()
-                        || papx.getEnd() > startInclusive;
-
-                if ( papx.getEnd() - 1 > charIndex )
-                {
-                    lastPapxIndex = papxIndex;
-                    broken = true;
-                    break;
-                }
-
-                papxs.add( papx );
-            }
-            if ( !broken )
-            {
-                lastPapxIndex = oldPapxSortedByEndPos.size() - 1;
-            }
-
-            if ( papxs.size() == 0 )
-            {
-                logger.log( POILogger.WARN, "Paragraph [",
-                        Integer.valueOf( startInclusive ), "; ",
-                        Integer.valueOf( endExclusive ),
-                        ") has no PAPX. Creating new one." );
-                // create it manually
-                PAPX papx = new PAPX( startInclusive, endExclusive,
-                        new SprmBuffer( 2 ) );
-                newPapxs.add( papx );
-
-                lastParStart = endExclusive;
-                continue;
-            }
-
-            if ( papxs.size() == 1 )
-            {
-                // can we reuse existing?
-                PAPX existing = papxs.get( 0 );
-                if ( existing.getStart() == startInclusive
-                        && existing.getEnd() == endExclusive )
-                {
-                    newPapxs.add( existing );
-                    lastParStart = endExclusive;
-                    continue;
-                }
-            }
-
-            // restore file order of PAPX
-            Collections.sort( papxs, papxFileOrderComparator );
-
-            SprmBuffer sprmBuffer = null;
-            for ( PAPX papx : papxs )
-            {
-                if ( papx.getGrpprl() == null || papx.getGrpprl().length == 0 )
-                    continue;
-
-                if ( sprmBuffer == null ) {
-                    sprmBuffer = papx.getSprmBuf().clone();
-                } else {
-                    sprmBuffer.append( papx.getGrpprl(), 2 );
-                }
-            }
-            PAPX newPapx = new PAPX( startInclusive, endExclusive, sprmBuffer );
-            newPapxs.add( newPapx );
-
-            lastParStart = endExclusive;
-            continue;
-        }
-        paragraphs.clear();
-        paragraphs.addAll( newPapxs );
-
-        logger.log( POILogger.DEBUG, "PAPX rebuilded from document text in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms (",
-                Integer.valueOf( paragraphs.size() ), " elements)" );
-        start = System.currentTimeMillis();
-    }
-
-    public void insert(int listIndex, int cpStart, SprmBuffer buf)
-    {
-
-        PAPX forInsert = new PAPX(0, 0, buf);
-
-        // Ensure character offsets are really characters
-        forInsert.setStart(cpStart);
-        forInsert.setEnd(cpStart);
-
-        if (listIndex == _paragraphs.size())
-        {
-             _paragraphs.add(forInsert);
-        }
-        else
-        {
-            PAPX currentPap = _paragraphs.get(listIndex);
-            if (currentPap != null && currentPap.getStart() < cpStart)
-            {
-                SprmBuffer clonedBuf = currentPap.getSprmBuf().clone();
-
-                // Copy the properties of the one before to afterwards
-                // Will go:
-                //    Original, until insert at point
-                //    New one
-                //    Clone of original, on to the old end
-                PAPX clone = new PAPX(0, 0, clonedBuf);
-                // Again ensure contains character based offsets no matter what
-                clone.setStart(cpStart);
-                clone.setEnd(currentPap.getEnd());
-
-                currentPap.setEnd(cpStart);
-
-                _paragraphs.add(listIndex + 1, forInsert);
-                _paragraphs.add(listIndex + 2, clone);
-            }
-            else
-            {
-                _paragraphs.add(listIndex, forInsert);
-            }
-        }
-
-    }
-
-    public void adjustForDelete(int listIndex, int offset, int length)
-    {
-        int size = _paragraphs.size();
-        int endMark = offset + length;
-        int endIndex = listIndex;
-
-        PAPX papx = _paragraphs.get(endIndex);
-        while (papx.getEnd() < endMark)
-        {
-            papx = _paragraphs.get(++endIndex);
-        }
-        if (listIndex == endIndex)
-        {
-            papx = _paragraphs.get(endIndex);
-            papx.setEnd((papx.getEnd() - endMark) + offset);
-        }
-        else
-        {
-            papx = _paragraphs.get(listIndex);
-            papx.setEnd(offset);
-            for (int x = listIndex + 1; x < endIndex; x++)
-            {
-                papx = _paragraphs.get(x);
-                papx.setStart(offset);
-                papx.setEnd(offset);
-            }
-            papx = _paragraphs.get(endIndex);
-            papx.setEnd((papx.getEnd() - endMark) + offset);
-        }
-
-        for (int x = endIndex + 1; x < size; x++)
-        {
-            papx = _paragraphs.get(x);
-            papx.setStart(papx.getStart() - length);
-            papx.setEnd(papx.getEnd() - length);
-        }
-    }
-
-
-    public void adjustForInsert(int listIndex, int length)
-    {
-        int size = _paragraphs.size();
-        PAPX papx = _paragraphs.get(listIndex);
-        papx.setEnd(papx.getEnd() + length);
-
-        for (int x = listIndex + 1; x < size; x++)
-        {
-            papx = _paragraphs.get(x);
-            papx.setStart(papx.getStart() + length);
-            papx.setEnd(papx.getEnd() + length);
-        }
-    }
-
-
-    public ArrayList<PAPX> getParagraphs()
-    {
-        return _paragraphs;
-    }
-
-    public void writeTo( HWPFOutputStream wordDocumentStream,
-            HWPFOutputStream tableStream, CharIndexTranslator translator )
-            throws IOException
-    {
-
-        PlexOfCps binTable = new PlexOfCps(4);
-    
-        // each FKP must start on a 512 byte page.
-        int docOffset = wordDocumentStream.getOffset();
-        int mod = docOffset % POIFSConstants.SMALLER_BIG_BLOCK_SIZE;
-        if (mod != 0)
-        {
-            byte[] padding = new byte[POIFSConstants.SMALLER_BIG_BLOCK_SIZE - mod];
-            wordDocumentStream.write(padding);
-        }
-    
-        // get the page number for the first fkp
-        docOffset = wordDocumentStream.getOffset();
-        int pageNum = docOffset/POIFSConstants.SMALLER_BIG_BLOCK_SIZE;
-    
-        // get the ending fc
-        // int endingFc = _paragraphs.get(_paragraphs.size() - 1).getEnd();
-        // endingFc += fcMin;
-        int endingFc = translator.getByteIndex( _paragraphs.get(_paragraphs.size() - 1 ).getEnd() );
-    
-        ArrayList<PAPX> overflow = _paragraphs;
-        do
-        {
-            PAPX startingProp = overflow.get(0);
-    
-            // int start = startingProp.getStart() + fcMin;
-            int start = translator.getByteIndex( startingProp.getStart() );
-
-            PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage();
-            pfkp.fill(overflow);
-
-            byte[] bufFkp = pfkp.toByteArray(tableStream, translator);
-            wordDocumentStream.write(bufFkp);
-            overflow = pfkp.getOverflow();
-
-            int end = endingFc;
-            if (overflow != null)
-            {
-                // end = overflow.get(0).getStart() + fcMin;
-                end = translator.getByteIndex( overflow.get( 0 ).getStart() );
-            }
-    
-            byte[] intHolder = new byte[4];
-            LittleEndian.putInt(intHolder, 0, pageNum++);
-            binTable.addProperty(new GenericPropertyNode(start, end, intHolder));
-    
-        }
-        while (overflow != null);
-        tableStream.write(binTable.toByteArray());
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
deleted file mode 100644
index d314d95..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents a PAP FKP. The style properties for paragraph and character runs
- * are stored in fkps. There are PAP fkps for paragraph properties and CHP fkps
- * for character run properties. The first part of the fkp for both CHP and PAP
- * fkps consists of an array of 4 byte int offsets in the main stream for that
- * Paragraph's or Character run's text. The ending offset is the next
- * value in the array. For example, if an fkp has X number of Paragraph's
- * stored in it then there are (x + 1) 4 byte ints in the beginning array. The
- * number X is determined by the last byte in a 512 byte fkp.
- *
- * CHP and PAP fkps also store the compressed styles(grpprl) that correspond to
- * the offsets on the front of the fkp. The offset of the grpprls is determined
- * differently for CHP fkps and PAP fkps.
- *
- * @author Ryan Ackley
- */
-@Internal
-public final class PAPFormattedDiskPage extends FormattedDiskPage {
-    private static final int BX_SIZE = 13;
-    private static final int FC_SIZE = 4;
-
-    private ArrayList<PAPX> _papxList = new ArrayList<PAPX>();
-    private ArrayList<PAPX> _overFlow;
-
-    /**
-     * @deprecated Use {@link #PAPFormattedDiskPage()} instead
-     */
-    public PAPFormattedDiskPage( byte[] dataStream )
-    {
-        this();
-    }
-
-    public PAPFormattedDiskPage()
-    {
-    }
-
-    /**
-     * Creates a PAPFormattedDiskPage from a 512 byte array
-     * 
-     * @deprecated Use
-     *             {@link #PAPFormattedDiskPage(byte[], byte[], int, CharIndexTranslator)}
-     *             instead
-     */
-    public PAPFormattedDiskPage( byte[] documentStream, byte[] dataStream,
-            int offset, int fcMin, TextPieceTable tpt )
-    {
-        this( documentStream, dataStream, offset, tpt );
-    }
-
-    /**
-     * Creates a PAPFormattedDiskPage from a 512 byte array
-     */
-    public PAPFormattedDiskPage( byte[] documentStream, byte[] dataStream,
-            int offset, CharIndexTranslator translator )
-    {
-        super( documentStream, offset );
-        for ( int x = 0; x < _crun; x++ )
-        {
-            int bytesStartAt = getStart( x );
-            int bytesEndAt = getEnd( x );
-
-            // int charStartAt = translator.getCharIndex( bytesStartAt );
-            // int charEndAt = translator.getCharIndex( bytesEndAt, charStartAt
-            // );
-            // PAPX papx = new PAPX( charStartAt, charEndAt, getGrpprl( x ),
-            // getParagraphHeight( x ), dataStream );
-            // _papxList.add( papx );
-
-            for ( int[] range : translator.getCharIndexRanges( bytesStartAt,
-                    bytesEndAt ) )
-            {
-                PAPX papx = new PAPX( range[0], range[1], getGrpprl( x ),
-                        getParagraphHeight( x ), dataStream );
-                _papxList.add( papx );
-            }
-        }
-        _fkp = null;
-    }
-
-    /**
-     * Fills the queue for writing.
-     *
-     * @param filler a List of PAPXs
-     */
-    public void fill(List<PAPX> filler)
-    {
-      _papxList.addAll(filler);
-    }
-
-    /**
-     * Used when writing out a Word docunment. This method is part of a sequence
-     * that is necessary because there is no easy and efficient way to
-     * determine the number PAPX's that will fit into one FKP. THe sequence is
-     * as follows:
-     *
-     * fill()
-     * toByteArray()
-     * getOverflow()
-     *
-     * @return The remaining PAPXs that didn't fit into this FKP.
-     */
-    ArrayList<PAPX> getOverflow()
-    {
-      return _overFlow;
-    }
-
-    /**
-     * Gets the PAPX at index.
-     * @param index The index to get the PAPX for.
-     * @return The PAPX at index.
-     */
-    public PAPX getPAPX(int index)
-    {
-      return _papxList.get(index);
-    }
-
-    public List<PAPX> getPAPXs()
-    {
-        return Collections.unmodifiableList( _papxList );
-    }
-
-    /**
-     * Gets the papx grpprl for the paragraph at index in this fkp.
-     *
-     * @param index The index of the papx to get.
-     * @return a papx grpprl.
-     */
-    protected byte[] getGrpprl(int index)
-    {
-        int papxOffset = 2 * LittleEndian.getUByte(_fkp, _offset + (((_crun + 1) * FC_SIZE) + (index * BX_SIZE)));
-        int size = 2 * LittleEndian.getUByte(_fkp, _offset + papxOffset);
-        if(size == 0)
-        {
-            size = 2 * LittleEndian.getUByte(_fkp, _offset + ++papxOffset);
-        }
-        else
-        {
-            size--;
-        }
-
-        byte[] papx = new byte[size];
-        System.arraycopy(_fkp, _offset + ++papxOffset, papx, 0, size);
-        return papx;
-    }
-
-    /**
-     * Creates a byte array representation of this data structure. Suitable for
-     * writing to a Word document.
-     * 
-     * @param dataStream required if PAPX is too big to fit in FKP
-     * 
-     * @return A byte array representing this data structure.
-     * @throws IOException
-     *             if an I/O error occurs.
-     */
-    protected byte[] toByteArray( HWPFOutputStream dataStream,
-            CharIndexTranslator translator ) throws IOException
-    {
-        byte[] buf = new byte[512];
-        int size = _papxList.size();
-        int grpprlOffset = 0;
-        int bxOffset = 0;
-        int fcOffset = 0;
-        byte[] lastGrpprl = new byte[0];
-
-        // total size is currently the size of one FC
-        int totalSize = FC_SIZE;
-
-        int index = 0;
-        for ( ; index < size; index++ )
-        {
-            byte[] grpprl = _papxList.get( index ).getGrpprl();
-            int grpprlLength = grpprl.length;
-
-            // is grpprl huge?
-            if ( grpprlLength > 488 )
-            {
-                grpprlLength = 8; // set equal to size of sprmPHugePapx grpprl
-            }
-
-            // check to see if we have enough room for an FC, a BX, and the
-            // grpprl
-            // and the 1 byte size of the grpprl.
-            int addition = 0;
-            if ( !Arrays.equals( grpprl, lastGrpprl ) )
-            {
-                addition = ( FC_SIZE + BX_SIZE + grpprlLength + 1 );
-            }
-            else
-            {
-                addition = ( FC_SIZE + BX_SIZE );
-            }
-
-            totalSize += addition;
-
-            // if size is uneven we will have to add one so the first grpprl
-            // falls
-            // on a word boundary
-            if ( totalSize > 511 + ( index % 2 ) )
-            {
-                totalSize -= addition;
-                break;
-            }
-
-            // grpprls must fall on word boundaries
-            if ( grpprlLength % 2 > 0 )
-            {
-                totalSize += 1;
-            }
-            else
-            {
-                totalSize += 2;
-            }
-            lastGrpprl = grpprl;
-        }
-
-        // see if we couldn't fit some
-        if ( index != size )
-        {
-            _overFlow = new ArrayList<PAPX>();
-            _overFlow.addAll( _papxList.subList( index, size ) );
-        }
-
-        // index should equal number of papxs that will be in this fkp now.
-        buf[511] = (byte) index;
-
-        bxOffset = ( FC_SIZE * index ) + FC_SIZE;
-        grpprlOffset = 511;
-
-        PAPX papx = null;
-        lastGrpprl = new byte[0];
-        for ( int x = 0; x < index; x++ )
-        {
-            papx = _papxList.get( x );
-            byte[] phe = papx.getParagraphHeight().toByteArray();
-            byte[] grpprl = papx.getGrpprl();
-
-            // is grpprl huge?
-            if ( grpprl.length > 488 )
-            {
-                // if so do we have storage at getHugeGrpprlOffset()
-                // int hugeGrpprlOffset = papx.getHugeGrpprlOffset();
-                // if ( hugeGrpprlOffset == -1 ) // then we have no storage...
-                // {
-                // throw new UnsupportedOperationException(
-                // "This Paragraph has no dataStream storage." );
-                // }
-                // we have some storage...
-
-                // get the size of the existing storage
-                // int maxHugeGrpprlSize = LittleEndian.getUShort( dataStream,
-                // hugeGrpprlOffset );
-                //
-                // if ( maxHugeGrpprlSize < grpprl.length - 2 )
-                // { // grpprl.length-2 because we don't store the istd
-                // throw new UnsupportedOperationException(
-                // "This Paragraph's dataStream storage is too small." );
-                // }
-
-                // store grpprl at hugeGrpprlOffset
-                // grpprl.length-2 because we don't store the istd
-                // System.arraycopy( grpprl, 2, dataStream, hugeGrpprlOffset +
-                // 2,
-                // grpprl.length - 2 );
-                // LittleEndian.putUShort( dataStream, hugeGrpprlOffset,
-                // grpprl.length - 2 );
-
-                byte[] hugePapx = new byte[grpprl.length - 2];
-                System.arraycopy( grpprl, 2, hugePapx, 0, grpprl.length - 2 );
-                int dataStreamOffset = dataStream.getOffset();
-                dataStream.write( hugePapx );
-
-                // grpprl = grpprl containing only a sprmPHugePapx2
-                int istd = LittleEndian.getUShort( grpprl, 0 );
-
-                grpprl = new byte[8];
-                LittleEndian.putUShort( grpprl, 0, istd );
-                LittleEndian.putUShort( grpprl, 2, 0x6646 ); // sprmPHugePapx2
-                LittleEndian.putInt( grpprl, 4, dataStreamOffset );
-            }
-
-            boolean same = Arrays.equals( lastGrpprl, grpprl );
-            if ( !same )
-            {
-                grpprlOffset -= ( grpprl.length + ( 2 - grpprl.length % 2 ) );
-                grpprlOffset -= ( grpprlOffset % 2 );
-            }
-            // LittleEndian.putInt( buf, fcOffset, papx.getStartBytes() );
-            LittleEndian.putInt( buf, fcOffset,
-                    translator.getByteIndex( papx.getStart() ) );
-            buf[bxOffset] = (byte) ( grpprlOffset / 2 );
-            System.arraycopy( phe, 0, buf, bxOffset + 1, phe.length );
-
-            /*
-             * refer to the section on PAPX in the spec. Places a size on the
-             * front of the PAPX. Has to do with how the grpprl stays on word
-             * boundaries.
-             */
-            if ( !same )
-            {
-                int copyOffset = grpprlOffset;
-                if ( ( grpprl.length % 2 ) > 0 )
-                {
-                    buf[copyOffset++] = (byte) ( ( grpprl.length + 1 ) / 2 );
-                }
-                else
-                {
-                    buf[++copyOffset] = (byte) ( ( grpprl.length ) / 2 );
-                    copyOffset++;
-                }
-                System.arraycopy( grpprl, 0, buf, copyOffset, grpprl.length );
-                lastGrpprl = grpprl;
-            }
-
-            bxOffset += BX_SIZE;
-            fcOffset += FC_SIZE;
-
-        }
-
-        // LittleEndian.putInt(buf, fcOffset, papx.getEndBytes() + fcMin);
-        LittleEndian.putInt( buf, fcOffset,
-                translator.getByteIndex( papx.getEnd() ) );
-        return buf;
-    }
-
-    /**
-     * Used to get the ParagraphHeight of a PAPX at a particular index.
-     * @param index
-     * @return The ParagraphHeight
-     */
-    private ParagraphHeight getParagraphHeight(int index)
-    {
-      int pheOffset = _offset + 1 + (((_crun + 1) * 4) + (index * 13));
-
-      ParagraphHeight phe = new ParagraphHeight(_fkp, pheOffset);
-
-      return phe;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
deleted file mode 100644
index c58cbac..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ====================================================================
-     Licensed to the Apache Software Foundation (ASF) under one or more
-     contributor license agreements.    See the NOTICE file distributed with
-     this work for additional information regarding copyright ownership.
-     The ASF licenses this file to You under the Apache License, Version 2.0
-     (the "License"); you may not use this file except in compliance with
-     the License.    You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-
-import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.hwpf.sprm.SprmOperation;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * DANGER - works in bytes!
- *
- * Make sure you call getStart() / getEnd() when you want characters
- *    (normal use), but getStartByte() / getEndByte() when you're
- *    reading in / writing out!
- *
- * @author Ryan Ackley
- */
-@Internal
-@SuppressWarnings( "deprecation" )
-public final class PAPX extends BytePropertyNode<PAPX> {
-
-    private ParagraphHeight _phe;
-
-    public PAPX(int fcStart, int fcEnd, CharIndexTranslator translator, byte[] papx, ParagraphHeight phe, byte[] dataStream)
-    {
-        super(fcStart, fcEnd, translator, new SprmBuffer(papx, 2));
-        _phe = phe;
-        SprmBuffer buf = findHuge(new SprmBuffer(papx, 2), dataStream);
-        if(buf != null)
-            _buf = buf;
-    }
-
-    public PAPX( int charStart, int charEnd, byte[] papx, ParagraphHeight phe,
-            byte[] dataStream )
-    {
-        super( charStart, charEnd, new SprmBuffer( papx, 2 ) );
-        _phe = phe;
-        SprmBuffer buf = findHuge( new SprmBuffer( papx, 2 ), dataStream );
-        if ( buf != null )
-            _buf = buf;
-    }
-
-    @Deprecated
-    public PAPX(int fcStart, int fcEnd, CharIndexTranslator translator, SprmBuffer buf, byte[] dataStream)
-    {
-        super(fcStart, fcEnd, translator, buf);
-        _phe = new ParagraphHeight();
-        buf = findHuge(buf, dataStream);
-        if(buf != null)
-            _buf = buf;
-    }
-
-    public PAPX( int charStart, int charEnd, SprmBuffer buf )
-    {
-        super( charStart, charEnd, buf );
-        _phe = new ParagraphHeight();
-    }
-
-    private SprmBuffer findHuge(SprmBuffer buf, byte[] datastream)
-    {
-        byte[] grpprl = buf.toByteArray();
-        if(grpprl.length==8 && datastream!=null) // then check for sprmPHugePapx
-        {
-            SprmOperation sprm = new SprmOperation(grpprl, 2);
-            if ((sprm.getOperation()==0x45 || sprm.getOperation()==0x46)
-                    && sprm.getSizeCode() == 3)
-            {
-                int hugeGrpprlOffset = sprm.getOperand();
-                if(hugeGrpprlOffset+1 < datastream.length)
-                {
-                    int grpprlSize = LittleEndian.getShort(datastream, hugeGrpprlOffset);
-                    if( hugeGrpprlOffset+grpprlSize < datastream.length)
-                    {
-                        byte[] hugeGrpprl = new byte[grpprlSize + 2];
-                        // copy original istd into huge Grpprl
-                        hugeGrpprl[0] = grpprl[0]; hugeGrpprl[1] = grpprl[1];
-                        // copy Grpprl from dataStream
-                        System.arraycopy(datastream, hugeGrpprlOffset + 2, hugeGrpprl, 2,
-                                                         grpprlSize);
-                        return new SprmBuffer(hugeGrpprl, 2);
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-
-    public ParagraphHeight getParagraphHeight()
-    {
-        return _phe;
-    }
-
-    public byte[] getGrpprl()
-    {
-        if (_buf == null)
-            return new byte[0];
-
-        return ((SprmBuffer)_buf).toByteArray();
-    }
-
-    public short getIstd()
-    {
-        if ( _buf == null )
-            return 0;
-    
-        byte[] buf = getGrpprl();
-        if (buf.length == 0)
-        {
-            return 0;
-        }
-        if (buf.length == 1)
-        {
-            return LittleEndian.getUByte(buf, 0);
-        }
-        return LittleEndian.getShort(buf);
-    }
-
-    public SprmBuffer getSprmBuf()
-    {
-        return (SprmBuffer)_buf;
-    }
-
-    @Deprecated
-    @Internal
-    public ParagraphProperties getParagraphProperties(StyleSheet ss)
-    {
-        if(ss == null) {
-            // TODO Fix up for Word 6/95
-            return new ParagraphProperties();
-        }
-            
-        short istd = getIstd();
-        ParagraphProperties baseStyle = ss.getParagraphStyle(istd);
-        ParagraphProperties props = ParagraphSprmUncompressor.uncompressPAP(baseStyle, getGrpprl(), 2);
-        return props;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (super.equals(o))
-        {
-            return _phe.equals(((PAPX)o)._phe);
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-    }
-
-    public String toString()
-    {
-        return "PAPX from " + getStart() + " to " + getEnd() + " (in bytes "
-                            + getStartBytes() + " to " + getEndBytes() + ")";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java
deleted file mode 100644
index ee7a11a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.model.types.PICFAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The PICF structure specifies the type of a picture, as well as the size of
- * the picture and information about its border.
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-public class PICF extends PICFAbstractType
-{
-
-    public PICF()
-    {
-    }
-
-    public PICF( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        PICF other = (PICF) obj;
-        if ( field_10_padding2 != other.field_10_padding2 )
-            return false;
-        if ( field_11_dxaGoal != other.field_11_dxaGoal )
-            return false;
-        if ( field_12_dyaGoal != other.field_12_dyaGoal )
-            return false;
-        if ( field_13_mx != other.field_13_mx )
-            return false;
-        if ( field_14_my != other.field_14_my )
-            return false;
-        if ( field_15_dxaReserved1 != other.field_15_dxaReserved1 )
-            return false;
-        if ( field_16_dyaReserved1 != other.field_16_dyaReserved1 )
-            return false;
-        if ( field_17_dxaReserved2 != other.field_17_dxaReserved2 )
-            return false;
-        if ( field_18_dyaReserved2 != other.field_18_dyaReserved2 )
-            return false;
-        if ( field_19_fReserved != other.field_19_fReserved )
-            return false;
-        if ( field_1_lcb != other.field_1_lcb )
-            return false;
-        if ( field_20_bpp != other.field_20_bpp )
-            return false;
-        if ( !Arrays.equals( field_21_brcTop80, other.field_21_brcTop80 ) )
-            return false;
-        if ( !Arrays.equals( field_22_brcLeft80, other.field_22_brcLeft80 ) )
-            return false;
-        if ( !Arrays.equals( field_23_brcBottom80, other.field_23_brcBottom80 ) )
-            return false;
-        if ( !Arrays.equals( field_24_brcRight80, other.field_24_brcRight80 ) )
-            return false;
-        if ( field_25_dxaReserved3 != other.field_25_dxaReserved3 )
-            return false;
-        if ( field_26_dyaReserved3 != other.field_26_dyaReserved3 )
-            return false;
-        if ( field_27_cProps != other.field_27_cProps )
-            return false;
-        if ( field_2_cbHeader != other.field_2_cbHeader )
-            return false;
-        if ( field_3_mm != other.field_3_mm )
-            return false;
-        if ( field_4_xExt != other.field_4_xExt )
-            return false;
-        if ( field_5_yExt != other.field_5_yExt )
-            return false;
-        if ( field_6_swHMF != other.field_6_swHMF )
-            return false;
-        if ( field_7_grf != other.field_7_grf )
-            return false;
-        if ( field_8_padding != other.field_8_padding )
-            return false;
-        if ( field_9_mmPM != other.field_9_mmPM )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_10_padding2;
-        result = prime * result + field_11_dxaGoal;
-        result = prime * result + field_12_dyaGoal;
-        result = prime * result + field_13_mx;
-        result = prime * result + field_14_my;
-        result = prime * result + field_15_dxaReserved1;
-        result = prime * result + field_16_dyaReserved1;
-        result = prime * result + field_17_dxaReserved2;
-        result = prime * result + field_18_dyaReserved2;
-        result = prime * result + field_19_fReserved;
-        result = prime * result + field_1_lcb;
-        result = prime * result + field_20_bpp;
-        result = prime * result + Arrays.hashCode( field_21_brcTop80 );
-        result = prime * result + Arrays.hashCode( field_22_brcLeft80 );
-        result = prime * result + Arrays.hashCode( field_23_brcBottom80 );
-        result = prime * result + Arrays.hashCode( field_24_brcRight80 );
-        result = prime * result + field_25_dxaReserved3;
-        result = prime * result + field_26_dyaReserved3;
-        result = prime * result + field_27_cProps;
-        result = prime * result + field_2_cbHeader;
-        result = prime * result + field_3_mm;
-        result = prime * result + field_4_xExt;
-        result = prime * result + field_5_yExt;
-        result = prime * result + field_6_swHMF;
-        result = prime * result + field_7_grf;
-        result = prime * result + field_8_padding;
-        result = prime * result + field_9_mmPM;
-        return result;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
deleted file mode 100644
index b17ec44..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public class PICFAndOfficeArtData
-{
-
-    private List<EscherRecord> _blipRecords;
-
-    private short _cchPicName;
-
-    private PICF _picf;
-
-    private EscherContainerRecord _shape;
-
-    private byte[] _stPicName;
-
-    public PICFAndOfficeArtData( byte[] dataStream, int startOffset )
-    {
-        int offset = startOffset;
-
-        _picf = new PICF( dataStream, offset );
-        offset += PICF.getSize();
-
-        if ( _picf.getMm() == 0x0066 )
-        {
-            _cchPicName = LittleEndian.getUByte( dataStream, offset );
-            offset += 1;
-
-            _stPicName = LittleEndian.getByteArray( dataStream, offset,
-                    _cchPicName );
-            offset += _cchPicName;
-        }
-
-        final DefaultEscherRecordFactory escherRecordFactory = new DefaultEscherRecordFactory();
-        _shape = new EscherContainerRecord();
-        int recordSize = _shape.fillFields( dataStream, offset,
-                escherRecordFactory );
-        offset += recordSize;
-
-        _blipRecords = new LinkedList<EscherRecord>();
-        while ( ( offset - startOffset ) < _picf.getLcb() )
-        {
-            EscherRecord nextRecord = escherRecordFactory.createRecord(
-                    dataStream, offset );
-            if ( nextRecord.getRecordId() != (short) 0xF007
-                    && ( nextRecord.getRecordId() < (short) 0xF018 || nextRecord
-                            .getRecordId() > (short) 0xF117 ) )
-                break;
-
-            int blipRecordSize = nextRecord.fillFields( dataStream, offset,
-                    escherRecordFactory );
-            offset += blipRecordSize;
-
-            _blipRecords.add( nextRecord );
-        }
-    }
-
-    public List<EscherRecord> getBlipRecords()
-    {
-        return _blipRecords;
-    }
-
-    public PICF getPicf()
-    {
-        return _picf;
-    }
-
-    public EscherContainerRecord getShape()
-    {
-        return _shape;
-    }
-
-    public byte[] getStPicName()
-    {
-        return _stPicName;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java
deleted file mode 100644
index 747d0c1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class ParagraphHeight
-{
-  private short infoField;
-    private BitField fSpare = BitFieldFactory.getInstance(0x0001);
-    private BitField fUnk = BitFieldFactory.getInstance(0x0002);
-    private BitField fDiffLines = BitFieldFactory.getInstance(0x0004);
-    private BitField clMac = BitFieldFactory.getInstance(0xff00);
-  private short reserved;
-  private int dxaCol;
-  private int dymLineOrHeight;
-
-  public ParagraphHeight(byte[] buf, int offset)
-  {
-    infoField = LittleEndian.getShort(buf, offset);
-    offset += LittleEndian.SHORT_SIZE;
-    reserved = LittleEndian.getShort(buf, offset);
-    offset += LittleEndian.SHORT_SIZE;
-    dxaCol = LittleEndian.getInt(buf, offset);
-    offset += LittleEndian.INT_SIZE;
-    dymLineOrHeight = LittleEndian.getInt(buf, offset);
-  }
-
-  public ParagraphHeight()
-  {
-
-  }
-
-  public void write(OutputStream out)
-    throws IOException
-  {
-    out.write(toByteArray());
-  }
-
-  protected byte[] toByteArray()
-  {
-    byte[] buf = new byte[12];
-    int offset = 0;
-    LittleEndian.putShort(buf, offset, infoField);
-    offset += LittleEndian.SHORT_SIZE;
-    LittleEndian.putShort(buf, offset, reserved);
-    offset += LittleEndian.SHORT_SIZE;
-    LittleEndian.putInt(buf, offset, dxaCol);
-    offset += LittleEndian.INT_SIZE;
-    LittleEndian.putInt(buf, offset, dymLineOrHeight);
-
-    return buf;
-  }
-
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof ParagraphHeight)) return false;
-    ParagraphHeight ph = (ParagraphHeight)o;
-
-    return infoField == ph.infoField && reserved == ph.reserved &&
-           dxaCol == ph.dxaCol && dymLineOrHeight == ph.dymLineOrHeight;
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
deleted file mode 100644
index 7cbca8e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherBlipRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherRecordFactory;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Holds information about all pictures embedded in Word Document either via "Insert -> Picture -> From File" or via
- * clipboard. Responsible for images extraction and determining whether some document's piece contains embedded image.
- * Analyzes raw data bytestream 'Data' (where Word stores all embedded objects) provided by HWPFDocument.
- *
- * Word stores images as is within so called "Data stream" - the stream within a Word docfile containing various data
- * that hang off of characters in the main stream. For example, binary data describing in-line pictures and/or
- * formfields an also embedded objects-native data. Word picture structures are concatenated one after the other in
- * the data stream if the document contains pictures.
- * Data stream is easily reachable via HWPFDocument._dataStream property.
- * A picture is represented in the document text stream as a special character, an Unicode \u0001 whose
- * CharacterRun.isSpecial() returns true. The file location of the picture in the Word binary file is accessed
- * via CharacterRun.getPicOffset(). The CharacterRun.getPicOffset() is a byte offset into the data stream.
- * Beginning at the position recorded in picOffset, a header data structure, will be stored.
- *
- * @author Dmitry Romanov
- */
-@Internal
-public final class PicturesTable
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( PicturesTable.class );
-    
-  static final int TYPE_IMAGE = 0x08;
-  static final int TYPE_IMAGE_WORD2000 = 0x00;
-  static final int TYPE_IMAGE_PASTED_FROM_CLIPBOARD = 0xA;
-  static final int TYPE_IMAGE_PASTED_FROM_CLIPBOARD_WORD2000 = 0x2;
-  static final int TYPE_HORIZONTAL_LINE = 0xE;
-  static final int BLOCK_TYPE_OFFSET = 0xE;
-  static final int MM_MODE_TYPE_OFFSET = 0x6;
-
-  private HWPFDocument _document;
-  private byte[] _dataStream;
-  private byte[] _mainStream;
-  @Deprecated
-  private FSPATable _fspa;
-  @Deprecated
-  private EscherRecordHolder _dgg;
-
-  /** @link dependency
-   * @stereotype instantiate*/
-  /*# Picture lnkPicture; */
-
-  /**
-   *
-   * @param _document
-   * @param _dataStream
-   */
-  @Deprecated
-  public PicturesTable(HWPFDocument _document, byte[] _dataStream, byte[] _mainStream, FSPATable fspa, EscherRecordHolder dgg)
-  {
-    this._document = _document;
-    this._dataStream = _dataStream;
-    this._mainStream = _mainStream;
-    this._fspa = fspa;
-    this._dgg = dgg;
-  }
-
-    public PicturesTable( HWPFDocument _document, byte[] _dataStream,
-            byte[] _mainStream )
-    {
-        this._document = _document;
-        this._dataStream = _dataStream;
-        this._mainStream = _mainStream;
-    }
-
-  /**
-   * determines whether specified CharacterRun contains reference to a picture
-   * @param run
-   */
-  public boolean hasPicture(CharacterRun run) {
-    if (run==null) {
-        return false;
-    }
-
-    if (run.isSpecialCharacter() && !run.isObj() && !run.isOle2() && !run.isData()) {
-       // Image should be in it's own run, or in a run with the end-of-special marker
-       if("\u0001".equals(run.text()) || "\u0001\u0015".equals(run.text())) {
-          return isBlockContainsImage(run.getPicOffset());
-       }
-    }
-    return false;
-  }
-
-  public boolean hasEscherPicture(CharacterRun run) {
-    if (run.isSpecialCharacter() && !run.isObj() && !run.isOle2() && !run.isData() && run.text().startsWith("\u0008")) {
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * determines whether specified CharacterRun contains reference to a picture
-   * @param run
-  */
-  public boolean hasHorizontalLine(CharacterRun run) {
-    if (run.isSpecialCharacter() && "\u0001".equals(run.text())) {
-      return isBlockContainsHorizontalLine(run.getPicOffset());
-    }
-    return false;
-  }
-
-  private boolean isPictureRecognized(short blockType, short mappingModeOfMETAFILEPICT) {
-    return (blockType == TYPE_IMAGE || blockType == TYPE_IMAGE_PASTED_FROM_CLIPBOARD || (blockType==TYPE_IMAGE_WORD2000 && mappingModeOfMETAFILEPICT==0x64) || (blockType==TYPE_IMAGE_PASTED_FROM_CLIPBOARD_WORD2000 && mappingModeOfMETAFILEPICT==0x64));
-  }
-
-  private static short getBlockType(byte[] dataStream, int pictOffset) {
-    return LittleEndian.getShort(dataStream, pictOffset + BLOCK_TYPE_OFFSET);
-  }
-
-  private static short getMmMode(byte[] dataStream, int pictOffset) {
-    return LittleEndian.getShort(dataStream, pictOffset + MM_MODE_TYPE_OFFSET);
-  }
-
-  /**
-   * Returns picture object tied to specified CharacterRun
-   * @param run
-   * @param fillBytes if true, Picture will be returned with filled byte array that represent picture's contents. If you don't want
-   * to have that byte array in memory but only write picture's contents to stream, pass false and then use Picture.writeImageContent
-   * @see Picture#writeImageContent(java.io.OutputStream)
-   * @return a Picture object if picture exists for specified CharacterRun, null otherwise. PicturesTable.hasPicture is used to determine this.
-   * @see #hasPicture(org.apache.poi.hwpf.usermodel.CharacterRun)
-   */
-  public Picture extractPicture(CharacterRun run, boolean fillBytes) {
-    if (hasPicture(run)) {
-      return new Picture(run.getPicOffset(), _dataStream, fillBytes);
-    }
-    return null;
-  }
-
-  /**
-     * Performs a recursive search for pictures in the given list of escher records.
-     *
-     * @param escherRecords the escher records.
-     * @param pictures the list to populate with the pictures.
-     */
-    private void searchForPictures(List<EscherRecord> escherRecords, List<Picture> pictures)
-    {
-       for(EscherRecord escherRecord : escherRecords) {
-          if (escherRecord instanceof EscherBSERecord) {
-              EscherBSERecord bse = (EscherBSERecord) escherRecord;
-              EscherBlipRecord blip = bse.getBlipRecord();
-              if (blip != null)
-              {
-                  pictures.add(new Picture(blip));
-              }
-                else if ( bse.getOffset() > 0 )
-                {
-                    try
-                    {
-                        // Blip stored in delay stream, which in a word doc, is
-                        // the main stream
-                        EscherRecordFactory recordFactory = new DefaultEscherRecordFactory();
-                        EscherRecord record = recordFactory.createRecord(
-                                _mainStream, bse.getOffset() );
-
-                        if ( record instanceof EscherBlipRecord )
-                        {
-                            record.fillFields( _mainStream, bse.getOffset(),
-                                    recordFactory );
-                            blip = (EscherBlipRecord) record;
-                            pictures.add( new Picture( blip ) );
-                        }
-                    }
-                    catch ( Exception exc )
-                    {
-                        logger.log(
-                                POILogger.WARN,
-                                "Unable to load picture from BLIB record at offset #",
-                                Integer.valueOf( bse.getOffset() ), exc );
-                    }
-                }
-          }
-
-          // Recursive call.
-          searchForPictures(escherRecord.getChildRecords(), pictures);
-       }
-    }
-
-  /**
-   * Not all documents have all the images concatenated in the data stream
-   * although MS claims so. The best approach is to scan all character runs.
-   *
-   * @return a list of Picture objects found in current document
-   */
-  public List<Picture> getAllPictures() {
-    ArrayList<Picture> pictures = new ArrayList<Picture>();
-
-    Range range = _document.getOverallRange();
-    for (int i = 0; i < range.numCharacterRuns(); i++) {
-    	CharacterRun run = range.getCharacterRun(i);
-
-        if (run==null) {
-            continue;
-        }
-
-    	Picture picture = extractPicture(run, false);
-    	if (picture != null) {
-    		pictures.add(picture);
-    	}
-	}
-
-    searchForPictures(_dgg.getEscherRecords(), pictures);
-
-    return pictures;
-  }
-
-  private boolean isBlockContainsImage(int i)
-  {
-    return isPictureRecognized(getBlockType(_dataStream, i), getMmMode(_dataStream, i));
-  }
-
-  private boolean isBlockContainsHorizontalLine(int i)
-  {
-    return getBlockType(_dataStream, i)==TYPE_HORIZONTAL_LINE && getMmMode(_dataStream, i)==0x64;
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
deleted file mode 100644
index a190f1d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class PieceDescriptor
-{
-
-  short descriptor;
-   private static BitField fNoParaLast = BitFieldFactory.getInstance(0x01);
-   private static BitField fPaphNil = BitFieldFactory.getInstance(0x02);
-   private static BitField fCopied = BitFieldFactory.getInstance(0x04);
-  int fc;
-  PropertyModifier prm;
-  boolean unicode;
-
-
-  public PieceDescriptor(byte[] buf, int offset)
-  {
-    descriptor = LittleEndian.getShort(buf, offset);
-    offset += LittleEndian.SHORT_SIZE;
-    fc = LittleEndian.getInt(buf, offset);
-    offset += LittleEndian.INT_SIZE;
-    prm = new PropertyModifier( LittleEndian.getShort(buf, offset));
-
-    // see if this piece uses unicode.
-    if ((fc & 0x40000000) == 0)
-    {
-        unicode = true;
-    }
-    else
-    {
-        unicode = false;
-        fc &= ~(0x40000000);//gives me FC in doc stream
-        fc /= 2;
-    }
-
-  }
-
-  public int getFilePosition()
-  {
-    return fc;
-  }
-
-  public void setFilePosition(int pos)
-  {
-    fc = pos;
-  }
-
-  public boolean isUnicode()
-  {
-    return unicode;
-  }
-
-    public PropertyModifier getPrm()
-    {
-        return prm;
-    }
-
-  protected byte[] toByteArray()
-  {
-    // set up the fc
-    int tempFc = fc;
-    if (!unicode)
-    {
-      tempFc *= 2;
-      tempFc |= (0x40000000);
-    }
-
-    int offset = 0;
-    byte[] buf = new byte[8];
-    LittleEndian.putShort(buf, offset, descriptor);
-    offset += LittleEndian.SHORT_SIZE;
-    LittleEndian.putInt(buf, offset, tempFc);
-    offset += LittleEndian.INT_SIZE;
-    LittleEndian.putShort(buf, offset, prm.getValue());
-
-    return buf;
-
-  }
-
-  public static int getSizeInBytes()
-  {
-    return 8;
-  }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + descriptor;
-        result = prime * result + ( ( prm == null ) ? 0 : prm.hashCode() );
-        result = prime * result + ( unicode ? 1231 : 1237 );
-        return result;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        PieceDescriptor other = (PieceDescriptor) obj;
-        if ( descriptor != other.descriptor )
-            return false;
-        if ( prm == null )
-        {
-            if ( other.prm != null )
-                return false;
-        }
-        else if ( !prm.equals( other.prm ) )
-            return false;
-        if ( unicode != other.unicode )
-            return false;
-        return true;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "PieceDescriptor (pos: " + getFilePosition() + "; "
-                + ( isUnicode() ? "unicode" : "non-unicode" ) + "; prm: "
-                + getPrm() + ")";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
deleted file mode 100644
index 66a667d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Plex of CPs stored in File (PLCF)
- * 
- * common data structure in a Word file. Contains an array of 4 byte ints in the
- * front that relate to an array of arbitrary data structures in the back.
- * 
- * See page 184 of official documentation for details
- * 
- * @author Ryan Ackley
- */
-public final class PlexOfCps
-{
-    private int _iMac;
-    private int _offset;
-    private int _cbStruct;
-    private List<GenericPropertyNode> _props;
-
-    public PlexOfCps( int sizeOfStruct )
-    {
-        _props = new ArrayList<GenericPropertyNode>();
-        _cbStruct = sizeOfStruct;
-    }
-
-    /**
-     * Constructor
-     * 
-     * @param cb
-     *            The size of PLCF in bytes
-     * @param cbStruct
-     *            The size of the data structure type stored in this PlexOfCps.
-     */
-    public PlexOfCps( byte[] buf, int start, int cb, int cbStruct )
-    {
-        // Figure out the number we hold
-        _iMac = ( cb - 4 ) / ( 4 + cbStruct );
-
-        _cbStruct = cbStruct;
-        _props = new ArrayList<GenericPropertyNode>( _iMac );
-
-        for ( int x = 0; x < _iMac; x++ )
-        {
-            _props.add( getProperty( x, buf, start ) );
-        }
-    }
-
-    @Internal
-    void adjust( int startCp, int shift )
-    {
-        for ( GenericPropertyNode node : _props )
-        {
-            if ( node.getStart() > startCp )
-            {
-                if ( node.getStart() + shift < startCp )
-                {
-                    node.setStart( startCp );
-                }
-                else
-                {
-                    node.setStart( node.getStart() + shift );
-                }
-            }
-            if ( node.getEnd() >= startCp )
-            {
-                if ( node.getEnd() + shift < startCp )
-                {
-                    node.setEnd( startCp );
-                }
-                else
-                {
-                    node.setEnd( node.getEnd() + shift );
-                }
-            }
-        }
-    }
-
-    public GenericPropertyNode getProperty( int index )
-    {
-        return _props.get( index );
-    }
-
-    public void addProperty( GenericPropertyNode node )
-    {
-        _props.add( node );
-        _iMac++;
-    }
-
-    void remove( int index )
-    {
-        _props.remove( index );
-        _iMac--;
-    }
-
-    public byte[] toByteArray()
-    {
-        int size = _props.size();
-        int cpBufSize = ( ( size + 1 ) * LittleEndian.INT_SIZE );
-        int structBufSize = +( _cbStruct * size );
-        int bufSize = cpBufSize + structBufSize;
-
-        byte[] buf = new byte[bufSize];
-
-        GenericPropertyNode node = null;
-        for ( int x = 0; x < size; x++ )
-        {
-            node = _props.get( x );
-
-            // put the starting offset of the property into the plcf.
-            LittleEndian.putInt( buf, ( LittleEndian.INT_SIZE * x ),
-                    node.getStart() );
-
-            // put the struct into the plcf
-            System.arraycopy( node.getBytes(), 0, buf, cpBufSize
-                    + ( x * _cbStruct ), _cbStruct );
-        }
-        // put the ending offset of the last property into the plcf.
-        LittleEndian.putInt( buf, LittleEndian.INT_SIZE * size, node.getEnd() );
-
-        return buf;
-
-    }
-
-    private GenericPropertyNode getProperty( int index, byte[] buf, int offset )
-    {
-        int start = LittleEndian.getInt( buf, offset + getIntOffset( index ) );
-        int end = LittleEndian.getInt( buf, offset + getIntOffset( index + 1 ) );
-
-        byte[] struct = new byte[_cbStruct];
-        System.arraycopy( buf, offset + getStructOffset( index ), struct, 0,
-                _cbStruct );
-
-        return new GenericPropertyNode( start, end, struct );
-    }
-
-    private int getIntOffset( int index )
-    {
-        return index * 4;
-    }
-
-    /**
-     * returns the number of data structures in this PlexofCps.
-     * 
-     * @return The number of data structures in this PlexofCps
-     */
-    public int length()
-    {
-        return _iMac;
-    }
-
-    /**
-     * Returns the offset, in bytes, from the beginning if this PlexOfCps to the
-     * data structure at index.
-     * 
-     * @param index
-     *            The index of the data structure.
-     * 
-     * @return The offset, in bytes, from the beginning if this PlexOfCps to the
-     *         data structure at index.
-     */
-    private int getStructOffset( int index )
-    {
-        return ( 4 * ( _iMac + 1 ) ) + ( _cbStruct * index );
-    }
-
-    GenericPropertyNode[] toPropertiesArray()
-    {
-        if ( _props == null || _props.isEmpty() )
-            return new GenericPropertyNode[0];
-
-        return _props.toArray( new GenericPropertyNode[_props.size()] );
-    }
-
-    @Override
-    public String toString()
-    {
-        return "PLCF (cbStruct: " + _cbStruct + "; iMac: " + _iMac + ")";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java
deleted file mode 100644
index 70e9fb1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Locale;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Structure describing the Plex for fields (contained plclfd* in the spec).
- * 
- * @author Cedric Bosdonnat <cbosdonnat@novell.com>
- */
-@Internal
-public class PlexOfField
-{
-
-    private final GenericPropertyNode propertyNode;
-    private final FieldDescriptor fld;
-
-    @Deprecated
-    public PlexOfField( int fcStart, int fcEnd, byte[] data )
-    {
-        propertyNode = new GenericPropertyNode( fcStart, fcEnd, data );
-        fld = new FieldDescriptor( data );
-    }
-
-    public PlexOfField( GenericPropertyNode propertyNode )
-    {
-        this.propertyNode = propertyNode;
-        fld = new FieldDescriptor( propertyNode.getBytes() );
-    }
-
-    public int getFcStart()
-    {
-        return propertyNode.getStart();
-    }
-
-    public int getFcEnd()
-    {
-        return propertyNode.getEnd();
-    }
-
-    public FieldDescriptor getFld()
-    {
-        return fld;
-    }
-
-    public String toString() {
-        String str = String.format(Locale.ROOT, "[%d, %d) - FLD - 0x%x; 0x%x"
-            , getFcStart(), getFcEnd(), fld.getBoundaryType(), fld.getFlt());
-        return str;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java
deleted file mode 100644
index 90618da..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.NoSuchElementException;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * The PlfLfo structure contains the list format override data for the document.
- * <p>
- * Documentation quoted from Page 424 of 621. [MS-DOC] -- v20110315 Word (.doc)
- * Binary File Format
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class PlfLfo
-{
-    private static POILogger log = POILogFactory.getLogger( PlfLfo.class );
-
-    /**
-     * An unsigned integer that specifies the count of elements in both the
-     * rgLfo and rgLfoData arrays.
-     */
-    private int _lfoMac;
-
-    private LFO[] _rgLfo;
-
-    private LFOData[] _rgLfoData;
-
-    
-    PlfLfo( byte[] tableStream, int fcPlfLfo, int lcbPlfLfo )
-    {
-        /*
-         * The PlfLfo structure contains the list format override data for the
-         * document. -- Page 424 of 621. [MS-DOC] -- v20110315 Word (.doc)
-         * Binary File Format
-         */
-        int offset = fcPlfLfo;
-
-        /*
-         * lfoMac (4 bytes): An unsigned integer that specifies the count of
-         * elements in both the rgLfo and rgLfoData arrays. -- Page 424 of 621.
-         * [MS-DOC] -- v20110315 Word (.doc) Binary File Format
-         */
-        long lfoMacLong = LittleEndian.getUInt( tableStream, offset );
-        offset += LittleEndian.INT_SIZE;
-
-        if ( lfoMacLong > Integer.MAX_VALUE )
-        {
-            throw new UnsupportedOperationException(
-                    "Apache POI doesn't support rgLfo/rgLfoData size large than "
-                            + Integer.MAX_VALUE + " elements" );
-        }
-
-        this._lfoMac = (int) lfoMacLong;
-        _rgLfo = new LFO[_lfoMac];
-        _rgLfoData = new LFOData[_lfoMac];
-
-        /*
-         * An array of LFO structures. The number of elements in this array is
-         * specified by lfoMac. -- Page 424 of 621. [MS-DOC] -- v20110315 Word
-         * (.doc) Binary File Format
-         */
-        for ( int x = 0; x < _lfoMac; x++ )
-        {
-            LFO lfo = new LFO( tableStream, offset );
-            offset += LFO.getSize();
-            _rgLfo[x] = lfo;
-        }
-
-        /*
-         * An array of LFOData that is parallel to rgLfo. The number of elements
-         * that are contained in this array is specified by lfoMac. -- Page 424
-         * of 621. [MS-DOC] -- v20110315 Word (.doc) Binary File Format
-         */
-        for ( int x = 0; x < _lfoMac; x++ )
-        {
-            LFOData lfoData = new LFOData( tableStream, offset,
-                    _rgLfo[x].getClfolvl() );
-            offset += lfoData.getSizeInBytes();
-            _rgLfoData[x] = lfoData;
-        }
-
-        if ( ( offset - fcPlfLfo ) != lcbPlfLfo )
-        {
-            if (log.check(POILogger.WARN)) {
-                log.log(POILogger.WARN, "Actual size of PlfLfo is "
-                        + (offset - fcPlfLfo) + " bytes, but expected "
-                        + lcbPlfLfo);
-            }
-        }
-    }
-
-    void add( LFO lfo, LFOData lfoData )
-    {
-        // _lfoMac is the size of the array
-        _rgLfo = Arrays.copyOf(_rgLfo, _lfoMac + 1);
-        _rgLfo[_lfoMac] = lfo;
-
-        _rgLfoData = Arrays.copyOf(_rgLfoData, _lfoMac + 1);
-        _rgLfoData[_lfoMac] = lfoData;
-
-        _lfoMac = _lfoMac + 1;
-    }
-
-    @Override
-    public boolean equals( Object obj ) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        PlfLfo other = (PlfLfo) obj;
-        return _lfoMac == other._lfoMac &&
-                Arrays.equals(_rgLfo, other._rgLfo) &&
-                Arrays.equals(_rgLfoData, other._rgLfoData);
-    }
-
-    /**
-     * An unsigned integer that specifies the count of elements in both the
-     * rgLfo and rgLfoData arrays.
-     */
-    public int getLfoMac()
-    {
-        return _lfoMac;
-    }
-
-    public int getIlfoByLsid( int lsid )
-    {
-        for ( int i = 0; i < _lfoMac; i++ )
-        {
-            if ( _rgLfo[i].getLsid() == lsid )
-            {
-                return i + 1;
-            }
-        }
-        throw new NoSuchElementException( "LFO with lsid " + lsid
-                + " not found" );
-    }
-
-    /**
-     * @param ilfo 1-based index
-     * @return The {@link LFO} stored at the given index
-     * @throws NoSuchElementException
-     */
-    public LFO getLfo( int ilfo ) throws NoSuchElementException
-    {
-        if ( ilfo <= 0 || ilfo > _lfoMac )
-        {
-            throw new NoSuchElementException( "LFO with ilfo " + ilfo
-                    + " not found. lfoMac is " + _lfoMac );
-        }
-        return _rgLfo[ilfo - 1];
-    }
-
-    /**
-     * @param ilfo 1-based index
-     * @return The {@link LFOData} stored at the given index
-     * @throws NoSuchElementException
-     */
-    public LFOData getLfoData( int ilfo ) throws NoSuchElementException
-    {
-        if ( ilfo <= 0 || ilfo > _lfoMac )
-        {
-            throw new NoSuchElementException( "LFOData with ilfo " + ilfo
-                    + " not found. lfoMac is " + _lfoMac );
-        }
-        return _rgLfoData[ilfo - 1];
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + _lfoMac;
-        result = prime * result + Arrays.hashCode( _rgLfo );
-        result = prime * result + Arrays.hashCode( _rgLfoData );
-        return result;
-    }
-
-    void writeTo( FileInformationBlock fib, HWPFOutputStream outputStream )
-            throws IOException
-    {
-        final int offset = outputStream.getOffset();
-        fib.setFcPlfLfo( offset );
-
-        LittleEndian.putUInt( _lfoMac, outputStream );
-
-        byte[] bs = new byte[LFO.getSize() * _lfoMac];
-        for ( int i = 0; i < _lfoMac; i++ )
-        {
-            _rgLfo[i].serialize( bs, i * LFO.getSize() );
-        }
-        outputStream.write( bs, 0, LFO.getSize() * _lfoMac );
-
-        for ( int i = 0; i < _lfoMac; i++ )
-        {
-            _rgLfoData[i].writeTo( outputStream );
-        }
-        fib.setLcbPlfLfo( outputStream.getOffset() - offset );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java
deleted file mode 100644
index 4ea4ace..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class PropertyModifier implements Cloneable
-{
-    /**
-     * <li>"Set to 0 for variant 1" <li>"Set to 1 for variant 2"
-     */
-    private static BitField _fComplex = new BitField( 0x0001 );
-
-    /**
-     * "Index to a grpprl stored in CLX portion of file"
-     */
-    private static BitField _figrpprl = new BitField( 0xfffe );
-
-    /**
-     * "Index to entry into rgsprmPrm"
-     */
-    private static BitField _fisprm = new BitField( 0x00fe );
-
-    /**
-     * "sprm's operand"
-     */
-    private static BitField _fval = new BitField( 0xff00 );
-
-    private short value;
-
-    public PropertyModifier( short value )
-    {
-        this.value = value;
-    }
-
-    @Override
-    protected PropertyModifier clone() throws CloneNotSupportedException
-    {
-        return new PropertyModifier( value );
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        PropertyModifier other = (PropertyModifier) obj;
-        if ( value != other.value )
-            return false;
-        return true;
-    }
-
-    /**
-     * "Index to a grpprl stored in CLX portion of file"
-     */
-    public short getIgrpprl()
-    {
-        if ( !isComplex() )
-            throw new IllegalStateException( "Not complex" );
-
-        return _figrpprl.getShortValue( value );
-    }
-
-    public short getIsprm()
-    {
-        if ( isComplex() )
-            throw new IllegalStateException( "Not simple" );
-
-        return _fisprm.getShortValue( value );
-    }
-
-    public short getVal()
-    {
-        if ( isComplex() )
-            throw new IllegalStateException( "Not simple" );
-
-        return _fval.getShortValue( value );
-    }
-
-    public short getValue()
-    {
-        return value;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + value;
-        return result;
-    }
-
-    public boolean isComplex()
-    {
-        return _fComplex.isSet( value );
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append( "[PRM] (complex: " );
-        stringBuilder.append( isComplex() );
-        stringBuilder.append( "; " );
-        if ( isComplex() )
-        {
-            stringBuilder.append( "igrpprl: " );
-            stringBuilder.append( getIgrpprl() );
-            stringBuilder.append( "; " );
-        }
-        else
-        {
-            stringBuilder.append( "isprm: " );
-            stringBuilder.append( getIsprm() );
-            stringBuilder.append( "; " );
-            stringBuilder.append( "val: " );
-            stringBuilder.append( getVal() );
-            stringBuilder.append( "; " );
-        }
-        stringBuilder.append( ")" );
-        return stringBuilder.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
deleted file mode 100644
index d7de7b3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Represents a lightweight node in the Trees used to store content
- *  properties.
- * This only ever works in characters. For the few odd cases when
- *  the start and end aren't in characters (eg PAPX and CHPX), use
- *  {@link BytePropertyNode} between you and this.
- *
- * @author Ryan Ackley
- */
-@Internal
-public abstract class PropertyNode<T extends PropertyNode<T>>  implements Comparable<T>, Cloneable
-{
-
-    public static final class EndComparator implements
-            Comparator<PropertyNode<?>>
-    {
-        public static final EndComparator instance = new EndComparator();
-
-        public int compare( PropertyNode<?> o1, PropertyNode<?> o2 )
-        {
-            int thisVal = o1.getEnd();
-            int anotherVal = o2.getEnd();
-            return ( thisVal < anotherVal ? -1 : ( thisVal == anotherVal ? 0
-                    : 1 ) );
-        }
-    }
-
-    public static final class StartComparator implements
-            Comparator<PropertyNode<?>>
-    {
-        public static final StartComparator instance = new StartComparator();
-
-        public int compare( PropertyNode<?> o1, PropertyNode<?> o2 )
-        {
-            int thisVal = o1.getStart();
-            int anotherVal = o2.getStart();
-            return ( thisVal < anotherVal ? -1 : ( thisVal == anotherVal ? 0
-                    : 1 ) );
-        }
-    }
-
-  private final static POILogger _logger = POILogFactory.getLogger(PropertyNode.class);
-  protected Object _buf;
-  /** The start, in characters */
-  private int _cpStart;
-  /** The end, in characters */
-  private int _cpEnd;
-
-
-  /**
-   * @param fcStart The start of the text for this property, in characters.
-   * @param fcEnd The end of the text for this property, in characters.
-   * @param buf FIXME: Old documentation is: "grpprl The property description in compressed form."
-   */
-  protected PropertyNode(int fcStart, int fcEnd, Object buf)
-  {
-      _cpStart = fcStart;
-      _cpEnd = fcEnd;
-      _buf = buf;
-
-      if(_cpStart < 0) {
-    	  _logger.log(POILogger.WARN, "A property claimed to start before zero, at " + _cpStart + "! Resetting it to zero, and hoping for the best");
-    	  _cpStart = 0;
-      }
-
-        if ( _cpEnd < _cpStart )
-        {
-            _logger.log( POILogger.WARN, "A property claimed to end (" + _cpEnd
-                    + ") before start! "
-                    + "Resetting end to start, and hoping for the best" );
-            _cpEnd = _cpStart;
-        }
-    }
-
-  /**
-   * @return The start offset of this property's text.
-   */
-  public int getStart()
-  {
-      return _cpStart;
-  }
-
-  public void setStart(int start)
-  {
-    _cpStart = start;
-  }
-
-  /**
-   * @return The offset of the end of this property's text.
-   */
-  public int getEnd()
-  {
-    return _cpEnd;
-  }
-
-  public void setEnd(int end)
-  {
-    _cpEnd = end;
-  }
-
-  /**
-   * Adjust for a deletion that can span multiple PropertyNodes.
-   * @param start
-   * @param length
-   */
-  public void adjustForDelete(int start, int length)
-  {
-    int end = start + length;
-
-    if (_cpEnd > start) {
-        // The start of the change is before we end
-
-        if (_cpStart < end) {
-            // The delete was somewhere in the middle of us
-            _cpEnd = end >= _cpEnd ? start : _cpEnd - length;
-            _cpStart = Math.min(start, _cpStart);
-        } else {
-            // The delete was before us
-            _cpEnd -= length;
-            _cpStart -= length;
-        }
-    }
-  }
-
-  protected boolean limitsAreEqual(Object o)
-  {
-    return ((PropertyNode<?>)o).getStart() == _cpStart &&
-           ((PropertyNode<?>)o).getEnd() == _cpEnd;
-
-  }
-
-    @Override
-    public int hashCode()
-    {
-        return this._cpStart * 31 + this._buf.hashCode();
-    }
-
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof PropertyNode)) return false;
-
-    if (limitsAreEqual(o))
-    {
-      Object testBuf = ((PropertyNode<?>)o)._buf;
-      if (testBuf instanceof byte[] && _buf instanceof byte[])
-      {
-        return Arrays.equals((byte[])testBuf, (byte[])_buf);
-      }
-      return _buf.equals(testBuf);
-    }
-    return false;
-  }
-
-  @SuppressWarnings("unchecked")
-  public T clone() throws CloneNotSupportedException
-  {
-    return (T) super.clone();
-  }
-
-  /**
-   * Used for sorting in collections.
-   */
-  public int compareTo(T o)
-  {
-      int cpEnd = o.getEnd();
-      if(_cpEnd == cpEnd)
-      {
-        return 0;
-      }
-      else if(_cpEnd < cpEnd)
-      {
-        return -1;
-      }
-      else
-      {
-        return 1;
-      }
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
deleted file mode 100644
index b1347d0..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-
-/**
- * String table containing the names of authors of revision marks, e-mails and
- * comments in this document.
- * 
- * @author Ryan Lauck
- */
-@Internal
-public final class RevisionMarkAuthorTable {
-	/**
-	 * Array of entries.
-	 */
-	private String[] entries;
-
-	/**
-	 * Constructor to read the table from the table stream.
-	 * 
-	 * @param tableStream the table stream.
-	 * @param offset the offset into the byte array.
-	 * @param size the size of the table in the byte array.
-	 */
-    public RevisionMarkAuthorTable( byte[] tableStream, int offset, int size )
-            throws IOException
-    {
-        entries = SttbUtils.readSttbfRMark( tableStream, offset );
-    }
-
-	/**
-	 * Gets the entries. The returned list cannot be modified.
-	 * 
-	 * @return the list of entries.
-	 */
-	public List<String> getEntries() {
-		return Collections.unmodifiableList(Arrays.asList(entries));
-	}
-	
-	/**
-	 * Get an author by its index.  Returns null if it does not exist.
-	 * 
-	 * @return the revision mark author
-	 */
-	public String getAuthor(int index) {
-		String auth = null;
-		if(index >= 0 && index < entries.length) {
-			auth = entries[index];
-		}
-		return auth;
-	}
-	
-	/**
-	 * Gets the number of entries.
-	 * 
-	 * @return the number of entries.
-	 */
-	public int getSize() {
-		return entries.length;
-	}
-
-	/**
-	 * Writes this table to the table stream.
-	 * 
-	 * @param tableStream  the table stream to write to.
-	 * @throws IOException  if an error occurs while writing.
-	 */
-    public void writeTo( HWPFOutputStream tableStream ) throws IOException
-    {
-        SttbUtils.writeSttbfRMark( entries, tableStream );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java
deleted file mode 100644
index b9bdff1..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.sprm.SectionSprmCompressor;
-import org.apache.poi.hwpf.sprm.SectionSprmUncompressor;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.hwpf.usermodel.SectionProperties;
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class SEPX extends PropertyNode<SEPX>
-{
-
-    SectionProperties sectionProperties;
-
-    SectionDescriptor _sed;
-
-    public SEPX( SectionDescriptor sed, int start, int end, byte[] grpprl )
-    {
-        super( start, end, new SprmBuffer( grpprl, 0 ) );
-        _sed = sed;
-    }
-
-    public byte[] getGrpprl()
-    {
-        if ( sectionProperties != null )
-        {
-            byte[] grpprl = SectionSprmCompressor
-                    .compressSectionProperty( sectionProperties );
-            _buf = new SprmBuffer( grpprl, 0 );
-        }
-
-        return ( (SprmBuffer) _buf ).toByteArray();
-    }
-
-    public SectionDescriptor getSectionDescriptor()
-    {
-        return _sed;
-    }
-
-    public SectionProperties getSectionProperties()
-    {
-        if ( sectionProperties == null )
-        {
-            sectionProperties = SectionSprmUncompressor.uncompressSEP(
-                    ( (SprmBuffer) _buf ).toByteArray(), 0 );
-        }
-        return sectionProperties;
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if (!(o instanceof SEPX)) return false;
-        SEPX sepx = (SEPX) o;
-        if ( super.equals( o ) )
-        {
-            return sepx._sed.equals( _sed );
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        assert false : "hashCode not designed";
-        return 42; // any arbitrary constant will do
-    }
-
-    public String toString()
-    {
-        return "SEPX from " + getStart() + " to " + getEnd();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java
deleted file mode 100644
index 2e15092..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-
-/**
- * A single entry in the {@link SavedByTable}.
- *
- * @author Daniel Noll
- */
-@Internal
-public final class SavedByEntry
-{
-  private String userName;
-  private String saveLocation;
-
-  public SavedByEntry(String userName, String saveLocation)
-  {
-    this.userName = userName;
-    this.saveLocation = saveLocation;
-  }
-
-  public String getUserName()
-  {
-    return userName;
-  }
-
-  public String getSaveLocation()
-  {
-    return saveLocation;
-  }
-
-  /**
-   * Compares this object with another, for equality.
-   *
-   * @param other the object to compare to this one.
-   * @return <code>true</code> iff the other object is equal to this one.
-   */
-  public boolean equals(Object other)
-  {
-    if (other == this) return true;
-    if (!(other instanceof SavedByEntry)) return false;
-    SavedByEntry that = (SavedByEntry) other;
-    return that.userName.equals(userName) &&
-           that.saveLocation.equals(saveLocation);
-  }
-
-  /**
-   * Generates a hash code for consistency with {@link #equals(Object)}.
-   *
-   * @return the hash code.
-   */
-  public int hashCode()
-  {
-    int hash = 29;
-    hash = hash * 13 + userName.hashCode();
-    hash = hash * 13 + saveLocation.hashCode();
-    return hash;
-  }
-
-  /**
-   * Returns a string for display.
-   *
-   * @return the string.
-   */
-  public String toString()
-  {
-    return "SavedByEntry[userName=" + getUserName() +
-                       ",saveLocation=" + getSaveLocation() + "]";
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java
deleted file mode 100644
index 87c7a8e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-
-/**
- * String table containing the history of the last few revisions ("saves") of
- * the document. Read-only for the time being.
- * 
- * @author Daniel Noll
- */
-@Internal
-public final class SavedByTable
-{
-    /**
-     * Array of entries.
-     */
-    private SavedByEntry[] entries;
-
-    /**
-     * Constructor to read the table from the table stream.
-     * 
-     * @param tableStream
-     *            the table stream.
-     * @param offset
-     *            the offset into the byte array.
-     * @param size
-     *            the size of the table in the byte array.
-     */
-    public SavedByTable( byte[] tableStream, int offset, int size )
-    {
-        String[] strings = SttbUtils.readSttbSavedBy( tableStream, offset );
-        int numEntries = strings.length / 2;
-        entries = new SavedByEntry[numEntries];
-        for ( int i = 0; i < numEntries; i++ )
-        {
-            entries[i] = new SavedByEntry( strings[i * 2], strings[i * 2 + 1] );
-        }
-    }
-
-    /**
-     * Gets the entries. The returned list cannot be modified.
-     * 
-     * @return the list of entries.
-     */
-    public List<SavedByEntry> getEntries()
-    {
-        return Collections.unmodifiableList( Arrays.asList( entries ) );
-    }
-
-    /**
-     * Writes this table to the table stream.
-     * 
-     * @param tableStream
-     *            the table stream to write to.
-     * @throws IOException
-     *             if an error occurs while writing.
-     */
-    public void writeTo( HWPFOutputStream tableStream ) throws IOException
-    {
-        String[] toSave = new String[entries.length * 2];
-        int counter = 0;
-        for ( SavedByEntry entry : entries )
-        {
-            toSave[counter++] = entry.getUserName();
-            toSave[counter++] = entry.getSaveLocation();
-        }
-        SttbUtils.writeSttbSavedBy( toSave, tableStream );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java
deleted file mode 100644
index fead9eb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Section Descriptor (SED)
- * 
- * See page 186 for details.
- */
-@Internal
-public final class SectionDescriptor
-{
-
-    /**
-     * "Used internally by Word"
-     */
-    private short fn;
-
-    /**
-     * "File offset in main stream to beginning of SEPX stored for section. If
-     * sed.fcSepx==0xFFFFFFFF, the section properties for the section are equal
-     * to the standard SEP (see SEP definition)."
-     */
-    private int fcSepx;
-    
-    /**
-     * "Used internally by Word"
-     */
-    private short fnMpr;
-
-    /**
-     * "Points to offset in FC space of main stream where the Macintosh Print
-     * Record for a document created on a Macintosh will be stored"
-     */
-    private int fcMpr;
-
-  public SectionDescriptor()
-  {
-  }
-
-  public SectionDescriptor(byte[] buf, int offset)
-  {
-    fn = LittleEndian.getShort(buf, offset);
-    offset += LittleEndian.SHORT_SIZE;
-    fcSepx = LittleEndian.getInt(buf, offset);
-    offset += LittleEndian.INT_SIZE;
-    fnMpr = LittleEndian.getShort(buf, offset);
-    offset += LittleEndian.SHORT_SIZE;
-    fcMpr = LittleEndian.getInt(buf, offset);
-  }
-
-  public int getFc()
-  {
-    return fcSepx;
-  }
-
-  public void setFc(int fc)
-  {
-    this.fcSepx = fc;
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof SectionDescriptor)) return false;
-    SectionDescriptor sed = (SectionDescriptor)o;
-    return sed.fn == fn && sed.fnMpr == fnMpr;
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-  
-  public byte[] toByteArray()
-  {
-    int offset = 0;
-    byte[] buf = new byte[12];
-
-    LittleEndian.putShort(buf, offset, fn);
-    offset += LittleEndian.SHORT_SIZE;
-    LittleEndian.putInt(buf, offset, fcSepx);
-    offset += LittleEndian.INT_SIZE;
-    LittleEndian.putShort(buf, offset, fnMpr);
-    offset += LittleEndian.SHORT_SIZE;
-    LittleEndian.putInt(buf, offset, fcMpr);
-
-    return buf;
-  }
-
-    @Override
-    public String toString()
-    {
-        return "[SED] (fn: " + fn + "; fcSepx: " + fcSepx + "; fnMpr: " + fnMpr
-                + "; fcMpr: " + fcMpr + ")";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
deleted file mode 100644
index ec93d56..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/* ====================================================================
-     Licensed to the Apache Software Foundation (ASF) under one or more
-     contributor license agreements.    See the NOTICE file distributed with
-     this work for additional information regarding copyright ownership.
-     The ASF licenses this file to You under the Apache License, Version 2.0
-     (the "License"); you may not use this file except in compliance with
-     the License.    You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * @author Ryan Ackley
- */
-@Internal
-public class SectionTable
-{
-    private final static POILogger _logger = POILogFactory.getLogger(SectionTable.class);
-    private static final int SED_SIZE = 12;
-
-    protected List<SEPX> _sections = new ArrayList<SEPX>();
-    protected List<TextPiece> _text;
-
-    /** So we can know if things are unicode or not */
-    //private TextPieceTable tpt;
-
-    public SectionTable()
-    {
-    }
-
-
-    public SectionTable(
-            byte[] documentStream, byte[] tableStream,
-            int offset, int size, int fcMin, TextPieceTable tpt, int mainLength)
-    {
-        PlexOfCps sedPlex = new PlexOfCps(tableStream, offset, size, SED_SIZE);
-        //this.tpt = tpt;
-        this._text = tpt.getTextPieces();
-
-        int length = sedPlex.length();
-
-        for (int x = 0; x < length; x++)
-        {
-            GenericPropertyNode node = sedPlex.getProperty(x);
-            SectionDescriptor sed = new SectionDescriptor(node.getBytes(), 0);
-
-            int fileOffset = sed.getFc();
-            // int startAt = CPtoFC(node.getStart());
-            // int endAt = CPtoFC(node.getEnd());
-            int startAt = node.getStart();
-            int endAt = node.getEnd();
-
-            // check for the optimization
-            if (fileOffset == 0xffffffff)
-            {
-                _sections.add(new SEPX(sed, startAt, endAt, new byte[0]));
-            }
-            else
-            {
-                // The first short at the offset is the size of the grpprl.
-                int sepxSize = LittleEndian.getShort(documentStream, fileOffset);
-                byte[] buf = new byte[sepxSize];
-                fileOffset += LittleEndian.SHORT_SIZE;
-                System.arraycopy(documentStream, fileOffset, buf, 0, buf.length);
-                _sections.add(new SEPX(sed, startAt, endAt, buf));
-            }
-        }
-
-        // Some files seem to lie about their unicode status, which
-        //    is very very pesky. Try to work around these, but this
-        //    is getting on for black magic...
-        int mainEndsAt = mainLength;
-        boolean matchAt = false;
-        boolean matchHalf = false;
-        for (int i=0; i<_sections.size(); i++) {
-            SEPX s = _sections.get(i);
-            if (s.getEnd() == mainEndsAt) {
-                matchAt = true;
-            } else if(s.getEnd() == mainEndsAt || s.getEnd() == mainEndsAt-1) {
-                matchHalf = true;
-            }
-        }
-        if(! matchAt && matchHalf) {
-            _logger.log(POILogger.WARN, "Your document seemed to be mostly unicode, but the section definition was in bytes! Trying anyway, but things may well go wrong!");
-            for(int i=0; i<_sections.size(); i++) {
-                SEPX s = _sections.get(i);
-                GenericPropertyNode node = sedPlex.getProperty(i);
-
-                // s.setStart( CPtoFC(node.getStart()) );
-                // s.setEnd( CPtoFC(node.getEnd()) );
-                int startAt = node.getStart();
-                int endAt = node.getEnd();
-                s.setStart( startAt );
-                s.setEnd( endAt );
-            }
-        }
-
-        Collections.sort( _sections, PropertyNode.StartComparator.instance );
-    }
-
-    public void adjustForInsert(int listIndex, int length)
-    {
-        int size = _sections.size();
-        SEPX sepx = _sections.get(listIndex);
-        sepx.setEnd(sepx.getEnd() + length);
-
-        for (int x = listIndex + 1; x < size; x++)
-        {
-            sepx = _sections.get(x);
-            sepx.setStart(sepx.getStart() + length);
-            sepx.setEnd(sepx.getEnd() + length);
-        }
-    }
-
-    // goss version of CPtoFC - this takes into account non-contiguous textpieces
-    // that we have come across in real world documents. Tests against the example
-    // code in HWPFDocument show no variation to Ryan's version of the code in
-    // normal use, but this version works with our non-contiguous test case.
-    // So far unable to get this test case to be written out as well due to
-    // other issues. - piers
-    //
-    // i'm commenting this out, because it just doesn't work with non-contiguous
-    // textpieces :( Usual (as for PAPX and CHPX) call to TextPiecesTable does.
-    // private int CPtoFC(int CP)
-    // {
-    // TextPiece TP = null;
-    //
-    // for(int i=_text.size()-1; i>-1; i--)
-    // {
-    // TP = _text.get(i);
-    //
-    // if(CP >= TP.getCP()) break;
-    // }
-    // int FC = TP.getPieceDescriptor().getFilePosition();
-    // int offset = CP - TP.getCP();
-    // if (TP.isUnicode()) {
-    // offset = offset*2;
-    // }
-    // FC = FC+offset;
-    // return FC;
-    // }
-
-    public List<SEPX> getSections()
-    {
-        return _sections;
-    }
-
-    @Deprecated
-    public void writeTo( HWPFFileSystem sys, int fcMin ) throws IOException
-    {
-        HWPFOutputStream docStream = sys.getStream( "WordDocument" );
-        HWPFOutputStream tableStream = sys.getStream( "1Table" );
-
-        writeTo( docStream, tableStream );
-    }
-
-    public void writeTo(
-            HWPFOutputStream wordDocumentStream,
-            HWPFOutputStream tableStream ) throws IOException
-    {
-
-        int offset = wordDocumentStream.getOffset();
-        int len = _sections.size();
-        PlexOfCps plex = new PlexOfCps(SED_SIZE);
-
-        for (int x = 0; x < len; x++)
-        {
-            SEPX sepx = _sections.get(x);
-            byte[] grpprl = sepx.getGrpprl();
-
-            // write the sepx to the document stream. starts with a 2 byte size
-            // followed by the grpprl
-            byte[] shortBuf = new byte[2];
-            LittleEndian.putShort(shortBuf, 0, (short)grpprl.length);
-
-            wordDocumentStream.write(shortBuf);
-            wordDocumentStream.write(grpprl);
-
-            // set the fc in the section descriptor
-            SectionDescriptor sed = sepx.getSectionDescriptor();
-            sed.setFc(offset);
-
-            // add the section descriptor bytes to the PlexOfCps.
-
-            /* original line */
-            GenericPropertyNode property = new GenericPropertyNode(
-                            sepx.getStart(), sepx.getEnd(), sed.toByteArray() );
-            /*
-             * Line using Ryan's FCtoCP() conversion method - unable to observe
-             * any effect on our testcases when using this code - piers
-             */
-            /*
-             * there is an effect on Bug45743.doc actually. writeoutreadback
-             * changes byte offset of chars (but preserve string offsets).
-             * Changing back to original lines - sergey
-             */
-            // GenericPropertyNode property = new GenericPropertyNode(
-            // tpt.getCharIndex( sepx.getStartBytes() ),
-            // tpt.getCharIndex( sepx.getEndBytes() ), sed.toByteArray() );
-
-            plex.addProperty(property);
-
-            offset = wordDocumentStream.getOffset();
-        }
-        tableStream.write(plex.toByteArray());
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java
deleted file mode 100644
index 9388a14..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.StringUtil;
-
-@Internal
-public class SinglentonTextPiece extends TextPiece
-{
-
-    public SinglentonTextPiece( StringBuilder buffer )
-    {
-        super( 0, buffer.length(), StringUtil.getToUnicodeLE(buffer.toString()), new PieceDescriptor( new byte[8], 0 ) );
-    }
-
-    @Override
-    public int bytesLength()
-    {
-        return getStringBuilder().length() * 2;
-    }
-
-    @Override
-    public int characterLength()
-    {
-        return getStringBuilder().length();
-    }
-
-    @Override
-    public int getCP()
-    {
-        return 0;
-    }
-
-    @Override
-    public int getEnd()
-    {
-        return characterLength();
-    }
-
-    @Override
-    public int getStart()
-    {
-        return 0;
-    }
-
-    public String toString()
-    {
-        return "SinglentonTextPiece (" + characterLength() + " chars)";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java
deleted file mode 100644
index e4c18b7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.StdfBaseAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The StdfBase structure specifies general information about a style.
- */
-@Internal
-class StdfBase extends StdfBaseAbstractType
-{
-
-    public StdfBase()
-    {
-    }
-
-    public StdfBase( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        StdfBase other = (StdfBase) obj;
-        if ( field_1_info1 != other.field_1_info1 )
-            return false;
-        if ( field_2_info2 != other.field_2_info2 )
-            return false;
-        if ( field_3_info3 != other.field_3_info3 )
-            return false;
-        if ( field_4_bchUpe != other.field_4_bchUpe )
-            return false;
-        if ( field_5_grfstd != other.field_5_grfstd )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_info1;
-        result = prime * result + field_2_info2;
-        result = prime * result + field_3_info3;
-        result = prime * result + field_4_bchUpe;
-        result = prime * result + field_5_grfstd;
-        return result;
-    }
-
-    public byte[] serialize()
-    {
-        byte[] result = new byte[getSize()];
-        serialize( result, 0 );
-        return result;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java
deleted file mode 100644
index 4792718..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.StdfPost2000AbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The StdfBase structure specifies general information about a style.
- */
-@Internal
-class StdfPost2000 extends StdfPost2000AbstractType
-{
-
-    public StdfPost2000()
-    {
-    }
-
-    public StdfPost2000( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        StdfPost2000 other = (StdfPost2000) obj;
-        if ( field_1_info1 != other.field_1_info1 )
-            return false;
-        if ( field_2_rsid != other.field_2_rsid )
-            return false;
-        if ( field_3_info3 != other.field_3_info3 )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_info1;
-        result = prime * result
-                + (int) ( field_2_rsid ^ ( field_2_rsid >>> 32 ) );
-        result = prime * result + field_3_info3;
-        return result;
-    }
-
-    public byte[] serialize()
-    {
-        byte[] result = new byte[getSize()];
-        serialize( result, 0 );
-        return result;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java
deleted file mode 100644
index 448da7b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.StshifAbstractType;
-import org.apache.poi.util.Internal;
-
-/**
- * The StdfBase structure specifies general information about a style.
- */
-@Internal
-class Stshif extends StshifAbstractType
-{
-
-    public Stshif()
-    {
-    }
-
-    public Stshif( byte[] std, int offset )
-    {
-        fillFields( std, offset );
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        Stshif other = (Stshif) obj;
-        if ( field_1_cstd != other.field_1_cstd )
-            return false;
-        if ( field_2_cbSTDBaseInFile != other.field_2_cbSTDBaseInFile )
-            return false;
-        if ( field_3_info3 != other.field_3_info3 )
-            return false;
-        if ( field_4_stiMaxWhenSaved != other.field_4_stiMaxWhenSaved )
-            return false;
-        if ( field_5_istdMaxFixedWhenSaved != other.field_5_istdMaxFixedWhenSaved )
-            return false;
-        if ( field_6_nVerBuiltInNamesWhenSaved != other.field_6_nVerBuiltInNamesWhenSaved )
-            return false;
-        if ( field_7_ftcAsci != other.field_7_ftcAsci )
-            return false;
-        if ( field_8_ftcFE != other.field_8_ftcFE )
-            return false;
-        if ( field_9_ftcOther != other.field_9_ftcOther )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_cstd;
-        result = prime * result + field_2_cbSTDBaseInFile;
-        result = prime * result + field_3_info3;
-        result = prime * result + field_4_stiMaxWhenSaved;
-        result = prime * result + field_5_istdMaxFixedWhenSaved;
-        result = prime * result + field_6_nVerBuiltInNamesWhenSaved;
-        result = prime * result + field_7_ftcAsci;
-        result = prime * result + field_8_ftcFE;
-        result = prime * result + field_9_ftcOther;
-        return result;
-    }
-
-    public byte[] serialize()
-    {
-        byte[] result = new byte[getSize()];
-        serialize( result, 0 );
-        return result;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java
deleted file mode 100644
index f36519c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * The STTB is a string table that is made up of a header that is followed by an
- * array of elements. The cData value specifies the number of elements that are
- * contained in the array.
- * <p>
- * Class and fields descriptions are quoted from [MS-DOC] -- v20121003 Word
- * (.doc) Binary File Format; Copyright (c) 2012 Microsoft Corporation; Release:
- * October 8, 2012
- * <p>
- * This class is internal. It content or properties may change without notice
- * due to changes in our knowledge of internal Microsoft Word binary structures.
- * 
- * @author Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word (.doc)
- *         Binary File Format; Copyright (c) 2012 Microsoft Corporation;
- *         Release: October 8, 2012
- */
-public class Sttb
-{
-
-    private int _cbExtra;
-
-    private final int _cDataLength;
-
-    private String[] _data;
-
-    private byte[][] _extraData;
-
-    private final boolean _fExtend = true;
-
-    public Sttb( byte[] buffer, int startOffset )
-    {
-        this( 2, buffer, startOffset );
-    }
-
-    public Sttb( int cDataLength, byte[] buffer, int startOffset )
-    {
-        this._cDataLength = cDataLength;
-        fillFields( buffer, startOffset );
-    }
-
-    public Sttb( int cDataLength, String[] data )
-    {
-        this._cDataLength = cDataLength;
-
-        this._data = Arrays.copyOf(data, data.length);
-
-        this._cbExtra = 0;
-        this._extraData = null;
-    }
-
-    public void fillFields( byte[] buffer, int startOffset )
-    {
-        short ffff = LittleEndian.getShort( buffer, startOffset );
-        int offset = startOffset + LittleEndian.SHORT_SIZE;
-
-        if ( ffff != (short) 0xffff )
-        {
-            POILogFactory.getLogger(Sttb.class).log(
-                    POILogger.WARN,
-                    "Non-extended character Pascal strings are not supported right now. "
-                            + "Creating empty values in the RevisionMarkAuthorTable for now.  " +
-                    "Please, contact POI developers for update.");
-            //set data and extraData to empty values to avoid
-            //downstream NPE in case someone calls getEntries on RevisionMarkAuthorTable
-            _data = new String[0];
-            _extraData = new byte[0][];
-
-            return;
-        }
-        // strings are extended character strings
-
-        int cData = _cDataLength == 2 ? LittleEndian.getUShort( buffer, offset )
-                : LittleEndian.getInt( buffer, offset );
-        offset += _cDataLength;
-
-        this._cbExtra = LittleEndian.getUShort( buffer, offset );
-        offset += 2;
-
-        _data = new String[cData];
-        _extraData = new byte[cData][];
-
-        for ( int i = 0; i < cData; i++ )
-        {
-            int cchData = LittleEndian.getShort( buffer, offset );
-            offset += 2;
-
-            if ( cchData < 0 )
-                continue;
-
-            _data[i] = StringUtil.getFromUnicodeLE( buffer, offset, cchData );
-            offset += cchData * 2;
-
-            _extraData[i] = LittleEndian
-                    .getByteArray( buffer, offset, _cbExtra );
-            offset += _cbExtra;
-        }
-    }
-
-    /**
-     * The definition of each STTB specifies the meaning of this field. If this
-     * STTB uses extended characters, the size of this field is 2*cchData bytes
-     * and it is a Unicode string unless otherwise specified by the STTB
-     * definition. If this STTB does not use extended characters, then the size
-     * of this field is cchData bytes and it is an ANSI string, unless otherwise
-     * specified by the STTB definition.
-     */
-    public String[] getData()
-    {
-        return _data;
-    }
-
-    public int getSize()
-    {
-        // ffff
-        int size = LittleEndian.SHORT_SIZE;
-
-        // cData
-        size += _cDataLength;
-
-        // cbExtra
-        size += LittleEndian.SHORT_SIZE;
-
-        if ( this._fExtend )
-        {
-            for ( String data : _data )
-            {
-                // cchData
-                size += LittleEndian.SHORT_SIZE;
-                // data
-                size += 2 * data.length();
-            }
-        }
-        else
-        {
-            for ( String data : _data )
-            {
-                // cchData
-                size += LittleEndian.BYTE_SIZE;
-                // data
-                size += 1 * data.length();
-            }
-        }
-
-        // extraData
-        if ( _extraData != null )
-        {
-            size += _cbExtra * _data.length;
-        }
-
-        return size;
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] buffer = new byte[getSize()];
-
-        LittleEndian.putShort( buffer, 0, (short) 0xffff );
-
-        if ( _data == null || _data.length == 0 )
-        {
-            if ( _cDataLength == 4 )
-            {
-                LittleEndian.putInt( buffer, 2, 0 );
-                LittleEndian.putUShort( buffer, 6, _cbExtra );
-                return buffer;
-            }
-
-            LittleEndian.putUShort( buffer, 2, 0 );
-            LittleEndian.putUShort( buffer, 4, _cbExtra );
-            return buffer;
-        }
-
-        int offset;
-        if ( _cDataLength == 4 )
-        {
-            LittleEndian.putInt( buffer, 2, _data.length );
-            LittleEndian.putUShort( buffer, 6, _cbExtra );
-            offset = 2 + LittleEndian.INT_SIZE + LittleEndian.SHORT_SIZE;
-        }
-        else
-        {
-            LittleEndian.putUShort( buffer, 2, _data.length );
-            LittleEndian.putUShort( buffer, 4, _cbExtra );
-            offset = 2 + LittleEndian.SHORT_SIZE + LittleEndian.SHORT_SIZE;
-        }
-
-        for ( int i = 0; i < _data.length; i++ )
-        {
-            String entry = _data[i];
-            if ( entry == null )
-            {
-                // is it correct?
-                buffer[offset] = -1;
-                buffer[offset + 1] = 0;
-                offset += 2;
-                continue;
-            }
-
-            if ( _fExtend )
-            {
-                LittleEndian.putUShort( buffer, offset, entry.length() );
-                offset += LittleEndian.SHORT_SIZE;
-
-                StringUtil.putUnicodeLE( entry, buffer, offset );
-                offset += 2 * entry.length();
-            }
-            else
-            {
-                throw new UnsupportedOperationException(
-                        "ANSI STTB is not supported yet" );
-            }
-
-            if ( _cbExtra != 0 )
-            {
-                if ( _extraData[i] != null && _extraData[i].length != 0 )
-                {
-                    System.arraycopy( _extraData[i], 0, buffer, offset,
-                            Math.min( _extraData[i].length, _cbExtra ) );
-                }
-                offset += _cbExtra;
-            }
-        }
-
-        return buffer;
-    }
-
-    public int serialize( byte[] buffer, int offset )
-    {
-        byte[] bs = serialize();
-        System.arraycopy( bs, 0, buffer, offset, bs.length );
-        return bs.length;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java
deleted file mode 100644
index fba473f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.util.Internal;
-
-/**
- * Utils class for storing and reading "STring TaBle stored in File"
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-class SttbUtils
-{
-
-    private static final int CDATA_SIZE_STTB_SAVED_BY = 2; // bytes
-
-    private static final int CDATA_SIZE_STTBF_BKMK = 2; // bytes
-
-    private static final int CDATA_SIZE_STTBF_R_MARK = 2; // bytes
-
-    static String[] readSttbfBkmk( byte[] buffer, int startOffset )
-    {
-        return new Sttb( CDATA_SIZE_STTBF_BKMK, buffer, startOffset ).getData();
-    }
-
-    static String[] readSttbfRMark( byte[] buffer, int startOffset )
-    {
-        return new Sttb( CDATA_SIZE_STTBF_R_MARK, buffer, startOffset )
-                .getData();
-    }
-
-    static String[] readSttbSavedBy( byte[] buffer, int startOffset )
-    {
-        return new Sttb( CDATA_SIZE_STTB_SAVED_BY, buffer, startOffset )
-                .getData();
-    }
-
-    static void writeSttbfBkmk( String[] data, HWPFOutputStream tableStream )
-            throws IOException
-    {
-        tableStream.write( new Sttb( CDATA_SIZE_STTBF_BKMK, data ).serialize() );
-    }
-
-    static void writeSttbfRMark( String[] data, HWPFOutputStream tableStream )
-            throws IOException
-    {
-        tableStream.write( new Sttb( CDATA_SIZE_STTBF_R_MARK, data )
-                .serialize() );
-    }
-
-    static void writeSttbSavedBy( String[] data, HWPFOutputStream tableStream )
-            throws IOException
-    {
-        tableStream.write( new Sttb( CDATA_SIZE_STTB_SAVED_BY, data )
-                .serialize() );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
deleted file mode 100644
index d4415c4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Comment me
- *
- * @author Ryan Ackley
- */
-@Internal
-public final class StyleDescription implements HDFType
-{
-
-    private static final POILogger logger = POILogFactory.getLogger( StyleDescription.class );
-    
-  private final static int PARAGRAPH_STYLE = 1;
-  private final static int CHARACTER_STYLE = 2;
-  // private final static int TABLE_STYLE = 3;
-  // private final static int NUMBERING_STYLE = 4;
-
-  private int _baseLength;
-  private StdfBase _stdfBase;
-  private StdfPost2000 _stdfPost2000;
-
-  UPX[] _upxs;
-  String _name;
-  @Deprecated
-  ParagraphProperties _pap;
-  @Deprecated
-  CharacterProperties _chp;
-
-  public StyleDescription()
-  {
-//      _pap = new ParagraphProperties();
-//      _chp = new CharacterProperties();
-  }
-  public StyleDescription(byte[] std, int baseLength, int offset, boolean word9)
-  {
-     _baseLength = baseLength;
-     int nameStart = offset + baseLength;
-
-        boolean readStdfPost2000 = false;
-        if ( baseLength == 0x0012 )
-        {
-            readStdfPost2000 = true;
-        }
-        else if ( baseLength == 0x000A )
-        {
-            readStdfPost2000 = false;
-        }
-        else
-        {
-            logger.log( POILogger.WARN,
-                    "Style definition has non-standard size of ",
-                    Integer.valueOf( baseLength ) );
-        }
-
-     _stdfBase = new StdfBase(std, offset);
-      offset += StdfBase.getSize();
-
-        if ( readStdfPost2000 )
-        {
-            _stdfPost2000 = new StdfPost2000( std, offset );
-            // offset += StdfPost2000.getSize();
-        }
-
-      //first byte(s) of variable length section of std is the length of the
-      //style name and aliases string
-      int nameLength = 0;
-      int multiplier = 1;
-      if(word9)
-      {
-          nameLength = LittleEndian.getShort(std, nameStart);
-          multiplier = 2;
-          nameStart += LittleEndian.SHORT_SIZE;
-      }
-      else
-      {
-          nameLength = std[nameStart];
-      }
-
-      _name = StringUtil.getFromUnicodeLE(std, nameStart, (nameLength*multiplier)/2);
-
-      //length then null terminator.
-      int grupxStart = ((nameLength + 1) * multiplier) + nameStart;
-
-      // the spec only refers to two possible upxs but it mentions
-      // that more may be added in the future
-      int varOffset = grupxStart;
-      int countOfUPX = _stdfBase.getCupx();
-      _upxs = new UPX[countOfUPX];
-      for(int x = 0; x < countOfUPX; x++)
-      {
-          int upxSize = LittleEndian.getShort(std, varOffset);
-          varOffset += LittleEndian.SHORT_SIZE;
-
-          byte[] upx = new byte[upxSize];
-          System.arraycopy(std, varOffset, upx, 0, upxSize);
-          _upxs[x] = new UPX(upx);
-          varOffset += upxSize;
-
-
-          // the upx will always start on a word boundary.
-          if((upxSize & 1) == 1)
-          {
-              ++varOffset;
-          }
-
-      }
-
-
-  }
-  public int getBaseStyle()
-  {
-    return _stdfBase.getIstdBase();
-  }
-  public byte[] getCHPX()
-  {
-    switch (_stdfBase.getStk())
-    {
-      case PARAGRAPH_STYLE:
-        if (_upxs.length > 1)
-        {
-          return _upxs[1].getUPX();
-        }
-        return null;
-      case CHARACTER_STYLE:
-        return _upxs[0].getUPX();
-      default:
-        return null;
-    }
-
-  }
-  public byte[] getPAPX()
-  {
-    switch (_stdfBase.getStk())
-    {
-      case PARAGRAPH_STYLE:
-        return _upxs[0].getUPX();
-      default:
-        return null;
-    }
-  }
-  @Deprecated
-  public ParagraphProperties getPAP()
-  {
-      return _pap;
-  }
-  @Deprecated
-  public CharacterProperties getCHP()
-  {
-      return _chp;
-  }
-  @Deprecated
-  void setPAP(ParagraphProperties pap)
-  {
-      _pap = pap;
-  }
-  @Deprecated
-  void setCHP(CharacterProperties chp)
-  {
-      _chp = chp;
-  }
-
-  public String getName()
-  {
-    return _name;
-  }
-
-  public byte[] toByteArray()
-  {
-    // size equals _baseLength bytes for known variables plus 2 bytes for name
-    // length plus name length * 2 plus 2 bytes for null plus upx's preceded by
-    // length
-    int size = _baseLength + 2 + ((_name.length() + 1) * 2);
-
-    // determine the size needed for the upxs. They always fall on word
-    // boundaries.
-    size += _upxs[0].size() + 2;
-    for (int x = 1; x < _upxs.length; x++)
-    {
-      size += _upxs[x-1].size() % 2;
-      size += _upxs[x].size() + 2;
-    }
-
-
-    byte[] buf = new byte[size];
-    _stdfBase.serialize( buf, 0 );
-
-    int offset = _baseLength;
-
-    char[] letters = _name.toCharArray();
-    LittleEndian.putShort(buf, _baseLength, (short)letters.length);
-    offset += LittleEndian.SHORT_SIZE;
-    for (int x = 0; x < letters.length; x++)
-    {
-      LittleEndian.putShort(buf, offset, (short)letters[x]);
-      offset += LittleEndian.SHORT_SIZE;
-    }
-    // get past the null delimiter for the name.
-    offset += LittleEndian.SHORT_SIZE;
-
-    for (int x = 0; x < _upxs.length; x++)
-    {
-      short upxSize = (short)_upxs[x].size();
-      LittleEndian.putShort(buf, offset, upxSize);
-      offset += LittleEndian.SHORT_SIZE;
-      System.arraycopy(_upxs[x].getUPX(), 0, buf, offset, upxSize);
-      offset += upxSize + (upxSize % 2);
-    }
-
-    return buf;
-  }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ( ( _name == null ) ? 0 : _name.hashCode() );
-        result = prime * result
-                + ( ( _stdfBase == null ) ? 0 : _stdfBase.hashCode() );
-        result = prime * result + Arrays.hashCode( _upxs );
-        return result;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        StyleDescription other = (StyleDescription) obj;
-        if ( _name == null )
-        {
-            if ( other._name != null )
-                return false;
-        }
-        else if ( !_name.equals( other._name ) )
-            return false;
-        if ( _stdfBase == null )
-        {
-            if ( other._stdfBase != null )
-                return false;
-        }
-        else if ( !_stdfBase.equals( other._stdfBase ) )
-            return false;
-        if ( !Arrays.equals( _upxs, other._upxs ) )
-            return false;
-        return true;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder result = new StringBuilder();
-        result.append( "[STD]: '" );
-        result.append( _name );
-        result.append( "'" );
-        result.append( ( "\nStdfBase:\t" + _stdfBase ).replaceAll( "\n",
-                "\n    " ) );
-        result.append( ( "\nStdfPost2000:\t" + _stdfPost2000 ).replaceAll(
-                "\n", "\n    " ) );
-        for ( UPX upx : _upxs )
-        {
-            result.append( ( "\nUPX:\t" + upx ).replaceAll( "\n", "\n    " ) );
-        }
-        return result.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
deleted file mode 100644
index f8ec76b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor;
-import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor;
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Represents a document's stylesheet. A word documents formatting is stored as
- * compressed styles that are based on styles contained in the stylesheet. This
- * class also contains static utility functions to uncompress different
- * formatting properties.
- * <p>
- * Fields documentation is quotes from Microsoft Office Word 97-2007 Binary File
- * Format (.doc) Specification, page 36 of 210
- * 
- * @author Ryan Ackley
- */
-@Internal
-public final class StyleSheet implements HDFType {
-
-  public static final int NIL_STYLE = 4095;
-//  private static final int PAP_TYPE = 1;
-//  private static final int CHP_TYPE = 2;
-//  private static final int SEP_TYPE = 4;
-//  private static final int TAP_TYPE = 5;
-
-    @Deprecated
-    private final static ParagraphProperties NIL_PAP = new ParagraphProperties();
-    @Deprecated
-    private final static CharacterProperties NIL_CHP = new CharacterProperties();
-
-  private final static byte[] NIL_CHPX = new byte[] {};
-  private final static byte[] NIL_PAPX = new byte[] {0, 0};
-
-    /**
-     * Size of the STSHI structure
-     */
-    private int _cbStshi;
-
-    /**
-     * General information about a stylesheet
-     */
-    private Stshif _stshif;
-    
-  StyleDescription[] _styleDescriptions;
-
-  /**
-   * StyleSheet constructor. Loads a document's stylesheet information,
-   *
-   * @param tableStream A byte array containing a document's raw stylesheet
-   *        info. Found by using FileInformationBlock.getFcStshf() and
-   *        FileInformationBLock.getLcbStshf()
-   */
-  public StyleSheet(byte[] tableStream, int offset)
-  {
-        int startOffset = offset;
-        _cbStshi = LittleEndian.getShort( tableStream, offset );
-        offset += LittleEndian.SHORT_SIZE;
-
-        /*
-         * Count of styles in stylesheet
-         * 
-         * The number of styles in this style sheet. There will be stshi.cstd
-         * (cbSTD, STD) pairs in the file following the STSHI. Note: styles can
-         * be empty, i.e. cbSTD==0.
-         */
-        
-        _stshif = new Stshif( tableStream, offset );
-        offset += Stshif.getSize();
-
-        // shall we discard cbLSD and mpstilsd?
-        
-      offset = startOffset + LittleEndian.SHORT_SIZE + _cbStshi;
-      _styleDescriptions = new StyleDescription[_stshif.getCstd()];
-      for(int x = 0; x < _stshif.getCstd(); x++)
-      {
-          int stdSize = LittleEndian.getShort(tableStream, offset);
-          //get past the size
-          offset += 2;
-          if(stdSize > 0)
-          {
-              //byte[] std = new byte[stdSize];
-
-              StyleDescription aStyle = new StyleDescription(tableStream,
-                      _stshif.getCbSTDBaseInFile(), offset, true);
-
-              _styleDescriptions[x] = aStyle;
-          }
-
-          offset += stdSize;
-
-      }
-      for(int x = 0; x < _styleDescriptions.length; x++)
-      {
-          if(_styleDescriptions[x] != null)
-          {
-              createPap(x);
-              createChp(x);
-          }
-      }
-  }
-
-  public void writeTo(HWPFOutputStream out)
-    throws IOException
-  {
-
-    int offset = 0;
-
-        /*
-         * we don't support 2003 Word extensions in STSHI (but may be we should
-         * at least not delete them, shouldn't we?), so our structure is always
-         * 18 bytes in length -- sergey
-         */
-        this._cbStshi = 18;
-
-    // add two bytes so we can prepend the stylesheet w/ its size
-    byte[] buf = new byte[_cbStshi + 2];
-
-    LittleEndian.putUShort(buf, offset, (short)_cbStshi);
-    offset += LittleEndian.SHORT_SIZE;
-
-    _stshif.setCstd( _styleDescriptions.length );
-    _stshif.serialize( buf, offset );
-    // offset += Stshif.getSize();
-
-    out.write(buf);
-
-    byte[] sizeHolder = new byte[2];
-    for (int x = 0; x < _styleDescriptions.length; x++)
-    {
-      if(_styleDescriptions[x] != null)
-      {
-          byte[] std = _styleDescriptions[x].toByteArray();
-
-          // adjust the size so it is always on a word boundary
-          LittleEndian.putShort(sizeHolder, 0, (short)((std.length) + (std.length % 2)));
-          out.write(sizeHolder);
-          out.write(std);
-
-          // Must always start on a word boundary.
-          if (std.length % 2 == 1)
-          {
-            out.write('\0');
-          }
-      }
-      else
-      {
-        sizeHolder[0] = 0;
-        sizeHolder[1] = 0;
-        out.write(sizeHolder);
-      }
-    }
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof StyleSheet)) return false;
-    StyleSheet ss = (StyleSheet)o;
-
-    if (!ss._stshif.equals( this._stshif )
-        || ss._cbStshi != this._cbStshi
-        || ss._styleDescriptions.length != this._styleDescriptions.length
-    ) return false;
-    
-    for (int i=0; i<_styleDescriptions.length; i++) {
-        StyleDescription tsd = this._styleDescriptions[i];
-        StyleDescription osd = ss._styleDescriptions[i];
-        if (tsd == null && osd == null) continue;
-        if (tsd == null || osd == null || !osd.equals(tsd)) return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-
-  /**
-   * Creates a PartagraphProperties object from a papx stored in the
-   * StyleDescription at the index istd in the StyleDescription array. The PAP
-   * is placed in the StyleDescription at istd after its been created. Not
-   * every StyleDescription will contain a papx. In these cases this function
-   * does nothing
-   *
-   * @param istd The index of the StyleDescription to create the
-   *        ParagraphProperties  from (and also place the finished PAP in)
-   */
-  @Deprecated
-  private void createPap(int istd)
-  {
-      StyleDescription sd = _styleDescriptions[istd];
-      ParagraphProperties pap = sd.getPAP();
-      byte[] papx = sd.getPAPX();
-      int baseIndex = sd.getBaseStyle();
-      if(pap == null && papx != null)
-      {
-          ParagraphProperties parentPAP = new ParagraphProperties();
-          if(baseIndex != NIL_STYLE)
-          {
-
-              parentPAP = _styleDescriptions[baseIndex].getPAP();
-              if(parentPAP == null) {
-                  if(baseIndex == istd) {
-                      // Oh dear, style claims that it is its own parent
-                      throw new IllegalStateException("Pap style " + istd + " claimed to have itself as its parent, which isn't allowed");
-                  }
-                  // Create the parent style
-                  createPap(baseIndex);
-                  parentPAP = _styleDescriptions[baseIndex].getPAP();
-              }
-
-          }
-
-          if (parentPAP == null) {
-              parentPAP = new ParagraphProperties();
-          }
-
-          pap = ParagraphSprmUncompressor.uncompressPAP(parentPAP, papx, 2);
-          sd.setPAP(pap);
-      }
-  }
-  /**
-   * Creates a CharacterProperties object from a chpx stored in the
-   * StyleDescription at the index istd in the StyleDescription array. The
-   * CharacterProperties object is placed in the StyleDescription at istd after
-   * its been created. Not every StyleDescription will contain a chpx. In these
-   * cases this function does nothing.
-   *
-   * @param istd The index of the StyleDescription to create the
-   *        CharacterProperties object from.
-   */
-  @Deprecated
-  private void createChp(int istd)
-  {
-      StyleDescription sd = _styleDescriptions[istd];
-      CharacterProperties chp = sd.getCHP();
-      byte[] chpx = sd.getCHPX();
-      int baseIndex = sd.getBaseStyle();
-      
-      if(baseIndex == istd) {
-         // Oh dear, this isn't allowed...
-         // The word file seems to be corrupted
-         // Switch to using the nil style so that
-         //  there's a chance we can read it
-         baseIndex = NIL_STYLE;
-      }
-      
-      // Build and decompress the Chp if required 
-      if(chp == null && chpx != null)
-      {
-          CharacterProperties parentCHP = new CharacterProperties();
-          if(baseIndex != NIL_STYLE)
-          {
-              parentCHP = _styleDescriptions[baseIndex].getCHP();
-              if(parentCHP == null)
-              {
-                  createChp(baseIndex);
-                  parentCHP = _styleDescriptions[baseIndex].getCHP();
-              }
-              if(parentCHP == null) {
-                  parentCHP = new CharacterProperties();
-              }
-          }
-
-          chp = CharacterSprmUncompressor.uncompressCHP(parentCHP, chpx, 0);
-          sd.setCHP(chp);
-      }
-  }
-
-  /**
-   * Gets the number of styles in the style sheet.
-   * @return The number of styles in the style sheet.
-   */
-  public int numStyles() {
-      return _styleDescriptions.length;
-  }
-
-    /**
-     * Gets the StyleDescription at index x.
-     * 
-     * @param styleIndex
-     *            the index of the desired StyleDescription.
-     */
-    public StyleDescription getStyleDescription( int styleIndex )
-    {
-        return _styleDescriptions[styleIndex];
-    }
-
-    @Deprecated
-    public CharacterProperties getCharacterStyle( int styleIndex )
-    {
-        if ( styleIndex == NIL_STYLE )
-        {
-            return NIL_CHP;
-        }
-
-        if ( styleIndex >= _styleDescriptions.length )
-        {
-            return NIL_CHP;
-        }
-
-        return ( _styleDescriptions[styleIndex] != null ? _styleDescriptions[styleIndex]
-                .getCHP() : NIL_CHP );
-    }
-
-    @Deprecated
-    public ParagraphProperties getParagraphStyle( int styleIndex )
-    {
-        if ( styleIndex == NIL_STYLE )
-        {
-            return NIL_PAP;
-        }
-
-        if ( styleIndex >= _styleDescriptions.length )
-        {
-            return NIL_PAP;
-        }
-
-        if ( _styleDescriptions[styleIndex] == null )
-        {
-            return NIL_PAP;
-        }
-
-        if ( _styleDescriptions[styleIndex].getPAP() == null )
-        {
-            return NIL_PAP;
-        }
-
-        return _styleDescriptions[styleIndex].getPAP();
-    }
-
-    public byte[] getCHPX( int styleIndex )
-    {
-        if ( styleIndex == NIL_STYLE )
-        {
-            return NIL_CHPX;
-        }
-
-        if ( styleIndex >= _styleDescriptions.length )
-        {
-            return NIL_CHPX;
-        }
-
-        if ( _styleDescriptions[styleIndex] == null )
-        {
-            return NIL_CHPX;
-        }
-
-        if ( _styleDescriptions[styleIndex].getCHPX() == null )
-        {
-            return NIL_CHPX;
-        }
-
-        return _styleDescriptions[styleIndex].getCHPX();
-    }
-
-    public byte[] getPAPX( int styleIndex )
-    {
-        if ( styleIndex == NIL_STYLE )
-        {
-            return NIL_PAPX;
-        }
-
-        if ( styleIndex >= _styleDescriptions.length )
-        {
-            return NIL_PAPX;
-        }
-
-        if ( _styleDescriptions[styleIndex] == null )
-        {
-            return NIL_PAPX;
-        }
-
-        if ( _styleDescriptions[styleIndex].getPAPX() == null )
-        {
-            return NIL_PAPX;
-        }
-
-        return _styleDescriptions[styleIndex].getPAPX();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java
deleted file mode 100644
index 89d16d2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Document text parts that can have text pieces (CPs)
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-public enum SubdocumentType {
-    MAIN(),
-
-    FOOTNOTE(),
-
-    HEADER(),
-
-    @Deprecated
-    MACRO(),
-
-    ANNOTATION(),
-
-    ENDNOTE(),
-
-    TEXTBOX(),
-
-    HEADER_TEXTBOX();
-
-    /**
-     * Array of {@link SubdocumentType}s ordered by document position and FIB
-     * field order
-     */
-    public static final SubdocumentType[] ORDERED = new SubdocumentType[] {
-            MAIN, FOOTNOTE, HEADER, MACRO, ANNOTATION, ENDNOTE, TEXTBOX,
-            HEADER_TEXTBOX };
-
-    private SubdocumentType()
-    {
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java
deleted file mode 100644
index 472b667..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.model.types.TBDAbstractType;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-
-/**
- * Tab descriptor. Part of {@link ParagraphProperties}.
- * 
- * @author vlsergey
- */
-public class TabDescriptor extends TBDAbstractType
-{
-
-    public TabDescriptor()
-    {
-    }
-
-    public TabDescriptor( byte[] bytes, int offset )
-    {
-        fillFields( bytes, offset );
-    }
-
-    public byte[] toByteArray()
-    {
-        byte[] buf = new byte[getSize()];
-        serialize( buf, 0 );
-        return buf;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
deleted file mode 100644
index 7ca5508..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-
-import java.nio.charset.Charset;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Lightweight representation of a text piece.
- * Works in the character domain, not the byte domain, so you
- *  need to have turned byte references into character
- *  references before getting here.
- *
- * @author Ryan Ackley
- */
-@Internal
-public class TextPiece extends PropertyNode<TextPiece>
-{
-  private boolean _usesUnicode;
-
-  private PieceDescriptor _pd;
-
-    /**
-     * @param start
-     *            Beginning offset in main document stream, in characters.
-     * @param end
-     *            Ending offset in main document stream, in characters.
-     * @param text
-     *            The raw bytes of our text
-     * @deprecated Use {@link #TextPiece(int,int,byte[],PieceDescriptor)}
-     *             instead
-     */
-    public TextPiece( int start, int end, byte[] text, PieceDescriptor pd,
-            int cpStart )
-    {
-        this( start, end, text, pd );
-    }
-
-    /**
-     * @param start
-     *            Beginning offset in main document stream, in characters.
-     * @param end
-     *            Ending offset in main document stream, in characters.
-     * @param text
-     *            The raw bytes of our text
-     */
-    public TextPiece( int start, int end, byte[] text, PieceDescriptor pd )
-    {
-	  super(start, end, buildInitSB(text, pd));
-	  _usesUnicode = pd.isUnicode();
-	  _pd = pd;
-
-	  // Validate
-	  int textLength = ((CharSequence)_buf).length();
-	  if(end-start != textLength) {
-		  throw new IllegalStateException("Told we're for characters " + start + " -> " + end + ", but actually covers " + textLength + " characters!");
-	  }
-	  if(end < start) {
-		  throw new IllegalStateException("Told we're of negative size! start="+start + " end="+end);
-	  }
-  }
-
-  /**
-   * Create the StringBuilder from the text and unicode flag
-   */
-  private static StringBuilder buildInitSB(byte[] text, PieceDescriptor pd) {
-	  String str = new String(text, Charset.forName(pd.isUnicode() ? "UTF-16LE" : "Cp1252"));
-
-      return new StringBuilder(str);
-  }
-
-  /**
-   * @return If this text piece is unicode
-   */
-   public boolean isUnicode()
-   {
-      return _usesUnicode;
-   }
-
-   public PieceDescriptor getPieceDescriptor()
-   {
-     return _pd;
-   }
-
-   @Deprecated
-   public StringBuffer getStringBuffer()
-   {
-     return new StringBuffer(getStringBuilder());
-   }
-
-   public StringBuilder getStringBuilder()
-   {
-     return (StringBuilder)_buf;
-   }
-
-   public byte[] getRawBytes()
-   {
-       return ((CharSequence)_buf).toString().getBytes(
-           Charset.forName(_usesUnicode ? "UTF-16LE" : "Cp1252")
-       );
-   }
-
-   /**
-    * Returns part of the string.
-    * Works only in characters, not in bytes!
-    * @param start Local start position, in characters
-    * @param end Local end position, in characters
-    */
-   @Deprecated
-   public String substring(int start, int end)
-   {
-       StringBuilder buf = (StringBuilder)_buf;
-
-	   // Validate
-	   if(start < 0) {
-		   throw new StringIndexOutOfBoundsException("Can't request a substring before 0 - asked for " + start);
-	   }
-	   if(end > buf.length()) {
-		   throw new StringIndexOutOfBoundsException("Index " + end + " out of range 0 -> " + buf.length());
-	   }
-	   if(end < start) {
-		   throw new StringIndexOutOfBoundsException("Asked for text from " + start + " to " + end + ", which has an end before the start!");
-	   }
-	   return buf.substring(start, end);
-   }
-
-   /**
-    * Adjusts the internal string for deletinging
-    *  some characters within this.
-    * @param start The start position for the delete, in characters
-    * @param length The number of characters to delete
-    */
-   @Deprecated
-   public void adjustForDelete(int start, int length) {
-	   int numChars = length;
-
-	   int myStart = getStart();
-	   int myEnd = getEnd();
-	   int end = start + numChars;
-
-	   /* do we have to delete from this text piece? */
-	   if (start <= myEnd && end >= myStart) {
-
-		   /* find where the deleted area overlaps with this text piece */
-		   int overlapStart = Math.max(myStart, start);
-		   int overlapEnd = Math.min(myEnd, end);
-
-		   int bufStart = overlapStart - myStart;
-		   int bufEnd = overlapEnd - myStart;
-		   ((StringBuilder)_buf).delete(bufStart, bufEnd);
-	   }
-
-	   // We need to invoke this even if text from this piece is not being
-	   // deleted because the adjustment must propagate to all subsequent
-	   // text pieces i.e., if text from tp[n] is being deleted, then
-	   // tp[n + 1], tp[n + 2], etc. will need to be adjusted.
-	   // The superclass is expected to use a separate sentry for this.
-	   super.adjustForDelete(start, length);
-   }
-
-   /**
-    * Returns the length, in characters
-    */
-   @Deprecated
-   public int characterLength()
-   {
-     return (getEnd() - getStart());
-   }
-   /**
-    * Returns the length, in bytes
-    */
-   public int bytesLength() {
-	   return (getEnd() - getStart()) * (_usesUnicode ? 2 : 1);
-   }
-
-   @Override
-   public boolean equals(Object o)
-   {
-     if (!(o instanceof TextPiece)) return false;
-     TextPiece tp = (TextPiece)o;
-     assert(_buf != null && tp._buf != null && _pd != null && tp._pd != null);
-     
-     return (
-            limitsAreEqual(o)
-         && tp._usesUnicode == this._usesUnicode
-         && tp._buf.toString().equals(this._buf.toString())
-         && tp._pd.equals(this._pd)
-     );
-   }
-
-   @Override
-   public int hashCode() {
-       assert false : "hashCode not designed";
-       return 42; // any arbitrary constant will do
-   }
-
-
-   /**
-    * Returns the character position we start at.
-    */
-   public int getCP()
-   {
-     return getStart();
-   }
-
-    public String toString()
-    {
-        return "TextPiece from " + getStart() + " to " + getEnd() + " ("
-                + getPieceDescriptor() + ")";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
deleted file mode 100644
index 6a42e2b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * The piece table for matching up character positions to bits of text. This
- * mostly works in bytes, but the TextPieces themselves work in characters. This
- * does the icky convertion.
- * 
- * @author Ryan Ackley
- */
-@Internal
-public class TextPieceTable implements CharIndexTranslator
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( TextPieceTable.class );
-
-    // int _multiple;
-    int _cpMin;
-    protected ArrayList<TextPiece> _textPieces = new ArrayList<TextPiece>();
-    protected ArrayList<TextPiece> _textPiecesFCOrder = new ArrayList<TextPiece>();
-
-    public TextPieceTable()
-    {
-    }
-
-    public TextPieceTable( byte[] documentStream, byte[] tableStream,
-            int offset, int size, int fcMin )
-    {
-        // get our plex of PieceDescriptors
-        PlexOfCps pieceTable = new PlexOfCps( tableStream, offset, size,
-                PieceDescriptor.getSizeInBytes() );
-
-        int length = pieceTable.length();
-        PieceDescriptor[] pieces = new PieceDescriptor[length];
-
-        // iterate through piece descriptors raw bytes and create
-        // PieceDescriptor objects
-        for ( int x = 0; x < length; x++ )
-        {
-            GenericPropertyNode node = pieceTable.getProperty( x );
-            pieces[x] = new PieceDescriptor( node.getBytes(), 0 );
-        }
-
-        // Figure out the cp of the earliest text piece
-        // Note that text pieces don't have to be stored in order!
-        _cpMin = pieces[0].getFilePosition() - fcMin;
-        for ( int x = 0; x < pieces.length; x++ )
-        {
-            int start = pieces[x].getFilePosition() - fcMin;
-            if ( start < _cpMin )
-            {
-                _cpMin = start;
-            }
-        }
-
-        // using the PieceDescriptors, build our list of TextPieces.
-        for ( int x = 0; x < pieces.length; x++ )
-        {
-            int start = pieces[x].getFilePosition();
-            GenericPropertyNode node = pieceTable.getProperty( x );
-
-            // Grab the start and end, which are in characters
-            int nodeStartChars = node.getStart();
-            int nodeEndChars = node.getEnd();
-
-            // What's the relationship between bytes and characters?
-            boolean unicode = pieces[x].isUnicode();
-            int multiple = 1;
-            if ( unicode )
-            {
-                multiple = 2;
-            }
-
-            // Figure out the length, in bytes and chars
-            int textSizeChars = ( nodeEndChars - nodeStartChars );
-            int textSizeBytes = textSizeChars * multiple;
-
-            // Grab the data that makes up the piece
-            byte[] buf = new byte[textSizeBytes];
-            System.arraycopy( documentStream, start, buf, 0, textSizeBytes );
-
-            // And now build the piece
-            final TextPiece newTextPiece = new TextPiece( nodeStartChars, nodeEndChars, buf,
-                    pieces[x] );
-
-            _textPieces.add( newTextPiece );
-        }
-
-        // In the interest of our sanity, now sort the text pieces
-        // into order, if they're not already
-        Collections.sort( _textPieces );
-        _textPiecesFCOrder = new ArrayList<TextPiece>( _textPieces );
-        Collections.sort( _textPiecesFCOrder, new FCComparator() );
-    }
-
-    public void add( TextPiece piece )
-    {
-        _textPieces.add( piece );
-        _textPiecesFCOrder.add( piece );
-        Collections.sort( _textPieces );
-        Collections.sort( _textPiecesFCOrder, new FCComparator() );
-    }
-
-    /**
-     * Adjust all the text piece after inserting some text into one of them
-     * 
-     * @param listIndex
-     *            The TextPiece that had characters inserted into
-     * @param length
-     *            The number of characters inserted
-     */
-    public int adjustForInsert( int listIndex, int length )
-    {
-        int size = _textPieces.size();
-
-        TextPiece tp = _textPieces.get( listIndex );
-
-        // Update with the new end
-        tp.setEnd( tp.getEnd() + length );
-
-        // Now change all subsequent ones
-        for ( int x = listIndex + 1; x < size; x++ )
-        {
-            tp = _textPieces.get( x );
-            tp.setStart( tp.getStart() + length );
-            tp.setEnd( tp.getEnd() + length );
-        }
-
-        // All done
-        return length;
-    }
-
-    public boolean equals( Object o )
-    {
-        if (!(o instanceof TextPieceTable)) return false;
-        TextPieceTable tpt = (TextPieceTable) o;
-
-        int size = tpt._textPieces.size();
-        if ( size == _textPieces.size() )
-        {
-            for ( int x = 0; x < size; x++ )
-            {
-                if ( !tpt._textPieces.get( x ).equals( _textPieces.get( x ) ) )
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public int getByteIndex( int charPos )
-    {
-        int byteCount = 0;
-        for ( TextPiece tp : _textPieces )
-        {
-            if ( charPos >= tp.getEnd() )
-            {
-                byteCount = tp.getPieceDescriptor().getFilePosition()
-                        + ( tp.getEnd() - tp.getStart() )
-                        * ( tp.isUnicode() ? 2 : 1 );
-
-                if ( charPos == tp.getEnd() )
-                    break;
-
-                continue;
-            }
-            if ( charPos < tp.getEnd() )
-            {
-                int left = charPos - tp.getStart();
-                byteCount = tp.getPieceDescriptor().getFilePosition() + left
-                        * ( tp.isUnicode() ? 2 : 1 );
-                break;
-            }
-        }
-        return byteCount;
-    }
-
-    @Deprecated
-    public int getCharIndex( int bytePos )
-    {
-        return getCharIndex( bytePos, 0 );
-    }
-
-    @Deprecated
-    public int getCharIndex( int startBytePos, int startCP )
-    {
-        int charCount = 0;
-
-        int bytePos = lookIndexForward( startBytePos );
-
-        for ( TextPiece tp : _textPieces )
-        {
-            int pieceStart = tp.getPieceDescriptor().getFilePosition();
-
-            int bytesLength = tp.bytesLength();
-            int pieceEnd = pieceStart + bytesLength;
-
-            int toAdd;
-
-            if ( bytePos < pieceStart || bytePos > pieceEnd )
-            {
-                toAdd = bytesLength;
-            }
-            else if ( bytePos > pieceStart && bytePos < pieceEnd )
-            {
-                toAdd = ( bytePos - pieceStart );
-            }
-            else
-            {
-                toAdd = bytesLength - ( pieceEnd - bytePos );
-            }
-
-            if ( tp.isUnicode() )
-            {
-                charCount += toAdd / 2;
-            }
-            else
-            {
-                charCount += toAdd;
-            }
-
-            if ( bytePos >= pieceStart && bytePos <= pieceEnd
-                    && charCount >= startCP )
-            {
-                break;
-            }
-        }
-
-        return charCount;
-    }
-
-    @Override
-    public int[][] getCharIndexRanges( int startBytePosInclusive,
-            int endBytePosExclusive )
-    {
-        List<int[]> result = new LinkedList<int[]>();
-        for ( TextPiece textPiece : _textPiecesFCOrder )
-        {
-            final int tpStart = textPiece.getPieceDescriptor()
-                    .getFilePosition();
-            final int tpEnd = textPiece.getPieceDescriptor().getFilePosition()
-                    + textPiece.bytesLength();
-            if ( startBytePosInclusive > tpEnd )
-                continue;
-            if ( endBytePosExclusive <= tpStart )
-                break;
-
-            final int rangeStartBytes = Math.max( tpStart,
-                    startBytePosInclusive );
-            final int rangeEndBytes = Math.min( tpEnd, endBytePosExclusive );
-            final int rangeLengthBytes = rangeEndBytes - rangeStartBytes;
-
-            if ( rangeStartBytes > rangeEndBytes )
-                continue;
-
-            final int encodingMultiplier = textPiece.isUnicode() ? 2 : 1;
-
-            final int rangeStartCp = textPiece.getStart()
-                    + ( rangeStartBytes - tpStart ) / encodingMultiplier;
-            final int rangeEndCp = rangeStartCp + rangeLengthBytes
-                    / encodingMultiplier;
-
-            result.add( new int[] { rangeStartCp, rangeEndCp } );
-        }
-
-        return result.toArray( new int[result.size()][] );
-    }
-
-    public int getCpMin()
-    {
-        return _cpMin;
-    }
-
-    public StringBuilder getText()
-    {
-        final long start = System.currentTimeMillis();
-
-        // rebuild document paragraphs structure
-        StringBuilder docText = new StringBuilder();
-        for ( TextPiece textPiece : _textPieces )
-        {
-            String toAppend = textPiece.getStringBuilder().toString();
-            int toAppendLength = toAppend.length();
-
-            if ( toAppendLength != textPiece.getEnd() - textPiece.getStart() )
-            {
-                logger.log(
-                        POILogger.WARN,
-                        "Text piece has boundaries [",
-                        Integer.valueOf( textPiece.getStart() ),
-                        "; ",
-                        Integer.valueOf( textPiece.getEnd() ),
-                        ") but length ",
-                        Integer.valueOf( textPiece.getEnd()
-                                - textPiece.getStart() ) );
-            }
-
-            docText.replace( textPiece.getStart(), textPiece.getStart()
-                    + toAppendLength, toAppend );
-        }
-
-        logger.log( POILogger.DEBUG, "Document text were rebuilded in ",
-                Long.valueOf( System.currentTimeMillis() - start ), " ms (",
-                Integer.valueOf( docText.length() ), " chars)" );
-
-        return docText;
-    }
-
-    public List<TextPiece> getTextPieces()
-    {
-        return _textPieces;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return _textPieces.size();
-    }
-
-    public boolean isIndexInTable( int bytePos )
-    {
-        for ( TextPiece tp : _textPiecesFCOrder )
-        {
-            int pieceStart = tp.getPieceDescriptor().getFilePosition();
-
-            if ( bytePos > pieceStart + tp.bytesLength() )
-            {
-                continue;
-            }
-
-            if ( pieceStart > bytePos )
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    boolean isIndexInTable( int startBytePos, int endBytePos )
-    {
-        for ( TextPiece tp : _textPiecesFCOrder )
-        {
-            int pieceStart = tp.getPieceDescriptor().getFilePosition();
-
-            if ( startBytePos >= pieceStart + tp.bytesLength() )
-            {
-                continue;
-            }
-
-            int left = Math.max( startBytePos, pieceStart );
-            int right = Math.min( endBytePos, pieceStart + tp.bytesLength() );
-
-            if ( left >= right )
-                return false;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    public int lookIndexBackward( final int startBytePos )
-    {
-        int bytePos = startBytePos;
-        int lastEnd = 0;
-
-        for ( TextPiece tp : _textPiecesFCOrder )
-        {
-            int pieceStart = tp.getPieceDescriptor().getFilePosition();
-
-            if ( bytePos > pieceStart + tp.bytesLength() )
-            {
-                lastEnd = pieceStart + tp.bytesLength();
-                continue;
-            }
-
-            if ( pieceStart > bytePos )
-            {
-                bytePos = lastEnd;
-            }
-
-            break;
-        }
-
-        return bytePos;
-    }
-
-    public int lookIndexForward( final int startBytePos )
-    {
-        if ( _textPiecesFCOrder.isEmpty() )
-            throw new IllegalStateException( "Text pieces table is empty" );
-
-        if ( _textPiecesFCOrder.get( 0 ).getPieceDescriptor().getFilePosition() > startBytePos )
-            return _textPiecesFCOrder.get( 0 ).getPieceDescriptor().getFilePosition();
-
-        if ( _textPiecesFCOrder.get( _textPiecesFCOrder.size() - 1 )
-                .getPieceDescriptor().getFilePosition() <= startBytePos )
-            return startBytePos;
-
-        int low = 0;
-        int high = _textPiecesFCOrder.size() - 1;
-
-        while ( low <= high )
-        {
-            int mid = ( low + high ) >>> 1;
-            final TextPiece textPiece = _textPiecesFCOrder.get( mid );
-            int midVal = textPiece.getPieceDescriptor().getFilePosition();
-
-            if ( midVal < startBytePos )
-                low = mid + 1;
-            else if ( midVal > startBytePos )
-                high = mid - 1;
-            else
-                // found piece with exact start
-                return textPiece.getPieceDescriptor().getFilePosition();
-        }
-        assert low == high;
-        assert _textPiecesFCOrder.get( low ).getPieceDescriptor()
-                .getFilePosition() < startBytePos;
-        // last line can't be current, can it?
-        assert _textPiecesFCOrder.get( low + 1 ).getPieceDescriptor()
-                .getFilePosition() > startBytePos;
-
-        // shifting to next piece start
-        return _textPiecesFCOrder.get( low + 1 ).getPieceDescriptor().getFilePosition();
-    }
-
-    public byte[] writeTo( HWPFOutputStream docStream ) throws IOException
-    {
-        PlexOfCps textPlex = new PlexOfCps( PieceDescriptor.getSizeInBytes() );
-        // int fcMin = docStream.getOffset();
-
-        int size = _textPieces.size();
-        for ( int x = 0; x < size; x++ )
-        {
-            TextPiece next = _textPieces.get( x );
-            PieceDescriptor pd = next.getPieceDescriptor();
-
-            int offset = docStream.getOffset();
-            int mod = ( offset % POIFSConstants.SMALLER_BIG_BLOCK_SIZE );
-            if ( mod != 0 )
-            {
-                mod = POIFSConstants.SMALLER_BIG_BLOCK_SIZE - mod;
-                byte[] buf = new byte[mod];
-                docStream.write( buf );
-            }
-
-            // set the text piece position to the current docStream offset.
-            pd.setFilePosition( docStream.getOffset() );
-
-            // write the text to the docstream and save the piece descriptor to
-            // the
-            // plex which will be written later to the tableStream.
-            docStream.write( next.getRawBytes() );
-
-            // The TextPiece is already in characters, which
-            // makes our life much easier
-            int nodeStart = next.getStart();
-            int nodeEnd = next.getEnd();
-            textPlex.addProperty( new GenericPropertyNode( nodeStart, nodeEnd,
-                    pd.toByteArray() ) );
-        }
-
-        return textPlex.toByteArray();
-    }
-
-    private static class FCComparator implements Comparator<TextPiece>, Serializable
-    {
-        public int compare( TextPiece textPiece, TextPiece textPiece1 )
-        {
-            if ( textPiece.getPieceDescriptor().fc > textPiece1
-                    .getPieceDescriptor().fc )
-            {
-                return 1;
-            }
-            else if ( textPiece.getPieceDescriptor().fc < textPiece1
-                    .getPieceDescriptor().fc )
-            {
-                return -1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java
deleted file mode 100644
index 5de2fe5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class UPX
-{
-  private byte[] _upx;
-
-  public UPX(byte[] upx)
-  {
-    _upx = upx;
-  }
-
-  public byte[] getUPX()
-  {
-    return _upx;
-  }
-  public int size()
-  {
-    return _upx.length;
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof UPX)) return false;
-    UPX upx = (UPX)o;
-    return Arrays.equals(_upx, upx._upx);
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-
-    @Override
-    public String toString()
-    {
-        return "[UPX] " + Arrays.toString( _upx );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
deleted file mode 100644
index 89d5c49..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.Internal;
-
-/**
- * A data structure used to hold some data we don't
- *  understand / can't handle, so we have it available
- *  for when we come to write back out again 
- */
-@Internal
-public final class UnhandledDataStructure
-{
-  private final byte[] _buf;
-
-  public UnhandledDataStructure(byte[] buf, int offset, int length)
-  {
-    // Sanity check the size they've asked for
-    int offsetEnd = offset + length;
-    if (offsetEnd > buf.length || offsetEnd < 0)
-    {
-      throw new IndexOutOfBoundsException("Buffer Length is " + buf.length + " " +
-                                          "but code is tried to read " + length + " " + 
-                                          "from offset " + offset + " to " + offsetEnd);
-    }
-    if (offset < 0 || length < 0)
-    {
-       throw new IndexOutOfBoundsException("Offset and Length must both be >= 0, negative " +
-       		"indicies are not permitted - code is tried to read " + length + " from offset " + offset);
-    }
-    
-    // Save that requested portion of the data 
-    _buf = Arrays.copyOfRange(buf, offset, offsetEnd);
-
-  }
-
-  /*package*/ byte[] getBuf()
-  {
-    return _buf;
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java
deleted file mode 100644
index 69e30af..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hwpf.model;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The Xst structure is a string. The string is prepended by its length and is
- * not null-terminated.
- * <p>
- * Documentation quoted from Page 424 of 621. [MS-DOC] -- v20110315 Word (.doc)
- * Binary File Format
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class Xst
-{
-
-    /**
-     * An unsigned integer that specifies the number of characters that are
-     * contained in the rgtchar array.
-     */
-    private int _cch;
-
-    /**
-     * An array of 16-bit Unicode characters that make up a string.
-     */
-    private char[] _rgtchar;
-
-    public Xst()
-    {
-        _cch = 0;
-        _rgtchar = new char[0];
-    }
-
-    public Xst( byte[] data, int startOffset )
-    {
-        int offset = startOffset;
-
-        _cch = LittleEndian.getUShort( data, offset );
-        offset += LittleEndian.SHORT_SIZE;
-
-        _rgtchar = new char[_cch];
-        for ( int x = 0; x < _cch; x++ )
-        {
-            _rgtchar[x] = (char) LittleEndian.getShort( data, offset );
-            offset += LittleEndian.SHORT_SIZE;
-        }
-
-    }
-
-    public Xst( String str )
-    {
-        _cch = str.length();
-        _rgtchar = str.toCharArray();
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        Xst other = (Xst) obj;
-        if ( _cch != other._cch )
-            return false;
-        if ( !Arrays.equals( _rgtchar, other._rgtchar ) )
-            return false;
-        return true;
-    }
-
-    public String getAsJavaString()
-    {
-        return new String( _rgtchar );
-    }
-
-    /**
-     * An unsigned integer that specifies the number of characters that are
-     * contained in the rgtchar array.
-     */
-    public int getCch()
-    {
-        return _cch;
-    }
-
-    /**
-     * An array of 16-bit Unicode characters that make up a string.
-     */
-    public char[] getRgtchar()
-    {
-        return _rgtchar;
-    }
-
-    public int getSize()
-    {
-        return LittleEndian.SHORT_SIZE + _rgtchar.length * 2;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + _cch;
-        result = prime * result + Arrays.hashCode( _rgtchar );
-        return result;
-    }
-
-    public void serialize( byte[] data, int startOffset )
-    {
-        int offset = startOffset;
-
-        LittleEndian.putUShort( data, offset, _cch );
-        offset += LittleEndian.SHORT_SIZE;
-
-        for ( char c : _rgtchar )
-        {
-            LittleEndian.putShort( data, offset, (short) c );
-            offset += LittleEndian.SHORT_SIZE;
-        }
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Xst [" + _cch + "; " + Arrays.toString(_rgtchar) + "]";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java
deleted file mode 100644
index 4aef017..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-public class Xstz
-{
-    private static final POILogger log = POILogFactory.getLogger( Xstz.class );
-
-    private final short _chTerm = 0;
-    private Xst _xst;
-
-    public Xstz()
-    {
-        _xst = new Xst();
-    }
-
-    public Xstz( byte[] data, int startOffset )
-    {
-        fillFields( data, startOffset );
-    }
-
-    public void fillFields( byte[] data, int startOffset )
-    {
-        int offset = startOffset;
-
-        _xst = new Xst( data, offset );
-        offset += _xst.getSize();
-
-        short term = LittleEndian.getShort( data, offset );
-        if ( term != 0 )
-        {
-            if (log.check(POILogger.WARN)) {
-                log.log(POILogger.WARN, "chTerm at the end of Xstz at offset ",
-                        offset, " is not 0");
-            }
-        }
-    }
-
-    public String getAsJavaString()
-    {
-        return _xst.getAsJavaString();
-    }
-
-    public int getSize()
-    {
-        return _xst.getSize() + LittleEndian.SHORT_SIZE;
-    }
-
-    public int serialize( byte[] data, int startOffset )
-    {
-        int offset = startOffset;
-
-        _xst.serialize( data, offset );
-        offset += _xst.getSize();
-
-        LittleEndian.putUShort( data, offset, _chTerm );
-        offset += LittleEndian.SHORT_SIZE;
-
-        return offset - startOffset;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "[Xstz]" + _xst.getAsJavaString() + "[/Xstz]";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
deleted file mode 100644
index 9663f01..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.io;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class HWPFFileSystem
-{
-  Map<String, HWPFOutputStream> _streams = new HashMap<String, HWPFOutputStream>();
-
-  public HWPFFileSystem()
-  {
-    _streams.put("WordDocument", new HWPFOutputStream());
-    _streams.put("1Table", new HWPFOutputStream());
-    _streams.put("Data", new HWPFOutputStream());
-  }
-
-  public HWPFOutputStream getStream(String name)
-  {
-    return _streams.get(name);
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java
deleted file mode 100644
index 0ed0205..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.io;
-
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.util.Internal;
-
-@Internal
-public final class HWPFOutputStream extends ByteArrayOutputStream
-{
-
-  int _offset;
-
-  public HWPFOutputStream()
-  {
-    super();
-  }
-
-  public int getOffset()
-  {
-    return _offset;
-  }
-
-  public synchronized void reset()
-  {
-    super.reset();
-    _offset = 0;
-  }
-
-  public synchronized void write(byte[] buf, int off, int len)
-  {
-    super.write(buf, off, len);
-    _offset += len;
-  }
-
-  public synchronized void write(int b)
-  {
-    super.write(b);
-    _offset++;
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java
deleted file mode 100644
index fb62447..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * BooKmark First descriptor (BKF).
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format (.doc) Specification
- * 
- * NOTE: This source is automatically generated please do not modify this file.
- * Either subclass or remove the record in src/types/definitions.
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format (.doc) Specification
- */
-@Internal
-public abstract class BKFAbstractType
-{
-
-    protected short field_1_ibkl;
-    protected short field_2_bkf_flags;
-    /**/private static BitField itcFirst = new BitField( 0x007F );
-    /**/private static BitField fPub = new BitField( 0x0080 );
-    /**/private static BitField itcLim = new BitField( 0x7F00 );
-    /**/private static BitField fCol = new BitField( 0x8000 );
-
-    protected BKFAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_ibkl                   = LittleEndian.getShort(data, 0x0 + offset);
-        field_2_bkf_flags              = LittleEndian.getShort(data, 0x2 + offset);
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putShort(data, 0x0 + offset, field_1_ibkl);
-        LittleEndian.putShort(data, 0x2 + offset, field_2_bkf_flags);
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[BKF]\n");
-        builder.append("    .ibkl                 = ");
-        builder.append(" (").append(getIbkl()).append(" )\n");
-        builder.append("    .bkf_flags            = ");
-        builder.append(" (").append(getBkf_flags()).append(" )\n");
-        builder.append("         .itcFirst                 = ").append(getItcFirst()).append('\n');
-        builder.append("         .fPub                     = ").append(isFPub()).append('\n');
-        builder.append("         .itcLim                   = ").append(getItcLim()).append('\n');
-        builder.append("         .fCol                     = ").append(isFCol()).append('\n');
-
-        builder.append("[/BKF]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Index to BKL entry in plcfbkl that describes the ending position of this bookmark in the CP stream.
-     */
-    public short getIbkl()
-    {
-        return field_1_ibkl;
-    }
-
-    /**
-     * Index to BKL entry in plcfbkl that describes the ending position of this bookmark in the CP stream.
-     */
-    public void setIbkl( short field_1_ibkl )
-    {
-        this.field_1_ibkl = field_1_ibkl;
-    }
-
-    /**
-     * Get the bkf_flags field for the BKF record.
-     */
-    public short getBkf_flags()
-    {
-        return field_2_bkf_flags;
-    }
-
-    /**
-     * Set the bkf_flags field for the BKF record.
-     */
-    public void setBkf_flags( short field_2_bkf_flags )
-    {
-        this.field_2_bkf_flags = field_2_bkf_flags;
-    }
-
-    /**
-     * Sets the itcFirst field value.
-     * When bkf.fCol==1, this is the index to the first column of a table column bookmark
-     */
-    public void setItcFirst( byte value )
-    {
-        field_2_bkf_flags = (short)itcFirst.setValue(field_2_bkf_flags, value);
-    }
-
-    /**
-     * When bkf.fCol==1, this is the index to the first column of a table column bookmark
-     * @return  the itcFirst field value.
-     */
-    public byte getItcFirst()
-    {
-        return ( byte )itcFirst.getValue(field_2_bkf_flags);
-    }
-
-    /**
-     * Sets the fPub field value.
-     * When 1, this indicates that this bookmark is marking the range of a Macintosh Publisher section
-     */
-    public void setFPub( boolean value )
-    {
-        field_2_bkf_flags = (short)fPub.setBoolean(field_2_bkf_flags, value);
-    }
-
-    /**
-     * When 1, this indicates that this bookmark is marking the range of a Macintosh Publisher section
-     * @return  the fPub field value.
-     */
-    public boolean isFPub()
-    {
-        return fPub.isSet(field_2_bkf_flags);
-    }
-
-    /**
-     * Sets the itcLim field value.
-     * When bkf.fCol==1, this is the index to limit column of a table column bookmark
-     */
-    public void setItcLim( byte value )
-    {
-        field_2_bkf_flags = (short)itcLim.setValue(field_2_bkf_flags, value);
-    }
-
-    /**
-     * When bkf.fCol==1, this is the index to limit column of a table column bookmark
-     * @return  the itcLim field value.
-     */
-    public byte getItcLim()
-    {
-        return ( byte )itcLim.getValue(field_2_bkf_flags);
-    }
-
-    /**
-     * Sets the fCol field value.
-     * When 1, this bookmark marks a range of columns in a table specified by (bkf.itcFirst, bkf.itcLim)
-     */
-    public void setFCol( boolean value )
-    {
-        field_2_bkf_flags = (short)fCol.setBoolean(field_2_bkf_flags, value);
-    }
-
-    /**
-     * When 1, this bookmark marks a range of columns in a table specified by (bkf.itcFirst, bkf.itcLim)
-     * @return  the fCol field value.
-     */
-    public boolean isFCol()
-    {
-        return fCol.isSet(field_2_bkf_flags);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java
deleted file mode 100644
index 92e001a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java
+++ /dev/null
@@ -1,3033 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.model.Colorref;
-import org.apache.poi.hwpf.model.Hyphenation;
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.DateAndTime;
-import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-
-/**
- * Character Properties.
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author S. Ryan Ackley
- */
-@Internal
-public abstract class CHPAbstractType
-{
-
-    protected int field_1_grpfChp;
-    /**/private static final BitField fBold = new BitField(0x00000001);
-    /**/private static final BitField fItalic = new BitField(0x00000002);
-    /**/private static final BitField fRMarkDel = new BitField(0x00000004);
-    /**/private static final BitField fOutline = new BitField(0x00000008);
-    /**/private static final BitField fFldVanish = new BitField(0x00000010);
-    /**/private static final BitField fSmallCaps = new BitField(0x00000020);
-    /**/private static final BitField fCaps = new BitField(0x00000040);
-    /**/private static final BitField fVanish = new BitField(0x00000080);
-    /**/private static final BitField fRMark = new BitField(0x00000100);
-    /**/private static final BitField fSpec = new BitField(0x00000200);
-    /**/private static final BitField fStrike = new BitField(0x00000400);
-    /**/private static final BitField fObj = new BitField(0x00000800);
-    /**/private static final BitField fShadow = new BitField(0x00001000);
-    /**/private static final BitField fLowerCase = new BitField(0x00002000);
-    /**/private static final BitField fData = new BitField(0x00004000);
-    /**/private static final BitField fOle2 = new BitField(0x00008000);
-    /**/private static final BitField fEmboss = new BitField(0x00010000);
-    /**/private static final BitField fImprint = new BitField(0x00020000);
-    /**/private static final BitField fDStrike = new BitField(0x00040000);
-    /**/private static final BitField fUsePgsuSettings = new BitField(0x00080000);
-    /**/private static final BitField fBoldBi = new BitField(0x00100000);
-    /**/private static final BitField fComplexScripts = new BitField(0x00100000);
-    /**/private static final BitField fItalicBi = new BitField(0x00200000);
-    /**/private static final BitField fBiDi = new BitField(0x00400000);
-    /**/private static final BitField fIcoBi = new BitField(0x00800000);
-    /**/private static final BitField fNonGlyph = new BitField(0x01000000);
-    /**/private static final BitField fBoldOther = new BitField(0x02000000);
-    /**/private static final BitField fItalicOther = new BitField(0x04000000);
-    /**/private static final BitField fNoProof = new BitField(0x08000000);
-    /**/private static final BitField fWebHidden = new BitField(0x10000000);
-    /**/private static final BitField fFitText = new BitField(0x20000000);
-    /**/private static final BitField fCalc = new BitField(0x40000000);
-    /**/private static final BitField fFmtLineProp = new BitField(0x80000000);
-    protected int field_2_hps;
-    protected int field_3_ftcAscii;
-    protected int field_4_ftcFE;
-    protected int field_5_ftcOther;
-    protected int field_6_ftcBi;
-    protected int field_7_dxaSpace;
-    protected Colorref field_8_cv;
-    protected byte field_9_ico;
-    protected int field_10_pctCharWidth;
-    protected int field_11_lidDefault;
-    protected int field_12_lidFE;
-    protected byte field_13_kcd;
-    /**/protected final static byte KCD_NON = 0;
-    /**/protected final static byte KCD_DOT = 1;
-    /**/protected final static byte KCD_COMMA = 2;
-    /**/protected final static byte KCD_CIRCLE = 3;
-    /**/protected final static byte KCD_UNDER_DOT = 4;
-    protected boolean field_14_fUndetermine;
-    protected byte field_15_iss;
-    /**/protected final static byte ISS_NONE = 0;
-    /**/protected final static byte ISS_SUPERSCRIPTED = 1;
-    /**/protected final static byte ISS_SUBSCRIPTED = 2;
-    protected boolean field_16_fSpecSymbol;
-    protected byte field_17_idct;
-    protected byte field_18_idctHint;
-    protected byte field_19_kul;
-    /**/protected final static byte KUL_NONE = 0;
-    /**/protected final static byte KUL_SINGLE = 1;
-    /**/protected final static byte KUL_BY_WORD = 2;
-    /**/protected final static byte KUL_DOUBLE = 3;
-    /**/protected final static byte KUL_DOTTED = 4;
-    /**/protected final static byte KUL_HIDDEN = 5;
-    /**/protected final static byte KUL_THICK = 6;
-    /**/protected final static byte KUL_DASH = 7;
-    /**/protected final static byte KUL_DOT = 8;
-    /**/protected final static byte KUL_DOT_DASH = 9;
-    /**/protected final static byte KUL_DOT_DOT_DASH = 10;
-    /**/protected final static byte KUL_WAVE = 11;
-    /**/protected final static byte KUL_DOTTED_HEAVY = 20;
-    /**/protected final static byte KUL_DASHED_HEAVY = 23;
-    /**/protected final static byte KUL_DOT_DASH_HEAVY = 25;
-    /**/protected final static byte KUL_DOT_DOT_DASH_HEAVY = 26;
-    /**/protected final static byte KUL_WAVE_HEAVY = 27;
-    /**/protected final static byte KUL_DASH_LONG = 39;
-    /**/protected final static byte KUL_WAVE_DOUBLE = 43;
-    /**/protected final static byte KUL_DASH_LONG_HEAVY = 55;
-    protected Hyphenation field_20_hresi;
-    protected int field_21_hpsKern;
-    protected short field_22_hpsPos;
-    protected ShadingDescriptor field_23_shd;
-    protected BorderCode field_24_brc;
-    protected int field_25_ibstRMark;
-    protected byte field_26_sfxtText;
-    /**/protected final static byte SFXTTEXT_NO = 0;
-    /**/protected final static byte SFXTTEXT_LAS_VEGAS_LIGHTS = 1;
-    /**/protected final static byte SFXTTEXT_BACKGROUND_BLINK = 2;
-    /**/protected final static byte SFXTTEXT_SPARKLE_TEXT = 3;
-    /**/protected final static byte SFXTTEXT_MARCHING_ANTS = 4;
-    /**/protected final static byte SFXTTEXT_MARCHING_RED_ANTS = 5;
-    /**/protected final static byte SFXTTEXT_SHIMMER = 6;
-    protected boolean field_27_fDblBdr;
-    protected boolean field_28_fBorderWS;
-    protected short field_29_ufel;
-    /**/private static final BitField itypFELayout = new BitField(0x00ff);
-    /**/private static final BitField fTNY = new BitField(0x0100);
-    /**/private static final BitField fWarichu = new BitField(0x0200);
-    /**/private static final BitField fKumimoji = new BitField(0x0400);
-    /**/private static final BitField fRuby = new BitField(0x0800);
-    /**/private static final BitField fLSFitText = new BitField(0x1000);
-    /**/private static final BitField spare = new BitField(0xe000);
-    protected byte field_30_copt;
-    /**/private static final BitField iWarichuBracket = new BitField(0x07);
-    /**/private static final BitField fWarichuNoOpenBracket = new BitField(0x08);
-    /**/private static final BitField fTNYCompress = new BitField(0x10);
-    /**/private static final BitField fTNYFetchTxm = new BitField(0x20);
-    /**/private static final BitField fCellFitText = new BitField(0x40);
-    /**/private static final BitField unused = new BitField(0x80);
-    protected int field_31_hpsAsci;
-    protected int field_32_hpsFE;
-    protected int field_33_hpsBi;
-    protected int field_34_ftcSym;
-    protected int field_35_xchSym;
-    protected int field_36_fcPic;
-    protected int field_37_fcObj;
-    protected int field_38_lTagObj;
-    protected int field_39_fcData;
-    protected Hyphenation field_40_hresiOld;
-    protected int field_41_ibstRMarkDel;
-    protected DateAndTime field_42_dttmRMark;
-    protected DateAndTime field_43_dttmRMarkDel;
-    protected int field_44_istd;
-    protected int field_45_idslRMReason;
-    protected int field_46_idslReasonDel;
-    protected int field_47_cpg;
-    protected short field_48_Highlight;
-    /**/private static final BitField icoHighlight = new BitField(0x001f);
-    /**/private static final BitField fHighlight = new BitField(0x0020);
-    protected short field_49_CharsetFlags;
-    /**/private static final BitField fChsDiff = new BitField(0x0001);
-    /**/private static final BitField fMacChs = new BitField(0x0020);
-    protected short field_50_chse;
-    protected boolean field_51_fPropRMark;
-    protected int field_52_ibstPropRMark;
-    protected DateAndTime field_53_dttmPropRMark;
-    protected boolean field_54_fConflictOrig;
-    protected boolean field_55_fConflictOtherDel;
-    protected int field_56_wConflict;
-    protected int field_57_IbstConflict;
-    protected DateAndTime field_58_dttmConflict;
-    protected boolean field_59_fDispFldRMark;
-    protected int field_60_ibstDispFldRMark;
-    protected DateAndTime field_61_dttmDispFldRMark;
-    protected byte[] field_62_xstDispFldRMark;
-    protected int field_63_fcObjp;
-    protected byte field_64_lbrCRJ;
-    /**/protected final static byte LBRCRJ_NONE = 0;
-    /**/protected final static byte LBRCRJ_LEFT = 1;
-    /**/protected final static byte LBRCRJ_RIGHT = 2;
-    /**/protected final static byte LBRCRJ_BOTH = 3;
-    protected boolean field_65_fSpecVanish;
-    protected boolean field_66_fHasOldProps;
-    protected boolean field_67_fSdtVanish;
-    protected int field_68_wCharScale;
-
-    protected CHPAbstractType()
-    {
-        this.field_2_hps = 20;
-        this.field_8_cv = new Colorref();
-        this.field_11_lidDefault = 0x0400;
-        this.field_12_lidFE = 0x0400;
-        this.field_20_hresi = new Hyphenation();
-        this.field_23_shd = new ShadingDescriptor();
-        this.field_24_brc = new BorderCode();
-        this.field_36_fcPic = -1;
-        this.field_40_hresiOld = new Hyphenation();
-        this.field_42_dttmRMark = new DateAndTime();
-        this.field_43_dttmRMarkDel = new DateAndTime();
-        this.field_44_istd = 10;
-        this.field_53_dttmPropRMark = new DateAndTime();
-        this.field_58_dttmConflict = new DateAndTime();
-        this.field_61_dttmDispFldRMark = new DateAndTime();
-        this.field_62_xstDispFldRMark = new byte[32];
-        this.field_68_wCharScale = 100;
-    }
-
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        CHPAbstractType other = (CHPAbstractType) obj;
-        if ( field_1_grpfChp != other.field_1_grpfChp )
-            return false;
-        if ( field_2_hps != other.field_2_hps )
-            return false;
-        if ( field_3_ftcAscii != other.field_3_ftcAscii )
-            return false;
-        if ( field_4_ftcFE != other.field_4_ftcFE )
-            return false;
-        if ( field_5_ftcOther != other.field_5_ftcOther )
-            return false;
-        if ( field_6_ftcBi != other.field_6_ftcBi )
-            return false;
-        if ( field_7_dxaSpace != other.field_7_dxaSpace )
-            return false;
-        if ( field_8_cv == null )
-        {
-            if ( other.field_8_cv != null )
-                return false;
-        }
-        else if ( !field_8_cv.equals( other.field_8_cv ) )
-            return false;
-        if ( field_9_ico != other.field_9_ico )
-            return false;
-        if ( field_10_pctCharWidth != other.field_10_pctCharWidth )
-            return false;
-        if ( field_11_lidDefault != other.field_11_lidDefault )
-            return false;
-        if ( field_12_lidFE != other.field_12_lidFE )
-            return false;
-        if ( field_13_kcd != other.field_13_kcd )
-            return false;
-        if ( field_14_fUndetermine != other.field_14_fUndetermine )
-            return false;
-        if ( field_15_iss != other.field_15_iss )
-            return false;
-        if ( field_16_fSpecSymbol != other.field_16_fSpecSymbol )
-            return false;
-        if ( field_17_idct != other.field_17_idct )
-            return false;
-        if ( field_18_idctHint != other.field_18_idctHint )
-            return false;
-        if ( field_19_kul != other.field_19_kul )
-            return false;
-        if ( field_20_hresi == null )
-        {
-            if ( other.field_20_hresi != null )
-                return false;
-        }
-        else if ( !field_20_hresi.equals( other.field_20_hresi ) )
-            return false;
-        if ( field_21_hpsKern != other.field_21_hpsKern )
-            return false;
-        if ( field_22_hpsPos != other.field_22_hpsPos )
-            return false;
-        if ( field_23_shd == null )
-        {
-            if ( other.field_23_shd != null )
-                return false;
-        }
-        else if ( !field_23_shd.equals( other.field_23_shd ) )
-            return false;
-        if ( field_24_brc == null )
-        {
-            if ( other.field_24_brc != null )
-                return false;
-        }
-        else if ( !field_24_brc.equals( other.field_24_brc ) )
-            return false;
-        if ( field_25_ibstRMark != other.field_25_ibstRMark )
-            return false;
-        if ( field_26_sfxtText != other.field_26_sfxtText )
-            return false;
-        if ( field_27_fDblBdr != other.field_27_fDblBdr )
-            return false;
-        if ( field_28_fBorderWS != other.field_28_fBorderWS )
-            return false;
-        if ( field_29_ufel != other.field_29_ufel )
-            return false;
-        if ( field_30_copt != other.field_30_copt )
-            return false;
-        if ( field_31_hpsAsci != other.field_31_hpsAsci )
-            return false;
-        if ( field_32_hpsFE != other.field_32_hpsFE )
-            return false;
-        if ( field_33_hpsBi != other.field_33_hpsBi )
-            return false;
-        if ( field_34_ftcSym != other.field_34_ftcSym )
-            return false;
-        if ( field_35_xchSym != other.field_35_xchSym )
-            return false;
-        if ( field_36_fcPic != other.field_36_fcPic )
-            return false;
-        if ( field_37_fcObj != other.field_37_fcObj )
-            return false;
-        if ( field_38_lTagObj != other.field_38_lTagObj )
-            return false;
-        if ( field_39_fcData != other.field_39_fcData )
-            return false;
-        if ( field_40_hresiOld == null )
-        {
-            if ( other.field_40_hresiOld != null )
-                return false;
-        }
-        else if ( !field_40_hresiOld.equals( other.field_40_hresiOld ) )
-            return false;
-        if ( field_41_ibstRMarkDel != other.field_41_ibstRMarkDel )
-            return false;
-        if ( field_42_dttmRMark == null )
-        {
-            if ( other.field_42_dttmRMark != null )
-                return false;
-        }
-        else if ( !field_42_dttmRMark.equals( other.field_42_dttmRMark ) )
-            return false;
-        if ( field_43_dttmRMarkDel == null )
-        {
-            if ( other.field_43_dttmRMarkDel != null )
-                return false;
-        }
-        else if ( !field_43_dttmRMarkDel.equals( other.field_43_dttmRMarkDel ) )
-            return false;
-        if ( field_44_istd != other.field_44_istd )
-            return false;
-        if ( field_45_idslRMReason != other.field_45_idslRMReason )
-            return false;
-        if ( field_46_idslReasonDel != other.field_46_idslReasonDel )
-            return false;
-        if ( field_47_cpg != other.field_47_cpg )
-            return false;
-        if ( field_48_Highlight != other.field_48_Highlight )
-            return false;
-        if ( field_49_CharsetFlags != other.field_49_CharsetFlags )
-            return false;
-        if ( field_50_chse != other.field_50_chse )
-            return false;
-        if ( field_51_fPropRMark != other.field_51_fPropRMark )
-            return false;
-        if ( field_52_ibstPropRMark != other.field_52_ibstPropRMark )
-            return false;
-        if ( field_53_dttmPropRMark == null )
-        {
-            if ( other.field_53_dttmPropRMark != null )
-                return false;
-        }
-        else if ( !field_53_dttmPropRMark.equals( other.field_53_dttmPropRMark ) )
-            return false;
-        if ( field_54_fConflictOrig != other.field_54_fConflictOrig )
-            return false;
-        if ( field_55_fConflictOtherDel != other.field_55_fConflictOtherDel )
-            return false;
-        if ( field_56_wConflict != other.field_56_wConflict )
-            return false;
-        if ( field_57_IbstConflict != other.field_57_IbstConflict )
-            return false;
-        if ( field_58_dttmConflict == null )
-        {
-            if ( other.field_58_dttmConflict != null )
-                return false;
-        }
-        else if ( !field_58_dttmConflict.equals( other.field_58_dttmConflict ) )
-            return false;
-        if ( field_59_fDispFldRMark != other.field_59_fDispFldRMark )
-            return false;
-        if ( field_60_ibstDispFldRMark != other.field_60_ibstDispFldRMark )
-            return false;
-        if ( field_61_dttmDispFldRMark == null )
-        {
-            if ( other.field_61_dttmDispFldRMark != null )
-                return false;
-        }
-        else if ( !field_61_dttmDispFldRMark.equals( other.field_61_dttmDispFldRMark ) )
-            return false;
-        if ( !Arrays.equals( field_62_xstDispFldRMark, other.field_62_xstDispFldRMark ) )
-            return false;
-        if ( field_63_fcObjp != other.field_63_fcObjp )
-            return false;
-        if ( field_64_lbrCRJ != other.field_64_lbrCRJ )
-            return false;
-        if ( field_65_fSpecVanish != other.field_65_fSpecVanish )
-            return false;
-        if ( field_66_fHasOldProps != other.field_66_fHasOldProps )
-            return false;
-        if ( field_67_fSdtVanish != other.field_67_fSdtVanish )
-            return false;
-        if ( field_68_wCharScale != other.field_68_wCharScale )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_grpfChp;
-        result = prime * result + field_2_hps;
-        result = prime * result + field_3_ftcAscii;
-        result = prime * result + field_4_ftcFE;
-        result = prime * result + field_5_ftcOther;
-        result = prime * result + field_6_ftcBi;
-        result = prime * result + field_7_dxaSpace;
-        result = prime * result
-                + ((field_8_cv == null) ? 0 : field_8_cv.hashCode());
-        result = prime * result + field_9_ico;
-        result = prime * result + field_10_pctCharWidth;
-        result = prime * result + field_11_lidDefault;
-        result = prime * result + field_12_lidFE;
-        result = prime * result + field_13_kcd;
-        result = prime * result + ( field_14_fUndetermine? 1231 : 1237 );
-        result = prime * result + field_15_iss;
-        result = prime * result + ( field_16_fSpecSymbol? 1231 : 1237 );
-        result = prime * result + field_17_idct;
-        result = prime * result + field_18_idctHint;
-        result = prime * result + field_19_kul;
-        result = prime * result
-                + ((field_20_hresi == null) ? 0 : field_20_hresi.hashCode());
-        result = prime * result + field_21_hpsKern;
-        result = prime * result + field_22_hpsPos;
-        result = prime * result
-                + ((field_23_shd == null) ? 0 : field_23_shd.hashCode());
-        result = prime * result
-                + ((field_24_brc == null) ? 0 : field_24_brc.hashCode());
-        result = prime * result + field_25_ibstRMark;
-        result = prime * result + field_26_sfxtText;
-        result = prime * result + ( field_27_fDblBdr? 1231 : 1237 );
-        result = prime * result + ( field_28_fBorderWS? 1231 : 1237 );
-        result = prime * result + field_29_ufel;
-        result = prime * result + field_30_copt;
-        result = prime * result + field_31_hpsAsci;
-        result = prime * result + field_32_hpsFE;
-        result = prime * result + field_33_hpsBi;
-        result = prime * result + field_34_ftcSym;
-        result = prime * result + field_35_xchSym;
-        result = prime * result + field_36_fcPic;
-        result = prime * result + field_37_fcObj;
-        result = prime * result + field_38_lTagObj;
-        result = prime * result + field_39_fcData;
-        result = prime * result
-                + ((field_40_hresiOld == null) ? 0 : field_40_hresiOld.hashCode());
-        result = prime * result + field_41_ibstRMarkDel;
-        result = prime * result
-                + ((field_42_dttmRMark == null) ? 0 : field_42_dttmRMark.hashCode());
-        result = prime * result
-                + ((field_43_dttmRMarkDel == null) ? 0 : field_43_dttmRMarkDel.hashCode());
-        result = prime * result + field_44_istd;
-        result = prime * result + field_45_idslRMReason;
-        result = prime * result + field_46_idslReasonDel;
-        result = prime * result + field_47_cpg;
-        result = prime * result + field_48_Highlight;
-        result = prime * result + field_49_CharsetFlags;
-        result = prime * result + field_50_chse;
-        result = prime * result + ( field_51_fPropRMark? 1231 : 1237 );
-        result = prime * result + field_52_ibstPropRMark;
-        result = prime * result
-                + ((field_53_dttmPropRMark == null) ? 0 : field_53_dttmPropRMark.hashCode());
-        result = prime * result + ( field_54_fConflictOrig? 1231 : 1237 );
-        result = prime * result + ( field_55_fConflictOtherDel? 1231 : 1237 );
-        result = prime * result + field_56_wConflict;
-        result = prime * result + field_57_IbstConflict;
-        result = prime * result
-                + ((field_58_dttmConflict == null) ? 0 : field_58_dttmConflict.hashCode());
-        result = prime * result + ( field_59_fDispFldRMark? 1231 : 1237 );
-        result = prime * result + field_60_ibstDispFldRMark;
-        result = prime * result
-                + ((field_61_dttmDispFldRMark == null) ? 0 : field_61_dttmDispFldRMark.hashCode());
-        result = prime * result + Arrays.hashCode( field_62_xstDispFldRMark );
-        result = prime * result + field_63_fcObjp;
-        result = prime * result + field_64_lbrCRJ;
-        result = prime * result + ( field_65_fSpecVanish? 1231 : 1237 );
-        result = prime * result + ( field_66_fHasOldProps? 1231 : 1237 );
-        result = prime * result + ( field_67_fSdtVanish? 1231 : 1237 );
-        result = prime * result + field_68_wCharScale;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[CHP]\n");
-        builder.append("    .grpfChp              = ");
-        builder.append(" (").append(getGrpfChp()).append(" )\n");
-        builder.append("         .fBold                    = ").append(isFBold()).append('\n');
-        builder.append("         .fItalic                  = ").append(isFItalic()).append('\n');
-        builder.append("         .fRMarkDel                = ").append(isFRMarkDel()).append('\n');
-        builder.append("         .fOutline                 = ").append(isFOutline()).append('\n');
-        builder.append("         .fFldVanish               = ").append(isFFldVanish()).append('\n');
-        builder.append("         .fSmallCaps               = ").append(isFSmallCaps()).append('\n');
-        builder.append("         .fCaps                    = ").append(isFCaps()).append('\n');
-        builder.append("         .fVanish                  = ").append(isFVanish()).append('\n');
-        builder.append("         .fRMark                   = ").append(isFRMark()).append('\n');
-        builder.append("         .fSpec                    = ").append(isFSpec()).append('\n');
-        builder.append("         .fStrike                  = ").append(isFStrike()).append('\n');
-        builder.append("         .fObj                     = ").append(isFObj()).append('\n');
-        builder.append("         .fShadow                  = ").append(isFShadow()).append('\n');
-        builder.append("         .fLowerCase               = ").append(isFLowerCase()).append('\n');
-        builder.append("         .fData                    = ").append(isFData()).append('\n');
-        builder.append("         .fOle2                    = ").append(isFOle2()).append('\n');
-        builder.append("         .fEmboss                  = ").append(isFEmboss()).append('\n');
-        builder.append("         .fImprint                 = ").append(isFImprint()).append('\n');
-        builder.append("         .fDStrike                 = ").append(isFDStrike()).append('\n');
-        builder.append("         .fUsePgsuSettings         = ").append(isFUsePgsuSettings()).append('\n');
-        builder.append("         .fBoldBi                  = ").append(isFBoldBi()).append('\n');
-        builder.append("         .fComplexScripts          = ").append(isFComplexScripts()).append('\n');
-        builder.append("         .fItalicBi                = ").append(isFItalicBi()).append('\n');
-        builder.append("         .fBiDi                    = ").append(isFBiDi()).append('\n');
-        builder.append("         .fIcoBi                   = ").append(isFIcoBi()).append('\n');
-        builder.append("         .fNonGlyph                = ").append(isFNonGlyph()).append('\n');
-        builder.append("         .fBoldOther               = ").append(isFBoldOther()).append('\n');
-        builder.append("         .fItalicOther             = ").append(isFItalicOther()).append('\n');
-        builder.append("         .fNoProof                 = ").append(isFNoProof()).append('\n');
-        builder.append("         .fWebHidden               = ").append(isFWebHidden()).append('\n');
-        builder.append("         .fFitText                 = ").append(isFFitText()).append('\n');
-        builder.append("         .fCalc                    = ").append(isFCalc()).append('\n');
-        builder.append("         .fFmtLineProp             = ").append(isFFmtLineProp()).append('\n');
-        builder.append("    .hps                  = ");
-        builder.append(" (").append(getHps()).append(" )\n");
-        builder.append("    .ftcAscii             = ");
-        builder.append(" (").append(getFtcAscii()).append(" )\n");
-        builder.append("    .ftcFE                = ");
-        builder.append(" (").append(getFtcFE()).append(" )\n");
-        builder.append("    .ftcOther             = ");
-        builder.append(" (").append(getFtcOther()).append(" )\n");
-        builder.append("    .ftcBi                = ");
-        builder.append(" (").append(getFtcBi()).append(" )\n");
-        builder.append("    .dxaSpace             = ");
-        builder.append(" (").append(getDxaSpace()).append(" )\n");
-        builder.append("    .cv                   = ");
-        builder.append(" (").append(getCv()).append(" )\n");
-        builder.append("    .ico                  = ");
-        builder.append(" (").append(getIco()).append(" )\n");
-        builder.append("    .pctCharWidth         = ");
-        builder.append(" (").append(getPctCharWidth()).append(" )\n");
-        builder.append("    .lidDefault           = ");
-        builder.append(" (").append(getLidDefault()).append(" )\n");
-        builder.append("    .lidFE                = ");
-        builder.append(" (").append(getLidFE()).append(" )\n");
-        builder.append("    .kcd                  = ");
-        builder.append(" (").append(getKcd()).append(" )\n");
-        builder.append("    .fUndetermine         = ");
-        builder.append(" (").append(getFUndetermine()).append(" )\n");
-        builder.append("    .iss                  = ");
-        builder.append(" (").append(getIss()).append(" )\n");
-        builder.append("    .fSpecSymbol          = ");
-        builder.append(" (").append(getFSpecSymbol()).append(" )\n");
-        builder.append("    .idct                 = ");
-        builder.append(" (").append(getIdct()).append(" )\n");
-        builder.append("    .idctHint             = ");
-        builder.append(" (").append(getIdctHint()).append(" )\n");
-        builder.append("    .kul                  = ");
-        builder.append(" (").append(getKul()).append(" )\n");
-        builder.append("    .hresi                = ");
-        builder.append(" (").append(getHresi()).append(" )\n");
-        builder.append("    .hpsKern              = ");
-        builder.append(" (").append(getHpsKern()).append(" )\n");
-        builder.append("    .hpsPos               = ");
-        builder.append(" (").append(getHpsPos()).append(" )\n");
-        builder.append("    .shd                  = ");
-        builder.append(" (").append(getShd()).append(" )\n");
-        builder.append("    .brc                  = ");
-        builder.append(" (").append(getBrc()).append(" )\n");
-        builder.append("    .ibstRMark            = ");
-        builder.append(" (").append(getIbstRMark()).append(" )\n");
-        builder.append("    .sfxtText             = ");
-        builder.append(" (").append(getSfxtText()).append(" )\n");
-        builder.append("    .fDblBdr              = ");
-        builder.append(" (").append(getFDblBdr()).append(" )\n");
-        builder.append("    .fBorderWS            = ");
-        builder.append(" (").append(getFBorderWS()).append(" )\n");
-        builder.append("    .ufel                 = ");
-        builder.append(" (").append(getUfel()).append(" )\n");
-        builder.append("         .itypFELayout             = ").append(getItypFELayout()).append('\n');
-        builder.append("         .fTNY                     = ").append(isFTNY()).append('\n');
-        builder.append("         .fWarichu                 = ").append(isFWarichu()).append('\n');
-        builder.append("         .fKumimoji                = ").append(isFKumimoji()).append('\n');
-        builder.append("         .fRuby                    = ").append(isFRuby()).append('\n');
-        builder.append("         .fLSFitText               = ").append(isFLSFitText()).append('\n');
-        builder.append("         .spare                    = ").append(getSpare()).append('\n');
-        builder.append("    .copt                 = ");
-        builder.append(" (").append(getCopt()).append(" )\n");
-        builder.append("         .iWarichuBracket          = ").append(getIWarichuBracket()).append('\n');
-        builder.append("         .fWarichuNoOpenBracket     = ").append(isFWarichuNoOpenBracket()).append('\n');
-        builder.append("         .fTNYCompress             = ").append(isFTNYCompress()).append('\n');
-        builder.append("         .fTNYFetchTxm             = ").append(isFTNYFetchTxm()).append('\n');
-        builder.append("         .fCellFitText             = ").append(isFCellFitText()).append('\n');
-        builder.append("         .unused                   = ").append(isUnused()).append('\n');
-        builder.append("    .hpsAsci              = ");
-        builder.append(" (").append(getHpsAsci()).append(" )\n");
-        builder.append("    .hpsFE                = ");
-        builder.append(" (").append(getHpsFE()).append(" )\n");
-        builder.append("    .hpsBi                = ");
-        builder.append(" (").append(getHpsBi()).append(" )\n");
-        builder.append("    .ftcSym               = ");
-        builder.append(" (").append(getFtcSym()).append(" )\n");
-        builder.append("    .xchSym               = ");
-        builder.append(" (").append(getXchSym()).append(" )\n");
-        builder.append("    .fcPic                = ");
-        builder.append(" (").append(getFcPic()).append(" )\n");
-        builder.append("    .fcObj                = ");
-        builder.append(" (").append(getFcObj()).append(" )\n");
-        builder.append("    .lTagObj              = ");
-        builder.append(" (").append(getLTagObj()).append(" )\n");
-        builder.append("    .fcData               = ");
-        builder.append(" (").append(getFcData()).append(" )\n");
-        builder.append("    .hresiOld             = ");
-        builder.append(" (").append(getHresiOld()).append(" )\n");
-        builder.append("    .ibstRMarkDel         = ");
-        builder.append(" (").append(getIbstRMarkDel()).append(" )\n");
-        builder.append("    .dttmRMark            = ");
-        builder.append(" (").append(getDttmRMark()).append(" )\n");
-        builder.append("    .dttmRMarkDel         = ");
-        builder.append(" (").append(getDttmRMarkDel()).append(" )\n");
-        builder.append("    .istd                 = ");
-        builder.append(" (").append(getIstd()).append(" )\n");
-        builder.append("    .idslRMReason         = ");
-        builder.append(" (").append(getIdslRMReason()).append(" )\n");
-        builder.append("    .idslReasonDel        = ");
-        builder.append(" (").append(getIdslReasonDel()).append(" )\n");
-        builder.append("    .cpg                  = ");
-        builder.append(" (").append(getCpg()).append(" )\n");
-        builder.append("    .Highlight            = ");
-        builder.append(" (").append(getHighlight()).append(" )\n");
-        builder.append("         .icoHighlight             = ").append(getIcoHighlight()).append('\n');
-        builder.append("         .fHighlight               = ").append(isFHighlight()).append('\n');
-        builder.append("    .CharsetFlags         = ");
-        builder.append(" (").append(getCharsetFlags()).append(" )\n");
-        builder.append("         .fChsDiff                 = ").append(isFChsDiff()).append('\n');
-        builder.append("         .fMacChs                  = ").append(isFMacChs()).append('\n');
-        builder.append("    .chse                 = ");
-        builder.append(" (").append(getChse()).append(" )\n");
-        builder.append("    .fPropRMark           = ");
-        builder.append(" (").append(getFPropRMark()).append(" )\n");
-        builder.append("    .ibstPropRMark        = ");
-        builder.append(" (").append(getIbstPropRMark()).append(" )\n");
-        builder.append("    .dttmPropRMark        = ");
-        builder.append(" (").append(getDttmPropRMark()).append(" )\n");
-        builder.append("    .fConflictOrig        = ");
-        builder.append(" (").append(getFConflictOrig()).append(" )\n");
-        builder.append("    .fConflictOtherDel    = ");
-        builder.append(" (").append(getFConflictOtherDel()).append(" )\n");
-        builder.append("    .wConflict            = ");
-        builder.append(" (").append(getWConflict()).append(" )\n");
-        builder.append("    .IbstConflict         = ");
-        builder.append(" (").append(getIbstConflict()).append(" )\n");
-        builder.append("    .dttmConflict         = ");
-        builder.append(" (").append(getDttmConflict()).append(" )\n");
-        builder.append("    .fDispFldRMark        = ");
-        builder.append(" (").append(getFDispFldRMark()).append(" )\n");
-        builder.append("    .ibstDispFldRMark     = ");
-        builder.append(" (").append(getIbstDispFldRMark()).append(" )\n");
-        builder.append("    .dttmDispFldRMark     = ");
-        builder.append(" (").append(getDttmDispFldRMark()).append(" )\n");
-        builder.append("    .xstDispFldRMark      = ");
-        builder.append(" (").append(Arrays.toString(getXstDispFldRMark())).append(" )\n");
-        builder.append("    .fcObjp               = ");
-        builder.append(" (").append(getFcObjp()).append(" )\n");
-        builder.append("    .lbrCRJ               = ");
-        builder.append(" (").append(getLbrCRJ()).append(" )\n");
-        builder.append("    .fSpecVanish          = ");
-        builder.append(" (").append(getFSpecVanish()).append(" )\n");
-        builder.append("    .fHasOldProps         = ");
-        builder.append(" (").append(getFHasOldProps()).append(" )\n");
-        builder.append("    .fSdtVanish           = ");
-        builder.append(" (").append(getFSdtVanish()).append(" )\n");
-        builder.append("    .wCharScale           = ");
-        builder.append(" (").append(getWCharScale()).append(" )\n");
-
-        builder.append("[/CHP]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Collection of the 32 flags.
-     */
-    @Internal
-    public int getGrpfChp()
-    {
-        return field_1_grpfChp;
-    }
-
-    /**
-     * Collection of the 32 flags.
-     */
-    @Internal
-    public void setGrpfChp( int field_1_grpfChp )
-    {
-        this.field_1_grpfChp = field_1_grpfChp;
-    }
-
-    /**
-     * Font size in half points.
-     */
-    @Internal
-    public int getHps()
-    {
-        return field_2_hps;
-    }
-
-    /**
-     * Font size in half points.
-     */
-    @Internal
-    public void setHps( int field_2_hps )
-    {
-        this.field_2_hps = field_2_hps;
-    }
-
-    /**
-     * Font for ASCII text.
-     */
-    @Internal
-    public int getFtcAscii()
-    {
-        return field_3_ftcAscii;
-    }
-
-    /**
-     * Font for ASCII text.
-     */
-    @Internal
-    public void setFtcAscii( int field_3_ftcAscii )
-    {
-        this.field_3_ftcAscii = field_3_ftcAscii;
-    }
-
-    /**
-     * Font for East Asian text.
-     */
-    @Internal
-    public int getFtcFE()
-    {
-        return field_4_ftcFE;
-    }
-
-    /**
-     * Font for East Asian text.
-     */
-    @Internal
-    public void setFtcFE( int field_4_ftcFE )
-    {
-        this.field_4_ftcFE = field_4_ftcFE;
-    }
-
-    /**
-     * Font for non-East Asian text.
-     */
-    @Internal
-    public int getFtcOther()
-    {
-        return field_5_ftcOther;
-    }
-
-    /**
-     * Font for non-East Asian text.
-     */
-    @Internal
-    public void setFtcOther( int field_5_ftcOther )
-    {
-        this.field_5_ftcOther = field_5_ftcOther;
-    }
-
-    /**
-     * Font for Complex Scripts text.
-     */
-    @Internal
-    public int getFtcBi()
-    {
-        return field_6_ftcBi;
-    }
-
-    /**
-     * Font for Complex Scripts text.
-     */
-    @Internal
-    public void setFtcBi( int field_6_ftcBi )
-    {
-        this.field_6_ftcBi = field_6_ftcBi;
-    }
-
-    /**
-     * Space following each character in the run expressed in twip units..
-     */
-    @Internal
-    public int getDxaSpace()
-    {
-        return field_7_dxaSpace;
-    }
-
-    /**
-     * Space following each character in the run expressed in twip units..
-     */
-    @Internal
-    public void setDxaSpace( int field_7_dxaSpace )
-    {
-        this.field_7_dxaSpace = field_7_dxaSpace;
-    }
-
-    /**
-     * 24-bit color.
-     */
-    @Internal
-    public Colorref getCv()
-    {
-        return field_8_cv;
-    }
-
-    /**
-     * 24-bit color.
-     */
-    @Internal
-    public void setCv( Colorref field_8_cv )
-    {
-        this.field_8_cv = field_8_cv;
-    }
-
-    /**
-     * Color of text for Word 97.
-     */
-    @Internal
-    public byte getIco()
-    {
-        return field_9_ico;
-    }
-
-    /**
-     * Color of text for Word 97.
-     */
-    @Internal
-    public void setIco( byte field_9_ico )
-    {
-        this.field_9_ico = field_9_ico;
-    }
-
-    /**
-     * Character scale.
-     */
-    @Internal
-    public int getPctCharWidth()
-    {
-        return field_10_pctCharWidth;
-    }
-
-    /**
-     * Character scale.
-     */
-    @Internal
-    public void setPctCharWidth( int field_10_pctCharWidth )
-    {
-        this.field_10_pctCharWidth = field_10_pctCharWidth;
-    }
-
-    /**
-     * Get the lidDefault field for the CHP record.
-     */
-    @Internal
-    public int getLidDefault()
-    {
-        return field_11_lidDefault;
-    }
-
-    /**
-     * Set the lidDefault field for the CHP record.
-     */
-    @Internal
-    public void setLidDefault( int field_11_lidDefault )
-    {
-        this.field_11_lidDefault = field_11_lidDefault;
-    }
-
-    /**
-     * Get the lidFE field for the CHP record.
-     */
-    @Internal
-    public int getLidFE()
-    {
-        return field_12_lidFE;
-    }
-
-    /**
-     * Set the lidFE field for the CHP record.
-     */
-    @Internal
-    public void setLidFE( int field_12_lidFE )
-    {
-        this.field_12_lidFE = field_12_lidFE;
-    }
-
-    /**
-     * Emphasis mark.
-     *
-     * @return One of 
-     * <li>{@link #KCD_NON}
-     * <li>{@link #KCD_DOT}
-     * <li>{@link #KCD_COMMA}
-     * <li>{@link #KCD_CIRCLE}
-     * <li>{@link #KCD_UNDER_DOT}
-     */
-    @Internal
-    public byte getKcd()
-    {
-        return field_13_kcd;
-    }
-
-    /**
-     * Emphasis mark.
-     *
-     * @param field_13_kcd
-     *        One of 
-     * <li>{@link #KCD_NON}
-     * <li>{@link #KCD_DOT}
-     * <li>{@link #KCD_COMMA}
-     * <li>{@link #KCD_CIRCLE}
-     * <li>{@link #KCD_UNDER_DOT}
-     */
-    @Internal
-    public void setKcd( byte field_13_kcd )
-    {
-        this.field_13_kcd = field_13_kcd;
-    }
-
-    /**
-     * Character is undetermined.
-     */
-    @Internal
-    public boolean getFUndetermine()
-    {
-        return field_14_fUndetermine;
-    }
-
-    /**
-     * Character is undetermined.
-     */
-    @Internal
-    public void setFUndetermine( boolean field_14_fUndetermine )
-    {
-        this.field_14_fUndetermine = field_14_fUndetermine;
-    }
-
-    /**
-     * Superscript/subscript indices.
-     *
-     * @return One of 
-     * <li>{@link #ISS_NONE}
-     * <li>{@link #ISS_SUPERSCRIPTED}
-     * <li>{@link #ISS_SUBSCRIPTED}
-     */
-    @Internal
-    public byte getIss()
-    {
-        return field_15_iss;
-    }
-
-    /**
-     * Superscript/subscript indices.
-     *
-     * @param field_15_iss
-     *        One of 
-     * <li>{@link #ISS_NONE}
-     * <li>{@link #ISS_SUPERSCRIPTED}
-     * <li>{@link #ISS_SUBSCRIPTED}
-     */
-    @Internal
-    public void setIss( byte field_15_iss )
-    {
-        this.field_15_iss = field_15_iss;
-    }
-
-    /**
-     * Used by Word internally.
-     */
-    @Internal
-    public boolean getFSpecSymbol()
-    {
-        return field_16_fSpecSymbol;
-    }
-
-    /**
-     * Used by Word internally.
-     */
-    @Internal
-    public void setFSpecSymbol( boolean field_16_fSpecSymbol )
-    {
-        this.field_16_fSpecSymbol = field_16_fSpecSymbol;
-    }
-
-    /**
-     * Not stored in file.
-     */
-    @Internal
-    public byte getIdct()
-    {
-        return field_17_idct;
-    }
-
-    /**
-     * Not stored in file.
-     */
-    @Internal
-    public void setIdct( byte field_17_idct )
-    {
-        this.field_17_idct = field_17_idct;
-    }
-
-    /**
-     * Identifier of Character type.
-     */
-    @Internal
-    public byte getIdctHint()
-    {
-        return field_18_idctHint;
-    }
-
-    /**
-     * Identifier of Character type.
-     */
-    @Internal
-    public void setIdctHint( byte field_18_idctHint )
-    {
-        this.field_18_idctHint = field_18_idctHint;
-    }
-
-    /**
-     * Underline code.
-     *
-     * @return One of 
-     * <li>{@link #KUL_NONE}
-     * <li>{@link #KUL_SINGLE}
-     * <li>{@link #KUL_BY_WORD}
-     * <li>{@link #KUL_DOUBLE}
-     * <li>{@link #KUL_DOTTED}
-     * <li>{@link #KUL_HIDDEN}
-     * <li>{@link #KUL_THICK}
-     * <li>{@link #KUL_DASH}
-     * <li>{@link #KUL_DOT}
-     * <li>{@link #KUL_DOT_DASH}
-     * <li>{@link #KUL_DOT_DOT_DASH}
-     * <li>{@link #KUL_WAVE}
-     * <li>{@link #KUL_DOTTED_HEAVY}
-     * <li>{@link #KUL_DASHED_HEAVY}
-     * <li>{@link #KUL_DOT_DASH_HEAVY}
-     * <li>{@link #KUL_DOT_DOT_DASH_HEAVY}
-     * <li>{@link #KUL_WAVE_HEAVY}
-     * <li>{@link #KUL_DASH_LONG}
-     * <li>{@link #KUL_WAVE_DOUBLE}
-     * <li>{@link #KUL_DASH_LONG_HEAVY}
-     */
-    @Internal
-    public byte getKul()
-    {
-        return field_19_kul;
-    }
-
-    /**
-     * Underline code.
-     *
-     * @param field_19_kul
-     *        One of 
-     * <li>{@link #KUL_NONE}
-     * <li>{@link #KUL_SINGLE}
-     * <li>{@link #KUL_BY_WORD}
-     * <li>{@link #KUL_DOUBLE}
-     * <li>{@link #KUL_DOTTED}
-     * <li>{@link #KUL_HIDDEN}
-     * <li>{@link #KUL_THICK}
-     * <li>{@link #KUL_DASH}
-     * <li>{@link #KUL_DOT}
-     * <li>{@link #KUL_DOT_DASH}
-     * <li>{@link #KUL_DOT_DOT_DASH}
-     * <li>{@link #KUL_WAVE}
-     * <li>{@link #KUL_DOTTED_HEAVY}
-     * <li>{@link #KUL_DASHED_HEAVY}
-     * <li>{@link #KUL_DOT_DASH_HEAVY}
-     * <li>{@link #KUL_DOT_DOT_DASH_HEAVY}
-     * <li>{@link #KUL_WAVE_HEAVY}
-     * <li>{@link #KUL_DASH_LONG}
-     * <li>{@link #KUL_WAVE_DOUBLE}
-     * <li>{@link #KUL_DASH_LONG_HEAVY}
-     */
-    @Internal
-    public void setKul( byte field_19_kul )
-    {
-        this.field_19_kul = field_19_kul;
-    }
-
-    /**
-     * Get the hresi field for the CHP record.
-     */
-    @Internal
-    public Hyphenation getHresi()
-    {
-        return field_20_hresi;
-    }
-
-    /**
-     * Set the hresi field for the CHP record.
-     */
-    @Internal
-    public void setHresi( Hyphenation field_20_hresi )
-    {
-        this.field_20_hresi = field_20_hresi;
-    }
-
-    /**
-     * Kerning distance for characters in run recorded in half points.
-     */
-    @Internal
-    public int getHpsKern()
-    {
-        return field_21_hpsKern;
-    }
-
-    /**
-     * Kerning distance for characters in run recorded in half points.
-     */
-    @Internal
-    public void setHpsKern( int field_21_hpsKern )
-    {
-        this.field_21_hpsKern = field_21_hpsKern;
-    }
-
-    /**
-     * Reserved (actually used as vertical offset(?) value).
-     */
-    @Internal
-    public short getHpsPos()
-    {
-        return field_22_hpsPos;
-    }
-
-    /**
-     * Reserved (actually used as vertical offset(?) value).
-     */
-    @Internal
-    public void setHpsPos( short field_22_hpsPos )
-    {
-        this.field_22_hpsPos = field_22_hpsPos;
-    }
-
-    /**
-     * Shading.
-     */
-    @Internal
-    public ShadingDescriptor getShd()
-    {
-        return field_23_shd;
-    }
-
-    /**
-     * Shading.
-     */
-    @Internal
-    public void setShd( ShadingDescriptor field_23_shd )
-    {
-        this.field_23_shd = field_23_shd;
-    }
-
-    /**
-     * Border.
-     */
-    @Internal
-    public BorderCode getBrc()
-    {
-        return field_24_brc;
-    }
-
-    /**
-     * Border.
-     */
-    @Internal
-    public void setBrc( BorderCode field_24_brc )
-    {
-        this.field_24_brc = field_24_brc;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when text in run was newly typed when revision marking was enabled.
-     */
-    @Internal
-    public int getIbstRMark()
-    {
-        return field_25_ibstRMark;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when text in run was newly typed when revision marking was enabled.
-     */
-    @Internal
-    public void setIbstRMark( int field_25_ibstRMark )
-    {
-        this.field_25_ibstRMark = field_25_ibstRMark;
-    }
-
-    /**
-     * Text animation.
-     *
-     * @return One of 
-     * <li>{@link #SFXTTEXT_NO}
-     * <li>{@link #SFXTTEXT_LAS_VEGAS_LIGHTS}
-     * <li>{@link #SFXTTEXT_BACKGROUND_BLINK}
-     * <li>{@link #SFXTTEXT_SPARKLE_TEXT}
-     * <li>{@link #SFXTTEXT_MARCHING_ANTS}
-     * <li>{@link #SFXTTEXT_MARCHING_RED_ANTS}
-     * <li>{@link #SFXTTEXT_SHIMMER}
-     */
-    @Internal
-    public byte getSfxtText()
-    {
-        return field_26_sfxtText;
-    }
-
-    /**
-     * Text animation.
-     *
-     * @param field_26_sfxtText
-     *        One of 
-     * <li>{@link #SFXTTEXT_NO}
-     * <li>{@link #SFXTTEXT_LAS_VEGAS_LIGHTS}
-     * <li>{@link #SFXTTEXT_BACKGROUND_BLINK}
-     * <li>{@link #SFXTTEXT_SPARKLE_TEXT}
-     * <li>{@link #SFXTTEXT_MARCHING_ANTS}
-     * <li>{@link #SFXTTEXT_MARCHING_RED_ANTS}
-     * <li>{@link #SFXTTEXT_SHIMMER}
-     */
-    @Internal
-    public void setSfxtText( byte field_26_sfxtText )
-    {
-        this.field_26_sfxtText = field_26_sfxtText;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public boolean getFDblBdr()
-    {
-        return field_27_fDblBdr;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setFDblBdr( boolean field_27_fDblBdr )
-    {
-        this.field_27_fDblBdr = field_27_fDblBdr;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public boolean getFBorderWS()
-    {
-        return field_28_fBorderWS;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setFBorderWS( boolean field_28_fBorderWS )
-    {
-        this.field_28_fBorderWS = field_28_fBorderWS;
-    }
-
-    /**
-     * Collection properties represented by itypFELayout and copt (East Asian layout properties).
-     */
-    @Internal
-    public short getUfel()
-    {
-        return field_29_ufel;
-    }
-
-    /**
-     * Collection properties represented by itypFELayout and copt (East Asian layout properties).
-     */
-    @Internal
-    public void setUfel( short field_29_ufel )
-    {
-        this.field_29_ufel = field_29_ufel;
-    }
-
-    /**
-     * Collection of the 5 flags.
-     */
-    @Internal
-    public byte getCopt()
-    {
-        return field_30_copt;
-    }
-
-    /**
-     * Collection of the 5 flags.
-     */
-    @Internal
-    public void setCopt( byte field_30_copt )
-    {
-        this.field_30_copt = field_30_copt;
-    }
-
-    /**
-     * Font size for ASCII font.
-     */
-    @Internal
-    public int getHpsAsci()
-    {
-        return field_31_hpsAsci;
-    }
-
-    /**
-     * Font size for ASCII font.
-     */
-    @Internal
-    public void setHpsAsci( int field_31_hpsAsci )
-    {
-        this.field_31_hpsAsci = field_31_hpsAsci;
-    }
-
-    /**
-     * Font size for East Asian text.
-     */
-    @Internal
-    public int getHpsFE()
-    {
-        return field_32_hpsFE;
-    }
-
-    /**
-     * Font size for East Asian text.
-     */
-    @Internal
-    public void setHpsFE( int field_32_hpsFE )
-    {
-        this.field_32_hpsFE = field_32_hpsFE;
-    }
-
-    /**
-     * Font size for Complex Scripts text.
-     */
-    @Internal
-    public int getHpsBi()
-    {
-        return field_33_hpsBi;
-    }
-
-    /**
-     * Font size for Complex Scripts text.
-     */
-    @Internal
-    public void setHpsBi( int field_33_hpsBi )
-    {
-        this.field_33_hpsBi = field_33_hpsBi;
-    }
-
-    /**
-     * an index into the rgffn structure. When chp.fSpec is 1 and the character recorded for the run in the document stream is chSymbol (0x28), chp.ftcSym identifies the font code of the symbol font that will be used to display the symbol character recorded in chp.xchSym..
-     */
-    @Internal
-    public int getFtcSym()
-    {
-        return field_34_ftcSym;
-    }
-
-    /**
-     * an index into the rgffn structure. When chp.fSpec is 1 and the character recorded for the run in the document stream is chSymbol (0x28), chp.ftcSym identifies the font code of the symbol font that will be used to display the symbol character recorded in chp.xchSym..
-     */
-    @Internal
-    public void setFtcSym( int field_34_ftcSym )
-    {
-        this.field_34_ftcSym = field_34_ftcSym;
-    }
-
-    /**
-     * When chp.fSpec==1 and the character recorded for the run in the document stream is chSymbol (0x28), the character stored chp.xchSym will be displayed using the font specified in chp.ftcSym..
-     */
-    @Internal
-    public int getXchSym()
-    {
-        return field_35_xchSym;
-    }
-
-    /**
-     * When chp.fSpec==1 and the character recorded for the run in the document stream is chSymbol (0x28), the character stored chp.xchSym will be displayed using the font specified in chp.ftcSym..
-     */
-    @Internal
-    public void setXchSym( int field_35_xchSym )
-    {
-        this.field_35_xchSym = field_35_xchSym;
-    }
-
-    /**
-     * Offset in data stream pointing to beginning of a picture when character is a picture character (character is 0x01 and chp.fSpec is 1)..
-     */
-    @Internal
-    public int getFcPic()
-    {
-        return field_36_fcPic;
-    }
-
-    /**
-     * Offset in data stream pointing to beginning of a picture when character is a picture character (character is 0x01 and chp.fSpec is 1)..
-     */
-    @Internal
-    public void setFcPic( int field_36_fcPic )
-    {
-        this.field_36_fcPic = field_36_fcPic;
-    }
-
-    /**
-     * Offset in data stream pointing to beginning of a picture when character is an OLE1 object character (character is 0x20 and chp.fSpec is 1, chp.fOle2 is 0)..
-     */
-    @Internal
-    public int getFcObj()
-    {
-        return field_37_fcObj;
-    }
-
-    /**
-     * Offset in data stream pointing to beginning of a picture when character is an OLE1 object character (character is 0x20 and chp.fSpec is 1, chp.fOle2 is 0)..
-     */
-    @Internal
-    public void setFcObj( int field_37_fcObj )
-    {
-        this.field_37_fcObj = field_37_fcObj;
-    }
-
-    /**
-     * An object ID for an OLE object, only set if chp.fSpec and chp.fOle2 are both true, and chp.fObj..
-     */
-    @Internal
-    public int getLTagObj()
-    {
-        return field_38_lTagObj;
-    }
-
-    /**
-     * An object ID for an OLE object, only set if chp.fSpec and chp.fOle2 are both true, and chp.fObj..
-     */
-    @Internal
-    public void setLTagObj( int field_38_lTagObj )
-    {
-        this.field_38_lTagObj = field_38_lTagObj;
-    }
-
-    /**
-     * Points to location of picture data, only if chp.fSpec is true..
-     */
-    @Internal
-    public int getFcData()
-    {
-        return field_39_fcData;
-    }
-
-    /**
-     * Points to location of picture data, only if chp.fSpec is true..
-     */
-    @Internal
-    public void setFcData( int field_39_fcData )
-    {
-        this.field_39_fcData = field_39_fcData;
-    }
-
-    /**
-     * Get the hresiOld field for the CHP record.
-     */
-    @Internal
-    public Hyphenation getHresiOld()
-    {
-        return field_40_hresiOld;
-    }
-
-    /**
-     * Set the hresiOld field for the CHP record.
-     */
-    @Internal
-    public void setHresiOld( Hyphenation field_40_hresiOld )
-    {
-        this.field_40_hresiOld = field_40_hresiOld;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when text in run was deleted when revision marking was enabled..
-     */
-    @Internal
-    public int getIbstRMarkDel()
-    {
-        return field_41_ibstRMarkDel;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when text in run was deleted when revision marking was enabled..
-     */
-    @Internal
-    public void setIbstRMarkDel( int field_41_ibstRMarkDel )
-    {
-        this.field_41_ibstRMarkDel = field_41_ibstRMarkDel;
-    }
-
-    /**
-     * Date/time at which this run of text was entered/modified by the author (Only recorded when revision marking is on.).
-     */
-    @Internal
-    public DateAndTime getDttmRMark()
-    {
-        return field_42_dttmRMark;
-    }
-
-    /**
-     * Date/time at which this run of text was entered/modified by the author (Only recorded when revision marking is on.).
-     */
-    @Internal
-    public void setDttmRMark( DateAndTime field_42_dttmRMark )
-    {
-        this.field_42_dttmRMark = field_42_dttmRMark;
-    }
-
-    /**
-     * Date/time at which this run of text was deleted by the author (Only recorded when revision marking is on.).
-     */
-    @Internal
-    public DateAndTime getDttmRMarkDel()
-    {
-        return field_43_dttmRMarkDel;
-    }
-
-    /**
-     * Date/time at which this run of text was deleted by the author (Only recorded when revision marking is on.).
-     */
-    @Internal
-    public void setDttmRMarkDel( DateAndTime field_43_dttmRMarkDel )
-    {
-        this.field_43_dttmRMarkDel = field_43_dttmRMarkDel;
-    }
-
-    /**
-     * Index to character style descriptor in the stylesheet that tags this run of text. When istd is istdNormalChar (10 decimal), characters in run are not affected by a character style. If chp.istd contains any other value, chpx of the specified character style are applied to CHP for this run before any other exceptional properties are applied..
-     */
-    @Internal
-    public int getIstd()
-    {
-        return field_44_istd;
-    }
-
-    /**
-     * Index to character style descriptor in the stylesheet that tags this run of text. When istd is istdNormalChar (10 decimal), characters in run are not affected by a character style. If chp.istd contains any other value, chpx of the specified character style are applied to CHP for this run before any other exceptional properties are applied..
-     */
-    @Internal
-    public void setIstd( int field_44_istd )
-    {
-        this.field_44_istd = field_44_istd;
-    }
-
-    /**
-     * An index to strings displayed as reasons for actions taken by Word's AutoFormat code.
-     */
-    @Internal
-    public int getIdslRMReason()
-    {
-        return field_45_idslRMReason;
-    }
-
-    /**
-     * An index to strings displayed as reasons for actions taken by Word's AutoFormat code.
-     */
-    @Internal
-    public void setIdslRMReason( int field_45_idslRMReason )
-    {
-        this.field_45_idslRMReason = field_45_idslRMReason;
-    }
-
-    /**
-     * An index to strings displayed as reasons for actions taken by Word's AutoFormat code.
-     */
-    @Internal
-    public int getIdslReasonDel()
-    {
-        return field_46_idslReasonDel;
-    }
-
-    /**
-     * An index to strings displayed as reasons for actions taken by Word's AutoFormat code.
-     */
-    @Internal
-    public void setIdslReasonDel( int field_46_idslReasonDel )
-    {
-        this.field_46_idslReasonDel = field_46_idslReasonDel;
-    }
-
-    /**
-     * Code page of run in pre-Unicode files.
-     */
-    @Internal
-    public int getCpg()
-    {
-        return field_47_cpg;
-    }
-
-    /**
-     * Code page of run in pre-Unicode files.
-     */
-    @Internal
-    public void setCpg( int field_47_cpg )
-    {
-        this.field_47_cpg = field_47_cpg;
-    }
-
-    /**
-     * Get the Highlight field for the CHP record.
-     */
-    @Internal
-    public short getHighlight()
-    {
-        return field_48_Highlight;
-    }
-
-    /**
-     * Set the Highlight field for the CHP record.
-     */
-    @Internal
-    public void setHighlight( short field_48_Highlight )
-    {
-        this.field_48_Highlight = field_48_Highlight;
-    }
-
-    /**
-     * Get the CharsetFlags field for the CHP record.
-     */
-    @Internal
-    public short getCharsetFlags()
-    {
-        return field_49_CharsetFlags;
-    }
-
-    /**
-     * Set the CharsetFlags field for the CHP record.
-     */
-    @Internal
-    public void setCharsetFlags( short field_49_CharsetFlags )
-    {
-        this.field_49_CharsetFlags = field_49_CharsetFlags;
-    }
-
-    /**
-     * Get the chse field for the CHP record.
-     */
-    @Internal
-    public short getChse()
-    {
-        return field_50_chse;
-    }
-
-    /**
-     * Set the chse field for the CHP record.
-     */
-    @Internal
-    public void setChse( short field_50_chse )
-    {
-        this.field_50_chse = field_50_chse;
-    }
-
-    /**
-     * properties have been changed with revision marking on.
-     */
-    @Internal
-    public boolean getFPropRMark()
-    {
-        return field_51_fPropRMark;
-    }
-
-    /**
-     * properties have been changed with revision marking on.
-     */
-    @Internal
-    public void setFPropRMark( boolean field_51_fPropRMark )
-    {
-        this.field_51_fPropRMark = field_51_fPropRMark;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when properties have been changed when revision marking was enabled..
-     */
-    @Internal
-    public int getIbstPropRMark()
-    {
-        return field_52_ibstPropRMark;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when properties have been changed when revision marking was enabled..
-     */
-    @Internal
-    public void setIbstPropRMark( int field_52_ibstPropRMark )
-    {
-        this.field_52_ibstPropRMark = field_52_ibstPropRMark;
-    }
-
-    /**
-     * Date/time at which properties of this were changed for this run of text by the author. (Only recorded when revision marking is on.).
-     */
-    @Internal
-    public DateAndTime getDttmPropRMark()
-    {
-        return field_53_dttmPropRMark;
-    }
-
-    /**
-     * Date/time at which properties of this were changed for this run of text by the author. (Only recorded when revision marking is on.).
-     */
-    @Internal
-    public void setDttmPropRMark( DateAndTime field_53_dttmPropRMark )
-    {
-        this.field_53_dttmPropRMark = field_53_dttmPropRMark;
-    }
-
-    /**
-     * When chp.wConflict!=0, this is TRUE when text is part of the original version of text. When FALSE, text is alternative introduced by reconciliation operation..
-     */
-    @Internal
-    public boolean getFConflictOrig()
-    {
-        return field_54_fConflictOrig;
-    }
-
-    /**
-     * When chp.wConflict!=0, this is TRUE when text is part of the original version of text. When FALSE, text is alternative introduced by reconciliation operation..
-     */
-    @Internal
-    public void setFConflictOrig( boolean field_54_fConflictOrig )
-    {
-        this.field_54_fConflictOrig = field_54_fConflictOrig;
-    }
-
-    /**
-     * When fConflictOtherDel==fTrue, the other side of a reconciliation conflict causes this text to be deleted.
-     */
-    @Internal
-    public boolean getFConflictOtherDel()
-    {
-        return field_55_fConflictOtherDel;
-    }
-
-    /**
-     * When fConflictOtherDel==fTrue, the other side of a reconciliation conflict causes this text to be deleted.
-     */
-    @Internal
-    public void setFConflictOtherDel( boolean field_55_fConflictOtherDel )
-    {
-        this.field_55_fConflictOtherDel = field_55_fConflictOtherDel;
-    }
-
-    /**
-     * When != 0, index number that identifies all text participating in a particular conflict incident.
-     */
-    @Internal
-    public int getWConflict()
-    {
-        return field_56_wConflict;
-    }
-
-    /**
-     * When != 0, index number that identifies all text participating in a particular conflict incident.
-     */
-    @Internal
-    public void setWConflict( int field_56_wConflict )
-    {
-        this.field_56_wConflict = field_56_wConflict;
-    }
-
-    /**
-     * Who made this change for this side of the conflict..
-     */
-    @Internal
-    public int getIbstConflict()
-    {
-        return field_57_IbstConflict;
-    }
-
-    /**
-     * Who made this change for this side of the conflict..
-     */
-    @Internal
-    public void setIbstConflict( int field_57_IbstConflict )
-    {
-        this.field_57_IbstConflict = field_57_IbstConflict;
-    }
-
-    /**
-     * When the change was made.
-     */
-    @Internal
-    public DateAndTime getDttmConflict()
-    {
-        return field_58_dttmConflict;
-    }
-
-    /**
-     * When the change was made.
-     */
-    @Internal
-    public void setDttmConflict( DateAndTime field_58_dttmConflict )
-    {
-        this.field_58_dttmConflict = field_58_dttmConflict;
-    }
-
-    /**
-     * the number for a ListNum field is being tracked in xstDispFldRMark. If that number is different from the current value, the number has changed. Only valid for ListNum fields..
-     */
-    @Internal
-    public boolean getFDispFldRMark()
-    {
-        return field_59_fDispFldRMark;
-    }
-
-    /**
-     * the number for a ListNum field is being tracked in xstDispFldRMark. If that number is different from the current value, the number has changed. Only valid for ListNum fields..
-     */
-    @Internal
-    public void setFDispFldRMark( boolean field_59_fDispFldRMark )
-    {
-        this.field_59_fDispFldRMark = field_59_fDispFldRMark;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when ListNum field numbering has been changed when revision marking was enabled..
-     */
-    @Internal
-    public int getIbstDispFldRMark()
-    {
-        return field_60_ibstDispFldRMark;
-    }
-
-    /**
-     * Index to author IDs stored in hsttbfRMark. Used when ListNum field numbering has been changed when revision marking was enabled..
-     */
-    @Internal
-    public void setIbstDispFldRMark( int field_60_ibstDispFldRMark )
-    {
-        this.field_60_ibstDispFldRMark = field_60_ibstDispFldRMark;
-    }
-
-    /**
-     * The date for the ListNum field number change.
-     */
-    @Internal
-    public DateAndTime getDttmDispFldRMark()
-    {
-        return field_61_dttmDispFldRMark;
-    }
-
-    /**
-     * The date for the ListNum field number change.
-     */
-    @Internal
-    public void setDttmDispFldRMark( DateAndTime field_61_dttmDispFldRMark )
-    {
-        this.field_61_dttmDispFldRMark = field_61_dttmDispFldRMark;
-    }
-
-    /**
-     * The string value of the ListNum field when revision mark tracking began.
-     */
-    @Internal
-    public byte[] getXstDispFldRMark()
-    {
-        return field_62_xstDispFldRMark;
-    }
-
-    /**
-     * The string value of the ListNum field when revision mark tracking began.
-     */
-    @Internal
-    public void setXstDispFldRMark( byte[] field_62_xstDispFldRMark )
-    {
-        this.field_62_xstDispFldRMark = field_62_xstDispFldRMark;
-    }
-
-    /**
-     * Offset in the data stream indicating the location of OLE object data.
-     */
-    @Internal
-    public int getFcObjp()
-    {
-        return field_63_fcObjp;
-    }
-
-    /**
-     * Offset in the data stream indicating the location of OLE object data.
-     */
-    @Internal
-    public void setFcObjp( int field_63_fcObjp )
-    {
-        this.field_63_fcObjp = field_63_fcObjp;
-    }
-
-    /**
-     * Line BReak code for xchCRJ.
-     *
-     * @return One of 
-     * <li>{@link #LBRCRJ_NONE}
-     * <li>{@link #LBRCRJ_LEFT}
-     * <li>{@link #LBRCRJ_RIGHT}
-     * <li>{@link #LBRCRJ_BOTH}
-     */
-    @Internal
-    public byte getLbrCRJ()
-    {
-        return field_64_lbrCRJ;
-    }
-
-    /**
-     * Line BReak code for xchCRJ.
-     *
-     * @param field_64_lbrCRJ
-     *        One of 
-     * <li>{@link #LBRCRJ_NONE}
-     * <li>{@link #LBRCRJ_LEFT}
-     * <li>{@link #LBRCRJ_RIGHT}
-     * <li>{@link #LBRCRJ_BOTH}
-     */
-    @Internal
-    public void setLbrCRJ( byte field_64_lbrCRJ )
-    {
-        this.field_64_lbrCRJ = field_64_lbrCRJ;
-    }
-
-    /**
-     * Special hidden for leading emphasis (always hidden).
-     */
-    @Internal
-    public boolean getFSpecVanish()
-    {
-        return field_65_fSpecVanish;
-    }
-
-    /**
-     * Special hidden for leading emphasis (always hidden).
-     */
-    @Internal
-    public void setFSpecVanish( boolean field_65_fSpecVanish )
-    {
-        this.field_65_fSpecVanish = field_65_fSpecVanish;
-    }
-
-    /**
-     * Used for character property revision marking. The chp at the time fHasOldProps is set to 1, the is the old chp..
-     */
-    @Internal
-    public boolean getFHasOldProps()
-    {
-        return field_66_fHasOldProps;
-    }
-
-    /**
-     * Used for character property revision marking. The chp at the time fHasOldProps is set to 1, the is the old chp..
-     */
-    @Internal
-    public void setFHasOldProps( boolean field_66_fHasOldProps )
-    {
-        this.field_66_fHasOldProps = field_66_fHasOldProps;
-    }
-
-    /**
-     * Mark the character as hidden..
-     */
-    @Internal
-    public boolean getFSdtVanish()
-    {
-        return field_67_fSdtVanish;
-    }
-
-    /**
-     * Mark the character as hidden..
-     */
-    @Internal
-    public void setFSdtVanish( boolean field_67_fSdtVanish )
-    {
-        this.field_67_fSdtVanish = field_67_fSdtVanish;
-    }
-
-    /**
-     * Get the wCharScale field for the CHP record.
-     */
-    @Internal
-    public int getWCharScale()
-    {
-        return field_68_wCharScale;
-    }
-
-    /**
-     * Set the wCharScale field for the CHP record.
-     */
-    @Internal
-    public void setWCharScale( int field_68_wCharScale )
-    {
-        this.field_68_wCharScale = field_68_wCharScale;
-    }
-
-    /**
-     * Sets the fBold field value.
-     * Text is bold
-     */
-    @Internal
-    public void setFBold( boolean value )
-    {
-        field_1_grpfChp = fBold.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Text is bold
-     * @return  the fBold field value.
-     */
-    @Internal
-    public boolean isFBold()
-    {
-        return fBold.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fItalic field value.
-     * Italic
-     */
-    @Internal
-    public void setFItalic( boolean value )
-    {
-        field_1_grpfChp = fItalic.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Italic
-     * @return  the fItalic field value.
-     */
-    @Internal
-    public boolean isFItalic()
-    {
-        return fItalic.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fRMarkDel field value.
-     * has been deleted and will be displayed with strikethrough when revision marked text is to be displayed
-     */
-    @Internal
-    public void setFRMarkDel( boolean value )
-    {
-        field_1_grpfChp = fRMarkDel.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * has been deleted and will be displayed with strikethrough when revision marked text is to be displayed
-     * @return  the fRMarkDel field value.
-     */
-    @Internal
-    public boolean isFRMarkDel()
-    {
-        return fRMarkDel.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fOutline field value.
-     * Outlined
-     */
-    @Internal
-    public void setFOutline( boolean value )
-    {
-        field_1_grpfChp = fOutline.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Outlined
-     * @return  the fOutline field value.
-     */
-    @Internal
-    public boolean isFOutline()
-    {
-        return fOutline.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fFldVanish field value.
-     * Used internally by Word
-     */
-    @Internal
-    public void setFFldVanish( boolean value )
-    {
-        field_1_grpfChp = fFldVanish.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word
-     * @return  the fFldVanish field value.
-     */
-    @Internal
-    public boolean isFFldVanish()
-    {
-        return fFldVanish.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fSmallCaps field value.
-     * Displayed with small caps
-     */
-    @Internal
-    public void setFSmallCaps( boolean value )
-    {
-        field_1_grpfChp = fSmallCaps.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Displayed with small caps
-     * @return  the fSmallCaps field value.
-     */
-    @Internal
-    public boolean isFSmallCaps()
-    {
-        return fSmallCaps.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fCaps field value.
-     * Displayed with caps
-     */
-    @Internal
-    public void setFCaps( boolean value )
-    {
-        field_1_grpfChp = fCaps.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Displayed with caps
-     * @return  the fCaps field value.
-     */
-    @Internal
-    public boolean isFCaps()
-    {
-        return fCaps.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fVanish field value.
-     * text has hidden format, and is not displayed unless fPagHidden is set in the DOP
-     */
-    @Internal
-    public void setFVanish( boolean value )
-    {
-        field_1_grpfChp = fVanish.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * text has hidden format, and is not displayed unless fPagHidden is set in the DOP
-     * @return  the fVanish field value.
-     */
-    @Internal
-    public boolean isFVanish()
-    {
-        return fVanish.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fRMark field value.
-     * text is newly typed since the last time revision marks have been accepted and will be displayed with an underline when revision marked text is to be displayed
-     */
-    @Internal
-    public void setFRMark( boolean value )
-    {
-        field_1_grpfChp = fRMark.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * text is newly typed since the last time revision marks have been accepted and will be displayed with an underline when revision marked text is to be displayed
-     * @return  the fRMark field value.
-     */
-    @Internal
-    public boolean isFRMark()
-    {
-        return fRMark.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fSpec field value.
-     * Character is a Word special character
-     */
-    @Internal
-    public void setFSpec( boolean value )
-    {
-        field_1_grpfChp = fSpec.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Character is a Word special character
-     * @return  the fSpec field value.
-     */
-    @Internal
-    public boolean isFSpec()
-    {
-        return fSpec.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fStrike field value.
-     * Displayed with strikethrough
-     */
-    @Internal
-    public void setFStrike( boolean value )
-    {
-        field_1_grpfChp = fStrike.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Displayed with strikethrough
-     * @return  the fStrike field value.
-     */
-    @Internal
-    public boolean isFStrike()
-    {
-        return fStrike.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fObj field value.
-     * Embedded objec
-     */
-    @Internal
-    public void setFObj( boolean value )
-    {
-        field_1_grpfChp = fObj.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Embedded objec
-     * @return  the fObj field value.
-     */
-    @Internal
-    public boolean isFObj()
-    {
-        return fObj.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fShadow field value.
-     * Character is drawn with a shadow
-     */
-    @Internal
-    public void setFShadow( boolean value )
-    {
-        field_1_grpfChp = fShadow.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Character is drawn with a shadow
-     * @return  the fShadow field value.
-     */
-    @Internal
-    public boolean isFShadow()
-    {
-        return fShadow.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fLowerCase field value.
-     * Character is displayed in lower case. This field may be set to 1 only when chp.fSmallCaps is 1.
-     */
-    @Internal
-    public void setFLowerCase( boolean value )
-    {
-        field_1_grpfChp = fLowerCase.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Character is displayed in lower case. This field may be set to 1 only when chp.fSmallCaps is 1.
-     * @return  the fLowerCase field value.
-     */
-    @Internal
-    public boolean isFLowerCase()
-    {
-        return fLowerCase.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fData field value.
-     * chp.fcPic points to an FFDATA, the data structure binary data used by Word to describe a form field. The bit chp.fData may only be 1 when chp.fSpec is also 1 and the special character in the document stream that has this property is a chPicture (0x01)
-     */
-    @Internal
-    public void setFData( boolean value )
-    {
-        field_1_grpfChp = fData.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * chp.fcPic points to an FFDATA, the data structure binary data used by Word to describe a form field. The bit chp.fData may only be 1 when chp.fSpec is also 1 and the special character in the document stream that has this property is a chPicture (0x01)
-     * @return  the fData field value.
-     */
-    @Internal
-    public boolean isFData()
-    {
-        return fData.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fOle2 field value.
-     * chp.lTagObj specifies a particular object in the object stream that specifies the particular OLE object in the stream that should be displayed when the chPicture fSpec character that is tagged with the fOle2 is encountered. The bit chp.fOle2 may only be 1 when chp.fSpec is also 1 and the special character in the document stream that has this property is a chPicture (0x01).
-     */
-    @Internal
-    public void setFOle2( boolean value )
-    {
-        field_1_grpfChp = fOle2.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * chp.lTagObj specifies a particular object in the object stream that specifies the particular OLE object in the stream that should be displayed when the chPicture fSpec character that is tagged with the fOle2 is encountered. The bit chp.fOle2 may only be 1 when chp.fSpec is also 1 and the special character in the document stream that has this property is a chPicture (0x01).
-     * @return  the fOle2 field value.
-     */
-    @Internal
-    public boolean isFOle2()
-    {
-        return fOle2.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fEmboss field value.
-     * Text is embossed
-     */
-    @Internal
-    public void setFEmboss( boolean value )
-    {
-        field_1_grpfChp = fEmboss.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Text is embossed
-     * @return  the fEmboss field value.
-     */
-    @Internal
-    public boolean isFEmboss()
-    {
-        return fEmboss.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fImprint field value.
-     * Text is engraved
-     */
-    @Internal
-    public void setFImprint( boolean value )
-    {
-        field_1_grpfChp = fImprint.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Text is engraved
-     * @return  the fImprint field value.
-     */
-    @Internal
-    public boolean isFImprint()
-    {
-        return fImprint.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fDStrike field value.
-     * Displayed with double strikethrough
-     */
-    @Internal
-    public void setFDStrike( boolean value )
-    {
-        field_1_grpfChp = fDStrike.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Displayed with double strikethrough
-     * @return  the fDStrike field value.
-     */
-    @Internal
-    public boolean isFDStrike()
-    {
-        return fDStrike.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fUsePgsuSettings field value.
-     * Used internally by Word
-     */
-    @Internal
-    public void setFUsePgsuSettings( boolean value )
-    {
-        field_1_grpfChp = fUsePgsuSettings.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word
-     * @return  the fUsePgsuSettings field value.
-     */
-    @Internal
-    public boolean isFUsePgsuSettings()
-    {
-        return fUsePgsuSettings.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fBoldBi field value.
-     * Complex Scripts text is bold
-     */
-    @Internal
-    public void setFBoldBi( boolean value )
-    {
-        field_1_grpfChp = fBoldBi.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Complex Scripts text is bold
-     * @return  the fBoldBi field value.
-     */
-    @Internal
-    public boolean isFBoldBi()
-    {
-        return fBoldBi.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fComplexScripts field value.
-     * Complex Scripts text that requires special processing to display and process
-     */
-    @Internal
-    public void setFComplexScripts( boolean value )
-    {
-        field_1_grpfChp = fComplexScripts.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Complex Scripts text that requires special processing to display and process
-     * @return  the fComplexScripts field value.
-     */
-    @Internal
-    public boolean isFComplexScripts()
-    {
-        return fComplexScripts.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fItalicBi field value.
-     * Complex Scripts text is italics
-     */
-    @Internal
-    public void setFItalicBi( boolean value )
-    {
-        field_1_grpfChp = fItalicBi.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Complex Scripts text is italics
-     * @return  the fItalicBi field value.
-     */
-    @Internal
-    public boolean isFItalicBi()
-    {
-        return fItalicBi.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fBiDi field value.
-     * Complex Scripts right-to-left text that requires special processing to display and process (character reordering; contextual shaping; display of combining characters and diacritics; specialized justification rules; cursor positioning)
-     */
-    @Internal
-    public void setFBiDi( boolean value )
-    {
-        field_1_grpfChp = fBiDi.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Complex Scripts right-to-left text that requires special processing to display and process (character reordering; contextual shaping; display of combining characters and diacritics; specialized justification rules; cursor positioning)
-     * @return  the fBiDi field value.
-     */
-    @Internal
-    public boolean isFBiDi()
-    {
-        return fBiDi.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fIcoBi field value.
-     * Used internally by Word
-     */
-    @Internal
-    public void setFIcoBi( boolean value )
-    {
-        field_1_grpfChp = fIcoBi.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word
-     * @return  the fIcoBi field value.
-     */
-    @Internal
-    public boolean isFIcoBi()
-    {
-        return fIcoBi.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fNonGlyph field value.
-     * Used internally by Word
-     */
-    @Internal
-    public void setFNonGlyph( boolean value )
-    {
-        field_1_grpfChp = fNonGlyph.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word
-     * @return  the fNonGlyph field value.
-     */
-    @Internal
-    public boolean isFNonGlyph()
-    {
-        return fNonGlyph.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fBoldOther field value.
-     * Used internally by Word 97 and earlier versions
-     */
-    @Internal
-    public void setFBoldOther( boolean value )
-    {
-        field_1_grpfChp = fBoldOther.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word 97 and earlier versions
-     * @return  the fBoldOther field value.
-     */
-    @Internal
-    public boolean isFBoldOther()
-    {
-        return fBoldOther.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fItalicOther field value.
-     * Used internally by Word 97 and earlier versions
-     */
-    @Internal
-    public void setFItalicOther( boolean value )
-    {
-        field_1_grpfChp = fItalicOther.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word 97 and earlier versions
-     * @return  the fItalicOther field value.
-     */
-    @Internal
-    public boolean isFItalicOther()
-    {
-        return fItalicOther.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fNoProof field value.
-     * When set to 1, do not check spelling or grammar
-     */
-    @Internal
-    public void setFNoProof( boolean value )
-    {
-        field_1_grpfChp = fNoProof.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * When set to 1, do not check spelling or grammar
-     * @return  the fNoProof field value.
-     */
-    @Internal
-    public boolean isFNoProof()
-    {
-        return fNoProof.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fWebHidden field value.
-     * Text should be hidden in Web View when set to 1
-     */
-    @Internal
-    public void setFWebHidden( boolean value )
-    {
-        field_1_grpfChp = fWebHidden.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Text should be hidden in Web View when set to 1
-     * @return  the fWebHidden field value.
-     */
-    @Internal
-    public boolean isFWebHidden()
-    {
-        return fWebHidden.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fFitText field value.
-     * Fit text when set to 1
-     */
-    @Internal
-    public void setFFitText( boolean value )
-    {
-        field_1_grpfChp = fFitText.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Fit text when set to 1
-     * @return  the fFitText field value.
-     */
-    @Internal
-    public boolean isFFitText()
-    {
-        return fFitText.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fCalc field value.
-     * Used internally by Word
-     */
-    @Internal
-    public void setFCalc( boolean value )
-    {
-        field_1_grpfChp = fCalc.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word
-     * @return  the fCalc field value.
-     */
-    @Internal
-    public boolean isFCalc()
-    {
-        return fCalc.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the fFmtLineProp field value.
-     * Used internally by Word
-     */
-    @Internal
-    public void setFFmtLineProp( boolean value )
-    {
-        field_1_grpfChp = fFmtLineProp.setBoolean(field_1_grpfChp, value);
-    }
-
-    /**
-     * Used internally by Word
-     * @return  the fFmtLineProp field value.
-     */
-    @Internal
-    public boolean isFFmtLineProp()
-    {
-        return fFmtLineProp.isSet(field_1_grpfChp);
-    }
-
-    /**
-     * Sets the itypFELayout field value.
-     * 
-     */
-    @Internal
-    public void setItypFELayout( short value )
-    {
-        field_29_ufel = (short)itypFELayout.setValue(field_29_ufel, value);
-    }
-
-    /**
-     * 
-     * @return  the itypFELayout field value.
-     */
-    @Internal
-    public short getItypFELayout()
-    {
-        return ( short )itypFELayout.getValue(field_29_ufel);
-    }
-
-    /**
-     * Sets the fTNY field value.
-     * Tatenakayoko: Horizontal-in-vertical (range of text in a direction perpendicular to the text flow) is used
-     */
-    @Internal
-    public void setFTNY( boolean value )
-    {
-        field_29_ufel = (short)fTNY.setBoolean(field_29_ufel, value);
-    }
-
-    /**
-     * Tatenakayoko: Horizontal-in-vertical (range of text in a direction perpendicular to the text flow) is used
-     * @return  the fTNY field value.
-     */
-    @Internal
-    public boolean isFTNY()
-    {
-        return fTNY.isSet(field_29_ufel);
-    }
-
-    /**
-     * Sets the fWarichu field value.
-     * Two lines in one (text in the group is displayed as two half-height lines within a line)
-     */
-    @Internal
-    public void setFWarichu( boolean value )
-    {
-        field_29_ufel = (short)fWarichu.setBoolean(field_29_ufel, value);
-    }
-
-    /**
-     * Two lines in one (text in the group is displayed as two half-height lines within a line)
-     * @return  the fWarichu field value.
-     */
-    @Internal
-    public boolean isFWarichu()
-    {
-        return fWarichu.isSet(field_29_ufel);
-    }
-
-    /**
-     * Sets the fKumimoji field value.
-     * combine characters
-     */
-    @Internal
-    public void setFKumimoji( boolean value )
-    {
-        field_29_ufel = (short)fKumimoji.setBoolean(field_29_ufel, value);
-    }
-
-    /**
-     * combine characters
-     * @return  the fKumimoji field value.
-     */
-    @Internal
-    public boolean isFKumimoji()
-    {
-        return fKumimoji.isSet(field_29_ufel);
-    }
-
-    /**
-     * Sets the fRuby field value.
-     * Phonetic guide
-     */
-    @Internal
-    public void setFRuby( boolean value )
-    {
-        field_29_ufel = (short)fRuby.setBoolean(field_29_ufel, value);
-    }
-
-    /**
-     * Phonetic guide
-     * @return  the fRuby field value.
-     */
-    @Internal
-    public boolean isFRuby()
-    {
-        return fRuby.isSet(field_29_ufel);
-    }
-
-    /**
-     * Sets the fLSFitText field value.
-     * fit text
-     */
-    @Internal
-    public void setFLSFitText( boolean value )
-    {
-        field_29_ufel = (short)fLSFitText.setBoolean(field_29_ufel, value);
-    }
-
-    /**
-     * fit text
-     * @return  the fLSFitText field value.
-     */
-    @Internal
-    public boolean isFLSFitText()
-    {
-        return fLSFitText.isSet(field_29_ufel);
-    }
-
-    /**
-     * Sets the spare field value.
-     * Unused
-     */
-    @Internal
-    public void setSpare( byte value )
-    {
-        field_29_ufel = (short)spare.setValue(field_29_ufel, value);
-    }
-
-    /**
-     * Unused
-     * @return  the spare field value.
-     */
-    @Internal
-    public byte getSpare()
-    {
-        return ( byte )spare.getValue(field_29_ufel);
-    }
-
-    /**
-     * Sets the iWarichuBracket field value.
-     * Bracket character for two-lines-in-one
-     */
-    @Internal
-    public void setIWarichuBracket( byte value )
-    {
-        field_30_copt = (byte)iWarichuBracket.setValue(field_30_copt, value);
-    }
-
-    /**
-     * Bracket character for two-lines-in-one
-     * @return  the iWarichuBracket field value.
-     */
-    @Internal
-    public byte getIWarichuBracket()
-    {
-        return ( byte )iWarichuBracket.getValue(field_30_copt);
-    }
-
-    /**
-     * Sets the fWarichuNoOpenBracket field value.
-     * Two-lines-in-one uses no open
-     */
-    @Internal
-    public void setFWarichuNoOpenBracket( boolean value )
-    {
-        field_30_copt = (byte)fWarichuNoOpenBracket.setBoolean(field_30_copt, value);
-    }
-
-    /**
-     * Two-lines-in-one uses no open
-     * @return  the fWarichuNoOpenBracket field value.
-     */
-    @Internal
-    public boolean isFWarichuNoOpenBracket()
-    {
-        return fWarichuNoOpenBracket.isSet(field_30_copt);
-    }
-
-    /**
-     * Sets the fTNYCompress field value.
-     * fit text in line
-     */
-    @Internal
-    public void setFTNYCompress( boolean value )
-    {
-        field_30_copt = (byte)fTNYCompress.setBoolean(field_30_copt, value);
-    }
-
-    /**
-     * fit text in line
-     * @return  the fTNYCompress field value.
-     */
-    @Internal
-    public boolean isFTNYCompress()
-    {
-        return fTNYCompress.isSet(field_30_copt);
-    }
-
-    /**
-     * Sets the fTNYFetchTxm field value.
-     * fetch text metrics
-     */
-    @Internal
-    public void setFTNYFetchTxm( boolean value )
-    {
-        field_30_copt = (byte)fTNYFetchTxm.setBoolean(field_30_copt, value);
-    }
-
-    /**
-     * fetch text metrics
-     * @return  the fTNYFetchTxm field value.
-     */
-    @Internal
-    public boolean isFTNYFetchTxm()
-    {
-        return fTNYFetchTxm.isSet(field_30_copt);
-    }
-
-    /**
-     * Sets the fCellFitText field value.
-     * Fit text in cell
-     */
-    @Internal
-    public void setFCellFitText( boolean value )
-    {
-        field_30_copt = (byte)fCellFitText.setBoolean(field_30_copt, value);
-    }
-
-    /**
-     * Fit text in cell
-     * @return  the fCellFitText field value.
-     */
-    @Internal
-    public boolean isFCellFitText()
-    {
-        return fCellFitText.isSet(field_30_copt);
-    }
-
-    /**
-     * Sets the unused field value.
-     * Not used
-     */
-    @Internal
-    public void setUnused( boolean value )
-    {
-        field_30_copt = (byte)unused.setBoolean(field_30_copt, value);
-    }
-
-    /**
-     * Not used
-     * @return  the unused field value.
-     */
-    @Internal
-    public boolean isUnused()
-    {
-        return unused.isSet(field_30_copt);
-    }
-
-    /**
-     * Sets the icoHighlight field value.
-     * Highlight color (see chp.ico)
-     */
-    @Internal
-    public void setIcoHighlight( byte value )
-    {
-        field_48_Highlight = (short)icoHighlight.setValue(field_48_Highlight, value);
-    }
-
-    /**
-     * Highlight color (see chp.ico)
-     * @return  the icoHighlight field value.
-     */
-    @Internal
-    public byte getIcoHighlight()
-    {
-        return ( byte )icoHighlight.getValue(field_48_Highlight);
-    }
-
-    /**
-     * Sets the fHighlight field value.
-     * When 1, characters are highlighted with color specified by chp.icoHighlight
-     */
-    @Internal
-    public void setFHighlight( boolean value )
-    {
-        field_48_Highlight = (short)fHighlight.setBoolean(field_48_Highlight, value);
-    }
-
-    /**
-     * When 1, characters are highlighted with color specified by chp.icoHighlight
-     * @return  the fHighlight field value.
-     */
-    @Internal
-    public boolean isFHighlight()
-    {
-        return fHighlight.isSet(field_48_Highlight);
-    }
-
-    /**
-     * Sets the fChsDiff field value.
-     * Pre-Unicode files, char's char set different from FIB char set
-     */
-    @Internal
-    public void setFChsDiff( boolean value )
-    {
-        field_49_CharsetFlags = (short)fChsDiff.setBoolean(field_49_CharsetFlags, value);
-    }
-
-    /**
-     * Pre-Unicode files, char's char set different from FIB char set
-     * @return  the fChsDiff field value.
-     */
-    @Internal
-    public boolean isFChsDiff()
-    {
-        return fChsDiff.isSet(field_49_CharsetFlags);
-    }
-
-    /**
-     * Sets the fMacChs field value.
-     * fTrue if char's are Macintosh char set
-     */
-    @Internal
-    public void setFMacChs( boolean value )
-    {
-        field_49_CharsetFlags = (short)fMacChs.setBoolean(field_49_CharsetFlags, value);
-    }
-
-    /**
-     * fTrue if char's are Macintosh char set
-     * @return  the fMacChs field value.
-     */
-    @Internal
-    public boolean isFMacChs()
-    {
-        return fMacChs.isSet(field_49_CharsetFlags);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
deleted file mode 100644
index 773f731..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
+++ /dev/null
@@ -1,3314 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import java.util.Arrays;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Document Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
- *
- * @author S. Ryan Ackley
- */
-@Internal
-public abstract class DOPAbstractType {
-
-    protected byte field_1_formatFlags;
-    private static final BitField fFacingPages = new BitField(0x01);
-    private static final BitField fWidowControl = new BitField(0x02);
-    private static final BitField fPMHMainDoc = new BitField(0x04);
-    private static final BitField grfSupression = new BitField(0x18);
-    private static final BitField fpc = new BitField(0x60);
-    private static final BitField unused1 = new BitField(0x80);
-    protected byte field_2_unused2;
-    protected short field_3_footnoteInfo;
-    private static final BitField rncFtn = new BitField(0x0003);
-    private static final BitField nFtn = new BitField(0xfffc);
-    protected byte field_4_fOutlineDirtySave;
-    protected byte field_5_docinfo;
-    private static final BitField fOnlyMacPics = new BitField(0x01);
-    private static final BitField fOnlyWinPics = new BitField(0x02);
-    private static final BitField fLabelDoc = new BitField(0x04);
-    private static final BitField fHyphCapitals = new BitField(0x08);
-    private static final BitField fAutoHyphen = new BitField(0x10);
-    private static final BitField fFormNoFields = new BitField(0x20);
-    private static final BitField fLinkStyles = new BitField(0x40);
-    private static final BitField fRevMarking = new BitField(0x80);
-    protected byte field_6_docinfo1;
-    private static final BitField fBackup = new BitField(0x01);
-    private static final BitField fExactCWords = new BitField(0x02);
-    private static final BitField fPagHidden = new BitField(0x04);
-    private static final BitField fPagResults = new BitField(0x08);
-    private static final BitField fLockAtn = new BitField(0x10);
-    private static final BitField fMirrorMargins = new BitField(0x20);
-    private static final BitField unused3 = new BitField(0x40);
-    private static final BitField fDfltTrueType = new BitField(0x80);
-    protected byte field_7_docinfo2;
-    private static final BitField fPagSupressTopSpacing = new BitField(0x01);
-    private static final BitField fProtEnabled = new BitField(0x02);
-    private static final BitField fDispFormFldSel = new BitField(0x04);
-    private static final BitField fRMView = new BitField(0x08);
-    private static final BitField fRMPrint = new BitField(0x10);
-    private static final BitField unused4 = new BitField(0x20);
-    private static final BitField fLockRev = new BitField(0x40);
-    private static final BitField fEmbedFonts = new BitField(0x80);
-    protected short field_8_docinfo3;
-    private static final BitField oldfNoTabForInd = new BitField(0x0001);
-    private static final BitField oldfNoSpaceRaiseLower = new BitField(0x0002);
-    private static final BitField oldfSuppressSpbfAfterPageBreak = new BitField(0x0004);
-    private static final BitField oldfWrapTrailSpaces = new BitField(0x0008);
-    private static final BitField oldfMapPrintTextColor = new BitField(0x0010);
-    private static final BitField oldfNoColumnBalance = new BitField(0x0020);
-    private static final BitField oldfConvMailMergeEsc = new BitField(0x0040);
-    private static final BitField oldfSupressTopSpacing = new BitField(0x0080);
-    private static final BitField oldfOrigWordTableRules = new BitField(0x0100);
-    private static final BitField oldfTransparentMetafiles = new BitField(0x0200);
-    private static final BitField oldfShowBreaksInFrames = new BitField(0x0400);
-    private static final BitField oldfSwapBordersFacingPgs = new BitField(0x0800);
-    private static final BitField unused5 = new BitField(0xf000);
-    protected int field_9_dxaTab;
-    protected int field_10_wSpare;
-    protected int field_11_dxaHotz;
-    protected int field_12_cConsexHypLim;
-    protected int field_13_wSpare2;
-    protected int field_14_dttmCreated;
-    protected int field_15_dttmRevised;
-    protected int field_16_dttmLastPrint;
-    protected int field_17_nRevision;
-    protected int field_18_tmEdited;
-    protected int field_19_cWords;
-    protected int field_20_cCh;
-    protected int field_21_cPg;
-    protected int field_22_cParas;
-    protected short field_23_Edn;
-    private static final BitField rncEdn = new BitField(0x0003);
-    private static final BitField nEdn = new BitField(0xfffc);
-    protected short field_24_Edn1;
-    private static final BitField epc = new BitField(0x0003);
-    private static final BitField nfcFtnRef1 = new BitField(0x003c);
-    private static final BitField nfcEdnRef1 = new BitField(0x03c0);
-    private static final BitField fPrintFormData = new BitField(0x0400);
-    private static final BitField fSaveFormData = new BitField(0x0800);
-    private static final BitField fShadeFormData = new BitField(0x1000);
-    private static final BitField fWCFtnEdn = new BitField(0x8000);
-    protected int field_25_cLines;
-    protected int field_26_cWordsFtnEnd;
-    protected int field_27_cChFtnEdn;
-    protected short field_28_cPgFtnEdn;
-    protected int field_29_cParasFtnEdn;
-    protected int field_30_cLinesFtnEdn;
-    protected int field_31_lKeyProtDoc;
-    protected short field_32_view;
-    private static final BitField wvkSaved = new BitField(0x0007);
-    private static final BitField wScaleSaved = new BitField(0x0ff8);
-    private static final BitField zkSaved = new BitField(0x3000);
-    private static final BitField fRotateFontW6 = new BitField(0x4000);
-    private static final BitField iGutterPos = new BitField(0x8000);
-    protected int field_33_docinfo4;
-    private static final BitField fNoTabForInd = new BitField(0x00000001);
-    private static final BitField fNoSpaceRaiseLower = new BitField(0x00000002);
-    private static final BitField fSupressSpdfAfterPageBreak = new BitField(0x00000004);
-    private static final BitField fWrapTrailSpaces = new BitField(0x00000008);
-    private static final BitField fMapPrintTextColor = new BitField(0x00000010);
-    private static final BitField fNoColumnBalance = new BitField(0x00000020);
-    private static final BitField fConvMailMergeEsc = new BitField(0x00000040);
-    private static final BitField fSupressTopSpacing = new BitField(0x00000080);
-    private static final BitField fOrigWordTableRules = new BitField(0x00000100);
-    private static final BitField fTransparentMetafiles = new BitField(0x00000200);
-    private static final BitField fShowBreaksInFrames = new BitField(0x00000400);
-    private static final BitField fSwapBordersFacingPgs = new BitField(0x00000800);
-    private static final BitField fSuppressTopSPacingMac5 = new BitField(0x00010000);
-    private static final BitField fTruncDxaExpand = new BitField(0x00020000);
-    private static final BitField fPrintBodyBeforeHdr = new BitField(0x00040000);
-    private static final BitField fNoLeading = new BitField(0x00080000);
-    private static final BitField fMWSmallCaps = new BitField(0x00200000);
-    protected short field_34_adt;
-    protected byte[] field_35_doptypography;
-    protected byte[] field_36_dogrid;
-    protected short field_37_docinfo5;
-    private static final BitField lvl = new BitField(0x001e);
-    private static final BitField fGramAllDone = new BitField(0x0020);
-    private static final BitField fGramAllClean = new BitField(0x0040);
-    private static final BitField fSubsetFonts = new BitField(0x0080);
-    private static final BitField fHideLastVersion = new BitField(0x0100);
-    private static final BitField fHtmlDoc = new BitField(0x0200);
-    private static final BitField fSnapBorder = new BitField(0x0800);
-    private static final BitField fIncludeHeader = new BitField(0x1000);
-    private static final BitField fIncludeFooter = new BitField(0x2000);
-    private static final BitField fForcePageSizePag = new BitField(0x4000);
-    private static final BitField fMinFontSizePag = new BitField(0x8000);
-    protected short field_38_docinfo6;
-    private static final BitField fHaveVersions = new BitField(0x0001);
-    private static final BitField fAutoVersions = new BitField(0x0002);
-    protected byte[] field_39_asumyi;
-    protected int field_40_cChWS;
-    protected int field_41_cChWSFtnEdn;
-    protected int field_42_grfDocEvents;
-    protected int field_43_virusinfo;
-    private static final BitField fVirusPrompted = new BitField(0x0001);
-    private static final BitField fVirusLoadSafe = new BitField(0x0002);
-    private static final BitField KeyVirusSession30 = new BitField(0xfffffffc);
-    protected byte[] field_44_Spare;
-    protected int field_45_reserved1;
-    protected int field_46_reserved2;
-    protected int field_47_cDBC;
-    protected int field_48_cDBCFtnEdn;
-    protected int field_49_reserved;
-    protected short field_50_nfcFtnRef;
-    protected short field_51_nfcEdnRef;
-    protected short field_52_hpsZoonFontPag;
-    protected short field_53_dywDispPag;
-
-    protected DOPAbstractType()
-    {
-        this.field_35_doptypography = new byte[0];
-        this.field_36_dogrid = new byte[0];
-        this.field_39_asumyi = new byte[0];
-        this.field_44_Spare = new byte[0];
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_formatFlags            = data[ 0x0 + offset ];
-        field_2_unused2                = data[ 0x1 + offset ];
-        field_3_footnoteInfo           = LittleEndian.getShort(data, 0x2 + offset);
-        field_4_fOutlineDirtySave      = data[ 0x4 + offset ];
-        field_5_docinfo                = data[ 0x5 + offset ];
-        field_6_docinfo1               = data[ 0x6 + offset ];
-        field_7_docinfo2               = data[ 0x7 + offset ];
-        field_8_docinfo3               = LittleEndian.getShort(data, 0x8 + offset);
-        field_9_dxaTab                 = LittleEndian.getShort(data, 0xa + offset);
-        field_10_wSpare                = LittleEndian.getShort(data, 0xc + offset);
-        field_11_dxaHotz               = LittleEndian.getShort(data, 0xe + offset);
-        field_12_cConsexHypLim         = LittleEndian.getShort(data, 0x10 + offset);
-        field_13_wSpare2               = LittleEndian.getShort(data, 0x12 + offset);
-        field_14_dttmCreated           = LittleEndian.getInt(data, 0x14 + offset);
-        field_15_dttmRevised           = LittleEndian.getInt(data, 0x18 + offset);
-        field_16_dttmLastPrint         = LittleEndian.getInt(data, 0x1c + offset);
-        field_17_nRevision             = LittleEndian.getShort(data, 0x20 + offset);
-        field_18_tmEdited              = LittleEndian.getInt(data, 0x22 + offset);
-        field_19_cWords                = LittleEndian.getInt(data, 0x26 + offset);
-        field_20_cCh                   = LittleEndian.getInt(data, 0x2a + offset);
-        field_21_cPg                   = LittleEndian.getShort(data, 0x2e + offset);
-        field_22_cParas                = LittleEndian.getInt(data, 0x30 + offset);
-        field_23_Edn                   = LittleEndian.getShort(data, 0x34 + offset);
-        field_24_Edn1                  = LittleEndian.getShort(data, 0x36 + offset);
-        field_25_cLines                = LittleEndian.getInt(data, 0x38 + offset);
-        field_26_cWordsFtnEnd          = LittleEndian.getInt(data, 0x3c + offset);
-        field_27_cChFtnEdn             = LittleEndian.getInt(data, 0x40 + offset);
-        field_28_cPgFtnEdn             = LittleEndian.getShort(data, 0x44 + offset);
-        field_29_cParasFtnEdn          = LittleEndian.getInt(data, 0x46 + offset);
-        field_30_cLinesFtnEdn          = LittleEndian.getInt(data, 0x4a + offset);
-        field_31_lKeyProtDoc           = LittleEndian.getInt(data, 0x4e + offset);
-        field_32_view                  = LittleEndian.getShort(data, 0x52 + offset);
-        field_33_docinfo4              = LittleEndian.getInt(data, 0x54 + offset);
-        field_34_adt                   = LittleEndian.getShort(data, 0x58 + offset);
-        field_35_doptypography         = LittleEndian.getByteArray(data, 0x5a + offset,310);
-        field_36_dogrid                = LittleEndian.getByteArray(data, 0x190 + offset,10);
-        field_37_docinfo5              = LittleEndian.getShort(data, 0x19a + offset);
-        field_38_docinfo6              = LittleEndian.getShort(data, 0x19c + offset);
-        field_39_asumyi                = LittleEndian.getByteArray(data, 0x19e + offset,12);
-        field_40_cChWS                 = LittleEndian.getInt(data, 0x1aa + offset);
-        field_41_cChWSFtnEdn           = LittleEndian.getInt(data, 0x1ae + offset);
-        field_42_grfDocEvents          = LittleEndian.getInt(data, 0x1b2 + offset);
-        field_43_virusinfo             = LittleEndian.getInt(data, 0x1b6 + offset);
-        field_44_Spare                 = LittleEndian.getByteArray(data, 0x1ba + offset,30);
-        field_45_reserved1             = LittleEndian.getInt(data, 0x1d8 + offset);
-        field_46_reserved2             = LittleEndian.getInt(data, 0x1dc + offset);
-        field_47_cDBC                  = LittleEndian.getInt(data, 0x1e0 + offset);
-        field_48_cDBCFtnEdn            = LittleEndian.getInt(data, 0x1e4 + offset);
-        field_49_reserved              = LittleEndian.getInt(data, 0x1e8 + offset);
-        field_50_nfcFtnRef             = LittleEndian.getShort(data, 0x1ec + offset);
-        field_51_nfcEdnRef             = LittleEndian.getShort(data, 0x1ee + offset);
-        field_52_hpsZoonFontPag        = LittleEndian.getShort(data, 0x1f0 + offset);
-        field_53_dywDispPag            = LittleEndian.getShort(data, 0x1f2 + offset);
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        data[ 0x0 + offset] = field_1_formatFlags;
-        data[ 0x1 + offset] = field_2_unused2;
-        LittleEndian.putShort(data, 0x2 + offset, field_3_footnoteInfo);
-        data[ 0x4 + offset] = field_4_fOutlineDirtySave;
-        data[ 0x5 + offset] = field_5_docinfo;
-        data[ 0x6 + offset] = field_6_docinfo1;
-        data[ 0x7 + offset] = field_7_docinfo2;
-        LittleEndian.putShort(data, 0x8 + offset, field_8_docinfo3);
-        LittleEndian.putShort(data, 0xa + offset, (short)field_9_dxaTab);
-        LittleEndian.putShort(data, 0xc + offset, (short)field_10_wSpare);
-        LittleEndian.putShort(data, 0xe + offset, (short)field_11_dxaHotz);
-        LittleEndian.putShort(data, 0x10 + offset, (short)field_12_cConsexHypLim);
-        LittleEndian.putShort(data, 0x12 + offset, (short)field_13_wSpare2);
-        LittleEndian.putInt(data, 0x14 + offset, field_14_dttmCreated);
-        LittleEndian.putInt(data, 0x18 + offset, field_15_dttmRevised);
-        LittleEndian.putInt(data, 0x1c + offset, field_16_dttmLastPrint);
-        LittleEndian.putShort(data, 0x20 + offset, (short)field_17_nRevision);
-        LittleEndian.putInt(data, 0x22 + offset, field_18_tmEdited);
-        LittleEndian.putInt(data, 0x26 + offset, field_19_cWords);
-        LittleEndian.putInt(data, 0x2a + offset, field_20_cCh);
-        LittleEndian.putShort(data, 0x2e + offset, (short)field_21_cPg);
-        LittleEndian.putInt(data, 0x30 + offset, field_22_cParas);
-        LittleEndian.putShort(data, 0x34 + offset, field_23_Edn);
-        LittleEndian.putShort(data, 0x36 + offset, field_24_Edn1);
-        LittleEndian.putInt(data, 0x38 + offset, field_25_cLines);
-        LittleEndian.putInt(data, 0x3c + offset, field_26_cWordsFtnEnd);
-        LittleEndian.putInt(data, 0x40 + offset, field_27_cChFtnEdn);
-        LittleEndian.putShort(data, 0x44 + offset, field_28_cPgFtnEdn);
-        LittleEndian.putInt(data, 0x46 + offset, field_29_cParasFtnEdn);
-        LittleEndian.putInt(data, 0x4a + offset, field_30_cLinesFtnEdn);
-        LittleEndian.putInt(data, 0x4e + offset, field_31_lKeyProtDoc);
-        LittleEndian.putShort(data, 0x52 + offset, field_32_view);
-        LittleEndian.putInt(data, 0x54 + offset, field_33_docinfo4);
-        LittleEndian.putShort(data, 0x58 + offset, field_34_adt);
-        System.arraycopy(field_35_doptypography, 0, data, 0x5a + offset, field_35_doptypography.length);
-        System.arraycopy(field_36_dogrid, 0, data, 0x190 + offset, field_36_dogrid.length);
-        LittleEndian.putShort(data, 0x19a + offset, field_37_docinfo5);
-        LittleEndian.putShort(data, 0x19c + offset, field_38_docinfo6);
-        System.arraycopy(field_39_asumyi, 0, data, 0x19e + offset, field_39_asumyi.length);
-        LittleEndian.putInt(data, 0x1aa + offset, field_40_cChWS);
-        LittleEndian.putInt(data, 0x1ae + offset, field_41_cChWSFtnEdn);
-        LittleEndian.putInt(data, 0x1b2 + offset, field_42_grfDocEvents);
-        LittleEndian.putInt(data, 0x1b6 + offset, field_43_virusinfo);
-        System.arraycopy(field_44_Spare, 0, data, 0x1ba + offset, field_44_Spare.length);
-        LittleEndian.putInt(data, 0x1d8 + offset, field_45_reserved1);
-        LittleEndian.putInt(data, 0x1dc + offset, field_46_reserved2);
-        LittleEndian.putInt(data, 0x1e0 + offset, field_47_cDBC);
-        LittleEndian.putInt(data, 0x1e4 + offset, field_48_cDBCFtnEdn);
-        LittleEndian.putInt(data, 0x1e8 + offset, field_49_reserved);
-        LittleEndian.putShort(data, 0x1ec + offset, field_50_nfcFtnRef);
-        LittleEndian.putShort(data, 0x1ee + offset, field_51_nfcEdnRef);
-        LittleEndian.putShort(data, 0x1f0 + offset, field_52_hpsZoonFontPag);
-        LittleEndian.putShort(data, 0x1f2 + offset, field_53_dywDispPag);
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 1 + 1 + 2 + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 4 + 4 + 2 + 4 + 4 + 4 + 2 + 4 + 2 + 2 + 4 + 4 + 4 + 2 + 4 + 4 + 4 + 2 + 4 + 2 + 310 + 10 + 2 + 2 + 12 + 4 + 4 + 4 + 4 + 30 + 4 + 4 + 4 + 4 + 4 + 2 + 2 + 2 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[DOP]\n");
-        builder.append("    .formatFlags          = ");
-        builder.append(" (").append(getFormatFlags()).append(" )\n");
-        builder.append("         .fFacingPages             = ").append(isFFacingPages()).append('\n');
-        builder.append("         .fWidowControl            = ").append(isFWidowControl()).append('\n');
-        builder.append("         .fPMHMainDoc              = ").append(isFPMHMainDoc()).append('\n');
-        builder.append("         .grfSupression            = ").append(getGrfSupression()).append('\n');
-        builder.append("         .fpc                      = ").append(getFpc()).append('\n');
-        builder.append("         .unused1                  = ").append(isUnused1()).append('\n');
-        builder.append("    .unused2              = ");
-        builder.append(" (").append(getUnused2()).append(" )\n");
-        builder.append("    .footnoteInfo         = ");
-        builder.append(" (").append(getFootnoteInfo()).append(" )\n");
-        builder.append("         .rncFtn                   = ").append(getRncFtn()).append('\n');
-        builder.append("         .nFtn                     = ").append(getNFtn()).append('\n');
-        builder.append("    .fOutlineDirtySave    = ");
-        builder.append(" (").append(getFOutlineDirtySave()).append(" )\n");
-        builder.append("    .docinfo              = ");
-        builder.append(" (").append(getDocinfo()).append(" )\n");
-        builder.append("         .fOnlyMacPics             = ").append(isFOnlyMacPics()).append('\n');
-        builder.append("         .fOnlyWinPics             = ").append(isFOnlyWinPics()).append('\n');
-        builder.append("         .fLabelDoc                = ").append(isFLabelDoc()).append('\n');
-        builder.append("         .fHyphCapitals            = ").append(isFHyphCapitals()).append('\n');
-        builder.append("         .fAutoHyphen              = ").append(isFAutoHyphen()).append('\n');
-        builder.append("         .fFormNoFields            = ").append(isFFormNoFields()).append('\n');
-        builder.append("         .fLinkStyles              = ").append(isFLinkStyles()).append('\n');
-        builder.append("         .fRevMarking              = ").append(isFRevMarking()).append('\n');
-        builder.append("    .docinfo1             = ");
-        builder.append(" (").append(getDocinfo1()).append(" )\n");
-        builder.append("         .fBackup                  = ").append(isFBackup()).append('\n');
-        builder.append("         .fExactCWords             = ").append(isFExactCWords()).append('\n');
-        builder.append("         .fPagHidden               = ").append(isFPagHidden()).append('\n');
-        builder.append("         .fPagResults              = ").append(isFPagResults()).append('\n');
-        builder.append("         .fLockAtn                 = ").append(isFLockAtn()).append('\n');
-        builder.append("         .fMirrorMargins           = ").append(isFMirrorMargins()).append('\n');
-        builder.append("         .unused3                  = ").append(isUnused3()).append('\n');
-        builder.append("         .fDfltTrueType            = ").append(isFDfltTrueType()).append('\n');
-        builder.append("    .docinfo2             = ");
-        builder.append(" (").append(getDocinfo2()).append(" )\n");
-        builder.append("         .fPagSupressTopSpacing     = ").append(isFPagSupressTopSpacing()).append('\n');
-        builder.append("         .fProtEnabled             = ").append(isFProtEnabled()).append('\n');
-        builder.append("         .fDispFormFldSel          = ").append(isFDispFormFldSel()).append('\n');
-        builder.append("         .fRMView                  = ").append(isFRMView()).append('\n');
-        builder.append("         .fRMPrint                 = ").append(isFRMPrint()).append('\n');
-        builder.append("         .unused4                  = ").append(isUnused4()).append('\n');
-        builder.append("         .fLockRev                 = ").append(isFLockRev()).append('\n');
-        builder.append("         .fEmbedFonts              = ").append(isFEmbedFonts()).append('\n');
-        builder.append("    .docinfo3             = ");
-        builder.append(" (").append(getDocinfo3()).append(" )\n");
-        builder.append("         .oldfNoTabForInd          = ").append(isOldfNoTabForInd()).append('\n');
-        builder.append("         .oldfNoSpaceRaiseLower     = ").append(isOldfNoSpaceRaiseLower()).append('\n');
-        builder.append("         .oldfSuppressSpbfAfterPageBreak     = ").append(isOldfSuppressSpbfAfterPageBreak()).append('\n');
-        builder.append("         .oldfWrapTrailSpaces      = ").append(isOldfWrapTrailSpaces()).append('\n');
-        builder.append("         .oldfMapPrintTextColor     = ").append(isOldfMapPrintTextColor()).append('\n');
-        builder.append("         .oldfNoColumnBalance      = ").append(isOldfNoColumnBalance()).append('\n');
-        builder.append("         .oldfConvMailMergeEsc     = ").append(isOldfConvMailMergeEsc()).append('\n');
-        builder.append("         .oldfSupressTopSpacing     = ").append(isOldfSupressTopSpacing()).append('\n');
-        builder.append("         .oldfOrigWordTableRules     = ").append(isOldfOrigWordTableRules()).append('\n');
-        builder.append("         .oldfTransparentMetafiles     = ").append(isOldfTransparentMetafiles()).append('\n');
-        builder.append("         .oldfShowBreaksInFrames     = ").append(isOldfShowBreaksInFrames()).append('\n');
-        builder.append("         .oldfSwapBordersFacingPgs     = ").append(isOldfSwapBordersFacingPgs()).append('\n');
-        builder.append("         .unused5                  = ").append(getUnused5()).append('\n');
-        builder.append("    .dxaTab               = ");
-        builder.append(" (").append(getDxaTab()).append(" )\n");
-        builder.append("    .wSpare               = ");
-        builder.append(" (").append(getWSpare()).append(" )\n");
-        builder.append("    .dxaHotz              = ");
-        builder.append(" (").append(getDxaHotz()).append(" )\n");
-        builder.append("    .cConsexHypLim        = ");
-        builder.append(" (").append(getCConsexHypLim()).append(" )\n");
-        builder.append("    .wSpare2              = ");
-        builder.append(" (").append(getWSpare2()).append(" )\n");
-        builder.append("    .dttmCreated          = ");
-        builder.append(" (").append(getDttmCreated()).append(" )\n");
-        builder.append("    .dttmRevised          = ");
-        builder.append(" (").append(getDttmRevised()).append(" )\n");
-        builder.append("    .dttmLastPrint        = ");
-        builder.append(" (").append(getDttmLastPrint()).append(" )\n");
-        builder.append("    .nRevision            = ");
-        builder.append(" (").append(getNRevision()).append(" )\n");
-        builder.append("    .tmEdited             = ");
-        builder.append(" (").append(getTmEdited()).append(" )\n");
-        builder.append("    .cWords               = ");
-        builder.append(" (").append(getCWords()).append(" )\n");
-        builder.append("    .cCh                  = ");
-        builder.append(" (").append(getCCh()).append(" )\n");
-        builder.append("    .cPg                  = ");
-        builder.append(" (").append(getCPg()).append(" )\n");
-        builder.append("    .cParas               = ");
-        builder.append(" (").append(getCParas()).append(" )\n");
-        builder.append("    .Edn                  = ");
-        builder.append(" (").append(getEdn()).append(" )\n");
-        builder.append("         .rncEdn                   = ").append(getRncEdn()).append('\n');
-        builder.append("         .nEdn                     = ").append(getNEdn()).append('\n');
-        builder.append("    .Edn1                 = ");
-        builder.append(" (").append(getEdn1()).append(" )\n");
-        builder.append("         .epc                      = ").append(getEpc()).append('\n');
-        builder.append("         .nfcFtnRef1               = ").append(getNfcFtnRef1()).append('\n');
-        builder.append("         .nfcEdnRef1               = ").append(getNfcEdnRef1()).append('\n');
-        builder.append("         .fPrintFormData           = ").append(isFPrintFormData()).append('\n');
-        builder.append("         .fSaveFormData            = ").append(isFSaveFormData()).append('\n');
-        builder.append("         .fShadeFormData           = ").append(isFShadeFormData()).append('\n');
-        builder.append("         .fWCFtnEdn                = ").append(isFWCFtnEdn()).append('\n');
-        builder.append("    .cLines               = ");
-        builder.append(" (").append(getCLines()).append(" )\n");
-        builder.append("    .cWordsFtnEnd         = ");
-        builder.append(" (").append(getCWordsFtnEnd()).append(" )\n");
-        builder.append("    .cChFtnEdn            = ");
-        builder.append(" (").append(getCChFtnEdn()).append(" )\n");
-        builder.append("    .cPgFtnEdn            = ");
-        builder.append(" (").append(getCPgFtnEdn()).append(" )\n");
-        builder.append("    .cParasFtnEdn         = ");
-        builder.append(" (").append(getCParasFtnEdn()).append(" )\n");
-        builder.append("    .cLinesFtnEdn         = ");
-        builder.append(" (").append(getCLinesFtnEdn()).append(" )\n");
-        builder.append("    .lKeyProtDoc          = ");
-        builder.append(" (").append(getLKeyProtDoc()).append(" )\n");
-        builder.append("    .view                 = ");
-        builder.append(" (").append(getView()).append(" )\n");
-        builder.append("         .wvkSaved                 = ").append(getWvkSaved()).append('\n');
-        builder.append("         .wScaleSaved              = ").append(getWScaleSaved()).append('\n');
-        builder.append("         .zkSaved                  = ").append(getZkSaved()).append('\n');
-        builder.append("         .fRotateFontW6            = ").append(isFRotateFontW6()).append('\n');
-        builder.append("         .iGutterPos               = ").append(isIGutterPos()).append('\n');
-        builder.append("    .docinfo4             = ");
-        builder.append(" (").append(getDocinfo4()).append(" )\n");
-        builder.append("         .fNoTabForInd             = ").append(isFNoTabForInd()).append('\n');
-        builder.append("         .fNoSpaceRaiseLower       = ").append(isFNoSpaceRaiseLower()).append('\n');
-        builder.append("         .fSupressSpdfAfterPageBreak     = ").append(isFSupressSpdfAfterPageBreak()).append('\n');
-        builder.append("         .fWrapTrailSpaces         = ").append(isFWrapTrailSpaces()).append('\n');
-        builder.append("         .fMapPrintTextColor       = ").append(isFMapPrintTextColor()).append('\n');
-        builder.append("         .fNoColumnBalance         = ").append(isFNoColumnBalance()).append('\n');
-        builder.append("         .fConvMailMergeEsc        = ").append(isFConvMailMergeEsc()).append('\n');
-        builder.append("         .fSupressTopSpacing       = ").append(isFSupressTopSpacing()).append('\n');
-        builder.append("         .fOrigWordTableRules      = ").append(isFOrigWordTableRules()).append('\n');
-        builder.append("         .fTransparentMetafiles     = ").append(isFTransparentMetafiles()).append('\n');
-        builder.append("         .fShowBreaksInFrames      = ").append(isFShowBreaksInFrames()).append('\n');
-        builder.append("         .fSwapBordersFacingPgs     = ").append(isFSwapBordersFacingPgs()).append('\n');
-        builder.append("         .fSuppressTopSPacingMac5     = ").append(isFSuppressTopSPacingMac5()).append('\n');
-        builder.append("         .fTruncDxaExpand          = ").append(isFTruncDxaExpand()).append('\n');
-        builder.append("         .fPrintBodyBeforeHdr      = ").append(isFPrintBodyBeforeHdr()).append('\n');
-        builder.append("         .fNoLeading               = ").append(isFNoLeading()).append('\n');
-        builder.append("         .fMWSmallCaps             = ").append(isFMWSmallCaps()).append('\n');
-        builder.append("    .adt                  = ");
-        builder.append(" (").append(getAdt()).append(" )\n");
-        builder.append("    .doptypography        = ");
-        builder.append(" (").append(Arrays.toString(getDoptypography())).append(" )\n");
-        builder.append("    .dogrid               = ");
-        builder.append(" (").append(Arrays.toString(getDogrid())).append(" )\n");
-        builder.append("    .docinfo5             = ");
-        builder.append(" (").append(getDocinfo5()).append(" )\n");
-        builder.append("         .lvl                      = ").append(getLvl()).append('\n');
-        builder.append("         .fGramAllDone             = ").append(isFGramAllDone()).append('\n');
-        builder.append("         .fGramAllClean            = ").append(isFGramAllClean()).append('\n');
-        builder.append("         .fSubsetFonts             = ").append(isFSubsetFonts()).append('\n');
-        builder.append("         .fHideLastVersion         = ").append(isFHideLastVersion()).append('\n');
-        builder.append("         .fHtmlDoc                 = ").append(isFHtmlDoc()).append('\n');
-        builder.append("         .fSnapBorder              = ").append(isFSnapBorder()).append('\n');
-        builder.append("         .fIncludeHeader           = ").append(isFIncludeHeader()).append('\n');
-        builder.append("         .fIncludeFooter           = ").append(isFIncludeFooter()).append('\n');
-        builder.append("         .fForcePageSizePag        = ").append(isFForcePageSizePag()).append('\n');
-        builder.append("         .fMinFontSizePag          = ").append(isFMinFontSizePag()).append('\n');
-        builder.append("    .docinfo6             = ");
-        builder.append(" (").append(getDocinfo6()).append(" )\n");
-        builder.append("         .fHaveVersions            = ").append(isFHaveVersions()).append('\n');
-        builder.append("         .fAutoVersions            = ").append(isFAutoVersions()).append('\n');
-        builder.append("    .asumyi               = ");
-        builder.append(" (").append(Arrays.toString(getAsumyi())).append(" )\n");
-        builder.append("    .cChWS                = ");
-        builder.append(" (").append(getCChWS()).append(" )\n");
-        builder.append("    .cChWSFtnEdn          = ");
-        builder.append(" (").append(getCChWSFtnEdn()).append(" )\n");
-        builder.append("    .grfDocEvents         = ");
-        builder.append(" (").append(getGrfDocEvents()).append(" )\n");
-        builder.append("    .virusinfo            = ");
-        builder.append(" (").append(getVirusinfo()).append(" )\n");
-        builder.append("         .fVirusPrompted           = ").append(isFVirusPrompted()).append('\n');
-        builder.append("         .fVirusLoadSafe           = ").append(isFVirusLoadSafe()).append('\n');
-        builder.append("         .KeyVirusSession30        = ").append(getKeyVirusSession30()).append('\n');
-        builder.append("    .Spare                = ");
-        builder.append(" (").append(Arrays.toString(getSpare())).append(" )\n");
-        builder.append("    .reserved1            = ");
-        builder.append(" (").append(getReserved1()).append(" )\n");
-        builder.append("    .reserved2            = ");
-        builder.append(" (").append(getReserved2()).append(" )\n");
-        builder.append("    .cDBC                 = ");
-        builder.append(" (").append(getCDBC()).append(" )\n");
-        builder.append("    .cDBCFtnEdn           = ");
-        builder.append(" (").append(getCDBCFtnEdn()).append(" )\n");
-        builder.append("    .reserved             = ");
-        builder.append(" (").append(getReserved()).append(" )\n");
-        builder.append("    .nfcFtnRef            = ");
-        builder.append(" (").append(getNfcFtnRef()).append(" )\n");
-        builder.append("    .nfcEdnRef            = ");
-        builder.append(" (").append(getNfcEdnRef()).append(" )\n");
-        builder.append("    .hpsZoonFontPag       = ");
-        builder.append(" (").append(getHpsZoonFontPag()).append(" )\n");
-        builder.append("    .dywDispPag           = ");
-        builder.append(" (").append(getDywDispPag()).append(" )\n");
-
-        builder.append("[/DOP]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Get the formatFlags field for the DOP record.
-     */
-    @Internal
-    public byte getFormatFlags()
-    {
-        return field_1_formatFlags;
-    }
-
-    /**
-     * Set the formatFlags field for the DOP record.
-     */
-    @Internal
-    public void setFormatFlags( byte field_1_formatFlags )
-    {
-        this.field_1_formatFlags = field_1_formatFlags;
-    }
-
-    /**
-     * Get the unused2 field for the DOP record.
-     */
-    @Internal
-    public byte getUnused2()
-    {
-        return field_2_unused2;
-    }
-
-    /**
-     * Set the unused2 field for the DOP record.
-     */
-    @Internal
-    public void setUnused2( byte field_2_unused2 )
-    {
-        this.field_2_unused2 = field_2_unused2;
-    }
-
-    /**
-     * Get the footnoteInfo field for the DOP record.
-     */
-    @Internal
-    public short getFootnoteInfo()
-    {
-        return field_3_footnoteInfo;
-    }
-
-    /**
-     * Set the footnoteInfo field for the DOP record.
-     */
-    @Internal
-    public void setFootnoteInfo( short field_3_footnoteInfo )
-    {
-        this.field_3_footnoteInfo = field_3_footnoteInfo;
-    }
-
-    /**
-     * Get the fOutlineDirtySave field for the DOP record.
-     */
-    @Internal
-    public byte getFOutlineDirtySave()
-    {
-        return field_4_fOutlineDirtySave;
-    }
-
-    /**
-     * Set the fOutlineDirtySave field for the DOP record.
-     */
-    @Internal
-    public void setFOutlineDirtySave( byte field_4_fOutlineDirtySave )
-    {
-        this.field_4_fOutlineDirtySave = field_4_fOutlineDirtySave;
-    }
-
-    /**
-     * Get the docinfo field for the DOP record.
-     */
-    @Internal
-    public byte getDocinfo()
-    {
-        return field_5_docinfo;
-    }
-
-    /**
-     * Set the docinfo field for the DOP record.
-     */
-    @Internal
-    public void setDocinfo( byte field_5_docinfo )
-    {
-        this.field_5_docinfo = field_5_docinfo;
-    }
-
-    /**
-     * Get the docinfo1 field for the DOP record.
-     */
-    @Internal
-    public byte getDocinfo1()
-    {
-        return field_6_docinfo1;
-    }
-
-    /**
-     * Set the docinfo1 field for the DOP record.
-     */
-    @Internal
-    public void setDocinfo1( byte field_6_docinfo1 )
-    {
-        this.field_6_docinfo1 = field_6_docinfo1;
-    }
-
-    /**
-     * Get the docinfo2 field for the DOP record.
-     */
-    @Internal
-    public byte getDocinfo2()
-    {
-        return field_7_docinfo2;
-    }
-
-    /**
-     * Set the docinfo2 field for the DOP record.
-     */
-    @Internal
-    public void setDocinfo2( byte field_7_docinfo2 )
-    {
-        this.field_7_docinfo2 = field_7_docinfo2;
-    }
-
-    /**
-     * Get the docinfo3 field for the DOP record.
-     */
-    @Internal
-    public short getDocinfo3()
-    {
-        return field_8_docinfo3;
-    }
-
-    /**
-     * Set the docinfo3 field for the DOP record.
-     */
-    @Internal
-    public void setDocinfo3( short field_8_docinfo3 )
-    {
-        this.field_8_docinfo3 = field_8_docinfo3;
-    }
-
-    /**
-     * Get the dxaTab field for the DOP record.
-     */
-    @Internal
-    public int getDxaTab()
-    {
-        return field_9_dxaTab;
-    }
-
-    /**
-     * Set the dxaTab field for the DOP record.
-     */
-    @Internal
-    public void setDxaTab( int field_9_dxaTab )
-    {
-        this.field_9_dxaTab = field_9_dxaTab;
-    }
-
-    /**
-     * Get the wSpare field for the DOP record.
-     */
-    @Internal
-    public int getWSpare()
-    {
-        return field_10_wSpare;
-    }
-
-    /**
-     * Set the wSpare field for the DOP record.
-     */
-    @Internal
-    public void setWSpare( int field_10_wSpare )
-    {
-        this.field_10_wSpare = field_10_wSpare;
-    }
-
-    /**
-     * Get the dxaHotz field for the DOP record.
-     */
-    @Internal
-    public int getDxaHotz()
-    {
-        return field_11_dxaHotz;
-    }
-
-    /**
-     * Set the dxaHotz field for the DOP record.
-     */
-    @Internal
-    public void setDxaHotz( int field_11_dxaHotz )
-    {
-        this.field_11_dxaHotz = field_11_dxaHotz;
-    }
-
-    /**
-     * Get the cConsexHypLim field for the DOP record.
-     */
-    @Internal
-    public int getCConsexHypLim()
-    {
-        return field_12_cConsexHypLim;
-    }
-
-    /**
-     * Set the cConsexHypLim field for the DOP record.
-     */
-    @Internal
-    public void setCConsexHypLim( int field_12_cConsexHypLim )
-    {
-        this.field_12_cConsexHypLim = field_12_cConsexHypLim;
-    }
-
-    /**
-     * Get the wSpare2 field for the DOP record.
-     */
-    @Internal
-    public int getWSpare2()
-    {
-        return field_13_wSpare2;
-    }
-
-    /**
-     * Set the wSpare2 field for the DOP record.
-     */
-    @Internal
-    public void setWSpare2( int field_13_wSpare2 )
-    {
-        this.field_13_wSpare2 = field_13_wSpare2;
-    }
-
-    /**
-     * Get the dttmCreated field for the DOP record.
-     */
-    @Internal
-    public int getDttmCreated()
-    {
-        return field_14_dttmCreated;
-    }
-
-    /**
-     * Set the dttmCreated field for the DOP record.
-     */
-    @Internal
-    public void setDttmCreated( int field_14_dttmCreated )
-    {
-        this.field_14_dttmCreated = field_14_dttmCreated;
-    }
-
-    /**
-     * Get the dttmRevised field for the DOP record.
-     */
-    @Internal
-    public int getDttmRevised()
-    {
-        return field_15_dttmRevised;
-    }
-
-    /**
-     * Set the dttmRevised field for the DOP record.
-     */
-    @Internal
-    public void setDttmRevised( int field_15_dttmRevised )
-    {
-        this.field_15_dttmRevised = field_15_dttmRevised;
-    }
-
-    /**
-     * Get the dttmLastPrint field for the DOP record.
-     */
-    @Internal
-    public int getDttmLastPrint()
-    {
-        return field_16_dttmLastPrint;
-    }
-
-    /**
-     * Set the dttmLastPrint field for the DOP record.
-     */
-    @Internal
-    public void setDttmLastPrint( int field_16_dttmLastPrint )
-    {
-        this.field_16_dttmLastPrint = field_16_dttmLastPrint;
-    }
-
-    /**
-     * Get the nRevision field for the DOP record.
-     */
-    @Internal
-    public int getNRevision()
-    {
-        return field_17_nRevision;
-    }
-
-    /**
-     * Set the nRevision field for the DOP record.
-     */
-    @Internal
-    public void setNRevision( int field_17_nRevision )
-    {
-        this.field_17_nRevision = field_17_nRevision;
-    }
-
-    /**
-     * Get the tmEdited field for the DOP record.
-     */
-    @Internal
-    public int getTmEdited()
-    {
-        return field_18_tmEdited;
-    }
-
-    /**
-     * Set the tmEdited field for the DOP record.
-     */
-    @Internal
-    public void setTmEdited( int field_18_tmEdited )
-    {
-        this.field_18_tmEdited = field_18_tmEdited;
-    }
-
-    /**
-     * Get the cWords field for the DOP record.
-     */
-    @Internal
-    public int getCWords()
-    {
-        return field_19_cWords;
-    }
-
-    /**
-     * Set the cWords field for the DOP record.
-     */
-    @Internal
-    public void setCWords( int field_19_cWords )
-    {
-        this.field_19_cWords = field_19_cWords;
-    }
-
-    /**
-     * Get the cCh field for the DOP record.
-     */
-    @Internal
-    public int getCCh()
-    {
-        return field_20_cCh;
-    }
-
-    /**
-     * Set the cCh field for the DOP record.
-     */
-    @Internal
-    public void setCCh( int field_20_cCh )
-    {
-        this.field_20_cCh = field_20_cCh;
-    }
-
-    /**
-     * Get the cPg field for the DOP record.
-     */
-    @Internal
-    public int getCPg()
-    {
-        return field_21_cPg;
-    }
-
-    /**
-     * Set the cPg field for the DOP record.
-     */
-    @Internal
-    public void setCPg( int field_21_cPg )
-    {
-        this.field_21_cPg = field_21_cPg;
-    }
-
-    /**
-     * Get the cParas field for the DOP record.
-     */
-    @Internal
-    public int getCParas()
-    {
-        return field_22_cParas;
-    }
-
-    /**
-     * Set the cParas field for the DOP record.
-     */
-    @Internal
-    public void setCParas( int field_22_cParas )
-    {
-        this.field_22_cParas = field_22_cParas;
-    }
-
-    /**
-     * Get the Edn field for the DOP record.
-     */
-    @Internal
-    public short getEdn()
-    {
-        return field_23_Edn;
-    }
-
-    /**
-     * Set the Edn field for the DOP record.
-     */
-    @Internal
-    public void setEdn( short field_23_Edn )
-    {
-        this.field_23_Edn = field_23_Edn;
-    }
-
-    /**
-     * Get the Edn1 field for the DOP record.
-     */
-    @Internal
-    public short getEdn1()
-    {
-        return field_24_Edn1;
-    }
-
-    /**
-     * Set the Edn1 field for the DOP record.
-     */
-    @Internal
-    public void setEdn1( short field_24_Edn1 )
-    {
-        this.field_24_Edn1 = field_24_Edn1;
-    }
-
-    /**
-     * Get the cLines field for the DOP record.
-     */
-    @Internal
-    public int getCLines()
-    {
-        return field_25_cLines;
-    }
-
-    /**
-     * Set the cLines field for the DOP record.
-     */
-    @Internal
-    public void setCLines( int field_25_cLines )
-    {
-        this.field_25_cLines = field_25_cLines;
-    }
-
-    /**
-     * Get the cWordsFtnEnd field for the DOP record.
-     */
-    @Internal
-    public int getCWordsFtnEnd()
-    {
-        return field_26_cWordsFtnEnd;
-    }
-
-    /**
-     * Set the cWordsFtnEnd field for the DOP record.
-     */
-    @Internal
-    public void setCWordsFtnEnd( int field_26_cWordsFtnEnd )
-    {
-        this.field_26_cWordsFtnEnd = field_26_cWordsFtnEnd;
-    }
-
-    /**
-     * Get the cChFtnEdn field for the DOP record.
-     */
-    @Internal
-    public int getCChFtnEdn()
-    {
-        return field_27_cChFtnEdn;
-    }
-
-    /**
-     * Set the cChFtnEdn field for the DOP record.
-     */
-    @Internal
-    public void setCChFtnEdn( int field_27_cChFtnEdn )
-    {
-        this.field_27_cChFtnEdn = field_27_cChFtnEdn;
-    }
-
-    /**
-     * Get the cPgFtnEdn field for the DOP record.
-     */
-    @Internal
-    public short getCPgFtnEdn()
-    {
-        return field_28_cPgFtnEdn;
-    }
-
-    /**
-     * Set the cPgFtnEdn field for the DOP record.
-     */
-    @Internal
-    public void setCPgFtnEdn( short field_28_cPgFtnEdn )
-    {
-        this.field_28_cPgFtnEdn = field_28_cPgFtnEdn;
-    }
-
-    /**
-     * Get the cParasFtnEdn field for the DOP record.
-     */
-    @Internal
-    public int getCParasFtnEdn()
-    {
-        return field_29_cParasFtnEdn;
-    }
-
-    /**
-     * Set the cParasFtnEdn field for the DOP record.
-     */
-    @Internal
-    public void setCParasFtnEdn( int field_29_cParasFtnEdn )
-    {
-        this.field_29_cParasFtnEdn = field_29_cParasFtnEdn;
-    }
-
-    /**
-     * Get the cLinesFtnEdn field for the DOP record.
-     */
-    @Internal
-    public int getCLinesFtnEdn()
-    {
-        return field_30_cLinesFtnEdn;
-    }
-
-    /**
-     * Set the cLinesFtnEdn field for the DOP record.
-     */
-    @Internal
-    public void setCLinesFtnEdn( int field_30_cLinesFtnEdn )
-    {
-        this.field_30_cLinesFtnEdn = field_30_cLinesFtnEdn;
-    }
-
-    /**
-     * Get the lKeyProtDoc field for the DOP record.
-     */
-    @Internal
-    public int getLKeyProtDoc()
-    {
-        return field_31_lKeyProtDoc;
-    }
-
-    /**
-     * Set the lKeyProtDoc field for the DOP record.
-     */
-    @Internal
-    public void setLKeyProtDoc( int field_31_lKeyProtDoc )
-    {
-        this.field_31_lKeyProtDoc = field_31_lKeyProtDoc;
-    }
-
-    /**
-     * Get the view field for the DOP record.
-     */
-    @Internal
-    public short getView()
-    {
-        return field_32_view;
-    }
-
-    /**
-     * Set the view field for the DOP record.
-     */
-    @Internal
-    public void setView( short field_32_view )
-    {
-        this.field_32_view = field_32_view;
-    }
-
-    /**
-     * Get the docinfo4 field for the DOP record.
-     */
-    @Internal
-    public int getDocinfo4()
-    {
-        return field_33_docinfo4;
-    }
-
-    /**
-     * Set the docinfo4 field for the DOP record.
-     */
-    @Internal
-    public void setDocinfo4( int field_33_docinfo4 )
-    {
-        this.field_33_docinfo4 = field_33_docinfo4;
-    }
-
-    /**
-     * Get the adt field for the DOP record.
-     */
-    @Internal
-    public short getAdt()
-    {
-        return field_34_adt;
-    }
-
-    /**
-     * Set the adt field for the DOP record.
-     */
-    @Internal
-    public void setAdt( short field_34_adt )
-    {
-        this.field_34_adt = field_34_adt;
-    }
-
-    /**
-     * Get the doptypography field for the DOP record.
-     */
-    @Internal
-    public byte[] getDoptypography()
-    {
-        return field_35_doptypography;
-    }
-
-    /**
-     * Set the doptypography field for the DOP record.
-     */
-    @Internal
-    public void setDoptypography( byte[] field_35_doptypography )
-    {
-        this.field_35_doptypography = field_35_doptypography;
-    }
-
-    /**
-     * Get the dogrid field for the DOP record.
-     */
-    @Internal
-    public byte[] getDogrid()
-    {
-        return field_36_dogrid;
-    }
-
-    /**
-     * Set the dogrid field for the DOP record.
-     */
-    @Internal
-    public void setDogrid( byte[] field_36_dogrid )
-    {
-        this.field_36_dogrid = field_36_dogrid;
-    }
-
-    /**
-     * Get the docinfo5 field for the DOP record.
-     */
-    @Internal
-    public short getDocinfo5()
-    {
-        return field_37_docinfo5;
-    }
-
-    /**
-     * Set the docinfo5 field for the DOP record.
-     */
-    @Internal
-    public void setDocinfo5( short field_37_docinfo5 )
-    {
-        this.field_37_docinfo5 = field_37_docinfo5;
-    }
-
-    /**
-     * Get the docinfo6 field for the DOP record.
-     */
-    @Internal
-    public short getDocinfo6()
-    {
-        return field_38_docinfo6;
-    }
-
-    /**
-     * Set the docinfo6 field for the DOP record.
-     */
-    @Internal
-    public void setDocinfo6( short field_38_docinfo6 )
-    {
-        this.field_38_docinfo6 = field_38_docinfo6;
-    }
-
-    /**
-     * Get the asumyi field for the DOP record.
-     */
-    @Internal
-    public byte[] getAsumyi()
-    {
-        return field_39_asumyi;
-    }
-
-    /**
-     * Set the asumyi field for the DOP record.
-     */
-    @Internal
-    public void setAsumyi( byte[] field_39_asumyi )
-    {
-        this.field_39_asumyi = field_39_asumyi;
-    }
-
-    /**
-     * Get the cChWS field for the DOP record.
-     */
-    @Internal
-    public int getCChWS()
-    {
-        return field_40_cChWS;
-    }
-
-    /**
-     * Set the cChWS field for the DOP record.
-     */
-    @Internal
-    public void setCChWS( int field_40_cChWS )
-    {
-        this.field_40_cChWS = field_40_cChWS;
-    }
-
-    /**
-     * Get the cChWSFtnEdn field for the DOP record.
-     */
-    @Internal
-    public int getCChWSFtnEdn()
-    {
-        return field_41_cChWSFtnEdn;
-    }
-
-    /**
-     * Set the cChWSFtnEdn field for the DOP record.
-     */
-    @Internal
-    public void setCChWSFtnEdn( int field_41_cChWSFtnEdn )
-    {
-        this.field_41_cChWSFtnEdn = field_41_cChWSFtnEdn;
-    }
-
-    /**
-     * Get the grfDocEvents field for the DOP record.
-     */
-    @Internal
-    public int getGrfDocEvents()
-    {
-        return field_42_grfDocEvents;
-    }
-
-    /**
-     * Set the grfDocEvents field for the DOP record.
-     */
-    @Internal
-    public void setGrfDocEvents( int field_42_grfDocEvents )
-    {
-        this.field_42_grfDocEvents = field_42_grfDocEvents;
-    }
-
-    /**
-     * Get the virusinfo field for the DOP record.
-     */
-    @Internal
-    public int getVirusinfo()
-    {
-        return field_43_virusinfo;
-    }
-
-    /**
-     * Set the virusinfo field for the DOP record.
-     */
-    @Internal
-    public void setVirusinfo( int field_43_virusinfo )
-    {
-        this.field_43_virusinfo = field_43_virusinfo;
-    }
-
-    /**
-     * Get the Spare field for the DOP record.
-     */
-    @Internal
-    public byte[] getSpare()
-    {
-        return field_44_Spare;
-    }
-
-    /**
-     * Set the Spare field for the DOP record.
-     */
-    @Internal
-    public void setSpare( byte[] field_44_Spare )
-    {
-        this.field_44_Spare = field_44_Spare;
-    }
-
-    /**
-     * Get the reserved1 field for the DOP record.
-     */
-    @Internal
-    public int getReserved1()
-    {
-        return field_45_reserved1;
-    }
-
-    /**
-     * Set the reserved1 field for the DOP record.
-     */
-    @Internal
-    public void setReserved1( int field_45_reserved1 )
-    {
-        this.field_45_reserved1 = field_45_reserved1;
-    }
-
-    /**
-     * Get the reserved2 field for the DOP record.
-     */
-    @Internal
-    public int getReserved2()
-    {
-        return field_46_reserved2;
-    }
-
-    /**
-     * Set the reserved2 field for the DOP record.
-     */
-    @Internal
-    public void setReserved2( int field_46_reserved2 )
-    {
-        this.field_46_reserved2 = field_46_reserved2;
-    }
-
-    /**
-     * Get the cDBC field for the DOP record.
-     */
-    @Internal
-    public int getCDBC()
-    {
-        return field_47_cDBC;
-    }
-
-    /**
-     * Set the cDBC field for the DOP record.
-     */
-    @Internal
-    public void setCDBC( int field_47_cDBC )
-    {
-        this.field_47_cDBC = field_47_cDBC;
-    }
-
-    /**
-     * Get the cDBCFtnEdn field for the DOP record.
-     */
-    @Internal
-    public int getCDBCFtnEdn()
-    {
-        return field_48_cDBCFtnEdn;
-    }
-
-    /**
-     * Set the cDBCFtnEdn field for the DOP record.
-     */
-    @Internal
-    public void setCDBCFtnEdn( int field_48_cDBCFtnEdn )
-    {
-        this.field_48_cDBCFtnEdn = field_48_cDBCFtnEdn;
-    }
-
-    /**
-     * Get the reserved field for the DOP record.
-     */
-    @Internal
-    public int getReserved()
-    {
-        return field_49_reserved;
-    }
-
-    /**
-     * Set the reserved field for the DOP record.
-     */
-    @Internal
-    public void setReserved( int field_49_reserved )
-    {
-        this.field_49_reserved = field_49_reserved;
-    }
-
-    /**
-     * Get the nfcFtnRef field for the DOP record.
-     */
-    @Internal
-    public short getNfcFtnRef()
-    {
-        return field_50_nfcFtnRef;
-    }
-
-    /**
-     * Set the nfcFtnRef field for the DOP record.
-     */
-    @Internal
-    public void setNfcFtnRef( short field_50_nfcFtnRef )
-    {
-        this.field_50_nfcFtnRef = field_50_nfcFtnRef;
-    }
-
-    /**
-     * Get the nfcEdnRef field for the DOP record.
-     */
-    @Internal
-    public short getNfcEdnRef()
-    {
-        return field_51_nfcEdnRef;
-    }
-
-    /**
-     * Set the nfcEdnRef field for the DOP record.
-     */
-    @Internal
-    public void setNfcEdnRef( short field_51_nfcEdnRef )
-    {
-        this.field_51_nfcEdnRef = field_51_nfcEdnRef;
-    }
-
-    /**
-     * Get the hpsZoonFontPag field for the DOP record.
-     */
-    @Internal
-    public short getHpsZoonFontPag()
-    {
-        return field_52_hpsZoonFontPag;
-    }
-
-    /**
-     * Set the hpsZoonFontPag field for the DOP record.
-     */
-    @Internal
-    public void setHpsZoonFontPag( short field_52_hpsZoonFontPag )
-    {
-        this.field_52_hpsZoonFontPag = field_52_hpsZoonFontPag;
-    }
-
-    /**
-     * Get the dywDispPag field for the DOP record.
-     */
-    @Internal
-    public short getDywDispPag()
-    {
-        return field_53_dywDispPag;
-    }
-
-    /**
-     * Set the dywDispPag field for the DOP record.
-     */
-    @Internal
-    public void setDywDispPag( short field_53_dywDispPag )
-    {
-        this.field_53_dywDispPag = field_53_dywDispPag;
-    }
-
-    /**
-     * Sets the fFacingPages field value.
-     * 
-     */
-    @Internal
-    public void setFFacingPages( boolean value )
-    {
-        field_1_formatFlags = (byte)fFacingPages.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * 
-     * @return  the fFacingPages field value.
-     */
-    @Internal
-    public boolean isFFacingPages()
-    {
-        return fFacingPages.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the fWidowControl field value.
-     * 
-     */
-    @Internal
-    public void setFWidowControl( boolean value )
-    {
-        field_1_formatFlags = (byte)fWidowControl.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * 
-     * @return  the fWidowControl field value.
-     */
-    @Internal
-    public boolean isFWidowControl()
-    {
-        return fWidowControl.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the fPMHMainDoc field value.
-     * 
-     */
-    @Internal
-    public void setFPMHMainDoc( boolean value )
-    {
-        field_1_formatFlags = (byte)fPMHMainDoc.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * 
-     * @return  the fPMHMainDoc field value.
-     */
-    @Internal
-    public boolean isFPMHMainDoc()
-    {
-        return fPMHMainDoc.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the grfSupression field value.
-     * 
-     */
-    @Internal
-    public void setGrfSupression( byte value )
-    {
-        field_1_formatFlags = (byte)grfSupression.setValue(field_1_formatFlags, value);
-    }
-
-    /**
-     * 
-     * @return  the grfSupression field value.
-     */
-    @Internal
-    public byte getGrfSupression()
-    {
-        return ( byte )grfSupression.getValue(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the fpc field value.
-     * 
-     */
-    @Internal
-    public void setFpc( byte value )
-    {
-        field_1_formatFlags = (byte)fpc.setValue(field_1_formatFlags, value);
-    }
-
-    /**
-     * 
-     * @return  the fpc field value.
-     */
-    @Internal
-    public byte getFpc()
-    {
-        return ( byte )fpc.getValue(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the unused1 field value.
-     * 
-     */
-    @Internal
-    public void setUnused1( boolean value )
-    {
-        field_1_formatFlags = (byte)unused1.setBoolean(field_1_formatFlags, value);
-    }
-
-    /**
-     * 
-     * @return  the unused1 field value.
-     */
-    @Internal
-    public boolean isUnused1()
-    {
-        return unused1.isSet(field_1_formatFlags);
-    }
-
-    /**
-     * Sets the rncFtn field value.
-     * 
-     */
-    @Internal
-    public void setRncFtn( byte value )
-    {
-        field_3_footnoteInfo = (short)rncFtn.setValue(field_3_footnoteInfo, value);
-    }
-
-    /**
-     * 
-     * @return  the rncFtn field value.
-     */
-    @Internal
-    public byte getRncFtn()
-    {
-        return ( byte )rncFtn.getValue(field_3_footnoteInfo);
-    }
-
-    /**
-     * Sets the nFtn field value.
-     * 
-     */
-    @Internal
-    public void setNFtn( short value )
-    {
-        field_3_footnoteInfo = (short)nFtn.setValue(field_3_footnoteInfo, value);
-    }
-
-    /**
-     * 
-     * @return  the nFtn field value.
-     */
-    @Internal
-    public short getNFtn()
-    {
-        return ( short )nFtn.getValue(field_3_footnoteInfo);
-    }
-
-    /**
-     * Sets the fOnlyMacPics field value.
-     * 
-     */
-    @Internal
-    public void setFOnlyMacPics( boolean value )
-    {
-        field_5_docinfo = (byte)fOnlyMacPics.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fOnlyMacPics field value.
-     */
-    @Internal
-    public boolean isFOnlyMacPics()
-    {
-        return fOnlyMacPics.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fOnlyWinPics field value.
-     * 
-     */
-    @Internal
-    public void setFOnlyWinPics( boolean value )
-    {
-        field_5_docinfo = (byte)fOnlyWinPics.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fOnlyWinPics field value.
-     */
-    @Internal
-    public boolean isFOnlyWinPics()
-    {
-        return fOnlyWinPics.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fLabelDoc field value.
-     * 
-     */
-    @Internal
-    public void setFLabelDoc( boolean value )
-    {
-        field_5_docinfo = (byte)fLabelDoc.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fLabelDoc field value.
-     */
-    @Internal
-    public boolean isFLabelDoc()
-    {
-        return fLabelDoc.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fHyphCapitals field value.
-     * 
-     */
-    @Internal
-    public void setFHyphCapitals( boolean value )
-    {
-        field_5_docinfo = (byte)fHyphCapitals.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fHyphCapitals field value.
-     */
-    @Internal
-    public boolean isFHyphCapitals()
-    {
-        return fHyphCapitals.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fAutoHyphen field value.
-     * 
-     */
-    @Internal
-    public void setFAutoHyphen( boolean value )
-    {
-        field_5_docinfo = (byte)fAutoHyphen.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fAutoHyphen field value.
-     */
-    @Internal
-    public boolean isFAutoHyphen()
-    {
-        return fAutoHyphen.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fFormNoFields field value.
-     * 
-     */
-    @Internal
-    public void setFFormNoFields( boolean value )
-    {
-        field_5_docinfo = (byte)fFormNoFields.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fFormNoFields field value.
-     */
-    @Internal
-    public boolean isFFormNoFields()
-    {
-        return fFormNoFields.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fLinkStyles field value.
-     * 
-     */
-    @Internal
-    public void setFLinkStyles( boolean value )
-    {
-        field_5_docinfo = (byte)fLinkStyles.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fLinkStyles field value.
-     */
-    @Internal
-    public boolean isFLinkStyles()
-    {
-        return fLinkStyles.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fRevMarking field value.
-     * 
-     */
-    @Internal
-    public void setFRevMarking( boolean value )
-    {
-        field_5_docinfo = (byte)fRevMarking.setBoolean(field_5_docinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fRevMarking field value.
-     */
-    @Internal
-    public boolean isFRevMarking()
-    {
-        return fRevMarking.isSet(field_5_docinfo);
-    }
-
-    /**
-     * Sets the fBackup field value.
-     * 
-     */
-    @Internal
-    public void setFBackup( boolean value )
-    {
-        field_6_docinfo1 = (byte)fBackup.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the fBackup field value.
-     */
-    @Internal
-    public boolean isFBackup()
-    {
-        return fBackup.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fExactCWords field value.
-     * 
-     */
-    @Internal
-    public void setFExactCWords( boolean value )
-    {
-        field_6_docinfo1 = (byte)fExactCWords.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the fExactCWords field value.
-     */
-    @Internal
-    public boolean isFExactCWords()
-    {
-        return fExactCWords.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fPagHidden field value.
-     * 
-     */
-    @Internal
-    public void setFPagHidden( boolean value )
-    {
-        field_6_docinfo1 = (byte)fPagHidden.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the fPagHidden field value.
-     */
-    @Internal
-    public boolean isFPagHidden()
-    {
-        return fPagHidden.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fPagResults field value.
-     * 
-     */
-    @Internal
-    public void setFPagResults( boolean value )
-    {
-        field_6_docinfo1 = (byte)fPagResults.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the fPagResults field value.
-     */
-    @Internal
-    public boolean isFPagResults()
-    {
-        return fPagResults.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fLockAtn field value.
-     * 
-     */
-    @Internal
-    public void setFLockAtn( boolean value )
-    {
-        field_6_docinfo1 = (byte)fLockAtn.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the fLockAtn field value.
-     */
-    @Internal
-    public boolean isFLockAtn()
-    {
-        return fLockAtn.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fMirrorMargins field value.
-     * 
-     */
-    @Internal
-    public void setFMirrorMargins( boolean value )
-    {
-        field_6_docinfo1 = (byte)fMirrorMargins.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the fMirrorMargins field value.
-     */
-    @Internal
-    public boolean isFMirrorMargins()
-    {
-        return fMirrorMargins.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the unused3 field value.
-     * 
-     */
-    @Internal
-    public void setUnused3( boolean value )
-    {
-        field_6_docinfo1 = (byte)unused3.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the unused3 field value.
-     */
-    @Internal
-    public boolean isUnused3()
-    {
-        return unused3.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fDfltTrueType field value.
-     * 
-     */
-    @Internal
-    public void setFDfltTrueType( boolean value )
-    {
-        field_6_docinfo1 = (byte)fDfltTrueType.setBoolean(field_6_docinfo1, value);
-    }
-
-    /**
-     * 
-     * @return  the fDfltTrueType field value.
-     */
-    @Internal
-    public boolean isFDfltTrueType()
-    {
-        return fDfltTrueType.isSet(field_6_docinfo1);
-    }
-
-    /**
-     * Sets the fPagSupressTopSpacing field value.
-     * 
-     */
-    @Internal
-    public void setFPagSupressTopSpacing( boolean value )
-    {
-        field_7_docinfo2 = (byte)fPagSupressTopSpacing.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the fPagSupressTopSpacing field value.
-     */
-    @Internal
-    public boolean isFPagSupressTopSpacing()
-    {
-        return fPagSupressTopSpacing.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fProtEnabled field value.
-     * 
-     */
-    @Internal
-    public void setFProtEnabled( boolean value )
-    {
-        field_7_docinfo2 = (byte)fProtEnabled.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the fProtEnabled field value.
-     */
-    @Internal
-    public boolean isFProtEnabled()
-    {
-        return fProtEnabled.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fDispFormFldSel field value.
-     * 
-     */
-    @Internal
-    public void setFDispFormFldSel( boolean value )
-    {
-        field_7_docinfo2 = (byte)fDispFormFldSel.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the fDispFormFldSel field value.
-     */
-    @Internal
-    public boolean isFDispFormFldSel()
-    {
-        return fDispFormFldSel.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fRMView field value.
-     * 
-     */
-    @Internal
-    public void setFRMView( boolean value )
-    {
-        field_7_docinfo2 = (byte)fRMView.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the fRMView field value.
-     */
-    @Internal
-    public boolean isFRMView()
-    {
-        return fRMView.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fRMPrint field value.
-     * 
-     */
-    @Internal
-    public void setFRMPrint( boolean value )
-    {
-        field_7_docinfo2 = (byte)fRMPrint.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the fRMPrint field value.
-     */
-    @Internal
-    public boolean isFRMPrint()
-    {
-        return fRMPrint.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the unused4 field value.
-     * 
-     */
-    @Internal
-    public void setUnused4( boolean value )
-    {
-        field_7_docinfo2 = (byte)unused4.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the unused4 field value.
-     */
-    @Internal
-    public boolean isUnused4()
-    {
-        return unused4.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fLockRev field value.
-     * 
-     */
-    @Internal
-    public void setFLockRev( boolean value )
-    {
-        field_7_docinfo2 = (byte)fLockRev.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the fLockRev field value.
-     */
-    @Internal
-    public boolean isFLockRev()
-    {
-        return fLockRev.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the fEmbedFonts field value.
-     * 
-     */
-    @Internal
-    public void setFEmbedFonts( boolean value )
-    {
-        field_7_docinfo2 = (byte)fEmbedFonts.setBoolean(field_7_docinfo2, value);
-    }
-
-    /**
-     * 
-     * @return  the fEmbedFonts field value.
-     */
-    @Internal
-    public boolean isFEmbedFonts()
-    {
-        return fEmbedFonts.isSet(field_7_docinfo2);
-    }
-
-    /**
-     * Sets the oldfNoTabForInd field value.
-     * 
-     */
-    @Internal
-    public void setOldfNoTabForInd( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfNoTabForInd.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfNoTabForInd field value.
-     */
-    @Internal
-    public boolean isOldfNoTabForInd()
-    {
-        return oldfNoTabForInd.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfNoSpaceRaiseLower field value.
-     * 
-     */
-    @Internal
-    public void setOldfNoSpaceRaiseLower( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfNoSpaceRaiseLower.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfNoSpaceRaiseLower field value.
-     */
-    @Internal
-    public boolean isOldfNoSpaceRaiseLower()
-    {
-        return oldfNoSpaceRaiseLower.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfSuppressSpbfAfterPageBreak field value.
-     * 
-     */
-    @Internal
-    public void setOldfSuppressSpbfAfterPageBreak( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfSuppressSpbfAfterPageBreak.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfSuppressSpbfAfterPageBreak field value.
-     */
-    @Internal
-    public boolean isOldfSuppressSpbfAfterPageBreak()
-    {
-        return oldfSuppressSpbfAfterPageBreak.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfWrapTrailSpaces field value.
-     * 
-     */
-    @Internal
-    public void setOldfWrapTrailSpaces( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfWrapTrailSpaces.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfWrapTrailSpaces field value.
-     */
-    @Internal
-    public boolean isOldfWrapTrailSpaces()
-    {
-        return oldfWrapTrailSpaces.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfMapPrintTextColor field value.
-     * 
-     */
-    @Internal
-    public void setOldfMapPrintTextColor( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfMapPrintTextColor.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfMapPrintTextColor field value.
-     */
-    @Internal
-    public boolean isOldfMapPrintTextColor()
-    {
-        return oldfMapPrintTextColor.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfNoColumnBalance field value.
-     * 
-     */
-    @Internal
-    public void setOldfNoColumnBalance( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfNoColumnBalance.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfNoColumnBalance field value.
-     */
-    @Internal
-    public boolean isOldfNoColumnBalance()
-    {
-        return oldfNoColumnBalance.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfConvMailMergeEsc field value.
-     * 
-     */
-    @Internal
-    public void setOldfConvMailMergeEsc( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfConvMailMergeEsc.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfConvMailMergeEsc field value.
-     */
-    @Internal
-    public boolean isOldfConvMailMergeEsc()
-    {
-        return oldfConvMailMergeEsc.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfSupressTopSpacing field value.
-     * 
-     */
-    @Internal
-    public void setOldfSupressTopSpacing( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfSupressTopSpacing.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfSupressTopSpacing field value.
-     */
-    @Internal
-    public boolean isOldfSupressTopSpacing()
-    {
-        return oldfSupressTopSpacing.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfOrigWordTableRules field value.
-     * 
-     */
-    @Internal
-    public void setOldfOrigWordTableRules( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfOrigWordTableRules.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfOrigWordTableRules field value.
-     */
-    @Internal
-    public boolean isOldfOrigWordTableRules()
-    {
-        return oldfOrigWordTableRules.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfTransparentMetafiles field value.
-     * 
-     */
-    @Internal
-    public void setOldfTransparentMetafiles( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfTransparentMetafiles.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfTransparentMetafiles field value.
-     */
-    @Internal
-    public boolean isOldfTransparentMetafiles()
-    {
-        return oldfTransparentMetafiles.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfShowBreaksInFrames field value.
-     * 
-     */
-    @Internal
-    public void setOldfShowBreaksInFrames( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfShowBreaksInFrames.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfShowBreaksInFrames field value.
-     */
-    @Internal
-    public boolean isOldfShowBreaksInFrames()
-    {
-        return oldfShowBreaksInFrames.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the oldfSwapBordersFacingPgs field value.
-     * 
-     */
-    @Internal
-    public void setOldfSwapBordersFacingPgs( boolean value )
-    {
-        field_8_docinfo3 = (short)oldfSwapBordersFacingPgs.setBoolean(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the oldfSwapBordersFacingPgs field value.
-     */
-    @Internal
-    public boolean isOldfSwapBordersFacingPgs()
-    {
-        return oldfSwapBordersFacingPgs.isSet(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the unused5 field value.
-     * 
-     */
-    @Internal
-    public void setUnused5( byte value )
-    {
-        field_8_docinfo3 = (short)unused5.setValue(field_8_docinfo3, value);
-    }
-
-    /**
-     * 
-     * @return  the unused5 field value.
-     */
-    @Internal
-    public byte getUnused5()
-    {
-        return ( byte )unused5.getValue(field_8_docinfo3);
-    }
-
-    /**
-     * Sets the rncEdn field value.
-     * 
-     */
-    @Internal
-    public void setRncEdn( byte value )
-    {
-        field_23_Edn = (short)rncEdn.setValue(field_23_Edn, value);
-    }
-
-    /**
-     * 
-     * @return  the rncEdn field value.
-     */
-    @Internal
-    public byte getRncEdn()
-    {
-        return ( byte )rncEdn.getValue(field_23_Edn);
-    }
-
-    /**
-     * Sets the nEdn field value.
-     * 
-     */
-    @Internal
-    public void setNEdn( short value )
-    {
-        field_23_Edn = (short)nEdn.setValue(field_23_Edn, value);
-    }
-
-    /**
-     * 
-     * @return  the nEdn field value.
-     */
-    @Internal
-    public short getNEdn()
-    {
-        return ( short )nEdn.getValue(field_23_Edn);
-    }
-
-    /**
-     * Sets the epc field value.
-     * 
-     */
-    @Internal
-    public void setEpc( byte value )
-    {
-        field_24_Edn1 = (short)epc.setValue(field_24_Edn1, value);
-    }
-
-    /**
-     * 
-     * @return  the epc field value.
-     */
-    @Internal
-    public byte getEpc()
-    {
-        return ( byte )epc.getValue(field_24_Edn1);
-    }
-
-    /**
-     * Sets the nfcFtnRef1 field value.
-     * 
-     */
-    @Internal
-    public void setNfcFtnRef1( byte value )
-    {
-        field_24_Edn1 = (short)nfcFtnRef1.setValue(field_24_Edn1, value);
-    }
-
-    /**
-     * 
-     * @return  the nfcFtnRef1 field value.
-     */
-    @Internal
-    public byte getNfcFtnRef1()
-    {
-        return ( byte )nfcFtnRef1.getValue(field_24_Edn1);
-    }
-
-    /**
-     * Sets the nfcEdnRef1 field value.
-     * 
-     */
-    @Internal
-    public void setNfcEdnRef1( byte value )
-    {
-        field_24_Edn1 = (short)nfcEdnRef1.setValue(field_24_Edn1, value);
-    }
-
-    /**
-     * 
-     * @return  the nfcEdnRef1 field value.
-     */
-    @Internal
-    public byte getNfcEdnRef1()
-    {
-        return ( byte )nfcEdnRef1.getValue(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fPrintFormData field value.
-     * 
-     */
-    @Internal
-    public void setFPrintFormData( boolean value )
-    {
-        field_24_Edn1 = (short)fPrintFormData.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     * 
-     * @return  the fPrintFormData field value.
-     */
-    @Internal
-    public boolean isFPrintFormData()
-    {
-        return fPrintFormData.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fSaveFormData field value.
-     * 
-     */
-    @Internal
-    public void setFSaveFormData( boolean value )
-    {
-        field_24_Edn1 = (short)fSaveFormData.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     * 
-     * @return  the fSaveFormData field value.
-     */
-    @Internal
-    public boolean isFSaveFormData()
-    {
-        return fSaveFormData.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fShadeFormData field value.
-     * 
-     */
-    @Internal
-    public void setFShadeFormData( boolean value )
-    {
-        field_24_Edn1 = (short)fShadeFormData.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     * 
-     * @return  the fShadeFormData field value.
-     */
-    @Internal
-    public boolean isFShadeFormData()
-    {
-        return fShadeFormData.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the fWCFtnEdn field value.
-     * 
-     */
-    @Internal
-    public void setFWCFtnEdn( boolean value )
-    {
-        field_24_Edn1 = (short)fWCFtnEdn.setBoolean(field_24_Edn1, value);
-    }
-
-    /**
-     * 
-     * @return  the fWCFtnEdn field value.
-     */
-    @Internal
-    public boolean isFWCFtnEdn()
-    {
-        return fWCFtnEdn.isSet(field_24_Edn1);
-    }
-
-    /**
-     * Sets the wvkSaved field value.
-     * 
-     */
-    @Internal
-    public void setWvkSaved( byte value )
-    {
-        field_32_view = (short)wvkSaved.setValue(field_32_view, value);
-    }
-
-    /**
-     * 
-     * @return  the wvkSaved field value.
-     */
-    @Internal
-    public byte getWvkSaved()
-    {
-        return ( byte )wvkSaved.getValue(field_32_view);
-    }
-
-    /**
-     * Sets the wScaleSaved field value.
-     * 
-     */
-    @Internal
-    public void setWScaleSaved( short value )
-    {
-        field_32_view = (short)wScaleSaved.setValue(field_32_view, value);
-    }
-
-    /**
-     * 
-     * @return  the wScaleSaved field value.
-     */
-    @Internal
-    public short getWScaleSaved()
-    {
-        return ( short )wScaleSaved.getValue(field_32_view);
-    }
-
-    /**
-     * Sets the zkSaved field value.
-     * 
-     */
-    @Internal
-    public void setZkSaved( byte value )
-    {
-        field_32_view = (short)zkSaved.setValue(field_32_view, value);
-    }
-
-    /**
-     * 
-     * @return  the zkSaved field value.
-     */
-    @Internal
-    public byte getZkSaved()
-    {
-        return ( byte )zkSaved.getValue(field_32_view);
-    }
-
-    /**
-     * Sets the fRotateFontW6 field value.
-     * 
-     */
-    @Internal
-    public void setFRotateFontW6( boolean value )
-    {
-        field_32_view = (short)fRotateFontW6.setBoolean(field_32_view, value);
-    }
-
-    /**
-     * 
-     * @return  the fRotateFontW6 field value.
-     */
-    @Internal
-    public boolean isFRotateFontW6()
-    {
-        return fRotateFontW6.isSet(field_32_view);
-    }
-
-    /**
-     * Sets the iGutterPos field value.
-     * 
-     */
-    @Internal
-    public void setIGutterPos( boolean value )
-    {
-        field_32_view = (short)iGutterPos.setBoolean(field_32_view, value);
-    }
-
-    /**
-     * 
-     * @return  the iGutterPos field value.
-     */
-    @Internal
-    public boolean isIGutterPos()
-    {
-        return iGutterPos.isSet(field_32_view);
-    }
-
-    /**
-     * Sets the fNoTabForInd field value.
-     * 
-     */
-    @Internal
-    public void setFNoTabForInd( boolean value )
-    {
-        field_33_docinfo4 = fNoTabForInd.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fNoTabForInd field value.
-     */
-    @Internal
-    public boolean isFNoTabForInd()
-    {
-        return fNoTabForInd.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fNoSpaceRaiseLower field value.
-     * 
-     */
-    @Internal
-    public void setFNoSpaceRaiseLower( boolean value )
-    {
-        field_33_docinfo4 = fNoSpaceRaiseLower.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fNoSpaceRaiseLower field value.
-     */
-    @Internal
-    public boolean isFNoSpaceRaiseLower()
-    {
-        return fNoSpaceRaiseLower.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSupressSpdfAfterPageBreak field value.
-     * 
-     */
-    @Internal
-    public void setFSupressSpdfAfterPageBreak( boolean value )
-    {
-        field_33_docinfo4 = fSupressSpdfAfterPageBreak.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fSupressSpdfAfterPageBreak field value.
-     */
-    @Internal
-    public boolean isFSupressSpdfAfterPageBreak()
-    {
-        return fSupressSpdfAfterPageBreak.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fWrapTrailSpaces field value.
-     * 
-     */
-    @Internal
-    public void setFWrapTrailSpaces( boolean value )
-    {
-        field_33_docinfo4 = fWrapTrailSpaces.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fWrapTrailSpaces field value.
-     */
-    @Internal
-    public boolean isFWrapTrailSpaces()
-    {
-        return fWrapTrailSpaces.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fMapPrintTextColor field value.
-     * 
-     */
-    @Internal
-    public void setFMapPrintTextColor( boolean value )
-    {
-        field_33_docinfo4 = fMapPrintTextColor.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fMapPrintTextColor field value.
-     */
-    @Internal
-    public boolean isFMapPrintTextColor()
-    {
-        return fMapPrintTextColor.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fNoColumnBalance field value.
-     * 
-     */
-    @Internal
-    public void setFNoColumnBalance( boolean value )
-    {
-        field_33_docinfo4 = fNoColumnBalance.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fNoColumnBalance field value.
-     */
-    @Internal
-    public boolean isFNoColumnBalance()
-    {
-        return fNoColumnBalance.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fConvMailMergeEsc field value.
-     * 
-     */
-    @Internal
-    public void setFConvMailMergeEsc( boolean value )
-    {
-        field_33_docinfo4 = fConvMailMergeEsc.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fConvMailMergeEsc field value.
-     */
-    @Internal
-    public boolean isFConvMailMergeEsc()
-    {
-        return fConvMailMergeEsc.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSupressTopSpacing field value.
-     * 
-     */
-    @Internal
-    public void setFSupressTopSpacing( boolean value )
-    {
-        field_33_docinfo4 = fSupressTopSpacing.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fSupressTopSpacing field value.
-     */
-    @Internal
-    public boolean isFSupressTopSpacing()
-    {
-        return fSupressTopSpacing.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fOrigWordTableRules field value.
-     * 
-     */
-    @Internal
-    public void setFOrigWordTableRules( boolean value )
-    {
-        field_33_docinfo4 = fOrigWordTableRules.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fOrigWordTableRules field value.
-     */
-    @Internal
-    public boolean isFOrigWordTableRules()
-    {
-        return fOrigWordTableRules.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fTransparentMetafiles field value.
-     * 
-     */
-    @Internal
-    public void setFTransparentMetafiles( boolean value )
-    {
-        field_33_docinfo4 = fTransparentMetafiles.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fTransparentMetafiles field value.
-     */
-    @Internal
-    public boolean isFTransparentMetafiles()
-    {
-        return fTransparentMetafiles.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fShowBreaksInFrames field value.
-     * 
-     */
-    @Internal
-    public void setFShowBreaksInFrames( boolean value )
-    {
-        field_33_docinfo4 = fShowBreaksInFrames.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fShowBreaksInFrames field value.
-     */
-    @Internal
-    public boolean isFShowBreaksInFrames()
-    {
-        return fShowBreaksInFrames.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSwapBordersFacingPgs field value.
-     * 
-     */
-    @Internal
-    public void setFSwapBordersFacingPgs( boolean value )
-    {
-        field_33_docinfo4 = fSwapBordersFacingPgs.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fSwapBordersFacingPgs field value.
-     */
-    @Internal
-    public boolean isFSwapBordersFacingPgs()
-    {
-        return fSwapBordersFacingPgs.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fSuppressTopSPacingMac5 field value.
-     * 
-     */
-    @Internal
-    public void setFSuppressTopSPacingMac5( boolean value )
-    {
-        field_33_docinfo4 = fSuppressTopSPacingMac5.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fSuppressTopSPacingMac5 field value.
-     */
-    @Internal
-    public boolean isFSuppressTopSPacingMac5()
-    {
-        return fSuppressTopSPacingMac5.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fTruncDxaExpand field value.
-     * 
-     */
-    @Internal
-    public void setFTruncDxaExpand( boolean value )
-    {
-        field_33_docinfo4 = fTruncDxaExpand.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fTruncDxaExpand field value.
-     */
-    @Internal
-    public boolean isFTruncDxaExpand()
-    {
-        return fTruncDxaExpand.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fPrintBodyBeforeHdr field value.
-     * 
-     */
-    @Internal
-    public void setFPrintBodyBeforeHdr( boolean value )
-    {
-        field_33_docinfo4 = fPrintBodyBeforeHdr.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fPrintBodyBeforeHdr field value.
-     */
-    @Internal
-    public boolean isFPrintBodyBeforeHdr()
-    {
-        return fPrintBodyBeforeHdr.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fNoLeading field value.
-     * 
-     */
-    @Internal
-    public void setFNoLeading( boolean value )
-    {
-        field_33_docinfo4 = fNoLeading.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fNoLeading field value.
-     */
-    @Internal
-    public boolean isFNoLeading()
-    {
-        return fNoLeading.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the fMWSmallCaps field value.
-     * 
-     */
-    @Internal
-    public void setFMWSmallCaps( boolean value )
-    {
-        field_33_docinfo4 = fMWSmallCaps.setBoolean(field_33_docinfo4, value);
-    }
-
-    /**
-     * 
-     * @return  the fMWSmallCaps field value.
-     */
-    @Internal
-    public boolean isFMWSmallCaps()
-    {
-        return fMWSmallCaps.isSet(field_33_docinfo4);
-    }
-
-    /**
-     * Sets the lvl field value.
-     * 
-     */
-    @Internal
-    public void setLvl( byte value )
-    {
-        field_37_docinfo5 = (short)lvl.setValue(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the lvl field value.
-     */
-    @Internal
-    public byte getLvl()
-    {
-        return ( byte )lvl.getValue(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fGramAllDone field value.
-     * 
-     */
-    @Internal
-    public void setFGramAllDone( boolean value )
-    {
-        field_37_docinfo5 = (short)fGramAllDone.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fGramAllDone field value.
-     */
-    @Internal
-    public boolean isFGramAllDone()
-    {
-        return fGramAllDone.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fGramAllClean field value.
-     * 
-     */
-    @Internal
-    public void setFGramAllClean( boolean value )
-    {
-        field_37_docinfo5 = (short)fGramAllClean.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fGramAllClean field value.
-     */
-    @Internal
-    public boolean isFGramAllClean()
-    {
-        return fGramAllClean.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fSubsetFonts field value.
-     * 
-     */
-    @Internal
-    public void setFSubsetFonts( boolean value )
-    {
-        field_37_docinfo5 = (short)fSubsetFonts.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fSubsetFonts field value.
-     */
-    @Internal
-    public boolean isFSubsetFonts()
-    {
-        return fSubsetFonts.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fHideLastVersion field value.
-     * 
-     */
-    @Internal
-    public void setFHideLastVersion( boolean value )
-    {
-        field_37_docinfo5 = (short)fHideLastVersion.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fHideLastVersion field value.
-     */
-    @Internal
-    public boolean isFHideLastVersion()
-    {
-        return fHideLastVersion.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fHtmlDoc field value.
-     * 
-     */
-    @Internal
-    public void setFHtmlDoc( boolean value )
-    {
-        field_37_docinfo5 = (short)fHtmlDoc.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fHtmlDoc field value.
-     */
-    @Internal
-    public boolean isFHtmlDoc()
-    {
-        return fHtmlDoc.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fSnapBorder field value.
-     * 
-     */
-    @Internal
-    public void setFSnapBorder( boolean value )
-    {
-        field_37_docinfo5 = (short)fSnapBorder.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fSnapBorder field value.
-     */
-    @Internal
-    public boolean isFSnapBorder()
-    {
-        return fSnapBorder.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fIncludeHeader field value.
-     * 
-     */
-    @Internal
-    public void setFIncludeHeader( boolean value )
-    {
-        field_37_docinfo5 = (short)fIncludeHeader.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fIncludeHeader field value.
-     */
-    @Internal
-    public boolean isFIncludeHeader()
-    {
-        return fIncludeHeader.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fIncludeFooter field value.
-     * 
-     */
-    @Internal
-    public void setFIncludeFooter( boolean value )
-    {
-        field_37_docinfo5 = (short)fIncludeFooter.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fIncludeFooter field value.
-     */
-    @Internal
-    public boolean isFIncludeFooter()
-    {
-        return fIncludeFooter.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fForcePageSizePag field value.
-     * 
-     */
-    @Internal
-    public void setFForcePageSizePag( boolean value )
-    {
-        field_37_docinfo5 = (short)fForcePageSizePag.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fForcePageSizePag field value.
-     */
-    @Internal
-    public boolean isFForcePageSizePag()
-    {
-        return fForcePageSizePag.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fMinFontSizePag field value.
-     * 
-     */
-    @Internal
-    public void setFMinFontSizePag( boolean value )
-    {
-        field_37_docinfo5 = (short)fMinFontSizePag.setBoolean(field_37_docinfo5, value);
-    }
-
-    /**
-     * 
-     * @return  the fMinFontSizePag field value.
-     */
-    @Internal
-    public boolean isFMinFontSizePag()
-    {
-        return fMinFontSizePag.isSet(field_37_docinfo5);
-    }
-
-    /**
-     * Sets the fHaveVersions field value.
-     * 
-     */
-    @Internal
-    public void setFHaveVersions( boolean value )
-    {
-        field_38_docinfo6 = (short)fHaveVersions.setBoolean(field_38_docinfo6, value);
-    }
-
-    /**
-     * 
-     * @return  the fHaveVersions field value.
-     */
-    @Internal
-    public boolean isFHaveVersions()
-    {
-        return fHaveVersions.isSet(field_38_docinfo6);
-    }
-
-    /**
-     * Sets the fAutoVersions field value.
-     * 
-     */
-    @Internal
-    public void setFAutoVersions( boolean value )
-    {
-        field_38_docinfo6 = (short)fAutoVersions.setBoolean(field_38_docinfo6, value);
-    }
-
-    /**
-     * 
-     * @return  the fAutoVersions field value.
-     */
-    @Internal
-    public boolean isFAutoVersions()
-    {
-        return fAutoVersions.isSet(field_38_docinfo6);
-    }
-
-    /**
-     * Sets the fVirusPrompted field value.
-     * 
-     */
-    @Internal
-    public void setFVirusPrompted( boolean value )
-    {
-        field_43_virusinfo = fVirusPrompted.setBoolean(field_43_virusinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fVirusPrompted field value.
-     */
-    @Internal
-    public boolean isFVirusPrompted()
-    {
-        return fVirusPrompted.isSet(field_43_virusinfo);
-    }
-
-    /**
-     * Sets the fVirusLoadSafe field value.
-     * 
-     */
-    @Internal
-    public void setFVirusLoadSafe( boolean value )
-    {
-        field_43_virusinfo = fVirusLoadSafe.setBoolean(field_43_virusinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the fVirusLoadSafe field value.
-     */
-    @Internal
-    public boolean isFVirusLoadSafe()
-    {
-        return fVirusLoadSafe.isSet(field_43_virusinfo);
-    }
-
-    /**
-     * Sets the KeyVirusSession30 field value.
-     * 
-     */
-    @Internal
-    public void setKeyVirusSession30( int value )
-    {
-        field_43_virusinfo = KeyVirusSession30.setValue(field_43_virusinfo, value);
-    }
-
-    /**
-     * 
-     * @return  the KeyVirusSession30 field value.
-     */
-    @Internal
-    public int getKeyVirusSession30()
-    {
-        return KeyVirusSession30.getValue(field_43_virusinfo);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
deleted file mode 100644
index f582018..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The FFData structure specifies form field data for a text
-        box, check box, or drop-down list box. <p>Class and fields
-        descriptions are quoted from [MS-DOC] -- v20121003 Word (.doc) Binary
-        File Format; Copyright (c) 2012 Microsoft Corporation; Release:
-        October 8, 2012
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word
-        (.doc) Binary File Format; Copyright (c) 2012 Microsoft Corporation;
-        Release: October 8, 2012
-    
- */
-@Internal
-public abstract class FFDataBaseAbstractType
-{
-
-    protected long field_1_version;
-    protected short field_2_bits;
-    /**/private static final BitField iType = new BitField(0x0003);
-    /**   Specifies that the form field is a textbox. */
-    /*  */public final static byte ITYPE_TEXT = 0;
-    /**   Specifies that the form field is a checkbox. */
-    /*  */public final static byte ITYPE_CHCK = 1;
-    /**   Specifies that the form field is a dropdown list box. */
-    /*  */public final static byte ITYPE_DROP = 2;
-    /**/private static final BitField iRes = new BitField(0x007C);
-    /**/private static final BitField fOwnHelp = new BitField(0x0080);
-    /**/private static final BitField fOwnStat = new BitField(0x0100);
-    /**/private static final BitField fProt = new BitField(0x0200);
-    /**/private static final BitField iSize = new BitField(0x0400);
-    /**/private static final BitField iTypeTxt = new BitField(0x3800);
-    /**   Specifies that the textbox value is regular text. */
-    /*  */public final static byte ITYPETXT_REG = 0;
-    /**   Specifies that the textbox value is a number. */
-    /*  */public final static byte ITYPETXT_NUM = 0;
-    /**   Specifies that the textbox value is a date or time. */
-    /*  */public final static byte ITYPETXT_DATE = 0;
-    /**   Specifies that the textbox value is the current date. */
-    /*  */public final static byte ITYPETXT_CURDATE = 0;
-    /**   Specifies that the textbox value is the current time. */
-    /*  */public final static byte ITYPETXT_CURTIME = 0;
-    /**   Specifies that the textbox value is calculated from an expression. The expression is given by FFData.xstzTextDef. */
-    /*  */protected final static byte ITYPETXT_CALC = 0;
-    /**/private static final BitField fRecalc = new BitField(0x4000);
-    /**/private static final BitField fHasListBox = new BitField(0x8000);
-    protected int field_3_cch;
-    protected int field_4_hps;
-
-    protected FFDataBaseAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_version                = LittleEndian.getUInt( data, 0x0 + offset );
-        field_2_bits                   = LittleEndian.getShort( data, 0x4 + offset );
-        field_3_cch                    = LittleEndian.getShort( data, 0x6 + offset );
-        field_4_hps                    = LittleEndian.getShort( data, 0x8 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putUInt( data, 0x0 + offset, field_1_version );
-        LittleEndian.putShort( data, 0x4 + offset, field_2_bits );
-        LittleEndian.putUShort( data, 0x6 + offset, field_3_cch );
-        LittleEndian.putUShort( data, 0x8 + offset, field_4_hps );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 2 + 2 + 2;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        FFDataBaseAbstractType other = (FFDataBaseAbstractType) obj;
-        if ( field_1_version != other.field_1_version )
-            return false;
-        if ( field_2_bits != other.field_2_bits )
-            return false;
-        if ( field_3_cch != other.field_3_cch )
-            return false;
-        if ( field_4_hps != other.field_4_hps )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result
-                 + (int) ( field_1_version ^ ( field_1_version >>> 32 ) );
-        result = prime * result + field_2_bits;
-        result = prime * result + field_3_cch;
-        result = prime * result + field_4_hps;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append("[FFDataBase]\n");
-        builder.append( "    .version              = " );
-        builder.append(" ( ").append( field_1_version ).append( " )\n" );
-        builder.append( "    .bits                 = " );
-        builder.append(" ( ").append( field_2_bits ).append( " )\n" );
-        builder.append("         .iType                    = ").append(getIType()).append('\n');
-        builder.append("         .iRes                     = ").append(getIRes()).append('\n');
-        builder.append("         .fOwnHelp                 = ").append(isFOwnHelp()).append('\n');
-        builder.append("         .fOwnStat                 = ").append(isFOwnStat()).append('\n');
-        builder.append("         .fProt                    = ").append(isFProt()).append('\n');
-        builder.append("         .iSize                    = ").append(isISize()).append('\n');
-        builder.append("         .iTypeTxt                 = ").append(getITypeTxt()).append('\n');
-        builder.append("         .fRecalc                  = ").append(isFRecalc()).append('\n');
-        builder.append("         .fHasListBox              = ").append(isFHasListBox()).append('\n');
-        builder.append( "    .cch                  = " );
-        builder.append(" ( ").append( field_3_cch ).append( " )\n" );
-        builder.append( "    .hps                  = " );
-        builder.append(" ( ").append( field_4_hps ).append( " )\n" );
-
-        builder.append("[/FFDataBase]");
-        return builder.toString();
-    }
-
-    /**
-     * An unsigned integer that MUST be 0xFFFFFFFF.
-     */
-    @Internal
-    public long getVersion()
-    {
-        return field_1_version;
-    }
-
-    /**
-     * An unsigned integer that MUST be 0xFFFFFFFF.
-     */
-    @Internal
-    public void setVersion( long field_1_version )
-    {
-        this.field_1_version = field_1_version;
-    }
-
-    /**
-     * An FFDataBits that specifies the type and state of this form field.
-     */
-    @Internal
-    public short getBits()
-    {
-        return field_2_bits;
-    }
-
-    /**
-     * An FFDataBits that specifies the type and state of this form field.
-     */
-    @Internal
-    public void setBits( short field_2_bits )
-    {
-        this.field_2_bits = field_2_bits;
-    }
-
-    /**
-     * An unsigned integer that specifies the maximum length, in characters, of the value of the textbox. This value MUST NOT exceed 32767. A value of 0 means there is no maximum length of the value of the textbox. If bits.iType is not iTypeText (0), this value MUST be 0..
-     */
-    @Internal
-    public int getCch()
-    {
-        return field_3_cch;
-    }
-
-    /**
-     * An unsigned integer that specifies the maximum length, in characters, of the value of the textbox. This value MUST NOT exceed 32767. A value of 0 means there is no maximum length of the value of the textbox. If bits.iType is not iTypeText (0), this value MUST be 0..
-     */
-    @Internal
-    public void setCch( int field_3_cch )
-    {
-        this.field_3_cch = field_3_cch;
-    }
-
-    /**
-     * An unsigned integer. If bits.iType is iTypeChck (1), hps specifies the size, in half-points, of the checkbox and MUST be between 2 and 3168, inclusive. If bits.iType is not iTypeChck (1), hps is undefined and MUST be ignored..
-     */
-    @Internal
-    public int getHps()
-    {
-        return field_4_hps;
-    }
-
-    /**
-     * An unsigned integer. If bits.iType is iTypeChck (1), hps specifies the size, in half-points, of the checkbox and MUST be between 2 and 3168, inclusive. If bits.iType is not iTypeChck (1), hps is undefined and MUST be ignored..
-     */
-    @Internal
-    public void setHps( int field_4_hps )
-    {
-        this.field_4_hps = field_4_hps;
-    }
-
-    /**
-     * Sets the iType field value.
-     * An unsigned integer that specifies the type of the form field. 
-     */
-    @Internal
-    public void setIType( byte value )
-    {
-        field_2_bits = (short)iType.setValue(field_2_bits, value);
-    }
-
-    /**
-     * An unsigned integer that specifies the type of the form field. 
-     * @return  the iType field value.
-     */
-    @Internal
-    public byte getIType()
-    {
-        return ( byte )iType.getValue(field_2_bits);
-    }
-
-    /**
-     * Sets the iRes field value.
-     * An unsigned integer. If iType is iTypeText (0), then iRes MUST be 0. If iType is iTypeChck (1), iRes specifies the state of the checkbox and MUST be 0 (unchecked), 1 (checked), or 25 (undefined). Undefined checkboxes are treated as unchecked. If iType is iTypeDrop (2), iRes specifies the current selected list box item. A value of 25 specifies the selection is undefined. Otherwise, iRes is a zero-based index into FFData.hsttbDropList.
-     */
-    @Internal
-    public void setIRes( byte value )
-    {
-        field_2_bits = (short)iRes.setValue(field_2_bits, value);
-    }
-
-    /**
-     * An unsigned integer. If iType is iTypeText (0), then iRes MUST be 0. If iType is iTypeChck (1), iRes specifies the state of the checkbox and MUST be 0 (unchecked), 1 (checked), or 25 (undefined). Undefined checkboxes are treated as unchecked. If iType is iTypeDrop (2), iRes specifies the current selected list box item. A value of 25 specifies the selection is undefined. Otherwise, iRes is a zero-based index into FFData.hsttbDropList.
-     * @return  the iRes field value.
-     */
-    @Internal
-    public byte getIRes()
-    {
-        return ( byte )iRes.getValue(field_2_bits);
-    }
-
-    /**
-     * Sets the fOwnHelp field value.
-     * A bit that specifies whether the form field has custom help text in FFData.xstzHelpText. If fOwnHelp is 0, FFData.xstzHelpText contains an empty or auto-generated string.
-     */
-    @Internal
-    public void setFOwnHelp( boolean value )
-    {
-        field_2_bits = (short)fOwnHelp.setBoolean(field_2_bits, value);
-    }
-
-    /**
-     * A bit that specifies whether the form field has custom help text in FFData.xstzHelpText. If fOwnHelp is 0, FFData.xstzHelpText contains an empty or auto-generated string.
-     * @return  the fOwnHelp field value.
-     */
-    @Internal
-    public boolean isFOwnHelp()
-    {
-        return fOwnHelp.isSet(field_2_bits);
-    }
-
-    /**
-     * Sets the fOwnStat field value.
-     * A bit that specifies whether the form field has custom status bar text in FFData.xstzStatText. If fOwnStat is 0, FFData.xstzStatText contains an empty or auto-generated string.
-     */
-    @Internal
-    public void setFOwnStat( boolean value )
-    {
-        field_2_bits = (short)fOwnStat.setBoolean(field_2_bits, value);
-    }
-
-    /**
-     * A bit that specifies whether the form field has custom status bar text in FFData.xstzStatText. If fOwnStat is 0, FFData.xstzStatText contains an empty or auto-generated string.
-     * @return  the fOwnStat field value.
-     */
-    @Internal
-    public boolean isFOwnStat()
-    {
-        return fOwnStat.isSet(field_2_bits);
-    }
-
-    /**
-     * Sets the fProt field value.
-     * A bit that specifies whether the form field is protected and its value cannot be changed.
-     */
-    @Internal
-    public void setFProt( boolean value )
-    {
-        field_2_bits = (short)fProt.setBoolean(field_2_bits, value);
-    }
-
-    /**
-     * A bit that specifies whether the form field is protected and its value cannot be changed.
-     * @return  the fProt field value.
-     */
-    @Internal
-    public boolean isFProt()
-    {
-        return fProt.isSet(field_2_bits);
-    }
-
-    /**
-     * Sets the iSize field value.
-     * A bit that specifies whether the size of a checkbox is automatically determined by the text size where the checkbox is located. This value MUST be 0 if iType is not iTypeChck (1).
-     */
-    @Internal
-    public void setISize( boolean value )
-    {
-        field_2_bits = (short)iSize.setBoolean(field_2_bits, value);
-    }
-
-    /**
-     * A bit that specifies whether the size of a checkbox is automatically determined by the text size where the checkbox is located. This value MUST be 0 if iType is not iTypeChck (1).
-     * @return  the iSize field value.
-     */
-    @Internal
-    public boolean isISize()
-    {
-        return iSize.isSet(field_2_bits);
-    }
-
-    /**
-     * Sets the iTypeTxt field value.
-     * An unsigned integer that specifies the type of the textbox. If iType is not iTypeText (0), iTypeTxt MUST be 0 and MUST be ignored.
-     */
-    @Internal
-    public void setITypeTxt( byte value )
-    {
-        field_2_bits = (short)iTypeTxt.setValue(field_2_bits, value);
-    }
-
-    /**
-     * An unsigned integer that specifies the type of the textbox. If iType is not iTypeText (0), iTypeTxt MUST be 0 and MUST be ignored.
-     * @return  the iTypeTxt field value.
-     */
-    @Internal
-    public byte getITypeTxt()
-    {
-        return ( byte )iTypeTxt.getValue(field_2_bits);
-    }
-
-    /**
-     * Sets the fRecalc field value.
-     * A bit that specifies whether the value of the field is automatically calculated after the field is modified.
-     */
-    @Internal
-    public void setFRecalc( boolean value )
-    {
-        field_2_bits = (short)fRecalc.setBoolean(field_2_bits, value);
-    }
-
-    /**
-     * A bit that specifies whether the value of the field is automatically calculated after the field is modified.
-     * @return  the fRecalc field value.
-     */
-    @Internal
-    public boolean isFRecalc()
-    {
-        return fRecalc.isSet(field_2_bits);
-    }
-
-    /**
-     * Sets the fHasListBox field value.
-     * A bit that specifies that the form field has a list box. This value MUST be 1 if iType is iTypeDrop (2). Otherwise, this value MUST be 0.
-     */
-    @Internal
-    public void setFHasListBox( boolean value )
-    {
-        field_2_bits = (short)fHasListBox.setBoolean(field_2_bits, value);
-    }
-
-    /**
-     * A bit that specifies that the form field has a list box. This value MUST be 1 if iType is iTypeDrop (2). Otherwise, this value MUST be 0.
-     * @return  the fHasListBox field value.
-     */
-    @Internal
-    public boolean isFHasListBox()
-    {
-        return fHasListBox.isSet(field_2_bits);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
deleted file mode 100644
index 04adf1a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-
-/**
- * Field Descriptor (FLD).
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format
- * 
- * NOTE: This source is automatically generated please do not modify this file.
- * Either subclass or remove the record in src/records/definitions.
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc]
- */
-@Internal
-public abstract class FLDAbstractType
-{
-
-    protected byte field_1_chHolder;
-    private static final BitField ch = new BitField( 0x1f );
-    private static final BitField reserved = new BitField( 0xe0 );
-    protected byte field_2_flt;
-    private static final BitField fDiffer = new BitField( 0x01 );
-    private static final BitField fZombieEmbed = new BitField( 0x02 );
-    private static final BitField fResultDirty = new BitField( 0x04 );
-    private static final BitField fResultEdited = new BitField( 0x08 );
-    private static final BitField fLocked = new BitField( 0x10 );
-    private static final BitField fPrivateResult = new BitField( 0x20 );
-    private static final BitField fNested = new BitField( 0x40 );
-    private static final BitField fHasSep = new BitField( 0x40 );
-
-    public FLDAbstractType()
-    {
-
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_chHolder = data[0x0 + offset];
-        field_2_flt = data[0x1 + offset];
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        data[0x0 + offset] = field_1_chHolder;
-        data[0x1 + offset] = field_2_flt;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append( "[FLD]\n" );
-
-        buffer.append( "    .chHolder             = " );
-        buffer.append( " (" ).append( getChHolder() ).append( " )\n" );
-        buffer.append( "         .ch                       = " )
-                .append( getCh() ).append( '\n' );
-        buffer.append( "         .reserved                 = " )
-                .append( getReserved() ).append( '\n' );
-
-        buffer.append( "    .flt                  = " );
-        buffer.append( " (" ).append( getFlt() ).append( " )\n" );
-        buffer.append( "         .fDiffer                  = " )
-                .append( isFDiffer() ).append( '\n' );
-        buffer.append( "         .fZombieEmbed             = " )
-                .append( isFZombieEmbed() ).append( '\n' );
-        buffer.append( "         .fResultDirty             = " )
-                .append( isFResultDirty() ).append( '\n' );
-        buffer.append( "         .fResultEdited            = " )
-                .append( isFResultEdited() ).append( '\n' );
-        buffer.append( "         .fLocked                  = " )
-                .append( isFLocked() ).append( '\n' );
-        buffer.append( "         .fPrivateResult           = " )
-                .append( isFPrivateResult() ).append( '\n' );
-        buffer.append( "         .fNested                  = " )
-                .append( isFNested() ).append( '\n' );
-        buffer.append( "         .fHasSep                  = " )
-                .append( isFHasSep() ).append( '\n' );
-
-        buffer.append( "[/FLD]\n" );
-        return buffer.toString();
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public static int getSize()
-    {
-        return 4 + +1 + 1;
-    }
-
-    /**
-     * ch field holder (along with reserved bits).
-     */
-    public byte getChHolder()
-    {
-        return field_1_chHolder;
-    }
-
-    /**
-     * ch field holder (along with reserved bits).
-     */
-    public void setChHolder( byte field_1_chHolder )
-    {
-        this.field_1_chHolder = field_1_chHolder;
-    }
-
-    /**
-     * Field type when ch == 19 OR field flags when ch == 21 .
-     */
-    public byte getFlt()
-    {
-        return field_2_flt;
-    }
-
-    /**
-     * Field type when ch == 19 OR field flags when ch == 21 .
-     */
-    public void setFlt( byte field_2_flt )
-    {
-        this.field_2_flt = field_2_flt;
-    }
-
-    /**
-     * Sets the ch field value. Type of field boundary the FLD describes: 19 --
-     * field begin mark, 20 -- field separation mark; 21 -- field end mark
-     */
-    public void setCh( byte value )
-    {
-        field_1_chHolder = (byte) ch.setValue( field_1_chHolder, value );
-
-    }
-
-    /**
-     * Type of field boundary the FLD describes: 19 -- field begin mark, 20 --
-     * field separation mark; 21 -- field end mark
-     * 
-     * @return the ch field value.
-     */
-    public byte getCh()
-    {
-        return (byte) ch.getValue( field_1_chHolder );
-
-    }
-
-    /**
-     * Sets the reserved field value. Reserved
-     */
-    public void setReserved( byte value )
-    {
-        field_1_chHolder = (byte) reserved.setValue( field_1_chHolder, value );
-
-    }
-
-    /**
-     * Reserved
-     * 
-     * @return the reserved field value.
-     */
-    public byte getReserved()
-    {
-        return (byte) reserved.getValue( field_1_chHolder );
-
-    }
-
-    /**
-     * Sets the fDiffer field value. Ignored for saved file
-     */
-    public void setFDiffer( boolean value )
-    {
-        field_2_flt = (byte) fDiffer.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * Ignored for saved file
-     * 
-     * @return the fDiffer field value.
-     */
-    public boolean isFDiffer()
-    {
-        return fDiffer.isSet( field_2_flt );
-
-    }
-
-    /**
-     * Sets the fZombieEmbed field value. ==1 when result still believes this
-     * field is an EMBED or LINK field
-     */
-    public void setFZombieEmbed( boolean value )
-    {
-        field_2_flt = (byte) fZombieEmbed.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * ==1 when result still believes this field is an EMBED or LINK field
-     * 
-     * @return the fZombieEmbed field value.
-     */
-    public boolean isFZombieEmbed()
-    {
-        return fZombieEmbed.isSet( field_2_flt );
-
-    }
-
-    /**
-     * Sets the fResultDirty field value. ==1 when user has edited or formatted
-     * the result. == 0 otherwise
-     */
-    public void setFResultDirty( boolean value )
-    {
-        field_2_flt = (byte) fResultDirty.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * ==1 when user has edited or formatted the result. == 0 otherwise
-     * 
-     * @return the fResultDirty field value.
-     */
-    public boolean isFResultDirty()
-    {
-        return fResultDirty.isSet( field_2_flt );
-
-    }
-
-    /**
-     * Sets the fResultEdited field value. ==1 when user has inserted text into
-     * or deleted text from the result
-     */
-    public void setFResultEdited( boolean value )
-    {
-        field_2_flt = (byte) fResultEdited.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * ==1 when user has inserted text into or deleted text from the result
-     * 
-     * @return the fResultEdited field value.
-     */
-    public boolean isFResultEdited()
-    {
-        return fResultEdited.isSet( field_2_flt );
-
-    }
-
-    /**
-     * Sets the fLocked field value. ==1 when field is locked from recalculation
-     */
-    public void setFLocked( boolean value )
-    {
-        field_2_flt = (byte) fLocked.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * ==1 when field is locked from recalculation
-     * 
-     * @return the fLocked field value.
-     */
-    public boolean isFLocked()
-    {
-        return fLocked.isSet( field_2_flt );
-
-    }
-
-    /**
-     * Sets the fPrivateResult field value. ==1 whenever the result of the field
-     * is never to be shown
-     */
-    public void setFPrivateResult( boolean value )
-    {
-        field_2_flt = (byte) fPrivateResult.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * ==1 whenever the result of the field is never to be shown
-     * 
-     * @return the fPrivateResult field value.
-     */
-    public boolean isFPrivateResult()
-    {
-        return fPrivateResult.isSet( field_2_flt );
-
-    }
-
-    /**
-     * Sets the fNested field value. ==1 when field is nested within another
-     * field
-     */
-    public void setFNested( boolean value )
-    {
-        field_2_flt = (byte) fNested.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * ==1 when field is nested within another field
-     * 
-     * @return the fNested field value.
-     */
-    public boolean isFNested()
-    {
-        return fNested.isSet( field_2_flt );
-
-    }
-
-    /**
-     * Sets the fHasSep field value. ==1 when field has a field separator
-     */
-    public void setFHasSep( boolean value )
-    {
-        field_2_flt = (byte) fHasSep.setBoolean( field_2_flt, value );
-
-    }
-
-    /**
-     * ==1 when field has a field separator
-     * 
-     * @return the fHasSep field value.
-     */
-    public boolean isFHasSep()
-    {
-        return fHasSep.isSet( field_2_flt );
-
-    }
-} // END OF CLASS
-
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java
deleted file mode 100644
index 9923fe6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Footnote Reference Descriptor (FRD).
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format (.doc) Specification
- * 
- * NOTE: This source is automatically generated please do not modify this file.
- * Either subclass or remove the record in src/types/definitions.
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format (.doc) Specification
- */
-@Internal
-public abstract class FRDAbstractType
-{
-
-    protected short field_1_nAuto;
-
-    protected FRDAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_nAuto = LittleEndian.getShort( data, 0x0 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putShort( data, 0x0 + offset, field_1_nAuto );
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append( "[FRD]\n" );
-        builder.append( "    .nAuto                = " );
-        builder.append( " (" ).append( getNAuto() ).append( " )\n" );
-
-        builder.append( "[/FRD]\n" );
-        return builder.toString();
-    }
-
-    /**
-     * If > 0, the note is an automatically numbered note, otherwise it has a
-     * custom mark.
-     */
-    public short getNAuto()
-    {
-        return field_1_nAuto;
-    }
-
-    /**
-     * If > 0, the note is an automatically numbered note, otherwise it has a
-     * custom mark.
-     */
-    public void setNAuto( short field_1_nAuto )
-    {
-        this.field_1_nAuto = field_1_nAuto;
-    }
-
-} // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
deleted file mode 100644
index ee71c2b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * File Shape Address (FSPA).
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format
- * 
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.
- * Either subclass or remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice
- * due to changes in our knowledge of internal Microsoft Word binary structures.
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc]
- */
-@Internal
-public abstract class FSPAAbstractType
-{
-
-    protected int field_1_spid;
-    protected int field_2_xaLeft;
-    protected int field_3_yaTop;
-    protected int field_4_xaRight;
-    protected int field_5_yaBottom;
-    protected short field_6_flags;
-    /**/private static BitField fHdr = new BitField(0x0001);
-    /**/private static BitField bx = new BitField(0x0006);
-    /**/private static BitField by = new BitField(0x0018);
-    /**/private static BitField wr = new BitField(0x01E0);
-    /**/private static BitField wrk = new BitField(0x1E00);
-    /**/private static BitField fRcaSimple = new BitField(0x2000);
-    /**/private static BitField fBelowText = new BitField(0x4000);
-    /**/private static BitField fAnchorLock = new BitField(0x8000);
-    protected int field_7_cTxbx;
-
-    protected FSPAAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_spid                   = LittleEndian.getInt(data, 0x0 + offset);
-        field_2_xaLeft                 = LittleEndian.getInt(data, 0x4 + offset);
-        field_3_yaTop                  = LittleEndian.getInt(data, 0x8 + offset);
-        field_4_xaRight                = LittleEndian.getInt(data, 0xc + offset);
-        field_5_yaBottom               = LittleEndian.getInt(data, 0x10 + offset);
-        field_6_flags                  = LittleEndian.getShort(data, 0x14 + offset);
-        field_7_cTxbx                  = LittleEndian.getInt(data, 0x16 + offset);
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt(data, 0x0 + offset, field_1_spid);
-        LittleEndian.putInt(data, 0x4 + offset, field_2_xaLeft);
-        LittleEndian.putInt(data, 0x8 + offset, field_3_yaTop);
-        LittleEndian.putInt(data, 0xc + offset, field_4_xaRight);
-        LittleEndian.putInt(data, 0x10 + offset, field_5_yaBottom);
-        LittleEndian.putShort(data, 0x14 + offset, field_6_flags);
-        LittleEndian.putInt(data, 0x16 + offset, field_7_cTxbx);
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 4 + 4 + 4 + 4 + 2 + 4;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[FSPA]\n");
-        builder.append("    .spid                 = ");
-        builder.append(" (").append(getSpid()).append(" )\n");
-        builder.append("    .xaLeft               = ");
-        builder.append(" (").append(getXaLeft()).append(" )\n");
-        builder.append("    .yaTop                = ");
-        builder.append(" (").append(getYaTop()).append(" )\n");
-        builder.append("    .xaRight              = ");
-        builder.append(" (").append(getXaRight()).append(" )\n");
-        builder.append("    .yaBottom             = ");
-        builder.append(" (").append(getYaBottom()).append(" )\n");
-        builder.append("    .flags                = ");
-        builder.append(" (").append(getFlags()).append(" )\n");
-        builder.append("         .fHdr                     = ").append(isFHdr()).append('\n');
-        builder.append("         .bx                       = ").append(getBx()).append('\n');
-        builder.append("         .by                       = ").append(getBy()).append('\n');
-        builder.append("         .wr                       = ").append(getWr()).append('\n');
-        builder.append("         .wrk                      = ").append(getWrk()).append('\n');
-        builder.append("         .fRcaSimple               = ").append(isFRcaSimple()).append('\n');
-        builder.append("         .fBelowText               = ").append(isFBelowText()).append('\n');
-        builder.append("         .fAnchorLock              = ").append(isFAnchorLock()).append('\n');
-        builder.append("    .cTxbx                = ");
-        builder.append(" (").append(getCTxbx()).append(" )\n");
-
-        builder.append("[/FSPA]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Shape Identifier. Used in conjunction with the office art data (found via fcDggInfo in the FIB) to find the actual data for this shape.
-     */
-    @Internal
-    public int getSpid()
-    {
-        return field_1_spid;
-    }
-
-    /**
-     * Shape Identifier. Used in conjunction with the office art data (found via fcDggInfo in the FIB) to find the actual data for this shape.
-     */
-    @Internal
-    public void setSpid( int field_1_spid )
-    {
-        this.field_1_spid = field_1_spid;
-    }
-
-    /**
-     * Left of rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public int getXaLeft()
-    {
-        return field_2_xaLeft;
-    }
-
-    /**
-     * Left of rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public void setXaLeft( int field_2_xaLeft )
-    {
-        this.field_2_xaLeft = field_2_xaLeft;
-    }
-
-    /**
-     * Top of rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public int getYaTop()
-    {
-        return field_3_yaTop;
-    }
-
-    /**
-     * Top of rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public void setYaTop( int field_3_yaTop )
-    {
-        this.field_3_yaTop = field_3_yaTop;
-    }
-
-    /**
-     * Right of rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public int getXaRight()
-    {
-        return field_4_xaRight;
-    }
-
-    /**
-     * Right of rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public void setXaRight( int field_4_xaRight )
-    {
-        this.field_4_xaRight = field_4_xaRight;
-    }
-
-    /**
-     * Bottom of the rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public int getYaBottom()
-    {
-        return field_5_yaBottom;
-    }
-
-    /**
-     * Bottom of the rectangle enclosing shape relative to the origin of the shape.
-     */
-    @Internal
-    public void setYaBottom( int field_5_yaBottom )
-    {
-        this.field_5_yaBottom = field_5_yaBottom;
-    }
-
-    /**
-     * Get the flags field for the FSPA record.
-     */
-    @Internal
-    public short getFlags()
-    {
-        return field_6_flags;
-    }
-
-    /**
-     * Set the flags field for the FSPA record.
-     */
-    @Internal
-    public void setFlags( short field_6_flags )
-    {
-        this.field_6_flags = field_6_flags;
-    }
-
-    /**
-     * Count of textboxes in shape (undo doc only).
-     */
-    @Internal
-    public int getCTxbx()
-    {
-        return field_7_cTxbx;
-    }
-
-    /**
-     * Count of textboxes in shape (undo doc only).
-     */
-    @Internal
-    public void setCTxbx( int field_7_cTxbx )
-    {
-        this.field_7_cTxbx = field_7_cTxbx;
-    }
-
-    /**
-     * Sets the fHdr field value.
-     * 1 in the undo doc when shape is from the header doc, 0 otherwise (undefined when not in the undo doc)
-     */
-    @Internal
-    public void setFHdr( boolean value )
-    {
-        field_6_flags = (short)fHdr.setBoolean(field_6_flags, value);
-    }
-
-    /**
-     * 1 in the undo doc when shape is from the header doc, 0 otherwise (undefined when not in the undo doc)
-     * @return  the fHdr field value.
-     */
-    @Internal
-    public boolean isFHdr()
-    {
-        return fHdr.isSet(field_6_flags);
-    }
-
-    /**
-     * Sets the bx field value.
-     * X position of shape relative to anchor CP
-     */
-    @Internal
-    public void setBx( byte value )
-    {
-        field_6_flags = (short)bx.setValue(field_6_flags, value);
-    }
-
-    /**
-     * X position of shape relative to anchor CP
-     * @return  the bx field value.
-     */
-    @Internal
-    public byte getBx()
-    {
-        return ( byte )bx.getValue(field_6_flags);
-    }
-
-    /**
-     * Sets the by field value.
-     * Y position of shape relative to anchor CP
-     */
-    @Internal
-    public void setBy( byte value )
-    {
-        field_6_flags = (short)by.setValue(field_6_flags, value);
-    }
-
-    /**
-     * Y position of shape relative to anchor CP
-     * @return  the by field value.
-     */
-    @Internal
-    public byte getBy()
-    {
-        return ( byte )by.getValue(field_6_flags);
-    }
-
-    /**
-     * Sets the wr field value.
-     * Text wrapping mode
-     */
-    @Internal
-    public void setWr( byte value )
-    {
-        field_6_flags = (short)wr.setValue(field_6_flags, value);
-    }
-
-    /**
-     * Text wrapping mode
-     * @return  the wr field value.
-     */
-    @Internal
-    public byte getWr()
-    {
-        return ( byte )wr.getValue(field_6_flags);
-    }
-
-    /**
-     * Sets the wrk field value.
-     * Text wrapping mode type (valid only for wrapping modes 2 and 4
-     */
-    @Internal
-    public void setWrk( byte value )
-    {
-        field_6_flags = (short)wrk.setValue(field_6_flags, value);
-    }
-
-    /**
-     * Text wrapping mode type (valid only for wrapping modes 2 and 4
-     * @return  the wrk field value.
-     */
-    @Internal
-    public byte getWrk()
-    {
-        return ( byte )wrk.getValue(field_6_flags);
-    }
-
-    /**
-     * Sets the fRcaSimple field value.
-     * When set, temporarily overrides bx, by, forcing the xaLeft, xaRight, yaTop, and yaBottom fields to all be page relative.
-     */
-    @Internal
-    public void setFRcaSimple( boolean value )
-    {
-        field_6_flags = (short)fRcaSimple.setBoolean(field_6_flags, value);
-    }
-
-    /**
-     * When set, temporarily overrides bx, by, forcing the xaLeft, xaRight, yaTop, and yaBottom fields to all be page relative.
-     * @return  the fRcaSimple field value.
-     */
-    @Internal
-    public boolean isFRcaSimple()
-    {
-        return fRcaSimple.isSet(field_6_flags);
-    }
-
-    /**
-     * Sets the fBelowText field value.
-     * 
-     */
-    @Internal
-    public void setFBelowText( boolean value )
-    {
-        field_6_flags = (short)fBelowText.setBoolean(field_6_flags, value);
-    }
-
-    /**
-     * 
-     * @return  the fBelowText field value.
-     */
-    @Internal
-    public boolean isFBelowText()
-    {
-        return fBelowText.isSet(field_6_flags);
-    }
-
-    /**
-     * Sets the fAnchorLock field value.
-     * 
-     */
-    @Internal
-    public void setFAnchorLock( boolean value )
-    {
-        field_6_flags = (short)fAnchorLock.setBoolean(field_6_flags, value);
-    }
-
-    /**
-     * 
-     * @return  the fAnchorLock field value.
-     */
-    @Internal
-    public boolean isFAnchorLock()
-    {
-        return fAnchorLock.isSet(field_6_flags);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
deleted file mode 100644
index 7ef1078..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Base part of the File information Block (FibBase). Holds the core part of the FIB,
-        from the first 32 bytes. <p>Class and fields descriptions are quoted from Microsoft
-        Office Word 97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File
-        Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Andrew C. Oliver; Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
-        File Format Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class FibBaseAbstractType
-{
-
-    protected int field_1_wIdent;
-    protected int field_2_nFib;
-    protected int field_3_unused;
-    protected int field_4_lid;
-    protected int field_5_pnNext;
-    protected short field_6_flags1;
-    /**/private static final BitField fDot = new BitField(0x0001);
-    /**/private static final BitField fGlsy = new BitField(0x0002);
-    /**/private static final BitField fComplex = new BitField(0x0004);
-    /**/private static final BitField fHasPic = new BitField(0x0008);
-    /**/private static final BitField cQuickSaves = new BitField(0x00F0);
-    /**/private static final BitField fEncrypted = new BitField(0x0100);
-    /**/private static final BitField fWhichTblStm = new BitField(0x0200);
-    /**/private static final BitField fReadOnlyRecommended = new BitField(0x0400);
-    /**/private static final BitField fWriteReservation = new BitField(0x0800);
-    /**/private static final BitField fExtChar = new BitField(0x1000);
-    /**/private static final BitField fLoadOverride = new BitField(0x2000);
-    /**/private static final BitField fFarEast = new BitField(0x4000);
-    /**/private static final BitField fObfuscated = new BitField(0x8000);
-    protected int field_7_nFibBack;
-    protected int field_8_lKey;
-    @Deprecated
-    protected byte field_9_envr;
-    protected byte field_10_flags2;
-    /**/private static final BitField fMac = new BitField(0x01);
-    /**/private static final BitField fEmptySpecial = new BitField(0x02);
-    /**/private static final BitField fLoadOverridePage = new BitField(0x04);
-    /**/private static final BitField reserved1 = new BitField(0x08);
-    /**/private static final BitField reserved2 = new BitField(0x10);
-    /**/private static final BitField fSpare0 = new BitField(0xFE);
-    @Deprecated
-    protected short field_11_Chs;
-    @Deprecated
-    protected short field_12_chsTables;
-    @Deprecated
-    protected int field_13_fcMin;
-    @Deprecated
-    protected int field_14_fcMac;
-
-    protected FibBaseAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_wIdent                 = LittleEndian.getShort( data, 0x0 + offset );
-        field_2_nFib                   = LittleEndian.getShort( data, 0x2 + offset );
-        field_3_unused                 = LittleEndian.getShort( data, 0x4 + offset );
-        field_4_lid                    = LittleEndian.getShort( data, 0x6 + offset );
-        field_5_pnNext                 = LittleEndian.getShort( data, 0x8 + offset );
-        field_6_flags1                 = LittleEndian.getShort( data, 0xa + offset );
-        field_7_nFibBack               = LittleEndian.getShort( data, 0xc + offset );
-        field_8_lKey                   = LittleEndian.getInt( data, 0xe + offset );
-        field_9_envr                   = data[ 0x12 + offset ];
-        field_10_flags2                = data[ 0x13 + offset ];
-        field_11_Chs                   = LittleEndian.getShort( data, 0x14 + offset );
-        field_12_chsTables             = LittleEndian.getShort( data, 0x16 + offset );
-        field_13_fcMin                 = LittleEndian.getInt( data, 0x18 + offset );
-        field_14_fcMac                 = LittleEndian.getInt( data, 0x1c + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putUShort( data, 0x0 + offset, field_1_wIdent );
-        LittleEndian.putUShort( data, 0x2 + offset, field_2_nFib );
-        LittleEndian.putUShort( data, 0x4 + offset, field_3_unused );
-        LittleEndian.putUShort( data, 0x6 + offset, field_4_lid );
-        LittleEndian.putUShort( data, 0x8 + offset, field_5_pnNext );
-        LittleEndian.putShort( data, 0xa + offset, field_6_flags1 );
-        LittleEndian.putUShort( data, 0xc + offset, field_7_nFibBack );
-        LittleEndian.putInt( data, 0xe + offset, field_8_lKey );
-        data[ 0x12 + offset ] = field_9_envr;
-        data[ 0x13 + offset ] = field_10_flags2;
-        LittleEndian.putShort( data, 0x14 + offset, field_11_Chs );
-        LittleEndian.putShort( data, 0x16 + offset, field_12_chsTables );
-        LittleEndian.putInt( data, 0x18 + offset, field_13_fcMin );
-        LittleEndian.putInt( data, 0x1c + offset, field_14_fcMac );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 1 + 1 + 2 + 2 + 4 + 4;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[FibBase]\n");
-        builder.append("    .wIdent               = ");
-        builder.append(" (").append(getWIdent()).append(" )\n");
-        builder.append("    .nFib                 = ");
-        builder.append(" (").append(getNFib()).append(" )\n");
-        builder.append("    .unused               = ");
-        builder.append(" (").append(getUnused()).append(" )\n");
-        builder.append("    .lid                  = ");
-        builder.append(" (").append(getLid()).append(" )\n");
-        builder.append("    .pnNext               = ");
-        builder.append(" (").append(getPnNext()).append(" )\n");
-        builder.append("    .flags1               = ");
-        builder.append(" (").append(getFlags1()).append(" )\n");
-        builder.append("         .fDot                     = ").append(isFDot()).append('\n');
-        builder.append("         .fGlsy                    = ").append(isFGlsy()).append('\n');
-        builder.append("         .fComplex                 = ").append(isFComplex()).append('\n');
-        builder.append("         .fHasPic                  = ").append(isFHasPic()).append('\n');
-        builder.append("         .cQuickSaves              = ").append(getCQuickSaves()).append('\n');
-        builder.append("         .fEncrypted               = ").append(isFEncrypted()).append('\n');
-        builder.append("         .fWhichTblStm             = ").append(isFWhichTblStm()).append('\n');
-        builder.append("         .fReadOnlyRecommended     = ").append(isFReadOnlyRecommended()).append('\n');
-        builder.append("         .fWriteReservation        = ").append(isFWriteReservation()).append('\n');
-        builder.append("         .fExtChar                 = ").append(isFExtChar()).append('\n');
-        builder.append("         .fLoadOverride            = ").append(isFLoadOverride()).append('\n');
-        builder.append("         .fFarEast                 = ").append(isFFarEast()).append('\n');
-        builder.append("         .fObfuscated              = ").append(isFObfuscated()).append('\n');
-        builder.append("    .nFibBack             = ");
-        builder.append(" (").append(getNFibBack()).append(" )\n");
-        builder.append("    .lKey                 = ");
-        builder.append(" (").append(getLKey()).append(" )\n");
-        builder.append("    .envr                 = ");
-        builder.append(" (").append(getEnvr()).append(" )\n");
-        builder.append("    .flags2               = ");
-        builder.append(" (").append(getFlags2()).append(" )\n");
-        builder.append("         .fMac                     = ").append(isFMac()).append('\n');
-        builder.append("         .fEmptySpecial            = ").append(isFEmptySpecial()).append('\n');
-        builder.append("         .fLoadOverridePage        = ").append(isFLoadOverridePage()).append('\n');
-        builder.append("         .reserved1                = ").append(isReserved1()).append('\n');
-        builder.append("         .reserved2                = ").append(isReserved2()).append('\n');
-        builder.append("         .fSpare0                  = ").append(getFSpare0()).append('\n');
-        builder.append("    .Chs                  = ");
-        builder.append(" (").append(getChs()).append(" )\n");
-        builder.append("    .chsTables            = ");
-        builder.append(" (").append(getChsTables()).append(" )\n");
-        builder.append("    .fcMin                = ");
-        builder.append(" (").append(getFcMin()).append(" )\n");
-        builder.append("    .fcMac                = ");
-        builder.append(" (").append(getFcMac()).append(" )\n");
-
-        builder.append("[/FibBase]\n");
-        return builder.toString();
-    }
-
-    /**
-     * An unsigned integer that specifies that this is a Word Binary File. This value MUST be 0xA5EC.
-     */
-    @Internal
-    public int getWIdent()
-    {
-        return field_1_wIdent;
-    }
-
-    /**
-     * An unsigned integer that specifies that this is a Word Binary File. This value MUST be 0xA5EC.
-     */
-    @Internal
-    public void setWIdent( int field_1_wIdent )
-    {
-        this.field_1_wIdent = field_1_wIdent;
-    }
-
-    /**
-     * An unsigned integer that specifies the version number of the file format used. Superseded by FibRgCswNew.nFibNew if it is present. This value SHOULD be 0x00C1.
-     */
-    @Internal
-    public int getNFib()
-    {
-        return field_2_nFib;
-    }
-
-    /**
-     * An unsigned integer that specifies the version number of the file format used. Superseded by FibRgCswNew.nFibNew if it is present. This value SHOULD be 0x00C1.
-     */
-    @Internal
-    public void setNFib( int field_2_nFib )
-    {
-        this.field_2_nFib = field_2_nFib;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getUnused()
-    {
-        return field_3_unused;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setUnused( int field_3_unused )
-    {
-        this.field_3_unused = field_3_unused;
-    }
-
-    /**
-     * A LID that specifies the install language of the application that is producing the document. If nFib is 0x00D9 or greater, then any East Asian install lid or any install lid with a base language of Spanish, German or French MUST be recorded as lidAmerican. If the nFib is 0x0101 or greater, then any install lid with a base language of Vietnamese, Thai, or Hindi MUST be recorded as lidAmerican..
-     */
-    @Internal
-    public int getLid()
-    {
-        return field_4_lid;
-    }
-
-    /**
-     * A LID that specifies the install language of the application that is producing the document. If nFib is 0x00D9 or greater, then any East Asian install lid or any install lid with a base language of Spanish, German or French MUST be recorded as lidAmerican. If the nFib is 0x0101 or greater, then any install lid with a base language of Vietnamese, Thai, or Hindi MUST be recorded as lidAmerican..
-     */
-    @Internal
-    public void setLid( int field_4_lid )
-    {
-        this.field_4_lid = field_4_lid;
-    }
-
-    /**
-     * An unsigned integer that specifies the offset in the WordDocument stream of the FIB for the document which contains all the AutoText items.
-     */
-    @Internal
-    public int getPnNext()
-    {
-        return field_5_pnNext;
-    }
-
-    /**
-     * An unsigned integer that specifies the offset in the WordDocument stream of the FIB for the document which contains all the AutoText items.
-     */
-    @Internal
-    public void setPnNext( int field_5_pnNext )
-    {
-        this.field_5_pnNext = field_5_pnNext;
-    }
-
-    /**
-     * Get the flags1 field for the FibBase record.
-     */
-    @Internal
-    public short getFlags1()
-    {
-        return field_6_flags1;
-    }
-
-    /**
-     * Set the flags1 field for the FibBase record.
-     */
-    @Internal
-    public void setFlags1( short field_6_flags1 )
-    {
-        this.field_6_flags1 = field_6_flags1;
-    }
-
-    /**
-     * This value SHOULD be 0x00BF. This value MUST be 0x00BF or 0x00C1.
-     */
-    @Internal
-    public int getNFibBack()
-    {
-        return field_7_nFibBack;
-    }
-
-    /**
-     * This value SHOULD be 0x00BF. This value MUST be 0x00BF or 0x00C1.
-     */
-    @Internal
-    public void setNFibBack( int field_7_nFibBack )
-    {
-        this.field_7_nFibBack = field_7_nFibBack;
-    }
-
-    /**
-     * If fEncryption is 1 and fObfuscation is 1, this value specifies the XOR obfuscation password verifier. If fEncryption is 1 and fObfuscation is 0, this value specifies the size of the EncryptionHeader that is stored at the beginning of the Table stream as described in Encryption and Obfuscation. Otherwise, this value MUST be 0.
-     */
-    @Internal
-    public int getLKey()
-    {
-        return field_8_lKey;
-    }
-
-    /**
-     * If fEncryption is 1 and fObfuscation is 1, this value specifies the XOR obfuscation password verifier. If fEncryption is 1 and fObfuscation is 0, this value specifies the size of the EncryptionHeader that is stored at the beginning of the Table stream as described in Encryption and Obfuscation. Otherwise, this value MUST be 0.
-     */
-    @Internal
-    public void setLKey( int field_8_lKey )
-    {
-        this.field_8_lKey = field_8_lKey;
-    }
-
-    /**
-     * This value MUST be 0, and MUST be ignored.
-     */
-    @Internal
-    public byte getEnvr()
-    {
-        return field_9_envr;
-    }
-
-    /**
-     * This value MUST be 0, and MUST be ignored.
-     */
-    @Internal
-    public void setEnvr( byte field_9_envr )
-    {
-        this.field_9_envr = field_9_envr;
-    }
-
-    /**
-     * Get the flags2 field for the FibBase record.
-     */
-    @Internal
-    public byte getFlags2()
-    {
-        return field_10_flags2;
-    }
-
-    /**
-     * Set the flags2 field for the FibBase record.
-     */
-    @Internal
-    public void setFlags2( byte field_10_flags2 )
-    {
-        this.field_10_flags2 = field_10_flags2;
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored.
-     */
-    @Internal
-    public short getChs()
-    {
-        return field_11_Chs;
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored.
-     */
-    @Internal
-    public void setChs( short field_11_Chs )
-    {
-        this.field_11_Chs = field_11_Chs;
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored.
-     */
-    @Internal
-    public short getChsTables()
-    {
-        return field_12_chsTables;
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored.
-     */
-    @Internal
-    public void setChsTables( short field_12_chsTables )
-    {
-        this.field_12_chsTables = field_12_chsTables;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getFcMin()
-    {
-        return field_13_fcMin;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setFcMin( int field_13_fcMin )
-    {
-        this.field_13_fcMin = field_13_fcMin;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getFcMac()
-    {
-        return field_14_fcMac;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setFcMac( int field_14_fcMac )
-    {
-        this.field_14_fcMac = field_14_fcMac;
-    }
-
-    /**
-     * Sets the fDot field value.
-     * Specifies whether this is a document template
-     */
-    @Internal
-    public void setFDot( boolean value )
-    {
-        field_6_flags1 = (short)fDot.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies whether this is a document template
-     * @return  the fDot field value.
-     */
-    @Internal
-    public boolean isFDot()
-    {
-        return fDot.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fGlsy field value.
-     * Specifies whether this is a document that contains only AutoText items
-     */
-    @Internal
-    public void setFGlsy( boolean value )
-    {
-        field_6_flags1 = (short)fGlsy.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies whether this is a document that contains only AutoText items
-     * @return  the fGlsy field value.
-     */
-    @Internal
-    public boolean isFGlsy()
-    {
-        return fGlsy.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fComplex field value.
-     * Specifies that the last save operation that was performed on this document was an incremental save operation
-     */
-    @Internal
-    public void setFComplex( boolean value )
-    {
-        field_6_flags1 = (short)fComplex.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies that the last save operation that was performed on this document was an incremental save operation
-     * @return  the fComplex field value.
-     */
-    @Internal
-    public boolean isFComplex()
-    {
-        return fComplex.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fHasPic field value.
-     * When set to 0, there SHOULD be no pictures in the document
-     */
-    @Internal
-    public void setFHasPic( boolean value )
-    {
-        field_6_flags1 = (short)fHasPic.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * When set to 0, there SHOULD be no pictures in the document
-     * @return  the fHasPic field value.
-     */
-    @Internal
-    public boolean isFHasPic()
-    {
-        return fHasPic.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the cQuickSaves field value.
-     * An unsigned integer. If nFib is less than 0x00D9, then cQuickSaves specifies the number of consecutive times this document was incrementally saved. If nFib is 0x00D9 or greater, then cQuickSaves MUST be 0xF
-     */
-    @Internal
-    public void setCQuickSaves( byte value )
-    {
-        field_6_flags1 = (short)cQuickSaves.setValue(field_6_flags1, value);
-    }
-
-    /**
-     * An unsigned integer. If nFib is less than 0x00D9, then cQuickSaves specifies the number of consecutive times this document was incrementally saved. If nFib is 0x00D9 or greater, then cQuickSaves MUST be 0xF
-     * @return  the cQuickSaves field value.
-     */
-    @Internal
-    public byte getCQuickSaves()
-    {
-        return ( byte )cQuickSaves.getValue(field_6_flags1);
-    }
-
-    /**
-     * Sets the fEncrypted field value.
-     * Specifies whether the document is encrypted or obfuscated as specified in Encryption and Obfuscation
-     */
-    @Internal
-    public void setFEncrypted( boolean value )
-    {
-        field_6_flags1 = (short)fEncrypted.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies whether the document is encrypted or obfuscated as specified in Encryption and Obfuscation
-     * @return  the fEncrypted field value.
-     */
-    @Internal
-    public boolean isFEncrypted()
-    {
-        return fEncrypted.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fWhichTblStm field value.
-     * Specifies the Table stream to which the FIB refers. When this value is set to 1, use 1Table; when this value is set to 0, use 0Table.
-     */
-    @Internal
-    public void setFWhichTblStm( boolean value )
-    {
-        field_6_flags1 = (short)fWhichTblStm.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies the Table stream to which the FIB refers. When this value is set to 1, use 1Table; when this value is set to 0, use 0Table.
-     * @return  the fWhichTblStm field value.
-     */
-    @Internal
-    public boolean isFWhichTblStm()
-    {
-        return fWhichTblStm.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fReadOnlyRecommended field value.
-     * Specifies whether the document author recommended that the document be opened in read-only mode
-     */
-    @Internal
-    public void setFReadOnlyRecommended( boolean value )
-    {
-        field_6_flags1 = (short)fReadOnlyRecommended.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies whether the document author recommended that the document be opened in read-only mode
-     * @return  the fReadOnlyRecommended field value.
-     */
-    @Internal
-    public boolean isFReadOnlyRecommended()
-    {
-        return fReadOnlyRecommended.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fWriteReservation field value.
-     * Specifies whether the document has a write-reservation password
-     */
-    @Internal
-    public void setFWriteReservation( boolean value )
-    {
-        field_6_flags1 = (short)fWriteReservation.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies whether the document has a write-reservation password
-     * @return  the fWriteReservation field value.
-     */
-    @Internal
-    public boolean isFWriteReservation()
-    {
-        return fWriteReservation.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fExtChar field value.
-     * This value MUST be 1
-     */
-    @Internal
-    public void setFExtChar( boolean value )
-    {
-        field_6_flags1 = (short)fExtChar.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * This value MUST be 1
-     * @return  the fExtChar field value.
-     */
-    @Internal
-    public boolean isFExtChar()
-    {
-        return fExtChar.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fLoadOverride field value.
-     * Specifies whether to override the language information and font that are specified in the paragraph style at istd 0 (the normal style) with the defaults that are appropriate for the installation language of the application
-     */
-    @Internal
-    public void setFLoadOverride( boolean value )
-    {
-        field_6_flags1 = (short)fLoadOverride.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies whether to override the language information and font that are specified in the paragraph style at istd 0 (the normal style) with the defaults that are appropriate for the installation language of the application
-     * @return  the fLoadOverride field value.
-     */
-    @Internal
-    public boolean isFLoadOverride()
-    {
-        return fLoadOverride.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fFarEast field value.
-     * Specifies whether the installation language of the application that created the document was an East Asian language
-     */
-    @Internal
-    public void setFFarEast( boolean value )
-    {
-        field_6_flags1 = (short)fFarEast.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * Specifies whether the installation language of the application that created the document was an East Asian language
-     * @return  the fFarEast field value.
-     */
-    @Internal
-    public boolean isFFarEast()
-    {
-        return fFarEast.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fObfuscated field value.
-     * If fEncrypted is 1, this bit specifies whether the document is obfuscated by using XOR obfuscation; otherwise, this bit MUST be ignored
-     */
-    @Internal
-    public void setFObfuscated( boolean value )
-    {
-        field_6_flags1 = (short)fObfuscated.setBoolean(field_6_flags1, value);
-    }
-
-    /**
-     * If fEncrypted is 1, this bit specifies whether the document is obfuscated by using XOR obfuscation; otherwise, this bit MUST be ignored
-     * @return  the fObfuscated field value.
-     */
-    @Internal
-    public boolean isFObfuscated()
-    {
-        return fObfuscated.isSet(field_6_flags1);
-    }
-
-    /**
-     * Sets the fMac field value.
-     * This value MUST be 0, and MUST be ignored
-     */
-    @Internal
-    public void setFMac( boolean value )
-    {
-        field_10_flags2 = (byte)fMac.setBoolean(field_10_flags2, value);
-    }
-
-    /**
-     * This value MUST be 0, and MUST be ignored
-     * @return  the fMac field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public boolean isFMac()
-    {
-        return fMac.isSet(field_10_flags2);
-    }
-
-    /**
-     * Sets the fEmptySpecial field value.
-     * This value SHOULD be 0 and SHOULD be ignored
-     */
-    @Internal
-    public void setFEmptySpecial( boolean value )
-    {
-        field_10_flags2 = (byte)fEmptySpecial.setBoolean(field_10_flags2, value);
-    }
-
-    /**
-     * This value SHOULD be 0 and SHOULD be ignored
-     * @return  the fEmptySpecial field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public boolean isFEmptySpecial()
-    {
-        return fEmptySpecial.isSet(field_10_flags2);
-    }
-
-    /**
-     * Sets the fLoadOverridePage field value.
-     * Specifies whether to override the section properties for page size, orientation, and margins with the defaults that are appropriate for the installation language of the application
-     */
-    @Internal
-    public void setFLoadOverridePage( boolean value )
-    {
-        field_10_flags2 = (byte)fLoadOverridePage.setBoolean(field_10_flags2, value);
-    }
-
-    /**
-     * Specifies whether to override the section properties for page size, orientation, and margins with the defaults that are appropriate for the installation language of the application
-     * @return  the fLoadOverridePage field value.
-     */
-    @Internal
-    public boolean isFLoadOverridePage()
-    {
-        return fLoadOverridePage.isSet(field_10_flags2);
-    }
-
-    /**
-     * Sets the reserved1 field value.
-     * This value is undefined and MUST be ignored
-     */
-    @Internal
-    public void setReserved1( boolean value )
-    {
-        field_10_flags2 = (byte)reserved1.setBoolean(field_10_flags2, value);
-    }
-
-    /**
-     * This value is undefined and MUST be ignored
-     * @return  the reserved1 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public boolean isReserved1()
-    {
-        return reserved1.isSet(field_10_flags2);
-    }
-
-    /**
-     * Sets the reserved2 field value.
-     * This value is undefined and MUST be ignored
-     */
-    @Internal
-    public void setReserved2( boolean value )
-    {
-        field_10_flags2 = (byte)reserved2.setBoolean(field_10_flags2, value);
-    }
-
-    /**
-     * This value is undefined and MUST be ignored
-     * @return  the reserved2 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public boolean isReserved2()
-    {
-        return reserved2.isSet(field_10_flags2);
-    }
-
-    /**
-     * Sets the fSpare0 field value.
-     * This value is undefined and MUST be ignored
-     */
-    @Internal
-    public void setFSpare0( byte value )
-    {
-        field_10_flags2 = (byte)fSpare0.setValue(field_10_flags2, value);
-    }
-
-    /**
-     * This value is undefined and MUST be ignored
-     * @return  the fSpare0 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public byte getFSpare0()
-    {
-        return ( byte )fSpare0.getValue(field_10_flags2);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
deleted file mode 100644
index a67069b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The FibRgLw95 structure is the third section of the FIB for Word95.
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov
-    
- */
-@Internal
-public abstract class FibRgLw95AbstractType
-{
-
-    protected int field_1_cbMac;
-    @Deprecated
-    protected int field_2_reserved1;
-    @Deprecated
-    protected int field_3_reserved2;
-    @Deprecated
-    protected int field_4_reserved3;
-    @Deprecated
-    protected int field_5_reserved4;
-    protected int field_6_ccpText;
-    protected int field_7_ccpFtn;
-    protected int field_8_ccpHdd;
-    protected int field_9_ccpMcr;
-    protected int field_10_ccpAtn;
-    protected int field_11_ccpEdn;
-    protected int field_12_ccpTxbx;
-    protected int field_13_ccpHdrTxbx;
-    @Deprecated
-    protected int field_14_reserved5;
-
-    protected FibRgLw95AbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_cbMac                  = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_reserved1              = LittleEndian.getInt( data, 0x4 + offset );
-        field_3_reserved2              = LittleEndian.getInt( data, 0x8 + offset );
-        field_4_reserved3              = LittleEndian.getInt( data, 0xc + offset );
-        field_5_reserved4              = LittleEndian.getInt( data, 0x10 + offset );
-        field_6_ccpText                = LittleEndian.getInt( data, 0x14 + offset );
-        field_7_ccpFtn                 = LittleEndian.getInt( data, 0x18 + offset );
-        field_8_ccpHdd                 = LittleEndian.getInt( data, 0x1c + offset );
-        field_9_ccpMcr                 = LittleEndian.getInt( data, 0x20 + offset );
-        field_10_ccpAtn                = LittleEndian.getInt( data, 0x24 + offset );
-        field_11_ccpEdn                = LittleEndian.getInt( data, 0x28 + offset );
-        field_12_ccpTxbx               = LittleEndian.getInt( data, 0x2c + offset );
-        field_13_ccpHdrTxbx            = LittleEndian.getInt( data, 0x30 + offset );
-        field_14_reserved5             = LittleEndian.getInt( data, 0x34 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, 0x0 + offset, field_1_cbMac );
-        LittleEndian.putInt( data, 0x4 + offset, field_2_reserved1 );
-        LittleEndian.putInt( data, 0x8 + offset, field_3_reserved2 );
-        LittleEndian.putInt( data, 0xc + offset, field_4_reserved3 );
-        LittleEndian.putInt( data, 0x10 + offset, field_5_reserved4 );
-        LittleEndian.putInt( data, 0x14 + offset, field_6_ccpText );
-        LittleEndian.putInt( data, 0x18 + offset, field_7_ccpFtn );
-        LittleEndian.putInt( data, 0x1c + offset, field_8_ccpHdd );
-        LittleEndian.putInt( data, 0x20 + offset, field_9_ccpMcr );
-        LittleEndian.putInt( data, 0x24 + offset, field_10_ccpAtn );
-        LittleEndian.putInt( data, 0x28 + offset, field_11_ccpEdn );
-        LittleEndian.putInt( data, 0x2c + offset, field_12_ccpTxbx );
-        LittleEndian.putInt( data, 0x30 + offset, field_13_ccpHdrTxbx );
-        LittleEndian.putInt( data, 0x34 + offset, field_14_reserved5 );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        FibRgLw95AbstractType other = (FibRgLw95AbstractType) obj;
-        if ( field_1_cbMac != other.field_1_cbMac )
-            return false;
-        if ( field_2_reserved1 != other.field_2_reserved1 )
-            return false;
-        if ( field_3_reserved2 != other.field_3_reserved2 )
-            return false;
-        if ( field_4_reserved3 != other.field_4_reserved3 )
-            return false;
-        if ( field_5_reserved4 != other.field_5_reserved4 )
-            return false;
-        if ( field_6_ccpText != other.field_6_ccpText )
-            return false;
-        if ( field_7_ccpFtn != other.field_7_ccpFtn )
-            return false;
-        if ( field_8_ccpHdd != other.field_8_ccpHdd )
-            return false;
-        if ( field_9_ccpMcr != other.field_9_ccpMcr )
-            return false;
-        if ( field_10_ccpAtn != other.field_10_ccpAtn )
-            return false;
-        if ( field_11_ccpEdn != other.field_11_ccpEdn )
-            return false;
-        if ( field_12_ccpTxbx != other.field_12_ccpTxbx )
-            return false;
-        if ( field_13_ccpHdrTxbx != other.field_13_ccpHdrTxbx )
-            return false;
-        if ( field_14_reserved5 != other.field_14_reserved5 )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_cbMac;
-        result = prime * result + field_2_reserved1;
-        result = prime * result + field_3_reserved2;
-        result = prime * result + field_4_reserved3;
-        result = prime * result + field_5_reserved4;
-        result = prime * result + field_6_ccpText;
-        result = prime * result + field_7_ccpFtn;
-        result = prime * result + field_8_ccpHdd;
-        result = prime * result + field_9_ccpMcr;
-        result = prime * result + field_10_ccpAtn;
-        result = prime * result + field_11_ccpEdn;
-        result = prime * result + field_12_ccpTxbx;
-        result = prime * result + field_13_ccpHdrTxbx;
-        result = prime * result + field_14_reserved5;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[FibRgLw95]\n");
-        builder.append("    .cbMac                = ");
-        builder.append(" (").append(getCbMac()).append(" )\n");
-        builder.append("    .reserved1            = ");
-        builder.append(" (").append(getReserved1()).append(" )\n");
-        builder.append("    .reserved2            = ");
-        builder.append(" (").append(getReserved2()).append(" )\n");
-        builder.append("    .reserved3            = ");
-        builder.append(" (").append(getReserved3()).append(" )\n");
-        builder.append("    .reserved4            = ");
-        builder.append(" (").append(getReserved4()).append(" )\n");
-        builder.append("    .ccpText              = ");
-        builder.append(" (").append(getCcpText()).append(" )\n");
-        builder.append("    .ccpFtn               = ");
-        builder.append(" (").append(getCcpFtn()).append(" )\n");
-        builder.append("    .ccpHdd               = ");
-        builder.append(" (").append(getCcpHdd()).append(" )\n");
-        builder.append("    .ccpMcr               = ");
-        builder.append(" (").append(getCcpMcr()).append(" )\n");
-        builder.append("    .ccpAtn               = ");
-        builder.append(" (").append(getCcpAtn()).append(" )\n");
-        builder.append("    .ccpEdn               = ");
-        builder.append(" (").append(getCcpEdn()).append(" )\n");
-        builder.append("    .ccpTxbx              = ");
-        builder.append(" (").append(getCcpTxbx()).append(" )\n");
-        builder.append("    .ccpHdrTxbx           = ");
-        builder.append(" (").append(getCcpHdrTxbx()).append(" )\n");
-        builder.append("    .reserved5            = ");
-        builder.append(" (").append(getReserved5()).append(" )\n");
-
-        builder.append("[/FibRgLw95]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Get the cbMac field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCbMac()
-    {
-        return field_1_cbMac;
-    }
-
-    /**
-     * Set the cbMac field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCbMac( int field_1_cbMac )
-    {
-        this.field_1_cbMac = field_1_cbMac;
-    }
-
-    /**
-     * Get the reserved1 field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getReserved1()
-    {
-        return field_2_reserved1;
-    }
-
-    /**
-     * Set the reserved1 field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setReserved1( int field_2_reserved1 )
-    {
-        this.field_2_reserved1 = field_2_reserved1;
-    }
-
-    /**
-     * Get the reserved2 field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getReserved2()
-    {
-        return field_3_reserved2;
-    }
-
-    /**
-     * Set the reserved2 field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setReserved2( int field_3_reserved2 )
-    {
-        this.field_3_reserved2 = field_3_reserved2;
-    }
-
-    /**
-     * Get the reserved3 field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getReserved3()
-    {
-        return field_4_reserved3;
-    }
-
-    /**
-     * Set the reserved3 field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setReserved3( int field_4_reserved3 )
-    {
-        this.field_4_reserved3 = field_4_reserved3;
-    }
-
-    /**
-     * Get the reserved4 field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getReserved4()
-    {
-        return field_5_reserved4;
-    }
-
-    /**
-     * Set the reserved4 field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setReserved4( int field_5_reserved4 )
-    {
-        this.field_5_reserved4 = field_5_reserved4;
-    }
-
-    /**
-     * Get the ccpText field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpText()
-    {
-        return field_6_ccpText;
-    }
-
-    /**
-     * Set the ccpText field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpText( int field_6_ccpText )
-    {
-        this.field_6_ccpText = field_6_ccpText;
-    }
-
-    /**
-     * Get the ccpFtn field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpFtn()
-    {
-        return field_7_ccpFtn;
-    }
-
-    /**
-     * Set the ccpFtn field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpFtn( int field_7_ccpFtn )
-    {
-        this.field_7_ccpFtn = field_7_ccpFtn;
-    }
-
-    /**
-     * Get the ccpHdd field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpHdd()
-    {
-        return field_8_ccpHdd;
-    }
-
-    /**
-     * Set the ccpHdd field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpHdd( int field_8_ccpHdd )
-    {
-        this.field_8_ccpHdd = field_8_ccpHdd;
-    }
-
-    /**
-     * Get the ccpMcr field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpMcr()
-    {
-        return field_9_ccpMcr;
-    }
-
-    /**
-     * Set the ccpMcr field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpMcr( int field_9_ccpMcr )
-    {
-        this.field_9_ccpMcr = field_9_ccpMcr;
-    }
-
-    /**
-     * Get the ccpAtn field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpAtn()
-    {
-        return field_10_ccpAtn;
-    }
-
-    /**
-     * Set the ccpAtn field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpAtn( int field_10_ccpAtn )
-    {
-        this.field_10_ccpAtn = field_10_ccpAtn;
-    }
-
-    /**
-     * Get the ccpEdn field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpEdn()
-    {
-        return field_11_ccpEdn;
-    }
-
-    /**
-     * Set the ccpEdn field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpEdn( int field_11_ccpEdn )
-    {
-        this.field_11_ccpEdn = field_11_ccpEdn;
-    }
-
-    /**
-     * Get the ccpTxbx field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpTxbx()
-    {
-        return field_12_ccpTxbx;
-    }
-
-    /**
-     * Set the ccpTxbx field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpTxbx( int field_12_ccpTxbx )
-    {
-        this.field_12_ccpTxbx = field_12_ccpTxbx;
-    }
-
-    /**
-     * Get the ccpHdrTxbx field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getCcpHdrTxbx()
-    {
-        return field_13_ccpHdrTxbx;
-    }
-
-    /**
-     * Set the ccpHdrTxbx field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setCcpHdrTxbx( int field_13_ccpHdrTxbx )
-    {
-        this.field_13_ccpHdrTxbx = field_13_ccpHdrTxbx;
-    }
-
-    /**
-     * Get the reserved5 field for the FibRgLw95 record.
-     */
-    @Internal
-    public int getReserved5()
-    {
-        return field_14_reserved5;
-    }
-
-    /**
-     * Set the reserved5 field for the FibRgLw95 record.
-     */
-    @Internal
-    public void setReserved5( int field_14_reserved5 )
-    {
-        this.field_14_reserved5 = field_14_reserved5;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
deleted file mode 100644
index eee5278..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
+++ /dev/null
@@ -1,686 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The FibRgLw97 structure is the third section of the FIB. This contains an array of
-        4-byte values. <p>Class and fields descriptions are quoted from Microsoft Office Word
-        97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class FibRgLw97AbstractType
-{
-
-    protected int field_1_cbMac;
-    @Deprecated
-    protected int field_2_reserved1;
-    @Deprecated
-    protected int field_3_reserved2;
-    protected int field_4_ccpText;
-    protected int field_5_ccpFtn;
-    protected int field_6_ccpHdd;
-    @Deprecated
-    protected int field_7_reserved3;
-    protected int field_8_ccpAtn;
-    protected int field_9_ccpEdn;
-    protected int field_10_ccpTxbx;
-    protected int field_11_ccpHdrTxbx;
-    @Deprecated
-    protected int field_12_reserved4;
-    @Deprecated
-    protected int field_13_reserved5;
-    @Deprecated
-    protected int field_14_reserved6;
-    @Deprecated
-    protected int field_15_reserved7;
-    @Deprecated
-    protected int field_16_reserved8;
-    @Deprecated
-    protected int field_17_reserved9;
-    @Deprecated
-    protected int field_18_reserved10;
-    @Deprecated
-    protected int field_19_reserved11;
-    @Deprecated
-    protected int field_20_reserved12;
-    @Deprecated
-    protected int field_21_reserved13;
-    @Deprecated
-    protected int field_22_reserved14;
-
-    protected FibRgLw97AbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_cbMac                  = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_reserved1              = LittleEndian.getInt( data, 0x4 + offset );
-        field_3_reserved2              = LittleEndian.getInt( data, 0x8 + offset );
-        field_4_ccpText                = LittleEndian.getInt( data, 0xc + offset );
-        field_5_ccpFtn                 = LittleEndian.getInt( data, 0x10 + offset );
-        field_6_ccpHdd                 = LittleEndian.getInt( data, 0x14 + offset );
-        field_7_reserved3              = LittleEndian.getInt( data, 0x18 + offset );
-        field_8_ccpAtn                 = LittleEndian.getInt( data, 0x1c + offset );
-        field_9_ccpEdn                 = LittleEndian.getInt( data, 0x20 + offset );
-        field_10_ccpTxbx               = LittleEndian.getInt( data, 0x24 + offset );
-        field_11_ccpHdrTxbx            = LittleEndian.getInt( data, 0x28 + offset );
-        field_12_reserved4             = LittleEndian.getInt( data, 0x2c + offset );
-        field_13_reserved5             = LittleEndian.getInt( data, 0x30 + offset );
-        field_14_reserved6             = LittleEndian.getInt( data, 0x34 + offset );
-        field_15_reserved7             = LittleEndian.getInt( data, 0x38 + offset );
-        field_16_reserved8             = LittleEndian.getInt( data, 0x3c + offset );
-        field_17_reserved9             = LittleEndian.getInt( data, 0x40 + offset );
-        field_18_reserved10            = LittleEndian.getInt( data, 0x44 + offset );
-        field_19_reserved11            = LittleEndian.getInt( data, 0x48 + offset );
-        field_20_reserved12            = LittleEndian.getInt( data, 0x4c + offset );
-        field_21_reserved13            = LittleEndian.getInt( data, 0x50 + offset );
-        field_22_reserved14            = LittleEndian.getInt( data, 0x54 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, 0x0 + offset, field_1_cbMac );
-        LittleEndian.putInt( data, 0x4 + offset, field_2_reserved1 );
-        LittleEndian.putInt( data, 0x8 + offset, field_3_reserved2 );
-        LittleEndian.putInt( data, 0xc + offset, field_4_ccpText );
-        LittleEndian.putInt( data, 0x10 + offset, field_5_ccpFtn );
-        LittleEndian.putInt( data, 0x14 + offset, field_6_ccpHdd );
-        LittleEndian.putInt( data, 0x18 + offset, field_7_reserved3 );
-        LittleEndian.putInt( data, 0x1c + offset, field_8_ccpAtn );
-        LittleEndian.putInt( data, 0x20 + offset, field_9_ccpEdn );
-        LittleEndian.putInt( data, 0x24 + offset, field_10_ccpTxbx );
-        LittleEndian.putInt( data, 0x28 + offset, field_11_ccpHdrTxbx );
-        LittleEndian.putInt( data, 0x2c + offset, field_12_reserved4 );
-        LittleEndian.putInt( data, 0x30 + offset, field_13_reserved5 );
-        LittleEndian.putInt( data, 0x34 + offset, field_14_reserved6 );
-        LittleEndian.putInt( data, 0x38 + offset, field_15_reserved7 );
-        LittleEndian.putInt( data, 0x3c + offset, field_16_reserved8 );
-        LittleEndian.putInt( data, 0x40 + offset, field_17_reserved9 );
-        LittleEndian.putInt( data, 0x44 + offset, field_18_reserved10 );
-        LittleEndian.putInt( data, 0x48 + offset, field_19_reserved11 );
-        LittleEndian.putInt( data, 0x4c + offset, field_20_reserved12 );
-        LittleEndian.putInt( data, 0x50 + offset, field_21_reserved13 );
-        LittleEndian.putInt( data, 0x54 + offset, field_22_reserved14 );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        FibRgLw97AbstractType other = (FibRgLw97AbstractType) obj;
-        if ( field_1_cbMac != other.field_1_cbMac )
-            return false;
-        if ( field_2_reserved1 != other.field_2_reserved1 )
-            return false;
-        if ( field_3_reserved2 != other.field_3_reserved2 )
-            return false;
-        if ( field_4_ccpText != other.field_4_ccpText )
-            return false;
-        if ( field_5_ccpFtn != other.field_5_ccpFtn )
-            return false;
-        if ( field_6_ccpHdd != other.field_6_ccpHdd )
-            return false;
-        if ( field_7_reserved3 != other.field_7_reserved3 )
-            return false;
-        if ( field_8_ccpAtn != other.field_8_ccpAtn )
-            return false;
-        if ( field_9_ccpEdn != other.field_9_ccpEdn )
-            return false;
-        if ( field_10_ccpTxbx != other.field_10_ccpTxbx )
-            return false;
-        if ( field_11_ccpHdrTxbx != other.field_11_ccpHdrTxbx )
-            return false;
-        if ( field_12_reserved4 != other.field_12_reserved4 )
-            return false;
-        if ( field_13_reserved5 != other.field_13_reserved5 )
-            return false;
-        if ( field_14_reserved6 != other.field_14_reserved6 )
-            return false;
-        if ( field_15_reserved7 != other.field_15_reserved7 )
-            return false;
-        if ( field_16_reserved8 != other.field_16_reserved8 )
-            return false;
-        if ( field_17_reserved9 != other.field_17_reserved9 )
-            return false;
-        if ( field_18_reserved10 != other.field_18_reserved10 )
-            return false;
-        if ( field_19_reserved11 != other.field_19_reserved11 )
-            return false;
-        if ( field_20_reserved12 != other.field_20_reserved12 )
-            return false;
-        if ( field_21_reserved13 != other.field_21_reserved13 )
-            return false;
-        if ( field_22_reserved14 != other.field_22_reserved14 )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_cbMac;
-        result = prime * result + field_2_reserved1;
-        result = prime * result + field_3_reserved2;
-        result = prime * result + field_4_ccpText;
-        result = prime * result + field_5_ccpFtn;
-        result = prime * result + field_6_ccpHdd;
-        result = prime * result + field_7_reserved3;
-        result = prime * result + field_8_ccpAtn;
-        result = prime * result + field_9_ccpEdn;
-        result = prime * result + field_10_ccpTxbx;
-        result = prime * result + field_11_ccpHdrTxbx;
-        result = prime * result + field_12_reserved4;
-        result = prime * result + field_13_reserved5;
-        result = prime * result + field_14_reserved6;
-        result = prime * result + field_15_reserved7;
-        result = prime * result + field_16_reserved8;
-        result = prime * result + field_17_reserved9;
-        result = prime * result + field_18_reserved10;
-        result = prime * result + field_19_reserved11;
-        result = prime * result + field_20_reserved12;
-        result = prime * result + field_21_reserved13;
-        result = prime * result + field_22_reserved14;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[FibRgLw97]\n");
-        builder.append("    .cbMac                = ");
-        builder.append(" (").append(getCbMac()).append(" )\n");
-        builder.append("    .reserved1            = ");
-        builder.append(" (").append(getReserved1()).append(" )\n");
-        builder.append("    .reserved2            = ");
-        builder.append(" (").append(getReserved2()).append(" )\n");
-        builder.append("    .ccpText              = ");
-        builder.append(" (").append(getCcpText()).append(" )\n");
-        builder.append("    .ccpFtn               = ");
-        builder.append(" (").append(getCcpFtn()).append(" )\n");
-        builder.append("    .ccpHdd               = ");
-        builder.append(" (").append(getCcpHdd()).append(" )\n");
-        builder.append("    .reserved3            = ");
-        builder.append(" (").append(getReserved3()).append(" )\n");
-        builder.append("    .ccpAtn               = ");
-        builder.append(" (").append(getCcpAtn()).append(" )\n");
-        builder.append("    .ccpEdn               = ");
-        builder.append(" (").append(getCcpEdn()).append(" )\n");
-        builder.append("    .ccpTxbx              = ");
-        builder.append(" (").append(getCcpTxbx()).append(" )\n");
-        builder.append("    .ccpHdrTxbx           = ");
-        builder.append(" (").append(getCcpHdrTxbx()).append(" )\n");
-        builder.append("    .reserved4            = ");
-        builder.append(" (").append(getReserved4()).append(" )\n");
-        builder.append("    .reserved5            = ");
-        builder.append(" (").append(getReserved5()).append(" )\n");
-        builder.append("    .reserved6            = ");
-        builder.append(" (").append(getReserved6()).append(" )\n");
-        builder.append("    .reserved7            = ");
-        builder.append(" (").append(getReserved7()).append(" )\n");
-        builder.append("    .reserved8            = ");
-        builder.append(" (").append(getReserved8()).append(" )\n");
-        builder.append("    .reserved9            = ");
-        builder.append(" (").append(getReserved9()).append(" )\n");
-        builder.append("    .reserved10           = ");
-        builder.append(" (").append(getReserved10()).append(" )\n");
-        builder.append("    .reserved11           = ");
-        builder.append(" (").append(getReserved11()).append(" )\n");
-        builder.append("    .reserved12           = ");
-        builder.append(" (").append(getReserved12()).append(" )\n");
-        builder.append("    .reserved13           = ");
-        builder.append(" (").append(getReserved13()).append(" )\n");
-        builder.append("    .reserved14           = ");
-        builder.append(" (").append(getReserved14()).append(" )\n");
-
-        builder.append("[/FibRgLw97]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Specifies the count of bytes of those written to the WordDocument stream of the file that have any meaning. All bytes in the WordDocument stream at offset cbMac and greater MUST be ignored..
-     */
-    @Internal
-    public int getCbMac()
-    {
-        return field_1_cbMac;
-    }
-
-    /**
-     * Specifies the count of bytes of those written to the WordDocument stream of the file that have any meaning. All bytes in the WordDocument stream at offset cbMac and greater MUST be ignored..
-     */
-    @Internal
-    public void setCbMac( int field_1_cbMac )
-    {
-        this.field_1_cbMac = field_1_cbMac;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved1()
-    {
-        return field_2_reserved1;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved1( int field_2_reserved1 )
-    {
-        this.field_2_reserved1 = field_2_reserved1;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved2()
-    {
-        return field_3_reserved2;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved2( int field_3_reserved2 )
-    {
-        this.field_3_reserved2 = field_3_reserved2;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the main document. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public int getCcpText()
-    {
-        return field_4_ccpText;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the main document. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public void setCcpText( int field_4_ccpText )
-    {
-        this.field_4_ccpText = field_4_ccpText;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the footnote subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public int getCcpFtn()
-    {
-        return field_5_ccpFtn;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the footnote subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public void setCcpFtn( int field_5_ccpFtn )
-    {
-        this.field_5_ccpFtn = field_5_ccpFtn;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the header subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public int getCcpHdd()
-    {
-        return field_6_ccpHdd;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the header subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public void setCcpHdd( int field_6_ccpHdd )
-    {
-        this.field_6_ccpHdd = field_6_ccpHdd;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved3()
-    {
-        return field_7_reserved3;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved3( int field_7_reserved3 )
-    {
-        this.field_7_reserved3 = field_7_reserved3;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the comment subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public int getCcpAtn()
-    {
-        return field_8_ccpAtn;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the comment subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public void setCcpAtn( int field_8_ccpAtn )
-    {
-        this.field_8_ccpAtn = field_8_ccpAtn;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the endnote subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public int getCcpEdn()
-    {
-        return field_9_ccpEdn;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the endnote subdocument. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public void setCcpEdn( int field_9_ccpEdn )
-    {
-        this.field_9_ccpEdn = field_9_ccpEdn;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the textbox subdocument of the main document. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public int getCcpTxbx()
-    {
-        return field_10_ccpTxbx;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the textbox subdocument of the main document. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public void setCcpTxbx( int field_10_ccpTxbx )
-    {
-        this.field_10_ccpTxbx = field_10_ccpTxbx;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the textbox subdocument of the header. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public int getCcpHdrTxbx()
-    {
-        return field_11_ccpHdrTxbx;
-    }
-
-    /**
-     * A signed integer that specifies the count of CPs in the textbox subdocument of the header. This value MUST be zero, 1, or greater.
-     */
-    @Internal
-    public void setCcpHdrTxbx( int field_11_ccpHdrTxbx )
-    {
-        this.field_11_ccpHdrTxbx = field_11_ccpHdrTxbx;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved4()
-    {
-        return field_12_reserved4;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved4( int field_12_reserved4 )
-    {
-        this.field_12_reserved4 = field_12_reserved4;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved5()
-    {
-        return field_13_reserved5;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved5( int field_13_reserved5 )
-    {
-        this.field_13_reserved5 = field_13_reserved5;
-    }
-
-    /**
-     * This value MUST be equal or less than the number of data elements in PlcBteChpx, as specified by FibRgFcLcb97.fcPlcfBteChpx and FibRgFcLcb97.lcbPlcfBteChpx. This value MUST be ignored.
-     */
-    @Internal
-    public int getReserved6()
-    {
-        return field_14_reserved6;
-    }
-
-    /**
-     * This value MUST be equal or less than the number of data elements in PlcBteChpx, as specified by FibRgFcLcb97.fcPlcfBteChpx and FibRgFcLcb97.lcbPlcfBteChpx. This value MUST be ignored.
-     */
-    @Internal
-    public void setReserved6( int field_14_reserved6 )
-    {
-        this.field_14_reserved6 = field_14_reserved6;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved7()
-    {
-        return field_15_reserved7;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved7( int field_15_reserved7 )
-    {
-        this.field_15_reserved7 = field_15_reserved7;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved8()
-    {
-        return field_16_reserved8;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved8( int field_16_reserved8 )
-    {
-        this.field_16_reserved8 = field_16_reserved8;
-    }
-
-    /**
-     * This value MUST be less than or equal to the number of data elements in PlcBtePapx, as specified by FibRgFcLcb97.fcPlcfBtePapx and FibRgFcLcb97.lcbPlcfBtePapx. This value MUST be ignored.
-     */
-    @Internal
-    public int getReserved9()
-    {
-        return field_17_reserved9;
-    }
-
-    /**
-     * This value MUST be less than or equal to the number of data elements in PlcBtePapx, as specified by FibRgFcLcb97.fcPlcfBtePapx and FibRgFcLcb97.lcbPlcfBtePapx. This value MUST be ignored.
-     */
-    @Internal
-    public void setReserved9( int field_17_reserved9 )
-    {
-        this.field_17_reserved9 = field_17_reserved9;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved10()
-    {
-        return field_18_reserved10;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved10( int field_18_reserved10 )
-    {
-        this.field_18_reserved10 = field_18_reserved10;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getReserved11()
-    {
-        return field_19_reserved11;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved11( int field_19_reserved11 )
-    {
-        this.field_19_reserved11 = field_19_reserved11;
-    }
-
-    /**
-     * This value SHOULD be zero, and MUST be ignored.
-     */
-    @Internal
-    public int getReserved12()
-    {
-        return field_20_reserved12;
-    }
-
-    /**
-     * This value SHOULD be zero, and MUST be ignored.
-     */
-    @Internal
-    public void setReserved12( int field_20_reserved12 )
-    {
-        this.field_20_reserved12 = field_20_reserved12;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public int getReserved13()
-    {
-        return field_21_reserved13;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public void setReserved13( int field_21_reserved13 )
-    {
-        this.field_21_reserved13 = field_21_reserved13;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public int getReserved14()
-    {
-        return field_22_reserved14;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public void setReserved14( int field_22_reserved14 )
-    {
-        this.field_22_reserved14 = field_22_reserved14;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
deleted file mode 100644
index 6dbc944..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The FibRgW97 structure is a variable-length portion of the Fib. <p>Class and
-        fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and
-        [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class FibRgW97AbstractType
-{
-
-    @Deprecated
-    protected short field_1_reserved1;
-    @Deprecated
-    protected short field_2_reserved2;
-    @Deprecated
-    protected short field_3_reserved3;
-    @Deprecated
-    protected short field_4_reserved4;
-    @Deprecated
-    protected short field_5_reserved5;
-    @Deprecated
-    protected short field_6_reserved6;
-    @Deprecated
-    protected short field_7_reserved7;
-    @Deprecated
-    protected short field_8_reserved8;
-    @Deprecated
-    protected short field_9_reserved9;
-    @Deprecated
-    protected short field_10_reserved10;
-    @Deprecated
-    protected short field_11_reserved11;
-    @Deprecated
-    protected short field_12_reserved12;
-    @Deprecated
-    protected short field_13_reserved13;
-    protected short field_14_lidFE;
-
-    protected FibRgW97AbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_reserved1              = LittleEndian.getShort( data, 0x0 + offset );
-        field_2_reserved2              = LittleEndian.getShort( data, 0x2 + offset );
-        field_3_reserved3              = LittleEndian.getShort( data, 0x4 + offset );
-        field_4_reserved4              = LittleEndian.getShort( data, 0x6 + offset );
-        field_5_reserved5              = LittleEndian.getShort( data, 0x8 + offset );
-        field_6_reserved6              = LittleEndian.getShort( data, 0xa + offset );
-        field_7_reserved7              = LittleEndian.getShort( data, 0xc + offset );
-        field_8_reserved8              = LittleEndian.getShort( data, 0xe + offset );
-        field_9_reserved9              = LittleEndian.getShort( data, 0x10 + offset );
-        field_10_reserved10            = LittleEndian.getShort( data, 0x12 + offset );
-        field_11_reserved11            = LittleEndian.getShort( data, 0x14 + offset );
-        field_12_reserved12            = LittleEndian.getShort( data, 0x16 + offset );
-        field_13_reserved13            = LittleEndian.getShort( data, 0x18 + offset );
-        field_14_lidFE                 = LittleEndian.getShort( data, 0x1a + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putShort( data, 0x0 + offset, field_1_reserved1 );
-        LittleEndian.putShort( data, 0x2 + offset, field_2_reserved2 );
-        LittleEndian.putShort( data, 0x4 + offset, field_3_reserved3 );
-        LittleEndian.putShort( data, 0x6 + offset, field_4_reserved4 );
-        LittleEndian.putShort( data, 0x8 + offset, field_5_reserved5 );
-        LittleEndian.putShort( data, 0xa + offset, field_6_reserved6 );
-        LittleEndian.putShort( data, 0xc + offset, field_7_reserved7 );
-        LittleEndian.putShort( data, 0xe + offset, field_8_reserved8 );
-        LittleEndian.putShort( data, 0x10 + offset, field_9_reserved9 );
-        LittleEndian.putShort( data, 0x12 + offset, field_10_reserved10 );
-        LittleEndian.putShort( data, 0x14 + offset, field_11_reserved11 );
-        LittleEndian.putShort( data, 0x16 + offset, field_12_reserved12 );
-        LittleEndian.putShort( data, 0x18 + offset, field_13_reserved13 );
-        LittleEndian.putShort( data, 0x1a + offset, field_14_lidFE );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[FibRgW97]\n");
-        builder.append("    .reserved1            = ");
-        builder.append(" (").append(getReserved1()).append(" )\n");
-        builder.append("    .reserved2            = ");
-        builder.append(" (").append(getReserved2()).append(" )\n");
-        builder.append("    .reserved3            = ");
-        builder.append(" (").append(getReserved3()).append(" )\n");
-        builder.append("    .reserved4            = ");
-        builder.append(" (").append(getReserved4()).append(" )\n");
-        builder.append("    .reserved5            = ");
-        builder.append(" (").append(getReserved5()).append(" )\n");
-        builder.append("    .reserved6            = ");
-        builder.append(" (").append(getReserved6()).append(" )\n");
-        builder.append("    .reserved7            = ");
-        builder.append(" (").append(getReserved7()).append(" )\n");
-        builder.append("    .reserved8            = ");
-        builder.append(" (").append(getReserved8()).append(" )\n");
-        builder.append("    .reserved9            = ");
-        builder.append(" (").append(getReserved9()).append(" )\n");
-        builder.append("    .reserved10           = ");
-        builder.append(" (").append(getReserved10()).append(" )\n");
-        builder.append("    .reserved11           = ");
-        builder.append(" (").append(getReserved11()).append(" )\n");
-        builder.append("    .reserved12           = ");
-        builder.append(" (").append(getReserved12()).append(" )\n");
-        builder.append("    .reserved13           = ");
-        builder.append(" (").append(getReserved13()).append(" )\n");
-        builder.append("    .lidFE                = ");
-        builder.append(" (").append(getLidFE()).append(" )\n");
-
-        builder.append("[/FibRgW97]\n");
-        return builder.toString();
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved1()
-    {
-        return field_1_reserved1;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved1( short field_1_reserved1 )
-    {
-        this.field_1_reserved1 = field_1_reserved1;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved2()
-    {
-        return field_2_reserved2;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved2( short field_2_reserved2 )
-    {
-        this.field_2_reserved2 = field_2_reserved2;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved3()
-    {
-        return field_3_reserved3;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved3( short field_3_reserved3 )
-    {
-        this.field_3_reserved3 = field_3_reserved3;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved4()
-    {
-        return field_4_reserved4;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved4( short field_4_reserved4 )
-    {
-        this.field_4_reserved4 = field_4_reserved4;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved5()
-    {
-        return field_5_reserved5;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved5( short field_5_reserved5 )
-    {
-        this.field_5_reserved5 = field_5_reserved5;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved6()
-    {
-        return field_6_reserved6;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved6( short field_6_reserved6 )
-    {
-        this.field_6_reserved6 = field_6_reserved6;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved7()
-    {
-        return field_7_reserved7;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved7( short field_7_reserved7 )
-    {
-        this.field_7_reserved7 = field_7_reserved7;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved8()
-    {
-        return field_8_reserved8;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved8( short field_8_reserved8 )
-    {
-        this.field_8_reserved8 = field_8_reserved8;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved9()
-    {
-        return field_9_reserved9;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved9( short field_9_reserved9 )
-    {
-        this.field_9_reserved9 = field_9_reserved9;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved10()
-    {
-        return field_10_reserved10;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved10( short field_10_reserved10 )
-    {
-        this.field_10_reserved10 = field_10_reserved10;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved11()
-    {
-        return field_11_reserved11;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved11( short field_11_reserved11 )
-    {
-        this.field_11_reserved11 = field_11_reserved11;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved12()
-    {
-        return field_12_reserved12;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved12( short field_12_reserved12 )
-    {
-        this.field_12_reserved12 = field_12_reserved12;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public short getReserved13()
-    {
-        return field_13_reserved13;
-    }
-
-    /**
-     * This value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setReserved13( short field_13_reserved13 )
-    {
-        this.field_13_reserved13 = field_13_reserved13;
-    }
-
-    /**
-     * A LID whose meaning depends on the nFib value.
-     */
-    @Internal
-    public short getLidFE()
-    {
-        return field_14_lidFE;
-    }
-
-    /**
-     * A LID whose meaning depends on the nFib value.
-     */
-    @Internal
-    public void setLidFE( short field_14_lidFE )
-    {
-        this.field_14_lidFE = field_14_lidFE;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
deleted file mode 100644
index 511f922..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-
-/**
- * The grfhic structure is a set of HTML incompatibility flags that specify the HTML
-        incompatibilities of a list structure. The values specify possible incompatibilities between
-        an LVL or LVLF and HTML lists. The values do not define list properties. <p>Class and
-        fields descriptions are quoted from [MS-DOC] -- v20110315 Word (.doc) Binary File Format
-        specification
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to [MS-DOC] -- v20110315 Word (.doc) Binary File Format
-        specification
-    
- */
-@Internal
-public abstract class GrfhicAbstractType
-{
-
-    protected byte field_1_grfhic;
-    /**/private static final BitField fHtmlChecked = new BitField(0x01);
-    /**/private static final BitField fHtmlUnsupported = new BitField(0x02);
-    /**/private static final BitField fHtmlListTextNotSharpDot = new BitField(0x04);
-    /**/private static final BitField fHtmlNotPeriod = new BitField(0x08);
-    /**/private static final BitField fHtmlFirstLineMismatch = new BitField(0x10);
-    /**/private static final BitField fHtmlTabLeftIndentMismatch = new BitField(0x20);
-    /**/private static final BitField fHtmlHangingIndentBeneathNumber = new BitField(0x40);
-    /**/private static final BitField fHtmlBuiltInBullet = new BitField(0x80);
-
-    protected GrfhicAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_grfhic                 = data[ 0x0 + offset ];
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        data[ 0x0 + offset ] = field_1_grfhic;
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 1;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        GrfhicAbstractType other = (GrfhicAbstractType) obj;
-        if ( field_1_grfhic != other.field_1_grfhic )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_grfhic;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append("[Grfhic]\n");
-        builder.append( "    .grfhic               = " );
-        builder.append(" ( ").append( field_1_grfhic ).append( " )\n" );
-        builder.append("         .fHtmlChecked             = ").append(isFHtmlChecked()).append('\n');
-        builder.append("         .fHtmlUnsupported         = ").append(isFHtmlUnsupported()).append('\n');
-        builder.append("         .fHtmlListTextNotSharpDot     = ").append(isFHtmlListTextNotSharpDot()).append('\n');
-        builder.append("         .fHtmlNotPeriod           = ").append(isFHtmlNotPeriod()).append('\n');
-        builder.append("         .fHtmlFirstLineMismatch     = ").append(isFHtmlFirstLineMismatch()).append('\n');
-        builder.append("         .fHtmlTabLeftIndentMismatch     = ").append(isFHtmlTabLeftIndentMismatch()).append('\n');
-        builder.append("         .fHtmlHangingIndentBeneathNumber     = ").append(isFHtmlHangingIndentBeneathNumber()).append('\n');
-        builder.append("         .fHtmlBuiltInBullet       = ").append(isFHtmlBuiltInBullet()).append('\n');
-
-        builder.append("[/Grfhic]");
-        return builder.toString();
-    }
-
-    /**
-     * HTML compatibility flags.
-     */
-    @Internal
-    public byte getGrfhic()
-    {
-        return field_1_grfhic;
-    }
-
-    /**
-     * HTML compatibility flags.
-     */
-    @Internal
-    public void setGrfhic( byte field_1_grfhic )
-    {
-        this.field_1_grfhic = field_1_grfhic;
-    }
-
-    /**
-     * Sets the fHtmlChecked field value.
-     * Checked
-     */
-    @Internal
-    public void setFHtmlChecked( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlChecked.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * Checked
-     * @return  the fHtmlChecked field value.
-     */
-    @Internal
-    public boolean isFHtmlChecked()
-    {
-        return fHtmlChecked.isSet(field_1_grfhic);
-    }
-
-    /**
-     * Sets the fHtmlUnsupported field value.
-     * The numbering sequence or format is unsupported (includes tab & size)
-     */
-    @Internal
-    public void setFHtmlUnsupported( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlUnsupported.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * The numbering sequence or format is unsupported (includes tab & size)
-     * @return  the fHtmlUnsupported field value.
-     */
-    @Internal
-    public boolean isFHtmlUnsupported()
-    {
-        return fHtmlUnsupported.isSet(field_1_grfhic);
-    }
-
-    /**
-     * Sets the fHtmlListTextNotSharpDot field value.
-     * The list text is not "#."
-     */
-    @Internal
-    public void setFHtmlListTextNotSharpDot( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlListTextNotSharpDot.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * The list text is not "#."
-     * @return  the fHtmlListTextNotSharpDot field value.
-     */
-    @Internal
-    public boolean isFHtmlListTextNotSharpDot()
-    {
-        return fHtmlListTextNotSharpDot.isSet(field_1_grfhic);
-    }
-
-    /**
-     * Sets the fHtmlNotPeriod field value.
-     * Something other than a period is used
-     */
-    @Internal
-    public void setFHtmlNotPeriod( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlNotPeriod.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * Something other than a period is used
-     * @return  the fHtmlNotPeriod field value.
-     */
-    @Internal
-    public boolean isFHtmlNotPeriod()
-    {
-        return fHtmlNotPeriod.isSet(field_1_grfhic);
-    }
-
-    /**
-     * Sets the fHtmlFirstLineMismatch field value.
-     * First line indent mismatch
-     */
-    @Internal
-    public void setFHtmlFirstLineMismatch( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlFirstLineMismatch.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * First line indent mismatch
-     * @return  the fHtmlFirstLineMismatch field value.
-     */
-    @Internal
-    public boolean isFHtmlFirstLineMismatch()
-    {
-        return fHtmlFirstLineMismatch.isSet(field_1_grfhic);
-    }
-
-    /**
-     * Sets the fHtmlTabLeftIndentMismatch field value.
-     * The list tab and the dxaLeft don't match (need table?)
-     */
-    @Internal
-    public void setFHtmlTabLeftIndentMismatch( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlTabLeftIndentMismatch.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * The list tab and the dxaLeft don't match (need table?)
-     * @return  the fHtmlTabLeftIndentMismatch field value.
-     */
-    @Internal
-    public boolean isFHtmlTabLeftIndentMismatch()
-    {
-        return fHtmlTabLeftIndentMismatch.isSet(field_1_grfhic);
-    }
-
-    /**
-     * Sets the fHtmlHangingIndentBeneathNumber field value.
-     * The hanging indent falls beneath the number (need plain text)
-     */
-    @Internal
-    public void setFHtmlHangingIndentBeneathNumber( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlHangingIndentBeneathNumber.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * The hanging indent falls beneath the number (need plain text)
-     * @return  the fHtmlHangingIndentBeneathNumber field value.
-     */
-    @Internal
-    public boolean isFHtmlHangingIndentBeneathNumber()
-    {
-        return fHtmlHangingIndentBeneathNumber.isSet(field_1_grfhic);
-    }
-
-    /**
-     * Sets the fHtmlBuiltInBullet field value.
-     * A built-in HTML bullet
-     */
-    @Internal
-    public void setFHtmlBuiltInBullet( boolean value )
-    {
-        field_1_grfhic = (byte)fHtmlBuiltInBullet.setBoolean(field_1_grfhic, value);
-    }
-
-    /**
-     * A built-in HTML bullet
-     * @return  the fHtmlBuiltInBullet field value.
-     */
-    @Internal
-    public boolean isFHtmlBuiltInBullet()
-    {
-        return fHtmlBuiltInBullet.isSet(field_1_grfhic);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
deleted file mode 100644
index 7c4f5d6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.Internal;
-
-/**
- * Hyphenation (HRESI).
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format (.doc) Specification
- * 
- * NOTE: This source is automatically generated please do not modify this file.
- * Either subclass or remove the record in src/types/definitions.
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format (.doc) Specification
- */
-@Internal
-public abstract class HRESIAbstractType
-{
-
-    protected byte field_1_hres;
-    /**/public final static byte HRES_NO = 0;
-    /**/public final static byte HRES_NORMAL = 1;
-    /**/public final static byte HRES_ADD_LETTER_BEFORE = 2;
-    /**/public final static byte HRES_CHANGE_LETTER_BEFORE = 3;
-    /**/public final static byte HRES_DELETE_LETTER_BEFORE = 4;
-    /**/public final static byte HRES_CHANGE_LETTER_AFTER = 5;
-    /**/public final static byte HRES_DELETE_BEFORE_CHANGE_BEFORE = 6;
-    protected byte field_2_chHres;
-
-    protected HRESIAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_hres                   = data[ 0x0 + offset ];
-        field_2_chHres                 = data[ 0x1 + offset ];
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        data[ 0x0 + offset] = field_1_hres;
-        data[ 0x1 + offset] = field_2_chHres;
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public static int getSize()
-    {
-        return 4 +  + 1 + 1;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[HRESI]\n");
-        builder.append("    .hres                 = ");
-        builder.append(" (").append(getHres()).append(" )\n");
-        builder.append("    .chHres               = ");
-        builder.append(" (").append(getChHres()).append(" )\n");
-
-        builder.append("[/HRESI]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Hyphenation rule.
-     *
-     * @return One of 
-     * <li>{@link #HRES_NO}
-     * <li>{@link #HRES_NORMAL}
-     * <li>{@link #HRES_ADD_LETTER_BEFORE}
-     * <li>{@link #HRES_CHANGE_LETTER_BEFORE}
-     * <li>{@link #HRES_DELETE_LETTER_BEFORE}
-     * <li>{@link #HRES_CHANGE_LETTER_AFTER}
-     * <li>{@link #HRES_DELETE_BEFORE_CHANGE_BEFORE}
-     */
-    public byte getHres()
-    {
-        return field_1_hres;
-    }
-
-    /**
-     * Hyphenation rule.
-     *
-     * @param field_1_hres
-     *        One of 
-     * <li>{@link #HRES_NO}
-     * <li>{@link #HRES_NORMAL}
-     * <li>{@link #HRES_ADD_LETTER_BEFORE}
-     * <li>{@link #HRES_CHANGE_LETTER_BEFORE}
-     * <li>{@link #HRES_DELETE_LETTER_BEFORE}
-     * <li>{@link #HRES_CHANGE_LETTER_AFTER}
-     * <li>{@link #HRES_DELETE_BEFORE_CHANGE_BEFORE}
-     */
-    public void setHres( byte field_1_hres )
-    {
-        this.field_1_hres = field_1_hres;
-    }
-
-    /**
-     * The character that will be used to add or change a letter when hres is 2, 3, 5 or 6.
-     */
-    public byte getChHres()
-    {
-        return field_2_chHres;
-    }
-
-    /**
-     * The character that will be used to add or change a letter when hres is 2, 3, 5 or 6.
-     */
-    public void setChHres( byte field_2_chHres )
-    {
-        this.field_2_chHres = field_2_chHres;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java
deleted file mode 100644
index 0289ef2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.hwpf.model.Grfhic;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * List Format Override (LFO). <p>Class and fields descriptions are quoted from
-        [MS-DOC] --v20110315; Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to [MS-DOC] --v20110315; Word (.doc) Binary File Format;
-        Copyright (c) Microsoft Corporation
-    
- */
-@Internal
-public abstract class LFOAbstractType
-{
-
-    protected int field_1_lsid;
-    protected int field_2_unused1;
-    protected int field_3_unused2;
-    protected byte field_4_clfolvl;
-    protected byte field_5_ibstFltAutoNum;
-    protected Grfhic field_6_grfhic;
-    protected byte field_7_unused3;
-
-    protected LFOAbstractType()
-    {
-        this.field_6_grfhic = new Grfhic();
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_lsid                   = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_unused1                = LittleEndian.getInt( data, 0x4 + offset );
-        field_3_unused2                = LittleEndian.getInt( data, 0x8 + offset );
-        field_4_clfolvl                = data[ 0xc + offset ];
-        field_5_ibstFltAutoNum         = data[ 0xd + offset ];
-        field_6_grfhic                 = new Grfhic( data, 0xe + offset );
-        field_7_unused3                = data[ 0xf + offset ];
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, 0x0 + offset, field_1_lsid );
-        LittleEndian.putInt( data, 0x4 + offset, field_2_unused1 );
-        LittleEndian.putInt( data, 0x8 + offset, field_3_unused2 );
-        data[ 0xc + offset ] = field_4_clfolvl;
-        data[ 0xd + offset ] = field_5_ibstFltAutoNum;
-        field_6_grfhic.serialize( data, 0xe + offset );
-        data[ 0xf + offset ] = field_7_unused3;
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 4 + 4 + 1 + 1 + 1 + 1;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        LFOAbstractType other = (LFOAbstractType) obj;
-        if ( field_1_lsid != other.field_1_lsid )
-            return false;
-        if ( field_2_unused1 != other.field_2_unused1 )
-            return false;
-        if ( field_3_unused2 != other.field_3_unused2 )
-            return false;
-        if ( field_4_clfolvl != other.field_4_clfolvl )
-            return false;
-        if ( field_5_ibstFltAutoNum != other.field_5_ibstFltAutoNum )
-            return false;
-        if ( field_6_grfhic == null )
-        {
-            if ( other.field_6_grfhic != null )
-                return false;
-        }
-        else if ( !field_6_grfhic.equals( other.field_6_grfhic ) )
-            return false;
-        if ( field_7_unused3 != other.field_7_unused3 )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_lsid;
-        result = prime * result + field_2_unused1;
-        result = prime * result + field_3_unused2;
-        result = prime * result + field_4_clfolvl;
-        result = prime * result + field_5_ibstFltAutoNum;
-        result = prime * result
-                + ((field_6_grfhic == null) ? 0 : field_6_grfhic.hashCode());
-        result = prime * result + field_7_unused3;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append("[LFO]\n");
-        builder.append( "    .lsid                 = " );
-        builder.append(" ( ").append( field_1_lsid ).append( " )\n" );
-        builder.append( "    .unused1              = " );
-        builder.append(" ( ").append( field_2_unused1 ).append( " )\n" );
-        builder.append( "    .unused2              = " );
-        builder.append(" ( ").append( field_3_unused2 ).append( " )\n" );
-        builder.append( "    .clfolvl              = " );
-        builder.append(" ( ").append( field_4_clfolvl ).append( " )\n" );
-        builder.append( "    .ibstFltAutoNum       = " );
-        builder.append(" ( ").append( field_5_ibstFltAutoNum ).append( " )\n" );
-        builder.append( "    .grfhic               = " );
-        builder.append(" ( ").append( field_6_grfhic == null ? "null" : field_6_grfhic.toString().replaceAll( "\n", "\n    " ) ).append( " )\n" );
-        builder.append( "    .unused3              = " );
-        builder.append(" ( ").append( field_7_unused3 ).append( " )\n" );
-
-        builder.append("[/LFO]");
-        return builder.toString();
-    }
-
-    /**
-     * A signed integer that specifies the list identifier of an LSTF. This LFO corresponds to the LSTF in PlfLst.rgLstf that has an lsid whose value is equal to this value..
-     */
-    @Internal
-    public int getLsid()
-    {
-        return field_1_lsid;
-    }
-
-    /**
-     * A signed integer that specifies the list identifier of an LSTF. This LFO corresponds to the LSTF in PlfLst.rgLstf that has an lsid whose value is equal to this value..
-     */
-    @Internal
-    public void setLsid( int field_1_lsid )
-    {
-        this.field_1_lsid = field_1_lsid;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public int getUnused1()
-    {
-        return field_2_unused1;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public void setUnused1( int field_2_unused1 )
-    {
-        this.field_2_unused1 = field_2_unused1;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public int getUnused2()
-    {
-        return field_3_unused2;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public void setUnused2( int field_3_unused2 )
-    {
-        this.field_3_unused2 = field_3_unused2;
-    }
-
-    /**
-     * An unsigned integer that specifies the field that this LFO represents..
-     */
-    @Internal
-    public byte getClfolvl()
-    {
-        return field_4_clfolvl;
-    }
-
-    /**
-     * An unsigned integer that specifies the field that this LFO represents..
-     */
-    @Internal
-    public void setClfolvl( byte field_4_clfolvl )
-    {
-        this.field_4_clfolvl = field_4_clfolvl;
-    }
-
-    /**
-     * Used for AUTONUM field emulation.
-     */
-    @Internal
-    public byte getIbstFltAutoNum()
-    {
-        return field_5_ibstFltAutoNum;
-    }
-
-    /**
-     * Used for AUTONUM field emulation.
-     */
-    @Internal
-    public void setIbstFltAutoNum( byte field_5_ibstFltAutoNum )
-    {
-        this.field_5_ibstFltAutoNum = field_5_ibstFltAutoNum;
-    }
-
-    /**
-     * HTML compatibility flags.
-     */
-    @Internal
-    public Grfhic getGrfhic()
-    {
-        return field_6_grfhic;
-    }
-
-    /**
-     * HTML compatibility flags.
-     */
-    @Internal
-    public void setGrfhic( Grfhic field_6_grfhic )
-    {
-        this.field_6_grfhic = field_6_grfhic;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public byte getUnused3()
-    {
-        return field_7_unused3;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public void setUnused3( byte field_7_unused3 )
-    {
-        this.field_7_unused3 = field_7_unused3;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
deleted file mode 100644
index 9e304b9..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The LFOLVL structure contains information that is used to override the formatting
-        information of a corresponding LVL. <p>Class and fields descriptions are quoted from
-        Microsoft Office Word 97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary
-        File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class LFOLVLBaseAbstractType
-{
-
-    protected int field_1_iStartAt;
-    protected int field_2_flags;
-    /**/private static final BitField iLvl = new BitField(0x0000000F);
-    /**/private static final BitField fStartAt = new BitField(0x00000010);
-    /**/private static final BitField fFormatting = new BitField(0x00000020);
-    /**/private static final BitField grfhic = new BitField(0x00003FC0);
-    /**/private static final BitField unused1 = new BitField(0x1FFFC000);
-    /**/private static final BitField unused2 = new BitField(0xE0000000);
-
-    protected LFOLVLBaseAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_iStartAt               = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_flags                  = LittleEndian.getInt( data, 0x4 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, 0x0 + offset, field_1_iStartAt );
-        LittleEndian.putInt( data, 0x4 + offset, field_2_flags );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 4;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        LFOLVLBaseAbstractType other = (LFOLVLBaseAbstractType) obj;
-        if ( field_1_iStartAt != other.field_1_iStartAt )
-            return false;
-        if ( field_2_flags != other.field_2_flags )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_iStartAt;
-        result = prime * result + field_2_flags;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[LFOLVLBase]\n");
-        builder.append("    .iStartAt             = ");
-        builder.append(" (").append(getIStartAt()).append(" )\n");
-        builder.append("    .flags                = ");
-        builder.append(" (").append(getFlags()).append(" )\n");
-        builder.append("         .iLvl                     = ").append(getILvl()).append('\n');
-        builder.append("         .fStartAt                 = ").append(isFStartAt()).append('\n');
-        builder.append("         .fFormatting              = ").append(isFFormatting()).append('\n');
-        builder.append("         .grfhic                   = ").append(getGrfhic()).append('\n');
-        builder.append("         .unused1                  = ").append(getUnused1()).append('\n');
-        builder.append("         .unused2                  = ").append(getUnused2()).append('\n');
-
-        builder.append("[/LFOLVLBase]\n");
-        return builder.toString();
-    }
-
-    /**
-     * If fStartAt is set to 0x1, this is a signed integer that specifies the start-at value that overrides lvlf.iStartAt of the corresponding LVL. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If both fStartAt and fFormatting are set to 0x1, or if fStartAt is set to 0x0, this value is undefined and MUST be ignored.
-     */
-    @Internal
-    public int getIStartAt()
-    {
-        return field_1_iStartAt;
-    }
-
-    /**
-     * If fStartAt is set to 0x1, this is a signed integer that specifies the start-at value that overrides lvlf.iStartAt of the corresponding LVL. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If both fStartAt and fFormatting are set to 0x1, or if fStartAt is set to 0x0, this value is undefined and MUST be ignored.
-     */
-    @Internal
-    public void setIStartAt( int field_1_iStartAt )
-    {
-        this.field_1_iStartAt = field_1_iStartAt;
-    }
-
-    /**
-     * Get the flags field for the LFOLVLBase record.
-     */
-    @Internal
-    public int getFlags()
-    {
-        return field_2_flags;
-    }
-
-    /**
-     * Set the flags field for the LFOLVLBase record.
-     */
-    @Internal
-    public void setFlags( int field_2_flags )
-    {
-        this.field_2_flags = field_2_flags;
-    }
-
-    /**
-     * Sets the iLvl field value.
-     * An unsigned integer that specifies the zero-based level of the list that this overrides. This LFOLVL overrides the LVL that specifies the level formatting of this level of the LSTF that is specified by the lsid field of the LFO to which this LFOLVL corresponds. This value MUST be less than or equal to 0x08
-     */
-    @Internal
-    public void setILvl( byte value )
-    {
-        field_2_flags = iLvl.setValue(field_2_flags, value);
-    }
-
-    /**
-     * An unsigned integer that specifies the zero-based level of the list that this overrides. This LFOLVL overrides the LVL that specifies the level formatting of this level of the LSTF that is specified by the lsid field of the LFO to which this LFOLVL corresponds. This value MUST be less than or equal to 0x08
-     * @return  the iLvl field value.
-     */
-    @Internal
-    public byte getILvl()
-    {
-        return ( byte )iLvl.getValue(field_2_flags);
-    }
-
-    /**
-     * Sets the fStartAt field value.
-     * A bit that specifies whether this LFOLVL overrides the start-at value of the level.
-     */
-    @Internal
-    public void setFStartAt( boolean value )
-    {
-        field_2_flags = fStartAt.setBoolean(field_2_flags, value);
-    }
-
-    /**
-     * A bit that specifies whether this LFOLVL overrides the start-at value of the level.
-     * @return  the fStartAt field value.
-     */
-    @Internal
-    public boolean isFStartAt()
-    {
-        return fStartAt.isSet(field_2_flags);
-    }
-
-    /**
-     * Sets the fFormatting field value.
-     * A bit that specifies whether lvl is an LVL that overrides the corresponding LVL
-     */
-    @Internal
-    public void setFFormatting( boolean value )
-    {
-        field_2_flags = fFormatting.setBoolean(field_2_flags, value);
-    }
-
-    /**
-     * A bit that specifies whether lvl is an LVL that overrides the corresponding LVL
-     * @return  the fFormatting field value.
-     */
-    @Internal
-    public boolean isFFormatting()
-    {
-        return fFormatting.isSet(field_2_flags);
-    }
-
-    /**
-     * Sets the grfhic field value.
-     * A grfhic that specifies the HTML incompatibilities of the overriding level formatting
-     */
-    @Internal
-    public void setGrfhic( short value )
-    {
-        field_2_flags = grfhic.setValue(field_2_flags, value);
-    }
-
-    /**
-     * A grfhic that specifies the HTML incompatibilities of the overriding level formatting
-     * @return  the grfhic field value.
-     */
-    @Internal
-    public short getGrfhic()
-    {
-        return ( short )grfhic.getValue(field_2_flags);
-    }
-
-    /**
-     * Sets the unused1 field value.
-     * This MUST be ignored
-     */
-    @Internal
-    public void setUnused1( short value )
-    {
-        field_2_flags = unused1.setValue(field_2_flags, value);
-    }
-
-    /**
-     * This MUST be ignored
-     * @return  the unused1 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public short getUnused1()
-    {
-        return ( short )unused1.getValue(field_2_flags);
-    }
-
-    /**
-     * Sets the unused2 field value.
-     * This MUST be ignored
-     */
-    @Internal
-    public void setUnused2( byte value )
-    {
-        field_2_flags = unused2.setValue(field_2_flags, value);
-    }
-
-    /**
-     * This MUST be ignored
-     * @return  the unused2 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public byte getUnused2()
-    {
-        return ( byte )unused2.getValue(field_2_flags);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
deleted file mode 100644
index 020c235..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.model.Grfhic;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The LSTF structure contains formatting properties that apply to an entire list.
-        <p>Class and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary
-        File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class LSTFAbstractType
-{
-
-    protected int field_1_lsid;
-    protected int field_2_tplc;
-    protected short[] field_3_rgistdPara;
-    protected byte field_4_flags;
-    /**/private static final BitField fSimpleList = new BitField(0x01);
-    /**/private static final BitField unused1 = new BitField(0x02);
-    /**/private static final BitField fAutoNum = new BitField(0x04);
-    /**/private static final BitField unused2 = new BitField(0x08);
-    /**/private static final BitField fHybrid = new BitField(0x10);
-    /**/private static final BitField reserved1 = new BitField(0xE0);
-    protected Grfhic field_5_grfhic;
-
-    protected LSTFAbstractType()
-    {
-        this.field_3_rgistdPara = new short[0];
-        this.field_5_grfhic = new Grfhic();
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_lsid                   = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_tplc                   = LittleEndian.getInt( data, 0x4 + offset );
-        field_3_rgistdPara             = LittleEndian.getShortArray( data, 0x8 + offset, 18 );
-        field_4_flags                  = data[ 0x1a + offset ];
-        field_5_grfhic                 = new Grfhic( data, 0x1b + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, 0x0 + offset, field_1_lsid );
-        LittleEndian.putInt( data, 0x4 + offset, field_2_tplc );
-        LittleEndian.putShortArray( data, 0x8 + offset, field_3_rgistdPara );
-        data[ 0x1a + offset ] = field_4_flags;
-        field_5_grfhic.serialize( data, 0x1b + offset );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 4 + 18 + 1 + 1;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        LSTFAbstractType other = (LSTFAbstractType) obj;
-        if ( field_1_lsid != other.field_1_lsid )
-            return false;
-        if ( field_2_tplc != other.field_2_tplc )
-            return false;
-        if ( !Arrays.equals( field_3_rgistdPara, other.field_3_rgistdPara ) )
-            return false;
-        if ( field_4_flags != other.field_4_flags )
-            return false;
-        if ( field_5_grfhic == null )
-        {
-            if ( other.field_5_grfhic != null )
-                return false;
-        }
-        else if ( !field_5_grfhic.equals( other.field_5_grfhic ) )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_lsid;
-        result = prime * result + field_2_tplc;
-        result = prime * result + Arrays.hashCode( field_3_rgistdPara );
-        result = prime * result + field_4_flags;
-        result = prime * result + field_5_grfhic.hashCode();
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[LSTF]\n");
-        builder.append("    .lsid                 = ");
-        builder.append(" (").append(getLsid()).append(" )\n");
-        builder.append("    .tplc                 = ");
-        builder.append(" (").append(getTplc()).append(" )\n");
-        builder.append("    .rgistdPara           = ");
-        builder.append(" (").append(Arrays.toString(getRgistdPara())).append(" )\n");
-        builder.append("    .flags                = ");
-        builder.append(" (").append(getFlags()).append(" )\n");
-        builder.append("         .fSimpleList              = ").append(isFSimpleList()).append('\n');
-        builder.append("         .unused1                  = ").append(isUnused1()).append('\n');
-        builder.append("         .fAutoNum                 = ").append(isFAutoNum()).append('\n');
-        builder.append("         .unused2                  = ").append(isUnused2()).append('\n');
-        builder.append("         .fHybrid                  = ").append(isFHybrid()).append('\n');
-        builder.append("         .reserved1                = ").append(getReserved1()).append('\n');
-        builder.append("    .grfhic               = ");
-        builder.append(" (").append(getGrfhic()).append(" )\n");
-
-        builder.append("[/LSTF]\n");
-        return builder.toString();
-    }
-
-    /**
-     * A signed integer that specifies the list identifier. This MUST be unique for each LSTF. This value MUST not be 0xFFFFFFFF.
-     */
-    @Internal
-    public int getLsid()
-    {
-        return field_1_lsid;
-    }
-
-    /**
-     * A signed integer that specifies the list identifier. This MUST be unique for each LSTF. This value MUST not be 0xFFFFFFFF.
-     */
-    @Internal
-    public void setLsid( int field_1_lsid )
-    {
-        this.field_1_lsid = field_1_lsid;
-    }
-
-    /**
-     * A Tplc that specifies a unique identifier for this LSTF that MAY be used for user interface purposes. If fHybrid is nonzero, this MUST be ignored.
-     */
-    @Internal
-    public int getTplc()
-    {
-        return field_2_tplc;
-    }
-
-    /**
-     * A Tplc that specifies a unique identifier for this LSTF that MAY be used for user interface purposes. If fHybrid is nonzero, this MUST be ignored.
-     */
-    @Internal
-    public void setTplc( int field_2_tplc )
-    {
-        this.field_2_tplc = field_2_tplc;
-    }
-
-    /**
-     * An array of nine 16-bit signed integers. Each element of rgistdPara specifies the ISTD of the style that is linked to the corresponding level in the list. If no style is linked to a given level, the value of the corresponding element of rgistdPara MUST be 0x0FFF.
-     */
-    @Internal
-    public short[] getRgistdPara()
-    {
-        return field_3_rgistdPara;
-    }
-
-    /**
-     * An array of nine 16-bit signed integers. Each element of rgistdPara specifies the ISTD of the style that is linked to the corresponding level in the list. If no style is linked to a given level, the value of the corresponding element of rgistdPara MUST be 0x0FFF.
-     */
-    @Internal
-    public void setRgistdPara( short[] field_3_rgistdPara )
-    {
-        this.field_3_rgistdPara = field_3_rgistdPara;
-    }
-
-    /**
-     * Get the flags field for the LSTF record.
-     */
-    @Internal
-    public byte getFlags()
-    {
-        return field_4_flags;
-    }
-
-    /**
-     * Set the flags field for the LSTF record.
-     */
-    @Internal
-    public void setFlags( byte field_4_flags )
-    {
-        this.field_4_flags = field_4_flags;
-    }
-
-    /**
-     * A grfhic that specifies the HTML incompatibilities of the list..
-     */
-    @Internal
-    public Grfhic getGrfhic()
-    {
-        return field_5_grfhic;
-    }
-
-    /**
-     * A grfhic that specifies the HTML incompatibilities of the list..
-     */
-    @Internal
-    public void setGrfhic( Grfhic field_5_grfhic )
-    {
-        this.field_5_grfhic = field_5_grfhic;
-    }
-
-    /**
-     * Sets the fSimpleList field value.
-     * A bit that, when set to 0x1, specifies that this LSTF represents a simple (one-level) list that has one corresponding LVL (see the fcPlfLst field of FibRgFcLcb97). Otherwise, this LSTF represents a multi-level list that has nine corresponding LVLs
-     */
-    @Internal
-    public void setFSimpleList( boolean value )
-    {
-        field_4_flags = (byte)fSimpleList.setBoolean(field_4_flags, value);
-    }
-
-    /**
-     * A bit that, when set to 0x1, specifies that this LSTF represents a simple (one-level) list that has one corresponding LVL (see the fcPlfLst field of FibRgFcLcb97). Otherwise, this LSTF represents a multi-level list that has nine corresponding LVLs
-     * @return  the fSimpleList field value.
-     */
-    @Internal
-    public boolean isFSimpleList()
-    {
-        return fSimpleList.isSet(field_4_flags);
-    }
-
-    /**
-     * Sets the unused1 field value.
-     * This bit MUST be ignored
-     */
-    @Internal
-    public void setUnused1( boolean value )
-    {
-        field_4_flags = (byte)unused1.setBoolean(field_4_flags, value);
-    }
-
-    /**
-     * This bit MUST be ignored
-     * @return  the unused1 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public boolean isUnused1()
-    {
-        return unused1.isSet(field_4_flags);
-    }
-
-    /**
-     * Sets the fAutoNum field value.
-     * A bit that specifies whether the list that this LSTF represents is used for the AUTONUMOUT, AUTONUMLGL, and AUTONUM fields (see AUTONUMOUT, AUTONUMLGL, and AUTONUM in flt)
-     */
-    @Internal
-    public void setFAutoNum( boolean value )
-    {
-        field_4_flags = (byte)fAutoNum.setBoolean(field_4_flags, value);
-    }
-
-    /**
-     * A bit that specifies whether the list that this LSTF represents is used for the AUTONUMOUT, AUTONUMLGL, and AUTONUM fields (see AUTONUMOUT, AUTONUMLGL, and AUTONUM in flt)
-     * @return  the fAutoNum field value.
-     */
-    @Internal
-    public boolean isFAutoNum()
-    {
-        return fAutoNum.isSet(field_4_flags);
-    }
-
-    /**
-     * Sets the unused2 field value.
-     * This bit MUST be ignored
-     */
-    @Internal
-    public void setUnused2( boolean value )
-    {
-        field_4_flags = (byte)unused2.setBoolean(field_4_flags, value);
-    }
-
-    /**
-     * This bit MUST be ignored
-     * @return  the unused2 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public boolean isUnused2()
-    {
-        return unused2.isSet(field_4_flags);
-    }
-
-    /**
-     * Sets the fHybrid field value.
-     * A bit that specifies whether the list this LSTF defines is a hybrid list
-     */
-    @Internal
-    public void setFHybrid( boolean value )
-    {
-        field_4_flags = (byte)fHybrid.setBoolean(field_4_flags, value);
-    }
-
-    /**
-     * A bit that specifies whether the list this LSTF defines is a hybrid list
-     * @return  the fHybrid field value.
-     */
-    @Internal
-    public boolean isFHybrid()
-    {
-        return fHybrid.isSet(field_4_flags);
-    }
-
-    /**
-     * Sets the reserved1 field value.
-     * This MUST be zero, and MUST be ignored.
-     */
-    @Internal
-    public void setReserved1( byte value )
-    {
-        field_4_flags = (byte)reserved1.setValue(field_4_flags, value);
-    }
-
-    /**
-     * This MUST be zero, and MUST be ignored.
-     * @return  the reserved1 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public byte getReserved1()
-    {
-        return ( byte )reserved1.getValue(field_4_flags);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
deleted file mode 100644
index 7858543..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.model.Grfhic;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The LVLF structure contains formatting properties for an individual level in a
-        list. <p>Class and fields descriptions are quoted from Microsoft Office Word 97-2007
-        Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class LVLFAbstractType
-{
-
-    protected int field_1_iStartAt;
-    protected byte field_2_nfc;
-    protected byte field_3_info;
-    /**/private static final BitField jc = new BitField(0x03);
-    /**/private static final BitField fLegal = new BitField(0x04);
-    /**/private static final BitField fNoRestart = new BitField(0x08);
-    /**/private static final BitField fIndentSav = new BitField(0x10);
-    /**/private static final BitField fConverted = new BitField(0x20);
-    /**/private static final BitField unused1 = new BitField(0x40);
-    /**/private static final BitField fTentative = new BitField(0x80);
-    protected byte[] field_4_rgbxchNums;
-    protected byte field_5_ixchFollow;
-    protected int field_6_dxaIndentSav;
-    protected int field_7_unused2;
-    protected short field_8_cbGrpprlChpx;
-    protected short field_9_cbGrpprlPapx;
-    protected short field_10_ilvlRestartLim;
-    protected Grfhic field_11_grfhic;
-
-    protected LVLFAbstractType()
-    {
-        this.field_4_rgbxchNums = new byte[9];
-        this.field_11_grfhic = new Grfhic();
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_iStartAt               = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_nfc                    = data[ 0x4 + offset ];
-        field_3_info                   = data[ 0x5 + offset ];
-        field_4_rgbxchNums             = LittleEndian.getByteArray( data, 0x6 + offset,9 );
-        field_5_ixchFollow             = data[ 0xf + offset ];
-        field_6_dxaIndentSav           = LittleEndian.getInt( data, 0x10 + offset );
-        field_7_unused2                = LittleEndian.getInt( data, 0x14 + offset );
-        field_8_cbGrpprlChpx           = LittleEndian.getUByte( data, 0x18 + offset );
-        field_9_cbGrpprlPapx           = LittleEndian.getUByte( data, 0x19 + offset );
-        field_10_ilvlRestartLim        = LittleEndian.getUByte( data, 0x1a + offset );
-        field_11_grfhic                = new Grfhic( data, 0x1b + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, 0x0 + offset, field_1_iStartAt );
-        data[ 0x4 + offset ] = field_2_nfc;
-        data[ 0x5 + offset ] = field_3_info;
-        System.arraycopy( field_4_rgbxchNums, 0, data, 0x6 + offset, field_4_rgbxchNums.length );
-        data[ 0xf + offset ] = field_5_ixchFollow;
-        LittleEndian.putInt( data, 0x10 + offset, field_6_dxaIndentSav );
-        LittleEndian.putInt( data, 0x14 + offset, field_7_unused2 );
-        LittleEndian.putUByte( data, 0x18 + offset, field_8_cbGrpprlChpx );
-        LittleEndian.putUByte( data, 0x19 + offset, field_9_cbGrpprlPapx );
-        LittleEndian.putUByte( data, 0x1a + offset, field_10_ilvlRestartLim );
-        field_11_grfhic.serialize( data, 0x1b + offset );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 1 + 1 + 9 + 1 + 4 + 4 + 1 + 1 + 1 + 1;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        LVLFAbstractType other = (LVLFAbstractType) obj;
-        if ( field_1_iStartAt != other.field_1_iStartAt )
-            return false;
-        if ( field_2_nfc != other.field_2_nfc )
-            return false;
-        if ( field_3_info != other.field_3_info )
-            return false;
-        if ( !Arrays.equals( field_4_rgbxchNums, other.field_4_rgbxchNums ) )
-            return false;
-        if ( field_5_ixchFollow != other.field_5_ixchFollow )
-            return false;
-        if ( field_6_dxaIndentSav != other.field_6_dxaIndentSav )
-            return false;
-        if ( field_7_unused2 != other.field_7_unused2 )
-            return false;
-        if ( field_8_cbGrpprlChpx != other.field_8_cbGrpprlChpx )
-            return false;
-        if ( field_9_cbGrpprlPapx != other.field_9_cbGrpprlPapx )
-            return false;
-        if ( field_10_ilvlRestartLim != other.field_10_ilvlRestartLim )
-            return false;
-        if ( field_11_grfhic == null )
-        {
-            if ( other.field_11_grfhic != null )
-                return false;
-        }
-        else if ( !field_11_grfhic.equals( other.field_11_grfhic ) )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_iStartAt;
-        result = prime * result + field_2_nfc;
-        result = prime * result + field_3_info;
-        result = prime * result + Arrays.hashCode( field_4_rgbxchNums );
-        result = prime * result + field_5_ixchFollow;
-        result = prime * result + field_6_dxaIndentSav;
-        result = prime * result + field_7_unused2;
-        result = prime * result + field_8_cbGrpprlChpx;
-        result = prime * result + field_9_cbGrpprlPapx;
-        result = prime * result + field_10_ilvlRestartLim;
-        result = prime * result + field_11_grfhic.hashCode();
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[LVLF]\n");
-        builder.append("    .iStartAt             = ");
-        builder.append(" (").append(getIStartAt()).append(" )\n");
-        builder.append("    .nfc                  = ");
-        builder.append(" (").append(getNfc()).append(" )\n");
-        builder.append("    .info                 = ");
-        builder.append(" (").append(getInfo()).append(" )\n");
-        builder.append("         .jc                       = ").append(getJc()).append('\n');
-        builder.append("         .fLegal                   = ").append(isFLegal()).append('\n');
-        builder.append("         .fNoRestart               = ").append(isFNoRestart()).append('\n');
-        builder.append("         .fIndentSav               = ").append(isFIndentSav()).append('\n');
-        builder.append("         .fConverted               = ").append(isFConverted()).append('\n');
-        builder.append("         .unused1                  = ").append(isUnused1()).append('\n');
-        builder.append("         .fTentative               = ").append(isFTentative()).append('\n');
-        builder.append("    .rgbxchNums           = ");
-        builder.append(" (").append(Arrays.toString(getRgbxchNums())).append(" )\n");
-        builder.append("    .ixchFollow           = ");
-        builder.append(" (").append(getIxchFollow()).append(" )\n");
-        builder.append("    .dxaIndentSav         = ");
-        builder.append(" (").append(getDxaIndentSav()).append(" )\n");
-        builder.append("    .unused2              = ");
-        builder.append(" (").append(getUnused2()).append(" )\n");
-        builder.append("    .cbGrpprlChpx         = ");
-        builder.append(" (").append(getCbGrpprlChpx()).append(" )\n");
-        builder.append("    .cbGrpprlPapx         = ");
-        builder.append(" (").append(getCbGrpprlPapx()).append(" )\n");
-        builder.append("    .ilvlRestartLim       = ");
-        builder.append(" (").append(getIlvlRestartLim()).append(" )\n");
-        builder.append("    .grfhic               = ");
-        builder.append(" (").append(getGrfhic()).append(" )\n");
-
-        builder.append("[/LVLF]\n");
-        return builder.toString();
-    }
-
-    /**
-     * A signed integer that specifies the beginning number for the number sequence belonging to this level. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If this level does not have a number sequence (see nfc), this MUST be ignored.
-     */
-    @Internal
-    public int getIStartAt()
-    {
-        return field_1_iStartAt;
-    }
-
-    /**
-     * A signed integer that specifies the beginning number for the number sequence belonging to this level. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If this level does not have a number sequence (see nfc), this MUST be ignored.
-     */
-    @Internal
-    public void setIStartAt( int field_1_iStartAt )
-    {
-        this.field_1_iStartAt = field_1_iStartAt;
-    }
-
-    /**
-     * An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets.
-     */
-    @Internal
-    public byte getNfc()
-    {
-        return field_2_nfc;
-    }
-
-    /**
-     * An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets.
-     */
-    @Internal
-    public void setNfc( byte field_2_nfc )
-    {
-        this.field_2_nfc = field_2_nfc;
-    }
-
-    /**
-     * Get the info field for the LVLF record.
-     */
-    @Internal
-    public byte getInfo()
-    {
-        return field_3_info;
-    }
-
-    /**
-     * Set the info field for the LVLF record.
-     */
-    @Internal
-    public void setInfo( byte field_3_info )
-    {
-        this.field_3_info = field_3_info;
-    }
-
-    /**
-     * An array of 8-bit integers. Each integer specifies a one-based character offset to a level placeholder in the xst.rgtchar of the LVL that contains this LVLF. This array is zero-terminated, unless it is full. The count of elements in this array, before to the first terminating zero, MUST be less than or equal to the one-based level of the list to which this LVL corresponds. The integers in this array, before the first terminating zero, MUST be in ascending order, and MUST be unique.
-     */
-    @Internal
-    public byte[] getRgbxchNums()
-    {
-        return field_4_rgbxchNums;
-    }
-
-    /**
-     * An array of 8-bit integers. Each integer specifies a one-based character offset to a level placeholder in the xst.rgtchar of the LVL that contains this LVLF. This array is zero-terminated, unless it is full. The count of elements in this array, before to the first terminating zero, MUST be less than or equal to the one-based level of the list to which this LVL corresponds. The integers in this array, before the first terminating zero, MUST be in ascending order, and MUST be unique.
-     */
-    @Internal
-    public void setRgbxchNums( byte[] field_4_rgbxchNums )
-    {
-        this.field_4_rgbxchNums = field_4_rgbxchNums;
-    }
-
-    /**
-     * An unsigned integer that specifies the character that follows the number text.
-     */
-    @Internal
-    public byte getIxchFollow()
-    {
-        return field_5_ixchFollow;
-    }
-
-    /**
-     * An unsigned integer that specifies the character that follows the number text.
-     */
-    @Internal
-    public void setIxchFollow( byte field_5_ixchFollow )
-    {
-        this.field_5_ixchFollow = field_5_ixchFollow;
-    }
-
-    /**
-     * If fIndentSav is nonzero, this is a signed integer that specifies the size, in twips, of the indent that needs to be removed when the numbering is removed. This MUST be less than or equal to 0x00007BC0 or greater than or equal to 0xFFFF8440. If fIndentSav is zero, this MUST be ignored.
-     */
-    @Internal
-    public int getDxaIndentSav()
-    {
-        return field_6_dxaIndentSav;
-    }
-
-    /**
-     * If fIndentSav is nonzero, this is a signed integer that specifies the size, in twips, of the indent that needs to be removed when the numbering is removed. This MUST be less than or equal to 0x00007BC0 or greater than or equal to 0xFFFF8440. If fIndentSav is zero, this MUST be ignored.
-     */
-    @Internal
-    public void setDxaIndentSav( int field_6_dxaIndentSav )
-    {
-        this.field_6_dxaIndentSav = field_6_dxaIndentSav;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public int getUnused2()
-    {
-        return field_7_unused2;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public void setUnused2( int field_7_unused2 )
-    {
-        this.field_7_unused2 = field_7_unused2;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of the grpprlChpx in the LVL that contains this LVLF.
-     */
-    @Internal
-    public short getCbGrpprlChpx()
-    {
-        return field_8_cbGrpprlChpx;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of the grpprlChpx in the LVL that contains this LVLF.
-     */
-    @Internal
-    public void setCbGrpprlChpx( short field_8_cbGrpprlChpx )
-    {
-        this.field_8_cbGrpprlChpx = field_8_cbGrpprlChpx;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of the grpprlPapx in the LVL that contains this LVLF.
-     */
-    @Internal
-    public short getCbGrpprlPapx()
-    {
-        return field_9_cbGrpprlPapx;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of the grpprlPapx in the LVL that contains this LVLF.
-     */
-    @Internal
-    public void setCbGrpprlPapx( short field_9_cbGrpprlPapx )
-    {
-        this.field_9_cbGrpprlPapx = field_9_cbGrpprlPapx;
-    }
-
-    /**
-     * An unsigned integer that specifies the first (most-significant) zero-based level after which the number sequence of this level does not restart. The number sequence of this level does restart after any level that is more significant than the specified level. This MUST be less than or equal to the zero-based level of the list to which this LVLF corresponds. If fNoRestart is zero, this MUST be ignored. If this level does not have a number sequence (see nfc), this MUST be ignored.
-     */
-    @Internal
-    public short getIlvlRestartLim()
-    {
-        return field_10_ilvlRestartLim;
-    }
-
-    /**
-     * An unsigned integer that specifies the first (most-significant) zero-based level after which the number sequence of this level does not restart. The number sequence of this level does restart after any level that is more significant than the specified level. This MUST be less than or equal to the zero-based level of the list to which this LVLF corresponds. If fNoRestart is zero, this MUST be ignored. If this level does not have a number sequence (see nfc), this MUST be ignored.
-     */
-    @Internal
-    public void setIlvlRestartLim( short field_10_ilvlRestartLim )
-    {
-        this.field_10_ilvlRestartLim = field_10_ilvlRestartLim;
-    }
-
-    /**
-     * A grfhic that specifies the HTML incompatibilities of the level..
-     */
-    @Internal
-    public Grfhic getGrfhic()
-    {
-        return field_11_grfhic;
-    }
-
-    /**
-     * A grfhic that specifies the HTML incompatibilities of the level..
-     */
-    @Internal
-    public void setGrfhic( Grfhic field_11_grfhic )
-    {
-        this.field_11_grfhic = field_11_grfhic;
-    }
-
-    /**
-     * Sets the jc field value.
-     * An unsigned integer that specifies the justification of this level
-     */
-    @Internal
-    public void setJc( byte value )
-    {
-        field_3_info = (byte)jc.setValue(field_3_info, value);
-    }
-
-    /**
-     * An unsigned integer that specifies the justification of this level
-     * @return  the jc field value.
-     */
-    @Internal
-    public byte getJc()
-    {
-        return ( byte )jc.getValue(field_3_info);
-    }
-
-    /**
-     * Sets the fLegal field value.
-     * A bit that specifies whether this level overrides the nfc of all inherited level numbers. If the original nfc of a level number is msonfcArabicLZ, it is preserved. Otherwise, the nfc of the level number is overridden by msonfcArabic.
-     */
-    @Internal
-    public void setFLegal( boolean value )
-    {
-        field_3_info = (byte)fLegal.setBoolean(field_3_info, value);
-    }
-
-    /**
-     * A bit that specifies whether this level overrides the nfc of all inherited level numbers. If the original nfc of a level number is msonfcArabicLZ, it is preserved. Otherwise, the nfc of the level number is overridden by msonfcArabic.
-     * @return  the fLegal field value.
-     */
-    @Internal
-    public boolean isFLegal()
-    {
-        return fLegal.isSet(field_3_info);
-    }
-
-    /**
-     * Sets the fNoRestart field value.
-     * A bit that specifies whether the number sequence of the level does not restart after a level is encountered that is more significant than the level to which this LVLF corresponds
-     */
-    @Internal
-    public void setFNoRestart( boolean value )
-    {
-        field_3_info = (byte)fNoRestart.setBoolean(field_3_info, value);
-    }
-
-    /**
-     * A bit that specifies whether the number sequence of the level does not restart after a level is encountered that is more significant than the level to which this LVLF corresponds
-     * @return  the fNoRestart field value.
-     */
-    @Internal
-    public boolean isFNoRestart()
-    {
-        return fNoRestart.isSet(field_3_info);
-    }
-
-    /**
-     * Sets the fIndentSav field value.
-     * A bit that specifies whether the level indented the text it was applied to and that the indent needs to be removed when numbering is removed. The indent to be removed is stored in dxaIndentSav
-     */
-    @Internal
-    public void setFIndentSav( boolean value )
-    {
-        field_3_info = (byte)fIndentSav.setBoolean(field_3_info, value);
-    }
-
-    /**
-     * A bit that specifies whether the level indented the text it was applied to and that the indent needs to be removed when numbering is removed. The indent to be removed is stored in dxaIndentSav
-     * @return  the fIndentSav field value.
-     */
-    @Internal
-    public boolean isFIndentSav()
-    {
-        return fIndentSav.isSet(field_3_info);
-    }
-
-    /**
-     * Sets the fConverted field value.
-     * A bit that specifies whether the nfc of this LVLF structure was previously a temporary value used for bidirectional compatibility that was converted into a standard MSONFC
-     */
-    @Internal
-    public void setFConverted( boolean value )
-    {
-        field_3_info = (byte)fConverted.setBoolean(field_3_info, value);
-    }
-
-    /**
-     * A bit that specifies whether the nfc of this LVLF structure was previously a temporary value used for bidirectional compatibility that was converted into a standard MSONFC
-     * @return  the fConverted field value.
-     */
-    @Internal
-    public boolean isFConverted()
-    {
-        return fConverted.isSet(field_3_info);
-    }
-
-    /**
-     * Sets the unused1 field value.
-     * This bit MUST be ignored
-     */
-    @Internal
-    public void setUnused1( boolean value )
-    {
-        field_3_info = (byte)unused1.setBoolean(field_3_info, value);
-    }
-
-    /**
-     * This bit MUST be ignored
-     * @return  the unused1 field value.
-     * @deprecated This field should not be used according to specification
-     */
-    @Internal
-    @Deprecated
-    public boolean isUnused1()
-    {
-        return unused1.isSet(field_3_info);
-    }
-
-    /**
-     * Sets the fTentative field value.
-     * A bit that specifies whether the format of the level is tentative
-     */
-    @Internal
-    public void setFTentative( boolean value )
-    {
-        field_3_info = (byte)fTentative.setBoolean(field_3_info, value);
-    }
-
-    /**
-     * A bit that specifies whether the format of the level is tentative
-     * @return  the fTentative field value.
-     */
-    @Internal
-    public boolean isFTentative()
-    {
-        return fTentative.isSet(field_3_info);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java
deleted file mode 100644
index 1363a83..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java
+++ /dev/null
@@ -1,1911 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.model.TabDescriptor;
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.DateAndTime;
-import org.apache.poi.hwpf.usermodel.DropCapSpecifier;
-import org.apache.poi.hwpf.usermodel.LineSpacingDescriptor;
-import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-
-/**
- * Paragraph Properties.
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author S. Ryan Ackley
- */
-@Internal
-public abstract class PAPAbstractType
-{
-
-    protected int field_1_istd;
-    protected boolean field_2_fSideBySide;
-    protected boolean field_3_fKeep;
-    protected boolean field_4_fKeepFollow;
-    protected boolean field_5_fPageBreakBefore;
-    protected byte field_6_brcl;
-    /**/protected final static byte BRCL_SINGLE = 0;
-    /**/protected final static byte BRCL_THICK = 1;
-    /**/protected final static byte BRCL_DOUBLE = 2;
-    /**/protected final static byte BRCL_SHADOW = 3;
-    protected byte field_7_brcp;
-    /**/protected final static byte BRCP_NONE = 0;
-    /**/protected final static byte BRCP_BORDER_ABOVE = 1;
-    /**/protected final static byte BRCP_BORDER_BELOW = 2;
-    /**/protected final static byte BRCP_BOX_AROUND = 15;
-    /**/protected final static byte BRCP_BAR_TO_LEFT_OF_PARAGRAPH = 16;
-    protected byte field_8_ilvl;
-    protected int field_9_ilfo;
-    protected boolean field_10_fNoLnn;
-    protected LineSpacingDescriptor field_11_lspd;
-    protected int field_12_dyaBefore;
-    protected int field_13_dyaAfter;
-    protected boolean field_14_fInTable;
-    protected boolean field_15_finTableW97;
-    protected boolean field_16_fTtp;
-    protected int field_17_dxaAbs;
-    protected int field_18_dyaAbs;
-    protected int field_19_dxaWidth;
-    protected boolean field_20_fBrLnAbove;
-    protected boolean field_21_fBrLnBelow;
-    protected byte field_22_pcVert;
-    protected byte field_23_pcHorz;
-    protected byte field_24_wr;
-    protected boolean field_25_fNoAutoHyph;
-    protected int field_26_dyaHeight;
-    protected boolean field_27_fMinHeight;
-    /**/protected final static boolean FMINHEIGHT_EXACT = false;
-    /**/protected final static boolean FMINHEIGHT_AT_LEAST = true;
-    protected DropCapSpecifier field_28_dcs;
-    protected int field_29_dyaFromText;
-    protected int field_30_dxaFromText;
-    protected boolean field_31_fLocked;
-    protected boolean field_32_fWidowControl;
-    protected boolean field_33_fKinsoku;
-    protected boolean field_34_fWordWrap;
-    protected boolean field_35_fOverflowPunct;
-    protected boolean field_36_fTopLinePunct;
-    protected boolean field_37_fAutoSpaceDE;
-    protected boolean field_38_fAutoSpaceDN;
-    protected int field_39_wAlignFont;
-    /**/protected final static byte WALIGNFONT_HANGING = 0;
-    /**/protected final static byte WALIGNFONT_CENTERED = 1;
-    /**/protected final static byte WALIGNFONT_ROMAN = 2;
-    /**/protected final static byte WALIGNFONT_VARIABLE = 3;
-    /**/protected final static byte WALIGNFONT_AUTO = 4;
-    protected short field_40_fontAlign;
-    /**/private static BitField fVertical = new BitField(0x0001);
-    /**/private static BitField fBackward = new BitField(0x0002);
-    /**/private static BitField fRotateFont = new BitField(0x0004);
-    protected byte field_41_lvl;
-    protected boolean field_42_fBiDi;
-    protected boolean field_43_fNumRMIns;
-    protected boolean field_44_fCrLf;
-    protected boolean field_45_fUsePgsuSettings;
-    protected boolean field_46_fAdjustRight;
-    protected int field_47_itap;
-    protected boolean field_48_fInnerTableCell;
-    protected boolean field_49_fOpenTch;
-    protected boolean field_50_fTtpEmbedded;
-    protected short field_51_dxcRight;
-    protected short field_52_dxcLeft;
-    protected short field_53_dxcLeft1;
-    protected boolean field_54_fDyaBeforeAuto;
-    protected boolean field_55_fDyaAfterAuto;
-    protected int field_56_dxaRight;
-    protected int field_57_dxaLeft;
-    protected int field_58_dxaLeft1;
-    protected byte field_59_jc;
-    protected BorderCode field_60_brcTop;
-    protected BorderCode field_61_brcLeft;
-    protected BorderCode field_62_brcBottom;
-    protected BorderCode field_63_brcRight;
-    protected BorderCode field_64_brcBetween;
-    protected BorderCode field_65_brcBar;
-    protected ShadingDescriptor field_66_shd;
-    protected byte[] field_67_anld;
-    protected byte[] field_68_phe;
-    protected boolean field_69_fPropRMark;
-    protected int field_70_ibstPropRMark;
-    protected DateAndTime field_71_dttmPropRMark;
-    protected int field_72_itbdMac;
-    protected int[] field_73_rgdxaTab;
-    protected TabDescriptor[] field_74_rgtbd;
-    protected byte[] field_75_numrm;
-    protected byte[] field_76_ptap;
-    protected boolean field_77_fNoAllowOverlap;
-    protected long field_78_ipgp;
-    protected long field_79_rsid;
-
-    protected PAPAbstractType()
-    {
-        this.field_11_lspd = new LineSpacingDescriptor();
-        this.field_11_lspd = new LineSpacingDescriptor();
-        this.field_28_dcs = new DropCapSpecifier();
-        this.field_32_fWidowControl = true;
-        this.field_41_lvl = 9;
-        this.field_60_brcTop = new BorderCode();
-        this.field_61_brcLeft = new BorderCode();
-        this.field_62_brcBottom = new BorderCode();
-        this.field_63_brcRight = new BorderCode();
-        this.field_64_brcBetween = new BorderCode();
-        this.field_65_brcBar = new BorderCode();
-        this.field_66_shd = new ShadingDescriptor();
-        this.field_67_anld = new byte[0];
-        this.field_68_phe = new byte[0];
-        this.field_71_dttmPropRMark = new DateAndTime();
-        this.field_73_rgdxaTab = new int[0];
-        this.field_74_rgtbd = new TabDescriptor[0];
-        this.field_75_numrm = new byte[0];
-        this.field_76_ptap = new byte[0];
-    }
-
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[PAP]\n");
-        builder.append("    .istd                 = ");
-        builder.append(" (").append(getIstd()).append(" )\n");
-        builder.append("    .fSideBySide          = ");
-        builder.append(" (").append(getFSideBySide()).append(" )\n");
-        builder.append("    .fKeep                = ");
-        builder.append(" (").append(getFKeep()).append(" )\n");
-        builder.append("    .fKeepFollow          = ");
-        builder.append(" (").append(getFKeepFollow()).append(" )\n");
-        builder.append("    .fPageBreakBefore     = ");
-        builder.append(" (").append(getFPageBreakBefore()).append(" )\n");
-        builder.append("    .brcl                 = ");
-        builder.append(" (").append(getBrcl()).append(" )\n");
-        builder.append("    .brcp                 = ");
-        builder.append(" (").append(getBrcp()).append(" )\n");
-        builder.append("    .ilvl                 = ");
-        builder.append(" (").append(getIlvl()).append(" )\n");
-        builder.append("    .ilfo                 = ");
-        builder.append(" (").append(getIlfo()).append(" )\n");
-        builder.append("    .fNoLnn               = ");
-        builder.append(" (").append(getFNoLnn()).append(" )\n");
-        builder.append("    .lspd                 = ");
-        builder.append(" (").append(getLspd()).append(" )\n");
-        builder.append("    .dyaBefore            = ");
-        builder.append(" (").append(getDyaBefore()).append(" )\n");
-        builder.append("    .dyaAfter             = ");
-        builder.append(" (").append(getDyaAfter()).append(" )\n");
-        builder.append("    .fInTable             = ");
-        builder.append(" (").append(getFInTable()).append(" )\n");
-        builder.append("    .finTableW97          = ");
-        builder.append(" (").append(getFinTableW97()).append(" )\n");
-        builder.append("    .fTtp                 = ");
-        builder.append(" (").append(getFTtp()).append(" )\n");
-        builder.append("    .dxaAbs               = ");
-        builder.append(" (").append(getDxaAbs()).append(" )\n");
-        builder.append("    .dyaAbs               = ");
-        builder.append(" (").append(getDyaAbs()).append(" )\n");
-        builder.append("    .dxaWidth             = ");
-        builder.append(" (").append(getDxaWidth()).append(" )\n");
-        builder.append("    .fBrLnAbove           = ");
-        builder.append(" (").append(getFBrLnAbove()).append(" )\n");
-        builder.append("    .fBrLnBelow           = ");
-        builder.append(" (").append(getFBrLnBelow()).append(" )\n");
-        builder.append("    .pcVert               = ");
-        builder.append(" (").append(getPcVert()).append(" )\n");
-        builder.append("    .pcHorz               = ");
-        builder.append(" (").append(getPcHorz()).append(" )\n");
-        builder.append("    .wr                   = ");
-        builder.append(" (").append(getWr()).append(" )\n");
-        builder.append("    .fNoAutoHyph          = ");
-        builder.append(" (").append(getFNoAutoHyph()).append(" )\n");
-        builder.append("    .dyaHeight            = ");
-        builder.append(" (").append(getDyaHeight()).append(" )\n");
-        builder.append("    .fMinHeight           = ");
-        builder.append(" (").append(getFMinHeight()).append(" )\n");
-        builder.append("    .dcs                  = ");
-        builder.append(" (").append(getDcs()).append(" )\n");
-        builder.append("    .dyaFromText          = ");
-        builder.append(" (").append(getDyaFromText()).append(" )\n");
-        builder.append("    .dxaFromText          = ");
-        builder.append(" (").append(getDxaFromText()).append(" )\n");
-        builder.append("    .fLocked              = ");
-        builder.append(" (").append(getFLocked()).append(" )\n");
-        builder.append("    .fWidowControl        = ");
-        builder.append(" (").append(getFWidowControl()).append(" )\n");
-        builder.append("    .fKinsoku             = ");
-        builder.append(" (").append(getFKinsoku()).append(" )\n");
-        builder.append("    .fWordWrap            = ");
-        builder.append(" (").append(getFWordWrap()).append(" )\n");
-        builder.append("    .fOverflowPunct       = ");
-        builder.append(" (").append(getFOverflowPunct()).append(" )\n");
-        builder.append("    .fTopLinePunct        = ");
-        builder.append(" (").append(getFTopLinePunct()).append(" )\n");
-        builder.append("    .fAutoSpaceDE         = ");
-        builder.append(" (").append(getFAutoSpaceDE()).append(" )\n");
-        builder.append("    .fAutoSpaceDN         = ");
-        builder.append(" (").append(getFAutoSpaceDN()).append(" )\n");
-        builder.append("    .wAlignFont           = ");
-        builder.append(" (").append(getWAlignFont()).append(" )\n");
-        builder.append("    .fontAlign            = ");
-        builder.append(" (").append(getFontAlign()).append(" )\n");
-        builder.append("         .fVertical                = ").append(isFVertical()).append('\n');
-        builder.append("         .fBackward                = ").append(isFBackward()).append('\n');
-        builder.append("         .fRotateFont              = ").append(isFRotateFont()).append('\n');
-        builder.append("    .lvl                  = ");
-        builder.append(" (").append(getLvl()).append(" )\n");
-        builder.append("    .fBiDi                = ");
-        builder.append(" (").append(getFBiDi()).append(" )\n");
-        builder.append("    .fNumRMIns            = ");
-        builder.append(" (").append(getFNumRMIns()).append(" )\n");
-        builder.append("    .fCrLf                = ");
-        builder.append(" (").append(getFCrLf()).append(" )\n");
-        builder.append("    .fUsePgsuSettings     = ");
-        builder.append(" (").append(getFUsePgsuSettings()).append(" )\n");
-        builder.append("    .fAdjustRight         = ");
-        builder.append(" (").append(getFAdjustRight()).append(" )\n");
-        builder.append("    .itap                 = ");
-        builder.append(" (").append(getItap()).append(" )\n");
-        builder.append("    .fInnerTableCell      = ");
-        builder.append(" (").append(getFInnerTableCell()).append(" )\n");
-        builder.append("    .fOpenTch             = ");
-        builder.append(" (").append(getFOpenTch()).append(" )\n");
-        builder.append("    .fTtpEmbedded         = ");
-        builder.append(" (").append(getFTtpEmbedded()).append(" )\n");
-        builder.append("    .dxcRight             = ");
-        builder.append(" (").append(getDxcRight()).append(" )\n");
-        builder.append("    .dxcLeft              = ");
-        builder.append(" (").append(getDxcLeft()).append(" )\n");
-        builder.append("    .dxcLeft1             = ");
-        builder.append(" (").append(getDxcLeft1()).append(" )\n");
-        builder.append("    .fDyaBeforeAuto       = ");
-        builder.append(" (").append(getFDyaBeforeAuto()).append(" )\n");
-        builder.append("    .fDyaAfterAuto        = ");
-        builder.append(" (").append(getFDyaAfterAuto()).append(" )\n");
-        builder.append("    .dxaRight             = ");
-        builder.append(" (").append(getDxaRight()).append(" )\n");
-        builder.append("    .dxaLeft              = ");
-        builder.append(" (").append(getDxaLeft()).append(" )\n");
-        builder.append("    .dxaLeft1             = ");
-        builder.append(" (").append(getDxaLeft1()).append(" )\n");
-        builder.append("    .jc                   = ");
-        builder.append(" (").append(getJc()).append(" )\n");
-        builder.append("    .brcTop               = ");
-        builder.append(" (").append(getBrcTop()).append(" )\n");
-        builder.append("    .brcLeft              = ");
-        builder.append(" (").append(getBrcLeft()).append(" )\n");
-        builder.append("    .brcBottom            = ");
-        builder.append(" (").append(getBrcBottom()).append(" )\n");
-        builder.append("    .brcRight             = ");
-        builder.append(" (").append(getBrcRight()).append(" )\n");
-        builder.append("    .brcBetween           = ");
-        builder.append(" (").append(getBrcBetween()).append(" )\n");
-        builder.append("    .brcBar               = ");
-        builder.append(" (").append(getBrcBar()).append(" )\n");
-        builder.append("    .shd                  = ");
-        builder.append(" (").append(getShd()).append(" )\n");
-        builder.append("    .anld                 = ");
-        builder.append(" (").append(Arrays.toString(getAnld())).append(" )\n");
-        builder.append("    .phe                  = ");
-        builder.append(" (").append(Arrays.toString(getPhe())).append(" )\n");
-        builder.append("    .fPropRMark           = ");
-        builder.append(" (").append(getFPropRMark()).append(" )\n");
-        builder.append("    .ibstPropRMark        = ");
-        builder.append(" (").append(getIbstPropRMark()).append(" )\n");
-        builder.append("    .dttmPropRMark        = ");
-        builder.append(" (").append(getDttmPropRMark()).append(" )\n");
-        builder.append("    .itbdMac              = ");
-        builder.append(" (").append(getItbdMac()).append(" )\n");
-        builder.append("    .rgdxaTab             = ");
-        builder.append(" (").append(Arrays.toString(getRgdxaTab())).append(" )\n");
-        builder.append("    .rgtbd                = ");
-        builder.append(" (").append(Arrays.toString(getRgtbd())).append(" )\n");
-        builder.append("    .numrm                = ");
-        builder.append(" (").append(Arrays.toString(getNumrm())).append(" )\n");
-        builder.append("    .ptap                 = ");
-        builder.append(" (").append(Arrays.toString(getPtap())).append(" )\n");
-        builder.append("    .fNoAllowOverlap      = ");
-        builder.append(" (").append(getFNoAllowOverlap()).append(" )\n");
-        builder.append("    .ipgp                 = ");
-        builder.append(" (").append(getIpgp()).append(" )\n");
-        builder.append("    .rsid                 = ");
-        builder.append(" (").append(getRsid()).append(" )\n");
-
-        builder.append("[/PAP]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Index to style descriptor.
-     */
-    @Internal
-    public int getIstd()
-    {
-        return field_1_istd;
-    }
-
-    /**
-     * Index to style descriptor.
-     */
-    @Internal
-    public void setIstd( int field_1_istd )
-    {
-        this.field_1_istd = field_1_istd;
-    }
-
-    /**
-     * Get the fSideBySide field for the PAP record.
-     */
-    @Internal
-    public boolean getFSideBySide()
-    {
-        return field_2_fSideBySide;
-    }
-
-    /**
-     * Set the fSideBySide field for the PAP record.
-     */
-    @Internal
-    public void setFSideBySide( boolean field_2_fSideBySide )
-    {
-        this.field_2_fSideBySide = field_2_fSideBySide;
-    }
-
-    /**
-     * Get the fKeep field for the PAP record.
-     */
-    @Internal
-    public boolean getFKeep()
-    {
-        return field_3_fKeep;
-    }
-
-    /**
-     * Set the fKeep field for the PAP record.
-     */
-    @Internal
-    public void setFKeep( boolean field_3_fKeep )
-    {
-        this.field_3_fKeep = field_3_fKeep;
-    }
-
-    /**
-     * Get the fKeepFollow field for the PAP record.
-     */
-    @Internal
-    public boolean getFKeepFollow()
-    {
-        return field_4_fKeepFollow;
-    }
-
-    /**
-     * Set the fKeepFollow field for the PAP record.
-     */
-    @Internal
-    public void setFKeepFollow( boolean field_4_fKeepFollow )
-    {
-        this.field_4_fKeepFollow = field_4_fKeepFollow;
-    }
-
-    /**
-     * Get the fPageBreakBefore field for the PAP record.
-     */
-    @Internal
-    public boolean getFPageBreakBefore()
-    {
-        return field_5_fPageBreakBefore;
-    }
-
-    /**
-     * Set the fPageBreakBefore field for the PAP record.
-     */
-    @Internal
-    public void setFPageBreakBefore( boolean field_5_fPageBreakBefore )
-    {
-        this.field_5_fPageBreakBefore = field_5_fPageBreakBefore;
-    }
-
-    /**
-     * Border line style.
-     *
-     * @return One of 
-     * <li>{@link #BRCL_SINGLE}
-     * <li>{@link #BRCL_THICK}
-     * <li>{@link #BRCL_DOUBLE}
-     * <li>{@link #BRCL_SHADOW}
-     */
-    @Internal
-    public byte getBrcl()
-    {
-        return field_6_brcl;
-    }
-
-    /**
-     * Border line style.
-     *
-     * @param field_6_brcl
-     *        One of 
-     * <li>{@link #BRCL_SINGLE}
-     * <li>{@link #BRCL_THICK}
-     * <li>{@link #BRCL_DOUBLE}
-     * <li>{@link #BRCL_SHADOW}
-     */
-    @Internal
-    public void setBrcl( byte field_6_brcl )
-    {
-        this.field_6_brcl = field_6_brcl;
-    }
-
-    /**
-     * Rectangle border codes.
-     *
-     * @return One of 
-     * <li>{@link #BRCP_NONE}
-     * <li>{@link #BRCP_BORDER_ABOVE}
-     * <li>{@link #BRCP_BORDER_BELOW}
-     * <li>{@link #BRCP_BOX_AROUND}
-     * <li>{@link #BRCP_BAR_TO_LEFT_OF_PARAGRAPH}
-     */
-    @Internal
-    public byte getBrcp()
-    {
-        return field_7_brcp;
-    }
-
-    /**
-     * Rectangle border codes.
-     *
-     * @param field_7_brcp
-     *        One of 
-     * <li>{@link #BRCP_NONE}
-     * <li>{@link #BRCP_BORDER_ABOVE}
-     * <li>{@link #BRCP_BORDER_BELOW}
-     * <li>{@link #BRCP_BOX_AROUND}
-     * <li>{@link #BRCP_BAR_TO_LEFT_OF_PARAGRAPH}
-     */
-    @Internal
-    public void setBrcp( byte field_7_brcp )
-    {
-        this.field_7_brcp = field_7_brcp;
-    }
-
-    /**
-     * List level if non-zero.
-     */
-    @Internal
-    public byte getIlvl()
-    {
-        return field_8_ilvl;
-    }
-
-    /**
-     * List level if non-zero.
-     */
-    @Internal
-    public void setIlvl( byte field_8_ilvl )
-    {
-        this.field_8_ilvl = field_8_ilvl;
-    }
-
-    /**
-     * "A 16-bit signed integer value that is used to determine which list
-     * contains the paragraph. This value MUST be one of the following:
-     * 
-     * 0x0000 -- This paragraph is not in a list, and any list formatting on the
-     * paragraph is removed.
-     * 
-     * 0x0001 - 0x07FE -- The value is a 1-based index into PlfLfo.rgLfo. The
-     * LFO at this index defines the list that this paragraph is in.
-     * 
-     * 0xF801 -- This paragraph is not in a list.
-     * 
-     * 0xF802 - 0xFFFF -- The value is the negation of a 1-based index into
-     * PlfLfo.rgLfo. The LFO at this index defines the list that this paragraph
-     * is in. The logical left indentation (see sprmPDxaLeft) and the logical
-     * left first line indentation (see sprmPDxaLeft1) of the paragraph MUST be
-     * preserved despite any list formatting.
-     * 
-     * By default, a paragraph is not in a list."
-     * 
-     * Quote from [MS-DOC] -- v20110315, page 125
-     */
-    @Internal
-    public int getIlfo()
-    {
-        return field_9_ilfo;
-    }
-
-    /**
-     * "A 16-bit signed integer value that is used to determine which list
-     * contains the paragraph. This value MUST be one of the following:
-     * 
-     * 0x0000 -- This paragraph is not in a list, and any list formatting on the
-     * paragraph is removed.
-     * 
-     * 0x0001 - 0x07FE -- The value is a 1-based index into PlfLfo.rgLfo. The
-     * LFO at this index defines the list that this paragraph is in.
-     * 
-     * 0xF801 -- This paragraph is not in a list.
-     * 
-     * 0xF802 - 0xFFFF -- The value is the negation of a 1-based index into
-     * PlfLfo.rgLfo. The LFO at this index defines the list that this paragraph
-     * is in. The logical left indentation (see sprmPDxaLeft) and the logical
-     * left first line indentation (see sprmPDxaLeft1) of the paragraph MUST be
-     * preserved despite any list formatting. By default, a paragraph is not in
-     * a list."
-     * 
-     * Quote from [MS-DOC] -- v20110315, page 125
-     */
-    @Internal
-    public void setIlfo( int field_9_ilfo )
-    {
-        this.field_9_ilfo = field_9_ilfo;
-    }
-
-    /**
-     * No line numbering.
-     */
-    @Internal
-    public boolean getFNoLnn()
-    {
-        return field_10_fNoLnn;
-    }
-
-    /**
-     * No line numbering.
-     */
-    @Internal
-    public void setFNoLnn( boolean field_10_fNoLnn )
-    {
-        this.field_10_fNoLnn = field_10_fNoLnn;
-    }
-
-    /**
-     * Line spacing descriptor.
-     */
-    @Internal
-    public LineSpacingDescriptor getLspd()
-    {
-        return field_11_lspd;
-    }
-
-    /**
-     * Line spacing descriptor.
-     */
-    @Internal
-    public void setLspd( LineSpacingDescriptor field_11_lspd )
-    {
-        this.field_11_lspd = field_11_lspd;
-    }
-
-    /**
-     * Space before paragraph.
-     */
-    @Internal
-    public int getDyaBefore()
-    {
-        return field_12_dyaBefore;
-    }
-
-    /**
-     * Space before paragraph.
-     */
-    @Internal
-    public void setDyaBefore( int field_12_dyaBefore )
-    {
-        this.field_12_dyaBefore = field_12_dyaBefore;
-    }
-
-    /**
-     * Space after paragraph.
-     */
-    @Internal
-    public int getDyaAfter()
-    {
-        return field_13_dyaAfter;
-    }
-
-    /**
-     * Space after paragraph.
-     */
-    @Internal
-    public void setDyaAfter( int field_13_dyaAfter )
-    {
-        this.field_13_dyaAfter = field_13_dyaAfter;
-    }
-
-    /**
-     * Paragraph is in table flag.
-     */
-    @Internal
-    public boolean getFInTable()
-    {
-        return field_14_fInTable;
-    }
-
-    /**
-     * Paragraph is in table flag.
-     */
-    @Internal
-    public void setFInTable( boolean field_14_fInTable )
-    {
-        this.field_14_fInTable = field_14_fInTable;
-    }
-
-    /**
-     * Archaic paragraph is in table flag.
-     */
-    @Internal
-    public boolean getFinTableW97()
-    {
-        return field_15_finTableW97;
-    }
-
-    /**
-     * Archaic paragraph is in table flag.
-     */
-    @Internal
-    public void setFinTableW97( boolean field_15_finTableW97 )
-    {
-        this.field_15_finTableW97 = field_15_finTableW97;
-    }
-
-    /**
-     * Table trailer paragraph (last in table row).
-     */
-    @Internal
-    public boolean getFTtp()
-    {
-        return field_16_fTtp;
-    }
-
-    /**
-     * Table trailer paragraph (last in table row).
-     */
-    @Internal
-    public void setFTtp( boolean field_16_fTtp )
-    {
-        this.field_16_fTtp = field_16_fTtp;
-    }
-
-    /**
-     * Get the dxaAbs field for the PAP record.
-     */
-    @Internal
-    public int getDxaAbs()
-    {
-        return field_17_dxaAbs;
-    }
-
-    /**
-     * Set the dxaAbs field for the PAP record.
-     */
-    @Internal
-    public void setDxaAbs( int field_17_dxaAbs )
-    {
-        this.field_17_dxaAbs = field_17_dxaAbs;
-    }
-
-    /**
-     * Get the dyaAbs field for the PAP record.
-     */
-    @Internal
-    public int getDyaAbs()
-    {
-        return field_18_dyaAbs;
-    }
-
-    /**
-     * Set the dyaAbs field for the PAP record.
-     */
-    @Internal
-    public void setDyaAbs( int field_18_dyaAbs )
-    {
-        this.field_18_dyaAbs = field_18_dyaAbs;
-    }
-
-    /**
-     * Get the dxaWidth field for the PAP record.
-     */
-    @Internal
-    public int getDxaWidth()
-    {
-        return field_19_dxaWidth;
-    }
-
-    /**
-     * Set the dxaWidth field for the PAP record.
-     */
-    @Internal
-    public void setDxaWidth( int field_19_dxaWidth )
-    {
-        this.field_19_dxaWidth = field_19_dxaWidth;
-    }
-
-    /**
-     * Get the fBrLnAbove field for the PAP record.
-     */
-    @Internal
-    public boolean getFBrLnAbove()
-    {
-        return field_20_fBrLnAbove;
-    }
-
-    /**
-     * Set the fBrLnAbove field for the PAP record.
-     */
-    @Internal
-    public void setFBrLnAbove( boolean field_20_fBrLnAbove )
-    {
-        this.field_20_fBrLnAbove = field_20_fBrLnAbove;
-    }
-
-    /**
-     * Get the fBrLnBelow field for the PAP record.
-     */
-    @Internal
-    public boolean getFBrLnBelow()
-    {
-        return field_21_fBrLnBelow;
-    }
-
-    /**
-     * Set the fBrLnBelow field for the PAP record.
-     */
-    @Internal
-    public void setFBrLnBelow( boolean field_21_fBrLnBelow )
-    {
-        this.field_21_fBrLnBelow = field_21_fBrLnBelow;
-    }
-
-    /**
-     * Get the pcVert field for the PAP record.
-     */
-    @Internal
-    public byte getPcVert()
-    {
-        return field_22_pcVert;
-    }
-
-    /**
-     * Set the pcVert field for the PAP record.
-     */
-    @Internal
-    public void setPcVert( byte field_22_pcVert )
-    {
-        this.field_22_pcVert = field_22_pcVert;
-    }
-
-    /**
-     * Get the pcHorz field for the PAP record.
-     */
-    @Internal
-    public byte getPcHorz()
-    {
-        return field_23_pcHorz;
-    }
-
-    /**
-     * Set the pcHorz field for the PAP record.
-     */
-    @Internal
-    public void setPcHorz( byte field_23_pcHorz )
-    {
-        this.field_23_pcHorz = field_23_pcHorz;
-    }
-
-    /**
-     * Get the wr field for the PAP record.
-     */
-    @Internal
-    public byte getWr()
-    {
-        return field_24_wr;
-    }
-
-    /**
-     * Set the wr field for the PAP record.
-     */
-    @Internal
-    public void setWr( byte field_24_wr )
-    {
-        this.field_24_wr = field_24_wr;
-    }
-
-    /**
-     * Get the fNoAutoHyph field for the PAP record.
-     */
-    @Internal
-    public boolean getFNoAutoHyph()
-    {
-        return field_25_fNoAutoHyph;
-    }
-
-    /**
-     * Set the fNoAutoHyph field for the PAP record.
-     */
-    @Internal
-    public void setFNoAutoHyph( boolean field_25_fNoAutoHyph )
-    {
-        this.field_25_fNoAutoHyph = field_25_fNoAutoHyph;
-    }
-
-    /**
-     * Get the dyaHeight field for the PAP record.
-     */
-    @Internal
-    public int getDyaHeight()
-    {
-        return field_26_dyaHeight;
-    }
-
-    /**
-     * Set the dyaHeight field for the PAP record.
-     */
-    @Internal
-    public void setDyaHeight( int field_26_dyaHeight )
-    {
-        this.field_26_dyaHeight = field_26_dyaHeight;
-    }
-
-    /**
-     * Minimum height is exact or auto.
-     *
-     * @return One of 
-     * <li>{@link #FMINHEIGHT_EXACT}
-     * <li>{@link #FMINHEIGHT_AT_LEAST}
-     */
-    @Internal
-    public boolean getFMinHeight()
-    {
-        return field_27_fMinHeight;
-    }
-
-    /**
-     * Minimum height is exact or auto.
-     *
-     * @param field_27_fMinHeight
-     *        One of 
-     * <li>{@link #FMINHEIGHT_EXACT}
-     * <li>{@link #FMINHEIGHT_AT_LEAST}
-     */
-    @Internal
-    public void setFMinHeight( boolean field_27_fMinHeight )
-    {
-        this.field_27_fMinHeight = field_27_fMinHeight;
-    }
-
-    /**
-     * Get the dcs field for the PAP record.
-     */
-    @Internal
-    public DropCapSpecifier getDcs()
-    {
-        return field_28_dcs;
-    }
-
-    /**
-     * Set the dcs field for the PAP record.
-     */
-    @Internal
-    public void setDcs( DropCapSpecifier field_28_dcs )
-    {
-        this.field_28_dcs = field_28_dcs;
-    }
-
-    /**
-     * Vertical distance between text and absolutely positioned object.
-     */
-    @Internal
-    public int getDyaFromText()
-    {
-        return field_29_dyaFromText;
-    }
-
-    /**
-     * Vertical distance between text and absolutely positioned object.
-     */
-    @Internal
-    public void setDyaFromText( int field_29_dyaFromText )
-    {
-        this.field_29_dyaFromText = field_29_dyaFromText;
-    }
-
-    /**
-     * Horizontal distance between text and absolutely positioned object.
-     */
-    @Internal
-    public int getDxaFromText()
-    {
-        return field_30_dxaFromText;
-    }
-
-    /**
-     * Horizontal distance between text and absolutely positioned object.
-     */
-    @Internal
-    public void setDxaFromText( int field_30_dxaFromText )
-    {
-        this.field_30_dxaFromText = field_30_dxaFromText;
-    }
-
-    /**
-     * Anchor of an absolutely positioned frame is locked.
-     */
-    @Internal
-    public boolean getFLocked()
-    {
-        return field_31_fLocked;
-    }
-
-    /**
-     * Anchor of an absolutely positioned frame is locked.
-     */
-    @Internal
-    public void setFLocked( boolean field_31_fLocked )
-    {
-        this.field_31_fLocked = field_31_fLocked;
-    }
-
-    /**
-     * 1, Word will prevent widowed lines in this paragraph from being placed at the beginning of a page.
-     */
-    @Internal
-    public boolean getFWidowControl()
-    {
-        return field_32_fWidowControl;
-    }
-
-    /**
-     * 1, Word will prevent widowed lines in this paragraph from being placed at the beginning of a page.
-     */
-    @Internal
-    public void setFWidowControl( boolean field_32_fWidowControl )
-    {
-        this.field_32_fWidowControl = field_32_fWidowControl;
-    }
-
-    /**
-     * apply Kinsoku rules when performing line wrapping.
-     */
-    @Internal
-    public boolean getFKinsoku()
-    {
-        return field_33_fKinsoku;
-    }
-
-    /**
-     * apply Kinsoku rules when performing line wrapping.
-     */
-    @Internal
-    public void setFKinsoku( boolean field_33_fKinsoku )
-    {
-        this.field_33_fKinsoku = field_33_fKinsoku;
-    }
-
-    /**
-     * perform word wrap.
-     */
-    @Internal
-    public boolean getFWordWrap()
-    {
-        return field_34_fWordWrap;
-    }
-
-    /**
-     * perform word wrap.
-     */
-    @Internal
-    public void setFWordWrap( boolean field_34_fWordWrap )
-    {
-        this.field_34_fWordWrap = field_34_fWordWrap;
-    }
-
-    /**
-     * apply overflow punctuation rules when performing line wrapping.
-     */
-    @Internal
-    public boolean getFOverflowPunct()
-    {
-        return field_35_fOverflowPunct;
-    }
-
-    /**
-     * apply overflow punctuation rules when performing line wrapping.
-     */
-    @Internal
-    public void setFOverflowPunct( boolean field_35_fOverflowPunct )
-    {
-        this.field_35_fOverflowPunct = field_35_fOverflowPunct;
-    }
-
-    /**
-     * perform top line punctuation processing.
-     */
-    @Internal
-    public boolean getFTopLinePunct()
-    {
-        return field_36_fTopLinePunct;
-    }
-
-    /**
-     * perform top line punctuation processing.
-     */
-    @Internal
-    public void setFTopLinePunct( boolean field_36_fTopLinePunct )
-    {
-        this.field_36_fTopLinePunct = field_36_fTopLinePunct;
-    }
-
-    /**
-     * auto space East Asian and alphabetic characters.
-     */
-    @Internal
-    public boolean getFAutoSpaceDE()
-    {
-        return field_37_fAutoSpaceDE;
-    }
-
-    /**
-     * auto space East Asian and alphabetic characters.
-     */
-    @Internal
-    public void setFAutoSpaceDE( boolean field_37_fAutoSpaceDE )
-    {
-        this.field_37_fAutoSpaceDE = field_37_fAutoSpaceDE;
-    }
-
-    /**
-     * auto space East Asian and numeric characters.
-     */
-    @Internal
-    public boolean getFAutoSpaceDN()
-    {
-        return field_38_fAutoSpaceDN;
-    }
-
-    /**
-     * auto space East Asian and numeric characters.
-     */
-    @Internal
-    public void setFAutoSpaceDN( boolean field_38_fAutoSpaceDN )
-    {
-        this.field_38_fAutoSpaceDN = field_38_fAutoSpaceDN;
-    }
-
-    /**
-     * Get the wAlignFont field for the PAP record.
-     *
-     * @return One of 
-     * <li>{@link #WALIGNFONT_HANGING}
-     * <li>{@link #WALIGNFONT_CENTERED}
-     * <li>{@link #WALIGNFONT_ROMAN}
-     * <li>{@link #WALIGNFONT_VARIABLE}
-     * <li>{@link #WALIGNFONT_AUTO}
-     */
-    @Internal
-    public int getWAlignFont()
-    {
-        return field_39_wAlignFont;
-    }
-
-    /**
-     * Set the wAlignFont field for the PAP record.
-     *
-     * @param field_39_wAlignFont
-     *        One of 
-     * <li>{@link #WALIGNFONT_HANGING}
-     * <li>{@link #WALIGNFONT_CENTERED}
-     * <li>{@link #WALIGNFONT_ROMAN}
-     * <li>{@link #WALIGNFONT_VARIABLE}
-     * <li>{@link #WALIGNFONT_AUTO}
-     */
-    @Internal
-    public void setWAlignFont( int field_39_wAlignFont )
-    {
-        this.field_39_wAlignFont = field_39_wAlignFont;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public short getFontAlign()
-    {
-        return field_40_fontAlign;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setFontAlign( short field_40_fontAlign )
-    {
-        this.field_40_fontAlign = field_40_fontAlign;
-    }
-
-    /**
-     * Outline level.
-     */
-    @Internal
-    public byte getLvl()
-    {
-        return field_41_lvl;
-    }
-
-    /**
-     * Outline level.
-     */
-    @Internal
-    public void setLvl( byte field_41_lvl )
-    {
-        this.field_41_lvl = field_41_lvl;
-    }
-
-    /**
-     * Get the fBiDi field for the PAP record.
-     */
-    @Internal
-    public boolean getFBiDi()
-    {
-        return field_42_fBiDi;
-    }
-
-    /**
-     * Set the fBiDi field for the PAP record.
-     */
-    @Internal
-    public void setFBiDi( boolean field_42_fBiDi )
-    {
-        this.field_42_fBiDi = field_42_fBiDi;
-    }
-
-    /**
-     * Get the fNumRMIns field for the PAP record.
-     */
-    @Internal
-    public boolean getFNumRMIns()
-    {
-        return field_43_fNumRMIns;
-    }
-
-    /**
-     * Set the fNumRMIns field for the PAP record.
-     */
-    @Internal
-    public void setFNumRMIns( boolean field_43_fNumRMIns )
-    {
-        this.field_43_fNumRMIns = field_43_fNumRMIns;
-    }
-
-    /**
-     * Get the fCrLf field for the PAP record.
-     */
-    @Internal
-    public boolean getFCrLf()
-    {
-        return field_44_fCrLf;
-    }
-
-    /**
-     * Set the fCrLf field for the PAP record.
-     */
-    @Internal
-    public void setFCrLf( boolean field_44_fCrLf )
-    {
-        this.field_44_fCrLf = field_44_fCrLf;
-    }
-
-    /**
-     * Get the fUsePgsuSettings field for the PAP record.
-     */
-    @Internal
-    public boolean getFUsePgsuSettings()
-    {
-        return field_45_fUsePgsuSettings;
-    }
-
-    /**
-     * Set the fUsePgsuSettings field for the PAP record.
-     */
-    @Internal
-    public void setFUsePgsuSettings( boolean field_45_fUsePgsuSettings )
-    {
-        this.field_45_fUsePgsuSettings = field_45_fUsePgsuSettings;
-    }
-
-    /**
-     * Get the fAdjustRight field for the PAP record.
-     */
-    @Internal
-    public boolean getFAdjustRight()
-    {
-        return field_46_fAdjustRight;
-    }
-
-    /**
-     * Set the fAdjustRight field for the PAP record.
-     */
-    @Internal
-    public void setFAdjustRight( boolean field_46_fAdjustRight )
-    {
-        this.field_46_fAdjustRight = field_46_fAdjustRight;
-    }
-
-    /**
-     * Table nesting level.
-     */
-    @Internal
-    public int getItap()
-    {
-        return field_47_itap;
-    }
-
-    /**
-     * Table nesting level.
-     */
-    @Internal
-    public void setItap( int field_47_itap )
-    {
-        this.field_47_itap = field_47_itap;
-    }
-
-    /**
-     * When 1, the end of paragraph mark is really an end of cell mark for a nested table cell.
-     */
-    @Internal
-    public boolean getFInnerTableCell()
-    {
-        return field_48_fInnerTableCell;
-    }
-
-    /**
-     * When 1, the end of paragraph mark is really an end of cell mark for a nested table cell.
-     */
-    @Internal
-    public void setFInnerTableCell( boolean field_48_fInnerTableCell )
-    {
-        this.field_48_fInnerTableCell = field_48_fInnerTableCell;
-    }
-
-    /**
-     * Ensure the Table Cell char doesn't show up as zero height.
-     */
-    @Internal
-    public boolean getFOpenTch()
-    {
-        return field_49_fOpenTch;
-    }
-
-    /**
-     * Ensure the Table Cell char doesn't show up as zero height.
-     */
-    @Internal
-    public void setFOpenTch( boolean field_49_fOpenTch )
-    {
-        this.field_49_fOpenTch = field_49_fOpenTch;
-    }
-
-    /**
-     * Word 97 compatibility indicates this end of paragraph mark is really an end of row marker for a nested table.
-     */
-    @Internal
-    public boolean getFTtpEmbedded()
-    {
-        return field_50_fTtpEmbedded;
-    }
-
-    /**
-     * Word 97 compatibility indicates this end of paragraph mark is really an end of row marker for a nested table.
-     */
-    @Internal
-    public void setFTtpEmbedded( boolean field_50_fTtpEmbedded )
-    {
-        this.field_50_fTtpEmbedded = field_50_fTtpEmbedded;
-    }
-
-    /**
-     * Right indent in character units.
-     */
-    @Internal
-    public short getDxcRight()
-    {
-        return field_51_dxcRight;
-    }
-
-    /**
-     * Right indent in character units.
-     */
-    @Internal
-    public void setDxcRight( short field_51_dxcRight )
-    {
-        this.field_51_dxcRight = field_51_dxcRight;
-    }
-
-    /**
-     * Left indent in character units.
-     */
-    @Internal
-    public short getDxcLeft()
-    {
-        return field_52_dxcLeft;
-    }
-
-    /**
-     * Left indent in character units.
-     */
-    @Internal
-    public void setDxcLeft( short field_52_dxcLeft )
-    {
-        this.field_52_dxcLeft = field_52_dxcLeft;
-    }
-
-    /**
-     * First line indent in character units.
-     */
-    @Internal
-    public short getDxcLeft1()
-    {
-        return field_53_dxcLeft1;
-    }
-
-    /**
-     * First line indent in character units.
-     */
-    @Internal
-    public void setDxcLeft1( short field_53_dxcLeft1 )
-    {
-        this.field_53_dxcLeft1 = field_53_dxcLeft1;
-    }
-
-    /**
-     * Vertical spacing before is automatic.
-     */
-    @Internal
-    public boolean getFDyaBeforeAuto()
-    {
-        return field_54_fDyaBeforeAuto;
-    }
-
-    /**
-     * Vertical spacing before is automatic.
-     */
-    @Internal
-    public void setFDyaBeforeAuto( boolean field_54_fDyaBeforeAuto )
-    {
-        this.field_54_fDyaBeforeAuto = field_54_fDyaBeforeAuto;
-    }
-
-    /**
-     * Vertical spacing after is automatic.
-     */
-    @Internal
-    public boolean getFDyaAfterAuto()
-    {
-        return field_55_fDyaAfterAuto;
-    }
-
-    /**
-     * Vertical spacing after is automatic.
-     */
-    @Internal
-    public void setFDyaAfterAuto( boolean field_55_fDyaAfterAuto )
-    {
-        this.field_55_fDyaAfterAuto = field_55_fDyaAfterAuto;
-    }
-
-    /**
-     * Get the dxaRight field for the PAP record.
-     */
-    @Internal
-    public int getDxaRight()
-    {
-        return field_56_dxaRight;
-    }
-
-    /**
-     * Set the dxaRight field for the PAP record.
-     */
-    @Internal
-    public void setDxaRight( int field_56_dxaRight )
-    {
-        this.field_56_dxaRight = field_56_dxaRight;
-    }
-
-    /**
-     * Get the dxaLeft field for the PAP record.
-     */
-    @Internal
-    public int getDxaLeft()
-    {
-        return field_57_dxaLeft;
-    }
-
-    /**
-     * Set the dxaLeft field for the PAP record.
-     */
-    @Internal
-    public void setDxaLeft( int field_57_dxaLeft )
-    {
-        this.field_57_dxaLeft = field_57_dxaLeft;
-    }
-
-    /**
-     * Get the dxaLeft1 field for the PAP record.
-     */
-    @Internal
-    public int getDxaLeft1()
-    {
-        return field_58_dxaLeft1;
-    }
-
-    /**
-     * Set the dxaLeft1 field for the PAP record.
-     */
-    @Internal
-    public void setDxaLeft1( int field_58_dxaLeft1 )
-    {
-        this.field_58_dxaLeft1 = field_58_dxaLeft1;
-    }
-
-    /**
-     * Get the jc field for the PAP record.
-     */
-    @Internal
-    public byte getJc()
-    {
-        return field_59_jc;
-    }
-
-    /**
-     * Set the jc field for the PAP record.
-     */
-    @Internal
-    public void setJc( byte field_59_jc )
-    {
-        this.field_59_jc = field_59_jc;
-    }
-
-    /**
-     * Get the brcTop field for the PAP record.
-     */
-    @Internal
-    public BorderCode getBrcTop()
-    {
-        return field_60_brcTop;
-    }
-
-    /**
-     * Set the brcTop field for the PAP record.
-     */
-    @Internal
-    public void setBrcTop( BorderCode field_60_brcTop )
-    {
-        this.field_60_brcTop = field_60_brcTop;
-    }
-
-    /**
-     * Get the brcLeft field for the PAP record.
-     */
-    @Internal
-    public BorderCode getBrcLeft()
-    {
-        return field_61_brcLeft;
-    }
-
-    /**
-     * Set the brcLeft field for the PAP record.
-     */
-    @Internal
-    public void setBrcLeft( BorderCode field_61_brcLeft )
-    {
-        this.field_61_brcLeft = field_61_brcLeft;
-    }
-
-    /**
-     * Get the brcBottom field for the PAP record.
-     */
-    @Internal
-    public BorderCode getBrcBottom()
-    {
-        return field_62_brcBottom;
-    }
-
-    /**
-     * Set the brcBottom field for the PAP record.
-     */
-    @Internal
-    public void setBrcBottom( BorderCode field_62_brcBottom )
-    {
-        this.field_62_brcBottom = field_62_brcBottom;
-    }
-
-    /**
-     * Get the brcRight field for the PAP record.
-     */
-    @Internal
-    public BorderCode getBrcRight()
-    {
-        return field_63_brcRight;
-    }
-
-    /**
-     * Set the brcRight field for the PAP record.
-     */
-    @Internal
-    public void setBrcRight( BorderCode field_63_brcRight )
-    {
-        this.field_63_brcRight = field_63_brcRight;
-    }
-
-    /**
-     * Get the brcBetween field for the PAP record.
-     */
-    @Internal
-    public BorderCode getBrcBetween()
-    {
-        return field_64_brcBetween;
-    }
-
-    /**
-     * Set the brcBetween field for the PAP record.
-     */
-    @Internal
-    public void setBrcBetween( BorderCode field_64_brcBetween )
-    {
-        this.field_64_brcBetween = field_64_brcBetween;
-    }
-
-    /**
-     * Get the brcBar field for the PAP record.
-     */
-    @Internal
-    public BorderCode getBrcBar()
-    {
-        return field_65_brcBar;
-    }
-
-    /**
-     * Set the brcBar field for the PAP record.
-     */
-    @Internal
-    public void setBrcBar( BorderCode field_65_brcBar )
-    {
-        this.field_65_brcBar = field_65_brcBar;
-    }
-
-    /**
-     * Get the shd field for the PAP record.
-     */
-    @Internal
-    public ShadingDescriptor getShd()
-    {
-        return field_66_shd;
-    }
-
-    /**
-     * Set the shd field for the PAP record.
-     */
-    @Internal
-    public void setShd( ShadingDescriptor field_66_shd )
-    {
-        this.field_66_shd = field_66_shd;
-    }
-
-    /**
-     * Get the anld field for the PAP record.
-     */
-    @Internal
-    public byte[] getAnld()
-    {
-        return field_67_anld;
-    }
-
-    /**
-     * Set the anld field for the PAP record.
-     */
-    @Internal
-    public void setAnld( byte[] field_67_anld )
-    {
-        this.field_67_anld = field_67_anld;
-    }
-
-    /**
-     * Get the phe field for the PAP record.
-     */
-    @Internal
-    public byte[] getPhe()
-    {
-        return field_68_phe;
-    }
-
-    /**
-     * Set the phe field for the PAP record.
-     */
-    @Internal
-    public void setPhe( byte[] field_68_phe )
-    {
-        this.field_68_phe = field_68_phe;
-    }
-
-    /**
-     * Get the fPropRMark field for the PAP record.
-     */
-    @Internal
-    public boolean getFPropRMark()
-    {
-        return field_69_fPropRMark;
-    }
-
-    /**
-     * Set the fPropRMark field for the PAP record.
-     */
-    @Internal
-    public void setFPropRMark( boolean field_69_fPropRMark )
-    {
-        this.field_69_fPropRMark = field_69_fPropRMark;
-    }
-
-    /**
-     * Get the ibstPropRMark field for the PAP record.
-     */
-    @Internal
-    public int getIbstPropRMark()
-    {
-        return field_70_ibstPropRMark;
-    }
-
-    /**
-     * Set the ibstPropRMark field for the PAP record.
-     */
-    @Internal
-    public void setIbstPropRMark( int field_70_ibstPropRMark )
-    {
-        this.field_70_ibstPropRMark = field_70_ibstPropRMark;
-    }
-
-    /**
-     * Get the dttmPropRMark field for the PAP record.
-     */
-    @Internal
-    public DateAndTime getDttmPropRMark()
-    {
-        return field_71_dttmPropRMark;
-    }
-
-    /**
-     * Set the dttmPropRMark field for the PAP record.
-     */
-    @Internal
-    public void setDttmPropRMark( DateAndTime field_71_dttmPropRMark )
-    {
-        this.field_71_dttmPropRMark = field_71_dttmPropRMark;
-    }
-
-    /**
-     * Number of tabs stops defined for paragraph. Must be >= 0 and <= 64..
-     */
-    @Internal
-    public int getItbdMac()
-    {
-        return field_72_itbdMac;
-    }
-
-    /**
-     * Number of tabs stops defined for paragraph. Must be >= 0 and <= 64..
-     */
-    @Internal
-    public void setItbdMac( int field_72_itbdMac )
-    {
-        this.field_72_itbdMac = field_72_itbdMac;
-    }
-
-    /**
-     * Array of positions of itbdMac tab stops. itbdMax==64.
-     */
-    @Internal
-    public int[] getRgdxaTab()
-    {
-        return field_73_rgdxaTab;
-    }
-
-    /**
-     * Array of positions of itbdMac tab stops. itbdMax==64.
-     */
-    @Internal
-    public void setRgdxaTab( int[] field_73_rgdxaTab )
-    {
-        this.field_73_rgdxaTab = field_73_rgdxaTab;
-    }
-
-    /**
-     * Array of itbdMac tab descriptors.
-     */
-    @Internal
-    public TabDescriptor[] getRgtbd()
-    {
-        return field_74_rgtbd;
-    }
-
-    /**
-     * Array of itbdMac tab descriptors.
-     */
-    @Internal
-    public void setRgtbd( TabDescriptor[] field_74_rgtbd )
-    {
-        this.field_74_rgtbd = field_74_rgtbd;
-    }
-
-    /**
-     * Get the numrm field for the PAP record.
-     */
-    @Internal
-    public byte[] getNumrm()
-    {
-        return field_75_numrm;
-    }
-
-    /**
-     * Set the numrm field for the PAP record.
-     */
-    @Internal
-    public void setNumrm( byte[] field_75_numrm )
-    {
-        this.field_75_numrm = field_75_numrm;
-    }
-
-    /**
-     * Get the ptap field for the PAP record.
-     */
-    @Internal
-    public byte[] getPtap()
-    {
-        return field_76_ptap;
-    }
-
-    /**
-     * Set the ptap field for the PAP record.
-     */
-    @Internal
-    public void setPtap( byte[] field_76_ptap )
-    {
-        this.field_76_ptap = field_76_ptap;
-    }
-
-    /**
-     * When 1, absolutely positioned paragraph cannot overlap with another paragraph.
-     */
-    @Internal
-    public boolean getFNoAllowOverlap()
-    {
-        return field_77_fNoAllowOverlap;
-    }
-
-    /**
-     * When 1, absolutely positioned paragraph cannot overlap with another paragraph.
-     */
-    @Internal
-    public void setFNoAllowOverlap( boolean field_77_fNoAllowOverlap )
-    {
-        this.field_77_fNoAllowOverlap = field_77_fNoAllowOverlap;
-    }
-
-    /**
-     * HTML DIV ID for this paragraph.
-     */
-    @Internal
-    public long getIpgp()
-    {
-        return field_78_ipgp;
-    }
-
-    /**
-     * HTML DIV ID for this paragraph.
-     */
-    @Internal
-    public void setIpgp( long field_78_ipgp )
-    {
-        this.field_78_ipgp = field_78_ipgp;
-    }
-
-    /**
-     * Save ID for last time this PAP was revised.
-     */
-    @Internal
-    public long getRsid()
-    {
-        return field_79_rsid;
-    }
-
-    /**
-     * Save ID for last time this PAP was revised.
-     */
-    @Internal
-    public void setRsid( long field_79_rsid )
-    {
-        this.field_79_rsid = field_79_rsid;
-    }
-
-    /**
-     * Sets the fVertical field value.
-     * 
-     */
-    @Internal
-    public void setFVertical( boolean value )
-    {
-        field_40_fontAlign = (short)fVertical.setBoolean(field_40_fontAlign, value);
-    }
-
-    /**
-     * 
-     * @return  the fVertical field value.
-     */
-    @Internal
-    public boolean isFVertical()
-    {
-        return fVertical.isSet(field_40_fontAlign);
-    }
-
-    /**
-     * Sets the fBackward field value.
-     * 
-     */
-    @Internal
-    public void setFBackward( boolean value )
-    {
-        field_40_fontAlign = (short)fBackward.setBoolean(field_40_fontAlign, value);
-    }
-
-    /**
-     * 
-     * @return  the fBackward field value.
-     */
-    @Internal
-    public boolean isFBackward()
-    {
-        return fBackward.isSet(field_40_fontAlign);
-    }
-
-    /**
-     * Sets the fRotateFont field value.
-     * 
-     */
-    @Internal
-    public void setFRotateFont( boolean value )
-    {
-        field_40_fontAlign = (short)fRotateFont.setBoolean(field_40_fontAlign, value);
-    }
-
-    /**
-     * 
-     * @return  the fRotateFont field value.
-     */
-    @Internal
-    public boolean isFRotateFont()
-    {
-        return fRotateFont.isSet(field_40_fontAlign);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java
deleted file mode 100644
index b41b2ba..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hwpf.model.types;
-
-
-import java.util.Arrays;
-
-import org.apache.poi.util.*;
-
-/**
- * The PICF structure specifies the type of a picture, as well as the size of the
-        picture and information about its border. <p>Class and fields descriptions are quoted
-        from Microsoft Office Word 97-2007
-        Binary File Format and [MS-DOC] - v20110608 Word (.doc)
-        Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class PICFAbstractType
-{
-
-    protected int field_1_lcb;
-    protected int field_2_cbHeader;
-    protected short field_3_mm;
-    protected short field_4_xExt;
-    protected short field_5_yExt;
-    protected short field_6_swHMF;
-    protected int field_7_grf;
-    protected int field_8_padding;
-    protected int field_9_mmPM;
-    protected int field_10_padding2;
-    protected short field_11_dxaGoal;
-    protected short field_12_dyaGoal;
-    protected int field_13_mx;
-    protected int field_14_my;
-    protected short field_15_dxaReserved1;
-    protected short field_16_dyaReserved1;
-    protected short field_17_dxaReserved2;
-    protected short field_18_dyaReserved2;
-    protected byte field_19_fReserved;
-    protected byte field_20_bpp;
-    protected byte[] field_21_brcTop80;
-    protected byte[] field_22_brcLeft80;
-    protected byte[] field_23_brcBottom80;
-    protected byte[] field_24_brcRight80;
-    protected short field_25_dxaReserved3;
-    protected short field_26_dyaReserved3;
-    protected short field_27_cProps;
-
-    protected PICFAbstractType()
-    {
-        this.field_21_brcTop80 = new byte[4];
-        this.field_22_brcLeft80 = new byte[4];
-        this.field_23_brcBottom80 = new byte[4];
-        this.field_24_brcRight80 = new byte[4];
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_lcb                    = LittleEndian.getInt( data, 0x0 + offset );
-        field_2_cbHeader               = LittleEndian.getShort( data, 0x4 + offset );
-        field_3_mm                     = LittleEndian.getShort( data, 0x6 + offset );
-        field_4_xExt                   = LittleEndian.getShort( data, 0x8 + offset );
-        field_5_yExt                   = LittleEndian.getShort( data, 0xa + offset );
-        field_6_swHMF                  = LittleEndian.getShort( data, 0xc + offset );
-        field_7_grf                    = LittleEndian.getInt( data, 0xe + offset );
-        field_8_padding                = LittleEndian.getInt( data, 0x12 + offset );
-        field_9_mmPM                   = LittleEndian.getShort( data, 0x16 + offset );
-        field_10_padding2              = LittleEndian.getInt( data, 0x18 + offset );
-        field_11_dxaGoal               = LittleEndian.getShort( data, 0x1c + offset );
-        field_12_dyaGoal               = LittleEndian.getShort( data, 0x1e + offset );
-        field_13_mx                    = LittleEndian.getShort( data, 0x20 + offset );
-        field_14_my                    = LittleEndian.getShort( data, 0x22 + offset );
-        field_15_dxaReserved1          = LittleEndian.getShort( data, 0x24 + offset );
-        field_16_dyaReserved1          = LittleEndian.getShort( data, 0x26 + offset );
-        field_17_dxaReserved2          = LittleEndian.getShort( data, 0x28 + offset );
-        field_18_dyaReserved2          = LittleEndian.getShort( data, 0x2a + offset );
-        field_19_fReserved             = data[ 0x2c + offset ];
-        field_20_bpp                   = data[ 0x2d + offset ];
-        field_21_brcTop80              = LittleEndian.getByteArray( data, 0x2e + offset,4 );
-        field_22_brcLeft80             = LittleEndian.getByteArray( data, 0x32 + offset,4 );
-        field_23_brcBottom80           = LittleEndian.getByteArray( data, 0x36 + offset,4 );
-        field_24_brcRight80            = LittleEndian.getByteArray( data, 0x3a + offset,4 );
-        field_25_dxaReserved3          = LittleEndian.getShort( data, 0x3e + offset );
-        field_26_dyaReserved3          = LittleEndian.getShort( data, 0x40 + offset );
-        field_27_cProps                = LittleEndian.getShort( data, 0x42 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putInt( data, 0x0 + offset, field_1_lcb );
-        LittleEndian.putUShort( data, 0x4 + offset, field_2_cbHeader );
-        LittleEndian.putShort( data, 0x6 + offset, field_3_mm );
-        LittleEndian.putShort( data, 0x8 + offset, field_4_xExt );
-        LittleEndian.putShort( data, 0xa + offset, field_5_yExt );
-        LittleEndian.putShort( data, 0xc + offset, field_6_swHMF );
-        LittleEndian.putInt( data, 0xe + offset, field_7_grf );
-        LittleEndian.putInt( data, 0x12 + offset, field_8_padding );
-        LittleEndian.putUShort( data, 0x16 + offset, field_9_mmPM );
-        LittleEndian.putInt( data, 0x18 + offset, field_10_padding2 );
-        LittleEndian.putShort( data, 0x1c + offset, field_11_dxaGoal );
-        LittleEndian.putShort( data, 0x1e + offset, field_12_dyaGoal );
-        LittleEndian.putUShort( data, 0x20 + offset, field_13_mx );
-        LittleEndian.putUShort( data, 0x22 + offset, field_14_my );
-        LittleEndian.putShort( data, 0x24 + offset, field_15_dxaReserved1 );
-        LittleEndian.putShort( data, 0x26 + offset, field_16_dyaReserved1 );
-        LittleEndian.putShort( data, 0x28 + offset, field_17_dxaReserved2 );
-        LittleEndian.putShort( data, 0x2a + offset, field_18_dyaReserved2 );
-        data[ 0x2c + offset ] = field_19_fReserved;
-        data[ 0x2d + offset ] = field_20_bpp;
-        System.arraycopy( field_21_brcTop80, 0, data, 0x2e + offset, field_21_brcTop80.length );
-        System.arraycopy( field_22_brcLeft80, 0, data, 0x32 + offset, field_22_brcLeft80.length );
-        System.arraycopy( field_23_brcBottom80, 0, data, 0x36 + offset, field_23_brcBottom80.length );
-        System.arraycopy( field_24_brcRight80, 0, data, 0x3a + offset, field_24_brcRight80.length );
-        LittleEndian.putShort( data, 0x3e + offset, field_25_dxaReserved3 );
-        LittleEndian.putShort( data, 0x40 + offset, field_26_dyaReserved3 );
-        LittleEndian.putShort( data, 0x42 + offset, field_27_cProps );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 2 + 2 + 2 + 2 + 2 + 4 + 4 + 2 + 4 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + 1 + 4 + 4 + 4 + 4 + 2 + 2 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[PICF]\n");
-        builder.append("    .lcb                  = ");
-        builder.append(" (").append(getLcb()).append(" )\n");
-        builder.append("    .cbHeader             = ");
-        builder.append(" (").append(getCbHeader()).append(" )\n");
-        builder.append("    .mm                   = ");
-        builder.append(" (").append(getMm()).append(" )\n");
-        builder.append("    .xExt                 = ");
-        builder.append(" (").append(getXExt()).append(" )\n");
-        builder.append("    .yExt                 = ");
-        builder.append(" (").append(getYExt()).append(" )\n");
-        builder.append("    .swHMF                = ");
-        builder.append(" (").append(getSwHMF()).append(" )\n");
-        builder.append("    .grf                  = ");
-        builder.append(" (").append(getGrf()).append(" )\n");
-        builder.append("    .padding              = ");
-        builder.append(" (").append(getPadding()).append(" )\n");
-        builder.append("    .mmPM                 = ");
-        builder.append(" (").append(getMmPM()).append(" )\n");
-        builder.append("    .padding2             = ");
-        builder.append(" (").append(getPadding2()).append(" )\n");
-        builder.append("    .dxaGoal              = ");
-        builder.append(" (").append(getDxaGoal()).append(" )\n");
-        builder.append("    .dyaGoal              = ");
-        builder.append(" (").append(getDyaGoal()).append(" )\n");
-        builder.append("    .mx                   = ");
-        builder.append(" (").append(getMx()).append(" )\n");
-        builder.append("    .my                   = ");
-        builder.append(" (").append(getMy()).append(" )\n");
-        builder.append("    .dxaReserved1         = ");
-        builder.append(" (").append(getDxaReserved1()).append(" )\n");
-        builder.append("    .dyaReserved1         = ");
-        builder.append(" (").append(getDyaReserved1()).append(" )\n");
-        builder.append("    .dxaReserved2         = ");
-        builder.append(" (").append(getDxaReserved2()).append(" )\n");
-        builder.append("    .dyaReserved2         = ");
-        builder.append(" (").append(getDyaReserved2()).append(" )\n");
-        builder.append("    .fReserved            = ");
-        builder.append(" (").append(getFReserved()).append(" )\n");
-        builder.append("    .bpp                  = ");
-        builder.append(" (").append(getBpp()).append(" )\n");
-        builder.append("    .brcTop80             = ");
-        builder.append(" (").append(Arrays.toString(getBrcTop80())).append(" )\n");
-        builder.append("    .brcLeft80            = ");
-        builder.append(" (").append(Arrays.toString(getBrcLeft80())).append(" )\n");
-        builder.append("    .brcBottom80          = ");
-        builder.append(" (").append(Arrays.toString(getBrcBottom80())).append(" )\n");
-        builder.append("    .brcRight80           = ");
-        builder.append(" (").append(Arrays.toString(getBrcRight80())).append(" )\n");
-        builder.append("    .dxaReserved3         = ");
-        builder.append(" (").append(getDxaReserved3()).append(" )\n");
-        builder.append("    .dyaReserved3         = ");
-        builder.append(" (").append(getDyaReserved3()).append(" )\n");
-        builder.append("    .cProps               = ");
-        builder.append(" (").append(getCProps()).append(" )\n");
-
-        builder.append("[/PICF]\n");
-        return builder.toString();
-    }
-
-    /**
-     * A signed integer that specifies the size, in bytes, of this PICF structure and the subsequent data.
-     */
-    @Internal
-    public int getLcb()
-    {
-        return field_1_lcb;
-    }
-
-    /**
-     * A signed integer that specifies the size, in bytes, of this PICF structure and the subsequent data.
-     */
-    @Internal
-    public void setLcb( int field_1_lcb )
-    {
-        this.field_1_lcb = field_1_lcb;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of this PICF structure. This value MUST be 0x44.
-     */
-    @Internal
-    public int getCbHeader()
-    {
-        return field_2_cbHeader;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of this PICF structure. This value MUST be 0x44.
-     */
-    @Internal
-    public void setCbHeader( int field_2_cbHeader )
-    {
-        this.field_2_cbHeader = field_2_cbHeader;
-    }
-
-    /**
-     * A signed integer that specifies the format of the picture data.
-     */
-    @Internal
-    public short getMm()
-    {
-        return field_3_mm;
-    }
-
-    /**
-     * A signed integer that specifies the format of the picture data.
-     */
-    @Internal
-    public void setMm( short field_3_mm )
-    {
-        this.field_3_mm = field_3_mm;
-    }
-
-    /**
-     * This field is unused and MUST be ignored.
-     */
-    @Internal
-    public short getXExt()
-    {
-        return field_4_xExt;
-    }
-
-    /**
-     * This field is unused and MUST be ignored.
-     */
-    @Internal
-    public void setXExt( short field_4_xExt )
-    {
-        this.field_4_xExt = field_4_xExt;
-    }
-
-    /**
-     * This field is unused and MUST be ignored.
-     */
-    @Internal
-    public short getYExt()
-    {
-        return field_5_yExt;
-    }
-
-    /**
-     * This field is unused and MUST be ignored.
-     */
-    @Internal
-    public void setYExt( short field_5_yExt )
-    {
-        this.field_5_yExt = field_5_yExt;
-    }
-
-    /**
-     * This field is unused and MUST be ignored.
-     */
-    @Internal
-    public short getSwHMF()
-    {
-        return field_6_swHMF;
-    }
-
-    /**
-     * This field is unused and MUST be ignored.
-     */
-    @Internal
-    public void setSwHMF( short field_6_swHMF )
-    {
-        this.field_6_swHMF = field_6_swHMF;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public int getGrf()
-    {
-        return field_7_grf;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public void setGrf( int field_7_grf )
-    {
-        this.field_7_grf = field_7_grf;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public int getPadding()
-    {
-        return field_8_padding;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public void setPadding( int field_8_padding )
-    {
-        this.field_8_padding = field_8_padding;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public int getMmPM()
-    {
-        return field_9_mmPM;
-    }
-
-    /**
-     * This field MUST be ignored.
-     */
-    @Internal
-    public void setMmPM( int field_9_mmPM )
-    {
-        this.field_9_mmPM = field_9_mmPM;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public int getPadding2()
-    {
-        return field_10_padding2;
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored.
-     */
-    @Internal
-    public void setPadding2( int field_10_padding2 )
-    {
-        this.field_10_padding2 = field_10_padding2;
-    }
-
-    /**
-     * Get the dxaGoal field for the PICF record.
-     */
-    @Internal
-    public short getDxaGoal()
-    {
-        return field_11_dxaGoal;
-    }
-
-    /**
-     * Set the dxaGoal field for the PICF record.
-     */
-    @Internal
-    public void setDxaGoal( short field_11_dxaGoal )
-    {
-        this.field_11_dxaGoal = field_11_dxaGoal;
-    }
-
-    /**
-     * Get the dyaGoal field for the PICF record.
-     */
-    @Internal
-    public short getDyaGoal()
-    {
-        return field_12_dyaGoal;
-    }
-
-    /**
-     * Set the dyaGoal field for the PICF record.
-     */
-    @Internal
-    public void setDyaGoal( short field_12_dyaGoal )
-    {
-        this.field_12_dyaGoal = field_12_dyaGoal;
-    }
-
-    /**
-     * Get the mx field for the PICF record.
-     */
-    @Internal
-    public int getMx()
-    {
-        return field_13_mx;
-    }
-
-    /**
-     * Set the mx field for the PICF record.
-     */
-    @Internal
-    public void setMx( int field_13_mx )
-    {
-        this.field_13_mx = field_13_mx;
-    }
-
-    /**
-     * Get the my field for the PICF record.
-     */
-    @Internal
-    public int getMy()
-    {
-        return field_14_my;
-    }
-
-    /**
-     * Set the my field for the PICF record.
-     */
-    @Internal
-    public void setMy( int field_14_my )
-    {
-        this.field_14_my = field_14_my;
-    }
-
-    /**
-     * Get the dxaReserved1 field for the PICF record.
-     */
-    @Internal
-    public short getDxaReserved1()
-    {
-        return field_15_dxaReserved1;
-    }
-
-    /**
-     * Set the dxaReserved1 field for the PICF record.
-     */
-    @Internal
-    public void setDxaReserved1( short field_15_dxaReserved1 )
-    {
-        this.field_15_dxaReserved1 = field_15_dxaReserved1;
-    }
-
-    /**
-     * Get the dyaReserved1 field for the PICF record.
-     */
-    @Internal
-    public short getDyaReserved1()
-    {
-        return field_16_dyaReserved1;
-    }
-
-    /**
-     * Set the dyaReserved1 field for the PICF record.
-     */
-    @Internal
-    public void setDyaReserved1( short field_16_dyaReserved1 )
-    {
-        this.field_16_dyaReserved1 = field_16_dyaReserved1;
-    }
-
-    /**
-     * Get the dxaReserved2 field for the PICF record.
-     */
-    @Internal
-    public short getDxaReserved2()
-    {
-        return field_17_dxaReserved2;
-    }
-
-    /**
-     * Set the dxaReserved2 field for the PICF record.
-     */
-    @Internal
-    public void setDxaReserved2( short field_17_dxaReserved2 )
-    {
-        this.field_17_dxaReserved2 = field_17_dxaReserved2;
-    }
-
-    /**
-     * Get the dyaReserved2 field for the PICF record.
-     */
-    @Internal
-    public short getDyaReserved2()
-    {
-        return field_18_dyaReserved2;
-    }
-
-    /**
-     * Set the dyaReserved2 field for the PICF record.
-     */
-    @Internal
-    public void setDyaReserved2( short field_18_dyaReserved2 )
-    {
-        this.field_18_dyaReserved2 = field_18_dyaReserved2;
-    }
-
-    /**
-     * Get the fReserved field for the PICF record.
-     */
-    @Internal
-    public byte getFReserved()
-    {
-        return field_19_fReserved;
-    }
-
-    /**
-     * Set the fReserved field for the PICF record.
-     */
-    @Internal
-    public void setFReserved( byte field_19_fReserved )
-    {
-        this.field_19_fReserved = field_19_fReserved;
-    }
-
-    /**
-     * Get the bpp field for the PICF record.
-     */
-    @Internal
-    public byte getBpp()
-    {
-        return field_20_bpp;
-    }
-
-    /**
-     * Set the bpp field for the PICF record.
-     */
-    @Internal
-    public void setBpp( byte field_20_bpp )
-    {
-        this.field_20_bpp = field_20_bpp;
-    }
-
-    /**
-     * Get the brcTop80 field for the PICF record.
-     */
-    @Internal
-    public byte[] getBrcTop80()
-    {
-        return field_21_brcTop80;
-    }
-
-    /**
-     * Set the brcTop80 field for the PICF record.
-     */
-    @Internal
-    public void setBrcTop80( byte[] field_21_brcTop80 )
-    {
-        this.field_21_brcTop80 = field_21_brcTop80;
-    }
-
-    /**
-     * Get the brcLeft80 field for the PICF record.
-     */
-    @Internal
-    public byte[] getBrcLeft80()
-    {
-        return field_22_brcLeft80;
-    }
-
-    /**
-     * Set the brcLeft80 field for the PICF record.
-     */
-    @Internal
-    public void setBrcLeft80( byte[] field_22_brcLeft80 )
-    {
-        this.field_22_brcLeft80 = field_22_brcLeft80;
-    }
-
-    /**
-     * Get the brcBottom80 field for the PICF record.
-     */
-    @Internal
-    public byte[] getBrcBottom80()
-    {
-        return field_23_brcBottom80;
-    }
-
-    /**
-     * Set the brcBottom80 field for the PICF record.
-     */
-    @Internal
-    public void setBrcBottom80( byte[] field_23_brcBottom80 )
-    {
-        this.field_23_brcBottom80 = field_23_brcBottom80;
-    }
-
-    /**
-     * Get the brcRight80 field for the PICF record.
-     */
-    @Internal
-    public byte[] getBrcRight80()
-    {
-        return field_24_brcRight80;
-    }
-
-    /**
-     * Set the brcRight80 field for the PICF record.
-     */
-    @Internal
-    public void setBrcRight80( byte[] field_24_brcRight80 )
-    {
-        this.field_24_brcRight80 = field_24_brcRight80;
-    }
-
-    /**
-     * Get the dxaReserved3 field for the PICF record.
-     */
-    @Internal
-    public short getDxaReserved3()
-    {
-        return field_25_dxaReserved3;
-    }
-
-    /**
-     * Set the dxaReserved3 field for the PICF record.
-     */
-    @Internal
-    public void setDxaReserved3( short field_25_dxaReserved3 )
-    {
-        this.field_25_dxaReserved3 = field_25_dxaReserved3;
-    }
-
-    /**
-     * Get the dyaReserved3 field for the PICF record.
-     */
-    @Internal
-    public short getDyaReserved3()
-    {
-        return field_26_dyaReserved3;
-    }
-
-    /**
-     * Set the dyaReserved3 field for the PICF record.
-     */
-    @Internal
-    public void setDyaReserved3( short field_26_dyaReserved3 )
-    {
-        this.field_26_dyaReserved3 = field_26_dyaReserved3;
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored.
-     */
-    @Internal
-    public short getCProps()
-    {
-        return field_27_cProps;
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored.
-     */
-    @Internal
-    public void setCProps( short field_27_cProps )
-    {
-        this.field_27_cProps = field_27_cProps;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java
deleted file mode 100644
index c2f0f9c..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java
+++ /dev/null
@@ -1,1253 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.DateAndTime;
-import org.apache.poi.util.Internal;
-
-/**
- * Section Properties.
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/records/definitions.
- *
- * @author S. Ryan Ackley
- */
-@Internal
-public abstract class SEPAbstractType
-{
-
-    protected byte field_1_bkc;
-    /** No break */
-    /**/public final static byte BKC_NO_BREAK = 0;
-    /** New column */
-    /**/public final static byte BKC_NEW_COLUMN = 1;
-    /** New page */
-    /**/public final static byte BKC_NEW_PAGE = 2;
-    /** Even page */
-    /**/public final static byte BKC_EVEN_PAGE = 3;
-    /** Odd page */
-    /**/public final static byte BKC_ODD_PAGE = 4;
-    protected boolean field_2_fTitlePage;
-    protected boolean field_3_fAutoPgn;
-    protected byte field_4_nfcPgn;
-    /** Arabic */
-    /**/public final static byte NFCPGN_ARABIC = 0;
-    /** Roman (upper case) */
-    /**/public final static byte NFCPGN_ROMAN_UPPER_CASE = 1;
-    /** Roman (lower case) */
-    /**/public final static byte NFCPGN_ROMAN_LOWER_CASE = 2;
-    /** Letter (upper case) */
-    /**/public final static byte NFCPGN_LETTER_UPPER_CASE = 3;
-    /** Letter (lower case) */
-    /**/public final static byte NFCPGN_LETTER_LOWER_CASE = 4;
-    protected boolean field_5_fUnlocked;
-    protected byte field_6_cnsPgn;
-    protected boolean field_7_fPgnRestart;
-    protected boolean field_8_fEndNote;
-    protected byte field_9_lnc;
-    protected byte field_10_grpfIhdt;
-    protected int field_11_nLnnMod;
-    protected int field_12_dxaLnn;
-    protected int field_13_dxaPgn;
-    protected int field_14_dyaPgn;
-    protected boolean field_15_fLBetween;
-    protected byte field_16_vjc;
-    protected int field_17_dmBinFirst;
-    protected int field_18_dmBinOther;
-    protected int field_19_dmPaperReq;
-    protected BorderCode field_20_brcTop;
-    protected BorderCode field_21_brcLeft;
-    protected BorderCode field_22_brcBottom;
-    protected BorderCode field_23_brcRight;
-    protected boolean field_24_fPropMark;
-    protected int field_25_ibstPropRMark;
-    protected DateAndTime field_26_dttmPropRMark;
-    protected int field_27_dxtCharSpace;
-    protected int field_28_dyaLinePitch;
-    protected int field_29_clm;
-    protected int field_30_unused2;
-    protected boolean field_31_dmOrientPage;
-    /**/public final static boolean DMORIENTPAGE_LANDSCAPE = false;
-    /**/public final static boolean DMORIENTPAGE_PORTRAIT = true;
-    protected byte field_32_iHeadingPgn;
-    protected int field_33_pgnStart;
-    protected int field_34_lnnMin;
-    protected int field_35_wTextFlow;
-    protected short field_36_unused3;
-    protected int field_37_pgbProp;
-    protected short field_38_unused4;
-    protected int field_39_xaPage;
-    protected int field_40_yaPage;
-    protected int field_41_xaPageNUp;
-    protected int field_42_yaPageNUp;
-    protected int field_43_dxaLeft;
-    protected int field_44_dxaRight;
-    protected int field_45_dyaTop;
-    protected int field_46_dyaBottom;
-    protected int field_47_dzaGutter;
-    protected int field_48_dyaHdrTop;
-    protected int field_49_dyaHdrBottom;
-    protected int field_50_ccolM1;
-    protected boolean field_51_fEvenlySpaced;
-    protected byte field_52_unused5;
-    protected int field_53_dxaColumns;
-    protected int[] field_54_rgdxaColumn;
-    protected int field_55_dxaColumnWidth;
-    protected byte field_56_dmOrientFirst;
-    protected byte field_57_fLayout;
-    protected short field_58_unused6;
-    protected byte[] field_59_olstAnm;
-
-    protected SEPAbstractType()
-    {
-        this.field_1_bkc = 2;
-        this.field_8_fEndNote = true;
-        this.field_13_dxaPgn = 720;
-        this.field_14_dyaPgn = 720;
-        this.field_31_dmOrientPage = true;
-        this.field_33_pgnStart = 1;
-        this.field_39_xaPage = 12240;
-        this.field_40_yaPage = 15840;
-        this.field_41_xaPageNUp = 12240;
-        this.field_42_yaPageNUp = 15840;
-        this.field_43_dxaLeft = 1800;
-        this.field_44_dxaRight = 1800;
-        this.field_45_dyaTop = 1440;
-        this.field_46_dyaBottom = 1440;
-        this.field_48_dyaHdrTop = 720;
-        this.field_49_dyaHdrBottom = 720;
-        this.field_51_fEvenlySpaced = true;
-        this.field_53_dxaColumns = 720;
-    }
-
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[SEP]\n");
-        builder.append("    .bkc                  = ");
-        builder.append(" (").append(getBkc()).append(" )\n");
-        builder.append("    .fTitlePage           = ");
-        builder.append(" (").append(getFTitlePage()).append(" )\n");
-        builder.append("    .fAutoPgn             = ");
-        builder.append(" (").append(getFAutoPgn()).append(" )\n");
-        builder.append("    .nfcPgn               = ");
-        builder.append(" (").append(getNfcPgn()).append(" )\n");
-        builder.append("    .fUnlocked            = ");
-        builder.append(" (").append(getFUnlocked()).append(" )\n");
-        builder.append("    .cnsPgn               = ");
-        builder.append(" (").append(getCnsPgn()).append(" )\n");
-        builder.append("    .fPgnRestart          = ");
-        builder.append(" (").append(getFPgnRestart()).append(" )\n");
-        builder.append("    .fEndNote             = ");
-        builder.append(" (").append(getFEndNote()).append(" )\n");
-        builder.append("    .lnc                  = ");
-        builder.append(" (").append(getLnc()).append(" )\n");
-        builder.append("    .grpfIhdt             = ");
-        builder.append(" (").append(getGrpfIhdt()).append(" )\n");
-        builder.append("    .nLnnMod              = ");
-        builder.append(" (").append(getNLnnMod()).append(" )\n");
-        builder.append("    .dxaLnn               = ");
-        builder.append(" (").append(getDxaLnn()).append(" )\n");
-        builder.append("    .dxaPgn               = ");
-        builder.append(" (").append(getDxaPgn()).append(" )\n");
-        builder.append("    .dyaPgn               = ");
-        builder.append(" (").append(getDyaPgn()).append(" )\n");
-        builder.append("    .fLBetween            = ");
-        builder.append(" (").append(getFLBetween()).append(" )\n");
-        builder.append("    .vjc                  = ");
-        builder.append(" (").append(getVjc()).append(" )\n");
-        builder.append("    .dmBinFirst           = ");
-        builder.append(" (").append(getDmBinFirst()).append(" )\n");
-        builder.append("    .dmBinOther           = ");
-        builder.append(" (").append(getDmBinOther()).append(" )\n");
-        builder.append("    .dmPaperReq           = ");
-        builder.append(" (").append(getDmPaperReq()).append(" )\n");
-        builder.append("    .brcTop               = ");
-        builder.append(" (").append(getBrcTop()).append(" )\n");
-        builder.append("    .brcLeft              = ");
-        builder.append(" (").append(getBrcLeft()).append(" )\n");
-        builder.append("    .brcBottom            = ");
-        builder.append(" (").append(getBrcBottom()).append(" )\n");
-        builder.append("    .brcRight             = ");
-        builder.append(" (").append(getBrcRight()).append(" )\n");
-        builder.append("    .fPropMark            = ");
-        builder.append(" (").append(getFPropMark()).append(" )\n");
-        builder.append("    .ibstPropRMark        = ");
-        builder.append(" (").append(getIbstPropRMark()).append(" )\n");
-        builder.append("    .dttmPropRMark        = ");
-        builder.append(" (").append(getDttmPropRMark()).append(" )\n");
-        builder.append("    .dxtCharSpace         = ");
-        builder.append(" (").append(getDxtCharSpace()).append(" )\n");
-        builder.append("    .dyaLinePitch         = ");
-        builder.append(" (").append(getDyaLinePitch()).append(" )\n");
-        builder.append("    .clm                  = ");
-        builder.append(" (").append(getClm()).append(" )\n");
-        builder.append("    .unused2              = ");
-        builder.append(" (").append(getUnused2()).append(" )\n");
-        builder.append("    .dmOrientPage         = ");
-        builder.append(" (").append(getDmOrientPage()).append(" )\n");
-        builder.append("    .iHeadingPgn          = ");
-        builder.append(" (").append(getIHeadingPgn()).append(" )\n");
-        builder.append("    .pgnStart             = ");
-        builder.append(" (").append(getPgnStart()).append(" )\n");
-        builder.append("    .lnnMin               = ");
-        builder.append(" (").append(getLnnMin()).append(" )\n");
-        builder.append("    .wTextFlow            = ");
-        builder.append(" (").append(getWTextFlow()).append(" )\n");
-        builder.append("    .unused3              = ");
-        builder.append(" (").append(getUnused3()).append(" )\n");
-        builder.append("    .pgbProp              = ");
-        builder.append(" (").append(getPgbProp()).append(" )\n");
-        builder.append("    .unused4              = ");
-        builder.append(" (").append(getUnused4()).append(" )\n");
-        builder.append("    .xaPage               = ");
-        builder.append(" (").append(getXaPage()).append(" )\n");
-        builder.append("    .yaPage               = ");
-        builder.append(" (").append(getYaPage()).append(" )\n");
-        builder.append("    .xaPageNUp            = ");
-        builder.append(" (").append(getXaPageNUp()).append(" )\n");
-        builder.append("    .yaPageNUp            = ");
-        builder.append(" (").append(getYaPageNUp()).append(" )\n");
-        builder.append("    .dxaLeft              = ");
-        builder.append(" (").append(getDxaLeft()).append(" )\n");
-        builder.append("    .dxaRight             = ");
-        builder.append(" (").append(getDxaRight()).append(" )\n");
-        builder.append("    .dyaTop               = ");
-        builder.append(" (").append(getDyaTop()).append(" )\n");
-        builder.append("    .dyaBottom            = ");
-        builder.append(" (").append(getDyaBottom()).append(" )\n");
-        builder.append("    .dzaGutter            = ");
-        builder.append(" (").append(getDzaGutter()).append(" )\n");
-        builder.append("    .dyaHdrTop            = ");
-        builder.append(" (").append(getDyaHdrTop()).append(" )\n");
-        builder.append("    .dyaHdrBottom         = ");
-        builder.append(" (").append(getDyaHdrBottom()).append(" )\n");
-        builder.append("    .ccolM1               = ");
-        builder.append(" (").append(getCcolM1()).append(" )\n");
-        builder.append("    .fEvenlySpaced        = ");
-        builder.append(" (").append(getFEvenlySpaced()).append(" )\n");
-        builder.append("    .unused5              = ");
-        builder.append(" (").append(getUnused5()).append(" )\n");
-        builder.append("    .dxaColumns           = ");
-        builder.append(" (").append(getDxaColumns()).append(" )\n");
-        builder.append("    .rgdxaColumn          = ");
-        builder.append(" (").append(Arrays.toString(getRgdxaColumn())).append(" )\n");
-        builder.append("    .dxaColumnWidth       = ");
-        builder.append(" (").append(getDxaColumnWidth()).append(" )\n");
-        builder.append("    .dmOrientFirst        = ");
-        builder.append(" (").append(getDmOrientFirst()).append(" )\n");
-        builder.append("    .fLayout              = ");
-        builder.append(" (").append(getFLayout()).append(" )\n");
-        builder.append("    .unused6              = ");
-        builder.append(" (").append(getUnused6()).append(" )\n");
-        builder.append("    .olstAnm              = ");
-        builder.append(" (").append(Arrays.toString(getOlstAnm())).append(" )\n");
-
-        builder.append("[/SEP]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Break code.
-     *
-     * @return One of 
-     * <li>{@link #BKC_NO_BREAK}
-     * <li>{@link #BKC_NEW_COLUMN}
-     * <li>{@link #BKC_NEW_PAGE}
-     * <li>{@link #BKC_EVEN_PAGE}
-     * <li>{@link #BKC_ODD_PAGE}
-     */
-    public byte getBkc()
-    {
-        return field_1_bkc;
-    }
-
-    /**
-     * Break code.
-     *
-     * @param field_1_bkc
-     *        One of 
-     * <li>{@link #BKC_NO_BREAK}
-     * <li>{@link #BKC_NEW_COLUMN}
-     * <li>{@link #BKC_NEW_PAGE}
-     * <li>{@link #BKC_EVEN_PAGE}
-     * <li>{@link #BKC_ODD_PAGE}
-     */
-    public void setBkc(byte field_1_bkc)
-    {
-        this.field_1_bkc = field_1_bkc;
-    }
-
-    /**
-     * Set to 1 when a title page is to be displayed.
-     */
-    public boolean getFTitlePage()
-    {
-        return field_2_fTitlePage;
-    }
-
-    /**
-     * Set to 1 when a title page is to be displayed.
-     */
-    public void setFTitlePage(boolean field_2_fTitlePage)
-    {
-        this.field_2_fTitlePage = field_2_fTitlePage;
-    }
-
-    /**
-     * Only for Macintosh compatibility, used only during open, when 1, sep.dxaPgn and sep.dyaPgn are valid page number locations.
-     */
-    public boolean getFAutoPgn()
-    {
-        return field_3_fAutoPgn;
-    }
-
-    /**
-     * Only for Macintosh compatibility, used only during open, when 1, sep.dxaPgn and sep.dyaPgn are valid page number locations.
-     */
-    public void setFAutoPgn(boolean field_3_fAutoPgn)
-    {
-        this.field_3_fAutoPgn = field_3_fAutoPgn;
-    }
-
-    /**
-     * Page number format code.
-     *
-     * @return One of 
-     * <li>{@link #NFCPGN_ARABIC}
-     * <li>{@link #NFCPGN_ROMAN_UPPER_CASE}
-     * <li>{@link #NFCPGN_ROMAN_LOWER_CASE}
-     * <li>{@link #NFCPGN_LETTER_UPPER_CASE}
-     * <li>{@link #NFCPGN_LETTER_LOWER_CASE}
-     */
-    public byte getNfcPgn()
-    {
-        return field_4_nfcPgn;
-    }
-
-    /**
-     * Page number format code.
-     *
-     * @param field_4_nfcPgn
-     *        One of 
-     * <li>{@link #NFCPGN_ARABIC}
-     * <li>{@link #NFCPGN_ROMAN_UPPER_CASE}
-     * <li>{@link #NFCPGN_ROMAN_LOWER_CASE}
-     * <li>{@link #NFCPGN_LETTER_UPPER_CASE}
-     * <li>{@link #NFCPGN_LETTER_LOWER_CASE}
-     */
-    public void setNfcPgn(byte field_4_nfcPgn)
-    {
-        this.field_4_nfcPgn = field_4_nfcPgn;
-    }
-
-    /**
-     * Get the fUnlocked field for the SEP record.
-     */
-    public boolean getFUnlocked()
-    {
-        return field_5_fUnlocked;
-    }
-
-    /**
-     * Set the fUnlocked field for the SEP record.
-     */
-    public void setFUnlocked(boolean field_5_fUnlocked)
-    {
-        this.field_5_fUnlocked = field_5_fUnlocked;
-    }
-
-    /**
-     * Get the cnsPgn field for the SEP record.
-     */
-    public byte getCnsPgn()
-    {
-        return field_6_cnsPgn;
-    }
-
-    /**
-     * Set the cnsPgn field for the SEP record.
-     */
-    public void setCnsPgn(byte field_6_cnsPgn)
-    {
-        this.field_6_cnsPgn = field_6_cnsPgn;
-    }
-
-    /**
-     * Get the fPgnRestart field for the SEP record.
-     */
-    public boolean getFPgnRestart()
-    {
-        return field_7_fPgnRestart;
-    }
-
-    /**
-     * Set the fPgnRestart field for the SEP record.
-     */
-    public void setFPgnRestart(boolean field_7_fPgnRestart)
-    {
-        this.field_7_fPgnRestart = field_7_fPgnRestart;
-    }
-
-    /**
-     * Get the fEndNote field for the SEP record.
-     */
-    public boolean getFEndNote()
-    {
-        return field_8_fEndNote;
-    }
-
-    /**
-     * Set the fEndNote field for the SEP record.
-     */
-    public void setFEndNote(boolean field_8_fEndNote)
-    {
-        this.field_8_fEndNote = field_8_fEndNote;
-    }
-
-    /**
-     * Get the lnc field for the SEP record.
-     */
-    public byte getLnc()
-    {
-        return field_9_lnc;
-    }
-
-    /**
-     * Set the lnc field for the SEP record.
-     */
-    public void setLnc(byte field_9_lnc)
-    {
-        this.field_9_lnc = field_9_lnc;
-    }
-
-    /**
-     * Get the grpfIhdt field for the SEP record.
-     */
-    public byte getGrpfIhdt()
-    {
-        return field_10_grpfIhdt;
-    }
-
-    /**
-     * Set the grpfIhdt field for the SEP record.
-     */
-    public void setGrpfIhdt(byte field_10_grpfIhdt)
-    {
-        this.field_10_grpfIhdt = field_10_grpfIhdt;
-    }
-
-    /**
-     * Get the nLnnMod field for the SEP record.
-     */
-    public int getNLnnMod()
-    {
-        return field_11_nLnnMod;
-    }
-
-    /**
-     * Set the nLnnMod field for the SEP record.
-     */
-    public void setNLnnMod(int field_11_nLnnMod)
-    {
-        this.field_11_nLnnMod = field_11_nLnnMod;
-    }
-
-    /**
-     * Get the dxaLnn field for the SEP record.
-     */
-    public int getDxaLnn()
-    {
-        return field_12_dxaLnn;
-    }
-
-    /**
-     * Set the dxaLnn field for the SEP record.
-     */
-    public void setDxaLnn(int field_12_dxaLnn)
-    {
-        this.field_12_dxaLnn = field_12_dxaLnn;
-    }
-
-    /**
-     * Get the dxaPgn field for the SEP record.
-     */
-    public int getDxaPgn()
-    {
-        return field_13_dxaPgn;
-    }
-
-    /**
-     * Set the dxaPgn field for the SEP record.
-     */
-    public void setDxaPgn(int field_13_dxaPgn)
-    {
-        this.field_13_dxaPgn = field_13_dxaPgn;
-    }
-
-    /**
-     * Get the dyaPgn field for the SEP record.
-     */
-    public int getDyaPgn()
-    {
-        return field_14_dyaPgn;
-    }
-
-    /**
-     * Set the dyaPgn field for the SEP record.
-     */
-    public void setDyaPgn(int field_14_dyaPgn)
-    {
-        this.field_14_dyaPgn = field_14_dyaPgn;
-    }
-
-    /**
-     * Get the fLBetween field for the SEP record.
-     */
-    public boolean getFLBetween()
-    {
-        return field_15_fLBetween;
-    }
-
-    /**
-     * Set the fLBetween field for the SEP record.
-     */
-    public void setFLBetween(boolean field_15_fLBetween)
-    {
-        this.field_15_fLBetween = field_15_fLBetween;
-    }
-
-    /**
-     * Get the vjc field for the SEP record.
-     */
-    public byte getVjc()
-    {
-        return field_16_vjc;
-    }
-
-    /**
-     * Set the vjc field for the SEP record.
-     */
-    public void setVjc(byte field_16_vjc)
-    {
-        this.field_16_vjc = field_16_vjc;
-    }
-
-    /**
-     * Get the dmBinFirst field for the SEP record.
-     */
-    public int getDmBinFirst()
-    {
-        return field_17_dmBinFirst;
-    }
-
-    /**
-     * Set the dmBinFirst field for the SEP record.
-     */
-    public void setDmBinFirst(int field_17_dmBinFirst)
-    {
-        this.field_17_dmBinFirst = field_17_dmBinFirst;
-    }
-
-    /**
-     * Get the dmBinOther field for the SEP record.
-     */
-    public int getDmBinOther()
-    {
-        return field_18_dmBinOther;
-    }
-
-    /**
-     * Set the dmBinOther field for the SEP record.
-     */
-    public void setDmBinOther(int field_18_dmBinOther)
-    {
-        this.field_18_dmBinOther = field_18_dmBinOther;
-    }
-
-    /**
-     * Get the dmPaperReq field for the SEP record.
-     */
-    public int getDmPaperReq()
-    {
-        return field_19_dmPaperReq;
-    }
-
-    /**
-     * Set the dmPaperReq field for the SEP record.
-     */
-    public void setDmPaperReq(int field_19_dmPaperReq)
-    {
-        this.field_19_dmPaperReq = field_19_dmPaperReq;
-    }
-
-    /**
-     * Get the brcTop field for the SEP record.
-     */
-    public BorderCode getBrcTop()
-    {
-        return field_20_brcTop;
-    }
-
-    /**
-     * Set the brcTop field for the SEP record.
-     */
-    public void setBrcTop(BorderCode field_20_brcTop)
-    {
-        this.field_20_brcTop = field_20_brcTop;
-    }
-
-    /**
-     * Get the brcLeft field for the SEP record.
-     */
-    public BorderCode getBrcLeft()
-    {
-        return field_21_brcLeft;
-    }
-
-    /**
-     * Set the brcLeft field for the SEP record.
-     */
-    public void setBrcLeft(BorderCode field_21_brcLeft)
-    {
-        this.field_21_brcLeft = field_21_brcLeft;
-    }
-
-    /**
-     * Get the brcBottom field for the SEP record.
-     */
-    public BorderCode getBrcBottom()
-    {
-        return field_22_brcBottom;
-    }
-
-    /**
-     * Set the brcBottom field for the SEP record.
-     */
-    public void setBrcBottom(BorderCode field_22_brcBottom)
-    {
-        this.field_22_brcBottom = field_22_brcBottom;
-    }
-
-    /**
-     * Get the brcRight field for the SEP record.
-     */
-    public BorderCode getBrcRight()
-    {
-        return field_23_brcRight;
-    }
-
-    /**
-     * Set the brcRight field for the SEP record.
-     */
-    public void setBrcRight(BorderCode field_23_brcRight)
-    {
-        this.field_23_brcRight = field_23_brcRight;
-    }
-
-    /**
-     * Get the fPropMark field for the SEP record.
-     */
-    public boolean getFPropMark()
-    {
-        return field_24_fPropMark;
-    }
-
-    /**
-     * Set the fPropMark field for the SEP record.
-     */
-    public void setFPropMark(boolean field_24_fPropMark)
-    {
-        this.field_24_fPropMark = field_24_fPropMark;
-    }
-
-    /**
-     * Get the ibstPropRMark field for the SEP record.
-     */
-    public int getIbstPropRMark()
-    {
-        return field_25_ibstPropRMark;
-    }
-
-    /**
-     * Set the ibstPropRMark field for the SEP record.
-     */
-    public void setIbstPropRMark(int field_25_ibstPropRMark)
-    {
-        this.field_25_ibstPropRMark = field_25_ibstPropRMark;
-    }
-
-    /**
-     * Get the dttmPropRMark field for the SEP record.
-     */
-    public DateAndTime getDttmPropRMark()
-    {
-        return field_26_dttmPropRMark;
-    }
-
-    /**
-     * Set the dttmPropRMark field for the SEP record.
-     */
-    public void setDttmPropRMark(DateAndTime field_26_dttmPropRMark)
-    {
-        this.field_26_dttmPropRMark = field_26_dttmPropRMark;
-    }
-
-    /**
-     * Get the dxtCharSpace field for the SEP record.
-     */
-    public int getDxtCharSpace()
-    {
-        return field_27_dxtCharSpace;
-    }
-
-    /**
-     * Set the dxtCharSpace field for the SEP record.
-     */
-    public void setDxtCharSpace(int field_27_dxtCharSpace)
-    {
-        this.field_27_dxtCharSpace = field_27_dxtCharSpace;
-    }
-
-    /**
-     * Get the dyaLinePitch field for the SEP record.
-     */
-    public int getDyaLinePitch()
-    {
-        return field_28_dyaLinePitch;
-    }
-
-    /**
-     * Set the dyaLinePitch field for the SEP record.
-     */
-    public void setDyaLinePitch(int field_28_dyaLinePitch)
-    {
-        this.field_28_dyaLinePitch = field_28_dyaLinePitch;
-    }
-
-    /**
-     * Get the clm field for the SEP record.
-     */
-    public int getClm()
-    {
-        return field_29_clm;
-    }
-
-    /**
-     * Set the clm field for the SEP record.
-     */
-    public void setClm(int field_29_clm)
-    {
-        this.field_29_clm = field_29_clm;
-    }
-
-    /**
-     * Get the unused2 field for the SEP record.
-     */
-    public int getUnused2()
-    {
-        return field_30_unused2;
-    }
-
-    /**
-     * Set the unused2 field for the SEP record.
-     */
-    public void setUnused2(int field_30_unused2)
-    {
-        this.field_30_unused2 = field_30_unused2;
-    }
-
-    /**
-     * Get the dmOrientPage field for the SEP record.
-     *
-     * @return One of 
-     * <li>{@link #DMORIENTPAGE_LANDSCAPE}
-     * <li>{@link #DMORIENTPAGE_PORTRAIT}
-     */
-    public boolean getDmOrientPage()
-    {
-        return field_31_dmOrientPage;
-    }
-
-    /**
-     * Set the dmOrientPage field for the SEP record.
-     *
-     * @param field_31_dmOrientPage
-     *        One of 
-     * <li>{@link #DMORIENTPAGE_LANDSCAPE}
-     * <li>{@link #DMORIENTPAGE_PORTRAIT}
-     */
-    public void setDmOrientPage(boolean field_31_dmOrientPage)
-    {
-        this.field_31_dmOrientPage = field_31_dmOrientPage;
-    }
-
-    /**
-     * Get the iHeadingPgn field for the SEP record.
-     */
-    public byte getIHeadingPgn()
-    {
-        return field_32_iHeadingPgn;
-    }
-
-    /**
-     * Set the iHeadingPgn field for the SEP record.
-     */
-    public void setIHeadingPgn(byte field_32_iHeadingPgn)
-    {
-        this.field_32_iHeadingPgn = field_32_iHeadingPgn;
-    }
-
-    /**
-     * Get the pgnStart field for the SEP record.
-     */
-    public int getPgnStart()
-    {
-        return field_33_pgnStart;
-    }
-
-    /**
-     * Set the pgnStart field for the SEP record.
-     */
-    public void setPgnStart(int field_33_pgnStart)
-    {
-        this.field_33_pgnStart = field_33_pgnStart;
-    }
-
-    /**
-     * Get the lnnMin field for the SEP record.
-     */
-    public int getLnnMin()
-    {
-        return field_34_lnnMin;
-    }
-
-    /**
-     * Set the lnnMin field for the SEP record.
-     */
-    public void setLnnMin(int field_34_lnnMin)
-    {
-        this.field_34_lnnMin = field_34_lnnMin;
-    }
-
-    /**
-     * Get the wTextFlow field for the SEP record.
-     */
-    public int getWTextFlow()
-    {
-        return field_35_wTextFlow;
-    }
-
-    /**
-     * Set the wTextFlow field for the SEP record.
-     */
-    public void setWTextFlow(int field_35_wTextFlow)
-    {
-        this.field_35_wTextFlow = field_35_wTextFlow;
-    }
-
-    /**
-     * Get the unused3 field for the SEP record.
-     */
-    public short getUnused3()
-    {
-        return field_36_unused3;
-    }
-
-    /**
-     * Set the unused3 field for the SEP record.
-     */
-    public void setUnused3(short field_36_unused3)
-    {
-        this.field_36_unused3 = field_36_unused3;
-    }
-
-    /**
-     * Get the pgbProp field for the SEP record.
-     */
-    public int getPgbProp()
-    {
-        return field_37_pgbProp;
-    }
-
-    /**
-     * Set the pgbProp field for the SEP record.
-     */
-    public void setPgbProp(int field_37_pgbProp)
-    {
-        this.field_37_pgbProp = field_37_pgbProp;
-    }
-
-    /**
-     * Get the unused4 field for the SEP record.
-     */
-    public short getUnused4()
-    {
-        return field_38_unused4;
-    }
-
-    /**
-     * Set the unused4 field for the SEP record.
-     */
-    public void setUnused4(short field_38_unused4)
-    {
-        this.field_38_unused4 = field_38_unused4;
-    }
-
-    /**
-     * Get the xaPage field for the SEP record.
-     */
-    public int getXaPage()
-    {
-        return field_39_xaPage;
-    }
-
-    /**
-     * Set the xaPage field for the SEP record.
-     */
-    public void setXaPage(int field_39_xaPage)
-    {
-        this.field_39_xaPage = field_39_xaPage;
-    }
-
-    /**
-     * Get the yaPage field for the SEP record.
-     */
-    public int getYaPage()
-    {
-        return field_40_yaPage;
-    }
-
-    /**
-     * Set the yaPage field for the SEP record.
-     */
-    public void setYaPage(int field_40_yaPage)
-    {
-        this.field_40_yaPage = field_40_yaPage;
-    }
-
-    /**
-     * Get the xaPageNUp field for the SEP record.
-     */
-    public int getXaPageNUp()
-    {
-        return field_41_xaPageNUp;
-    }
-
-    /**
-     * Set the xaPageNUp field for the SEP record.
-     */
-    public void setXaPageNUp(int field_41_xaPageNUp)
-    {
-        this.field_41_xaPageNUp = field_41_xaPageNUp;
-    }
-
-    /**
-     * Get the yaPageNUp field for the SEP record.
-     */
-    public int getYaPageNUp()
-    {
-        return field_42_yaPageNUp;
-    }
-
-    /**
-     * Set the yaPageNUp field for the SEP record.
-     */
-    public void setYaPageNUp(int field_42_yaPageNUp)
-    {
-        this.field_42_yaPageNUp = field_42_yaPageNUp;
-    }
-
-    /**
-     * Get the dxaLeft field for the SEP record.
-     */
-    public int getDxaLeft()
-    {
-        return field_43_dxaLeft;
-    }
-
-    /**
-     * Set the dxaLeft field for the SEP record.
-     */
-    public void setDxaLeft(int field_43_dxaLeft)
-    {
-        this.field_43_dxaLeft = field_43_dxaLeft;
-    }
-
-    /**
-     * Get the dxaRight field for the SEP record.
-     */
-    public int getDxaRight()
-    {
-        return field_44_dxaRight;
-    }
-
-    /**
-     * Set the dxaRight field for the SEP record.
-     */
-    public void setDxaRight(int field_44_dxaRight)
-    {
-        this.field_44_dxaRight = field_44_dxaRight;
-    }
-
-    /**
-     * Get the dyaTop field for the SEP record.
-     */
-    public int getDyaTop()
-    {
-        return field_45_dyaTop;
-    }
-
-    /**
-     * Set the dyaTop field for the SEP record.
-     */
-    public void setDyaTop(int field_45_dyaTop)
-    {
-        this.field_45_dyaTop = field_45_dyaTop;
-    }
-
-    /**
-     * Get the dyaBottom field for the SEP record.
-     */
-    public int getDyaBottom()
-    {
-        return field_46_dyaBottom;
-    }
-
-    /**
-     * Set the dyaBottom field for the SEP record.
-     */
-    public void setDyaBottom(int field_46_dyaBottom)
-    {
-        this.field_46_dyaBottom = field_46_dyaBottom;
-    }
-
-    /**
-     * Get the dzaGutter field for the SEP record.
-     */
-    public int getDzaGutter()
-    {
-        return field_47_dzaGutter;
-    }
-
-    /**
-     * Set the dzaGutter field for the SEP record.
-     */
-    public void setDzaGutter(int field_47_dzaGutter)
-    {
-        this.field_47_dzaGutter = field_47_dzaGutter;
-    }
-
-    /**
-     * Get the dyaHdrTop field for the SEP record.
-     */
-    public int getDyaHdrTop()
-    {
-        return field_48_dyaHdrTop;
-    }
-
-    /**
-     * Set the dyaHdrTop field for the SEP record.
-     */
-    public void setDyaHdrTop(int field_48_dyaHdrTop)
-    {
-        this.field_48_dyaHdrTop = field_48_dyaHdrTop;
-    }
-
-    /**
-     * Get the dyaHdrBottom field for the SEP record.
-     */
-    public int getDyaHdrBottom()
-    {
-        return field_49_dyaHdrBottom;
-    }
-
-    /**
-     * Set the dyaHdrBottom field for the SEP record.
-     */
-    public void setDyaHdrBottom(int field_49_dyaHdrBottom)
-    {
-        this.field_49_dyaHdrBottom = field_49_dyaHdrBottom;
-    }
-
-    /**
-     * Get the ccolM1 field for the SEP record.
-     */
-    public int getCcolM1()
-    {
-        return field_50_ccolM1;
-    }
-
-    /**
-     * Set the ccolM1 field for the SEP record.
-     */
-    public void setCcolM1(int field_50_ccolM1)
-    {
-        this.field_50_ccolM1 = field_50_ccolM1;
-    }
-
-    /**
-     * Get the fEvenlySpaced field for the SEP record.
-     */
-    public boolean getFEvenlySpaced()
-    {
-        return field_51_fEvenlySpaced;
-    }
-
-    /**
-     * Set the fEvenlySpaced field for the SEP record.
-     */
-    public void setFEvenlySpaced(boolean field_51_fEvenlySpaced)
-    {
-        this.field_51_fEvenlySpaced = field_51_fEvenlySpaced;
-    }
-
-    /**
-     * Get the unused5 field for the SEP record.
-     */
-    public byte getUnused5()
-    {
-        return field_52_unused5;
-    }
-
-    /**
-     * Set the unused5 field for the SEP record.
-     */
-    public void setUnused5(byte field_52_unused5)
-    {
-        this.field_52_unused5 = field_52_unused5;
-    }
-
-    /**
-     * Get the dxaColumns field for the SEP record.
-     */
-    public int getDxaColumns()
-    {
-        return field_53_dxaColumns;
-    }
-
-    /**
-     * Set the dxaColumns field for the SEP record.
-     */
-    public void setDxaColumns(int field_53_dxaColumns)
-    {
-        this.field_53_dxaColumns = field_53_dxaColumns;
-    }
-
-    /**
-     * Get the rgdxaColumn field for the SEP record.
-     */
-    public int[] getRgdxaColumn()
-    {
-        return field_54_rgdxaColumn;
-    }
-
-    /**
-     * Set the rgdxaColumn field for the SEP record.
-     */
-    public void setRgdxaColumn(int[] field_54_rgdxaColumn)
-    {
-        this.field_54_rgdxaColumn = field_54_rgdxaColumn;
-    }
-
-    /**
-     * Get the dxaColumnWidth field for the SEP record.
-     */
-    public int getDxaColumnWidth()
-    {
-        return field_55_dxaColumnWidth;
-    }
-
-    /**
-     * Set the dxaColumnWidth field for the SEP record.
-     */
-    public void setDxaColumnWidth(int field_55_dxaColumnWidth)
-    {
-        this.field_55_dxaColumnWidth = field_55_dxaColumnWidth;
-    }
-
-    /**
-     * Get the dmOrientFirst field for the SEP record.
-     */
-    public byte getDmOrientFirst()
-    {
-        return field_56_dmOrientFirst;
-    }
-
-    /**
-     * Set the dmOrientFirst field for the SEP record.
-     */
-    public void setDmOrientFirst(byte field_56_dmOrientFirst)
-    {
-        this.field_56_dmOrientFirst = field_56_dmOrientFirst;
-    }
-
-    /**
-     * Get the fLayout field for the SEP record.
-     */
-    public byte getFLayout()
-    {
-        return field_57_fLayout;
-    }
-
-    /**
-     * Set the fLayout field for the SEP record.
-     */
-    public void setFLayout(byte field_57_fLayout)
-    {
-        this.field_57_fLayout = field_57_fLayout;
-    }
-
-    /**
-     * Get the unused6 field for the SEP record.
-     */
-    public short getUnused6()
-    {
-        return field_58_unused6;
-    }
-
-    /**
-     * Set the unused6 field for the SEP record.
-     */
-    public void setUnused6(short field_58_unused6)
-    {
-        this.field_58_unused6 = field_58_unused6;
-    }
-
-    /**
-     * Get the olstAnm field for the SEP record.
-     */
-    public byte[] getOlstAnm()
-    {
-        return field_59_olstAnm;
-    }
-
-    /**
-     * Set the olstAnm field for the SEP record.
-     */
-    public void setOlstAnm(byte[] field_59_olstAnm)
-    {
-        this.field_59_olstAnm = field_59_olstAnm;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
deleted file mode 100644
index 1a61707..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The Shd80 structure specifies the colors and pattern that are used for background
-        shading. As an exception to the constraints that are specified by Ico and Ipat, a Shd80 can
-        be set to Shd80Nil and specifies that no shading is applied. <p>Class and fields
-        descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Word (.doc) Binary File Format by Microsoft Corporation.
-    
- */
-@Internal
-public abstract class SHD80AbstractType
-{
-
-    protected short field_1_value;
-    /**/private static final BitField icoFore = new BitField(0x001F);
-    /**/private static final BitField icoBack = new BitField(0x03E0);
-    /**/private static final BitField ipat = new BitField(0xFC00);
-
-    protected SHD80AbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_value                  = LittleEndian.getShort( data, 0x0 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putShort( data, 0x0 + offset, field_1_value );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        SHD80AbstractType other = (SHD80AbstractType) obj;
-        if ( field_1_value != other.field_1_value )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_value;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[SHD80]\n");
-        builder.append("    .value                = ");
-        builder.append(" (").append(getValue()).append(" )\n");
-        builder.append("         .icoFore                  = ").append(getIcoFore()).append('\n');
-        builder.append("         .icoBack                  = ").append(getIcoBack()).append('\n');
-        builder.append("         .ipat                     = ").append(getIpat()).append('\n');
-
-        builder.append("[/SHD80]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Get the value field for the SHD80 record.
-     */
-    @Internal
-    public short getValue()
-    {
-        return field_1_value;
-    }
-
-    /**
-     * Set the value field for the SHD80 record.
-     */
-    @Internal
-    public void setValue( short field_1_value )
-    {
-        this.field_1_value = field_1_value;
-    }
-
-    /**
-     * Sets the icoFore field value.
-     * Foreground color
-     */
-    @Internal
-    public void setIcoFore( byte value )
-    {
-        field_1_value = (short)icoFore.setValue(field_1_value, value);
-    }
-
-    /**
-     * Foreground color
-     * @return  the icoFore field value.
-     */
-    @Internal
-    public byte getIcoFore()
-    {
-        return ( byte )icoFore.getValue(field_1_value);
-    }
-
-    /**
-     * Sets the icoBack field value.
-     * Background color
-     */
-    @Internal
-    public void setIcoBack( byte value )
-    {
-        field_1_value = (short)icoBack.setValue(field_1_value, value);
-    }
-
-    /**
-     * Background color
-     * @return  the icoBack field value.
-     */
-    @Internal
-    public byte getIcoBack()
-    {
-        return ( byte )icoBack.getValue(field_1_value);
-    }
-
-    /**
-     * Sets the ipat field value.
-     * Shading pattern
-     */
-    @Internal
-    public void setIpat( byte value )
-    {
-        field_1_value = (short)ipat.setValue(field_1_value, value);
-    }
-
-    /**
-     * Shading pattern
-     * @return  the ipat field value.
-     */
-    @Internal
-    public byte getIpat()
-    {
-        return ( byte )ipat.getValue(field_1_value);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java
deleted file mode 100644
index 13603ae..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.hwpf.model.Colorref;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The Shd structure specifies the colors and pattern that are used for background shading. <p>Class
-        and
-        fields descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Word (.doc) Binary File Format by Microsoft Corporation.
-    
- */
-@Internal
-public abstract class SHDAbstractType
-{
-
-    protected Colorref field_1_cvFore;
-    protected Colorref field_2_cvBack;
-    protected int field_3_ipat;
-
-    protected SHDAbstractType()
-    {
-        this.field_1_cvFore = new Colorref();
-        this.field_2_cvBack = new Colorref();
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_cvFore                 = new Colorref( data, 0x0 + offset );
-        field_2_cvBack                 = new Colorref( data, 0x4 + offset );
-        field_3_ipat                   = LittleEndian.getShort( data, 0x8 + offset );
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        field_1_cvFore.serialize( data, 0x0 + offset );
-        field_2_cvBack.serialize( data, 0x4 + offset );
-        LittleEndian.putUShort( data, 0x8 + offset, field_3_ipat );
-    }
-
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 4 + 4 + 2;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        SHDAbstractType other = (SHDAbstractType) obj;
-        if ( field_1_cvFore != other.field_1_cvFore )
-            return false;
-        if ( field_2_cvBack != other.field_2_cvBack )
-            return false;
-        if ( field_3_ipat != other.field_3_ipat )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_cvFore.hashCode();
-        result = prime * result + field_2_cvBack.hashCode();
-        result = prime * result + field_3_ipat;
-        return result;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[SHD]\n");
-        builder.append("    .cvFore               = ");
-        builder.append(" (").append(getCvFore()).append(" )\n");
-        builder.append("    .cvBack               = ");
-        builder.append(" (").append(getCvBack()).append(" )\n");
-        builder.append("    .ipat                 = ");
-        builder.append(" (").append(getIpat()).append(" )\n");
-
-        builder.append("[/SHD]\n");
-        return builder.toString();
-    }
-
-    /**
-     * A COLORREF that specifies the foreground color of ipat.
-     */
-    @Internal
-    public Colorref getCvFore()
-    {
-        return field_1_cvFore;
-    }
-
-    /**
-     * A COLORREF that specifies the foreground color of ipat.
-     */
-    @Internal
-    public void setCvFore( Colorref field_1_cvFore )
-    {
-        this.field_1_cvFore = field_1_cvFore;
-    }
-
-    /**
-     * A COLORREF that specifies the background color of ipat.
-     */
-    @Internal
-    public Colorref getCvBack()
-    {
-        return field_2_cvBack;
-    }
-
-    /**
-     * A COLORREF that specifies the background color of ipat.
-     */
-    @Internal
-    public void setCvBack( Colorref field_2_cvBack )
-    {
-        this.field_2_cvBack = field_2_cvBack;
-    }
-
-    /**
-     * An Ipat that specifies the pattern used for shading.
-     */
-    @Internal
-    public int getIpat()
-    {
-        return field_3_ipat;
-    }
-
-    /**
-     * An Ipat that specifies the pattern used for shading.
-     */
-    @Internal
-    public void setIpat( int field_3_ipat )
-    {
-        this.field_3_ipat = field_3_ipat;
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
deleted file mode 100644
index 8282e38..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
+++ /dev/null
@@ -1,695 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The StdfBase structure specifies general information about a style. <p>Class
-        and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and
-        [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class StdfBaseAbstractType
-{
-
-    protected short field_1_info1;
-    /**/private static final BitField sti = new BitField(0x0FFF);
-    /**/private static final BitField fScratch = new BitField(0x1000);
-    /**/private static final BitField fInvalHeight = new BitField(0x2000);
-    /**/private static final BitField fHasUpe = new BitField(0x4000);
-    /**/private static final BitField fMassCopy = new BitField(0x8000);
-    protected short field_2_info2;
-    /**/private static final BitField stk = new BitField(0x000F);
-    /**/private static final BitField istdBase = new BitField(0xFFF0);
-    protected short field_3_info3;
-    /**/private static final BitField cupx = new BitField(0x000F);
-    /**/private static final BitField istdNext = new BitField(0xFFF0);
-    protected int field_4_bchUpe;
-    protected short field_5_grfstd;
-    /**/private static final BitField fAutoRedef = new BitField(0x0001);
-    /**/private static final BitField fHidden = new BitField(0x0002);
-    /**/private static final BitField f97LidsSet = new BitField(0x0004);
-    /**/private static final BitField fCopyLang = new BitField(0x0008);
-    /**/private static final BitField fPersonalCompose = new BitField(0x0010);
-    /**/private static final BitField fPersonalReply = new BitField(0x0020);
-    /**/private static final BitField fPersonal = new BitField(0x0040);
-    /**/private static final BitField fNoHtmlExport = new BitField(0x0080);
-    /**/private static final BitField fSemiHidden = new BitField(0x0100);
-    /**/private static final BitField fLocked = new BitField(0x0200);
-    /**/private static final BitField fInternalUse = new BitField(0x0400);
-    /**/private static final BitField fUnhideWhenUsed = new BitField(0x0800);
-    /**/private static final BitField fQFormat = new BitField(0x1000);
-    /**/private static final BitField fReserved = new BitField(0xE000);
-
-    protected StdfBaseAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_info1                  = LittleEndian.getShort(data, 0x0 + offset);
-        field_2_info2                  = LittleEndian.getShort(data, 0x2 + offset);
-        field_3_info3                  = LittleEndian.getShort(data, 0x4 + offset);
-        field_4_bchUpe                 = LittleEndian.getShort(data, 0x6 + offset);
-        field_5_grfstd                 = LittleEndian.getShort(data, 0x8 + offset);
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putShort(data, 0x0 + offset, field_1_info1);
-        LittleEndian.putShort(data, 0x2 + offset, field_2_info2);
-        LittleEndian.putShort(data, 0x4 + offset, field_3_info3);
-        LittleEndian.putUShort(data, 0x6 + offset, field_4_bchUpe);
-        LittleEndian.putShort(data, 0x8 + offset, field_5_grfstd);
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2 + 2 + 2 + 2 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[StdfBase]\n");
-        builder.append("    .info1                = ");
-        builder.append(" (").append(getInfo1()).append(" )\n");
-        builder.append("         .sti                      = ").append(getSti()).append('\n');
-        builder.append("         .fScratch                 = ").append(isFScratch()).append('\n');
-        builder.append("         .fInvalHeight             = ").append(isFInvalHeight()).append('\n');
-        builder.append("         .fHasUpe                  = ").append(isFHasUpe()).append('\n');
-        builder.append("         .fMassCopy                = ").append(isFMassCopy()).append('\n');
-        builder.append("    .info2                = ");
-        builder.append(" (").append(getInfo2()).append(" )\n");
-        builder.append("         .stk                      = ").append(getStk()).append('\n');
-        builder.append("         .istdBase                 = ").append(getIstdBase()).append('\n');
-        builder.append("    .info3                = ");
-        builder.append(" (").append(getInfo3()).append(" )\n");
-        builder.append("         .cupx                     = ").append(getCupx()).append('\n');
-        builder.append("         .istdNext                 = ").append(getIstdNext()).append('\n');
-        builder.append("    .bchUpe               = ");
-        builder.append(" (").append(getBchUpe()).append(" )\n");
-        builder.append("    .grfstd               = ");
-        builder.append(" (").append(getGrfstd()).append(" )\n");
-        builder.append("         .fAutoRedef               = ").append(isFAutoRedef()).append('\n');
-        builder.append("         .fHidden                  = ").append(isFHidden()).append('\n');
-        builder.append("         .f97LidsSet               = ").append(isF97LidsSet()).append('\n');
-        builder.append("         .fCopyLang                = ").append(isFCopyLang()).append('\n');
-        builder.append("         .fPersonalCompose         = ").append(isFPersonalCompose()).append('\n');
-        builder.append("         .fPersonalReply           = ").append(isFPersonalReply()).append('\n');
-        builder.append("         .fPersonal                = ").append(isFPersonal()).append('\n');
-        builder.append("         .fNoHtmlExport            = ").append(isFNoHtmlExport()).append('\n');
-        builder.append("         .fSemiHidden              = ").append(isFSemiHidden()).append('\n');
-        builder.append("         .fLocked                  = ").append(isFLocked()).append('\n');
-        builder.append("         .fInternalUse             = ").append(isFInternalUse()).append('\n');
-        builder.append("         .fUnhideWhenUsed          = ").append(isFUnhideWhenUsed()).append('\n');
-        builder.append("         .fQFormat                 = ").append(isFQFormat()).append('\n');
-        builder.append("         .fReserved                = ").append(getFReserved()).append('\n');
-
-        builder.append("[/StdfBase]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Get the info1 field for the StdfBase record.
-     */
-    @Internal
-    public short getInfo1()
-    {
-        return field_1_info1;
-    }
-
-    /**
-     * Set the info1 field for the StdfBase record.
-     */
-    @Internal
-    public void setInfo1( short field_1_info1 )
-    {
-        this.field_1_info1 = field_1_info1;
-    }
-
-    /**
-     * Get the info2 field for the StdfBase record.
-     */
-    @Internal
-    public short getInfo2()
-    {
-        return field_2_info2;
-    }
-
-    /**
-     * Set the info2 field for the StdfBase record.
-     */
-    @Internal
-    public void setInfo2( short field_2_info2 )
-    {
-        this.field_2_info2 = field_2_info2;
-    }
-
-    /**
-     * Get the info3 field for the StdfBase record.
-     */
-    @Internal
-    public short getInfo3()
-    {
-        return field_3_info3;
-    }
-
-    /**
-     * Set the info3 field for the StdfBase record.
-     */
-    @Internal
-    public void setInfo3( short field_3_info3 )
-    {
-        this.field_3_info3 = field_3_info3;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of std in LPStd. This value MUST be equal to cbStd in LPStd.
-     */
-    @Internal
-    public int getBchUpe()
-    {
-        return field_4_bchUpe;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of std in LPStd. This value MUST be equal to cbStd in LPStd.
-     */
-    @Internal
-    public void setBchUpe( int field_4_bchUpe )
-    {
-        this.field_4_bchUpe = field_4_bchUpe;
-    }
-
-    /**
-     * A GRFSTD that specifies miscellaneous style properties.
-     */
-    @Internal
-    public short getGrfstd()
-    {
-        return field_5_grfstd;
-    }
-
-    /**
-     * A GRFSTD that specifies miscellaneous style properties.
-     */
-    @Internal
-    public void setGrfstd( short field_5_grfstd )
-    {
-        this.field_5_grfstd = field_5_grfstd;
-    }
-
-    /**
-     * Sets the sti field value.
-     * An unsigned integer that specifies the invariant style identifier for application-defined styles, or 0x0FFE for user-defined styles
-     */
-    @Internal
-    public void setSti( short value )
-    {
-        field_1_info1 = (short)sti.setValue(field_1_info1, value);
-    }
-
-    /**
-     * An unsigned integer that specifies the invariant style identifier for application-defined styles, or 0x0FFE for user-defined styles
-     * @return  the sti field value.
-     */
-    @Internal
-    public short getSti()
-    {
-        return ( short )sti.getValue(field_1_info1);
-    }
-
-    /**
-     * Sets the fScratch field value.
-     * spare field for any temporary use, always reset back to zero!
-     */
-    @Internal
-    public void setFScratch( boolean value )
-    {
-        field_1_info1 = (short)fScratch.setBoolean(field_1_info1, value);
-    }
-
-    /**
-     * spare field for any temporary use, always reset back to zero!
-     * @return  the fScratch field value.
-     */
-    @Internal
-    public boolean isFScratch()
-    {
-        return fScratch.isSet(field_1_info1);
-    }
-
-    /**
-     * Sets the fInvalHeight field value.
-     * Specifies whether the paragraph height information in the fcPlcfPhe field of FibRgFcLcb97, for any paragraphs having this paragraph style, MUST be ignored. SHOULD be 0
-     */
-    @Internal
-    public void setFInvalHeight( boolean value )
-    {
-        field_1_info1 = (short)fInvalHeight.setBoolean(field_1_info1, value);
-    }
-
-    /**
-     * Specifies whether the paragraph height information in the fcPlcfPhe field of FibRgFcLcb97, for any paragraphs having this paragraph style, MUST be ignored. SHOULD be 0
-     * @return  the fInvalHeight field value.
-     */
-    @Internal
-    public boolean isFInvalHeight()
-    {
-        return fInvalHeight.isSet(field_1_info1);
-    }
-
-    /**
-     * Sets the fHasUpe field value.
-     * This bit is undefined and MUST be ignored
-     */
-    @Internal
-    public void setFHasUpe( boolean value )
-    {
-        field_1_info1 = (short)fHasUpe.setBoolean(field_1_info1, value);
-    }
-
-    /**
-     * This bit is undefined and MUST be ignored
-     * @return  the fHasUpe field value.
-     */
-    @Internal
-    public boolean isFHasUpe()
-    {
-        return fHasUpe.isSet(field_1_info1);
-    }
-
-    /**
-     * Sets the fMassCopy field value.
-     * This bit is undefined and MUST be ignored
-     */
-    @Internal
-    public void setFMassCopy( boolean value )
-    {
-        field_1_info1 = (short)fMassCopy.setBoolean(field_1_info1, value);
-    }
-
-    /**
-     * This bit is undefined and MUST be ignored
-     * @return  the fMassCopy field value.
-     */
-    @Internal
-    public boolean isFMassCopy()
-    {
-        return fMassCopy.isSet(field_1_info1);
-    }
-
-    /**
-     * Sets the stk field value.
-     * style kind
-     */
-    @Internal
-    public void setStk( byte value )
-    {
-        field_2_info2 = (short)stk.setValue(field_2_info2, value);
-    }
-
-    /**
-     * style kind
-     * @return  the stk field value.
-     */
-    @Internal
-    public byte getStk()
-    {
-        return ( byte )stk.getValue(field_2_info2);
-    }
-
-    /**
-     * Sets the istdBase field value.
-     * base style
-     */
-    @Internal
-    public void setIstdBase( short value )
-    {
-        field_2_info2 = (short)istdBase.setValue(field_2_info2, value);
-    }
-
-    /**
-     * base style
-     * @return  the istdBase field value.
-     */
-    @Internal
-    public short getIstdBase()
-    {
-        return ( short )istdBase.getValue(field_2_info2);
-    }
-
-    /**
-     * Sets the cupx field value.
-     * number of UPXs (and UPEs)
-     */
-    @Internal
-    public void setCupx( byte value )
-    {
-        field_3_info3 = (short)cupx.setValue(field_3_info3, value);
-    }
-
-    /**
-     * number of UPXs (and UPEs)
-     * @return  the cupx field value.
-     */
-    @Internal
-    public byte getCupx()
-    {
-        return ( byte )cupx.getValue(field_3_info3);
-    }
-
-    /**
-     * Sets the istdNext field value.
-     * next style
-     */
-    @Internal
-    public void setIstdNext( short value )
-    {
-        field_3_info3 = (short)istdNext.setValue(field_3_info3, value);
-    }
-
-    /**
-     * next style
-     * @return  the istdNext field value.
-     */
-    @Internal
-    public short getIstdNext()
-    {
-        return ( short )istdNext.getValue(field_3_info3);
-    }
-
-    /**
-     * Sets the fAutoRedef field value.
-     * number of UPXs (and UPEs)
-     */
-    @Internal
-    public void setFAutoRedef( boolean value )
-    {
-        field_5_grfstd = (short)fAutoRedef.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * number of UPXs (and UPEs)
-     * @return  the fAutoRedef field value.
-     */
-    @Internal
-    public boolean isFAutoRedef()
-    {
-        return fAutoRedef.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fHidden field value.
-     * Specifies whether this style is not shown in the application UI
-     */
-    @Internal
-    public void setFHidden( boolean value )
-    {
-        field_5_grfstd = (short)fHidden.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether this style is not shown in the application UI
-     * @return  the fHidden field value.
-     */
-    @Internal
-    public boolean isFHidden()
-    {
-        return fHidden.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the f97LidsSet field value.
-     * Specifies whether sprmCRgLid0_80 and sprmCRgLid1_80 were applied, as appropriate, to this paragraph or character style for compatibility with applications that do not support sprmCRgLid0, sprmCRgLid1, and sprmCFNoProof
-     */
-    @Internal
-    public void setF97LidsSet( boolean value )
-    {
-        field_5_grfstd = (short)f97LidsSet.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether sprmCRgLid0_80 and sprmCRgLid1_80 were applied, as appropriate, to this paragraph or character style for compatibility with applications that do not support sprmCRgLid0, sprmCRgLid1, and sprmCFNoProof
-     * @return  the f97LidsSet field value.
-     */
-    @Internal
-    public boolean isF97LidsSet()
-    {
-        return f97LidsSet.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fCopyLang field value.
-     * If f97LidsSet is 1, this value specifies whether the applied compatibility sprmCRgLid0_80 or sprmCRgLid1_80 specified an actual language or a special LID value (0x0400) signifying that no proofing is needed for the text. This MUST be ignored if f97LidsSet is 0
-     */
-    @Internal
-    public void setFCopyLang( boolean value )
-    {
-        field_5_grfstd = (short)fCopyLang.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * If f97LidsSet is 1, this value specifies whether the applied compatibility sprmCRgLid0_80 or sprmCRgLid1_80 specified an actual language or a special LID value (0x0400) signifying that no proofing is needed for the text. This MUST be ignored if f97LidsSet is 0
-     * @return  the fCopyLang field value.
-     */
-    @Internal
-    public boolean isFCopyLang()
-    {
-        return fCopyLang.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fPersonalCompose field value.
-     * Specifies whether this character style can be used to automatically format the new message text in a new e-mail
-     */
-    @Internal
-    public void setFPersonalCompose( boolean value )
-    {
-        field_5_grfstd = (short)fPersonalCompose.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether this character style can be used to automatically format the new message text in a new e-mail
-     * @return  the fPersonalCompose field value.
-     */
-    @Internal
-    public boolean isFPersonalCompose()
-    {
-        return fPersonalCompose.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fPersonalReply field value.
-     * Specifies whether this character style can be used to automatically format the new message text when replying to an e-mail
-     */
-    @Internal
-    public void setFPersonalReply( boolean value )
-    {
-        field_5_grfstd = (short)fPersonalReply.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether this character style can be used to automatically format the new message text when replying to an e-mail
-     * @return  the fPersonalReply field value.
-     */
-    @Internal
-    public boolean isFPersonalReply()
-    {
-        return fPersonalReply.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fPersonal field value.
-     * Specifies whether this character style was applied to format all message text from one or more users in an e-mail
-     */
-    @Internal
-    public void setFPersonal( boolean value )
-    {
-        field_5_grfstd = (short)fPersonal.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether this character style was applied to format all message text from one or more users in an e-mail
-     * @return  the fPersonal field value.
-     */
-    @Internal
-    public boolean isFPersonal()
-    {
-        return fPersonal.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fNoHtmlExport field value.
-     * This value MUST be 0 and MUST be ignored
-     */
-    @Internal
-    public void setFNoHtmlExport( boolean value )
-    {
-        field_5_grfstd = (short)fNoHtmlExport.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored
-     * @return  the fNoHtmlExport field value.
-     */
-    @Internal
-    public boolean isFNoHtmlExport()
-    {
-        return fNoHtmlExport.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fSemiHidden field value.
-     * Specifies whether this style is not shown in the simplified main styles UI of the application
-     */
-    @Internal
-    public void setFSemiHidden( boolean value )
-    {
-        field_5_grfstd = (short)fSemiHidden.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether this style is not shown in the simplified main styles UI of the application
-     * @return  the fSemiHidden field value.
-     */
-    @Internal
-    public boolean isFSemiHidden()
-    {
-        return fSemiHidden.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fLocked field value.
-     * Specifies whether this style is prevented from being applied by using the application UI
-     */
-    @Internal
-    public void setFLocked( boolean value )
-    {
-        field_5_grfstd = (short)fLocked.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether this style is prevented from being applied by using the application UI
-     * @return  the fLocked field value.
-     */
-    @Internal
-    public boolean isFLocked()
-    {
-        return fLocked.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fInternalUse field value.
-     * This bit is undefined and MUST be ignored
-     */
-    @Internal
-    public void setFInternalUse( boolean value )
-    {
-        field_5_grfstd = (short)fInternalUse.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * This bit is undefined and MUST be ignored
-     * @return  the fInternalUse field value.
-     */
-    @Internal
-    public boolean isFInternalUse()
-    {
-        return fInternalUse.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fUnhideWhenUsed field value.
-     * Specifies whether the fSemiHidden property is to be set to 0 when this style is used
-     */
-    @Internal
-    public void setFUnhideWhenUsed( boolean value )
-    {
-        field_5_grfstd = (short)fUnhideWhenUsed.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether the fSemiHidden property is to be set to 0 when this style is used
-     * @return  the fUnhideWhenUsed field value.
-     */
-    @Internal
-    public boolean isFUnhideWhenUsed()
-    {
-        return fUnhideWhenUsed.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fQFormat field value.
-     * Specifies whether this style is shown in the Ribbon Style gallery
-     */
-    @Internal
-    public void setFQFormat( boolean value )
-    {
-        field_5_grfstd = (short)fQFormat.setBoolean(field_5_grfstd, value);
-    }
-
-    /**
-     * Specifies whether this style is shown in the Ribbon Style gallery
-     * @return  the fQFormat field value.
-     */
-    @Internal
-    public boolean isFQFormat()
-    {
-        return fQFormat.isSet(field_5_grfstd);
-    }
-
-    /**
-     * Sets the fReserved field value.
-     * This value MUST be 0 and MUST be ignored
-     */
-    @Internal
-    public void setFReserved( byte value )
-    {
-        field_5_grfstd = (short)fReserved.setValue(field_5_grfstd, value);
-    }
-
-    /**
-     * This value MUST be 0 and MUST be ignored
-     * @return  the fReserved field value.
-     */
-    @Internal
-    public byte getFReserved()
-    {
-        return ( byte )fReserved.getValue(field_5_grfstd);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
deleted file mode 100644
index 26e5fd6..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The StdfPost2000 structure specifies general information about a style.
-        <p>Class and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary
-        File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class StdfPost2000AbstractType
-{
-
-    protected short field_1_info1;
-    /**/private static final BitField istdLink = new BitField(0x0FFF);
-    /**/private static final BitField fHasOriginalStyle = new BitField(0x1000);
-    /**/private static final BitField fSpare = new BitField(0xE000);
-    protected long field_2_rsid;
-    protected short field_3_info3;
-    /**/private static final BitField iftcHtml = new BitField(0x0007);
-    /**/private static final BitField unused = new BitField(0x0008);
-    /**/private static final BitField iPriority = new BitField(0xFFF0);
-
-    protected StdfPost2000AbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_info1                  = LittleEndian.getShort(data, 0x0 + offset);
-        field_2_rsid                   = LittleEndian.getUInt(data, 0x2 + offset);
-        field_3_info3                  = LittleEndian.getShort(data, 0x6 + offset);
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putShort(data, 0x0 + offset, field_1_info1);
-        LittleEndian.putUInt(data, 0x2 + offset, field_2_rsid);
-        LittleEndian.putShort(data, 0x6 + offset, field_3_info3);
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2 + 4 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[StdfPost2000]\n");
-        builder.append("    .info1                = ");
-        builder.append(" (").append(getInfo1()).append(" )\n");
-        builder.append("         .istdLink                 = ").append(getIstdLink()).append('\n');
-        builder.append("         .fHasOriginalStyle        = ").append(isFHasOriginalStyle()).append('\n');
-        builder.append("         .fSpare                   = ").append(getFSpare()).append('\n');
-        builder.append("    .rsid                 = ");
-        builder.append(" (").append(getRsid()).append(" )\n");
-        builder.append("    .info3                = ");
-        builder.append(" (").append(getInfo3()).append(" )\n");
-        builder.append("         .iftcHtml                 = ").append(getIftcHtml()).append('\n');
-        builder.append("         .unused                   = ").append(isUnused()).append('\n');
-        builder.append("         .iPriority                = ").append(getIPriority()).append('\n');
-
-        builder.append("[/StdfPost2000]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Get the info1 field for the StdfPost2000 record.
-     */
-    @Internal
-    public short getInfo1()
-    {
-        return field_1_info1;
-    }
-
-    /**
-     * Set the info1 field for the StdfPost2000 record.
-     */
-    @Internal
-    public void setInfo1( short field_1_info1 )
-    {
-        this.field_1_info1 = field_1_info1;
-    }
-
-    /**
-     *  An unsigned integer that specifies the revision save identifier of the session when this style definition was last modified.
-     */
-    @Internal
-    public long getRsid()
-    {
-        return field_2_rsid;
-    }
-
-    /**
-     *  An unsigned integer that specifies the revision save identifier of the session when this style definition was last modified.
-     */
-    @Internal
-    public void setRsid( long field_2_rsid )
-    {
-        this.field_2_rsid = field_2_rsid;
-    }
-
-    /**
-     * Get the info3 field for the StdfPost2000 record.
-     */
-    @Internal
-    public short getInfo3()
-    {
-        return field_3_info3;
-    }
-
-    /**
-     * Set the info3 field for the StdfPost2000 record.
-     */
-    @Internal
-    public void setInfo3( short field_3_info3 )
-    {
-        this.field_3_info3 = field_3_info3;
-    }
-
-    /**
-     * Sets the istdLink field value.
-     * An unsigned integer that specifies the istd of the style that is linked to this one, or 0x0000 if this style is not linked to any other style in the document.
-     */
-    @Internal
-    public void setIstdLink( short value )
-    {
-        field_1_info1 = (short)istdLink.setValue(field_1_info1, value);
-    }
-
-    /**
-     * An unsigned integer that specifies the istd of the style that is linked to this one, or 0x0000 if this style is not linked to any other style in the document.
-     * @return  the istdLink field value.
-     */
-    @Internal
-    public short getIstdLink()
-    {
-        return ( short )istdLink.getValue(field_1_info1);
-    }
-
-    /**
-     * Sets the fHasOriginalStyle field value.
-     * Specifies whether the style is revision-marked. A revision-marked style stores the pre-revision formatting in addition to the current formatting. If this bit is set to 1, the cupx member of StdfBase MUST include the formatting sets that specify that pre-revision formatting
-     */
-    @Internal
-    public void setFHasOriginalStyle( boolean value )
-    {
-        field_1_info1 = (short)fHasOriginalStyle.setBoolean(field_1_info1, value);
-    }
-
-    /**
-     * Specifies whether the style is revision-marked. A revision-marked style stores the pre-revision formatting in addition to the current formatting. If this bit is set to 1, the cupx member of StdfBase MUST include the formatting sets that specify that pre-revision formatting
-     * @return  the fHasOriginalStyle field value.
-     */
-    @Internal
-    public boolean isFHasOriginalStyle()
-    {
-        return fHasOriginalStyle.isSet(field_1_info1);
-    }
-
-    /**
-     * Sets the fSpare field value.
-     * Specifies whether the paragraph height information in the fcPlcfPhe field of FibRgFcLcb97
-     */
-    @Internal
-    public void setFSpare( byte value )
-    {
-        field_1_info1 = (short)fSpare.setValue(field_1_info1, value);
-    }
-
-    /**
-     * Specifies whether the paragraph height information in the fcPlcfPhe field of FibRgFcLcb97
-     * @return  the fSpare field value.
-     */
-    @Internal
-    public byte getFSpare()
-    {
-        return ( byte )fSpare.getValue(field_1_info1);
-    }
-
-    /**
-     * Sets the iftcHtml field value.
-     * This field is undefined and MUST be ignored
-     */
-    @Internal
-    public void setIftcHtml( byte value )
-    {
-        field_3_info3 = (short)iftcHtml.setValue(field_3_info3, value);
-    }
-
-    /**
-     * This field is undefined and MUST be ignored
-     * @return  the iftcHtml field value.
-     */
-    @Internal
-    public byte getIftcHtml()
-    {
-        return ( byte )iftcHtml.getValue(field_3_info3);
-    }
-
-    /**
-     * Sets the unused field value.
-     * This value MUST be zero and MUST be ignored
-     */
-    @Internal
-    public void setUnused( boolean value )
-    {
-        field_3_info3 = (short)unused.setBoolean(field_3_info3, value);
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored
-     * @return  the unused field value.
-     */
-    @Internal
-    public boolean isUnused()
-    {
-        return unused.isSet(field_3_info3);
-    }
-
-    /**
-     * Sets the iPriority field value.
-     * An unsigned integer that specifies the priority value that is assigned to this style and that is used when ordering the styles by priority in the user interface
-     */
-    @Internal
-    public void setIPriority( short value )
-    {
-        field_3_info3 = (short)iPriority.setValue(field_3_info3, value);
-    }
-
-    /**
-     * An unsigned integer that specifies the priority value that is assigned to this style and that is used when ordering the styles by priority in the user interface
-     * @return  the iPriority field value.
-     */
-    @Internal
-    public short getIPriority()
-    {
-        return ( short )iPriority.getValue(field_3_info3);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java
deleted file mode 100644
index 5b72d2e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * The Stshif structure specifies general stylesheet information. <p>Class and
-        fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and
-        [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    
- */
-@Internal
-public abstract class StshifAbstractType
-{
-
-    protected int field_1_cstd;
-    protected int field_2_cbSTDBaseInFile;
-    protected int field_3_info3;
-    /**/private static final BitField fHasOriginalStyle = new BitField(0x0001);
-    /**/private static final BitField fReserved = new BitField(0xFFFE);
-    protected int field_4_stiMaxWhenSaved;
-    protected int field_5_istdMaxFixedWhenSaved;
-    protected int field_6_nVerBuiltInNamesWhenSaved;
-    protected short field_7_ftcAsci;
-    protected short field_8_ftcFE;
-    protected short field_9_ftcOther;
-
-    protected StshifAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_cstd                   = LittleEndian.getShort(data, 0x0 + offset);
-        field_2_cbSTDBaseInFile        = LittleEndian.getShort(data, 0x2 + offset);
-        field_3_info3                  = LittleEndian.getShort(data, 0x4 + offset);
-        field_4_stiMaxWhenSaved        = LittleEndian.getShort(data, 0x6 + offset);
-        field_5_istdMaxFixedWhenSaved  = LittleEndian.getShort(data, 0x8 + offset);
-        field_6_nVerBuiltInNamesWhenSaved = LittleEndian.getShort(data, 0xa + offset);
-        field_7_ftcAsci                = LittleEndian.getShort(data, 0xc + offset);
-        field_8_ftcFE                  = LittleEndian.getShort(data, 0xe + offset);
-        field_9_ftcOther               = LittleEndian.getShort(data, 0x10 + offset);
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putUShort(data, 0x0 + offset, field_1_cstd);
-        LittleEndian.putUShort(data, 0x2 + offset, field_2_cbSTDBaseInFile);
-        LittleEndian.putUShort(data, 0x4 + offset, field_3_info3);
-        LittleEndian.putUShort(data, 0x6 + offset, field_4_stiMaxWhenSaved);
-        LittleEndian.putUShort(data, 0x8 + offset, field_5_istdMaxFixedWhenSaved);
-        LittleEndian.putUShort(data, 0xa + offset, field_6_nVerBuiltInNamesWhenSaved);
-        LittleEndian.putShort(data, 0xc + offset, field_7_ftcAsci);
-        LittleEndian.putShort(data, 0xe + offset, field_8_ftcFE);
-        LittleEndian.putShort(data, 0x10 + offset, field_9_ftcOther);
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[Stshif]\n");
-        builder.append("    .cstd                 = ");
-        builder.append(" (").append(getCstd()).append(" )\n");
-        builder.append("    .cbSTDBaseInFile      = ");
-        builder.append(" (").append(getCbSTDBaseInFile()).append(" )\n");
-        builder.append("    .info3                = ");
-        builder.append(" (").append(getInfo3()).append(" )\n");
-        builder.append("         .fHasOriginalStyle        = ").append(isFHasOriginalStyle()).append('\n');
-        builder.append("         .fReserved                = ").append(getFReserved()).append('\n');
-        builder.append("    .stiMaxWhenSaved      = ");
-        builder.append(" (").append(getStiMaxWhenSaved()).append(" )\n");
-        builder.append("    .istdMaxFixedWhenSaved = ");
-        builder.append(" (").append(getIstdMaxFixedWhenSaved()).append(" )\n");
-        builder.append("    .nVerBuiltInNamesWhenSaved = ");
-        builder.append(" (").append(getNVerBuiltInNamesWhenSaved()).append(" )\n");
-        builder.append("    .ftcAsci              = ");
-        builder.append(" (").append(getFtcAsci()).append(" )\n");
-        builder.append("    .ftcFE                = ");
-        builder.append(" (").append(getFtcFE()).append(" )\n");
-        builder.append("    .ftcOther             = ");
-        builder.append(" (").append(getFtcOther()).append(" )\n");
-
-        builder.append("[/Stshif]\n");
-        return builder.toString();
-    }
-
-    /**
-     * An unsigned integer that specifies the count of elements in STSH.rglpstd. This value MUST be equal to or greater than 0x000F, and MUST be less than 0x0FFE.
-     */
-    @Internal
-    public int getCstd()
-    {
-        return field_1_cstd;
-    }
-
-    /**
-     * An unsigned integer that specifies the count of elements in STSH.rglpstd. This value MUST be equal to or greater than 0x000F, and MUST be less than 0x0FFE.
-     */
-    @Internal
-    public void setCstd( int field_1_cstd )
-    {
-        this.field_1_cstd = field_1_cstd;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of the Stdf structure. The Stdf structure contains an StdfBase structure that is followed by a StdfPost2000OrNone structure which contains an optional StdfPost2000 structure. This value MUST be 0x000A when the Stdf structure does not contain an StdfPost2000 structure and MUST be 0x0012 when the Stdf structure does contain an StdfPost2000 structure..
-     */
-    @Internal
-    public int getCbSTDBaseInFile()
-    {
-        return field_2_cbSTDBaseInFile;
-    }
-
-    /**
-     * An unsigned integer that specifies the size, in bytes, of the Stdf structure. The Stdf structure contains an StdfBase structure that is followed by a StdfPost2000OrNone structure which contains an optional StdfPost2000 structure. This value MUST be 0x000A when the Stdf structure does not contain an StdfPost2000 structure and MUST be 0x0012 when the Stdf structure does contain an StdfPost2000 structure..
-     */
-    @Internal
-    public void setCbSTDBaseInFile( int field_2_cbSTDBaseInFile )
-    {
-        this.field_2_cbSTDBaseInFile = field_2_cbSTDBaseInFile;
-    }
-
-    /**
-     * Get the info3 field for the Stshif record.
-     */
-    @Internal
-    public int getInfo3()
-    {
-        return field_3_info3;
-    }
-
-    /**
-     * Set the info3 field for the Stshif record.
-     */
-    @Internal
-    public void setInfo3( int field_3_info3 )
-    {
-        this.field_3_info3 = field_3_info3;
-    }
-
-    /**
-     * An unsigned integer that specifies a value that is 1 larger than the largest StdfBase.sti index of any application-defined style. This SHOULD be equal to the largest sti index that is defined in the application, incremented by 1.
-     */
-    @Internal
-    public int getStiMaxWhenSaved()
-    {
-        return field_4_stiMaxWhenSaved;
-    }
-
-    /**
-     * An unsigned integer that specifies a value that is 1 larger than the largest StdfBase.sti index of any application-defined style. This SHOULD be equal to the largest sti index that is defined in the application, incremented by 1.
-     */
-    @Internal
-    public void setStiMaxWhenSaved( int field_4_stiMaxWhenSaved )
-    {
-        this.field_4_stiMaxWhenSaved = field_4_stiMaxWhenSaved;
-    }
-
-    /**
-     * An unsigned integer that specifies the count of elements at the start of STSH.rglpstd that are reserved for fixed-index application-defined styles. This value MUST be 0x000F.
-     */
-    @Internal
-    public int getIstdMaxFixedWhenSaved()
-    {
-        return field_5_istdMaxFixedWhenSaved;
-    }
-
-    /**
-     * An unsigned integer that specifies the count of elements at the start of STSH.rglpstd that are reserved for fixed-index application-defined styles. This value MUST be 0x000F.
-     */
-    @Internal
-    public void setIstdMaxFixedWhenSaved( int field_5_istdMaxFixedWhenSaved )
-    {
-        this.field_5_istdMaxFixedWhenSaved = field_5_istdMaxFixedWhenSaved;
-    }
-
-    /**
-     * An unsigned integer that specifies the version number of the style names as defined by the application that writes the file.
-     */
-    @Internal
-    public int getNVerBuiltInNamesWhenSaved()
-    {
-        return field_6_nVerBuiltInNamesWhenSaved;
-    }
-
-    /**
-     * An unsigned integer that specifies the version number of the style names as defined by the application that writes the file.
-     */
-    @Internal
-    public void setNVerBuiltInNamesWhenSaved( int field_6_nVerBuiltInNamesWhenSaved )
-    {
-        this.field_6_nVerBuiltInNamesWhenSaved = field_6_nVerBuiltInNamesWhenSaved;
-    }
-
-    /**
-     * A signed integer that specifies an operand value for the sprmCRgFtc0 for default document formatting.
-     */
-    @Internal
-    public short getFtcAsci()
-    {
-        return field_7_ftcAsci;
-    }
-
-    /**
-     * A signed integer that specifies an operand value for the sprmCRgFtc0 for default document formatting.
-     */
-    @Internal
-    public void setFtcAsci( short field_7_ftcAsci )
-    {
-        this.field_7_ftcAsci = field_7_ftcAsci;
-    }
-
-    /**
-     * A signed integer that specifies an operand value for the sprmCRgFtc1 for default document formatting, as defined in the section Determining Formatting Properties.
-     */
-    @Internal
-    public short getFtcFE()
-    {
-        return field_8_ftcFE;
-    }
-
-    /**
-     * A signed integer that specifies an operand value for the sprmCRgFtc1 for default document formatting, as defined in the section Determining Formatting Properties.
-     */
-    @Internal
-    public void setFtcFE( short field_8_ftcFE )
-    {
-        this.field_8_ftcFE = field_8_ftcFE;
-    }
-
-    /**
-     * A signed integer that specifies an operand value for the sprmCRgFtc2 for default document formatting, as defined in the section Determining Formatting Properties.
-     */
-    @Internal
-    public short getFtcOther()
-    {
-        return field_9_ftcOther;
-    }
-
-    /**
-     * A signed integer that specifies an operand value for the sprmCRgFtc2 for default document formatting, as defined in the section Determining Formatting Properties.
-     */
-    @Internal
-    public void setFtcOther( short field_9_ftcOther )
-    {
-        this.field_9_ftcOther = field_9_ftcOther;
-    }
-
-    /**
-     * Sets the fHasOriginalStyle field value.
-     * This value MUST be 1 and MUST be ignored
-     */
-    @Internal
-    public void setFHasOriginalStyle( boolean value )
-    {
-        field_3_info3 = fHasOriginalStyle.setBoolean(field_3_info3, value);
-    }
-
-    /**
-     * This value MUST be 1 and MUST be ignored
-     * @return  the fHasOriginalStyle field value.
-     */
-    @Internal
-    public boolean isFHasOriginalStyle()
-    {
-        return fHasOriginalStyle.isSet(field_3_info3);
-    }
-
-    /**
-     * Sets the fReserved field value.
-     * This value MUST be zero and MUST be ignored
-     */
-    @Internal
-    public void setFReserved( short value )
-    {
-        field_3_info3 = fReserved.setValue(field_3_info3, value);
-    }
-
-    /**
-     * This value MUST be zero and MUST be ignored
-     * @return  the fReserved field value.
-     */
-    @Internal
-    public short getFReserved()
-    {
-        return ( short )fReserved.getValue(field_3_info3);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java
deleted file mode 100644
index d295f42..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java
+++ /dev/null
@@ -1,2327 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
-import org.apache.poi.hwpf.usermodel.TableAutoformatLookSpecifier;
-import org.apache.poi.hwpf.usermodel.TableCellDescriptor;
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-
-/**
- * Table Properties. Properties descriptions quoted from official 97-2007 binary file
-        format specification.
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author S. Ryan Ackley
- */
-@Internal
-public abstract class TAPAbstractType
-{
-
-    protected short field_1_istd;
-    protected short field_2_jc;
-    protected int field_3_dxaGapHalf;
-    protected int field_4_dyaRowHeight;
-    protected boolean field_5_fCantSplit;
-    protected boolean field_6_fCantSplit90;
-    protected boolean field_7_fTableHeader;
-    protected TableAutoformatLookSpecifier field_8_tlp;
-    protected short field_9_wWidth;
-    protected short field_10_wWidthIndent;
-    protected short field_11_wWidthBefore;
-    protected short field_12_wWidthAfter;
-    protected int field_13_widthAndFitsFlags;
-    /**/private static BitField fAutofit = new BitField(0x00000001);
-    /**/private static BitField fKeepFollow = new BitField(0x00000002);
-    /**/private static BitField ftsWidth = new BitField(0x0000001c);
-    /**/private static BitField ftsWidthIndent = new BitField(0x000000e0);
-    /**/private static BitField ftsWidthBefore = new BitField(0x00000700);
-    /**/private static BitField ftsWidthAfter = new BitField(0x00003800);
-    /**/private static BitField fNeverBeenAutofit = new BitField(0x00004000);
-    /**/private static BitField fInvalAutofit = new BitField(0x00008000);
-    /**/private static BitField widthAndFitsFlags_empty1 = new BitField(0x00070000);
-    /**/private static BitField fVert = new BitField(0x00080000);
-    /**/private static BitField pcVert = new BitField(0x00300000);
-    /**/private static BitField pcHorz = new BitField(0x00c00000);
-    /**/private static BitField widthAndFitsFlags_empty2 = new BitField(0xff000000);
-    protected int field_14_dxaAbs;
-    protected int field_15_dyaAbs;
-    protected int field_16_dxaFromText;
-    protected int field_17_dyaFromText;
-    protected int field_18_dxaFromTextRight;
-    protected int field_19_dyaFromTextBottom;
-    protected byte field_20_fBiDi;
-    protected byte field_21_fRTL;
-    protected byte field_22_fNoAllowOverlap;
-    protected byte field_23_fSpare;
-    protected int field_24_grpfTap;
-    protected int field_25_internalFlags;
-    /**/private static BitField fFirstRow = new BitField(0x0001);
-    /**/private static BitField fLastRow = new BitField(0x0002);
-    /**/private static BitField fOutline = new BitField(0x0004);
-    /**/private static BitField fOrigWordTableRules = new BitField(0x0008);
-    /**/private static BitField fCellSpacing = new BitField(0x0010);
-    /**/private static BitField grpfTap_unused = new BitField(0xffe0);
-    protected short field_26_itcMac;
-    protected int field_27_dxaAdjust;
-    protected int field_28_dxaWebView;
-    protected int field_29_dxaRTEWrapWidth;
-    protected int field_30_dxaColWidthWwd;
-    protected short field_31_pctWwd;
-    protected int field_32_viewFlags;
-    /**/private static BitField fWrapToWwd = new BitField(0x0001);
-    /**/private static BitField fNotPageView = new BitField(0x0002);
-    /**/private static BitField viewFlags_unused1 = new BitField(0x0004);
-    /**/private static BitField fWebView = new BitField(0x0008);
-    /**/private static BitField fAdjusted = new BitField(0x0010);
-    /**/private static BitField viewFlags_unused2 = new BitField(0xffe0);
-    protected short[] field_33_rgdxaCenter;
-    protected short[] field_34_rgdxaCenterPrint;
-    protected ShadingDescriptor field_35_shdTable;
-    protected BorderCode field_36_brcBottom;
-    protected BorderCode field_37_brcTop;
-    protected BorderCode field_38_brcLeft;
-    protected BorderCode field_39_brcRight;
-    protected BorderCode field_40_brcVertical;
-    protected BorderCode field_41_brcHorizontal;
-    protected short field_42_wCellPaddingDefaultTop;
-    protected short field_43_wCellPaddingDefaultLeft;
-    protected short field_44_wCellPaddingDefaultBottom;
-    protected short field_45_wCellPaddingDefaultRight;
-    protected byte field_46_ftsCellPaddingDefaultTop;
-    protected byte field_47_ftsCellPaddingDefaultLeft;
-    protected byte field_48_ftsCellPaddingDefaultBottom;
-    protected byte field_49_ftsCellPaddingDefaultRight;
-    protected short field_50_wCellSpacingDefaultTop;
-    protected short field_51_wCellSpacingDefaultLeft;
-    protected short field_52_wCellSpacingDefaultBottom;
-    protected short field_53_wCellSpacingDefaultRight;
-    protected byte field_54_ftsCellSpacingDefaultTop;
-    protected byte field_55_ftsCellSpacingDefaultLeft;
-    protected byte field_56_ftsCellSpacingDefaultBottom;
-    protected byte field_57_ftsCellSpacingDefaultRight;
-    protected short field_58_wCellPaddingOuterTop;
-    protected short field_59_wCellPaddingOuterLeft;
-    protected short field_60_wCellPaddingOuterBottom;
-    protected short field_61_wCellPaddingOuterRight;
-    protected byte field_62_ftsCellPaddingOuterTop;
-    protected byte field_63_ftsCellPaddingOuterLeft;
-    protected byte field_64_ftsCellPaddingOuterBottom;
-    protected byte field_65_ftsCellPaddingOuterRight;
-    protected short field_66_wCellSpacingOuterTop;
-    protected short field_67_wCellSpacingOuterLeft;
-    protected short field_68_wCellSpacingOuterBottom;
-    protected short field_69_wCellSpacingOuterRight;
-    protected byte field_70_ftsCellSpacingOuterTop;
-    protected byte field_71_ftsCellSpacingOuterLeft;
-    protected byte field_72_ftsCellSpacingOuterBottom;
-    protected byte field_73_ftsCellSpacingOuterRight;
-    protected TableCellDescriptor[] field_74_rgtc;
-    protected ShadingDescriptor[] field_75_rgshd;
-    protected byte field_76_fPropRMark;
-    protected byte field_77_fHasOldProps;
-    protected short field_78_cHorzBands;
-    protected short field_79_cVertBands;
-    protected BorderCode field_80_rgbrcInsideDefault_0;
-    protected BorderCode field_81_rgbrcInsideDefault_1;
-
-    protected TAPAbstractType()
-    {
-        this.field_8_tlp = new TableAutoformatLookSpecifier();
-        this.field_33_rgdxaCenter = new short[0];
-        this.field_34_rgdxaCenterPrint = new short[0];
-        this.field_35_shdTable = new ShadingDescriptor();
-        this.field_36_brcBottom = new BorderCode();
-        this.field_37_brcTop = new BorderCode();
-        this.field_38_brcLeft = new BorderCode();
-        this.field_39_brcRight = new BorderCode();
-        this.field_40_brcVertical = new BorderCode();
-        this.field_41_brcHorizontal = new BorderCode();
-        this.field_74_rgtc = new TableCellDescriptor[0];
-        this.field_75_rgshd = new ShadingDescriptor[0];
-        this.field_80_rgbrcInsideDefault_0 = new BorderCode();
-        this.field_81_rgbrcInsideDefault_1 = new BorderCode();
-    }
-
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[TAP]\n");
-        builder.append("    .istd                 = ");
-        builder.append(" (").append(getIstd()).append(" )\n");
-        builder.append("    .jc                   = ");
-        builder.append(" (").append(getJc()).append(" )\n");
-        builder.append("    .dxaGapHalf           = ");
-        builder.append(" (").append(getDxaGapHalf()).append(" )\n");
-        builder.append("    .dyaRowHeight         = ");
-        builder.append(" (").append(getDyaRowHeight()).append(" )\n");
-        builder.append("    .fCantSplit           = ");
-        builder.append(" (").append(getFCantSplit()).append(" )\n");
-        builder.append("    .fCantSplit90         = ");
-        builder.append(" (").append(getFCantSplit90()).append(" )\n");
-        builder.append("    .fTableHeader         = ");
-        builder.append(" (").append(getFTableHeader()).append(" )\n");
-        builder.append("    .tlp                  = ");
-        builder.append(" (").append(getTlp()).append(" )\n");
-        builder.append("    .wWidth               = ");
-        builder.append(" (").append(getWWidth()).append(" )\n");
-        builder.append("    .wWidthIndent         = ");
-        builder.append(" (").append(getWWidthIndent()).append(" )\n");
-        builder.append("    .wWidthBefore         = ");
-        builder.append(" (").append(getWWidthBefore()).append(" )\n");
-        builder.append("    .wWidthAfter          = ");
-        builder.append(" (").append(getWWidthAfter()).append(" )\n");
-        builder.append("    .widthAndFitsFlags    = ");
-        builder.append(" (").append(getWidthAndFitsFlags()).append(" )\n");
-        builder.append("         .fAutofit                 = ").append(isFAutofit()).append('\n');
-        builder.append("         .fKeepFollow              = ").append(isFKeepFollow()).append('\n');
-        builder.append("         .ftsWidth                 = ").append(getFtsWidth()).append('\n');
-        builder.append("         .ftsWidthIndent           = ").append(getFtsWidthIndent()).append('\n');
-        builder.append("         .ftsWidthBefore           = ").append(getFtsWidthBefore()).append('\n');
-        builder.append("         .ftsWidthAfter            = ").append(getFtsWidthAfter()).append('\n');
-        builder.append("         .fNeverBeenAutofit        = ").append(isFNeverBeenAutofit()).append('\n');
-        builder.append("         .fInvalAutofit            = ").append(isFInvalAutofit()).append('\n');
-        builder.append("         .widthAndFitsFlags_empty1     = ").append(getWidthAndFitsFlags_empty1()).append('\n');
-        builder.append("         .fVert                    = ").append(isFVert()).append('\n');
-        builder.append("         .pcVert                   = ").append(getPcVert()).append('\n');
-        builder.append("         .pcHorz                   = ").append(getPcHorz()).append('\n');
-        builder.append("         .widthAndFitsFlags_empty2     = ").append(getWidthAndFitsFlags_empty2()).append('\n');
-        builder.append("    .dxaAbs               = ");
-        builder.append(" (").append(getDxaAbs()).append(" )\n");
-        builder.append("    .dyaAbs               = ");
-        builder.append(" (").append(getDyaAbs()).append(" )\n");
-        builder.append("    .dxaFromText          = ");
-        builder.append(" (").append(getDxaFromText()).append(" )\n");
-        builder.append("    .dyaFromText          = ");
-        builder.append(" (").append(getDyaFromText()).append(" )\n");
-        builder.append("    .dxaFromTextRight     = ");
-        builder.append(" (").append(getDxaFromTextRight()).append(" )\n");
-        builder.append("    .dyaFromTextBottom    = ");
-        builder.append(" (").append(getDyaFromTextBottom()).append(" )\n");
-        builder.append("    .fBiDi                = ");
-        builder.append(" (").append(getFBiDi()).append(" )\n");
-        builder.append("    .fRTL                 = ");
-        builder.append(" (").append(getFRTL()).append(" )\n");
-        builder.append("    .fNoAllowOverlap      = ");
-        builder.append(" (").append(getFNoAllowOverlap()).append(" )\n");
-        builder.append("    .fSpare               = ");
-        builder.append(" (").append(getFSpare()).append(" )\n");
-        builder.append("    .grpfTap              = ");
-        builder.append(" (").append(getGrpfTap()).append(" )\n");
-        builder.append("    .internalFlags        = ");
-        builder.append(" (").append(getInternalFlags()).append(" )\n");
-        builder.append("         .fFirstRow                = ").append(isFFirstRow()).append('\n');
-        builder.append("         .fLastRow                 = ").append(isFLastRow()).append('\n');
-        builder.append("         .fOutline                 = ").append(isFOutline()).append('\n');
-        builder.append("         .fOrigWordTableRules      = ").append(isFOrigWordTableRules()).append('\n');
-        builder.append("         .fCellSpacing             = ").append(isFCellSpacing()).append('\n');
-        builder.append("         .grpfTap_unused           = ").append(getGrpfTap_unused()).append('\n');
-        builder.append("    .itcMac               = ");
-        builder.append(" (").append(getItcMac()).append(" )\n");
-        builder.append("    .dxaAdjust            = ");
-        builder.append(" (").append(getDxaAdjust()).append(" )\n");
-        builder.append("    .dxaWebView           = ");
-        builder.append(" (").append(getDxaWebView()).append(" )\n");
-        builder.append("    .dxaRTEWrapWidth      = ");
-        builder.append(" (").append(getDxaRTEWrapWidth()).append(" )\n");
-        builder.append("    .dxaColWidthWwd       = ");
-        builder.append(" (").append(getDxaColWidthWwd()).append(" )\n");
-        builder.append("    .pctWwd               = ");
-        builder.append(" (").append(getPctWwd()).append(" )\n");
-        builder.append("    .viewFlags            = ");
-        builder.append(" (").append(getViewFlags()).append(" )\n");
-        builder.append("         .fWrapToWwd               = ").append(isFWrapToWwd()).append('\n');
-        builder.append("         .fNotPageView             = ").append(isFNotPageView()).append('\n');
-        builder.append("         .viewFlags_unused1        = ").append(isViewFlags_unused1()).append('\n');
-        builder.append("         .fWebView                 = ").append(isFWebView()).append('\n');
-        builder.append("         .fAdjusted                = ").append(isFAdjusted()).append('\n');
-        builder.append("         .viewFlags_unused2        = ").append(getViewFlags_unused2()).append('\n');
-        builder.append("    .rgdxaCenter          = ");
-        builder.append(" (").append(Arrays.toString(getRgdxaCenter())).append(" )\n");
-        builder.append("    .rgdxaCenterPrint     = ");
-        builder.append(" (").append(Arrays.toString(getRgdxaCenterPrint())).append(" )\n");
-        builder.append("    .shdTable             = ");
-        builder.append(" (").append(getShdTable()).append(" )\n");
-        builder.append("    .brcBottom            = ");
-        builder.append(" (").append(getBrcBottom()).append(" )\n");
-        builder.append("    .brcTop               = ");
-        builder.append(" (").append(getBrcTop()).append(" )\n");
-        builder.append("    .brcLeft              = ");
-        builder.append(" (").append(getBrcLeft()).append(" )\n");
-        builder.append("    .brcRight             = ");
-        builder.append(" (").append(getBrcRight()).append(" )\n");
-        builder.append("    .brcVertical          = ");
-        builder.append(" (").append(getBrcVertical()).append(" )\n");
-        builder.append("    .brcHorizontal        = ");
-        builder.append(" (").append(getBrcHorizontal()).append(" )\n");
-        builder.append("    .wCellPaddingDefaultTop = ");
-        builder.append(" (").append(getWCellPaddingDefaultTop()).append(" )\n");
-        builder.append("    .wCellPaddingDefaultLeft = ");
-        builder.append(" (").append(getWCellPaddingDefaultLeft()).append(" )\n");
-        builder.append("    .wCellPaddingDefaultBottom = ");
-        builder.append(" (").append(getWCellPaddingDefaultBottom()).append(" )\n");
-        builder.append("    .wCellPaddingDefaultRight = ");
-        builder.append(" (").append(getWCellPaddingDefaultRight()).append(" )\n");
-        builder.append("    .ftsCellPaddingDefaultTop = ");
-        builder.append(" (").append(getFtsCellPaddingDefaultTop()).append(" )\n");
-        builder.append("    .ftsCellPaddingDefaultLeft = ");
-        builder.append(" (").append(getFtsCellPaddingDefaultLeft()).append(" )\n");
-        builder.append("    .ftsCellPaddingDefaultBottom = ");
-        builder.append(" (").append(getFtsCellPaddingDefaultBottom()).append(" )\n");
-        builder.append("    .ftsCellPaddingDefaultRight = ");
-        builder.append(" (").append(getFtsCellPaddingDefaultRight()).append(" )\n");
-        builder.append("    .wCellSpacingDefaultTop = ");
-        builder.append(" (").append(getWCellSpacingDefaultTop()).append(" )\n");
-        builder.append("    .wCellSpacingDefaultLeft = ");
-        builder.append(" (").append(getWCellSpacingDefaultLeft()).append(" )\n");
-        builder.append("    .wCellSpacingDefaultBottom = ");
-        builder.append(" (").append(getWCellSpacingDefaultBottom()).append(" )\n");
-        builder.append("    .wCellSpacingDefaultRight = ");
-        builder.append(" (").append(getWCellSpacingDefaultRight()).append(" )\n");
-        builder.append("    .ftsCellSpacingDefaultTop = ");
-        builder.append(" (").append(getFtsCellSpacingDefaultTop()).append(" )\n");
-        builder.append("    .ftsCellSpacingDefaultLeft = ");
-        builder.append(" (").append(getFtsCellSpacingDefaultLeft()).append(" )\n");
-        builder.append("    .ftsCellSpacingDefaultBottom = ");
-        builder.append(" (").append(getFtsCellSpacingDefaultBottom()).append(" )\n");
-        builder.append("    .ftsCellSpacingDefaultRight = ");
-        builder.append(" (").append(getFtsCellSpacingDefaultRight()).append(" )\n");
-        builder.append("    .wCellPaddingOuterTop = ");
-        builder.append(" (").append(getWCellPaddingOuterTop()).append(" )\n");
-        builder.append("    .wCellPaddingOuterLeft = ");
-        builder.append(" (").append(getWCellPaddingOuterLeft()).append(" )\n");
-        builder.append("    .wCellPaddingOuterBottom = ");
-        builder.append(" (").append(getWCellPaddingOuterBottom()).append(" )\n");
-        builder.append("    .wCellPaddingOuterRight = ");
-        builder.append(" (").append(getWCellPaddingOuterRight()).append(" )\n");
-        builder.append("    .ftsCellPaddingOuterTop = ");
-        builder.append(" (").append(getFtsCellPaddingOuterTop()).append(" )\n");
-        builder.append("    .ftsCellPaddingOuterLeft = ");
-        builder.append(" (").append(getFtsCellPaddingOuterLeft()).append(" )\n");
-        builder.append("    .ftsCellPaddingOuterBottom = ");
-        builder.append(" (").append(getFtsCellPaddingOuterBottom()).append(" )\n");
-        builder.append("    .ftsCellPaddingOuterRight = ");
-        builder.append(" (").append(getFtsCellPaddingOuterRight()).append(" )\n");
-        builder.append("    .wCellSpacingOuterTop = ");
-        builder.append(" (").append(getWCellSpacingOuterTop()).append(" )\n");
-        builder.append("    .wCellSpacingOuterLeft = ");
-        builder.append(" (").append(getWCellSpacingOuterLeft()).append(" )\n");
-        builder.append("    .wCellSpacingOuterBottom = ");
-        builder.append(" (").append(getWCellSpacingOuterBottom()).append(" )\n");
-        builder.append("    .wCellSpacingOuterRight = ");
-        builder.append(" (").append(getWCellSpacingOuterRight()).append(" )\n");
-        builder.append("    .ftsCellSpacingOuterTop = ");
-        builder.append(" (").append(getFtsCellSpacingOuterTop()).append(" )\n");
-        builder.append("    .ftsCellSpacingOuterLeft = ");
-        builder.append(" (").append(getFtsCellSpacingOuterLeft()).append(" )\n");
-        builder.append("    .ftsCellSpacingOuterBottom = ");
-        builder.append(" (").append(getFtsCellSpacingOuterBottom()).append(" )\n");
-        builder.append("    .ftsCellSpacingOuterRight = ");
-        builder.append(" (").append(getFtsCellSpacingOuterRight()).append(" )\n");
-        builder.append("    .rgtc                 = ");
-        builder.append(" (").append(Arrays.toString(getRgtc())).append(" )\n");
-        builder.append("    .rgshd                = ");
-        builder.append(" (").append(Arrays.toString(getRgshd())).append(" )\n");
-        builder.append("    .fPropRMark           = ");
-        builder.append(" (").append(getFPropRMark()).append(" )\n");
-        builder.append("    .fHasOldProps         = ");
-        builder.append(" (").append(getFHasOldProps()).append(" )\n");
-        builder.append("    .cHorzBands           = ");
-        builder.append(" (").append(getCHorzBands()).append(" )\n");
-        builder.append("    .cVertBands           = ");
-        builder.append(" (").append(getCVertBands()).append(" )\n");
-        builder.append("    .rgbrcInsideDefault_0 = ");
-        builder.append(" (").append(getRgbrcInsideDefault_0()).append(" )\n");
-        builder.append("    .rgbrcInsideDefault_1 = ");
-        builder.append(" (").append(getRgbrcInsideDefault_1()).append(" )\n");
-
-        builder.append("[/TAP]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Table style for the Table.
-     */
-    @Internal
-    public short getIstd()
-    {
-        return field_1_istd;
-    }
-
-    /**
-     * Table style for the Table.
-     */
-    @Internal
-    public void setIstd( short field_1_istd )
-    {
-        this.field_1_istd = field_1_istd;
-    }
-
-    /**
-     * Justification code. specifies how table row should be justified within its column. 0 -- left justify, 1 -- center, 2 -- right justify.
-     */
-    @Internal
-    public short getJc()
-    {
-        return field_2_jc;
-    }
-
-    /**
-     * Justification code. specifies how table row should be justified within its column. 0 -- left justify, 1 -- center, 2 -- right justify.
-     */
-    @Internal
-    public void setJc( short field_2_jc )
-    {
-        this.field_2_jc = field_2_jc;
-    }
-
-    /**
-     * Measures half of the white space that will be maintained between text in adjacent columns of a table row. A dxaGapHalf width of white space will be maintained on both sides of a column boundary..
-     */
-    @Internal
-    public int getDxaGapHalf()
-    {
-        return field_3_dxaGapHalf;
-    }
-
-    /**
-     * Measures half of the white space that will be maintained between text in adjacent columns of a table row. A dxaGapHalf width of white space will be maintained on both sides of a column boundary..
-     */
-    @Internal
-    public void setDxaGapHalf( int field_3_dxaGapHalf )
-    {
-        this.field_3_dxaGapHalf = field_3_dxaGapHalf;
-    }
-
-    /**
-     * When greater than 0, guarantees that the height of the table will be at least dyaRowHeight high. When less than 0, guarantees that the height of the table will be exactly absolute value of dyaRowHeight high. When 0, table will be given a height large enough to represent all of the text in all of the cells of the table. Cells with vertical text flow make no contribution to the computation of the height of rows with auto or at least height. Neither do vertically merged cells, except in the last row of the vertical merge. If an auto height row consists entirely of cells which have vertical text direction or are vertically merged, and the row does not contain the last cell in any vertical cell merge, then the row is given height equal to that of the end of cell mark in the first cell..
-     */
-    @Internal
-    public int getDyaRowHeight()
-    {
-        return field_4_dyaRowHeight;
-    }
-
-    /**
-     * When greater than 0, guarantees that the height of the table will be at least dyaRowHeight high. When less than 0, guarantees that the height of the table will be exactly absolute value of dyaRowHeight high. When 0, table will be given a height large enough to represent all of the text in all of the cells of the table. Cells with vertical text flow make no contribution to the computation of the height of rows with auto or at least height. Neither do vertically merged cells, except in the last row of the vertical merge. If an auto height row consists entirely of cells which have vertical text direction or are vertically merged, and the row does not contain the last cell in any vertical cell merge, then the row is given height equal to that of the end of cell mark in the first cell..
-     */
-    @Internal
-    public void setDyaRowHeight( int field_4_dyaRowHeight )
-    {
-        this.field_4_dyaRowHeight = field_4_dyaRowHeight;
-    }
-
-    /**
-     * When 1, table row may not be split across page bounds.
-     */
-    @Internal
-    public boolean getFCantSplit()
-    {
-        return field_5_fCantSplit;
-    }
-
-    /**
-     * When 1, table row may not be split across page bounds.
-     */
-    @Internal
-    public void setFCantSplit( boolean field_5_fCantSplit )
-    {
-        this.field_5_fCantSplit = field_5_fCantSplit;
-    }
-
-    /**
-     * When 1, table row may not be split across page bounds. Used for Word 2000 and Word 97..
-     */
-    @Internal
-    public boolean getFCantSplit90()
-    {
-        return field_6_fCantSplit90;
-    }
-
-    /**
-     * When 1, table row may not be split across page bounds. Used for Word 2000 and Word 97..
-     */
-    @Internal
-    public void setFCantSplit90( boolean field_6_fCantSplit90 )
-    {
-        this.field_6_fCantSplit90 = field_6_fCantSplit90;
-    }
-
-    /**
-     * When 1, table row is to be used as the header of the table.
-     */
-    @Internal
-    public boolean getFTableHeader()
-    {
-        return field_7_fTableHeader;
-    }
-
-    /**
-     * When 1, table row is to be used as the header of the table.
-     */
-    @Internal
-    public void setFTableHeader( boolean field_7_fTableHeader )
-    {
-        this.field_7_fTableHeader = field_7_fTableHeader;
-    }
-
-    /**
-     * Table look specifier.
-     */
-    @Internal
-    public TableAutoformatLookSpecifier getTlp()
-    {
-        return field_8_tlp;
-    }
-
-    /**
-     * Table look specifier.
-     */
-    @Internal
-    public void setTlp( TableAutoformatLookSpecifier field_8_tlp )
-    {
-        this.field_8_tlp = field_8_tlp;
-    }
-
-    /**
-     * Preferred table width.
-     */
-    @Internal
-    public short getWWidth()
-    {
-        return field_9_wWidth;
-    }
-
-    /**
-     * Preferred table width.
-     */
-    @Internal
-    public void setWWidth( short field_9_wWidth )
-    {
-        this.field_9_wWidth = field_9_wWidth;
-    }
-
-    /**
-     * Left Indent.
-     */
-    @Internal
-    public short getWWidthIndent()
-    {
-        return field_10_wWidthIndent;
-    }
-
-    /**
-     * Left Indent.
-     */
-    @Internal
-    public void setWWidthIndent( short field_10_wWidthIndent )
-    {
-        this.field_10_wWidthIndent = field_10_wWidthIndent;
-    }
-
-    /**
-     * Width of invisible cell (used for layout purposes) before the first visible cell in the row..
-     */
-    @Internal
-    public short getWWidthBefore()
-    {
-        return field_11_wWidthBefore;
-    }
-
-    /**
-     * Width of invisible cell (used for layout purposes) before the first visible cell in the row..
-     */
-    @Internal
-    public void setWWidthBefore( short field_11_wWidthBefore )
-    {
-        this.field_11_wWidthBefore = field_11_wWidthBefore;
-    }
-
-    /**
-     * Width of invisible cell (used for layout purposes) after the last visible cell in the row..
-     */
-    @Internal
-    public short getWWidthAfter()
-    {
-        return field_12_wWidthAfter;
-    }
-
-    /**
-     * Width of invisible cell (used for layout purposes) after the last visible cell in the row..
-     */
-    @Internal
-    public void setWWidthAfter( short field_12_wWidthAfter )
-    {
-        this.field_12_wWidthAfter = field_12_wWidthAfter;
-    }
-
-    /**
-     * Get the widthAndFitsFlags field for the TAP record.
-     */
-    @Internal
-    public int getWidthAndFitsFlags()
-    {
-        return field_13_widthAndFitsFlags;
-    }
-
-    /**
-     * Set the widthAndFitsFlags field for the TAP record.
-     */
-    @Internal
-    public void setWidthAndFitsFlags( int field_13_widthAndFitsFlags )
-    {
-        this.field_13_widthAndFitsFlags = field_13_widthAndFitsFlags;
-    }
-
-    /**
-     * Absolute horizontal position.
-     */
-    @Internal
-    public int getDxaAbs()
-    {
-        return field_14_dxaAbs;
-    }
-
-    /**
-     * Absolute horizontal position.
-     */
-    @Internal
-    public void setDxaAbs( int field_14_dxaAbs )
-    {
-        this.field_14_dxaAbs = field_14_dxaAbs;
-    }
-
-    /**
-     * Absolute vertical position.
-     */
-    @Internal
-    public int getDyaAbs()
-    {
-        return field_15_dyaAbs;
-    }
-
-    /**
-     * Absolute vertical position.
-     */
-    @Internal
-    public void setDyaAbs( int field_15_dyaAbs )
-    {
-        this.field_15_dyaAbs = field_15_dyaAbs;
-    }
-
-    /**
-     * Left distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public int getDxaFromText()
-    {
-        return field_16_dxaFromText;
-    }
-
-    /**
-     * Left distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public void setDxaFromText( int field_16_dxaFromText )
-    {
-        this.field_16_dxaFromText = field_16_dxaFromText;
-    }
-
-    /**
-     * Top distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public int getDyaFromText()
-    {
-        return field_17_dyaFromText;
-    }
-
-    /**
-     * Top distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public void setDyaFromText( int field_17_dyaFromText )
-    {
-        this.field_17_dyaFromText = field_17_dyaFromText;
-    }
-
-    /**
-     * Right distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public int getDxaFromTextRight()
-    {
-        return field_18_dxaFromTextRight;
-    }
-
-    /**
-     * Right distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public void setDxaFromTextRight( int field_18_dxaFromTextRight )
-    {
-        this.field_18_dxaFromTextRight = field_18_dxaFromTextRight;
-    }
-
-    /**
-     * Bottom distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public int getDyaFromTextBottom()
-    {
-        return field_19_dyaFromTextBottom;
-    }
-
-    /**
-     * Bottom distance from surrounding text when absolutely positioned.
-     */
-    @Internal
-    public void setDyaFromTextBottom( int field_19_dyaFromTextBottom )
-    {
-        this.field_19_dyaFromTextBottom = field_19_dyaFromTextBottom;
-    }
-
-    /**
-     * When 1, table is right-to-left. Logical right-to-left table: The CP stream of a right-to-left table is meant to be displayed from right to left. So for example the first table cell is displayed on the right side of the table instead of the left..
-     */
-    @Internal
-    public byte getFBiDi()
-    {
-        return field_20_fBiDi;
-    }
-
-    /**
-     * When 1, table is right-to-left. Logical right-to-left table: The CP stream of a right-to-left table is meant to be displayed from right to left. So for example the first table cell is displayed on the right side of the table instead of the left..
-     */
-    @Internal
-    public void setFBiDi( byte field_20_fBiDi )
-    {
-        this.field_20_fBiDi = field_20_fBiDi;
-    }
-
-    /**
-     * Word 2000 style right-to-left table. Visual right-to-left table: The CP stream of a right-to-left table is displayed from left to right just as for a normal table. So, the text which is meant to be in the first (rightmost) table cell must be placed in the last table cell in the CP stream..
-     */
-    @Internal
-    public byte getFRTL()
-    {
-        return field_21_fRTL;
-    }
-
-    /**
-     * Word 2000 style right-to-left table. Visual right-to-left table: The CP stream of a right-to-left table is displayed from left to right just as for a normal table. So, the text which is meant to be in the first (rightmost) table cell must be placed in the last table cell in the CP stream..
-     */
-    @Internal
-    public void setFRTL( byte field_21_fRTL )
-    {
-        this.field_21_fRTL = field_21_fRTL;
-    }
-
-    /**
-     * When set to 1, do not allow absolutely positioned table to overlap with other tables.
-     */
-    @Internal
-    public byte getFNoAllowOverlap()
-    {
-        return field_22_fNoAllowOverlap;
-    }
-
-    /**
-     * When set to 1, do not allow absolutely positioned table to overlap with other tables.
-     */
-    @Internal
-    public void setFNoAllowOverlap( byte field_22_fNoAllowOverlap )
-    {
-        this.field_22_fNoAllowOverlap = field_22_fNoAllowOverlap;
-    }
-
-    /**
-     * Not used.
-     */
-    @Internal
-    public byte getFSpare()
-    {
-        return field_23_fSpare;
-    }
-
-    /**
-     * Not used.
-     */
-    @Internal
-    public void setFSpare( byte field_23_fSpare )
-    {
-        this.field_23_fSpare = field_23_fSpare;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public int getGrpfTap()
-    {
-        return field_24_grpfTap;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setGrpfTap( int field_24_grpfTap )
-    {
-        this.field_24_grpfTap = field_24_grpfTap;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public int getInternalFlags()
-    {
-        return field_25_internalFlags;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setInternalFlags( int field_25_internalFlags )
-    {
-        this.field_25_internalFlags = field_25_internalFlags;
-    }
-
-    /**
-     * Count of cells defined for this row. itcMac must be >= 0 and less than or equal to 64..
-     */
-    @Internal
-    public short getItcMac()
-    {
-        return field_26_itcMac;
-    }
-
-    /**
-     * Count of cells defined for this row. itcMac must be >= 0 and less than or equal to 64..
-     */
-    @Internal
-    public void setItcMac( short field_26_itcMac )
-    {
-        this.field_26_itcMac = field_26_itcMac;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public int getDxaAdjust()
-    {
-        return field_27_dxaAdjust;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setDxaAdjust( int field_27_dxaAdjust )
-    {
-        this.field_27_dxaAdjust = field_27_dxaAdjust;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public int getDxaWebView()
-    {
-        return field_28_dxaWebView;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setDxaWebView( int field_28_dxaWebView )
-    {
-        this.field_28_dxaWebView = field_28_dxaWebView;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public int getDxaRTEWrapWidth()
-    {
-        return field_29_dxaRTEWrapWidth;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setDxaRTEWrapWidth( int field_29_dxaRTEWrapWidth )
-    {
-        this.field_29_dxaRTEWrapWidth = field_29_dxaRTEWrapWidth;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public int getDxaColWidthWwd()
-    {
-        return field_30_dxaColWidthWwd;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setDxaColWidthWwd( int field_30_dxaColWidthWwd )
-    {
-        this.field_30_dxaColWidthWwd = field_30_dxaColWidthWwd;
-    }
-
-    /**
-     * Used internally by Word: percent of Window size for AutoFit in WebView.
-     */
-    @Internal
-    public short getPctWwd()
-    {
-        return field_31_pctWwd;
-    }
-
-    /**
-     * Used internally by Word: percent of Window size for AutoFit in WebView.
-     */
-    @Internal
-    public void setPctWwd( short field_31_pctWwd )
-    {
-        this.field_31_pctWwd = field_31_pctWwd;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public int getViewFlags()
-    {
-        return field_32_viewFlags;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setViewFlags( int field_32_viewFlags )
-    {
-        this.field_32_viewFlags = field_32_viewFlags;
-    }
-
-    /**
-     * rgdxaCenter[0] is the left boundary of cell 0 measured relative to margin rgdxaCenter[tap.itcMac - 1] is left boundary of last cell rgdxaCenter[tap.itcMac] is right boundary of last cell..
-     */
-    @Internal
-    public short[] getRgdxaCenter()
-    {
-        return field_33_rgdxaCenter;
-    }
-
-    /**
-     * rgdxaCenter[0] is the left boundary of cell 0 measured relative to margin rgdxaCenter[tap.itcMac - 1] is left boundary of last cell rgdxaCenter[tap.itcMac] is right boundary of last cell..
-     */
-    @Internal
-    public void setRgdxaCenter( short[] field_33_rgdxaCenter )
-    {
-        this.field_33_rgdxaCenter = field_33_rgdxaCenter;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public short[] getRgdxaCenterPrint()
-    {
-        return field_34_rgdxaCenterPrint;
-    }
-
-    /**
-     * Used internally by Word.
-     */
-    @Internal
-    public void setRgdxaCenterPrint( short[] field_34_rgdxaCenterPrint )
-    {
-        this.field_34_rgdxaCenterPrint = field_34_rgdxaCenterPrint;
-    }
-
-    /**
-     * Table shading.
-     */
-    @Internal
-    public ShadingDescriptor getShdTable()
-    {
-        return field_35_shdTable;
-    }
-
-    /**
-     * Table shading.
-     */
-    @Internal
-    public void setShdTable( ShadingDescriptor field_35_shdTable )
-    {
-        this.field_35_shdTable = field_35_shdTable;
-    }
-
-    /**
-     * Get the brcBottom field for the TAP record.
-     */
-    @Internal
-    public BorderCode getBrcBottom()
-    {
-        return field_36_brcBottom;
-    }
-
-    /**
-     * Set the brcBottom field for the TAP record.
-     */
-    @Internal
-    public void setBrcBottom( BorderCode field_36_brcBottom )
-    {
-        this.field_36_brcBottom = field_36_brcBottom;
-    }
-
-    /**
-     * Get the brcTop field for the TAP record.
-     */
-    @Internal
-    public BorderCode getBrcTop()
-    {
-        return field_37_brcTop;
-    }
-
-    /**
-     * Set the brcTop field for the TAP record.
-     */
-    @Internal
-    public void setBrcTop( BorderCode field_37_brcTop )
-    {
-        this.field_37_brcTop = field_37_brcTop;
-    }
-
-    /**
-     * Get the brcLeft field for the TAP record.
-     */
-    @Internal
-    public BorderCode getBrcLeft()
-    {
-        return field_38_brcLeft;
-    }
-
-    /**
-     * Set the brcLeft field for the TAP record.
-     */
-    @Internal
-    public void setBrcLeft( BorderCode field_38_brcLeft )
-    {
-        this.field_38_brcLeft = field_38_brcLeft;
-    }
-
-    /**
-     * Get the brcRight field for the TAP record.
-     */
-    @Internal
-    public BorderCode getBrcRight()
-    {
-        return field_39_brcRight;
-    }
-
-    /**
-     * Set the brcRight field for the TAP record.
-     */
-    @Internal
-    public void setBrcRight( BorderCode field_39_brcRight )
-    {
-        this.field_39_brcRight = field_39_brcRight;
-    }
-
-    /**
-     * Get the brcVertical field for the TAP record.
-     */
-    @Internal
-    public BorderCode getBrcVertical()
-    {
-        return field_40_brcVertical;
-    }
-
-    /**
-     * Set the brcVertical field for the TAP record.
-     */
-    @Internal
-    public void setBrcVertical( BorderCode field_40_brcVertical )
-    {
-        this.field_40_brcVertical = field_40_brcVertical;
-    }
-
-    /**
-     * Get the brcHorizontal field for the TAP record.
-     */
-    @Internal
-    public BorderCode getBrcHorizontal()
-    {
-        return field_41_brcHorizontal;
-    }
-
-    /**
-     * Set the brcHorizontal field for the TAP record.
-     */
-    @Internal
-    public void setBrcHorizontal( BorderCode field_41_brcHorizontal )
-    {
-        this.field_41_brcHorizontal = field_41_brcHorizontal;
-    }
-
-    /**
-     * Default top cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingDefaultTop()
-    {
-        return field_42_wCellPaddingDefaultTop;
-    }
-
-    /**
-     * Default top cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingDefaultTop( short field_42_wCellPaddingDefaultTop )
-    {
-        this.field_42_wCellPaddingDefaultTop = field_42_wCellPaddingDefaultTop;
-    }
-
-    /**
-     * Default left cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingDefaultLeft()
-    {
-        return field_43_wCellPaddingDefaultLeft;
-    }
-
-    /**
-     * Default left cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingDefaultLeft( short field_43_wCellPaddingDefaultLeft )
-    {
-        this.field_43_wCellPaddingDefaultLeft = field_43_wCellPaddingDefaultLeft;
-    }
-
-    /**
-     * Default bottom cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingDefaultBottom()
-    {
-        return field_44_wCellPaddingDefaultBottom;
-    }
-
-    /**
-     * Default bottom cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingDefaultBottom( short field_44_wCellPaddingDefaultBottom )
-    {
-        this.field_44_wCellPaddingDefaultBottom = field_44_wCellPaddingDefaultBottom;
-    }
-
-    /**
-     * Default right cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingDefaultRight()
-    {
-        return field_45_wCellPaddingDefaultRight;
-    }
-
-    /**
-     * Default right cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingDefaultRight( short field_45_wCellPaddingDefaultRight )
-    {
-        this.field_45_wCellPaddingDefaultRight = field_45_wCellPaddingDefaultRight;
-    }
-
-    /**
-     * Default top cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingDefaultTop()
-    {
-        return field_46_ftsCellPaddingDefaultTop;
-    }
-
-    /**
-     * Default top cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingDefaultTop( byte field_46_ftsCellPaddingDefaultTop )
-    {
-        this.field_46_ftsCellPaddingDefaultTop = field_46_ftsCellPaddingDefaultTop;
-    }
-
-    /**
-     * Default left cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingDefaultLeft()
-    {
-        return field_47_ftsCellPaddingDefaultLeft;
-    }
-
-    /**
-     * Default left cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingDefaultLeft( byte field_47_ftsCellPaddingDefaultLeft )
-    {
-        this.field_47_ftsCellPaddingDefaultLeft = field_47_ftsCellPaddingDefaultLeft;
-    }
-
-    /**
-     * Default bottom cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingDefaultBottom()
-    {
-        return field_48_ftsCellPaddingDefaultBottom;
-    }
-
-    /**
-     * Default bottom cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingDefaultBottom( byte field_48_ftsCellPaddingDefaultBottom )
-    {
-        this.field_48_ftsCellPaddingDefaultBottom = field_48_ftsCellPaddingDefaultBottom;
-    }
-
-    /**
-     * Default right cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingDefaultRight()
-    {
-        return field_49_ftsCellPaddingDefaultRight;
-    }
-
-    /**
-     * Default right cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingDefaultRight( byte field_49_ftsCellPaddingDefaultRight )
-    {
-        this.field_49_ftsCellPaddingDefaultRight = field_49_ftsCellPaddingDefaultRight;
-    }
-
-    /**
-     * Default top cell spacings.
-     */
-    @Internal
-    public short getWCellSpacingDefaultTop()
-    {
-        return field_50_wCellSpacingDefaultTop;
-    }
-
-    /**
-     * Default top cell spacings.
-     */
-    @Internal
-    public void setWCellSpacingDefaultTop( short field_50_wCellSpacingDefaultTop )
-    {
-        this.field_50_wCellSpacingDefaultTop = field_50_wCellSpacingDefaultTop;
-    }
-
-    /**
-     * Default left cell spacings.
-     */
-    @Internal
-    public short getWCellSpacingDefaultLeft()
-    {
-        return field_51_wCellSpacingDefaultLeft;
-    }
-
-    /**
-     * Default left cell spacings.
-     */
-    @Internal
-    public void setWCellSpacingDefaultLeft( short field_51_wCellSpacingDefaultLeft )
-    {
-        this.field_51_wCellSpacingDefaultLeft = field_51_wCellSpacingDefaultLeft;
-    }
-
-    /**
-     * Default bottom cell spacings.
-     */
-    @Internal
-    public short getWCellSpacingDefaultBottom()
-    {
-        return field_52_wCellSpacingDefaultBottom;
-    }
-
-    /**
-     * Default bottom cell spacings.
-     */
-    @Internal
-    public void setWCellSpacingDefaultBottom( short field_52_wCellSpacingDefaultBottom )
-    {
-        this.field_52_wCellSpacingDefaultBottom = field_52_wCellSpacingDefaultBottom;
-    }
-
-    /**
-     * Default right cell spacings.
-     */
-    @Internal
-    public short getWCellSpacingDefaultRight()
-    {
-        return field_53_wCellSpacingDefaultRight;
-    }
-
-    /**
-     * Default right cell spacings.
-     */
-    @Internal
-    public void setWCellSpacingDefaultRight( short field_53_wCellSpacingDefaultRight )
-    {
-        this.field_53_wCellSpacingDefaultRight = field_53_wCellSpacingDefaultRight;
-    }
-
-    /**
-     * Default top cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingDefaultTop()
-    {
-        return field_54_ftsCellSpacingDefaultTop;
-    }
-
-    /**
-     * Default top cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingDefaultTop( byte field_54_ftsCellSpacingDefaultTop )
-    {
-        this.field_54_ftsCellSpacingDefaultTop = field_54_ftsCellSpacingDefaultTop;
-    }
-
-    /**
-     * Default left cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingDefaultLeft()
-    {
-        return field_55_ftsCellSpacingDefaultLeft;
-    }
-
-    /**
-     * Default left cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingDefaultLeft( byte field_55_ftsCellSpacingDefaultLeft )
-    {
-        this.field_55_ftsCellSpacingDefaultLeft = field_55_ftsCellSpacingDefaultLeft;
-    }
-
-    /**
-     * Default bottom cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingDefaultBottom()
-    {
-        return field_56_ftsCellSpacingDefaultBottom;
-    }
-
-    /**
-     * Default bottom cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingDefaultBottom( byte field_56_ftsCellSpacingDefaultBottom )
-    {
-        this.field_56_ftsCellSpacingDefaultBottom = field_56_ftsCellSpacingDefaultBottom;
-    }
-
-    /**
-     * Default right cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingDefaultRight()
-    {
-        return field_57_ftsCellSpacingDefaultRight;
-    }
-
-    /**
-     * Default right cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingDefaultRight( byte field_57_ftsCellSpacingDefaultRight )
-    {
-        this.field_57_ftsCellSpacingDefaultRight = field_57_ftsCellSpacingDefaultRight;
-    }
-
-    /**
-     * Default outer top cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingOuterTop()
-    {
-        return field_58_wCellPaddingOuterTop;
-    }
-
-    /**
-     * Default outer top cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingOuterTop( short field_58_wCellPaddingOuterTop )
-    {
-        this.field_58_wCellPaddingOuterTop = field_58_wCellPaddingOuterTop;
-    }
-
-    /**
-     * Default outer left cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingOuterLeft()
-    {
-        return field_59_wCellPaddingOuterLeft;
-    }
-
-    /**
-     * Default outer left cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingOuterLeft( short field_59_wCellPaddingOuterLeft )
-    {
-        this.field_59_wCellPaddingOuterLeft = field_59_wCellPaddingOuterLeft;
-    }
-
-    /**
-     * Default outer bottom cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingOuterBottom()
-    {
-        return field_60_wCellPaddingOuterBottom;
-    }
-
-    /**
-     * Default outer bottom cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingOuterBottom( short field_60_wCellPaddingOuterBottom )
-    {
-        this.field_60_wCellPaddingOuterBottom = field_60_wCellPaddingOuterBottom;
-    }
-
-    /**
-     * Default outer right cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingOuterRight()
-    {
-        return field_61_wCellPaddingOuterRight;
-    }
-
-    /**
-     * Default outer right cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingOuterRight( short field_61_wCellPaddingOuterRight )
-    {
-        this.field_61_wCellPaddingOuterRight = field_61_wCellPaddingOuterRight;
-    }
-
-    /**
-     * Default outer top cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingOuterTop()
-    {
-        return field_62_ftsCellPaddingOuterTop;
-    }
-
-    /**
-     * Default outer top cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingOuterTop( byte field_62_ftsCellPaddingOuterTop )
-    {
-        this.field_62_ftsCellPaddingOuterTop = field_62_ftsCellPaddingOuterTop;
-    }
-
-    /**
-     * Default outer left cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingOuterLeft()
-    {
-        return field_63_ftsCellPaddingOuterLeft;
-    }
-
-    /**
-     * Default outer left cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingOuterLeft( byte field_63_ftsCellPaddingOuterLeft )
-    {
-        this.field_63_ftsCellPaddingOuterLeft = field_63_ftsCellPaddingOuterLeft;
-    }
-
-    /**
-     * Default outer bottom cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingOuterBottom()
-    {
-        return field_64_ftsCellPaddingOuterBottom;
-    }
-
-    /**
-     * Default outer bottom cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingOuterBottom( byte field_64_ftsCellPaddingOuterBottom )
-    {
-        this.field_64_ftsCellPaddingOuterBottom = field_64_ftsCellPaddingOuterBottom;
-    }
-
-    /**
-     * Default outer right cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellPaddingOuterRight()
-    {
-        return field_65_ftsCellPaddingOuterRight;
-    }
-
-    /**
-     * Default outer right cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellPaddingOuterRight( byte field_65_ftsCellPaddingOuterRight )
-    {
-        this.field_65_ftsCellPaddingOuterRight = field_65_ftsCellPaddingOuterRight;
-    }
-
-    /**
-     * Default outer top cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingOuterTop()
-    {
-        return field_66_wCellSpacingOuterTop;
-    }
-
-    /**
-     * Default outer top cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingOuterTop( short field_66_wCellSpacingOuterTop )
-    {
-        this.field_66_wCellSpacingOuterTop = field_66_wCellSpacingOuterTop;
-    }
-
-    /**
-     * Default outer left cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingOuterLeft()
-    {
-        return field_67_wCellSpacingOuterLeft;
-    }
-
-    /**
-     * Default outer left cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingOuterLeft( short field_67_wCellSpacingOuterLeft )
-    {
-        this.field_67_wCellSpacingOuterLeft = field_67_wCellSpacingOuterLeft;
-    }
-
-    /**
-     * Default outer bottom cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingOuterBottom()
-    {
-        return field_68_wCellSpacingOuterBottom;
-    }
-
-    /**
-     * Default outer bottom cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingOuterBottom( short field_68_wCellSpacingOuterBottom )
-    {
-        this.field_68_wCellSpacingOuterBottom = field_68_wCellSpacingOuterBottom;
-    }
-
-    /**
-     * Default outer right cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingOuterRight()
-    {
-        return field_69_wCellSpacingOuterRight;
-    }
-
-    /**
-     * Default outer right cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingOuterRight( short field_69_wCellSpacingOuterRight )
-    {
-        this.field_69_wCellSpacingOuterRight = field_69_wCellSpacingOuterRight;
-    }
-
-    /**
-     * Default outer top cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingOuterTop()
-    {
-        return field_70_ftsCellSpacingOuterTop;
-    }
-
-    /**
-     * Default outer top cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingOuterTop( byte field_70_ftsCellSpacingOuterTop )
-    {
-        this.field_70_ftsCellSpacingOuterTop = field_70_ftsCellSpacingOuterTop;
-    }
-
-    /**
-     * Default outer left cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingOuterLeft()
-    {
-        return field_71_ftsCellSpacingOuterLeft;
-    }
-
-    /**
-     * Default outer left cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingOuterLeft( byte field_71_ftsCellSpacingOuterLeft )
-    {
-        this.field_71_ftsCellSpacingOuterLeft = field_71_ftsCellSpacingOuterLeft;
-    }
-
-    /**
-     * Default outer bottom cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingOuterBottom()
-    {
-        return field_72_ftsCellSpacingOuterBottom;
-    }
-
-    /**
-     * Default outer bottom cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingOuterBottom( byte field_72_ftsCellSpacingOuterBottom )
-    {
-        this.field_72_ftsCellSpacingOuterBottom = field_72_ftsCellSpacingOuterBottom;
-    }
-
-    /**
-     * Default outer right cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public byte getFtsCellSpacingOuterRight()
-    {
-        return field_73_ftsCellSpacingOuterRight;
-    }
-
-    /**
-     * Default outer right cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips..
-     */
-    @Internal
-    public void setFtsCellSpacingOuterRight( byte field_73_ftsCellSpacingOuterRight )
-    {
-        this.field_73_ftsCellSpacingOuterRight = field_73_ftsCellSpacingOuterRight;
-    }
-
-    /**
-     * Get the rgtc field for the TAP record.
-     */
-    @Internal
-    public TableCellDescriptor[] getRgtc()
-    {
-        return field_74_rgtc;
-    }
-
-    /**
-     * Set the rgtc field for the TAP record.
-     */
-    @Internal
-    public void setRgtc( TableCellDescriptor[] field_74_rgtc )
-    {
-        this.field_74_rgtc = field_74_rgtc;
-    }
-
-    /**
-     * Get the rgshd field for the TAP record.
-     */
-    @Internal
-    public ShadingDescriptor[] getRgshd()
-    {
-        return field_75_rgshd;
-    }
-
-    /**
-     * Set the rgshd field for the TAP record.
-     */
-    @Internal
-    public void setRgshd( ShadingDescriptor[] field_75_rgshd )
-    {
-        this.field_75_rgshd = field_75_rgshd;
-    }
-
-    /**
-     * Set to 1 if property revision.
-     */
-    @Internal
-    public byte getFPropRMark()
-    {
-        return field_76_fPropRMark;
-    }
-
-    /**
-     * Set to 1 if property revision.
-     */
-    @Internal
-    public void setFPropRMark( byte field_76_fPropRMark )
-    {
-        this.field_76_fPropRMark = field_76_fPropRMark;
-    }
-
-    /**
-     * Has old properties.
-     */
-    @Internal
-    public byte getFHasOldProps()
-    {
-        return field_77_fHasOldProps;
-    }
-
-    /**
-     * Has old properties.
-     */
-    @Internal
-    public void setFHasOldProps( byte field_77_fHasOldProps )
-    {
-        this.field_77_fHasOldProps = field_77_fHasOldProps;
-    }
-
-    /**
-     * Size of each horizontal style band, in number of rows.
-     */
-    @Internal
-    public short getCHorzBands()
-    {
-        return field_78_cHorzBands;
-    }
-
-    /**
-     * Size of each horizontal style band, in number of rows.
-     */
-    @Internal
-    public void setCHorzBands( short field_78_cHorzBands )
-    {
-        this.field_78_cHorzBands = field_78_cHorzBands;
-    }
-
-    /**
-     * Size of a vertical style band, in number of columns.
-     */
-    @Internal
-    public short getCVertBands()
-    {
-        return field_79_cVertBands;
-    }
-
-    /**
-     * Size of a vertical style band, in number of columns.
-     */
-    @Internal
-    public void setCVertBands( short field_79_cVertBands )
-    {
-        this.field_79_cVertBands = field_79_cVertBands;
-    }
-
-    /**
-     * Border definition for inside horizontal borders.
-     */
-    @Internal
-    public BorderCode getRgbrcInsideDefault_0()
-    {
-        return field_80_rgbrcInsideDefault_0;
-    }
-
-    /**
-     * Border definition for inside horizontal borders.
-     */
-    @Internal
-    public void setRgbrcInsideDefault_0( BorderCode field_80_rgbrcInsideDefault_0 )
-    {
-        this.field_80_rgbrcInsideDefault_0 = field_80_rgbrcInsideDefault_0;
-    }
-
-    /**
-     * Border definition for inside vertical borders.
-     */
-    @Internal
-    public BorderCode getRgbrcInsideDefault_1()
-    {
-        return field_81_rgbrcInsideDefault_1;
-    }
-
-    /**
-     * Border definition for inside vertical borders.
-     */
-    @Internal
-    public void setRgbrcInsideDefault_1( BorderCode field_81_rgbrcInsideDefault_1 )
-    {
-        this.field_81_rgbrcInsideDefault_1 = field_81_rgbrcInsideDefault_1;
-    }
-
-    /**
-     * Sets the fAutofit field value.
-     * When set to 1, AutoFit this table
-     */
-    @Internal
-    public void setFAutofit( boolean value )
-    {
-        field_13_widthAndFitsFlags = fAutofit.setBoolean(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * When set to 1, AutoFit this table
-     * @return  the fAutofit field value.
-     */
-    @Internal
-    public boolean isFAutofit()
-    {
-        return fAutofit.isSet(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the fKeepFollow field value.
-     * When set to 1, keep this row with the following row
-     */
-    @Internal
-    public void setFKeepFollow( boolean value )
-    {
-        field_13_widthAndFitsFlags = fKeepFollow.setBoolean(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * When set to 1, keep this row with the following row
-     * @return  the fKeepFollow field value.
-     */
-    @Internal
-    public boolean isFKeepFollow()
-    {
-        return fKeepFollow.isSet(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the ftsWidth field value.
-     * Units for wWidth: 0 -- null; 1 -- auto, ignores wWidth, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     */
-    @Internal
-    public void setFtsWidth( byte value )
-    {
-        field_13_widthAndFitsFlags = ftsWidth.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Units for wWidth: 0 -- null; 1 -- auto, ignores wWidth, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     * @return  the ftsWidth field value.
-     */
-    @Internal
-    public byte getFtsWidth()
-    {
-        return ( byte )ftsWidth.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the ftsWidthIndent field value.
-     * Units for wWidthIndent: 0 -- null; 1 -- auto, ignores wWidthIndent, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     */
-    @Internal
-    public void setFtsWidthIndent( byte value )
-    {
-        field_13_widthAndFitsFlags = ftsWidthIndent.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Units for wWidthIndent: 0 -- null; 1 -- auto, ignores wWidthIndent, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     * @return  the ftsWidthIndent field value.
-     */
-    @Internal
-    public byte getFtsWidthIndent()
-    {
-        return ( byte )ftsWidthIndent.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the ftsWidthBefore field value.
-     * Units for wWidthBefore: 0 -- null; 1 -- auto, ignores wWidthBefore, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     */
-    @Internal
-    public void setFtsWidthBefore( byte value )
-    {
-        field_13_widthAndFitsFlags = ftsWidthBefore.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Units for wWidthBefore: 0 -- null; 1 -- auto, ignores wWidthBefore, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     * @return  the ftsWidthBefore field value.
-     */
-    @Internal
-    public byte getFtsWidthBefore()
-    {
-        return ( byte )ftsWidthBefore.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the ftsWidthAfter field value.
-     * Units for wWidthAfter: 0 -- null; 1 -- auto, ignores wWidthAfter, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     */
-    @Internal
-    public void setFtsWidthAfter( byte value )
-    {
-        field_13_widthAndFitsFlags = ftsWidthAfter.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Units for wWidthAfter: 0 -- null; 1 -- auto, ignores wWidthAfter, 2 -- percentage (in 50ths of a percent), 3 -- twips
-     * @return  the ftsWidthAfter field value.
-     */
-    @Internal
-    public byte getFtsWidthAfter()
-    {
-        return ( byte )ftsWidthAfter.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the fNeverBeenAutofit field value.
-     * When 1, table has never been autofit
-     */
-    @Internal
-    public void setFNeverBeenAutofit( boolean value )
-    {
-        field_13_widthAndFitsFlags = fNeverBeenAutofit.setBoolean(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * When 1, table has never been autofit
-     * @return  the fNeverBeenAutofit field value.
-     */
-    @Internal
-    public boolean isFNeverBeenAutofit()
-    {
-        return fNeverBeenAutofit.isSet(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the fInvalAutofit field value.
-     * When 1, TAP is still valid, but autofit properties aren't
-     */
-    @Internal
-    public void setFInvalAutofit( boolean value )
-    {
-        field_13_widthAndFitsFlags = fInvalAutofit.setBoolean(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * When 1, TAP is still valid, but autofit properties aren't
-     * @return  the fInvalAutofit field value.
-     */
-    @Internal
-    public boolean isFInvalAutofit()
-    {
-        return fInvalAutofit.isSet(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the widthAndFitsFlags_empty1 field value.
-     * Not used
-     */
-    @Internal
-    public void setWidthAndFitsFlags_empty1( byte value )
-    {
-        field_13_widthAndFitsFlags = widthAndFitsFlags_empty1.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Not used
-     * @return  the widthAndFitsFlags_empty1 field value.
-     */
-    @Internal
-    public byte getWidthAndFitsFlags_empty1()
-    {
-        return ( byte )widthAndFitsFlags_empty1.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the fVert field value.
-     * When 1, positioned in vertical text flow
-     */
-    @Internal
-    public void setFVert( boolean value )
-    {
-        field_13_widthAndFitsFlags = fVert.setBoolean(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * When 1, positioned in vertical text flow
-     * @return  the fVert field value.
-     */
-    @Internal
-    public boolean isFVert()
-    {
-        return fVert.isSet(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the pcVert field value.
-     * Vertical position code. Specifies coordinate frame to use when paragraphs are absolutely positioned. 0 -- vertical position coordinates are relative to margin; 1 -- coordinates are relative to page; 2 -- coordinates are relative to text. This means: relative to where the next non-APO text would have been placed if this APO did not exist.
-     */
-    @Internal
-    public void setPcVert( byte value )
-    {
-        field_13_widthAndFitsFlags = pcVert.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Vertical position code. Specifies coordinate frame to use when paragraphs are absolutely positioned. 0 -- vertical position coordinates are relative to margin; 1 -- coordinates are relative to page; 2 -- coordinates are relative to text. This means: relative to where the next non-APO text would have been placed if this APO did not exist.
-     * @return  the pcVert field value.
-     */
-    @Internal
-    public byte getPcVert()
-    {
-        return ( byte )pcVert.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the pcHorz field value.
-     * Horizontal position code. Specifies coordinate frame to use when paragraphs are absolutely positioned. 0 -- horizontal position coordinates are relative to column; 1 -- coordinates are relative to margin; 2 -- coordinates are relative to page
-     */
-    @Internal
-    public void setPcHorz( byte value )
-    {
-        field_13_widthAndFitsFlags = pcHorz.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Horizontal position code. Specifies coordinate frame to use when paragraphs are absolutely positioned. 0 -- horizontal position coordinates are relative to column; 1 -- coordinates are relative to margin; 2 -- coordinates are relative to page
-     * @return  the pcHorz field value.
-     */
-    @Internal
-    public byte getPcHorz()
-    {
-        return ( byte )pcHorz.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the widthAndFitsFlags_empty2 field value.
-     * Not used
-     */
-    @Internal
-    public void setWidthAndFitsFlags_empty2( short value )
-    {
-        field_13_widthAndFitsFlags = widthAndFitsFlags_empty2.setValue(field_13_widthAndFitsFlags, value);
-    }
-
-    /**
-     * Not used
-     * @return  the widthAndFitsFlags_empty2 field value.
-     */
-    @Internal
-    public short getWidthAndFitsFlags_empty2()
-    {
-        return ( short )widthAndFitsFlags_empty2.getValue(field_13_widthAndFitsFlags);
-    }
-
-    /**
-     * Sets the fFirstRow field value.
-     * Used internally by Word: first row
-     */
-    @Internal
-    public void setFFirstRow( boolean value )
-    {
-        field_25_internalFlags = fFirstRow.setBoolean(field_25_internalFlags, value);
-    }
-
-    /**
-     * Used internally by Word: first row
-     * @return  the fFirstRow field value.
-     */
-    @Internal
-    public boolean isFFirstRow()
-    {
-        return fFirstRow.isSet(field_25_internalFlags);
-    }
-
-    /**
-     * Sets the fLastRow field value.
-     * Used internally by Word: last row
-     */
-    @Internal
-    public void setFLastRow( boolean value )
-    {
-        field_25_internalFlags = fLastRow.setBoolean(field_25_internalFlags, value);
-    }
-
-    /**
-     * Used internally by Word: last row
-     * @return  the fLastRow field value.
-     */
-    @Internal
-    public boolean isFLastRow()
-    {
-        return fLastRow.isSet(field_25_internalFlags);
-    }
-
-    /**
-     * Sets the fOutline field value.
-     * Used internally by Word: row was cached for outline mode
-     */
-    @Internal
-    public void setFOutline( boolean value )
-    {
-        field_25_internalFlags = fOutline.setBoolean(field_25_internalFlags, value);
-    }
-
-    /**
-     * Used internally by Word: row was cached for outline mode
-     * @return  the fOutline field value.
-     */
-    @Internal
-    public boolean isFOutline()
-    {
-        return fOutline.isSet(field_25_internalFlags);
-    }
-
-    /**
-     * Sets the fOrigWordTableRules field value.
-     * Used internally by Word: table combining like Word 5.x for the Macintosh and WinWord 1.x
-     */
-    @Internal
-    public void setFOrigWordTableRules( boolean value )
-    {
-        field_25_internalFlags = fOrigWordTableRules.setBoolean(field_25_internalFlags, value);
-    }
-
-    /**
-     * Used internally by Word: table combining like Word 5.x for the Macintosh and WinWord 1.x
-     * @return  the fOrigWordTableRules field value.
-     */
-    @Internal
-    public boolean isFOrigWordTableRules()
-    {
-        return fOrigWordTableRules.isSet(field_25_internalFlags);
-    }
-
-    /**
-     * Sets the fCellSpacing field value.
-     * Used internally by Word: When set to 1 cell spacing is allowed
-     */
-    @Internal
-    public void setFCellSpacing( boolean value )
-    {
-        field_25_internalFlags = fCellSpacing.setBoolean(field_25_internalFlags, value);
-    }
-
-    /**
-     * Used internally by Word: When set to 1 cell spacing is allowed
-     * @return  the fCellSpacing field value.
-     */
-    @Internal
-    public boolean isFCellSpacing()
-    {
-        return fCellSpacing.isSet(field_25_internalFlags);
-    }
-
-    /**
-     * Sets the grpfTap_unused field value.
-     * Not used
-     */
-    @Internal
-    public void setGrpfTap_unused( short value )
-    {
-        field_25_internalFlags = grpfTap_unused.setValue(field_25_internalFlags, value);
-    }
-
-    /**
-     * Not used
-     * @return  the grpfTap_unused field value.
-     */
-    @Internal
-    public short getGrpfTap_unused()
-    {
-        return ( short )grpfTap_unused.getValue(field_25_internalFlags);
-    }
-
-    /**
-     * Sets the fWrapToWwd field value.
-     * Used internally by Word: Wrap to window is on when set to 1
-     */
-    @Internal
-    public void setFWrapToWwd( boolean value )
-    {
-        field_32_viewFlags = fWrapToWwd.setBoolean(field_32_viewFlags, value);
-    }
-
-    /**
-     * Used internally by Word: Wrap to window is on when set to 1
-     * @return  the fWrapToWwd field value.
-     */
-    @Internal
-    public boolean isFWrapToWwd()
-    {
-        return fWrapToWwd.isSet(field_32_viewFlags);
-    }
-
-    /**
-     * Sets the fNotPageView field value.
-     * Used internally by Word: when set to 1 we are not in Page View
-     */
-    @Internal
-    public void setFNotPageView( boolean value )
-    {
-        field_32_viewFlags = fNotPageView.setBoolean(field_32_viewFlags, value);
-    }
-
-    /**
-     * Used internally by Word: when set to 1 we are not in Page View
-     * @return  the fNotPageView field value.
-     */
-    @Internal
-    public boolean isFNotPageView()
-    {
-        return fNotPageView.isSet(field_32_viewFlags);
-    }
-
-    /**
-     * Sets the viewFlags_unused1 field value.
-     * Not used
-     */
-    @Internal
-    public void setViewFlags_unused1( boolean value )
-    {
-        field_32_viewFlags = viewFlags_unused1.setBoolean(field_32_viewFlags, value);
-    }
-
-    /**
-     * Not used
-     * @return  the viewFlags_unused1 field value.
-     */
-    @Internal
-    public boolean isViewFlags_unused1()
-    {
-        return viewFlags_unused1.isSet(field_32_viewFlags);
-    }
-
-    /**
-     * Sets the fWebView field value.
-     * Used internally by Word: Web View is on when set to 1
-     */
-    @Internal
-    public void setFWebView( boolean value )
-    {
-        field_32_viewFlags = fWebView.setBoolean(field_32_viewFlags, value);
-    }
-
-    /**
-     * Used internally by Word: Web View is on when set to 1
-     * @return  the fWebView field value.
-     */
-    @Internal
-    public boolean isFWebView()
-    {
-        return fWebView.isSet(field_32_viewFlags);
-    }
-
-    /**
-     * Sets the fAdjusted field value.
-     * Used internally by Word
-     */
-    @Internal
-    public void setFAdjusted( boolean value )
-    {
-        field_32_viewFlags = fAdjusted.setBoolean(field_32_viewFlags, value);
-    }
-
-    /**
-     * Used internally by Word
-     * @return  the fAdjusted field value.
-     */
-    @Internal
-    public boolean isFAdjusted()
-    {
-        return fAdjusted.isSet(field_32_viewFlags);
-    }
-
-    /**
-     * Sets the viewFlags_unused2 field value.
-     * Not used
-     */
-    @Internal
-    public void setViewFlags_unused2( short value )
-    {
-        field_32_viewFlags = viewFlags_unused2.setValue(field_32_viewFlags, value);
-    }
-
-    /**
-     * Not used
-     * @return  the viewFlags_unused2 field value.
-     */
-    @Internal
-    public short getViewFlags_unused2()
-    {
-        return ( short )viewFlags_unused2.getValue(field_32_viewFlags);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java
deleted file mode 100644
index 2d11178..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-
-/**
- * The TBD is a substructure of the PAP. <p>Class and fields descriptions are quoted from
-        Microsoft Office Word 97-2007 Binary File Format
-    
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc]
-    
- */
-@Internal
-public abstract class TBDAbstractType
-{
-
-    protected byte field_1_value;
-    /**/private static BitField jc = new BitField(0x07);
-    /**/private static BitField tlc = new BitField(0x38);
-    /**/private static BitField reserved = new BitField(0xc0);
-
-    protected TBDAbstractType()
-    {
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_value                  = data[ 0x0 + offset ];
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        data[ 0x0 + offset] = field_1_value;
-    }
-
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-        return 0 + 1;
-    }
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[TBD]\n");
-        builder.append("    .value                = ");
-        builder.append(" (").append(getValue()).append(" )\n");
-        builder.append("         .jc                       = ").append(getJc()).append('\n');
-        builder.append("         .tlc                      = ").append(getTlc()).append('\n');
-        builder.append("         .reserved                 = ").append(getReserved()).append('\n');
-
-        builder.append("[/TBD]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Get the value field for the TBD record.
-     */
-    @Internal
-    public byte getValue()
-    {
-        return field_1_value;
-    }
-
-    /**
-     * Set the value field for the TBD record.
-     */
-    @Internal
-    public void setValue( byte field_1_value )
-    {
-        this.field_1_value = field_1_value;
-    }
-
-    /**
-     * Sets the jc field value.
-     * Justification code
-     */
-    @Internal
-    public void setJc( byte value )
-    {
-        field_1_value = (byte)jc.setValue(field_1_value, value);
-    }
-
-    /**
-     * Justification code
-     * @return  the jc field value.
-     */
-    @Internal
-    public byte getJc()
-    {
-        return ( byte )jc.getValue(field_1_value);
-    }
-
-    /**
-     * Sets the tlc field value.
-     * Tab leader code
-     */
-    @Internal
-    public void setTlc( byte value )
-    {
-        field_1_value = (byte)tlc.setValue(field_1_value, value);
-    }
-
-    /**
-     * Tab leader code
-     * @return  the tlc field value.
-     */
-    @Internal
-    public byte getTlc()
-    {
-        return ( byte )tlc.getValue(field_1_value);
-    }
-
-    /**
-     * Sets the reserved field value.
-     * 
-     */
-    @Internal
-    public void setReserved( byte value )
-    {
-        field_1_value = (byte)reserved.setValue(field_1_value, value);
-    }
-
-    /**
-     * 
-     * @return  the reserved field value.
-     */
-    @Internal
-    public byte getReserved()
-    {
-        return ( byte )reserved.getValue(field_1_value);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java
deleted file mode 100644
index a871653..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java
+++ /dev/null
@@ -1,808 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-
-import org.apache.poi.hwpf.usermodel.*;
-import org.apache.poi.util.*;
-
-/**
- * Table Cell Descriptor.
- * <p>
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * <p>
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-
- * @author S. Ryan Ackley. Field descriptions are quoted from Microsoft Office Word 97-2007 Binary
-        File Format (.doc) Specification
-    
- */
-@Internal
-public abstract class TCAbstractType
-{
-
-    protected short field_1_rgf;
-    /**/private static BitField fFirstMerged = new BitField(0x0001);
-    /**/private static BitField fMerged = new BitField(0x0002);
-    /**/private static BitField fVertical = new BitField(0x0004);
-    /**/private static BitField fBackward = new BitField(0x0008);
-    /**/private static BitField fRotateFont = new BitField(0x0010);
-    /**/private static BitField fVertMerge = new BitField(0x0020);
-    /**/private static BitField fVertRestart = new BitField(0x0040);
-    /**/private static BitField vertAlign = new BitField(0x0180);
-    /**/private static BitField ftsWidth = new BitField(0x0E00);
-    /**/private static BitField fFitText = new BitField(0x1000);
-    /**/private static BitField fNoWrap = new BitField(0x2000);
-    /**/private static BitField fUnused = new BitField(0xC000);
-    protected short field_2_wWidth;
-    protected ShadingDescriptor field_3_shd;
-    protected short field_4_wCellPaddingLeft;
-    protected short field_5_wCellPaddingTop;
-    protected short field_6_wCellPaddingBottom;
-    protected short field_7_wCellPaddingRight;
-    protected byte field_8_ftsCellPaddingLeft;
-    protected byte field_9_ftsCellPaddingTop;
-    protected byte field_10_ftsCellPaddingBottom;
-    protected byte field_11_ftsCellPaddingRight;
-    protected short field_12_wCellSpacingLeft;
-    protected short field_13_wCellSpacingTop;
-    protected short field_14_wCellSpacingBottom;
-    protected short field_15_wCellSpacingRight;
-    protected byte field_16_ftsCellSpacingLeft;
-    protected byte field_17_ftsCellSpacingTop;
-    protected byte field_18_ftsCellSpacingBottom;
-    protected byte field_19_ftsCellSpacingRight;
-    protected BorderCode field_20_brcTop;
-    protected BorderCode field_21_brcLeft;
-    protected BorderCode field_22_brcBottom;
-    protected BorderCode field_23_brcRight;
-
-    protected TCAbstractType()
-    {
-        this.field_3_shd = new ShadingDescriptor();
-        this.field_20_brcTop = new BorderCode();
-        this.field_21_brcLeft = new BorderCode();
-        this.field_22_brcBottom = new BorderCode();
-        this.field_23_brcRight = new BorderCode();
-    }
-
-
-    public String toString()
-    {
-        StringBuilder builder = new StringBuilder();
-        builder.append("[TC]\n");
-        builder.append("    .rgf                  = ");
-        builder.append(" (").append(getRgf()).append(" )\n");
-        builder.append("         .fFirstMerged             = ").append(isFFirstMerged()).append('\n');
-        builder.append("         .fMerged                  = ").append(isFMerged()).append('\n');
-        builder.append("         .fVertical                = ").append(isFVertical()).append('\n');
-        builder.append("         .fBackward                = ").append(isFBackward()).append('\n');
-        builder.append("         .fRotateFont              = ").append(isFRotateFont()).append('\n');
-        builder.append("         .fVertMerge               = ").append(isFVertMerge()).append('\n');
-        builder.append("         .fVertRestart             = ").append(isFVertRestart()).append('\n');
-        builder.append("         .vertAlign                = ").append(getVertAlign()).append('\n');
-        builder.append("         .ftsWidth                 = ").append(getFtsWidth()).append('\n');
-        builder.append("         .fFitText                 = ").append(isFFitText()).append('\n');
-        builder.append("         .fNoWrap                  = ").append(isFNoWrap()).append('\n');
-        builder.append("         .fUnused                  = ").append(getFUnused()).append('\n');
-        builder.append("    .wWidth               = ");
-        builder.append(" (").append(getWWidth()).append(" )\n");
-        builder.append("    .shd                  = ");
-        builder.append(" (").append(getShd()).append(" )\n");
-        builder.append("    .wCellPaddingLeft     = ");
-        builder.append(" (").append(getWCellPaddingLeft()).append(" )\n");
-        builder.append("    .wCellPaddingTop      = ");
-        builder.append(" (").append(getWCellPaddingTop()).append(" )\n");
-        builder.append("    .wCellPaddingBottom   = ");
-        builder.append(" (").append(getWCellPaddingBottom()).append(" )\n");
-        builder.append("    .wCellPaddingRight    = ");
-        builder.append(" (").append(getWCellPaddingRight()).append(" )\n");
-        builder.append("    .ftsCellPaddingLeft   = ");
-        builder.append(" (").append(getFtsCellPaddingLeft()).append(" )\n");
-        builder.append("    .ftsCellPaddingTop    = ");
-        builder.append(" (").append(getFtsCellPaddingTop()).append(" )\n");
-        builder.append("    .ftsCellPaddingBottom = ");
-        builder.append(" (").append(getFtsCellPaddingBottom()).append(" )\n");
-        builder.append("    .ftsCellPaddingRight  = ");
-        builder.append(" (").append(getFtsCellPaddingRight()).append(" )\n");
-        builder.append("    .wCellSpacingLeft     = ");
-        builder.append(" (").append(getWCellSpacingLeft()).append(" )\n");
-        builder.append("    .wCellSpacingTop      = ");
-        builder.append(" (").append(getWCellSpacingTop()).append(" )\n");
-        builder.append("    .wCellSpacingBottom   = ");
-        builder.append(" (").append(getWCellSpacingBottom()).append(" )\n");
-        builder.append("    .wCellSpacingRight    = ");
-        builder.append(" (").append(getWCellSpacingRight()).append(" )\n");
-        builder.append("    .ftsCellSpacingLeft   = ");
-        builder.append(" (").append(getFtsCellSpacingLeft()).append(" )\n");
-        builder.append("    .ftsCellSpacingTop    = ");
-        builder.append(" (").append(getFtsCellSpacingTop()).append(" )\n");
-        builder.append("    .ftsCellSpacingBottom = ");
-        builder.append(" (").append(getFtsCellSpacingBottom()).append(" )\n");
-        builder.append("    .ftsCellSpacingRight  = ");
-        builder.append(" (").append(getFtsCellSpacingRight()).append(" )\n");
-        builder.append("    .brcTop               = ");
-        builder.append(" (").append(getBrcTop()).append(" )\n");
-        builder.append("    .brcLeft              = ");
-        builder.append(" (").append(getBrcLeft()).append(" )\n");
-        builder.append("    .brcBottom            = ");
-        builder.append(" (").append(getBrcBottom()).append(" )\n");
-        builder.append("    .brcRight             = ");
-        builder.append(" (").append(getBrcRight()).append(" )\n");
-
-        builder.append("[/TC]\n");
-        return builder.toString();
-    }
-
-    /**
-     * Get the rgf field for the TC record.
-     */
-    @Internal
-    public short getRgf()
-    {
-        return field_1_rgf;
-    }
-
-    /**
-     * Set the rgf field for the TC record.
-     */
-    @Internal
-    public void setRgf( short field_1_rgf )
-    {
-        this.field_1_rgf = field_1_rgf;
-    }
-
-    /**
-     * Preferred cell width.
-     */
-    @Internal
-    public short getWWidth()
-    {
-        return field_2_wWidth;
-    }
-
-    /**
-     * Preferred cell width.
-     */
-    @Internal
-    public void setWWidth( short field_2_wWidth )
-    {
-        this.field_2_wWidth = field_2_wWidth;
-    }
-
-    /**
-     * Cell shading.
-     */
-    @Internal
-    public ShadingDescriptor getShd()
-    {
-        return field_3_shd;
-    }
-
-    /**
-     * Cell shading.
-     */
-    @Internal
-    public void setShd( ShadingDescriptor field_3_shd )
-    {
-        this.field_3_shd = field_3_shd;
-    }
-
-    /**
-     * Left cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingLeft()
-    {
-        return field_4_wCellPaddingLeft;
-    }
-
-    /**
-     * Left cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingLeft( short field_4_wCellPaddingLeft )
-    {
-        this.field_4_wCellPaddingLeft = field_4_wCellPaddingLeft;
-    }
-
-    /**
-     * Top cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingTop()
-    {
-        return field_5_wCellPaddingTop;
-    }
-
-    /**
-     * Top cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingTop( short field_5_wCellPaddingTop )
-    {
-        this.field_5_wCellPaddingTop = field_5_wCellPaddingTop;
-    }
-
-    /**
-     * Bottom cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingBottom()
-    {
-        return field_6_wCellPaddingBottom;
-    }
-
-    /**
-     * Bottom cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingBottom( short field_6_wCellPaddingBottom )
-    {
-        this.field_6_wCellPaddingBottom = field_6_wCellPaddingBottom;
-    }
-
-    /**
-     * Right cell margin/padding.
-     */
-    @Internal
-    public short getWCellPaddingRight()
-    {
-        return field_7_wCellPaddingRight;
-    }
-
-    /**
-     * Right cell margin/padding.
-     */
-    @Internal
-    public void setWCellPaddingRight( short field_7_wCellPaddingRight )
-    {
-        this.field_7_wCellPaddingRight = field_7_wCellPaddingRight;
-    }
-
-    /**
-     * Left cell margin/padding units.
-     */
-    @Internal
-    public byte getFtsCellPaddingLeft()
-    {
-        return field_8_ftsCellPaddingLeft;
-    }
-
-    /**
-     * Left cell margin/padding units.
-     */
-    @Internal
-    public void setFtsCellPaddingLeft( byte field_8_ftsCellPaddingLeft )
-    {
-        this.field_8_ftsCellPaddingLeft = field_8_ftsCellPaddingLeft;
-    }
-
-    /**
-     * Top cell margin/padding units.
-     */
-    @Internal
-    public byte getFtsCellPaddingTop()
-    {
-        return field_9_ftsCellPaddingTop;
-    }
-
-    /**
-     * Top cell margin/padding units.
-     */
-    @Internal
-    public void setFtsCellPaddingTop( byte field_9_ftsCellPaddingTop )
-    {
-        this.field_9_ftsCellPaddingTop = field_9_ftsCellPaddingTop;
-    }
-
-    /**
-     * Bottom cell margin/padding units.
-     */
-    @Internal
-    public byte getFtsCellPaddingBottom()
-    {
-        return field_10_ftsCellPaddingBottom;
-    }
-
-    /**
-     * Bottom cell margin/padding units.
-     */
-    @Internal
-    public void setFtsCellPaddingBottom( byte field_10_ftsCellPaddingBottom )
-    {
-        this.field_10_ftsCellPaddingBottom = field_10_ftsCellPaddingBottom;
-    }
-
-    /**
-     * Right cell margin/padding units.
-     */
-    @Internal
-    public byte getFtsCellPaddingRight()
-    {
-        return field_11_ftsCellPaddingRight;
-    }
-
-    /**
-     * Right cell margin/padding units.
-     */
-    @Internal
-    public void setFtsCellPaddingRight( byte field_11_ftsCellPaddingRight )
-    {
-        this.field_11_ftsCellPaddingRight = field_11_ftsCellPaddingRight;
-    }
-
-    /**
-     * Left cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingLeft()
-    {
-        return field_12_wCellSpacingLeft;
-    }
-
-    /**
-     * Left cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingLeft( short field_12_wCellSpacingLeft )
-    {
-        this.field_12_wCellSpacingLeft = field_12_wCellSpacingLeft;
-    }
-
-    /**
-     * Top cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingTop()
-    {
-        return field_13_wCellSpacingTop;
-    }
-
-    /**
-     * Top cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingTop( short field_13_wCellSpacingTop )
-    {
-        this.field_13_wCellSpacingTop = field_13_wCellSpacingTop;
-    }
-
-    /**
-     * Bottom cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingBottom()
-    {
-        return field_14_wCellSpacingBottom;
-    }
-
-    /**
-     * Bottom cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingBottom( short field_14_wCellSpacingBottom )
-    {
-        this.field_14_wCellSpacingBottom = field_14_wCellSpacingBottom;
-    }
-
-    /**
-     * Right cell spacing.
-     */
-    @Internal
-    public short getWCellSpacingRight()
-    {
-        return field_15_wCellSpacingRight;
-    }
-
-    /**
-     * Right cell spacing.
-     */
-    @Internal
-    public void setWCellSpacingRight( short field_15_wCellSpacingRight )
-    {
-        this.field_15_wCellSpacingRight = field_15_wCellSpacingRight;
-    }
-
-    /**
-     * Left cell spacing units.
-     */
-    @Internal
-    public byte getFtsCellSpacingLeft()
-    {
-        return field_16_ftsCellSpacingLeft;
-    }
-
-    /**
-     * Left cell spacing units.
-     */
-    @Internal
-    public void setFtsCellSpacingLeft( byte field_16_ftsCellSpacingLeft )
-    {
-        this.field_16_ftsCellSpacingLeft = field_16_ftsCellSpacingLeft;
-    }
-
-    /**
-     * Top cell spacing units.
-     */
-    @Internal
-    public byte getFtsCellSpacingTop()
-    {
-        return field_17_ftsCellSpacingTop;
-    }
-
-    /**
-     * Top cell spacing units.
-     */
-    @Internal
-    public void setFtsCellSpacingTop( byte field_17_ftsCellSpacingTop )
-    {
-        this.field_17_ftsCellSpacingTop = field_17_ftsCellSpacingTop;
-    }
-
-    /**
-     * Bottom cell spacing units.
-     */
-    @Internal
-    public byte getFtsCellSpacingBottom()
-    {
-        return field_18_ftsCellSpacingBottom;
-    }
-
-    /**
-     * Bottom cell spacing units.
-     */
-    @Internal
-    public void setFtsCellSpacingBottom( byte field_18_ftsCellSpacingBottom )
-    {
-        this.field_18_ftsCellSpacingBottom = field_18_ftsCellSpacingBottom;
-    }
-
-    /**
-     * Right cell spacing units.
-     */
-    @Internal
-    public byte getFtsCellSpacingRight()
-    {
-        return field_19_ftsCellSpacingRight;
-    }
-
-    /**
-     * Right cell spacing units.
-     */
-    @Internal
-    public void setFtsCellSpacingRight( byte field_19_ftsCellSpacingRight )
-    {
-        this.field_19_ftsCellSpacingRight = field_19_ftsCellSpacingRight;
-    }
-
-    /**
-     * Top border.
-     */
-    @Internal
-    public BorderCode getBrcTop()
-    {
-        return field_20_brcTop;
-    }
-
-    /**
-     * Top border.
-     */
-    @Internal
-    public void setBrcTop( BorderCode field_20_brcTop )
-    {
-        this.field_20_brcTop = field_20_brcTop;
-    }
-
-    /**
-     * Left border.
-     */
-    @Internal
-    public BorderCode getBrcLeft()
-    {
-        return field_21_brcLeft;
-    }
-
-    /**
-     * Left border.
-     */
-    @Internal
-    public void setBrcLeft( BorderCode field_21_brcLeft )
-    {
-        this.field_21_brcLeft = field_21_brcLeft;
-    }
-
-    /**
-     * Bottom border.
-     */
-    @Internal
-    public BorderCode getBrcBottom()
-    {
-        return field_22_brcBottom;
-    }
-
-    /**
-     * Bottom border.
-     */
-    @Internal
-    public void setBrcBottom( BorderCode field_22_brcBottom )
-    {
-        this.field_22_brcBottom = field_22_brcBottom;
-    }
-
-    /**
-     * Right border.
-     */
-    @Internal
-    public BorderCode getBrcRight()
-    {
-        return field_23_brcRight;
-    }
-
-    /**
-     * Right border.
-     */
-    @Internal
-    public void setBrcRight( BorderCode field_23_brcRight )
-    {
-        this.field_23_brcRight = field_23_brcRight;
-    }
-
-    /**
-     * Sets the fFirstMerged field value.
-     * When 1, cell is first cell of a range of cells that have been merged. When a cell is merged, the display areas of the merged cells are consolidated and the text within the cells is interpreted as belonging to one text stream for purposes of calculating line breaks.
-     */
-    @Internal
-    public void setFFirstMerged( boolean value )
-    {
-        field_1_rgf = (short)fFirstMerged.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, cell is first cell of a range of cells that have been merged. When a cell is merged, the display areas of the merged cells are consolidated and the text within the cells is interpreted as belonging to one text stream for purposes of calculating line breaks.
-     * @return  the fFirstMerged field value.
-     */
-    @Internal
-    public boolean isFFirstMerged()
-    {
-        return fFirstMerged.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fMerged field value.
-     * When 1, cell has been merged with preceding cell
-     */
-    @Internal
-    public void setFMerged( boolean value )
-    {
-        field_1_rgf = (short)fMerged.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, cell has been merged with preceding cell
-     * @return  the fMerged field value.
-     */
-    @Internal
-    public boolean isFMerged()
-    {
-        return fMerged.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fVertical field value.
-     * When 1, cell has vertical text flow
-     */
-    @Internal
-    public void setFVertical( boolean value )
-    {
-        field_1_rgf = (short)fVertical.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, cell has vertical text flow
-     * @return  the fVertical field value.
-     */
-    @Internal
-    public boolean isFVertical()
-    {
-        return fVertical.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fBackward field value.
-     * For a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0
-     */
-    @Internal
-    public void setFBackward( boolean value )
-    {
-        field_1_rgf = (short)fBackward.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * For a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0
-     * @return  the fBackward field value.
-     */
-    @Internal
-    public boolean isFBackward()
-    {
-        return fBackward.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fRotateFont field value.
-     * When 1, cell has rotated characters (i.e. uses @font)
-     */
-    @Internal
-    public void setFRotateFont( boolean value )
-    {
-        field_1_rgf = (short)fRotateFont.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, cell has rotated characters (i.e. uses @font)
-     * @return  the fRotateFont field value.
-     */
-    @Internal
-    public boolean isFRotateFont()
-    {
-        return fRotateFont.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fVertMerge field value.
-     * When 1, cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3).
-     */
-    @Internal
-    public void setFVertMerge( boolean value )
-    {
-        field_1_rgf = (short)fVertMerge.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3).
-     * @return  the fVertMerge field value.
-     */
-    @Internal
-    public boolean isFVertMerge()
-    {
-        return fVertMerge.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fVertRestart field value.
-     * When 1, the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty.
-     */
-    @Internal
-    public void setFVertRestart( boolean value )
-    {
-        field_1_rgf = (short)fVertRestart.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty.
-     * @return  the fVertRestart field value.
-     */
-    @Internal
-    public boolean isFVertRestart()
-    {
-        return fVertRestart.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the vertAlign field value.
-     * Specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary)
-     */
-    @Internal
-    public void setVertAlign( byte value )
-    {
-        field_1_rgf = (short)vertAlign.setValue(field_1_rgf, value);
-    }
-
-    /**
-     * Specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary)
-     * @return  the vertAlign field value.
-     */
-    @Internal
-    public byte getVertAlign()
-    {
-        return ( byte )vertAlign.getValue(field_1_rgf);
-    }
-
-    /**
-     * Sets the ftsWidth field value.
-     * Units for wWidth
-     */
-    @Internal
-    public void setFtsWidth( byte value )
-    {
-        field_1_rgf = (short)ftsWidth.setValue(field_1_rgf, value);
-    }
-
-    /**
-     * Units for wWidth
-     * @return  the ftsWidth field value.
-     */
-    @Internal
-    public byte getFtsWidth()
-    {
-        return ( byte )ftsWidth.getValue(field_1_rgf);
-    }
-
-    /**
-     * Sets the fFitText field value.
-     * When 1, make the text fit the table cell
-     */
-    @Internal
-    public void setFFitText( boolean value )
-    {
-        field_1_rgf = (short)fFitText.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, make the text fit the table cell
-     * @return  the fFitText field value.
-     */
-    @Internal
-    public boolean isFFitText()
-    {
-        return fFitText.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fNoWrap field value.
-     * When 1, do not allow text to wrap in the table cell
-     */
-    @Internal
-    public void setFNoWrap( boolean value )
-    {
-        field_1_rgf = (short)fNoWrap.setBoolean(field_1_rgf, value);
-    }
-
-    /**
-     * When 1, do not allow text to wrap in the table cell
-     * @return  the fNoWrap field value.
-     */
-    @Internal
-    public boolean isFNoWrap()
-    {
-        return fNoWrap.isSet(field_1_rgf);
-    }
-
-    /**
-     * Sets the fUnused field value.
-     * Not used
-     */
-    @Internal
-    public void setFUnused( byte value )
-    {
-        field_1_rgf = (short)fUnused.setValue(field_1_rgf, value);
-    }
-
-    /**
-     * Not used
-     * @return  the fUnused field value.
-     */
-    @Internal
-    public byte getFUnused()
-    {
-        return ( byte )fUnused.getValue(field_1_rgf);
-    }
-
-}  // END OF CLASS
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
deleted file mode 100644
index 58fab86..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model.types;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Table Autoformat Look sPecifier (TLP).
- * <p>
- * Class and fields descriptions are quoted from Microsoft Office Word 97-2007
- * Binary File Format
- * 
- * NOTE: This source is automatically generated please do not modify this file.
- * Either subclass or remove the record in src/records/definitions.
- * 
- * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
- *         File Format Specification [*.doc]
- */
-@Internal
-public abstract class TLPAbstractType
-{
-
-    protected short field_1_itl;
-    protected byte field_2_tlp_flags;
-    private static final BitField fBorders = new BitField( 0x0001 );
-    private static final BitField fShading = new BitField( 0x0002 );
-    private static final BitField fFont = new BitField( 0x0004 );
-    private static final BitField fColor = new BitField( 0x0008 );
-    private static final BitField fBestFit = new BitField( 0x0010 );
-    private static final BitField fHdrRows = new BitField( 0x0020 );
-    private static final BitField fLastRow = new BitField( 0x0040 );
-
-    public TLPAbstractType()
-    {
-
-    }
-
-    protected void fillFields( byte[] data, int offset )
-    {
-        field_1_itl = LittleEndian.getShort( data, 0x0 + offset );
-        field_2_tlp_flags = data[0x2 + offset];
-    }
-
-    public void serialize( byte[] data, int offset )
-    {
-        LittleEndian.putShort( data, 0x0 + offset, field_1_itl );
-        data[0x2 + offset] = field_2_tlp_flags;
-    }
-
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append( "[TLP]\n" );
-
-        buffer.append( "    .itl                  = " );
-        buffer.append( " (" ).append( getItl() ).append( " )\n" );
-
-        buffer.append( "    .tlp_flags            = " );
-        buffer.append( " (" ).append( getTlp_flags() ).append( " )\n" );
-        buffer.append( "         .fBorders                 = " )
-                .append( isFBorders() ).append( '\n' );
-        buffer.append( "         .fShading                 = " )
-                .append( isFShading() ).append( '\n' );
-        buffer.append( "         .fFont                    = " )
-                .append( isFFont() ).append( '\n' );
-        buffer.append( "         .fColor                   = " )
-                .append( isFColor() ).append( '\n' );
-        buffer.append( "         .fBestFit                 = " )
-                .append( isFBestFit() ).append( '\n' );
-        buffer.append( "         .fHdrRows                 = " )
-                .append( isFHdrRows() ).append( '\n' );
-        buffer.append( "         .fLastRow                 = " )
-                .append( isFLastRow() ).append( '\n' );
-
-        buffer.append( "[/TLP]\n" );
-        return buffer.toString();
-    }
-
-    /**
-     * Size of record (exluding 4 byte header)
-     */
-    public int getSize()
-    {
-        return 4 + +2 + 1;
-    }
-
-    /**
-     * Get the itl field for the TLP record.
-     */
-    public short getItl()
-    {
-        return field_1_itl;
-    }
-
-    /**
-     * Set the itl field for the TLP record.
-     */
-    public void setItl( short field_1_itl )
-    {
-        this.field_1_itl = field_1_itl;
-    }
-
-    /**
-     * Get the tlp_flags field for the TLP record.
-     */
-    public byte getTlp_flags()
-    {
-        return field_2_tlp_flags;
-    }
-
-    /**
-     * Set the tlp_flags field for the TLP record.
-     */
-    public void setTlp_flags( byte field_2_tlp_flags )
-    {
-        this.field_2_tlp_flags = field_2_tlp_flags;
-    }
-
-    /**
-     * Sets the fBorders field value. When == 1, use the border properties from
-     * the selected table look
-     */
-    public void setFBorders( boolean value )
-    {
-        field_2_tlp_flags = (byte) fBorders.setBoolean( field_2_tlp_flags,
-                value );
-
-    }
-
-    /**
-     * When == 1, use the border properties from the selected table look
-     * 
-     * @return the fBorders field value.
-     */
-    public boolean isFBorders()
-    {
-        return fBorders.isSet( field_2_tlp_flags );
-
-    }
-
-    /**
-     * Sets the fShading field value. When == 1, use the shading properties from
-     * the selected table look
-     */
-    public void setFShading( boolean value )
-    {
-        field_2_tlp_flags = (byte) fShading.setBoolean( field_2_tlp_flags,
-                value );
-
-    }
-
-    /**
-     * When == 1, use the shading properties from the selected table look
-     * 
-     * @return the fShading field value.
-     */
-    public boolean isFShading()
-    {
-        return fShading.isSet( field_2_tlp_flags );
-
-    }
-
-    /**
-     * Sets the fFont field value. When == 1, use the font from the selected
-     * table look
-     */
-    public void setFFont( boolean value )
-    {
-        field_2_tlp_flags = (byte) fFont.setBoolean( field_2_tlp_flags, value );
-
-    }
-
-    /**
-     * When == 1, use the font from the selected table look
-     * 
-     * @return the fFont field value.
-     */
-    public boolean isFFont()
-    {
-        return fFont.isSet( field_2_tlp_flags );
-
-    }
-
-    /**
-     * Sets the fColor field value. When == 1, use the color from the selected
-     * table look
-     */
-    public void setFColor( boolean value )
-    {
-        field_2_tlp_flags = (byte) fColor.setBoolean( field_2_tlp_flags, value );
-
-    }
-
-    /**
-     * When == 1, use the color from the selected table look
-     * 
-     * @return the fColor field value.
-     */
-    public boolean isFColor()
-    {
-        return fColor.isSet( field_2_tlp_flags );
-
-    }
-
-    /**
-     * Sets the fBestFit field value. When == 1, do best fit from the selected
-     * table look
-     */
-    public void setFBestFit( boolean value )
-    {
-        field_2_tlp_flags = (byte) fBestFit.setBoolean( field_2_tlp_flags,
-                value );
-
-    }
-
-    /**
-     * When == 1, do best fit from the selected table look
-     * 
-     * @return the fBestFit field value.
-     */
-    public boolean isFBestFit()
-    {
-        return fBestFit.isSet( field_2_tlp_flags );
-
-    }
-
-    /**
-     * Sets the fHdrRows field value. When == 1, apply properties from the
-     * selected table look to the header rows in the table
-     */
-    public void setFHdrRows( boolean value )
-    {
-        field_2_tlp_flags = (byte) fHdrRows.setBoolean( field_2_tlp_flags,
-                value );
-
-    }
-
-    /**
-     * When == 1, apply properties from the selected table look to the header
-     * rows in the table
-     * 
-     * @return the fHdrRows field value.
-     */
-    public boolean isFHdrRows()
-    {
-        return fHdrRows.isSet( field_2_tlp_flags );
-
-    }
-
-    /**
-     * Sets the fLastRow field value. When == 1, apply properties from the
-     * selected table look to the last row in the table
-     */
-    public void setFLastRow( boolean value )
-    {
-        field_2_tlp_flags = (byte) fLastRow.setBoolean( field_2_tlp_flags,
-                value );
-
-    }
-
-    /**
-     * When == 1, apply properties from the selected table look to the last row
-     * in the table
-     * 
-     * @return the fLastRow field value.
-     */
-    public boolean isFLastRow()
-    {
-        return fLastRow.isSet( field_2_tlp_flags );
-
-    }
-
-} // END OF CLASS
-
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
deleted file mode 100644
index 5e744bb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class CharacterSprmCompressor
-{
-  public CharacterSprmCompressor()
-  {
-  }
-  public static byte[] compressCharacterProperty(CharacterProperties newCHP, CharacterProperties oldCHP)
-  {
-    List<byte[]> sprmList = new ArrayList<byte[]>();
-    int size = 0;
-
-    if (newCHP.isFRMarkDel() != oldCHP.isFRMarkDel())
-    {
-      int value = 0;
-      if (newCHP.isFRMarkDel())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0800, value, null, sprmList);
-    }
-    if (newCHP.isFRMark() != oldCHP.isFRMark())
-    {
-      int value = 0;
-      if (newCHP.isFRMark())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0801, value, null, sprmList);
-    }
-    if (newCHP.isFFldVanish() != oldCHP.isFFldVanish())
-    {
-      int value = 0;
-      if (newCHP.isFFldVanish())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0802, value, null, sprmList);
-    }
-    if (newCHP.isFSpec() != oldCHP.isFSpec() || newCHP.getFcPic() != oldCHP.getFcPic())
-    {
-      size += SprmUtils.addSprm((short)0x6a03, newCHP.getFcPic(), null, sprmList);
-    }
-    if (newCHP.getIbstRMark() != oldCHP.getIbstRMark())
-    {
-       size += SprmUtils.addSprm((short)0x4804, newCHP.getIbstRMark(), null, sprmList);
-    }
-    if (!newCHP.getDttmRMark().equals(oldCHP.getDttmRMark()))
-    {
-      byte[] buf = new byte[4];
-      newCHP.getDttmRMark().serialize(buf, 0);
-
-      size += SprmUtils.addSprm((short)0x6805, LittleEndian.getInt(buf), null, sprmList);
-    }
-    if (newCHP.isFData() != oldCHP.isFData())
-    {
-      int value = 0;
-      if (newCHP.isFData())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0806, value, null, sprmList);
-    }
-    if (newCHP.isFSpec() && newCHP.getFtcSym() != 0)
-    {
-       byte[] varParam = new byte[4];
-       LittleEndian.putShort(varParam, 0, (short)newCHP.getFtcSym());
-       LittleEndian.putShort(varParam, 2, (short)newCHP.getXchSym());
-
-       size += SprmUtils.addSprm((short)0x6a09, 0, varParam, sprmList);
-    }
-    if (newCHP.isFOle2() != newCHP.isFOle2())
-    {
-      int value = 0;
-      if (newCHP.isFOle2())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x080a, value, null, sprmList);
-    }
-    if (newCHP.getIcoHighlight() != oldCHP.getIcoHighlight())
-    {
-      size += SprmUtils.addSprm((short)0x2a0c, newCHP.getIcoHighlight(), null, sprmList);
-    }
-    if (newCHP.getFcObj() != oldCHP.getFcObj())
-    {
-      size += SprmUtils.addSprm((short)0x680e, newCHP.getFcObj(), null, sprmList);
-    }
-    if (newCHP.getIstd() != oldCHP.getIstd())
-    {
-      size += SprmUtils.addSprm((short)0x4a30, newCHP.getIstd(), null, sprmList);
-    }
-    if (newCHP.isFBold() != oldCHP.isFBold())
-    {
-      int value = 0;
-      if (newCHP.isFBold())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0835, value, null, sprmList);
-    }
-    if (newCHP.isFItalic() != oldCHP.isFItalic())
-    {
-      int value = 0;
-      if (newCHP.isFItalic())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0836, value, null, sprmList);
-    }
-    if (newCHP.isFStrike() != oldCHP.isFStrike())
-    {
-      int value = 0;
-      if (newCHP.isFStrike())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0837, value, null, sprmList);
-    }
-    if (newCHP.isFOutline() != oldCHP.isFOutline())
-    {
-      int value = 0;
-      if (newCHP.isFOutline())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0838, value, null, sprmList);
-    }
-    if (newCHP.isFShadow() != oldCHP.isFShadow())
-    {
-      int value = 0;
-      if (newCHP.isFShadow())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0839, value, null, sprmList);
-    }
-    if (newCHP.isFSmallCaps() != oldCHP.isFSmallCaps())
-    {
-      int value = 0;
-      if (newCHP.isFSmallCaps())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x083a, value, null, sprmList);
-    }
-    if (newCHP.isFCaps() != oldCHP.isFCaps())
-    {
-      int value = 0;
-      if (newCHP.isFCaps())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x083b, value, null, sprmList);
-    }
-    if (newCHP.isFVanish() != oldCHP.isFVanish())
-    {
-      int value = 0;
-      if (newCHP.isFVanish())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x083c, value, null, sprmList);
-    }
-    if (newCHP.getKul() != oldCHP.getKul())
-    {
-      size += SprmUtils.addSprm((short)0x2a3e, newCHP.getKul(), null, sprmList);
-    }
-    if (newCHP.getDxaSpace() != oldCHP.getDxaSpace())
-    {
-      size += SprmUtils.addSprm((short)0x8840, newCHP.getDxaSpace(), null, sprmList);
-    }
-    if (newCHP.getIco() != oldCHP.getIco())
-    {
-      size += SprmUtils.addSprm((short)0x2a42, newCHP.getIco(), null, sprmList);
-    }
-    if (newCHP.getHps() != oldCHP.getHps())
-    {
-      size += SprmUtils.addSprm((short)0x4a43, newCHP.getHps(), null, sprmList);
-    }
-    if (newCHP.getHpsPos() != oldCHP.getHpsPos())
-    {
-      size += SprmUtils.addSprm((short)0x4845, newCHP.getHpsPos(), null, sprmList);
-    }
-    if (newCHP.getHpsKern() != oldCHP.getHpsKern())
-    {
-      size += SprmUtils.addSprm((short)0x484b, newCHP.getHpsKern(), null, sprmList);
-    }
-    if (newCHP.getHresi().equals( oldCHP.getHresi() ))
-    {
-      size += SprmUtils.addSprm((short)0x484e, newCHP.getHresi().getValue(), null, sprmList);
-    }
-    if (newCHP.getFtcAscii() != oldCHP.getFtcAscii())
-    {
-      size += SprmUtils.addSprm((short)0x4a4f, newCHP.getFtcAscii(), null, sprmList);
-    }
-    if (newCHP.getFtcFE() != oldCHP.getFtcFE())
-    {
-      size += SprmUtils.addSprm((short)0x4a50, newCHP.getFtcFE(), null, sprmList);
-    }
-    if (newCHP.getFtcOther() != oldCHP.getFtcOther())
-    {
-      size += SprmUtils.addSprm((short)0x4a51, newCHP.getFtcOther(), null, sprmList);
-    }
-
-    if (newCHP.isFDStrike() != oldCHP.isFDStrike())
-    {
-      int value = 0;
-      if (newCHP.isFDStrike())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x2a53, value, null, sprmList);
-    }
-    if (newCHP.isFImprint() != oldCHP.isFImprint())
-    {
-      int value = 0;
-      if (newCHP.isFImprint())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0854, value, null, sprmList);
-    }
-    if (newCHP.isFSpec() != oldCHP.isFSpec())
-    {
-      int value = 0;
-      if (newCHP.isFSpec())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0855, value, null, sprmList);
-    }
-    if (newCHP.isFObj() != oldCHP.isFObj())
-    {
-      int value = 0;
-      if (newCHP.isFObj())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0856, value, null, sprmList);
-    }
-    if (newCHP.isFEmboss() != oldCHP.isFEmboss())
-    {
-      int value = 0;
-      if (newCHP.isFEmboss())
-      {
-        value = 0x01;
-      }
-      size += SprmUtils.addSprm((short)0x0858, value, null, sprmList);
-    }
-    if (newCHP.getSfxtText() != oldCHP.getSfxtText())
-    {
-      size += SprmUtils.addSprm((short)0x2859, newCHP.getSfxtText(), null, sprmList);
-    }
-        if ( !newCHP.getCv().equals( oldCHP.getCv() ) )
-        {
-            // don't add a sprm if we're looking at an ico = Auto
-            if ( !newCHP.getCv().isEmpty() )
-                size += SprmUtils.addSprm( CharacterProperties.SPRM_CCV, newCHP
-                        .getCv().getValue(), null, sprmList );
-        }
-
-    return SprmUtils.getGrpprl(sprmList, size);
-  }
-
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
deleted file mode 100644
index e382ffe..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
+++ /dev/null
@@ -1,759 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import org.apache.poi.hwpf.usermodel.ShadingDescriptor80;
-
-import org.apache.poi.hwpf.model.Colorref;
-import org.apache.poi.hwpf.model.Hyphenation;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.hwpf.usermodel.DateAndTime;
-import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-public final class CharacterSprmUncompressor extends SprmUncompressor
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( CharacterSprmUncompressor.class );
-
-  public CharacterSprmUncompressor()
-  {
-  }
-
-    @Deprecated
-    public static CharacterProperties uncompressCHP(
-            CharacterProperties parent, byte[] grpprl, int offset )
-    {
-        CharacterProperties newProperties = parent.clone();
-        applySprms( parent, grpprl, offset, true, newProperties );
-        return newProperties;
-    }
-
-    public static CharacterProperties uncompressCHP( StyleSheet styleSheet,
-            CharacterProperties parStyle, byte[] grpprl, int offset )
-    {
-        CharacterProperties newProperties;
-        if ( parStyle == null )
-        {
-            parStyle = new CharacterProperties();
-            newProperties = new CharacterProperties();
-        }
-        else
-        {
-            newProperties = parStyle.clone();
-        }
-
-        /*
-         * not fully conform to specification, but the fastest way to make it
-         * work. Shall be rewritten if any errors would be found -- vlsergey
-         */
-        Integer style = getIstd( grpprl, offset );
-        if ( style != null )
-        {
-            try
-            {
-                applySprms( parStyle, styleSheet.getCHPX( style ), 0, false,
-                        newProperties );
-            }
-            catch ( Exception exc )
-            {
-                logger.log( POILogger.ERROR, "Unable to apply all style ",
-                        style, " CHP SPRMs to CHP: ", exc, exc );
-            }
-        }
-
-        CharacterProperties styleProperties = newProperties;
-        newProperties = styleProperties.clone();
-
-        try
-        {
-            applySprms( styleProperties, grpprl, offset, true, newProperties );
-        }
-        catch ( Exception exc )
-        {
-            logger.log( POILogger.ERROR,
-                    "Unable to process all direct CHP SPRMs: ", exc, exc );
-        }
-        return newProperties;
-    }
-
-    private static void applySprms( CharacterProperties parentProperties,
-            byte[] grpprl, int offset, boolean warnAboutNonChpSprms,
-            CharacterProperties targetProperties )
-    {
-        SprmIterator sprmIt = new SprmIterator( grpprl, offset );
-
-        while ( sprmIt.hasNext() )
-        {
-            SprmOperation sprm = sprmIt.next();
-
-            if ( sprm.getType() != 2 )
-            {
-                if ( warnAboutNonChpSprms )
-                {
-                    logger.log( POILogger.WARN,
-                            "Non-CHP SPRM returned by SprmIterator: " + sprm );
-                }
-                continue;
-            }
-
-            unCompressCHPOperation( parentProperties, targetProperties, sprm );
-        }
-    }
-
-    private static Integer getIstd( byte[] grpprl, int offset )
-    {
-        Integer style = null;
-        try
-        {
-            SprmIterator sprmIt = new SprmIterator( grpprl, offset );
-            while ( sprmIt.hasNext() )
-            {
-                SprmOperation sprm = sprmIt.next();
-
-                if ( sprm.getType() == 2 && sprm.getOperation() == 0x30 )
-                {
-                    // sprmCIstd (0x4A30)
-                    style = Integer.valueOf( sprm.getOperand() );
-                }
-            }
-        }
-        catch ( Exception exc )
-        {
-            logger.log( POILogger.ERROR,
-                    "Unable to extract istd from direct CHP SPRM: ", exc, exc );
-        }
-        return style;
-    }
-
-  /**
-   * Used in decompression of a chpx. This performs an operation defined by
-   * a single sprm.
-   *
-   * @param oldCHP The base CharacterProperties.
-   * @param newCHP The current CharacterProperties.
-   * @param operand The operand defined by the sprm (See Word file format spec)
-   * @param param The parameter defined by the sprm (See Word file format spec)
-   * @param varParam The variable length parameter defined by the sprm. (See
-   *        Word file format spec)
-   * @param grpprl The entire chpx that this operation is a part of.
-   * @param offset The offset in the grpprl of the next sprm
-   * @param styleSheet The StyleSheet for this document.
-   */
-  static void unCompressCHPOperation (CharacterProperties oldCHP,
-                                      CharacterProperties newCHP,
-                                      SprmOperation sprm)
-  {
-
-    switch (sprm.getOperation())
-    {
-      case 0:
-        newCHP.setFRMarkDel (getFlag (sprm.getOperand()));
-        break;
-      case 0x1:
-        newCHP.setFRMark (getFlag (sprm.getOperand()));
-        break;
-      case 0x2:
-        newCHP.setFFldVanish (getFlag (sprm.getOperand()));
-        break;
-        case 0x3:
-            // sprmCPicLocation -- 0x6A03
-            /*
-             * [MS-DOC]
-             * 
-             * Page 104 of 622
-             * 
-             * A signed 32-bit integer that specifies either the position in the
-             * Data Stream of a picture or binary data or the name of an OLE
-             * object storage.
-             */
-            newCHP.setFcPic( sprm.getOperand() );
-            newCHP.setFSpec( true );
-            break;
-      case 0x4:
-        newCHP.setIbstRMark ((short) sprm.getOperand());
-        break;
-      case 0x5:
-        newCHP.setDttmRMark (new DateAndTime(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x6:
-        newCHP.setFData (getFlag (sprm.getOperand()));
-        break;
-      case 0x7:
-        //don't care about this
-        break;
-      case 0x8:
-        //short chsDiff = (short)((param & 0xff0000) >>> 16);
-        int operand =sprm.getOperand();
-        short chsDiff = (short) (operand & 0x0000ff);
-        newCHP.setFChsDiff (getFlag (chsDiff));
-        newCHP.setChse ((short) (operand & 0xffff00));
-        break;
-      case 0x9:
-        newCHP.setFSpec (true);
-        newCHP.setFtcSym (LittleEndian.getShort (sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        newCHP.setXchSym (LittleEndian.getShort (sprm.getGrpprl(), sprm.getGrpprlOffset() + 2));
-        break;
-      case 0xa:
-        newCHP.setFOle2 (getFlag (sprm.getOperand()));
-        break;
-      case 0xb:
-
-        // Obsolete
-        break;
-      case 0xc:
-        newCHP.setIcoHighlight ((byte) sprm.getOperand());
-        newCHP.setFHighlight (getFlag (sprm.getOperand()));
-        break;
-      case 0xd:
-
-        //	undocumented
-        break;
-      case 0xe:
-        newCHP.setFcObj (sprm.getOperand());
-        break;
-      case 0xf:
-
-        // undocumented
-        break;
-      case 0x10:
-
-        // undocumented
-        break;
-
-        // undocumented till 0x30
-
-      case 0x11:
-        // sprmCFWebHidden
-        break;
-      case 0x12:
-        break;
-      case 0x13:
-        break;
-      case 0x14:
-        break;
-      case 0x15:
-        // sprmCRsidProp
-        break;
-      case 0x16:
-        // sprmCRsidText
-        break;
-      case 0x17:
-        // sprmCRsidRMDel
-        break;
-      case 0x18:
-        // sprmCFSpecVanish
-        break;
-      case 0x19:
-        break;
-      case 0x1a:
-        // sprmCFMathPr
-        break;
-      case 0x1b:
-        break;
-      case 0x1c:
-        break;
-      case 0x1d:
-        break;
-      case 0x1e:
-        break;
-      case 0x1f:
-        break;
-      case 0x20:
-        break;
-      case 0x21:
-        break;
-      case 0x22:
-        break;
-      case 0x23:
-        break;
-      case 0x24:
-        break;
-      case 0x25:
-        break;
-      case 0x26:
-        break;
-      case 0x27:
-        break;
-      case 0x28:
-        break;
-      case 0x29:
-        break;
-      case 0x2a:
-        break;
-      case 0x2b:
-        break;
-      case 0x2c:
-        break;
-      case 0x2d:
-        break;
-      case 0x2e:
-        break;
-      case 0x2f:
-        break;
-        case 0x30:
-            newCHP.setIstd( sprm.getOperand() );
-            // 0x30 is supported by uncompressCHP(...)
-            break;
-      case 0x31:
-
-        //permutation vector for fast saves, who cares!
-        break;
-      case 0x32:
-        newCHP.setFBold (false);
-        newCHP.setFItalic (false);
-        newCHP.setFOutline (false);
-        newCHP.setFStrike (false);
-        newCHP.setFShadow (false);
-        newCHP.setFSmallCaps (false);
-        newCHP.setFCaps (false);
-        newCHP.setFVanish (false);
-        newCHP.setKul ((byte) 0);
-        newCHP.setIco ((byte) 0);
-        break;
-        case 0x33:
-            // preserve the fSpec setting from the original CHP
-            boolean fSpec = newCHP.isFSpec();
-            newCHP = oldCHP.clone();
-            newCHP.setFSpec( fSpec );
-            return;
-      case 0x34:
-        // sprmCKcd
-        break;
-      case 0x35:
-        newCHP.setFBold (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFBold ()));
-        break;
-      case 0x36:
-        newCHP.setFItalic (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFItalic ()));
-        break;
-      case 0x37:
-        newCHP.setFStrike (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFStrike ()));
-        break;
-      case 0x38:
-        newCHP.setFOutline (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFOutline ()));
-        break;
-      case 0x39:
-        newCHP.setFShadow (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFShadow ()));
-        break;
-      case 0x3a:
-        newCHP.setFSmallCaps (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFSmallCaps ()));
-        break;
-      case 0x3b:
-        newCHP.setFCaps (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFCaps ()));
-        break;
-      case 0x3c:
-        newCHP.setFVanish (getCHPFlag ((byte) sprm.getOperand(), oldCHP.isFVanish ()));
-        break;
-      case 0x3d:
-        newCHP.setFtcAscii ((short) sprm.getOperand());
-        break;
-      case 0x3e:
-        newCHP.setKul ((byte) sprm.getOperand());
-        break;
-      case 0x3f:
-        operand = sprm.getOperand();
-        int hps = operand & 0xff;
-        if (hps != 0)
-        {
-          newCHP.setHps (hps);
-        }
-
-        //byte cInc = (byte)(((byte)(param & 0xfe00) >>> 4) >> 1);
-        byte cInc = (byte) ((operand & 0xff00) >>> 8);
-        cInc >>>= 1;
-        if (cInc != 0)
-        {
-          newCHP.setHps (Math.max (newCHP.getHps () + (cInc * 2), 2));
-        }
-
-        //byte hpsPos = (byte)((param & 0xff0000) >>> 8);
-        byte hpsPos = (byte) ((operand & 0xff0000) >>> 16);
-        if (hpsPos != (byte)0x80)
-        {
-          newCHP.setHpsPos (hpsPos);
-        }
-        boolean fAdjust = (operand & 0x0100) > 0;
-        if (fAdjust && (hpsPos & 0xFF) != 128 && hpsPos != 0 && oldCHP.getHpsPos () == 0)
-        {
-          newCHP.setHps (Math.max (newCHP.getHps () + ( -2), 2));
-        }
-        if (fAdjust && hpsPos == 0 && oldCHP.getHpsPos () != 0)
-        {
-          newCHP.setHps (Math.max (newCHP.getHps () + 2, 2));
-        }
-        break;
-      case 0x40:
-        newCHP.setDxaSpace (sprm.getOperand());
-        break;
-      case 0x41:
-        newCHP.setLidDefault ((short) sprm.getOperand());
-        break;
-      case 0x42:
-        newCHP.setIco ((byte) sprm.getOperand());
-        break;
-      case 0x43:
-        newCHP.setHps (sprm.getOperand());
-        break;
-      case 0x44:
-        byte hpsLvl = (byte) sprm.getOperand();
-        newCHP.setHps (Math.max (newCHP.getHps () + (hpsLvl * 2), 2));
-        break;
-      case 0x45:
-        newCHP.setHpsPos ((short) sprm.getOperand());
-        break;
-      case 0x46:
-        if (sprm.getOperand() != 0)
-        {
-          if (oldCHP.getHpsPos () == 0)
-          {
-            newCHP.setHps (Math.max (newCHP.getHps () + ( -2), 2));
-          }
-        }
-        else
-        {
-          if (oldCHP.getHpsPos () != 0)
-          {
-            newCHP.setHps (Math.max (newCHP.getHps () + 2, 2));
-          }
-        }
-        break;
-      case 0x47:
-        /*CharacterProperties genCHP = new CharacterProperties ();
-        genCHP.setFtcAscii (4);
-        genCHP = (CharacterProperties) unCompressProperty (varParam, genCHP,
-          styleSheet);
-        CharacterProperties styleCHP = styleSheet.getStyleDescription (oldCHP.
-          getBaseIstd ()).getCHP ();
-        if (genCHP.isFBold () == newCHP.isFBold ())
-        {
-          newCHP.setFBold (styleCHP.isFBold ());
-        }
-        if (genCHP.isFItalic () == newCHP.isFItalic ())
-        {
-          newCHP.setFItalic (styleCHP.isFItalic ());
-        }
-        if (genCHP.isFSmallCaps () == newCHP.isFSmallCaps ())
-        {
-          newCHP.setFSmallCaps (styleCHP.isFSmallCaps ());
-        }
-        if (genCHP.isFVanish () == newCHP.isFVanish ())
-        {
-          newCHP.setFVanish (styleCHP.isFVanish ());
-        }
-        if (genCHP.isFStrike () == newCHP.isFStrike ())
-        {
-          newCHP.setFStrike (styleCHP.isFStrike ());
-        }
-        if (genCHP.isFCaps () == newCHP.isFCaps ())
-        {
-          newCHP.setFCaps (styleCHP.isFCaps ());
-        }
-        if (genCHP.getFtcAscii () == newCHP.getFtcAscii ())
-        {
-          newCHP.setFtcAscii (styleCHP.getFtcAscii ());
-        }
-        if (genCHP.getFtcFE () == newCHP.getFtcFE ())
-        {
-          newCHP.setFtcFE (styleCHP.getFtcFE ());
-        }
-        if (genCHP.getFtcOther () == newCHP.getFtcOther ())
-        {
-          newCHP.setFtcOther (styleCHP.getFtcOther ());
-        }
-        if (genCHP.getHps () == newCHP.getHps ())
-        {
-          newCHP.setHps (styleCHP.getHps ());
-        }
-        if (genCHP.getHpsPos () == newCHP.getHpsPos ())
-        {
-          newCHP.setHpsPos (styleCHP.getHpsPos ());
-        }
-        if (genCHP.getKul () == newCHP.getKul ())
-        {
-          newCHP.setKul (styleCHP.getKul ());
-        }
-        if (genCHP.getDxaSpace () == newCHP.getDxaSpace ())
-        {
-          newCHP.setDxaSpace (styleCHP.getDxaSpace ());
-        }
-        if (genCHP.getIco () == newCHP.getIco ())
-        {
-          newCHP.setIco (styleCHP.getIco ());
-        }
-        if (genCHP.getLidDefault () == newCHP.getLidDefault ())
-        {
-          newCHP.setLidDefault (styleCHP.getLidDefault ());
-        }
-        if (genCHP.getLidFE () == newCHP.getLidFE ())
-        {
-          newCHP.setLidFE (styleCHP.getLidFE ());
-        }*/
-        break;
-      case 0x48:
-        newCHP.setIss ((byte) sprm.getOperand());
-        break;
-      case 0x49:
-        newCHP.setHps (LittleEndian.getShort (sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x4a:
-        int increment = LittleEndian.getShort (sprm.getGrpprl(), sprm.getGrpprlOffset());
-        newCHP.setHps (Math.max (newCHP.getHps () + increment, 8));
-        break;
-      case 0x4b:
-        newCHP.setHpsKern (sprm.getOperand());
-        break;
-        // Microsoft Office Word 97-2007 Binary File Format (.doc) Specification
-        // Page 59 of 210
-        case 0x4c:
-            // sprmCMajority50 -- 0xCA4C
-            // unCompressCHPOperation (oldCHP, newCHP, 0x47, param, varParam,
-            // styleSheet, opSize);
-            break;
-        case 0x4d:
-            // sprmCHpsMul -- 0x4A4D
-            float percentage = sprm.getOperand() / 100.0f;
-            int add = (int) ( percentage * newCHP.getHps() );
-            newCHP.setHps( newCHP.getHps() + add );
-            break;
-        case 0x4e:
-            // sprmCHresi -- 0x484e
-            Hyphenation hyphenation = new Hyphenation(
-                    (short) sprm.getOperand() );
-            newCHP.setHresi( hyphenation );
-            break;
-      case 0x4f:
-        newCHP.setFtcAscii ((short) sprm.getOperand());
-        break;
-      case 0x50:
-        newCHP.setFtcFE ((short) sprm.getOperand());
-        break;
-      case 0x51:
-        newCHP.setFtcOther ((short) sprm.getOperand());
-        break;
-      case 0x52:
-        // sprmCCharScale
-        break;
-      case 0x53:
-        newCHP.setFDStrike (getFlag (sprm.getOperand()));
-        break;
-      case 0x54:
-        newCHP.setFImprint (getFlag (sprm.getOperand()));
-        break;
-        case 0x55:
-            // sprmCFSpec -- 0x0855
-            newCHP.setFSpec( getFlag( sprm.getOperand() ) );
-            break;
-      case 0x56:
-        newCHP.setFObj (getFlag (sprm.getOperand()));
-        break;
-        case 0x57:
-            // sprmCPropRMark -- 0xCA57
-            /*
-             * Microsoft Office Word 97-2007 Binary File Format (.doc)
-             * Specification
-             * 
-             * Page 78 of 210
-             * 
-             * sprmCPropRMark (opcode 0xCA57) is interpreted by moving the first
-             * parameter byte to chp.fPropRMark, the next two bytes to
-             * chp.ibstPropRMark, and the remaining four bytes to
-             * chp.dttmPropRMark.
-             */
-            byte[] buf = sprm.getGrpprl();
-            int offset = sprm.getGrpprlOffset();
-            newCHP.setFPropRMark( buf[offset] != 0 );
-            newCHP.setIbstPropRMark( LittleEndian.getShort( buf, offset + 1 ) );
-            newCHP.setDttmPropRMark( new DateAndTime( buf, offset + 3 ) );
-            break;
-      case 0x58:
-        newCHP.setFEmboss (getFlag (sprm.getOperand()));
-        break;
-      case 0x59:
-        newCHP.setSfxtText ((byte) sprm.getOperand());
-        break;
-      case 0x5a:
-        // sprmCFBiDi
-        break;
-      case 0x5b:
-        break;
-      case 0x5c:
-        // sprmCFBoldBi
-        break;
-      case 0x5d:
-        // sprmCFItalicBi
-        break;
-      case 0x5e:
-        // sprmCFtcBi
-        break;
-      case 0x5f:
-        // sprmCLidBi 
-        break;
-      case 0x60:
-        // sprmCIcoBi
-        break;
-      case 0x61:
-        // sprmCHpsBi
-        break;
-        case 0x62:
-            // sprmCDispFldRMark -- 0xCA62
-            /*
-             * Microsoft Office Word 97-2007 Binary File Format (.doc)
-             * Specification
-             * 
-             * Page 78 of 210
-             * 
-             * sprmCDispFldRMark (opcode 0xCA62) is interpreted by moving the
-             * first parameter byte to chp.fDispFldRMark, the next two bytes to
-             * chp.ibstDispFldRMark, the next four bytes to
-             * chp.dttmDispFldRMark, and the remaining 32 bytes to
-             * chp.xstDispFldRMark.
-             */
-            byte[] xstDispFldRMark = new byte[32];
-            buf = sprm.getGrpprl();
-            offset = sprm.getGrpprlOffset();
-            newCHP.setFDispFldRMark( 0 != buf[offset] );
-            newCHP.setIbstDispFldRMark( LittleEndian.getShort( buf, offset + 1 ) );
-            newCHP.setDttmDispFldRMark( new DateAndTime( buf, offset + 3 ) );
-            System.arraycopy( buf, offset + 7, xstDispFldRMark, 0, 32 );
-            newCHP.setXstDispFldRMark( xstDispFldRMark );
-            break;
-      case 0x63:
-        newCHP.setIbstRMarkDel ((short) sprm.getOperand());
-        break;
-      case 0x64:
-        newCHP.setDttmRMarkDel (new DateAndTime(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x65:
-        newCHP.setBrc (new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-        case 0x66:
-            // sprmCShd80
-            /*
-             * "A Shd80 structure that specifies the background shading for the text. By default, text is not shaded."
-             * 
-             * Word (.doc) Binary File Format. Copyright (c) 2011 Microsoft
-             * Corporation. Release: Tuesday, March 15, 2011
-             */
-            ShadingDescriptor80 oldDescriptor = new ShadingDescriptor80(
-                    sprm.getGrpprl(), sprm.getGrpprlOffset() );
-            ShadingDescriptor newDescriptor = oldDescriptor
-                    .toShadingDescriptor();
-            newCHP.setShd( newDescriptor );
-            break;
-      case 0x67:
-        // Obsolete
-        break;
-      case 0x68:
-        //  sprmCFUsePgsuSettings
-        break;
-      case 0x69:
-        break;
-      case 0x6a:
-        break;
-      case 0x6b:
-        break;
-      case 0x6c:
-        break;
-      case 0x6d:
-        newCHP.setLidDefault ((short) sprm.getOperand());
-        break;
-      case 0x6e:
-        newCHP.setLidFE ((short) sprm.getOperand());
-        break;
-      case 0x6f:
-        newCHP.setIdctHint ((byte) sprm.getOperand());
-        break;
-        case 0x70:
-            // sprmCCv -- 0x6870
-            newCHP.setCv( new Colorref( sprm.getOperand() ) );
-            break;
-      case 0x71:
-        // sprmCShd
-        break;
-      case 0x72:
-        // sprmCBrc
-        break;
-      case 0x73:
-        // sprmCRgLid0
-        break;
-      case 0x74:
-          // sprmCRgLid1
-          break;
-		case 0x75:
-			// sprmCFNoProof -- 0x875
-			/*
-			 * "A ToggleOperand value that specifies whether the text is excluded from the proofing analysis. By default, text is not excluded from the proofing analysis."
-			 * 
-			 * Word (.doc) Binary File Format. Copyright (c) 2012 Microsoft
-			 * Corporation. Released: October 8, 2012
-			 */
-			newCHP.setFNoProof(getCHPFlag((byte) sprm.getOperand(),
-					oldCHP.isFNoProof()));
-			break;
-      default:
-          logger.log( POILogger.DEBUG, "Unknown CHP sprm ignored: " + sprm );
-          break;
-    }
-  }
-
-  private static boolean getCHPFlag (byte x, boolean oldVal)
-  {
-    /*
-         switch(x)
-         {
-     case 0:
-       return false;
-     case 1:
-       return true;
-     case (byte)0x80:
-       return oldVal;
-     case (byte)0x81:
-       return !oldVal;
-     default:
-       return false;
-         }
-     */
-    if (x == 0)
-    {
-      return false;
-    }
-    else if (x == 1)
-    {
-      return true;
-    }
-    else if ((x & 0x81) == 0x80)
-    {
-      return oldVal;
-    }
-    else if ((x & 0x81) == 0x81)
-    {
-      return!oldVal;
-    }
-    else
-    {
-      return false;
-    }
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
deleted file mode 100644
index 2f60b53..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class ParagraphSprmCompressor
-{
-  public ParagraphSprmCompressor()
-  {
-  }
-
-  public static byte[] compressParagraphProperty(ParagraphProperties newPAP,
-                                                 ParagraphProperties oldPAP)
-  {
-    // page numbers links to Word97-2007BinaryFileFormat(doc)Specification.pdf, accessible from microsoft.com 
-
-    List<byte[]> sprmList = new ArrayList<byte[]>();
-    int size = 0;
-
-    // Page 50 of public specification begins
-    if (newPAP.getIstd() != oldPAP.getIstd())
-    {
-      // sprmPIstd 
-      size += SprmUtils.addSprm((short)0x4600, newPAP.getIstd(), null, sprmList);
-    }
-    if (newPAP.getJc() != oldPAP.getJc())
-    {
-      // sprmPJc80 
-      size += SprmUtils.addSprm((short)0x2403, newPAP.getJc(), null, sprmList);
-    }
-    if (newPAP.getFSideBySide() != oldPAP.getFSideBySide())
-    {
-      // sprmPFSideBySide 
-      size += SprmUtils.addSprm((short)0x2404, newPAP.getFSideBySide(), sprmList);
-    }
-    if (newPAP.getFKeep() != oldPAP.getFKeep())
-    {
-      size += SprmUtils.addSprm((short)0x2405, newPAP.getFKeep(), sprmList);
-    }
-    if (newPAP.getFKeepFollow() != oldPAP.getFKeepFollow())
-    {
-      size += SprmUtils.addSprm((short)0x2406, newPAP.getFKeepFollow(), sprmList);
-    }
-    if (newPAP.getFPageBreakBefore() != oldPAP.getFPageBreakBefore())
-    {
-      size += SprmUtils.addSprm((short)0x2407, newPAP.getFPageBreakBefore(), sprmList);
-    }
-    if (newPAP.getBrcl() != oldPAP.getBrcl())
-    {
-      size += SprmUtils.addSprm((short)0x2408, newPAP.getBrcl(), null, sprmList);
-    }
-    if (newPAP.getBrcp() != oldPAP.getBrcp())
-    {
-      size += SprmUtils.addSprm((short)0x2409, newPAP.getBrcp(), null, sprmList);
-    }
-    if (newPAP.getIlvl() != oldPAP.getIlvl())
-    {
-      size += SprmUtils.addSprm((short)0x260A, newPAP.getIlvl(), null, sprmList);
-    }
-    if (newPAP.getIlfo() != oldPAP.getIlfo())
-    {
-      size += SprmUtils.addSprm((short)0x460b, newPAP.getIlfo(), null, sprmList);
-    }
-    if (newPAP.getFNoLnn() != oldPAP.getFNoLnn())
-    {
-      size += SprmUtils.addSprm((short)0x240C, newPAP.getFNoLnn(), sprmList);
-    }
-    if (newPAP.getItbdMac() != oldPAP.getItbdMac() ||
-            !Arrays.equals(newPAP.getRgdxaTab(), oldPAP.getRgdxaTab()) ||
-            !Arrays.equals(newPAP.getRgtbd(), oldPAP.getRgtbd()))
-        {
-          /** @todo revisit this */
-//          byte[] oldTabArray = oldPAP.getRgdxaTab();
-//          byte[] newTabArray = newPAP.getRgdxaTab();
-//          byte[] newTabDescriptors = newPAP.getRgtbd();
-//          byte[] varParam = new byte[2 + oldTabArray.length + newTabArray.length +
-//                                     newTabDescriptors.length];
-//          varParam[0] = (byte)(oldTabArray.length/2);
-//          int offset = 1;
-//          System.arraycopy(oldTabArray, 0, varParam, offset, oldTabArray.length);
-//          offset += oldTabArray.length;
-//          varParam[offset] = (byte)(newTabArray.length/2);
-//          offset += 1;
-//          System.arraycopy(newTabArray, 0, varParam, offset, newTabArray.length);
-//          offset += newTabArray.length;
-//          System.arraycopy(newTabDescriptors, 0, varParam, offset, newTabDescriptors.length);
-    //
-//          size += SprmUtils.addSprm((short)0xC60D, 0, varParam, sprmList);
-    }
-    if (newPAP.getDxaLeft() != oldPAP.getDxaLeft())
-    {
-      // sprmPDxaLeft80 
-      size += SprmUtils.addSprm((short)0x840F, newPAP.getDxaLeft(), null, sprmList);
-    }
-
-    // Page 51 of public specification begins
-    if (newPAP.getDxaLeft1() != oldPAP.getDxaLeft1())
-    {
-      // sprmPDxaLeft180 
-      size += SprmUtils.addSprm((short)0x8411, newPAP.getDxaLeft1(), null, sprmList);
-    }
-    if (newPAP.getDxaRight() != oldPAP.getDxaRight())
-    {
-      // sprmPDxaRight80  
-      size += SprmUtils.addSprm((short)0x840E, newPAP.getDxaRight(), null, sprmList);
-    }
-    if (newPAP.getDxcLeft() != oldPAP.getDxcLeft())
-    {
-      // sprmPDxcLeft
-      size += SprmUtils.addSprm((short)0x4456, newPAP.getDxcLeft(), null, sprmList);
-    }
-    if (newPAP.getDxcLeft1() != oldPAP.getDxcLeft1())
-    {
-      // sprmPDxcLeft1
-      size += SprmUtils.addSprm((short)0x4457, newPAP.getDxcLeft1(), null, sprmList);
-    }
-    if (newPAP.getDxcRight() != oldPAP.getDxcRight())
-    {
-      // sprmPDxcRight
-      size += SprmUtils.addSprm((short)0x4455, newPAP.getDxcRight(), null, sprmList);
-    }
-    if (!newPAP.getLspd().equals(oldPAP.getLspd()))
-    {
-      // sprmPDyaLine
-      byte[] buf = new byte[4];
-      newPAP.getLspd().serialize(buf, 0);
-
-      size += SprmUtils.addSprm((short)0x6412, LittleEndian.getInt(buf), null, sprmList);
-    }
-    if (newPAP.getDyaBefore() != oldPAP.getDyaBefore())
-    {
-      // sprmPDyaBefore
-      size += SprmUtils.addSprm((short)0xA413, newPAP.getDyaBefore(), null, sprmList);
-    }
-    if (newPAP.getDyaAfter() != oldPAP.getDyaAfter())
-    {
-      // sprmPDyaAfter
-      size += SprmUtils.addSprm((short)0xA414, newPAP.getDyaAfter(), null, sprmList);
-    }
-    if (newPAP.getFDyaBeforeAuto() != oldPAP.getFDyaBeforeAuto())
-    {
-      // sprmPFDyaBeforeAuto
-      size += SprmUtils.addSprm((short)0x245B, newPAP.getFDyaBeforeAuto(), sprmList);
-    }
-    if (newPAP.getFDyaAfterAuto() != oldPAP.getFDyaAfterAuto())
-    {
-      // sprmPFDyaAfterAuto
-      size += SprmUtils.addSprm((short)0x245C, newPAP.getFDyaAfterAuto(), sprmList);
-    }
-    if (newPAP.getFInTable() != oldPAP.getFInTable())
-    {
-      // sprmPFInTable
-      size += SprmUtils.addSprm((short)0x2416, newPAP.getFInTable(), sprmList);
-    }
-    if (newPAP.getFTtp() != oldPAP.getFTtp())
-    {
-      // sprmPFTtp
-      size += SprmUtils.addSprm((short)0x2417, newPAP.getFTtp(), sprmList);
-    }
-    if (newPAP.getDxaAbs() != oldPAP.getDxaAbs())
-    {
-      // sprmPDxaAbs
-      size += SprmUtils.addSprm((short)0x8418, newPAP.getDxaAbs(), null, sprmList);
-    }
-    if (newPAP.getDyaAbs() != oldPAP.getDyaAbs())
-    {
-      // sprmPDyaAbs
-      size += SprmUtils.addSprm((short)0x8419, newPAP.getDyaAbs(), null, sprmList);
-    }
-    if (newPAP.getDxaWidth() != oldPAP.getDxaWidth())
-    {
-      // sprmPDxaWidth
-      size += SprmUtils.addSprm((short)0x841A, newPAP.getDxaWidth(), null, sprmList);
-    }
-    
-    // Page 52 of public specification begins
-    if (newPAP.getWr() != oldPAP.getWr())
-    {
-      size += SprmUtils.addSprm((short)0x2423, newPAP.getWr(), null, sprmList);
-    }
-
-    if (newPAP.getBrcBar().equals(oldPAP.getBrcBar()))
-    {
-      // XXX: sprm code 0x6428 is sprmPBrcBetween80, but accessed property linked to sprmPBrcBar80 (0x6629)
-      int brc = newPAP.getBrcBar().toInt();
-      size += SprmUtils.addSprm((short)0x6428, brc, null, sprmList);
-    }
-    if (!newPAP.getBrcBottom().equals(oldPAP.getBrcBottom()))
-    {
-      // sprmPBrcBottom80  
-      int brc = newPAP.getBrcBottom().toInt();
-      size += SprmUtils.addSprm((short)0x6426, brc, null, sprmList);
-    }
-    if (!newPAP.getBrcLeft().equals(oldPAP.getBrcLeft()))
-    {
-      // sprmPBrcLeft80  
-      int brc = newPAP.getBrcLeft().toInt();
-      size += SprmUtils.addSprm((short)0x6425, brc, null, sprmList);
-    }
-
-    // Page 53 of public specification begins
-    if (!newPAP.getBrcRight().equals(oldPAP.getBrcRight()))
-    {
-      // sprmPBrcRight80
-      int brc = newPAP.getBrcRight().toInt();
-      size += SprmUtils.addSprm((short)0x6427, brc, null, sprmList);
-    }
-    if (!newPAP.getBrcTop().equals(oldPAP.getBrcTop()))
-    {
-      // sprmPBrcTop80 
-      int brc = newPAP.getBrcTop().toInt();
-      size += SprmUtils.addSprm((short)0x6424, brc, null, sprmList);
-    }
-    if (newPAP.getFNoAutoHyph() != oldPAP.getFNoAutoHyph())
-    {
-      size += SprmUtils.addSprm((short)0x242A, newPAP.getFNoAutoHyph(), sprmList);
-    }
-    if (newPAP.getDyaHeight() != oldPAP.getDyaHeight() ||
-            newPAP.getFMinHeight() != oldPAP.getFMinHeight())
-    {
-      // sprmPWHeightAbs
-      short val = (short)newPAP.getDyaHeight();
-      if (newPAP.getFMinHeight())
-      {
-        val |= 0x8000;
-      }
-      size += SprmUtils.addSprm((short)0x442B, val, null, sprmList);
-    }
-    if (newPAP.getDcs() != null && !newPAP.getDcs().equals(oldPAP.getDcs()))
-    {
-      // sprmPDcs 
-      size += SprmUtils.addSprm((short)0x442C, newPAP.getDcs().toShort(), null, sprmList);
-    }
-    if (newPAP.getDyaFromText() != oldPAP.getDyaFromText())
-    {
-      // sprmPDyaFromText
-      size += SprmUtils.addSprm((short)0x842E, newPAP.getDyaFromText(), null, sprmList);
-    }
-    if (newPAP.getDxaFromText() != oldPAP.getDxaFromText())
-    {
-      // sprmPDxaFromText
-      size += SprmUtils.addSprm((short)0x842F, newPAP.getDxaFromText(), null, sprmList);
-    }
-    if (newPAP.getFLocked() != oldPAP.getFLocked())
-    {
-      // sprmPFLocked
-      size += SprmUtils.addSprm((short)0x2430, newPAP.getFLocked(), sprmList);
-    }
-    if (newPAP.getFWidowControl() != oldPAP.getFWidowControl())
-    {
-      // sprmPFWidowControl
-      size += SprmUtils.addSprm((short)0x2431, newPAP.getFWidowControl(), sprmList);
-    }
-    if (newPAP.getFKinsoku() != oldPAP.getFKinsoku())
-    {
-      size += SprmUtils.addSprm((short)0x2433, newPAP.getDyaBefore(), null, sprmList);
-    }
-    if (newPAP.getFWordWrap() != oldPAP.getFWordWrap())
-    {
-      size += SprmUtils.addSprm((short)0x2434, newPAP.getFWordWrap(), sprmList);
-    }
-    if (newPAP.getFOverflowPunct() != oldPAP.getFOverflowPunct())
-    {
-      size += SprmUtils.addSprm((short)0x2435, newPAP.getFOverflowPunct(), sprmList);
-    }
-    if (newPAP.getFTopLinePunct() != oldPAP.getFTopLinePunct())
-    {
-      size += SprmUtils.addSprm((short)0x2436, newPAP.getFTopLinePunct(), sprmList);
-    }
-    if (newPAP.getFAutoSpaceDE() != oldPAP.getFAutoSpaceDE())
-    {
-      size += SprmUtils.addSprm((short)0x2437, newPAP.getFAutoSpaceDE(), sprmList);
-    }
-    if (newPAP.getFAutoSpaceDN() != oldPAP.getFAutoSpaceDN())
-    {
-      size += SprmUtils.addSprm((short)0x2438, newPAP.getFAutoSpaceDN(), sprmList);
-    }
-    if (newPAP.getWAlignFont() != oldPAP.getWAlignFont())
-    {
-      size += SprmUtils.addSprm((short)0x4439, newPAP.getWAlignFont(), null, sprmList);
-    }
-
-    // Page 54 of public specification begins
-    if (newPAP.isFBackward() != oldPAP.isFBackward() ||
-        newPAP.isFVertical() != oldPAP.isFVertical() ||
-        newPAP.isFRotateFont() != oldPAP.isFRotateFont())
-    {
-      int val = 0;
-      if (newPAP.isFBackward())
-      {
-        val |= 0x2;
-      }
-      if (newPAP.isFVertical())
-      {
-        val |= 0x1;
-      }
-      if (newPAP.isFRotateFont())
-      {
-        val |= 0x4;
-      }
-      size += SprmUtils.addSprm((short)0x443A, val, null, sprmList);
-    }
-    if (!Arrays.equals(newPAP.getAnld(), oldPAP.getAnld()))
-    {
-      // sprmPAnld80 
-      size += SprmUtils.addSprm((short)0xC63E, 0, newPAP.getAnld(), sprmList);
-    }
-    if (newPAP.getFPropRMark() != oldPAP.getFPropRMark() ||
-            newPAP.getIbstPropRMark() != oldPAP.getIbstPropRMark() ||
-            !newPAP.getDttmPropRMark().equals(oldPAP.getDttmPropRMark()))
-    {
-      // sprmPPropRMark
-      byte[] buf = new byte[7];
-      buf[0] = (byte) ( newPAP.getFPropRMark() ? 1 : 0 );
-      LittleEndian.putShort(buf, 1, (short)newPAP.getIbstPropRMark());
-      newPAP.getDttmPropRMark().serialize(buf, 3);
-      size += SprmUtils.addSprm((short)0xC63F, 0, buf, sprmList);
-    }
-    if (newPAP.getLvl() != oldPAP.getLvl())
-    {
-      // sprmPOutLvl 
-      size += SprmUtils.addSprm((short)0x2640, newPAP.getLvl(), null, sprmList);
-    }
-    if (newPAP.getFBiDi() != oldPAP.getFBiDi())
-    {
-      // sprmPFBiDi 
-      size += SprmUtils.addSprm((short)0x2441, newPAP.getFBiDi(), sprmList);
-    }
-    if (newPAP.getFNumRMIns() != oldPAP.getFNumRMIns())
-    {
-      // sprmPFNumRMIns 
-      size += SprmUtils.addSprm((short)0x2443, newPAP.getFNumRMIns(), sprmList);
-    }
-    if (!Arrays.equals(newPAP.getNumrm(), oldPAP.getNumrm()))
-    {
-      // sprmPNumRM
-      size += SprmUtils.addSprm((short)0xC645, 0, newPAP.getNumrm(), sprmList);
-    }
-    if (newPAP.getFInnerTableCell() != oldPAP.getFInnerTableCell())
-    {
-      // sprmPFInnerTableCell
-      size += SprmUtils.addSprm((short)0x244b, newPAP.getFInnerTableCell(), sprmList);
-    }
-    if (newPAP.getFTtpEmbedded() != oldPAP.getFTtpEmbedded())
-    {
-      // sprmPFInnerTtp 
-      size += SprmUtils.addSprm((short)0x244c, newPAP.getFTtpEmbedded(), sprmList);
-    }
-
-    if (newPAP.getShd() != null && !newPAP.getShd().equals(oldPAP.getShd()))
-    {
-        // size += SprmUtils.addSprm((short)0x442D, newPAP.getShd().toShort(), null, sprmList);
-        // sprmPShd  -- 0xc64d 
-        size += SprmUtils.addSprm( (short) 0xc64d, 0, newPAP.getShd().serialize(), sprmList );
-    }
-
-    // Page 55 of public specification begins
-    if (newPAP.getItap() != oldPAP.getItap())
-    {
-      // sprmPItap
-      size += SprmUtils.addSprm((short)0x6649, newPAP.getItap(), null, sprmList);
-    }
-
-        if ( newPAP.getRsid() != oldPAP.getRsid() )
-        {
-            // sprmPRsid
-            byte[] value = new byte[4];
-            LittleEndian.putUInt( value, 0, newPAP.getRsid() );
-            size += SprmUtils.addSprm( (short) 0x6467, 0, value, sprmList );
-        }
-
-    return SprmUtils.getGrpprl(sprmList, size);
-
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
deleted file mode 100644
index 6634aa4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hwpf.model.TabDescriptor;
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.DateAndTime;
-import org.apache.poi.hwpf.usermodel.DropCapSpecifier;
-import org.apache.poi.hwpf.usermodel.LineSpacingDescriptor;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
-import org.apache.poi.hwpf.usermodel.ShadingDescriptor80;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-public final class ParagraphSprmUncompressor
-  extends SprmUncompressor
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( ParagraphSprmUncompressor.class );
-
-  public ParagraphSprmUncompressor()
-  {
-  }
-
-  public static ParagraphProperties uncompressPAP(ParagraphProperties parent,
-                                                  byte[] grpprl,
-                                                  int offset)
-  {
-    ParagraphProperties newProperties = null;
-    try
-    {
-      newProperties = (ParagraphProperties) parent.clone();
-    }
-    catch (CloneNotSupportedException cnse)
-    {
-      throw new RuntimeException("There is no way this exception should happen!!");
-    }
-    SprmIterator sprmIt = new SprmIterator(grpprl, offset);
-
-    while (sprmIt.hasNext())
-    {
-      SprmOperation sprm = sprmIt.next();
-
-      // PAPXs can contain table sprms if the paragraph marks the end of a
-      // table row
-      if (sprm.getType() == SprmOperation.TYPE_PAP)
-      {
-          try
-          {
-              unCompressPAPOperation( newProperties, sprm );
-          }
-          catch ( Exception exc )
-          {
-              logger.log(
-                      POILogger.ERROR,
-                      "Unable to apply SPRM operation '"
-                              + sprm.getOperation() + "': ", exc );
-          }
-      }
-    }
-
-    return newProperties;
-  }
-
-  /**
-   * Performs an operation on a ParagraphProperties object. Used to uncompress
-   * from a papx.
-   *
-   * @param newPAP The ParagraphProperties object to perform the operation on.
-   * @param operand The operand that defines the operation.
-   * @param param The operation's parameter.
-   * @param varParam The operation's variable length parameter.
-   * @param grpprl The original papx.
-   * @param offset The current offset in the papx.
-   * @param spra A part of the sprm that defined this operation.
-   */
-  static void unCompressPAPOperation (ParagraphProperties newPAP, SprmOperation sprm)
-  {
-    switch (sprm.getOperation())
-    {
-      case 0:
-        newPAP.setIstd (sprm.getOperand());
-        break;
-      case 0x1:
-
-        // Used only for piece table grpprl's not for PAPX
-//        int istdFirst = LittleEndian.getShort (varParam, 2);
-//        int istdLast = LittleEndian.getShort (varParam, 4);
-//        if ((newPAP.getIstd () > istdFirst) || (newPAP.getIstd () <= istdLast))
-//        {
-//          permuteIstd (newPAP, varParam, opSize);
-//        }
-        break;
-      case 0x2:
-        if (newPAP.getIstd () <= 9 || newPAP.getIstd () >= 1)
-        {
-          byte paramTmp = (byte) sprm.getOperand();
-          newPAP.setIstd (newPAP.getIstd () + paramTmp);
-          newPAP.setLvl ((byte) (newPAP.getLvl () + paramTmp));
-
-          if (((paramTmp >> 7) & 0x01) == 1)
-          {
-            newPAP.setIstd (Math.max (newPAP.getIstd (), 1));
-          }
-          else
-          {
-            newPAP.setIstd (Math.min (newPAP.getIstd (), 9));
-          }
-
-        }
-        break;
-      case 0x3:
-        // Physical justification of the paragraph
-        newPAP.setJc ((byte) sprm.getOperand());
-        break;
-      case 0x4:
-        newPAP.setFSideBySide (sprm.getOperand() != 0);
-        break;
-      case 0x5:
-        newPAP.setFKeep (sprm.getOperand() != 0);
-        break;
-      case 0x6:
-        newPAP.setFKeepFollow (sprm.getOperand() != 0);
-        break;
-      case 0x7:
-        newPAP.setFPageBreakBefore (sprm.getOperand() != 0);
-        break;
-      case 0x8:
-        newPAP.setBrcl ((byte) sprm.getOperand());
-        break;
-      case 0x9:
-        newPAP.setBrcp ((byte) sprm.getOperand());
-        break;
-      case 0xa:
-        newPAP.setIlvl ((byte) sprm.getOperand());
-        break;
-        case 0xb:
-            /* sprmPIlfo -- 0x460B */
-            newPAP.setIlfo( sprm.getOperandShortSigned() );
-            break;
-      case 0xc:
-        newPAP.setFNoLnn (sprm.getOperand() != 0);
-        break;
-      case 0xd:
-        /**handle tabs . variable parameter. seperate processing needed*/
-        handleTabs(newPAP, sprm);
-        break;
-      case 0xe:
-        newPAP.setDxaRight (sprm.getOperand());
-        break;
-      case 0xf:
-        newPAP.setDxaLeft (sprm.getOperand());
-        break;
-      case 0x10:
-
-        // sprmPNest is only stored in grpprls linked to a piece table.
-        newPAP.setDxaLeft (newPAP.getDxaLeft () + sprm.getOperand());
-        newPAP.setDxaLeft (Math.max (0, newPAP.getDxaLeft ()));
-        break;
-      case 0x11:
-        newPAP.setDxaLeft1 (sprm.getOperand());
-        break;
-      case 0x12:
-        newPAP.setLspd(new LineSpacingDescriptor(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x13:
-        newPAP.setDyaBefore (sprm.getOperand());
-        break;
-      case 0x14:
-        newPAP.setDyaAfter (sprm.getOperand());
-        break;
-      case 0x15:
-        // fast saved only
-        //applySprmPChgTabs (newPAP, varParam, opSize);
-        break;
-        case 0x16:
-            // sprmPFInTable -- 0x2416
-            newPAP.setFInTable( sprm.getOperand()  != 0);
-            break;
-      case 0x17:
-        newPAP.setFTtp ( sprm.getOperand() != 0);
-        break;
-      case 0x18:
-        newPAP.setDxaAbs (sprm.getOperand());
-        break;
-      case 0x19:
-        newPAP.setDyaAbs (sprm.getOperand());
-        break;
-      case 0x1a:
-        newPAP.setDxaWidth (sprm.getOperand());
-        break;
-      case 0x1b:
-        byte param = (byte)sprm.getOperand();
-        /** @todo handle paragraph postioning*/
-        byte pcVert = (byte) ((param & 0x0c) >> 2);
-        byte pcHorz = (byte) (param & 0x03);
-        if (pcVert != 3)
-        {
-          newPAP.setPcVert (pcVert);
-        }
-        if (pcHorz != 3)
-        {
-          newPAP.setPcHorz (pcHorz);
-        }
-        break;
-
-        // BrcXXX1 is older Version. Brc is used
-        // case 0x1c:
-        // newPAP.setBrcTop1((short)param);
-        // break;
-        // case 0x1d:
-        // newPAP.setBrcLeft1((short)param);
-        // break;
-        // case 0x1e:
-        // newPAP.setBrcBottom1((short)param);
-        // break;
-        // case 0x1f:
-        // newPAP.setBrcRight1((short)param);
-        // break;
-        // case 0x20:
-        // newPAP.setBrcBetween1((short)param);
-        // break;
-        // case 0x21:
-        // newPAP.setBrcBar1((byte)param);
-        // break;
-
-      case 0x22:
-        newPAP.setDxaFromText (sprm.getOperand());
-        break;
-      case 0x23:
-        newPAP.setWr((byte)sprm.getOperand());
-        break;
-      case 0x24:
-        newPAP.setBrcTop(new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x25:
-        newPAP.setBrcLeft(new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x26:
-        newPAP.setBrcBottom (new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x27:
-        newPAP.setBrcRight (new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x28:
-        newPAP.setBrcBetween (new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x29:
-        newPAP.setBrcBar (new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x2a:
-        newPAP.setFNoAutoHyph (sprm.getOperand() != 0);
-        break;
-      case 0x2b:
-        newPAP.setDyaHeight (sprm.getOperand());
-        break;
-      case 0x2c:
-        newPAP.setDcs (new DropCapSpecifier((short)sprm.getOperand()));
-        break;
-        case 0x2d:
-            newPAP.setShd( new ShadingDescriptor80( (short) sprm.getOperand() )
-                    .toShadingDescriptor() );
-            break;
-      case 0x2e:
-        newPAP.setDyaFromText (sprm.getOperand());
-        break;
-      case 0x2f:
-        newPAP.setDxaFromText (sprm.getOperand());
-        break;
-      case 0x30:
-        newPAP.setFLocked (sprm.getOperand() != 0);
-        break;
-      case 0x31:
-        newPAP.setFWidowControl (sprm.getOperand() != 0);
-        break;
-      case 0x33:
-        newPAP.setFKinsoku (sprm.getOperand() != 0);
-        break;
-      case 0x34:
-        newPAP.setFWordWrap (sprm.getOperand() != 0);
-        break;
-      case 0x35:
-        newPAP.setFOverflowPunct (sprm.getOperand() != 0);
-        break;
-      case 0x36:
-        newPAP.setFTopLinePunct (sprm.getOperand() != 0);
-        break;
-      case 0x37:
-        newPAP.setFAutoSpaceDE (sprm.getOperand() != 0);
-        break;
-      case 0x38:
-        newPAP.setFAutoSpaceDN (sprm.getOperand() != 0);
-        break;
-      case 0x39:
-        newPAP.setWAlignFont (sprm.getOperand());
-        break;
-      case 0x3a:
-        newPAP.setFontAlign ((short) sprm.getOperand());
-        break;
-      case 0x3b:
-        //obsolete
-        break;
-      case 0x3e:
-      {
-        byte[] buf = new byte[sprm.size() - 3];
-        System.arraycopy(buf, 0, sprm.getGrpprl(), sprm.getGrpprlOffset(),
-                         buf.length);
-        newPAP.setAnld(buf);
-        break;
-      }
-      case 0x3f:
-        //don't really need this. spec is confusing regarding this
-        //sprm
-          byte[] varParam = sprm.getGrpprl();
-          int offset = sprm.getGrpprlOffset();
-          newPAP.setFPropRMark (varParam[offset]  != 0 );
-          newPAP.setIbstPropRMark (LittleEndian.getShort (varParam, offset + 1));
-          newPAP.setDttmPropRMark (new DateAndTime(varParam, offset + 3));
-        break;
-      case 0x40:
-        // This condition commented out, as Word seems to set outline levels even for 
-        //  paragraph with other styles than Heading 1..9, even though specification 
-        //  does not say so. See bug 49820 for discussion.
-        //if (newPAP.getIstd () < 1 && newPAP.getIstd () > 9)
-        {
-          newPAP.setLvl ((byte) sprm.getOperand());
-        }
-        break;
-      case 0x41:
-        // sprmPFBiDi 
-        newPAP.setFBiDi(sprm.getOperand() != 0);
-        break;
-      case 0x43:
-
-        //pap.fNumRMIns
-        newPAP.setFNumRMIns (sprm.getOperand() != 0);
-        break;
-      case 0x44:
-
-        //undocumented
-        break;
-      case 0x45:
-        if (sprm.getSizeCode() == 6)
-        {
-          byte[] buf = new byte[sprm.size() - 3];
-          System.arraycopy(buf, 0, sprm.getGrpprl(), sprm.getGrpprlOffset(), buf.length);
-          newPAP.setNumrm (buf);
-        }
-        else
-        {
-          /**@todo handle large PAPX from data stream*/
-        }
-        break;
-
-      case 0x47:
-        newPAP.setFUsePgsuSettings (sprm.getOperand() != 0);
-        break;
-      case 0x48:
-        newPAP.setFAdjustRight (sprm.getOperand() != 0);
-        break;
-        case 0x49:
-            // sprmPItap -- 0x6649
-            newPAP.setItap( sprm.getOperand() );
-            break;
-        case 0x4a:
-            // sprmPDtap -- 0x664a
-            newPAP.setItap( (byte) ( newPAP.getItap() + sprm.getOperand() ) );
-            break;
-        case 0x4b:
-            // sprmPFInnerTableCell -- 0x244b
-            newPAP.setFInnerTableCell( sprm.getOperand()  != 0);
-            break;
-        case 0x4c:
-            // sprmPFInnerTtp -- 0x244c
-            newPAP.setFTtpEmbedded( sprm.getOperand()  != 0);
-            break;
-        case 0x4d:
-            // sprmPShd -- 0xc64d
-            ShadingDescriptor shadingDescriptor = new ShadingDescriptor(
-                    sprm.getGrpprl(), 3 );
-            newPAP.setShading( shadingDescriptor );
-            break;
-        case 0x5d:
-            // sprmPDxaRight -- 0x845d
-            newPAP.setDxaRight( sprm.getOperand() );
-            break;
-        case 0x5e:
-            // sprmPDxaLeft -- 0x845e
-            newPAP.setDxaLeft( sprm.getOperand() );
-            break;
-        case 0x60:
-            // sprmPDxaLeft1 -- 0x8460
-            newPAP.setDxaLeft1( sprm.getOperand() );
-            break;
-      case 0x61:
-        // sprmPJc 
-        newPAP.setJustificationLogical((byte) sprm.getOperand());
-        break;
-      case 0x67:
-          // sprmPRsid -- 0x6467 
-          newPAP.setRsid( sprm.getOperand() );
-          break;
-        default:
-            logger.log( POILogger.DEBUG, "Unknown PAP sprm ignored: " + sprm );
-            break;
-        }
-  }
-
-  private static void handleTabs(ParagraphProperties pap, SprmOperation sprm)
-  {
-    byte[] grpprl = sprm.getGrpprl();
-    int offset = sprm.getGrpprlOffset();
-    int delSize = grpprl[offset++];
-    int[] tabPositions = pap.getRgdxaTab();
-    TabDescriptor[] tabDescriptors = pap.getRgtbd();
-
-    Map<Integer, TabDescriptor> tabMap = new HashMap<Integer, TabDescriptor>();
-    for (int x = 0; x < tabPositions.length; x++)
-    {
-      tabMap.put(Integer.valueOf(tabPositions[x]), tabDescriptors[x]);
-    }
-
-    for (int x = 0; x < delSize; x++)
-    {
-      tabMap.remove(Integer.valueOf(LittleEndian.getShort(grpprl, offset)));
-      offset += LittleEndian.SHORT_SIZE;
-    }
-
-    int addSize = grpprl[offset++];
-    int start = offset;
-    for (int x = 0; x < addSize; x++)
-    {
-      Integer key = Integer.valueOf(LittleEndian.getShort(grpprl, offset));
-      TabDescriptor val = new TabDescriptor( grpprl, start + ((TabDescriptor.getSize() * addSize) + x) );
-      tabMap.put(key, val);
-      offset += LittleEndian.SHORT_SIZE;
-    }
-
-    tabPositions = new int[tabMap.size()];
-    tabDescriptors = new TabDescriptor[tabPositions.length];
-    
-    List<Integer> list = new ArrayList<Integer>(tabMap.keySet());
-    Collections.sort(list);
-
-    for (int x = 0; x < tabPositions.length; x++)
-    {
-      Integer key = list.get(x);
-      tabPositions[x] = key.intValue();
-      if (tabMap.containsKey( key ))
-          tabDescriptors[x] = tabMap.get(key);
-      else
-          tabDescriptors[x] = new TabDescriptor();
-    }
-
-    pap.setRgdxaTab(tabPositions);
-    pap.setRgtbd(tabDescriptors);
-  }
-
-//  private static void handleTabsAgain(ParagraphProperties pap, SprmOperation sprm)
-//  {
-//    byte[] grpprl = sprm.getGrpprl();
-//    int offset = sprm.getGrpprlOffset();
-//    int delSize = grpprl[offset++];
-//    int[] tabPositions = pap.getRgdxaTab();
-//    byte[] tabDescriptors = pap.getRgtbd();
-//
-//    HashMap tabMap = new HashMap();
-//    for (int x = 0; x < tabPositions.length; x++)
-//    {
-//      tabMap.put(Integer.valueOf(tabPositions[x]), Byte.valueOf(tabDescriptors[x]));
-//    }
-//
-//    for (int x = 0; x < delSize; x++)
-//    {
-//      tabMap.remove(Integer.valueOf(LittleEndian.getInt(grpprl, offset)));
-//      offset += LittleEndian.INT_SIZE;;
-//    }
-//
-//    int addSize = grpprl[offset++];
-//    for (int x = 0; x < addSize; x++)
-//    {
-//      Integer key = Integer.valueOf(LittleEndian.getInt(grpprl, offset));
-//      Byte val = Byte.valueOf(grpprl[(LittleEndian.INT_SIZE * (addSize - x)) + x]);
-//      tabMap.put(key, val);
-//      offset += LittleEndian.INT_SIZE;
-//    }
-//
-//    tabPositions = new int[tabMap.size()];
-//    tabDescriptors = new byte[tabPositions.length];
-//    ArrayList list = new ArrayList();
-//
-//    Iterator keyIT = tabMap.keySet().iterator();
-//    while (keyIT.hasNext())
-//    {
-//      list.add(keyIT.next());
-//    }
-//    Collections.sort(list);
-//
-//    for (int x = 0; x < tabPositions.length; x++)
-//    {
-//      Integer key = ((Integer)list.get(x));
-//      tabPositions[x] = key.intValue();
-//      tabDescriptors[x] = ((Byte)tabMap.get(key)).byteValue();
-//    }
-//
-//    pap.setRgdxaTab(tabPositions);
-//    pap.setRgtbd(tabDescriptors);
-//  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
deleted file mode 100644
index 8d20a74..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ====================================================================
-     Licensed to the Apache Software Foundation (ASF) under one or more
-     contributor license agreements.    See the NOTICE file distributed with
-     this work for additional information regarding copyright ownership.
-     The ASF licenses this file to You under the Apache License, Version 2.0
-     (the "License"); you may not use this file except in compliance with
-     the License.    You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.hwpf.usermodel.SectionProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class SectionSprmCompressor
-{
-    private final static SectionProperties DEFAULT_SEP = new SectionProperties();
-    public SectionSprmCompressor()
-    {
-    }
-    public static byte[] compressSectionProperty(SectionProperties newSEP)
-    {
-        int size = 0;
-        List<byte[]> sprmList = new ArrayList<byte[]>();
-
-        if (newSEP.getCnsPgn() != DEFAULT_SEP.getCnsPgn())
-        {
-            size += SprmUtils.addSprm((short)0x3000, newSEP.getCnsPgn(), null, sprmList);
-        }
-        if (newSEP.getIHeadingPgn() != DEFAULT_SEP.getIHeadingPgn())
-        {
-            size += SprmUtils.addSprm((short)0x3001, newSEP.getIHeadingPgn(), null, sprmList);
-        }
-        if (!Arrays.equals(newSEP.getOlstAnm(), DEFAULT_SEP.getOlstAnm()))
-        {
-            size += SprmUtils.addSprm((short)0xD202, 0, newSEP.getOlstAnm(), sprmList);
-        }
-        if (newSEP.getFEvenlySpaced() != DEFAULT_SEP.getFEvenlySpaced())
-        {
-            size += SprmUtils.addSprm((short)0x3005, newSEP.getFEvenlySpaced() ? 1 : 0, null, sprmList);
-        }
-        if (newSEP.getFUnlocked() != DEFAULT_SEP.getFUnlocked())
-        {
-            size += SprmUtils.addSprm((short)0x3006, newSEP.getFUnlocked() ? 1 :0, null, sprmList);
-        }
-        if (newSEP.getDmBinFirst() != DEFAULT_SEP.getDmBinFirst())
-        {
-            size += SprmUtils.addSprm((short)0x5007, newSEP.getDmBinFirst(), null, sprmList);
-        }
-        if (newSEP.getDmBinOther() != DEFAULT_SEP.getDmBinOther())
-        {
-            size += SprmUtils.addSprm((short)0x5008, newSEP.getDmBinOther(), null, sprmList);
-        }
-        if (newSEP.getBkc() != DEFAULT_SEP.getBkc())
-        {
-            size += SprmUtils.addSprm((short)0x3009, newSEP.getBkc(), null, sprmList);
-        }
-        if (newSEP.getFTitlePage() != DEFAULT_SEP.getFTitlePage())
-        {
-            size += SprmUtils.addSprm((short)0x300A, newSEP.getFTitlePage() ? 1 : 0, null, sprmList);
-        }
-        if (newSEP.getCcolM1() != DEFAULT_SEP.getCcolM1())
-        {
-            size += SprmUtils.addSprm((short)0x500B, newSEP.getCcolM1(), null, sprmList);
-        }
-        if (newSEP.getDxaColumns() != DEFAULT_SEP.getDxaColumns())
-        {
-            size += SprmUtils.addSprm((short)0x900C, newSEP.getDxaColumns(), null, sprmList);
-        }
-        if (newSEP.getFAutoPgn() != DEFAULT_SEP.getFAutoPgn())
-        {
-            size += SprmUtils.addSprm((short)0x300D, newSEP.getFAutoPgn() ? 1 : 0, null, sprmList);
-        }
-        if (newSEP.getNfcPgn() != DEFAULT_SEP.getNfcPgn())
-        {
-            size += SprmUtils.addSprm((short)0x300E, newSEP.getNfcPgn(), null, sprmList);
-        }
-        if (newSEP.getDyaPgn() != DEFAULT_SEP.getDyaPgn())
-        {
-            size += SprmUtils.addSprm((short)0xB00F, newSEP.getDyaPgn(), null, sprmList);
-        }
-        if (newSEP.getDxaPgn() != DEFAULT_SEP.getDxaPgn())
-        {
-            size += SprmUtils.addSprm((short)0xB010, newSEP.getDxaPgn(), null, sprmList);
-        }
-        if (newSEP.getFPgnRestart() != DEFAULT_SEP.getFPgnRestart())
-        {
-            size += SprmUtils.addSprm((short)0x3011, newSEP.getFPgnRestart() ? 1 : 0, null, sprmList);
-        }
-        if (newSEP.getFEndNote() != DEFAULT_SEP.getFEndNote())
-        {
-            size += SprmUtils.addSprm((short)0x3012, newSEP.getFEndNote() ? 1 : 0, null, sprmList);
-        }
-        if (newSEP.getLnc() != DEFAULT_SEP.getLnc())
-        {
-            size += SprmUtils.addSprm((short)0x3013, newSEP.getLnc(), null, sprmList);
-        }
-        if (newSEP.getGrpfIhdt() != DEFAULT_SEP.getGrpfIhdt())
-        {
-            size += SprmUtils.addSprm((short)0x3014, newSEP.getGrpfIhdt(), null, sprmList);
-        }
-        if (newSEP.getNLnnMod() != DEFAULT_SEP.getNLnnMod())
-        {
-            size += SprmUtils.addSprm((short)0x5015, newSEP.getNLnnMod(), null, sprmList);
-        }
-        if (newSEP.getDxaLnn() != DEFAULT_SEP.getDxaLnn())
-        {
-            size += SprmUtils.addSprm((short)0x9016, newSEP.getDxaLnn(), null, sprmList);
-        }
-        if (newSEP.getDyaHdrTop() != DEFAULT_SEP.getDyaHdrTop())
-        {
-            size += SprmUtils.addSprm((short)0xB017, newSEP.getDyaHdrTop(), null, sprmList);
-        }
-        if (newSEP.getDyaHdrBottom() != DEFAULT_SEP.getDyaHdrBottom())
-        {
-            size += SprmUtils.addSprm((short)0xB018, newSEP.getDyaHdrBottom(), null, sprmList);
-        }
-        if (newSEP.getFLBetween() != DEFAULT_SEP.getFLBetween())
-        {
-            size += SprmUtils.addSprm((short)0x3019, newSEP.getFLBetween() ? 1 : 0, null, sprmList);
-        }
-        if (newSEP.getVjc() != DEFAULT_SEP.getVjc())
-        {
-            size += SprmUtils.addSprm((short)0x301A, newSEP.getVjc(), null, sprmList);
-        }
-        if (newSEP.getLnnMin() != DEFAULT_SEP.getLnnMin())
-        {
-            size += SprmUtils.addSprm((short)0x501B, newSEP.getLnnMin(), null, sprmList);
-        }
-        if (newSEP.getPgnStart() != DEFAULT_SEP.getPgnStart())
-        {
-            size += SprmUtils.addSprm((short)0x501C, newSEP.getPgnStart(), null, sprmList);
-        }
-        if (newSEP.getDmOrientPage() != DEFAULT_SEP.getDmOrientPage())
-        {
-            size += SprmUtils.addSprm((short)0x301D, newSEP.getDmOrientPage() ? 1 : 0, null, sprmList);
-        }
-        if (newSEP.getXaPage() != DEFAULT_SEP.getXaPage())
-        {
-            size += SprmUtils.addSprm((short)0xB01F, newSEP.getXaPage(), null, sprmList);
-        }
-        if (newSEP.getYaPage() != DEFAULT_SEP.getYaPage())
-        {
-            size += SprmUtils.addSprm((short)0xB020, newSEP.getYaPage(), null, sprmList);
-        }
-        if (newSEP.getDxaLeft() != DEFAULT_SEP.getDxaLeft())
-        {
-            size += SprmUtils.addSprm((short)0xB021, newSEP.getDxaLeft(), null, sprmList);
-        }
-        if (newSEP.getDxaRight() != DEFAULT_SEP.getDxaRight())
-        {
-            size += SprmUtils.addSprm((short)0xB022, newSEP.getDxaRight(), null, sprmList);
-        }
-        if (newSEP.getDyaTop() != DEFAULT_SEP.getDyaTop())
-        {
-            size += SprmUtils.addSprm((short)0x9023, newSEP.getDyaTop(), null, sprmList);
-        }
-        if (newSEP.getDyaBottom() != DEFAULT_SEP.getDyaBottom())
-        {
-            size += SprmUtils.addSprm((short)0x9024, newSEP.getDyaBottom(), null, sprmList);
-        }
-        if (newSEP.getDzaGutter() != DEFAULT_SEP.getDzaGutter())
-        {
-            size += SprmUtils.addSprm((short)0xB025, newSEP.getDzaGutter(), null, sprmList);
-        }
-        if (newSEP.getDmPaperReq() != DEFAULT_SEP.getDmPaperReq())
-        {
-            size += SprmUtils.addSprm((short)0x5026, newSEP.getDmPaperReq(), null, sprmList);
-        }
-        if (newSEP.getFPropMark() != DEFAULT_SEP.getFPropMark() ||
-                newSEP.getIbstPropRMark() != DEFAULT_SEP.getIbstPropRMark() ||
-                !newSEP.getDttmPropRMark().equals(DEFAULT_SEP.getDttmPropRMark()))
-        {
-            byte[] buf = new byte[7];
-            buf[0] = (byte)(newSEP.getFPropMark() ? 1 : 0);
-            int offset = LittleEndian.BYTE_SIZE;
-            LittleEndian.putShort(buf, 0, (short)newSEP.getIbstPropRMark());
-            offset += LittleEndian.SHORT_SIZE;
-            newSEP.getDttmPropRMark().serialize(buf, offset);
-            size += SprmUtils.addSprm((short)0xD227, -1, buf, sprmList);
-        }
-        if (!newSEP.getBrcTop().equals( DEFAULT_SEP.getBrcTop()))
-        {
-            size += SprmUtils.addSprm((short)0x702B, newSEP.getBrcTop().toInt(), null, sprmList);
-        }
-        if (!newSEP.getBrcLeft().equals(DEFAULT_SEP.getBrcLeft()))
-        {
-            size += SprmUtils.addSprm((short)0x702C, newSEP.getBrcLeft().toInt(), null, sprmList);
-        }
-        if (!newSEP.getBrcBottom().equals(DEFAULT_SEP.getBrcBottom()))
-        {
-            size += SprmUtils.addSprm((short)0x702D, newSEP.getBrcBottom().toInt(), null, sprmList);
-        }
-        if (!newSEP.getBrcRight().equals(DEFAULT_SEP.getBrcRight()))
-        {
-            size += SprmUtils.addSprm((short)0x702E, newSEP.getBrcRight().toInt(), null, sprmList);
-        }
-        if (newSEP.getPgbProp() != DEFAULT_SEP.getPgbProp())
-        {
-            size += SprmUtils.addSprm((short)0x522F, newSEP.getPgbProp(), null, sprmList);
-        }
-        if (newSEP.getDxtCharSpace() != DEFAULT_SEP.getDxtCharSpace())
-        {
-            size += SprmUtils.addSprm((short)0x7030, newSEP.getDxtCharSpace(), null, sprmList);
-        }
-        if (newSEP.getDyaLinePitch() != DEFAULT_SEP.getDyaLinePitch())
-        {
-            size += SprmUtils.addSprm((short)0x9031, newSEP.getDyaLinePitch(), null, sprmList);
-        }
-        if (newSEP.getClm() != DEFAULT_SEP.getClm())
-        {
-            size += SprmUtils.addSprm((short)0x5032, newSEP.getClm(), null, sprmList);
-        }
-        if (newSEP.getWTextFlow() != DEFAULT_SEP.getWTextFlow())
-        {
-            size += SprmUtils.addSprm((short)0x5033, newSEP.getWTextFlow(), null, sprmList);
-        }
-
-        return SprmUtils.getGrpprl(sprmList, size);
-    }
-}
-
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
deleted file mode 100644
index 0b186b5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.SectionProperties;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-
-@Internal
-public final class SectionSprmUncompressor extends SprmUncompressor
-{
-  private static final POILogger logger = POILogFactory.getLogger(SectionSprmUncompressor.class);
-
-  public SectionSprmUncompressor()
-  {
-  }
-  public static SectionProperties uncompressSEP(byte[] grpprl, int offset)
-  {
-    SectionProperties newProperties = new SectionProperties();
-
-    SprmIterator sprmIt = new SprmIterator(grpprl, offset);
-
-    while (sprmIt.hasNext())
-    {
-      SprmOperation sprm = sprmIt.next();
-      unCompressSEPOperation(newProperties, sprm);
-    }
-
-    return newProperties;
-  }
-
-  /**
-   * Used in decompression of a sepx. This performs an operation defined by
-   * a single sprm.
-   *
-   * @param newSEP The SectionProperty to perform the operation on.
-   * @param operand The operation to perform.
-   * @param param The operation's parameter.
-   * @param varParam The operation variable length parameter.
-   */
-  static void unCompressSEPOperation (SectionProperties newSEP, SprmOperation sprm)
-  {
-    int operation = sprm.getOperation();
-    switch (operation)
-    {
-      case 0:
-        newSEP.setCnsPgn ((byte) sprm.getOperand());
-        break;
-      case 0x1:
-        newSEP.setIHeadingPgn ((byte) sprm.getOperand());
-        break;
-      case 0x2:
-        byte[] buf = new byte[sprm.size() - 3];
-        System.arraycopy(sprm.getGrpprl(), sprm.getGrpprlOffset(), buf, 0, buf.length);
-        newSEP.setOlstAnm (buf);
-        break;
-      case 0x3:
-        //not quite sure
-        break;
-      case 0x4:
-        //not quite sure
-        break;
-      case 0x5:
-        newSEP.setFEvenlySpaced (getFlag (sprm.getOperand()));
-        break;
-      case 0x6:
-        newSEP.setFUnlocked (getFlag (sprm.getOperand()));
-        break;
-      case 0x7:
-        newSEP.setDmBinFirst ((short) sprm.getOperand());
-        break;
-      case 0x8:
-        newSEP.setDmBinOther ((short) sprm.getOperand());
-        break;
-      case 0x9:
-        newSEP.setBkc ((byte) sprm.getOperand());
-        break;
-      case 0xa:
-        newSEP.setFTitlePage (getFlag (sprm.getOperand()));
-        break;
-      case 0xb:
-        newSEP.setCcolM1 ((short) sprm.getOperand());
-        break;
-      case 0xc:
-        newSEP.setDxaColumns (sprm.getOperand());
-        break;
-      case 0xd:
-        newSEP.setFAutoPgn (getFlag (sprm.getOperand()));
-        break;
-      case 0xe:
-        newSEP.setNfcPgn ((byte) sprm.getOperand());
-        break;
-      case 0xf:
-        newSEP.setDyaPgn ((short) sprm.getOperand());
-        break;
-      case 0x10:
-        newSEP.setDxaPgn ((short) sprm.getOperand());
-        break;
-      case 0x11:
-        newSEP.setFPgnRestart (getFlag (sprm.getOperand()));
-        break;
-      case 0x12:
-        newSEP.setFEndNote (getFlag (sprm.getOperand()));
-        break;
-      case 0x13:
-        newSEP.setLnc ((byte) sprm.getOperand());
-        break;
-      case 0x14:
-        newSEP.setGrpfIhdt ((byte) sprm.getOperand());
-        break;
-      case 0x15:
-        newSEP.setNLnnMod ((short) sprm.getOperand());
-        break;
-      case 0x16:
-        newSEP.setDxaLnn (sprm.getOperand());
-        break;
-      case 0x17:
-        newSEP.setDyaHdrTop (sprm.getOperand());
-        break;
-      case 0x18:
-        newSEP.setDyaHdrBottom (sprm.getOperand());
-        break;
-      case 0x19:
-        newSEP.setFLBetween (getFlag (sprm.getOperand()));
-        break;
-      case 0x1a:
-        newSEP.setVjc ((byte) sprm.getOperand());
-        break;
-      case 0x1b:
-        newSEP.setLnnMin ((short) sprm.getOperand());
-        break;
-      case 0x1c:
-        newSEP.setPgnStart ((short) sprm.getOperand());
-        break;
-      case 0x1d:
-        newSEP.setDmOrientPage( sprm.getOperand() != 0 );
-        break;
-      case 0x1e:
-
-        //nothing
-        break;
-      case 0x1f:
-        newSEP.setXaPage (sprm.getOperand());
-        break;
-      case 0x20:
-        newSEP.setYaPage (sprm.getOperand());
-        break;
-      case 0x21:
-        newSEP.setDxaLeft (sprm.getOperand());
-        break;
-      case 0x22:
-        newSEP.setDxaRight (sprm.getOperand());
-        break;
-      case 0x23:
-        newSEP.setDyaTop (sprm.getOperand());
-        break;
-      case 0x24:
-        newSEP.setDyaBottom (sprm.getOperand());
-        break;
-      case 0x25:
-        newSEP.setDzaGutter (sprm.getOperand());
-        break;
-      case 0x26:
-        newSEP.setDmPaperReq ((short) sprm.getOperand());
-        break;
-      case 0x27:
-        newSEP.setFPropMark (getFlag (sprm.getOperand()));
-        break;
-      case 0x28:
-        break;
-      case 0x29:
-        break;
-      case 0x2a:
-        break;
-      case 0x2b:
-        newSEP.setBrcTop(new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x2c:
-        newSEP.setBrcLeft(new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x2d:
-        newSEP.setBrcBottom(new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x2e:
-        newSEP.setBrcRight(new BorderCode(sprm.getGrpprl(), sprm.getGrpprlOffset()));
-        break;
-      case 0x2f:
-        newSEP.setPgbProp (sprm.getOperand());
-        break;
-      case 0x30:
-        newSEP.setDxtCharSpace (sprm.getOperand());
-        break;
-      case 0x31:
-        newSEP.setDyaLinePitch (sprm.getOperand());
-        break;
-      case 0x33:
-        newSEP.setWTextFlow ((short) sprm.getOperand());
-        break;
-      case 0x3C:
-        // [MS-DOC], v20140721, 2.6.4, sprmSRncFtn        
-        newSEP.setRncFtn((short) sprm.getOperand());
-        break;
-      case 0x3E:
-        // [MS-DOC], v20140721, 2.6.4, sprmSRncEdn        
-        newSEP.setRncEdn((short) sprm.getOperand());
-        break;
-      case 0x3F:
-        // [MS-DOC], v20140721, 2.6.4, sprmSNFtn
-        newSEP.setNFtn((int) sprm.getOperand());
-        break;
-      case 0x40:
-        // [MS-DOC], v20140721, 2.6.4, sprmSNFtnRef
-        newSEP.setNfcFtnRef((int) sprm.getOperand());
-        break;
-      case 0x41:
-        // [MS-DOC], v20140721, 2.6.4, sprmSNEdn
-        newSEP.setNEdn((int) sprm.getOperand());
-        break;
-      case 0x42:
-        // [MS-DOC], v20140721, 2.6.4, sprmSNEdnRef
-        newSEP.setNfcEdnRef((int) sprm.getOperand());
-        break;
-      default:
-        logger.log(POILogger.INFO, "Unsupported Sprm operation: " + operation + " (" + HexDump.byteToHex(operation) + ")");
-        break;
-    }
-
-  }
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
deleted file mode 100644
index 24ef823..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.util.Arrays;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class SprmBuffer implements Cloneable
-{
-    byte[] _buf;
-    boolean _istd;
-    int _offset;
-
-    private final int _sprmsStartOffset;
-
-    /**
-     * @deprecated Use {@link #SprmBuffer(int)} instead
-     */
-    @Deprecated
-    public SprmBuffer()
-    {
-        this( 0 );
-    }
-
-    /**
-     * @deprecated Use {@link #SprmBuffer(byte[],int)} instead
-     */
-    @Deprecated
-    public SprmBuffer( byte[] buf )
-    {
-        this( buf, 0 );
-    }
-
-    /**
-     * @deprecated Use {@link #SprmBuffer(byte[],boolean,int)} instead
-     */
-    @Deprecated
-    public SprmBuffer( byte[] buf, boolean istd )
-    {
-        this( buf, istd, 0 );
-    }
-
-    public SprmBuffer( byte[] buf, boolean istd, int sprmsStartOffset )
-    {
-        _offset = buf.length;
-        _buf = buf;
-        _istd = istd;
-        _sprmsStartOffset = sprmsStartOffset;
-    }
-
-    public SprmBuffer( byte[] buf, int _sprmsStartOffset )
-    {
-        this( buf, false, _sprmsStartOffset );
-    }
-
-    public SprmBuffer( int sprmsStartOffset )
-    {
-        _buf = new byte[sprmsStartOffset + 4];
-        _offset = sprmsStartOffset;
-        _sprmsStartOffset = sprmsStartOffset;
-    }
-
-    public void addSprm(short opcode, byte operand)
-      {
-        int addition = LittleEndian.SHORT_SIZE + LittleEndian.BYTE_SIZE;
-        ensureCapacity(addition);
-        LittleEndian.putShort(_buf, _offset, opcode);
-        _offset += LittleEndian.SHORT_SIZE;
-        _buf[_offset++] = operand;
-      }
-
-    public void addSprm(short opcode, byte[] operand)
-      {
-        int addition = LittleEndian.SHORT_SIZE + LittleEndian.BYTE_SIZE + operand.length;
-        ensureCapacity(addition);
-        LittleEndian.putShort(_buf, _offset, opcode);
-        _offset += LittleEndian.SHORT_SIZE;
-        _buf[_offset++] = (byte)operand.length;
-        System.arraycopy(operand, 0, _buf, _offset, operand.length);
-      }
-
-  public void addSprm(short opcode, int operand)
-  {
-    int addition = LittleEndian.SHORT_SIZE + LittleEndian.INT_SIZE;
-    ensureCapacity(addition);
-    LittleEndian.putShort(_buf, _offset, opcode);
-    _offset += LittleEndian.SHORT_SIZE;
-    LittleEndian.putInt(_buf, _offset, operand);
-    _offset += LittleEndian.INT_SIZE;
-  }
-
-  public void addSprm(short opcode, short operand)
-  {
-    int addition = LittleEndian.SHORT_SIZE + LittleEndian.SHORT_SIZE;
-    ensureCapacity(addition);
-    LittleEndian.putShort(_buf, _offset, opcode);
-    _offset += LittleEndian.SHORT_SIZE;
-    LittleEndian.putShort(_buf, _offset, operand);
-    _offset += LittleEndian.SHORT_SIZE;
-  }
-
-  public void append( byte[] grpprl )
-{
-    append( grpprl, 0 );
-}
-
-  public void append( byte[] grpprl, int offset )
-{
-    ensureCapacity( grpprl.length - offset );
-    System.arraycopy( grpprl, offset, _buf, _offset, grpprl.length - offset );
-    _offset += grpprl.length - offset;
-}
-  public SprmBuffer clone()
-  {
-      try {
-        SprmBuffer retVal = (SprmBuffer)super.clone();
-        retVal._buf = new byte[_buf.length];
-        System.arraycopy(_buf, 0, retVal._buf, 0, _buf.length);
-        return retVal;
-      } catch (CloneNotSupportedException e) {
-          throw new RuntimeException(e);
-      }
-  }
-  private void ensureCapacity( int addition )
-{
-    if ( _offset + addition >= _buf.length )
-    {
-        // add 6 more than they need for use the next iteration
-        //
-        // commented - buffer shall not contain any additional bytes --
-        // sergey
-        // byte[] newBuf = new byte[_offset + addition + 6];
-         byte[] newBuf = new byte[_offset + addition];
-        System.arraycopy( _buf, 0, newBuf, 0, _buf.length );
-        _buf = newBuf;
-    }
-}
-
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (!(obj instanceof SprmBuffer)) return false;
-    SprmBuffer sprmBuf = (SprmBuffer)obj;
-    return (Arrays.equals(_buf, sprmBuf._buf));
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-
-  public SprmOperation findSprm( short opcode )
-{
-    int operation = SprmOperation.getOperationFromOpcode( opcode );
-    int type = SprmOperation.getTypeFromOpcode( opcode );
-
-    SprmIterator si = new SprmIterator( _buf, 2 );
-    while ( si.hasNext() )
-    {
-        SprmOperation i = si.next();
-        if ( i.getOperation() == operation && i.getType() == type )
-            return i;
-    }
-    return null;
-}
-
-  private int findSprmOffset( short opcode )
-{
-    SprmOperation sprmOperation = findSprm( opcode );
-    if ( sprmOperation == null )
-        return -1;
-
-    return sprmOperation.getGrpprlOffset();
-}
-
-    public byte[] toByteArray()
-      {
-        return _buf;
-      }
-
-    public SprmIterator iterator()
-    {
-        return new SprmIterator( _buf, _sprmsStartOffset );
-    }
-
-    public void updateSprm(short opcode, byte operand)
-      {
-        int grpprlOffset = findSprmOffset(opcode);
-        if(grpprlOffset != -1)
-        {
-          _buf[grpprlOffset] = operand;
-          return;
-        }
-        addSprm(opcode, operand);
-      }
-
-    public void updateSprm( short opcode, boolean operand )
-    {
-        int grpprlOffset = findSprmOffset( opcode );
-        if ( grpprlOffset != -1 )
-        {
-            _buf[grpprlOffset] = (byte) ( operand ? 1 : 0 );
-            return;
-        }
-        addSprm( opcode, operand ? 1 : 0 );
-    }
-
-  public void updateSprm(short opcode, int operand)
-  {
-    int grpprlOffset = findSprmOffset(opcode);
-    if(grpprlOffset != -1)
-    {
-      LittleEndian.putInt(_buf, grpprlOffset, operand);
-      return;
-    }
-    addSprm(opcode, operand);
-  }
-
-    public void updateSprm(short opcode, short operand)
-      {
-        int grpprlOffset = findSprmOffset(opcode);
-        if(grpprlOffset != -1)
-        {
-          LittleEndian.putShort(_buf, grpprlOffset, operand);
-          return;
-        }
-        addSprm(opcode, operand);
-      }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append( "Sprms (" );
-        stringBuilder.append( _buf.length );
-        stringBuilder.append( " byte(s)): " );
-        for ( SprmIterator iterator = iterator(); iterator.hasNext(); )
-        {
-            try
-            {
-                stringBuilder.append( iterator.next() );
-            }
-            catch ( Exception exc )
-            {
-                stringBuilder.append( "error" );
-            }
-            stringBuilder.append( "; " );
-        }
-        return stringBuilder.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java
deleted file mode 100644
index dd4ba79..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import org.apache.poi.util.Internal;
-
-/**
- * This class is used to iterate through a list of sprms from a Word 97/2000/XP
- * document.
- * @author Ryan Ackley
- * @version 1.0
- */
-@Internal
-public final class SprmIterator
-{
-  private byte[] _grpprl;
-  int _offset;
-
-  public SprmIterator(byte[] grpprl, int offset)
-  {
-    _grpprl = grpprl;
-    _offset = offset;
-  }
-
-  public boolean hasNext()
-  {
-    // A Sprm is at least 2 bytes long
-    return _offset < (_grpprl.length-1);
-  }
-
-  public SprmOperation next()
-  {
-    SprmOperation op = new SprmOperation(_grpprl, _offset);
-    _offset += op.size();
-    return op;
-  }
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
deleted file mode 100644
index 5a557ef..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class is used to represent a sprm operation from a Word 97/2000/XP
- * document.
- */
-@Internal(since="3.8 beta 4")
-public final class SprmOperation
-{
-    private static final BitField BITFIELD_OP = BitFieldFactory
-            .getInstance( 0x1ff );
-    private static final BitField BITFIELD_SIZECODE = BitFieldFactory
-            .getInstance( 0xe000 );
-    private static final BitField BITFIELD_SPECIAL = BitFieldFactory
-            .getInstance( 0x200 );
-    private static final BitField BITFIELD_TYPE = BitFieldFactory
-            .getInstance( 0x1c00 );
-
-    final static private short SPRM_LONG_PARAGRAPH = (short) 0xc615;
-    final static private short SPRM_LONG_TABLE = (short) 0xd608;
-
-    public static final int TYPE_PAP = 1;
-    public static final int TYPE_CHP = 2;
-    public static final int TYPE_PIC = 3;
-    public static final int TYPE_SEP = 4;
-    public static final int TYPE_TAP = 5;
-
-    public static int getOperationFromOpcode( short opcode )
-    {
-        return BITFIELD_OP.getValue( opcode );
-    }
-
-    public static int getTypeFromOpcode( short opcode )
-    {
-        return BITFIELD_TYPE.getValue( opcode );
-    }
-
-    private final int _offset;
-    private int _gOffset;
-    private final byte[] _grpprl;
-    private final int _size;
-    private final short _value;
-
-    public SprmOperation( byte[] grpprl, int offset )
-    {
-        _grpprl = grpprl;
-        _value = LittleEndian.getShort( grpprl, offset );
-        _offset = offset;
-        _gOffset = offset + 2;
-        _size = initSize( _value );
-    }
-
-    public byte[] toByteArray()
-    {
-        byte[] result = new byte[size()];
-        System.arraycopy( _grpprl, _offset, result, 0, size() );
-        return result;
-    }
-
-    public byte[] getGrpprl()
-    {
-        return _grpprl;
-    }
-
-    public int getGrpprlOffset()
-    {
-        return _gOffset;
-    }
-    
-    public int getOperand()
-    {
-        switch ( getSizeCode() )
-        {
-        case 0:
-        case 1:
-            return _grpprl[_gOffset];
-        case 2:
-        case 4:
-        case 5:
-            return LittleEndian.getShort( _grpprl, _gOffset );
-        case 3:
-            return LittleEndian.getInt( _grpprl, _gOffset );
-        case 6:
-            // surely shorter than an int...
-            byte operandLength = _grpprl[_gOffset + 1];
-
-            // initialized to zeros by JVM
-            byte[] codeBytes = new byte[LittleEndian.INT_SIZE];
-            for ( int i = 0; i < operandLength; i++ )
-                if ( _gOffset + i < _grpprl.length )
-                    codeBytes[i] = _grpprl[_gOffset + 1 + i];
-
-            return LittleEndian.getInt( codeBytes, 0 );
-        case 7:
-            byte threeByteInt[] = new byte[4];
-            threeByteInt[0] = _grpprl[_gOffset];
-            threeByteInt[1] = _grpprl[_gOffset + 1];
-            threeByteInt[2] = _grpprl[_gOffset + 2];
-            threeByteInt[3] = (byte) 0;
-            return LittleEndian.getInt( threeByteInt, 0 );
-        default:
-            throw new IllegalArgumentException(
-                    "SPRM contains an invalid size code" );
-        }
-    }
-
-    public short getOperandShortSigned()
-    {
-        int sizeCode = getSizeCode();
-        if ( sizeCode != 2 && sizeCode != 4 && sizeCode != 5 )
-            throw new UnsupportedOperationException(
-                    "Current SPRM doesn't have signed short operand: " + this );
-
-        return LittleEndian.getShort( _grpprl, _gOffset );
-    }
-
-    public int getOperation()
-    {
-        return BITFIELD_OP.getValue( _value );
-    }
-
-    public int getSizeCode()
-    {
-        return BITFIELD_SIZECODE.getValue( _value );
-    }
-
-    public int getType()
-    {
-        return BITFIELD_TYPE.getValue( _value );
-    }
-
-    private int initSize( short sprm )
-    {
-        switch ( getSizeCode() )
-        {
-        case 0:
-        case 1:
-            return 3;
-        case 2:
-        case 4:
-        case 5:
-            return 4;
-        case 3:
-            return 6;
-        case 6:
-            int offset = _gOffset;
-            if ( sprm == SPRM_LONG_TABLE || sprm == SPRM_LONG_PARAGRAPH )
-            {
-                int retVal = ( 0x0000ffff &
-                        LittleEndian.getShort( _grpprl, offset ) ) + 3;
-                _gOffset += 2;
-                return retVal;
-            }
-            return ( 0x000000ff & _grpprl[_gOffset++] ) + 3;
-        case 7:
-            return 5;
-        default:
-            throw new IllegalArgumentException(
-                    "SPRM contains an invalid size code" );
-        }
-    }
-
-    public int size()
-    {
-        return _size;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append( "[SPRM] (0x" );
-        stringBuilder.append( Integer.toHexString( _value & 0xffff ) );
-        stringBuilder.append( "): " );
-        try
-        {
-            stringBuilder.append( getOperand() );
-        }
-        catch ( Exception exc )
-        {
-            stringBuilder.append( "(error)" );
-        }
-        return stringBuilder.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java
deleted file mode 100644
index ef2e117..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import org.apache.poi.util.Internal;
-
-
-
-@Internal
-public abstract class SprmUncompressor
-{
-  protected SprmUncompressor()
-  {
-  }
-
-  /**
-   * Converts an int into a boolean. If the int is non-zero, it returns true.
-   * Otherwise it returns false.
-   *
-   * @param x The int to convert.
-   *
-   * @return A boolean whose value depends on x.
-   */
-  public static boolean getFlag (int x)
-  {
-    if (x != 0)
-    {
-      return true;
-    }
-	return false;
-  }
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java
deleted file mode 100644
index 3383427..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.util.List;
-
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-
-@Internal
-public final class SprmUtils
-{
-    public SprmUtils()
-    {
-    }
-
-    public static byte[] shortArrayToByteArray(short[] convert)
-    {
-        byte[] buf = new byte[convert.length * LittleEndian.SHORT_SIZE];
-
-        for (int x = 0; x < convert.length; x++)
-        {
-            LittleEndian.putShort(buf, x * LittleEndian.SHORT_SIZE, convert[x]);
-        }
-
-        return buf;
-    }
-
-    public static int addSpecialSprm(short instruction, byte[] varParam, List<byte[]> list)
-    {
-        byte[] sprm = new byte[varParam.length + 4];
-        System.arraycopy(varParam, 0, sprm, 4, varParam.length);
-        LittleEndian.putShort(sprm, 0, instruction);
-        LittleEndian.putShort(sprm, 2, (short)(varParam.length + 1));
-        list.add(sprm);
-        return sprm.length;
-    }
-
-    public static int addSprm( short instruction, boolean param,
-            List<byte[]> list )
-    {
-        return addSprm( instruction, param ? 1 : 0, null, list );
-    }
-
-    public static int addSprm(short instruction, int param, byte[] varParam, List<byte[]> list)
-    {
-        int type = (instruction & 0xe000) >> 13;
-
-        byte[] sprm = null;
-        switch(type)
-        {
-            case 0:
-            case 1:
-                sprm = new byte[3];
-                sprm[2] = (byte)param;
-                break;
-            case 2:
-                sprm = new byte[4];
-                LittleEndian.putShort(sprm, 2, (short)param);
-                break;
-            case 3:
-                sprm = new byte[6];
-                LittleEndian.putInt(sprm, 2, param);
-                break;
-            case 4:
-            case 5:
-                sprm = new byte[4];
-                LittleEndian.putShort(sprm, 2, (short)param);
-                break;
-            case 6:
-                sprm = new byte[3 + varParam.length];
-                sprm[2] = (byte)varParam.length;
-                System.arraycopy(varParam, 0, sprm, 3, varParam.length);
-                break;
-            case 7:
-                sprm = new byte[5];
-                // this is a three byte int so it has to be handled special
-                byte[] temp = new byte[4];
-                LittleEndian.putInt(temp, 0, param);
-                System.arraycopy(temp, 0, sprm, 2, 3);
-                break;
-            default:
-                //should never happen
-                throw new RuntimeException("Invalid sprm type"); 
-        }
-        LittleEndian.putShort(sprm, 0, instruction);
-        list.add(sprm);
-        return sprm.length;
-    }
-
-    public static byte[] getGrpprl(List<byte[]> sprmList, int size)
-    {
-        // spit out the final grpprl
-        byte[] grpprl = new byte[size];
-        int listSize = sprmList.size() - 1;
-        int index = 0;
-        for (; listSize >= 0; listSize--)
-        {
-            byte[] sprm = sprmList.remove(0);
-            System.arraycopy(sprm, 0, grpprl, index, sprm.length);
-            index += sprm.length;
-        }
-
-        return grpprl;
-
-    }
-
-    public static int convertBrcToInt(short[] brc)
-    {
-        byte[] buf = new byte[4];
-        LittleEndian.putShort(buf, 0, brc[0]);
-        LittleEndian.putShort(buf, LittleEndian.SHORT_SIZE, brc[1]);
-        return LittleEndian.getInt(buf);
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
deleted file mode 100644
index ec5fe93..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.TableAutoformatLookSpecifier;
-import org.apache.poi.hwpf.usermodel.TableCellDescriptor;
-import org.apache.poi.hwpf.usermodel.TableProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-
-@Internal
-public final class TableSprmCompressor
-{
-  public TableSprmCompressor()
-  {
-  }
-  public static byte[] compressTableProperty(TableProperties newTAP)
-  {
-    int size = 0;
-    List<byte[]> sprmList = new ArrayList<byte[]>();
-
-    if (newTAP.getJc() != 0)
-    {
-      size += SprmUtils.addSprm((short)0x5400, newTAP.getJc(), null, sprmList);
-    }
-    if (newTAP.getFCantSplit())
-    {
-      size += SprmUtils.addSprm((short)0x3403, 1, null, sprmList);
-    }
-    if (newTAP.getFTableHeader())
-    {
-      size += SprmUtils.addSprm((short)0x3404, 1, null, sprmList);
-    }
-    byte[] brcBuf = new byte[6 * BorderCode.SIZE];
-    int offset = 0;
-    newTAP.getBrcTop().serialize(brcBuf, offset);
-    offset += BorderCode.SIZE;
-    newTAP.getBrcLeft().serialize(brcBuf, offset);
-    offset += BorderCode.SIZE;
-    newTAP.getBrcBottom().serialize(brcBuf, offset);
-    offset += BorderCode.SIZE;
-    newTAP.getBrcRight().serialize(brcBuf, offset);
-    offset += BorderCode.SIZE;
-    newTAP.getBrcHorizontal().serialize(brcBuf, offset);
-    offset += BorderCode.SIZE;
-    newTAP.getBrcVertical().serialize(brcBuf, offset);
-    byte[] compare = new byte[6 * BorderCode.SIZE];
-    if (!Arrays.equals(brcBuf, compare))
-    {
-      size += SprmUtils.addSprm((short)0xD605, 0, brcBuf, sprmList);
-    }
-    if (newTAP.getDyaRowHeight() != 0)
-    {
-      size += SprmUtils.addSprm((short)0x9407, newTAP.getDyaRowHeight(), null, sprmList);
-    }
-    if (newTAP.getItcMac() > 0)
-    {
-      int itcMac = newTAP.getItcMac();
-      byte[] buf = new byte[1 + (LittleEndian.SHORT_SIZE*(itcMac + 1)) + (TableCellDescriptor.SIZE*itcMac)];
-      buf[0] = (byte)itcMac;
-
-      short[] dxaCenters = newTAP.getRgdxaCenter();
-      for (int x = 0; x < dxaCenters.length; x++)
-      {
-        LittleEndian.putShort(buf, 1 + (x * LittleEndian.SHORT_SIZE),
-                              dxaCenters[x]);
-      }
-
-      TableCellDescriptor[] cellDescriptors = newTAP.getRgtc();
-      for (int x = 0; x < cellDescriptors.length; x++)
-      {
-        cellDescriptors[x].serialize(buf,
-          1+((itcMac+1)*LittleEndian.SHORT_SIZE)+(x*TableCellDescriptor.SIZE));
-      }
-      size += SprmUtils.addSpecialSprm((short)0xD608, buf, sprmList);
-
-//      buf = new byte[(itcMac * ShadingDescriptor.SIZE) + 1];
-//      buf[0] = (byte)itcMac;
-//      ShadingDescriptor[] shds = newTAP.getRgshd();
-//      for (int x = 0; x < itcMac; x++)
-//      {
-//        shds[x].serialize(buf, 1 + (x * ShadingDescriptor.SIZE));
-//      }
-//      size += SprmUtils.addSpecialSprm((short)0xD609, buf, sprmList);
-    }
-
-        if ( newTAP.getTlp() != null && !newTAP.getTlp().isEmpty() )
-        {
-            byte[] buf = new byte[TableAutoformatLookSpecifier.SIZE];
-            newTAP.getTlp().serialize( buf, 0 );
-            size += SprmUtils.addSprm( (short) 0x740a, 0, buf, sprmList );
-        }
-
-    return SprmUtils.getGrpprl(sprmList, size);
-  }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
deleted file mode 100644
index 4bad5bb..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.sprm;
-
-import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.TableCellDescriptor;
-import org.apache.poi.hwpf.usermodel.TableProperties;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-@Internal
-public final class TableSprmUncompressor
-  extends SprmUncompressor
-{
-  private static final POILogger logger = POILogFactory.getLogger( TableSprmUncompressor.class );
-
-  public TableSprmUncompressor()
-  {
-  }
-
-    public static TableProperties uncompressTAP( SprmBuffer sprmBuffer )
-    {
-        TableProperties tableProperties;
-
-        SprmOperation sprmOperation = sprmBuffer.findSprm( (short) 0xd608 );
-        if ( sprmOperation != null )
-        {
-            byte[] grpprl = sprmOperation.getGrpprl();
-            int offset = sprmOperation.getGrpprlOffset();
-            short itcMac = grpprl[offset];
-            tableProperties = new TableProperties( itcMac );
-        }
-        else
-        {
-            logger.log( POILogger.WARN,
-                    "Some table rows didn't specify number of columns in SPRMs" );
-            tableProperties = new TableProperties( (short) 1 );
-        }
-
-        for ( SprmIterator iterator = sprmBuffer.iterator(); iterator.hasNext(); )
-        {
-            SprmOperation sprm = iterator.next();
-
-            /*
-             * TAPXs are actually PAPXs so we have to make sure we are only
-             * trying to uncompress the right type of sprm.
-             */
-            if ( sprm.getType() == SprmOperation.TYPE_TAP )
-            {
-                try
-                {
-                    unCompressTAPOperation( tableProperties, sprm );
-                }
-                catch ( ArrayIndexOutOfBoundsException ex )
-                {
-                    logger.log( POILogger.ERROR, "Unable to apply ", sprm,
-                            ": ", ex, ex );
-                }
-            }
-        }
-        return tableProperties;
-    }
-
-  /**
-   * Used to uncompress a table property. Performs an operation defined
-   * by a sprm stored in a tapx.
-   *
-   * @param newTAP The TableProperties object to perform the operation on.
-   * @param operand The operand that defines this operation.
-   * @param param The parameter for this operation.
-   * @param varParam Variable length parameter for this operation.
-   */
-  static void unCompressTAPOperation (TableProperties newTAP, SprmOperation sprm)
-  {
-    switch (sprm.getOperation())
-    {
-      case 0:
-        newTAP.setJc ((short) sprm.getOperand());
-        break;
-      case 0x01:
-      {
-        short[] rgdxaCenter = newTAP.getRgdxaCenter ();
-        short itcMac = newTAP.getItcMac ();
-        int adjust = sprm.getOperand() - (rgdxaCenter[0] + newTAP.getDxaGapHalf ());
-        for (int x = 0; x < itcMac; x++)
-        {
-          rgdxaCenter[x] += adjust;
-        }
-        break;
-      }
-      case 0x02:
-      {
-        short[] rgdxaCenter = newTAP.getRgdxaCenter ();
-        if (rgdxaCenter != null)
-        {
-          int adjust = newTAP.getDxaGapHalf () - sprm.getOperand();
-          rgdxaCenter[0] += adjust;
-        }
-        newTAP.setDxaGapHalf (sprm.getOperand());
-        break;
-      }
-      case 0x03:
-        newTAP.setFCantSplit (getFlag(sprm.getOperand()));
-        break;
-      case 0x04:
-        newTAP.setFTableHeader (getFlag (sprm.getOperand()));
-        break;
-      case 0x05:
-      {
-        byte[] buf = sprm.getGrpprl();
-        int offset = sprm.getGrpprlOffset();
-        newTAP.setBrcTop(new BorderCode(buf, offset));
-        offset += BorderCode.SIZE;
-        newTAP.setBrcLeft(new BorderCode(buf, offset));
-        offset += BorderCode.SIZE;
-        newTAP.setBrcBottom(new BorderCode(buf, offset));
-        offset += BorderCode.SIZE;
-        newTAP.setBrcRight(new BorderCode(buf, offset));
-        offset += BorderCode.SIZE;
-        newTAP.setBrcHorizontal(new BorderCode(buf, offset));
-        offset += BorderCode.SIZE;
-        newTAP.setBrcVertical(new BorderCode(buf, offset));
-        break;
-      }
-      case 0x06:
-
-        //obsolete, used in word 1.x
-        break;
-      case 0x07:
-        newTAP.setDyaRowHeight (sprm.getOperand());
-        break;
-      case 0x08:
-      {
-        byte[] grpprl = sprm.getGrpprl();
-        int offset = sprm.getGrpprlOffset();
-        short itcMac = grpprl[offset];
-        short[] rgdxaCenter = new short[itcMac + 1];
-        TableCellDescriptor[] rgtc = new TableCellDescriptor[itcMac];
-        //I use varParam[0] and newTAP._itcMac interchangably
-        newTAP.setItcMac (itcMac);
-        newTAP.setRgdxaCenter (rgdxaCenter);
-        newTAP.setRgtc (rgtc);
-
-        // get the rgdxaCenters
-        for (int x = 0; x < itcMac; x++)
-        {
-          rgdxaCenter[x] = LittleEndian.getShort (grpprl, offset + (1 + (x * 2)));
-        }
-
-        // only try to get the TC entries if they exist...
-        int endOfSprm = offset+sprm.size()-6; // -2 bytes for sprm - 2 for size short - 2 to correct offsets being 0 based
-        int startOfTCs = offset + (1 + (itcMac + 1) * 2);
-
-        boolean hasTCs = startOfTCs < endOfSprm;
-
-        for (int x = 0; x < itcMac; x++)
-        {
-          // Sometimes, the grpprl does not contain data at every offset. I have no idea why this happens.
-          if(hasTCs && offset + (1 + ( (itcMac + 1) * 2) + (x * 20)) < grpprl.length)
-            rgtc[x] = TableCellDescriptor.convertBytesToTC(grpprl,
-               offset + (1 + ( (itcMac + 1) * 2) + (x * 20)));
-          else
-            rgtc[x] = new TableCellDescriptor();
-        }
-
-        rgdxaCenter[itcMac] = LittleEndian.getShort (grpprl, offset + (1 + (itcMac * 2)));
-        break;
-      }
-      case 0x09:
-
-        /** @todo handle cell shading*/
-        break;
-      case 0x0a:
-
-        /** @todo handle word defined table styles*/
-        break;
-      case 0x20:
-//      {
-//        TableCellDescriptor[] rgtc = newTAP.getRgtc();
-//
-//        for (int x = varParam[0]; x < varParam[1]; x++)
-//        {
-//
-//          if ((varParam[2] & 0x08) > 0)
-//          {
-//            short[] brcRight = rgtc[x].getBrcRight ();
-//            brcRight[0] = LittleEndian.getShort (varParam, 6);
-//            brcRight[1] = LittleEndian.getShort (varParam, 8);
-//          }
-//          else if ((varParam[2] & 0x04) > 0)
-//          {
-//            short[] brcBottom = rgtc[x].getBrcBottom ();
-//            brcBottom[0] = LittleEndian.getShort (varParam, 6);
-//            brcBottom[1] = LittleEndian.getShort (varParam, 8);
-//          }
-//          else if ((varParam[2] & 0x02) > 0)
-//          {
-//            short[] brcLeft = rgtc[x].getBrcLeft ();
-//            brcLeft[0] = LittleEndian.getShort (varParam, 6);
-//            brcLeft[1] = LittleEndian.getShort (varParam, 8);
-//          }
-//          else if ((varParam[2] & 0x01) > 0)
-//          {
-//            short[] brcTop = rgtc[x].getBrcTop ();
-//            brcTop[0] = LittleEndian.getShort (varParam, 6);
-//            brcTop[1] = LittleEndian.getShort (varParam, 8);
-//          }
-//        }
-//        break;
-//      }
-        break;
-      case 0x21:
-      {
-        int param = sprm.getOperand();
-        int index = (param & 0xff000000) >> 24;
-        int count = (param & 0x00ff0000) >> 16;
-        int width = (param & 0x0000ffff);
-        int itcMac = newTAP.getItcMac();
-
-        short[] rgdxaCenter = new short[itcMac + count + 1];
-        TableCellDescriptor[] rgtc = new TableCellDescriptor[itcMac + count];
-        if (index >= itcMac)
-        {
-          index = itcMac;
-          System.arraycopy(newTAP.getRgdxaCenter(), 0, rgdxaCenter, 0,
-                           itcMac + 1);
-          System.arraycopy(newTAP.getRgtc(), 0, rgtc, 0, itcMac);
-        }
-        else
-        {
-          //copy rgdxaCenter
-          System.arraycopy(newTAP.getRgdxaCenter(), 0, rgdxaCenter, 0,
-                           index + 1);
-          System.arraycopy(newTAP.getRgdxaCenter(), index + 1, rgdxaCenter,
-                           index + count, itcMac - (index));
-          //copy rgtc
-          System.arraycopy(newTAP.getRgtc(), 0, rgtc, 0, index);
-          System.arraycopy(newTAP.getRgtc(), index, rgtc, index + count,
-                           itcMac - index);
-        }
-
-        for (int x = index; x < index + count; x++)
-        {
-          rgtc[x] = new TableCellDescriptor();
-          rgdxaCenter[x] = (short)(rgdxaCenter[x - 1] + width);
-        }
-        rgdxaCenter[index +
-          count] = (short)(rgdxaCenter[(index + count) - 1] + width);
-        break;
-      }
-      /**@todo handle table sprms from complex files*/
-      case 0x22:
-      case 0x23:
-      case 0x24:
-      case 0x25:
-      case 0x26:
-      case 0x27:
-      case 0x28:
-      case 0x29:
-      case 0x2a:
-      case 0x2b:
-      case 0x2c:
-        break;
-      case 0x34:
-        // sprmTCellPaddingDefault -- (0xd634)
-        // TODO: extract into CSSA structure
-        byte itcFirst = sprm.getGrpprl()[sprm.getGrpprlOffset()];
-        byte itcLim = sprm.getGrpprl()[sprm.getGrpprlOffset() + 1];
-        byte grfbrc = sprm.getGrpprl()[sprm.getGrpprlOffset() + 2];
-        byte ftsWidth = sprm.getGrpprl()[sprm.getGrpprlOffset() + 3];
-        short wWidth = LittleEndian.getShort(sprm.getGrpprl(),
-            sprm.getGrpprlOffset() + 4);
-
-        for (int c = itcFirst; c < itcLim; c++) {
-          TableCellDescriptor tableCellDescriptor = newTAP.getRgtc()[c];
-
-          if ((grfbrc & 0x01) != 0) {
-            tableCellDescriptor.setFtsCellPaddingTop(ftsWidth);
-            tableCellDescriptor.setWCellPaddingTop(wWidth);
-          }
-          if ((grfbrc & 0x02) != 0) {
-            tableCellDescriptor.setFtsCellPaddingLeft(ftsWidth);
-            tableCellDescriptor.setWCellPaddingLeft(wWidth);
-          }
-          if ((grfbrc & 0x04) != 0) {
-            tableCellDescriptor.setFtsCellPaddingBottom(ftsWidth);
-            tableCellDescriptor.setWCellPaddingBottom(wWidth);
-          }
-          if ((grfbrc & 0x08) != 0) {
-            tableCellDescriptor.setFtsCellPaddingRight(ftsWidth);
-            tableCellDescriptor.setWCellPaddingRight(wWidth);
-          }
-        }
-        break;
-      default:
-        break;
-    }
-  }
-
-
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java
deleted file mode 100644
index 1836d89..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-/**
- * User friendly interface to access information about document bookmarks
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {doc} com)
- */
-public interface Bookmark
-{
-    int getEnd();
-
-    String getName();
-
-    int getStart();
-
-    void setName( String name );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java
deleted file mode 100644
index c4dae5e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * User-friendly interface to access document bookmarks
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public interface Bookmarks
-{
-    /**
-     * @param index
-     *            bookmark document index
-     * @return {@link Bookmark} with specified index
-     * @throws IndexOutOfBoundsException
-     *             if bookmark with specified index not present in document
-     */
-    Bookmark getBookmark( int index ) throws IndexOutOfBoundsException;
-
-    /**
-     * @return count of {@link Bookmark}s in document
-     */
-    int getBookmarksCount();
-
-    /**
-     * @return {@link Map} of bookmarks started in specified range, where key is
-     *         start position and value is sorted {@link List} of
-     *         {@link Bookmark}
-     */
-    Map<Integer, List<Bookmark>> getBookmarksStartedBetween(
-            int startInclusive, int endExclusive );
-
-    /**
-     * Remove bookmark from document (but not the bookmark text)
-     * 
-     * @param index
-     *            bookmark document index to be removed
-     */
-    void remove( int index );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
deleted file mode 100644
index ce4df16..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hwpf.model.BookmarksTables;
-import org.apache.poi.hwpf.model.GenericPropertyNode;
-import org.apache.poi.hwpf.model.PropertyNode;
-
-/**
- * Implementation of user-friendly interface for document bookmarks
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {doc} com)
- */
-public class BookmarksImpl implements Bookmarks
-{
-
-    private final class BookmarkImpl implements Bookmark
-    {
-        private final GenericPropertyNode first;
-
-        private BookmarkImpl( GenericPropertyNode first )
-        {
-            this.first = first;
-        }
-
-        @Override
-        public boolean equals( Object obj )
-        {
-            if ( this == obj )
-                return true;
-            if ( obj == null )
-                return false;
-            if ( getClass() != obj.getClass() )
-                return false;
-            BookmarkImpl other = (BookmarkImpl) obj;
-            if ( first == null )
-            {
-                if ( other.first != null )
-                    return false;
-            }
-            else if ( !first.equals( other.first ) )
-                return false;
-            return true;
-        }
-
-        public int getEnd()
-        {
-            int currentIndex = bookmarksTables.getDescriptorFirstIndex( first );
-            try
-            {
-                GenericPropertyNode descriptorLim = bookmarksTables
-                        .getDescriptorLim( currentIndex );
-                return descriptorLim.getStart();
-            }
-            catch ( IndexOutOfBoundsException exc )
-            {
-                return first.getEnd();
-            }
-        }
-
-        public String getName()
-        {
-            int currentIndex = bookmarksTables.getDescriptorFirstIndex( first );
-            try
-            {
-                return bookmarksTables.getName( currentIndex );
-            }
-            catch ( ArrayIndexOutOfBoundsException exc )
-            {
-                return "";
-            }
-        }
-
-        public int getStart()
-        {
-            return first.getStart();
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return 31 + ( first == null ? 0 : first.hashCode() );
-        }
-
-        public void setName( String name )
-        {
-            int currentIndex = bookmarksTables.getDescriptorFirstIndex( first );
-            bookmarksTables.setName( currentIndex, name );
-        }
-
-        @Override
-        public String toString()
-        {
-            return "Bookmark [" + getStart() + "; " + getEnd() + "): name: "
-                    + getName();
-        }
-
-    }
-
-    private final BookmarksTables bookmarksTables;
-
-    private Map<Integer, List<GenericPropertyNode>> sortedDescriptors = null;
-
-    private int[] sortedStartPositions = null;
-
-    public BookmarksImpl( BookmarksTables bookmarksTables )
-    {
-        this.bookmarksTables = bookmarksTables;
-        reset();
-    }
-
-    void afterDelete( int startCp, int length )
-    {
-        bookmarksTables.afterDelete( startCp, length );
-        reset();
-    }
-
-    void afterInsert( int startCp, int length )
-    {
-        bookmarksTables.afterInsert( startCp, length );
-        reset();
-    }
-
-    private Bookmark getBookmark( final GenericPropertyNode first )
-    {
-        return new BookmarkImpl( first );
-    }
-
-    public Bookmark getBookmark( int index )
-    {
-        final GenericPropertyNode first = bookmarksTables
-                .getDescriptorFirst( index );
-        return getBookmark( first );
-    }
-
-    public List<Bookmark> getBookmarksAt( int startCp )
-    {
-        updateSortedDescriptors();
-
-        List<GenericPropertyNode> nodes = sortedDescriptors.get( Integer
-                .valueOf( startCp ) );
-        if ( nodes == null || nodes.isEmpty() )
-            return Collections.emptyList();
-
-        List<Bookmark> result = new ArrayList<Bookmark>( nodes.size() );
-        for ( GenericPropertyNode node : nodes )
-        {
-            result.add( getBookmark( node ) );
-        }
-        return Collections.unmodifiableList( result );
-    }
-
-    public int getBookmarksCount()
-    {
-        return bookmarksTables.getDescriptorsFirstCount();
-    }
-
-    public Map<Integer, List<Bookmark>> getBookmarksStartedBetween(
-            int startInclusive, int endExclusive )
-    {
-        updateSortedDescriptors();
-
-        int startLookupIndex = Arrays.binarySearch( this.sortedStartPositions,
-                startInclusive );
-        if ( startLookupIndex < 0 )
-            startLookupIndex = -( startLookupIndex + 1 );
-        int endLookupIndex = Arrays.binarySearch( this.sortedStartPositions,
-                endExclusive );
-        if ( endLookupIndex < 0 )
-            endLookupIndex = -( endLookupIndex + 1 );
-
-        Map<Integer, List<Bookmark>> result = new LinkedHashMap<Integer, List<Bookmark>>();
-        for ( int lookupIndex = startLookupIndex; lookupIndex < endLookupIndex; lookupIndex++ )
-        {
-            int s = sortedStartPositions[lookupIndex];
-            if ( s < startInclusive )
-                continue;
-            if ( s >= endExclusive )
-                break;
-
-            List<Bookmark> startedAt = getBookmarksAt( s );
-            if ( startedAt != null )
-                result.put( Integer.valueOf( s ), startedAt );
-        }
-
-        return Collections.unmodifiableMap( result );
-    }
-
-    public void remove( int index )
-    {
-        bookmarksTables.remove( index );
-    }
-
-    private void reset()
-    {
-        sortedDescriptors = null;
-        sortedStartPositions = null;
-    }
-
-    private void updateSortedDescriptors()
-    {
-        if ( sortedDescriptors != null )
-            return;
-
-        Map<Integer, List<GenericPropertyNode>> result = new HashMap<Integer, List<GenericPropertyNode>>();
-        for ( int b = 0; b < bookmarksTables.getDescriptorsFirstCount(); b++ )
-        {
-            GenericPropertyNode property = bookmarksTables
-                    .getDescriptorFirst( b );
-            Integer positionKey = Integer.valueOf( property.getStart() );
-            List<GenericPropertyNode> atPositionList = result.get( positionKey );
-            if ( atPositionList == null )
-            {
-                atPositionList = new LinkedList<GenericPropertyNode>();
-                result.put( positionKey, atPositionList );
-            }
-            atPositionList.add( property );
-        }
-
-        int counter = 0;
-        int[] indices = new int[result.size()];
-        for ( Map.Entry<Integer, List<GenericPropertyNode>> entry : result
-                .entrySet() )
-        {
-            indices[counter++] = entry.getKey().intValue();
-            List<GenericPropertyNode> updated = new ArrayList<GenericPropertyNode>(
-                    entry.getValue() );
-            Collections.sort( updated, PropertyNode.EndComparator.instance );
-            entry.setValue( updated );
-        }
-        Arrays.sort( indices );
-
-        this.sortedDescriptors = result;
-        this.sortedStartPositions = indices;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
deleted file mode 100644
index 0f5a949..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Mapping class for BRC80 structure (Border Code for Word 97)
- *
- * <p>Comments are copied out from the binary format specification.
- */
-public final class BorderCode implements Cloneable {
-  
-  public static final int SIZE = 4;
-  
-  private short _info;
-    private static final BitField _dptLineWidth = BitFieldFactory.getInstance(0x00ff);
-    private static final BitField _brcType = BitFieldFactory.getInstance(0xff00);
-    
-  private short _info2;
-    private static final BitField _ico = BitFieldFactory.getInstance(0x00ff);
-    private static final BitField _dptSpace = BitFieldFactory.getInstance(0x1f00);
-    private static final BitField _fShadow = BitFieldFactory.getInstance(0x2000);
-    private static final BitField _fFrame = BitFieldFactory.getInstance(0x4000);
-    
-  public BorderCode()
-  {
-  }
-
-  public BorderCode(byte[] buf, int offset)
-  {
-    _info = LittleEndian.getShort(buf, offset);
-    _info2 = LittleEndian.getShort(buf, offset + LittleEndian.SHORT_SIZE);
-  }
-
-  public void serialize(byte[] buf, int offset)
-  {
-    LittleEndian.putShort(buf, offset, _info);
-    LittleEndian.putShort(buf, offset + LittleEndian.SHORT_SIZE, _info2);
-  }
-
-  public int toInt()
-  {
-    byte[] buf = new byte[4];
-    serialize(buf, 0);
-    return LittleEndian.getInt(buf);
-  }
-
-  public boolean isEmpty()
-  {
-    return _info == 0 && _info2 == 0 || _info == -1;
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof BorderCode)) return false;
-    BorderCode brc = (BorderCode)o;
-    return _info == brc._info && _info2 == brc._info2;
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-  
-  public Object clone()
-    throws CloneNotSupportedException
-  {
-    return super.clone();
-  }
-  
-  /**
-   * Width of a single line in 1/8 pt, max of 32 pt.
-   */
-  public int getLineWidth() {
-    return _dptLineWidth.getShortValue(_info);
-  }
-  
-  /**
-   * @param lineWidth the width of the line to set
-   */
-  public void setLineWidth(int lineWidth) {
-    _info = _dptLineWidth.setShortValue(_info, (short)lineWidth);
-  }
-
-  /**
-   * Border type code:
-   * <ul>
-   * <li>0  none</li>
-   * <li>1  single</li>
-   * <li>2  thick</li>
-   * <li>3  double</li>
-   * <li>5  hairline</li>
-   * <li>6  dot</li>
-   * <li>7  dash large gap</li>
-   * <li>8  dot dash</li>
-   * <li>9  dot dot dash</li>
-   * <li>10  triple</li>
-   * <li>11  thin-thick small gap</li>
-   * <li>12  thick-thin small gap</li>
-   * <li>13  thin-thick-thin small gap</li>
-   * <li>14  thin-thick medium gap</li>
-   * <li>15  thick-thin medium gap</li>
-   * <li>16  thin-thick-thin medium gap</li>
-   * <li>17  thin-thick large gap</li>
-   * <li>18  thick-thin large gap</li>
-   * <li>19  thin-thick-thin large gap</li>
-   * <li>20  wave</li>
-   * <li>21  double wave</li>
-   * <li>22  dash small gap</li>
-   * <li>23  dash dot stroked</li>
-   * <li>24  emboss 3D</li>
-   * <li>25  engrave 3D</li>
-   * <li>codes 64 - 230 represent border art types and are used only for page borders</li>
-   * </ul>
-   */
-  public int getBorderType() {
-    return _brcType.getShortValue(_info);
-  }
-  
-  public void setBorderType(int borderType) {
-      _info = _brcType.setShortValue(_info, (short)borderType);
-  }
-  
-  /**
-   * Color:
-   * <ul>
-   * <li>0  Auto</li>
-   * <li>1  Black</li>
-   * <li>2  Blue</li>
-   * <li>3  Cyan</li>
-   * <li>4  Green</li>
-   * <li>5  Magenta</li>
-   * <li>6  Red</li>
-   * <li>7  Yellow</li>
-   * <li>8  White</li>
-   * <li>9  DkBlue</li>
-   * <li>10  DkCyan</li>
-   * <li>11  DkGreen</li>
-   * <li>12  DkMagenta</li>
-   * <li>13  DkRed</li>
-   * <li>14  DkYellow</li>
-   * <li>15  DkGray</li>
-   * <li>16  LtGray</li>
-   * </ul>
-   */
-  public short getColor() {
-    return _ico.getShortValue(_info2);
-  }
-  
-  public void setColor(short color) {
-      _info2 = _ico.setShortValue(_info2, color);
-  }
-  
-  /**
-   * Width of space to maintain between border and text within border.
-   * 
-   * <p>Must be 0 when BRC is a substructure of TC.
-   * 
-   * <p>Stored in points.
-   */
-  public int getSpace() {
-    return _dptSpace.getShortValue(_info2);
-  }
-  
-  public void setSpace(int space) {
-      _info2 = (short)_dptSpace.setValue(_info2, space);
-  }
-  
-  /**
-   * When true, border is drawn with shadow
-   * Must be false when BRC is a substructure of the TC.
-   */
-  public boolean isShadow() {
-    return _fShadow.getValue(_info2) != 0;
-  }
-  
-  public void setShadow(boolean shadow) {
-      _info2 = (short)_fShadow.setValue(_info2, shadow ? 1 : 0);
-  }
-  
-  /**
-   * Don't reverse the border.
-   */
-  public boolean isFrame() {
-    return _fFrame.getValue(_info2) != 0;
-  }
-  
-  public void setFrame(boolean frame) {
-      _info2 = (short)_fFrame.setValue(_info2, frame ? 1 : 0);
-  }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[BRC] EMPTY";
-
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append( "[BRC]\n" );
-
-        buffer.append( "        .dptLineWidth         = " );
-        buffer.append( " (" ).append( getLineWidth() ).append( " )\n" );
-
-        buffer.append( "        .brcType              = " );
-        buffer.append( " (" ).append( getBorderType() ).append( " )\n" );
-
-        buffer.append( "        .ico                  = " );
-        buffer.append( " (" ).append( getColor() ).append( " )\n" );
-
-        buffer.append( "        .dptSpace             = " );
-        buffer.append( " (" ).append( getSpace() ).append( " )\n" );
-
-        buffer.append( "        .fShadow              = " );
-        buffer.append( " (" ).append( isShadow() ).append( " )\n" );
-
-        buffer.append( "        .fFrame               = " );
-        buffer.append( " (" ).append( isFrame() ).append( " )\n" );
-
-        return buffer.toString();
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java
deleted file mode 100644
index 3c5e25f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.Colorref;
-import org.apache.poi.hwpf.model.types.CHPAbstractType;
-
-/**
- * @author Ryan Ackley
- */
-public final class CharacterProperties
-  extends CHPAbstractType implements Cloneable
-{
-  public final static short SPRM_FRMARKDEL = (short)0x0800;
-  public final static short SPRM_FRMARK = 0x0801;
-  public final static short SPRM_FFLDVANISH = 0x0802;
-  public final static short SPRM_PICLOCATION = 0x6A03;
-  public final static short SPRM_IBSTRMARK = 0x4804;
-  public final static short SPRM_DTTMRMARK = 0x6805;
-  public final static short SPRM_FDATA = 0x0806;
-  public final static short SPRM_SYMBOL = 0x6A09;
-  public final static short SPRM_FOLE2 = 0x080A;
-  public final static short SPRM_HIGHLIGHT = 0x2A0C;
-  public final static short SPRM_OBJLOCATION = 0x680E;
-  public final static short SPRM_ISTD = 0x4A30;
-  public final static short SPRM_FBOLD = 0x0835;
-  public final static short SPRM_FITALIC = 0x0836;
-  public final static short SPRM_FSTRIKE = 0x0837;
-  public final static short SPRM_FOUTLINE = 0x0838;
-  public final static short SPRM_FSHADOW = 0x0839;
-  public final static short SPRM_FSMALLCAPS = 0x083A;
-  public final static short SPRM_FCAPS = 0x083B;
-  public final static short SPRM_FVANISH = 0x083C;
-  public final static short SPRM_KUL = 0x2A3E;
-  public final static short SPRM_DXASPACE = (short)0x8840;
-  public final static short SPRM_LID = 0x4A41;
-  public final static short SPRM_ICO = 0x2A42;
-  public final static short SPRM_HPS = 0x4A43;
-  public final static short SPRM_HPSPOS = 0x4845;
-  public final static short SPRM_ISS = 0x2A48;
-  public final static short SPRM_HPSKERN = 0x484B;
-  public final static short SPRM_YSRI = 0x484E;
-  public final static short SPRM_RGFTCASCII = 0x4A4F;
-  public final static short SPRM_RGFTCFAREAST = 0x4A50;
-  public final static short SPRM_RGFTCNOTFAREAST = 0x4A51;
-  public final static short SPRM_CHARSCALE = 0x4852;
-  public final static short SPRM_FDSTRIKE = 0x2A53;
-  public final static short SPRM_FIMPRINT = 0x0854;
-  public final static short SPRM_FSPEC = 0x0855;
-  public final static short SPRM_FOBJ = 0x0856;
-  public final static short SPRM_PROPRMARK = (short)0xCA57;
-  public final static short SPRM_FEMBOSS = 0x0858;
-  public final static short SPRM_SFXTEXT = 0x2859;
-    /*
-     * Microsoft Office Word 97-2007 Binary File Format (.doc) Specification;
-     * Page 60 of 210
-     */
-  public final static short SPRM_DISPFLDRMARK = (short)0xCA62;
-  public final static short SPRM_IBSTRMARKDEL = 0x4863;
-  public final static short SPRM_DTTMRMARKDEL = 0x6864;
-  public final static short SPRM_BRC = 0x6865;
-  public final static short SPRM_SHD = 0x4866;
-  public final static short SPRM_IDSIRMARKDEL = 0x4867;
-  public final static short SPRM_CPG = 0x486B;
-  public final static short SPRM_NONFELID = 0x486D;
-  public final static short SPRM_FELID = 0x486E;
-  public final static short SPRM_IDCTHINT = 0x286F;
-    /**
-     * change chp.cv
-     */
-    public final static short SPRM_CCV = 0x6870;
-
-    public CharacterProperties()
-    {
-        setFUsePgsuSettings( true );
-        setXstDispFldRMark( new byte[36] );
-    }
-
-  public boolean isMarkedDeleted()
-  {
-    return isFRMarkDel();
-  }
-
-  public void markDeleted(boolean mark)
-  {
-    super.setFRMarkDel(mark);
-  }
-
-  public boolean isBold()
-  {
-    return isFBold();
-  }
-
-  public void setBold(boolean bold)
-  {
-    super.setFBold(bold);
-  }
-
-  public boolean isItalic()
-  {
-    return isFItalic();
-  }
-
-  public void setItalic(boolean italic)
-  {
-    super.setFItalic(italic);
-  }
-
-  public boolean isOutlined()
-  {
-    return isFOutline();
-  }
-
-  public void setOutline(boolean outlined)
-  {
-    super.setFOutline(outlined);
-  }
-
-  public boolean isFldVanished()
-  {
-    return isFFldVanish();
-  }
-
-  public void setFldVanish(boolean fldVanish)
-  {
-    super.setFFldVanish(fldVanish);
-  }
-
-  public boolean isSmallCaps()
-  {
-    return isFSmallCaps();
-  }
-
-  public void setSmallCaps(boolean smallCaps)
-  {
-    super.setFSmallCaps(smallCaps);
-  }
-
-  public boolean isCapitalized()
-  {
-    return isFCaps();
-  }
-
-  public void setCapitalized(boolean caps)
-  {
-    super.setFCaps(caps);
-  }
-
-  public boolean isVanished()
-  {
-    return isFVanish();
-  }
-
-  public void setVanished(boolean vanish)
-  {
-    super.setFVanish(vanish);
-
-  }
-  public boolean isMarkedInserted()
-  {
-    return isFRMark();
-  }
-
-  public void markInserted(boolean mark)
-  {
-    super.setFRMark(mark);
-  }
-
-  public boolean isStrikeThrough()
-  {
-    return isFStrike();
-  }
-
-  public void strikeThrough(boolean strike)
-  {
-    super.setFStrike(strike);
-  }
-
-  public boolean isShadowed()
-  {
-    return isFShadow();
-  }
-
-  public void setShadow(boolean shadow)
-  {
-    super.setFShadow(shadow);
-
-  }
-
-  public boolean isEmbossed()
-  {
-    return isFEmboss();
-  }
-
-  public void setEmbossed(boolean emboss)
-  {
-    super.setFEmboss(emboss);
-  }
-
-  public boolean isImprinted()
-  {
-    return isFImprint();
-  }
-
-  public void setImprinted(boolean imprint)
-  {
-    super.setFImprint(imprint);
-  }
-
-  public boolean isDoubleStrikeThrough()
-  {
-    return isFDStrike();
-  }
-
-  public void setDoubleStrikeThrough(boolean dstrike)
-  {
-    super.setFDStrike(dstrike);
-  }
-
-  public int getFontSize()
-  {
-    return getHps();
-  }
-
-  public void setFontSize(int halfPoints)
-  {
-    super.setHps(halfPoints);
-  }
-
-  public int getCharacterSpacing()
-  {
-    return getDxaSpace();
-  }
-
-  public void setCharacterSpacing(int twips)
-  {
-    super.setDxaSpace(twips);
-  }
-
-  public short getSubSuperScriptIndex()
-  {
-    return getIss();
-  }
-
-  public void setSubSuperScriptIndex(short iss)
-  {
-    super.setDxaSpace(iss);
-  }
-
-  public int getUnderlineCode()
-  {
-    return super.getKul();
-  }
-
-  public void setUnderlineCode(int kul)
-  {
-    super.setKul((byte)kul);
-  }
-
-  public int getColor()
-  {
-    return super.getIco();
-  }
-
-  public void setColor(int color)
-  {
-    super.setIco((byte)color);
-  }
-
-  public int getVerticalOffset()
-  {
-    return super.getHpsPos();
-  }
-
-  public void setVerticalOffset(int hpsPos)
-  {
-    super.setHpsPos((short) hpsPos);
-  }
-
-  public int getKerning()
-  {
-    return super.getHpsKern();
-  }
-
-  public void setKerning(int kern)
-  {
-    super.setHpsKern(kern);
-  }
-
-  public boolean isHighlighted()
-  {
-    return super.isFHighlight();
-  }
-
-  public void setHighlighted(byte color)
-  {
-    super.setIcoHighlight(color);
-  }
-
-    /**
-     * Get the ico24 field for the CHP record.
-     */
-    public int getIco24()
-    {
-        if ( !getCv().isEmpty() )
-            return getCv().getValue();
-
-        // convert word 97 colour numbers to 0xBBRRGGRR value
-        switch ( getIco() )
-        {
-        case 0: // auto
-            return -1;
-        case 1: // black
-            return 0x00000000;
-        case 2: // blue
-            return 0x00FF0000;
-        case 3: // cyan
-            return 0x00FFFF00;
-        case 4: // green
-            return 0x0000FF00;
-        case 5: // magenta
-            return 0x00FF00FF;
-        case 6: // red
-            return 0x000000FF;
-        case 7: // yellow
-            return 0x0000FFFF;
-        case 8: // white
-            return 0x00FFFFFF;
-        case 9: // dark blue
-            return 0x00800000;
-        case 10: // dark cyan
-            return 0x00808000;
-        case 11: // dark green
-            return 0x00008000;
-        case 12: // dark magenta
-            return 0x00800080;
-        case 13: // dark red
-            return 0x00000080;
-        case 14: // dark yellow
-            return 0x00008080;
-        case 15: // dark grey
-            return 0x00808080;
-        case 16: // light grey
-            return 0x00C0C0C0;
-        }
-
-        return -1;
-    }
-
-    /**
-     * Set the ico24 field for the CHP record.
-     */
-    public void setIco24( int colour24 )
-    {
-        setCv( new Colorref( colour24 & 0xFFFFFF ) );
-    }
-
-    public CharacterProperties clone()
-    {
-        try
-        {
-            CharacterProperties cp = (CharacterProperties) super.clone();
-
-            cp.setCv( getCv().clone() );
-            cp.setDttmRMark( (DateAndTime) getDttmRMark().clone() );
-            cp.setDttmRMarkDel( (DateAndTime) getDttmRMarkDel().clone() );
-            cp.setDttmPropRMark( (DateAndTime) getDttmPropRMark().clone() );
-            cp.setDttmDispFldRMark( (DateAndTime) getDttmDispFldRMark().clone() );
-            cp.setXstDispFldRMark( getXstDispFldRMark().clone() );
-            cp.setShd( getShd().clone() );
-            cp.setBrc( (BorderCode) getBrc().clone() );
-
-            return cp;
-        }
-        catch ( CloneNotSupportedException exc )
-        {
-            throw new UnsupportedOperationException(
-                    "Impossible CloneNotSupportedException occured", exc );
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
deleted file mode 100644
index 7301333..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
+++ /dev/null
@@ -1,680 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.model.CHPX;
-import org.apache.poi.hwpf.model.FFData;
-import org.apache.poi.hwpf.model.Ffn;
-import org.apache.poi.hwpf.model.NilPICFAndBinData;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-
-/**
- * This class represents a run of text that share common properties.
- */
-public final class CharacterRun extends Range
-  implements Cloneable, org.apache.poi.wp.usermodel.CharacterRun
-{
-  public final static short SPRM_FRMARKDEL = (short)0x0800;
-  public final static short SPRM_FRMARK = 0x0801;
-  public final static short SPRM_FFLDVANISH = 0x0802;
-  public final static short SPRM_PICLOCATION = 0x6A03;
-  public final static short SPRM_IBSTRMARK = 0x4804;
-  public final static short SPRM_DTTMRMARK = 0x6805;
-  public final static short SPRM_FDATA = 0x0806;
-  public final static short SPRM_SYMBOL = 0x6A09;
-  public final static short SPRM_FOLE2 = 0x080A;
-  public final static short SPRM_HIGHLIGHT = 0x2A0C;
-  public final static short SPRM_OBJLOCATION = 0x680E;
-  public final static short SPRM_ISTD = 0x4A30;
-  public final static short SPRM_FBOLD = 0x0835;
-  public final static short SPRM_FITALIC = 0x0836;
-  public final static short SPRM_FSTRIKE = 0x0837;
-  public final static short SPRM_FOUTLINE = 0x0838;
-  public final static short SPRM_FSHADOW = 0x0839;
-  public final static short SPRM_FSMALLCAPS = 0x083A;
-  public final static short SPRM_FCAPS = 0x083B;
-  public final static short SPRM_FVANISH = 0x083C;
-  public final static short SPRM_KUL = 0x2A3E;
-  public final static short SPRM_DXASPACE = (short)0x8840;
-  public final static short SPRM_LID = 0x4A41;
-  public final static short SPRM_ICO = 0x2A42;
-  public final static short SPRM_HPS = 0x4A43;
-  public final static short SPRM_HPSPOS = 0x4845;
-  public final static short SPRM_ISS = 0x2A48;
-  public final static short SPRM_HPSKERN = 0x484B;
-  public final static short SPRM_YSRI = 0x484E;
-  public final static short SPRM_RGFTCASCII = 0x4A4F;
-  public final static short SPRM_RGFTCFAREAST = 0x4A50;
-  public final static short SPRM_RGFTCNOTFAREAST = 0x4A51;
-  public final static short SPRM_CHARSCALE = 0x4852;
-  public final static short SPRM_FDSTRIKE = 0x2A53;
-  public final static short SPRM_FIMPRINT = 0x0854;
-  public final static short SPRM_FSPEC = 0x0855;
-  public final static short SPRM_FOBJ = 0x0856;
-  public final static short SPRM_PROPRMARK = (short)0xCA57;
-  public final static short SPRM_FEMBOSS = 0x0858;
-  public final static short SPRM_SFXTEXT = 0x2859;
-  public final static short SPRM_DISPFLDRMARK = (short)0xCA62;
-  public final static short SPRM_IBSTRMARKDEL = 0x4863;
-  public final static short SPRM_DTTMRMARKDEL = 0x6864;
-  public final static short SPRM_BRC = 0x6865;
-  public final static short SPRM_SHD = 0x4866;
-  public final static short SPRM_IDSIRMARKDEL = 0x4867;
-  public final static short SPRM_CPG = 0x486B;
-  public final static short SPRM_NONFELID = 0x486D;
-  public final static short SPRM_FELID = 0x486E;
-  public final static short SPRM_IDCTHINT = 0x286F;
-
-  protected short _istd;
-  protected SprmBuffer _chpx;
-  protected CharacterProperties _props;
-
-  /**
-   *
-   * @param chpx The chpx this object is based on.
-   * @param ss The stylesheet for the document this run belongs to.
-   * @param istd The style index if this run's base style.
-   * @param parent The parent range of this character run (usually a paragraph).
-   */
-  CharacterRun(CHPX chpx, StyleSheet ss, short istd, Range parent)
-  {
-    super(Math.max(parent._start, chpx.getStart()), Math.min(parent._end, chpx.getEnd()), parent);
-    _props = chpx.getCharacterProperties(ss, istd);
-    _chpx = chpx.getSprmBuf();
-    _istd = istd;
-  }
-
-  /**
-   * Here for runtime type determination using a switch statement convenient.
-   *
-   * @return TYPE_CHARACTER
-   */
-  @SuppressWarnings("deprecation")
-  public int type()
-  {
-    return TYPE_CHARACTER;
-  }
-
-  public boolean isMarkedDeleted()
-  {
-    return _props.isFRMarkDel();
-  }
-
-  public void markDeleted(boolean mark)
-  {
-    _props.setFRMarkDel(mark);
-
-    byte newVal = (byte)(mark ? 1 : 0);
-    _chpx.updateSprm(SPRM_FRMARKDEL, newVal);
-
-  }
-
-  public boolean isBold()
-  {
-    return _props.isFBold();
-  }
-
-  public void setBold(boolean bold)
-  {
-    _props.setFBold(bold);
-
-    byte newVal = (byte)(bold ? 1 : 0);
-    _chpx.updateSprm(SPRM_FBOLD, newVal);
-
-  }
-
-  public boolean isItalic()
-  {
-    return _props.isFItalic();
-  }
-
-  public void setItalic(boolean italic)
-  {
-    _props.setFItalic(italic);
-
-    byte newVal = (byte)(italic ? 1 : 0);
-    _chpx.updateSprm(SPRM_FITALIC, newVal);
-
-  }
-
-  public boolean isOutlined()
-  {
-    return _props.isFOutline();
-  }
-
-  public void setOutline(boolean outlined)
-  {
-    _props.setFOutline(outlined);
-
-    byte newVal = (byte)(outlined ? 1 : 0);
-    _chpx.updateSprm(SPRM_FOUTLINE, newVal);
-
-  }
-
-  public boolean isFldVanished()
-  {
-    return _props.isFFldVanish();
-  }
-
-  public void setFldVanish(boolean fldVanish)
-  {
-    _props.setFFldVanish(fldVanish);
-
-    byte newVal = (byte)(fldVanish ? 1 : 0);
-    _chpx.updateSprm(SPRM_FFLDVANISH, newVal);
-
-  }
-
-  public boolean isSmallCaps()
-  {
-    return _props.isFSmallCaps();
-  }
-
-  public void setSmallCaps(boolean smallCaps)
-  {
-    _props.setFSmallCaps(smallCaps);
-
-    byte newVal = (byte)(smallCaps ? 1 : 0);
-    _chpx.updateSprm(SPRM_FSMALLCAPS, newVal);
-
-  }
-
-  public boolean isCapitalized()
-  {
-    return _props.isFCaps();
-  }
-
-  public void setCapitalized(boolean caps)
-  {
-    _props.setFCaps(caps);
-
-    byte newVal = (byte)(caps ? 1 : 0);
-    _chpx.updateSprm(SPRM_FCAPS, newVal);
-
-  }
-
-  public boolean isVanished()
-  {
-    return _props.isFVanish();
-  }
-
-  public void setVanished(boolean vanish)
-  {
-    _props.setFVanish(vanish);
-
-    byte newVal = (byte)(vanish ? 1 : 0);
-    _chpx.updateSprm(SPRM_FVANISH, newVal);
-
-  }
-
-  public boolean isMarkedInserted()
-  {
-    return _props.isFRMark();
-  }
-
-  public void markInserted(boolean mark)
-  {
-    _props.setFRMark(mark);
-
-    byte newVal = (byte)(mark ? 1 : 0);
-    _chpx.updateSprm(SPRM_FRMARK, newVal);
-
-  }
-
-  public boolean isStrikeThrough()
-  {
-    return _props.isFStrike();
-  }
-
-  public void setStrikeThrough(boolean strike)
-  {
-      strikeThrough(strike);
-  }
-  public void strikeThrough(boolean strike)
-  {
-    _props.setFStrike(strike);
-
-    byte newVal = (byte)(strike ? 1 : 0);
-    _chpx.updateSprm(SPRM_FSTRIKE, newVal);
-
-  }
-
-  public boolean isShadowed()
-  {
-    return _props.isFShadow();
-  }
-
-  public void setShadow(boolean shadow)
-  {
-    _props.setFShadow(shadow);
-
-    byte newVal = (byte)(shadow ? 1 : 0);
-    _chpx.updateSprm(SPRM_FSHADOW, newVal);
-
-  }
-
-  public boolean isEmbossed()
-  {
-    return _props.isFEmboss();
-  }
-
-  public void setEmbossed(boolean emboss)
-  {
-    _props.setFEmboss(emboss);
-
-    byte newVal = (byte)(emboss ? 1 : 0);
-    _chpx.updateSprm(SPRM_FEMBOSS, newVal);
-
-  }
-
-  public boolean isImprinted()
-  {
-    return _props.isFImprint();
-  }
-
-  public void setImprinted(boolean imprint)
-  {
-    _props.setFImprint(imprint);
-
-    byte newVal = (byte)(imprint ? 1 : 0);
-    _chpx.updateSprm(SPRM_FIMPRINT, newVal);
-
-  }
-
-  public boolean isDoubleStrikeThrough()
-  {
-    return _props.isFDStrike();
-  }
-
-  public void setDoubleStrikethrough(boolean dstrike)
-  {
-    _props.setFDStrike(dstrike);
-
-    byte newVal = (byte)(dstrike ? 1 : 0);
-    _chpx.updateSprm(SPRM_FDSTRIKE, newVal);
-
-  }
-
-  public void setFtcAscii(int ftcAscii)
-  {
-    _props.setFtcAscii(ftcAscii);
-
-    _chpx.updateSprm(SPRM_RGFTCASCII, (short)ftcAscii);
-
-  }
-
-  public void setFtcFE(int ftcFE)
-  {
-    _props.setFtcFE(ftcFE);
-
-    _chpx.updateSprm(SPRM_RGFTCFAREAST, (short)ftcFE);
-
-  }
-
-  public void setFtcOther(int ftcOther)
-  {
-    _props.setFtcOther(ftcOther);
-
-    _chpx.updateSprm(SPRM_RGFTCNOTFAREAST, (short)ftcOther);
-
-  }
-
-  public int getFontSize()
-  {
-    return _props.getHps();
-  }
-
-  public void setFontSize(int halfPoints)
-  {
-    _props.setHps(halfPoints);
-
-    _chpx.updateSprm(SPRM_HPS, (short)halfPoints);
-
-  }
-
-  public int getCharacterSpacing()
-  {
-    return _props.getDxaSpace();
-  }
-
-  public void setCharacterSpacing(int twips)
-  {
-    _props.setDxaSpace(twips);
-
-    _chpx.updateSprm(SPRM_DXASPACE, twips);
-
-  }
-
-  public short getSubSuperScriptIndex()
-  {
-    return _props.getIss();
-  }
-
-  public void setSubSuperScriptIndex(short iss)
-  {
-    _props.setDxaSpace(iss);
-
-    _chpx.updateSprm(SPRM_DXASPACE, iss);
-
-  }
-
-  public int getUnderlineCode()
-  {
-    return _props.getKul();
-  }
-
-  public void setUnderlineCode(int kul)
-  {
-    _props.setKul((byte)kul);
-    _chpx.updateSprm(SPRM_KUL, (byte)kul);
-  }
-
-  public int getColor()
-  {
-    return _props.getIco();
-  }
-
-  public void setColor(int color)
-  {
-    _props.setIco((byte)color);
-    _chpx.updateSprm(SPRM_ICO, (byte)color);
-  }
-
-  public int getVerticalOffset()
-  {
-    return _props.getHpsPos();
-  }
-
-  public void setVerticalOffset(int hpsPos)
-  {
-    _props.setHpsPos((short) hpsPos);
-    _chpx.updateSprm(SPRM_HPSPOS, (byte)hpsPos);
-  }
-
-  public int getKerning()
-  {
-    return _props.getHpsKern();
-  }
-
-  public void setKerning(int kern)
-  {
-    _props.setHpsKern(kern);
-    _chpx.updateSprm(SPRM_HPSKERN, (short)kern);
-  }
-
-  public boolean isHighlighted()
-  {
-    return _props.isFHighlight();
-  }
-
-  public byte getHighlightedColor()
-  {
-      return _props.getIcoHighlight();
-  }
-
-  public void setHighlighted(byte color)
-  {
-    _props.setFHighlight(true);
-    _props.setIcoHighlight(color);
-    _chpx.updateSprm(SPRM_HIGHLIGHT, color);
-  }
-
-  public String getFontName()
-  {
-    if (_doc.getFontTable() == null)
-      // old word format
-      return null;
-
-    return _doc.getFontTable().getMainFont(_props.getFtcAscii());
-  }
-
-  public boolean isSpecialCharacter()
-  {
-    return _props.isFSpec();
-  }
-
-  public void setSpecialCharacter(boolean spec)
-  {
-    _props.setFSpec(spec);
-
-    byte newVal = (byte)(spec ? 1 : 0);
-    _chpx.updateSprm(SPRM_FSPEC, newVal);
-  }
-
-  public boolean isObj()
-  {
-    return _props.isFObj();
-  }
-
-  public void setObj(boolean obj)
-  {
-    _props.setFObj(obj);
-
-    byte newVal = (byte)(obj ? 1 : 0);
-    _chpx.updateSprm(SPRM_FOBJ, newVal);
-  }
-
-  public int getPicOffset()
-  {
-    return _props.getFcPic();
-  }
-
-  public void setPicOffset(int offset)
-  {
-    _props.setFcPic(offset);
-    _chpx.updateSprm(SPRM_PICLOCATION, offset);
-  }
-
-  /**
-   * Does the picture offset represent picture
-   *  or binary data?
-   * If it's set, then the picture offset refers to
-   *  a NilPICFAndBinData structure, otherwise to a
-   *  PICFAndOfficeArtData
-   */
-  public boolean isData()
-  {
-    return _props.isFData();
-  }
-
-  public void setData(boolean data)
-  {
-    _props.setFData(data);
-
-    byte newVal = (byte)(data ? 1 : 0);
-    _chpx.updateSprm(SPRM_FOBJ, newVal);
-  }
-
-  public boolean isOle2()
-  {
-    return _props.isFOle2();
-  }
-
-  public void setOle2(boolean ole)
-  {
-    _props.setFOle2(ole);
-
-    byte newVal = (byte)(ole ? 1 : 0);
-    _chpx.updateSprm(SPRM_FOBJ, newVal);
-  }
-
-  public int getObjOffset()
-  {
-    return _props.getFcObj();
-  }
-
-  public void setObjOffset(int obj)
-  {
-    _props.setFcObj(obj);
-    _chpx.updateSprm(SPRM_OBJLOCATION, obj);
-  }
-
-  /**
-  * Get the ico24 field for the CHP record.
-  */
-  public int getIco24()
-  {
-    return _props.getIco24();
-  }
-
-  /**
-   * Set the ico24 field for the CHP record.
-   */
-  public void setIco24(int colour24)
-  {
-    _props.setIco24(colour24);
-  }
-
-  /**
-   * Used to create a deep copy of this object.
-   *
-   * @return A deep copy.
-   * @throws CloneNotSupportedException never
-   */
-  public Object clone()
-    throws CloneNotSupportedException
-  {
-    CharacterRun cp = (CharacterRun)super.clone();
-    cp._props.setDttmRMark((DateAndTime)_props.getDttmRMark().clone());
-    cp._props.setDttmRMarkDel((DateAndTime)_props.getDttmRMarkDel().clone());
-    cp._props.setDttmPropRMark((DateAndTime)_props.getDttmPropRMark().clone());
-    cp._props.setDttmDispFldRMark((DateAndTime)_props.getDttmDispFldRMark().
-                                  clone());
-    cp._props.setXstDispFldRMark(_props.getXstDispFldRMark().clone());
-    cp._props.setShd(_props.getShd().clone());
-
-    return cp;
-  }
-  
-  /**
-   * Returns true, if the CharacterRun is a special character run containing a symbol, otherwise false.
-   *
-   * <p>In case of a symbol, the {@link #text()} method always returns a single character 0x0028, but word actually stores
-   * the character in a different field. Use {@link #getSymbolCharacter()} to get that character and {@link #getSymbolFont()}
-   * to determine its font.
-   */
-  public boolean isSymbol()
-  {
-    return isSpecialCharacter() && text().equals("\u0028");
-  }
-
-  /**
-   * Returns the symbol character, if this is a symbol character run.
-   * 
-   * @see #isSymbol()
-   * @throws IllegalStateException If this is not a symbol character run: call {@link #isSymbol()} first.
-   */
-  public char getSymbolCharacter()
-  {
-    if (isSymbol()) {
-      return (char)_props.getXchSym();
-    } else
-      throw new IllegalStateException("Not a symbol CharacterRun");
-  }
-
-  /**
-   * Returns the symbol font, if this is a symbol character run. Might return null, if the font index is not found in the font table.
-   * 
-   * @see #isSymbol()
-   * @throws IllegalStateException If this is not a symbol character run: call {@link #isSymbol()} first.
-   */
-  public Ffn getSymbolFont()
-  {
-    if (isSymbol()) {
-      if (_doc.getFontTable() == null)
-        return null;
-      
-      // Fetch all font names
-      Ffn[] fontNames = _doc.getFontTable().getFontNames();
-
-      // Try to find the name of the font for our symbol
-      if (fontNames.length <= _props.getFtcSym())
-        return null;
-
-      return fontNames[_props.getFtcSym()];
-    } else
-      throw new IllegalStateException("Not a symbol CharacterRun");
-  }
-  
-  public BorderCode getBorder() {
-    return _props.getBrc();
-  }
-
-  public int getLanguageCode() {
-      return _props.getLidDefault();
-  }
-  
-  /**
-   * <p>Returns the index of the base style which applies to
-   *  this Run. Details of the style can be looked up
-   *  from the {@link StyleSheet}, via
-   *  {@link StyleSheet#getStyleDescription(int)}.</p>
-   * <p>Note that runs typically override some of the style
-   *  properties from the base, so normally style information
-   *  should be fetched directly from the {@link CharacterRun}
-   *  itself.</p>
-   */
-  public short getStyleIndex() {
-    return _istd;
-  }
-  
-  public String toString() {
-     String text = text();
-     return "CharacterRun of " + text.length() + " characters - " + text; 
-  }
-
-    public String[] getDropDownListValues()
-    {
-        if ( getDocument() instanceof HWPFDocument )
-        {
-            char c = _text.charAt( _start );
-            if ( c == 0x01 )
-            {
-                NilPICFAndBinData data = new NilPICFAndBinData(
-                        ( (HWPFDocument) getDocument() ).getDataStream(),
-                        getPicOffset() );
-                FFData ffData = new FFData( data.getBinData(), 0 );
-
-                String[] values = ffData.getDropList();
-                return values;
-            }
-        }
-        return null;
-    }
-
-    public Integer getDropDownListDefaultItemIndex()
-    {
-        if ( getDocument() instanceof HWPFDocument )
-        {
-            char c = _text.charAt( _start );
-            if ( c == 0x01 )
-            {
-                NilPICFAndBinData data = new NilPICFAndBinData(
-                        ( (HWPFDocument) getDocument() ).getDataStream(),
-                        getPicOffset() );
-                FFData ffData = new FFData( data.getBinData(), 0 );
-
-                return Integer.valueOf( ffData.getDefaultDropDownItemIndex() );
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
deleted file mode 100644
index b812b66..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.Calendar;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-
-/**
- * This class is used to represent a date and time in a Word document.
- *
- * @author Ryan Ackley
- */
-public final class DateAndTime
-  implements Cloneable
-{
-    public static final int SIZE = 4;
-    private short _info;
-    private static final BitField _minutes = BitFieldFactory.getInstance(0x3f);
-    private static final BitField _hours = BitFieldFactory.getInstance(0x7c0);
-    private static final BitField _dom = BitFieldFactory.getInstance(0xf800);
-    private short _info2;
-    private static final BitField _months = BitFieldFactory.getInstance(0xf);
-    private static final BitField _years = BitFieldFactory.getInstance(0x1ff0);
-    // private static final BitField _weekday = BitFieldFactory.getInstance(0xe000);
-
-  public DateAndTime()
-  {
-  }
-
-  public DateAndTime(byte[] buf, int offset)
-  {
-    _info = LittleEndian.getShort(buf, offset);
-    _info2 = LittleEndian.getShort(buf, offset + LittleEndian.SHORT_SIZE);
-  }
-  
-  public Calendar getDate() {
-     // TODO Discover if the timezone is stored somewhere else or not
-     Calendar cal = LocaleUtil.getLocaleCalendar(
-           _years.getValue(_info2)+1900, 
-           _months.getValue(_info2)-1, 
-           _dom.getValue(_info), 
-           _hours.getValue(_info), 
-           _minutes.getValue(_info),
-           0
-     );
-     return cal;
-  }
-
-  public void serialize(byte[] buf, int offset)
-  {
-    LittleEndian.putShort(buf, offset, _info);
-    LittleEndian.putShort(buf, offset + LittleEndian.SHORT_SIZE, _info2);
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof DateAndTime)) return false;
-    DateAndTime dttm = (DateAndTime)o;
-    return _info == dttm._info && _info2 == dttm._info2;
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-  
-  public Object clone()
-    throws CloneNotSupportedException
-  {
-    return super.clone();
-  }
-
-    public boolean isEmpty()
-    {
-        return _info == 0 && _info2 == 0;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[DTTM] EMPTY";
-
-        return "[DTTM] " + getDate();
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DocumentPosition.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DocumentPosition.java
deleted file mode 100644
index eb90d55..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DocumentPosition.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.HWPFDocument;
-
-public final class DocumentPosition
-  extends Range
-{
-  public DocumentPosition(HWPFDocument doc, int pos)
-  {
-    super(pos, pos, doc);
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
deleted file mode 100644
index 5ba4e07..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.util.BitField;
-import org.apache.poi.util.BitFieldFactory;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This data structure is used by a paragraph to determine how it should drop
- * its first letter. I think its the visual effect that will show a giant first
- * letter to a paragraph. I've seen this used in the first paragraph of a book
- * 
- * @author Ryan Ackley
- */
-public final class DropCapSpecifier implements Cloneable
-{
-    private short _fdct;
-        private static BitField _lines = BitFieldFactory.getInstance( 0xf8 );
-        private static BitField _type = BitFieldFactory.getInstance( 0x07 );
-
-    public DropCapSpecifier()
-    {
-        this._fdct = 0;
-    }
-
-    public DropCapSpecifier( byte[] buf, int offset )
-    {
-        this( LittleEndian.getShort( buf, offset ) );
-    }
-
-    public DropCapSpecifier( short fdct )
-    {
-        this._fdct = fdct;
-    }
-
-    @Override
-    public DropCapSpecifier clone()
-    {
-        return new DropCapSpecifier( _fdct );
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        DropCapSpecifier other = (DropCapSpecifier) obj;
-        if ( _fdct != other._fdct )
-            return false;
-        return true;
-    }
-
-    public byte getCountOfLinesToDrop()
-    {
-        return (byte) _lines.getValue( _fdct );
-    }
-
-    public byte getDropCapType()
-    {
-        return (byte) _type.getValue( _fdct );
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return _fdct;
-    }
-
-    public boolean isEmpty()
-    {
-        return _fdct == 0;
-    }
-
-    public void setCountOfLinesToDrop( byte value )
-    {
-        _fdct = (short) _lines.setValue( _fdct, value );
-    }
-
-    public void setDropCapType( byte value )
-    {
-        _fdct = (short) _type.setValue( _fdct, value );
-    }
-
-    public short toShort()
-    {
-        return _fdct;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[DCS] EMPTY";
-
-        return "[DCS] (type: " + getDropCapType() + "; count: "
-                + getCountOfLinesToDrop() + ")";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java
deleted file mode 100644
index de7ebcd..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-public interface Field
-{
-
-    Range firstSubrange( Range parent );
-
-    /**
-     * @return character position of first character after field (i.e.
-     *         {@link #getMarkEndOffset()} + 1)
-     */
-    int getFieldEndOffset();
-
-    /**
-     * @return character position of first character in field (i.e.
-     *         {@link #getFieldStartOffset()})
-     */
-    int getFieldStartOffset();
-
-    CharacterRun getMarkEndCharacterRun( Range parent );
-
-    /**
-     * @return character position of end field mark
-     */
-    int getMarkEndOffset();
-
-    CharacterRun getMarkSeparatorCharacterRun( Range parent );
-
-    /**
-     * @return character position of separator field mark (if present,
-     *         {@link NullPointerException} otherwise)
-     */
-    int getMarkSeparatorOffset();
-
-    CharacterRun getMarkStartCharacterRun( Range parent );
-
-    /**
-     * @return character position of start field mark
-     */
-    int getMarkStartOffset();
-
-    int getType();
-
-    boolean hasSeparator();
-
-    boolean isHasSep();
-
-    boolean isLocked();
-
-    boolean isNested();
-
-    boolean isPrivateResult();
-
-    boolean isResultDirty();
-
-    boolean isResultEdited();
-
-    boolean isZombieEmbed();
-
-    Range secondSubrange( Range parent );
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java
deleted file mode 100644
index 37131c3..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.FieldDescriptor;
-import org.apache.poi.hwpf.model.PlexOfField;
-import org.apache.poi.util.Internal;
-
-/**
- * TODO: document me
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-class FieldImpl implements Field
-{
-    private PlexOfField endPlex;
-    private PlexOfField separatorPlex;
-    private PlexOfField startPlex;
-
-    public FieldImpl( PlexOfField startPlex, PlexOfField separatorPlex,
-            PlexOfField endPlex )
-    {
-        if ( startPlex == null )
-            throw new IllegalArgumentException( "startPlex == null" );
-        if ( endPlex == null )
-            throw new IllegalArgumentException( "endPlex == null" );
-
-        if ( startPlex.getFld().getBoundaryType() != FieldDescriptor.FIELD_BEGIN_MARK )
-            throw new IllegalArgumentException( "startPlex (" + startPlex
-                    + ") is not type of FIELD_BEGIN" );
-
-        if ( separatorPlex != null
-                && separatorPlex.getFld().getBoundaryType() != FieldDescriptor.FIELD_SEPARATOR_MARK )
-            throw new IllegalArgumentException( "separatorPlex" + separatorPlex
-                    + ") is not type of FIELD_SEPARATOR" );
-
-        if ( endPlex.getFld().getBoundaryType() != FieldDescriptor.FIELD_END_MARK )
-            throw new IllegalArgumentException( "endPlex (" + endPlex
-                    + ") is not type of FIELD_END" );
-
-        this.startPlex = startPlex;
-        this.separatorPlex = separatorPlex;
-        this.endPlex = endPlex;
-    }
-
-    public Range firstSubrange( Range parent )
-    {
-        if ( hasSeparator() )
-        {
-            if ( getMarkStartOffset() + 1 == getMarkSeparatorOffset() )
-                return null;
-
-            return new Range( getMarkStartOffset() + 1,
-                    getMarkSeparatorOffset(), parent )
-            {
-                @Override
-                public String toString()
-                {
-                    return "FieldSubrange1 (" + super.toString() + ")";
-                }
-            };
-        }
-
-        if ( getMarkStartOffset() + 1 == getMarkEndOffset() )
-            return null;
-
-        return new Range( getMarkStartOffset() + 1, getMarkEndOffset(), parent )
-        {
-            @Override
-            public String toString()
-            {
-                return "FieldSubrange1 (" + super.toString() + ")";
-            }
-        };
-    }
-
-    /**
-     * @return character position of first character after field (i.e.
-     *         {@link #getMarkEndOffset()} + 1)
-     */
-    public int getFieldEndOffset()
-    {
-        /*
-         * sometimes plex looks like [100, 2000), where 100 is the position of
-         * field-end character, and 2000 - some other char position, far away
-         * from field (not inside). So taking into account only start --sergey
-         */
-        return endPlex.getFcStart() + 1;
-    }
-
-    /**
-     * @return character position of first character in field (i.e.
-     *         {@link #getFieldStartOffset()})
-     */
-    public int getFieldStartOffset()
-    {
-        return startPlex.getFcStart();
-    }
-
-    public CharacterRun getMarkEndCharacterRun( Range parent )
-    {
-        return new Range( getMarkEndOffset(), getMarkEndOffset() + 1, parent )
-                .getCharacterRun( 0 );
-    }
-
-    /**
-     * @return character position of end field mark
-     */
-    public int getMarkEndOffset()
-    {
-        return endPlex.getFcStart();
-    }
-
-    public CharacterRun getMarkSeparatorCharacterRun( Range parent )
-    {
-        if ( !hasSeparator() )
-            return null;
-
-        return new Range( getMarkSeparatorOffset(),
-                getMarkSeparatorOffset() + 1, parent ).getCharacterRun( 0 );
-    }
-
-    /**
-     * @return character position of separator field mark (if present,
-     *         {@link NullPointerException} otherwise)
-     */
-    public int getMarkSeparatorOffset()
-    {
-        return separatorPlex.getFcStart();
-    }
-
-    public CharacterRun getMarkStartCharacterRun( Range parent )
-    {
-        return new Range( getMarkStartOffset(), getMarkStartOffset() + 1,
-                parent ).getCharacterRun( 0 );
-    }
-
-    /**
-     * @return character position of start field mark
-     */
-    public int getMarkStartOffset()
-    {
-        return startPlex.getFcStart();
-    }
-
-    public int getType()
-    {
-        return startPlex.getFld().getFieldType();
-    }
-
-    public boolean hasSeparator()
-    {
-        return separatorPlex != null;
-    }
-
-    public boolean isHasSep()
-    {
-        return endPlex.getFld().isFHasSep();
-    }
-
-    public boolean isLocked()
-    {
-        return endPlex.getFld().isFLocked();
-    }
-
-    public boolean isNested()
-    {
-        return endPlex.getFld().isFNested();
-    }
-
-    public boolean isPrivateResult()
-    {
-        return endPlex.getFld().isFPrivateResult();
-    }
-
-    public boolean isResultDirty()
-    {
-        return endPlex.getFld().isFResultDirty();
-    }
-
-    public boolean isResultEdited()
-    {
-        return endPlex.getFld().isFResultEdited();
-    }
-
-    public boolean isZombieEmbed()
-    {
-        return endPlex.getFld().isFZombieEmbed();
-    }
-
-    public Range secondSubrange( Range parent )
-    {
-        if ( !hasSeparator()
-                || getMarkSeparatorOffset() + 1 == getMarkEndOffset() )
-            return null;
-
-        return new Range( getMarkSeparatorOffset() + 1, getMarkEndOffset(),
-                parent )
-        {
-            @Override
-            public String toString()
-            {
-                return "FieldSubrange2 (" + super.toString() + ")";
-            }
-        };
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Field [" + getFieldStartOffset() + "; " + getFieldEndOffset()
-                + "] (type: 0x" + Integer.toHexString( getType() ) + " = "
-                + getType() + " )";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java
deleted file mode 100644
index 2db551e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.Collection;
-
-import org.apache.poi.hwpf.model.FieldsDocumentPart;
-
-/**
- * User-friendly interface to access document {@link Field}s
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public interface Fields
-{
-    Field getFieldByStartOffset( FieldsDocumentPart documentPart, int offset );
-
-    Collection<Field> getFields( FieldsDocumentPart part );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java
deleted file mode 100644
index 7f73e59..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hwpf.model.FieldDescriptor;
-import org.apache.poi.hwpf.model.FieldsDocumentPart;
-import org.apache.poi.hwpf.model.FieldsTables;
-import org.apache.poi.hwpf.model.PlexOfField;
-import org.apache.poi.util.Internal;
-
-/**
- * Default implementation of {@link Field}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-@Internal
-public class FieldsImpl implements Fields
-{
-    /**
-     * This is port and adaptation of Arrays.binarySearch from Java 6 (Apache
-     * Harmony).
-     */
-    private static <T> int binarySearch( List<PlexOfField> list,
-            int startIndex, int endIndex, int requiredStartOffset )
-    {
-        checkIndexForBinarySearch( list.size(), startIndex, endIndex );
-
-        int low = startIndex, mid = -1, high = endIndex - 1, result = 0;
-        while ( low <= high )
-        {
-            mid = ( low + high ) >>> 1;
-            int midStart = list.get( mid ).getFcStart();
-
-            if ( midStart == requiredStartOffset )
-            {
-                return mid;
-            }
-            else if ( midStart < requiredStartOffset )
-            {
-                low = mid + 1;
-            }
-            else
-            {
-                high = mid - 1;
-            }
-        }
-        if ( mid < 0 )
-        {
-            int insertPoint = endIndex;
-            for ( int index = startIndex; index < endIndex; index++ )
-            {
-                if ( requiredStartOffset < list.get( index ).getFcStart() )
-                {
-                    insertPoint = index;
-                }
-            }
-            return -insertPoint - 1;
-        }
-        return -mid - ( result >= 0 ? 1 : 2 );
-    }
-
-    private static void checkIndexForBinarySearch( int length, int start,
-            int end )
-    {
-        if ( start > end )
-        {
-            throw new IllegalArgumentException();
-        }
-        if ( length < end || 0 > start )
-        {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-    }
-
-    private Map<FieldsDocumentPart, Map<Integer, FieldImpl>> _fieldsByOffset;
-
-    private PlexOfFieldComparator comparator = new PlexOfFieldComparator();
-
-    public FieldsImpl( FieldsTables fieldsTables )
-    {
-        _fieldsByOffset = new HashMap<FieldsDocumentPart, Map<Integer, FieldImpl>>(
-                FieldsDocumentPart.values().length );
-
-        for ( FieldsDocumentPart part : FieldsDocumentPart.values() )
-        {
-            List<PlexOfField> plexOfCps = fieldsTables.getFieldsPLCF( part );
-            _fieldsByOffset.put( part, parseFieldStructure( plexOfCps ) );
-        }
-    }
-
-    public Collection<Field> getFields( FieldsDocumentPart part )
-    {
-        Map<Integer, FieldImpl> map = _fieldsByOffset.get( part );
-        if ( map == null || map.isEmpty() )
-            return Collections.emptySet();
-
-        return Collections.<Field> unmodifiableCollection( map.values() );
-    }
-
-    public FieldImpl getFieldByStartOffset( FieldsDocumentPart documentPart,
-            int offset )
-    {
-        Map<Integer, FieldImpl> map = _fieldsByOffset.get( documentPart );
-        if ( map == null || map.isEmpty() )
-            return null;
-
-        return map.get( Integer.valueOf( offset ) );
-    }
-
-    private Map<Integer, FieldImpl> parseFieldStructure(
-            List<PlexOfField> plexOfFields )
-    {
-        if ( plexOfFields == null || plexOfFields.isEmpty() )
-            return new HashMap<Integer, FieldImpl>();
-
-        Collections.sort( plexOfFields, comparator );
-        List<FieldImpl> fields = new ArrayList<FieldImpl>(
-                plexOfFields.size() / 3 + 1 );
-        parseFieldStructureImpl( plexOfFields, 0, plexOfFields.size(), fields );
-
-        HashMap<Integer, FieldImpl> result = new HashMap<Integer, FieldImpl>(
-                fields.size() );
-        for ( FieldImpl field : fields )
-        {
-            result.put( Integer.valueOf( field.getFieldStartOffset() ), field );
-        }
-        return result;
-    }
-
-    private void parseFieldStructureImpl( List<PlexOfField> plexOfFields,
-            int startOffsetInclusive, int endOffsetExclusive,
-            List<FieldImpl> result )
-    {
-        int next = startOffsetInclusive;
-        while ( next < endOffsetExclusive )
-        {
-            PlexOfField startPlexOfField = plexOfFields.get( next );
-            if ( startPlexOfField.getFld().getBoundaryType() != FieldDescriptor.FIELD_BEGIN_MARK )
-            {
-                /* Start mark seems to be missing */
-                next++;
-                continue;
-            }
-
-            /*
-             * we have start node. end offset points to next node, separator or
-             * end
-             */
-            int nextNodePositionInList = binarySearch( plexOfFields, next + 1,
-                    endOffsetExclusive, startPlexOfField.getFcEnd() );
-            if ( nextNodePositionInList < 0 )
-            {
-                /*
-                 * too bad, this start field mark doesn't have corresponding end
-                 * field mark or separator field mark in fields table
-                 */
-                next++;
-                continue;
-            }
-            PlexOfField nextPlexOfField = plexOfFields
-                    .get( nextNodePositionInList );
-
-            switch ( nextPlexOfField.getFld().getBoundaryType() )
-            {
-            case FieldDescriptor.FIELD_SEPARATOR_MARK:
-            {
-                PlexOfField separatorPlexOfField = nextPlexOfField;
-
-                int endNodePositionInList = binarySearch( plexOfFields,
-                        nextNodePositionInList, endOffsetExclusive,
-                        separatorPlexOfField.getFcEnd() );
-                if ( endNodePositionInList < 0 )
-                {
-                    /*
-                     * too bad, this separator field mark doesn't have
-                     * corresponding end field mark in fields table
-                     */
-                    next++;
-                    continue;
-                }
-                PlexOfField endPlexOfField = plexOfFields
-                        .get( endNodePositionInList );
-
-                if ( endPlexOfField.getFld().getBoundaryType() != FieldDescriptor.FIELD_END_MARK )
-                {
-                    /* Not and ending mark */
-                    next++;
-                    continue;
-                }
-
-                FieldImpl field = new FieldImpl( startPlexOfField,
-                        separatorPlexOfField, endPlexOfField );
-                result.add( field );
-
-                // adding included fields
-                if ( startPlexOfField.getFcStart() + 1 < separatorPlexOfField
-                        .getFcStart() - 1 )
-                {
-                    parseFieldStructureImpl( plexOfFields, next + 1,
-                            nextNodePositionInList, result );
-                }
-                if ( separatorPlexOfField.getFcStart() + 1 < endPlexOfField
-                        .getFcStart() - 1 )
-                {
-                    parseFieldStructureImpl( plexOfFields,
-                            nextNodePositionInList + 1, endNodePositionInList,
-                            result );
-                }
-
-                next = endNodePositionInList + 1;
-
-                break;
-            }
-            case FieldDescriptor.FIELD_END_MARK:
-            {
-                // we have no separator
-                FieldImpl field = new FieldImpl( startPlexOfField, null,
-                        nextPlexOfField );
-                result.add( field );
-
-                // adding included fields
-                if ( startPlexOfField.getFcStart() + 1 < nextPlexOfField
-                        .getFcStart() - 1 )
-                {
-                    parseFieldStructureImpl( plexOfFields, next + 1,
-                            nextNodePositionInList, result );
-                }
-
-                next = nextNodePositionInList + 1;
-                break;
-            }
-            case FieldDescriptor.FIELD_BEGIN_MARK:
-            default:
-            {
-                /* something is wrong, ignoring this mark along with start mark */
-                next++;
-                continue;
-            }
-            }
-        }
-    }
-
-    private static final class PlexOfFieldComparator implements Comparator<PlexOfField>, Serializable {
-        public int compare( PlexOfField o1, PlexOfField o2 )
-        {
-            int thisVal = o1.getFcStart();
-            int anotherVal = o2.getFcStart();
-            return thisVal < anotherVal ? -1 : thisVal == anotherVal ? 0 : 1;
-        }
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java
deleted file mode 100644
index 6f69f71..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.ListTables;
-
-import org.apache.poi.util.Internal;
-
-import org.apache.poi.hwpf.model.LFO;
-import org.apache.poi.hwpf.model.LFOData;
-import org.apache.poi.hwpf.model.ListData;
-import org.apache.poi.hwpf.model.ListFormatOverrideLevel;
-import org.apache.poi.hwpf.model.ListLevel;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.sprm.CharacterSprmCompressor;
-import org.apache.poi.hwpf.sprm.ParagraphSprmCompressor;
-
-/**
- * This class is used to create a list in a Word document. It is used in
- * conjunction with
- * {@link org.apache.poi.hwpf.HWPFDocument#registerList(HWPFList) registerList}
- * in {@link org.apache.poi.hwpf.HWPFDocument HWPFDocument}.
- * 
- * In Word, lists are not ranged entities, meaning you can't actually add one to
- * the document. Lists only act as properties for list entries. Once you
- * register a list, you can add list entries to a document that are a part of
- * the list.
- * 
- * The only benefit of this that I see, is that you can add a list entry
- * anywhere in the document and continue numbering from the previous list.
- * 
- * @author Ryan Ackley
- */
-public final class HWPFList
-{
-    //private static POILogger log = POILogFactory.getLogger( HWPFList.class );
-
-    private boolean _ignoreLogicalLeftIdentation = false;
-    private LFO _lfo;
-    private LFOData _lfoData;
-    private ListData _listData;
-    private ListTables _listTables;
-    private boolean _registered;
-    private StyleSheet _styleSheet;
-
-    /**
-     * 
-     * @param numbered
-     *            true if the list should be numbered; false if it should be
-     *            bulleted.
-     * @param styleSheet
-     *            The document's stylesheet.
-     */
-    public HWPFList( boolean numbered, StyleSheet styleSheet )
-    {
-        _listData = new ListData(
-                (int) ( Math.random() * System.currentTimeMillis() ), numbered );
-        _lfo = new LFO();
-        _lfo.setLsid( _listData.getLsid() );
-        _lfoData = new LFOData();
-        _styleSheet = styleSheet;
-    }
-
-    public HWPFList( StyleSheet styleSheet, ListTables listTables, int ilfo )
-    {
-        _listTables = listTables;
-        _styleSheet = styleSheet;
-        _registered = true;
-
-        /* See documentation for sprmPIlfo (0x460B) */
-        if ( ilfo == 0 || ilfo == 0xF801 )
-        {
-            throw new IllegalArgumentException( "Paragraph not in list" );
-        }
-        else if ( 0x0001 <= ilfo && ilfo <= 0x07FE )
-        {
-            _lfo = listTables.getLfo( ilfo );
-            _lfoData = listTables.getLfoData( ilfo );
-        }
-        else if ( 0xF802 <= ilfo && ilfo <= 0xFFFF )
-        {
-            int nilfo = ilfo ^ 0xFFFF;
-            _lfo = listTables.getLfo( nilfo );
-            _lfoData = listTables.getLfoData( nilfo );
-            _ignoreLogicalLeftIdentation = true;
-        }
-        else
-        {
-            throw new IllegalArgumentException( "Incorrect ilfo: " + ilfo );
-        }
-
-        _listData = listTables.getListData( _lfo.getLsid() );
-    }
-
-    @Internal
-    public LFO getLFO()
-    {
-        return _lfo;
-    }
-
-    @Internal
-    public LFOData getLFOData()
-    {
-        return _lfoData;
-    }
-
-    @Internal
-    public ListData getListData()
-    {
-        return _listData;
-    }
-
-    public int getLsid()
-    {
-        return _lfo.getLsid();
-    }
-
-    @Internal
-    ListLevel getLVL( char level )
-    {
-        if ( level >= _listData.numLevels() )
-        {
-            throw new IllegalArgumentException( "Required level "
-                    + ( (int) level )
-                    + " is more than number of level for list ("
-                    + _listData.numLevels() + ")" );
-        }
-        ListLevel lvl = _listData.getLevels()[level];
-        return lvl;
-    }
-
-    /**
-     * An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies
-     * the format of the level numbers that replace the placeholders for this
-     * level in the xst fields of the LVLs in this list. This value MUST not be
-     * equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17,
-     * this level does not have a number sequence and therefore has no number
-     * formatting. If this is equal to 0x17, the level uses bullets.
-     */
-    public int getNumberFormat( char level )
-    {
-        return getLVL( level ).getNumberFormat();
-    }
-
-    public String getNumberText( char level )
-    {
-        return getLVL( level ).getNumberText();
-    }
-
-    public int getStartAt( char level )
-    {
-        if ( isStartAtOverriden( level ) )
-        {
-            return _lfoData.getRgLfoLvl()[level].getIStartAt();
-        }
-
-        return getLVL( level ).getStartAt();
-    }
-
-    /**
-     * "The type of character following the number text for the paragraph: 0 == tab, 1 == space, 2 == nothing."
-     */
-    public byte getTypeOfCharFollowingTheNumber( char level )
-    {
-        return getLVL( level ).getTypeOfCharFollowingTheNumber();
-    }
-
-    public boolean isIgnoreLogicalLeftIdentation()
-    {
-        return _ignoreLogicalLeftIdentation;
-    }
-
-    public boolean isStartAtOverriden( char level )
-    {
-        ListFormatOverrideLevel lfolvl = _lfoData.getRgLfoLvl().length > level ? _lfoData
-                .getRgLfoLvl()[level] : null;
-
-        return lfolvl != null && lfolvl.getIStartAt() != 0
-                && !lfolvl.isFormatting();
-    }
-
-    public void setIgnoreLogicalLeftIdentation(
-            boolean ignoreLogicalLeftIdentation )
-    {
-        this._ignoreLogicalLeftIdentation = ignoreLogicalLeftIdentation;
-    }
-
-    /**
-     * Sets the character properties of the list numbers.
-     * 
-     * @param level
-     *            the level number that the properties should apply to.
-     * @param chp
-     *            The character properties.
-     */
-    public void setLevelNumberProperties( int level, CharacterProperties chp )
-    {
-        ListLevel listLevel = _listData.getLevel( level );
-        int styleIndex = _listData.getLevelStyle( level );
-        CharacterProperties base = _styleSheet.getCharacterStyle( styleIndex );
-
-        byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty( chp,
-                base );
-        listLevel.setNumberProperties( grpprl );
-    }
-
-    /**
-     * Sets the paragraph properties for a particular level of the list.
-     * 
-     * @param level
-     *            The level number.
-     * @param pap
-     *            The paragraph properties
-     */
-    public void setLevelParagraphProperties( int level, ParagraphProperties pap )
-    {
-        ListLevel listLevel = _listData.getLevel( level );
-        int styleIndex = _listData.getLevelStyle( level );
-        ParagraphProperties base = _styleSheet.getParagraphStyle( styleIndex );
-
-        byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty( pap,
-                base );
-        listLevel.setLevelProperties( grpprl );
-    }
-
-    public void setLevelStyle( int level, int styleIndex )
-    {
-        _listData.setLevelStyle( level, styleIndex );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
deleted file mode 100644
index 84a0e9b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.model.FileInformationBlock;
-import org.apache.poi.hwpf.model.GenericPropertyNode;
-import org.apache.poi.hwpf.model.PlexOfCps;
-import org.apache.poi.hwpf.model.SubdocumentType;
-
-/**
- * A HeaderStory is a Header, a Footer, or footnote/endnote
- *  separator.
- * All the Header Stories get stored in the same Range in the
- *  document, and this handles getting out all the individual
- *  parts.
- *
- * WARNING - you shouldn't change the headers or footers,
- *  as offsets are not yet updated!
- */
-public final class HeaderStories {
-	private Range headerStories;
-	private PlexOfCps plcfHdd;
-
-	private boolean stripFields = false;
-
-	public HeaderStories(HWPFDocument doc) {
-		this.headerStories = doc.getHeaderStoryRange();
-		FileInformationBlock fib = doc.getFileInformationBlock();
-
-//        // If there's no PlcfHdd, nothing to do
-//        if(fib.getCcpHdd() == 0) {
-//            return;
-//        }
-
-        if (fib.getSubdocumentTextStreamLength( SubdocumentType.HEADER ) == 0)
-		    return;
-		
-		if(fib.getPlcfHddSize() == 0) {
-			return;
-		}
-
-        // Handle the PlcfHdd
-        /*
-         * Page 88:
-         * 
-         * "The plcfhdd, a table whose location and length within the file is
-         * stored in fib.fcPlcfhdd and fib.cbPlcfhdd, describes where the text
-         * of each header/footer begins. If there are n headers/footers stored
-         * in the Word file, the plcfhdd consists of n+2 CP entries. The
-         * beginning CP of the ith header/footer is the ith CP in the plcfhdd.
-         * The limit CP (the CP of character 1 position past the end of a
-         * header/footer) of the ith header/footer is the i+1st CP in the
-         * plcfhdd. Note: at the limit CP - 1, Word always places a chEop as a
-         * placeholder which is never displayed as part of the header/footer.
-         * This allows Word to change an existing header/footer to be empty.
-         * 
-         * If there are n header/footers, the n+2nd CP entry value is always 1
-         * greater than the n+1st CP entry value. A paragraph end (ASCII 13) is
-         * always stored at the file position marked by the n+1st CP value.
-         * 
-         * The transformation in a full saved file from a header/footer CP to an
-         * offset from the beginning of a file (fc) is
-         * fc=fib.fcMin+ccpText+ccpFtn+cp."
-         */
-        plcfHdd = new PlexOfCps( doc.getTableStream(), fib.getPlcfHddOffset(),
-                fib.getPlcfHddSize(), 0 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getFootnoteSeparator()
-    {
-        return getAt( 0 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getFootnoteContSeparator()
-    {
-        return getAt( 1 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getFootnoteContNote()
-    {
-        return getAt( 2 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getEndnoteSeparator()
-    {
-        return getAt( 3 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getEndnoteContSeparator()
-    {
-        return getAt( 4 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getEndnoteContNote()
-    {
-        return getAt( 5 );
-    }
-
-    public Range getFootnoteSeparatorSubrange()
-    {
-        return getSubrangeAt( 0 );
-    }
-
-    public Range getFootnoteContSeparatorSubrange()
-    {
-        return getSubrangeAt( 1 );
-    }
-
-    public Range getFootnoteContNoteSubrange()
-    {
-        return getSubrangeAt( 2 );
-    }
-
-    public Range getEndnoteSeparatorSubrange()
-    {
-        return getSubrangeAt( 3 );
-    }
-
-    public Range getEndnoteContSeparatorSubrange()
-    {
-        return getSubrangeAt( 4 );
-    }
-
-    public Range getEndnoteContNoteSubrange()
-    {
-        return getSubrangeAt( 5 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-	@Deprecated
-	public String getEvenHeader() {
-		return getAt(6+0);
-	}
-	/**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getOddHeader() {
-		return getAt(6+1);
-	}
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getFirstHeader() {
-		return getAt(6+4);
-	}
-	
-
-    public Range getEvenHeaderSubrange() {
-        return getSubrangeAt(6+0);
-    }
-    public Range getOddHeaderSubrange() {
-        return getSubrangeAt(6+1);
-    }
-    public Range getFirstHeaderSubrange() {
-        return getSubrangeAt(6+4);
-    }
-    
-	/**
-	 * Returns the correct, defined header for the given
-	 *  one based page
-	 * @param pageNumber The one based page number
-	 */
-	public String getHeader(int pageNumber) {
-		// First page header is optional, only return
-		//  if it's set
-		if(pageNumber == 1) {
-			if(getFirstHeader().length() > 0) {
-				return getFirstHeader();
-			}
-		}
-		// Even page header is optional, only return
-		//  if it's set
-		if(pageNumber % 2 == 0) {
-			if(getEvenHeader().length() > 0) {
-				return getEvenHeader();
-			}
-		}
-		// Odd is the default
-		return getOddHeader();
-	}
-
-	/**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getEvenFooter()
-    {
-        return getAt( 6 + 2 );
-    }
-
-	/**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getOddFooter()
-    {
-        return getAt( 6 + 3 );
-    }
-
-    /**
-     * @deprecated 3.8 beta 4 
-     */
-    @Deprecated
-    public String getFirstFooter()
-    {
-        return getAt( 6 + 5 );
-    }
-
-    public Range getEvenFooterSubrange()
-    {
-        return getSubrangeAt( 6 + 2 );
-    }
-
-    public Range getOddFooterSubrange()
-    {
-        return getSubrangeAt( 6 + 3 );
-    }
-
-    public Range getFirstFooterSubrange()
-    {
-        return getSubrangeAt( 6 + 5 );
-    }
-
-	/**
-	 * Returns the correct, defined footer for the given
-	 *  one based page
-	 * @param pageNumber The one based page number
-	 */
-	public String getFooter(int pageNumber) {
-		// First page footer is optional, only return
-		//  if it's set
-		if(pageNumber == 1) {
-			if(getFirstFooter().length() > 0) {
-				return getFirstFooter();
-			}
-		}
-		// Even page footer is optional, only return
-		//  if it's set
-		if(pageNumber % 2 == 0) {
-			if(getEvenFooter().length() > 0) {
-				return getEvenFooter();
-			}
-		}
-		// Odd is the default
-		return getOddFooter();
-	}
-
-
-	/**
-	 * Get the string that's pointed to by the
-	 *  given plcfHdd index
-	 * @deprecated 3.8 beta 4
-	 */
-    @Deprecated
-	private String getAt(int plcfHddIndex) {
-		if(plcfHdd == null) return null;
-
-		GenericPropertyNode prop = plcfHdd.getProperty(plcfHddIndex);
-		if(prop.getStart() == prop.getEnd()) {
-			// Empty story
-			return "";
-		}
-		if(prop.getEnd() < prop.getStart()) {
-		   // Broken properties?
-		   return "";
-		}
-
-		// Ensure we're getting a sensible length
-		String rawText = headerStories.text();
-		int start = Math.min(prop.getStart(), rawText.length());
-		int end = Math.min(prop.getEnd(), rawText.length());
-
-		// Grab the contents
-		String text = rawText.substring(start, end);
-
-		// Strip off fields and macros if requested
-		if(stripFields) {
-			return Range.stripFields(text);
-		}
-		// If you create a header/footer, then remove it again, word
-		//  will leave \r\r. Turn these back into an empty string,
-		//  which is more what you'd expect
-		if(text.equals("\r\r")) {
-			return "";
-		}
-
-		return text;
-	}
-
-    private Range getSubrangeAt( int plcfHddIndex )
-    {
-        if ( plcfHdd == null )
-            return null;
-
-        GenericPropertyNode prop = plcfHdd.getProperty( plcfHddIndex );
-        if ( prop.getStart() == prop.getEnd() )
-        {
-            // Empty story
-            return null;
-        }
-        if ( prop.getEnd() < prop.getStart() )
-        {
-            // Broken properties?
-            return null;
-        }
-
-        final int headersLength = headerStories.getEndOffset()
-                - headerStories.getStartOffset();
-        int start = Math.min( prop.getStart(), headersLength );
-        int end = Math.min( prop.getEnd(), headersLength );
-
-        return new Range( headerStories.getStartOffset() + start,
-                headerStories.getStartOffset() + end, headerStories );
-    }
-
-	public Range getRange() {
-		return headerStories;
-	}
-	protected PlexOfCps getPlcfHdd() {
-		return plcfHdd;
-	}
-
-	/**
-	 * Are fields currently being stripped from
-	 *  the text that this {@link HeaderStories} returns?
-	 *  Default is false, but can be changed
-	 */
-	public boolean areFieldsStripped() {
-		return stripFields;
-	}
-	/**
-	 * Should fields (eg macros) be stripped from
-	 *  the text that this class returns?
-	 * Default is not to strip.
-	 * @param stripFields
-	 */
-	public void setAreFieldsStripped(boolean stripFields) {
-		this.stripFields = stripFields;
-	}
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
deleted file mode 100644
index 6e6b802..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.util.LittleEndian;
-
-/**
- * This class is used to determine line spacing for a paragraph.
- *
- * @author Ryan Ackley
- */
-public final class LineSpacingDescriptor
-  implements Cloneable
-{
-  short _dyaLine;
-  short _fMultiLinespace;
-
-  public LineSpacingDescriptor()
-  {
-      //see page 181
-      _dyaLine = 240;
-      _fMultiLinespace = 1;
-  }
-
-  public LineSpacingDescriptor(byte[] buf, int offset)
-  {
-    _dyaLine = LittleEndian.getShort(buf, offset);
-    _fMultiLinespace = LittleEndian.getShort(buf, offset + LittleEndian.SHORT_SIZE);
-  }
-
-  public Object clone()
-    throws CloneNotSupportedException
-  {
-    return super.clone();
-  }
-
-  public void setMultiLinespace(short fMultiLinespace)
-  {
-    _fMultiLinespace = fMultiLinespace;
-  }
-
-  public int toInt()
-  {
-    byte[] intHolder = new byte[4];
-    serialize(intHolder, 0);
-    return LittleEndian.getInt(intHolder);
-  }
-
-  public void serialize(byte[] buf, int offset)
-  {
-    LittleEndian.putShort(buf, offset, _dyaLine);
-    LittleEndian.putShort(buf, offset + LittleEndian.SHORT_SIZE, _fMultiLinespace);
-  }
-
-  public void setDyaLine(short dyaLine)
-  {
-    _dyaLine = dyaLine;
-  }
-  
-  @Override
-  public boolean equals(Object o)
-  {
-    if (!(o instanceof LineSpacingDescriptor)) return false;
-    LineSpacingDescriptor lspd = (LineSpacingDescriptor)o;
-
-    return _dyaLine == lspd._dyaLine && _fMultiLinespace == lspd._fMultiLinespace;
-  }
-
-  @Override
-  public int hashCode() {
-      assert false : "hashCode not designed";
-      return 42; // any arbitrary constant will do
-  }
-  
-    public boolean isEmpty()
-    {
-        return _dyaLine == 0 && _fMultiLinespace == 0;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[LSPD] EMPTY";
-
-        return "[LSPD] (dyaLine: " + _dyaLine + "; fMultLinespace: "
-                + _fMultiLinespace + ")";
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java
deleted file mode 100644
index d7158fa..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.PAPX;
-import org.apache.poi.util.Internal;
-
-public final class ListEntry extends Paragraph
-{
-    @Internal
-    ListEntry( PAPX papx, ParagraphProperties properties, Range parent )
-    {
-        super( papx, properties, parent );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java
deleted file mode 100644
index 9e6cf56..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-/**
- * User-friendly interface to access document notes information
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {doc} com)
- */
-public interface Notes
-{
-    /**
-     * Returns the location of note anchor in main textspace
-     */
-    int getNoteAnchorPosition( int index );
-
-    /**
-     * Returns count of notes in document
-     */
-    int getNotesCount();
-
-    /**
-     * Returns index of note (if exists, otherwise -1) with specified anchor
-     * position
-     */
-    int getNoteIndexByAnchorPosition( int anchorPosition );
-
-    /**
-     * Returns the end offset of the text corresponding to the reference within
-     * the footnote text address space
-     */
-    int getNoteTextEndOffset( int index );
-
-    /**
-     * Returns the start offset of the text corresponding to the reference
-     * within the footnote text address space
-     */
-    int getNoteTextStartOffset( int index );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java
deleted file mode 100644
index ec3b17f..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.hwpf.model.NotesTables;
-
-/**
- * Default implementation of {@link Notes} interface
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {doc} com)
- */
-public class NotesImpl implements Notes
-{
-    private Map<Integer, Integer> anchorToIndexMap = null;
-
-    private final NotesTables notesTables;
-
-    public NotesImpl( NotesTables notesTables )
-    {
-        this.notesTables = notesTables;
-    }
-
-    public int getNoteAnchorPosition( int index )
-    {
-        return notesTables.getDescriptor( index ).getStart();
-    }
-
-    public int getNoteIndexByAnchorPosition( int anchorPosition )
-    {
-        updateAnchorToIndexMap();
-
-        Integer index = anchorToIndexMap
-                .get( Integer.valueOf( anchorPosition ) );
-        if ( index == null )
-            return -1;
-
-        return index.intValue();
-    }
-
-    public int getNotesCount()
-    {
-        return notesTables.getDescriptorsCount();
-    }
-
-    public int getNoteTextEndOffset( int index )
-    {
-        return notesTables.getTextPosition( index ).getEnd();
-    }
-
-    public int getNoteTextStartOffset( int index )
-    {
-        return notesTables.getTextPosition( index ).getStart();
-    }
-
-    private void updateAnchorToIndexMap()
-    {
-        if ( anchorToIndexMap != null )
-            return;
-
-        Map<Integer, Integer> result = new HashMap<Integer, Integer>();
-        for ( int n = 0; n < notesTables.getDescriptorsCount(); n++ )
-        {
-            int anchorPosition = notesTables.getDescriptor( n ).getStart();
-            result.put( Integer.valueOf( anchorPosition ), Integer.valueOf( n ) );
-        }
-        this.anchorToIndexMap = result;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
deleted file mode 100644
index c672134..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.EntryUtils;
-import org.apache.poi.util.Internal;
-
-@Internal
-public class ObjectPoolImpl implements ObjectsPool
-{
-    private DirectoryEntry _objectPool;
-
-    public ObjectPoolImpl( DirectoryEntry _objectPool )
-    {
-        super();
-        this._objectPool = _objectPool;
-    }
-
-    public Entry getObjectById( String objId )
-    {
-        if ( _objectPool == null )
-            return null;
-
-        try
-        {
-            return _objectPool.getEntry( objId );
-        }
-        catch ( FileNotFoundException exc )
-        {
-            return null;
-        }
-    }
-
-    @Internal
-    public void writeTo( DirectoryEntry directoryEntry ) throws IOException
-    {
-        if ( _objectPool != null )
-            EntryUtils.copyNodeRecursively( _objectPool, directoryEntry );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java
deleted file mode 100644
index d9f39d7..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.poifs.filesystem.Entry;
-
-public interface ObjectsPool
-{
-    public Entry getObjectById( String objId );
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
deleted file mode 100644
index 4bed04e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.ddf.EscherContainerRecord;
-
-/**
- * User-friendly interface to office drawing objects.
- * <p>
- * Some properties and enumeration constants description are quotes from the
- * following sources:
- * <ul>
- * <li>[MS-ODRAW] -- v20110608; Office Drawing Binary File Format; Copyright (c)
- * 2011 Microsoft Corporation.
- * </ul>
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public interface OfficeDrawing
-{
-
-    public enum HorizontalPositioning {
-
-        /**
-         * The shape is horizontally offset by an absolute distance from the
-         * page element.
-         */
-        ABSOLUTE,
-
-        /**
-         * The shape is horizontally positioned at the center of the page
-         * element.
-         */
-        CENTER,
-
-        /**
-         * The shape is horizontally positioned like {@link #LEFT} on
-         * odd-numbered pages and like {@link #RIGHT} on even-numbered pages.
-         */
-        INSIDE,
-
-        /**
-         * The shape is horizontally positioned at the left side of the page
-         * element.
-         */
-        LEFT,
-
-        /**
-         * The shape is horizontally positioned like {@link #RIGHT} on
-         * odd-numbered pages and like {@link #LEFT} on even-numbered pages.
-         */
-        OUTSIDE,
-
-        /**
-         * The shape is horizontally positioned at the right side of the page
-         * element.
-         */
-        RIGHT
-    }
-
-    public enum HorizontalRelativeElement {
-        CHAR, MARGIN, PAGE, TEXT
-    }
-
-    public enum VerticalPositioning {
-
-        /**
-         * The shape is vertically offset by an absolute distance from the page
-         * element
-         */
-        ABSOLUTE,
-
-        /**
-         * The shape is vertically positioned at the bottom of the page element
-         */
-        BOTTOM,
-
-        /**
-         * The shape is vertically positioned in the center of the page element
-         */
-        CENTER,
-
-        /**
-         * The shape is vertically positioned like msopvTop on odd-numbered
-         * pages and like msopvBottom on even-numbered pages
-         */
-        INSIDE,
-
-        /**
-         * The shape is vertically positioned like {@link #BOTTOM} on
-         * odd-numbered pages and like {@link #TOP} on even-numbered pages
-         */
-        OUTSIDE,
-
-        /**
-         * The shape is vertically positioned at the top of the page element
-         */
-        TOP
-    }
-
-    public enum VerticalRelativeElement {
-        LINE, MARGIN, PAGE, TEXT
-    }
-
-    /**
-     * Returns the type of horizontal positioning to use for a shape
-     * 
-     * @return the type of horizontal positioning to use for a shape
-     */
-    public HorizontalPositioning getHorizontalPositioning();
-
-    /**
-     * Specifies a page element relative to which a shape is horizontally
-     * positioned
-     * 
-     * @return a page element relative to which a shape is horizontally
-     *         positioned
-     */
-    public HorizontalRelativeElement getHorizontalRelative();
-
-    /**
-     * Returns escher record that represent shape container (record type is
-     * <tt>0xF004</tt>). Returned record has a child with record type
-     * <tt>0xF00A</tt> and value of shape id equals to {@link #getShapeId()}.
-     * 
-     * @return Returns office art shape container or <tt>null</tt> if not found
-     */
-    public EscherContainerRecord getOfficeArtSpContainer();
-
-    /**
-     * Returns picture data if this shape has (single?) associated picture data
-     */
-    byte[] getPictureData();
-
-    /**
-     * Bottom of the rectangle enclosing shape relative to the origin of the
-     * shape
-     */
-    int getRectangleBottom();
-
-    /**
-     * Left of rectangle enclosing shape relative to the origin of the shape
-     */
-    int getRectangleLeft();
-
-    /**
-     * Right of rectangle enclosing shape relative to the origin of the shape
-     */
-    int getRectangleRight();
-
-    /**
-     * Top of rectangle enclosing shape relative to the origin of the shape
-     */
-    int getRectangleTop();
-
-    /**
-     * Shape Identifier
-     */
-    int getShapeId();
-
-    /**
-     * Specifies the type of vertical positioning to use for a shape
-     * 
-     * @return return the type of vertical positioning to use for a shape
-     */
-    public VerticalPositioning getVerticalPositioning();
-
-    /**
-     * Specifies a page element relative to which a shape is vertically
-     * positioned
-     * 
-     * @return a page element relative to which a shape is vertically positioned
-     */
-    public VerticalRelativeElement getVerticalRelativeElement();
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
deleted file mode 100644
index 58661aa..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.Collection;
-
-/**
- * User-friendly interface to access document part's office drawings
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public interface OfficeDrawings
-{
-    OfficeDrawing getOfficeDrawingAt( int characterPosition );
-
-    Collection<OfficeDrawing> getOfficeDrawings();
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
deleted file mode 100644
index 732879a..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherTertiaryOptRecord;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherBlipRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherRecordFactory;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hwpf.model.EscherRecordHolder;
-import org.apache.poi.hwpf.model.FSPA;
-import org.apache.poi.hwpf.model.FSPATable;
-
-public class OfficeDrawingsImpl implements OfficeDrawings
-{
-    private final EscherRecordHolder _escherRecordHolder;
-    private final FSPATable _fspaTable;
-    private final byte[] _mainStream;
-
-    public OfficeDrawingsImpl( FSPATable fspaTable,
-            EscherRecordHolder escherRecordHolder, byte[] mainStream )
-    {
-        this._fspaTable = fspaTable;
-        this._escherRecordHolder = escherRecordHolder;
-        this._mainStream = mainStream;
-    }
-
-    private EscherBlipRecord getBitmapRecord( int bitmapIndex )
-    {
-        List<? extends EscherContainerRecord> bContainers = _escherRecordHolder
-                .getBStoreContainers();
-        if ( bContainers == null || bContainers.size() != 1 )
-            return null;
-
-        EscherContainerRecord bContainer = bContainers.get( 0 );
-        final List<EscherRecord> bitmapRecords = bContainer.getChildRecords();
-
-        if ( bitmapRecords.size() < bitmapIndex )
-            return null;
-
-        EscherRecord imageRecord = bitmapRecords.get( bitmapIndex - 1 );
-
-        if ( imageRecord instanceof EscherBlipRecord )
-        {
-            return (EscherBlipRecord) imageRecord;
-        }
-
-        if ( imageRecord instanceof EscherBSERecord )
-        {
-            EscherBSERecord bseRecord = (EscherBSERecord) imageRecord;
-
-            EscherBlipRecord blip = bseRecord.getBlipRecord();
-            if ( blip != null )
-            {
-                return blip;
-            }
-
-            if ( bseRecord.getOffset() > 0 )
-            {
-                /*
-                 * Blip stored in delay stream, which in a word doc, is the main
-                 * stream
-                 */
-                EscherRecordFactory recordFactory = new DefaultEscherRecordFactory();
-                EscherRecord record = recordFactory.createRecord( _mainStream,
-                        bseRecord.getOffset() );
-
-                if ( record instanceof EscherBlipRecord )
-                {
-                    record.fillFields( _mainStream, bseRecord.getOffset(),
-                            recordFactory );
-                    return (EscherBlipRecord) record;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private EscherContainerRecord getEscherShapeRecordContainer(
-            final int shapeId )
-    {
-        for ( EscherContainerRecord spContainer : _escherRecordHolder
-                .getSpContainers() )
-        {
-            EscherSpRecord escherSpRecord = spContainer
-                    .getChildById( (short) 0xF00A );
-            if ( escherSpRecord != null
-                    && escherSpRecord.getShapeId() == shapeId )
-                return spContainer;
-        }
-
-        return null;
-    }
-
-    private OfficeDrawing getOfficeDrawing( final FSPA fspa )
-    {
-        return new OfficeDrawing()
-        {
-            public HorizontalPositioning getHorizontalPositioning()
-            {
-                int value = getTertiaryPropertyValue(
-                        EscherProperties.GROUPSHAPE__POSH, -1 );
-
-                switch ( value )
-                {
-                case 0:
-                    return HorizontalPositioning.ABSOLUTE;
-                case 1:
-                    return HorizontalPositioning.LEFT;
-                case 2:
-                    return HorizontalPositioning.CENTER;
-                case 3:
-                    return HorizontalPositioning.RIGHT;
-                case 4:
-                    return HorizontalPositioning.INSIDE;
-                case 5:
-                    return HorizontalPositioning.OUTSIDE;
-                }
-
-                return HorizontalPositioning.ABSOLUTE;
-            }
-
-            public HorizontalRelativeElement getHorizontalRelative()
-            {
-                int value = getTertiaryPropertyValue(
-                        EscherProperties.GROUPSHAPE__POSRELH, -1 );
-
-                switch ( value )
-                {
-                case 1:
-                    return HorizontalRelativeElement.MARGIN;
-                case 2:
-                    return HorizontalRelativeElement.PAGE;
-                case 3:
-                    return HorizontalRelativeElement.TEXT;
-                case 4:
-                    return HorizontalRelativeElement.CHAR;
-                }
-
-                return HorizontalRelativeElement.TEXT;
-            }
-
-            public EscherContainerRecord getOfficeArtSpContainer()
-            {
-                return getEscherShapeRecordContainer( getShapeId() );
-            }
-
-            public byte[] getPictureData()
-            {
-                EscherContainerRecord shapeDescription = getEscherShapeRecordContainer( getShapeId() );
-                if ( shapeDescription == null )
-                    return null;
-
-                EscherOptRecord escherOptRecord = shapeDescription
-                        .getChildById( EscherOptRecord.RECORD_ID );
-                if ( escherOptRecord == null )
-                    return null;
-
-                EscherSimpleProperty escherProperty = escherOptRecord
-                        .lookup( EscherProperties.BLIP__BLIPTODISPLAY );
-                if ( escherProperty == null )
-                    return null;
-
-                int bitmapIndex = escherProperty.getPropertyValue();
-                EscherBlipRecord escherBlipRecord = getBitmapRecord( bitmapIndex );
-                if ( escherBlipRecord == null )
-                    return null;
-
-                return escherBlipRecord.getPicturedata();
-            }
-
-            public int getRectangleBottom()
-            {
-                return fspa.getYaBottom();
-            }
-
-            public int getRectangleLeft()
-            {
-                return fspa.getXaLeft();
-            }
-
-            public int getRectangleRight()
-            {
-                return fspa.getXaRight();
-            }
-
-            public int getRectangleTop()
-            {
-                return fspa.getYaTop();
-            }
-
-            public int getShapeId()
-            {
-                return fspa.getSpid();
-            }
-
-            private int getTertiaryPropertyValue( int propertyId,
-                    int defaultValue )
-            {
-                EscherContainerRecord shapeDescription = getEscherShapeRecordContainer( getShapeId() );
-                if ( shapeDescription == null )
-                    return defaultValue;
-
-                EscherTertiaryOptRecord escherTertiaryOptRecord = shapeDescription
-                        .getChildById( EscherTertiaryOptRecord.RECORD_ID );
-                if ( escherTertiaryOptRecord == null )
-                    return defaultValue;
-
-                EscherSimpleProperty escherProperty = escherTertiaryOptRecord
-                        .lookup( propertyId );
-                if ( escherProperty == null )
-                    return defaultValue;
-                int value = escherProperty.getPropertyValue();
-
-                return value;
-            }
-
-            public VerticalPositioning getVerticalPositioning()
-            {
-                int value = getTertiaryPropertyValue(
-                        EscherProperties.GROUPSHAPE__POSV, -1 );
-
-                switch ( value )
-                {
-                case 0:
-                    return VerticalPositioning.ABSOLUTE;
-                case 1:
-                    return VerticalPositioning.TOP;
-                case 2:
-                    return VerticalPositioning.CENTER;
-                case 3:
-                    return VerticalPositioning.BOTTOM;
-                case 4:
-                    return VerticalPositioning.INSIDE;
-                case 5:
-                    return VerticalPositioning.OUTSIDE;
-                }
-
-                return VerticalPositioning.ABSOLUTE;
-            }
-
-            public VerticalRelativeElement getVerticalRelativeElement()
-            {
-                int value = getTertiaryPropertyValue(
-                        EscherProperties.GROUPSHAPE__POSV, -1 );
-
-                switch ( value )
-                {
-                case 1:
-                    return VerticalRelativeElement.MARGIN;
-                case 2:
-                    return VerticalRelativeElement.PAGE;
-                case 3:
-                    return VerticalRelativeElement.TEXT;
-                case 4:
-                    return VerticalRelativeElement.LINE;
-                }
-
-                return VerticalRelativeElement.TEXT;
-            }
-
-            @Override
-            public String toString()
-            {
-                return "OfficeDrawingImpl: " + fspa.toString();
-            }
-        };
-    }
-
-    public OfficeDrawing getOfficeDrawingAt( int characterPosition )
-    {
-        final FSPA fspa = _fspaTable.getFspaFromCp( characterPosition );
-        if ( fspa == null )
-            return null;
-
-        return getOfficeDrawing( fspa );
-    }
-
-    public Collection<OfficeDrawing> getOfficeDrawings()
-    {
-        List<OfficeDrawing> result = new ArrayList<OfficeDrawing>();
-        for ( FSPA fspa : _fspaTable.getShapes() )
-        {
-            result.add( getOfficeDrawing( fspa ) );
-        }
-        return Collections.unmodifiableList( result );
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java
deleted file mode 100644
index 6e5f688..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.NoSuchElementException;
-
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.model.LFO;
-import org.apache.poi.hwpf.model.ListLevel;
-import org.apache.poi.hwpf.model.ListTables;
-import org.apache.poi.hwpf.model.PAPX;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.hwpf.sprm.TableSprmCompressor;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-public class Paragraph extends Range implements Cloneable {
-    private static POILogger log = POILogFactory.getLogger( Paragraph.class );
-
-    public final static short SPRM_JC = 0x2403;
-    public final static short SPRM_FSIDEBYSIDE = 0x2404;
-    public final static short SPRM_FKEEP = 0x2405;
-    public final static short SPRM_FKEEPFOLLOW = 0x2406;
-    public final static short SPRM_FPAGEBREAKBEFORE = 0x2407;
-    public final static short SPRM_BRCL = 0x2408;
-    public final static short SPRM_BRCP = 0x2409;
-    public final static short SPRM_ILVL = 0x260A;
-    public final static short SPRM_ILFO = 0x460B;
-    public final static short SPRM_FNOLINENUMB = 0x240C;
-    public final static short SPRM_CHGTABSPAPX = (short)0xC60D;
-    public final static short SPRM_DXARIGHT = (short)0x840E;
-    public final static short SPRM_DXALEFT = (short)0x840F;
-    public final static short SPRM_DXALEFT1 = (short)0x8411;
-    public final static short SPRM_DYALINE = 0x6412;
-    public final static short SPRM_DYABEFORE = (short)0xA413;
-    public final static short SPRM_DYAAFTER = (short)0xA414;
-    public final static short SPRM_CHGTABS = (short)0xC615;
-    public final static short SPRM_FINTABLE = 0x2416;
-    public final static short SPRM_FTTP = 0x2417;
-    public final static short SPRM_DXAABS = (short)0x8418;
-    public final static short SPRM_DYAABS = (short)0x8419;
-    public final static short SPRM_DXAWIDTH = (short)0x841A;
-    public final static short SPRM_PC = 0x261B;
-    public final static short SPRM_WR = 0x2423;
-    public final static short SPRM_BRCTOP = 0x6424;
-    public final static short SPRM_BRCLEFT = 0x6425;
-    public final static short SPRM_BRCBOTTOM = 0x6426;
-    public final static short SPRM_BRCRIGHT = 0x6427;
-    public final static short SPRM_BRCBAR = 0x6629;
-    public final static short SPRM_FNOAUTOHYPH = 0x242A;
-    public final static short SPRM_WHEIGHTABS = 0x442B;
-    public final static short SPRM_DCS = 0x442C;
-    public final static short SPRM_SHD80 = 0x442D;
-    public final static short SPRM_SHD = (short)0xC64D;
-    public final static short SPRM_DYAFROMTEXT = (short)0x842E;
-    public final static short SPRM_DXAFROMTEXT = (short)0x842F;
-    public final static short SPRM_FLOCKED = 0x2430;
-    public final static short SPRM_FWIDOWCONTROL = 0x2431;
-    public final static short SPRM_RULER = (short)0xC632;
-    public final static short SPRM_FKINSOKU = 0x2433;
-    public final static short SPRM_FWORDWRAP = 0x2434;
-    public final static short SPRM_FOVERFLOWPUNCT = 0x2435;
-    public final static short SPRM_FTOPLINEPUNCT = 0x2436;
-    public final static short SPRM_AUTOSPACEDE = 0x2437;
-    public final static short SPRM_AUTOSPACEDN = 0x2438;
-    public final static short SPRM_WALIGNFONT = 0x4439;
-    public final static short SPRM_FRAMETEXTFLOW = 0x443A;
-    public final static short SPRM_ANLD = (short)0xC63E;
-    public final static short SPRM_PROPRMARK = (short)0xC63F;
-    public final static short SPRM_OUTLVL = 0x2640;
-    public final static short SPRM_FBIDI = 0x2441;
-    public final static short SPRM_FNUMRMLNS = 0x2443;
-    public final static short SPRM_CRLF = 0x2444;
-    public final static short SPRM_NUMRM = (short)0xC645;
-    public final static short SPRM_USEPGSUSETTINGS = 0x2447;
-    public final static short SPRM_FADJUSTRIGHT = 0x2448;
-
-    @Internal
-    public static Paragraph newParagraph( Range parent, PAPX papx )
-    {
-        HWPFDocumentCore doc = parent._doc;
-        ListTables listTables = doc.getListTables();
-        StyleSheet styleSheet = doc.getStyleSheet();
-
-        ParagraphProperties properties = new ParagraphProperties();
-        properties.setIstd( papx.getIstd() );
-
-        properties = newParagraph_applyStyleProperties( styleSheet, papx,
-                properties );
-        properties = ParagraphSprmUncompressor.uncompressPAP( properties,
-                papx.getGrpprl(), 2 );
-
-        if ( properties.getIlfo() != 0 && listTables != null )
-        {
-            LFO lfo = null;
-            try
-            {
-                lfo = listTables.getLfo( properties.getIlfo() );
-            }
-            catch ( NoSuchElementException exc )
-            {
-                log.log( POILogger.WARN, "Paragraph refers to LFO #",
-                        properties.getIlfo(), " that does not exists" );
-            }
-            if ( lfo != null )
-            {
-                final ListLevel listLevel = listTables.getLevel( lfo.getLsid(),
-                        properties.getIlvl() );
-
-                if ( listLevel != null && listLevel.getGrpprlPapx() != null )
-                {
-                    properties = ParagraphSprmUncompressor.uncompressPAP(
-                            properties, listLevel.getGrpprlPapx(), 0 );
-                    // reapply style and local PAPX properties
-                    properties = newParagraph_applyStyleProperties( styleSheet,
-                            papx, properties );
-                    properties = ParagraphSprmUncompressor.uncompressPAP(
-                            properties, papx.getGrpprl(), 2 );
-                }
-            }
-        }
-
-        if ( properties.getIlfo() > 0 )
-            return new ListEntry( papx, properties, parent );
-
-        return new Paragraph( papx, properties, parent );
-    }
-
-    protected static ParagraphProperties newParagraph_applyStyleProperties(
-            StyleSheet styleSheet, PAPX papx, ParagraphProperties properties )
-    {
-        if ( styleSheet == null )
-            return properties;
-
-        int style = papx.getIstd();
-        byte[] grpprl = styleSheet.getPAPX( style );
-        return ParagraphSprmUncompressor.uncompressPAP( properties, grpprl, 2 );
-    }
-
-  protected short _istd;
-  protected ParagraphProperties _props;
-  protected SprmBuffer _papx;
-
-    @Internal
-    Paragraph( PAPX papx, ParagraphProperties properties, Range parent )
-    {
-        super( Math.max( parent._start, papx.getStart() ), Math.min(
-                parent._end, papx.getEnd() ), parent );
-        _props = properties;
-        _papx = papx.getSprmBuf();
-        _istd = papx.getIstd();
-    }
-
-  /**
-   * Returns the index of the style which applies to this
-   *  Paragraph. Details of the style can be looked up
-   *  from the {@link StyleSheet}, via
-   *  {@link StyleSheet#getStyleDescription(int)} 
-   */
-  public short getStyleIndex()
-  {
-     return _istd;
-  }
-
-  public boolean isInTable()
-  {
-    return _props.getFInTable();
-  }
-
-  /**
-   * @return <tt>true</tt>, if table trailer paragraph (last in table row),
-   *         <tt>false</tt> otherwise
-   */
-  public boolean isTableRowEnd()
-  {
-    return _props.getFTtp() || _props.getFTtpEmbedded();
-  }
-
-  public int getTableLevel()
-  {
-    return _props.getItap();
-  }
-
-    /**
-     * @return <tt>true</tt>, if the end of paragraph mark is really an end of
-     *         cell mark for a nested table cell, <tt>false</tt> otherwise
-     */
-    public boolean isEmbeddedCellMark()
-    {
-        return _props.getFInnerTableCell();
-    }
-
-  public int getJustification()
-  {
-    return _props.getJc();
-  }
-
-  public void setJustification(byte jc)
-  {
-    _props.setJc(jc);
-    _papx.updateSprm(SPRM_JC, jc);
-  }
-
-  public boolean keepOnPage()
-  {
-    return _props.getFKeep();
-  }
-
-  public void setKeepOnPage(boolean fKeep)
-  {
-    _props.setFKeep(fKeep);
-    _papx.updateSprm(SPRM_FKEEP, fKeep);
-  }
-
-  public boolean keepWithNext()
-  {
-    return _props.getFKeepFollow();
-  }
-
-  public void setKeepWithNext(boolean fKeepFollow)
-  {
-    _props.setFKeepFollow(fKeepFollow);
-    _papx.updateSprm(SPRM_FKEEPFOLLOW, fKeepFollow);
-  }
-
-  public boolean pageBreakBefore()
-  {
-    return _props.getFPageBreakBefore();
-  }
-
-  public void setPageBreakBefore(boolean fPageBreak)
-  {
-    _props.setFPageBreakBefore(fPageBreak);
-    _papx.updateSprm(SPRM_FPAGEBREAKBEFORE, fPageBreak);
-  }
-
-  public boolean isLineNotNumbered()
-  {
-    return _props.getFNoLnn();
-  }
-
-  public void setLineNotNumbered(boolean fNoLnn)
-  {
-    _props.setFNoLnn(fNoLnn);
-    _papx.updateSprm(SPRM_FNOLINENUMB, fNoLnn);
-  }
-
-  public boolean isSideBySide()
-  {
-    return _props.getFSideBySide();
-  }
-
-  public void setSideBySide(boolean fSideBySide)
-  {
-    _props.setFSideBySide(fSideBySide);
-    _papx.updateSprm(SPRM_FSIDEBYSIDE, fSideBySide);
-  }
-
-  public boolean isAutoHyphenated()
-  {
-    return !_props.getFNoAutoHyph();
-  }
-
-  public void setAutoHyphenated(boolean autoHyph)
-  {
-    _props.setFNoAutoHyph(!autoHyph);
-    _papx.updateSprm(SPRM_FNOAUTOHYPH, !autoHyph);
-  }
-
-  public boolean isWidowControlled()
-  {
-    return _props.getFWidowControl();
-  }
-
-  public void setWidowControl(boolean widowControl)
-  {
-    _props.setFWidowControl(widowControl);
-    _papx.updateSprm(SPRM_FWIDOWCONTROL, widowControl);
-  }
-
-  public int getIndentFromRight()
-  {
-    return _props.getDxaRight();
-  }
-
-  public void setIndentFromRight(int dxaRight)
-  {
-    _props.setDxaRight(dxaRight);
-    _papx.updateSprm(SPRM_DXARIGHT, (short)dxaRight);
-  }
-
-  public int getIndentFromLeft()
-  {
-    return _props.getDxaLeft();
-  }
-
-  public void setIndentFromLeft(int dxaLeft)
-  {
-    _props.setDxaLeft(dxaLeft);
-    _papx.updateSprm(SPRM_DXALEFT, (short)dxaLeft);
-  }
-
-  public int getFirstLineIndent()
-  {
-    return _props.getDxaLeft1();
-  }
-
-  public void setFirstLineIndent(int first)
-  {
-    _props.setDxaLeft1(first);
-    _papx.updateSprm(SPRM_DXALEFT1, (short)first);
-  }
-
-  public LineSpacingDescriptor getLineSpacing()
-  {
-    return _props.getLspd();
-  }
-
-  public void setLineSpacing(LineSpacingDescriptor lspd)
-  {
-    _props.setLspd(lspd);
-    _papx.updateSprm(SPRM_DYALINE, lspd.toInt());
-  }
-
-  public int getSpacingBefore()
-  {
-    return _props.getDyaBefore();
-  }
-
-  public void setSpacingBefore(int before)
-  {
-    _props.setDyaBefore(before);
-    _papx.updateSprm(SPRM_DYABEFORE, (short)before);
-  }
-
-  public int getSpacingAfter()
-  {
-    return _props.getDyaAfter();
-  }
-
-  public void setSpacingAfter(int after)
-  {
-    _props.setDyaAfter(after);
-    _papx.updateSprm(SPRM_DYAAFTER, (short)after);
-  }
-
-  public boolean isKinsoku()
-  {
-    return _props.getFKinsoku();
-  }
-
-  public void setKinsoku(boolean kinsoku)
-  {
-    _props.setFKinsoku(kinsoku);
-    _papx.updateSprm(SPRM_FKINSOKU, kinsoku);
-  }
-
-  public boolean isWordWrapped()
-  {
-    return _props.getFWordWrap();
-  }
-
-  public void setWordWrapped(boolean wrap)
-  {
-    _props.setFWordWrap(wrap);
-    _papx.updateSprm(SPRM_FWORDWRAP, wrap);
-  }
-
-  public int getFontAlignment()
-  {
-    return _props.getWAlignFont();
-  }
-
-  public void setFontAlignment(int align)
-  {
-    _props.setWAlignFont(align);
-    _papx.updateSprm(SPRM_WALIGNFONT, (short)align);
-  }
-
-  public boolean isVertical()
-  {
-    return _props.isFVertical();
-  }
-
-  public void setVertical(boolean vertical)
-  {
-    _props.setFVertical(vertical);
-    _papx.updateSprm(SPRM_FRAMETEXTFLOW, getFrameTextFlow());
-  }
-
-  public boolean isBackward()
-  {
-    return _props.isFBackward();
-  }
-
-  public void setBackward(boolean bward)
-  {
-    _props.setFBackward(bward);
-    _papx.updateSprm(SPRM_FRAMETEXTFLOW, getFrameTextFlow());
-  }
-
-  public BorderCode getTopBorder()
-  {
-    return _props.getBrcTop();
-  }
-
-  public void setTopBorder(BorderCode top)
-  {
-    _props.setBrcTop(top);
-    _papx.updateSprm(SPRM_BRCTOP, top.toInt());
-  }
-
-  public BorderCode getLeftBorder()
-  {
-    return _props.getBrcLeft();
-  }
-
-  public void setLeftBorder(BorderCode left)
-  {
-    _props.setBrcLeft(left);
-    _papx.updateSprm(SPRM_BRCLEFT, left.toInt());
-  }
-
-  public BorderCode getBottomBorder()
-  {
-    return _props.getBrcBottom();
-  }
-
-  public void setBottomBorder(BorderCode bottom)
-  {
-    _props.setBrcBottom(bottom);
-    _papx.updateSprm(SPRM_BRCBOTTOM, bottom.toInt());
-  }
-
-  public BorderCode getRightBorder()
-  {
-    return _props.getBrcRight();
-  }
-
-  public void setRightBorder(BorderCode right)
-  {
-    _props.setBrcRight(right);
-    _papx.updateSprm(SPRM_BRCRIGHT, right.toInt());
-  }
-
-  public BorderCode getBarBorder()
-  {
-    return _props.getBrcBar();
-  }
-
-  public void setBarBorder(BorderCode bar)
-  {
-    _props.setBrcBar(bar);
-    _papx.updateSprm(SPRM_BRCBAR, bar.toInt());
-  }
-
-  public ShadingDescriptor getShading()
-  {
-    return _props.getShd();
-  }
-
-  public void setShading(ShadingDescriptor shd)
-  {
-    _props.setShd(shd);
-    //TODO: remove old one
-    _papx.addSprm( SPRM_SHD, shd.serialize() );
-  }
-
-  public DropCapSpecifier getDropCap()
-  {
-    return _props.getDcs();
-  }
-
-  public void setDropCap(DropCapSpecifier dcs)
-  {
-    _props.setDcs(dcs);
-    _papx.updateSprm(SPRM_DCS, dcs.toShort());
-  }
-
-  /**
-   * Returns the ilfo, an index to the document's hpllfo, which
-   *  describes the automatic number formatting of the paragraph.
-   * A value of zero means it isn't numbered.
-   */
-  public int getIlfo()
-  {
-     return _props.getIlfo();
-  }
-
-  /**
-   * Returns the multi-level indent for the paragraph. Will be
-   *  zero for non-list paragraphs, and the first level of any
-   *  list. Subsequent levels in hold values 1-8.
-   */
-  public int getIlvl()
-  {
-     return _props.getIlvl();
-  }
-
-  /**
-   * Returns the heading level (1-8), or 9 if the paragraph
-   *  isn't in a heading style.
-   */
-  public int getLvl()
-  {
-     return _props.getLvl();
-  }
-
-  void setTableRowEnd(TableProperties props)
-  {
-    setTableRowEnd(true);
-    byte[] grpprl = TableSprmCompressor.compressTableProperty(props);
-    _papx.append(grpprl);
-  }
-
-  private void setTableRowEnd(boolean val)
-  {
-    _props.setFTtp(val);
-    _papx.updateSprm(SPRM_FTTP, val);
-  }
-
-    /**
-     * Returns number of tabs stops defined for paragraph. Must be >= 0 and <=
-     * 64.
-     * 
-     * @return number of tabs stops defined for paragraph. Must be >= 0 and <=
-     *         64
-     */
-    public int getTabStopsNumber()
-    {
-        return _props.getItbdMac();
-    }
-
-    /**
-     * Returns array of positions of itbdMac tab stops
-     * 
-     * @return array of positions of itbdMac tab stops
-     */
-    public int[] getTabStopsPositions()
-    {
-        return _props.getRgdxaTab();
-    }
-
-    public HWPFList getList()
-    {
-        if ( getIlfo() == 0x000 || getIlfo() == 0xF801 )
-        {
-            throw new IllegalStateException( "Paragraph not in list" );
-        }
-        HWPFList hwpfList = new HWPFList( getDocument().getStyleSheet(),
-                getDocument().getListTables(), getIlfo() );
-        return hwpfList;
-    }
-
-    public boolean isInList()
-    {
-        return getIlfo() != 0x000 && getIlfo() != 0xF801;
-    }
-
-    /**
-     * Clone the ParagraphProperties object associated with this
-     *  Paragraph, so that you can apply the same properties to 
-     *  another Paragraph.
-     */
-    public ParagraphProperties cloneProperties() {
-        try {
-            return (ParagraphProperties)_props.clone();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public Object clone() throws CloneNotSupportedException
-    {
-        Paragraph p = (Paragraph)super.clone();
-        p._props = (ParagraphProperties)_props.clone();
-        //p._baseStyle = _baseStyle;
-        p._papx = new SprmBuffer(0);
-        return p;
-    }
-
-    private short getFrameTextFlow()
-    {
-        short retVal = 0;
-        if (_props.isFVertical())
-        {
-            retVal |= 1;
-        }
-        if (_props.isFBackward())
-        {
-            retVal |= 2;
-        }
-        if (_props.isFRotateFont())
-        {
-            retVal |= 4;
-        }
-        return retVal;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Paragraph [" + getStartOffset() + "; " + getEndOffset() + ")";
-    }
-
-    @Internal
-    public ParagraphProperties getProps() {
-        return _props;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
deleted file mode 100644
index 1dbeae4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.types.PAPAbstractType;
-
-public final class ParagraphProperties extends PAPAbstractType implements
-        Cloneable
-{
-
-    private boolean jcLogical = false;
-
-    public ParagraphProperties()
-    {
-        setAnld( new byte[84] );
-        setPhe( new byte[12] );
-    }
-
-    public Object clone() throws CloneNotSupportedException
-    {
-        ParagraphProperties pp = (ParagraphProperties) super.clone();
-        pp.setAnld( getAnld().clone() );
-        pp.setBrcTop( (BorderCode) getBrcTop().clone() );
-        pp.setBrcLeft( (BorderCode) getBrcLeft().clone() );
-        pp.setBrcBottom( (BorderCode) getBrcBottom().clone() );
-        pp.setBrcRight( (BorderCode) getBrcRight().clone() );
-        pp.setBrcBetween( (BorderCode) getBrcBetween().clone() );
-        pp.setBrcBar( (BorderCode) getBrcBar().clone() );
-        pp.setDcs( getDcs().clone() );
-        pp.setLspd( (LineSpacingDescriptor) getLspd().clone() );
-        pp.setShd( getShd().clone() );
-        pp.setPhe( getPhe().clone() );
-        return pp;
-    }
-
-    public BorderCode getBarBorder()
-    {
-        return super.getBrcBar();
-    }
-
-    public BorderCode getBottomBorder()
-    {
-        return super.getBrcBottom();
-    }
-
-    public DropCapSpecifier getDropCap()
-    {
-        return super.getDcs();
-    }
-
-    public int getFirstLineIndent()
-    {
-        return super.getDxaLeft1();
-    }
-
-    public int getFontAlignment()
-    {
-        return super.getWAlignFont();
-    }
-
-    public int getIndentFromLeft()
-    {
-        return super.getDxaLeft();
-    }
-
-    public int getIndentFromRight()
-    {
-        return super.getDxaRight();
-    }
-
-    public int getJustification()
-    {
-        if ( jcLogical )
-        {
-            if ( !getFBiDi() )
-                return getJc();
-
-            switch ( getJc() )
-            {
-            case 0:
-                return 2;
-            case 2:
-                return 0;
-            default:
-                return getJc();
-            }
-        }
-
-        return getJc();
-    }
-
-    public BorderCode getLeftBorder()
-    {
-        return super.getBrcLeft();
-    }
-
-    public LineSpacingDescriptor getLineSpacing()
-    {
-        return super.getLspd();
-    }
-
-    public BorderCode getRightBorder()
-    {
-        return super.getBrcRight();
-    }
-
-    public ShadingDescriptor getShading()
-    {
-        return super.getShd();
-    }
-
-    public int getSpacingAfter()
-    {
-        return super.getDyaAfter();
-    }
-
-    public int getSpacingBefore()
-    {
-        return super.getDyaBefore();
-    }
-
-    public BorderCode getTopBorder()
-    {
-        return super.getBrcTop();
-    }
-
-    public boolean isAutoHyphenated()
-    {
-        return !super.getFNoAutoHyph();
-    }
-
-    public boolean isBackward()
-    {
-        return super.isFBackward();
-    }
-
-    public boolean isKinsoku()
-    {
-        return super.getFKinsoku();
-    }
-
-    public boolean isLineNotNumbered()
-    {
-        return super.getFNoLnn();
-    }
-
-    public boolean isSideBySide()
-    {
-        return super.getFSideBySide();
-    }
-
-    public boolean isVertical()
-    {
-        return super.isFVertical();
-    }
-
-    public boolean isWidowControlled()
-    {
-        return super.getFWidowControl();
-    }
-
-    public boolean isWordWrapped()
-    {
-        return super.getFWordWrap();
-    }
-
-    public boolean keepOnPage()
-    {
-        return super.getFKeep();
-    }
-
-    public boolean keepWithNext()
-    {
-        return super.getFKeepFollow();
-    }
-
-    public boolean pageBreakBefore()
-    {
-        return super.getFPageBreakBefore();
-    }
-
-    public void setAutoHyphenated( boolean auto )
-    {
-        super.setFNoAutoHyph( !auto );
-    }
-
-    public void setBackward( boolean bward )
-    {
-        super.setFBackward( bward );
-    }
-
-    public void setBarBorder( BorderCode bar )
-    {
-        super.setBrcBar( bar );
-    }
-
-    public void setBottomBorder( BorderCode bottom )
-    {
-        super.setBrcBottom( bottom );
-    }
-
-    public void setDropCap( DropCapSpecifier dcs )
-    {
-        super.setDcs( dcs );
-    }
-
-    public void setFirstLineIndent( int first )
-    {
-        super.setDxaLeft1( first );
-    }
-
-    public void setFontAlignment( int align )
-    {
-        super.setWAlignFont( align );
-    }
-
-    public void setIndentFromLeft( int dxaLeft )
-    {
-        super.setDxaLeft( dxaLeft );
-    }
-
-    public void setIndentFromRight( int dxaRight )
-    {
-        super.setDxaRight( dxaRight );
-    }
-
-    public void setJustification( byte jc )
-    {
-        super.setJc( jc );
-        this.jcLogical = false;
-    }
-
-    public void setJustificationLogical( byte jc )
-    {
-        super.setJc( jc );
-        this.jcLogical = true;
-    }
-
-    public void setKeepOnPage( boolean fKeep )
-    {
-        super.setFKeep( fKeep );
-    }
-
-    public void setKeepWithNext( boolean fKeepFollow )
-    {
-        super.setFKeepFollow( fKeepFollow );
-    }
-
-    public void setKinsoku( boolean kinsoku )
-    {
-        super.setFKinsoku( kinsoku );
-    }
-
-    public void setLeftBorder( BorderCode left )
-    {
-        super.setBrcLeft( left );
-    }
-
-    public void setLineNotNumbered( boolean fNoLnn )
-    {
-        super.setFNoLnn( fNoLnn );
-    }
-
-    public void setLineSpacing( LineSpacingDescriptor lspd )
-    {
-        super.setLspd( lspd );
-    }
-
-    public void setPageBreakBefore( boolean fPageBreak )
-    {
-        super.setFPageBreakBefore( fPageBreak );
-    }
-
-    public void setRightBorder( BorderCode right )
-    {
-        super.setBrcRight( right );
-    }
-
-    public void setShading( ShadingDescriptor shd )
-    {
-        super.setShd( shd );
-    }
-
-    public void setSideBySide( boolean fSideBySide )
-    {
-        super.setFSideBySide( fSideBySide );
-    }
-
-    public void setSpacingAfter( int after )
-    {
-        super.setDyaAfter( after );
-    }
-
-    public void setSpacingBefore( int before )
-    {
-        super.setDyaBefore( before );
-    }
-
-    public void setTopBorder( BorderCode top )
-    {
-        super.setBrcTop( top );
-    }
-
-    public void setVertical( boolean vertical )
-    {
-        super.setFVertical( vertical );
-    }
-
-    public void setWidowControl( boolean widowControl )
-    {
-        super.setFWidowControl( widowControl );
-    }
-
-    public void setWordWrapped( boolean wrap )
-    {
-        super.setFWordWrap( wrap );
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
deleted file mode 100644
index 108544e..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.List;
-import java.util.zip.InflaterInputStream;
-
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherBlipRecord;
-import org.apache.poi.ddf.EscherComplexProperty;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.hwpf.model.PICF;
-import org.apache.poi.hwpf.model.PICFAndOfficeArtData;
-import org.apache.poi.util.PngUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Represents embedded picture extracted from Word Document
- */
-public final class Picture
-{
-    public static final byte[] COMPRESSED1 = { (byte) 0xFE, 0x78, (byte) 0xDA };
-
-    public static final byte[] COMPRESSED2 = { (byte) 0xFE, 0x78, (byte) 0x9C };
-
-    public static final byte[] IHDR = new byte[] { 'I', 'H', 'D', 'R' };
-    private static final POILogger log = POILogFactory
-            .getLogger( Picture.class );
-    @Deprecated
-    private static final byte[] PNG = new byte[] { (byte) 0x89, 0x50, 0x4E,
-            0x47, 0x0D, 0x0A, 0x1A, 0x0A };
-
-    private static int getBigEndianInt( byte[] data, int offset )
-    {
-        return ( ( ( data[offset] & 0xFF ) << 24 )
-                + ( ( data[offset + 1] & 0xFF ) << 16 )
-                + ( ( data[offset + 2] & 0xFF ) << 8 ) + ( data[offset + 3] & 0xFF ) );
-    }
-
-    private static int getBigEndianShort( byte[] data, int offset )
-    {
-        return ( ( ( data[offset] & 0xFF ) << 8 ) + ( data[offset + 1] & 0xFF ) );
-    }
-
-    private static boolean matchSignature( byte[] pictureData,
-            byte[] signature, int offset )
-    {
-        boolean matched = offset < pictureData.length;
-        for ( int i = 0; ( i + offset ) < pictureData.length
-                && i < signature.length; i++ )
-        {
-            if ( pictureData[i + offset] != signature[i] )
-            {
-                matched = false;
-                break;
-            }
-        }
-        return matched;
-    }
-
-    private PICF _picf;
-    private PICFAndOfficeArtData _picfAndOfficeArtData;
-    private List<? extends EscherRecord> _blipRecords;
-
-    private byte[] content;
-    private int dataBlockStartOfsset;
-
-    private int height = -1;
-    private int width = -1;
-
-    /**
-     * Builds a Picture object for a Picture stored as
-     *  Escher.
-     * TODO We need to pass in the PICF data too somehow!
-     */
-    public Picture( EscherBlipRecord blipRecord )
-    {
-       this._blipRecords = Arrays.asList(new EscherBlipRecord[] {blipRecord});
-    }
-
-    /**
-     * Builds a Picture object for a Picture stored in the
-     *  DataStream
-     */
-    public Picture( int dataBlockStartOfsset, byte[] _dataStream, boolean fillBytes ) { // NOSONAR
-        _picfAndOfficeArtData = new PICFAndOfficeArtData( _dataStream,
-                dataBlockStartOfsset );
-        _picf = _picfAndOfficeArtData.getPicf();
-
-        this.dataBlockStartOfsset = dataBlockStartOfsset;
-
-        if ( _picfAndOfficeArtData != null && _picfAndOfficeArtData.getBlipRecords() != null) {
-           _blipRecords = _picfAndOfficeArtData.getBlipRecords();
-        }
-        
-        if ( fillBytes ) {
-            fillImageContent();
-        }
-    }
-
-    private void fillImageContent()
-    {
-        if ( content != null && content.length > 0 )
-            return;
-
-        byte[] rawContent = getRawContent();
-
-        /*
-         * HACK: Detect compressed images. In reality there should be some way
-         * to determine this from the first 32 bytes, but I can't see any
-         * similarity between all the samples I have obtained, nor any
-         * similarity in the data block contents.
-         */
-        if ( matchSignature( rawContent, COMPRESSED1, 32 )
-                || matchSignature( rawContent, COMPRESSED2, 32 ) )
-        {
-            try
-            {
-                InflaterInputStream in = new InflaterInputStream(
-                        new ByteArrayInputStream( rawContent, 33,
-                                rawContent.length - 33 ) );
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                byte[] buf = new byte[4096];
-                int readBytes;
-                while ( ( readBytes = in.read( buf ) ) > 0 )
-                {
-                    out.write( buf, 0, readBytes );
-                }
-                content = out.toByteArray();
-            }
-            catch ( IOException e )
-            {
-                /*
-                 * Problems reading from the actual ByteArrayInputStream should
-                 * never happen so this will only ever be a ZipException.
-                 */
-                log.log( POILogger.INFO,
-                        "Possibly corrupt compression or non-compressed data",
-                        e );
-            }
-        }
-        else
-        {
-            // Raw data is not compressed.
-            content = rawContent;
-
-            //PNG created on MAC may have a 16-byte prefix which prevents successful reading.
-            //Just cut it off!.
-            if (PngUtils.matchesPngHeader(content, 16))
-            {
-                byte[] png = new byte[content.length-16];
-                System.arraycopy(content, 16, png, 0, png.length);
-                content = png;
-            }
-        }
-    }
-
-    private void fillJPGWidthHeight()
-    {
-        /*
-         * http://www.codecomments.com/archive281-2004-3-158083.html
-         * 
-         * Algorithm proposed by Patrick TJ McPhee:
-         * 
-         * read 2 bytes make sure they are 'ffd8'x repeatedly: read 2 bytes make
-         * sure the first one is 'ff'x if the second one is 'd9'x stop else if
-         * the second one is c0 or c2 (or possibly other values ...) skip 2
-         * bytes read one byte into depth read two bytes into height read two
-         * bytes into width else read two bytes into length skip forward
-         * length-2 bytes
-         * 
-         * Also used Ruby code snippet from:
-         * http://www.bigbold.com/snippets/posts/show/805 for reference
-         */
-        byte[] jpegContent = getContent();
-
-        int pointer = 2;
-        int firstByte = jpegContent[pointer];
-        int secondByte = jpegContent[pointer + 1];
-        int endOfPicture = jpegContent.length;
-        while ( pointer < endOfPicture - 1 )
-        {
-            do
-            {
-                firstByte = jpegContent[pointer];
-                secondByte = jpegContent[pointer + 1];
-                pointer += 2;
-            }
-            while ( !( firstByte == (byte) 0xFF ) && pointer < endOfPicture - 1 );
-
-            if ( firstByte == ( (byte) 0xFF ) && pointer < endOfPicture - 1 )
-            {
-                if ( secondByte == (byte) 0xD9 || secondByte == (byte) 0xDA )
-                {
-                    break;
-                }
-                else if ( ( secondByte & 0xF0 ) == 0xC0
-                        && secondByte != (byte) 0xC4
-                        && secondByte != (byte) 0xC8
-                        && secondByte != (byte) 0xCC )
-                {
-                    pointer += 5;
-                    this.height = getBigEndianShort( jpegContent, pointer );
-                    this.width = getBigEndianShort( jpegContent, pointer + 2 );
-                    break;
-                }
-                else
-                {
-                    pointer++;
-                    pointer++;
-                    int length = getBigEndianShort( jpegContent, pointer );
-                    pointer += length;
-                }
-            }
-            else
-            {
-                pointer++;
-            }
-        }
-    }
-
-    void fillPNGWidthHeight()
-    {
-        byte[] pngContent = getContent();
-        /*
-         * Used PNG file format description from
-         * http://www.wotsit.org/download.asp?f=png
-         */
-        int HEADER_START = PNG.length + 4;
-        if ( matchSignature( pngContent, IHDR, HEADER_START ) )
-        {
-            int IHDR_CHUNK_WIDTH = HEADER_START + 4;
-            this.width = getBigEndianInt( pngContent, IHDR_CHUNK_WIDTH );
-            this.height = getBigEndianInt( pngContent, IHDR_CHUNK_WIDTH + 4 );
-        }
-    }
-
-    private void fillWidthHeight()
-    {
-        PictureType pictureType = suggestPictureType();
-        // trying to extract width and height from pictures content:
-        switch ( pictureType )
-        {
-        case JPEG:
-            fillJPGWidthHeight();
-            break;
-        case PNG:
-            fillPNGWidthHeight();
-            break;
-        default:
-            // unsupported;
-            break;
-        }
-    }
-
-    /**
-     * @return picture's content as byte array
-     */
-    public byte[] getContent()
-    {
-        fillImageContent();
-        return content;
-    }
-
-    /**
-     * @return The amount the picture has been cropped on the left in twips
-     * @deprecated POI 3.8 beta 4.
-     */
-    @Deprecated
-    public int getDxaCropLeft()
-    {
-        // TODO: use new properties
-        // if (_picfAndOfficeArtData == null || _picfAndOfficeArtData.getShape()
-        // == null)
-        // return 0;
-        //
-        // final EscherContainerRecord shape = _picfAndOfficeArtData.getShape();
-        // EscherOptRecord optRecord = shape.getChildById( (short) 0xF00B );
-        // if (optRecord == null)
-        // return 0;
-        //
-        // EscherProperty property = optRecord.lookup( 0x0102 );
-        // if (property == null || !(property instanceof EscherSimpleProperty))
-        // return 0;
-        //
-        // EscherSimpleProperty simpleProperty = (EscherSimpleProperty)
-        // property;
-        // return simpleProperty.getPropertyValue();
-
-        return _picf.getDxaReserved1();
-    }
-
-    /**
-     * @return The amount the picture has been cropped on the right in twips
-     * @deprecated POI 3.8 beta 4.
-     */
-    @Deprecated
-    public int getDxaCropRight()
-    {
-        return _picf.getDxaReserved2();
-    }
-
-    /**
-     * Gets the initial width of the picture, in twips, prior to cropping or
-     * scaling.
-     * 
-     * @return the initial width of the picture in twips
-     */
-    public int getDxaGoal()
-    {
-        return _picf.getDxaGoal();
-    }
-
-    /**
-     * @return The amount the picture has been cropped on the bottom in twips
-     * @deprecated POI 3.8 beta 5.
-     */
-    @Deprecated
-    public int getDyaCropBottom()
-    {
-        return _picf.getDyaReserved2();
-    }
-
-    /**
-     * @return The amount the picture has been cropped on the top in twips
-     * @deprecated POI 3.8 beta 5.
-     */
-    @Deprecated
-    public int getDyaCropTop()
-    {
-        return _picf.getDyaReserved1();
-    }
-
-    /**
-     * Gets the initial height of the picture, in twips, prior to cropping or
-     * scaling.
-     * 
-     * @return the initial width of the picture in twips
-     */
-    public int getDyaGoal()
-    {
-        return _picf.getDyaGoal();
-    }
-
-    /**
-     * returns pixel height of the picture or -1 if dimensions determining was
-     * failed
-     */
-    public int getHeight()
-    {
-        if ( height == -1 )
-        {
-            fillWidthHeight();
-        }
-        return height;
-    }
-
-    /**
-     * @return Horizontal scaling factor supplied by user expressed in .001%
-     *         units
-     */
-    public int getHorizontalScalingFactor()
-    {
-        return _picf.getMx();
-    }
-
-    /**
-     * Returns the MIME type for the image
-     * 
-     * @return MIME-type for known types of image or "image/unknown" if unknown
-     */
-    public String getMimeType()
-    {
-        return suggestPictureType().getMime();
-    }
-
-    /**
-     * Returns picture's content as it stored in Word file, i.e. possibly in
-     * compressed form.
-     * 
-     * @return picture's content as it stored in Word file
-     */
-    public byte[] getRawContent()
-    {
-        if (_blipRecords == null || _blipRecords.size() != 1) {
-           return new byte[0];
-        }
-
-        EscherRecord escherRecord = _blipRecords.get( 0 );
-        if ( escherRecord instanceof EscherBlipRecord )
-        {
-            return ( (EscherBlipRecord) escherRecord ).getPicturedata();
-        }
-
-        if ( escherRecord instanceof EscherBSERecord )
-        {
-            return ( (EscherBSERecord) escherRecord ).getBlipRecord()
-                    .getPicturedata();
-        }
-        return new byte[0];
-    }
-
-    /**
-     * 
-     * @return size in bytes of the picture
-     */
-    public int getSize()
-    {
-        return getContent().length;
-    }
-
-    /**
-     * @return The offset of this picture in the picture bytes, used when
-     *         matching up with {@link CharacterRun#getPicOffset()}
-     */
-    public int getStartOffset()
-    {
-        return dataBlockStartOfsset;
-    }
-
-    /**
-     * @return Vertical scaling factor supplied by user expressed in .001% units
-     */
-    public int getVerticalScalingFactor()
-    {
-        return _picf.getMy();
-    }
-
-    /**
-     * returns pixel width of the picture or -1 if dimensions determining was
-     * failed
-     */
-    public int getWidth()
-    {
-        if ( width == -1 )
-        {
-            fillWidthHeight();
-        }
-        return width;
-    }
-    
-    /**
-     * returns the description stored in the alternative text
-     * 
-     * @return pictue description
-     */
-    public String getDescription()
-    {
-       for(EscherRecord escherRecord : _picfAndOfficeArtData.getShape().getChildRecords()){
-          if(escherRecord instanceof EscherOptRecord){
-             EscherOptRecord escherOptRecord = (EscherOptRecord) escherRecord;
-             for(EscherProperty property : escherOptRecord.getEscherProperties()){
-                if(EscherProperties.GROUPSHAPE__DESCRIPTION == property.getPropertyNumber()){
-                   byte[] complexData = ((EscherComplexProperty)property).getComplexData();
-                   return StringUtil.getFromUnicodeLE(complexData,0,complexData.length/2-1);
-                }
-             }
-          }
-       }
-
-       return null;
-    }
-
-    /**
-     * tries to suggest extension for picture's file by matching signatures of
-     * popular image formats to first bytes of picture's contents
-     * 
-     * @return suggested file extension
-     */
-    public String suggestFileExtension()
-    {
-        return suggestPictureType().getExtension();
-    }
-
-    /**
-     * Tries to suggest a filename: hex representation of picture structure
-     * offset in "Data" stream plus extension that is tried to determine from
-     * first byte of picture's content.
-     * 
-     * @return suggested file name
-     */
-    public String suggestFullFileName()
-    {
-        String fileExt = suggestFileExtension();
-        return Integer.toHexString( dataBlockStartOfsset )
-                + ( fileExt.length() > 0 ? "." + fileExt : "" );
-    }
-
-    public PictureType suggestPictureType()
-    {
-        if (_blipRecords == null || _blipRecords.size() != 1 ) {
-            return PictureType.UNKNOWN;
-        }
-
-        EscherRecord escherRecord = _blipRecords.get( 0 );
-        switch ( escherRecord.getRecordId() )
-        {
-        case (short) 0xF007:
-        {
-            EscherBSERecord bseRecord = (EscherBSERecord) escherRecord;
-            switch ( bseRecord.getBlipTypeWin32() )
-            {
-            case 0x00:
-                return PictureType.UNKNOWN;
-            case 0x01:
-                return PictureType.UNKNOWN;
-            case 0x02:
-                return PictureType.EMF;
-            case 0x03:
-                return PictureType.WMF;
-            case 0x04:
-                return PictureType.PICT;
-            case 0x05:
-                return PictureType.JPEG;
-            case 0x06:
-                return PictureType.PNG;
-            case 0x07:
-                return PictureType.BMP;
-            case 0x11:
-                return PictureType.TIFF;
-            case 0x12:
-                return PictureType.JPEG;
-            default:
-                return PictureType.UNKNOWN;
-            }
-        }
-        case (short) 0xF01A:
-            return PictureType.EMF;
-        case (short) 0xF01B:
-            return PictureType.WMF;
-        case (short) 0xF01C:
-            return PictureType.PICT;
-        case (short) 0xF01D:
-            return PictureType.JPEG;
-        case (short) 0xF01E:
-            return PictureType.PNG;
-        case (short) 0xF01F:
-            return PictureType.BMP;
-        case (short) 0xF029:
-            return PictureType.TIFF;
-        case (short) 0xF02A:
-            return PictureType.JPEG;
-        default:
-            return PictureType.UNKNOWN;
-        }
-    }
-
-    /**
-     * Writes Picture's content bytes to specified OutputStream. Is useful when
-     * there is need to write picture bytes directly to stream, omitting its
-     * representation in memory as distinct byte array.
-     * 
-     * @param out
-     *            a stream to write to
-     * @throws IOException
-     *             if some exception is occured while writing to specified out
-     */
-    public void writeImageContent( OutputStream out ) throws IOException
-    {
-        byte[] c = getContent();
-        if ( c != null && c.length > 0 )
-        {
-            out.write( c, 0, c.length );
-        }
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java
deleted file mode 100644
index e630925..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-/**
- * Picture types supported by MS Word format
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public enum PictureType
-{
-    BMP( "image/bmp", "bmp", new byte[][] { { 'B', 'M' } } ),
-
-    EMF( "image/x-emf", "emf", new byte[][] { { 0x01, 0x00, 0x00, 0x00 } } ),
-
-    GIF( "image/gif", "gif", new byte[][] { { 'G', 'I', 'F' } } ),
-
-    JPEG( "image/jpeg", "jpg", new byte[][] { { (byte) 0xFF, (byte) 0xD8 } } ),
-
-    PICT( "image/pict", ".pict", new byte[0][] ),
-
-    PNG( "image/png", "png", new byte[][] { { (byte) 0x89, 0x50, 0x4E, 0x47,
-            0x0D, 0x0A, 0x1A, 0x0A } } ),
-
-    TIFF( "image/tiff", "tiff", new byte[][] { { 0x49, 0x49, 0x2A, 0x00 },
-            { 0x4D, 0x4D, 0x00, 0x2A } } ),
-
-    UNKNOWN( "image/unknown", "", new byte[][] {} ),
-
-    WMF( "image/x-wmf", "wmf", new byte[][] {
-            { (byte) 0xD7, (byte) 0xCD, (byte) 0xC6, (byte) 0x9A, 0x00, 0x00 },
-            { 0x01, 0x00, 0x09, 0x00, 0x00, 0x03 } } );
-
-    public static PictureType findMatchingType( byte[] pictureContent )
-    {
-        for ( PictureType pictureType : PictureType.values() )
-            for ( byte[] signature : pictureType.getSignatures() )
-                if ( matchSignature( pictureContent, signature ) )
-                    return pictureType;
-
-        // TODO: DIB, PICT
-        return PictureType.UNKNOWN;
-    }
-
-    private static boolean matchSignature( byte[] pictureData, byte[] signature )
-    {
-        if ( pictureData.length < signature.length )
-            return false;
-
-        for ( int i = 0; i < signature.length; i++ )
-            if ( pictureData[i] != signature[i] )
-                return false;
-
-        return true;
-    }
-
-    private String _extension;
-
-    private String _mime;
-
-    private byte[][] _signatures;
-
-    private PictureType( String mime, String extension, byte[][] signatures )
-    {
-        this._mime = mime;
-        this._extension = extension;
-        this._signatures = signatures.clone();
-    }
-
-    public String getExtension()
-    {
-        return _extension;
-    }
-
-    public String getMime()
-    {
-        return _mime;
-    }
-
-    public byte[][] getSignatures()
-    {
-        return _signatures;
-    }
-
-    public boolean matchSignature( byte[] pictureData )
-    {
-        for ( byte[] signature : getSignatures() )
-            if ( matchSignature( signature, pictureData ) )
-                return true;
-        return false;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
deleted file mode 100644
index 10b3f96..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
+++ /dev/null
@@ -1,1195 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.lang.ref.WeakReference;
-import java.util.List;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.hwpf.model.CHPX;
-import org.apache.poi.hwpf.model.FileInformationBlock;
-import org.apache.poi.hwpf.model.PAPX;
-import org.apache.poi.hwpf.model.PropertyNode;
-import org.apache.poi.hwpf.model.SEPX;
-import org.apache.poi.hwpf.model.StyleSheet;
-import org.apache.poi.hwpf.model.SubdocumentType;
-import org.apache.poi.hwpf.sprm.CharacterSprmCompressor;
-import org.apache.poi.hwpf.sprm.ParagraphSprmCompressor;
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.util.Internal;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class is the central class of the HWPF object model. All properties that
- * apply to a range of characters in a Word document extend this class.
- *
- * It is possible to insert text and/or properties at the beginning or end of a
- * range.
- *
- * Ranges are only valid if there hasn't been an insert in a prior Range since
- * the Range's creation. Once an element (text, paragraph, etc.) has been
- * inserted into a Range, subsequent Ranges become unstable.
- *
- * @author Ryan Ackley
- */
-public class Range { // TODO -instantiable superclass
-
-    private POILogger logger = POILogFactory.getLogger( Range.class );
-    
-    /**
-     * @deprecated POI 3.8 beta 5
-     */
-    @Deprecated
-	public static final int TYPE_PARAGRAPH = 0;
-    
-    /**
-     * @deprecated POI 3.8 beta 5
-     */
-    @Deprecated
-    public static final int TYPE_CHARACTER = 1;
-    
-    /**
-     * @deprecated POI 3.8 beta 5
-     */
-    @Deprecated
-    public static final int TYPE_SECTION = 2;
-    
-    /**
-     * @deprecated POI 3.8 beta 5
-     */
-    @Deprecated
-    public static final int TYPE_TEXT = 3;
-    
-    /**
-     * @deprecated POI 3.8 beta 5
-     */
-    @Deprecated
-    public static final int TYPE_LISTENTRY = 4;
-    
-    /**
-     * @deprecated POI 3.8 beta 5
-     */
-    @Deprecated
-    public static final int TYPE_TABLE = 5;
-    
-    /**
-     * @deprecated POI 3.8 beta 5
-     */
-    @Deprecated
-    public static final int TYPE_UNDEFINED = 6;
-
-	/** Needed so inserts and deletes will ripple up through containing Ranges */
-	private final WeakReference<Range> _parent;
-
-	/** The starting character offset of this range. */
-	protected final int _start;
-
-	/** The ending character offset of this range. */
-	protected int _end;
-
-	/** The document this range belongs to. */
-	protected final HWPFDocumentCore _doc;
-
-	/** Have we loaded the section indexes yet */
-	boolean _sectionRangeFound;
-
-	/** All sections that belong to the document this Range belongs to. */
-	protected final List<SEPX> _sections;
-
-	/** The start index in the sections list for this Range */
-	protected int _sectionStart;
-
-	/** The end index in the sections list for this Range. */
-	protected int _sectionEnd;
-
-	/** Have we loaded the paragraph indexes yet. */
-	protected boolean _parRangeFound;
-
-	/** All paragraphs that belong to the document this Range belongs to. */
-	protected final List<PAPX> _paragraphs;
-
-	/** The start index in the paragraphs list for this Range, inclusive */
-	protected int _parStart;
-
-	/** The end index in the paragraphs list for this Range, exclusive */
-	protected int _parEnd;
-
-	/** Have we loaded the characterRun indexes yet. */
-	protected boolean _charRangeFound;
-
-	/** All CharacterRuns that belong to the document this Range belongs to. */
-	protected List<CHPX> _characters;
-
-	/** The start index in the characterRuns list for this Range */
-	protected int _charStart;
-
-	/** The end index in the characterRuns list for this Range. */
-	protected int _charEnd;
-
-	protected StringBuilder _text;
-	
-	/**
-	 * Used to construct a Range from a document. This is generally used to
-	 * create a Range that spans the whole document, or at least one whole part
-	 * of the document (eg main text, header, comment)
-	 *
-	 * @param start
-	 *            Starting character offset of the range.
-	 * @param end
-	 *            Ending character offset of the range.
-	 * @param doc
-	 *            The HWPFDocument the range is based on.
-	 */
-	public Range(int start, int end, HWPFDocumentCore doc) {
-		_start = start;
-		_end = end;
-		_doc = doc;
-		_sections = _doc.getSectionTable().getSections();
-		_paragraphs = _doc.getParagraphTable().getParagraphs();
-		_characters = _doc.getCharacterTable().getTextRuns();
-		_text = _doc.getText();
-		_parent = new WeakReference<Range>(null);
-
-		sanityCheckStartEnd();
-	}
-
-	/**
-	 * Used to create Ranges that are children of other Ranges.
-	 *
-	 * @param start
-	 *            Starting character offset of the range.
-	 * @param end
-	 *            Ending character offset of the range.
-	 * @param parent
-	 *            The parent this range belongs to.
-	 */
-	protected Range(int start, int end, Range parent) {
-		_start = start;
-		_end = end;
-		_doc = parent._doc;
-		_sections = parent._sections;
-		_paragraphs = parent._paragraphs;
-		_characters = parent._characters;
-		_text = parent._text;
-		_parent = new WeakReference<Range>(parent);
-
-		sanityCheckStartEnd();
-		assert sanityCheck();
-	}
-
-
-	/**
-	 * Ensures that the start and end were were given are actually valid, to
-	 * avoid issues later on if they're not
-	 */
-	private void sanityCheckStartEnd() {
-		if (_start < 0) {
-			throw new IllegalArgumentException("Range start must not be negative. Given " + _start);
-		}
-		if (_end < _start) {
-			throw new IllegalArgumentException("The end (" + _end
-					+ ") must not be before the start (" + _start + ")");
-		}
-	}
-
-	/**
-	 * Gets the text that this Range contains.
-	 *
-	 * @return The text for this range.
-	 */
-	public String text() {
-	    return _text.substring( _start, _end );
-	}
-
-	/**
-	 * Removes any fields (eg macros, page markers etc) from the string.
-	 * Normally used to make some text suitable for showing to humans, and the
-	 * resultant text should not normally be saved back into the document!
-	 */
-	public static String stripFields(String text) {
-		// First up, fields can be nested...
-		// A field can be 0x13 [contents] 0x15
-		// Or it can be 0x13 [contents] 0x14 [real text] 0x15
-
-		// If there are no fields, all easy
-		if (text.indexOf('\u0013') == -1)
-			return text;
-
-		// Loop over until they're all gone
-		// That's when we're out of both 0x13s and 0x15s
-		while (text.indexOf('\u0013') > -1 && text.indexOf('\u0015') > -1) {
-			int first13 = text.indexOf('\u0013');
-			int next13 = text.indexOf('\u0013', first13 + 1);
-			int first14 = text.indexOf('\u0014', first13 + 1);
-			int last15 = text.lastIndexOf('\u0015');
-
-			// If they're the wrong way around, give up
-			if (last15 < first13) {
-				break;
-			}
-
-			// If no more 13s and 14s, just zap
-			if (next13 == -1 && first14 == -1) {
-				text = text.substring(0, first13) + text.substring(last15 + 1);
-				break;
-			}
-
-			// If a 14 comes before the next 13, then
-			// zap from the 13 to the 14, and remove
-			// the 15
-			if (first14 != -1 && (first14 < next13 || next13 == -1)) {
-				text = text.substring(0, first13) + text.substring(first14 + 1, last15)
-						+ text.substring(last15 + 1);
-				continue;
-			}
-
-			// Another 13 comes before the next 14.
-			// This means there's nested stuff, so we
-			// can just zap the lot
-			text = text.substring(0, first13) + text.substring(last15 + 1);
-		}
-
-		return text;
-	}
-
-	/**
-	 * Used to get the number of sections in a range. If this range is smaller
-	 * than a section, it will return 1 for its containing section.
-	 *
-	 * @return The number of sections in this range.
-	 */
-	public int numSections() {
-		initSections();
-		return _sectionEnd - _sectionStart;
-	}
-
-	/**
-	 * Used to get the number of paragraphs in a range. If this range is smaller
-	 * than a paragraph, it will return 1 for its containing paragraph.
-	 *
-	 * @return The number of paragraphs in this range.
-	 */
-
-	public int numParagraphs() {
-		initParagraphs();
-		return _parEnd - _parStart;
-	}
-
-	/**
-	 *
-	 * @return The number of characterRuns in this range.
-	 */
-
-	public int numCharacterRuns() {
-		initCharacterRuns();
-		return _charEnd - _charStart;
-	}
-
-    /**
-     * Inserts text into the front of this range.
-     * 
-     * @param text
-     *            The text to insert
-     * @return The character run that text was inserted into.
-     */
-    public CharacterRun insertBefore( String text )
-    {
-        initAll();
-
-        _text.insert( _start, text );
-        _doc.getCharacterTable().adjustForInsert( _charStart, text.length() );
-        _doc.getParagraphTable().adjustForInsert( _parStart, text.length() );
-        _doc.getSectionTable().adjustForInsert( _sectionStart, text.length() );
-        if ( _doc instanceof HWPFDocument )
-        {
-            ( (BookmarksImpl) ( (HWPFDocument) _doc ).getBookmarks() )
-                    .afterInsert( _start, text.length() );
-        }
-        adjustForInsert( text.length() );
-
-        // update the FIB.CCPText + friends fields
-        adjustFIB( text.length() );
-
-        assert sanityCheck();
-
-        return getCharacterRun( 0 );
-    }
-
-    /**
-     * Inserts text onto the end of this range
-     * 
-     * @param text
-     *            The text to insert
-     * @return The character run the text was inserted into.
-     */
-    public CharacterRun insertAfter( String text )
-    {
-        initAll();
-
-        _text.insert( _end, text );
-
-        _doc.getCharacterTable().adjustForInsert( _charEnd - 1, text.length() );
-        _doc.getParagraphTable().adjustForInsert( _parEnd - 1, text.length() );
-        _doc.getSectionTable().adjustForInsert( _sectionEnd - 1, text.length() );
-        if ( _doc instanceof HWPFDocument )
-        {
-            ( (BookmarksImpl) ( (HWPFDocument) _doc ).getBookmarks() )
-                    .afterInsert( _end, text.length() );
-        }
-        adjustForInsert( text.length() );
-
-        assert sanityCheck();
-        return getCharacterRun( numCharacterRuns() - 1 );
-    }
-
-	/**
-	 * Inserts text into the front of this range and it gives that text the
-	 * CharacterProperties specified in props.
-	 *
-	 * @param text
-	 *            The text to insert.
-	 * @param props
-	 *            The CharacterProperties to give the text.
-	 * @return A new CharacterRun that has the given text and properties and is
-	 *         n ow a part of the document.
-     * @deprecated POI 3.8 beta 4. User code should not work with {@link CharacterProperties}
-	 */
-    @Deprecated
-	private CharacterRun insertBefore(String text, CharacterProperties props)
-	{
-		initAll();
-		PAPX papx = _paragraphs.get(_parStart);
-		short istd = papx.getIstd();
-
-		StyleSheet ss = _doc.getStyleSheet();
-		CharacterProperties baseStyle = ss.getCharacterStyle(istd);
-		byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty(props, baseStyle);
-		SprmBuffer buf = new SprmBuffer(grpprl, 0);
-		_doc.getCharacterTable().insert(_charStart, _start, buf);
-
-		return insertBefore(text);
-	}
-
-	/**
-	 * Inserts text onto the end of this range and gives that text the
-	 * CharacterProperties specified in props.
-	 *
-	 * @param text
-	 *            The text to insert.
-	 * @param props
-	 *            The CharacterProperties to give the text.
-	 * @return A new CharacterRun that has the given text and properties and is
-	 *         n ow a part of the document.
-	 * @deprecated POI 3.8 beta 4. User code should not work with {@link CharacterProperties}
-	 */
-    @Deprecated
-	private CharacterRun insertAfter(String text, CharacterProperties props)
-	{
-		initAll();
-		PAPX papx = _paragraphs.get(_parEnd - 1);
-		short istd = papx.getIstd();
-
-		StyleSheet ss = _doc.getStyleSheet();
-		CharacterProperties baseStyle = ss.getCharacterStyle(istd);
-		byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty(props, baseStyle);
-		SprmBuffer buf = new SprmBuffer(grpprl, 0);
-		_doc.getCharacterTable().insert(_charEnd, _end, buf);
-		_charEnd++;
-		return insertAfter(text);
-	}
-
-	/**
-	 * Inserts and empty paragraph into the front of this range.
-	 *
-	 * @param props
-	 *            The properties that the new paragraph will have.
-	 * @param styleIndex
-	 *            The index into the stylesheet for the new paragraph.
-	 * @return The newly inserted paragraph.
-	 * @deprecated POI 3.8 beta 4. Use code shall not work with {@link ParagraphProperties}
-	 */
-	@Deprecated
-	private Paragraph insertBefore(ParagraphProperties props, int styleIndex)
-	{
-		return this.insertBefore(props, styleIndex, "\r");
-	}
-
-	/**
-	 * Inserts a paragraph into the front of this range. The paragraph will
-	 * contain one character run that has the default properties for the
-	 * paragraph's style.
-	 *
-	 * It is necessary for the text to end with the character '\r'
-	 *
-	 * @param props
-	 *            The paragraph's properties.
-	 * @param styleIndex
-	 *            The index of the paragraph's style in the style sheet.
-	 * @param text
-	 *            The text to insert.
-	 * @return A newly inserted paragraph.
-     * @deprecated POI 3.8 beta 4. Use code shall not work with {@link ParagraphProperties}
-	 */
-    @Deprecated
-	private Paragraph insertBefore(ParagraphProperties props, int styleIndex, String text)
-	{
-		initAll();
-		StyleSheet ss = _doc.getStyleSheet();
-		ParagraphProperties baseStyle = ss.getParagraphStyle(styleIndex);
-		CharacterProperties baseChp = ss.getCharacterStyle(styleIndex);
-
-		byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty(props, baseStyle);
-		byte[] withIndex = new byte[grpprl.length + LittleEndian.SHORT_SIZE];
-		LittleEndian.putShort(withIndex, 0, (short) styleIndex);
-		System.arraycopy(grpprl, 0, withIndex, LittleEndian.SHORT_SIZE, grpprl.length);
-		SprmBuffer buf = new SprmBuffer(withIndex, 2);
-
-		_doc.getParagraphTable().insert(_parStart, _start, buf);
-		insertBefore(text, baseChp);
-		return getParagraph(0);
-	}
-
-	/**
-	 * Inserts and empty paragraph into the end of this range.
-	 *
-	 * @param props
-	 *            The properties that the new paragraph will have.
-	 * @param styleIndex
-	 *            The index into the stylesheet for the new paragraph.
-	 * @return The newly inserted paragraph.
-     * @deprecated POI 3.8 beta 4. Use code shall not work with {@link ParagraphProperties}
-	 */
-    @Deprecated
-	protected Paragraph insertAfter(ParagraphProperties props, int styleIndex)
-	{
-		return this.insertAfter(props, styleIndex, "\r");
-	}
-
-	/**
-	 * Inserts a paragraph into the end of this range. The paragraph will
-	 * contain one character run that has the default properties for the
-	 * paragraph's style.
-	 *
-	 * It is necessary for the text to end with the character '\r'
-	 *
-	 * @param props
-	 *            The paragraph's properties.
-	 * @param styleIndex
-	 *            The index of the paragraph's style in the style sheet.
-	 * @param text
-	 *            The text to insert.
-	 * @return A newly inserted paragraph.
-     * @deprecated POI 3.8 beta 4. Use code shall not work with {@link ParagraphProperties}
-	 */
-    @Deprecated
-	protected Paragraph insertAfter(ParagraphProperties props, int styleIndex, String text)
-	{
-		initAll();
-		StyleSheet ss = _doc.getStyleSheet();
-		ParagraphProperties baseStyle = ss.getParagraphStyle(styleIndex);
-		CharacterProperties baseChp = ss.getCharacterStyle(styleIndex);
-
-		byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty(props, baseStyle);
-		byte[] withIndex = new byte[grpprl.length + LittleEndian.SHORT_SIZE];
-		LittleEndian.putShort(withIndex, 0, (short) styleIndex);
-		System.arraycopy(grpprl, 0, withIndex, LittleEndian.SHORT_SIZE, grpprl.length);
-		SprmBuffer buf = new SprmBuffer(withIndex, 2);
-
-		_doc.getParagraphTable().insert(_parEnd, _end, buf);
-		_parEnd++;
-		insertAfter(text, baseChp);
-		return getParagraph(numParagraphs() - 1);
-	}
-
-	public void delete() {
-
-		initAll();
-
-		int numSections = _sections.size();
-		int numRuns = _characters.size();
-		int numParagraphs = _paragraphs.size();
-
-		for (int x = _charStart; x < numRuns; x++) {
-			CHPX chpx = _characters.get(x);
-			chpx.adjustForDelete(_start, _end - _start);
-		}
-
-		for (int x = _parStart; x < numParagraphs; x++) {
-			PAPX papx = _paragraphs.get(x);
-			// System.err.println("Paragraph " + x + " was " + papx.getStart() +
-			// " -> " + papx.getEnd());
-			papx.adjustForDelete(_start, _end - _start);
-			// System.err.println("Paragraph " + x + " is now " +
-			// papx.getStart() + " -> " + papx.getEnd());
-		}
-
-		for (int x = _sectionStart; x < numSections; x++) {
-			SEPX sepx = _sections.get(x);
-			// System.err.println("Section " + x + " was " + sepx.getStart() +
-			// " -> " + sepx.getEnd());
-			sepx.adjustForDelete(_start, _end - _start);
-			// System.err.println("Section " + x + " is now " + sepx.getStart()
-			// + " -> " + sepx.getEnd());
-		}
-
-        if ( _doc instanceof HWPFDocument )
-        {
-            ( (BookmarksImpl) ( (HWPFDocument) _doc ).getBookmarks() )
-                    .afterDelete( _start, ( _end - _start ) );
-        }
-
-        _text.delete( _start, _end );
-        Range parent = _parent.get();
-        if ( parent != null )
-        {
-            parent.adjustForInsert( -( _end - _start ) );
-        }
-
-		// update the FIB.CCPText + friends field
-		adjustFIB(-(_end - _start));
-	}
-
-    /**
-     * Inserts a simple table into the beginning of this range.
-     * 
-     * @param columns
-     *            The number of columns
-     * @param rows
-     *            The number of rows.
-     * @return The empty Table that is now part of the document.
-     */
-	public Table insertTableBefore(short columns, int rows) {
-        ParagraphProperties parProps = new ParagraphProperties();
-        parProps.setFInTable(true);
-        parProps.setItap( 1 );
-
-        final int oldEnd = this._end;
-        
-        for ( int x = 0; x < rows; x++ )
-        {
-            Paragraph cell = this.insertBefore( parProps, StyleSheet.NIL_STYLE );
-            cell.insertAfter( String.valueOf( '\u0007' ) );
-            for ( int y = 1; y < columns; y++ )
-            {
-                cell = cell.insertAfter( parProps, StyleSheet.NIL_STYLE );
-                cell.insertAfter( String.valueOf( '\u0007' ) );
-            }
-            cell = cell.insertAfter( parProps, StyleSheet.NIL_STYLE,
-                    String.valueOf( '\u0007' ) );
-            cell.setTableRowEnd( new TableProperties( columns ) );
-        }
-
-        final int newEnd = this._end;
-        final int diff = newEnd - oldEnd;
-
-        return new Table( _start, _start + diff, this, 1 );
-	}
-	
-    /**
-     * Replace range text with new one, adding it to the range and deleting
-     * original text from document
-     * 
-     * @param newText
-     *            The text to be replaced with
-     * @param addAfter
-     *            if <tt>true</tt> the text will be added at the end of current
-     *            range, otherwise to the beginning
-     */
-    public void replaceText( String newText, boolean addAfter )
-    {
-        if ( addAfter )
-        {
-            int originalEnd = getEndOffset();
-            insertAfter( newText );
-            new Range( getStartOffset(), originalEnd, this ).delete();
-        }
-        else
-        {
-            int originalStart = getStartOffset();
-            int originalEnd = getEndOffset();
-
-            insertBefore( newText );
-            new Range( originalStart + newText.length(), originalEnd
-                    + newText.length(), this ).delete();
-        }
-    }
-
-	/**
-	 * Replace (one instance of) a piece of text with another...
-	 *
-	 * @param pPlaceHolder
-	 *            The text to be replaced (e.g., "${organization}")
-	 * @param pValue
-	 *            The replacement text (e.g., "Apache Software Foundation")
-	 * @param pOffset
-	 *            The offset or index where the text to be replaced begins
-	 *            (relative to/within this <code>Range</code>)
-	 */
-	@Internal
-	public void replaceText(String pPlaceHolder, String pValue, int pOffset) {
-		int absPlaceHolderIndex = getStartOffset() + pOffset;
-
-		Range subRange = new Range(absPlaceHolderIndex,
-				(absPlaceHolderIndex + pPlaceHolder.length()), this);
-		subRange.insertBefore(pValue);
-
-		// re-create the sub-range so we can delete it
-		subRange = new Range((absPlaceHolderIndex + pValue.length()), (absPlaceHolderIndex
-				+ pPlaceHolder.length() + pValue.length()), this);
-
-		// deletes are automagically propagated
-		subRange.delete();
-	}
-
-	/**
-	 * Replace (all instances of) a piece of text with another...
-	 *
-	 * @param pPlaceHolder
-	 *            The text to be replaced (e.g., "${organization}")
-	 * @param pValue
-	 *            The replacement text (e.g., "Apache Software Foundation")
-	 */
-	public void replaceText(String pPlaceHolder, String pValue) {
-		while (true) {
-			String text = text();
-			int offset = text.indexOf(pPlaceHolder);
-			if (offset >= 0) {
-				replaceText(pPlaceHolder, pValue, offset);
-			} else {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Gets the character run at index. The index is relative to this range.
-	 *
-	 * @param index
-	 *            The index of the character run to get.
-	 * @return The character run at the specified index in this range.
-	 */
-    public CharacterRun getCharacterRun( int index )
-    {
-        initCharacterRuns();
-
-        if ( index + _charStart >= _charEnd )
-            throw new IndexOutOfBoundsException( "CHPX #" + index + " ("
-                    + ( index + _charStart ) + ") not in range [" + _charStart
-                    + "; " + _charEnd + ")" );
-
-        CHPX chpx = _characters.get( index + _charStart );
-        if ( chpx == null )
-        {
-            return null;
-        }
-
-        short istd;
-        if ( this instanceof Paragraph )
-        {
-            istd = ((Paragraph) this)._istd;
-        }
-        else
-        {
-            int[] point = findRange( _paragraphs,
-                    Math.max( chpx.getStart(), _start ),
-                    Math.min( chpx.getEnd(), _end ) );
-
-            initParagraphs();
-            int parStart = Math.max( point[0], _parStart );
-
-            if ( parStart >= _paragraphs.size() )
-            {
-                return null;
-            }
-
-            PAPX papx = _paragraphs.get( point[0] );
-            istd = papx.getIstd();
-        }
-
-		return new CharacterRun( chpx, _doc.getStyleSheet(), istd,
-				this);
-    }
-
-	/**
-	 * Gets the section at index. The index is relative to this range.
-	 *
-	 * @param index
-	 *            The index of the section to get.
-	 * @return The section at the specified index in this range.
-	 */
-	public Section getSection(int index) {
-		initSections();
-		SEPX sepx = _sections.get(index + _sectionStart);
-		return new Section(sepx, this);
-	}
-
-	/**
-	 * Gets the paragraph at index. The index is relative to this range.
-	 *
-	 * @param index
-	 *            The index of the paragraph to get.
-	 * @return The paragraph at the specified index in this range.
-	 */
-
-	public Paragraph getParagraph(int index) {
-        initParagraphs();
-
-        if ( index + _parStart >= _parEnd )
-            throw new IndexOutOfBoundsException( "Paragraph #" + index + " ("
-                    + (index + _parStart) + ") not in range [" + _parStart
-                    + "; " + _parEnd + ")" );
-
-		PAPX papx = _paragraphs.get(index + _parStart);
-		return Paragraph.newParagraph( this, papx );
-	}
-
-	/**
-	 * Gets the table that starts with paragraph. In a Word file, a table
-	 * consists of a group of paragraphs with certain flags set.
-	 *
-	 * @param paragraph
-	 *            The paragraph that is the first paragraph in the table.
-	 * @return The table that starts with paragraph
-	 */
-	public Table getTable(Paragraph paragraph) {
-		if (!paragraph.isInTable()) {
-			throw new IllegalArgumentException("This paragraph doesn't belong to a table");
-		}
-
-		Range r = paragraph;
-		if (r._parent.get() != this) {
-			throw new IllegalArgumentException("This paragraph is not a child of this range instance");
-		}
-
-        r.initAll();
-        int tableLevel = paragraph.getTableLevel();
-        int tableEndInclusive = r._parStart;
-
-        if ( r._parStart != 0 )
-        {
-            Paragraph previous = Paragraph.newParagraph( this,
-                    _paragraphs.get( r._parStart - 1 ) );
-            if ( previous.isInTable() && //
-                    previous.getTableLevel() == tableLevel //
-                    && previous._sectionEnd >= r._sectionStart )
-            {
-                throw new IllegalArgumentException(
-                        "This paragraph is not the first one in the table" );
-            }
-        }
-
-        Range overallRange = _doc.getOverallRange();
-        int limit = _paragraphs.size();
-        for ( ; tableEndInclusive < limit - 1; tableEndInclusive++ )
-        {
-            Paragraph next = Paragraph.newParagraph( overallRange,
-                    _paragraphs.get( tableEndInclusive + 1 ) );
-            if ( !next.isInTable() || next.getTableLevel() < tableLevel )
-                break;
-        }
-
-        initAll();
-        if ( tableEndInclusive >= this._parEnd )
-        {
-            logger.log( POILogger.WARN, "The table's bounds ", "["
-                    + this._parStart + "; " + tableEndInclusive + ")",
-                    " fall outside of this Range paragraphs numbers ", "["
-                            + this._parStart + "; " + this._parEnd + ")" );
-        }
-
-        if ( tableEndInclusive < 0 )
-        {
-            throw new ArrayIndexOutOfBoundsException(
-                    "The table's end is negative, which isn't allowed!" );
-        }
-
-        int endOffsetExclusive = _paragraphs.get( tableEndInclusive ).getEnd();
-
-        return new Table( paragraph.getStartOffset(), endOffsetExclusive,
-                this, paragraph.getTableLevel() );
-    }
-
-	/**
-	 * loads all of the list indexes.
-	 */
-	protected void initAll() {
-		initCharacterRuns();
-		initParagraphs();
-		initSections();
-	}
-
-	/**
-	 * inits the paragraph list indexes.
-	 */
-	private void initParagraphs() {
-		if (!_parRangeFound) {
-			int[] point = findRange(_paragraphs, _start, _end);
-			_parStart = point[0];
-			_parEnd = point[1];
-			_parRangeFound = true;
-		}
-	}
-
-	/**
-	 * inits the character run list indexes.
-	 */
-	private void initCharacterRuns() {
-		if (!_charRangeFound) {
-			int[] point = findRange(_characters, _start, _end);
-			_charStart = point[0];
-			_charEnd = point[1];
-			_charRangeFound = true;
-		}
-	}
-
-	/**
-	 * inits the section list indexes.
-	 */
-	private void initSections() {
-		if (!_sectionRangeFound) {
-			int[] point = findRange(_sections, _sectionStart, _start, _end);
-			_sectionStart = point[0];
-			_sectionEnd = point[1];
-			_sectionRangeFound = true;
-		}
-	}
-
-    private static int binarySearchStart( List<? extends PropertyNode<?>> rpl,
-            int start )
-    {
-        if ( rpl.size() == 0 )
-            return -1;
-        if ( rpl.get( 0 ).getStart() >= start )
-            return 0;
-
-        int low = 0;
-        int high = rpl.size() - 1;
-
-        while ( low <= high )
-        {
-            int mid = ( low + high ) >>> 1;
-            PropertyNode<?> node = rpl.get( mid );
-
-            if ( node.getStart() < start )
-            {
-                low = mid + 1;
-            }
-            else if ( node.getStart() > start )
-            {
-                high = mid - 1;
-            }
-            else
-            {
-                assert node.getStart() == start;
-                return mid;
-            }
-        }
-        assert low != 0;
-        return low - 1;
-    }
-
-    private static int binarySearchEnd( List<? extends PropertyNode<?>> rpl,
-            int foundStart, int end )
-    {
-        if ( rpl.get( rpl.size() - 1 ).getEnd() <= end )
-            return rpl.size() - 1;
-
-        int low = foundStart;
-        int high = rpl.size() - 1;
-
-        while ( low <= high )
-        {
-            int mid = ( low + high ) >>> 1;
-            PropertyNode<?> node = rpl.get( mid );
-
-            if ( node.getEnd() < end )
-            {
-                low = mid + 1;
-            }
-            else if ( node.getEnd() > end )
-            {
-                high = mid - 1;
-            }
-            else
-            {
-                assert node.getEnd() == end;
-                return mid;
-            }
-        }
-        assert 0 <= low && low < rpl.size();
-
-        return low;
-    }
-
-    /**
-     * Used to find the list indexes of a particular property.
-     * 
-     * @param rpl
-     *            A list of property nodes.
-     * @param start
-     *            The starting character offset.
-     * @param end
-     *            The ending character offset.
-     * @return An int array of length 2. The first int is the start index and
-     *         the second int is the end index.
-     */
-    private int[] findRange( List<? extends PropertyNode<?>> rpl, int start,
-            int end )
-    {
-        int startIndex = binarySearchStart( rpl, start );
-        while ( startIndex > 0 && rpl.get( startIndex - 1 ).getStart() >= start )
-            startIndex--;
-
-        int endIndex = binarySearchEnd( rpl, startIndex, end );
-        while ( endIndex < rpl.size() - 1
-                && rpl.get( endIndex + 1 ).getEnd() <= end )
-            endIndex++;
-
-        if ( startIndex < 0 || startIndex >= rpl.size()
-                || startIndex > endIndex || endIndex < 0
-                || endIndex >= rpl.size() )
-            throw new AssertionError();
-
-        return new int[] { startIndex, endIndex + 1 };
-    }
-
-	/**
-	 * Used to find the list indexes of a particular property.
-	 *
-	 * @param rpl
-	 *            A list of property nodes.
-	 * @param min
-	 *            A hint on where to start looking.
-	 * @param start
-	 *            The starting character offset.
-	 * @param end
-	 *            The ending character offset.
-	 * @return An int array of length 2. The first int is the start index and
-	 *         the second int is the end index.
-	 */
-	private int[] findRange(List<? extends PropertyNode<?>> rpl, int min, int start, int end) {
-		int x = min;
-		
-        if ( rpl.size() == min )
-            return new int[] { min, min };
-
-        PropertyNode<?> node = rpl.get( x );
-
-		while (node==null || (node.getEnd() <= start && x < rpl.size() - 1)) {
-			x++;
-
-            if (x>=rpl.size()) {
-                return new int[] {0, 0};
-            }
-
-			node = rpl.get(x);
-		}
-
-        if ( node.getStart() > end )
-        {
-            return new int[] { 0, 0 };
-        }
-
-        if ( node.getEnd() <= start )
-        {
-            return new int[] { rpl.size(), rpl.size() };
-        }
-
-        for ( int y = x; y < rpl.size(); y++ )
-        {
-            node = rpl.get( y );
-            if ( node == null )
-                continue;
-
-            if ( node.getStart() < end && node.getEnd() <= end )
-                continue;
-
-            if ( node.getStart() < end )
-                return new int[] { x, y +1 };
-
-            return new int[] { x, y };
-        }
-        return new int[] { x, rpl.size() };
-    }
-
-	/**
-	 * resets the list indexes.
-	 */
-	protected void reset() {
-		_charRangeFound = false;
-		_parRangeFound = false;
-		_sectionRangeFound = false;
-	}
-
-    /**
-     * Adjust the value of the various FIB character count fields, eg
-     * <code>FIB.CCPText</code> after an insert or a delete...
-     * 
-     * Works on all CCP fields from this range onwards
-     * 
-     * @param adjustment
-     *            The (signed) value that should be added to the FIB CCP fields
-     */
-    protected void adjustFIB( int adjustment )
-    {
-        assert ( _doc instanceof HWPFDocument );
-
-        // update the FIB.CCPText field (this should happen once per adjustment,
-        // so we don't want it in
-        // adjustForInsert() or it would get updated multiple times if the range
-        // has a parent)
-        // without this, OpenOffice.org (v. 2.2.x) does not see all the text in
-        // the document
-
-        FileInformationBlock fib = _doc.getFileInformationBlock();
-
-        // // Do for each affected part
-        // if (_start < cpS.getMainDocumentEnd()) {
-        // fib.setCcpText(fib.getCcpText() + adjustment);
-        // }
-        //
-        // if (_start < cpS.getCommentsEnd()) {
-        // fib.setCcpAtn(fib.getCcpAtn() + adjustment);
-        // }
-        // if (_start < cpS.getEndNoteEnd()) {
-        // fib.setCcpEdn(fib.getCcpEdn() + adjustment);
-        // }
-        // if (_start < cpS.getFootnoteEnd()) {
-        // fib.setCcpFtn(fib.getCcpFtn() + adjustment);
-        // }
-        // if (_start < cpS.getHeaderStoryEnd()) {
-        // fib.setCcpHdd(fib.getCcpHdd() + adjustment);
-        // }
-        // if (_start < cpS.getHeaderTextboxEnd()) {
-        // fib.setCcpHdrTxtBx(fib.getCcpHdrTxtBx() + adjustment);
-        // }
-        // if (_start < cpS.getMainTextboxEnd()) {
-        // fib.setCcpTxtBx(fib.getCcpTxtBx() + adjustment);
-        // }
-
-        // much simple implementation base on SubdocumentType --sergey
-
-        int currentEnd = 0;
-        for ( SubdocumentType type : SubdocumentType.ORDERED )
-        {
-            int currentLength = fib.getSubdocumentTextStreamLength( type );
-            currentEnd += currentLength;
-
-            // do we need to shift this part?
-            if ( _start > currentEnd )
-                continue;
-
-            fib.setSubdocumentTextStreamLength( type, currentLength
-                    + adjustment );
-
-            break;
-        }
-    }
-
-	/**
-	 * adjust this range after an insert happens.
-	 *
-	 * @param length
-	 *            the length to adjust for (expected to be a count of
-	 *            code-points, not necessarily chars)
-	 */
-	private void adjustForInsert(int length) {
-		_end += length;
-
-		reset();
-		Range parent = _parent.get();
-		if (parent != null) {
-			parent.adjustForInsert(length);
-		}
-	}
-
-	/**
-	 * @return Starting character offset of the range
-	 */
-	public int getStartOffset() {
-		return _start;
-	}
-
-	/**
-	 * @return The ending character offset of this range
-	 */
-	public int getEndOffset() {
-		return _end;
-	}
-
-	protected HWPFDocumentCore getDocument() {
-		return _doc;
-	}
-
-    @Override
-    public String toString()
-    {
-        return "Range from " + getStartOffset() + " to " + getEndOffset()
-                + " (chars)";
-    }
-
-    /**
-     * Method for debug purposes. Checks that all resolved elements are inside
-     * of current range.
-     */
-    public boolean sanityCheck()
-    {
-        if ( _start < 0 )
-            throw new AssertionError();
-        if ( _start > _text.length() )
-            throw new AssertionError();
-        if ( _end < 0 )
-            throw new AssertionError();
-        if ( _end > _text.length() )
-            throw new AssertionError();
-        if ( _start > _end )
-            throw new AssertionError();
-
-        if ( _charRangeFound )
-        {
-            for ( int c = _charStart; c < _charEnd; c++ )
-            {
-                CHPX chpx = _characters.get( c );
-
-                int left = Math.max( this._start, chpx.getStart() );
-                int right = Math.min( this._end, chpx.getEnd() );
-
-                if ( left >= right )
-                    throw new AssertionError();
-            }
-        }
-        if ( _parRangeFound )
-        {
-            for ( int p = _parStart; p < _parEnd; p++ )
-            {
-                PAPX papx = _paragraphs.get( p );
-
-                int left = Math.max( this._start, papx.getStart() );
-                int right = Math.min( this._end, papx.getEnd() );
-
-                if ( left >= right )
-                    throw new AssertionError();
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
deleted file mode 100644
index 71ab501..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.HWPFOldDocument;
-import org.apache.poi.hwpf.model.SEPX;
-
-public final class Section extends Range
-{
-    private SectionProperties _props;
-
-    public Section( SEPX sepx, Range parent )
-    {
-        super( Math.max( parent._start, sepx.getStart() ), Math.min(
-                parent._end, sepx.getEnd() ), parent );
-
-        // XXX: temporary workaround for old Word95 document
-        if ( parent.getDocument() instanceof HWPFOldDocument )
-            _props = new SectionProperties();
-        else
-            _props = sepx.getSectionProperties();
-    }
-
-    public Object clone() throws CloneNotSupportedException
-    {
-        Section s = (Section) super.clone();
-        s._props = (SectionProperties) _props.clone();
-        return s;
-    }
-
-    /**
-     * @return distance to be maintained between columns, in twips. Used when
-     *         {@link #isColumnsEvenlySpaced()} == true
-     */
-    public int getDistanceBetweenColumns()
-    {
-        return _props.getDxaColumns();
-    }
-
-    public int getMarginBottom()
-    {
-        return _props.getDyaBottom();
-    }
-
-    public int getMarginLeft()
-    {
-        return _props.getDxaLeft();
-    }
-
-    public int getMarginRight()
-    {
-        return _props.getDxaRight();
-    }
-
-    public int getMarginTop()
-    {
-        return _props.getDyaTop();
-    }
-
-    public int getNumColumns()
-    {
-        return _props.getCcolM1() + 1;
-    }
-
-    /**
-     * @return page height (in twips) in current section. Default value is 15840
-     *         twips
-     */
-    public int getPageHeight()
-    {
-        return _props.getYaPage();
-    }
-
-    /**
-     * @return page width (in twips) in current section. Default value is 12240
-     *         twips
-     */
-    public int getPageWidth()
-    {
-        return _props.getXaPage();
-    }
-
-    /**
-     * Set the height of the bottom margin in twips. In the AbstractWordUtils class, a constant
-     * is defined that indicates how many twips there are per inch and it can be used in setting
-     * the margins width a little like this;
-     * 
-     * section.setMarginBottom( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
-     *
-     * @param marginWidth A primitive int whose value will indciate how high the margin should
-     *                be - in twips.
-     */
-    public void setMarginBottom(int marginWidth)
-    {
-        this._props.setDyaBottom(marginWidth);
-    }
-
-    /**
-     * Set the width of the left hand margin in twips. In the AbstractWordUtils class, a constant
-     * is defined that indicates how many twips there are per inch and it can be used in setting
-     * the margins width a little like this;
-     * 
-     * section.setMarginLeft( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
-     *
-     * @param marginWidth A primitive int whose value will indciate how high the margin should
-     *                be - in twips.
-     */
-    public void setMarginLeft(int marginWidth)
-    {
-        this._props.setDxaLeft(marginWidth);
-    }
-
-    /**
-     * Set the width of the right hand margin in twips. In the AbstractWordUtils class, a constant
-     * is defined that indicates how many twips there are per inch and it can be used in setting
-     * the margins width a little like this;
-     * 
-     * section.setMarginRight( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
-     *
-     * @param marginWidth A primitive int whose value will indciate how high the margin should
-     *                be - in twips.
-     */
-    public void setMarginRight(int marginWidth)
-    {
-        this._props.setDxaRight(marginWidth);
-    }
-
-    /**
-     * Set the height of the top margin in twips. In the AbstractWordUtils class, a constant
-     * is defined that indicates how many twips there are per inch and it can be used in setting
-     * the margins width a little like this;
-     * 
-     * section.setMarginTop( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
-     *
-     * @param marginWidth A primitive int whose value will indciate how high the margin should
-     *                be - in twips.
-     */
-    public void setMarginTop(int marginWidth)
-    {
-        this._props.setDyaTop(marginWidth);
-    }
-
-    public boolean isColumnsEvenlySpaced()
-    {
-        return _props.getFEvenlySpaced();
-    }
-
-    /**
-     * Get the footnote restart qualifier
-     *
-     * <dl>
-     * <dt>{@code 0x00}</dt><dd>If the numbering is continuous throughout the entire document</dd>
-     * <dt>{@code 0x01}</dt><dd>If the numbering restarts at the beginning of this section</dd>
-     * <dt>{@code 0x02}</dt><dd>If the numbering restarts on every page</dd>
-     * </dl>
-     *
-     * @return an Rnc, as decribed above, specifying when and where footnote numbering restarts
-     */
-    public short getFootnoteRestartQualifier() {
-        return _props.getRncFtn();
-    }
-
-    /**
-     * @return an offset to be added to footnote numbers
-     */
-    public int getFootnoteNumberingOffset() {
-        return _props.getNFtn();
-    }
-    
-    /**
-     * Get the numbering format of embedded footnotes
-     *
-     * <p>The full list of possible return values is given in [MS-OSHARED], v20140428, 2.2.1.3</p>
-     *
-     * @return an Nfc specifying the numbering format for footnotes
-     */
-    public int getFootnoteNumberingFormat() {
-        return _props.getNfcFtnRef();
-    }
-    
-    /**
-     * Get the endnote restart qualifier
-     *
-     * <dl>
-     * <dt>{@code 0x00}</dt><dd>If the numbering is continuous throughout the entire document</dd>
-     * <dt>{@code 0x01}</dt><dd>If the numbering restarts at the beginning of this section</dd>
-     * <dt>{@code 0x02}</dt><dd>If the numbering restarts on every page</dd>
-     * </dl>
-     *
-     * @return an Rnc, as decribed above, specifying when and where endnote numbering restarts
-     */   
-    public short getEndnoteRestartQualifier() {
-        return _props.getRncEdn();
-    }
-    
-    /**
-     * @return an offset to be added to endnote numbers
-     */
-    public int getEndnoteNumberingOffset() {
-        return _props.getNEdn();
-    }
-    
-    /**
-     * Get the numbering format of embedded endnotes
-     *
-     * <p>The full list of possible return values is given in [MS-OSHARED], v20140428, 2.2.1.3</p>
-     *
-     * @return an Nfc specifying the numbering format for endnotes
-     */
-    public int getEndnoteNumberingFormat() {
-        return _props.getNfcEdnRef();
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Section [" + getStartOffset() + "; " + getEndOffset() + ")";
-    }
-
-    public int type()
-    {
-        return TYPE_SECTION;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java
deleted file mode 100644
index 47aad84..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.types.SEPAbstractType;
-
-public final class SectionProperties extends SEPAbstractType implements Cloneable
-{
-    private short field_60_rncftn;
-    private short field_61_rncedn;
-    private int field_62_nftn;
-    private int field_63_nfcftnref = 0x00; // initialize with default value; msonfcArabic
-    private int field_64_nedn;
-    private int field_65_nfcednref = 0x02; // initialize with default value; msonfcLCRoman
-
-    public SectionProperties()
-    {
-        field_20_brcTop = new BorderCode();
-        field_21_brcLeft = new BorderCode();
-        field_22_brcBottom = new BorderCode();
-        field_23_brcRight = new BorderCode();
-        field_26_dttmPropRMark = new DateAndTime();
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException
-    {
-        SectionProperties copy = (SectionProperties) super.clone();
-        copy.field_20_brcTop = (BorderCode) field_20_brcTop.clone();
-        copy.field_21_brcLeft = (BorderCode) field_21_brcLeft.clone();
-        copy.field_22_brcBottom = (BorderCode) field_22_brcBottom.clone();
-        copy.field_23_brcRight = (BorderCode) field_23_brcRight.clone();
-        copy.field_26_dttmPropRMark = (DateAndTime) field_26_dttmPropRMark
-                .clone();
-
-        return copy;
-    }
-    
-    /**
-     * sprmSRncFtn, [MS-DOC], 20140721, 2.6.4
-     * 
-     * @param field_60_rncftn unsigned 8-bit integer specifying the footnote numbering restart condition
-     */
-    public void setRncFtn(final short field_60_rncftn) {
-        this.field_60_rncftn = field_60_rncftn;
-    }
-    
-    /**
-     * @see #setRncFtn(short)
-     * @return an Rnc value specifying when and where footnote numbering restarts
-     */
-    public short getRncFtn() {
-        return this.field_60_rncftn;
-    }
-    
-    /**
-     * sprmSRncEdn, [MS-DOC], 20140721, 2.6.4
-     * 
-     * @param field_61_rncedn unsigned 8-bit integer specifying the endnote numbering restart condition
-     */
-    public void setRncEdn(final short field_61_rncedn) {
-        this.field_61_rncedn = field_61_rncedn;
-    }
-    
-    /**
-     * @see #setRncEdn(short)
-     * @return an Rnc value specifying when and where endnote numbering restarts
-     */
-    public short getRncEdn() {
-        return this.field_61_rncedn;
-    }
-    
-    /**
-     * sprmSNftn, [MS-DOC], v20140721, 2.6.4
-     * 
-     * @param field_62_nftn a number specifying the offset to add to footnote numbers
-     */
-    public void setNFtn(final int field_62_nftn) {
-        this.field_62_nftn = field_62_nftn;
-    }
-    
-    /**
-     * @see #setNFtn(int)
-     * @return a 16-bit integer specifying the offset to add to footnote numbering
-     */
-    public int getNFtn() {
-        return this.field_62_nftn;
-    }
-    
-    /**
-     * sprmSNfcFtnRef, [MS-DOC], v20140721
-     * 
-     * @param field_63_nfcftnref an Nfc specifying the numbering format for footnotes
-     */
-    public void setNfcFtnRef(final int field_63_nfcftnref) {
-        this.field_63_nfcftnref = field_63_nfcftnref;
-    }
-    
-    /**
-     * 
-     * @see #setNfcFtnRef(int)
-     * @return a 16-bit integer with an Nfc specifying the numbering format for footnotes
-     */
-    public int getNfcFtnRef() {
-        return this.field_63_nfcftnref;
-    }
-    
-    /**
-     * sprmSNEdn, [MS-DOC], v20140721, 2.6.4
-     * 
-     * @param field_64_nedn a number specifying the offset to add to footnote numbers
-     */
-    public void setNEdn(final int field_64_nedn) {
-        this.field_64_nedn = field_64_nedn;
-    }
-    
-    /**
-     * @see #setNEdn(int)
-     * @return a 16-bit integer specifying the offset to add to endnote numbering
-     */
-    public int getNEdn() {
-        return this.field_64_nedn;
-    }
-    
-    /**
-     * sprmSNfcEdnRef, [MS-DOC], v20140721
-     * 
-     * @param field_65_nfcednref an Nfc specifying the numbering format for endnotes
-     */
-    public void setNfcEdnRef(final int field_65_nfcednref) {
-        this.field_65_nfcednref = field_65_nfcednref;
-    }
-    
-    /**
-     * 
-     * @see #setNfcEdnRef(int)
-     * @return a 16-bit integer with an Nfc specifying the numbering format for endnotes
-     */
-    public int getNfcEdnRef() {
-        return this.field_65_nfcednref;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
deleted file mode 100644
index e15cd7d..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.types.SHDAbstractType;
-
-/**
- * The SHD is a substructure of the CHP, PAP, and TC for Word 2000.
- * 
- * @author vlsergey
- */
-public final class ShadingDescriptor extends SHDAbstractType implements
-        Cloneable
-{
-
-    public ShadingDescriptor()
-    {
-    }
-
-    public ShadingDescriptor( byte[] buf, int offset )
-    {
-        super();
-        fillFields( buf, offset );
-    }
-
-    public ShadingDescriptor clone() throws CloneNotSupportedException
-    {
-        return (ShadingDescriptor) super.clone();
-    }
-
-    public boolean isEmpty()
-    {
-        return field_3_ipat == 0;
-    }
-
-    public byte[] serialize()
-    {
-        byte[] result = new byte[getSize()];
-        serialize( result, 0 );
-        return result;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[SHD] EMPTY";
-
-        return "[SHD] (cvFore: " + getCvFore() + "; cvBack: " + getCvBack()
-                + "; iPat: " + getIpat() + ")";
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
deleted file mode 100644
index 40a6fac..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.Colorref;
-
-import org.apache.poi.hwpf.model.types.SHD80AbstractType;
-
-/**
- * The SHD80 is a substructure of the CHP and PAP, and TC for Word 97.
- */
-public final class ShadingDescriptor80 extends SHD80AbstractType implements
-        Cloneable
-{
-
-    public ShadingDescriptor80()
-    {
-    }
-
-    public ShadingDescriptor80( byte[] buf, int offset )
-    {
-        super();
-        fillFields( buf, offset );
-    }
-
-    public ShadingDescriptor80( short value )
-    {
-        super();
-        field_1_value = value;
-    }
-
-    public ShadingDescriptor80 clone() throws CloneNotSupportedException
-    {
-        return (ShadingDescriptor80) super.clone();
-    }
-
-    public boolean isEmpty()
-    {
-        return field_1_value == 0;
-    }
-
-    public byte[] serialize()
-    {
-        byte[] result = new byte[getSize()];
-        serialize( result, 0 );
-        return result;
-    }
-
-    public ShadingDescriptor toShadingDescriptor()
-    {
-        ShadingDescriptor result = new ShadingDescriptor();
-        result.setCvFore( Colorref.valueOfIco( getIcoFore() ) );
-        result.setCvBack( Colorref.valueOfIco( getIcoBack() ) );
-        result.setIpat( getIpat() );
-        return result;
-    }
-
-    @Override
-    public String toString()
-    {
-        if ( isEmpty() )
-            return "[SHD80] EMPTY";
-
-        return "[SHD80] (icoFore: " + getIcoFore() + "; icoBack: "
-                + getIcoBack() + "; iPat: " + getIpat() + ")";
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
deleted file mode 100644
index fb99df5..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.ArrayList;
-
-public final class Table extends Range
-{
-    private ArrayList<TableRow> _rows;
-
-    private boolean _rowsFound = false;
-
-    private int _tableLevel;
-
-    Table( int startIdxInclusive, int endIdxExclusive, Range parent,
-            int levelNum )
-    {
-        super( startIdxInclusive, endIdxExclusive, parent );
-        _tableLevel = levelNum;
-        initRows();
-    }
-
-    public TableRow getRow( int index )
-    {
-        initRows();
-        return _rows.get( index );
-    }
-
-    public int getTableLevel()
-    {
-        return _tableLevel;
-    }
-
-    private void initRows()
-    {
-        if ( _rowsFound )
-            return;
-
-        _rows = new ArrayList<TableRow>();
-        int rowStart = 0;
-        int rowEnd = 0;
-
-        int numParagraphs = numParagraphs();
-        while ( rowEnd < numParagraphs )
-        {
-            Paragraph startRowP = getParagraph( rowStart );
-            Paragraph endRowP = getParagraph( rowEnd );
-            rowEnd++;
-            if ( endRowP.isTableRowEnd()
-                    && endRowP.getTableLevel() == _tableLevel )
-            {
-                _rows.add( new TableRow( startRowP.getStartOffset(), endRowP
-                        .getEndOffset(), this, _tableLevel ) );
-                rowStart = rowEnd;
-            }
-        }
-        _rowsFound = true;
-    }
-
-    public int numRows()
-    {
-        initRows();
-        return _rows.size();
-    }
-
-    @Override
-    protected void reset()
-    {
-        _rowsFound = false;
-    }
-
-    public int type()
-    {
-        return TYPE_TABLE;
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
deleted file mode 100644
index fbe68d4..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.types.TLPAbstractType;
-
-public class TableAutoformatLookSpecifier extends TLPAbstractType implements
-        Cloneable
-{
-    public static final int SIZE = 4;
-
-    public TableAutoformatLookSpecifier()
-    {
-        super();
-    }
-
-    public TableAutoformatLookSpecifier( byte[] data, int offset )
-    {
-        super();
-        fillFields( data, offset );
-    }
-
-    @Override
-    public TableAutoformatLookSpecifier clone()
-    {
-        try
-        {
-            return (TableAutoformatLookSpecifier) super.clone();
-        }
-        catch ( CloneNotSupportedException e )
-        {
-            throw new Error( e.getMessage(), e );
-        }
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-        TableAutoformatLookSpecifier other = (TableAutoformatLookSpecifier) obj;
-        if ( field_1_itl != other.field_1_itl )
-            return false;
-        if ( field_2_tlp_flags != other.field_2_tlp_flags )
-            return false;
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + field_1_itl;
-        result = prime * result + field_2_tlp_flags;
-        return result;
-    }
-
-    public boolean isEmpty()
-    {
-        return field_1_itl == 0 && field_2_tlp_flags == 0;
-    }
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java
deleted file mode 100644
index 83a7b0b..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-public final class TableCell
-  extends Range
-{
-  private int _levelNum;
-  private TableCellDescriptor _tcd;
-  private int _leftEdge;
-  private int _width;
-
-    public TableCell( int startIdxInclusive, int endIdxExclusive,
-            TableRow parent, int levelNum, TableCellDescriptor tcd,
-            int leftEdge, int width )
-    {
-        super( startIdxInclusive, endIdxExclusive, parent );
-        _tcd = tcd;
-        _leftEdge = leftEdge;
-        _width = width;
-        _levelNum = levelNum;
-    }
-
-  public boolean isFirstMerged()
-  {
-    return _tcd.isFFirstMerged();
-  }
-
-  public boolean isMerged()
-  {
-    return _tcd.isFMerged();
-  }
-
-  public boolean isVertical()
-  {
-    return _tcd.isFVertical();
-  }
-
-  public boolean isBackward()
-  {
-    return _tcd.isFBackward();
-  }
-
-    public boolean isRotateFont()
-  {
-    return _tcd.isFRotateFont();
-  }
-
-  public boolean isVerticallyMerged()
-  {
-    return _tcd.isFVertMerge();
-  }
-
-  public boolean isFirstVerticallyMerged()
-  {
-    return _tcd.isFVertRestart();
-  }
-
-  public byte getVertAlign()
-  {
-    return _tcd.getVertAlign();
-  }
-
-  public BorderCode getBrcTop()
-  {
-    return _tcd.getBrcTop();
-  }
-
-  public BorderCode getBrcBottom()
-  {
-    return _tcd.getBrcBottom();
-  }
-
-  public BorderCode getBrcLeft()
-  {
-    return _tcd.getBrcLeft();
-  }
-
-  public BorderCode getBrcRight()
-  {
-    return _tcd.getBrcRight();
-  }
-
-  public int getLeftEdge() // twips
-  {
-    return _leftEdge;
-  }
-
-  public int getWidth() // twips
-  {
-    return _width;
-  }
-
-  /** Returns the TableCellDescriptor for this cell.*/
-  public TableCellDescriptor getDescriptor(){
-  	return _tcd;
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
deleted file mode 100644
index 4d01ec8..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.types.TCAbstractType;
-import org.apache.poi.util.LittleEndian;
-
-public final class TableCellDescriptor extends TCAbstractType implements
-        Cloneable
-{
-  public static final int SIZE = 20;
-
-  public TableCellDescriptor()
-  {
-  }
-
-  protected void fillFields(byte[] data, int offset)
-  {
-    field_1_rgf = LittleEndian.getShort(data, 0x0 + offset);
-    field_2_wWidth = LittleEndian.getShort(data, 0x2 + offset);
-    setBrcTop(new BorderCode(data, 0x4 + offset));
-    setBrcLeft(new BorderCode(data, 0x8 + offset));
-    setBrcBottom(new BorderCode(data, 0xc + offset));
-    setBrcRight(new BorderCode(data, 0x10 + offset));
-  }
-
-  public void serialize(byte[] data, int offset)
-  {
-      LittleEndian.putShort(data, 0x0 + offset, field_1_rgf);
-      LittleEndian.putShort(data, 0x2 + offset, field_2_wWidth);
-      getBrcTop().serialize(data, 0x4 + offset);
-      getBrcLeft().serialize(data, 0x8 + offset);
-      getBrcBottom().serialize(data, 0xc + offset);
-      getBrcRight().serialize(data, 0x10 + offset);
-  }
-
-  public Object clone()
-    throws CloneNotSupportedException
-  {
-    TableCellDescriptor tc = (TableCellDescriptor)super.clone();
-    tc.setShd( getShd().clone() );
-    tc.setBrcTop((BorderCode)getBrcTop().clone());
-    tc.setBrcLeft((BorderCode)getBrcLeft().clone());
-    tc.setBrcBottom((BorderCode)getBrcBottom().clone());
-    tc.setBrcRight((BorderCode)getBrcRight().clone());
-    return tc;
-  }
-
-  public static TableCellDescriptor convertBytesToTC(byte[] buf, int offset)
-  {
-    TableCellDescriptor tc = new TableCellDescriptor();
-    tc.fillFields(buf, offset);
-    return tc;
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java
deleted file mode 100644
index b2b11d2..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-
-public final class TableIterator
-{
-  Range _range;
-  int _index;
-  int _levelNum;
-
-  TableIterator(Range range, int levelNum)
-  {
-    _range = range;
-    _index = 0;
-    _levelNum = levelNum;
-  }
-
-  public TableIterator(Range range)
-  {
-    this(range, 1);
-  }
-
-
-  public boolean hasNext()
-  {
-    int numParagraphs = _range.numParagraphs();
-    for (;_index < numParagraphs; _index++)
-    {
-      Paragraph paragraph = _range.getParagraph(_index);
-      if (paragraph.isInTable() && paragraph.getTableLevel() == _levelNum)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public Table next()
-  {
-    int numParagraphs = _range.numParagraphs();
-    int startIndex = _index;
-    int endIndex = _index;
-
-    for (;_index < numParagraphs; _index++)
-    {
-      Paragraph paragraph = _range.getParagraph(_index);
-      if (!paragraph.isInTable() || paragraph.getTableLevel() < _levelNum)
-      {
-        endIndex = _index;
-        break;
-      }
-    }
-        return new Table( _range.getParagraph( startIndex ).getStartOffset(),
-                _range.getParagraph( endIndex - 1 ).getEndOffset(), _range,
-                _levelNum );
-  }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
deleted file mode 100644
index 001b3cf..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.model.types.TAPAbstractType;
-
-public final class TableProperties extends TAPAbstractType implements Cloneable
-{
-
-    public TableProperties()
-    {
-        setTlp( new TableAutoformatLookSpecifier() );
-        setShdTable( new ShadingDescriptor() );
-        setBrcBottom( new BorderCode() );
-        setBrcHorizontal( new BorderCode() );
-        setBrcLeft( new BorderCode() );
-        setBrcRight( new BorderCode() );
-        setBrcTop( new BorderCode() );
-        setBrcVertical( new BorderCode() );
-        setRgbrcInsideDefault_0( new BorderCode() );
-        setRgbrcInsideDefault_1( new BorderCode() );
-        setRgdxaCenter( new short[0] );
-        setRgdxaCenterPrint( new short[0] );
-        setRgshd( new ShadingDescriptor[0] );
-        setRgtc( new TableCellDescriptor[0] );
-    }
-
-    public TableProperties( short columns )
-    {
-        this();
-
-        setItcMac( columns );
-        setRgshd( new ShadingDescriptor[columns] );
-
-        for ( int x = 0; x < columns; x++ )
-        {
-            getRgshd()[x] = new ShadingDescriptor();
-        }
-
-        TableCellDescriptor[] tableCellDescriptors = new TableCellDescriptor[columns];
-        for ( int x = 0; x < columns; x++ )
-        {
-            tableCellDescriptors[x] = new TableCellDescriptor();
-        }
-        setRgtc( tableCellDescriptors );
-
-        setRgdxaCenter( new short[columns] );
-        setRgdxaCenterPrint( new short[columns] );
-    }
-
-    public Object clone() throws CloneNotSupportedException
-    {
-        TableProperties tap = (TableProperties) super.clone();
-
-        tap.setTlp( getTlp().clone() );
-        tap.setRgshd( new ShadingDescriptor[getRgshd().length] );
-        for ( int x = 0; x < getRgshd().length; x++ )
-        {
-            tap.getRgshd()[x] = getRgshd()[x].clone();
-        }
-
-        tap.setBrcBottom( (BorderCode) getBrcBottom().clone() );
-        tap.setBrcHorizontal( (BorderCode) getBrcHorizontal().clone() );
-        tap.setBrcLeft( (BorderCode) getBrcLeft().clone() );
-        tap.setBrcRight( (BorderCode) getBrcRight().clone() );
-        tap.setBrcTop( (BorderCode) getBrcTop().clone() );
-        tap.setBrcVertical( (BorderCode) getBrcVertical().clone() );
-
-        tap.setShdTable( getShdTable().clone() );
-
-        tap.setRgbrcInsideDefault_0( (BorderCode) getRgbrcInsideDefault_0()
-                .clone() );
-        tap.setRgbrcInsideDefault_1( (BorderCode) getRgbrcInsideDefault_1()
-                .clone() );
-
-        tap.setRgdxaCenter( getRgdxaCenter().clone() );
-        tap.setRgdxaCenterPrint( getRgdxaCenterPrint().clone() );
-
-        tap.setRgtc( new TableCellDescriptor[getRgtc().length] );
-        for ( int x = 0; x < getRgtc().length; x++ )
-        {
-            tap.getRgtc()[x] = (TableCellDescriptor) getRgtc()[x].clone();
-        }
-        return tap;
-    }
-
-}
diff --git a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java b/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
deleted file mode 100644
index a12dc63..0000000
--- a/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hwpf.sprm.SprmBuffer;
-import org.apache.poi.hwpf.sprm.TableSprmUncompressor;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-public final class TableRow extends Range
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger( TableRow.class );
-
-    private final static short SPRM_DXAGAPHALF = (short) 0x9602;
-    private final static short SPRM_DYAROWHEIGHT = (short) 0x9407;
-    private final static short SPRM_FCANTSPLIT = 0x3403;
-    private final static short SPRM_FTABLEHEADER = 0x3404;
-    private final static short SPRM_TJC = 0x5400;
-
-    private final static char TABLE_CELL_MARK = '\u0007';
-
-    private TableCell[] _cells;
-    private boolean _cellsFound = false;
-
-    int _levelNum;
-    private SprmBuffer _papx;
-    private TableProperties _tprops;
-
-    public TableRow( int startIdxInclusive, int endIdxExclusive, Table parent,
-            int levelNum )
-    {
-        super( startIdxInclusive, endIdxExclusive, parent );
-
-        Paragraph last = getParagraph( numParagraphs() - 1 );
-        _papx = last._papx;
-        _tprops = TableSprmUncompressor.uncompressTAP( _papx );
-        _levelNum = levelNum;
-        initCells();
-    }
-
-    public boolean cantSplit()
-    {
-        return _tprops.getFCantSplit();
-    }
-
-    public BorderCode getBarBorder()
-    {
-        throw new UnsupportedOperationException( "not applicable for TableRow" );
-    }
-
-    public BorderCode getBottomBorder()
-    {
-        return _tprops.getBrcBottom();
-    }
-
-    public TableCell getCell( int index )
-    {
-        initCells();
-        return _cells[index];
-    }
-
-    public int getGapHalf()
-    {
-        return _tprops.getDxaGapHalf();
-    }
-
-    public BorderCode getHorizontalBorder()
-    {
-        return _tprops.getBrcHorizontal();
-    }
-
-    public BorderCode getLeftBorder()
-    {
-        return _tprops.getBrcLeft();
-    }
-
-    public BorderCode getRightBorder()
-    {
-        return _tprops.getBrcRight();
-    }
-
-    public int getRowHeight()
-    {
-        return _tprops.getDyaRowHeight();
-    }
-
-    public int getRowJustification()
-    {
-        return _tprops.getJc();
-    }
-
-    public BorderCode getTopBorder()
-    {
-        return _tprops.getBrcTop();
-    }
-
-    public BorderCode getVerticalBorder()
-    {
-        return _tprops.getBrcVertical();
-    }
-
-    private void initCells()
-    {
-        if ( _cellsFound )
-            return;
-
-        final short expectedCellsCount = _tprops.getItcMac();
-
-        int lastCellStart = 0;
-        List<TableCell> cells = new ArrayList<TableCell>(
-                expectedCellsCount + 1 );
-        for ( int p = 0; p < numParagraphs(); p++ )
-        {
-            Paragraph paragraph = getParagraph( p );
-            String s = paragraph.text();
-
-            if ( ( ( s.length() > 0 && s.charAt( s.length() - 1 ) == TABLE_CELL_MARK ) || paragraph
-                    .isEmbeddedCellMark() )
-                    && paragraph.getTableLevel() == _levelNum )
-            {
-                TableCellDescriptor tableCellDescriptor = _tprops.getRgtc() != null
-                        && _tprops.getRgtc().length > cells.size() ? _tprops
-                        .getRgtc()[cells.size()] : new TableCellDescriptor();
-                final short leftEdge = _tprops.getRgdxaCenter() != null
-                        && _tprops.getRgdxaCenter().length > cells.size() ? _tprops
-                        .getRgdxaCenter()[cells.size()] : 0;
-                final short rightEdge = _tprops.getRgdxaCenter() != null
-                        && _tprops.getRgdxaCenter().length > cells.size() + 1 ? _tprops
-                        .getRgdxaCenter()[cells.size() + 1] : 0;
-
-                TableCell tableCell = new TableCell( getParagraph(
-                        lastCellStart ).getStartOffset(), getParagraph( p )
-                        .getEndOffset(), this, _levelNum, tableCellDescriptor,
-                        leftEdge, rightEdge - leftEdge );
-                cells.add( tableCell );
-                lastCellStart = p + 1;
-            }
-        }
-
-        if ( lastCellStart < ( numParagraphs() - 1 ) )
-        {
-            TableCellDescriptor tableCellDescriptor = _tprops.getRgtc() != null
-                    && _tprops.getRgtc().length > cells.size() ? _tprops
-                    .getRgtc()[cells.size()] : new TableCellDescriptor();
-            final short leftEdge = _tprops.getRgdxaCenter() != null
-                    && _tprops.getRgdxaCenter().length > cells.size() ? _tprops
-                    .getRgdxaCenter()[cells.size()] : 0;
-            final short rightEdge = _tprops.getRgdxaCenter() != null
-                    && _tprops.getRgdxaCenter().length > cells.size() + 1 ? _tprops
-                    .getRgdxaCenter()[cells.size() + 1] : 0;
-
-            TableCell tableCell = new TableCell( lastCellStart,
-                    ( numParagraphs() - 1 ), this, _levelNum,
-                    tableCellDescriptor, leftEdge, rightEdge - leftEdge );
-            cells.add( tableCell );
-        }
-
-        if ( !cells.isEmpty() )
-        {
-            TableCell lastCell = cells.get( cells.size() - 1 );
-            if ( lastCell.numParagraphs() == 1
-                    && ( lastCell.getParagraph( 0 ).isTableRowEnd() ) )
-            {
-                // remove "fake" cell
-                cells.remove( cells.size() - 1 );
-            }
-        }
-
-        if ( cells.size() != expectedCellsCount )
-        {
-            logger.log( POILogger.WARN,
-                    "Number of found table cells (" + cells.size()
-                            + ") for table row [" + getStartOffset() + "c; "
-                            + getEndOffset()
-                            + "c] not equals to stored property value "
-                            + expectedCellsCount );
-            _tprops.setItcMac( (short) cells.size() );
-        }
-
-        _cells = cells.toArray( new TableCell[cells.size()] );
-        _cellsFound = true;
-    }
-
-    public boolean isTableHeader()
-    {
-        return _tprops.getFTableHeader();
-    }
-
-    public int numCells()
-    {
-        initCells();
-        return _cells.length;
-    }
-
-    @Override
-    protected void reset()
-    {
-        _cellsFound = false;
-    }
-
-    public void setCantSplit( boolean cantSplit )
-    {
-        _tprops.setFCantSplit( cantSplit );
-        _papx.updateSprm( SPRM_FCANTSPLIT, (byte) ( cantSplit ? 1 : 0 ) );
-    }
-
-    public void setGapHalf( int dxaGapHalf )
-    {
-        _tprops.setDxaGapHalf( dxaGapHalf );
-        _papx.updateSprm( SPRM_DXAGAPHALF, (short) dxaGapHalf );
-    }
-
-    public void setRowHeight( int dyaRowHeight )
-    {
-        _tprops.setDyaRowHeight( dyaRowHeight );
-        _papx.updateSprm( SPRM_DYAROWHEIGHT, (short) dyaRowHeight );
-    }
-
-    public void setRowJustification( int jc )
-    {
-        _tprops.setJc( (short) jc );
-        _papx.updateSprm( SPRM_TJC, (short) jc );
-    }
-
-    public void setTableHeader( boolean tableHeader )
-    {
-        _tprops.setFTableHeader( tableHeader );
-        _papx.updateSprm( SPRM_FTABLEHEADER, (byte) ( tableHeader ? 1 : 0 ) );
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/dummy.txt b/trunk/src/scratchpad/testcases/dummy.txt
deleted file mode 100644
index e69de29..0000000
--- a/trunk/src/scratchpad/testcases/dummy.txt
+++ /dev/null
diff --git a/trunk/src/scratchpad/testcases/log4j.properties b/trunk/src/scratchpad/testcases/log4j.properties
deleted file mode 100644
index ac2be68..0000000
--- a/trunk/src/scratchpad/testcases/log4j.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-log4j.rootLogger=ALL,CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{dd.MM HH:mm:ss} %-30.30c %5p %m%n
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java b/trunk/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
deleted file mode 100644
index d19843a..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
+++ /dev/null
@@ -1,106 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-
-package org.apache.poi;
-
-
-import junit.framework.TestCase;
-
-import java.io.*;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.poifs.filesystem.*;
-
-/**
- * Tests that POIDocument correctly loads and saves the common
- *  (hspf) Document Properties
- *
- * This is part 2 of 2 of the tests - it only does the POIDocuments
- *  which are part of the scratchpad (not main)
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestPOIDocumentScratchpad extends TestCase {
-	// The POI Documents to work on
-	private POIDocument doc;
-	private POIDocument doc2;
-
-	/**
-	 * Set things up, using a PowerPoint document and
-	 *  a Word Document for our testing
-	 */
-	@Override
-    public void setUp() throws Exception {
-		doc = new HSLFSlideShowImpl(POIDataSamples.getSlideShowInstance().openResourceAsStream("basic_test_ppt_file.ppt"));
-
-		doc2 = HWPFTestDataSamples.openSampleFile("test2.doc");
-	}
-
-	public void testReadProperties() {
-		// We should have both sets
-		assertNotNull(doc.getDocumentSummaryInformation());
-		assertNotNull(doc.getSummaryInformation());
-
-		// Check they are as expected for the test doc
-		assertEquals("Hogwarts", doc.getSummaryInformation().getAuthor());
-		assertEquals(10598, doc.getDocumentSummaryInformation().getByteCount());
-	}
-
-	public void testReadProperties2() {
-		// Check again on the word one
-		assertNotNull(doc2.getDocumentSummaryInformation());
-		assertNotNull(doc2.getSummaryInformation());
-
-		assertEquals("Hogwarts", doc2.getSummaryInformation().getAuthor());
-		assertEquals("", doc2.getSummaryInformation().getKeywords());
-		assertEquals(0, doc2.getDocumentSummaryInformation().getByteCount());
-	}
-
-	public void testWriteProperties() throws Exception {
-		// Just check we can write them back out into a filesystem
-		NPOIFSFileSystem outFS = new NPOIFSFileSystem();
-		doc.writeProperties(outFS);
-
-		// Should now hold them
-		assertNotNull(outFS.createDocumentInputStream("\005SummaryInformation"));
-		assertNotNull(outFS.createDocumentInputStream("\005DocumentSummaryInformation"));
-	}
-
-    public void testWriteReadProperties() throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-    	// Write them out
-    	NPOIFSFileSystem outFS = new NPOIFSFileSystem();
-    	doc.writeProperties(outFS);
-    	outFS.writeFilesystem(baos);
-
-    	// Create a new version
-    	ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    	POIFSFileSystem inFS = new POIFSFileSystem(bais);
-
-    	// Check they're still there
-    	doc.directory = inFS.getRoot();
-    	doc.readProperties();
-
-    	// Delegate test
-    	testReadProperties();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
deleted file mode 100644
index ad3888d..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hdgf.extractor.VisioTextExtractor;
-import org.apache.poi.hdgf.streams.PointerContainingStream;
-import org.apache.poi.hdgf.streams.TrailerStream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-public final class TestHDGFCore extends TestCase {
-    private static POIDataSamples _dgTests = POIDataSamples.getDiagramInstance();
-
-    private POIFSFileSystem fs;
-    private HDGFDiagram hdgf;
-    private VisioTextExtractor textExtractor;
-
-    @Override
-    protected void setUp() throws Exception {
-        fs = new POIFSFileSystem(_dgTests.openResourceAsStream("Test_Visio-Some_Random_Text.vsd"));
-    }
-    @Override
-    protected void tearDown() throws Exception {
-        if (textExtractor != null) textExtractor.close();
-        if (hdgf != null) hdgf.close();
-    }
-
-
-    public void testCreate() throws Exception {
-        hdgf = new HDGFDiagram(fs);
-    }
-
-    public void testTrailer() throws Exception {
-        hdgf = new HDGFDiagram(fs);
-        assertNotNull(hdgf);
-        assertNotNull(hdgf.getTrailerStream());
-
-        // Check it has what we'd expect
-        TrailerStream trailer = hdgf.getTrailerStream();
-        assertEquals(0x8a94, trailer.getPointer().getOffset());
-
-        assertNotNull(trailer.getPointedToStreams());
-        assertEquals(20, trailer.getPointedToStreams().length);
-
-        assertEquals(20, hdgf.getTopLevelStreams().length);
-
-        // 9th one should have children
-        assertNotNull(trailer.getPointedToStreams()[8]);
-        assertNotNull(trailer.getPointedToStreams()[8].getPointer());
-        PointerContainingStream ps8 = (PointerContainingStream)
-                trailer.getPointedToStreams()[8];
-        assertNotNull(ps8.getPointedToStreams());
-        assertEquals(8, ps8.getPointedToStreams().length);
-    }
-
-    /**
-     * Tests that we can open a problematic file, that used to
-     *  break with a negative chunk length
-     */
-    public void testNegativeChunkLength() throws Exception {
-        fs = new POIFSFileSystem(_dgTests.openResourceAsStream("NegativeChunkLength.vsd"));
-
-        hdgf = new HDGFDiagram(fs);
-        assertNotNull(hdgf);
-
-        // And another file
-        fs = new POIFSFileSystem(_dgTests.openResourceAsStream("NegativeChunkLength2.vsd"));
-        hdgf = new HDGFDiagram(fs);
-        assertNotNull(hdgf);
-    }
-
-    /**
-     * Tests that we can open a problematic file that triggers
-     *  an ArrayIndexOutOfBoundsException when processing the
-     *  chunk commands.
-     * @throws Exception
-     */
-    public void DISABLEDtestAIOOB() throws Exception {
-        fs = new POIFSFileSystem(_dgTests.openResourceAsStream("44501.vsd"));
-
-        hdgf = new HDGFDiagram(fs);
-        assertNotNull(hdgf);
-    }
-
-    public void testV5() throws Exception {
-        fs = new POIFSFileSystem(_dgTests.openResourceAsStream("v5_Connection_Types.vsd"));
-
-        hdgf = new HDGFDiagram(fs);
-        assertNotNull(hdgf);
-
-        textExtractor = new VisioTextExtractor(hdgf);
-        String text = textExtractor.getText().replace("\u0000", "").trim();
-
-        assertEquals("Static to Static\nDynamic to Static\nDynamic to Dynamic", text);
-    }
-
-    public void testV6NonUtf16LE() throws Exception {
-        fs = new POIFSFileSystem(_dgTests.openResourceAsStream("v6-non-utf16le.vsd"));
-
-        hdgf = new HDGFDiagram(fs);
-        assertNotNull(hdgf);
-
-        textExtractor = new VisioTextExtractor(hdgf);
-        String text = textExtractor.getText().replace("\u0000", "").trim();
-
-        assertEquals("Table\n\n\nPropertySheet\n\n\n\nPropertySheetField", text);
-    }
-
-    public void testUtf16LE() throws Exception {
-        fs = new POIFSFileSystem(_dgTests.openResourceAsStream("Test_Visio-Some_Random_Text.vsd"));
-
-        hdgf = new HDGFDiagram(fs);
-        assertNotNull(hdgf);
-
-        textExtractor = new VisioTextExtractor(hdgf);
-        String text = textExtractor.getText().trim();
-
-        assertEquals("text\nView\nTest View\nI am a test view\nSome random text, on a page", text);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java
deleted file mode 100644
index 7f89a05..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-public final class TestHDGFLZW extends TestCase {
-	public static final byte[] testTrailerComp = new byte[] {
-		123,      // *mask bit*
-		-60, 2,
-		-21, -16, // 3 @ 4093
-		1, 0, 0, -72,
-		-13, -16, // 3 @ 5
-		78,       // *mask bit* 2,3,4,7
-		-32, -5,  // 14 @ 4082
-		1, 0, 3,
-		-21, -16, // 3 @ 4093
-		10, 5,    // 8 @ 28
-		4,
-		-21, -16, // 3 @ 4093
-		21,       // *mask bit* 1,3,5
-		9,
-		-21, -16, // 3 @ 4093
-		103, 
-		-21, -16, // 3 @ 4093
-		34,
-		-36, -1,  // 18 @ 4078
-		52, 15,   // 18 @ 70
-		70, 15,   // 18 @ 88
-		120,      // *mask bit*
-		88, 15,   // 18 @ 106
-		-7, -2,   // 17 @ 11
-		-28, -9,  // 10 @ 4086
-		-123, 21, 0, 44,
-		-122, 1,  // 4 @ 152
-		-4,       // *mask bit*
-		104, 15,  // 18 @ 122
-		-24, -13, 40, -98, 32,
-		78, 102, -67, -1, -2, -30, 64, 40, -67, -113, -73, 116, -98,
-		-85, 2, 66, 123, 9, 109, -85, 2, -89, 14, -56, -69, -83, -79,
-		-34, -3, 120, 110, 75, -9, -10, 20, -6, -25, -12, 22, -21, -16,
-		-12, -81, 67, 1, -128, -70, -21, -16, 84, -21, -16, 70, 0, 23,
-		-21, -16, 76, 47, -40, 79, 1, -44, -21, -16, 32, 3, 18, 12, 17,
-		-43, -68, 17, 16, -8, 21, 22, -1, -21, -16, -84, -1, -35, 79,
-		-9, -10, 96, 0, 46, -21, -16, 44, -39, -41, 79, 1, 119, -13,
-		-16, -106, -13, -16, 84, 0, 125, 26, -21, -16, 68, -38, 79, 1,
-		17, 10, 0, -97, 50, 10, 0, 0, -42, -108, 15, 118, 31, 0, -3, 29,
-		-21, -16, -100, -25, 79, 1, -18, 97, -36, 76, 16, -21, -16, 86,
-		0, 36, -5, 1, -5, 79, 63, 1, -124, 98, 0, 0, 28, 3, 20, -34, -3,
-		125, 33, -21, -16, 100, -4, 79, 1, -92, -91, 16, -22, 24, 19, 41,
-		-21, -16, -44, -59, 16, 108, 100, 0, -21, 0, 71, -105, 18, 39, 85,
-		17, -3, 79, 1, 95, -108, 113, 0, 0, 104, 3, 18, 49, 49, 17, -1, 64,
-		85, 1, 0, 114, 0, 0, -93, -36, -21, -16, 100, 31, 0, 0, -40, -21,
-		-16, -92, 66, 127, 85, 1, 98, 119, 0, 0, -48, 79, 18, -3, 50, -17,
-		1, 67, 85, 1, 81, -127, 0, -41, 0, 14, 6, 4, 17, 63, -63, 17, 68,
-		85, -65, 1, 30, -120, 0, 0, 42, 79, 18, 68, 126, -21, -16, -76, 69,
-		85, 1, 102, -119, 72, 37, 0, 97, 33 };
-	public static final byte[] testTrailerDecomp = new byte[] {
-		-60, 2, 0, 0, 0, 1, 0, 0, -72, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0,
-		0, 9, 0, 0, 0, 103, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		-123, 21, 0, 44, -123, 21, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, -98, 32, 78, 102, -67,
-		-2, -30, 64, 40, -67, -113, -73, 116, -67, -2, -30, 64, 40, 66,
-		123, 9, 109, -67, -2, -30, 64, 40, -98, 32, 78, 102, -67, -2, -30,
-		64, 40, -67, -113, -73, 116, -67, -2, -30, 64, -56, -83, -79, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 110, 75, 1, 0, 0, 0,
-		0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, -12, -81, 67,
-		1, -128, 0, 0, 0, 84, 0, 0, 0, 70, 0, 23, 0, 0, 0, 76, -40, 79, 1,
-		-44, 0, 0, 0, 32, 0, 0, 0, 84, 0, 23, 0, 0, 0, -68, -40, 79, 1, -8,
-		0, 0, 0, 32, 0, 0, 0, 84, 0, -1, 0, 0, 0, -84, -1, 79, 1, 0, 0, 0,
-		0, 0, 0, 0, 0, 96, 0, 46, 0, 0, 0, 44, -39, 79, 1, 119, 1, 0, 0,
-		-106, 1, 0, 0, 84, 0, 26, 0, 0, 0, 68, -38, 79, 1, 17, 3, 0, 0,
-		50, 10, 0, 0, -42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		29, 0, 0, 0, -100, -25, 79, 1, -18, 97, 0, 0, -106, 0, 0, 0, 86, 0,
-		36, 0, 0, 0, -12, -5, 79, 1, -124, 98, 0, 0, 28, 0, 0, 0, 84, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 100,
-		-4, 79, 1, -92, 98, 0, 0, 32, 0, 0, 0, 84, 0, 41, 0, 0, 0, -44, -4,
-		79, 1, 108, 100, 0, 0, 71, 0, 0, 0, 86, 0, 39, 0, 0, 0, 68, -3, 79,
-		1, -108, 113, 0, 0, 104, 0, 0, 0, 84, 0, 49, 0, 0, 0, -84, 64, 85,
-		1, 0, 114, 0, 0, -93, 0, 0, 0, -42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, -40, 0, 0, 0, -92, 66, 85, 1, 98, 119,
-		0, 0, -48, 1, 0, 0, 84, 0, 50, 0, 0, 0, 20, 67, 85, 1, 81, -127,
-		0, 0, 14, 6, 0, 0, 84, 0, 63, 0, 0, 0, 100, 68, 85, 1, 30, -120,
-		0, 0, 42, 1, 0, 0, 84, 0, 68, 0, 0, 0, -76, 69, 85, 1, 102, -119,
-		0, 0, 42, 1, 0, 0, 84, 0, 0, 0, 0, 0
-	};
-
-	public void testFromToInt() {
-		byte b255 = -1;
-		assertEquals(255, HDGFLZW.fromByte(b255));
-		assertEquals(-1, HDGFLZW.fromInt( HDGFLZW.fromByte(b255) ));
-		assertEquals(-1, HDGFLZW.fromInt( 255 ));
-
-		byte b11 = 11;
-		assertEquals(11, HDGFLZW.fromByte(b11));
-		assertEquals(11, HDGFLZW.fromInt( HDGFLZW.fromByte(b11) ));
-		assertEquals(11, HDGFLZW.fromInt( 11 ));
-
-		byte b0 = 0;
-		assertEquals(0, HDGFLZW.fromByte(b0));
-		assertEquals(0, HDGFLZW.fromInt( HDGFLZW.fromByte(b0) ));
-		assertEquals(0, HDGFLZW.fromInt( 0 ));
-
-		byte b127 = 127;
-		assertEquals(127, HDGFLZW.fromByte(b127));
-		assertEquals(127, HDGFLZW.fromInt( HDGFLZW.fromByte(b127) ));
-		assertEquals(127, HDGFLZW.fromInt( 127 ));
-
-		byte b128 = -128;
-		assertEquals(128, HDGFLZW.fromByte(b128));
-		assertEquals(-128, HDGFLZW.fromInt( HDGFLZW.fromByte(b128) ));
-		assertEquals(-128, HDGFLZW.fromInt( 128 ));
-	}
-
-	public void testCounts() throws Exception {
-		assertEquals(339, testTrailerComp.length);
-		assertEquals(632, testTrailerDecomp.length);
-
-		// decompress it using our engine
-		HDGFLZW lzw = new HDGFLZW();
-		byte[] dec = lzw.decompress(new ByteArrayInputStream(testTrailerComp));
-
-		// Check it's of the right size
-		assertEquals(632, dec.length);
-
-/*
-		// Encode it again using our engine
-		byte[] comp = lzw.compress(new ByteArrayInputStream(testTrailerDecomp));
-
-		// Check it's of the right size
-		assertEquals(339, comp.length);
-*/
-	}
-
-	public void testDecompress() throws Exception {
-		assertEquals(339, testTrailerComp.length);
-		assertEquals(632, testTrailerDecomp.length);
-
-		// decompress it using our engine
-		HDGFLZW lzw = new HDGFLZW();
-		byte[] dec = lzw.decompress(new ByteArrayInputStream(testTrailerComp));
-
-		// Now check it's the right data
-		assertEquals(632, dec.length);
-		for(int i=0; i<dec.length; i++) {
-			if(dec[i] != testTrailerDecomp[i])
-				System.err.println(i + "\t" + dec[i] + "\t" + testTrailerDecomp[i]);
-		}
-	}
-
-	/**
-	 * Test that we can round-trip a little bit.
-	 * Uses a part short enough that we agree with visio
-	 *  on the best way to compress it
-	 */
-	public void testCompressMini() throws Exception {
-	   // first 11 bytes compressed = 12 bytes uncompressed
-	   byte[] sourceComp = new byte[11];
-	   byte[] sourceDecomp = new byte[12];
-	   System.arraycopy(testTrailerComp, 0, sourceComp, 0, sourceComp.length);
-      System.arraycopy(testTrailerDecomp, 0, sourceDecomp, 0, sourceDecomp.length);
-
-		// Compress it using our engine
-		HDGFLZW lzw = new HDGFLZW();
-		byte[] comp = lzw.compress(new ByteArrayInputStream(sourceDecomp));
-		
-		// Now decompress it again
-		byte[] decomp = lzw.decompress(new ByteArrayInputStream(comp));
-
-		// First up, check the round tripping
-		assertEquals(12, decomp.length);
-      for(int i=0; i<decomp.length; i++) {
-         assertEquals("Wrong at " + i, decomp[i], testTrailerDecomp[i]);
-      }
-
-		// Now check the compressed intermediate version
-      assertEquals(11, comp.length);
-      for(int i=0; i<comp.length; i++) {
-         assertEquals("Wrong at " + i, comp[i], testTrailerComp[i]);
-      }
-	}
-
-	/**
-	 * Tests that we can do several mask pages
-	 */
-   public void testCompressMidi() throws Exception {
-      // First 12 -> 11
-      // Next 32 -> 13
-      byte[] sourceComp = new byte[24];
-      byte[] sourceDecomp = new byte[44];
-      System.arraycopy(testTrailerComp, 0, sourceComp, 0, sourceComp.length);
-      System.arraycopy(testTrailerDecomp, 0, sourceDecomp, 0, sourceDecomp.length);
-
-      // Compress it using our engine
-      HDGFLZW lzw = new HDGFLZW();
-      byte[] comp = lzw.compress(new ByteArrayInputStream(sourceDecomp));
-      
-      // We should be 3 characters bigger, as
-      //  we split one compressed bit into two
-      assertEquals(27, comp.length);
-      
-      // Now decompress it again
-      byte[] decomp = lzw.decompress(new ByteArrayInputStream(comp));
-
-      // We can only check the round-tripping, as for now
-      //  visio cheats on re-using a block
-      assertEquals(44, decomp.length);
-      for(int i=0; i<decomp.length; i++) {
-         assertEquals("Wrong at " + i, decomp[i], sourceDecomp[i]);
-      }
-   }
-
-   /**
-    * Gets 160 bytes through then starts going wrong...
-    * TODO Fix this
-    */
-   public void DISABLEDtestCompressFull() throws Exception {
-      assertEquals(339, testTrailerComp.length);
-      assertEquals(632, testTrailerDecomp.length);
-
-      // Compress it using our engine
-      HDGFLZW lzw = new HDGFLZW();
-      byte[] comp = lzw.compress(new ByteArrayInputStream(testTrailerDecomp));
-      
-      // Now decompress it again
-      byte[] decomp = lzw.decompress(new ByteArrayInputStream(comp));
-
-//      for(int i=0; i<comp.length; i++) {
-//         System.err.println(i + "\t" + comp[i] + "\t" + testTrailerComp[i]);
-//      }
-      
-      // First up, check the round tripping
-//    assertEquals(632, decomp.length);
-      for(int i=0; i<decomp.length; i++) {
-         assertEquals("Wrong at " + i, decomp[i], testTrailerDecomp[i]);
-      }
-
-      
-      // Now check the compressed intermediate version
-      assertEquals(339, comp.length);
-      for(int i=0; i<comp.length; i++) {
-         assertEquals("Wrong at " + i, comp[i], testTrailerComp[i]);
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java
deleted file mode 100644
index 2cbbbec..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.chunks;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public final class TestChunks {
-public static final byte[] data_a = new byte[] { 70, 0, 0, 0,
-	-1, -1, -1, -1, 2, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0,
-	0, 0, 2, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, -1, -1, -1, -1, 0, 0, 0,
-	0, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-	0, 36, 0, 0, 0, 1, 0, 84, 24, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-	0, 0, 2, 0, 0, 0, 0, 0, 0, 0, -110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	-124, 0, 0, 0, 2, 0, 85, 73, 0, 0, 0, 0, 0, 0, -56, 63, 73, 0, 0, 0,
-	0, 0, 0, -64, 63, 63, 0, 0, 0, 0, 0, 0, -64, 63, 63, 0, 0, 0, 0, 0, 0,
-	-64, -65, 73, 0, 0, 0, 0, 0, 0, -16, 63, 73, 0, 0, 0, 0, 0, 0, -16, 63,
-	4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16, 63, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	1, -1, 3, 0, 0, 32, 0, 0, 0, 0, 0, -73, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
-	79, 0, 0, 0, 2, 0, 85, 32, 32, 64, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0,
-	0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0,
-	8, 8, 65, 0, 0, 0, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0,
-	0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 1, -13, 15, 0, 0, 0, 0,
-	-56, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 2, 0, 85, 63, 0, 0,
-	0, 0, 0, 0, -48, 63, 63, 0, 0, 0, 0, 0, 0, -48, 63, 63, 0, 0, 0, 0, 0,
-	0, -48, 63, 63, 0, 0, 0, 0, 0, 0, -48, 63, 0, 0, 0, 0, 0, 0, -16, 63,
-	0, 0, 0, 0, 0, 0, -16, 63, 1, 0, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0,
-	0, 1, -1, 15, 7, 0, 0, 0, 0, 101, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 28,
-	0, 0, 0, 1, 0, 84, 24, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	-125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 2, 0, 85, 5, 0, 0,
-	0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-public static final byte[] data_b = new byte[] { 70, 0, 0, 0,
-	-1, -1, -1, -1, 3, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0,
-	0, 0, 2, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 	0, 0, 0, -1, -1, -1, -1,
-	0, 0, 0, 0, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0,
-	0, 2, 0, 0, 0, 32, 0, 0, 0, 1, 0, 84, 24, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1, 0, 0, 0, 0, 0, 0, 0, -110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -124,
-	0, 0, 0, 2, 0, 85, 63, 0, 0, 0, 0, 0, 0, 33, 64, 63, 0, 0, 0, 0, 0, 0,
-	38, 64, 63, 0, 0, 0, 0, 0, 0, -64, 63, 63, 0, 0, 0, 0, 0, 0, -64, -65,
-	73, 0, 0, 0, 0, 0, 0, -16, 63, 73, 0, 0, 0, 0, 0, 0, -16, 63, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -16, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 3,
-	0, 4, 32, 0, 0, 0, 0, 0, -56, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0,
-	0, 2, 0, 85, 63, 0, 0, 0, 0, 0, 0, -48, 63, 63, 0, 0, 0, 0, 0, 0, -48,
-	63, 63, 0, 0, 0, 0, 0, 0, -48, 63, 63, 0, 0, 0, 0, 0, 0, -48, 63, 0, 0,
-	0, 0, 0, 0, -16, 63, 0, 0, 0, 0, 0, 0, -16, 63, 1, 0, 1, 0, 0, 1, 1, 0,
-	7, 0, 0, 0, 0, 0, 0, 0, 1, -1, 15, 7, 0, 0, 0, 0, 101, 0, 0, 0, 1, 0, 0,
-	0, 1, 0, 0, 0, 28, 0, 0, 0, 1, 0, 84, 24, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, -125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 2, 0,
-	85, 5, 0, 0, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, -55, 0, 0, 0, 2, 0, 0, 0,
-	0, 0, 0, 0, -122, 0, 0, 0, 1, 0, 80, 1, 0, 0, 0, 60, 0, 0, 0, 60, 0, 0,
-	0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0
-};
-    
-    @Test
-	public void testChunkHeaderA() throws Exception {
-		ChunkHeader h =
-			ChunkHeader.createChunkHeader(11, data_a, 0);
-
-		assertTrue(h instanceof ChunkHeaderV11);
-		ChunkHeaderV11 header = (ChunkHeaderV11)h;
-
-		assertEquals(70, header.getType());
-		assertEquals(-1, header.getId());
-		assertEquals(2, header.getUnknown1());
-		assertEquals(68, header.getLength());
-		assertEquals(0, header.getUnknown2());
-		assertEquals(0, header.getUnknown3());
-
-		assertTrue(header.hasTrailer());
-		assertTrue(header.hasSeparator());
-	}
-	
-    @Test
-    public void testChunkHeaderB() throws Exception {
-		ChunkHeader h =
-			ChunkHeader.createChunkHeader(11, data_b, 0);
-
-		assertTrue(h instanceof ChunkHeaderV11);
-		ChunkHeaderV11 header = (ChunkHeaderV11)h;
-
-		assertEquals(70, header.getType());
-		assertEquals(-1, header.getId());
-		assertEquals(3, header.getUnknown1());
-		assertEquals(68, header.getLength());
-		assertEquals(0, header.getUnknown2());
-		assertEquals(0, header.getUnknown3());
-
-		assertTrue(header.hasTrailer());
-		assertTrue(header.hasSeparator());
-	}
-
-    @Test
-    public void testOneChunk() throws Exception {
-		ChunkFactory cf = new ChunkFactory(11);
-		cf.createChunk(data_a, 0);
-		cf.createChunk(data_b, 0);
-
-		Chunk chunk = cf.createChunk(data_a, 0);
-		assertNotNull(chunk.getHeader());
-		assertNotNull(chunk.getTrailer());
-		assertNotNull(chunk.getSeparator());
-
-		// Should be 19 + length + 8 + 4 big
-		assertEquals(68, chunk.getHeader().getLength());
-		assertEquals(68+19+8+4, chunk.getOnDiskSize());
-
-		// Type is 70, or 0x46
-		assertEquals(70, chunk.getHeader().getType());
-		assertEquals(0x46, chunk.getHeader().getType());
-
-		// Should have two virtual chunk commands, a
-		//  10 (page sheet) and an 18
-		assertEquals(2, chunk.commandDefinitions.length);
-		assertEquals(0, chunk.getCommands().length);
-
-		assertEquals(10, chunk.commandDefinitions[0].getType());
-		assertEquals(0, chunk.commandDefinitions[0].getOffset());
-		assertEquals("PageSheet", chunk.commandDefinitions[0].getName());
-
-		assertEquals(18, chunk.commandDefinitions[1].getType());
-		assertEquals(0, chunk.commandDefinitions[1].getOffset());
-		assertEquals("0", chunk.commandDefinitions[1].getName());
-	}
-
-    @Test
-    public void testAnotherChunk() throws Exception {
-		ChunkFactory cf = new ChunkFactory(11);
-
-		// Go for the 2nd chunk in the stream
-		int offset = 0;
-		Chunk chunk = cf.createChunk(data_b, offset);
-		offset += chunk.getOnDiskSize();
-		chunk = cf.createChunk(data_b, offset);
-
-		assertNotNull(chunk.getHeader());
-		assertNotNull(chunk.getTrailer());
-		assertNotNull(chunk.getSeparator());
-
-		// Should be 19 + length + 8 + 4 big
-		assertEquals(32, chunk.getHeader().getLength());
-		assertEquals(32+19+8+4, chunk.getOnDiskSize());
-
-		// Type is 104, or 0x68
-		assertEquals(104, chunk.getHeader().getType());
-		assertEquals(0x68, chunk.getHeader().getType());
-
-		// Should have two virtual chunk commands, a
-		//  10 (Unknown) and an 18
-		assertEquals(2, chunk.commandDefinitions.length);
-		assertEquals(0, chunk.getCommands().length);
-
-		assertEquals(10, chunk.commandDefinitions[0].getType());
-		assertEquals(0, chunk.commandDefinitions[0].getOffset());
-		assertEquals("PropList", chunk.commandDefinitions[0].getName());
-
-		assertEquals(18, chunk.commandDefinitions[1].getType());
-		assertEquals(0, chunk.commandDefinitions[1].getOffset());
-		assertEquals("0", chunk.commandDefinitions[1].getName());
-	}
-
-    @Test
-    public void testManyChunks() throws Exception {
-		ChunkFactory cf = new ChunkFactory(11);
-		Chunk chunk;
-		int offset = 0;
-
-		chunk = cf.createChunk(data_a, offset);
-		assertNotNull(chunk.getHeader());
-		assertNotNull(chunk.getTrailer());
-		assertNotNull(chunk.getSeparator());
-		offset += chunk.getOnDiskSize();
-
-		chunk = cf.createChunk(data_a, offset);
-		assertNotNull(chunk.getHeader());
-		assertNotNull(chunk.getTrailer());
-		assertNotNull(chunk.getSeparator());
-		offset += chunk.getOnDiskSize();
-
-		// Has a separator but no trailer
-		chunk = cf.createChunk(data_a, offset);
-		assertNotNull(chunk.getHeader());
-		assertNull(chunk.getTrailer());
-		assertNotNull(chunk.getSeparator());
-		offset += chunk.getOnDiskSize();
-
-		chunk = cf.createChunk(data_a, offset);
-		assertNotNull(chunk.getHeader());
-		assertNull(chunk.getTrailer());
-		assertNotNull(chunk.getSeparator());
-		offset += chunk.getOnDiskSize();
-
-		chunk = cf.createChunk(data_a, offset);
-		assertNotNull(chunk.getHeader());
-		assertNull(chunk.getTrailer());
-		assertNotNull(chunk.getSeparator());
-		offset += chunk.getOnDiskSize();
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
deleted file mode 100644
index 48cc8a9..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.extractor;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hdgf.HDGFDiagram;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.POIDataSamples;
-
-public final class TestVisioExtractor extends TestCase {
-    private static POIDataSamples _dgTests = POIDataSamples.getDiagramInstance();
-
-	private String defFilename;
-	private int defTextChunks;
-	@Override
-    protected void setUp() {
-		defFilename = "Test_Visio-Some_Random_Text.vsd";
-		defTextChunks = 5;
-	}
-
-	/**
-	 * Test the 3 different ways of creating one
-	 */
-	public void testCreation() throws Exception {
-		VisioTextExtractor extractor;
-
-		extractor = new VisioTextExtractor(_dgTests.openResourceAsStream(defFilename));
-		assertNotNull(extractor);
-		assertNotNull(extractor.getAllText());
-		assertEquals(defTextChunks, extractor.getAllText().length);
-
-		extractor = new VisioTextExtractor(
-				new POIFSFileSystem(
-						_dgTests.openResourceAsStream(defFilename)
-				)
-		);
-		assertNotNull(extractor);
-		assertNotNull(extractor.getAllText());
-		assertEquals(defTextChunks, extractor.getAllText().length);
-
-		extractor = new VisioTextExtractor(
-			new HDGFDiagram(
-				new POIFSFileSystem(
-						_dgTests.openResourceAsStream(defFilename)
-				)
-			)
-		);
-		assertNotNull(extractor);
-		assertNotNull(extractor.getAllText());
-		assertEquals(defTextChunks, extractor.getAllText().length);
-	}
-
-	public void testExtraction() throws Exception {
-		VisioTextExtractor extractor =
-			new VisioTextExtractor(_dgTests.openResourceAsStream(defFilename));
-
-		// Check the array fetch
-		String[] text = extractor.getAllText();
-		assertNotNull(text);
-		assertEquals(defTextChunks, text.length);
-
-      assertEquals("text\n", text[0]);
-      assertEquals("View\n", text[1]);
-		assertEquals("Test View\n", text[2]);
-		assertEquals("I am a test view\n", text[3]);
-		assertEquals("Some random text, on a page\n", text[4]);
-
-		// And the all-in fetch
-		String textS = extractor.getText();
-		assertEquals("text\nView\nTest View\nI am a test view\nSome random text, on a page\n", textS);
-	}
-
-	public void testProblemFiles() throws Exception {
-		String[] files = {
-		      "44594.vsd", "44594-2.vsd", 
-		      "ShortChunk1.vsd", "ShortChunk2.vsd", "ShortChunk3.vsd",
-		      "NegativeChunkLength.vsd", "NegativeChunkLength2.vsd"
-		};
-        for(String file : files){
-            VisioTextExtractor ex = new VisioTextExtractor(_dgTests.openResourceAsStream(file));
-            ex.getText();
-        }
-	}
-
-	public void testMain() throws Exception {
-		PrintStream oldOut = System.out;
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PrintStream capture = new PrintStream(baos);
-		System.setOut(capture);
-
-        String path = _dgTests.getFile(defFilename).getPath();
-        VisioTextExtractor.main(new String[] {path});
-
-		// Put things back
-		System.setOut(oldOut);
-
-		// Check
-		capture.flush();
-		String text = baos.toString();
-        // YK: stdout can contain lots of other stuff if logging is sent to console
-        // ( -Dorg.apache.poi.util.POILogger=org.apache.poi.util.SystemOutLogger)
-		assertTrue( text.contains(
-		      "text\nView\n" +
-		      "Test View\nI am a test view\n" +
-		      "Some random text, on a page\n"
-		      ));
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java
deleted file mode 100644
index 60d12f0..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.pointers;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for the pointer factory, and the pointers themselves
- */
-public final class TestPointerFactory extends TestCase {
-    // Type: 14    Addr: 011eb2ac  Offset: 1dd4    Len:  14d   Format: 52  From: 24
-    private static byte[] vp5_a = new byte[] {
-        0x14, 0, 0x52, 0, (byte)0xac, (byte)0xb2, 0x1e, 1, (byte)0xd4, 0x1d, 0, 0,
-        0x4d, 1, 0, 0
-    };
-    
-	// Type: 16   Addr: 0143aff4  Offset: 80   Len: 54   Format: 46   From: 8a94
-	private static byte[] vp6_a = new byte[] {
-		22, 0, 0, 0, -12, -81, 67, 1, -128, 0, 0, 0, 84, 0, 0, 0, 70, 0
-	};
-	// Type: 17   Addr: 014fd84c  Offset: d4   Len: 20   Format: 54   From: 8a94
-	private static byte[] vp6_b = new byte[] {
-		23, 0, 0, 0, 76, -40, 79, 1, -44, 0, 0, 0, 32, 0, 0, 0, 84, 0
-	};
-	// Type: 17   Addr: 014fd8bc  Offset: f8   Len: 20   Format: 54   From: 8a94
-	private static byte[] vp6_c = new byte[] {
-		23, 0, 0, 0, -68, -40, 79, 1, -8, 0, 0, 0, 32, 0, 0, 0, 84, 0
-	};
-	// Type: ff   Addr: 014fffac  Offset: 0    Len:  0   Format: 60   From: 8a94
-	private static byte[] vp6_d = new byte[] {
-		-1, 0, 0, 0, -84, -1, 79, 1, 0, 0, 0, 0, 0, 0, 0, 0, 96, 0
-	};
-
-	public void testCreateV4() {
-		PointerFactory pf = new PointerFactory(4);
-		try {
-			pf.createPointer(new byte[]{}, 0);
-			fail();
-		} catch(IllegalArgumentException e) {
-			// As expected
-		}
-	}
-
-	public void testCreateV5() {
-		PointerFactory pf = new PointerFactory(5);
-		
-        Pointer a = pf.createPointer(vp5_a, 0);
-        assertEquals(0x14, a.getType());
-        assertEquals(0x011eb2ac, a.getAddress());
-        assertEquals(0x1dd4, a.getOffset());
-        assertEquals(0x14d, a.getLength());
-        assertEquals(0x52, a.getFormat());
-
-        // TODO Are these right?
-        assertTrue(a.destinationCompressed());
-        assertFalse(a.destinationHasStrings());
-        assertFalse(a.destinationHasChunks());
-        assertTrue(a.destinationHasPointers());
-
-        assertEquals(16, a.getSizeInBytes());
-	}
-
-	public void testCreateV6() {
-		PointerFactory pf = new PointerFactory(6);
-
-		Pointer a = pf.createPointer(vp6_a, 0);
-		assertEquals(0x16, a.getType());
-		assertEquals(0x0143aff4, a.getAddress());
-		assertEquals(0x80, a.getOffset());
-		assertEquals(0x54, a.getLength());
-		assertEquals(0x46, a.getFormat());
-
-		assertTrue(a.destinationCompressed());
-		assertTrue(a.destinationHasStrings());
-		assertFalse(a.destinationHasChunks());
-		assertFalse(a.destinationHasPointers());
-
-		assertEquals(18, a.getSizeInBytes());
-
-
-		Pointer b = pf.createPointer(vp6_b, 0);
-		assertEquals(0x17, b.getType());
-		assertEquals(0x014fd84c, b.getAddress());
-		assertEquals(0xd4, b.getOffset());
-		assertEquals(0x20, b.getLength());
-		assertEquals(0x54, b.getFormat());
-
-		assertFalse(b.destinationCompressed());
-		assertFalse(b.destinationHasStrings());
-		assertFalse(b.destinationHasChunks());
-		assertTrue(b.destinationHasPointers());
-
-		Pointer c = pf.createPointer(vp6_c, 0);
-		assertEquals(0x17, c.getType());
-		assertEquals(0x014fd8bc, c.getAddress());
-		assertEquals(0xf8, c.getOffset());
-		assertEquals(0x20, c.getLength());
-		assertEquals(0x54, c.getFormat());
-
-		assertFalse(c.destinationCompressed());
-		assertFalse(c.destinationHasStrings());
-		assertFalse(c.destinationHasChunks());
-		assertTrue(c.destinationHasPointers());
-
-		// Type: ff   Addr: 014fffac  Offset: 0    Len:  0   Format: 60   From: 8a94
-		Pointer d = pf.createPointer(vp6_d, 0);
-		assertEquals(0xff, d.getType());
-		assertEquals(0x014fffac, d.getAddress());
-		assertEquals(0x00, d.getOffset());
-		assertEquals(0x00, d.getLength());
-		assertEquals(0x60, d.getFormat());
-
-		assertFalse(d.destinationCompressed());
-		assertFalse(d.destinationHasStrings());
-		assertFalse(d.destinationHasChunks());
-		assertFalse(d.destinationHasPointers());
-	}
-
-	public void testCreateV6FromMid() {
-		PointerFactory pf = new PointerFactory(11);
-
-		// Create a from part way down the byte stream
-		byte[] bytes = new byte[28];
-		System.arraycopy(vp6_b, 0, bytes, 0, 10);
-		System.arraycopy(vp6_a, 0, bytes, 10, 18);
-
-		Pointer a = pf.createPointer(bytes, 10);
-		assertEquals(0x16, a.getType());
-		assertEquals(0x0143aff4, a.getAddress());
-		assertEquals(0x80, a.getOffset());
-		assertEquals(0x54, a.getLength());
-		assertEquals(0x46, a.getFormat());
-
-		assertTrue(a.destinationCompressed());
-		assertTrue(a.destinationHasStrings());
-		assertFalse(a.destinationHasChunks());
-		assertFalse(a.destinationHasPointers());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java
deleted file mode 100644
index b79eda3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import org.apache.poi.hdgf.pointers.Pointer;
-import static org.apache.poi.hdgf.pointers.PointerV6.*;
-
-import junit.framework.TestCase;
-
-public abstract class StreamTest extends TestCase {
-    public static class TestPointer extends Pointer {
-        private final boolean compressed;
-        protected boolean hasPointers = false;
-        public TestPointer(boolean compressed, int offset, int length, int type, short format) {
-            this.compressed = compressed;
-            this.offset = offset;
-            this.length = length;
-            this.type = type;
-            this.format = format;
-        }
-
-        @Override
-        public boolean destinationCompressed() { return compressed; }
-        @Override
-        public boolean destinationHasChunks() { return false; }
-        @Override
-        public boolean destinationHasPointers() { return hasPointers; }
-        @Override
-        public boolean destinationHasStrings() { return false; }
-
-        @Override
-        public int getSizeInBytes() { return -1; }
-        @Override
-        public int getNumPointersOffset(byte[] data) { 
-            return getNumPointersOffsetV6(data); 
-        }
-        @Override
-        public int getNumPointers(int offset, byte[] data) { 
-            return getNumPointersV6(offset, data);
-        }
-        @Override
-        public int getPostNumPointersSkip() {
-            return getPostNumPointersSkipV6();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java
deleted file mode 100644
index 26c91d0..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import org.apache.poi.hdgf.pointers.Pointer;
-
-public final class TestStreamBasics extends StreamTest {
-	/** The header from when compressedStream is decompressed */
-	public static final byte[] compressedStreamDCHeader = new byte[] {
-		-60, 2, 0, 0
-	};
-	public static final byte[] compressedStream = new byte[] {
-		123, -60, 2, -21, -16, 1, 0, 0, -72, -13, -16, 78, -32, -5, 1,
-		0, 3, -21, -16, 10, 5, 4, -21, -16, 21, 9, -21, -16, 103, -21,
-		-16, 34, -36, -1, 52, 15, 70, 15, 120, 88, 15, -7, -2, -28, -9,
-		-123, 21, 0, 44, -122, 1, -4, 104, 15, -24, -13, 40, -98, 32,
-		78, 102, -67, -1, -2, -30, 64, 40, -67, -113, -73, 116, -98,
-		-85, 2, 66, 123, 9, 109, -85, 2, -89, 14, -56, -69, -83, -79,
-		-34, -3, 120, 110, 75, -9, -10, 20, -6, -25, -12, 22, -21, -16,
-		-12, -81, 67, 1, -128, -70, -21, -16, 84, -21, -16, 70, 0, 23,
-		-21, -16, 76, 47, -40, 79, 1, -44, -21, -16, 32, 3, 18, 12, 17,
-		-43, -68, 17, 16, -8, 21, 22, -1, -21, -16, -84, -1, -35, 79,
-		-9, -10, 96, 0, 46, -21, -16, 44, -39, -41, 79, 1, 119, -13,
-		-16, -106, -13, -16, 84, 0, 125, 26, -21, -16, 68, -38, 79, 1,
-		17, 10, 0, -97, 50, 10, 0, 0, -42, -108, 15, 118, 31, 0, -3, 29,
-		-21, -16, -100, -25, 79, 1, -18, 97, -36, 76, 16, -21, -16, 86,
-		0, 36, -5, 1, -5, 79, 63, 1, -124, 98, 0, 0, 28, 3, 20, -34, -3,
-		125, 33, -21, -16, 100, -4, 79, 1, -92, -91, 16, -22, 24, 19, 41,
-		-21, -16, -44, -59, 16, 108, 100, 0, -21, 0, 71, -105, 18, 39, 85,
-		17, -3, 79, 1, 95, -108, 113, 0, 0, 104, 3, 18, 49, 49, 17, -1, 64,
-		85, 1, 0, 114, 0, 0, -93, -36, -21, -16, 100, 31, 0, 0, -40, -21,
-		-16, -92, 66, 127, 85, 1, 98, 119, 0, 0, -48, 79, 18, -3, 50, -17,
-		1, 67, 85, 1, 81, -127, 0, -41, 0, 14, 6, 4, 17, 63, -63, 17, 68,
-		85, -65, 1, 30, -120, 0, 0, 42, 79, 18, 68, 126, -21, -16, -76, 69,
-		85, 1, 102, -119, 72, 37, 0, 97, 33 };
-	public static final byte[] uncompressedStream = new byte[] {
-		0, 1, 0, 0, -72, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0,
-		0, 9, 0, 0, 0, 103, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		-123, 21, 0, 44, -123, 21, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, -98, 32, 78, 102, -67,
-		-2, -30, 64, 40, -67, -113, -73, 116, -67, -2, -30, 64, 40, 66,
-		123, 9, 109, -67, -2, -30, 64, 40, -98, 32, 78, 102, -67, -2, -30,
-		64, 40, -67, -113, -73, 116, -67, -2, -30, 64, -56, -83, -79, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 110, 75, 1, 0, 0, 0,
-		0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, -12, -81, 67,
-		1, -128, 0, 0, 0, 84, 0, 0, 0, 70, 0, 23, 0, 0, 0, 76, -40, 79, 1,
-		-44, 0, 0, 0, 32, 0, 0, 0, 84, 0, 23, 0, 0, 0, -68, -40, 79, 1, -8,
-		0, 0, 0, 32, 0, 0, 0, 84, 0, -1, 0, 0, 0, -84, -1, 79, 1, 0, 0, 0,
-		0, 0, 0, 0, 0, 96, 0, 46, 0, 0, 0, 44, -39, 79, 1, 119, 1, 0, 0,
-		-106, 1, 0, 0, 84, 0, 26, 0, 0, 0, 68, -38, 79, 1, 17, 3, 0, 0,
-		50, 10, 0, 0, -42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		29, 0, 0, 0, -100, -25, 79, 1, -18, 97, 0, 0, -106, 0, 0, 0, 86, 0,
-		36, 0, 0, 0, -12, -5, 79, 1, -124, 98, 0, 0, 28, 0, 0, 0, 84, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 100,
-		-4, 79, 1, -92, 98, 0, 0, 32, 0, 0, 0, 84, 0, 41, 0, 0, 0, -44, -4,
-		79, 1, 108, 100, 0, 0, 71, 0, 0, 0, 86, 0, 39, 0, 0, 0, 68, -3, 79,
-		1, -108, 113, 0, 0, 104, 0, 0, 0, 84, 0, 49, 0, 0, 0, -84, 64, 85,
-		1, 0, 114, 0, 0, -93, 0, 0, 0, -42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, -40, 0, 0, 0, -92, 66, 85, 1, 98, 119,
-		0, 0, -48, 1, 0, 0, 84, 0, 50, 0, 0, 0, 20, 67, 85, 1, 81, -127,
-		0, 0, 14, 6, 0, 0, 84, 0, 63, 0, 0, 0, 100, 68, 85, 1, 30, -120,
-		0, 0, 42, 1, 0, 0, 84, 0, 68, 0, 0, 0, -76, 69, 85, 1, 102, -119,
-		0, 0, 42, 1, 0, 0, 84, 0, 0, 0, 0, 0
-	};
-
-	public void testCompressedStream() {
-		// Create a fake pointer
-		Pointer ptr = new TestPointer(true, 0, compressedStream.length, -1, (short)-1);
-		// Now the stream
-		Stream stream = Stream.createStream(ptr, compressedStream, null, null);
-
-		// Check
-		assertNotNull(stream.getPointer());
-		assertNotNull(stream.getStore());
-		assertTrue(stream.getStore() instanceof StreamStore);
-		assertTrue(stream.getStore() instanceof CompressedStreamStore);
-		assertTrue(stream instanceof UnknownStream);
-
-		// Check the stream store
-		CompressedStreamStore ss = (CompressedStreamStore)stream.getStore();
-		assertEquals(4, ss._getBlockHeader().length);
-		assertEquals(compressedStream.length, ss._getCompressedContents().length);
-		assertEquals(uncompressedStream.length, ss.getContents().length);
-
-		for(int i=0; i<uncompressedStream.length; i++) {
-			assertEquals(uncompressedStream[i], ss.getContents()[i]);
-		}
-	}
-
-	public void testUncompressedStream() {
-		// Create a fake pointer
-		Pointer ptr = new TestPointer(false, 0, uncompressedStream.length, -1, (short)-1);
-		// Now the stream
-		Stream stream = Stream.createStream(ptr, uncompressedStream, null, null);
-
-		// Check
-		assertNotNull(stream.getPointer());
-		assertNotNull(stream.getStore());
-		assertTrue(stream.getStore() instanceof StreamStore);
-		assertFalse(stream.getStore() instanceof CompressedStreamStore);
-		assertTrue(stream instanceof UnknownStream);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
deleted file mode 100644
index 0377b24..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import java.io.InputStream;
-
-import org.apache.poi.hdgf.HDGFDiagram;
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.hdgf.pointers.PointerFactory;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests for bugs with streams
- */
-public final class TestStreamBugs extends StreamTest {
-	private byte[] contents;
-	private ChunkFactory chunkFactory;
-	private PointerFactory ptrFactory;
-	private POIFSFileSystem filesystem;
-
-	@Override
-    protected void setUp() throws Exception {
-		ptrFactory = new PointerFactory(11);
-		chunkFactory = new ChunkFactory(11);
-
-        InputStream is = POIDataSamples.getDiagramInstance().openResourceAsStream("44594.vsd");
-        filesystem = new POIFSFileSystem(is);
-
-		DocumentEntry docProps =
-			(DocumentEntry)filesystem.getRoot().getEntry("VisioDocument");
-
-		// Grab the document stream
-		contents = new byte[docProps.getSize()];
-		filesystem.createDocumentInputStream("VisioDocument").read(contents);
-	}
-
-	public void testGetTrailer() {
-		Pointer trailerPointer = ptrFactory.createPointer(contents, 0x24);
-		Stream.createStream(trailerPointer, contents, chunkFactory, ptrFactory);
-	}
-
-	public void TOIMPLEMENTtestGetCertainChunks() {
-		int offsetA = 3708;
-		int offsetB = 3744;
-	}
-
-	public void testGetChildren() {
-		Pointer trailerPointer = ptrFactory.createPointer(contents, 0x24);
-		TrailerStream trailer = (TrailerStream)
-			Stream.createStream(trailerPointer, contents, chunkFactory, ptrFactory);
-
-		// Get without recursing
-		Pointer[] ptrs = trailer.getChildPointers();
-		for (Pointer ptr : ptrs) {
-			Stream.createStream(ptr, contents, chunkFactory, ptrFactory);
-		}
-
-		// Get with recursing into chunks
-		for (Pointer ptr : ptrs) {
-			Stream stream =
-				Stream.createStream(ptr, contents, chunkFactory, ptrFactory);
-			if(stream instanceof ChunkStream) {
-				ChunkStream cStream = (ChunkStream)stream;
-				cStream.findChunks();
-			}
-		}
-
-		// Get with recursing into chunks and pointers
-		for (Pointer ptr : ptrs) {
-			Stream stream =
-				Stream.createStream(ptr, contents, chunkFactory, ptrFactory);
-			if(stream instanceof PointerContainingStream) {
-				PointerContainingStream pStream =
-					(PointerContainingStream)stream;
-				pStream.findChildren(contents);
-			}
-		}
-
-		trailer.findChildren(contents);
-	}
-
-	public void testOpen() throws Exception {
-		HDGFDiagram dg = new HDGFDiagram(filesystem);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java b/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
deleted file mode 100644
index d1092e2..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hdgf.streams;
-
-import java.io.InputStream;
-
-import org.apache.poi.hdgf.chunks.Chunk;
-import org.apache.poi.hdgf.chunks.ChunkFactory;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.hdgf.pointers.PointerFactory;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.POIDataSamples;
-
-public final class TestStreamComplex extends StreamTest {
-	private byte[] contents;
-	private final int trailerPointerAt = 0x24;
-	private final int trailerDataAt = 0x8a94;
-	private ChunkFactory chunkFactory;
-	private PointerFactory ptrFactory;
-
-	@Override
-    protected void setUp() throws Exception {
-		ptrFactory = new PointerFactory(11);
-		chunkFactory = new ChunkFactory(11);
-
-        InputStream is = POIDataSamples.getDiagramInstance().openResourceAsStream("Test_Visio-Some_Random_Text.vsd");
-		POIFSFileSystem filesystem = new POIFSFileSystem(is);
-
-		DocumentEntry docProps =
-			(DocumentEntry)filesystem.getRoot().getEntry("VisioDocument");
-
-		// Grab the document stream
-		contents = new byte[docProps.getSize()];
-		filesystem.createDocumentInputStream("VisioDocument").read(contents);
-	}
-
-	/**
-	 * Test creating the trailer, but not looking for children
-	 */
-	public void testTrailer() {
-		// Find the trailer
-		Pointer trailerPtr = ptrFactory.createPointer(contents, trailerPointerAt);
-
-		assertEquals(20, trailerPtr.getType());
-		assertEquals(trailerDataAt, trailerPtr.getOffset());
-
-		Stream stream = Stream.createStream(trailerPtr, contents, chunkFactory, ptrFactory);
-		assertTrue(stream instanceof TrailerStream);
-		TrailerStream ts = (TrailerStream)stream;
-
-		assertNotNull(ts.getChildPointers());
-		assertNull(ts.getPointedToStreams());
-
-		assertEquals(20, ts.getChildPointers().length);
-		assertEquals(0x16, ts.getChildPointers()[0].getType());
-		assertEquals(0x17, ts.getChildPointers()[1].getType());
-		assertEquals(0x17, ts.getChildPointers()[2].getType());
-		assertEquals(0xff, ts.getChildPointers()[3].getType());
-	}
-
-	public void testChunks() {
-		Pointer trailerPtr = ptrFactory.createPointer(contents, trailerPointerAt);
-		TrailerStream ts = (TrailerStream)
-			Stream.createStream(trailerPtr, contents, chunkFactory, ptrFactory);
-
-		// Should be 7th one
-		Pointer chunkPtr = ts.getChildPointers()[5];
-		assertFalse(chunkPtr.destinationHasStrings());
-		assertTrue(chunkPtr.destinationHasChunks());
-		assertFalse(chunkPtr.destinationHasPointers());
-
-		Stream stream = Stream.createStream(chunkPtr, contents, chunkFactory, ptrFactory);
-		assertNotNull(stream);
-		assertTrue(stream instanceof ChunkStream);
-
-		// Now find the chunks within it
-		ChunkStream cs = (ChunkStream)stream;
-		cs.findChunks();
-	}
-
-	public void testStrings() {
-		Pointer trailerPtr = ptrFactory.createPointer(contents, trailerPointerAt);
-		TrailerStream ts = (TrailerStream)
-			Stream.createStream(trailerPtr, contents, chunkFactory, ptrFactory);
-
-		// Should be the 1st one
-		Pointer stringPtr = ts.getChildPointers()[0];
-		assertTrue(stringPtr.destinationHasStrings());
-		assertFalse(stringPtr.destinationHasChunks());
-		assertFalse(stringPtr.destinationHasPointers());
-
-		Stream stream = Stream.createStream(stringPtr, contents, chunkFactory, ptrFactory);
-		assertNotNull(stream);
-		assertTrue(stream instanceof StringsStream);
-	}
-
-	public void testPointerToStrings() {
-		// The stream at 0x347f has strings
-		// The stream at 0x4312 has a pointer to 0x347f
-		// The stream at 0x44d3 has a pointer to 0x4312
-		//  (it's the 2nd one of 3, and the block is compressed)
-
-		TestPointer ptr44d3 = new TestPointer(true, 0x44d3, 0x51, 0x4e, (short)0x56);
-		ptr44d3.hasPointers = true;
-		PointerContainingStream s44d3 = (PointerContainingStream)
-			Stream.createStream(ptr44d3, contents, chunkFactory, ptrFactory);
-
-		// Type: 0d  Addr: 014ff644  Offset: 4312  Len: 48  Format: 54  From: 44d3
-		Pointer ptr4312 = s44d3.getChildPointers()[1];
-		assertEquals(0x0d, ptr4312.getType());
-		assertEquals(0x4312, ptr4312.getOffset());
-		assertEquals(0x48, ptr4312.getLength());
-		assertEquals(0x54, ptr4312.getFormat());
-		assertTrue(ptr4312.destinationHasPointers());
-		assertFalse(ptr4312.destinationHasStrings());
-
-		PointerContainingStream s4312 = (PointerContainingStream)
-			Stream.createStream(ptr4312, contents, chunkFactory, ptrFactory);
-
-		// Check it has 0x347f
-		// Type: 1f  Addr: 01540004  Offset: 347f  Len: 8e8  Format: 46  From: 4312
-		assertEquals(2, s4312.getChildPointers().length);
-		Pointer ptr347f = s4312.getChildPointers()[0];
-		assertEquals(0x1f, ptr347f.getType());
-		assertEquals(0x347f, ptr347f.getOffset());
-		assertEquals(0x8e8, ptr347f.getLength());
-		assertEquals(0x46, ptr347f.getFormat());
-		assertFalse(ptr347f.destinationHasPointers());
-		assertTrue(ptr347f.destinationHasStrings());
-
-		// Find the children of 0x4312
-		assertNull(s4312.getPointedToStreams());
-		s4312.findChildren(contents);
-		// Should have two, both strings
-		assertNotNull(s4312.getPointedToStreams());
-		assertEquals(2, s4312.getPointedToStreams().length);
-		assertTrue(s4312.getPointedToStreams()[0] instanceof StringsStream);
-		assertTrue(s4312.getPointedToStreams()[1] instanceof StringsStream);
-	}
-
-	public void testTrailerContents() {
-		Pointer trailerPtr = ptrFactory.createPointer(contents, trailerPointerAt);
-		TrailerStream ts = (TrailerStream)
-			Stream.createStream(trailerPtr, contents, chunkFactory, ptrFactory);
-
-		assertNotNull(ts.getChildPointers());
-		assertNull(ts.getPointedToStreams());
-		assertEquals(20, ts.getChildPointers().length);
-
-		ts.findChildren(contents);
-
-		assertNotNull(ts.getChildPointers());
-		assertNotNull(ts.getPointedToStreams());
-		assertEquals(20, ts.getChildPointers().length);
-		assertEquals(20, ts.getPointedToStreams().length);
-
-		// Step down:
-		// 8 -> 4 -> 5 -> 1 -> 0 == String
-		assertNotNull(ts.getPointedToStreams()[8]);
-		assertTrue(ts.getPointedToStreams()[8] instanceof PointerContainingStream);
-
-		PointerContainingStream s8 =
-			(PointerContainingStream)ts.getPointedToStreams()[8];
-		assertNotNull(s8.getPointedToStreams());
-
-		assertNotNull(s8.getPointedToStreams()[4]);
-		assertTrue(s8.getPointedToStreams()[4] instanceof PointerContainingStream);
-
-		PointerContainingStream s84 =
-			(PointerContainingStream)s8.getPointedToStreams()[4];
-		assertNotNull(s84.getPointedToStreams());
-
-		assertNotNull(s84.getPointedToStreams()[5]);
-		assertTrue(s84.getPointedToStreams()[5] instanceof PointerContainingStream);
-
-		PointerContainingStream s845 =
-			(PointerContainingStream)s84.getPointedToStreams()[5];
-		assertNotNull(s845.getPointedToStreams());
-
-		assertNotNull(s845.getPointedToStreams()[1]);
-		assertTrue(s845.getPointedToStreams()[1] instanceof PointerContainingStream);
-
-		PointerContainingStream s8451 =
-			(PointerContainingStream)s845.getPointedToStreams()[1];
-		assertNotNull(s8451.getPointedToStreams());
-
-		assertNotNull(s8451.getPointedToStreams()[0]);
-		assertTrue(s8451.getPointedToStreams()[0] instanceof StringsStream);
-		assertTrue(s8451.getPointedToStreams()[1] instanceof StringsStream);
-	}
-
-	public void testChunkWithText() {
-		// Parent ChunkStream is at 0x7194
-		// This is one of the last children of the trailer
-		Pointer trailerPtr = ptrFactory.createPointer(contents, trailerPointerAt);
-		TrailerStream ts = (TrailerStream)
-			Stream.createStream(trailerPtr, contents, chunkFactory, ptrFactory);
-
-		ts.findChildren(contents);
-
-		assertNotNull(ts.getChildPointers());
-		assertNotNull(ts.getPointedToStreams());
-		assertEquals(20, ts.getChildPointers().length);
-		assertEquals(20, ts.getPointedToStreams().length);
-
-		assertEquals(0x7194, ts.getChildPointers()[13].getOffset());
-		assertEquals(0x7194, ts.getPointedToStreams()[13].getPointer().getOffset());
-
-		PointerContainingStream ps7194 = (PointerContainingStream)
-			ts.getPointedToStreams()[13];
-
-		// First child is at 0x64b3
-		assertEquals(0x64b3, ps7194.getChildPointers()[0].getOffset());
-		assertEquals(0x64b3, ps7194.getPointedToStreams()[0].getPointer().getOffset());
-
-		ChunkStream cs = (ChunkStream)ps7194.getPointedToStreams()[0];
-
-		// Should be 26bc bytes un-compressed
-		assertEquals(0x26bc, cs.getStore().getContents().length);
-		// And should have lots of children
-		assertEquals(131, cs.getChunks().length);
-
-		// One of which is Text
-		boolean hasText = false;
-		for(int i=0; i<cs.getChunks().length; i++) {
-			if(cs.getChunks()[i].getName().equals("Text")) {
-				hasText = true;
-			}
-		}
-		assertTrue(hasText);
-		// Which is the 72nd command
-		assertEquals("Text", cs.getChunks()[72].getName());
-
-		Chunk text = cs.getChunks()[72];
-		assertEquals("Text", text.getName());
-
-		// Which contains our text
-		assertEquals(1, text.getCommands().length);
-		assertEquals("Test View\n", text.getCommands()[0].getValue());
-
-
-		// Almost at the end is some more text
-		assertEquals("Text", cs.getChunks()[128].getName());
-		text = cs.getChunks()[128];
-		assertEquals("Text", text.getName());
-
-		assertEquals(1, text.getCommands().length);
-		assertEquals("Some random text, on a page\n", text.getCommands()[0].getValue());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/HMEFTest.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/HMEFTest.java
deleted file mode 100644
index 4dde7b3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/HMEFTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.IOUtils;
-
-public abstract class HMEFTest extends TestCase {
-   protected static final POIDataSamples _samples = POIDataSamples.getHMEFInstance();
-   
-   protected void assertContents(String filename, Attachment attachment) 
-         throws IOException {
-      assertEquals(filename, attachment.getLongFilename());
-      assertContents(filename, attachment.getContents());
-   }
-   protected void assertContents(String filename, byte[] actual) 
-         throws IOException {
-      InputStream stream = _samples.openResourceAsStream("quick-contents/" + filename);
-      try {
-          byte[] expected = IOUtils.toByteArray(stream);
-          
-          assertEquals(expected.length, actual.length);
-          for(int i=0; i<expected.length; i++) {
-              assertEquals("Byte " + i + " wrong", expected[i], actual[i]);
-          }
-      } finally {
-          stream.close();
-      }
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java
deleted file mode 100644
index 18f5972..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef;
-
-import java.text.DateFormat;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.util.LocaleUtil;
-
-public final class TestAttachments extends HMEFTest {
-   private HMEFMessage quick;
-   
-   @Override
-   protected void setUp() throws Exception {
-      super.setUp();
-      
-      quick = new HMEFMessage(
-            _samples.openResourceAsStream("quick-winmail.dat")
-      );
-   }
-
-   /**
-    * Check the file is as we expect
-    */
-	public void testCounts() throws Exception {
-      // Should have 5 attachments
-      assertEquals(5, quick.getAttachments().size());
-	}
-   
-	/**
-	 * Check some basic bits about the attachments 
-	 */
-   public void testBasicAttachments() throws Exception {
-      List<Attachment> attachments = quick.getAttachments();
-      
-      // Word first
-      assertEquals("quick.doc", attachments.get(0).getFilename());
-      assertEquals("quick.doc", attachments.get(0).getLongFilename());
-      assertEquals(".doc", attachments.get(0).getExtension());
-      
-      // Then HTML
-      assertEquals("QUICK~1.HTM", attachments.get(1).getFilename());
-      assertEquals("quick.html", attachments.get(1).getLongFilename());
-      assertEquals(".html", attachments.get(1).getExtension());
-      
-      // Then PDF
-      assertEquals("quick.pdf", attachments.get(2).getFilename());
-      assertEquals("quick.pdf", attachments.get(2).getLongFilename());
-      assertEquals(".pdf", attachments.get(2).getExtension());
-      
-      // Then Text
-      assertEquals("quick.txt", attachments.get(3).getFilename());
-      assertEquals("quick.txt", attachments.get(3).getLongFilename());
-      assertEquals(".txt", attachments.get(3).getExtension());
-      
-      // And finally XML
-      assertEquals("quick.xml", attachments.get(4).getFilename());
-      assertEquals("quick.xml", attachments.get(4).getLongFilename());
-      assertEquals(".xml", attachments.get(4).getExtension());
-   }
-   
-   /**
-    * Query the attachments in detail, and check we see
-    *  the right values for key things
-    */
-   public void testAttachmentDetails() throws Exception {
-      List<Attachment> attachments = quick.getAttachments();
-      
-      // Pick a predictable date format + timezone
-      DateFormat fmt = DateFormat.getDateTimeInstance(
-            DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
-      );
-      fmt.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-      
-      // They should all have the same date on them
-      assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(0).getModifiedDate()));
-      assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(1).getModifiedDate()));
-      assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(2).getModifiedDate()));
-      assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(3).getModifiedDate()));
-      assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(4).getModifiedDate()));
-      
-      // They should all have a 3512 byte metafile rendered version
-      assertEquals(3512, attachments.get(0).getRenderedMetaFile().length);
-      assertEquals(3512, attachments.get(1).getRenderedMetaFile().length);
-      assertEquals(3512, attachments.get(2).getRenderedMetaFile().length);
-      assertEquals(3512, attachments.get(3).getRenderedMetaFile().length);
-      assertEquals(3512, attachments.get(4).getRenderedMetaFile().length);
-   }
-
-   /**
-    * Ensure the attachment contents come back as they should do 
-    */
-   public void testAttachmentContents() throws Exception {
-      List<Attachment> attachments = quick.getAttachments();
-      
-      assertContents("quick.doc", attachments.get(0));
-      assertContents("quick.html", attachments.get(1));
-      assertContents("quick.pdf", attachments.get(2));
-      assertContents("quick.txt", attachments.get(3));
-      assertContents("quick.xml", attachments.get(4));
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java
deleted file mode 100644
index 6b698e9..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hmef;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.TNEFAttribute;
-import org.apache.poi.hmef.attribute.TNEFProperty;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.util.LittleEndian;
-
-import org.junit.Test;
-
-public class TestBugs {
-    @Test
-    public void test52400ReadSimpleTNEF() throws Exception {
-        POIDataSamples samples = POIDataSamples.getHMEFInstance();
-        String testFile = "bug52400-winmail-simple.dat";
-        HMEFMessage tnefDat    = new HMEFMessage(samples.openResourceAsStream(testFile));
-        MAPIAttribute bodyHtml = tnefDat.getMessageMAPIAttribute(MAPIProperty.BODY_HTML);
-        String bodyStr = new String(bodyHtml.getData(), getEncoding(tnefDat));
-        assertTrue(bodyStr.contains("This is the message body."));
-    }
-    
-    @Test
-    public void test52400ReadAttachedTNEF() throws Exception {
-        POIDataSamples samples = POIDataSamples.getHMEFInstance();
-        String testFile = "bug52400-winmail-with-attachments.dat";
-        HMEFMessage tnefDat    = new HMEFMessage(samples.openResourceAsStream(testFile));
-        MAPIAttribute bodyHtml = tnefDat.getMessageMAPIAttribute(MAPIProperty.BODY_HTML);
-        String bodyStr = new String(bodyHtml.getData(), getEncoding(tnefDat));
-        assertTrue(bodyStr.contains("There are also two attachments."));
-        assertEquals(2, tnefDat.getAttachments().size());
-    }
-    
-    private String getEncoding(HMEFMessage tnefDat) {
-        TNEFAttribute oemCP = tnefDat.getMessageAttribute(TNEFProperty.ID_OEMCODEPAGE);
-        MAPIAttribute cpId = tnefDat.getMessageMAPIAttribute(MAPIProperty.INTERNET_CPID);
-        int codePage = 1252;
-        if (oemCP != null) {
-            codePage = LittleEndian.getInt(oemCP.getData());
-        } else if (cpId != null) {
-            codePage =  LittleEndian.getInt(cpId.getData());
-        }
-        switch (codePage) {
-        // see http://en.wikipedia.org/wiki/Code_page for more
-        case 1252: return "Windows-1252";
-        case 20127: return "US-ASCII";
-        default: return "cp"+codePage;
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java
deleted file mode 100644
index c010a6b..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.MAPIRtfAttribute;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-
-public final class TestCompressedRTF extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getHMEFInstance();
-
-    private static final String block1 = "{\\rtf1\\adeflang102";
-    private static final String block2 = block1 + "5\\ansi\\ansicpg1252";
-    
-    /**
-     * Check that things are as we expected. If this fails,
-     *  then decoding has no hope...  
-     */
-    public void testQuickBasics() throws Exception {
-       HMEFMessage msg = new HMEFMessage(
-             _samples.openResourceAsStream("quick-winmail.dat")
-       );
-       
-       MAPIAttribute rtfAttr = msg.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-       assertNotNull(rtfAttr);
-       assertTrue(rtfAttr instanceof MAPIRtfAttribute);
-       
-       // Check the start of the compressed version
-       byte[] data = ((MAPIRtfAttribute)rtfAttr).getRawData();
-       assertEquals(5907, data.length);
-       
-       // First 16 bytes is header stuff
-       // Check it has the length + compressed marker
-       assertEquals(5907-4, LittleEndian.getShort(data));
-       assertEquals(
-             "LZFu", 
-             StringUtil.getFromCompressedUnicode(data, 8, 4)
-       );
-             
-       
-       // Now Look at the code
-       assertEquals((byte)0x07, data[16+0]);  // Flag: cccUUUUU
-       assertEquals((byte)0x00, data[16+1]);  //  c1a: offset 0 / 0x000
-       assertEquals((byte)0x06, data[16+2]);  //  c1b: length 6+2  -> {\rtf1\a
-       assertEquals((byte)0x01, data[16+3]);  //  c2a: offset 16 / 0x010
-       assertEquals((byte)0x01, data[16+4]);  //  c2b: length 1+2  ->  def
-       assertEquals((byte)0x0b, data[16+5]);  //  c3a: offset 182 / 0xb6
-       assertEquals((byte)0x60, data[16+6]);  //  c3b: length 0+2  -> la 
-       assertEquals((byte)0x6e, data[16+7]);  // n
-       assertEquals((byte)0x67, data[16+8]);  // g
-       assertEquals((byte)0x31, data[16+9]);  // 1
-       assertEquals((byte)0x30, data[16+10]); // 0
-       assertEquals((byte)0x32, data[16+11]); // 2
-       
-       assertEquals((byte)0x66, data[16+12]); // Flag:  UccUUccU
-       assertEquals((byte)0x35, data[16+13]); // 5 
-       assertEquals((byte)0x00, data[16+14]); //  c2a: offset 6 / 0x006
-       assertEquals((byte)0x64, data[16+15]); //  c2b: length 4+2  -> \ansi\a
-       assertEquals((byte)0x00, data[16+16]); //  c3a: offset 7 / 0x007
-       assertEquals((byte)0x72, data[16+17]); //  c3b: length 2+2  -> nsi
-       assertEquals((byte)0x63, data[16+18]); // c 
-       assertEquals((byte)0x70, data[16+19]); // p
-       assertEquals((byte)0x0d, data[16+20]); //  c6a: offset 221 / 0x0dd
-       assertEquals((byte)0xd0, data[16+21]); //  c6b: length 0+2  -> g1
-       assertEquals((byte)0x0e, data[16+22]); //  c7a: offset 224 / 0x0e0
-       assertEquals((byte)0x00, data[16+23]); //  c7b: length 0+2  -> 25
-       assertEquals((byte)0x32, data[16+24]); // 2
-    }
-
-    /**
-     * Check that we can decode the first 8 codes
-     * (1 flag byte + 8 codes)  
-     */
-    public void testFirstBlock() throws Exception {
-       HMEFMessage msg = new HMEFMessage(
-             _samples.openResourceAsStream("quick-winmail.dat")
-       );
-       
-       MAPIAttribute attr = msg.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-       assertNotNull(attr);
-       MAPIRtfAttribute rtfAttr = (MAPIRtfAttribute)attr;
-
-       // Truncate to header + flag + data for flag
-       byte[] data = new byte[16+12];
-       System.arraycopy(rtfAttr.getRawData(), 0, data, 0, data.length);
-       
-       // Decompress it
-       CompressedRTF comp = new CompressedRTF();
-       byte[] decomp = comp.decompress(new ByteArrayInputStream(data));
-       String decompStr = new String(decomp, "ASCII");
-       
-       // Test
-       assertEquals(block1.length(), decomp.length);
-       assertEquals(block1, decompStr);
-    }
-
-    /**
-     * Check that we can decode the first 16 codes
-     * (flag + 8 codes, flag + 8 codes)  
-     */
-    public void testFirstTwoBlocks() throws Exception {
-       HMEFMessage msg = new HMEFMessage(
-             _samples.openResourceAsStream("quick-winmail.dat")
-       );
-
-       MAPIAttribute attr = msg.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-       assertNotNull(attr);
-       MAPIRtfAttribute rtfAttr = (MAPIRtfAttribute)attr;
-
-       // Truncate to header + flag + data for flag + flag + data
-       byte[] data = new byte[16+12+13];
-       System.arraycopy(rtfAttr.getRawData(), 0, data, 0, data.length);
-       
-       // Decompress it
-       CompressedRTF comp = new CompressedRTF();
-       byte[] decomp = comp.decompress(new ByteArrayInputStream(data));
-       String decompStr = new String(decomp, "ASCII");
-       
-       // Test
-       assertEquals(block2.length(), decomp.length);
-       assertEquals(block2, decompStr);
-    }
-
-    /**
-     * Check that we can correctly decode the whole file
-     * TODO Fix what looks like a padding issue
-     */
-    public void testFull() throws Exception {
-       HMEFMessage msg = new HMEFMessage(
-             _samples.openResourceAsStream("quick-winmail.dat")
-       );
-       
-       MAPIAttribute attr = msg.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-       assertNotNull(attr);
-       MAPIRtfAttribute rtfAttr = (MAPIRtfAttribute)attr;
-       
-       InputStream stream = _samples.openResourceAsStream("quick-contents/message.rtf");
-       try {
-           byte[] expected = IOUtils.toByteArray(stream);
-           
-           CompressedRTF comp = new CompressedRTF();
-           byte[] data = rtfAttr.getRawData();
-           byte[] decomp = comp.decompress(new ByteArrayInputStream(data));
-           
-           // Check the length was as expected
-           assertEquals(data.length, comp.getCompressedSize() + 16);
-           assertEquals(expected.length, comp.getDeCompressedSize()); 
-           
-           // Will have been padded though
-           assertEquals(expected.length+2, decomp.length);
-           byte[] tmp = new byte[expected.length];
-           System.arraycopy(decomp, 0, tmp, 0, tmp.length);
-           decomp = tmp;
-           
-           // By byte
-           assertEquals(expected.length, decomp.length);
-           for(int i=0; i<expected.length; i++) {
-               assertEquals(expected[i], decomp[i]);
-           }
-           
-           // By String
-           String expString = new String(expected, "ASCII");
-           String decompStr = rtfAttr.getDataString();
-           assertEquals(expString.length(), decompStr.length());
-           assertEquals(expString, decompStr);
-       } finally {
-           stream.close();
-       }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java
deleted file mode 100644
index 25f0d07..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import org.apache.poi.hmef.attribute.MAPIAttribute;
-import org.apache.poi.hmef.attribute.MAPIRtfAttribute;
-import org.apache.poi.hmef.attribute.MAPIStringAttribute;
-import org.apache.poi.hmef.attribute.TNEFProperty;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.Types;
-import org.apache.poi.util.LittleEndian;
-
-public final class TestHMEFMessage extends HMEFTest {
-	public void testOpen() throws Exception {
-		HMEFMessage msg = new HMEFMessage(
-                _samples.openResourceAsStream("quick-winmail.dat")
-		);
-
-		assertNotNull(msg);
-	}
-
-	public void testCounts() throws Exception {
-      HMEFMessage msg = new HMEFMessage(
-            _samples.openResourceAsStream("quick-winmail.dat")
-      );
-      
-      // Should have 4 attributes on the message
-      assertEquals(4, msg.getMessageAttributes().size());
-      
-      // And should have 54 MAPI attributes on it
-      assertEquals(54, msg.getMessageMAPIAttributes().size());
-      
-      
-      // Should have 5 attachments
-      assertEquals(5, msg.getAttachments().size());
-      
-      // Each attachment should have 6 normal attributes, and 
-      //  20 or so MAPI ones
-      for(Attachment attach : msg.getAttachments()) {
-         int attrCount = attach.getAttributes().size();
-         int mapiAttrCount = attach.getMAPIAttributes().size();
-         
-         assertEquals(6, attrCount);
-         assertTrue("Should be 20-25 mapi attributes, found " + mapiAttrCount, mapiAttrCount >= 20);
-         assertTrue("Should be 20-25 mapi attributes, found " + mapiAttrCount, mapiAttrCount <= 25);
-      }
-	}
-	
-	public void testBasicMessageAttributes() throws Exception {
-      HMEFMessage msg = new HMEFMessage(
-            _samples.openResourceAsStream("quick-winmail.dat")
-      );
-      
-      // Should have version, codepage, class and MAPI
-      assertEquals(4, msg.getMessageAttributes().size());
-      assertNotNull(msg.getMessageAttribute(TNEFProperty.ID_TNEFVERSION));
-      assertNotNull(msg.getMessageAttribute(TNEFProperty.ID_OEMCODEPAGE));
-      assertNotNull(msg.getMessageAttribute(TNEFProperty.ID_MESSAGECLASS));
-      assertNotNull(msg.getMessageAttribute(TNEFProperty.ID_MAPIPROPERTIES));
-      
-      // Check the order
-      assertEquals(TNEFProperty.ID_TNEFVERSION, msg.getMessageAttributes().get(0).getProperty());
-      assertEquals(TNEFProperty.ID_OEMCODEPAGE, msg.getMessageAttributes().get(1).getProperty());
-      assertEquals(TNEFProperty.ID_MESSAGECLASS, msg.getMessageAttributes().get(2).getProperty());
-      assertEquals(TNEFProperty.ID_MAPIPROPERTIES, msg.getMessageAttributes().get(3).getProperty());
-      
-      // Check some that aren't there
-      assertNull(msg.getMessageAttribute(TNEFProperty.ID_AIDOWNER));
-      assertNull(msg.getMessageAttribute(TNEFProperty.ID_ATTACHDATA));
-      
-      // Now check the details of one or two
-      assertEquals(
-            0x010000, 
-            LittleEndian.getInt( msg.getMessageAttribute(TNEFProperty.ID_TNEFVERSION).getData() )
-      );
-      assertEquals(
-            "IPM.Microsoft Mail.Note\0", 
-            new String(msg.getMessageAttribute(TNEFProperty.ID_MESSAGECLASS).getData(), "ASCII")
-      );
-	}
-   
-   public void testBasicMessageMAPIAttributes() throws Exception {
-      HMEFMessage msg = new HMEFMessage(
-            _samples.openResourceAsStream("quick-winmail.dat")
-      );
-      
-      assertEquals("This is a test message", msg.getSubject());
-      assertEquals("{\\rtf1", msg.getBody().substring(0, 6));
-   }
-
-   /**
-    * Checks that the compressed RTF message contents
-    *  can be correctly extracted
-    */
-   public void testMessageContents() throws Exception {
-      HMEFMessage msg = new HMEFMessage(
-            _samples.openResourceAsStream("quick-winmail.dat")
-      );
-      
-      // Firstly by byte
-      MAPIRtfAttribute rtf = (MAPIRtfAttribute)
-         msg.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-      assertContents("message.rtf", rtf.getData());
-      
-      // Then by String
-      String contents = msg.getBody();
-      // It's all low bytes
-      byte[] contentsBytes = contents.getBytes("ASCII");
-      assertContents("message.rtf", contentsBytes);
-      
-      // try to get a message id that does not exist
-      assertNull(msg.getMessageMAPIAttribute(MAPIProperty.AB_DEFAULT_DIR));
-   }
-   
-   public void testMessageSample1() throws Exception {
-		HMEFMessage msg = new HMEFMessage(
-				_samples.openResourceAsStream("winmail-sample1.dat"));
-
-		// Firstly by byte
-		MAPIRtfAttribute rtf = (MAPIRtfAttribute) msg
-				.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-		// assertContents("message.rtf", rtf.getData());
-		assertNotNull(rtf);
-
-		// Then by String
-		String contents = msg.getBody();
-		//System.out.println(contents);
-		// It's all low bytes
-		byte[] contentsBytes = contents.getBytes("ASCII");
-		// assertContents("message.rtf", contentsBytes);
-		assertNotNull(contentsBytes);
-		
-		assertNotNull(msg.getSubject());
-		assertNotNull(msg.getBody());
-   }
-   
-   public void testInvalidMessage() throws Exception {
-	   InputStream str = new ByteArrayInputStream(new byte[] {0, 0, 0, 0});
-	   try {
-		   assertNotNull(new HMEFMessage(str));
-		   fail("Should catch an exception here");
-	   } catch (IllegalArgumentException e) {
-		   assertTrue(e.getMessage().contains("TNEF signature not detected in file, expected 574529400 but got 0"));
-	   }
-   }
-   
-   
-   public void testNoData() throws Exception {
-	   ByteArrayOutputStream out = new ByteArrayOutputStream();
-	   
-	   // Header
-	   LittleEndian.putInt(HMEFMessage.HEADER_SIGNATURE, out);
-	   
-	   // field
-	   LittleEndian.putUShort(0, out);
-	   
-	   byte[] bytes = out.toByteArray();
-	   InputStream str = new ByteArrayInputStream(bytes);
-	   HMEFMessage msg = new HMEFMessage(str);
-	   assertNull(msg.getSubject());
-	   assertNull(msg.getBody());
-   }
-   
-   public void testInvalidLevel() throws Exception {
-	   ByteArrayOutputStream out = new ByteArrayOutputStream();
-	   
-	   // Header
-	   LittleEndian.putInt(HMEFMessage.HEADER_SIGNATURE, out);
-	   
-	   // field
-	   LittleEndian.putUShort(0, out);
-	   
-	   // invalid level
-	   LittleEndian.putUShort(90, out);
-	   
-	   byte[] bytes = out.toByteArray();
-	   InputStream str = new ByteArrayInputStream(bytes);
-	   try {
-		   assertNotNull(new HMEFMessage(str));
-		   fail("Should catch an exception here");
-	   } catch (IllegalStateException e) {
-		   assertTrue(e.getMessage().contains("Unhandled level 90"));
-	   }
-   }
-   
-   public void testCustomProperty() throws Exception {
-       HMEFMessage msg = new HMEFMessage(
-               _samples.openResourceAsStream("quick-winmail.dat")
-       );
-       
-       // Should have non-standard properties with IDs 0xE28 and 0xE29
-       boolean hasE28 = false;
-       boolean hasE29 = false;
-       for (MAPIAttribute attr : msg.getMessageMAPIAttributes()) {
-           if (attr.getProperty().id == 0xe28) hasE28 = true;
-           if (attr.getProperty().id == 0xe29) hasE29 = true;
-       }
-       assertEquals(true, hasE28);
-       assertEquals(true, hasE29);
-       
-       // Ensure we can fetch those as custom ones
-       MAPIProperty propE28 = MAPIProperty.createCustom(0xe28, Types.ASCII_STRING, "Custom E28");
-       MAPIProperty propE29 = MAPIProperty.createCustom(0xe29, Types.ASCII_STRING, "Custom E29");
-       assertNotNull(msg.getMessageMAPIAttribute(propE28));
-       assertNotNull(msg.getMessageMAPIAttribute(propE29));
-       
-       assertEquals(MAPIStringAttribute.class, msg.getMessageMAPIAttribute(propE28).getClass());
-       assertEquals(
-            "Zimbra - Mark Rogers", 
-            ((MAPIStringAttribute)msg.getMessageMAPIAttribute(propE28)).getDataString().substring(10)
-       );
-   }
-}
-
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
deleted file mode 100644
index f854394..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.util.Locale;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-
-import junit.framework.TestCase;
-
-public final class TestMAPIAttributes extends TestCase {
-   private static final POIDataSamples _samples = POIDataSamples.getHMEFInstance();
-   private HMEFMessage quick;
-   private InputStream stream;
-   
-   @Override
-   protected void setUp() throws Exception {
-      super.setUp();
-      
-      stream = _samples.openResourceAsStream("quick-winmail.dat");
-      quick = new HMEFMessage(stream);
-   }
-
-
-   @Override
-protected void tearDown() throws Exception {
-       stream.close();
-
-       super.tearDown();
-   }
-
-
-/** 
-    * Test counts
-    */
-   public void testCounts() throws Exception {
-      // Message should have 54
-      assertEquals(54, quick.getMessageMAPIAttributes().size());
-      
-      // First attachment should have 22
-      assertEquals(22, quick.getAttachments().get(0).getMAPIAttributes().size());
-   }
-	
-   /**
-    * Test various general ones
-    */
-   public void testBasics() throws Exception {
-      // Try constructing two attributes
-      byte[] data = new byte[] {
-            // Level one, id 36867, type 6
-            0x01,    0x03, (byte)0x90,   0x06, 0x00,
-            // Length 24
-            0x24, 0x00, 0x00, 0x00,
-            
-            // Three attributes
-            0x03, 0x00, 0x00, 0x00,
-            // AlternateRecipientAllowed = 01 00
-            0x0B, 0x00, 0x02, 0x00,
-            0x01, 0x00, 0x00, 0x00,
-            // Priority = 00 00 00 00
-            0x03, 0x00, 0x26, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            // ConversationTopic = Test
-            0x1E, 0x00, 0x70, 0x00,
-            0x01, 0x00, 0x00, 0x00,
-            0x04, 0x00, 0x00, 0x00,
-            (byte)'T', (byte)'e',
-            (byte)'s', (byte)'t',
-            // Checksum (may be wrong...)
-            0x01, 0x00
-      };
-      ByteArrayInputStream bais = new ByteArrayInputStream(data);
-      
-      // Create it
-      int level = bais.read();
-      assertEquals(1, level);
-      TNEFAttribute attr = TNEFAttribute.create(bais);
-      
-      // Check it
-      assertNotNull(attr);
-      assertEquals(TNEFMAPIAttribute.class, attr.getClass());
-      
-      TNEFMAPIAttribute mapi = (TNEFMAPIAttribute)attr;
-      assertEquals(3, mapi.getMAPIAttributes().size());
-      
-      assertEquals(
-            MAPIProperty.ALTERNATE_RECIPIENT_ALLOWED, 
-            mapi.getMAPIAttributes().get(0).getProperty()
-      );
-      assertEquals(1, LittleEndian.getUShort(
-               mapi.getMAPIAttributes().get(0).getData()
-      ));
-      
-      assertEquals(
-            MAPIProperty.PRIORITY, 
-            mapi.getMAPIAttributes().get(1).getProperty()
-      );
-      assertEquals(0, LittleEndian.getUShort(
-               mapi.getMAPIAttributes().get(1).getData()
-      ));
-      
-      assertEquals(
-            MAPIProperty.CONVERSATION_TOPIC, 
-            mapi.getMAPIAttributes().get(2).getProperty()
-      );
-      assertEquals(
-            "Test",
-            ((MAPIStringAttribute)mapi.getMAPIAttributes().get(2)).getDataString()
-      );
-   }
-
-   /**
-    * Test String, Date and RTF ones
-    */
-   public void testTyped() throws Exception {
-      MAPIAttribute attr;
-      
-      // String
-      //  ConversationTopic -> This is a test message
-      attr = quick.getMessageMAPIAttribute(MAPIProperty.CONVERSATION_TOPIC);
-      assertNotNull(attr);
-      assertEquals(MAPIStringAttribute.class, attr.getClass());
-      
-      MAPIStringAttribute str = (MAPIStringAttribute)attr;
-      assertEquals("This is a test message", str.getDataString());
-      
-      // Date
-      //  (Unknown/Custom) 32955 -> Wed Dec 15 2010 @ 14:46:31 UTC
-      attr = null;
-      for(MAPIAttribute a : quick.getMessageMAPIAttributes()) {
-         if(a.getProperty().id == 32955) {
-            attr = a;
-            break;
-         }
-      }
-      assertNotNull(attr);
-      assertEquals(MAPIDateAttribute.class, attr.getClass());
-      
-      MAPIDateAttribute date = (MAPIDateAttribute)attr;
-      DateFormat fmt = DateFormat.getDateTimeInstance(
-            DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
-      );
-      fmt.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-      assertEquals("15-Dec-2010 14:46:31", fmt.format(date.getDate()));
-      
-      // RTF
-      //   RtfCompressed -> {\rtf1...
-      attr = quick.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
-      assertNotNull(attr);
-      assertEquals(MAPIRtfAttribute.class, attr.getClass());
-      
-      MAPIRtfAttribute rtf = (MAPIRtfAttribute)attr;
-      assertEquals("{\\rtf1", rtf.getDataString().substring(0, 6));
-   }
-
-   /**
-    * Check common ones via helper accessors
-    */
-   public void testCommon() throws Exception {
-      assertEquals("This is a test message", quick.getSubject());
-      
-      assertEquals("quick.doc", quick.getAttachments().get(0).getLongFilename());
-      assertEquals(".doc", quick.getAttachments().get(0).getExtension());
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
deleted file mode 100644
index cd13b94..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.attribute;
-
-import java.io.ByteArrayInputStream;
-import java.text.DateFormat;
-import java.util.Locale;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-
-import junit.framework.TestCase;
-
-public final class TestTNEFAttributes extends TestCase {
-   private static final POIDataSamples _samples = POIDataSamples.getHMEFInstance();
-   private HMEFMessage quick;
-   
-   @Override
-   protected void setUp() throws Exception {
-      super.setUp();
-      
-      quick = new HMEFMessage(
-            _samples.openResourceAsStream("quick-winmail.dat")
-      );
-   }
-	
-	/** 
-	 * Test counts
-	 */
-	public void testCounts() throws Exception {
-	   // The message should have 4 attributes 
-      assertEquals(4, quick.getMessageAttributes().size());
-      
-      // Each attachment should have 6 attributes
-      for(Attachment attach : quick.getAttachments()) {
-         assertEquals(6, attach.getAttributes().size());
-      }
-	}
-	
-	/** 
-	 * Test the basics
-	 */
-	public void testBasics() throws Exception {
-	   // An int one
-      assertEquals(
-            0x010000, 
-            LittleEndian.getInt( quick.getMessageAttribute(TNEFProperty.ID_TNEFVERSION).getData() )
-      );
-      
-      // Claims not to be text, but really is
-      assertEquals(
-            "IPM.Microsoft Mail.Note\0", 
-            new String(quick.getMessageAttribute(TNEFProperty.ID_MESSAGECLASS).getData(), "ASCII")
-      );
-	   
-	   // Try constructing two attributes
-      byte[] data = new byte[] {
-            // Level one, id 36870, type 8
-            0x01,    0x06, (byte)0x90,   0x08, 0x00,
-            // Length 4
-            0x04, 0x00, 0x00, 0x00,
-            // Data
-            0x00, 0x00, 0x01, 0x00,
-            // Checksum
-            0x01, 0x00, 
-            
-            // level one, id 36871, type 6
-            0x01,    0x07, (byte)0x90,   0x06, 0x00,
-            // Length 8
-            0x08, 0x00, 0x00, 0x00,
-            // Data
-            (byte)0xe4, 0x04, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            // Checksum
-            (byte)0xe8, 0x00
-      };
-      ByteArrayInputStream bais = new ByteArrayInputStream(data);
-      
-      // Create them
-      int level = bais.read();
-      assertEquals(1, level);
-      TNEFAttribute attr1 = TNEFAttribute.create(bais);
-      
-      level = bais.read();
-      assertEquals(1, level);
-      TNEFAttribute attr2 = TNEFAttribute.create(bais);
-      
-      assertEquals(-1, bais.read());
-      
-      // Check them
-      assertEquals(TNEFProperty.ID_TNEFVERSION, attr1.getProperty());
-      assertEquals(8, attr1.getType());
-      assertEquals(4, attr1.getData().length);
-      assertEquals(0x010000, LittleEndian.getInt( attr1.getData() ));
-      
-      assertEquals(TNEFProperty.ID_OEMCODEPAGE, attr2.getProperty());
-      assertEquals(6, attr2.getType());
-      assertEquals(8, attr2.getData().length);
-      assertEquals(0x04e4, LittleEndian.getInt( attr2.getData() ));
-	}
-	
-	/**
-	 * Test string based ones
-	 */
-	public void testString() throws Exception {
-	   TNEFAttribute attr = quick.getAttachments().get(0).getAttribute(
-	         TNEFProperty.ID_ATTACHTITLE
-	   );
-	   assertNotNull(attr);
-	   assertEquals(TNEFStringAttribute.class, attr.getClass());
-	   
-	   // It is a null terminated string
-	   assertEquals("quick.doc\u0000", new String(attr.getData(), "ASCII"));
-	   
-	   // But when we ask for the string, that is sorted for us
-	   TNEFStringAttribute str = (TNEFStringAttribute)attr;
-	   assertEquals("quick.doc", str.getString());
-	}
-
-	/**
-	 * Test date based ones
-	 */
-	public void testDate() throws Exception {
-      TNEFAttribute attr = quick.getAttachments().get(0).getAttribute(
-            TNEFProperty.ID_ATTACHMODIFYDATE
-      );
-      assertNotNull(attr);
-      assertEquals(TNEFDateAttribute.class, attr.getClass());
-      
-      // It is a series of date parts
-      // Weds 28th April 2010 @ 12:40:56 UTC
-      assertEquals(2010, LittleEndian.getUShort(attr.getData(), 0));
-      assertEquals(04, LittleEndian.getUShort(attr.getData(), 2));
-      assertEquals(28, LittleEndian.getUShort(attr.getData(), 4));
-      assertEquals(12, LittleEndian.getUShort(attr.getData(), 6));
-      assertEquals(40, LittleEndian.getUShort(attr.getData(), 8));
-      assertEquals(56, LittleEndian.getUShort(attr.getData(), 10));
-      assertEquals(3, LittleEndian.getUShort(attr.getData(), 12)); // Weds
-      
-      // Ask for it as a Java date, and have it converted
-      // Pick a predictable format + location + timezone
-      TNEFDateAttribute date = (TNEFDateAttribute)attr;
-      DateFormat fmt = DateFormat.getDateTimeInstance(
-            DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
-      );
-      fmt.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-      assertEquals("28-Apr-2010 12:40:56", fmt.format(date.getDate()));
-	}
-	
-	/** 
-	 * Test a bit of mapi
-	 */
-	public void testMAPI() throws Exception {
-	   // Message MAPI
-      TNEFAttribute attr = quick.getMessageAttribute(
-            TNEFProperty.ID_MAPIPROPERTIES
-      );
-      assertNotNull(attr);
-      assertEquals(TNEFMAPIAttribute.class, attr.getClass());
-	   
-      TNEFMAPIAttribute mapi = (TNEFMAPIAttribute)attr;
-      assertEquals(54, mapi.getMAPIAttributes().size());
-      assertEquals(
-            MAPIProperty.ALTERNATE_RECIPIENT_ALLOWED, 
-            mapi.getMAPIAttributes().get(0).getProperty()
-      );
-      
-      
-	   // Attribute MAPI
-      attr = quick.getAttachments().get(0).getAttribute(
-            TNEFProperty.ID_ATTACHMENT
-      );
-      assertNotNull(attr);
-      assertEquals(TNEFMAPIAttribute.class, attr.getClass());
-      
-      mapi = (TNEFMAPIAttribute)attr;
-      assertEquals(22, mapi.getMAPIAttributes().size());
-      assertEquals(
-            MAPIProperty.ATTACH_SIZE, 
-            mapi.getMAPIAttributes().get(0).getProperty()
-      );
-	}
-	
-	/**
-	 * Test common ones via helpers
-	 */
-	public void testCommon() throws Exception {
-	   assertEquals("This is a test message", quick.getSubject());
-	   assertEquals("quick.doc", quick.getAttachments().get(0).getFilename());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java b/trunk/src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
deleted file mode 100644
index 2cfd644..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hmef.extractor;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.TempFile;
-import org.junit.Test;
-
-public class TestHMEFContentsExtractor {
-    @Test
-    public void TestMain() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHMEFInstance();
-        File message = samples.getFile("quick-winmail.dat");
-        File outputDirectory = TempFile.createTempDirectory("quick-winmail-main");
-        String[] args = new String[] { message.getAbsolutePath(), outputDirectory.getAbsolutePath() };
-        HMEFContentsExtractor.main(args);
-        
-        String[] contents = new String[] {
-                "message.rtf", // from extractMessageBody
-                "quick.txt", "quick.pdf", "quick.xml", "quick.doc", "quick.html" // from extractAttachments
-        };
-        
-        for (String filename : contents) {
-            File f = new File(outputDirectory, filename);
-            assertTrue(f + " does not exist", f.exists());
-        }
-
-        outputDirectory.delete();
-    }
-    
-    @Test
-    public void TestExtractMessageBody_OutputStream() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHMEFInstance();
-        File winmailTNEFFile = samples.getFile("quick-winmail.dat");
-        HMEFContentsExtractor extractor = new HMEFContentsExtractor(winmailTNEFFile);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        extractor.extractMessageBody(out);
-        assertTrue(out.size() > 0);
-        byte[] expectedMagic = new byte[] { '{', '\\', 'r', 't', 'f' };
-        byte[] magic = Arrays.copyOf(out.toByteArray(), 5);
-        assertArrayEquals("RTF magic number", expectedMagic, magic);
-        out.close();
-    }
-    
-    @Test
-    public void TestExtractMessageBody_File() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHMEFInstance();
-        File winmailTNEFFile = samples.getFile("quick-winmail.dat");
-        HMEFContentsExtractor extractor = new HMEFContentsExtractor(winmailTNEFFile);
-        File rtf = TempFile.createTempFile("quick-winmail-message-body", ".rtf");
-        assertTrue(rtf.delete());
-        extractor.extractMessageBody(rtf);
-        assertTrue("RTF message body is empty", rtf.length() > 0);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java b/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
deleted file mode 100644
index f0a08a4..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIDataSamples;
-
-public final class TestHPBFDocument extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
-
-	public void testOpen() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample.pub")
-		);
-
-		assertNotNull(doc);
-	}
-
-	public void testBits() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample.pub")
-		);
-
-		assertNotNull(doc.getMainContents());
-		assertNotNull(doc.getQuillContents());
-		assertNotNull(doc.getEscherStm());
-		assertNotNull(doc.getEscherDelayStm());
-
-		assertTrue(doc.getMainContents().getData().length > 0);
-		assertTrue(doc.getQuillContents().getData().length > 0);
-		assertTrue(doc.getEscherStm().getData().length > 0);
-		assertTrue(doc.getEscherDelayStm().getData().length == 0);
-	}
-
-	// TODO
-//	public void testWrite() throws Exception {
-//	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java b/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
deleted file mode 100644
index 63af798..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.extractor;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpbf.HPBFDocument;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-public final class TestPublisherTextExtractor extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
-    
-    private static final String SAMPLE_TEXT = 
-       "This is some text on the first page\n" +
-       "It\u2019s in times new roman, font size 10, all normal\n" +
-       "" +
-       "This is in bold and italic\n" +
-       "It\u2019s Arial, 20 point font\n" +
-       "It\u2019s in the second textbox on the first page\n" +
-       "" +
-       "This is the second page\n\n" +
-       "" +
-       "It is also times new roman, 10 point\n" +
-       "" +
-       "Table on page 2\nTop right\n" +
-       "P2 table left\nP2 table right\n" +
-       "Bottom Left\nBottom Right\n" +
-       "" +
-       "This text is on page two\n" +
-       "#This is a link to Apache POI\n" +
-       "More normal text\n" +
-       "Link to a file\n" +
-       "" +
-       "More text, more hyperlinks\n" +
-       "email link\n" +
-       "Final hyperlink\n" +
-       "Within doc to page 1\n";
-    private static final String SIMPLE_TEXT =
-       "0123456789\n" +
-       "0123456789abcdef\n" +
-       "0123456789abcdef0123456789abcdef\n" +
-       "0123456789\n" +
-       "0123456789abcdef\n" +
-       "0123456789abcdef0123456789abcdef\n" +
-       "0123456789abcdef0123456789abcdef0123456789abcdef\n";
-
-	public void testBasics() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-				_samples.openResourceAsStream("Sample.pub")
-		);
-
-		PublisherTextExtractor ext =
-			new PublisherTextExtractor(doc);
-		ext.getText();
-
-		ext = new PublisherTextExtractor(
-                _samples.openResourceAsStream("Simple.pub")
-		);
-		ext.getText();
-	}
-
-	public void testContents() throws Exception {
-	   PublisherTextExtractor ext;
-	   File sample = _samples.getFile("Sample.pub");
-      File simple = _samples.getFile("Simple.pub");
-	   
-	   // Check this complicated file using POIFS
-		HPBFDocument docOPOIFS = new HPBFDocument(
-		      new FileInputStream(sample)
-		);
-      ext = new PublisherTextExtractor(docOPOIFS);
-      assertEquals( SAMPLE_TEXT, ext.getText() );
-
-      // And with NPOIFS
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(sample);
-    HPBFDocument docNPOIFS = new HPBFDocument(
-            fs
-      );
-		ext = new PublisherTextExtractor(docNPOIFS);
-		assertEquals( SAMPLE_TEXT, ext.getText() );
-
-		
-		// Now a simpler file
-		ext = new PublisherTextExtractor(
-		      new FileInputStream(simple)
-		);
-      assertEquals( SIMPLE_TEXT, ext.getText() );
-      fs.close();
-	}
-
-	/**
-	 * We have the same file saved for Publisher 98, Publisher
-	 *  2000 and Publisher 2007. Check they all agree.
-	 * @throws Exception
-	 */
-	public void testMultipleVersions() throws Exception {
-		File f;
-		HPBFDocument doc;
-
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample.pub")
-		);
-		String s2007 = (new PublisherTextExtractor(doc)).getText();
-
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample2000.pub")
-		);
-		String s2000 = (new PublisherTextExtractor(doc)).getText();
-
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample98.pub")
-		);
-		String s98 = (new PublisherTextExtractor(doc)).getText();
-
-		// Check they all agree
-		assertEquals(s2007, s2000);
-		assertEquals(s2007, s98);
-	}
-
-	/**
-	 * Test that the hyperlink extraction stuff works as well
-	 *  as we can hope it to.
-	 */
-	public void testWithHyperlinks() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("LinkAt10.pub")
-		);
-
-		PublisherTextExtractor ext =
-			new PublisherTextExtractor(doc);
-		ext.getText();
-
-		// Default is no hyperlinks
-		assertEquals("1234567890LINK\n", ext.getText());
-
-		// Turn on
-		ext.setHyperlinksByDefault(true);
-		assertEquals("1234567890LINK\n<http://poi.apache.org/>\n", ext.getText());
-
-
-		// Now a much more complex document
-		ext = new PublisherTextExtractor(
-                _samples.openResourceAsStream("Sample.pub")
-        );
-		ext.setHyperlinksByDefault(true);
-		String text = ext.getText();
-
-		assertTrue(text.endsWith(
-				"<http://poi.apache.org/>\n" +
-				"<C:\\Documents and Settings\\Nick\\My Documents\\Booleans.xlsx>\n" +
-				"<>\n" +
-				"<mailto:dev@poi.apache.org?subject=HPBF>\n" +
-				"<mailto:dev@poi.apache.org?subject=HPBF>\n"
-		));
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java b/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
deleted file mode 100644
index 72d8274..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import org.apache.poi.hpbf.HPBFDocument;
-import org.apache.poi.POIDataSamples;
-
-import junit.framework.TestCase;
-
-public final class TestEscherParts extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
-
-	public void testBasics() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-		    _samples.openResourceAsStream("Sample.pub")
-		);
-
-		EscherStm es = doc.getEscherStm();
-		EscherDelayStm eds = doc.getEscherDelayStm();
-
-		assertNotNull(es);
-		assertNotNull(eds);
-
-		assertEquals(13, es.getEscherRecords().length);
-		assertEquals(0, eds.getEscherRecords().length);
-
-		// TODO - check the contents
-	}
-
-	public void testComplex() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("SampleBrochure.pub")
-		);
-
-		EscherStm es = doc.getEscherStm();
-		EscherDelayStm eds = doc.getEscherDelayStm();
-
-		assertNotNull(es);
-		assertNotNull(eds);
-
-		assertEquals(30, es.getEscherRecords().length);
-		assertEquals(19, eds.getEscherRecords().length);
-
-		// TODO - check contents
-
-
-		// Now do another complex file
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("SampleNewsletter.pub")
-		);
-
-		es = doc.getEscherStm();
-		eds = doc.getEscherDelayStm();
-
-		assertNotNull(es);
-		assertNotNull(eds);
-
-		assertEquals(51, es.getEscherRecords().length);
-		assertEquals(92, eds.getEscherRecords().length);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java b/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
deleted file mode 100644
index b88e45b..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpbf.model;
-
-import org.apache.poi.hpbf.HPBFDocument;
-import org.apache.poi.hpbf.model.qcbits.QCTextBit;
-import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type12;
-import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type0;
-import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type4;
-import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type8;
-import org.apache.poi.POIDataSamples;
-
-import junit.framework.TestCase;
-
-public final class TestQuillContents extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
-
-	public void testBasics() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-		    _samples.openResourceAsStream("Sample.pub")
-		);
-
-		QuillContents qc = doc.getQuillContents();
-		assertEquals(20, qc.getBits().length);
-		for(int i=0; i<19; i++) {
-			assertNotNull(qc.getBits()[i]);
-		}
-		// Last one is blank
-		assertNull(qc.getBits()[19]);
-
-		// Should be text, then three STSHs
-		assertEquals("TEXT", qc.getBits()[0].getThingType());
-		assertEquals("TEXT", qc.getBits()[0].getBitType());
-		assertEquals(0, qc.getBits()[0].getOptA());
-
-		assertEquals("STSH", qc.getBits()[1].getThingType());
-		assertEquals("STSH", qc.getBits()[1].getBitType());
-		assertEquals(0, qc.getBits()[1].getOptA());
-
-		assertEquals("STSH", qc.getBits()[2].getThingType());
-		assertEquals("STSH", qc.getBits()[2].getBitType());
-		assertEquals(1, qc.getBits()[2].getOptA());
-
-		assertEquals("STSH", qc.getBits()[3].getThingType());
-		assertEquals("STSH", qc.getBits()[3].getBitType());
-		assertEquals(2, qc.getBits()[3].getOptA());
-	}
-
-	public void testText() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample.pub")
-		);
-
-		QuillContents qc = doc.getQuillContents();
-		assertEquals(20, qc.getBits().length);
-
-		QCTextBit text = (QCTextBit)qc.getBits()[0];
-		String t = text.getText();
-		assertTrue(t.startsWith("This is some text on the first page"));
-		assertTrue(t.endsWith("Within doc to page 1\r"));
-	}
-
-	public void testPLC() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("Simple.pub")
-		);
-
-		QuillContents qc = doc.getQuillContents();
-		assertEquals(20, qc.getBits().length);
-
-		assertTrue(qc.getBits()[9] instanceof Type4);
-		assertTrue(qc.getBits()[10] instanceof Type4);
-		assertTrue(qc.getBits()[12] instanceof Type8);
-
-		Type4 plc9 = (Type4)qc.getBits()[9];
-		Type4 plc10 = (Type4)qc.getBits()[10];
-		Type8 plc12 = (Type8)qc.getBits()[12];
-
-
-		assertEquals(1, plc9.getNumberOfPLCs());
-		assertEquals(4, plc9.getPreData().length);
-		assertEquals(1, plc9.getPlcValA().length);
-		assertEquals(1, plc9.getPlcValB().length);
-
-		assertEquals(0, plc9.getPreData()[0]);
-		assertEquals(0, plc9.getPreData()[1]);
-		assertEquals(0, plc9.getPreData()[2]);
-		assertEquals(0, plc9.getPreData()[3]);
-		assertEquals(0x356, plc9.getPlcValA()[0]);
-		assertEquals(0x600, plc9.getPlcValB()[0]);
-
-
-		assertEquals(1, plc10.getNumberOfPLCs());
-		assertEquals(4, plc10.getPreData().length);
-		assertEquals(1, plc10.getPlcValA().length);
-		assertEquals(1, plc10.getPlcValB().length);
-
-		assertEquals(0, plc10.getPreData()[0]);
-		assertEquals(0, plc10.getPreData()[1]);
-		assertEquals(0, plc10.getPreData()[2]);
-		assertEquals(0, plc10.getPreData()[3]);
-		assertEquals(0x356, plc10.getPlcValA()[0]);
-		assertEquals(0x800, plc10.getPlcValB()[0]);
-
-		assertEquals(2, plc12.getNumberOfPLCs());
-		assertEquals(7, plc12.getPreData().length);
-		assertEquals(2, plc12.getPlcValA().length);
-		assertEquals(2, plc12.getPlcValB().length);
-
-		assertEquals(0xff, plc12.getPreData()[0]);
-		assertEquals(0, plc12.getPreData()[1]);
-		assertEquals(0x3d, plc12.getPreData()[2]);
-		assertEquals(0, plc12.getPreData()[3]);
-		assertEquals(0x6e, plc12.getPreData()[4]);
-		assertEquals(0, plc12.getPreData()[5]);
-		assertEquals(0, plc12.getPreData()[6]);
-		assertEquals(0xa0000, plc12.getPlcValA()[0]);
-		assertEquals(0x22000000, plc12.getPlcValB()[0]);
-		assertEquals(0x05, plc12.getPlcValA()[1]);
-		assertEquals(0x04, plc12.getPlcValB()[1]);
-	}
-
-	public void testComplexPLC() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample.pub")
-		);
-
-		QuillContents qc = doc.getQuillContents();
-		assertEquals(20, qc.getBits().length);
-
-		assertTrue(qc.getBits()[10] instanceof Type4);
-		assertTrue(qc.getBits()[11] instanceof Type4);
-		assertTrue(qc.getBits()[13] instanceof Type0);
-		assertTrue(qc.getBits()[14] instanceof Type12);
-		assertTrue(qc.getBits()[15] instanceof Type12);
-		assertTrue(qc.getBits()[16] instanceof Type8);
-
-		Type4 plc10 = (Type4)qc.getBits()[10];
-		Type4 plc11 = (Type4)qc.getBits()[11];
-		Type0 plc13 = (Type0)qc.getBits()[13];
-		Type12 plc14 = (Type12)qc.getBits()[14];
-		Type12 plc15 = (Type12)qc.getBits()[15];
-		Type8 plc16 = (Type8)qc.getBits()[16];
-
-
-		assertEquals(1, plc10.getNumberOfPLCs());
-		assertEquals(4, plc10.getPreData().length);
-		assertEquals(1, plc10.getPlcValA().length);
-		assertEquals(1, plc10.getPlcValB().length);
-
-		assertEquals(0, plc10.getPreData()[0]);
-		assertEquals(0, plc10.getPreData()[1]);
-		assertEquals(0, plc10.getPreData()[2]);
-		assertEquals(0, plc10.getPreData()[3]);
-		assertEquals(0x5d0, plc10.getPlcValA()[0]);
-		assertEquals(0x800, plc10.getPlcValB()[0]);
-
-
-		assertEquals(2, plc11.getNumberOfPLCs());
-		assertEquals(4, plc11.getPreData().length);
-		assertEquals(2, plc11.getPlcValA().length);
-		assertEquals(2, plc11.getPlcValB().length);
-
-		assertEquals(0, plc11.getPreData()[0]);
-		assertEquals(0, plc11.getPreData()[1]);
-		assertEquals(0, plc11.getPreData()[2]);
-		assertEquals(0, plc11.getPreData()[3]);
-		assertEquals(0x53a, plc11.getPlcValA()[0]);
-		assertEquals(0x5d0, plc11.getPlcValB()[0]);
-		assertEquals(0xa00, plc11.getPlcValA()[1]);
-		assertEquals(0xc00, plc11.getPlcValB()[1]);
-
-
-		assertEquals(5, plc13.getNumberOfPLCs());
-		assertEquals(4, plc13.getPreData().length);
-		assertEquals(5, plc13.getPlcValA().length);
-		assertEquals(5, plc13.getPlcValB().length);
-
-		assertEquals(0xff00, plc13.getPreData()[0]);
-		assertEquals(0, plc13.getPreData()[1]);
-		assertEquals(0xf, plc13.getPreData()[2]);
-		assertEquals(0, plc13.getPreData()[3]);
-		assertEquals(0x19, plc13.getPlcValA()[0]);
-		assertEquals(0x00, plc13.getPlcValB()[0]);
-		assertEquals(0x27, plc13.getPlcValA()[1]);
-		assertEquals(0x00, plc13.getPlcValB()[1]);
-		assertEquals(0x36, plc13.getPlcValA()[2]);
-		assertEquals(0x00, plc13.getPlcValB()[2]);
-		assertEquals(0x42, plc13.getPlcValA()[3]);
-		assertEquals(0x00, plc13.getPlcValB()[3]);
-		assertEquals(0x50, plc13.getPlcValA()[4]);
-		assertEquals(0x00, plc13.getPlcValB()[4]);
-
-
-		// TODO - test the type 12s
-
-
-		assertEquals(6, plc16.getNumberOfPLCs());
-		assertEquals(7, plc16.getPreData().length);
-		assertEquals(6, plc16.getPlcValA().length);
-		assertEquals(6, plc16.getPlcValB().length);
-
-		assertEquals(0xff, plc16.getPreData()[0]);
-		assertEquals(0, plc16.getPreData()[1]);
-		assertEquals(0x56, plc16.getPreData()[2]);
-		assertEquals(0, plc16.getPreData()[3]);
-		assertEquals(0x62, plc16.getPreData()[4]);
-		assertEquals(0, plc16.getPreData()[5]);
-		assertEquals(0x3e, plc16.getPreData()[6]);
-		assertEquals(0x500000, plc16.getPlcValA()[0]);
-		assertEquals(0x570000, plc16.getPlcValB()[0]);
-		assertEquals(0x4b0000, plc16.getPlcValA()[1]);
-		assertEquals(0x000000, plc16.getPlcValB()[1]);
-		assertEquals(0x0a0000, plc16.getPlcValA()[2]);
-		assertEquals(0x22000000, plc16.getPlcValB()[2]);
-		assertEquals(0x000005, plc16.getPlcValA()[3]);
-		assertEquals(0x000004, plc16.getPlcValB()[3]);
-		assertEquals(0x000004, plc16.getPlcValA()[4]);
-		assertEquals(0x000004, plc16.getPlcValB()[4]);
-		assertEquals(0x000004, plc16.getPlcValA()[5]);
-		assertEquals(0x000004, plc16.getPlcValB()[5]);
-	}
-
-	public void testNoHyperlinks() throws Exception {
-		HPBFDocument doc = new HPBFDocument(
-                _samples.openResourceAsStream("SampleNewsletter.pub")
-		);
-
-		QuillContents qc = doc.getQuillContents();
-		assertEquals(20, qc.getBits().length);
-
-		Type12 plc18 = (Type12)qc.getBits()[18];
-
-		assertEquals(1, plc18.getNumberOfPLCs());
-		assertEquals(0, plc18.getNumberOfHyperlinks());
-		assertEquals(0, plc18.getTextStartAt(0));
-		assertEquals(601, plc18.getAllTextEndAt());
-	}
-
-	public void testSimpleHyperlink() throws Exception {
-		HPBFDocument doc;
-		QuillContents qc;
-		Type12 hlBit;
-
-		// Link at 10
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("LinkAt10.pub")
-		);
-		qc = doc.getQuillContents();
-
-		hlBit = (Type12)qc.getBits()[12];
-		assertEquals(1, hlBit.getNumberOfPLCs());
-		assertEquals(1, hlBit.getNumberOfHyperlinks());
-
-		assertEquals(10, hlBit.getTextStartAt(0));
-		assertEquals(15, hlBit.getAllTextEndAt());
-		assertEquals("http://poi.apache.org/", hlBit.getHyperlink(0));
-
-		// Longer link at 10
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("LinkAt10Longer.pub")
-		);
-		qc = doc.getQuillContents();
-
-		hlBit = (Type12)qc.getBits()[12];
-		assertEquals(1, hlBit.getNumberOfPLCs());
-		assertEquals(1, hlBit.getNumberOfHyperlinks());
-
-		assertEquals(10, hlBit.getTextStartAt(0));
-		assertEquals(15, hlBit.getAllTextEndAt());
-		assertEquals("http://poi.apache.org/hpbf/", hlBit.getHyperlink(0));
-
-		// Link at 20
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("LinkAt20.pub")
-		);
-		qc = doc.getQuillContents();
-
-		hlBit = (Type12)qc.getBits()[12];
-		assertEquals(1, hlBit.getNumberOfPLCs());
-		assertEquals(1, hlBit.getNumberOfHyperlinks());
-
-		assertEquals(20, hlBit.getTextStartAt(0));
-		assertEquals(25, hlBit.getAllTextEndAt());
-		assertEquals("http://poi.apache.org/", hlBit.getHyperlink(0));
-	}
-
-	public void testManyHyperlinks() throws Exception {
-		HPBFDocument doc;
-		QuillContents qc;
-		Type12 hlBit;
-
-		// Link at 10
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("LinkAt10.pub")
-		);
-		qc = doc.getQuillContents();
-
-		hlBit = (Type12)qc.getBits()[12];
-		assertEquals(1, hlBit.getNumberOfPLCs());
-		assertEquals(1, hlBit.getNumberOfHyperlinks());
-
-		assertEquals(10, hlBit.getTextStartAt(0));
-		assertEquals(15, hlBit.getAllTextEndAt());
-		assertEquals("http://poi.apache.org/", hlBit.getHyperlink(0));
-
-	}
-
-	public void testHyperlinkDifferentVersions() throws Exception {
-		HPBFDocument doc;
-		QuillContents qc;
-		Type12 hlBitA;
-		Type12 hlBitB;
-
-		// Latest version
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample.pub")
-		);
-		qc = doc.getQuillContents();
-
-		hlBitA = (Type12)qc.getBits()[14];
-		assertEquals(2, hlBitA.getNumberOfPLCs());
-		assertEquals(2, hlBitA.getNumberOfHyperlinks());
-
-		assertEquals(25, hlBitA.getTextStartAt(0));
-		assertEquals(72, hlBitA.getTextStartAt(1));
-		assertEquals(87, hlBitA.getAllTextEndAt());
-		assertEquals("http://poi.apache.org/", hlBitA.getHyperlink(0));
-		assertEquals("C:\\Documents and Settings\\Nick\\My Documents\\Booleans.xlsx", hlBitA.getHyperlink(1));
-
-		hlBitB = (Type12)qc.getBits()[15];
-		assertEquals(3, hlBitB.getNumberOfPLCs());
-		assertEquals(3, hlBitB.getNumberOfHyperlinks());
-
-		assertEquals(27, hlBitB.getTextStartAt(0));
-		assertEquals(37, hlBitB.getTextStartAt(1));
-		assertEquals(54, hlBitB.getTextStartAt(2));
-		assertEquals(75, hlBitB.getAllTextEndAt());
-		assertEquals("", hlBitB.getHyperlink(0));
-		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(1));
-		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
-
-		// 2000 version
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample2000.pub")
-		);
-		qc = doc.getQuillContents();
-
-		hlBitA = (Type12)qc.getBits()[13];
-		assertEquals(2, hlBitA.getNumberOfPLCs());
-		assertEquals(2, hlBitA.getNumberOfHyperlinks());
-
-		assertEquals(25, hlBitA.getTextStartAt(0));
-		assertEquals(72, hlBitA.getTextStartAt(1));
-		assertEquals(87, hlBitA.getAllTextEndAt());
-		assertEquals("http://poi.apache.org/", hlBitA.getHyperlink(0));
-		assertEquals("C:\\Documents and Settings\\Nick\\My Documents\\Booleans.xlsx", hlBitA.getHyperlink(1));
-
-		hlBitB = (Type12)qc.getBits()[14];
-		assertEquals(3, hlBitB.getNumberOfPLCs());
-		assertEquals(3, hlBitB.getNumberOfHyperlinks());
-
-		assertEquals(27, hlBitB.getTextStartAt(0));
-		assertEquals(37, hlBitB.getTextStartAt(1));
-		assertEquals(54, hlBitB.getTextStartAt(2));
-		assertEquals(75, hlBitB.getAllTextEndAt());
-		assertEquals("", hlBitB.getHyperlink(0));
-		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(1));
-		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
-
-		// 98 version
-		doc = new HPBFDocument(
-                _samples.openResourceAsStream("Sample98.pub")
-		);
-		qc = doc.getQuillContents();
-
-		hlBitA = (Type12)qc.getBits()[13];
-		assertEquals(2, hlBitA.getNumberOfPLCs());
-		assertEquals(2, hlBitA.getNumberOfHyperlinks());
-
-		assertEquals(25, hlBitA.getTextStartAt(0));
-		assertEquals(72, hlBitA.getTextStartAt(1));
-		assertEquals(87, hlBitA.getAllTextEndAt());
-		assertEquals("http://poi.apache.org/", hlBitA.getHyperlink(0));
-		assertEquals("C:\\Documents and Settings\\Nick\\My Documents\\Booleans.xlsx", hlBitA.getHyperlink(1));
-
-		hlBitB = (Type12)qc.getBits()[14];
-		assertEquals(3, hlBitB.getNumberOfPLCs());
-		assertEquals(3, hlBitB.getNumberOfHyperlinks());
-
-		assertEquals(27, hlBitB.getTextStartAt(0));
-		assertEquals(37, hlBitB.getTextStartAt(1));
-		assertEquals(54, hlBitB.getTextStartAt(2));
-		assertEquals(75, hlBitB.getAllTextEndAt());
-		assertEquals("", hlBitB.getHyperlink(0));
-		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(1));
-		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/AllHSLFTests.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/AllHSLFTests.java
deleted file mode 100644
index e24b093..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/AllHSLFTests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf;
-
-import org.apache.poi.hslf.extractor.TestCruddyExtractor;
-import org.apache.poi.hslf.extractor.TestExtractor;
-import org.apache.poi.hslf.model.AllHSLFModelTests;
-import org.apache.poi.hslf.record.AllHSLFRecordTests;
-import org.apache.poi.hslf.usermodel.AllHSLFUserModelTests;
-import org.apache.poi.hslf.util.TestSystemTimeUtils;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests from the package <tt>org.apache.poi.hslf</tt> and all sub-packages.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestEncryptedFile.class,
-    TestRecordCounts.class,
-    TestReWrite.class,
-    TestReWriteSanity.class,
-    TestCruddyExtractor.class,
-    TestExtractor.class,
-    AllHSLFModelTests.class,
-    AllHSLFRecordTests.class,
-    AllHSLFUserModelTests.class,
-    TestSystemTimeUtils.class
-})
-public class AllHSLFTests {
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java
deleted file mode 100644
index 34d5aee..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-
-public class HSLFTestDataSamples {
-
-	private static final POIDataSamples _inst = POIDataSamples.getSlideShowInstance();
-
-	public static InputStream openSampleFileStream(String sampleFileName) {
-		return _inst.openResourceAsStream(sampleFileName);
-	}
-	public static File getSampleFile(String sampleFileName) {
-	   return _inst.getFile(sampleFileName);
-	}
-	public static byte[] getTestDataFileContent(String fileName) {
-		return _inst.readFile(fileName);
-	}
-
-	/**
-	 * Writes a slideshow to a <tt>ByteArrayOutputStream</tt> and reads it back
-	 * from a <tt>ByteArrayInputStream</tt>.<p/>
-	 * Useful for verifying that the serialisation round trip
-	 */
-	public static HSLFSlideShowImpl writeOutAndReadBack(HSLFSlideShowImpl original) {
-		try {
-			ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-			original.write(baos);
-			ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-			return new HSLFSlideShowImpl(bais);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * Writes a slideshow to a <tt>ByteArrayOutputStream</tt> and reads it back
-	 * from a <tt>ByteArrayInputStream</tt>.<p/>
-	 * Useful for verifying that the serialisation round trip
-	 */
-	public static HSLFSlideShow writeOutAndReadBack(HSLFSlideShow original) {
-		try {
-			ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-			original.write(baos);
-			ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-			return new HSLFSlideShow(bais);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
deleted file mode 100644
index ae43394..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf;
-
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests that HSLFSlideShow does the right thing with an encrypted file
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestEncryptedFile extends TestCase {
-    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-	public void testLoadNonEncrypted() throws Exception {
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-
-		assertNotNull(hss);
-	}
-
-	public void testLoadEncrypted() throws Exception {
-		try {
-            new HSLFSlideShowImpl(slTests.openResourceAsStream("Password_Protected-hello.ppt"));
-			fail();
-		} catch(EncryptedPowerPointFileException e) {
-			// Good
-		}
-
-		try {
-            new HSLFSlideShowImpl(slTests.openResourceAsStream("Password_Protected-np-hello.ppt"));
-			fail();
-		} catch(EncryptedPowerPointFileException e) {
-			// Good
-		}
-
-		try {
-            new HSLFSlideShowImpl(slTests.openResourceAsStream("Password_Protected-56-hello.ppt"));
-			fail();
-		} catch(EncryptedPowerPointFileException e) {
-			// Good
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
deleted file mode 100644
index e54cc0c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.TempFile;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that HSLFSlideShow writes the powerpoint bit of data back out
- *  correctly. Currently, that means being the same as what it read in
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestReWrite {
-    // HSLFSlideShow primed on the test data
-    private HSLFSlideShowImpl hssA;
-    private HSLFSlideShowImpl hssB;
-    private HSLFSlideShowImpl hssC;
-    // POIFS primed on the test data
-    private POIFSFileSystem pfsA;
-    private POIFSFileSystem pfsB;
-    private POIFSFileSystem pfsC;
-
-    @Before
-    public void setUp() throws Exception {
-
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-        
-        pfsA = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-        hssA = new HSLFSlideShowImpl(pfsA);
-
-        pfsB = new POIFSFileSystem(slTests.openResourceAsStream("ParagraphStylesShorterThanCharStyles.ppt"));
-        hssB = new HSLFSlideShowImpl(pfsB);
-
-        pfsC = new POIFSFileSystem(slTests.openResourceAsStream("WithMacros.ppt"));
-        hssC = new HSLFSlideShowImpl(pfsC);
-    }
-
-    @Test
-    public void testWritesOutTheSame() throws Exception {
-        assertWritesOutTheSame(hssA, pfsA);
-        assertWritesOutTheSame(hssB, pfsB);
-    }
-    
-    public void assertWritesOutTheSame(HSLFSlideShowImpl hss, POIFSFileSystem pfs) throws Exception {
-        // Write out to a byte array, and to a temp file
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        hss.write(baos);
-        
-        final File file = TempFile.createTempFile("TestHSLF", ".ppt");
-        final File file2 = TempFile.createTempFile("TestHSLF", ".ppt");
-        hss.write(file);
-        hss.write(file2);
-        
-
-        // Build an input stream of it, and read back as a POIFS from the stream
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        POIFSFileSystem npfS = new POIFSFileSystem(bais);
-        
-        // And the same on the temp file
-        POIFSFileSystem npfF = new POIFSFileSystem(file);
-        
-        // And another where we do an in-place write
-        POIFSFileSystem npfRF = new POIFSFileSystem(file2, false);
-        HSLFSlideShowImpl hssRF = new HSLFSlideShowImpl(npfRF);
-        hssRF.write();
-        hssRF.close();
-        npfRF = new POIFSFileSystem(file2);
-        
-        // Check all of them in turn
-        for (POIFSFileSystem npf : new POIFSFileSystem[] { npfS, npfF, npfRF }) {
-            // Check that the "PowerPoint Document" sections have the same size
-            DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document");
-            DocumentEntry nProps = (DocumentEntry)npf.getRoot().getEntry("PowerPoint Document");
-            assertEquals(oProps.getSize(),nProps.getSize());
-    
-            // Check that they contain the same data
-            byte[] _oData = new byte[oProps.getSize()];
-            byte[] _nData = new byte[nProps.getSize()];
-            pfs.createDocumentInputStream("PowerPoint Document").read(_oData);
-            npf.createDocumentInputStream("PowerPoint Document").read(_nData);
-            for(int i=0; i<_oData.length; i++) {
-                //System.out.println(i + "\t" + Integer.toHexString(i));
-                assertEquals(_oData[i], _nData[i]);
-            }
-            npf.close();
-        }
-    }
-
-    @Test
-    public void testWithMacroStreams() throws IOException {
-        // Check that they're apparently the same
-        assertSlideShowWritesOutTheSame(hssC, pfsC);
-
-        // Currently has a Macros stream
-        assertNotNull( pfsC.getRoot().getEntry("Macros") );
-
-        // Write out normally, will loose the macro stream
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        hssC.write(baos);
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        POIFSFileSystem pfsNew = new POIFSFileSystem(bais);
-        assertFalse(pfsNew.getRoot().hasEntry("Macros"));
-        pfsNew.close();
-
-        // But if we write out with nodes preserved, will be there
-        baos.reset();
-        hssC.write(baos, true);
-        bais = new ByteArrayInputStream(baos.toByteArray());
-        pfsNew = new POIFSFileSystem(bais);
-        assertTrue( pfsNew.getRoot().hasEntry("Macros") );
-        pfsNew.close();
-    }
-
-    /**
-     * Ensure that simply opening a slideshow (usermodel) view of it
-     *  doesn't change things
-     */
-    @Test
-    public void testSlideShowWritesOutTheSame() throws Exception {
-        assertSlideShowWritesOutTheSame(hssA, pfsA);
-
-        // Some bug in StyleTextPropAtom rewriting means this will fail
-        // We need to identify and fix that first
-        //assertSlideShowWritesOutTheSame(hssB, pfsB);
-    }
-    
-    public void assertSlideShowWritesOutTheSame(HSLFSlideShowImpl hss, POIFSFileSystem pfs) throws IOException {
-        // Create a slideshow covering it
-        @SuppressWarnings("resource")
-        HSLFSlideShow ss = new HSLFSlideShow(hss);
-        ss.getSlides();
-        ss.getNotes();
-
-        // Now write out to a byte array
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        hss.write(baos);
-
-        // Build an input stream of it
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-        // Use POIFS to query that lot
-        POIFSFileSystem npfs = new POIFSFileSystem(bais);
-
-        // Check that the "PowerPoint Document" sections have the same size
-        DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document");
-        DocumentEntry nProps = (DocumentEntry)npfs.getRoot().getEntry("PowerPoint Document");
-        assertEquals(oProps.getSize(),nProps.getSize());
-
-        // Check that they contain the same data
-        byte[] _oData = new byte[oProps.getSize()];
-        byte[] _nData = new byte[nProps.getSize()];
-        pfs.createDocumentInputStream("PowerPoint Document").read(_oData);
-        npfs.createDocumentInputStream("PowerPoint Document").read(_nData);
-        for(int i=0; i<_oData.length; i++) {
-            if(_oData[i] != _nData[i])
-                System.out.println(i + "\t" + Integer.toHexString(i));
-            assertEquals(_oData[i], _nData[i]);
-        }
-        npfs.close();
-    }
-    
-    @Test
-    public void test48593() throws IOException {
-        HSLFSlideShow ppt1 = new HSLFSlideShow();
-        ppt1.createSlide();
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt2.createSlide();
-        HSLFSlideShow ppt3 = HSLFTestDataSamples.writeOutAndReadBack(ppt2);
-        ppt3.createSlide();
-        HSLFSlideShow ppt4 = HSLFTestDataSamples.writeOutAndReadBack(ppt3);
-        ppt4.createSlide();
-        HSLFTestDataSamples.writeOutAndReadBack(ppt4).close();
-        ppt4.close();
-        ppt3.close();
-        ppt2.close();
-        ppt1.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
deleted file mode 100644
index f6d18a9..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf;
-
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.CurrentUserAtom;
-import org.apache.poi.hslf.record.PersistPtrHolder;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.UserEditAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that HSLFSlideShow writes the powerpoint bit of data back out
- *  in a sane manner - i.e. records end up in the right place
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestReWriteSanity {
-    // HSLFSlideShow primed on the test data
-    private HSLFSlideShowImpl ss;
-    // POIFS primed on the test data
-    private POIFSFileSystem pfs;
-
-    @Before
-    public void setUp() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-        pfs = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-        ss = new HSLFSlideShowImpl(pfs);
-    }
-    
-    @After
-    public void tearDown() throws Exception {
-        pfs.close();
-        ss.close();
-    }
-
-    @Test
-    public void testUserEditAtomsRight() throws Exception {
-        // Write out to a byte array
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ss.write(baos);
-
-        // Build an input stream of it
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-        // Create a new one from that
-        HSLFSlideShowImpl wss = new HSLFSlideShowImpl(bais);
-
-        // Find the location of the PersistPtrIncrementalBlocks and
-        // UserEditAtoms
-        Record[] r = wss.getRecords();
-        Map<Integer,Record> pp = new HashMap<Integer,Record>();
-        Map<Integer,Object> ue = new HashMap<Integer,Object>();
-        ue.put(Integer.valueOf(0),Integer.valueOf(0)); // Will show 0 if first
-        int pos = 0;
-        int lastUEPos = -1;
-
-        for (final Record rec : r) {
-            if(rec instanceof PersistPtrHolder) {
-                pp.put(Integer.valueOf(pos), rec);
-            }
-            if(rec instanceof UserEditAtom) {
-                ue.put(Integer.valueOf(pos), rec);
-                lastUEPos = pos;
-            }
-
-            ByteArrayOutputStream bc = new ByteArrayOutputStream();
-            rec.writeOut(bc);
-            pos += bc.size();
-        }
-
-        // Check that the UserEditAtom's point to right stuff
-        for (final Record rec : r) {
-            if(rec instanceof UserEditAtom) {
-                UserEditAtom uea = (UserEditAtom)rec;
-                int luPos = uea.getLastUserEditAtomOffset();
-                int ppPos = uea.getPersistPointersOffset();
-
-                assertContains(ue, Integer.valueOf(luPos));
-                assertContains(pp, Integer.valueOf(ppPos));
-            }
-        }
-
-        // Check that the CurrentUserAtom points to the right UserEditAtom
-        CurrentUserAtom cua = wss.getCurrentUserAtom();
-        int listedUEPos = (int)cua.getCurrentEditOffset();
-        assertEquals(lastUEPos,listedUEPos);
-        
-        wss.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
deleted file mode 100644
index 473c9d3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf;
-
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests that HSLFSlideShow returns the right numbers of key records when
- * it parses the test file
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestRecordCounts extends TestCase {
-	// HSLFSlideShow primed on the test data
-	private final HSLFSlideShowImpl ss;
-
-	public TestRecordCounts() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		ss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-	}
-
-	public void testSheetsCount() {
-		// Top level
-		Record[] r = ss.getRecords();
-
-		int count = 0;
-		for (final Record rec : r) {
-			if(rec instanceof Slide) {
-				count++;
-			}
-		}
-		// Currently still sees the Master Sheet, but might not in the future
-		assertEquals(3,count);
-	}
-
-	public void testNotesCount() {
-		// Top level
-		Record[] r = ss.getRecords();
-
-		int count = 0;
-		for (final Record rec : r) {
-			if (rec instanceof Notes && rec.getRecordType() == 1008l) {
-				count++;
-			}
-		}
-		// Two real sheets, plus the master sheet
-		assertEquals(3,count);
-	}
-
-	public void testSlideListWithTextCount() {
-		// Second level
-		Record[] rt = ss.getRecords();
-		Record[] r = rt[0].getChildRecords();
-
-		int count = 0;
-		for (final Record rec : r) {
-			if (rec instanceof SlideListWithText && rec.getRecordType() == 4080l) {
-				count++;
-			}
-		}
-		// Two real sheets, plus the master sheet
-		assertEquals(3,count);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
deleted file mode 100644
index 33807ac..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.extractor;
-
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Tests that the QuickButCruddyTextExtractor works correctly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestCruddyExtractor extends TestCase {
-	// Extractor primed on the test data
-	private final QuickButCruddyTextExtractor te;
-	// All the text to be found in the file
-	String[] allTheText = new String[] {
-		"This is a test title",
-		"This is a test subtitle\nThis is on page 1",
-		"Click to edit Master title style",
-		"Click to edit Master text styles\nSecond level\nThird level\nFourth level\nFifth level",
-		"*",
-		"*",
-		"*",
-		"*",
-		"*",
-		"Click to edit Master text styles\nSecond level\nThird level\nFourth level\nFifth level",
-		"*",
-		"*",
-		"These are the notes for page 1",
-		"This is a test title",
-		"This is a test subtitle\nThis is on page 1",
-		"This is the title on page 2",
-		"This is page two\nIt has several blocks of text\nNone of them have formattingT",
-		"These are the notes on page two, again lacking formatting",
-		"This is a test title",
-		"This is a test subtitle\nThis is on page 1",
-		"This is the title on page 2",
-		"This is page two\nIt has several blocks of text\nNone of them have formatting",
-	};
-
-    public TestCruddyExtractor() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		te = new QuickButCruddyTextExtractor(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-    }
-
-    public void testReadAsVector() {
-		// Extract the text from the file as a vector
-		List<String> foundTextV = te.getTextAsVector();
-
-		// Ensure they match
-		assertEquals(allTheText.length,foundTextV.size());
-		for(int i=0; i<allTheText.length; i++) {
-			String foundText = foundTextV.get(i);
-			assertEquals(allTheText[i],foundText);
-		}
-	}
-
-	public void testReadAsString() {
-		// Extract the text as a String
-		String foundText = te.getTextAsString();
-
-		// Turn the string array into a single string
-		String expectText = StringUtil.join(allTheText, "\n") + "\n";
-
-		// Ensure they match
-		assertEquals(expectText,foundText);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
deleted file mode 100644
index 8ab30ee..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.extractor;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.apache.poi.POITestCase.assertContainsIgnoreCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.model.OLEShape;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that the extractor correctly gets the text out of our sample file
- */
-public final class TestExtractor {
-    /**
-     * Extractor primed on the 2 page basic test data
-     */
-    private PowerPointExtractor ppe;
-    private static final String expectText = "This is a test title\nThis is a test subtitle\nThis is on page 1\nThis is the title on page 2\nThis is page two\nIt has several blocks of text\nNone of them have formatting\n";
-
-    /**
-     * Extractor primed on the 1 page but text-box'd test data
-     */
-    private PowerPointExtractor ppe2;
-    private static final String expectText2 = "Hello, World!!!\nI am just a poor boy\nThis is Times New Roman\nPlain Text \n";
-
-    /**
-     * Where our embeded files live
-     */
-    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-    @Before
-    public void setUp() throws Exception {
-        ppe = new PowerPointExtractor(slTests.getFile("basic_test_ppt_file.ppt").getCanonicalPath());
-        ppe2 = new PowerPointExtractor(slTests.getFile("with_textbox.ppt").getCanonicalPath());
-    }
-
-    @After
-    public void closeResources() throws Exception {
-        ppe2.close();
-        ppe.close();
-    }
-
-    @Test
-    public void testReadSheetText() {
-        // Basic 2 page example
-        String sheetText = ppe.getText();
-
-        ensureTwoStringsTheSame(expectText, sheetText);
-
-
-        // 1 page example with text boxes
-        sheetText = ppe2.getText();
-
-        ensureTwoStringsTheSame(expectText2, sheetText);
-    }
-
-    @Test
-    public void testReadNoteText() {
-        // Basic 2 page example
-        String notesText = ppe.getNotes();
-        String expText = "These are the notes for page 1\nThese are the notes on page two, again lacking formatting\n";
-
-        ensureTwoStringsTheSame(expText, notesText);
-
-        // Other one doesn't have notes
-        notesText = ppe2.getNotes();
-        expText = "";
-
-        ensureTwoStringsTheSame(expText, notesText);
-    }
-
-    @Test
-    public void testReadBoth() {
-        String[] slText = new String[]{
-                "This is a test title\nThis is a test subtitle\nThis is on page 1\n",
-                "This is the title on page 2\nThis is page two\nIt has several blocks of text\nNone of them have formatting\n"
-        };
-        String[] ntText = new String[]{
-                "These are the notes for page 1\n",
-                "These are the notes on page two, again lacking formatting\n"
-        };
-
-        ppe.setSlidesByDefault(true);
-        ppe.setNotesByDefault(false);
-        assertEquals(slText[0] + slText[1], ppe.getText());
-
-        ppe.setSlidesByDefault(false);
-        ppe.setNotesByDefault(true);
-        assertEquals(ntText[0] + ntText[1], ppe.getText());
-
-        ppe.setSlidesByDefault(true);
-        ppe.setNotesByDefault(true);
-        assertEquals(slText[0] + slText[1] + "\n" + ntText[0] + ntText[1], ppe.getText());
-    }
-
-    /**
-     * Test that when presented with a PPT file missing the odd
-     * core record, we can still get the rest of the text out
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testMissingCoreRecords() throws Exception {
-        ppe.close();
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("missing_core_records.ppt"));
-
-        String text = ppe.getText(true, false);
-        String nText = ppe.getNotes();
-
-        assertNotNull(text);
-        assertNotNull(nText);
-
-        // Notes record were corrupt, so don't expect any
-        assertEquals(nText.length(), 0);
-
-        // Slide records were fine
-        assertTrue(text.startsWith("Using Disease Surveillance and Response"));
-    }
-
-    private void ensureTwoStringsTheSame(String exp, String act) {
-        assertEquals(exp.length(), act.length());
-        char[] expC = exp.toCharArray();
-        char[] actC = act.toCharArray();
-        for (int i = 0; i < expC.length; i++) {
-            assertEquals("Char " + i, expC[i], actC[i]);
-        }
-        assertEquals(exp, act);
-    }
-
-    @Test
-    public void testExtractFromEmbeded() throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem(
-                POIDataSamples.getSpreadSheetInstance().openResourceAsStream("excel_with_embeded.xls")
-        );
-        HSLFSlideShowImpl ss;
-
-        DirectoryNode dirA = (DirectoryNode)
-                fs.getRoot().getEntry("MBD0000A3B6");
-        DirectoryNode dirB = (DirectoryNode)
-                fs.getRoot().getEntry("MBD0000A3B3");
-
-        assertNotNull(dirA.getEntry("PowerPoint Document"));
-        assertNotNull(dirB.getEntry("PowerPoint Document"));
-
-        // Check the first file
-        ss = new HSLFSlideShowImpl(dirA);
-        ppe.close();
-        ppe = new PowerPointExtractor(ss);
-        assertEquals("Sample PowerPoint file\nThis is the 1st file\nNot much too it\n",
-                ppe.getText(true, false)
-        );
-
-        // And the second
-        ss = new HSLFSlideShowImpl(dirB);
-        ppe.close();
-        ppe = new PowerPointExtractor(ss);
-        assertEquals("Sample PowerPoint file\nThis is the 2nd file\nNot much too it either\n",
-                ppe.getText(true, false)
-        );
-        fs.close();
-    }
-
-    /**
-     * A powerpoint file with embeded powerpoint files
-     */
-    @SuppressWarnings("unused")
-    @Test
-    public void testExtractFromOwnEmbeded() throws Exception {
-        String path = "ppt_with_embeded.ppt";
-        ppe.close();
-        ppe = new PowerPointExtractor(POIDataSamples.getSlideShowInstance().openResourceAsStream(path));
-        List<OLEShape> shapes = ppe.getOLEShapes();
-        assertEquals("Expected 6 ole shapes in " + path, 6, shapes.size());
-        int num_ppt = 0, num_doc = 0, num_xls = 0;
-        for (OLEShape ole : shapes) {
-            String name = ole.getInstanceName();
-            InputStream data = ole.getObjectData().getData();
-            if ("Worksheet".equals(name)) {
-                HSSFWorkbook wb = new HSSFWorkbook(data);
-                num_xls++;
-                wb.close();
-            } else if ("Document".equals(name)) {
-                HWPFDocument doc = new HWPFDocument(data);
-                num_doc++;
-            } else if ("Presentation".equals(name)) {
-                num_ppt++;
-                HSLFSlideShow ppt = new HSLFSlideShow(data);
-                ppt.close();
-            }
-            data.close();
-        }
-        assertEquals("Expected 2 embedded Word Documents", 2, num_doc);
-        assertEquals("Expected 2 embedded Excel Spreadsheets", 2, num_xls);
-        assertEquals("Expected 2 embedded PowerPoint Presentations", 2, num_ppt);
-    }
-
-    /**
-     * A powerpoint file with embeded powerpoint files
-     */
-    @Test
-    public void test52991() throws Exception {
-        String path = "badzip.ppt";
-        ppe.close();
-        ppe = new PowerPointExtractor(POIDataSamples.getSlideShowInstance().openResourceAsStream(path));
-        List<OLEShape> shapes = ppe.getOLEShapes();
-
-        for (OLEShape shape : shapes) {
-            IOUtils.copy(shape.getObjectData().getData(), new ByteArrayOutputStream());
-        }
-    }
-
-    /**
-     * From bug #45543
-     */
-    @Test
-    public void testWithComments() throws Exception {
-        ppe.close();
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("WithComments.ppt"));
-
-        String text = ppe.getText();
-        assertFalse("Comments not in by default", text.contains("This is a test comment"));
-
-        ppe.setCommentsByDefault(true);
-
-        text = ppe.getText();
-        assertContains(text, "This is a test comment");
-
-
-        // And another file
-        ppe.close();
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("45543.ppt"));
-
-        text = ppe.getText();
-        assertFalse("Comments not in by default", text.contains("testdoc"));
-
-        ppe.setCommentsByDefault(true);
-
-        text = ppe.getText();
-        assertContains(text, "testdoc");
-    }
-
-    /**
-     * From bug #45537
-     */
-    @Test
-    public void testHeaderFooter() throws Exception {
-        String text;
-
-        // With a header on the notes
-        HSLFSlideShowImpl hslf = new HSLFSlideShowImpl(slTests.openResourceAsStream("45537_Header.ppt"));
-        HSLFSlideShow ss = new HSLFSlideShow(hslf);
-        assertNotNull(ss.getNotesHeadersFooters());
-        assertEquals("testdoc test phrase", ss.getNotesHeadersFooters().getHeaderText());
-        ppe.close();
-
-        ppe = new PowerPointExtractor(hslf);
-
-        text = ppe.getText();
-        assertFalse("Header shouldn't be there by default\n" + text, text.contains("testdoc"));
-        assertFalse("Header shouldn't be there by default\n" + text, text.contains("test phrase"));
-
-        ppe.setNotesByDefault(true);
-        text = ppe.getText();
-        assertContains(text, "testdoc");
-        assertContains(text, "test phrase");
-        ss.close();
-
-        // And with a footer, also on notes
-        hslf = new HSLFSlideShowImpl(slTests.openResourceAsStream("45537_Footer.ppt"));
-        ss = new HSLFSlideShow(hslf);
-        assertNotNull(ss.getNotesHeadersFooters());
-        assertEquals("testdoc test phrase", ss.getNotesHeadersFooters().getFooterText());
-        ppe.close();
-
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("45537_Footer.ppt"));
-
-        text = ppe.getText();
-        assertFalse("Header shouldn't be there by default\n" + text, text.contains("testdoc"));
-        assertFalse("Header shouldn't be there by default\n" + text, text.contains("test phrase"));
-
-        ppe.setNotesByDefault(true);
-        text = ppe.getText();
-        assertContains(text, "testdoc");
-        assertContains(text, "test phrase");
-    }
-
-    @SuppressWarnings("unused")
-    @Test
-    public void testSlideMasterText() throws Exception {
-        String masterTitleText = "This is the Master Title";
-        String masterRandomText = "This text comes from the Master Slide";
-        String masterFooterText = "Footer from the master slide";
-        HSLFSlideShowImpl hslf = new HSLFSlideShowImpl(slTests.openResourceAsStream("WithMaster.ppt"));
-        ppe.close();
-
-        ppe = new PowerPointExtractor(hslf);
-
-        String text = ppe.getText();
-        //assertContains(text, masterTitleText); // TODO Is this available in PPT?
-        //assertContains(text, masterRandomText); // TODO Extract
-        assertContains(text, masterFooterText);
-    }
-
-    @Test
-    public void testMasterText() throws Exception {
-        ppe.close();
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("master_text.ppt"));
-
-        // Initially not there
-        String text = ppe.getText();
-        assertFalse(text.contains("Text that I added to the master slide"));
-
-        // Enable, shows up
-        ppe.setMasterByDefault(true);
-        text = ppe.getText();
-        assertTrue(text.contains("Text that I added to the master slide"));
-
-        // Make sure placeholder text does not come out
-        assertFalse(text.contains("Click to edit Master"));
-
-        // Now with another file only containing master text
-        // Will always show up
-        String masterText = "Footer from the master slide";
-        HSLFSlideShowImpl hslf = new HSLFSlideShowImpl(slTests.openResourceAsStream("WithMaster.ppt"));
-        ppe.close();
-
-        ppe = new PowerPointExtractor(hslf);
-
-        text = ppe.getText();
-        assertContainsIgnoreCase(text, "master");
-        assertContains(text, masterText);
-    }
-
-    /**
-     * Bug #54880 Chinese text not extracted properly
-     */
-    @Test
-    public void testChineseText() throws Exception {
-        HSLFSlideShowImpl hslf = new HSLFSlideShowImpl(slTests.openResourceAsStream("54880_chinese.ppt"));
-        ppe.close();
-        ppe = new PowerPointExtractor(hslf);
-
-        String text = ppe.getText();
-
-        // Check for the english text line
-        assertContains(text, "Single byte");
-
-        // Check for the english text in the mixed line
-        assertContains(text, "Mix");
-
-        // Check for the chinese text in the mixed line
-        assertContains(text, "\u8868");
-
-        // Check for the chinese only text line
-        assertContains(text, "\uff8a\uff9d\uff76\uff78");
-    }
-
-    /**
-     * Tests that we can work with both {@link POIFSFileSystem}
-     * and {@link NPOIFSFileSystem}
-     */
-    @SuppressWarnings("resource")
-    @Test
-    public void testDifferentPOIFS() throws Exception {
-        // Open the two filesystems
-        DirectoryNode[] files = new DirectoryNode[2];
-        files[0] = (new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"))).getRoot();
-        NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem(slTests.getFile("basic_test_ppt_file.ppt"));
-        files[1] = npoifsFileSystem.getRoot();
-
-        // Open directly
-        for (DirectoryNode dir : files) {
-            PowerPointExtractor extractor = new PowerPointExtractor(dir);
-            assertEquals(expectText, extractor.getText());
-        }
-
-        // Open via a HWPFDocument
-        for (DirectoryNode dir : files) {
-            HSLFSlideShowImpl slideshow = new HSLFSlideShowImpl(dir);
-            PowerPointExtractor extractor = new PowerPointExtractor(slideshow);
-            assertEquals(expectText, extractor.getText());
-        }
-
-        npoifsFileSystem.close();
-    }
-
-    @Test
-    public void testTable() throws Exception {
-//        ppe = new PowerPointExtractor(slTests.openResourceAsStream("54111.ppt"));
-//        String text = ppe.getText();
-//        String target = "TH Cell 1\tTH Cell 2\tTH Cell 3\tTH Cell 4\n"+
-//                         "Row 1, Cell 1\tRow 1, Cell 2\tRow 1, Cell 3\tRow 1, Cell 4\n"+   
-//                         "Row 2, Cell 1\tRow 2, Cell 2\tRow 2, Cell 3\tRow 2, Cell 4\n"+
-//                         "Row 3, Cell 1\tRow 3, Cell 2\tRow 3, Cell 3\tRow 3, Cell 4\n"+
-//                         "Row 4, Cell 1\tRow 4, Cell 2\tRow 4, Cell 3\tRow 4, Cell 4\n"+ 
-//                         "Row 5, Cell 1\tRow 5, Cell 2\tRow 5, Cell 3\tRow 5, Cell 4\n";
-//        assertTrue(text.contains(target));
-        ppe.close();
-
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("54722.ppt"));
-        String text = ppe.getText();
-
-        String target = "this\tText\tis\twithin\ta\n" +
-                "table\t1\t2\t3\t4";
-        assertTrue(text.contains(target));
-    }
-
-    // bug 60003
-    @Test
-    public void testExtractMasterSlideFooterText() throws Exception {
-        HSLFSlideShowImpl hslf = new HSLFSlideShowImpl(slTests.openResourceAsStream("60003.ppt"));
-        ppe.close();
-
-        ppe = new PowerPointExtractor(hslf);
-        ppe.setMasterByDefault(true);
-
-        String text = ppe.getText();
-        assertContains(text, "Prague");
-        hslf.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java
deleted file mode 100644
index 14301af..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests from the package <tt>org.apache.poi.hslf.model</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestBackground.class,
-    TestFreeform.class,
-    TestHeadersFooters.class,
-    TestHyperlink.class,
-    TestLine.class,
-    TestMovieShape.class,
-    TestOleEmbedding.class,
-    TestPPFont.class,
-    TestPPGraphics2D.class,
-    TestSetBoldItalic.class,
-    TestShapes.class,
-    TestSheet.class,
-    TestSlideChangeNotes.class,
-    TestSlideMaster.class,
-    TestSlides.class,
-    TestTable.class,
-    TestTextRunReWrite.class
-})
-public class AllHSLFModelTests {
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
deleted file mode 100644
index f8b4bcc..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.hslf.usermodel.HSLFAutoShape;
-import org.apache.poi.hslf.usermodel.HSLFFill;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSheet;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.junit.Test;
-
-
-/**
- * Test <code>Fill</code> object.
- *
- * @author Yegor Kozlov
- */
-public final class TestBackground {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    /**
-     * Default background for slide, shape and slide master.
-     */
-    @Test
-    public void defaults() {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        assertEquals(HSLFFill.FILL_SOLID, ppt.getSlideMasters().get(0).getBackground().getFill().getFillType());
-
-        HSLFSlide slide = ppt.createSlide();
-        assertTrue(slide.getFollowMasterBackground());
-        assertEquals(HSLFFill.FILL_SOLID, slide.getBackground().getFill().getFillType());
-
-        HSLFShape shape = new HSLFAutoShape(ShapeType.RECT);
-        assertEquals(HSLFFill.FILL_SOLID, shape.getFill().getFillType());
-    }
-
-    /**
-     * Read fill information from an reference ppt file
-     */
-    @Test
-    public void readBackground() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("backgrounds.ppt"));
-        HSLFFill fill;
-        HSLFShape shape;
-
-        List<HSLFSlide> slide = ppt.getSlides();
-
-        fill = slide.get(0).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_PICTURE, fill.getFillType());
-        shape = slide.get(0).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_SOLID, shape.getFill().getFillType());
-
-        fill = slide.get(1).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_PATTERN, fill.getFillType());
-        shape = slide.get(1).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_BACKGROUND, shape.getFill().getFillType());
-
-        fill = slide.get(2).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_TEXTURE, fill.getFillType());
-        shape = slide.get(2).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_PICTURE, shape.getFill().getFillType());
-
-        fill = slide.get(3).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_SHADE_CENTER, fill.getFillType());
-        shape = slide.get(3).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_SHADE, shape.getFill().getFillType());
-    }
-
-    /**
-     * Create a ppt with various fill effects
-     */
-    @Test
-    public void backgroundPicture() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide;
-        HSLFFill fill;
-        HSLFShape shape;
-        HSLFPictureData data;
-
-        //slide 1
-        slide = ppt.createSlide();
-        slide.setFollowMasterBackground(false);
-        fill = slide.getBackground().getFill();
-        data = ppt.addPicture(_slTests.readFile("tomcat.png"), PictureType.PNG);
-        fill.setFillType(HSLFFill.FILL_PICTURE);
-        fill.setPictureData(data);
-
-        shape = new HSLFAutoShape(ShapeType.RECT);
-        shape.setAnchor(new java.awt.Rectangle(100, 100, 200, 200));
-        fill = shape.getFill();
-        fill.setFillType(HSLFFill.FILL_SOLID);
-        slide.addShape(shape);
-
-        //slide 2
-        slide = ppt.createSlide();
-        slide.setFollowMasterBackground(false);
-        fill = slide.getBackground().getFill();
-        data = ppt.addPicture(_slTests.readFile("tomcat.png"), PictureType.PNG);
-        fill.setFillType(HSLFFill.FILL_PATTERN);
-        fill.setPictureData(data);
-        fill.setBackgroundColor(Color.green);
-        fill.setForegroundColor(Color.red);
-
-        shape = new HSLFAutoShape(ShapeType.RECT);
-        shape.setAnchor(new java.awt.Rectangle(100, 100, 200, 200));
-        fill = shape.getFill();
-        fill.setFillType(HSLFFill.FILL_BACKGROUND);
-        slide.addShape(shape);
-
-        //slide 3
-        slide = ppt.createSlide();
-        slide.setFollowMasterBackground(false);
-        fill = slide.getBackground().getFill();
-        data = ppt.addPicture(_slTests.readFile("tomcat.png"), PictureType.PNG);
-        fill.setFillType(HSLFFill.FILL_TEXTURE);
-        fill.setPictureData(data);
-
-        shape = new HSLFAutoShape(ShapeType.RECT);
-        shape.setAnchor(new java.awt.Rectangle(100, 100, 200, 200));
-        fill = shape.getFill();
-        fill.setFillType(HSLFFill.FILL_PICTURE);
-        data = ppt.addPicture(_slTests.readFile("clock.jpg"), PictureType.JPEG);
-        fill.setPictureData(data);
-        slide.addShape(shape);
-
-        // slide 4
-        slide = ppt.createSlide();
-        slide.setFollowMasterBackground(false);
-        fill = slide.getBackground().getFill();
-        fill.setFillType(HSLFFill.FILL_SHADE_CENTER);
-        fill.setBackgroundColor(Color.white);
-        fill.setForegroundColor(Color.darkGray);
-
-        shape = new HSLFAutoShape(ShapeType.RECT);
-        shape.setAnchor(new java.awt.Rectangle(100, 100, 200, 200));
-        fill = shape.getFill();
-        fill.setFillType(HSLFFill.FILL_SHADE);
-        fill.setBackgroundColor(Color.red);
-        fill.setForegroundColor(Color.green);
-        slide.addShape(shape);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        List<HSLFSlide> slides = ppt.getSlides();
-
-        fill = slides.get(0).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_PICTURE, fill.getFillType());
-        assertEquals(3, getFillPictureRefCount(slides.get(0).getBackground(), fill));
-        shape = slides.get(0).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_SOLID, shape.getFill().getFillType());
-
-        fill = slides.get(1).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_PATTERN, fill.getFillType());
-        shape = slides.get(1).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_BACKGROUND, shape.getFill().getFillType());
-
-        fill = slides.get(2).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_TEXTURE, fill.getFillType());
-        assertEquals(3, getFillPictureRefCount(slides.get(2).getBackground(), fill));
-        shape = slides.get(2).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_PICTURE, shape.getFill().getFillType());
-        assertEquals(1, getFillPictureRefCount(shape, fill));
-
-        fill = slides.get(3).getBackground().getFill();
-        assertEquals(HSLFFill.FILL_SHADE_CENTER, fill.getFillType());
-        shape = slides.get(3).getShapes().get(0);
-        assertEquals(HSLFFill.FILL_SHADE, shape.getFill().getFillType());
-    }
-
-    private int getFillPictureRefCount(HSLFShape shape, HSLFFill fill) {
-        AbstractEscherOptRecord opt = shape.getEscherOptRecord();
-        EscherSimpleProperty p = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__PATTERNTEXTURE);
-        if(p != null) {
-            int idx = p.getPropertyValue();
-
-            HSLFSheet sheet = shape.getSheet();
-            HSLFSlideShow ppt = sheet.getSlideShow();
-            Document doc = ppt.getDocumentRecord();
-            EscherContainerRecord dggContainer = doc.getPPDrawingGroup().getDggContainer();
-            EscherContainerRecord bstore = HSLFShape.getEscherChild(dggContainer, EscherContainerRecord.BSTORE_CONTAINER);
-            List<EscherRecord> lst = bstore.getChildRecords();
-            return ((EscherBSERecord)lst.get(idx-1)).getRef();
-        }
-        return 0;
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java
deleted file mode 100644
index 91d2366..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.geom.Area;
-import java.awt.geom.Line2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-
-import org.apache.poi.hslf.usermodel.HSLFFreeformShape;
-import org.junit.Test;
-
-/**
- * Test Freeform object.
- * The Freeform shape is constructed from java.awt.GeneralPath.
- * Check that the get/set path accessors are consistent.
- * (TODO: verification of Bezier curves is more difficult due to rounding error.  Figure out a test approach for that)
- *
- * @author Yegor Kozlov
- */
-public final class TestFreeform {
-
-    @Test
-    public void testClosedPath() {
-
-        Path2D.Double path1 = new Path2D.Double();
-        path1.moveTo(100, 100);
-        path1.lineTo(200, 100);
-        path1.lineTo(200, 200);
-        path1.lineTo(100, 200);
-        path1.closePath();
-
-        HSLFFreeformShape p = new HSLFFreeformShape();
-        p.setPath(path1);
-
-        java.awt.Shape path2 = p.getPath();
-        assertTrue(new Area(path1).equals(new Area(path2)));
-    }
-
-    @Test
-    public void testLine() {
-
-        Path2D.Double path1 = new Path2D.Double(new Line2D.Double(100, 100, 200, 100));
-
-        HSLFFreeformShape p = new HSLFFreeformShape();
-        p.setPath(path1);
-
-        java.awt.Shape path2 = p.getPath();
-        assertTrue(new Area(path1).equals(new Area(path2)));
-    }
-
-    @Test
-    public void testRectangle() {
-
-        Path2D.Double path1 = new Path2D.Double(new Rectangle2D.Double(100, 100, 200, 50));
-
-        HSLFFreeformShape p = new HSLFFreeformShape();
-        p.setPath(path1);
-
-        java.awt.Shape path2 = p.getPath();
-        assertTrue(new Area(path1).equals(new Area(path2)));
-   }
-
-    /**
-     * Avoid NPE in  Freeform.getOutline() if either GEOMETRY__VERTICES or
-     * GEOMETRY__SEGMENTINFO is missing, see Bugzilla 54188
-     */
-    @Test
-    public void test54188() {
-
-        HSLFFreeformShape p = new HSLFFreeformShape();
-        Path2D.Double path = p.getPath();
-        Path2D.Double emptyPath = new Path2D.Double();
-        assertEquals(emptyPath.getBounds2D(), path.getBounds2D());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
deleted file mode 100644
index 333b7a8..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.HSLFTestDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.junit.Test;
-
-/**
- * Test {@link org.apache.poi.hslf.model.HeadersFooters} object
- */
-public final class TestHeadersFooters
-{
-
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void testRead() throws IOException {
-        InputStream is = _slTests.openResourceAsStream("headers_footers.ppt");
-        HSLFSlideShow ppt = new HSLFSlideShow(is);
-        is.close();
-
-        HeadersFooters slideHdd = ppt.getSlideHeadersFooters();
-        assertTrue(slideHdd.isFooterVisible());
-        assertEquals("Global Slide Footer", slideHdd.getFooterText());
-        assertTrue(slideHdd.isSlideNumberVisible());
-        assertFalse(slideHdd.isHeaderVisible());
-        assertNull(slideHdd.getHeaderText());
-        assertFalse(slideHdd.isUserDateVisible());
-        assertNull(slideHdd.getDateTimeText());
-
-
-        HeadersFooters notesHdd = ppt.getNotesHeadersFooters();
-        assertTrue(notesHdd.isFooterVisible());
-        assertEquals("Notes Footer", notesHdd.getFooterText());
-        assertTrue(notesHdd.isHeaderVisible());
-        assertEquals("Notes Header", notesHdd.getHeaderText());
-        assertTrue(notesHdd.isUserDateVisible());
-        assertNull(notesHdd.getDateTimeText());
-
-        List<HSLFSlide> slide = ppt.getSlides();
-        //the first slide uses presentation-scope headers / footers
-        HeadersFooters hd1 = slide.get(0).getHeadersFooters();
-        assertEquals(slideHdd.isFooterVisible(), hd1.isFooterVisible());
-        assertEquals(slideHdd.getFooterText(), hd1.getFooterText());
-        assertEquals(slideHdd.isSlideNumberVisible(), hd1.isSlideNumberVisible());
-        assertEquals(slideHdd.isHeaderVisible(), hd1.isHeaderVisible());
-        assertEquals(slideHdd.getHeaderText(), hd1.getHeaderText());
-        assertEquals(slideHdd.isUserDateVisible(), hd1.isUserDateVisible());
-        assertEquals(slideHdd.getDateTimeText(), hd1.getDateTimeText());
-
-        //the first slide uses per-slide headers / footers
-        HeadersFooters hd2 = slide.get(1).getHeadersFooters();
-        assertEquals(true, hd2.isFooterVisible());
-        assertEquals("per-slide footer", hd2.getFooterText());
-        assertEquals(true, hd2.isUserDateVisible());
-        assertEquals("custom date format", hd2.getDateTimeText());
-
-        ppt.close();
-    }
-
-    /**
-     * If Headers / Footers are not set, all the getters should return <code>false</code> or <code>null</code>
-     */
-    @Test
-    public void testReadNoHeadersFooters() throws Exception {
-        InputStream is = _slTests.openResourceAsStream("basic_test_ppt_file.ppt");
-        HSLFSlideShow ppt = new HSLFSlideShow(is);
-        is.close();
-
-        HeadersFooters slideHdd = ppt.getSlideHeadersFooters();
-        assertFalse(slideHdd.isFooterVisible());
-        assertNull(slideHdd.getFooterText());
-        assertFalse(slideHdd.isSlideNumberVisible());
-        assertFalse(slideHdd.isHeaderVisible());
-        assertNull(slideHdd.getHeaderText());
-        assertFalse(slideHdd.isUserDateVisible());
-        assertNull(slideHdd.getDateTimeText());
-
-
-        HeadersFooters notesHdd = ppt.getNotesHeadersFooters();
-        assertFalse(notesHdd.isFooterVisible());
-        assertNull(notesHdd.getFooterText());
-        assertFalse(notesHdd.isHeaderVisible());
-        assertNull(notesHdd.getHeaderText());
-        assertFalse(notesHdd.isUserDateVisible());
-        assertNull(notesHdd.getDateTimeText());
-
-        for(HSLFSlide s : ppt.getSlides()) {
-            HeadersFooters hd1 = s.getHeadersFooters();
-            assertFalse(hd1.isFooterVisible());
-            assertNull(hd1.getFooterText());
-            assertFalse(hd1.isHeaderVisible());
-            assertNull(hd1.getHeaderText());
-            assertFalse(hd1.isUserDateVisible());
-            assertNull(hd1.getDateTimeText());
-        }
-        
-        ppt.close();
-    }
-
-    /**
-     * Test extraction of headers / footers from PPTs saved in Office 2007
-     */
-    @Test
-    public void testRead2007() throws IOException {
-        InputStream is = _slTests.openResourceAsStream("headers_footers_2007.ppt");
-        HSLFSlideShow ppt = new HSLFSlideShow(is);
-        is.close();
-
-        HeadersFooters slideHdd = ppt.getSlideHeadersFooters();
-        assertTrue(slideHdd.isFooterVisible());
-        assertEquals("THE FOOTER TEXT", slideHdd.getFooterText());
-        assertTrue(slideHdd.isSlideNumberVisible());
-        assertFalse(slideHdd.isHeaderVisible());
-        assertNull(slideHdd.getHeaderText());
-        assertTrue(slideHdd.isUserDateVisible());
-        assertEquals("Wednesday, August 06, 2008", slideHdd.getDateTimeText());
-
-
-        HeadersFooters notesHdd = ppt.getNotesHeadersFooters();
-        assertTrue(notesHdd.isFooterVisible());
-        assertEquals("THE NOTES FOOTER TEXT", notesHdd.getFooterText());
-        assertTrue(notesHdd.isHeaderVisible());
-        assertEquals("THE NOTES HEADER TEXT", notesHdd.getHeaderText());
-        assertTrue(notesHdd.isUserDateVisible());
-        assertTrue(notesHdd.isDateTimeVisible());
-        //TODO: depending on the formatId getDateTimeText() should return formatted date
-        //assertEquals("08/12/08", notesHdd.getDateTimeText());
-
-        //per-slide headers / footers
-        List<HSLFSlide> slide = ppt.getSlides();
-        //the first slide uses presentation-scope headers / footers
-        HeadersFooters hd1 = slide.get(0).getHeadersFooters();
-        assertTrue(hd1.isFooterVisible());
-        assertEquals("THE FOOTER TEXT", hd1.getFooterText());
-        assertTrue(hd1.isSlideNumberVisible());
-        assertFalse(hd1.isHeaderVisible());
-        assertNull(hd1.getHeaderText());
-        assertTrue(hd1.isUserDateVisible());
-        assertTrue(hd1.isDateTimeVisible());
-        assertEquals("Wednesday, August 06, 2008", hd1.getDateTimeText());
-
-        //the second slide uses custom per-slide headers / footers
-        HeadersFooters hd2 = slide.get(1).getHeadersFooters();
-        assertTrue(hd2.isFooterVisible());
-        assertEquals("THE FOOTER TEXT FOR SLIDE 2", hd2.getFooterText());
-        assertTrue(hd2.isSlideNumberVisible());
-        assertFalse(hd2.isHeaderVisible());
-        assertNull(hd2.getHeaderText());
-        assertTrue(hd2.isUserDateVisible());
-        assertTrue(hd2.isDateTimeVisible());
-        assertEquals("August 06, 2008", hd2.getDateTimeText());
-
-        //the third slide uses per-slide headers / footers
-        HeadersFooters hd3 = slide.get(2).getHeadersFooters();
-        assertTrue(hd3.isFooterVisible());
-        assertEquals("THE FOOTER TEXT", hd3.getFooterText());
-        assertTrue(hd3.isSlideNumberVisible());
-        assertFalse(hd3.isHeaderVisible());
-        assertNull(hd3.getHeaderText());
-        assertTrue(hd3.isUserDateVisible());
-        assertTrue(hd3.isDateTimeVisible());
-        assertEquals("Wednesday, August 06, 2008", hd3.getDateTimeText());
-
-        ppt.close();
-    }
-
-    @Test
-    public void testCreateSlideFooters() throws IOException {
-        HSLFSlideShow ppt1 = new HSLFSlideShow();
-        HeadersFooters hdd = ppt1.getSlideHeadersFooters();
-        hdd.setFootersText("My slide footer");
-        hdd.setSlideNumberVisible(true);
-
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        HeadersFooters hdd2 = ppt2.getSlideHeadersFooters();
-        assertTrue(hdd2.isSlideNumberVisible());
-        assertTrue(hdd2.isFooterVisible());
-        assertEquals("My slide footer", hdd2.getFooterText());
-        
-        ppt2.close();
-        ppt1.close();
-    }
-
-    @Test
-    public void testCreateNotesFooters() throws IOException {
-        HSLFSlideShow ppt1 = new HSLFSlideShow();
-        HeadersFooters hdd = ppt1.getNotesHeadersFooters();
-        hdd.setFootersText("My notes footer");
-        hdd.setHeaderText("My notes header");
-        hdd.setSlideNumberVisible(true);
-
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        HeadersFooters hdd2 = ppt2.getNotesHeadersFooters();
-        assertTrue(hdd2.isSlideNumberVisible());
-        assertTrue(hdd2.isFooterVisible());
-        assertEquals("My notes footer", hdd2.getFooterText());
-        assertTrue(hdd2.isHeaderVisible());
-        assertEquals("My notes header", hdd2.getHeaderText());
-        
-        ppt2.close();
-        ppt1.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
deleted file mode 100644
index 7aeb42c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.apache.poi.hslf.usermodel.HSLFTextParagraph.getRawText;
-import static org.apache.poi.hslf.usermodel.HSLFTextParagraph.toExternalString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hslf.HSLFTestDataSamples;
-import org.apache.poi.hslf.record.InteractiveInfoAtom;
-import org.apache.poi.hslf.usermodel.HSLFHyperlink;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextBox;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-import org.apache.poi.sl.usermodel.Hyperlink;
-import org.junit.Test;
-
-/**
- * Test Hyperlink.
- */
-public final class TestHyperlink {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void testTextRunHyperlinks() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("WithLinks.ppt"));
-
-        HSLFSlide slide = ppt.getSlides().get(0);
-        List<HSLFTextParagraph> para = slide.getTextParagraphs().get(1);
-
-        String rawText = toExternalString(getRawText(para), para.get(0).getRunType());
-        String expected =
-            "This page has two links:\n"+
-            "http://jakarta.apache.org/poi/\n"+
-            "\n"+
-            "http://slashdot.org/\n"+
-            "\n"+
-            "In addition, its notes has one link";
-        assertEquals(expected, rawText);
-
-        List<HSLFHyperlink> links = findHyperlinks(para);
-        assertEquals(2, links.size());
-
-        assertEquals("http://jakarta.apache.org/poi/", links.get(0).getLabel());
-        assertEquals("http://jakarta.apache.org/poi/", links.get(0).getAddress());
-        assertEquals("http://jakarta.apache.org/poi/", rawText.substring(links.get(0).getStartIndex(), links.get(0).getEndIndex()-1));
-
-        assertEquals("http://slashdot.org/", links.get(1).getLabel());
-        assertEquals("http://slashdot.org/", links.get(1).getAddress());
-        assertEquals("http://slashdot.org/", rawText.substring(links.get(1).getStartIndex(), links.get(1).getEndIndex()-1));
-
-        slide = ppt.getSlides().get(1);
-        para = slide.getTextParagraphs().get(1);
-        rawText = toExternalString(getRawText(para), para.get(0).getRunType());
-        expected =
-            "I have the one link:\n" +
-            "Jakarta HSSF";
-        assertEquals(expected, rawText);
-
-        links.clear();
-
-        links = findHyperlinks(para);
-        assertNotNull(links);
-        assertEquals(1, links.size());
-
-        assertEquals("Open Jakarta POI HSSF module test  ", links.get(0).getLabel());
-        assertEquals("http://jakarta.apache.org/poi/hssf/", links.get(0).getAddress());
-        assertEquals("Jakarta HSSF", rawText.substring(links.get(0).getStartIndex(), links.get(0).getEndIndex()-1));
-        
-        ppt.close();
-    }
-
-    @Test
-    public void bug47291() throws IOException {
-        HSLFSlideShow ppt1 = new HSLFSlideShow();
-        HSLFSlide slide1 = ppt1.createSlide();
-        HSLFTextRun r1 = slide1.createTextBox().setText("page1");
-        HSLFHyperlink hl1 = r1.createHyperlink();
-        hl1.linkToEmail("dev@poi.apache.org");
-        HSLFTextRun r2 = ppt1.createSlide().createTextBox().setText("page2");
-        HSLFHyperlink hl2 = r2.createHyperlink();
-        hl2.linkToLastSlide();
-        HSLFSlide sl1 = ppt1.createSlide();
-        HSLFTextBox tb1 = sl1.createTextBox();
-        tb1.setAnchor(new Rectangle2D.Double(100,100,100,100));
-        tb1.appendText("text1 ", false);
-        HSLFTextRun r3 = tb1.appendText("lin\u000bk", false);
-        tb1.appendText(" text2", false);
-        HSLFHyperlink hl3 = r3.createHyperlink();
-        hl3.linkToSlide(slide1);
-        HSLFTextRun r4 = ppt1.createSlide().createTextBox().setText("page4");
-        HSLFHyperlink hl4 = r4.createHyperlink();
-        hl4.linkToUrl("http://poi.apache.org");
-        HSLFTextBox tb5 = ppt1.createSlide().createTextBox();
-        tb5.setText("page5");
-        HSLFHyperlink hl5 = tb5.createHyperlink();
-        hl5.linkToFirstSlide();
-
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-
-        List<HSLFSlide> slides = ppt2.getSlides();
-        tb1 = (HSLFTextBox)slides.get(0).getShapes().get(0);
-        hl1 = tb1.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(hl1);
-        assertEquals("dev@poi.apache.org", hl1.getLabel());
-        assertEquals(HyperlinkType.EMAIL, hl1.getTypeEnum());
-
-        HSLFTextBox tb2 = (HSLFTextBox)slides.get(1).getShapes().get(0);
-        hl2 = tb2.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(hl2);
-        assertEquals(InteractiveInfoAtom.LINK_LastSlide, hl2.getInfo().getInteractiveInfoAtom().getHyperlinkType());
-        assertEquals(HyperlinkType.DOCUMENT, hl2.getTypeEnum());
-
-        HSLFTextBox tb3 = (HSLFTextBox)slides.get(2).getShapes().get(0);
-        hl3 = tb3.getTextParagraphs().get(0).getTextRuns().get(1).getHyperlink();
-        assertNotNull(hl3);
-        assertEquals(ppt2.getSlides().get(0)._getSheetNumber(), Integer.parseInt(hl3.getAddress().split(",")[0]));
-        assertEquals(HyperlinkType.DOCUMENT, hl3.getTypeEnum());
-
-        HSLFTextBox tb4 = (HSLFTextBox)slides.get(3).getShapes().get(0);
-        hl4 = tb4.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink();
-        assertNotNull(hl4);
-        assertEquals("http://poi.apache.org", hl4.getLabel());
-        assertEquals(HyperlinkType.URL, hl4.getTypeEnum());
-
-        tb5 = (HSLFTextBox)slides.get(4).getShapes().get(0);
-        hl5 = tb5.getHyperlink();
-        assertNotNull(hl5);
-        assertEquals(InteractiveInfoAtom.LINK_FirstSlide, hl5.getInfo().getInteractiveInfoAtom().getHyperlinkType());
-        assertEquals(HyperlinkType.DOCUMENT, hl5.getTypeEnum());
-        
-        ppt2.close();
-    }
-    
-    private static List<HSLFHyperlink> findHyperlinks(List<HSLFTextParagraph> paras) {
-        List<HSLFHyperlink> links = new ArrayList<HSLFHyperlink>();
-        for (HSLFTextParagraph p : paras) {
-            for (HSLFTextRun r : p) {
-                HSLFHyperlink hl = r.getHyperlink();
-                if (hl != null) {
-                    links.add(hl);
-                }
-            }
-        }
-        return links;
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
deleted file mode 100644
index c601ca0..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import java.awt.Color;
-
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFLine;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.junit.Test;
-
-/**
- * Test Line shape.
- *
- * @author Yegor Kozlov
- */
-public final class TestLine {
-
-    @Test
-    public void testCreateLines() {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-
-        slide.addTitle().setText("Lines tester");
-
-        HSLFLine line;
-
-        /**
-         * line styles
-         */
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 200, 300, 0));
-        line.setLineCompound(LineCompound.SINGLE);
-        line.setLineColor(Color.blue);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 230, 300, 0));
-        line.setLineCompound(LineCompound.DOUBLE);
-        line.setLineWidth(3.5);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 260, 300, 0));
-        line.setLineCompound(LineCompound.TRIPLE);
-        line.setLineWidth(6);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 290, 300, 0));
-        line.setLineCompound(LineCompound.THICK_THIN);
-        line.setLineWidth(4.5);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 320, 300, 0));
-        line.setLineCompound(LineCompound.THIN_THICK);
-        line.setLineWidth(5.5);
-        slide.addShape(line);
-
-        /**
-         * line dashing
-         */
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(450, 200, 300, 0));
-        line.setLineDash(LineDash.SOLID);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(450, 230, 300, 0));
-        line.setLineDash(LineDash.DASH);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(450, 260, 300, 0));
-        line.setLineDash(LineDash.DOT);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(450, 290, 300, 0));
-        line.setLineDash(LineDash.DASH_DOT);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(450, 320, 300, 0));
-        line.setLineDash(LineDash.LG_DASH_DOT_DOT);
-        slide.addShape(line);
-
-        /**
-         * Combinations
-         */
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 400, 300, 0));
-        line.setLineDash(LineDash.DASH_DOT);
-        line.setLineCompound(LineCompound.TRIPLE);
-        line.setLineWidth(5.0);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 430, 300, 0));
-        line.setLineDash(LineDash.DASH);
-        line.setLineCompound(LineCompound.THICK_THIN);
-        line.setLineWidth(4.0);
-        slide.addShape(line);
-
-        line = new HSLFLine();
-        line.setAnchor(new java.awt.Rectangle(75, 460, 300, 0));
-        line.setLineDash(LineDash.DOT);
-        line.setLineCompound(LineCompound.DOUBLE);
-        line.setLineWidth(8.0);
-        slide.addShape(line);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
deleted file mode 100644
index 7e96707..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.junit.Test;
-
-/**
- * Test <code>MovieShape</code> object.
- */
-public final class TestMovieShape {
-
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void testCreate() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-
-        String path = "/test-movie.mpg";
-        int movieIdx = ppt.addMovie(path, MovieShape.MOVIE_MPEG);
-        HSLFPictureData thumbnailData = ppt.addPicture(_slTests.readFile("tomcat.png"), PictureType.PNG);
-
-        MovieShape shape = new MovieShape(movieIdx, thumbnailData);
-        shape.setAnchor(new Rectangle2D.Double(300,225,120,90));
-        slide.addShape(shape);
-
-        assertEquals(path, shape.getPath());
-        assertTrue(shape.isAutoPlay());
-        shape.setAutoPlay(false);
-        assertFalse(shape.isAutoPlay());
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-
-        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        slide = ppt.getSlides().get(0);
-        shape = (MovieShape)slide.getShapes().get(0);
-        assertEquals(path, shape.getPath());
-        assertFalse(shape.isAutoPlay());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
deleted file mode 100644
index e3c7390..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFObjectData;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.util.IOUtils;
-import org.junit.Test;
-
-public final class TestOleEmbedding {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-    /**
-     * Tests support for OLE objects.
-     *
-     * @throws Exception if an error occurs.
-     */
-    @Test
-    public void testOleEmbedding2003() throws IOException {
-        HSLFSlideShowImpl slideShow = new HSLFSlideShowImpl(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
-        // Placeholder EMFs for clients that don't support the OLE components.
-        List<HSLFPictureData> pictures = slideShow.getPictureData();
-        assertEquals("Should be two pictures", 2, pictures.size());
-        
-        long checkSums[] = { 0xD37A4204l, 0x26A62F68l, 0x82853169l, 0xE0E45D2Bl };
-        int checkId = 0;
-        
-        // check for checksum to be uptodate
-        for (HSLFPictureData pd : pictures) {
-            long checkEMF = IOUtils.calculateChecksum(pd.getData());
-            assertEquals(checkSums[checkId++], checkEMF);
-        }
-
-        // Actual embedded objects.
-        HSLFObjectData[] objects = slideShow.getEmbeddedObjects();
-        assertEquals("Should be two objects", 2, objects.length);
-        for (HSLFObjectData od : objects) {
-            long checkEMF = IOUtils.calculateChecksum(od.getData());
-            assertEquals(checkSums[checkId++], checkEMF);
-        }
-        
-        slideShow.close();
-    }
-    
-    
-
-    @Test
-    public void testOLEShape() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
-
-        HSLFSlide slide = ppt.getSlides().get(0);
-        int cnt = 0;
-        for (HSLFShape sh : slide.getShapes()) {
-            if(sh instanceof OLEShape){
-                cnt++;
-                OLEShape ole = (OLEShape)sh;
-                HSLFObjectData data = ole.getObjectData();
-                if("Worksheet".equals(ole.getInstanceName())){
-                    //Voila! we created a workbook from the embedded OLE data
-                    HSSFWorkbook wb = new HSSFWorkbook(data.getData());
-                    HSSFSheet sheet = wb.getSheetAt(0);
-                    //verify we can access the xls data
-                    assertEquals(1, sheet.getRow(0).getCell(0).getNumericCellValue(), 0);
-                    assertEquals(1, sheet.getRow(1).getCell(0).getNumericCellValue(), 0);
-                    assertEquals(2, sheet.getRow(2).getCell(0).getNumericCellValue(), 0);
-                    assertEquals(3, sheet.getRow(3).getCell(0).getNumericCellValue(), 0);
-                    assertEquals(8, sheet.getRow(5).getCell(0).getNumericCellValue(), 0);
-                    wb.close();
-                } else if ("Document".equals(ole.getInstanceName())){
-                    //creating a HWPF document
-                    HWPFDocument doc = new HWPFDocument(data.getData());
-                    String txt = doc.getRange().getParagraph(0).text();
-                    assertEquals("OLE embedding is thoroughly unremarkable.\r", txt);
-                }
-            }
-
-        }
-        assertEquals("Expected 2 OLE shapes", 2, cnt);
-        ppt.close();
-    }
-    
-    @Test
-    public void testEmbedding() throws IOException {
-    	HSLFSlideShow ppt = new HSLFSlideShow();
-    	
-    	File pict = POIDataSamples.getSlideShowInstance().getFile("clock.jpg");
-    	HSLFPictureData pictData = ppt.addPicture(pict, PictureType.JPEG);
-    	
-    	InputStream is = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("Employee.xls");
-    	POIFSFileSystem poiData1 = new POIFSFileSystem(is);
-    	is.close();
-    	
-    	int oleObjectId1 = ppt.addEmbed(poiData1);
-    	
-    	HSLFSlide slide1 = ppt.createSlide();
-    	OLEShape oleShape1 = new OLEShape(pictData);
-    	oleShape1.setObjectID(oleObjectId1);
-    	slide1.addShape(oleShape1);
-    	oleShape1.setAnchor(new Rectangle2D.Double(100,100,100,100));
-    	
-    	// add second slide with different order in object creation
-    	HSLFSlide slide2 = ppt.createSlide();
-    	OLEShape oleShape2 = new OLEShape(pictData);
-
-        is = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("SimpleWithImages.xls");
-        POIFSFileSystem poiData2 = new POIFSFileSystem(is);
-        is.close();
-    	
-        int oleObjectId2 = ppt.addEmbed(poiData2);
-
-        oleShape2.setObjectID(oleObjectId2);
-        slide2.addShape(oleShape2);
-        oleShape2.setAnchor(new Rectangle2D.Double(100,100,100,100));
-        
-    	ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    	ppt.write(bos);
-    	
-    	ppt = new HSLFSlideShow(new ByteArrayInputStream(bos.toByteArray()));
-    	OLEShape comp = (OLEShape)ppt.getSlides().get(0).getShapes().get(0);
-    	byte compData[] = IOUtils.toByteArray(comp.getObjectData().getData());
-    	
-    	bos.reset();
-    	poiData1.writeFilesystem(bos);
-    	byte expData[] = bos.toByteArray();
-    	
-    	assertArrayEquals(expData, compData);
-    	
-    	poiData1.close();
-    	poiData2.close();
-    	ppt.close();
-    }
-
-    
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
deleted file mode 100644
index 4c69862..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.junit.Test;
-
-
-/**
- * Test adding fonts to the presenataion resources
- *
- * @author Yegor Kozlov
- */
-public final class TestPPFont {
-
-    @Test
-    public void testCreate() {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        assertEquals(1, ppt.getNumberOfFonts());
-        assertEquals("Arial", ppt.getFont(0).getFontName());
-
-        //adding the same font twice
-        assertEquals(0, ppt.addFont(PPFont.ARIAL));
-        assertEquals(1, ppt.getNumberOfFonts());
-
-        assertEquals(1, ppt.addFont(PPFont.TIMES_NEW_ROMAN));
-        assertEquals(2, ppt.addFont(PPFont.COURIER_NEW));
-        assertEquals(3, ppt.addFont(PPFont.WINGDINGS));
-
-        assertEquals(4, ppt.getNumberOfFonts());
-
-        assertEquals(PPFont.TIMES_NEW_ROMAN.getFontName(), ppt.getFont(1).getFontName());
-        assertEquals(PPFont.COURIER_NEW.getFontName(), ppt.getFont(2).getFontName());
-
-        PPFont font3 = ppt.getFont(3);
-        assertEquals(PPFont.WINGDINGS.getFontName(), font3.getFontName());
-        assertEquals(PPFont.SYMBOL_CHARSET, font3.getCharSet());
-        assertEquals(PPFont.VARIABLE_PITCH, font3.getPitchAndFamily());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
deleted file mode 100644
index cd5c3f7..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.*;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.*;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test drawing shapes via Graphics2D
- *
- * @author Yegor Kozlov
- */
-public final class TestPPGraphics2D {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-    private HSLFSlideShow ppt;
-
-    @Before
-    public void setUp() throws Exception {
-		ppt = new HSLFSlideShow(_slTests.openResourceAsStream("empty.ppt"));
-    }
-
-    @Test
-    public void testGraphics() throws Exception {
-    	// Starts off empty
-    	assertTrue(ppt.getSlides().isEmpty());
-
-    	// Add a slide
-        HSLFSlide slide = ppt.createSlide();
-    	assertEquals(1, ppt.getSlides().size());
-
-    	// Add some stuff into it
-        HSLFGroupShape group = new HSLFGroupShape();
-        Dimension pgsize = ppt.getPageSize();
-        java.awt.Rectangle bounds = new java.awt.Rectangle(0, 0, (int)pgsize.getWidth(), (int)pgsize.getHeight());
-        group.setAnchor(bounds);
-        slide.addShape(group);
-
-        PPGraphics2D graphics = new PPGraphics2D(group);
-        graphics.setColor(Color.blue);
-        graphics.draw(new Rectangle(1296, 2544, 1344, 0));
-
-        graphics.setColor(Color.red);
-        graphics.setStroke(new BasicStroke((float)2.5));
-        graphics.drawLine(500, 500, 1500, 2500);
-
-        graphics.setColor(Color.green);
-        graphics.setPaint(Color.gray);
-        graphics.drawOval(4000, 1000, 1000, 1000);
-
-        // Write the file out
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        // And read it back in
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        assertEquals(1, ppt.getSlides().size());
-
-        slide = ppt.getSlides().get(0);
-        List<HSLFShape> shape = slide.getShapes();
-        assertEquals(shape.size(), 1); //group shape
-
-        assertTrue(shape.get(0) instanceof HSLFGroupShape); //group shape
-
-        group = (HSLFGroupShape)shape.get(0);
-        shape = group.getShapes();
-        assertEquals(shape.size(), 3);
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
deleted file mode 100644
index e593eb8..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.hslf.usermodel.*;
-import org.junit.Test;
-
-/**
- * Test setting text properties of newly added TextBoxes
- *
- * @author Yegor Kozlov
- */
-public final class TestSetBoldItalic {
-    /**
-     * Verify that we can add TextBox shapes to a slide
-     * and set some of the style attributes
-     */
-    @Test
-    public void testTextBoxWrite() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide sl = ppt.createSlide();
-        HSLFTextRun rt;
-
-        String val = "Hello, World!";
-
-        // Create a new textbox, and give it lots of properties
-        HSLFTextBox txtbox = new HSLFTextBox();
-        rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
-        txtbox.setText(val);
-        rt.setFontSize(42d);
-        rt.setBold(true);
-        rt.setItalic(true);
-        rt.setUnderlined(false);
-        sl.addShape(txtbox);
-
-        // Check it before save
-        rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(val, rt.getRawText());
-        assertEquals(42, rt.getFontSize(), 0);
-        assertTrue(rt.isBold());
-        assertTrue(rt.isItalic());
-
-        // Serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        sl = ppt.getSlides().get(0);
-
-        txtbox = (HSLFTextBox)sl.getShapes().get(0);
-        rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
-
-        // Check after save
-        assertEquals(val, rt.getRawText());
-        assertEquals(42, rt.getFontSize(), 0);
-        assertTrue(rt.isBold());
-        assertTrue(rt.isItalic());
-        assertFalse(rt.isUnderlined());
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
deleted file mode 100644
index bf23bd4..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.apache.poi.sl.TestCommonSL.sameColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.hslf.usermodel.HSLFAutoShape;
-import org.apache.poi.hslf.usermodel.HSLFGroupShape;
-import org.apache.poi.hslf.usermodel.HSLFLine;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFPictureShape;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSimpleShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextBox;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-import org.apache.poi.hslf.usermodel.HSLFTextShape;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test drawing shapes via Graphics2D
- */
-public final class TestShapes {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    private HSLFSlideShow ppt;
-    private HSLFSlideShow pptB;
-
-    @Before
-    public void setUp() throws Exception {
-        InputStream is1 = null, is2 = null;
-        try {
-            is1 = _slTests.openResourceAsStream("empty.ppt");
-            ppt = new HSLFSlideShow(is1);
-            is2 = _slTests.openResourceAsStream("empty_textbox.ppt");
-            pptB = new HSLFSlideShow(is2);
-        } finally {
-            is1.close();
-            is2.close();
-        }
-    }
-
-    @Test
-    public void graphics() throws IOException {
-        HSLFSlide slide = ppt.createSlide();
-
-        HSLFLine line = new HSLFLine();
-        java.awt.Rectangle lineAnchor = new java.awt.Rectangle(100, 200, 50, 60);
-        line.setAnchor(lineAnchor);
-        line.setLineWidth(3);
-        line.setLineDash(LineDash.DASH);
-        line.setLineColor(Color.red);
-        slide.addShape(line);
-
-        HSLFAutoShape ellipse = new HSLFAutoShape(ShapeType.ELLIPSE);
-        Rectangle2D ellipseAnchor = new Rectangle2D.Double(320, 154, 55, 111);
-        ellipse.setAnchor(ellipseAnchor);
-        ellipse.setLineWidth(2);
-        ellipse.setLineDash(LineDash.SOLID);
-        ellipse.setLineColor(Color.green);
-        ellipse.setFillColor(Color.lightGray);
-        slide.addShape(ellipse);
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        //read ppt from byte array
-
-        HSLFSlideShow ppt2 = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        assertEquals(1, ppt2.getSlides().size());
-
-        slide = ppt2.getSlides().get(0);
-        List<HSLFShape> shape = slide.getShapes();
-        assertEquals(2, shape.size());
-
-        assertTrue(shape.get(0) instanceof HSLFLine); //group shape
-        assertEquals(lineAnchor, shape.get(0).getAnchor()); //group shape
-
-        assertTrue(shape.get(1) instanceof HSLFAutoShape); //group shape
-        assertEquals(ellipseAnchor, shape.get(1).getAnchor()); //group shape
-        
-        ppt2.close();
-    }
-
-    /**
-     * Verify that we can read TextBox shapes
-     * @throws Exception
-     */
-    @Test
-    public void textBoxRead() throws IOException {
-        ppt = new HSLFSlideShow(_slTests.openResourceAsStream("with_textbox.ppt"));
-        HSLFSlide sl = ppt.getSlides().get(0);
-        for (HSLFShape sh : sl.getShapes()) {
-            assertTrue(sh instanceof HSLFTextBox);
-            HSLFTextBox txtbox = (HSLFTextBox)sh;
-            String text = txtbox.getText();
-            assertNotNull(text);
-
-            assertEquals(txtbox.getTextParagraphs().get(0).getTextRuns().size(), 1);
-            HSLFTextRun rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
-
-            if (text.equals("Hello, World!!!")){
-                assertEquals(32, rt.getFontSize(), 0);
-                assertTrue(rt.isBold());
-                assertTrue(rt.isItalic());
-            } else if (text.equals("I am just a poor boy")){
-                assertEquals(44, rt.getFontSize(), 0);
-                assertTrue(rt.isBold());
-            } else if (text.equals("This is Times New Roman")){
-                assertEquals(16, rt.getFontSize(), 0);
-                assertTrue(rt.isBold());
-                assertTrue(rt.isItalic());
-                assertTrue(rt.isUnderlined());
-            } else if (text.equals("Plain Text")){
-                assertEquals(18, rt.getFontSize(), 0);
-            }
-        }
-    }
-
-    @SuppressWarnings("unused")
-    @Test
-    public void testParagraphs() throws IOException {
-        HSLFSlideShow ss = new HSLFSlideShow();
-        HSLFSlide slide = ss.createSlide();
-        HSLFTextBox shape = new HSLFTextBox();
-        HSLFTextRun p1r1 = shape.setText("para 1 run 1. ");
-        HSLFTextRun p1r2 = shape.appendText("para 1 run 2.", false);
-        HSLFTextRun p2r1 = shape.appendText("para 2 run 1. ", true);
-        HSLFTextRun p2r2 = shape.appendText("para 2 run 2. ", false);
-        p1r1.setFontColor(Color.black);
-        p1r2.setFontColor(Color.red);
-        p2r1.setFontColor(Color.yellow);
-        p2r2.setStrikethrough(true);
-        // run 3 has same text properties as run 2 and will be merged when saving
-        HSLFTextRun p2r3 = shape.appendText("para 2 run 3.", false);
-        shape.setAnchor(new Rectangle2D.Double(100,100,100,10));
-        slide.addShape(shape);
-        shape.resizeToFitText();
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ss.write(bos);
-        
-        ss = new HSLFSlideShow(new ByteArrayInputStream(bos.toByteArray()));
-        slide = ss.getSlides().get(0);
-        HSLFTextBox tb = (HSLFTextBox)slide.getShapes().get(0);
-        List<HSLFTextParagraph> para = tb.getTextParagraphs();
-        HSLFTextRun tr = para.get(0).getTextRuns().get(0);
-        assertEquals("para 1 run 1. ", tr.getRawText());
-        assertTrue(sameColor(Color.black, tr.getFontColor()));
-        tr = para.get(0).getTextRuns().get(1);
-        assertEquals("para 1 run 2.\r",  tr.getRawText());
-        assertTrue(sameColor(Color.red, tr.getFontColor()));
-        tr = para.get(1).getTextRuns().get(0);
-        assertEquals("para 2 run 1. ", tr.getRawText());
-        assertTrue(sameColor(Color.yellow, tr.getFontColor()));
-        tr = para.get(1).getTextRuns().get(1);
-        assertEquals("para 2 run 2. para 2 run 3.", tr.getRawText());
-        assertTrue(sameColor(Color.black, tr.getFontColor()));
-        assertTrue(tr.isStrikethrough());
-    }
-        
-    
-    /**
-     * Verify that we can add TextBox shapes to a slide
-     * and set some of the style attributes
-     */
-    @Test
-    public void textBoxWriteBytes() throws IOException {
-        ppt = new HSLFSlideShow();
-        HSLFSlide sl = ppt.createSlide();
-        HSLFTextRun rt;
-
-        String val = "Hello, World!";
-
-        // Create a new textbox, and give it lots of properties
-        HSLFTextBox txtbox = new HSLFTextBox();
-        rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
-        txtbox.setText(val);
-        rt.setFontFamily("Arial");
-        rt.setFontSize(42d);
-        rt.setBold(true);
-        rt.setItalic(true);
-        rt.setUnderlined(false);
-        rt.setFontColor(Color.red);
-        sl.addShape(txtbox);
-
-        // Check it before save
-        rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
-        assertEquals(val, rt.getRawText());
-        assertEquals(42, rt.getFontSize(), 0);
-        assertTrue(rt.isBold());
-        assertTrue(rt.isItalic());
-        assertFalse(rt.isUnderlined());
-        assertEquals("Arial", rt.getFontFamily());
-        assertTrue(sameColor(Color.red, rt.getFontColor()));
-
-        // Serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        HSLFSlideShow ppt2 = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        sl = ppt2.getSlides().get(0);
-
-        txtbox = (HSLFTextBox)sl.getShapes().get(0);
-        rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
-
-        // Check after save
-        assertEquals(val, rt.getRawText());
-        assertEquals(42, rt.getFontSize(), 0);
-        assertTrue(rt.isBold());
-        assertTrue(rt.isItalic());
-        assertFalse(rt.isUnderlined());
-        assertEquals("Arial", rt.getFontFamily());
-        assertTrue(sameColor(Color.red, rt.getFontColor()));
-        
-        ppt2.close();
-    }
-
-    /**
-     * Test with an empty text box
-     */
-    @Test
-    public void emptyTextBox() {
-    	assertEquals(2, pptB.getSlides().size());
-    	HSLFSlide s1 = pptB.getSlides().get(0);
-    	HSLFSlide s2 = pptB.getSlides().get(1);
-
-    	// Check we can get the shapes count
-    	assertEquals(2, s1.getShapes().size());
-    	assertEquals(2, s2.getShapes().size());
-    }
-
-    /**
-     * If you iterate over text shapes in a slide and collect them in a set
-     * it must be the same as returned by Slide.getTextRuns().
-     */
-    @Test
-    public void textBoxSet() throws IOException {
-        textBoxSet("with_textbox.ppt");
-        textBoxSet("basic_test_ppt_file.ppt");
-        textBoxSet("next_test_ppt_file.ppt");
-        textBoxSet("Single_Coloured_Page.ppt");
-        textBoxSet("Single_Coloured_Page_With_Fonts_and_Alignments.ppt");
-        textBoxSet("incorrect_slide_order.ppt");
-    }
-
-    private void textBoxSet(String filename) throws IOException {
-        HSLFSlideShow ss = new HSLFSlideShow(_slTests.openResourceAsStream(filename));
-        for (HSLFSlide sld : ss.getSlides()) {
-            ArrayList<String> lst1 = new ArrayList<String>();
-            for (List<HSLFTextParagraph> txt : sld.getTextParagraphs()) {
-                for (HSLFTextParagraph p : txt) {
-                    for (HSLFTextRun r : p) {
-                        lst1.add(r.getRawText());
-                    }
-                }
-            }
-
-            ArrayList<String> lst2 = new ArrayList<String>();
-            for (HSLFShape sh : sld.getShapes()) {
-                if (sh instanceof HSLFTextShape){
-                    HSLFTextShape tbox = (HSLFTextShape)sh;
-                    for (HSLFTextParagraph p : tbox.getTextParagraphs()) {
-                        for (HSLFTextRun r : p) {
-                            lst2.add(r.getRawText());
-                        }
-                    }
-                }
-            }
-            assertTrue(lst1.containsAll(lst2));
-            assertTrue(lst2.containsAll(lst1));
-        }
-        ss.close();
-    }
-
-    /**
-     * Test adding shapes to <code>ShapeGroup</code>
-     */
-    @Test
-    public void shapeGroup() throws IOException {
-        HSLFSlideShow ss = new HSLFSlideShow();
-
-        HSLFSlide slide = ss.createSlide();
-        Dimension pgsize = ss.getPageSize();
-
-        HSLFGroupShape group = new HSLFGroupShape();
-
-        group.setAnchor(new Rectangle2D.Double(0, 0, pgsize.getWidth(), pgsize.getHeight()));
-        slide.addShape(group);
-
-        HSLFPictureData data = ss.addPicture(_slTests.readFile("clock.jpg"), PictureType.JPEG);
-        HSLFPictureShape pict = new HSLFPictureShape(data, group);
-        pict.setAnchor(new Rectangle2D.Double(0, 0, 200, 200));
-        group.addShape(pict);
-
-        HSLFLine line = new HSLFLine(group);
-        line.setAnchor(new Rectangle2D.Double(300, 300, 500, 0));
-        group.addShape(line);
-
-        //serialize and read again.
-        ByteArrayOutputStream  out = new ByteArrayOutputStream();
-        ss.write(out);
-        out.close();
-        ss.close();
-
-        ByteArrayInputStream is = new ByteArrayInputStream(out.toByteArray());
-        ss = new HSLFSlideShow(is);
-        is.close();
-
-        slide = ss.getSlides().get(0);
-
-        List<HSLFShape> shape = slide.getShapes();
-        assertEquals(1, shape.size());
-        assertTrue(shape.get(0) instanceof HSLFGroupShape);
-
-        group = (HSLFGroupShape)shape.get(0);
-        List<HSLFShape> grshape = group.getShapes();
-        assertEquals(2, grshape.size());
-        assertTrue(grshape.get(0) instanceof HSLFPictureShape);
-        assertTrue(grshape.get(1) instanceof HSLFLine);
-
-        pict = (HSLFPictureShape)grshape.get(0);
-        assertEquals(new Rectangle2D.Double(0, 0, 200, 200), pict.getAnchor());
-
-        line = (HSLFLine)grshape.get(1);
-        assertEquals(new Rectangle2D.Double(300, 300, 500, 0), line.getAnchor());
-        
-        ss.close();
-    }
-
-    /**
-     * Test functionality of Sheet.removeShape(Shape shape)
-     */
-    @Test
-    public void removeShapes() throws IOException {
-        String file = "with_textbox.ppt";
-        HSLFSlideShow ss = new HSLFSlideShow(_slTests.openResourceAsStream(file));
-        HSLFSlide sl = ss.getSlides().get(0);
-        List<HSLFShape> sh = sl.getShapes();
-        assertEquals("expected four shaped in " + file, 4, sh.size());
-        //remove all
-        for (int i = 0; i < sh.size(); i++) {
-            boolean ok = sl.removeShape(sh.get(i));
-            assertTrue("Failed to delete shape #" + i, ok);
-        }
-        //now Slide.getShapes() should return an empty array
-        assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().size());
-
-        //serialize and read again. The file should be readable and contain no shapes
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ss.write(out);
-        out.close();
-        ss.close();
-
-        ss = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        sl = ss.getSlides().get(0);
-        assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().size());
-        ss.close();
-    }
-
-    @Test
-    public void lineWidth() {
-        HSLFSimpleShape sh = new HSLFAutoShape(ShapeType.RT_TRIANGLE);
-
-        AbstractEscherOptRecord opt = sh.getEscherOptRecord();
-        EscherSimpleProperty prop = HSLFSimpleShape.getEscherProperty(opt, EscherProperties.LINESTYLE__LINEWIDTH);
-        assertNull(prop);
-        assertEquals(HSLFSimpleShape.DEFAULT_LINE_WIDTH, sh.getLineWidth(), 0);
-
-        sh.setLineWidth(1.0);
-        prop = HSLFSimpleShape.getEscherProperty(opt, EscherProperties.LINESTYLE__LINEWIDTH);
-        assertNotNull(prop);
-        assertEquals(1.0, sh.getLineWidth(), 0);
-    }
-
-    @Test
-    public void shapeId() throws IOException {
-        HSLFSlideShow ss = new HSLFSlideShow();
-        HSLFSlide slide = ss.createSlide();
-        HSLFShape shape = null;
-
-        //EscherDgg is a document-level record which keeps track of the drawing groups
-        EscherDggRecord dgg = ss.getDocumentRecord().getPPDrawingGroup().getEscherDggRecord();
-        EscherDgRecord dg = slide.getSheetContainer().getPPDrawing().getEscherDgRecord();
-
-        int dggShapesUsed = dgg.getNumShapesSaved();   //total number of shapes in the ppt
-        int dggMaxId = dgg.getShapeIdMax();            //max number of shapeId
-
-        int dgMaxId = dg.getLastMSOSPID();   //max shapeId in the slide
-        int dgShapesUsed = dg.getNumShapes();          // number of shapes in the slide
-        //insert 3 shapes and make sure the Ids are properly incremented
-        for (int i = 0; i < 3; i++) {
-            shape = new HSLFLine();
-            assertEquals(0, shape.getShapeId());
-            slide.addShape(shape);
-            assertTrue(shape.getShapeId() > 0);
-
-            //check that EscherDgRecord is updated
-            assertEquals(shape.getShapeId(), dg.getLastMSOSPID());
-            assertEquals(dgMaxId + 1, dg.getLastMSOSPID());
-            assertEquals(dgShapesUsed + 1, dg.getNumShapes());
-
-            //check that EscherDggRecord is updated
-            assertEquals(shape.getShapeId() + 1, dgg.getShapeIdMax());
-            assertEquals(dggMaxId + 1, dgg.getShapeIdMax());
-            assertEquals(dggShapesUsed + 1, dgg.getNumShapesSaved());
-
-            dggShapesUsed = dgg.getNumShapesSaved();
-            dggMaxId = dgg.getShapeIdMax();
-            dgMaxId = dg.getLastMSOSPID();
-            dgShapesUsed = dg.getNumShapes();
-        }
-
-
-        //For each drawing group PPT allocates clusters with size=1024
-        //if the number of shapes is greater that 1024 a new cluster is allocated
-        //make sure it is so
-        int numClusters = dgg.getNumIdClusters();
-        for (int i = 0; i < 1025; i++) {
-            shape = new HSLFLine();
-            slide.addShape(shape);
-        }
-        assertEquals(numClusters + 1, dgg.getNumIdClusters());
-        ss.close();
-    }
-
-    @Test
-    public void lineColor() throws IOException {
-        HSLFSlideShow ss = new HSLFSlideShow(_slTests.openResourceAsStream("51731.ppt"));
-        List<HSLFShape> shape = ss.getSlides().get(0).getShapes();
-
-        assertEquals(4, shape.size());
-
-        HSLFTextShape sh1 = (HSLFTextShape)shape.get(0);
-        assertEquals("Hello Apache POI", sh1.getText());
-        assertNull(sh1.getLineColor());
-
-        HSLFTextShape sh2 = (HSLFTextShape)shape.get(1);
-        assertEquals("Why are you showing this border?", sh2.getText());
-        assertNull(sh2.getLineColor());
-
-        HSLFTextShape sh3 = (HSLFTextShape)shape.get(2);
-        assertEquals("Text in a black border", sh3.getText());
-        assertEquals(Color.black, sh3.getLineColor());
-        assertEquals(0.75, sh3.getLineWidth(), 0);
-
-        HSLFTextShape sh4 = (HSLFTextShape)shape.get(3);
-        assertEquals("Border width is 5 pt", sh4.getText());
-        assertEquals(Color.black, sh4.getLineColor());
-        assertEquals(5.0, sh4.getLineWidth(), 0);
-        
-        ss.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
deleted file mode 100644
index 1b5aa8d..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
-import org.apache.poi.hslf.record.ColorSchemeAtom;
-import org.apache.poi.hslf.record.PPDrawing;
-import org.apache.poi.hslf.usermodel.*;
-import org.junit.Test;
-
-/**
- * Test common functionality of the <code>Sheet</code> object.
- * For each ppt in the test directory check that all sheets are properly initialized
- *
- * @author Yegor Kozlov
- */
-public final class TestSheet {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    /**
-     * For each ppt in the test directory check that all sheets are properly initialized
-     */
-    @Test
-    public void testSheet() throws Exception {
-        String[] tests = {"SampleShow.ppt", "backgrounds.ppt", "text_shapes.ppt", "pictures.ppt"};
-        for (String file : tests) {
-            try {
-                HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream(file));
-                doSlideShow(ppt);
-            } catch (EncryptedPowerPointFileException e){
-                //skip encrypted ppt
-            }
-        }
-    }
-
-    private void doSlideShow(HSLFSlideShow ppt) {
-        for (HSLFSlide slide : ppt.getSlides()) {
-            verify(slide);
-
-            HSLFNotes notes = slide.getNotes();
-            if(notes != null) verify(notes);
-
-            HSLFMasterSheet master = slide.getMasterSheet();
-            assertNotNull(master);
-            verify(master);
-        }
-    }
-
-    private void verify(HSLFSheet sheet){
-        assertNotNull(sheet.getSlideShow());
-
-        ColorSchemeAtom colorscheme = sheet.getColorScheme();
-        assertNotNull(colorscheme);
-
-        PPDrawing ppdrawing = sheet.getPPDrawing();
-        assertNotNull(ppdrawing);
-
-        HSLFBackground background = sheet.getBackground();
-        assertNotNull(background);
-
-        assertTrue(sheet._getSheetNumber() != 0);
-        assertTrue(sheet._getSheetRefId() != 0);
-
-        List<List<HSLFTextParagraph>> txt = sheet.getTextParagraphs();
-        // assertTrue("no text runs", txt != null && !txt.isEmpty());
-        // backgrounds.ppt has no texts
-        for (List<HSLFTextParagraph> t : txt) {
-            for (HSLFTextParagraph tp : t) {
-                assertNotNull(tp.getSheet());
-            }
-        }
-
-        List<HSLFShape> shape = sheet.getShapes();
-        assertTrue("no shapes", shape != null && !shape.isEmpty());
-        for (HSLFShape s : shape) {
-            assertNotNull(s.getSpContainer());
-            assertNotNull(s.getSheet());
-            assertNotNull(s.getShapeName());
-            assertNotNull(s.getAnchor());
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
deleted file mode 100644
index 57f6f5a..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.SlideAtom;
-import org.apache.poi.hslf.usermodel.*;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that changing a slide's idea of what notes sheet is its works right
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestSlideChangeNotes {
-	// SlideShow primed on the test data
-	private HSLFSlideShow ss;
-
-	@Before
-	public void init() throws Exception {
-        POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss = new HSLFSlideShow(hss);
-	}
-
-	@Test
-	public void testSetToNone() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		SlideAtom sa = slideOne.getSlideRecord().getSlideAtom();
-
-		slideOne.setNotes(null);
-
-		assertEquals(0, sa.getNotesID());
-	}
-
-	@Test
-	public void testSetToSomething() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		HSLFNotes notesOne = ss.getNotes().get(1);
-		SlideAtom sa = slideOne.getSlideRecord().getSlideAtom();
-
-		slideOne.setNotes(notesOne);
-
-		assertEquals(notesOne._getSheetNumber(), sa.getNotesID());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
deleted file mode 100644
index 23a3d15..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.model.textproperties.CharFlagsTextProp;
-import org.apache.poi.hslf.record.Environment;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.usermodel.*;
-import org.junit.Test;
-
-/**
- * Tests for SlideMaster
- *
- * @author Yegor Kozlov
- */
-public final class TestSlideMaster {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    /**
-     * The reference ppt has two masters.
-     * Check we can read their attributes.
-     */
-    @Test
-    public void testSlideMaster() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
-
-        Environment env = ppt.getDocumentRecord().getEnvironment();
-
-        List<HSLFSlideMaster> master = ppt.getSlideMasters();
-        assertEquals(2, master.size());
-
-        //character attributes
-        assertEquals(40, master.get(0).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.size", true).getValue());
-        assertEquals(48, master.get(1).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.size", true).getValue());
-
-        int font1 = master.get(0).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.index", true).getValue();
-        int font2 = master.get(1).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.index", true).getValue();
-        assertEquals("Arial", env.getFontCollection().getFontWithId(font1));
-        assertEquals("Georgia", env.getFontCollection().getFontWithId(font2));
-
-        CharFlagsTextProp prop1 = (CharFlagsTextProp)master.get(0).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "char_flags", true);
-        assertEquals(false, prop1.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(false, prop1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(true, prop1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-
-        CharFlagsTextProp prop2 = (CharFlagsTextProp)master.get(1).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "char_flags", true);
-        assertEquals(false, prop2.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(true, prop2.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(false, prop2.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-
-        //now paragraph attributes
-        assertEquals(0x266B, master.get(0).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.char", false).getValue());
-        assertEquals(0x2022, master.get(1).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.char", false).getValue());
-
-        int b1 = master.get(0).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.font", false).getValue();
-        int b2 = master.get(1).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.font", false).getValue();
-        assertEquals("Arial", env.getFontCollection().getFontWithId(b1));
-        assertEquals("Georgia", env.getFontCollection().getFontWithId(b2));
-    }
-
-    /**
-     * Test we can read default text attributes for a title master sheet
-     */
-    @Test
-    public void testTitleMasterTextAttributes() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
-        List<HSLFTitleMaster> master = ppt.getTitleMasters();
-        assertEquals(1, master.size());
-
-        assertEquals(32, master.get(0).getStyleAttribute(TextHeaderAtom.CENTER_TITLE_TYPE, 0, "font.size", true).getValue());
-        CharFlagsTextProp prop1 = (CharFlagsTextProp)master.get(0).getStyleAttribute(TextHeaderAtom.CENTER_TITLE_TYPE, 0, "char_flags", true);
-        assertEquals(true, prop1.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(false, prop1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(true, prop1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-
-        assertEquals(20, master.get(0).getStyleAttribute(TextHeaderAtom.CENTRE_BODY_TYPE, 0, "font.size", true).getValue());
-        CharFlagsTextProp prop2 = (CharFlagsTextProp)master.get(0).getStyleAttribute(TextHeaderAtom.CENTRE_BODY_TYPE, 0, "char_flags", true);
-        assertEquals(true, prop2.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(false, prop2.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(false, prop2.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-    }
-
-    /**
-     * Slide 3 has title layout and follows the TitleMaster. Verify that.
-     */
-    @Test
-    public void testTitleMaster() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
-        HSLFSlide slide = ppt.getSlides().get(2);
-        HSLFMasterSheet masterSheet = slide.getMasterSheet();
-        assertTrue(masterSheet instanceof HSLFTitleMaster);
-
-        for (List<HSLFTextParagraph> txt : slide.getTextParagraphs()) {
-            HSLFTextRun rt = txt.get(0).getTextRuns().get(0);
-            switch(txt.get(0).getRunType()){
-                case TextHeaderAtom.CENTER_TITLE_TYPE:
-                    assertEquals("Arial", rt.getFontFamily());
-                    assertEquals(32, rt.getFontSize(), 0);
-                    assertEquals(true, rt.isBold());
-                    assertEquals(true, rt.isUnderlined());
-                    break;
-                case TextHeaderAtom.CENTRE_BODY_TYPE:
-                    assertEquals("Courier New", rt.getFontFamily());
-                    assertEquals(20, rt.getFontSize(), 0);
-                    assertEquals(true, rt.isBold());
-                    assertEquals(false, rt.isUnderlined());
-                    break;
-            }
-
-        }
-    }
-    /**
-     * If a style attribute is not set ensure it is read from the master
-     */
-    @Test
-    public void testMasterAttributes() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
-        List<HSLFSlide> slide = ppt.getSlides();
-        assertEquals(3, slide.size());
-        for (List<HSLFTextParagraph> tparas : slide.get(0).getTextParagraphs()) {
-            HSLFTextParagraph tpara = tparas.get(0);
-            if (tpara.getRunType() == TextHeaderAtom.TITLE_TYPE){
-                HSLFTextRun rt = tpara.getTextRuns().get(0);
-                assertEquals(40, rt.getFontSize(), 0);
-                assertEquals(true, rt.isUnderlined());
-                assertEquals("Arial", rt.getFontFamily());
-            } else if (tpara.getRunType() == TextHeaderAtom.BODY_TYPE){
-                HSLFTextRun rt = tpara.getTextRuns().get(0);
-                assertEquals(0, tpara.getIndentLevel());
-                assertEquals(32, rt.getFontSize(), 0);
-                assertEquals("Arial", rt.getFontFamily());
-
-                tpara = tparas.get(1);
-                rt = tpara.getTextRuns().get(0);
-                assertEquals(1, tpara.getIndentLevel());
-                assertEquals(28, rt.getFontSize(), 0);
-                assertEquals("Arial", rt.getFontFamily());
-
-            }
-        }
-
-        for (List<HSLFTextParagraph> tparas : slide.get(1).getTextParagraphs()) {
-            HSLFTextParagraph tpara = tparas.get(0);
-            if (tpara.getRunType() == TextHeaderAtom.TITLE_TYPE){
-                HSLFTextRun rt = tpara.getTextRuns().get(0);
-                assertEquals(48, rt.getFontSize(), 0);
-                assertEquals(true, rt.isItalic());
-                assertEquals("Georgia", rt.getFontFamily());
-            } else if (tpara.getRunType() == TextHeaderAtom.BODY_TYPE){
-                HSLFTextRun rt;
-                rt = tpara.getTextRuns().get(0);
-                assertEquals(0, tpara.getIndentLevel());
-                assertEquals(32, rt.getFontSize(), 0);
-                assertEquals("Courier New", rt.getFontFamily());
-            }
-        }
-
-    }
-
-    /**
-     * Check we can dynamically assign a slide master to a slide.
-     */
-    @Test
-    public void testChangeSlideMaster() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
-        List<HSLFSlideMaster> master = ppt.getSlideMasters();
-        List<HSLFSlide> slide = ppt.getSlides();
-        int sheetNo;
-
-        //each slide uses its own master
-        assertEquals(slide.get(0).getMasterSheet()._getSheetNumber(), master.get(0)._getSheetNumber());
-        assertEquals(slide.get(1).getMasterSheet()._getSheetNumber(), master.get(1)._getSheetNumber());
-
-        //all slides use the first master slide
-        sheetNo = master.get(0)._getSheetNumber();
-        for (HSLFSlide s : slide) {
-            s.setMasterSheet(master.get(0));
-        }
-
-        ByteArrayOutputStream out;
-
-        out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        master = ppt.getSlideMasters();
-        slide = ppt.getSlides();
-        for (HSLFSlide s : slide) {
-            assertEquals(sheetNo, s.getMasterSheet()._getSheetNumber());
-        }
-    }
-
-    /**
-     * Varify we can read attrubutes for different identtation levels.
-     * (typical for the "bullted body" placeholder)
-     */
-    @Test
-    public void testIndentation() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
-        HSLFSlide slide = ppt.getSlides().get(0);
-        
-        for (List<HSLFTextParagraph> tparas : slide.getTextParagraphs()) {
-            HSLFTextParagraph tpara = tparas.get(0);
-            if (tpara.getRunType() == TextHeaderAtom.TITLE_TYPE){
-                HSLFTextRun rt = tpara.getTextRuns().get(0);
-                assertEquals(40, rt.getFontSize(), 0);
-                assertEquals(true, rt.isUnderlined());
-                assertEquals("Arial", rt.getFontFamily());
-            } else if (tpara.getRunType() == TextHeaderAtom.BODY_TYPE){
-                int indents[] = { 32, 28, 24 };
-                for (HSLFTextRun rt : tpara.getTextRuns()) {
-                    int indent = tpara.getIndentLevel();
-                    assertEquals(indents[indent], rt.getFontSize(), 0);
-                }
-            }
-        }
-
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
deleted file mode 100644
index 5ced994..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.*;
-import org.junit.Test;
-
-/**
- * Test adding new slides to a ppt.
- *
- * Note - uses the same empty PPT file as the core "new Slideshow"
- *  stuff does
- * @author Yegor Kozlov
- */
-public final class TestSlides {
-
-    /**
-     * Add 1 slide to an empty ppt.
-     * @throws Exception
-     */
-    @Test
-    public void testAddSlides1() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(new HSLFSlideShowImpl( TestSlides.class.getResourceAsStream("/org/apache/poi/hslf/data/empty.ppt") ));
-        assertTrue(ppt.getSlides().isEmpty());
-
-        HSLFSlide s1 = ppt.createSlide();
-        assertEquals(1, ppt.getSlides().size());
-        assertEquals(3, s1._getSheetRefId());
-        assertEquals(256, s1._getSheetNumber());
-        assertEquals(1, s1.getSlideNumber());
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        assertEquals(1, ppt.getSlides().size());
-    }
-
-    /**
-     * Add 2 slides to an empty ppt
-     * @throws Exception
-     */
-    @Test
-    public void testAddSlides2() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(new HSLFSlideShowImpl( TestSlides.class.getResourceAsStream("/org/apache/poi/hslf/data/empty.ppt") ));
-        assertTrue(ppt.getSlides().isEmpty());
-
-        HSLFSlide s1 = ppt.createSlide();
-        assertEquals(1, ppt.getSlides().size());
-        assertEquals(3, s1._getSheetRefId());
-        assertEquals(256, s1._getSheetNumber());
-        assertEquals(1, s1.getSlideNumber());
-
-        HSLFSlide s2 = ppt.createSlide();
-        assertEquals(2, ppt.getSlides().size());
-        assertEquals(4, s2._getSheetRefId());
-        assertEquals(257, s2._getSheetNumber());
-        assertEquals(2, s2.getSlideNumber());
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        assertEquals(2, ppt.getSlides().size());
-    }
-
-    /**
-     * Add 3 slides to an empty ppt
-     * @throws Exception
-     */
-    @Test
-    public void testAddSlides3() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(new HSLFSlideShowImpl( TestSlides.class.getResourceAsStream("/org/apache/poi/hslf/data/empty.ppt") ));
-        assertTrue(ppt.getSlides().isEmpty());
-
-        HSLFSlide s1 = ppt.createSlide();
-        assertEquals(1, ppt.getSlides().size());
-        assertEquals(3, s1._getSheetRefId());
-        assertEquals(256, s1._getSheetNumber());
-        assertEquals(1, s1.getSlideNumber());
-
-        HSLFSlide s2 = ppt.createSlide();
-        assertEquals(2, ppt.getSlides().size());
-        assertEquals(4, s2._getSheetRefId());
-        assertEquals(257, s2._getSheetNumber());
-        assertEquals(2, s2.getSlideNumber());
-
-        HSLFSlide s3 = ppt.createSlide();
-        assertEquals(3, ppt.getSlides().size());
-        assertEquals(5, s3._getSheetRefId());
-        assertEquals(258, s3._getSheetNumber());
-        assertEquals(3, s3.getSlideNumber());
-
-
-        //serialize and read again
-         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        assertEquals(3, ppt.getSlides().size());
-
-        // Check IDs are still right
-        s1 = ppt.getSlides().get(0);
-        assertEquals(256, s1._getSheetNumber());
-        assertEquals(3, s1._getSheetRefId());
-        s2 = ppt.getSlides().get(1);
-        assertEquals(257, s2._getSheetNumber());
-        assertEquals(4, s2._getSheetRefId());
-        s3 = ppt.getSlides().get(2);
-        assertEquals(3, ppt.getSlides().size());
-        assertEquals(258, s3._getSheetNumber());
-        assertEquals(5, s3._getSheetRefId());
-    }
-
-    /**
-     * Add slides to ppt which already has two slides
-     */
-    @Test
-    public void testAddSlides2to3() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-        HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-
-        assertEquals(2, ppt.getSlides().size());
-
-        // First slide is 256 / 4
-        HSLFSlide s1 = ppt.getSlides().get(0);
-        assertEquals(256, s1._getSheetNumber());
-        assertEquals(4, s1._getSheetRefId());
-
-        // Last slide is 257 / 6
-        HSLFSlide s2 = ppt.getSlides().get(1);
-        assertEquals(257, s2._getSheetNumber());
-        assertEquals(6, s2._getSheetRefId());
-
-        // Add another slide, goes in at the end
-        HSLFSlide s3 = ppt.createSlide();
-        assertEquals(3, ppt.getSlides().size());
-        assertEquals(258, s3._getSheetNumber());
-        assertEquals(8, s3._getSheetRefId());
-
-
-        // Serialize and read again
-         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-        assertEquals(3, ppt.getSlides().size());
-
-
-        // Check IDs are still right
-        s1 = ppt.getSlides().get(0);
-        assertEquals(256, s1._getSheetNumber());
-        assertEquals(4, s1._getSheetRefId());
-        s2 = ppt.getSlides().get(1);
-        assertEquals(257, s2._getSheetNumber());
-        assertEquals(6, s2._getSheetRefId());
-        s3 = ppt.getSlides().get(2);
-        assertEquals(3, ppt.getSlides().size());
-        assertEquals(258, s3._getSheetNumber());
-        assertEquals(8, s3._getSheetRefId());
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
deleted file mode 100644
index 3c7bc9c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTable;
-import org.apache.poi.hslf.usermodel.HSLFTableCell;
-import org.apache.poi.sl.usermodel.Shape;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.TableShape;
-import org.junit.Test;
-
-/**
- * Test <code>Table</code> object.
- */
-public final class TestTable {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    /**
-     * Test that ShapeFactory works properly and returns <code>Table</code>
-     */
-    @Test
-    public void testShapeFactory() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-
-        HSLFTable tbl = slide.createTable(2, 5);
-
-        HSLFTableCell cell = tbl.getCell(0, 0);
-        //table cells have type=TextHeaderAtom.OTHER_TYPE, see bug #46033
-        assertEquals(TextHeaderAtom.OTHER_TYPE, cell.getTextParagraphs().get(0).getRunType());
-
-        HSLFShape tblSh = slide.getShapes().get(0);
-        assertTrue(tblSh instanceof HSLFTable);
-        HSLFTable tbl2 = (HSLFTable)tblSh;
-        assertEquals(tbl.getNumberOfColumns(), tbl2.getNumberOfColumns());
-        assertEquals(tbl.getNumberOfRows(), tbl2.getNumberOfRows());
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-        ppt.close();
-        
-        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        slide = ppt.getSlides().get(0);
-        assertTrue(slide.getShapes().get(0) instanceof HSLFTable);
-        HSLFTable tbl3 = (HSLFTable)slide.getShapes().get(0);
-        assertEquals(tbl.getNumberOfColumns(), tbl3.getNumberOfColumns());
-        assertEquals(tbl.getNumberOfRows(), tbl3.getNumberOfRows());
-        ppt.close();
-    }
-
-    /**
-     * Error constructing Table when rownum=1
-     */
-    @Test
-    public void test45889() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide = ppt.createSlide();
-        List<HSLFShape> shapes;
-        HSLFTable tbl1 = slide.createTable(1, 5);
-        assertEquals(5, tbl1.getNumberOfColumns());
-        assertEquals(1, tbl1.getNumberOfRows());
-
-        shapes = slide.getShapes();
-        assertEquals(1, shapes.size());
-
-        HSLFTable tbl2 = (HSLFTable)shapes.get(0);
-        assertSame(tbl1.getSpContainer(), tbl2.getSpContainer());
-
-        assertEquals(tbl1.getNumberOfColumns(), tbl2.getNumberOfColumns());
-        assertEquals(tbl1.getNumberOfRows(), tbl2.getNumberOfRows());
-        ppt.close();
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testIllegalRowCnstruction() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide = ppt.createSlide();
-        slide.createTable(0, 5);
-        fail("Table(rownum, colnum) must throw IllegalArgumentException if any of tghe arguments is less than 1");
-        ppt.close();
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testIllegalColConstruction() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide = ppt.createSlide();
-        slide.createTable(5, 0);
-        fail("Table(rownum, colnum) must throw IllegalArgumentException if any of tghe arguments is less than 1");
-        ppt.close();
-    }
-    
-    /**
-     * Bug 57820: initTable throws NullPointerException
-     * when the table is positioned with its top at -1
-     */
-    @Test
-    public void test57820() throws IOException {
-        SlideShow<?,?> ppt = new HSLFSlideShow(_slTests.openResourceAsStream("bug57820-initTableNullRefrenceException.ppt"));
-
-        List<? extends Slide<?,?>> slides = ppt.getSlides();
-        assertEquals(1, slides.size());
-
-        List<? extends Shape<?,?>> shapes = slides.get(0).getShapes(); //throws NullPointerException
-
-        TableShape<?,?> tbl = null;
-        for(Shape<?,?> s : shapes) {
-            if(s instanceof TableShape) {
-                tbl = (TableShape<?,?>)s;
-                break;
-            }
-        }
-
-        assertNotNull(tbl);
-        assertEquals(-1, tbl.getAnchor().getY(), 0);
-        
-        ppt.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
deleted file mode 100644
index 85070a3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.model;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.*;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that if we load something up, get a TextRun, set the text
- *  to be the same as it was before, and write it all back out again,
- *  that we don't break anything in the process.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestTextRunReWrite {
-	// HSLFSlideShow primed on the test data
-	private HSLFSlideShowImpl hss;
-	// HSLFSlideShow primed on the test data
-	private HSLFSlideShow ss;
-	// POIFS primed on the test data
-	private POIFSFileSystem pfs;
-
-	/**
-	 * Load up a test PPT file with rich data
-	 */
-	@Before
-    public void setUp() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		String filename = "Single_Coloured_Page_With_Fonts_and_Alignments.ppt";
-		pfs = new POIFSFileSystem(slTests.openResourceAsStream(filename));
-		hss = new HSLFSlideShowImpl(pfs);
-		ss = new HSLFSlideShow(hss);
-    }
-
-    @Test
-	public void testWritesOutTheSameNonRich() throws Exception {
-    	// Ensure the text lengths are as we'd expect to start with
-    	assertEquals(1, ss.getSlides().size());
-    	assertEquals(2, ss.getSlides().get(0).getTextParagraphs().size());
-
-        // Grab the first text run on the first sheet
-        List<HSLFTextParagraph> tr1 = ss.getSlides().get(0).getTextParagraphs().get(0);
-        List<HSLFTextParagraph> tr2 = ss.getSlides().get(0).getTextParagraphs().get(1);
-    	
-    	
-    	assertEquals(30, HSLFTextParagraph.getRawText(tr1).length());
-    	assertEquals(179, HSLFTextParagraph.getRawText(tr2).length());
-
-    	assertEquals(1, tr1.size());
-    	assertEquals(30, HSLFTextParagraph.getText(tr1).length());
-    	assertEquals(30, HSLFTextParagraph.getRawText(tr1).length());
-    	assertEquals(31, tr1.get(0).getTextRuns().get(0).getCharacterStyle().getCharactersCovered());
-    	assertEquals(31, tr1.get(0).getParagraphStyle().getCharactersCovered());
-
-    	// Set the text to be as it is now
-    	HSLFTextParagraph.setText(tr1, HSLFTextParagraph.getRawText(tr1));
-    	tr1 = ss.getSlides().get(0).getTextParagraphs().get(0);
-
-    	// Check the text lengths are still right
-    	assertEquals(30, HSLFTextParagraph.getRawText(tr1).length());
-    	assertEquals(179, HSLFTextParagraph.getRawText(tr2).length());
-
-        assertEquals(1, tr1.size());
-        assertEquals(30, HSLFTextParagraph.getText(tr1).length());
-        assertEquals(30, HSLFTextParagraph.getRawText(tr1).length());
-        assertEquals(31, tr1.get(0).getTextRuns().get(0).getCharacterStyle().getCharactersCovered());
-        assertEquals(31, tr1.get(0).getParagraphStyle().getCharactersCovered());
-
-
-		// Write the slideshow out to a byte array
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ss.write(baos);
-
-		// Build an input stream of it
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		// Use POIFS to query that lot
-		POIFSFileSystem npfs = new POIFSFileSystem(bais);
-
-		// Check that the "PowerPoint Document" sections have the same size
-		DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document");
-		DocumentEntry nProps = (DocumentEntry)npfs.getRoot().getEntry("PowerPoint Document");
-		assertEquals(oProps.getSize(),nProps.getSize());
-
-		// Check that they contain the same data
-		byte[] _oData = new byte[oProps.getSize()];
-		byte[] _nData = new byte[nProps.getSize()];
-		pfs.createDocumentInputStream("PowerPoint Document").read(_oData);
-		npfs.createDocumentInputStream("PowerPoint Document").read(_nData);
-		for(int i=0; i<_oData.length; i++) {
-//			System.out.println(i + "\t" + Integer.toHexString(i));
-			assertEquals(_oData[i], _nData[i]);
-		}
-	}
-
-    @Test
-    public void testWritesOutTheSameRich() throws Exception {
-    	// Grab the first text run on the first sheet
-    	List<HSLFTextParagraph> tr1 = ss.getSlides().get(0).getTextParagraphs().get(0);
-
-    	// Get the first rich text run
-    	HSLFTextRun rtr1 = tr1.get(0).getTextRuns().get(0);
-
-
-    	// Check that the text sizes are as expected
-    	assertEquals(1, tr1.get(0).getTextRuns().size());
-        assertEquals(30, HSLFTextParagraph.getRawText(tr1).length());
-    	assertEquals(30, rtr1.getLength());
-    	assertEquals(30, rtr1.getRawText().length());
-    	assertEquals(31, rtr1.getCharacterStyle().getCharactersCovered());
-    	assertEquals(31, tr1.get(0).getParagraphStyle().getCharactersCovered());
-
-    	// Set the text to be as it is now
-    	rtr1.setText( rtr1.getRawText() );
-    	rtr1 = tr1.get(0).getTextRuns().get(0);
-
-    	// Check that the text sizes are still as expected
-    	assertEquals(1, tr1.get(0).getTextRuns().size());
-    	assertEquals(30, HSLFTextParagraph.getRawText(tr1).length());
-    	assertEquals(30, tr1.get(0).getTextRuns().get(0).getRawText().length());
-    	assertEquals(30, rtr1.getLength());
-    	assertEquals(30, rtr1.getRawText().length());
-    	assertEquals(31, rtr1.getCharacterStyle().getCharactersCovered());
-    	assertEquals(31, tr1.get(0).getParagraphStyle().getCharactersCovered());
-
-
-		// Write the slideshow out to a byte array
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ss.write(baos);
-
-		// Build an input stream of it
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		// Use POIFS to query that lot
-		POIFSFileSystem npfs = new POIFSFileSystem(bais);
-
-		// Check that the "PowerPoint Document" sections have the same size
-		DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document");
-		DocumentEntry nProps = (DocumentEntry)npfs.getRoot().getEntry("PowerPoint Document");
-		assertEquals(oProps.getSize(),nProps.getSize());
-
-		// Check that they contain the same data
-		byte[] _oData = new byte[oProps.getSize()];
-		byte[] _nData = new byte[nProps.getSize()];
-		pfs.createDocumentInputStream("PowerPoint Document").read(_oData);
-		npfs.createDocumentInputStream("PowerPoint Document").read(_nData);
-		for(int i=0; i<_oData.length; i++) {
-//			System.out.println(i + "\t" + Integer.toHexString(i) + "\t" + _oData[i]);
-			assertEquals(_oData[i], _nData[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/AllHSLFRecordTests.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/AllHSLFRecordTests.java
deleted file mode 100644
index 81bcefc..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/AllHSLFRecordTests.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests from the package <tt>org.apache.poi.hslf.record</tt>.
- * 
- * @author Josh Micich
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestAnimationInfoAtom.class,
-    TestCString.class,
-    TestColorSchemeAtom.class,
-    TestComment2000.class,
-    TestComment2000Atom.class,
-    TestCurrentUserAtom.class,
-    TestDocument.class,
-    TestDocumentAtom.class,
-    TestDocumentEncryptionAtom.class,
-    TestExControl.class,
-    TestExHyperlink.class,
-    TestExHyperlinkAtom.class,
-    TestExMediaAtom.class,
-    TestExObjList.class,
-    TestExObjListAtom.class,
-    TestExOleObjAtom.class,
-    TestExOleObjStg.class,
-    TestExVideoContainer.class,
-    TestFontCollection.class,
-    TestHeadersFootersAtom.class,
-    TestHeadersFootersContainer.class,
-    TestInteractiveInfo.class,
-    TestInteractiveInfoAtom.class,
-    TestNotesAtom.class,
-    TestRecordContainer.class,
-    TestRecordTypes.class,
-    TestSlideAtom.class,
-    TestSlidePersistAtom.class,
-    TestSound.class,
-    TestStyleTextPropAtom.class,
-    TestTextBytesAtom.class,
-    TestTextCharsAtom.class,
-    TestTextHeaderAtom.class,
-    TestTextRulerAtom.class,
-    TestTextSpecInfoAtom.class,
-    TestTxInteractiveInfoAtom.class,
-    TestTxMasterStyleAtom.class,
-    TestUserEditAtom.class
-})
-public class AllHSLFRecordTests {
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
deleted file mode 100644
index df3150c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that {@link HeadersFootersAtom} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestAnimationInfoAtom extends TestCase {
-    // From a real file
-    /*
-     <AnimationInfoAtom info="1" type="4081" size="28" offset="4015" header="01 00 F1 0F 1C 00 00 00 ">
-       00 00 00 07 04 05 00 00 00 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 00
-       00 00 00
-     </AnimationInfoAtom>
-     */
-    private final byte[] data = new byte[] {
-         0x01, 0x00, (byte)0xF1, 0x0F, 0x1C, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x07, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-
-    public void testRead() {
-        AnimationInfoAtom record = new AnimationInfoAtom(data, 0, data.length);
-        assertEquals(RecordTypes.AnimationInfoAtom.typeID, record.getRecordType());
-        assertTrue(record.getFlag(AnimationInfoAtom.Automatic));
-        assertTrue(record.getFlag(AnimationInfoAtom.Play));
-        assertTrue(record.getFlag(AnimationInfoAtom.Synchronous));
-        assertFalse(record.getFlag(AnimationInfoAtom.Reverse));
-        assertFalse(record.getFlag(AnimationInfoAtom.Sound));
-        assertFalse(record.getFlag(AnimationInfoAtom.StopSound));
-        assertFalse(record.getFlag(AnimationInfoAtom.Hide));
-        assertFalse(record.getFlag(AnimationInfoAtom.AnimateBg));
-        assertEquals(0x07000000, record.getDimColor());
-        assertEquals(0, record.getSoundIdRef());
-        assertEquals(0, record.getDelayTime());
-        assertEquals(2, record.getOrderID());
-        assertEquals(0, record.getSlideCount());
-    }
-
-    public void testWrite() throws Exception {
-        AnimationInfoAtom record = new AnimationInfoAtom(data, 0, data.length);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(data, b);
-    }
-
-    public void testNewRecord() throws Exception {
-        AnimationInfoAtom record = new AnimationInfoAtom();
-        record.setDimColor(0x07000000);
-        record.setOrderID(2);
-        record.setFlag(AnimationInfoAtom.Automatic, true);
-        record.setFlag(AnimationInfoAtom.Play, true);
-        record.setFlag(AnimationInfoAtom.Synchronous, true);
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(data, b);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java
deleted file mode 100644
index 4289c27..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that CString works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestCString extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] { 0, 0, 0xBA-256, 0x0f, 0x10, 0, 0, 0,
-		0x48, 00, 0x6F, 00, 0x67, 00, 0x77, 00,
-		0x61, 00, 0x72, 00, 0x74, 00, 0x73, 00  };
-	private final byte[] data_b = new byte[] { 0x10, 0, 0xBA-256, 0x0f, 0x10, 0, 0, 0,
-		0x43, 00, 0x6F, 00, 0x6D, 00, 0x6D, 00,
-		0x65, 00, 0x6E, 00, 0x74, 00, 0x73, 00 };
-
-    public void testRecordType() {
-		CString ca = new CString(data_a, 0, data_a.length);
-		assertEquals(4026l, ca.getRecordType());
-		CString cb = new CString(data_b, 0, data_a.length);
-		assertEquals(4026l, cb.getRecordType());
-	}
-	public void testCount() {
-		CString ca = new CString(data_a, 0, data_a.length);
-		assertEquals(0, ca.getOptions());
-		CString cb = new CString(data_b, 0, data_a.length);
-		assertEquals(0x10, cb.getOptions());
-
-		ca.setOptions(28);
-		assertEquals(28, ca.getOptions());
-	}
-
-	public void testText() {
-		CString ca = new CString(data_a, 0, data_a.length);
-		assertEquals("Hogwarts", ca.getText());
-		CString cb = new CString(data_b, 0, data_a.length);
-		assertEquals("Comments", cb.getText());
-
-		ca.setText("FooBar");
-		assertEquals("FooBar", ca.getText());
-	}
-
-	public void testWrite() throws Exception {
-		CString ca = new CString(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-
-		CString cb = new CString(data_b, 0, data_a.length);
-		ByteArrayOutputStream baosB = new ByteArrayOutputStream();
-		cb.writeOut(baosB);
-		b = baosB.toByteArray();
-
-		assertEquals(data_b.length, b.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],b[i]);
-		}
-	}
-
-	// Turn data_a into data_b
-	public void testChange() throws Exception {
-		CString ca = new CString(data_a, 0, data_a.length);
-		ca.setText("Comments");
-		ca.setOptions(0x10);
-
-		try {
-			for(int i=0; i<data_a.length; i++) {
-				assertEquals(data_a[i],data_b[i]);
-			}
-			fail();
-		} catch(Error e) {
-			// Good, they're not the same
-		}
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Should now be the same
-		assertEquals(data_b.length, b.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java
deleted file mode 100644
index 9e0af0d..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that ColorSchemAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestColorSchemeAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] { 60, 0, 0xF0-256, 0x07, 0x20, 0, 0, 0,
-		0xFF-256, 0xFF-256, 0xFF-256, 00,   00, 00, 00, 00,
-		0x80-256, 0x80-256, 0x80-256, 00,   00, 00, 00, 00,
-		0xBB-256, 0xE0-256, 0xE3-256, 00,   0x33, 0x33, 0x99-256, 00,
-		00, 0x99-256, 0x99-256, 00,         0x99-256, 0xCC-256, 00, 00
-	};
-
-	public void testRecordType() {
-		ColorSchemeAtom csa = new ColorSchemeAtom(data_a,0,data_a.length);
-		assertEquals(2032l, csa.getRecordType());
-	}
-
-	public void testToRGB() {
-		byte[] rgb = ColorSchemeAtom.splitRGB(3669760);
-
-		assertEquals(3,rgb.length);
-		assertEquals(0, rgb[0]);
-		assertEquals(255-256, rgb[1]);
-		assertEquals(55, rgb[2]);
-	}
-
-	public void testFromRGB() {
-		byte[] rgb_a = new byte[] { 0, 255-256, 55 };
-		byte[] rgb_b = new byte[] { 255-256, 127, 79 };
-
-		assertEquals( 3669760, ColorSchemeAtom.joinRGB( rgb_a ) );
-		assertEquals( 5210111, ColorSchemeAtom.joinRGB( rgb_b ) );
-
-		assertEquals( 3669760, ColorSchemeAtom.joinRGB( rgb_a[0], rgb_a[1], rgb_a[2] ) );
-		assertEquals( 5210111, ColorSchemeAtom.joinRGB( rgb_b[0], rgb_b[1], rgb_b[2] ) );
-	}
-
-	public void testRGBs() {
-		ColorSchemeAtom csa = new ColorSchemeAtom(data_a,0,data_a.length);
-
-		assertEquals( 16777215 , csa.getBackgroundColourRGB() );
-		assertEquals( 0 , csa.getTextAndLinesColourRGB() );
-		assertEquals( 8421504 , csa.getShadowsColourRGB() );
-		assertEquals( 0 , csa.getTitleTextColourRGB() );
-		assertEquals( 14934203 , csa.getFillsColourRGB() );
-		assertEquals( 10040115 , csa.getAccentColourRGB() );
-		assertEquals( 10066176 , csa.getAccentAndHyperlinkColourRGB() );
-		assertEquals( 52377 , csa.getAccentAndFollowingHyperlinkColourRGB() );
-	}
-
-	public void testWrite() throws Exception {
-		ColorSchemeAtom csa = new ColorSchemeAtom(data_a,0,data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		csa.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java
deleted file mode 100644
index 0081b84..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests that Comment2000 works properly.
- * TODO: Test Comment200Atom within
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestComment2000 {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		0x0F, 00, 0xE0-256, 0x2E, 0x9C-256, 00, 00, 00,
-		00, 00, 0xBA-256, 0x0F, 0x14, 00, 00, 00,
-		0x44, 00, 0x75, 00, 0x6D, 00, 0x62, 00,
-		0x6C, 00, 0x65, 00, 0x64, 00, 0x6F, 00,
-		0x72, 00, 0x65, 00,
-		0x10, 00, 0xBA-256, 0x0F, 0x4A, 00, 00, 00,
-		0x59, 00, 0x65, 00, 0x73, 00, 0x2C, 00,
-		0x20, 00, 0x74, 00, 0x68, 00, 0x65, 00,
-		0x79, 00, 0x20, 00, 0x63, 00, 0x65, 00,
-		0x72, 00, 0x74, 00,	0x61, 00, 0x69, 00,
-		0x6E, 00, 0x6C, 00, 0x79, 00, 0x20, 00,
-		0x61, 00, 0x72, 00, 0x65, 00, 0x2C, 00,
-		0x20, 00, 0x61, 00, 0x72, 00, 0x65, 00,
-		0x6E, 00, 0x27, 00, 0x74, 00, 0x20, 00,
-		0x74, 00, 0x68, 00, 0x65, 00, 0x79, 00, 0x21, 00,
-		0x20, 00, 0xBA-256, 0x0F, 0x02, 00, 00, 00,
-		0x44, 00,
-		00, 00, 0xE1-256, 0x2E, 0x1C, 00, 00, 00,
-		01, 00, 00, 00, 0xD6-256, 07, 01, 00,
-		02, 00, 0x18, 00, 0x0A, 00, 0x1A, 00,
-		0x0F, 00, 0xCD-256, 00, 0x92-256, 00,
-		00,	00, 0x92-256, 00, 00, 00
-	};
-	private final byte[] data_b = new byte[] {
-		0x0F, 00, 0xE0-256, 0x2E, 0xAC-256, 00, 00, 00,
-		00, 00, 0xBA-256, 0x0F, 0x10, 00, 00, 00,
-		0x48, 00, 0x6F, 00, 0x67, 00, 0x77, 00,
-		0x61, 00, 0x72, 00, 0x74, 00, 0x73, 00,
-		0x10, 00, 0xBA-256, 0x0F, 0x5E, 00, 00, 00,
-		0x43, 00, 0x6F, 00, 0x6D, 00, 0x6D, 00,
-		0x65, 00, 0x6E, 00, 0x74, 00, 0x73, 00,
-		0x20, 00, 0x61, 00, 0x72, 00, 0x65, 00,
-		0x20, 00, 0x66, 00, 0x75, 00, 0x6E, 00,
-		0x20, 00, 0x74, 00, 0x68, 00, 0x69, 00,
-		0x6E, 00, 0x67, 00, 0x73, 00, 0x20, 00,
-		0x74, 00, 0x6F, 00, 0x20, 00, 0x61, 00,
-		0x64, 00, 0x64, 00, 0x20, 00, 0x69, 00,
-		0x6E, 00, 0x2C, 00, 0x20, 00, 0x61, 00,
-		0x72, 00, 0x65, 00, 0x6E, 00, 0x27, 00,
-		0x74, 00, 0x20, 00, 0x74, 00, 0x68, 00,
-		0x65, 00, 0x79, 00, 0x3F, 00,
-		0x20, 00, 0xBA-256, 0x0F, 0x02, 00, 00, 00,
-		0x48, 00,
-		00, 00, 0xE1-256, 0x2E, 0x1C, 00, 00, 00,
-		01, 00, 00, 00, 0xD6-256, 0x07, 01, 00,
-		02, 00, 0x18, 00, 0x16, 00, 0x19, 00, 03,
-		00, 0xD5-256, 02, 0x0A, 00, 00, 00,
-		0x0A, 00, 00, 00
-		};
-
-	private static SimpleDateFormat sdf;
-	
-	@BeforeClass
-	public static void initDateFormat() {
-	    sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.ROOT);
-	    sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-	}
-
-    @Test
-    public void testRecordType() {
-		Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
-		assertEquals(12000l, ca.getRecordType());
-	}
-    
-    @Test
-    public void testAuthor() {
-		Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
-		assertEquals("Dumbledore", ca.getAuthor());
-		assertEquals("D", ca.getAuthorInitials());
-	}
-	
-    @Test
-    public void testText() {
-		Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
-		assertEquals("Yes, they certainly are, aren't they!", ca.getText());
-	}
-	
-    @Test
-    public void testCommentAtom() throws Exception {
-		Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
-		Comment2000Atom c2a = ca.getComment2000Atom();
-
-		assertEquals(1, c2a.getNumber());
-		assertEquals(0x92, c2a.getXOffset());
-		assertEquals(0x92, c2a.getYOffset());
-		Date exp_a = sdf.parse("2006-01-24 10:26:15.205");
-		assertEquals(exp_a, c2a.getDate());
-	}
-	
-    @Test
-    public void testCommentAtomB() throws Exception {
-		Comment2000 cb = new Comment2000(data_b, 0, data_b.length);
-		Comment2000Atom c2b = cb.getComment2000Atom();
-
-		assertEquals(1, c2b.getNumber());
-		assertEquals(0x0a, c2b.getXOffset());
-		assertEquals(0x0a, c2b.getYOffset());
-		Date exp_b = sdf.parse("2006-01-24 22:25:03.725");
-		assertEquals(exp_b, c2b.getDate());
-	}
-
-    @Test
-    public void testWrite() throws Exception {
-		Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Change a few things
-    @Test
-    public void testChange() throws Exception {
-		Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
-		Comment2000 cb = new Comment2000(data_b, 0, data_b.length);
-		Comment2000 cn = new Comment2000();
-		ca.setAuthor("Hogwarts");
-		ca.setAuthorInitials("H");
-		ca.setText("Comments are fun things to add in, aren't they?");
-		cn.setAuthor("Hogwarts");
-		cn.setAuthorInitials("H");
-		cn.setText("Comments are fun things to add in, aren't they?");
-
-		// Change the Comment2000Atom
-		Comment2000Atom c2a = ca.getComment2000Atom();
-		Comment2000Atom c2n = cn.getComment2000Atom();
-		c2a.setNumber(1);
-		c2a.setXOffset(0x0a);
-		c2a.setYOffset(0x0a);
-		c2n.setNumber(1);
-		c2n.setXOffset(0x0a);
-		c2n.setYOffset(0x0a);
-
-		Date new_date = sdf.parse("2006-01-24 22:25:03.725");
-		c2a.setDate(new_date);
-		c2n.setDate(new_date);
-
-		// Check now the same
-		assertEquals(ca.getText(), cb.getText());
-		assertEquals(cn.getText(), cb.getText());
-		assertEquals(ca.getAuthor(), cb.getAuthor());
-		assertEquals(cn.getAuthor(), cb.getAuthor());
-		assertEquals(ca.getAuthorInitials(), cb.getAuthorInitials());
-		assertEquals(cn.getAuthorInitials(), cb.getAuthorInitials());
-
-		// Check bytes weren't the same
-		try {
-			for(int i=0; i<data_a.length; i++) {
-				assertEquals(data_a[i],data_b[i]);
-			}
-			fail();
-		} catch(Error e) {
-			// Good, they're not the same
-		}
-
-		// Check bytes are now the same
-		ByteArrayOutputStream baosa = new ByteArrayOutputStream();
-		ByteArrayOutputStream baosn = new ByteArrayOutputStream();
-		ca.writeOut(baosa);
-		cn.writeOut(baosn);
-		byte[] ba = baosa.toByteArray();
-		byte[] bn = baosn.toByteArray();
-
-		// Should now be the same
-		assertEquals(data_b.length, ba.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],ba[i]);
-		}
-		assertEquals(data_b.length, bn.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],bn[i]);
-		}
-	}
-
-    /**
-     *  A Comment2000 records with missing commentTextAtom
-     */
-    @Test
-    public void testBug44770() {
-		byte[] data = {
-            0x0F, 0x00, (byte)0xE0, 0x2E, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, (byte)0xBA, 0x0F,
-            0x08, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x45, 0x00, 0x53, 0x00, 0x53, 0x00, 0x20,
-            0x00, (byte)0xBA, 0x0F, 0x02, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, (byte)0xE1, 0x2E,
-            0x1C, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, (byte)0xD9, 0x07, 0x08, 0x00,
-            0x01, 0x00, 0x18, 0x00, 0x10, 0x00, 0x1F, 0x00, 0x05, 0x00, (byte)0x80, 0x03,
-            0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 00
-        };
-        Comment2000 ca = new Comment2000(data, 0, data.length);
-        Record[] ch = ca.getChildRecords();
-        assertEquals(3, ch.length);
-
-        assertTrue(ch[0] instanceof CString);
-        assertEquals(0, ((CString)ch[0]).getOptions() >> 4);
-        assertTrue(ch[1] instanceof CString);
-        assertEquals(2, ((CString)ch[1]).getOptions() >> 4);
-        assertTrue(ch[2] instanceof Comment2000Atom);
-
-        assertEquals("NESS", ca.getAuthor());
-        assertEquals("N", ca.getAuthorInitials());
-        assertNull(ca.getText()); //commentTextAtom is missing
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java
deleted file mode 100644
index 05a3a67..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests that Comment2000Atom works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestComment2000Atom {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		00, 00, 0xE1-256, 0x2E, 0x1C, 00, 00, 00,
-		01, 00, 00, 00, 0xD6-256, 07, 01, 00,
-		02, 00, 0x18, 00, 0x0A, 00, 0x1A, 00,
-		0x0F, 00, 0xCD-256, 00, 0x92-256, 00,
-		00,	00, 0x92-256, 00, 00, 00
-	};
-	private final byte[] data_b = new byte[] {
-		00, 00, 0xE1-256, 0x2E, 0x1C, 00, 00, 00,
-		05, 00, 00, 00, 0xD6-256, 0x07, 01, 00,
-		02, 00, 0x18, 00, 0x15, 00, 0x19, 00, 03,
-		00, 0xD5-256, 02, 0x0A, 00, 00, 00,
-		0x0E, 00, 00, 00
-		};
-
-    private static SimpleDateFormat sdf;
-    
-    @BeforeClass
-    public static void initDateFormat() {
-        sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.ROOT);
-        sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-    }
-
-	@Test
-	public void testRecordType() {
-		Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
-		assertEquals(12001l, ca.getRecordType());
-	}
-
-	@Test
-    public void testGetDate() throws Exception {
-		Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
-		Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length);
-
-		// A is 2006-01-24 (2nd day of week) 10:26:15.205
-		Date exp_a = sdf.parse("2006-01-24 10:26:15.205");
-		// B is 2006-01-24 (2nd day of week) 21:25:03.725
-		Date exp_b = sdf.parse("2006-01-24 21:25:03.725");
-
-		assertEquals(exp_a, ca.getDate());
-		assertEquals(exp_b, cb.getDate());
-	}
-
-	@Test
-    public void testGetNums() {
-		Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
-		Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length);
-
-		// A is number 1
-		assertEquals(1, ca.getNumber());
-		// B is number 5
-		assertEquals(5, cb.getNumber());
-	}
-
-	@Test
-    public void testGetPos() {
-		Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
-		Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length);
-
-		// A is at 0x92, 0x92
-		assertEquals(0x92, ca.getXOffset());
-		assertEquals(0x92, ca.getYOffset());
-
-		// B is at 0x0A, 0x0E
-		assertEquals(0x0A, cb.getXOffset());
-		assertEquals(0x0E, cb.getYOffset());
-	}
-
-	@Test
-    public void testWrite() throws Exception {
-		Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Create A from scratch
-	@Test
-    public void testCreate() throws Exception {
-		Comment2000Atom a = new Comment2000Atom();
-
-		// Set number, x and y
-		a.setNumber(1);
-		a.setXOffset(0x92);
-		a.setYOffset(0x92);
-
-		// Set the date
-		Date date_a = sdf.parse("2006-01-24 10:26:15.205");
-		a.setDate(date_a);
-
-		// Check it's now the same as a
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		a.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Try to turn a into b
-	@Test
-    public void testChange() throws Exception {
-		Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
-
-		// Change the number
-		ca.setNumber(5);
-
-		// Change the date
-		Date new_date = sdf.parse("2006-01-24 21:25:03.725");
-		ca.setDate(new_date);
-
-		// Change the x and y
-		ca.setXOffset(0x0A);
-		ca.setYOffset(0x0E);
-
-		// Check bytes are now the same
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Should now be the same
-		assertEquals(data_b.length, b.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
deleted file mode 100644
index 7ce0f6c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-
-/**
- * Tests that CurrentUserAtom works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestCurrentUserAtom {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-	/** Not encrypted */
-	private static final String normalFile = "basic_test_ppt_file.ppt";
-	/** Encrypted */
-	private static final String encFile = "Password_Protected-hello.ppt";
-
-	@Test
-	public void readNormal() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(_slTests.getFile(normalFile));
-
-		CurrentUserAtom cu = new CurrentUserAtom(fs.getRoot());
-		fs.close();
-
-		// Check the contents
-		assertEquals("Hogwarts", cu.getLastEditUsername());
-		assertEquals(0x2942, cu.getCurrentEditOffset());
-
-		// Round trip
-		POIFSFileSystem poifs = new POIFSFileSystem();
-		cu.writeToFS(poifs);
-		
-		CurrentUserAtom cu2 = new CurrentUserAtom(poifs.getRoot());
-		assertEquals("Hogwarts", cu2.getLastEditUsername());
-		assertEquals(0x2942, cu2.getCurrentEditOffset());
-		
-		poifs.close();
-	}
-
-	@Test(expected = EncryptedPowerPointFileException.class)
-	public void readEnc() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(_slTests.getFile(encFile));
-
-		try {
-    		new CurrentUserAtom(fs.getRoot());
-    		assertTrue(true); // not yet failed
-    		
-    		new HSLFSlideShowImpl(fs).close();
-		} finally {
-		    fs.close();
-		}
-	}
-
-	@Test
-	public void writeNormal() throws Exception {
-		// Get raw contents from a known file
-		POIFSFileSystem fs = new POIFSFileSystem(_slTests.getFile(normalFile));
-		DocumentEntry docProps = (DocumentEntry)fs.getRoot().getEntry("Current User");
-		byte[] contents = new byte[docProps.getSize()];
-		InputStream in = fs.getRoot().createDocumentInputStream("Current User");
-		in.read(contents);
-		in.close();
-		fs.close();
-
-		// Now build up a new one
-		CurrentUserAtom cu = new CurrentUserAtom();
-		cu.setLastEditUsername("Hogwarts");
-		cu.setCurrentEditOffset(0x2942);
-
-		// Check it matches
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		cu.writeOut(baos);
-		byte[] out = baos.toByteArray();
-
-		assertArrayEquals(contents, out);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
deleted file mode 100644
index e9134ee..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.poifs.filesystem.*;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests that Document works properly (Also tests Environment while we're at it)
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestDocument extends TestCase {
-	// HSLFSlideShow primed on the test data
-	private final HSLFSlideShowImpl ss;
-	// POIFS primed on the test data
-	private final POIFSFileSystem pfs;
-
-	public TestDocument() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		pfs = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss = new HSLFSlideShowImpl(pfs);
-	}
-
-	private Document getDocRecord() {
-		Record[] r = ss.getRecords();
-		for (int i = (r.length - 1); i >= 0; i--) {
-			if (r[i] instanceof Document) {
-				return (Document) r[i];
-			}
-		}
-		throw new IllegalStateException("No Document record found");
-	}
-
-	public void testRecordType() {
-		Document dr = getDocRecord();
-		assertEquals(1000, dr.getRecordType());
-	}
-
-	public void testChildRecords() {
-		Document dr = getDocRecord();
-		assertNotNull(dr.getDocumentAtom());
-
-		assertNotNull(dr.getEnvironment());
-
-		assertNotNull(dr.getSlideListWithTexts());
-		assertEquals(3, dr.getSlideListWithTexts().length);
-		assertNotNull(dr.getSlideListWithTexts()[0]);
-		assertNotNull(dr.getSlideListWithTexts()[1]);
-		assertNotNull(dr.getSlideListWithTexts()[2]);
-	}
-
-	public void testEnvironment() {
-		Document dr = getDocRecord();
-		Environment env = dr.getEnvironment();
-
-		assertEquals(1010, env.getRecordType());
-		assertNotNull(env.getFontCollection());
-	}
-
-	// No need to check re-writing - hslf.TestReWrite does all that for us
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
deleted file mode 100644
index 40f4cd7..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that DocumentAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestDocumentAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] { 1, 0, 0xE9-256, 3, 0x28, 0, 0, 0,
-		0x80-256, 0x16, 0, 0, 0xE0-256, 0x10, 0, 0,
-		0xE0-256, 0x10, 0, 0, 0x80-256, 0x16, 0, 0,
-		0x05, 0, 0, 0, 0x0A, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
-		1, 0, 0, 0, 0, 0, 0, 1 };
-
-    public void testRecordType() {
-		DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
-		assertEquals(1001l, da.getRecordType());
-	}
-	public void testSizeAndZoom() {
-		DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
-		assertEquals(5760l, da.getSlideSizeX());
-		assertEquals(4320l, da.getSlideSizeY());
-		assertEquals(4320l, da.getNotesSizeX());
-		assertEquals(5760l, da.getNotesSizeY());
-
-		assertEquals(5l, da.getServerZoomFrom());
-		assertEquals(10l, da.getServerZoomTo());
-	}
-	public void testMasterPersist() {
-		DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
-		assertEquals(2l, da.getNotesMasterPersist());
-		assertEquals(0l, da.getHandoutMasterPersist());
-	}
-	public void testSlideDetails() {
-		DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
-		assertEquals(1, da.getFirstSlideNum());
-		assertEquals(0, da.getSlideSizeType());
-	}
-	public void testBooleans() {
-		DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
-		assertEquals(false, da.getSaveWithFonts());
-		assertEquals(false, da.getOmitTitlePlace());
-		assertEquals(false, da.getRightToLeft());
-		assertEquals(true, da.getShowComments());
-	}
-
-	public void testWrite() throws Exception {
-		DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		da.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
deleted file mode 100644
index 80e9f53..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.security.MessageDigest;
-import java.util.List;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFSlide;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIDecryptor;
-import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionHeader;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that DocumentEncryption works properly.
- */
-public class TestDocumentEncryption {
-    POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-    @Before
-    @After  // also afterwards to not affect other tests running in the same JVM
-    public void resetPassword() {
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-    }
-    
-    @Test
-    public void cryptoAPIDecryptionOther() throws Exception {
-        Biff8EncryptionKey.setCurrentUserPassword("hello");
-        String encPpts[] = {
-            "Password_Protected-56-hello.ppt",
-            "Password_Protected-hello.ppt",
-            "Password_Protected-np-hello.ppt",
-        };
-        
-        for (String pptFile : encPpts) {
-            try {
-                NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true);
-                HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs);
-                new HSLFSlideShow(hss);
-                fs.close();
-            } catch (EncryptedPowerPointFileException e) {
-                fail(pptFile+" can't be decrypted");
-            }
-        }
-    }
-
-    @Test
-    public void cryptoAPIChangeKeySize() throws Exception {
-        String pptFile = "cryptoapi-proc2356.ppt";
-        Biff8EncryptionKey.setCurrentUserPassword("crypto");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true);
-        HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs);
-        // need to cache data (i.e. read all data) before changing the key size
-        List<HSLFPictureData> picsExpected = hss.getPictureData();
-        hss.getDocumentSummaryInformation();
-        EncryptionInfo ei = hss.getDocumentEncryptionAtom().getEncryptionInfo();
-        ((CryptoAPIEncryptionHeader)ei.getHeader()).setKeySize(0x78);
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        hss.write(bos);
-        fs.close();
-        
-        fs = new NPOIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-        hss = new HSLFSlideShowImpl(fs);
-        List<HSLFPictureData> picsActual = hss.getPictureData();
-        fs.close();
-        
-        assertEquals(picsExpected.size(), picsActual.size());
-        for (int i=0; i<picsExpected.size(); i++) {
-            assertArrayEquals(picsExpected.get(i).getRawData(), picsActual.get(i).getRawData());
-        }
-    }
-
-    @Test
-    public void cryptoAPIEncryption() throws Exception {
-        /* documents with multiple edits need to be normalized for encryption */
-        String pptFile = "57272_corrupted_usereditatom.ppt";
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true);
-        HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs);
-        hss.normalizeRecords();
-        
-        // normalized ppt
-        ByteArrayOutputStream expected = new ByteArrayOutputStream();
-        hss.write(expected);
-        
-        // encrypted
-        Biff8EncryptionKey.setCurrentUserPassword("hello");
-        ByteArrayOutputStream encrypted = new ByteArrayOutputStream();
-        hss.write(encrypted);
-        fs.close();
-
-        // decrypted
-        ByteArrayInputStream bis = new ByteArrayInputStream(encrypted.toByteArray());
-        fs = new NPOIFSFileSystem(bis);
-        hss = new HSLFSlideShowImpl(fs);
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-        ByteArrayOutputStream actual = new ByteArrayOutputStream();
-        hss.write(actual);
-        fs.close();
-        
-        assertArrayEquals(expected.toByteArray(), actual.toByteArray());
-    }    
-    
-    @Test
-    public void cryptoAPIDecryption() throws Exception {
-        // taken from a msdn blog:
-        // http://blogs.msdn.com/b/openspecification/archive/2009/05/08/dominic-salemno.aspx
-        Biff8EncryptionKey.setCurrentUserPassword("crypto");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile("cryptoapi-proc2356.ppt"));
-        HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs);
-        HSLFSlideShow ss = new HSLFSlideShow(hss);
-        
-        HSLFSlide slide = ss.getSlides().get(0);
-        String rawText = HSLFTextParagraph.getRawText(slide.getTextParagraphs().get(0));
-        assertEquals("Dominic Salemno", rawText);
-
-        String picCmp[][] = {
-            {"0","nKsDTKqxTCR8LFkVVWlP9GSTvZ0="},
-            {"95163","SuNOR+9V1UVYZIoeD65l3VTaLoc="},
-            {"100864","Ql3IGrr4bNq07ZTp5iPg7b+pva8="},
-            {"714114","8pdst9NjBGSfWezSZE8+aVhIRe0="},
-            {"723752","go6xqW7lvkCtlOO5tYLiMfb4oxw="},
-            {"770128","gZUM8YqRNL5kGNfyyYvEEernvCc="},
-            {"957958","CNU2iiqUFAnk3TDXsXV1ihH9eRM="},                
-        };
-        
-        MessageDigest md = CryptoFunctions.getMessageDigest(HashAlgorithm.sha1);
-        List<HSLFPictureData> pd = hss.getPictureData();
-        int i = 0;
-        for (HSLFPictureData p : pd) {
-            byte hash[] = md.digest(p.getData());
-            assertEquals(Integer.parseInt(picCmp[i][0]), p.getOffset());
-            assertEquals(picCmp[i][1], Base64.encodeBase64String(hash));
-            i++;
-        }
-        
-        DocumentEncryptionAtom dea = hss.getDocumentEncryptionAtom();
-        
-        POIFSFileSystem fs2 = ((CryptoAPIDecryptor)dea.getEncryptionInfo().getDecryptor()).getSummaryEntries(fs.getRoot(), "EncryptedSummary");
-        PropertySet ps = PropertySetFactory.create(fs2.getRoot(), SummaryInformation.DEFAULT_STREAM_NAME);
-        assertTrue(ps.isSummaryInformation());
-        assertEquals("RC4 CryptoAPI Encryption", ps.getProperties()[1].getValue());
-        ps = PropertySetFactory.create(fs2.getRoot(), DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        assertTrue(ps.isDocumentSummaryInformation());
-        assertEquals("On-screen Show (4:3)", ps.getProperties()[1].getValue());
-        fs.close();
-        fs2.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
deleted file mode 100644
index 7e394cb..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-/**
- * Tests that DocumentEncryptionAtom works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestDocumentEncryptionAtom {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		0x0F, 00, 0x14, 0x2F, 0xBE-256, 00, 00, 00,
-		02, 00, 02, 00, 0x0C, 00, 00, 00,
-		0x76, 00, 00, 00, 0x0C, 00, 00, 00,
-		00, 00, 00, 00, 01, 0x68, 00, 00,
-		04, 0x80-256, 00, 00, 0x28, 00, 00, 00,
-		01, 00, 00, 00, 0x30, 00, 0x26, 01,
-		00, 00, 00, 00,
-
-		0x4D, 00, 0x69, 00,
-		0x63, 00, 0x72, 00, 0x6F, 00, 0x73, 00,
-		0x6F, 00, 0x66, 00, 0x74, 00, 0x20, 00,
-		0x42, 00, 0x61, 00, 0x73, 00, 0x65, 00,
-		0x20, 00, 0x43, 00, 0x72, 00, 0x79, 00,
-		0x70, 00, 0x74, 00, 0x6F, 00, 0x67, 00,
-		0x72, 00, 0x61, 00, 0x70, 00, 0x68, 00,
-		0x69, 00, 0x63, 00, 0x20, 00, 0x50, 00,
-		0x72, 00, 0x6F, 00, 0x76, 00, 0x69, 00,
-		0x64, 00, 0x65, 00, 0x72, 00, 0x20, 00,
-		0x76, 00, 0x31, 00, 0x2E, 00, 0x30, 00,
-		0x00, 0x00,
-
-		0x10, 00, 0x00, 00,
-		0x62, 0xA6-256,
-		0xDF-256, 0xEA-256, 0x96-256, 0x84-256,
-		0xFB-256, 0x89-256, 0x93-256, 0xCA-256,
-		0xBA-256, 0xEE-256, 0x8E-256, 0x43,
-		0xC8-256, 0x71, 0xD1-256, 0x89-256,
-		0xF6-256, 0x4B, 0x2B, 0xD9-256,
-		0x7E, 0x0B, 0x52, 0xFB-256,
-		0x68, 0xD7-256, 0x5A, 0x4E, 0x45, 0xDF-256, 0x14, 0x00,
-		0x00, 0x00, 0x93-256, 0x15, 0x27, 0xEB-256, 0x21, 0x54,
-		0x7F, 0x0B, 0x56, 0x07, 0xEE-256, 0x66, 0xEB-256, 0x6F,
-		0xB2-256, 0x8E-256, 0x67, 0x54, 0x07, 0x04, 0x00
-	};
-
-	private final byte[] data_b = new byte[] {
-			15, 0, 20, 47, -66, 0, 0, 0,
-			2, 0, 2, 0, 4,
-			0, 0, 0, 118, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0,
-			0, 1, 104, 0, 0, 4, -128, 0, 0, 56, 0, 0, 0,
-			1, 0, 0, 0, 48, 0, 38, 1, 0, 0, 0, 0, 77, 0,
-			105, 0, 99, 0, 114, 0, 111, 0, 115, 0, 111,
-			0, 102, 0, 116, 0, 32, 0, 66, 0, 97, 0, 115,
-			0, 101, 0, 32, 0, 67, 0, 114, 0, 121, 0, 112,
-			0, 116, 0, 111, 0, 103, 0, 114, 0, 97, 0,
-			112, 0, 104, 0, 105, 0, 99, 0, 32, 0, 80, 0,
-			114, 0, 111, 0, 118, 0, 105, 0, 100, 0, 101,
-			0, 114, 0, 32, 0, 118, 0, 49, 0, 46, 0, 48,
-			0, 0, 0, 16, 0, 0, 0, -80, -66, 112, -40, 57,
-			110, 54, 80, 64, 61, -73, -29, 48, -35, -20,
-			17, -40, 84, 54, 6, -103, 125, -22, -72, 53,
-			103, -114, 13, -48, 111, 29, 78, 20, 0, 0,
-			0, -97, -67, 55, -62, -94, 14, 15, -21, 37,
-			3, -104, 22, 6, 102, -61, -98, 62, 40, 61, 21
-	};
-
-	@Test
-    public void recordType() throws IOException {
-		DocumentEncryptionAtom dea1 = new DocumentEncryptionAtom(data_a, 0, data_a.length);
-		assertEquals(12052l, dea1.getRecordType());
-
-		DocumentEncryptionAtom dea2 = new DocumentEncryptionAtom(data_b, 0, data_b.length);
-		assertEquals(12052l, dea2.getRecordType());
-
-		assertEquals(199, data_a.length);
-		assertEquals(198, data_b.length);
-	}
-
-	@Test
-    public void encryptionTypeName() throws IOException {
-		DocumentEncryptionAtom dea1 = new DocumentEncryptionAtom(data_a, 0, data_a.length);
-		assertEquals("Microsoft Base Cryptographic Provider v1.0", dea1.getEncryptionProviderName());
-
-		DocumentEncryptionAtom dea2 = new DocumentEncryptionAtom(data_b, 0, data_b.length);
-		assertEquals("Microsoft Base Cryptographic Provider v1.0", dea2.getEncryptionProviderName());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java
deleted file mode 100644
index 29c7ee2..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that {@link org.apache.poi.hslf.record.ExControl} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestExControl extends TestCase {
-
-	// From a real file (embedded SWF control)
-    /*
-     <ExControl info="15" type="4078" size="218" offset="76" header="0F 00 EE 0F DA 00 00 00 ">
-       <ExControlAtom info="0" type="4091" size="4" offset="84" header="00 00 FB 0F 04 00 00 00 ">
-         00 01 00 00
-       </ExControlAtom>
-       <ExOleObjAtom info="1" type="4035" size="24" offset="96" header="01 00 C3 0F 18 00 00 00 ">
-         01 00 00 00 02 00 00 00 01 00 00 00 00 00 00 00 02 00 00 00 00 96 13 00
-       </ExOleObjAtom>
-       <CString info="16" type="4026" size="44" offset="128" header="10 00 BA 0F 2C 00 00 00 ">
-         53 00 68 00 6F 00 63 00 6B 00 77 00 61 00 76 00 65 00 20 00 46 00 6C 00 61
-         00 73 00 68 00 20 00 4F 00 62 00 6A 00 65 00 63 00 74 00
-       </CString>
-       <CString info="32" type="4026" size="62" offset="180" header="20 00 BA 0F 3E 00 00 00 ">
-         53 00 68 00 6F 00 63 00 6B 00 77 00 61 00 76 00 65 00 46 00 6C 00 61 00 73
-         00 68 00 2E 00 53 00 68 00 6F 00 63 00 6B 00 77 00 61 00 76 00 65 00 46 00
-         6C 00 61 00 73 00 68 00 2E 00 39 00
-       </CString>
-       <CString info="48" type="4026" size="44" offset="250" header="30 00 BA 0F 2C 00 00 00 ">
-         53 00 68 00 6F 00 63 00 6B 00 77 00 61 00 76 00 65 00 20 00 46 00 6C 00 61
-         00 73 00 68 00 20 00 4F 00 62 00 6A 00 65 00 63 00 74 00
-       </CString>
-     </ExControl>
-     */
-    private final byte[] data = new byte[] {
-            0x0F, 0x00, (byte)0xEE, 0x0F, (byte)0xDA, 0x00, 0x00, 0x00, 0x00, 0x00, (byte)0xFB, 0x0F, 0x04, 0x00, 0x00, 0x00,
-            0x00, 0x01, 0x00, 0x00, 0x01, 0x00, (byte)0xC3, 0x0F, 0x18, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00,
-            0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, (byte)0x96, 0x13, 0x00,
-            0x10, 0x00, (byte)0xBA, 0x0F, 0x2C, 0x00, 0x00, 0x00, 0x53, 0x00, 0x68, 0x00, 0x6F, 0x00, 0x63, 0x00, 0x6B, 0x00,
-            0x77, 0x00, 0x61, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x46, 0x00, 0x6C, 0x00, 0x61, 0x00, 0x73, 0x00, 0x68,
-            0x00, 0x20, 0x00, 0x4F, 0x00, 0x62, 0x00, 0x6A, 0x00, 0x65, 0x00, 0x63, 0x00, 0x74, 0x00, 0x20, 0x00, (byte)0xBA,
-            0x0F, 0x3E, 0x00, 0x00, 0x00, 0x53, 0x00, 0x68, 0x00, 0x6F, 0x00, 0x63, 0x00, 0x6B, 0x00, 0x77, 0x00, 0x61, 0x00,
-            0x76, 0x00, 0x65, 0x00, 0x46, 0x00, 0x6C, 0x00, 0x61, 0x00, 0x73, 0x00, 0x68, 0x00, 0x2E, 0x00, 0x53, 0x00, 0x68,
-            0x00, 0x6F, 0x00, 0x63, 0x00, 0x6B, 0x00, 0x77, 0x00, 0x61, 0x00, 0x76, 0x00, 0x65, 0x00, 0x46, 0x00, 0x6C, 0x00,
-            0x61, 0x00, 0x73, 0x00, 0x68, 0x00, 0x2E, 0x00, 0x39, 0x00, 0x30, 0x00, (byte)0xBA, 0x0F, 0x2C, 0x00, 0x00, 0x00,
-            0x53, 0x00, 0x68, 0x00, 0x6F, 0x00, 0x63, 0x00, 0x6B, 0x00, 0x77, 0x00, 0x61, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20,
-            0x00, 0x46, 0x00, 0x6C, 0x00, 0x61, 0x00, 0x73, 0x00, 0x68, 0x00, 0x20, 0x00, 0x4F, 0x00, 0x62, 0x00, 0x6A, 0x00,
-            0x65, 0x00, 0x63, 0x00, 0x74, 0x00
-    };
-
-	public void testRead() {
-		ExControl record = new ExControl(data, 0, data.length);
-		assertEquals(RecordTypes.ExControl.typeID, record.getRecordType());
-
-		assertNotNull(record.getExControlAtom());
-		assertEquals(256, record.getExControlAtom().getSlideId());
-
-		ExOleObjAtom oleObj = record.getExOleObjAtom();
-		assertNotNull(oleObj);
-		assertEquals(oleObj.getDrawAspect(), ExOleObjAtom.DRAW_ASPECT_VISIBLE);
-		assertEquals(oleObj.getType(), ExOleObjAtom.TYPE_CONTROL);
-		assertEquals(oleObj.getSubType(), ExOleObjAtom.SUBTYPE_DEFAULT);
-
-		assertEquals("Shockwave Flash Object", record.getMenuName());
-		assertEquals("ShockwaveFlash.ShockwaveFlash.9", record.getProgId());
-		assertEquals("Shockwave Flash Object", record.getClipboardName());
-	}
-
-	public void testWrite() throws Exception {
-		ExControl record = new ExControl(data, 0, data.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(data, b);
-	}
-
-	public void testNewRecord() throws Exception {
-		ExControl record = new ExControl();
-		ExControlAtom ctrl = record.getExControlAtom();
-		ctrl.setSlideId(256);
-
-		ExOleObjAtom oleObj = record.getExOleObjAtom();
-		oleObj.setDrawAspect(ExOleObjAtom.DRAW_ASPECT_VISIBLE);
-		oleObj.setType(ExOleObjAtom.TYPE_CONTROL);
-		oleObj.setObjID(1);
-		oleObj.setSubType(ExOleObjAtom.SUBTYPE_DEFAULT);
-		oleObj.setObjStgDataRef(2);
-		oleObj.setOptions(1283584);
-
-		record.setMenuName("Shockwave Flash Object");
-		record.setProgId("ShockwaveFlash.ShockwaveFlash.9");
-		record.setClipboardName("Shockwave Flash Object");
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data.length, b.length);
-		assertArrayEquals(data, b);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
deleted file mode 100644
index dfd840b..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests that ExHyperlink works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestExHyperlink extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		0x0F, 00, 0xD7-256, 0x0F, 0xA8-256, 00, 00, 00,
-
-		00, 00, 0xD3-256, 0x0F, 04, 00, 00, 00,
-		03, 00, 00, 00,
-
-		00, 00, 0xBA-256, 0x0F, 0x46, 00, 00, 00,
-		0x68, 00, 0x74, 00, 0x74, 00, 0x70, 00,
-		0x3A, 00, 0x2F, 00, 0x2F, 00, 0x6A, 00,
-		0x61, 00, 0x6B, 00, 0x61, 00, 0x72, 00,
-		0x74, 00, 0x61, 00, 0x2E, 00, 0x61, 00,
-		0x70, 00, 0x61, 00, 0x63, 00, 0x68, 00,
-		0x65, 00, 0x2E, 00, 0x6F, 00, 0x72, 00,
-		0x67, 00, 0x2F, 00, 0x70, 00, 0x6F, 00,
-		0x69, 00, 0x2F, 00, 0x68, 00, 0x73, 00,
-		0x73, 00, 0x66, 00, 0x2F, 00,
-
-		0x10, 00, 0xBA-256, 0x0F, 0x46, 00, 00, 00,
-		0x68, 00, 0x74, 00, 0x74, 00, 0x70, 00,
-		0x3A, 00, 0x2F, 00, 0x2F, 00, 0x6A, 00,
-		0x61, 00, 0x6B, 00, 0x61, 00, 0x72, 00,
-		0x74, 00, 0x61, 00, 0x2E, 00, 0x61, 00,
-		0x70, 00, 0x61, 00, 0x63, 00, 0x68, 00,
-		0x65, 00, 0x2E, 00, 0x6F, 00, 0x72, 00,
-		0x67, 00, 0x2F, 00, 0x70, 00, 0x6F, 00,
-		0x69, 00, 0x2F, 00, 0x68, 00, 0x73, 00,
-		0x73, 00, 0x66, 00, 0x2F, 00
-	};
-
-    public void testRecordType() {
-    	ExHyperlink eh = new ExHyperlink(data_a, 0, data_a.length);
-		assertEquals(4055l, eh.getRecordType());
-	}
-
-    public void testNumber() {
-    	ExHyperlink eh = new ExHyperlink(data_a, 0, data_a.length);
-		assertEquals(3, eh.getExHyperlinkAtom().getNumber());
-    }
-
-	public void testLinkURL() {
-    	ExHyperlink eh = new ExHyperlink(data_a, 0, data_a.length);
-    	assertEquals("http://jakarta.apache.org/poi/hssf/", eh.getLinkURL());
-	}
-	public void testDetails() {
-    	ExHyperlink eh = new ExHyperlink(data_a, 0, data_a.length);
-    	assertEquals("http://jakarta.apache.org/poi/hssf/", eh._getDetailsA());
-    	assertEquals("http://jakarta.apache.org/poi/hssf/", eh._getDetailsB());
-	}
-
-	public void testWrite() throws Exception {
-    	ExHyperlink eh = new ExHyperlink(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		eh.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	public void testRealFile() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("WithLinks.ppt"));
-		HSLFSlideShow ss = new HSLFSlideShow(hss);
-
-		// Get the document
-		Document doc = ss.getDocumentRecord();
-		// Get the ExObjList
-		ExObjList exObjList = null;
-		for (final Record rec : doc._children) {
-			if(rec instanceof ExObjList) {
-				exObjList = (ExObjList)rec;
-			}
-		}
-		if (exObjList == null) {
-			throw new AssertionFailedError("exObjList must not be null");
-		}
-
-		// Within that, grab out the Hyperlink atoms
-		List<ExHyperlink> linksA = new ArrayList<ExHyperlink>();
-		for (Record ch : exObjList._children) {
-			if(ch instanceof ExHyperlink) {
-				linksA.add((ExHyperlink) ch);
-			}
-		}
-
-		// Should be 4 of them
-		assertEquals(4, linksA.size());
-		ExHyperlink[] links = new ExHyperlink[linksA.size()];
-		linksA.toArray(links);
-
-		assertEquals(4, exObjList.getExHyperlinks().length);
-
-		// Check the other way
-
-		// Check they have what we expect in them
-		assertEquals(1, links[0].getExHyperlinkAtom().getNumber());
-		assertEquals("http://jakarta.apache.org/poi/", links[0].getLinkURL());
-
-		assertEquals(2, links[1].getExHyperlinkAtom().getNumber());
-		assertEquals("http://slashdot.org/", links[1].getLinkURL());
-
-		assertEquals(3, links[2].getExHyperlinkAtom().getNumber());
-		assertEquals("http://jakarta.apache.org/poi/hssf/", links[2].getLinkURL());
-
-		assertEquals(4, links[3].getExHyperlinkAtom().getNumber());
-		assertEquals("http://jakarta.apache.org/hslf/", links[3].getLinkURL());
-
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
deleted file mode 100644
index eba79e0..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that ExHyperlinkAtom works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public class TestExHyperlinkAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		00, 00, 0xD3-256, 0x0F, 04, 00, 00, 00,
-		01, 00, 00, 00
-	};
-	private final byte[] data_b = new byte[] {
-		00, 00, 0xD3-256, 0x0F, 04, 00, 00, 00,
-		04, 00, 00, 00
-	};
-
-    public void testRecordType() {
-    	ExHyperlinkAtom eha = new ExHyperlinkAtom(data_a, 0, data_a.length);
-		assertEquals(4051l, eha.getRecordType());
-	}
-
-    public void testGetNumber() {
-    	ExHyperlinkAtom eha = new ExHyperlinkAtom(data_a, 0, data_a.length);
-    	ExHyperlinkAtom ehb = new ExHyperlinkAtom(data_b, 0, data_b.length);
-
-		assertEquals(1, eha.getNumber());
-		assertEquals(4, ehb.getNumber());
-    }
-
-	public void testWrite() throws Exception {
-    	ExHyperlinkAtom eha = new ExHyperlinkAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		eha.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Create A from scratch
-	public void testCreate() throws Exception {
-		ExHyperlinkAtom eha = new ExHyperlinkAtom();
-
-		// Set value
-		eha.setNumber(1);
-
-		// Check it's now the same as a
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		eha.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Try to turn a into b
-	public void testChange() throws Exception {
-		ExHyperlinkAtom eha = new ExHyperlinkAtom(data_a, 0, data_a.length);
-
-		// Change the number
-		eha.setNumber(4);
-
-		// Check bytes are now the same
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		eha.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Should now be the same
-		assertEquals(data_b.length, b.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java
deleted file mode 100644
index 05c0e67..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that {@link org.apache.poi.hslf.record.HeadersFootersAtom} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestExMediaAtom extends TestCase {
-	// From a real file
-	private static final byte[] data = {
-			0x00, 0x00, (byte)0x04, 0x10, 0x08, 0x00, 0x00, 00,
-			0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-	public void testRead() {
-		ExMediaAtom record = new ExMediaAtom(data, 0, data.length);
-		assertEquals(RecordTypes.ExMediaAtom.typeID, record.getRecordType());
-
-		assertEquals(1, record.getObjectId());
-		assertFalse(record.getFlag(ExMediaAtom.fLoop));
-		assertFalse(record.getFlag(ExMediaAtom.fNarration));
-		assertFalse(record.getFlag(ExMediaAtom.fRewind));
-	}
-
-	public void testWrite() throws Exception {
-		ExMediaAtom record = new ExMediaAtom(data, 0, data.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(data, b);
-	}
-
-	public void testNewRecord() throws Exception {
-		ExMediaAtom ref = new ExMediaAtom(data, 0, data.length);
-		assertEquals(0, ref.getMask()); //
-
-		ExMediaAtom record = new ExMediaAtom();
-		record.setObjectId(1);
-		record.setFlag(HeadersFootersAtom.fHasDate, false);
-		record.setFlag(HeadersFootersAtom.fHasTodayDate, false);
-		record.setFlag(HeadersFootersAtom.fHasFooter, false);
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(data, b);
-	}
-
-	public void testFlags() {
-		ExMediaAtom record = new ExMediaAtom();
-
-		//in a new record all the bits are 0
-		for(int i = 0; i < 3; i++) assertFalse(record.getFlag(1 << i));
-
-		record.setFlag(ExMediaAtom.fLoop, true);
-		assertTrue(record.getFlag(ExMediaAtom.fLoop));
-
-		record.setFlag(ExMediaAtom.fNarration, true);
-		assertTrue(record.getFlag(ExMediaAtom.fNarration));
-
-		record.setFlag(ExMediaAtom.fNarration, false);
-		assertFalse(record.getFlag(ExMediaAtom.fNarration));
-
-		record.setFlag(ExMediaAtom.fNarration, false);
-		assertFalse(record.getFlag(ExMediaAtom.fNarration));
-
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
deleted file mode 100644
index 88f6884..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests that ExObjList works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public class TestExObjList extends TestCase {
-	public void testRealFile() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("WithLinks.ppt"));
-		HSLFSlideShow ss = new HSLFSlideShow(hss);
-
-		// Get the document
-		Document doc = ss.getDocumentRecord();
-		// Get the ExObjList
-		ExObjList exObjList = doc.getExObjList(false);
-		assertNotNull(exObjList);
-		assertEquals(1033l, exObjList.getRecordType());
-
-		// Check the atom
-		assertNotNull(exObjList.getExObjListAtom());
-		assertEquals(4, exObjList.getExObjListAtom().getObjectIDSeed());
-
-		// Check the Hyperlinks
-		assertEquals(4, exObjList.getExHyperlinks().length);
-
-		// Check the contents
-		ExHyperlink[] links = exObjList.getExHyperlinks();
-
-		// Check they have what we expect in them
-		assertEquals(1, links[0].getExHyperlinkAtom().getNumber());
-		assertEquals("http://jakarta.apache.org/poi/", links[0].getLinkURL());
-
-		assertEquals(2, links[1].getExHyperlinkAtom().getNumber());
-		assertEquals("http://slashdot.org/", links[1].getLinkURL());
-
-		assertEquals(3, links[2].getExHyperlinkAtom().getNumber());
-		assertEquals("http://jakarta.apache.org/poi/hssf/", links[2].getLinkURL());
-
-		assertEquals(4, links[3].getExHyperlinkAtom().getNumber());
-		assertEquals("http://jakarta.apache.org/hslf/", links[3].getLinkURL());
-
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java
deleted file mode 100644
index 7f11108..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that ExObjListAtom works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public class TestExObjListAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		00, 00, 0x0A, 0x04, 04, 00, 00, 00,
-		01, 00, 00, 00
-	};
-	private final byte[] data_b = new byte[] {
-		00, 00, 0x0A, 0x04, 04, 00, 00, 00,
-		04, 00, 00, 00
-	};
-
-	public void testRecordType() {
-		ExObjListAtom eoa = new ExObjListAtom(data_a, 0, data_a.length);
-		assertEquals(1034l, eoa.getRecordType());
-	}
-
-	public void testGetSeed() {
-		ExObjListAtom eoa = new ExObjListAtom(data_a, 0, data_a.length);
-		ExObjListAtom eob = new ExObjListAtom(data_b, 0, data_b.length);
-
-		assertEquals(1, eoa.getObjectIDSeed());
-		assertEquals(4, eob.getObjectIDSeed());
-	}
-
-	public void testWrite() throws Exception {
-		ExObjListAtom eoa = new ExObjListAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		eoa.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Create A from scratch
-	public void testCreate() throws Exception {
-		ExObjListAtom eoa = new ExObjListAtom();
-
-		// Set seed
-		eoa.setObjectIDSeed(1);
-
-		// Check it's now the same as a
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		eoa.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Try to turn a into b
-	public void testChange() throws Exception {
-		ExObjListAtom eoa = new ExObjListAtom(data_a, 0, data_a.length);
-
-		// Change the number
-		eoa.setObjectIDSeed(4);
-
-		// Check bytes are now the same
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		eoa.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Should now be the same
-		assertEquals(data_b.length, b.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java
deleted file mode 100644
index ca33bb4..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that {@link ExOleObjAtom} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestExOleObjAtom extends TestCase {
-	// From a real file (embedded SWF control)
-	private final byte[] data = {
-			0x01, 0x00, (byte)0xC3, 0x0F, 0x18, 0x00, 0x00, 0x00,
-			0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, (byte)0x96, 0x13, 0x00  };
-
-	public void testRead() {
-		ExOleObjAtom record = new ExOleObjAtom(data, 0, data.length);
-		assertEquals(RecordTypes.ExOleObjAtom.typeID, record.getRecordType());
-
-		assertEquals(record.getDrawAspect(), ExOleObjAtom.DRAW_ASPECT_VISIBLE);
-		assertEquals(record.getType(), ExOleObjAtom.TYPE_CONTROL);
-		assertEquals(record.getObjID(), 1);
-		assertEquals(record.getSubType(), ExOleObjAtom.SUBTYPE_DEFAULT);
-		assertEquals(record.getObjStgDataRef(), 2);
-		assertEquals(record.getOptions(), 1283584); //ther meaning is unknown
-	}
-
-	public void testWrite() throws Exception {
-		ExOleObjAtom record = new ExOleObjAtom(data, 0, data.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(data, b);
-	}
-
-	public void testNewRecord() throws Exception {
-		ExOleObjAtom record = new ExOleObjAtom();
-		record.setDrawAspect(ExOleObjAtom.DRAW_ASPECT_VISIBLE);
-		record.setType(ExOleObjAtom.TYPE_CONTROL);
-		record.setObjID(1);
-		record.setSubType(ExOleObjAtom.SUBTYPE_DEFAULT);
-		record.setObjStgDataRef(2);
-		record.setOptions(1283584);
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(data, b);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java
deleted file mode 100644
index 07147f1..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Tests that {@link ExOleObjStg} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestExOleObjStg extends TestCase {
-
-    // From a real file (embedded SWF control)
-    /*
-    <ExOleObjStg info="16" type="4113" size="347" offset="4322" header="10 00 11 10 5B 01 00 00 ">
-      00 0E 00 00 78 9C BB 70 5E F0 C1 C2 8D 52 0F 19 D0 80 1D 03 33 C3 BF FF 9C
-      0C 6C 48 62 8C 40 CC 04 E3 08 30 30 B0 40 C5 FE FD FF FF 1F 24 C4 0C C4 FF
-      47 C1 90 02 41 0C F9 40 58 C2 A0 C0 E0 CA 90 07 A4 8B 18 2A D1 93 02 5E 20
-      C6 C0 0A 8F 73 50 5A C8 BB 5D 73 29 77 DD 79 C1 69 3B 5C 5C 83 43 50 D5 06
-      BC 48 2F 2B 66 38 C9 C8 0E 64 3B 30 42 C4 9C 81 B6 83 EC 4D 05 93 C5 24 D9
-      0D 02 42 0C 4C 8C C8 FE 21 56 9F 02 23 C9 56 E1 04 E4 D8 4F 4D 40 89 FD A0
-      BC FB 17 4B BA F8 07 C5 A3 60 78 03 7A E6 FF 09 67 59 1B 41 F9 9F 95 61 34
-      FF 53 13 50 62 3F 4C 1F AC 1C 18 CD F7 23 0B C0 DA 74 A0 B6 1B A8 3D 37 1A
-      F7 23 0B A4 87 A6 85 0A 00 1B 64 6F 38 21 98 03 DA C2 E7 60 90 01 92 69 0C
-      39 0C 65 0C 05 40 32 11 58 2F A4 02 6B 07 3D 60 19 5D 0E 14 27 4E 05 1F 90
-      0C 67 C8 04 96 ED 29 C0 72 BE 1C C8 E3 06 E3 FF FF 39 18 B8 80 2C 0F A0 5C
-      3A 43 06 58 2D A8 A7 E1 C3 10 02 97 87 B8 02 E6 1A 60 77 83 21 18 A8 12 64
-      8A 23 D0 B6 1C B8 59 C8 AA 90 F5 F0 62 94 75 DC C0 DE 0A 37 5C 1D 33 54 35
-      88 97 08 35 91 83 81 07 EC 27 10 BF 18 E8 9B E1 0F 00 BD 65 3D D4
-    </ExOleObjStg>
-     */
-    private final byte[] data = new byte[] {
-            0x10, 0x00, 0x11, 0x10, 0x5B, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x78, (byte)0x9C, (byte)0xBB, 0x70,
-            0x5E, (byte)0xF0, (byte)0xC1, (byte)0xC2, (byte)0x8D, 0x52, 0x0F, 0x19, (byte)0xD0, (byte)0x80, 0x1D, 0x03,
-            0x33, (byte)0xC3, (byte)0xBF, (byte)0xFF, (byte)0x9C, 0x0C, 0x6C, 0x48, 0x62, (byte)0x8C, 0x40, (byte)0xCC,
-            0x04, (byte)0xE3, 0x08, 0x30, 0x30, (byte)0xB0, 0x40, (byte)0xC5, (byte)0xFE, (byte)0xFD, (byte)0xFF, (byte)0xFF,
-            0x1F, 0x24, (byte)0xC4, (byte)0x0C, (byte)0xC4, (byte)0xFF, 0x47, (byte)0xC1, (byte)0x90, 0x02, 0x41, 0x0C,
-            (byte)0xF9, 0x40, 0x58, (byte)0xC2, (byte)0xA0, (byte)0xC0, (byte)0xE0, (byte)0xCA, (byte)0x90, 0x07, (byte)0xA4,
-            (byte)0x8B, 0x18, 0x2A, (byte)0xD1, (byte)0x93, 0x02, 0x5E, 0x20, (byte)0xC6, (byte)0xC0, 0x0A, (byte)0x8F,
-            0x73, 0x50, 0x5A, (byte)0xC8, (byte)0xBB, 0x5D, 0x73, 0x29, 0x77, (byte)0xDD, 0x79, (byte)0xC1, 0x69, 0x3B,
-            0x5C, 0x5C, (byte)0x83, 0x43, 0x50, (byte)0xD5, 0x06, (byte)0xBC, 0x48, 0x2F, 0x2B, 0x66, 0x38, (byte)0xC9,
-            (byte)0xC8, 0x0E, 0x64, 0x3B, 0x30, 0x42, (byte)0xC4, (byte)0x9C, (byte)0x81, (byte)0xB6, (byte)0x83, (byte)0xEC,
-            0x4D, 0x05, (byte)0x93, (byte)0xC5, 0x24, (byte)0xD9, 0x0D, 0x02, 0x42, 0x0C, 0x4C, (byte)0x8C, (byte)0xC8,
-            (byte)0xFE, 0x21, 0x56, (byte)0x9F, 0x02, 0x23, (byte)0xC9, 0x56, (byte)0xE1, 0x04, (byte)0xE4, (byte)0xD8,
-            0x4F, 0x4D, 0x40, (byte)0x89, (byte)0xFD, (byte)0xA0, (byte)0xBC, (byte)0xFB, 0x17, 0x4B, (byte)0xBA, (byte)0xF8,
-            0x07, (byte)0xC5, (byte)0xA3, 0x60, 0x78, 0x03, 0x7A, (byte)0xE6, (byte)0xFF, 0x09, 0x67, 0x59, 0x1B, 0x41,
-            (byte)0xF9, (byte)0x9F, (byte)0x95, 0x61, 0x34, (byte)0xFF, 0x53, 0x13, 0x50, 0x62, 0x3F, 0x4C, 0x1F, (byte)0xAC,
-            0x1C, 0x18, (byte)0xCD, (byte)0xF7, 0x23, 0x0B, (byte)0xC0, (byte)0xDA, 0x74, (byte)0xA0, (byte)0xB6, 0x1B,
-            (byte)0xA8, 0x3D, 0x37, 0x1A, (byte)0xF7, 0x23, 0x0B, (byte)0xA4, (byte)0x87, (byte)0xA6, (byte)0x85, 0x0A,
-            0x00, 0x1B, 0x64, 0x6F, 0x38, 0x21, (byte)0x98, 0x03, (byte)0xDA, (byte)0xC2, (byte)0xE7, 0x60, (byte)0x90,
-            0x01, (byte)0x92, 0x69, 0x0C, 0x39, 0x0C, 0x65, 0x0C, 0x05, 0x40, 0x32, 0x11, 0x58, 0x2F, (byte)0xA4, 0x02,
-            0x6B, 0x07, 0x3D, 0x60, 0x19, 0x5D, 0x0E, 0x14, 0x27, 0x4E, 0x05, 0x1F, (byte)0x90, 0x0C, 0x67, (byte)0xC8,
-            0x04, (byte)0x96, (byte)0xED, 0x29, (byte)0xC0, 0x72, (byte)0xBE, 0x1C, (byte)0xC8, (byte)0xE3, 0x06, (byte)0xE3,
-            (byte)0xFF, (byte)0xFF, 0x39, 0x18, (byte)0xB8, (byte)0x80, 0x2C, 0x0F, (byte)0xA0, 0x5C, 0x3A, 0x43, 0x06, 0x58,
-            0x2D, (byte)0xA8, (byte)0xA7, (byte)0xE1, (byte)0xC3, 0x10, 0x02, (byte)0x97, (byte)0x87, (byte)0xB8, 0x02,
-            (byte)0xE6, 0x1A, 0x60, 0x77, (byte)0x83, 0x21, 0x18, (byte)0xA8, 0x12, 0x64, (byte)0x8A, 0x23, (byte)0xD0,
-            (byte)0xB6, 0x1C, (byte)0xB8, 0x59, (byte)0xC8, (byte)0xAA, (byte)0x90, (byte)0xF5, (byte)0xF0, 0x62, (byte)0x94,
-            0x75, (byte)0xDC, (byte)0xC0, (byte)0xDE, 0x0A, 0x37, 0x5C, 0x1D, 0x33, 0x54, 0x35, (byte)0x88, (byte)0x97, 0x08,
-            0x35, (byte)0x91, (byte)0x83, (byte)0x81, 0x07, (byte)0xEC, 0x27, 0x10, (byte)0xBF, 0x18, (byte)0xE8, (byte)0x9B,
-            (byte)0xE1, 0x0F, 0x00, (byte)0xBD, 0x65, 0x3D, (byte)0xD4
-                };
-
-    public void testRead() throws Exception {
-        ExOleObjStg record = new ExOleObjStg(data, 0, data.length);
-        assertEquals(RecordTypes.ExOleObjStg.typeID, record.getRecordType());
-
-        int len = record.getDataLength();
-        byte[] oledata = readAll(record.getData());
-        assertEquals(len, oledata.length);
-
-        POIFSFileSystem fs = new POIFSFileSystem(record.getData());
-        assertTrue("Constructed POIFS from ExOleObjStg data", true);
-        DocumentEntry doc = (DocumentEntry)fs.getRoot().getEntry("Contents");
-        assertNotNull(doc);
-        assertTrue("Fetched the Contents stream containing OLE properties", true);
-    }
-
-    public void testWrite() throws Exception {
-        ExOleObjStg record = new ExOleObjStg(data, 0, data.length);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(data, b);
-    }
-
-    public void testNewRecord() throws Exception {
-        ExOleObjStg src = new ExOleObjStg(data, 0, data.length);
-        byte[] oledata = readAll(src.getData());
-
-        ExOleObjStg tgt = new ExOleObjStg();
-        tgt.setData(oledata);
-
-
-        assertEquals(src.getDataLength(), tgt.getDataLength());
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        tgt.writeOut(out);
-        byte[] b = out.toByteArray();
-
-        assertEquals(data.length, b.length);
-        assertArrayEquals(data, b);
-    }
-
-    private byte[] readAll(InputStream is) throws IOException {
-        int pos;
-        byte[] chunk = new byte[1024];
-        ByteArrayOutputStream out = new  ByteArrayOutputStream();
-        while((pos = is.read(chunk)) > 0){
-            out.write(chunk, 0, pos);
-        }
-        return out.toByteArray();
-
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java
deleted file mode 100644
index 10dc940..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that {@link HeadersFootersAtom} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestExVideoContainer extends TestCase {
-
-    // From a real file
-    private final byte[] data = new byte[]{
-            0x0F, 0x00, 0x05, 0x10, (byte) 0x9E, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x04, 0x10, 0x08, 0x00, 0x00, 0x00,
-            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, (byte)0xBA, 0x0F, (byte)0x86, 0x00, 0x00, 0x00,
-            0x44, 0x00, 0x3A, 0x00, 0x5C, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6F, 0x00, 0x6A, 0x00, 0x65, 0x00,
-            0x63, 0x00, 0x74, 0x00, 0x73, 0x00, 0x5C, 0x00, 0x53, 0x00, 0x63, 0x00, 0x68, 0x00, 0x75, 0x00,
-            0x6C, 0x00, 0x65, 0x00, 0x72, 0x00, 0x41, 0x00, 0x47, 0x00, 0x5C, 0x00, 0x6D, 0x00, 0x63, 0x00,
-            0x6F, 0x00, 0x6D, 0x00, 0x5F, 0x00, 0x76, 0x00, 0x5F, 0x00, 0x31, 0x00, 0x5F, 0x00, 0x30, 0x00,
-            0x5F, 0x00, 0x34, 0x00, 0x5C, 0x00, 0x76, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x5C, 0x00,
-            0x64, 0x00, 0x61, 0x00, 0x74, 0x00, 0x61, 0x00, 0x5C, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00,
-            0x74, 0x00, 0x73, 0x00, 0x5C, 0x00, 0x69, 0x00, 0x6D, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00,
-            0x73, 0x00, 0x5C, 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x73, 0x00, 0x2E, 0x00,
-            0x6D, 0x00, 0x70, 0x00, 0x67, 0x00};
-
-
-
-
-    public void testRead() {
-        ExVideoContainer record = new ExVideoContainer(data, 0, data.length);
-        assertEquals(RecordTypes.ExVideoContainer.typeID, record.getRecordType());
-
-        ExMediaAtom exMedia = record.getExMediaAtom();
-        assertEquals(1, exMedia.getObjectId());
-        assertNotNull(exMedia);
-        assertFalse(exMedia.getFlag(ExMediaAtom.fLoop));
-        assertFalse(exMedia.getFlag(ExMediaAtom.fNarration));
-        assertFalse(exMedia.getFlag(ExMediaAtom.fRewind));
-
-        CString path = record.getPathAtom();
-        assertNotNull(exMedia);
-        assertEquals("D:\\projects\\SchulerAG\\mcom_v_1_0_4\\view\\data\\tests\\images\\cards.mpg", path.getText());
-    }
-
-    public void testWrite() throws Exception {
-        ExVideoContainer record = new ExVideoContainer(data, 0, data.length);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(data, b);
-    }
-
-    public void testNewRecord() throws Exception {
-        ExVideoContainer record = new ExVideoContainer();
-        record.getExMediaAtom().setObjectId(1);
-        record.getPathAtom().setText("D:\\projects\\SchulerAG\\mcom_v_1_0_4\\view\\data\\tests\\images\\cards.mpg");
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(data, b);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java
deleted file mode 100644
index 2d595f3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests <code>FontCollection</code> and <code>FontEntityAtom</code> records
- *
- * @author Yegor Kozlov
- */
-public final class TestFontCollection extends TestCase {
-    // From a real file
-    private final byte[] data = new byte[]  {
-        0x0F, 0x00, 0xD5-256, 0x07, 0x4C, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xB7-256, 0x0F, 0x44, 0x00, 0x00, 0x00,
-        0x54, 0x00, 0x69, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x73, 0x00,
-        0x20, 0x00, 0x4E, 0x00, 0x65, 0x00, 0x77, 0x00, 0x20, 0x00,
-        0x52, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x61, 0x00, 0x6E, 0x00,
-        0x00, 0x00, 0x74, 0x34, 0xB8-256, 0x00, 0x7C, 0xDA-256, 0x12, 0x00,
-        0x64, 0xDA-256, 0x12, 0x00, 0x76, 0xC7-256, 0x0B, 0x30, 0x08, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xDA-256, 0x12, 0x00,
-        0x28, 0xDD-256, 0x0D, 0x30, 0x00, 0x00, 0x04, 0x00  };
-
-    public void testFonts() {
-        FontCollection fonts = new FontCollection(data, 0, data.length);
-        Record[] child = fonts.getChildRecords();
-        assertEquals(child.length, 1);
-
-        FontEntityAtom fnt = (FontEntityAtom)child[0];
-        assertEquals(fnt.getFontName(), "Times New Roman");
-    }
-
-    public void testAddFont() {
-        FontCollection fonts = new FontCollection(data, 0, data.length);
-        int idx = fonts.addFont("Times New Roman");
-        assertEquals(idx, 0);
-        idx = fonts.addFont("Helvetica");
-        assertEquals(idx, 1);
-        idx = fonts.addFont("Arial");
-        assertEquals(idx, 2);
-        idx = fonts.addFont("Arial"); //the font being added twice
-        assertEquals(idx, 2);
-
-        // Font collection should contain 3 fonts
-        Record[] child = fonts.getChildRecords();
-        assertEquals(child.length, 3);
-
-        // Check we get the right font name for the indicies
-        assertEquals("Times New Roman", fonts.getFontWithId(0));
-        assertEquals("Helvetica", fonts.getFontWithId(1));
-        assertEquals("Arial", fonts.getFontWithId(2));
-        assertNull(fonts.getFontWithId(3));
-    }
-
-    public void testWrite() throws Exception {
-        FontCollection fonts = new FontCollection(data, 0, data.length);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        fonts.writeOut(out);
-        byte[] recdata = out.toByteArray();
-        assertArrayEquals(recdata, data);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
deleted file mode 100644
index c694b90..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that {@link HeadersFootersAtom} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestHeadersFootersAtom extends TestCase {
-	// From a real file
-	private final byte[] data = new byte[] {
-            0x00, 0x00, (byte)0xDA, 0x0F, 0x04, 0x00, 0x00, 00,
-            0x00, 0x00, 0x23, 0x00 };
-
-    public void testRead() {
-		HeadersFootersAtom record = new HeadersFootersAtom(data, 0, data.length);
-		assertEquals(RecordTypes.HeadersFootersAtom.typeID, record.getRecordType());
-
-        assertEquals(0, record.getFormatId());
-        assertEquals(0x23, record.getMask());
-
-        assertTrue(record.getFlag(HeadersFootersAtom.fHasDate));
-        assertTrue(record.getFlag(HeadersFootersAtom.fHasTodayDate));
-        assertFalse(record.getFlag(HeadersFootersAtom.fHasUserDate));
-        assertFalse(record.getFlag(HeadersFootersAtom.fHasSlideNumber));
-        assertFalse(record.getFlag(HeadersFootersAtom.fHasHeader));
-        assertTrue(record.getFlag(HeadersFootersAtom.fHasFooter));
-    }
-
-	public void testWrite() throws Exception {
-		HeadersFootersAtom record = new HeadersFootersAtom(data, 0, data.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(data, b);
-	}
-
-    public void testNewRecord() throws Exception {
-        HeadersFootersAtom record = new HeadersFootersAtom();
-        record.setFlag(HeadersFootersAtom.fHasDate, true);
-        record.setFlag(HeadersFootersAtom.fHasTodayDate, true);
-        record.setFlag(HeadersFootersAtom.fHasFooter, true);
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(data, b);
-    }
-
-    public void testFlags() {
-        HeadersFootersAtom record = new HeadersFootersAtom();
-
-        //in a new record all the bits are 0
-        for(int i = 0; i < 6; i++) assertFalse(record.getFlag(1 << i));
-
-        record.setFlag(HeadersFootersAtom.fHasTodayDate, true);
-        assertTrue(record.getFlag(HeadersFootersAtom.fHasTodayDate));
-
-        record.setFlag(HeadersFootersAtom.fHasTodayDate, true);
-        assertTrue(record.getFlag(HeadersFootersAtom.fHasTodayDate));
-
-        record.setFlag(HeadersFootersAtom.fHasTodayDate, false);
-        assertFalse(record.getFlag(HeadersFootersAtom.fHasTodayDate));
-
-        record.setFlag(HeadersFootersAtom.fHasTodayDate, false);
-        assertFalse(record.getFlag(HeadersFootersAtom.fHasTodayDate));
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
deleted file mode 100644
index 6e787e7..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that {@link HeadersFootersContainer} works properly
- *
- * @author Yegor Kozlov
- */
-public final class TestHeadersFootersContainer extends TestCase {
-	// SlideHeadersFootersContainer
-	private final byte[] slideData = new byte[] {
-            0x3F, 0x00, (byte)0xD9, 0x0F, 0x2E, 0x00, 0x00, 0x00,
-            0x00, 0x00, (byte)0xDA, 0x0F, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00,
-            0x20, 0x00, (byte)0xBA, 0x0F, 0x1A, 0x00, 0x00, 0x00,
-            0x4D, 0x00, 0x79, 0x00, 0x20, 0x00, 0x46, 0x00, 0x6F, 0x00, 0x6F, 0x00, 0x74,
-            0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x2D, 0x00, 0x20, 0x00, 0x31, 0x00
-
-    };
-
-    // NotesHeadersFootersContainer
-    private final byte[] notesData = new byte[] {
-            0x4F, 0x00, (byte)0xD9, 0x0F, 0x48, 0x00, 0x00, 0x00,
-            0x00, 0x00, (byte)0xDA, 0x0F, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00,
-            0x10, 0x00, (byte)0xBA, 0x0F, 0x16, 0x00, 0x00, 0x00,
-            0x4E, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x48, 0x00,
-            0x65, 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00,
-            0x20, 0x00, (byte)0xBA, 0x0F, 0x16, 0x00, 0x00, 0x00,
-            0x4E, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x46, 0x00,
-            0x6F, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00
-    };
-
-    public void testReadSlideHeadersFootersContainer() {
-		HeadersFootersContainer record = new HeadersFootersContainer(slideData, 0, slideData.length);
-		assertEquals(RecordTypes.HeadersFooters.typeID, record.getRecordType());
-        assertEquals(HeadersFootersContainer.SlideHeadersFootersContainer, record.getOptions());
-        assertEquals(2, record.getChildRecords().length);
-
-        HeadersFootersAtom hdd = record.getHeadersFootersAtom();
-        assertNotNull(hdd);
-
-        CString csFooter = record.getFooterAtom();
-        assertNotNull(csFooter);
-        assertEquals(HeadersFootersContainer.FOOTERATOM, csFooter.getOptions() >> 4);
-
-        assertEquals("My Footer - 1", csFooter.getText());
-
-        assertNull(record.getUserDateAtom());
-        assertNull(record.getHeaderAtom());
-    }
-
-	public void testWriteSlideHeadersFootersContainer() throws Exception {
-		HeadersFootersContainer record = new HeadersFootersContainer(slideData, 0, slideData.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(slideData, b);
-	}
-
-    public void testNewSlideHeadersFootersContainer() throws Exception {
-        HeadersFootersContainer record = new HeadersFootersContainer(HeadersFootersContainer.SlideHeadersFootersContainer);
-
-        assertNotNull(record.getHeadersFootersAtom());
-        assertNull(record.getUserDateAtom());
-        assertNull(record.getHeaderAtom());
-        assertNull(record.getFooterAtom());
-
-        HeadersFootersAtom hd = record.getHeadersFootersAtom();
-        hd.setFlag(HeadersFootersAtom.fHasDate, true);
-        hd.setFlag(HeadersFootersAtom.fHasTodayDate, true);
-        hd.setFlag(HeadersFootersAtom.fHasFooter, true);
-
-        CString csFooter = record.addFooterAtom();
-        assertNotNull(csFooter);
-        assertEquals(HeadersFootersContainer.FOOTERATOM, csFooter.getOptions() >> 4);
-        csFooter.setText("My Footer - 1");
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(slideData, b);
-    }
-
-    public void testReadNotesHeadersFootersContainer() {
-		HeadersFootersContainer record = new HeadersFootersContainer(notesData, 0, notesData.length);
-		assertEquals(RecordTypes.HeadersFooters.typeID, record.getRecordType());
-        assertEquals(HeadersFootersContainer.NotesHeadersFootersContainer, record.getOptions());
-        assertEquals(3, record.getChildRecords().length);
-
-        HeadersFootersAtom hdd = record.getHeadersFootersAtom();
-        assertNotNull(hdd);
-
-        CString csHeader = record.getHeaderAtom();
-        assertNotNull(csHeader);
-        assertEquals(HeadersFootersContainer.HEADERATOM, csHeader.getOptions() >> 4);
-        assertEquals("Note Header", csHeader.getText());
-
-        CString csFooter = record.getFooterAtom();
-        assertNotNull(csFooter);
-        assertEquals(HeadersFootersContainer.FOOTERATOM, csFooter.getOptions() >> 4);
-        assertEquals("Note Footer", csFooter.getText());
-    }
-
-	public void testWriteNotesHeadersFootersContainer() throws Exception {
-		HeadersFootersContainer record = new HeadersFootersContainer(notesData, 0, notesData.length);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		record.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertArrayEquals(notesData, b);
-	}
-
-    public void testNewNotesHeadersFootersContainer() throws Exception {
-        HeadersFootersContainer record = new HeadersFootersContainer(HeadersFootersContainer.NotesHeadersFootersContainer);
-
-        assertNotNull(record.getHeadersFootersAtom());
-        assertNull(record.getUserDateAtom());
-        assertNull(record.getHeaderAtom());
-        assertNull(record.getFooterAtom());
-
-        HeadersFootersAtom hd = record.getHeadersFootersAtom();
-        hd.setFlag(HeadersFootersAtom.fHasDate, true);
-        hd.setFlag(HeadersFootersAtom.fHasTodayDate, false);
-        hd.setFlag(HeadersFootersAtom.fHasUserDate, true);
-        hd.setFlag(HeadersFootersAtom.fHasSlideNumber, true);
-        hd.setFlag(HeadersFootersAtom.fHasHeader, true);
-        hd.setFlag(HeadersFootersAtom.fHasFooter, true);
-
-        CString csHeader = record.addHeaderAtom();
-        assertNotNull(csHeader);
-        assertEquals(HeadersFootersContainer.HEADERATOM, csHeader.getOptions() >> 4);
-        csHeader.setText("Note Header");
-
-        CString csFooter = record.addFooterAtom();
-        assertNotNull(csFooter);
-        assertEquals(HeadersFootersContainer.FOOTERATOM, csFooter.getOptions() >> 4);
-        csFooter.setText("Note Footer");
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        record.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertArrayEquals(notesData, b);
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java
deleted file mode 100644
index 24278fa..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-
-package org.apache.poi.hslf.record;
-
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that InteractiveInfoAtom works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public class TestInteractiveInfo extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		0x0F, 00, 0xF2-256, 0x0F, 0x18, 00, 00, 00,
-		00, 00, 0xF3-256, 0x0F, 0x10, 00, 00, 00,
-		00, 00, 00, 00, 01, 00, 00, 00,
-		04, 00, 00, 00, 8, 00, 00, 00
-	};
-
-	public void testRecordType() {
-		InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length);
-		assertEquals(4082, ii.getRecordType());
-	}
-
-	public void testGetChildDetails() {
-		InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length);
-		InteractiveInfoAtom ia = ii.getInteractiveInfoAtom();
-
-		assertEquals(1, ia.getHyperlinkID());
-	}
-
-	public void testWrite() throws Exception {
-		InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ii.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Create A from scratch
-	public void testCreate() throws Exception {
-		InteractiveInfo ii = new InteractiveInfo();
-		InteractiveInfoAtom ia = ii.getInteractiveInfoAtom();
-
-		// Set values
-		ia.setHyperlinkID(1);
-		ia.setSoundRef(0);
-		ia.setAction((byte)4);
-		ia.setHyperlinkType((byte)8);
-
-		// Check it's now the same as a
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ii.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
deleted file mode 100644
index cabed25..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that InteractiveInfoAtom works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public class TestInteractiveInfoAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] {
-		00, 00, 0xF3-256, 0x0F, 0x10, 00, 00, 00,
-		00, 00, 00, 00, 01, 00, 00, 00,
-		04, 00, 00, 00, 8, 00, 00, 00
-	};
-	private final byte[] data_b = new byte[] {
-		00, 00, 0xF3-256, 0x0F, 0x10, 00, 00, 00,
-		00, 00, 00, 00, 04, 00, 00, 00,
-		04, 00, 00, 00, 8, 00, 00, 00
-	};
-
-	public void testRecordType() {
-		InteractiveInfoAtom ia = new InteractiveInfoAtom(data_a, 0, data_a.length);
-		assertEquals(4083l, ia.getRecordType());
-	}
-
-	public void testGetNumber() {
-		InteractiveInfoAtom ia = new InteractiveInfoAtom(data_a, 0, data_a.length);
-		InteractiveInfoAtom ib = new InteractiveInfoAtom(data_b, 0, data_b.length);
-
-		assertEquals(1, ia.getHyperlinkID());
-		assertEquals(4, ib.getHyperlinkID());
-	}
-
-	public void testGetRest() {
-		InteractiveInfoAtom ia = new InteractiveInfoAtom(data_a, 0, data_a.length);
-		InteractiveInfoAtom ib = new InteractiveInfoAtom(data_b, 0, data_b.length);
-
-		assertEquals(0, ia.getSoundRef());
-		assertEquals(0, ib.getSoundRef());
-
-		assertEquals(4, ia.getAction());
-		assertEquals(4, ib.getAction());
-
-		assertEquals(8, ia.getHyperlinkType());
-		assertEquals(8, ib.getHyperlinkType());
-	}
-
-	public void testWrite() throws Exception {
-		InteractiveInfoAtom ia = new InteractiveInfoAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ia.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Create A from scratch
-	public void testCreate() throws Exception {
-		InteractiveInfoAtom ia = new InteractiveInfoAtom();
-
-		// Set values
-		ia.setHyperlinkID(1);
-		ia.setSoundRef(0);
-		ia.setAction((byte)4);
-		ia.setHyperlinkType((byte)8);
-
-		// Check it's now the same as a
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ia.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Try to turn a into b
-	public void testChange() throws Exception {
-		InteractiveInfoAtom ia = new InteractiveInfoAtom(data_a, 0, data_a.length);
-
-		// Change the number
-		ia.setHyperlinkID(4);
-
-		// Check bytes are now the same
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ia.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Should now be the same
-		assertEquals(data_b.length, b.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java
deleted file mode 100644
index fc207ea..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that NotesAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestNotesAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] { 1, 0, 0xF1-256, 3, 8, 0, 0, 0,
-		0, 0, 0, 0x80-256, 0, 0, 0x0D, 0x30 };
-
-	public void testRecordType() {
-		NotesAtom na = new NotesAtom(data_a, 0, data_a.length);
-		assertEquals(1009l, na.getRecordType());
-	}
-	public void testFlags() {
-		NotesAtom na = new NotesAtom(data_a, 0, data_a.length);
-		assertEquals(0x80000000, na.getSlideID());
-		assertEquals(false, na.getFollowMasterObjects());
-		assertEquals(false, na.getFollowMasterScheme());
-		assertEquals(false, na.getFollowMasterBackground());
-	}
-
-	public void testWrite() throws Exception {
-		NotesAtom na = new NotesAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		na.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
deleted file mode 100644
index 2679e32..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests that the helper methods on RecordContainer work properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestRecordContainer extends TestCase {
-	private RecordContainer recordContainer;
-
-	public void testIsAnAtom() {
-		assertFalse( recordContainer.isAnAtom() );
-	}
-
-	public void testAppendChildRecord() {
-		// Grab records for testing with
-		Record r = recordContainer.getChildRecords()[0];
-		Record rb = recordContainer.getChildRecords()[1];
-		Record rc = recordContainer.getChildRecords()[2];
-		Record rd = recordContainer.getChildRecords()[3];
-
-		// Start with an empty set
-		Record[] rs = new Record[0];
-		recordContainer._children = rs;
-		recordContainer.appendChildRecord(r);
-		Record[] nrs = recordContainer.getChildRecords();
-
-		assertEquals(1, nrs.length);
-		assertEquals(r, nrs[0]);
-
-		// Now start with one with 3 entries
-		rs = new Record[3];
-		recordContainer._children = rs;
-		rs[0] = rb;
-		rs[1] = rc;
-		rs[2] = rd;
-
-		recordContainer.appendChildRecord(r);
-		nrs = recordContainer.getChildRecords();
-
-		assertEquals(4, nrs.length);
-		assertEquals(rb, nrs[0]);
-		assertEquals(rc, nrs[1]);
-		assertEquals(rd, nrs[2]);
-		assertEquals(r, nrs[3]);
-	}
-
-	public void testAddChildAfter() {
-		// Working with new StyleTextPropAtom
-		Record newRecord = new StyleTextPropAtom(0);
-
-		// Try to add after a mid-record
-		Record[] cr = recordContainer.getChildRecords();
-		Record after = cr[2];
-		Record before = cr[3];
-
-		recordContainer.addChildAfter(newRecord, after);
-		Record[] ncr = recordContainer.getChildRecords();
-
-		assertEquals(cr.length+1, ncr.length);
-		assertEquals(after, ncr[2]);
-		assertEquals(newRecord, ncr[3]);
-		assertEquals(before, ncr[4]);
-
-		// Try again at the end
-		recordContainer._children = cr;
-		after = cr[cr.length-1];
-
-		recordContainer.addChildAfter(newRecord, after);
-		ncr = recordContainer.getChildRecords();
-
-		assertEquals(cr.length+1, ncr.length);
-		assertEquals(after, ncr[cr.length-1]);
-		assertEquals(newRecord, ncr[cr.length]);
-	}
-
-	public void testAddChildBefore() {
-		// Working with new StyleTextPropAtom
-		Record newRecord = new StyleTextPropAtom(0);
-
-		// Try to add before a mid-record
-		Record[] cr = recordContainer.getChildRecords();
-		Record before = cr[2];
-
-		recordContainer.addChildBefore(newRecord, before);
-		Record[] ncr = recordContainer.getChildRecords();
-
-		assertEquals(cr.length+1, ncr.length);
-		assertEquals(newRecord, ncr[2]);
-		assertEquals(before, ncr[3]);
-
-
-		// Try again at the end
-		recordContainer._children = cr;
-		before = cr[cr.length-1];
-
-		recordContainer.addChildBefore(newRecord, before);
-		ncr = recordContainer.getChildRecords();
-
-		assertEquals(cr.length+1, ncr.length);
-		assertEquals(newRecord, ncr[cr.length-1]);
-		assertEquals(before, ncr[cr.length]);
-
-
-		// And at the start
-		recordContainer._children = cr;
-		before = cr[0];
-
-		recordContainer.addChildBefore(newRecord, before);
-		ncr = recordContainer.getChildRecords();
-
-		assertEquals(cr.length+1, ncr.length);
-		assertEquals(newRecord, ncr[0]);
-		assertEquals(before, ncr[1]);
-	}
-
-    public void testRemove() {
-        Record[] ch = recordContainer.getChildRecords();
-        Record removeRecord = recordContainer.removeChild(ch[0]);
-        assertSame(ch[0], removeRecord);
-        assertEquals(ch.length-1, recordContainer.getChildRecords().length);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-		super.setUp();
-
-		// Find a real RecordContainer record
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-
-		Record[] r = hss.getRecords();
-		for (Record rec : r) {
-			if(rec instanceof RecordContainer) {
-				recordContainer = (RecordContainer)rec;
-				return;
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java
deleted file mode 100644
index 814259c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Tests that RecordTypes returns the right records and classes when asked
- */
-public final class TestRecordTypes {
-    @Test
-	public void testPPTNameLookups() {
-		assertEquals("MainMaster", RecordTypes.MainMaster.name());
-		assertEquals("TextBytesAtom", RecordTypes.TextBytesAtom.name());
-		assertEquals("VBAInfo", RecordTypes.VBAInfo.name());
-	}
-
-    @Test
-	public void testEscherNameLookups() {
-		assertEquals("EscherDggContainer", RecordTypes.EscherDggContainer.name());
-		assertEquals("EscherClientTextbox", RecordTypes.EscherClientTextbox.name());
-		assertEquals("EscherSelection", RecordTypes.EscherSelection.name());
-	}
-
-    @Test
-	public void testPPTClassLookups() {
-		assertEquals(Slide.class, RecordTypes.Slide.handlingClass);
-		assertEquals(TextCharsAtom.class, RecordTypes.TextCharsAtom.handlingClass);
-		assertEquals(TextBytesAtom.class, RecordTypes.TextBytesAtom.handlingClass);
-		assertEquals(SlideListWithText.class, RecordTypes.SlideListWithText.handlingClass);
-
-		// If this record is ever implemented, change to one that isn't!
-		// This is checking the "unhandled default" stuff works
-		assertEquals(UnknownRecordPlaceholder.class, RecordTypes.forTypeID(-10).handlingClass);
-	}
-
-    @Test
-    public void testEscherClassLookups() {
-		// Should all come back with null, as DDF handles them
-		assertEquals(null, RecordTypes.EscherDggContainer.handlingClass);
-		assertEquals(null, RecordTypes.EscherBStoreContainer.handlingClass);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
deleted file mode 100644
index 7e6137b..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.hslf.record.SlideAtom.SSlideLayoutAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that SlideAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestSlideAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] { 1, 0, 0xEF-256, 3, 0x18, 0, 0, 0,
-		0, 0, 0, 0, 0x0F, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80-256,
-		0, 1, 0, 0, 7, 0, 0x0C, 0x30 };
-
-    public void testRecordType() {
-		SlideAtom sa = new SlideAtom(data_a, 0, data_a.length);
-		assertEquals(1007l, sa.getRecordType());
-	}
-	public void testFlags() {
-		SlideAtom sa = new SlideAtom(data_a, 0, data_a.length);
-
-		// First 12 bytes are a SSlideLayoutAtom, checked elsewhere
-
-		// Check the IDs
-		assertEquals(0x80000000, sa.getMasterID());
-		assertEquals(256, sa.getNotesID());
-
-		// Check the flags
-		assertEquals(true, sa.getFollowMasterObjects());
-		assertEquals(true, sa.getFollowMasterScheme());
-		assertEquals(true, sa.getFollowMasterBackground());
-	}
-	public void testSSlideLayoutAtom() {
-		SlideAtom sa = new SlideAtom(data_a, 0, data_a.length);
-		SSlideLayoutAtom ssla = sa.getSSlideLayoutAtom();
-
-		assertEquals(0, ssla.getGeometryType());
-
-		// Should also check the placehold IDs at some point
-	}
-
-	public void testWrite() throws Exception {
-		SlideAtom sa = new SlideAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		sa.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-	
-	public void testSSSlideInfoAtom() throws Exception {
-		HSLFSlideShow ss = new HSLFSlideShow();
-		org.apache.poi.hslf.usermodel.HSLFSlide	slide1 = ss.createSlide(), slide2 = ss.createSlide();
-		slide2.setHidden(true);
-
-		ByteArrayOutputStream bos = new ByteArrayOutputStream(4096);
-		ss.write(bos);
-		ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-		ss = new HSLFSlideShow(bis);
-		slide1 = ss.getSlides().get(0);
-		slide2 = ss.getSlides().get(1);
-		assertFalse(slide1.getHidden());
-		assertTrue(slide2.getHidden());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java
deleted file mode 100644
index 87d8a17..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that SlidePersistAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestSlidePersistAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] { 0, 0, 0xF3-256, 3, 0x14, 0, 0, 0,
-		4, 0, 0, 0, 4, 0, 0, 0, 2, 0, 0, 0, 0,
-		1, 0, 0, 0, 0, 0, 0 };
-
-	public void testRecordType() {
-		SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length);
-		assertEquals(1011l, spa.getRecordType());
-	}
-	public void testFlags() {
-		SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length);
-		assertEquals(4, spa.getRefID() );
-		assertEquals(true, spa.getHasShapesOtherThanPlaceholders() );
-		assertEquals(2, spa.getNumPlaceholderTexts() );
-		assertEquals(256, spa.getSlideIdentifier());
-	}
-
-	public void testWrite() throws Exception {
-		SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		spa.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
deleted file mode 100644
index 24e21d6..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-
-/**
- * Tests Sound-related records: SoundCollection(2020), Sound(2022) and
- * SoundData(2023)).
- *
- * @author Yegor Kozlov
- */
-public final class TestSound extends TestCase {
-	public void testRealFile() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-		HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream("sound.ppt"));
-
-		// Get the document
-		Document doc = ppt.getDocumentRecord();
-		SoundCollection soundCollection = null;
-		Record[] doc_ch = doc.getChildRecords();
-		for (Record rec : doc_ch) {
-			if (rec instanceof SoundCollection) {
-				soundCollection = (SoundCollection) rec;
-				break;
-			}
-		}
-		if (soundCollection == null) {
-			throw new AssertionFailedError("soundCollection must not be null");
-		}
-
-		Sound sound = null;
-		Record[] sound_ch = soundCollection.getChildRecords();
-		int k = 0;
-		for (Record rec : sound_ch) {
-			if (rec instanceof Sound) {
-				sound = (Sound) rec;
-				k++;
-			}
-		}
-		if (sound == null) {
-			throw new AssertionFailedError("sound must not be null");
-		}
-		assertEquals(1, k);
-
-		assertEquals("ringin.wav", sound.getSoundName());
-		assertEquals(".WAV", sound.getSoundType());
-		assertNotNull(sound.getSoundData());
-
-		byte[] ref_data = slTests.readFile("ringin.wav");
-		assertArrayEquals(ref_data, sound.getSoundData());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
deleted file mode 100644
index 533d250..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
+++ /dev/null
@@ -1,796 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.poi.hslf.model.textproperties.*;
-import org.apache.poi.util.HexDump;
-import org.junit.Test;
-
-/**
- * Tests that StyleTextPropAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestStyleTextPropAtom {
-    /** From a real file: a paragraph with 4 different styles */
-    private static final byte[] data_a = new byte[] {
-      0, 0, 0xA1-256, 0x0F, 0x2A, 0, 0, 0,
-      0x36, 00, 00, 00, // paragraph is 54 long
-      00, 00,           // (paragraph reserved field)
-      00, 00, 00, 00,   // it doesn't have any styles
-      0x15, 00, 00, 00, // first char run is 21 long
-      00, 00, 00, 00,   // it doesn't have any styles
-      0x11, 00, 00, 00, // second char run is 17 long
-      00, 00, 0x04, 00, // font.color only
-      00, 00, 00, 0x05, // blue
-      0x10, 00, 00, 00, // third char run is 16 long
-      00, 00, 0x04, 00, // font.color only
-      0xFF-256, 0x33, 00, 0xFE-256 // red
-    };
-    private static final int data_a_text_len = 0x36-1;
-
-    /**
-     * From a real file: 4 paragraphs with text in 4 different styles:
-     * left aligned+bold (30)
-     * centre aligned+italic+blue (28)
-     * right aligned+red (25)
-     * left aligned+underlined+larger font size (96)
-     * left aligned+underlined+larger font size+red (1)
-     */
-    private static final byte[] data_b = new byte[] {
-        0, 0, 0xA1-256, 0x0F, 0x80-256, 0, 0, 0,
-        0x1E, 00, 00, 00,     // paragraph is 30 long
-        00, 00,               // paragraph reserved field
-        00, 0x18, 00, 00,     // mask is 0x1800
-        00, 00,               // left aligned
-        0x50, 00,             // line spacing 80
-        0x1C, 00, 00, 00,     // paragprah is 28 long
-        00, 00,               // paragraph reserved field
-        00, 0x10, 00, 00,     // mask is 0x1000
-        0x50, 00,             // line spacing 80
-        0x19, 00, 00, 00,     // paragraph is 25 long
-        00, 00,               // paragraph reserved field
-        00, 0x18, 00, 00,     // mask is 0x1800
-        02, 00,               // right aligned
-        0x50, 00,             // line spacing 80
-        0x61, 00, 00, 00,     // paragraph is 97 long
-        00, 00,               // paragraph reserved field
-        00, 0x18, 00, 00,     // mask is 0x1800
-        00, 00,               // left aligned
-        0x50, 00,             // line spacing 80
-
-        0x1E, 00, 00, 00,     // character run is 30 long
-        01, 00, 02, 00,       // mask is 0x020001
-        01, 00,               // char flags 0x0001 = bold
-        0x14, 00,             // font size 20
-        0x1C, 00, 00, 00,     // character run is 28 long
-        02, 00, 06, 00,       // mask is 0x060002
-        02, 00,               // char flags 0x0002 = italic
-        0x14, 00,             // font size 20
-        00, 00, 00, 05,       // colour blue
-        0x19, 00, 00, 00,     // character run is 25 long
-        00, 00, 06, 00,       // char flags 0x060000
-        0x14, 00,             // font size 20
-        0xFF-256, 0x33, 00, 0xFE-256, // colour red
-        0x60, 00, 00, 00,     // character run is 96 long
-        04, 00, 03, 00,       // mask is 0x030004
-        04, 00,               // char flags 0x0004 = underlined
-        01, 00,               // font index is 1
-        0x18, 00,             // font size 24
-
-        01, 00, 00, 00,       // character run is 1 long
-        04, 00, 07, 00,       // mask is 0x070004
-        04, 00,               // char flags 0x0004 = underlined
-        01, 00,               // font index is 1
-        0x18, 00,             // font size 24
-        0xFF-256, 0x33, 00, 0xFE-256 // colour red
-    };
-    private static final int data_b_text_len = 0xB3;
-
-    /**
-     * From a real file. Has a mask with more bits
-     *  set than it actually has data for. Shouldn't do,
-     *  but some real files do :(
-     */
-    private static final byte[] data_c = new byte[] {
-        0, 0, -95, 15, 62, 0, 0, 0,
-        123, 0, 0, 0, 0, 0, 48, 8,
-        10, 0, 1, 0, 0, 0, 0, 0,
-        1, 0, 2, 0, 1, 0, 0, 0,
-        0, 0, 48, 0, 10, 0, 1, 0,
-        0, 0, 0, 0, 2, 0, 123, 0,
-        0, 0, 0, 0, 3, 0, 1, 0,
-        28, 0, 1, 0, 0, 0, 0, 0,
-        3, 0, 1, 0, 24, 0
-    };
-    private final int data_c_text_len = 123-1;
-
-    /**
-     * From a real file supplied for Bug 40143 by tales@great.ufc.br
-     */
-    private static final byte[] data_d = {
-        0x00, 0x00, 0xA1-256, 0x0F, 0x1E, 0x00, 0x00, 0x00, //header
-        (byte)0xA0, 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x08 , 0x00 , 0x00 ,
-        0x01 , 0x00, (byte)0xA0 , 0x00 , 0x00 , 0x00 , 0x01 , 0x00 , 0x63 , 0x00 ,
-        0x01 , 0x00, 0x01 , 0x00 , 0x00, 0x00 , 0x01 , 0x00 , 0x14 , 0x00
-    };
-    private static final int data_d_text_len = 0xA0-1;
-
-    @Test
-    public void testRecordType() {
-        StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length);
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-        StyleTextPropAtom stpc = new StyleTextPropAtom(data_c,0,data_c.length);
-        assertEquals(4001l, stpa.getRecordType());
-        assertEquals(4001l, stpb.getRecordType());
-        assertEquals(4001l, stpc.getRecordType());
-    }
-
-
-    @Test
-    public void testCharacterStyleCounts() {
-        StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length);
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-
-        // Set for the appropriate text sizes
-        stpa.setParentTextSize(data_a_text_len);
-        stpb.setParentTextSize(data_b_text_len);
-
-        // In case A, there is a single styling of the characters
-        assertEquals(3, stpa.getCharacterStyles().size());
-        // In case B, there are 5 different stylings
-        assertEquals(5, stpb.getCharacterStyles().size());
-    }
-
-    @Test
-    public void testParagraphStyleCounts() {
-        StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length);
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-
-        // Set for the appropriate text sizes
-        stpa.setParentTextSize(data_a_text_len);
-        stpb.setParentTextSize(data_b_text_len);
-
-        // In case A, all has the same spacing and alignment
-        assertEquals(1, stpa.getParagraphStyles().size());
-        // In case B, all 4 sets have different alignments
-        assertEquals(4, stpb.getParagraphStyles().size());
-    }
-
-
-    @Test
-    public void testCharacterStyleLengths() {
-        StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length);
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-
-        // Set for the appropriate text sizes
-        stpa.setParentTextSize(data_a_text_len);
-        stpb.setParentTextSize(data_b_text_len);
-
-        // 54 chars, 21 + 17 + 16
-        List<TextPropCollection> a_ch_l = stpa.getCharacterStyles();
-        TextPropCollection a_ch_1 = a_ch_l.get(0);
-        TextPropCollection a_ch_2 = a_ch_l.get(1);
-        TextPropCollection a_ch_3 = a_ch_l.get(2);
-        assertEquals(21, a_ch_1.getCharactersCovered());
-        assertEquals(17, a_ch_2.getCharactersCovered());
-        assertEquals(16, a_ch_3.getCharactersCovered());
-
-        // 179 chars, 30 + 28 + 25
-        List<TextPropCollection> b_ch_l = stpb.getCharacterStyles();
-        TextPropCollection b_ch_1 = b_ch_l.get(0);
-        TextPropCollection b_ch_2 = b_ch_l.get(1);
-        TextPropCollection b_ch_3 = b_ch_l.get(2);
-        TextPropCollection b_ch_4 = b_ch_l.get(3);
-        assertEquals(30, b_ch_1.getCharactersCovered());
-        assertEquals(28, b_ch_2.getCharactersCovered());
-        assertEquals(25, b_ch_3.getCharactersCovered());
-        assertEquals(96, b_ch_4.getCharactersCovered());
-    }
-
-
-    @Test
-    public void testCharacterPropOrdering() {
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-        stpb.setParentTextSize(data_b_text_len);
-
-        List<TextPropCollection> b_ch_l = stpb.getCharacterStyles();
-        TextPropCollection b_ch_1 = b_ch_l.get(0);
-        TextPropCollection b_ch_2 = b_ch_l.get(1);
-        TextPropCollection b_ch_3 = b_ch_l.get(2);
-        TextPropCollection b_ch_4 = b_ch_l.get(3);
-
-        // In first set, we get a CharFlagsTextProp and a font.size
-        assertEquals(2,b_ch_1.getTextPropList().size());
-        TextProp tp_1_1 = b_ch_1.getTextPropList().get(0);
-        TextProp tp_1_2 = b_ch_1.getTextPropList().get(1);
-        assertEquals(true, tp_1_1 instanceof CharFlagsTextProp);
-        assertEquals("font.size", tp_1_2.getName());
-        assertEquals(20, tp_1_2.getValue());
-
-        // In second set, we get a CharFlagsTextProp and a font.size and a font.color
-        assertEquals(3,b_ch_2.getTextPropList().size());
-        TextProp tp_2_1 = b_ch_2.getTextPropList().get(0);
-        TextProp tp_2_2 = b_ch_2.getTextPropList().get(1);
-        TextProp tp_2_3 = b_ch_2.getTextPropList().get(2);
-        assertEquals(true, tp_2_1 instanceof CharFlagsTextProp);
-        assertEquals("font.size", tp_2_2.getName());
-        assertEquals("font.color", tp_2_3.getName());
-        assertEquals(20, tp_2_2.getValue());
-
-        // In third set, it's just a font.size and a font.color
-        assertEquals(2,b_ch_3.getTextPropList().size());
-        TextProp tp_3_1 = b_ch_3.getTextPropList().get(0);
-        TextProp tp_3_2 = b_ch_3.getTextPropList().get(1);
-        assertEquals("font.size", tp_3_1.getName());
-        assertEquals("font.color", tp_3_2.getName());
-        assertEquals(20, tp_3_1.getValue());
-
-        // In fourth set, we get a CharFlagsTextProp and a font.index and a font.size
-        assertEquals(3,b_ch_4.getTextPropList().size());
-        TextProp tp_4_1 = b_ch_4.getTextPropList().get(0);
-        TextProp tp_4_2 = b_ch_4.getTextPropList().get(1);
-        TextProp tp_4_3 = b_ch_4.getTextPropList().get(2);
-        assertEquals(true, tp_4_1 instanceof CharFlagsTextProp);
-        assertEquals("font.index", tp_4_2.getName());
-        assertEquals("font.size", tp_4_3.getName());
-        assertEquals(24, tp_4_3.getValue());
-    }
-
-    @Test
-    public void testParagraphProps() {
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-        stpb.setParentTextSize(data_b_text_len);
-
-        List<TextPropCollection> b_p_l = stpb.getParagraphStyles();
-        TextPropCollection b_p_1 = b_p_l.get(0);
-        TextPropCollection b_p_2 = b_p_l.get(1);
-        TextPropCollection b_p_3 = b_p_l.get(2);
-        TextPropCollection b_p_4 = b_p_l.get(3);
-
-        // 1st is left aligned + normal line spacing
-        assertEquals(2,b_p_1.getTextPropList().size());
-        TextProp tp_1_1 = b_p_1.getTextPropList().get(0);
-        TextProp tp_1_2 = b_p_1.getTextPropList().get(1);
-        assertEquals("alignment", tp_1_1.getName());
-        assertEquals("linespacing", tp_1_2.getName());
-        assertEquals(0, tp_1_1.getValue());
-        assertEquals(80, tp_1_2.getValue());
-
-        // 2nd is centre aligned (default) + normal line spacing
-        assertEquals(1,b_p_2.getTextPropList().size());
-        TextProp tp_2_1 = b_p_2.getTextPropList().get(0);
-        assertEquals("linespacing", tp_2_1.getName());
-        assertEquals(80, tp_2_1.getValue());
-
-        // 3rd is right aligned + normal line spacing
-        assertEquals(2,b_p_3.getTextPropList().size());
-        TextProp tp_3_1 = b_p_3.getTextPropList().get(0);
-        TextProp tp_3_2 = b_p_3.getTextPropList().get(1);
-        assertEquals("alignment", tp_3_1.getName());
-        assertEquals("linespacing", tp_3_2.getName());
-        assertEquals(2, tp_3_1.getValue());
-        assertEquals(80, tp_3_2.getValue());
-
-        // 4st is left aligned + normal line spacing (despite differing font)
-        assertEquals(2,b_p_4.getTextPropList().size());
-        TextProp tp_4_1 = b_p_4.getTextPropList().get(0);
-        TextProp tp_4_2 = b_p_4.getTextPropList().get(1);
-        assertEquals("alignment", tp_4_1.getName());
-        assertEquals("linespacing", tp_4_2.getName());
-        assertEquals(0, tp_4_1.getValue());
-        assertEquals(80, tp_4_2.getValue());
-    }
-
-    @Test
-    public void testCharacterProps() {
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-        stpb.setParentTextSize(data_b_text_len);
-
-        List<TextPropCollection> b_ch_l = stpb.getCharacterStyles();
-        TextPropCollection b_ch_1 = b_ch_l.get(0);
-        TextPropCollection b_ch_2 = b_ch_l.get(1);
-        TextPropCollection b_ch_3 = b_ch_l.get(2);
-        TextPropCollection b_ch_4 = b_ch_l.get(3);
-
-        // 1st is bold
-        CharFlagsTextProp cf_1_1 = (CharFlagsTextProp)b_ch_1.getTextPropList().get(0);
-        assertEquals(true,cf_1_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
-        assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-
-        // 2nd is italic
-        CharFlagsTextProp cf_2_1 = (CharFlagsTextProp)b_ch_2.getTextPropList().get(0);
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(true,cf_2_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
-        assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-
-        // 3rd is normal, so lacks a CharFlagsTextProp
-        assertFalse(b_ch_3.getTextPropList().get(0) instanceof CharFlagsTextProp);
-
-        // 4th is underlined
-        CharFlagsTextProp cf_4_1 = (CharFlagsTextProp)b_ch_4.getTextPropList().get(0);
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
-        assertEquals(true,cf_4_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-
-        // The value for this should be 4
-        assertEquals(0x0004, cf_4_1.getValue());
-
-        // Now make the 4th bold, italic and not underlined
-        cf_4_1.setSubValue(true, CharFlagsTextProp.BOLD_IDX);
-        cf_4_1.setSubValue(true, CharFlagsTextProp.ITALIC_IDX);
-        cf_4_1.setSubValue(false, CharFlagsTextProp.UNDERLINE_IDX);
-
-        assertEquals(true,cf_4_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
-        assertEquals(true,cf_4_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
-        assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
-
-        // The value should now be 3
-        assertEquals(0x0003, cf_4_1.getValue());
-    }
-
-    @Test(expected=HSLFException.class)
-    public void testFindAddTextProp() {
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-        stpb.setParentTextSize(data_b_text_len);
-
-        List<TextPropCollection> b_p_l = stpb.getParagraphStyles();
-        TextPropCollection b_p_1 = b_p_l.get(0);
-        TextPropCollection b_p_2 = b_p_l.get(1);
-        TextPropCollection b_p_3 = b_p_l.get(2);
-        TextPropCollection b_p_4 = b_p_l.get(3);
-
-        List<TextPropCollection> b_ch_l = stpb.getCharacterStyles();
-        TextPropCollection b_ch_1 = b_ch_l.get(0);
-        TextPropCollection b_ch_2 = b_ch_l.get(1);
-        TextPropCollection b_ch_3 = b_ch_l.get(2);
-        TextPropCollection b_ch_4 = b_ch_l.get(3);
-        
-        assertNotNull(b_p_1);
-        assertNotNull(b_p_2);
-        assertNotNull(b_p_3);
-        assertNotNull(b_p_4);
-        
-        assertNotNull(b_ch_1);
-        assertNotNull(b_ch_2);
-        assertNotNull(b_ch_3);
-        assertNotNull(b_ch_4);
-
-        // CharFlagsTextProp: 3 doesn't have, 4 does
-        assertNull(b_ch_3.findByName("char_flags"));
-        assertNotNull(b_ch_4.findByName("char_flags"));
-
-        // Now add in on 3, should go to front
-        assertEquals(2, b_ch_3.getTextPropList().size());
-        TextProp new_cftp = b_ch_3.addWithName("char_flags");
-        assertEquals(3, b_ch_3.getTextPropList().size());
-        assertEquals(new_cftp, b_ch_3.getTextPropList().get(0));
-
-        // alignment: 1 does have, 2 doesn't
-        assertNotNull(b_p_1.findByName("alignment"));
-        assertNull(b_p_2.findByName("alignment"));
-
-        // Now add in on 2, should go to the front
-        assertEquals(1, b_p_2.getTextPropList().size());
-        TextProp new_al = b_p_2.addWithName("alignment");
-        assertEquals(2, b_p_2.getTextPropList().size());
-        assertEquals(new_al, b_p_2.getTextPropList().get(0));
-
-        // This should go at the end
-        TextProp new_sa = b_p_2.addWithName("spaceafter");
-        assertEquals(3, b_p_2.getTextPropList().size());
-        assertEquals(new_sa, b_p_2.getTextPropList().get(2));
-
-        // Check we get an error with a made up one
-        b_p_2.addWithName("madeUpOne");
-    }
-
-    /**
-     * Try to recreate an existing StyleTextPropAtom (a) from the empty
-     *  constructor, and setting the required properties
-     */
-    @Test
-    public void testCreateAFromScatch() throws Exception {
-        // Start with an empty one
-        StyleTextPropAtom stpa = new StyleTextPropAtom(54);
-
-        // Don't need to touch the paragraph styles
-        // Add two more character styles
-        List<TextPropCollection> cs = stpa.getCharacterStyles();
-
-        // First char style is boring, and 21 long
-        TextPropCollection tpca = cs.get(0);
-        tpca.updateTextSize(21);
-
-        // Second char style is coloured, 00 00 00 05, and 17 long
-        TextPropCollection tpcb = stpa.addCharacterTextPropCollection(17);
-        TextProp tpb = tpcb.addWithName("font.color");
-        tpb.setValue(0x05000000);
-
-        // Third char style is coloured, FF 33 00 FE, and 16 long
-        TextPropCollection tpcc = stpa.addCharacterTextPropCollection(16);
-        TextProp tpc = tpcc.addWithName("font.color");
-        tpc.setValue(0xFE0033FF);
-
-        // Should now be the same as data_a
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        stpa.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertEquals(data_a.length, b.length);
-        for(int i=0; i<data_a.length; i++) {
-            assertEquals(data_a[i],b[i]);
-        }
-    }
-
-    /**
-     * Try to recreate an existing StyleTextPropAtom (b) from the empty
-     *  constructor, and setting the required properties
-     */
-    @Test
-    public void testCreateBFromScatch() throws Exception {
-        // Start with an empty one
-        StyleTextPropAtom stpa = new StyleTextPropAtom(data_b_text_len);
-
-
-        // Need 4 paragraph styles
-        List<TextPropCollection> ps = stpa.getParagraphStyles();
-
-        // First is 30 long, left aligned, normal spacing
-        TextPropCollection tppa = ps.get(0);
-        tppa.updateTextSize(30);
-
-        TextProp tp = tppa.addWithName("alignment");
-        tp.setValue(0);
-        tp = tppa.addWithName("linespacing");
-        tp.setValue(80);
-
-        // Second is 28 long, centre aligned and normal spacing
-        TextPropCollection tppb = stpa.addParagraphTextPropCollection(28);
-
-        tp = tppb.addWithName("linespacing");
-        tp.setValue(80);
-
-        // Third is 25 long, right aligned and normal spacing
-        TextPropCollection tppc = stpa.addParagraphTextPropCollection(25);
-
-        tp = tppc.addWithName("alignment");
-        tp.setValue(2);
-        tp = tppc.addWithName("linespacing");
-        tp.setValue(80);
-
-        // Forth is left aligned + normal line spacing (despite differing font)
-        TextPropCollection tppd = stpa.addParagraphTextPropCollection(97);
-
-        tp = tppd.addWithName("alignment");
-        tp.setValue(0);
-        tp = tppd.addWithName("linespacing");
-        tp.setValue(80);
-
-
-        // Now do 4 character styles
-        List<TextPropCollection> cs = stpa.getCharacterStyles();
-
-        // First is 30 long, bold and font size
-        TextPropCollection tpca = cs.get(0);
-        tpca.updateTextSize(30);
-
-        tp = tpca.addWithName("font.size");
-        tp.setValue(20);
-        CharFlagsTextProp cftp = (CharFlagsTextProp)
-            tpca.addWithName("char_flags");
-        assertEquals(0, cftp.getValue());
-        cftp.setSubValue(true, CharFlagsTextProp.BOLD_IDX);
-        assertEquals(1, cftp.getValue());
-
-        // Second is 28 long, blue and italic
-        TextPropCollection tpcb = stpa.addCharacterTextPropCollection(28);
-
-        tp = tpcb.addWithName("font.size");
-        tp.setValue(20);
-        tp = tpcb.addWithName("font.color");
-        tp.setValue(0x05000000);
-        cftp = (CharFlagsTextProp)tpcb.addWithName("char_flags");
-        cftp.setSubValue(true, CharFlagsTextProp.ITALIC_IDX);
-        assertEquals(2, cftp.getValue());
-
-        // Third is 25 long and red
-        TextPropCollection tpcc = stpa.addCharacterTextPropCollection(25);
-
-        tp = tpcc.addWithName("font.size");
-        tp.setValue(20);
-        tp = tpcc.addWithName("font.color");
-        tp.setValue(0xfe0033ff);
-
-        // Fourth is 96 long, underlined and different+bigger font
-        TextPropCollection tpcd = stpa.addCharacterTextPropCollection(96);
-
-        tp = tpcd.addWithName("font.size");
-        tp.setValue(24);
-        tp = tpcd.addWithName("font.index");
-        tp.setValue(1);
-        cftp = (CharFlagsTextProp)tpcd.addWithName("char_flags");
-        cftp.setSubValue(true, CharFlagsTextProp.UNDERLINE_IDX);
-        assertEquals(4, cftp.getValue());
-
-        // Fifth is 1 long, underlined and different+bigger font + red
-        TextPropCollection tpce = stpa.addCharacterTextPropCollection(1);
-
-        tp = tpce.addWithName("font.size");
-        tp.setValue(24);
-        tp = tpce.addWithName("font.index");
-        tp.setValue(1);
-        tp = tpce.addWithName("font.color");
-        tp.setValue(0xfe0033ff);
-        cftp = (CharFlagsTextProp)tpce.addWithName("char_flags");
-        cftp.setSubValue(true, CharFlagsTextProp.UNDERLINE_IDX);
-        assertEquals(4, cftp.getValue());
-
-
-        // Check it's as expected
-        assertEquals(4, stpa.getParagraphStyles().size());
-        assertEquals(5, stpa.getCharacterStyles().size());
-
-        // Compare in detail to b
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
-        stpb.setParentTextSize(data_b_text_len);
-        List<TextPropCollection> psb = stpb.getParagraphStyles();
-        List<TextPropCollection> csb = stpb.getCharacterStyles();
-
-        assertEquals(psb.size(), ps.size());
-        assertEquals(csb.size(), cs.size());
-
-        // Ensure Paragraph Character styles match
-        for(int z=0; z<2; z++) {
-            List<TextPropCollection> lla = cs;
-            List<TextPropCollection> llb = csb;
-            int upto = 5;
-            if(z == 1) {
-                lla = ps;
-                llb = psb;
-                upto = 4;
-            }
-
-            for(int i=0; i<upto; i++) {
-                TextPropCollection ca = lla.get(i);
-                TextPropCollection cb = llb.get(i);
-
-                assertEquals(ca.getCharactersCovered(), cb.getCharactersCovered());
-                assertEquals(ca.getTextPropList().size(), cb.getTextPropList().size());
-
-                for(int j=0; j<ca.getTextPropList().size(); j++) {
-                    TextProp tpa = ca.getTextPropList().get(j);
-                    TextProp tpb = cb.getTextPropList().get(j);
-                    //System.out.println("TP " + i + " " + j + " " + tpa.getName() + "\t" + tpa.getValue() );
-                    assertEquals(tpa.getName(), tpb.getName());
-                    assertEquals(tpa.getMask(), tpb.getMask());
-                    assertEquals(tpa.getWriteMask(), tpb.getWriteMask());
-                    assertEquals(tpa.getValue(), tpb.getValue());
-                }
-
-                ByteArrayOutputStream ba = new ByteArrayOutputStream();
-                ByteArrayOutputStream bb = new ByteArrayOutputStream();
-
-                ca.writeOut(ba);
-                cb.writeOut(bb);
-                byte[] cab = ba.toByteArray();
-                byte[] cbb = bb.toByteArray();
-
-                assertEquals(cbb.length, cab.length);
-                for(int j=0; j<cab.length; j++) {
-                    //System.out.println("On tp " + z + " " + i + " " + j + "\t" + cab[j] + "\t" + cbb[j]);
-                    assertEquals(cbb[j], cab[j]);
-                }
-            }
-        }
-
-
-
-        // Check byte level with b
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        stpa.writeOut(baos);
-        byte[] b = baos.toByteArray();
-
-        assertEquals(data_b.length, b.length);
-        for(int i=0; i<data_b.length; i++) {
-            //System.out.println(i + "\t" + b[i] + "\t" + data_b[i] + "\t" + Integer.toHexString(b[i]) );
-            assertEquals(data_b[i],b[i]);
-        }
-    }
-
-    @Test
-    public void testWriteA() {
-        doReadWrite(data_a, -1);
-    }
-
-    @Test
-    public void testLoadWriteA() {
-        doReadWrite(data_b, data_b_text_len);
-    }
-
-
-    @Test
-    public void testWriteB() {
-        doReadWrite(data_b, -1);
-    }
-
-    @Test
-    public void testLoadWriteB() {
-        doReadWrite(data_b, data_b_text_len);
-    }
-
-    @Test
-    public void testLoadWriteC() {
-        // BitMaskTextProperties will sanitize the output
-        byte expected[] = data_c.clone();
-        expected[56] = 0;
-        expected[68] = 0;
-        doReadWrite(data_c, expected, data_c_text_len);
-    }
-
-    @Test
-    public void testLoadWriteD() {
-        doReadWrite(data_d, data_d_text_len);
-    }
-
-    protected void doReadWrite(byte[] data, int textlen) {
-        doReadWrite(data, data, textlen);
-    }
-    
-    protected void doReadWrite(byte[] data, byte[] expected, int textlen) {
-        StyleTextPropAtom stpb = new StyleTextPropAtom(data, 0,data.length);
-        if(textlen != -1) stpb.setParentTextSize(textlen);
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        try {
-            stpb.writeOut(out);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        byte[] bytes = out.toByteArray();
-
-        assertEquals(expected.length, bytes.length);
-        try {
-            assertArrayEquals(expected, bytes);
-        } catch (Throwable e){
-            //print hex dump if failed
-            assertEquals(HexDump.toHex(expected), HexDump.toHex(bytes));
-        }
-    }
-
-    @Test
-    public void testNotEnoughDataProp() {
-        // We don't have enough data in the record to cover
-        //  all the properties the mask says we have
-        // Make sure we just do the best we can
-        StyleTextPropAtom stpc = new StyleTextPropAtom(data_c,0,data_c.length);
-        stpc.setParentTextSize(data_c_text_len);
-
-        // If we get here, we didn't break
-    }
-
-    /**
-     * Check the test data for Bug 40143.
-     */
-   @Test
-   public void testBug40143() {
-        StyleTextPropAtom atom = new StyleTextPropAtom(data_d, 0, data_d.length);
-        atom.setParentTextSize(data_d_text_len);
-
-        TextPropCollection prprops = atom.getParagraphStyles().get(0);
-        assertEquals(data_d_text_len+1, prprops.getCharactersCovered());
-        assertEquals(1, prprops.getTextPropList().size()); //1 property found
-        assertEquals(1, prprops.findByName("alignment").getValue());
-
-        TextPropCollection chprops = atom.getCharacterStyles().get(0);
-        assertEquals(data_d_text_len+1, chprops.getCharactersCovered());
-        assertEquals(5, chprops.getTextPropList().size()); //5 properties found
-        assertEquals(1, chprops.findByName("char_flags").getValue());
-        assertEquals(1, chprops.findByName("font.index").getValue());
-        assertEquals(20, chprops.findByName("font.size").getValue());
-        assertEquals(0, chprops.findByName("asian.font.index").getValue());
-        assertEquals(1, chprops.findByName("ansi.font.index").getValue());
-    }
-
-    /**
-     * Check the test data for Bug 42677.
-     */
-     @Test
-     public void test42677() {
-        int length = 18;
-        byte[] data = {
-            0x00, 0x00, (byte)0xA1, 0x0F, 0x28, 0x00, 0x00, 0x00,
-            0x13, 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , (byte)0xF1 , 0x20 , 0x00, 0x00 , 0x00 , 0x00 ,
-            0x22 , 0x20 , 0x00 , 0x00 , 0x64 , 0x00 , 0x00 , 0x00 , 0x00 , (byte)0xFF ,
-            0x00 , 0x00 , 0x13 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x63 , 0x00 ,
-            0x00 , 0x00 , 0x01 , 0x00 , 0x00 , 0x00 , 0x0F , 0x00
-        };
-        doReadWrite(data, length);
-
-    }
-
-    /**
-     *  Bug 45815: bit mask values are not preserved on read-write
-     *
-     * From the test file attached to the bug:
-     *
-     * <StyleTextPropAtom info="0" type="4001" size="94" offset="114782" header="00 00 A1 0F 5E 00 00 00 ">
-     *   14 00 00 00 00 00 41 00 0A 00 06 00 50 00 07 00 01 00 00 00 00 00 00 00 02
-     *   00 00 00 01 04 00 00 01 04 01 00 00 00 01 08 00 00 01 08 0C 00 00 00 01 0C
-     *   00 00 01 0C 01 00 00 00 01 10 00 00 01 10 01 00 00 00 01 14 00 00 01 14 01
-     *   00 00 00 01 18 00 00 01 18 01 00 00 00 01 1C 00 00 01 1C
-     * </StyleTextPropAtom>
-     */
-     @Test
-    public void test45815() {
-        int length = 19;
-        byte[] data = {
-                0x00, 0x00, (byte)0xA1, 0x0F, 0x5E, 0x00, 0x00, 0x00, 0x14, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x0A, 0x00, 0x06, 0x00,
-                0x50, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00,
-                0x01, 0x04, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00,
-                0x01, 0x08, 0x0C, 0x00, 0x00, 0x00, 0x01, 0x0C, 0x00, 0x00,
-                0x01, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00,
-                0x01, 0x10, 0x01, 0x00, 0x00, 0x00, 0x01, 0x14, 0x00, 0x00,
-                0x01, 0x14, 0x01, 0x00, 0x00, 0x00, 0x01, 0x18, 0x00, 0x00,
-                0x01, 0x18, 0x01, 0x00, 0x00, 0x00, 0x01, 0x1C, 0x00, 0x00,
-                0x01, 0x1C
-        };
-
-        // changed original data: ... 0x41 and 0x06 don't match
-        // the bitmask text properties will sanitize the bytes and thus the bytes differ
-        byte[] exptected = data.clone();
-        exptected[18] = 0;
-        
-        doReadWrite(data, exptected, length);
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java
deleted file mode 100644
index 9078bd1..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that TextBytesAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestTextBytesAtom extends TestCase {
-	// From a real file
-	private final byte[] data = new byte[]  { 0, 0, 0xA8-256, 0x0f, 0x1c, 0, 0, 0,
-		0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x74, 0x69, 0x74, 0x6C,	0x65, 0x20, 0x6F, 0x6E,
-		0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x32 };
-	private final String data_text = "This is the title on page 2";
-	private final byte[] alt_data = new byte[] { 0, 0, 0xA8-256, 0x0F, 0x14, 0, 0, 0,
-		0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20,
-		0x74, 0x65, 0x73, 0x74, 0x20, 0x74, 0x69, 0x74, 0x6C, 0x65 };
-	private final String alt_text = "This is a test title";
-
-    public void testRecordType() {
-		TextBytesAtom tba = new TextBytesAtom(data,0,data.length);
-		assertEquals(4008l, tba.getRecordType());
-	}
-
-	public void testTextA() {
-		TextBytesAtom tba = new TextBytesAtom(data,0,data.length);
-		assertEquals(data_text, tba.getText());
-	}
-	public void testTextB() {
-		TextBytesAtom tba = new TextBytesAtom(alt_data,0,alt_data.length);
-		assertEquals(alt_text, tba.getText());
-	}
-
-	public void testChangeText() throws Exception {
-		TextBytesAtom tba = new TextBytesAtom(data,0,data.length);
-		tba.setText(alt_text.getBytes("ISO-8859-1"));
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		tba.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Compare the header and the text
-		assertEquals(alt_data.length, b.length);
-		for(int i=0; i<alt_data.length; i++) {
-			assertEquals(alt_data[i],b[i]);
-		}
-	}
-
-	public void testWrite() throws Exception {
-		TextBytesAtom tba = new TextBytesAtom(data,0,data.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		tba.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data.length, b.length);
-		for(int i=0; i<data.length; i++) {
-			assertEquals(data[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java
deleted file mode 100644
index 8158cb1..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that TextCharsAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestTextCharsAtom extends TestCase {
-	// From a real file
-	private final byte[] data = new byte[]  { 0, 0, 0xA0-256, 0x0f, 0x08, 0, 0, 0,
-		0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00 };
-	private final String data_text = "This";
-	private final byte[] alt_data = new byte[] { 0, 0, 0xA0-256, 0x0F, 0x0a, 0, 0, 0,
-		0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0xa3-256, 0x01 };
-	private final String alt_text = "This\u01A3";
-
-    public void testRecordType() {
-		TextCharsAtom tca = new TextCharsAtom(data,0,data.length);
-		assertEquals(4000l, tca.getRecordType());
-	}
-
-	public void testTextA() {
-		TextCharsAtom tca = new TextCharsAtom(data,0,data.length);
-		assertEquals(data_text, tca.getText());
-	}
-	public void testTextB() {
-		TextCharsAtom tca = new TextCharsAtom(alt_data,0,alt_data.length);
-		assertEquals(alt_text, tca.getText());
-	}
-
-	public void testChangeText() throws Exception {
-		TextCharsAtom tca = new TextCharsAtom(data,0,data.length);
-		tca.setText(alt_text);
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		tca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Compare the header and the text
-		assertEquals(alt_data.length, b.length);
-		for(int i=0; i<alt_data.length; i++) {
-			assertEquals(alt_data[i],b[i]);
-		}
-	}
-
-	public void testWrite() throws Exception {
-		TextCharsAtom tca = new TextCharsAtom(data,0,data.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		tca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data.length, b.length);
-		for(int i=0; i<data.length; i++) {
-			assertEquals(data[i],b[i]);
-		}
-	}
-
-	public void testCreateNew() throws Exception {
-		TextCharsAtom tca = new TextCharsAtom();
-		assertEquals(0, tca.getText().length());
-
-		tca.setText(data_text);
-		assertEquals(data_text, tca.getText());
-
-		// Check it's now like data
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		tca.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data.length, b.length);
-		for(int i=0; i<data.length; i++) {
-			assertEquals(data[i],b[i]);
-		}
-	}
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java
deleted file mode 100644
index 8ac7453..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that TextHeaderAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestTextHeaderAtom extends TestCase {
-	// From a real file
-	private final byte[] notes_data = new byte[] { 0, 0, 0x9f-256, 0x0f, 4, 0, 0, 0, 2, 0, 0, 0};
-	private final byte[] title_data = new byte[] { 0, 0, 0x9f-256, 0x0f, 4, 0, 0, 0, 0, 0, 0, 0 };
-	private final byte[] body_data = new byte[]  { 0, 0, 0x9f-256, 0x0f, 4, 0, 0, 0, 1, 0, 0, 0 };
-
-	public void testRecordType() {
-		TextHeaderAtom tha = new TextHeaderAtom(notes_data,0,12);
-		assertEquals(3999l, tha.getRecordType());
-	}
-	public void testTypes() {
-		TextHeaderAtom n_tha = new TextHeaderAtom(notes_data,0,12);
-		TextHeaderAtom t_tha = new TextHeaderAtom(title_data,0,12);
-		TextHeaderAtom b_tha = new TextHeaderAtom(body_data,0,12);
-		assertEquals(TextHeaderAtom.NOTES_TYPE, n_tha.getTextType());
-		assertEquals(TextHeaderAtom.TITLE_TYPE, t_tha.getTextType());
-		assertEquals(TextHeaderAtom.BODY_TYPE, b_tha.getTextType());
-	}
-
-	public void testWrite() throws Exception {
-		TextHeaderAtom tha = new TextHeaderAtom(notes_data,0,12);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		tha.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(notes_data.length, b.length);
-		for(int i=0; i<notes_data.length; i++) {
-			assertEquals(notes_data[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java
deleted file mode 100644
index 475918c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests TextRulerAtom
- *
- * @author Yegor Kozlov
- */
-public final class TestTextRulerAtom extends TestCase {
-
-	//from a real file
-	private final byte[] data_1 = new byte[] {
-		0x00, 0x00, (byte)0xA6, 0x0F, 0x18, 0x00, 0x00, 0x00,
-		(byte)0xF8, 0x1F, 0x00, 0x00, 0x75, 0x00, (byte)0xE2, 0x00, 0x59,
-		0x01, (byte)0xC3, 0x01, 0x1A, 0x03, (byte)0x87, 0x03, (byte)0xF8,
-		0x03, 0x69, 0x04, (byte)0xF6, 0x05, (byte)0xF6, 0x05
-	};
-
-	private final byte[] data_2 = new byte[] {
-		0x00, 0x00, (byte)0xA6, 0x0F, 0x0A, 0x00, 0x00, 0x00,
-		0x10, 0x03, 0x00, 0x00, (byte)0xF9, 0x00, 0x41, 0x01, 0x41, 0x01
-	};
-
-	public void testReadRuler() {
-		TextRulerAtom ruler = new TextRulerAtom(data_1, 0, data_1.length);
-		assertEquals(ruler.getNumberOfLevels(), 0);
-		assertEquals(ruler.getDefaultTabSize(), 0);
-
-		int[] tabStops = ruler.getTabStops();
-		assertNull(tabStops);
-
-		int[] textOffsets = ruler.getTextOffsets();
-		assertArrayEquals(new int[]{226, 451, 903, 1129, 1526}, textOffsets);
-
-		int[] bulletOffsets = ruler.getBulletOffsets();
-		assertArrayEquals(new int[]{117, 345, 794, 1016, 1526}, bulletOffsets);
-
-	}
-
-	public void testWriteRuler() throws Exception {
-		TextRulerAtom ruler = new TextRulerAtom(data_1, 0, data_1.length);
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		ruler.writeOut(out);
-
-		byte[] result = out.toByteArray();
-		assertArrayEquals(result, data_1);
-	}
-
-	public void testRead2() throws Exception {
-		TextRulerAtom ruler = TextRulerAtom.getParagraphInstance();
-		ruler.setParagraphIndent((short)249, (short)321);
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		ruler.writeOut(out);
-
-		byte[] result = out.toByteArray();
-		assertArrayEquals(result, data_2);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
deleted file mode 100644
index 4f88d4c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests TextSpecInfoAtom
- *
- * @author Yegor Kozlov
- */
-public final class TestTextSpecInfoAtom extends TestCase {
-
-    //from a real file
-    private final byte[] data_1 = new byte[] {
-        0x00, 0x00, (byte)0xAA, 0x0F, 0x2C, 0x00, 0x00, 0x00,
-        0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-        0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x01,
-        0x00, 0x00, 0x00, 0x03, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-
-
-    public void testRead() {
-        TextSpecInfoAtom spec = new TextSpecInfoAtom(data_1, 0, data_1.length);
-        TextSpecInfoRun[] run = spec.getTextSpecInfoRuns();
-        assertEquals(5, run.length);
-
-        assertEquals(10, run[0].getLength());
-        assertEquals(1, run[1].getLength());
-        assertEquals(70, run[2].getLength());
-        assertEquals(9, run[3].getLength());
-        assertEquals(32, run[4].getLength());
-
-    }
-
-    public void testWrite() throws Exception {
-        TextSpecInfoAtom spec = new TextSpecInfoAtom(data_1, 0, data_1.length);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        spec.writeOut(out);
-
-        byte[] result = out.toByteArray();
-        assertArrayEquals(result, data_1);
-	}
-
-    public void testReset() throws Exception {
-        TextSpecInfoAtom spec = new TextSpecInfoAtom(data_1, 0, data_1.length);
-        spec.reset(32);  //length of the parent text
-
-        TextSpecInfoRun[] run = spec.getTextSpecInfoRuns();
-        assertEquals(1, run.length);
-
-        assertEquals(32, run[0].getLength());
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        spec.writeOut(out);
-
-        byte[] result = out.toByteArray();
-        TextSpecInfoAtom spec2 = new TextSpecInfoAtom(result, 0, result.length);
-        TextSpecInfoRun[] run2 = spec2.getTextSpecInfoRuns();
-        assertEquals(1, run2.length);
-
-        assertEquals(32, run2[0].getLength());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
deleted file mode 100644
index 7f6eab1..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that TxInteractiveInfoAtom works properly.
- *
- * @author Yegor Kozlov
- */
-public final class TestTxInteractiveInfoAtom extends TestCase {
-	// From WithLinks.ppt
-	private final byte[] data_a = new byte[] {
-		00, 00, (byte)0xDF, 0x0F, 0x08, 00, 00, 00,
-		0x19, 00, 00, 00, 0x38, 00, 00, 00
-	};
-
-	private final byte[] data_b = new byte[] {
-		00, 00, (byte)0xDF, 0x0F, 0x08, 00, 00, 00,
-		0x39, 00, 00, 00, 0x4E, 00, 00, 00
-	};
-
-	public void testRead() {
-		TxInteractiveInfoAtom ia1 = new TxInteractiveInfoAtom(data_a, 0, data_a.length);
-
-		assertEquals(4063, ia1.getRecordType());
-		assertEquals(25, ia1.getStartIndex());
-		assertEquals(56, ia1.getEndIndex());
-
-		TxInteractiveInfoAtom ia2 = new TxInteractiveInfoAtom(data_b, 0, data_b.length);
-
-		assertEquals(4063, ia2.getRecordType());
-		assertEquals(57, ia2.getStartIndex());
-		assertEquals(78, ia2.getEndIndex());
-	}
-
-	public void testWrite() throws Exception {
-		TxInteractiveInfoAtom atom = new TxInteractiveInfoAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		atom.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Create A from scratch
-	public void testCreate() throws Exception {
-		TxInteractiveInfoAtom ia = new TxInteractiveInfoAtom();
-
-		// Set values
-		ia.setStartIndex(25);
-		ia.setEndIndex(56);
-
-		// Check it's now the same as a
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ia.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-
-	// Try to turn a into b
-	public void testChange() throws Exception {
-		TxInteractiveInfoAtom ia = new TxInteractiveInfoAtom(data_a, 0, data_a.length);
-
-		// Change the number
-		ia.setStartIndex(57);
-		ia.setEndIndex(78);
-
-		// Check bytes are now the same
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ia.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		// Should now be the same
-		assertEquals(data_b.length, b.length);
-		for(int i=0; i<data_b.length; i++) {
-			assertEquals(data_b[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
deleted file mode 100644
index a2d4da3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.model.textproperties.TextProp;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-
-
-/**
- * Test <code>TestTxMasterStyleAtom</code> record.
- * Check master style for the empty ppt which is created
- * by the default constructor of <code>SlideShow</code>
- *
- * @author Yegor Kozlov
- */
-public final class TestTxMasterStyleAtom extends TestCase {
-    protected HSLFSlideShow _ppt;
-
-    @Override
-    public void setUp() {
-        _ppt = new HSLFSlideShow();
-    }
-
-    public void testDefaultStyles()  {
-        TxMasterStyleAtom[] txmaster = getMasterStyles();
-        for (final TxMasterStyleAtom atom : txmaster) {
-            final int txtype = atom.getTextType();
-            switch (txtype){
-                case TextHeaderAtom.TITLE_TYPE:
-                    checkTitleType(atom);
-                    break;
-                case TextHeaderAtom.BODY_TYPE:
-                    checkBodyType(atom);
-                    break;
-                case TextHeaderAtom.NOTES_TYPE:
-                    checkNotesType(atom);
-                    break;
-                case TextHeaderAtom.OTHER_TYPE:
-                    checkOtherType(atom);
-                    break;
-                case TextHeaderAtom.CENTRE_BODY_TYPE:
-                    break;
-                case TextHeaderAtom.CENTER_TITLE_TYPE:
-                    break;
-                case TextHeaderAtom.HALF_BODY_TYPE:
-                    break;
-                case TextHeaderAtom.QUARTER_BODY_TYPE:
-                    break;
-                default:
-                    fail("Unknown text type: " + txtype);
-            }
-
-        }
-    }
-
-
-
-    /**
-     * Test styles for type=TextHeaderAtom.TITLE_TYPE
-     */
-    private void checkTitleType(TxMasterStyleAtom txmaster){
-        TextPropCollection props;
-        TextProp prop;
-
-        //paragraph styles
-        props = txmaster.getParagraphStyles().get(0);
-
-        prop = props.findByName("alignment");
-        assertEquals(1, prop.getValue()); //title has center alignment
-
-        //character styles
-        props = txmaster.getCharacterStyles().get(0);
-
-        prop = props.findByName("font.color");
-        assertEquals(0x3000000, prop.getValue());
-
-        prop = props.findByName("font.index");
-        assertEquals(0, prop.getValue());
-
-        prop = props.findByName("font.size");
-        assertEquals(44, prop.getValue());
-
-    }
-
-    /**
-     * Test styles for type=TextHeaderAtom.BODY_TYPE
-     */
-    private void checkBodyType(TxMasterStyleAtom txmaster){
-        TextPropCollection props;
-        TextProp prop;
-
-        List<TextPropCollection> prstyles = txmaster.getParagraphStyles();
-        List<TextPropCollection> chstyles = txmaster.getCharacterStyles();
-        assertEquals("TxMasterStyleAtom for TextHeaderAtom.BODY_TYPE " +
-                "must contain styles for 5 indentation levels", 5, prstyles.size());
-        assertEquals("TxMasterStyleAtom for TextHeaderAtom.BODY_TYPE " +
-                "must contain styles for 5 indentation levels", 5, chstyles.size());
-
-        //paragraph styles
-        props = prstyles.get(0);
-
-        prop = props.findByName("alignment");
-        assertEquals(0, prop.getValue());
-
-
-        for (int i = 0; i < prstyles.size(); i++) {
-            assertNotNull("text.offset is null for indentation level " + i, prstyles.get(i).findByName("text.offset"));
-            assertNotNull("bullet.offset is null for indentation level " + i, prstyles.get(i).findByName("bullet.offset"));
-        }
-
-        //character styles
-        props = chstyles.get(0);
-
-        prop = props.findByName("font.color");
-        assertEquals(0x1000000, prop.getValue());
-
-        prop = props.findByName("font.index");
-        assertEquals(0, prop.getValue());
-
-        prop = props.findByName("font.size");
-        assertEquals(32, prop.getValue());
-    }
-
-    /**
-     * Test styles for type=TextHeaderAtom.OTHER_TYPE
-     */
-    private void checkOtherType(TxMasterStyleAtom txmaster){
-        TextPropCollection props;
-        TextProp prop;
-
-        //paragraph styles
-        props = txmaster.getParagraphStyles().get(0);
-
-        prop = props.findByName("alignment");
-        assertEquals(0, prop.getValue());
-
-        //character styles
-        props = txmaster.getCharacterStyles().get(0);
-
-        prop = props.findByName("font.color");
-        assertEquals(0x1000000, prop.getValue());
-
-        prop = props.findByName("font.index");
-        assertEquals(0, prop.getValue());
-
-        prop = props.findByName("font.size");
-        assertEquals(18, prop.getValue());
-    }
-
-    /**
-     * Test styles for type=TextHeaderAtom.NOTES_TYPE
-     */
-    private void checkNotesType(TxMasterStyleAtom txmaster){
-        TextPropCollection props;
-        TextProp prop;
-
-        //paragraph styles
-        props = txmaster.getParagraphStyles().get(0);
-
-        prop = props.findByName("alignment");
-        assertEquals(0, prop.getValue()); //title has center alignment
-
-        //character styles
-        props = txmaster.getCharacterStyles().get(0);
-
-        prop = props.findByName("font.color");
-        assertEquals(0x1000000, prop.getValue());
-
-        prop = props.findByName("font.index");
-        assertEquals(0, prop.getValue());
-
-        prop = props.findByName("font.size");
-        assertEquals(12, prop.getValue());
-
-    }
-
-    /**
-     * Collect all TxMasterStyleAtom records contained in the supplied slide show.
-     * There must be a TxMasterStyleAtom per each type of text defined in TextHeaderAtom
-     */
-    protected TxMasterStyleAtom[] getMasterStyles(){
-        List<TxMasterStyleAtom> lst = new ArrayList<TxMasterStyleAtom>();
-
-        Record[] coreRecs = _ppt.getMostRecentCoreRecords();
-        for (final Record coreRec : coreRecs) {
-            if(coreRec.getRecordType() == RecordTypes.MainMaster.typeID){
-                Record[] recs = coreRec.getChildRecords();
-                int cnt = 0;
-                for (final Record rec : recs) {
-                    if (rec instanceof TxMasterStyleAtom) {
-                        lst.add((TxMasterStyleAtom) rec);
-                        cnt++;
-                    }
-                }
-                assertEquals("MainMaster must contain 7 TxMasterStyleAtoms ", 7, cnt);
-            } else if(coreRec.getRecordType() == RecordTypes.Document.typeID){
-                TxMasterStyleAtom txstyle = null;
-                Document doc = (Document)coreRec;
-                Record[] rec = doc.getEnvironment().getChildRecords();
-                for (final Record atom : rec) {
-                    if (atom instanceof TxMasterStyleAtom) {
-                        if (txstyle != null)  fail("Document.Environment must contain 1 TxMasterStyleAtom");
-                        txstyle = (TxMasterStyleAtom)atom;
-                    }
-                }
-                if (txstyle == null) {
-                    throw new AssertionFailedError("TxMasterStyleAtom not found in Document.Environment");
-                }
-
-                assertEquals("Document.Environment must contain TxMasterStyleAtom  with type=TextHeaderAtom.OTHER_TYPE",
-                        TextHeaderAtom.OTHER_TYPE, txstyle.getTextType());
-                lst.add(txstyle);
-            }
-        }
-
-        return lst.toArray(new TxMasterStyleAtom[lst.size()]);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java
deleted file mode 100644
index fca7028..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.record;
-
-
-import junit.framework.TestCase;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Tests that UserEditAtom works properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestUserEditAtom extends TestCase {
-	// From a real file
-	private final byte[] data_a = new byte[] { 0, 0, 0xF5-256, 0x0F, 0x1C, 0, 0, 0,
-		00, 01, 00, 00, 0xD9-256, 18, 00, 03,
-		00, 00, 00, 00, 00, 0x18, 00, 00, 01, 00, 00, 00,
-		05, 00, 00, 00, 01, 00, 0xF6-256, 77 };
-
-	public void testRecordType() {
-		UserEditAtom uea = new UserEditAtom(data_a, 0, data_a.length);
-		assertEquals(4085l, uea.getRecordType());
-	}
-	public void testFlags() {
-		UserEditAtom uea = new UserEditAtom(data_a, 0, data_a.length);
-
-		assertEquals(256, uea.getLastViewedSlideID() );
-		//assertEquals(0x030018D9, uea.getPPTVersion() );
-		assertEquals(0, uea.getLastUserEditAtomOffset() );
-		assertEquals(0x1800, uea.getPersistPointersOffset() );
-		assertEquals(1, uea.getDocPersistRef() );
-		assertEquals(5, uea.getMaxPersistWritten() );
-		assertEquals((short)1, uea.getLastViewType() );
-	}
-
-	public void testWrite() throws Exception {
-		UserEditAtom uea = new UserEditAtom(data_a, 0, data_a.length);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		uea.writeOut(baos);
-		byte[] b = baos.toByteArray();
-
-		assertEquals(data_a.length, b.length);
-		for(int i=0; i<data_a.length; i++) {
-			assertEquals(data_a[i],b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java
deleted file mode 100644
index 0354d9b..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests from the package <tt>org.apache.poi.hslf.usermodel</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestAddingSlides.class,
-    TestBugs.class,
-    TestCounts.class,
-    TestMostRecentRecords.class,
-    TestNotesText.class,
-    TestPictures.class,
-    TestReOrderingSlides.class,
-    TestRecordSetup.class,
-    TestRichTextRun.class,
-    TestSheetText.class,
-    TestSlideOrdering.class,
-    TestSoundData.class,
-    TestFontRendering.class,
-    TestPicture.class,
-    TestTextRun.class,
-    TestTextShape.class
-})
-public class AllHSLFUserModelTests {
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
deleted file mode 100644
index 75247a7..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.*;
-
-/**
- * Tests that SlideShow adds additional sheets properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestAddingSlides extends TestCase {
-	// An empty SlideShow
-	private HSLFSlideShowImpl hss_empty;
-	private HSLFSlideShow ss_empty;
-
-	// A SlideShow with one slide
-	private HSLFSlideShowImpl hss_one;
-	private HSLFSlideShow ss_one;
-
-	// A SlideShow with two slides
-	private HSLFSlideShowImpl hss_two;
-	private HSLFSlideShow ss_two;
-
-	/**
-	 * Create/open the slideshows
-	 */
-	@Override
-    public void setUp() throws Exception {
-		hss_empty = HSLFSlideShowImpl.create();
-		ss_empty = new HSLFSlideShow(hss_empty);
-
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-		hss_one = new HSLFSlideShowImpl(slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
-		ss_one = new HSLFSlideShow(hss_one);
-
-		hss_two = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss_two = new HSLFSlideShow(hss_two);
-	}
-
-	/**
-	 * Test adding a slide to an empty slideshow
-	 */
-	public void testAddSlideToEmpty() throws Exception {
-		// Doesn't have any slides
-		assertEquals(0, ss_empty.getSlides().size());
-
-		// Should only have a master SLWT
-		assertEquals(1, ss_empty.getDocumentRecord().getSlideListWithTexts().length);
-
-        //grab UserEditAtom
-        UserEditAtom usredit = null;
-        Record[] _records = hss_empty.getRecords();
-        for (Record record : _records) {
-            if(record.getRecordType() == RecordTypes.UserEditAtom.typeID) {
-                usredit = (UserEditAtom)record;
-            }
-       }
-       assertNotNull(usredit);
-
-		// Add one
-		HSLFSlide slide = ss_empty.createSlide();
-		assertEquals(1, ss_empty.getSlides().size());
-		assertEquals(256, slide._getSheetNumber());
-		assertEquals(3, slide._getSheetRefId());
-		assertEquals(1, slide.getSlideNumber());
-        assertEquals(usredit.getMaxPersistWritten(), slide._getSheetRefId());
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_empty.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it now has a slide
-		assertEquals(1, ss_read.getSlides().size());
-
-		// Check it now has two SLWTs
-		assertEquals(2, ss_empty.getDocumentRecord().getSlideListWithTexts().length);
-
-		// And check it's as expected
-		slide = ss_read.getSlides().get(0);
-		assertEquals(256, slide._getSheetNumber());
-		assertEquals(3, slide._getSheetRefId());
-		assertEquals(1, slide.getSlideNumber());
-	}
-
-	/**
-	 * Test adding a slide to an existing slideshow
-	 */
-	public void testAddSlideToExisting() throws Exception {
-		// Has one slide
-		assertEquals(1, ss_one.getSlides().size());
-		HSLFSlide s1 = ss_one.getSlides().get(0);
-
-		// Should have two SLTWs
-		assertEquals(2, ss_one.getDocumentRecord().getSlideListWithTexts().length);
-
-		// Check slide 1 is as expected
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(3, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-
-		// Add a second one
-		HSLFSlide s2 = ss_one.createSlide();
-		assertEquals(2, ss_one.getSlides().size());
-		assertEquals(257, s2._getSheetNumber());
-		assertEquals(4, s2._getSheetRefId());
-		assertEquals(2, s2.getSlideNumber());
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_one.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it now has two slides
-		assertEquals(2, ss_read.getSlides().size());
-
-		// Should still have two SLTWs
-		assertEquals(2, ss_read.getDocumentRecord().getSlideListWithTexts().length);
-
-		// And check it's as expected
-		s1 = ss_read.getSlides().get(0);
-		s2 = ss_read.getSlides().get(1);
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(3, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-		assertEquals(257, s2._getSheetNumber());
-		assertEquals(4, s2._getSheetRefId());
-		assertEquals(2, s2.getSlideNumber());
-	}
-
-	/**
-	 * Test adding a slide to an existing slideshow,
-	 *  with two slides already
-	 */
-	@SuppressWarnings("unused")
-    public void testAddSlideToExisting2() throws Exception {
-        //grab UserEditAtom
-        UserEditAtom usredit = null;
-        Record[] _records = hss_two.getRecords();
-        for (Record record : _records) {
-            if(record.getRecordType() == RecordTypes.UserEditAtom.typeID) {
-                usredit = (UserEditAtom)record;
-            }
-       }
-       assertNotNull(usredit);
-
-		// Has two slides
-		assertEquals(2, ss_two.getSlides().size());
-		HSLFSlide s1 = ss_two.getSlides().get(0);
-		HSLFSlide s2 = ss_two.getSlides().get(1);
-
-		// Check slide 1 is as expected
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(4, s1._getSheetRefId()); // master has notes
-		assertEquals(1, s1.getSlideNumber());
-		// Check slide 2 is as expected
-		assertEquals(257, s2._getSheetNumber());
-		assertEquals(6, s2._getSheetRefId()); // master and 1 have notes
-		assertEquals(2, s2.getSlideNumber());
-
-		// Add a third one
-		HSLFSlide s3 = ss_two.createSlide();
-		assertEquals(3, ss_two.getSlides().size());
-		assertEquals(258, s3._getSheetNumber());
-		assertEquals(8, s3._getSheetRefId()); // lots of notes before us
-		assertEquals(3, s3.getSlideNumber());
-        assertEquals(usredit.getMaxPersistWritten(), s3._getSheetRefId());
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_two.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it now has three slides
-		assertEquals(3, ss_read.getSlides().size());
-
-		// And check it's as expected
-		s1 = ss_read.getSlides().get(0);
-		s2 = ss_read.getSlides().get(1);
-		s3 = ss_read.getSlides().get(2);
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(4, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-		assertEquals(257, s2._getSheetNumber());
-		assertEquals(6, s2._getSheetRefId());
-		assertEquals(2, s2.getSlideNumber());
-		assertEquals(258, s3._getSheetNumber());
-		assertEquals(8, s3._getSheetRefId());
-		assertEquals(3, s3.getSlideNumber());
-	}
-
-    /**
-     * Test SlideShow#removeSlide
-     */
-    public void testRemoving() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide1 = ppt.createSlide();
-        HSLFSlide slide2 = ppt.createSlide();
-
-        List<HSLFSlide> s1 = ppt.getSlides();
-        assertEquals(2, s1.size());
-        try {
-            ppt.removeSlide(-1);
-            fail("expected exception");
-        } catch (Exception e){
-		}
-
-        try {
-            ppt.removeSlide(2);
-            fail("expected exception");
-        } catch (Exception e){
-		}
-
-        assertEquals(1, slide1.getSlideNumber());
-
-        HSLFSlide removedSlide = ppt.removeSlide(0);
-        List<HSLFSlide> s2 = ppt.getSlides();
-        assertEquals(1, s2.size());
-        assertSame(slide1, removedSlide);
-        assertSame(slide2, s2.get(0));
-
-        assertEquals(0, slide2.getSlideNumber());
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-
-        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-
-        List<HSLFSlide> s3 = ppt.getSlides();
-        assertEquals(1, s3.size());
-    }
-
-
-    public void test47261() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-        HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream("47261.ppt"));
-        List<HSLFSlide> slides = ppt.getSlides();
-        Document doc = ppt.getDocumentRecord();
-        assertNotNull(doc.getSlideSlideListWithText());
-        assertEquals(14, ppt.getSlides().size());
-        int notesId = slides.get(0).getSlideRecord().getSlideAtom().getNotesID();
-        assertTrue(notesId > 0);
-        assertNotNull(doc.getNotesSlideListWithText());
-        assertEquals(14, doc.getNotesSlideListWithText().getSlideAtomsSets().length);
-
-        //remove all slides, corresponding notes should be removed too
-        for (int i = slides.size(); i > 0; i--) {
-            ppt.removeSlide(0);
-        }
-        assertEquals(0, ppt.getSlides().size());
-        assertEquals(0, ppt.getNotes().size());
-        assertNull(doc.getSlideSlideListWithText());
-        assertNull(doc.getNotesSlideListWithText());
-
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
deleted file mode 100644
index 0cabd81..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
+++ /dev/null
@@ -1,1023 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedCharacterIterator.Attribute;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ddf.AbstractEscherOptRecord;
-import org.apache.poi.ddf.EscherArrayProperty;
-import org.apache.poi.ddf.EscherColorRef;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.hslf.HSLFTestDataSamples;
-import org.apache.poi.hslf.exceptions.OldPowerPointFormatException;
-import org.apache.poi.hslf.extractor.PowerPointExtractor;
-import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.record.DocInfoListContainer;
-import org.apache.poi.hslf.record.Document;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.record.SlideListWithText;
-import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.record.VBAInfoAtom;
-import org.apache.poi.hslf.record.VBAInfoContainer;
-import org.apache.poi.hssf.usermodel.DummyGraphics2d;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.macros.VBAMacroReader;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.draw.DrawTextParagraph;
-import org.apache.poi.sl.usermodel.ColorStyle;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.sl.usermodel.TextBox;
-import org.apache.poi.sl.usermodel.TextParagraph;
-import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
-import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.util.Units;
-import org.junit.Test;
-
-/**
- * Testcases for bugs entered in bugzilla
- * the Test name contains the bugzilla bug id
- */
-public final class TestBugs {
-    /**
-     * Bug 41384: Array index wrong in record creation
-     */
-    @Test
-    public void bug41384() throws IOException {
-        HSLFSlideShow ppt = open("41384.ppt");
-
-        assertEquals(1, ppt.getSlides().size());
-
-        List<HSLFPictureData> pict = ppt.getPictureData();
-        assertEquals(2, pict.size());
-        assertEquals(PictureType.JPEG, pict.get(0).getType());
-        assertEquals(PictureType.JPEG, pict.get(1).getType());
-
-        ppt.close();
-    }
-
-    /**
-     * First fix from Bug 42474: NPE in RichTextRun.isBold()
-     * when the RichTextRun comes from a Notes model object
-     */
-    @Test
-    public void bug42474_1() throws IOException {
-        HSLFSlideShow ppt = open("42474-1.ppt");
-        assertEquals(2, ppt.getSlides().size());
-
-        List<HSLFTextParagraph> txrun;
-        HSLFNotes notes;
-
-        notes = ppt.getSlides().get(0).getNotes();
-        assertNotNull(notes);
-        txrun = notes.getTextParagraphs().get(0);
-        assertEquals("Notes-1", HSLFTextParagraph.getRawText(txrun));
-        assertEquals(false, txrun.get(0).getTextRuns().get(0).isBold());
-
-        //notes for the second slide are in bold
-        notes = ppt.getSlides().get(1).getNotes();
-        assertNotNull(notes);
-        txrun = notes.getTextParagraphs().get(0);
-        assertEquals("Notes-2", HSLFTextParagraph.getRawText(txrun));
-        assertEquals(true, txrun.get(0).getTextRuns().get(0).isBold());
-
-        ppt.close();
-    }
-
-    /**
-     * Second fix from Bug 42474: Incorrect matching of notes to slides
-     */
-    @Test
-    public void bug42474_2() throws IOException {
-        HSLFSlideShow ppt = open("42474-2.ppt");
-
-        //map slide number and starting phrase of its notes
-        Map<Integer, String> notesMap = new HashMap<Integer, String>();
-        notesMap.put(Integer.valueOf(4), "For  decades before calculators");
-        notesMap.put(Integer.valueOf(5), "Several commercial applications");
-        notesMap.put(Integer.valueOf(6), "There are three variations of LNS that are discussed here");
-        notesMap.put(Integer.valueOf(7), "Although multiply and square root are easier");
-        notesMap.put(Integer.valueOf(8), "The bus Z is split into Z_H and Z_L");
-
-        for (HSLFSlide slide : ppt.getSlides()) {
-            Integer slideNumber = Integer.valueOf(slide.getSlideNumber());
-            HSLFNotes notes = slide.getNotes();
-            if (notesMap.containsKey(slideNumber)){
-                assertNotNull(notes);
-                String text = HSLFTextParagraph.getRawText(notes.getTextParagraphs().get(0));
-                String startingPhrase = notesMap.get(slideNumber);
-                assertTrue("Notes for slide " + slideNumber + " must start with " +
-                        startingPhrase , text.startsWith(startingPhrase));
-            }
-        }
-
-        ppt.close();
-    }
-
-    /**
-     * Bug 42485: All TextBoxes inside ShapeGroups have null TextRuns
-     */
-    @Test
-    public void bug42485 () throws IOException {
-        HSLFSlideShow ppt = open("42485.ppt");
-        for (HSLFShape shape : ppt.getSlides().get(0).getShapes()) {
-            if(shape instanceof HSLFGroupShape){
-                HSLFGroupShape group = (HSLFGroupShape)shape;
-                for (HSLFShape sh : group.getShapes()) {
-                    if(sh instanceof HSLFTextBox){
-                        HSLFTextBox txt = (HSLFTextBox)sh;
-                        assertNotNull(txt.getTextParagraphs());
-                    }
-                }
-            }
-        }
-        ppt.close();
-    }
-
-    /**
-     * Bug 42484: NullPointerException from ShapeGroup.getAnchor()
-     */
-    @Test
-    public void bug42484 () throws IOException {
-        HSLFSlideShow ppt = open("42485.ppt");
-        for (HSLFShape shape : ppt.getSlides().get(0).getShapes()) {
-            if(shape instanceof HSLFGroupShape){
-                HSLFGroupShape  group = (HSLFGroupShape)shape;
-                assertNotNull(group.getAnchor());
-                for (HSLFShape sh : group.getShapes()) {
-                    assertNotNull(sh.getAnchor());
-                }
-            }
-        }
-        ppt.close();
-    }
-
-    /**
-     * Bug 41381: Exception from Slide.getMasterSheet() on a seemingly valid PPT file
-     */
-    @Test
-    public void bug41381() throws IOException {
-        HSLFSlideShow ppt = open("alterman_security.ppt");
-        assertTrue("No Exceptions while reading file", true);
-
-        assertEquals(1, ppt.getSlideMasters().size());
-        assertEquals(1, ppt.getTitleMasters().size());
-        boolean isFirst = true;
-        for (HSLFSlide slide : ppt.getSlides()) {
-            HSLFMasterSheet master = slide.getMasterSheet();
-            // the first slide follows TitleMaster
-            assertTrue(isFirst ? master instanceof HSLFTitleMaster : master instanceof HSLFSlideMaster);
-            isFirst = false;
-        }
-        ppt.close();
-    }
-
-    /**
-     * Bug 42486:  Failure parsing a seemingly valid PPT
-     */
-    @SuppressWarnings("unused")
-    @Test
-    public void bug42486 () throws IOException {
-        HSLFSlideShow ppt = open("42486.ppt");
-        for (HSLFSlide slide : ppt.getSlides()) {
-            List<HSLFShape> shape = slide.getShapes();
-        }
-        ppt.close();
-    }
-
-    /**
-     * Bug 42524:  NPE in Shape.getShapeType()
-     */
-    @Test
-    public void bug42524 () throws IOException {
-        HSLFSlideShow ppt = open("42486.ppt");
-        //walk down the tree and see if there were no errors while reading
-        for (HSLFSlide slide : ppt.getSlides()) {
-            for (HSLFShape shape : slide.getShapes()) {
-                assertNotNull(shape.getShapeName());
-                if (shape instanceof HSLFGroupShape){
-                    HSLFGroupShape group = (HSLFGroupShape)shape;
-                    for (HSLFShape comps : group.getShapes()) {
-                        assertNotNull(comps.getShapeName());
-                   }
-                }
-            }
-
-        }
-        ppt.close();
-    }
-
-    /**
-     * Bug 42520:  NPE in Picture.getPictureData()
-     */
-    @SuppressWarnings("unused")
-    @Test
-    public void bug42520 () throws IOException {
-        HSLFSlideShow ppt = open("42520.ppt");
-
-        //test case from the bug report
-        HSLFGroupShape shapeGroup = (HSLFGroupShape)ppt.getSlides().get(11).getShapes().get(10);
-        HSLFPictureShape picture = (HSLFPictureShape)shapeGroup.getShapes().get(0);
-        picture.getPictureData();
-
-        //walk down the tree and see if there were no errors while reading
-        for (HSLFSlide slide : ppt.getSlides()) {
-            for (HSLFShape shape : slide.getShapes()) {
-              if (shape instanceof HSLFGroupShape){
-                    HSLFGroupShape group = (HSLFGroupShape)shape;
-                    for (HSLFShape comp : group.getShapes()) {
-                        if (comp instanceof HSLFPictureShape){
-                            HSLFPictureData pict = ((HSLFPictureShape)comp).getPictureData();
-                        }
-                    }
-                }
-            }
-        }
-        
-        ppt.close();
-    }
-
-    /**
-     * Bug 38256:  RuntimeException: Couldn't instantiate the class for type with id 0.
-     * ( also fixed followup: getTextRuns() returns no text )
-     */
-    @Test
-    public void bug38256 () throws IOException {
-        HSLFSlideShow ppt = open("38256.ppt");
-
-        List<HSLFSlide> slide = ppt.getSlides();
-        assertEquals(1, slide.size());
-        List<List<HSLFTextParagraph>> paras = slide.get(0).getTextParagraphs();
-        assertEquals(4, paras.size());
-
-        Set<String> txt = new HashSet<String>();
-        txt.add("\u201CHAPPY BIRTHDAY SCOTT\u201D");
-        txt.add("Have a HAPPY DAY");
-        txt.add("PS Nobody is allowed to hassle Scott TODAY\u2026");
-        txt.add("Drinks will be in the Boardroom at 5pm today to celebrate Scott\u2019s B\u2019Day\u2026  See you all there!");
-
-        for (List<HSLFTextParagraph> para : paras) {
-            String text = HSLFTextParagraph.getRawText(para);
-            assertTrue(text, txt.contains(text));
-        }
-
-        ppt.close();
-    }
-
-    /**
-     * Bug 38256:  RuntimeException: Couldn't instantiate the class for type with id 0.
-     * ( also fixed followup: getTextRuns() returns no text )
-     */
-    @Test
-    public void bug43781() throws IOException {
-        HSLFSlideShow ppt = open("43781.ppt");
-
-        // Check the first slide
-        HSLFSlide slide = ppt.getSlides().get(0);
-        List<List<HSLFTextParagraph>> slTr = slide.getTextParagraphs();
-
-        // Has 3 text paragraphs, two from slide text (empty title / filled body), one from drawing
-        assertEquals(3, slTr.size());
-        assertFalse(slTr.get(0).get(0).isDrawingBased());
-        assertFalse(slTr.get(1).get(0).isDrawingBased());
-        assertTrue(slTr.get(2).get(0).isDrawingBased());
-        assertEquals("", HSLFTextParagraph.getRawText(slTr.get(0)));
-        assertEquals("First run", HSLFTextParagraph.getRawText(slTr.get(1)));
-        assertEquals("Second run", HSLFTextParagraph.getRawText(slTr.get(2)));
-
-        // Check the shape based text runs
-        List<HSLFTextParagraph> lst = new ArrayList<HSLFTextParagraph>();
-        for (HSLFShape shape : slide.getShapes()) {
-            if (shape instanceof HSLFTextShape){
-                List<HSLFTextParagraph> textRun = ((HSLFTextShape)shape).getTextParagraphs();
-                lst.addAll(textRun);
-            }
-
-        }
-
-        // There are two shapes in the ppt
-        assertEquals(2, lst.size());
-        assertEquals("First runSecond run", HSLFTextParagraph.getRawText(lst));
-        ppt.close();
-    }
-
-    /**
-     * Bug 44296: HSLF Not Extracting Slide Background Image
-     */
-    @Test
-    public void bug44296  () throws IOException {
-        HSLFSlideShow ppt = open("44296.ppt");
-
-        HSLFSlide slide = ppt.getSlides().get(0);
-
-        HSLFBackground b = slide.getBackground();
-        HSLFFill f = b.getFill();
-        assertEquals(HSLFFill.FILL_PICTURE, f.getFillType());
-
-        HSLFPictureData pict = f.getPictureData();
-        assertNotNull(pict);
-        assertEquals(PictureType.JPEG, pict.getType());
-        
-        ppt.close();
-    }
-
-    /**
-     * Bug 44770: java.lang.RuntimeException: Couldn't instantiate the class for
-     * type with id 1036 on class class org.apache.poi.hslf.record.PPDrawing
-     */
-    @Test
-    public void bug44770() throws IOException {
-        open("44770.ppt").close();
-    }
-
-    /**
-     * Bug 41071: Will not extract text from Powerpoint TextBoxes
-     */
-    @Test
-    public void bug41071() throws IOException {
-        HSLFSlideShow ppt = open("41071.ppt");
-
-        HSLFSlide slide = ppt.getSlides().get(0);
-        List<HSLFShape> sh = slide.getShapes();
-        assertEquals(1, sh.size());
-        assertTrue(sh.get(0) instanceof HSLFTextShape);
-        HSLFTextShape tx = (HSLFTextShape)sh.get(0);
-        assertEquals("Fundera, planera och involvera.", HSLFTextParagraph.getRawText(tx.getTextParagraphs()));
-
-        List<List<HSLFTextParagraph>> run = slide.getTextParagraphs();
-        assertEquals(3, run.size());
-        assertEquals("Fundera, planera och involvera.", HSLFTextParagraph.getRawText(run.get(2)));
-        
-        ppt.close();
-    }
-
-    /**
-     * PowerPoint 95 files should throw a more helpful exception
-     * @throws IOException
-     */
-    @Test(expected=OldPowerPointFormatException.class)
-    public void bug41711() throws IOException {
-    	// New file is fine
-        open("SampleShow.ppt").close();
-
-        // PowerPoint 95 gives an old format exception
-        open("PPT95.ppt").close();
-    }
-
-    /**
-     * Changing text from Ascii to Unicode
-     */
-    @Test
-    public void bug49648() throws IOException {
-        HSLFSlideShow ppt = open("49648.ppt");
-        for (HSLFSlide slide : ppt.getSlides()) {
-            for (List<HSLFTextParagraph> run : slide.getTextParagraphs()) {
-                String text = HSLFTextParagraph.getRawText(run);
-                text.replace("{txtTot}", "With \u0123\u1234\u5678 unicode");
-                HSLFTextParagraph.setText(run, text);
-            }
-        }
-        ppt.close();
-    }
-
-    /**
-     * Bug 41246: AIOOB with illegal note references
-     */
-    @Test
-    public void bug41246a() throws IOException {
-        HSLFSlideShow ppt = open("41246-1.ppt");
-
-        HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
-        
-        ppt.close();
-    }
-
-    @Test
-    public void bug41246b() throws IOException {
-        HSLFSlideShow ppt = open("41246-2.ppt");
-
-        HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
-        
-        ppt.close();
-    }
-
-    /**
-     * Bug 45776: Fix corrupt file problem using TextRun.setText
-     */
-    @Test
-    public void bug45776() throws IOException {
-        HSLFSlideShow ppt = open("45776.ppt");
-
-        // get slides
-        for (HSLFSlide slide : ppt.getSlides()) {
-            for (HSLFShape shape : slide.getShapes()) {
-                if (!(shape instanceof HSLFTextBox)) continue;
-                HSLFTextBox tb = (HSLFTextBox) shape;
-                // work with TextBox
-                String str = tb.getText();
-
-                if (!str.contains("$$DATE$$")) continue;
-                str = str.replace("$$DATE$$", new Date().toString());
-                tb.setText(str);
-
-                List<HSLFTextParagraph> tr = tb.getTextParagraphs();
-                assertEquals(str.length()+1,tr.get(0).getParagraphStyle().getCharactersCovered());
-                assertEquals(str.length()+1,tr.get(0).getTextRuns().get(0).getCharacterStyle().getCharactersCovered());
-            }
-        }
-        
-        ppt.close();
-    }
-
-    @Test
-    public void bug55732() throws IOException {
-        HSLFSlideShow ppt = open("bug55732.ppt");
-
-        List<HSLFSlide> _slides = ppt.getSlides();
-
-        /* Iterate over slides and extract text */
-        for( HSLFSlide slide : _slides ) {
-            HeadersFooters hf = slide.getHeadersFooters();
-            /*boolean visible =*/ hf.isHeaderVisible(); // exception happens here
-        }
-        
-        ppt.close();
-    }
-
-    @Test
-    public void bug56260() throws IOException {
-        HSLFSlideShow ppt = open("56260.ppt");
-        List<HSLFSlide> _slides = ppt.getSlides();
-        assertEquals(13, _slides.size());
-
-        // Check the number of TextHeaderAtoms on Slide 1
-        Document dr = ppt.getDocumentRecord();
-        SlideListWithText slidesSLWT = dr.getSlideSlideListWithText();
-        SlideAtomsSet s1 = slidesSLWT.getSlideAtomsSets()[0];
-
-        int tha = 0;
-        for (Record r : s1.getSlideRecords()) {
-            if (r instanceof TextHeaderAtom) tha++;
-        }
-        assertEquals(2, tha);
-
-        // Check to see that we have a pair next to each other
-        assertEquals(TextHeaderAtom.class, s1.getSlideRecords()[0].getClass());
-        assertEquals(TextHeaderAtom.class, s1.getSlideRecords()[1].getClass());
-
-
-        // Check the number of text runs based on the slide (not textbox)
-        // Will have skipped the empty one
-        int str = 0;
-        for (List<HSLFTextParagraph> tr : _slides.get(0).getTextParagraphs()) {
-            if (! tr.get(0).isDrawingBased()) str++;
-        }
-        assertEquals(2, str);
-        
-        ppt.close();
-    }
-
-    @Test
-    public void bug37625() throws IOException {
-        HSLFSlideShow ppt1 = open("37625.ppt");
-        assertEquals(29, ppt1.getSlides().size());
-
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        assertNotNull(ppt2);
-        assertEquals(29, ppt2.getSlides().size());
-        ppt2.close();
-        ppt1.close();
-    }
-
-    @Test
-    public void bug57272() throws IOException {
-        HSLFSlideShow ppt1 = open("57272_corrupted_usereditatom.ppt");
-        assertEquals(6, ppt1.getSlides().size());
-
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        assertNotNull(ppt2);
-        assertEquals(6, ppt2.getSlides().size());
-        ppt2.close();
-        ppt1.close();
-    }
-
-    @Test
-    public void bug49541() throws IOException {
-        HSLFSlideShow ppt = open("49541_symbol_map.ppt");
-        HSLFSlide slide = ppt.getSlides().get(0);
-        HSLFGroupShape sg = (HSLFGroupShape)slide.getShapes().get(0);
-        HSLFTextBox tb = (HSLFTextBox)sg.getShapes().get(0);
-        String text = StringUtil.mapMsCodepointString(tb.getText());
-        assertEquals("\u226575 years", text);
-        ppt.close();
-    }
-
-    @Test
-    public void bug47261() throws IOException {
-        HSLFSlideShow ppt = open("bug47261.ppt");
-        ppt.removeSlide(0);
-        ppt.createSlide();
-        HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
-        ppt.close();
-    }
-
-    @Test
-    public void bug56240() throws IOException {
-        HSLFSlideShow ppt = open("bug56240.ppt");
-        int slideCnt = ppt.getSlides().size();
-        assertEquals(105, slideCnt);
-        HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
-        ppt.close();
-    }
-
-    @Test
-    public void bug46441() throws IOException {
-        HSLFSlideShow ppt = open("bug46441.ppt");
-        HSLFAutoShape as = (HSLFAutoShape)ppt.getSlides().get(0).getShapes().get(0);
-        AbstractEscherOptRecord opt = as.getEscherOptRecord();
-        EscherArrayProperty ep = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__SHADECOLORS);
-        double exp[][] = {
-            // r, g, b, position
-            { 94, 158, 255, 0 },
-            { 133, 194, 255, 0.399994 },
-            { 196, 214, 235, 0.699997 },
-            { 255, 235, 250, 1 }
-        };
-
-        int i = 0;
-        for (byte data[] : ep) {
-            EscherColorRef ecr = new EscherColorRef(data, 0, 4);
-            int rgb[] = ecr.getRGB();
-            double pos = Units.fixedPointToDouble(LittleEndian.getInt(data, 4));
-            assertEquals((int)exp[i][0], rgb[0]);
-            assertEquals((int)exp[i][1], rgb[1]);
-            assertEquals((int)exp[i][2], rgb[2]);
-            assertEquals(exp[i][3], pos, 0.01);
-            i++;
-        }
-        ppt.close();
-    }
-
-    @Test
-    public void bug58516() throws IOException {
-        open("bug58516.ppt").close();
-    }
-
-    @Test
-    public void bug45124() throws IOException {
-        SlideShow<?,?> ppt = open("bug45124.ppt");
-        Slide<?,?> slide1 = ppt.getSlides().get(1);
-
-        TextBox<?,?> res = slide1.createTextBox();
-        res.setAnchor(new java.awt.Rectangle(60, 150, 700, 100));
-        res.setText("I am italic-false, bold-true inserted text");
-
-
-        TextParagraph<?,?,?> tp = res.getTextParagraphs().get(0);
-        TextRun rt = tp.getTextRuns().get(0);
-        rt.setItalic(false);
-        assertTrue(rt.isBold());
-
-        tp.setBulletStyle(Color.red, 'A');
-
-        SlideShow<?,?> ppt2 = HSLFTestDataSamples.writeOutAndReadBack((HSLFSlideShow)ppt);
-        ppt.close();
-
-        res = (TextBox<?,?>)ppt2.getSlides().get(1).getShapes().get(1);
-        tp = res.getTextParagraphs().get(0);
-        rt = tp.getTextRuns().get(0);
-
-        assertFalse(rt.isItalic());
-        assertTrue(rt.isBold());
-        PaintStyle ps = tp.getBulletStyle().getBulletFontColor();
-        assertTrue(ps instanceof SolidPaint);
-        Color actColor = DrawPaint.applyColorTransform(((SolidPaint)ps).getSolidColor());
-        assertEquals(Color.red, actColor);
-        assertEquals("A", tp.getBulletStyle().getBulletCharacter());
-
-        ppt2.close();
-    }
-
-    @Test
-    public void bug45088() throws IOException {
-        String template = "[SYSDATE]";
-        String textExp = "REPLACED_DATE_WITH_A_LONG_ONE";
-
-        HSLFSlideShow ppt1 = open("bug45088.ppt");
-        for (HSLFSlide slide : ppt1.getSlides()) {
-            for (List<HSLFTextParagraph> paraList : slide.getTextParagraphs()) {
-                for (HSLFTextParagraph para : paraList) {
-                    for (HSLFTextRun run : para.getTextRuns()) {
-                        String text = run.getRawText();
-                        if (text != null && text.contains(template)) {
-                            String replacedText = text.replace(template, textExp);
-                            run.setText(replacedText);
-                            para.setDirty();
-                        }
-                    }
-                }
-            }
-        }
-
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-
-        HSLFTextBox tb = (HSLFTextBox)ppt2.getSlides().get(0).getShapes().get(1);
-        String textAct = tb.getTextParagraphs().get(0).getTextRuns().get(0).getRawText().trim();
-        assertEquals(textExp, textAct);
-        ppt2.close();
-    }
-
-    @Test
-    public void bug45908() throws IOException {
-        HSLFSlideShow ppt1 = open("bug45908.ppt");
-
-        HSLFSlide slide = ppt1.getSlides().get(0);
-        HSLFAutoShape styleShape = (HSLFAutoShape)slide.getShapes().get(1);
-        HSLFTextParagraph tp0 = styleShape.getTextParagraphs().get(0);
-        HSLFTextRun tr0 = tp0.getTextRuns().get(0);
-
-
-        int rows = 5;
-        int cols = 2;
-        HSLFTable table = slide.createTable(rows, cols);
-        for (int i = 0; i < rows; i++) {
-            for (int j = 0; j < cols; j++) {
-
-                HSLFTableCell cell = table.getCell(i, j);
-                cell.setText("Test");
-
-                HSLFTextParagraph tp = cell.getTextParagraphs().get(0);
-                tp.setBulletStyle('%', tp0.getBulletColor(), tp0.getBulletFont(), tp0.getBulletSize());
-                tp.setIndent(tp0.getIndent());
-                tp.setTextAlign(tp0.getTextAlign());
-                tp.setIndentLevel(tp0.getIndentLevel());
-                tp.setSpaceAfter(tp0.getSpaceAfter());
-                tp.setSpaceBefore(tp0.getSpaceBefore());
-                tp.setBulletStyle();
-
-                HSLFTextRun tr = tp.getTextRuns().get(0);
-                tr.setBold(tr0.isBold());
-                // rt.setEmbossed();
-                tr.setFontColor(Color.BLACK);
-                tr.setFontFamily(tr0.getFontFamily());
-                tr.setFontSize(tr0.getFontSize());
-                tr.setItalic(tr0.isItalic());
-                tr.setShadowed(tr0.isShadowed());
-                tr.setStrikethrough(tr0.isStrikethrough());
-                tr.setUnderlined(tr0.isUnderlined());
-            }
-        }
-
-        table.moveTo(100, 100);
-
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-
-        HSLFTable tab = (HSLFTable)ppt2.getSlides().get(0).getShapes().get(2);
-        HSLFTableCell c2 = tab.getCell(0, 0);
-        HSLFTextParagraph tp1 = c2.getTextParagraphs().get(0);
-        HSLFTextRun tr1 = tp1.getTextRuns().get(0);
-        assertFalse(tp1.isBullet());
-        assertEquals(tp0.getBulletColor(), tp1.getBulletColor());
-        assertEquals(tp0.getBulletFont(), tp1.getBulletFont());
-        assertEquals(tp0.getBulletSize(), tp1.getBulletSize());
-        assertEquals(tp0.getIndent(), tp1.getIndent());
-        assertEquals(tp0.getTextAlign(), tp1.getTextAlign());
-        assertEquals(tp0.getIndentLevel(), tp1.getIndentLevel());
-        assertEquals(tp0.getSpaceAfter(), tp1.getSpaceAfter());
-        assertEquals(tp0.getSpaceBefore(), tp1.getSpaceBefore());
-        assertEquals(tr0.isBold(), tr1.isBold());
-        assertEquals(Color.black, DrawPaint.applyColorTransform(tr1.getFontColor().getSolidColor()));
-        assertEquals(tr0.getFontFamily(), tr1.getFontFamily());
-        assertEquals(tr0.getFontSize(), tr1.getFontSize());
-        assertEquals(tr0.isItalic(), tr1.isItalic());
-        assertEquals(tr0.isShadowed(), tr1.isShadowed());
-        assertEquals(tr0.isStrikethrough(), tr1.isStrikethrough());
-        assertEquals(tr0.isUnderlined(), tr1.isUnderlined());
-
-        ppt2.close();
-    }
-
-    @Test
-    public void bug47904() throws IOException {
-        HSLFSlideShow ppt1 = new HSLFSlideShow();
-        HSLFSlideMaster sm = ppt1.getSlideMasters().get(0);
-        HSLFAutoShape as = (HSLFAutoShape)sm.getShapes().get(0);
-        HSLFTextParagraph tp = as.getTextParagraphs().get(0);
-        HSLFTextRun tr = tp.getTextRuns().get(0);
-        tr.setFontFamily("Tahoma");
-        tr.setShadowed(true);
-        tr.setFontSize(44.);
-        tr.setFontColor(Color.red);
-        tp.setTextAlign(TextAlign.RIGHT);
-        ppt1.createSlide().addTitle().setText("foobaa");
-        
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-        
-        HSLFTextShape ts = (HSLFTextShape)ppt2.getSlides().get(0).getShapes().get(0);
-        tp = ts.getTextParagraphs().get(0);
-        tr = tp.getTextRuns().get(0);
-        assertEquals(44., tr.getFontSize(), 0);
-        assertEquals("Tahoma", tr.getFontFamily());
-        Color colorAct = DrawPaint.applyColorTransform(tr.getFontColor().getSolidColor());
-        assertEquals(Color.red, colorAct);
-        assertEquals(TextAlign.RIGHT, tp.getTextAlign());
-        assertEquals("foobaa", tr.getRawText());
-        ppt2.close();
-    }
-
-    @Test
-    public void bug58718() throws IOException {
-        String files[] = { "bug58718_008524.ppt","bug58718_008558.ppt","bug58718_349008.ppt","bug58718_008495.ppt",  }; 
-        for (String f : files) {
-            File sample = HSLFTestDataSamples.getSampleFile(f);
-            PowerPointExtractor ex = new PowerPointExtractor(sample.getAbsolutePath());
-            assertNotNull(ex.getText());
-            ex.close();
-        }
-    }
-
-    @Test
-    public void bug58733() throws IOException {
-        File sample = HSLFTestDataSamples.getSampleFile("bug58733_671884.ppt");
-        PowerPointExtractor ex = new PowerPointExtractor(sample.getAbsolutePath());
-        assertNotNull(ex.getText());
-        ex.close();
-    }
-
-    @Test
-    public void bug58159() throws IOException {
-        HSLFSlideShow ppt = open("bug58159_headers-and-footers.ppt");
-        HeadersFooters hf = ppt.getSlideHeadersFooters();
-        assertNull(hf.getHeaderText());
-        assertEquals("Slide footer", hf.getFooterText());
-        hf = ppt.getNotesHeadersFooters();
-        assertEquals("Notes header", hf.getHeaderText());
-        assertEquals("Notes footer", hf.getFooterText());
-        HSLFSlide sl = ppt.getSlides().get(0);
-        hf = sl.getHeadersFooters();
-        assertNull(hf.getHeaderText());
-        assertEquals("Slide footer", hf.getFooterText());
-        for (HSLFShape shape : sl.getShapes()) {
-            if (shape instanceof HSLFTextShape) {
-                HSLFTextShape ts = (HSLFTextShape)shape;
-                Placeholder ph = ts.getPlaceholder();
-                if (Placeholder.FOOTER == ph) {
-                    assertEquals("Slide footer", ts.getText());
-                }
-            }
-        }
-        ppt.close();
-    }
-
-    @Test
-    public void bug55030() throws IOException {
-        HSLFSlideShow ppt = open("bug55030.ppt");
-        
-        String expFamily = "\u96b6\u4e66";
-        
-        HSLFSlide sl = ppt.getSlides().get(0);
-        for (List<HSLFTextParagraph> paraList : sl.getTextParagraphs()) {
-            for (HSLFTextParagraph htp : paraList) {
-                for (HSLFTextRun htr : htp) {
-                    String actFamily = htr.getFontFamily();
-                    assertEquals(expFamily, actFamily);
-                }
-            }
-        }
-        
-        ppt.close();
-    }
-
-    @Test
-    @SuppressWarnings("resource")
-    public void bug57796() throws IOException {
-        HSLFSlideShow ppt = open("WithLinks.ppt");
-        HSLFSlide slide = ppt.getSlides().get(0);
-        HSLFTextShape shape = (HSLFTextShape)slide.getShapes().get(1);
-        List<HSLFHyperlink> hlList =  HSLFHyperlink.find(shape);
-        HSLFHyperlink hlShape = hlList.get(0);
-        HSLFTextRun r = shape.getTextParagraphs().get(1).getTextRuns().get(0);
-        HSLFHyperlink hlRun = r.getHyperlink();
-        assertEquals(hlRun.getId(), hlShape.getId());
-        assertEquals(hlRun.getAddress(), hlShape.getAddress());
-        assertEquals(hlRun.getLabel(), hlShape.getLabel());
-        assertEquals(hlRun.getType(), hlShape.getType());
-        assertEquals(hlRun.getStartIndex(), hlShape.getStartIndex());
-        assertEquals(hlRun.getEndIndex(), hlShape.getEndIndex());
-
-        OutputStream nullOutput = new OutputStream(){
-            @Override
-            public void write(int b) throws IOException {}
-        };
-        
-        final boolean found[] = { false }; 
-        DummyGraphics2d dgfx = new DummyGraphics2d(new PrintStream(nullOutput)){
-            @Override
-            public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-                // For the test file, common sl draws textruns one by one and not mixed
-                // so we evaluate the whole iterator
-                Map<Attribute, Object> attributes = null;
-                StringBuffer sb = new StringBuffer();
-                
-                for (char c = iterator.first();
-                        c != AttributedCharacterIterator.DONE;
-                        c = iterator.next()) {
-                    sb.append(c);
-                    attributes = iterator.getAttributes();
-                }
-    
-                if ("Jakarta HSSF".equals(sb.toString())) {
-                    // this is a test for a manually modified ppt, for real hyperlink label
-                    // one would need to access the screen tip record
-                    String href = (String)attributes.get(DrawTextParagraph.HYPERLINK_HREF);
-                    String label = (String)attributes.get(DrawTextParagraph.HYPERLINK_LABEL);
-                    assertEquals("http://jakarta.apache.org/poi/hssf/", href);
-                    assertEquals("Open Jakarta POI HSSF module test  ", label);
-                    found[0] = true;
-                }
-            }
-        };
-        
-        ppt.getSlides().get(1).draw(dgfx);
-        assertTrue(found[0]);
-        
-        ppt.close();
-    }
-
-    @Test
-    public void bug59056() throws IOException {
-        HSLFSlideShow ppt = open("54541_cropped_bitmap.ppt");
-        
-        for (HSLFShape shape : ppt.getSlides().get(0).getShapes()) {
-            BufferedImage img = new BufferedImage(500, 300, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D graphics = img.createGraphics();
-            Rectangle2D box = new Rectangle2D.Double(50,50,300,100);
-            graphics.setPaint(Color.red);
-            graphics.fill(box);
-            box = new Rectangle2D.Double(box.getX()+1,box.getY()+1,box.getWidth()-2,box.getHeight()-2);
-            DrawFactory.getInstance(graphics).drawShape(graphics, shape, box);
-            graphics.dispose();
-            // ImageIO.write(img, "png", new File("bla"+shape.getShapeId()+".png"));
-        }
-            
-        ppt.close();
-        
-    }
-    
-    private static HSLFSlideShow open(String fileName) throws IOException {
-        File sample = HSLFTestDataSamples.getSampleFile(fileName);
-        return (HSLFSlideShow)SlideShowFactory.create(sample);
-    }
-
-    @Test
-    public void bug55983() throws IOException {
-        HSLFSlideShow ppt1 = new HSLFSlideShow();
-        HSLFSlide sl = ppt1.createSlide();
-        sl.getBackground().getFill().setForegroundColor(Color.blue);
-        HSLFFreeformShape fs = sl.createFreeform();
-        Ellipse2D.Double el = new Ellipse2D.Double(0,0,300,200);
-        fs.setAnchor(new Rectangle2D.Double(100,100,300,200));
-        fs.setPath(new Path2D.Double(el));
-        Color cExp = new Color(50,100,150,200);
-        fs.setFillColor(cExp);
-        
-        HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
-        ppt1.close();
-        
-        sl = ppt2.getSlides().get(0);
-        fs = (HSLFFreeformShape)sl.getShapes().get(0);
-        Color cAct = fs.getFillColor();
-        assertEquals(cExp.getRed(), cAct.getRed());
-        assertEquals(cExp.getGreen(), cAct.getGreen());
-        assertEquals(cExp.getBlue(), cAct.getBlue());
-        assertEquals(cExp.getAlpha(), cAct.getAlpha(), 1);
-        
-        PaintStyle ps = fs.getFillStyle().getPaint();
-        assertTrue(ps instanceof SolidPaint);
-        ColorStyle cs = ((SolidPaint)ps).getSolidColor();
-        cAct = cs.getColor();
-        assertEquals(cExp.getRed(), cAct.getRed());
-        assertEquals(cExp.getGreen(), cAct.getGreen());
-        assertEquals(cExp.getBlue(), cAct.getBlue());
-        assertEquals(255, cAct.getAlpha());
-        assertEquals(cExp.getAlpha()*100000./255., cs.getAlpha(), 1);
-        
-        ppt2.close();
-    }
-
-    @Test
-    public void bug59302() throws IOException {
-        //add extraction from PPT
-        Map<String, String> macros = getMacrosFromHSLF("59302.ppt");
-        assertNotNull("couldn't find macros", macros);
-        assertNotNull("couldn't find second module", macros.get("Module2"));
-        assertContains(macros.get("Module2"), "newMacro in Module2");
-
-        assertNotNull("couldn't find first module", macros.get("Module1"));
-        assertContains(macros.get("Module1"), "Italicize");
-
-        macros = getMacrosFromHSLF("SimpleMacro.ppt");
-        assertNotNull(macros.get("Module1"));
-        assertContains(macros.get("Module1"), "This is a macro slideshow");
-    }
-
-    //It isn't pretty, but it works...
-    private Map<String, String> getMacrosFromHSLF(String fileName) throws IOException {
-        InputStream is = null;
-        NPOIFSFileSystem npoifs = null;
-        try {
-            is = new FileInputStream(POIDataSamples.getSlideShowInstance().getFile(fileName));
-            npoifs = new NPOIFSFileSystem(is);
-            //TODO: should we run the VBAMacroReader on this npoifs?
-            //TBD: We know that ppt typically don't store macros in the regular place,
-            //but _can_ they?
-
-            HSLFSlideShow ppt = new HSLFSlideShow(npoifs);
-
-            //get macro persist id
-            DocInfoListContainer list = (DocInfoListContainer)ppt.getDocumentRecord().findFirstOfType(RecordTypes.List.typeID);
-            VBAInfoContainer vbaInfo = (VBAInfoContainer)list.findFirstOfType(RecordTypes.VBAInfo.typeID);
-            VBAInfoAtom vbaAtom = (VBAInfoAtom)vbaInfo.findFirstOfType(RecordTypes.VBAInfoAtom.typeID);
-            long persistId = vbaAtom.getPersistIdRef();
-            for (HSLFObjectData objData : ppt.getEmbeddedObjects()) {
-                if (objData.getExOleObjStg().getPersistId() == persistId) {
-                    return new VBAMacroReader(objData.getData()).readMacros();
-                }
-            }
-
-        } finally {
-            IOUtils.closeQuietly(npoifs);
-            IOUtils.closeQuietly(is);
-        }
-        return null;
-    }
-
-    /**
-     * Bug 60294: Add "unknown" ShapeType for 4095
-     */
-    @Test
-    public void bug60294() throws IOException {
-        HSLFSlideShow ppt = open("60294.ppt");
-        List<HSLFShape> shList = ppt.getSlides().get(0).getShapes();
-        assertEquals(ShapeType.NOT_PRIMITIVE, ((HSLFAutoShape)shList.get(2)).getShapeType());
-        ppt.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
deleted file mode 100644
index a52cee4..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests that SlideShow returns the right number of Sheets and MetaSheets
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestCounts extends TestCase {
-	// SlideShow primed on the test data
-	private final HSLFSlideShow ss;
-
-	public TestCounts() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss = new HSLFSlideShow(hss);
-	}
-
-	public void testSheetsCount() {
-		List<HSLFSlide> slides = ss.getSlides();
-		// Two sheets - master sheet is separate
-		assertEquals(2, slides.size());
-
-		// They are slides 1+2
-		assertEquals(1, slides.get(0).getSlideNumber());
-		assertEquals(2, slides.get(1).getSlideNumber());
-
-		// The ref IDs are 4 and 6
-		assertEquals(4, slides.get(0)._getSheetRefId());
-		assertEquals(6, slides.get(1)._getSheetRefId());
-
-		// These are slides 1+2 -> 256+257
-		assertEquals(256, slides.get(0)._getSheetNumber());
-		assertEquals(257, slides.get(1)._getSheetNumber());
-	}
-
-	public void testNotesCount() {
-		List<HSLFNotes> notes = ss.getNotes();
-		// Two sheets -> two notes
-		// Note: there are also notes on the slide master
-		//assertEquals(3, notes.length); // When we do slide masters
-		assertEquals(2, notes.size());
-
-		// First is for master
-		//assertEquals(-2147483648, notes.get(0)._getSheetNumber());  // When we do slide masters
-
-		// Next two are for the two slides
-		assertEquals(256, notes.get(0)._getSheetNumber());
-		assertEquals(257, notes.get(1)._getSheetNumber());
-
-		// They happen to go between the two slides in Ref terms
-		assertEquals(5, notes.get(0)._getSheetRefId());
-		assertEquals(7, notes.get(1)._getSheetRefId());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
deleted file mode 100644
index bbe6123..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assume.assumeTrue;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.GraphicsEnvironment;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferByte;
-import java.io.File;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.sl.draw.Drawable;
-import org.apache.poi.util.TempFile;
-import org.junit.Test;
-
-/**
- * Test font rendering of alternative and fallback fonts
- */
-public class TestFontRendering {
-    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-    // @Ignore2("This fails on some systems because fonts are rendered slightly different")
-    @Test
-    public void bug55902mixedFontWithChineseCharacters() throws Exception {
-        // font files need to be downloaded first via
-        // ant test-scratchpad-download-resources
-        String fontFiles[][] = {
-            // Calibri is not available on *nix systems, so we need to use another similar free font
-            { "build/scratchpad-test-resources/Cabin-Regular.ttf", "mapped", "Calibri" },
-
-            // use "MS PGothic" if available (Windows only) ...
-            // for the junit test not all chars are rendered
-            { "build/scratchpad-test-resources/mona.ttf", "fallback", "Cabin" }
-        };
-        
-        // setup fonts (especially needed, when run under *nix systems)
-        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        Map<String,String> fontMap = new HashMap<String,String>();
-        Map<String,String> fallbackMap = new HashMap<String,String>();
-        
-        for (String fontFile[] : fontFiles) {
-            File f = new File(fontFile[0]);
-            assumeTrue("necessary font file "+f.getName()+" not downloaded.", f.exists());
-            
-            Font font = Font.createFont(Font.TRUETYPE_FONT, f);
-            ge.registerFont(font);
-            
-            Map<String,String> map = ("mapped".equals(fontFile[1]) ? fontMap : fallbackMap);
-            map.put(fontFile[2], font.getFamily());
-        }
-        
-        InputStream is = slTests.openResourceAsStream("bug55902-mixedFontChineseCharacters.ppt");
-        HSLFSlideShow ss = new HSLFSlideShow(is);
-        is.close();
-        
-        Dimension pgsize = ss.getPageSize();
-        
-        HSLFSlide slide = ss.getSlides().get(0);
-        
-        // render it
-        double zoom = 1;
-        AffineTransform at = new AffineTransform();
-        at.setToScale(zoom, zoom);
-        
-        BufferedImage imgActual = new BufferedImage((int)Math.ceil(pgsize.width*zoom), (int)Math.ceil(pgsize.height*zoom), BufferedImage.TYPE_3BYTE_BGR);
-        Graphics2D graphics = imgActual.createGraphics();
-        graphics.setRenderingHint(Drawable.FONT_FALLBACK, fallbackMap);
-        graphics.setRenderingHint(Drawable.FONT_MAP, fontMap);
-        graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-        graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-        graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        graphics.setTransform(at);                
-        graphics.setPaint(Color.white);
-        graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
-        slide.draw(graphics);             
-        
-        BufferedImage imgExpected = ImageIO.read(slTests.getFile("bug55902-mixedChars.png"));
-        DataBufferByte expectedDB = (DataBufferByte)imgExpected.getRaster().getDataBuffer();
-        DataBufferByte actualDB = (DataBufferByte)imgActual.getRaster().getDataBuffer();
-        byte[] expectedData = expectedDB.getData(0);
-        byte[] actualData = actualDB.getData(0);
-        
-        // allow to find out what the actual difference is in CI where this fails currently
-        if(!Arrays.equals(expectedData, actualData)) {
-            ImageIO.write(imgActual, "PNG", TempFile.createTempFile("TestFontRendering", ".png"));
-        }
-        
-        assertArrayEquals("Expected to have matching raster-arrays, but found differences", expectedData, actualData);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
deleted file mode 100644
index 7f5385e..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.poi.sl.usermodel.BaseTestSlideShow;
-import org.junit.Test;
-
-public class TestHSLFSlideShow extends BaseTestSlideShow {
-    @Override
-    public HSLFSlideShow createSlideShow() {
-        return new HSLFSlideShow();
-    }
-    
-    // make sure junit4 executes this test class
-    @Test
-    public void dummy() {
-        assertNotNull(createSlideShow());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
deleted file mode 100644
index 9c305ef..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import org.apache.poi.sl.usermodel.BaseTestSlideShowFactory;
-import org.junit.Test;
-
-public final class TestHSLFSlideShowFactory extends BaseTestSlideShowFactory {
-    @Test
-    public void testFactory() throws Exception {
-        testFactory("pictures.ppt", "Password_Protected-hello.ppt", "hello");
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
deleted file mode 100644
index a7e2a62..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.Record;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that SlideShow finds the right records as its most recent ones
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestMostRecentRecords extends TestCase {
-	// HSLFSlideShow primed on the test data
-	private final HSLFSlideShowImpl hss;
-	// SlideShow primed on the test data
-	private final HSLFSlideShow ss;
-
-	public TestMostRecentRecords() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss = new HSLFSlideShow(hss);
-	}
-
-	public void testCount() {
-		// Most recent core records
-		Record[] mrcr = ss.getMostRecentCoreRecords();
-
-		// Master sheet + master notes + 2 slides + 2 notes + document
-		assertEquals(7, mrcr.length);
-	}
-
-	public void testRightRecordTypes() {
-		// Most recent core records
-		Record[] mrcr = ss.getMostRecentCoreRecords();
-
-		// Document
-		assertEquals(1000, mrcr[0].getRecordType());
-		// Notes of master
-		assertEquals(1008, mrcr[1].getRecordType());
-		// Master
-		assertEquals(1016, mrcr[2].getRecordType());
-
-		// Slide
-		assertEquals(1006, mrcr[3].getRecordType());
-		// Notes
-		assertEquals(1008, mrcr[4].getRecordType());
-		// Slide
-		assertEquals(1006, mrcr[5].getRecordType());
-		// Notes
-		assertEquals(1008, mrcr[6].getRecordType());
-	}
-
-	public void testCorrectRecords() {
-		// Most recent core records
-		Record[] mrcr = ss.getMostRecentCoreRecords();
-
-		// All records
-		Record[] allr = hss.getRecords();
-
-		// Ensure they are the right (latest) version of each
-
-		// Document - late version
-		assertEquals(allr[12], mrcr[0]);
-		// Notes of master - unchanged
-		assertEquals(allr[2], mrcr[1]);
-		// Master - unchanged
-		assertEquals(allr[1], mrcr[2]);
-
-		// Slide - added at start
-		assertEquals(allr[3], mrcr[3]);
-		// Notes - added at start
-		assertEquals(allr[4], mrcr[4]);
-		// Slide - added later and then changed
-		assertEquals(allr[13], mrcr[5]);
-		// Notes - added later but not changed
-		assertEquals(allr[9], mrcr[6]);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
deleted file mode 100644
index 59c5c65..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-
-import org.apache.poi.POIDataSamples;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that SlideShow returns MetaSheets which have the right text in them
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestNotesText extends TestCase {
-	// SlideShow primed on the test data
-	private final HSLFSlideShow ss;
-
-	public TestNotesText() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss = new HSLFSlideShow(hss);
-	}
-
-	public void testNotesOne() {
-		HSLFNotes notes = ss.getNotes().get(0);
-
-		String[] expectText = new String[] {"These are the notes for page 1"};
-		assertEquals(expectText.length, notes.getTextParagraphs().size());
-		for(int i=0; i<expectText.length; i++) {
-			assertEquals(expectText[i], HSLFTextParagraph.getRawText(notes.getTextParagraphs().get(i)));
-		}
-	}
-
-	public void testNotesTwo() {
-		HSLFNotes notes = ss.getNotes().get(1);
-		String[] expectText = new String[] {"These are the notes on page two, again lacking formatting"};
-		assertEquals(expectText.length, notes.getTextParagraphs().size());
-		for(int i=0; i<expectText.length; i++) {
-			assertEquals(expectText[i], HSLFTextParagraph.getRawText(notes.getTextParagraphs().get(i)));
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
deleted file mode 100644
index b21f216..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.model.textproperties.TextPFException9;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.junit.Test;
-
-
-/**
- * Test that checks numbered list functionality.
- * 
- * @author Alex Nikiforov [mailto:anikif@gmail.com]
- */
-public final class TestNumberedList {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void testNumberedList() throws Exception {
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("numbers.ppt"));
-		final List<HSLFSlide> slides = ppt.getSlides();
-		assertEquals(2, slides.size());
-		checkSlide0(slides.get(0));
-		checkSlide1(slides.get(1));
-		ppt.close();
-	}
-
-    private void checkSlide0(final HSLFSlide s) {
-		final StyleTextProp9Atom[] numberedListArray = s.getNumberedListInfo();
-		assertNotNull(numberedListArray);
-		assertEquals(1, numberedListArray.length);//Just one text box here
-		final StyleTextProp9Atom numberedListInfo = numberedListArray[0];
-		assertNotNull(numberedListInfo);
-		final TextPFException9[] autoNumbers = numberedListInfo.getAutoNumberTypes();
-		assertNotNull(autoNumbers);
-		assertEquals(4, autoNumbers.length);
-		assertTrue(4 == autoNumbers[0].getAutoNumberStartNumber());
-		assertNull(autoNumbers[1].getAutoNumberStartNumber());
-		assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
-		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbers[0].getAutoNumberScheme());
-		assertNull(autoNumbers[1].getAutoNumberScheme());
-		assertTrue(AutoNumberingScheme.alphaLcParenRight == autoNumbers[2].getAutoNumberScheme());
-			
-		List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
-		assertEquals(2, textParass.size());
-
-		List<HSLFTextParagraph> textParas = textParass.get(0);
-		assertEquals("titTe", HSLFTextParagraph.getRawText(textParas));
-		assertEquals(1, textParas.size());
-		assertFalse(textParas.get(0).isBullet());
-
-		String expected =
-	        "This is a text placeholder that \r" +
-	        "follows the design pattern\r" +
-	        "Just a test\rWithout any paragraph\r" +
-	        "Second paragraph first line c) ;\r" +
-	        "Second paragraph second line d) . \r";
-		assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1)));
-		
-		final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers();
-		assertEquals(textParass.size(), styleAtoms.length);
-		final EscherTextboxWrapper wrapper =  styleAtoms[1];
-		final StyleTextPropAtom styleTextPropAtom = wrapper.getStyleTextPropAtom();
-		final List<TextPropCollection> textProps = styleTextPropAtom.getCharacterStyles();
-		assertEquals(60, textProps.get(0).getCharactersCovered());
-		assertEquals(34, textProps.get(1).getCharactersCovered());
-		assertEquals(68, textProps.get(2).getCharactersCovered());
-	}
-
-    private void checkSlide1(final HSLFSlide s) {
-		final StyleTextProp9Atom[] numberedListArray = s.getNumberedListInfo();
-		assertNotNull(numberedListArray);
-		assertEquals(1, numberedListArray.length);//Just one text box here
-		final StyleTextProp9Atom numberedListInfo = numberedListArray[0];
-		assertNotNull(numberedListInfo);
-		final TextPFException9[] autoNumbers = numberedListInfo.getAutoNumberTypes();
-		assertNotNull(autoNumbers);
-		assertEquals(4, autoNumbers.length);
-		assertTrue(9 == autoNumbers[0].getAutoNumberStartNumber());
-		assertNull(autoNumbers[1].getAutoNumberStartNumber());
-		assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
-		assertTrue(AutoNumberingScheme.arabicParenRight == autoNumbers[0].getAutoNumberScheme());
-		assertNull(autoNumbers[1].getAutoNumberScheme());
-		assertTrue(AutoNumberingScheme.alphaUcPeriod == autoNumbers[2].getAutoNumberScheme());
-
-		final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
-		assertEquals(2, textParass.size());
-
-		List<HSLFTextParagraph> textParas = textParass.get(0);
-		assertEquals("Second Slide Title", HSLFTextParagraph.getRawText(textParas));
-		assertEquals(1, textParas.size());
-		assertFalse(textParas.get(0).isBullet());
-
-		String expected =
-	        "This is a text placeholder that \r" +
-	        "follows the design pattern\r" +
-	        "Just a test\rWithout any paragraph\r" +
-	        "Second paragraph first line c) ;\r" +
-	        "Second paragraph second line d) . \r";		        
-		assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1)));
-		
-		final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers();
-		assertEquals(textParass.size(), styleAtoms.length);
-		final EscherTextboxWrapper wrapper =  styleAtoms[1];
-		final StyleTextPropAtom styleTextPropAtom = wrapper.getStyleTextPropAtom();
-		final List<TextPropCollection> textProps = styleTextPropAtom.getCharacterStyles();
-		
-		assertEquals(33, textProps.get(0).getCharactersCovered());
-		assertEquals(61, textProps.get(1).getCharactersCovered());
-		assertEquals(68, textProps.get(2).getCharactersCovered());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
deleted file mode 100644
index 297f57c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.model.textproperties.TextPFException9;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.junit.Test;
-
-
-/**
- * Test that checks numbered list functionality.
- * if a paragraph has autonumber ()
- * @see <a href="http://social.msdn.microsoft.com/Forums/mr-IN/os_binaryfile/thread/650888db-fabd-4b95-88dc-f0455f6e2d28">
- *     PPT: Missing TextAutoNumberScheme structure providing the style of the number bullets</a>
- * 
- * @author Alex Nikiforov [mailto:anikif@gmail.com]
- */
-public final class TestNumberedList2 {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-	public void testNumberedList() throws Exception {
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("numbers2.ppt"));
-		assertTrue("No Exceptions while reading file", true);
-
-		final List<HSLFSlide> slides = ppt.getSlides();
-		assertEquals(2, slides.size());
-		checkSlide0(slides.get(0));
-		checkSlide1(slides.get(1));
-	}
-	private void checkSlide0(final HSLFSlide s) {
-		final StyleTextProp9Atom[] numberedListArray = s.getNumberedListInfo();
-		assertNotNull(numberedListArray);
-		assertEquals(2, numberedListArray.length);
-		final StyleTextProp9Atom numberedListInfoForTextBox0 = numberedListArray[0];
-		final StyleTextProp9Atom numberedListInfoForTextBox1 = numberedListArray[1];
-		assertNotNull(numberedListInfoForTextBox0);
-		assertNotNull(numberedListInfoForTextBox1);
-		final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox0.getAutoNumberTypes();
-		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
-		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
-		final TextPFException9[] autoNumbersOfTextBox1 = numberedListInfoForTextBox1.getAutoNumberTypes();
-		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox1[0].getfBulletHasAutoNumber());
-		assertEquals(Short.valueOf((short)6), autoNumbersOfTextBox1[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox1[0].getAutoNumberScheme());
-
-		
-		List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
-		assertEquals(2, textParass.size());
-
-		List<HSLFTextParagraph> textParas = textParass.get(0);
-		assertEquals("List Item One\rList Item Two\rList Item Three", HSLFTextParagraph.getRawText(textParas));
-		assertEquals(3, textParas.size());
-		assertTrue(textParas.get(0).isBullet());
-
-		String expected =
-	        "A numbered list may start at any number \r" +
-	        "This would be used as a continuation list on another page\r" +
-            "This list should start with #6";
-		assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1)));
-		
-		final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers();
-		assertEquals(textParass.size(), styleAtoms.length);
-		checkSingleRunWrapper(44, styleAtoms[0]);
-		checkSingleRunWrapper(130, styleAtoms[1]);
-	}
-	private void checkSlide1(final HSLFSlide s) {
-		final StyleTextProp9Atom[] numberedListArray = s.getNumberedListInfo();
-		assertNotNull(numberedListArray);
-		assertEquals(1, numberedListArray.length);
-		final StyleTextProp9Atom numberedListInfoForTextBox = numberedListArray[0];
-		assertNotNull(numberedListInfoForTextBox);
-		final TextPFException9[] autoNumbersOfTextBox = numberedListInfoForTextBox.getAutoNumberTypes();
-		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getfBulletHasAutoNumber());
-		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox[0].getAutoNumberScheme());
-			
-		List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
-		assertEquals(3, textParass.size());
-
-		List<HSLFTextParagraph> textParas = textParass.get(0);
-		assertEquals("Bulleted list\rMore bullets", HSLFTextParagraph.getRawText(textParas));
-		assertEquals(2, textParas.size());
-		assertTrue(textParas.get(0).isBullet());
-
-		String expected = "Numbered list between two bulleted lists\rSecond numbered list item";
-		assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1)));
-		expected = "Second bulleted list \u2013 should appear after numbered list\rMore bullets";
-		assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(2)));
-		
-		final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers();
-		assertEquals(textParass.size(), styleAtoms.length);
-		checkSingleRunWrapper(27, styleAtoms[0]);
-		checkSingleRunWrapper(67, styleAtoms[1]);
-		checkSingleRunWrapper(70, styleAtoms[2]);
-	}
-	private void checkSingleRunWrapper(final int exceptedLength, final EscherTextboxWrapper wrapper) {
-		final StyleTextPropAtom styleTextPropAtom = wrapper.getStyleTextPropAtom();
-		final List<TextPropCollection> textProps = styleTextPropAtom.getCharacterStyles();
-		assertEquals(1, textProps.size());
-		assertEquals(exceptedLength, textProps.get(0).getCharactersCovered());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
deleted file mode 100644
index 36832c6..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.model.textproperties.TextPFException9;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.record.EscherTextboxWrapper;
-import org.apache.poi.hslf.record.StyleTextProp9Atom;
-import org.apache.poi.hslf.record.StyleTextPropAtom;
-import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.junit.Test;
-
-
-/**
- * Test that checks numbered list functionality.
- * if a paragraph has autonumber ()
- * @see <a href="http://social.msdn.microsoft.com/Forums/mr-IN/os_binaryfile/thread/650888db-fabd-4b95-88dc-f0455f6e2d28">
- *     PPT: Missing TextAutoNumberScheme structure providing the style of the number bullets</a>
- * 
- * @author Alex Nikiforov [mailto:anikif@gmail.com]
- */
-public final class TestNumberedList3 {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void testNumberedList() throws IOException {
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("numbers3.ppt"));
-		assertTrue("No Exceptions while reading file", true);
-
-		final List<HSLFSlide> slides = ppt.getSlides();
-		assertEquals(1, slides.size());
-		final HSLFSlide slide = slides.get(0);
-		checkSlide(slide);
-		ppt.close();
-	}
-	private void checkSlide(final HSLFSlide s) {
-		final StyleTextProp9Atom[] numberedListArray = s.getNumberedListInfo();
-		assertNotNull(numberedListArray);
-		assertEquals(1, numberedListArray.length);
-		final StyleTextProp9Atom numberedListInfoForTextBox = numberedListArray[0];
-		assertNotNull(numberedListInfoForTextBox);
-		final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox.getAutoNumberTypes();
-		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
-		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
-		
-		final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
-		assertEquals(3, textParass.size());
-		assertEquals("Bulleted list\rMore bullets\rNo bullets here", HSLFTextParagraph.getRawText(textParass.get(0)));
-		assertEquals("Numbered list between two bulleted lists\rSecond numbered list item", HSLFTextParagraph.getRawText(textParass.get(1)));
-		assertEquals("Second bulleted list \u2013 should appear after numbered list\rMore bullets", HSLFTextParagraph.getRawText(textParass.get(2)));
-		assertEquals(3, textParass.get(0).size());
-		assertEquals(2, textParass.get(1).size());
-		assertEquals(2, textParass.get(2).size());
-		assertNull(textParass.get(0).get(0).getStyleTextProp9Atom());
-		assertNotNull(textParass.get(1).get(0).getStyleTextProp9Atom());
-		assertNull(textParass.get(2).get(0).getStyleTextProp9Atom());
-		final TextPFException9[] autoNumbers = textParass.get(1).get(0).getStyleTextProp9Atom().getAutoNumberTypes();
-		assertEquals(1, autoNumbers.length);
-		assertEquals(Short.valueOf((short)1), autoNumbers[0].getfBulletHasAutoNumber());
-		assertEquals(Short.valueOf((short)1), autoNumbers[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-		assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
-		
-		int chCovered = 0;
-		for (HSLFTextParagraph htp : textParass.get(1)) {
-    		for (HSLFTextRun htr : htp.getTextRuns()) {
-    		    TextPropCollection textProp = htr.getCharacterStyle();
-    		    chCovered += textProp.getCharactersCovered();
-    		}
-		}
-		assertEquals(67, chCovered);
-		
-		assertTrue(textParass.get(0).get(0).isBullet());
-		
-		final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers();
-		assertEquals(textParass.size(), styleAtoms.length);
-		checkSingleRunWrapper(43, styleAtoms[0]);
-		checkSingleRunWrapper(67, styleAtoms[1]);
-	}
-	private void checkSingleRunWrapper(final int exceptedLength, final EscherTextboxWrapper wrapper) {
-		final StyleTextPropAtom styleTextPropAtom = wrapper.getStyleTextPropAtom();
-		final List<TextPropCollection> textProps = styleTextPropAtom.getCharacterStyles();
-		assertEquals(1, textProps.size());
-		assertEquals(exceptedLength, textProps.get(0).getCharactersCovered());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
deleted file mode 100644
index 7a7a7b4..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.BitSet;
-import java.util.List;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.hssf.usermodel.DummyGraphics2d;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.Slide;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test Picture shape.
- *
- * @author Yegor Kozlov
- */
-public final class TestPicture {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    /**
-     * Test that the reference count of a blip is incremented every time the picture is inserted.
-     * This is important when the same image appears multiple times in a slide show.
-     *
-     */
-    @Test
-    public void multiplePictures() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide s = ppt.createSlide();
-        HSLFSlide s2 = ppt.createSlide();
-        HSLFSlide s3 = ppt.createSlide();
-
-        HSLFPictureData data = ppt.addPicture(_slTests.readFile("clock.jpg"), PictureType.JPEG);
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        HSLFPictureShape pict2 = new HSLFPictureShape(data);
-        HSLFPictureShape pict3 = new HSLFPictureShape(data);
-
-        pict.setAnchor(new Rectangle(10,10,100,100));
-        s.addShape(pict);
-        EscherBSERecord bse1 = pict.getEscherBSERecord();
-        assertEquals(1, bse1.getRef());
-
-        pict2.setAnchor(new Rectangle(10,10,100,100));
-        s2.addShape(pict2);
-        EscherBSERecord bse2 = pict.getEscherBSERecord();
-        assertSame(bse1, bse2);
-        assertEquals(2, bse1.getRef());
-
-        pict3.setAnchor(new Rectangle(10,10,100,100));
-        s3.addShape(pict3);
-        EscherBSERecord bse3 = pict.getEscherBSERecord();
-        assertSame(bse2, bse3);
-        assertEquals(3, bse1.getRef());
-        
-        ppt.close();
-    }
-
-    /**
-     * Picture#getEscherBSERecord threw NullPointerException if EscherContainerRecord.BSTORE_CONTAINER
-     * was not found. The correct behaviour is to return null.
-     */
-    @Test
-    public void bug46122() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide = ppt.createSlide();
-        HSLFPictureData pd = HSLFPictureData.create(PictureType.PNG);
-        
-        HSLFPictureShape pict = new HSLFPictureShape(pd); //index to non-existing picture data
-        pict.setAnchor(new Rectangle2D.Double(50,50,100,100));
-        pict.setSheet(slide);
-        HSLFPictureData data = pict.getPictureData();
-        assertNull(data);
-
-        BufferedImage img = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
-        Graphics2D graphics = img.createGraphics();
-        pict.draw(graphics, null);
-        
-        ppt.close();
-    }
-
-    @Test
-    public void macImages() throws IOException {
-        HSLFSlideShowImpl hss = new HSLFSlideShowImpl(_slTests.openResourceAsStream("53446.ppt"));
-
-        List<HSLFPictureData> pictures = hss.getPictureData();
-        assertEquals(15, pictures.size());
-
-        int[][] expectedSizes = {
-                null,           // WMF
-                { 427, 428 },   // PNG
-                { 371, 370 },   // PNG
-                { 288, 183 },   // PNG
-                { 285, 97 },    // PNG
-                { 288, 168 },   // PNG
-                null,           // WMF
-                null,           // WMF
-                { 199, 259 },   // PNG
-                { 432, 244 },   // PNG
-                { 261, 258 },   // PNG
-                null,           // WMF
-                null,           // WMF
-                null,           // WMF
-                null            // EMF
-        };
-
-        int i = 0;
-        for (HSLFPictureData pd : pictures) {
-            int[] dimensions = expectedSizes[i++];
-            BufferedImage image = ImageIO.read(new ByteArrayInputStream(pd.getData()));
-            switch (pd.getType()) {
-                case WMF:
-                case EMF:
-                    break;
-                default:
-                    assertNotNull(image);
-                    assertEquals(dimensions[0], image.getWidth());
-                    assertEquals(dimensions[1], image.getHeight());
-                    break;
-            }
-        }
-        
-        hss.close();
-    }
-
-    @Test
-    @Ignore("Just for visual validation - antialiasing is different on various systems")
-    public void bug54541()
-    throws IOException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException {
-        String files[] = {
-//            "sample_pptx_grouping_issues.pptx",
-//            "54542_cropped_bitmap.pptx",
-//            "54541_cropped_bitmap.ppt",
-//            "54541_cropped_bitmap2.ppt",
-            "alterman_security.ppt",
-//            "alterman_security3.pptx",
-        };
-        
-        BitSet pages = new BitSet();
-        pages.set(2);
-        
-        for (String file : files) {
-            InputStream is = _slTests.openResourceAsStream(file);
-            SlideShow<?,?> ss;
-            if (file.endsWith("pptx")) {
-                Class<?> cls = Class.forName("org.apache.poi.xslf.usermodel.XMLSlideShow");
-                Constructor<?> ct = cls.getDeclaredConstructor(InputStream.class);
-                ss = (SlideShow<?,?>)ct.newInstance(is);
-            } else {
-                ss = new HSLFSlideShow(is);
-            }
-            is.close();
-            
-            boolean debugOut = false;
-            Dimension pg = ss.getPageSize();
-            for (Slide<?,?> slide : ss.getSlides()) {
-                int slideNo = slide.getSlideNumber();
-                if (!pages.get(slideNo-1)) {
-                    if (pages.nextSetBit(slideNo-1) == -1) break; else continue;
-                }
-                if (debugOut) {
-                    DummyGraphics2d graphics = new DummyGraphics2d();
-                    slide.draw(graphics);
-                } else {
-                    BufferedImage img = new BufferedImage(pg.width, pg.height, BufferedImage.TYPE_INT_ARGB);
-                    Graphics2D graphics = img.createGraphics();
-                    DrawFactory.getInstance(graphics).fixFonts(graphics);
-                    slide.draw(graphics);
-                    graphics.setColor(Color.BLACK);
-                    graphics.setStroke(new BasicStroke(1));
-                    graphics.drawRect(0, 0, (int)pg.getWidth()-1, (int)pg.getHeight()-1);
-                    ImageIO.write(img, "PNG", new File(file.replaceFirst(".pptx?", "-")+slideNo+".png"));
-                }
-            }
-            
-            ss.close();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
deleted file mode 100644
index 3afcfe5..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Dimension;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.blip.DIB;
-import org.apache.poi.hslf.blip.EMF;
-import org.apache.poi.hslf.blip.JPEG;
-import org.apache.poi.hslf.blip.PICT;
-import org.apache.poi.hslf.blip.PNG;
-import org.apache.poi.hslf.blip.WMF;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.util.Units;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test adding/reading pictures
- *
- * @author Yegor Kozlov
- */
-public final class TestPictures {
-    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-    /**
-     * Test read/write Macintosh PICT
-     */
-    @Test
-    public void testPICT() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-        byte[] src_bytes = slTests.readFile("cow.pict");
-        HSLFPictureData data = ppt.addPicture(src_bytes, PictureType.PICT);
-        PICT.NativeHeader nHeader = new PICT.NativeHeader(src_bytes, 512);
-        final int expWidth = 197, expHeight = 137;
-        Dimension nDim = nHeader.getSize();
-        assertEquals(expWidth, nDim.getWidth(), 0);
-        assertEquals(expHeight, nDim.getHeight(), 0);
-        
-        Dimension dim = data.getImageDimensionInPixels();
-        assertEquals(Units.pointsToPixel(expWidth), dim.getWidth(), 0);
-        assertEquals(Units.pointsToPixel(expHeight), dim.getHeight(), 0);
-        
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-        slide.addShape(pict);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-
-        //make sure we can read this picture shape and it refers to the correct picture data
-        List<HSLFShape> sh = ppt.getSlides().get(0).getShapes();
-        assertEquals(1, sh.size());
-        pict = (HSLFPictureShape)sh.get(0);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-
-        //check picture data
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        assertEquals(1, pictures.size());
-        
-        HSLFPictureData pd = pictures.get(0);
-        dim = pd.getImageDimension();
-        assertEquals(expWidth, dim.width);
-        assertEquals(expHeight, dim.height);
-        
-        //the Picture shape refers to the PictureData object in the Presentation
-        assertEquals(pict.getPictureData(), pd);
-
-        assertEquals(1, pictures.size());
-        assertEquals(PictureType.PICT, pd.getType());
-        assertTrue(pd instanceof PICT);
-        //compare the content of the initial file with what is stored in the PictureData
-        byte[] ppt_bytes = pd.getData();
-        assertEquals(src_bytes.length, ppt_bytes.length);
-        //in PICT the first 512 bytes are MAC specific and may not be preserved, ignore them
-        byte[] b1 = new byte[src_bytes.length-512];
-        System.arraycopy(src_bytes, 512, b1, 0, b1.length);
-        byte[] b2 = new byte[ppt_bytes.length-512];
-        System.arraycopy(ppt_bytes, 512, b2, 0, b2.length);
-        assertArrayEquals(b1, b2);
-    }
-
-    /**
-     * Test read/write WMF
-     */
-    @Test
-    public void testWMF() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-        byte[] src_bytes = slTests.readFile("santa.wmf");
-        HSLFPictureData data = ppt.addPicture(src_bytes, PictureType.WMF);
-        WMF.NativeHeader nHeader = new WMF.NativeHeader(src_bytes, 0);
-        final int expWidth = 136, expHeight = 146;
-        Dimension nDim = nHeader.getSize();
-        assertEquals(expWidth, nDim.getWidth(), 0);
-        assertEquals(expHeight, nDim.getHeight(), 0);
-
-        Dimension dim = data.getImageDimensionInPixels();
-        assertEquals(Units.pointsToPixel(expWidth), dim.getWidth(), 0);
-        assertEquals(Units.pointsToPixel(expHeight), dim.getHeight(), 0);
-        
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-        slide.addShape(pict);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-
-        //make sure we can read this picture shape and it refers to the correct picture data
-        List<HSLFShape> sh = ppt.getSlides().get(0).getShapes();
-        assertEquals(1, sh.size());
-        pict = (HSLFPictureShape)sh.get(0);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-
-        //check picture data
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        assertEquals(1, pictures.size());
-
-        HSLFPictureData pd = pictures.get(0);
-        dim = pd.getImageDimension();
-        assertEquals(expWidth, dim.width);
-        assertEquals(expHeight, dim.height);
-        
-        //the Picture shape refers to the PictureData object in the Presentation
-        assertEquals(pict.getPictureData(), pd);
-        
-        assertEquals(PictureType.WMF, pd.getType());
-        assertTrue(pd instanceof WMF);
-        //compare the content of the initial file with what is stored in the PictureData
-        byte[] ppt_bytes = pd.getData();
-        assertEquals(src_bytes.length, ppt_bytes.length);
-        //in WMF the first 22 bytes - is a metafile header
-        byte[] b1 = new byte[src_bytes.length-22];
-        System.arraycopy(src_bytes, 22, b1, 0, b1.length);
-        byte[] b2 = new byte[ppt_bytes.length-22];
-        System.arraycopy(ppt_bytes, 22, b2, 0, b2.length);
-        assertArrayEquals(b1, b2);
-    }
-
-    /**
-     * Test read/write EMF
-     */
-    @Test
-    public void testEMF() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-        byte[] src_bytes = slTests.readFile("wrench.emf");
-        HSLFPictureData data = ppt.addPicture(src_bytes, PictureType.EMF);
-        EMF.NativeHeader nHeader = new EMF.NativeHeader(src_bytes, 0);
-        final int expWidth = 190, expHeight = 115;
-        Dimension nDim = nHeader.getSize();
-        assertEquals(expWidth, nDim.getWidth(), 0);
-        assertEquals(expHeight, nDim.getHeight(), 0);
-
-        Dimension dim = data.getImageDimensionInPixels();
-        assertEquals(Units.pointsToPixel(expWidth), dim.getWidth(), 0);
-        assertEquals(Units.pointsToPixel(expHeight), dim.getHeight(), 0);
-        
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-        slide.addShape(pict);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-
-        //make sure we can get this picture shape and it refers to the correct picture data
-        List<HSLFShape> sh = ppt.getSlides().get(0).getShapes();
-        assertEquals(1, sh.size());
-        pict = (HSLFPictureShape)sh.get(0);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-
-        //check picture data
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        assertEquals(1, pictures.size());
-        
-        HSLFPictureData pd = pictures.get(0);
-        dim = pd.getImageDimension();
-        assertEquals(expWidth, dim.width);
-        assertEquals(expHeight, dim.height);
-        
-        //the Picture shape refers to the PictureData object in the Presentation
-        assertEquals(pict.getPictureData(), pd);
-
-        assertEquals(1, pictures.size());
-        assertEquals(PictureType.EMF, pd.getType());
-        assertTrue(pd instanceof EMF);
-        //compare the content of the initial file with what is stored in the PictureData
-        byte[] ppt_bytes = pd.getData();
-        assertArrayEquals(src_bytes, ppt_bytes);
-    }
-
-    /**
-     * Test read/write PNG
-     */
-    @Test
-    public void testPNG() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-        byte[] src_bytes = slTests.readFile("tomcat.png");
-        HSLFPictureData data = ppt.addPicture(src_bytes, PictureType.PNG);
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-        slide.addShape(pict);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-
-        //make sure we can read this picture shape and it refers to the correct picture data
-        List<HSLFShape> sh = ppt.getSlides().get(0).getShapes();
-        assertEquals(1, sh.size());
-        pict = (HSLFPictureShape)sh.get(0);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-
-        //check picture data
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        //the Picture shape refers to the PictureData object in the Presentation
-        assertEquals(pict.getPictureData(), pictures.get(0));
-
-        assertEquals(1, pictures.size());
-        assertEquals(PictureType.PNG, pictures.get(0).getType());
-        assertTrue(pictures.get(0) instanceof PNG);
-        //compare the content of the initial file with what is stored in the PictureData
-        byte[] ppt_bytes = pictures.get(0).getData();
-        assertArrayEquals(src_bytes, ppt_bytes);
-    }
-
-    /**
-     * Test read/write JPEG
-     */
-    @Test
-    public void testJPEG() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-        byte[] src_bytes = slTests.readFile("clock.jpg");
-        HSLFPictureData data = ppt.addPicture(src_bytes, PictureType.JPEG);
-
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-        slide.addShape(pict);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-
-        //make sure we can read this picture shape and it refers to the correct picture data
-        List<HSLFShape> sh = ppt.getSlides().get(0).getShapes();
-        assertEquals(1, sh.size());
-        pict = (HSLFPictureShape)sh.get(0);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-
-        //check picture data
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        //the Picture shape refers to the PictureData object in the Presentation
-        assertEquals(pict.getPictureData(), pictures.get(0));
-
-        assertEquals(1, pictures.size());
-        assertEquals(PictureType.JPEG, pictures.get(0).getType());
-        assertTrue(pictures.get(0) instanceof JPEG);
-        //compare the content of the initial file with what is stored in the PictureData
-        byte[] ppt_bytes = pictures.get(0).getData();
-        assertArrayEquals(src_bytes, ppt_bytes);
-    }
-
-    /**
-     * Test read/write DIB
-     */
-    @Test
-    public void testDIB() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-        byte[] src_bytes = slTests.readFile("clock.dib");
-        HSLFPictureData data = ppt.addPicture(src_bytes, PictureType.DIB);
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-        slide.addShape(pict);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
-
-        //make sure we can read this picture shape and it refers to the correct picture data
-        List<HSLFShape> sh = ppt.getSlides().get(0).getShapes();
-        assertEquals(1, sh.size());
-        pict = (HSLFPictureShape)sh.get(0);
-        assertEquals(data.getIndex(), pict.getPictureIndex());
-
-        //check picture data
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        //the Picture shape refers to the PictureData object in the Presentation
-        assertEquals(pict.getPictureData(), pictures.get(0));
-
-        assertEquals(1, pictures.size());
-        assertEquals(PictureType.DIB, pictures.get(0).getType());
-        assertTrue(pictures.get(0) instanceof DIB);
-        //compare the content of the initial file with what is stored in the PictureData
-        byte[] ppt_bytes = pictures.get(0).getData();
-        assertArrayEquals(src_bytes, ppt_bytes);
-    }
-
-    /**
-     * Read pictures in different formats from a reference slide show
-     */
-    @Test
-    public void testReadPictures() throws Exception {
-
-        byte[] src_bytes, ppt_bytes, b1, b2;
-        HSLFPictureShape pict;
-        HSLFPictureData pdata;
-
-        HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream("pictures.ppt"));
-        List<HSLFSlide> slides = ppt.getSlides();
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        assertEquals(5, pictures.size());
-
-        pict = (HSLFPictureShape)slides.get(0).getShapes().get(0); //the first slide contains JPEG
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof JPEG);
-        assertEquals(PictureType.JPEG, pdata.getType());
-        src_bytes = pdata.getData();
-        ppt_bytes = slTests.readFile("clock.jpg");
-        assertArrayEquals(src_bytes, ppt_bytes);
-
-        pict = (HSLFPictureShape)slides.get(1).getShapes().get(0); //the second slide contains PNG
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof PNG);
-        assertEquals(PictureType.PNG, pdata.getType());
-        src_bytes = pdata.getData();
-        ppt_bytes = slTests.readFile("tomcat.png");
-        assertArrayEquals(src_bytes, ppt_bytes);
-
-        pict = (HSLFPictureShape)slides.get(2).getShapes().get(0); //the third slide contains WMF
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof WMF);
-        assertEquals(PictureType.WMF, pdata.getType());
-        src_bytes = pdata.getData();
-        ppt_bytes = slTests.readFile("santa.wmf");
-        assertEquals(src_bytes.length, ppt_bytes.length);
-        //ignore the first 22 bytes - it is a WMF metafile header
-        b1 = new byte[src_bytes.length-22];
-        System.arraycopy(src_bytes, 22, b1, 0, b1.length);
-        b2 = new byte[ppt_bytes.length-22];
-        System.arraycopy(ppt_bytes, 22, b2, 0, b2.length);
-        assertArrayEquals(b1, b2);
-
-        pict = (HSLFPictureShape)slides.get(3).getShapes().get(0); //the forth slide contains PICT
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof PICT);
-        assertEquals(PictureType.PICT, pdata.getType());
-        src_bytes = pdata.getData();
-        ppt_bytes = slTests.readFile("cow.pict");
-        assertEquals(src_bytes.length, ppt_bytes.length);
-        //ignore the first 512 bytes - it is a MAC specific crap
-        b1 = new byte[src_bytes.length-512];
-        System.arraycopy(src_bytes, 512, b1, 0, b1.length);
-        b2 = new byte[ppt_bytes.length-512];
-        System.arraycopy(ppt_bytes, 512, b2, 0, b2.length);
-        assertArrayEquals(b1, b2);
-
-        pict = (HSLFPictureShape)slides.get(4).getShapes().get(0); //the fifth slide contains EMF
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof EMF);
-        assertEquals(PictureType.EMF, pdata.getType());
-        src_bytes = pdata.getData();
-        ppt_bytes = slTests.readFile("wrench.emf");
-        assertArrayEquals(src_bytes, ppt_bytes);
-
-    }
-
-	/**
-	 * Test that on a party corrupt powerpoint document, which has
-	 *  crazy pictures of type 0, we do our best.
-	 */
-    @Test
-	public void testZeroPictureType() throws Exception {
-		HSLFSlideShowImpl hslf = new HSLFSlideShowImpl(slTests.openResourceAsStream("PictureTypeZero.ppt"));
-
-		// Should still have 2 real pictures
-		assertEquals(2, hslf.getPictureData().size());
-		// Both are real pictures, both WMF
-		assertEquals(PictureType.WMF, hslf.getPictureData().get(0).getType());
-		assertEquals(PictureType.WMF, hslf.getPictureData().get(1).getType());
-
-		// Now test what happens when we use the SlideShow interface
-		HSLFSlideShow ppt = new HSLFSlideShow(hslf);
-        List<HSLFSlide> slides = ppt.getSlides();
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        assertEquals(12, slides.size());
-        assertEquals(2, pictures.size());
-
-		HSLFPictureShape pict;
-		HSLFPictureData pdata;
-
-        pict = (HSLFPictureShape)slides.get(0).getShapes().get(1); // 2nd object on 1st slide
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof WMF);
-        assertEquals(PictureType.WMF, pdata.getType());
-
-        pict = (HSLFPictureShape)slides.get(0).getShapes().get(2); // 3rd object on 1st slide
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof WMF);
-        assertEquals(PictureType.WMF, pdata.getType());
-	}
-
-    /**
-     * YK: The test is disabled because the owner asked to delete the test file from POI svn.
-     * See "Please remove my file from your svn" on @poi-dev from Dec 12, 2013
-     */
-    @Test
-    @Ignore
-	public void testZeroPictureLength() throws Exception {
-        // take the data from www instead of test directory
-        URL url = new URL("http://www.cs.sfu.ca/~anoop/courses/CMPT-882-Fall-2002/chris.ppt");
-		HSLFSlideShowImpl hslf = new HSLFSlideShowImpl(url.openStream());
-
-		// Should still have 2 real pictures
-		assertEquals(2, hslf.getPictureData().size());
-		// Both are real pictures, both WMF
-		assertEquals(PictureType.WMF, hslf.getPictureData().get(0).getType());
-		assertEquals(PictureType.WMF, hslf.getPictureData().get(1).getType());
-
-		// Now test what happens when we use the SlideShow interface
-		HSLFSlideShow ppt = new HSLFSlideShow(hslf);
-        List<HSLFSlide> slides = ppt.getSlides();
-        List<HSLFPictureData> pictures = ppt.getPictureData();
-        assertEquals(27, slides.size());
-        assertEquals(2, pictures.size());
-
-		HSLFPictureShape pict;
-		HSLFPictureData pdata;
-
-        pict = (HSLFPictureShape)slides.get(6).getShapes().get(13);
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof WMF);
-        assertEquals(PictureType.WMF, pdata.getType());
-
-        pict = (HSLFPictureShape)slides.get(7).getShapes().get(13);
-        pdata = pict.getPictureData();
-        assertTrue(pdata instanceof WMF);
-        assertEquals(PictureType.WMF, pdata.getType());
-
-        //add a new picture, it should be correctly appended to the Pictures stream
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        for(HSLFPictureData p : pictures) p.write(out);
-        out.close();
-
-        int streamSize = out.size();
-
-        HSLFPictureData data = HSLFPictureData.create(PictureType.JPEG);
-        data.setData(new byte[100]);
-        int offset = hslf.addPicture(data);
-        assertEquals(streamSize, offset);
-        assertEquals(3, ppt.getPictureData().size());
-
-    }
-
-    @Test
-    public void testGetPictureName() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream("ppt_with_png.ppt"));
-        HSLFSlide slide = ppt.getSlides().get(0);
-
-        HSLFPictureShape p = (HSLFPictureShape)slide.getShapes().get(0); //the first slide contains JPEG
-        assertEquals("test", p.getPictureName());
-    }
-
-    @Test
-    public void testSetPictureName() throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-        byte[] img = slTests.readFile("tomcat.png");
-        HSLFPictureData data = ppt.addPicture(img, PictureType.PNG);
-        HSLFPictureShape pict = new HSLFPictureShape(data);
-        pict.setPictureName("tomcat.png");
-        slide.addShape(pict);
-
-        //serialize and read again
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-
-        HSLFPictureShape p = (HSLFPictureShape)ppt.getSlides().get(0).getShapes().get(0);
-        assertEquals("tomcat.png", p.getPictureName());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
deleted file mode 100644
index c8a3d37..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that SlideShow can re-order slides properly
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestReOrderingSlides {
-	// A SlideShow with one slide
-	private HSLFSlideShowImpl hss_one;
-	private HSLFSlideShow ss_one;
-
-	// A SlideShow with two slides
-	private HSLFSlideShowImpl hss_two;
-	private HSLFSlideShow ss_two;
-
-	// A SlideShow with three slides
-	private HSLFSlideShowImpl hss_three;
-	private HSLFSlideShow ss_three;
-
-	/**
-	 * Create/open the slideshows
-	 */
-	@Before
-	public void setUp() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-		hss_one = new HSLFSlideShowImpl(slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
-		ss_one = new HSLFSlideShow(hss_one);
-
-		hss_two = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss_two = new HSLFSlideShow(hss_two);
-
-		hss_three = new HSLFSlideShowImpl(slTests.openResourceAsStream("incorrect_slide_order.ppt"));
-		ss_three = new HSLFSlideShow(hss_three);
-	}
-
-	/**
-	 * Test that we can "re-order" a slideshow with only 1 slide on it
-	 */
-	@Test
-	public void testReOrder1() throws Exception {
-		// Has one slide
-		assertEquals(1, ss_one.getSlides().size());
-		HSLFSlide s1 = ss_one.getSlides().get(0);
-
-		// Check slide 1 is as expected
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(3, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-
-		// Now move it to one
-		ss_one.reorderSlide(1, 1);
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_one.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it still has 1 slide
-		assertEquals(1, ss_read.getSlides().size());
-
-		// And check it's as expected
-		s1 = ss_read.getSlides().get(0);
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(3, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-	}
-
-	/**
-	 * Test doing a dummy re-order on a slideshow with
-	 *  two slides in it
-	 */
-    @Test
-	public void testReOrder2() throws Exception {
-		// Has two slides
-		assertEquals(2, ss_two.getSlides().size());
-		HSLFSlide s1 = ss_two.getSlides().get(0);
-		HSLFSlide s2 = ss_two.getSlides().get(1);
-
-		// Check slide 1 is as expected
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(4, s1._getSheetRefId()); // master has notes
-		assertEquals(1, s1.getSlideNumber());
-		// Check slide 2 is as expected
-		assertEquals(257, s2._getSheetNumber());
-		assertEquals(6, s2._getSheetRefId()); // master and 1 have notes
-		assertEquals(2, s2.getSlideNumber());
-
-		// Don't swap them around
-		ss_two.reorderSlide(2, 2);
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_two.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it still has 2 slides
-		assertEquals(2, ss_read.getSlides().size());
-
-		// And check it's as expected
-		s1 = ss_read.getSlides().get(0);
-		s2 = ss_read.getSlides().get(1);
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(4, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-		assertEquals(257, s2._getSheetNumber());
-		assertEquals(6, s2._getSheetRefId());
-		assertEquals(2, s2.getSlideNumber());
-	}
-
-	/**
-	 * Test re-ordering slides in a slideshow with 2 slides on it
-	 */
-    @Test
-	public void testReOrder2swap() throws Exception {
-		// Has two slides
-		assertEquals(2, ss_two.getSlides().size());
-		HSLFSlide s1 = ss_two.getSlides().get(0);
-		HSLFSlide s2 = ss_two.getSlides().get(1);
-
-		// Check slide 1 is as expected
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(4, s1._getSheetRefId()); // master has notes
-		assertEquals(1, s1.getSlideNumber());
-		// Check slide 2 is as expected
-		assertEquals(257, s2._getSheetNumber());
-		assertEquals(6, s2._getSheetRefId()); // master and 1 have notes
-		assertEquals(2, s2.getSlideNumber());
-
-		// Swap them around
-		ss_two.reorderSlide(2, 1);
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_two.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it still has 2 slides
-		assertEquals(2, ss_read.getSlides().size());
-
-		// And check it's as expected
-		s1 = ss_read.getSlides().get(0);
-		s2 = ss_read.getSlides().get(1);
-		assertEquals(257, s1._getSheetNumber());
-		assertEquals(6, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-		assertEquals(256, s2._getSheetNumber());
-		assertEquals(4, s2._getSheetRefId());
-		assertEquals(2, s2.getSlideNumber());
-	}
-
-	/**
-	 * Test doing a dummy re-order on a slideshow with
-	 *  three slides in it
-	 */
-    @Test
-	public void testReOrder3() throws Exception {
-		// Has three slides
-		assertEquals(3, ss_three.getSlides().size());
-		HSLFSlide s1 = ss_three.getSlides().get(0);
-		HSLFSlide s2 = ss_three.getSlides().get(1);
-		HSLFSlide s3 = ss_three.getSlides().get(2);
-
-		// Check slide 1 is as expected
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(3, s1._getSheetRefId()); // no notes on master
-		assertEquals(1, s1.getSlideNumber());
-		// Check slide 2 is as expected (was re-ordered from 3)
-		assertEquals(258, s2._getSheetNumber());
-		assertEquals(5, s2._getSheetRefId()); // no notes on slide
-		assertEquals(2, s2.getSlideNumber());
-		// Check slide 3 is as expected (was re-ordered from 2)
-		assertEquals(257, s3._getSheetNumber());
-		assertEquals(4, s3._getSheetRefId()); // no notes on slide
-		assertEquals(3, s3.getSlideNumber());
-
-		// Don't swap them around
-		ss_three.reorderSlide(2, 2);
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_three.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it still has 3 slides
-		assertEquals(3, ss_read.getSlides().size());
-
-		// And check it's as expected
-		s1 = ss_read.getSlides().get(0);
-		s2 = ss_read.getSlides().get(1);
-		s3 = ss_read.getSlides().get(2);
-
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(3, s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-		assertEquals(258, s2._getSheetNumber());
-		assertEquals(5, s2._getSheetRefId());
-		assertEquals(2, s2.getSlideNumber());
-		assertEquals(257, s3._getSheetNumber());
-		assertEquals(4, s3._getSheetRefId());
-		assertEquals(3, s3.getSlideNumber());
-	}
-
-	/**
-	 * Test re-ordering slides in a slideshow with 3 slides on it
-	 */
-    @Test
-	public void testReOrder3swap() throws Exception {
-		// Has three slides
-		assertEquals(3, ss_three.getSlides().size());
-		HSLFSlide s1 = ss_three.getSlides().get(0);
-		HSLFSlide s2 = ss_three.getSlides().get(1);
-		HSLFSlide s3 = ss_three.getSlides().get(2);
-
-		// Check slide 1 is as expected
-		assertEquals(256, s1._getSheetNumber());
-		assertEquals(3, s1._getSheetRefId()); // no notes on master
-		assertEquals(1, s1.getSlideNumber());
-		// Check slide 2 is as expected (was re-ordered from 3)
-		assertEquals(258, s2._getSheetNumber());
-		assertEquals(5, s2._getSheetRefId()); // no notes on slide
-		assertEquals(2, s2.getSlideNumber());
-		// Check slide 3 is as expected (was re-ordered from 2)
-		assertEquals(257, s3._getSheetNumber());
-		assertEquals(4, s3._getSheetRefId()); // no notes on slide
-		assertEquals(3, s3.getSlideNumber());
-
-		// Put 3 in place of 1
-		// (1 -> 2, 2 -> 3)
-		ss_three.reorderSlide(3, 1);
-
-		// refresh the slides
-		s1 = ss_three.getSlides().get(0);
-        s2 = ss_three.getSlides().get(1);
-        s3 = ss_three.getSlides().get(2);
-		
-		assertEquals(1, s1.getSlideNumber());
-        assertEquals(2, s2.getSlideNumber());
-        assertEquals(3, s3.getSlideNumber());
-        
-        assertEquals("Slide 3", ((HSLFTextShape)s1.getShapes().get(0)).getText());
-        assertEquals("Slide 1", ((HSLFTextShape)s3.getShapes().get(0)).getText());
-
-		// Write out, and read back in
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		hss_three.write(baos);
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-		HSLFSlideShowImpl hss_read = new HSLFSlideShowImpl(bais);
-		HSLFSlideShow ss_read = new HSLFSlideShow(hss_read);
-
-		// Check it still has 3 slides
-		assertEquals(3, ss_read.getSlides().size());
-
-		// And check it's as expected
-		HSLFSlide _s1 = ss_read.getSlides().get(0);
-		HSLFSlide _s2 = ss_read.getSlides().get(1);
-		HSLFSlide _s3 = ss_read.getSlides().get(2);
-
-        // 1 --> 3
-        assertEquals(s1._getSheetNumber(), _s1._getSheetNumber());
-		assertEquals(s1._getSheetRefId(), _s1._getSheetRefId());
-		assertEquals(1, s1.getSlideNumber());
-
-        // 2nd slide is not updated
-        assertEquals(s2._getSheetNumber(), _s2._getSheetNumber());
-        assertEquals(s2._getSheetRefId(), _s2._getSheetRefId());
-		assertEquals(2, s2.getSlideNumber());
-
-        // 3 --> 1
-        assertEquals(s3._getSheetNumber(), _s3._getSheetNumber());
-        assertEquals(s3._getSheetRefId(), _s3._getSheetRefId());
-		assertEquals(3, s3.getSlideNumber());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
deleted file mode 100644
index b707df2..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.*;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that the record setup done by SlideShow
- *  has worked correctly
- * Note: most recent record stuff has its own test
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestRecordSetup {
-	// SlideShow primed on the test data
-	@SuppressWarnings("unused")
-    private HSLFSlideShow ss;
-	private HSLFSlideShowImpl hss;
-
-	@Before
-	public void init() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss = new HSLFSlideShow(hss);
-	}
-
-	@Test
-	public void testHandleParentAwareRecords() {
-		Record[] records = hss.getRecords();
-		for (Record record : records) {
-			ensureParentAware(record,null);
-		}
-	}
-	private void ensureParentAware(Record r,RecordContainer parent) {
-		if(r instanceof ParentAwareRecord) {
-			ParentAwareRecord pr = (ParentAwareRecord)r;
-			assertEquals(parent, pr.getParentRecord());
-		}
-		if(r instanceof RecordContainer) {
-			RecordContainer rc = (RecordContainer)r;
-			Record[] children = rc.getChildRecords();
-			for (Record rec : children) {
-				ensureParentAware(rec, rc);
-			}
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
deleted file mode 100644
index ce49cd5..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
+++ /dev/null
@@ -1,657 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.*;
-import static org.apache.poi.POITestCase.assertContains;
-
-import java.io.*;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test that the friendly getters and setters on RichTextRun
- *  behave as expected.
- * (model.TestTextRun tests the other functionality)
- */
-public final class TestRichTextRun {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    // SlideShow primed on the test data
-    private HSLFSlideShow ss;
-    private HSLFSlideShow ssRichA;
-    private HSLFSlideShow ssRichB;
-    private HSLFSlideShow ssRichC;
-    private HSLFSlideShow ssChinese;
-    private HSLFSlideShowImpl hss;
-    private HSLFSlideShowImpl hssRichA;
-    private HSLFSlideShowImpl hssRichB;
-    private HSLFSlideShowImpl hssRichC;
-    private HSLFSlideShowImpl hssChinese;
-    private static String filenameC;
-
-    @Before
-    public void setUp() throws Exception {
-        // Basic (non rich) test file
-        hss = new HSLFSlideShowImpl(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-        ss = new HSLFSlideShow(hss);
-
-        // Rich test file A
-        hssRichA = new HSLFSlideShowImpl(_slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
-        ssRichA = new HSLFSlideShow(hssRichA);
-        
-        // Rich test file B
-        hssRichB = new HSLFSlideShowImpl(_slTests.openResourceAsStream("Single_Coloured_Page_With_Fonts_and_Alignments.ppt"));
-        ssRichB = new HSLFSlideShow(hssRichB);
-        
-        // Rich test file C - has paragraph styles that run out before
-        //   the character ones do
-        filenameC = "ParagraphStylesShorterThanCharStyles.ppt";
-        hssRichC = new HSLFSlideShowImpl(_slTests.openResourceAsStream(filenameC));
-        ssRichC = new HSLFSlideShow(hssRichC);
-        
-        // Rich test file with Chinese + English text in it
-        hssChinese = new HSLFSlideShowImpl(_slTests.openResourceAsStream("54880_chinese.ppt"));
-        ssChinese = new HSLFSlideShow(hssChinese);
-    }
-
-	/**
-	 * Test the stuff about getting/setting bold
-	 *  on a non rich text run
-	 */
-    @Test
-	public void testBoldNonRich() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-		List<HSLFTextParagraph> textParas = textParass.get(0);
-		HSLFTextRun rtr = textParas.get(0).getTextRuns().get(0);
-
-		assertNotNull(rtr.getCharacterStyle());
-		assertNotNull(textParas.get(0).getParagraphStyle());
-		assertFalse(rtr.isBold());
-
-		// Now set it to not bold
-		rtr.setBold(false);
-		// in Pre 3.12: setting bold=false doesn't change the internal state
-		// now: also allow explicitly disable styles and there aren't any non rich text runs anymore
-		assertNotNull(rtr.getCharacterStyle());
-		assertNotNull(textParas.get(0).getParagraphStyle());
-
-		assertFalse(rtr.isBold());
-
-		// And now make it bold
-		rtr.setBold(true);
-		assertNotNull(rtr.getCharacterStyle());
-        assertNotNull(textParas.get(0).getParagraphStyle());
-		assertTrue(rtr.isBold());
-	}
-
-	/**
-	 * Test the stuff about getting/setting bold
-	 *  on a rich text run
-	 */
-    @Test
-	public void testBoldRich() {
-		HSLFSlide slideOneR = ssRichA.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOneR.getTextParagraphs();
-		List<HSLFTextParagraph> textParas = textParass.get(1);
-		assertEquals(3, textParas.size());
-
-		assertTrue(textParas.get(0).getTextRuns().get(0).isBold());
-		assertFalse(textParas.get(1).getTextRuns().get(0).isBold());
-		assertFalse(textParas.get(2).getTextRuns().get(0).isBold());
-
-		textParas.get(0).getTextRuns().get(0).setBold(true);
-		textParas.get(1).getTextRuns().get(0).setBold(true);
-
-		assertTrue(textParas.get(0).getTextRuns().get(0).isBold());
-		assertTrue(textParas.get(1).getTextRuns().get(0).isBold());
-
-		textParas.get(0).getTextRuns().get(0).setBold(false);
-		textParas.get(1).getTextRuns().get(0).setBold(false);
-
-		assertFalse(textParas.get(0).getTextRuns().get(0).isBold());
-		assertFalse(textParas.get(1).getTextRuns().get(0).isBold());
-	}
-
-	/**
-	 * Tests getting and setting the font size on rich and non
-	 *  rich text runs
-	 */
-    @Test
-	public void testFontSize() {
-
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-		HSLFTextRun rtr = textParass.get(0).get(0).getTextRuns().get(0);
-
-		HSLFSlide slideOneR = ssRichB.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParassR = slideOneR.getTextParagraphs();
-		HSLFTextRun rtrRa = textParassR.get(0).get(0).getTextRuns().get(0);
-		HSLFTextRun rtrRb = textParassR.get(1).get(0).getTextRuns().get(0);
-		HSLFTextRun rtrRc = textParassR.get(1).get(3).getTextRuns().get(0);
-
-		String defaultFont = "Arial";
-
-		// Start off with rich one
-		// First run has defaults
-		assertEquals(44, rtrRa.getFontSize(), 0);
-		assertEquals(defaultFont, rtrRa.getFontFamily());
-
-		// Second is size 20, default font
-		assertEquals(20, rtrRb.getFontSize(), 0);
-		assertEquals(defaultFont, rtrRb.getFontFamily());
-		// Third is size 24, alt font
-		assertEquals(24, rtrRc.getFontSize(), 0);
-		assertEquals("Times New Roman", rtrRc.getFontFamily());
-
-		// Change 2nd to different size and font
-		assertEquals(2, ssRichB.getFontCollection().getChildRecords().length); // Default + TNR
-		rtrRb.setFontSize(18d);
-		rtrRb.setFontFamily("Courier");
-		assertEquals(3, ssRichB.getFontCollection().getChildRecords().length); // Default + TNR + Courier
-		assertEquals(18, rtrRb.getFontSize(), 0);
-		assertEquals("Courier", rtrRb.getFontFamily());
-
-
-		// Now do non rich one
-		assertEquals(44, rtr.getFontSize(), 0);
-		assertEquals(defaultFont, rtr.getFontFamily());
-		assertEquals(1, ss.getFontCollection().getChildRecords().length); // Default
-		assertNotNull(rtr.getCharacterStyle());
-		assertNotNull(rtr.getTextParagraph().getParagraphStyle());
-
-		// Change Font size
-		rtr.setFontSize(99d);
-		assertEquals(99, rtr.getFontSize(), 0);
-		assertEquals(defaultFont, rtr.getFontFamily());
-		assertNotNull(rtr.getCharacterStyle());
-		assertNotNull(rtr.getTextParagraph().getParagraphStyle());
-		assertEquals(1, ss.getFontCollection().getChildRecords().length); // Default
-
-		// Change Font size and name
-		rtr.setFontSize(25d);
-		rtr.setFontFamily("Times New Roman");
-		assertEquals(25, rtr.getFontSize(), 0);
-		assertEquals("Times New Roman", rtr.getFontFamily());
-		assertNotNull(rtr.getCharacterStyle());
-		assertNotNull(rtr.getTextParagraph().getParagraphStyle());
-		assertEquals(2, ss.getFontCollection().getChildRecords().length);
-	}
-
-    @Test
-	public void testChangeWriteRead() throws Exception {
-		for(HSLFSlideShow h : new HSLFSlideShow[] { ss, ssRichA, ssRichB }) {
-			// Change
-			HSLFSlide slideOne = h.getSlides().get(0);
-			List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-			HSLFTextRun rtr = textParass.get(0).get(0).getTextRuns().get(0);
-			
-			rtr.setBold(true);
-			rtr.setFontSize(18d);
-			rtr.setFontFamily("Courier");
-            HSLFTextParagraph.storeText(textParass.get(0));
-
-			// Check it took those
-			assertTrue(rtr.isBold());
-			assertEquals(18., rtr.getFontSize(), 0);
-			assertEquals("Courier", rtr.getFontFamily());
-
-			// Write out and back in
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			h.write(baos);
-			ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-			HSLFSlideShowImpl readHSLF = new HSLFSlideShowImpl(bais);
-			HSLFSlideShow readS = new HSLFSlideShow(readHSLF);
-
-			// Tweak existing one again, to ensure really worked
-			rtr.setBold(false);
-			rtr.setFontSize(17d);
-			rtr.setFontFamily("CourierZZ");
-
-			// Check it took those changes
-			assertFalse(rtr.isBold());
-			assertEquals(17., rtr.getFontSize(), 0);
-			assertEquals("CourierZZ", rtr.getFontFamily());
-
-
-			// Now, look at the one we changed, wrote out, and read back in
-			// Ensure it does contain our original modifications
-			HSLFSlide slideOneRR = readS.getSlides().get(0);
-			List<List<HSLFTextParagraph>> textParassRR = slideOneRR.getTextParagraphs();
-			HSLFTextRun rtrRRa = textParassRR.get(0).get(0).getTextRuns().get(0);
-
-			assertTrue(rtrRRa.isBold());
-			assertEquals(18., rtrRRa.getFontSize(), 0);
-			assertEquals("Courier", rtrRRa.getFontFamily());
-		}
-	}
-
-	/**
-	 * Test that we can do the right things when the paragraph styles
-	 *  run out before the character styles do
-	 */
-    @Test
-	public void testParagraphStylesShorterTheCharStyles() {
-		// Check we have the right number of sheets
-		List<HSLFSlide> slides = ssRichC.getSlides();
-		assertEquals(14, slides.size());
-
-		// Check the number of text runs on interesting sheets
-		HSLFSlide slideThreeC = ssRichC.getSlides().get(2);
-		HSLFSlide slideSevenC = ssRichC.getSlides().get(6);
-		assertEquals(4, slideThreeC.getTextParagraphs().size());
-		assertEquals(5, slideSevenC.getTextParagraphs().size());
-
-		// On slide three, we should have:
-		// TR:
-		//   You are an important supplier of various items that I need
-		//   .
-		// TR:
-		//   Source: Internal focus groups
-		// TR:
-		//   Illustrative Example
-		//   .
-
-        List<List<HSLFTextParagraph>> s3tr = slideThreeC.getTextParagraphs();
-		List<HSLFTextRun> s3rtr0 = s3tr.get(0).get(0).getTextRuns();
-		List<HSLFTextRun> s3rtr1 = s3tr.get(2).get(0).getTextRuns();
-		List<HSLFTextRun> s3rtr2 = s3tr.get(3).get(0).getTextRuns();
-
-		assertEquals(2, s3rtr0.size());
-		assertEquals(1, s3rtr1.size());
-		assertEquals(2, s3rtr2.size());
-
-		assertEquals("You are an important supplier of various items that I need", s3rtr0.get(0).getRawText());
-		assertEquals("", s3rtr0.get(1).getRawText());
-		assertEquals("Source: Internal focus groups", s3rtr1.get(0).getRawText());
-		assertEquals("Illustrative Example", s3rtr2.get(0).getRawText());
-		assertEquals("", s3rtr2.get(1).getRawText());
-
-		// On slide seven, we have:
-		// TR:
-		//  (text)
-		// TR:
-		//  <ps>(text a)</ps><ps>(text a)(text b)</ps>
-		// TR:
-		//  (text)
-		List<List<HSLFTextParagraph>> s7tr = slideSevenC.getTextParagraphs();
-		List<HSLFTextParagraph> s7rtr0 = s7tr.get(0);
-		List<HSLFTextParagraph> s7rtr1 = s7tr.get(1);
-		List<HSLFTextParagraph> s7rtr2 = s7tr.get(2);
-
-		assertEquals(1, s7rtr0.size());
-		assertEquals(8, s7rtr1.size());
-		assertEquals(1, s7rtr2.size());
-	}
-
-	/**
-	 * Test that we can do the right things when the paragraph styles
-	 *  run out before the character styles do, when we tweak something
-	 *  and write back out.
-	 */
-    @Test
-	@SuppressWarnings("unused")
-    public void testParagraphStylesShorterTheCharStylesWrite() throws Exception {
-		assertMatchesSLTWC(ssRichC);
-		assertMatchesFileC(ssRichC);
-
-		HSLFSlide slideSevenC = ssRichC.getSlides().get(6);
-		List<List<HSLFTextParagraph>> s7tr = slideSevenC.getTextParagraphs();
-		List<HSLFTextRun> s7rtr0 = s7tr.get(0).get(0).getTextRuns();
-		List<HSLFTextRun> s7rtr1 = s7tr.get(1).get(0).getTextRuns();
-		List<HSLFTextRun> s7rtr2 = s7tr.get(2).get(0).getTextRuns();
-
-		String oldText;
-
-		// Reset the text on the last run
-		// Need to ensure it's a run that really has styles!
-		oldText = s7rtr2.get(0).getRawText();
-		s7rtr2.get(0).setText( oldText );
-		HSLFTextParagraph.storeText(s7tr.get(2));
-		assertEquals(oldText, s7rtr2.get(0).getRawText());
-		assertEquals(oldText, HSLFTextParagraph.getRawText(s7tr.get(2)));
-		assertEquals(oldText.length() + 1, s7rtr2.get(0).getCharacterStyle().getCharactersCovered());
-		assertEquals(oldText.length() + 1, s7rtr2.get(0).getTextParagraph().getParagraphStyle().getCharactersCovered());
-		assertMatchesSLTWC(ssRichC);
-		assertMatchesFileC(ssRichC);
-
-		// Reset the text on a shared paragraph
-		oldText = s7rtr1.get(0).getRawText();
-		s7rtr1.get(0).setText( oldText );
-        HSLFTextParagraph.storeText(s7tr.get(1));
-		assertEquals(oldText, s7rtr1.get(0).getRawText());
-		assertEquals(oldText.length(), s7rtr1.get(0).getCharacterStyle().getCharactersCovered());
-		assertMatchesSLTWC(ssRichC);
-		assertMatchesFileC(ssRichC);
-
-		// Reset the text on a shared paragraph+character
-		s7rtr1.get(0).setText( s7rtr1.get(0).getRawText() );
-		HSLFTextParagraph.storeText(s7tr.get(1));
-		assertMatchesSLTWC(ssRichC);
-		assertMatchesFileC(ssRichC);
-	}
-
-	/**
-	 * Opens a new copy of SlideShow C, writes the active
-	 *  SlideListWithText out, and compares it to the write
-	 *  out of the supplied SlideShow. Also compares the
-	 *  contents.
-	 * @param s
-	 */
-	private void assertMatchesSLTWC(HSLFSlideShow s) throws Exception {
-		// Grab a new copy of slideshow C
-		HSLFSlideShow refC = new HSLFSlideShow(_slTests.openResourceAsStream(filenameC));
-
-		// Write out the 2nd SLWT in the active document
-		SlideListWithText refSLWT = refC.getDocumentRecord().getSlideListWithTexts()[1];
-		byte[] raw_slwt = writeRecord(refSLWT);
-
-		// Write out the same for the supplied slideshow
-		SlideListWithText s_SLWT = s.getDocumentRecord().getSlideListWithTexts()[1];
-		byte[] s_slwt = writeRecord(s_SLWT);
-
-		// Check the records are the same
-		assertEquals(refSLWT.getChildRecords().length, s_SLWT.getChildRecords().length);
-		for(int i=0; i<refSLWT.getChildRecords().length; i++) {
-			Record ref_r = refSLWT.getChildRecords()[i];
-			Record s_r = s_SLWT.getChildRecords()[i];
-
-			byte[] r_rb = writeRecord(ref_r);
-			byte[] s_rb = writeRecord(s_r);
-			assertArrayEquals(r_rb, s_rb);
-		}
-
-		// Check the bytes are the same
-		assertArrayEquals(raw_slwt, s_slwt);
-	}
-
-	/**
-	 * Checks that the supplied slideshow still matches the bytes
-	 *  of slideshow c
-	 */
-	private static void assertMatchesFileC(HSLFSlideShow s) throws Exception {
-		// Grab the bytes of the file
-	    NPOIFSFileSystem fs = new NPOIFSFileSystem(_slTests.getFile(filenameC));
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    InputStream is = fs.createDocumentInputStream("PowerPoint Document");
-	    IOUtils.copy(is, baos);
-	    is.close();
-	    fs.close();
-	    byte[] raw_file = baos.toByteArray();
-
-		// Now write out the slideshow
-		baos.reset();
-		s.write(baos);
-		fs = new NPOIFSFileSystem(new ByteArrayInputStream(baos.toByteArray()));
-		baos.reset();
-		is = fs.createDocumentInputStream("PowerPoint Document");
-        IOUtils.copy(is, baos);
-        is.close();
-        fs.close();		
-		byte[] raw_ss = baos.toByteArray();
-		
-		// different paragraph mask, because of sanitizing
-		raw_ss[169030] = 0x0a;
-		
-		// Ensure they're the same
-		assertArrayEquals(raw_file, raw_ss);
-	}
-
-	private byte[] writeRecord(Record r) throws Exception {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		r.writeOut(baos);
-		return baos.toByteArray();
-	}
-
-    @Test
-	public void testIndentationLevel() throws Exception {
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("ParagraphStylesShorterThanCharStyles.ppt"));
-		for (HSLFSlide sl : ppt.getSlides()) {
-			for (List<HSLFTextParagraph> txt : sl.getTextParagraphs()) {
-				for (HSLFTextParagraph p : txt) {
-					int indent = p.getIndentLevel();
-					assertTrue(indent >= 0 && indent <= 4 );
-				}
-
-			}
-		}
-	}
-
-    @Test
-	public void testReadParagraphStyles() throws Exception {
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("bullets.ppt"));
-		assertTrue("No Exceptions while reading file", true);
-
-		HSLFTextParagraph rt;
-		List<List<HSLFTextParagraph>> txt;
-		List<HSLFSlide> slide = ppt.getSlides();
-		assertEquals(2, slide.size());
-
-		txt = slide.get(0).getTextParagraphs();
-		assertEquals(2, txt.size());
-
-		assertEquals("Title text", HSLFTextParagraph.getRawText(txt.get(0)));
-		assertEquals(1, txt.get(0).size());
-		rt = txt.get(0).get(0);
-		assertFalse(rt.isBullet());
-
-		String expected =
-	        "This is a text placeholder that \r" +
-            "follows the design pattern\r" +
-            "Defined in the slide master\r" +
-            "and has bullets by default";
-		assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(1)));
-		assertEquals(4, txt.get(1).size());
-		rt = txt.get(1).get(0);
-		assertEquals('\u2022', (char)rt.getBulletChar());
-		assertTrue(rt.isBullet());
-
-
-		txt = slide.get(1).getTextParagraphs();
-		assertEquals(2, txt.size());
-
-		expected =
-	        "I\u2019m a text box\r" +
-            "With bullets\r" +
-            "That follow the design pattern\r" +
-            "From the slide master";
-		assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(0)));
-		assertEquals(4, txt.get(0).size());
-		rt = txt.get(0).get(0);
-		assertTrue(rt.isBullet());
-		assertEquals('\u2022', (char)rt.getBulletChar());
-
-		expected =
-            "I\u2019m a text box with user-defined\r" +
-            "bullet character";
-        assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(1)));
-		assertEquals(2, txt.get(1).size());
-		rt = txt.get(1).get(0);
-		assertTrue(rt.isBullet());
-		assertEquals('\u263A', (char)rt.getBulletChar());
-	}
-
-    @Test
-	public void testSetParagraphStyles() throws Exception {
-		HSLFSlideShow ppt = new HSLFSlideShow();
-
-		HSLFSlide slide = ppt.createSlide();
-
-		HSLFTextBox shape = new HSLFTextBox();
-		shape.setText(
-				"Hello, World!\r" +
-				"This should be\r" +
-				"Multiline text");
-        HSLFTextParagraph rt = shape.getTextParagraphs().get(0);
-        HSLFTextRun tr = rt.getTextRuns().get(0);
-		tr.setFontSize(42d);
-		rt.setBullet(true);
-		rt.setLeftMargin(50d);
-		rt.setIndent(0d);
-		rt.setBulletChar('\u263A');
-		slide.addShape(shape);
-
-		assertEquals(42.0, tr.getFontSize(), 0);
-		assertEquals(true, rt.isBullet());
-		assertEquals(50.0, rt.getLeftMargin(), 0);
-		assertEquals(0, rt.getIndent(), 0);
-		assertEquals('\u263A', (char)rt.getBulletChar());
-
-		shape.setAnchor(new java.awt.Rectangle(50, 50, 500, 300));
-		slide.addShape(shape);
-
-		//serialize and read again
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		ppt.write(out);
-		out.close();
-
-		ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-		slide = ppt.getSlides().get(0);
-		shape = (HSLFTextBox)slide.getShapes().get(0);
-		rt = shape.getTextParagraphs().get(0);
-		tr = rt.getTextRuns().get(0);
-		assertEquals(42.0, tr.getFontSize(), 0);
-		assertEquals(true, rt.isBullet());
-		assertEquals(50.0, rt.getLeftMargin(), 0);
-		assertEquals(0, rt.getIndent(), 0);
-		assertEquals('\u263A', (char)rt.getBulletChar());
-	}
-
-    @Test
-	public void testAddText() throws Exception {
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("bullets.ppt"));
-		assertTrue("No Exceptions while reading file", true);
-
-		HSLFTextParagraph rt;
-		HSLFTextRun tr;
-		List<List<HSLFTextParagraph>> txt;
-		List<HSLFSlide> slides = ppt.getSlides();
-
-		assertEquals(2, slides.size());
-		txt = slides.get(0).getTextParagraphs();
-		assertEquals(2, txt.size());
-
-		assertEquals("Title text", HSLFTextParagraph.getRawText(txt.get(0)));
-		assertEquals(1, txt.get(0).size());
-		rt = txt.get(0).get(0);
-		assertFalse(rt.isBullet());
-
-		// Add some new text
-		HSLFTextParagraph.appendText(txt.get(0), "Foo! I'm new!", true);
-		assertEquals(2, txt.get(0).size());
-
-		rt = txt.get(0).get(0);
-		tr = rt.getTextRuns().get(0);
-		assertFalse(tr.isBold());
-		assertEquals("Title text\r", tr.getRawText());
-		rt = txt.get(0).get(1);
-		tr = rt.getTextRuns().get(0);
-		assertFalse(tr.isBold());
-		assertEquals("Foo! I'm new!", tr.getRawText());
-		tr.setBold(true);
-		HSLFTextParagraph.storeText(txt.get(0));
-
-		// And some more, attributes will be copied from previous run
-		HSLFTextParagraph.appendText(txt.get(0), "Me too!", true);
-		HSLFTextParagraph.storeText(txt.get(0));
-		assertEquals(3, txt.get(0).size());
-		rt = txt.get(0).get(0);
-		tr = rt.getTextRuns().get(0);
-		assertFalse(tr.isBold());
-		assertEquals("Title text\r", tr.getRawText());
-		rt = txt.get(0).get(1);
-		tr = rt.getTextRuns().get(0);
-		assertTrue(tr.isBold());
-		assertEquals("Foo! I'm new!\r", tr.getRawText());
-		rt = txt.get(0).get(2);
-		tr = rt.getTextRuns().get(0);
-		assertTrue(tr.isBold());
-		assertEquals("Me too!", tr.getRawText());
-
-		// Save and re-open
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		ppt.write(out);
-		out.close();
-
-		ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-		slides = ppt.getSlides();
-
-		assertEquals(2, slides.size());
-
-		txt = slides.get(0).getTextParagraphs();
-		assertEquals(2, txt.size());
-		assertEquals(3, txt.get(0).size());
-		rt = txt.get(0).get(0);
-		tr = rt.getTextRuns().get(0);
-		assertFalse(tr.isBold());
-		assertEquals("Title text\r", tr.getRawText());
-		rt = txt.get(0).get(1);
-		tr = rt.getTextRuns().get(0);
-		assertTrue(tr.isBold());
-		assertEquals("Foo! I'm new!\r", tr.getRawText());
-		rt = txt.get(0).get(2);
-		tr = rt.getTextRuns().get(0);
-		assertTrue(tr.isBold());
-		assertEquals("Me too!", tr.getRawText());
-
-//		FileOutputStream fout = new FileOutputStream("/tmp/foo.ppt");
-//		ppt.write(fout);
-	}
-	
-    @Test
-	public void testChineseParagraphs() throws Exception {
-      List<HSLFTextRun> rts;
-      HSLFTextRun rt;
-      List<List<HSLFTextParagraph>> txt;
-      List<HSLFSlide> slides = ssChinese.getSlides();
-
-      // One slide
-      assertEquals(1, slides.size());
-      
-      // One block of text within that
-      txt = slides.get(0).getTextParagraphs();
-      assertEquals(1, txt.size());
-      
-      // One rich block of text in that - text is all the same style
-      // TODO Is this completely correct?
-      rts = txt.get(0).get(0).getTextRuns();
-      assertEquals(1, rts.size());
-      rt = rts.get(0);
-      
-      // Check we can get the english text out of that
-      String text = rt.getRawText();
-      assertContains(text, "Single byte");
-      // And the chinese
-      assertContains(txt.get(0).get(3).getTextRuns().get(0).getRawText(), "\uff8a\uff9d\uff76\uff78");
-      
-      // It isn't bold or italic
-      assertFalse(rt.isBold());
-      assertFalse(rt.isItalic());
-      
-      // Font is Calibri
-      assertEquals("Calibri", rt.getFontFamily());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
deleted file mode 100644
index 9c8f3e1..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that SlideShow returns Sheets which have the right text in them
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestSheetText {
-	// SlideShow primed on the test data
-	private HSLFSlideShow ss;
-
-	@Before
-	public void init() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ss = new HSLFSlideShow(hss);
-	}
-
-	@Test
-	public void testSheetOne() {
-		HSLFSheet slideOne = ss.getSlides().get(0);
-
-		String[] expectText = new String[] {"This is a test title","This is a test subtitle\rThis is on page 1"};
-		assertEquals(expectText.length, slideOne.getTextParagraphs().size());
-		int i = 0;
-		for(List<HSLFTextParagraph> textParas : slideOne.getTextParagraphs()) {
-			assertEquals(expectText[i++], HSLFTextParagraph.getRawText(textParas));
-		}
-	}
-
-	public void testSheetTwo() {
-		HSLFSheet slideTwo = ss.getSlides().get(1);
-		String[] expectText = new String[] {"This is the title on page 2","This is page two\rIt has several blocks of text\rNone of them have formatting"};
-		assertEquals(expectText.length, slideTwo.getTextParagraphs().size());
-        int i = 0;
-        for(List<HSLFTextParagraph> textParas : slideTwo.getTextParagraphs()) {
-            assertEquals(expectText[i++], HSLFTextParagraph.getRawText(textParas));
-        }
-	}
-
-	/**
-	 * Check we can still get the text from a file where the
-	 *  TextProps don't have enough data.
-	 * (Make sure we don't screw up / throw an exception etc)
-	 */
-	public void testWithShortTextPropData() throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-		HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("iisd_report.ppt"));
-		HSLFSlideShow sss = new HSLFSlideShow(hss);
-
-		// Should come out with 10 slides, no notes
-		assertEquals(10, sss.getSlides().size());
-		assertEquals(0, sss.getNotes().size());
-
-		// Check text on first slide
-		HSLFSlide s = sss.getSlides().get(0);
-		String exp =
-			"Realizing the Development Dividend:\n" +
-			"Community Capacity Building and CDM.\n" +
-			"Can they co-exist?\n\n" +
-			"Gay Harley\n" +
-			"Clean Development Alliance\n" +
-			"COP 11 \u2013 MOP 1\n" + // special long hyphen
-			"December 5, 2005\n";
-
-		assertEquals(1, s.getTextParagraphs().size());
-		assertEquals(exp, HSLFTextParagraph.getRawText(s.getTextParagraphs().get(0)));
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
deleted file mode 100644
index e1a6a60..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that SlideShow returns Sheets in the right order
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestSlideOrdering {
-    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-	// Simple slideshow, record order matches slide order
-	private HSLFSlideShow ssA;
-	// Complex slideshow, record order doesn't match slide order
-	private HSLFSlideShow ssB;
-
-	@Before
-	public void init() throws Exception {
-		HSLFSlideShowImpl hssA = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-		ssA = new HSLFSlideShow(hssA);
-
-		HSLFSlideShowImpl hssB = new HSLFSlideShowImpl(slTests.openResourceAsStream("incorrect_slide_order.ppt"));
-		ssB = new HSLFSlideShow(hssB);
-	}
-
-	/**
-	 * Test the simple case - record order matches slide order
-	 */
-	@Test
-	public void testSimpleCase() {
-		assertEquals(2, ssA.getSlides().size());
-
-		HSLFSlide s1 = ssA.getSlides().get(0);
-		HSLFSlide s2 = ssA.getSlides().get(1);
-
-		String[] firstTRs = new String[] { "This is a test title", "This is the title on page 2" };
-
-		assertEquals(firstTRs[0], HSLFTextParagraph.getRawText(s1.getTextParagraphs().get(0)));
-		assertEquals(firstTRs[1], HSLFTextParagraph.getRawText(s2.getTextParagraphs().get(0)));
-	}
-
-	/**
-	 * Test the complex case - record order differs from slide order
-	 */
-    @Test
-	public void testComplexCase() {
-		assertEquals(3, ssB.getSlides().size());
-		int i=1;
-		for (HSLFSlide s : ssB.getSlides()) {
-		    assertEquals("Slide "+(i++), HSLFTextParagraph.getRawText(s.getTextParagraphs().get(0)));
-		}
-	}
-
-	/**
-	 * Assert that the order of slides is correct.
-	 *
-	 * @param filename
-	 *            file name of the slide show to assert
-	 * @param titles
-	 *            array of reference slide titles
-	 */
-	protected void assertSlideOrdering(String filename, String[] titles) throws Exception {
-        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-        HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream(filename));
-		List<HSLFSlide> slide = ppt.getSlides();
-
-		assertEquals(titles.length, slide.size());
-		for (int i = 0; i < slide.size(); i++) {
-			String title = slide.get(i).getTitle();
-			assertEquals("Wrong slide title in " + filename, titles[i], title);
-		}
-	}
-
-    @Test
-	public void testTitles() throws Exception {
-		assertSlideOrdering("basic_test_ppt_file.ppt", new String[] {
-				"This is a test title", "This is the title on page 2" });
-
-		assertSlideOrdering("incorrect_slide_order.ppt", new String[] { "Slide 1",
-				"Slide 2", "Slide 3" });
-
-		assertSlideOrdering("next_test_ppt_file.ppt", new String[] {
-				"This is a test title", "This is the title on page 2" });
-
-		assertSlideOrdering("Single_Coloured_Page.ppt",
-				new String[] { "This is a title, it" + (char) 0x2019 + "s in black" });
-
-		assertSlideOrdering("Single_Coloured_Page_With_Fonts_and_Alignments.ppt",
-				new String[] { "This is a title, it" + (char) 0x2019 + "s in black" });
-
-		assertSlideOrdering(
-				"ParagraphStylesShorterThanCharStyles.ppt",
-				new String[] {
-						"ROMANCE: AN ANALYSIS",
-						"AGENDA",
-						"You are an important supplier of various items that I need",
-						'\n' + "Although The Psycho set back my relationship process, recovery is luckily enough under way",
-						"Since the time that we seriously go out together, you rank highly among existing relationships",
-						"Although our personal interests are mostly compatible, the greatest gap exists in Sex and Shopping",
-						"Your physical characteristics are strong when compared with your competition",
-						"The combination of your high physical appearance and personality rank you highly, although your sister is also a top prospect",
-						"When people found out that we were going out, their responses have been mixed",
-						"The benchmark of relationship lifecycles, suggests that we are on schedule",
-						"In summary we can say that we are on the right track, but we must remain aware of possible roadblocks ",
-						"THE ANSWER",
-						"Unfortunately a huge disconnect exists between my needs and your existing service",
-						"SUMMARY", });
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
deleted file mode 100644
index 9bbec5a..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-
-/**
- * Test reading sound data from a ppt
- *
- * @author Yegor Kozlov
- */
-public final class TestSoundData extends TestCase{
-    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
-    /**
-     * Read a reference sound file from disk and compare it from the data extracted from the slide show
-     */
-    public void testSounds() throws Exception {
-        //read the reference sound file
-        byte[] ref_data = slTests.readFile("ringin.wav");
-
-        HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream("sound.ppt"));
-
-        HSLFSoundData[] sound = ppt.getSoundData();
-        assertEquals("Expected 1 sound", 1, sound.length);
-
-        assertArrayEquals(ref_data, sound[0].getData());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
deleted file mode 100644
index a151db2..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.sl.draw.DrawTableShape;
-import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.junit.Test;
-
-
-/**
- * Table related tests
- */
-public class TestTable {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void moveTable() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide = ppt.createSlide();
-        int rows = 3, cols = 5;
-        HSLFTable table = slide.createTable(rows, cols);
-        for (int row=0; row<rows; row++) {
-            for (int col=0; col<cols; col++) {
-                HSLFTableCell c = table.getCell(row, col);
-                c.setText("r"+row+"c"+col);
-            }
-        }
-
-        new DrawTableShape(table).setAllBorders(1.0, Color.black, StrokeStyle.LineDash.DASH_DOT);
-
-        table.setAnchor(new Rectangle2D.Double(100, 100, 400, 400));
-
-        Rectangle2D rectExp = new Rectangle2D.Double(420,366.625,80,133.375);
-        Rectangle2D rectAct = table.getCell(rows-1, cols-1).getAnchor();
-        assertEquals(rectExp, rectAct);
-        ppt.close();
-    }
-
-    @Test
-    public void testTable() throws IOException {
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("54111.ppt"));
-		assertTrue("No Exceptions while reading file", true);
-
-		List<HSLFSlide> slides = ppt.getSlides();
-		assertEquals(1, slides.size());
-		checkSlide(slides.get(0));
-		ppt.close();
-	}
-
-	private void checkSlide(final HSLFSlide s) {
-		List<List<HSLFTextParagraph>> textRuns = s.getTextParagraphs();
-		assertEquals(2, textRuns.size());
-
-		HSLFTextRun textRun = textRuns.get(0).get(0).getTextRuns().get(0);
-		assertEquals("Table sample", textRun.getRawText().trim());
-		assertEquals(1, textRuns.get(0).get(0).getTextRuns().size());
-		assertFalse(textRun.getTextParagraph().isBullet());
-
-		assertEquals("Dummy text", HSLFTextParagraph.getRawText(textRuns.get(1)));
-
-		List<HSLFShape> shapes = s.getShapes();
-		assertNotNull(shapes);
-		assertEquals(3, shapes.size());
-		assertTrue(shapes.get(2) instanceof HSLFTable);
-		final HSLFTable table = (HSLFTable) shapes.get(2);
-		assertEquals(4, table.getNumberOfColumns());
-		assertEquals(6, table.getNumberOfRows());
-		for (int x = 0; x < 4; x ++) {
-			assertEquals("TH Cell " + (x + 1), HSLFTextParagraph.getRawText(table.getCell(0, x).getTextParagraphs()));
-			for (int y = 1; y < 6; y++) {
-				assertEquals("Row " + y + ", Cell " + (x + 1), table.getCell(y, x).getText());
-			}
-		}
-	}
-
-    @Test
-    public void testAddText() throws IOException {
-        HSLFSlideShow ppt1 = new HSLFSlideShow();
-        HSLFSlide slide = ppt1.createSlide();
-        HSLFTable tab = slide.createTable(4, 5);
-
-        int rows = tab.getNumberOfRows();
-        int cols = tab.getNumberOfColumns();
-        for (int row=0; row<rows; row++) {
-            for (int col=0; col<cols; col++) {
-                HSLFTableCell c = tab.getCell(row, col);
-                c.setText("r"+(row+1)+"c"+(col+1));
-            }
-        }
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ppt1.write(bos);
-        ppt1.close();
-
-        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        HSLFSlideShow ppt2 = new HSLFSlideShow(bis);
-        slide = ppt2.getSlides().get(0);
-        tab = (HSLFTable)slide.getShapes().get(0);
-
-        rows = tab.getNumberOfRows();
-        cols = tab.getNumberOfColumns();
-        for (int row=0; row<rows; row++) {
-            for (int col=0; col<cols; col++) {
-                HSLFTableCell c = tab.getCell(row, col);
-                c.setText(c.getText()+"...");
-            }
-        }
-
-        bos.reset();
-        ppt2.write(bos);
-        ppt2.close();
-
-        bis = new ByteArrayInputStream(bos.toByteArray());
-        HSLFSlideShow ppt3 = new HSLFSlideShow(bis);
-        slide = ppt3.getSlides().get(0);
-        tab = (HSLFTable)slide.getShapes().get(0);
-
-        rows = tab.getNumberOfRows();
-        cols = tab.getNumberOfColumns();
-        for (int row=0; row<rows; row++) {
-            for (int col=0; col<cols; col++) {
-                HSLFTableCell c = tab.getCell(row, col);
-                assertEquals("r"+(row+1)+"c"+(col+1)+"...", c.getText());
-            }
-        }
-
-        ppt3.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
deleted file mode 100644
index f7db8f5..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
+++ /dev/null
@@ -1,583 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.apache.poi.sl.TestCommonSL.sameColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests for TextRuns
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestTextRun {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-	// SlideShow primed on the test data
-	private HSLFSlideShow ss;
-	private HSLFSlideShow ssRich;
-
-	@Before
-	public void setUp() throws IOException {
-
-		// Basic (non rich) test file
-		ss = new HSLFSlideShow(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
-
-		// Rich test file
-		ssRich = new HSLFSlideShow(_slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
-	}
-
-	/**
-	 * Test to ensure that getting the text works correctly
-	 */
-	@Test
-	public void testGetText() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParas = slideOne.getTextParagraphs();
-
-		assertEquals(2, textParas.size());
-
-		// Get text works with \n
-		assertEquals("This is a test title", HSLFTextParagraph.getText(textParas.get(0)));
-		assertEquals("This is a test subtitle\nThis is on page 1", HSLFTextParagraph.getText(textParas.get(1)));
-
-		// Raw text has \r instead
-		assertEquals("This is a test title", HSLFTextParagraph.getRawText(textParas.get(0)));
-		assertEquals("This is a test subtitle\rThis is on page 1", HSLFTextParagraph.getRawText(textParas.get(1)));
-
-
-		// Now check on a rich text run
-		HSLFSlide slideOneR = ssRich.getSlides().get(0);
-		textParas = slideOneR.getTextParagraphs();
-
-		assertEquals(2, textParas.size());
-		assertEquals("This is a title, it\u2019s in black", HSLFTextParagraph.getText(textParas.get(0)));
-		assertEquals("This is the subtitle, in bold\nThis bit is blue and italic\nThis bit is red (normal)", HSLFTextParagraph.getText(textParas.get(1)));
-		assertEquals("This is a title, it\u2019s in black", HSLFTextParagraph.getRawText(textParas.get(0)));
-		assertEquals("This is the subtitle, in bold\rThis bit is blue and italic\rThis bit is red (normal)", HSLFTextParagraph.getRawText(textParas.get(1)));
-	}
-
-	/**
-	 * Test to ensure changing non rich text bytes->bytes works correctly
-	 */
-	@Test
-	public void testSetText() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textRuns = slideOne.getTextParagraphs();
-		HSLFTextParagraph run = textRuns.get(0).get(0);
-		HSLFTextRun tr =  run.getTextRuns().get(0);
-
-		// Check current text
-		assertEquals("This is a test title", tr.getRawText());
-
-		// Change
-		String changeTo = "New test title";
-		tr.setText(changeTo);
-		assertEquals(changeTo, tr.getRawText());
-
-		// Ensure trailing \n's are NOT stripped, it is legal to set a text with a trailing '\r'
-		tr.setText(changeTo + "\n");
-		assertEquals(changeTo + "\r", tr.getRawText());
-	}
-
-	/**
-	 * Test to ensure that changing non rich text between bytes and
-	 *  chars works correctly
-	 */
-	@SuppressWarnings("unused")
-    @Test
-	public void testAdvancedSetText() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<HSLFTextParagraph> paras = slideOne.getTextParagraphs().get(0);
-		HSLFTextParagraph para = paras.get(0);
-		
-        TextHeaderAtom tha = null;
-        TextBytesAtom tba = null;
-        TextCharsAtom tca = null;
-		for (Record r : para.getRecords()) {
-		    if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
-		    else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
-		    else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
-		}
-
-		// Bytes -> Bytes
-		assertNull(tca);
-		assertNotNull(tba);
-		// assertFalse(run._isUnicode);
-		assertEquals("This is a test title", para.getTextRuns().get(0).getRawText());
-
-		String changeBytesOnly = "New Test Title";
-		HSLFTextParagraph.setText(paras, changeBytesOnly);
-		para = paras.get(0);
-		tha = null; tba = null; tca = null;
-        for (Record r : para.getRecords()) {
-            if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
-            else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
-            else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
-        }
-		
-		assertEquals(changeBytesOnly, HSLFTextParagraph.getRawText(paras));
-		assertNull(tca);
-		assertNotNull(tba);
-
-		// Bytes -> Chars
-        assertNull(tca);
-        assertNotNull(tba);
-		assertEquals(changeBytesOnly, HSLFTextParagraph.getRawText(paras));
-
-		String changeByteChar = "This is a test title with a '\u0121' g with a dot";
-		HSLFTextParagraph.setText(paras, changeByteChar);
-		para = paras.get(0);
-        tha = null; tba = null; tca = null;
-        for (Record r : para.getRecords()) {
-            if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
-            else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
-            else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
-        }		
-
-		assertEquals(changeByteChar, HSLFTextParagraph.getRawText(paras));
-		assertNotNull(tca);
-		assertNull(tba);
-
-		// Chars -> Chars
-		assertNull(tba);
-		assertNotNull(tca);
-		assertEquals(changeByteChar, HSLFTextParagraph.getRawText(paras));
-
-		String changeCharChar = "This is a test title with a '\u0147' N with a hat";
-		HSLFTextParagraph.setText(paras, changeCharChar);
-        para = paras.get(0);
-        tha = null; tba = null; tca = null;
-        for (Record r : para.getRecords()) {
-            if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
-            else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
-            else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
-        }       
-
-		assertEquals(changeCharChar, HSLFTextParagraph.getRawText(paras));
-		assertNotNull(tca);
-		assertNull(tba);
-	}
-
-	/**
-	 * Tests to ensure that non rich text has the right default rich text run
-	 *  set up for it
-	 */
-	@Test
-	public void testGetRichTextNonRich() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-
-		assertEquals(2, textParass.size());
-
-		List<HSLFTextParagraph> trA = textParass.get(0);
-		List<HSLFTextParagraph> trB = textParass.get(1);
-
-		assertEquals(1, trA.size());
-		assertEquals(2, trB.size());
-
-		HSLFTextRun rtrA = trA.get(0).getTextRuns().get(0);
-		HSLFTextRun rtrB = trB.get(0).getTextRuns().get(0);
-
-		assertEquals(HSLFTextParagraph.getRawText(trA), rtrA.getRawText());
-		assertEquals(HSLFTextParagraph.getRawText(trB.subList(0, 1)), rtrB.getRawText());
-	}
-
-	/**
-	 * Tests to ensure that the rich text runs are built up correctly
-	 */
-	@Test
-	public void testGetRichText() {
-		HSLFSlide slideOne = ssRich.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-
-		assertEquals(2, textParass.size());
-
-		List<HSLFTextParagraph> trA = textParass.get(0);
-		List<HSLFTextParagraph> trB = textParass.get(1);
-
-		assertEquals(1, trA.size());
-		assertEquals(3, trB.size());
-
-		HSLFTextRun rtrA = trA.get(0).getTextRuns().get(0);
-		HSLFTextRun rtrB = trB.get(0).getTextRuns().get(0);
-		HSLFTextRun rtrC = trB.get(1).getTextRuns().get(0);
-		HSLFTextRun rtrD = trB.get(2).getTextRuns().get(0);
-
-		assertEquals(HSLFTextParagraph.getRawText(trA), rtrA.getRawText());
-
-		String trBstr = HSLFTextParagraph.getRawText(trB);
-		assertEquals(trBstr.substring(0, 30), rtrB.getRawText());
-		assertEquals(trBstr.substring(30,58), rtrC.getRawText());
-		assertEquals(trBstr.substring(58,82), rtrD.getRawText());
-
-		// Same paragraph styles
-		assertEquals(trB.get(0).getParagraphStyle(), trB.get(1).getParagraphStyle());
-		assertEquals(trB.get(0).getParagraphStyle(), trB.get(2).getParagraphStyle());
-
-		// Different char styles
-		assertNotEquals(rtrB.getCharacterStyle(), rtrC.getCharacterStyle());
-        assertNotEquals(rtrB.getCharacterStyle(), rtrD.getCharacterStyle());
-        assertNotEquals(rtrC.getCharacterStyle(), rtrD.getCharacterStyle());
-	}
-
-	/**
-	 * Tests to ensure that setting the text where the text isn't rich,
-	 *  ensuring that everything stays with the same default styling
-	 */
-	@Test
-	public void testSetTextWhereNotRich() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-		List<HSLFTextParagraph> trB = textParass.get(0);
-		assertEquals(1, trB.size());
-
-		HSLFTextRun rtrB = trB.get(0).getTextRuns().get(0);
-		assertEquals(HSLFTextParagraph.getText(trB), rtrB.getRawText());
-
-		// Change text via normal
-		HSLFTextParagraph.setText(trB, "Test Foo Test");
-		rtrB = trB.get(0).getTextRuns().get(0);
-		assertEquals("Test Foo Test", HSLFTextParagraph.getRawText(trB));
-		assertEquals("Test Foo Test", rtrB.getRawText());
-	}
-
-	/**
-	 * Tests to ensure that setting the text where the text is rich
-	 *  sets everything to the same styling
-	 */
-	@Test
-	public void testSetTextWhereRich() {
-		HSLFSlide slideOne = ssRich.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-		List<HSLFTextParagraph> trB = textParass.get(1);
-		assertEquals(3, trB.size());
-
-		HSLFTextRun rtrB = trB.get(0).getTextRuns().get(0);
-		HSLFTextRun rtrC = trB.get(1).getTextRuns().get(0);
-		HSLFTextRun rtrD = trB.get(2).getTextRuns().get(0);
-		TextPropCollection tpBP = rtrB.getTextParagraph().getParagraphStyle();
-		TextPropCollection tpBC = rtrB.getCharacterStyle();
-		TextPropCollection tpCP = rtrC.getTextParagraph().getParagraphStyle();
-		TextPropCollection tpCC = rtrC.getCharacterStyle();
-		TextPropCollection tpDP = rtrD.getTextParagraph().getParagraphStyle();
-		TextPropCollection tpDC = rtrD.getCharacterStyle();
-
-//		assertEquals(trB.getRawText().substring(0, 30), rtrB.getRawText());
-		assertNotNull(tpBP);
-		assertNotNull(tpBC);
-		assertNotNull(tpCP);
-		assertNotNull(tpCC);
-		assertNotNull(tpDP);
-		assertNotNull(tpDC);
-		assertEquals(tpBP,tpCP);
-		assertEquals(tpBP,tpDP);
-		assertEquals(tpCP,tpDP);
-		assertNotEquals(tpBC,tpCC);
-		assertNotEquals(tpBC,tpDC);
-		assertNotEquals(tpCC,tpDC);
-
-		// Change text via normal
-		HSLFTextParagraph.setText(trB, "Test Foo Test");
-
-		// Ensure now have first style
-		assertEquals(1, trB.get(0).getTextRuns().size());
-		rtrB = trB.get(0).getTextRuns().get(0);
-		assertEquals("Test Foo Test", HSLFTextParagraph.getRawText(trB));
-		assertEquals("Test Foo Test", rtrB.getRawText());
-		assertNotNull(rtrB.getCharacterStyle());
-		assertNotNull(rtrB.getTextParagraph().getParagraphStyle());
-		assertEquals( tpBP, rtrB.getTextParagraph().getParagraphStyle() );
-		assertEquals( tpBC, rtrB.getCharacterStyle() );
-	}
-
-	/**
-	 * Test to ensure the right stuff happens if we change the text
-	 *  in a rich text run, that doesn't happen to actually be rich
-	 */
-	@Test
-	public void testChangeTextInRichTextRunNonRich() {
-		HSLFSlide slideOne = ss.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textRuns = slideOne.getTextParagraphs();
-		List<HSLFTextParagraph> trB = textRuns.get(1);
-		assertEquals(1, trB.get(0).getTextRuns().size());
-
-		HSLFTextRun rtrB = trB.get(0).getTextRuns().get(0);
-		assertEquals(HSLFTextParagraph.getRawText(trB.subList(0, 1)), rtrB.getRawText());
-		assertNotNull(rtrB.getCharacterStyle());
-		assertNotNull(rtrB.getTextParagraph().getParagraphStyle());
-
-		// Change text via rich
-		rtrB.setText("Test Test Test");
-		assertEquals("Test Test Test", HSLFTextParagraph.getRawText(trB.subList(0, 1)));
-		assertEquals("Test Test Test", rtrB.getRawText());
-
-		// Will now have dummy props
-        assertNotNull(rtrB.getCharacterStyle());
-        assertNotNull(rtrB.getTextParagraph().getParagraphStyle());
-	}
-
-	/**
-	 * Tests to ensure changing the text within rich text runs works
-	 *  correctly
-	 */
-	@Test
-	public void testChangeTextInRichTextRun() {
-		HSLFSlide slideOne = ssRich.getSlides().get(0);
-		List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
-		List<HSLFTextParagraph> trB = textParass.get(1);
-		assertEquals(3, trB.size());
-
-		// We start with 3 text runs, each with their own set of styles,
-		// but all sharing the same paragraph styles
-		HSLFTextRun rtrB = trB.get(0).getTextRuns().get(0);
-		HSLFTextRun rtrC = trB.get(1).getTextRuns().get(0);
-		HSLFTextRun rtrD = trB.get(2).getTextRuns().get(0);
-		TextPropCollection tpBP = rtrB.getTextParagraph().getParagraphStyle();
-		TextPropCollection tpBC = rtrB.getCharacterStyle();
-		TextPropCollection tpCP = rtrC.getTextParagraph().getParagraphStyle();
-		TextPropCollection tpCC = rtrC.getCharacterStyle();
-		TextPropCollection tpDP = rtrD.getTextParagraph().getParagraphStyle();
-		TextPropCollection tpDC = rtrD.getCharacterStyle();
-
-		// Check text and stylings
-		assertEquals(HSLFTextParagraph.getRawText(trB).substring(0, 30), rtrB.getRawText());
-		assertNotNull(tpBP);
-		assertNotNull(tpBC);
-		assertNotNull(tpCP);
-		assertNotNull(tpCC);
-		assertNotNull(tpDP);
-		assertNotNull(tpDC);
-		assertEquals(tpBP, tpCP);
-		assertEquals(tpBP, tpDP);
-		assertEquals(tpCP, tpDP);
-		assertNotEquals(tpBC, tpCC);
-		assertNotEquals(tpBC, tpDC);
-		assertNotEquals(tpCC, tpDC);
-
-		// Check text in the rich runs
-		assertEquals("This is the subtitle, in bold\r", rtrB.getRawText());
-		assertEquals("This bit is blue and italic\r", rtrC.getRawText());
-		assertEquals("This bit is red (normal)", rtrD.getRawText());
-
-		String newBText = "New Subtitle, will still be bold\n";
-		String newCText = "New blue and italic text\n";
-		String newDText = "Funky new normal red text";
-		rtrB.setText(newBText);
-		rtrC.setText(newCText);
-		rtrD.setText(newDText);
-		HSLFTextParagraph.storeText(trB);
-
-		assertEquals(newBText.replace('\n','\r'), rtrB.getRawText());
-		assertEquals(newCText.replace('\n','\r'), rtrC.getRawText());
-		assertEquals(newDText.replace('\n','\r'), rtrD.getRawText());
-
-		assertEquals(newBText.replace('\n','\r') + newCText.replace('\n','\r') + newDText.replace('\n','\r'), HSLFTextParagraph.getRawText(trB));
-
-		// The styles should have been updated for the new sizes
-		assertEquals(newBText.length(), tpBC.getCharactersCovered());
-		assertEquals(newCText.length(), tpCC.getCharactersCovered());
-		assertEquals(newDText.length()+1, tpDC.getCharactersCovered()); // Last one is always one larger
-
-        // Paragraph style should be sum of text length
-		assertEquals(
-			newBText.length() + newCText.length() + newDText.length() +1,
-			tpBP.getCharactersCovered() + tpCP.getCharactersCovered() + tpDP.getCharactersCovered()
-		);
-
-		// Check stylings still as expected
-		TextPropCollection ntpBC = rtrB.getCharacterStyle();
-		TextPropCollection ntpCC = rtrC.getCharacterStyle();
-		TextPropCollection ntpDC = rtrD.getCharacterStyle();
-		assertEquals(tpBC.getTextPropList(), ntpBC.getTextPropList());
-		assertEquals(tpCC.getTextPropList(), ntpCC.getTextPropList());
-		assertEquals(tpDC.getTextPropList(), ntpDC.getTextPropList());
-	}
-
-
-	/**
-	 * Test case for Bug 41015.
-	 *
-	 * In some cases RichTextRun.getText() threw StringIndexOutOfBoundsException because
-	 * of the wrong list of potential paragraph properties defined in StyleTextPropAtom.
-	 *
-	 */
-	@Test
-	public void testBug41015() throws IOException {
-		List<HSLFTextRun> rt;
-
-		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("bug-41015.ppt"));
-		HSLFSlide sl = ppt.getSlides().get(0);
-        List<List<HSLFTextParagraph>> textParass = sl.getTextParagraphs();
-		assertEquals(2, textParass.size());
-		
-		List<HSLFTextParagraph> textParas = textParass.get(0);
-		rt = textParass.get(0).get(0).getTextRuns();
-		assertEquals(1, rt.size());
-		assertEquals(0, textParass.get(0).get(0).getIndentLevel());
-		assertEquals("sdfsdfsdf", rt.get(0).getRawText());
-
-		textParas = textParass.get(1);
-		String texts[] = {"Sdfsdfsdf\r","Dfgdfg\r","Dfgdfgdfg\r","Sdfsdfs\r","Sdfsdf\r"};
-		int indents[] = {0,0,0,1,1};
-		int i=0;
-		for (HSLFTextParagraph p : textParas) {
-		    assertEquals(texts[i], p.getTextRuns().get(0).getRawText());
-		    assertEquals(indents[i], p.getIndentLevel());
-		    i++;
-		}
-	}
-
-	/**
-	 * Test creation of TextRun objects.
-	 */
-	@Test
-	public void testAddTextRun() {
-		HSLFSlideShow ppt = new HSLFSlideShow();
-		HSLFSlide slide = ppt.createSlide();
-
-		assertEquals(0, slide.getTextParagraphs().size());
-
-		HSLFTextBox shape1 = new HSLFTextBox();
-		List<HSLFTextParagraph> run1 = shape1.getTextParagraphs();
-		shape1.setText("Text 1");
-		slide.addShape(shape1);
-
-		//The array of Slide's text runs must be updated when new text shapes are added.
-		List<List<HSLFTextParagraph>> runs = slide.getTextParagraphs();
-		assertNotNull(runs);
-		assertSame(run1, runs.get(0));
-
-		HSLFTextBox shape2 = new HSLFTextBox();
-		List<HSLFTextParagraph> run2 = shape2.getTextParagraphs();
-		shape2.setText("Text 2");
-		slide.addShape(shape2);
-
-		runs = slide.getTextParagraphs();
-		assertEquals(2, runs.size());
-
-		assertSame(run1, runs.get(0));
-		assertSame(run2, runs.get(1));
-
-		// as getShapes()
-		List<HSLFShape> sh = slide.getShapes();
-		assertEquals(2, sh.size());
-		assertTrue(sh.get(0) instanceof HSLFTextBox);
-		HSLFTextBox box1 = (HSLFTextBox)sh.get(0);
-		assertSame(run1, box1.getTextParagraphs());
-		HSLFTextBox box2 = (HSLFTextBox)sh.get(1);
-		assertSame(run2, box2.getTextParagraphs());
-
-		// test Table - a complex group of shapes containing text objects
-		HSLFSlide slide2 = ppt.createSlide();
-		assertTrue(slide2.getTextParagraphs().isEmpty());
-		HSLFTable table = new HSLFTable(2, 2);
-		slide2.addShape(table);
-		runs = slide2.getTextParagraphs();
-		assertNotNull(runs);
-		assertEquals(4, runs.size());
-	}
-
-	@Test
-	public void test48916() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("SampleShow.ppt"));
-        List<HSLFSlide> slides = ppt.getSlides();
-        for(HSLFSlide slide : slides){
-            for(HSLFShape sh : slide.getShapes()){
-                if (!(sh instanceof HSLFTextShape)) continue;
-                HSLFTextShape tx = (HSLFTextShape)sh;
-                List<HSLFTextParagraph> paras = tx.getTextParagraphs();
-                //verify that records cached in  TextRun and EscherTextboxWrapper are the same
-                Record[] runChildren = paras.get(0).getRecords();
-                Record[] txboxChildren = tx.getEscherTextboxWrapper().getChildRecords();
-                assertEquals(runChildren.length, txboxChildren.length);
-                for(int i=0; i < txboxChildren.length; i++){
-                    assertSame(txboxChildren[i], runChildren[i]);
-                }
-                // caused NPE prior to fix of Bugzilla #48916
-                for (HSLFTextParagraph p : paras) {
-                    for (HSLFTextRun rt : p.getTextRuns()) {
-                        rt.setBold(true);
-                        rt.setFontColor(Color.RED);
-                    }
-                }
-                // tx.storeText();
-            }
-        }
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        
-        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        for(HSLFSlide slide : ppt.getSlides()){
-            for(HSLFShape sh : slide.getShapes()){
-                if(sh instanceof HSLFTextShape){
-                    HSLFTextShape tx = (HSLFTextShape)sh;
-                    List<HSLFTextParagraph> run = tx.getTextParagraphs();
-                    HSLFTextRun rt = run.get(0).getTextRuns().get(0);
-                    assertTrue(rt.isBold());
-                    assertTrue(sameColor(Color.RED, rt.getFontColor()));
-                }
-            }
-        }
-
-    }
-
-	@Test
-	public void test52244() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("52244.ppt"));
-        HSLFSlide slide = ppt.getSlides().get(0);
-
-        int sizes[] = { 36, 24, 12, 32, 12, 12 };
-        
-        int i=0;
-        for (List<HSLFTextParagraph> textParas : slide.getTextParagraphs()) {
-            assertEquals("Arial", textParas.get(0).getTextRuns().get(0).getFontFamily());
-            assertEquals(sizes[i++], textParas.get(0).getTextRuns().get(0).getFontSize().intValue());
-        }
-    }
-
-	@Test
-	public void testAppendEmpty() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide s = ppt.createSlide();
-        HSLFTextBox title = s.addTitle();
-        title.setText("");
-        title.appendText("\n", true);
-        title.appendText("para", true);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java
deleted file mode 100644
index 365b892..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.*;
-import java.util.*;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.sl.usermodel.ShapeType;
-import org.junit.Test;
-
-/**
- * Verify behavior of <code>TextShape</code> and its sub-classes
- *
- * @author Yegor Kozlov
- */
-public final class TestTextShape {
-    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @Test
-    public void createAutoShape(){
-        HSLFTextShape shape = new HSLFAutoShape(ShapeType.TRAPEZOID);
-        assertNull(shape.getEscherTextboxWrapper());
-        assertNotNull(shape.getTextParagraphs());
-        assertNotNull(shape.getEscherTextboxWrapper());
-        assertEquals("", shape.getText());
-        assertEquals(-1, shape.getTextParagraphs().get(0).getIndex());
-    }
-
-    @Test
-    public void createTextBox(){
-        HSLFTextShape shape = new HSLFTextBox();
-        List<HSLFTextParagraph> paras = shape.getTextParagraphs();
-        assertNotNull(paras);
-        assertNotNull(shape.getText());
-        assertNotNull(shape.getEscherTextboxWrapper());
-
-        assertNotNull(shape.getTextParagraphs());
-        assertNotNull(shape.getEscherTextboxWrapper());
-        assertEquals("", shape.getText());
-
-    }
-
-    /**
-     * Verify we can get text from TextShape in the following cases:
-     *  - placeholders
-     *  - normal TextBox object
-     *  - text in auto-shapes
-     */
-    @Test
-    public void read() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("text_shapes.ppt"));
-
-        List<String> lst1 = new ArrayList<String>();
-        HSLFSlide slide = ppt.getSlides().get(0);
-        for (HSLFShape shape : slide.getShapes()) {
-            assertTrue("Expected TextShape but found " + shape.getClass().getName(), shape instanceof HSLFTextShape);
-            HSLFTextShape tx = (HSLFTextShape)shape;
-            List<HSLFTextParagraph> paras = tx.getTextParagraphs();
-            assertNotNull(paras);
-            int runType = paras.get(0).getRunType();
-
-            ShapeType type = shape.getShapeType();
-            String rawText = HSLFTextParagraph.getRawText(paras);
-            switch (type){
-                case TEXT_BOX:
-                    assertEquals("Text in a TextBox", rawText);
-                    break;
-                case RECT:
-                    if(runType == TextHeaderAtom.OTHER_TYPE)
-                        assertEquals("Rectangle", rawText);
-                    else if(runType == TextHeaderAtom.TITLE_TYPE)
-                        assertEquals("Title Placeholder", rawText);
-                    break;
-                case OCTAGON:
-                    assertEquals("Octagon", rawText);
-                    break;
-                case ELLIPSE:
-                    assertEquals("Ellipse", rawText);
-                    break;
-                case ROUND_RECT:
-                    assertEquals("RoundRectangle", rawText);
-                    break;
-                default:
-                    fail("Unexpected shape: " + shape.getShapeName());
-
-            }
-            lst1.add(rawText);
-        }
-
-        List<String> lst2 = new ArrayList<String>();
-        for (List<HSLFTextParagraph> paras : slide.getTextParagraphs()) {
-            lst2.add(HSLFTextParagraph.getRawText(paras));
-        }
-
-        assertTrue(lst1.containsAll(lst2));
-    }
-
-    @Test
-    public void readWrite() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        HSLFSlide slide =  ppt.createSlide();
-
-        HSLFTextShape shape1 = new HSLFTextBox();
-        shape1.setText("Hello, World!");
-        slide.addShape(shape1);
-
-        shape1.moveTo(100, 100);
-
-        HSLFTextShape shape2 = new HSLFAutoShape(ShapeType.RIGHT_ARROW);
-        shape2.setText("Testing TextShape");
-        slide.addShape(shape2);
-        shape2.moveTo(300, 300);
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        out.close();
-
-        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        slide = ppt.getSlides().get(0);
-        List<HSLFShape> shape = slide.getShapes();
-
-        assertTrue(shape.get(0) instanceof HSLFTextShape);
-        shape1 = (HSLFTextShape)shape.get(0);
-        assertEquals(ShapeType.TEXT_BOX, shape1.getShapeType());
-        assertEquals("Hello, World!", shape1.getText());
-
-        assertTrue(shape.get(1) instanceof HSLFTextShape);
-        shape1 = (HSLFTextShape)shape.get(1);
-        assertEquals(ShapeType.RIGHT_ARROW, shape1.getShapeType());
-        assertEquals("Testing TextShape", shape1.getText());
-    }
-
-    @Test
-    public void margins() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("text-margins.ppt"));
-
-        HSLFSlide slide = ppt.getSlides().get(0);
-
-        Map<String,HSLFTextShape> map = new HashMap<String,HSLFTextShape>();
-        for (HSLFShape shape : slide.getShapes()) {
-            if(shape instanceof HSLFTextShape){
-                HSLFTextShape tx = (HSLFTextShape)shape;
-                map.put(tx.getText(), tx);
-            }
-        }
-
-        HSLFTextShape tx;
-
-        tx = map.get("TEST1");
-        assertEquals(7.2, tx.getLeftInset(), 0);
-        assertEquals(7.2, tx.getRightInset(), 0);
-        assertEquals(28.34, tx.getTopInset(), 0.01);
-        assertEquals(3.6, tx.getBottomInset(), 0);
-
-        tx = map.get("TEST2");
-        assertEquals(7.2, tx.getLeftInset(), 0);
-        assertEquals(7.2, tx.getRightInset(), 0);
-        assertEquals(3.6, tx.getTopInset(), 0);
-        assertEquals(28.34, tx.getBottomInset(), 0.01);
-
-        tx = map.get("TEST3");
-        assertEquals(28.34, tx.getLeftInset(), 0.01);
-        assertEquals(7.2, tx.getRightInset(), 0);
-        assertEquals(3.6, tx.getTopInset(), 0);
-        assertEquals(3.6, tx.getBottomInset(), 0);
-
-        tx = map.get("TEST4");
-        assertEquals(7.2, tx.getLeftInset(), 0);
-        assertEquals(28.34, tx.getRightInset(), 0.01);
-        assertEquals(3.6, tx.getTopInset(), 0);
-        assertEquals(3.6, tx.getBottomInset(), 0);
-    }
-
-    @Test
-    public void bug52599() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("52599.ppt"));
-
-        HSLFSlide slide = ppt.getSlides().get(0);
-        List<HSLFShape> sh = slide.getShapes();
-        assertEquals(3, sh.size());
-
-        HSLFTextShape sh0 = (HSLFTextShape)sh.get(0);
-        assertNotNull(sh0.getTextParagraphs());
-        assertEquals("", sh0.getText());
-
-        HSLFTextShape sh1 = (HSLFTextShape)sh.get(1);
-        assertNotNull(sh1.getTextParagraphs());
-        assertEquals("", sh1.getText());
-
-        HSLFTextShape sh2 = (HSLFTextShape)sh.get(2);
-        assertEquals("this box should be shown just once", sh2.getText());
-        assertEquals(-1, sh2.getTextParagraphs().get(0).getIndex());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java b/trunk/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java
deleted file mode 100644
index 776da2f..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hslf.util;
-
-
-import static org.junit.Assert.assertEquals;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests that SystemTimeUtils works properly.
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestSystemTimeUtils {
-	// From real files
-	private final byte[] data_a = new byte[] {
-		0xD6-256, 07, 01, 00,
-		02, 00, 0x18, 00, 0x0A, 00, 0x1A, 00,
-		0x0F, 00, 0xCD-256, 00
-	};
-	private final byte[] data_b = new byte[] {
-		00, 00, 0xE1-256, 0x2E, 0x1C, 00, 00, 00,
-		01, 00, 00, 00, 0xD6-256, 0x07, 01, 00,
-		02, 00, 0x18, 00, 0x15, 00, 0x19, 00, 03,
-		00, 0xD5-256, 02, 0x0A, 00, 00, 00,
-		0x0A, 00, 00, 00
-	};
-
-    private static SimpleDateFormat sdf;
-    
-    @BeforeClass
-    public static void initDateFormat() {
-        sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.ROOT);
-        sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-    }
-
-	@Test
-    public void testGetDateA() throws Exception {
-		Date date = SystemTimeUtils.getDate(data_a);
-
-		// Is 2006-01-24 (2nd day of week) 10:26:15.205
-		Date exp = sdf.parse("2006-01-24 10:26:15.205");
-		assertEquals(exp.getTime(), date.getTime());
-		assertEquals(exp, date);
-	}
-
-	@Test
-	public void testGetDateB() throws Exception {
-		Date date = SystemTimeUtils.getDate(data_b, 8+4);
-
-		// Is 2006-01-24 (2nd day of week) 21:25:03.725
-		Date exp = sdf.parse("2006-01-24 21:25:03.725");
-		assertEquals(exp.getTime(), date.getTime());
-		assertEquals(exp, date);
-	}
-
-	@Test
-	public void testWriteDateA() throws Exception {
-		byte[] out_a = new byte[data_a.length];
-		Date date = sdf.parse("2006-01-24 10:26:15.205");
-		SystemTimeUtils.storeDate(date, out_a);
-
-		for(int i=0; i<out_a.length; i++) {
-			assertEquals(data_a[i], out_a[i]);
-		}
-	}
-
-	@Test
-	public void testWriteDateB() throws Exception {
-		byte[] out_b = new byte[data_b.length];
-		// Copy over start and end, ignoring the 16 byte date field in the middle
-		System.arraycopy(data_b, 0, out_b, 0, 12);
-		System.arraycopy(data_b, 12+16, out_b, 12+16, data_b.length-12-16);
-
-		Date date = sdf.parse("2006-01-24 21:25:03.725");
-		SystemTimeUtils.storeDate(date, out_b, 12);
-
-		for(int i=0; i<out_b.length; i++) {
-			assertEquals(data_b[i], out_b[i]);
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java
deleted file mode 100644
index fc042c7..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import org.apache.poi.hsmf.datatypes.TestChunkData;
-import org.apache.poi.hsmf.datatypes.TestSorters;
-import org.apache.poi.hsmf.datatypes.TestTypes;
-import org.apache.poi.hsmf.extractor.TestOutlookTextExtractor;
-import org.apache.poi.hsmf.parsers.TestPOIFSChunkParser;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestBasics.class,
-    TestBlankFileRead.class,
-    TestSimpleFileRead.class,
-    TestOutlook30FileRead.class,
-    TestFileWithAttachmentsRead.class,
-    TestChunkData.class,
-    TestTypes.class,
-    TestSorters.class,
-    TestOutlookTextExtractor.class,
-    TestPOIFSChunkParser.class,
-    TestMessageSubmissionChunkY2KRead.class,
-    TestMessageSubmissionChunk.class
-})
-public class AllHSMFTests {
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java
deleted file mode 100644
index 7cdfdb1..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-
-/**
- * Tests to verify that we can perform basic opperations on 
- *  a range of files
- */
-public final class TestBasics extends TestCase {
-   private final MAPIMessage simple;
-   private final MAPIMessage quick;
-   private final MAPIMessage outlook30;
-   private final MAPIMessage attachments;
-   private final MAPIMessage noRecipientAddress;
-   private final MAPIMessage unicode;
-   private final MAPIMessage cyrillic;
-   private final MAPIMessage chinese;
-
-   /**
-    * Initialize this test, load up the blank.msg mapi message.
-    * @throws Exception
-    */
-   public TestBasics() throws IOException {
-       POIDataSamples samples = POIDataSamples.getHSMFInstance();
-       simple = new MAPIMessage(samples.openResourceAsStream("simple_test_msg.msg"));
-       quick  = new MAPIMessage(samples.openResourceAsStream("quick.msg"));
-       outlook30  = new MAPIMessage(samples.openResourceAsStream("outlook_30_msg.msg"));
-       attachments = new MAPIMessage(samples.openResourceAsStream("attachment_test_msg.msg"));
-       noRecipientAddress = new MAPIMessage(samples.openResourceAsStream("no_recipient_address.msg"));
-       unicode = new MAPIMessage(samples.openResourceAsStream("example_received_unicode.msg"));
-       cyrillic = new MAPIMessage(samples.openResourceAsStream("cyrillic_message.msg"));
-       chinese = new MAPIMessage(samples.openResourceAsStream("chinese-traditional.msg"));
-   }
-
-   /**
-    * Can we always get the recipient's email?
-    */
-   public void testRecipientEmail() throws Exception {
-      assertEquals("travis@overwrittenstack.com", simple.getRecipientEmailAddress());
-      assertEquals("kevin.roast@alfresco.org", quick.getRecipientEmailAddress());
-      assertEquals("nicolas1.23456@free.fr", attachments.getRecipientEmailAddress());
-      
-      // This one has lots...
-      assertEquals(18, outlook30.getRecipientEmailAddressList().length);
-      assertEquals("shawn.bohn@pnl.gov; gus.calapristi@pnl.gov; Richard.Carter@pnl.gov; " +
-      		"barb.cheney@pnl.gov; nick.cramer@pnl.gov; vern.crow@pnl.gov; Laura.Curtis@pnl.gov; " +
-      		"julie.dunkle@pnl.gov; david.gillen@pnl.gov; michelle@pnl.gov; Jereme.Haack@pnl.gov; " +
-      		"Michelle.Hart@pnl.gov; ranata.johnson@pnl.gov; grant.nakamura@pnl.gov; " +
-      		"debbie.payne@pnl.gov; stuart.rose@pnl.gov; randall.scarberry@pnl.gov; Leigh.Williams@pnl.gov", 
-            outlook30.getRecipientEmailAddress()
-      );
-   }
-
-   /**
-    * Test subject
-    */
-   public void testSubject() throws Exception {
-      assertEquals("test message", simple.getSubject());
-      assertEquals("Test the content transformer", quick.getSubject());
-      assertEquals("IN-SPIRE servers going down for a bit, back up around 8am", outlook30.getSubject());
-      assertEquals("test pi\u00e8ce jointe 1", attachments.getSubject());
-   }
-
-   /**
-    * Test message headers
-    */
-   public void testHeaders() throws Exception {
-      // Simple email first
-      assertEquals(26, simple.getHeaders().length);
-      assertTrue(simple.getHeaders()[0].startsWith("Return-path:"));
-      assertTrue(simple.getHeaders()[1].equals("Envelope-to: travis@overwrittenstack.com"));
-      assertTrue(simple.getHeaders()[25].startsWith("X-Antivirus-Scanner: Clean"));
-      
-      // Quick doesn't have them
-      try {
-         quick.getHeaders();
-         fail();
-      } catch(ChunkNotFoundException e) {}
-      
-      // Attachments doesn't have them
-      try {
-         attachments.getHeaders();
-         fail();
-      } catch(ChunkNotFoundException e) {}
-      
-      // Outlook30 has some
-      assertEquals(33, outlook30.getHeaders().length);
-      assertTrue(outlook30.getHeaders()[0].startsWith("Microsoft Mail Internet Headers"));
-      assertTrue(outlook30.getHeaders()[1].startsWith("x-mimeole:"));
-      assertTrue(outlook30.getHeaders()[32].startsWith("\t\"Williams")); // May need better parsing in future
-   }
-
-   /**
-    * Test attachments
-    */
-   public void testAttachments() throws Exception {
-      assertEquals(0, simple.getAttachmentFiles().length);
-      assertEquals(0, quick.getAttachmentFiles().length);
-      assertEquals(0, outlook30.getAttachmentFiles().length);
-      assertEquals(2, attachments.getAttachmentFiles().length);
-   }
-
-   /**
-    * Test missing chunks.
-    * Use a file with no HTML body
-    */
-   public void testMissingChunks() throws Exception {
-      assertEquals(false, attachments.isReturnNullOnMissingChunk());
-
-      try {
-          attachments.getHtmlBody();
-          fail();
-      } catch(ChunkNotFoundException e) {
-          // Good
-      }
-
-      attachments.setReturnNullOnMissingChunk(true);
-
-      assertEquals(null, attachments.getHtmlBody());
-	   
-      attachments.setReturnNullOnMissingChunk(false);
-      
-      try {
-         attachments.getHtmlBody();
-         fail();
-      } catch(ChunkNotFoundException e) {
-         // Good
-      }
-   }
-
-   /**
-    * More missing chunk testing, this time for
-    *  missing recipient email address
-    */
-   public void testMissingAddressChunk() throws Exception {
-      assertEquals(false, noRecipientAddress.isReturnNullOnMissingChunk());
-
-      try {
-         noRecipientAddress.getRecipientEmailAddress();
-         fail();
-      } catch(ChunkNotFoundException e) {
-         // Good
-      }
-      try {
-         noRecipientAddress.getRecipientEmailAddressList();
-         fail();
-      } catch(ChunkNotFoundException e) {
-         // Good
-      }
-      
-      noRecipientAddress.setReturnNullOnMissingChunk(true);
-      
-      noRecipientAddress.getRecipientEmailAddress();
-      noRecipientAddress.getRecipientEmailAddressList();
-      assertEquals("", noRecipientAddress.getRecipientEmailAddress());
-      assertEquals(1, noRecipientAddress.getRecipientEmailAddressList().length);
-      assertEquals(null, noRecipientAddress.getRecipientEmailAddressList()[0]);
-      
-      // Check a few other bits too
-      assertEquals("Microsoft Outlook 2003 Team", noRecipientAddress.getDisplayFrom());
-      assertEquals("New Outlook User", noRecipientAddress.getDisplayTo());
-      
-      noRecipientAddress.setReturnNullOnMissingChunk(false);
-   }
-
-   /**
-    * Test the 7 bit detection
-    */
-   public void test7BitDetection() throws Exception {
-      assertEquals(false, unicode.has7BitEncodingStrings());
-      assertEquals(true, simple.has7BitEncodingStrings());
-      assertEquals(true, chinese.has7BitEncodingStrings());
-      assertEquals(true, cyrillic.has7BitEncodingStrings());
-   }
-	
-   /**
-    * We default to CP1252, but can sometimes do better
-    *  if needed.
-    * This file is really CP1251, according to the person
-    *  who submitted it in bug #49441
-    */
-   public void testEncoding() throws Exception {
-      assertEquals(2, cyrillic.getRecipientDetailsChunks().length);
-      assertEquals("CP1252", cyrillic.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding());
-      assertEquals("CP1252", cyrillic.getRecipientDetailsChunks()[1].recipientDisplayNameChunk.get7BitEncoding());
-      
-      cyrillic.guess7BitEncoding();
-      
-      assertEquals("Cp1251", cyrillic.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding());
-      assertEquals("Cp1251", cyrillic.getRecipientDetailsChunks()[1].recipientDisplayNameChunk.get7BitEncoding());
-      
-      // Override it, check it's taken
-      cyrillic.set7BitEncoding("UTF-8");
-      assertEquals("UTF-8", cyrillic.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding());
-      assertEquals("UTF-8", cyrillic.getRecipientDetailsChunks()[1].recipientDisplayNameChunk.get7BitEncoding());
-      
-      
-      // Check with a file that has no headers
-      try {
-         chinese.getHeaders();
-         fail("File doesn't have headers!");
-      } catch(ChunkNotFoundException e) {}
-      
-      String html = chinese.getHtmlBody();
-      assertTrue("Charset not found:\n" + html, html.contains("text/html; charset=big5"));
-      
-      // Defaults to CP1251
-      assertEquals("CP1252", chinese.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding());
-      
-      // But after guessing goes to the correct one, cp950 (Windows Traditional Chinese)
-      chinese.guess7BitEncoding();
-      assertEquals("cp950", chinese.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding());
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java
deleted file mode 100644
index c4f13a6..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.IOException;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.POIDataSamples;
-
-import junit.framework.TestCase;
-
-
-/**
- * Tests to verify that the library can read blank msg files.
- */
-public final class TestBlankFileRead extends TestCase {
-    private final MAPIMessage mapiMessage;
-
-    /**
-     * Initialize this test, load up the blank.msg mapi message.
-     */
-    public TestBlankFileRead() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHSMFInstance();
-        this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("blank.msg"));
-    }
-
-    /**
-     * Check if we can read the body of the blank message, we expect "".
-     */
-    public void testReadBody() {
-        try {
-            mapiMessage.getTextBody();
-        } catch(ChunkNotFoundException exp) {
-            return;
-        }
-
-        TestCase.fail("Should have thrown a ChunkNotFoundException but didn't");
-    }
-
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     */
-    public void testReadDisplayCC() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayCC();
-        String expected = "";
-
-        TestCase.assertEquals(expected, obtained);
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     */
-    public void testReadDisplayTo() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayTo();
-        String expected = "";
-
-        TestCase.assertEquals(expected, obtained);
-    }
-
-    /**
-     * Test to see if we can read the FROM Chunk.
-     */
-    public void testReadDisplayFrom() {
-        try {
-            mapiMessage.getDisplayFrom();
-        } catch(ChunkNotFoundException exp) {
-            return;
-        }
-
-        TestCase.fail("Should have thrown a ChunkNotFoundException but didn't");
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     */
-    public void testReadDisplayBCC() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayBCC();
-        String expected = "";
-
-        TestCase.assertEquals(expected, obtained);
-    }
-
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     */
-    public void testReadSubject() throws Exception {
-        String obtained = mapiMessage.getSubject();
-        TestCase.assertEquals("", obtained);
-    }
-
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     */
-    public void testReadConversationTopic() {
-        try {
-            mapiMessage.getConversationTopic();
-        } catch(ChunkNotFoundException exp) {
-            return;
-        }
-        TestCase.fail("We shouldn't have a ConversationTopic node on the blank.msg file.");
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
deleted file mode 100644
index 12ffb62..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-
-/**
- * Tests to verify that we can read attachments from msg file
- * 
- * @author Nicolas Bureau
- */
-public class TestFileWithAttachmentsRead extends TestCase {
-   private final MAPIMessage twoSimpleAttachments;
-   private final MAPIMessage pdfMsgAttachments;
-
-   /**
-    * Initialize this test, load up the attachment_test_msg.msg mapi message.
-    * 
-    * @throws Exception
-    */
-   public TestFileWithAttachmentsRead() throws IOException {
-      POIDataSamples samples = POIDataSamples.getHSMFInstance();
-      this.twoSimpleAttachments = new MAPIMessage(samples.openResourceAsStream("attachment_test_msg.msg"));
-      this.pdfMsgAttachments = new MAPIMessage(samples.openResourceAsStream("attachment_msg_pdf.msg"));
-   }
-
-   /**
-    * Test to see if we can retrieve attachments.
-    * 
-    * @throws ChunkNotFoundException
-    * 
-    */
-   public void testRetrieveAttachments() {
-       // Simple file
-       AttachmentChunks[] attachments = twoSimpleAttachments.getAttachmentFiles();
-       assertEquals(2, attachments.length);
-       
-       // Other file
-       attachments = pdfMsgAttachments.getAttachmentFiles();
-       assertEquals(2, attachments.length);
-   }
-
-   /**
-    * Test to see if attachments are not empty.
-    */
-   public void testReadAttachments() throws IOException {
-      AttachmentChunks[] attachments = twoSimpleAttachments.getAttachmentFiles();
-
-      // Basic checks
-      for (AttachmentChunks attachment : attachments) {
-         assertTrue(attachment.attachFileName.getValue().length() > 0);
-         assertTrue(attachment.attachLongFileName.getValue().length() > 0);
-         assertTrue(attachment.attachExtension.getValue().length() > 0);
-         if(attachment.attachMimeTag != null) {
-            assertTrue(attachment.attachMimeTag.getValue().length() > 0);
-         }
-      }
-
-      AttachmentChunks attachment;
-
-      // Now check in detail
-      attachment = twoSimpleAttachments.getAttachmentFiles()[0];
-      assertEquals("TEST-U~1.DOC", attachment.attachFileName.toString());
-      assertEquals("test-unicode.doc", attachment.attachLongFileName.toString());
-      assertEquals(".doc", attachment.attachExtension.getValue());
-      assertEquals(null, attachment.attachMimeTag);
-      assertEquals(24064, attachment.attachData.getValue().length);
-
-      attachment = twoSimpleAttachments.getAttachmentFiles()[1];
-      assertEquals("pj1.txt", attachment.attachFileName.toString());
-      assertEquals("pj1.txt", attachment.attachLongFileName.toString());
-      assertEquals(".txt", attachment.attachExtension.getValue());
-      assertEquals(null, attachment.attachMimeTag);
-      assertEquals(89, attachment.attachData.getValue().length);
-   }
-   
-   /**
-    * Test that we can handle both PDF and MSG attachments
-    */
-   public void testReadMsgAttachments() throws Exception {
-       AttachmentChunks[] attachments = pdfMsgAttachments.getAttachmentFiles();
-       assertEquals(2, attachments.length);
-       
-       AttachmentChunks attachment;
-
-       // Second is a PDF
-       attachment = pdfMsgAttachments.getAttachmentFiles()[1];
-       assertEquals("smbprn~1.pdf", attachment.attachFileName.toString());
-       assertEquals("smbprn.00009008.KdcPjl.pdf", attachment.attachLongFileName.toString());
-       assertEquals(".pdf", attachment.attachExtension.getValue());
-       assertEquals(null, attachment.attachMimeTag);
-       assertEquals(null, attachment.attachmentDirectory);
-       assertEquals(13539, attachment.attachData.getValue().length);
-       
-       // First in a nested message
-       attachment = pdfMsgAttachments.getAttachmentFiles()[0];
-       assertEquals("Test Attachment", attachment.attachFileName.toString());
-       assertEquals(null, attachment.attachLongFileName);
-       assertEquals(null, attachment.attachExtension);
-       assertEquals(null, attachment.attachMimeTag);
-       assertEquals(null, attachment.attachData);
-       assertNotNull(attachment.attachmentDirectory);
-       
-       // Check we can see some bits of it
-       MAPIMessage nested = attachment.attachmentDirectory.getAsEmbededMessage();
-       assertEquals(1, nested.getRecipientNamesList().length);
-       assertEquals("Nick Booth", nested.getRecipientNames());
-       assertEquals("Test Attachment", nested.getConversationTopic());
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
deleted file mode 100644
index ecedca3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hsmf.datatypes.ChunkBasedPropertyValue;
-import org.apache.poi.hsmf.datatypes.Chunks;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.PropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.LongPropertyValue;
-import org.apache.poi.hsmf.datatypes.PropertyValue.TimePropertyValue;
-import org.apache.poi.hsmf.dev.HSMFDump;
-import org.apache.poi.hsmf.extractor.OutlookTextExtactor;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests that we can read fixed sized properties, as well as variable
- *  ones, for example Submission Dates
- */
-public final class TestFixedSizedProperties {
-   private static final String messageSucceeds = "53784_succeeds.msg";
-   private static final String messageFails = "53784_fails.msg";
-   private static MAPIMessage mapiMessageSucceeds;
-   private static MAPIMessage mapiMessageFails;
-   private static NPOIFSFileSystem fsMessageSucceeds;
-   private static NPOIFSFileSystem fsMessageFails;
-   private static SimpleDateFormat messageDateFormat;
-   private static TimeZone userTimeZone;
-
-   /**
-    * Initialize this test, load up the messages.
-    */
-   @BeforeClass
-   public static void initMapi()  throws Exception {
-       POIDataSamples samples = POIDataSamples.getHSMFInstance();
-       fsMessageSucceeds = new NPOIFSFileSystem(samples.getFile(messageSucceeds));
-       fsMessageFails = new NPOIFSFileSystem(samples.getFile(messageFails));
-
-       mapiMessageSucceeds = new MAPIMessage(fsMessageSucceeds);
-       mapiMessageFails = new MAPIMessage(fsMessageFails);        
-      
-       messageDateFormat = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss", Locale.ROOT);
-       messageDateFormat.setTimeZone(LocaleUtil.TIMEZONE_UTC);       
-
-       userTimeZone = LocaleUtil.getUserTimeZone();
-       LocaleUtil.setUserTimeZone(LocaleUtil.TIMEZONE_UTC);
-   }
-   
-   
-   @AfterClass
-   public static void closeFS() throws Exception {
-       LocaleUtil.setUserTimeZone(userTimeZone);
-       fsMessageSucceeds.close();
-       fsMessageFails.close();
-   }
-   
-   /**
-    * Check we can find a sensible number of properties on a few
-    * of our test files
-    */
-   @Test
-   public void testPropertiesFound() throws Exception {
-       Map<MAPIProperty,List<PropertyValue>> props;
-       
-       props = mapiMessageSucceeds.getMainChunks().getProperties();
-       assertTrue(props.toString(), props.size() > 10);
-       
-       props = mapiMessageFails.getMainChunks().getProperties();
-       assertTrue(props.toString(), props.size() > 10);
-   }
-   
-   /**
-    * Check we find properties of a variety of different types
-    */
-   @Test
-   public void testPropertyValueTypes() throws Exception {
-       Chunks mainChunks = mapiMessageSucceeds.getMainChunks();
-       
-       // Ask to have the values looked up
-       Map<MAPIProperty,List<PropertyValue>> props = mainChunks.getProperties();
-       HashSet<Class<? extends PropertyValue>> seenTypes = 
-               new HashSet<Class<? extends PropertyValue>>();
-       for (List<PropertyValue> pvs : props.values()) {
-           for (PropertyValue pv : pvs) {
-               seenTypes.add(pv.getClass());
-           }
-       }
-       assertTrue(seenTypes.toString(), seenTypes.size() > 3);
-       assertTrue(seenTypes.toString(), seenTypes.contains(LongPropertyValue.class));
-       assertTrue(seenTypes.toString(), seenTypes.contains(TimePropertyValue.class));
-       assertFalse(seenTypes.toString(), seenTypes.contains(ChunkBasedPropertyValue.class));
-       
-       // Ask for the raw values
-       seenTypes.clear();
-       for (PropertyValue pv : mainChunks.getRawProperties().values()) {
-           seenTypes.add(pv.getClass());
-       }
-       assertTrue(seenTypes.toString(), seenTypes.size() > 3);
-       assertTrue(seenTypes.toString(), seenTypes.contains(LongPropertyValue.class));
-       assertTrue(seenTypes.toString(), seenTypes.contains(TimePropertyValue.class));
-       assertTrue(seenTypes.toString(), seenTypes.contains(ChunkBasedPropertyValue.class));
-   }
-
-   /**
-    * Test to see if we can read the Date Chunk with OutlookTextExtractor.
-    */
-   @Test
-   // @Ignore("TODO Work out why the Fri 22nd vs Monday 25th problem is occurring and fix")
-   public void testReadMessageDateSucceedsWithOutlookTextExtractor() throws Exception {
-      OutlookTextExtactor ext = new OutlookTextExtactor(mapiMessageSucceeds);
-      ext.setFilesystem(null); // Don't close re-used test resources here
-      
-      String text = ext.getText();
-      assertContains(text, "Date: Fri, 22 Jun 2012 18:32:54 +0000\n");
-      ext.close();
-   }
-
-   /**
-    * Test to see if we can read the Date Chunk with OutlookTextExtractor.
-    */
-   @Test
-   // @Ignore("TODO Work out why the Thu 21st vs Monday 25th problem is occurring and fix")
-   public void testReadMessageDateFailsWithOutlookTextExtractor() throws Exception {
-      OutlookTextExtactor ext = new OutlookTextExtactor(mapiMessageFails);
-      ext.setFilesystem(null); // Don't close re-used test resources here
-      
-      String text = ext.getText();
-      assertContains(text, "Date: Thu, 21 Jun 2012 14:14:04 +0000\n");
-      ext.close();
-   }
-
-   /**
-    * Test to see if we can read the Date Chunk with HSMFDump.
-    */
-   @Test
-   public void testReadMessageDateSucceedsWithHSMFDump() throws IOException {
-       PrintStream stream = new PrintStream(new ByteArrayOutputStream());
-       HSMFDump dump = new HSMFDump(fsMessageSucceeds);
-       dump.dump(stream);
-   }	
-
-   /**
-    * Test to see if we can read the Date Chunk with HSMFDump.
-    */
-   @Test
-   public void testReadMessageDateFailsWithHSMFDump() throws Exception {
-       PrintStream stream = new PrintStream(new ByteArrayOutputStream());
-       HSMFDump dump = new HSMFDump(fsMessageFails);
-       dump.dump(stream);
-   }
-
-   /**
-    * Will be based on the ClientSubmit time
-    */
-   @Test
-   public void testClientSubmitTime() throws Exception {
-       // Check via the message date
-       Calendar clientSubmitTime = mapiMessageSucceeds.getMessageDate();
-       assertEquals(
-               "Fri, 22 Jun 2012 18:32:54", 
-               messageDateFormat.format(clientSubmitTime.getTime()));
-       
-       // Fetch the property value directly
-       Map<MAPIProperty,List<PropertyValue>> props =
-               mapiMessageSucceeds.getMainChunks().getProperties();
-       List<PropertyValue> pv = props.get(MAPIProperty.CLIENT_SUBMIT_TIME); 
-       assertNotNull(pv);
-       assertEquals(1, pv.size());
-       
-       clientSubmitTime = (Calendar)pv.get(0).getValue();
-       assertEquals(
-               "Fri, 22 Jun 2012 18:32:54", 
-               messageDateFormat.format(clientSubmitTime.getTime()));
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
deleted file mode 100644
index dc4f1c9..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.IOException;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.POIDataSamples;
-
-import java.util.Calendar;
-
-import junit.framework.TestCase;
-
-public final class TestMessageSubmissionChunk extends TestCase {
-    
-    private final MAPIMessage mapiMessageExtraHyphenSubmissionChunk;
-    private final MAPIMessage mapiMessageNormalSubmissionChunk;
-
-    /**
-     * Initialise this test, load up the test messages.
-     * @throws Exception
-     */
-    public TestMessageSubmissionChunk() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHSMFInstance();
-        this.mapiMessageExtraHyphenSubmissionChunk = new MAPIMessage(samples.openResourceAsStream("message_extra_hyphen_submission_chunk.msg"));
-        this.mapiMessageNormalSubmissionChunk = new MAPIMessage(samples.openResourceAsStream("message_normal_submission_chunk.msg"));
-    }
-
-    public void testReadMessageDateExtraHyphenSubmissionChunk() throws ChunkNotFoundException {
-        final Calendar date = mapiMessageExtraHyphenSubmissionChunk.getMessageDate();
-        TestCase.assertNotNull(date);
-        final int year = date.get(Calendar.YEAR);
-        TestCase.assertEquals(2007, year);
-    }
-
-    public void testReadMessageDateNormalSubmissionChunk() throws ChunkNotFoundException {
-        final Calendar date = mapiMessageNormalSubmissionChunk.getMessageDate();
-        TestCase.assertNotNull(date);
-        final int year = date.get(Calendar.YEAR);
-        TestCase.assertEquals(2007, year);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
deleted file mode 100644
index ef770d4..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.IOException;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.POIDataSamples;
-
-import java.util.Calendar;
-
-import junit.framework.TestCase;
-
-public final class TestMessageSubmissionChunkY2KRead extends TestCase {
-    
-    private final MAPIMessage mapiMessage1979;
-    private final MAPIMessage mapiMessage1980;
-    private final MAPIMessage mapiMessage1981;
-
-    /**
-     * Initialise this test, load up the three test messages.
-     * @throws Exception
-     */
-    public TestMessageSubmissionChunkY2KRead() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHSMFInstance();
-        this.mapiMessage1979 = new MAPIMessage(samples.openResourceAsStream("message_1979.msg"));
-        this.mapiMessage1980 = new MAPIMessage(samples.openResourceAsStream("message_1980.msg"));
-        this.mapiMessage1981 = new MAPIMessage(samples.openResourceAsStream("message_1981.msg"));
-    }
-
-    // 1979 is one year before our pivot year (so this is an expected "failure")
-    public void testReadMessageDate1979() throws ChunkNotFoundException {
-        final Calendar date = mapiMessage1979.getMessageDate();
-        final int year = date.get(Calendar.YEAR);
-        TestCase.assertEquals(2079, year);
-    }
-
-    // 1980 is our pivot year (so this is an expected "failure")
-    public void testReadMessageDate1980() throws ChunkNotFoundException {
-        final Calendar date = mapiMessage1980.getMessageDate();
-        final int year = date.get(Calendar.YEAR);
-        TestCase.assertEquals(2080, year);
-    }
-
-    // 1981 is one year after our pivot year (so this starts working)
-    public void testReadMessageDate1981() throws ChunkNotFoundException {
-        final Calendar date = mapiMessage1981.getMessageDate();
-        final int year = date.get(Calendar.YEAR);
-        TestCase.assertEquals(1981, year);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
deleted file mode 100644
index 1496e08..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.IOException;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.POIDataSamples;
-
-import junit.framework.TestCase;
-
-/**
- * Tests to verify that we can still work on the newer Outlook 3.0 files.
- */
-public final class TestOutlook30FileRead extends TestCase {
-    private final MAPIMessage mapiMessage;
-
-    /**
-     * Initialize this test, load up the blank.msg mapi message.
-     * @throws Exception
-     */
-    public TestOutlook30FileRead() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHSMFInstance();
-        this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("outlook_30_msg.msg"));
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayCC() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayCC();
-        String expected = "";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayTo() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayTo();
-
-        assertTrue(obtained.startsWith("Bohn, Shawn"));
-    }
-
-    /**
-     * Test to see if we can read the From Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayFrom() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayFrom();
-        String expected = "Cramer, Nick";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayBCC() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayBCC();
-        String expected = "";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-
-    /**
-     * Check if we can read the body of the blank message, we expect "".
-     *
-     * @throws Exception
-     */
-    public void testReadBody() throws Exception {
-        String obtained = mapiMessage.getTextBody();
-        assertTrue(obtained.startsWith("I am shutting down"));
-    }
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     *
-     * @throws Exception
-     */
-    public void testReadSubject() throws Exception {
-        String obtained = mapiMessage.getSubject();
-        String expected = "IN-SPIRE servers going down for a bit, back up around 8am";
-
-        TestCase.assertEquals(expected, obtained);
-    }
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     *
-     * @throws Exception
-     */
-    public void testReadConversationTopic() throws Exception {
-        String obtained = mapiMessage.getConversationTopic();
-        TestCase.assertEquals("IN-SPIRE servers going down for a bit, back up around 8am", obtained);
-    }
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     *
-     * @throws Exception
-     */
-    public void testReadMessageClass() throws Exception {
-        String obtained = mapiMessage.getMessageClass();
-        TestCase.assertEquals("IPM.Note", obtained);
-    }
-
-    /**
-     * Ensure we can get the HTML and RTF versions
-     */
-    public void testReadBodyContents() throws Exception {
-        String html = mapiMessage.getHtmlBody();
-        String rtf = mapiMessage.getRtfBody();
-        assertNotNull(html);
-        assertNotNull(rtf);
-
-        assertTrue("Wrong text:\n" + html, html.startsWith("<!DOCTYPE"));
-        assertTrue("Wrong text:\n" + rtf,  rtf.startsWith("{\\rtf1"));
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
deleted file mode 100644
index bdfff10..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf;
-
-import java.io.IOException;
-
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.POIDataSamples;
-
-import junit.framework.TestCase;
-
-/**
- * Tests to verify that we can read a simple msg file, that is in plain/text
- *  format with no attachments or extra recipents.
- */
-public final class TestSimpleFileRead extends TestCase {
-    private final MAPIMessage mapiMessage;
-
-    /**
-     * Initialize this test, load up the blank.msg mapi message.
-     * @throws Exception
-     */
-    public TestSimpleFileRead() throws IOException {
-        POIDataSamples samples = POIDataSamples.getHSMFInstance();
-        this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("simple_test_msg.msg"));
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayCC() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayCC();
-        String expected = "";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayTo() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayTo();
-        String expected = "travis@overwrittenstack.com";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-    /**
-     * Test to see if we can read the From Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayFrom() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayFrom();
-        String expected = "Travis Ferguson";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-    /**
-     * Test to see if we can read the CC Chunk.
-     * @throws ChunkNotFoundException
-     *
-     */
-    public void testReadDisplayBCC() throws ChunkNotFoundException {
-        String obtained = mapiMessage.getDisplayBCC();
-        String expected = "";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-
-    /**
-     * Check if we can read the body of the blank message, we expect "".
-     *
-     * @throws Exception
-     */
-    public void testReadBody() throws Exception {
-        String obtained = mapiMessage.getTextBody();
-        String expected = "This is a test message.";
-
-        TestCase.assertEquals(obtained, expected);
-    }
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     *
-     * @throws Exception
-     */
-    public void testReadSubject() throws Exception {
-        String obtained = mapiMessage.getSubject();
-        String expected = "test message";
-
-        TestCase.assertEquals(expected, obtained);
-    }
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     *
-     * @throws Exception
-     */
-    public void testReadConversationTopic() throws Exception {
-        String obtained = mapiMessage.getConversationTopic();
-        TestCase.assertEquals("test message", obtained);
-    }
-
-
-    /**
-     * Check if we can read the subject line of the blank message, we expect ""
-     *
-     * @throws Exception
-     */
-    public void testReadMessageClass() throws Exception {
-        String obtained = mapiMessage.getMessageClass();
-        TestCase.assertEquals("IPM.Note", obtained);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
deleted file mode 100644
index ea6f8be..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import junit.framework.TestCase;
-
-/**
- * Verifies that the Chunks class is actually setup properly and hasn't been changed in ways
- * that will break the library.
- *
- * @author Travis Ferguson
- *
- */
-public final class TestChunkData extends TestCase {
-	public void testChunkCreate() {
-	   Chunk chunk;
-	   
-		chunk = new StringChunk(0x0200, Types.createCustom(0x001E));
-		assertEquals("__substg1.0_0200001E", chunk.getEntryName());
-		assertEquals(0x0200, chunk.getChunkId());
-		assertEquals(0x001E, chunk.getType().getId());
-
-      chunk = new StringChunk("__substg1.0_", 0x0200, Types.createCustom(0x001E));
-      assertEquals("__substg1.0_0200001E", chunk.getEntryName());
-      assertEquals(0x0200, chunk.getChunkId());
-      assertEquals(0x001E, chunk.getType().getId());
-      
-      chunk = new StringChunk("__substg1.0_", 0x0200, Types.getById(0x001E));
-      assertEquals("__substg1.0_0200001E", chunk.getEntryName());
-      assertEquals(0x0200, chunk.getChunkId());
-      assertEquals(0x001E, chunk.getType().getId());
-      
-		/* test the lower and upper limits of the chunk ids */
-		chunk = new StringChunk(0x0000, Types.createCustom(0x001E));
-		assertEquals("__substg1.0_0000001E", chunk.getEntryName());
-
-		chunk = new StringChunk(0xFFFF, Types.createCustom(0x001E));
-		assertEquals("__substg1.0_FFFF001E", chunk.getEntryName());
-
-		chunk = new StringChunk(0xFFFF, Types.createCustom(0x001F));
-		assertEquals("__substg1.0_FFFF001F", chunk.getEntryName());
-	}
-
-	public void testTextBodyChunk() {
-		StringChunk chunk = new StringChunk(0x1000, Types.UNICODE_STRING);
-		assertEquals(chunk.getChunkId(), MAPIProperty.BODY.id);
-	}
-
-	public void testDisplayToChunk() {
-		StringChunk chunk = new StringChunk(0x0E04, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIProperty.DISPLAY_TO.id);
-	}
-
-
-	public void testDisplayCCChunk() {
-		StringChunk chunk = new StringChunk(0x0E03, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIProperty.DISPLAY_CC.id);
-	}
-
-	public void testDisplayBCCChunk() {
-		StringChunk chunk = new StringChunk(0x0E02, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIProperty.DISPLAY_BCC.id);
-	}
-
-	public void testSubjectChunk() {
-		Chunk chunk = new StringChunk(0x0037, Types.UNICODE_STRING);
-      assertEquals(chunk.getChunkId(), MAPIProperty.SUBJECT.id);
-	}
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
deleted file mode 100644
index 55369e8..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.util.Collection;
-
-import junit.framework.TestCase;
-
-/**
- * Checks various MAPIProperty related logic
- */
-public final class TestMAPIProperty extends TestCase {
-   public void testGet() throws Exception {
-      assertEquals(MAPIProperty.DISPLAY_NAME, MAPIProperty.get(MAPIProperty.DISPLAY_NAME.id));
-      assertEquals(MAPIProperty.DISPLAY_BCC, MAPIProperty.get(MAPIProperty.DISPLAY_BCC.id));
-      assertNotSame(MAPIProperty.DISPLAY_BCC, MAPIProperty.get(MAPIProperty.DISPLAY_CC.id));
-   }
-   
-   public void testGetAll() throws Exception {
-      Collection<MAPIProperty> all = MAPIProperty.getAll();
-      assertEquals(true, all.contains(MAPIProperty.DISPLAY_NAME));
-      assertEquals(true, all.contains(MAPIProperty.DISPLAY_CC));
-      
-      // Won't contain custom
-      assertEquals(false, all.contains(MAPIProperty.createCustom(1, Types.UNSPECIFIED, "")));
-      
-      // Won't contain unknown
-      assertEquals(false, all.contains(MAPIProperty.UNKNOWN));
-   }
-   
-   public void testCustom() throws Exception {
-      MAPIProperty c1 = MAPIProperty.createCustom(1, Types.UNSPECIFIED, "");
-      MAPIProperty c2a = MAPIProperty.createCustom(2, Types.UNSPECIFIED, "2");
-      MAPIProperty c2b = MAPIProperty.createCustom(2, Types.UNSPECIFIED, "2");
-      
-      // New object each time
-      assertNotSame(c1, c2a);
-      assertNotSame(c1, c2b);
-      assertNotSame(c2a, c2b);
-      
-      // Won't be in all list
-      Collection<MAPIProperty> all = MAPIProperty.getAll();
-      assertEquals(false, all.contains(c1));
-      assertEquals(false, all.contains(c2a));
-      assertEquals(false, all.contains(c2b));
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java
deleted file mode 100644
index 815fb2d..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import java.util.Arrays;
-
-import org.apache.poi.hsmf.datatypes.AttachmentChunks.AttachmentChunksSorter;
-import org.apache.poi.hsmf.datatypes.RecipientChunks.RecipientChunksSorter;
-
-import junit.framework.TestCase;
-
-/**
- * Checks that the sorters on the chunk groups order
- *  chunks properly.
- */
-public final class TestSorters extends TestCase {
-   public void testAttachmentChunksSorter() {
-      AttachmentChunks[] chunks;
-      
-      // Simple
-      chunks = new AttachmentChunks[] {
-            new AttachmentChunks("__attach_version1.0_#00000001"),
-            new AttachmentChunks("__attach_version1.0_#00000000"),
-      };
-      Arrays.sort(chunks, new AttachmentChunksSorter());
-      assertEquals("__attach_version1.0_#00000000", chunks[0].getPOIFSName());
-      assertEquals("__attach_version1.0_#00000001", chunks[1].getPOIFSName());
-      
-      // Lots, with gaps
-      chunks = new AttachmentChunks[] {
-            new AttachmentChunks("__attach_version1.0_#00000101"),
-            new AttachmentChunks("__attach_version1.0_#00000001"),
-            new AttachmentChunks("__attach_version1.0_#00000002"),
-            new AttachmentChunks("__attach_version1.0_#00000005"),
-            new AttachmentChunks("__attach_version1.0_#00000026"),
-            new AttachmentChunks("__attach_version1.0_#00000000"),
-            new AttachmentChunks("__attach_version1.0_#000000AB"),
-      };
-      Arrays.sort(chunks, new AttachmentChunksSorter());
-      assertEquals("__attach_version1.0_#00000000", chunks[0].getPOIFSName());
-      assertEquals("__attach_version1.0_#00000001", chunks[1].getPOIFSName());
-      assertEquals("__attach_version1.0_#00000002", chunks[2].getPOIFSName());
-      assertEquals("__attach_version1.0_#00000005", chunks[3].getPOIFSName());
-      assertEquals("__attach_version1.0_#00000026", chunks[4].getPOIFSName());
-      assertEquals("__attach_version1.0_#000000AB", chunks[5].getPOIFSName());
-      assertEquals("__attach_version1.0_#00000101", chunks[6].getPOIFSName());
-   }
-   
-   public void testRecipientChunksSorter() {
-      RecipientChunks[] chunks;
-      
-      // Simple
-      chunks = new RecipientChunks[] {
-            new RecipientChunks("__recip_version1.0_#00000001"),
-            new RecipientChunks("__recip_version1.0_#00000000"),
-      };
-      Arrays.sort(chunks, new RecipientChunksSorter());
-      assertEquals(0, chunks[0].recipientNumber);
-      assertEquals(1, chunks[1].recipientNumber);
-      
-      // Lots, with gaps
-      chunks = new RecipientChunks[] {
-            new RecipientChunks("__recip_version1.0_#00020001"),
-            new RecipientChunks("__recip_version1.0_#000000FF"),
-            new RecipientChunks("__recip_version1.0_#00000205"),
-            new RecipientChunks("__recip_version1.0_#00000001"),
-            new RecipientChunks("__recip_version1.0_#00000005"),
-            new RecipientChunks("__recip_version1.0_#00000009"),
-            new RecipientChunks("__recip_version1.0_#00000404"),
-            new RecipientChunks("__recip_version1.0_#00000000"),
-      };
-      Arrays.sort(chunks, new RecipientChunksSorter());
-      assertEquals(0, chunks[0].recipientNumber);
-      assertEquals(1, chunks[1].recipientNumber);
-      assertEquals(5, chunks[2].recipientNumber);
-      assertEquals(9, chunks[3].recipientNumber);
-      assertEquals(0xFF, chunks[4].recipientNumber);
-      assertEquals(0x205, chunks[5].recipientNumber);
-      assertEquals(0x404, chunks[6].recipientNumber);
-      assertEquals(0x20001, chunks[7].recipientNumber);
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java
deleted file mode 100644
index 8a58639..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.datatypes;
-
-import org.apache.poi.hsmf.datatypes.Types;
-
-import junit.framework.TestCase;
-
-/**
- * Verifies that the Types class is behaving properly.
- * Also check that no changes have been made that will
- *  break the library.
- */
-public final class TestTypes extends TestCase {
-   public void testTypeIds() {
-      assertEquals(0x1e, Types.ASCII_STRING.getId());
-      assertEquals(0x1f, Types.UNICODE_STRING.getId());
-      
-      assertEquals(0x0102, Types.BINARY.getId());
-      assertEquals(0x000B, Types.BOOLEAN.getId());
-      assertEquals(0x0003, Types.LONG.getId());
-      assertEquals(0x0040, Types.TIME.getId());
-      
-      assertEquals(Types.ASCII_STRING, Types.getById(0x1e));
-      assertEquals(Types.UNICODE_STRING, Types.getById(0x1f));
-      
-      assertEquals(Types.BINARY, Types.getById(0x0102));
-      assertEquals(Types.BOOLEAN, Types.getById(0x000B));
-      assertEquals(Types.LONG, Types.getById(0x0003));
-      assertEquals(Types.TIME, Types.getById(0x0040));
-   }
-   
-   public void testTypeFormatting() {
-      assertEquals("0000", Types.asFileEnding(0x0000));
-      assertEquals("0020", Types.asFileEnding(0x0020));
-      assertEquals("0102", Types.asFileEnding(0x0102));
-      assertEquals("FEDC", Types.asFileEnding(0xfedc));
-   }
-   
-   public void testName() {
-      assertEquals("ASCII String", Types.ASCII_STRING.getName());
-      assertEquals("Boolean", Types.BOOLEAN.getName());
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
deleted file mode 100644
index 755bb63..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.extractor;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.apache.poi.POITestCase.assertNotContained;
-import static org.junit.Assert.assertEquals;
-
-import java.io.FileInputStream;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests to verify that the text extractor works
- */
-public final class TestOutlookTextExtractor {
-   private final POIDataSamples samples = POIDataSamples.getHSMFInstance();
-	
-   private static TimeZone userTZ;
-   
-   @BeforeClass
-   public static void initTimeZone() {
-       userTZ = LocaleUtil.getUserTimeZone();
-       LocaleUtil.setUserTimeZone(LocaleUtil.TIMEZONE_UTC);
-   }
-   
-   @AfterClass
-   public static void resetTimeZone() {
-       LocaleUtil.setUserTimeZone(userTZ);
-   }
-   
-   @Test
-   public void testQuick() throws Exception {
-      NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile("quick.msg"), true);
-      MAPIMessage msg = new MAPIMessage(poifs);
-      
-      OutlookTextExtactor ext = new OutlookTextExtactor(msg);
-      String text = ext.getText();
-      
-      assertContains(text, "From: Kevin Roast\n");
-      assertContains(text, "To: Kevin Roast <kevin.roast@alfresco.org>\n");
-      assertEquals(-1, text.indexOf("CC:"));
-      assertEquals(-1, text.indexOf("BCC:"));
-      assertEquals(-1, text.indexOf("Attachment:"));
-      assertContains(text, "Subject: Test the content transformer\n");
-      Calendar cal = LocaleUtil.getLocaleCalendar(2007, 5, 14, 9, 42, 55);
-      SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z", Locale.ROOT);
-      f.setTimeZone(LocaleUtil.getUserTimeZone());
-      String dateText = f.format(cal.getTime());
-      assertContains(text, "Date: " + dateText + "\n");
-      assertContains(text, "The quick brown fox jumps over the lazy dog");
-
-      ext.close();
-      poifs.close();
-   }
-   
-   @Test
-   public void testSimple() throws Exception {
-      NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile("simple_test_msg.msg"), true);
-      MAPIMessage msg = new MAPIMessage(poifs);
-      
-      OutlookTextExtactor ext = new OutlookTextExtactor(msg);
-      String text = ext.getText();
-      
-      assertContains(text, "From: Travis Ferguson\n");
-      assertContains(text, "To: travis@overwrittenstack.com\n");
-      assertEquals(-1, text.indexOf("CC:"));
-      assertEquals(-1, text.indexOf("BCC:"));
-      assertContains(text, "Subject: test message\n");
-      assertContains(text, "Date: Fri, 6 Jul 2007 05:27:17 +0000\n");
-      assertContains(text, "This is a test message.");
-
-      ext.close();
-      poifs.close();
-   }
-
-   @Test
-   public void testConstructors() throws Exception {
-        FileInputStream fis = new FileInputStream(samples.getFile("simple_test_msg.msg"));
-        OutlookTextExtactor ext = new OutlookTextExtactor(fis);
-        String inp = ext.getText();
-        ext.close();
-        fis.close();
-
-        NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile("simple_test_msg.msg"), true);
-        ext = new OutlookTextExtactor(poifs);
-        String poifsTxt = ext.getText();
-        ext.close();
-        poifs.close();
-
-        fis = new FileInputStream(samples.getFile("simple_test_msg.msg"));
-        ext = new OutlookTextExtactor(new MAPIMessage(fis));
-        String mapi = ext.getText();
-        ext.close();
-        fis.close();
-
-        assertEquals(inp, poifsTxt);
-        assertEquals(inp, mapi);
-   }
-   
-   /**
-    * Test that we correctly handle multiple To+CC+BCC
-    *  recipients in an email we sent.
-    */
-   @Test
-   public void testSentWithMulipleRecipients() throws Exception {
-      // To: 'Ashutosh Dandavate' <ashutosh.dandavate@alfresco.com>,
-      //   'Paul Holmes-Higgin' <paul.hh@alfresco.com>,
-      //   'Mike Farman' <mikef@alfresco.com>
-      // Cc: nickb@alfresco.com, nick.burch@alfresco.com,
-      //   'Roy Wetherall' <roy.wetherall@alfresco.com>
-      // Bcc: 'David Caruana' <dave.caruana@alfresco.com>,
-      //   'Vonka Jan' <roy.wetherall@alfresco.com>
-      
-      String[] files = new String[] {
-            "example_sent_regular.msg", "example_sent_unicode.msg"
-      };
-      for(String file : files) {
-         NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile(file), true);
-         MAPIMessage msg = new MAPIMessage(poifs);
-         
-         OutlookTextExtactor ext = new OutlookTextExtactor(msg);
-         String text = ext.getText();
-         
-         assertContains(text, "From: Mike Farman\n");
-         assertContains(text, "To: 'Ashutosh Dandavate' <ashutosh.dandavate@alfresco.com>; " +
-         		"'Paul Holmes-Higgin' <paul.hh@alfresco.com>; 'Mike Farman' <mikef@alfresco.com>\n");
-         assertContains(text, "CC: 'nickb@alfresco.com' <nickb@alfresco.com>; " +
-         		"'nick.burch@alfresco.com' <nick.burch@alfresco.com>; 'Roy Wetherall' <roy.wetherall@alfresco.com>\n");
-         assertContains(text, "BCC: 'David Caruana' <dave.caruana@alfresco.com>; " +
-         		"'Vonka Jan' <jan.vonka@alfresco.com>\n");
-         assertContains(text, "Subject: This is a test message please ignore\n");
-         assertContains(text, "Date:");
-         assertContains(text, "The quick brown fox jumps over the lazy dog");
-
-         ext.close();
-         poifs.close();
-      }
-   }
-   
-   /**
-    * Test that we correctly handle multiple To+CC
-    *  recipients in an email we received.
-    */
-   @Test
-   public void testReceivedWithMultipleRecipients() throws Exception {
-      // To: 'Ashutosh Dandavate' <ashutosh.dandavate@alfresco.com>,
-      //   'Paul Holmes-Higgin' <paul.hh@alfresco.com>,
-      //   'Mike Farman' <mikef@alfresco.com>
-      // Cc: nickb@alfresco.com, nick.burch@alfresco.com,
-      //   'Roy Wetherall' <roy.wetherall@alfresco.com>
-      // (No BCC shown) 
-      
-      
-      String[] files = new String[] {
-            "example_received_regular.msg", "example_received_unicode.msg"
-      };
-      for(String file : files) {
-          NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile(file), true);
-          MAPIMessage msg = new MAPIMessage(poifs);
-
-         
-         OutlookTextExtactor ext = new OutlookTextExtactor(msg);
-         String text = ext.getText();
-         
-         assertContains(text, "From: Mike Farman\n");
-         assertContains(text, "To: 'Ashutosh Dandavate' <ashutosh.dandavate@alfresco.com>; " +
-               "'Paul Holmes-Higgin' <paul.hh@alfresco.com>; 'Mike Farman' <mikef@alfresco.com>\n");
-         assertContains(text, "CC: nickb@alfresco.com; " +
-               "nick.burch@alfresco.com; 'Roy Wetherall' <roy.wetherall@alfresco.com>\n");
-         assertEquals(-1, text.indexOf("BCC:"));
-         assertContains(text, "Subject: This is a test message please ignore\n");
-         assertContains(text, "Date: Mon, 11 Jan 2010 16:2"); // Exact times differ slightly
-         assertContains(text, "The quick brown fox jumps over the lazy dog");
-
-         ext.close();
-         poifs.close();
-      }
-   }
-   
-   /**
-    * See also {@link org.apache.poi.extractor.TestExtractorFactory#testEmbeded()}
-    */
-   public void testWithAttachments() throws Exception {
-      NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile("attachment_test_msg.msg"), true);
-      MAPIMessage msg = new MAPIMessage(poifs);
-      OutlookTextExtactor ext = new OutlookTextExtactor(msg);
-      
-      // Check the normal bits
-      String text = ext.getText();
-      
-      assertContains(text, "From: Nicolas1");
-      assertContains(text, "To: 'nicolas1.23456@free.fr'");
-      assertEquals(-1, text.indexOf("CC:"));
-      assertEquals(-1, text.indexOf("BCC:"));
-      assertContains(text, "Subject: test");
-      assertContains(text, "Date: Wed, 22 Apr");
-      assertContains(text, "Attachment: test-unicode.doc\n");
-      assertContains(text, "Attachment: pj1.txt\n");
-      assertContains(text, "contenu");
-      
-      // Embeded bits are checked in
-      //  TestExtractorFactory
-
-      ext.close();
-      poifs.close();
-   }
-   
-   public void testWithAttachedMessage() throws Exception {
-       NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile("58214_with_attachment.msg"), true);
-         MAPIMessage msg = new MAPIMessage(poifs);
-         OutlookTextExtactor ext = new OutlookTextExtactor(msg);
-         String text = ext.getText();
-         
-         // Check we got bits from the main message
-         assertContains(text, "Master mail");
-         assertContains(text, "ante in lacinia euismod");
-         
-         // But not the attached message
-         assertNotContained(text, "Test mail attachment");
-         assertNotContained(text, "Lorem ipsum dolor sit");
-         
-         ext.close();
-         poifs.close();
-   }
-   
-   public void testEncodings() throws Exception {
-      NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile("chinese-traditional.msg"), true);
-      MAPIMessage msg = new MAPIMessage(poifs);
-      OutlookTextExtactor ext = new OutlookTextExtactor(msg);
-      String text = ext.getText();
-      
-      // Check the english bits
-      assertContains(text, "From: Tests Chang@FT");
-      assertContains(text, "tests.chang@fengttt.com");
-      
-      // And check some chinese bits
-      assertContains(text, "(\u5f35\u6bd3\u502b)");
-      assertContains(text, "( MSG \u683c\u5f0f\u6e2c\u8a66 )");
-
-      ext.close();
-      poifs.close();
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java b/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
deleted file mode 100644
index 58ff1cc..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hsmf.parsers;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Calendar;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hsmf.MAPIMessage;
-import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.datatypes.ChunkGroup;
-import org.apache.poi.hsmf.datatypes.Chunks;
-import org.apache.poi.hsmf.datatypes.MAPIProperty;
-import org.apache.poi.hsmf.datatypes.NameIdChunks;
-import org.apache.poi.hsmf.datatypes.RecipientChunks;
-import org.apache.poi.hsmf.datatypes.RecipientChunks.RecipientChunksSorter;
-import org.apache.poi.hsmf.datatypes.StringChunk;
-import org.apache.poi.hsmf.datatypes.Types;
-import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Tests to verify that the chunk parser works properly
- */
-public final class TestPOIFSChunkParser {
-   private final POIDataSamples samples = POIDataSamples.getHSMFInstance();
-
-   @Test
-   public void testFindsCore() throws Exception {
-      NPOIFSFileSystem simple = new NPOIFSFileSystem(samples.getFile("quick.msg"), true);
-      
-      // Check a few core things are present
-      simple.getRoot().getEntry(
-            (new StringChunk(MAPIProperty.SUBJECT.id, Types.ASCII_STRING)).getEntryName()
-      );
-      simple.getRoot().getEntry(
-            (new StringChunk(MAPIProperty.SENDER_NAME.id, Types.ASCII_STRING)).getEntryName()
-      );
-      
-      // Now load the file
-      MAPIMessage msg = new MAPIMessage(simple);
-      assertEquals("Kevin Roast", msg.getDisplayTo());
-      assertEquals("Kevin Roast", msg.getDisplayFrom());
-      assertEquals("Test the content transformer", msg.getSubject());
-      
-      // Check date too
-      Calendar calExp = LocaleUtil.getLocaleCalendar(2007,5,14,9,42,55);
-      Calendar calAct = msg.getMessageDate();
-      assertEquals( calExp, calAct );
-
-      simple.close();
-   }
-   
-   public void testFindsRecips() throws IOException, ChunkNotFoundException {
-      NPOIFSFileSystem simple = new NPOIFSFileSystem(samples.getFile("quick.msg"), true);
-      
-      simple.getRoot().getEntry("__recip_version1.0_#00000000");
-
-      ChunkGroup[] groups = POIFSChunkParser.parse(simple.getRoot());
-      assertEquals(3, groups.length);
-      assertTrue(groups[0] instanceof Chunks);
-      assertTrue(groups[1] instanceof RecipientChunks);
-      assertTrue(groups[2] instanceof NameIdChunks);
-      
-      RecipientChunks recips = (RecipientChunks)groups[1];
-      assertEquals("kevin.roast@alfresco.org", recips.recipientSMTPChunk.getValue());
-      assertEquals("/O=HOSTEDSERVICE2/OU=FIRST ADMINISTRATIVE GROUP/CN=RECIPIENTS/CN=Kevin.roast@ben", 
-            recips.recipientEmailChunk.getValue());
-      
-      String search = new String(recips.recipientSearchChunk.getValue(), "ASCII");
-      assertEquals("CN=KEVIN.ROAST@BEN\0", search.substring(search.length()-19));
-      
-      // Now via MAPIMessage
-      MAPIMessage msg = new MAPIMessage(simple);
-      assertNotNull(msg.getRecipientDetailsChunks());
-      assertEquals(1, msg.getRecipientDetailsChunks().length);
-      
-      assertEquals("kevin.roast@alfresco.org", msg.getRecipientDetailsChunks()[0].recipientSMTPChunk.getValue());
-      assertEquals("kevin.roast@alfresco.org", msg.getRecipientDetailsChunks()[0].getRecipientEmailAddress());
-      assertEquals("Kevin Roast", msg.getRecipientDetailsChunks()[0].getRecipientName());
-      assertEquals("kevin.roast@alfresco.org", msg.getRecipientEmailAddress());
-      
-      
-      // Try both SMTP and EX files for recipient
-      assertEquals("EX", msg.getRecipientDetailsChunks()[0].deliveryTypeChunk.getValue());
-      assertEquals("kevin.roast@alfresco.org", msg.getRecipientDetailsChunks()[0].recipientSMTPChunk.getValue());
-      assertEquals("/O=HOSTEDSERVICE2/OU=FIRST ADMINISTRATIVE GROUP/CN=RECIPIENTS/CN=Kevin.roast@ben", 
-            msg.getRecipientDetailsChunks()[0].recipientEmailChunk.getValue());
-      simple.close();
-      
-      
-      // Now look at another message
-      simple = new NPOIFSFileSystem(samples.getFile("simple_test_msg.msg"), true);
-      msg = new MAPIMessage(simple);
-      assertNotNull(msg.getRecipientDetailsChunks());
-      assertEquals(1, msg.getRecipientDetailsChunks().length);
-      
-      assertEquals("SMTP", msg.getRecipientDetailsChunks()[0].deliveryTypeChunk.getValue());
-      assertEquals(null, msg.getRecipientDetailsChunks()[0].recipientSMTPChunk);
-      assertEquals(null, msg.getRecipientDetailsChunks()[0].recipientNameChunk);
-      assertEquals("travis@overwrittenstack.com", msg.getRecipientDetailsChunks()[0].recipientEmailChunk.getValue());
-      assertEquals("travis@overwrittenstack.com", msg.getRecipientEmailAddress());
-      
-      simple.close();
-   }
-   
-   public void testFindsMultipleRecipients() throws IOException, ChunkNotFoundException {
-      NPOIFSFileSystem multiple = new NPOIFSFileSystem(samples.getFile("example_received_unicode.msg"), true);
-      
-      multiple.getRoot().getEntry("__recip_version1.0_#00000000");
-      multiple.getRoot().getEntry("__recip_version1.0_#00000001");
-      multiple.getRoot().getEntry("__recip_version1.0_#00000002");
-      multiple.getRoot().getEntry("__recip_version1.0_#00000003");
-      multiple.getRoot().getEntry("__recip_version1.0_#00000004");
-      multiple.getRoot().getEntry("__recip_version1.0_#00000005");
-      
-      ChunkGroup[] groups = POIFSChunkParser.parse(multiple.getRoot());
-      assertEquals(9, groups.length);
-      assertTrue(groups[0] instanceof Chunks);
-      assertTrue(groups[1] instanceof RecipientChunks);
-      assertTrue(groups[2] instanceof RecipientChunks);
-      assertTrue(groups[3] instanceof RecipientChunks);
-      assertTrue(groups[4] instanceof RecipientChunks);
-      assertTrue(groups[5] instanceof AttachmentChunks);
-      assertTrue(groups[6] instanceof RecipientChunks);
-      assertTrue(groups[7] instanceof RecipientChunks);
-      assertTrue(groups[8] instanceof NameIdChunks);
-      
-      // In FS order initially
-      RecipientChunks[] chunks = new RecipientChunks[] {
-            (RecipientChunks)groups[1],
-            (RecipientChunks)groups[2],
-            (RecipientChunks)groups[3],
-            (RecipientChunks)groups[4],
-            (RecipientChunks)groups[6],
-            (RecipientChunks)groups[7],
-      };
-      assertEquals(6, chunks.length);
-      assertEquals(0, chunks[0].recipientNumber);
-      assertEquals(2, chunks[1].recipientNumber);
-      assertEquals(4, chunks[2].recipientNumber);
-      assertEquals(5, chunks[3].recipientNumber);
-      assertEquals(3, chunks[4].recipientNumber);
-      assertEquals(1, chunks[5].recipientNumber);
-      
-      // Check
-      assertEquals("'Ashutosh Dandavate'", chunks[0].getRecipientName());
-      assertEquals("ashutosh.dandavate@alfresco.com", chunks[0].getRecipientEmailAddress());
-      assertEquals("'Mike Farman'", chunks[1].getRecipientName());
-      assertEquals("mikef@alfresco.com", chunks[1].getRecipientEmailAddress());
-      assertEquals("nick.burch@alfresco.com", chunks[2].getRecipientName());
-      assertEquals("nick.burch@alfresco.com", chunks[2].getRecipientEmailAddress());
-      assertEquals("'Roy Wetherall'", chunks[3].getRecipientName());
-      assertEquals("roy.wetherall@alfresco.com", chunks[3].getRecipientEmailAddress());
-      assertEquals("nickb@alfresco.com", chunks[4].getRecipientName());
-      assertEquals("nickb@alfresco.com", chunks[4].getRecipientEmailAddress());
-      assertEquals("'Paul Holmes-Higgin'", chunks[5].getRecipientName());
-      assertEquals("paul.hh@alfresco.com", chunks[5].getRecipientEmailAddress());
-      
-      // Now sort, and re-check
-      Arrays.sort(chunks, new RecipientChunksSorter());
-      
-      assertEquals("'Ashutosh Dandavate'", chunks[0].getRecipientName());
-      assertEquals("ashutosh.dandavate@alfresco.com", chunks[0].getRecipientEmailAddress());
-      assertEquals("'Paul Holmes-Higgin'", chunks[1].getRecipientName());
-      assertEquals("paul.hh@alfresco.com", chunks[1].getRecipientEmailAddress());
-      assertEquals("'Mike Farman'", chunks[2].getRecipientName());
-      assertEquals("mikef@alfresco.com", chunks[2].getRecipientEmailAddress());
-      assertEquals("nickb@alfresco.com", chunks[3].getRecipientName());
-      assertEquals("nickb@alfresco.com", chunks[3].getRecipientEmailAddress());
-      assertEquals("nick.burch@alfresco.com", chunks[4].getRecipientName());
-      assertEquals("nick.burch@alfresco.com", chunks[4].getRecipientEmailAddress());
-      assertEquals("'Roy Wetherall'", chunks[5].getRecipientName());
-      assertEquals("roy.wetherall@alfresco.com", chunks[5].getRecipientEmailAddress());
-      
-      // Finally check on message
-      MAPIMessage msg = new MAPIMessage(multiple);
-      assertEquals(6, msg.getRecipientEmailAddressList().length);
-      assertEquals(6, msg.getRecipientNamesList().length);
-      
-      assertEquals("'Ashutosh Dandavate'", msg.getRecipientNamesList()[0]);
-      assertEquals("'Paul Holmes-Higgin'", msg.getRecipientNamesList()[1]);
-      assertEquals("'Mike Farman'",        msg.getRecipientNamesList()[2]);
-      assertEquals("nickb@alfresco.com",   msg.getRecipientNamesList()[3]);
-      assertEquals("nick.burch@alfresco.com", msg.getRecipientNamesList()[4]);
-      assertEquals("'Roy Wetherall'",      msg.getRecipientNamesList()[5]);
-      
-      assertEquals("ashutosh.dandavate@alfresco.com", msg.getRecipientEmailAddressList()[0]);
-      assertEquals("paul.hh@alfresco.com",            msg.getRecipientEmailAddressList()[1]);
-      assertEquals("mikef@alfresco.com",              msg.getRecipientEmailAddressList()[2]);
-      assertEquals("nickb@alfresco.com",              msg.getRecipientEmailAddressList()[3]);
-      assertEquals("nick.burch@alfresco.com",         msg.getRecipientEmailAddressList()[4]);
-      assertEquals("roy.wetherall@alfresco.com",      msg.getRecipientEmailAddressList()[5]);
-      
-      multiple.close();
-   }
-   
-   public void testFindsNameId() throws IOException {
-      NPOIFSFileSystem simple = new NPOIFSFileSystem(samples.getFile("quick.msg"), true);
-      
-      simple.getRoot().getEntry("__nameid_version1.0");
-
-      ChunkGroup[] groups = POIFSChunkParser.parse(simple.getRoot());
-      assertEquals(3, groups.length);
-      assertTrue(groups[0] instanceof Chunks);
-      assertTrue(groups[1] instanceof RecipientChunks);
-      assertTrue(groups[2] instanceof NameIdChunks);
-      
-      NameIdChunks nameId = (NameIdChunks)groups[2];
-      assertEquals(10, nameId.getAll().length);
-      
-      // Now via MAPIMessage
-      MAPIMessage msg = new MAPIMessage(simple);
-      assertNotNull(msg.getNameIdChunks());
-      assertEquals(10, msg.getNameIdChunks().getAll().length);
-      
-      simple.close();
-   }
-   
-   public void testFindsAttachments() throws Exception {
-	  NPOIFSFileSystem with = new NPOIFSFileSystem(samples.getFile("attachment_test_msg.msg"), true);
-      NPOIFSFileSystem without = new NPOIFSFileSystem(samples.getFile("quick.msg"), true);
-      AttachmentChunks attachment;
-      
-      
-      // Check raw details on the one with
-      with.getRoot().getEntry("__attach_version1.0_#00000000");
-      with.getRoot().getEntry("__attach_version1.0_#00000001");
-      POIFSChunkParser.parse(with.getRoot());
-      
-      ChunkGroup[] groups = POIFSChunkParser.parse(with.getRoot());
-      assertEquals(5, groups.length);
-      assertTrue(groups[0] instanceof Chunks);
-      assertTrue(groups[1] instanceof RecipientChunks);
-      assertTrue(groups[2] instanceof AttachmentChunks);
-      assertTrue(groups[3] instanceof AttachmentChunks);
-      assertTrue(groups[4] instanceof NameIdChunks);
-      
-      attachment = (AttachmentChunks)groups[2];
-      assertEquals("TEST-U~1.DOC", attachment.attachFileName.toString());
-      assertEquals("test-unicode.doc", attachment.attachLongFileName.toString());
-      assertEquals(24064, attachment.attachData.getValue().length);
-      
-      attachment = (AttachmentChunks)groups[3];
-      assertEquals("pj1.txt", attachment.attachFileName.toString());
-      assertEquals("pj1.txt", attachment.attachLongFileName.toString());
-      assertEquals(89, attachment.attachData.getValue().length);
-	   
-      
-      // Check raw details on one without
-      assertFalse(without.getRoot().hasEntry("__attach_version1.0_#00000000"));
-      assertFalse(without.getRoot().hasEntry("__attach_version1.0_#00000001"));
-      
-	   // One with, from the top
-      MAPIMessage msgWith = new MAPIMessage(with);
-      assertEquals(2, msgWith.getAttachmentFiles().length);
-
-      attachment = msgWith.getAttachmentFiles()[0];
-      assertEquals("TEST-U~1.DOC", attachment.attachFileName.toString());
-      assertEquals("test-unicode.doc", attachment.attachLongFileName.toString());
-      assertEquals(24064, attachment.attachData.getValue().length);
-      
-      attachment = msgWith.getAttachmentFiles()[1];
-      assertEquals("pj1.txt", attachment.attachFileName.toString());
-      assertEquals("pj1.txt", attachment.attachLongFileName.toString());
-      assertEquals(89, attachment.attachData.getValue().length);
-      
-      // Plus check core details are there
-      assertEquals("'nicolas1.23456@free.fr'", msgWith.getDisplayTo());
-      assertEquals("Nicolas1 23456", msgWith.getDisplayFrom());
-      assertEquals("test pi\u00e8ce jointe 1", msgWith.getSubject());
-      
-	   // One without, from the top
-      MAPIMessage msgWithout = new MAPIMessage(without);
-      
-      // No attachments
-      assertEquals(0, msgWithout.getAttachmentFiles().length);
-      
-      // But has core details
-      assertEquals("Kevin Roast", msgWithout.getDisplayTo());
-      assertEquals("Kevin Roast", msgWithout.getDisplayFrom());
-      assertEquals("Test the content transformer", msgWithout.getSubject());
-
-      without.close();
-      with.close();
-   }
-	
-   /**
-    * Bugzilla #51873 - Outlook 2002 files created with dragging and
-    *  dropping files to the disk include a non-standard named streams
-    *  such as "Olk10SideProps_0001"
-    */
-   public void testOlk10SideProps() throws Exception {
-      NPOIFSFileSystem poifs = new NPOIFSFileSystem(samples.getFile("51873.msg"), true);
-      MAPIMessage msg = new MAPIMessage(poifs);
-
-      // Check core details came through
-      assertEquals("bubba@bubbasmith.com", msg.getDisplayTo());
-      assertEquals("Test with Olk10SideProps_ Chunk", msg.getSubject());
-      
-      poifs.close();
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java b/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
deleted file mode 100644
index 799a44c..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.converter;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(Parameterized.class)
-public class TestExcelConverterSuite
-{
-    /**
-     * YK: a quick hack to exclude failing documents from the suite.
-     */
-    @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
-    private static List<String> failingFiles = Arrays.asList(
-            /* not failing, but requires more memory */
-            "ex45698-22488.xls" );
-
-    @Parameterized.Parameters(name="{index}: {0}")
-    public static Iterable<Object[]> files() {
-        List<Object[]> files = new ArrayList<Object[]>();
-        File directory = POIDataSamples.getDocumentInstance().getFile(
-                "../spreadsheet" );
-        for ( final File child : directory.listFiles( new FilenameFilter()
-        {
-            @Override
-            public boolean accept( File dir, String name )
-            {
-                return name.endsWith( ".xls" ) && !failingFiles.contains( name );
-            }
-        } ) )
-        {
-            files.add(new Object[] { child });
-        }
-
-        return files;
-    }
-
-
-    @Parameterized.Parameter
-    public File child;
-
-    @Test
-    public void testFo() throws Exception
-    {
-        HSSFWorkbook workbook;
-        try {
-            workbook = ExcelToHtmlUtils.loadXls( child );
-        } catch ( Exception exc ) {
-            // unable to parse file -- not ExcelToFoConverter fault
-            return;
-        }
-
-        ExcelToHtmlConverter excelToHtmlConverter = new ExcelToHtmlConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        excelToHtmlConverter.processWorkbook( workbook );
-
-        StringWriter stringWriter = new StringWriter();
-
-        Transformer transformer = TransformerFactory.newInstance()
-                .newTransformer();
-        transformer.setOutputProperty( OutputKeys.ENCODING, "utf-8" );
-        transformer.setOutputProperty( OutputKeys.INDENT, "yes" );
-        transformer.setOutputProperty( OutputKeys.METHOD, "xml" );
-        transformer.transform(
-                new DOMSource( excelToHtmlConverter.getDocument() ),
-                new StreamResult( stringWriter ) );
-
-        assertNotNull(stringWriter.toString());
-    }
-
-    @Test
-    public void testHtml() throws Exception
-    {
-        HSSFWorkbook workbook;
-        try {
-            workbook = ExcelToHtmlUtils.loadXls( child );
-        } catch ( Exception exc ) {
-            // unable to parse file -- not ExcelToFoConverter fault
-            return;
-        }
-
-        ExcelToHtmlConverter excelToHtmlConverter = new ExcelToHtmlConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        excelToHtmlConverter.processWorkbook( workbook );
-
-        StringWriter stringWriter = new StringWriter();
-
-        Transformer transformer = TransformerFactory.newInstance()
-                .newTransformer();
-        transformer.setOutputProperty( OutputKeys.ENCODING, "utf-8" );
-        transformer.setOutputProperty( OutputKeys.INDENT, "no" );
-        transformer.setOutputProperty( OutputKeys.METHOD, "html" );
-        transformer.transform(
-                new DOMSource( excelToHtmlConverter.getDocument() ),
-                new StreamResult( stringWriter ) );
-
-        assertNotNull(stringWriter.toString());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java b/trunk/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
deleted file mode 100644
index 987741f..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.chart.SeriesRecord;
-import org.apache.poi.hssf.usermodel.HSSFChart.HSSFSeries;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressBase;
-import org.junit.Test;
-
-/**
- * Tests for {@link HSSFChart}
- */
-public final class TestHSSFChart {
-
-	@Test
-	public void testSingleChart() {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithChart.xls");
-
-		HSSFSheet s1 = wb.getSheetAt(0);
-		HSSFSheet s2 = wb.getSheetAt(1);
-		HSSFSheet s3 = wb.getSheetAt(2);
-
-		assertEquals(0, HSSFChart.getSheetCharts(s1).length);
-		assertEquals(1, HSSFChart.getSheetCharts(s2).length);
-		assertEquals(0, HSSFChart.getSheetCharts(s3).length);
-
-		HSSFChart[] charts;
-
-		// Check the chart on the 2nd sheet
-		charts = HSSFChart.getSheetCharts(s2);
-		assertEquals(1, charts.length);
-
-		assertEquals(2, charts[0].getSeries().length);
-		assertEquals("1st Column", charts[0].getSeries()[0].getSeriesTitle());
-		assertEquals("2nd Column", charts[0].getSeries()[1].getSeriesTitle());
-		assertNull(charts[0].getChartTitle());
-
-		// Check x, y, width, height
-		assertEquals(0, charts[0].getChartX());
-		assertEquals(0, charts[0].getChartY());
-		assertEquals(26492928, charts[0].getChartWidth());
-		assertEquals(15040512, charts[0].getChartHeight());
-	}
-
-	@Test
-	public void testTwoCharts() {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithTwoCharts.xls");
-
-		HSSFSheet s1 = wb.getSheetAt(0);
-		HSSFSheet s2 = wb.getSheetAt(1);
-		HSSFSheet s3 = wb.getSheetAt(2);
-
-		assertEquals(0, HSSFChart.getSheetCharts(s1).length);
-		assertEquals(1, HSSFChart.getSheetCharts(s2).length);
-		assertEquals(1, HSSFChart.getSheetCharts(s3).length);
-
-		HSSFChart[] charts;
-
-		// Check the chart on the 2nd sheet
-		charts = HSSFChart.getSheetCharts(s2);
-		assertEquals(1, charts.length);
-
-		assertEquals(2, charts[0].getSeries().length);
-		assertEquals("1st Column", charts[0].getSeries()[0].getSeriesTitle());
-		assertEquals("2nd Column", charts[0].getSeries()[1].getSeriesTitle());
-		assertNull(charts[0].getChartTitle());
-
-		// And the third sheet
-		charts = HSSFChart.getSheetCharts(s3);
-		assertEquals(1, charts.length);
-
-		assertEquals(2, charts[0].getSeries().length);
-		assertEquals("Squares", charts[0].getSeries()[0].getSeriesTitle());
-		assertEquals("Base Numbers", charts[0].getSeries()[1].getSeriesTitle());
-		assertNull(charts[0].getChartTitle());
-	}
-
-	@Test
-	public void testThreeCharts() {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithThreeCharts.xls");
-
-		HSSFSheet s1 = wb.getSheetAt(0);
-		HSSFSheet s2 = wb.getSheetAt(1);
-		HSSFSheet s3 = wb.getSheetAt(2);
-
-		assertEquals(0, HSSFChart.getSheetCharts(s1).length);
-		assertEquals(2, HSSFChart.getSheetCharts(s2).length);
-		assertEquals(1, HSSFChart.getSheetCharts(s3).length);
-
-		HSSFChart[] charts;
-
-		// Check the charts on the 2nd sheet
-		charts = HSSFChart.getSheetCharts(s2);
-		assertEquals(2, charts.length);
-
-		assertEquals(2, charts[0].getSeries().length);
-		assertEquals("1st Column", charts[0].getSeries()[0].getSeriesTitle());
-		assertEquals("2nd Column", charts[0].getSeries()[1].getSeriesTitle());
-		assertEquals(6, charts[0].getSeries()[0].getNumValues());
-		assertEquals(6, charts[0].getSeries()[1].getNumValues());
-		assertEquals(SeriesRecord.CATEGORY_DATA_TYPE_NUMERIC, charts[0].getSeries()[0].getValueType());
-		assertEquals(SeriesRecord.CATEGORY_DATA_TYPE_NUMERIC, charts[0].getSeries()[1].getValueType());
-		assertNull(charts[0].getChartTitle());
-
-		assertEquals(1, charts[1].getSeries().length);
-		assertNull(charts[1].getSeries()[0].getSeriesTitle());
-		assertEquals("Pie Chart Title Thingy", charts[1].getChartTitle());
-
-		// And the third sheet
-		charts = HSSFChart.getSheetCharts(s3);
-		assertEquals(1, charts.length);
-
-		assertEquals(2, charts[0].getSeries().length);
-		assertEquals("Squares", charts[0].getSeries()[0].getSeriesTitle());
-		assertEquals("Base Numbers", charts[0].getSeries()[1].getSeriesTitle());
-		assertEquals("Sheet 3 Chart with Title", charts[0].getChartTitle());
-	}
-	
-    @Test
-    public void testExistingSheet3() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
-        
-        HSSFSheet sheet = wb.getSheetAt( 2 ) ;
-        HSSFChart[] charts = HSSFChart.getSheetCharts( sheet ) ;
-        assertEquals(1, charts.length);
-        
-        for ( HSSFChart chart : charts ) {
-            for ( HSSFSeries series : chart.getSeries() ) {
-                chart.removeSeries( series ) ;
-            }
-        }
-        
-        // Save and re-check
-        wb = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt( 2 ) ;
-        assertEquals(1, HSSFChart.getSheetCharts(sheet).length);
-        
-        HSSFChart c = HSSFChart.getSheetCharts(sheet)[0];
-        assertEquals(0, c.getSeries().length);
-    }
-
-    @Test
-    public void testExistingSheet2() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
-        HSSFSheet sheet = wb.getSheetAt( 1 ) ;
-        HSSFChart[] charts = HSSFChart.getSheetCharts( sheet ) ;
-        
-        assertEquals(1, charts.length);
-        for ( HSSFChart chart : charts ) {
-            HSSFSeries series ;
-            
-            // Starts with one
-            assertEquals(1, chart.getSeries().length);
-
-            // Add two more
-            series = chart.createSeries() ;
-            series.setCategoryLabelsCellRange( new CellRangeAddress( 3, 4, 0, 0 ) ) ;
-            series.setValuesCellRange( new CellRangeAddress( 3, 4, 1, 1 ) ) ;
-
-            series = chart.createSeries() ;
-            series.setCategoryLabelsCellRange( new CellRangeAddress( 6, 7, 0, 0 ) ) ;
-            series.setValuesCellRange( new CellRangeAddress( 6, 7, 1, 1 ) ) ;
-        }
-        
-        // Save and re-check
-        wb = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt( 1 ) ;
-        assertEquals(1, HSSFChart.getSheetCharts(sheet).length);
-        
-        HSSFChart c = HSSFChart.getSheetCharts(sheet)[0];
-        assertEquals(3, c.getSeries().length);
-    }
-
-    @Test
-    public void testExistingSheet1() throws Exception {
-       HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
-        HSSFSheet sheet = wb.getSheetAt( 0 ) ;
-        HSSFChart[] charts = HSSFChart.getSheetCharts( sheet ) ;
-        
-        for ( HSSFChart chart : charts ) {
-            //System.out.println( chart.getType() ) ;
-            HSSFSeries[] seriesArray = chart.getSeries() ;
-            //System.out.println( "seriesArray.length=" + seriesArray.length ) ;
-            for ( HSSFSeries series : seriesArray )
-            {
-                //System.out.println( "serie.getNumValues()=" + series.getNumValues() ) ;
-                CellRangeAddressBase range ;
-
-                range = series.getValuesCellRange() ;
-                //System.out.println( range.toString() ) ;
-                range.setLastRow( range.getLastRow() + 1 ) ;
-                series.setValuesCellRange( range ) ;
-
-                range = series.getCategoryLabelsCellRange() ;
-                //System.out.println( range.toString() ) ;
-                range.setLastRow( range.getLastRow() + 1 ) ;
-                series.setCategoryLabelsCellRange( range ) ;
-            }
-
-            for ( int id = 0 ; id < 2 ; id++ )
-            {
-                HSSFSeries newSeries = chart.createSeries() ;
-                newSeries.setValuesCellRange( new CellRangeAddress( 1 + id, 4, 3, 3 ) ) ;
-                String oldSeriesTitle = newSeries.getSeriesTitle() ;
-                if ( oldSeriesTitle != null )
-                {
-                    //System.out.println( "old series title: " + oldSeriesTitle ) ;
-                    newSeries.setSeriesTitle( "new series" ) ;
-                }
-            }
-        }
-
-        HSSFChart chart = charts[ 2 ] ;
-        chart.removeSeries( chart.getSeries()[ 0 ] ) ;
-    }
-    
-    /**
-     * Bug 26862: HSSFWorkbook.cloneSheet copies charts
-     */
-    @Test
-    public void test26862() throws IOException, Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleChart.xls");
-        HSSFSheet srcSheet = wb.getSheetAt(0);
-        HSSFChart[] srcCharts = HSSFChart.getSheetCharts(srcSheet);
-        assertEquals(1, srcCharts.length);
-        HSSFChart srcChart = srcCharts[0];
-        
-        // Clone the sheet
-        HSSFSheet clonedSheet = wb.cloneSheet(0);
-        
-        // Verify the chart was copied
-        HSSFChart[] clonedCharts = HSSFChart.getSheetCharts(clonedSheet);
-        assertEquals(1, clonedCharts.length);
-        HSSFChart clonedChart = clonedCharts[0];
-        assertNotSame(srcChart, clonedChart); //refer to different objects
-        assertEquals(srcChart.getType(), clonedChart.getType());
-        assertEquals(srcChart.getChartTitle(), clonedChart.getChartTitle());
-        assertEquals(srcChart.getChartWidth(), clonedChart.getChartWidth());
-        assertEquals(srcChart.getChartHeight(), clonedChart.getChartHeight());
-        assertEquals(srcChart.getChartX(), clonedChart.getChartX());
-        assertEquals(srcChart.getChartY(), clonedChart.getChartY());
-        
-        // Check if chart was shallow copied or deep copied
-        clonedChart.setChartWidth(clonedChart.getChartWidth()+10);
-        assertEquals(srcChart.getChartWidth()+10, clonedChart.getChartWidth());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
deleted file mode 100644
index 17226a6..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwmf;
-
-import static org.junit.Assert.assertEquals;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-import java.util.Locale;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwmf.record.HwmfFill.HwmfImageRecord;
-import org.apache.poi.hwmf.record.HwmfRecord;
-import org.apache.poi.hwmf.usermodel.HwmfPicture;
-import org.apache.poi.sl.usermodel.PictureData;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.poi.sl.usermodel.SlideShow;
-import org.apache.poi.sl.usermodel.SlideShowFactory;
-import org.apache.poi.util.Units;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class TestHwmfParsing {
-    @Test
-    public void parse() throws IOException {
-        File f = POIDataSamples.getSlideShowInstance().getFile("santa.wmf");
-        FileInputStream fis = new FileInputStream(f);
-        HwmfPicture wmf = new HwmfPicture(fis);
-        fis.close();
-        List<HwmfRecord> records = wmf.getRecords();
-        assertEquals(581, records.size());
-    }
-    
-    @Test
-    @Ignore("This is work-in-progress and not a real unit test ...")
-    public void paint() throws IOException {
-        File f = POIDataSamples.getSlideShowInstance().getFile("santa.wmf");
-        // File f = new File("bla.wmf");
-        FileInputStream fis = new FileInputStream(f);
-        HwmfPicture wmf = new HwmfPicture(fis);
-        fis.close();
-        
-        Dimension dim = wmf.getSize();
-        int width = Units.pointsToPixel(dim.getWidth());
-        // keep aspect ratio for height
-        int height = Units.pointsToPixel(dim.getHeight());
-        double max = Math.max(width, height);
-        if (max > 1500) {
-            width *= 1500/max;
-            height *= 1500/max;
-        }
-        
-        BufferedImage bufImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = bufImg.createGraphics();
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-        g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        
-        wmf.draw(g, new Rectangle2D.Double(0,0,width,height));
-
-        g.dispose();
-        
-        ImageIO.write(bufImg, "PNG", new File("bla.png"));
-    }
-
-    @Test
-    @Ignore("This is work-in-progress and not a real unit test ...")
-    public void fetchWmfFromGovdocs() throws IOException {
-        URL url = new URL("http://digitalcorpora.org/corpora/files/govdocs1/by_type/ppt.zip");
-        File outdir = new File("build/ppt");
-        outdir.mkdirs();
-        ZipInputStream zis = new ZipInputStream(url.openStream());
-        ZipEntry ze;
-        while ((ze = zis.getNextEntry()) != null) {
-            String basename = ze.getName().replaceAll(".*?([^/]+)\\.wmf", "$1");
-            FilterInputStream fis = new FilterInputStream(zis){
-                @Override
-                public void close() throws IOException {}
-            };
-            try {
-                SlideShow<?,?> ss = SlideShowFactory.create(fis);
-                int wmfIdx = 1;
-                for (PictureData pd : ss.getPictureData()) {
-                    if (pd.getType() != PictureType.WMF) continue;
-                    byte wmfData[] = pd.getData();
-                    String filename = String.format(Locale.ROOT, "%s-%04d.wmf", basename, wmfIdx);
-                    FileOutputStream fos = new FileOutputStream(new File(outdir, filename));
-                    fos.write(wmfData);
-                    fos.close();
-                    wmfIdx++;
-                }
-                ss.close();
-            } catch (Exception e) {
-                System.out.println(ze.getName()+" ignored.");
-            }
-        }
-    }
-
-    @Test
-    @Ignore("This is work-in-progress and not a real unit test ...")
-    public void parseWmfs() throws IOException {
-        // parse and render the extracted wmfs from the fetchWmfFromGovdocs step
-        boolean outputFiles = false;
-        boolean renderWmf = true;
-        File indir = new File("E:\\project\\poi\\misc\\govdocs-ppt");
-        File outdir = new File("build/wmf");
-        outdir.mkdirs();
-        final String startFile = "";
-        File files[] = indir.listFiles(new FileFilter() {
-            boolean foundStartFile = false;
-            @Override
-            public boolean accept(File pathname) {
-                foundStartFile |= startFile.isEmpty() || pathname.getName().contains(startFile);
-                return foundStartFile && pathname.getName().matches("(?i).*\\.wmf?$");
-            }
-        });
-        for (File f : files) {
-            try {
-                String basename = f.getName().replaceAll(".*?([^/]+)\\.wmf", "$1");
-                FileInputStream fis = new FileInputStream(f);
-                HwmfPicture wmf = new HwmfPicture(fis);
-                fis.close();
-                
-                int bmpIndex = 1;
-                for (HwmfRecord r : wmf.getRecords()) {
-                    if (r instanceof HwmfImageRecord) {
-                        BufferedImage bi = ((HwmfImageRecord)r).getImage();
-                        if (bi != null && outputFiles) {
-                            String filename = String.format(Locale.ROOT, "%s-%04d.png", basename, bmpIndex);
-                            ImageIO.write(bi, "PNG", new File(outdir, filename));
-                        }
-                        bmpIndex++;
-                    }
-                }
-
-                if (renderWmf) {
-                    Dimension dim = wmf.getSize();
-                    int width = Units.pointsToPixel(dim.getWidth());
-                    // keep aspect ratio for height
-                    int height = Units.pointsToPixel(dim.getHeight());
-                    
-                    BufferedImage bufImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-                    Graphics2D g = bufImg.createGraphics();
-                    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                    g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-                    g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-                    g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-                    
-                    wmf.draw(g);
-
-                    g.dispose();
-                    
-                    ImageIO.write(bufImg, "PNG", new File(outdir, basename+".png"));
-                }
-            } catch (Exception e) {
-                System.out.println(f.getName()+" ignored.");                
-            }
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java
deleted file mode 100644
index 53ab567..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import org.apache.poi.hwpf.converter.AbstractWordUtilsTest;
-import org.apache.poi.hwpf.converter.TestWordToFoConverter;
-import org.apache.poi.hwpf.converter.TestWordToHtmlConverter;
-import org.apache.poi.hwpf.extractor.TestDifferentRoutes;
-import org.apache.poi.hwpf.extractor.TestWordExtractor;
-import org.apache.poi.hwpf.extractor.TestWordExtractorBugs;
-import org.apache.poi.hwpf.model.TestBookmarksTables;
-import org.apache.poi.hwpf.model.TestCHPBinTable;
-import org.apache.poi.hwpf.model.TestDocumentProperties;
-import org.apache.poi.hwpf.model.TestFileInformationBlock;
-import org.apache.poi.hwpf.model.TestFontTable;
-import org.apache.poi.hwpf.model.TestListTables;
-import org.apache.poi.hwpf.model.TestNotesTables;
-import org.apache.poi.hwpf.model.TestPAPBinTable;
-import org.apache.poi.hwpf.model.TestPlexOfCps;
-import org.apache.poi.hwpf.model.TestRevisionMarkAuthorTable;
-import org.apache.poi.hwpf.model.TestSavedByTable;
-import org.apache.poi.hwpf.model.TestSectionTable;
-import org.apache.poi.hwpf.model.TestStyleSheet;
-import org.apache.poi.hwpf.model.TestTextPieceTable;
-import org.apache.poi.hwpf.sprm.TestSprms;
-import org.apache.poi.hwpf.usermodel.TestBorderCode;
-import org.apache.poi.hwpf.usermodel.TestBug46610;
-import org.apache.poi.hwpf.usermodel.TestBug49820;
-import org.apache.poi.hwpf.usermodel.TestBug50075;
-import org.apache.poi.hwpf.usermodel.TestBugs;
-import org.apache.poi.hwpf.usermodel.TestHWPFOldDocument;
-import org.apache.poi.hwpf.usermodel.TestHeaderStories;
-import org.apache.poi.hwpf.usermodel.TestLists;
-import org.apache.poi.hwpf.usermodel.TestPictures;
-import org.apache.poi.hwpf.usermodel.TestProblems;
-import org.apache.poi.hwpf.usermodel.TestRange;
-import org.apache.poi.hwpf.usermodel.TestRangeDelete;
-import org.apache.poi.hwpf.usermodel.TestRangeInsertion;
-import org.apache.poi.hwpf.usermodel.TestRangeProperties;
-import org.apache.poi.hwpf.usermodel.TestRangeReplacement;
-import org.apache.poi.hwpf.usermodel.TestRangeSymbols;
-import org.apache.poi.hwpf.usermodel.TestTableRow;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    // org.apache.poi.hwpf
-    TestFieldsTables.class,
-    TestHWPFPictures.class,
-    TestHWPFRangeParts.class,
-
-    // org.apache.poi.hwpf.converter
-    // TestWordToConverterSuite.class,
-    AbstractWordUtilsTest.class,
-    TestWordToFoConverter.class,
-    TestWordToHtmlConverter.class,
-
-    // org.apache.poi.hwpf.extractor
-    TestDifferentRoutes.class,
-    TestWordExtractor.class,
-    TestWordExtractorBugs.class,
-
-    // org.apache.poi.hwpf.model
-    TestBookmarksTables.class,
-    TestCHPBinTable.class,
-    TestDocumentProperties.class,
-    TestFileInformationBlock.class,
-    TestFontTable.class,
-    TestListTables.class,
-    TestNotesTables.class,
-    TestPAPBinTable.class,
-    TestPlexOfCps.class,
-    TestRevisionMarkAuthorTable.class,
-    TestSavedByTable.class,
-    TestSectionTable.class,
-    TestStyleSheet.class,
-    TestTextPieceTable.class,
-
-    // org.apache.poi.hwpf.sprm
-    TestSprms.class,
-
-    // org.apache.poi.hwpf.usermodel
-    TestBorderCode.class,
-    TestBug46610.class,
-    TestBug49820.class,
-    TestBug50075.class,
-    TestBugs.class,
-    TestHeaderStories.class,
-    TestHWPFOldDocument.class,
-    TestLists.class,
-    TestPictures.class,
-    TestProblems.class,
-    TestRange.class,
-    TestRangeDelete.class,
-    TestRangeInsertion.class,
-    TestRangeProperties.class,
-    TestRangeReplacement.class,
-    TestRangeSymbols.class,
-    TestTableRow.class
-})
-public final class AllHWPFTests {
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java
deleted file mode 100644
index 763ec67..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import org.apache.poi.hwpf.model.FileInformationBlock;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.POIDataSamples;
-
-import java.io.IOException;
-
-
-public final class HWPFDocFixture
-{
-  public static final String DEFAULT_TEST_FILE = "test.doc";
-  
-  public byte[] _tableStream;
-  public byte[] _mainStream;
-  public FileInformationBlock _fib;
-  private final String _testFile;
-
-  public HWPFDocFixture(Object obj, String testFile)
-  {
-    _testFile = testFile;
-  }
-
-  public void setUp() throws IOException {
-      POIFSFileSystem filesystem = new POIFSFileSystem(
-              POIDataSamples.getDocumentInstance().openResourceAsStream(_testFile));
-
-      DocumentEntry documentProps =
-        (DocumentEntry) filesystem.getRoot().getEntry("WordDocument");
-      _mainStream = new byte[documentProps.getSize()];
-      filesystem.createDocumentInputStream("WordDocument").read(_mainStream);
-
-      // use the fib to determine the name of the table stream.
-      _fib = new FileInformationBlock(_mainStream);
-
-      String name = "0Table";
-      if (_fib.getFibBase().isFWhichTblStm())
-      {
-        name = "1Table";
-      }
-
-      // read in the table stream.
-      DocumentEntry tableProps =
-        (DocumentEntry) filesystem.getRoot().getEntry(name);
-      _tableStream = new byte[tableProps.getSize()];
-      filesystem.createDocumentInputStream(name).read(_tableStream);
-
-      _fib.fillVariableFields(_mainStream, _tableStream);
-  }
-
-  public void tearDown()
-  {
-  }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java
deleted file mode 100644
index 7ac0817..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-public abstract class HWPFTestCase extends TestCase {
-	protected HWPFDocFixture _hWPFDocFixture;
-
-	protected HWPFTestCase() {
-	}
-
-	@Override
-    protected void setUp() throws Exception {
-		super.setUp();
-		/** @todo verify the constructors */
-		_hWPFDocFixture = new HWPFDocFixture(this, getTestFile());
-
-		_hWPFDocFixture.setUp();
-	}
-
-	protected String getTestFile()
-	{
-	  return HWPFDocFixture.DEFAULT_TEST_FILE;
-	}
-
-	@Override
-    protected void tearDown() throws Exception {
-		if (_hWPFDocFixture != null) {
-			_hWPFDocFixture.tearDown();
-		}
-
-		_hWPFDocFixture = null;
-		super.tearDown();
-	}
-
-	public HWPFDocument writeOutAndRead(HWPFDocument doc) {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		HWPFDocument newDoc;
-		try {
-			doc.write(baos);
-			ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-			newDoc = new HWPFDocument(bais);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		return newDoc;
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
deleted file mode 100644
index 6f6ae82..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.zip.ZipInputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-public class HWPFTestDataSamples {
-
-    private static final POILogger logger = POILogFactory
-            .getLogger( HWPFTestDataSamples.class );
-
-    public static HWPFDocument openSampleFile(String sampleFileName) {
-        try {
-            InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream(sampleFileName);
-            return new HWPFDocument(is);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static HWPFDocument openSampleFileFromArchive( String sampleFileName )
-    {
-        final long start = System.currentTimeMillis();
-        try
-        {
-            ZipInputStream is = new ZipInputStream( POIDataSamples
-                    .getDocumentInstance()
-                    .openResourceAsStream( sampleFileName ) );
-            try
-            {
-                is.getNextEntry();
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try
-                {
-                    IOUtils.copy( is, baos );
-                }
-                finally
-                {
-                    baos.close();
-                }
-
-                final long endUnzip = System.currentTimeMillis();
-                byte[] byteArray = baos.toByteArray();
-
-                logger.log( POILogger.DEBUG, "Unzipped in ",
-                        Long.valueOf( endUnzip - start ), " ms -- ",
-                        Long.valueOf( byteArray.length ), " byte(s)" );
-
-                ByteArrayInputStream bais = new ByteArrayInputStream( byteArray );
-                HWPFDocument doc = new HWPFDocument( bais );
-                final long endParse = System.currentTimeMillis();
-
-                logger.log( POILogger.DEBUG, "Parsed in ",
-                        Long.valueOf( endParse - start ), " ms" );
-
-                return doc;
-            }
-            finally
-            {
-                is.close();
-            }
-        }
-        catch ( IOException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    /**
-     * Open a remote sample from URL. opening is performd in two phases:
-     *  (1) download content into a byte array
-     *  (2) construct HWPFDocument
-     *
-     * @param sampleFileUrl the url to open
-     */
-    public static HWPFDocument openRemoteFile( String sampleFileUrl )
-    {
-        final long start = System.currentTimeMillis();
-        try
-        {
-			logger.log(POILogger.DEBUG, "Downloading ", sampleFileUrl, " ...");
-
-            InputStream is = new URL( sampleFileUrl ).openStream();
-            try
-            {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try
-                {
-                    IOUtils.copy( is, baos );
-                }
-                finally
-                {
-                    baos.close();
-                }
-
-                final long endDownload = System.currentTimeMillis();
-                byte[] byteArray = baos.toByteArray();
-
-                logger.log( POILogger.DEBUG, "Downloaded in ",
-                        Long.valueOf( endDownload - start ), " ms -- ",
-                        Long.valueOf( byteArray.length ), " byte(s)" );
-
-                ByteArrayInputStream bais = new ByteArrayInputStream( byteArray );
-                HWPFDocument doc = new HWPFDocument( bais );
-                final long endParse = System.currentTimeMillis();
-
-                logger.log( POILogger.DEBUG, "Parsed in ",
-                        Long.valueOf( endParse - start ), " ms" );
-
-                return doc;
-            }
-            finally
-            {
-                is.close();
-            }
-        }
-        catch ( IOException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    public static HWPFOldDocument openOldSampleFile(String sampleFileName) {
-       try {
-           InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream(sampleFileName);
-           return new HWPFOldDocument(new POIFSFileSystem(is));
-       } catch (IOException e) {
-           throw new RuntimeException(e);
-       }
-   }
-    /**
-     * Writes a spreadsheet to a <tt>ByteArrayOutputStream</tt> and reads it back
-     * from a <tt>ByteArrayInputStream</tt>.<p/>
-     * Useful for verifying that the serialisation round trip
-     */
-    public static HWPFDocument writeOutAndReadBack(HWPFDocument original) {
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-            original.write(baos);
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-            return new HWPFDocument(bais);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
deleted file mode 100644
index 095d776..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hwpf;
-
-import java.util.ArrayList;
-
-import org.apache.poi.hwpf.model.FieldsDocumentPart;
-import org.apache.poi.hwpf.model.FieldsTables;
-import org.apache.poi.hwpf.model.FileInformationBlock;
-import org.apache.poi.hwpf.model.PlexOfField;
-
-/**
- * Test case for the fields tables, this test is based on the test-fields.doc
- * file instead of the usual test.doc.
- * 
- * @author Cedric Bosdonnat <cbosdonnat@novell.com>
- * 
- */
-public class TestFieldsTables extends HWPFTestCase
-{
-
-    private static final String EXPECTED[] = {
-
-            "[19, 43) - FLD - 0x13; 0x1f\n" + "[43, 54) - FLD - 0x14; 0xff\n"
-                    + "[54, 59) - FLD - 0x15; 0x81\n",
-
-            "[31, 59) - FLD - 0x13; 0x45\n" + "[59, 61) - FLD - 0x14; 0xff\n"
-                    + "[61, 66) - FLD - 0x15; 0x80\n",
-
-            "[23, 49) - FLD - 0x13; 0x11\n" + "[49, 64) - FLD - 0x14; 0xff\n"
-                    + "[64, 69) - FLD - 0x15; 0x80\n",
-
-            "[18, 42) - FLD - 0x13; 0x21\n" + "[42, 44) - FLD - 0x14; 0xff\n"
-                    + "[44, 47) - FLD - 0x15; 0x81\n"
-                    + "[47, 75) - FLD - 0x13; 0x1d\n"
-                    + "[75, 85) - FLD - 0x14; 0xff\n"
-                    + "[85, 91) - FLD - 0x15; 0x81\n",
-
-            "[30, 54) - FLD - 0x13; 0x20\n" + "[54, 62) - FLD - 0x14; 0xff\n"
-                    + "[62, 68) - FLD - 0x15; 0x81\n",
-
-            "[1, 31) - FLD - 0x13; 0x15\n" + "[31, 51) - FLD - 0x14; 0xff\n"
-                    + "[51, 541) - FLD - 0x15; 0x81\n",
-
-            "[19, 47) - FLD - 0x13; 0x19\n" + "[47, 49) - FLD - 0x14; 0xff\n"
-                    + "[49, 55) - FLD - 0x15; 0x81\n"
-
-    };
-
-    public TestFieldsTables()
-    {
-    }
-
-    @Override
-    protected String getTestFile()
-    {
-        return "test-fields.doc";
-    }
-
-    public void testReadFields()
-    {
-        FileInformationBlock fib = _hWPFDocFixture._fib;
-        byte[] tableStream = _hWPFDocFixture._tableStream;
-
-        FieldsTables fieldsTables = new FieldsTables( tableStream, fib );
-
-        for ( int i = 0; i < FieldsDocumentPart.values().length; i++ )
-        {
-            FieldsDocumentPart part = FieldsDocumentPart.values()[i];
-
-            ArrayList<PlexOfField> fieldsPlexes = fieldsTables
-                    .getFieldsPLCF( part );
-            String result = dumpPlexes( fieldsPlexes );
-            assertEquals( EXPECTED[i], result );
-        }
-    }
-
-    private String dumpPlexes( ArrayList<PlexOfField> fieldsPlexes )
-    {
-        StringBuilder dump = new StringBuilder();
-        for ( int i = 0; i < fieldsPlexes.size(); i++ )
-        {
-            final PlexOfField flds = fieldsPlexes.get( i );
-            dump.append( flds.toString() + "\n" );
-        }
-        return dump.toString();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
deleted file mode 100644
index e065b09..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.util.List;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.model.PicturesTable;
-import org.apache.poi.hwpf.usermodel.Picture;
-
-import junit.framework.TestCase;
-
-/**
- * Test picture support in HWPF
- * @author nick
- */
-public final class TestHWPFPictures extends TestCase {
-	private String docAFile;
-	private String docBFile;
-	private String docCFile;
-	private String docDFile;
-
-	private String imgAFile;
-	private String imgBFile;
-	private String imgCFile;
-	private String imgDFile;
-
-	@Override
-    protected void setUp() {
-
-		docAFile = "testPictures.doc";
-		docBFile = "two_images.doc";
-		docCFile = "vector_image.doc";
-		docDFile = "GaiaTest.doc";
-
-		imgAFile = "simple_image.jpg";
-		imgBFile = "simple_image.png";
-		imgCFile = "vector_image.emf";
-		imgDFile = "GaiaTestImg.png";
-	}
-
-	/**
-	 * Test just opening the files
-	 */
-	public void testOpen() {
-		HWPFTestDataSamples.openSampleFile(docAFile);
-		HWPFTestDataSamples.openSampleFile(docBFile);
-	}
-
-	/**
-	 * Test that we have the right numbers of images in each file
-	 */
-	public void testImageCount() {
-		HWPFDocument docA = HWPFTestDataSamples.openSampleFile(docAFile);
-		HWPFDocument docB = HWPFTestDataSamples.openSampleFile(docBFile);
-
-		assertNotNull(docA.getPicturesTable());
-		assertNotNull(docB.getPicturesTable());
-
-		PicturesTable picA = docA.getPicturesTable();
-		PicturesTable picB = docB.getPicturesTable();
-
-		List<Picture> picturesA = picA.getAllPictures();
-		List<Picture> picturesB = picB.getAllPictures();
-
-		assertEquals(7, picturesA.size());
-		assertEquals(2, picturesB.size());
-	}
-
-	/**
-	 * Test that we have the right images in at least one file
-	 */
-	public void testImageData() {
-		HWPFDocument docB = HWPFTestDataSamples.openSampleFile(docBFile);
-		PicturesTable picB = docB.getPicturesTable();
-		List<Picture> picturesB = picB.getAllPictures();
-
-		assertEquals(2, picturesB.size());
-
-		Picture pic1 = picturesB.get(0);
-		Picture pic2 = picturesB.get(1);
-
-		assertNotNull(pic1);
-		assertNotNull(pic2);
-
-		// Check the same
-		byte[] pic1B = readFile(imgAFile);
-		byte[] pic2B = readFile(imgBFile);
-
-		assertEquals(pic1B.length, pic1.getContent().length);
-		assertEquals(pic2B.length, pic2.getContent().length);
-
-		assertBytesSame(pic1B, pic1.getContent());
-		assertBytesSame(pic2B, pic2.getContent());
-	}
-
-	/**
-	 * Test that compressed image data is correctly returned.
-	 */
-	public void testCompressedImageData() {
-		HWPFDocument docC = HWPFTestDataSamples.openSampleFile(docCFile);
-		PicturesTable picC = docC.getPicturesTable();
-		List<Picture> picturesC = picC.getAllPictures();
-
-		assertEquals(1, picturesC.size());
-
-		Picture pic = picturesC.get(0);
-		assertNotNull(pic);
-
-		// Check the same
-		byte[] picBytes = readFile(imgCFile);
-
-		assertEquals(picBytes.length, pic.getContent().length);
-		assertBytesSame(picBytes, pic.getContent());
-	}
-
-   	public void testMacImages() throws Exception {
-        HWPFDocument docC = HWPFTestDataSamples.openSampleFile("53446.doc");
-   		PicturesTable picturesTable = docC.getPicturesTable();
-   		List<Picture> pictures = picturesTable.getAllPictures();
-
-   		assertEquals(4, pictures.size());
-
-        int[][] expectedSizes = {
-            { 185, 42 },  // PNG
-            { 260, 114 }, // PNG
-            { 185, 42 },  // PNG
-            { 260, 114 }, // PNG
-       };
-
-       for (int i = 0; i < pictures.size(); i++) {
-           BufferedImage image = ImageIO.read(new ByteArrayInputStream(pictures.get(i).getContent()));
-           assertNotNull(image);
-
-           int[] dimensions = expectedSizes[i];
-           assertEquals(dimensions[0], image.getWidth());
-           assertEquals(dimensions[1], image.getHeight());
-       }
-   	}
-
-	/**
-	 * Pending the missing files being uploaded to
-	 *  bug #44937
-	 */
-	public void BROKENtestEscherDrawing() {
-		HWPFDocument docD = HWPFTestDataSamples.openSampleFile(docDFile);
-		List<Picture> allPictures = docD.getPicturesTable().getAllPictures();
-
-		assertEquals(1, allPictures.size());
-
-		Picture pic = allPictures.get(0);
-		assertNotNull(pic);
-		byte[] picD = readFile(imgDFile);
-
-		assertEquals(picD.length, pic.getContent().length);
-
-		assertBytesSame(picD, pic.getContent());
-	}
-
-	private void assertBytesSame(byte[] a, byte[] b) {
-		assertEquals(a.length, b.length);
-		for(int i=0; i<a.length; i++) {
-			assertEquals(a[i],b[i]);
-		}
-	}
-
-	private static byte[] readFile(String file) {
-		return POIDataSamples.getDocumentInstance().readFile(file);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java
deleted file mode 100644
index 8fce4e5..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf;
-
-import org.apache.poi.hwpf.usermodel.Range;
-
-import junit.framework.TestCase;
-
-/**
- * Test that we pull out the right bits of a file into
- *  the different ranges
- */
-public final class TestHWPFRangeParts extends TestCase {
-	private static final char page_break = (char)12;
-	private static final String headerDef =
-		"\u0003\r\r" +
-		"\u0004\r\r" +
-		"\u0003\r\r" +
-		"\u0004\r\r"
-	;
-	private static final String footerDef = "\r";
-	private static final String endHeaderFooter = "\r\r";
-
-
-	private static final String a_page_1 =
-		"This is a sample word document. It has two pages. It has a three column heading, and a three column footer\r" +
-		"\r" +
-		"HEADING TEXT\r" +
-		"\r" +
-		"More on page one\r" +
-		"\r\r" +
-		"End of page 1\r"
-	;
-	private static final String a_page_2 =
-		"This is page two. It also has a three column heading, and a three column footer.\r"
-	;
-
-	private static final String a_header =
-		"First header column!\tMid header Right header!\r"
-	;
-	private static final String a_footer =
-		"Footer Left\tFooter Middle Footer Right\r"
-	;
-
-
-	private static final String u_page_1 =
-		"This is a fairly simple word document, over two pages, with headers and footers.\r" +
-		"The trick with this one is that it contains some Unicode based strings in it.\r" +
-		"Firstly, some currency symbols:\r" +
-		"\tGBP - \u00a3\r" +
-		"\tEUR - \u20ac\r" +
-		"Now, we\u2019ll have some French text, in bold and big:\r" +
-		"\tMoli\u00e8re\r" +
-		"And some normal French text:\r" +
-		"\tL'Avare ou l'\u00c9cole du mensonge\r" +
-		"That\u2019s it for page one\r"
-	;
-	private static final String u_page_2 =
-		"This is page two. Les Pr\u00e9cieuses ridicules. The end.\r"
-	;
-
-	private static final String u_header =
-		"\r\r" +
-		"This is a simple header, with a \u20ac euro symbol in it.\r"
-	;
-	private static final String u_footer =
-		"\r\r\r" +
-		"The footer, with Moli\u00e8re, has Unicode in it.\r" +
-		"\r\r\r\r"
-	;
-
-	/**
-	 * A document made up only of basic ASCII text
-	 */
-	private HWPFDocument docAscii;
-	/**
-	 * A document with some unicode in it too
-	 */
-	private HWPFDocument docUnicode;
-
-	@Override
-    public void setUp() {
-		docUnicode = HWPFTestDataSamples.openSampleFile("HeaderFooterUnicode.doc");
-		docAscii = HWPFTestDataSamples.openSampleFile("ThreeColHeadFoot.doc");
-	}
-
-   /**
-    * Note - this test runs several times, to ensure that things
-    *  don't get broken as we write out and read back in again
-    * TODO - Make this work with 3+ runs
-    */
-	public void testContents() {
-      HWPFDocument doc = docAscii;
-      for(int run=0; run<3; run++) {
-   		Range r;
-   
-   		// Now check the real ranges
-   		r = doc.getRange();
-   		assertEquals(
-   				a_page_1 +
-   				page_break + "\r" +
-   				a_page_2,
-   				r.text()
-   		);
-   
-   		r = doc.getHeaderStoryRange();
-   		assertEquals(
-   				headerDef +
-   				a_header +
-   				footerDef +
-   				a_footer +
-   				endHeaderFooter,
-   				r.text()
-   		);
-   
-   		r = doc.getOverallRange();
-   		assertEquals(
-   				a_page_1 +
-   				page_break + "\r" +
-   				a_page_2 +
-   				headerDef +
-   				a_header +
-   				footerDef +
-   				a_footer +
-   				endHeaderFooter +
-   				"\r",
-   				r.text()
-   		);
-         
-         // Write out and read back in again, ready for
-         //  the next run of the test
-         // TODO run more than once
-         if(run < 1)
-            doc = HWPFTestDataSamples.writeOutAndReadBack(doc);
-      }
-	}
-
-	public void testContentsUnicode() {
-		Range r;
-
-		// Now check the real ranges
-		r = docUnicode.getRange();
-		assertEquals(
-				u_page_1 +
-				page_break + "\r" +
-				u_page_2,
-				r.text()
-		);
-
-		r = docUnicode.getHeaderStoryRange();
-		assertEquals(
-				headerDef +
-				u_header +
-				footerDef +
-				u_footer +
-				endHeaderFooter,
-				r.text()
-		);
-
-		r = docUnicode.getOverallRange();
-		assertEquals(
-				u_page_1 +
-				page_break + "\r" +
-				u_page_2 +
-				headerDef +
-				u_header +
-				footerDef +
-				u_footer +
-				endHeaderFooter +
-				"\r",
-				r.text()
-		);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java
deleted file mode 100644
index 4cb37b8..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import org.apache.poi.hwpf.usermodel.Range;
-
-import junit.framework.TestCase;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.usermodel.Table;
-
-/**
- * Test cases for {@link AbstractWordUtils}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class AbstractWordUtilsTest extends TestCase
-{
-    /**
-     * Test case for {@link AbstractWordUtils#buildTableCellEdgesArray(Table)}
-     */
-    public void testBuildTableCellEdgesArray()
-    {
-        HWPFDocument document = HWPFTestDataSamples
-                .openSampleFile( "table-merges.doc" );
-        final Range range = document.getRange();
-        Table table = range.getTable( range.getParagraph( 0 ) );
-
-        int[] result = AbstractWordUtils.buildTableCellEdgesArray( table );
-        assertEquals( 6, result.length );
-
-        assertEquals( 0000, result[0] );
-        assertEquals( 1062, result[1] );
-        assertEquals( 5738, result[2] );
-        assertEquals( 6872, result[3] );
-        assertEquals( 8148, result[4] );
-        assertEquals( 9302, result[5] );
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java
deleted file mode 100644
index fdbd51a..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import junit.framework.TestCase;
-
-public class TestNumberFormatter extends TestCase
-{
-
-    public void testRoman()
-    {
-        assertEquals( "i", NumberFormatter.getNumber( 1, 2 ) );
-        assertEquals( "ii", NumberFormatter.getNumber( 2, 2 ) );
-        assertEquals( "iii", NumberFormatter.getNumber( 3, 2 ) );
-        assertEquals( "iv", NumberFormatter.getNumber( 4, 2 ) );
-        assertEquals( "v", NumberFormatter.getNumber( 5, 2 ) );
-        assertEquals( "vi", NumberFormatter.getNumber( 6, 2 ) );
-        assertEquals( "vii", NumberFormatter.getNumber( 7, 2 ) );
-        assertEquals( "viii", NumberFormatter.getNumber( 8, 2 ) );
-        assertEquals( "ix", NumberFormatter.getNumber( 9, 2 ) );
-        assertEquals( "x", NumberFormatter.getNumber( 10, 2 ) );
-
-        assertEquals( "mdcvi", NumberFormatter.getNumber( 1606, 2 ) );
-        assertEquals( "mcmx", NumberFormatter.getNumber( 1910, 2 ) );
-        assertEquals( "mcmliv", NumberFormatter.getNumber( 1954, 2 ) );
-    }
-
-    public void testEnglish()
-    {
-        assertEquals( "a", NumberFormatter.getNumber( 1, 4 ) );
-        assertEquals( "z", NumberFormatter.getNumber( 26, 4 ) );
-
-        assertEquals( "aa", NumberFormatter.getNumber( 1 * 26 + 1, 4 ) );
-        assertEquals( "az", NumberFormatter.getNumber( 1 * 26 + 26, 4 ) );
-
-        assertEquals( "za", NumberFormatter.getNumber( 26 * 26 + 1, 4 ) );
-        assertEquals( "zz", NumberFormatter.getNumber( 26 * 26 + 26, 4 ) );
-
-        assertEquals( "aaa",
-                NumberFormatter.getNumber( 26 * 26 + 1 * 26 + 1, 4 ) );
-        assertEquals( "aaz",
-                NumberFormatter.getNumber( 26 * 26 + 1 * 26 + 26, 4 ) );
-
-        assertEquals( "aba",
-                NumberFormatter.getNumber( 1 * 26 * 26 + 2 * 26 + 1, 4 ) );
-        assertEquals( "aza",
-                NumberFormatter.getNumber( 1 * 26 * 26 + 26 * 26 + 1, 4 ) );
-
-        assertEquals( "azz",
-                NumberFormatter.getNumber( 26 * 26 + 26 * 26 + 26, 4 ) );
-        assertEquals( "baa",
-                NumberFormatter.getNumber( 2 * 26 * 26 + 1 * 26 + 1, 4 ) );
-        assertEquals( "zaa",
-                NumberFormatter.getNumber( 26 * 26 * 26 + 1 * 26 + 1, 4 ) );
-        assertEquals( "zzz",
-                NumberFormatter.getNumber( 26 * 26 * 26 + 26 * 26 + 26, 4 ) );
-
-        assertEquals(
-                "aaaa",
-                NumberFormatter.getNumber( 1 * 26 * 26 * 26 + 1 * 26 * 26 + 1
-                        * 26 + 1, 4 ) );
-        assertEquals(
-                "azzz",
-                NumberFormatter.getNumber( 1 * 26 * 26 * 26 + 26 * 26 * 26 + 26
-                        * 26 + 26, 4 ) );
-        assertEquals(
-                "zzzz",
-                NumberFormatter.getNumber( 26 * 26 * 26 * 26 + 26 * 26 * 26
-                        + 26 * 26 + 26, 4 ) );
-
-        for ( int i = 1; i < 1000000; i++ )
-        {
-            // make sure there is no exceptions
-            NumberFormatter.getNumber( i, 4 );
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
deleted file mode 100644
index f3194bf..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocumentCore;
-import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(Parameterized.class)
-public class TestWordToConverterSuite
-{
-    /**
-     * YK: a quick hack to exclude failing documents from the suite.
-     */
-    private static List<String> failingFiles = Arrays
-            .asList( "ProblemExtracting.doc" );
-
-    @Parameterized.Parameters(name="{index}: {0}")
-    public static Iterable<Object[]> files() {
-        List<Object[]> files = new ArrayList<Object[]>();
-        File directory = POIDataSamples.getDocumentInstance().getFile(
-                "../document" );
-        for ( final File child : directory.listFiles( new FilenameFilter()
-        {
-            @Override
-            public boolean accept( File dir, String name )
-            {
-                return name.endsWith( ".doc" ) && !failingFiles.contains( name );
-            }
-        } ) )
-        {
-            files.add(new Object[] { child });
-        }
-
-        return files;
-    }
-
-    @Parameterized.Parameter
-    public File child;
-
-    @Test
-    public void testFo() throws Exception {
-        HWPFDocumentCore hwpfDocument;
-        try {
-            hwpfDocument = AbstractWordUtils.loadDoc( child );
-        } catch ( Exception exc ) {
-            return;
-        }
-
-        WordToFoConverter wordToFoConverter = new WordToFoConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        wordToFoConverter.processDocument( hwpfDocument );
-
-        StringWriter stringWriter = new StringWriter();
-
-        Transformer transformer = TransformerFactory.newInstance()
-                .newTransformer();
-        transformer.setOutputProperty( OutputKeys.ENCODING, "utf-8" );
-        transformer.setOutputProperty( OutputKeys.INDENT, "false" );
-        transformer.transform(
-                new DOMSource( wordToFoConverter.getDocument() ),
-                new StreamResult( stringWriter ) );
-
-        // no exceptions
-        assertNotNull(stringWriter.toString());
-    }
-
-    @Test
-    public void testHtml() throws Exception
-    {
-        HWPFDocumentCore hwpfDocument;
-        try {
-            hwpfDocument = AbstractWordUtils.loadDoc( child );
-        } catch ( Exception exc ) {
-            return;
-        }
-
-        WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        wordToHtmlConverter.processDocument( hwpfDocument );
-
-        StringWriter stringWriter = new StringWriter();
-
-        Transformer transformer = TransformerFactory.newInstance()
-                .newTransformer();
-        transformer.setOutputProperty( OutputKeys.ENCODING, "utf-8" );
-        transformer.setOutputProperty( OutputKeys.INDENT, "false" );
-        transformer.setOutputProperty( OutputKeys.METHOD, "html" );
-        transformer.transform(
-                new DOMSource( wordToHtmlConverter.getDocument() ),
-                new StreamResult( stringWriter ) );
-
-        // no exceptions
-        assertNotNull(stringWriter.toString());
-    }
-
-    @Test
-    public void testText() throws Exception
-    {
-        HWPFDocumentCore wordDocument;
-        try {
-            wordDocument = AbstractWordUtils.loadDoc( child );
-        } catch ( Exception exc ) {
-            return;
-        }
-
-        WordToTextConverter wordToTextConverter = new WordToTextConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        wordToTextConverter.processDocument( wordDocument );
-
-        StringWriter stringWriter = new StringWriter();
-
-        Transformer transformer = TransformerFactory.newInstance()
-                .newTransformer();
-        transformer.setOutputProperty( OutputKeys.ENCODING, "utf-8" );
-        transformer.setOutputProperty( OutputKeys.INDENT, "yes" );
-        transformer.setOutputProperty( OutputKeys.METHOD, "text" );
-        transformer.transform(
-                new DOMSource( wordToTextConverter.getDocument() ),
-                new StreamResult( stringWriter ) );
-
-        // no exceptions
-        assertNotNull(stringWriter.toString());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
deleted file mode 100644
index 7dd60b0..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hwpf.converter;
-
-import static org.apache.poi.POITestCase.assertContains;
-
-import java.io.StringWriter;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
-
-/**
- * Test cases for {@link WordToFoConverter}
- */
-public class TestWordToFoConverter
-{
-    private static String getFoText( final String sampleFileName )
-            throws Exception
-    {
-        HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples
-                .getDocumentInstance().openResourceAsStream( sampleFileName ) );
-
-        WordToFoConverter wordToFoConverter = new WordToFoConverter(
-                XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument() );
-        wordToFoConverter.processDocument( hwpfDocument );
-
-        StringWriter stringWriter = new StringWriter();
-
-        Transformer transformer = TransformerFactory.newInstance()
-                .newTransformer();
-        transformer.setOutputProperty( OutputKeys.INDENT, "yes" );
-        transformer.transform(
-                new DOMSource( wordToFoConverter.getDocument() ),
-                new StreamResult( stringWriter ) );
-
-        String result = stringWriter.toString();
-        return result;
-    }
-
-    @Test
-    public void testDocumentProperties() throws Exception
-    {
-        String result = getFoText( "documentProperties.doc" );
-
-        assertContains(
-                result,
-                "<dc:title xmlns:dc=\"http://purl.org/dc/elements/1.1/\">This is document title</dc:title>" );
-        assertContains(
-                result,
-                "<pdf:Keywords xmlns:pdf=\"http://ns.adobe.com/pdf/1.3/\">This is document keywords</pdf:Keywords>" );
-    }
-
-    @Test
-    public void testEndnote() throws Exception
-    {
-        String result = getFoText( "endingnote.doc" );
-
-        assertContains( result,
-                "<fo:basic-link id=\"endnote_back_1\" internal-destination=\"endnote_1\">" );
-        assertContains( result,
-                "<fo:inline baseline-shift=\"super\" font-size=\"smaller\">1</fo:inline>" );
-        assertContains( result,
-                "<fo:basic-link id=\"endnote_1\" internal-destination=\"endnote_back_1\">" );
-        assertContains( result,
-                "<fo:inline baseline-shift=\"super\" font-size=\"smaller\">1 </fo:inline>" );
-        assertContains( result, "Ending note text" );
-    }
-
-    @Test
-    public void testEquation() throws Exception
-    {
-        final String sampleFileName = "equation.doc";
-        String result = getFoText( sampleFileName );
-
-        assertContains( result, "<!--Image link to '0.emf' can be here-->" );
-    }
-
-    @Test
-    public void testHyperlink() throws Exception
-    {
-        final String sampleFileName = "hyperlink.doc";
-        String result = getFoText( sampleFileName );
-
-        assertContains( result,
-                "<fo:basic-link external-destination=\"http://testuri.org/\">" );
-        assertContains( result, "Hyperlink text" );
-    }
-
-    @Test
-    public void testInnerTable() throws Exception
-    {
-        final String sampleFileName = "innertable.doc";
-        String result = getFoText( sampleFileName );
-
-        assertContains( result,
-                "padding-end=\"0.0in\" padding-start=\"0.0in\" width=\"1.0770833in\"" );
-    }
-
-    @Test
-    public void testPageBreak() throws Exception
-    {
-        final String sampleFileName = "page-break.doc";
-        String result = getFoText( sampleFileName );
-
-        assertContains( result, "<fo:block break-before=\"page\"" );
-    }
-
-    @Test
-    public void testPageBreakBefore() throws Exception
-    {
-        final String sampleFileName = "page-break-before.doc";
-        String result = getFoText( sampleFileName );
-
-        assertContains( result, "<fo:block break-before=\"page\"" );
-    }
-
-    @Test
-    public void testPageref() throws Exception
-    {
-        final String sampleFileName = "pageref.doc";
-        String result = getFoText( sampleFileName );
-
-        assertContains( result,
-                "<fo:basic-link internal-destination=\"bookmark_userref\">" );
-        assertContains( result, "1" );
-        assertContains( result, "<fo:inline id=\"bookmark_userref\">" );
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
deleted file mode 100644
index 1b18e5f..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertFalse;
-
-import java.io.StringWriter;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.PictureType;
-import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
-import org.w3c.dom.Document;
-
-/**
- * Test cases for {@link WordToHtmlConverter}
- */
-public class TestWordToHtmlConverter
-{
-    private static String getHtmlText( final String sampleFileName )
-            throws Exception
-    {
-        return getHtmlText( sampleFileName, false);
-    }
-
-    private static String getHtmlText( final String sampleFileName,
-            boolean emulatePictureStorage ) throws Exception
-    {
-        HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples
-                .getDocumentInstance().openResourceAsStream( sampleFileName ));
-
-        Document newDocument = XMLHelper.getDocumentBuilderFactory().newDocumentBuilder().newDocument();
-        WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter(
-                newDocument);
-
-        if ( emulatePictureStorage )
-        {
-            wordToHtmlConverter.setPicturesManager( new PicturesManager()
-            {
-                @Override
-                public String savePicture( byte[] content,
-                        PictureType pictureType, String suggestedName,
-                        float widthInches, float heightInches )
-                {
-                    return suggestedName;
-                }
-            });
-        }
-
-        wordToHtmlConverter.processDocument( hwpfDocument);
-
-        StringWriter stringWriter = new StringWriter();
-
-        Transformer transformer = TransformerFactory.newInstance()
-                .newTransformer();
-        transformer.setOutputProperty( OutputKeys.INDENT, "yes");
-        transformer.setOutputProperty( OutputKeys.ENCODING, "utf-8");
-        transformer.setOutputProperty( OutputKeys.METHOD, "html");
-        transformer.transform(
-                new DOMSource( wordToHtmlConverter.getDocument() ),
-                new StreamResult( stringWriter ));
-
-        String result = stringWriter.toString();
-        return result;
-    }
-
-    @Test
-    public void testAIOOBTap() throws Exception
-    {
-        String result = getHtmlText( "AIOOB-Tap.doc");
-        assertContains(result.substring( 0, 6000 ), "<table class=\"t1\">");
-    }
-
-    @Test
-    public void testBug33519() throws Exception
-    {
-        String result = getHtmlText( "Bug33519.doc");
-        assertContains(
-                result,
-                "\u041F\u043B\u0430\u043D\u0438\u043D\u0441\u043A\u0438 \u0442\u0443\u0440\u043E\u0432\u0435");
-        assertContains(result,
-                "\u042F\u0432\u043E\u0440 \u0410\u0441\u0435\u043D\u043E\u0432");
-    }
-
-    @Test
-    public void testBug46610_2() throws Exception
-    {
-        String result = getHtmlText( "Bug46610_2.doc");
-        assertContains(
-                result,
-                "012345678911234567892123456789312345678941234567890123456789112345678921234567893123456789412345678");
-    }
-
-    @Test
-    public void testBug46817() throws Exception
-    {
-        String result = getHtmlText( "Bug46817.doc");
-        final String substring = "<table class=\"t1\">";
-        assertContains(result, substring);
-    }
-
-    @Test
-    public void testBug47286() throws Exception
-    {
-        String result = getHtmlText( "Bug47286.doc");
-
-        assertFalse(result.contains( "FORMTEXT" ));
-
-        assertContains(result, "color:#4f6228;");
-        assertContains(result, "Passport No and the date of expire");
-        assertContains(result, "mfa.gov.cy");
-    }
-
-    @Test
-    public void testBug48075() throws Exception
-    {
-        getHtmlText( "Bug48075.doc");
-    }
-
-    @Test
-    public void testBug52583() throws Exception
-    {
-        String result = getHtmlText( "Bug52583.doc");
-        assertContains(
-                result,
-                "<select><option selected>riri</option><option>fifi</option><option>loulou</option></select>");
-    }
-
-    @Test
-    public void testBug53182() throws Exception
-    {
-        String result = getHtmlText( "Bug53182.doc");
-        assertFalse(result.contains( "italic" ));
-    }
-
-    @Test
-    public void testDocumentProperties() throws Exception
-    {
-        String result = getHtmlText( "documentProperties.doc");
-
-        assertContains(result, "<title>This is document title</title>");
-        assertContains(result,
-                "<meta content=\"This is document keywords\" name=\"keywords\">");
-    }
-
-    @Test
-    public void testEmailhyperlink() throws Exception
-    {
-        String result = getHtmlText( "Bug47286.doc");
-        final String substring = "provisastpet@mfa.gov.cy";
-        assertContains(result, substring);
-    }
-
-    @Test
-    public void testEndnote() throws Exception
-    {
-        String result = getHtmlText( "endingnote.doc");
-
-        assertContains(
-                result,
-                "<a class=\"a1 endnoteanchor\" href=\"#endnote_1\" name=\"endnote_back_1\">1</a>");
-        assertContains(
-                result,
-                "<a class=\"a1 endnoteindex\" href=\"#endnote_back_1\" name=\"endnote_1\">1</a> <span");
-        assertContains(result, "Ending note text");
-    }
-
-    @Test
-    public void testEquation() throws Exception
-    {
-        String result = getHtmlText( "equation.doc");
-
-        assertContains(result, "<!--Image link to '0.emf' can be here-->");
-    }
-
-    @Test
-    public void testHyperlink() throws Exception
-    {
-        String result = getHtmlText( "hyperlink.doc");
-
-        assertContains(result, "<span>Before text; </span><a ");
-        assertContains(result,
-                "<a href=\"http://testuri.org/\"><span class=\"s1\">Hyperlink text</span></a>");
-        assertContains(result, "</a><span>; after text</span>");
-    }
-
-    @Test
-    public void testInnerTable() throws Exception
-    {
-        getHtmlText( "innertable.doc");
-    }
-
-    @Test
-    public void testListsMargins() throws Exception
-    {
-        String result = getHtmlText( "lists-margins.doc");
-
-        assertContains(result,
-                ".s1{display: inline-block; text-indent: 0; min-width: 0.4861111in;}");
-        assertContains(result,
-                ".s2{display: inline-block; text-indent: 0; min-width: 0.23055555in;}");
-        assertContains(result,
-                ".s3{display: inline-block; text-indent: 0; min-width: 0.28541666in;}");
-        assertContains(result,
-                ".s4{display: inline-block; text-indent: 0; min-width: 0.28333333in;}");
-        assertContains(result,
-                ".p4{text-indent:-0.59652776in;margin-left:-0.70069444in;");
-    }
-
-    @Test
-    public void testO_kurs_doc() throws Exception
-    {
-        getHtmlText( "o_kurs.doc");
-    }
-
-    @Test
-    public void testPageref() throws Exception
-    {
-        String result = getHtmlText( "pageref.doc");
-
-        assertContains(result, "<a href=\"#userref\">");
-        assertContains(result, "<a name=\"userref\">");
-        assertContains(result, "1");
-    }
-
-    @Test
-    public void testPicture() throws Exception
-    {
-        String result = getHtmlText( "picture.doc", true);
-
-        // picture
-        assertContains(result, "src=\"0.emf\"");
-        // visible size
-        assertContains(result, "width:3.1293333in;height:1.7247736in;");
-        // shift due to crop
-        assertContains(result, "left:-0.09433333;top:-0.2573611;");
-        // size without crop
-        assertContains(result, "width:3.4125in;height:2.3253334in;");
-    }
-
-    @Test
-    public void testPicturesEscher() throws Exception
-    {
-        String result = getHtmlText( "pictures_escher.doc", true);
-        assertContains(result, "<img src=\"s0.PNG\">");
-        assertContains(result, "<img src=\"s808.PNG\">");
-    }
-
-    @Test
-    public void testTableMerges() throws Exception
-    {
-        String result = getHtmlText( "table-merges.doc");
-
-        assertContains(result, "<td class=\"td1\" colspan=\"3\">");
-        assertContains(result, "<td class=\"td2\" colspan=\"2\">");
-    }
-
-    @Test
-    public void testBug52420() throws Exception {
-        String result = getHtmlText( "52420.doc");
-
-        assertFalse(result.contains( "FORMTEXT" ));
-
-        assertContains(result, "\u0417\u0410\u0414\u0410\u041d\u0418\u0415");
-        assertContains(result, "\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c");
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
deleted file mode 100644
index 00a46f6..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.converter;
-
-import junit.framework.TestCase;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-public class TestWordToTextConverter extends TestCase
-{
-
-    /**
-     * [FAILING] Bug 47731 - Word Extractor considers text copied from some
-     * website as an embedded object
-     */
-    public void testBug47731() throws Exception
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug47731.doc" );
-        String foundText = WordToTextConverter.getText( doc );
-
-        assertTrue( foundText
-                .contains( "Soak the rice in water for three to four hours" ) );
-    }
-
-    public void testBug52311() throws Exception
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug52311.doc" );
-        String result = WordToTextConverter.getText( doc );
-
-        assertTrue( result.contains( "2.1\tHeader 2.1" ) );
-        assertTrue( result.contains( "2.2\tHeader 2.2" ) );
-        assertTrue( result.contains( "2.3\tHeader 2.3" ) );
-        assertTrue( result.contains( "2.3.1\tHeader 2.3.1" ) );
-        assertTrue( result.contains( "2.99\tHeader 2.99" ) );
-        assertTrue( result.contains( "2.99.1\tHeader 2.99.1" ) );
-        assertTrue( result.contains( "2.100\tHeader 2.100" ) );
-        assertTrue( result.contains( "2.101\tHeader 2.101" ) );
-    }
-
-    public void testBug53380_3() throws Exception
-    {
-        HWPFDocument doc = HWPFTestDataSamples
-                .openSampleFile( "Bug53380_3.doc" );
-        WordToTextConverter.getText( doc );
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
deleted file mode 100644
index ca1b54e..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.extractor;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.util.StringUtil;
-import org.junit.After;
-import org.junit.Before;
-
-/**
- * Test the different routes to extracting text
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestDifferentRoutes {
-	private static final String[] p_text = new String[] {
-			"This is a simple word document\r",
-			"\r",
-			"It has a number of paragraphs in it\r",
-			"\r",
-			"Some of them even feature bold, italic and underlined text\r",
-			"\r",
-			"\r",
-			"This bit is in a different font and size\r",
-			"\r",
-			"\r",
-			"This bit features some red text.\r",
-			"\r",
-			"\r",
-			"It is otherwise very very boring.\r"
-	};
-
-	private HWPFDocument doc;
-
-	@Before
-	public void setUp() {
-		doc = HWPFTestDataSamples.openSampleFile("test2.doc");
-	}
-	
-	@After
-	public void tearDown() throws IOException {
-		doc.close();
-	}
-
-	/**
-	 * Test model based extraction
-	 */
-	@Test
-	public void testExtractFromModel() {
-		Range r = doc.getRange();
-
-		String[] text = new String[r.numParagraphs()];
-		for (int i = 0; i < r.numParagraphs(); i++) {
-			Paragraph p = r.getParagraph(i);
-			text[i] = p.text();
-		}
-
-		assertArrayEquals(p_text, text);
-	}
-
-	/**
-	 * Test textPieces based extraction
-	 */
-	@Test
-	public void testExtractFromTextPieces() throws Exception {
-		String expected = StringUtil.join(p_text, "");
-		assertEquals(expected, doc.getDocumentText());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
deleted file mode 100644
index 0fed1e8..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.extractor;
-
-import static org.apache.poi.POITestCase.assertContains;
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.OldWordFileFormatException;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.StringUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Test the different routes to extracting text
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestWordExtractor extends TestCase {
-
-    public static void assertEquals( String expected, String actual )
-    {
-        String newExpected = expected.replaceAll( "\r\n", "\n" )
-                .replaceAll( "\r", "\n" ).trim();
-        String newActual = actual.replaceAll( "\r\n", "\n" )
-                .replaceAll( "\r", "\n" ).trim();
-        TestCase.assertEquals( newExpected, newActual );
-    }
-    
-    private static void assertExtractedContains(String[] extracted, String needle) {
-        String endnote = StringUtil.join(extracted, "");
-        assertContains(endnote, needle);
-    }
-
-	private final String[] p_text1 = new String[] {
-			"This is a simple word document\r\n",
-			"\r\n",
-			"It has a number of paragraphs in it\r\n",
-			"\r\n",
-			"Some of them even feature bold, italic and underlined text\r\n",
-			"\r\n",
-			"\r\n",
-			"This bit is in a different font and size\r\n",
-			"\r\n",
-			"\r\n",
-			"This bit features some red text.\r\n",
-			"\r\n",
-			"\r\n",
-			"It is otherwise very very boring.\r\n"
-	};
-	private String p_text1_block = "";
-
-	// Well behaved document
-	private WordExtractor extractor;
-	// Slightly iffy document
-	private WordExtractor extractor2;
-	// A word doc embeded in an excel file
-	private String filename3;
-
-	// With header and footer
-	private String filename4;
-	// With unicode header and footer
-	private String filename5;
-	// With footnote
-	private String filename6;
-
-	@Override
-    protected void setUp() throws Exception {
-
-		String filename = "test2.doc";
-		String filename2 = "test.doc";
-		filename3 = "excel_with_embeded.xls";
-		filename4 = "ThreeColHeadFoot.doc";
-		filename5 = "HeaderFooterUnicode.doc";
-		filename6 = "footnote.doc";
-        POIDataSamples docTests = POIDataSamples.getDocumentInstance();
-		extractor = new WordExtractor(docTests.openResourceAsStream(filename));
-		extractor2 = new WordExtractor(docTests.openResourceAsStream(filename2));
-
-		// Build splat'd out text version
-		p_text1_block = StringUtil.join(p_text1, "");
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-	    if (extractor != null) extractor.close();
-	    if (extractor2 != null) extractor2.close();
-	}
-
-	/**
-	 * Test paragraph based extraction
-	 */
-	public void testExtractFromParagraphs() {
-		String[] text = extractor.getParagraphText();
-
-		assertEquals(p_text1.length, text.length);
-		for (int i = 0; i < p_text1.length; i++) {
-			assertEquals(p_text1[i], text[i]);
-		}
-
-		// Lots of paragraphs with only a few lines in them
-		assertEquals(24, extractor2.getParagraphText().length);
-		assertEquals("as d\r\n", extractor2.getParagraphText()[16]);
-      assertEquals("as d\r\n", extractor2.getParagraphText()[17]);
-      assertEquals("as d\r\n", extractor2.getParagraphText()[18]);
-	}
-
-	/**
-	 * Test the paragraph -> flat extraction
-	 */
-	public void testGetText() {
-		assertEquals(p_text1_block, extractor.getText());
-
-        // For the 2nd, should give similar answers for
-        // the two methods, differing only in line endings
-
-        // nope, they must have different results, because of garbage
-        // assertEquals(
-        // extractor2.getTextFromPieces().replaceAll("[\\r\\n]", ""),
-        // extractor2.getText().replaceAll("[\\r\\n]", ""));
-    }
-
-	/**
-	 * Test textPieces based extraction
-	 */
-	public void testExtractFromTextPieces() {
-		String text = extractor.getTextFromPieces();
-		assertEquals(p_text1_block, text);
-	}
-
-
-	/**
-	 * Test that we can get data from two different
-	 *  embeded word documents
-	 * @throws Exception
-	 */
-	public void testExtractFromEmbeded() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getSpreadSheetInstance().openResourceAsStream(filename3));
-		HWPFDocument doc;
-		WordExtractor extractor3;
-
-		DirectoryNode dirA = (DirectoryNode) fs.getRoot().getEntry("MBD0000A3B7");
-		DirectoryNode dirB = (DirectoryNode) fs.getRoot().getEntry("MBD0000A3B2");
-
-		// Should have WordDocument and 1Table
-		assertNotNull(dirA.getEntry("1Table"));
-		assertNotNull(dirA.getEntry("WordDocument"));
-
-		assertNotNull(dirB.getEntry("1Table"));
-		assertNotNull(dirB.getEntry("WordDocument"));
-
-		// Check each in turn
-		doc = new HWPFDocument(dirA);
-		extractor3 = new WordExtractor(doc);
-
-		assertNotNull(extractor3.getText());
-		assertTrue(extractor3.getText().length() > 20);
-		assertEquals("I am a sample document\r\nNot much on me\r\nI am document 1\r\n", extractor3
-				.getText());
-		assertEquals("Sample Doc 1", extractor3.getSummaryInformation().getTitle());
-		assertEquals("Sample Test", extractor3.getSummaryInformation().getSubject());
-
-		doc = new HWPFDocument(dirB);
-		extractor3 = new WordExtractor(doc);
-
-		assertNotNull(extractor3.getText());
-		assertTrue(extractor3.getText().length() > 20);
-		assertEquals("I am another sample document\r\nNot much on me\r\nI am document 2\r\n",
-				extractor3.getText());
-		assertEquals("Sample Doc 2", extractor3.getSummaryInformation().getTitle());
-		assertEquals("Another Sample Test", extractor3.getSummaryInformation().getSubject());
-	}
-
-	public void testWithHeader() {
-		// Non-unicode
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename4);
-		extractor = new WordExtractor(doc);
-
-		assertEquals("First header column!\tMid header Right header!\n", extractor.getHeaderText());
-		assertContains(extractor.getText(), "First header column!");
-
-		// Unicode
-		doc = HWPFTestDataSamples.openSampleFile(filename5);
-		extractor = new WordExtractor(doc);
-
-		assertEquals("This is a simple header, with a \u20ac euro symbol in it.\n\n", extractor.getHeaderText());
-		assertContains(extractor.getText(), "This is a simple header");
-	}
-
-	public void testWithFooter() {
-		// Non-unicode
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename4);
-		extractor = new WordExtractor(doc);
-
-		assertEquals("Footer Left\tFooter Middle Footer Right\n", extractor.getFooterText());
-		assertContains(extractor.getText(), "Footer Left");
-
-		// Unicode
-		doc = HWPFTestDataSamples.openSampleFile(filename5);
-		extractor = new WordExtractor(doc);
-
-		assertEquals("The footer, with Moli\u00e8re, has Unicode in it.\n", extractor.getFooterText());
-		assertContains(extractor.getText(), "The footer, with");
-	}
-
-	public void testFootnote() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename6);
-		extractor = new WordExtractor(doc);
-
-		assertExtractedContains(extractor.getFootnoteText(), "TestFootnote");
-		assertEquals(0x00, doc.getRange().getSection(0).getFootnoteNumberingFormat()); // msonfcArabic
-		assertEquals(0x00, doc.getRange().getSection(0).getFootnoteRestartQualifier()); // rncCont
-		assertEquals(0, doc.getRange().getSection(0).getFootnoteNumberingOffset());	    
-		assertEquals(1, doc.getFootnotes().getNotesCount());
-	}
-
-	public void testEndnote() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename6);
-		extractor = new WordExtractor(doc);
-
-		assertExtractedContains(extractor.getEndnoteText(), "TestEndnote");
-		assertEquals(0x02, doc.getRange().getSection(0).getEndnoteNumberingFormat()); // msonfcLCRoman
-		assertEquals(0x00, doc.getRange().getSection(0).getEndnoteRestartQualifier()); // rncCont
-		assertEquals(0, doc.getRange().getSection(0).getEndnoteNumberingOffset()); 	   
-		assertEquals(1, doc.getEndnotes().getNotesCount());
-	}
-
-	public void testComments() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename6);
-		extractor = new WordExtractor(doc);
-
-		assertExtractedContains(extractor.getCommentsText(), "TestComment");
-	}
-	
-	public void testWord95() throws Exception {
-	    // Too old for the default
-	    try {
-    		extractor = new WordExtractor(
-    				POIDataSamples.getDocumentInstance().openResourceAsStream("Word95.doc")
-    		);
-    		fail();
-	    } catch(OldWordFileFormatException e) {}
-		
-		// Can work with the special one
-	    Word6Extractor w6e = new Word6Extractor(
-                POIDataSamples.getDocumentInstance().openResourceAsStream("Word95.doc")
-        );
-		String text = w6e.getText();
-		
-		assertTrue(text.contains("The quick brown fox jumps over the lazy dog"));
-        assertTrue(text.contains("Paragraph 2"));
-        assertTrue(text.contains("Paragraph 3. Has some RED text and some BLUE BOLD text in it"));
-        assertTrue(text.contains("Last (4th) paragraph"));
-        
-        String[] tp = w6e.getParagraphText();
-        assertEquals(7, tp.length);
-        assertEquals("The quick brown fox jumps over the lazy dog\r\n", tp[0]);
-        assertEquals("\r\n", tp[1]);
-        assertEquals("Paragraph 2\r\n", tp[2]);
-        assertEquals("\r\n", tp[3]);
-        assertEquals("Paragraph 3. Has some RED text and some BLUE BOLD text in it.\r\n", tp[4]);
-        assertEquals("\r\n", tp[5]);
-        assertEquals("Last (4th) paragraph.\r\n", tp[6]);
-	}
-	
-	public void testWord6() throws Exception {
-        // Too old for the default
-        try {
-    		extractor = new WordExtractor(
-    				POIDataSamples.getDocumentInstance().openResourceAsStream("Word6.doc")
-    		);
-            fail();
-        } catch(OldWordFileFormatException e) {}
-        
-        Word6Extractor w6e = new Word6Extractor(
-                POIDataSamples.getDocumentInstance().openResourceAsStream("Word6.doc")
-        );
-        String text = w6e.getText();
-        
-        assertTrue(text.contains("The quick brown fox jumps over the lazy dog"));
-        
-        String[] tp = w6e.getParagraphText();
-        assertEquals(1, tp.length);
-        assertEquals("The quick brown fox jumps over the lazy dog\r\n", tp[0]);
-	}
-
-    public void testFastSaved() throws Exception {
-        extractor = new WordExtractor(
-                POIDataSamples.getDocumentInstance().openResourceAsStream("rasp.doc")
-        );
-
-        String text = extractor.getText();
-        assertTrue(text.contains("\u0425\u0425\u0425\u0425\u0425"));
-        assertTrue(text.contains("\u0423\u0423\u0423\u0423\u0423"));
-        
-        extractor.close();
-    }
-
-    public void testFirstParagraphFix() throws Exception {
-        extractor = new WordExtractor(
-                POIDataSamples.getDocumentInstance().openResourceAsStream("Bug48075.doc")
-        );
-
-        String text = extractor.getText();
-
-        assertTrue(text.startsWith("\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435"));
-    }
-    
-    /**
-     * Tests that we can work with both {@link POIFSFileSystem}
-     *  and {@link NPOIFSFileSystem}
-     */
-    public void testDifferentPOIFS() throws Exception {
-       POIDataSamples docTests = POIDataSamples.getDocumentInstance();
-       
-       // Open the two filesystems
-       DirectoryNode[] files = new DirectoryNode[2];
-       POIFSFileSystem poifs = new POIFSFileSystem(docTests.openResourceAsStream("test2.doc"));
-       files[0] = poifs.getRoot();
-       NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem(docTests.getFile("test2.doc"));
-       files[1] = npoifsFileSystem.getRoot();
-       
-       // Open directly 
-       for(DirectoryNode dir : files) {
-          WordExtractor extractor = new WordExtractor(dir);
-          assertEquals(p_text1_block, extractor.getText());
-       }
-
-       // Open via a HWPFDocument
-       for(DirectoryNode dir : files) {
-          HWPFDocument doc = new HWPFDocument(dir);
-          WordExtractor extractor = new WordExtractor(doc);
-          assertEquals(p_text1_block, extractor.getText());
-       }
-       
-       poifs.close();
-       npoifsFileSystem.close();
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 51686 - Update to POI 3.8 beta 4 causes
-     * ConcurrentModificationException in Tika's OfficeParser
-     */
-    public void testBug51686() throws IOException
-    {
-        InputStream is = POIDataSamples.getDocumentInstance()
-                .openResourceAsStream( "Bug51686.doc" );
-
-        POIFSFileSystem fs = new POIFSFileSystem(is);
-
-        String text = null;
-
-        for (Entry entry : fs.getRoot()) {
-            if ("WordDocument".equals(entry.getName())) {
-                WordExtractor ex = new WordExtractor(fs);
-                try {
-                    text = ex.getText();
-                } finally {
-                    ex.close();
-                }
-            }
-        }
-
-        assertNotNull(text);
-    }
-
-
-    public void testExtractorFromWord6Extractor() throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getHPSFInstance().openResourceAsStream("TestMickey.doc"));
-        Word6Extractor wExt = new Word6Extractor(fs);
-        try {
-            POITextExtractor ext = wExt.getMetadataTextExtractor();
-            try {
-                // Now overall
-                String text = ext.getText();
-                assertContains(text, "TEMPLATE = Normal");
-                assertContains(text, "SUBJECT = sample subject");
-                assertContains(text, "MANAGER = sample manager");
-                assertContains(text, "COMPANY = sample company");
-            } finally {
-                ext.close();
-            }
-        } finally {
-            wExt.close();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
deleted file mode 100644
index f236b96..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.extractor;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests for bugs with the WordExtractor
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestWordExtractorBugs extends TestCase {
-
-	public void testProblemMetadata() throws Exception {
-		WordExtractor extractor =
-			new WordExtractor(POIDataSamples.getDocumentInstance().openResourceAsStream("ProblemExtracting.doc"));
-
-		// Check it gives text without error
-		extractor.getText();
-		extractor.getParagraphText();
-		extractor.getTextFromPieces();
-	}
-
-    public void testBug50688() throws Exception {
-        WordExtractor extractor =
-            new WordExtractor(POIDataSamples.getDocumentInstance().openResourceAsStream("parentinvguid.doc"));
-
-        // Check it gives text without error
-        extractor.getText();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java
deleted file mode 100644
index cb90d99..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hwpf.model;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class PlfLfoTest {
-    @Test
-    public void testAdd() {
-        PlfLfo p = new PlfLfo(new byte[] {0, 0, 0, 0}, 0, 0);
-        assertEquals(0, p.getLfoMac());
-        p.add(new LFO(new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0), new LFOData());
-        assertEquals(1, p.getLfoMac());
-        assertNotNull(p.getLfo(1));
-        assertNotNull(p.getLfoData(1));
-    }
-
-    @Test
-    public void testEquals() {
-        PlfLfo p = new PlfLfo(new byte[] {0, 0, 0, 0}, 0, 0);
-        PlfLfo p2 = new PlfLfo(new byte[] {0, 0, 0, 0}, 0, 0);
-        assertEquals(0, p.getLfoMac());
-        assertEquals(0, p2.getLfoMac());
-
-        assertTrue(p.equals(p2));
-        //noinspection ObjectEqualsNull
-        assertFalse(p.equals(null));
-
-        p.add(new LFO(new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0), new LFOData());
-        assertEquals(1, p.getLfoMac());
-
-        assertFalse(p.equals(p2));
-
-        p2.add(new LFO(new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0), new LFOData());
-        assertEquals(1, p2.getLfoMac());
-        assertTrue(p.equals(p2));
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java
deleted file mode 100644
index 4e013b3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.usermodel.Range;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.usermodel.Bookmark;
-import org.apache.poi.hwpf.usermodel.Bookmarks;
-
-/**
- * Test cases for {@link BookmarksTables} and default implementation of
- * {@link Bookmarks}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class TestBookmarksTables extends TestCase
-{
-    public void test()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "pageref.doc" );
-        Bookmarks bookmarks = doc.getBookmarks();
-
-        assertEquals( 1, bookmarks.getBookmarksCount() );
-
-        Bookmark bookmark = bookmarks.getBookmark( 0 );
-        assertEquals( "userref", bookmark.getName() );
-        assertEquals( 27, bookmark.getStart() );
-        assertEquals( 38, bookmark.getEnd() );
-    }
-
-    public void testDeleteRange()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "pageref.doc" );
-        Range range = new Range( 27, 41, doc );
-        range.delete();
-
-        assertEquals( 0, doc.getBookmarks().getBookmarksCount() );
-    }
-
-    public void testReplaceTextAfter()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "pageref.doc" );
-        Bookmark bookmark = doc.getBookmarks().getBookmark( 0 );
-        Range range = new Range( bookmark.getStart(), bookmark.getEnd(), doc );
-        range.replaceText( "1destin2ation3", true );
-
-        bookmark = doc.getBookmarks().getBookmark( 0 );
-        assertEquals( "userref", bookmark.getName() );
-        assertEquals( 27, bookmark.getStart() );
-        assertEquals( 41, bookmark.getEnd() );
-    }
-
-    public void testReplaceTextBefore()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "pageref.doc" );
-        Bookmark bookmark = doc.getBookmarks().getBookmark( 0 );
-        Range range = new Range( bookmark.getStart(), bookmark.getEnd(), doc );
-        range.replaceText( "1destin2ation3", false );
-
-        bookmark = doc.getBookmarks().getBookmark( 0 );
-        assertEquals( "userref", bookmark.getName() );
-        assertEquals( 27, bookmark.getStart() );
-        assertEquals( 41, bookmark.getEnd() );
-    }
-
-    public void testUpdateText()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "pageref.doc" );
-        Bookmark bookmark = doc.getBookmarks().getBookmark( 0 );
-        Range range = new Range( bookmark.getStart(), bookmark.getEnd(), doc );
-        range.replaceText( "destination", "1destin2ation3" );
-
-        bookmark = doc.getBookmarks().getBookmark( 0 );
-        assertEquals( "userref", bookmark.getName() );
-        assertEquals( 27, bookmark.getStart() );
-        assertEquals( 41, bookmark.getEnd() );
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java
deleted file mode 100644
index 759e1af..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocFixture;
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-
-public final class TestCHPBinTable
-  extends TestCase
-{
-  private CHPBinTable _cHPBinTable = null;
-  private HWPFDocFixture _hWPFDocFixture;
-
-  private final TextPieceTable fakeTPT = new TextPieceTable() {
-      @Override
-      public boolean isIndexInTable(int bytePos) {
-          return true;
-      }
-  };
-
-  public void testReadWrite()
-    throws Exception
-  {
-    FileInformationBlock fib = _hWPFDocFixture._fib;
-    byte[] mainStream = _hWPFDocFixture._mainStream;
-    byte[] tableStream = _hWPFDocFixture._tableStream;
-    int fcMin = fib.getFibBase().getFcMin();
-
-    _cHPBinTable = new CHPBinTable(mainStream, tableStream, fib.getFcPlcfbteChpx(), fib.getLcbPlcfbteChpx(), fakeTPT);
-
-    HWPFFileSystem fileSys = new HWPFFileSystem();
-
-    _cHPBinTable.writeTo(fileSys, 0, fakeTPT);
-    ByteArrayOutputStream tableOut = fileSys.getStream("1Table");
-    ByteArrayOutputStream mainOut =  fileSys.getStream("WordDocument");
-
-    byte[] newTableStream = tableOut.toByteArray();
-    byte[] newMainStream = mainOut.toByteArray();
-
-    CHPBinTable newBinTable = new CHPBinTable(newMainStream, newTableStream, 0, newTableStream.length, fakeTPT);
-
-    List<CHPX> oldTextRuns = _cHPBinTable._textRuns;
-    List<CHPX> newTextRuns = newBinTable._textRuns;
-
-    assertEquals(oldTextRuns.size(), newTextRuns.size());
-
-    int size = oldTextRuns.size();
-    for (int x = 0; x < size; x++)
-    {
-      CHPX oldNode = oldTextRuns.get(x);
-      CHPX newNode = newTextRuns.get(x);
-      assertTrue(oldNode.equals(newNode));
-    }
-
-  }
-  @Override
-protected void setUp()
-    throws Exception
-  {
-    super.setUp();
-    _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-
-    _hWPFDocFixture.setUp();
-  }
-
-  @Override
-protected void tearDown()
-    throws Exception
-  {
-    _cHPBinTable = null;
-    _hWPFDocFixture.tearDown();
-
-    _hWPFDocFixture = null;
-    super.tearDown();
-  }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java
deleted file mode 100644
index 9dfc572..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import static org.apache.poi.POITestCase.assertReflectEquals;
-
-import org.apache.poi.hwpf.HWPFDocFixture;
-import org.apache.poi.hwpf.model.types.DOPAbstractType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-// TODO: Add DocumentProperties#equals ???
-
-public final class TestDocumentProperties {
-    private DocumentProperties _documentProperties = null;
-    private HWPFDocFixture _hWPFDocFixture;
-
-    @Test
-    public void testReadWrite() throws Exception  {
-        int size = DOPAbstractType.getSize();
-        byte[] buf = new byte[size];
-        _documentProperties.serialize(buf, 0);
-        DocumentProperties newDocProperties = new DocumentProperties(buf, 0, size);
-
-        assertReflectEquals(_documentProperties, newDocProperties);
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        /** TODO verify the constructors*/
-        _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-        _hWPFDocFixture.setUp();
-        _documentProperties = new DocumentProperties(_hWPFDocFixture._tableStream, _hWPFDocFixture._fib.getFcDop(), _hWPFDocFixture._fib.getLcbDop());
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        _documentProperties = null;
-        _hWPFDocFixture.tearDown();
-        _hWPFDocFixture = null;
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java
deleted file mode 100644
index e6e2145..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import static org.apache.poi.POITestCase.assertReflectEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.poi.hwpf.HWPFDocFixture;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public final class TestFileInformationBlock {
-    private FileInformationBlock _fileInformationBlock = null;
-    private HWPFDocFixture _hWPFDocFixture;
-
-    @Test
-    public void testReadWrite() throws Exception {
-        final FibBase expected = _fileInformationBlock.getFibBase();
-        int size = _fileInformationBlock.getSize();
-        byte[] buf = new byte[size];
-        expected.serialize(buf, 0);
-
-        FileInformationBlock newFileInformationBlock = new FileInformationBlock(buf);
-        FibBase actual = newFileInformationBlock.getFibBase();
-
-        assertReflectEquals(expected, actual);
-        assertNotNull(_fileInformationBlock.toString());
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        /** @todo verify the constructors */
-        _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-        _hWPFDocFixture.setUp();
-        _fileInformationBlock = _hWPFDocFixture._fib;
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        _fileInformationBlock = null;
-        _hWPFDocFixture.tearDown();
-        _hWPFDocFixture = null;
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java
deleted file mode 100644
index fa4dc3e..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import junit.framework.*;
-import org.apache.poi.hwpf.*;
-import org.apache.poi.hwpf.model.io.*;
-
-public final class TestFontTable
-  extends TestCase
-{
-  private FontTable _fontTable = null;
-  private HWPFDocFixture _hWPFDocFixture;
-
-  public void testReadWrite()
-    throws Exception
-  {
-    FileInformationBlock fib = _hWPFDocFixture._fib;
-    byte[] tableStream = _hWPFDocFixture._tableStream;
-
-    int fcSttbfffn = fib.getFcSttbfffn();
-    int lcbSttbfffn = fib.getLcbSttbfffn();
-
-    _fontTable = new FontTable(tableStream, fcSttbfffn, lcbSttbfffn);
-
-    HWPFFileSystem fileSys = new HWPFFileSystem();
-
-    _fontTable.writeTo(fileSys);
-    HWPFOutputStream  tableOut = fileSys.getStream("1Table");
-
-
-    byte[] newTableStream = tableOut.toByteArray();
-
-
-    FontTable newFontTable = new FontTable(newTableStream, 0, newTableStream.length);
-
-	  assertTrue(_fontTable.equals(newFontTable));
-
-  }
-
-  @Override
-protected void setUp()
-    throws Exception
-  {
-    super.setUp();
-    /**@todo verify the constructors*/
-    _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-
-    _hWPFDocFixture.setUp();
-  }
-
-  @Override
-protected void tearDown()
-    throws Exception
-  {
-    _hWPFDocFixture.tearDown();
-
-    _hWPFDocFixture = null;
-    super.tearDown();
-  }
-
-}
-
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java
deleted file mode 100644
index feb7a90..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import org.apache.poi.hwpf.*;
-import org.apache.poi.hwpf.model.io.*;
-
-
-public final class TestListTables
-  extends HWPFTestCase
-{
-
-  public TestListTables()
-  {
-  }
-
-  public void testReadWrite()
-    throws Exception
-  {
-    FileInformationBlock fib = _hWPFDocFixture._fib;
-    byte[] tableStream = _hWPFDocFixture._tableStream;
-
-    int listOffset = fib.getFcPlfLst();
-    int lfoOffset = fib.getFcPlfLfo();
-    if (listOffset != 0 && fib.getLcbPlfLst() != 0)
-    {
-      ListTables listTables = new ListTables (tableStream, fib.getFcPlfLst(),
-                                              fib.getFcPlfLfo (), fib.getLcbPlfLfo());
-      HWPFFileSystem fileSys = new HWPFFileSystem ();
-
-      HWPFOutputStream tableOut = fileSys.getStream ("1Table");
-
-      listTables.writeListDataTo (fib, tableOut);
-      listTables.writeListOverridesTo( fib, tableOut);
-
-      ListTables newTables = new ListTables (tableOut.toByteArray (), fib.getFcPlfLst(),
-              fib.getFcPlfLfo (), fib.getLcbPlfLfo());
-
-      assertEquals(listTables, newTables);
-
-    }
-  }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java
deleted file mode 100644
index 4679d24..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.usermodel.Notes;
-
-/**
- * Test cases for {@link NotesTables} and default implementation of
- * {@link Notes}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class TestNotesTables extends TestCase
-{
-    public void test()
-    {
-        HWPFDocument doc = HWPFTestDataSamples
-                .openSampleFile( "endingnote.doc" );
-        Notes notes = doc.getEndnotes();
-
-        assertEquals( 1, notes.getNotesCount() );
-
-        assertEquals( 10, notes.getNoteAnchorPosition( 0 ) );
-        assertEquals( 0, notes.getNoteTextStartOffset( 0 ) );
-        assertEquals( 19, notes.getNoteTextEndOffset( 0 ) );
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java
deleted file mode 100644
index a642d19..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocFixture;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-
-public final class TestPAPBinTable extends TestCase
-{
-
-    public void testObIs()
-    {
-        // shall not fail with assertions on
-        HWPFTestDataSamples.openSampleFile( "ob_is.doc" );
-    }
-
-    public void testReadWrite() throws Exception
-    {
-        /** @todo verify the constructors */
-        HWPFDocFixture _hWPFDocFixture = new HWPFDocFixture( this,
-                HWPFDocFixture.DEFAULT_TEST_FILE );
-
-        _hWPFDocFixture.setUp();
-        TextPieceTable fakeTPT = new TextPieceTable();
-
-        FileInformationBlock fib = _hWPFDocFixture._fib;
-        byte[] mainStream = _hWPFDocFixture._mainStream;
-        byte[] tableStream = _hWPFDocFixture._tableStream;
-
-        PAPBinTable _pAPBinTable = new PAPBinTable( mainStream, tableStream,
-                null, fib.getFcPlcfbtePapx(), fib.getLcbPlcfbtePapx(), fakeTPT );
-
-        HWPFFileSystem fileSys = new HWPFFileSystem();
-        HWPFOutputStream tableOut = fileSys.getStream( "1Table" );
-        HWPFOutputStream mainOut = fileSys.getStream( "WordDocument" );
-        _pAPBinTable.writeTo( mainOut, tableOut, fakeTPT );
-
-        byte[] newTableStream = tableOut.toByteArray();
-        byte[] newMainStream = mainOut.toByteArray();
-
-        PAPBinTable newBinTable = new PAPBinTable( newMainStream,
-                newTableStream, null, 0, newTableStream.length, fakeTPT );
-
-        List<PAPX> oldTextRuns = _pAPBinTable.getParagraphs();
-        List<PAPX> newTextRuns = newBinTable.getParagraphs();
-
-        assertEquals( oldTextRuns.size(), newTextRuns.size() );
-
-        int size = oldTextRuns.size();
-        for ( int x = 0; x < size; x++ )
-        {
-            PAPX oldNode = oldTextRuns.get( x );
-            PAPX newNode = newTextRuns.get( x );
-
-            assertTrue( oldNode.equals( newNode ) );
-        }
-
-        _hWPFDocFixture.tearDown();
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java
deleted file mode 100644
index 0754054..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import junit.framework.*;
-import org.apache.poi.hwpf.*;
-
-import org.apache.poi.util.LittleEndian;
-
-public final class TestPlexOfCps
-  extends TestCase
-{
-  private PlexOfCps _plexOfCps = null;
-  private HWPFDocFixture _hWPFDocFixture;
-
-  public void testWriteRead() {
-    _plexOfCps = new PlexOfCps(4);
-
-    int last = 0;
-    for (int x = 0; x < 110; x++)
-    {
-      byte[] intHolder = new byte[4];
-      int span = (int)(110.0f * Math.random());
-      LittleEndian.putInt(intHolder, 0, span);
-      _plexOfCps.addProperty(new GenericPropertyNode(last, last + span, intHolder));
-      last += span;
-    }
-
-    byte[] output = _plexOfCps.toByteArray();
-    _plexOfCps = new PlexOfCps(output, 0, output.length, 4);
-    int len = _plexOfCps.length();
-    assertEquals(len, 110);
-
-    last = 0;
-    for (int x = 0; x < len; x++)
-    {
-      GenericPropertyNode node = _plexOfCps.getProperty(x);
-      assertEquals(node.getStart(), last);
-      last = node.getEnd();
-      int span = LittleEndian.getInt(node.getBytes());
-      assertEquals(node.getEnd()-node.getStart(), span);
-    }
-  }
-  @Override
-protected void setUp()
-    throws Exception
-  {
-    super.setUp();
-    /**@todo verify the constructors*/
-    _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-
-    _hWPFDocFixture.setUp();
-  }
-
-  @Override
-protected void tearDown()
-    throws Exception
-  {
-    _plexOfCps = null;
-    _hWPFDocFixture.tearDown();
-
-    _hWPFDocFixture = null;
-    super.tearDown();
-  }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
deleted file mode 100644
index 6ef2d2b..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * Test the table which handles author revision marks
- */
-public final class TestRevisionMarkAuthorTable extends TestCase {
-   /**
-    * Tests that an empty file doesn't have one
-    */
-   public void testEmptyDocument() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("empty.doc");
-      
-      RevisionMarkAuthorTable rmt = doc.getRevisionMarkAuthorTable();
-      assertNull(rmt);
-   }
-   
-   /**
-    * Tests that we can load a document with
-    *  only simple entries in the table
-    */
-	public void testSimpleDocument() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile("two_images.doc");
-		
-		RevisionMarkAuthorTable rmt = doc.getRevisionMarkAuthorTable();
-		assertNotNull(rmt);
-		assertEquals(1, rmt.getSize());
-		assertEquals("Unknown", rmt.getAuthor(0));
-		
-		assertEquals(null, rmt.getAuthor(1));
-      assertEquals(null, rmt.getAuthor(2));
-      assertEquals(null, rmt.getAuthor(3));
-	}
-	
-	/**
-	 * Several authors, one of whom has no name
-	 */
-	public void testMultipleAuthors() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("MarkAuthorsTable.doc");
-      
-      RevisionMarkAuthorTable rmt = doc.getRevisionMarkAuthorTable();
-      assertNotNull(rmt);
-      assertEquals(4, rmt.getSize());
-      assertEquals("Unknown", rmt.getAuthor(0));
-      assertEquals("BSanders", rmt.getAuthor(1));
-      assertEquals(" ", rmt.getAuthor(2));
-      assertEquals("Ryan Lauck", rmt.getAuthor(3));
-      
-      assertEquals(null, rmt.getAuthor(4));
-      assertEquals(null, rmt.getAuthor(5));
-      assertEquals(null, rmt.getAuthor(6));
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java
deleted file mode 100644
index 2b96f21..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import java.io.*;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * Unit test for {@link SavedByTable} and {@link SavedByEntry}.
- *
- * @author Daniel Noll
- */
-public final class TestSavedByTable
-  extends TestCase
-{
-
-  /** The expected entries in the test document. */
-  private final List expected = Arrays.asList(new Object[] {
-    new SavedByEntry("cic22", "C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd"),
-    new SavedByEntry("cic22", "C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd"),
-    new SavedByEntry("cic22", "C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd"),
-    new SavedByEntry("JPratt", "C:\\TEMP\\Iraq - security.doc"),
-    new SavedByEntry("JPratt", "A:\\Iraq - security.doc"),
-    new SavedByEntry("ablackshaw", "C:\\ABlackshaw\\Iraq - security.doc"),
-    new SavedByEntry("ablackshaw", "C:\\ABlackshaw\\A;Iraq - security.doc"),
-    new SavedByEntry("ablackshaw", "A:\\Iraq - security.doc"),
-    new SavedByEntry("MKhan", "C:\\TEMP\\Iraq - security.doc"),
-    new SavedByEntry("MKhan", "C:\\WINNT\\Profiles\\mkhan\\Desktop\\Iraq.doc")
-  });
-
-  /**
-   * Tests reading in the entries, comparing them against the expected entries.
-   * Then tests writing the document out and reading the entries yet again.
-   *
-   * @throws Exception if an unexpected error occurs.
-   */
-  public void testReadWrite()
-    throws Exception
-  {
-    // This document is widely available on the internet as "blair.doc".
-    // I tried stripping the content and saving the document but my version
-    // of Word (from Office XP) strips this table out.
-    HWPFDocument doc = HWPFTestDataSamples.openSampleFile("saved-by-table.doc");
-
-    // Check what we just read.
-    assertEquals("List of saved-by entries was not as expected",
-                 expected, doc.getSavedByTable().getEntries());
-
-    // Now write the entire document out, and read it back in...
-    ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-    doc.write(byteStream);
-    InputStream copyStream = new ByteArrayInputStream(byteStream.toByteArray());
-    HWPFDocument copy = new HWPFDocument(copyStream);
-
-    // And check again.
-    assertEquals("List of saved-by entries was incorrect after writing",
-                 expected, copy.getSavedByTable().getEntries());
-  }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java
deleted file mode 100644
index 1ca57b0..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import junit.framework.*;
-
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import org.apache.poi.hwpf.*;
-import org.apache.poi.hwpf.model.io.*;
-
-public final class TestSectionTable
-  extends TestCase
-{
-  private HWPFDocFixture _hWPFDocFixture;
-
-  public void testReadWrite()
-    throws Exception
-  {
-    FileInformationBlock fib = _hWPFDocFixture._fib;
-    byte[] mainStream = _hWPFDocFixture._mainStream;
-    byte[] tableStream = _hWPFDocFixture._tableStream;
-    int fcMin = fib.getFibBase().getFcMin();
-
-    ComplexFileTable cft = new ComplexFileTable(mainStream, tableStream, fib.getFcClx(), fcMin);
-    TextPieceTable tpt = cft.getTextPieceTable();
-
-    SectionTable sectionTable = new SectionTable(mainStream, tableStream,
-                                                 fib.getFcPlcfsed(),
-                                                 fib.getLcbPlcfsed(),
-                                                 fcMin, tpt, fib.getSubdocumentTextStreamLength( SubdocumentType.MAIN ));
-    HWPFFileSystem fileSys = new HWPFFileSystem();
-
-    sectionTable.writeTo(fileSys, 0);
-    ByteArrayOutputStream tableOut = fileSys.getStream("1Table");
-    ByteArrayOutputStream mainOut =  fileSys.getStream("WordDocument");
-
-    byte[] newTableStream = tableOut.toByteArray();
-    byte[] newMainStream = mainOut.toByteArray();
-
-    SectionTable newSectionTable = new SectionTable(
-    		newMainStream, newTableStream, 0,
-    		newTableStream.length, 0, tpt, fib.getSubdocumentTextStreamLength( SubdocumentType.MAIN ));
-
-    List<SEPX> oldSections = sectionTable.getSections();
-    List<SEPX> newSections = newSectionTable.getSections();
-
-    assertEquals(oldSections.size(), newSections.size());
-
-    //test for proper char offset conversions
-    PlexOfCps oldSedPlex = new PlexOfCps(tableStream, fib.getFcPlcfsed(),
-                                                      fib.getLcbPlcfsed(), 12);
-    PlexOfCps newSedPlex = new PlexOfCps(newTableStream, 0,
-                                         newTableStream.length, 12);
-    assertEquals(oldSedPlex.length(), newSedPlex.length());
-
-    for (int x = 0; x < oldSedPlex.length(); x++)
-    {
-      assertEquals(oldSedPlex.getProperty(x).getStart(), newSedPlex.getProperty(x).getStart());
-      assertEquals(oldSedPlex.getProperty(x).getEnd(), newSedPlex.getProperty(x).getEnd());
-    }
-
-    int size = oldSections.size();
-    for (int x = 0; x < size; x++)
-    {
-	  SEPX oldNode = oldSections.get(x);
-	  SEPX newNode = newSections.get(x);
-      assertEquals(oldNode, newNode);
-    }
-  }
-
-  @Override
-protected void setUp()
-    throws Exception
-  {
-    super.setUp();
-    /**@todo verify the constructors*/
-    _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-
-    _hWPFDocFixture.setUp();
-  }
-
-  @Override
-protected void tearDown()
-    throws Exception
-  {
-    _hWPFDocFixture.tearDown();
-
-    _hWPFDocFixture = null;
-    super.tearDown();
-  }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java
deleted file mode 100644
index 41677dd..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import junit.framework.*;
-
-import org.apache.poi.hwpf.*;
-import org.apache.poi.hwpf.model.io.*;
-
-public final class TestStyleSheet
-  extends TestCase
-{
-  private StyleSheet _styleSheet = null;
-  private HWPFDocFixture _hWPFDocFixture;
-
-  public void testReadWrite()
-    throws Exception
-  {
-    HWPFFileSystem fileSys = new HWPFFileSystem();
-
-
-    HWPFOutputStream tableOut = fileSys.getStream("1Table");
-    HWPFOutputStream mainOut =  fileSys.getStream("WordDocument");
-
-    _styleSheet.writeTo(tableOut);
-
-    byte[] newTableStream = tableOut.toByteArray();
-
-    StyleSheet newStyleSheet = new StyleSheet(newTableStream, 0);
-    assertEquals(newStyleSheet, _styleSheet);
-
-  }
-
-  public void testReadWriteFromNonZeroOffset()
-    throws Exception
-  {
-    HWPFFileSystem fileSys = new HWPFFileSystem();
-    HWPFOutputStream tableOut = fileSys.getStream("1Table");
-
-    tableOut.write(new byte[20]); // 20 bytes of whatever at the front.
-    _styleSheet.writeTo(tableOut);
-
-    byte[] newTableStream = tableOut.toByteArray();
-
-    StyleSheet newStyleSheet = new StyleSheet(newTableStream, 20);
-    assertEquals(newStyleSheet, _styleSheet);
-  }
-
-  @Override
-protected void setUp()
-    throws Exception
-  {
-    super.setUp();
-    /**@todo verify the constructors*/
-    _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-    _hWPFDocFixture.setUp();
-    FileInformationBlock fib = _hWPFDocFixture._fib;
-    byte[] mainStream = _hWPFDocFixture._mainStream;
-    byte[] tableStream = _hWPFDocFixture._tableStream;
-
-    _hWPFDocFixture.setUp();
-    _styleSheet = new StyleSheet(tableStream, fib.getFcStshf());
-  }
-
-  @Override
-protected void tearDown()
-    throws Exception
-  {
-    _styleSheet = null;
-    _hWPFDocFixture.tearDown();
-
-    _hWPFDocFixture = null;
-    super.tearDown();
-  }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java
deleted file mode 100644
index 1185791..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.model;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.hwpf.HWPFDocFixture;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-@SuppressWarnings("deprecation")
-public final class TestTextPieceTable {
-    private HWPFDocFixture _hWPFDocFixture;
-
-    @Before
-    public void setUp() throws Exception {
-        System.setProperty("org.apache.poi.hwpf.preserveTextTable",
-                Boolean.TRUE.toString());
-
-        _hWPFDocFixture = new HWPFDocFixture(this,
-                HWPFDocFixture.DEFAULT_TEST_FILE);
-        _hWPFDocFixture.setUp();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        _hWPFDocFixture.tearDown();
-        _hWPFDocFixture = null;
-
-        System.setProperty("org.apache.poi.hwpf.preserveTextTable",
-                Boolean.FALSE.toString());
-    }
-
-    @Test
-    public void testReadWrite() throws Exception {
-        FileInformationBlock fib = _hWPFDocFixture._fib;
-        byte[] mainStream = _hWPFDocFixture._mainStream;
-        byte[] tableStream = _hWPFDocFixture._tableStream;
-        int fcMin = fib.getFibBase().getFcMin();
-
-        ComplexFileTable cft = new ComplexFileTable(mainStream, tableStream,
-                fib.getFcClx(), fcMin);
-
-        HWPFFileSystem fileSys = new HWPFFileSystem();
-
-        cft.writeTo(fileSys);
-        ByteArrayOutputStream tableOut = fileSys.getStream("1Table");
-        ByteArrayOutputStream mainOut = fileSys.getStream("WordDocument");
-
-        byte[] newTableStream = tableOut.toByteArray();
-        byte[] newMainStream = mainOut.toByteArray();
-
-        ComplexFileTable newCft = new ComplexFileTable(newMainStream,
-                newTableStream, 0, 0);
-
-        TextPieceTable oldTextPieceTable = cft.getTextPieceTable();
-        TextPieceTable newTextPieceTable = newCft.getTextPieceTable();
-
-        assertEquals(oldTextPieceTable, newTextPieceTable);
-    }
-
-    /**
-     * Check that we do the positions correctly when working with pure-ascii
-     */
-    @Test
-    public void testAsciiParts() throws Exception {
-        HWPFDocument doc = HWPFTestDataSamples
-                .openSampleFile("ThreeColHeadFoot.doc");
-        TextPieceTable tbl = doc.getTextTable();
-
-        // All ascii, so stored in one big lump
-        assertEquals(1, tbl.getTextPieces().size());
-        TextPiece tp = tbl.getTextPieces().get(0);
-
-        assertEquals(0, tp.getStart());
-        assertEquals(339, tp.getEnd());
-        assertEquals(339, tp.characterLength());
-        assertEquals(339, tp.bytesLength());
-        assertTrue(tp.getStringBuilder().toString()
-                .startsWith("This is a sample word document"));
-
-        // Save and re-load
-        HWPFDocument docB = saveAndReload(doc);
-        tbl = docB.getTextTable();
-
-        assertEquals(1, tbl.getTextPieces().size());
-        tp = tbl.getTextPieces().get(0);
-
-        assertEquals(0, tp.getStart());
-        assertEquals(339, tp.getEnd());
-        assertEquals(339, tp.characterLength());
-        assertEquals(339, tp.bytesLength());
-        assertTrue(tp.getStringBuilder().toString()
-                .startsWith("This is a sample word document"));
-    }
-
-    /**
-     * Check that we do the positions correctly when working with a mix ascii,
-     * unicode file
-     */
-    @Test
-    public void testUnicodeParts() throws Exception {
-        HWPFDocument doc = HWPFTestDataSamples
-                .openSampleFile("HeaderFooterUnicode.doc");
-        TextPieceTable tbl = doc.getTextTable();
-
-        // In three bits, split every 512 bytes
-        assertEquals(3, tbl.getTextPieces().size());
-        TextPiece tpA = tbl.getTextPieces().get(0);
-        TextPiece tpB = tbl.getTextPieces().get(1);
-        TextPiece tpC = tbl.getTextPieces().get(2);
-
-        assertTrue(tpA.isUnicode());
-        assertTrue(tpB.isUnicode());
-        assertTrue(tpC.isUnicode());
-
-        assertEquals(256, tpA.characterLength());
-        assertEquals(256, tpB.characterLength());
-        assertEquals(19, tpC.characterLength());
-
-        assertEquals(512, tpA.bytesLength());
-        assertEquals(512, tpB.bytesLength());
-        assertEquals(38, tpC.bytesLength());
-
-        assertEquals(0, tpA.getStart());
-        assertEquals(256, tpA.getEnd());
-        assertEquals(256, tpB.getStart());
-        assertEquals(512, tpB.getEnd());
-        assertEquals(512, tpC.getStart());
-        assertEquals(531, tpC.getEnd());
-
-        // Save and re-load
-        HWPFDocument docB = saveAndReload(doc);
-        tbl = docB.getTextTable();
-
-        assertEquals(3, tbl.getTextPieces().size());
-        tpA = tbl.getTextPieces().get(0);
-        tpB = tbl.getTextPieces().get(1);
-        tpC = tbl.getTextPieces().get(2);
-
-        assertTrue(tpA.isUnicode());
-        assertTrue(tpB.isUnicode());
-        assertTrue(tpC.isUnicode());
-
-        assertEquals(256, tpA.characterLength());
-        assertEquals(256, tpB.characterLength());
-        assertEquals(19, tpC.characterLength());
-
-        assertEquals(512, tpA.bytesLength());
-        assertEquals(512, tpB.bytesLength());
-        assertEquals(38, tpC.bytesLength());
-
-        assertEquals(0, tpA.getStart());
-        assertEquals(256, tpA.getEnd());
-        assertEquals(256, tpB.getStart());
-        assertEquals(512, tpB.getEnd());
-        assertEquals(512, tpC.getStart());
-        assertEquals(531, tpC.getEnd());
-    }
-
-    protected HWPFDocument saveAndReload(HWPFDocument doc) throws Exception {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        doc.write(baos);
-
-        return new HWPFDocument(new ByteArrayInputStream(baos.toByteArray()));
-    }
-
-    @Test
-    public void test56549_CharIndexRange() {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("ThreeColHeadFoot.doc");
-
-        // there is one range from 2048 - 2387
-
-        TextPieceTable tbl = doc.getTextTable();
-        int[][] range = tbl.getCharIndexRanges(0, 0);
-        assertEquals(0, range.length);
-
-        range = tbl.getCharIndexRanges(0, 1);
-        assertEquals(0, range.length);
-
-        range = tbl.getCharIndexRanges(0, 338);
-        assertEquals(0, range.length);
-
-        range = tbl.getCharIndexRanges(0, 339);
-        assertEquals(0, range.length);
-
-        range = tbl.getCharIndexRanges(0, 340);
-        assertEquals(0, range.length);
-
-        range = tbl.getCharIndexRanges(2030, 2048);
-        assertEquals(0, range.length);
-
-        range = tbl.getCharIndexRanges(2030, 2049);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {0,1}, range[0]);
-
-        range = tbl.getCharIndexRanges(2048, 2049);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {0,1}, range[0]);
-
-        range = tbl.getCharIndexRanges(2048, 2300);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {0,252}, range[0]);
-
-        range = tbl.getCharIndexRanges(2049, 2300);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {1,252}, range[0]);
-
-        range = tbl.getCharIndexRanges(2049, 2300);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {1,252}, range[0]);
-
-        range = tbl.getCharIndexRanges(2049, 2387);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {1,339}, range[0]);
-
-        range = tbl.getCharIndexRanges(2049, 2388);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {1,339}, range[0]);
-
-        range = tbl.getCharIndexRanges(2387, 2388);
-        assertEquals(1, range.length);
-        assertArrayEquals(new int[] {339,339}, range[0]);
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java
deleted file mode 100644
index 90919cf..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import junit.framework.TestCase;
-
-/**
- * Test cases for {@link LFOLVLBaseAbstractType}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class LFOLVLBaseAbstractTypeTest extends TestCase
-{
-
-    public void testGetSize()
-    {
-        assertEquals( 8, LFOLVLBaseAbstractType.getSize() );
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java
deleted file mode 100644
index b2e9642..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.model.types;
-
-import junit.framework.TestCase;
-
-/**
- * Test cases for {@link LVLFAbstractType}
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class LVLFAbstractTypeTest extends TestCase
-{
-
-    public void testGetSize()
-    {
-        assertEquals( 28, LVLFAbstractType.getSize() );
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
deleted file mode 100644
index 77c6e86..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hwpf.sprm;
-
-import org.apache.poi.hwpf.usermodel.TableProperties;
-
-import junit.framework.TestCase;
-
-public class TableSprmUncompressorTest extends TestCase
-{
-    public void testSprmTDefTable()
-    {
-        final byte[] example = { (byte) 0x08, (byte) 0xD6, (byte) 0x2F,
-                (byte) 0x00, (byte) 0x02, (byte) 0x94, (byte) 0xFF,
-                (byte) 0x53, (byte) 0x03, (byte) 0x60, (byte) 0x13,
-                (byte) 0x00, (byte) 0x06, (byte) 0xBF, (byte) 0x03,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x06, (byte) 0x0D, (byte) 0x10,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 };
-
-        SprmOperation sprmOperation = new SprmOperation( example, 0 );
-        assertEquals( SprmOperation.TYPE_TAP, sprmOperation.getType() );
-        assertEquals( (short) 0x08, sprmOperation.getOperation() );
-
-        TableProperties tableProperties = new TableProperties();
-        TableSprmUncompressor.unCompressTAPOperation( tableProperties,
-                sprmOperation );
-
-        assertEquals( 2, tableProperties.getItcMac() );
-        assertEquals( 3, tableProperties.getRgdxaCenter().length );
-        assertEquals( (short) 0xff94, tableProperties.getRgdxaCenter()[0] );
-        assertEquals( (short) 0x0353, tableProperties.getRgdxaCenter()[1] );
-        assertEquals( (short) 0x1360, tableProperties.getRgdxaCenter()[2] );
-
-        assertEquals( 2, tableProperties.getRgtc().length );
-        assertEquals( (short) 0x03bf, tableProperties.getRgtc()[0].getWWidth() );
-        assertEquals( (short) 0x100d, tableProperties.getRgtc()[1].getWWidth() );
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
deleted file mode 100644
index e5c94d0..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hwpf.sprm;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Range;
-
-public class TestSprms extends TestCase
-{
-    private static HWPFDocument reload( HWPFDocument hwpfDocument )
-            throws IOException
-    {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        hwpfDocument.write( baos );
-        return new HWPFDocument( new ByteArrayInputStream( baos.toByteArray() ) );
-    }
-
-    /**
-     * Test correct processing of "sprmPItap" (0x6649) and "sprmPFInTable"
-     * (0x2416)
-     */
-    public void testInnerTable() throws Exception
-    {
-        InputStream resourceAsStream = POIDataSamples.getDocumentInstance()
-                .openResourceAsStream( "innertable.doc" );
-        HWPFDocument hwpfDocument = new HWPFDocument( resourceAsStream );
-        resourceAsStream.close();
-
-        testInnerTable( hwpfDocument );
-        hwpfDocument = reload( hwpfDocument );
-        testInnerTable( hwpfDocument );
-    }
-
-    private void testInnerTable( HWPFDocument hwpfDocument )
-    {
-        Range range = hwpfDocument.getRange();
-        for ( int p = 0; p < range.numParagraphs(); p++ )
-        {
-            Paragraph paragraph = range.getParagraph( p );
-            char first = paragraph.text().toLowerCase(Locale.ROOT).charAt( 0 );
-            if ( '1' <= first && first < '4' )
-            {
-                assertTrue( paragraph.isInTable() );
-                assertEquals( 2, paragraph.getTableLevel() );
-            }
-
-            if ( 'a' <= first && first < 'z' )
-            {
-                assertTrue( paragraph.isInTable() );
-                assertEquals( 1, paragraph.getTableLevel() );
-            }
-        }
-    }
-
-    /**
-     * Test correct processing of "sprmPJc" by uncompressor
-     */
-    public void testSprmPJc() throws IOException
-    {
-        InputStream resourceAsStream = POIDataSamples.getDocumentInstance()
-                .openResourceAsStream( "Bug49820.doc" );
-        HWPFDocument hwpfDocument = new HWPFDocument( resourceAsStream );
-        resourceAsStream.close();
-
-        assertEquals( 1, hwpfDocument.getStyleSheet().getParagraphStyle( 8 )
-                .getJustification() );
-
-        hwpfDocument = reload( hwpfDocument );
-
-        assertEquals( 1, hwpfDocument.getStyleSheet().getParagraphStyle( 8 )
-                .getJustification() );
-
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java
deleted file mode 100644
index 4adf939..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * API for BorderCode, see Bugzill 49919
- */
-public final class TestBorderCode extends TestCase {
-
-    private int pos = 0;
-    private Range range;
-
-    public void test() {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug49919.doc");
-        range = doc.getRange();
-
-        Paragraph par = findParagraph("Paragraph normal\r");
-        assertEquals(0, par.getLeftBorder().getBorderType());
-        assertEquals(0, par.getRightBorder().getBorderType());
-        assertEquals(0, par.getTopBorder().getBorderType());
-        assertEquals(0, par.getBottomBorder().getBorderType());
-
-        par = findParagraph("Paragraph with border\r");
-        assertEquals(18, par.getLeftBorder().getBorderType());
-        assertEquals(17, par.getRightBorder().getBorderType());
-        assertEquals(18, par.getTopBorder().getBorderType());
-        assertEquals(17, par.getBottomBorder().getBorderType());
-        assertEquals(15, par.getLeftBorder().getColor());
-
-        par = findParagraph("Paragraph with red border\r");
-        assertEquals(1, par.getLeftBorder().getBorderType());
-        assertEquals(1, par.getRightBorder().getBorderType());
-        assertEquals(1, par.getTopBorder().getBorderType());
-        assertEquals(1, par.getBottomBorder().getBorderType());
-        assertEquals(6, par.getLeftBorder().getColor());
-
-        par = findParagraph("Paragraph with bordered words.\r");
-        assertEquals(0, par.getLeftBorder().getBorderType());
-        assertEquals(0, par.getRightBorder().getBorderType());
-        assertEquals(0, par.getTopBorder().getBorderType());
-        assertEquals(0, par.getBottomBorder().getBorderType());
-
-        assertEquals(3, par.numCharacterRuns());
-        CharacterRun chr = par.getCharacterRun(0);
-        assertEquals(0, chr.getBorder().getBorderType());
-        chr = par.getCharacterRun(1);
-        assertEquals(1, chr.getBorder().getBorderType());
-        assertEquals(0, chr.getBorder().getColor());
-        chr = par.getCharacterRun(2);
-        assertEquals(0, chr.getBorder().getBorderType());
-
-        while (pos < range.numParagraphs() - 1) {
-            par = range.getParagraph(pos++);
-            if (par.isInTable())
-                break;
-        }
-
-        assertEquals(true, par.isInTable());
-        Table tab = range.getTable(par);
-
-        // Border could be defined for the entire row, or for each cell, with the same visual appearance.
-        assertEquals(2, tab.numRows());
-        TableRow row = tab.getRow(0);
-        assertEquals(1, row.getLeftBorder().getBorderType());
-        assertEquals(1, row.getRightBorder().getBorderType());
-        assertEquals(1, row.getTopBorder().getBorderType());
-        assertEquals(1, row.getBottomBorder().getBorderType());
-
-        assertEquals(2, row.numCells());
-        TableCell cell = row.getCell(1);
-        assertEquals(3, cell.getBrcTop().getBorderType());
-
-        row = tab.getRow(1);
-        cell = row.getCell(0);
-        // 255 clears border inherited from row
-        assertEquals(255, cell.getBrcBottom().getBorderType());
-    }
-
-    private Paragraph findParagraph(String expectedText) {
-        while (pos < range.numParagraphs() - 1) {
-            Paragraph par = range.getParagraph(pos);
-            pos++;
-            if (par.text().equals(expectedText))
-                return par;
-        }
-
-        fail("Expected paragraph not found");
-
-        // should never come here
-        throw null;
-    }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
deleted file mode 100644
index be231da..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.usermodel.CharacterRun;
-import org.apache.poi.hwpf.usermodel.Paragraph;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-public final class TestBug46610 extends TestCase {
-
-	public void testUtf() {
-		runExtract("Bug46610_1.doc");
-	}
-
-	public void testUtf2() {
-		runExtract("Bug46610_2.doc");
-	}
-
-	public void testExtraction() {
-		String text = runExtract("Bug46610_3.doc");
-		assertTrue(text.contains("\u0421\u0412\u041e\u042e"));
-	}
-
-	private static String runExtract(String sampleName) {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile(sampleName);
-		StringBuffer out = new StringBuffer();
-
-		Range globalRange = doc.getRange();
-		for (int i = 0; i < globalRange.numParagraphs(); i++) {
-			Paragraph p = globalRange.getParagraph(i);
-			out.append(p.text());
-			out.append("\n");
-			for (int j = 0; j < p.numCharacterRuns(); j++) {
-				CharacterRun characterRun = p.getCharacterRun(j);
-				characterRun.text();
-			}
-		}
-		return out.toString();
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
deleted file mode 100644
index ec64fd5..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * Bug 47563 - Exception when working with table 
- */
-public class TestBug47563 extends TestCase {
-
-	public void test() throws Exception {
-		test(1, 5);
-		test(1, 6);
-		test(5, 1);
-		test(6, 1);
-		test(2, 2);
-		test(3, 2);
-		test(2, 3);
-		test(3, 3);
-	}
-
-	private void test(int rows, int columns) throws Exception {
-		// POI apparently can't create a document from scratch,
-		// so we need an existing empty dummy document
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile("empty.doc");
-
-		Range range = doc.getRange();
-		range.sanityCheck();
-
-		Table table = range.insertTableBefore((short) columns, rows);
-		table.sanityCheck();
-
-		for (int rowIdx = 0; rowIdx < table.numRows(); rowIdx++) {
-			TableRow row = table.getRow(rowIdx);
-			row.sanityCheck();
-
-			System.out.println("row " + rowIdx);
-			for (int colIdx = 0; colIdx < row.numCells(); colIdx++) {
-				TableCell cell = row.getCell(colIdx);
-				cell.sanityCheck();
-
-				System.out.println("column " + colIdx + ", num paragraphs "
-						+ cell.numParagraphs());
-
-				Paragraph par = cell.getParagraph(0);
-				par.sanityCheck();
-
-				par.insertBefore("" + (rowIdx * row.numCells() + colIdx));
-				par.sanityCheck();
-				
-				row.sanityCheck();
-				table.sanityCheck();
-				range.sanityCheck();
-
-			}
-		}
-
-		String text = range.text();
-		int mustBeAfter = 0;
-		for (int i = 0; i < rows * columns; i++) {
-			int next = text.indexOf(Integer.toString(i), mustBeAfter);
-			assertTrue("Test with " + rows + "/" + columns + ": Should not find " + i + " but found it at " + next + " in " + text, 
-					next != -1);
-			mustBeAfter = next;
-		}
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java
deleted file mode 100644
index 4e96646..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.io.IOException;
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.StyleSheet;
-
-public final class TestBug49820 extends TestCase {
-
-  public void test() throws IOException {
-    HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug49820.doc");
-    
-    Range documentRange = doc.getRange();
-    StyleSheet styleSheet = doc.getStyleSheet();
-    
-    // JUnit asserts
-    assertLevels(documentRange, styleSheet, 0, 0, 0);
-    assertLevels(documentRange, styleSheet, 1, 1, 1);
-    assertLevels(documentRange, styleSheet, 2, 2, 2);
-    assertLevels(documentRange, styleSheet, 3, 3, 3);
-    assertLevels(documentRange, styleSheet, 4, 4, 4);
-    assertLevels(documentRange, styleSheet, 5, 5, 5);
-    assertLevels(documentRange, styleSheet, 6, 6, 6);
-    assertLevels(documentRange, styleSheet, 7, 7, 7);
-    assertLevels(documentRange, styleSheet, 8, 8, 8);
-    assertLevels(documentRange, styleSheet, 9, 9, 9);
-    assertLevels(documentRange, styleSheet, 10, 9, 0);
-    assertLevels(documentRange, styleSheet, 11, 9, 4);
-    
-    // output to console
-    /*for (int i=0; i<documentRange.numParagraphs(); i++) {
-      Paragraph par = documentRange.getParagraph(i);
-      int styleLvl = styleSheet.getParagraphStyle(par.getStyleIndex()).getLvl();
-      int parLvl = par.getLvl();
-      System.out.println("Style level: " + styleLvl + ", paragraph level: " + parLvl + ", text: " + par.text());
-    }*/
-  }
-
-  private void assertLevels(Range documentRange, StyleSheet styleSheet, int parIndex, int expectedStyleLvl, int expectedParLvl) {
-    Paragraph par = documentRange.getParagraph(parIndex);
-    assertEquals(expectedStyleLvl, styleSheet.getParagraphStyle(par.getStyleIndex()).getLvl());
-    assertEquals(expectedParLvl, par.getLvl());
-  }
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java
deleted file mode 100644
index a830252..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.LFO;
-import org.apache.poi.hwpf.model.ListLevel;
-
-public class TestBug50075 extends TestCase
-{
-
-  public void test() {
-    HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug50075.doc");
-    Range range = doc.getRange();
-    assertEquals(1, range.numParagraphs());
-    ListEntry entry = (ListEntry) range.getParagraph(0);
-    LFO override = doc.getListTables().getLfo( entry.getIlfo());
-    ListLevel level = doc.getListTables().getLevel(override.getLsid(), entry.getIlvl());
-    
-    // the bug reproduces, if this call fails with NullPointerException
-    level.getNumberText();
-  }
-  
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
deleted file mode 100644
index efa219b..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
+++ /dev/null
@@ -1,905 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFOldDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.converter.AbstractWordUtils;
-import org.apache.poi.hwpf.converter.WordToTextConverter;
-import org.apache.poi.hwpf.extractor.Word6Extractor;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.hwpf.model.FieldsDocumentPart;
-import org.apache.poi.hwpf.model.FileInformationBlock;
-import org.apache.poi.hwpf.model.PlexOfField;
-import org.apache.poi.hwpf.model.SubdocumentType;
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Test different problems reported in the Apache Bugzilla
- *  against HWPF
- */
-public class TestBugs extends TestCase
-{
-    private static final POILogger logger = POILogFactory
-            .getLogger(TestBugs.class);
-
-    public static void assertEqualsIgnoreNewline(String expected, String actual )
-    {
-        String newExpected = expected.replaceAll("\r\n", "\n" )
-                .replaceAll("\r", "\n").trim();
-        String newActual = actual.replaceAll("\r\n", "\n" )
-                .replaceAll("\r", "\n").trim();
-        TestCase.assertEquals(newExpected, newActual);
-    }
-
-    private static void assertTableStructures(Range expected, Range actual )
-    {
-        assertEquals(expected.numParagraphs(), actual.numParagraphs());
-        for (int p = 0; p < expected.numParagraphs(); p++ )
-        {
-            Paragraph expParagraph = expected.getParagraph(p);
-            Paragraph actParagraph = actual.getParagraph(p);
-
-            assertEqualsIgnoreNewline(expParagraph.text(), actParagraph.text());
-            assertEquals("Diffent isInTable flags for paragraphs #" + p
-                    + " -- " + expParagraph + " -- " + actParagraph + ".",
-                    expParagraph.isInTable(), actParagraph.isInTable());
-            assertEquals(expParagraph.isTableRowEnd(),
-                    actParagraph.isTableRowEnd());
-
-            if (expParagraph.isInTable() && actParagraph.isInTable() )
-            {
-                Table expTable, actTable;
-                try
-                {
-                    expTable = expected.getTable(expParagraph);
-                    actTable = actual.getTable(actParagraph);
-                }
-                catch (Exception exc )
-                {
-                    continue;
-                }
-
-                assertEquals(expTable.numRows(), actTable.numRows());
-                assertEquals(expTable.numParagraphs(),
-                        actTable.numParagraphs());
-            }
-        }
-    }
-
-    private static void fixed(String bugzillaId )
-    {
-        throw new Error(
-                "Bug "
-                        + bugzillaId
-                        + " seems to be fixed. "
-                        + "Please resolve the issue in Bugzilla and remove fail() from the test");
-    }
-
-    private String getText(String samplefile) throws IOException {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile(samplefile);
-        WordExtractor extractor = new WordExtractor(doc);
-        try {
-            return extractor.getText();
-        } finally {
-            extractor.close();
-        }
-    }
-    
-    private String getTextOldFile(String samplefile) throws IOException {
-        HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile(samplefile);
-        Word6Extractor extractor = new Word6Extractor(doc);
-        try {
-            return extractor.getText();
-        } finally {
-            extractor.close();
-        }
-    }
-
-    /**
-     * Bug 33519 - HWPF fails to read a file
-     */
-    public void test33519() throws IOException
-    {
-        assertNotNull(getText("Bug33519.doc"));
-    }
-
-    /**
-     * Bug 34898 - WordExtractor doesn't read the whole string from the file
-     */
-    public void test34898() throws IOException
-    {
-        assertEqualsIgnoreNewline("\u30c7\u30a3\u30ec\u30af\u30c8\u30ea", getText("Bug34898.doc").trim());
-    }
-
-    /**
-     * [RESOLVED INVALID] 41898 - Word 2003 pictures cannot be extracted
-     */
-    public void test41898()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug41898.doc");
-        List<Picture> pics = doc.getPicturesTable().getAllPictures();
-
-        assertNotNull(pics);
-        assertEquals(1, pics.size());
-
-        Picture pic = pics.get(0);
-        assertNotNull(pic.suggestFileExtension());
-        assertNotNull(pic.suggestFullFileName());
-
-        assertNotNull(pic.getContent());
-        assertNotNull(pic.getRawContent());
-
-        /*
-         * This is a file with empty EMF image, but present Office Drawing
-         * --sergey
-         */
-        final Collection<OfficeDrawing> officeDrawings = doc
-                .getOfficeDrawingsMain().getOfficeDrawings();
-        assertNotNull(officeDrawings);
-        assertEquals(1, officeDrawings.size());
-
-        OfficeDrawing officeDrawing = officeDrawings.iterator().next();
-        assertNotNull(officeDrawing);
-        assertEquals(1044, officeDrawing.getShapeId());
-    }
-
-    /**
-     * Bug 44331 - HWPFDocument.write destroys fields
-     */
-    @SuppressWarnings("deprecation")
-    public void test44431() throws IOException
-    {
-        HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug44431.doc");
-
-        WordExtractor extractor1 = new WordExtractor(doc1);
-        try {
-            HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
-            
-            WordExtractor extractor2 = new WordExtractor(doc2);
-            try {
-                assertEqualsIgnoreNewline(extractor1.getFooterText(), extractor2.getFooterText());
-                assertEqualsIgnoreNewline(extractor1.getHeaderText(), extractor2.getHeaderText());
-                assertEqualsIgnoreNewline(Arrays.toString(extractor1.getParagraphText() ),
-                        Arrays.toString(extractor2.getParagraphText()));
-        
-                assertEqualsIgnoreNewline(extractor1.getText(), extractor2.getText());
-            } finally {
-                extractor2.close();
-            }
-        } finally {
-            extractor1.close();
-        }
-    }
-
-    /**
-     * Bug 44331 - HWPFDocument.write destroys fields
-     */
-    public void test44431_2() throws IOException
-    {
-        assertEqualsIgnoreNewline("File name=FieldsTest.doc\n" + 
-        		"\n" + 
-        		"\n" + 
-        		"STYLEREF test\n" + 
-        		"\n" + 
-        		"\n" + 
-        		"\n" + 
-        		"TEST TABLE OF CONTENTS\n" + 
-        		"\n" + 
-        		"Heading paragraph in next page\t2\n" + 
-        		"Another heading paragraph in further page\t3\n" + 
-        		"Another heading paragraph in further page\t3\n" + 
-        		"\n" + 
-        		"\n" + 
-        		"Heading paragraph in next page\n" + 
-        		"Another heading paragraph in further page\n" + 
-        		"\n" + 
-        		"\n" + 
-        		"\n" + 
-        		"Page 3 of 3", getText("Bug44431.doc"));
-    }
-
-    /**
-     * Bug 45473 - HWPF cannot read file after save
-     */
-    public void test45473() throws IOException
-    {
-        // Fetch the current text
-        HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug45473.doc");
-        WordExtractor wordExtractor = new WordExtractor(doc1);
-        final String text1;
-        try {
-            text1 = wordExtractor.getText().trim();
-        } finally {
-            wordExtractor.close();
-        }
-
-        // Re-load, then re-save and re-check
-        doc1 = HWPFTestDataSamples.openSampleFile("Bug45473.doc");
-        HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
-        WordExtractor wordExtractor2 = new WordExtractor(doc2);
-        final String text2;
-        try {
-            text2 = wordExtractor2.getText().trim();
-        } finally {
-            wordExtractor2.close();
-        }
-
-        // the text in the saved document has some differences in line
-        // separators but we tolerate that
-        assertEqualsIgnoreNewline(text1.replaceAll("\n", "" ), text2.replaceAll("\n", ""));
-    }
-
-    /**
-     * Bug 46220 - images are not properly extracted
-     */
-    public void test46220()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug46220.doc");
-        // reference checksums as in Bugzilla
-        String[] md5 = { "851be142bce6d01848e730cb6903f39e",
-                "7fc6d8fb58b09ababd036d10a0e8c039",
-                "a7dc644c40bc2fbf17b2b62d07f99248",
-                "72d07b8db5fad7099d90bc4c304b4666" };
-        List<Picture> pics = doc.getPicturesTable().getAllPictures();
-        assertEquals(4, pics.size());
-        for (int i = 0; i < pics.size(); i++ )
-        {
-            Picture pic = pics.get(i);
-            byte[] data = pic.getRawContent();
-            // use Apache Commons Codec utils to compute md5
-            assertEqualsIgnoreNewline(md5[i], DigestUtils.md5Hex(data));
-        }
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 46817 - Regression: Text from some table cells
-     * missing
-     */
-    public void test46817() throws IOException
-    {
-        String text = getText("Bug46817.doc").trim();
-
-        assertTrue(text.contains("Nazwa wykonawcy"));
-        assertTrue(text.contains("kujawsko-pomorskie"));
-        assertTrue(text.contains("ekomel@ekomel.com.pl"));
-    }
-
-    /**
-     * [FAILING] Bug 47286 - Word documents saves in wrong format if source
-     * contains form elements
-     * 
-     */
-    @SuppressWarnings("deprecation")
-    public void test47286() throws IOException
-    {
-        // Fetch the current text
-        HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug47286.doc");
-        WordExtractor wordExtractor = new WordExtractor(doc1);
-        final String text1;
-        try {
-            text1 = wordExtractor.getText().trim();
-        } finally {
-            wordExtractor.close();
-        }
-
-        // Re-load, then re-save and re-check
-        doc1 = HWPFTestDataSamples.openSampleFile("Bug47286.doc");
-        HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
-        WordExtractor wordExtractor2 = new WordExtractor(doc2);
-        final String text2;
-        try {
-            text2 = wordExtractor2.getText().trim();
-        } finally {
-            wordExtractor2.close();
-        }
-
-        // the text in the saved document has some differences in line
-        // separators but we tolerate that
-        assertEqualsIgnoreNewline(text1.replaceAll("\n", "" ), text2.replaceAll("\n", ""));
-
-        assertEquals(doc1.getCharacterTable().getTextRuns().size(), doc2
-                .getCharacterTable().getTextRuns().size());
-
-        List<PlexOfField> expectedFields = doc1.getFieldsTables()
-                .getFieldsPLCF(FieldsDocumentPart.MAIN);
-        List<PlexOfField> actualFields = doc2.getFieldsTables().getFieldsPLCF(
-                FieldsDocumentPart.MAIN);
-        assertEquals(expectedFields.size(), actualFields.size());
-
-        assertTableStructures(doc1.getRange(), doc2.getRange());
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 47287 - StringIndexOutOfBoundsException in
-     * CharacterRun.replaceText()
-     */
-    public void test47287()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug47287.doc");
-        String[] values = { "1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7",
-                "1-8", "1-9", "1-10", "1-11", "1-12", "1-13", "1-14", "1-15", };
-        int usedVal = 0;
-        String PLACEHOLDER = "\u2002\u2002\u2002\u2002\u2002";
-        Range r = doc.getRange();
-        for (int x = 0; x < r.numSections(); x++ )
-        {
-            Section s = r.getSection(x);
-            for (int y = 0; y < s.numParagraphs(); y++ )
-            {
-                Paragraph p = s.getParagraph(y);
-
-                for (int z = 0; z < p.numCharacterRuns(); z++ )
-                {
-                    boolean isFound = false;
-
-                    // character run
-                    CharacterRun run = p.getCharacterRun(z);
-                    // character run text
-                    String text = run.text();
-                    String oldText = text;
-                    int c = text.indexOf("FORMTEXT ");
-                    if (c < 0 )
-                    {
-                        int k = text.indexOf(PLACEHOLDER);
-                        if (k >= 0 )
-                        {
-                            text = text.substring(0, k ) + values[usedVal]
-                                    + text.substring(k + PLACEHOLDER.length());
-                            usedVal++;
-                            isFound = true;
-                        }
-                    }
-                    else
-                    {
-                        for (; c >= 0; c = text.indexOf("FORMTEXT ", c
-                                + "FORMTEXT ".length() ) )
-                        {
-                            int k = text.indexOf(PLACEHOLDER, c);
-                            if (k >= 0 )
-                            {
-                                text = text.substring(0, k )
-                                        + values[usedVal]
-                                        + text.substring(k
-                                                + PLACEHOLDER.length());
-                                usedVal++;
-                                isFound = true;
-                            }
-                        }
-                    }
-                    if (isFound )
-                    {
-                        run.replaceText(oldText, text, 0);
-                    }
-
-                }
-            }
-        }
-
-        String docText = r.text();
-
-        assertTrue(docText.contains("1-1"));
-        assertTrue(docText.contains("1-12"));
-
-        assertFalse(docText.contains("1-13"));
-        assertFalse(docText.contains("1-15"));
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 47731 - Word Extractor considers text copied from
-     * some website as an embedded object
-     */
-    public void test47731() throws Exception
-    {
-        String foundText = getText("Bug47731.doc");
-
-        assertTrue(foundText
-                .contains("Soak the rice in water for three to four hours"));
-    }
-
-    /**
-     * Bug 4774 - text extracted by WordExtractor is broken
-     */
-    public void test47742() throws Exception
-    {
-        // (1) extract text from MS Word document via POI
-        String foundText = getText("Bug47742.doc");
-
-        // (2) read text from text document (retrieved by saving the word
-        // document as text file using encoding UTF-8)
-        InputStream is = POIDataSamples.getDocumentInstance()
-                .openResourceAsStream("Bug47742-text.txt");
-        try {
-            byte[] expectedBytes = IOUtils.toByteArray(is);
-            String expectedText = new String(expectedBytes, "utf-8" )
-                    .substring(1); // strip-off the unicode marker
-    
-            assertEqualsIgnoreNewline(expectedText, foundText);
-        } finally {
-            is.close();
-        }
-    }
-
-    /**
-     * Bug 47958 - Exception during Escher walk of pictures
-     */
-    public void test47958()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug47958.doc");
-        doc.getPicturesTable().getAllPictures();
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 48065 - Problems with save output of HWPF (losing
-     * formatting)
-     */
-    public void test48065()
-    {
-        HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug48065.doc");
-        HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
-
-        Range expected = doc1.getRange();
-        Range actual = doc2.getRange();
-
-        assertEqualsIgnoreNewline(
-                expected.text().replace("\r", "\n").replaceAll("\n\n", "\n" ),
-                actual.text().replace("\r", "\n").replaceAll("\n\n", "\n"));
-
-        assertTableStructures(expected, actual);
-    }
-
-    public void test49933() throws IOException
-    {
-        String text = getTextOldFile("Bug49933.doc");
-
-        assertTrue( text.contains( "best.wine.jump.ru" ) );
-    }
-
-    /**
-     * Bug 50936 - Exception parsing MS Word 8.0 file
-     */
-    public void test50936_1()
-    {
-        HWPFDocument hwpfDocument = HWPFTestDataSamples
-                .openSampleFile("Bug50936_1.doc");
-        hwpfDocument.getPicturesTable().getAllPictures();
-    }
-
-    /**
-     * Bug 50936 - Exception parsing MS Word 8.0 file
-     */
-    public void test50936_2()
-    {
-        HWPFDocument hwpfDocument = HWPFTestDataSamples
-                .openSampleFile("Bug50936_2.doc");
-        hwpfDocument.getPicturesTable().getAllPictures();
-    }
-
-    /**
-     * Bug 50936 - Exception parsing MS Word 8.0 file
-     */
-    public void test50936_3()
-    {
-        HWPFDocument hwpfDocument = HWPFTestDataSamples
-                .openSampleFile("Bug50936_3.doc");
-        hwpfDocument.getPicturesTable().getAllPictures();
-    }
-
-    /**
-     * [FAILING] Bug 50955 - error while retrieving the text file
-     */
-    public void test50955() throws IOException
-    {
-        try {
-            getTextOldFile("Bug50955.doc");
-
-            fixed("50955");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 51604 - replace text fails for doc (poi 3.8 beta
-     * release from download site )
-     */
-    public void test51604()
-    {
-        HWPFDocument document = HWPFTestDataSamples
-                .openSampleFile("Bug51604.doc");
-
-        Range range = document.getRange();
-        int numParagraph = range.numParagraphs();
-        int counter = 0;
-        for (int i = 0; i < numParagraph; i++ )
-        {
-            Paragraph paragraph = range.getParagraph(i);
-            int numCharRuns = paragraph.numCharacterRuns();
-            for (int j = 0; j < numCharRuns; j++ )
-            {
-                CharacterRun charRun = paragraph.getCharacterRun(j);
-                String text = charRun.text();
-                charRun.replaceText(text, "+" + (++counter));
-            }
-        }
-
-        document = HWPFTestDataSamples.writeOutAndReadBack(document);
-        String text = document.getDocumentText();
-        assertEqualsIgnoreNewline("+1+2+3+4+5+6+7+8+9+10+11+12", text);
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 51604 - replace text fails for doc (poi 3.8 beta
-     * release from download site )
-     */
-    public void test51604p2() throws Exception
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug51604.doc");
-
-        Range range = doc.getRange();
-        int numParagraph = range.numParagraphs();
-        replaceText(range, numParagraph);
-
-        doc = HWPFTestDataSamples.writeOutAndReadBack(doc);
-        final FileInformationBlock fileInformationBlock = doc
-                .getFileInformationBlock();
-
-        int totalLength = 0;
-        for (SubdocumentType type : SubdocumentType.values() )
-        {
-            final int partLength = fileInformationBlock
-                    .getSubdocumentTextStreamLength(type);
-            assert (partLength >= 0);
-
-            totalLength += partLength;
-        }
-        assertEquals(doc.getText().length(), totalLength);
-    }
-
-    private void replaceText(Range range, int numParagraph) {
-        for (int i = 0; i < numParagraph; i++ )
-        {
-            Paragraph paragraph = range.getParagraph(i);
-            int numCharRuns = paragraph.numCharacterRuns();
-            for (int j = 0; j < numCharRuns; j++ )
-            {
-                CharacterRun charRun = paragraph.getCharacterRun(j);
-                String text = charRun.text();
-                if (text.contains("Header" ) )
-                    charRun.replaceText(text, "added");
-            }
-        }
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 51604 - replace text fails for doc (poi 3.8 beta
-     * release from download site )
-     */
-    public void test51604p3() throws Exception
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug51604.doc");
-
-        byte[] originalData = new byte[doc.getFileInformationBlock()
-                .getLcbDop()];
-        System.arraycopy(doc.getTableStream(), doc.getFileInformationBlock()
-                .getFcDop(), originalData, 0, originalData.length);
-
-        HWPFOutputStream outputStream = new HWPFOutputStream();
-        doc.getDocProperties().writeTo(outputStream);
-        final byte[] oldData = outputStream.toByteArray();
-
-        assertEqualsIgnoreNewline(Arrays.toString(originalData ),
-                Arrays.toString(oldData));
-
-        Range range = doc.getRange();
-        int numParagraph = range.numParagraphs();
-        replaceText(range, numParagraph);
-
-        doc = HWPFTestDataSamples.writeOutAndReadBack(doc);
-
-        outputStream = new HWPFOutputStream();
-        doc.getDocProperties().writeTo(outputStream);
-        final byte[] newData = outputStream.toByteArray();
-
-        assertEqualsIgnoreNewline(Arrays.toString(oldData ), Arrays.toString(newData));
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 51671 - HWPFDocument.write based on NPOIFSFileSystem
-     * throws a NullPointerException
-     */
-    public void test51671() throws Exception
-    {
-        InputStream is = POIDataSamples.getDocumentInstance()
-                .openResourceAsStream("empty.doc");
-        NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem(is);
-        try {
-            HWPFDocument hwpfDocument = new HWPFDocument(
-                    npoifsFileSystem.getRoot());
-            hwpfDocument.write(new ByteArrayOutputStream());
-        } finally {
-            npoifsFileSystem.close();
-        }
-    }
-
-    /**
-     * Bug 51678 - Extracting text from Bug51524.zip is slow Bug 51524 -
-     * PapBinTable constructor is slow
-     */
-    public void test51678And51524() throws IOException
-    {
-        // YK: the test will run only if the poi.test.remote system property is
-        // set.
-        // TODO: refactor into something nicer!
-        if (System.getProperty("poi.test.remote" ) != null )
-        {
-            String href = "http://domex.nps.edu/corp/files/govdocs1/007/007488.doc";
-            HWPFDocument hwpfDocument = HWPFTestDataSamples
-                    .openRemoteFile(href);
-
-            WordExtractor wordExtractor = new WordExtractor(hwpfDocument);
-            try {
-                wordExtractor.getText();
-            } finally {
-                wordExtractor.close();
-            }
-        }
-    }
-
-    /**
-     * [FIXED] Bug 51902 - Picture.fillRawImageContent -
-     * ArrayIndexOutOfBoundsException
-     */
-    public void testBug51890()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug51890.doc");
-        for (Picture picture : doc.getPicturesTable().getAllPictures() )
-        {
-            PictureType pictureType = picture.suggestPictureType();
-            logger.log(POILogger.DEBUG,
-                    "Picture at offset " + picture.getStartOffset()
-                            + " has type " + pictureType);
-        }
-    }
-
-    /**
-     * [RESOLVED FIXED] Bug 51834 - Opening and Writing .doc file results in
-     * corrupt document
-     */
-    public void testBug51834() throws Exception
-    {
-        /*
-         * we don't have Java test for this file - it should be checked using
-         * Microsoft BFF Validator. But check read-write-read anyway. -- sergey
-         */
-        HWPFTestDataSamples.openSampleFile("Bug51834.doc");
-        HWPFTestDataSamples.writeOutAndReadBack(HWPFTestDataSamples
-                .openSampleFile("Bug51834.doc"));
-    }
-
-    /**
-     * Bug 51944 - PAPFormattedDiskPage.getPAPX - IndexOutOfBounds
-     */
-    public void testBug51944() throws Exception
-    {
-        HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug51944.doc");
-        assertNotNull(WordToTextConverter.getText(doc));
-    }
-
-    /**
-     * Bug 52032 - [BUG] & [partial-PATCH] HWPF - ArrayIndexOutofBoundsException
-     * with no stack trace (broken after revision 1178063)
-     */
-    public void testBug52032_1() throws Exception
-    {
-        assertNotNull(getText("Bug52032_1.doc"));
-    }
-
-    /**
-     * Bug 52032 - [BUG] & [partial-PATCH] HWPF - ArrayIndexOutofBoundsException
-     * with no stack trace (broken after revision 1178063)
-     */
-    public void testBug52032_2() throws Exception
-    {
-        assertNotNull(getText("Bug52032_2.doc"));
-    }
-
-    /**
-     * Bug 52032 - [BUG] & [partial-PATCH] HWPF - ArrayIndexOutofBoundsException
-     * with no stack trace (broken after revision 1178063)
-     */
-    public void testBug52032_3() throws Exception
-    {
-        assertNotNull(getText("Bug52032_3.doc"));
-    }
-
-    /**
-     * Bug 53380 - ArrayIndexOutOfBounds Exception parsing word 97 document
-     */
-    public void testBug53380_1() throws Exception
-    {
-        assertNotNull(getText("Bug53380_1.doc"));
-    }
-
-    /**
-     * Bug 53380 - ArrayIndexOutOfBounds Exception parsing word 97 document
-     */
-    public void testBug53380_2() throws Exception
-    {
-        assertNotNull(getText("Bug53380_2.doc"));
-    }
-
-    /**
-     * Bug 53380 - ArrayIndexOutOfBounds Exception parsing word 97 document
-     */
-    public void testBug53380_3() throws Exception
-    {
-        assertNotNull(getText("Bug53380_3.doc"));
-    }
-
-    /**
-     * Bug 53380 - ArrayIndexOutOfBounds Exception parsing word 97 document
-     */
-    public void testBug53380_4() throws Exception
-    {
-        assertNotNull(getText("Bug53380_4.doc"));
-    }
-    
-    /**
-     * java.lang.UnsupportedOperationException: Non-extended character 
-     *  Pascal strings are not supported right now
-     * 
-     * Disabled pending a fix for the bug
-     */
-    public void test56880() throws Exception {
-        HWPFDocument doc =
-                HWPFTestDataSamples.openSampleFile("56880.doc");
-        assertEqualsIgnoreNewline("Check Request", doc.getRange().text());
-    }
-
-    
-    // These are the values the are expected to be read when the file
-    // is checked.
-    private final int section1LeftMargin = 1440;
-    private final int section1RightMargin = 1440;
-    private final int section1TopMargin = 1440;
-    private final int section1BottomMargin = 1440;
-    private final int section1NumColumns = 1;
-    private int section2LeftMargin = 1440;
-    private int section2RightMargin = 1440;
-    private int section2TopMargin = 1440;
-    private int section2BottomMargin = 1440;
-    private final int section2NumColumns = 3;
-    
-    @SuppressWarnings("SuspiciousNameCombination")
-    public void testHWPFSections() {
-        HWPFDocument document = HWPFTestDataSamples.openSampleFile("Bug53453Section.doc");
-        Range overallRange = document.getOverallRange();
-        int numParas = overallRange.numParagraphs();
-        for(int i = 0; i < numParas; i++) {
-            Paragraph para = overallRange.getParagraph(i);
-            int numSections = para.numSections();
-            for(int j = 0; j < numSections; j++) {
-                Section section = para.getSection(j);
-                if(para.text().trim().equals("Section1")) {
-                    assertSection1Margin(section);
-                }
-                else if(para.text().trim().equals("Section2")) {
-                    assertSection2Margin(section);
-                    
-                    // Change the margin widths
-                    this.section2BottomMargin = (int)(1.5 * AbstractWordUtils.TWIPS_PER_INCH);
-                    this.section2TopMargin = (int)(1.75 * AbstractWordUtils.TWIPS_PER_INCH);
-                    this.section2LeftMargin = (int)(0.5 * AbstractWordUtils.TWIPS_PER_INCH);
-                    this.section2RightMargin = (int)(0.75 * AbstractWordUtils.TWIPS_PER_INCH);
-                    section.setMarginBottom(this.section2BottomMargin);
-                    section.setMarginLeft(this.section2LeftMargin);
-                    section.setMarginRight(this.section2RightMargin);
-                    section.setMarginTop(this.section2TopMargin);
-                }
-            }
-        }
-        
-        // Save away and re-read the document to prove the chages are permanent
-        document = HWPFTestDataSamples.writeOutAndReadBack(document);
-        overallRange = document.getOverallRange();
-        numParas = overallRange.numParagraphs();
-        for(int i = 0; i < numParas; i++) {
-            Paragraph para = overallRange.getParagraph(i);
-            int numSections = para.numSections();
-            for(int j = 0; j < numSections; j++) {
-                Section section = para.getSection(j);
-                if(para.text().trim().equals("Section1")) {
-                    // No changes to the margins in Section1
-                    assertSection1Margin(section);
-                }
-                else if(para.text().trim().equals("Section2")) {
-                    // The margins in Section2 have kept the new settings.
-                    assertSection2Margin(section);
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("Duplicates")
-    private void assertSection1Margin(Section section) {
-        assertEquals(section1BottomMargin, section.getMarginBottom());
-        assertEquals(section1LeftMargin, section.getMarginLeft());
-        assertEquals(section1RightMargin, section.getMarginRight());
-        assertEquals(section1TopMargin, section.getMarginTop());
-        assertEquals(section1NumColumns, section.getNumColumns());
-    }
-
-    @SuppressWarnings("Duplicates")
-    private void assertSection2Margin(Section section) {
-        assertEquals(section2BottomMargin, section.getMarginBottom());
-        assertEquals(section2LeftMargin, section.getMarginLeft());
-        assertEquals(section2RightMargin, section.getMarginRight());
-        assertEquals(section2TopMargin, section.getMarginTop());
-        assertEquals(section2NumColumns, section.getNumColumns());
-    }
-
-    public void testRegressionIn315beta2() {
-        HWPFDocument hwpfDocument = HWPFTestDataSamples.openSampleFile("cap.stanford.edu_profiles_viewbiosketch_facultyid=4009&name=m_maciver.doc");
-        assertNotNull(hwpfDocument);
-    }
-
-    public void test57603SevenRowTable() throws Exception {
-        try {
-            HWPFDocument hwpfDocument = HWPFTestDataSamples.openSampleFile("57603-seven_columns.doc");
-            HWPFDocument hwpfDocument2 = HWPFTestDataSamples.writeOutAndReadBack(hwpfDocument);
-            assertNotNull(hwpfDocument2);
-            hwpfDocument2.close();
-            hwpfDocument.close();
-            fixed("57603");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected until this bug is fixed
-        }
-    }
-    
-    public void test57843() throws IOException {
-        File f = POIDataSamples.getDocumentInstance().getFile("57843.doc");
-        POIFSFileSystem fs = new POIFSFileSystem(f, true);
-        try {
-            HWPFOldDocument doc = new HWPFOldDocument(fs);
-            assertNotNull(doc);
-            doc.close();
-            fixed("57843");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected until this bug is fixed
-        } finally {
-            fs.close();
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
deleted file mode 100644
index 8eca387..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.OldFileFormatException;
-import org.apache.poi.hwpf.HWPFOldDocument;
-import org.apache.poi.hwpf.HWPFTestCase;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * Tests for Word 6 and Word 95 support
- */
-public final class TestHWPFOldDocument extends HWPFTestCase {
-   /**
-    * Test a simple Word 6 document
-    */
-   public void testWord6() throws Exception {
-      // Can't open as HWPFDocument
-      try {
-         HWPFTestDataSamples.openSampleFile("Word6.doc");
-         fail("Shouldn't be openable");
-      } catch(OldFileFormatException e) {}
-      
-      // Open
-      HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6.doc");
-      
-      // Check
-      assertEquals(1, doc.getRange().numSections());
-      assertEquals(1, doc.getRange().numParagraphs());
-      assertEquals(1, doc.getRange().numCharacterRuns());
-      
-      assertEquals(
-            "The quick brown fox jumps over the lazy dog\r",
-            doc.getRange().getParagraph(0).text()
-      );
-   }
-   
-   /**
-    * Test a simple Word 95 document
-    */
-   public void testWord95() throws Exception {
-      // Can't open as HWPFDocument
-      try {
-         HWPFTestDataSamples.openSampleFile("Word95.doc");
-         fail("Shouldn't be openable");
-      } catch(OldFileFormatException e) {}
-      
-      // Open
-      HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word95.doc");
-      
-      // Check
-      assertEquals(1, doc.getRange().numSections());
-      assertEquals(7, doc.getRange().numParagraphs());
-      
-      assertEquals(
-            "The quick brown fox jumps over the lazy dog\r",
-            doc.getRange().getParagraph(0).text()
-      );
-      assertEquals("\r", doc.getRange().getParagraph(1).text());
-      assertEquals(
-            "Paragraph 2\r",
-            doc.getRange().getParagraph(2).text()
-      );
-      assertEquals("\r", doc.getRange().getParagraph(3).text());
-      assertEquals(
-            "Paragraph 3. Has some RED text and some " +
-            "BLUE BOLD text in it.\r",
-            doc.getRange().getParagraph(4).text()
-      );
-      assertEquals("\r", doc.getRange().getParagraph(5).text());
-      assertEquals(
-            "Last (4th) paragraph.\r",
-            doc.getRange().getParagraph(6).text()
-      );
-      
-      assertEquals(1, doc.getRange().getParagraph(0).numCharacterRuns());
-      assertEquals(1, doc.getRange().getParagraph(1).numCharacterRuns());
-      assertEquals(1, doc.getRange().getParagraph(2).numCharacterRuns());
-      assertEquals(1, doc.getRange().getParagraph(3).numCharacterRuns());
-      // Normal, red, normal, blue+bold, normal
-      assertEquals(5, doc.getRange().getParagraph(4).numCharacterRuns());
-      assertEquals(1, doc.getRange().getParagraph(5).numCharacterRuns());
-      // Normal, superscript for 4th, normal
-      assertEquals(3, doc.getRange().getParagraph(6).numCharacterRuns());
-   }
-   
-   /**
-    * Test a word document that has sections,
-    *  as well as the usual paragraph stuff.
-    */
-   public void testWord6Sections() throws Exception {
-      HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6_sections.doc");
-      
-      assertEquals(3, doc.getRange().numSections());
-      assertEquals(6, doc.getRange().numParagraphs());
-      
-      assertEquals(
-            "This is a test.\r",
-            doc.getRange().getParagraph(0).text()
-      );
-      assertEquals("\r", doc.getRange().getParagraph(1).text());
-      assertEquals("\u000c", doc.getRange().getParagraph(2).text()); // Section line?
-      assertEquals("This is a new section.\r", doc.getRange().getParagraph(3).text());
-      assertEquals("\u000c", doc.getRange().getParagraph(4).text()); // Section line?
-      assertEquals("\r", doc.getRange().getParagraph(5).text());
-   }
-   
-   /**
-    * Another word document with sections, this time with a 
-    *  few more section properties set on it
-    */
-   public void testWord6Sections2() throws Exception {
-      HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6_sections2.doc");
-      
-      assertEquals(1, doc.getRange().numSections());
-      assertEquals(57, doc.getRange().numParagraphs());
-      
-      assertEquals(
-            "\r",
-            doc.getRange().getParagraph(0).text()
-      );
-      assertEquals(
-            "STATEMENT  OF  INSOLVENCY  PRACTICE  10  (SCOTLAND)\r",
-            doc.getRange().getParagraph(1).text()
-      );
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
deleted file mode 100644
index f829c10..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.io.*;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestCase;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.TempFile;
-
-/**
- * Test various write situations
- */
-public final class TestHWPFWrite extends HWPFTestCase {
-   /**
-    * Write to a stream
-    */
-   public void testWriteStream() throws Exception {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
-
-      Range r = doc.getRange();
-      assertEquals("I am a test document\r", r.getParagraph(0).text());
-      
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      doc.write(baos);
-      doc.close();
-      ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-      
-      doc = new HWPFDocument(bais);
-      r = doc.getRange();
-      assertEquals("I am a test document\r", r.getParagraph(0).text());
-      doc.close();
-   }
-   
-   /**
-    * Write to a new file
-    */
-   public void testWriteNewFile() throws Exception {
-       HWPFDocument doc = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
-
-       Range r = doc.getRange();
-       assertEquals("I am a test document\r", r.getParagraph(0).text());
-       
-       File file = TempFile.createTempFile("TestDocument", ".doc");
-       doc.write(file);
-       doc.close();
-
-       // Check reading from File and Stream
-       doc = new HWPFDocument(new FileInputStream(file));
-       r = doc.getRange();
-       assertEquals("I am a test document\r", r.getParagraph(0).text());
-       doc.close();
-       
-       doc = new HWPFDocument(new POIFSFileSystem(file));
-       r = doc.getRange();
-       assertEquals("I am a test document\r", r.getParagraph(0).text());
-       doc.close();
-   }
-   
-   /**
-    * Writing to the file we opened from - note, uses a temp file to
-    *  avoid changing our test files!
-    */
-   @SuppressWarnings("resource")
-   public void testInPlaceWrite() throws Exception {
-       // Setup as a copy of a known-good file
-       final File file = TempFile.createTempFile("TestDocument", ".doc");
-       InputStream inputStream = POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.doc");
-       try {
-           FileOutputStream outputStream = new FileOutputStream(file);
-           try {
-               IOUtils.copy(inputStream, outputStream);
-           } finally {
-               outputStream.close();
-           }
-       } finally {
-           inputStream.close();
-       }
-
-       // Open from the temp file in read-write mode
-       HWPFDocument doc = new HWPFDocument(new NPOIFSFileSystem(file, false).getRoot());
-       Range r = doc.getRange();
-       assertEquals("I am a test document\r", r.getParagraph(0).text());
-
-       // Change
-       r.replaceText("X XX a test document\r", false);
-
-       // Save in-place, close, re-open and check
-       doc.write();
-       doc.close();
-
-       doc = new HWPFDocument(new NPOIFSFileSystem(file).getRoot());
-       r = doc.getRange();
-       assertEquals("X XX a test document\r", r.getParagraph(0).text());
-       doc.close();
-   }
-
-   @SuppressWarnings("resource")
-   public void testInvalidInPlaceWrite() throws Exception {
-       HWPFDocument doc;
-
-       // Can't work for InputStream opened files
-       doc = new HWPFDocument(
-               POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.doc"));
-       try {
-           doc.write();
-           fail("Shouldn't work for InputStream");
-       } catch (IllegalStateException e) {
-           // expected here
-       }
-       doc.close();
-
-       // Can't work for OPOIFS
-       OPOIFSFileSystem ofs = new OPOIFSFileSystem(
-               POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.doc"));
-       doc = new HWPFDocument(ofs.getRoot());
-       try {
-           doc.write();
-           fail("Shouldn't work for OPOIFSFileSystem");
-       } catch (IllegalStateException e) {
-           // expected here
-       }
-       doc.close();
-
-       // Can't work for Read-Only files
-       NPOIFSFileSystem fs = new NPOIFSFileSystem(
-               POIDataSamples.getDocumentInstance().getFile("SampleDoc.doc"), true);
-       doc = new HWPFDocument(fs.getRoot());
-       try {
-           doc.write();
-           fail("Shouldn't work for Read Only");
-       } catch (IllegalStateException e) {
-           // expected here
-       }
-       doc.close();
-   }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
deleted file mode 100644
index 0aa4b31..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * Tests for the handling of header stories into headers, footers etc
- */
-public final class TestHeaderStories extends TestCase {
-	private HWPFDocument none;
-	private HWPFDocument header;
-	private HWPFDocument footer;
-	private HWPFDocument headerFooter;
-	private HWPFDocument oddEven;
-	private HWPFDocument diffFirst;
-	private HWPFDocument unicode;
-	private HWPFDocument withFields;
-
-	@Override
-    protected void setUp() {
-
-		none = HWPFTestDataSamples.openSampleFile("NoHeadFoot.doc");
-		header = HWPFTestDataSamples.openSampleFile("ThreeColHead.doc");
-		footer = HWPFTestDataSamples.openSampleFile("ThreeColFoot.doc");
-		headerFooter = HWPFTestDataSamples.openSampleFile("SimpleHeadThreeColFoot.doc");
-		oddEven = HWPFTestDataSamples.openSampleFile("PageSpecificHeadFoot.doc");
-		diffFirst = HWPFTestDataSamples.openSampleFile("DiffFirstPageHeadFoot.doc");
-		unicode = HWPFTestDataSamples.openSampleFile("HeaderFooterUnicode.doc");
-		withFields = HWPFTestDataSamples.openSampleFile("HeaderWithMacros.doc");
-	}
-
-	public void testNone() {
-		HeaderStories hs = new HeaderStories(none);
-
-		assertNull(hs.getPlcfHdd());
-		assertEquals(0, hs.getRange().text().length());
-	}
-
-	public void testHeader() {
-		HeaderStories hs = new HeaderStories(header);
-
-		assertEquals(60, hs.getRange().text().length());
-
-		// Should have the usual 6 separaters
-		// Then all 6 of the different header/footer kinds
-		// Finally a terminater
-		assertEquals(13, hs.getPlcfHdd().length());
-
-		assertEquals(215, hs.getRange().getStartOffset());
-
-		assertEquals(0, hs.getPlcfHdd().getProperty(0).getStart());
-		assertEquals(3, hs.getPlcfHdd().getProperty(1).getStart());
-		assertEquals(6, hs.getPlcfHdd().getProperty(2).getStart());
-		assertEquals(6, hs.getPlcfHdd().getProperty(3).getStart());
-		assertEquals(9, hs.getPlcfHdd().getProperty(4).getStart());
-		assertEquals(12, hs.getPlcfHdd().getProperty(5).getStart());
-
-		assertEquals(12, hs.getPlcfHdd().getProperty(6).getStart());
-		assertEquals(12, hs.getPlcfHdd().getProperty(7).getStart());
-		assertEquals(59, hs.getPlcfHdd().getProperty(8).getStart());
-		assertEquals(59, hs.getPlcfHdd().getProperty(9).getStart());
-		assertEquals(59, hs.getPlcfHdd().getProperty(10).getStart());
-		assertEquals(59, hs.getPlcfHdd().getProperty(11).getStart());
-
-		assertEquals(59, hs.getPlcfHdd().getProperty(12).getStart());
-
-		assertEquals("\u0003\r\r", hs.getFootnoteSeparator());
-		assertEquals("\u0004\r\r", hs.getFootnoteContSeparator());
-		assertEquals("", hs.getFootnoteContNote());
-		assertEquals("\u0003\r\r", hs.getEndnoteSeparator());
-		assertEquals("\u0004\r\r", hs.getEndnoteContSeparator());
-		assertEquals("", hs.getEndnoteContNote());
-
-		assertEquals("", hs.getFirstHeader());
-		assertEquals("", hs.getEvenHeader());
-		assertEquals("First header column!\tMid header Right header!\r\r", hs.getOddHeader());
-
-		assertEquals("", hs.getFirstFooter());
-		assertEquals("", hs.getEvenFooter());
-		assertEquals("", hs.getOddFooter());
-	}
-
-	public void testFooter() {
-		HeaderStories hs = new HeaderStories(footer);
-
-		assertEquals("", hs.getFirstHeader());
-		assertEquals("", hs.getEvenHeader());
-		assertEquals("", hs.getOddHeader()); // Was \r\r but gets emptied
-
-		assertEquals("", hs.getFirstFooter());
-		assertEquals("", hs.getEvenFooter());
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
-	}
-
-	public void testHeaderFooter() {
-		HeaderStories hs = new HeaderStories(headerFooter);
-
-		assertEquals("", hs.getFirstHeader());
-		assertEquals("", hs.getEvenHeader());
-		assertEquals("I am some simple header text here\r\r\r", hs.getOddHeader());
-
-		assertEquals("", hs.getFirstFooter());
-		assertEquals("", hs.getEvenFooter());
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
-	}
-
-	public void testOddEven() {
-		HeaderStories hs = new HeaderStories(oddEven);
-
-		assertEquals("", hs.getFirstHeader());
-		assertEquals("[This is an Even Page, with a Header]\u0007August 20, 2008\u0007\u0007\r\r",
-				hs.getEvenHeader());
-		assertEquals("August 20, 2008\u0007[ODD Page Header text]\u0007\u0007\r\r", hs
-				.getOddHeader());
-
-		assertEquals("", hs.getFirstFooter());
-		assertEquals(
-				"\u0007Page \u0013 PAGE  \\* MERGEFORMAT \u00142\u0015\u0007\u0007\u0007\u0007\u0007\u0007\u0007This is a simple footer on the second page\r\r",
-				hs.getEvenFooter());
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
-
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(1));
-		assertEquals(
-				"\u0007Page \u0013 PAGE  \\* MERGEFORMAT \u00142\u0015\u0007\u0007\u0007\u0007\u0007\u0007\u0007This is a simple footer on the second page\r\r",
-				hs.getFooter(2));
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(3));
-	}
-
-	public void testFirst() {
-		HeaderStories hs = new HeaderStories(diffFirst);
-
-		assertEquals("I am the header on the first page, and I\u2019m nice and simple\r\r", hs
-				.getFirstHeader());
-		assertEquals("", hs.getEvenHeader());
-		assertEquals("First header column!\tMid header Right header!\r\r", hs.getOddHeader());
-
-		assertEquals("The footer of the first page\r\r", hs.getFirstFooter());
-		assertEquals("", hs.getEvenFooter());
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
-
-		assertEquals("The footer of the first page\r\r", hs.getFooter(1));
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(2));
-		assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(3));
-	}
-
-	public void testUnicode() {
-		HeaderStories hs = new HeaderStories(unicode);
-
-		assertEquals("", hs.getFirstHeader());
-		assertEquals("", hs.getEvenHeader());
-		assertEquals("This is a simple header, with a \u20ac euro symbol in it.\r\r\r", hs
-				.getOddHeader());
-
-		assertEquals("", hs.getFirstFooter());
-		assertEquals("", hs.getEvenFooter());
-		assertEquals("The footer, with Moli\u00e8re, has Unicode in it.\r\r", hs.getOddFooter());
-	}
-
-	public void testWithFields() {
-		HeaderStories hs = new HeaderStories(withFields);
-		assertFalse(hs.areFieldsStripped());
-
-		assertEquals(
-				"HEADER GOES HERE. 8/12/2008 \u0013 AUTHOR   \\* MERGEFORMAT \u0014Eric Roch\u0015\r\r\r",
-				hs.getOddHeader());
-
-		// Now turn on stripping
-		hs.setAreFieldsStripped(true);
-		assertEquals("HEADER GOES HERE. 8/12/2008 Eric Roch\r\r\r", hs.getOddHeader());
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java
deleted file mode 100644
index d2c9ac9..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.ListLevel;
-
-/**
- * Tests for our handling of lists
- */
-public final class TestLists extends TestCase {
-   public void testBasics() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc");
-      Range r = doc.getRange();
-      
-      assertEquals(40, r.numParagraphs());
-      assertEquals("Heading Level 1\r", r.getParagraph(0).text());
-      assertEquals("This document has different lists in it for testing\r", r.getParagraph(1).text());
-      assertEquals("The end!\r", r.getParagraph(38).text());
-      assertEquals("\r", r.getParagraph(39).text());
-      
-      assertEquals(0, r.getParagraph(0).getLvl());
-      assertEquals(9, r.getParagraph(1).getLvl());
-      assertEquals(9, r.getParagraph(38).getLvl());
-      assertEquals(9, r.getParagraph(39).getLvl());
-   }
-   
-	public void testUnorderedLists() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc");
-      Range r = doc.getRange();
-      assertEquals(40, r.numParagraphs());
-      
-      // Normal bullet points
-      assertEquals("This document has different lists in it for testing\r", r.getParagraph(1).text());
-      assertEquals("Unordered list 1\r", r.getParagraph(2).text());
-      assertEquals("UL 2\r", r.getParagraph(3).text());
-      assertEquals("UL 3\r", r.getParagraph(4).text());
-      assertEquals("Next up is an ordered list:\r", r.getParagraph(5).text());
-      
-      assertEquals(9, r.getParagraph(1).getLvl());
-      assertEquals(9, r.getParagraph(2).getLvl());
-      assertEquals(9, r.getParagraph(3).getLvl());
-      assertEquals(9, r.getParagraph(4).getLvl());
-      assertEquals(9, r.getParagraph(5).getLvl());
-      
-      assertEquals(0, r.getParagraph(1).getIlvl());
-      assertEquals(0, r.getParagraph(2).getIlvl());
-      assertEquals(0, r.getParagraph(3).getIlvl());
-      assertEquals(0, r.getParagraph(4).getIlvl());
-      assertEquals(0, r.getParagraph(5).getIlvl());
-      
-      // Tick bullets
-      assertEquals("Now for an un-ordered list with a different bullet style:\r", r.getParagraph(9).text());
-      assertEquals("Tick 1\r", r.getParagraph(10).text());
-      assertEquals("Tick 2\r", r.getParagraph(11).text());
-      assertEquals("Multi-level un-ordered list:\r", r.getParagraph(12).text());
-      
-      assertEquals(9, r.getParagraph(9).getLvl());
-      assertEquals(9, r.getParagraph(10).getLvl());
-      assertEquals(9, r.getParagraph(11).getLvl());
-      assertEquals(9, r.getParagraph(12).getLvl());
-
-      assertEquals(0, r.getParagraph(9).getIlvl());
-      assertEquals(0, r.getParagraph(10).getIlvl());
-      assertEquals(0, r.getParagraph(11).getIlvl());
-      assertEquals(0, r.getParagraph(12).getIlvl());
-
-      // TODO Test for tick not bullet
-	}
-   
-   public void testOrderedLists() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc");
-      Range r = doc.getRange();
-      assertEquals(40, r.numParagraphs());
-      
-      assertEquals("Next up is an ordered list:\r", r.getParagraph(5).text());
-      assertEquals("Ordered list 1\r", r.getParagraph(6).text());
-      assertEquals("OL 2\r", r.getParagraph(7).text());
-      assertEquals("OL 3\r", r.getParagraph(8).text());
-      assertEquals("Now for an un-ordered list with a different bullet style:\r", r.getParagraph(9).text());
-      
-      assertEquals(9, r.getParagraph(5).getLvl());
-      assertEquals(9, r.getParagraph(6).getLvl());
-      assertEquals(9, r.getParagraph(7).getLvl());
-      assertEquals(9, r.getParagraph(8).getLvl());
-      assertEquals(9, r.getParagraph(9).getLvl());
-
-      assertEquals(0, r.getParagraph(5).getIlvl());
-      assertEquals(0, r.getParagraph(6).getIlvl());
-      assertEquals(0, r.getParagraph(7).getIlvl());
-      assertEquals(0, r.getParagraph(8).getIlvl());
-      assertEquals(0, r.getParagraph(9).getIlvl());
-   }
-   
-   public void testMultiLevelLists() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc");
-      Range r = doc.getRange();
-      assertEquals(40, r.numParagraphs());
-      
-      assertEquals("Multi-level un-ordered list:\r", r.getParagraph(12).text());
-      assertEquals("ML 1:1\r", r.getParagraph(13).text());
-      assertEquals("ML 1:2\r", r.getParagraph(14).text());
-      assertEquals("ML 2:1\r", r.getParagraph(15).text());
-      assertEquals("ML 2:2\r", r.getParagraph(16).text());
-      assertEquals("ML 2:3\r", r.getParagraph(17).text());
-      assertEquals("ML 3:1\r", r.getParagraph(18).text());
-      assertEquals("ML 4:1\r", r.getParagraph(19).text());
-      assertEquals("ML 5:1\r", r.getParagraph(20).text());
-      assertEquals("ML 5:2\r", r.getParagraph(21).text());
-      assertEquals("ML 2:4\r", r.getParagraph(22).text());
-      assertEquals("ML 1:3\r", r.getParagraph(23).text());
-      assertEquals("Multi-level ordered list:\r", r.getParagraph(24).text());
-      assertEquals("OL 1\r", r.getParagraph(25).text());
-      assertEquals("OL 2\r", r.getParagraph(26).text());
-      assertEquals("OL 2.1\r", r.getParagraph(27).text());
-      assertEquals("OL 2.2\r", r.getParagraph(28).text());
-      assertEquals("OL 2.2.1\r", r.getParagraph(29).text());
-      assertEquals("OL 2.2.2\r", r.getParagraph(30).text());
-      assertEquals("OL 2.2.2.1\r", r.getParagraph(31).text());
-      assertEquals("OL 2.2.3\r", r.getParagraph(32).text());
-      assertEquals("OL 3\r", r.getParagraph(33).text());
-      assertEquals("Finally we want some indents, to tell the difference\r", r.getParagraph(34).text());
-      
-      for(int i=12; i<=34; i++) {
-         assertEquals(9, r.getParagraph(12).getLvl());
-      }
-      assertEquals(0, r.getParagraph(12).getIlvl());
-      assertEquals(0, r.getParagraph(13).getIlvl());
-      assertEquals(0, r.getParagraph(14).getIlvl());
-      assertEquals(1, r.getParagraph(15).getIlvl());
-      assertEquals(1, r.getParagraph(16).getIlvl());
-      assertEquals(1, r.getParagraph(17).getIlvl());
-      assertEquals(2, r.getParagraph(18).getIlvl());
-      assertEquals(3, r.getParagraph(19).getIlvl());
-      assertEquals(4, r.getParagraph(20).getIlvl());
-      assertEquals(4, r.getParagraph(21).getIlvl());
-      assertEquals(1, r.getParagraph(22).getIlvl());
-      assertEquals(0, r.getParagraph(23).getIlvl());
-      assertEquals(0, r.getParagraph(24).getIlvl());
-      assertEquals(0, r.getParagraph(25).getIlvl());
-      assertEquals(0, r.getParagraph(26).getIlvl());
-      assertEquals(1, r.getParagraph(27).getIlvl());
-      assertEquals(1, r.getParagraph(28).getIlvl());
-      assertEquals(2, r.getParagraph(29).getIlvl());
-      assertEquals(2, r.getParagraph(30).getIlvl());
-      assertEquals(3, r.getParagraph(31).getIlvl());
-      assertEquals(2, r.getParagraph(32).getIlvl());
-      assertEquals(0, r.getParagraph(33).getIlvl());
-      assertEquals(0, r.getParagraph(34).getIlvl());
-   }
-   
-   public void testIndentedText() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc");
-      Range r = doc.getRange();
-      
-      assertEquals(40, r.numParagraphs());
-      assertEquals("Finally we want some indents, to tell the difference\r", r.getParagraph(34).text());
-      assertEquals("Indented once\r", r.getParagraph(35).text());
-      assertEquals("Indented twice\r", r.getParagraph(36).text());
-      assertEquals("Indented three times\r", r.getParagraph(37).text());
-      assertEquals("The end!\r", r.getParagraph(38).text());
-      
-      assertEquals(9, r.getParagraph(34).getLvl());
-      assertEquals(9, r.getParagraph(35).getLvl());
-      assertEquals(9, r.getParagraph(36).getLvl());
-      assertEquals(9, r.getParagraph(37).getLvl());
-      assertEquals(9, r.getParagraph(38).getLvl());
-      assertEquals(9, r.getParagraph(39).getLvl());
-      
-      assertEquals(0, r.getParagraph(34).getIlvl());
-      assertEquals(0, r.getParagraph(35).getIlvl());
-      assertEquals(0, r.getParagraph(36).getIlvl());
-      assertEquals(0, r.getParagraph(37).getIlvl());
-      assertEquals(0, r.getParagraph(38).getIlvl());
-      assertEquals(0, r.getParagraph(39).getIlvl());
-      
-      // TODO Test the indent
-   }
-   
-   public void testWriteRead() throws IOException {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc");
-      doc = HWPFTestDataSamples.writeOutAndReadBack(doc);
-      
-      Range r = doc.getRange();
-      
-      // Check a couple at random
-      assertEquals(4, r.getParagraph(21).getIlvl());
-      assertEquals(1, r.getParagraph(22).getIlvl());
-      assertEquals(0, r.getParagraph(23).getIlvl());
-   }
-
-   public void testSpecificNumberedOrderedListFeatures() throws IOException {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Lists.doc");
-
-      Range r = doc.getRange();
-      //these are in the numbered ordered list
-      //26 = OL 2
-      //27 = OL 2.1
-      //28 = OL 2.2
-      //29 = OL 2.2.1
-      for (int i = 26; i < 30; i++) {
-         Paragraph p = r.getParagraph(i);
-         assertTrue(p.isInList());
-         HWPFList list = p.getList();
-         ListLevel level = list.getLVL((char) p.getIlvl());
-         assertFalse(level.isLegalNumbering());
-         assertEquals(-1, level.getRestart());
-      }
-      Paragraph p = r.getParagraph(26);
-      HWPFList list = p.getList();
-      ListLevel level = list.getLVL((char) p.getIlvl());
-      byte[] lvl = level.getLevelNumberingPlaceholderOffsets();
-
-      assertEquals((byte)1, lvl[0]);
-      assertEquals((byte)0, lvl[1]);
-
-      p = r.getParagraph(27);
-      list = p.getList();
-      level = list.getLVL((char) p.getIlvl());
-      lvl = level.getLevelNumberingPlaceholderOffsets();
-      assertEquals((byte)1, lvl[0]);
-      assertEquals((byte)3, lvl[1]);
-
-      p = r.getParagraph(29);
-      list = p.getList();
-      level = list.getLVL((char) p.getIlvl());
-      lvl = level.getLevelNumberingPlaceholderOffsets();
-
-      assertEquals((byte)1, lvl[0]);
-      assertEquals((byte)3, lvl[1]);
-      assertEquals((byte)5, lvl[2]);
-   }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
deleted file mode 100644
index ca0caf5..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ddf.EscherComplexProperty;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.util.StringUtil;
-
-/**
- * Test cases for {@link OfficeDrawing} and {@link OfficeDrawingsImpl} classes.
- * 
- * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
- */
-public class TestOfficeDrawings extends TestCase
-{
-    /**
-     * Tests watermark text extraction
-     */
-    public void testWatermark() throws Exception
-    {
-        HWPFDocument hwpfDocument = HWPFTestDataSamples
-                .openSampleFile( "watermark.doc" );
-        OfficeDrawing drawing = hwpfDocument.getOfficeDrawingsHeaders()
-                .getOfficeDrawings().iterator().next();
-        EscherContainerRecord escherContainerRecord = drawing
-                .getOfficeArtSpContainer();
-
-        EscherOptRecord officeArtFOPT = escherContainerRecord
-                .getChildById( (short) 0xF00B );
-        EscherComplexProperty gtextUNICODE = (EscherComplexProperty) officeArtFOPT
-                .lookup( 0x00c0 );
-
-        String text = StringUtil.getFromUnicodeLE(gtextUNICODE.getComplexData());
-        assertEquals( "DRAFT CONTRACT\0", text );
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
deleted file mode 100644
index f60b010..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.PicturesTable;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test the picture handling
- *
- * @author Nick Burch
- */
-public final class TestPictures {
-
-	/**
-	 * two jpegs
-	 */
-    @Test
-	public void testTwoImages() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile("two_images.doc");
-		List<Picture> pics = doc.getPicturesTable().getAllPictures();
-
-		assertNotNull(pics);
-		assertEquals(pics.size(), 2);
-		for(int i=0; i<pics.size(); i++) {
-			Picture pic = pics.get(i);
-			assertNotNull(pic.suggestFileExtension());
-			assertNotNull(pic.suggestFullFileName());
-		}
-
-		Picture picA = pics.get(0);
-		Picture picB = pics.get(1);
-		assertEquals("jpg", picA.suggestFileExtension());
-		assertEquals("png", picB.suggestFileExtension());
-	}
-
-	/**
-	 * pngs and jpegs
-	 */
-    @Test
-	public void testDifferentImages() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile("testPictures.doc");
-		List<Picture> pics = doc.getPicturesTable().getAllPictures();
-
-		assertNotNull(pics);
-		assertEquals(7, pics.size());
-		for(Picture pic : pics) {
-			assertNotNull(pic.suggestFileExtension());
-			assertNotNull(pic.suggestFullFileName());
-		}
-
-		assertEquals("jpg", pics.get(0).suggestFileExtension());
-		assertEquals("image/jpeg", pics.get(0).getMimeType());
-		assertEquals("jpg", pics.get(1).suggestFileExtension());
-      assertEquals("image/jpeg", pics.get(1).getMimeType());
-		assertEquals("png", pics.get(3).suggestFileExtension());
-      assertEquals("image/png", pics.get(3).getMimeType());
-		assertEquals("png", pics.get(4).suggestFileExtension());
-      assertEquals("image/png", pics.get(4).getMimeType());
-		assertEquals("wmf", pics.get(5).suggestFileExtension());
-      assertEquals("image/x-wmf", pics.get(5).getMimeType());
-		assertEquals("jpg", pics.get(6).suggestFileExtension());
-      assertEquals("image/jpeg", pics.get(6).getMimeType());
-	}
-
-	/**
-	 * emf image, nice and simple
-	 */
-    @Test
-	public void testEmfImage() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile("vector_image.doc");
-		List<Picture> pics = doc.getPicturesTable().getAllPictures();
-
-		assertNotNull(pics);
-		assertEquals(1, pics.size());
-
-		Picture pic = pics.get(0);
-		assertNotNull(pic.suggestFileExtension());
-		assertNotNull(pic.suggestFullFileName());
-		assertTrue(pic.getSize() > 128);
-
-		// Check right contents
-		byte[] emf = POIDataSamples.getDocumentInstance().readFile("vector_image.emf");
-		byte[] pemf = pic.getContent();
-		assertEquals(emf.length, pemf.length);
-		for(int i=0; i<emf.length; i++) {
-			assertEquals(emf[i], pemf[i]);
-		}
-	}
-
-    @Test
-    public void testPicturesWithTable() {
-		HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug44603.doc");
-
-		List<Picture> pics = doc.getPicturesTable().getAllPictures();
-		assertEquals(2, pics.size());
-	}
-
-    @Test
-    public void testPicturesInHeader() {
-	   HWPFDocument doc = HWPFTestDataSamples.openSampleFile("header_image.doc");
-
-	   List<Picture> pics = doc.getPicturesTable().getAllPictures();
-	   assertEquals(2, pics.size());
-	}
-
-    @Test
-    public void testFastSaved() {
-       HWPFDocument doc = HWPFTestDataSamples.openSampleFile("rasp.doc");
-
-       doc.getPicturesTable().getAllPictures(); // just check that we do not throw Exception
-    }
-
-    @Test
-    public void testFastSaved2() {
-       HWPFDocument doc = HWPFTestDataSamples.openSampleFile("o_kurs.doc");
-
-       doc.getPicturesTable().getAllPictures(); // just check that we do not throw Exception
-    }
-
-    @Test
-    public void testFastSaved3() {
-       HWPFDocument doc = HWPFTestDataSamples.openSampleFile("ob_is.doc");
-
-       doc.getPicturesTable().getAllPictures(); // just check that we do not throw Exception
-    }
-
-    /**
-     * When you embed another office document into Word, it stores
-     *  a rendered "icon" picture of what that document looks like.
-     * This image is re-created when you edit the embeded document,
-     *  then used as-is to speed things up.
-     * Check that we can properly read one of these
-     */
-    @Test
-    public void testEmbededDocumentIcon() {
-       // This file has two embeded excel files, an embeded powerpoint
-       //   file and an embeded word file, in that order
-       HWPFDocument doc = HWPFTestDataSamples.openSampleFile("word_with_embeded.doc");
-       
-       // Check we don't break loading the pictures
-       doc.getPicturesTable().getAllPictures();
-       PicturesTable pictureTable = doc.getPicturesTable();
-       
-       // Check the text, and its embeded images
-       Paragraph p;
-       Range r = doc.getRange();
-       assertEquals(1, r.numSections());
-       assertEquals(5, r.numParagraphs());
-       
-       p = r.getParagraph(0);
-       assertEquals(2, p.numCharacterRuns());
-       assertEquals("I have lots of embedded files in me\r", p.text());
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
-       
-       p = r.getParagraph(1);
-       assertEquals(5, p.numCharacterRuns());
-       assertEquals("\u0013 EMBED Excel.Sheet.8  \u0014\u0001\u0015\r", p.text());
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
-       assertEquals(true,  pictureTable.hasPicture(p.getCharacterRun(3)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
-       
-       p = r.getParagraph(2);
-       assertEquals(6, p.numCharacterRuns());
-       assertEquals("\u0013 EMBED Excel.Sheet.8  \u0014\u0001\u0015\r", p.text());
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
-       assertEquals(true,  pictureTable.hasPicture(p.getCharacterRun(3)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(5)));
-       
-       p = r.getParagraph(3);
-       assertEquals(6, p.numCharacterRuns());
-       assertEquals("\u0013 EMBED PowerPoint.Show.8  \u0014\u0001\u0015\r", p.text());
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
-       assertEquals(true,  pictureTable.hasPicture(p.getCharacterRun(3)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(5)));
-       
-       p = r.getParagraph(4);
-       assertEquals(6, p.numCharacterRuns());
-       assertEquals("\u0013 EMBED Word.Document.8 \\s \u0014\u0001\u0015\r", p.text());
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
-       assertEquals(true,  pictureTable.hasPicture(p.getCharacterRun(3)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
-       assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(5)));
-
-       // Look at the pictures table
-       List<Picture> pictures = pictureTable.getAllPictures();
-       assertEquals(4, pictures.size());
-
-        Picture picture = pictures.get( 0 );
-        assertEquals( "emf", picture.suggestFileExtension() );
-        assertEquals( "0.emf", picture.suggestFullFileName() );
-        assertEquals( "image/x-emf", picture.getMimeType() );
-
-        picture = pictures.get( 1 );
-        assertEquals( "emf", picture.suggestFileExtension() );
-        assertEquals( "469.emf", picture.suggestFullFileName() );
-        assertEquals( "image/x-emf", picture.getMimeType() );
-
-        picture = pictures.get( 2 );
-        assertEquals( "emf", picture.suggestFileExtension() );
-        assertEquals( "8c7.emf", picture.suggestFullFileName() );
-        assertEquals( "image/x-emf", picture.getMimeType() );
-
-        picture = pictures.get( 3 );
-        assertEquals( "emf", picture.suggestFileExtension() );
-        assertEquals( "10a8.emf", picture.suggestFullFileName() );
-        assertEquals( "image/x-emf", picture.getMimeType() );
-    }
-
-    @Test
-    public void testEquation()
-    {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "equation.doc" );
-        PicturesTable pictures = doc.getPicturesTable();
-
-        final List<Picture> allPictures = pictures.getAllPictures();
-        assertEquals( 1, allPictures.size() );
-
-        Picture picture = allPictures.get( 0 );
-        assertNotNull( picture );
-        assertEquals( PictureType.EMF, picture.suggestPictureType() );
-        assertEquals( PictureType.EMF.getExtension(),
-                picture.suggestFileExtension() );
-        assertEquals( PictureType.EMF.getMime(), picture.getMimeType() );
-        assertEquals( "0.emf", picture.suggestFullFileName() );
-    }
-
-    /**
-     * In word you can have floating or fixed pictures.
-     * Fixed have a \u0001 in place with an offset to the
-     *  picture data.
-     * Floating have a \u0008 in place, which references a
-     *  \u0001 which has the offset. More than one can
-     *  reference the same \u0001
-     */
-    @Test
-    public void testFloatingPictures() {
-       HWPFDocument doc = HWPFTestDataSamples.openSampleFile("FloatingPictures.doc");
-       PicturesTable pictures = doc.getPicturesTable();
-       
-       // There are 19 images in the picture, but some are
-       //  duplicate floating ones
-       assertEquals(17, pictures.getAllPictures().size());
-       
-       int plain8s = 0;
-       int escher8s = 0;
-       int image1s = 0;
-       
-       Range r = doc.getRange();
-       for(int np=0; np < r.numParagraphs(); np++) {
-          Paragraph p = r.getParagraph(np);
-          for(int nc=0; nc < p.numCharacterRuns(); nc++) {
-             CharacterRun cr = p.getCharacterRun(nc);
-             if(pictures.hasPicture(cr)) {
-                image1s++;
-             } else if(pictures.hasEscherPicture(cr)) {
-                escher8s++;
-             } else if(cr.text().startsWith("\u0008")) {
-                plain8s++;
-             }
-          }
-       }
-       // Total is 20, as the 4 escher 8s all reference
-       //  the same regular image
-       assertEquals(16, image1s);
-       assertEquals(4,  escher8s);
-       assertEquals(0, plain8s);
-    }
-
-    @SuppressWarnings( "deprecation" )
-    @Test
-    public void testCroppedPictures() {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("testCroppedPictures.doc");
-        List<Picture> pics = doc.getPicturesTable().getAllPictures();
-
-        assertNotNull(pics);
-        assertEquals(2, pics.size());
-
-        Picture pic1 = pics.get(0);
-        assertEquals("FIXME: unable to get image width", -1, pic1.getWidth());
-        assertEquals(270, pic1.getHorizontalScalingFactor());
-        assertEquals(271, pic1.getVerticalScalingFactor());
-        assertEquals(12000, pic1.getDxaGoal());       // 21.17 cm / 2.54 cm/inch * 72dpi * 20 = 12000
-        assertEquals(9000, pic1.getDyaGoal());        // 15.88 cm / 2.54 cm/inch * 72dpi * 20 = 9000
-        assertEquals(0, pic1.getDxaCropLeft());
-        assertEquals(0, pic1.getDxaCropRight());
-        assertEquals(0, pic1.getDyaCropTop());
-        assertEquals(0, pic1.getDyaCropBottom());
-
-        Picture pic2 = pics.get(1);
-        assertEquals("FIXME: unable to get image width", -1, pic2.getWidth());
-        assertEquals(764, pic2.getHorizontalScalingFactor());
-        assertEquals(685, pic2.getVerticalScalingFactor());
-        assertEquals(12000, pic2.getDxaGoal());       // 21.17 cm / 2.54 cm/inch * 72dpi * 20 = 12000
-        assertEquals(9000, pic2.getDyaGoal());        // 15.88 cm / 2.54 cm/inch * 72dpi * 20 = 9000
-        assertEquals(0, pic2.getDxaCropLeft());       // TODO YK: The Picture is cropped but HWPF reads the crop parameters all zeros
-        assertEquals(0, pic2.getDxaCropRight());
-        assertEquals(0, pic2.getDyaCropTop());
-        assertEquals(0, pic2.getDyaCropBottom());
-    }
-
-    @Test
-    public void testPictureDetectionWithPNG() {
-        HWPFDocument document = HWPFTestDataSamples.openSampleFile("PngPicture.doc");
-        PicturesTable pictureTable = document.getPicturesTable();
-        
-        assertEquals(1, pictureTable.getAllPictures().size());
-        
-        Picture p = pictureTable.getAllPictures().get(0);
-        assertEquals(PictureType.PNG, p.suggestPictureType());
-        assertEquals("png", p.suggestFileExtension());
-    }
-    
-    @Test
-    public void testPictureWithAlternativeText() {
-        HWPFDocument document = HWPFTestDataSamples.openSampleFile("Picture_Alternative_Text.doc");
-        PicturesTable pictureTable = document.getPicturesTable();
-        Picture picture = pictureTable.getAllPictures().get(0);
-
-        assertEquals("This is the alternative text for the picture.", picture.getDescription());
-    }
-    
-    @Ignore("This bug is not fixed yet")
-    @Test
-    public void test58804_1() throws Exception {
-        HWPFDocument docA = HWPFTestDataSamples.openSampleFile("58804_1.doc");
-        
-        expectImages(docA, 1);
-
-        HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
-        
-        OutputStream out = new FileOutputStream("/tmp/58804_1_out.doc");
-        try {
-            docB.write(out);
-        } finally {
-            out.close();
-        }
-
-        expectImages(docB, 1);
-    }
-
-    @Ignore("This bug is not fixed yet")
-    @Test
-    public void test58804() throws Exception {
-        HWPFDocument docA = HWPFTestDataSamples.openSampleFile("58804.doc");
-        
-        expectImages(docA, 7);
-
-        HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
-
-        expectImages(docB, 7);
-    }
-
-    private void expectImages(HWPFDocument docA, int expectedCount) {
-        assertNotNull(docA.getPicturesTable());
-        PicturesTable picA = docA.getPicturesTable();
-        List<Picture> picturesA = picA.getAllPictures();
-        assertEquals(expectedCount, picturesA.size());
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
deleted file mode 100644
index 3623629..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestCase;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.hwpf.model.StyleSheet;
-
-/**
- * Test various problem documents
- *
- * @author Nick Burch (nick at torchbox dot com)
- */
-public final class TestProblems extends HWPFTestCase {
-
-    
-   /**
-    * ListEntry passed no ListTable
-    */
-   public void testListEntryNoListTable() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("ListEntryNoListTable.doc");
-
-      Range r = doc.getRange();
-      StyleSheet styleSheet = doc.getStyleSheet();
-      for (int x = 0; x < r.numSections(); x++) {
-         Section s = r.getSection(x);
-         for (int y = 0; y < s.numParagraphs(); y++) {
-            Paragraph paragraph = s.getParagraph(y);
-            // System.out.println(paragraph.getCharacterRun(0).text());
-         }
-      }
-   }
-
-   /**
-    * AIOOB for TableSprmUncompressor.unCompressTAPOperation
-    */
-   public void testSprmAIOOB() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("AIOOB-Tap.doc");
-
-      Range r = doc.getRange();
-      StyleSheet styleSheet = doc.getStyleSheet();
-      for (int x = 0; x < r.numSections(); x++) {
-         Section s = r.getSection(x);
-         for (int y = 0; y < s.numParagraphs(); y++) {
-            Paragraph paragraph = s.getParagraph(y);
-            // System.out.println(paragraph.getCharacterRun(0).text());
-         }
-      }
-   }
-
-   /**
-    * Test for TableCell not skipping the last paragraph. Bugs #45062 and
-    * #44292
-    */
-   public void testTableCellLastParagraph() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug44292.doc");
-      Range r = doc.getRange();
-      assertEquals(6, r.numParagraphs());
-      assertEquals(0, r.getStartOffset());
-      assertEquals(87, r.getEndOffset());
-
-      // Paragraph with table
-      Paragraph p = r.getParagraph(0);
-      assertEquals(0, p.getStartOffset());
-      assertEquals(20, p.getEndOffset());
-
-      // Check a few bits of the table directly
-      assertEquals("One paragraph is ok\7", r.getParagraph(0).text());
-      assertEquals("First para is ok\r", r.getParagraph(1).text());
-      assertEquals("Second paragraph is skipped\7", r.getParagraph(2).text());
-      assertEquals("One paragraph is ok\7", r.getParagraph(3).text());
-      assertEquals("\7", r.getParagraph(4).text());
-      assertEquals("\r", r.getParagraph(5).text());
-
-      // Get the table
-      Table t = r.getTable(p);
-
-      // get the only row
-      assertEquals(1, t.numRows());
-      TableRow row = t.getRow(0);
-
-      // sanity check our row
-      assertEquals(5, row.numParagraphs());
-      assertEquals(0, row._parStart);
-      assertEquals(5, row._parEnd);
-      assertEquals(0, row.getStartOffset());
-      assertEquals(86, row.getEndOffset());
-
-
-      // get the first cell
-      TableCell cell = row.getCell(0);
-      // First cell should have one paragraph
-      assertEquals(1, cell.numParagraphs());
-      assertEquals("One paragraph is ok\7", cell.getParagraph(0).text());
-      assertEquals(0, cell._parStart);
-      assertEquals(1, cell._parEnd);
-      assertEquals(0, cell.getStartOffset());
-      assertEquals(20, cell.getEndOffset());
-
-
-      // get the second
-      cell = row.getCell(1);
-      // Second cell should be detected as having two paragraphs
-      assertEquals(2, cell.numParagraphs());
-      assertEquals("First para is ok\r", cell.getParagraph(0).text());
-      assertEquals("Second paragraph is skipped\7", cell.getParagraph(1).text());
-      assertEquals(1, cell._parStart);
-      assertEquals(3, cell._parEnd);
-      assertEquals(20, cell.getStartOffset());
-      assertEquals(65, cell.getEndOffset());
-
-
-      // get the last cell
-      cell = row.getCell(2);
-      // Last cell should have one paragraph
-      assertEquals(1, cell.numParagraphs());
-      assertEquals("One paragraph is ok\7", cell.getParagraph(0).text());
-      assertEquals(3, cell._parStart);
-      assertEquals(4, cell._parEnd);
-      assertEquals(65, cell.getStartOffset());
-      assertEquals(85, cell.getEndOffset());
-   }
-
-   public void testRangeDelete() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug28627.doc");
-
-      Range range = doc.getRange();
-      int numParagraphs = range.numParagraphs();
-
-      int totalLength = 0, deletedLength = 0;
-
-      for (int i = 0; i < numParagraphs; i++) {
-         Paragraph para = range.getParagraph(i);
-         String text = para.text();
-
-         totalLength += text.length();
-         if (text.indexOf("{delete me}") > -1) {
-            para.delete();
-            deletedLength = text.length();
-         }
-      }
-
-      // check the text length after deletion
-      int newLength = 0;
-      range = doc.getRange();
-      numParagraphs = range.numParagraphs();
-
-      for (int i = 0; i < numParagraphs; i++) {
-         Paragraph para = range.getParagraph(i);
-         String text = para.text();
-
-         newLength += text.length();
-      }
-
-      assertEquals(newLength, totalLength - deletedLength);
-   }
-
-   /**
-    * With an encrypted file, we should give a suitable exception, and not OOM
-    */
-   public void testEncryptedFile() {
-      try {
-         HWPFTestDataSamples.openSampleFile("PasswordProtected.doc");
-         fail();
-      } catch (EncryptedDocumentException e) {
-         // Good
-      }
-   }
-
-   public void testWriteProperties() {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
-      assertEquals("Nick Burch", doc.getSummaryInformation().getAuthor());
-
-      // Write and read
-      HWPFDocument doc2 = writeOutAndRead(doc);
-      assertEquals("Nick Burch", doc2.getSummaryInformation().getAuthor());
-   }
-
-   /**
-    * Test for reading paragraphs from Range after replacing some 
-    * text in this Range.
-    * Bug #45269
-    */
-   public void testReadParagraphsAfterReplaceText()throws Exception{
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug45269.doc");
-      Range range = doc.getRange();
-
-      String toFind = "campo1";
-      String longer = " foi porraaaaa ";
-      String shorter = " foi ";
-
-      //check replace with longer text
-      for (int x = 0; x < range.numParagraphs(); x++) {
-         Paragraph para = range.getParagraph(x);
-         int offset = para.text().indexOf(toFind);
-         if (offset >= 0) {
-            para.replaceText(toFind, longer, offset);
-            assertEquals(offset, para.text().indexOf(longer));
-         }
-      }
-
-      doc = HWPFTestDataSamples.openSampleFile("Bug45269.doc");
-      range = doc.getRange();
-
-      //check replace with shorter text
-      for (int x = 0; x < range.numParagraphs(); x++) {
-         Paragraph para = range.getParagraph(x);
-         int offset = para.text().indexOf(toFind);
-         if (offset >= 0) {
-            para.replaceText(toFind, shorter, offset);
-            assertEquals(offset, para.text().indexOf(shorter));
-         }
-      }
-   }
-   
-   /**
-    * Bug #49936 - Problems with reading the header out of
-    *  the Header Stories
-    */
-   public void testProblemHeaderStories49936() throws Exception {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("HeaderFooterProblematic.doc");
-      HeaderStories hs = new HeaderStories(doc);
-      
-      assertEquals("", hs.getFirstHeader());
-      assertEquals("\r", hs.getEvenHeader());
-      assertEquals("", hs.getOddHeader());
-      
-      assertEquals("", hs.getFirstFooter());
-      assertEquals("", hs.getEvenFooter());
-      assertEquals("", hs.getOddFooter());
-      
-      WordExtractor ext = new WordExtractor(doc);
-      assertEquals("\n", ext.getHeaderText());
-      assertEquals("", ext.getFooterText());
-   }
-   
-   /**
-    * Bug #45877 - problematic PAPX with no parent set
-    */
-   public void testParagraphPAPXNoParent45877() throws Exception {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug45877.doc");
-      assertEquals(17, doc.getRange().numParagraphs());
-      
-      assertEquals("First paragraph\r", doc.getRange().getParagraph(0).text());
-      assertEquals("After Crashing Part\r", doc.getRange().getParagraph(13).text());
-   }
-
-   /**
-    * Bug #48245 - don't include the text from the
-    *  next cell in the current one
-    */
-   public void testTableIterator() throws Exception {
-      HWPFDocument doc = HWPFTestDataSamples.openSampleFile("simple-table2.doc");
-      Range r = doc.getRange();
-
-      // Check the text is as we'd expect
-      assertEquals(13, r.numParagraphs());
-      assertEquals("Row 1/Cell 1\u0007", r.getParagraph(0).text());
-      assertEquals("Row 1/Cell 2\u0007", r.getParagraph(1).text());
-      assertEquals("Row 1/Cell 3\u0007", r.getParagraph(2).text());
-      assertEquals("\u0007", r.getParagraph(3).text());
-      assertEquals("Row 2/Cell 1\u0007", r.getParagraph(4).text());
-      assertEquals("Row 2/Cell 2\u0007", r.getParagraph(5).text());
-      assertEquals("Row 2/Cell 3\u0007", r.getParagraph(6).text());
-      assertEquals("\u0007", r.getParagraph(7).text());
-      assertEquals("Row 3/Cell 1\u0007", r.getParagraph(8).text());
-      assertEquals("Row 3/Cell 2\u0007", r.getParagraph(9).text());
-      assertEquals("Row 3/Cell 3\u0007", r.getParagraph(10).text());
-      assertEquals("\u0007", r.getParagraph(11).text());
-      assertEquals("\r", r.getParagraph(12).text());
-
-      Paragraph p;
-
-      // Take a look in detail at the first couple of
-      //  paragraphs
-      p = r.getParagraph(0);
-      assertEquals(1,  p.numParagraphs());
-      assertEquals(0,  p.getStartOffset());
-      assertEquals(13, p.getEndOffset());
-      assertEquals(0,  p._parStart);
-      assertEquals(1,  p._parEnd);
-
-      p = r.getParagraph(1);
-      assertEquals(1,  p.numParagraphs());
-      assertEquals(13, p.getStartOffset());
-      assertEquals(26, p.getEndOffset());
-      assertEquals(1,  p._parStart);
-      assertEquals(2,  p._parEnd);
-
-      p = r.getParagraph(2);
-      assertEquals(1,  p.numParagraphs());
-      assertEquals(26, p.getStartOffset());
-      assertEquals(39, p.getEndOffset());
-      assertEquals(2,  p._parStart);
-      assertEquals(3,  p._parEnd);
-
-
-      // Now look at the table
-      Table table = r.getTable(r.getParagraph(0));
-      assertEquals(3, table.numRows());
-
-      TableRow row;
-      TableCell cell;
-
-
-      row = table.getRow(0);
-      assertEquals(0, row._parStart);
-      assertEquals(4, row._parEnd);
-
-      cell = row.getCell(0);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(0, cell._parStart);
-      assertEquals(1, cell._parEnd);
-      assertEquals(0, cell.getStartOffset());
-      assertEquals(13, cell.getEndOffset());
-      assertEquals("Row 1/Cell 1\u0007", cell.text());
-      assertEquals("Row 1/Cell 1\u0007", cell.getParagraph(0).text());
-
-      cell = row.getCell(1);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(1, cell._parStart);
-      assertEquals(2, cell._parEnd);
-      assertEquals(13, cell.getStartOffset());
-      assertEquals(26, cell.getEndOffset());
-      assertEquals("Row 1/Cell 2\u0007", cell.text());
-      assertEquals("Row 1/Cell 2\u0007", cell.getParagraph(0).text());
-
-      cell = row.getCell(2);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(2, cell._parStart);
-      assertEquals(3, cell._parEnd);
-      assertEquals(26, cell.getStartOffset());
-      assertEquals(39, cell.getEndOffset());
-      assertEquals("Row 1/Cell 3\u0007", cell.text());
-      assertEquals("Row 1/Cell 3\u0007", cell.getParagraph(0).text());
-
-
-      // Onto row #2
-      row = table.getRow(1);
-      assertEquals(4, row._parStart);
-      assertEquals(8, row._parEnd);
-
-      cell = row.getCell(0);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(4, cell._parStart);
-      assertEquals(5, cell._parEnd);
-      assertEquals(40, cell.getStartOffset());
-      assertEquals(53, cell.getEndOffset());
-      assertEquals("Row 2/Cell 1\u0007", cell.text());
-
-      cell = row.getCell(1);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(5, cell._parStart);
-      assertEquals(6, cell._parEnd);
-      assertEquals(53, cell.getStartOffset());
-      assertEquals(66, cell.getEndOffset());
-      assertEquals("Row 2/Cell 2\u0007", cell.text());
-
-      cell = row.getCell(2);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(6, cell._parStart);
-      assertEquals(7, cell._parEnd);
-      assertEquals(66, cell.getStartOffset());
-      assertEquals(79, cell.getEndOffset());
-      assertEquals("Row 2/Cell 3\u0007", cell.text());
-
-
-      // Finally row 3
-      row = table.getRow(2);
-      assertEquals(8, row._parStart);
-      assertEquals(12, row._parEnd);
-
-      cell = row.getCell(0);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(8, cell._parStart);
-      assertEquals(9, cell._parEnd);
-      assertEquals(80, cell.getStartOffset());
-      assertEquals(93, cell.getEndOffset());
-      assertEquals("Row 3/Cell 1\u0007", cell.text());
-
-      cell = row.getCell(1);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(9, cell._parStart);
-      assertEquals(10, cell._parEnd);
-      assertEquals(93, cell.getStartOffset());
-      assertEquals(106, cell.getEndOffset());
-      assertEquals("Row 3/Cell 2\u0007", cell.text());
-
-      cell = row.getCell(2);
-      assertEquals(1, cell.numParagraphs());
-      assertEquals(10, cell._parStart);
-      assertEquals(11, cell._parEnd);
-      assertEquals(106, cell.getStartOffset());
-      assertEquals(119, cell.getEndOffset());
-      assertEquals("Row 3/Cell 3\u0007", cell.text());
-   }
-
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java
deleted file mode 100644
index a7eabe5..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.model.SEPX;
-
-/**
- * Tests for Range which aren't around deletion, insertion, text replacement or
- * textual contents
- */
-public final class TestRange extends TestCase
-{
-    public void testFieldStripping()
-    {
-        String exp = "This is some text.";
-
-        String single = "This is some \u0013Blah!\u0015text.";
-        String with14 = "This is \u0013Blah!\u0014some\u0015 text.";
-        String withNested = "This is \u0013Blah!\u0013Blah!\u0015\u0015some text.";
-        String withNested14 = "This is \u0013Blah!\u0013Blah!\u0014don't see me\u0015 blah!\u0015some text.";
-        String withNestedIn14 = "This is \u0013Blah!\u0014some\u0013Blah!\u0015 \u0015text.";
-
-        // Check all comes out right
-        assertEquals( exp, Range.stripFields( exp ) );
-        assertEquals( exp, Range.stripFields( single ) );
-        assertEquals( exp, Range.stripFields( with14 ) );
-        assertEquals( exp, Range.stripFields( withNested ) );
-        assertEquals( exp, Range.stripFields( withNested14 ) );
-        assertEquals( exp, Range.stripFields( withNestedIn14 ) );
-
-        // Ones that are odd and we won't change
-        String odd1 = "This\u0015 is \u0013 odd";
-        String odd2 = "This\u0015 is \u0014 also \u0013 odd";
-
-        assertEquals( odd1, Range.stripFields( odd1 ) );
-        assertEquals( odd2, Range.stripFields( odd2 ) );
-    }
-
-    public void testBug46817() throws Exception
-    {
-        HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples
-                .getDocumentInstance().openResourceAsStream( "Bug46817.doc" ) );
-
-        final List<SEPX> sections = hwpfDocument.getSectionTable()
-                .getSections();
-        assertEquals( sections.size(), 1 );
-
-        // whole document, including additional text from shape
-        SEPX sepx = sections.get( 0 );
-        assertEquals( sepx.getStart(), 0 );
-        assertEquals( sepx.getEnd(), 1428 );
-
-        // only main range
-        Range range = hwpfDocument.getRange();
-        assertEquals( range.getStartOffset(), 0 );
-        assertEquals( range.getEndOffset(), 766 );
-
-        Paragraph lastInMainRange = range.getParagraph( range.numParagraphs() - 1);
-        assertTrue( lastInMainRange.getEndOffset() <= 766 );
-
-        Section section = range.getSection( 0 );
-        assertTrue( section.getEndOffset() <= 766 );
-
-        Paragraph lastInMainSection = section.getParagraph( section
-                .numParagraphs() - 1);
-        assertTrue( lastInMainSection.getEndOffset() <= 766 );
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
deleted file mode 100644
index bf52606..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.PAPX;
-
-import junit.framework.TestCase;
-
-/**
- *	Test to see if Range.delete() works even if the Range contains a
- *	CharacterRun that uses Unicode characters.
- */
-public final class TestRangeDelete extends TestCase {
-
-	// u201c and u201d are "smart-quotes"
-	private final String introText =
-		"Introduction\r";
-	private final String fillerText =
-		"${delete} This is an MS-Word 97 formatted document created using NeoOffice v. 2.2.4 Patch 0 (OpenOffice.org v. 2.2.1).\r";
-	private final String originalText =
-		"It is used to confirm that text delete works even if Unicode characters (such as \u201c\u2014\u201d (U+2014), \u201c\u2e8e\u201d (U+2E8E), or \u201c\u2714\u201d (U+2714)) are present.  Everybody should be thankful to the ${organization} ${delete} and all the POI contributors for their assistance in this matter.\r";
-	private final String lastText =
-		"Thank you, ${organization} ${delete}!\r";
-	private final String searchText = "${delete}";
-	private final String expectedText1 = " This is an MS-Word 97 formatted document created using NeoOffice v. 2.2.4 Patch 0 (OpenOffice.org v. 2.2.1).\r";
-	private final String expectedText2 =
-		"It is used to confirm that text delete works even if Unicode characters (such as \u201c\u2014\u201d (U+2014), \u201c\u2e8e\u201d (U+2E8E), or \u201c\u2714\u201d (U+2714)) are present.  Everybody should be thankful to the ${organization}  and all the POI contributors for their assistance in this matter.\r";
-	private final String expectedText3 = "Thank you, ${organization} !\r";
-
-	private String illustrativeDocFile;
-
-	@Override
-    protected void setUp() {
-		illustrativeDocFile = "testRangeDelete.doc";
-	}
-
-	/**
-	 * Test just opening the files
-	 */
-	public void testOpen() {
-
-		HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-	}
-
-	/**
-	 * Test (more "confirm" than test) that we have the general structure that we expect to have.
-	 */
-	public void testDocStructure() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-		Range range;
-		Section section;
-		Paragraph para;
-		PAPX paraDef;
-
-		// First, check overall
-		range = daDoc.getOverallRange();
-		assertEquals(1, range.numSections());
-		assertEquals(5, range.numParagraphs());
-
-
-		// Now, onto just the doc bit
-		range = daDoc.getRange();
-
-		assertEquals(1, range.numSections());
-		assertEquals(1, daDoc.getSectionTable().getSections().size());
-		section = range.getSection(0);
-
-		assertEquals(5, section.numParagraphs());
-
-		para = section.getParagraph(0);
-		assertEquals(1, para.numCharacterRuns());
-		assertEquals(introText, para.text());
-
-		para = section.getParagraph(1);
-		assertEquals(5, para.numCharacterRuns());
-		assertEquals(fillerText, para.text());
-
-
-		paraDef = daDoc.getParagraphTable().getParagraphs().get(2);
-		assertEquals(132, paraDef.getStart());
-		assertEquals(400, paraDef.getEnd());
-
-		para = section.getParagraph(2);
-		assertEquals(5, para.numCharacterRuns());
-		assertEquals(originalText, para.text());
-
-
-		paraDef = daDoc.getParagraphTable().getParagraphs().get(3);
-		assertEquals(400, paraDef.getStart());
-		assertEquals(438, paraDef.getEnd());
-
-		para = section.getParagraph(3);
-		assertEquals(1, para.numCharacterRuns());
-		assertEquals(lastText, para.text());
-
-
-		// Check things match on text length
-		assertEquals(439, range.text().length());
-		assertEquals(439, section.text().length());
-		assertEquals(439,
-				section.getParagraph(0).text().length() +
-				section.getParagraph(1).text().length() +
-				section.getParagraph(2).text().length() +
-				section.getParagraph(3).text().length() +
-				section.getParagraph(4).text().length()
-		);
-	}
-
-	/**
-	 * Test that we can delete text (one instance) from our Range with Unicode text.
-	 */
-	public void testRangeDeleteOne() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-
-		Range range = daDoc.getOverallRange();
-		assertEquals(1, range.numSections());
-
-		Section section = range.getSection(0);
-		assertEquals(5, section.numParagraphs());
-
-		Paragraph para = section.getParagraph(2);
-
-		String text = para.text();
-		assertEquals(originalText, text);
-
-		int offset = text.indexOf(searchText);
-		assertEquals(192, offset);
-
-		int absOffset = para.getStartOffset() + offset;
-		Range subRange = new Range(absOffset, (absOffset + searchText.length()), para.getDocument());
-
-		assertEquals(searchText, subRange.text());
-
-		subRange.delete();
-		daDoc.getOverallRange().sanityCheck();
-		daDoc.getRange().sanityCheck();
-
-		// we need to let the model re-calculate the Range before we evaluate it
-		range = daDoc.getRange();
-
-		assertEquals(1, range.numSections());
-		section = range.getSection(0);
-
-		assertEquals(5, section.numParagraphs());
-		para = section.getParagraph(2);
-
-		text = para.text();
-		assertEquals(expectedText2, text);
-
-		// this can lead to a StringBufferOutOfBoundsException, so we will add it
-		// even though we don't have an assertion for it
-		Range daRange = daDoc.getRange();
-		daRange.sanityCheck();
-		daRange.text();
-	}
-
-	/**
-	 * Test that we can delete text (all instances of) from our Range with Unicode text.
-	 */
-	public void testRangeDeleteAll() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-
-		Range range = daDoc.getRange();
-		assertEquals(1, range.numSections());
-
-		Section section = range.getSection(0);
-		assertEquals(5, section.numParagraphs());
-
-		Paragraph para = section.getParagraph(2);
-
-		String text = para.text();
-		assertEquals(originalText, text);
-
-		boolean keepLooking = true;
-		while (keepLooking) {
-			// Reload the range every time
-			range = daDoc.getRange();
-			int offset = range.text().indexOf(searchText);
-			if (offset >= 0) {
-
-				int absOffset = range.getStartOffset() + offset;
-
-				Range subRange = new Range(
-					absOffset, (absOffset + searchText.length()), range.getDocument());
-
-				assertEquals(searchText, subRange.text());
-
-				subRange.delete();
-
-			} else {
-				keepLooking = false;
-			}
-		}
-
-		// we need to let the model re-calculate the Range before we use it
-		range = daDoc.getRange();
-
-		assertEquals(1, range.numSections());
-		section = range.getSection(0);
-
-		assertEquals(5, section.numParagraphs());
-
-		para = section.getParagraph(0);
-		text = para.text();
-		assertEquals(introText, text);
-
-		para = section.getParagraph(1);
-		text = para.text();
-		assertEquals(expectedText1, text);
-
-		para = section.getParagraph(2);
-		text = para.text();
-		assertEquals(expectedText2, text);
-
-		para = section.getParagraph(3);
-		text = para.text();
-		assertEquals(expectedText3, text);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
deleted file mode 100644
index 18ae0e7..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- *	Test to see if Range.insertBefore() works even if the Range contains a
- *	CharacterRun that uses Unicode characters.
- *
- * TODO - re-enable me when unicode paragraph stuff is fixed!
- */
-public final class TestRangeInsertion extends TestCase {
-
-	// u201c and u201d are "smart-quotes"
-	private final String originalText =
-		"It is used to confirm that text insertion works even if Unicode characters (such as \u201c\u2014\u201d (U+2014), \u201c\u2e8e\u201d (U+2E8E), or \u201c\u2714\u201d (U+2714)) are present.\r";
-	private final String textToInsert = "Look at me!  I'm cool!  ";
-	private final int insertionPoint = 122;
-
-	private String illustrativeDocFile;
-
-	@Override
-    protected void setUp() {
-		illustrativeDocFile = "testRangeInsertion.doc";
-	}
-
-	/**
-	 * Test just opening the files
-	 */
-	public void testOpen() {
-
-		HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-	}
-
-	/**
-	 * Test (more "confirm" than test) that we have the general structure that we expect to have.
-	 */
-	public void testDocStructure() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-
-		Range range = daDoc.getRange();
-
-		assertEquals(1, range.numSections());
-		Section section = range.getSection(0);
-
-		assertEquals(3, section.numParagraphs());
-		Paragraph para = section.getParagraph(2);
-		assertEquals(originalText, para.text());
-
-		assertEquals(3, para.numCharacterRuns());
-		String text =
-			para.getCharacterRun(0).text() +
-			para.getCharacterRun(1).text() +
-			para.getCharacterRun(2).text()
-		;
-
-		assertEquals(originalText, text);
-
-		assertEquals(insertionPoint, para.getStartOffset());
-	}
-
-	/**
-	 * Test that we can insert text in our CharacterRun with Unicode text.
-	 */
-	public void testRangeInsertion() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-
-//		if (false) { // TODO - delete or resurrect this code
-//			Range range = daDoc.getRange();
-//			Section section = range.getSection(0);
-//			Paragraph para = section.getParagraph(2);
-//			String text = para.getCharacterRun(0).text() + para.getCharacterRun(1).text() +
-//			para.getCharacterRun(2).text();
-//
-//			System.out.println(text);
-//		}
-
-		Range range = new Range(insertionPoint, (insertionPoint + 2), daDoc);
-		range.insertBefore(textToInsert);
-
-		// we need to let the model re-calculate the Range before we evaluate it
-		range = daDoc.getRange();
-
-		assertEquals(1, range.numSections());
-		Section section = range.getSection(0);
-
-		assertEquals(3, section.numParagraphs());
-		Paragraph para = section.getParagraph(2);
-		assertEquals((textToInsert + originalText), para.text());
-
-		assertEquals(3, para.numCharacterRuns());
-		String text =
-			para.getCharacterRun(0).text() +
-			para.getCharacterRun(1).text() +
-			para.getCharacterRun(2).text()
-		;
-
-		// System.out.println(text);
-
-		assertEquals((textToInsert + originalText), text);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
deleted file mode 100644
index 0865189..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.apache.poi.hwpf.model.PAPX;
-import org.apache.poi.hwpf.model.StyleSheet;
-
-/**
- * Tests to ensure that our ranges end up with
- *  the right text in them, and the right font/styling
- *  properties applied to them.
- */
-public final class TestRangeProperties extends TestCase {
-    private static final char page_break = (char)12;
-
-    private static final String u_page_1 =
-        "This is a fairly simple word document, over two pages, with headers and footers.\r" +
-        "The trick with this one is that it contains some Unicode based strings in it.\r" +
-        "Firstly, some currency symbols:\r" +
-        "\tGBP - \u00a3\r" +
-        "\tEUR - \u20ac\r" +
-        "Now, we\u2019ll have some French text, in bold and big:\r" +
-        "\tMoli\u00e8re\r" +
-        "And some normal French text:\r" +
-        "\tL'Avare ou l'\u00c9cole du mensonge\r" +
-        "That\u2019s it for page one\r"
-    ;
-    private static final String u_page_2 =
-        "This is page two. Les Pr\u00e9cieuses ridicules. The end.\r"
-    ;
-
-    private static final String a_page_1 =
-        "I am a test document\r" +
-        "This is page 1\r" +
-        "I am Calibri (Body) in font size 11\r"
-    ;
-    private static final String a_page_2 =
-        "This is page two\r" +
-        "It\u2019s Arial Black in 16 point\r" +
-        "It\u2019s also in blue\r"
-    ;
-
-    private HWPFDocument u;
-    private HWPFDocument a;
-
-    @Override
-    protected void setUp() {
-        u = HWPFTestDataSamples.openSampleFile("HeaderFooterUnicode.doc");
-        a = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
-    }
-
-
-    public void testAsciiTextParagraphs() {
-        Range r = a.getRange();
-        assertEquals(
-                a_page_1 +
-                page_break + "\r" +
-                a_page_2,
-                r.text()
-        );
-
-        assertEquals(1, r.numSections());
-        assertEquals(1, a.getSectionTable().getSections().size());
-        Section s = r.getSection(0);
-        assertEquals(
-                a_page_1 +
-                page_break + "\r" +
-                a_page_2,
-                s.text()
-        );
-
-        // no PAP reconstruction
-        // assertEquals( 7, r.numParagraphs() );
-        // with PAP reconstructon
-        assertEquals( 8, r.numParagraphs() );
-
-        String[] p1_parts = a_page_1.split("\r");
-        String[] p2_parts = a_page_2.split("\r");
-
-        // Check paragraph contents
-        assertEquals(
-                p1_parts[0] + "\r",
-                r.getParagraph(0).text()
-        );
-        assertEquals(
-                p1_parts[1] + "\r",
-                r.getParagraph(1).text()
-        );
-        assertEquals(
-                p1_parts[2] + "\r",
-                r.getParagraph(2).text()
-        );
-
-        // no PAPX reconstruction
-        // assertEquals( page_break + "\r", r.getParagraph( 3 ).text() );
-        // assertEquals( p2_parts[0] + "\r", r.getParagraph( 4 ).text() );
-        // assertEquals( p2_parts[1] + "\r", r.getParagraph( 5 ).text() );
-        // assertEquals( p2_parts[2] + "\r", r.getParagraph( 6 ).text() );
-
-        // with PAPX reconstruction
-        assertEquals( "" + page_break, r.getParagraph( 3 ).text() );
-        assertEquals( "\r", r.getParagraph( 4 ).text() );
-        assertEquals( p2_parts[0] + "\r", r.getParagraph( 5 ).text() );
-        assertEquals( p2_parts[1] + "\r", r.getParagraph( 6 ).text() );
-        assertEquals( p2_parts[2] + "\r", r.getParagraph( 7 ).text() );
-    }
-
-    public void testAsciiStyling() {
-        Range r = a.getRange();
-
-        Paragraph p1 = r.getParagraph(0);
-        Paragraph p7 = r.getParagraph(6);
-
-        assertEquals(1, p1.numCharacterRuns());
-        assertEquals(1, p7.numCharacterRuns());
-
-        CharacterRun c1 = p1.getCharacterRun(0);
-        CharacterRun c7 = p7.getCharacterRun(0);
-
-        assertEquals("Times New Roman", c1.getFontName()); // No Calibri
-        assertEquals("Arial Black", c7.getFontName());
-        assertEquals(22, c1.getFontSize());
-        assertEquals(32, c7.getFontSize());
-
-        // This document has 15 styles
-        assertEquals(15, a.getStyleSheet().numStyles());
-
-        // Ensure none of the paragraphs refer to one that isn't there,
-        //  and none of their character runs either
-        // Also check all use the default style
-        StyleSheet ss = a.getStyleSheet();
-        for(int i=0; i<a.getRange().numParagraphs(); i++) {
-            Paragraph p = a.getRange().getParagraph(i);
-            int styleIndex = p.getStyleIndex();
-            assertTrue(styleIndex < 15);
-            assertEquals("Normal", ss.getStyleDescription(styleIndex).getName());
-        }
-        for(int i=0; i<a.getRange().numCharacterRuns(); i++) {
-            CharacterRun c = a.getRange().getCharacterRun(i);
-            int styleIndex = c.getStyleIndex();
-            assertTrue(styleIndex < 15);
-            assertEquals("Normal", ss.getStyleDescription(styleIndex).getName());
-        }
-    }
-
-    /**
-     * Tests the raw definitions of the paragraphs of
-     *  a unicode document
-     */
-    public void testUnicodeParagraphDefinitions() {
-        Range r = u.getRange();
-        String[] p1_parts = u_page_1.split("\r");
-        String[] p2_parts = u_page_2.split("\r");
-
-        assertEquals(
-                u_page_1 + page_break + "\r" + u_page_2,
-                r.text()
-        );
-        assertEquals(
-                408, r.text().length()
-        );
-
-
-        assertEquals(1, r.numSections());
-        assertEquals(1, u.getSectionTable().getSections().size());
-        Section s = r.getSection(0);
-        assertEquals(
-                u_page_1 +
-                page_break + "\r" +
-                u_page_2,
-                s.text()
-        );
-        assertEquals(0, s.getStartOffset());
-        assertEquals(408, s.getEndOffset());
-
-
-        List<PAPX> pDefs = r._paragraphs;
-        // no PAPX reconstruction
-        // assertEquals(36, pDefs.size());
-        // with PAPX reconstruction
-        assertEquals( 36, pDefs.size() );
-
-        // Check that the last paragraph ends where it should do
-        assertEquals(531, u.getOverallRange().text().length());
-        PAPX pLast = pDefs.get(34);
-        // assertEquals(530, pLast.getEnd());
-
-        // Only care about the first few really though
-        PAPX p0 = pDefs.get(0);
-        PAPX p1 = pDefs.get(1);
-        PAPX p2 = pDefs.get(2);
-        PAPX p3 = pDefs.get(3);
-        PAPX p4 = pDefs.get(4);
-
-        // 5 paragraphs should get us to the end of our text
-        assertTrue(p0.getStart() < 408);
-        assertTrue(p0.getEnd() < 408);
-        assertTrue(p1.getStart() < 408);
-        assertTrue(p1.getEnd() < 408);
-        assertTrue(p2.getStart() < 408);
-        assertTrue(p2.getEnd() < 408);
-        assertTrue(p3.getStart() < 408);
-        assertTrue(p3.getEnd() < 408);
-        assertTrue(p4.getStart() < 408);
-        assertTrue(p4.getEnd() < 408);
-
-        // Paragraphs should match with lines
-        assertEquals(
-                0,
-                p0.getStart()
-        );
-        assertEquals(
-                p1_parts[0].length() + 1,
-                p0.getEnd()
-        );
-
-        assertEquals(
-                p1_parts[0].length() + 1,
-                p1.getStart()
-        );
-        assertEquals(
-                p1_parts[0].length() + 1 +
-                p1_parts[1].length() + 1,
-                p1.getEnd()
-        );
-
-        assertEquals(
-                p1_parts[0].length() + 1 +
-                p1_parts[1].length() + 1,
-                p2.getStart()
-        );
-        assertEquals(
-                p1_parts[0].length() + 1 +
-                p1_parts[1].length() + 1 +
-                p1_parts[2].length() + 1,
-                p2.getEnd()
-        );
-	}
-
-    /**
-     * Tests the paragraph text of a unicode document
-     */
-    public void testUnicodeTextParagraphs() {
-        Range r = u.getRange();
-        assertEquals(
-                u_page_1 +
-                page_break + "\r" +
-                u_page_2,
-                r.text()
-        );
-
-        // without PAPX reconstruction
-        // assertEquals( 12, r.numParagraphs() );
-        // with PAPX reconstruction
-        assertEquals( 13, r.numParagraphs() );
-        String[] p1_parts = u_page_1.split("\r");
-        String[] p2_parts = u_page_2.split("\r");
-
-        // Check text all matches up properly
-        assertEquals(p1_parts[0] + "\r", r.getParagraph(0).text());
-        assertEquals(p1_parts[1] + "\r", r.getParagraph(1).text());
-        assertEquals(p1_parts[2] + "\r", r.getParagraph(2).text());
-        assertEquals(p1_parts[3] + "\r", r.getParagraph(3).text());
-        assertEquals(p1_parts[4] + "\r", r.getParagraph(4).text());
-        assertEquals(p1_parts[5] + "\r", r.getParagraph(5).text());
-        assertEquals(p1_parts[6] + "\r", r.getParagraph(6).text());
-        assertEquals(p1_parts[7] + "\r", r.getParagraph(7).text());
-        assertEquals(p1_parts[8] + "\r", r.getParagraph(8).text());
-        assertEquals(p1_parts[9] + "\r", r.getParagraph(9).text());
-        // without PAPX reconstruction
-        // assertEquals(page_break + "\r", r.getParagraph(10).text());
-        // assertEquals(p2_parts[0] + "\r", r.getParagraph(11).text());
-        // with PAPX reconstruction
-        assertEquals( page_break + "", r.getParagraph( 10 ).text() );
-        assertEquals( "\r", r.getParagraph( 11 ).text() );
-        assertEquals( p2_parts[0] + "\r", r.getParagraph( 12 ).text() );
-    }
-    public void testUnicodeStyling() {
-        Range r = u.getRange();
-        String[] p1_parts = u_page_1.split("\r");
-
-        Paragraph p1 = r.getParagraph(0);
-        Paragraph p7 = r.getParagraph(6);
-        StyleSheet ss = r._doc.getStyleSheet();
-
-        // Line ending in its own run each time!
-        assertEquals(2, p1.numCharacterRuns());
-        assertEquals(2, p7.numCharacterRuns());
-
-        CharacterRun c1a = p1.getCharacterRun(0);
-        CharacterRun c1b = p1.getCharacterRun(1);
-        CharacterRun c7a = p7.getCharacterRun(0);
-        CharacterRun c7b = p7.getCharacterRun(1);
-
-        assertEquals("Times New Roman", c1a.getFontName()); // No Calibri
-        assertEquals(22, c1a.getFontSize());
-
-        assertEquals("Times New Roman", c1b.getFontName()); // No Calibri
-        assertEquals(22, c1b.getFontSize());
-
-        assertEquals("Times New Roman", c7a.getFontName());
-        assertEquals(48, c7a.getFontSize());
-
-        assertEquals("Times New Roman", c7b.getFontName());
-        assertEquals(48, c7b.getFontSize());
-
-        // All use the default base style
-        assertEquals("Normal", ss.getStyleDescription(c1a.getStyleIndex()).getName());
-        assertEquals("Normal", ss.getStyleDescription(c1b.getStyleIndex()).getName());
-        assertEquals("Heading 1", ss.getStyleDescription(c7a.getStyleIndex()).getName());
-        assertEquals("Heading 1", ss.getStyleDescription(c7b.getStyleIndex()).getName());
-
-        // Now check where they crop up
-        assertEquals(
-                0,
-                c1a.getStartOffset()
-        );
-        assertEquals(
-                p1_parts[0].length(),
-                c1a.getEndOffset()
-        );
-
-        assertEquals(
-                p1_parts[0].length(),
-                c1b.getStartOffset()
-        );
-        assertEquals(
-                p1_parts[0].length()+1,
-                c1b.getEndOffset()
-        );
-
-        assertEquals(
-                p1_parts[0].length() + 1 +
-                p1_parts[1].length() + 1 +
-                p1_parts[2].length() + 1 +
-                p1_parts[3].length() + 1 +
-                p1_parts[4].length() + 1 +
-                p1_parts[5].length() + 1,
-                c7a.getStartOffset()
-        );
-        assertEquals(
-                p1_parts[0].length() + 1 +
-                p1_parts[1].length() + 1 +
-                p1_parts[2].length() + 1 +
-                p1_parts[3].length() + 1 +
-                p1_parts[4].length() + 1 +
-                p1_parts[5].length() + 1 +
-                1,
-                c7a.getEndOffset()
-        );
-
-        assertEquals(
-                p1_parts[0].length() + 1 +
-                p1_parts[1].length() + 1 +
-                p1_parts[2].length() + 1 +
-                p1_parts[3].length() + 1 +
-                p1_parts[4].length() + 1 +
-                p1_parts[5].length() + 1 +
-                1,
-                c7b.getStartOffset()
-        );
-        assertEquals(
-                p1_parts[0].length() + 1 +
-                p1_parts[1].length() + 1 +
-                p1_parts[2].length() + 1 +
-                p1_parts[3].length() + 1 +
-                p1_parts[4].length() + 1 +
-                p1_parts[5].length() + 1 +
-                p1_parts[6].length() + 1,
-                c7b.getEndOffset()
-        );
-
-        // This document also has 22 styles
-        assertEquals(22, ss.numStyles());
-
-        // Ensure none of the paragraphs refer to one that isn't there,
-        //  and none of their character runs either
-        for(int i=0; i<r.numParagraphs(); i++) {
-            Paragraph p = r.getParagraph(i);
-            int styleIndex = p.getStyleIndex();
-            assertTrue(styleIndex < 22);
-            assertNotNull(ss.getStyleDescription(styleIndex).getName());
-        }
-        for(int i=0; i<r.numCharacterRuns(); i++) {
-            CharacterRun c = r.getCharacterRun(i);
-            int styleIndex = c.getStyleIndex();
-            assertTrue(styleIndex < 22);
-            assertNotNull(ss.getStyleDescription(styleIndex).getName());
-        }
-    }
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
deleted file mode 100644
index 370c4f3..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- *	Test to see if Range.replaceText() works even if the Range contains a
- *	CharacterRun that uses Unicode characters.
- *
- * TODO - re-enable me when unicode paragraph stuff is fixed!
- */
-public final class TestRangeReplacement extends TestCase {
-
-	// u201c and u201d are "smart-quotes"
-	private final String originalText =
-		"It is used to confirm that text replacement works even if Unicode characters (such as \u201c\u2014\u201d (U+2014), \u201c\u2e8e\u201d (U+2E8E), or \u201c\u2714\u201d (U+2714)) are present.  Everybody should be thankful to the ${organization} and all the POI contributors for their assistance in this matter.\r";
-	private final String searchText = "${organization}";
-	private final String replacementText = "Apache Software Foundation";
-	private final String expectedText2 =
-		"It is used to confirm that text replacement works even if Unicode characters (such as \u201c\u2014\u201d (U+2014), \u201c\u2e8e\u201d (U+2E8E), or \u201c\u2714\u201d (U+2714)) are present.  Everybody should be thankful to the Apache Software Foundation and all the POI contributors for their assistance in this matter.\r";
-	private final String expectedText3 = "Thank you, Apache Software Foundation!\r";
-
-	private final String illustrativeDocFile = "testRangeReplacement.doc";
-
-	/**
-	 * Test just opening the files
-	 */
-	public void testOpen() {
-
-		HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-	}
-
-	/**
-	 * Test (more "confirm" than test) that we have the general structure that we expect to have.
-	 */
-	public void testDocStructure() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-
-		Range range = daDoc.getRange();
-		assertEquals(414, range.text().length());
-
-		assertEquals(1, range.numSections());
-		Section section = range.getSection(0);
-		assertEquals(414, section.text().length());
-
-		assertEquals(5, section.numParagraphs());
-		Paragraph para = section.getParagraph(2);
-
-		assertEquals(5, para.numCharacterRuns());
-		String text =
-			para.getCharacterRun(0).text() +
-			para.getCharacterRun(1).text() +
-			para.getCharacterRun(2).text() +
-			para.getCharacterRun(3).text() +
-			para.getCharacterRun(4).text()
-		;
-
-		assertEquals(originalText, text);
-	}
-
-	/**
-	 * Test that we can replace text in our Range with Unicode text.
-	 */
-	public void testRangeReplacementOne() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-
-		// Has one section
-		Range range = daDoc.getRange();
-		assertEquals(1, range.numSections());
-
-		// The first section has 5 paragraphs
-		Section section = range.getSection(0);
-		assertEquals(5, section.numParagraphs());
-
-		
-		// Change some text
-		Paragraph para = section.getParagraph(2);
-
-		String text = para.text();
-		assertEquals(originalText, text);
-
-		int offset = text.indexOf(searchText);
-		assertEquals(181, offset);
-
-		para.replaceText(searchText, replacementText, offset);
-
-		// Ensure we still have one section, 5 paragraphs
-		assertEquals(1, range.numSections());
-		section = range.getSection(0);
-
-		assertEquals(5, section.numParagraphs());
-		para = section.getParagraph(2);
-
-		// Ensure the text is what we should now have
-		text = para.text();
-		assertEquals(expectedText2, text);
-	}
-
-	/**
-	 * Test that we can replace text in our Range with Unicode text.
-	 */
-	public void testRangeReplacementAll() {
-
-		HWPFDocument daDoc = HWPFTestDataSamples.openSampleFile(illustrativeDocFile);
-
-		Range range = daDoc.getRange();
-		assertEquals(1, range.numSections());
-
-		Section section = range.getSection(0);
-		assertEquals(5, section.numParagraphs());
-
-		Paragraph para = section.getParagraph(2);
-
-		String text = para.text();
-		assertEquals(originalText, text);
-
-		range.replaceText(searchText, replacementText);
-
-		assertEquals(1, range.numSections());
-		section = range.getSection(0);
-		assertEquals(5, section.numParagraphs());
-
-		para = section.getParagraph(2);
-		text = para.text();
-		assertEquals(expectedText2, text);
-
-		para = section.getParagraph(3);
-		text = para.text();
-		assertEquals(expectedText3, text);
-	}
-}
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
deleted file mode 100644
index bc1d997..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hwpf.usermodel;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
-
-/**
- * API for processing of symbols, see Bugzilla 49908
- */
-public final class TestRangeSymbols extends TestCase {
-
-    public void test() throws IOException {
-        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug49908.doc");
-
-        Range range = doc.getRange();
-
-        assertTrue(range.numCharacterRuns() >= 2);
-        CharacterRun chr = range.getCharacterRun(0);
-        assertEquals(false, chr.isSymbol());
-
-        chr = range.getCharacterRun(1);
-        assertEquals(true, chr.isSymbol());
-        assertEquals("\u0028", chr.text());
-        assertEquals("Wingdings", chr.getSymbolFont().getMainFontName());
-        assertEquals(0xf028, chr.getSymbolCharacter());
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java b/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
deleted file mode 100644
index e08aea4..0000000
--- a/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hwpf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hwpf.HWPFDocument;
-
-public class TestTableRow extends TestCase
-{
-    public void testInnerTableCellsDetection() throws Exception
-    {
-        HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples
-                .getDocumentInstance().openResourceAsStream( "innertable.doc" ) );
-        hwpfDocument.getRange();
-
-        Range documentRange = hwpfDocument.getRange();
-        Paragraph startOfInnerTable = documentRange.getParagraph( 6 );
-
-        Table innerTable = documentRange.getTable( startOfInnerTable );
-        assertEquals( 2, innerTable.numRows() );
-
-        TableRow tableRow = innerTable.getRow( 0 );
-        assertEquals( 2, tableRow.numCells() );
-    }
-
-    public void testOuterTableCellsDetection() throws Exception
-    {
-        HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples
-                .getDocumentInstance().openResourceAsStream( "innertable.doc" ) );
-        hwpfDocument.getRange();
-
-        Range documentRange = hwpfDocument.getRange();
-        Paragraph startOfOuterTable = documentRange.getParagraph( 0 );
-
-        Table outerTable = documentRange.getTable( startOfOuterTable );
-        assertEquals( 3, outerTable.numRows() );
-
-        assertEquals( 3, outerTable.getRow( 0 ).numCells() );
-        assertEquals( 3, outerTable.getRow( 1 ).numCells() );
-        assertEquals( 3, outerTable.getRow( 2 ).numCells() );
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/AllPOITests.java b/trunk/src/testcases/org/apache/poi/AllPOITests.java
deleted file mode 100644
index 0fba8f8..0000000
--- a/trunk/src/testcases/org/apache/poi/AllPOITests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import org.apache.poi.ddf.AllPOIDDFTests;
-import org.apache.poi.hpsf.basic.AllPOIHPSFBasicTests;
-import org.apache.poi.hssf.HSSFTests;
-import org.apache.poi.poifs.AllPOIFSTests;
-import org.apache.poi.util.AllPOIUtilTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-/**
- * Root Test Suite for entire POI project.  (Includes all sub-packages of org.apache.poi)<br/>
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestPOIDocumentMain.class,
-    AllPOIDDFTests.class,
-    AllPOIHPSFBasicTests.class,
-    HSSFTests.class,
-    AllPOIFSTests.class,
-    AllPOIUtilTests.class
-})
-public final class AllPOITests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/POIDataSamples.java b/trunk/src/testcases/org/apache/poi/POIDataSamples.java
deleted file mode 100644
index fbaa36b..0000000
--- a/trunk/src/testcases/org/apache/poi/POIDataSamples.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Centralises logic for finding/opening sample files
- */
-public final class POIDataSamples {
-
-    /**
-     * Name of the system property that defined path to the test data.
-     */
-    public static final String TEST_PROPERTY = "POI.testdata.path";
-
-    private static POIDataSamples _instSlideshow;
-    private static POIDataSamples _instSpreadsheet;
-    private static POIDataSamples _instDocument;
-    private static POIDataSamples _instDiagram;
-    private static POIDataSamples _instOpenxml4j;
-    private static POIDataSamples _instPOIFS;
-    private static POIDataSamples _instDDF;
-    private static POIDataSamples _instHMEF;
-    private static POIDataSamples _instHPSF;
-    private static POIDataSamples _instHPBF;
-    private static POIDataSamples _instHSMF;
-    private static POIDataSamples _instXmlDSign;
-
-    private File _resolvedDataDir;
-    /** <code>true</code> if standard system propery is not set,
-     * but the data is available on the test runtime classpath */
-    private boolean _sampleDataIsAvaliableOnClassPath;
-    private final String _moduleDir;
-
-    /**
-     *
-     * @param moduleDir   the name of the directory containing the test files
-     */
-    private POIDataSamples(String moduleDir){
-        _moduleDir = moduleDir;
-        initialise();
-    }
-
-    public static POIDataSamples getSpreadSheetInstance(){
-        if(_instSpreadsheet == null) _instSpreadsheet = new POIDataSamples("spreadsheet");
-        return _instSpreadsheet;
-    }
-
-    public static POIDataSamples getDocumentInstance(){
-        if(_instDocument == null) _instDocument = new POIDataSamples("document");
-        return _instDocument;
-    }
-
-    public static POIDataSamples getSlideShowInstance(){
-        if(_instSlideshow == null) _instSlideshow = new POIDataSamples("slideshow");
-        return _instSlideshow;
-    }
-
-    public static POIDataSamples getDiagramInstance(){
-        if(_instOpenxml4j == null) _instOpenxml4j = new POIDataSamples("diagram");
-        return _instOpenxml4j;
-    }
-
-    public static POIDataSamples getOpenXML4JInstance(){
-        if(_instDiagram == null) _instDiagram = new POIDataSamples("openxml4j");
-        return _instDiagram;
-    }
-
-    public static POIDataSamples getPOIFSInstance(){
-        if(_instPOIFS == null) _instPOIFS = new POIDataSamples("poifs");
-        return _instPOIFS;
-    }
-
-    public static POIDataSamples getDDFInstance(){
-        if(_instDDF == null) _instDDF = new POIDataSamples("ddf");
-        return _instDDF;
-    }
-
-    public static POIDataSamples getHPSFInstance(){
-        if(_instHPSF == null) _instHPSF = new POIDataSamples("hpsf");
-        return _instHPSF;
-    }
-
-    public static POIDataSamples getPublisherInstance(){
-        if(_instHPBF == null) _instHPBF = new POIDataSamples("publisher");
-        return _instHPBF;
-    }
-
-    public static POIDataSamples getHMEFInstance(){
-        if(_instHMEF == null) _instHMEF = new POIDataSamples("hmef");
-        return _instHMEF;
-    }
-
-    public static POIDataSamples getHSMFInstance(){
-        if(_instHSMF == null) _instHSMF = new POIDataSamples("hsmf");
-        return _instHSMF;
-    }
-
-    public static POIDataSamples getXmlDSignInstance(){
-        if(_instXmlDSign == null) _instXmlDSign = new POIDataSamples("xmldsign");
-        return _instXmlDSign;
-    }
-    
-    /**
-     * Opens a sample file from the test data directory
-     *
-     * @param  sampleFileName the file to open
-     * @return an open <tt>InputStream</tt> for the specified sample file
-     */
-    public InputStream openResourceAsStream(String sampleFileName) {
-
-        if (_sampleDataIsAvaliableOnClassPath) {
-            InputStream result = sampleFileName == null ? null :
-                    openClasspathResource(sampleFileName);
-            if(result == null) {
-                throw new RuntimeException("specified test sample file '" + sampleFileName
-                        + "' not found on the classpath");
-            }
-            // wrap to avoid temp warning method about auto-closing input stream
-            return new NonSeekableInputStream(result);
-        }
-        if (_resolvedDataDir == null) {
-            throw new RuntimeException("Must set system property '"
-                    + TEST_PROPERTY
-                    + "' properly before running tests");
-        }
-
-        File f = getFile(sampleFileName);
-        try {
-            return new FileInputStream(f);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     *
-     * @param sampleFileName    the name of the test file
-     * @return
-     * @throws RuntimeException if the file was not found
-     */
-    public File getFile(String sampleFileName) {
-        File f = new File(_resolvedDataDir, sampleFileName);
-        if (!f.exists()) {
-            throw new RuntimeException("Sample file '" + sampleFileName
-                    + "' not found in data dir '" + _resolvedDataDir.getAbsolutePath() + "'");
-        }
-        try {
-            if(sampleFileName.length() > 0) {
-               String fn = sampleFileName;
-               if(fn.indexOf('/') > 0) {
-                  fn = fn.substring(fn.indexOf('/')+1);
-               }
-               if(!fn.equals(f.getCanonicalFile().getName())){
-                   throw new RuntimeException("File name is case-sensitive: requested '" + fn
-                        + "' but actual file is '" + f.getCanonicalFile().getName() + "'");
-               }
-            }
-        } catch (IOException e){
-            throw new RuntimeException(e);
-        }
-        return f;
-    }
-
-    private void initialise() {
-        String dataDirName = System.getProperty(TEST_PROPERTY);
-        if (dataDirName == null) {
-            // check to see if we can just get the resources from the classpath
-            InputStream is = openClasspathResource("");
-            if (is != null) {
-                try {
-                    is.close(); // be nice
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-                _sampleDataIsAvaliableOnClassPath = true;
-                return;
-            }
-
-            if(new File("test-data").exists()) {
-               dataDirName = "test-data";
-            } else {
-               throw new RuntimeException("Must set system property '" +
-                       TEST_PROPERTY + "' before running tests");
-            }
-        }
-        File dataDir = new File(dataDirName, _moduleDir);
-        if (!dataDir.exists()) {
-            throw new RuntimeException("Data dir '" + _moduleDir + " does not exist");
-        }
-        // convert to canonical file, to make any subsequent error messages
-        // clearer.
-        try {
-            _resolvedDataDir = dataDir.getCanonicalFile();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Opens a test sample file from the 'data' sub-package of this class's package.
-     *
-     * @param  sampleFileName the file to open
-     * @return <code>null</code> if the sample file is not deployed on the classpath.
-     */
-    private InputStream openClasspathResource(String sampleFileName) {
-        return getClass().getResourceAsStream("/" + _moduleDir + "/" + sampleFileName);
-    }
-
-    private static final class NonSeekableInputStream extends InputStream {
-
-        private final InputStream _is;
-
-        public NonSeekableInputStream(InputStream is) {
-            _is = is;
-        }
-
-        @Override
-        public int read() throws IOException {
-            return _is.read();
-        }
-        @Override
-        public int read(byte[] b, int off, int len) throws IOException {
-            return _is.read(b, off, len);
-        }
-        @Override
-        public boolean markSupported() {
-            return false;
-        }
-        @Override
-        public void close() throws IOException {
-            _is.close();
-        }
-    }
-
-    /**
-     * @param  fileName the file to open
-     * @return byte array of sample file content from file found in standard test-data directory
-     */
-    public byte[] readFile(String fileName) {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-        try {
-            InputStream fis = openResourceAsStream(fileName);
-
-            byte[] buf = new byte[512];
-            while (true) {
-                int bytesRead = fis.read(buf);
-                if (bytesRead < 1) {
-                    break;
-                }
-                bos.write(buf, 0, bytesRead);
-            }
-            fis.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return bos.toByteArray();
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/POITestCase.java b/trunk/src/testcases/org/apache/poi/POITestCase.java
deleted file mode 100644
index a8cc8e1..0000000
--- a/trunk/src/testcases/org/apache/poi/POITestCase.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.util.SuppressForbidden;
-import org.apache.poi.util.Internal;
-
-/**
- * Util class for POI JUnit TestCases, which provide additional features 
- */
-@Internal
-public final class POITestCase {
-    public static void assertContains(String haystack, String needle) {
-        assertNotNull(haystack);
-        assertTrue(
-              "Unable to find expected text '" + needle + "' in text:\n" + haystack,
-              haystack.contains(needle)
-        );
-    }
-
-    public static void assertContainsIgnoreCase(String haystack, String needle, Locale locale) {
-        assertNotNull(haystack);
-        assertNotNull(needle);
-        String hay = haystack.toLowerCase(locale);
-        String n = needle.toLowerCase(locale);
-        assertTrue("Unable to find expected text '" + needle + "' in text:\n" + haystack,
-                hay.contains(n)
-        );
-    }
-    public static void assertContainsIgnoreCase(String haystack, String needle) {
-        assertContainsIgnoreCase(haystack, needle, Locale.ROOT);
-    }
-    
-    public static void assertNotContained(String haystack, String needle) {
-        assertNotNull(haystack);
-        assertFalse(
-              "Unexpectedly found text '" + needle + "' in text:\n" + haystack,
-              haystack.contains(needle)
-        );
-    }
-    
-    /**
-     * @param map haystack
-     * @param key needle
-     */
-    public static  <T> void assertContains(Map<T, ?> map, T key) {
-        if (map.containsKey(key)) {
-            return;
-        }
-        fail("Unable to find " + key + " in " + map);
-    }
-     
-    /**
-     * Utility method to get the value of a private/protected field.
-     * Only use this method in test cases!!!
-     */
-    public static <R,T> R getFieldValue(final Class<? super T> clazz, final T instance, final Class<R> fieldType, final String fieldName) {
-        assertTrue("Reflection of private fields is only allowed for POI classes.", clazz.getName().startsWith("org.apache.poi."));
-        try {
-            return AccessController.doPrivileged(new PrivilegedExceptionAction<R>() {
-                @Override
-                @SuppressWarnings("unchecked")
-                @SuppressForbidden("For test usage only")
-                public R run() throws Exception {
-                    Field f = clazz.getDeclaredField(fieldName);
-                    f.setAccessible(true);
-                    return (R) f.get(instance);
-                }
-            });
-        } catch (PrivilegedActionException pae) {
-            throw new RuntimeException("Cannot access field '" + fieldName + "' of class " + clazz, pae.getException());
-        }
-    }
-     
-    /**
-     * Utility method to call a private/protected method.
-     * Only use this method in test cases!!!
-     */
-    public static <R,T> R callMethod(final Class<? super T> clazz, final T instance, final Class<R> returnType, final String methodName,
-        final Class<?>[] parameterTypes, final Object[] parameters) {
-        assertTrue("Reflection of private methods is only allowed for POI classes.", clazz.getName().startsWith("org.apache.poi."));
-        try {
-            return AccessController.doPrivileged(new PrivilegedExceptionAction<R>() {
-                @Override
-                @SuppressWarnings("unchecked")
-                @SuppressForbidden("For test usage only")
-                public R run() throws Exception {
-                    Method m = clazz.getDeclaredMethod(methodName, parameterTypes);
-                    m.setAccessible(true);
-                    return (R) m.invoke(instance, parameters);
-                }
-            });
-        } catch (PrivilegedActionException pae) {
-            throw new RuntimeException("Cannot access method '" + methodName + "' of class " + clazz, pae.getException());
-        }
-    }
-
-    /**
-     * Utility method to shallow compare all fields of the objects
-     * Only use this method in test cases!!!
-     */
-    public static void assertReflectEquals(final Object expected, Object actual) throws Exception {
-        final List<Field> fields;
-        try {
-            fields = AccessController.doPrivileged(new PrivilegedExceptionAction<List<Field>>() {
-                @Override
-                @SuppressForbidden("Test only")
-                public List<Field> run() throws Exception {
-                    List<Field> flds = new ArrayList<Field>();
-                    for (Class<?> c = expected.getClass(); c != null; c = c.getSuperclass()) {
-                        Field[] fs = c.getDeclaredFields();
-                        AccessibleObject.setAccessible(fs, true);                        
-                        for (Field f : fs) {
-                            // JaCoCo Code Coverage adds it's own field, don't look at this one here
-                            if(f.getName().equals("$jacocoData")) {
-                                continue;
-                            }
-                            
-                            flds.add(f);
-                        }
-                    }
-                    return flds;
-                }
-            });
-        } catch (PrivilegedActionException pae) {
-            throw pae.getException();
-        }
-        
-        for (Field f : fields) {
-            Class<?> t = f.getType();
-            if (t.isArray()) {
-                if (Object[].class.isAssignableFrom(t)) {
-                    assertArrayEquals((Object[])f.get(expected), (Object[])f.get(actual));
-                } else if (byte[].class.isAssignableFrom(t)) {
-                    assertArrayEquals((byte[])f.get(expected), (byte[])f.get(actual));
-                } else {
-                    fail("Array type is not yet implemented ... add it!");
-                }
-            } else {
-                assertEquals(f.get(expected), f.get(actual));
-            }
-        }
-    }
-    
-    /**
-     * Rather than adding {@literal @}Ignore to known-failing tests,
-     * write the test so that it notifies us if it starts passing.
-     * This is useful for closing related or forgotten bugs.
-     * 
-     * An Example:
-     * <code><pre>
-     * public static int add(int a, int b) {
-     *     // a known bug in behavior that has not been fixed yet
-     *     raise UnsupportedOperationException("add");
-     * }
-     * 
-     * {@literal @}Test
-     * public void knownFailingUnitTest() {
-     *     try {
-     *         assertEquals(2, add(1,1));
-     *         // this test fails because the assumption that this bug had not been fixed is false
-     *         testPassesNow(12345);
-     *     } catch (UnsupportedOperationException e) {
-     *         // test is skipped because the assumption that this bug had not been fixed is true
-     *         skipTest(e);
-     *     }
-     * }
-     * 
-     * Once passing, this unit test can be rewritten as:
-     * {@literal @}Test
-     * public void knownPassingUnitTest() {
-     *     assertEquals(2, add(1,1));
-     * }
-     * 
-     * If you have a better idea how to simplify test code while still notifying
-     * us when a previous known-failing test now passes, please improve these.
-     * As a bonus, a known-failing test that fails should not be counted as a
-     * passing test.
-     * 
-     * One possible alternative is to expect the known exception, but without
-     * a clear message that it is a good thing to no longer get the expected
-     * exception once the test passes.
-     * {@literal @}Test(expected=UnsupportedOperationException.class)
-     * public void knownFailingUnitTest() {
-     *     assertEquals(2, add(1,1));
-     * }
-     *
-     * @param e  the exception that was caught that will no longer
-     * be raised when the bug is fixed 
-     */
-    public static void skipTest(Throwable e) {
-        assumeTrue("This test currently fails with " + e, false);
-    }
-    /**
-     * @see #skipTest(Throwable)
-     *
-     * @param bug  the bug number corresponding to a known bug in bugzilla
-     */
-    public static void testPassesNow(int bug) {
-        fail("This test passes now. Please update the unit test and bug " + bug + ".");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java b/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
deleted file mode 100644
index 7483d59..0000000
--- a/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that POIDocument correctly loads and saves the common
- *  (hspf) Document Properties.
- *
- * This is part 1 of 2 of the tests - it only does the POIDocuments
- *  which are part of the Main (not scratchpad)
- */
-public final class TestPOIDocumentMain {
-    // The POI Documents to work on
-    private POIDocument doc;
-    private POIDocument doc2;
-
-    /**
-     * Set things up, two spreadsheets for our testing
-     */
-    @Before
-    public void setUp() {
-        doc = HSSFTestDataSamples.openSampleWorkbook("DateFormats.xls");
-        doc2 = HSSFTestDataSamples.openSampleWorkbook("StringFormulas.xls");
-    }
-
-    @Test
-    public void readProperties() {
-        // We should have both sets
-        assertNotNull(doc.getDocumentSummaryInformation());
-        assertNotNull(doc.getSummaryInformation());
-
-        // Check they are as expected for the test doc
-        assertEquals("Administrator", doc.getSummaryInformation().getAuthor());
-        assertEquals(0, doc.getDocumentSummaryInformation().getByteCount());
-    }
-
-    @Test
-    public void readProperties2() {
-        // Check again on the word one
-        assertNotNull(doc2.getDocumentSummaryInformation());
-        assertNotNull(doc2.getSummaryInformation());
-
-        assertEquals("Avik Sengupta", doc2.getSummaryInformation().getAuthor());
-        assertEquals(null, doc2.getSummaryInformation().getKeywords());
-        assertEquals(0, doc2.getDocumentSummaryInformation().getByteCount());
-    }
-
-    @Test
-    public void writeProperties() throws Exception {
-        // Just check we can write them back out into a filesystem
-        NPOIFSFileSystem outFS = new NPOIFSFileSystem();
-        doc.readProperties();
-        doc.writeProperties(outFS);
-
-        // Should now hold them
-        assertNotNull(
-                outFS.createDocumentInputStream("\005SummaryInformation")
-        );
-        assertNotNull(
-                outFS.createDocumentInputStream("\005DocumentSummaryInformation")
-        );
-    }
-
-    @Test
-    public void WriteReadProperties() throws Exception {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-        // Write them out
-        NPOIFSFileSystem outFS = new NPOIFSFileSystem();
-        doc.readProperties();
-        doc.writeProperties(outFS);
-        outFS.writeFilesystem(baos);
-
-        // Create a new version
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        OPOIFSFileSystem inFS = new OPOIFSFileSystem(bais);
-
-        // Check they're still there
-        doc.directory = inFS.getRoot();
-        doc.readProperties();
-
-        // Delegate test
-        readProperties();
-    }
-
-    @Test
-    public void createNewProperties() throws IOException {
-        POIDocument doc = new HSSFWorkbook();
-
-        // New document won't have them
-        assertNull(doc.getSummaryInformation());
-        assertNull(doc.getDocumentSummaryInformation());
-
-        // Add them in
-        doc.createInformationProperties();
-        assertNotNull(doc.getSummaryInformation());
-        assertNotNull(doc.getDocumentSummaryInformation());
-
-        // Write out and back in again, no change
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        doc.write(baos);
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-        ((HSSFWorkbook)doc).close();
-
-        doc = new HSSFWorkbook(bais);
-
-        assertNotNull(doc.getSummaryInformation());
-        assertNotNull(doc.getDocumentSummaryInformation());
-        
-        ((HSSFWorkbook)doc).close();
-    }
-
-    @Test
-    public void createNewPropertiesOnExistingFile() throws IOException {
-        POIDocument doc = new HSSFWorkbook();
-
-        // New document won't have them
-        assertNull(doc.getSummaryInformation());
-        assertNull(doc.getDocumentSummaryInformation());
-
-        // Write out and back in again, no change
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        doc.write(baos);
-        
-        ((HSSFWorkbook)doc).close();
-        
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        doc = new HSSFWorkbook(bais);
-
-        assertNull(doc.getSummaryInformation());
-        assertNull(doc.getDocumentSummaryInformation());
-
-        // Create, and change
-        doc.createInformationProperties();
-        doc.getSummaryInformation().setAuthor("POI Testing");
-        doc.getDocumentSummaryInformation().setCompany("ASF");
-
-        // Save and re-load
-        baos = new ByteArrayOutputStream();
-        doc.write(baos);
-        
-        ((HSSFWorkbook)doc).close();
-
-        bais = new ByteArrayInputStream(baos.toByteArray());
-        doc = new HSSFWorkbook(bais);
-
-        // Check
-        assertNotNull(doc.getSummaryInformation());
-        assertNotNull(doc.getDocumentSummaryInformation());
-        assertEquals("POI Testing", doc.getSummaryInformation().getAuthor());
-        assertEquals("ASF", doc.getDocumentSummaryInformation().getCompany());
-
-        // Asking to re-create will make no difference now
-        doc.createInformationProperties();
-        assertNotNull(doc.getSummaryInformation());
-        assertNotNull(doc.getDocumentSummaryInformation());
-        assertEquals("POI Testing", doc.getSummaryInformation().getAuthor());
-        assertEquals("ASF", doc.getDocumentSummaryInformation().getCompany());
-
-        ((HSSFWorkbook)doc).close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/TestPOITestCase.java b/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
deleted file mode 100644
index fd9f3d1..0000000
--- a/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.POITestCase;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * A class for testing the POI Junit TestCase utility class
- */
-public final class TestPOITestCase {
-    @Test
-    public void assertContains() {
-        POITestCase.assertContains("There is a needle in this haystack", "needle");
-        /*try {
-            POITestCase.assertContains("There is gold in this haystack", "needle");
-            fail("found a needle");
-        } catch (final junit.framework.AssertionFailedError e) {
-            // expected
-        }*/
-    }
-
-    @Test
-    public void assertContainsIgnoreCase_Locale() {
-        POITestCase.assertContainsIgnoreCase("There is a Needle in this haystack", "needlE", Locale.ROOT);
-        // FIXME: test failing case
-    }
-
-    @Test
-    public void assertContainsIgnoreCase() {
-        POITestCase.assertContainsIgnoreCase("There is a Needle in this haystack", "needlE");
-        // FIXME: test failing case
-    }
-
-    @Test
-    public void assertNotContained() {
-        POITestCase.assertNotContained("There is a needle in this haystack", "gold");
-        // FIXME: test failing case
-    }
-
-    @Test
-    public void assertMapContains() {
-        Map<String, String> haystack = Collections.singletonMap("needle", "value");
-        POITestCase.assertContains(haystack, "needle");
-        // FIXME: test failing case
-    }
-
-     
-    /**
-     * Utility method to get the value of a private/protected field.
-     * Only use this method in test cases!!!
-     */
-    @Ignore
-    @Test
-    public void getFieldValue() {
-        /*
-        final Class<? super T> clazz;
-        final T instance;
-        final Class<R> fieldType;
-        final String fieldName;
-
-        final R expected;
-        final R actual = POITestCase.getFieldValue(clazz, instance, fieldType, fieldName);
-        assertEquals(expected, actual);
-        */
-    }
-     
-    /**
-     * Utility method to call a private/protected method.
-     * Only use this method in test cases!!!
-     */
-    @Ignore
-    @Test
-    public void callMethod() {
-        /*
-        final Class<? super T> clazz;
-        final T instance;
-        final Class<R> returnType;
-        final String methodName;
-        final Class<?>[] parameterTypes;
-        final Object[] parameters;
-
-        final R expected;
-        final R actual = POITestCase.callMethod(clazz, instance, returnType, methodName, parameterTypes, parameters);
-        assertEquals(expected, actual);
-        */
-    }
-
-    /**
-     * Utility method to shallow compare all fields of the objects
-     * Only use this method in test cases!!!
-     */
-    @Ignore
-    @Test
-    public void assertReflectEquals() throws Exception {
-        /*
-        final Object expected;
-        final Object actual;
-        POITestCase.assertReflectEquals(expected, actual);
-        */
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/AllPOIDDFTests.java b/trunk/src/testcases/org/apache/poi/ddf/AllPOIDDFTests.java
deleted file mode 100644
index 56a436b..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/AllPOIDDFTests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-/**
- * Tests for org.apache.poi.ddf<br/>
- */
-public final class AllPOIDDFTests {
-    public static Test suite() {
-        TestSuite result = new TestSuite("Tests for org.apache.poi.ddf");
-        result.addTestSuite(TestEscherBSERecord.class);
-        result.addTestSuite(TestEscherBlipRecord.class);
-        result.addTestSuite(TestEscherBoolProperty.class);
-        result.addTestSuite(TestEscherChildAnchorRecord.class);
-        result.addTestSuite(TestEscherClientAnchorRecord.class);
-        result.addTestSuite(TestEscherClientDataRecord.class);
-        result.addTestSuite(TestEscherContainerRecord.class);
-        result.addTestSuite(TestEscherDgRecord.class);
-        result.addTestSuite(TestEscherDggRecord.class);
-        result.addTestSuite(TestEscherOptRecord.class);
-        result.addTestSuite(TestEscherPropertyFactory.class);
-        result.addTestSuite(TestEscherSpRecord.class);
-        result.addTestSuite(TestEscherSpgrRecord.class);
-        result.addTestSuite(TestEscherSplitMenuColorsRecord.class);
-        result.addTestSuite(TestUnknownEscherRecord.class);
-        return result;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
deleted file mode 100644
index 6b26799..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestEscherBSERecord extends TestCase {
-    public void testFillFields() {
-        String data = "01 00 00 00 24 00 00 00 05 05 01 02 03 04 " +
-                " 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 00 00 00 " +
-                " 00 00 02 00 00 00 03 00 00 00 04 05 06 07";
-        EscherBSERecord r = new EscherBSERecord();
-        int bytesWritten = r.fillFields( HexRead.readFromString( data ), 0, new DefaultEscherRecordFactory() );
-        assertEquals( 44, bytesWritten );
-        assertEquals( (short) 0x0001, r.getOptions() );
-        assertEquals( EscherBSERecord.BT_JPEG, r.getBlipTypeWin32() );
-        assertEquals( EscherBSERecord.BT_JPEG, r.getBlipTypeMacOS() );
-        assertEquals( "[01, 02, 03, 04, 05, 06, 07, 08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 00]", HexDump.toHex( r.getUid() ) );
-        assertEquals( (short) 1, r.getTag() );
-        assertEquals( 2, r.getRef() );
-        assertEquals( 3, r.getOffset() );
-        assertEquals( (byte) 4, r.getUsage() );
-        assertEquals( (byte) 5, r.getName() );
-        assertEquals( (byte) 6, r.getUnused2() );
-        assertEquals( (byte) 7, r.getUnused3() );
-        assertEquals( 0, r.getRemainingData().length );
-    }
-
-    public void testSerialize() {
-        EscherBSERecord r = createRecord();
-
-        byte[] data = new byte[8 + 36];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 44, bytesWritten );
-        assertEquals( "[01, 00, 00, 00, 24, 00, 00, 00, 05, 05, 01, 02, 03, 04, " +
-                "05, 06, 07, 08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 00, 01, 00, 00, 00, " +
-                "00, 00, 02, 00, 00, 00, 03, 00, 00, 00, 04, 05, 06, 07]",
-                HexDump.toHex(data));
-
-    }
-
-    private EscherBSERecord createRecord() {
-        EscherBSERecord r = new EscherBSERecord();
-        r.setOptions( (short) 0x0001 );
-        r.setBlipTypeWin32( EscherBSERecord.BT_JPEG );
-        r.setBlipTypeMacOS( EscherBSERecord.BT_JPEG );
-        r.setUid( HexRead.readFromString( "01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00" ) );
-        r.setTag( (short) 1 );
-        r.setRef( 2 );
-        r.setOffset( 3 );
-        r.setUsage( (byte) 4 );
-        r.setName( (byte) 5 );
-        r.setUnused2( (byte) 6 );
-        r.setUnused3( (byte) 7 );
-        r.setRemainingData( new byte[0] );
-        return r;
-
-    }
-
-    public void testToString() {
-        EscherBSERecord record = createRecord();
-        String expected = "org.apache.poi.ddf.EscherBSERecord:" + '\n' +
-                "  RecordId: 0xF007" + '\n' +
-                "  Version: 0x0001" + '\n' +
-                "  Instance: 0x0000" + '\n' +
-                "  BlipTypeWin32: 5" + '\n' +
-                "  BlipTypeMacOS: 5" + '\n' +
-                "  SUID: [01, 02, 03, 04, 05, 06, 07, 08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 00]" + '\n' +
-                "  Tag: 1" + '\n' +
-                "  Size: 0" + '\n' +
-                "  Ref: 2" + '\n' +
-                "  Offset: 3" + '\n' +
-                "  Usage: 4" + '\n' +
-                "  Name: 5" + '\n' +
-                "  Unused2: 6" + '\n' +
-                "  Unused3: 7" + '\n' +
-                "  blipRecord: null" + '\n' +
-                "  Extra Data:" + '\n' +
-                ": 0";
-        String actual = record.toString();
-        assertEquals( expected, actual );
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
deleted file mode 100644
index 899af6e..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-
-/**
- * Test read/serialize of escher blip records
- *
- * @author Yegor Kozlov
- */
-public final class TestEscherBlipRecord extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getDDFInstance();
-
-    //test reading/serializing of a PNG blip
-    public void testReadPNG() {
-        //provided in bug-44886
-        byte[] data = _samples.readFile("Container.dat");
-
-        EscherContainerRecord record = new EscherContainerRecord();
-        record.fillFields(data, 0, new DefaultEscherRecordFactory());
-        EscherContainerRecord bstore = (EscherContainerRecord)record.getChild(1);
-        EscherBSERecord bse1 = (EscherBSERecord)bstore.getChild(0);
-        assertEquals(EscherBSERecord.BT_PNG, bse1.getBlipTypeWin32());
-        assertEquals(EscherBSERecord.BT_PNG, bse1.getBlipTypeMacOS());
-        assertArrayEquals(new byte[]{
-            0x65, 0x07, 0x4A, (byte)0x8D, 0x3E, 0x42, (byte)0x8B, (byte)0xAC,
-            0x1D, (byte)0x89, 0x35, 0x4F, 0x48, (byte)0xFA, 0x37, (byte)0xC2
-        }, bse1.getUid());
-        assertEquals(255, bse1.getTag());
-        assertEquals(32308, bse1.getSize());
-
-        EscherBitmapBlip blip1 = (EscherBitmapBlip)bse1.getBlipRecord();
-        assertEquals(0x6E00, blip1.getOptions());
-        assertEquals(EscherBitmapBlip.RECORD_ID_PNG, blip1.getRecordId());
-        assertArrayEquals(new byte[]{
-            0x65, 0x07, 0x4A, (byte)0x8D, 0x3E, 0x42, (byte)0x8B, (byte)0xAC,
-            0x1D, (byte)0x89, 0x35, 0x4F, 0x48, (byte)0xFA, 0x37, (byte)0xC2
-        }, blip1.getUID());
-
-        //serialize and read again
-        byte[] ser = bse1.serialize();
-        EscherBSERecord bse2 = new EscherBSERecord();
-        bse2.fillFields(ser, 0, new DefaultEscherRecordFactory());
-        assertEquals(bse1.getRecordId(), bse2.getRecordId());
-        assertEquals(bse1.getBlipTypeWin32(), bse2.getBlipTypeWin32());
-        assertEquals(bse1.getBlipTypeMacOS(), bse2.getBlipTypeMacOS());
-        assertArrayEquals(bse1.getUid(), bse2.getUid());
-        assertEquals(bse1.getTag(), bse2.getTag());
-        assertEquals(bse1.getSize(), bse2.getSize());
-
-        EscherBitmapBlip blip2 = (EscherBitmapBlip)bse1.getBlipRecord();
-        assertEquals(blip1.getOptions(), blip2.getOptions());
-        assertEquals(blip1.getRecordId(), blip2.getRecordId());
-        assertEquals(blip1.getUID(), blip2.getUID());
-
-        assertArrayEquals(blip1.getPicturedata(), blip1.getPicturedata());
-    }
-
-    //test reading/serializing of a PICT metafile
-    public void testReadPICT() {
-        //provided in bug-44886
-        byte[] data = _samples.readFile("Container.dat");
-
-        EscherContainerRecord record = new EscherContainerRecord();
-        record.fillFields(data, 0, new DefaultEscherRecordFactory());
-        EscherContainerRecord bstore = (EscherContainerRecord)record.getChild(1);
-        EscherBSERecord bse1 = (EscherBSERecord)bstore.getChild(1);
-        //System.out.println(bse1);
-        assertEquals(EscherBSERecord.BT_WMF, bse1.getBlipTypeWin32());
-        assertEquals(EscherBSERecord.BT_PICT, bse1.getBlipTypeMacOS());
-        assertArrayEquals(new byte[]{
-            (byte)0xC7, 0x15, 0x69, 0x2D, (byte)0xE5, (byte)0x89, (byte)0xA3, 0x6F,
-            0x66, 0x03, (byte)0xD6, 0x24, (byte)0xF7, (byte)0xDB, 0x1D, 0x13
-        }, bse1.getUid());
-        assertEquals(255, bse1.getTag());
-        assertEquals(1133, bse1.getSize());
-
-        EscherMetafileBlip blip1 = (EscherMetafileBlip)bse1.getBlipRecord();
-        assertEquals(0x5430, blip1.getOptions());
-        assertEquals(EscherMetafileBlip.RECORD_ID_PICT, blip1.getRecordId());
-        assertArrayEquals(new byte[]{
-            0x57, 0x32, 0x7B, (byte)0x91, 0x23, 0x5D, (byte)0xDB, 0x36,
-            0x7A, (byte)0xDB, (byte)0xFF, 0x17, (byte)0xFE, (byte)0xF3, (byte)0xA7, 0x05
-        }, blip1.getUID());
-        assertArrayEquals(new byte[]{
-            (byte)0xC7, 0x15, 0x69, 0x2D, (byte)0xE5, (byte)0x89, (byte)0xA3, 0x6F,
-            0x66, 0x03, (byte)0xD6, 0x24, (byte)0xF7, (byte)0xDB, 0x1D, 0x13
-        }, blip1.getPrimaryUID());
-
-        //serialize and read again
-        byte[] ser = bse1.serialize();
-        EscherBSERecord bse2 = new EscherBSERecord();
-        bse2.fillFields(ser, 0, new DefaultEscherRecordFactory());
-        assertEquals(bse1.getRecordId(), bse2.getRecordId());
-        assertEquals(bse1.getOptions(), bse2.getOptions());
-        assertEquals(bse1.getBlipTypeWin32(), bse2.getBlipTypeWin32());
-        assertEquals(bse1.getBlipTypeMacOS(), bse2.getBlipTypeMacOS());
-        assertArrayEquals(bse1.getUid(), bse2.getUid());
-        assertEquals(bse1.getTag(), bse2.getTag());
-        assertEquals(bse1.getSize(), bse2.getSize());
-
-        EscherMetafileBlip blip2 = (EscherMetafileBlip)bse1.getBlipRecord();
-        assertEquals(blip1.getOptions(), blip2.getOptions());
-        assertEquals(blip1.getRecordId(), blip2.getRecordId());
-        assertEquals(blip1.getUID(), blip2.getUID());
-        assertEquals(blip1.getPrimaryUID(), blip2.getPrimaryUID());
-
-        assertArrayEquals(blip1.getPicturedata(), blip1.getPicturedata());
-    }
-
-    //integral test: check that the read-write-read round trip is consistent
-    public void testContainer() {
-        byte[] data = _samples.readFile("Container.dat");
-
-        EscherContainerRecord record = new EscherContainerRecord();
-        record.fillFields(data, 0, new DefaultEscherRecordFactory());
-
-        byte[] ser = record.serialize();
-        assertArrayEquals(data, ser);
-    }
-
-    private byte[] read(File file) {
-        byte[] data = new byte[(int)file.length()];
-        try {
-            FileInputStream is = new FileInputStream(file);
-            is.read(data);
-            is.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return data;
-    }
-
-    /**
-     * The test data was created from pl031405.xls attached to Bugzilla #47143
-     */
-    public void test47143() {
-        byte[] data = _samples.readFile("47143.dat");
-        EscherBSERecord bse = new EscherBSERecord();
-        bse.fillFields(data, 0, new DefaultEscherRecordFactory());
-        bse.toString(); //assert that toString() works
-        assertTrue(bse.getBlipRecord() instanceof EscherMetafileBlip);
-
-        EscherMetafileBlip blip = (EscherMetafileBlip)bse.getBlipRecord();
-        blip.toString(); //assert that toString() works
-        byte[] remaining = blip.getRemainingData();
-        assertNotNull(remaining);
-
-        byte[] ser = bse.serialize();  //serialize and assert against the source data
-        assertArrayEquals(data, ser);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
deleted file mode 100644
index f171353..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-
-public final class TestEscherBoolProperty extends TestCase {
-    public void testToString() {
-        EscherBoolProperty p = new EscherBoolProperty((short)1, 1);
-        assertEquals("propNum: 1, RAW: 0x0001, propName: unknown, complex: false, blipId: false, value: 1 (0x00000001)", p.toString());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
deleted file mode 100644
index 4f8815a..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestEscherChildAnchorRecord extends TestCase {
-    public void testSerialize() {
-        EscherChildAnchorRecord r = createRecord();
-
-        byte[] data = new byte[8 + 16];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 24, bytesWritten );
-        assertEquals( "[01, 00, " +
-                "0F, F0, " +
-                "10, 00, 00, 00, " +
-                "01, 00, 00, 00, " +
-                "02, 00, 00, 00, " +
-                "03, 00, 00, 00, " +
-                "04, 00, 00, 00]", HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "01 00 " +
-                "0F F0 " +
-                "10 00 00 00 " +
-                "01 00 00 00 " +
-                "02 00 00 00 " +
-                "03 00 00 00 " +
-                "04 00 00 00 ";
-
-        byte[] data = HexRead.readFromString( hexData );
-        EscherChildAnchorRecord r = new EscherChildAnchorRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 24, bytesWritten );
-        assertEquals( 1, r.getDx1() );
-        assertEquals( 2, r.getDy1() );
-        assertEquals( 3, r.getDx2() );
-        assertEquals( 4, r.getDy2() );
-        assertEquals( (short) 0x0001, r.getOptions() );
-    }
-
-    public void testToString(){
-        String nl = System.getProperty( "line.separator" );
-
-        String expected = "org.apache.poi.ddf.EscherChildAnchorRecord:" + nl +
-                "  RecordId: 0xF00F" + nl +
-                "  Version: 0x0001" + nl +
-                "  Instance: 0x0000" + nl +
-                "  X1: 1" + nl +
-                "  Y1: 2" + nl +
-                "  X2: 3" + nl +
-                "  Y2: 4" + nl;
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private static EscherChildAnchorRecord createRecord() {
-        EscherChildAnchorRecord r = new EscherChildAnchorRecord();
-        r.setRecordId( EscherChildAnchorRecord.RECORD_ID );
-        r.setOptions( (short) 0x0001 );
-        r.setDx1( 1 );
-        r.setDy1( 2 );
-        r.setDx2( 3 );
-        r.setDy2( 4 );
-        return r;
-    }
-}
-
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
deleted file mode 100644
index a1eb171..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public class TestEscherClientAnchorRecord extends TestCase
-{
-    public void testSerialize() {
-        EscherClientAnchorRecord r = createRecord();
-
-        byte[] data = new byte[8 + 18 + 2];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 28, bytesWritten );
-        assertEquals( "[01, 00, " +
-                "10, F0, " +
-                "14, 00, 00, 00, " +
-                "4D, 00, 37, 00, 21, 00, 58, 00, " +
-                "0B, 00, 2C, 00, 16, 00, 63, 00, " +
-                "42, 00, " +
-                "FF, DD]", HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "01 00 " +
-                "10 F0 " +
-                "14 00 00 00 " +
-                "4D 00 37 00 21 00 58 00 " +
-                "0B 00 2C 00 16 00 63 00 " +
-                "42 00 " +
-                "FF DD";
-        byte[] data = HexRead.readFromString( hexData );
-        EscherClientAnchorRecord r = new EscherClientAnchorRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 28, bytesWritten );
-        assertEquals( (short) 55, r.getCol1() );
-        assertEquals( (short) 44, r.getCol2() );
-        assertEquals( (short) 33, r.getDx1() );
-        assertEquals( (short) 22, r.getDx2() );
-        assertEquals( (short) 11, r.getDy1() );
-        assertEquals( (short) 66, r.getDy2() );
-        assertEquals( (short) 77, r.getFlag() );
-        assertEquals( (short) 88, r.getRow1() );
-        assertEquals( (short) 99, r.getRow2() );
-        assertEquals( (short) 0x0001, r.getOptions() );
-        assertEquals( (byte) 0xFF, r.getRemainingData()[0] );
-        assertEquals( (byte) 0xDD, r.getRemainingData()[1] );
-    }
-
-    public void testToString() {
-        String nl = System.getProperty("line.separator");
-
-        String expected = "org.apache.poi.ddf.EscherClientAnchorRecord:" + nl +
-                "  RecordId: 0xF010" + nl +
-                "  Version: 0x0001" + nl +
-                "  Instance: 0x0000" + nl +
-                "  Flag: 77" + nl +
-                "  Col1: 55" + nl +
-                "  DX1: 33" + nl +
-                "  Row1: 88" + nl +
-                "  DY1: 11" + nl +
-                "  Col2: 44" + nl +
-                "  DX2: 22" + nl +
-                "  Row2: 99" + nl +
-                "  DY2: 66" + nl +
-                "  Extra Data:" + nl +
-                "00000000 FF DD                                           .." + nl;
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private EscherClientAnchorRecord createRecord()
-    {
-        EscherClientAnchorRecord r = new EscherClientAnchorRecord();
-        r.setCol1( (short) 55 );
-        r.setCol2( (short) 44 );
-        r.setDx1( (short) 33 );
-        r.setDx2( (short) 22 );
-        r.setDy1( (short) 11 );
-        r.setDy2( (short) 66 );
-        r.setFlag( (short) 77 );
-        r.setRow1( (short) 88 );
-        r.setRow2( (short) 99 );
-        r.setOptions( (short) 0x0001 );
-        r.setRemainingData( new byte[]{(byte) 0xFF, (byte) 0xDD} );
-        return r;
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java
deleted file mode 100644
index 0282ed0..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
- 
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public class TestEscherClientDataRecord extends TestCase
-{
-    public void testSerialize() {
-        EscherClientDataRecord r = createRecord();
-
-        byte[] data = new byte[8];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 8, bytesWritten );
-        assertEquals( "[02, 00, " +
-                "11, F0, " +
-                "00, 00, 00, 00]",
-                HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "02 00 " +
-                "11 F0 " +
-                "00 00 00 00 ";
-        byte[] data = HexRead.readFromString( hexData );
-        EscherClientDataRecord r = new EscherClientDataRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 8, bytesWritten );
-        assertEquals( (short)0xF011, r.getRecordId() );
-        assertEquals( "[]", HexDump.toHex(r.getRemainingData()) );
-    }
-
-    public void testToString() {
-        String nl = System.getProperty("line.separator");
-
-        String expected = "org.apache.poi.ddf.EscherClientDataRecord:" + nl +
-                "  RecordId: 0xF011" + nl +
-                "  Version: 0x0002" + nl +
-                "  Instance: 0x0000" + nl +
-                "  Extra Data:" + nl +
-                "No Data" + nl ;
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private static EscherClientDataRecord createRecord()
-    {
-        EscherClientDataRecord r = new EscherClientDataRecord();
-        r.setOptions( (short) 0x0002 );
-        r.setRecordId( EscherClientDataRecord.RECORD_ID );
-        r.setRemainingData( new byte[] {} );
-        return r;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
deleted file mode 100644
index 026bc41..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests for {@link EscherContainerRecord}
- */
-public final class TestEscherContainerRecord extends TestCase {
-    private static final POIDataSamples _samples = POIDataSamples.getDDFInstance();
-
-	public void testFillFields() {
-		EscherRecordFactory f = new DefaultEscherRecordFactory();
-		byte[] data = HexRead.readFromString("0F 02 11 F1 00 00 00 00");
-		EscherRecord r = f.createRecord(data, 0);
-		r.fillFields(data, 0, f);
-		assertTrue(r instanceof EscherContainerRecord);
-		assertEquals((short) 0x020F, r.getOptions());
-		assertEquals((short) 0xF111, r.getRecordId());
-
-		data = HexRead.readFromString("0F 02 11 F1 08 00 00 00" +
-				" 02 00 22 F2 00 00 00 00");
-		r = f.createRecord(data, 0);
-		r.fillFields(data, 0, f);
-		EscherRecord c = r.getChild(0);
-		assertFalse(c instanceof EscherContainerRecord);
-		assertEquals((short) 0x0002, c.getOptions());
-		assertEquals((short) 0xF222, c.getRecordId());
-	}
-
-	public void testSerialize() {
-		UnknownEscherRecord r = new UnknownEscherRecord();
-		r.setOptions((short) 0x123F);
-		r.setRecordId((short) 0xF112);
-		byte[] data = new byte[8];
-		r.serialize(0, data, new NullEscherSerializationListener());
-
-		assertEquals("[3F, 12, 12, F1, 00, 00, 00, 00]", HexDump.toHex(data));
-
-		EscherRecord childRecord = new UnknownEscherRecord();
-		childRecord.setOptions((short) 0x9999);
-		childRecord.setRecordId((short) 0xFF01);
-		r.addChildRecord(childRecord);
-		data = new byte[16];
-		r.serialize(0, data, new NullEscherSerializationListener());
-
-		assertEquals("[3F, 12, 12, F1, 08, 00, 00, 00, 99, 99, 01, FF, 00, 00, 00, 00]", HexDump.toHex(data));
-
-	}
-
-	public void testToString() {
-		EscherContainerRecord r = new EscherContainerRecord();
-		r.setRecordId(EscherContainerRecord.SP_CONTAINER);
-		r.setOptions((short) 0x000F);
-		String nl = System.getProperty("line.separator");
-		assertEquals("org.apache.poi.ddf.EscherContainerRecord (SpContainer):" + nl +
-				"  isContainer: true" + nl +
-                "  version: 0x000F" + nl +
-                "  instance: 0x0000" + nl +
-				"  recordId: 0xF004" + nl +
-				"  numchildren: 0" + nl
-				, r.toString());
-
-		EscherOptRecord r2 = new EscherOptRecord();
-		// don't try to shoot in foot, please -- vlsergey
-		// r2.setOptions((short) 0x9876);
-		r2.setRecordId(EscherOptRecord.RECORD_ID);
-
-		String expected;
-		r.addChildRecord(r2);
-		expected = "org.apache.poi.ddf.EscherContainerRecord (SpContainer):" + nl +
-				   "  isContainer: true" + nl +
-                   "  version: 0x000F" + nl +
-                   "  instance: 0x0000" + nl +
-				   "  recordId: 0xF004" + nl +
-				   "  numchildren: 1" + nl +
-				   "  children: " + nl +
-				   "   Child 0:" + nl +
-				   "    org.apache.poi.ddf.EscherOptRecord:" + nl +
-				   "      isContainer: false" + nl +
-                   "      version: 0x0003" + nl +
-                   "      instance: 0x0000" + nl +
-				   "      recordId: 0xF00B" + nl +
-				   "      numchildren: 0" + nl +
-				   "      properties:" + nl +
-				   "    " + nl;
-		assertEquals(expected, r.toString());
-
-		r.addChildRecord(r2);
-		expected = "org.apache.poi.ddf.EscherContainerRecord (SpContainer):" + nl +
-				"  isContainer: true" + nl +
-                "  version: 0x000F" + nl +
-                "  instance: 0x0000" + nl +
-				"  recordId: 0xF004" + nl +
-				"  numchildren: 2" + nl +
-				"  children: " + nl +
-				"   Child 0:" + nl +
-				"    org.apache.poi.ddf.EscherOptRecord:" + nl +
-				"      isContainer: false" + nl +
-                "      version: 0x0003" + nl +
-                "      instance: 0x0000" + nl +
-				"      recordId: 0xF00B" + nl +
-				"      numchildren: 0" + nl +
-				"      properties:" + nl +
-				"    " + nl +
-				"   Child 1:" + nl +
-				"    org.apache.poi.ddf.EscherOptRecord:" + nl +
-				"      isContainer: false" + nl +
-                "      version: 0x0003" + nl +
-                "      instance: 0x0000" + nl +
-				"      recordId: 0xF00B" + nl +
-				"      numchildren: 0" + nl +
-				"      properties:" + nl +
-				"    " + nl;
-		assertEquals(expected, r.toString());
-	}
-
-	private static final class DummyEscherRecord extends EscherRecord {
-		public DummyEscherRecord() { }
-		@Override
-        public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) { return 0; }
-		@Override
-        public int serialize(int offset, byte[] data, EscherSerializationListener listener) { return 0; }
-		@Override
-        public int getRecordSize() { return 10; }
-		@Override
-        public String getRecordName() { return ""; }
-	}
-
-	public void testGetRecordSize() {
-		EscherContainerRecord r = new EscherContainerRecord();
-		r.addChildRecord(new DummyEscherRecord());
-		assertEquals(18, r.getRecordSize());
-	}
-
-	/**
-	 * We were having problems with reading too much data on an UnknownEscherRecord,
-	 *  but hopefully we now read the correct size.
-	 */
-	public void testBug44857() throws Exception {
-		byte[] data = _samples.readFile("Container.dat");
-
-		// This used to fail with an OutOfMemory
-		EscherContainerRecord record = new EscherContainerRecord();
-		record.fillFields(data, 0, new DefaultEscherRecordFactory());
-	}
-
-	/**
-	 * Ensure {@link EscherContainerRecord} doesn't spill its guts everywhere
-	 */
-	public void testChildren() {
-		EscherContainerRecord ecr = new EscherContainerRecord();
-		List<EscherRecord> children0 = ecr.getChildRecords();
-		assertEquals(0, children0.size());
-
-		EscherRecord chA = new DummyEscherRecord();
-		EscherRecord chB = new DummyEscherRecord();
-		EscherRecord chC = new DummyEscherRecord();
-
-		ecr.addChildRecord(chA);
-		ecr.addChildRecord(chB);
-		children0.add(chC);
-
-		List<EscherRecord> children1 = ecr.getChildRecords();
-		assertTrue(children0 !=  children1);
-		assertEquals(2, children1.size());
-		assertEquals(chA, children1.get(0));
-		assertEquals(chB, children1.get(1));
-
-		assertEquals(1, children0.size()); // first copy unchanged
-
-		ecr.setChildRecords(children0);
-		ecr.addChildRecord(chA);
-		List<EscherRecord> children2 = ecr.getChildRecords();
-		assertEquals(2, children2.size());
-		assertEquals(chC, children2.get(0));
-		assertEquals(chA, children2.get(1));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java
deleted file mode 100644
index 2e0fd4b..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestEscherDgRecord extends TestCase {
-    public void testSerialize() {
-        EscherDgRecord r = createRecord();
-
-        byte[] data = new byte[16];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 16, bytesWritten );
-        assertEquals( "[10, 00, " +
-                "08, F0, " +
-                "08, 00, 00, 00, " +
-                "02, 00, 00, 00, " +     // num shapes in drawing
-                "01, 04, 00, 00]",     // The last MSOSPID given to an SP in this DG
-                HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "10 00 " +
-                "08 F0 " +
-                "08 00 00 00 " +
-                "02 00 00 00 " +
-                "01 04 00 00 ";
-        byte[] data = HexRead.readFromString( hexData );
-        EscherDgRecord r = new EscherDgRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 16, bytesWritten );
-        assertEquals( 2, r.getNumShapes() );
-        assertEquals( 1025, r.getLastMSOSPID() );
-    }
-
-    public void testToString() {
-        String expected = "org.apache.poi.ddf.EscherDgRecord:" + '\n' +
-                "  RecordId: 0xF008" + '\n' +
-                "  Version: 0x0000" + '\n' +
-                "  Instance: 0x0001" + '\n' +
-                "  NumShapes: 2" + '\n' +
-                "  LastMSOSPID: 1025" + '\n';
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private static EscherDgRecord createRecord()
-    {
-        EscherDgRecord r = new EscherDgRecord();
-        r.setOptions( (short) 0x0010 );
-        r.setRecordId( EscherDgRecord.RECORD_ID );
-        r.setNumShapes(2);
-        r.setLastMSOSPID(1025);
-        return r;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java
deleted file mode 100644
index 2587a3b..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestEscherDggRecord extends TestCase {
-    public void testSerialize() {
-        EscherDggRecord r = createRecord();
-
-        byte[] data = new byte[32];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 32, bytesWritten );
-        assertEquals( "[00, 00, " +
-                "06, F0, " +
-                "18, 00, 00, 00, " +
-                "02, 04, 00, 00, " +
-                "02, 00, 00, 00, " +
-                "02, 00, 00, 00, " +
-                "01, 00, 00, 00, " +
-                "01, 00, 00, 00, 02, 00, 00, 00]",
-                HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "00 00 " +
-                "06 F0 " +
-                "18 00 00 00 " +
-                "02 04 00 00 " +
-                "02 00 00 00 " +
-                "02 00 00 00 " +
-                "01 00 00 00 " +
-                "01 00 00 00 02 00 00 00";
-        byte[] data = HexRead.readFromString( hexData );
-        EscherDggRecord r = new EscherDggRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 32, bytesWritten );
-        assertEquals( 0x402, r.getShapeIdMax() );
-        assertEquals( 0x02, r.getNumIdClusters() );
-        assertEquals( 0x02, r.getNumShapesSaved() );
-        assertEquals( 0x01, r.getDrawingsSaved() );
-        assertEquals( 1, r.getFileIdClusters().length );
-        assertEquals( 0x01, r.getFileIdClusters()[0].getDrawingGroupId());
-        assertEquals( 0x02, r.getFileIdClusters()[0].getNumShapeIdsUsed());
-    }
-
-    public void testToString() {
-        String expected = "org.apache.poi.ddf.EscherDggRecord:" + '\n' +
-                "  RecordId: 0xF006" + '\n' +
-                "  Version: 0x0000" + '\n' +
-                "  Instance: 0x0000" + '\n' +
-                "  ShapeIdMax: 1026" + '\n' +
-                "  NumIdClusters: 2" + '\n' +
-                "  NumShapesSaved: 2" + '\n' +
-                "  DrawingsSaved: 1" + '\n' +
-                "  DrawingGroupId1: 1" + '\n' +
-                "  NumShapeIdsUsed1: 2" + '\n';
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private static EscherDggRecord createRecord()
-    {
-        EscherDggRecord r = new EscherDggRecord();
-        r.setOptions( (short) 0x0000 );
-        r.setRecordId( EscherDggRecord.RECORD_ID );
-        r.setShapeIdMax( 0x402 );
-        r.setNumShapesSaved( 0x02 );
-        r.setDrawingsSaved( 0x01 );
-        r.setFileIdClusters(new EscherDggRecord.FileIdCluster[] {
-            new EscherDggRecord.FileIdCluster( 1, 2 )
-        });
-        return r;
-    }
-
-    public void testGetRecordSize() {
-        EscherDggRecord r = new EscherDggRecord();
-        r.setFileIdClusters(new EscherDggRecord.FileIdCluster[] { new EscherDggRecord.FileIdCluster(0,0) } );
-        assertEquals(32,r.getRecordSize());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java
deleted file mode 100644
index 95b0745..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.NullOutputStream;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class TestEscherDump {
-    static NullPrinterStream nullPS;
-    
-    @BeforeClass
-    public static void init() throws UnsupportedEncodingException {
-        nullPS = new NullPrinterStream();
-    }
-    
-    @Test
-    public void testSimple() throws Exception {
-        // simple test to at least cover some parts of the class
-        EscherDump.main(new String[] {}, nullPS);
-        
-        new EscherDump().dump(0, new byte[] {}, nullPS);
-        new EscherDump().dump(new byte[] {}, 0, 0, nullPS);
-        new EscherDump().dumpOld(0, new ByteArrayInputStream(new byte[] {}), nullPS);
-    }
-
-    @Test
-    public void testWithData() throws Exception {
-        new EscherDump().dumpOld(8, new ByteArrayInputStream(new byte[] { 00, 00, 00, 00, 00, 00, 00, 00 }), nullPS);
-    }
-
-    @Test
-    public  void testWithSamplefile() throws Exception {
-        //InputStream stream = HSSFTestDataSamples.openSampleFileStream(")
-        byte[] data = POIDataSamples.getDDFInstance().readFile("Container.dat");
-        new EscherDump().dump(data.length, data, nullPS);
-        //new EscherDump().dumpOld(data.length, new ByteArrayInputStream(data), System.out);
-        
-        data = new byte[2586114];
-        InputStream stream = HSSFTestDataSamples.openSampleFileStream("44593.xls");
-        try {
-            int bytes = IOUtils.readFully(stream, data);
-            assertTrue(bytes != -1);
-            //new EscherDump().dump(bytes, data, System.out);
-            //new EscherDump().dumpOld(bytes, new ByteArrayInputStream(data), System.out);
-        } finally {
-            stream.close();
-        }
-    }
-    
-    /**
-     * Implementation of an OutputStream which does nothing, used
-     * to redirect stdout to avoid spamming the console with output
-     */
-    private static class NullPrinterStream extends PrintStream {
-        @SuppressWarnings("resource")
-        private NullPrinterStream() throws UnsupportedEncodingException {
-            super(new NullOutputStream(),true,LocaleUtil.CHARSET_1252.name());
-        }      
-    }    
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java
deleted file mode 100644
index 0b43a0e..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestEscherOptRecord extends TestCase {
-
-    public void testFillFields() {
-        checkFillFieldsSimple();
-        checkFillFieldsComplex();
-    }
-
-    private void checkFillFieldsComplex() {
-        String dataStr = "33 00 " +
-                "0B F0 " +
-                "14 00 00 00 " +
-                "BF 00 01 00 00 00 " +
-                "01 80 02 00 00 00 " +
-                "BF 00 01 00 00 00 " +
-                "01 02";
-
-        EscherOptRecord r = new EscherOptRecord();
-        r.fillFields( HexRead.readFromString( dataStr ), new DefaultEscherRecordFactory() );
-        assertEquals( (short) 0x0033, r.getOptions() );
-        assertEquals( (short) 0xF00B, r.getRecordId() );
-        assertEquals( 3, r.getEscherProperties().size() );
-        EscherBoolProperty prop1 = new EscherBoolProperty( EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 1 );
-        EscherComplexProperty prop2 = new EscherComplexProperty( (short) 1, false, new byte[] { 0x01, 0x02 } );
-        EscherBoolProperty prop3 = new EscherBoolProperty( EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 1 );
-        assertEquals( prop1, r.getEscherProperty( 0 ) );
-        assertEquals( prop2, r.getEscherProperty( 1 ) );
-        assertEquals( prop3, r.getEscherProperty( 2 ) );
-
-    }
-
-    private void checkFillFieldsSimple() {
-        String dataStr = "33 00 " + // options
-                        "0B F0 " + // recordid
-                        "12 00 00 00 " + // remaining bytes
-                        "BF 00 08 00 08 00 " +
-                        "81 01 09 00 00 08 " +
-                        "C0 01 40 00 00 08";
-
-        EscherOptRecord r = new EscherOptRecord();
-        r.fillFields( HexRead.readFromString( dataStr ), new DefaultEscherRecordFactory() );
-        assertEquals( (short) 0x0033, r.getOptions() );
-        assertEquals( (short) 0xF00B, r.getRecordId() );
-        assertEquals( 3, r.getEscherProperties().size() );
-        EscherBoolProperty prop1 = new EscherBoolProperty( EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 524296 );
-        EscherRGBProperty prop2 = new EscherRGBProperty( EscherProperties.FILL__FILLCOLOR, 0x08000009 );
-        EscherRGBProperty prop3 = new EscherRGBProperty( EscherProperties.LINESTYLE__COLOR, 0x08000040 );
-        assertEquals( prop1, r.getEscherProperty( 0 ) );
-        assertEquals( prop2, r.getEscherProperty( 1 ) );
-        assertEquals( prop3, r.getEscherProperty( 2 ) );
-    }
-
-    public void testSerialize() {
-        checkSerializeSimple();
-        checkSerializeComplex();
-    }
-
-    private void checkSerializeComplex()
-    {
-        //Complex escher record
-        EscherOptRecord r = new EscherOptRecord();
-        r.setOptions( (short) 0x0033 );
-        r.setRecordId( (short) 0xF00B );
-        EscherBoolProperty prop1 = new EscherBoolProperty( EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 1 );
-        EscherComplexProperty prop2 = new EscherComplexProperty( (short) 1, false, new byte[] { 0x01, 0x02 } );
-        EscherBoolProperty prop3 = new EscherBoolProperty( EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 1 );
-        r.addEscherProperty( prop1 );
-        r.addEscherProperty( prop2 );
-        r.addEscherProperty( prop3 );
-
-        byte[] data = new byte[28];
-        int bytesWritten = r.serialize(0, data, new NullEscherSerializationListener() );
-        assertEquals( 28, bytesWritten );
-        String dataStr = "[33, 00, " +
-                "0B, F0, " +
-                "14, 00, 00, 00, " +
-                "BF, 00, 01, 00, 00, 00, " +
-                "01, 80, 02, 00, 00, 00, " +
-                "BF, 00, 01, 00, 00, 00, " +
-                "01, 02]";
-        assertEquals( dataStr, HexDump.toHex(data) );
-
-    }
-
-    private void checkSerializeSimple()
-    {
-        EscherOptRecord r = new EscherOptRecord();
-        r.setOptions( (short) 0x0033 );
-        r.setRecordId( (short) 0xF00B );
-        EscherBoolProperty prop1 = new EscherBoolProperty( EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE, 1 );
-        EscherRGBProperty prop2 = new EscherRGBProperty( EscherProperties.FILL__FILLCOLOR, 0x08000009 );
-        EscherRGBProperty prop3 = new EscherRGBProperty( EscherProperties.LINESTYLE__COLOR, 0x08000040 );
-        r.addEscherProperty( prop1 );
-        r.addEscherProperty( prop2 );
-        r.addEscherProperty( prop3 );
-
-        byte[] data = new byte[26];
-        int bytesWritten = r.serialize(0, data, new NullEscherSerializationListener() );
-        String dataStr = "[33, 00, " +
-                "0B, F0, " +
-                "12, 00, 00, 00, " +
-                "BF, 00, 01, 00, 00, 00, " +
-                "81, 01, 09, 00, 00, 08, " +
-                "C0, 01, 40, 00, 00, 08]";
-        assertEquals( dataStr, HexDump.toHex(data) );
-        assertEquals( 26, bytesWritten );
-    }
-
-    public void testToString() {
-        String nl = System.getProperty("line.separator");
-        EscherOptRecord r = new EscherOptRecord();
-        // don't try to shoot in foot, please -- vlsergey
-        // r.setOptions((short)0x000F);
-        r.setRecordId(EscherOptRecord.RECORD_ID);
-        EscherProperty prop1 = new EscherBoolProperty((short)1, 1);
-        r.addEscherProperty(prop1);
-        String expected = "org.apache.poi.ddf.EscherOptRecord:" + nl +
-                "  isContainer: false" + nl +
-                "  version: 0x0003" + nl +
-                "  instance: 0x0001" + nl +
-                "  recordId: 0x" + HexDump.toHex(EscherOptRecord.RECORD_ID) + nl +
-                "  numchildren: 0" + nl +
-                "  properties:" + nl +
-                "    propNum: 1, RAW: 0x0001, propName: unknown, complex: false, blipId: false, value: 1 (0x00000001)" + nl;
-        assertEquals( expected, r.toString());
-    }
-
-    /**
-     * Test serialisation of a particually complex example
-     * This test is currently broken!
-     */
-    public void testComplexSerialise() {
-    	byte[] data = {
-    		0x53, 0x01, 0x0B, 0xF0-256, 0x9C-256, 0x01, 0x00, 0x00,
-    		// Simple data follows
-    		0x42, 0x01,	0x49, 0x00, 0x00, 0x00,          // SP @ 8
-    		0x43, 0x01, 0x85-256, 0x00, 0x00, 0x00,      // SP @ 14
-    		0x44, 0x01, 0x04, 0x00, 0x00, 0x00,          // SP @ 20
-    		0x45, 0xC1-256, 0x88-256, 0x00, 0x00, 0x00,  // SP @ 26
-    		0x46, 0xC1-256, 0x90-256, 0x00, 0x00, 0x00,  // SP @ 32
-    		0x7F, 0x01, 0x01, 0x00, 0x01, 0x00,
-    		0x80-256, 0x01, 0x00, 0x00, 0x00, 0x00,
-    		0x81-256, 0x01, 0x02, 0x00, 0x00, 0x08,
-    		0xBF-256, 0x01,	0x10, 0x00, 0x10, 0x00,
-    		0xC0-256, 0x01, 0x01, 0x00, 0x00, 0x08,      // SP 10
-    		0xC1-256, 0x01, 0x00, 0x00, 0x01, 0x00,
-    		0xC4-256, 0x01, 0x00, 0x00, 0x00, 0x00,
-    		0xCB-256, 0x01, 0x38, 0x63, 0x00, 0x00,
-    		0xCD-256, 0x01, 0x00, 0x00,	0x00, 0x00,
-    		0xCE-256, 0x01, 0x00, 0x00, 0x00, 0x00,      // SP 15
-    		0xD0-256, 0x01, 0x00, 0x00, 0x00, 0x00,
-    		0xD1-256, 0x01, 0x00, 0x00, 0x00, 0x00,
-    		0xD7-256, 0x01, 0x00, 0x00, 0x00, 0x00,
-    		0xFF-256, 0x01, 0x18, 0x00, 0x18, 0x00,
-    		0x01, 0x02, 0x02, 0x00, 0x00, 0x08,
-    		0x3F, 0x02, 0x00, 0x00,	0x02, 0x00,          // SP 21
-
-    		// Complex data follows
-
-    		// Complex data for Array #325
-    		// Array header
-    		0x22, 0x00, 0x22, 0x00, 0xF0-256, 0xFF-256,
-    		// Array data
-    		0x18, 0x00, 0x28, 0x00, 0x04, 0x00, 0x34,
-    		0x00, 0x04, 0x00, 0x28, 0x00, 0x04, 0x00,
-    		0x1C, 0x00, 0x04, 0x00, 0x10, 0x00, 0x04, 0x00, 0x04, 0x00, 0x10,
-    		0x00, 0x00, 0x00, 0x1C, 0x00,
-    		0x04, 0x00, 0x28, 0x00, 0x10, 0x00, 0x34, 0x00, 0x18, 0x00, 0x3C,
-    		0x00, 0x24, 0x00, 0x44, 0x00,
-    		0x30, 0x00, 0x48, 0x00, 0x3C, 0x00, 0x44, 0x00, 0x48, 0x00, 0x3C,
-    		0x00, 0x54, 0x00, 0x38, 0x00,
-    		0x60, 0x00, 0x2C, 0x00, 0x70, 0x00, 0x20, 0x00, 0x78, 0x00,
-    		0x14, 0x00, 0x80-256, 0x00, 0x08, 0x00,
-    		0x84-256, 0x00, 0x04, 0x00, 0x78, 0x00, 0x04, 0x00, 0x6C, 0x00,
-    		0x04, 0x00, 0x60, 0x00, 0x04, 0x00,
-    		0x54, 0x00, 0x08, 0x00, 0x48, 0x00, 0x0C, 0x00, 0x3C, 0x00, 0x0C,
-    		0x00, 0x30, 0x00, 0x08, 0x00,
-    		0x3C, 0x00, 0x08, 0x00, 0x48, 0x00, 0x08, 0x00, 0x54, 0x00, 0x00,
-    		0x00, 0x48, 0x00, 0x00, 0x00,
-    		0x3C, 0x00, 0x00, 0x00, 0x30, 0x00, 0x04, 0x00, 0x24, 0x00,
-    		// Complex data for Array #326
-    		// Array header
-    		0x45, 0x00, 0x48, 0x00, 0x02, 0x00,
-    		// Array data
-    		0x00, 0x40, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00,
-    		0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256,
-    		0x01, 0x00, 0x00, 0xB0-256, 0x01, 0x00, 0x00, 0xB0-256, 0x00, 0x80-256
-    	};
-
-    	// Create the record
-        EscherOptRecord r = new EscherOptRecord();
-        int filled = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        // Check it's the right length
-        assertEquals(data.length, filled);
-        assertEquals(data.length, r.getRecordSize());
-
-        // Serialise it
-        byte[] dest = new byte[data.length];
-        int written = r.serialize(0, dest);
-
-        // Check it serialised it back to the same data
-        assertEquals(data.length, written);
-        for(int i=0; i<data.length; i++) {
-        	assertEquals(data[i], dest[i]);
-        }
-    }
-
-    /**
-     * Test read/write against an OPT record from a real ppt file.
-     * In PowerPoint is is legal to have array properties with empty complex part.
-     * In Glen's original implementation complex part is always 6 bytes which resulted
-     * in +6 extra bytes when writing back out. As the result the ppt becomes unreadable.
-     *
-     * Make sure we write back the original empty complex part.
-     *
-     * See Bug 41946 for details.
-     */
-    public void test41946() {
-        String dataStr1 =
-                "03 08 0B F0 00 03 00 00 81 00 30 65 01 00 82 00 98 B2 00 00 83 00 30 65 01 " +
-                "00 84 00 98 B2 00 00 85 00 00 00 00 00 87 00 01 00 00 00 88 00 00 00 00 00 " +
-                "89 00 00 00 00 00 BF 00 00 00 0F 00 0C 01 F4 00 00 10 0D 01 00 00 00 20 0E " +
-                "01 00 00 00 20 80 01 00 00 00 00 81 01 04 00 00 08 82 01 00 00 01 00 83 01 " +
-                "00 00 00 08 84 01 00 00 01 00 85 01 00 00 00 20 86 41 00 00 00 00 87 C1 00 " +
-                "00 00 00 88 01 00 00 00 00 89 01 00 00 00 00 8A 01 00 00 00 00 8B 01 00 00 " +
-                "00 00 8C 01 00 00 00 00 8D 01 00 00 00 00 8E 01 00 00 00 00 8F 01 00 00 00 " +
-                "00 90 01 00 00 00 00 91 01 00 00 00 00 92 01 00 00 00 00 93 01 00 00 00 00 " +
-                "94 01 00 00 00 00 95 01 00 00 00 00 96 01 00 00 00 00 97 C1 00 00 00 00 98 " +
-                "01 00 00 00 00 99 01 00 00 00 00 9A 01 00 00 00 00 9B 01 00 00 00 00 9C 01 " +
-                "03 00 00 40 BF 01 0C 00 1E 00 C0 01 01 00 00 08 C1 01 00 00 01 00 C2 01 FF " +
-                "FF FF 00 C3 01 00 00 00 20 C4 01 00 00 00 00 C5 41 00 00 00 00 C6 C1 00 00 " +
-                "00 00 C7 01 00 00 00 00 C8 01 00 00 00 00 C9 01 00 00 00 00 CA 01 00 00 00 " +
-                "00 CB 01 35 25 00 00 CC 01 00 00 08 00 CD 01 00 00 00 00 CE 01 00 00 00 00 " +
-                "CF C1 00 00 00 00 D7 01 02 00 00 00 FF 01 06 00 0E 00 00 02 00 00 00 00 01 " +
-                "02 02 00 00 08 02 02 CB CB CB 00 03 02 00 00 00 20 04 02 00 00 01 00 05 02 " +
-                "38 63 00 00 06 02 38 63 00 00 07 02 00 00 00 00 08 02 00 00 00 00 09 02 00 " +
-                "00 01 00 0A 02 00 00 00 00 0B 02 00 00 00 00 0C 02 00 00 01 00 0D 02 00 00 " +
-                "00 00 0E 02 00 00 00 00 0F 02 00 01 00 00 10 02 00 00 00 00 11 02 00 00 00 " +
-                "00 3F 02 00 00 03 00 80 02 00 00 00 00 81 02 00 00 01 00 82 02 05 00 00 00 " +
-                "83 02 9C 31 00 00 84 02 00 00 00 00 85 02 F0 F9 06 00 86 02 00 00 00 00 87 " +
-                "02 F7 00 00 10 88 02 00 00 00 20 BF 02 01 00 0F 00 C0 02 00 00 00 00 C1 02 " +
-                "00 00 00 00 C2 02 64 00 00 00 C3 02 00 00 00 00 C4 02 00 00 00 00 C5 02 00 " +
-                "00 00 00 C6 02 00 00 00 00 C7 02 00 00 00 00 C8 02 00 00 00 00 C9 02 00 00 " +
-                "00 00 CA 02 30 75 00 00 CB 02 D0 12 13 00 CC 02 30 ED EC FF CD 02 40 54 89 " +
-                "00 CE 02 00 80 00 00 CF 02 00 80 FF FF D0 02 00 00 79 FF D1 02 32 00 00 00 " +
-                "D2 02 20 4E 00 00 D3 02 50 C3 00 00 D4 02 00 00 00 00 D5 02 10 27 00 00 D6 " +
-                "02 70 94 00 00 D7 02 B0 3C FF FF D8 02 00 00 00 00 D9 02 10 27 00 00 DA 02 " +
-                "70 94 00 00 FF 02 16 00 1F 00 04 03 01 00 00 00 41 03 A8 29 01 00 42 03 00 " +
-                "00 00 00 43 03 03 00 00 00 44 03 7C BE 01 00 45 03 00 00 00 00 7F 03 00 00 " +
-                "0F 00 84 03 7C BE 01 00 85 03 00 00 00 00 86 03 7C BE 01 00 87 03 00 00 00 " +
-                "00";
-
-        EscherOptRecord r = new EscherOptRecord();
-        byte[] data = HexRead.readFromString( dataStr1 );
-        r.fillFields( data, 0, new DefaultEscherRecordFactory() );
-        assertEquals( (short) 0xF00B, r.getRecordId() );
-
-        byte[] data1 = r.serialize();
-        EscherOptRecord opt2 = new EscherOptRecord();
-        opt2.fillFields( data1, new DefaultEscherRecordFactory() );
-
-        byte[] data2 = opt2.serialize();
-        assertArrayEquals(data1, data2);
-    }
-
-    /**
-     * Test that EscherOptRecord can properly read/write array properties
-     * with empty complex part.
-     */
-    public void testEmptyArrayProperty() {
-        EscherOptRecord r = new EscherOptRecord();
-        EscherArrayProperty p = new EscherArrayProperty((short)(EscherProperties.FILL__SHADECOLORS + 0x8000), new byte[0] );
-        assertEquals(0, p.getNumberOfElementsInArray());
-        r.addEscherProperty(p);
-
-        byte[] data1 = r.serialize();
-        EscherOptRecord opt2 = new EscherOptRecord();
-        opt2.fillFields( data1, new DefaultEscherRecordFactory() );
-        p = (EscherArrayProperty)opt2.getEscherProperties().get(0);
-        assertEquals(0, p.getNumberOfElementsInArray());
-
-        byte[] data2 = opt2.serialize();
-        assertArrayEquals(data1, data2);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
deleted file mode 100644
index c7d704f..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-
-
-/**
- * @author Yegor Kozlov
- */
-public class TestEscherProperty extends TestCase
-{
-    /**
-     * assure that EscherProperty.getName() returns correct name for complex properties
-     * See Bugzilla 50401 
-     */
-    public void testPropertyNames() throws Exception {
-        EscherProperty p1 = new EscherSimpleProperty( EscherProperties.GROUPSHAPE__SHAPENAME, 0);
-        assertEquals("groupshape.shapename", p1.getName());
-        assertEquals(EscherProperties.GROUPSHAPE__SHAPENAME, p1.getPropertyNumber());
-        assertFalse(p1.isComplex());
-
-        EscherProperty p2 = new EscherComplexProperty(
-                EscherProperties.GROUPSHAPE__SHAPENAME, false, new byte[10]);
-        assertEquals("groupshape.shapename", p2.getName());
-        assertEquals(EscherProperties.GROUPSHAPE__SHAPENAME, p2.getPropertyNumber());
-        assertTrue(p2.isComplex());
-        assertFalse(p2.isBlipId());
-
-        EscherProperty p3 = new EscherComplexProperty(
-                EscherProperties.GROUPSHAPE__SHAPENAME, true, new byte[10]);
-        assertEquals("groupshape.shapename", p3.getName());
-        assertEquals(EscherProperties.GROUPSHAPE__SHAPENAME, p3.getPropertyNumber());
-        assertTrue(p3.isComplex());
-        assertTrue(p3.isBlipId());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
deleted file mode 100644
index aef2c72..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-
-import java.util.List;
-
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.HexDump;
-
-/**
- * @author Glen Stampoultzis  (glens @ superlinksoftware.com)
- */
-public class TestEscherPropertyFactory extends TestCase
-{
-    public void testCreateProperties() {
-        String dataStr = "41 C1 " +     // propid, complex ind
-                "03 00 00 00 " +         // size of complex property
-                "01 00 " +              // propid, complex ind
-                "00 00 00 00 " +         // value
-                "41 C1 " +              // propid, complex ind
-                "03 00 00 00 " +         // size of complex property
-                "01 02 03 " +
-                "01 02 03 "
-                ;
-        byte[] data = HexRead.readFromString( dataStr );
-        EscherPropertyFactory f = new EscherPropertyFactory();
-        List props = f.createProperties( data, 0, (short)3 );
-        EscherComplexProperty p1 = (EscherComplexProperty) props.get( 0 );
-        assertEquals( (short)0xC141, p1.getId() );
-        assertEquals( "[01, 02, 03]", HexDump.toHex( p1.getComplexData() ) );
-
-        EscherComplexProperty p3 = (EscherComplexProperty) props.get( 2 );
-        assertEquals( (short)0xC141, p3.getId() );
-        assertEquals( "[01, 02, 03]", HexDump.toHex( p3.getComplexData() ) );
-    }
-}
-
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java
deleted file mode 100644
index f0daf07..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public class TestEscherSpRecord extends TestCase
-{
-    public void testSerialize() {
-        EscherSpRecord r = createRecord();
-
-        byte[] data = new byte[16];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 16, bytesWritten );
-        assertEquals( "[02, 00, " +
-                "0A, F0, " +
-                "08, 00, 00, 00, " +
-                "00, 04, 00, 00, " +
-                "05, 00, 00, 00]",
-                HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "02 00 " +
-                "0A F0 " +
-                "08 00 00 00 " +
-                "00 04 00 00 " +
-                "05 00 00 00 ";
-        byte[] data = HexRead.readFromString( hexData );
-        EscherSpRecord r = new EscherSpRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 16, bytesWritten );
-        assertEquals( 0x0400, r.getShapeId() );
-        assertEquals( 0x05, r.getFlags() );
-    }
-
-    public void testToString() {
-        String nl = System.getProperty("line.separator");
-
-        String expected = "org.apache.poi.ddf.EscherSpRecord:" + nl +
-                "  RecordId: 0xF00A" + nl +
-                "  Version: 0x0002" + nl +
-                "  ShapeType: 0x0000" + nl +
-                "  ShapeId: 1024" + nl +
-                "  Flags: GROUP|PATRIARCH (0x00000005)" + nl;
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private static EscherSpRecord createRecord()
-    {
-        EscherSpRecord r = new EscherSpRecord();
-        r.setOptions( (short) 0x0002 );
-        r.setRecordId( EscherSpRecord.RECORD_ID );
-        r.setShapeId(0x0400);
-        r.setFlags(0x05);
-        return r;
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java
deleted file mode 100644
index e70934e..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestEscherSpgrRecord extends TestCase {
-    public void testSerialize() {
-        EscherSpgrRecord r = createRecord();
-
-        byte[] data = new byte[24];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 24, bytesWritten );
-        assertEquals( "[10, 00, " +
-                "09, F0, " +
-                "10, 00, 00, 00, " +
-                "01, 00, 00, 00, " +     // x
-                "02, 00, 00, 00, " +     // y
-                "03, 00, 00, 00, " +     // width
-                "04, 00, 00, 00]",     // height
-                HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "10 00 " +
-                "09 F0 " +
-                "10 00 00 00 " +
-                "01 00 00 00 " +
-                "02 00 00 00 " +
-                "03 00 00 00 " +
-                "04 00 00 00 ";
-        byte[] data = HexRead.readFromString( hexData );
-        EscherSpgrRecord r = new EscherSpgrRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 24, bytesWritten );
-        assertEquals( 1, r.getRectX1() );
-        assertEquals( 2, r.getRectY1() );
-        assertEquals( 3, r.getRectX2() );
-        assertEquals( 4, r.getRectY2() );
-    }
-
-    public void testToString() {
-
-        String expected = "org.apache.poi.ddf.EscherSpgrRecord:" + '\n' +
-                "  RecordId: 0xF009" + '\n' +
-                "  Version: 0x0000" + '\n' +
-                "  Instance: 0x0001" + '\n' +
-                "  RectX: 1" + '\n' +
-                "  RectY: 2" + '\n' +
-                "  RectWidth: 3" + '\n' +
-                "  RectHeight: 4" + '\n';
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private static EscherSpgrRecord createRecord()
-    {
-        EscherSpgrRecord r = new EscherSpgrRecord();
-        r.setOptions( (short) 0x0010 );
-        r.setRecordId( EscherSpgrRecord.RECORD_ID );
-        r.setRectX1(1);
-        r.setRectY1(2);
-        r.setRectX2(3);
-        r.setRectY2(4);
-        return r;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
deleted file mode 100644
index 60facfb..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestEscherSplitMenuColorsRecord extends TestCase {
-    public void testSerialize() {
-        EscherSplitMenuColorsRecord r = createRecord();
-
-        byte[] data = new byte[24];
-        int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
-        assertEquals( 24, bytesWritten );
-        assertEquals( "[40, 00, " +
-                "1E, F1, " +
-                "10, 00, 00, 00, " +
-                "02, 04, 00, 00, " +
-                "02, 00, 00, 00, " +
-                "02, 00, 00, 00, " +
-                "01, 00, 00, 00]",
-                HexDump.toHex( data ) );
-    }
-
-    public void testFillFields() {
-        String hexData = "40 00 " +
-                "1E F1 " +
-                "10 00 00 00 " +
-                "02 04 00 00 " +
-                "02 00 00 00 " +
-                "02 00 00 00 " +
-                "01 00 00 00 ";
-        byte[] data = HexRead.readFromString( hexData );
-        EscherSplitMenuColorsRecord r = new EscherSplitMenuColorsRecord();
-        int bytesWritten = r.fillFields( data, new DefaultEscherRecordFactory() );
-
-        assertEquals( 24, bytesWritten );
-        assertEquals( 0x0402, r.getColor1() );
-        assertEquals( 0x02, r.getColor2() );
-        assertEquals( 0x02, r.getColor3() );
-        assertEquals( 0x01, r.getColor4() );
-    }
-
-    public void testToString() {
-        String expected = "org.apache.poi.ddf.EscherSplitMenuColorsRecord:" + '\n' +
-                "  RecordId: 0xF11E" + '\n' +
-                "  Version: 0x0000" + '\n' +
-                "  Instance: 0x0004" + '\n' +
-                "  Color1: 0x00000402" + '\n' +
-                "  Color2: 0x00000002" + '\n' +
-                "  Color3: 0x00000002" + '\n' +
-                "  Color4: 0x00000001" + '\n' +
-                "";
-        assertEquals( expected, createRecord().toString() );
-    }
-
-    private static EscherSplitMenuColorsRecord createRecord()
-    {
-        EscherSplitMenuColorsRecord r = new EscherSplitMenuColorsRecord();
-        r.setOptions( (short) 0x0040 );
-        r.setRecordId( EscherSplitMenuColorsRecord.RECORD_ID );
-        r.setColor1( 0x402  );
-        r.setColor2( 0x2 );
-        r.setColor3( 0x2 );
-        r.setColor4( 0x1 );
-        return r;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java b/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java
deleted file mode 100644
index b42c98c..0000000
--- a/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ddf;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.HexDump;
-
-public final class TestUnknownEscherRecord extends TestCase {
-    public void testFillFields() {
-        String testData =
-                "0F 02 " + // options
-                "11 F1 " + // record id
-                "00 00 00 00";      // remaining bytes
-
-        UnknownEscherRecord r = new UnknownEscherRecord();
-        EscherRecordFactory factory = new DefaultEscherRecordFactory();
-        r.fillFields( HexRead.readFromString( testData ), factory );
-
-        assertEquals( 0x020F, r.getOptions() );
-        assertEquals( (short) 0xF111, r.getRecordId() );
-        assertTrue( r.isContainerRecord() );
-        assertEquals( 8, r.getRecordSize() );
-        assertEquals( 0, r.getChildRecords().size() );
-        assertEquals( 0, r.getData().length );
-
-        testData =
-                "00 02 " + // options
-                "11 F1 " + // record id
-                "04 00 00 00 " + // remaining bytes
-                "01 02 03 04";
-
-        r = new UnknownEscherRecord();
-        r.fillFields( HexRead.readFromString( testData ), factory );
-
-        assertEquals( 0x0200, r.getOptions() );
-        assertEquals( (short) 0xF111, r.getRecordId() );
-        assertEquals( 12, r.getRecordSize() );
-        assertFalse( r.isContainerRecord() );
-        assertEquals( 0, r.getChildRecords().size() );
-        assertEquals( 4, r.getData().length );
-        assertEquals( 1, r.getData()[0] );
-        assertEquals( 2, r.getData()[1] );
-        assertEquals( 3, r.getData()[2] );
-        assertEquals( 4, r.getData()[3] );
-
-        testData =
-                "0F 02 " + // options
-                "11 F1 " + // record id
-                "08 00 00 00 " + // remaining bytes
-                "00 02 " + // options
-                "FF FF " + // record id
-                "00 00 00 00";      // remaining bytes
-
-        r = new UnknownEscherRecord();
-        r.fillFields( HexRead.readFromString( testData ), factory );
-
-        assertEquals( 0x020F, r.getOptions() );
-        assertEquals( (short) 0xF111, r.getRecordId() );
-        assertEquals( 8, r.getRecordSize() );
-        assertTrue( r.isContainerRecord() );
-        assertEquals( 1, r.getChildRecords().size() );
-        assertEquals( (short) 0xFFFF, r.getChild( 0 ).getRecordId() );
-        
-        //Add by Zhang Zhang test error situation when remaining bytes > avalible bytes
-        testData =
-            "00 02 " + // options
-            "11 F1 " + // record id
-            "05 00 00 00 " + // remaining bytes
-            "01 02 03 04";
-
-	    r = new UnknownEscherRecord();
-	    r.fillFields( HexRead.readFromString( testData ), factory );
-	
-	    assertEquals( 0x0200, r.getOptions() );
-	    assertEquals( (short) 0xF111, r.getRecordId() );
-	    assertEquals( 12, r.getRecordSize() );
-	    assertFalse( r.isContainerRecord() );
-	    assertEquals( 0, r.getChildRecords().size() );
-	    assertEquals( 4, r.getData().length );
-	    assertEquals( 1, r.getData()[0] );
-	    assertEquals( 2, r.getData()[1] );
-	    assertEquals( 3, r.getData()[2] );
-	    assertEquals( 4, r.getData()[3] );
-	    
-        testData =
-            "0F 02 " + // options
-            "11 F1 " + // record id
-            "09 00 00 00 " + // remaining bytes
-            "00 02 " + // options
-            "FF FF " + // record id
-            "00 00 00 00";      // remaining bytes
-
-	    r = new UnknownEscherRecord();
-	    r.fillFields( HexRead.readFromString( testData ), factory );
-	
-	    assertEquals( 0x020F, r.getOptions() );
-	    assertEquals( (short) 0xF111, r.getRecordId() );
-	    assertEquals( 8, r.getRecordSize() );
-	    assertTrue( r.isContainerRecord() );
-	    assertEquals( 1, r.getChildRecords().size() );
-	    assertEquals( (short) 0xFFFF, r.getChild( 0 ).getRecordId() );
-    }
-
-    public void testSerialize() {
-        UnknownEscherRecord r = new UnknownEscherRecord();
-        r.setOptions( (short) 0x1234 );
-        r.setRecordId( (short) 0xF112 );
-        byte[] data = new byte[8];
-        r.serialize( 0, data, new NullEscherSerializationListener() );
-
-        assertEquals( "[34, 12, 12, F1, 00, 00, 00, 00]", HexDump.toHex( data ) );
-
-        EscherRecord childRecord = new UnknownEscherRecord();
-        childRecord.setOptions( (short) 0x9999 );
-        childRecord.setRecordId( (short) 0xFF01 );
-        r.addChildRecord( childRecord );
-        r.setOptions( (short) 0x123F );
-        data = new byte[16];
-        r.serialize( 0, data, new NullEscherSerializationListener() );
-
-        assertEquals( "[3F, 12, 12, F1, 08, 00, 00, 00, 99, 99, 01, FF, 00, 00, 00, 00]", HexDump.toHex( data ) );
-    }
-
-    public void testToString() {
-        UnknownEscherRecord r = new UnknownEscherRecord();
-        r.setOptions( (short) 0x1234 );
-        r.setRecordId( (short) 0xF112 );
-        byte[] data = new byte[8];
-        r.serialize( 0, data, new NullEscherSerializationListener() );
-
-        assertEquals( "org.apache.poi.ddf.UnknownEscherRecord:" + '\n' +
-                "  isContainer: false" + '\n' +
-                "  version: 0x0004" + '\n' +
-                "  instance: 0x0123" + '\n' +
-                "  recordId: 0xF112" + '\n' +
-                "  numchildren: 0" + '\n' +
-                ": 0"
-                , r.toString() );
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java b/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
deleted file mode 100644
index 3b6354e..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.hpsf;
-
-import junit.framework.TestCase;
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.util.HexRead;
-
-import java.io.ByteArrayInputStream;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestVariantSupport extends TestCase {
-
-    public void test52337() throws Exception {
-        // document summary stream   from test1-excel.doc attached to Bugzilla 52337
-        String hex =
-                "FE FF 00 00 05 01 02 00 00 00 00 00 00 00 00 00 00 00 00 00" +
-                "00 00 00 00 02 00 00 00 02 D5 CD D5 9C 2E 1B 10 93 97 08 00" +
-                "2B 2C F9 AE 44 00 00 00 05 D5 CD D5 9C 2E 1B 10 93 97 08 00" +
-                "2B 2C F9 AE 58 01 00 00 14 01 00 00 0C 00 00 00 01 00 00 00" +
-                "68 00 00 00 0F 00 00 00 70 00 00 00 05 00 00 00 98 00 00 00" +
-                "06 00 00 00 A0 00 00 00 11 00 00 00 A8 00 00 00 17 00 00 00" +
-                "B0 00 00 00 0B 00 00 00 B8 00 00 00 10 00 00 00 C0 00 00 00" +
-                "13 00 00 00 C8 00 00 00 16 00 00 00 D0 00 00 00 0D 00 00 00" +
-                "D8 00 00 00 0C 00 00 00 F3 00 00 00 02 00 00 00 E4 04 00 00" +
-                "1E 00 00 00 20 00 00 00 44 65 70 61 72 74 6D 65 6E 74 20 6F" +
-                "66 20 49 6E 74 65 72 6E 61 6C 20 41 66 66 61 69 72 73 00 00" +
-                "03 00 00 00 05 00 00 00 03 00 00 00 01 00 00 00 03 00 00 00" +
-                "47 03 00 00 03 00 00 00 0F 27 0B 00 0B 00 00 00 00 00 00 00" +
-                "0B 00 00 00 00 00 00 00 0B 00 00 00 00 00 00 00 0B 00 00 00" +
-                "00 00 00 00 1E 10 00 00 01 00 00 00 0F 00 00 00 54 68 69 73" +
-                "20 69 73 20 61 20 74 65 73 74 00 0C 10 00 00 02 00 00 00 1E" +
-                "00 00 00 06 00 00 00 54 69 74 6C 65 00 03 00 00 00 01 00 00" +
-                "00 00 00 00 A8 00 00 00 03 00 00 00 00 00 00 00 20 00 00 00" +
-                "01 00 00 00 38 00 00 00 02 00 00 00 40 00 00 00 01 00 00 00" +
-                "02 00 00 00 0C 00 00 00 5F 50 49 44 5F 48 4C 49 4E 4B 53 00" +
-                "02 00 00 00 E4 04 00 00 41 00 00 00 60 00 00 00 06 00 00 00" +
-                "03 00 00 00 74 00 74 00 03 00 00 00 09 00 00 00 03 00 00 00" +
-                "00 00 00 00 03 00 00 00 05 00 00 00 1F 00 00 00 0C 00 00 00" +
-                "4E 00 6F 00 72 00 6D 00 61 00 6C 00 32 00 2E 00 78 00 6C 00" +
-                "73 00 00 00 1F 00 00 00 0A 00 00 00 53 00 68 00 65 00 65 00" +
-                "74 00 31 00 21 00 44 00 32 00 00 00 ";
-        byte[] bytes = HexRead.readFromString(hex);
-
-        PropertySet ps = PropertySetFactory.create(new ByteArrayInputStream(bytes));
-        DocumentSummaryInformation dsi = (DocumentSummaryInformation) ps;
-        Section s = dsi.getSections().get(0);
-
-        Object hdrs =  s.getProperty(PropertyIDMap.PID_HEADINGPAIR);
-
-        assertNotNull("PID_HEADINGPAIR was not found", hdrs);
-        
-        assertTrue("PID_HEADINGPAIR: expected byte[] but was "+ hdrs.getClass(), hdrs instanceof byte[]);
-        // parse the value
-        Vector v = new Vector((short)Variant.VT_VARIANT);
-        v.read((byte[])hdrs, 0);
-
-        TypedPropertyValue[] items = v.getValues();
-        assertEquals(2, items.length);
-
-        assertNotNull(items[0].getValue());
-        assertTrue("first item must be CodePageString but was "+ items[0].getValue().getClass(),
-                items[0].getValue() instanceof CodePageString);
-        assertNotNull(items[1].getValue());
-        assertTrue("second item must be Integer but was "+ items[1].getValue().getClass(),
-                items[1].getValue() instanceof Integer);
-        assertEquals(1, (int)(Integer)items[1].getValue());
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
deleted file mode 100644
index a0db230..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import org.apache.poi.POIDataSamples;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.logging.Logger;
-
-/**
- * <p>Processes a test method for all OLE2 files in the HPSF test data
- * directory. Well, this class does not check whether a file is an OLE2 file but
- * rather whether its name begins with "Test".</p>
- */
-public class AllDataFilesTester {
-    private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-
-    /**
-     * <p>Interface specifying how to run a test on a single file.</p>
-     */
-    public interface TestTask
-    {
-        /**
-         * <p>Executes a test on a single file.</p>
-         *
-         * @param file the file
-         * @throws Throwable if the method throws anything.
-         */
-        void runTest(File file) throws Throwable;
-    }
-
-    /**
-     * <p>Tests the simplified custom properties.</p>
-     *
-     * @param task the task to execute
-     * @throws Throwable 
-     */
-    public void runTests(final TestTask task) throws Throwable
-    {
-        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-        final File dataDir = _samples.getFile("");
-        final File[] docs = dataDir.listFiles(new FileFilter()
-        {
-            @Override
-            public boolean accept(final File file)
-            {
-                return file.isFile() && file.getName().startsWith("Test");
-            }});
-        for (final File doc : docs) {
-            final Logger logger = Logger.getLogger(getClass().getName());
-            logger.info("Processing file \" " + doc.toString() + "\".");
-
-            /* Execute the test task. */
-            task.runTest(doc);
-        }
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
deleted file mode 100644
index dbb5645..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-/**
- * Test suite for org.apache.poi.hpsf.basic
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestBasic.class,
-    TestClassID.class,
-    TestEmptyProperties.class,
-    TestHPSFBugs.class,
-    TestMetaDataIPI.class,
-    TestUnicode.class,
-    TestWrite.class,
-    TestWriteWellKnown.class    
-})
-public class AllPOIHPSFBasicTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java
deleted file mode 100644
index 9db2a97..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-
-/**
- * <p>A POI file just for testing.</p>
- */
-public class POIFile
-{
-
-    private String name;
-    private POIFSDocumentPath path;
-    private byte[] bytes;
-
-
-    /**
-     * <p>Sets the POI file's name.</p>
-     *
-     * @param name The POI file's name.
-     */
-    public void setName(final String name)
-    {
-        this.name = name;
-    }
-
-    /**
-     * <p>Returns the POI file's name.</p>
-     *
-     * @return The POI file's name.
-     */
-    public String getName()
-    {
-        return name;
-    }
-
-    /**
-     * <p>Sets the POI file's path.</p>
-     *
-     * @param path The POI file's path.
-     */
-    public void setPath(final POIFSDocumentPath path)
-    {
-        this.path = path;
-    }
-
-    /**
-     * <p>Returns the POI file's path.</p>
-     *
-     * @return The POI file's path.
-     */
-    public POIFSDocumentPath getPath()
-    {
-        return path;
-    }
-
-    /**
-     * <p>Sets the POI file's content bytes.</p>
-     *
-     * @param bytes The POI file's content bytes.
-     */
-    public void setBytes(final byte[] bytes)
-    {
-        this.bytes = bytes;
-    }
-
-    /**
-     * <p>Returns the POI file's content bytes.</p>
-     *
-     * @return The POI file's content bytes.
-     */
-    public byte[] getBytes()
-    {
-        return bytes;
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
deleted file mode 100644
index 8937dca..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.HPSFException;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.Section;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * <p>Tests the basic HPSF functionality.</p>
- */
-public final class TestBasic {
-
-    private static final String POI_FS = "TestGermanWord90.doc";
-    private static final String[] POI_FILES = new String[]
-        {
-            "\005SummaryInformation",
-            "\005DocumentSummaryInformation",
-            "WordDocument",
-            "\001CompObj",
-            "1Table"
-        };
-    private static final int BYTE_ORDER = 0xfffe;
-    private static final int FORMAT     = 0x0000;
-    private static final int OS_VERSION = 0x00020A04;
-    private static final byte[] CLASS_ID =
-        {
-            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00
-        };
-    private static final int[] SECTION_COUNT =
-        {1, 2};
-    private static final boolean[] IS_SUMMARY_INFORMATION =
-        {true, false};
-    private static final boolean[] IS_DOCUMENT_SUMMARY_INFORMATION =
-        {false, true};
-
-    private POIFile[] poiFiles;
-
-
-    /**
-     * <p>Read a the test file from the "data" directory.</p>
-     *
-     * @exception FileNotFoundException if the file to be read does not exist.
-     * @exception IOException if any other I/O exception occurs.
-     */
-    @Before
-    public void setUp() throws IOException
-    {
-        POIDataSamples samples = POIDataSamples.getHPSFInstance();
-        final File data = samples.getFile(POI_FS);
-        poiFiles = Util.readPOIFiles(data);
-    }
-
-    /**
-     * <p>Checks the names of the files in the POI filesystem. They
-     * are expected to be in a certain order.</p>
-     */
-    @Test
-    public void testReadFiles()
-    {
-        String[] expected = POI_FILES;
-        for (int i = 0; i < expected.length; i++)
-            assertEquals(poiFiles[i].getName(), expected[i]);
-    }
-
-    /**
-     * <p>Tests whether property sets can be created from the POI
-     * files in the POI file system. This test case expects the first
-     * file to be a {@link SummaryInformation}, the second file to be
-     * a {@link DocumentSummaryInformation} and the rest to be no
-     * property sets. In the latter cases a {@link
-     * NoPropertySetStreamException} will be thrown when trying to
-     * create a {@link PropertySet}.</p>
-     *
-     * @exception IOException if an I/O exception occurs.
-     *
-     * @exception UnsupportedEncodingException if a character encoding is not
-     * supported.
-     */
-    @Test
-    public void testCreatePropertySets()
-    throws UnsupportedEncodingException, IOException
-    {
-        Class<?>[] expected = new Class[]
-            {
-                SummaryInformation.class,
-                DocumentSummaryInformation.class,
-                NoPropertySetStreamException.class,
-                NoPropertySetStreamException.class,
-                NoPropertySetStreamException.class
-            };
-        for (int i = 0; i < expected.length; i++)
-        {
-            InputStream in = new ByteArrayInputStream(poiFiles[i].getBytes());
-            Object o;
-            try
-            {
-                o = PropertySetFactory.create(in);
-            }
-            catch (NoPropertySetStreamException ex)
-            {
-                o = ex;
-            }
-            catch (MarkUnsupportedException ex)
-            {
-                o = ex;
-            }
-            in.close();
-            assertEquals(expected[i], o.getClass());
-        }
-    }
-
-    /**
-     * <p>Tests the {@link PropertySet} methods. The test file has two
-     * property sets: the first one is a {@link SummaryInformation},
-     * the second one is a {@link DocumentSummaryInformation}.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     * @exception HPSFException if any HPSF exception occurs
-     */
-    @Test
-    public void testPropertySetMethods() throws IOException, HPSFException
-    {
-        /* Loop over the two property sets. */
-        for (int i = 0; i < 2; i++)
-        {
-            byte[] b = poiFiles[i].getBytes();
-            PropertySet ps = PropertySetFactory.create(new ByteArrayInputStream(b));
-            assertEquals(BYTE_ORDER, ps.getByteOrder());
-            assertEquals(FORMAT, ps.getFormat());
-            assertEquals(OS_VERSION, ps.getOSVersion());
-            assertArrayEquals(CLASS_ID, ps.getClassID().getBytes());
-            assertEquals(SECTION_COUNT[i], ps.getSectionCount());
-            assertEquals(IS_SUMMARY_INFORMATION[i], ps.isSummaryInformation());
-            assertEquals(IS_DOCUMENT_SUMMARY_INFORMATION[i], ps.isDocumentSummaryInformation());
-        }
-    }
-
-    /**
-     * <p>Tests the {@link Section} methods. The test file has two
-     * property sets: the first one is a {@link SummaryInformation},
-     * the second one is a {@link DocumentSummaryInformation}.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     * @exception HPSFException if any HPSF exception occurs
-     */
-    @Test
-    public void testSectionMethods() throws IOException, HPSFException
-    {
-        final SummaryInformation si = (SummaryInformation)
-            PropertySetFactory.create(new ByteArrayInputStream
-                (poiFiles[0].getBytes()));
-        final List<Section> sections = si.getSections();
-        final Section s = sections.get(0);
-        assertTrue(org.apache.poi.hpsf.Util.equal
-            (s.getFormatID().getBytes(), SectionIDMap.SUMMARY_INFORMATION_ID));
-        assertNotNull(s.getProperties());
-        assertEquals(17, s.getPropertyCount());
-        assertEquals("Titel", s.getProperty(2));
-        assertEquals(1764, s.getSize());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
deleted file mode 100644
index ed79510..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import java.util.Locale;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.poi.hpsf.ClassID;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.SummaryInformation;
-
-/**
- * <p>Tests ClassID structure.</p>
- *
- * @author Michael Zalewski (zalewski@optonline.net)
- */
-public final class TestClassID extends TestCase {
-
-    /**
-     * Various tests of overridden .equals()
-     */
-    public void testEquals()
-    {
-        ClassID clsidTest1 = new ClassID(
-              new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                          0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}
-            , 0
-        );
-        ClassID clsidTest2 = new ClassID(
-              new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                          0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}
-            , 0
-        );
-        ClassID clsidTest3 = new ClassID(
-              new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                          0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11 }
-            , 0
-        );
-        Assert.assertEquals(clsidTest1, clsidTest1);
-        Assert.assertEquals(clsidTest1, clsidTest2);
-        Assert.assertFalse(clsidTest1.equals(clsidTest3));
-        Assert.assertFalse(clsidTest1.equals(null));
-    }
-    /**
-     * Try to write to a buffer that is too small. This should
-     *   throw an Exception
-     */
-    public void testWriteArrayStoreException()
-    {
-        ClassID clsidTest = new ClassID(
-              new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                          0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}
-            , 0
-        );
-        boolean bExceptionOccurred = false;
-        try
-        {
-            clsidTest.write(new byte[15], 0);
-        }
-        catch (Exception e)
-        {
-            bExceptionOccurred = true;
-        }
-        Assert.assertTrue(bExceptionOccurred);
-
-        bExceptionOccurred = false;
-        try
-        {
-            clsidTest.write(new byte[16], 1);
-        }
-        catch (Exception e)
-        {
-            bExceptionOccurred = true;
-        }
-        Assert.assertTrue(bExceptionOccurred);
-
-        // These should work without throwing an Exception
-        bExceptionOccurred = false;
-        try
-        {
-            clsidTest.write(new byte[16], 0);
-            clsidTest.write(new byte[17], 1);
-        }
-        catch (Exception e)
-        {
-            bExceptionOccurred = true;
-        }
-        Assert.assertFalse(bExceptionOccurred);
-    }
-    /**
-     * <p>Tests the {@link PropertySet} methods. The test file has two
-     * property set: the first one is a {@link SummaryInformation},
-     * the second one is a {@link DocumentSummaryInformation}.</p>
-     */
-    public void testClassID()
-    {
-        ClassID clsidTest = new ClassID(
-              new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                          0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}
-            , 0
-        );
-        Assert.assertEquals(clsidTest.toString().toUpperCase(Locale.ROOT),
-                            "{04030201-0605-0807-090A-0B0C0D0E0F10}"
-        );
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
deleted file mode 100644
index 48103b0..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.HPSFException;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.Variant;
-
-/**
- * <p>Test case for OLE2 files with empty properties. An empty property's type
- * is {@link Variant#VT_EMPTY}.</p>
- */
-public final class TestEmptyProperties extends TestCase {
-
-    /**
-     * <p>This test file's summary information stream contains some empty
-     * properties.</p>
-     */
-	private static final String POI_FS = "TestCorel.shw";
-
-	private static final String[] POI_FILES = new String[]
-        {
-            "PerfectOffice_MAIN",
-            "\005SummaryInformation",
-            "Main"
-        };
-
-	private POIFile[] poiFiles;
-
-    /**
-     * <p>Read a the test file from the "data" directory.</p>
-     *
-     * @exception FileNotFoundException if the file containing the test data
-     * does not exist
-     * @exception IOException if an I/O exception occurs
-     */
-    @Override
-    public void setUp() throws FileNotFoundException, IOException
-    {
-        POIDataSamples samples = POIDataSamples.getHPSFInstance();
-        final File data = samples.getFile(POI_FS);
-
-        poiFiles = Util.readPOIFiles(data);
-    }
-
-    /**
-     * <p>Checks the names of the files in the POI filesystem. They
-     * are expected to be in a certain order.</p>
-     */
-    public void testReadFiles()
-    {
-        String[] expected = POI_FILES;
-        for (int i = 0; i < expected.length; i++)
-            assertEquals(poiFiles[i].getName(), expected[i]);
-    }
-
-    /**
-     * <p>Tests whether property sets can be created from the POI
-     * files in the POI file system. This test case expects the first
-     * file to be a {@link SummaryInformation}, the second file to be
-     * a {@link DocumentSummaryInformation} and the rest to be no
-     * property sets. In the latter cases a {@link
-     * NoPropertySetStreamException} will be thrown when trying to
-     * create a {@link PropertySet}.</p>
-     *
-     * @exception IOException if an I/O exception occurs.
-     *
-     * @exception UnsupportedEncodingException if a character encoding is not
-     * supported.
-     */
-    public void testCreatePropertySets()
-    throws UnsupportedEncodingException, IOException
-    {
-        Class<?>[] expected = new Class[]
-            {
-                NoPropertySetStreamException.class,
-                SummaryInformation.class,
-                NoPropertySetStreamException.class
-            };
-        for (int i = 0; i < expected.length; i++)
-        {
-            InputStream in = new ByteArrayInputStream(poiFiles[i].getBytes());
-            Object o;
-            try
-            {
-                o = PropertySetFactory.create(in);
-            }
-            catch (NoPropertySetStreamException ex)
-            {
-                o = ex;
-            }
-            catch (MarkUnsupportedException ex)
-            {
-                o = ex;
-            }
-            in.close();
-            assertEquals(o.getClass(), expected[i]);
-        }
-    }
-
-    /**
-     * <p>Tests the {@link PropertySet} methods. The test file has two
-     * property sets: the first one is a {@link SummaryInformation},
-     * the second one is a {@link DocumentSummaryInformation}.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     * @exception HPSFException if an HPSF operation fails
-     */
-    public void testPropertySetMethods() throws IOException, HPSFException
-    {
-        byte[] b = poiFiles[1].getBytes();
-        PropertySet ps =
-            PropertySetFactory.create(new ByteArrayInputStream(b));
-        SummaryInformation s = (SummaryInformation) ps;
-        assertNull(s.getTitle());
-        assertNull(s.getSubject());
-        assertNotNull(s.getAuthor());
-        assertNull(s.getKeywords());
-        assertNull(s.getComments());
-        assertNotNull(s.getTemplate());
-        assertNotNull(s.getLastAuthor());
-        assertNotNull(s.getRevNumber());
-        assertEquals(s.getEditTime(), 0);
-        assertNull(s.getLastPrinted());
-        assertNull(s.getCreateDateTime());
-        assertNull(s.getLastSaveDateTime());
-        assertEquals(s.getPageCount(), 0);
-        assertEquals(s.getWordCount(), 0);
-        assertEquals(s.getCharCount(), 0);
-        assertNull(s.getThumbnail());
-        assertNull(s.getApplicationName());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
deleted file mode 100644
index cd58e15..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Date;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.POIDocument;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.HPSFPropertiesOnlyDocument;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-/**
- * Tests various bugs have been fixed
- */
-public final class TestHPSFBugs extends TestCase {
-   private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-    
-   /**
-    * Ensure that we can create a new HSSF Workbook,
-    *  then add some properties to it, save +
-    *  reload, and still access & change them.
-    */
-   public void test48832() throws Exception {
-      HSSFWorkbook wb = new HSSFWorkbook();
-      
-      // Starts empty
-      assertNull(wb.getDocumentSummaryInformation());
-      assertNull(wb.getSummaryInformation());
-      
-      // Add new properties
-      wb.createInformationProperties();
-      
-      assertNotNull(wb.getDocumentSummaryInformation());
-      assertNotNull(wb.getSummaryInformation());
-      
-      // Set initial values
-      wb.getSummaryInformation().setAuthor("Apache POI");
-      wb.getSummaryInformation().setKeywords("Testing POI");
-      wb.getSummaryInformation().setCreateDateTime(new Date(12345));
-      
-      wb.getDocumentSummaryInformation().setCompany("Apache");
-      
-      
-      // Save and reload
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      wb.write(baos);
-      ByteArrayInputStream bais = 
-         new ByteArrayInputStream(baos.toByteArray());
-      wb = new HSSFWorkbook(bais);
-      
-      
-      // Ensure changes were taken
-      assertNotNull(wb.getDocumentSummaryInformation());
-      assertNotNull(wb.getSummaryInformation());
- 
-      assertEquals("Apache POI", wb.getSummaryInformation().getAuthor());
-      assertEquals("Testing POI", wb.getSummaryInformation().getKeywords());
-      assertEquals(12345, wb.getSummaryInformation().getCreateDateTime().getTime());
-      assertEquals("Apache", wb.getDocumentSummaryInformation().getCompany());
-      
-      
-      // Set some more, save + reload
-      wb.getSummaryInformation().setComments("Resaved");
-      
-      baos = new ByteArrayOutputStream();
-      wb.write(baos);
-      bais = new ByteArrayInputStream(baos.toByteArray());
-      wb = new HSSFWorkbook(bais);
-      
-      // Check again
-      assertNotNull(wb.getDocumentSummaryInformation());
-      assertNotNull(wb.getSummaryInformation());
- 
-      assertEquals("Apache POI", wb.getSummaryInformation().getAuthor());
-      assertEquals("Testing POI", wb.getSummaryInformation().getKeywords());
-      assertEquals("Resaved", wb.getSummaryInformation().getComments());
-      assertEquals(12345, wb.getSummaryInformation().getCreateDateTime().getTime());
-      assertEquals("Apache", wb.getDocumentSummaryInformation().getCompany());
-   }
-   
-   /**
-    * Some files seem to want the length and data to be on a 4-byte boundary,
-    * and without that you'll hit an ArrayIndexOutOfBoundsException after
-    * reading junk
-    */
-   public void test54233() throws Exception {
-       DocumentInputStream dis;
-       NPOIFSFileSystem fs = 
-               new NPOIFSFileSystem(_samples.openResourceAsStream("TestNon4ByteBoundary.doc"));
-       
-       dis = fs.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME);
-       SummaryInformation si = (SummaryInformation)PropertySetFactory.create(dis);
-       
-       dis = fs.createDocumentInputStream(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-       DocumentSummaryInformation dsi = (DocumentSummaryInformation)PropertySetFactory.create(dis);
-      
-       // Test
-       assertEquals("Microsoft Word 10.0", si.getApplicationName());
-       assertEquals("", si.getTitle());
-       assertEquals("", si.getAuthor());
-       assertEquals("Cour de Justice", dsi.getCompany());
-       
-       
-       // Write out and read back, should still be valid
-       POIDocument doc = new HPSFPropertiesOnlyDocument(fs);
-       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-       doc.write(baos);
-       ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-       doc = new HPSFPropertiesOnlyDocument(new NPOIFSFileSystem(bais));
-       
-       // Check properties are still there
-       assertEquals("Microsoft Word 10.0", si.getApplicationName());
-       assertEquals("", si.getTitle());
-       assertEquals("", si.getAuthor());
-       assertEquals("Cour de Justice", dsi.getCompany());
-   }
-   
-   /**
-    * CodePage Strings can be zero length
-    */
-   public void test56138() throws Exception {
-       DocumentInputStream dis;
-       NPOIFSFileSystem fs = 
-               new NPOIFSFileSystem(_samples.openResourceAsStream("TestZeroLengthCodePage.mpp"));
-       
-       dis = fs.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME);
-       SummaryInformation si = (SummaryInformation)PropertySetFactory.create(dis);
-       
-       dis = fs.createDocumentInputStream(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-       DocumentSummaryInformation dsi = (DocumentSummaryInformation)PropertySetFactory.create(dis);
-       
-       // Test
-       assertEquals("MSProject", si.getApplicationName());
-       assertEquals("project1", si.getTitle());
-       assertEquals("Jon Iles", si.getAuthor());
-       
-       assertEquals("", dsi.getCompany());
-       assertEquals(2, dsi.getSectionCount());
-   }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
deleted file mode 100644
index 3cb277f..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hpsf.*;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-/**
- * Basing on: src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java
- * This class tests reading and writing of meta data. No actual document is created. All information
- * is stored in a virtual document in a ByteArrayOutputStream
- * @author Matthias G\u00fcnter
- */
-public final class TestMetaDataIPI extends TestCase{
-
-	private ByteArrayOutputStream bout; //our store
-	private POIFSFileSystem poifs;
-	private DirectoryEntry dir;
-	private DocumentSummaryInformation dsi;
-	private SummaryInformation si;
-
-
-
-	/**
-	 * Setup is used to get the document ready. Gets the DocumentSummaryInformation and the
-	 * SummaryInformation to reasonable values
-	 */
-	@Override
-    public void setUp() throws Exception {
-		bout = new ByteArrayOutputStream();
-		poifs = new POIFSFileSystem();
-		dir = poifs.getRoot();
-		dsi = null;
-		try {
-			DocumentEntry dsiEntry = (DocumentEntry) dir
-					.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-			DocumentInputStream dis = new DocumentInputStream(dsiEntry);
-			PropertySet ps = new PropertySet(dis);
-			dis.close();
-			dsi = new DocumentSummaryInformation(ps);
-
-		} catch (FileNotFoundException ex) {
-			/*
-			 * There is no document summary information yet. We have to create a
-			 * new one.
-			 */
-			dsi = PropertySetFactory.newDocumentSummaryInformation();
-			assertNotNull(dsi);
-		}
-		assertNotNull(dsi);
-		try {
-			DocumentEntry dsiEntry = (DocumentEntry) dir
-					.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-			DocumentInputStream dis = new DocumentInputStream(dsiEntry);
-			PropertySet ps = new PropertySet(dis);
-			dis.close();
-			si = new SummaryInformation(ps);
-
-		} catch (FileNotFoundException ex) {
-			/*
-			 * There is no document summary information yet. We have to create a
-			 * new one.
-			 */
-			si = PropertySetFactory.newSummaryInformation();
-			assertNotNull(si);
-		}
-		assertNotNull(dsi);
-	}
-
-	/**
-	 * Closes the ByteArrayOutputStream and reads it into a ByteArrayInputStream.
-	 * When finished writing information this method is used in the tests to
-	 * start reading from the created document and then the see if the results match.
-	 */
-	public void closeAndReOpen() throws IOException, HPSFException {
-
-		dsi.write(dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-		si.write(dir, SummaryInformation.DEFAULT_STREAM_NAME);
-
-		si = null;
-		dsi = null;
-        poifs.writeFilesystem(bout);
-        bout.flush();
-
-		InputStream is = new ByteArrayInputStream(bout.toByteArray());
-		assertNotNull(is);
-		POIFSFileSystem poifs = new POIFSFileSystem(is);
-		is.close();
-
-		assertNotNull(poifs);
-		/* Read the document summary information. */
-		DirectoryEntry dir = poifs.getRoot();
-
-		DocumentEntry dsiEntry = (DocumentEntry) dir
-				.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-		DocumentInputStream dis = new DocumentInputStream(dsiEntry);
-		PropertySet ps = new PropertySet(dis);
-		dis.close();
-		dsi = new DocumentSummaryInformation(ps);
-
-		try {
-			dsiEntry = (DocumentEntry) dir
-					.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-			dis = new DocumentInputStream(dsiEntry);
-			ps = new PropertySet(dis);
-			dis.close();
-			si = new SummaryInformation(ps);
-
-		} catch (FileNotFoundException ex) {
-			/*
-			 * There is no document summary information yet. We have to create a
-			 * new one.
-			 */
-			si = PropertySetFactory.newSummaryInformation();
-			assertNotNull(si);
-		}
-	}
-
-	/**
-	 * Sets the most important information in DocumentSummaryInformation and Summary Information and rereads it
-	 */
-	public void testOne() throws Exception {
-
-		// DocumentSummaryInformation
-		dsi.setCompany("xxxCompanyxxx");
-		dsi.setManager("xxxManagerxxx");
-		dsi.setCategory("xxxCategoryxxx");
-
-		// SummaryInformation
-		si.setTitle("xxxTitlexxx");
-		si.setAuthor("xxxAuthorxxx");
-		si.setComments("xxxCommentsxxx");
-		si.setKeywords("xxxKeyWordsxxx");
-		si.setSubject("xxxSubjectxxx");
-
-		// Custom Properties (in DocumentSummaryInformation
-		CustomProperties customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			customProperties = new CustomProperties();
-		}
-
-		/* Insert some custom properties into the container. */
-		customProperties.put("Key1", "Value1");
-		customProperties.put("Schl\u00fcssel2", "Wert2");
-		customProperties.put("Sample Integer", new Integer(12345));
-		customProperties.put("Sample Boolean", Boolean.TRUE);
-		Date date = new Date();
-		customProperties.put("Sample Date", date);
-		customProperties.put("Sample Double", new Double(-1.0001));
-		customProperties.put("Sample Negative Integer", new Integer(-100000));
-
-		dsi.setCustomProperties(customProperties);
-
-		// start reading
-		closeAndReOpen();
-
-		// testing
-		assertNotNull(dsi);
-		assertNotNull(si);
-
-		assertEquals("Category", "xxxCategoryxxx", dsi.getCategory());
-		assertEquals("Company", "xxxCompanyxxx", dsi.getCompany());
-		assertEquals("Manager", "xxxManagerxxx", dsi.getManager());
-
-		assertEquals("", "xxxAuthorxxx", si.getAuthor());
-		assertEquals("", "xxxTitlexxx", si.getTitle());
-		assertEquals("", "xxxCommentsxxx", si.getComments());
-		assertEquals("", "xxxKeyWordsxxx", si.getKeywords());
-		assertEquals("", "xxxSubjectxxx", si.getSubject());
-
-		/*
-		 * Read the custom properties. If there are no custom properties yet,
-		 * the application has to create a new CustomProperties object. It will
-		 * serve as a container for custom properties.
-		 */
-		customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			fail();
-		}
-
-		/* Insert some custom properties into the container. */
-		String a1 = (String) customProperties.get("Key1");
-		assertEquals("Key1", "Value1", a1);
-		String a2 = (String) customProperties.get("Schl\u00fcssel2");
-		assertEquals("Schl\u00fcssel2", "Wert2", a2);
-		Integer a3 = (Integer) customProperties.get("Sample Integer");
-		assertEquals("Sample Number", new Integer(12345), a3);
-		Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
-		assertEquals("Sample Boolean", Boolean.TRUE, a4);
-		Date a5 = (Date) customProperties.get("Sample Date");
-		assertEquals("Custom Date:", date, a5);
-
-		Double a6 = (Double) customProperties.get("Sample Double");
-		assertEquals("Custom Float", new Double(-1.0001), a6);
-
-		Integer a7 = (Integer) customProperties.get("Sample Negative Integer");
-		assertEquals("Neg", new Integer(-100000), a7);
-	}
-
-	/**
-	 * multiplies a string
-	 * @param s Input String
-	 * @return the multiplied String
-	 */
-	private static String elongate(String s) {
-		StringBuilder sb = new StringBuilder();
-		for (int i = 0; i < 10000; i++) {
-			sb.append(s);
-			sb.append(" ");
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Test very long input in each of the fields (approx 30-60KB each)
-	 */
-	public void testTwo() throws Exception {
-
-		String company = elongate("company");
-		String manager = elongate("manager");
-		String category = elongate("category");
-		String title = elongate("title");
-		String author = elongate("author");
-		String comments = elongate("comments");
-		String keywords = elongate("keywords");
-		String subject = elongate("subject");
-		String p1 = elongate("p1");
-		String p2 = elongate("p2");
-		String k1 = elongate("k1");
-		String k2 = elongate("k2");
-
-		dsi.setCompany(company);
-		dsi.setManager(manager);
-		dsi.setCategory(category);
-
-		si.setTitle(title);
-		si.setAuthor(author);
-		si.setComments(comments);
-		si.setKeywords(keywords);
-		si.setSubject(subject);
-		CustomProperties customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			customProperties = new CustomProperties();
-		}
-
-		/* Insert some custom properties into the container. */
-		customProperties.put(k1, p1);
-		customProperties.put(k2, p2);
-		customProperties.put("Sample Number", new Integer(12345));
-		customProperties.put("Sample Boolean", Boolean.TRUE);
-		Date date = new Date();
-		customProperties.put("Sample Date", date);
-
-		dsi.setCustomProperties(customProperties);
-
-		closeAndReOpen();
-
-		assertNotNull(dsi);
-		assertNotNull(si);
-		/*
-		 * Change the category to "POI example". Any former category value will
-		 * be lost. If there has been no category yet, it will be created.
-		 */
-		assertEquals("Category", category, dsi.getCategory());
-		assertEquals("Company", company, dsi.getCompany());
-		assertEquals("Manager", manager, dsi.getManager());
-
-		assertEquals("", author, si.getAuthor());
-		assertEquals("", title, si.getTitle());
-		assertEquals("", comments, si.getComments());
-		assertEquals("", keywords, si.getKeywords());
-		assertEquals("", subject, si.getSubject());
-
-		/*
-		 * Read the custom properties. If there are no custom properties yet,
-		 * the application has to create a new CustomProperties object. It will
-		 * serve as a container for custom properties.
-		 */
-		customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			fail();
-		}
-
-		/* Insert some custom properties into the container. */
-		String a1 = (String) customProperties.get(k1);
-		assertEquals("Key1", p1, a1);
-		String a2 = (String) customProperties.get(k2);
-		assertEquals("Schl\u00fcssel2", p2, a2);
-		Integer a3 = (Integer) customProperties.get("Sample Number");
-		assertEquals("Sample Number", new Integer(12345), a3);
-		Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
-		assertEquals("Sample Boolean", Boolean.TRUE, a4);
-		Date a5 = (Date) customProperties.get("Sample Date");
-		assertEquals("Custom Date:", date, a5);
-
-	}
-
-
-	/**
-	 * adds strange characters to the string
-	 * @param s Input String
-	 * @return  the multiplied String
-	 */
-	private static String strangize(String s) {
-        StringBuilder sb = strangizeInit(s);
-
-		return sb.toString();
-	}
-
-
-	/**
-	 * Tests with strange characters in keys and data (Umlaute etc.)
-	 */
-	public void testThree() throws Exception {
-
-		String company = strangize("company");
-		String manager = strangize("manager");
-		String category = strangize("category");
-		String title = strangize("title");
-		String author = strangize("author");
-		String comments = strangize("comments");
-		String keywords = strangize("keywords");
-		String subject = strangize("subject");
-		String p1 = strangize("p1");
-		String p2 = strangize("p2");
-		String k1 = strangize("k1");
-		String k2 = strangize("k2");
-
-		dsi.setCompany(company);
-		dsi.setManager(manager);
-		dsi.setCategory(category);
-
-		si.setTitle(title);
-		si.setAuthor(author);
-		si.setComments(comments);
-		si.setKeywords(keywords);
-		si.setSubject(subject);
-		CustomProperties customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			customProperties = new CustomProperties();
-		}
-
-		/* Insert some custom properties into the container. */
-		customProperties.put(k1, p1);
-		customProperties.put(k2, p2);
-		customProperties.put("Sample Number", new Integer(12345));
-		customProperties.put("Sample Boolean", Boolean.FALSE);
-		Date date = new Date(0);
-		customProperties.put("Sample Date", date);
-
-		dsi.setCustomProperties(customProperties);
-
-		closeAndReOpen();
-
-		assertNotNull(dsi);
-		assertNotNull(si);
-		/*
-		 * Change the category to "POI example". Any former category value will
-		 * be lost. If there has been no category yet, it will be created.
-		 */
-		assertEquals("Category", category, dsi.getCategory());
-		assertEquals("Company", company, dsi.getCompany());
-		assertEquals("Manager", manager, dsi.getManager());
-
-		assertEquals("", author, si.getAuthor());
-		assertEquals("", title, si.getTitle());
-		assertEquals("", comments, si.getComments());
-		assertEquals("", keywords, si.getKeywords());
-		assertEquals("", subject, si.getSubject());
-
-		/*
-		 * Read the custom properties. If there are no custom properties yet,
-		 * the application has to create a new CustomProperties object. It will
-		 * serve as a container for custom properties.
-		 */
-		customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			fail();
-		}
-
-		/* Insert some custom properties into the container. */
-		// System.out.println(k1);
-		String a1 = (String) customProperties.get(k1);
-		assertEquals("Key1", p1, a1);
-		String a2 = (String) customProperties.get(k2);
-		assertEquals("Schl\u00fcssel2", p2, a2);
-		Integer a3 = (Integer) customProperties.get("Sample Number");
-		assertEquals("Sample Number", new Integer(12345), a3);
-		Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
-		assertEquals("Sample Boolean", Boolean.FALSE, a4);
-		Date a5 = (Date) customProperties.get("Sample Date");
-		assertEquals("Custom Date:", date, a5);
-
-	}
-
-	/**
-	 * Iterative testing: writing, reading etc.
-	 */
-	public void testFour() throws Exception {
-		for (int i = 1; i < 100; i++) {
-			setUp();
-			testThree();
-		}
-	}
-
-
-
-	/**
-	 * adds strange characters to the string with the adding of unicode characters
-	 * @param s Input String
-	 * @return  the multiplied String
-    */
-	private static String strangizeU(String s) {
-
-        StringBuilder sb = strangizeInit(s);
-		sb.append("\u00e4\u00f6\u00fc\uD840\uDC00");
-		return sb.toString();
-	}
-
-    private static StringBuilder strangizeInit(String s) {
-        StringBuilder sb = new StringBuilder();
-        String[] umlaute = { "\u00e4", "\u00fc", "\u00f6", "\u00dc", "$", "\u00d6", "\u00dc",
-                "\u00c9", "\u00d6", "@", "\u00e7", "&" };
-        Random rand = new Random(0); // TODO - no Random - tests should be completely deterministic
-        for (int i = 0; i < 5; i++) {
-            sb.append(s);
-            sb.append(" ");
-            char j = (char) rand.nextInt(220);
-            j += 33;
-            // System.out.println(j);
-            sb.append(">");
-            sb.append(Character.valueOf(j));
-            sb.append("=");
-            sb.append(umlaute[rand.nextInt(umlaute.length)]);
-            sb.append("<");
-        }
-        return sb;
-    }
-
-    /**
-	 * Unicode test
-	 */
-	public void testUnicode() throws Exception {
-		String company = strangizeU("company");
-		String manager = strangizeU("manager");
-		String category = strangizeU("category");
-		String title = strangizeU("title");
-		String author = strangizeU("author");
-		String comments = strangizeU("comments");
-		String keywords = strangizeU("keywords");
-		String subject = strangizeU("subject");
-		String p1 = strangizeU("p1");
-		String p2 = strangizeU("p2");
-		String k1 = strangizeU("k1");
-		String k2 = strangizeU("k2");
-
-		dsi.setCompany(company);
-		dsi.setManager(manager);
-		dsi.setCategory(category);
-
-		si.setTitle(title);
-		si.setAuthor(author);
-		si.setComments(comments);
-		si.setKeywords(keywords);
-		si.setSubject(subject);
-		CustomProperties customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			customProperties = new CustomProperties();
-		}
-
-		/* Insert some custom properties into the container. */
-		customProperties.put(k1, p1);
-		customProperties.put(k2, p2);
-		customProperties.put("Sample Number", new Integer(12345));
-		customProperties.put("Sample Boolean", Boolean.TRUE);
-		Date date = new Date();
-		customProperties.put("Sample Date", date);
-
-		dsi.setCustomProperties(customProperties);
-
-		closeAndReOpen();
-
-		assertNotNull(dsi);
-		assertNotNull(si);
-		/*
-		 * Change the category to "POI example". Any former category value will
-		 * be lost. If there has been no category yet, it will be created.
-		 */
-		assertEquals("Category", category, dsi.getCategory());
-		assertEquals("Company", company, dsi.getCompany());
-		assertEquals("Manager", manager, dsi.getManager());
-
-		assertEquals("", author, si.getAuthor());
-		assertEquals("", title, si.getTitle());
-		assertEquals("", comments, si.getComments());
-		assertEquals("", keywords, si.getKeywords());
-		assertEquals("", subject, si.getSubject());
-
-		/*
-		 * Read the custom properties. If there are no custom properties yet,
-		 * the application has to create a new CustomProperties object. It will
-		 * serve as a container for custom properties.
-		 */
-		customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			fail();
-		}
-
-		/* Insert some custom properties into the container. */
-		// System.out.println(k1);
-		String a1 = (String) customProperties.get(k1);
-		assertEquals("Key1", p1, a1);
-		String a2 = (String) customProperties.get(k2);
-		assertEquals("Schl\u00fcssel2", p2, a2);
-		Integer a3 = (Integer) customProperties.get("Sample Number");
-		assertEquals("Sample Number", new Integer(12345), a3);
-		Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
-		assertEquals("Sample Boolean", Boolean.TRUE, a4);
-		Date a5 = (Date) customProperties.get("Sample Date");
-		assertEquals("Custom Date:", date, a5);
-	}
-
-
-	/**
-	 * Iterative testing of the unicode test
-	 *
-	 */
-	public void testSix() throws Exception {
-		for (int i = 1; i < 100; i++) {
-			setUp();
-			testUnicode();
-		}
-	}
-
-
-	/**
-	 * Tests conversion in custom fields and errors
-	 */
-	public void testConvAndExistence() throws Exception {
-
-		CustomProperties customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			customProperties = new CustomProperties();
-		}
-
-		/* Insert some custom properties into the container. */
-		customProperties.put("int", new Integer(12345));
-		customProperties.put("negint", new Integer(-12345));
-		customProperties.put("long", new Long(12345));
-		customProperties.put("neglong", new Long(-12345));
-		customProperties.put("boolean", Boolean.TRUE);
-		customProperties.put("string", "a String");
-		// customProperties.put("float", new Float(12345.0)); is not valid
-		// customProperties.put("negfloat", new Float(-12345.1)); is not valid
-		customProperties.put("double", new Double(12345.2));
-		customProperties.put("negdouble", new Double(-12345.3));
-		// customProperties.put("char", new Character('a')); is not valid
-
-		Date date = new Date();
-		customProperties.put("date", date);
-
-		dsi.setCustomProperties(customProperties);
-
-		closeAndReOpen();
-
-		assertNotNull(dsi);
-		assertNotNull(si);
-		/*
-		 * Change the category to "POI example". Any former category value will
-		 * be lost. If there has been no category yet, it will be created.
-		 */
-		assertNull(dsi.getCategory());
-		assertNull(dsi.getCompany());
-		assertNull(dsi.getManager());
-
-		assertNull(si.getAuthor());
-		assertNull(si.getTitle());
-		assertNull(si.getComments());
-		assertNull(si.getKeywords());
-		assertNull(si.getSubject());
-
-		/*
-		 * Read the custom properties. If there are no custom properties yet,
-		 * the application has to create a new CustomProperties object. It will
-		 * serve as a container for custom properties.
-		 */
-		customProperties = dsi.getCustomProperties();
-		if (customProperties == null) {
-			fail();
-		}
-
-		/* Insert some custom properties into the container. */
-
-		Integer a3 = (Integer) customProperties.get("int");
-		assertEquals("int", new Integer(12345), a3);
-
-		a3 = (Integer) customProperties.get("negint");
-		assertEquals("negint", new Integer(-12345), a3);
-
-		Long al = (Long) customProperties.get("neglong");
-		assertEquals("neglong", new Long(-12345), al);
-
-		al = (Long) customProperties.get("long");
-		assertEquals("long", new Long(12345), al);
-
-		Boolean a4 = (Boolean) customProperties.get("boolean");
-		assertEquals("boolean", Boolean.TRUE, a4);
-
-		Date a5 = (Date) customProperties.get("date");
-		assertEquals("Custom Date:", date, a5);
-
-		Double d = (Double) customProperties.get("double");
-		assertEquals("int", new Double(12345.2), d);
-
-		d = (Double) customProperties.get("negdouble");
-		assertEquals("string", new Double(-12345.3), d);
-
-		String s = (String) customProperties.get("string");
-		assertEquals("sring", "a String", s);
-
-
-		assertTrue(customProperties.get("string") instanceof String);
-		assertTrue(customProperties.get("boolean") instanceof Boolean);
-		assertTrue(customProperties.get("int") instanceof Integer);
-		assertTrue(customProperties.get("negint") instanceof Integer);
-		assertTrue(customProperties.get("long") instanceof Long);
-		assertTrue(customProperties.get("neglong") instanceof Long);
-		assertTrue(customProperties.get("double") instanceof Double);
-		assertTrue(customProperties.get("negdouble") instanceof Double);
-		assertTrue(customProperties.get("date") instanceof Date);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
deleted file mode 100644
index b419ad1..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.HPSFException;
-import org.apache.poi.hpsf.PropertySetFactory;
-
-/**
- * <p>Tests some HPSF functionality by reading all property sets from all files
- * in the "data" directory. If you want to ensure HPSF can deal with a certain
- * OLE2 file, just add it to the "data" directory and run this test case.</p>
- */
-public class TestReadAllFiles extends TestCase {
-    private static String[] excludes = new String[] {};
-
-    /**
-     * <p>This test methods reads all property set streams from all POI
-     * filesystems in the "data" directory.</p>
-     * 
-     * @throws IOException 
-     * @throws HPSFException
-     */
-    public void testReadAllFiles() throws IOException, HPSFException
-    {
-        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-        final File dataDir = _samples.getFile("");
-        final File[] fileList = dataDir.listFiles(new FileFilter()
-            {
-                @Override
-                public boolean accept(final File f)
-                {
-                    // exclude files that we know will fail
-                    return f.isFile() && checkExclude(f);
-                }
-            });
-
-        for (final File f : fileList) {
-            /* Read the POI filesystem's property set streams: */
-            final POIFile[] psf1 = Util.readPropertySets(f);
-
-            for (int j = 0; j < psf1.length; j++)
-            {
-                final InputStream in =
-                    new ByteArrayInputStream(psf1[j].getBytes());
-                try {
-                    PropertySetFactory.create(in);
-                } catch (Exception e) {
-                    throw new IOException("While handling file: " + f + " at " + j, e);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns true if the file should be checked, false if it should be excluded.
-     *
-     * @param f
-     * @return
-     */
-    public static boolean checkExclude(File f) {
-        for(String exclude : excludes) {
-            if(f.getAbsolutePath().endsWith(exclude)) {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
deleted file mode 100644
index 6f7e6db..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.HPSFException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.Section;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.util.CodePageUtil;
-
-/**
- * <p>Tests whether Unicode string can be read from a
- * DocumentSummaryInformation.</p>
- */
-public class TestUnicode extends TestCase {
-
-    static final String POI_FS = "TestUnicode.xls";
-    static final String[] POI_FILES = new String[]
-        {
-            "\005DocumentSummaryInformation",
-        };
-    File data;
-    POIFile[] poiFiles;
-
-
-    /**
-     * <p>Read a the test file from the "data" directory.</p>
-     *
-     * @exception FileNotFoundException if the file to be read does not exist.
-     * @exception IOException if any other I/O exception occurs
-     */
-    @Override
-    protected void setUp() {
-        POIDataSamples samples = POIDataSamples.getHPSFInstance();
-        data = samples.getFile(POI_FS);
-    }
-
-
-
-    /**
-     * <p>Tests the {@link PropertySet} methods. The test file has two
-     * property set: the first one is a {@link SummaryInformation},
-     * the second one is a {@link DocumentSummaryInformation}.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     * @exception HPSFException if an HPSF exception occurs
-     */
-    public void testPropertySetMethods() throws IOException, HPSFException
-    {
-        POIFile poiFile = Util.readPOIFiles(data, POI_FILES)[0];
-        byte[] b = poiFile.getBytes();
-        PropertySet ps =
-            PropertySetFactory.create(new ByteArrayInputStream(b));
-        assertTrue(ps.isDocumentSummaryInformation());
-        assertEquals(ps.getSectionCount(), 2);
-        Section s = ps.getSections().get(1);
-        assertEquals(s.getProperty(1),
-                            Integer.valueOf(CodePageUtil.CP_UTF16));
-        assertEquals(s.getProperty(2),
-                            Integer.valueOf(-96070278));
-        assertEquals(s.getProperty(3),
-                            "MCon_Info zu Office bei Schreiner");
-        assertEquals(s.getProperty(4),
-                            "petrovitsch@schreiner-online.de");
-        assertEquals(s.getProperty(5),
-                            "Petrovitsch, Wilhelm");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
deleted file mode 100644
index ffcaa3a..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
+++ /dev/null
@@ -1,1101 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.ClassID;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.HPSFException;
-import org.apache.poi.hpsf.IllegalPropertySetDataException;
-import org.apache.poi.hpsf.MutableProperty;
-import org.apache.poi.hpsf.MutablePropertySet;
-import org.apache.poi.hpsf.MutableSection;
-import org.apache.poi.hpsf.NoFormatIDException;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.ReadingNotSupportedException;
-import org.apache.poi.hpsf.Section;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.UnsupportedVariantTypeException;
-import org.apache.poi.hpsf.Variant;
-import org.apache.poi.hpsf.VariantSupport;
-import org.apache.poi.hpsf.WritingNotSupportedException;
-import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentNode;
-import org.apache.poi.poifs.filesystem.NDocumentInputStream;
-import org.apache.poi.poifs.filesystem.NDocumentOutputStream;
-import org.apache.poi.poifs.filesystem.NPOIFSDocument;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.CodePageUtil;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.TempFile;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * <p>Tests HPSF's writing functionality.</p>
- */
-public class TestWrite
-{
-    private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-
-    static final String POI_FS = "TestHPSFWritingFunctionality.doc";
-
-    static final int BYTE_ORDER = 0xfffe;
-    static final int FORMAT     = 0x0000;
-    static final int OS_VERSION = 0x00020A04;
-    static final int[] SECTION_COUNT = {1, 2};
-    static final boolean[] IS_SUMMARY_INFORMATION = {true, false};
-    static final boolean[] IS_DOCUMENT_SUMMARY_INFORMATION = {false, true};
-
-    final String IMPROPER_DEFAULT_CHARSET_MESSAGE =
-        "Your default character set is " + getDefaultCharsetName() +
-        ". However, this testcase must be run in an environment " +
-        "with a default character set supporting at least " +
-        "8-bit-characters. You can achieve this by setting the " +
-        "LANG environment variable to a proper value, e.g. " +
-        "\"de_DE\".";
-
-    POIFile[] poiFiles;
-
-    @Before
-    public void setUp()
-    {
-        VariantSupport.setLogUnsupportedTypes(false);
-    }
-
-    /**
-     * <p>Writes an empty property set to a POIFS and reads it back
-     * in.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     */
-    @Test(expected=NoFormatIDException.class)
-    public void withoutAFormatID() throws Exception
-    {
-        final File filename = TempFile.createTempFile(POI_FS, ".doc");
-
-        /* Create a mutable property set with a section that does not have the
-         * formatID set: */
-        final OutputStream out = new FileOutputStream(filename);
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-        final MutablePropertySet ps = new MutablePropertySet();
-        ps.clearSections();
-        ps.addSection(new MutableSection());
-
-        /* Write it to a POIFS and the latter to disk: */
-        try {
-            final ByteArrayOutputStream psStream = new ByteArrayOutputStream();
-            ps.write(psStream);
-            psStream.close();
-            final byte[] streamData = psStream.toByteArray();
-            poiFs.createDocument(new ByteArrayInputStream(streamData),
-                                 SummaryInformation.DEFAULT_STREAM_NAME);
-            poiFs.writeFilesystem(out);
-        } finally {
-            poiFs.close();
-            out.close();
-        }
-    }
-
-
-
-    /**
-     * <p>Writes an empty property set to a POIFS and reads it back
-     * in.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     * @exception UnsupportedVariantTypeException if HPSF does not yet support
-     * a variant type to be written
-     */
-    @Test
-    public void writeEmptyPropertySet()
-        throws IOException, UnsupportedVariantTypeException
-    {
-        final File dataDir = _samples.getFile("");
-        final File filename = new File(dataDir, POI_FS);
-        filename.deleteOnExit();
-
-        /* Create a mutable property set and write it to a POIFS: */
-        final OutputStream out = new FileOutputStream(filename);
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-        final MutablePropertySet ps = new MutablePropertySet();
-        final MutableSection s = (MutableSection) ps.getSections().get(0);
-        s.setFormatID(SectionIDMap.SUMMARY_INFORMATION_ID);
-
-        final ByteArrayOutputStream psStream = new ByteArrayOutputStream();
-        ps.write(psStream);
-        psStream.close();
-        final byte[] streamData = psStream.toByteArray();
-        poiFs.createDocument(new ByteArrayInputStream(streamData),
-                             SummaryInformation.DEFAULT_STREAM_NAME);
-        poiFs.writeFilesystem(out);
-        poiFs.close();
-        out.close();
-
-        /* Read the POIFS: */
-        final POIFSReader r = new POIFSReader();
-        r.registerListener(new MyPOIFSReaderListener(),
-                           SummaryInformation.DEFAULT_STREAM_NAME);
-        FileInputStream stream = new FileInputStream(filename);
-        try {
-            r.read(stream);
-        } finally {
-            stream.close();
-        }
-    }
-
-
-
-    /**
-     * <p>Writes a simple property set with a SummaryInformation section to a
-     * POIFS and reads it back in.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     * @exception UnsupportedVariantTypeException if HPSF does not yet support
-     * a variant type to be written
-     */
-    @Test
-    public void writeSimplePropertySet()
-        throws IOException, UnsupportedVariantTypeException
-    {
-        final String AUTHOR = "Rainer Klute";
-        final String TITLE = "Test Document";
-        final File dataDir = _samples.getFile("");
-        final File filename = new File(dataDir, POI_FS);
-        filename.deleteOnExit();
-        final OutputStream out = new FileOutputStream(filename);
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-
-        final MutablePropertySet ps = new MutablePropertySet();
-        final MutableSection si = new MutableSection();
-        si.setFormatID(SectionIDMap.SUMMARY_INFORMATION_ID);
-        ps.getSections().set(0, si);
-
-        final MutableProperty p = new MutableProperty();
-        p.setID(PropertyIDMap.PID_AUTHOR);
-        p.setType(Variant.VT_LPWSTR);
-        p.setValue(AUTHOR);
-        si.setProperty(p);
-        si.setProperty(PropertyIDMap.PID_TITLE, Variant.VT_LPSTR, TITLE);
-
-        poiFs.createDocument(ps.toInputStream(),
-                             SummaryInformation.DEFAULT_STREAM_NAME);
-        poiFs.writeFilesystem(out);
-        poiFs.close();
-        out.close();
-
-        /* Read the POIFS: */
-        final PropertySet[] psa = new PropertySet[1];
-        final POIFSReader r = new POIFSReader();
-        r.registerListener(new POIFSReaderListener()
-            {
-                @Override
-                public void processPOIFSReaderEvent
-                    (final POIFSReaderEvent event)
-                {
-                    try
-                    {
-                        psa[0] = PropertySetFactory.create(event.getStream());
-                    }
-                    catch (Exception ex)
-                    {
-                        fail(org.apache.poi.hpsf.Util.toString(ex));
-                    }
-                }
-
-            },
-            SummaryInformation.DEFAULT_STREAM_NAME);
-        
-        InputStream stream = new FileInputStream(filename);
-        try {
-            r.read(stream);
-        } finally {
-            stream.close();
-        }
-        assertNotNull(psa[0]);
-        assertTrue(psa[0].isSummaryInformation());
-
-        final Section s = (psa[0].getSections().get(0));
-        Object p1 = s.getProperty(PropertyIDMap.PID_AUTHOR);
-        Object p2 = s.getProperty(PropertyIDMap.PID_TITLE);
-        assertEquals(AUTHOR, p1);
-        assertEquals(TITLE, p2);
-    }
-
-
-
-    /**
-     * <p>Writes a simple property set with two sections to a POIFS and reads it
-     * back in.</p>
-     *
-     * @exception IOException if an I/O exception occurs
-     * @exception WritingNotSupportedException if HPSF does not yet support
-     * a variant type to be written
-     */
-    @Test
-    public void writeTwoSections()
-        throws WritingNotSupportedException, IOException
-    {
-        final String STREAM_NAME = "PropertySetStream";
-        final String SECTION1 = "Section 1";
-        final String SECTION2 = "Section 2";
-
-        final File dataDir = _samples.getFile("");
-        final File filename = new File(dataDir, POI_FS);
-        filename.deleteOnExit();
-        final OutputStream out = new FileOutputStream(filename);
-
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-        final MutablePropertySet ps = new MutablePropertySet();
-        ps.clearSections();
-
-        final ClassID formatID = new ClassID();
-        formatID.setBytes(new byte[]{0, 1,  2,  3,  4,  5,  6,  7,
-                                     8, 9, 10, 11, 12, 13, 14, 15});
-        final MutableSection s1 = new MutableSection();
-        s1.setFormatID(formatID);
-        s1.setProperty(2, SECTION1);
-        ps.addSection(s1);
-
-        final MutableSection s2 = new MutableSection();
-        s2.setFormatID(formatID);
-        s2.setProperty(2, SECTION2);
-        ps.addSection(s2);
-
-        poiFs.createDocument(ps.toInputStream(), STREAM_NAME);
-        poiFs.writeFilesystem(out);
-        poiFs.close();
-        out.close();
-
-        /* Read the POIFS: */
-        final PropertySet[] psa = new PropertySet[1];
-        final POIFSReader r = new POIFSReader();
-        r.registerListener(new POIFSReaderListener()
-            {
-                @Override
-                public void processPOIFSReaderEvent
-                    (final POIFSReaderEvent event)
-                {
-                    try
-                    {
-                        psa[0] = PropertySetFactory.create(event.getStream());
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new RuntimeException(ex);
-                    }
-                }
-            },
-            STREAM_NAME);
-        FileInputStream stream = new FileInputStream(filename);
-        try {
-            r.read(stream);
-        } finally {
-            stream.close();
-        }
-        assertNotNull(psa[0]);
-        Section s = (psa[0].getSections().get(0));
-        assertEquals(s.getFormatID(), formatID);
-        Object p = s.getProperty(2);
-        assertEquals(SECTION1, p);
-        s = (psa[0].getSections().get(1));
-        p = s.getProperty(2);
-        assertEquals(SECTION2, p);
-    }
-
-
-
-    static class MyPOIFSReaderListener implements POIFSReaderListener
-    {
-        @Override
-        public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-        {
-            try
-            {
-                PropertySetFactory.create(event.getStream());
-            }
-            catch (Exception ex)
-            {
-                fail(org.apache.poi.hpsf.Util.toString(ex));
-            }
-        }
-    }
-
-
-
-    private static final int CODEPAGE_DEFAULT = -1;
-    private static final int CODEPAGE_1252 = 1252;
-    private static final int CODEPAGE_UTF8 = CodePageUtil.CP_UTF8;
-    private static final int CODEPAGE_UTF16 = CodePageUtil.CP_UTF16;
-
-
-
-    /**
-     * <p>Writes and reads back various variant types and checks whether the
-     * stuff that has been read back equals the stuff that was written.</p>
-     */
-    @Test
-    public void variantTypes()
-    {
-        Throwable t = null;
-        final int codepage = CODEPAGE_DEFAULT;
-        if (!hasProperDefaultCharset())
-        {
-            System.err.println(IMPROPER_DEFAULT_CHARSET_MESSAGE +
-                " This testcase is skipped.");
-            return;
-        }
-
-        try
-        {
-            check(Variant.VT_EMPTY, null, codepage);
-            check(Variant.VT_BOOL, Boolean.TRUE, codepage);
-            check(Variant.VT_BOOL, Boolean.FALSE, codepage);
-            check( Variant.VT_CF, new byte[] { 8, 0, 0, 0, 1, 0, 0, 0, 1, 2, 3,
-                    4 }, codepage );
-            check(Variant.VT_I4, Integer.valueOf(27), codepage);
-            check(Variant.VT_I8, Long.valueOf(28), codepage);
-            check(Variant.VT_R8, new Double(29.0), codepage);
-            check(Variant.VT_I4, Integer.valueOf(-27), codepage);
-            check(Variant.VT_I8, Long.valueOf(-28), codepage);
-            check(Variant.VT_R8, new Double(-29.0), codepage);
-            check(Variant.VT_FILETIME, new Date(), codepage);
-            check(Variant.VT_I4, new Integer(Integer.MAX_VALUE), codepage);
-            check(Variant.VT_I4, new Integer(Integer.MIN_VALUE), codepage);
-            check(Variant.VT_I8, new Long(Long.MAX_VALUE), codepage);
-            check(Variant.VT_I8, new Long(Long.MIN_VALUE), codepage);
-            check(Variant.VT_R8, new Double(Double.MAX_VALUE), codepage);
-            check(Variant.VT_R8, new Double(Double.MIN_VALUE), codepage);
-
-            check(Variant.VT_LPSTR,
-                  "", codepage);
-            check(Variant.VT_LPSTR,
-                  "\u00e4", codepage);
-            check(Variant.VT_LPSTR,
-                  "\u00e4\u00f6", codepage);
-            check(Variant.VT_LPSTR,
-                  "\u00e4\u00f6\u00fc", codepage);
-            check(Variant.VT_LPSTR,
-                  "\u00e4\u00f6\u00fc\u00df", codepage);
-            check(Variant.VT_LPSTR,
-                  "\u00e4\u00f6\u00fc\u00df\u00c4", codepage);
-            check(Variant.VT_LPSTR,
-                  "\u00e4\u00f6\u00fc\u00df\u00c4\u00d6", codepage);
-            check(Variant.VT_LPSTR,
-                  "\u00e4\u00f6\u00fc\u00df\u00c4\u00d6\u00dc", codepage);
-
-            check(Variant.VT_LPWSTR,
-                  "", codepage);
-            check(Variant.VT_LPWSTR,
-                  "\u00e4", codepage);
-            check(Variant.VT_LPWSTR,
-                  "\u00e4\u00f6", codepage);
-            check(Variant.VT_LPWSTR,
-                  "\u00e4\u00f6\u00fc", codepage);
-            check(Variant.VT_LPWSTR,
-                  "\u00e4\u00f6\u00fc\u00df", codepage);
-            check(Variant.VT_LPWSTR,
-                  "\u00e4\u00f6\u00fc\u00df\u00c4", codepage);
-            check(Variant.VT_LPWSTR,
-                  "\u00e4\u00f6\u00fc\u00df\u00c4\u00d6", codepage);
-            check(Variant.VT_LPWSTR,
-                  "\u00e4\u00f6\u00fc\u00df\u00c4\u00d6\u00dc", codepage);
-        }
-        catch (Exception ex)
-        {
-            t = ex;
-        }
-        catch (Error ex)
-        {
-            t = ex;
-        }
-        if (t != null)
-            fail(org.apache.poi.hpsf.Util.toString(t));
-    }
-
-
-
-    /**
-     * <p>Writes and reads back strings using several different codepages and
-     * checks whether the stuff that has been read back equals the stuff that
-     * was written.</p>
-     */
-    @Test
-    public void codepages()
-    {
-        Throwable thr = null;
-        final int[] validCodepages = new int[]
-            {CODEPAGE_DEFAULT, CODEPAGE_UTF8, CODEPAGE_UTF16, CODEPAGE_1252};
-        for (final int cp : validCodepages) {
-            if (cp == -1 && !hasProperDefaultCharset())
-            {
-                System.err.println(IMPROPER_DEFAULT_CHARSET_MESSAGE +
-                     " This testcase is skipped for the default codepage.");
-                continue;
-            }
-
-            final long t = cp == CODEPAGE_UTF16 ? Variant.VT_LPWSTR
-                                                : Variant.VT_LPSTR;
-            try
-            {
-                check(t, "", cp);
-                check(t, "\u00e4", cp);
-                check(t, "\u00e4\u00f6", cp);
-                check(t, "\u00e4\u00f6\u00fc", cp);
-                check(t, "\u00e4\u00f6\u00fc\u00c4", cp);
-                check(t, "\u00e4\u00f6\u00fc\u00c4\u00d6", cp);
-                check(t, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc", cp);
-                check(t, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", cp);
-                if (cp == CodePageUtil.CP_UTF16 || cp == CodePageUtil.CP_UTF8)
-                    check(t, "\u79D1\u5B78", cp);
-            }
-            catch (Exception ex)
-            {
-                thr = ex;
-            }
-            catch (Error ex)
-            {
-                thr = ex;
-            }
-            if (thr != null)
-                fail(org.apache.poi.hpsf.Util.toString(thr) +
-                     " with codepage " + cp);
-        }
-
-        final int[] invalidCodepages = new int[] {0, 1, 2, 4711, 815};
-        for (int cp : invalidCodepages) {
-            final long type = cp == CODEPAGE_UTF16 ? Variant.VT_LPWSTR
-                                                   : Variant.VT_LPSTR;
-            try
-            {
-                check(type, "", cp);
-                check(type, "\u00e4", cp);
-                check(type, "\u00e4\u00f6", cp);
-                check(type, "\u00e4\u00f6\u00fc", cp);
-                check(type, "\u00e4\u00f6\u00fc\u00c4", cp);
-                check(type, "\u00e4\u00f6\u00fc\u00c4\u00d6", cp);
-                check(type, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc", cp);
-                check(type, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", cp);
-                fail("UnsupportedEncodingException for codepage " + cp +
-                     " expected.");
-            }
-            catch (UnsupportedEncodingException ex)
-            {
-                /* This is the expected behaviour. */
-            }
-            catch (Exception ex)
-            {
-                thr = ex;
-            }
-            catch (Error ex)
-            {
-                thr = ex;
-            }
-            if (thr != null)
-                fail(org.apache.poi.hpsf.Util.toString(thr));
-        }
-
-    }
-
-
-
-    /**
-     * <p>Tests whether writing 8-bit characters to a Unicode property
-     * succeeds.</p>
-     */
-    @Test
-    public void unicodeWrite8Bit()
-    {
-        final String TITLE = "This is a sample title";
-        final MutablePropertySet mps = new MutablePropertySet();
-        final MutableSection ms = (MutableSection) mps.getSections().get(0);
-        ms.setFormatID(SectionIDMap.SUMMARY_INFORMATION_ID);
-        final MutableProperty p = new MutableProperty();
-        p.setID(PropertyIDMap.PID_TITLE);
-        p.setType(Variant.VT_LPSTR);
-        p.setValue(TITLE);
-        ms.setProperty(p);
-
-        Throwable t = null;
-        try
-        {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            mps.write(out);
-            out.close();
-            byte[] bytes = out.toByteArray();
-
-            PropertySet psr = new PropertySet(bytes);
-            assertTrue(psr.isSummaryInformation());
-            Section sr = psr.getSections().get(0);
-            String title = (String) sr.getProperty(PropertyIDMap.PID_TITLE);
-            assertEquals(TITLE, title);
-        }
-        catch (WritingNotSupportedException e)
-        {
-            t = e;
-        }
-        catch (IOException e)
-        {
-            t = e;
-        }
-        catch (NoPropertySetStreamException e)
-        {
-            t = e;
-        }
-        if (t != null)
-            fail(t.getMessage());
-    }
-
-
-
-    /**
-     * <p>Writes a property and reads it back in.</p>
-     *
-     * @param variantType The property's variant type.
-     * @param value The property's value.
-     * @param codepage The codepage to use for writing and reading.
-     * @throws UnsupportedVariantTypeException if the variant is not supported.
-     * @throws IOException if an I/O exception occurs.
-     * @throws ReadingNotSupportedException
-     * @throws UnsupportedEncodingException
-     */
-    private void check(final long variantType, final Object value,
-                       final int codepage)
-        throws UnsupportedVariantTypeException, IOException,
-               ReadingNotSupportedException, UnsupportedEncodingException
-    {
-        final ByteArrayOutputStream out = new ByteArrayOutputStream();
-        VariantSupport.write(out, variantType, value, codepage);
-        out.close();
-        final byte[] b = out.toByteArray();
-        final Object objRead =
-            VariantSupport.read(b, 0, b.length + LittleEndian.INT_SIZE,
-                                variantType, codepage);
-        if (objRead instanceof byte[])
-        {
-            byte[] valueB = (byte[])value;
-            byte[] readB = (byte[])objRead;
-            if (valueB.length != readB.length)
-               fail("Byte arrays are different length - expected " + valueB.length +
-                     " but found " + readB.length);
-
-            final int diff = diff(valueB, readB);
-            if (diff >= 0)
-                fail("Byte arrays are different. First different byte is at " +
-                     "index " + diff + ".");
-        }
-        else
-            if (value != null && !value.equals(objRead))
-            {
-                fail("Expected: \"" + value + "\" but was: \"" + objRead +
-                     "\". Codepage: " + codepage +
-                     (codepage == -1 ?
-                      " (" + System.getProperty("file.encoding") + ")." : "."));
-            }
-            else
-                assertEquals(value, objRead);
-    }
-
-
-
-    /**
-     * <p>Compares two byte arrays.</p>
-     *
-     * @param a The first byte array
-     * @param b The second byte array
-     * @return The index of the first byte that is different. If the byte arrays
-     * are equal, -1 is returned.
-     */
-    private int diff(final byte[] a, final byte[] b)
-    {
-        final int min = Math.min(a.length, b.length);
-        for (int i = 0; i < min; i++)
-            if (a[i] != b[i])
-                return i;
-        if (a.length != b.length)
-            return min;
-        return -1;
-    }
-
-
-
-    /**
-     * <p>This test method does a write and read back test with all POI
-     * filesystems in the "data" directory by performing the following
-     * actions for each file:</p>
-     *
-     * <ul>
-     *
-     * <li><p>Read its property set streams.</p></li>
-     *
-     * <li><p>Create a new POI filesystem containing the origin file's
-     * property set streams.</p></li>
-     *
-     * <li><p>Read the property set streams from the POI filesystem just
-     * created.</p></li>
-     *
-     * <li><p>Compare each property set stream with the corresponding one from
-     * the origin file and check whether they are equal.</p></li>
-     *
-     * </ul>
-     * @throws IOException 
-     */
-    @Test
-    public void recreate() throws IOException
-    {
-        final File dataDir = _samples.getFile("");
-        final File[] fileList = dataDir.listFiles(new FileFilter()
-            {
-                @Override
-                public boolean accept(final File f)
-                {
-                    return f.getName().startsWith("Test") && TestReadAllFiles.checkExclude(f);
-                }
-            });
-        for (final File file : fileList) {
-            try {
-                testRecreate(file);
-            } catch (Exception e) {
-                throw new IOException("While handling file " + file, e);
-            }
-        }
-    }
-
-
-
-    /**
-     * <p>Performs the check described in {@link #recreate()} for a single
-     * POI filesystem.</p>
-     *
-     * @param f the POI filesystem to check
-     * @throws IOException 
-     * @throws HPSFException
-     */
-    private void testRecreate(final File f) throws IOException, HPSFException
-    {
-        /* Read the POI filesystem's property set streams: */
-        final POIFile[] psf1 = Util.readPropertySets(f);
-
-        /* Create a new POI filesystem containing the origin file's
-         * property set streams: */
-        final File copy = TempFile.createTempFile(f.getName(), "");
-        copy.deleteOnExit();
-        final OutputStream out = new FileOutputStream(copy);
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-        for (POIFile file : psf1) {
-            final InputStream in =
-                new ByteArrayInputStream(file.getBytes());
-            final PropertySet psIn = PropertySetFactory.create(in);
-            final MutablePropertySet psOut = new MutablePropertySet(psIn);
-            final ByteArrayOutputStream psStream =
-                new ByteArrayOutputStream();
-            psOut.write(psStream);
-            psStream.close();
-            final byte[] streamData = psStream.toByteArray();
-            poiFs.createDocument(new ByteArrayInputStream(streamData),
-                                 file.getName());
-            poiFs.writeFilesystem(out);
-        }
-        poiFs.close();
-        out.close();
-
-
-        /* Read the property set streams from the POI filesystem just
-         * created. */
-        final POIFile[] psf2 = Util.readPropertySets(copy);
-        for (int i = 0; i < psf2.length; i++)
-        {
-            final byte[] bytes1 = psf1[i].getBytes();
-            final byte[] bytes2 = psf2[i].getBytes();
-            final InputStream in1 = new ByteArrayInputStream(bytes1);
-            final InputStream in2 = new ByteArrayInputStream(bytes2);
-            final PropertySet ps1 = PropertySetFactory.create(in1);
-            final PropertySet ps2 = PropertySetFactory.create(in2);
-
-            /* Compare the property set stream with the corresponding one
-             * from the origin file and check whether they are equal. */
-            assertEquals("Equality for file " + f.getName(), ps1, ps2);
-        }
-    }
-
-
-
-    /**
-     * <p>Tests writing and reading back a proper dictionary.</p>
-     * @throws IOException 
-     * @throws HPSFException 
-     */
-    @Test
-    public void dictionary() throws IOException, HPSFException
-    {
-        final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
-        copy.deleteOnExit();
-
-        /* Write: */
-        final OutputStream out = new FileOutputStream(copy);
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-        final MutablePropertySet ps1 = new MutablePropertySet();
-        final MutableSection s = (MutableSection) ps1.getSections().get(0);
-        final Map<Long,String> m = new HashMap<Long,String>(3, 1.0f);
-        m.put(Long.valueOf(1), "String 1");
-        m.put(Long.valueOf(2), "String 2");
-        m.put(Long.valueOf(3), "String 3");
-        s.setDictionary(m);
-        s.setFormatID(SectionIDMap.DOCUMENT_SUMMARY_INFORMATION_ID[0]);
-        int codepage = CodePageUtil.CP_UNICODE;
-        s.setProperty(PropertyIDMap.PID_CODEPAGE, Variant.VT_I2,
-                      Integer.valueOf(codepage));
-        poiFs.createDocument(ps1.toInputStream(), "Test");
-        poiFs.writeFilesystem(out);
-        poiFs.close();
-        out.close();
-
-        /* Read back: */
-        final POIFile[] psf = Util.readPropertySets(copy);
-        assertEquals(1, psf.length);
-        final byte[] bytes = psf[0].getBytes();
-        final InputStream in = new ByteArrayInputStream(bytes);
-        final PropertySet ps2 = PropertySetFactory.create(in);
-
-        /* Check if the result is a DocumentSummaryInformation stream, as
-         * specified. */
-        assertTrue(ps2.isDocumentSummaryInformation());
-
-        /* Compare the property set stream with the corresponding one
-         * from the origin file and check whether they are equal. */
-        assertEquals(ps1, ps2);
-    }
-
-    /**
-     * Tests that when using NPOIFS, we can do an in-place write
-     *  without needing to stream in + out the whole kitchen sink
-     */
-    @Test
-    public void inPlaceNPOIFSWrite() throws Exception {
-        NPOIFSFileSystem fs = null;
-        DirectoryEntry root = null;
-        DocumentNode sinfDoc = null;
-        DocumentNode dinfDoc = null;
-        SummaryInformation sinf = null;
-        DocumentSummaryInformation dinf = null;
-        
-        // We need to work on a File for in-place changes, so create a temp one
-        final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
-        copy.deleteOnExit();
-        
-        // Copy a test file over to our temp location
-        InputStream inp = _samples.openResourceAsStream("TestShiftJIS.doc");
-        FileOutputStream out = new FileOutputStream(copy);
-        IOUtils.copy(inp, out);
-        inp.close();
-        out.close();
-        
-        
-        // Open the copy in read/write mode
-        fs = new NPOIFSFileSystem(copy, false);
-        root = fs.getRoot();
-        
-        
-        // Read the properties in there
-        sinfDoc = (DocumentNode)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-        dinfDoc = (DocumentNode)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-
-        InputStream sinfStream = new NDocumentInputStream(sinfDoc);
-        sinf = (SummaryInformation)PropertySetFactory.create(sinfStream);
-        sinfStream.close();
-        assertEquals(131077, sinf.getOSVersion());
-        
-        InputStream dinfStream = new NDocumentInputStream(dinfDoc);
-        dinf = (DocumentSummaryInformation)PropertySetFactory.create(dinfStream);
-        dinfStream.close();
-        assertEquals(131077, dinf.getOSVersion());
-        
-        
-        // Check they start as we expect
-        assertEquals("Reiichiro Hori", sinf.getAuthor());
-        assertEquals("Microsoft Word 9.0", sinf.getApplicationName());
-        assertEquals("\u7b2c1\u7ae0", sinf.getTitle());
-        
-        assertEquals("", dinf.getCompany());
-        assertEquals(null, dinf.getManager());
-        
-        
-        // Do an in-place replace via an InputStream
-        new NPOIFSDocument(sinfDoc).replaceContents(sinf.toInputStream());
-        new NPOIFSDocument(dinfDoc).replaceContents(dinf.toInputStream());
-        
-        
-        // Check it didn't get changed
-        sinfDoc = (DocumentNode)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-        dinfDoc = (DocumentNode)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        
-        InputStream sinfStream2 = new NDocumentInputStream(sinfDoc);
-        sinf = (SummaryInformation)PropertySetFactory.create(sinfStream2);
-        sinfStream2.close();
-        assertEquals(131077, sinf.getOSVersion());
-        
-        InputStream dinfStream2 = new NDocumentInputStream(dinfDoc);
-        dinf = (DocumentSummaryInformation)PropertySetFactory.create(dinfStream2);
-        dinfStream2.close();
-        assertEquals(131077, dinf.getOSVersion());
-
-        
-        // Start again!
-        fs.close();
-        inp = _samples.openResourceAsStream("TestShiftJIS.doc");
-        out = new FileOutputStream(copy);
-        IOUtils.copy(inp, out);
-        inp.close();
-        out.close();
-        
-        fs = new NPOIFSFileSystem(copy, false);
-        root = fs.getRoot();
-        
-        // Read the properties in once more
-        sinfDoc = (DocumentNode)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-        dinfDoc = (DocumentNode)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-
-        InputStream sinfStream3 = new NDocumentInputStream(sinfDoc);
-        sinf = (SummaryInformation)PropertySetFactory.create(sinfStream3);
-        sinfStream3.close();
-        assertEquals(131077, sinf.getOSVersion());
-        
-        InputStream dinfStream3 = new NDocumentInputStream(dinfDoc);
-        dinf = (DocumentSummaryInformation)PropertySetFactory.create(dinfStream3);
-        dinfStream3.close();
-        assertEquals(131077, dinf.getOSVersion());
-        
-        
-        // Have them write themselves in-place with no changes, as an OutputStream
-        OutputStream soufStream = new NDocumentOutputStream(sinfDoc);
-        sinf.write(soufStream);
-        soufStream.close();
-        OutputStream doufStream = new NDocumentOutputStream(dinfDoc);
-        dinf.write(doufStream);
-        doufStream.close();
-        
-        // And also write to some bytes for checking
-        ByteArrayOutputStream sinfBytes = new ByteArrayOutputStream();
-        sinf.write(sinfBytes);
-        ByteArrayOutputStream dinfBytes = new ByteArrayOutputStream();
-        dinf.write(dinfBytes);
-        
-        
-        // Check that the filesystem can give us back the same bytes
-        sinfDoc = (DocumentNode)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-        dinfDoc = (DocumentNode)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-
-        InputStream sinfStream4 = new NDocumentInputStream(sinfDoc);
-        byte[] sinfData = IOUtils.toByteArray(sinfStream4);
-        sinfStream4.close();
-        InputStream dinfStream4 = new NDocumentInputStream(dinfDoc);
-        byte[] dinfData = IOUtils.toByteArray(dinfStream4);
-        dinfStream4.close();
-        assertThat(sinfBytes.toByteArray(), equalTo(sinfData));
-        assertThat(dinfBytes.toByteArray(), equalTo(dinfData));
-
-        
-        // Read back in as-is
-        InputStream sinfStream5 = new NDocumentInputStream(sinfDoc);
-        sinf = (SummaryInformation)PropertySetFactory.create(sinfStream5);
-        sinfStream5.close();
-        assertEquals(131077, sinf.getOSVersion());
-        
-        InputStream dinfStream5 = new NDocumentInputStream(dinfDoc);
-        dinf = (DocumentSummaryInformation)PropertySetFactory.create(dinfStream5);
-        dinfStream5.close();
-        assertEquals(131077, dinf.getOSVersion());
-        
-        assertEquals("Reiichiro Hori", sinf.getAuthor());
-        assertEquals("Microsoft Word 9.0", sinf.getApplicationName());
-        assertEquals("\u7b2c1\u7ae0", sinf.getTitle());
-        
-        assertEquals("", dinf.getCompany());
-        assertEquals(null, dinf.getManager());
-        
-
-        // Now alter a few of them
-        sinf.setAuthor("Changed Author");
-        sinf.setTitle("Le titre \u00e9tait chang\u00e9");
-        dinf.setManager("Changed Manager");
-        
-        
-        // Save this into the filesystem
-        OutputStream soufStream2 = new NDocumentOutputStream(sinfDoc);
-        sinf.write(soufStream2);
-        soufStream2.close();
-        OutputStream doufStream2 = new NDocumentOutputStream(dinfDoc);
-        dinf.write(doufStream2);
-        doufStream2.close();
-        
-        
-        // Read them back in again
-        sinfDoc = (DocumentNode)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-        InputStream sinfStream6 = new NDocumentInputStream(sinfDoc);
-        sinf = (SummaryInformation)PropertySetFactory.create(sinfStream6);
-        sinfStream6.close();
-        assertEquals(131077, sinf.getOSVersion());
-        
-        dinfDoc = (DocumentNode)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        InputStream dinfStream6 = new NDocumentInputStream(dinfDoc);
-        dinf = (DocumentSummaryInformation)PropertySetFactory.create(dinfStream6);
-        dinfStream6.close();
-        assertEquals(131077, dinf.getOSVersion());
-
-        assertEquals("Changed Author", sinf.getAuthor());
-        assertEquals("Microsoft Word 9.0", sinf.getApplicationName());
-        assertEquals("Le titre \u00e9tait chang\u00e9", sinf.getTitle());
-        
-        assertEquals("", dinf.getCompany());
-        assertEquals("Changed Manager", dinf.getManager());
-
-        
-        // Close the whole filesystem, and open it once more
-        fs.writeFilesystem();
-        fs.close();
-        
-        fs = new NPOIFSFileSystem(copy);
-        root = fs.getRoot();
-        
-        // Re-check on load
-        sinfDoc = (DocumentNode)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME);
-        InputStream sinfStream7 = new NDocumentInputStream(sinfDoc);
-        sinf = (SummaryInformation)PropertySetFactory.create(sinfStream7);
-        sinfStream7.close();
-        assertEquals(131077, sinf.getOSVersion());
-        
-        dinfDoc = (DocumentNode)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        InputStream dinfStream7 = new NDocumentInputStream(dinfDoc);
-        dinf = (DocumentSummaryInformation)PropertySetFactory.create(dinfStream7);
-        dinfStream7.close();
-        assertEquals(131077, dinf.getOSVersion());
-
-        assertEquals("Changed Author", sinf.getAuthor());
-        assertEquals("Microsoft Word 9.0", sinf.getApplicationName());
-        assertEquals("Le titre \u00e9tait chang\u00e9", sinf.getTitle());
-        
-        assertEquals("", dinf.getCompany());
-        assertEquals("Changed Manager", dinf.getManager());
-        
-        
-        // Tidy up
-        fs.close();
-        copy.delete();
-    }
-
-
-    /**
-     * <p>Tests writing and reading back a proper dictionary with an invalid
-     * codepage. (HPSF writes Unicode dictionaries only.)</p>
-     * @throws IOException 
-     * @throws HPSFException 
-     */
-    @Test(expected=IllegalPropertySetDataException.class)
-    public void dictionaryWithInvalidCodepage() throws IOException, HPSFException
-    {
-        final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
-        copy.deleteOnExit();
-        
-        /* Write: */
-        final OutputStream out = new FileOutputStream(copy);
-        
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
-        final MutablePropertySet ps1 = new MutablePropertySet();
-        final MutableSection s = (MutableSection) ps1.getSections().get(0);
-        final Map<Long,String> m = new HashMap<Long, String>(3, 1.0f);
-        m.put(Long.valueOf(1), "String 1");
-        m.put(Long.valueOf(2), "String 2");
-        m.put(Long.valueOf(3), "String 3");
-
-        try {
-            s.setDictionary(m);
-            s.setFormatID(SectionIDMap.DOCUMENT_SUMMARY_INFORMATION_ID[0]);
-            int codepage = 12345;
-            s.setProperty(PropertyIDMap.PID_CODEPAGE, Variant.VT_I2,
-                          Integer.valueOf(codepage));
-            poiFs.createDocument(ps1.toInputStream(), "Test");
-            poiFs.writeFilesystem(out);
-        } finally {
-            poiFs.close();
-            out.close();
-        }
-    }
-
-
-
-    /**
-     * <p>Returns the display name of the default character set.</p>
-     *
-     * @return the display name of the default character set.
-     */
-    private String getDefaultCharsetName()
-    {
-        final String charSetName = System.getProperty("file.encoding");
-        final Charset charSet = Charset.forName(charSetName);
-        return charSet.displayName(Locale.ROOT);
-    }
-
-
-
-    /**
-     * <p>In order to execute tests with characters beyond US-ASCII, this
-     * method checks whether the application is runing in an environment
-     * where the default character set is 16-bit-capable.</p>
-     *
-     * @return <code>true</code> if the default character set is 16-bit-capable,
-     * else <code>false</code>.
-     */
-    private boolean hasProperDefaultCharset()
-    {
-        final String charSetName = System.getProperty("file.encoding");
-        final Charset charSet = Charset.forName(charSetName);
-        return charSet.newEncoder().canEncode('\u00e4');
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
deleted file mode 100644
index b47417e..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
+++ /dev/null
@@ -1,744 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.CustomProperties;
-import org.apache.poi.hpsf.CustomProperty;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.MutableProperty;
-import org.apache.poi.hpsf.MutableSection;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.UnexpectedPropertySetTypeException;
-import org.apache.poi.hpsf.Variant;
-import org.apache.poi.hpsf.VariantSupport;
-import org.apache.poi.hpsf.WritingNotSupportedException;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.TempFile;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * <p>Tests HPSF's high-level writing functionality for the well-known property
- * set "SummaryInformation" and "DocumentSummaryInformation".</p>
- */
-public class TestWriteWellKnown {
-
-    private static final String POI_FS = "TestWriteWellKnown.doc";
-
-    @BeforeClass
-    public static void setUp() {
-        VariantSupport.setLogUnsupportedTypes(false);
-    }
-
-    /**
-     * <p>This test method checks whether DocumentSummary information streams
-     * can be read. This is done by opening all "Test*" files in the 'poifs' directrory
-     * pointed to by the "POI.testdata.path" system property, trying to extract
-     * the document summary information stream in the root directory and calling
-     * its get... methods.</p>
-     */
-    @Test
-    public void testReadDocumentSummaryInformation()
-            throws FileNotFoundException, IOException,
-            NoPropertySetStreamException, MarkUnsupportedException,
-            UnexpectedPropertySetTypeException
-    {
-        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-        final File dataDir = _samples.getFile("");
-        final File[] docs = dataDir.listFiles(new FileFilter()
-        {
-            @Override
-            public boolean accept(final File file)
-            {
-                return file.isFile() && file.getName().startsWith("Test") && TestReadAllFiles.checkExclude(file);
-            }
-        });
-
-        for (final File doc : docs) {
-            NPOIFSFileSystem poifs = null;
-            try {
-                /* Read a test document <em>doc</em> into a POI filesystem. */
-                poifs = new NPOIFSFileSystem(doc, true);
-                final DirectoryEntry dir = poifs.getRoot();
-                /*
-                 * If there is a document summry information stream, read it from
-                 * the POI filesystem.
-                 */
-                if (dir.hasEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)) {
-                    final DocumentSummaryInformation dsi = getDocumentSummaryInformation(poifs);
-    
-                    /* Execute the get... methods. */
-                    dsi.getByteCount();
-                    dsi.getByteOrder();
-                    dsi.getCategory();
-                    dsi.getCompany();
-                    dsi.getCustomProperties();
-                    // FIXME dsi.getDocparts();
-                    // FIXME dsi.getHeadingPair();
-                    dsi.getHiddenCount();
-                    dsi.getLineCount();
-                    dsi.getLinksDirty();
-                    dsi.getManager();
-                    dsi.getMMClipCount();
-                    dsi.getNoteCount();
-                    dsi.getParCount();
-                    dsi.getPresentationFormat();
-                    dsi.getScale();
-                    dsi.getSlideCount();
-                }
-            } catch (Exception e) {
-                throw new IOException("While handling file " + doc, e);
-            } finally {
-                if (poifs != null) poifs.close();
-            }
-        }
-    }
-
-    static final String P_APPLICATION_NAME = "ApplicationName";
-    static final String P_AUTHOR = "Author";
-    static final int    P_CHAR_COUNT = 4712;
-    static final String P_COMMENTS = "Comments";
-    static final Date   P_CREATE_DATE_TIME;
-    static final long   P_EDIT_TIME = 4713 * 1000 * 10;
-    static final String P_KEYWORDS = "Keywords";
-    static final String P_LAST_AUTHOR = "LastAuthor";
-    static final Date   P_LAST_PRINTED;
-    static final Date   P_LAST_SAVE_DATE_TIME;
-    static final int    P_PAGE_COUNT = 4714;
-    static final String P_REV_NUMBER = "RevNumber";
-    static final int    P_SECURITY = 1;
-    static final String P_SUBJECT = "Subject";
-    static final String P_TEMPLATE = "Template";
-    // FIXME (byte array properties not yet implemented): static final byte[] P_THUMBNAIL = new byte[123];
-    static final String P_TITLE = "Title";
-    static final int    P_WORD_COUNT = 4715;
-
-    static final int     P_BYTE_COUNT = 4716;
-    static final String  P_CATEGORY = "Category";
-    static final String  P_COMPANY = "Company";
-    // FIXME (byte array properties not yet implemented): static final byte[]  P_DOCPARTS = new byte[123];
-    // FIXME (byte array properties not yet implemented): static final byte[]  P_HEADING_PAIR = new byte[123];
-    static final int     P_HIDDEN_COUNT = 4717;
-    static final int     P_LINE_COUNT = 4718;
-    static final boolean P_LINKS_DIRTY = true;
-    static final String  P_MANAGER = "Manager";
-    static final int     P_MM_CLIP_COUNT = 4719;
-    static final int     P_NOTE_COUNT = 4720;
-    static final int     P_PAR_COUNT = 4721;
-    static final String  P_PRESENTATION_FORMAT = "PresentationFormat";
-    static final boolean P_SCALE = false;
-    static final int     P_SLIDE_COUNT = 4722;
-    static final Date    now = new Date();
-
-    static final Integer POSITIVE_INTEGER = new Integer(2222);
-    static final Long POSITIVE_LONG = new  Long(3333);
-    static final Double POSITIVE_DOUBLE = new  Double(4444);
-    static final Integer NEGATIVE_INTEGER = new Integer(2222);
-    static final Long NEGATIVE_LONG = new  Long(3333);
-    static final Double NEGATIVE_DOUBLE = new  Double(4444);
-
-    static final Integer MAX_INTEGER = new Integer(Integer.MAX_VALUE);
-    static final Integer MIN_INTEGER = new Integer(Integer.MIN_VALUE);
-    static final Long MAX_LONG = new Long(Long.MAX_VALUE);
-    static final Long MIN_LONG = new Long(Long.MIN_VALUE);
-    static final Double MAX_DOUBLE = new Double(Double.MAX_VALUE);
-    static final Double MIN_DOUBLE = new Double(Double.MIN_VALUE);
-
-    static {
-        Calendar cal = LocaleUtil.getLocaleCalendar(2000, 6, 6, 6, 6, 6);
-        P_CREATE_DATE_TIME = cal.getTime();
-        cal.set(2001, 7, 7, 7, 7, 7);
-        P_LAST_PRINTED = cal.getTime();
-        cal.set(2002, 8, 8, 8, 8, 8);
-        P_LAST_SAVE_DATE_TIME = cal.getTime();
-    }
-    
-    /**
-     * <p>This test method test the writing of properties in the well-known
-     * property set streams "SummaryInformation" and
-     * "DocumentSummaryInformation" by performing the following steps:</p>
-     *
-     * <ol>
-     *
-     * <li><p>Read a test document <em>doc1</em> into a POI filesystem.</p></li>
-     *
-     * <li><p>Read the summary information stream and the document summary
-     * information stream from the POI filesystem.</p></li>
-     *
-     * <li><p>Write all properties supported by HPSF to the summary
-     * information (e.g. author, edit date, application name) and to the
-     * document summary information (e.g. company, manager).</p></li>
-     *
-     * <li><p>Write the summary information stream and the document summary
-     * information stream to the POI filesystem.</p></li>
-     *
-     * <li><p>Write the POI filesystem to a (temporary) file <em>doc2</em>
-     * and close the latter.</p></li>
-     *
-     * <li><p>Open <em>doc2</em> for reading and check summary information
-     * and document summary information. All properties written before must be
-     * found in the property streams of <em>doc2</em> and have the correct
-     * values.</p></li>
-     *
-     * <li><p>Remove all properties supported by HPSF from the summary
-     * information (e.g. author, edit date, application name) and from the
-     * document summary information (e.g. company, manager).</p></li>
-     *
-     * <li><p>Write the summary information stream and the document summary
-     * information stream to the POI filesystem.</p></li>
-     *
-     * <li><p>Write the POI filesystem to a (temporary) file <em>doc3</em>
-     * and close the latter.</p></li>
-     *
-     * <li><p>Open <em>doc3</em> for reading and check summary information
-     * and document summary information. All properties removed before must not
-     * be found in the property streams of <em>doc3</em>.</p></li> </ol>
-     *
-     * @throws IOException if some I/O error occurred.
-     * @throws MarkUnsupportedException
-     * @throws NoPropertySetStreamException
-     * @throws UnexpectedPropertySetTypeException
-     * @throws WritingNotSupportedException
-     */
-    @Test
-    public void testWriteWellKnown() throws Exception {
-        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-        
-        final File doc1 = TempFile.createTempFile("POI_HPSF_Test1.", ".tmp");
-        final File doc2 = TempFile.createTempFile("POI_HPSF_Test2.", ".tmp");
-        final File doc3 = TempFile.createTempFile("POI_HPSF_Test3.", ".tmp");
-
-        FileInputStream fis = new FileInputStream(_samples.getFile(POI_FS));
-        FileOutputStream fos = new FileOutputStream(doc1);
-        IOUtils.copy(fis, fos);
-        fos.close();
-        fis.close();
-        
-        CustomProperties cps1 = write1stFile(doc1, doc2);
-        CustomProperties cps2 = write2ndFile(doc2, doc3);
-        write3rdFile(doc3, null);
-        
-        assertEquals(cps1, cps2);
-    }
-    
-    /*
-     * Write all properties supported by HPSF to the summary information
-     * (e.g. author, edit date, application name) and to the document
-     * summary information (e.g. company, manager).
-     */
-    private static CustomProperties write1stFile(File fileIn, File fileOut) throws Exception {
-        /* Read a test document <em>doc1</em> into a POI filesystem. */
-        NPOIFSFileSystem poifs = new NPOIFSFileSystem(fileIn, false);
-
-        /*
-         * Read the summary information stream and the document summary
-         * information stream from the POI filesystem.
-         *
-         * Please note that the result consists of SummaryInformation and
-         * DocumentSummaryInformation instances which are in memory only. To
-         * make them permanent they have to be written to a POI filesystem
-         * explicitly (overwriting the former contents). Then the POI filesystem
-         * should be saved to a file.
-         */
-        SummaryInformation si = getSummaryInformation(poifs);
-        DocumentSummaryInformation dsi = getDocumentSummaryInformation(poifs);
-
-        si.setApplicationName(P_APPLICATION_NAME);
-        si.setAuthor(P_AUTHOR);
-        si.setCharCount(P_CHAR_COUNT);
-        si.setComments(P_COMMENTS);
-        si.setCreateDateTime(P_CREATE_DATE_TIME);
-        si.setEditTime(P_EDIT_TIME);
-        si.setKeywords(P_KEYWORDS);
-        si.setLastAuthor(P_LAST_AUTHOR);
-        si.setLastPrinted(P_LAST_PRINTED);
-        si.setLastSaveDateTime(P_LAST_SAVE_DATE_TIME);
-        si.setPageCount(P_PAGE_COUNT);
-        si.setRevNumber(P_REV_NUMBER);
-        si.setSecurity(P_SECURITY);
-        si.setSubject(P_SUBJECT);
-        si.setTemplate(P_TEMPLATE);
-        // FIXME (byte array properties not yet implemented): si.setThumbnail(P_THUMBNAIL);
-        si.setTitle(P_TITLE);
-        si.setWordCount(P_WORD_COUNT);
-
-        dsi.setByteCount(P_BYTE_COUNT);
-        dsi.setCategory(P_CATEGORY);
-        dsi.setCompany(P_COMPANY);
-        // FIXME (byte array properties not yet implemented): dsi.setDocparts(P_DOCPARTS);
-        // FIXME (byte array properties not yet implemented): dsi.setHeadingPair(P_HEADING_PAIR);
-        dsi.setHiddenCount(P_HIDDEN_COUNT);
-        dsi.setLineCount(P_LINE_COUNT);
-        dsi.setLinksDirty(P_LINKS_DIRTY);
-        dsi.setManager(P_MANAGER);
-        dsi.setMMClipCount(P_MM_CLIP_COUNT);
-        dsi.setNoteCount(P_NOTE_COUNT);
-        dsi.setParCount(P_PAR_COUNT);
-        dsi.setPresentationFormat(P_PRESENTATION_FORMAT);
-        dsi.setScale(P_SCALE);
-        dsi.setSlideCount(P_SLIDE_COUNT);
-
-        CustomProperties cps = dsi.getCustomProperties();
-        assertNull(cps);
-        cps = new CustomProperties();
-        cps.put("Schl\u00fcssel \u00e4",    "Wert \u00e4");
-        cps.put("Schl\u00fcssel \u00e4\u00f6",   "Wert \u00e4\u00f6");
-        cps.put("Schl\u00fcssel \u00e4\u00f6\u00fc",  "Wert \u00e4\u00f6\u00fc");
-        cps.put("Schl\u00fcssel \u00e4\u00f6\u00fc\u00d6", "Wert \u00e4\u00f6\u00fc\u00d6");
-        cps.put("positive_Integer", POSITIVE_INTEGER);
-        cps.put("positive_Long", POSITIVE_LONG);
-        cps.put("positive_Double", POSITIVE_DOUBLE);
-        cps.put("negative_Integer", NEGATIVE_INTEGER);
-        cps.put("negative_Long", NEGATIVE_LONG);
-        cps.put("negative_Double", NEGATIVE_DOUBLE);
-        cps.put("Boolean", Boolean.TRUE);
-        cps.put("Date", now);
-        cps.put("max_Integer", MAX_INTEGER);
-        cps.put("min_Integer", MIN_INTEGER);
-        cps.put("max_Long", MAX_LONG);
-        cps.put("min_Long", MIN_LONG);
-        cps.put("max_Double", MAX_DOUBLE);
-        cps.put("min_Double", MIN_DOUBLE);
-        
-        // Check the keys went in
-        assertTrue(cps.containsKey("Schl\u00fcssel \u00e4"));
-        assertTrue(cps.containsKey("Boolean"));
-        
-        // Check the values went in
-        assertEquals("Wert \u00e4", cps.get("Schl\u00fcssel \u00e4"));
-        assertEquals(Boolean.TRUE, cps.get("Boolean"));
-        assertTrue(cps.containsValue(Boolean.TRUE));
-        assertTrue(cps.containsValue("Wert \u00e4"));
-        
-        // Check that things that aren't in aren't in
-        assertFalse(cps.containsKey("False Boolean"));
-        assertFalse(cps.containsValue(Boolean.FALSE));
-
-        // Save as our custom properties
-        dsi.setCustomProperties(cps);
-
-        
-        /* Write the summary information stream and the document summary
-         * information stream to the POI filesystem. */
-        si.write(poifs.getRoot(), SummaryInformation.DEFAULT_STREAM_NAME);
-        dsi.write(poifs.getRoot(), DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-
-        /* Write the POI filesystem to a (temporary) file <em>doc2</em>
-         * and close the latter. */
-        OutputStream out = new FileOutputStream(fileOut);
-        poifs.writeFilesystem(out);
-        out.close();
-        poifs.close();
-        
-        return cps;
-    }
-    
-    /*
-     * Open <em>doc2</em> for reading and check summary information and
-     * document summary information. All properties written before must be
-     * found in the property streams of <em>doc2</em> and have the correct
-     * values.
-     */
-    private static CustomProperties write2ndFile(File fileIn, File fileOut) throws Exception {
-        NPOIFSFileSystem poifs = new NPOIFSFileSystem(fileIn, false);
-        SummaryInformation si = getSummaryInformation(poifs);
-        DocumentSummaryInformation dsi = getDocumentSummaryInformation(poifs);
-
-        assertEquals(P_APPLICATION_NAME, si.getApplicationName());
-        assertEquals(P_AUTHOR, si.getAuthor());
-        assertEquals(P_CHAR_COUNT, si.getCharCount());
-        assertEquals(P_COMMENTS, si.getComments());
-        assertEquals(P_CREATE_DATE_TIME, si.getCreateDateTime());
-        assertEquals(P_EDIT_TIME, si.getEditTime());
-        assertEquals(P_KEYWORDS, si.getKeywords());
-        assertEquals(P_LAST_AUTHOR, si.getLastAuthor());
-        assertEquals(P_LAST_PRINTED, si.getLastPrinted());
-        assertEquals(P_LAST_SAVE_DATE_TIME, si.getLastSaveDateTime());
-        assertEquals(P_PAGE_COUNT, si.getPageCount());
-        assertEquals(P_REV_NUMBER, si.getRevNumber());
-        assertEquals(P_SECURITY, si.getSecurity());
-        assertEquals(P_SUBJECT, si.getSubject());
-        assertEquals(P_TEMPLATE, si.getTemplate());
-        // FIXME (byte array properties not yet implemented): assertEquals(P_THUMBNAIL, si.getThumbnail());
-        assertEquals(P_TITLE, si.getTitle());
-        assertEquals(P_WORD_COUNT, si.getWordCount());
-
-        assertEquals(P_BYTE_COUNT, dsi.getByteCount());
-        assertEquals(P_CATEGORY, dsi.getCategory());
-        assertEquals(P_COMPANY, dsi.getCompany());
-        // FIXME (byte array properties not yet implemented): assertEquals(P_, dsi.getDocparts());
-        // FIXME (byte array properties not yet implemented): assertEquals(P_, dsi.getHeadingPair());
-        assertEquals(P_HIDDEN_COUNT, dsi.getHiddenCount());
-        assertEquals(P_LINE_COUNT, dsi.getLineCount());
-        assertEquals(P_LINKS_DIRTY, dsi.getLinksDirty());
-        assertEquals(P_MANAGER, dsi.getManager());
-        assertEquals(P_MM_CLIP_COUNT, dsi.getMMClipCount());
-        assertEquals(P_NOTE_COUNT, dsi.getNoteCount());
-        assertEquals(P_PAR_COUNT, dsi.getParCount());
-        assertEquals(P_PRESENTATION_FORMAT, dsi.getPresentationFormat());
-        assertEquals(P_SCALE, dsi.getScale());
-        assertEquals(P_SLIDE_COUNT, dsi.getSlideCount());
-
-        final CustomProperties cps = dsi.getCustomProperties();
-        assertNotNull(cps);
-        assertNull(cps.get("No value available"));
-        assertEquals("Wert \u00e4", cps.get("Schl\u00fcssel \u00e4"));
-        assertEquals("Wert \u00e4\u00f6", cps.get("Schl\u00fcssel \u00e4\u00f6"));
-        assertEquals("Wert \u00e4\u00f6\u00fc", cps.get("Schl\u00fcssel \u00e4\u00f6\u00fc"));
-        assertEquals("Wert \u00e4\u00f6\u00fc\u00d6", cps.get("Schl\u00fcssel \u00e4\u00f6\u00fc\u00d6"));
-        assertEquals(POSITIVE_INTEGER, cps.get("positive_Integer"));
-        assertEquals(POSITIVE_LONG, cps.get("positive_Long"));
-        assertEquals(POSITIVE_DOUBLE, cps.get("positive_Double"));
-        assertEquals(NEGATIVE_INTEGER, cps.get("negative_Integer"));
-        assertEquals(NEGATIVE_LONG, cps.get("negative_Long"));
-        assertEquals(NEGATIVE_DOUBLE, cps.get("negative_Double"));
-        assertEquals(Boolean.TRUE, cps.get("Boolean"));
-        assertEquals(now, cps.get("Date"));
-        assertEquals(MAX_INTEGER, cps.get("max_Integer"));
-        assertEquals(MIN_INTEGER, cps.get("min_Integer"));
-        assertEquals(MAX_LONG, cps.get("max_Long"));
-        assertEquals(MIN_LONG, cps.get("min_Long"));
-        assertEquals(MAX_DOUBLE, cps.get("max_Double"));
-        assertEquals(MIN_DOUBLE, cps.get("min_Double"));
-
-        /* Remove all properties supported by HPSF from the summary
-         * information (e.g. author, edit date, application name) and from the
-         * document summary information (e.g. company, manager). */
-        si.removeApplicationName();
-        si.removeAuthor();
-        si.removeCharCount();
-        si.removeComments();
-        si.removeCreateDateTime();
-        si.removeEditTime();
-        si.removeKeywords();
-        si.removeLastAuthor();
-        si.removeLastPrinted();
-        si.removeLastSaveDateTime();
-        si.removePageCount();
-        si.removeRevNumber();
-        si.removeSecurity();
-        si.removeSubject();
-        si.removeTemplate();
-        si.removeThumbnail();
-        si.removeTitle();
-        si.removeWordCount();
-
-        dsi.removeByteCount();
-        dsi.removeCategory();
-        dsi.removeCompany();
-        dsi.removeCustomProperties();
-        dsi.removeDocparts();
-        dsi.removeHeadingPair();
-        dsi.removeHiddenCount();
-        dsi.removeLineCount();
-        dsi.removeLinksDirty();
-        dsi.removeManager();
-        dsi.removeMMClipCount();
-        dsi.removeNoteCount();
-        dsi.removeParCount();
-        dsi.removePresentationFormat();
-        dsi.removeScale();
-        dsi.removeSlideCount();
-
-        /*
-         * <li><p>Write the summary information stream and the document summary
-         * information stream to the POI filesystem. */
-        si.write(poifs.getRoot(), SummaryInformation.DEFAULT_STREAM_NAME);
-        dsi.write(poifs.getRoot(), DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-
-        /*
-         * <li><p>Write the POI filesystem to a (temporary) file <em>doc3</em>
-         * and close the latter. */
-        FileOutputStream out = new FileOutputStream(fileOut);
-        poifs.writeFilesystem(out);
-        out.close();
-        poifs.close();
-        
-        return cps;
-    }
-    
-    /*
-     * Open <em>doc3</em> for reading and check summary information
-     * and document summary information. All properties removed before must not
-     * be found in the property streams of <em>doc3</em>.
-     */
-    private static CustomProperties write3rdFile(File fileIn, File fileOut) throws Exception {
-        NPOIFSFileSystem poifs = new NPOIFSFileSystem(fileIn, false);
-        SummaryInformation si = getSummaryInformation(poifs);
-        DocumentSummaryInformation dsi = getDocumentSummaryInformation(poifs);
-
-        assertNull(si.getApplicationName());
-        assertNull(si.getAuthor());
-        assertEquals(0, si.getCharCount());
-        assertTrue(si.wasNull());
-        assertNull(si.getComments());
-        assertNull(si.getCreateDateTime());
-        assertEquals(0, si.getEditTime());
-        assertTrue(si.wasNull());
-        assertNull(si.getKeywords());
-        assertNull(si.getLastAuthor());
-        assertNull(si.getLastPrinted());
-        assertNull(si.getLastSaveDateTime());
-        assertEquals(0, si.getPageCount());
-        assertTrue(si.wasNull());
-        assertNull(si.getRevNumber());
-        assertEquals(0, si.getSecurity());
-        assertTrue(si.wasNull());
-        assertNull(si.getSubject());
-        assertNull(si.getTemplate());
-        assertNull(si.getThumbnail());
-        assertNull(si.getTitle());
-        assertEquals(0, si.getWordCount());
-        assertTrue(si.wasNull());
-
-        assertEquals(0, dsi.getByteCount());
-        assertTrue(dsi.wasNull());
-        assertNull(dsi.getCategory());
-        assertNull(dsi.getCustomProperties());
-        // FIXME (byte array properties not yet implemented): assertNull(dsi.getDocparts());
-        // FIXME (byte array properties not yet implemented): assertNull(dsi.getHeadingPair());
-        assertEquals(0, dsi.getHiddenCount());
-        assertTrue(dsi.wasNull());
-        assertEquals(0, dsi.getLineCount());
-        assertTrue(dsi.wasNull());
-        assertFalse(dsi.getLinksDirty());
-        assertTrue(dsi.wasNull());
-        assertNull(dsi.getManager());
-        assertEquals(0, dsi.getMMClipCount());
-        assertTrue(dsi.wasNull());
-        assertEquals(0, dsi.getNoteCount());
-        assertTrue(dsi.wasNull());
-        assertEquals(0, dsi.getParCount());
-        assertTrue(dsi.wasNull());
-        assertNull(dsi.getPresentationFormat());
-        assertFalse(dsi.getScale());
-        assertTrue(dsi.wasNull());
-        assertEquals(0, dsi.getSlideCount());
-        assertTrue(dsi.wasNull());
-        poifs.close();
-        
-        return dsi.getCustomProperties();
-    }
-
-    private static SummaryInformation getSummaryInformation(NPOIFSFileSystem poifs) throws Exception {
-        DocumentInputStream dis = poifs.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME);
-        PropertySet ps = new PropertySet(dis);
-        SummaryInformation si = new SummaryInformation(ps);
-        dis.close();
-        return si;
-    }
-    
-    private static DocumentSummaryInformation getDocumentSummaryInformation(NPOIFSFileSystem poifs) throws Exception {
-        DocumentInputStream dis = poifs.createDocumentInputStream(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        PropertySet ps = new PropertySet(dis);
-        DocumentSummaryInformation dsi = new DocumentSummaryInformation(ps);
-        dis.close();
-        return dsi;
-    }
-
-    
-    
-    /**
-     * <p>Tests the simplified custom properties by reading them from the
-     * available test files.</p>
-     *
-     * @throws Throwable if anything goes wrong.
-     */
-    @Test
-    public void testReadCustomPropertiesFromFiles() throws Throwable
-    {
-        final AllDataFilesTester.TestTask task = new AllDataFilesTester.TestTask()
-        {
-            @Override
-            public void runTest(final File file) throws FileNotFoundException,
-                    IOException, NoPropertySetStreamException,
-                    MarkUnsupportedException,
-                    UnexpectedPropertySetTypeException
-            {
-                /* Read a test document <em>doc</em> into a POI filesystem. */
-                NPOIFSFileSystem poifs = null;
-                try {
-                    poifs = new NPOIFSFileSystem(file);
-                    final DirectoryEntry dir = poifs.getRoot();
-                    /*
-                     * If there is a document summry information stream, read it from
-                     * the POI filesystem, else create a new one.
-                     */
-                    DocumentSummaryInformation dsi;
-                    if (dir.hasEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)) {
-                        final DocumentInputStream dis = poifs.createDocumentInputStream(DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-                        final PropertySet ps = new PropertySet(dis);
-                        dsi = new DocumentSummaryInformation(ps);
-                        dis.close();
-                    } else {
-                        dsi = PropertySetFactory.newDocumentSummaryInformation();
-                    }
-                    final CustomProperties cps = dsi.getCustomProperties();
-    
-                    if (cps == null)
-                        /* The document does not have custom properties. */
-                        return;
-    
-                    for (CustomProperty cp : cps.values()) {
-                        cp.getName();
-                        cp.getValue();
-                    }
-                } finally {
-                    if (poifs != null) poifs.close();
-                }
-            }
-        };
-
-        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-        final File dataDir = _samples.getFile("");
-        final File[] docs = dataDir.listFiles(new FileFilter()
-        {
-            @Override
-            public boolean accept(final File file)
-            {
-                return file.isFile() && file.getName().startsWith("Test") && TestReadAllFiles.checkExclude(file);
-            }
-        });
-
-        for (File doc : docs) {
-            try {
-                task.runTest(doc);
-            } catch (Exception e) {
-                throw new IOException("While handling file " + doc, e);
-            }
-        }
-    }
-
-
-
-    /**
-     * <p>Tests basic custom property features.</p>
-     */
-    @Test
-    public void testCustomerProperties()
-    {
-        final String KEY = "Schl\u00fcssel \u00e4";
-        final String VALUE_1 = "Wert 1";
-        final String VALUE_2 = "Wert 2";
-
-        CustomProperty cp;
-        CustomProperties cps = new CustomProperties();
-        assertEquals(0, cps.size());
-
-        /* After adding a custom property the size must be 1 and it must be
-         * possible to extract the custom property from the map. */
-        cps.put(KEY, VALUE_1);
-        assertEquals(1, cps.size());
-        Object v1 = cps.get(KEY);
-        assertEquals(VALUE_1, v1);
-
-        /* After adding a custom property with the same name the size must still
-         * be one. */
-        cps.put(KEY, VALUE_2);
-        assertEquals(1, cps.size());
-        Object v2 = cps.get(KEY);
-        assertEquals(VALUE_2, v2);
-
-        /* Removing the custom property must return the remove property and
-         * reduce the size to 0. */
-        cp = (CustomProperty) cps.remove(KEY);
-        assertEquals(KEY, cp.getName());
-        assertEquals(VALUE_2, cp.getValue());
-        assertEquals(0, cps.size());
-    }
-
-
-
-    /**
-     * <p>Tests reading custom properties from a section including reading
-     * custom properties which are not pure.</p>
-     */
-    @Test
-    public void testGetCustomerProperties()
-    {
-        final int ID_1 = 2;
-        final int ID_2 = 3;
-        final String NAME_1 = "Schl\u00fcssel \u00e4";
-        final String VALUE_1 = "Wert 1";
-        final Map<Long,String> dictionary = new HashMap<Long, String>();
-
-        DocumentSummaryInformation dsi = PropertySetFactory.newDocumentSummaryInformation();
-        CustomProperties cps;
-        MutableSection s;
-
-        /* A document summary information set stream by default does have custom properties. */
-        cps = dsi.getCustomProperties();
-        assertNull(cps);
-
-        /* Test an empty custom properties set. */
-        s = new MutableSection();
-        s.setFormatID(SectionIDMap.DOCUMENT_SUMMARY_INFORMATION_ID[1]);
-        // s.setCodepage(CodePageUtil.CP_UNICODE);
-        dsi.addSection(s);
-        cps = dsi.getCustomProperties();
-        assertEquals(0, cps.size());
-
-        /* Add a custom property. */
-        MutableProperty p = new MutableProperty();
-        p.setID(ID_1);
-        p.setType(Variant.VT_LPWSTR);
-        p.setValue(VALUE_1);
-        s.setProperty(p);
-        dictionary.put(Long.valueOf(ID_1), NAME_1);
-        s.setDictionary(dictionary);
-        cps = dsi.getCustomProperties();
-        assertEquals(1, cps.size());
-        assertTrue(cps.isPure());
-
-        /* Add another custom property. */
-        s.setProperty(ID_2, Variant.VT_LPWSTR, VALUE_1);
-        dictionary.put(Long.valueOf(ID_2), NAME_1);
-        s.setDictionary(dictionary);
-        cps = dsi.getCustomProperties();
-        assertEquals(1, cps.size());
-        assertFalse(cps.isPure());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java b/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java
deleted file mode 100644
index 668b185..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java
+++ /dev/null
@@ -1,264 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.basic;
-
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-
-
-
-/**
- * <p>Static utility methods needed by the HPSF test cases.</p>
- */
-final class Util {
-
-    /**
-     * <p>Reads bytes from an input stream and writes them to an
-     * output stream until end of file is encountered.</p>
-     *
-     * @param in the input stream to read from
-     * 
-     * @param out the output stream to write to
-     * 
-     * @exception IOException if an I/O exception occurs
-     */
-    public static void copy(final InputStream in, final OutputStream out)
-        throws IOException
-    {
-        final int BUF_SIZE = 1000;
-        byte[] b = new byte[BUF_SIZE];
-        int read;
-        boolean eof = false;
-        while (!eof)
-        {
-            try
-            {
-                read = in.read(b, 0, BUF_SIZE);
-                if (read > 0)
-                    out.write(b, 0, read);
-                else
-                    eof = true;
-            }
-            catch (EOFException ex)
-            {
-                eof = true;
-            }
-        }
-    }
-
-
-
-    /**
-     * <p>Reads all files from a POI filesystem and returns them as an
-     * array of {@link POIFile} instances. This method loads all files
-     * into memory and thus does not cope well with large POI
-     * filessystems.</p>
-     * 
-     * @param poiFs The name of the POI filesystem as seen by the
-     * operating system. (This is the "filename".)
-     *
-     * @return The POI files. The elements are ordered in the same way
-     * as the files in the POI filesystem.
-     * 
-     * @exception FileNotFoundException if the file containing the POI 
-     * filesystem does not exist
-     * 
-     * @exception IOException if an I/O exception occurs
-     */
-    public static POIFile[] readPOIFiles(final File poiFs)
-        throws FileNotFoundException, IOException
-    {
-        return readPOIFiles(poiFs, null);
-    }
-
-
-
-    /**
-     * <p>Reads a set of files from a POI filesystem and returns them
-     * as an array of {@link POIFile} instances. This method loads all
-     * files into memory and thus does not cope well with large POI
-     * filessystems.</p>
-     * 
-     * @param poiFs The name of the POI filesystem as seen by the
-     * operating system. (This is the "filename".)
-     *
-     * @param poiFiles The names of the POI files to be read.
-     *
-     * @return The POI files. The elements are ordered in the same way
-     * as the files in the POI filesystem.
-     * 
-     * @exception FileNotFoundException if the file containing the POI 
-     * filesystem does not exist
-     * 
-     * @exception IOException if an I/O exception occurs
-     */
-    public static POIFile[] readPOIFiles(final File poiFs,
-                                         final String[] poiFiles)
-        throws FileNotFoundException, IOException
-    {
-        final List<POIFile> files = new ArrayList<POIFile>();
-        POIFSReader r = new POIFSReader();
-        POIFSReaderListener pfl = new POIFSReaderListener()
-        {
-            @Override
-            public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-            {
-                try
-                {
-                    final POIFile f = new POIFile();
-                    f.setName(event.getName());
-                    f.setPath(event.getPath());
-                    final InputStream in = event.getStream();
-                    final ByteArrayOutputStream out =
-                        new ByteArrayOutputStream();
-                    Util.copy(in, out);
-                    out.close();
-                    f.setBytes(out.toByteArray());
-                    files.add(f);
-                }
-                catch (IOException ex)
-                {
-                    throw new RuntimeException(ex);
-                }
-            }
-        };
-        if (poiFiles == null)
-            /* Register the listener for all POI files. */
-            r.registerListener(pfl);
-        else
-            for (String poiFile : poiFiles)
-                r.registerListener(pfl, poiFile);
-
-        /* Read the POI filesystem. */
-        FileInputStream stream = new FileInputStream(poiFs);
-        try {
-            r.read(stream);
-        } finally {
-            stream.close();
-        }
-        POIFile[] result = new POIFile[files.size()];
-        for (int i = 0; i < result.length; i++)
-            result[i] = files.get(i);
-        return result;
-    }
-
-
-
-    /**
-     * <p>Read all files from a POI filesystem which are property set streams
-     * and returns them as an array of {@link org.apache.poi.hpsf.PropertySet}
-     * instances.</p>
-     * 
-     * @param poiFs The name of the POI filesystem as seen by the
-     * operating system. (This is the "filename".)
-     *
-     * @return The property sets. The elements are ordered in the same way
-     * as the files in the POI filesystem.
-     * 
-     * @exception FileNotFoundException if the file containing the POI 
-     * filesystem does not exist
-     * 
-     * @exception IOException if an I/O exception occurs
-     */
-    public static POIFile[] readPropertySets(final File poiFs)
-        throws FileNotFoundException, IOException
-    {
-        final List<POIFile> files = new ArrayList<POIFile>(7);
-        final POIFSReader r = new POIFSReader();
-        POIFSReaderListener pfl = new POIFSReaderListener()
-        {
-            @Override
-            public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-            {
-                try
-                {
-                    final POIFile f = new POIFile();
-                    f.setName(event.getName());
-                    f.setPath(event.getPath());
-                    final InputStream in = event.getStream();
-                    if (PropertySet.isPropertySetStream(in))
-                    {
-                        final ByteArrayOutputStream out =
-                            new ByteArrayOutputStream();
-                        Util.copy(in, out);
-                        out.close();
-                        f.setBytes(out.toByteArray());
-                        files.add(f);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    throw new RuntimeException(ex);
-                }
-            }
-        };
-
-        /* Register the listener for all POI files. */
-        r.registerListener(pfl);
-
-        /* Read the POI filesystem. */
-        FileInputStream stream = new FileInputStream(poiFs);
-        try {
-            r.read(stream);
-        } finally {
-            stream.close();
-        }
-
-        POIFile[] result = new POIFile[files.size()];
-        for (int i = 0; i < result.length; i++)
-            result[i] = files.get(i);
-        return result;
-    }
-
-
-
-    /**
-     * <p>Prints the system properties to System.out.</p>
-     */
-    public static void printSystemProperties()
-    {
-        final Properties p = System.getProperties();
-        final List<String> names = new LinkedList<String>();
-        for (String name : p.stringPropertyNames())
-            names.add(name);
-        Collections.sort(names);
-        for (String name : names) {
-            String value = p.getProperty(name);
-            System.out.println(name + ": " + value);
-        }
-        System.out.println("Current directory: " +
-                           System.getProperty("user.dir"));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java b/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
deleted file mode 100644
index 0d7ce88..0000000
--- a/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hpsf.extractor;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.Thumbnail;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-public final class TestHPSFPropertiesExtractor extends TestCase {
-	private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-
-	public void testNormalProperties() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(_samples.openResourceAsStream("TestMickey.doc"));
-		HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
-		try {
-    		ext.getText();
-    
-    		// Check each bit in turn
-    		String sinfText = ext.getSummaryInformationText();
-    		String dinfText = ext.getDocumentSummaryInformationText();
-    
-    		assertTrue(sinfText.indexOf("TEMPLATE = Normal") > -1);
-    		assertTrue(sinfText.indexOf("SUBJECT = sample subject") > -1);
-    		assertTrue(dinfText.indexOf("MANAGER = sample manager") > -1);
-    		assertTrue(dinfText.indexOf("COMPANY = sample company") > -1);
-    
-    		// Now overall
-    		String text = ext.getText();
-    		assertTrue(text.indexOf("TEMPLATE = Normal") > -1);
-    		assertTrue(text.indexOf("SUBJECT = sample subject") > -1);
-    		assertTrue(text.indexOf("MANAGER = sample manager") > -1);
-    		assertTrue(text.indexOf("COMPANY = sample company") > -1);
-		} finally {
-		    ext.close();
-		}
-	}
-
-	public void testNormalUnicodeProperties() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(_samples.openResourceAsStream("TestUnicode.xls"));
-		HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
-		try {
-    		ext.getText();
-    
-    		// Check each bit in turn
-    		String sinfText = ext.getSummaryInformationText();
-    		String dinfText = ext.getDocumentSummaryInformationText();
-    
-    		assertTrue(sinfText.indexOf("AUTHOR = marshall") > -1);
-    		assertTrue(sinfText.indexOf("TITLE = Titel: \u00c4h") > -1);
-    		assertTrue(dinfText.indexOf("COMPANY = Schreiner") > -1);
-    		assertTrue(dinfText.indexOf("SCALE = false") > -1);
-    
-    		// Now overall
-    		String text = ext.getText();
-    		assertTrue(text.indexOf("AUTHOR = marshall") > -1);
-    		assertTrue(text.indexOf("TITLE = Titel: \u00c4h") > -1);
-    		assertTrue(text.indexOf("COMPANY = Schreiner") > -1);
-    		assertTrue(text.indexOf("SCALE = false") > -1);
-		} finally {
-		    ext.close();
-		}
-	}
-
-	public void testCustomProperties() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(
-				_samples.openResourceAsStream("TestMickey.doc")
-		);
-		HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
-		try {
-    		// Custom properties are part of the document info stream
-    		String dinfText = ext.getDocumentSummaryInformationText();
-    		assertTrue(dinfText.indexOf("Client = sample client") > -1);
-    		assertTrue(dinfText.indexOf("Division = sample division") > -1);
-    
-    		String text = ext.getText();
-    		assertTrue(text.indexOf("Client = sample client") > -1);
-    		assertTrue(text.indexOf("Division = sample division") > -1);
-        } finally {
-            ext.close();
-        }
-	}
-
-	public void testConstructors() throws IOException {
-		POIFSFileSystem fs;
-		HSSFWorkbook wb;
-		try {
-			fs = new POIFSFileSystem(_samples.openResourceAsStream("TestUnicode.xls"));
-			wb = new HSSFWorkbook(fs);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		ExcelExtractor excelExt = new ExcelExtractor(wb);
-
-		final String fsText;
-		HPSFPropertiesExtractor fsExt = new HPSFPropertiesExtractor(fs);
-		fsExt.setFilesystem(null); // Don't close re-used test resources!
-		try {
-		    fsText = fsExt.getText();
-		} finally {
-		    fsExt.close();
-		}
-        
-        final String hwText; 
-		HPSFPropertiesExtractor hwExt = new HPSFPropertiesExtractor(wb);
-		hwExt.setFilesystem(null); // Don't close re-used test resources!
-		try {
-		    hwText = hwExt.getText();
-		} finally {
-		    hwExt.close();
-		}
-		
-        final String eeText;
-        HPSFPropertiesExtractor eeExt = new HPSFPropertiesExtractor(excelExt);
-        eeExt.setFilesystem(null); // Don't close re-used test resources!
-        try {
-            eeText = eeExt.getText();
-        } finally {
-            eeExt.close();
-        }
-
-		assertEquals(fsText, hwText);
-		assertEquals(fsText, eeText);
-
-		assertTrue(fsText.indexOf("AUTHOR = marshall") > -1);
-		assertTrue(fsText.indexOf("TITLE = Titel: \u00c4h") > -1);
-		
-		// Finally tidy
-		wb.close();
-	}
-
-	public void test42726() throws IOException {
-		HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(HSSFTestDataSamples.openSampleWorkbook("42726.xls"));
-		try {
-    		String txt = ext.getText();
-    		assertTrue(txt.indexOf("PID_AUTHOR") != -1);
-    		assertTrue(txt.indexOf("PID_EDITTIME") != -1);
-    		assertTrue(txt.indexOf("PID_REVNUMBER") != -1);
-    		assertTrue(txt.indexOf("PID_THUMBNAIL") != -1);
-        } finally {
-            ext.close();
-        }
-	}
-	
-    public void testThumbnail() throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem(_samples.openResourceAsStream("TestThumbnail.xls"));
-        HSSFWorkbook wb = new HSSFWorkbook(fs);
-        Thumbnail thumbnail = new Thumbnail(wb.getSummaryInformation().getThumbnail());
-        assertEquals(-1, thumbnail.getClipboardFormatTag());
-        assertEquals(3, thumbnail.getClipboardFormat());
-        assertNotNull(thumbnail.getThumbnailAsWMF());
-        wb.close();
-    }
-
-    public void test52258() throws Exception {
-        POIFSFileSystem fs = new POIFSFileSystem(_samples.openResourceAsStream("TestVisioWithCodepage.vsd"));
-        HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
-        try {
-            assertNotNull(ext.getDocSummaryInformation());
-            assertNotNull(ext.getDocumentSummaryInformationText());
-            assertNotNull(ext.getSummaryInformation());
-            assertNotNull(ext.getSummaryInformationText());
-            assertNotNull(ext.getText());
-        } finally {
-            ext.close();
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java b/trunk/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
deleted file mode 100644
index 5d80a26..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf;
-
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * @author Yegor Kozlov
- */
-public final class HSSFITestDataProvider implements ITestDataProvider {
-    public static final HSSFITestDataProvider instance = new HSSFITestDataProvider();
-
-    private HSSFITestDataProvider(){
-        // enforce singleton
-    }
-    
-    @Override
-    public HSSFWorkbook openSampleWorkbook(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleWorkbook(sampleFileName);
-    }
-    
-    public InputStream openWorkbookStream(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-    }
-    
-    @Override
-    public HSSFWorkbook writeOutAndReadBack(Workbook original) {
-        if(!(original instanceof HSSFWorkbook)) {
-            throw new IllegalArgumentException("Expected an instance of HSSFWorkbook");
-        }
-        return HSSFTestDataSamples.writeOutAndReadBack((HSSFWorkbook)original);
-    }
-    
-    @Override
-    public HSSFWorkbook createWorkbook(){
-        return new HSSFWorkbook();
-    }
-    
-    //************ SXSSF-specific methods ***************//
-    @Override
-    public HSSFWorkbook createWorkbook(int rowAccessWindowSize) {
-        return createWorkbook();
-    }
-    
-    @Override
-    public void trackAllColumnsForAutosizing(Sheet sheet) {}
-    //************ End SXSSF-specific methods ***************//
-    
-    @Override
-    public FormulaEvaluator createFormulaEvaluator(Workbook wb) {
-        return new HSSFFormulaEvaluator((HSSFWorkbook) wb);
-    }
-
-    @Override
-    public byte[] getTestDataFileContent(String fileName) {
-        return POIDataSamples.getSpreadSheetInstance().readFile(fileName);
-    }
-    
-    @Override
-    public SpreadsheetVersion getSpreadsheetVersion(){
-        return SpreadsheetVersion.EXCEL97;
-    }
-    
-    @Override
-    public String getStandardFileNameExtension() {
-        return "xls";
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java b/trunk/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java
deleted file mode 100644
index fb64e4e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Centralises logic for finding/opening sample files in the src/testcases/org/apache/poi/hssf/hssf/data folder.
- *
- * @author Josh Micich
- */
-public final class HSSFTestDataSamples {
-
-	private static final POIDataSamples _inst = POIDataSamples.getSpreadSheetInstance();
-
-	public static InputStream openSampleFileStream(String sampleFileName) {
-		return _inst.openResourceAsStream(sampleFileName);
-	}
-	public static File getSampleFile(String sampleFileName) {
-		return _inst.getFile(sampleFileName);
-	}
-	public static byte[] getTestDataFileContent(String fileName) {
-		return _inst.readFile(fileName);
-	}
-
-	public static HSSFWorkbook openSampleWorkbook(String sampleFileName) {
-		try {
-			return new HSSFWorkbook(_inst.openResourceAsStream(sampleFileName));
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	/**
-	 * Writes a spreadsheet to a <tt>ByteArrayOutputStream</tt> and reads it back
-	 * from a <tt>ByteArrayInputStream</tt>.<p/>
-	 * Useful for verifying that the serialisation round trip
-	 */
-	public static HSSFWorkbook writeOutAndReadBack(HSSFWorkbook original) {
-		try {
-			ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-			original.write(baos);
-			ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-			return new HSSFWorkbook(bais);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java b/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java
deleted file mode 100644
index 2860275..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf;
-
-import org.apache.poi.hssf.eventmodel.TestEventRecordFactory;
-import org.apache.poi.hssf.eventusermodel.AllEventUserModelTests;
-import org.apache.poi.hssf.extractor.TestExcelExtractor;
-import org.apache.poi.hssf.model.AllModelTests;
-import org.apache.poi.hssf.record.AllRecordTests;
-import org.apache.poi.hssf.usermodel.AllUserModelTests;
-import org.apache.poi.hssf.util.AllHSSFUtilTests;
-import org.apache.poi.ss.formula.AllSSFormulaTests;
-import org.apache.poi.ss.util.AllSSUtilTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Test Suite for all sub-packages of org.apache.poi.hssf<br/>
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    AllEventUserModelTests.class,
-    AllModelTests.class,
-    AllUserModelTests.class,
-    AllRecordTests.class,
-    AllHSSFUtilTests.class,
-    TestExcelExtractor.class,
-    TestEventRecordFactory.class,
-    AllSSFormulaTests.class,
-    AllSSUtilTests.class
-})
-public final class HSSFTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java b/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
deleted file mode 100644
index e69c700..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.dev;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.NullOutputStream;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Base class for integration-style tests which iterate over all test-files
- * and execute the same action to find out if any change breaks these applications.
- * 
- * This test uses {@link Parameterized} to run the test for each file separatedely.
- */
-@RunWith(Parameterized.class)
-public abstract class BaseXLSIteratingTest {
-    protected static final OutputStream NULL_OUTPUT_STREAM = new NullOutputStream();
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-    
-	protected static final Map<String,Class<? extends Throwable>> EXCLUDED =
-        new HashMap<String,Class<? extends Throwable>>();
-
-    @Parameters(name="{index}: {0}")
-    public static Iterable<Object[]> files() {
-        String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY);
-        if(dataDirName == null) {
-            dataDirName = "test-data";
-        }
-
-        List<Object[]> files = new ArrayList<Object[]>();
-        findFile(files, dataDirName + "/spreadsheet");
-        findFile(files, dataDirName + "/hpsf");
-        
-        return files;
-    }
-	
-    private static void findFile(List<Object[]> list, String dir) {
-        String[] files = new File(dir).list(new FilenameFilter() {
-            @Override
-            public boolean accept(File arg0, String arg1) {
-                return arg1.toLowerCase(Locale.ROOT).endsWith(".xls");
-            }
-        });
-        
-        assertNotNull("Did not find any xls files in directory " + dir, files);
-        
-        for(String file : files) {
-            list.add(new Object[] { new File(dir, file) });
-        }
-    }
-    
-    @Parameter
-    public File file;
-    
-	@Test
-	public void testMain() throws Exception {
-	    // we had intermittent problems when this was set differently somehow, let's try to set it here so it always is set correctly for these tests
-	    Biff8EncryptionKey.setCurrentUserPassword(null);
-
-	    String fileName = file.getName();
-	    if (EXCLUDED.containsKey(fileName)) {
-	        thrown.expect(EXCLUDED.get(fileName));
-	    }
-	    
-		try {
-			runOneFile(file);
-		} catch (Exception e) {
-			// try to read it in HSSFWorkbook to quickly fail if we cannot read the file there at all and thus probably should use EXCLUDED instead
-			FileInputStream stream = new FileInputStream(file);
-			HSSFWorkbook wb = null;
-			try {
-			    wb = new HSSFWorkbook(stream);
-				assertNotNull(wb);
-			} finally {
-			    if (wb != null) {
-			        wb.close();
-			    }
-				stream.close();
-			}
-			
-			throw e;
-		}
-	}
-
-	abstract void runOneFile(File pFile) throws Exception;
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java b/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
deleted file mode 100644
index 83e8013..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.dev;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.junit.BeforeClass;
-
-public class TestBiffDrawingToXml extends BaseXLSIteratingTest {
-    @BeforeClass
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header 
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-    }
-	
-	@Override
-	void runOneFile(File pFile) throws Exception {
-		PrintStream save = System.out;
-		try {
-			//System.setOut(new PrintStream(TestBiffViewer.NULL_OUTPUT_STREAM));
-			// use a NullOutputStream to not write the bytes anywhere for best runtime 
-		    InputStream wb = new FileInputStream(pFile);
-		    try {
-		    	BiffDrawingToXml.writeToFile(NULL_OUTPUT_STREAM, wb, false, new String[] {});
-		    } finally {
-		    	wb.close();
-		    }
-		} finally {
-			System.setOut(save);
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java b/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
deleted file mode 100644
index e6d0c6e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class TestBiffViewer extends BaseXLSIteratingTest {
-    @BeforeClass
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header 
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        // EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-        EXCLUDED.put("50833.xls", IllegalArgumentException.class);       // "Name is too long" when setting username
-        EXCLUDED.put("XRefCalc.xls", RuntimeException.class);            // "Buffer overrun"
-    }
-
-    @Override
-    void runOneFile(File fileIn) throws IOException {
-        NPOIFSFileSystem fs  = new NPOIFSFileSystem(fileIn, true);
-        try {
-            InputStream is = BiffViewer.getPOIFSInputStream(fs);
-            try {
-                // use a NullOutputStream to not write the bytes anywhere for best runtime
-                PrintWriter dummy = new PrintWriter(new OutputStreamWriter(NULL_OUTPUT_STREAM, LocaleUtil.CHARSET_1252));
-                BiffViewer.runBiffViewer(dummy, is, true, true, true, false);
-            } finally {
-                is.close();
-            }
-        } finally {
-            fs.close();
-        }
-    }
-
-    @Test
-    @Ignore("only used for manual tests")
-    public void testOneFile() throws Exception {
-        POIDataSamples samples = POIDataSamples.getSpreadSheetInstance();
-        runOneFile(samples.getFile("43493.xls"));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java b/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java
deleted file mode 100644
index a58af43..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-
-public class TestEFBiffViewer extends BaseXLSIteratingTest {
-    @BeforeClass
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header 
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-        EXCLUDED.put("XRefCalc.xls", RuntimeException.class);            // "Buffer overrun"
-    }
-	
-	@Override
-	void runOneFile(File fileIn) throws IOException {
-		PrintStream save = System.out;
-		try {
-			// redirect standard out during the test to avoid spamming the console with output
-			System.setOut(new PrintStream(NULL_OUTPUT_STREAM,true,LocaleUtil.CHARSET_1252.name()));
-
-			EFBiffViewer.main(new String[] { fileIn.getAbsolutePath() });
-		} finally {
-			System.setOut(save);
-		}
-	}
-
-	//@Test
-	public void testFile() throws IOException {
-		EFBiffViewer viewer = new EFBiffViewer();
-		viewer.setFile(new File("test-data/spreadsheet/59074.xls").getAbsolutePath());
-		viewer.run();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java b/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java
deleted file mode 100644
index 419e0d3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.dev;
-
-import static org.junit.Assume.assumeTrue;
-
-import java.io.File;
-import java.io.PrintStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-
-public class TestFormulaViewer extends BaseXLSIteratingTest {
-    @BeforeClass
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header 
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-    }
-	
-    @Override
-	void runOneFile(File fileIn) throws Exception {
-		PrintStream save = System.out;
-		try {
-			// redirect standard out during the test to avoid spamming the console with output
-			System.setOut(new PrintStream(NULL_OUTPUT_STREAM,true,LocaleUtil.CHARSET_1252.name()));
-
-            FormulaViewer viewer = new FormulaViewer();
-            viewer.setFile(fileIn.getAbsolutePath());
-            viewer.setList(true);
-            viewer.run();
-		} catch (RuntimeException re) {
-		    String m = re.getMessage();
-		    if (m.startsWith("toFormulaString") || m.startsWith("3D references")) {
-		        // TODO: fix those cases, but ignore them for now ...
-		        assumeTrue(true);
-		    } else {
-		        throw re;
-		    }
-		} finally {
-			System.setOut(save);
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java b/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java
deleted file mode 100644
index 80925ba..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.dev;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.PrintStream;
-
-import static org.junit.Assert.assertTrue;
-
-public class TestReSave extends BaseXLSIteratingTest {
-    @BeforeClass
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header 
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class); 
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-        EXCLUDED.put("XRefCalc.xls", RuntimeException.class);            // "Buffer overrun"
-    }
-
-	@Override
-	void runOneFile(File fileIn) throws Exception {
-		// avoid running on files leftover from previous failed runs
-		if(fileIn.getName().endsWith("-saved.xls")) {
-			return;
-		}
-
-		PrintStream save = System.out;
-		try {
-			// redirect standard out during the test to avoid spamming the console with output
-			System.setOut(new PrintStream(NULL_OUTPUT_STREAM,true,LocaleUtil.CHARSET_1252.name()));
-
-			File reSavedFile = new File(fileIn.getParentFile(), fileIn.getName().replace(".xls", "-saved.xls"));
-			try {
-				ReSave.main(new String[] { fileIn.getAbsolutePath() });
-				
-				// also try BiffViewer on the saved file
-                new TestBiffViewer().runOneFile(reSavedFile);
-
-    			// had one case where the re-saved could not be re-saved!
-    			ReSave.main(new String[] { "-bos", reSavedFile.getAbsolutePath() });
-			} finally {
-				// clean up the re-saved file
-				assertTrue(!reSavedFile.exists() || reSavedFile.delete());
-			}
-
-		} finally {
-			System.setOut(save);
-		}
-	}
-
-    @Ignore("Only used for local testing")
-    @Test
-    public void testOneFile() throws Exception {
-        String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY);
-        if(dataDirName == null) {
-            dataDirName = "test-data";
-        }
-
-        runOneFile(new File(dataDirName + "/spreadsheet", "49931.xls"));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java b/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java
deleted file mode 100644
index 796609d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.dev;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-
-public class TestRecordLister extends BaseXLSIteratingTest {
-    @BeforeClass
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-
-    }
-	
-	@Override
-	void runOneFile(File fileIn) throws IOException {
-		PrintStream save = System.out;
-		try {
-			// redirect standard out during the test to avoid spamming the console with output
-			System.setOut(new PrintStream(NULL_OUTPUT_STREAM,true,LocaleUtil.CHARSET_1252.name()));
-
-			RecordLister viewer = new RecordLister();
-            viewer.setFile(fileIn.getAbsolutePath());
-            viewer.run();
-		} finally {
-			System.setOut(save);
-		}
-	}
-
-	//@Test
-	public void testFile() throws IOException {
-	    RecordLister viewer = new RecordLister();
-        viewer.setFile(new File("test-data/spreadsheet/testEXCEL_95.xls").getAbsolutePath());
-        viewer.run();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java b/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
deleted file mode 100644
index a4618ae..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventmodel;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.eventusermodel.AbortableHSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
-import org.apache.poi.hssf.eventusermodel.HSSFRequest;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Tests for {@link AbortableHSSFListener}
- */
-public final class TestAbortableListener extends TestCase {
-
-	private POIFSFileSystem openSample() {
-		ByteArrayInputStream is = new ByteArrayInputStream(HSSFITestDataProvider.instance
-				.getTestDataFileContent("SimpleWithColours.xls"));
-		try {
-			return new POIFSFileSystem(is);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public void testAbortingBasics() throws Exception {
-		AbortableCountingListener l = new AbortableCountingListener(1000);
-
-		HSSFRequest req = new HSSFRequest();
-		req.addListenerForAllRecords(l);
-
-		HSSFEventFactory f = new HSSFEventFactory();
-
-		assertEquals(0, l.countSeen);
-		assertEquals(null, l.lastRecordSeen);
-
-		POIFSFileSystem fs = openSample();
-		short res = f.abortableProcessWorkbookEvents(req, fs);
-
-		assertEquals(0, res);
-		assertEquals(175, l.countSeen);
-		assertEquals(EOFRecord.sid, l.lastRecordSeen.getSid());
-	}
-
-
-	public void testAbortStops() throws Exception {
-		AbortableCountingListener l = new AbortableCountingListener(1);
-
-		HSSFRequest req = new HSSFRequest();
-		req.addListenerForAllRecords(l);
-
-		HSSFEventFactory f = new HSSFEventFactory();
-
-		assertEquals(0, l.countSeen);
-		assertEquals(null, l.lastRecordSeen);
-
-		POIFSFileSystem fs = openSample();
-		short res = f.abortableProcessWorkbookEvents(req, fs);
-
-		assertEquals(1234, res);
-		assertEquals(1, l.countSeen);
-		assertEquals(BOFRecord.sid, l.lastRecordSeen.getSid());
-	}
-
-	private static final class AbortableCountingListener extends AbortableHSSFListener {
-		private final int abortAfterIndex;
-		public int countSeen;
-		public Record lastRecordSeen;
-
-		public AbortableCountingListener(int abortAfter) {
-			abortAfterIndex = abortAfter;
-			countSeen = 0;
-			lastRecordSeen = null;
-		}
-		@Override
-		public short abortableProcessRecord(Record record) {
-			countSeen++;
-			lastRecordSeen = record;
-
-			if(countSeen == abortAfterIndex) {
-				return 1234;
-			}
-			return 0;
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java b/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
deleted file mode 100644
index b3bf668..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventmodel;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFactory;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.util.NotImplemented;
-
-/**
- * enclosing_type describe the purpose here
- * 
- * @author Andrew C. Oliver acoliver@apache.org
- * @author Csaba Nagy (ncsaba at yahoo dot com)
- */
-public final class TestEventRecordFactory extends TestCase {
-
-    /**
-     * tests that the records can be processed and properly return 
-     * values.
-     */
-    public void testProcessRecords()
-    {
-        final boolean[] wascalled = { false, }; // hack to pass boolean by ref into inner class
-
-        ERFListener listener = new ERFListener() {
-            @Override
-            public boolean processRecord(Record rec) {
-                wascalled[0] = true;
-                assertTrue("must be BOFRecord got SID="+rec.getSid(),
-                           (rec.getSid() == BOFRecord.sid));                  
-                return true;              
-            }
-        };
-    	EventRecordFactory factory = new EventRecordFactory(listener, new short[] {BOFRecord.sid});
-        
-        BOFRecord bof = new BOFRecord();
-        bof.setBuild((short)0);
-        bof.setBuildYear((short)1999);
-        bof.setRequiredVersion(123);
-        bof.setType(BOFRecord.TYPE_WORKBOOK);
-        bof.setVersion((short)0x06);
-        bof.setHistoryBitMask(BOFRecord.HISTORY_MASK);
-        
-        EOFRecord eof = EOFRecord.instance;
-    	byte[] bytes = new byte[bof.getRecordSize() + eof.getRecordSize()];
-        int offset = 0;
-        offset = bof.serialize(offset,bytes);
-        offset = eof.serialize(offset,bytes);
-                
-        factory.processRecords(new ByteArrayInputStream(bytes));    
-        assertTrue("The record listener must be called", wascalled[0]);    
-    }
-    
-
-    /**
-     * tests that the create record function returns a properly 
-     * constructed record in the simple case.
-     */
-    public void testCreateRecord() {
-        BOFRecord bof = new BOFRecord();
-        bof.setBuild((short)0);
-        bof.setBuildYear((short)1999);
-        bof.setRequiredVersion(123);
-        bof.setType(BOFRecord.TYPE_WORKBOOK);
-        bof.setVersion((short)0x06);
-        bof.setHistoryBitMask(BOFRecord.HISTORY_MASK);
-        
-        byte[] bytes = bof.serialize();
-            
-        Record[] records = RecordFactory.createRecord(TestcaseRecordInputStream.create(bytes));
-        
-        assertTrue("record.length must be 1, was ="+records.length,records.length == 1);
-        assertTrue("record is the same", compareRec(bof,records[0]));
-        
-    }
-
-    /**
-     * Compare the serialized bytes of two records are equal
-     * @param first the first record to compare
-     * @param second the second record to compare
-     * @return boolean whether or not the record where equal
-     */
-    private static boolean compareRec(Record first, Record second) {
-        byte[] rec1 = first.serialize();
-        byte[] rec2 = second.serialize();
-        
-        if (rec1.length != rec2.length) {
-            return false;   
-        }
-        for (int k=0; k<rec1.length; k++) {
-            if (rec1[k] != rec2[k]) {
-                return false;
-            }   
-        }
-        return true;
-    }
-
-    
-    /**
-     * tests that the create record function returns a properly 
-     * constructed record in the case of a continued record.
-     * TODO - need a real world example to put in a unit test
-     */
-    @NotImplemented
-    public void testCreateContinuedRecord()
-    {
-      //  fail("not implemented");
-    }
-    
-
-    /**
-     * TEST NAME:  Test Creating ContinueRecords After Unknown Records From An InputStream <P>
-     * OBJECTIVE:  Test that the RecordFactory given an InputStream
-     *             constructs the expected records.<P>
-     * SUCCESS:    Record factory creates the expected records.<P>
-     * FAILURE:    The wrong records are created or contain the wrong values <P>
-     *
-     */
-     public void testContinuedUnknownRecord() {
-        final byte[] data = {
-            0, -1, 0, 0, // an unknown record with 0 length
-            0x3C , 0, 3, 0, 1, 2, 3, // a continuation record with 3 bytes of data
-            0x3C , 0, 1, 0, 4 // one more continuation record with 1 byte of data
-        };
-
-        final int[] recCnt = { 0 };
-        final int[] offset = { 0 };
-        ERFListener listener = new ERFListener() {
-              private final String[] expectedRecordTypes = {
-                  UnknownRecord.class.getName(),
-                  ContinueRecord.class.getName(),
-                  ContinueRecord.class.getName()
-              };
-              @Override
-            public boolean processRecord(Record rec)
-              {
-                  // System.out.println(rec.toString());
-                  assertEquals(
-                    "Record type",
-                    expectedRecordTypes[recCnt[0]],
-                    rec.getClass().getName()
-                  );
-                  compareData(rec, "Record " + recCnt[0] + ": ");
-                  recCnt[0]++;
-                  return true;
-              }
-              private void compareData(Record record, String message) {
-                  byte[] recData = record.serialize();
-                  for (int i = 0; i < recData.length; i++) {
-                      assertEquals(message + " data byte " + i, data[offset[0]++], recData[i]);
-                  }
-              }
-          };
-    	EventRecordFactory factory = new EventRecordFactory(listener, new short[] {-256, 0x3C});
-
-        factory.processRecords(new ByteArrayInputStream(data));
-        assertEquals("nr. of processed records", 3, recCnt[0]);
-        assertEquals("nr. of processed bytes", data.length, offset[0]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java b/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java
deleted file mode 100644
index a5d9073..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for <tt>org.apache.poi.hssf.eventusermodel</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestEventWorkbookBuilder.class,
-    TestFormatTrackingHSSFListener.class,
-    TestHSSFEventFactory.class,
-    TestMissingRecordAwareHSSFListener.class
-})
-public class AllEventUserModelTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java b/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
deleted file mode 100644
index 609640c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-/**
- * Tests for {@link EventWorkbookBuilder}
- */
-public final class TestEventWorkbookBuilder extends TestCase {
-    private MockHSSFListener mockListen;
-    private SheetRecordCollectingListener listener;
-
-    @Override
-    public void setUp() {
-        HSSFRequest req = new HSSFRequest();
-        mockListen = new MockHSSFListener();
-        listener = new SheetRecordCollectingListener(mockListen);
-        req.addListenerForAllRecords(listener);
-
-        HSSFEventFactory factory = new HSSFEventFactory();
-        try {
-            InputStream is = HSSFTestDataSamples.openSampleFileStream("3dFormulas.xls");
-            POIFSFileSystem fs = new POIFSFileSystem(is);
-            factory.processWorkbookEvents(req, fs);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void testBasics() {
-        assertNotNull(listener.getSSTRecord());
-        assertNotNull(listener.getBoundSheetRecords());
-        assertNotNull(listener.getExternSheetRecords());
-    }
-
-    public void testGetStubWorkbooks() {
-        assertNotNull(listener.getStubWorkbook());
-        assertNotNull(listener.getStubHSSFWorkbook());
-    }
-
-    public void testContents() {
-        assertEquals(2, listener.getSSTRecord().getNumStrings());
-        assertEquals(3, listener.getBoundSheetRecords().length);
-        assertEquals(1, listener.getExternSheetRecords().length);
-
-        assertEquals(3, listener.getStubWorkbook().getNumSheets());
-
-        InternalWorkbook ref = listener.getStubWorkbook();
-        assertEquals("Sh3", ref.findSheetFirstNameFromExternSheet(0));
-        assertEquals("Sheet1", ref.findSheetFirstNameFromExternSheet(1));
-        assertEquals("S2", ref.findSheetFirstNameFromExternSheet(2));
-    }
-
-    public void testFormulas() {
-
-        FormulaRecord[] fRecs = mockListen.getFormulaRecords();
-
-        // Check our formula records
-        assertEquals(6, fRecs.length);
-
-        InternalWorkbook stubWB = listener.getStubWorkbook();
-        assertNotNull(stubWB);
-        HSSFWorkbook stubHSSF = listener.getStubHSSFWorkbook();
-        assertNotNull(stubHSSF);
-
-        // Check these stubs have the right stuff on them
-        assertEquals("Sheet1", stubWB.getSheetName(0));
-        assertEquals("Sheet1", stubHSSF.getSheetName(0));
-        assertEquals("S2",     stubWB.getSheetName(1));
-        assertEquals("S2",     stubHSSF.getSheetName(1));
-        assertEquals("Sh3",    stubWB.getSheetName(2));
-        assertEquals("Sh3",    stubHSSF.getSheetName(2));
-
-        // Check we can get the formula without breaking
-        for (FormulaRecord fRec : fRecs) {
-            HSSFFormulaParser.toFormulaString(stubHSSF, fRec.getParsedExpression());
-        }
-
-        // Peer into just one formula, and check that
-        //  all the ptgs give back the right things
-        Ptg[] ptgs = fRecs[0].getParsedExpression();
-        assertEquals(1, ptgs.length);
-        assertTrue(ptgs[0] instanceof Ref3DPtg);
-
-        Ref3DPtg ptg = (Ref3DPtg)ptgs[0];
-        HSSFEvaluationWorkbook book = HSSFEvaluationWorkbook.create(stubHSSF);
-        assertEquals("Sheet1!A1", ptg.toFormulaString(book));
-
-
-        // Now check we get the right formula back for
-        //  a few sample ones
-        FormulaRecord fr;
-
-        // Sheet 1 A2 is on same sheet
-        fr = fRecs[0];
-        assertEquals(1, fr.getRow());
-        assertEquals(0, fr.getColumn());
-        assertEquals("Sheet1!A1", HSSFFormulaParser.toFormulaString(stubHSSF, fr.getParsedExpression()));
-
-        // Sheet 1 A5 is to another sheet
-        fr = fRecs[3];
-        assertEquals(4, fr.getRow());
-        assertEquals(0, fr.getColumn());
-        assertEquals("'S2'!A1", HSSFFormulaParser.toFormulaString(stubHSSF, fr.getParsedExpression()));
-
-        // Sheet 1 A7 is to another sheet, range
-        fr = fRecs[5];
-        assertEquals(6, fr.getRow());
-        assertEquals(0, fr.getColumn());
-        assertEquals("SUM(Sh3!A1:A4)", HSSFFormulaParser.toFormulaString(stubHSSF, fr.getParsedExpression()));
-
-
-        // Now, load via Usermodel and re-check
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("3dFormulas.xls");
-        assertEquals("Sheet1!A1", wb.getSheetAt(0).getRow(1).getCell(0).getCellFormula());
-        assertEquals("SUM(Sh3!A1:A4)", wb.getSheetAt(0).getRow(6).getCell(0).getCellFormula());
-    }
-
-    private static final class MockHSSFListener implements HSSFListener {
-        public MockHSSFListener() {}
-        private final List<Record> _records = new ArrayList<Record>();
-        private final List<Record> _frecs = new ArrayList<Record>();
-
-        @Override
-        public void processRecord(Record record) {
-            _records.add(record);
-            if(record instanceof FormulaRecord) {
-                _frecs.add(record);
-            }
-        }
-        public FormulaRecord[] getFormulaRecords() {
-            FormulaRecord[] result = new FormulaRecord[_frecs.size()];
-            _frecs.toArray(result);
-            return result;
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
deleted file mode 100644
index ec1e9d0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-/**
- * Tests for FormatTrackingHSSFListener
- */
-public final class TestFormatTrackingHSSFListener {
-	private FormatTrackingHSSFListener listener;
-	private MockHSSFListener mockListen;
-
-	private void processFile(String filename) throws Exception {
-		HSSFRequest req = new HSSFRequest();
-		mockListen = new MockHSSFListener();
-		listener = new FormatTrackingHSSFListener(mockListen);
-		req.addListenerForAllRecords(listener);
-		
-        File file = HSSFTestDataSamples.getSampleFile(filename);
-		HSSFEventFactory factory = new HSSFEventFactory();
-		POIFSFileSystem fs = new POIFSFileSystem(file);
-		factory.processWorkbookEvents(req, fs);
-		fs.close();
-	} 
-	
-	@Test
-	public void testFormats() throws Exception {
-		processFile("MissingBits.xls");
-
-		assertEquals("_(\"$\"* #,##0_);_(\"$\"* (#,##0);_(\"$\"* \"-\"_);_(@_)", listener.getFormatString(41));
-		assertEquals("_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)", listener.getFormatString(42));
-		assertEquals("_(* #,##0.00_);_(* (#,##0.00);_(* \"-\"??_);_(@_)", listener.getFormatString(43));
-		assertEquals("_(\"$\"* #,##0.00_);_(\"$\"* (#,##0.00);_(\"$\"* \"-\"??_);_(@_)", listener.getFormatString(44));
-	}
-	
-	/**
-	 * Ensure that all number and formula records can be
-	 *  turned into strings without problems.
-	 * For now, we're just looking to get text back, no
-	 *  exceptions thrown, but in future we might also
-	 *  want to check the exact strings!
-	 */
-	@Test
-	public void testTurnToString() throws Exception {
-		String[] files = new String[] { 
-				"45365.xls", "45365-2.xls", "MissingBits.xls" 
-		};
-		for (String file : files) {
-			processFile(file);
-			
-			// Check we found our formats
-			assertTrue(listener.getNumberOfCustomFormats() > 5);
-			assertTrue(listener.getNumberOfExtendedFormats() > 5);
-			
-			// Now check we can turn all the numeric
-			//  cells into strings without error
-			for(Record r : mockListen._records) {
-				CellValueRecordInterface cvr = null;
-				
-				if(r instanceof NumberRecord) {
-					cvr = (CellValueRecordInterface)r;
-				}
-				if(r instanceof FormulaRecord) {
-					cvr = (CellValueRecordInterface)r;
-				}
-				
-				if(cvr != null) {
-					// Should always give us a string 
-					String s = listener.formatNumberDateCell(cvr);
-					assertNotNull(s);
-					assertTrue(s.length() > 0);
-				}
-			}
-			
-			// TODO - test some specific format strings
-		}
-	}
-	
-	private static final class MockHSSFListener implements HSSFListener {
-		public MockHSSFListener() {}
-		private final List<Record> _records = new ArrayList<Record>();
-
-		@Override
-        public void processRecord(Record record) {
-			_records.add(record);
-		}
-	}
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
deleted file mode 100644
index 040b83c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.DVALRecord;
-import org.apache.poi.hssf.record.DVRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.FeatHdrRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.After;
-
-/**
- * Testing for {@link HSSFEventFactory}
- */
-public final class TestHSSFEventFactory extends TestCase {
-    private static final InputStream openSample(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-    }
-
-    // to not affect other tests running in the same JVM
-    @After
-    public void resetPassword() {
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-    }
-
-    public void testWithMissingRecords() throws Exception {
-
-        HSSFRequest req = new HSSFRequest();
-        MockHSSFListener mockListen = new MockHSSFListener();
-        req.addListenerForAllRecords(mockListen);
-
-        POIFSFileSystem fs = new POIFSFileSystem(openSample("SimpleWithSkip.xls"));
-        HSSFEventFactory factory = new HSSFEventFactory();
-        factory.processWorkbookEvents(req, fs);
-
-        Record[] recs = mockListen.getRecords();
-        // Check we got the records
-        assertTrue( recs.length > 100 );
-
-        // Check that the last few records are as we expect
-        // (Makes sure we don't accidently skip the end ones)
-        int numRec = recs.length;
-        assertEquals(WindowTwoRecord.class, recs[numRec-3].getClass());
-        assertEquals(SelectionRecord.class, recs[numRec-2].getClass());
-        assertEquals(EOFRecord.class,	   recs[numRec-1].getClass());
-    }
-
-    public void testWithCrazyContinueRecords() throws Exception {
-        // Some files have crazy ordering of their continue records
-        // Check that we don't break on them (bug #42844)
-
-        HSSFRequest req = new HSSFRequest();
-        MockHSSFListener mockListen = new MockHSSFListener();
-        req.addListenerForAllRecords(mockListen);
-
-        POIFSFileSystem fs = new POIFSFileSystem(openSample("ContinueRecordProblem.xls"));
-        HSSFEventFactory factory = new HSSFEventFactory();
-        factory.processWorkbookEvents(req, fs);
-
-        Record[] recs = mockListen.getRecords();
-        // Check we got the records
-        assertTrue( recs.length > 100 );
-
-        // And none of them are continue ones
-        for (Record rec : recs) {
-            assertFalse( rec instanceof ContinueRecord );
-        }
-
-        // Check that the last few records are as we expect
-        // (Makes sure we don't accidently skip the end ones)
-        int numRec = recs.length;
-        assertEquals(DVALRecord.class,    recs[numRec-4].getClass());
-        assertEquals(DVRecord.class,      recs[numRec-3].getClass());
-        assertEquals(FeatHdrRecord.class, recs[numRec-2].getClass());
-        assertEquals(EOFRecord.class,     recs[numRec-1].getClass());
-    }
-
-    /**
-     * Unknown records can be continued.
-     * Check that HSSFEventFactory doesn't break on them.
-     * (the test file was provided in a reopen of bug #42844)
-     */
-    public void testUnknownContinueRecords() throws Exception {
-
-        HSSFRequest req = new HSSFRequest();
-        MockHSSFListener mockListen = new MockHSSFListener();
-        req.addListenerForAllRecords(mockListen);
-
-        POIFSFileSystem fs = new POIFSFileSystem(openSample("42844.xls"));
-        HSSFEventFactory factory = new HSSFEventFactory();
-        factory.processWorkbookEvents(req, fs);
-    }
-
-    private static class MockHSSFListener implements HSSFListener {
-        private final List<Record> records = new ArrayList<Record>();
-
-        public MockHSSFListener() {}
-        public Record[] getRecords() {
-            Record[] result = new Record[records.size()];
-            records.toArray(result);
-            return result;
-        }
-
-        @Override
-        public void processRecord(Record record) {
-            records.add(record);
-        }
-    }
-
-    public void testWithDifferentWorkbookName() throws Exception {
-        HSSFRequest req = new HSSFRequest();
-        MockHSSFListener mockListen = new MockHSSFListener();
-        req.addListenerForAllRecords(mockListen);
-
-        POIFSFileSystem fs = new POIFSFileSystem(openSample("BOOK_in_capitals.xls"));
-        HSSFEventFactory factory = new HSSFEventFactory();
-        factory.processWorkbookEvents(req, fs);
-
-        fs = new POIFSFileSystem(openSample("WORKBOOK_in_capitals.xls"));
-        factory = new HSSFEventFactory();
-        factory.processWorkbookEvents(req, fs);
-    }
-
-    public void testWithPasswordProtectedWorkbooks() throws Exception {
-        HSSFRequest req = new HSSFRequest();
-        MockHSSFListener mockListen = new MockHSSFListener();
-        req.addListenerForAllRecords(mockListen);
-
-        // Without a password, can't be read
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-        POIFSFileSystem fs = new POIFSFileSystem(openSample("xor-encryption-abc.xls"));
-
-        HSSFEventFactory factory = new HSSFEventFactory();
-        try {
-            factory.processWorkbookEvents(req, fs);
-            fail("Shouldn't be able to process protected workbook without the password");
-        } catch (EncryptedDocumentException e) {}
-
-
-        // With the password, is properly processed
-        Biff8EncryptionKey.setCurrentUserPassword("abc");
-
-        req = new HSSFRequest();
-        mockListen = new MockHSSFListener();
-        req.addListenerForAllRecords(mockListen);
-        factory.processWorkbookEvents(req, fs);
-
-        // Check we got the sheet and the contents
-        Record[] recs = mockListen.getRecords();
-        assertTrue( recs.length > 50 );
-
-        // Has one sheet, with values 1,2,3 in column A rows 1-3
-        boolean hasSheet=false, hasA1=false, hasA2=false, hasA3=false;
-        for (Record r : recs) {
-            if (r instanceof BoundSheetRecord) {
-                BoundSheetRecord bsr = (BoundSheetRecord)r;
-                assertEquals("Sheet1", bsr.getSheetname());
-                hasSheet = true;
-            }
-            if (r instanceof NumberRecord) {
-                NumberRecord nr = (NumberRecord)r;
-                if (nr.getColumn() == 0 && nr.getRow() == 0) {
-                    assertEquals(1, (int)nr.getValue());
-                    hasA1 = true;
-                }
-                if (nr.getColumn() == 0 && nr.getRow() == 1) {
-                    assertEquals(2, (int)nr.getValue());
-                    hasA2 = true;
-                }
-                if (nr.getColumn() == 0 && nr.getRow() == 2) {
-                    assertEquals(3, (int)nr.getValue());
-                    hasA3 = true;
-                }
-            }
-        }
-
-        assertTrue("Sheet record not found", hasSheet);
-        assertTrue("Numeric record for A1 not found", hasA1);
-        assertTrue("Numeric record for A2 not found", hasA2);
-        assertTrue("Numeric record for A3 not found", hasA3);
-    }
-}	
diff --git a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
deleted file mode 100644
index 0867720..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
+++ /dev/null
@@ -1,895 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.eventusermodel;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingRowDummyRecord;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.MulBlankRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-/**
- * Tests for MissingRecordAwareHSSFListener
- */
-public final class TestMissingRecordAwareHSSFListener extends TestCase {
-	
-	private Record[] r;
-
-	private void readRecords(String sampleFileName) {
-		HSSFRequest req = new HSSFRequest();
-		MockHSSFListener mockListen = new MockHSSFListener();
-		MissingRecordAwareHSSFListener listener = new MissingRecordAwareHSSFListener(mockListen);
-		req.addListenerForAllRecords(listener);
-		
-		HSSFEventFactory factory = new HSSFEventFactory();
-		try {
-			InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-			POIFSFileSystem fs = new POIFSFileSystem(is);
-			factory.processWorkbookEvents(req, fs);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		
-		r = mockListen.getRecords();
-		assertTrue(r.length > 100);
-	} 
-	public void openNormal() {
-		readRecords("MissingBits.xls");
-	}
-	
-	public void testMissingRowRecords() {
-		openNormal();
-		
-		// We have rows 0, 1, 2, 20 and 21
-		int row0 = -1;
-		for(int i=0; i<r.length; i++) {
-			if(r[i] instanceof RowRecord) {
-				RowRecord rr = (RowRecord)r[i];
-				if(rr.getRowNumber() == 0) { row0 = i; }
-			}
-		}
-		assertTrue(row0 > -1);
-		
-		// Following row 0, we should have 1, 2, then dummy, then 20+21+22
-		assertTrue(r[row0] instanceof RowRecord);
-		assertTrue(r[row0+1] instanceof RowRecord);
-		assertTrue(r[row0+2] instanceof RowRecord);
-		assertTrue(r[row0+3] instanceof MissingRowDummyRecord);
-		assertTrue(r[row0+4] instanceof MissingRowDummyRecord);
-		assertTrue(r[row0+5] instanceof MissingRowDummyRecord);
-		assertTrue(r[row0+6] instanceof MissingRowDummyRecord);
-		// ...
-		assertTrue(r[row0+18] instanceof MissingRowDummyRecord);
-		assertTrue(r[row0+19] instanceof MissingRowDummyRecord);
-		assertTrue(r[row0+20] instanceof RowRecord);
-		assertTrue(r[row0+21] instanceof RowRecord);
-		assertTrue(r[row0+22] instanceof RowRecord);
-		
-		// Check things had the right row numbers
-		RowRecord rr;
-		rr = (RowRecord)r[row0+2];
-		assertEquals(2, rr.getRowNumber());
-		rr = (RowRecord)r[row0+20];
-		assertEquals(20, rr.getRowNumber());
-		rr = (RowRecord)r[row0+21];
-		assertEquals(21, rr.getRowNumber());
-		
-		MissingRowDummyRecord mr;
-		mr = (MissingRowDummyRecord)r[row0+3];
-		assertEquals(3, mr.getRowNumber());
-		mr = (MissingRowDummyRecord)r[row0+4];
-		assertEquals(4, mr.getRowNumber());
-		mr = (MissingRowDummyRecord)r[row0+5];
-		assertEquals(5, mr.getRowNumber());
-		mr = (MissingRowDummyRecord)r[row0+18];
-		assertEquals(18, mr.getRowNumber());
-		mr = (MissingRowDummyRecord)r[row0+19];
-		assertEquals(19, mr.getRowNumber());
-	}
-	
-	public void testEndOfRowRecords() {
-		openNormal();
-		
-		// Find the cell at 0,0
-		int cell00 = -1;
-		for(int i=0; i<r.length; i++) {
-			if(r[i] instanceof LabelSSTRecord) {
-				LabelSSTRecord lr = (LabelSSTRecord)r[i];
-				if(lr.getRow() == 0 && lr.getColumn() == 0) { cell00 = i; }
-			}
-		}
-		assertTrue(cell00 > -1);
-		
-		// We have rows 0, 1, 2, 20 and 21
-		// Row 0 has 1 entry
-		// Row 1 has 4 entries
-		// Row 2 has 6 entries
-		// Row 20 has 5 entries
-		// Row 21 has 7 entries
-		// Row 22 has 12 entries
-
-		// Row 0
-		assertFalse(r[cell00+0] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+1] instanceof LastCellOfRowDummyRecord);
-		// Row 1
-		assertFalse(r[cell00+2] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+3] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+4] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+5] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+6] instanceof LastCellOfRowDummyRecord);
-		// Row 2
-		assertFalse(r[cell00+7] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+8] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+9] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+10] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+11] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+12] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+13] instanceof LastCellOfRowDummyRecord);
-		// Row 3 -> 19
-		assertTrue(r[cell00+14] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+15] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+16] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+17] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+18] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+19] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+20] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+21] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+22] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+23] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+24] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+25] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+26] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+27] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+28] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+29] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+30] instanceof LastCellOfRowDummyRecord);
-		// Row 20
-		assertFalse(r[cell00+31] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+32] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+33] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+34] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+35] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+36] instanceof LastCellOfRowDummyRecord);
-		// Row 21
-		assertFalse(r[cell00+37] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+38] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+39] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+40] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+41] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+42] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+43] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+44] instanceof LastCellOfRowDummyRecord);
-		// Row 22
-		assertFalse(r[cell00+45] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+46] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+47] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+48] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+49] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+50] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+51] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+52] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+53] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+54] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+55] instanceof LastCellOfRowDummyRecord);
-		assertFalse(r[cell00+56] instanceof LastCellOfRowDummyRecord);
-		assertTrue(r[cell00+57] instanceof LastCellOfRowDummyRecord);
-		
-		// Check the numbers of the last seen columns
-		LastCellOfRowDummyRecord[] lrs = new LastCellOfRowDummyRecord[24];
-		int lrscount = 0;
-		for (final Record rec : r) {
-			if(rec instanceof LastCellOfRowDummyRecord) {
-				lrs[lrscount] = (LastCellOfRowDummyRecord)rec;
-				lrscount++;
-			}
-		}
-		
-		assertEquals(0, lrs[0].getLastColumnNumber());
-		assertEquals(0, lrs[0].getRow());
-		
-		assertEquals(3, lrs[1].getLastColumnNumber());
-		assertEquals(1, lrs[1].getRow());
-		
-		assertEquals(5, lrs[2].getLastColumnNumber());
-		assertEquals(2, lrs[2].getRow());
-		
-		for(int i=3; i<=19; i++) {
-			assertEquals(-1, lrs[i].getLastColumnNumber());
-			assertEquals(i, lrs[i].getRow());
-		}
-		
-		assertEquals(4, lrs[20].getLastColumnNumber());
-		assertEquals(20, lrs[20].getRow());
-		
-		assertEquals(6, lrs[21].getLastColumnNumber());
-		assertEquals(21, lrs[21].getRow());
-		
-		assertEquals(11, lrs[22].getLastColumnNumber());
-		assertEquals(22, lrs[22].getRow());
-	}
-	
-	
-	public void testMissingCellRecords() {
-		openNormal();
-		
-		// Find the cell at 0,0
-		int cell00 = -1;
-		for(int i=0; i<r.length; i++) {
-			if(r[i] instanceof LabelSSTRecord) {
-				LabelSSTRecord lr = (LabelSSTRecord)r[i];
-				if(lr.getRow() == 0 && lr.getColumn() == 0) { cell00 = i; }
-			}
-		}
-		assertTrue(cell00 > -1);
-		
-		// We have rows 0, 1, 2, 20 and 21
-		// Row 0 has 1 entry, 0
-		// Row 1 has 4 entries, 0+3
-		// Row 2 has 6 entries, 0+5
-		// Row 20 has 5 entries, 0-5
-		// Row 21 has 7 entries, 0+1+3+5+6
-		// Row 22 has 12 entries, 0+3+4+11
-		
-		// Row 0
-		assertFalse(r[cell00+0] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+1] instanceof MissingCellDummyRecord);
-		
-		// Row 1
-		assertFalse(r[cell00+2] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+3] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+4] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+5] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+6] instanceof MissingCellDummyRecord);
-		
-		// Row 2
-		assertFalse(r[cell00+7] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+8] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+9] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+10] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+11] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+12] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+13] instanceof MissingCellDummyRecord);
-		
-		// Row 3-19
-		assertFalse(r[cell00+14] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+15] instanceof MissingCellDummyRecord);
-		
-		// Row 20
-		assertFalse(r[cell00+31] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+32] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+33] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+34] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+35] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+36] instanceof MissingCellDummyRecord);
-		
-		// Row 21
-		assertFalse(r[cell00+37] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+38] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+39] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+40] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+41] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+42] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+43] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+44] instanceof MissingCellDummyRecord);
-		
-		// Row 22
-		assertFalse(r[cell00+45] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+46] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+47] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+48] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+49] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+50] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+51] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+52] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+53] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+54] instanceof MissingCellDummyRecord);
-		assertTrue(r[cell00+55] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+56] instanceof MissingCellDummyRecord);
-		assertFalse(r[cell00+57] instanceof MissingCellDummyRecord);
-		
-		// Check some numbers
-		MissingCellDummyRecord mc;
-		
-		mc = (MissingCellDummyRecord)r[cell00+3];
-		assertEquals(1, mc.getRow());
-		assertEquals(1, mc.getColumn());
-		mc = (MissingCellDummyRecord)r[cell00+4];
-		assertEquals(1, mc.getRow());
-		assertEquals(2, mc.getColumn());
-		
-		mc = (MissingCellDummyRecord)r[cell00+8];
-		assertEquals(2, mc.getRow());
-		assertEquals(1, mc.getColumn());
-		mc = (MissingCellDummyRecord)r[cell00+9];
-		assertEquals(2, mc.getRow());
-		assertEquals(2, mc.getColumn());
-		
-		mc = (MissingCellDummyRecord)r[cell00+55];
-		assertEquals(22, mc.getRow());
-		assertEquals(10, mc.getColumn());
-	}
-	
-	// Make sure we don't put in any extra new lines
-	//  that aren't already there
-	public void testNoExtraNewLines() {
-		// Load a different file
-		// This file has has something in lines 1-33
-		readRecords("MRExtraLines.xls");
-		
-		int rowCount=0;
-		for (Record rec : r) {
-			if(rec instanceof LastCellOfRowDummyRecord) {
-				LastCellOfRowDummyRecord eor = (LastCellOfRowDummyRecord) rec;
-				assertEquals(rowCount, eor.getRow());
-				rowCount++;
-			}
-		}
-		// Check we got the 33 rows
-		assertEquals(33, rowCount);
-	}
-
-	private static final class MockHSSFListener implements HSSFListener {
-		public MockHSSFListener() {}
-		private final List<Record> _records = new ArrayList<Record>();
-		private final boolean logToStdOut = false;
-
-		@Override
-        public void processRecord(Record record) {
-			_records.add(record);
-			
-			if(record instanceof MissingRowDummyRecord) {
-				MissingRowDummyRecord mr = (MissingRowDummyRecord)record;
-				log("Got dummy row " + mr.getRowNumber());
-			}
-			if(record instanceof MissingCellDummyRecord) {
-				MissingCellDummyRecord mc = (MissingCellDummyRecord)record;
-				log("Got dummy cell " + mc.getRow() + " " + mc.getColumn());
-			}
-			if(record instanceof LastCellOfRowDummyRecord) {
-				LastCellOfRowDummyRecord lc = (LastCellOfRowDummyRecord)record;
-				log("Got end-of row, row was " + lc.getRow() + ", last column was " + lc.getLastColumnNumber());
-			}
-			
-			if(record instanceof BOFRecord) {
-				BOFRecord r = (BOFRecord)record;
-				if(r.getType() == BOFRecord.TYPE_WORKSHEET) {
-					log("On new sheet");
-				}
-			}
-			if(record instanceof RowRecord) {
-				RowRecord rr = (RowRecord)record;
-				log("Starting row #" + rr.getRowNumber());
-			}
-		}
-		private void log(String msg) {
-			if(logToStdOut) {
-				System.out.println(msg);
-			}
-		}
-		public Record[] getRecords() {
-			Record[] result = new Record[_records.size()];
-			_records.toArray(result);
-			return result;
-		}
-	}
-	
-	/**
-	 * Make sure that the presence of shared formulas does not cause extra 
-	 * end-of-row records.
-	 */
-	public void testEndOfRow_bug45672() {
-		readRecords("ex45672.xls");
-		Record[] rr = r;
-		int eorCount=0;
-		int sfrCount=0;
-		for (Record record : rr) {
-			if (record instanceof SharedFormulaRecord) {
-				sfrCount++;
-			}
-			if (record instanceof LastCellOfRowDummyRecord) {
-				eorCount++;
-			}
-		}
-		if (eorCount == 2) {
-			throw new AssertionFailedError("Identified bug 45672");
-		}
-		assertEquals(1, eorCount);
-		assertEquals(1, sfrCount);
-	}
-	
-	/**
-	 * MulBlank records hold multiple blank cells. Check we
-	 *  can handle them correctly.
-	 */
-	public void testMulBlankHandling() {
-		readRecords("45672.xls");
-		
-		// Check that we don't have any MulBlankRecords, but do
-		//  have lots of BlankRecords
-		Record[] rr = r;
-		int eorCount=0;
-		int mbrCount=0;
-		int brCount=0;
-		for (Record record : rr) {
-			if (record instanceof MulBlankRecord) {
-				mbrCount++;
-			}
-			if (record instanceof BlankRecord) {
-				brCount++;
-			}
-			if (record instanceof LastCellOfRowDummyRecord) {
-				eorCount++;
-			}
-		}
-		if (mbrCount > 0) {
-			throw new AssertionFailedError("Identified bug 45672");
-		}
-		if (brCount < 20) {
-			throw new AssertionFailedError("Identified bug 45672");
-		}
-		if (eorCount != 2) {
-			throw new AssertionFailedError("Identified bug 45672");
-		}
-		assertEquals(2, eorCount);
-	}
-
-    public void testStringRecordHandling(){
-        readRecords("53588.xls");
-        Record[] rr = r;
-        int missingCount=0;
-        int lastCount=0;
-        for (Record record : rr) {
-            if (record instanceof MissingCellDummyRecord) {
-                missingCount++;
-            }
-            if (record instanceof LastCellOfRowDummyRecord) {
-                lastCount++;
-            }
-        }
-        assertEquals(1, missingCount);
-        assertEquals(1, lastCount);
-    }
-    
-    public void testFormulasWithStringResultsHandling() {
-        readRecords("53433.xls");
-        
-        int pos = 95;
-        
-        // First three rows are blank
-        assertEquals(DimensionsRecord.class, r[pos++].getClass());
-        
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(0, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(1, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(2, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        
-        // Then rows 4-10 are defined
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(3, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(4, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(5, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(6, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(7, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(8, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(9, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        
-        // 5 more blank rows
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(10, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(11, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(12, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(13, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(14, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        
-        // 2 defined rows
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(15, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(16, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        
-        // one blank row
-        assertEquals(MissingRowDummyRecord.class, r[pos].getClass());
-        assertEquals(17, ((MissingRowDummyRecord)r[pos]).getRowNumber());
-        pos++;
-        
-        // one last real row
-        assertEquals(RowRecord.class, r[pos].getClass());
-        assertEquals(18, ((RowRecord)r[pos]).getRowNumber());
-        pos++;
-        
-        
-        
-        // Now onto the cells
-        
-        // Because the 3 first rows are missing, should have last-of-row records first
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(0, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(1, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(2, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Onto row 4 (=3)
-        
-        // Now we have blank cell A4
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(3, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        
-        // Now 4 real cells, all strings
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(1, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(2, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        
-        // Final dummy cell for the end-of-row
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(3, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 5 has string, formula of string, number, formula of string
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(4, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(1, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(FormulaRecord.class, r[pos].getClass());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(2, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(StringRecord.class, r[pos].getClass());
-        assertEquals("s1", ((StringRecord)r[pos]).getString());
-        pos++;
-        assertEquals(NumberRecord.class, r[pos].getClass());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(FormulaRecord.class, r[pos].getClass());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(StringRecord.class, r[pos].getClass());
-        assertEquals("s3845", ((StringRecord)r[pos]).getString());
-        pos++;
-        
-        // Final dummy cell for the end-of-row
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 6 is blank / string formula / number / number / string formula
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(5, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        
-        assertEquals(FormulaRecord.class, r[pos].getClass());
-        assertEquals(5, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(1, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(StringRecord.class, r[pos].getClass());
-        assertEquals("s4", ((StringRecord)r[pos]).getString());
-        pos++;
-        assertEquals(NumberRecord.class, r[pos].getClass());
-        assertEquals(5, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(2, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(NumberRecord.class, r[pos].getClass());
-        assertEquals(5, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(FormulaRecord.class, r[pos].getClass());
-        assertEquals(5, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(StringRecord.class, r[pos].getClass());
-        assertEquals("s3845", ((StringRecord)r[pos]).getString());
-        pos++;
-        
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(5, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 7 is blank / blank / number / number / number
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(6, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(6, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(1, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        
-        assertEquals(NumberRecord.class, r[pos].getClass());
-        assertEquals(6, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(2, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(NumberRecord.class, r[pos].getClass());
-        assertEquals(6, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(NumberRecord.class, r[pos].getClass());
-        assertEquals(6, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(6, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 8 is blank / string / number formula / string formula / blank
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(7, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(7, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(1, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(FormulaRecord.class, r[pos].getClass());
-        assertEquals(7, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(2, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(FormulaRecord.class, r[pos].getClass());
-        assertEquals(7, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(StringRecord.class, r[pos].getClass());
-        assertEquals("s4", ((StringRecord)r[pos]).getString());
-        pos++;
-        assertEquals(BlankRecord.class, r[pos].getClass());
-        assertEquals(7, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(7, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 9 is empty, but with a blank at E9
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(8, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(8, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(1, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(8, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(2, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(8, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(3, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(BlankRecord.class, r[pos].getClass());
-        assertEquals(8, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(8, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 10 has a string in D10
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(9, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(9, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(1, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(9, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(2, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(9, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(9, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(3, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Now 5 blank rows
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(10, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(11, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(12, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(13, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(14, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 16 has a single string in B16
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(15, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(15, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(1, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(15, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 17 has a single string in D17
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(16, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(16, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(1, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(16, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(2, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(16, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(3, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(16, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(3, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 18 is blank
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(17, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // Row 19 has a single string in E19
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(18, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(0, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(18, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(1, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(18, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(2, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(MissingCellDummyRecord.class, r[pos].getClass());
-        assertEquals(18, ((MissingCellDummyRecord)r[pos]).getRow());
-        assertEquals(3, ((MissingCellDummyRecord)r[pos]).getColumn());
-        pos++;
-        assertEquals(LabelSSTRecord.class, r[pos].getClass());
-        assertEquals(18, ((CellValueRecordInterface)r[pos]).getRow());
-        assertEquals(4, ((CellValueRecordInterface)r[pos]).getColumn());
-        pos++;
-        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
-        assertEquals(18, ((LastCellOfRowDummyRecord)r[pos]).getRow());
-        assertEquals(4, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
-        pos++;
-        
-        
-        // And that's it!
-        assertEquals(WindowTwoRecord.class, r[pos++].getClass());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
deleted file mode 100644
index 6156cb1..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.extractor;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Locale;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.After;
-import org.junit.Test;
-
-/**
- *
- */
-public final class TestExcelExtractor {
-    // to not affect other tests running in the same JVM
-    @After
-    public void resetPassword() {
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-    }
-
-    private static ExcelExtractor createExtractor(String sampleFileName) throws IOException {
-		File file = HSSFTestDataSamples.getSampleFile(sampleFileName);
-        POIFSFileSystem fs = new POIFSFileSystem(file);
-        ExcelExtractor extractor = new ExcelExtractor(fs);
-        extractor.setFilesystem(fs);
-        return extractor;
-	}
-
-	@Test
-	public void testSimple() throws IOException {
-		ExcelExtractor extractor = createExtractor("Simple.xls");
-
-		try {
-    		assertEquals("Sheet1\nreplaceMe\nSheet2\nSheet3\n", extractor.getText());
-    
-    		// Now turn off sheet names
-    		extractor.setIncludeSheetNames(false);
-    		assertEquals("replaceMe\n", extractor.getText());
-		} finally {
-		    extractor.close();
-		}
-	}
-
-	@Test
-	public void testNumericFormula() throws IOException {
-
-		ExcelExtractor extractor = createExtractor("sumifformula.xls");
-
-		assertEquals(
-				"Sheet1\n" +
-				"1000\t1\t5\n" +
-				"2000\t2\n" +
-				"3000\t3\n" +
-				"4000\t4\n" +
-				"5000\t5\n" +
-				"Sheet2\nSheet3\n",
-				extractor.getText()
-		);
-
-		extractor.setFormulasNotResults(true);
-
-		assertEquals(
-				"Sheet1\n" +
-				"1000\t1\tSUMIF(A1:A5,\">4000\",B1:B5)\n" +
-				"2000\t2\n" +
-				"3000\t3\n" +
-				"4000\t4\n" +
-				"5000\t5\n" +
-				"Sheet2\nSheet3\n",
-				extractor.getText()
-		);
-		
-		extractor.close();
-	}
-
-	@Test
-	public void testwithContinueRecords() throws IOException {
-
-		ExcelExtractor extractor = createExtractor("StringContinueRecords.xls");
-
-		extractor.getText();
-
-		// Has masses of text
-		// Until we fixed bug #41064, this would've
-		//   failed by now
-		assertTrue(extractor.getText().length() > 40960);
-		
-		extractor.close();
-	}
-
-	@Test
-    public void testStringConcat() throws IOException {
-
-		ExcelExtractor extractor = createExtractor("SimpleWithFormula.xls");
-
-		// Comes out as NaN if treated as a number
-		// And as XYZ if treated as a string
-		assertEquals("Sheet1\nreplaceme\nreplaceme\nreplacemereplaceme\nSheet2\nSheet3\n", extractor.getText());
-
-		extractor.setFormulasNotResults(true);
-
-		assertEquals("Sheet1\nreplaceme\nreplaceme\nCONCATENATE(A1,A2)\nSheet2\nSheet3\n", extractor.getText());
-		
-		extractor.close();
-	}
-
-	@Test
-    public void testStringFormula() throws IOException {
-
-		ExcelExtractor extractor = createExtractor("StringFormulas.xls");
-
-		// Comes out as NaN if treated as a number
-		// And as XYZ if treated as a string
-		assertEquals("Sheet1\nXYZ\nSheet2\nSheet3\n", extractor.getText());
-
-		extractor.setFormulasNotResults(true);
-
-		assertEquals("Sheet1\nUPPER(\"xyz\")\nSheet2\nSheet3\n", extractor.getText());
-		
-		extractor.close();
-	}
-
-
-	@Test
-    public void testEventExtractor() throws Exception {
-		// First up, a simple file with string
-		//  based formulas in it
-		EventBasedExcelExtractor extractor1 = null;
-		try {
-	        extractor1 = new EventBasedExcelExtractor(
-	                new POIFSFileSystem(
-	                        HSSFTestDataSamples.openSampleFileStream("SimpleWithFormula.xls")
-	                )
-	        );
-    		extractor1.setIncludeSheetNames(true);
-        
-    		String text = extractor1.getText();
-    		assertEquals("Sheet1\nreplaceme\nreplaceme\nreplacemereplaceme\nSheet2\nSheet3\n", text);
-    
-    		extractor1.setIncludeSheetNames(false);
-    		extractor1.setFormulasNotResults(true);
-    
-    		text = extractor1.getText();
-    		assertEquals("replaceme\nreplaceme\nCONCATENATE(A1,A2)\n", text);
-		} finally {
-		    if (extractor1 != null) extractor1.close();
-		}
-
-		// Now, a slightly longer file with numeric formulas
-		EventBasedExcelExtractor extractor2 = null;
-		try {
-		    extractor2 = new EventBasedExcelExtractor(
-	                new POIFSFileSystem(
-	                        HSSFTestDataSamples.openSampleFileStream("sumifformula.xls")
-	                )
-	        );		    
-		    
-    		extractor2.setIncludeSheetNames(false);
-    		extractor2.setFormulasNotResults(true);
-    
-    		String text = extractor2.getText();
-    		assertEquals(
-    				"1000\t1\tSUMIF(A1:A5,\">4000\",B1:B5)\n" +
-    				"2000\t2\n" +
-    				"3000\t3\n" +
-    				"4000\t4\n" +
-    				"5000\t5\n",
-    				text
-    		);
-		} finally {
-		    if (extractor2 != null) extractor2.close();
-		}
-	}
-
-	@Test
-    public void testWithComments() throws IOException {
-		ExcelExtractor extractor = createExtractor("SimpleWithComments.xls");
-		extractor.setIncludeSheetNames(false);
-
-		// Check without comments
-		assertEquals(
-				"1\tone\n" +
-				"2\ttwo\n" +
-				"3\tthree\n",
-				extractor.getText()
-		);
-
-		// Now with
-		extractor.setIncludeCellComments(true);
-		assertEquals(
-				"1\tone Comment by Yegor Kozlov: Yegor Kozlov: first cell\n" +
-				"2\ttwo Comment by Yegor Kozlov: Yegor Kozlov: second cell\n" +
-				"3\tthree Comment by Yegor Kozlov: Yegor Kozlov: third cell\n",
-				extractor.getText()
-		);
-		
-		extractor.close();
-	}
-
-	@Test
-    public void testWithBlank() throws IOException {
-		ExcelExtractor extractor = createExtractor("MissingBits.xls");
-		String def = extractor.getText();
-		extractor.setIncludeBlankCells(true);
-		String padded = extractor.getText();
-
-		assertTrue(def.startsWith(
-				"Sheet1\n" +
-				"&[TAB]\t\n" +
-				"Hello\n" +
-				"11\t23\n"
-		));
-
-		assertTrue(padded.startsWith(
-				"Sheet1\n" +
-				"&[TAB]\t\n" +
-				"Hello\n" +
-				"11\t\t\t23\n"
-		));
-		
-		extractor.close();
-	}
-
-	@Test
-    public void testFormatting() throws Exception {
-	    Locale userLocale = LocaleUtil.getUserLocale();
-	    LocaleUtil.setUserLocale(Locale.ROOT);
-	    try {
-            ExcelExtractor extractor = createExtractor("Formatting.xls");
-            extractor.setIncludeBlankCells(false);
-            extractor.setIncludeSheetNames(false);
-            String text = extractor.getText();
-            
-            // Note - not all the formats in the file
-            //  actually quite match what they claim to
-            //  be, as some are auto-local builtins...
-            
-            assertTrue(text.startsWith(
-                  "Dates, all 24th November 2006\n"
-            ));
-            assertTrue(text.contains("yyyy/mm/dd\t2006/11/24\n"));
-            assertTrue(text.contains("yyyy-mm-dd\t2006-11-24\n"));
-            assertTrue(text.contains("dd-mm-yy\t24-11-06\n"));
-            
-            assertTrue("Had: " + text + ", but should contain 'nn.nn\\t10.52\\n'",
-					text.contains("nn.nn\t10.52\n"));
-            assertTrue(text.contains("nn.nnn\t10.520\n"));
-            assertTrue(text.contains("\u00a3nn.nn\t\u00a310.52\n"));
-            extractor.close();
-	    } finally {
-	        LocaleUtil.setUserLocale(userLocale);
-	    }
-	}
-
-	/**
-	 * Embeded in a non-excel file
-	 */
-	@Test
-    public void testWithEmbeded() throws Exception {
-		POIFSFileSystem fs = null;
-		
-		HSSFWorkbook wbA = null, wbB = null;
-		ExcelExtractor exA = null, exB = null;
-
-		try {
-	        fs = new POIFSFileSystem(POIDataSamples.getDocumentInstance().getFile("word_with_embeded.doc"));
-
-	        DirectoryNode objPool = (DirectoryNode) fs.getRoot().getEntry("ObjectPool");
-	        DirectoryNode dirA = (DirectoryNode) objPool.getEntry("_1269427460");
-	        DirectoryNode dirB = (DirectoryNode) objPool.getEntry("_1269427461");
-		    
-		    wbA = new HSSFWorkbook(dirA, fs, true);
-	        exA = new ExcelExtractor(wbA);
-	        wbB = new HSSFWorkbook(dirB, fs, true);
-            exB = new ExcelExtractor(wbB);
-
-            assertEquals("Sheet1\nTest excel file\nThis is the first file\nSheet2\nSheet3\n", exA.getText());
-    		assertEquals("Sample Excel", exA.getSummaryInformation().getTitle());
-    		assertEquals("Sheet1\nAnother excel file\nThis is the second file\nSheet2\nSheet3\n", exB.getText());
-    		assertEquals("Sample Excel 2", exB.getSummaryInformation().getTitle());
-		} finally {
-            if (exB != null) exB.close();
-            if (wbB != null) wbB.close();
-            if (exA != null) exA.close();
-            if (wbA != null) wbA.close();
-            if (fs != null) fs.close();
-		}
-	}
-
-	/**
-	 * Excel embeded in excel
-	 */
-	@Test
-    public void testWithEmbededInOwn() throws Exception {
-		POIDataSamples ssSamples = POIDataSamples.getSpreadSheetInstance();
-		POIFSFileSystem fs = null;
-		HSSFWorkbook wbA = null, wbB = null;
-		ExcelExtractor exA = null, exB = null, ex = null;
-
-		try {
-	        fs = new POIFSFileSystem(ssSamples.getFile("excel_with_embeded.xls"));
-
-	        DirectoryNode dirA = (DirectoryNode) fs.getRoot().getEntry("MBD0000A3B5");
-	        DirectoryNode dirB = (DirectoryNode) fs.getRoot().getEntry("MBD0000A3B4");
-
-	        wbA = new HSSFWorkbook(dirA, fs, true);
-	        wbB = new HSSFWorkbook(dirB, fs, true);
-
-	        exA = new ExcelExtractor(wbA);
-    		exB = new ExcelExtractor(wbB);
-    		assertEquals("Sheet1\nTest excel file\nThis is the first file\nSheet2\nSheet3\n", exA.getText());
-    		assertEquals("Sample Excel", exA.getSummaryInformation().getTitle());
-    
-    		assertEquals("Sheet1\nAnother excel file\nThis is the second file\nSheet2\nSheet3\n", exB.getText());
-    		assertEquals("Sample Excel 2", exB.getSummaryInformation().getTitle());
-        
-    		// And the base file too
-    		ex = new ExcelExtractor(fs);
-    		assertEquals("Sheet1\nI have lots of embeded files in me\nSheet2\nSheet3\n", ex.getText());
-    		assertEquals("Excel With Embeded", ex.getSummaryInformation().getTitle());
-		} finally {
-		    if (ex != null) ex.close();
-            if (exB != null) exB.close();
-            if (exA != null) exA.close();
-            if (wbB != null) wbB.close();
-            if (wbA != null) wbA.close();
-            if (fs != null) fs.close();
-        }
-	}
-
-	/**
-	 * Test that we get text from headers and footers
-	 */
-	@Test
-    public void test45538() throws IOException {
-		String[] files = {
-			"45538_classic_Footer.xls", "45538_form_Footer.xls",
-			"45538_classic_Header.xls", "45538_form_Header.xls"
-		};
-		for (String file : files) {
-			ExcelExtractor extractor = createExtractor(file);
-			String text = extractor.getText();
-			assertTrue("Unable to find expected word in text\n" + text, text.contains("testdoc"));
-			assertTrue("Unable to find expected word in text\n" + text, text.contains("test phrase"));
-			extractor.close();
-		}
-	}
-
-	@Test
-    public void testPassword() throws IOException {
-		Biff8EncryptionKey.setCurrentUserPassword("password");
-		ExcelExtractor extractor = createExtractor("password.xls");
-		String text = extractor.getText();
-		Biff8EncryptionKey.setCurrentUserPassword(null);
-
-		assertTrue(text.contains("ZIP"));
-		extractor.close();
-	}
-
-	@Test
-    public void testNullPointerException() throws IOException {
-		ExcelExtractor extractor = createExtractor("ar.org.apsme.www_Form%20Inscripcion%20Curso%20NO%20Socios.xls");
-		assertNotNull(extractor);
-		assertNotNull(extractor.getText());
-		extractor.close();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java b/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
deleted file mode 100644
index 8a15032..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.extractor;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-
-import org.apache.poi.EmptyFileException;
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.util.RecordFormatException;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Unit tests for the Excel 5/95 and Excel 4 (and older) text 
- *  extractor
- */
-public final class TestOldExcelExtractor {
-    private static OldExcelExtractor createExtractor(String sampleFileName) throws IOException {
-        File file = HSSFTestDataSamples.getSampleFile(sampleFileName);
-        return new OldExcelExtractor(file);
-    }
-
-    @Test
-    public void testSimpleExcel3() throws Exception {
-        OldExcelExtractor extractor = createExtractor("testEXCEL_3.xls");
-
-        // Check we can call getText without error
-        String text = extractor.getText();
-
-        // Check we find a few words we expect in there
-        assertContains(text, "Season beginning August");
-        assertContains(text, "USDA");
-        
-        // Check we find a few numbers we expect in there
-        assertContains(text, "347");
-        assertContains(text, "228");
-        
-        // Check we find a few string-literal dates in there
-        assertContains(text, "1981/82");
-        
-        // Check the type
-        assertEquals(3, extractor.getBiffVersion());
-        assertEquals(0x10, extractor.getFileType());
-
-        extractor.close();
-    }
-    
-
-    @Test
-    public void testSimpleExcel3NoReading() throws Exception {
-        OldExcelExtractor extractor = createExtractor("testEXCEL_3.xls");
-        assertNotNull(extractor);
-
-        extractor.close();
-    }
-
-    @Test
-    public void testSimpleExcel4() throws Exception {
-        OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls");
-
-        // Check we can call getText without error
-        String text = extractor.getText();
-
-        // Check we find a few words we expect in there
-        assertContains(text, "Size");
-        assertContains(text, "Returns");
-        
-        // Check we find a few numbers we expect in there
-        assertContains(text, "11");
-        assertContains(text, "784");
-        
-        // Check the type
-        assertEquals(4, extractor.getBiffVersion());
-        assertEquals(0x10, extractor.getFileType());
-
-        extractor.close();
-    }
-    
-    @Test
-    public void testSimpleExcel5() throws Exception {
-        for (String ver : new String[] {"5", "95"}) {
-            OldExcelExtractor extractor = createExtractor("testEXCEL_"+ver+".xls");
-    
-            // Check we can call getText without error
-            String text = extractor.getText();
-    
-            // Check we find a few words we expect in there
-            assertContains(text, "Sample Excel");
-            assertContains(text, "Written and saved");
-            
-            // Check we find a few numbers we expect in there
-            assertContains(text, "15");
-            assertContains(text, "169");
-            
-            // Check we got the sheet names (new formats only)
-            assertContains(text, "Sheet: Feuil3");
-            
-            // Check the type
-            assertEquals(5, extractor.getBiffVersion());
-            assertEquals(0x05, extractor.getFileType());
-
-            extractor.close();
-        }
-    }
-
-    @Test
-    public void testStrings() throws Exception {
-        OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls");
-        String text = extractor.getText();
-
-        // Simple strings
-        assertContains(text, "Table 10 -- Examination Coverage:");
-        assertContains(text, "Recommended and Average Recommended Additional Tax After");
-        assertContains(text, "Individual income tax returns, total");
-        
-        // More complicated strings
-        assertContains(text, "$100,000 or more");
-        assertContains(text, "S corporation returns, Form 1120S [10,15]");
-        assertContains(text, "individual income tax return \u201Cshort forms.\u201D");
-        
-        // Formula based strings
-        // TODO Find some then test
-
-        extractor.close();
-    }
-
-    @Test
-    public void testFormattedNumbersExcel4() throws Exception {
-        OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls");
-        String text = extractor.getText();
-
-        // Simple numbers
-        assertContains(text, "151");
-        assertContains(text, "784");
-        
-        // Numbers which come from formulas
-        assertContains(text, "0.398"); // TODO Rounding
-        assertContains(text, "624");
-        
-        // Formatted numbers
-        // TODO
-//      assertContains(text, "55,624");
-//      assertContains(text, "11,743,477");
-
-        extractor.close();
-    }
-    
-    @Test
-    public void testFormattedNumbersExcel5() throws Exception {
-        for (String ver : new String[] {"5", "95"}) {
-            OldExcelExtractor extractor = createExtractor("testEXCEL_"+ver+".xls");
-            String text = extractor.getText();
-            
-            // Simple numbers
-            assertContains(text, "1");
-            
-            // Numbers which come from formulas
-            assertContains(text, "13");
-            assertContains(text, "169");
-            
-            // Formatted numbers
-            // TODO
-//          assertContains(text, "100.00%");
-//          assertContains(text, "155.00%");
-//          assertContains(text, "1,125");
-//          assertContains(text, "189,945");
-//          assertContains(text, "1,234,500");
-//          assertContains(text, "$169.00");
-//          assertContains(text, "$1,253.82");
-
-            extractor.close();
-        }
-    }
-    
-    @Test
-    public void testFromFile() throws Exception {
-        for (String ver : new String[] {"4", "5", "95"}) {
-            String filename = "testEXCEL_"+ver+".xls";
-            File f = HSSFTestDataSamples.getSampleFile(filename);
-            
-            OldExcelExtractor extractor = new OldExcelExtractor(f);
-            String text = extractor.getText();
-            assertNotNull(text);
-            assertTrue(text.length() > 100);
-
-            extractor.close();
-        }
-    }
-
-    @Test
-    public void testOpenInvalidFile() throws Exception {
-        // a file that exists, but is a different format
-        try {
-            createExtractor("WithVariousData.xlsx");
-            fail("Should catch Exception here");
-        } catch (OfficeXmlFileException e) {
-            // expected here
-        }
-
-        // a completely different type of file
-        try {
-            createExtractor("48936-strings.txt");
-            fail("Should catch Exception here");
-        } catch (RecordFormatException e) {
-            // expected here
-        }
-    }
-
-    @Test
-    public void testOpenNonExistingFile() throws Exception {
-        // a file that exists, but is a different format
-        try {
-            OldExcelExtractor extractor = new OldExcelExtractor(new File("notexistingfile.xls"));
-            extractor.close();
-            fail("Should catch Exception here");
-        } catch (EmptyFileException e) {
-            // expected here
-        }
-    }
-    
-    @Test
-    public void testInputStream() throws Exception {
-        File file = HSSFTestDataSamples.getSampleFile("testEXCEL_3.xls");
-        InputStream stream = new FileInputStream(file);
-        try {
-            OldExcelExtractor extractor = new OldExcelExtractor(stream);
-            String text = extractor.getText();
-            assertNotNull(text);
-            extractor.close();
-        } finally {
-            stream.close();
-        }
-    }
-
-    @Test
-    public void testInputStreamNPOIHeader() throws Exception {
-        File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
-        InputStream stream = new FileInputStream(file);
-        try {
-            OldExcelExtractor extractor = new OldExcelExtractor(stream);
-            extractor.close();
-        } finally {
-            stream.close();
-        }
-    }
-
-    @Test
-    public void testNPOIFSFileSystem() throws Exception {
-        File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(file);
-        try {
-            OldExcelExtractor extractor = new OldExcelExtractor(fs);
-            extractor.close();
-        } finally {
-            fs.close();
-        }
-    }
-
-    @Test
-    public void testDirectoryNode() throws Exception {
-        File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(file);
-        try {
-            OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot());
-            extractor.close();
-        } finally {
-            fs.close();
-        }
-    }
-
-    @Test
-    public void testDirectoryNodeInvalidFile() throws Exception {
-        File file = POIDataSamples.getDocumentInstance().getFile("test.doc");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(file);
-        try {
-            OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot());
-            extractor.close();
-            fail("Should catch exception here");
-        } catch (FileNotFoundException e) {
-            // expected here
-        } finally {
-            fs.close();
-        }
-    }
-
-    @Ignore("Calls System.exit()")
-    @Test
-    public void testMainUsage() throws Exception {
-        PrintStream save = System.err;
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            try {
-                PrintStream str = new PrintStream(out, false, "UTF-8");
-                System.setErr(str);
-                OldExcelExtractor.main(new String[] {});
-            } finally {
-                out.close();
-            }
-        } finally {
-            System.setErr(save);
-        }
-    }
-
-    @Test
-    public void testMain() throws Exception {
-        File file = HSSFTestDataSamples.getSampleFile("testEXCEL_3.xls");
-        PrintStream save = System.out;
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            try {
-                PrintStream str = new PrintStream(out, false, "UTF-8");
-                System.setOut(str);
-                OldExcelExtractor.main(new String[] {file.getAbsolutePath()});
-            } finally {
-                out.close();
-            }
-            String string = new String(out.toByteArray(), "UTF-8");
-            assertTrue("Had: " + string,
-                    string.contains("Table C-13--Lemons"));
-        } finally {
-            System.setOut(save);
-        }
-    }
-
-    @Test
-    public void testEncryptionException() throws Exception {
-        //test file derives from Common Crawl
-        File file = HSSFTestDataSamples.getSampleFile("60284.xls");
-        OldExcelExtractor ex = new OldExcelExtractor(file);
-        assertEquals(5, ex.getBiffVersion());
-        assertEquals(5, ex.getFileType());
-        try {
-            ex.getText();
-            fail();
-        } catch (EncryptedDocumentException e) {
-            assertTrue("correct exception thrown", true);
-        }
-        ex.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/AllModelTests.java b/trunk/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
deleted file mode 100644
index bca29c7..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for <tt>org.apache.poi.hssf.model</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestDrawingManager.class,
-    TestDrawingManager2.class,
-    //TestFormulaParser.class, //converted to junit4
-    TestFormulaParserEval.class,
-    TestFormulaParserIf.class,
-    TestLinkTable.class,
-    TestOperandClassTransformer.class,
-    TestRowBlocksReader.class,
-    TestRVA.class,
-    TestSheet.class,
-    TestSheetAdditional.class,
-    TestWorkbook.class
-})
-public final class AllModelTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
deleted file mode 100644
index 70e7c7d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
+++ /dev/null
@@ -1,977 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.model;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.GZIPInputStream;
-
-import javax.xml.bind.DatatypeConverter;
-
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherRecordFactory;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.DrawingRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RecordFactory;
-import org.apache.poi.hssf.record.TextObjectRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.aggregates.RowRecordsAggregate;
-import org.apache.poi.hssf.usermodel.HSSFPatriarch;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFTestHelper;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.IOUtils;
-import org.junit.Test;
-
-public class TestDrawingAggregate {
-    /**
-     *  information about drawing aggregate in a worksheet
-     */
-    private static class DrawingAggregateInfo {
-        /**
-         * start and end indices of the aggregate in the worksheet stream
-         */
-        private int startRecordIndex, endRecordIndex;
-        /**
-         * the records being aggregated
-         */
-        private List<RecordBase> aggRecords;
-
-        /**
-         * @return aggregate info or null if the sheet does not contain drawing objects
-         */
-        static DrawingAggregateInfo get(HSSFSheet sheet){
-            DrawingAggregateInfo info = null;
-            InternalSheet isheet = HSSFTestHelper.getSheetForTest(sheet);
-            List<RecordBase> records = isheet.getRecords();
-            for(int i = 0; i < records.size(); i++){
-                RecordBase rb = records.get(i);
-                if((rb instanceof DrawingRecord) && info == null) {
-                    info = new DrawingAggregateInfo();
-                    info.startRecordIndex = i;
-                    info.endRecordIndex = i;
-                } else if (info != null && (
-                        rb instanceof DrawingRecord
-                                || rb instanceof ObjRecord
-                                || rb instanceof TextObjectRecord
-                                || rb instanceof ContinueRecord
-                                || rb instanceof NoteRecord
-                )){
-                    info.endRecordIndex = i;
-                } else {
-                    if(rb instanceof EscherAggregate)
-                        throw new IllegalStateException("Drawing data already aggregated. " +
-                                "You should cal this method before the first invocation of HSSFSheet#getDrawingPatriarch()");
-                    if (info != null) break;
-                }
-            }
-            if(info != null){
-                info.aggRecords = new ArrayList<RecordBase>(
-                        records.subList(info.startRecordIndex, info.endRecordIndex + 1));
-            }
-            return info;
-        }
-
-        /**
-         * @return the raw data being aggregated
-         */
-        byte[] getRawBytes(){
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            for (RecordBase rb : aggRecords) {
-                Record r = (Record) rb;
-                try {
-                    out.write(r.serialize());
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            return out.toByteArray();
-        }
-    }
-
-    /**
-     * iterate over all sheets, aggregate drawing records (if there are any)
-     * and remember information about the aggregated data.
-     * Then serialize the workbook, read back and assert that the aggregated data is preserved.
-     *
-     * The assertion is strict meaning that the drawing data before and after save must be equal.
-     */
-    private static void assertWriteAndReadBack(HSSFWorkbook wb) throws IOException {
-        // map aggregate info by sheet index
-        Map<Integer, DrawingAggregateInfo> aggs = new HashMap<Integer, DrawingAggregateInfo>();
-        for(int i = 0; i < wb.getNumberOfSheets(); i++){
-            HSSFSheet sheet = wb.getSheetAt(i);
-            DrawingAggregateInfo info = DrawingAggregateInfo.get(sheet);
-            if(info != null) {
-                aggs.put(i, info);
-                HSSFPatriarch p = sheet.getDrawingPatriarch();
-
-                // compare aggregate.serialize() with raw bytes from the record stream
-                EscherAggregate agg = HSSFTestHelper.getEscherAggregate(p);
-
-                byte[] dgBytes1 = info.getRawBytes();
-                byte[] dgBytes2 = agg.serialize();
-
-                assertEquals("different size of raw data ande aggregate.serialize()", dgBytes1.length, dgBytes2.length);
-                assertTrue("raw drawing data ("+dgBytes1.length+" bytes) and aggregate.serialize() are different.",
-                        Arrays.equals(dgBytes1, dgBytes2));
-            }
-        }
-
-        if(aggs.size() != 0){
-            HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb);
-            for(int i = 0; i < wb2.getNumberOfSheets(); i++){
-                DrawingAggregateInfo info1 = aggs.get(i);
-                if(info1 != null) {
-                    HSSFSheet sheet2 = wb2.getSheetAt(i);
-                    DrawingAggregateInfo info2 = DrawingAggregateInfo.get(sheet2);
-                    byte[] dgBytes1 = info1.getRawBytes();
-                    byte[] dgBytes2 = info2.getRawBytes();
-                    assertEquals("different size of drawing data before and after save", dgBytes1.length, dgBytes2.length);
-                    assertTrue("drawing data ("+dgBytes1.length+" bytes) before and after save is different.",
-                            Arrays.equals(dgBytes1, dgBytes2));
-                }
-            }
-            wb2.close();
-        }
-    }
-
-    /**
-     * test that we correctly read and write drawing aggregates
-     *  in all .xls files in POI test samples
-     */
-    @Test
-    public void testAllTestSamples() throws IOException {
-        File[] xls = new File(System.getProperty("POI.testdata.path"), "spreadsheet").listFiles(
-                new FilenameFilter() {
-                    @Override
-                    public boolean accept(File dir, String name) {
-                        return name.endsWith(".xls");
-                    }
-                }
-        );
-        assertNotNull(
-                "Need to find files in test-data path, had path: " + new File(System.getProperty("POI.testdata.path"), "spreadsheet"), 
-                xls);
-        for(File file : xls) {
-            HSSFWorkbook wb;
-            try {
-                wb = HSSFTestDataSamples.openSampleWorkbook(file.getName());
-            } catch (Throwable e){
-                // don't bother about files we cannot read - they are different bugs
-                // System.out.println("[WARN]  Cannot read " + file.getName());
-                continue;
-            }
-            try {
-                assertWriteAndReadBack(wb);
-            } catch (Exception e) {
-                String filename = file.getName();
-                System.out.println("Drawing Aggregate re-write test failed for " + filename);
-                e.printStackTrace(System.out);
-                
-                fail("Error when writing and re-reading workbook " + filename + "\n" + e);
-            }
-            wb.close();
-        }
-    }
-
-    /**
-     * when reading incomplete data ensure that the serialized bytes match the source
-     */
-    @Test
-    public void testIncompleteData() throws IOException {
-        //EscherDgContainer and EscherSpgrContainer length exceeds the actual length of the data
-        String data =
-            "H4sIAAAAAAAAAGWOOw7CQAxE32YTsSRIWSgQJSUloqSm5g4ICURBg+iBK3APGi6wBWeh9xGYbEps2WON"+
-            "P+OWwpYeIsECMFC8S2jxNvMdlrYQ5xha5N8K6ryHdir6+avwOer5l3hq2NPYWuWN0n1dIsgfbgshuSj1"+
-            "+2eqbvLdxQ0ndhy5KJ/lc1ZZK9okY5X/gSbrHZTH1vE/ozagTcwAAAA=";
-        byte[] dgBytes = decompress(data);
-
-        List<EscherRecord> records = new ArrayList<EscherRecord>();
-        EscherRecordFactory recordFactory = new DefaultEscherRecordFactory();
-        int pos = 0;
-        while (pos < dgBytes.length) {
-            EscherRecord r = recordFactory.createRecord(dgBytes, pos);
-            int bytesRead = r.fillFields(dgBytes, pos, recordFactory);
-            records.add(r);
-            pos += bytesRead;
-        }
-        assertEquals("data was not fully read", dgBytes.length, pos);
-
-        // serialize to byte array
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        for(EscherRecord r : records) {
-            out.write(r.serialize());
-        }
-        assertEquals(HexDump.toHex(dgBytes, 10), HexDump.toHex(out.toByteArray(), 10));
-    }
-
-    /**
-     * TODO: figure out why it fails with "RecordFormatException: 0 bytes written but getRecordSize() reports 80"
-     */
-    @Test
-    public void testFailing() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("15573.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        sh.getDrawingPatriarch();
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    private static byte[] toByteArray(List<RecordBase> records) {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        for (RecordBase rb : records) {
-            Record r = (Record) rb;
-            try {
-                out.write(r.serialize());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return out.toByteArray();
-    }
-
-    @Test
-    public void testSolverContainerMustBeSavedDuringSerialization() throws IOException{
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SolverContainerAfterSPGR.xls");
-        HSSFSheet sh = wb1.getSheetAt(0);
-        InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
-        List<RecordBase> records = ish.getRecords();
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(19, 22);
-        byte[] dgBytes = toByteArray(dgRecords);
-        sh.getDrawingPatriarch();
-        EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
-        assertEquals(agg.getEscherRecords().get(0).getChildRecords().size(), 3);
-        assertEquals(agg.getEscherRecords().get(0).getChild(2).getRecordId(), EscherContainerRecord.SOLVER_CONTAINER);
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        sh.getDrawingPatriarch();
-        ish = HSSFTestHelper.getSheetForTest(sh);
-        agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
-        assertEquals(agg.getEscherRecords().get(0).getChildRecords().size(), 3);
-        assertEquals(agg.getEscherRecords().get(0).getChild(2).getRecordId(), EscherContainerRecord.SOLVER_CONTAINER);
-
-
-        // collect drawing records into a byte buffer.
-        agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-        wb2.close();
-    }
-
-    @Test
-    public void testFileWithTextbox() throws IOException{
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("text.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
-        List<RecordBase> records = ish.getRecords();
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(19, 23);
-        byte[] dgBytes = toByteArray(dgRecords);
-        sh.getDrawingPatriarch();
-
-        // collect drawing records into a byte buffer.
-        EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-        wb.close();
-    }
-
-    @Test
-    public void testFileWithCharts() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
-        List<RecordBase> records = ish.getRecords();
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(19, 21);
-        byte[] dgBytes = toByteArray(dgRecords);
-        sh.getDrawingPatriarch();
-
-        // collect drawing records into a byte buffer.
-        EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        for (int i=0; i< dgBytes.length; i++){
-            if (dgBytes[i] != dgBytesAfterSave[i]){
-                System.out.println("pos = " + i);
-            }
-        }
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-        wb.close();
-    }
-
-    /**
-     * test reading drawing aggregate from a test file from Bugzilla 45129
-     */
-    @Test
-    public void test45129() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("45129.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-
-        InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
-        InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
-
-        List<RecordBase> records = isheet.getRecords();
-
-        // the sheet's drawing is not aggregated
-        assertEquals("wrong size of sheet records stream", 394, records.size());
-        // the last record before the drawing block
-        assertTrue(
-                "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
-                records.get(18) instanceof RowRecordsAggregate);
-
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(19, 389);
-        // collect drawing records into a byte buffer.
-        byte[] dgBytes = toByteArray(dgRecords);
-
-        for (RecordBase rb : dgRecords) {
-            Record r = (Record) rb;
-            short sid = r.getSid();
-            // we expect that drawing block consists of either
-            // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
-            assertTrue(
-                    sid == DrawingRecord.sid ||
-                            sid == ContinueRecord.sid ||
-                            sid == ObjRecord.sid ||
-                            sid == TextObjectRecord.sid);
-        }
-
-        // the first record after the drawing block
-        assertTrue(
-                "records.get(389) is expected to be Window2",
-                records.get(389) instanceof WindowTwoRecord);
-
-        // aggregate drawing records.
-        // The subrange [19, 388] is expected to be replaced with a EscherAggregate object
-        DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
-        int loc = isheet.aggregateDrawingRecords(drawingManager, false);
-        EscherAggregate agg = (EscherAggregate) records.get(loc);
-
-        assertEquals("wrong size of the aggregated sheet records stream", 25, records.size());
-        assertTrue(
-                "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
-                records.get(18) instanceof RowRecordsAggregate);
-        assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
-                records.get(19) instanceof EscherAggregate);
-        assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
-                records.get(20) instanceof WindowTwoRecord);
-
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-        wb.close();
-    }
-
-    /**
-     * Try to check file with such record sequence
-     * ...
-     * DrawingRecord
-     * ContinueRecord
-     * ObjRecord | TextObjRecord
-     * ...
-     */
-    @Test
-    public void testSerializeDrawingBigger8k() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DrawingContinue.xls");
-        InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
-        HSSFSheet sh = wb.getSheetAt(0);
-        InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
-
-
-        List<RecordBase> records = isheet.getRecords();
-
-        // the sheet's drawing is not aggregated
-        assertEquals("wrong size of sheet records stream", 32, records.size());
-        // the last record before the drawing block
-        assertTrue(
-                "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
-                records.get(18) instanceof RowRecordsAggregate);
-
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(19, 26);
-        for (RecordBase rb : dgRecords) {
-            Record r = (Record) rb;
-            short sid = r.getSid();
-            // we expect that drawing block consists of either
-            // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
-            assertTrue(
-                    sid == DrawingRecord.sid ||
-                            sid == ContinueRecord.sid ||
-                            sid == ObjRecord.sid ||
-                            sid == NoteRecord.sid ||
-                            sid == TextObjectRecord.sid);
-        }
-        // collect drawing records into a byte buffer.
-        byte[] dgBytes = toByteArray(dgRecords);
-
-        // the first record after the drawing block
-        assertTrue(
-                "records.get(26) is expected to be Window2",
-                records.get(26) instanceof WindowTwoRecord);
-
-        // aggregate drawing records.
-        // The subrange [19, 38] is expected to be replaced with a EscherAggregate object
-        DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
-        int loc = isheet.aggregateDrawingRecords(drawingManager, false);
-        EscherAggregate agg = (EscherAggregate) records.get(loc);
-
-        assertEquals("wrong size of the aggregated sheet records stream", 26, records.size());
-        assertTrue(
-                "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
-                records.get(18) instanceof RowRecordsAggregate);
-        assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
-                records.get(19) instanceof EscherAggregate);
-        assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
-                records.get(20) instanceof WindowTwoRecord);
-
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-        wb.close();
-    }
-
-
-    @Test
-    public void testSerializeDrawingBigger8k_noAggregation() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("DrawingContinue.xls");
-
-        InternalSheet isheet = HSSFTestHelper.getSheetForTest(wb1.getSheetAt(0));
-        List<RecordBase> records = isheet.getRecords();
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        InternalSheet isheet2 = HSSFTestHelper.getSheetForTest(wb2.getSheetAt(0));
-        List<RecordBase> records2 = isheet2.getRecords();
-
-        assertEquals(records.size(), records2.size());
-        for (int i = 0; i < records.size(); i++) {
-            RecordBase r1 = records.get(i);
-            RecordBase r2 = records2.get(i);
-            assertTrue(r1.getClass() == r2.getClass());
-            assertEquals(r1.getRecordSize(), r2.getRecordSize());
-            if (r1 instanceof Record) {
-                assertEquals(((Record) r1).getSid(), ((Record) r2).getSid());
-                assertArrayEquals(((Record) r1).serialize(), ((Record) r2).serialize());
-            }
-        }
-        wb2.close();
-    }
-
-    @Test
-    public void testSerializeDrawingWithComments() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DrawingAndComments.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
-        InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
-
-        List<RecordBase> records = isheet.getRecords();
-
-        // the sheet's drawing is not aggregated
-        assertEquals("wrong size of sheet records stream", 46, records.size());
-        // the last record before the drawing block
-        assertTrue(
-                "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
-                records.get(18) instanceof RowRecordsAggregate);
-
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(19, 39);
-        for (RecordBase rb : dgRecords) {
-            Record r = (Record) rb;
-            short sid = r.getSid();
-            // we expect that drawing block consists of either
-            // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
-            assertTrue(
-                    sid == DrawingRecord.sid ||
-                            sid == ContinueRecord.sid ||
-                            sid == ObjRecord.sid ||
-                            sid == NoteRecord.sid ||
-                            sid == TextObjectRecord.sid);
-        }
-        // collect drawing records into a byte buffer.
-        byte[] dgBytes = toByteArray(dgRecords);
-
-        // the first record after the drawing block
-        assertTrue(
-                "records.get(39) is expected to be Window2",
-                records.get(39) instanceof WindowTwoRecord);
-
-        // aggregate drawing records.
-        // The subrange [19, 38] is expected to be replaced with a EscherAggregate object
-        DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
-        int loc = isheet.aggregateDrawingRecords(drawingManager, false);
-        EscherAggregate agg = (EscherAggregate) records.get(loc);
-
-        assertEquals("wrong size of the aggregated sheet records stream", 27, records.size());
-        assertTrue(
-                "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
-                records.get(18) instanceof RowRecordsAggregate);
-        assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
-                records.get(19) instanceof EscherAggregate);
-        assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
-                records.get(20) instanceof WindowTwoRecord);
-
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-        wb.close();
-    }
-
-
-    @Test
-    public void testFileWithPictures() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ContinueRecordProblem.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-
-        InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
-        InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
-
-        List<RecordBase> records = isheet.getRecords();
-
-        // the sheet's drawing is not aggregated
-        assertEquals("wrong size of sheet records stream", 315, records.size());
-        // the last record before the drawing block
-        assertTrue(
-                "records.get(21) is expected to be RowRecordsAggregate but was " + records.get(21).getClass().getSimpleName(),
-                records.get(21) instanceof RowRecordsAggregate);
-
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(22, 300);
-        for (RecordBase rb : dgRecords) {
-            Record r = (Record) rb;
-            short sid = r.getSid();
-            // we expect that drawing block consists of either
-            // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
-            assertTrue(
-                    sid == DrawingRecord.sid ||
-                            sid == ContinueRecord.sid ||
-                            sid == ObjRecord.sid ||
-                            sid == TextObjectRecord.sid);
-        }
-        // collect drawing records into a byte buffer.
-        byte[] dgBytes = toByteArray(dgRecords);
-
-        // the first record after the drawing block
-        assertTrue(
-                "records.get(300) is expected to be Window2",
-                records.get(300) instanceof WindowTwoRecord);
-
-        // aggregate drawing records.
-        // The subrange [19, 299] is expected to be replaced with a EscherAggregate object
-        DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
-        int loc = isheet.aggregateDrawingRecords(drawingManager, false);
-        EscherAggregate agg = (EscherAggregate) records.get(loc);
-
-        assertEquals("wrong size of the aggregated sheet records stream", 38, records.size());
-        assertTrue(
-                "records.get(21) is expected to be RowRecordsAggregate but was " + records.get(21).getClass().getSimpleName(),
-                records.get(21) instanceof RowRecordsAggregate);
-        assertTrue("records.get(22) is expected to be EscherAggregate but was " + records.get(22).getClass().getSimpleName(),
-                records.get(22) instanceof EscherAggregate);
-        assertTrue("records.get(23) is expected to be Window2 but was " + records.get(23).getClass().getSimpleName(),
-                records.get(23) instanceof WindowTwoRecord);
-
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-        wb.close();
-    }
-
-    @Test
-    public void testUnhandledContinue() throws IOException {
-        String data =
-            "H4sIAAAAAAAAAO3adVRU2/4A8EPHAEOnlEooNaSUdCNIg4CUDCEtQ6gwlITSjYiSkoKA0ikg0i1IyCjS"+
-            "QwpSEr8B73v3PS6+9+67vz/eH+615pyz9tn71PqevT/rfGcJOIcLBtDXrNgAgBjAXcMFAAAb9SPDBAAw"+
-            "gLGmzna8xlxjR9WhAXhrxMAfCzqAf9IPQPXBAn6078IBgAyCH/VgVD2ADwCxAGhNBbXpc9LUF2h8n4we"+
-            "iOoNAKEnywaAFmAEGtDQABLgCA0AcAHfZvLjeozjc+gAUMATgAEygBNqzQTwHl8lcH5dGHWmvGY+1FJD"+
-            "FQOTHHX1x+dkBta2H9UcoLam0I7bAYCRrJMjDOoIM9W56wx1vcnt6WAfF92t0gIhfrfqv0o8e9khH4fE"+
-            "thqnQJHiJqOZUrbDByG8xwYeiEmYJPcUPoP17NH6hTz9cVtyfvnyyUuV3BzE06+vDH/Dlxi+/pYeV32e"+
-            "IGIy2p+e90VyZ+i9OlDL+Rp6Dmot/G2tUgYbGW5vpkSep5Fk2eKtJthDdEvKkzrvC4cmWe7kKaliC7ip"+
-            "0sMjlMUdN/akSG0ticE4nweeA7LUha1xyjNLXZEJUx80rOZMmgMIveJ5pQ7Hio17qM558+zaZgheNOHN"+
-            "tk7hCxKIZgFTs9t1NGhTdj0EIdz0tEcV4KZebLmun1t9qpQ2fF6N29/P3I3j3pYc8kI9zaMjjFNPi/ej"+
-            "qfkAaisS9bRAqLXpHai9Kw/38TIr6s3tZghB0GpAXUB/ncuYLE2mulOgiSpODb6R8rVbnQasDoj6bIiB"+
-            "gpPYItWexPrqVgUk73GpZwT2sBroUQZ07ovZJ6SXgbdvjH//55ZoggllM0Rdw7K6gHmeIt/exXytDGpq"+
-            "VeVUw1D6S2kCKezDar0iZnm3GGAy99/4bWY7VIgeWUlVmOVn8kdFOmIsel1/vx9MX9vNOZHYeqdvYnuy"+
-            "PuP2uxHPjCotCFiHoJKzFzI4MTQn1bBVdLQQT0LmrX8os3+t4Nu7F1SC7mDgrFsvKsHS80DFHx3O8SsA"+
-            "AJZ3XHlcbcydoagIOY6SWl1Vp3EIQT34gw8x7PqBwdNgkpp5LViiOWHMLE5uaQp1LIusFllOAzxrOusm"+
-            "WExAlgdfVmW/LRLc67SnF1MHKe/PT2vXvfZQw1g/fIwStuEpmaxlQa9NEWv40J8h8PmVmRGejXo+EW2v"+
-            "HEI0qo7ZNPb5niruyPOdHhnQLRUPGb+y4Wwo0WGygw6NOzBXGDYgzKBYzu+v6872oAZEaXgP4VtOrDV5"+
-            "LyQtP9wxoKWMM/buA960eUbfNY0RKG1vKafEuMZMtwJjh5N0+JRy8JYlbS/r6OhsqifipW+Gx4NtrO4B"+
-            "znA/UjinjWh9TytvuD/PeHSCSyZI5WEAslSzQZpIoczUQ5XM8tCuQSArrxGN5VGZ1OKFiaOi+zEpKW/o"+
-            "vaSMwbfZQYveck70N1ZjZrwdxtKxlzAobG5kMl1LQFazAkJqVsrYDgCNeunmvRhm4c6jbinypsbQpyUr"+
-            "wX1UwXJ9mtLhn3qC321JFsoymDATqy98V+hQ3ZBcpxN+W1+6wo6FrlRGKhW2ug7eAH3Dvn0rNWTG6vvr"+
-            "qKDGWqAXYu0s8ZmmdMM3xFjWIjXsqtT56ly7tMPY9d40CZ/CQ0b4OLsD9qG5CB5n47N2/2qJMKo1+rUg"+
-            "TTpa4D7au2JRC6XrayDXu7ZXGpvcwM5DWoz4HdBBTfQnmzN1K2YG+hpYNVGkX6ZlZGv7OM1XZeaZU1e2"+
-            "Rt+QEzSTyLSYPXezW5pSbf62gbi5iHWB7xBAZ2leDdXI7Kat5+Epnor5sC3ZefMh0hUTSQ8VP+BIz2fh"+
-            "t3eD2z9TLOhGRLoIErwXi+9yUgMZHhVGhWusRIi4J297mNL4iBUbHaKdFaRyobYMnKg9BWjH4+uPILV0"+
-            "8nC8A3U/jlFjjX71Jgi595V1xmS7qScwAiEcrTYLmRbMfuaHL6EOo1NjPeWNa8hlBYLWd64rInOTrmyv"+
-            "FPTmG8O5ys73rWL5VnYIcryPaJz1hicCpRGXFTgKhf3IKiBPTEzV5pMWMjt2zJfd24LZxbIx8ecWeVuF"+
-            "eCqzynPsivav2VzI2+hbgvBvzjdDA5uZQkqynn+lwzfceOc/l4qsu1hsOTVzy6AnNW9HhaqZ8yHRS87z"+
-            "01vZyoyAyGRlaOVkgW6lsSNCaOFlWqgRBJ2ZaR02lhwDHRJ1xN2B1xc64WubpudpxVONMUW7GMG/w61N"+
-            "qLmi+xXRMaSqigzr33Iwc3owsLyZl1hUaNChDstgByZaRb2FUik+0vh0uZw72thqliZVKKQydVxsnHk3"+
-            "yPj3tx8NnQv4+UTxz+WMaeP0AU6Pnb8XbrR/GklPdzw98vxeLqH/cRw63ft0SPxeejD/ECAaqljYP6Zo"+
-            "TOAbas2G/aMp8RrpyQyOBpihYQAbqK0+1BxuiKojWTvefxM1J1MApKiTggESs9MPZ+nkUghPWpajkQKk"+
-            "6H/bg/3bDYkDqHuDQT1hXLziJ1WUv+3+2wE6cY650PkPXCD+CRcAqPZf4ALfb1y4csIF3l9c+MWF/44L"+
-            "j9ungt3+JRe6HacgxPUvhzyKvXJ2F/yZmvIM81egZfIaDI0XieSQH6KXZeYHV8Oe9jmC77MXmJyzbuVH"+
-            "7Dxh7HWqUYgJgJQPP+qfFs2Wy5VJLBvjrb4LP6d2qSSiIEa1EDOTzXzBAf7NYTKe9Uv+BzvZxsBSGlzq"+
-            "j2IjVpqWoXU2lXXDhRppha9tKwNMX4WqNEd+qo3WpH0X21ausDawEugMlpZ1XaXro5TpEAOTyMX3q32g"+
-            "MJxtF2+idkYSmm3o6N6l7W39svNCNlqfzruLTTpsXDpob1SYnlNqhqsWeUW8X0QLFtb0RgBb4RFZ5sL0"+
-            "d0/SQfbKUi5bT3OBzDhhYW67b3Rb0nlESHfbpvodNwNarcSwSY0MT4wUiebd+x+jYc7Y1n2+lUQtURRx"+
-            "30MmxUonWXqrOwS88XfYSPvWDKWTxAd15QH75K4YXh20CYiyU3YjQcbGEoJcjplI/AMtEo7r7XINk573"+
-            "ttxnL6/9tUHRi1OE6J/j4C+e18b5+n2Sujwc78Z2iVgqPx6w8gr3STZTEnam+x76oWmpHGSLuwkiJvTG"+
-            "RlKOOIuBQ9oojJdCS+4ryVHpYg358B7SDCFMC46CEUMqT575UKujkzl/itEcCTxEr8cwQdh5o5lxmTEm"+
-            "sBHYgkxtulQL0LCL7vs/j9lrs2FGJpAmZb1khCo2GylQdMmohMWCCNdlSh5UgdKDv7/24CGqTnOKID6P"+
-            "zVFodIvClLZo9WhLi4c6eh1EzC5SzyMTLmTnaWpiPnzRRdLGOGLDNc4iUwyxMqmSe6ed0PRpeHenTdnu"+
-            "OLWibGodMxRubxi1VyEzLFOFs7LTt8poQuMjWvzk6Ews6D2wxOX6F1iIMr2OwsJbhNo+Ubfgulo5Ravk"+
-            "JUteZgv/qaiWkdJy++ryV4WQnU13JuY9z566hsH7oslDpXJGjvbpFH65FOhTlwdfaNChF1Qs3GSMctPh"+
-            "Nbz9Fm+pKrB9Z++2XPC1VZ2OCtUKaQm5UWaWKDF9woBGK5HEoXLY2/hUPIeLbibJao0EH3edb2ALE9T4"+
-            "ZQV+5Zl+PQUW6ZVIRMQ0pjyc21bn9c6Y4njsNgCvvVmcFDX+RLQKZ9pzmbtT97CkcWN3zy0+hSrChV8h"+
-            "jVBJfGUk2+xSWQQden2qE/JJ0wf93E45aJWQUtYEJQ5idRqUycJ3TzENxD4I/XJlTx63k95POuxW6jSb"+
-            "NU5wwAcj6djFzYfLB6U7YLpvGT2Swk3LEhF0wpUTMPJESYaj/zktnB54/pwWTsfE76Xr32uB9QwtYKOm"+
-            "5GMt4ACzZ2iB+C9qge8/1QLJz7TQ/1e0wP9LC7+08P+hBWVCae5j4tP+VAtqruNMxHUe2Ud+n1fmLyTQ"+
-            "2YXx5fEvPB/0XNrBMcMbTT7fB5TM7O+t+C9liWwSe9yRtqHauspQ07lU7sQyCrpFV0itVmSh8uCy2/tc"+
-            "rkxkTnA/Icuwi65LXrzZJjtnHVc9/PG3+Paqyx5jxLjp9kTYCh49bnfJR++wGTq+hLGRe9o5GK58GrHP"+
-            "7FjDwHSCxrWuXyx9SlJbKsY84b3W1/QO+3VV1NceWUxtBxid1fMEeb7QKAz1A+wk8WG36NZBztBeCYG7"+
-            "Ff3BFrRdwldH+yS7B5aW1um8pvWF+8W0tsKaqgWwpTsuZC5YpqhZ0AYqlV/g4gm3iiPF6YRmwpvFhd/D"+
-            "33NdS0ps2ALJJj/q52V5VMG0QPbiqOj+HW98bDtnDJerSZ+1+lZo6ggtvZWebZfZBtN9YuxrmAlHTxYf"+
-            "cVMDllgfs9JcREuB7CZEfBGQhT07MvJnX2sM/PFxwfU8dYjmBZW53fWD60iNEH3cB9p76dFftdDU0XE0"+
-            "eQtfiKn4AVpcWOxftPeb0ZsDA8pLJEO4ut35E4Okqnz7NKwgjs4EOccfF5rfSNDc95WDaY4wHbB9SZU+"+
-            "2C3b89lxyHxNsxk8eXENfcuYb3FPwzTNo5HutoMS0IX1onkxJE5oLbCpVoAuDVGtSH07DxyWULrA7qew"+
-            "93XSHVJ7S0eaI6tFWGSkkSqG5fXNNIaewY9XxXL904XR5S+itGBOaaoyMuLjYUtuabkPoKtE9IZqZH7D"+
-            "f5ZINS+ovLSROlfUeChS3SrjUT9xwJ2ej3XF6+6k/TPFzm+IJyWCBBUe1XwIIS6DA21muvSJqx77Oqur"+
-            "DDQNorlG+2d64a68eyEHak/+z7ygeeyFQJQXwMdeEGV970demkTM+/g3L7g4WBuZ7yC5LjyY/yKyDZ/b"+
-            "gok76IaXN1V32OAfmGAqzTetqTixv5i0voLHNPd49oWQocYHEM5g+8zbpPDK0QVj+0R4gEyI+wWF9M16"+
-            "GvOlR1rss/eySUS7skoe7TItY7t2ujMbvxeOyBB7YfC8OTBGcKqE/O3cVyPNtkqvXWqdV9asDQO7TNfb"+
-            "3N/gPR/Rd9gD2kKHUxPpOKhcEgoRegu26aFPXPExpL7aNpRT9D7eaNLCPZAZ7yNnTZcxyqlmD5fnoyra"+
-            "wzuIqH+twGznTh7ki6/NuB8Ajx/AYzQmjXV05puyUVLC3CFe7CZZDjaipzsyJ7tzBF55V6FcjB7We32x"+
-            "ZTeUreF/TgunB54/p4XTEfF7+Q++LZylBTyA8EQL+IDrGVog+Yta4D9bC104p1MRpD/TgtBfSUUIAL9S"+
-            "Eb+08P+gBSMhtMnjl5b+51rQHoecaEE6837xU9bHUW+s2AnqYPixjWDi8hTPy6oMyheJGuqdWNg0iK5G"+
-            "EVHdMLHdXq4/6HsLRVwujx8WVJgTF1MVia0W0M0cEfHxqqTvFnE1mVdhz4T2bA+sd04hE0PrS0HpneEl"+
-            "BKyvjaSiNsK3P55XNq6KLnS2zo6lzSkrKVzbKUNmlVrgfClUabUVVTW2fp47oaDiQ3bdk8QeY9nwshsF"+
-            "U0ZueXZ4zUDu+RqlNpwxbCz7lcVq6py5Qdt74hc0hcut9C0DiJbBMtVR0FinhbSAV2lkYQ3nOyZflfbu"+
-            "wsTpcz5lTcx5iT+5Zn3pegbXSIle3PB0Cn8kMr+/oSQy+F7N4orDRGJD+XaCIEWYS7Y8SI/R+ahmYXTa"+
-            "jMBDyW+XwWI6cPpNZkWQMeQSpbfDODPeFMYlG/nMz9kGSdVWwBPruVFyNykS/+67tDLkoT7aUXKSberW"+
-            "T4+Yu9slePniXDlUGffJxlN7yEheEmPmdDtkDuVhnsONyNKCijToxwBxJioQsvz9ZswLnz8JEfpVDhSl"+
-            "FsVD56mJw9Wb9+TswrgB0jvhjcdeuAi7MXKcjIhMY4ZnHjHCx21u4RzyPrvIYsah0+PN+B3kpVibPhKE"+
-            "nmaYJvFia3qArN6mS7sA7cIIwjwvfnSmVkftHY3VQuf90Z5H3HO0g1H8yPdlfg3sCcJ3P98Ly6m5tzXv"+
-            "ny6SETr94g5cXtcrv4ZddXMiT68thBCEq+NvQp2nGMlRC+FJchk179vxn52zkQlfka3B4coruG/+9muu"+
-            "fapi57uGeFsBglGxLM4wNRxbTy6dC2UNJCbn9g4+ipE5KrqHSp4ZpOM9XLvH352LfpaKuHn9RypCUmCk"+
-            "5coC9RBwkoqwhBMoe3HZdVKOuJe7EfjU0ctAJD6muK6ILFcN3i24PISLVMm8tHmfhCndtVm17nkx3Ggi"+
-            "DBDpFbCO7/dvMhFO6uXmybZv6la3zrixy4XPPKZGHdj0/Z5/SScoPQn52HA+TfkWxQbaGNdswrJMZb7z"+
-            "OfkKgxKtYCp8vdDvMtOMBTzyzDNfF7wNuBke719LaLaXS6ZSZ6+rvx0rJmXy+rDW+IpQ+CBso1pdHRRc"+
-            "yZIjBbQHH7QmiN/qAakyb4IcZLWTAvEd4udrIZTt1yq/im1+n3kuiH/jFagSzH5Flw3W8ipOfSeCgSgj"+
-            "iiKLjELxlsz5xptFVxQ9vGDBuyNXI9okPSQZwiwGqtZ3jXCcJTaWcP7XuHB65PlzXDgdEn+KC2elIkBA"+
-            "8gkXCI7/dfAHLpD+RS4InMUFcaDthAtt/8AFsp9wwZf/r3BB8DcuCJxwgfsXF35x4b/jQouTZIA7Kv7O"+
-            "/YtUxI9/LojhVueUB4iqhbfJJ2bUENhFCYDT2u5YXEsgUFZLkThQaleuYHC3CTKxTCbd1WT0EahBGslv"+
-            "DVS32ii8KogjzQvMo62Dwg72hZO1psRHKPQVVBUiB/prviITb5iO+tuV8Cf4gpbxNSDVG/UcMS0Pn9pX"+
-            "1fA9HSo2ohu/A25wf6KTwNh4tyDGJVmddORGO0dF7IBkC70hNsJXKFHlI05Ibn6hbebFsMuvbvjzplET"+
-            "SHnmI++kTM7evTcpq/uhfFbDakQz8qsyjX32rhp8Ep/1zTZd2tJVkquZu8KMOVIPhflEnxnPxcax9scj"+
-            "lToDBcO0pj5X3t7kifqSPfmyOjC8dKfK1GBAJ0ydvb8WSyv18/6Vwdj9aYKeNLT1q7nMXLlgkoOFNqzE"+
-            "2nm7cSKRT4xtUp10hOZfm4YE0Ypt3Z/MaGB/DmqcUQt5RHWUzfTQJS21R/ToZnLorfPzIZocgeD19QPw"+
-            "XHTIFdwHg7Mlmota6OqYilolxSmSlx8CKjwsELJHKCrINvmNCxi34NV87Ipn6YNICQjQvqAz/rKMznR+"+
-            "xLnkeisDE8nNYUGNo/Yd6z5nn79bwVxU+VrjMw6FYyvsRHjKviTE8i3z9Tag580i9Ern5SnETqo8xEsw"+
-            "fIyRKSNIzwJRMUUgiRI8wm5TB8UZvJzFngq0eBhAJRO5vbBiKg5703eOV45AT6Sh6XK9gDG76nyVal0a"+
-            "GR0lk4aLl1kWQ6H+WmNtU1jngMZR7RpLTy8JgWWcC6Gelj7Icfervb2pQuc3RKswbdDSUy3K1mwMB09O"+
-            "lBZ8Pj1LRWmBn0xd0b0TcWaMvhRwTruEejUL/yMtjCZxXMuKevsgpH2fOmbNcDiBq2jZnuNYC7lyjL3W"+
-            "qwueYx20DlUl8XqYe3XExPqBVvFjxAb1PUWkUsOab20KKdiK5yizYzde8dLz1mmLILgnsHdJoYpxUgvG"+
-            "/PjoRnHGWuODhPomZGNKi+ICT3xpqjdmSokyIOcwY/Q6GjQGghDxtZ5GXkroNGSRBZXJVzXWn/V8EX8z"+
-            "bh2EV1VrM2gkFVGxYum4qEsJHd2DPj6kJnJzVTADlCZWR7ItRI7zEPBUU2RiU8t1G6QOxXMhpekJvVQ4"+
-            "IppKQdVys+cLtUY6Un0+hI2Z0wMzAxO8Lr0LbaILk8WtNsxpaFYMrTjC22723OH5GFkUi+ux8An2Hi0F"+
-            "fvcr1v8aFU6POn+OCqfj4ffS/e+pcOEMKhABrCdUAAPhwB+pQHYGFcT/BBUEz6LC/wGpc+eRNSkAAA==";
-
-        byte[] dgBytes = decompress(data);
-        List<Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes));
-        assertEquals(20, dgRecords.size());
-
-        short[] expectedSids = {
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                DrawingRecord.sid,
-                TextObjectRecord.sid,
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                DrawingRecord.sid,
-                TextObjectRecord.sid,
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                DrawingRecord.sid,
-                TextObjectRecord.sid,
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                DrawingRecord.sid,
-                TextObjectRecord.sid,
-                ContinueRecord.sid,
-                ObjRecord.sid,
-                ContinueRecord.sid,
-                TextObjectRecord.sid
-        };
-        for (int i = 0; i < expectedSids.length; i++) {
-            assertEquals("unexpected record.sid and index[" + i + "]", expectedSids[i], dgRecords.get(i).getSid());
-        }
-        DrawingManager2 drawingManager = new DrawingManager2(new EscherDggRecord());
-
-        // create a dummy sheet consisting of our test data
-        InternalSheet sheet = InternalSheet.createSheet();
-        List<RecordBase> records = sheet.getRecords();
-        records.clear();
-        records.addAll(dgRecords);
-        records.add(EOFRecord.instance);
-
-
-        sheet.aggregateDrawingRecords(drawingManager, false);
-        assertEquals("drawing was not fully aggregated", 2, records.size());
-        assertTrue("expected EscherAggregate", records.get(0) instanceof EscherAggregate);
-        assertTrue("expected EOFRecord", records.get(1) instanceof EOFRecord);
-        EscherAggregate agg = (EscherAggregate) records.get(0);
-
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-    }
-
-    @Test
-    public void testUnhandledContinue2() throws IOException {
-        String data =
-            "H4sIAAAAAAAAAO3bdVRUW9sA8AGGrqFHSlpAhSEcQAkJ6UYQyaFBmiEFpCVEOiREGikJSekGlRJQuiQl"+
-            "FQFB4ptBvxvIvd+97/fete4f7rWYc9aZc4aZw7P3/s3zbFYB/FiEANTNeD4AAATA2sQCAADIH0wgAEAI"+
-            "QNv04kNugZusiGMoAOxNEODHhgrAObkOgLgGHfDt/GlMAID4+3EUxHEADgDgB8DdVEbsNgDAgPMAHxQl"+
-            "nzpAAwoI8XsbUfh1QwCvUPiNAIBjFCzEO/BuoUOeiYZ89fPA60AloCBQGCgO5EE8XgPKA4WA/MCrQDoA"+
-            "F+IsRgDDR0VM5JUAwHVAbosYYl9ZDg1ICsA4+Sz0gM3dkJpDxN4s4gwSxFZb3NbG0cTGUf+mm50JXJfD"+
-            "1doqJrJbthUC6tjw3QAtsFvnYRJZvMDMlyLTPQ+TzrYehmInaLpMTTqKcMzi0JotHH9kzL01ZkHKc6Ni"+
-            "kq2K4yJorozv7TaO8FulNhosxSW8sMlIXxqugsRXD+7W4bYy1NBcBKvi7KqW0pqLcXjSxXM+DifJFmzX"+
-            "wxikWpWZvDlUODjJ7JArLYfB6yRHcy9MRtBma/86sYUxiBBz5k0WQBxc2B4jM7/6OjxudljZdFGvxQ/f"+
-            "I5br+tFosU4PBbUn555F+hUmPa5ss2Tu+7yRzIRgVsuXDWrkr4Nxp5w01EYk7+l7XHgKn2n3qpbe8no+"+
-            "ZuWesRfDsSsy6IG4v8fHaKfuFteEvsEbxF444m7hIrb6DiZWcE4O5GNmRNOdFgje/Q2/Or/+OvtR8XMZ"+
-            "irYBenKYNTjaMvJGrzRZrKfqsyGakrbXPlDsC3/c2KmE5CaUuoZhvFXADUk3WXwPm17x0PT0jvLtn2mN"+
-            "xBuXgU3VNawp8hrkSnHvM+WppoPBcjJPtB7QsKXyJrO+VegVgOUa0TqKuTf5fM62rrx6bHq9EpaXwRMR"+
-            "boP2wUNp6CCQprb70nh8u0Pf+O5kffqdjneu6dWqEMKbeFWXeiED44OL1xt2nh0vxxKReN46EjuQz9/u"+
-            "KKC44kwIOOujl5871I5HBQAOMJDdAQAwdoBzws0N7EwQEYKMkgJ1GZsxCOkExRIN1joJfgWxVDFpGcGo"+
-            "Qj9YEQ7QSLdKI2WLKLhspp46hiokRtiv0E9vFmE7qKSqOuqo2bojlj1JcezuxZCzqNDWlyirjpMyPT3c"+
-            "EfRJfo5Zn+XL/tDzDGxJWZIUEhZ+hc04do8U4Xu81g7nSFIK/SWmffPB3sCismdGvWojIRoSNA8SHYrJ"+
-            "xTQkWvJ17lYzUdnpcXF+PiRRGoqK0ilkHaLo8VVb0bZtDeXeaVXlfxqR7pAvX8ybfFfS7/YofnHVpRBH"+
-            "0lApA95hPONuVas3kX7dpR2hQkHNJRuE0Jq2/XrGQUM6mQ6/LRQe7XSZ6eMH/Eutk2bCD/ZpYNXv10Zu"+
-            "PmSPkomEhfJa817co9K8plVfn7dYGr3pIBT/9DUJtWGrDHrAHZG1yTXhiqmxsYmvO3D3sXtjnuZeZfqj"+
-            "RayNk8XdX7z5qNaLaGO3FWazI9RvwT55f9LInEuNb01nVUbDJ38oCeKRHAM+uZ/BM8WnJY3XlPZ6uCO6"+
-            "05vVj9B3iZffJ/yhcE6rh5Zc1hO1kkp2Y2pmzTfy2gHGh2IWUkNqjm721ZDu7M9xKoy+H9EDvK3ei/Bz"+
-            "KkOwBMpWnQ2XQmXKWC41Mb1ifefDUyitSEO9t7nyiWu1eKTEN7Q03XgVNnoVxTTxeHDBYejjCAM5OtMW"+
-            "bO7omPh9p0WvOSPFgd2celfAQRIAQ32ZwcXDM7rqLUQ3PSmHYYpSpmjmPAZ8Sthn67Z+cwbMMHo6NPaK"+
-            "pN3m5HhHpikPygTa1vuwBaAln7788kVGO302kID8dL1eAUknroFcleOjaGk34QtRlwBmrePCn9b6Zylt"+
-            "nlDxY/umra1wTHlGrXVlAcrjUS4aWHEEsWRLVJA36DOSw6tlvFDPCuKXAuvz1Ii+G4aCHIu/BbGxrYuN"+
-            "g4kzMoblI14ptkBAN3alD/yuSFuBnFJYY66qi4qZqEmMlsLMiBfpDa+VKkQfCUXH5U3s9Yzz8Lx7vken"+
-            "XUrSDtXi2rxAC0pz0OXNMyyeqJ28cL3gfd50oYZvk57mo5x3t3iELzsWcZdo14RMg0xykkXXdPiyBhfK"+
-            "I8YVHS+Q7shaM7mwKtzAbXGn5tCmdJ1Ei61VqUpbeOyae+Po+VFs1Zz4PZtt+KfydJcxYW2bKBYCknYb"+
-            "2/ttJKALGC7Q4wFbdD+AdPW4V1J2Z5VTM6SRH0zgJxpCQbgmNl8OfV/Dq0Wc4Y5BH6FTiUm57X5bayYi"+
-            "yK9TnFo7R3VJygCERmOfE14cfo3QEWg0Y+wZ2u/a1R68QXP7rhtmyBZfttcvowEK6mXAH08cv29nTCOn"+
-            "X+D0WPpr40D53ch6+sLTI9GvjQ31x3Hp9NWnQ+DXtg78ISCU5dAxvk3fQMA2YsuH8e1U0Cbx9/kdhIoG"+
-            "6EY824eGB8BHHCHaRB7XBVACyBCzPCpCBkSw0zdnFbCEeVoCqP+gBLh/SuCnBP57ErjpXBiC7H9HfyiB"+
-            "7rABCKie8SNB3EbNnkXSZZVoMkd0ilYN3R0U+dkyojCakWwRd7HZkLLwRnE70YNVnkzb1mFFVZhPS4VQ"+
-            "Zo+84BTf1Ovh6C0EBUK+UWDwOwWYvuxvb0VznabAyBw3i6A2TjAd8BYXmLh28EWYkJKJnBaRE/udl03a"+
-            "WLeJ8IscZuajCuhd22r7dhlPKHCZDUEBPzUq7aK2GO6dQTF+Nfob8xoJMAv+j3iYz8uoYPa3SZchIT3N"+
-            "Khs8LCtxho8JHo9cupb0EbPJbvprXa9NScmut9ZnumVhV9vnKs1NX/QbReV2aB1IBZd3vG3Dx2dyKdWZ"+
-            "ohmawBYv+gvmbA3WvPc+5KV0xbXmD8mncyttAhgV2VnVtyx277mMediuO59P7O3W3bLeLdnr97CoTwe5"+
-            "H0JJ0Catmhskb0KhwXwBBaPE0ZikVQzMmPVM5Dd8oH2G/a5AAaMyhc0vl1Bn8CmIxR1YeY7ovzQFcX+h"+
-            "Az9GJ/Kw+iLAsjCgxX7oG+J3m56EtSnKdJSbKT9e9tpTgvShNguDUYXlyxn3ge/hONgjb72KOZQh0gJl"+
-            "S86mSzEyZQzfJQC/LKP42G2upWgoY8pgqMQf7zlCAubjWqimKRtwuFa5a0XQDRRDWvzx4ycQgmTnICi8"+
-            "KRxTL1ans4EIphwLhQe+uxJsiT/AfHdLfk5bfBn/oAVGO3rBTmxFzpVUvoAkuaS0HStsMknEWvV5rve6"+
-            "z559INy3PIkz+3MsvSsrWSc1y2YfKxRrSWwY9RnNAqtqSm8QE7yYx3D9/N668T383V78ZKDo1I5TvsuF"+
-            "UqFqUs01p0ZZcBJuejBbZGHbBkVwuYD1mydnBnFQfewychqIOFsCNyMUlE76sPRBYKe0DkhO5K3qy1IL"+
-            "ujR7lJJC6qoAFt2LiZmyzaOH7oIYo1V75YfD94QS8POYtS10jXj97EgBkS940/upMNr2P15FmxV851sp"+
-            "KYdxbRkGFRJJ2tR5pMc57zzPBww0j4djlO/qKuZetMytokpQvFOg3s6+rjKKTxa3y69TzovjG8M+aT6u"+
-            "vKUoPFh6oOPJpvMpbxIH/qROZCA/XZ/j7e3o1nNG8RQtBwRB8X4i0OM3Sr6ieJlaq8JWjHHjbhbnUml4"+
-            "A9thSAnoxJeXfK0qlSSyvIthRJdlcU6i+B2n+nymFAN1B8qs5r7cw4HPLLLe6/a2BHZBg4SPD3IGNsm1"+
-            "lRA94DmaghKnqL3H3Geqf5sETo9Ef08Cp0Pg/ysBNCAgEfEtvw+ABxg9QwKoZ0rg/YkExn4jAbR/UAI8"+
-            "3yUg8xsJCP2UwE8J/GcSKAnuIYz+05yAnM0YBPQ9J+BJPRICYzOnKUtK50peABRIjIixqdLd9ipl77P2"+
-            "oU0LXMpeuoDMCdCzVT/8ert1p5m2126hbi/y/QOn7r4oWXXslNkTCOiQkj3J+bIw9DwazJiFzYlFkpzt"+
-            "Kk5W30krQlmEmwBK4fSXAPnmA0nZ9MwnmFJyPqEXBl8lw5+HXQ4oCL7f4LBOFlVA59qNgEBgyh0m5gAt"+
-            "5TzOx+hm0Aq9YGyT1eAAuzzVkFGZatgIbPUcgWQZAZ1OrIkzbUB/jyHpW9Y29pVByVWndmFKVKJFFJYV"+
-            "A7RjsQHDwD7MESl8+pcNdn5hy8J2IILZyUVah/AcypvROiGkRpnLWs9DGlBGImderZiyXzPkjFcLzmNo"+
-            "MwPbq4o/GVUacxkLX9vdsflafzg+WT5VcX70/Fr8zkVKmO2iqWEjYr7YIIp9qBDlxLbyrGEOZaJQps2H"+
-            "U0bidvqV17cEgzAN/PsxjEVCpeptOyOApeLVAnbkUoupEtUCRA996ZOhQBoyeFmkrEjOLEyrEyhbklld"+
-            "Qdr1KeANQV7gEs77EIP7Csv4SATw4JwbafKyM0g1inAw719r78OONpfRDJFJUXuGZqYV4XvVaa4lJ7+j"+
-            "p0Wjg5j79cuQkgz7FaxH1kfRSfnqgWZJmnHKrzN8vh5fDEXLEUrv1tl87/OOjOKTLRDsmPVqfGZbfFay"+
-            "RT5YT4SsrV35Ln5DcUJgD/Z47z5OvSyLBlvP7SEYkGJjrV7xDpQIIlQssn5HscT5a1tMPRRImIWa0IJB"+
-            "S9mG4fMCBA2UChQIiaFQY+jC+xz66J1UvVDCROMKHJdPtJjqa3a+i76xuxNb32iHt3oxNF6CZIBh7MHX"+
-            "3qCh6lFjEZSzAlh6X2qcCvHMw7+YD4iKIhZ7nEeXVooSCb00nNDqFjQcZjWQ6dWbmXXHpb4evi648EC0"+
-            "wvhiqHWZ4bSSIJ3Y/Avzm210Y7Xjkr/kAxQ1NZniKeC0FC9u5Q4/070BkRh5xPP08YqhrLUebteahItY"+
-            "2q07jNXiFuxa4EmjKiuLaTcedreMYvHuax91HhyYHV4s6Qo8eP1Z7fO2pG2psK51OkuyZKiuPv4rKTpF"+
-            "vPWbB0oN5Hjr3jH5E5UWITHaF/DQdDDjW9romoIDnXM/aSV91KW8HNwv5AeSfqaNoQY+SQiAx3vt6uvg"+
-            "B25YfqClzquedJ4SO6ySyWn3IA+LHcvCrLztMRNTwn1mHdvmCP9tCDg9CP09BJyOgF/bh/8bAdynEICG"+
-            "eAPoAFMkAlDwAdlnIADtL6YDgP8gAngBP9MBPxHwX0PA6+aBzkeInnb4lxAgEzbf6ZuV6tRnE9Jul4hW"+
-            "TGyCmyXtY3zYlXe9Ev2uP216UvqTZNF6lcBMJr7Dy4buBgM8c7V8tqadXW3ZhuY3stjRlezsPhhJuLF8"+
-            "iuIk9tj6MCLjH/nGf9EfW5GkNgtHPzP8vAK0OhS7N06MAatJHe8+kLP8pDIQpSHxOCTRYfOkMqBfvekg"+
-            "8xZUazjZuCuVksfMXK2lilAAZg5CAQ/YThSQLRbyspC76c3zYDP+R1lCgAf56dJ+KhBa/7reRwXaIU5X"+
-            "HUyfr1q1e5Gj10/VrGJT3Q3PuREeuW60C4Ub8wdJHjfj3/f87N6o4jpJg6LoPk2gOPSUIYEUu1164KEp"+
-            "sxeaJYVf0bOVBCuBWp1uJvYtYCACA6JpiUo1LjXh3bsLNrv1e+PjV6aczyee745fuEhpWCRygoGNIiQG"+
-            "ZhXo8ysa51DmC6W7fDiDb6ik4vMOu66K94CtDWgkULAQFgCXiieMQEKbucAqps7+iyhBd5xdw0JGTkoD"+
-            "9pDLxqgnpYEQ420xC8wh0bJmfi75SrY6k8EImIciPePYHiE5BjsGG+GlFzTnrpoQF2LJQbq4XzpN68hF"+
-            "qZkReH4pu/v5QsHVuAgDjZhQmofaco2hW0/GkzUup1w2VPF+JIW2e3wBQQGabxS4xXxCgZtZ3eMzTgqz"+
-            "Wi2OwZOCZHtvkRSAJATuYOv0ISiAw/IWu0fzthGQb2NtA5o7cvP6buNBVY1A02g3hdr+KEgwBseYgMTV"+
-            "nJQK6EhvhVJEACdl6zWTiBIYPsfVG+7hzt3gs7j4dpzMc+xd4eTjzp0PqrDyopPKQPBJZWB3isgSPpp5"+
-            "tgRy7xoJUP1ZZaAbKQH/Delav3JpHZDTG2iT/wt1UbE1dIlRu2lT4kWpVmeTJBZPd+gdFfct192xkZGR"+
-            "9FuXR+RWKDME/DMAQYPVbJS69p0VRbt4QVtiFOlXtBz4pTEf7G0PyTMFLDuy71LpE1Gn6zLwD05uEMvq"+
-            "6skxj3euZrZrWRQQ02YVmhvcCGxRl+sQBakxUz4kKB/uitdaEEnSD2A5/4GHp3d15eGkie6L0VKWREiP"+
-            "re3+PAmI093LRrh/xVccmKlDU2+tltnsZiEAo8YLbIKFUe2uqS6Wl7TUlEkSWV4l4IoYL6NmgSztljq+"+
-            "yTA08ObVOPJq5veglrqOOZrESKWoBNHSb7x0t7FHzvWq6Uei7Hj3VP4n9keY/zYJnB6J/p4ETkfAr23j"+
-            "76cDEBJAwUB83UZIAJUAAD9DAsAzJCAImD+RwMRvJID+D0rgyncJyP1GAiI/JfBTAv+ZBPoZnjfFIXra"+
-            "3l+TQNx81R9KwOF3EqhcNiNyN1LjSXYLR0pg7ywJHO7vdSHzAb3YJMksrnJkwkrnRRKtkGsELgdIRPjm"+
-            "g/Gw9e7odqTklDIXBl0luzI/fdm/IOi+0okEIk5JIBkhgcoTCeT+KgG72XMEphZoyMKABRivRXTwa2jX"+
-            "iyzNHLMeq7jH3V8OJ61cxsrcL13eP1gWtrXloe/n3zwOOFfGtSsaaJbBAdT5AQG4loGvbt3alq+g1is0"+
-            "JY5185VCIiASgYDdmrEFd3jl1z4Pm/VEW4QIwhfktshuDK+0yBN8KV08vJJRWi1Ty2Y8RB4vmFpGxiaw"+
-            "yVzCilMmswlgJ8FjCK3oMzcASyIzAmDFQO5hEF5HPwkk/fVqUA+qcufqJjXZ8/I42YZUZEqASbY4M6GC"+
-            "tOtD1huCPD/zAHvDR4pqd189pW/6ktwcbPVORBP89FF/a/qYfZoaS39IMTD6UoYOZk85k4CTad8rNoy7"+
-            "n4k0aOQ6IRdl28PaC5lhkntKNor55L3kJazXTzICJO0+AwT9Kb9jgFB1y0pia/n9ZeI6xF+vMO0zxpEB"+
-            "N+EaSVXyNvPBL3UBm4mkr78wwP07A14iGZCMrAtcgmIj6wJ61G/1UASfEMkswMxaBYU+TXQdUKakUFVh"+
-            "+9avrWhsKCIzAsWj8d6xECiFBIkag/aDqSnQHzvgA+7DVErEMyF/5AB9pWYIaduUwgFB95WPbdJ87bAE"+
-            "R6ACXr05cMHP1mnlqLVcd/Rle+WiIt3mYMrY12u7KT0UdVadimBty7bG827X/V866uVHib7w9Az11uxQ"+
-            "76EqBPrVFRdL29guCPY45bw1rLRnFiUxMepJdXj2kK38NjNTJeMEToBtADTqWkx2ZvUMTeKr+2FCtrLM"+
-            "RWSKT10v6rFHHtocMRHsxejn3gurn1oWHy28NfaUwC+o5GvNvT1ga/CkbqLSZ+0eGE6m5pqX/OOi6l+W"+
-            "CPhS7XarmsRCW+ogWsQZ1zB46BJswEDIUnh6cfNhtKZQfuMT4HvQ0vWrnnMHm8BZN3RFU7VV6ku9duC9"+
-            "SaLsd9dSqzwMHAD/NgacHob+HgNOB8Cvbe3/ZgDvjwxAxURO4oA+NELE9PojA9DPZMDiCQOmfsMAjH+Q"+
-            "AdDvDFD4DQNEfzLgJwP+MwY8biPYj/s7CYHwM6oC2j0/JAQyyxAMGMNNSqFfrHPjEe/pWYlKw4/NAwm2"+
-            "N+WGE83nduLUh3zczje7QBIawyLIKG9H+Z5G/Yug24G5hhk3g6AuLnJ9ABHYsPbtixBBpSxLLWIndvaX"+
-            "TUm4t4nxveZfvmIaEduMckObOu+WFxVjfEcht96ONnl4+O7FhZiSC+TNCQ5sspWy6HI9pikzsLgdwCWO"+
-            "LcFzYZLvRYdPHDDMYmQGfdVjeiDKD96/t/Fcymr12vXLdyOMBzE3rKEvp60+cU6nCsHPu1E6X2iEB46l"+
-            "5eLEMsUytIMttCw1NvmKnYs94OqXjeVm5k3pVSLbXEOJLjCT5u2VeVUeD3vY2uxuJPV2W29ZH6d9WyBA"+
-            "tLNvxIJx8Hz5iFJlZJgpD367Ap2FkNVWBofAQ4bpE/UQFy1eNv1caD9BojU/dg7SAlil4mxWS6GsV641"+
-            "20N8J+6nZhhWaKguL96klsdNuM4VxzsUxzBSqzwq6gQqhCjiDVjLboCvMIH1VTs7nY/8AnxCzimcZAPM"+
-            "iK2xHnDJqCGzAZZRKr/LBsRRnM4GpPidzgbEo/+QDXj2JMTKjLXuvv6j1+JfgRzmntj6AiRj4JyCpxDf"+
-            "pN2FeoU7UIo+IbsHNTUC7b8y4DfZAPRv2QByiSjm79mA0tr7i4sYNr6ptl/zhmpIRvR0cQp2rsDQQ7vR"+
-            "+1tjOt/O7rq0jiZDu5TOjOGMJL/0P10oeCodkMhrgeWU5+s/ihtUMdPYzdQTHrT2Eqqwv2OlrQwv7bg2"+
-            "tR5mtqVXYcyJrAxAaJEMcOp/GiJa4Vkd7oNgQJM2ggF+xRCloiJTQTZHBAMa7MmaWF6yJIuujXOknawU"+
-            "DPusyFoQOyq9rpwYQn7fZVinYnC3Nkh2kjVZeeux67MbR3V7kfxzuveM99mOPLJcblfq2bxnwTNst7Hd"+
-            "b2MEXbjrwnXcn+/bRCpdLeiRkK0JX/E38LaHUGP4kfKtjwW8tLQO231jLhO6rnjzmTYGCvW2NnKlINZh"+
-            "cCB/3NETFhXebfFUqfFlHsEwRXIMV4KlQNBDcedVzI8JWS1Cyjr1XIfo/zYInB6I/h4ETofA34IA9EcI"+
-            "oGECuhEv3od4K2ctFMQ4EwI/VgYw/0EI8AF+VgZ+QuC/BgGe5ra+P68M/HahoMwL61FJBY0+Mh2QttMI"+
-            "JiR4QJLf2TgJOkFCfIuJ1idw2vfLiJn0VFDJY2MfdIKxnb4XPDseUx48Rr3/FAQIhdRlZLnLs2/q8xMq"+
-            "WlnVkcFfDpPgzshXk2ZpZ/kytyR8rwy8ElTKzmh6ugv2c5ItUWD5lg7wg7kufK3rpS2J3JguW6KPKiac"+
-            "HHsd2cRPfYDLb947Lk7gZ+GC4eHSSZOSpyyjymYYGpldboruhWaJ+Zrv1pBYBZOeDTkx2e3QNJ3kGOWn"+
-            "CwNHE0dGW3XVEw22wnyV3ZWHgQtSW1l7Ie3DK+EJ4M1elgNLCROj6Kc9JiPkjwRTa5nZ+DeZIzvhNztc"+
-            "IdRh9Gahzn1WMyPAGD5jaeBIGikU2NJljiMZk0iTYQ9qthHvU+HSvpj7Gc5OkB0gnwqWS7wjF2mlx7qW"+
-            "ejVIA3zh/jI0yyWUkjiUk83Y+NpxU/P1tlAW8okwvMc8wVD/tkeZbPNX7Z5d6XrKE+5xlgU8v6UEuHpF"+
-            "f5MSMOX48rHxlS/uHh8qXt4b0/XNFyz2hQYvJN4p3ajgidFr4ZRfSPNEpSir9y9KDrYOVdO4CW7qdt/K"+
-            "+WYBiMi6TViJ81ZbTD33t0UCQOQiARRdLO2m/BbqGy+fo0caYztLvt5inEq5VDSzV+2TRLc0Vn9ne12i"+
-            "4lY8ar4nviaKEVyUl4u5tPzLIU0JNEfhE8lZUWw72xT81yoD4mVICkRB6fG/U6DsfynQeUIBLWX30o6a"+
-            "qfVQileiZT0plgOsMk1JVdN2CfnpkWQBVrsO532MLkWjW8bOkRKMN3JX12sVVynXye/ds7yIGShNwoNT"+
-            "Xq4rH9RlyfEo4WmYXEGsLK6pyocQ0sRtfp2yVpeJCKy30uPKz8NE3gkeTx5h6XziEObeJvWsj6opUHpX"+
-            "8xQ7myirkq/lAxH1K0x3m6MMPnT0z1rPCPVfsKmaXnpHCiG43wKLSH2fpttVq3G3Nl4LWyr/SHo+Lwvi"+
-            "p9IQmzVDjm0LdSLqeHM8ILiJRsdoNYS93WyEhi7IOdKXZLTCvCLifxTMEi+snNzAtfevk8DpkejvSeB0"+
-            "BPza/oPKABD5z4SARKQEELP1WQsFMc+QwP8ATkmhK404AAA=";
-
-        byte[] dgBytes = decompress(data);
-        List<Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes));
-        assertEquals(14, dgRecords.size());
-
-        short[] expectedSids = {
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                DrawingRecord.sid,
-                ObjRecord.sid,
-                ContinueRecord.sid,
-                ObjRecord.sid,
-                ContinueRecord.sid,
-                ObjRecord.sid,
-                ContinueRecord.sid,
-                ObjRecord.sid
-        };
-
-        for (int i = 0; i < expectedSids.length; i++) {
-            assertEquals("unexpected record.sid and index[" + i + "]", expectedSids[i], dgRecords.get(i).getSid());
-        }
-        DrawingManager2 drawingManager = new DrawingManager2(new EscherDggRecord());
-
-        // create a dummy sheet consisting of our test data
-        InternalSheet sheet = InternalSheet.createSheet();
-        List<RecordBase> records = sheet.getRecords();
-        records.clear();
-        records.addAll(dgRecords);
-        records.add(EOFRecord.instance);
-
-        sheet.aggregateDrawingRecords(drawingManager, false);
-        assertEquals("drawing was not fully aggregated", 2, records.size());
-        assertTrue("expected EscherAggregate", records.get(0) instanceof EscherAggregate);
-        assertTrue("expected EOFRecord", records.get(1) instanceof EOFRecord);
-
-        EscherAggregate agg = (EscherAggregate) records.get(0);
-
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data brefpore and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-    }
-
-
-    /**
-     * Decompress previously gziped/base64ed data
-     *
-     * @param data the gziped/base64ed data
-     * @return the raw bytes
-     * @throws IOException if you copy and pasted the data wrong
-     */
-    public static byte[] decompress(String data) throws IOException {
-        byte[] base64Bytes = DatatypeConverter.parseBase64Binary(data);
-        return IOUtils.toByteArray(new GZIPInputStream(new ByteArrayInputStream(base64Bytes)));
-    }
-    
-    /**
-     * Compress raw data for test runs - usually called while debugging :)
-     *
-     * @param data the raw data
-     * @return the gziped/base64ed data as String
-     * @throws IOException usually not ...
-     */
-    public static String compress(byte[] data) throws IOException {
-        java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
-        java.util.zip.GZIPOutputStream gz = new java.util.zip.GZIPOutputStream(bos);
-        gz.write(data);
-        gz.finish();
-        return DatatypeConverter.printBase64Binary(bos.toByteArray());        
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
deleted file mode 100644
index c150277..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-
-/**
- * @deprecated in POI 3.15-beta2, scheduled for removal in 3.17, use DrawingManager2 instead
- */
-@Deprecated
-public final class TestDrawingManager extends TestCase {
-    public void testFindFreeSPIDBlock() {
-        EscherDggRecord dgg = new EscherDggRecord();
-        DrawingManager dm = new DrawingManager( dgg );
-        dgg.setShapeIdMax( 1024 );
-        assertEquals( 2048, dm.findFreeSPIDBlock() );
-        dgg.setShapeIdMax( 1025 );
-        assertEquals( 2048, dm.findFreeSPIDBlock() );
-        dgg.setShapeIdMax( 2047 );
-        assertEquals( 2048, dm.findFreeSPIDBlock() );
-    }
-
-    public void testFindNewDrawingGroupId() {
-        EscherDggRecord dgg = new EscherDggRecord();
-        dgg.setDrawingsSaved( 1 );
-        dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{
-            new EscherDggRecord.FileIdCluster( 2, 10 )} );
-        DrawingManager dm = new DrawingManager( dgg );
-        assertEquals( 1, dm.findNewDrawingGroupId() );
-        dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{
-            new EscherDggRecord.FileIdCluster( 1, 10 ),
-            new EscherDggRecord.FileIdCluster( 2, 10 )} );
-        assertEquals( 3, dm.findNewDrawingGroupId() );
-    }
-
-    public void testDrawingGroupExists() {
-        EscherDggRecord dgg = new EscherDggRecord();
-        dgg.setDrawingsSaved( 1 );
-        dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{
-            new EscherDggRecord.FileIdCluster( 2, 10 )} );
-        DrawingManager dm = new DrawingManager( dgg );
-        assertFalse( dm.drawingGroupExists( (short) 1 ) );
-        assertTrue( dm.drawingGroupExists( (short) 2 ) );
-        assertFalse( dm.drawingGroupExists( (short) 3 ) );
-    }
-
-    public void testCreateDgRecord() {
-        EscherDggRecord dgg = new EscherDggRecord();
-        dgg.setDrawingsSaved( 0 );
-        dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{} );
-        DrawingManager dm = new DrawingManager( dgg );
-
-        EscherDgRecord dgRecord = dm.createDgRecord();
-        assertEquals( -1, dgRecord.getLastMSOSPID() );
-        assertEquals( 0, dgRecord.getNumShapes() );
-        assertEquals( 1, dm.getDgg().getDrawingsSaved() );
-        assertEquals( 1, dm.getDgg().getFileIdClusters().length );
-        assertEquals( 1, dm.getDgg().getFileIdClusters()[0].getDrawingGroupId() );
-        assertEquals( 0, dm.getDgg().getFileIdClusters()[0].getNumShapeIdsUsed() );
-    }
-
-    public void testAllocateShapeId() {
-        EscherDggRecord dgg = new EscherDggRecord();
-        dgg.setDrawingsSaved( 0 );
-        dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{} );
-        DrawingManager dm = new DrawingManager( dgg );
-
-        EscherDgRecord dg = dm.createDgRecord();
-        int shapeId = dm.allocateShapeId( dg.getDrawingGroupId() );
-        assertEquals( 1024, shapeId );
-        assertEquals( 1025, dgg.getShapeIdMax() );
-        assertEquals( 1, dgg.getDrawingsSaved() );
-        assertEquals( 1, dgg.getFileIdClusters()[0].getDrawingGroupId() );
-        assertEquals( 1, dgg.getFileIdClusters()[0].getNumShapeIdsUsed() );
-        assertEquals( 1024, dg.getLastMSOSPID() );
-        assertEquals( 1, dg.getNumShapes() );
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java
deleted file mode 100644
index 0a0b789..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherDgRecord;
-
-public final class TestDrawingManager2 extends TestCase {
-    private DrawingManager2 drawingManager2;
-    private EscherDggRecord dgg;
-
-    @Override
-    protected void setUp() {
-        dgg = new EscherDggRecord();
-        dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[0] );
-        drawingManager2 = new DrawingManager2( dgg );
-    }
-
-    public void testCreateDgRecord() {
-        EscherDgRecord dgRecord1 = drawingManager2.createDgRecord();
-        assertEquals( 1, dgRecord1.getDrawingGroupId() );
-        assertEquals( -1, dgRecord1.getLastMSOSPID() );
-
-        EscherDgRecord dgRecord2 = drawingManager2.createDgRecord();
-        assertEquals( 2, dgRecord2.getDrawingGroupId() );
-        assertEquals( -1, dgRecord2.getLastMSOSPID() );
-
-        assertEquals( 2, dgg.getDrawingsSaved( ) );
-        assertEquals( 2, dgg.getFileIdClusters().length );
-        assertEquals( 3, dgg.getNumIdClusters() );
-        assertEquals( 0, dgg.getNumShapesSaved() );
-    }
-
-    public void testAllocateShapeId() {
-        EscherDgRecord dgRecord1 = drawingManager2.createDgRecord();
-        EscherDgRecord dgRecord2 = drawingManager2.createDgRecord();
-
-        assertEquals( 1024, drawingManager2.allocateShapeId( (short)1 ) );
-        assertEquals( 1024, dgRecord1.getLastMSOSPID() );
-        assertEquals( 1025, dgg.getShapeIdMax() );
-        assertEquals( 1025, drawingManager2.allocateShapeId( (short)1 ) );
-        assertEquals( 1025, dgRecord1.getLastMSOSPID() );
-        assertEquals( 1026, dgg.getShapeIdMax() );
-        assertEquals( 1026, drawingManager2.allocateShapeId( (short)1 ) );
-        assertEquals( 1026, dgRecord1.getLastMSOSPID() );
-        assertEquals( 1027, dgg.getShapeIdMax() );
-        assertEquals( 2048, drawingManager2.allocateShapeId( (short)2 ) );
-        assertEquals( 2048, dgRecord2.getLastMSOSPID() );
-        assertEquals( 2049, dgg.getShapeIdMax() );
-
-        for (int i = 0; i < 1021; i++)
-        {
-            drawingManager2.allocateShapeId( (short)1 );
-            assertEquals( 2049, dgg.getShapeIdMax() );
-        }
-        assertEquals( 3072, drawingManager2.allocateShapeId( (short) 1 ) );
-        assertEquals( 3073, dgg.getShapeIdMax() );
-
-        assertEquals( 2, dgg.getDrawingsSaved() );
-        assertEquals( 4, dgg.getNumIdClusters() );
-        assertEquals( 1026, dgg.getNumShapesSaved() );
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
deleted file mode 100644
index 2c00cbf..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
+++ /dev/null
@@ -1,854 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.usermodel.HSSFAnchor;
-import org.apache.poi.hssf.usermodel.HSSFChildAnchor;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFComment;
-import org.apache.poi.hssf.usermodel.HSSFPatriarch;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
-import org.apache.poi.hssf.usermodel.HSSFPolygon;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFShape;
-import org.apache.poi.hssf.usermodel.HSSFShapeGroup;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFSimpleShape;
-import org.apache.poi.hssf.usermodel.HSSFTestHelper;
-import org.apache.poi.hssf.usermodel.HSSFTextbox;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.HexDump;
-import org.junit.Test;
-
-
-/**
- * Test escher drawing
- * 
- * optionally the system setting "poi.deserialize.escher" can be set to {@code true}
- */
-public class TestDrawingShapes {
-    /**
-     * HSSFShape tree bust be built correctly
-     * Check file with such records structure:
-     * -patriarch
-     * --shape
-     * --group
-     * ---group
-     * ----shape
-     * ----shape
-     * ---shape
-     * ---group
-     * ----shape
-     * ----shape
-     */
-    @Test
-    public void testDrawingGroups() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("groups");
-        HSSFPatriarch patriarch = sheet.getDrawingPatriarch();
-        assertEquals(patriarch.getChildren().size(), 2);
-        HSSFShapeGroup group = (HSSFShapeGroup) patriarch.getChildren().get(1);
-        assertEquals(3, group.getChildren().size());
-        HSSFShapeGroup group1 = (HSSFShapeGroup) group.getChildren().get(0);
-        assertEquals(2, group1.getChildren().size());
-        group1 = (HSSFShapeGroup) group.getChildren().get(2);
-        assertEquals(2, group1.getChildren().size());
-        wb.close();
-    }
-
-    @Test
-    public void testHSSFShapeCompatibility() {
-        HSSFSimpleShape shape = new HSSFSimpleShape(null, new HSSFClientAnchor());
-        shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-        assertEquals(0x08000040, shape.getLineStyleColor());
-        assertEquals(0x08000009, shape.getFillColor());
-        assertEquals(HSSFShape.LINEWIDTH_DEFAULT, shape.getLineWidth());
-        assertEquals(HSSFShape.LINESTYLE_SOLID, shape.getLineStyle());
-        assertFalse(shape.isNoFill());
-        
-        EscherOptRecord opt = shape.getOptRecord();
-
-        assertEquals(7, opt.getEscherProperties().size());
-        assertTrue(((EscherBoolProperty) opt.lookup(EscherProperties.GROUPSHAPE__PRINT)).isTrue());
-        assertTrue(((EscherBoolProperty) opt.lookup(EscherProperties.LINESTYLE__NOLINEDRAWDASH)).isTrue());
-        assertEquals(0x00000004, ((EscherSimpleProperty) opt.lookup(EscherProperties.GEOMETRY__SHAPEPATH)).getPropertyValue());
-        assertNull(opt.lookup(EscherProperties.TEXT__SIZE_TEXT_TO_FIT_SHAPE));
-    }
-
-    @Test
-    public void testDefaultPictureSettings() {
-        HSSFPicture picture = new HSSFPicture(null, new HSSFClientAnchor());
-        assertEquals(picture.getLineWidth(), HSSFShape.LINEWIDTH_DEFAULT);
-        assertEquals(picture.getFillColor(), HSSFShape.FILL__FILLCOLOR_DEFAULT);
-        assertEquals(picture.getLineStyle(), HSSFShape.LINESTYLE_NONE);
-        assertEquals(picture.getLineStyleColor(), HSSFShape.LINESTYLE__COLOR_DEFAULT);
-        assertFalse(picture.isNoFill());
-        assertEquals(picture.getPictureIndex(), -1);//not set yet
-    }
-
-    /**
-     * No NullPointerException should appear
-     */
-    @Test
-    public void testDefaultSettingsWithEmptyContainer() {
-        EscherContainerRecord container = new EscherContainerRecord();
-        EscherOptRecord opt = new EscherOptRecord();
-        opt.setRecordId(EscherOptRecord.RECORD_ID);
-        container.addChildRecord(opt);
-        ObjRecord obj = new ObjRecord();
-        CommonObjectDataSubRecord cod = new CommonObjectDataSubRecord();
-        cod.setObjectType(HSSFSimpleShape.OBJECT_TYPE_PICTURE);
-        obj.addSubRecord(cod);
-        HSSFPicture picture = new HSSFPicture(container, obj);
-
-        assertEquals(picture.getLineWidth(), HSSFShape.LINEWIDTH_DEFAULT);
-        assertEquals(picture.getFillColor(), HSSFShape.FILL__FILLCOLOR_DEFAULT);
-        assertEquals(picture.getLineStyle(), HSSFShape.LINESTYLE_DEFAULT);
-        assertEquals(picture.getLineStyleColor(), HSSFShape.LINESTYLE__COLOR_DEFAULT);
-        assertEquals(picture.isNoFill(), HSSFShape.NO_FILL_DEFAULT);
-        assertEquals(picture.getPictureIndex(), -1);//not set yet
-    }
-
-    /**
-     * create a rectangle, save the workbook, read back and verify that all shape properties are there
-     */
-    @Test
-    public void testReadWriteRectangle() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-
-        HSSFPatriarch drawing = sheet.createDrawingPatriarch();
-        HSSFClientAnchor anchor = new HSSFClientAnchor(10, 10, 50, 50, (short) 2, 2, (short) 4, 4);
-        anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE);
-        assertEquals(AnchorType.MOVE_DONT_RESIZE, anchor.getAnchorType());
-        //noinspection deprecation
-        anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE.value);
-        assertEquals(AnchorType.MOVE_DONT_RESIZE, anchor.getAnchorType());
-
-        HSSFSimpleShape rectangle = drawing.createSimpleShape(anchor);
-        rectangle.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-        rectangle.setLineWidth(10000);
-        rectangle.setFillColor(777);
-        assertEquals(rectangle.getFillColor(), 777);
-        assertEquals(10000, rectangle.getLineWidth());
-        rectangle.setLineStyle(10);
-        assertEquals(10, rectangle.getLineStyle());
-        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_SQUARE);
-        rectangle.setLineStyleColor(1111);
-        rectangle.setNoFill(true);
-        rectangle.setWrapText(HSSFSimpleShape.WRAP_NONE);
-        rectangle.setString(new HSSFRichTextString("teeeest"));
-        assertEquals(rectangle.getLineStyleColor(), 1111);
-        EscherContainerRecord escherContainer = HSSFTestHelper.getEscherContainer(rectangle);
-        assertNotNull(escherContainer);
-        EscherRecord childById = escherContainer.getChildById(EscherOptRecord.RECORD_ID);
-        assertNotNull(childById);
-        EscherProperty lookup = ((EscherOptRecord) childById).lookup(EscherProperties.TEXT__TEXTID);
-        assertNotNull(lookup);
-        assertEquals(((EscherSimpleProperty) lookup).getPropertyValue(), "teeeest".hashCode());
-        assertEquals(rectangle.isNoFill(), true);
-        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_NONE);
-        assertEquals(rectangle.getString().getString(), "teeeest");
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-
-        HSSFSimpleShape rectangle2 =
-                (HSSFSimpleShape) drawing.getChildren().get(0);
-        assertEquals(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE,
-                rectangle2.getShapeType());
-        assertEquals(10000, rectangle2.getLineWidth());
-        assertEquals(10, rectangle2.getLineStyle());
-        assertEquals(anchor, rectangle2.getAnchor());
-        assertEquals(rectangle2.getLineStyleColor(), 1111);
-        assertEquals(rectangle2.getFillColor(), 777);
-        assertEquals(rectangle2.isNoFill(), true);
-        assertEquals(rectangle2.getString().getString(), "teeeest");
-        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_NONE);
-
-        rectangle2.setFillColor(3333);
-        rectangle2.setLineStyle(9);
-        rectangle2.setLineStyleColor(4444);
-        rectangle2.setNoFill(false);
-        rectangle2.setLineWidth(77);
-        rectangle2.getAnchor().setDx1(2);
-        rectangle2.getAnchor().setDx2(3);
-        rectangle2.getAnchor().setDy1(4);
-        rectangle2.getAnchor().setDy2(5);
-        rectangle.setWrapText(HSSFSimpleShape.WRAP_BY_POINTS);
-        rectangle2.setString(new HSSFRichTextString("test22"));
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sheet = wb3.getSheetAt(0);
-        drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-        rectangle2 = (HSSFSimpleShape) drawing.getChildren().get(0);
-        assertEquals(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE, rectangle2.getShapeType());
-        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_BY_POINTS);
-        assertEquals(77, rectangle2.getLineWidth());
-        assertEquals(9, rectangle2.getLineStyle());
-        assertEquals(rectangle2.getLineStyleColor(), 4444);
-        assertEquals(rectangle2.getFillColor(), 3333);
-        assertEquals(rectangle2.getAnchor().getDx1(), 2);
-        assertEquals(rectangle2.getAnchor().getDx2(), 3);
-        assertEquals(rectangle2.getAnchor().getDy1(), 4);
-        assertEquals(rectangle2.getAnchor().getDy2(), 5);
-        assertEquals(rectangle2.isNoFill(), false);
-        assertEquals(rectangle2.getString().getString(), "test22");
-
-        HSSFSimpleShape rect3 = drawing.createSimpleShape(new HSSFClientAnchor());
-        rect3.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-
-        drawing = wb4.getSheetAt(0).getDrawingPatriarch();
-        assertEquals(drawing.getChildren().size(), 2);
-        wb4.close();
-    }
-
-    @Test
-    public void testReadExistingImage() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("pictures");
-        HSSFPatriarch drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-        HSSFPicture picture = (HSSFPicture) drawing.getChildren().get(0);
-
-        assertEquals(picture.getPictureIndex(), 2);
-        assertEquals(picture.getLineStyleColor(), HSSFShape.LINESTYLE__COLOR_DEFAULT);
-        assertEquals(picture.getFillColor(), 0x5DC943);
-        assertEquals(picture.getLineWidth(), HSSFShape.LINEWIDTH_DEFAULT);
-        assertEquals(picture.getLineStyle(), HSSFShape.LINESTYLE_DEFAULT);
-        assertEquals(picture.isNoFill(), false);
-
-        picture.setPictureIndex(2);
-        assertEquals(picture.getPictureIndex(), 2);
-        wb.close();
-    }
-
-
-    /* assert shape properties when reading shapes from a existing workbook */
-    @Test
-    public void testReadExistingRectangle() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("rectangles");
-        HSSFPatriarch drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-
-        HSSFSimpleShape shape = (HSSFSimpleShape) drawing.getChildren().get(0);
-        assertEquals(shape.isNoFill(), false);
-        assertEquals(shape.getLineStyle(), HSSFShape.LINESTYLE_DASHDOTGEL);
-        assertEquals(shape.getLineStyleColor(), 0x616161);
-        assertEquals(HexDump.toHex(shape.getFillColor()), shape.getFillColor(), 0x2CE03D);
-        assertEquals(shape.getLineWidth(), HSSFShape.LINEWIDTH_ONE_PT * 2);
-        assertEquals(shape.getString().getString(), "POItest");
-        assertEquals(shape.getRotationDegree(), 27);
-        wb.close();
-    }
-
-    @Test
-    public void testShapeIds() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb1.createSheet();
-        HSSFPatriarch patriarch1 = sheet1.createDrawingPatriarch();
-        for (int i = 0; i < 2; i++) {
-            patriarch1.createSimpleShape(new HSSFClientAnchor());
-        }
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet1 = wb2.getSheetAt(0);
-        patriarch1 = sheet1.getDrawingPatriarch();
-
-        EscherAggregate agg1 = HSSFTestHelper.getEscherAggregate(patriarch1);
-        // last shape ID cached in EscherDgRecord
-        EscherDgRecord dg1 =
-                agg1.getEscherContainer().getChildById(EscherDgRecord.RECORD_ID);
-        assertEquals(1026, dg1.getLastMSOSPID());
-
-        // iterate over shapes and check shapeId
-        EscherContainerRecord spgrContainer =
-                agg1.getEscherContainer().getChildContainers().get(0);
-        // root spContainer + 2 spContainers for shapes
-        assertEquals(3, spgrContainer.getChildRecords().size());
-
-        EscherSpRecord sp0 =
-                ((EscherContainerRecord) spgrContainer.getChild(0)).getChildById(EscherSpRecord.RECORD_ID);
-        assertEquals(1024, sp0.getShapeId());
-
-        EscherSpRecord sp1 =
-                ((EscherContainerRecord) spgrContainer.getChild(1)).getChildById(EscherSpRecord.RECORD_ID);
-        assertEquals(1025, sp1.getShapeId());
-
-        EscherSpRecord sp2 =
-                ((EscherContainerRecord) spgrContainer.getChild(2)).getChildById(EscherSpRecord.RECORD_ID);
-        assertEquals(1026, sp2.getShapeId());
-        wb2.close();
-    }
-
-    /**
-     * Test get new id for shapes from existing file
-     * File already have for 1 shape on each sheet, because document must contain EscherDgRecord for each sheet
-     */
-    @Test
-    public void testAllocateNewIds() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("empty.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFPatriarch patriarch = sheet.getDrawingPatriarch();
-
-        /**
-         * 2048 - main SpContainer id
-         * 2049 - existing shape id
-         */
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 2050);
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 2051);
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 2052);
-
-        sheet = wb.getSheetAt(1);
-        patriarch = sheet.getDrawingPatriarch();
-
-        /**
-         * 3072 - main SpContainer id
-         * 3073 - existing shape id
-         */
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 3074);
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 3075);
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 3076);
-
-
-        sheet = wb.getSheetAt(2);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 1026);
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 1027);
-        assertEquals(HSSFTestHelper.allocateNewShapeId(patriarch), 1028);
-        wb.close();
-    }
-
-    @Test
-    public void testOpt() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        // create a sheet with a text box
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
-        EscherOptRecord opt1 = HSSFTestHelper.getOptRecord(textbox);
-        EscherOptRecord opt2 = HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID);
-        assertSame(opt1, opt2);
-        wb.close();
-    }
-    
-    @Test
-    public void testCorrectOrderInOptRecord() throws IOException{
-        HSSFWorkbook wb = new HSSFWorkbook();
-        
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
-        EscherOptRecord opt = HSSFTestHelper.getOptRecord(textbox);
-        
-        String opt1Str = opt.toXml();
-
-        textbox.setFillColor(textbox.getFillColor());
-        EscherContainerRecord container = HSSFTestHelper.getEscherContainer(textbox);
-        EscherOptRecord optRecord = container.getChildById(EscherOptRecord.RECORD_ID);
-        assertEquals(opt1Str, optRecord.toXml());
-        textbox.setLineStyle(textbox.getLineStyle());
-        assertEquals(opt1Str, optRecord.toXml());
-        textbox.setLineWidth(textbox.getLineWidth());
-        assertEquals(opt1Str, optRecord.toXml());
-        textbox.setLineStyleColor(textbox.getLineStyleColor());
-        assertEquals(opt1Str, optRecord.toXml());
-        wb.close();
-    }
-
-    @Test
-    public void testDgRecordNumShapes() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        EscherAggregate aggregate = HSSFTestHelper.getEscherAggregate(patriarch);
-        EscherDgRecord dgRecord = (EscherDgRecord) aggregate.getEscherRecord(0).getChild(0);
-        assertEquals(dgRecord.getNumShapes(), 1);
-        wb.close();
-    }
-
-    @Test
-    public void testTextForSimpleShape() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFSimpleShape shape = patriarch.createSimpleShape(new HSSFClientAnchor());
-        shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-
-        EscherAggregate agg = HSSFTestHelper.getEscherAggregate(patriarch);
-        assertEquals(agg.getShapeToObjMapping().size(), 2);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        shape = (HSSFSimpleShape) patriarch.getChildren().get(0);
-
-        agg = HSSFTestHelper.getEscherAggregate(patriarch);
-        assertEquals(agg.getShapeToObjMapping().size(), 2);
-
-        shape.setString(new HSSFRichTextString("string1"));
-        assertEquals(shape.getString().getString(), "string1");
-
-        assertNotNull(HSSFTestHelper.getEscherContainer(shape).getChildById(EscherTextboxRecord.RECORD_ID));
-        assertEquals(agg.getShapeToObjMapping().size(), 2);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-        sheet = wb4.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        shape = (HSSFSimpleShape) patriarch.getChildren().get(0);
-
-        assertNotNull(HSSFTestHelper.getTextObjRecord(shape));
-        assertEquals(shape.getString().getString(), "string1");
-        assertNotNull(HSSFTestHelper.getEscherContainer(shape).getChildById(EscherTextboxRecord.RECORD_ID));
-        assertEquals(agg.getShapeToObjMapping().size(), 2);
-        wb4.close();
-    }
-
-    @Test
-    public void testRemoveShapes() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFSimpleShape rectangle = patriarch.createSimpleShape(new HSSFClientAnchor());
-        rectangle.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-
-        int idx = wb1.addPicture(new byte[]{1,2,3}, Workbook.PICTURE_TYPE_JPEG);
-        patriarch.createPicture(new HSSFClientAnchor(), idx);
-
-        patriarch.createCellComment(new HSSFClientAnchor());
-
-        HSSFPolygon polygon = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon.setPoints(new int[]{1,2}, new int[]{2,3});
-
-        patriarch.createTextbox(new HSSFClientAnchor());
-
-        HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
-        group.createTextbox(new HSSFChildAnchor());
-        group.createPicture(new HSSFChildAnchor(), idx);
-
-        assertEquals(patriarch.getChildren().size(), 6);
-        assertEquals(group.getChildren().size(), 2);
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 12);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 12);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-
-        assertEquals(patriarch.getChildren().size(), 6);
-
-        group = (HSSFShapeGroup) patriarch.getChildren().get(5);
-        group.removeShape(group.getChildren().get(0));
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 10);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sheet = wb3.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 10);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-
-        group = (HSSFShapeGroup) patriarch.getChildren().get(5);
-        patriarch.removeShape(group);
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 8);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-        sheet = wb4.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 8);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-        assertEquals(patriarch.getChildren().size(), 5);
-
-        HSSFShape shape = patriarch.getChildren().get(0);
-        patriarch.removeShape(shape);
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 6);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-        assertEquals(patriarch.getChildren().size(), 4);
-
-        HSSFWorkbook wb5 = HSSFTestDataSamples.writeOutAndReadBack(wb4);
-        wb4.close();
-        sheet = wb5.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 6);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-        assertEquals(patriarch.getChildren().size(), 4);
-
-        HSSFPicture picture = (HSSFPicture) patriarch.getChildren().get(0);
-        patriarch.removeShape(picture);
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 5);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-        assertEquals(patriarch.getChildren().size(), 3);
-
-        HSSFWorkbook wb6 = HSSFTestDataSamples.writeOutAndReadBack(wb5);
-        wb5.close();
-        sheet = wb6.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 5);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 1);
-        assertEquals(patriarch.getChildren().size(), 3);
-
-        HSSFComment comment = (HSSFComment) patriarch.getChildren().get(0);
-        patriarch.removeShape(comment);
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 3);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 2);
-
-        HSSFWorkbook wb7 = HSSFTestDataSamples.writeOutAndReadBack(wb6);
-        wb6.close();
-        sheet = wb7.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 3);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 2);
-
-        polygon = (HSSFPolygon) patriarch.getChildren().get(0);
-        patriarch.removeShape(polygon);
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 2);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 1);
-
-        HSSFWorkbook wb8 = HSSFTestDataSamples.writeOutAndReadBack(wb7);
-        wb7.close();
-        sheet = wb8.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 2);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 1);
-
-        HSSFTextbox textbox = (HSSFTextbox) patriarch.getChildren().get(0);
-        patriarch.removeShape(textbox);
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 0);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 0);
-
-        HSSFWorkbook wb9 = HSSFTestDataSamples.writeOutAndReadBack(wb8);
-        wb8.close();
-        sheet = wb9.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getShapeToObjMapping().size(), 0);
-        assertEquals(HSSFTestHelper.getEscherAggregate(patriarch).getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 0);
-        wb9.close();
-    }
-
-    @Test
-    public void testShapeFlip() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFSimpleShape rectangle = patriarch.createSimpleShape(new HSSFClientAnchor());
-        rectangle.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-
-        assertEquals(rectangle.isFlipVertical(), false);
-        assertEquals(rectangle.isFlipHorizontal(), false);
-
-        rectangle.setFlipVertical(true);
-        assertEquals(rectangle.isFlipVertical(), true);
-        rectangle.setFlipHorizontal(true);
-        assertEquals(rectangle.isFlipHorizontal(), true);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        rectangle = (HSSFSimpleShape) patriarch.getChildren().get(0);
-
-        assertEquals(rectangle.isFlipHorizontal(), true);
-        rectangle.setFlipHorizontal(false);
-        assertEquals(rectangle.isFlipHorizontal(), false);
-
-        assertEquals(rectangle.isFlipVertical(), true);
-        rectangle.setFlipVertical(false);
-        assertEquals(rectangle.isFlipVertical(), false);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sheet = wb3.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        rectangle = (HSSFSimpleShape) patriarch.getChildren().get(0);
-
-        assertEquals(rectangle.isFlipVertical(), false);
-        assertEquals(rectangle.isFlipHorizontal(), false);
-        wb3.close();
-    }
-
-    @Test
-    public void testRotation() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFSimpleShape rectangle = patriarch.createSimpleShape(new HSSFClientAnchor(0,0,100,100, (short) 0,0,(short)5,5));
-        rectangle.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-
-        assertEquals(rectangle.getRotationDegree(), 0);
-        rectangle.setRotationDegree((short) 45);
-        assertEquals(rectangle.getRotationDegree(), 45);
-        rectangle.setFlipHorizontal(true);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-        rectangle = (HSSFSimpleShape) patriarch.getChildren().get(0);
-        assertEquals(rectangle.getRotationDegree(), 45);
-        rectangle.setRotationDegree((short) 30);
-        assertEquals(rectangle.getRotationDegree(), 30);
-
-        patriarch.setCoordinates(0, 0, 10, 10);
-        rectangle.setString(new HSSFRichTextString("1234"));
-        wb2.close();
-    }
-
-    @SuppressWarnings("unused")
-    @Test
-    public void testShapeContainerImplementsIterable() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        patriarch.createSimpleShape(new HSSFClientAnchor());
-        patriarch.createSimpleShape(new HSSFClientAnchor());
-
-        int i=2;
-
-        for (HSSFShape shape: patriarch){
-            i--;
-        }
-        assertEquals(i, 0);
-        wb.close();
-    }
-
-    @Test
-    public void testClearShapesForPatriarch() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        patriarch.createSimpleShape(new HSSFClientAnchor());
-        patriarch.createSimpleShape(new HSSFClientAnchor());
-        patriarch.createCellComment(new HSSFClientAnchor());
-
-        EscherAggregate agg = HSSFTestHelper.getEscherAggregate(patriarch);
-
-        assertEquals(agg.getShapeToObjMapping().size(), 6);
-        assertEquals(agg.getTailRecords().size(), 1);
-        assertEquals(patriarch.getChildren().size(), 3);
-
-        patriarch.clear();
-
-        assertEquals(agg.getShapeToObjMapping().size(), 0);
-        assertEquals(agg.getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 0);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        assertEquals(agg.getShapeToObjMapping().size(), 0);
-        assertEquals(agg.getTailRecords().size(), 0);
-        assertEquals(patriarch.getChildren().size(), 0);
-        wb2.close();
-    }
-    
-    @Test
-    public void testBug45312() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        try {
-            HSSFSheet sheet = wb.createSheet();
-            HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-    
-            {
-                HSSFClientAnchor a1 = new HSSFClientAnchor();
-                a1.setAnchor( (short)1, 1, 0, 0, (short) 1, 1, 512, 100);
-                HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-                shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-            }
-            {
-                HSSFClientAnchor a1 = new HSSFClientAnchor();
-                a1.setAnchor( (short)1, 1, 512, 0, (short) 1, 1, 1024, 100);
-                HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-                shape1.setFlipVertical(true);
-                shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-            }
-
-            {
-                HSSFClientAnchor a1 = new HSSFClientAnchor();
-                a1.setAnchor( (short)2, 2, 0, 0, (short) 2, 2, 512, 100);
-                HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-                shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-            }
-            {
-                HSSFClientAnchor a1 = new HSSFClientAnchor();
-                a1.setAnchor( (short)2, 2, 0, 100, (short) 2, 2, 512, 200);
-                HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
-                shape1.setFlipHorizontal(true);
-                shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-            }
-            
-            /*OutputStream stream = new FileOutputStream("/tmp/45312.xls");
-            try {
-                wb.write(stream);
-            } finally {
-                stream.close();
-            }*/
-            
-            checkWorkbookBack(wb);
-        } finally {
-            wb.close();
-        }
-    }
-
-    private void checkWorkbookBack(HSSFWorkbook wb) throws IOException {
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertNotNull(wbBack);
-        
-        HSSFSheet sheetBack = wbBack.getSheetAt(0);
-        assertNotNull(sheetBack);
-        
-        HSSFPatriarch patriarchBack = sheetBack.getDrawingPatriarch();
-        assertNotNull(patriarchBack);
-        
-        List<HSSFShape> children = patriarchBack.getChildren();
-        assertEquals(4, children.size());
-        HSSFShape hssfShape = children.get(0);
-        assertTrue(hssfShape instanceof HSSFSimpleShape);
-        HSSFAnchor anchor = hssfShape.getAnchor();
-        assertTrue(anchor instanceof HSSFClientAnchor);
-        assertEquals(0, anchor.getDx1());
-        assertEquals(512, anchor.getDx2());
-        assertEquals(0, anchor.getDy1());
-        assertEquals(100, anchor.getDy2());
-        HSSFClientAnchor cAnchor = (HSSFClientAnchor) anchor;
-        assertEquals(1, cAnchor.getCol1());
-        assertEquals(1, cAnchor.getCol2());
-        assertEquals(1, cAnchor.getRow1());
-        assertEquals(1, cAnchor.getRow2());
-
-        hssfShape = children.get(1);
-        assertTrue(hssfShape instanceof HSSFSimpleShape);
-        anchor = hssfShape.getAnchor();
-        assertTrue(anchor instanceof HSSFClientAnchor);
-        assertEquals(512, anchor.getDx1());
-        assertEquals(1024, anchor.getDx2());
-        assertEquals(0, anchor.getDy1());
-        assertEquals(100, anchor.getDy2());
-        cAnchor = (HSSFClientAnchor) anchor;
-        assertEquals(1, cAnchor.getCol1());
-        assertEquals(1, cAnchor.getCol2());
-        assertEquals(1, cAnchor.getRow1());
-        assertEquals(1, cAnchor.getRow2());
-
-        hssfShape = children.get(2);
-        assertTrue(hssfShape instanceof HSSFSimpleShape);
-        anchor = hssfShape.getAnchor();
-        assertTrue(anchor instanceof HSSFClientAnchor);
-        assertEquals(0, anchor.getDx1());
-        assertEquals(512, anchor.getDx2());
-        assertEquals(0, anchor.getDy1());
-        assertEquals(100, anchor.getDy2());
-        cAnchor = (HSSFClientAnchor) anchor;
-        assertEquals(2, cAnchor.getCol1());
-        assertEquals(2, cAnchor.getCol2());
-        assertEquals(2, cAnchor.getRow1());
-        assertEquals(2, cAnchor.getRow2());
-
-        hssfShape = children.get(3);
-        assertTrue(hssfShape instanceof HSSFSimpleShape);
-        anchor = hssfShape.getAnchor();
-        assertTrue(anchor instanceof HSSFClientAnchor);
-        assertEquals(0, anchor.getDx1());
-        assertEquals(512, anchor.getDx2());
-        assertEquals(100, anchor.getDy1());
-        assertEquals(200, anchor.getDy2());
-        cAnchor = (HSSFClientAnchor) anchor;
-        assertEquals(2, cAnchor.getCol1());
-        assertEquals(2, cAnchor.getCol2());
-        assertEquals(2, cAnchor.getRow1());
-        assertEquals(2, cAnchor.getRow2());
-        
-        wbBack.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
deleted file mode 100644
index 4ff7c44..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFTestHelper;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-/**
- * @author Evgeniy Berlog
- * @date 18.06.12
- */
-public class TestEscherRecordFactory extends TestCase{
-
-    private static byte[] toByteArray(List<RecordBase> records) {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        for (RecordBase rb : records) {
-            Record r = (Record) rb;
-            try {
-                out.write(r.serialize());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return out.toByteArray();
-    }
-
-    public void testDetectContainer() {
-        Random rnd = new Random();
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DG_CONTAINER));
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SOLVER_CONTAINER));
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SP_CONTAINER));
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DGG_CONTAINER));
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.BSTORE_CONTAINER));
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SPGR_CONTAINER));
-
-        for (Short i=EscherContainerRecord.DGG_CONTAINER; i<= EscherContainerRecord.SOLVER_CONTAINER; i++){
-            assertEquals(true, DefaultEscherRecordFactory.isContainer(Integer.valueOf(rnd.nextInt(Short.MAX_VALUE)).shortValue(), i));
-        }
-
-        assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
-        assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.SOLVER_CONTAINER+1).shortValue()));
-
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x000F, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
-        assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0xFFFF, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
-        assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x000C, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
-        assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0xCCCC, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
-        assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x000F, EscherTextboxRecord.RECORD_ID));
-        assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0xCCCC, EscherTextboxRecord.RECORD_ID));
-    }
-
-    public void testDgContainerMustBeRootOfHSSFSheetEscherRecords() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("47251.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
-        List<RecordBase> records = ish.getRecords();
-        // records to be aggregated
-        List<RecordBase> dgRecords = records.subList(19, 23);
-        byte[] dgBytes = toByteArray(dgRecords);
-        sh.getDrawingPatriarch();
-        EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
-        assertEquals(true, agg.getEscherRecords().get(0) instanceof EscherContainerRecord);
-        assertEquals(EscherContainerRecord.DG_CONTAINER, agg.getEscherRecords().get(0).getRecordId());
-        assertEquals((short) 0x0, agg.getEscherRecords().get(0).getOptions());
-        agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
-        byte[] dgBytesAfterSave = agg.serialize();
-        assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
-        assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
deleted file mode 100644
index 82153fe..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
+++ /dev/null
@@ -1,1627 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.Locale;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.usermodel.FormulaExtractor;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFName;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.TestHSSFName;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.constant.ErrorConstant;
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.AddPtg;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtgBase;
-import org.apache.poi.ss.formula.ptg.ArrayPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.BoolPtg;
-import org.apache.poi.ss.formula.ptg.ConcatPtg;
-import org.apache.poi.ss.formula.ptg.DividePtg;
-import org.apache.poi.ss.formula.ptg.EqualPtg;
-import org.apache.poi.ss.formula.ptg.ErrPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.GreaterThanPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.IntersectionPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.MissingArgPtg;
-import org.apache.poi.ss.formula.ptg.MultiplyPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.NumberPtg;
-import org.apache.poi.ss.formula.ptg.ParenthesisPtg;
-import org.apache.poi.ss.formula.ptg.PercentPtg;
-import org.apache.poi.ss.formula.ptg.PowerPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RangePtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.apache.poi.ss.formula.ptg.SubtractPtg;
-import org.apache.poi.ss.formula.ptg.UnaryMinusPtg;
-import org.apache.poi.ss.formula.ptg.UnaryPlusPtg;
-import org.apache.poi.ss.formula.ptg.UnionPtg;
-import org.apache.poi.ss.usermodel.BaseTestBugzillaIssues;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.junit.Test;
-
-/**
- * Test the low level formula parser functionality. High level tests are to
- * be done via usermodel/HSSFCell.setFormulaValue().
- */
-public final class TestFormulaParser {
-
-    /**
-     * @return parsed token array already confirmed not <code>null</code>
-     */
-    /* package */ static Ptg[] parseFormula(String formula) {
-        Ptg[] result = HSSFFormulaParser.parse(formula, (HSSFWorkbook)null);
-        assertNotNull("Ptg array should not be null", result);
-        return result;
-    }
-    private static String toFormulaString(Ptg[] ptgs) {
-        return HSSFFormulaParser.toFormulaString((HSSFWorkbook)null, ptgs);
-    }
-
-    @Test
-    public void testSimpleFormula() {
-        confirmTokenClasses("2+2",IntPtg.class, IntPtg.class, AddPtg.class);
-    }
-
-    @Test
-    public void testFormulaWithSpace1() {
-        confirmTokenClasses(" 2 + 2 ",IntPtg.class, IntPtg.class, AddPtg.class);
-    }
-
-    @Test
-    public void testFormulaWithSpace2() {
-        Ptg[] ptgs = parseFormula("2+ sum( 3 , 4) ");
-        assertEquals(5, ptgs.length);
-    }
-
-    @Test
-    public void testFormulaWithSpaceNRef() {
-        Ptg[] ptgs = parseFormula("sum( A2:A3 )");
-        assertEquals(2, ptgs.length);
-    }
-
-    @Test
-    public void testFormulaWithString() {
-        Ptg[] ptgs = parseFormula("\"hello\" & \"world\" ");
-        assertEquals(3, ptgs.length);
-    }
-
-    @Test
-    public void testTRUE() {
-        Ptg[] ptgs = parseFormula("TRUE");
-        assertEquals(1, ptgs.length);
-        BoolPtg flag  = (BoolPtg) ptgs[0];
-        assertEquals(true, flag.getValue());
-    }
-
-    @Test
-    public void testSumIf() {
-        Ptg[] ptgs = parseFormula("SUMIF(A1:A5,\">4000\",B1:B5)");
-        assertEquals(4, ptgs.length);
-    }
-
-    /**
-     * Bug Reported by xt-jens.riis@nokia.com (Jens Riis)
-     * Refers to Bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17582">#17582</a>
-     *
-     */
-    @Test
-    public void testNonAlphaFormula() {
-        Ptg[] ptgs = parseFormula("\"TOTAL[\"&F3&\"]\"");
-        confirmTokenClasses(ptgs, StringPtg.class, RefPtg.class, ConcatPtg.class, StringPtg.class, ConcatPtg.class);
-        assertEquals("TOTAL[", ((StringPtg)ptgs[0]).getValue());
-    }
-
-    @Test
-    public void testMacroFunction() throws IOException {
-        // testNames.xls contains a VB function called 'myFunc'
-        final String testFile = "testNames.xls";
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(testFile);
-        try {
-            HSSFEvaluationWorkbook book = HSSFEvaluationWorkbook.create(wb);
-
-            //Expected ptg stack: [NamePtg(myFunc), StringPtg(arg), (additional operands go here...), FunctionPtg(myFunc)]
-            Ptg[] ptg = FormulaParser.parse("myFunc(\"arg\")", book, FormulaType.CELL, -1);
-            assertEquals(3, ptg.length); 
-
-            // the name gets encoded as the first operand on the stack
-            NamePtg tname = (NamePtg) ptg[0];
-            assertEquals("myFunc", tname.toFormulaString(book));
-
-            // the function's arguments are pushed onto the stack from left-to-right as OperandPtgs
-            StringPtg arg = (StringPtg) ptg[1];
-            assertEquals("arg", arg.getValue());
-
-            // The external FunctionPtg is the last Ptg added to the stack
-            // During formula evaluation, this Ptg pops off the the appropriate number of
-            // arguments (getNumberOfOperands()) and pushes the result on the stack
-            AbstractFunctionPtg tfunc = (AbstractFunctionPtg) ptg[2]; //FuncVarPtg
-            assertTrue(tfunc.isExternalFunction());
-
-            // confirm formula parsing is case-insensitive
-            FormulaParser.parse("mYfUnC(\"arg\")", book, FormulaType.CELL, -1);
-
-            // confirm formula parsing doesn't care about argument count or type
-            // this should only throw an error when evaluating the formula.
-            FormulaParser.parse("myFunc()", book, FormulaType.CELL, -1);
-            FormulaParser.parse("myFunc(\"arg\", 0, TRUE)", book, FormulaType.CELL, -1);
-
-            // A completely unknown formula name (not saved in workbook) should still be parseable and renderable
-            // but will throw an NotImplementedFunctionException or return a #NAME? error value if evaluated.
-            FormulaParser.parse("yourFunc(\"arg\")", book, FormulaType.CELL, -1);
-
-            // Verify that myFunc and yourFunc were successfully added to Workbook names
-            HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb);
-            try {
-                // HSSFWorkbook/EXCEL97-specific side-effects user-defined function names must be added to Workbook's defined names in order to be saved.
-                assertNotNull(wb2.getName("myFunc"));
-                assertEqualsIgnoreCase("myFunc", wb2.getName("myFunc").getNameName());
-                assertNotNull(wb2.getName("yourFunc"));
-                assertEqualsIgnoreCase("yourFunc", wb2.getName("yourFunc").getNameName());
-
-                // Manually check to make sure file isn't corrupted
-                // TODO: develop a process for occasionally manually reviewing workbooks
-                // to verify workbooks are not corrupted
-                /*
-                final File fileIn = HSSFTestDataSamples.getSampleFile(testFile);
-                final File reSavedFile = new File(fileIn.getParentFile(), fileIn.getName().replace(".xls", "-saved.xls"));
-                FileOutputStream fos = new FileOutputStream(reSavedFile);
-                wb2.write(fos);
-                fos.close();
-                */
-            } finally {
-                wb2.close();
-            }
-        } finally {
-            wb.close();
-        }
-    }
-    
-    private final static void assertEqualsIgnoreCase(String expected, String actual) {
-        assertEquals(expected.toLowerCase(Locale.ROOT), actual.toLowerCase(Locale.ROOT));
-    }
-
-    @Test
-    public void testEmbeddedSlash() {
-        confirmTokenClasses("HYPERLINK(\"http://www.jakarta.org\",\"Jakarta\")",
-                        StringPtg.class, StringPtg.class, FuncVarPtg.class);
-    }
-
-    @Test
-    public void testConcatenate() {
-        confirmTokenClasses("CONCATENATE(\"first\",\"second\")",
-                StringPtg.class, StringPtg.class, FuncVarPtg.class);
-    }
-
-    @Test
-    public void testWorksheetReferences() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        wb.createSheet("NoQuotesNeeded");
-        wb.createSheet("Quotes Needed Here &#$@");
-
-        HSSFSheet sheet = wb.createSheet("Test");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell;
-
-        cell = row.createCell(0);
-        cell.setCellFormula("NoQuotesNeeded!A1");
-
-        cell = row.createCell(1);
-        cell.setCellFormula("'Quotes Needed Here &#$@'!A1");
-        
-        wb.close();
-    }
-
-    @Test
-    public void testUnaryMinus() {
-        confirmTokenClasses("-A1", RefPtg.class, UnaryMinusPtg.class);
-    }
-
-    @Test
-    public void testUnaryPlus() {
-        confirmTokenClasses("+A1", RefPtg.class, UnaryPlusPtg.class);
-    }
-
-    /**
-     * There may be multiple ways to encode an expression involving {@link UnaryPlusPtg}
-     * or {@link UnaryMinusPtg}.  These may be perfectly equivalent from a formula
-     * evaluation perspective, or formula rendering.  However, differences in the way
-     * POI encodes formulas may cause unnecessary confusion.  These non-critical tests
-     * check that POI follows the same encoding rules as Excel.
-     */
-    @Test
-    public void testExactEncodingOfUnaryPlusAndMinus() {
-        // as tested in Excel:
-        confirmUnary("-3", -3, NumberPtg.class);
-        confirmUnary("--4", -4, NumberPtg.class, UnaryMinusPtg.class);
-        confirmUnary("+++5", 5, IntPtg.class, UnaryPlusPtg.class, UnaryPlusPtg.class);
-        confirmUnary("++-6", -6, NumberPtg.class, UnaryPlusPtg.class, UnaryPlusPtg.class);
-
-        // Spaces muck things up a bit.  It would be clearer why the following cases are
-        // reasonable if POI encoded tAttrSpace in the right places.
-        // Otherwise these differences look capricious.
-        confirmUnary("+ 12", 12, IntPtg.class, UnaryPlusPtg.class);
-        confirmUnary("- 13", 13, IntPtg.class, UnaryMinusPtg.class);
-    }
-
-    private static void confirmUnary(String formulaText, double val, Class<?>...expectedTokenTypes) {
-        Ptg[] ptgs = parseFormula(formulaText);
-        confirmTokenClasses(ptgs, expectedTokenTypes);
-        Ptg ptg0 = ptgs[0];
-        if (ptg0 instanceof IntPtg) {
-            IntPtg intPtg = (IntPtg) ptg0;
-            assertEquals((int)val, intPtg.getValue());
-        } else if (ptg0 instanceof NumberPtg) {
-            NumberPtg numberPtg = (NumberPtg) ptg0;
-            assertEquals(val, numberPtg.getValue(), 0.0);
-        } else {
-            fail("bad ptg0 " + ptg0);
-        }
-    }
-
-    @Test
-    public void testLeadingSpaceInString() {
-        String value = "  hi  ";
-        Ptg[] ptgs = parseFormula("\"" + value + "\"");
-        confirmTokenClasses(ptgs, StringPtg.class);
-        assertTrue("ptg0 contains exact value", ((StringPtg)ptgs[0]).getValue().equals(value));
-    }
-
-    @Test
-    public void testLookupAndMatchFunctionArgs() {
-        Ptg[] ptgs = parseFormula("lookup(A1, A3:A52, B3:B52)");
-        confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class, AreaPtg.class, FuncVarPtg.class);
-        assertTrue("ptg0 has Value class", ptgs[0].getPtgClass() == Ptg.CLASS_VALUE);
-
-        ptgs = parseFormula("match(A1, A3:A52)");
-        confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class, FuncVarPtg.class);
-        assertTrue("ptg0 has Value class", ptgs[0].getPtgClass() == Ptg.CLASS_VALUE);
-    }
-
-    /** bug 33160*/
-    @Test
-    public void testLargeInt() {
-        confirmTokenClasses("40", IntPtg.class);
-        confirmTokenClasses("40000", IntPtg.class);
-    }
-
-    /** bug 33160 */
-    @Test
-    public void testSimpleLongFormula() {
-        confirmTokenClasses("40000/2", IntPtg.class, IntPtg.class, DividePtg.class);
-    }
-
-    /** bug 35027, underscore in sheet name */
-    @Test
-    public void testUnderscore() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        wb.createSheet("Cash_Flow");
-
-        HSSFSheet sheet = wb.createSheet("Test");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell;
-
-        cell = row.createCell(0);
-        cell.setCellFormula("Cash_Flow!A1");
-        
-        wb.close();
-    }
-
-    /** bug 49725, defined names with underscore */
-    @Test
-    public void testNamesWithUnderscore() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook(); //or new XSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("NamesWithUnderscore");
-
-        HSSFName nm;
-
-        nm = wb.createName();
-        nm.setNameName("DA6_LEO_WBS_Number");
-        nm.setRefersToFormula("33");
-
-        nm = wb.createName();
-        nm.setNameName("DA6_LEO_WBS_Name");
-        nm.setRefersToFormula("33");
-
-        nm = wb.createName();
-        nm.setNameName("A1_");
-        nm.setRefersToFormula("22");
-
-        nm = wb.createName();
-        nm.setNameName("_A1");
-        nm.setRefersToFormula("11");
-
-        nm = wb.createName();
-        nm.setNameName("A_1");
-        nm.setRefersToFormula("44");
-
-        nm = wb.createName();
-        nm.setNameName("A_1_");
-        nm.setRefersToFormula("44");
-
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-
-        cell.setCellFormula("DA6_LEO_WBS_Number*2");
-        assertEquals("DA6_LEO_WBS_Number*2", cell.getCellFormula());
-
-        cell.setCellFormula("(A1_*_A1+A_1)/A_1_");
-        assertEquals("(A1_*_A1+A_1)/A_1_", cell.getCellFormula());
-
-        cell.setCellFormula("INDEX(DA6_LEO_WBS_Name,MATCH($A3,DA6_LEO_WBS_Number,0))");
-        assertEquals("INDEX(DA6_LEO_WBS_Name,MATCH($A3,DA6_LEO_WBS_Number,0))", cell.getCellFormula());
-        
-        wb.close();
-    }
-
-    // bug 38396 : Formula with exponential numbers not parsed correctly.
-    @Test
-    public void testExponentialParsing() {
-        confirmTokenClasses("1.3E21/2",  NumberPtg.class, IntPtg.class, DividePtg.class);
-        confirmTokenClasses("1322E21/2", NumberPtg.class, IntPtg.class, DividePtg.class);
-        confirmTokenClasses("1.3E1/2",   NumberPtg.class, IntPtg.class, DividePtg.class);
-    }
-
-    @Test
-    public void testExponentialInSheet() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        wb.createSheet("Cash_Flow");
-
-        HSSFSheet sheet = wb.createSheet("Test");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-        String formula = null;
-
-        cell.setCellFormula("1.3E21/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "1.3E+21/3", formula);
-
-        cell.setCellFormula("-1.3E21/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-1.3E+21/3", formula);
-
-        cell.setCellFormula("1322E21/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "1.322E+24/3", formula);
-
-        cell.setCellFormula("-1322E21/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-1.322E+24/3", formula);
-
-        cell.setCellFormula("1.3E1/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "13/3", formula);
-
-        cell.setCellFormula("-1.3E1/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-13/3", formula);
-
-        cell.setCellFormula("1.3E-4/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "0.00013/3", formula);
-
-        cell.setCellFormula("-1.3E-4/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-0.00013/3", formula);
-
-        cell.setCellFormula("13E-15/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "0.000000000000013/3", formula);
-
-        cell.setCellFormula("-13E-15/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-0.000000000000013/3", formula);
-
-        cell.setCellFormula("1.3E3/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "1300/3", formula);
-
-        cell.setCellFormula("-1.3E3/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-1300/3", formula);
-
-        cell.setCellFormula("1300000000000000/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "1300000000000000/3", formula);
-
-        cell.setCellFormula("-1300000000000000/3");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-1300000000000000/3", formula);
-
-        cell.setCellFormula("-10E-1/3.1E2*4E3/3E4");
-        formula = cell.getCellFormula();
-        assertEquals("Exponential formula string", "-1/310*4000/30000", formula);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testNumbers() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        wb.createSheet("Cash_Flow");
-
-        HSSFSheet sheet = wb.createSheet("Test");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-        String formula = null;
-
-        // starts from decimal point
-
-        cell.setCellFormula(".1");
-        formula = cell.getCellFormula();
-        assertEquals("0.1", formula);
-
-        cell.setCellFormula("+.1");
-        formula = cell.getCellFormula();
-        assertEquals("0.1", formula);
-
-        cell.setCellFormula("-.1");
-        formula = cell.getCellFormula();
-        assertEquals("-0.1", formula);
-
-        // has exponent
-
-        cell.setCellFormula("10E1");
-        formula = cell.getCellFormula();
-        assertEquals("100", formula);
-
-        cell.setCellFormula("10E+1");
-        formula = cell.getCellFormula();
-        assertEquals("100", formula);
-
-        cell.setCellFormula("10E-1");
-        formula = cell.getCellFormula();
-        assertEquals("1", formula);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testRanges() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        wb.createSheet("Cash_Flow");
-
-        HSSFSheet sheet = wb.createSheet("Test");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-        String formula = null;
-
-        cell.setCellFormula("A1.A2");
-        formula = cell.getCellFormula();
-        assertEquals("A1:A2", formula);
-
-        cell.setCellFormula("A1..A2");
-        formula = cell.getCellFormula();
-        assertEquals("A1:A2", formula);
-
-        cell.setCellFormula("A1...A2");
-        formula = cell.getCellFormula();
-        assertEquals("A1:A2", formula);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testMultiSheetReference() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        wb.createSheet("Cash_Flow");
-        wb.createSheet("Test Sheet");
-        
-        HSSFSheet sheet = wb.createSheet("Test");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-        String formula = null;
-
-        
-        // References to a single cell:
-        
-        // One sheet
-        cell.setCellFormula("Cash_Flow!A1");
-        formula = cell.getCellFormula();
-        assertEquals("Cash_Flow!A1", formula);
-        
-        // Then the other
-        cell.setCellFormula("\'Test Sheet\'!A1");
-        formula = cell.getCellFormula();
-        assertEquals("\'Test Sheet\'!A1", formula);
-        
-        // Now both
-        cell.setCellFormula("Cash_Flow:\'Test Sheet\'!A1");
-        formula = cell.getCellFormula();
-        assertEquals("Cash_Flow:\'Test Sheet\'!A1", formula);
-
-        
-        // References to a range (area) of cells:
-        
-        // One sheet
-        cell.setCellFormula("Cash_Flow!A1:B2");
-        formula = cell.getCellFormula();
-        assertEquals("Cash_Flow!A1:B2", formula);
-        
-        // Then the other
-        cell.setCellFormula("\'Test Sheet\'!A1:B2");
-        formula = cell.getCellFormula();
-        assertEquals("\'Test Sheet\'!A1:B2", formula);
-        
-        // Now both
-        cell.setCellFormula("Cash_Flow:\'Test Sheet\'!A1:B2");
-        formula = cell.getCellFormula();
-        assertEquals("Cash_Flow:\'Test Sheet\'!A1:B2", formula);
-        
-        wb.close();
-    }
-    
-    /**
-     * Test for bug observable at svn revision 618865 (5-Feb-2008)<br/>
-     * a formula consisting of a single no-arg function got rendered without the function braces
-     */
-    @Test
-    public void testToFormulaStringZeroArgFunction() throws IOException {
-        HSSFWorkbook book = new HSSFWorkbook();
-
-        Ptg[] ptgs = {
-                FuncPtg.create(10),
-        };
-        assertEquals("NA()", HSSFFormulaParser.toFormulaString(book, ptgs));
-        
-        book.close();
-    }
-
-    @Test
-    public void testPercent() {
-
-        confirmTokenClasses("5%", IntPtg.class, PercentPtg.class);
-        // spaces OK
-        confirmTokenClasses(" 250 % ", IntPtg.class, PercentPtg.class);
-        // double percent OK
-        confirmTokenClasses("12345.678%%", NumberPtg.class, PercentPtg.class, PercentPtg.class);
-
-        // percent of a bracketed expression
-        confirmTokenClasses("(A1+35)%*B1%", RefPtg.class, IntPtg.class, AddPtg.class, ParenthesisPtg.class,
-                PercentPtg.class, RefPtg.class, PercentPtg.class, MultiplyPtg.class);
-
-        // percent of a text quantity
-        confirmTokenClasses("\"8.75\"%", StringPtg.class, PercentPtg.class);
-
-        // percent to the power of
-        confirmTokenClasses("50%^3", IntPtg.class, PercentPtg.class, IntPtg.class, PowerPtg.class);
-
-        // things that parse OK but would *evaluate* to an error
-        confirmTokenClasses("\"abc\"%", StringPtg.class, PercentPtg.class);
-        confirmTokenClasses("#N/A%", ErrPtg.class, PercentPtg.class);
-    }
-
-    /**
-     * Tests combinations of various operators in the absence of brackets
-     */
-    @Test
-    public void testPrecedenceAndAssociativity() {
-
-        // TRUE=TRUE=2=2  evaluates to FALSE
-        confirmTokenClasses("TRUE=TRUE=2=2", BoolPtg.class, BoolPtg.class, EqualPtg.class,
-                IntPtg.class, EqualPtg.class, IntPtg.class, EqualPtg.class);
-
-        //  2^3^2    evaluates to 64 not 512
-        confirmTokenClasses("2^3^2", IntPtg.class, IntPtg.class, PowerPtg.class,
-                IntPtg.class, PowerPtg.class);
-
-        // "abc" & 2 + 3 & "def"   evaluates to "abc5def"
-        confirmTokenClasses("\"abc\"&2+3&\"def\"", StringPtg.class, IntPtg.class, IntPtg.class,
-                AddPtg.class, ConcatPtg.class, StringPtg.class, ConcatPtg.class);
-
-        //  (1 / 2) - (3 * 4)
-        confirmTokenClasses("1/2-3*4", IntPtg.class, IntPtg.class, DividePtg.class,
-                IntPtg.class, IntPtg.class, MultiplyPtg.class, SubtractPtg.class);
-
-        // 2 * (2^2)
-        // NOT: (2 *2) ^ 2 -> int int multiply int power
-        confirmTokenClasses("2*2^2", IntPtg.class, IntPtg.class, IntPtg.class, PowerPtg.class, MultiplyPtg.class);
-
-        //  2^200% -> 2 not 1.6E58
-        confirmTokenClasses("2^200%", IntPtg.class, IntPtg.class, PercentPtg.class, PowerPtg.class);
-    }
-
-    /* package */ static Ptg[] confirmTokenClasses(String formula, Class<?>...expectedClasses) {
-        Ptg[] ptgs = parseFormula(formula);
-        confirmTokenClasses(ptgs, expectedClasses);
-        return ptgs;
-    }
-
-    private static void confirmTokenClasses(Ptg[] ptgs, Class<?>...expectedClasses) {
-        assertEquals(expectedClasses.length, ptgs.length);
-        for (int i = 0; i < expectedClasses.length; i++) {
-            if(expectedClasses[i] != ptgs[i].getClass()) {
-                fail("difference at token[" + i + "]: expected ("
-                    + expectedClasses[i].getName() + ") but got ("
-                    + ptgs[i].getClass().getName() + ")");
-            }
-        }
-    }
-
-    @Test
-    public void testPower() {
-        confirmTokenClasses("2^5", IntPtg.class, IntPtg.class, PowerPtg.class);
-    }
-
-    private static Ptg parseSingleToken(String formula, Class<? extends Ptg> ptgClass) {
-        Ptg[] ptgs = parseFormula(formula);
-        assertEquals(1, ptgs.length);
-        Ptg result = ptgs[0];
-        assertEquals(ptgClass, result.getClass());
-        return result;
-    }
-
-    @Test
-    public void testParseNumber() {
-        IntPtg ip;
-
-        // bug 33160
-        ip = (IntPtg) parseSingleToken("40", IntPtg.class);
-        assertEquals(40, ip.getValue());
-        ip = (IntPtg) parseSingleToken("40000", IntPtg.class);
-        assertEquals(40000, ip.getValue());
-
-        // check the upper edge of the IntPtg range:
-        ip = (IntPtg) parseSingleToken("65535", IntPtg.class);
-        assertEquals(65535, ip.getValue());
-        NumberPtg np = (NumberPtg) parseSingleToken("65536", NumberPtg.class);
-        assertEquals(65536, np.getValue(), 0);
-
-        np = (NumberPtg) parseSingleToken("65534.6", NumberPtg.class);
-        assertEquals(65534.6, np.getValue(), 0);
-    }
-
-    public void testMissingArgs() {
-
-        confirmTokenClasses("if(A1, ,C1)",
-                RefPtg.class,
-                AttrPtg.class, // tAttrIf
-                MissingArgPtg.class,
-                AttrPtg.class, // tAttrSkip
-                RefPtg.class,
-                AttrPtg.class, // tAttrSkip
-                FuncVarPtg.class
-        );
-
-        confirmTokenClasses("counta( , A1:B2, )", MissingArgPtg.class, AreaPtg.class, MissingArgPtg.class,
-                FuncVarPtg.class);
-    }
-
-    @Test
-    public void testParseErrorLiterals() {
-
-        confirmParseErrorLiteral(ErrPtg.NULL_INTERSECTION, "#NULL!");
-        confirmParseErrorLiteral(ErrPtg.DIV_ZERO, "#DIV/0!");
-        confirmParseErrorLiteral(ErrPtg.VALUE_INVALID, "#VALUE!");
-        confirmParseErrorLiteral(ErrPtg.REF_INVALID, "#REF!");
-        confirmParseErrorLiteral(ErrPtg.NAME_INVALID, "#NAME?");
-        confirmParseErrorLiteral(ErrPtg.NUM_ERROR, "#NUM!");
-        confirmParseErrorLiteral(ErrPtg.N_A, "#N/A");
-        parseFormula("HLOOKUP(F7,#REF!,G7,#REF!)");
-    }
-
-    private static void confirmParseErrorLiteral(ErrPtg expectedToken, String formula) {
-        assertEquals(expectedToken, parseSingleToken(formula, ErrPtg.class));
-    }
-
-    /**
-     * To aid readability the parameters have been encoded with single quotes instead of double
-     * quotes.  This method converts single quotes to double quotes before performing the parse
-     * and result check.
-     */
-    private static void confirmStringParse(String singleQuotedValue) {
-        // formula: internal quotes become double double, surround with double quotes
-        String formula = '"' + singleQuotedValue.replaceAll("'", "\"\"") + '"';
-        String expectedValue = singleQuotedValue.replace('\'', '"');
-
-        StringPtg sp = (StringPtg) parseSingleToken(formula, StringPtg.class);
-        assertEquals(expectedValue, sp.getValue());
-    }
-    
-    @Test
-    public void testParseStringLiterals_bug28754() throws IOException {
-
-        StringPtg sp;
-        try {
-            sp = (StringPtg) parseSingleToken("\"test\"\"ing\"", StringPtg.class);
-        } catch (RuntimeException e) {
-            if(e.getMessage().startsWith("Cannot Parse")) {
-                fail("Identified bug 28754a");
-            }
-            throw e;
-        }
-        assertEquals("test\"ing", sp.getValue());
-
-        HSSFWorkbook wb = new HSSFWorkbook();
-        try {
-            HSSFSheet sheet = wb.createSheet();
-            wb.setSheetName(0, "Sheet1");
-    
-            HSSFRow row = sheet.createRow(0);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellFormula("right(\"test\"\"ing\", 3)");
-            String actualCellFormula = cell.getCellFormula();
-            if("RIGHT(\"test\"ing\",3)".equals(actualCellFormula)) {
-                fail("Identified bug 28754b");
-            }
-            assertEquals("RIGHT(\"test\"\"ing\",3)", actualCellFormula);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testParseStringLiterals() {
-        confirmStringParse("goto considered harmful");
-
-        confirmStringParse("goto 'considered' harmful");
-
-        confirmStringParse("");
-        confirmStringParse("'");
-        confirmStringParse("''");
-        confirmStringParse("' '");
-        confirmStringParse(" ' ");
-    }
-
-    @Test
-    public void testParseSumIfSum() {
-        String formulaString;
-        Ptg[] ptgs;
-        ptgs = parseFormula("sum(5, 2, if(3>2, sum(A1:A2), 6))");
-        formulaString = toFormulaString(ptgs);
-        assertEquals("SUM(5,2,IF(3>2,SUM(A1:A2),6))", formulaString);
-
-        ptgs = parseFormula("if(1<2,sum(5, 2, if(3>2, sum(A1:A2), 6)),4)");
-        formulaString = toFormulaString(ptgs);
-        assertEquals("IF(1<2,SUM(5,2,IF(3>2,SUM(A1:A2),6)),4)", formulaString);
-    }
-    
-    @Test
-    public void testParserErrors() {
-        parseExpectedException(" 12 . 345  ");
-        parseExpectedException("1 .23  ");
-
-        parseExpectedException("sum(#NAME)");
-        parseExpectedException("1 + #N / A * 2");
-        parseExpectedException("#value?");
-        parseExpectedException("#DIV/ 0+2");
-
-
-        parseExpectedException("IF(TRUE)");
-        parseExpectedException("countif(A1:B5, C1, D1)");
-        
-        parseExpectedException("(");
-        parseExpectedException(")");
-        parseExpectedException("+");
-        parseExpectedException("42+");
-        
-        parseExpectedException("IF(");
-    }
-
-    private static void parseExpectedException(String formula) {
-        try {
-            parseFormula(formula);
-            fail("Expected FormulaParseException: " + formula);
-        } catch (FormulaParseException e) {
-            // expected during successful test
-            assertNotNull(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testSetFormulaWithRowBeyond32768_Bug44539() throws IOException {
-
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        wb.setSheetName(0, "Sheet1");
-
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-        cell.setCellFormula("SUM(A32769:A32770)");
-        if("SUM(A-32767:A-32766)".equals(cell.getCellFormula())) {
-            fail("Identified bug 44539");
-        }
-        assertEquals("SUM(A32769:A32770)", cell.getCellFormula());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testSpaceAtStartOfFormula() {
-        // Simulating cell formula of "= 4" (note space)
-        // The same Ptg array can be observed if an excel file is saved with that exact formula
-
-        AttrPtg spacePtg = AttrPtg.createSpace(AttrPtg.SpaceType.SPACE_BEFORE, 1);
-        Ptg[] ptgs = { spacePtg, new IntPtg(4), };
-        String formulaString;
-        try {
-            formulaString = toFormulaString(ptgs);
-        } catch (IllegalStateException e) {
-            if(e.getMessage().equalsIgnoreCase("too much stuff left on the stack")) {
-                fail("Identified bug 44609");
-            }
-            // else some unexpected error
-            throw e;
-        }
-        // FormulaParser strips spaces anyway
-        assertEquals("4", formulaString);
-
-        ptgs = new Ptg[] { new IntPtg(3), spacePtg, new IntPtg(4), spacePtg, AddPtg.instance, };
-        formulaString = toFormulaString(ptgs);
-        assertEquals("3+4", formulaString);
-    }
-
-    /**
-     * Checks some internal error detecting logic ('stack underflow error' in toFormulaString)
-     */
-    @Test
-    public void testTooFewOperandArgs() {
-        // Simulating badly encoded cell formula of "=/1"
-        // Not sure if Excel could ever produce this
-        Ptg[] ptgs = {
-                // Excel would probably have put tMissArg here
-                new IntPtg(1),
-                DividePtg.instance,
-        };
-        try {
-            toFormulaString(ptgs);
-            fail("Expected exception was not thrown");
-        } catch (IllegalStateException e) {
-            // expected during successful test
-            assertTrue(e.getMessage().startsWith("Too few arguments supplied to operation"));
-        }
-    }
-    /**
-     * Make sure that POI uses the right Func Ptg when encoding formulas.  Functions with variable
-     * number of args should get FuncVarPtg, functions with fixed args should get FuncPtg.<p/>
-     *
-     * Prior to the fix for bug 44675 POI would encode FuncVarPtg for all functions.  In many cases
-     * Excel tolerates the wrong Ptg and evaluates the formula OK (e.g. SIN), but in some cases
-     * (e.g. COUNTIF) Excel fails to evaluate the formula, giving '#VALUE!' instead.
-     */
-    @Test
-    public void testFuncPtgSelection() {
-
-        Ptg[] ptgs = parseFormula("countif(A1:A2, 1)");
-        assertEquals(3, ptgs.length);
-        if(ptgs[2] instanceof FuncVarPtg) {
-            fail("Identified bug 44675");
-        }
-        confirmTokenClasses(ptgs, AreaPtg.class, IntPtg.class, FuncPtg.class);
-
-        confirmTokenClasses("sin(1)", IntPtg.class, FuncPtg.class);
-    }
-
-    @Test
-    public void testWrongNumberOfFunctionArgs() throws IOException {
-        confirmArgCountMsg("sin()", "Too few arguments to function 'SIN'. Expected 1 but got 0.");
-        confirmArgCountMsg("countif(1, 2, 3, 4)", "Too many arguments to function 'COUNTIF'. Expected 2 but got 4.");
-        confirmArgCountMsg("index(1, 2, 3, 4, 5, 6)", "Too many arguments to function 'INDEX'. At most 4 were expected but got 6.");
-        confirmArgCountMsg("vlookup(1, 2)", "Too few arguments to function 'VLOOKUP'. At least 3 were expected but got 2.");
-    }
-
-    private static void confirmArgCountMsg(String formula, String expectedMessage) throws IOException {
-        HSSFWorkbook book = new HSSFWorkbook();
-        try {
-            HSSFFormulaParser.parse(formula, book);
-            fail("Didn't get parse exception as expected");
-        } catch (FormulaParseException e) {
-            confirmParseException(e, expectedMessage);
-        }
-        book.close();
-    }
-
-    @Test
-    public void testParseErrorExpectedMsg() {
-
-        try {
-            parseFormula("round(3.14;2)");
-            fail("Didn't get parse exception as expected");
-        } catch (FormulaParseException e) {
-            confirmParseException(e,
-                    "Parse error near char 10 ';' in specified formula 'round(3.14;2)'. Expected ',' or ')'");
-        }
-
-        try {
-            parseFormula(" =2+2");
-            fail("Didn't get parse exception as expected");
-        } catch (FormulaParseException e) {
-            confirmParseException(e,
-                    "The specified formula ' =2+2' starts with an equals sign which is not allowed.");
-        }
-    }
-
-    /**
-     * this function name has a dot in it.
-     */
-    @Test
-    public void testParseErrorTypeFunction() {
-
-        Ptg[] ptgs;
-        try {
-            ptgs = parseFormula("error.type(A1)");
-        } catch (IllegalArgumentException e) {
-            if (e.getMessage().equals("Invalid Formula cell reference: 'error'")) {
-                fail("Identified bug 45334");
-            }
-            throw e;
-        }
-        confirmTokenClasses(ptgs, RefPtg.class, FuncPtg.class);
-        assertEquals("ERROR.TYPE", ((FuncPtg) ptgs[1]).getName());
-    }
-
-    @Test
-    public void testNamedRangeThatLooksLikeCell() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFName name = wb.createName();
-        name.setRefersToFormula("Sheet1!B1");
-        name.setNameName("pfy1");
-
-        Ptg[] ptgs;
-        try {
-            ptgs = HSSFFormulaParser.parse("count(pfy1)", wb);
-        } catch (IllegalArgumentException e) {
-            if (e.getMessage().equals("Specified colIx (1012) is out of range")) {
-                fail("Identified bug 45354");
-            }
-            wb.close();
-            throw e;
-        }
-        confirmTokenClasses(ptgs, NamePtg.class, FuncVarPtg.class);
-
-        HSSFCell cell = sheet.createRow(0).createCell(0);
-        cell.setCellFormula("count(pfy1)");
-        assertEquals("COUNT(pfy1)", cell.getCellFormula());
-        try {
-            cell.setCellFormula("count(pf1)");
-            fail("Expected formula parse execption");
-        } catch (FormulaParseException e) {
-            confirmParseException(e,
-                    "Specified named range 'pf1' does not exist in the current workbook.");
-        }
-        cell.setCellFormula("count(fp1)"); // plain cell ref, col is in range
-        wb.close();
-    }
-
-    @Test
-    public void testParseAreaRefHighRow_bug45358() throws IOException {
-        Ptg[] ptgs;
-        AreaI aptg;
-
-        HSSFWorkbook book = new HSSFWorkbook();
-        book.createSheet("Sheet1");
-
-        ptgs = HSSFFormulaParser.parse("Sheet1!A10:A40000", book);
-        aptg = (AreaI) ptgs[0];
-        if (aptg.getLastRow() == -25537) {
-            fail("Identified bug 45358");
-        }
-        assertEquals(39999, aptg.getLastRow());
-
-        ptgs = HSSFFormulaParser.parse("Sheet1!A10:A65536", book);
-        aptg = (AreaI) ptgs[0];
-        assertEquals(65535, aptg.getLastRow());
-
-        // plain area refs should be ok too
-        ptgs = parseFormula("A10:A65536");
-        aptg = (AreaI) ptgs[0];
-        assertEquals(65535, aptg.getLastRow());
-
-        book.close();
-    }
-    
-    @Test
-    public void testParseArray()  {
-        Ptg[] ptgs;
-        ptgs = parseFormula("mode({1,2,2,#REF!;FALSE,3,3,2})");
-        confirmTokenClasses(ptgs, ArrayPtg.class, FuncVarPtg.class);
-        assertEquals("{1,2,2,#REF!;FALSE,3,3,2}", ptgs[0].toFormulaString());
-
-        ArrayPtg aptg = (ArrayPtg) ptgs[0];
-        Object[][] values = aptg.getTokenArrayValues();
-        assertEquals(ErrorConstant.valueOf(FormulaError.REF.getCode()), values[0][3]);
-        assertEquals(Boolean.FALSE, values[1][0]);
-    }
-
-    @Test
-    public void testParseStringElementInArray() {
-        Ptg[] ptgs;
-        ptgs = parseFormula("MAX({\"5\"},3)");
-        confirmTokenClasses(ptgs, ArrayPtg.class, IntPtg.class, FuncVarPtg.class);
-        Object element = ((ArrayPtg)ptgs[0]).getTokenArrayValues()[0][0];
-        if (element instanceof UnicodeString) {
-            // this would cause ClassCastException below
-            fail("Wrong encoding of array element value");
-        }
-        assertEquals(String.class, element.getClass());
-
-        // make sure the formula encodes OK
-        int encSize = Ptg.getEncodedSize(ptgs);
-        byte[] data = new byte[encSize];
-        Ptg.serializePtgs(ptgs, data, 0);
-        byte[] expData = HexRead.readFromString(
-                "20 00 00 00 00 00 00 00 " // tArray
-                + "1E 03 00 "      // tInt(3)
-                + "42 02 07 00 "   // tFuncVar(MAX) 2-arg
-                + "00 00 00 "      // Array data: 1 col, 1 row
-                + "02 01 00 00 35" // elem (type=string, len=1, "5")
-        );
-        assertArrayEquals(expData, data);
-        int initSize = Ptg.getEncodedSizeWithoutArrayData(ptgs);
-        Ptg[] ptgs2 = Ptg.readTokens(initSize, new LittleEndianByteArrayInputStream(data));
-        confirmTokenClasses(ptgs2, ArrayPtg.class, IntPtg.class, FuncVarPtg.class);
-    }
-
-    @Test
-    public void testParseArrayNegativeElement() {
-        Ptg[] ptgs;
-        try {
-            ptgs = parseFormula("{-42}");
-        } catch (FormulaParseException e) {
-            if (e.getMessage().equals("Parse error near char 1 '-' in specified formula '{-42}'. Expected Integer")) {
-                fail("Identified bug - failed to parse negative array element.");
-            }
-            throw e;
-        }
-        confirmTokenClasses(ptgs, ArrayPtg.class);
-        Object element = ((ArrayPtg)ptgs[0]).getTokenArrayValues()[0][0];
-
-        assertEquals(-42.0, ((Double)element).doubleValue(), 0.0);
-
-        // Should be able to handle whitespace between unary minus and digits (Excel
-        // accepts this formula after presenting the user with a confirmation dialog).
-        ptgs = parseFormula("{- 5}");
-        element = ((ArrayPtg)ptgs[0]).getTokenArrayValues()[0][0];
-        assertEquals(-5.0, ((Double)element).doubleValue(), 0.0);
-    }
-
-    @Test
-    public void testRangeOperator() throws IOException {
-
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        HSSFCell cell = sheet.createRow(0).createCell(0);
-
-        wb.setSheetName(0, "Sheet1");
-        cell.setCellFormula("Sheet1!B$4:Sheet1!$C1"); // explicit range ':' operator
-        assertEquals("Sheet1!B$4:Sheet1!$C1", cell.getCellFormula());
-
-        cell.setCellFormula("Sheet1!B$4:$C1"); // plain area ref
-        assertEquals("Sheet1!B1:$C$4", cell.getCellFormula()); // note - area ref is normalised
-
-        cell.setCellFormula("Sheet1!$C1...B$4"); // different syntax for plain area ref
-        assertEquals("Sheet1!B1:$C$4", cell.getCellFormula());
-
-        // with funny sheet name
-        wb.setSheetName(0, "A1...A2");
-        cell.setCellFormula("A1...A2!B1");
-        assertEquals("A1...A2!B1", cell.getCellFormula());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testBooleanNamedSheet() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("true");
-        HSSFCell cell = sheet.createRow(0).createCell(0);
-        cell.setCellFormula("'true'!B2");
-
-        assertEquals("'true'!B2", cell.getCellFormula());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testParseExternalWorkbookReference() throws IOException {
-        HSSFWorkbook wbA = HSSFTestDataSamples.openSampleWorkbook("multibookFormulaA.xls");
-        HSSFCell cell = wbA.getSheetAt(0).getRow(0).getCell(0);
-
-        // make sure formula in sample is as expected
-        assertEquals("[multibookFormulaB.xls]BSheet1!B1", cell.getCellFormula());
-        Ptg[] expectedPtgs = FormulaExtractor.getPtgs(cell);
-        confirmSingle3DRef(expectedPtgs, 1);
-
-        // now try (re-)parsing the formula
-        Ptg[] actualPtgs = HSSFFormulaParser.parse("[multibookFormulaB.xls]BSheet1!B1", wbA);
-        confirmSingle3DRef(actualPtgs, 1); // externalSheetIndex 1 -> BSheet1
-
-        // try parsing a formula pointing to a different external sheet
-        Ptg[] otherPtgs = HSSFFormulaParser.parse("[multibookFormulaB.xls]AnotherSheet!B1", wbA);
-        confirmSingle3DRef(otherPtgs, 0); // externalSheetIndex 0 -> AnotherSheet
-
-        // try setting the same formula in a cell
-        cell.setCellFormula("[multibookFormulaB.xls]AnotherSheet!B1");
-        assertEquals("[multibookFormulaB.xls]AnotherSheet!B1", cell.getCellFormula());
-        
-        wbA.close();
-    }
-    
-    private static void confirmSingle3DRef(Ptg[] ptgs, int expectedExternSheetIndex) {
-        assertEquals(1, ptgs.length);
-        Ptg ptg0 = ptgs[0];
-        assertTrue(ptg0 instanceof Ref3DPtg);
-        assertEquals(expectedExternSheetIndex, ((Ref3DPtg)ptg0).getExternSheetIndex());
-    }
-
-    @Test
-    public void testUnion() throws IOException {
-        String formula = "Sheet1!$B$2:$C$3,OFFSET(Sheet1!$E$2:$E$4,1,Sheet1!$A$1),Sheet1!$D$6";
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("Sheet1");
-        Ptg[] ptgs = FormulaParser.parse(formula, HSSFEvaluationWorkbook.create(wb), FormulaType.CELL, -1);
-
-        confirmTokenClasses(ptgs,
-                // TODO - AttrPtg.class, // Excel prepends this
-                MemFuncPtg.class,
-                Area3DPtg.class,
-                Area3DPtg.class,
-                IntPtg.class,
-                Ref3DPtg.class,
-                FuncVarPtg.class,
-                UnionPtg.class,
-                Ref3DPtg.class,
-                UnionPtg.class
-        );
-        MemFuncPtg mf = (MemFuncPtg)ptgs[0];
-        assertEquals(45, mf.getLenRefSubexpression());
-
-        // We don't check the type of the operands.
-        confirmTokenClasses("1,2", MemAreaPtg.class, IntPtg.class, IntPtg.class, UnionPtg.class);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testIntersection() throws IOException {
-       String formula = "Sheet1!$B$2:$C$3 OFFSET(Sheet1!$E$2:$E$4, 1,Sheet1!$A$1) Sheet1!$D$6";
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("Sheet1");
-        Ptg[] ptgs = FormulaParser.parse(formula, HSSFEvaluationWorkbook.create(wb), FormulaType.CELL, -1);
-
-        confirmTokenClasses(ptgs,
-                // TODO - AttrPtg.class, // Excel prepends this
-                MemFuncPtg.class,
-                Area3DPtg.class,
-                Area3DPtg.class,
-                IntPtg.class,
-                Ref3DPtg.class,
-                FuncVarPtg.class,
-                IntersectionPtg.class,
-                Ref3DPtg.class,
-                IntersectionPtg.class
-        );
-        MemFuncPtg mf = (MemFuncPtg)ptgs[0];
-        assertEquals(45, mf.getLenRefSubexpression());
-
-        // This used to be an error but now parses.  Union has the same behaviour.
-        confirmTokenClasses("1 2", MemAreaPtg.class, IntPtg.class, IntPtg.class, IntersectionPtg.class);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testComparisonInParen() {
-        confirmTokenClasses("(A1 > B2)", 
-            RefPtg.class, 
-            RefPtg.class, 
-            GreaterThanPtg.class, 
-            ParenthesisPtg.class
-        );
-    }
-    
-    @Test
-    public void testUnionInParen() {
-        confirmTokenClasses("(A1:B2,B2:C3)", 
-          MemAreaPtg.class, 
-          AreaPtg.class, 
-          AreaPtg.class, 
-          UnionPtg.class, 
-          ParenthesisPtg.class
-        );
-    }
-
-    @Test
-    public void testIntersectionInParen() {
-        confirmTokenClasses("(A1:B2 B2:C3)", 
-            MemAreaPtg.class, 
-            AreaPtg.class, 
-            AreaPtg.class, 
-            IntersectionPtg.class, 
-            ParenthesisPtg.class
-        );
-    }
-    
-    @Test
-    public void testRange_bug46643() throws IOException {
-        String formula = "Sheet1!A1:Sheet1!B3";
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("Sheet1");
-        Ptg[] ptgs = FormulaParser.parse(formula, HSSFEvaluationWorkbook.create(wb), FormulaType.CELL, -1, -1);
-
-        if (ptgs.length == 3) {
-            confirmTokenClasses(ptgs, Ref3DPtg.class, Ref3DPtg.class, RangePtg.class);
-            fail("Identified bug 46643");
-        }
-
-        confirmTokenClasses(ptgs,
-                MemFuncPtg.class,
-                Ref3DPtg.class,
-                Ref3DPtg.class,
-                RangePtg.class
-        );
-        MemFuncPtg mf = (MemFuncPtg)ptgs[0];
-        assertEquals(15, mf.getLenRefSubexpression());
-        wb.close();
-    }
-
-    /** Named ranges with backslashes, e.g. 'POI\\2009' */
-    @Test
-    public void testBackSlashInNames() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        HSSFName name = wb.createName();
-        name.setNameName("POI\\2009");
-        name.setRefersToFormula("Sheet1!$A$1");
-
-        HSSFSheet sheet = wb.createSheet();
-        HSSFRow row = sheet.createRow(0);
-
-        HSSFCell cell_C1 =  row.createCell(2);
-        cell_C1.setCellFormula("POI\\2009");
-        assertEquals("POI\\2009", cell_C1.getCellFormula());
-
-        HSSFCell cell_D1 = row.createCell(2);
-        cell_D1.setCellFormula("NOT(POI\\2009=\"3.5-final\")");
-        assertEquals("NOT(POI\\2009=\"3.5-final\")", cell_D1.getCellFormula());
-        
-        wb.close();
-    }
-
-    /**
-     * TODO - delete equiv test:
-     * {@link BaseTestBugzillaIssues#test42448()}
-     */
-    @Test
-    public void testParseAbnormalSheetNamesAndRanges_bug42448() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("A");
-        try {
-            HSSFFormulaParser.parse("SUM(A!C7:A!C67)", wb);
-        } catch (StringIndexOutOfBoundsException e) {
-            fail("Identified bug 42448");
-        }
-        // the exact example from the bugzilla description:
-        HSSFFormulaParser.parse("SUMPRODUCT(A!C7:A!C67, B8:B68) / B69", wb);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testRangeFuncOperand_bug46951() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        Ptg[] ptgs;
-        try {
-            ptgs = HSSFFormulaParser.parse("SUM(C1:OFFSET(C1,0,B1))", wb);
-        } catch (RuntimeException e) {
-            if (e.getMessage().equals("Specified named range 'OFFSET' does not exist in the current workbook.")) {
-                fail("Identified bug 46951");
-            }
-            wb.close();
-            throw e;
-        }
-        confirmTokenClasses(ptgs,
-            MemFuncPtg.class, // [len=23]
-            RefPtg.class, // [C1]
-            RefPtg.class, // [C1]
-            IntPtg.class, // [0]
-            RefPtg.class, // [B1]
-            FuncVarPtg.class, // [OFFSET nArgs=3]
-            RangePtg.class, //
-            AttrPtg.class // [sum ]
-        );
-        wb.close();
-    }
-
-    @Test
-    public void testUnionOfFullCollFullRowRef() throws IOException {
-        Ptg[] ptgs;
-        ptgs = parseFormula("3:4");
-        ptgs = parseFormula("$Z:$AC");
-        confirmTokenClasses(ptgs, AreaPtg.class);
-        ptgs = parseFormula("B:B");
-
-        ptgs = parseFormula("$11:$13");
-        confirmTokenClasses(ptgs, AreaPtg.class);
-
-        ptgs = parseFormula("$A:$A,$1:$4");
-        confirmTokenClasses(ptgs, MemAreaPtg.class,
-                AreaPtg.class,
-                AreaPtg.class,
-                UnionPtg.class
-        );
-
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("Sheet1");
-        ptgs = HSSFFormulaParser.parse("Sheet1!$A:$A,Sheet1!$1:$4", wb);
-        confirmTokenClasses(ptgs, MemFuncPtg.class,
-                Area3DPtg.class,
-                Area3DPtg.class,
-                UnionPtg.class
-        );
-
-        ptgs = HSSFFormulaParser.parse("'Sheet1'!$A:$A,'Sheet1'!$1:$4", wb);
-        confirmTokenClasses(ptgs,
-                MemFuncPtg.class,
-                Area3DPtg.class,
-                Area3DPtg.class,
-                UnionPtg.class
-        );
-        
-        wb.close();
-    }
-
-    @Test
-    public void testExplicitRangeWithTwoSheetNames() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("Sheet1");
-        Ptg[] ptgs = HSSFFormulaParser.parse("Sheet1!F1:Sheet1!G2", wb);
-        confirmTokenClasses(ptgs,
-                MemFuncPtg.class,
-                Ref3DPtg.class,
-                Ref3DPtg.class,
-                RangePtg.class
-        );
-        MemFuncPtg mf;
-        mf = (MemFuncPtg)ptgs[0];
-        assertEquals(15, mf.getLenRefSubexpression());
-        wb.close();
-    }
-
-    /**
-     * Checks that the area-ref and explicit range operators get the right associativity
-     * and that the {@link MemFuncPtg} / {@link MemAreaPtg} is added correctly
-     */
-    @Test
-    public void testComplexExplicitRangeEncodings() {
-
-        Ptg[] ptgs;
-        ptgs = parseFormula("SUM(OFFSET(A1,0,0):B2:C3:D4:E5:OFFSET(F6,1,1):G7)");
-        confirmTokenClasses(ptgs,
-            // AttrPtg.class, // [volatile ] // POI doesn't do this yet (Apr 2009)
-            MemFuncPtg.class, // len 57
-            RefPtg.class, // [A1]
-            IntPtg.class, // [0]
-            IntPtg.class, // [0]
-            FuncVarPtg.class, // [OFFSET nArgs=3]
-            AreaPtg.class, // [B2:C3]
-            RangePtg.class,
-            AreaPtg.class, // [D4:E5]
-            RangePtg.class,
-            RefPtg.class, // [F6]
-            IntPtg.class, // [1]
-            IntPtg.class, // [1]
-            FuncVarPtg.class, // [OFFSET nArgs=3]
-            RangePtg.class,
-            RefPtg.class, // [G7]
-            RangePtg.class,
-            AttrPtg.class // [sum ]
-        );
-
-        MemFuncPtg mf = (MemFuncPtg)ptgs[0];
-        assertEquals(57, mf.getLenRefSubexpression());
-        assertEquals("D4:E5", ((AreaPtgBase)ptgs[7]).toFormulaString());
-        assertTrue(((AttrPtg)ptgs[16]).isSum());
-
-        ptgs = parseFormula("SUM(A1:B2:C3:D4)");
-        confirmTokenClasses(ptgs,
-            // AttrPtg.class, // [volatile ] // POI doesn't do this yet (Apr 2009)
-                MemAreaPtg.class, // len 19
-                AreaPtg.class, // [A1:B2]
-                AreaPtg.class, // [C3:D4]
-                RangePtg.class,
-                AttrPtg.class // [sum ]
-        );
-        MemAreaPtg ma = (MemAreaPtg)ptgs[0];
-        assertEquals(19, ma.getLenRefSubexpression());
-    }
-
-
-    /**
-     * Mostly confirming that erroneous conditions are detected.  Actual error message wording is not critical.
-     *
-     */
-    @Test
-    public void testEdgeCaseParserErrors() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("Sheet1");
-
-        confirmParseError(wb, "A1:ROUND(B1,1)", "The RHS of the range operator ':' at position 3 is not a proper reference.");
-
-        confirmParseError(wb, "Sheet1!!!", "Parse error near char 7 '!' in specified formula 'Sheet1!!!'. Expected number, string, defined name, or data table");
-        confirmParseError(wb, "Sheet1!.Name", "Parse error near char 7 '.' in specified formula 'Sheet1!.Name'. Expected number, string, defined name, or data table");
-        confirmParseError(wb, "Sheet1!Sheet1", "Specified name 'Sheet1' for sheet Sheet1 not found");
-        confirmParseError(wb, "Sheet1!F:Sheet1!G", "'Sheet1!F' is not a proper reference.");
-        confirmParseError(wb, "Sheet1!F..foobar", "Complete area reference expected after sheet name at index 11.");
-        confirmParseError(wb, "Sheet1!A .. B", "Dotted range (full row or column) expression 'A .. B' must not contain whitespace.");
-        confirmParseError(wb, "Sheet1!A...B", "Dotted range (full row or column) expression 'A...B' must have exactly 2 dots.");
-        confirmParseError(wb, "Sheet1!A foobar", "Second part of cell reference expected after sheet name at index 10.");
-
-        confirmParseError(wb, "foobar", "Specified named range 'foobar' does not exist in the current workbook.");
-        confirmParseError(wb, "A1:1", "The RHS of the range operator ':' at position 3 is not a proper reference.");
-        wb.close();
-    }
-
-    private static void confirmParseError(HSSFWorkbook wb, String formula, String expectedMessage) {
-
-        try {
-            HSSFFormulaParser.parse(formula, wb);
-            fail("Expected formula parse execption");
-        } catch (FormulaParseException e) {
-            confirmParseException(e, expectedMessage);
-        }
-    }
-
-    /**
-     * In bug 47078, POI had trouble evaluating a defined name flagged as 'complex'.
-     * POI should also be able to parse such defined names.
-     */
-    @Test
-    public void testParseComplexName() throws IOException {
-
-        // Mock up a spreadsheet to match the critical details of the sample
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("Sheet1");
-        HSSFName definedName = wb.createName();
-        definedName.setNameName("foo");
-        definedName.setRefersToFormula("Sheet1!B2");
-
-        // Set the complex flag - POI doesn't usually manipulate this flag
-        NameRecord nameRec = TestHSSFName.getNameRecord(definedName);
-        nameRec.setOptionFlag((short)0x10); // 0x10 -> complex
-
-        Ptg[] result;
-        try {
-            result = HSSFFormulaParser.parse("1+foo", wb);
-        } catch (FormulaParseException e) {
-            if (e.getMessage().equals("Specified name 'foo' is not a range as expected.")) {
-                fail("Identified bug 47078c");
-            }
-            wb.close();
-            throw e;
-        }
-        confirmTokenClasses(result, IntPtg.class, NamePtg.class, AddPtg.class);
-        
-        wb.close();
-    }
-
-    /**
-     * Zero is not a valid row number so cell references like 'A0' are not valid.
-     * Actually, they should be treated like defined names.
-     * <br/>
-     * In addition, leading zeros (on the row component) should be removed from cell
-     * references during parsing.
-     */
-    @Test
-    public void testZeroRowRefs() throws IOException {
-        String badCellRef = "B0"; // bad because zero is not a valid row number
-        String leadingZeroCellRef = "B000001"; // this should get parsed as "B1"
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        try {
-            HSSFFormulaParser.parse(badCellRef, wb);
-            fail("Identified bug 47312b - Shouldn't be able to parse cell ref '"
-                    + badCellRef + "'.");
-        } catch (FormulaParseException e) {
-            // expected during successful test
-            confirmParseException(e, "Specified named range '"
-                    + badCellRef + "' does not exist in the current workbook.");
-        }
-
-        Ptg[] ptgs;
-        try {
-            ptgs = HSSFFormulaParser.parse(leadingZeroCellRef, wb);
-            assertEquals("B1", ((RefPtg) ptgs[0]).toFormulaString());
-        } catch (FormulaParseException e) {
-            confirmParseException(e, "Specified named range '"
-                    + leadingZeroCellRef + "' does not exist in the current workbook.");
-            // close but no cigar
-            fail("Identified bug 47312c - '" + leadingZeroCellRef + "' should parse as 'B1'.");
-        }
-
-        // create a defined name called 'B0' and try again
-        Name n = wb.createName();
-        n.setNameName("B0");
-        n.setRefersToFormula("1+1");
-        ptgs = HSSFFormulaParser.parse("B0", wb);
-        confirmTokenClasses(ptgs, NamePtg.class);
-        
-        wb.close();
-    }
-
-    private static void confirmParseException(FormulaParseException e, String expMsg) {
-        assertEquals(expMsg, e.getMessage());
-    }
-
-    @Test
-    public void test57196_Formula() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        Ptg[] ptgs = HSSFFormulaParser.parse("DEC2HEX(HEX2DEC(O8)-O2+D2)", wb, FormulaType.CELL, -1); 
-        assertNotNull("Ptg array should not be null", ptgs);
-        
-        confirmTokenClasses(ptgs,
-            NameXPtg.class, // ??
-            NameXPtg.class, // ??
-            RefPtg.class, // O8
-            FuncVarPtg.class, // HEX2DEC
-            RefPtg.class, // O2
-            SubtractPtg.class,
-            RefPtg.class,   // D2
-            AddPtg.class,
-            FuncVarPtg.class // DEC2HEX
-        );
-
-        RefPtg o8 = (RefPtg) ptgs[2];
-        FuncVarPtg hex2Dec = (FuncVarPtg) ptgs[3];
-        RefPtg o2 = (RefPtg) ptgs[4];
-        RefPtg d2 = (RefPtg) ptgs[6];
-        FuncVarPtg dec2Hex = (FuncVarPtg) ptgs[8];
-
-        assertEquals("O8", o8.toFormulaString());
-        assertEquals(255, hex2Dec.getFunctionIndex());
-        //assertEquals("", hex2Dec.toString());
-        assertEquals("O2", o2.toFormulaString());
-        assertEquals("D2", d2.toFormulaString());
-        assertEquals(255, dec2Hex.getFunctionIndex());
-        
-        wb.close();
-    }    
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
deleted file mode 100644
index 291b3a5..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFName;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-/**
- * Test the low level formula parser functionality,
- *  but using parts which need to use
- *  HSSFFormulaEvaluator.
- */
-public final class TestFormulaParserEval extends TestCase {
-
-	public void testWithNamedRange() {
-		HSSFWorkbook workbook = new HSSFWorkbook();
-
-		HSSFSheet s = workbook.createSheet("Foo");
-		s.createRow(0).createCell(0).setCellValue(1.1);
-		s.createRow(1).createCell(0).setCellValue(2.3);
-		s.createRow(2).createCell(2).setCellValue(3.1);
-
-		HSSFName name = workbook.createName();
-		name.setNameName("testName");
-		name.setRefersToFormula("A1:A2");
-
-		confirmParseFormula(workbook);
-
-		// Now make it a single cell
-		name.setRefersToFormula("C3");
-		confirmParseFormula(workbook);
-
-		// And make it non-contiguous
-		// using area unions
-		name.setRefersToFormula("A1:A2,C3");
-
-		confirmParseFormula(workbook);
-	}
-
-	/**
-	 * Makes sure that a formula referring to the named range parses properly
-	 */
-	private static void confirmParseFormula(HSSFWorkbook workbook) {
-		Ptg[] ptgs = HSSFFormulaParser.parse("SUM(testName)", workbook);
-		assertTrue("two tokens expected, got "+ptgs.length,ptgs.length == 2);
-		assertEquals(NamePtg.class, ptgs[0].getClass());
-		assertEquals(AttrPtg.class, ptgs[1].getClass());
-	}
-
-	public void testEvaluateFormulaWithRowBeyond32768_Bug44539() {
-
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet();
-		wb.setSheetName(0, "Sheet1");
-
-		HSSFRow row = sheet.createRow(0);
-		HSSFCell cell = row.createCell(0);
-		cell.setCellFormula("SUM(A32769:A32770)");
-
-		// put some values in the cells to make the evaluation more interesting
-		sheet.createRow(32768).createCell(0).setCellValue(31);
-		sheet.createRow(32769).createCell(0).setCellValue(11);
-
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		CellValue result;
-		try {
-			result = fe.evaluate(cell);
-		} catch (FormulaParseException e) {
-			if (!e.getMessage().equals("Found reference to named range \"A\", but that named range wasn't defined!")) {
-				throw new AssertionFailedError("Identifed bug 44539");
-			}
-			throw e;
-		}
-		assertEquals(CellType.NUMERIC, result.getCellTypeEnum());
-		assertEquals(42.0, result.getNumberValue(), 0.0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
deleted file mode 100644
index a069190..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.ptg.AddPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.BoolPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.LessEqualPtg;
-import org.apache.poi.ss.formula.ptg.LessThanPtg;
-import org.apache.poi.ss.formula.ptg.MultiplyPtg;
-import org.apache.poi.ss.formula.ptg.NotEqualPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-
-/**
- * Tests <tt>FormulaParser</tt> specifically with respect to IF() functions
- */
-public final class TestFormulaParserIf extends TestCase {
-	private static Ptg[] parseFormula(String formula) {
-		return TestFormulaParser.parseFormula(formula);
-	}
-
-	private static Ptg[] confirmTokenClasses(String formula, Class<?>[] expectedClasses) {
-		return TestFormulaParser.confirmTokenClasses(formula, expectedClasses);
-	}
-
-	private static void confirmAttrData(Ptg[] ptgs, int i, int expectedData) {
-		Ptg ptg = ptgs[i];
-		if (!(ptg instanceof AttrPtg)) {
-			throw new AssertionFailedError("Token[" + i + "] was not AttrPtg as expected");
-		}
-		AttrPtg attrPtg = (AttrPtg) ptg;
-		assertEquals(expectedData, attrPtg.getData());
-	}
-
-	public void testSimpleIf() {
-
-		Class<?>[] expClss;
-
-		expClss = new Class[] {
-				RefPtg.class,
-				AttrPtg.class, // tAttrIf
-				IntPtg.class,
-				AttrPtg.class, // tAttrSkip
-				IntPtg.class,
-				AttrPtg.class, // tAttrSkip
-				FuncVarPtg.class,
-		};
-
-		Ptg[] ptgs = confirmTokenClasses("if(A1,1,2)", expClss);
-
-		confirmAttrData(ptgs, 1, 7);
-		confirmAttrData(ptgs, 3, 10);
-		confirmAttrData(ptgs, 5, 3);
-	}
-
-	public void testSimpleIfNoFalseParam() {
-
-		Class<?>[] expClss;
-
-		expClss = new Class[] {
-				RefPtg.class,
-				AttrPtg.class, // tAttrIf
-				RefPtg.class,
-				AttrPtg.class, // tAttrSkip
-				FuncVarPtg.class,
-		};
-
-		Ptg[] ptgs = confirmTokenClasses("if(A1,B1)", expClss);
-
-		confirmAttrData(ptgs, 1, 9);
-		confirmAttrData(ptgs, 3, 3);
-	}
-
-	public void testIfWithLargeParams() {
-
-		Class<?>[] expClss;
-
-		expClss = new Class[] {
-				RefPtg.class,
-				AttrPtg.class, // tAttrIf
-
-				RefPtg.class,
-				IntPtg.class,
-				MultiplyPtg.class,
-				RefPtg.class,
-				IntPtg.class,
-				AddPtg.class,
-				FuncPtg.class,
-				AttrPtg.class, // tAttrSkip
-
-				RefPtg.class,
-				RefPtg.class,
-				FuncPtg.class,
-
-				AttrPtg.class, // tAttrSkip
-				FuncVarPtg.class,
-		};
-
-		Ptg[] ptgs = confirmTokenClasses("if(A1,round(B1*100,C1+2),round(B1,C1))", expClss);
-
-		confirmAttrData(ptgs, 1, 25);
-		confirmAttrData(ptgs, 9, 20);
-		confirmAttrData(ptgs, 13, 3);
-	}
-
-	public void testNestedIf() {
-
-		Class<?>[] expClss;
-
-		expClss = new Class[] {
-
-				RefPtg.class,
-				AttrPtg.class,	  // A tAttrIf
-				RefPtg.class,
-				AttrPtg.class,    //   B tAttrIf
-				IntPtg.class,
-				AttrPtg.class,    //   B tAttrSkip
-				IntPtg.class,
-				AttrPtg.class,    //   B tAttrSkip
-				FuncVarPtg.class,
-				AttrPtg.class,    // A tAttrSkip
-				RefPtg.class,
-				AttrPtg.class,    //   C tAttrIf
-				IntPtg.class,
-				AttrPtg.class,    //   C tAttrSkip
-				IntPtg.class,
-				AttrPtg.class,    //   C tAttrSkip
-				FuncVarPtg.class,
-				AttrPtg.class,    // A tAttrSkip
-				FuncVarPtg.class,
-		};
-
-		Ptg[] ptgs = confirmTokenClasses("if(A1,if(B1,1,2),if(C1,3,4))", expClss);
-		confirmAttrData(ptgs, 1, 31);
-		confirmAttrData(ptgs, 3, 7);
-		confirmAttrData(ptgs, 5, 10);
-		confirmAttrData(ptgs, 7, 3);
-		confirmAttrData(ptgs, 9, 34);
-		confirmAttrData(ptgs, 11, 7);
-		confirmAttrData(ptgs, 13, 10);
-		confirmAttrData(ptgs, 15, 3);
-		confirmAttrData(ptgs, 17, 3);
-	}
-
-	public void testEmbeddedIf() {
-		Ptg[] ptgs = parseFormula("IF(3>=1,\"*\",IF(4<>1,\"first\",\"second\"))");
-		assertEquals(17, ptgs.length);
-
-		assertEquals("6th Ptg is not a goto (Attr) ptg",AttrPtg.class,ptgs[5].getClass());
-		assertEquals("9th Ptg is not a not equal ptg",NotEqualPtg.class,ptgs[8].getClass());
-		assertEquals("15th Ptg is not the inner IF variable function ptg",FuncVarPtg.class,ptgs[14].getClass());
-	}
-
-
-	public void testSimpleLogical() {
-	 Ptg[] ptgs = parseFormula("IF(A1<A2,B1,B2)");
-	 assertEquals(9, ptgs.length);
-	 assertEquals("3rd Ptg is less than", LessThanPtg.class, ptgs[2].getClass());
-	}
-
-	public void testParenIf() {
-		Ptg[] ptgs = parseFormula("IF((A1+A2)<=3,\"yes\",\"no\")");
-		assertEquals(12, ptgs.length);
-		assertEquals("6th Ptg is less than equal",LessEqualPtg.class,ptgs[5].getClass());
-		assertEquals("11th Ptg is not a goto (Attr) ptg",AttrPtg.class,ptgs[10].getClass());
-	}
-	public void testYN() {
-		Ptg[] ptgs = parseFormula("IF(TRUE,\"Y\",\"N\")");
-		assertEquals(7, ptgs.length);
-
-		BoolPtg flag  = (BoolPtg) ptgs[0];
-		AttrPtg funif = (AttrPtg) ptgs[1];
-		StringPtg y = (StringPtg) ptgs[2];
-		AttrPtg goto1 = (AttrPtg) ptgs[3];
-		StringPtg n = (StringPtg) ptgs[4];
-
-
-		assertEquals(true, flag.getValue());
-		assertEquals("Y", y.getValue());
-		assertEquals("N", n.getValue());
-		assertEquals("IF", funif.toFormulaString());
-		assertTrue("tAttrSkip ptg exists", goto1.isSkip());
-	}
-	/**
-	 * Make sure the ptgs are generated properly with two functions embedded
-	 *
-	 */
-	public void testNestedFunctionIf() {
-		Ptg[] ptgs = parseFormula("IF(A1=B1,AVERAGE(A1:B1),AVERAGE(A2:B2))");
-		assertEquals(11, ptgs.length);
-
-		assertTrue("IF Attr set correctly", (ptgs[3] instanceof AttrPtg));
-		AttrPtg ifFunc = (AttrPtg)ptgs[3];
-		assertTrue("It is not an if", ifFunc.isOptimizedIf());
-
-		assertTrue("Average Function set correctly", (ptgs[5] instanceof FuncVarPtg));
-	}
-
-	public void testIfSingleCondition(){
-		Ptg[] ptgs = parseFormula("IF(1=1,10)");
-		assertEquals(7, ptgs.length);
-
-		assertTrue("IF Attr set correctly", (ptgs[3] instanceof AttrPtg));
-		AttrPtg ifFunc = (AttrPtg)ptgs[3];
-		assertTrue("It is not an if", ifFunc.isOptimizedIf());
-
-		assertTrue("Single Value is not an IntPtg", (ptgs[4] instanceof IntPtg));
-		IntPtg intPtg = (IntPtg)ptgs[4];
-		assertEquals("Result", (short)10, intPtg.getValue());
-
-		assertTrue("Ptg is not a Variable Function", (ptgs[6] instanceof FuncVarPtg));
-		FuncVarPtg funcPtg = (FuncVarPtg)ptgs[6];
-		assertEquals("Arguments", 2, funcPtg.getNumberOfOperands());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
deleted file mode 100644
index 84ef3c4..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-
-/**
- * @author Evgeniy Berlog
- * @date 12.06.12
- */
-public class TestHSSFAnchor extends TestCase {
-
-    public void testDefaultValues(){
-        HSSFClientAnchor clientAnchor = new HSSFClientAnchor();
-        assertEquals(clientAnchor.getAnchorType(), AnchorType.MOVE_AND_RESIZE);
-        assertEquals(clientAnchor.getCol1(), 0);
-        assertEquals(clientAnchor.getCol2(), 0);
-        assertEquals(clientAnchor.getDx1(), 0);
-        assertEquals(clientAnchor.getDx2(), 0);
-        assertEquals(clientAnchor.getDy1(), 0);
-        assertEquals(clientAnchor.getDy2(), 0);
-        assertEquals(clientAnchor.getRow1(), 0);
-        assertEquals(clientAnchor.getRow2(), 0);
-
-        clientAnchor = new HSSFClientAnchor(new EscherClientAnchorRecord());
-        assertEquals(clientAnchor.getAnchorType(), AnchorType.MOVE_AND_RESIZE);
-        assertEquals(clientAnchor.getCol1(), 0);
-        assertEquals(clientAnchor.getCol2(), 0);
-        assertEquals(clientAnchor.getDx1(), 0);
-        assertEquals(clientAnchor.getDx2(), 0);
-        assertEquals(clientAnchor.getDy1(), 0);
-        assertEquals(clientAnchor.getDy2(), 0);
-        assertEquals(clientAnchor.getRow1(), 0);
-        assertEquals(clientAnchor.getRow2(), 0);
-
-        HSSFChildAnchor childAnchor = new HSSFChildAnchor();
-        assertEquals(childAnchor.getDx1(), 0);
-        assertEquals(childAnchor.getDx2(), 0);
-        assertEquals(childAnchor.getDy1(), 0);
-        assertEquals(childAnchor.getDy2(), 0);
-
-        childAnchor = new HSSFChildAnchor(new EscherChildAnchorRecord());
-        assertEquals(childAnchor.getDx1(), 0);
-        assertEquals(childAnchor.getDx2(), 0);
-        assertEquals(childAnchor.getDy1(), 0);
-        assertEquals(childAnchor.getDy2(), 0);
-    }
-
-    public void testCorrectOrderInSpContainer(){
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("pictures");
-        HSSFPatriarch drawing = sheet.getDrawingPatriarch();
-
-        HSSFSimpleShape rectangle = (HSSFSimpleShape) drawing.getChildren().get(0);
-
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(0).getRecordId(), EscherSpRecord.RECORD_ID);
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(1).getRecordId(), EscherOptRecord.RECORD_ID);
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(3).getRecordId(), EscherClientDataRecord.RECORD_ID);
-
-        rectangle.setAnchor(new HSSFClientAnchor());
-
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(0).getRecordId(), EscherSpRecord.RECORD_ID);
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(1).getRecordId(), EscherOptRecord.RECORD_ID);
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);
-        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(3).getRecordId(), EscherClientDataRecord.RECORD_ID);
-    }
-
-    public void testCreateClientAnchorFromContainer(){
-        EscherContainerRecord container = new EscherContainerRecord();
-        EscherClientAnchorRecord escher = new EscherClientAnchorRecord();
-        escher.setFlag((short) 3);
-        escher.setCol1((short)11);
-        escher.setCol2((short)12);
-        escher.setRow1((short)13);
-        escher.setRow2((short) 14);
-        escher.setDx1((short) 15);
-        escher.setDx2((short) 16);
-        escher.setDy1((short) 17);
-        escher.setDy2((short) 18);
-        container.addChildRecord(escher);
-
-        HSSFClientAnchor anchor = (HSSFClientAnchor) HSSFAnchor.createAnchorFromEscher(container);
-        assertEquals(anchor.getCol1(), 11);
-        assertEquals(escher.getCol1(), 11);
-        assertEquals(anchor.getCol2(), 12);
-        assertEquals(escher.getCol2(), 12);
-        assertEquals(anchor.getRow1(), 13);
-        assertEquals(escher.getRow1(), 13);
-        assertEquals(anchor.getRow2(), 14);
-        assertEquals(escher.getRow2(), 14);
-        assertEquals(anchor.getDx1(), 15);
-        assertEquals(escher.getDx1(), 15);
-        assertEquals(anchor.getDx2(), 16);
-        assertEquals(escher.getDx2(), 16);
-        assertEquals(anchor.getDy1(), 17);
-        assertEquals(escher.getDy1(), 17);
-        assertEquals(anchor.getDy2(), 18);
-        assertEquals(escher.getDy2(), 18);
-    }
-
-    public void testCreateChildAnchorFromContainer(){
-        EscherContainerRecord container = new EscherContainerRecord();
-        EscherChildAnchorRecord escher = new EscherChildAnchorRecord();
-        escher.setDx1((short) 15);
-        escher.setDx2((short) 16);
-        escher.setDy1((short) 17);
-        escher.setDy2((short) 18);
-        container.addChildRecord(escher);
-
-        HSSFChildAnchor anchor = (HSSFChildAnchor) HSSFAnchor.createAnchorFromEscher(container);
-        assertEquals(anchor.getDx1(), 15);
-        assertEquals(escher.getDx1(), 15);
-        assertEquals(anchor.getDx2(), 16);
-        assertEquals(escher.getDx2(), 16);
-        assertEquals(anchor.getDy1(), 17);
-        assertEquals(escher.getDy1(), 17);
-        assertEquals(anchor.getDy2(), 18);
-        assertEquals(escher.getDy2(), 18);
-    }
-
-    public void testShapeEscherMustHaveAnchorRecord(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-
-        HSSFPatriarch drawing = sheet.createDrawingPatriarch();
-        HSSFClientAnchor anchor = new HSSFClientAnchor(10, 10, 200, 200, (short)2, 2, (short)15, 15);
-        anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE);
-
-        HSSFSimpleShape rectangle = drawing.createSimpleShape(anchor);
-        rectangle.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);
-
-        rectangle.setAnchor(anchor);
-
-        assertNotNull(HSSFTestHelper.getEscherAnchor(anchor));
-        assertNotNull(HSSFTestHelper.getEscherContainer(rectangle));
-        assertTrue(HSSFTestHelper.getEscherAnchor(anchor).equals(HSSFTestHelper.getEscherContainer(rectangle).getChildById(EscherClientAnchorRecord.RECORD_ID)));
-    }
-
-    public void testClientAnchorFromEscher(){
-        EscherClientAnchorRecord escher = new EscherClientAnchorRecord();
-        escher.setCol1((short)11);
-        escher.setCol2((short)12);
-        escher.setRow1((short)13);
-        escher.setRow2((short) 14);
-        escher.setDx1((short) 15);
-        escher.setDx2((short) 16);
-        escher.setDy1((short) 17);
-        escher.setDy2((short) 18);
-
-        HSSFClientAnchor anchor = new HSSFClientAnchor(escher);
-        assertEquals(anchor.getCol1(), 11);
-        assertEquals(escher.getCol1(), 11);
-        assertEquals(anchor.getCol2(), 12);
-        assertEquals(escher.getCol2(), 12);
-        assertEquals(anchor.getRow1(), 13);
-        assertEquals(escher.getRow1(), 13);
-        assertEquals(anchor.getRow2(), 14);
-        assertEquals(escher.getRow2(), 14);
-        assertEquals(anchor.getDx1(), 15);
-        assertEquals(escher.getDx1(), 15);
-        assertEquals(anchor.getDx2(), 16);
-        assertEquals(escher.getDx2(), 16);
-        assertEquals(anchor.getDy1(), 17);
-        assertEquals(escher.getDy1(), 17);
-        assertEquals(anchor.getDy2(), 18);
-        assertEquals(escher.getDy2(), 18);
-    }
-
-    public void testClientAnchorFromScratch(){
-        HSSFClientAnchor anchor = new HSSFClientAnchor();
-        EscherClientAnchorRecord escher = (EscherClientAnchorRecord) HSSFTestHelper.getEscherAnchor(anchor);
-        anchor.setAnchor((short)11, 12, 13, 14, (short)15, 16, 17, 18);
-
-        assertEquals(anchor.getCol1(), 11);
-        assertEquals(escher.getCol1(), 11);
-        assertEquals(anchor.getCol2(), 15);
-        assertEquals(escher.getCol2(), 15);
-        assertEquals(anchor.getRow1(), 12);
-        assertEquals(escher.getRow1(), 12);
-        assertEquals(anchor.getRow2(), 16);
-        assertEquals(escher.getRow2(), 16);
-        assertEquals(anchor.getDx1(), 13);
-        assertEquals(escher.getDx1(), 13);
-        assertEquals(anchor.getDx2(), 17);
-        assertEquals(escher.getDx2(), 17);
-        assertEquals(anchor.getDy1(), 14);
-        assertEquals(escher.getDy1(), 14);
-        assertEquals(anchor.getDy2(), 18);
-        assertEquals(escher.getDy2(), 18);
-
-        anchor.setCol1(111);
-        assertEquals(anchor.getCol1(), 111);
-        assertEquals(escher.getCol1(), 111);
-        anchor.setCol2(112);
-        assertEquals(anchor.getCol2(), 112);
-        assertEquals(escher.getCol2(), 112);
-        anchor.setRow1(113);
-        assertEquals(anchor.getRow1(), 113);
-        assertEquals(escher.getRow1(), 113);
-        anchor.setRow2(114);
-        assertEquals(anchor.getRow2(), 114);
-        assertEquals(escher.getRow2(), 114);
-        anchor.setDx1(115);
-        assertEquals(anchor.getDx1(), 115);
-        assertEquals(escher.getDx1(), 115);
-        anchor.setDx2(116);
-        assertEquals(anchor.getDx2(), 116);
-        assertEquals(escher.getDx2(), 116);
-        anchor.setDy1(117);
-        assertEquals(anchor.getDy1(), 117);
-        assertEquals(escher.getDy1(), 117);
-        anchor.setDy2(118);
-        assertEquals(anchor.getDy2(), 118);
-        assertEquals(escher.getDy2(), 118);
-    }
-
-    public void testChildAnchorFromEscher(){
-        EscherChildAnchorRecord escher = new EscherChildAnchorRecord();
-        escher.setDx1((short) 15);
-        escher.setDx2((short) 16);
-        escher.setDy1((short) 17);
-        escher.setDy2((short) 18);
-
-        HSSFChildAnchor anchor = new HSSFChildAnchor(escher);
-        assertEquals(anchor.getDx1(), 15);
-        assertEquals(escher.getDx1(), 15);
-        assertEquals(anchor.getDx2(), 16);
-        assertEquals(escher.getDx2(), 16);
-        assertEquals(anchor.getDy1(), 17);
-        assertEquals(escher.getDy1(), 17);
-        assertEquals(anchor.getDy2(), 18);
-        assertEquals(escher.getDy2(), 18);
-    }
-
-    public void testChildAnchorFromScratch(){
-        HSSFChildAnchor anchor = new HSSFChildAnchor();
-        EscherChildAnchorRecord escher = (EscherChildAnchorRecord) HSSFTestHelper.getEscherAnchor(anchor);
-        anchor.setAnchor(11, 12, 13, 14);
-
-        assertEquals(anchor.getDx1(), 11);
-        assertEquals(escher.getDx1(), 11);
-        assertEquals(anchor.getDx2(), 13);
-        assertEquals(escher.getDx2(), 13);
-        assertEquals(anchor.getDy1(), 12);
-        assertEquals(escher.getDy1(), 12);
-        assertEquals(anchor.getDy2(), 14);
-        assertEquals(escher.getDy2(), 14);
-
-        anchor.setDx1(115);
-        assertEquals(anchor.getDx1(), 115);
-        assertEquals(escher.getDx1(), 115);
-        anchor.setDx2(116);
-        assertEquals(anchor.getDx2(), 116);
-        assertEquals(escher.getDx2(), 116);
-        anchor.setDy1(117);
-        assertEquals(anchor.getDy1(), 117);
-        assertEquals(escher.getDy1(), 117);
-        anchor.setDy2(118);
-        assertEquals(anchor.getDy2(), 118);
-        assertEquals(escher.getDy2(), 118);
-    }
-
-    public void testEqualsToSelf(){
-        HSSFClientAnchor clientAnchor = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
-        assertEquals(clientAnchor, clientAnchor);
-
-        HSSFChildAnchor childAnchor = new HSSFChildAnchor(0, 1, 2, 3);
-        assertEquals(childAnchor, childAnchor);
-    }
-
-    public void testPassIncompatibleTypeIsFalse(){
-        HSSFClientAnchor clientAnchor = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
-        assertNotSame(clientAnchor, "wrongType");
-
-        HSSFChildAnchor childAnchor = new HSSFChildAnchor(0, 1, 2, 3);
-        assertNotSame(childAnchor, "wrongType");
-    }
-
-    public void testNullReferenceIsFalse() {
-        HSSFClientAnchor clientAnchor = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
-        assertFalse("Passing null to equals should return false", clientAnchor.equals(null));
-
-        HSSFChildAnchor childAnchor = new HSSFChildAnchor(0, 1, 2, 3);
-        assertFalse("Passing null to equals should return false", childAnchor.equals(null));
-    }
-
-    public void testEqualsIsReflexiveIsSymmetric() {
-        HSSFClientAnchor clientAnchor1 = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
-        HSSFClientAnchor clientAnchor2 = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
-
-        assertTrue(clientAnchor1.equals(clientAnchor2));
-        assertTrue(clientAnchor1.equals(clientAnchor2));
-
-        HSSFChildAnchor childAnchor1 = new HSSFChildAnchor(0, 1, 2, 3);
-        HSSFChildAnchor childAnchor2 = new HSSFChildAnchor(0, 1, 2, 3);
-
-        assertTrue(childAnchor1.equals(childAnchor2));
-        assertTrue(childAnchor2.equals(childAnchor1));
-    }
-
-    public void testEqualsValues(){
-        HSSFClientAnchor clientAnchor1 = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
-        HSSFClientAnchor clientAnchor2 = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setDx1(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setDx1(0);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setDy1(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setDy1(1);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setDx2(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setDx2(2);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setDy2(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setDy2(3);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setCol1(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setCol1(4);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setRow1(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setRow1(5);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setCol2(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setCol2(6);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setRow2(10);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setRow2(7);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        clientAnchor2.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-        assertNotSame(clientAnchor1, clientAnchor2);
-        clientAnchor2.setAnchorType(AnchorType.MOVE_AND_RESIZE);
-        assertEquals(clientAnchor1, clientAnchor2);
-
-        HSSFChildAnchor childAnchor1 = new HSSFChildAnchor(0, 1, 2, 3);
-        HSSFChildAnchor childAnchor2 = new HSSFChildAnchor(0, 1, 2, 3);
-
-        childAnchor1.setDx1(10);
-        assertNotSame(childAnchor1, childAnchor2);
-        childAnchor1.setDx1(0);
-        assertEquals(childAnchor1, childAnchor2);
-
-        childAnchor2.setDy1(10);
-        assertNotSame(childAnchor1, childAnchor2);
-        childAnchor2.setDy1(1);
-        assertEquals(childAnchor1, childAnchor2);
-
-        childAnchor2.setDx2(10);
-        assertNotSame(childAnchor1, childAnchor2);
-        childAnchor2.setDx2(2);
-        assertEquals(childAnchor1, childAnchor2);
-
-        childAnchor2.setDy2(10);
-        assertNotSame(childAnchor1, childAnchor2);
-        childAnchor2.setDy2(3);
-        assertEquals(childAnchor1, childAnchor2);
-    }
-
-    public void testFlipped(){
-        HSSFChildAnchor child = new HSSFChildAnchor(2,2,1,1);
-        assertEquals(child.isHorizontallyFlipped(), true);
-        assertEquals(child.isVerticallyFlipped(), true);
-        assertEquals(child.getDx1(), 1);
-        assertEquals(child.getDx2(), 2);
-        assertEquals(child.getDy1(), 1);
-        assertEquals(child.getDy2(), 2);
-
-        child = new HSSFChildAnchor(3,3,4,4);
-        assertEquals(child.isHorizontallyFlipped(), false);
-        assertEquals(child.isVerticallyFlipped(), false);
-        assertEquals(child.getDx1(), 3);
-        assertEquals(child.getDx2(), 4);
-        assertEquals(child.getDy1(), 3);
-        assertEquals(child.getDy2(), 4);
-
-        HSSFClientAnchor client = new HSSFClientAnchor(1,1,1,1, (short)4,4,(short)3,3);
-        assertEquals(client.isVerticallyFlipped(), true);
-        assertEquals(client.isHorizontallyFlipped(), true);
-        assertEquals(client.getCol1(), 3);
-        assertEquals(client.getCol2(), 4);
-        assertEquals(client.getRow1(), 3);
-        assertEquals(client.getRow2(), 4);
-
-        client = new HSSFClientAnchor(1,1,1,1, (short)5,5,(short)6,6);
-        assertEquals(client.isVerticallyFlipped(), false);
-        assertEquals(client.isHorizontallyFlipped(), false);
-        assertEquals(client.getCol1(), 5);
-        assertEquals(client.getCol2(), 6);
-        assertEquals(client.getRow1(), 5);
-        assertEquals(client.getRow2(), 6);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
deleted file mode 100644
index 4f25a1d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.ExternalNameRecord;
-import org.apache.poi.hssf.record.NameCommentRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-
-/**
- * Tests for {@link LinkTable}
- *
- * @author Josh Micich
- */
-public final class TestLinkTable extends TestCase {
-
-	/**
-	 * The example file attached to bugzilla 45046 is a clear example of Name records being present
-	 * without an External Book (SupBook) record.  Excel has no trouble reading this file.<br/>
-	 * TODO get OOO documentation updated to reflect this (that EXTERNALBOOK is optional).
-	 *
-	 * It's not clear what exact steps need to be taken in Excel to create such a workbook
-	 */
-	public void testLinkTableWithoutExternalBookRecord_bug45046() {
-		HSSFWorkbook wb;
-
-		try {
-			wb = HSSFTestDataSamples.openSampleWorkbook("ex45046-21984.xls");
-		} catch (RuntimeException e) {
-			if ("DEFINEDNAME is part of LinkTable".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 45046 b");
-			}
-			throw e;
-		}
-		// some other sanity checks
-		assertEquals(3, wb.getNumberOfSheets());
-		String formula = wb.getSheetAt(0).getRow(4).getCell(13).getCellFormula();
-
-		if ("ipcSummenproduktIntern($P5,N$6,$A$9,N$5)".equals(formula)) {
-			// The reported symptom of this bugzilla is an earlier bug (already fixed)
-			throw new AssertionFailedError("Identified bug 41726");
-			// This is observable in version 3.0
-		}
-
-		assertEquals("ipcSummenproduktIntern($C5,N$2,$A$9,N$1)", formula);
-	}
-
-	public void testMultipleExternSheetRecords_bug45698() {
-		HSSFWorkbook wb;
-
-		try {
-			wb = HSSFTestDataSamples.openSampleWorkbook("ex45698-22488.xls");
-		} catch (RuntimeException e) {
-			if ("Extern sheet is part of LinkTable".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 45698");
-			}
-			throw e;
-		}
-		// some other sanity checks
-		assertEquals(7, wb.getNumberOfSheets());
-	}
-
-	public void testExtraSheetRefs_bug45978() {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex45978-extraLinkTableSheets.xls");
-		/*
-		ex45978-extraLinkTableSheets.xls is a cut-down version of attachment 22561.
-		The original file produces the same error.
-
-		This bug was caused by a combination of invalid sheet indexes in the EXTERNSHEET
-		record, and eager initialisation of the extern sheet references. Note - the workbook
-		has 2 sheets, but the EXTERNSHEET record refers to sheet indexes 0, 1 and 2.
-
-		Offset 0x3954 (14676)
-		recordid = 0x17, size = 32
-		[EXTERNSHEET]
-		   numOfRefs	 = 5
-		refrec		 #0: extBook=0 firstSheet=0 lastSheet=0
-		refrec		 #1: extBook=1 firstSheet=2 lastSheet=2
-		refrec		 #2: extBook=2 firstSheet=1 lastSheet=1
-		refrec		 #3: extBook=0 firstSheet=-1 lastSheet=-1
-		refrec		 #4: extBook=0 firstSheet=1 lastSheet=1
-		[/EXTERNSHEET]
-
-		As it turns out, the formula in question doesn't even use externSheetIndex #1 - it
-		uses #4, which resolves to sheetIndex 1 -> 'Data'.
-
-		It is not clear exactly what externSheetIndex #4 would refer to.  Excel seems to
-		display such a formula as "''!$A2", but then complains of broken link errors.
-		*/
-
-		HSSFCell cell = wb.getSheetAt(0).getRow(1).getCell(1);
-		String cellFormula;
-		try {
-			cellFormula = cell.getCellFormula();
-		} catch (IndexOutOfBoundsException e) {
-			if (e.getMessage().equals("Index: 2, Size: 2")) {
-				throw new AssertionFailedError("Identified bug 45798");
-			}
-			throw e;
-		}
-		assertEquals("Data!$A2", cellFormula);
-	}
-
-	/**
-	 * This problem was visible in POI svn r763332
-	 * when reading the workbook of attachment 23468 from bugzilla 47001
-	 */
-	public void testMissingExternSheetRecord_bug47001b() {
-		
-		Record[] recs = {
-				SupBookRecord.createAddInFunctions(),
-				new SSTRecord(),
-		};
-		List<Record> recList = Arrays.asList(recs);
-		WorkbookRecordList wrl = new WorkbookRecordList();
-		
-		LinkTable lt;
-		try {
-			lt = new LinkTable(recList, 0, wrl, Collections.<String, NameCommentRecord>emptyMap());
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("Expected an EXTERNSHEET record but got (org.apache.poi.hssf.record.SSTRecord)")) {
-				throw new AssertionFailedError("Identified bug 47001b");
-			}
-		
-			throw e;
-		}
-		assertNotNull(lt);
-	}	
-
-	/**
-	 *
-	 */
-	public void testNameCommentRecordBetweenNameRecords() {
-
-		final Record[] recs = {
-        new NameRecord(),
-        new NameCommentRecord("name1", "comment1"),
-        new NameRecord(),
-        new NameCommentRecord("name2", "comment2"),
-
-		};
-		final List<Record> recList = Arrays.asList(recs);
-		final WorkbookRecordList wrl = new WorkbookRecordList();
-		final Map<String, NameCommentRecord> commentRecords = new LinkedHashMap<String, NameCommentRecord>();
-
-		final LinkTable	lt = new LinkTable(recList, 0, wrl, commentRecords);
-		assertNotNull(lt);
-
-		assertEquals(2, commentRecords.size());
-    assertTrue(recs[1] == commentRecords.get("name1")); //== is intentionally not .equals()!
-    assertTrue(recs[3] == commentRecords.get("name2")); //== is intentionally not .equals()!
-
-    assertEquals(2, lt.getNumNames());
-	}
-
-    public void testAddNameX(){
-        WorkbookRecordList wrl = new WorkbookRecordList();
-        wrl.add(0, new BOFRecord());
-        wrl.add(1, new CountryRecord());
-        wrl.add(2, EOFRecord.instance);
-
-        int numberOfSheets = 3;
-        LinkTable tbl = new LinkTable(numberOfSheets, wrl);
-        // creation of a new LinkTable insert two new records: SupBookRecord followed by ExternSheetRecord
-        // assure they are in place:
-        //    [BOFRecord]
-        //    [CountryRecord]
-        //    [SUPBOOK Internal References  nSheets= 3]
-        //    [EXTERNSHEET]
-        //    [EOFRecord]
-
-        assertEquals(5, wrl.getRecords().size());
-        assertTrue(wrl.get(2) instanceof SupBookRecord);
-        SupBookRecord sup1 = (SupBookRecord)wrl.get(2);
-        assertEquals(numberOfSheets, sup1.getNumberOfSheets());
-        assertTrue(wrl.get(3) instanceof ExternSheetRecord);
-        ExternSheetRecord extSheet = (ExternSheetRecord)wrl.get(3);
-        assertEquals(0, extSheet.getNumOfRefs());
-
-        assertNull(tbl.getNameXPtg("ISODD", -1));
-        assertEquals(5, wrl.getRecords().size()); //still have five records
-
-        NameXPtg namex1 = tbl.addNameXPtg("ISODD");  // adds two new rercords
-        assertEquals(0, namex1.getSheetRefIndex());
-        assertEquals(0, namex1.getNameIndex());
-        assertEquals(namex1.toString(), tbl.getNameXPtg("ISODD", -1).toString());
-        
-        // Can only find on the right sheet ref, if restricting
-        assertEquals(namex1.toString(), tbl.getNameXPtg("ISODD", 0).toString());
-        assertNull(tbl.getNameXPtg("ISODD", 1));
-        assertNull(tbl.getNameXPtg("ISODD", 2));
-        
-        // assure they are in place:
-        //    [BOFRecord]
-        //    [CountryRecord]
-        //    [SUPBOOK Internal References  nSheets= 3]
-        //    [SUPBOOK Add-In Functions nSheets= 1]
-        //    [EXTERNALNAME .name    = ISODD]
-        //    [EXTERNSHEET]
-        //    [EOFRecord]
-
-        assertEquals(7, wrl.getRecords().size());
-        assertTrue(wrl.get(3) instanceof SupBookRecord);
-        SupBookRecord sup2 = (SupBookRecord)wrl.get(3);
-        assertTrue(sup2.isAddInFunctions());
-        assertTrue(wrl.get(4) instanceof ExternalNameRecord);
-        ExternalNameRecord ext1 = (ExternalNameRecord)wrl.get(4);
-        assertEquals("ISODD", ext1.getText());
-        assertTrue(wrl.get(5) instanceof ExternSheetRecord);
-        assertEquals(1, extSheet.getNumOfRefs());
-
-        //check that
-        assertEquals(0, tbl.resolveNameXIx(namex1.getSheetRefIndex(), namex1.getNameIndex()));
-        assertEquals("ISODD", tbl.resolveNameXText(namex1.getSheetRefIndex(), namex1.getNameIndex(), null));
-
-        assertNull(tbl.getNameXPtg("ISEVEN", -1));
-        NameXPtg namex2 = tbl.addNameXPtg("ISEVEN");  // adds two new rercords
-        assertEquals(0, namex2.getSheetRefIndex());
-        assertEquals(1, namex2.getNameIndex());  // name index increased by one
-        assertEquals(namex2.toString(), tbl.getNameXPtg("ISEVEN", -1).toString());
-        assertEquals(8, wrl.getRecords().size());
-        // assure they are in place:
-        //    [BOFRecord]
-        //    [CountryRecord]
-        //    [SUPBOOK Internal References  nSheets= 3]
-        //    [SUPBOOK Add-In Functions nSheets= 1]
-        //    [EXTERNALNAME .name    = ISODD]
-        //    [EXTERNALNAME .name    = ISEVEN]
-        //    [EXTERNSHEET]
-        //    [EOFRecord]
-        assertTrue(wrl.get(3) instanceof SupBookRecord);
-        assertTrue(wrl.get(4) instanceof ExternalNameRecord);
-        assertTrue(wrl.get(5) instanceof ExternalNameRecord);
-        assertEquals("ISODD", ((ExternalNameRecord)wrl.get(4)).getText());
-        assertEquals("ISEVEN", ((ExternalNameRecord)wrl.get(5)).getText());
-        assertTrue(wrl.get(6) instanceof ExternSheetRecord);
-        assertTrue(wrl.get(7) instanceof EOFRecord);
-
-        assertEquals(0, tbl.resolveNameXIx(namex2.getSheetRefIndex(), namex2.getNameIndex()));
-        assertEquals("ISEVEN", tbl.resolveNameXText(namex2.getSheetRefIndex(), namex2.getNameIndex(), null));
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
deleted file mode 100644
index 467186c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests specific formula examples in <tt>OperandClassTransformer</tt>.
- * 
- * @author Josh Micich
- */
-public final class TestOperandClassTransformer extends TestCase {
-
-	private static Ptg[] parseFormula(String formula) {
-		Ptg[] result = HSSFFormulaParser.parse(formula, (HSSFWorkbook)null);
-		assertNotNull("Ptg array should not be null", result);
-		return result;
-	}
-	
-	public void testMdeterm() {
-		String formula = "MDETERM(ABS(A1))";
-		Ptg[] ptgs = parseFormula(formula);
-
-		confirmTokenClass(ptgs, 0, Ptg.CLASS_ARRAY);
-		confirmFuncClass(ptgs, 1, "ABS", Ptg.CLASS_ARRAY);
-		confirmFuncClass(ptgs, 2, "MDETERM", Ptg.CLASS_VALUE);
-	}
-
-	/**
-	 * In the example: <code>INDEX(PI(),1)</code>, Excel encodes PI() as 'array'.  It is not clear
-	 * what rule justifies this. POI currently encodes it as 'value' which Excel(2007) seems to 
-	 * tolerate. Changing the metadata for INDEX to have first parameter as 'array' class breaks 
-	 * other formulas involving INDEX.  It seems like a special case needs to be made.  Perhaps an 
-	 * important observation is that INDEX is one of very few functions that returns 'reference' type.
-	 * 
-	 * This test has been added but disabled in order to document this issue.
-	 */
-	public void DISABLED_testIndexPi1() {
-		String formula = "INDEX(PI(),1)";
-		Ptg[] ptgs = parseFormula(formula);
-
-		confirmFuncClass(ptgs, 1, "PI", Ptg.CLASS_ARRAY); // fails as of POI 3.1
-		confirmFuncClass(ptgs, 2, "INDEX", Ptg.CLASS_VALUE);
-	}
-
-	/**
-	 * Even though count expects args of type R, because A1 is a direct operand of a
-	 * value operator it must get type V
-	 */
-	public void testDirectOperandOfValueOperator() {
-		String formula = "COUNT(A1*1)";
-		Ptg[] ptgs = parseFormula(formula);
-		if (ptgs[0].getPtgClass() == Ptg.CLASS_REF) {
-			throw new AssertionFailedError("Identified bug 45348");
-		}
-
-		confirmTokenClass(ptgs, 0, Ptg.CLASS_VALUE);
-		confirmTokenClass(ptgs, 3, Ptg.CLASS_VALUE);
-	}
-	
-	/**
-	 * A cell ref passed to a function expecting type V should be converted to type V
-	 */
-	public void testRtoV() {
-
-		String formula = "lookup(A1, A3:A52, B3:B52)";
-		Ptg[] ptgs = parseFormula(formula);
-		confirmTokenClass(ptgs, 0, Ptg.CLASS_VALUE);
-	}
-	
-	public void testComplexIRR_bug45041() {
-		String formula = "(1+IRR(SUMIF(A:A,ROW(INDIRECT(MIN(A:A)&\":\"&MAX(A:A))),B:B),0))^365-1";
-		Ptg[] ptgs = parseFormula(formula);
-
-		FuncVarPtg rowFunc = (FuncVarPtg) ptgs[10];
-		FuncVarPtg sumifFunc = (FuncVarPtg) ptgs[12];
-		assertEquals("ROW", rowFunc.getName());
-		assertEquals("SUMIF", sumifFunc.getName());
-
-		if (rowFunc.getPtgClass() == Ptg.CLASS_VALUE || sumifFunc.getPtgClass() == Ptg.CLASS_VALUE) {
-			throw new AssertionFailedError("Identified bug 45041");
-		}
-		confirmTokenClass(ptgs, 1, Ptg.CLASS_REF);
-		confirmTokenClass(ptgs, 2, Ptg.CLASS_REF);
-		confirmFuncClass(ptgs, 3, "MIN", Ptg.CLASS_VALUE);
-		confirmTokenClass(ptgs, 6, Ptg.CLASS_REF);
-		confirmFuncClass(ptgs, 7, "MAX", Ptg.CLASS_VALUE);
-		confirmFuncClass(ptgs, 9, "INDIRECT", Ptg.CLASS_REF);
-		confirmFuncClass(ptgs, 10, "ROW", Ptg.CLASS_ARRAY);
-		confirmTokenClass(ptgs, 11, Ptg.CLASS_REF);
-		confirmFuncClass(ptgs, 12, "SUMIF", Ptg.CLASS_ARRAY);
-		confirmFuncClass(ptgs, 14, "IRR", Ptg.CLASS_VALUE);
-	}
-
-	private void confirmFuncClass(Ptg[] ptgs, int i, String expectedFunctionName, byte operandClass) {
-		confirmTokenClass(ptgs, i, operandClass);
-		AbstractFunctionPtg afp = (AbstractFunctionPtg) ptgs[i];
-		assertEquals(expectedFunctionName, afp.getName());
-	}
-
-	private void confirmTokenClass(Ptg[] ptgs, int i, byte operandClass) {
-		Ptg ptg = ptgs[i];
-		if (ptg.isBaseToken()) {
-			throw new AssertionFailedError("ptg[" + i + "] is a base token");
-		}
-		if (operandClass != ptg.getPtgClass()) {
-			throw new AssertionFailedError("Wrong operand class for ptg ("
-					+ ptg.toString() + "). Expected " + getOperandClassName(operandClass)
-					+ " but got " + getOperandClassName(ptg.getPtgClass()));
-		}
-	}
-
-	private static String getOperandClassName(byte ptgClass) {
-		switch (ptgClass) {
-			case Ptg.CLASS_REF:
-				return "R";
-			case Ptg.CLASS_VALUE:
-				return "V";
-			case Ptg.CLASS_ARRAY:
-				return "A";
-		}
-		throw new RuntimeException("Unknown operand class (" + ptgClass + ")");
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java
deleted file mode 100644
index 4869d87..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.FormulaExtractor;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.CellType;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests 'operand class' transformation performed by
- * <tt>OperandClassTransformer</tt> by comparing its results with those
- * directly produced by Excel (in a sample spreadsheet).
- */
-@RunWith(Parameterized.class)
-public final class TestRVA {
-
-	private static final String NEW_LINE = System.getProperty("line.separator");
-	private static NPOIFSFileSystem poifs;
-    private static HSSFWorkbook workbook;
-    private static HSSFSheet sheet;
-
-	
-    @Parameter(value = 0)
-    public HSSFCell formulaCell;
-    @Parameter(value = 1)
-    public String formula;
-
-    @AfterClass
-    public static void closeResource() throws Exception {
-        workbook.close();
-        poifs.close();
-    }
-
-    @Parameters(name="{1}")
-    public static Collection<Object[]> data() throws Exception {
-        poifs = new NPOIFSFileSystem(HSSFTestDataSamples.getSampleFile("testRVA.xls"), true);
-        workbook = new HSSFWorkbook(poifs);
-        sheet = workbook.getSheetAt(0);
-
-        List<Object[]> data = new ArrayList<Object[]>(); 
-        
-        for (int rowIdx = 0; true; rowIdx++) {
-            HSSFRow row = sheet.getRow(rowIdx);
-            if (row == null) {
-                break;
-            }
-            HSSFCell cell = row.getCell(0);
-            if (cell == null || cell.getCellTypeEnum() == CellType.BLANK) {
-                break;
-            }
-
-            String formula = cell.getCellFormula();
-            data.add(new Object[]{cell,formula});
-        }
-        
-        return data;
-    }
-	
-    @Test
-	public void confirmCell() {
-		Ptg[] excelPtgs = FormulaExtractor.getPtgs(formulaCell);
-		Ptg[] poiPtgs = HSSFFormulaParser.parse(formula, workbook);
-		int nExcelTokens = excelPtgs.length;
-		int nPoiTokens = poiPtgs.length;
-		if (nExcelTokens != nPoiTokens) {
-			if (nExcelTokens == nPoiTokens + 1 && excelPtgs[0].getClass() == AttrPtg.class) {
-				// compensate for missing tAttrVolatile, which belongs in any formula 
-				// involving OFFSET() et al. POI currently does not insert where required
-				Ptg[] temp = new Ptg[nExcelTokens];
-				temp[0] = excelPtgs[0];
-				System.arraycopy(poiPtgs, 0, temp, 1, nPoiTokens);
-				poiPtgs = temp;
-			} else {
-				fail("Expected " + nExcelTokens + " tokens but got " + nPoiTokens);
-			}
-		}
-		boolean hasMismatch = false;
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < nExcelTokens; i++) {
-			Ptg poiPtg = poiPtgs[i];
-			Ptg excelPtg = excelPtgs[i];
-			if (excelPtg.getClass() != poiPtg.getClass()) {
-				hasMismatch = true;
-				sb.append("  mismatch token type[" + i + "] " + getShortClassName(excelPtg) + " "
-						+ excelPtg.getRVAType() + " - " + getShortClassName(poiPtg) + " "
-						+ poiPtg.getRVAType());
-				sb.append(NEW_LINE);
-				continue;
-			}
-			if (poiPtg.isBaseToken()) {
-				continue;
-			}
-			sb.append("  token[" + i + "] " + excelPtg.toString() + " "
-					+ excelPtg.getRVAType());
-
-			if (excelPtg.getPtgClass() != poiPtg.getPtgClass()) {
-				hasMismatch = true;
-				sb.append(" - was " + poiPtg.getRVAType());
-			}
-			sb.append(NEW_LINE);
-		}
-//		if (false) { // set 'true' to see trace of RVA values
-//			System.out.println(formulaCell.getRowIndex() + " " + formula);
-//			System.out.println(sb.toString());
-//		}
-		assertFalse(hasMismatch);
-	}
-
-	private String getShortClassName(Object o) {
-		String cn = o.getClass().getName();
-		int pos = cn.lastIndexOf('.');
-		return cn.substring(pos + 1);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java
deleted file mode 100644
index bf1fce7..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.pivottable.ViewDefinitionRecord;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Tests for {@link RowBlocksReader}
- *
- * @author Josh Micich
- */
-public final class TestRowBlocksReader {
-    @Test
-	public void testAbnormalPivotTableRecords_bug46280() {
-		int SXVIEW_SID = ViewDefinitionRecord.sid;
-		Record[] inRecs = {
-			new RowRecord(0),
-			new NumberRecord(),
-			// normally MSODRAWING(0x00EC) would come here before SXVIEW
-			new UnknownRecord(SXVIEW_SID, "dummydata (SXVIEW: View Definition)".getBytes(LocaleUtil.CHARSET_1252)),
-			new WindowTwoRecord(),
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(inRecs), 0);
-		RowBlocksReader rbr = new RowBlocksReader(rs);
-		if (rs.peekNextClass() == WindowTwoRecord.class) {
-			// Should have stopped at the SXVIEW record
-			fail("Identified bug 46280b");
-		}
-		RecordStream rbStream = rbr.getPlainRecordStream();
-		assertEquals(inRecs[0], rbStream.getNext());
-		assertEquals(inRecs[1], rbStream.getNext());
-		assertFalse(rbStream.hasNext());
-		assertTrue(rs.hasNext());
-		assertEquals(inRecs[2], rs.getNext());
-		assertEquals(inRecs[3], rs.getNext());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java
deleted file mode 100644
index 97b3fe0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java
+++ /dev/null
@@ -1,870 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.ColumnInfoRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.DrawingRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.GutsRecord;
-import org.apache.poi.hssf.record.IndexRecord;
-import org.apache.poi.hssf.record.MergeCellsRecord;
-import org.apache.poi.hssf.record.MulBlankRecord;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.record.TextObjectRecord;
-import org.apache.poi.hssf.record.UncalcedRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable;
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.HexRead;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * Unit test for the {@link InternalSheet} class.
- */
-public final class TestSheet {
-	private static InternalSheet createSheet(List<Record> inRecs) {
-		return InternalSheet.createSheet(new RecordStream(inRecs, 0));
-	}
-
-	private static Record[] getSheetRecords(InternalSheet s, int offset) {
-		RecordCollector rc = new RecordCollector();
-		s.visitContainedRecords(rc, offset);
-		return rc.getRecords();
-	}
-
-	@Test
-	public void testCreateSheet() {
-		// Check we're adding row and cell aggregates
-		List<Record> records = new ArrayList<Record>();
-		records.add(BOFRecord.createSheetBOF());
-		records.add( new DimensionsRecord() );
-		records.add(createWindow2Record());
-		records.add(EOFRecord.instance);
-		InternalSheet sheet = createSheet(records);
-		Record[] outRecs = getSheetRecords(sheet, 0);
-
-		int pos = 0;
-		assertTrue(outRecs[pos++] instanceof BOFRecord );
-		assertTrue(outRecs[pos++] instanceof IndexRecord);
-		assertTrue(outRecs[pos++] instanceof DimensionsRecord);
-		assertTrue(outRecs[pos++] instanceof WindowTwoRecord );
-		assertTrue(outRecs[pos++] instanceof EOFRecord);
-	}
-
-	private static Record createWindow2Record() {
-		WindowTwoRecord result = new WindowTwoRecord();
-		result.setOptions(( short ) 0x6b6);
-		result.setTopRow(( short ) 0);
-		result.setLeftCol(( short ) 0);
-		result.setHeaderColor(0x40);
-		result.setPageBreakZoom(( short ) 0);
-		result.setNormalZoom(( short ) 0);
-		return result;
-	}
-
-	private static final class MergedCellListener implements RecordVisitor {
-
-		private int _count;
-		public MergedCellListener() {
-			_count = 0;
-		}
-		@Override
-        public void visitRecord(Record r) {
-			if (r instanceof MergeCellsRecord) {
-				_count++;
-			}
-		}
-		public int getCount() {
-			return _count;
-		}
-	}
-
-    @Test
-	public void testAddMergedRegion() {
-		InternalSheet sheet = InternalSheet.createSheet();
-		int regionsToAdd = 4096;
-
-		//simple test that adds a load of regions
-		for (int n = 0; n < regionsToAdd; n++)
-		{
-			int index = sheet.addMergedRegion(0, (short) 0, 1, (short) 1);
-			assertTrue("Merged region index expected to be " + n + " got " + index, index == n);
-		}
-
-		//test all the regions were indeed added
-		assertTrue(sheet.getNumMergedRegions() == regionsToAdd);
-
-		//test that the regions were spread out over the appropriate number of records
-		MergedCellListener mcListener = new MergedCellListener();
-		sheet.visitContainedRecords(mcListener, 0);
-		int recordsAdded	= mcListener.getCount();
-		int recordsExpected = regionsToAdd/1027;
-		if ((regionsToAdd % 1027) != 0)
-			recordsExpected++;
-		assertTrue("The " + regionsToAdd + " merged regions should have been spread out over "
-				+ recordsExpected + " records, not " + recordsAdded, recordsAdded == recordsExpected);
-		// Check we can't add one with invalid date
-		try {
-			sheet.addMergedRegion(10, (short)10, 9, (short)12);
-			fail("Expected an exception to occur");
-		} catch(IllegalArgumentException e) {
-			// occurs during successful test
-			assertEquals("The 'to' row (9) must not be less than the 'from' row (10)", e.getMessage());
-		}
-		try {
-			sheet.addMergedRegion(10, (short)10, 12, (short)9);
-			fail("Expected an exception to occur");
-		} catch(IllegalArgumentException e) {
-			// occurs during successful test
-			assertEquals("The 'to' col (9) must not be less than the 'from' col (10)", e.getMessage());
-		}
-	}
-
-    @Test
-	public void testRemoveMergedRegion() {
-		InternalSheet sheet = InternalSheet.createSheet();
-		int regionsToAdd = 4096;
-
-		for (int n = 0; n < regionsToAdd; n++) {
-			sheet.addMergedRegion(n, 0, n, 1);
-		}
-
-		int nSheetRecords = sheet.getRecords().size();
-
-		//remove a third from the beginning
-		for (int n = 0; n < regionsToAdd/3; n++)
-		{
-			sheet.removeMergedRegion(0);
-			//assert they have been deleted
-			assertEquals("Num of regions", regionsToAdd - n - 1, sheet.getNumMergedRegions());
-		}
-
-		// merge records are removed from within the MergedCellsTable,
-		// so the sheet record count should not change
-		assertEquals("Sheet Records", nSheetRecords, sheet.getRecords().size());
-	}
-
-	/**
-	 * Bug: 22922 (Reported by Xuemin Guan)
-	 * <p>
-	 * Remove mergedregion fails when a sheet loses records after an initial CreateSheet
-	 * fills up the records.
-	 *
-	 */
-    @Test
-	public void testMovingMergedRegion() {
-		List<Record> records = new ArrayList<Record>();
-
-		CellRangeAddress[] cras = {
-			new CellRangeAddress(0, 1, 0, 2),
-		};
-		MergeCellsRecord merged = new MergeCellsRecord(cras, 0, cras.length);
-		records.add(BOFRecord.createSheetBOF());
-		records.add(new DimensionsRecord());
-		records.add(new RowRecord(0));
-		records.add(new RowRecord(1));
-		records.add(new RowRecord(2));
-		records.add(createWindow2Record());
-		records.add(EOFRecord.instance);
-		records.add(merged);
-
-		InternalSheet sheet = createSheet(records);
-		sheet.getRecords().remove(0); // TODO - what does this line do?
-
-		//stub object to throw off list INDEX operations
-		sheet.removeMergedRegion(0);
-		assertEquals("Should be no more merged regions", 0, sheet.getNumMergedRegions());
-	}
-
-    @Test
-	public void testGetMergedRegionAt() {
-		//TODO
-	}
-
-    @Test
-	public void testGetNumMergedRegions() {
-		//TODO
-	}
-
-	/**
-	 * Makes sure all rows registered for this sheet are aggregated, they were being skipped
-	 *
-	 */
-    @Test
-	public void testRowAggregation() {
-		List<Record> records = new ArrayList<Record>();
-
-		records.add(InternalSheet.createBOF());
-		records.add(new DimensionsRecord());
-		records.add(new RowRecord(0));
-		records.add(new RowRecord(1));
-		FormulaRecord formulaRecord = new FormulaRecord();
-		formulaRecord.setCachedResultTypeString();
-		records.add(formulaRecord);
-		records.add(new StringRecord());
-		records.add(new RowRecord(2));
-		records.add(createWindow2Record());
-		records.add(EOFRecord.instance);
-
-		InternalSheet sheet = createSheet(records);
-		assertNotNull("Row [2] was skipped", sheet.getRow(2));
-	}
-
-	/**
-	 * Make sure page break functionality works (in memory)
-	 *
-	 */
-    @Test
-	public void testRowPageBreaks() {
-		short colFrom = 0;
-		short colTo = 255;
-
-		InternalSheet worksheet = InternalSheet.createSheet();
-		PageSettingsBlock sheet = worksheet.getPageSettings();
-		sheet.setRowBreak(0, colFrom, colTo);
-
-		assertTrue("no row break at 0", sheet.isRowBroken(0));
-		assertEquals("1 row break available", 1, sheet.getNumRowBreaks());
-
-		sheet.setRowBreak(0, colFrom, colTo);
-		sheet.setRowBreak(0, colFrom, colTo);
-
-		assertTrue("no row break at 0", sheet.isRowBroken(0));
-		assertEquals("1 row break available", 1, sheet.getNumRowBreaks());
-
-		sheet.setRowBreak(10, colFrom, colTo);
-		sheet.setRowBreak(11, colFrom, colTo);
-
-		assertTrue("no row break at 10", sheet.isRowBroken(10));
-		assertTrue("no row break at 11", sheet.isRowBroken(11));
-		assertEquals("3 row break available", 3, sheet.getNumRowBreaks());
-
-
-		boolean is10 = false;
-		boolean is0 = false;
-		boolean is11 = false;
-
-		int[] rowBreaks = sheet.getRowBreaks();
-		for (int main : rowBreaks) {
-			if (main != 0 && main != 10 && main != 11) fail("Invalid page break");
-			if (main == 0)	 is0 = true;
-			if (main == 10) is10= true;
-			if (main == 11) is11 = true;
-		}
-
-		assertTrue("one of the breaks didnt make it", is0 && is10 && is11);
-
-		sheet.removeRowBreak(11);
-		assertFalse("row should be removed", sheet.isRowBroken(11));
-
-		sheet.removeRowBreak(0);
-		assertFalse("row should be removed", sheet.isRowBroken(0));
-
-		sheet.removeRowBreak(10);
-		assertFalse("row should be removed", sheet.isRowBroken(10));
-
-		assertEquals("no more breaks", 0, sheet.getNumRowBreaks());
-	}
-
-	/**
-	 * Make sure column pag breaks works properly (in-memory)
-	 *
-	 */
-    @Test
-	public void testColPageBreaks() {
-		short rowFrom = 0;
-		short rowTo = (short)65535;
-
-		InternalSheet worksheet = InternalSheet.createSheet();
-		PageSettingsBlock sheet = worksheet.getPageSettings();
-		sheet.setColumnBreak((short)0, rowFrom, rowTo);
-
-		assertTrue("no col break at 0", sheet.isColumnBroken(0));
-		assertEquals("1 col break available", 1, sheet.getNumColumnBreaks());
-
-		sheet.setColumnBreak((short)0, rowFrom, rowTo);
-
-		assertTrue("no col break at 0", sheet.isColumnBroken(0));
-		assertEquals("1 col break available", 1, sheet.getNumColumnBreaks());
-
-		sheet.setColumnBreak((short)1, rowFrom, rowTo);
-		sheet.setColumnBreak((short)10, rowFrom, rowTo);
-		sheet.setColumnBreak((short)15, rowFrom, rowTo);
-
-		assertTrue("no col break at 1", sheet.isColumnBroken(1));
-		assertTrue("no col break at 10", sheet.isColumnBroken(10));
-		assertTrue("no col break at 15", sheet.isColumnBroken(15));
-		assertEquals("4 col break available", 4, sheet.getNumColumnBreaks());
-
-		boolean is10 = false;
-		boolean is0 = false;
-		boolean is1 = false;
-		boolean is15 = false;
-
-		int[] colBreaks = sheet.getColumnBreaks();
-		for (int main : colBreaks) {
-			if (main != 0 && main != 1 && main != 10 && main != 15) fail("Invalid page break");
-			if (main == 0)  is0 = true;
-			if (main == 1)  is1 = true;
-			if (main == 10) is10= true;
-			if (main == 15) is15 = true;
-		}
-
-		assertTrue("one of the breaks didnt make it", is0 && is1 && is10 && is15);
-
-		sheet.removeColumnBreak(15);
-		assertFalse("column break should not be there", sheet.isColumnBroken(15));
-
-		sheet.removeColumnBreak(0);
-		assertFalse("column break should not be there", sheet.isColumnBroken(0));
-
-		sheet.removeColumnBreak(1);
-		assertFalse("column break should not be there", sheet.isColumnBroken(1));
-
-		sheet.removeColumnBreak(10);
-		assertFalse("column break should not be there", sheet.isColumnBroken(10));
-
-		assertEquals("no more breaks", 0, sheet.getNumColumnBreaks());
-	}
-
-	/**
-	 * test newly added method Sheet.getXFIndexForColAt(..)
-	 * works as designed.
-	 */
-    @Test
-	public void testXFIndexForColumn() {
-		final short TEST_IDX = 10;
-		final short DEFAULT_IDX = 0xF; // 15
-		short xfindex = Short.MIN_VALUE;
-		InternalSheet sheet = InternalSheet.createSheet();
-
-		// without ColumnInfoRecord
-		xfindex = sheet.getXFIndexForColAt((short) 0);
-		assertEquals(DEFAULT_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 1);
-		assertEquals(DEFAULT_IDX, xfindex);
-
-		ColumnInfoRecord nci = new ColumnInfoRecord();
-		sheet._columnInfos.insertColumn(nci);
-
-		// single column ColumnInfoRecord
-		nci.setFirstColumn((short) 2);
-		nci.setLastColumn((short) 2);
-		nci.setXFIndex(TEST_IDX);
-		xfindex = sheet.getXFIndexForColAt((short) 0);
-		assertEquals(DEFAULT_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 1);
-		assertEquals(DEFAULT_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 2);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 3);
-		assertEquals(DEFAULT_IDX, xfindex);
-
-		// ten column ColumnInfoRecord
-		nci.setFirstColumn((short) 2);
-		nci.setLastColumn((short) 11);
-		nci.setXFIndex(TEST_IDX);
-		xfindex = sheet.getXFIndexForColAt((short) 1);
-		assertEquals(DEFAULT_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 2);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 6);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 11);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 12);
-		assertEquals(DEFAULT_IDX, xfindex);
-
-		// single column ColumnInfoRecord starting at index 0
-		nci.setFirstColumn((short) 0);
-		nci.setLastColumn((short) 0);
-		nci.setXFIndex(TEST_IDX);
-		xfindex = sheet.getXFIndexForColAt((short) 0);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 1);
-		assertEquals(DEFAULT_IDX, xfindex);
-
-		// ten column ColumnInfoRecord starting at index 0
-		nci.setFirstColumn((short) 0);
-		nci.setLastColumn((short) 9);
-		nci.setXFIndex(TEST_IDX);
-		xfindex = sheet.getXFIndexForColAt((short) 0);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 7);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 9);
-		assertEquals(TEST_IDX, xfindex);
-		xfindex = sheet.getXFIndexForColAt((short) 10);
-		assertEquals(DEFAULT_IDX, xfindex);
-	}
-
-	private static final class SizeCheckingRecordVisitor implements RecordVisitor {
-
-		private int _totalSize;
-		public SizeCheckingRecordVisitor() {
-			_totalSize = 0;
-		}
-		@Override
-        public void visitRecord(Record r) {
-
-			int estimatedSize=r.getRecordSize();
-			byte[] buf = new byte[estimatedSize];
-			int serializedSize = r.serialize(0, buf);
-			if (estimatedSize != serializedSize) {
-				throw new AssertionFailedError("serialized size mismatch for record ("
-						+ r.getClass().getName() + ")");
-			}
-			_totalSize += estimatedSize;
-		}
-		public int getTotalSize() {
-			return _totalSize;
-		}
-	}
-	/**
-	 * Prior to bug 45066, POI would get the estimated sheet size wrong
-	 * when an <tt>UncalcedRecord</tt> was present.<p/>
-	 */
-    @Test
-	public void testUncalcSize_bug45066() {
-
-		List<Record> records = new ArrayList<Record>();
-		records.add(BOFRecord.createSheetBOF());
-		records.add(new UncalcedRecord());
-		records.add(new DimensionsRecord());
-		records.add(createWindow2Record());
-		records.add(EOFRecord.instance);
-		InternalSheet sheet = createSheet(records);
-
-		// The original bug was due to different logic for collecting records for sizing and
-		// serialization. The code has since been refactored into a single method for visiting
-		// all contained records.  Now this test is much less interesting
-		SizeCheckingRecordVisitor scrv = new SizeCheckingRecordVisitor();
-		sheet.visitContainedRecords(scrv, 0);
-		assertEquals(90, scrv.getTotalSize());
-	}
-
-	/**
-	 * Prior to bug 45145 <tt>RowRecordsAggregate</tt> and <tt>ValueRecordsAggregate</tt> could
-	 * sometimes occur in reverse order.  This test reproduces one of those situations and makes
-	 * sure that RRA comes before VRA.<br/>
-	 *
-	 * The code here represents a normal POI use case where a spreadsheet is created from scratch.
-	 */
-    @Test
-	public void testRowValueAggregatesOrder_bug45145() {
-
-		InternalSheet sheet = InternalSheet.createSheet();
-
-		RowRecord rr = new RowRecord(5);
-		sheet.addRow(rr);
-
-		CellValueRecordInterface cvr = new BlankRecord();
-		cvr.setColumn((short)0);
-		cvr.setRow(5);
-		sheet.addValueRecord(5, cvr);
-
-
-		int dbCellRecordPos = getDbCellRecordPos(sheet);
-		if (dbCellRecordPos == 252) {
-			// The overt symptom of the bug
-			// DBCELL record pos is calculated wrong if VRA comes before RRA
-			throw new AssertionFailedError("Identified  bug 45145");
-		}
-
-//		if (false) {
-//			// make sure that RRA and VRA are in the right place
-//			// (Aug 2008) since the VRA is now part of the RRA, there is much less chance that
-//			// they could get out of order. Still, one could write serialize the sheet here,
-//			// and read back with EventRecordFactory to make sure...
-//		}
-		assertEquals(242, dbCellRecordPos);
-	}
-
-	/**
-	 * @return the value calculated for the position of the first DBCELL record for this sheet.
-	 * That value is found on the IndexRecord.
-	 */
-	private static int getDbCellRecordPos(InternalSheet sheet) {
-
-		MyIndexRecordListener myIndexListener = new MyIndexRecordListener();
-		sheet.visitContainedRecords(myIndexListener, 0);
-		IndexRecord indexRecord = myIndexListener.getIndexRecord();
-		int dbCellRecordPos = indexRecord.getDbcellAt(0);
-		return dbCellRecordPos;
-	}
-
-	private static final class MyIndexRecordListener implements RecordVisitor {
-
-		private IndexRecord _indexRecord;
-		public MyIndexRecordListener() {
-			// no-arg constructor
-		}
-		public IndexRecord getIndexRecord() {
-			return _indexRecord;
-		}
-		@Override
-        public void visitRecord(Record r) {
-			if (r instanceof IndexRecord) {
-				if (_indexRecord != null) {
-					throw new RuntimeException("too many index records");
-				}
-				_indexRecord = (IndexRecord)r;
-			}
-		}
-	}
-
-	/**
-	 * Checks for bug introduced around r682282-r683880 that caused a second GUTS records
-	 * which in turn got the dimensions record out of alignment
-	 */
-    @Test
-	public void testGutsRecord_bug45640() {
-
-		InternalSheet sheet = InternalSheet.createSheet();
-		sheet.addRow(new RowRecord(0));
-		sheet.addRow(new RowRecord(1));
-		sheet.groupRowRange( 0, 1, true );
-		sheet.toString();
-		List<RecordBase> recs = sheet.getRecords();
-		int count=0;
-		for(int i=0; i< recs.size(); i++) {
-			if (recs.get(i) instanceof GutsRecord) {
-				count++;
-			}
-		}
-		if (count == 2) {
-			throw new AssertionFailedError("Identified bug 45640");
-		}
-		assertEquals(1, count);
-	}
-
-    @Test
-	public void testMisplacedMergedCellsRecords_bug45699() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex45698-22488.xls");
-
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFRow row = sheet.getRow(3);
-		HSSFCell cell = row.getCell(4);
-		if (cell == null) {
-			fail("Identified bug 45699");
-		}
-		assertEquals("Informations", cell.getRichStringCellValue().getString());
-		
-		wb.close();
-	}
-	/**
-	 * In 3.1, setting margins between creating first row and first cell caused an exception.
-	 */
-    @Test
-	public void testSetMargins_bug45717() throws Exception {
-		HSSFWorkbook workbook = new HSSFWorkbook();
-		HSSFSheet sheet = workbook.createSheet("Vorschauliste");
-		HSSFRow row = sheet.createRow(0);
-
-		sheet.setMargin(HSSFSheet.LeftMargin, 0.3);
-		try {
-			row.createCell(0);
-		} catch (IllegalStateException e) {
-			if (e.getMessage().equals("Cannot create value records before row records exist")) {
-				fail("Identified bug 45717");
-			}
-			throw e;
-		} finally {
-		    workbook.close();
-		}
-	}
-
-	/**
-	 * Some apps seem to write files with missing DIMENSION records.
-	 * Excel(2007) tolerates this, so POI should too.
-	 */
-    @Test
-	public void testMissingDims() {
-
-		int rowIx = 5;
-		int colIx = 6;
-		NumberRecord nr = new NumberRecord();
-		nr.setRow(rowIx);
-		nr.setColumn((short) colIx);
-		nr.setValue(3.0);
-
-		List<Record> inRecs = new ArrayList<Record>();
-		inRecs.add(BOFRecord.createSheetBOF());
-		inRecs.add(new RowRecord(rowIx));
-		inRecs.add(nr);
-		inRecs.add(createWindow2Record());
-		inRecs.add(EOFRecord.instance);
-		InternalSheet sheet;
-		try {
-			sheet = createSheet(inRecs);
-		} catch (RuntimeException e) {
-			if ("DimensionsRecord was not found".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 46206");
-			}
-			throw e;
-		}
-
-		RecordCollector rv = new RecordCollector();
-		sheet.visitContainedRecords(rv, rowIx);
-		Record[] outRecs = rv.getRecords();
-		assertEquals(8, outRecs.length);
-		DimensionsRecord dims = (DimensionsRecord) outRecs[5];
-		assertEquals(rowIx, dims.getFirstRow());
-		assertEquals(rowIx, dims.getLastRow());
-		assertEquals(colIx, dims.getFirstCol());
-		assertEquals(colIx, dims.getLastCol());
-	}
-
-	/**
-	 * Prior to the fix for bug 46547, shifting formulas would have the side-effect
-	 * of creating a {@link ConditionalFormattingTable}.  There was no impairment to
-	 * functionality since empty record aggregates are equivalent to missing record
-	 * aggregates. However, since this unnecessary creation helped expose bug 46547b,
-	 * and since there is a slight performance hit the fix was made to avoid it.
-	 */
-    @Test
-	public void testShiftFormulasAddCondFormat_bug46547() {
-		// Create a sheet with data validity (similar to bugzilla attachment id=23131).
-		InternalSheet sheet = InternalSheet.createSheet();
-
-		List<RecordBase> sheetRecs = sheet.getRecords();
-		assertEquals(23, sheetRecs.size());
-
-		FormulaShifter shifter = FormulaShifter.createForRowShift(0, "", 0, 0, 1, SpreadsheetVersion.EXCEL97);
-		sheet.updateFormulasAfterCellShift(shifter, 0);
-		if (sheetRecs.size() == 24 && sheetRecs.get(22) instanceof ConditionalFormattingTable) {
-			throw new AssertionFailedError("Identified bug 46547a");
-		}
-		assertEquals(23, sheetRecs.size());
-	}
-	/**
-	 * Bug 46547 happened when attempting to add conditional formatting to a sheet
-	 * which already had data validity constraints.
-	 */
-    @Test
-	public void testAddCondFormatAfterDataValidation_bug46547() {
-		// Create a sheet with data validity (similar to bugzilla attachment id=23131).
-		InternalSheet sheet = InternalSheet.createSheet();
-		sheet.getOrCreateDataValidityTable();
-
-		ConditionalFormattingTable cft;
-		// attempt to add conditional formatting
-		try {
-
-			cft = sheet.getConditionalFormattingTable(); // lazy getter
-		} catch (ClassCastException e) {
-			throw new AssertionFailedError("Identified bug 46547b");
-		}
-		assertNotNull(cft);
-	}
-
-    @Test
-	public void testCloneMulBlank_bug46776() {
-		Record[]  recs = {
-				InternalSheet.createBOF(),
-				new DimensionsRecord(),
-				new RowRecord(1),
-				new MulBlankRecord(1, 3, new short[] { 0x0F, 0x0F, 0x0F, } ),
-				new RowRecord(2),
-				createWindow2Record(),
-				EOFRecord.instance,
-		};
-
-		InternalSheet sheet = createSheet(Arrays.asList(recs));
-
-		InternalSheet sheet2;
-		try {
-			sheet2 = sheet.cloneSheet();
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("The class org.apache.poi.hssf.record.MulBlankRecord needs to define a clone method")) {
-				throw new AssertionFailedError("Identified bug 46776");
-			}
-			throw e;
-		}
-
-		RecordCollector rc = new RecordCollector();
-		sheet2.visitContainedRecords(rc, 0);
-		Record[] clonedRecs = rc.getRecords();
-		assertEquals(recs.length+2, clonedRecs.length); // +2 for INDEX and DBCELL
-	}
-
-    @Test
-    public void testCreateAggregate() {
-        String msoDrawingRecord1 =
-                "0F 00 02 F0 20 01 00 00 10 00 08 F0 08 00 00 00 \n" +
-                "03 00 00 00 02 04 00 00 0F 00 03 F0 08 01 00 00 \n" +
-                "0F 00 04 F0 28 00 00 00 01 00 09 F0 10 00 00 00 \n" +
-                "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \n" +
-                "02 00 0A F0 08 00 00 00 00 04 00 00 05 00 00 00 \n" +
-                "0F 00 04 F0 64 00 00 00 42 01 0A F0 08 00 00 00 \n" +
-                "01 04 00 00 00 0A 00 00 73 00 0B F0 2A 00 00 00 \n" +
-                "BF 00 08 00 08 00 44 01 04 00 00 00 7F 01 00 00 \n" +
-                "01 00 BF 01 00 00 11 00 C0 01 40 00 00 08 FF 01 \n" +
-                "10 00 10 00 BF 03 00 00 08 00 00 00 10 F0 12 00 \n" +
-                "00 00 00 00 01 00 54 00 05 00 45 00 01 00 88 03 \n" +
-                "05 00 94 00 00 00 11 F0 00 00 00 00";
-
-        String msoDrawingRecord2 =
-                "0F 00 04 F0 64 00 00 00 42 01 0A F0 08 00 00 00 " +
-                "02 04 00 00 80 0A 00 00 73 00 0B F0 2A 00 00 00 " +
-                "BF 00 08 00 08 00 44 01 04 00 00 00 7F 01 00 00 " +
-                "01 00 BF 01 00 00 11 00 C0 01 40 00 00 08 FF 01 " +
-                "10 00 10 00 BF 03 00 00 08 00 00 00 10 F0 12 00 " +
-                "00 00 00 00 01 00 8D 03 05 00 E4 00 03 00 4D 03 " +
-                "0B 00 0C 00 00 00 11 F0 00 00 00 00";
-
-        DrawingRecord d1 = new DrawingRecord();
-        d1.setData( HexRead.readFromString( msoDrawingRecord1 ) );
-
-        ObjRecord r1 = new ObjRecord();
-
-        DrawingRecord d2 = new DrawingRecord();
-        d2.setData( HexRead.readFromString( msoDrawingRecord2 ) );
-
-        TextObjectRecord r2 = new TextObjectRecord();
-        r2.setStr(new HSSFRichTextString("Aggregated"));
-        NoteRecord n2 = new NoteRecord();
-
-        List<Record> recordStream = new ArrayList<Record>();
-        recordStream.add(InternalSheet.createBOF());
-        recordStream.add( d1 );
-        recordStream.add( r1 );
-        recordStream.add(createWindow2Record());
-        recordStream.add(EOFRecord.instance);
-
-        confirmAggregatedRecords(recordStream);
-
-
-        recordStream = new ArrayList<Record>();
-        recordStream.add(InternalSheet.createBOF());
-        recordStream.add( d1 );
-        recordStream.add( r1 );
-        recordStream.add( d2 );
-        recordStream.add( r2 );
-        recordStream.add(createWindow2Record());
-        recordStream.add(EOFRecord.instance);
-
-        confirmAggregatedRecords(recordStream);
-
-        recordStream = new ArrayList<Record>();
-        recordStream.add(InternalSheet.createBOF());
-        recordStream.add( d1 );
-        recordStream.add( r1 );
-        recordStream.add( d2 );
-        recordStream.add( r2 );
-        recordStream.add( n2 );
-        recordStream.add(createWindow2Record());
-        recordStream.add(EOFRecord.instance);
-
-        confirmAggregatedRecords(recordStream);
-     }
-
-    private void confirmAggregatedRecords(List<Record> recordStream){
-        InternalSheet sheet = InternalSheet.createSheet();
-        sheet.getRecords().clear();
-        sheet.getRecords().addAll(recordStream);
-
-        List<RecordBase> sheetRecords = sheet.getRecords();
-
-        DrawingManager2 drawingManager = new DrawingManager2(new EscherDggRecord() );
-        sheet.aggregateDrawingRecords(drawingManager, false);
-
-        assertEquals(4, sheetRecords.size());
-        assertEquals(BOFRecord.sid, ((Record)sheetRecords.get(0)).getSid());
-        assertEquals(EscherAggregate.sid, ((Record)sheetRecords.get(1)).getSid());
-        assertEquals(WindowTwoRecord.sid, ((Record)sheetRecords.get(2)).getSid());
-        assertEquals(EOFRecord.sid, ((Record)sheetRecords.get(3)).getSid());
-    }
-
-    @Test
-    public void testSheetDimensions() throws IOException{
-        InternalSheet sheet = InternalSheet.createSheet();
-        DimensionsRecord dimensions = (DimensionsRecord)sheet.findFirstRecordBySid(DimensionsRecord.sid);
-        assertEquals(0, dimensions.getFirstCol());
-        assertEquals(0, dimensions.getFirstRow());
-        assertEquals(1, dimensions.getLastCol());  // plus pne
-        assertEquals(1, dimensions.getLastRow());  // plus pne
-
-        RowRecord rr = new RowRecord(0);
-        sheet.addRow(rr);
-
-        assertEquals(0, dimensions.getFirstCol());
-        assertEquals(0, dimensions.getFirstRow());
-        assertEquals(1, dimensions.getLastCol());
-        assertEquals(1, dimensions.getLastRow());
-
-        CellValueRecordInterface cvr;
-
-        cvr = new BlankRecord();
-        cvr.setColumn((short)0);
-        cvr.setRow(0);
-        sheet.addValueRecord(0, cvr);
-
-        assertEquals(0, dimensions.getFirstCol());
-        assertEquals(0, dimensions.getFirstRow());
-        assertEquals(1, dimensions.getLastCol());
-        assertEquals(1, dimensions.getLastRow());
-
-        cvr = new BlankRecord();
-        cvr.setColumn((short)1);
-        cvr.setRow(0);
-        sheet.addValueRecord(0, cvr);
-
-        assertEquals(0, dimensions.getFirstCol());
-        assertEquals(0, dimensions.getFirstRow());
-        assertEquals(2, dimensions.getLastCol());   //YK:  failed until Bugzilla 53414 was fixed
-        assertEquals(1, dimensions.getLastRow());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
deleted file mode 100644
index 8bd521e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.ColumnInfoRecord;
-
-/**
- * @author Tony Poppleton
- */
-public final class TestSheetAdditional extends TestCase {
-
-	public void testGetCellWidth() {
-		InternalSheet sheet = InternalSheet.createSheet();
-		ColumnInfoRecord nci = new ColumnInfoRecord();
-
-		// Prepare test model
-		nci.setFirstColumn(5);
-		nci.setLastColumn(10);
-		nci.setColumnWidth(100);
-
-
-		sheet._columnInfos.insertColumn(nci);
-
-		assertEquals(100,sheet.getColumnWidth(5));
-		assertEquals(100,sheet.getColumnWidth(6));
-		assertEquals(100,sheet.getColumnWidth(7));
-		assertEquals(100,sheet.getColumnWidth(8));
-		assertEquals(100,sheet.getColumnWidth(9));
-		assertEquals(100,sheet.getColumnWidth(10));
-
-		sheet.setColumnWidth(6,200);
-
-		assertEquals(100,sheet.getColumnWidth(5));
-		assertEquals(200,sheet.getColumnWidth(6));
-		assertEquals(100,sheet.getColumnWidth(7));
-		assertEquals(100,sheet.getColumnWidth(8));
-		assertEquals(100,sheet.getColumnWidth(9));
-		assertEquals(100,sheet.getColumnWidth(10));
-	}
-
-	public void testMaxColumnWidth() {
-		InternalSheet sheet = InternalSheet.createSheet();
-		sheet.setColumnWidth(0, 255*256); //the limit
-		try {
-			sheet.setColumnWidth(0, 256*256); //the limit
-			fail("expected exception");
-		} catch (IllegalArgumentException e){
-			assertEquals(e.getMessage(), "The maximum column width for an individual cell is 255 characters.");
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java b/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
deleted file mode 100644
index 6147358..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.model;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.RecalcIdRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.TestHSSFWorkbook;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
-import org.apache.poi.ss.formula.udf.DefaultUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.junit.Test;
-
-/**
- * Unit test for the Workbook class.
- */
-public final class TestWorkbook {
-    @Test
-    public void testFontStuff() throws IOException {
-        HSSFWorkbook hwb = new HSSFWorkbook();
-		InternalWorkbook wb = TestHSSFWorkbook.getInternalWorkbook(hwb);
-
-		assertEquals(4, wb.getNumberOfFontRecords());
-		assertEquals(68, wb.getRecords().size());
-
-		FontRecord f1 = wb.getFontRecordAt(0);
-		FontRecord f4 = wb.getFontRecordAt(3);
-
-		assertEquals(0, wb.getFontIndex(f1));
-		assertEquals(3, wb.getFontIndex(f4));
-
-		assertEquals(f1, wb.getFontRecordAt(0));
-		assertEquals(f4, wb.getFontRecordAt(3));
-
-		// There is no 4! new ones go in at 5
-
-		FontRecord n = wb.createNewFont();
-		assertEquals(69, wb.getRecords().size());
-		assertEquals(5, wb.getNumberOfFontRecords());
-		assertEquals(5, wb.getFontIndex(n));
-		assertEquals(n, wb.getFontRecordAt(5));
-
-		// And another
-		FontRecord n6 = wb.createNewFont();
-		assertEquals(70, wb.getRecords().size());
-		assertEquals(6, wb.getNumberOfFontRecords());
-		assertEquals(6, wb.getFontIndex(n6));
-		assertEquals(n6, wb.getFontRecordAt(6));
-
-
-		// Now remove the one formerly at 5
-		assertEquals(70, wb.getRecords().size());
-		wb.removeFontRecord(n);
-
-		// Check that 6 has gone to 5
-		assertEquals(69, wb.getRecords().size());
-		assertEquals(5, wb.getNumberOfFontRecords());
-		assertEquals(5, wb.getFontIndex(n6));
-		assertEquals(n6, wb.getFontRecordAt(5));
-
-		// Check that the earlier ones are unchanged
-		assertEquals(0, wb.getFontIndex(f1));
-		assertEquals(3, wb.getFontIndex(f4));
-		assertEquals(f1, wb.getFontRecordAt(0));
-		assertEquals(f4, wb.getFontRecordAt(3));
-
-		// Finally, add another one
-		FontRecord n7 = wb.createNewFont();
-		assertEquals(70, wb.getRecords().size());
-		assertEquals(6, wb.getNumberOfFontRecords());
-		assertEquals(6, wb.getFontIndex(n7));
-		assertEquals(n7, wb.getFontRecordAt(6));
-
-		hwb.close();
-	}
-
-    @Test
-    public void testAddNameX() throws IOException {
-        HSSFWorkbook hwb = new HSSFWorkbook();
-        InternalWorkbook wb = TestHSSFWorkbook.getInternalWorkbook(hwb);
-        assertNotNull(wb.getNameXPtg("ISODD", AggregatingUDFFinder.DEFAULT));
-
-        FreeRefFunction NotImplemented = new FreeRefFunction() {
-            @Override
-            public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-                throw new RuntimeException("not implemented");
-            }
-        };
-
-        /**
-         * register the two test UDFs in a UDF finder, to be passed to the evaluator
-         */
-        UDFFinder udff1 = new DefaultUDFFinder(new String[] { "myFunc", },
-                new FreeRefFunction[] { NotImplemented });
-        UDFFinder udff2 = new DefaultUDFFinder(new String[] { "myFunc2", },
-                new FreeRefFunction[] { NotImplemented });
-        UDFFinder udff = new AggregatingUDFFinder(udff1, udff2);
-        assertNotNull(wb.getNameXPtg("myFunc", udff));
-        assertNotNull(wb.getNameXPtg("myFunc2", udff));
-
-        assertNull(wb.getNameXPtg("myFunc3", udff));  // myFunc3 is unknown
-
-        hwb.close();
-    }
-
-    @Test
-    public void testRecalcId() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        assertFalse(wb.getForceFormulaRecalculation());
-
-        InternalWorkbook iwb = TestHSSFWorkbook.getInternalWorkbook(wb);
-        int countryPos = iwb.findFirstRecordLocBySid(CountryRecord.sid);
-        assertTrue(countryPos != -1);
-        // RecalcIdRecord is not present in new workbooks
-        assertEquals(null, iwb.findFirstRecordBySid(RecalcIdRecord.sid));
-        RecalcIdRecord record = iwb.getRecalcId();
-        assertNotNull(record);
-        assertSame(record, iwb.getRecalcId());
-
-        assertSame(record, iwb.findFirstRecordBySid(RecalcIdRecord.sid));
-        assertEquals(countryPos + 1, iwb.findFirstRecordLocBySid(RecalcIdRecord.sid));
-
-        record.setEngineId(100);
-        assertEquals(100, record.getEngineId());
-        assertTrue(wb.getForceFormulaRecalculation());
-
-        wb.setForceFormulaRecalculation(true); // resets the EngineId flag to zero
-        assertEquals(0, record.getEngineId());
-        assertFalse(wb.getForceFormulaRecalculation());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
deleted file mode 100644
index e328167..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.aggregates.AllRecordAggregateTests;
-import org.apache.poi.hssf.record.cf.TestCellRange;
-import org.apache.poi.hssf.record.chart.AllChartRecordTests;
-import org.apache.poi.hssf.record.common.TestUnicodeString;
-import org.apache.poi.hssf.record.pivot.AllPivotRecordTests;
-import org.apache.poi.poifs.crypt.AllEncryptionTests;
-import org.apache.poi.ss.formula.constant.TestConstantValueParser;
-import org.apache.poi.ss.formula.ptg.AllFormulaTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for package <tt>org.apache.poi.hssf.record</tt> and sub-packages.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    AllChartRecordTests.class,
-    AllEncryptionTests.class,
-    AllFormulaTests.class,
-    AllPivotRecordTests.class,
-    AllRecordAggregateTests.class,
-    TestArrayRecord.class,
-    TestBOFRecord.class,
-    TestBoolErrRecord.class,
-    TestBoundSheetRecord.class,
-    TestCellRange.class,
-    TestCFHeaderRecord.class,
-    TestCFRuleRecord.class,
-    TestColumnInfoRecord.class,
-    TestCommonObjectDataSubRecord.class,
-    TestConstantValueParser.class,
-    TestDVALRecord.class,
-    TestDrawingGroupRecord.class,
-    TestDrawingRecord.class,
-    TestEmbeddedObjectRefSubRecord.class,
-    TestEndSubRecord.class,
-    TestEscherAggregate.class,
-    TestExtendedFormatRecord.class,
-    TestExternalNameRecord.class,
-    TestFeatRecord.class,
-    TestFontRecord.class,
-    TestFormulaRecord.class,
-    TestHyperlinkRecord.class,
-    TestInterfaceEndRecord.class,
-    TestLabelRecord.class,
-    TestLbsDataSubRecord.class,
-    TestMergeCellsRecord.class,
-    TestNameRecord.class,
-    TestNoteRecord.class,
-    TestNoteStructureSubRecord.class,
-    TestObjRecord.class,
-    //TestPaletteRecord.class, //converted to junit4
-    TestPaneRecord.class,
-    TestPLVRecord.class,
-    TestRecalcIdRecord.class,
-    TestRecordFactory.class,
-    TestRecordFactoryInputStream.class,
-    TestRecordInputStream.class,
-    TestSCLRecord.class,
-    TestSSTDeserializer.class,
-    TestSSTRecord.class,
-    TestSSTRecordSizeCalculator.class,
-    TestSharedFormulaRecord.class,
-    TestStringRecord.class,
-    TestStyleRecord.class,
-    TestSubRecord.class,
-    TestSupBookRecord.class,
-    TestTableRecord.class,
-    TestTextObjectBaseRecord.class,
-    TestTextObjectRecord.class,
-    TestUnicodeNameRecord.class,
-    TestUnicodeString.class,
-    TestWriteAccessRecord.class,
-    TestDConRefRecord.class
-})
-public final class AllRecordTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java
deleted file mode 100644
index ff5fe0a..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-public final class TestArrayRecord extends TestCase {
-
-    public void testRead() {
-        String hex =
-                "21 02 25 00 01 00 01 00 01 01 00 00 00 00 00 00 " +
-                "17 00 65 00 00 01 00 02 C0 02 C0 65 00 00 01 00 " +
-                "03 C0 03 C0 04 62 01 07 00";
-        byte[] data = HexRead.readFromString(hex);
-        RecordInputStream in = TestcaseRecordInputStream.create(data);
-        ArrayRecord r1 = new ArrayRecord(in);
-        CellRangeAddress8Bit range = r1.getRange();
-        assertEquals(1, range.getFirstColumn());
-        assertEquals(1, range.getLastColumn());
-        assertEquals(1, range.getFirstRow());
-        assertEquals(1, range.getLastRow());
-
-        Ptg[] ptg = r1.getFormulaTokens();
-        assertEquals("MAX(C1:C2-D1:D2)", FormulaRenderer.toFormulaString(null, ptg));
-
-        //construct a new ArrayRecord with the same contents as r1
-        Ptg[] fmlaPtg = FormulaParser.parse("MAX(C1:C2-D1:D2)", null, FormulaType.ARRAY, 0);
-        ArrayRecord r2 = new ArrayRecord(Formula.create(fmlaPtg), new CellRangeAddress8Bit(1, 1, 1, 1));
-        byte[] ser = r2.serialize();
-        //serialize and check that the data is the same as in r1
-        assertEquals(HexDump.toHex(data), HexDump.toHex(ser));
-    }
-
-    public void testBug57231() {
-        HSSFWorkbook wb = HSSFTestDataSamples
-                .openSampleWorkbook("57231_MixedGasReport.xls");
-        HSSFSheet sheet = wb.getSheet("master");
-
-        HSSFSheet newSheet = wb.cloneSheet(wb.getSheetIndex(sheet));
-        int idx = wb.getSheetIndex(newSheet);
-        wb.setSheetName(idx, "newName");
-
-        // Write the output to a file
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertNotNull(wbBack);
-
-        assertNotNull(wbBack.getSheet("master"));
-        assertNotNull(wbBack.getSheet("newName"));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
deleted file mode 100644
index 4581950..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.TestCase;
-
-/**
- * Tests the AutoFilterInfoRecord class.
- *
- * @author Yegor Kozlov
- */
-public final class TestAutoFilterInfoRecord extends TestCase {
-    private final byte[] data = new byte[] {
-        0x05, 0x00
-    };
-
-    public void testRead() {
-
-        AutoFilterInfoRecord record = new AutoFilterInfoRecord(TestcaseRecordInputStream.create(AutoFilterInfoRecord.sid, data));
-
-        assertEquals(AutoFilterInfoRecord.sid, record.getSid());
-        assertEquals(data.length, record.getDataSize());
-        assertEquals(5, record.getNumEntries());
-        record.setNumEntries((short)3);
-        assertEquals(3, record.getNumEntries());
-    }
-
-    public void testWrite() {
-        AutoFilterInfoRecord record = new AutoFilterInfoRecord();
-        record.setNumEntries((short)3);
-
-        byte [] ser = record.serialize();
-        assertEquals(ser.length - 4, data.length);
-        record = new AutoFilterInfoRecord(TestcaseRecordInputStream.create(ser));
-        assertEquals(3, record.getNumEntries());
-    }
-
-    public void testClone()
-    {
-        AutoFilterInfoRecord record = new AutoFilterInfoRecord();
-        record.setNumEntries((short)3);
-        byte[] src = record.serialize();
-
-        AutoFilterInfoRecord cloned = record.clone();
-        assertEquals(3, record.getNumEntries());
-        byte[] cln = cloned.serialize();
-
-        assertEquals(record.getDataSize(), cloned.getDataSize());
-        assertArrayEquals(src, cln);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
deleted file mode 100644
index 843e17d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.InputStream;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-/**
- * 
- */
-public final class TestBOFRecord extends TestCase {
-    public void testBOFRecord() throws Exception {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream("bug_42794.xls");
-        
-        // This used to throw an error before
-        try {
-            new HSSFWorkbook(is);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw new AssertionFailedError("Identified bug 42794");
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
deleted file mode 100644
index 67b151c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.RecordInputStream.LeftoverDataException;
-import org.apache.poi.util.HexRead;
-/**
- * Tests for {@link BoolErrRecord}
- */
-public final class TestBoolErrRecord extends TestCase {
-
-	public void testError() {
-		byte[] data = HexRead.readFromString(
-				"00 00 00 00 0F 00 " + // row, col, xfIndex
-				"07 01 " // #DIV/0!, isError
-				);
-
-		RecordInputStream in = TestcaseRecordInputStream.create(BoolErrRecord.sid, data);
-		BoolErrRecord ber = new BoolErrRecord(in);
-		assertTrue(ber.isError());
-		assertEquals(7, ber.getErrorValue());
-		
-		TestcaseRecordInputStream.confirmRecordEncoding(BoolErrRecord.sid, data, ber.serialize());
-	}
-
-	/**
-	 * Bugzilla 47479 was due to an apparent error in OOO which (as of version 3.0.1) 
-	 * writes the <i>value</i> field of BOOLERR records as 2 bytes instead of 1.<br/>
-	 * Coincidentally, the extra byte written is zero, which is exactly the value 
-	 * required by the <i>isError</i> field.  This probably why Excel seems to have
-	 * no problem.  OOO does not have the same bug for error values (which wouldn't
-	 * work by the same coincidence). 
-	 */
-	public void testOooBadFormat_bug47479() {
-		byte[] data = HexRead.readFromString(
-				"05 02 09 00 " + // sid, size
-				"00 00 00 00 0F 00 " + // row, col, xfIndex
-				"01 00 00 " // extra 00 byte here
-				);
-
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		BoolErrRecord ber = new BoolErrRecord(in);
-		boolean hasMore;
-		try {
-			hasMore = in.hasNextRecord();
-		} catch (LeftoverDataException e) {
-			if ("Initialisation of record 0x205 left 1 bytes remaining still to be read.".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 47479");
-			}
-			throw e;
-		}
-		assertFalse(hasMore);
-		assertTrue(ber.isBoolean());
-		assertEquals(true, ber.getBooleanValue());
-		
-		// Check that the record re-serializes correctly
-		byte[] outData = ber.serialize();
-		byte[] expData = HexRead.readFromString(
-				"05 02 08 00 " +
-				"00 00 00 00 0F 00 " +
-				"01 00 " // normal number of data bytes
-				);
-		assertArrayEquals(expData, outData);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
deleted file mode 100644
index d50ae9e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests BoundSheetRecord.
- *
- * @see BoundSheetRecord
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestBoundSheetRecord extends TestCase {
-
-
-	public void testRecordLength() {
-		BoundSheetRecord record = new BoundSheetRecord("Sheet1");
-		assertEquals(18, record.getRecordSize());
-	}
-
-	public void testWideRecordLength() {
-		BoundSheetRecord record = new BoundSheetRecord("Sheet\u20ac");
-		assertEquals(24, record.getRecordSize());
-	}
-
-	public void testName() {
-		BoundSheetRecord record = new BoundSheetRecord("1234567890223456789032345678904");
-
-		try {
-			record.setSheetname("s//*s");
-			throw new AssertionFailedError("Should have thrown IllegalArgumentException, but didnt");
-		} catch (IllegalArgumentException e) {
-			// expected
-		}
-	}
-
-	public void testDeserializeUnicode() {
-
-		byte[] data = HexRead.readFromString(""
-			+ "85 00 1A 00" // sid, length
-			+ "3C 09 00 00" // bof
-			+ "00 00"// flags
-			+ "09 01" // str-len. unicode flag
-			// string data
-			+ "21 04 42 04 40 04"
-			+ "30 04 3D 04 38 04"
-			+ "47 04 3A 04 30 04"
-		);
-
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		BoundSheetRecord bsr = new BoundSheetRecord(in);
-		// sheet name is unicode Russian for 'minor page'
-		assertEquals("\u0421\u0442\u0440\u0430\u043D\u0438\u0447\u043A\u0430", bsr.getSheetname());
-
-		byte[] data2 = bsr.serialize();
-		assertArrayEquals(data, data2);
-	}
-
-	public void testOrdering() {
-		BoundSheetRecord bs1 = new BoundSheetRecord("SheetB");
-		BoundSheetRecord bs2 = new BoundSheetRecord("SheetC");
-		BoundSheetRecord bs3 = new BoundSheetRecord("SheetA");
-		bs1.setPositionOfBof(11);
-		bs2.setPositionOfBof(33);
-		bs3.setPositionOfBof(22);
-
-		List<BoundSheetRecord> l = new ArrayList<BoundSheetRecord>();
-		l.add(bs1);
-		l.add(bs2);
-		l.add(bs3);
-
-		BoundSheetRecord[] r = BoundSheetRecord.orderByBofPosition(l);
-		assertEquals(3, r.length);
-		assertEquals(bs1, r[0]);
-		assertEquals(bs3, r[1]);
-		assertEquals(bs2, r[2]);
-	}
-
-	public void testValidNames() {
-		confirmValid("Sheet1", true);
-		confirmValid("O'Brien's sales", true);
-		confirmValid(" data # ", true);
-		confirmValid("data $1.00", true);
-
-		confirmValid("data?", false);
-		confirmValid("abc/def", false);
-		confirmValid("data[0]", false);
-		confirmValid("data*", false);
-		confirmValid("abc\\def", false);
-		confirmValid("'data", false);
-		confirmValid("data'", false);
-	}
-
-	private static void confirmValid(String sheetName, boolean expectedResult) {
-
-		try {
-			new BoundSheetRecord(sheetName);
-			if (!expectedResult) {
-				throw new AssertionFailedError("Expected sheet name '" + sheetName + "' to be invalid");
-			}
-		} catch (IllegalArgumentException e) {
-			if (expectedResult) {
-				throw new AssertionFailedError("Expected sheet name '" + sheetName + "' to be valid");
-			}
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
deleted file mode 100644
index 9c9b548..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * Tests the serialization and deserialization of the {@link CFHeaderRecord}
- *  and {@link CFHeader12Record} classes works correctly.  
- */
-public final class TestCFHeaderRecord extends TestCase {
-	public void testCreateCFHeaderRecord () {
-		CFHeaderRecord record = new CFHeaderRecord();
-		CellRangeAddress[] ranges = {
-			new CellRangeAddress(0,0xFFFF,5,5),
-			new CellRangeAddress(0,0xFFFF,6,6),
-			new CellRangeAddress(0,1,0,1),
-			new CellRangeAddress(0,1,2,3),
-			new CellRangeAddress(2,3,0,1),
-			new CellRangeAddress(2,3,2,3),
-		};
-		record.setCellRanges(ranges);
-		ranges = record.getCellRanges();
-		assertEquals(6,ranges.length);
-		CellRangeAddress enclosingCellRange = record.getEnclosingCellRange();
-		assertEquals(0, enclosingCellRange.getFirstRow());
-		assertEquals(65535, enclosingCellRange.getLastRow());
-		assertEquals(0, enclosingCellRange.getFirstColumn());
-		assertEquals(6, enclosingCellRange.getLastColumn());
-		
-		assertEquals(false, record.getNeedRecalculation());
-		assertEquals(0, record.getID());
-		
-		record.setNeedRecalculation(true);
-        assertEquals(true, record.getNeedRecalculation());
-        assertEquals(0, record.getID());
-        
-        record.setID(7);
-		record.setNeedRecalculation(false);
-        assertEquals(false, record.getNeedRecalculation());
-        assertEquals(7, record.getID());
-	}
-	
-    public void testCreateCFHeader12Record () {
-        CFHeader12Record record = new CFHeader12Record();
-        CellRangeAddress[] ranges = {
-            new CellRangeAddress(0,0xFFFF,5,5),
-            new CellRangeAddress(0,0xFFFF,6,6),
-            new CellRangeAddress(0,1,0,1),
-            new CellRangeAddress(0,1,2,3),
-            new CellRangeAddress(2,3,0,1),
-            new CellRangeAddress(2,3,2,3),
-        };
-        record.setCellRanges(ranges);
-        ranges = record.getCellRanges();
-        assertEquals(6,ranges.length);
-        CellRangeAddress enclosingCellRange = record.getEnclosingCellRange();
-        assertEquals(0, enclosingCellRange.getFirstRow());
-        assertEquals(65535, enclosingCellRange.getLastRow());
-        assertEquals(0, enclosingCellRange.getFirstColumn());
-        assertEquals(6, enclosingCellRange.getLastColumn());
-
-        assertEquals(false, record.getNeedRecalculation());
-        assertEquals(0, record.getID());
-        
-        record.setNeedRecalculation(true);
-        assertEquals(true, record.getNeedRecalculation());
-        assertEquals(0, record.getID());
-        
-        record.setID(7);
-        record.setNeedRecalculation(false);
-        assertEquals(false, record.getNeedRecalculation());
-        assertEquals(7, record.getID());
-    }
-    
-	public void testSerialization() {
-		byte[] recordData = 
-		{
-			(byte)0x03, (byte)0x00,
-			(byte)0x01,	(byte)0x00,
-			
-			(byte)0x00,	(byte)0x00,
-			(byte)0x03,	(byte)0x00,
-			(byte)0x00,	(byte)0x00,
-			(byte)0x03,	(byte)0x00,
-			
-			(byte)0x04,	(byte)0x00, // nRegions
-			
-			(byte)0x00,	(byte)0x00,
-			(byte)0x01,	(byte)0x00,
-			(byte)0x00,	(byte)0x00,
-			(byte)0x01,	(byte)0x00,
-			
-			(byte)0x00,	(byte)0x00,
-			(byte)0x01,	(byte)0x00,
-			(byte)0x02,	(byte)0x00,
-			(byte)0x03,	(byte)0x00,
-			
-			(byte)0x02,	(byte)0x00,
-			(byte)0x03,	(byte)0x00,
-			(byte)0x00,	(byte)0x00,
-			(byte)0x01,	(byte)0x00,
-			
-			(byte)0x02,	(byte)0x00,
-			(byte)0x03,	(byte)0x00,
-			(byte)0x02,	(byte)0x00,
-			(byte)0x03,	(byte)0x00,
-		};
-
-		CFHeaderRecord record = new CFHeaderRecord(TestcaseRecordInputStream.create(CFHeaderRecord.sid, recordData));
-
-		assertEquals("#CFRULES", 3, record.getNumberOfConditionalFormats());
-		assertTrue(record.getNeedRecalculation());
-		confirm(record.getEnclosingCellRange(), 0, 3, 0, 3);
-		CellRangeAddress[] ranges = record.getCellRanges();
-		assertEquals(4, ranges.length);
-		confirm(ranges[0], 0, 1, 0, 1);
-		confirm(ranges[1], 0, 1, 2, 3);
-		confirm(ranges[2], 2, 3, 0, 1);
-		confirm(ranges[3], 2, 3, 2, 3);
-		assertEquals(recordData.length+4, record.getRecordSize());
-
-		byte[] output = record.serialize();
-
-		assertEquals("Output size", recordData.length+4, output.length); //includes sid+recordlength
-
-		for (int i = 0; i < recordData.length; i++) 
-		{
-			assertEquals("CFHeaderRecord doesn't match", recordData[i], output[i+4]);
-		}
-	}
-	
-	public void testExtremeRows() {
-		byte[] recordData = {
-			(byte)0x13, (byte)0x00, // nFormats
-			(byte)0x00,	(byte)0x00,
-			
-			(byte)0x00,	(byte)0x00,
-			(byte)0xFF,	(byte)0xFF,
-			(byte)0x00,	(byte)0x00,
-			(byte)0xFF,	(byte)0x00,
-			
-			(byte)0x03,	(byte)0x00, // nRegions
-			
-			(byte)0x40,	(byte)0x9C,
-			(byte)0x50,	(byte)0xC3,
-			(byte)0x02,	(byte)0x00,
-			(byte)0x02,	(byte)0x00,
-			
-			(byte)0x00,	(byte)0x00,
-			(byte)0xFF,	(byte)0xFF,
-			(byte)0x05,	(byte)0x00,
-			(byte)0x05,	(byte)0x00,
-			
-			(byte)0x07,	(byte)0x00,
-			(byte)0x07,	(byte)0x00,
-			(byte)0x00,	(byte)0x00,
-			(byte)0xFF,	(byte)0x00,
-		};
-
-		CFHeaderRecord record;
-		try {
-			record = new CFHeaderRecord(TestcaseRecordInputStream.create(CFHeaderRecord.sid, recordData));
-		} catch (IllegalArgumentException e) {
-			if(e.getMessage().equals("invalid cell range (-25536, 2, -15536, 2)")) {
-				throw new AssertionFailedError("Identified bug 44739b");
-			}
-			throw e;
-		}
-
-		assertEquals("#CFRULES", 19, record.getNumberOfConditionalFormats());
-		assertFalse(record.getNeedRecalculation());
-		confirm(record.getEnclosingCellRange(), 0, 65535, 0, 255);
-		CellRangeAddress[] ranges = record.getCellRanges();
-		assertEquals(3, ranges.length);
-		confirm(ranges[0], 40000, 50000, 2, 2);
-		confirm(ranges[1], 0, 65535, 5, 5);
-		confirm(ranges[2], 7, 7, 0, 255);
-
-		byte[] output = record.serialize();
-
-		assertEquals("Output size", recordData.length+4, output.length); //includes sid+recordlength
-
-		for (int i = 0; i < recordData.length;i++) {
-			assertEquals("CFHeaderRecord doesn't match", recordData[i], output[i+4]);
-		}
-	}
-
-	private static void confirm(CellRangeAddress cr, int expFirstRow, int expLastRow, int expFirstCol, int expLastColumn) {
-		assertEquals("first row", expFirstRow, cr.getFirstRow());
-		assertEquals("last row", expLastRow, cr.getLastRow());
-		assertEquals("first column", expFirstCol, cr.getFirstColumn());
-		assertEquals("last column", expLastColumn, cr.getLastColumn());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
deleted file mode 100644
index 3b2591e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator;
-import org.apache.poi.hssf.record.cf.BorderFormatting;
-import org.apache.poi.hssf.record.cf.FontFormatting;
-import org.apache.poi.hssf.record.cf.PatternFormatting;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefNPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Tests the serialization and deserialization of the TestCFRuleRecord
- * class works correctly.
- */
-@SuppressWarnings("resource")
-public final class TestCFRuleRecord extends TestCase {
-    public void testConstructors () {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-
-        CFRuleRecord rule1 = CFRuleRecord.create(sheet, "7");
-        assertEquals(CFRuleRecord.CONDITION_TYPE_FORMULA, rule1.getConditionType());
-        assertEquals(ComparisonOperator.NO_COMPARISON, rule1.getComparisonOperation());
-        assertNotNull(rule1.getParsedExpression1());
-        assertSame(Ptg.EMPTY_PTG_ARRAY, rule1.getParsedExpression2());
-
-        CFRuleRecord rule2 = CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "2", "5");
-        assertEquals(CFRuleRecord.CONDITION_TYPE_CELL_VALUE_IS, rule2.getConditionType());
-        assertEquals(ComparisonOperator.BETWEEN, rule2.getComparisonOperation());
-        assertNotNull(rule2.getParsedExpression1());
-        assertNotNull(rule2.getParsedExpression2());
-
-        CFRuleRecord rule3 = CFRuleRecord.create(sheet, ComparisonOperator.EQUAL, null, null);
-        assertEquals(CFRuleRecord.CONDITION_TYPE_CELL_VALUE_IS, rule3.getConditionType());
-        assertEquals(ComparisonOperator.EQUAL, rule3.getComparisonOperation());
-        assertSame(Ptg.EMPTY_PTG_ARRAY, rule3.getParsedExpression2());
-        assertSame(Ptg.EMPTY_PTG_ARRAY, rule3.getParsedExpression2());
-    }
-
-    public void testCreateCFRuleRecord() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        CFRuleRecord record = CFRuleRecord.create(sheet, "7");
-        testCFRuleRecord(record);
-
-        // Serialize
-        byte [] serializedRecord = record.serialize();
-
-        // Strip header
-        byte [] recordData = new byte[serializedRecord.length-4];
-        System.arraycopy(serializedRecord, 4, recordData, 0, recordData.length);
-
-        // Deserialize
-        record = new CFRuleRecord(TestcaseRecordInputStream.create(CFRuleRecord.sid, recordData));
-
-        // Serialize again
-        byte[] output = record.serialize();
-
-        // Compare
-        assertEquals("Output size", recordData.length+4, output.length); //includes sid+recordlength
-
-        for (int i = 0; i < recordData.length;i++)
-        {
-            assertEquals("CFRuleRecord doesn't match", recordData[i], output[i+4]);
-        }
-    }
-
-    public void testCreateCFRule12Record() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        CFRule12Record record = CFRule12Record.create(sheet, "7");
-        testCFRule12Record(record);
-
-        // Serialize
-        byte [] serializedRecord = record.serialize();
-
-        // Strip header
-        byte [] recordData = new byte[serializedRecord.length-4];
-        System.arraycopy(serializedRecord, 4, recordData, 0, recordData.length);
-
-        // Deserialize
-        record = new CFRule12Record(TestcaseRecordInputStream.create(CFRule12Record.sid, recordData));
-
-        // Serialize again
-        byte[] output = record.serialize();
-
-        // Compare
-        assertEquals("Output size", recordData.length+4, output.length); //includes sid+recordlength
-
-        for (int i = 0; i < recordData.length;i++)
-        {
-            assertEquals("CFRule12Record doesn't match", recordData[i], output[i+4]);
-        }
-    }
-
-    public void testCreateIconCFRule12Record() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        CFRule12Record record = CFRule12Record.create(sheet, IconSet.GREY_5_ARROWS);
-        record.getMultiStateFormatting().getThresholds()[1].setType(RangeType.PERCENT.id);
-        record.getMultiStateFormatting().getThresholds()[1].setValue(10d);
-        record.getMultiStateFormatting().getThresholds()[2].setType(RangeType.NUMBER.id);
-        record.getMultiStateFormatting().getThresholds()[2].setValue(-4d);
-        
-        // Check it 
-        testCFRule12Record(record);
-        assertEquals(IconSet.GREY_5_ARROWS, record.getMultiStateFormatting().getIconSet());
-        assertEquals(5, record.getMultiStateFormatting().getThresholds().length);
-
-        // Serialize
-        byte [] serializedRecord = record.serialize();
-
-        // Strip header
-        byte [] recordData = new byte[serializedRecord.length-4];
-        System.arraycopy(serializedRecord, 4, recordData, 0, recordData.length);
-
-        // Deserialize
-        record = new CFRule12Record(TestcaseRecordInputStream.create(CFRule12Record.sid, recordData));
-        
-        // Check it has the icon, and the right number of thresholds
-        assertEquals(IconSet.GREY_5_ARROWS, record.getMultiStateFormatting().getIconSet());
-        assertEquals(5, record.getMultiStateFormatting().getThresholds().length);
-
-        // Serialize again
-        byte[] output = record.serialize();
-
-        // Compare
-        assertEquals("Output size", recordData.length+4, output.length); //includes sid+recordlength
-
-        for (int i = 0; i < recordData.length;i++)
-        {
-            assertEquals("CFRule12Record doesn't match", recordData[i], output[i+4]);
-        }
-    }
-    
-    private void testCFRuleRecord(CFRuleRecord record) {
-        testCFRuleBase(record);
-        
-        assertFalse(record.isLeftBorderModified());
-        record.setLeftBorderModified(true);
-        assertTrue(record.isLeftBorderModified());
-
-        assertFalse(record.isRightBorderModified());
-        record.setRightBorderModified(true);
-        assertTrue(record.isRightBorderModified());
-
-        assertFalse(record.isTopBorderModified());
-        record.setTopBorderModified(true);
-        assertTrue(record.isTopBorderModified());
-
-        assertFalse(record.isBottomBorderModified());
-        record.setBottomBorderModified(true);
-        assertTrue(record.isBottomBorderModified());
-
-        assertFalse(record.isTopLeftBottomRightBorderModified());
-        record.setTopLeftBottomRightBorderModified(true);
-        assertTrue(record.isTopLeftBottomRightBorderModified());
-
-        assertFalse(record.isBottomLeftTopRightBorderModified());
-        record.setBottomLeftTopRightBorderModified(true);
-        assertTrue(record.isBottomLeftTopRightBorderModified());
-
-
-        assertFalse(record.isPatternBackgroundColorModified());
-        record.setPatternBackgroundColorModified(true);
-        assertTrue(record.isPatternBackgroundColorModified());
-
-        assertFalse(record.isPatternColorModified());
-        record.setPatternColorModified(true);
-        assertTrue(record.isPatternColorModified());
-
-        assertFalse(record.isPatternStyleModified());
-        record.setPatternStyleModified(true);
-        assertTrue(record.isPatternStyleModified());
-    }
-    private void testCFRule12Record(CFRule12Record record) {
-        assertEquals(CFRule12Record.sid, record.getFutureRecordType());
-        assertEquals("A1", record.getAssociatedRange().formatAsString());
-        testCFRuleBase(record);
-    }
-    private void testCFRuleBase(CFRuleBase record) {
-        FontFormatting fontFormatting = new FontFormatting();
-        testFontFormattingAccessors(fontFormatting);
-        assertFalse(record.containsFontFormattingBlock());
-        record.setFontFormatting(fontFormatting);
-        assertTrue(record.containsFontFormattingBlock());
-
-        BorderFormatting borderFormatting = new BorderFormatting();
-        testBorderFormattingAccessors(borderFormatting);
-        assertFalse(record.containsBorderFormattingBlock());
-        record.setBorderFormatting(borderFormatting);
-        assertTrue(record.containsBorderFormattingBlock());
-
-        PatternFormatting patternFormatting = new PatternFormatting();
-        testPatternFormattingAccessors(patternFormatting);
-        assertFalse(record.containsPatternFormattingBlock());
-        record.setPatternFormatting(patternFormatting);
-        assertTrue(record.containsPatternFormattingBlock());
-    }
-
-    private void testPatternFormattingAccessors(PatternFormatting patternFormatting) {
-        patternFormatting.setFillBackgroundColor(HSSFColor.GREEN.index);
-        assertEquals(HSSFColor.GREEN.index,patternFormatting.getFillBackgroundColor());
-
-        patternFormatting.setFillForegroundColor(HSSFColor.INDIGO.index);
-        assertEquals(HSSFColor.INDIGO.index,patternFormatting.getFillForegroundColor());
-
-        patternFormatting.setFillPattern(PatternFormatting.DIAMONDS);
-        assertEquals(PatternFormatting.DIAMONDS,patternFormatting.getFillPattern());
-    }
-
-    private void testBorderFormattingAccessors(BorderFormatting borderFormatting) {
-        borderFormatting.setBackwardDiagonalOn(false);
-        assertFalse(borderFormatting.isBackwardDiagonalOn());
-        borderFormatting.setBackwardDiagonalOn(true);
-        assertTrue(borderFormatting.isBackwardDiagonalOn());
-
-        borderFormatting.setBorderBottom(BorderFormatting.BORDER_DOTTED);
-        assertEquals(BorderFormatting.BORDER_DOTTED, borderFormatting.getBorderBottom());
-
-        borderFormatting.setBorderDiagonal(BorderFormatting.BORDER_MEDIUM);
-        assertEquals(BorderFormatting.BORDER_MEDIUM, borderFormatting.getBorderDiagonal());
-
-        borderFormatting.setBorderLeft(BorderFormatting.BORDER_MEDIUM_DASH_DOT_DOT);
-        assertEquals(BorderFormatting.BORDER_MEDIUM_DASH_DOT_DOT, borderFormatting.getBorderLeft());
-
-        borderFormatting.setBorderRight(BorderFormatting.BORDER_MEDIUM_DASHED);
-        assertEquals(BorderFormatting.BORDER_MEDIUM_DASHED, borderFormatting.getBorderRight());
-
-        borderFormatting.setBorderTop(BorderFormatting.BORDER_HAIR);
-        assertEquals(BorderFormatting.BORDER_HAIR, borderFormatting.getBorderTop());
-
-        borderFormatting.setBottomBorderColor(HSSFColor.AQUA.index);
-        assertEquals(HSSFColor.AQUA.index, borderFormatting.getBottomBorderColor());
-
-        borderFormatting.setDiagonalBorderColor(HSSFColor.RED.index);
-        assertEquals(HSSFColor.RED.index, borderFormatting.getDiagonalBorderColor());
-
-        assertFalse(borderFormatting.isForwardDiagonalOn());
-        borderFormatting.setForwardDiagonalOn(true);
-        assertTrue(borderFormatting.isForwardDiagonalOn());
-
-        borderFormatting.setLeftBorderColor(HSSFColor.BLACK.index);
-        assertEquals(HSSFColor.BLACK.index, borderFormatting.getLeftBorderColor());
-
-        borderFormatting.setRightBorderColor(HSSFColor.BLUE.index);
-        assertEquals(HSSFColor.BLUE.index, borderFormatting.getRightBorderColor());
-
-        borderFormatting.setTopBorderColor(HSSFColor.GOLD.index);
-        assertEquals(HSSFColor.GOLD.index, borderFormatting.getTopBorderColor());
-    }
-
-
-    private void testFontFormattingAccessors(FontFormatting fontFormatting) {
-        // Check for defaults
-        assertFalse(fontFormatting.isEscapementTypeModified());
-        assertFalse(fontFormatting.isFontCancellationModified());
-        assertFalse(fontFormatting.isFontOutlineModified());
-        assertFalse(fontFormatting.isFontShadowModified());
-        assertFalse(fontFormatting.isFontStyleModified());
-        assertFalse(fontFormatting.isUnderlineTypeModified());
-        assertFalse(fontFormatting.isFontWeightModified());
-
-        assertFalse(fontFormatting.isBold());
-        assertFalse(fontFormatting.isItalic());
-        assertFalse(fontFormatting.isOutlineOn());
-        assertFalse(fontFormatting.isShadowOn());
-        assertFalse(fontFormatting.isStruckout());
-
-        assertEquals(0, fontFormatting.getEscapementType());
-        assertEquals(-1, fontFormatting.getFontColorIndex());
-        assertEquals(-1, fontFormatting.getFontHeight());
-        assertEquals(0, fontFormatting.getFontWeight());
-        assertEquals(0, fontFormatting.getUnderlineType());
-
-        fontFormatting.setBold(true);
-        assertTrue(fontFormatting.isBold());
-        fontFormatting.setBold(false);
-        assertFalse(fontFormatting.isBold());
-
-        fontFormatting.setEscapementType(FontFormatting.SS_SUB);
-        assertEquals(FontFormatting.SS_SUB, fontFormatting.getEscapementType());
-        fontFormatting.setEscapementType(FontFormatting.SS_SUPER);
-        assertEquals(FontFormatting.SS_SUPER, fontFormatting.getEscapementType());
-        fontFormatting.setEscapementType(FontFormatting.SS_NONE);
-        assertEquals(FontFormatting.SS_NONE, fontFormatting.getEscapementType());
-
-        fontFormatting.setEscapementTypeModified(false);
-        assertFalse(fontFormatting.isEscapementTypeModified());
-        fontFormatting.setEscapementTypeModified(true);
-        assertTrue(fontFormatting.isEscapementTypeModified());
-
-        fontFormatting.setFontWieghtModified(false);
-        assertFalse(fontFormatting.isFontWeightModified());
-        fontFormatting.setFontWieghtModified(true);
-        assertTrue(fontFormatting.isFontWeightModified());
-
-        fontFormatting.setFontCancellationModified(false);
-        assertFalse(fontFormatting.isFontCancellationModified());
-        fontFormatting.setFontCancellationModified(true);
-        assertTrue(fontFormatting.isFontCancellationModified());
-
-        fontFormatting.setFontColorIndex((short)10);
-        assertEquals(10,fontFormatting.getFontColorIndex());
-
-        fontFormatting.setFontHeight(100);
-        assertEquals(100,fontFormatting.getFontHeight());
-
-        fontFormatting.setFontOutlineModified(false);
-        assertFalse(fontFormatting.isFontOutlineModified());
-        fontFormatting.setFontOutlineModified(true);
-        assertTrue(fontFormatting.isFontOutlineModified());
-
-        fontFormatting.setFontShadowModified(false);
-        assertFalse(fontFormatting.isFontShadowModified());
-        fontFormatting.setFontShadowModified(true);
-        assertTrue(fontFormatting.isFontShadowModified());
-
-        fontFormatting.setFontStyleModified(false);
-        assertFalse(fontFormatting.isFontStyleModified());
-        fontFormatting.setFontStyleModified(true);
-        assertTrue(fontFormatting.isFontStyleModified());
-
-        fontFormatting.setItalic(false);
-        assertFalse(fontFormatting.isItalic());
-        fontFormatting.setItalic(true);
-        assertTrue(fontFormatting.isItalic());
-
-        fontFormatting.setOutline(false);
-        assertFalse(fontFormatting.isOutlineOn());
-        fontFormatting.setOutline(true);
-        assertTrue(fontFormatting.isOutlineOn());
-
-        fontFormatting.setShadow(false);
-        assertFalse(fontFormatting.isShadowOn());
-        fontFormatting.setShadow(true);
-        assertTrue(fontFormatting.isShadowOn());
-
-        fontFormatting.setStrikeout(false);
-        assertFalse(fontFormatting.isStruckout());
-        fontFormatting.setStrikeout(true);
-        assertTrue(fontFormatting.isStruckout());
-
-        fontFormatting.setUnderlineType(FontFormatting.U_DOUBLE_ACCOUNTING);
-        assertEquals(FontFormatting.U_DOUBLE_ACCOUNTING, fontFormatting.getUnderlineType());
-
-        fontFormatting.setUnderlineTypeModified(false);
-        assertFalse(fontFormatting.isUnderlineTypeModified());
-        fontFormatting.setUnderlineTypeModified(true);
-        assertTrue(fontFormatting.isUnderlineTypeModified());
-    }
-
-    public void testWrite() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        CFRuleRecord rr = CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "5", "10");
-
-        PatternFormatting patternFormatting = new PatternFormatting();
-        patternFormatting.setFillPattern(PatternFormatting.BRICKS);
-        rr.setPatternFormatting(patternFormatting);
-
-        byte[] data = rr.serialize();
-        assertEquals(26, data.length);
-        assertEquals(3, LittleEndian.getShort(data, 6));
-        assertEquals(3, LittleEndian.getShort(data, 8));
-
-        int flags = LittleEndian.getInt(data, 10);
-        assertEquals("unused flags should be 111", 0x00380000, flags & 0x00380000);
-        assertEquals("undocumented flags should be 0000", 0, flags & 0x03C00000); // Otherwise Excel gets unhappy
-        // check all remaining flag bits (some are not well understood yet)
-        assertEquals(0x203FFFFF, flags);
-    }
-
-    private static final byte[] DATA_REFN = {
-        // formula extracted from bugzilla 45234 att 22141
-        1, 3,
-        9, // formula 1 length
-        0, 0, 0, -1, -1, 63, 32, 2, -128, 0, 0, 0, 5,
-        // formula 1: "=B3=1" (formula is relative to B4)
-        76, -1, -1, 0, -64, // tRefN(B1)
-        30, 1, 0,
-        11,
-    };
-
-    /**
-     * tRefN and tAreaN tokens must be preserved when re-serializing conditional format formulas
-     */
-    public void testReserializeRefNTokens() {
-
-        RecordInputStream is = TestcaseRecordInputStream.create(CFRuleRecord.sid, DATA_REFN);
-        CFRuleRecord rr = new CFRuleRecord(is);
-        Ptg[] ptgs = rr.getParsedExpression1();
-        assertEquals(3, ptgs.length);
-        if (ptgs[0] instanceof RefPtg) {
-            throw new AssertionFailedError("Identified bug 45234");
-        }
-        assertEquals(RefNPtg.class, ptgs[0].getClass());
-        RefNPtg refNPtg = (RefNPtg) ptgs[0];
-        assertTrue(refNPtg.isColRelative());
-        assertTrue(refNPtg.isRowRelative());
-
-        byte[] data = rr.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(CFRuleRecord.sid, DATA_REFN, data);
-    }
-    
-    public void testBug53691() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-
-        CFRuleRecord record = CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "2", "5");
-        
-        CFRuleRecord clone = record.clone();
-        
-        byte [] serializedRecord = record.serialize();
-        byte [] serializedClone = clone.serialize();
-        assertArrayEquals(serializedRecord, serializedClone);
-    }
-    
-    public void testBug57231_rewrite() {
-        HSSFWorkbook wb = HSSFITestDataProvider.instance.openSampleWorkbook("57231_MixedGasReport.xls");
-        assertEquals(7, wb.getNumberOfSheets());
-        wb = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        assertEquals(7, wb.getNumberOfSheets());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
deleted file mode 100644
index 8e5b482..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests for {@link ColumnInfoRecord}
- *
- * @author Josh Micich
- */
-public final class TestColumnInfoRecord extends TestCase {
-
-	public void testBasic() {
-		byte[] data = HexRead.readFromString("7D 00 0C 00 14 00 9B 00 C7 19 0F 00 01 13 00 00");
-
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		ColumnInfoRecord cir = new ColumnInfoRecord(in);
-		assertEquals(0, in.remaining());
-
-		assertEquals(20, cir.getFirstColumn());
-		assertEquals(155, cir.getLastColumn());
-		assertEquals(6599, cir.getColumnWidth());
-		assertEquals(15, cir.getXFIndex());
-		assertEquals(true, cir.getHidden());
-		assertEquals(3, cir.getOutlineLevel());
-		assertEquals(true, cir.getCollapsed());
-		assertArrayEquals(data, cir.serialize());
-	}
-
-	/**
-	 * Some applications skip the last reserved field when writing {@link ColumnInfoRecord}s
-	 * The attached file was apparently created by "SoftArtisans OfficeWriter for Excel".
-	 * Excel reads that file OK and assumes zero for the value of the reserved field.
-	 */
-	public void testZeroResevedBytes_bug48332() {
-		// Taken from bugzilla attachment 24661 (offset 0x1E73)
-		byte[] inpData = HexRead.readFromString("7D 00 0A 00 00 00 00 00 D5 19 0F 00 02 00");
-		byte[] outData = HexRead.readFromString("7D 00 0C 00 00 00 00 00 D5 19 0F 00 02 00 00 00");
-
-		RecordInputStream in = TestcaseRecordInputStream.create(inpData);
-		ColumnInfoRecord cir;
-		try {
-			cir = new ColumnInfoRecord(in);
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("Unusual record size remaining=(0)")) {
-				throw new AssertionFailedError("Identified bug 48332");
-			}
-			throw e;
-		}
-		assertEquals(0, in.remaining());
-		assertArrayEquals(outData, cir.serialize());
-	}
-
-	/**
-	 * Some sample files have just one reserved byte (field 6):
-	 * OddStyleRecord.xls, NoGutsRecords.xls, WORKBOOK_in_capitals.xls
-	 * but this seems to cause no problem to Excel
-	 */
-	public void testOneReservedByte() {
-		byte[] inpData = HexRead.readFromString("7D 00 0B 00 00 00 00 00 24 02 0F 00 00 00 01");
-		byte[] outData = HexRead.readFromString("7D 00 0C 00 00 00 00 00 24 02 0F 00 00 00 01 00");
-		RecordInputStream in = TestcaseRecordInputStream.create(inpData);
-		ColumnInfoRecord cir = new ColumnInfoRecord(in);
-		assertEquals(0, in.remaining());
-		assertArrayEquals(outData, cir.serialize());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
deleted file mode 100644
index 7ff8623..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the {@link CommonObjectDataSubRecord}
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestCommonObjectDataSubRecord extends TestCase {
-	byte[] data = new byte[] {
-		(byte)0x12,(byte)0x00,(byte)0x01,(byte)0x00,
-		(byte)0x01,(byte)0x00,(byte)0x11,(byte)0x60,
-		(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-		(byte)0x00,(byte)0x0D,(byte)0x26,(byte)0x01,
-		(byte)0x00,(byte)0x00,
-	};
-
-	public void testLoad() {
-		CommonObjectDataSubRecord record = new CommonObjectDataSubRecord(TestcaseRecordInputStream.createLittleEndian(data), data.length);
-
-		assertEquals( CommonObjectDataSubRecord.OBJECT_TYPE_LIST_BOX, record.getObjectType());
-		assertEquals((short) 1, record.getObjectId());
-		assertEquals((short) 1, record.getOption());
-		assertEquals(true, record.isLocked());
-		assertEquals(false, record.isPrintable());
-		assertEquals(false, record.isAutofill());
-		assertEquals(false, record.isAutoline());
-		assertEquals(24593, record.getReserved1());
-		assertEquals(218103808, record.getReserved2());
-		assertEquals(294, record.getReserved3());
-		assertEquals(18, record.getDataSize());
-	}
-
-	public void testStore() {
-		CommonObjectDataSubRecord record = new CommonObjectDataSubRecord();
-
-		record.setObjectType(CommonObjectDataSubRecord.OBJECT_TYPE_LIST_BOX);
-		record.setObjectId( 1);
-		record.setOption((short) 1);
-		record.setLocked(true);
-		record.setPrintable(false);
-		record.setAutofill(false);
-		record.setAutoline(false);
-		record.setReserved1(24593);
-		record.setReserved2(218103808);
-		record.setReserved3(294);
-
-		byte [] recordBytes = record.serialize();
-		assertEquals(recordBytes.length - 4, data.length);
-		for (int i = 0; i < data.length; i++)
-			assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
deleted file mode 100644
index b101a4e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import junit.framework.TestCase;
-import org.apache.poi.util.LittleEndianOutputStream;
-
-/**
- * Unit tests for DConRefRecord class.
- *
- * @author Niklas Rehfeld
- */
-public class TestDConRefRecord extends TestCase
-{
-    /**
-     * record of a proper single-byte external 'volume'-style path with multiple parts and a sheet
-     * name.
-     */
-    final byte[] volumeString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        17, 0,//cchFile (2 bytes)
-        0, //char type
-        1, 1, 'c', '[', 'f', 'o', 'o', 0x3,
-        'b', 'a', 'r', ']', 's', 'h', 'e', 'e',
-        't'
-    };
-    /**
-     * record of a proper single-byte external 'unc-volume'-style path with multiple parts and a
-     * sheet name.
-     */
-    final byte[] uncVolumeString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        34, 0,//cchFile (2 bytes)
-        0, //char type
-        1, 1, '@', '[', 'c', 'o', 'm', 'p',
-        0x3, 's', 'h', 'a', 'r', 'e', 'd', 0x3,
-        'r', 'e', 'l', 'a', 't', 'i', 'v', 'e',
-        0x3, 'f', 'o', 'o', ']', 's', 'h', 'e',
-        'e', 't'
-    };
-    /**
-     * record of a proper single-byte external 'simple-file-path-dcon' style path with a sheet name.
-     */
-    final byte[] simpleFilePathDconString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        16, 0,//cchFile (2 bytes)
-        0, //char type
-        1, 'c', '[', 'f', 'o', 'o', 0x3, 'b',
-        'a', 'r', ']', 's', 'h', 'e', 'e', 't'
-    };
-    /**
-     * record of a proper 'transfer-protocol'-style path. This one has a sheet name at the end, and
-     * another one inside the file path. The spec doesn't seem to care about what they are.
-     */
-    final byte[] transferProtocolString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        33, 0,//cchFile (2 bytes)
-        0, //char type
-        0x1, 0x5, 30, //count = 30
-        '[', 'h', 't', 't', 'p', ':', '/', '/',
-        '[', 'f', 'o', 'o', 0x3, 'b', 'a', 'r',
-        ']', 's', 'h', 'e', 'e', 't', '1', ']',
-        's', 'h', 'e', 'e', 't', 'x'
-    };
-    /**
-     * startup-type path.
-     */
-    final byte[] relVolumeString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        16, 0,//cchFile (2 bytes)
-        0, //char type
-        0x1, 0x2, '[', 'f', 'o', 'o', 0x3, 'b',
-        'a', 'r', ']', 's', 'h', 'e', 'e', 't'
-    };
-    /**
-     * startup-type path.
-     */
-    final byte[] startupString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        16, 0,//cchFile (2 bytes)
-        0, //char type
-        0x1, 0x6, '[', 'f', 'o', 'o', 0x3, 'b',
-        'a', 'r', ']', 's', 'h', 'e', 'e', 't'
-    };
-    /**
-     * alt-startup-type path.
-     */
-    final byte[] altStartupString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        16, 0,//cchFile (2 bytes)
-        0, //char type
-        0x1, 0x7, '[', 'f', 'o', 'o', 0x3, 'b',
-        'a', 'r', ']', 's', 'h', 'e', 'e', 't'
-    };
-    /**
-     * library-style path.
-     */
-    final byte[] libraryString = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        16, 0,//cchFile (2 bytes)
-        0, //char type
-        0x1, 0x8, '[', 'f', 'o', 'o', 0x3, 'b',
-        'a', 'r', ']', 's', 'h', 'e', 'e', 't'
-    };
-    /**
-     * record of single-byte string, external, volume path.
-     */
-    final byte[] data1 = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        10, 0,//cchFile (2 bytes)
-        0, //char type
-        1, 1, (byte) 'b', (byte) 'l', (byte) 'a', (byte) ' ', (byte) 't',
-        (byte) 'e', (byte) 's', (byte) 't'
-    //unused doesn't exist as stFile[1] != 2
-    };
-    /**
-     * record of double-byte string, self-reference.
-     */
-    final byte[] data2 = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        9, 0,//cchFile (2 bytes)
-        1, //char type = unicode
-        2, 0, (byte) 'b', 0, (byte) 'l', 0, (byte) 'a', 0, (byte) ' ', 0, (byte) 't', 0,
-        (byte) 'e', 0, (byte) 's', (byte) 't', 0,//stFile
-        0, 0 //unused (2 bytes as we're using double-byte chars)
-    };
-    /**
-     * record of single-byte string, self-reference.
-     */
-    final byte[] data3 = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        9, 0,//cchFile (2 bytes)
-        0, //char type = ansi
-        2, (byte) 'b', (byte) 'l', (byte) 'a', (byte) ' ', (byte) 't', (byte) 'e', (byte) 's',
-        (byte) 't',//stFile
-        0 //unused (1 byte as we're using single byes)
-    };
-    /**
-     * double-byte string, external reference, unc-volume.
-     */
-    final byte[] data4 = new byte[]
-    {
-        0, 0, 0, 0, 0, 0, //ref (6 bytes) not used...
-        16, 0,//cchFile (2 bytes)
-        //stFile starts here:
-        1, //char type = unicode
-        1, 0, 1, 0, 0x40, 0, (byte) 'c', 0, (byte) 'o', 0, (byte) 'm', 0, (byte) 'p', 0, 0x03, 0,
-        (byte) 'b', 0, (byte) 'l', 0, (byte) 'a', 0, 0x03, 0, (byte) 't', 0, (byte) 'e', 0,
-        (byte) 's', 0, (byte) 't', 0,
-    //unused doesn't exist as stFile[1] != 2
-    };
-
-    /**
-     * test read-constructor-then-serialize for a single-byte external reference strings of
-     * various flavours. This uses the RecordInputStream constructor.
-     * @throws IOException
-     */
-    public void testReadWriteSBExtRef() throws IOException
-    {
-        testReadWrite(data1, "read-write single-byte external reference, volume type path");
-        testReadWrite(volumeString,
-                "read-write properly formed single-byte external reference, volume type path");
-        testReadWrite(uncVolumeString,
-                "read-write properly formed single-byte external reference, UNC volume type path");
-        testReadWrite(relVolumeString,
-                "read-write properly formed single-byte external reference, rel-volume type path");
-        testReadWrite(simpleFilePathDconString,
-                "read-write properly formed single-byte external reference, simple-file-path-dcon type path");
-        testReadWrite(transferProtocolString,
-                "read-write properly formed single-byte external reference, transfer-protocol type path");
-        testReadWrite(startupString,
-                "read-write properly formed single-byte external reference, startup type path");
-        testReadWrite(altStartupString,
-                "read-write properly formed single-byte external reference, alt-startup type path");
-        testReadWrite(libraryString,
-                "read-write properly formed single-byte external reference, library type path");
-    }
-
-    /**
-     * test read-constructor-then-serialize for a double-byte external reference 'UNC-Volume' style
-     * string
-     * <p/>
-     * @throws IOException
-     */
-    public void testReadWriteDBExtRefUncVol() throws IOException
-    {
-        testReadWrite(data4, "read-write double-byte external reference, UNC volume type path");
-    }
-
-    private void testReadWrite(byte[] data, String message) throws IOException
-    {
-        RecordInputStream is = TestcaseRecordInputStream.create(81, data);
-        DConRefRecord d = new DConRefRecord(is);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream(data.length);
-        LittleEndianOutputStream o = new LittleEndianOutputStream(bos);
-        d.serialize(o);
-        o.flush();
-
-        assertTrue(message, Arrays.equals(data,
-                bos.toByteArray()));
-    }
-
-    /**
-     * test read-constructor-then-serialize for a double-byte self-reference style string
-     * <p/>
-     * @throws IOException
-     */
-    public void testReadWriteDBSelfRef() throws IOException
-    {
-        testReadWrite(data2, "read-write double-byte self reference");
-    }
-
-    /**
-     * test read-constructor-then-serialize for a single-byte self-reference style string
-     * <p/>
-     * @throws IOException
-     */
-    public void testReadWriteSBSelfRef() throws IOException
-    {
-        testReadWrite(data3, "read-write single byte self reference");
-    }
-
-    /**
-     * Test of getDataSize method, of class DConRefRecord.
-     */
-    public void testGetDataSize()
-    {
-        DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
-        int expResult = data1.length;
-        int result = instance.getDataSize();
-        assertEquals("single byte external reference, volume type path data size", expResult, result);
-        instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data2));
-        assertEquals("double byte self reference data size", data2.length, instance.getDataSize());
-        instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data3));
-        assertEquals("single byte self reference data size", data3.length, instance.getDataSize());
-        instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data4));
-        assertEquals("double byte external reference, UNC volume type path data size", data4.length,
-                instance.getDataSize());
-    }
-
-    /**
-     * Test of getSid method, of class DConRefRecord.
-     */
-    public void testGetSid()
-    {
-        DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
-        short expResult = 81;
-        short result = instance.getSid();
-        assertEquals("SID", expResult, result);
-    }
-
-    /**
-     * Test of getPath method, of class DConRefRecord.
-     * @todo different types of paths.
-     */
-    public void testGetPath()
-    {
-        DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
-        byte[] expResult = Arrays.copyOfRange(data1, 9, data1.length);
-        byte[] result = instance.getPath();
-        assertTrue("get path", Arrays.equals(expResult, result));
-    }
-
-    /**
-     * Test of isExternalRef method, of class DConRefRecord.
-     */
-    public void testIsExternalRef()
-    {
-        DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
-        assertTrue("external reference", instance.isExternalRef());
-        instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data2));
-        assertFalse("internal reference", instance.isExternalRef());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java
deleted file mode 100644
index bcfb766..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayInputStream;
-
-import org.apache.poi.util.LittleEndian;
-
-import junit.framework.TestCase;
-
-/**
- * 
- * @author Josh Micich
- */
-public final class TestDVALRecord extends TestCase {
-    public void testRead() {
-        
-        byte[] data = new byte[22];
-        LittleEndian.putShort(data, 0, DVALRecord.sid);
-        LittleEndian.putShort(data, 2, (short)18);
-        LittleEndian.putShort(data, 4, (short)55);
-        LittleEndian.putInt(data, 6, 56);
-        LittleEndian.putInt(data, 10, 57);
-        LittleEndian.putInt(data, 14, 58);
-        LittleEndian.putInt(data, 18, 59);
-       
-        RecordInputStream in = new RecordInputStream(new ByteArrayInputStream(data));
-        in.nextRecord();
-        DVALRecord dv = new DVALRecord(in);
-        
-        assertEquals(55, dv.getOptions());
-        assertEquals(56, dv.getHorizontalPos());
-        assertEquals(57, dv.getVerticalPos());
-        assertEquals(58, dv.getObjectID());
-        if(dv.getDVRecNo() == 0) {
-            fail("Identified bug 44510");
-        }
-        assertEquals(59, dv.getDVRecNo());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
deleted file mode 100644
index 17d6475..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.util.HexDump;
-
-public final class TestDrawingGroupRecord extends TestCase {
-    private static final int MAX_RECORD_SIZE = 8228;
-    private static final int MAX_DATA_SIZE = MAX_RECORD_SIZE - 4;
-
-    public void testGetRecordSize() {
-        DrawingGroupRecord r = new DrawingGroupRecord();
-        assertEquals(4, r.getRecordSize());
-
-        EscherSpRecord sp = new EscherSpRecord();
-        sp.setRecordId(EscherSpRecord.RECORD_ID);
-        sp.setOptions((short) 0x1111);
-        sp.setFlags(-1);
-        sp.setShapeId(-1);
-        EscherContainerRecord dggContainer = new EscherContainerRecord();
-        dggContainer.setOptions((short) 0x000F);
-        dggContainer.setRecordId((short) 0xF000);
-        dggContainer.addChildRecord(sp);
-
-        r.addEscherRecord(dggContainer);
-        assertEquals(28, r.getRecordSize());
-
-        byte[] data = new byte[28];
-        int size = r.serialize(0, data);
-        assertEquals("[EB, 00, 18, 00, 0F, 00, 00, F0, 10, 00, 00, 00, 11, 11, 0A, F0, 08, 00, 00, 00, FF, FF, FF, FF, FF, FF, FF, FF]", HexDump.toHex(data));
-        assertEquals(28, size);
-
-        assertEquals(24, dggContainer.getRecordSize());
-
-
-        r = new DrawingGroupRecord( );
-        r.setRawData( new byte[MAX_DATA_SIZE] );
-        assertEquals( MAX_RECORD_SIZE, r.getRecordSize() );
-        r.setRawData( new byte[MAX_DATA_SIZE+1] );
-        assertEquals( MAX_RECORD_SIZE + 5, r.getRecordSize() );
-        r.setRawData( new byte[MAX_DATA_SIZE*2] );
-        assertEquals( MAX_RECORD_SIZE * 2, r.getRecordSize() );
-        r.setRawData( new byte[MAX_DATA_SIZE*2 + 1] );
-        assertEquals( MAX_RECORD_SIZE * 2 + 5, r.getRecordSize() );
-    }
-
-    public void testSerialize() {
-        // Check under max record size
-        DrawingGroupRecord r = new DrawingGroupRecord();
-        byte[] rawData = new byte[100];
-        rawData[0] = 100;
-        rawData[99] = (byte) 200;
-        r.setRawData( rawData );
-        byte[] buffer = new byte[r.getRecordSize()];
-        int size = r.serialize( 0, buffer );
-        assertEquals( 104, size );
-        assertEquals("[EB, 00, 64, 00, 64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, C8]", HexDump.toHex(buffer));
-
-        // check at max record size
-        rawData = new byte[MAX_DATA_SIZE];
-        r.setRawData( rawData );
-        buffer = new byte[r.getRecordSize()];
-        size = r.serialize( 0, buffer );
-        assertEquals( MAX_RECORD_SIZE, size );
-
-        // check over max record size
-        rawData = new byte[MAX_DATA_SIZE+1];
-        rawData[rawData.length-1] = (byte) 255;
-        r.setRawData( rawData );
-        buffer = new byte[r.getRecordSize()];
-        size = r.serialize( 0, buffer );
-        assertEquals( MAX_RECORD_SIZE + 5, size );
-        assertEquals( "[EB, 00, 20, 20]", HexDump.toHex(cut(buffer, 0, 4) ));
-        assertEquals( "[00, EB, 00, 01, 00, FF]", HexDump.toHex(cut(buffer, MAX_RECORD_SIZE - 1, MAX_RECORD_SIZE + 5) ));
-
-        // check continue record
-        rawData = new byte[MAX_DATA_SIZE * 2 + 1];
-        rawData[rawData.length-1] = (byte) 255;
-        r.setRawData( rawData );
-        buffer = new byte[r.getRecordSize()];
-        size = r.serialize( 0, buffer );
-        assertEquals( MAX_RECORD_SIZE * 2 + 5, size );
-        assertEquals( MAX_RECORD_SIZE * 2 + 5, r.getRecordSize() );
-        assertEquals( "[EB, 00, 20, 20]", HexDump.toHex(cut(buffer, 0, 4) ));
-        assertEquals( "[EB, 00, 20, 20]", HexDump.toHex(cut(buffer, MAX_RECORD_SIZE, MAX_RECORD_SIZE + 4) ));
-        assertEquals( "[3C, 00, 01, 00, FF]", HexDump.toHex(cut(buffer, MAX_RECORD_SIZE * 2, MAX_RECORD_SIZE * 2 + 5) ));
-
-        // check continue record
-        rawData = new byte[664532];
-        r.setRawData( rawData );
-        buffer = new byte[r.getRecordSize()];
-        size = r.serialize( 0, buffer );
-        assertEquals( 664856, size );
-        assertEquals( 664856, r.getRecordSize() );
-    }
-
-    private static byte[] cut( byte[] data, int fromInclusive, int toExclusive )
-    {
-        int length = toExclusive - fromInclusive;
-        byte[] result = new byte[length];
-        System.arraycopy( data, fromInclusive, result, 0, length);
-        return result;
-    }
-
-    public void testGrossSizeFromDataSize() {
-        for (int i = 0; i < MAX_RECORD_SIZE * 4; i += 11)
-        {
-            //System.out.print( "data size = " + i + ", gross size = " + DrawingGroupRecord.grossSizeFromDataSize( i ) );
-            //System.out.println( "  Diff: " + (DrawingGroupRecord.grossSizeFromDataSize( i ) - i) );
-        }
-
-        assertEquals( 4, DrawingGroupRecord.grossSizeFromDataSize( 0 ) );
-        assertEquals( 5, DrawingGroupRecord.grossSizeFromDataSize( 1 ) );
-        assertEquals( MAX_RECORD_SIZE, DrawingGroupRecord.grossSizeFromDataSize( MAX_DATA_SIZE ) );
-        assertEquals( MAX_RECORD_SIZE + 5, DrawingGroupRecord.grossSizeFromDataSize( MAX_DATA_SIZE + 1 ) );
-        assertEquals( MAX_RECORD_SIZE * 2, DrawingGroupRecord.grossSizeFromDataSize( MAX_DATA_SIZE * 2 ) );
-        assertEquals( MAX_RECORD_SIZE * 2 + 5, DrawingGroupRecord.grossSizeFromDataSize( MAX_DATA_SIZE * 2 + 1 ) );
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
deleted file mode 100644
index e6a3167..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-public final class TestDrawingRecord extends TestCase {
-
-    /**
-     * Check that RecordFactoryInputStream properly handles continued DrawingRecords
-     * See Bugzilla #47548
-     */
-    public void testReadContinued() throws IOException {
-
-        //simulate a continues drawing record
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        //main part
-        DrawingRecord dg = new DrawingRecord();
-        byte[] data1 = new byte[8224];
-        Arrays.fill(data1, (byte)1);
-        dg.setData(data1);
-        out.write(dg.serialize());
-
-        //continued part
-        byte[] data2 = new byte[4048];
-        Arrays.fill(data2, (byte)2);
-        ContinueRecord cn = new ContinueRecord(data2);
-        out.write(cn.serialize());
-
-        List<Record> rec = RecordFactory.createRecords(new ByteArrayInputStream(out.toByteArray()));
-        assertEquals(2, rec.size());
-        assertTrue(rec.get(0) instanceof DrawingRecord);
-        assertTrue(rec.get(1) instanceof ContinueRecord);
-
-        assertArrayEquals(data1, ((DrawingRecord)rec.get(0)).getRecordData());
-        assertArrayEquals(data2, ((ContinueRecord)rec.get(1)).getData());
-
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
deleted file mode 100644
index 3f7dd86..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the serialization and deserialization of the TestEmbeddedObjectRefSubRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Yegor Kozlov
- */
-public final class TestEmbeddedObjectRefSubRecord extends TestCase {
-
-	private static final short EORSR_SID = EmbeddedObjectRefSubRecord.sid;
-
-	public void testStore() {
-		String data1
-				= "20 00 05 00 FC 10 76 01 02 24 14 DF 00 03 10 00 "
-				+ "00 46 6F 72 6D 73 2E 43 68 65 63 6B 42 6F 78 2E "
-				+ "31 00 00 00 00 00 70 00 00 00 00 00 00 00 00 00 "
-				+ "00 00";
-
-		byte[] src = hr(data1);
-
-		RecordInputStream in = TestcaseRecordInputStream.create(EORSR_SID, src);
-
-		EmbeddedObjectRefSubRecord record1 = new EmbeddedObjectRefSubRecord(in, src.length);
-
-		byte[] ser = record1.serialize();
-
-		RecordInputStream in2 = TestcaseRecordInputStream.create(ser);
-		EmbeddedObjectRefSubRecord record2 = new EmbeddedObjectRefSubRecord(in2, ser.length-4);
-
-		confirmData(src, ser);
-		assertEquals(record1.getOLEClassName(), record2.getOLEClassName());
-
-		byte[] ser2 = record1.serialize();
-		assertArrayEquals(ser, ser2);
-	}
-
-	/**
-	 * @param expectedData does not include sid & size
-	 * @param actualFullRecordData includes sid & size
-	 */
-	private static void confirmData(byte[] expectedData, byte[] actualFullRecordData) {
-		assertEquals(expectedData.length, actualFullRecordData.length-4);
-		for (int i = 0; i < expectedData.length; i++) {
-			if(expectedData[i] != actualFullRecordData[i+4]) {
-				throw new AssertionFailedError("Difference at offset (" + i + ")");
-			}
-		}
-	}
-
-	public void testCreate() {
-
-		EmbeddedObjectRefSubRecord record1 = new EmbeddedObjectRefSubRecord();
-
-		byte[] ser = record1.serialize();
-		RecordInputStream in2 = TestcaseRecordInputStream.create(ser);
-		EmbeddedObjectRefSubRecord record2 = new EmbeddedObjectRefSubRecord(in2, ser.length-4);
-
-		assertEquals(record1.getOLEClassName(), record2.getOLEClassName());
-		assertEquals(record1.getStreamId(), record2.getStreamId());
-
-		byte[] ser2 = record1.serialize();
-		assertArrayEquals(ser, ser2);
-	}
-
-	public void testCameraTool_bug45912() {
-		/**
-		 * taken from ftPictFmla sub-record in attachment 22645 (offset 0x40AB).
-		 */
-		byte[] data45912 = hr(
-				"12 00 0B 00 F8 02 88 04 3B 00 " +
-				"00 00 00 01 00 00 00 01 " +
-				"00 00");
-		RecordInputStream in = TestcaseRecordInputStream.create(EORSR_SID, data45912);
-
-		EmbeddedObjectRefSubRecord rec = new EmbeddedObjectRefSubRecord(in, data45912.length);
-		byte[] ser2 = rec.serialize();
-		confirmData(data45912, ser2);
-	}
-
-	private static byte[] hr(String string) {
-		return HexRead.readFromString(string);
-	}
-
-	/**
-	 * tests various examples of OLE controls
-	 */
-	public void testVarious() {
-		String[] rawData = {
-			"12 00 0B 00 70 95 0B 05 3B 01 00 36 00 40 00 18 00 19 00 18",
-			"12 00 0B 00 B0 4D 3E 03 3B 00 00 00 00 01 00 00 80 01 C0 00",
-			"0C 00 05 00 60 AF 3B 03 24 FD FF FE C0 FE",
-			"24 00 05 00 40 42 3E 03 02 80 CD B4 04 03 15 00 00 46 6F 72 6D 73 2E 43 6F 6D 6D 61 6E 64 42 75 74 74 6F 6E 2E 31 00 00 00 00 54 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 05 00 10 4E 3E 03 02 00 4C CC 04 03 12 00 00 46 6F 72 6D 73 2E 53 70 69 6E 42 75 74 74 6F 6E 2E 31 00 54 00 00 00 20 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 05 00 E0 41 3E 03 02 00 FC 0B 05 03 10 00 00 46 6F 72 6D 73 2E 43 6F 6D 62 6F 42 6F 78 2E 31 00 74 00 00 00 4C 00 00 00 00 00 00 00 00 00 00 00",
-			"24 00 05 00 00 4C AF 03 02 80 E1 93 05 03 14 00 00 46 6F 72 6D 73 2E 4F 70 74 69 6F 6E 42 75 74 74 6F 6E 2E 31 00 C0 00 00 00 70 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 05 00 E0 A4 28 04 02 80 EA 93 05 03 10 00 00 46 6F 72 6D 73 2E 43 68 65 63 6B 42 6F 78 2E 31 00 30 01 00 00 6C 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 05 00 30 40 3E 03 02 00 CC B4 04 03 0D 00 00 46 6F 72 6D 73 2E 4C 61 62 65 6C 2E 31 9C 01 00 00 54 00 00 00 00 00 00 00 00 00 00 00",
-			"1E 00 05 00 B0 A4 28 04 02 00 D0 0A 05 03 0F 00 00 46 6F 72 6D 73 2E 4C 69 73 74 42 6F 78 2E 31 F0 01 00 00 48 00 00 00 00 00 00 00 00 00 00 00",
-			"24 00 05 00 C0 AF 3B 03 02 80 D1 0A 05 03 14 00 00 46 6F 72 6D 73 2E 54 6F 67 67 6C 65 42 75 74 74 6F 6E 2E 31 00 38 02 00 00 6C 00 00 00 00 00 00 00 00 00 00 00",
-			"1E 00 05 00 90 AF 3B 03 02 80 D4 0A 05 03 0F 00 00 46 6F 72 6D 73 2E 54 65 78 74 42 6F 78 2E 31 A4 02 00 00 48 00 00 00 00 00 00 00 00 00 00 00",
-			"24 00 05 00 60 40 3E 03 02 00 D6 0A 05 03 14 00 00 46 6F 72 6D 73 2E 54 6F 67 67 6C 65 42 75 74 74 6F 6E 2E 31 00 EC 02 00 00 6C 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 05 00 20 4D 3E 03 02 00 D9 0A 05 03 11 00 00 46 6F 72 6D 73 2E 53 63 72 6F 6C 6C 42 61 72 2E 31 58 03 00 00 20 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 05 00 00 AF 28 04 02 80 31 AC 04 03 10 00 00 53 68 65 6C 6C 2E 45 78 70 6C 6F 72 65 72 2E 32 00 78 03 00 00 AC 00 00 00 00 00 00 00 00 00 00 00",
-		};
-
-		for (int i = 0; i < rawData.length; i++) {
-			confirmRead(hr(rawData[i]), i);
-		}
-	}
-
-	private static void confirmRead(byte[] data, int i) {
-		RecordInputStream in = TestcaseRecordInputStream.create(EORSR_SID, data);
-
-		EmbeddedObjectRefSubRecord rec = new EmbeddedObjectRefSubRecord(in, data.length);
-		byte[] ser2 = rec.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding("Test record " + i, EORSR_SID, data, ser2);
-	}
-
-	public void testVisioDrawing_bug46199() {
-		/**
-		 * taken from ftPictFmla sub-record in attachment 22860 (stream offset 0x768F).<br/>
-		 * Note that the since the string length is zero, there is no unicode flag byte
-		 */
-		byte[] data46199 = hr(
-				  "0E 00 "
-				+ "05 00 "
-				+ "28 25 A3 01 "
-				+ "02 6C D1 34 02 "
-				+ "03 00 00 "
-				+ "0F CB E8 00");
-		RecordInputStream in = TestcaseRecordInputStream.create(EORSR_SID, data46199);
-
-		EmbeddedObjectRefSubRecord rec;
-		try {
-			rec = new EmbeddedObjectRefSubRecord(in, data46199.length);
-		} catch (RecordFormatException e) {
-			if (e.getMessage().equals("Not enough data (3) to read requested (4) bytes")) {
-				throw new AssertionFailedError("Identified bug 22860");
-			}
-			throw e;
-		}
-		byte[] ser2 = rec.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(EORSR_SID, data46199, ser2);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
deleted file mode 100644
index ab4a801..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the EndSubRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestEndSubRecord extends TestCase {
-    private static final byte[] data =  { };
-
-    public void testLoad() {
-        EndSubRecord record = new EndSubRecord(TestcaseRecordInputStream.create(0x00, data), 0);
-        assertEquals(0, record.getDataSize());
-    }
-
-    public void testStore()
-    {
-        EndSubRecord record = new EndSubRecord();
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
deleted file mode 100644
index 0df5d44..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherClientDataRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Tests the EscherAggregate class.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestEscherAggregate extends TestCase {
-    /**
-     * Tests that the create aggregate method correctly rejoins escher records together.
-     */
-    public void testCreateAggregate() {
-        String msoDrawingRecord1 =
-                "0F 00 02 F0 20 01 00 00 10 00 08 F0 08 00 00 00 \n" +
-                "03 00 00 00 02 04 00 00 0F 00 03 F0 08 01 00 00 \n" +
-                "0F 00 04 F0 28 00 00 00 01 00 09 F0 10 00 00 00 \n" +
-                "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \n" +
-                "02 00 0A F0 08 00 00 00 00 04 00 00 05 00 00 00 \n" +
-                "0F 00 04 F0 64 00 00 00 42 01 0A F0 08 00 00 00 \n" +
-                "01 04 00 00 00 0A 00 00 73 00 0B F0 2A 00 00 00 \n" +
-                "BF 00 08 00 08 00 44 01 04 00 00 00 7F 01 00 00 \n" +
-                "01 00 BF 01 00 00 11 00 C0 01 40 00 00 08 FF 01 \n" +
-                "10 00 10 00 BF 03 00 00 08 00 00 00 10 F0 12 00 \n" +
-                "00 00 00 00 01 00 54 00 05 00 45 00 01 00 88 03 \n" +
-                "05 00 94 00 00 00 11 F0 00 00 00 00";
-
-        String msoDrawingRecord2 =
-                "0F 00 04 F0 64 00 00 00 42 01 0A F0 08 00 00 00 " +
-                "02 04 00 00 80 0A 00 00 73 00 0B F0 2A 00 00 00 " +
-                "BF 00 08 00 08 00 44 01 04 00 00 00 7F 01 00 00 " +
-                "01 00 BF 01 00 00 11 00 C0 01 40 00 00 08 FF 01 " +
-                "10 00 10 00 BF 03 00 00 08 00 00 00 10 F0 12 00 " +
-                "00 00 00 00 01 00 8D 03 05 00 E4 00 03 00 4D 03 " +
-                "0B 00 0C 00 00 00 11 F0 00 00 00 00";
-
-        DrawingRecord d1 = new DrawingRecord();
-        d1.setData( HexRead.readFromString( msoDrawingRecord1 ) );
-
-        ObjRecord r1 = new ObjRecord();
-
-        DrawingRecord d2 = new DrawingRecord();
-        d2.setData( HexRead.readFromString( msoDrawingRecord2 ) );
-
-        ObjRecord r2 = new ObjRecord();
-
-        List<RecordBase> records = new ArrayList<RecordBase>();
-        records.add( d1 );
-        records.add( r1 );
-        records.add( d2 );
-        records.add( r2 );
-
-        EscherAggregate aggregate = EscherAggregate.createAggregate(records, 0);
-
-        assertEquals( 1, aggregate.getEscherRecords().size() );
-        assertEquals( (short) 0xF002, aggregate.getEscherRecord( 0 ).getRecordId() );
-        assertEquals( 2, aggregate.getEscherRecord( 0 ).getChildRecords().size() );
-
-//        System.out.println( "aggregate = " + aggregate );
-    }
-
-    public void testSerialize() {
-
-        EscherContainerRecord container1 = new EscherContainerRecord();
-        EscherContainerRecord spContainer1 = new EscherContainerRecord();
-        EscherContainerRecord spContainer2 = new EscherContainerRecord();
-        EscherContainerRecord spContainer3 = new EscherContainerRecord();
-        EscherSpRecord sp1 = new EscherSpRecord();
-        EscherSpRecord sp2 = new EscherSpRecord();
-        EscherSpRecord sp3 = new EscherSpRecord();
-        EscherClientDataRecord d2 = new EscherClientDataRecord();
-        EscherClientDataRecord d3 = new EscherClientDataRecord();
-
-        container1.setOptions( (short) 0x000F );
-        spContainer1.setOptions( (short) 0x000F );
-        spContainer1.setRecordId( EscherContainerRecord.SP_CONTAINER );
-        spContainer2.setOptions( (short) 0x000F );
-        spContainer2.setRecordId( EscherContainerRecord.SP_CONTAINER );
-        spContainer3.setOptions( (short) 0x000F );
-        spContainer3.setRecordId( EscherContainerRecord.SP_CONTAINER );
-        d2.setRecordId( EscherClientDataRecord.RECORD_ID );
-        d2.setRemainingData( new byte[0] );
-        d3.setRecordId( EscherClientDataRecord.RECORD_ID );
-        d3.setRemainingData( new byte[0] );
-        container1.addChildRecord( spContainer1 );
-        container1.addChildRecord( spContainer2 );
-        container1.addChildRecord( spContainer3 );
-        spContainer1.addChildRecord( sp1 );
-        spContainer2.addChildRecord( sp2 );
-        spContainer3.addChildRecord( sp3 );
-        spContainer2.addChildRecord( d2 );
-        spContainer3.addChildRecord( d3 );
-
-        EscherAggregate aggregate = new EscherAggregate(false);
-        aggregate.addEscherRecord( container1 );
-        aggregate.associateShapeToObjRecord( d2, new ObjRecord() );
-        aggregate.associateShapeToObjRecord( d3, new ObjRecord() );
-
-        byte[] data = new byte[112];
-        int bytesWritten = aggregate.serialize( 0, data );
-        assertEquals( 112, bytesWritten );
-        assertEquals( "[EC, 00, 40, 00, 0F, 00, 00, 00, 58, 00, 00, 00, 0F, 00, 04, F0, 10, 00, 00, 00, 00, 00, 0A, F0, 08, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 0F, 00, 04, F0, 18, 00, 00, 00, 00, 00, 0A, F0, 08, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 11, F0, 00, 00, 00, 00, 5D, 00, 00, 00, EC, 00, 20, 00, 0F, 00, 04, F0, 18, 00, 00, 00, 00, 00, 0A, F0, 08, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 11, F0, 00, 00, 00, 00, 5D, 00, 00, 00]",
-                HexDump.toHex( data ) );
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
deleted file mode 100644
index 7a126c5..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
+++ /dev/null
@@ -1,865 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.util.HexRead;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestExtSSTRecord extends TestCase {
-
-
-    /**
-     * hex dump from ISBN_UPD_PL_20100104_1525.xls atatched to Bugzilla 50867
-     */
-    private static final String data_50967 =
-                    // "Offset=0x0008BB19(572185) recno=159 sid=0x00FF size=0x201A(8218)\n" +
-                    "                           FF 00 1A 20 08 00 1A" +
-                    "09 00 00 0C 00 00 00 6D 09 00 00 5F 00 00 00 B8" +
-                    "09 00 00 AA 00 00 00 BC 0A 00 00 AE 01 00 00 FA" +
-                    "0B 00 00 EC 02 00 00 C6 0D 00 00 B8 04 00 00 2E" +
-                    "0F 00 00 20 06 00 00 5C 11 00 00 4E 08 00 00 B0" +
-                    "12 00 00 A2 09 00 00 A4 13 00 00 96 0A 00 00 92" +
-                    "15 00 00 84 0C 00 00 0A 17 00 00 FC 0D 00 00 32" +
-                    "18 00 00 24 0F 00 00 84 19 00 00 76 10 00 00 9A" +
-                    "1A 00 00 8C 11 00 00 5E 1C 00 00 50 13 00 00 24" +
-                    "1D 00 00 16 14 00 00 56 1E 00 00 48 15 00 00 1C" +
-                    "1F 00 00 0E 16 00 00 DA 1F 00 00 CC 16 00 00 76" +
-                    "21 00 00 68 18 00 00 2E 23 00 00 20 1A 00 00 A0" +
-                    "24 00 00 92 1B 00 00 FA 25 00 00 EC 1C 00 00 BA" +
-                    "27 00 00 AC 1E 00 00 12 29 00 00 04 00 00 00 4E" +
-                    "2A 00 00 40 01 00 00 A0 2B 00 00 92 02 00 00 C8" +
-                    "2C 00 00 BA 03 00 00 62 2E 00 00 54 05 00 00 58" +
-                    "2F 00 00 4A 06 00 00 9A 30 00 00 8C 07 00 00 02" +
-                    "32 00 00 F4 08 00 00 36 33 00 00 28 0A 00 00 30" +
-                    "34 00 00 22 0B 00 00 FC 34 00 00 EE 0B 00 00 FE" +
-                    "35 00 00 F0 0C 00 00 26 37 00 00 18 0E 00 00 C6" +
-                    "38 00 00 B8 0F 00 00 FA 39 00 00 EC 10 00 00 8E" +
-                    "3B 00 00 80 12 00 00 2C 3D 00 00 1E 14 00 00 3C" +
-                    "3E 00 00 2E 15 00 00 80 3F 00 00 72 16 00 00 74" +
-                    "40 00 00 66 17 00 00 8A 41 00 00 7C 18 00 00 64" +
-                    "42 00 00 56 19 00 00 96 43 00 00 88 1A 00 00 82" +
-                    "44 00 00 74 1B 00 00 76 45 00 00 68 1C 00 00 80" +
-                    "46 00 00 72 1D 00 00 88 47 00 00 7A 1E 00 00 80" +
-                    "48 00 00 72 1F 00 00 66 49 00 00 34 00 00 00 76" +
-                    "4A 00 00 44 01 00 00 D0 4B 00 00 9E 02 00 00 F2" +
-                    "4C 00 00 C0 03 00 00 DA 4D 00 00 A8 04 00 00 B4" +
-                    "4F 00 00 82 06 00 00 12 51 00 00 E0 07 00 00 2A" +
-                    "52 00 00 F8 08 00 00 3C 53 00 00 0A 0A 00 00 6E" +
-                    "54 00 00 3C 0B 00 00 BC 55 00 00 8A 0C 00 00 14" +
-                    "57 00 00 E2 0D 00 00 3C 58 00 00 0A 0F 00 00 36" +
-                    "59 00 00 04 10 00 00 4A 5A 00 00 18 11 00 00 4A" +
-                    "5B 00 00 18 12 00 00 AC 5C 00 00 7A 13 00 00 C2" +
-                    "5D 00 00 90 14 00 00 2C 5F 00 00 FA 15 00 00 74" +
-                    "60 00 00 42 17 00 00 56 62 00 00 24 19 00 00 12" +
-                    "64 00 00 E0 1A 00 00 E8 65 00 00 B6 1C 00 00 CA" +
-                    "66 00 00 98 1D 00 00 14 68 00 00 E2 1E 00 00 56" +
-                    "69 00 00 04 00 00 00 EC 6A 00 00 9A 01 00 00 DC" +
-                    "6B 00 00 8A 02 00 00 EE 6C 00 00 9C 03 00 00 66" +
-                    "6E 00 00 14 05 00 00 A6 6F 00 00 54 06 00 00 92" +
-                    "70 00 00 40 07 00 00 E6 71 00 00 94 08 00 00 48" +
-                    "73 00 00 F6 09 00 00 AC 74 00 00 5A 0B 00 00 A2" +
-                    "75 00 00 50 0C 00 00 C4 76 00 00 72 0D 00 00 4E" +
-                    "78 00 00 FC 0E 00 00 14 7A 00 00 C2 10 00 00 0C" +
-                    "7B 00 00 BA 11 00 00 4E 7C 00 00 FC 12 00 00 5A" +
-                    "7D 00 00 08 14 00 00 C4 7E 00 00 72 15 00 00 BA" +
-                    "80 00 00 68 17 00 00 1C 82 00 00 CA 18 00 00 5E" +
-                    "83 00 00 0C 1A 00 00 BA 84 00 00 68 1B 00 00 E6" +
-                    "85 00 00 94 1C 00 00 46 87 00 00 F4 1D 00 00 94" +
-                    "88 00 00 42 1F 00 00 24 8A 00 00 10 01 00 00 80" +
-                    "8B 00 00 6C 02 00 00 8E 8C 00 00 7A 03 00 00 82" +
-                    "8D 00 00 6E 04 00 00 54 8E 00 00 40 05 00 00 60" +
-                    "8F 00 00 4C 06 00 00 68 90 00 00 54 07 00 00 92" +
-                    "91 00 00 7E 08 00 00 C8 92 00 00 B4 09 00 00 2C" +
-                    "94 00 00 18 0B 00 00 8E 95 00 00 7A 0C 00 00 AA" +
-                    "96 00 00 96 0D 00 00 FA 97 00 00 E6 0E 00 00 3E" +
-                    "99 00 00 2A 10 00 00 54 9A 00 00 40 11 00 00 D4" +
-                    "9B 00 00 C0 12 00 00 C2 9C 00 00 AE 13 00 00 1E" +
-                    "9E 00 00 0A 15 00 00 F4 9E 00 00 E0 15 00 00 E0" +
-                    "9F 00 00 CC 16 00 00 08 A1 00 00 F4 17 00 00 0E" +
-                    "A2 00 00 FA 18 00 00 8A A3 00 00 76 1A 00 00 78" +
-                    "A5 00 00 64 1C 00 00 4E A6 00 00 3A 1D 00 00 42" +
-                    "A7 00 00 2E 1E 00 00 08 A9 00 00 F4 1F 00 00 BE" +
-                    "AA 00 00 8D 01 00 00 34 AC 00 00 03 03 00 00 62" +
-                    "AD 00 00 31 04 00 00 68 AE 00 00 37 05 00 00 52" +
-                    "AF 00 00 21 06 00 00 DE B0 00 00 AD 07 00 00 A8" +
-                    "B1 00 00 77 08 00 00 B6 B2 00 00 85 09 00 00 DA" +
-                    "B3 00 00 A9 0A 00 00 EC B4 00 00 BB 0B 00 00 EA" +
-                    "B5 00 00 B9 0C 00 00 0A B7 00 00 D9 0D 00 00 0A" +
-                    "B8 00 00 D9 0E 00 00 26 B9 00 00 F5 0F 00 00 72" +
-                    "BA 00 00 41 11 00 00 D8 BB 00 00 A7 12 00 00 3A" +
-                    "BD 00 00 09 14 00 00 6C BE 00 00 3B 15 00 00 88" +
-                    "BF 00 00 57 16 00 00 D8 C0 00 00 A7 17 00 00 60" +
-                    "C2 00 00 2F 19 00 00 84 C3 00 00 53 1A 00 00 A8" +
-                    "C4 00 00 77 1B 00 00 CE C5 00 00 9D 1C 00 00 02" +
-                    "C7 00 00 D1 1D 00 00 58 C8 00 00 27 1F 00 00 56" +
-                    "C9 00 00 04 00 00 00 D0 CA 00 00 7E 01 00 00 D4" +
-                    "CB 00 00 82 02 00 00 38 CD 00 00 E6 03 00 00 E4" +
-                    "CF 00 00 92 06 00 00 76 D1 00 00 24 08 00 00 10" +
-                    "D3 00 00 BE 09 00 00 50 D4 00 00 FE 0A 00 00 94" +
-                    "D5 00 00 42 0C 00 00 14 D7 00 00 C2 0D 00 00 92" +
-                    "D8 00 00 40 0F 00 00 EC D9 00 00 9A 10 00 00 20" +
-                    "DC 00 00 CE 12 00 00 7E DD 00 00 2C 14 00 00 5C" +
-                    "DF 00 00 0A 16 00 00 B8 E0 00 00 66 17 00 00 9C" +
-                    "E1 00 00 4A 18 00 00 44 E3 00 00 F2 19 00 00 A6" +
-                    "E4 00 00 54 1B 00 00 F8 E5 00 00 A6 1C 00 00 D4" +
-                    "E7 00 00 82 1E 00 00 2E E9 00 00 DC 1F 00 00 C8" +
-                    "EA 00 00 75 01 00 00 3C EC 00 00 E9 02 00 00 6A" +
-                    "ED 00 00 17 04 00 00 BC EE 00 00 69 05 00 00 18" +
-                    "F0 00 00 C5 06 00 00 D0 F1 00 00 7D 08 00 00 66" +
-                    "F3 00 00 13 0A 00 00 8C F4 00 00 39 0B 00 00 EC" +
-                    "F5 00 00 99 0C 00 00 2A F7 00 00 D7 0D 00 00 84" +
-                    "F8 00 00 31 0F 00 00 A0 F9 00 00 4D 10 00 00 06" +
-                    "FB 00 00 B3 11 00 00 E6 FB 00 00 93 12 00 00 08" +
-                    "FD 00 00 B5 13 00 00 66 FE 00 00 13 15 00 00 DA" +
-                    "FF 00 00 87 16 00 00 52 01 01 00 FF 17 00 00 74" +
-                    "02 01 00 21 19 00 00 96 03 01 00 43 1A 00 00 BC" +
-                    "04 01 00 69 1B 00 00 72 06 01 00 1F 1D 00 00 D4" +
-                    "07 01 00 81 1E 00 00 56 09 01 00 04 00 00 00 FC" +
-                    "0A 01 00 AA 01 00 00 5E 0C 01 00 0C 03 00 00 B6" +
-                    "0D 01 00 64 04 00 00 F4 0E 01 00 A2 05 00 00 74" +
-                    "10 01 00 22 07 00 00 00 12 01 00 AE 08 00 00 4A" +
-                    "13 01 00 F8 09 00 00 40 14 01 00 EE 0A 00 00 66" +
-                    "15 01 00 14 0C 00 00 B8 16 01 00 66 0D 00 00 3E" +
-                    "18 01 00 EC 0E 00 00 58 19 01 00 06 10 00 00 72" +
-                    "1A 01 00 20 11 00 00 4A 1C 01 00 F8 12 00 00 8E" +
-                    "1D 01 00 3C 14 00 00 E8 1E 01 00 96 15 00 00 A8" +
-                    "20 01 00 56 17 00 00 88 23 01 00 36 1A 00 00 00" +
-                    "25 01 00 AE 1B 00 00 AE 26 01 00 5C 1D 00 00 88" +
-                    "28 01 00 36 1F 00 00 96 29 01 00 25 00 00 00 E6" +
-                    "2A 01 00 75 01 00 00 A2 2C 01 00 31 03 00 00 40" +
-                    "2E 01 00 CF 04 00 00 B8 2F 01 00 47 06 00 00 64" +
-                    "31 01 00 F3 07 00 00 C0 32 01 00 4F 09 00 00 1C" +
-                    "34 01 00 AB 0A 00 00 A4 35 01 00 33 0C 00 00 2A" +
-                    "37 01 00 B9 0D 00 00 9A 38 01 00 29 0F 00 00 94" +
-                    "3A 01 00 23 11 00 00 86 3B 01 00 15 12 00 00 44" +
-                    "3D 01 00 D3 13 00 00 6E 3E 01 00 FD 14 00 00 8C" +
-                    "40 01 00 1B 17 00 00 44 42 01 00 D3 18 00 00 0E" +
-                    "44 01 00 9D 1A 00 00 06 45 01 00 95 1B 00 00 BA" +
-                    "46 01 00 49 1D 00 00 24 49 01 00 B3 1F 00 00 A2" +
-                    "4A 01 00 12 01 00 00 2C 4C 01 00 9C 02 00 00 D4" +
-                    "4D 01 00 44 04 00 00 5E 50 01 00 CE 06 00 00 82" +
-                    "51 01 00 F2 07 00 00 9C 52 01 00 0C 09 00 00 9E" +
-                    "54 01 00 0E 0B 00 00 6C 56 01 00 DC 0C 00 00 42" +
-                    "57 01 00 B2 0D 00 00 70 58 01 00 E0 0E 00 00 6E" +
-                    "5A 01 00 DE 10 00 00 86 5C 01 00 F6 12 00 00 F2" +
-                    "5D 01 00 62 14 00 00 A0 5F 01 00 10 16 00 00 6C" +
-                    "61 01 00 DC 17 00 00 6C 64 01 00 DC 1A 00 00 F0" +
-                    "66 01 00 60 1D 00 00 4E 69 01 00 BE 1F 00 00 68" +
-                    "6A 01 00 EA 00 00 00 6E 6C 01 00 F0 02 00 00 B8" +
-                    "6D 01 00 3A 04 00 00 52 6F 01 00 D4 05 00 00 C6" +
-                    "70 01 00 48 07 00 00 80 72 01 00 02 09 00 00 DC" +
-                    "73 01 00 5E 0A 00 00 F2 75 01 00 74 0C 00 00 6C" +
-                    "77 01 00 EE 0D 00 00 46 79 01 00 C8 0F 00 00 CC" +
-                    "7A 01 00 4E 11 00 00 80 7C 01 00 02 13 00 00 08" +
-                    "7E 01 00 8A 14 00 00 80 7F 01 00 02 16 00 00 46" +
-                    "81 01 00 C8 17 00 00 26 83 01 00 A8 19 00 00 A4" +
-                    "84 01 00 26 1B 00 00 02 86 01 00 84 1C 00 00 F4" +
-                    "87 01 00 76 1E 00 00 68 89 01 00 04 00 00 00 4E" +
-                    "8B 01 00 EA 01 00 00 04 8D 01 00 A0 03 00 00 FE" +
-                    "8E 01 00 9A 05 00 00 A2 90 01 00 3E 07 00 00 A6" +
-                    "91 01 00 42 08 00 00 76 93 01 00 12 0A 00 00 72" +
-                    "95 01 00 0E 0C 00 00 36 97 01 00 D2 0D 00 00 50" +
-                    "99 01 00 EC 0F 00 00 E2 9B 01 00 7E 12 00 00 6A" +
-                    "9D 01 00 06 14 00 00 28 9F 01 00 C4 15 00 00 F0" +
-                    "A1 01 00 8C 18 00 00 B8 A3 01 00 54 1A 00 00 14" +
-                    "A6 01 00 B0 1C 00 00 7C A7 01 00 18 1E 00 00 E2" +
-                    "A8 01 00 7E 1F 00 00 8C AA 01 00 2A 01 00 00 8C" +
-                    "AC 01 00 2A 03 00 00 A6 AE 01 00 44 05 00 00 76" +
-                    "B0 01 00 14 07 00 00 A0 B2 01 00 3E 09 00 00 12" +
-                    "B4 01 00 B0 0A 00 00 78 B5 01 00 16 0C 00 00 A4" +
-                    "B6 01 00 42 0D 00 00 5C B7 01 00 FA 0D 00 00 08" +
-                    "B8 01 00 A6 0E 00 00 D0 B9 01 00 6E 10 00 00 D2" +
-                    "BB 01 00 70 12 00 00 6C BD 01 00 0A 14 00 00 78" +
-                    "BF 01 00 16 16 00 00 AE C0 01 00 4C 17 00 00 BA" +
-                    "C1 01 00 58 18 00 00 02 C3 01 00 A0 19 00 00 BA" +
-                    "C3 01 00 58 1A 00 00 F6 C4 01 00 94 1B 00 00 70" +
-                    "C7 01 00 0E 1E 00 00 E8 C8 01 00 86 1F 00 00 AC" +
-                    "CA 01 00 88 01 00 00 88 CC 01 00 64 03 00 00 90" +
-                    "CE 01 00 6C 05 00 00 5C D0 01 00 38 07 00 00 66" +
-                    "D2 01 00 42 09 00 00 F6 D3 01 00 D2 0A 00 00 4E" +
-                    "D5 01 00 2A 0C 00 00 A2 D7 01 00 7E 0E 00 00 BE" +
-                    "D8 01 00 9A 0F 00 00 AE DA 01 00 8A 11 00 00 7E" +
-                    "DC 01 00 5A 13 00 00 F4 DD 01 00 D0 14 00 00 98" +
-                    "DF 01 00 74 16 00 00 AA E1 01 00 86 18 00 00 24" +
-                    "E3 01 00 00 1A 00 00 84 E4 01 00 60 1B 00 00 58" +
-                    "E6 01 00 34 1D 00 00 DA E8 01 00 B6 1F 00 00 A6" +
-                    "EA 01 00 5F 01 00 00 44 EC 01 00 FD 02 00 00 B8" +
-                    "ED 01 00 71 04 00 00 18 EF 01 00 D1 05 00 00 3A" +
-                    "F1 01 00 F3 07 00 00 3E F3 01 00 F7 09 00 00 9C" +
-                    "F4 01 00 55 0B 00 00 74 F7 01 00 2D 0E 00 00 36" +
-                    "F9 01 00 EF 0F 00 00 AA FB 01 00 63 12 00 00 60" +
-                    "FD 01 00 19 14 00 00 60 FF 01 00 19 16 00 00 B2" +
-                    "01 02 00 6B 18 00 00 84 03 02 00 3D 1A 00 00 42" +
-                    "06 02 00 FB 1C 00 00 DE 08 02 00 97 1F 00 00 42" +
-                    "0B 02 00 11 02 00 00 A0 0D 02 00 6F 04 00 00 28" +
-                    "10 02 00 F7 06 00 00 FE 11 02 00 CD 08 00 00 64" +
-                    "13 02 00 33 0A 00 00 4C 14 02 00 1B 0B 00 00 D8" +
-                    "15 02 00 A7 0C 00 00 C6 16 02 00 95 0D 00 00 F8" +
-                    "17 02 00 C7 0E 00 00 C4 19 02 00 93 10 00 00 02" +
-                    "1B 02 00 D1 11 00 00 A4 1C 02 00 73 13 00 00 7A" +
-                    "1D 02 00 49 14 00 00 B2 1E 02 00 81 15 00 00 66" +
-                    "20 02 00 35 17 00 00 B2 21 02 00 81 18 00 00 52" +
-                    "23 02 00 21 1A 00 00 B4 24 02 00 83 1B 00 00 EC" +
-                    "25 02 00 BB 1C 00 00 36 27 02 00 05 1E 00 00 5E" +
-                    "28 02 00 2D 1F 00 00 A8 29 02 00 62 00 00 00 4A" +
-                    "2B 02 00 04 02 00 00 CA 2C 02 00 84 03 00 00 20" +
-                    "2E 02 00 DA 04 00 00 C6 2F 02 00 80 06 00 00 26" +
-                    "31 02 00 E0 07 00 00 3A 32 02 00 F4 08 00 00 6E" +
-                    "33 02 00 28 0A 00 00 F4 34 02 00 AE 0B 00 00 DA" +
-                    "35 02 00 94 0C 00 00 E4 36 02 00 9E 0D 00 00 08" +
-                    "38 02 00 C2 0E 00 00 52 39 02 00 0C 10 00 00 96" +
-                    "3A 02 00 50 11 00 00 3C 3C 02 00 F6 12 00 00 D2" +
-                    "3D 02 00 8C 14 00 00 30 3F 02 00 EA 15 00 00 7A" +
-                    "40 02 00 34 17 00 00 74 41 02 00 2E 18 00 00 F4" +
-                    "42 02 00 AE 19 00 00 64 44 02 00 1E 1B 00 00 B4" +
-                    "45 02 00 6E 1C 00 00 FA 46 02 00 B4 1D 00 00 4A" +
-                    "48 02 00 04 1F 00 00 4C 49 02 00 04 00 00 00 58" +
-                    "4A 02 00 10 01 00 00 98 4B 02 00 50 02 00 00 E0" +
-                    "4C 02 00 98 03 00 00 48 4E 02 00 00 05 00 00 2E" +
-                    "4F 02 00 E6 05 00 00 BE 50 02 00 76 07 00 00 18" +
-                    "52 02 00 D0 08 00 00 66 53 02 00 1E 0A 00 00 BA" +
-                    "54 02 00 72 0B 00 00 F2 55 02 00 AA 0C 00 00 3C" +
-                    "57 02 00 F4 0D 00 00 6A 58 02 00 22 0F 00 00 D4" +
-                    "59 02 00 8C 10 00 00 20 5B 02 00 D8 11 00 00 4C" +
-                    "5C 02 00 04 13 00 00 FC 5C 02 00 B4 13 00 00 7A" +
-                    "5E 02 00 32 15 00 00 B4 5F 02 00 6C 16 00 00 FA" +
-                    "60 02 00 B2 17 00 00 7E 62 02 00 36 19 00 00 3C" +
-                    "63 02 00 F4 19 00 00 CE 64 02 00 86 1B 00 00 F6" +
-                    "65 02 00 AE 1C 00 00 18 67 02 00 D0 1D 00 00 82" +
-                    "68 02 00 3A 1F 00 00 A0 69 02 00 3B 00 00 00 CE" +
-                    "6A 02 00 69 01 00 00 CC 6B 02 00 67 02 00 00 D6" +
-                    "6C 02 00 71 03 00 00 0E 6E 02 00 A9 04 00 00 24" +
-                    "6F 02 00 BF 05 00 00 4A 70 02 00 E5 06 00 00 7A" +
-                    "71 02 00 15 08 00 00 5A 72 02 00 F5 08 00 00 A0" +
-                    "73 02 00 3B 0A 00 00 B6 74 02 00 51 0B 00 00 DA" +
-                    "75 02 00 75 0C 00 00 E4 76 02 00 7F 0D 00 00 20" +
-                    "78 02 00 BB 0E 00 00 00 79 02 00 9B 0F 00 00 F8" +
-                    "79 02 00 93 10 00 00 16 7B 02 00 B1 11 00 00 06" +
-                    "7C 02 00 A1 12 00 00 FA 7C 02 00 95 13 00 00 2A" +
-                    "7E 02 00 C5 14 00 00 5C 7F 02 00 F7 15 00 00 46" +
-                    "80 02 00 E1 16 00 00 54 81 02 00 EF 17 00 00 70" +
-                    "82 02 00 0B 19 00 00 68 83 02 00 03 1A 00 00 40" +
-                    "84 02 00 DB 1A 00 00 16 85 02 00 B1 1B 00 00 28" +
-                    "86 02 00 C3 1C 00 00 DE 86 02 00 79 1D 00 00 08" +
-                    "88 02 00 A3 1E 00 00 CE 88 02 00 69 1F 00 00 F2" +
-                    "89 02 00 7A 00 00 00 C6 8A 02 00 4E 01 00 00 D8" +
-                    "8B 02 00 60 02 00 00 B4 8C 02 00 3C 03 00 00 A2" +
-                    "8D 02 00 2A 04 00 00 EE 8E 02 00 76 05 00 00 06" +
-                    "90 02 00 8E 06 00 00 12 91 02 00 9A 07 00 00 F8" +
-                    "91 02 00 80 08 00 00 20 93 02 00 A8 09 00 00 0A" +
-                    "95 02 00 92 0B 00 00 FE 95 02 00 86 0C 00 00 C6" +
-                    "96 02 00 4E 0D 00 00 92 97 02 00 1A 0E 00 00 36" +
-                    "98 02 00 BE 0E 00 00 02 99 02 00 8A 0F 00 00 28" +
-                    "9A 02 00 B0 10 00 00 5A 9B 02 00 E2 11 00 00 74" +
-                    "9C 02 00 FC 12 00 00 6C 9D 02 00 F4 13 00 00 42" +
-                    "9E 02 00 CA 14 00 00 90 9F 02 00 18 16 00 00 34" +
-                    "A1 02 00 BC 17 00 00 1E A2 02 00 A6 18 00 00 42" +
-                    "A3 02 00 CA 19 00 00 62 A4 02 00 EA 1A 00 00 74" +
-                    "A5 02 00 FC 1B 00 00 B0 A6 02 00 38 1D 00 00 5A" +
-                    "A8 02 00 E2 1E 00 00 86 A9 02 00 04 00 00 00 30" +
-                    "AB 02 00 AE 01 00 00 DA AC 02 00 58 03 00 00 C4" +
-                    "AD 02 00 42 04 00 00 8C AE 02 00 0A 05 00 00 C4" +
-                    "AF 02 00 42 06 00 00 86 B1 02 00 04 08 00 00 54" +
-                    "B2 02 00 D2 08 00 00 8A B3 02 00 08 0A 00 00 54" +
-                    "B4 02 00 D2 0A 00 00 52 B5 02 00 D0 0B 00 00 58" +
-                    "B6 02 00 D6 0C 00 00 68 B7 02 00 E6 0D 00 00 3E" +
-                    "B8 02 00 BC 0E 00 00 2C B9 02 00 AA 0F 00 00 78" +
-                    "BA 02 00 F6 10 00 00 AA BB 02 00 28 12 00 00 D6" +
-                    "BC 02 00 54 13 00 00 CC BD 02 00 4A 14 00 00 F8" +
-                    "BE 02 00 76 15 00 00 42 C0 02 00 C0 16 00 00 5C" +
-                    "C1 02 00 DA 17 00 00 42 C2 02 00 C0 18 00 00 36" +
-                    "C3 02 00 B4 19 00 00 78 C4 02 00 F6 1A 00 00 90" +
-                    "C5 02 00 0E 1C 00 00 BA C6 02 00 38 1D 00 00 1A" +
-                    "C8 02 00 98 1E 00 00 62 C9 02 00 E0 1F 00 00 0E" +
-                    "CA 02 00 77 00 00 00 24 CB 02 00 8D 01 00 00 38" +
-                    "CC 02 00 A1 02 00 00 A6 CD 02 00 0F 04 00 00 84" +
-                    "CE 02 00 ED 04 00 00 50 CF 02 00 B9 05 00 00 2C" +
-                    "D0 02 00 95 06 00 00 3A D1 02 00 A3 07 00 00 22" +
-                    "D3 02 00 8B 09 00 00 14 D4 02 00 7D 0A 00 00 3E" +
-                    "D5 02 00 A7 0B 00 00 68 D6 02 00 D1 0C 00 00 62" +
-                    "D7 02 00 CB 0D 00 00 4C D8 02 00 B5 0E 00 00 6A" +
-                    "D9 02 00 D3 0F 00 00 92 DA 02 00 FB 10 00 00 CC" +
-                    "DB 02 00 35 12 00 00 FC DC 02 00 65 13 00 00 A6" +
-                    "DE 02 00 0F 15 00 00 B2 DF 02 00 1B 16 00 00 9E" +
-                    "E0 02 00 07 17 00 00 A6 E1 02 00 0F 18 00 00 AA" +
-                    "E2 02 00 13 19 00 00 86 E3 02 00 EF 19 00 00 C8" +
-                    "E4 02 00 31 1B 00 00 F0 E5 02 00 59 1C 00 00 C6" +
-                    "E6 02 00 2F 1D 00 00 BA E7 02 00 23 1E 00 00 EC" +
-                    "E8 02 00 55 1F 00 00 02 EA 02 00 6C 00 00 00 64" +
-                    "EB 02 00 CE 01 00 00 F4 EC 02 00 5E 03 00 00 FE" +
-                    "ED 02 00 68 04 00 00 00 EF 02 00 6A 05 00 00 F6" +
-                    "EF 02 00 60 06 00 00 FA F0 02 00 64 07 00 00 CE" +
-                    "F1 02 00 38 08 00 00 2E F3 02 00 98 09 00 00 36" +
-                    "F4 02 00 A0 0A 00 00 46 F5 02 00 B0 0B 00 00 50" +
-                    "F6 02 00 BA 0C 00 00 60 F7 02 00 CA 0D 00 00 7C" +
-                    "F8 02 00 E6 0E 00 00 CC F9 02 00 36 10 00 00 DE" +
-                    "FA 02 00 48 11 00 00 AA FB 02 00 14 12 00 00 2E" +
-                    "FD 02 00 98 13 00 00 54 FE 02 00 BE 14 00 00 6E" +
-                    "FF 02 00 D8 15 00 00 88 00 03 00 F2 16 00 00 D6" +
-                    "01 03 00 40 18 00 00 4A 03 03 00 B4 19 00 00 80" +
-                    "04 03 00 EA 1A 00 00 90 05 03 00 FA 1B 00 00 96" +
-                    "06 03 00 00 1D 00 00 A4 07 03 00 0E 1E 00 00 12" +
-                    "09 03 00 7C 1F 00 00 20 0A 03 00 8B 00 00 00 8E" +
-                    "0B 03 00 F9 01 00 00 B6 0C 03 00 21 03 00 00 D6" +
-                    "0D 03 00 41 04 00 00 D6 0E 03 00 41 05 00 00 28" +
-                    "10 03 00 93 06 00 00 36 11 03 00 A1 07 00 00 84" +
-                    "12 03 00 EF 08 00 00 F2 13 03 00 5D 0A 00 00 44" +
-                    "15 03 00 AF 0B 00 00 F6 16 03 00 61 0D 00 00 26" +
-                    "18 03 00 91 0E 00 00 B8 19 03 00 23 10 00 00 0A" +
-                    "1B 03 00 75 11 00 00 5E 1C 03 00 C9 12 00 00 A4" +
-                    "1D 03 00 0F 14 00 00 CA 1E 03 00 35 15 00 00 3A" +
-                    "20 03 00 A5 16 00 00 C2 21 03 00 2D 18 00 00 A8" +
-                    "22 03 00 13 19 00 00 DA 23 03 00 45 1A 00 00 3A" +
-                    "25 03 00 A5 1B 00 00 2C 26 03 00 97 1C 00 00 96" +
-                    "27 03 00 01 1E 00 00 A2 28 03 00 0D 1F 00 00 B0" +
-                    "29 03 00 04 00 00 00 78 2B 03 00 CC 01 00 00 44" +
-                    "2C 03 00 98 02 00 00 74 2D 03 00 C8 03 00 00 00" +
-                    "2F 03 00 54 05 00 00 18 30 03 00 6C 06 00 00 6C" +
-                    "31 03 00 C0 07 00 00 E8 32 03 00 3C 09 00 00 E6" +
-                    "33 03 00 3A 0A 00 00 5E 35 03 00 B2 0B 00 00 02" +
-                    "37 03 00 56 0D 00 00 56 38 03 00 AA 0E 00 00 82" +
-                    "39 03 00 D6 0F 00 00 C8 3A 03 00 1C 11 00 00 08" +
-                    "3C 03 00 5C 12 00 00 72 3D 03 00 C6 13 00 00 C2" +
-                    "3E 03 00 16 15 00 00 28 40 03 00 7C 16 00 00 AE" +
-                    "41 03 00 02 18 00 00 38 43 03 00 8C 19 00 00 7A" +
-                    "44 03 00 CE 1A 00 00 C4 45 03 00 18 1C 00 00 1E" +
-                    "47 03 00 72 1D 00 00 A2 48 03 00 F6 1E 00 00 1E" +
-                    "4A 03 00 51 00 00 00 7A 4B 03 00 AD 01 00 00 F8" +
-                    "4C 03 00 2B 03 00 00 7C 4E 03 00 AF 04 00 00 6C" +
-                    "50 03 00 9F 06 00 00 B8 51 03 00 EB 07 00 00 30" +
-                    "53 03 00 63 09 00 00 2A 54 03 00 5D 0A 00 00 5C" +
-                    "55 03 00 8F 0B 00 00 D4 56 03 00 07 0D 00 00 DE" +
-                    "57 03 00 11 0E 00 00 E8 58 03 00 1B 0F 00 00 B0" +
-                    "59 03 00 E3 0F 00 00 F4 5A 03 00 27 11 00 00 68" +
-                    "5C 03 00 9B 12 00 00 F6 5D 03 00 29 14 00 00 F4" +
-                    "5E 03 00 27 15 00 00 64 60 03 00 97 16 00 00 9E" +
-                    "61 03 00 D1 17 00 00 CA 62 03 00 FD 18 00 00 3C" +
-                    "64 03 00 6F 1A 00 00 96 65 03 00 C9 1B 00 00 FC" +
-                    "66 03 00 2F 1D 00 00 40 68 03 00 73 1E 00 00 AE" +
-                    "69 03 00 E1 1F 00 00 3E 6B 03 00 73 01 00 00 66" +
-                    "6C 03 00 9B 02 00 00 52 6D 03 00 87 03 00 00 24" +
-                    "6F 03 00 59 05 00 00 AA 70 03 00 DF 06 00 00 E6" +
-                    "71 03 00 1B 08 00 00 82 73 03 00 B7 09 00 00 00" +
-                    "75 03 00 35 0B 00 00 9E 76 03 00 D3 0C 00 00 20" +
-                    "78 03 00 55 0E 00 00 0E 79 03 00 43 0F 00 00 10" +
-                    "7A 03 00 45 10 00 00 02 7B 03 00 37 11 00 00 3C" +
-                    "7C 03 00 71 12 00 00 8E 7D 03 00 C3 13 00 00 F4" +
-                    "7E 03 00 29 15 00 00 96 80 03 00 CB 16 00 00 44" +
-                    "82 03 00 79 18 00 00 76 84 03 00 AB 1A 00 00 92" +
-                    "86 03 00 C7 1C 00 00 2D 88 03 00 62 1E 00 00 19" +
-                    "8A 03 00 88 00 00 00 11 8B 03 00 80 01 00 00 BB" +
-                    "8C 03 00 2A 03 00 00 CB 8D 03 00 3A 04 00 00 CB" +
-                    "8E 03 00 3A 05 00 00 CF 8F 03 00 3E 06 00 00 C5" +
-                    "90 03 00 34 07 00 00 A7 91 03 00 16 08 00 00 C9" +
-                    "92 03 00 38 09 00 00 C5 93 03 00 34 0A 00 00 CD" +
-                    "94 03 00 3C 0B 00 00 C5 96 03 00 34 0D 00 00 BB" +
-                    "98 03 00 2A 0F 00 00 A9 99 03 00 18 10 00 00 C3" +
-                    "9A 03 00 32 11 00 00 53 9C 03 00 C2 12 00 00 51" +
-                    "9D 03 00 C0 13 00 00 AF 9E 03 00 1E 15 00 00 ED" +
-                    "9F 03 00 5C 16 00 00 53 A1 03 00 C2 17 00 00 17" +
-                    "A3 03 00 86 19 00 00 55 A4 03 00 C4 1A 00 00 6B" +
-                    "A5 03 00 DA 1B 00 00 5F A6 03 00 CE 1C 00 00 5F" +
-                    "A7 03 00 CE 1D 00 00 9F A8 03 00 0E 1F 00 00 51" +
-                    "AA 03 00 9E 00 00 00 1F AC 03 00 6C 02 00 00 17" +
-                    "AE 03 00 64 04 00 00 B7 B0 03 00 04 07 00 00 05" +
-                    "B3 03 00 52 09 00 00 97 B4 03 00 E4 0A 00 00 03" +
-                    "B6 03 00 50 0C 00 00 7F B7 03 00 CC 0D 00 00 0B" +
-                    "B9 03 00 58 0F 00 00 41 BB 03 00 8E 11 00 00 23" +
-                    "BD 03 00 70 13 00 00 1D BF 03 00 6A 15 00 00 47" +
-                    "C0 03 00 94 16 00 00 FB C1 03 00 48 18 00 00 45" +
-                    "C3 03 00 92 19 00 00 7F C4 03 00 CC 1A 00 00 19" +
-                    "C6 03 00 66 1C 00 00 55 C7 03 00 A2 1D 00 00 9D" +
-                    "C8 03 00 EA 1E 00 00 FB C9 03 00 58 00 00 00 89" +
-                    "CB 03 00 E6 01 00 00 2B CD 03 00 88 03 00 00 8D" +
-                    "CE 03 00 EA 04 00 00 F9 CF 03 00 56 06 00 00 6D" +
-                    "D1 03 00 CA 07 00 00 EF D3 03 00 4C 0A 00 00 1D" +
-                    "D5 03 00 7A 0B 00 00 C9 D6 03 00 26 0D 00 00 C3" +
-                    "D8 03 00 20 0F 00 00 1D DA 03 00 7A 10 00 00 07" +
-                    "DC 03 00 64 12 00 00 61 DD 03 00 BE 13 00 00 E3" +
-                    "DE 03 00 40 15 00 00 29 E0 03 00 86 16 00 00 5B" +
-                    "E2 03 00 B8 18 00 00 B7 E4 03 00 14 1B 00 00 A7" +
-                    "E6 03 00 04 1D 00 00 E5 E8 03 00 42 1F 00 00 AF" +
-                    "EA 03 00 3D 01 00 00 AD EC 03 00 3B 03 00 00 C1" +
-                    "EE 03 00 4F 05 00 00 C7 F0 03 00 55 07 00 00 0B" +
-                    "F3 03 00 99 09 00 00 E9 F4 03 00 77 0B 00 00 ED" +
-                    "F6 03 00 7B 0D 00 00 53 F9 03 00 E1 0F 00 00 5B" +
-                    "FB 03 00 E9 11 00 00 5F FD 03 00 ED 13 00 00 EF" +
-                    "FF 03 00 7D 16 00 00 AF 01 04 00 3D 18 00 00 B9" +
-                    "02 04 00 47 19 00 00 AD 04 04 00 3B 1B 00 00 51" +
-                    "06 04 00 DF 1C 00 00 6F 07 04 00 FD 1D 00 00 69" +
-                    "08 04 00 F7 1E 00 00 E1 09 04 00 52 00 00 00 81" +
-                    "0B 04 00 F2 01 00 00 51 0C 04 00 C2 02 00 00 39" +
-                    "0D 04 00 AA 03 00 00 5D 0E 04 00 CE 04 00 00 BB" +
-                    "0F 04 00 2C 06 00 00 91 10 04 00 02 07 00 00 1D" +
-                    "12 04 00 8E 08 00 00 2D 13 04 00 9E 09 00 00 7B" +
-                    "14 04 00 EC 0A 00 00 1D 16 04 00 8E 0C 00 00 8B" +
-                    "17 04 00 FC 0D 00 00 B5 18 04 00 26 0F 00 00 6D" +
-                    "1A 04 00 DE 10 00 00 8B 1B 04 00 FC 11 00 00 AB" +
-                    "1C 04 00 1C 13 00 00 E7 1D 04 00 58 14 00 00 37" +
-                    "1F 04 00 A8 15 00 00 69 20 04 00 DA 16 00 00 83" +
-                    "21 04 00 F4 17 00 00 8D 22 04 00 FE 18 00 00 E7" +
-                    "23 04 00 58 1A 00 00 B7 25 04 00 28 1C 00 00 29" +
-                    "28 04 00 9A 1E 00 00 97 29 04 00 04 00 00 00 DB" +
-                    "2A 04 00 48 01 00 00 EF 2B 04 00 5C 02 00 00 5B" +
-                    "2D 04 00 C8 03 00 00 71 2E 04 00 DE 04 00 00 BF" +
-                    "2F 04 00 2C 06 00 00 9D 31 04 00 0A 08 00 00 DD" +
-                    "32 04 00 4A 09 00 00 FB 33 04 00 68 0A 00 00 11" +
-                    "36 04 00 7E 0C 00 00 4D 37 04 00 BA 0D 00 00 01" +
-                    "39 04 00 6E 0F 00 00 67 3A 04 00 D4 10 00 00 0D" +
-                    "3C 04 00 7A 12 00 00 A1 3D 04 00 0E 14 00 00 F3" +
-                    "3E 04 00 60 15 00 00 87 40 04 00 F4 16 00 00 83" +
-                    "42 04 00 F0 18 00 00 F7 43 04 00 64 1A 00 00 F7" +
-                    "45 04 00 64 1C 00 00 FB 47 04 00 68 1E 00 00 3D" +
-                    "49 04 00 AA 1F 00 00 39 4B 04 00 92 01 00 00 8B" +
-                    "4C 04 00 E4 02 00 00 97 4E 04 00 F0 04 00 00 5D" +
-                    "50 04 00 B6 06 00 00 19 52 04 00 72 08 00 00 43" +
-                    "53 04 00 9C 09 00 00 FD 54 04 00 56 0B 00 00 FD" +
-                    "55 04 00 56 0C 00 00 4B 57 04 00 A4 0D 00 00 83" +
-                    "58 04 00 DC 0E 00 00 E9 59 04 00 42 10 00 00 47" +
-                    "5B 04 00 A0 11 00 00 B9 5C 04 00 12 13 00 00 5D" +
-                    "5E 04 00 B6 14 00 00 DB 5F 04 00 34 16 00 00 F1" +
-                    "61 04 00 4A 18 00 00 35 64 04 00 8E 1A 00 00 87" +
-                    "66 04 00 E0 1C 00 00 B9 68 04 00 12 1F 00 00 AD" +
-                    "6A 04 00 FA 00 00 00 EB 6C 04 00 38 03 00 00 0B" +
-                    "6F 04 00 58 05 00 00 49 71 04 00 96 07 00 00 11" +
-                    "73 04 00 5E 09 00 00 A5 75 04 00 F2 0B 00 00 89" +
-                    "77 04 00 D6 0D 00 00 C9 79 04 00 16 10 00 00 C5" +
-                    "7A 04 00 12 11 00 00 15 7C 04 00 62 12 00 00 7F" +
-                    "7D 04 00 CC 13 00 00 83 7F 04 00 D0 15 00 00 AB" +
-                    "81 04 00 F8 17 00 00 2D 83 04 00 7A 19 00 00 7B" +
-                    "84 04 00 C8 1A 00 00 CD 85 04 00 1A 1C 00 00 DF" +
-                    "87 04 00 2C 1E 00 00 65 89 04 00 B2 1F 00 00 BF" +
-                    "8B 04 00 0B 02 00 00 25 8E 04 00 71 04 00 00 F5" +
-                    "8F 04 00 41 06 00 00 79 91 04 00 C5 07 00 00 19" +
-                    "93 04 00 65 09 00 00 5D 94 04 00 A9 0A 00 00 4B" +
-                    "96 04 00 97 0C 00 00 B7 97 04 00 03 0E 00 00 37" +
-                    "99 04 00 83 0F 00 00 EB 9A 04 00 37 11 00 00 E3" +
-                    "9B 04 00 2F 12 00 00 BD 9D 04 00 09 14 00 00 C1" +
-                    "9F 04 00 0D 16 00 00 AB A1 04 00 F7 17 00 00 EB" +
-                    "A2 04 00 37 19 00 00 DF A3 04 00 2B 1A 00 00 CB" +
-                    "A4 04 00 17 1B 00 00 93 A5 04 00 DF 1B 00 00 6F" +
-                    "A6 04 00 BB 1C 00 00 59 A7 04 00 A5 1D 00 00 5B" +
-                    "A8 04 00 A7 1E 00 00 47 A9 04 00 93 1F 00 00 4B" +
-                    "AA 04 00 AE 00 00 00 49 AB 04 00 AC 01 00 00 53" +
-                    "AC 04 00 B6 02 00 00 7B AD 04 00 DE 03 00 00 67" +
-                    "AE 04 00 CA 04 00 00 73 AF 04 00 D6 05 00 00 B3" +
-                    "B0 04 00 16 07 00 00 A7 B1 04 00 0A 08 00 00 7B" +
-                    "B2 04 00 DE 08 00 00 C7 B3 04 00 2A 0A 00 00 B3" +
-                    "B4 04 00 16 0B 00 00 EB B5 04 00 4E 0C 00 00 09" +
-                    "B7 04 00 6C 0D 00 00 11 B8 04 00 74 0E 00 00 37" +
-                    "B9 04 00 9A 0F 00 00 41 BA 04 00 A4 10 00 00 A7" +
-                    "BB 04 00 0A 12 00 00 87 BC 04 00 EA 12 00 00 9D" +
-                    "BD 04 00 00 14 00 00 DF BE 04 00 42 15 00 00 C5" +
-                    "BF 04 00 28 16 00 00 A9 C0 04 00 0C 17 00 00 A1" +
-                    "C1 04 00 04 18 00 00 9B C2 04 00 FE 18 00 00 DD" +
-                    "C3 04 00 40 1A 00 00 AF C4 04 00 12 1B 00 00 D1" +
-                    "C5 04 00 34 1C 00 00 F5 C6 04 00 58 1D 00 00 E5" +
-                    "C7 04 00 48 1E 00 00 2F C9 04 00 92 1F 00 00 11" +
-                    "CA 04 00 63 00 00 00 E5 CA 04 00 37 01 00 00 C3" +
-                    "CB 04 00 15 02 00 00 A9 CC 04 00 FB 02 00 00 B1" +
-                    "CD 04 00 03 04 00 00 A1 CE 04 00 F3 04 00 00 8B" +
-                    "CF 04 00 DD 05 00 00 5D D0 04 00 AF 06 00 00 33" +
-                    "D1 04 00 85 07 00 00 39 D2 04 00 8B 08 00 00 27" +
-                    "D3 04 00 79 09 00 00 21 D4 04 00 73 0A 00 00 EF" +
-                    "D4 04 00 41 0B 00 00 C3 D5 04 00 15 0C 00 00 7D" +
-                    "D6 04 00 CF 0C 00 00 3F D7 04 00 91 0D 00 00 5F" +
-                    "D8 04 00 B1 0E 00 00 3D D9 04 00 8F 0F 00 00 0D" +
-                    "DA 04 00 5F 10 00 00 F7 DA 04 00 49 11 00 00 31" +
-                    "DC 04 00 83 12 00 00 B7 DD 04 00 09 14 00 00 ED" +
-                    "DE 04 00 3F 15 00 00 EF DF 04 00 41 16 00 00 D5" +
-                    "E0 04 00 27 17 00 00 AF E1 04 00 01 18 00 00 C7" +
-                    "E2 04 00 19 19 00 00 B7 E3 04 00 09 1A 00 00 A9" +
-                    "E4 04 00 FB 1A 00 00 B7 E5 04 00 09 1C 00 00 C1" +
-                    "E6 04 00 13 1D 00 00 A9 E7 04 00 FB 1D 00 00 AB" +
-                    "E8 04 00 FD 1E 00 00 93 E9 04 00 E5 1F 00 00 75" +
-                    "EA 04 00 CF 00 00 00 3F EB 04 00 99 01 00 00 63" +
-                    "EC 04 00 BD 02 00 00 67 ED 04 00 C1 03 00 00 83" +
-                    "EE 04 00 DD 04 00 00 8F EF 04 00 E9 05 00 00 79" +
-                    "F0 04 00 D3 06 00 00 4F F1 04 00 A9 07 00 00 3F" +
-                    "F2 04 00 99 08 00 00 41 F3 04 00 9B 09 00 00 11" +
-                    "F4 04 00 6B 0A 00 00 27 F5 04 00 81 0B 00 00 21" +
-                    "F6 04 00 7B 0C 00 00 23 F7 04 00 7D 0D 00 00 5F" +
-                    "F8 04 00 B9 0E 00 00 2D F9 04 00 87 0F 00 00 2F" +
-                    "FA 04 00 89 10 00 00 2B FB 04 00 85 11 00 00 4D" +
-                    "FC 04 00 A7 12 00 00 2B FD 04 00 85 13 00 00 2F" +
-                    "FE 04 00 89 14 00 00 4D FF 04 00 A7 15 00 00 59" +
-                    "00 05 00 B3 16 00 00 7D 01 05 00 D7 17 00 00 AD" +
-                    "02 05 00 07 19 00 00 B7 03 05 00 11 1A 00 00 47" +
-                    "05 05 00 A1 1B 00 00 7D 06 05 00 D7 1C 00 00 0F" +
-                    "08 05 00 69 1E 00 00 5D 09 05 00 B7 1F 00 00 9B" +
-                    "0A 05 00 DE 00 00 00 A1 0B 05 00 E4 01 00 00 91" +
-                    "0C 05 00 D4 02 00 00 09 0E 05 00 4C 04 00 00 A7" +
-                    "0F 05 00 EA 05 00 00 FD 10 05 00 40 07 00 00 93" +
-                    "12 05 00 D6 08 00 00 35 14 05 00 78 0A 00 00 63" +
-                    "15 05 00 A6 0B 00 00 97 17 05 00 DA 0D 00 00 B1" +
-                    "19 05 00 F4 0F 00 00 2B 1C 05 00 6E 12 00 00 69" +
-                    "1D 05 00 AC 13 00 00 8D 1E 05 00 D0 14 00 00 D1" +
-                    "1F 05 00 14 16 00 00 FF 20 05 00 42 17 00 00 93" +
-                    "22 05 00 D6 18 00 00 F1 23 05 00 34 1A 00 00 55" +
-                    "25 05 00 98 1B 00 00 83 26 05 00 C6 1C 00 00 BF" +
-                    "27 05 00 02 1E 00 00 13 29 05 00 56 1F 00 00 7D" +
-                    "2A 05 00 B5 00 00 00 F3 2B 05 00 2B 02 00 00 79" +
-                    "2D 05 00 B1 03 00 00 D7 2E 05 00 0F 05 00 00 11" +
-                    "30 05 00 49 06 00 00 19 32 05 00 51 08 00 00 2B" +
-                    "33 05 00 63 09 00 00 33 34 05 00 6B 0A 00 00 AF" +
-                    "35 05 00 E7 0B 00 00 8F 36 05 00 C7 0C 00 00 01" +
-                    "38 05 00 39 0E 00 00 49 39 05 00 81 0F 00 00 AD" +
-                    "3A 05 00 E5 10 00 00 29 3C 05 00 61 12 00 00 0F" +
-                    "3E 05 00 47 14 00 00 99 3F 05 00 D1 15 00 00 79" +
-                    "41 05 00 B1 17 00 00 E7 43 05 00 1F 1A 00 00 D1" +
-                    "46 05 00 09 1D 00 00 29 49 05 00 61 1F 00 00 CF" +
-                    "4B 05 00 EE 01 00 00 F9 4D 05 00 18 04 00 00 E5" +
-                    "50 05 00 04 07 00 00 51 53 05 00 70 09 00 00 C1" +
-                    "55 05 00 E0 0B 00 00 5F 58 05 00 7E 0E 00 00 9D" +
-                    "59 05 00 BC 0F 00 00 8F 5A 05 00 AE 10 00 00 9D" +
-                    "5C 05 00 BC 12 00 00 CB 5D 05 00 EA 13 00 00 8F" +
-                    "5F 05 00 AE 15 00 00 B1 60 05 00 D0 16 00 00 FB" +
-                    "61 05 00 1A 18 00 00 29 63 05 00 48 19 00 00 BD" +
-                    "64 05 00 DC 1A 00 00 67 66 05 00 86 1C 00 00 21" +
-                    "68 05 00 40 1E 00 00 83 69 05 00 A2 1F 00 00 F9" +
-                    "6A 05 00 0B 01 00 00 EB 6C 05 00 FD 02 00 00 B5" +
-                    "6E 05 00 C7 04 00 00 19 70 05 00 2B 06 00 00 11" +
-                    "72 05 00 23 08 00 00 53 73 05 00 65 09 00 00 99" +
-                    "74 05 00 AB 0A 00 00 23 76 05 00 35 0C 00 00 13" +
-                    "78 05 00 25 0E 00 00 91 79 05 00 A3 0F 00 00 E3" +
-                    "7A 05 00 F5 10 00 00 B7 7B 05 00 C9 11 00 00 B7" +
-                    "7C 05 00 C9 12 00 00 B7 7D 05 00 C9 13 00 00 81" +
-                    "7F 05 00 93 15 00 00 E7 80 05 00 F9 16 00 00 67" +
-                    "82 05 00 79 18 00 00 6B 83 05 00 7D 19 00 00 8B" +
-                    "84 05 00 9D 1A 00 00 71 86 05 00 83 1C 00 00 F5" +
-                    "87 05 00 07 1E 00 00                           " +
-
-                    //Offset=0x0008DB37(580407) recno=160 sid=0x003C size=0x1048(4168)
-                    "                     3C 00 48 10 47 8A 05 00 4E" +
-                    "00 00 00 45 8B 05 00 4C 01 00 00 59 8C 05 00 60" +
-                    "02 00 00 91 8D 05 00 98 03 00 00 77 8F 05 00 7E" +
-                    "05 00 00 B9 90 05 00 C0 06 00 00 D3 91 05 00 DA" +
-                    "07 00 00 75 93 05 00 7C 09 00 00 2F 95 05 00 36" +
-                    "0B 00 00 F1 96 05 00 F8 0C 00 00 DB 98 05 00 E2" +
-                    "0E 00 00 3D 9A 05 00 44 10 00 00 41 9C 05 00 48" +
-                    "12 00 00 A1 9D 05 00 A8 13 00 00 F7 9E 05 00 FE" +
-                    "14 00 00 71 A0 05 00 78 16 00 00 11 A2 05 00 18" +
-                    "18 00 00 0F A3 05 00 16 19 00 00 69 A4 05 00 70" +
-                    "1A 00 00 89 A6 05 00 90 1C 00 00 65 A8 05 00 6C" +
-                    "1E 00 00 E3 AA 05 00 CF 00 00 00 AF AC 05 00 9B" +
-                    "02 00 00 91 AE 05 00 7D 04 00 00 B7 B0 05 00 A3" +
-                    "06 00 00 85 B2 05 00 71 08 00 00 D9 B3 05 00 C5" +
-                    "09 00 00 4F B5 05 00 3B 0B 00 00 BD B6 05 00 A9" +
-                    "0C 00 00 AF B8 05 00 9B 0E 00 00 63 BA 05 00 4F" +
-                    "10 00 00 35 BC 05 00 21 12 00 00 5B BD 05 00 47" +
-                    "13 00 00 53 BE 05 00 3F 14 00 00 9F BF 05 00 8B" +
-                    "15 00 00 17 C2 05 00 03 18 00 00 CB C3 05 00 B7" +
-                    "19 00 00 FB C4 05 00 E7 1A 00 00 89 C6 05 00 75" +
-                    "1C 00 00 67 C7 05 00 53 1D 00 00 D7 C8 05 00 C3" +
-                    "1E 00 00 0B CA 05 00 F7 1F 00 00 0D CB 05 00 EB" +
-                    "00 00 00 F7 CB 05 00 D5 01 00 00 03 CD 05 00 E1" +
-                    "02 00 00 13 CE 05 00 F1 03 00 00 33 CF 05 00 11" +
-                    "05 00 00 51 D0 05 00 2F 06 00 00 49 D1 05 00 27" +
-                    "07 00 00 43 D2 05 00 21 08 00 00 63 D4 05 00 41" +
-                    "0A 00 00 93 D5 05 00 71 0B 00 00 C9 D6 05 00 A7" +
-                    "0C 00 00 FF D7 05 00 DD 0D 00 00 73 D9 05 00 51" +
-                    "0F 00 00 27 DB 05 00 05 11 00 00 8B DC 05 00 69" +
-                    "12 00 00 C3 DD 05 00 A1 13 00 00 3F DF 05 00 1D" +
-                    "15 00 00 E5 E0 05 00 C3 16 00 00 FF E1 05 00 DD" +
-                    "17 00 00 29 E3 05 00 07 19 00 00 3F E4 05 00 1D" +
-                    "1A 00 00 15 E5 05 00 F3 1A 00 00 F9 E5 05 00 D7" +
-                    "1B 00 00 C5 E6 05 00 A3 1C 00 00 C9 E7 05 00 A7" +
-                    "1D 00 00 27 E9 05 00 05 1F 00 00 A1 EA 05 00 73" +
-                    "00 00 00 6B EC 05 00 3D 02 00 00 A3 ED 05 00 75" +
-                    "03 00 00 B5 EE 05 00 87 04 00 00 E9 EF 05 00 BB" +
-                    "05 00 00 77 F1 05 00 49 07 00 00 B9 F2 05 00 8B" +
-                    "08 00 00 C5 F4 05 00 97 0A 00 00 0D F6 05 00 DF" +
-                    "0B 00 00 C3 F7 05 00 95 0D 00 00 E5 F9 05 00 B7" +
-                    "0F 00 00 B5 FB 05 00 87 11 00 00 6B FE 05 00 3D" +
-                    "14 00 00 DD 00 06 00 AF 16 00 00 0B 03 06 00 DD" +
-                    "18 00 00 9F 05 06 00 71 1B 00 00 7B 08 06 00 4D" +
-                    "1E 00 00 A7 0A 06 00 62 00 00 00 59 0D 06 00 14" +
-                    "03 00 00 3D 0F 06 00 F8 04 00 00 9B 10 06 00 56" +
-                    "06 00 00 17 12 06 00 D2 07 00 00 6F 13 06 00 2A" +
-                    "09 00 00 59 14 06 00 14 0A 00 00 1F 16 06 00 DA" +
-                    "0B 00 00 49 17 06 00 04 0D 00 00 D1 18 06 00 8C" +
-                    "0E 00 00 C1 1A 06 00 7C 10 00 00 2B 1C 06 00 E6" +
-                    "11 00 00 9F 1D 06 00 5A 13 00 00 77 1F 06 00 32" +
-                    "15 00 00 CD 20 06 00 88 16 00 00 B7 21 06 00 72" +
-                    "17 00 00 9D 22 06 00 58 18 00 00 61 23 06 00 1C" +
-                    "19 00 00 33 24 06 00 EE 19 00 00 67 25 06 00 22" +
-                    "1B 00 00 4F 26 06 00 0A 1C 00 00 3F 27 06 00 FA" +
-                    "1C 00 00 17 28 06 00 D2 1D 00 00 25 29 06 00 E0" +
-                    "1E 00 00 19 2A 06 00 D4 1F 00 00 DF 2A 06 00 96" +
-                    "00 00 00 CF 2B 06 00 86 01 00 00 9D 2C 06 00 54" +
-                    "02 00 00 CD 2D 06 00 84 03 00 00 9F 2E 06 00 56" +
-                    "04 00 00 7F 2F 06 00 36 05 00 00 49 30 06 00 00" +
-                    "06 00 00 21 31 06 00 D8 06 00 00 17 32 06 00 CE" +
-                    "07 00 00 05 33 06 00 BC 08 00 00 FF 33 06 00 B6" +
-                    "09 00 00 DD 34 06 00 94 0A 00 00 B1 35 06 00 68" +
-                    "0B 00 00 99 36 06 00 50 0C 00 00 73 37 06 00 2A" +
-                    "0D 00 00 95 38 06 00 4C 0E 00 00 8D 39 06 00 44" +
-                    "0F 00 00 A9 3A 06 00 60 10 00 00 F3 3B 06 00 AA" +
-                    "11 00 00 19 3D 06 00 D0 12 00 00 2D 3E 06 00 E4" +
-                    "13 00 00 49 3F 06 00 00 15 00 00 FF 40 06 00 B6" +
-                    "16 00 00 9D 42 06 00 54 18 00 00 4D 44 06 00 04" +
-                    "1A 00 00 9B 46 06 00 52 1C 00 00 BF 48 06 00 76" +
-                    "1E 00 00 19 4B 06 00 D9 00 00 00 DB 4D 06 00 9B" +
-                    "03 00 00 53 4F 06 00 13 05 00 00 EB 50 06 00 AB" +
-                    "06 00 00 25 52 06 00 E5 07 00 00 9B 53 06 00 5B" +
-                    "09 00 00 03 55 06 00 C3 0A 00 00 85 56 06 00 45" +
-                    "0C 00 00 E9 58 06 00 A9 0E 00 00 EF 59 06 00 AF" +
-                    "0F 00 00 61 5B 06 00 21 11 00 00 2B 5D 06 00 EB" +
-                    "12 00 00 57 5F 06 00 17 15 00 00 D1 60 06 00 91" +
-                    "16 00 00 15 63 06 00 D5 18 00 00 97 65 06 00 57" +
-                    "1B 00 00 D3 67 06 00 93 1D 00 00 31 69 06 00 F1" +
-                    "1E 00 00 47 6A 06 00 07 20 00 00 FB 6B 06 00 97" +
-                    "01 00 00 43 6D 06 00 DF 02 00 00 7B 6E 06 00 17" +
-                    "04 00 00 39 70 06 00 D5 05 00 00 BD 71 06 00 59" +
-                    "07 00 00 6B 73 06 00 07 09 00 00 95 74 06 00 31" +
-                    "0A 00 00 59 76 06 00 F5 0B 00 00 C7 77 06 00 63" +
-                    "0D 00 00 BF 79 06 00 5B 0F 00 00 AD 7B 06 00 49" +
-                    "11 00 00 9B 7D 06 00 37 13 00 00 FB 7E 06 00 97" +
-                    "14 00 00 2D 81 06 00 C9 16 00 00 5B 82 06 00 F7" +
-                    "17 00 00 D5 83 06 00 71 19 00 00 B1 85 06 00 4D" +
-                    "1B 00 00 73 87 06 00 0F 1D 00 00 29 89 06 00 C5" +
-                    "1E 00 00 AF 8A 06 00 34 00 00 00 C9 8B 06 00 4E" +
-                    "01 00 00 39 8D 06 00 BE 02 00 00 B1 8E 06 00 36" +
-                    "04 00 00 01 90 06 00 86 05 00 00 6D 91 06 00 F2" +
-                    "06 00 00 C7 92 06 00 4C 08 00 00 21 94 06 00 A6" +
-                    "09 00 00 51 95 06 00 D6 0A 00 00 61 96 06 00 E6" +
-                    "0B 00 00 F1 97 06 00 76 0D 00 00 F5 98 06 00 7A" +
-                    "0E 00 00 37 9A 06 00 BC 0F 00 00 79 9B 06 00 FE" +
-                    "10 00 00 09 9D 06 00 8E 12 00 00 DD 9D 06 00 62" +
-                    "13 00 00 1F 9F 06 00 A4 14 00 00 29 A0 06 00 AE" +
-                    "15 00 00 3B A1 06 00 C0 16 00 00 AF A2 06 00 34" +
-                    "18 00 00 E3 A3 06 00 68 19 00 00 3D A5 06 00 C2" +
-                    "1A 00 00 91 A6 06 00 16 1C 00 00 3F A8 06 00 C4" +
-                    "1D 00 00 1B AA 06 00 A0 1F 00 00 1B AB 06 00 8A" +
-                    "00 00 00 63 AC 06 00 D2 01 00 00 75 AD 06 00 E4" +
-                    "02 00 00 91 AE 06 00 00 04 00 00 E7 AF 06 00 56" +
-                    "05 00 00 41 B1 06 00 B0 06 00 00 85 B2 06 00 F4" +
-                    "07 00 00 83 B3 06 00 F2 08 00 00 CD B4 06 00 3C" +
-                    "0A 00 00 B7 B5 06 00 26 0B 00 00 ED B6 06 00 5C" +
-                    "0C 00 00 D9 B7 06 00 48 0D 00 00 B3 B9 06 00 22" +
-                    "0F 00 00 63 BB 06 00 D2 10 00 00 E3 BC 06 00 52" +
-                    "12 00 00 53 BE 06 00 C2 13 00 00 83 BF 06 00 F2" +
-                    "14 00 00 AF C0 06 00 1E 16 00 00 8F C2 06 00 FE" +
-                    "17 00 00 0F C4 06 00 7E 19 00 00 DF C5 06 00 4E" +
-                    "1B 00 00 77 C7 06 00 E6 1C 00 00 D9 C8 06 00 48" +
-                    "1E 00 00 C5 CA 06 00 35 00 00 00 D9 CB 06 00 49" +
-                    "01 00 00 29 CD 06 00 99 02 00 00 F3 CE 06 00 63" +
-                    "04 00 00 0B D1 06 00 7B 06 00 00 45 D2 06 00 B5" +
-                    "07 00 00 59 D4 06 00 C9 09 00 00 87 D6 06 00 F7" +
-                    "0B 00 00 DD D7 06 00 4D 0D 00 00 2D DA 06 00 9D" +
-                    "0F 00 00 2D DC 06 00 9D 11 00 00 B7 DD 06 00 27" +
-                    "13 00 00 09 DF 06 00 79 14 00 00 FB E0 06 00 6B" +
-                    "16 00 00 E9 E2 06 00 59 18 00 00 47 E4 06 00 B7" +
-                    "19 00 00 21 E6 06 00 91 1B 00 00 03 E8 06 00 73" +
-                    "1D 00 00 D1 E9 06 00 41 1F 00 00 45 EC 06 00 95" +
-                    "01 00 00 63 EE 06 00 B3 03 00 00 C9 F1 06 00 19" +
-                    "07 00 00 BD F4 06 00 0D 0A 00 00 57 F7 06 00 A7" +
-                    "0C 00 00 9B FA 06 00 EB 0F 00 00 37 FD 06 00 87" +
-                    "12 00 00 55 FF 06 00 A5 14 00 00 57 01 07 00 A7" +
-                    "16 00 00 D3 03 07 00 23 19 00 00 BF 05 07 00 0F" +
-                    "1B 00 00 1D 07 07 00 6D 1C 00 00 15 08 07 00 65" +
-                    "1D 00 00 1F 09 07 00 6F 1E 00 00 39 0B 07 00 8E" +
-                    "00 00 00 D5 0C 07 00 2A 02 00 00 21 0E 07 00 76" +
-                    "03 00 00 59 10 07 00 AE 05 00 00 43 12 07 00 98" +
-                    "07 00 00 A1 13 07 00 F6 08 00 00 9B 16 07 00 F0" +
-                    "0B 00 00 99 18 07 00 EE 0D 00 00 43 1A 07 00 98" +
-                    "0F 00 00 D3 1C 07 00 28 12 00 00 4B 1E 07 00 A0" +
-                    "13 00 00 E9 1F 07 00 3E 15 00 00 13 21 07 00 68" +
-                    "16 00 00 65 22 07 00 BA 17 00 00 BF 23 07 00 14" +
-                    "19 00 00 77 25 07 00 CC 1A 00 00 11 27 07 00 66" +
-                    "1C 00 00 1B 28 07 00 70 1D 00 00 89 2A 07 00 DE" +
-                    "1F 00 00 07 2C 07 00 61 01 00 00 4D 2E 07 00 A7" +
-                    "03 00 00 41 31 07 00 9B 06 00 00 F1 33 07 00 4B" +
-                    "09 00 00 8B 36 07 00 E5 0B 00 00 15 39 07 00 6F" +
-                    "0E 00 00 17 3B 07 00 71 10 00 00 2B 3E 07 00 85" +
-                    "13 00 00 61 40 07 00 BB 15 00 00 1D 42 07 00 77" +
-                    "17 00 00 29 43 07 00 83 18 00 00 0D 45 07 00 67" +
-                    "1A 00 00 2D 46 07 00 87 1B 00 00 DF 47 07 00 39" +
-                    "1D 00 00 C7 4A 07 00 04 00 00 00 AB 4D 07 00 E8" +
-                    "02 00 00 55 50 07 00 92 05 00 00 C9 52 07 00 06" +
-                    "08 00 00 91 55 07 00 CE 0A 00 00 9F 57 07 00 DC" +
-                    "0C 00 00 8B 59 07 00 C8 0E 00 00 83 5A 07 00 C0" +
-                    "0F 00 00 03 5C 07 00 40 11 00 00 3F 5D 07 00 7C" +
-                    "12 00 00 7B 5E 07 00 B8 13 00 00 EF 5F 07 00 2C" +
-                    "15 00 00 85 61 07 00 C2 16 00 00 2F 63 07 00 6C" +
-                    "18 00 00 BB 65 07 00 F8 1A 00 00 D9 66 07 00 16" +
-                    "1C 00 00 21 68 07 00 5E 1D 00 00 4D 69 07 00 8A" +
-                    "1E 00 00 E3 6A 07 00 04 00 00 00 CF 6B 07 00 F0" +
-                    "00 00 00 6B 6D 07 00 8C 02 00 00 F1 6E 07 00 12" +
-                    "04 00 00 6D 70 07 00 8E 05 00 00 6F 71 07 00 90" +
-                    "06 00 00 9F 72 07 00 C0 07 00 00 55 74 07 00 76" +
-                    "09 00 00 49 76 07 00 6A 0B 00 00 D3 78 07 00 F4" +
-                    "0D 00 00 5F 7A 07 00 80 0F 00 00 A9 7B 07 00 CA" +
-                    "10 00 00 8F 7D 07 00 B0 12 00 00 B5 7F 07 00 D6" +
-                    "14 00 00 F9 81 07 00 1A 17 00 00 57 83 07 00 78" +
-                    "18 00 00 A5 84 07 00 C6 19 00 00 C3 85 07 00 E4" +
-                    "1A 00 00 FB 86 07 00 1C 1C 00 00 01 89 07 00 22" +
-                    "1E 00 00 2B 8A 07 00 4C 1F 00 00 77 8B 07 00 85" +
-                    "00 00 00 AD 8C 07 00 BB 01 00 00 4F 8E 07 00 5D" +
-                    "03 00 00 99 90 07 00 A7 05 00 00 F9 92 07 00 07" +
-                    "08 00 00 AB 94 07 00 B9 09 00 00 33 96 07 00 41" +
-                    "0B 00 00 CF 97 07 00 DD 0C 00 00 19 9A 07 00 27" +
-                    "0F 00 00 31 9B 07 00 3F 10 00 00 BF 9C 07 00 CD" +
-                    "11 00 00 A1 9E 07 00 AF 13 00 00 BF A0 07 00 CD" +
-                    "15 00 00 A3 A2 07 00 B1 17 00 00 95 A4 07 00 A3" +
-                    "19 00 00 95 A6 07 00 A3 1B 00 00 B7 A8 07 00 C5" +
-                    "1D 00 00 9F AA 07 00 AD 1F 00 00 F5 AC 07 00 F2" +
-                    "01 00 00 8F AE 07 00 8C 03 00 00 DB B0 07 00 D8" +
-                    "05 00 00 8D B2 07 00 8A 07 00 00 11 B4 07 00 0E" +
-                    "09 00 00 95 B5 07 00 92 0A 00 00 D3 B7 07 00 D0" +
-                    "0C 00 00 5D B9 07 00 5A 0E 00 00 63 BB 07 00 60" +
-                    "10 00 00 21 BE 07 00 1E 13 00 00 EB BF 07 00 E8" +
-                    "14 00 00 A3 C2 07 00 A0 17 00 00 25 C4 07 00 22" +
-                    "19 00 00 F7 C4 07 00 F4 19 00 00 29 C6 07 00 26" +
-                    "1B 00 00 BD C7 07 00 BA 1C 00 00 61 C9 07 00 5E" +
-                    "1E 00 00 3B CB 07 00 6D 00 00 00 C7 CC 07 00 F9" +
-                    "01 00 00 4D CE 07 00 7F 03 00 00 93 D0 07 00 C5" +
-                    "05 00 00 53 D2 07 00 85 07 00 00 BF D3 07 00 F1" +
-                    "08 00 00 EF D4 07 00 21 0A 00 00 F7 D6 07 00 29" +
-                    "0C 00 00 8F D8 07 00 C1 0D 00 00 DB D9 07 00 0D" +
-                    "0F 00 00 21 DB 07 00 53 10 00 00 59 DC 07 00 8B" +
-                    "11 00 00 25 DE 07 00 57 13 00 00 AB DF 07 00 DD" +
-                    "14 00 00 5B E1 07 00 8D 16 00 00 91 E3 07 00 C3" +
-                    "18 00 00 03 E5 07 00 35 1A 00 00 29 E6 07 00 5B" +
-                    "1B 00 00 41 E7 07 00 73 1C 00 00 87 E8 07 00 B9" +
-                    "1D 00 00 F1 E9 07 00 23 1F 00 00 33 EB 07 00 5E" +
-                    "00 00 00 37 ED 07 00 62 02 00 00 13 EF 07 00 3E" +
-                    "04 00 00 15 F0 07 00 40 05 00 00 13 F1 07 00 3E" +
-                    "06 00 00 39 F2 07 00 64 07 00 00 41 F3 07 00 6C" +
-                    "08 00 00 25 F4 07 00 50 09 00 00 75 F5 07 00 A0" +
-                    "0A 00 00 83 F7 07 00 AE 0C 00 00 AF F9 07 00 DA" +
-                    "0E 00 00 E1 FB 07 00 0C 11 00 00 3B FE 07 00 66" +
-                    "13 00 00 8B FF 07 00 B6 14 00 00 21 01 08 00 4C" +
-                    "16 00 00 89 03 08 00 B4 18 00 00 7D 04 08 00 A8" +
-                    "19 00 00 0F 06 08 00 3A 1B 00 00 9F 07 08 00 CA" +
-                    "1C 00 00 F3 08 08 00 1E 1E 00 00 19 0A 08 00 44" +
-                    "1F 00 00 3D 0C 08 00 59 01 00 00 61 0D 08 00 7D" +
-                    "02 00 00 11 0F 08 00 2D 04 00 00 45 10 08 00 61" +
-                    "05 00 00 9F 11 08 00 BB 06 00 00 65 13 08 00 81" +
-                    "08 00 00 83 15 08 00 9F 0A 00 00 39 17 08 00 55" +
-                    "0C 00 00 0D 1A 08 00 29 0F 00 00 71 1C 08 00 8D" +
-                    "11 00 00 95 1D 08 00 B1 12 00 00 D9 1E 08 00 F5" +
-                    "13 00 00 35 20 08 00 51 15 00 00 99 21 08 00 B5" +
-                    "16 00 00 09 24 08 00 25 19 00 00 3F 25 08 00 5B" +
-                    "1A 00 00 57 26 08 00 73 1B 00 00 49 27 08 00 65" +
-                    "1C 00 00 69 28 08 00 85 1D 00 00 C3 29 08 00 DF" +
-                    "1E 00 00 9D 2B 08 00 D9 00 00 00 09 2D 08 00 45" +
-                    "02 00 00 29 2E 08 00 65 03 00 00 2F 31 08 00 6B" +
-                    "06 00 00 9D 32 08 00 D9 07 00 00 B1 33 08 00 ED" +
-                    "08 00 00 0D 36 08 00 49 0B 00 00 BB 37 08 00 F7" +
-                    "0C 00 00 19 3A 08 00 55 0F 00 00 79 3C 08 00 B5" +
-                    "11 00 00 E1 3D 08 00 1D 13 00 00 6F 3F 08 00 AB" +
-                    "14 00 00 5F 40 08 00 9B 15 00 00 8D 41 08 00 C9" +
-                    "16 00 00 FF 42 08 00 3B 18 00 00 07 44 08 00 43" +
-                    "19 00 00 27 46 08 00 63 1B 00 00 53 47 08 00 8F" +
-                    "1C 00 00 47 48 08 00 83 1D 00 00 53 49 08 00 8F" +
-                    "1E 00 00 61 4A 08 00 9D 1F 00 00 D7 4B 08 00 1E" +
-                    "01 00 00 57 4D 08 00 9E 02 00 00 CB 4E 08 00 12" +
-                    "04 00 00 7D 50 08 00 C4 05 00 00 A9 51 08 00 F0" +
-                    "06 00 00 41 53 08 00 88 08 00 00 ED 54 08 00 34" +
-                    "0A 00 00 17 57 08 00 5E 0C 00 00 91 58 08 00 D8" +
-                    "0D 00 00 B7 59 08 00 FE 0E 00 00 0F 5B 08 00 56" +
-                    "10 00 00 33 5C 08 00 7A 11 00 00 A7 5D 08 00 EE" +
-                    "12 00 00 25 5F 08 00 6C 14 00 00 D5 61 08 00 1C" +
-                    "17 00 00 EB 63 08 00 32 19 00 00 A5 65 08 00 EC" +
-                    "1A 00 00 E1 67 08 00 28 1D 00 00 9F 69 08 00 E6" +
-                    "1E 00 00 DD 6A 08 00 04 00 00 00 6F 6C 08 00 96" +
-                    "01 00 00 B7 6D 08 00 DE 02 00 00 6D 6F 08 00 94" +
-                    "04 00 00 ED 70 08 00 14 06 00 00 5B 72 08 00 82" +
-                    "07 00 00 09 74 08 00 30 09 00 00 43 75 08 00 6A" +
-                    "0A 00 00 77 76 08 00 9E 0B 00 00 7D 77 08 00 A4" +
-                    "0C 00 00 E3 78 08 00 0A 0E 00 00 87 7B 08 00 AE" +
-                    "10 00 00 DF 7C 08 00 06 12 00 00 DF 7D 08 00 06" +
-                    "13 00 00 3F 7F 08 00 66 14 00 00 71 80 08 00 98" +
-                    "15 00 00 8F 81 08 00 B6 16 00 00 EF 82 08 00 16" +
-                    "18 00 00 AB 84 08 00 D2 19 00 00 8D 86 08 00 B4" +
-                    "1B 00 00 B9 87 08 00 E0 1C 00 00 47 89 08 00 6E" +
-                    "1E 00 00 F7 8A 08 00 04 00 00 00 FB 8B 08 00 08" +
-                    "01 00 00 9B 8D 08 00 A8 02 00 00 DF 8E 08 00 EC" +
-                    "03 00 00 DB 8F 08 00 E8 04 00 00 BB 90 08 00 C8" +
-                    "05 00 00 F3 91 08 00 00 07 00 00 43 93 08 00 50" +
-                    "08 00 00 71 94 08 00 7E 09 00 00 5B 96 08 00 68" +
-                    "0B 00 00 A9 97 08 00 B6 0C 00 00 0F 99 08 00 1C" +
-                    "0E 00 00 C5 9A 08 00 D2 0F 00 00 11 9C 08 00 1E" +
-                    "11 00 00 D1 9C 08 00 DE 11 00 00 DD 9D 08 00 EA" +
-                    "12 00 00 73 9F 08 00 80 14 00 00 05 A1 08 00 12" +
-                    "16 00 00 1D A2 08 00 2A 17 00 00 EB A3 08 00 F8" +
-                    "18 00 00 33 A5 08 00 40 1A 00 00 F5 A6 08 00 02" +
-                    "1C 00 00 6B A8 08 00 78 1D 00 00 77 A9 08 00 84" +
-                    "1E 00 00 A5 AB 08 00 CE 00 00 00 99 AD 08 00 C2" +
-                    "02 00 00 ED AF 08 00 16 05 00 00 CB B1 08 00 F4" +
-                    "06 00 00 B9 B3 08 00 E2 08 00 00 4F B5 08 00 78" +
-                    "0A 00 00 67 B6 08 00 90 0B 00 00 DD B7 08 00 06" +
-                    "0D 00 00 67 B9 08 00 90 0E 00 00 C7 BA 08 00 F0" +
-                    "0F 00 00                                       ";
-
-
-    /**
-     * deep comparison of two SST records
-     */
-    public static void assertEquals(SSTRecord expected, SSTRecord actual){
-        assertEquals("number of strings", expected.getNumStrings(), actual.getNumStrings());
-        assertEquals("number of unique strings", expected.getNumUniqueStrings(), actual.getNumUniqueStrings());
-        assertEquals("count of strings", expected.countStrings(), actual.countStrings());
-        for ( int k = 0; k < expected.countStrings(); k++ ) {
-            UnicodeString us1 = expected.getString(k);
-            UnicodeString us2 = actual.getString(k);
-
-            assertTrue("String at idx=" + k, us1.equals(us2));
-        }
-    }
-
-    /**
-     *  ExtSSTRecord can be continued. Ensure we properly read the continue remainder.
-     */
-    public void test50967() {
-        byte[] bytes = HexRead.readFromString(data_50967);
-
-        RecordInputStream in = TestcaseRecordInputStream.create(bytes);
-        assertEquals(ExtSSTRecord.sid, in.getSid());
-        ExtSSTRecord src = new ExtSSTRecord(in);
-        assertEquals(12386, src.getDataSize());
-        ExtSSTRecord.InfoSubRecord[] sub1 = src.getInfoSubRecords();
-
-        byte[] serialized = src.serialize();
-
-        in = TestcaseRecordInputStream.create(serialized);
-        assertEquals(ExtSSTRecord.sid, in.getSid());
-        ExtSSTRecord dst = new ExtSSTRecord(in);
-        assertEquals(12386, dst.getDataSize());
-        ExtSSTRecord.InfoSubRecord[] sub2 = src.getInfoSubRecords();
-        assertEquals(sub1.length, sub2.length);
-
-        for(int i = 0; i < sub1.length; i++){
-            ExtSSTRecord.InfoSubRecord s1 = sub1[i];
-            ExtSSTRecord.InfoSubRecord s2 = sub2[i];
-
-            assertEquals(s1.getBucketSSTOffset(), s2.getBucketSSTOffset());
-            assertEquals(s1.getStreamPos(), s2.getStreamPos());
-
-        }
-    }
-
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
deleted file mode 100644
index 5ed16ad..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.TestCase;
-/**
- */
-public final class TestExtendedFormatRecord extends TestCase {
-
-	private static final byte[] data = new byte[] {
-			00, 00, // Font 0
-			00, 00, // Format 0
-			0xF5 - 256, 0xFF - 256, // Cell opts ...
-			0x20, 00, // Alignment 20
-			00, 00, // Ident 0
-			00, 00, // Border 0
-			00, 00, // Palette 0
-			00, 00, 00, 00, // ADTL Palette 0
-			0xC0 - 256, 0x20 // Fill Palette 20c0
-	};
-
-	private static ExtendedFormatRecord createEFR() {
-		return new ExtendedFormatRecord(TestcaseRecordInputStream.create(0x00E0, data));
-	}
-
-	public void testLoad() {
-		ExtendedFormatRecord record = createEFR();
-		assertEquals(0, record.getFontIndex());
-		assertEquals(0, record.getFormatIndex());
-		assertEquals(0xF5 - 256, record.getCellOptions());
-		assertEquals(0x20, record.getAlignmentOptions());
-		assertEquals(0, record.getIndentionOptions());
-		assertEquals(0, record.getBorderOptions());
-		assertEquals(0, record.getPaletteOptions());
-		assertEquals(0, record.getAdtlPaletteOptions());
-		assertEquals(0x20c0, record.getFillPaletteOptions());
-
-		assertEquals(20 + 4, record.getRecordSize());
-	}
-
-
-	public void testStore() {
-//    .fontindex       = 0
-//    .formatindex     = 0
-//    .celloptions     = fffffff5
-//          .islocked  = true
-//          .ishidden  = false
-//          .recordtype= 1
-//          .parentidx = fff
-//    .alignmentoptions= 20
-//          .alignment = 0
-//          .wraptext  = false
-//          .valignment= 2
-//          .justlast  = 0
-//          .rotation  = 0
-//    .indentionoptions= 0
-//          .indent    = 0
-//          .shrinktoft= false
-//          .mergecells= false
-//          .readngordr= 0
-//          .formatflag= false
-//          .fontflag  = false
-//          .prntalgnmt= false
-//          .borderflag= false
-//          .paternflag= false
-//          .celloption= false
-//    .borderoptns     = 0
-//          .lftln     = 0
-//          .rgtln     = 0
-//          .topln     = 0
-//          .btmln     = 0
-//    .paleteoptns     = 0
-//          .leftborder= 0
-//          .rghtborder= 0
-//          .diag      = 0
-//    .paleteoptn2     = 0
-//          .topborder = 0
-//          .botmborder= 0
-//          .adtldiag  = 0
-//          .diaglnstyl= 0
-//          .fillpattrn= 0
-//    .fillpaloptn     = 20c0
-//          .foreground= 40
-//          .background= 41
-
-		ExtendedFormatRecord record = new ExtendedFormatRecord();
-		record.setFontIndex((short) 0);
-		record.setFormatIndex((short) 0);
-
-		record.setLocked(true);
-		record.setHidden(false);
-		record.setXFType((short) 1);
-		record.setParentIndex((short) 0xfff);
-
-		record.setVerticalAlignment((short) 2);
-
-		record.setFillForeground((short) 0x40);
-		record.setFillBackground((short) 0x41);
-
-		byte[] recordBytes = record.serialize();
-		assertEquals(recordBytes.length - 4, data.length);
-		for (int i = 0; i < data.length; i++)
-			assertEquals("At offset " + i, data[i], recordBytes[i + 4]);
-	}
-
-	public void testCloneOnto() {
-		ExtendedFormatRecord base = createEFR();
-
-		ExtendedFormatRecord other = new ExtendedFormatRecord();
-		other.cloneStyleFrom(base);
-
-		byte[] recordBytes = other.serialize();
-		assertEquals(recordBytes.length - 4, data.length);
-		for (int i = 0; i < data.length; i++)
-			assertEquals("At offset " + i, data[i], recordBytes[i + 4]);
-	}
-	
-	public void testRotation() {
-        ExtendedFormatRecord record = createEFR();
-        assertEquals(0, record.getRotation());
-
-        record.setRotation((short)1);
-        assertEquals(1, record.getRotation());
-
-        record.setRotation((short)89);
-        assertEquals(89, record.getRotation());
-
-        record.setRotation((short)90);
-        assertEquals(90, record.getRotation());
-
-        // internally values below zero are stored differently
-        record.setRotation((short)-1);
-        assertEquals(255, record.getRotation());
-
-        record.setRotation((short)-89);
-        assertEquals(-77, 90-record.getRotation());
-
-        record.setRotation((short)-90);
-        assertEquals(-76, 90-record.getRotation());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
deleted file mode 100644
index 54042ba..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-/**
- *
- * @author Josh Micich
- */
-public final class TestExternalNameRecord extends TestCase {
-
-	private static final byte[] dataFDS = {
-		0, 0, 0, 0, 0, 0, 3, 0, 70, 68, 83, 0, 0,
-	};
-
-	// data taken from bugzilla 44774 att 21790
-	private static final byte[] dataAutoDocName = {
-		-22, 127, 0, 0, 0, 0, 29, 0, 39, 49, 57, 49, 50, 49, 57, 65, 87, 52, 32, 67, 111, 114,
-			112, 44, 91, 87, 79, 82, 75, 79, 85, 84, 95, 80, 88, 93, 39,
-	};
-
-	// data taken from bugzilla 44774 att 21790
-	private static final byte[] dataPlainName = {
-		0, 0, 0, 0, 0, 0, 9, 0, 82, 97, 116, 101, 95, 68, 97, 116, 101, 9, 0, 58, 0, 0, 0, 0, 4, 0, 8, 0
-		// TODO - the last 2 bytes of formula data (8,0) seem weird.  They encode to ConcatPtg, UnknownPtg
-		// UnknownPtg is otherwise not created by any other test cases
-	};
-
-	private static ExternalNameRecord createSimpleENR(byte[] data) {
-		return new ExternalNameRecord(TestcaseRecordInputStream.create(0x0023, data));
-	}
-	public void testBasicDeserializeReserialize() {
-
-		ExternalNameRecord enr = createSimpleENR(dataFDS);
-		assertEquals("FDS", enr.getText());
-
-		try {
-			TestcaseRecordInputStream.confirmRecordEncoding(0x0023, dataFDS, enr.serialize());
-		} catch (ArrayIndexOutOfBoundsException e) {
-			if(e.getMessage().equals("15")) {
-				throw new AssertionFailedError("Identified bug 44695");
-			}
-		}
-	}
-
-	public void testBasicSize() {
-		ExternalNameRecord enr = createSimpleENR(dataFDS);
-		if(enr.getRecordSize() == 13) {
-			throw new AssertionFailedError("Identified bug 44695");
-		}
-		assertEquals(17, enr.getRecordSize());
-		
-		assertNotNull(enr.serialize());		
-	}
-
-	public void testAutoStdDocName() {
-
-		ExternalNameRecord enr;
-		try {
-			enr = createSimpleENR(dataAutoDocName);
-		} catch (ArrayIndexOutOfBoundsException e) {
-			if(e.getMessage() == null) {
-				throw new AssertionFailedError("Identified bug XXXX");
-			}
-			throw e;
-		}
-		assertEquals("'191219AW4 Corp,[WORKOUT_PX]'", enr.getText());
-		assertTrue(enr.isAutomaticLink());
-		assertFalse(enr.isBuiltInName());
-		assertFalse(enr.isIconifiedPictureLink());
-		assertFalse(enr.isOLELink());
-		assertFalse(enr.isPicureLink());
-		assertTrue(enr.isStdDocumentNameIdentifier());
-
-		TestcaseRecordInputStream.confirmRecordEncoding(0x0023, dataAutoDocName, enr.serialize());
-	}
-
-	public void testPlainName() {
-
-		ExternalNameRecord enr = createSimpleENR(dataPlainName);
-		assertEquals("Rate_Date", enr.getText());
-		assertFalse(enr.isAutomaticLink());
-		assertFalse(enr.isBuiltInName());
-		assertFalse(enr.isIconifiedPictureLink());
-		assertFalse(enr.isOLELink());
-		assertFalse(enr.isPicureLink());
-		assertFalse(enr.isStdDocumentNameIdentifier());
-
-		TestcaseRecordInputStream.confirmRecordEncoding(0x0023, dataPlainName, enr.serialize());
-	}
-
-	public void testDDELink_bug47229() {
-		/**
-		 * Hex dump read directly from text of bugzilla 47229
-		 */
-		final byte[] dataDDE = HexRead.readFromString(
-				"E2 7F 00 00 00 00 " +
-				"37 00 " + // text len
-				// 010672AT0 MUNI,[RTG_MOODY_UNDERLYING,RTG_SP_UNDERLYING]
-				"30 31 30 36 37 32 41 54 30 20 4D 55 4E 49 2C " +
-				"5B 52 54 47 5F 4D 4F 4F 44 59 5F 55 4E 44 45 52 4C 59 49 4E 47 2C " +
-				"52 54 47 5F 53 50 5F 55 4E 44 45 52 4C 59 49 4E 47 5D " +
-				// constant array { { "#N/A N.A.", "#N/A N.A.", }, }
-				" 01 00 00 " +
-				"02 09 00 00 23 4E 2F 41 20 4E 2E 41 2E " +
-				"02 09 00 00 23 4E 2F 41 20 4E 2E 41 2E");
-		ExternalNameRecord enr;
-		try {
-			enr = createSimpleENR(dataDDE);
-		} catch (RecordFormatException e) {
-			// actual msg reported in bugzilla 47229 is different
-			// because that seems to be using a version from before svn r646666
-			if (e.getMessage().startsWith("Some unread data (is formula present?)")) {
-				throw new AssertionFailedError("Identified bug 47229 - failed to read ENR with OLE/DDE result data");
-			}
-			throw e;
-		}
-		assertEquals("010672AT0 MUNI,[RTG_MOODY_UNDERLYING,RTG_SP_UNDERLYING]", enr.getText());
-
-		TestcaseRecordInputStream.confirmRecordEncoding(0x0023, dataDDE, enr.serialize());
-	}
-
-	public void testUnicodeName_bug47384() {
-		// data taken from bugzilla 47384 att 23830 at offset 0x13A0
-		byte[] dataUN = HexRead.readFromString(
-				"23 00 22 00" +
-				"00 00 00 00 00 00 " +
-				"0C 01 " +
-				"59 01 61 00 7A 00 65 00 6E 00 ED 00 5F 00 42 00 69 00 6C 00 6C 00 61 00" +
-				"00 00");
-
-		RecordInputStream in = TestcaseRecordInputStream.create(dataUN);
-		ExternalNameRecord enr;
-		try {
-			enr = new ExternalNameRecord(in);
-		} catch (RecordFormatException e) {
-			if (e.getMessage().startsWith("Expected to find a ContinueRecord in order to read remaining 242 of 268 chars")) {
-				throw new AssertionFailedError("Identified bug 47384 - failed to read ENR with unicode name");
-			}
-			throw e;
-		}
-		assertEquals("\u0159azen\u00ED_Billa", enr.getText());
-        byte[] ser = enr.serialize();
-        assertEquals(HexDump.toHex(dataUN), HexDump.toHex(ser));
-	}
-
-    public void test48339() {
-        // data taken from bugzilla 48339
-        byte[] data = HexRead.readFromString(
-                "23 00 09 00" +
-                "F4, FF, 14, 2D, 61, 01, 01, 00, 27");
-
-        RecordInputStream in = TestcaseRecordInputStream.create(data);
-        ExternalNameRecord enr = new ExternalNameRecord(in);
-        byte[] ser = enr.serialize();
-        assertEquals(HexDump.toHex(data), HexDump.toHex(ser));
-    }
-    
-    public void testNPEWithFileFrom49219() {
-        // the file at test-data/spreadsheet/49219.xls has ExternalNameRecords without actual data, 
-    	// we did handle this during reading, but failed during serializing this out, ensure it works now
-        byte[] data = new byte[] {
-        		2, 127, 0, 0, 0, 0, 
-        		9, 0, 82, 97, 116, 101, 95, 68, 97, 116, 101};
-
-		ExternalNameRecord enr = createSimpleENR(data);
-
-        byte[] ser = enr.serialize();
-        assertEquals("[23, 00, 11, 00, 02, 7F, 00, 00, 00, 00, 09, 00, 52, 61, 74, 65, 5F, 44, 61, 74, 65]", 
-        		HexDump.toHex(ser));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
deleted file mode 100644
index dc88400..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.common.FeatFormulaErr2;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFTestHelper;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import junit.framework.TestCase;
-/**
- * Tests for <tt>FeatRecord</tt>
- * 
- * @author Josh Micich
- */
-public final class TestFeatRecord extends TestCase {
-	public void testWithoutFeatRecord() throws Exception {
-		HSSFWorkbook hssf = 
-			HSSFTestDataSamples.openSampleWorkbook("46136-WithWarnings.xls");
-		InternalWorkbook wb = HSSFTestHelper.getWorkbookForTest(hssf);
-		
-		assertEquals(1, hssf.getNumberOfSheets());
-		
-		int countFR = 0;
-		int countFRH = 0;
-		
-		// Check on the workbook, but shouldn't be there!
-		for(Record r : wb.getRecords()) {
-			if(r instanceof FeatRecord) {
-				countFR++;
-			} else if (r.getSid() == FeatRecord.sid) {
-				countFR++;
-			}
-			if(r instanceof FeatHdrRecord) {
-				countFRH++;
-			} else if (r.getSid() == FeatHdrRecord.sid) {
-				countFRH++;
-			}
-		}
-		
-		assertEquals(0, countFR);
-		assertEquals(0, countFRH);
-		
-		// Now check on the sheet
-		HSSFSheet s = hssf.getSheetAt(0);
-		InternalSheet sheet = HSSFTestHelper.getSheetForTest(s);
-		
-		for(RecordBase rb : sheet.getRecords()) {
-			if(rb instanceof Record) {
-				Record r = (Record)rb;
-				if(r instanceof FeatRecord) {
-					countFR++;
-				} else if (r.getSid() == FeatRecord.sid) {
-					countFR++;
-				}
-				if(r instanceof FeatHdrRecord) {
-					countFRH++;
-				} else if (r.getSid() == FeatHdrRecord.sid) {
-					countFRH++;
-				}
-			}
-		}
-		
-		assertEquals(0, countFR);
-		assertEquals(0, countFRH);
-	}
-
-	public void testReadFeatRecord() throws Exception {
-		HSSFWorkbook hssf = 
-			HSSFTestDataSamples.openSampleWorkbook("46136-NoWarnings.xls");
-		InternalWorkbook wb = HSSFTestHelper.getWorkbookForTest(hssf);
-		
-		FeatRecord fr = null;
-		FeatHdrRecord fhr = null;
-		
-		assertEquals(1, hssf.getNumberOfSheets());
-		
-		// First check it isn't on the Workbook
-		int countFR = 0;
-		int countFRH = 0;
-		for(Record r : wb.getRecords()) {
-			if(r instanceof FeatRecord) {
-				fr = (FeatRecord)r;
-				countFR++;
-			} else if (r.getSid() == FeatRecord.sid) {
-				fail("FeatRecord SID found but not created correctly!");
-			}
-			if(r instanceof FeatHdrRecord) {
-				countFRH++;
-			} else if (r.getSid() == FeatHdrRecord.sid) {
-				fail("FeatHdrRecord SID found but not created correctly!");
-			}
-		}
-		
-		assertEquals(0, countFR);
-		assertEquals(0, countFRH);
-		
-		// Now find it on our sheet
-		HSSFSheet s = hssf.getSheetAt(0);
-		InternalSheet sheet = HSSFTestHelper.getSheetForTest(s);
-		
-		for(RecordBase rb : sheet.getRecords()) {
-			if(rb instanceof Record) {
-				Record r = (Record)rb;
-				if(r instanceof FeatRecord) {
-					fr = (FeatRecord)r;
-					countFR++;
-				} else if (r.getSid() == FeatRecord.sid) {
-					countFR++;
-				}
-				if(r instanceof FeatHdrRecord) {
-					fhr = (FeatHdrRecord)r;
-					countFRH++;
-				} else if (r.getSid() == FeatHdrRecord.sid) {
-					countFRH++;
-				}
-			}
-		}
-		
-		assertEquals(1, countFR);
-		assertEquals(1, countFRH);
-		assertNotNull(fr);
-		assertNotNull(fhr);
-		
-		// Now check the contents are as expected
-		assertEquals(
-				FeatHdrRecord.SHAREDFEATURES_ISFFEC2,
-				fr.getIsf_sharedFeatureType()
-		);
-		
-		// Applies to one cell only
-		assertEquals(1, fr.getCellRefs().length);
-		assertEquals(0, fr.getCellRefs()[0].getFirstRow());
-		assertEquals(0, fr.getCellRefs()[0].getLastRow());
-		assertEquals(0, fr.getCellRefs()[0].getFirstColumn());
-		assertEquals(0, fr.getCellRefs()[0].getLastColumn());
-		
-		// More checking of shared features stuff
-		assertEquals(4, fr.getCbFeatData());
-		assertEquals(4, fr.getSharedFeature().getDataSize());
-		assertEquals(FeatFormulaErr2.class, fr.getSharedFeature().getClass());
-		
-		FeatFormulaErr2 fferr2 = (FeatFormulaErr2)fr.getSharedFeature();
-		assertEquals(0x04, fferr2._getRawErrorCheckValue());
-		
-		assertFalse(fferr2.getCheckCalculationErrors());
-		assertFalse(fferr2.getCheckDateTimeFormats());
-		assertFalse(fferr2.getCheckEmptyCellRef());
-		assertFalse(fferr2.getCheckInconsistentFormulas());
-		assertFalse(fferr2.getCheckInconsistentRanges());
-		assertTrue(fferr2.getCheckNumbersAsText());
-		assertFalse(fferr2.getCheckUnprotectedFormulas());
-		assertFalse(fferr2.getPerformDataValidation());
-	}
-
-    /**
-     *  cloning sheets with feat records 
-     */
-    public void testCloneSheetWithFeatRecord() throws Exception {
-        HSSFWorkbook wb =
-            HSSFTestDataSamples.openSampleWorkbook("46136-WithWarnings.xls");
-        wb.cloneSheet(0);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
deleted file mode 100644
index 7791df3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the serialization and deserialization of the {@link FontRecord}
- * class works correctly.  Test data taken directly from a real Excel file.
- */
-public final class TestFontRecord extends TestCase {
-
-    private static final int SID = 0x31;
-    private static final byte[] data = {
-            0xC8-256, 00,       // font height = xc8
-            00, 00,             // attrs = 0
-            0xFF-256, 0x7F,     // colour palette = x7fff
-            0x90-256, 0x01,     // bold weight = x190
-            00, 00,  // supersubscript
-            00, 00,  // underline, family
-            00, 00,  // charset, padding
-            05, 00,  // name length, unicode flag
-            0x41, 0x72, 0x69, 0x61, 0x6C, // Arial, as unicode
-
-    };
-
-    public void testLoad() {
-
-        FontRecord record = new FontRecord(TestcaseRecordInputStream.create(0x31, data));
-        assertEquals(0xc8, record.getFontHeight());
-        assertEquals(0x00, record.getAttributes());
-        assertFalse(record.isItalic());
-        assertFalse(record.isStruckout());
-        assertFalse(record.isMacoutlined());
-        assertFalse(record.isMacshadowed());
-        assertEquals(0x7fff, record.getColorPaletteIndex());
-        assertEquals(0x190, record.getBoldWeight());
-        assertEquals(0x00, record.getSuperSubScript());
-        assertEquals(0x00, record.getUnderline());
-        assertEquals(0x00, record.getFamily());
-        assertEquals(0x00, record.getCharset());
-        assertEquals("Arial", record.getFontName());
-
-        assertEquals(21 + 4, record.getRecordSize());
-    }
-
-    public void testStore() {
-//      .fontheight      = c8
-//      .attributes      = 0
-//           .italic     = false
-//           .strikout   = false
-//           .macoutlined= false
-//           .macshadowed= false
-//      .colorpalette    = 7fff
-//      .boldweight      = 190
-//      .supersubscript  = 0
-//      .underline       = 0
-//      .family          = 0
-//      .charset         = 0
-//      .namelength      = 5
-//      .fontname        = Arial
-
-        FontRecord record = new FontRecord();
-        record.setFontHeight((short)0xc8);
-        record.setAttributes((short)0);
-        record.setColorPaletteIndex((short)0x7fff);
-        record.setBoldWeight((short)0x190);
-        record.setSuperSubScript((short)0);
-        record.setUnderline((byte)0);
-        record.setFamily((byte)0);
-        record.setCharset((byte)0);
-        record.setFontName("Arial");
-
-        byte [] recordBytes = record.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(0x31, data, recordBytes);
-    }
-
-    public void testCloneOnto() {
-        FontRecord base = new FontRecord(TestcaseRecordInputStream.create(0x31, data));
-
-        FontRecord other = new FontRecord();
-        other.cloneStyleFrom(base);
-
-        byte [] recordBytes = other.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-
-    public void testSameProperties() {
-        FontRecord f1 = new FontRecord(TestcaseRecordInputStream.create(0x31, data));
-        FontRecord f2 = new FontRecord(TestcaseRecordInputStream.create(0x31, data));
-
-        assertTrue(f1.sameProperties(f2));
-
-        f2.setFontName("Arial2");
-        assertFalse(f1.sameProperties(f2));
-        f2.setFontName("Arial");
-        assertTrue(f1.sameProperties(f2));
-
-        f2.setFontHeight((short)11);
-        assertFalse(f1.sameProperties(f2));
-        f2.setFontHeight((short)0xc8);
-        assertTrue(f1.sameProperties(f2));
-    }
-
-    /**
-     * Bugzilla 47250 suggests that the unicode options byte should be present even when the name
-     * length is zero.  The OOO documentation seems to agree with this and POI had no test data
-     * samples to say otherwise.
-     */
-    public void testEmptyName_bug47250() {
-        byte[] emptyNameData = HexRead.readFromString(
-                "C8 00 00 00 FF 7F 90 01 00 00 00 00 00 00 "
-                + "00" // zero length
-                + "00" // unicode options byte
-                );
-
-        RecordInputStream in = TestcaseRecordInputStream.create(SID, emptyNameData);
-        FontRecord fr = new FontRecord(in);
-        if (in.available() == 1) {
-            throw new AssertionFailedError("Identified bug 47250");
-        }
-        assertEquals(0, in.available());
-
-        assertEquals(0, fr.getFontName().length());
-        byte[] recordBytes = fr.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(SID, emptyNameData, recordBytes);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
deleted file mode 100644
index 2f6a14b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaError;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link FormulaRecord}
- *
- * @author Andrew C. Oliver
- */
-public final class TestFormulaRecord extends TestCase {
-
-	public void testCreateFormulaRecord () {
-		FormulaRecord record = new FormulaRecord();
-		record.setColumn((short)0);
-		record.setRow(1);
-		record.setXFIndex((short)4);
-
-		assertEquals(record.getColumn(),0);
-		assertEquals(record.getRow(), 1);
-		assertEquals(record.getXFIndex(),4);
-	}
-
-	/**
-	 * Make sure a NAN value is preserved
-	 * This formula record is a representation of =1/0 at row 0, column 0
-	 */
-	public void testCheckNanPreserve() {
-		byte[] formulaByte = {
-			0, 0, 0, 0,
-			0x0F, 0x00,
-
-			// 8 bytes cached number is a 'special value' in this case
-			0x02, // special cached value type 'error'
-			0x00,
-			FormulaError.DIV0.getCode(),
-			0x00,
-			0x00,
-			0x00,
-			(byte)0xFF,
-			(byte)0xFF,
-
-			0x00,
-			0x00,
-			0x00,
-			0x00,
-
-			(byte)0xE0, //18
-			(byte)0xFC,
-			// Ptgs
-			0x07, 0x00, // encoded length
-			0x1E, 0x01, 0x00, // IntPtg(1)
-			0x1E, 0x00,	0x00, // IntPtg(0)
-			0x06, // DividePtg
-
-		};
-
-		FormulaRecord record = new FormulaRecord(TestcaseRecordInputStream.create(FormulaRecord.sid, formulaByte));
-		assertEquals("Row", 0, record.getRow());
-		assertEquals("Column", 0, record.getColumn());
-		assertEquals(CellType.ERROR.getCode(), record.getCachedResultType());
-
-		byte[] output = record.serialize();
-		assertEquals("Output size", 33, output.length); //includes sid+recordlength
-
-		for (int i = 5; i < 13;i++) {
-			assertEquals("FormulaByte NaN doesn't match", formulaByte[i], output[i+4]);
-		}
-	}
-
-	/**
-	 * Tests to see if the shared formula cells properly reserialize the expPtg
-	 *
-	 */
-	public void testExpFormula() {
-		byte[] formulaByte = new byte[27];
-
-		formulaByte[4] =(byte)0x0F;
-		formulaByte[14]=(byte)0x08;
-		formulaByte[18]=(byte)0xE0;
-		formulaByte[19]=(byte)0xFD;
-		formulaByte[20]=(byte)0x05;
-		formulaByte[22]=(byte)0x01;
-		FormulaRecord record = new FormulaRecord(TestcaseRecordInputStream.create(FormulaRecord.sid, formulaByte));
-		assertEquals("Row", 0, record.getRow());
-		assertEquals("Column", 0, record.getColumn());
-		byte[] output = record.serialize();
-		assertEquals("Output size", 31, output.length); //includes sid+recordlength
-		assertEquals("Offset 22", 1, output[26]);
-	}
-
-	public void testWithConcat() {
-		// =CHOOSE(2,A2,A3,A4)
-		byte[] data = {
-				1, 0, 1, 0, 15, 0, 0, 0, 0, 0, 0, 0, 57,
-				64, 0, 0, 12, 0, 12, -4, 46, 0,
-				30, 2, 0,	// Int - 2
-				25, 4, 3, 0, // Attr
-					8, 0, 17, 0, 26, 0, // jumpTable
-					35, 0, // chooseOffset
-				36, 1, 0, 0, -64, // Ref - A2
-				25, 8, 21, 0, // Attr
-				36, 2, 0, 0, -64, // Ref - A3
-				25,	8, 12, 0, // Attr
-				36, 3, 0, 0, -64, // Ref - A4
-				25, 8, 3, 0,  // Attr
-				66, 4, 100, 0 // CHOOSE
-		};
-		RecordInputStream inp = TestcaseRecordInputStream.create(FormatRecord.sid, data);
-
-		FormulaRecord fr = new FormulaRecord(inp);
-
-		Ptg[] ptgs = fr.getParsedExpression();
-		assertEquals(9, ptgs.length);
-		assertEquals(IntPtg.class,	   ptgs[0].getClass());
-		assertEquals(AttrPtg.class,	  ptgs[1].getClass());
-		assertEquals(RefPtg.class, ptgs[2].getClass());
-		assertEquals(AttrPtg.class,	  ptgs[3].getClass());
-		assertEquals(RefPtg.class, ptgs[4].getClass());
-		assertEquals(AttrPtg.class,	  ptgs[5].getClass());
-		assertEquals(RefPtg.class, ptgs[6].getClass());
-		assertEquals(AttrPtg.class,	  ptgs[7].getClass());
-		assertEquals(FuncVarPtg.class,   ptgs[8].getClass());
-
-		FuncVarPtg choose = (FuncVarPtg)ptgs[8];
-		assertEquals("CHOOSE", choose.getName());
-	}
-	
-	public void testReserialize() {
-		FormulaRecord formulaRecord = new FormulaRecord();
-		formulaRecord.setRow(1);
-		formulaRecord.setColumn((short) 1);
-		formulaRecord.setParsedExpression(new Ptg[] { new RefPtg("B$5"), });
-		formulaRecord.setValue(3.3);
-		byte[] ser = formulaRecord.serialize();
-		assertEquals(31, ser.length);
-
-		RecordInputStream in = TestcaseRecordInputStream.create(ser);
-		FormulaRecord fr2 = new FormulaRecord(in);
-		assertEquals(3.3, fr2.getValue(), 0.0);
-		Ptg[] ptgs = fr2.getParsedExpression();
-		assertEquals(1, ptgs.length);
-		RefPtg rp = (RefPtg) ptgs[0];
-		assertEquals("B$5", rp.toFormulaString());
-	}
-	
-	/**
-	 * Bug noticed while fixing 46479.  Operands of conditional operator ( ? : ) were swapped
-	 * inside {@link FormulaRecord}
-	 */
-	public void testCachedValue_bug46479() {
-		FormulaRecord fr0 = new FormulaRecord();
-		FormulaRecord fr1 = new FormulaRecord();
-		// test some other cached value types 
-		fr0.setValue(3.5);
-		assertEquals(3.5, fr0.getValue(), 0.0);
-		fr0.setCachedResultErrorCode(FormulaError.REF.getCode());
-		assertEquals(FormulaError.REF.getCode(), fr0.getCachedErrorValue());
-
-		fr0.setCachedResultBoolean(false);
-		fr1.setCachedResultBoolean(true);
-		if (fr0.getCachedBooleanValue() == true && fr1.getCachedBooleanValue() == false) {
-			throw new AssertionFailedError("Identified bug 46479c");
-		}
-		assertEquals(false, fr0.getCachedBooleanValue());
-		assertEquals(true, fr1.getCachedBooleanValue());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
deleted file mode 100644
index 3823072..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the FtCblsSubRecord
- * class works correctly.
- *
- * @author Yegor Kozlov
- */
-public final class TestFtCblsSubRecord extends TestCase {
-    private final byte[] data = new byte[] {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00,
-        0x01, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00
-    };
-
-    public void testRead() {
-
-        FtCblsSubRecord record = new FtCblsSubRecord(TestcaseRecordInputStream.create(FtCblsSubRecord.sid, data), data.length);
-
-        assertEquals(FtCblsSubRecord.sid, record.getSid());
-        assertEquals(data.length, record.getDataSize());
-    }
-
-    public void testWrite() {
-        FtCblsSubRecord record = new FtCblsSubRecord();
-        assertEquals(FtCblsSubRecord.sid, record.getSid());
-        assertEquals(data.length, record.getDataSize());
-
-        byte [] ser = record.serialize();
-        assertEquals(ser.length - 4, data.length);
-
-    }
-
-    public void testClone()
-    {
-        FtCblsSubRecord record = new FtCblsSubRecord();
-        byte[] src = record.serialize();
-
-        FtCblsSubRecord cloned = record.clone();
-        byte[] cln = cloned.serialize();
-
-        assertEquals(record.getDataSize(), cloned.getDataSize());
-        assertArrayEquals(src, cln);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
deleted file mode 100644
index 953266b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.hssf.record.HyperlinkRecord.GUID;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.junit.Test;
-
-/**
- * Test HyperlinkRecord
- *
- * @author Nick Burch
- * @author Yegor Kozlov
- */
-public final class TestHyperlinkRecord {
-
-    //link to http://www.lakings.com/
-    private static final byte[] data1 = { 0x02, 0x00,    //First row of the hyperlink
-                     0x02, 0x00,    //Last row of the hyperlink
-                     0x00, 0x00,    //First column of the hyperlink
-                     0x00, 0x00,    //Last column of the hyperlink
-
-                     //16-byte GUID. Seems to be always the same. Does not depend on the hyperlink type
-                     (byte)0xD0, (byte)0xC9, (byte)0xEA, 0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE, 0x11,
-                     (byte)0x8C, (byte)0x82, 0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B,
-
-                    0x02, 0x00, 0x00, 0x00, //integer, always 2
-
-                    // flags. Define the type of the hyperlink:
-                    // HyperlinkRecord.HLINK_URL | HyperlinkRecord.HLINK_ABS | HyperlinkRecord.HLINK_LABEL
-                    0x17, 0x00, 0x00, 0x00,
-
-                    0x08, 0x00, 0x00, 0x00, //length of the label including the trailing '\0'
-
-                    //label:
-                    0x4D, 0x00, 0x79, 0x00, 0x20, 0x00, 0x4C, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x6B, 0x00, 0x00, 0x00,
-
-                    //16-byte link moniker: HyperlinkRecord.URL_MONIKER
-                    (byte)0xE0, (byte)0xC9, (byte)0xEA, 0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE,  0x11,
-                    (byte)0x8C, (byte)0x82, 0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B,
-
-                    //count of bytes in the address including the tail
-                    0x48, 0x00, 0x00, 0x00, //integer
-
-                    //the actual link, terminated by '\u0000'
-                    0x68, 0x00, 0x74, 0x00, 0x74, 0x00, 0x70, 0x00, 0x3A, 0x00, 0x2F, 0x00,
-                    0x2F, 0x00, 0x77, 0x00, 0x77, 0x00, 0x77, 0x00, 0x2E, 0x00, 0x6C, 0x00,
-                    0x61, 0x00, 0x6B, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x67, 0x00, 0x73, 0x00,
-                    0x2E, 0x00, 0x63, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x2F, 0x00, 0x00, 0x00,
-
-                    //standard 24-byte tail of a URL link. Seems to always be the same for all URL HLINKs
-                    0x79, 0x58, (byte)0x81, (byte)0xF4, 0x3B, 0x1D, 0x7F, 0x48, (byte)0xAF, 0x2C,
-                    (byte)0x82, 0x5D, (byte)0xC4, (byte)0x85, 0x27, 0x63, 0x00, 0x00, 0x00,
-                    0x00, (byte)0xA5, (byte)0xAB, 0x00, 0x00};
-
-    //link to a file in the current directory: link1.xls
-    private static final byte[] data2 =  {0x00, 0x00,
-                     0x00, 0x00,
-                     0x00, 0x00,
-                     0x00, 0x00,
-                     //16-bit GUID. Seems to be always the same. Does not depend on the hyperlink type
-                     (byte)0xD0, (byte)0xC9, (byte)0xEA, 0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE, 0x11,
-                     (byte)0x8C, (byte)0x82, 0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B,
-
-                     0x02, 0x00, 0x00, 0x00,    //integer, always 2
-
-                     0x15, 0x00, 0x00, 0x00,    //options: HyperlinkRecord.HLINK_URL | HyperlinkRecord.HLINK_LABEL
-
-                     0x05, 0x00, 0x00, 0x00,    //length of the label
-                     //label
-                     0x66, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x00, 0x00,
-
-                     //16-byte link moniker: HyperlinkRecord.FILE_MONIKER
-                     0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte)0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
-
-                     0x00, 0x00,    //level
-                     0x0A, 0x00, 0x00, 0x00,    //length of the path )
-
-                     //path to the file (plain ISO-8859 bytes, NOT UTF-16LE!)
-                     0x6C, 0x69, 0x6E, 0x6B, 0x31, 0x2E, 0x78, 0x6C, 0x73, 0x00,
-
-                     //standard 24-byte tail of a file link
-                     (byte)0xFF, (byte)0xFF, (byte)0xAD, (byte)0xDE, 0x00, 0x00, 0x00, 0x00,
-                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                     0x00, 0x00, 0x00, 0x00,
-
-                     0x00, 0x00, 0x00, 0x00, // length of address link field
-                     };
-
-    // mailto:ebgans@mail.ru?subject=Hello,%20Ebgans!
-    private static final byte[] data3 = {0x01, 0x00,
-                    0x01, 0x00,
-                    0x00, 0x00,
-                    0x00, 0x00,
-
-                    //16-bit GUID. Seems to be always the same. Does not depend on the hyperlink type
-                    (byte)0xD0, (byte)0xC9, (byte)0xEA, 0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE, 0x11,
-                    (byte)0x8C, (byte)0x82, 0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B,
-
-                    0x02, 0x00, 0x00, 0x00, //integer, always 2
-
-                    0x17, 0x00, 0x00, 0x00,  //options: HyperlinkRecord.HLINK_URL | HyperlinkRecord.HLINK_ABS | HyperlinkRecord.HLINK_LABEL
-
-                    0x06, 0x00, 0x00, 0x00,     //length of the label
-                    0x65, 0x00, 0x6D, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x00, 0x00, //label
-
-                    //16-byte link moniker: HyperlinkRecord.URL_MONIKER
-                    (byte)0xE0, (byte)0xC9, (byte)0xEA, 0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE, 0x11,
-                    (byte)0x8C, (byte)0x82, 0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B,
-
-                    //length of the address including the tail.
-                    0x76, 0x00, 0x00, 0x00,
-
-                    //the address is terminated by '\u0000'
-                    0x6D, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x74, 0x00, 0x6F, 0x00,
-                    0x3A, 0x00, 0x65, 0x00, 0x62, 0x00, 0x67, 0x00, 0x61, 0x00, 0x6E, 0x00,
-                    0x73, 0x00, 0x40, 0x00, 0x6D, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6C, 0x00,
-                    0x2E, 0x00, 0x72, 0x00, 0x75, 0x00, 0x3F, 0x00, 0x73, 0x00, 0x75, 0x00,
-                    0x62, 0x00, 0x6A, 0x00, 0x65, 0x00, 0x63, 0x00, 0x74, 0x00, 0x3D, 0x00,
-                    0x48, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x2C, 0x00,
-                    0x25, 0x00, 0x32, 0x00, 0x30, 0x00, 0x45, 0x00, 0x62, 0x00, 0x67, 0x00,
-                    0x61, 0x00, 0x6E, 0x00, 0x73, 0x00, 0x21, 0x00, 0x00, 0x00,
-
-                    //standard 24-byte tail of a URL link
-                    0x79, 0x58, (byte)0x81, (byte)0xF4, 0x3B, 0x1D, 0x7F, 0x48, (byte)0xAF, (byte)0x2C,
-                    (byte)0x82, 0x5D, (byte)0xC4, (byte)0x85, 0x27, 0x63, 0x00, 0x00, 0x00,
-                    0x00, (byte)0xA5, (byte)0xAB, 0x00, 0x00
-    };
-
-    //link to a place in worksheet: Sheet1!A1
-    private static final byte[] data4 = {0x03, 0x00,
-                    0x03, 0x00,
-                    0x00, 0x00,
-                    0x00, 0x00,
-
-                    //16-bit GUID. Seems to be always the same. Does not depend on the hyperlink type
-                    (byte)0xD0, (byte)0xC9, (byte)0xEA, 0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE, 0x11,
-                    (byte)0x8C, (byte)0x82, 0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B,
-
-                    0x02, 0x00, 0x00, 0x00, //integer, always 2
-
-                    0x1C, 0x00, 0x00, 0x00, //flags: HyperlinkRecord.HLINK_LABEL | HyperlinkRecord.HLINK_PLACE
-
-                    0x06, 0x00, 0x00, 0x00, //length of the label
-
-                    0x70, 0x00, 0x6C, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, 0x00, 0x00, 0x00, //label
-
-                    0x0A, 0x00, 0x00, 0x00, //length of the document link including trailing zero
-
-                    //link: Sheet1!A1
-                    0x53, 0x00, 0x68, 0x00, 0x65, 0x00, 0x65, 0x00, 0x74, 0x00, 0x31, 0x00, 0x21,
-                    0x00, 0x41, 0x00, 0x31, 0x00, 0x00, 0x00};
-
-	private static final byte[] dataLinkToWorkbook = HexRead.readFromString("01 00 01 00 01 00 01 00 " +
-			"D0 C9 EA 79 F9 BA CE 11 8C 82 00 AA 00 4B A9 0B " +
-			"02 00 00 00 " +
-			"1D 00 00 00 " + // options: LABEL | PLACE | FILE_OR_URL
-			// label: "My Label"
-			"09 00 00 00 " +
-			"4D 00 79 00 20 00 4C 00 61 00 62 00 65 00 6C 00 00 00 " +
-			"03 03 00 00 00 00 00 00 C0 00 00 00 00 00 00 46 " + // file GUID
-			"00 00 " + // file options
-			// shortFileName: "YEARFR~1.XLS"
-			"0D 00 00 00 " +
-			"59 45 41 52 46 52 7E 31 2E 58 4C 53 00 " +
-			// FILE_TAIL - unknown byte sequence
-			"FF FF AD DE 00 00 00 00 " +
-			"00 00 00 00 00 00 00 00 " +
-			"00 00 00 00 00 00 00 00 " +
-			// field len, char data len
-			"2E 00 00 00 " +
-			"28 00 00 00 " +
-			"03 00 " + // unknown ushort
-			// _address: "yearfracExamples.xls"
-			"79 00 65 00 61 00 72 00 66 00 72 00 61 00 63 00 " +
-			"45 00 78 00 61 00 6D 00 70 00 6C 00 65 00 73 00 " +
-			"2E 00 78 00 6C 00 73 00 " +
-			// textMark: "Sheet1!B6"
-			"0A 00 00 00 " +
-			"53 00 68 00 65 00 65 00 74 00 31 00 21 00 42 00 " +
-			"36 00 00 00");
-
-	private static final byte[] dataTargetFrame = HexRead.readFromString("0E 00 0E 00 00 00 00 00 " +
-			"D0 C9 EA 79 F9 BA CE 11  8C 82 00 AA 00 4B A9 0B " +
-			"02 00 00 00 " +
-			"83 00 00 00 " + // options: TARGET_FRAME | ABS | FILE_OR_URL
-			// targetFrame: "_blank"
-			"07 00 00 00 " +
-			"5F 00 62 00 6C 00 61 00 6E 00 6B 00 00 00 " +
-			// url GUID
-			"E0 C9 EA 79 F9 BA CE 11 8C 82 00 AA 00 4B A9 0B " +
-			// address: "http://www.regnow.com/softsell/nph-softsell.cgi?currency=USD&item=7924-37"
-			"94 00 00 00 " +
-			"68 00 74 00 74 00 70 00 3A 00 2F 00 2F 00 77 00 " +
-			"77 00 77 00 2E 00 72 00 65 00 67 00 6E 00 6F 00 " +
-			"77 00 2E 00 63 00 6F 00 6D 00 2F 00 73 00 6F 00 " +
-			"66 00 74 00 73 00 65 00 6C 00 6C 00 2F 00 6E 00 " +
-			"70 00 68 00 2D 00 73 00 6F 00 66 00 74 00 73 00 " +
-			"65 00 6C 00 6C 00 2E 00 63 00 67 00 69 00 3F 00 " +
-			"63 00 75 00 72 00 72 00 65 00 6E 00 63 00 79 00 " +
-			"3D 00 55 00 53 00 44 00 26 00 69 00 74 00 65 00 " +
-			"6D 00 3D 00 37 00 39 00 32 00 34 00 2D 00 33 00 " +
-			"37 00 00 00");
-
-
-	private static final byte[] dataUNC = HexRead.readFromString("01 00 01 00 01 00 01 00 " +
-			"D0 C9 EA 79 F9 BA CE 11 8C 82 00 AA 00 4B A9 0B " +
-			"02 00 00 00 " +
-			"1F 01 00 00 " + // options: UNC_PATH | LABEL | TEXT_MARK | ABS | FILE_OR_URL
-			"09 00 00 00 " + // label: "My Label"
-			"4D 00 79 00 20 00 6C 00 61 00 62 00 65 00 6C 00 00 00 " +
-			// note - no moniker GUID
-			"27 00 00 00 " +  // "\\\\MyServer\\my-share\\myDir\\PRODNAME.xls"
-			"5C 00 5C 00 4D 00 79 00 53 00 65 00 72 00 76 00 " +
-			"65 00 72 00 5C 00 6D 00 79 00 2D 00 73 00 68 00 " +
-			"61 00 72 00 65 00 5C 00 6D 00 79 00 44 00 69 00 " +
-			"72 00 5C 00 50 00 52 00 4F 00 44 00 4E 00 41 00 " +
-			"4D 00 45 00 2E 00 78 00 6C 00 73 00 00 00 " +
-
-			"0C 00 00 00 " + // textMark: PRODNAME!C2
-			"50 00 52 00 4F 00 44 00 4E 00 41 00 4D 00 45 00 21 00 " +
-			"43 00 32 00 00 00");
-
-
-    /**
-     * From Bugzilla 47498
-     */
-    private static byte[] data_47498 = {
-            0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, (byte)0xD0, (byte)0xC9,
-            (byte)0xEA, 0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE, 0x11, (byte)0x8C,
-            (byte)0x82, 0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B, 0x02, 0x00,
-            0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x50, 0x00,
-            0x44, 0x00, 0x46, 0x00, 0x00, 0x00, (byte)0xE0, (byte)0xC9, (byte)0xEA,
-            0x79, (byte)0xF9, (byte)0xBA, (byte)0xCE, (byte)0x11, (byte)0x8C, (byte)0x82,
-            0x00, (byte)0xAA, 0x00, 0x4B, (byte)0xA9, 0x0B, 0x28, 0x00, 0x00, 0x00,
-            0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x66, 0x00, 0x6F, 0x00,
-            0x6C, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2F, 0x00, 0x74, 0x00,
-            0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x2E, 0x00, 0x50, 0x00, 0x44, 0x00,
-            0x46, 0x00, 0x00, 0x00};
-
-
-    private void confirmGUID(GUID expectedGuid, GUID actualGuid) {
-		assertEquals(expectedGuid, actualGuid);
-	}
-    
-    @Test
-    public void testReadURLLink(){
-        RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, data1);
-        HyperlinkRecord link = new HyperlinkRecord(is);
-        assertEquals(2, link.getFirstRow());
-        assertEquals(2, link.getLastRow());
-        assertEquals(0, link.getFirstColumn());
-        assertEquals(0, link.getLastColumn());
-        confirmGUID(HyperlinkRecord.STD_MONIKER, link.getGuid());
-        confirmGUID(HyperlinkRecord.URL_MONIKER, link.getMoniker());
-        assertEquals(2, link.getLabelOptions());
-        int opts = HyperlinkRecord.HLINK_URL | HyperlinkRecord.HLINK_ABS | HyperlinkRecord.HLINK_LABEL;
-        assertEquals(0x17, opts);
-        assertEquals(opts, link.getLinkOptions());
-        assertEquals(0, link.getFileOptions());
-
-        assertEquals("My Link", link.getLabel());
-        assertEquals("http://www.lakings.com/", link.getAddress());
-    }
-
-    @Test
-    public void testReadFileLink(){
-        RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, data2);
-        HyperlinkRecord link = new HyperlinkRecord(is);
-        assertEquals(0, link.getFirstRow());
-        assertEquals(0, link.getLastRow());
-        assertEquals(0, link.getFirstColumn());
-        assertEquals(0, link.getLastColumn());
-        confirmGUID(HyperlinkRecord.STD_MONIKER, link.getGuid());
-        confirmGUID(HyperlinkRecord.FILE_MONIKER, link.getMoniker());
-        assertEquals(2, link.getLabelOptions());
-        int opts = HyperlinkRecord.HLINK_URL | HyperlinkRecord.HLINK_LABEL;
-        assertEquals(0x15, opts);
-        assertEquals(opts, link.getLinkOptions());
-
-        assertEquals("file", link.getLabel());
-        assertEquals("link1.xls", link.getShortFilename());
-        assertEquals("link1.xls", link.getAddress());
-    }
-
-    @Test
-    public void testReadEmailLink(){
-        RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, data3);
-        HyperlinkRecord link = new HyperlinkRecord(is);
-        assertEquals(1, link.getFirstRow());
-        assertEquals(1, link.getLastRow());
-        assertEquals(0, link.getFirstColumn());
-        assertEquals(0, link.getLastColumn());
-        confirmGUID(HyperlinkRecord.STD_MONIKER, link.getGuid());
-        confirmGUID(HyperlinkRecord.URL_MONIKER, link.getMoniker());
-        assertEquals(2, link.getLabelOptions());
-        int opts = HyperlinkRecord.HLINK_URL | HyperlinkRecord.HLINK_ABS | HyperlinkRecord.HLINK_LABEL;
-        assertEquals(0x17, opts);
-        assertEquals(opts, link.getLinkOptions());
-
-        assertEquals("email", link.getLabel());
-        assertEquals("mailto:ebgans@mail.ru?subject=Hello,%20Ebgans!", link.getAddress());
-    }
-
-    @Test
-    public void testReadDocumentLink(){
-        RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, data4);
-        HyperlinkRecord link = new HyperlinkRecord(is);
-        assertEquals(3, link.getFirstRow());
-        assertEquals(3, link.getLastRow());
-        assertEquals(0, link.getFirstColumn());
-        assertEquals(0, link.getLastColumn());
-        confirmGUID(HyperlinkRecord.STD_MONIKER, link.getGuid());
-        assertEquals(2, link.getLabelOptions());
-        int opts = HyperlinkRecord.HLINK_LABEL | HyperlinkRecord.HLINK_PLACE;
-        assertEquals(0x1C, opts);
-        assertEquals(opts, link.getLinkOptions());
-
-        assertEquals("place", link.getLabel());
-        assertEquals("Sheet1!A1", link.getTextMark());
-        assertEquals("Sheet1!A1", link.getAddress());
-    }
-
-    private void serialize(byte[] data){
-        RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, data);
-        HyperlinkRecord link = new HyperlinkRecord(is);
-        byte[] bytes1 = link.serialize();
-        is = TestcaseRecordInputStream.create(bytes1);
-        link = new HyperlinkRecord(is);
-        byte[] bytes2 = link.serialize();
-        assertEquals(bytes1.length, bytes2.length);
-        assertArrayEquals(bytes1, bytes2);
-    }
-
-    @Test
-    public void testSerialize(){
-        serialize(data1);
-        serialize(data2);
-        serialize(data3);
-        serialize(data4);
-    }
-
-    @Test
-    public void testCreateURLRecord() {
-        HyperlinkRecord link = new HyperlinkRecord();
-        link.newUrlLink();
-        link.setFirstRow((short)2);
-        link.setLastRow((short)2);
-        link.setLabel("My Link");
-        link.setAddress("http://www.lakings.com/");
-
-        byte[] tmp = link.serialize();
-        byte[] ser = new byte[tmp.length-4];
-        System.arraycopy(tmp, 4, ser, 0, ser.length);
-        assertEquals(data1.length, ser.length);
-        assertArrayEquals(data1, ser);
-    }
-
-    @Test
-    public void testCreateFileRecord() {
-        HyperlinkRecord link = new HyperlinkRecord();
-        link.newFileLink();
-        link.setFirstRow((short)0);
-        link.setLastRow((short)0);
-        link.setLabel("file");
-        link.setShortFilename("link1.xls");
-
-        byte[] tmp = link.serialize();
-        byte[] ser = new byte[tmp.length-4];
-        System.arraycopy(tmp, 4, ser, 0, ser.length);
-        assertEquals(data2.length, ser.length);
-        assertArrayEquals(data2, ser);
-    }
-
-    @Test
-    public void testCreateDocumentRecord() {
-        HyperlinkRecord link = new HyperlinkRecord();
-        link.newDocumentLink();
-        link.setFirstRow((short)3);
-        link.setLastRow((short)3);
-        link.setLabel("place");
-        link.setTextMark("Sheet1!A1");
-
-        byte[] tmp = link.serialize();
-        byte[] ser = new byte[tmp.length-4];
-        System.arraycopy(tmp, 4, ser, 0, ser.length);
-        assertEquals(data4.length, ser.length);
-        assertArrayEquals(data4, ser);
-    }
-
-    @Test
-    public void testCreateEmailtRecord() {
-        HyperlinkRecord link = new HyperlinkRecord();
-        link.newUrlLink();
-        link.setFirstRow((short)1);
-        link.setLastRow((short)1);
-        link.setLabel("email");
-        link.setAddress("mailto:ebgans@mail.ru?subject=Hello,%20Ebgans!");
-
-        byte[] tmp = link.serialize();
-        byte[] ser = new byte[tmp.length-4];
-        System.arraycopy(tmp, 4, ser, 0, ser.length);
-        assertEquals(data3.length, ser.length);
-        assertArrayEquals(data3, ser);
-    }
-
-    @Test
-    public void testClone() {
-        byte[][] data = {data1, data2, data3, data4};
-        for (final byte[] d : data) {
-            RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, d);
-            HyperlinkRecord link = new HyperlinkRecord(is);
-            HyperlinkRecord clone = link.clone();
-            assertArrayEquals(link.serialize(), clone.serialize());
-        }
-
-    }
-
-    @Test
-    public void testReserializeTargetFrame() {
-		RecordInputStream in = TestcaseRecordInputStream.create(HyperlinkRecord.sid, dataTargetFrame);
-		HyperlinkRecord hr = new HyperlinkRecord(in);
-		byte[] ser = hr.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(HyperlinkRecord.sid, dataTargetFrame, ser);
-	}
-
-    @Test
-	public void testReserializeLinkToWorkbook() {
-
-		RecordInputStream in = TestcaseRecordInputStream.create(HyperlinkRecord.sid, dataLinkToWorkbook);
-		HyperlinkRecord hr = new HyperlinkRecord(in);
-		byte[] ser = hr.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(HyperlinkRecord.sid, dataLinkToWorkbook, ser);
-		assertNotEquals("Identified bug in reading workbook link", "YEARFR~1.XLS", hr.getAddress());
-		assertEquals("yearfracExamples.xls", hr.getAddress());
-	}
-
-    @Test
-    public void testReserializeUNC() {
-
-		RecordInputStream in = TestcaseRecordInputStream.create(HyperlinkRecord.sid, dataUNC);
-		HyperlinkRecord hr = new HyperlinkRecord(in);
-		byte[] ser = hr.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(HyperlinkRecord.sid, dataUNC, ser);
-		try {
-			hr.toString();
-		} catch (NullPointerException e) {
-		    fail("Identified bug with option URL and UNC set at same time");
-		}
-	}
-	
-    @Test
-	public void testGUID() {
-		GUID g;
-		g = GUID.parse("3F2504E0-4F89-11D3-9A0C-0305E82C3301");
-		confirmGUID(g, 0x3F2504E0, 0x4F89, 0x11D3, 0x9A0C0305E82C3301L);
-		assertEquals("3F2504E0-4F89-11D3-9A0C-0305E82C3301", g.formatAsString());
-
-		g = GUID.parse("13579BDF-0246-8ACE-0123-456789ABCDEF");
-		confirmGUID(g, 0x13579BDF, 0x0246, 0x8ACE, 0x0123456789ABCDEFL);
-		assertEquals("13579BDF-0246-8ACE-0123-456789ABCDEF", g.formatAsString());
-
-		byte[] buf = new byte[16];
-		g.serialize(new LittleEndianByteArrayOutputStream(buf, 0));
-		String expectedDump = "[DF, 9B, 57, 13, 46, 02, CE, 8A, 01, 23, 45, 67, 89, AB, CD, EF]";
-		assertEquals(expectedDump, HexDump.toHex(buf));
-
-		// STD Moniker
-		g = createFromStreamDump("[D0, C9, EA, 79, F9, BA, CE, 11, 8C, 82, 00, AA, 00, 4B, A9, 0B]");
-		assertEquals("79EAC9D0-BAF9-11CE-8C82-00AA004BA90B", g.formatAsString());
-		// URL Moniker
-		g = createFromStreamDump("[E0, C9, EA, 79, F9, BA, CE, 11, 8C, 82, 00, AA, 00, 4B, A9, 0B]");
-		assertEquals("79EAC9E0-BAF9-11CE-8C82-00AA004BA90B", g.formatAsString());
-		// File Moniker
-		g = createFromStreamDump("[03, 03, 00, 00, 00, 00, 00, 00, C0, 00, 00, 00, 00, 00, 00, 46]");
-		assertEquals("00000303-0000-0000-C000-000000000046", g.formatAsString());
-	}
-
-	private static GUID createFromStreamDump(String s) {
-		return new GUID(new LittleEndianByteArrayInputStream(HexRead.readFromString(s)));
-	}
-
-	private void confirmGUID(GUID g, int d1, int d2, int d3, long d4) {
-		assertEquals(HexDump.intToHex(d1), HexDump.intToHex(g.getD1()));
-		assertEquals(HexDump.shortToHex(d2), HexDump.shortToHex(g.getD2()));
-		assertEquals(HexDump.shortToHex(d3), HexDump.shortToHex(g.getD3()));
-		assertEquals(HexDump.longToHex(d4), HexDump.longToHex(g.getD4()));
-	}
-
-	@Test
-    public void test47498(){
-        RecordInputStream is = TestcaseRecordInputStream.create(HyperlinkRecord.sid, data_47498);
-        HyperlinkRecord link = new HyperlinkRecord(is);
-        assertEquals(2, link.getFirstRow());
-        assertEquals(2, link.getLastRow());
-        assertEquals(0, link.getFirstColumn());
-        assertEquals(0, link.getLastColumn());
-        confirmGUID(HyperlinkRecord.STD_MONIKER, link.getGuid());
-        confirmGUID(HyperlinkRecord.URL_MONIKER, link.getMoniker());
-        assertEquals(2, link.getLabelOptions());
-        int opts = HyperlinkRecord.HLINK_URL | HyperlinkRecord.HLINK_LABEL;
-        assertEquals(opts, link.getLinkOptions());
-        assertEquals(0, link.getFileOptions());
-
-        assertEquals("PDF", link.getLabel());
-        assertEquals("testfolder/test.PDF", link.getAddress());
-
-        byte[] ser = link.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(HyperlinkRecord.sid, data_47498, ser);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
deleted file mode 100644
index 528f8e3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.TestCase;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.HexDump;
-import java.util.List;
-import java.io.ByteArrayInputStream;
-
-/**
- * Tests the serialization and deserialization of the EndSubRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Yegor Kozlov
- */
-public final class TestInterfaceEndRecord extends TestCase {
-
-    public void testCreate() {
-        InterfaceEndRecord record = InterfaceEndRecord.instance;
-        assertEquals(0, record.getDataSize());
-    }
-
-    /**
-     * Silently swallow unexpected contents in InterfaceEndRecord.
-     * Although it violates the spec, Excel silently converts this
-     * data to an {@link InterfaceHdrRecord}.
-     */
-    public void testUnexpectedBytes_bug47251(){
-        String hex = "" +
-                "09 08 10 00 00 06 05 00 EC 15 CD 07 C1 C0 00 00 06 03 00 00 " +   //BOF
-                "E2 00 02 00 B0 04 " + //INTERFACEEND with extra two bytes
-                "0A 00 00 00";    // EOF
-        byte[] data = HexRead.readFromString(hex);
-        List<Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data));
-        assertEquals(3, records.size());
-        Record rec1 = records.get(1);
-        assertEquals(InterfaceHdrRecord.class, rec1.getClass());
-        InterfaceHdrRecord r = (InterfaceHdrRecord)rec1;
-        assertEquals("[E1, 00, 02, 00, B0, 04]", HexDump.toHex(r.serialize()));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
deleted file mode 100644
index 10f3636..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-/**
- * Tests for <tt>LabelRecord</tt>
- * 
- * @author Josh Micich
- */
-public final class TestLabelRecord extends TestCase {
-
-	public void testEmptyString() {
-		HSSFWorkbook wb;
-		try {
-			wb = HSSFTestDataSamples.openSampleWorkbook("ex42570-20305.xls");
-		} catch (NullPointerException e) {
-			throw new AssertionFailedError("Identified bug 42570");
-		}
-		HSSFTestDataSamples.writeOutAndReadBack(wb);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
deleted file mode 100644
index 0f53548..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndianInputStream;
-import org.apache.poi.util.LittleEndianOutputStream;
-
-/**
- * Tests the serialization and deserialization of the LbsDataSubRecord class works correctly.
- *
- * @author Yegor Kozlov
- */
-public final class TestLbsDataSubRecord extends TestCase {
-
-    /**
-     * test read-write round trip
-     * test data was taken from 47701.xls
-     */
-    public void test_47701(){
-        byte[] data = HexRead.readFromString(
-                        "15, 00, 12, 00, 12, 00, 02, 00, 11, 20, " +
-                        "00, 00, 00, 00, 80, 3D, 03, 05, 00, 00, " +
-                        "00, 00, 0C, 00, 14, 00, 00, 00, 00, 00, " +
-                        "00, 00, 00, 00, 00, 00, 01, 00, 0A, 00, " +
-                        "00, 00, 10, 00, 01, 00, 13, 00, EE, 1F, " +
-                        "10, 00, 09, 00, 40, 9F, 74, 01, 25, 09, " +
-                        "00, 0C, 00, 07, 00, 07, 00, 07, 04, 00, " +
-                        "00, 00, 08, 00, 00, 00");
-        RecordInputStream in = TestcaseRecordInputStream.create(ObjRecord.sid, data);
-        // check read OK
-        ObjRecord record = new ObjRecord(in);
-        assertEquals(3, record.getSubRecords().size());
-        SubRecord sr = record.getSubRecords().get(2);
-        assertTrue(sr instanceof LbsDataSubRecord);
-        LbsDataSubRecord lbs = (LbsDataSubRecord)sr;
-        assertEquals(4, lbs.getNumberOfItems());
-
-        assertTrue(lbs.getFormula() instanceof AreaPtg);
-        AreaPtg ptg = (AreaPtg)lbs.getFormula();
-        CellRangeAddress range = new CellRangeAddress(
-                ptg.getFirstRow(), ptg.getLastRow(), ptg.getFirstColumn(), ptg.getLastColumn());
-        assertEquals("H10:H13", range.formatAsString());
-
-        // check that it re-serializes to the same data
-        byte[] ser = record.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(ObjRecord.sid, data, ser);
-    }
-
-    /**
-     * test data was taken from the file attached to Bugzilla 45778
-     */
-    public void test_45778(){
-        byte[] data = HexRead.readFromString(
-                                "15, 00, 12, 00, 14, 00, 01, 00, 01, 00, " +
-                                "01, 21, 00, 00, 3C, 13, F4, 03, 00, 00, " +
-                                "00, 00, 0C, 00, 14, 00, 00, 00, 00, 00, " +
-                                "00, 00, 00, 00, 00, 00, 01, 00, 08, 00, 00, " +
-                                "00, 10, 00, 00, 00, " +
-                                 "13, 00, EE, 1F, " +
-                                 "00, 00, " +
-                                 "08, 00, " +  //number of items
-                                 "08, 00, " + //selected item
-                                 "01, 03, " + //flags
-                                 "00, 00, " + //objId
-                                 //LbsDropData
-                                 "0A, 00, " + //flags
-                                 "14, 00, " + //the number of lines to be displayed in the dropdown
-                                 "6C, 00, " + //the smallest width in pixels allowed for the dropdown window
-                                 "00, 00, " +  //num chars
-                                 "00, 00");
-        RecordInputStream in = TestcaseRecordInputStream.create(ObjRecord.sid, data);
-        // check read OK
-        ObjRecord record = new ObjRecord(in);
-
-        SubRecord sr = record.getSubRecords().get(2);
-        assertTrue(sr instanceof LbsDataSubRecord);
-        LbsDataSubRecord lbs = (LbsDataSubRecord)sr;
-        assertEquals(8, lbs.getNumberOfItems());
-        assertNull(lbs.getFormula());
-
-        // check that it re-serializes to the same data
-        byte[] ser = record.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(ObjRecord.sid, data, ser);
-
-    }
-
-    /**
-     * Test data produced by OpenOffice 3.1 by opening  and saving 47701.xls
-     * There are 5 padding bytes that are removed by POI
-     */
-    public void test_remove_padding(){
-        byte[] data = HexRead.readFromString(
-                        "5D, 00, 4C, 00, " +
-                        "15, 00, 12, 00, 12, 00, 01, 00, 11, 00, " +
-                        "00, 00, 00, 00, 00, 00, 00, 00, 00, 00, " +
-                        "00, 00, 0C, 00, 14, 00, 00, 00, 00, 00, " +
-                        "00, 00, 00, 00, 00, 00, 01, 00, 09, 00, " +
-                        "00, 00, 0F, 00, 01, 00, " +
-                        "13, 00, 1B, 00, " +
-                        "10, 00, " + //next 16 bytes is a ptg aray
-                        "09, 00, 00, 00, 00, 00, 25, 09, 00, 0C, 00, 07, 00, 07, 00, 00, " +
-                        "01, 00, " + //num lines
-                        "00, 00, " + //selected
-                         "08, 00, " +
-                         "00, 00, " +
-                         "00, 00, 00, 00, 00"); //padding bytes
-
-        RecordInputStream in = TestcaseRecordInputStream.create(data);
-        // check read OK
-        ObjRecord record = new ObjRecord(in);
-        // check that it re-serializes to the same data
-        byte[] ser = record.serialize();
-
-        assertEquals(data.length-5, ser.length);
-        for(int i=0; i < ser.length; i++) assertEquals(data[i],ser[i]);
-
-        //check we can read the trimmed record
-        RecordInputStream in2 = TestcaseRecordInputStream.create(ser);
-        ObjRecord record2 = new ObjRecord(in2);
-        byte[] ser2 = record2.serialize();
-        assertArrayEquals(ser, ser2);
-    }
-
-    public void test_LbsDropData() throws IOException{
-        byte[] data = HexRead.readFromString(
-                                 //LbsDropData
-                                 "0A, 00, " + //flags
-                                 "14, 00, " + //the number of lines to be displayed in the dropdown
-                                 "6C, 00, " + //the smallest width in pixels allowed for the dropdown window
-                                 "00, 00, " +  //num chars
-                                 "00, " +      //compression flag
-                                 "00");        //padding byte
-
-        LittleEndianInputStream in = new LittleEndianInputStream(new ByteArrayInputStream(data));
-        try {
-            LbsDataSubRecord.LbsDropData lbs = new LbsDataSubRecord.LbsDropData(in);
-    
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            LittleEndianOutputStream out = new LittleEndianOutputStream(baos);
-            try {
-                lbs.serialize(out);
-        
-                assertArrayEquals(data, baos.toByteArray());
-            } finally {
-                out.close();
-            }
-        } finally {
-            in.close();
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
deleted file mode 100644
index d7d05ab..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.aggregates.MergedCellsTable;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-
-/**
- * Make sure the merge cells record behaves
- * @author Danny Mui (dmui at apache dot org)
- *
- */
-public final class TestMergeCellsRecord extends TestCase {
-   
-	/**
-	 * Make sure when a clone is called, we actually clone it.
-	 */
-	public void testCloneReferences() {
-		CellRangeAddress[] cras = { new CellRangeAddress(0, 1, 0, 2), };
-		MergeCellsRecord merge = new MergeCellsRecord(cras, 0, cras.length);
-		MergeCellsRecord clone = merge.clone();
-
-		assertNotSame("Merged and cloned objects are the same", merge, clone);
-
-		CellRangeAddress mergeRegion = merge.getAreaAt(0);
-		CellRangeAddress cloneRegion = clone.getAreaAt(0);
-		assertNotSame("Should not point to same objects when cloning", mergeRegion, cloneRegion);
-		assertEquals("New Clone Row From doesnt match", mergeRegion.getFirstRow(), cloneRegion.getFirstRow());
-		assertEquals("New Clone Row To doesnt match", mergeRegion.getLastRow(), cloneRegion.getLastRow());
-		assertEquals("New Clone Col From doesnt match", mergeRegion.getFirstColumn(), cloneRegion.getFirstColumn());
-		assertEquals("New Clone Col To doesnt match", mergeRegion.getLastColumn(), cloneRegion.getLastColumn());      
-      
-		assertFalse(merge.getAreaAt(0) == clone.getAreaAt(0));
-	}
-   
-	private static final RecordVisitor dummyRecordVisitor = new RecordVisitor() {
-		@Override
-        public void visitRecord(Record r) {
-			// do nothing
-		}
-	};
-	public void testMCTable_bug46009() {
-		MergedCellsTable mct = new MergedCellsTable();
-		List<Record> recList = new ArrayList<Record>();
-		CellRangeAddress[] cras = new CellRangeAddress[] {
-				new CellRangeAddress(0, 0, 0, 3), 
-		};
-		recList.add(new MergeCellsRecord(cras, 0, 1));
-		RecordStream rs = new RecordStream(recList, 0);
-		mct.read(rs);
-		try {
-			mct.visitContainedRecords(dummyRecordVisitor);
-		} catch (ArrayStoreException e) {
-			throw new AssertionFailedError("Identified bug 46009");
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
deleted file mode 100644
index f7a29eb..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the NameCommentRecord serializes/deserializes correctly
- *
- * @author Andrew Shirley (aks at corefiling.co.uk)
- */
-public final class TestNameCommentRecord extends TestCase {
-	public void testReserialize() {
-		final byte[] data = HexRead
-				.readFromString(""
-						+ "94 08 00 00 00 00 00 00 00 00 00 00 04 00 07 00 00 6E 61 6D 65 00 63 6F 6D 6D 65 6E 74]");
-		final RecordInputStream in = TestcaseRecordInputStream.create(NameCommentRecord.sid, data);
-		final NameCommentRecord ncr = new NameCommentRecord(in);
-		assertEquals(0x0894, ncr.getRecordType());
-		assertEquals("name", ncr.getNameText());
-		assertEquals("comment", ncr.getCommentText());
-		final byte[] data2 = ncr.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(NameCommentRecord.sid, data, data2);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
deleted file mode 100644
index 231b6c9..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
+++ /dev/null
@@ -1,717 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFName;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.ArrayPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the NameRecord serializes/deserializes correctly
- * 
- * @author Danny Mui (dmui at apache dot org)
- */
-public final class TestNameRecord extends TestCase {
-
-	/**
-	 * Makes sure that additional name information is parsed properly such as menu/description
-	 */
-	public void testFillExtras() {
-
-		byte[] examples = HexRead.readFromString(""
-				+ "88 03 67 06 07 00 00 00 00 00 00 23 00 00 00 4D "
-				+ "61 63 72 6F 31 3A 01 00 00 00 11 00 00 4D 61 63 "
-				+ "72 6F 20 72 65 63 6F 72 64 65 64 20 32 37 2D 53 "
-				+ "65 70 2D 39 33 20 62 79 20 41 4C 4C 57 4F 52");
-
-		NameRecord name = new NameRecord(TestcaseRecordInputStream.create(NameRecord.sid, examples));
-		String description = name.getDescriptionText();
-		assertNotNull(description);
-		assertTrue(description.endsWith("Macro recorded 27-Sep-93 by ALLWOR"));
-	}
-
-	public void testReserialize() {
-		byte[] data = HexRead
-				.readFromString(""
-						+ "20 00 00 01 0B 00 00 00 01 00 00 00 00 00 00 06 3B 00 00 00 00 02 00 00 00 09 00]");
-		RecordInputStream in = TestcaseRecordInputStream.create(NameRecord.sid, data);
-		NameRecord nr = new NameRecord(in);
-		assertEquals(0x0020, nr.getOptionFlag());
-		byte[] data2 = nr.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(NameRecord.sid, data, data2);
-	}
-
-	public void testFormulaRelAbs_bug46174() throws IOException {
-		// perhaps this testcase belongs on TestHSSFName
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFName name = wb.createName();
-		wb.createSheet("Sheet1");
-		name.setNameName("test");
-		name.setRefersToFormula("Sheet1!$B$3");
-		if (name.getRefersToFormula().equals("Sheet1!B3")) {
-			fail("Identified bug 46174");
-		}
-		assertEquals("Sheet1!$B$3", name.getRefersToFormula());
-	    wb.close();
-	}
-
-	public void testFormulaGeneral() throws IOException {
-		// perhaps this testcase belongs on TestHSSFName
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFName name = wb.createName();
-		wb.createSheet("Sheet1");
-		name.setNameName("test");
-		name.setRefersToFormula("Sheet1!A1+Sheet1!A2");
-		assertEquals("Sheet1!A1+Sheet1!A2", name.getRefersToFormula());
-		name.setRefersToFormula("5*6");
-		assertEquals("5*6", name.getRefersToFormula());
-		
-		wb.close();
-	}
-
-    /**
-     *  A NameRecord followed by a ContinueRecord. See Bugzilla 50244
-     */
-    public void test50244(){
-        String record_0x0018 =
-                "                                          18 00 " +
-                "21 1E 00 00 00 11 08 00 00 00 03 00 00 00 00 00 " +
-                "00 77 44 61 74 61 47 72 75 70 70 65 53 65 72 69 " +
-                "65 2E 60 00 B7 02 0C 00 57 03 00 B7 02 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 30 31 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 30 31 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 30 31 02 09 00 00 31 2E 54 32 30 2E 30 30 " +
-                "32 02 09 00 00 31 2E 54 32 30 2E 30 30 32 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 30 32 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 30 33 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 30 33 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "30 33 02 09 00 00 31 2E 54 32 30 2E 30 31 33 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 31 33 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 31 33 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 31 34 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 31 34 02 09 00 00 31 2E 54 32 30 2E 30 31 34 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 31 35 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 31 35 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 31 35 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 32 35 02 09 00 00 31 2E 54 32 30 2E 30 32 " +
-                "35 02 09 00 00 31 2E 54 32 30 2E 30 32 35 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 32 36 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 32 36 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 32 36 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "32 37 02 09 00 00 31 2E 54 32 30 2E 30 32 37 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 32 37 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 33 37 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 33 37 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 33 37 02 09 00 00 31 2E 54 32 30 2E 30 33 38 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 33 38 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 33 38 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 33 39 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 33 39 02 09 00 00 31 2E 54 32 30 2E 30 33 " +
-                "39 02 09 00 00 31 2E 54 32 30 2E 30 34 39 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 34 39 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 34 39 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 35 30 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "35 30 02 09 00 00 31 2E 54 32 30 2E 30 35 30 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 35 31 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 35 31 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 35 31 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 36 31 02 09 00 00 31 2E 54 32 30 2E 30 36 31 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 36 31 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 36 32 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 36 32 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 36 32 02 09 00 00 31 2E 54 32 30 2E 30 36 " +
-                "33 02 09 00 00 31 2E 54 32 30 2E 30 36 33 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 36 33 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 37 33 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 37 33 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "37 33 02 09 00 00 31 2E 54 32 30 2E 30 37 34 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 37 34 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 37 34 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 37 35 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 37 35 02 09 00 00 31 2E 54 32 30 2E 30 37 35 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 38 35 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 38 35 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 38 35 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 38 36 02 09 00 00 31 2E 54 32 30 2E 30 38 " +
-                "36 02 09 00 00 31 2E 54 32 30 2E 30 38 36 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 38 37 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 38 37 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 38 37 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "39 37 02 09 00 00 31 2E 54 32 30 2E 30 39 37 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 39 37 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 39 38 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 39 38 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 39 38 02 09 00 00 31 2E 54 32 30 2E 30 39 39 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 39 39 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 39 39 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 30 39 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 30 39 02 09 00 00 31 2E 54 32 30 2E 31 30 " +
-                "39 02 09 00 00 31 2E 54 32 30 2E 31 31 30 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 31 30 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 31 30 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 31 31 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "31 31 02 09 00 00 31 2E 54 32 30 2E 31 31 31 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 32 31 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 32 31 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 32 31 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 32 32 02 09 00 00 31 2E 54 32 30 2E 31 32 32 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 32 32 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 32 33 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 32 33 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 32 33 02 09 00 00 31 2E 54 32 30 2E 31 33 " +
-                "33 02 09 00 00 31 2E 54 32 30 2E 31 33 33 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 33 33 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 33 34 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 33 34 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "33 34 02 09 00 00 31 2E 54 32 30 2E 31 33 35 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 33 35 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 33 35 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 34 35 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 34 35 02 09 00 00 31 2E 54 32 30 2E 31 34 35 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 34 36 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 34 36 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 34 36 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 34 37 02 09 00 00 31 2E 54 32 30 2E 31 34 " +
-                "37 02 09 00 00 31 2E 54 32 30 2E 31 34 37 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 35 37 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 35 37 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 35 37 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "35 38 02 09 00 00 31 2E 54 32 30 2E 31 35 38 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 35 38 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 35 39 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 35 39 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 35 39 02 09 00 00 31 2E 54 32 30 2E 31 36 39 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 36 39 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 36 39 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 37 30 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 37 30 02 09 00 00 31 2E 54 32 30 2E 31 37 " +
-                "30 02 09 00 00 31 2E 54 32 30 2E 31 37 31 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 37 31 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 37 31 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 30 39 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "30 39 02 09 00 00 31 2E 54 36 30 2E 30 30 39 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 31 30 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 31 30 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 31 30 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 31 31 02 09 00 00 31 2E 54 36 30 2E 30 31 31 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 31 31 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 32 31 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 32 31 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 32 31 02 09 00 00 31 2E 54 36 30 2E 30 32 " +
-                "32 02 09 00 00 31 2E 54 36 30 2E 30 32 32 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 32 32 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 32 33 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 32 33 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "32 33 02 09 00 00 31 2E 54 36 30 2E 30 33 33 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 33 33 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 33 33 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 33 34 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 33 34 02 09 00 00 31 2E 54 36 30 2E 30 33 34 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 33 35 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 33 35 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 33 35 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 34 35 02 09 00 00 31 2E 54 36 30 2E 30 34 " +
-                "35 02 09 00 00 31 2E 54 36 30 2E 30 34 35 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 34 36 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 34 36 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 34 36 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "34 37 02 09 00 00 31 2E 54 36 30 2E 30 34 37 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 34 37 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 35 37 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 35 37 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 35 37 02 09 00 00 31 2E 54 36 30 2E 30 35 38 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 35 38 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 35 38 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 35 39 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 35 39 02 09 00 00 31 2E 54 36 30 2E 30 35 " +
-                "39 02 09 00 00 31 2E 54 36 30 2E 30 36 30 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 36 30 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 36 30 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 35 30 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "35 30 02 09 00 00 31 2E 54 36 30 2E 30 35 30 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 34 39 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 34 39 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 34 39 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 34 38 02 09 00 00 31 2E 54 36 30 2E 30 34 38 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 34 38 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 33 38 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 33 38 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 33 38 02 09 00 00 31 2E 54 36 30 2E 30 33 " +
-                "37 02 09 00 00 31 2E 54 36 30 2E 30 33 37 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 33 37 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 33 36 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 33 36 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "33 36 02 09 00 00 31 2E 54 36 30 2E 30 32 36 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 32 36 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 32 36 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 32 35 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 32 35 02 09 00 00 31 2E 54 36 30 2E 30 32 35 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 32 34 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 32 34 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 32 34 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 31 34 02 09 00 00 31 2E 54 36 30 2E 30 31 " +
-                "34 02 09 00 00 31 2E 54 36 30 2E 30 31 34 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 31 33 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 31 33 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 31 33 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "31 32 02 09 00 00 31 2E 54 36 30 2E 30 31 32 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 31 32 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 30 32 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 30 32 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 30 32 02 09 00 00 31 2E 54 36 30 2E 30 30 31 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 30 31 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 30 31 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 37 32 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 37 32 02 09 00 00 31 2E 54 32 30 2E 31 37 " +
-                "32 02 09 00 00 31 2E 54 32 30 2E 31 36 32 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 36 32 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 36 32 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 36 31 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "36 31 02 09 00 00 31 2E 54 32 30 2E 31 36 31 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 36 30 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 36 30 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 36 30 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 35 30 02 09 00 00 31 2E 54 32 30 2E 31 35 30 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 35 30 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 34 39 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 34 39 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 34 39 02 09 00 00 31 2E 54 32 30 2E 31 34 " +
-                "38 02 09 00 00 31 2E 54 32 30 2E 31 34 38 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 34 38 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 33 38 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 33 38 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "33 38 02 09 00 00 31 2E 54 32 30 2E 31 33 37 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 33 37 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 33 37 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 33 36 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 33 36 02 09 00 00 31 2E 54 32 30 2E 31 33 36 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 32 36 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 32 36 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 32 36 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 32 35 02 09 00 00 31 2E 54 32 30 2E 31 32 " +
-                "35 02 09 00 00 31 2E 54 32 30 2E 31 32 35 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 32 34 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 32 34 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 32 34 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "31 34 02 09 00 00 31 2E 54 32 30 2E 31 31 34 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 31 34 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 31 33 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 31 33 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 31 33 02 09 00 00 31 2E 54 32 30 2E 31 31 32 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 31 32 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 31 32 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 30 32 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 30 32 02 09 00 00 31 2E 54 32 30 2E 31 30 " +
-                "32 02 09 00 00 31 2E 54 32 30 2E 31 30 31 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 30 31 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 30 31 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 30 30 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "30 30 02 09 00 00 31 2E 54 32 30 2E 31 30 30 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 39 30 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 39 30 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 39 30 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 38 39 02 09 00 00 31 2E 54 32 30 2E 30 38 39 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 38 39 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 38 38 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 38 38 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 38 38 02 09 00 00 31 2E 54 32 30 2E 30 37 " +
-                "38 02 09 00 00 31 2E 54 32 30 2E 30 37 38 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 37 38 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 37 37 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 37 37 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "37 37 02 09 00 00 31 2E 54 32 30 2E 30 37 36 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 37 36 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 37 36 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 36 36 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 36 36 02 09 00 00 31 2E 54 32 30 2E 30 36 36 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 36 35 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 36 35 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 36 35 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 36 34 02 09 00 00 31 2E 54 32 30 2E 30 36 " +
-                "34 02 09 00 00 31 2E 54 32 30 2E 30 36 34 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 35 34 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 35 34 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 35 34 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "35 33 02 09 00 00 31 2E 54 32 30 2E 30 35 33 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 35 33 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 35 32 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 35 32 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 35 32 02 09 00 00 31 2E 54 32 30 2E 30 34 32 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 34 32 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 34 32 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 34 31 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 34 31 02 09 00 00 31 2E 54 32 30 2E 30 34 " +
-                "31 02 09 00 00 31 2E 54 32 30 2E 30 34 30 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 34 30 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 34 30 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 33 30 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "33 30 02 09 00 00 31 2E 54 32 30 2E 30 33 30 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 32 39 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 32 39 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 32 39 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 32 38 02 09 00 00 31 2E 54 32 30 2E 30 32 38 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 32 38 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 31 38 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 31 38 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 31 38 02 09 00 00 31 2E 54 32 30 2E 30 31 " +
-                "37 02 09 00 00 31 2E 54 32 30 2E 30 31 37 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 31 37 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 31 36 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 31 36 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "31 36 02 09 00 00 31 2E 54 32 30 2E 30 30 36 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 30 36 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 30 36 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 30 35 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 30 35 02 09 00 00 31 2E 54 32 30 2E 30 30 35 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 30 34 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 30 34 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 30 34 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 30 37 02 09 00 00 31 2E 54 32 30 2E 30 30 " +
-                "37 02 09 00 00 31 2E 54 32 30 2E 30 30 37 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 30 38 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 30 38 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 30 38 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "30 39 02 09 00 00 31 2E 54 32 30 2E 30 30 39 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 30 39 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 31 39 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 31 39 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 31 39 02 09 00 00 31 2E 54 32 30 2E 30 32 30 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 32 30 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 32 30 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 32 31 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 32 31 02 09 00 00 31 2E 54 32 30 2E 30 32 " +
-                "31 02 09 00 00 31 2E 54 32 30 2E 30 33 31 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 33 31 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 33 31 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 33 32 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "33 32 02 09 00 00 31 2E 54 32 30 2E 30 33 32 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 33 33 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 33 33 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 33 33 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 34 33 02 09 00 00 31 2E 54 32 30 2E 30 34 33 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 34 33 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 34 34 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 34 34 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 34 34 02 09 00 00 31 2E 54 32 30 2E 30 34 " +
-                "35 02 09 00 00 31 2E 54 32 30 2E 30 34 35 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 34 35 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 35 35 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 35 35 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "35 35 02 09 00 00 31 2E 54 32 30 2E 30 35 36 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 35 36 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 35 36 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 35 37 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 35 37 02 09 00 00 31 2E 54 32 30 2E 30 35 37 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 36 37 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 36 37 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 36 37 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 36 38 02 09 00 00 31 2E 54 32 30 2E 30 36 " +
-                "38 02 09 00 00 31 2E 54 32 30 2E 30 36 38 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 36 39 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 36 39 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 36 39 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "37 39 02 09 00 00 31 2E 54 32 30 2E 30 37 39 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 37 39 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 38 30 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 38 30 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 38 30 02 09 00 00 31 2E 54 32 30 2E 30 38 31 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 38 31 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 38 31 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 39 31 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 39 31 02 09 00 00 31 2E 54 32 30 2E 30 39 " +
-                "31 02 09 00 00 31 2E 54 32 30 2E 30 39 32 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 39 32 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 39 32 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 39 33 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "39 33 02 09 00 00 31 2E 54 32 30 2E 30 39 33 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 30 33 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 30 33 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 30 33 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 30 34 02 09 00 00 31 2E 54 32 30 2E 31 30 34 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 30 34 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 30 35 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 30 35 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 30 35 02 09 00 00 31 2E 54 32 30 2E 31 31 " +
-                "35 02 09 00 00 31 2E 54 32 30 2E 31 31 35 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 31 35 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 31 36 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 31 36 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "31 36 02 09 00 00 31 2E 54 32 30 2E 31 31 37 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 31 37 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 31 37 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 32 37 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 32 37 02 09 00 00 31 2E 54 32 30 2E 31 32 37 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 32 38 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 32 38 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 32 38 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 32 39 02 09 00 00 31 2E 54 32 30 2E 31 32 " +
-                "39 02 09 00 00 31 2E 54 32 30 2E 31 32 39 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 33 39 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 33 39 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 33 39 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "34 30 02 09 00 00 31 2E 54 32 30 2E 31 34 30 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 34 30 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 34 31 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 34 31 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 34 31 02 09 00 00 31 2E 54 32 30 2E 31 35 31 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 35 31 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 35 31 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 35 32 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 35 32 02 09 00 00 31 2E 54 32 30 2E 31 35 " +
-                "32 02 09 00 00 31 2E 54 32 30 2E 31 35 33 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 35 33 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 35 33 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 36 33 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "36 33 02 09 00 00 31 2E 54 32 30 2E 31 36 33 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 36 34 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 36 34 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 36 34 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 36 35 02 09 00 00 31 2E 54 32 30 2E 31 36 35 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 36 35 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 30 33 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 30 33 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 30 33 02 09 00 00 31 2E 54 36 30 2E 30 30 " +
-                "34 02 09 00 00 31 2E 54 36 30 2E 30 30 34 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 30 34 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 30 35 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 30 35 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "30 35 02 09 00 00 31 2E 54 36 30 2E 30 31 35 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 31 35 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 31 35 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 31 36 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 31 36 02 09 00 00 31 2E 54 36 30 2E 30 31 36 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 31 37 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 31 37 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 31 37 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 32 37 02 09 00 00 31 2E 54 36 30 2E 30 32 " +
-                "37 02 09 00 00 31 2E 54 36 30 2E 30 32 37 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 32 38 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 32 38 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 32 38 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "32 39 02 09 00 00 31 2E 54 36 30 2E 30 32 39 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 32 39 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 33 39 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 33 39 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 33 39 02 09 00 00 31 2E 54 36 30 2E 30 34 30 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 34 30 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 34 30 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 34 31 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 34 31 02 09 00 00 31 2E 54 36 30 2E 30 34 " +
-                "31 02 09 00 00 31 2E 54 36 30 2E 30 35 31 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 35 31 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 35 31 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 35 32 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "35 32 02 09 00 00 31 2E 54 36 30 2E 30 35 32 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 35 33 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 35 33 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 35 33 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 35 36 02 09 00 00 31 2E 54 36 30 2E 30 35 36 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 35 36 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 35 35 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 35 35 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 35 35 02 09 00 00 31 2E 54 36 30 2E 30 35 " +
-                "34 02 09 00 00 31 2E 54 36 30 2E 30 35 34 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 35 34 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 34 34 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 34 34 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "34 34 02 09 00 00 31 2E 54 36 30 2E 30 34 33 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 34 33 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 34 33 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 34 32 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 34 32 02 09 00 00 31 2E 54 36 30 2E 30 34 32 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 33 32 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 33 32 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 33 32 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 33 31 02 09 00 00 31 2E 54 36 30 2E 30 33 " +
-                "31 02 09 00 00 31 2E 54 36 30 2E 30 33 31 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 33 30 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 33 30 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 33 30 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "32 30 02 09 00 00 31 2E 54 36 30 2E 30 32 30 02 " +
-                "09 00 00 31 2E 54 36 30 2E 30 32 30 02 09 00 00 " +
-                "31 2E 54 36 30 2E 30 31 39 02 09 00 00 31 2E 54 " +
-                "36 30 2E 30 31 39 02 09 00 00 31 2E 54 36 30 2E " +
-                "30 31 39 02 09 00 00 31 2E 54 36 30 2E 30 31 38 " +
-                "02 09 00 00 31 2E 54 36 30 2E 30 31 38 02 09 00 " +
-                "00 31 2E 54 36 30 2E 30 31 38 02 09 00 00 31 2E " +
-                "54 36 30 2E 30 30 38 02 09 00 00 31 2E 54 36 30 " +
-                "2E 30 30 38 02 09 00 00 31 2E 54 36 30 2E 30 30 " +
-                "38 02 09 00 00 31 2E 54 36 30 2E 30 30 37 02 09 " +
-                "00 00 31 2E 54 36 30 2E 30 30 37 02 09 00 00 31 " +
-                "2E 54 36 30 2E 30 30 37 02 09 00 00 31 2E 54 36 " +
-                "30 2E 30 30 36 02 09 00 00 31 2E 54 36 30 2E 30 " +
-                "30 36 02 09 00 00 31 2E 54 36 30 2E 30 30 36 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 36 38 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 36 38 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 36 38 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 36 37 02 09 00 00 31 2E 54 32 30 2E 31 36 37 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 36 37 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 36 36 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 36 36 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 36 36 02 09 00 00 31 2E 54 32 30 2E 31 35 " +
-                "36 02 09 00 00 31 2E 54 32 30 2E 31 35 36 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 35 36 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 35 35 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 35 35 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "35 35 02 09 00 00 31 2E 54 32 30 2E 31 35 34 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 35 34 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 35 34 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 34 34 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 34 34                                       ";
-
-        String record_0x03C =
-                "         3C 00 62 05 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 34 34 02 09 00 00 31 2E 54 32 30 2E 31 34 " +
-                "33 02 09 00 00 31 2E 54 32 30 2E 31 34 33 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 34 33 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 34 32 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 34 32 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "34 32 02 09 00 00 31 2E 54 32 30 2E 31 33 32 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 33 32 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 33 32 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 33 31 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 33 31 02 09 00 00 31 2E 54 32 30 2E 31 33 31 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 33 30 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 33 30 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 33 30 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 32 30 02 09 00 00 31 2E 54 32 30 2E 31 32 " +
-                "30 02 09 00 00 31 2E 54 32 30 2E 31 32 30 02 09 " +
-                "00 00 31 2E 54 32 30 2E 31 31 39 02 09 00 00 31 " +
-                "2E 54 32 30 2E 31 31 39 02 09 00 00 31 2E 54 32 " +
-                "30 2E 31 31 39 02 09 00 00 31 2E 54 32 30 2E 31 " +
-                "31 38 02 09 00 00 31 2E 54 32 30 2E 31 31 38 02 " +
-                "09 00 00 31 2E 54 32 30 2E 31 31 38 02 09 00 00 " +
-                "31 2E 54 32 30 2E 31 30 38 02 09 00 00 31 2E 54 " +
-                "32 30 2E 31 30 38 02 09 00 00 31 2E 54 32 30 2E " +
-                "31 30 38 02 09 00 00 31 2E 54 32 30 2E 31 30 37 " +
-                "02 09 00 00 31 2E 54 32 30 2E 31 30 37 02 09 00 " +
-                "00 31 2E 54 32 30 2E 31 30 37 02 09 00 00 31 2E " +
-                "54 32 30 2E 31 30 36 02 09 00 00 31 2E 54 32 30 " +
-                "2E 31 30 36 02 09 00 00 31 2E 54 32 30 2E 31 30 " +
-                "36 02 09 00 00 31 2E 54 32 30 2E 30 39 36 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 39 36 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 39 36 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 39 35 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "39 35 02 09 00 00 31 2E 54 32 30 2E 30 39 35 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 39 34 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 39 34 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 39 34 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 38 34 02 09 00 00 31 2E 54 32 30 2E 30 38 34 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 38 34 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 38 33 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 38 33 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 38 33 02 09 00 00 31 2E 54 32 30 2E 30 38 " +
-                "32 02 09 00 00 31 2E 54 32 30 2E 30 38 32 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 38 32 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 37 32 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 37 32 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "37 32 02 09 00 00 31 2E 54 32 30 2E 30 37 31 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 37 31 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 37 31 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 37 30 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 37 30 02 09 00 00 31 2E 54 32 30 2E 30 37 30 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 36 30 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 36 30 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 36 30 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 35 39 02 09 00 00 31 2E 54 32 30 2E 30 35 " +
-                "39 02 09 00 00 31 2E 54 32 30 2E 30 35 39 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 35 38 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 35 38 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 35 38 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "34 38 02 09 00 00 31 2E 54 32 30 2E 30 34 38 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 34 38 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 34 37 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 34 37 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 34 37 02 09 00 00 31 2E 54 32 30 2E 30 34 36 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 34 36 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 34 36 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 33 36 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 33 36 02 09 00 00 31 2E 54 32 30 2E 30 33 " +
-                "36 02 09 00 00 31 2E 54 32 30 2E 30 33 35 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 33 35 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 33 35 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 33 34 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "33 34 02 09 00 00 31 2E 54 32 30 2E 30 33 34 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 32 34 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 32 34 02 09 00 00 31 2E 54 " +
-                "32 30 2E 30 32 34 02 09 00 00 31 2E 54 32 30 2E " +
-                "30 32 33 02 09 00 00 31 2E 54 32 30 2E 30 32 33 " +
-                "02 09 00 00 31 2E 54 32 30 2E 30 32 33 02 09 00 " +
-                "00 31 2E 54 32 30 2E 30 32 32 02 09 00 00 31 2E " +
-                "54 32 30 2E 30 32 32 02 09 00 00 31 2E 54 32 30 " +
-                "2E 30 32 32 02 09 00 00 31 2E 54 32 30 2E 30 31 " +
-                "32 02 09 00 00 31 2E 54 32 30 2E 30 31 32 02 09 " +
-                "00 00 31 2E 54 32 30 2E 30 31 32 02 09 00 00 31 " +
-                "2E 54 32 30 2E 30 31 31 02 09 00 00 31 2E 54 32 " +
-                "30 2E 30 31 31 02 09 00 00 31 2E 54 32 30 2E 30 " +
-                "31 31 02 09 00 00 31 2E 54 32 30 2E 30 31 30 02 " +
-                "09 00 00 31 2E 54 32 30 2E 30 31 30 02 09 00 00 " +
-                "31 2E 54 32 30 2E 30 31 30                     ";
-
-        byte[] data1 = HexRead.readFromString(record_0x0018 + record_0x03C);
-        RecordInputStream in1 = TestcaseRecordInputStream.create(data1);
-        NameRecord nr1 = new NameRecord(in1);
-        assert_bug50244(nr1);
-
-        byte[] data2 = nr1.serialize();
-
-        assertEquals(data1.length, data2.length);
-        RecordInputStream in2 = TestcaseRecordInputStream.create(data2);
-        NameRecord nr2 = new NameRecord(in2);
-        assert_bug50244(nr2);
-    }
-
-    private void assert_bug50244(NameRecord nr){
-        assertEquals("wDataGruppeSerie.", nr.getNameText());
-        Ptg[] ptg = nr.getNameDefinition();
-        assertEquals(1, ptg.length);
-        ArrayPtg arr = (ArrayPtg)ptg[0];
-        assertEquals(696, arr.getRowCount());
-        assertEquals(1, arr.getColumnCount());
-        Object[][] vals = arr.getTokenArrayValues();
-        assertEquals("1.T20.001", vals[0][0]);
-        assertEquals("1.T20.010", vals[vals.length - 1][0]);
-    }
-
-    public void testBug57923() {
-        NameRecord record = new NameRecord();
-        assertEquals(0, record.getExternSheetNumber());
-        
-        record.setNameDefinition(new Ptg[] {});
-        assertEquals(0, record.getExternSheetNumber());
-        
-        record.setNameDefinition(new Ptg[] {new NamePtg(1)});
-        assertEquals(0, record.getExternSheetNumber());
-
-        record.setNameDefinition(new Ptg[] {new Area3DPtg("area", 1)});
-        assertEquals(1, record.getExternSheetNumber());
-
-        record.setNameDefinition(new Ptg[] {new Ref3DPtg("A1", 1)});
-        assertEquals(1, record.getExternSheetNumber());
-    }
-    
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
deleted file mode 100644
index 5f238f8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the serialization and deserialization of the NoteRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Yegor Kozlov
- */
-public final class TestNoteRecord extends TestCase {
-    private final byte[] testData = HexRead.readFromString(
-            "06 00 01 00 02 00 02 04 " +
-            "1A 00 00 " +
-            "41 70 61 63 68 65 20 53 6F 66 74 77 61 72 65 20 46 6F 75 6E 64 61 74 69 6F 6E " +
-            "00" // padding byte
-            );
-
-    public void testRead() {
-
-        NoteRecord record = new NoteRecord(TestcaseRecordInputStream.create(NoteRecord.sid, testData));
-
-        assertEquals(NoteRecord.sid, record.getSid());
-        assertEquals(6, record.getRow());
-        assertEquals(1, record.getColumn());
-        assertEquals(NoteRecord.NOTE_VISIBLE, record.getFlags());
-        assertEquals(1026, record.getShapeId());
-        assertEquals("Apache Software Foundation", record.getAuthor());
-    }
-
-    public void testWrite() {
-        NoteRecord record = new NoteRecord();
-        assertEquals(NoteRecord.sid, record.getSid());
-        
-        record.setRow((short)6);
-        record.setColumn((short)1);
-        record.setFlags(NoteRecord.NOTE_VISIBLE);
-        record.setShapeId((short)1026);
-        record.setAuthor("Apache Software Foundation");
-
-        byte[] ser = record.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(NoteRecord.sid, testData, ser);
-    }
-
-    public void testClone() {
-        NoteRecord record = new NoteRecord();
-
-        record.setRow((short)1);
-        record.setColumn((short)2);
-        record.setFlags(NoteRecord.NOTE_VISIBLE);
-        record.setShapeId((short)1026);
-        record.setAuthor("Apache Software Foundation");
-
-        NoteRecord cloned = record.clone();
-        assertEquals(record.getRow(), cloned.getRow());
-        assertEquals(record.getColumn(), cloned.getColumn());
-        assertEquals(record.getFlags(), cloned.getFlags());
-        assertEquals(record.getShapeId(), cloned.getShapeId());
-        assertEquals(record.getAuthor(), cloned.getAuthor());
-
-        //finally check that the serialized data is the same
-        byte[] src = record.serialize();
-        byte[] cln = cloned.serialize();
-        assertArrayEquals(src, cln);
-    }
-    
-    public void testUnicodeAuthor() {
-        // This sample data was created by setting the 'user name' field in the 'Personalize' 
-        // section of Excel's options to \u30A2\u30D1\u30C3\u30C1\u65CF, and then 
-        // creating a cell comment.
-        byte[] data = HexRead.readFromString("01 00 01 00 00 00 03 00 " +
-                "05 00 01 " + // len=5, 16bit
-                "A2 30 D1 30 C3 30 C1 30 CF 65 " + // character data 
-                "00 " // padding byte
-                );
-        RecordInputStream in = TestcaseRecordInputStream.create(NoteRecord.sid, data);
-        NoteRecord nr = new NoteRecord(in);
-        if ("\u00A2\u0030\u00D1\u0030\u00C3".equals(nr.getAuthor())) {
-            throw new AssertionFailedError("Identified bug in reading note with unicode author");
-        }
-        assertEquals("\u30A2\u30D1\u30C3\u30C1\u65CF", nr.getAuthor());
-        assertTrue(nr.authorIsMultibyte());
-        
-        byte[] ser = nr.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(NoteRecord.sid, data, ser);
-
-        // Re-check
-        in = TestcaseRecordInputStream.create(ser);
-        nr = new NoteRecord(in);
-        assertEquals("\u30A2\u30D1\u30C3\u30C1\u65CF", nr.getAuthor());
-        assertTrue(nr.authorIsMultibyte());
-        
-        
-        // Change to a non unicode author, will stop being unicode
-        nr.setAuthor("Simple");
-        ser = nr.serialize();
-        in = TestcaseRecordInputStream.create(ser);
-        nr = new NoteRecord(in);
-        
-        assertEquals("Simple", nr.getAuthor());
-        assertFalse(nr.authorIsMultibyte());
-        
-        // Now set it back again
-        nr.setAuthor("Unicode\u1234");
-        ser = nr.serialize();
-        in = TestcaseRecordInputStream.create(ser);
-        nr = new NoteRecord(in);
-        
-        assertEquals("Unicode\u1234", nr.getAuthor());
-        assertTrue(nr.authorIsMultibyte());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
deleted file mode 100644
index 5a4d5c8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the NoteRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Yegor Kozlov
- */
-public final class TestNoteStructureSubRecord extends TestCase {
-    private final byte[] data = new byte[] {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte)0x80, 0x00, 0x00, 0x00,
-        0x00, 0x00, (byte)0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, (byte)0x81, 0x01,
-        (byte)0xCC, (byte)0xEC
-    };
-
-    public void testRead() {
-
-        NoteStructureSubRecord record = new NoteStructureSubRecord(TestcaseRecordInputStream.create(NoteStructureSubRecord.sid, data), data.length);
-
-        assertEquals(NoteStructureSubRecord.sid, record.getSid());
-        assertEquals(data.length, record.getDataSize());
-    }
-
-    public void testWrite() {
-        NoteStructureSubRecord record = new NoteStructureSubRecord();
-        assertEquals(NoteStructureSubRecord.sid, record.getSid());
-        assertEquals(data.length, record.getDataSize());
-
-        byte [] ser = record.serialize();
-        assertEquals(ser.length - 4, data.length);
-
-    }
-
-    public void testClone()
-    {
-        NoteStructureSubRecord record = new NoteStructureSubRecord();
-        byte[] src = record.serialize();
-
-        NoteStructureSubRecord cloned = record.clone();
-        byte[] cln = cloned.serialize();
-
-        assertEquals(record.getDataSize(), cloned.getDataSize());
-        assertArrayEquals(src, cln);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
deleted file mode 100644
index 504180d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the serialization and deserialization of the ObjRecord class works correctly.
- * Test data taken directly from a real Excel file.
- *
- * @author Yegor Kozlov
- */
-public final class TestObjRecord extends TestCase {
-    /**
-     * OBJ record data containing two sub-records.
-     * The data taken directly from a real Excel file.
-     *
-     * [OBJ]
-     *     [ftCmo]
-     *     [ftEnd]
-     */
-    private static final byte[] recdata = HexRead.readFromString(""
-            + "15 00 12 00 06 00 01 00 11 60 "
-            + "F4 02 41 01 14 10 1F 02 00 00 "
-            +"00 00 00 00 00 00"
-            // TODO - this data seems to require two extra bytes padding. not sure where original file is.
-            // it's not bug 38607 attachment 17639
-    );
-
-    /**
-     * Hex dump from
-     * offset 0x2072 in att 22076 of bug 45133
-     */
-    private static final byte[] recdataNeedingPadding = HexRead.readFromString(""
-            + "5D 00 20 00"
-            + "15 00 12 00 00 00 01 00 11 60 00 00 00 00 38 6F CC 03 00 00 00 00 06 00 02 00 00 00 00 00 00 00"
-    );
-
-    public void testLoad() {
-        ObjRecord record = new ObjRecord(TestcaseRecordInputStream.create(ObjRecord.sid, recdata));
-
-        assertEquals(26, record.getRecordSize() - 4);
-
-        List<SubRecord> subrecords = record.getSubRecords();
-        assertEquals(2, subrecords.size() );
-        assertTrue(subrecords.get(0) instanceof CommonObjectDataSubRecord);
-        assertTrue(subrecords.get(1) instanceof EndSubRecord );
-
-    }
-
-    public void testStore() {
-        ObjRecord record = new ObjRecord(TestcaseRecordInputStream.create(ObjRecord.sid, recdata));
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(26, recordBytes.length - 4);
-        byte[] subData = new byte[recdata.length];
-        System.arraycopy(recordBytes, 4, subData, 0, subData.length);
-        assertArrayEquals(recdata, subData);
-    }
-
-    public void testConstruct() {
-        ObjRecord record = new ObjRecord();
-        CommonObjectDataSubRecord ftCmo = new CommonObjectDataSubRecord();
-        ftCmo.setObjectType( CommonObjectDataSubRecord.OBJECT_TYPE_COMMENT);
-        ftCmo.setObjectId( 1024 );
-        ftCmo.setLocked( true );
-        ftCmo.setPrintable( true );
-        ftCmo.setAutofill( true );
-        ftCmo.setAutoline( true );
-        record.addSubRecord(ftCmo);
-        EndSubRecord ftEnd = new EndSubRecord();
-        record.addSubRecord(ftEnd);
-
-        //serialize and read again
-        byte [] recordBytes = record.serialize();
-        //cut off the record header
-        byte [] bytes = new byte[recordBytes.length-4];
-        System.arraycopy(recordBytes, 4, bytes, 0, bytes.length);
-
-        record = new ObjRecord(TestcaseRecordInputStream.create(ObjRecord.sid, bytes));
-        List<SubRecord> subrecords = record.getSubRecords();
-        assertEquals( 2, subrecords.size() );
-        assertTrue( subrecords.get(0) instanceof CommonObjectDataSubRecord);
-        assertTrue( subrecords.get(1) instanceof EndSubRecord );
-    }
-    
-    public void testReadWriteWithPadding_bug45133() {
-        ObjRecord record = new ObjRecord(TestcaseRecordInputStream.create(recdataNeedingPadding));
-        
-        if (record.getRecordSize() == 34) {
-            throw new AssertionFailedError("Identified bug 45133");
-        }
-
-        assertEquals(36, record.getRecordSize());
-
-        List<SubRecord> subrecords = record.getSubRecords();
-        assertEquals(3, subrecords.size() );
-        assertEquals(CommonObjectDataSubRecord.class, subrecords.get(0).getClass());
-        assertEquals(GroupMarkerSubRecord.class, subrecords.get(1).getClass());
-        assertEquals(EndSubRecord.class, subrecords.get(2).getClass());
-    }
-    
-    /**
-     * Check that ObjRecord tolerates and preserves padding to a 4-byte boundary
-     * (normally padding is to a 2-byte boundary).
-     */
-    public void test4BytePadding() {
-        // actual data from file saved by Excel 2007
-        byte[] data = HexRead.readFromString(""
-                + "15 00 12 00  1E 00 01 00  11 60 B4 6D  3C 01 C4 06 "
-                + "49 06 00 00  00 00 00 00  00 00 00 00");
-        // this data seems to have 2 extra bytes of padding more than usual
-        // the total may have been padded to the nearest quad-byte length
-        RecordInputStream in = TestcaseRecordInputStream.create(ObjRecord.sid, data);
-        // check read OK
-        ObjRecord record = new ObjRecord(in);
-        // check that it re-serializes to the same data
-        byte[] ser = record.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(ObjRecord.sid, data, ser);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
deleted file mode 100644
index fce575b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.DVConstraint;
-import org.apache.poi.hssf.usermodel.HSSFDataValidation;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.util.CellRangeAddressList;
-
-import java.io.InputStream;
-
-/**
- * Verify that presence of PLV record doesn't break data
- * validation, bug #53972:
- * https://issues.apache.org/bugzilla/show_bug.cgi?id=53972
- *
- * @author Andrew Novikov
- */
-
-public final class TestPLVRecord extends TestCase {
-    private final static String DV_DEFINITION = "$A$1:$A$5";
-    private final static String XLS_FILENAME = "53972.xls";
-    private final static String SHEET_NAME = "S2";
-
-    public void testPLVRecord() throws Exception {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream(XLS_FILENAME);
-        HSSFWorkbook workbook = new HSSFWorkbook(is);
-
-        CellRangeAddressList cellRange = new CellRangeAddressList(0, 0, 1, 1);
-        DataValidationConstraint constraint = DVConstraint.createFormulaListConstraint(DV_DEFINITION);
-        HSSFDataValidation dataValidation = new HSSFDataValidation(cellRange, constraint);
-
-        // This used to throw an error before
-        try {
-            workbook.getSheet(SHEET_NAME).addValidationData(dataValidation);
-        } catch (IllegalStateException ex) {
-            throw new AssertionFailedError("Identified bug 53972, PLV record breaks addDataValidation()");
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
deleted file mode 100644
index 9fd3c2a..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.poi.hssf.util.HSSFColor;
-import org.junit.Test;
-
-/**
- * Verifies that custom palette editing works correctly
- *
- * @author Brian Sanders (bsanders at risklabs dot com)
- */
-public final class TestPaletteRecord {
-
-    /**
-     * Tests that the default palette matches the constants of HSSFColor
-     */
-    @Test
-    public void testDefaultPalette() {
-        PaletteRecord palette = new PaletteRecord();
-
-        //make sure all the HSSFColor constants match
-        Map<Integer, HSSFColor> colors = HSSFColor.getIndexHash();
-        for (Entry<Integer, HSSFColor> entry : colors.entrySet()) {
-            int index = entry.getKey();
-            HSSFColor c = entry.getValue();
-            short[] rgbTriplet = c.getTriplet();
-            byte[] paletteTriplet = palette.getColor((short) index);
-            String msg = "Expected HSSFColor constant to match PaletteRecord at index 0x"
-                + Integer.toHexString(c.getIndex());
-            assertEquals(msg, rgbTriplet[0], paletteTriplet[0] & 0xff);
-            assertEquals(msg, rgbTriplet[1], paletteTriplet[1] & 0xff);
-            assertEquals(msg, rgbTriplet[2], paletteTriplet[2] & 0xff);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
deleted file mode 100644
index 93d1a1f..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the PaneRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestPaneRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x01, (byte)0x00,
-        (byte)0x02, (byte)0x00,
-        (byte)0x03, (byte)0x00,
-        (byte)0x04, (byte)0x00,
-        (byte)0x02, (byte)0x00,
-    };
-
-    public void testLoad() {
-        PaneRecord record = new PaneRecord(TestcaseRecordInputStream.create(0x41, data));
-
-        assertEquals( (short)1, record.getX());
-        assertEquals( (short)2, record.getY());
-        assertEquals( (short)3, record.getTopRow());
-        assertEquals( (short)4, record.getLeftColumn());
-        assertEquals( PaneRecord.ACTIVE_PANE_LOWER_LEFT, record.getActivePane());
-
-        assertEquals( 14, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        PaneRecord record = new PaneRecord();
-
-        record.setX( (short) 1);
-        record.setY( (short) 2);
-        record.setTopRow( (short) 3);
-        record.setLeftColumn( (short) 4);
-        record.setActivePane( PaneRecord.ACTIVE_PANE_LOWER_LEFT);
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
deleted file mode 100644
index 868cf8e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-/**
- *
- * @author Josh Micich
- */
-public final class TestRecalcIdRecord extends TestCase {
-
-	private static RecalcIdRecord create(byte[] data) {
-		RecordInputStream in = TestcaseRecordInputStream.create(RecalcIdRecord.sid, data);
-		RecalcIdRecord result = new RecalcIdRecord(in);
-		assertEquals(0, in.remaining());
-		return result;
-	}
-	public void testBasicDeserializeReserialize() {
-		
-		byte[] data = HexRead.readFromString(
-				"C1 01" +  // rt
-				"00 00" +  // reserved
-				"1D EB 01 00"); // engine id
-
-		RecalcIdRecord r = create(data);
-		TestcaseRecordInputStream.confirmRecordEncoding(RecalcIdRecord.sid, data, r.serialize());
-	}
-
-	public void testBadFirstField_bug48096() {
-		/**
-		 * Data taken from the sample file referenced in Bugzilla 48096, file offset 0x0D45.
-		 * The apparent problem is that the first data short field has been written with the
-		 * wrong <i>endianness</n>.  Excel seems to ignore whatever value is present in this
-		 * field, and always rewrites it as (C1, 01). POI now does the same.
-		 */
-		byte[] badData  = HexRead.readFromString("C1 01 08 00 01 C1 00 00 00 01 69 61");
-		byte[] goodData = HexRead.readFromString("C1 01 08 00 C1 01 00 00 00 01 69 61");
-
-		RecordInputStream in = TestcaseRecordInputStream.create(badData);
-		RecalcIdRecord r;
-		try {
-			r = new RecalcIdRecord(in);
-		} catch (RecordFormatException e) {
-			if (e.getMessage().equals("expected 449 but got 49409")) {
-				throw new AssertionFailedError("Identified bug 48096");
-			}
-			throw e;
-		}
-		assertEquals(0, in.remaining());
-		assertArrayEquals(r.serialize(), goodData);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
deleted file mode 100644
index 8be6684..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the record factory
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Csaba Nagy (ncsaba at yahoo dot com)
- */
-public final class TestRecordFactory extends TestCase {
-
-
-	/**
-	 * TEST NAME:  Test Basic Record Construction <P>
-	 * OBJECTIVE:  Test that the RecordFactory given the required parameters for know
-	 *             record types can construct the proper record w/values.<P>
-	 * SUCCESS:	Record factory creates the records with the expected values.<P>
-	 * FAILURE:	The wrong records are creates or contain the wrong values <P>
-	 *
-	 */
-	public void testBasicRecordConstruction() {
-		short recType = BOFRecord.sid;
-		byte[]   data	= {
-			0, 6, 5, 0, -2, 28, -51, 7, -55, 64, 0, 0, 6, 1, 0, 0
-		};
-		Record[] record  = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
-
-		assertEquals(BOFRecord.class.getName(),
-					 record[ 0 ].getClass().getName());
-		BOFRecord bofRecord = ( BOFRecord ) record[ 0 ];
-
-		assertEquals(7422, bofRecord.getBuild());
-		assertEquals(1997, bofRecord.getBuildYear());
-		assertEquals(16585, bofRecord.getHistoryBitMask());
-		assertEquals(20, bofRecord.getRecordSize());
-		assertEquals(262, bofRecord.getRequiredVersion());
-		assertEquals(2057, bofRecord.getSid());
-		assertEquals(5, bofRecord.getType());
-		assertEquals(1536, bofRecord.getVersion());
-		recType = MMSRecord.sid;
-		data = new byte[] {
-			0, 0
-		};
-		record  = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
-		assertEquals(MMSRecord.class.getName(),
-					 record[ 0 ].getClass().getName());
-		MMSRecord mmsRecord = ( MMSRecord ) record[ 0 ];
-
-		assertEquals(0, mmsRecord.getAddMenuCount());
-		assertEquals(0, mmsRecord.getDelMenuCount());
-		assertEquals(6, mmsRecord.getRecordSize());
-		assertEquals(193, mmsRecord.getSid());
-	}
-
-	/**
-	 * TEST NAME:  Test Special Record Construction <P>
-	 * OBJECTIVE:  Test that the RecordFactory given the required parameters for
-	 *			 constructing a RKRecord will return a NumberRecord.<P>
-	 * SUCCESS:	Record factory creates the Number record with the expected values.<P>
-	 * FAILURE:	The wrong records are created or contain the wrong values <P>
-	 *
-	 */
-	public void testSpecial() {
-		short recType = RKRecord.sid;
-		byte[] data = {
-			0, 0, 0, 0, 21, 0, 0, 0, 0, 0
-		};
-		Record[] record  = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
-
-		assertEquals(NumberRecord.class.getName(),
-					 record[ 0 ].getClass().getName());
-		NumberRecord numberRecord = ( NumberRecord ) record[ 0 ];
-
-		assertEquals(0, numberRecord.getColumn());
-		assertEquals(18, numberRecord.getRecordSize());
-		assertEquals(0, numberRecord.getRow());
-		assertEquals(515, numberRecord.getSid());
-		assertEquals(0.0, numberRecord.getValue(), 0.001);
-		assertEquals(21, numberRecord.getXFIndex());
-	}
-
-	/**
-	 * TEST NAME:  Test Creating ContinueRecords After Unknown Records From An InputStream <P>
-	 * OBJECTIVE:  Test that the RecordFactory given an InputStream
-	 *             constructs the expected array of records.<P>
-	 * SUCCESS:	Record factory creates the expected records.<P>
-	 * FAILURE:	The wrong records are created or contain the wrong values <P>
-	 */
-	public void testContinuedUnknownRecord() {
-		byte[] data = {
-			0, -1, 0, 0, // an unknown record with 0 length
-			0x3C , 0, 3, 0, 1, 2, 3, // a continuation record with 3 bytes of data
-			0x3C , 0, 1, 0, 4 // one more continuation record with 1 byte of data
-		};
-
-		ByteArrayInputStream bois = new ByteArrayInputStream(data);
-		Record[] records = RecordFactory.createRecords(bois).toArray(new Record[0]);
-		assertEquals("Created record count", 3, records.length);
-		assertEquals("1st record's type",
-					 UnknownRecord.class.getName(),
-					 records[ 0 ].getClass().getName());
-		assertEquals("1st record's sid", (short)-256, records[0].getSid());
-		assertEquals("2nd record's type",
-					 ContinueRecord.class.getName(),
-					 records[ 1 ].getClass().getName());
-		ContinueRecord record = (ContinueRecord) records[1];
-		assertEquals("2nd record's sid", 0x3C, record.getSid());
-		assertEquals("1st data byte", 1, record.getData()[ 0 ]);
-		assertEquals("2nd data byte", 2, record.getData()[ 1 ]);
-		assertEquals("3rd data byte", 3, record.getData()[ 2 ]);
-		assertEquals("3rd record's type",
-					 ContinueRecord.class.getName(),
-					 records[ 2 ].getClass().getName());
-		record = (ContinueRecord) records[2];
-		assertEquals("3nd record's sid", 0x3C, record.getSid());
-		assertEquals("4th data byte", 4, record.getData()[ 0 ]);
-	}
-
-	/**
-	 * Drawing records have a very strange continue behaviour.
-	 * There can actually be OBJ records mixed between the continues.
-	 * Record factory must preserve this structure when reading records.
-	 */
-	public void testMixedContinue() throws Exception {
-		/**
-		 *  Adapted from a real test sample file 39512.xls (Offset 0x4854).
-		 *  See Bug 39512 for details.
-		 */
-		String dump =
-				//OBJ
-				"5D 00 48 00 15 00 12 00 0C 00 3C 00 11 00 A0 2E 03 01 CC 42 " +
-				"CF 00 00 00 00 00 0A 00 0C 00 00 00 00 00 00 00 00 00 00 00 " +
-				"03 00 0B 00 06 00 28 01 03 01 00 00 12 00 08 00 00 00 00 00 " +
-				"00 00 03 00 11 00 04 00 3D 00 00 00 00 00 00 00 " +
-				 //MSODRAWING
-				"EC 00 08 00 00 00 0D F0 00 00 00 00 " +
-				//TXO (and 2 trailing CONTINUE records)
-				"B6 01 12 00 22 02 00 00 00 00 00 00 00 00 10 00 10 00 00 00 00 00 " +
-				"3C 00 11 00 00 4F 70 74 69 6F 6E 20 42 75 74 74 6F 6E 20 33 39 " +
-				"3C 00 10 00 00 00 05 00 00 00 00 00 10 00 00 00 00 00 00 00 " +
-				// another CONTINUE
-				"3C 00 7E 00 0F 00 04 F0 7E 00 00 00 92 0C 0A F0 08 00 00 00 " +
-				"3D 04 00 00 00 0A 00 00 A3 00 0B F0 3C 00 00 00 7F 00 00 01 " +
-				"00 01 80 00 8C 01 03 01 85 00 01 00 00 00 8B 00 02 00 00 00 " +
-				"BF 00 08 00 1A 00 7F 01 29 00 29 00 81 01 41 00 00 08 BF 01 " +
-				"00 00 10 00 C0 01 40 00 00 08 FF 01 00 00 08 00 00 00 10 F0 " +
-				"12 00 00 00 02 00 02 00 A0 03 18 00 B5 00 04 00 30 02 1A 00 " +
-				"00 00 00 00 11 F0 00 00 00 00 " +
-				//OBJ
-				"5D 00 48 00 15 00 12 00 0C 00 3D 00 11 00 8C 01 03 01 C8 59 CF 00 00 " +
-				"00 00 00 0A 00 0C 00 00 00 00 00 00 00 00 00 00 00 03 00 0B 00 06 00 " +
-				"7C 16 03 01 00 00 12 00 08 00 00 00 00 00 00 00 03 00 11 00 04 00 01 " +
-				"00 00 00 00 00 00 00";
-		byte[] data = HexRead.readFromString(dump);
-
-		List records = RecordFactory.createRecords(new ByteArrayInputStream(data));
-		assertEquals(5, records.size());
-		assertTrue(records.get(0) instanceof ObjRecord);
-		assertTrue(records.get(1) instanceof DrawingRecord);
-		assertTrue(records.get(2) instanceof TextObjectRecord);
-		assertTrue(records.get(3) instanceof ContinueRecord);
-		assertTrue(records.get(4) instanceof ObjRecord);
-
-		//serialize and verify that the serialized data is the same as the original
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		for(Iterator it = records.iterator(); it.hasNext(); ){
-			Record rec = (Record)it.next();
-			out.write(rec.serialize());
-		}
-
-		byte[] ser = out.toByteArray();
-		assertEquals(data.length, ser.length);
-		assertArrayEquals(data, ser);
-	}
-
-	public void testNonZeroPadding_bug46987() {
-		Record[] recs = {
-			new BOFRecord(),
-			new WriteAccessRecord(), // need *something* between BOF and EOF
-			EOFRecord.instance,
-			BOFRecord.createSheetBOF(),
-			EOFRecord.instance,
-		};
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		for (Record rec : recs) {
-			try {
-				baos.write(rec.serialize());
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		//simulate the bad padding at the end of the workbook stream in attachment 23483 of bug 46987
-		baos.write(0x00);
-		baos.write(0x11);
-		baos.write(0x00);
-		baos.write(0x02);
-		for (int i = 0; i < 192; i++) {
-			baos.write(0x00);
-		}
-
-
-		POIFSFileSystem fs = new POIFSFileSystem();
-		InputStream is;
-		try {
-			fs.createDocument(new ByteArrayInputStream(baos.toByteArray()), "dummy");
-			is = fs.getRoot().createDocumentInputStream("dummy");
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-
-		List<Record> outRecs;
-		try {
-			outRecs = RecordFactory.createRecords(is);
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("Buffer underrun - requested 512 bytes but 192 was available")) {
-				throw new AssertionFailedError("Identified bug 46987");
-			}
-			throw e;
-		}
-		assertEquals(5, outRecs.size());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
deleted file mode 100644
index 4cfdfcf..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.util.HexRead;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-/**
- * Tests for {@link RecordFactoryInputStream}
- *
- * @author Josh Micich
- */
-public final class TestRecordFactoryInputStream {
-    // to not affect other tests running in the same JVM
-    @After
-    public void resetPassword() {
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-    }
-
-	/**
-	 * Hex dump of a BOF record and most of a FILEPASS record.
-	 * A 16 byte saltHash should be added to complete the second record
-	 */
-	private static final String COMMON_HEX_DATA = ""
-		// BOF
-		+ "09 08 10 00"
-		+ "00 06  05 00  D3 10  CC 07  01 00 00 00  00 06 00 00"
-		// FILEPASS
-		+ "2F 00 36 00"
-		+ "01 00  01 00  01 00"
-		+ "BAADF00D BAADF00D BAADF00D BAADF00D" // docId
-		+ "DEADBEEF DEADBEEF DEADBEEF DEADBEEF" // saltData
-		;
-
-	/**
-	 * Hex dump of a sample WINDOW1 record
-	 */
-	private static final String SAMPLE_WINDOW1 = "3D 00 12 00"
-		+ "00 00 00 00 40 38 55 23 38 00 00 00 00 00 01 00 58 02";
-
-	@Rule
-	public ExpectedException expectedEx = ExpectedException.none();
-
-	
-	/**
-	 * Makes sure that a default password mismatch condition is represented with {@link EncryptedDocumentException}
-	 */
-	@Test
-	public void defaultPasswordWrong() {
-		// This encodng depends on docId, password and stream position
-		final String SAMPLE_WINDOW1_ENCR1 = "3D 00 12 00"
-			+ "C4, 9B, 02, 50, 86, E0, DF, 34, FB, 57, 0E, 8C, CE, 25, 45, E3, 80, 01";
-
-		byte[] dataWrongDefault = HexRead.readFromString(""
-				+ COMMON_HEX_DATA
-				+ "00000000 00000000 00000000 00000001"
-				+ SAMPLE_WINDOW1_ENCR1
-		);
-
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-	    expectedEx.expect(EncryptedDocumentException.class);
-	    expectedEx.expectMessage("Default password is invalid for salt/verifier/verifierHash");
-		createRFIS(dataWrongDefault);
-	}
-	
-    @Test
-    public void defaultPasswordOK() {
-        // This encodng depends on docId, password and stream position
-        final String SAMPLE_WINDOW1_ENCR1 = "3D 00 12 00"
-            + "C4, 9B, 02, 50, 86, E0, DF, 34, FB, 57, 0E, 8C, CE, 25, 45, E3, 80, 01";
-
-        byte[] dataCorrectDefault = HexRead.readFromString(""
-                + COMMON_HEX_DATA
-                + "137BEF04 969A200B 306329DE 52254005" // correct saltHash for default password (and docId/saltHash)
-                + SAMPLE_WINDOW1_ENCR1
-        );
-
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-        RecordFactoryInputStream rfis = createRFIS(dataCorrectDefault);
-        confirmReadInitialRecords(rfis);
-    }
-	
-
-	/**
-	 * Makes sure that an incorrect user supplied password condition is represented with {@link EncryptedDocumentException}
-	 */
-	@Test
-	public void suppliedPasswordWrong() {
-		// This encoding depends on docId, password and stream position
-		final String SAMPLE_WINDOW1_ENCR2 = "3D 00 12 00"
-			+ "45, B9, 90, FE, B6, C6, EC, 73, EE, 3F, 52, 45, 97, DB, E3, C1, D6, FE";
-
-		byte[] dataWrongDefault = HexRead.readFromString(""
-				+ COMMON_HEX_DATA
-				+ "00000000 00000000 00000000 00000000"
-				+ SAMPLE_WINDOW1_ENCR2
-		);
-
-
-		Biff8EncryptionKey.setCurrentUserPassword("passw0rd");
-
-        expectedEx.expect(EncryptedDocumentException.class);
-        expectedEx.expectMessage("Supplied password is invalid for salt/verifier/verifierHash");
-        createRFIS(dataWrongDefault);
-	}
-
-    @Test
-    public void suppliedPasswordOK() {
-        // This encoding depends on docId, password and stream position
-        final String SAMPLE_WINDOW1_ENCR2 = "3D 00 12 00"
-            + "45, B9, 90, FE, B6, C6, EC, 73, EE, 3F, 52, 45, 97, DB, E3, C1, D6, FE";
-
-        Biff8EncryptionKey.setCurrentUserPassword("passw0rd");
-
-        byte[] dataCorrectDefault = HexRead.readFromString(""
-                + COMMON_HEX_DATA
-                + "C728659A C38E35E0 568A338F C3FC9D70" // correct saltHash for supplied password (and docId/saltHash)
-                + SAMPLE_WINDOW1_ENCR2
-        );
-
-        RecordFactoryInputStream rfis = createRFIS(dataCorrectDefault);
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-
-        confirmReadInitialRecords(rfis);
-    }
-	
-	
-	/**
-	 * makes sure the record stream starts with {@link BOFRecord}, {@link FilePassRecord} and then {@link WindowOneRecord}
-	 * The third record is decrypted so this method also checks its content.
-	 */
-	private void confirmReadInitialRecords(RecordFactoryInputStream rfis) {
-		assertEquals(BOFRecord.class, rfis.nextRecord().getClass());
-		FilePassRecord recFP = (FilePassRecord) rfis.nextRecord();
-		WindowOneRecord rec1 = (WindowOneRecord) rfis.nextRecord();
-		assertArrayEquals(HexRead.readFromString(SAMPLE_WINDOW1),rec1.serialize());
-	}
-
-	private static RecordFactoryInputStream createRFIS(byte[] data) {
-		return new RecordFactoryInputStream(new ByteArrayInputStream(data), true);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
deleted file mode 100644
index 518c5f0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.util.HexRead;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link RecordInputStream}
- *
- * @author Josh Micich
- */
-public final class TestRecordInputStream extends TestCase {
-
-	/**
-	 * Data inspired by attachment 22626 of bug 45866<br/>
-	 * A unicode string of 18 chars, with a continue record where the compression flag changes
-	 */
-	private static final String HED_DUMP1 = ""
-			+ "1A 59 00 8A 9E 8A " // 3 uncompressed unicode chars
-			+ "3C 00 " // Continue sid
-			+ "10 00 " // rec size 16 (1+15)
-			+ "00"	// next chunk is compressed
-			+ "20 2D 20 4D 75 6C 74 69 6C 69 6E 67 75 61 6C " // 15 chars
-	;
-	/**
-	 * same string re-arranged
-	 */
-	private static final String HED_DUMP2 = ""
-			// 15 chars at end of current record
-			+ "4D 75 6C 74 69 6C 69 6E 67 75 61 6C 20 2D 20"
-			+ "3C 00 " // Continue sid
-			+ "07 00 " // rec size 7 (1+6)
-			+ "01"	// this bit uncompressed
-			+ "1A 59 00 8A 9E 8A " // 3 uncompressed unicode chars
-	;
-	public void testChangeOfCompressionFlag_bug25866() {
-		byte[] changingFlagSimpleData = HexRead.readFromString(""
-				+ "AA AA "  // fake SID
-				+ "06 00 "  // first rec len 6
-				+ HED_DUMP1
-				);
-		RecordInputStream in = TestcaseRecordInputStream.create(changingFlagSimpleData);
-		String actual;
-		try {
-			actual = in.readUnicodeLEString(18);
-		} catch (IllegalArgumentException e) {
-			if ("compressByte in continue records must be 1 while reading unicode LE string".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 45866");
-			}
-				
-			throw e;
-		}
-		assertEquals("\u591A\u8A00\u8A9E - Multilingual", actual);
-	}
-
-	public void testChangeFromUnCompressedToCompressed() {
-		byte[] changingFlagSimpleData = HexRead.readFromString(""
-				+ "AA AA "  // fake SID
-				+ "0F 00 "  // first rec len 15
-				+ HED_DUMP2
-				);
-		RecordInputStream in = TestcaseRecordInputStream.create(changingFlagSimpleData);
-		String actual = in.readCompressedUnicode(18);
-		assertEquals("Multilingual - \u591A\u8A00\u8A9E", actual);
-	}
-	
-	public void testReadString() {
-		byte[] changingFlagFullData = HexRead.readFromString(""
-				+ "AA AA "  // fake SID
-				+ "12 00 "  // first rec len 18 (15 + next 3 bytes)
-				+ "12 00 "  // total chars 18
-				+ "00 "	 // this bit compressed
-				+ HED_DUMP2
-				);
-		RecordInputStream in = TestcaseRecordInputStream.create(changingFlagFullData);
-		String actual = in.readString();
-		assertEquals("Multilingual - \u591A\u8A00\u8A9E", actual);
-	}
-
-	public void testLeftoverDataException() {
-	    // just ensure that the exception is created correctly, even with unknown sids
-	    new RecordInputStream.LeftoverDataException(1, 200);
-	    new RecordInputStream.LeftoverDataException(0, 200);
-        new RecordInputStream.LeftoverDataException(999999999, 200);
-	    new RecordInputStream.LeftoverDataException(HeaderRecord.sid, 200);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
deleted file mode 100644
index 335b660..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the SCLRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
- */
-public final class TestSCLRecord extends TestCase {
-    byte[] data = new byte[] {
-      (byte)0x3,(byte)0x0,(byte)0x4,(byte)0x0
-    };
-
-    public void testLoad() {
-        SCLRecord record = new SCLRecord(TestcaseRecordInputStream.create(0xa0, data));
-        assertEquals( 3, record.getNumerator());
-        assertEquals( 4, record.getDenominator());
-
-        assertEquals( 8, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        SCLRecord record = new SCLRecord();
-        record.setNumerator( (short)3 );
-        record.setDenominator( (short)4 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java
deleted file mode 100644
index c779711..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.IntMapper;
-import org.junit.Test;
-
-/**
- * Exercise the SSTDeserializer class.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSSTDeserializer {
-	private static final int FAKE_SID = -5555;
-
-    private static byte[] concat(byte[] a, byte[] b) {
-        byte[] result = new byte[a.length + b.length];
-        System.arraycopy(a, 0, result, 0, a.length);
-        System.arraycopy(b, 0, result, a.length, b.length);
-        return result;
-    }
-    
-    private static byte[] readSampleHexData(String sampleFileName, String sectionName, int recSid)
-    throws IOException {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-        byte[] data = HexRead.readData(is, sectionName);
-        byte[] result = TestcaseRecordInputStream.mergeDataAndSid(recSid, data.length, data);
-        is.close();
-        return result;
-    }
-
-    @Test
-    public void testSpanRichTextToPlainText() throws IOException {
-        byte[] header = readSampleHexData("richtextdata.txt", "header", FAKE_SID);
-        byte[] continueBytes = readSampleHexData("richtextdata.txt", "continue1", ContinueRecord.sid);
-        RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes));
-      
-
-        IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>();
-        SSTDeserializer deserializer = new SSTDeserializer( strings );
-        deserializer.manufactureStrings(1, in );
-
-        assertEquals( "At a dinner party orAt At At ", strings.get( 0 ) + "" );
-    }
-
-    @Test
-    public void testContinuationWithNoOverlap() throws IOException {
-        byte[] header = readSampleHexData("evencontinuation.txt", "header", FAKE_SID);
-        byte[] continueBytes = readSampleHexData("evencontinuation.txt", "continue1", ContinueRecord.sid);
-        RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes));
-
-        IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>();
-        SSTDeserializer deserializer = new SSTDeserializer( strings );
-        deserializer.manufactureStrings( 2, in);
-
-        assertEquals( "At a dinner party or", strings.get( 0 ) + "" );
-        assertEquals( "At a dinner party", strings.get( 1 ) + "" );
-    }
-
-    /**
-     * Strings can actually span across more than one continuation.
-     */
-    @Test
-    public void testStringAcross2Continuations() throws IOException {
-        byte[] header = readSampleHexData("stringacross2continuations.txt", "header", FAKE_SID);
-        byte[] continue1 = readSampleHexData("stringacross2continuations.txt", "continue1", ContinueRecord.sid);
-        byte[] continue2 = readSampleHexData("stringacross2continuations.txt", "continue2", ContinueRecord.sid);
-        
-        RecordInputStream in = TestcaseRecordInputStream.create(concat(header, concat(continue1, continue2)));
-
-        IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>();
-        SSTDeserializer deserializer = new SSTDeserializer( strings );
-        deserializer.manufactureStrings( 2, in);
-
-        assertEquals( "At a dinner party or", strings.get(  0 ) + "" );
-        assertEquals( "At a dinner partyAt a dinner party", strings.get( 1 ) + "" );
-    }
-
-    @Test
-    public void testExtendedStrings() throws IOException {
-        byte[] header = readSampleHexData("extendedtextstrings.txt", "rich-header", FAKE_SID);
-        byte[] continueBytes = readSampleHexData("extendedtextstrings.txt", "rich-continue1", ContinueRecord.sid);
-        RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes));
-        
-        IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>();
-        SSTDeserializer deserializer = new SSTDeserializer( strings );
-        deserializer.manufactureStrings( 1, in);
-
-        assertEquals( "At a dinner party orAt At At ", strings.get( 0  ) + "" );
-
-
-        header = readSampleHexData("extendedtextstrings.txt", "norich-header", FAKE_SID);
-        continueBytes = readSampleHexData("extendedtextstrings.txt", "norich-continue1", ContinueRecord.sid);
-        in = TestcaseRecordInputStream.create(concat(header, continueBytes));
-        
-        strings = new IntMapper<UnicodeString>();
-        deserializer = new SSTDeserializer( strings );
-        deserializer.manufactureStrings( 1, in);
-
-        assertEquals( "At a dinner party orAt At At ", strings.get( 0 ) + "" );
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
deleted file mode 100644
index cd98ee0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
+++ /dev/null
@@ -1,1523 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * @author Marc Johnson (mjohnson at apache dot org)
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSSTRecord {
-
-    /**
-     * decodes hexdump files and concatenates the results
-     * @param hexDumpFileNames names of sample files in the hssf test data directory
-     * @throws IOException 
-     */
-    private static byte[] concatHexDumps(String... hexDumpFileNames) throws IOException {
-        int nFiles = hexDumpFileNames.length;
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(nFiles * 8228);
-        for (int i = 0; i < nFiles; i++) {
-            String sampleFileName = hexDumpFileNames[i];
-            InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-            BufferedReader br = new BufferedReader(new InputStreamReader(is, LocaleUtil.CHARSET_1252));
-
-            while (true) {
-                String line = br.readLine();
-                if (line == null) {
-                    break;
-                }
-                baos.write(HexRead.readFromString(line));
-            }
-            is.close();
-        }
-
-        return baos.toByteArray();
-    }
-
-    /**
-     * @param rawData serialization of one {@link SSTRecord} and zero or more {@link ContinueRecord}s
-     */
-    private static SSTRecord createSSTFromRawData(byte[] rawData) {
-        RecordInputStream in = new RecordInputStream(new ByteArrayInputStream(rawData));
-        in.nextRecord();
-        SSTRecord result = new SSTRecord(in);
-        assertEquals(0, in.remaining());
-        assertTrue(!in.hasNextRecord());
-        return result;
-    }
-
-    /**
-     * SST is often split over several {@link ContinueRecord}s
-     * @throws IOException 
-     */
-    @Test
-    public void testContinuedRecord() throws IOException {
-        byte[] origData;
-        SSTRecord record;
-        byte[] ser_output;
-
-        origData = concatHexDumps("BigSSTRecord", "BigSSTRecordCR");
-        record = createSSTFromRawData(origData);
-        assertEquals( 1464, record.getNumStrings() );
-        assertEquals( 688, record.getNumUniqueStrings() );
-        assertEquals( 688, record.countStrings() );
-        ser_output = record.serialize();
-        assertArrayEquals(origData, ser_output);
-
-        // testing based on new bug report
-        origData = concatHexDumps("BigSSTRecord2", "BigSSTRecord2CR1", "BigSSTRecord2CR2", "BigSSTRecord2CR3",
-                "BigSSTRecord2CR4", "BigSSTRecord2CR5", "BigSSTRecord2CR6", "BigSSTRecord2CR7");
-        record = createSSTFromRawData(origData);
-
-
-        assertEquals( 158642, record.getNumStrings() );
-        assertEquals( 5249, record.getNumUniqueStrings() );
-        assertEquals( 5249, record.countStrings() );
-        ser_output = record.serialize();
-//        if (false) { // set true to observe make sure areSameSSTs() is working
-//            ser_output[11000] = 'X';
-//        }
-
-        SSTRecord rec2 = createSSTFromRawData(ser_output);
-        if (!areSameSSTs(record, rec2)) {
-            throw new AssertionFailedError("large SST re-serialized incorrectly");
-        }
-//        if (false) {
-//            // TODO - trivial differences in ContinueRecord break locations
-//            // Sample data should be checked against what most recent Excel version produces.
-//            // maybe tweaks are required in ContinuableRecordOutput
-//            assertArrayEquals(origData, ser_output);
-//        }
-    }
-
-    private boolean areSameSSTs(SSTRecord a, SSTRecord b) {
-
-        if (a.getNumStrings() != b.getNumStrings()) {
-            return false;
-        }
-        int nElems = a.getNumUniqueStrings();
-        if (nElems != b.getNumUniqueStrings()) {
-            return false;
-        }
-        for(int i=0; i<nElems; i++) {
-            if (!a.getString(i).equals(b.getString(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Test capability of handling mondo big strings
-     *
-     * @exception IOException
-     */
-    @Test
-    public void testHugeStrings() {
-        SSTRecord record = new SSTRecord();
-        byte[][] bstrings =
-                {
-                    new byte[9000], new byte[7433], new byte[9002],
-                    new byte[16998]
-                };
-        UnicodeString[] strings = new UnicodeString[bstrings.length];
-        int total_length = 0;
-
-        for ( int k = 0; k < bstrings.length; k++ )
-        {
-            Arrays.fill( bstrings[k], (byte) ( 'a' + k ) );
-            strings[k] = new UnicodeString( new String(bstrings[k], LocaleUtil.CHARSET_1252) );
-            record.addString( strings[k] );
-            total_length += 3 + bstrings[k].length;
-        }
-
-        // add overhead of SST record
-        total_length += 8;
-
-        // add overhead of broken strings
-        total_length += 4;
-
-        // add overhead of six records
-        total_length += ( 6 * 4 );
-        byte[] content = new byte[record.getRecordSize()];
-
-        record.serialize( 0, content );
-        assertEquals( total_length, content.length );
-
-        //Deserialize the record.
-        RecordInputStream recStream = new RecordInputStream(new ByteArrayInputStream(content));
-        recStream.nextRecord();
-        record = new SSTRecord(recStream);
-
-        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 ) );
-        }
-        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 )
-            {
-                Arrays.fill( bstrings[k], (byte) ( 'a' + k ) );
-                strings[k] = new UnicodeString( new String(bstrings[k], LocaleUtil.CHARSET_1252) );
-            }
-            else
-            {
-                char[] data = new char[bstrings[k].length / 2];
-
-                Arrays.fill( data, (char) ( '\u2122' + k ) );
-                strings[k] = new UnicodeString(new String( data ));
-            }
-            record.addString( strings[k] );
-        }
-        content = new byte[record.getRecordSize()];
-        record.serialize( 0, content );
-        total_length--;
-        assertEquals( total_length, content.length );
-
-        recStream = new RecordInputStream(new ByteArrayInputStream(content));
-        recStream.nextRecord();
-        record = new SSTRecord(recStream);
-
-        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 ) );
-        }
-    }
-
-    /**
-     * test SSTRecord boundary conditions
-     */
-    @Test
-    public void testSSTRecordBug() {
-        // create an SSTRecord and write a certain pattern of strings
-        // to it ... then serialize it and verify the content
-        SSTRecord record = new SSTRecord();
-
-        // 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( new UnicodeString("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++ )
-        {
-            record.addString( new UnicodeString(String.valueOf( testvalue++ )) );
-        }
-        byte[] content = new byte[record.getRecordSize()];
-
-        record.serialize( 0, content );
-        assertEquals(8224, LittleEndian.getShort(content, 2));
-        assertEquals(ContinueRecord.sid, LittleEndian.getShort(content, 8228));
-        assertEquals(8224, LittleEndian.getShort(content, 8228+2));
-        assertEquals( (byte) 13, content[4 + 8228] );
-        assertEquals(ContinueRecord.sid, LittleEndian.getShort(content, 2*8228));
-        assertEquals(8224, LittleEndian.getShort(content, 8228*2+2));
-        assertEquals( (byte) 13, content[4 + 8228 * 2] );
-        assertEquals(ContinueRecord.sid, LittleEndian.getShort(content, 3*8228));
-        assertEquals( (byte) 13, content[4 + 8228 * 3] );
-    }
-
-    /**
-     * test simple addString
-     */
-    @Test
-    public void testSimpleAddString() {
-        SSTRecord record = new SSTRecord();
-        UnicodeString s1 = new UnicodeString("Hello world");
-
-        // \u2122 is the encoding of the trademark symbol ...
-        UnicodeString s2 = new UnicodeString("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() );
-        Iterator<UnicodeString> iter = record.getStrings();
-
-        while ( iter.hasNext() ) {
-            UnicodeString ucs = iter.next();
-
-            if ( ucs.equals( s1 ) )
-            {
-                assertEquals( (byte) 0, ucs.getOptionFlags() );
-            }
-            else if ( ucs.equals( s2 ) )
-            {
-                assertEquals( (byte) 1, ucs.getOptionFlags() );
-            }
-            else
-            {
-                fail( "cannot match string: " + ucs.getString() );
-            }
-        }
-    }
-
-    /**
-     * test simple constructor
-     */
-    @Test
-    public void testSimpleConstructor() {
-        SSTRecord record = new SSTRecord();
-
-        assertEquals( 0, record.getNumStrings() );
-        assertEquals( 0, record.getNumUniqueStrings() );
-        assertEquals( 0, record.countStrings() );
-        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
-                };
-
-        assertEquals( expected.length, output.length );
-        for ( int k = 0; k < expected.length; k++ )
-        {
-            assertEquals( String.valueOf( k ), expected[k], output[k] );
-        }
-    }
-
-    /**
-     * Tests that workbooks with rich text that duplicates a non rich text cell can be read and written.
-     */
-    @Test
-    public void testReadWriteDuplicatedRichText1() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("duprich1.xls");
-        HSSFSheet sheet = wb.getSheetAt( 1 );
-        assertEquals( "01/05 (Wed)", sheet.getRow( 0 ).getCell(8 ).getStringCellValue() );
-        assertEquals( "01/05 (Wed)", sheet.getRow( 1 ).getCell(8 ).getStringCellValue() );
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb).close();
-        
-        wb.close();
-
-        // test the second file.
-        wb = HSSFTestDataSamples.openSampleWorkbook("duprich2.xls");
-        sheet = wb.getSheetAt( 0 );
-        int row = 0;
-        assertEquals( "Testing", sheet.getRow( row++ ).getCell(0 ).getStringCellValue() );
-        assertEquals( "rich", sheet.getRow( row++ ).getCell(0 ).getStringCellValue() );
-        assertEquals( "text", sheet.getRow( row++ ).getCell(0 ).getStringCellValue() );
-        assertEquals( "strings", sheet.getRow( row++ ).getCell(0 ).getStringCellValue() );
-        assertEquals( "Testing", sheet.getRow( row++ ).getCell(0 ).getStringCellValue() );
-        assertEquals( "Testing", sheet.getRow( row++ ).getCell(0 ).getStringCellValue() );
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    /**
-     * hex dump from UnicodeStringFailCase1.xls atatched to Bugzilla 50779
-     */
-    private static final String data_50779_1 =
-            //Offset=0x00000612(1554) recno=71 sid=0x00FC size=0x2020(8224)
-            "      FC 00 20 20 51 00 00 00 51 00 00 00 32 00" +
-            "05 10 00 00 00 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 30 00 31 00 01 00 0C 00 05 00 35" +
-            "00 00 00 00 00 00 00 4B 30 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 30 00 32 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 30 00 33 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 30 00 34 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 30 00 35 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 30 00 36 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 30" +
-            "00 37 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 30 00 38 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 30 00 39" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 31 00 30 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 31 00 31 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 31 00 32 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 31 00 33 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "31 00 34 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 31 00 35 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 31 00" +
-            "36 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 31 00 37 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 31 00 38 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 31 00 39 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 32 00 30 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 32 00 31 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 32 00 32 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 32" +
-            "00 33 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 32 00 34 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 32 00 35" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 32 00 36 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 32 00 37 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 32 00 38 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 32 00 39 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "33 00 30 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 33 00 31 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 33 00" +
-            "32 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 33 00 33 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 33 00 34 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 33 00 35 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 33 00 36 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 33 00 37 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 33 00 38 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 33" +
-            "00 39 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 34 00 30 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 34 00 31" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 34 00 32 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 34 00 33 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 34 00 34 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 34 00 35 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "34 00 36 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 34 00 37 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 34 00" +
-            "38 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 34 00 39 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 35 00 30 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 35 00 31 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 35 00 32 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 35 00 33 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 35 00 34 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 35" +
-            "00 35 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 35 00 36 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 35 00 37" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 35 00 38 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 35 00 39 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 36 00 30 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 36 00 31 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "36 00 32 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 36 00 33 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 36 00" +
-            "34 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 36 00 35 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 36 00 36 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 36 00 37 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 36 00 38 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 36 00 39 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 37 00 30 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 37" +
-            "00 31 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 37 00 32 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 37 00 33" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 37 00 34 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 37 00 35 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 37 00 36 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 37 00 37 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "37 00 38 00 1F 00 05 B8 00 00 00 17 53 77 6D 53" +
-            "90 52 97 EE 68 0C 77 A9 5C 4B 62 0C 77 8F 79 F6" +
-            "5C 0C 77 03 68 28 67 0C 77 FC 57 89 73 0C 77 71" +
-            "67 AC 4E FD 90 43 53 49 84 0C 77 5E 79 48 59 DD" +
-            "5D 0C 77 77 95 CE 91 0C 77 01 00 B4 00 05 00 35" +
-            "00 0A 00 37 00 37 00 DB 30 C3 30 AB 30 A4 30 C9" +
-            "30 A6 30 A2 30 AA 30 E2 30 EA 30 B1 30 F3 30 A4" +
-            "30 EF 30 C6 30 B1 30 F3 30 D5 30 AF 30 B7 30 DE" +
-            "30 B1 30 F3 30 C8 30 C1 30 AE 30 B1 30 F3 30 B5" +
-            "30 A4 30 BF 30 DE 30 B1 30 F3 30 C8 30 A6 30 AD" +
-            "30 E7 30 A6 30 C8                              " +
-
-            // Offset=0x00002636(9782) recno=72 sid=0x003C size=0x0151(337)
-            "                  3C 00 51 01 30 C1 30 D0 30 B1" +
-            "30 F3 30 AB 30 CA 30 AC 30 EF 30 B1 30 F3 30 CA" +
-            "30 AC 30 CE 30 B1 30 F3 30 00 00 00 00 03 00 06" +
-            "00 03 00 03 00 0C 00 06 00 03 00 11 00 09 00 03" +
-            "00 17 00 0C 00 03 00 1C 00 0F 00 03 00 22 00 12" +
-            "00 03 00 28 00 15 00 03 00 2C 00 18 00 04 00 32" +
-            "00 1C 00 03 00 32 00 05 10 00 00 00 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 37 00 39 00" +
-            "01 00 0C 00 05 00 35 00 00 00 00 00 00 00 00 00" +
-            "32 00 05 10 00 00 00 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 38 00 30 00 01 00 0C 00 05" +
-            "00 35 00 00 00 00 00 00 00 4B 30               ";
-
-
-    /**
-     * hex dump from UnicodeStringFailCase2.xls atatched to Bugzilla 50779
-     */
-    private static final String data_50779_2 =
-            //"Offset=0x00000612(1554) recno=71 sid=0x00FC size=0x2020(8224)\n" +
-            "      FC 00 20 20 51 00 00 00 51 00 00 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 30 00 31 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 30 00 32 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 30" +
-            "00 33 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 30 00 34 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 30 00 35" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 30 00 36 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 30 00 37 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 30 00 38 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 30 00 39 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "31 00 30 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 31 00 31 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 31 00" +
-            "32 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 31 00 33 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 31 00 34 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 31 00 35 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 31 00 36 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 31 00 37 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 31 00 38 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 31" +
-            "00 39 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 32 00 30 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 32 00 31" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 32 00 32 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 32 00 33 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 32 00 34 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 32 00 35 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "32 00 36 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 32 00 37 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 32 00" +
-            "38 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 32 00 39 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 33 00 30 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 33 00 31 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 33 00 32 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 33 00 33 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 33 00 34 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 33" +
-            "00 35 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 33 00 36 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 33 00 37" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 33 00 38 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 33 00 39 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 34 00 30 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 34 00 31 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "34 00 32 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 34 00 33 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 34 00" +
-            "34 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 34 00 35 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 34 00 36 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 34 00 37 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 34 00 38 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 34 00 39 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 35 00 30 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 35" +
-            "00 31 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 35 00 32 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 35 00 33" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 35 00 34 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 35 00 35 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 35 00 36 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 35 00 37 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "35 00 38 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 35 00 39 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 36 00" +
-            "30 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 36 00 31 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 36 00 32 00" +
-            "32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 36 00 33 00 32 00 01 42 30 44 30 46 30" +
-            "48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30" +
-            "57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30" +
-            "68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30" +
-            "75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30" +
-            "84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30" +
-            "8F 30 92 30 93 30 30 00 30 00 36 00 34 00 32 00" +
-            "01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F" +
-            "30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F" +
-            "30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D" +
-            "30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F" +
-            "30 80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A" +
-            "30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30" +
-            "00 36 00 35 00 32 00 01 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 36 00 36 00 32 00 01 42" +
-            "30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51" +
-            "30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61" +
-            "30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E" +
-            "30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80" +
-            "30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B" +
-            "30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 36" +
-            "00 37 00 32 00 01 42 30 44 30 46 30 48 30 4A 30" +
-            "4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30" +
-            "5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30" +
-            "6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30" +
-            "7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30" +
-            "88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30" +
-            "93 30 30 00 30 00 36 00 38 00 32 00 01 42 30 44" +
-            "30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53" +
-            "30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64" +
-            "30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F" +
-            "30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81" +
-            "30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C" +
-            "30 8D 30 8F 30 92 30 93 30 30 00 30 00 36 00 39" +
-            "00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B 30" +
-            "4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30" +
-            "5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30" +
-            "6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30" +
-            "7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30" +
-            "89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30" +
-            "30 00 30 00 37 00 30 00 32 00 01 42 30 44 30 46" +
-            "30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55" +
-            "30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66" +
-            "30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72" +
-            "30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82" +
-            "30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D" +
-            "30 8F 30 92 30 93 30 30 00 30 00 37 00 31 00 32" +
-            "00 01 42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30" +
-            "4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D 30" +
-            "5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30" +
-            "6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30" +
-            "7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89 30" +
-            "8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00" +
-            "30 00 37 00 32 00 32 00 01 42 30 44 30 46 30 48" +
-            "30 4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57" +
-            "30 59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68" +
-            "30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75" +
-            "30 78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84" +
-            "30 86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F" +
-            "30 92 30 93 30 30 00 30 00 37 00 33 00 32 00 01" +
-            "42 30 44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30" +
-            "51 30 53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30" +
-            "61 30 64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30" +
-            "6E 30 6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30" +
-            "80 30 81 30 82 30 84 30 86 30 88 30 89 30 8A 30" +
-            "8B 30 8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00" +
-            "37 00 34 00 32 00 01 42 30 44 30 46 30 48 30 4A" +
-            "30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30 59" +
-            "30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A" +
-            "30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78" +
-            "30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30 86" +
-            "30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92" +
-            "30 93 30 30 00 30 00 37 00 35 00 32 00 01 42 30" +
-            "44 30 46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30" +
-            "53 30 55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30" +
-            "64 30 66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30" +
-            "6F 30 72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30" +
-            "81 30 82 30 84 30 86 30 88 30 89 30 8A 30 8B 30" +
-            "8C 30 8D 30 8F 30 92 30 93 30 30 00 30 00 37 00" +
-            "36 00 32 00 01 42 30 44 30 46 30 48 30 4A 30 4B" +
-            "30 4D 30 4F 30 51 30 53 30 55 30 57 30 59 30 5B" +
-            "30 5D 30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B" +
-            "30 6C 30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B" +
-            "30 7E 30 7F 30 80 30 81 30 82 30 84 30 86 30 88" +
-            "30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93" +
-            "30 30 00 30 00 37 00 37 00 32 00 01 42 30 44 30" +
-            "46 30 48 30 4A 30 4B 30 4D 30 4F 30 51 30 53 30" +
-            "55 30 57 30 59 30 5B 30 5D 30 5F 30 61 30 64 30" +
-            "66 30 68 30 6A 30 6B 30 6C 30 6D 30 6E 30 6F 30" +
-            "72 30 75 30 78 30 7B 30 7E 30 7F 30 80 30 81 30" +
-            "82 30 84 30 86 30 88 30 89 30 8A 30 8B 30 8C 30" +
-            "8D 30 8F 30 92 30 93 30 30 00 30 00 37 00 38 00" +
-            "18 00 05 96 00 00 00 17 53 77 6D 53 90 52 97 EE" +
-            "68 0C 77 A9 5C 4B 62 0C 77 8F 79 F6 5C 0C 77 03" +
-            "68 28 67 0C 77 FC 57 89 73 0C 77 71 67 AC 4E FD" +
-            "90 43 53 49 84 0C 77 01 00 92 00 05 00 35 00 08" +
-            "00 2C 00 2C 00 DB 30 C3 30 AB 30 A4 30 C9 30 A6" +
-            "30 A2 30 AA 30 E2 30 EA 30 B1 30 F3 30 A4 30 EF" +
-            "30 C6 30 B1 30 F3 30 D5 30 AF 30 B7 30 DE 30 B1" +
-            "30 F3 30 C8 30 C1 30 AE 30 B1 30 F3 30 B5 30 A4" +
-            "30 BF 30 DE 30 B1 30 F3 30 C8 30 A6 30 AD 30 E7" +
-            "30 A6 30 C8 30 C1 30 D0 30 B1 30 F3 30 00 00 00" +
-            "00 03 00 06 00 03 00 03 00 0C 00 06 00 03 00 11" +
-            "00 09 00 03 00 17                              " +
-
-            //Offset=0x00002636(9782) recno=72 sid=0x003C size=0x010D(269)
-            "                  3C 00 0D 01 00 0C 00 03 00 1C" +
-            "00 0F 00 03 00 22 00 12 00 03 00 28 00 15 00 03" +
-            "00 32 00 05 10 00 00 00 42 30 44 30 46 30 48 30" +
-            "4A 30 4B 30 4D 30 4F 30 51 30 53 30 55 30 57 30" +
-            "59 30 5B 30 5D 30 5F 30 61 30 64 30 66 30 68 30" +
-            "6A 30 6B 30 6C 30 6D 30 6E 30 6F 30 72 30 75 30" +
-            "78 30 7B 30 7E 30 7F 30 80 30 81 30 82 30 84 30" +
-            "86 30 88 30 89 30 8A 30 8B 30 8C 30 8D 30 8F 30" +
-            "92 30 93 30 30 00 30 00 37 00 39 00 01 00 0C 00" +
-            "05 00 35 00 00 00 00 00 00 00 00 00 32 00 05 10" +
-            "00 00 00 42 30 44 30 46 30 48 30 4A 30 4B 30 4D" +
-            "30 4F 30 51 30 53 30 55 30 57 30 59 30 5B 30 5D" +
-            "30 5F 30 61 30 64 30 66 30 68 30 6A 30 6B 30 6C" +
-            "30 6D 30 6E 30 6F 30 72 30 75 30 78 30 7B 30 7E" +
-            "30 7F 30 80 30 81 30 82 30 84 30 86 30 88 30 89" +
-            "30 8A 30 8B 30 8C 30 8D 30 8F 30 92 30 93 30 30" +
-            "00 30 00 38 00 30 00 01 00 0C 00 05 00 35 00 00" +
-            "00 00 00 00 00 4B 30                           ";
-
-
-    /**
-     * deep comparison of two SST records
-     */
-    private static void assertRecordEquals(SSTRecord expected, SSTRecord actual){
-        assertEquals("number of strings", expected.getNumStrings(), actual.getNumStrings());
-        assertEquals("number of unique strings", expected.getNumUniqueStrings(), actual.getNumUniqueStrings());
-        assertEquals("count of strings", expected.countStrings(), actual.countStrings());
-        for ( int k = 0; k < expected.countStrings(); k++ ) {
-            org.apache.poi.hssf.record.common.UnicodeString us1 = expected.getString(k);
-            org.apache.poi.hssf.record.common.UnicodeString us2 = actual.getString(k);
-
-            assertTrue("String at idx=" + k, us1.equals(us2));
-        }
-    }
-    
-    @Test
-    public void test50779_1(){
-        byte[] bytes = HexRead.readFromString(data_50779_1);
-
-        RecordInputStream in = TestcaseRecordInputStream.create(bytes);
-        assertEquals(SSTRecord.sid, in.getSid());
-        SSTRecord src = new SSTRecord(in);
-        assertEquals(81, src.getNumStrings());
-
-        byte[] serialized = src.serialize();
-
-        in = TestcaseRecordInputStream.create(serialized);
-        assertEquals(SSTRecord.sid, in.getSid());
-        SSTRecord dst = new SSTRecord(in);
-        assertEquals(81, dst.getNumStrings());
-
-        assertRecordEquals(src, dst);
-    }
-
-    @Test
-    public void test50779_2() {
-        byte[] bytes = HexRead.readFromString(data_50779_2);
-
-        RecordInputStream in = TestcaseRecordInputStream.create(bytes);
-        assertEquals(SSTRecord.sid, in.getSid());
-        SSTRecord src = new SSTRecord(in);
-        assertEquals(81, src.getNumStrings());
-
-        byte[] serialized = src.serialize();
-
-        in = TestcaseRecordInputStream.create(serialized);
-        assertEquals(SSTRecord.sid, in.getSid());
-        SSTRecord dst = new SSTRecord(in);
-        assertEquals(81, dst.getNumStrings());
-
-        assertRecordEquals(src, dst);
-    }
-
-    @Test
-    public void test57456() {
-        byte[] bytes = HexRead.readFromString("FC, 00, 08, 00, 00, 00, 00, 00, E1, 06, 00, 00");
-        RecordInputStream in = TestcaseRecordInputStream.create(bytes);
-        assertEquals(SSTRecord.sid, in.getSid());
-        SSTRecord src = new SSTRecord(in);
-        assertEquals(0, src.getNumStrings());
-        assertEquals(0, src.getNumUniqueStrings());
-        
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
deleted file mode 100644
index 80380ac..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.util.IntMapper;
-
-/**
- * Tests that records size calculates correctly.
- * 
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSSTRecordSizeCalculator extends TestCase {
-	private static final String SMALL_STRING = "Small string";
-	private static final int COMPRESSED_PLAIN_STRING_OVERHEAD = 3;
-	private static final int OPTION_FIELD_SIZE = 1;
-	
-	private final IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>();
-
-	private void confirmSize(int expectedSize) {
-		ContinuableRecordOutput cro = ContinuableRecordOutput.createForCountingOnly();
-		SSTSerializer ss = new SSTSerializer(strings, 0, 0);
-		ss.serialize(cro);
-		assertEquals(expectedSize, cro.getTotalSize());
-	}
-
-	public void testBasic() {
-		strings.add(makeUnicodeString(SMALL_STRING));
-		confirmSize(SSTRecord.SST_RECORD_OVERHEAD
-				+ COMPRESSED_PLAIN_STRING_OVERHEAD
-				+ SMALL_STRING.length());
-	}
-
-	public void testBigStringAcrossUnicode() {
-		int bigString = SSTRecord.MAX_DATA_SPACE + 100;
-		strings.add(makeUnicodeString(bigString));
-		confirmSize(SSTRecord.SST_RECORD_OVERHEAD
-				+ COMPRESSED_PLAIN_STRING_OVERHEAD
-				+ SSTRecord.MAX_DATA_SPACE
-				+ SSTRecord.STD_RECORD_OVERHEAD
-				+ OPTION_FIELD_SIZE
-				+ 100);
-	}
-
-	public void testPerfectFit() {
-		int perfectFit = SSTRecord.MAX_DATA_SPACE - COMPRESSED_PLAIN_STRING_OVERHEAD;
-		strings.add(makeUnicodeString(perfectFit));
-		confirmSize(SSTRecord.SST_RECORD_OVERHEAD
-				+ COMPRESSED_PLAIN_STRING_OVERHEAD
-				+ perfectFit);
-	}
-
-	public void testJustOversized() {
-		int tooBig = SSTRecord.MAX_DATA_SPACE - COMPRESSED_PLAIN_STRING_OVERHEAD + 1;
-		strings.add(makeUnicodeString(tooBig));
-		confirmSize(SSTRecord.SST_RECORD_OVERHEAD
-				+ COMPRESSED_PLAIN_STRING_OVERHEAD
-				+ tooBig - 1
-				// continue record
-				+ SSTRecord.STD_RECORD_OVERHEAD
-				+ OPTION_FIELD_SIZE + 1);
-
-	}
-
-	public void testSecondStringStartsOnNewContinuation() {
-		int perfectFit = SSTRecord.MAX_DATA_SPACE - COMPRESSED_PLAIN_STRING_OVERHEAD;
-		strings.add(makeUnicodeString(perfectFit));
-		strings.add(makeUnicodeString(SMALL_STRING));
-		confirmSize(SSTRecord.SST_RECORD_OVERHEAD
-				+ SSTRecord.MAX_DATA_SPACE
-				// second string
-				+ SSTRecord.STD_RECORD_OVERHEAD
-				+ COMPRESSED_PLAIN_STRING_OVERHEAD
-				+ SMALL_STRING.length());
-	}
-
-	public void testHeaderCrossesNormalContinuePoint() {
-		int almostPerfectFit = SSTRecord.MAX_DATA_SPACE - COMPRESSED_PLAIN_STRING_OVERHEAD - 2;
-		strings.add(makeUnicodeString(almostPerfectFit));
-		String oneCharString = new String(new char[1]);
-		strings.add(makeUnicodeString(oneCharString));
-		confirmSize(SSTRecord.SST_RECORD_OVERHEAD
-				+ COMPRESSED_PLAIN_STRING_OVERHEAD
-				+ almostPerfectFit
-				// second string
-				+ SSTRecord.STD_RECORD_OVERHEAD
-				+ COMPRESSED_PLAIN_STRING_OVERHEAD
-				+ oneCharString.length());
-
-	}
-	private static UnicodeString makeUnicodeString(int size) {
-		String s = new String(new char[size]);
-		return makeUnicodeString(s);
-	}
-
-	private static UnicodeString makeUnicodeString(String s) {
-		UnicodeString st = new UnicodeString(s);
-		st.setOptionFlags((byte) 0);
-		return st;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
deleted file mode 100644
index 98f1e85..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.ComparisonFailure;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.SharedFormula;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.formula.FormulaParser;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * @author Josh Micich
- */
-public final class TestSharedFormulaRecord extends TestCase {
-
-    /**
-     * A sample spreadsheet known to have one sheet with 4 shared formula ranges
-     */
-    private static final String SHARED_FORMULA_TEST_XLS = "SharedFormulaTest.xls";
-    /**
-     * Binary data for an encoded formula.  Taken from attachment 22062 (bugzilla 45123/45421).
-     * The shared formula is in Sheet1!C6:C21, with text "SUMPRODUCT(--(End_Acct=$C6),--(End_Bal))"
-     * This data is found at offset 0x1A4A (within the shared formula record).
-     * The critical thing about this formula is that it contains shared formula tokens (tRefN*,
-     * tAreaN*) with operand class 'array'.
-     */
-    private static final byte[] SHARED_FORMULA_WITH_REF_ARRAYS_DATA = {
-        0x1A, 0x00,
-        0x63, 0x02, 0x00, 0x00, 0x00,
-        0x6C, 0x00, 0x00, 0x02, (byte)0x80,  // tRefNA
-        0x0B,
-        0x15,
-        0x13,
-        0x13,
-        0x63, 0x03, 0x00, 0x00, 0x00,
-        0x15,
-        0x13,
-        0x13,
-        0x42, 0x02, (byte)0xE4, 0x00,
-    };
-
-    /**
-     * The method <tt>SharedFormulaRecord.convertSharedFormulas()</tt> converts formulas from
-     * 'shared formula' to 'single cell formula' format.  It is important that token operand
-     * classes are preserved during this transformation, because Excel may not tolerate the
-     * incorrect encoding.  The formula here is one such example (Excel displays #VALUE!).
-     */
-    public void testConvertSharedFormulasOperandClasses_bug45123() {
-
-        LittleEndianInput in = TestcaseRecordInputStream.createLittleEndian(SHARED_FORMULA_WITH_REF_ARRAYS_DATA);
-        int encodedLen = in.readUShort();
-        Ptg[] sharedFormula = Ptg.readTokens(encodedLen, in);
-
-        SharedFormula sf = new SharedFormula(SpreadsheetVersion.EXCEL97);
-        Ptg[] convertedFormula = sf.convertSharedFormulas(sharedFormula, 100, 200);
-
-        RefPtg refPtg = (RefPtg) convertedFormula[1];
-        assertEquals("$C101", refPtg.toFormulaString());
-        if (refPtg.getPtgClass() == Ptg.CLASS_REF) {
-            throw new AssertionFailedError("Identified bug 45123");
-        }
-
-        confirmOperandClasses(sharedFormula, convertedFormula);
-    }
-
-    private static void confirmOperandClasses(Ptg[] originalPtgs, Ptg[] convertedPtgs) {
-        assertEquals(originalPtgs.length, convertedPtgs.length);
-        for (int i = 0; i < convertedPtgs.length; i++) {
-            Ptg originalPtg = originalPtgs[i];
-            Ptg convertedPtg = convertedPtgs[i];
-            if (originalPtg.getPtgClass() != convertedPtg.getPtgClass()) {
-                throw new ComparisonFailure("Different operand class for token[" + i + "]",
-                        String.valueOf(originalPtg.getPtgClass()), String.valueOf(convertedPtg.getPtgClass()));
-            }
-        }
-    }
-
-    public void testConvertSharedFormulas() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFEvaluationWorkbook fpb = HSSFEvaluationWorkbook.create(wb);
-        Ptg[] sharedFormula, convertedFormula;
-
-        SharedFormula sf = new SharedFormula(SpreadsheetVersion.EXCEL97);
-
-        sharedFormula = FormulaParser.parse("A2", fpb, FormulaType.CELL, -1);
-        convertedFormula = sf.convertSharedFormulas(sharedFormula, 0, 0);
-        confirmOperandClasses(sharedFormula, convertedFormula);
-        //conversion relative to [0,0] should return the original formula
-        assertEquals("A2", FormulaRenderer.toFormulaString(fpb, convertedFormula));
-
-        convertedFormula = sf.convertSharedFormulas(sharedFormula, 1, 0);
-        confirmOperandClasses(sharedFormula, convertedFormula);
-        //one row down
-        assertEquals("A3", FormulaRenderer.toFormulaString(fpb, convertedFormula));
-
-        convertedFormula = sf.convertSharedFormulas(sharedFormula, 1, 1);
-        confirmOperandClasses(sharedFormula, convertedFormula);
-        //one row down and one cell right
-        assertEquals("B3", FormulaRenderer.toFormulaString(fpb, convertedFormula));
-
-        sharedFormula = FormulaParser.parse("SUM(A1:C1)", fpb, FormulaType.CELL, -1);
-        convertedFormula = sf.convertSharedFormulas(sharedFormula, 0, 0);
-        confirmOperandClasses(sharedFormula, convertedFormula);
-        assertEquals("SUM(A1:C1)", FormulaRenderer.toFormulaString(fpb, convertedFormula));
-
-        convertedFormula = sf.convertSharedFormulas(sharedFormula, 1, 0);
-        confirmOperandClasses(sharedFormula, convertedFormula);
-        assertEquals("SUM(A2:C2)", FormulaRenderer.toFormulaString(fpb, convertedFormula));
-
-        convertedFormula = sf.convertSharedFormulas(sharedFormula, 1, 1);
-        confirmOperandClasses(sharedFormula, convertedFormula);
-        assertEquals("SUM(B2:D2)", FormulaRenderer.toFormulaString(fpb, convertedFormula));
-    }
-
-    /**
-     * Make sure that POI preserves {@link SharedFormulaRecord}s
-     */
-    public void testPreserveOnReserialize() {
-        HSSFWorkbook wb;
-        HSSFSheet sheet;
-        HSSFCell cellB32769;
-        HSSFCell cellC32769;
-
-        // Reading directly from XLS file
-        wb = HSSFTestDataSamples.openSampleWorkbook(SHARED_FORMULA_TEST_XLS);
-        sheet = wb.getSheetAt(0);
-        cellB32769 = sheet.getRow(32768).getCell(1);
-        cellC32769 = sheet.getRow(32768).getCell(2);
-        // check reading of formulas which are shared (two cells from a 1R x 8C range)
-        assertEquals("B32770*2", cellB32769.getCellFormula());
-        assertEquals("C32770*2", cellC32769.getCellFormula());
-        confirmCellEvaluation(wb, cellB32769, 4);
-        confirmCellEvaluation(wb, cellC32769, 6);
-        // Confirm this example really does have SharedFormulas.
-        // there are 3 others besides the one at A32769:H32769
-        assertEquals(4, countSharedFormulas(sheet));
-
-
-        // Re-serialize and check again
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        cellB32769 = sheet.getRow(32768).getCell(1);
-        cellC32769 = sheet.getRow(32768).getCell(2);
-        assertEquals("B32770*2", cellB32769.getCellFormula());
-        confirmCellEvaluation(wb, cellB32769, 4);
-        assertEquals(4, countSharedFormulas(sheet));
-    }
-
-    public void testUnshareFormulaDueToChangeFormula() {
-        HSSFWorkbook wb;
-        HSSFSheet sheet;
-        HSSFCell cellB32769;
-        HSSFCell cellC32769;
-
-        wb = HSSFTestDataSamples.openSampleWorkbook(SHARED_FORMULA_TEST_XLS);
-        sheet = wb.getSheetAt(0);
-        cellB32769 = sheet.getRow(32768).getCell(1);
-        cellC32769 = sheet.getRow(32768).getCell(2);
-
-        // Updating cell formula, causing it to become unshared
-        cellB32769.setCellFormula("1+1");
-        confirmCellEvaluation(wb, cellB32769, 2);
-        // currently (Oct 2008) POI handles this by exploding the whole shared formula group
-        assertEquals(3, countSharedFormulas(sheet)); // one less now
-        // check that nearby cell of the same group still has the same formula
-        assertEquals("C32770*2", cellC32769.getCellFormula());
-        confirmCellEvaluation(wb, cellC32769, 6);
-    }
-    public void testUnshareFormulaDueToDelete() {
-        HSSFWorkbook wb;
-        HSSFSheet sheet;
-        HSSFCell cell;
-        final int ROW_IX = 2;
-
-        // changing shared formula cell to blank
-        wb = HSSFTestDataSamples.openSampleWorkbook(SHARED_FORMULA_TEST_XLS);
-        sheet = wb.getSheetAt(0);
-
-        assertEquals("A$1*2", sheet.getRow(ROW_IX).getCell(1).getCellFormula());
-        cell = sheet.getRow(ROW_IX).getCell(1);
-        cell.setCellType(CellType.BLANK);
-        assertEquals(3, countSharedFormulas(sheet));
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        assertEquals("A$1*2", sheet.getRow(ROW_IX+1).getCell(1).getCellFormula());
-
-        // deleting shared formula cell
-        wb = HSSFTestDataSamples.openSampleWorkbook(SHARED_FORMULA_TEST_XLS);
-        sheet = wb.getSheetAt(0);
-
-        assertEquals("A$1*2", sheet.getRow(ROW_IX).getCell(1).getCellFormula());
-        cell = sheet.getRow(ROW_IX).getCell(1);
-        sheet.getRow(ROW_IX).removeCell(cell);
-        assertEquals(3, countSharedFormulas(sheet));
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        assertEquals("A$1*2", sheet.getRow(ROW_IX+1).getCell(1).getCellFormula());
-    }
-
-    private static void confirmCellEvaluation(HSSFWorkbook wb, HSSFCell cell, double expectedValue) {
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        CellValue cv = fe.evaluate(cell);
-        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-        assertEquals(expectedValue, cv.getNumberValue(), 0.0);
-    }
-
-    /**
-     * @return the number of {@link SharedFormulaRecord}s encoded for the specified sheet
-     */
-    private static int countSharedFormulas(HSSFSheet sheet) {
-        Record[] records = RecordInspector.getRecords(sheet, 0);
-        int count = 0;
-        for (Record rec : records) {
-            if(rec instanceof SharedFormulaRecord) {
-                count++;
-            }
-        }
-        return count;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
deleted file mode 100644
index ec7b84c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianInput;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the StringRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestStringRecord extends TestCase {
-	private static final byte[] data = HexRead.readFromString(
-			"0B 00 " + // length
-			"00 " +    // option
-			// string
-			"46 61 68 72 7A 65 75 67 74 79 70"
-	);
-
-	public void testLoad() {
-
-		StringRecord record = new StringRecord(TestcaseRecordInputStream.create(0x207, data));
-		assertEquals( "Fahrzeugtyp", record.getString());
-
-		assertEquals( 18, record.getRecordSize() );
-	}
-
-	public void testStore() {
-		StringRecord record = new StringRecord();
-		record.setString("Fahrzeugtyp");
-
-		byte [] recordBytes = record.serialize();
-		assertEquals(recordBytes.length - 4, data.length);
-		for (int i = 0; i < data.length; i++)
-			assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-	}
-    
-	public void testContinue() {
-		int MAX_BIFF_DATA = RecordInputStream.MAX_RECORD_DATA_SIZE;
-		int TEXT_LEN = MAX_BIFF_DATA + 1000; // deliberately over-size
-		String textChunk = "ABCDEGGHIJKLMNOP"; // 16 chars
-		StringBuffer sb = new StringBuffer(16384);
-		while (sb.length() < TEXT_LEN) {
-			sb.append(textChunk);
-		}
-		sb.setLength(TEXT_LEN);
-
-		StringRecord sr = new StringRecord();
-		sr.setString(sb.toString());
-		byte[] ser = sr.serialize();
-		assertEquals(StringRecord.sid, LittleEndian.getUShort(ser, 0));
-		if (LittleEndian.getUShort(ser, 2) > MAX_BIFF_DATA) {
-			throw new AssertionFailedError(
-					"StringRecord should have been split with a continue record");
-		}
-		// Confirm expected size of first record, and ushort strLen.
-		assertEquals(MAX_BIFF_DATA, LittleEndian.getUShort(ser, 2));
-		assertEquals(TEXT_LEN, LittleEndian.getUShort(ser, 4));
-
-		// Confirm first few bytes of ContinueRecord
-		LittleEndianInput crIn = new LittleEndianByteArrayInputStream(ser, (MAX_BIFF_DATA + 4));
-		int nCharsInFirstRec = MAX_BIFF_DATA - (2 + 1); // strLen, optionFlags
-		int nCharsInSecondRec = TEXT_LEN - nCharsInFirstRec;
-		assertEquals(ContinueRecord.sid, crIn.readUShort());
-		assertEquals(1 + nCharsInSecondRec, crIn.readUShort());
-		assertEquals(0, crIn.readUByte());
-		assertEquals('N', crIn.readUByte());
-		assertEquals('O', crIn.readUByte());
-
-		// re-read and make sure string value is the same
-		RecordInputStream in = TestcaseRecordInputStream.create(ser);
-		StringRecord sr2 = new StringRecord(in);
-		assertEquals(sb.toString(), sr2.getString());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
deleted file mode 100644
index 890546c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests for {@link StyleRecord}
- */
-public final class TestStyleRecord extends TestCase {
-	public void testUnicodeReadName() {
-		byte[] data = HexRead.readFromString(
-				"11 00 09 00 01 38 5E C4 89 5F 00 53 00 68 00 65 00 65 00 74 00 31 00");
-		RecordInputStream in = TestcaseRecordInputStream.create(StyleRecord.sid, data);
-		StyleRecord sr = new StyleRecord(in);
-		assertEquals("\u5E38\u89C4_Sheet1", sr.getName()); // "<Conventional>_Sheet1"
-		byte[] ser;
-		try {
-			ser = sr.serialize();
-		} catch (IllegalStateException e) {
-			if (e.getMessage().equals("Incorrect number of bytes written - expected 27 but got 18")) {
-				throw new AssertionFailedError("Identified bug 46385");
-			}
-			throw e;
-		}
-		TestcaseRecordInputStream.confirmRecordEncoding(StyleRecord.sid, data, ser);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
deleted file mode 100644
index 56bc99f..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.record;
-
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Tests Subrecord components of an OBJ record.  Test data taken directly
- * from a real Excel file.
- *
- * @author Michael Zalewski (zalewski@optonline.net)
- */
-public final class TestSubRecord extends TestCase {
-	/*
-	   The following is a dump of the OBJ record corresponding to an auto-filter
-	   drop-down list. The 3rd subrecord beginning at offset 0x002e (type=0x0013)
-	   does not conform to the documentation, because the length field is 0x1fee,
-	   which is longer than the entire OBJ record.
-
-	   00000000 15 00 12 00 14 00 01 00 01 21 00 00 00 00 3C 13 .........!....<.  Type=0x15 Len=0x0012 ftCmo
-	   00000010 F4 03 00 00 00 00
-	                              0C 00 14 00 00 00 00 00 00 00 ................  Type=0x0c Len=0x0014 ftSbs
-	   00000020 00 00 00 00 01 00 08 00 00 00 10 00 00 00
-	                                                      13 00 ................  Type=0x13 Len=0x1FEE ftLbsData
-	   00000030 EE 1F 00 00 08 00 08 00 01 03 00 00 0A 00 14 00 ................
-	   00000040 6C 00
-	                  00 00 00 00                               l.....            Type=0x00 Len=0x0000 ftEnd
-	*/
-
-	private static final byte[] dataAutoFilter 
-		= HexRead.readFromString(""
-			+ "5D 00 46 00 " // ObjRecord.sid, size=70
-			// ftCmo
-			+ "15 00 12 00 "
-			+ "14 00 01 00 01 00 01 21 00 00 3C 13 F4 03 00 00 00 00 "
-			// ftSbs (currently UnknownSubrecord)
-			+ "0C 00 14 00 "
-			+ "00 00 00 00 00 00 00 00 00 00 01 00 08 00 00 00 10 00 00 00 "
-			// ftLbsData (currently UnknownSubrecord)
-			+ "13 00 EE 1F 00 00 "
-			+ "08 00 08 00 01 03 00 00 0A 00 14 00 6C 00 "
-			// ftEnd
-			+ "00 00 00 00"
-		);
-
-
-	/**
-	 * Make sure that ftLbsData (which has abnormal size info) is parsed correctly.
-	 * If the size field is interpreted incorrectly, the resulting ObjRecord becomes way too big.
-	 * At the time of fixing (Oct-2008 svn r707447) {@link RecordInputStream} allowed  buffer 
-	 * read overruns, so the bug was mostly silent.
-	 */
-	public void testReadAll_bug45778() {
-		RecordInputStream in = TestcaseRecordInputStream.create(dataAutoFilter);
-		ObjRecord or = new ObjRecord(in);
-		byte[] data2 = or.serialize();
-		if (data2.length == 8228) {
-			throw new AssertionFailedError("Identified bug 45778");
-		}
-		assertEquals(74, data2.length);
-		assertArrayEquals(dataAutoFilter, data2);
-	}
-	
-	public void testReadManualComboWithFormula() {
-		byte[] data = HexRead.readFromString(""
-			+ "5D 00 66 00 "
-			+ "15 00 12 00 14 00 02 00 11 20 00 00 00 00 "
-			+ "20 44 C6 04 00 00 00 00 0C 00 14 00 04 F0 C6 04 "
-			+ "00 00 00 00 00 00 01 00 06 00 00 00 10 00 00 00 "
-			+ "0E 00 0C 00 05 00 80 44 C6 04 24 09 00 02 00 02 "
-			+ "13 00 DE 1F 10 00 09 00 80 44 C6 04 25 0A 00 0F "
-			+ "00 02 00 02 00 02 06 00 03 00 08 00 00 00 00 00 "
-			+ "08 00 00 00 00 00 00 00 " // TODO sometimes last byte is non-zero
-		);
-		
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		ObjRecord or = new ObjRecord(in);
-		byte[] data2 = or.serialize();
-		if (data2.length == 8228) {
-			throw new AssertionFailedError("Identified bug 45778");
-		}
-		assertEquals("Encoded length", data.length, data2.length);
-		for (int i = 0; i < data.length; i++) {
-			if (data[i] != data2[i]) {
-				throw new AssertionFailedError("Encoded data differs at index " + i);
-			}
-		}
-		assertArrayEquals(data, data2);
-	}
-
-	/**
-	 * Some versions of POI (e.g. 3.1 - prior to svn r707450 / bug 45778) interpreted the ftLbs 
-	 * subrecord second short (0x1FEE) as a length, and hence read lots of extra padding.  This 
-	 * buffer-overrun in {@link RecordInputStream} happened silently due to problems later fixed
-	 * in svn 707778. When the ObjRecord is written, the extra padding is written too, making the 
-	 * record 8224 bytes long instead of 70.  
-	 * (An aside: It seems more than a coincidence that this problem creates a record of exactly
-	 * {@link RecordInputStream#MAX_RECORD_DATA_SIZE} but not enough is understood about 
-	 * subrecords to explain this.)<br/>
-	 * 
-	 * Excel reads files with this excessive padding OK.  It also truncates the over-sized
-	 * ObjRecord back to the proper size.  POI should do the same.
-	 */
-	public void testWayTooMuchPadding_bug46545() {
-		byte[] data = HexRead.readFromString(""
-			+ "15 00 12 00 14 00 13 00 01 21 00 00 00"
-			+ "00 98 0B 5B 09 00 00 00 00 0C 00 14 00 00 00 00 00 00 00 00"
-			+ "00 00 00 01 00 01 00 00 00 10 00 00 00 "
-			// ftLbs
-			+ "13 00 EE 1F 00 00 "
-			+ "01 00 00 00 01 06 00 00 02 00 08 00 75 00 "
-			// ftEnd
-			+ "00 00 00 00"
-		);
-		final int LBS_START_POS = 0x002E;
-		final int WRONG_LBS_SIZE = 0x1FEE;
-		assertEquals(0x0013, LittleEndian.getShort(data, LBS_START_POS+0));
-		assertEquals(WRONG_LBS_SIZE, LittleEndian.getShort(data, LBS_START_POS+2));
-		int wrongTotalSize = LBS_START_POS + 4 + WRONG_LBS_SIZE;
-		byte[] wrongData = new byte[wrongTotalSize];
-		System.arraycopy(data, 0, wrongData, 0, data.length);
-		// wrongData has the ObjRecord data as would have been written by v3.1 
-		
-		RecordInputStream in = TestcaseRecordInputStream.create(ObjRecord.sid, wrongData);
-		ObjRecord or;
-		try {
-			or = new ObjRecord(in);
-		} catch (RecordFormatException e) {
-			if (e.getMessage().startsWith("Leftover 8154 bytes in subrecord data")) {
-				throw new AssertionFailedError("Identified bug 46545");
-			}
-			throw e;
-		}
-		// make sure POI properly truncates the ObjRecord data
-		byte[] data2 = or.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(ObjRecord.sid, data, data2);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
deleted file mode 100644
index 47926cf..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.TestCase;
-
-import static org.apache.poi.hssf.record.SupBookRecord.*;
-
-/**
- * Tests the serialization and deserialization of the SupBook record
- * class works correctly.  
- *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- */
-public final class TestSupBookRecord extends TestCase {
-    /**
-     * This contains a fake data section of a SubBookRecord
-     */
-    byte[] dataIR = new byte[] {
-        (byte)0x04,(byte)0x00,(byte)0x01,(byte)0x04,
-    };
-    byte[] dataAIF = new byte[] {
-        (byte)0x01,(byte)0x00,(byte)0x01,(byte)0x3A,
-    };
-    byte[] dataER = new byte[] {
-        (byte)0x02,(byte)0x00,
-        (byte)0x07,(byte)0x00,   (byte)0x00,   
-                (byte)'t', (byte)'e', (byte)'s', (byte)'t', (byte)'U', (byte)'R', (byte)'L',  
-        (byte)0x06,(byte)0x00,   (byte)0x00,   
-                (byte)'S', (byte)'h', (byte)'e', (byte)'e', (byte)'t', (byte)'1', 
-        (byte)0x06,(byte)0x00,   (byte)0x00,   
-                (byte)'S', (byte)'h', (byte)'e', (byte)'e', (byte)'t', (byte)'2', 
-   };
-
-    /**
-     * tests that we can load the record
-     */
-    public void testLoadIR() {
-
-        SupBookRecord record = new SupBookRecord(TestcaseRecordInputStream.create(0x01AE, dataIR));      
-        assertTrue( record.isInternalReferences() );             //expected flag
-        assertEquals( 0x4, record.getNumberOfSheets() );    //expected # of sheets
-
-        assertEquals( 8, record.getRecordSize() );  //sid+size+data
-    }
-    /**
-     * tests that we can load the record
-     */
-    public void testLoadER() {
-
-        SupBookRecord record = new SupBookRecord(TestcaseRecordInputStream.create(0x01AE, dataER));      
-        assertTrue( record.isExternalReferences() );             //expected flag
-        assertEquals( 0x2, record.getNumberOfSheets() );    //expected # of sheets
-
-        assertEquals( 34, record.getRecordSize() );  //sid+size+data
-        
-        assertEquals("testURL", record.getURL());
-        String[] sheetNames = record.getSheetNames();
-        assertEquals(2, sheetNames.length);
-        assertEquals("Sheet1", sheetNames[0]);
-        assertEquals("Sheet2", sheetNames[1]);
-    }
-    
-    /**
-     * tests that we can load the record
-     */
-    public void testLoadAIF() {
-
-        SupBookRecord record = new SupBookRecord(TestcaseRecordInputStream.create(0x01AE, dataAIF));      
-        assertTrue( record.isAddInFunctions() );             //expected flag
-        assertEquals( 0x1, record.getNumberOfSheets() );    //expected # of sheets
-        assertEquals( 8, record.getRecordSize() );  //sid+size+data
-    }
-   
-    /**
-     * Tests that we can store the record
-     *
-     */
-    public void testStoreIR() {
-        SupBookRecord record = SupBookRecord.createInternalReferences((short)4);
-
-        TestcaseRecordInputStream.confirmRecordEncoding(0x01AE, dataIR, record.serialize());
-    }   
-    
-    public void testStoreER() {
-        String url = "testURL";
-        String[] sheetNames = { "Sheet1", "Sheet2", };
-        SupBookRecord record = SupBookRecord.createExternalReferences(url, sheetNames);
-
-        TestcaseRecordInputStream.confirmRecordEncoding(0x01AE, dataER, record.serialize());
-    }
-
-    public void testStoreAIF() {
-        SupBookRecord record = SupBookRecord.createAddInFunctions();
-        assertEquals(1, record.getNumberOfSheets());
-        assertTrue(record.isAddInFunctions());
-        TestcaseRecordInputStream.confirmRecordEncoding(0x01AE, dataAIF, record.serialize());
-    }
-    
-    public void testExternalReferenceUrl() {
-    	String[] sheetNames = new String[]{"SampleSheet"};
-    	final char startMarker = (char)1;
-    	
-		SupBookRecord record;
-		
-		record = new SupBookRecord(startMarker + "test.xls", sheetNames);
-    	assertEquals("test.xls", record.getURL());
-
-    	//UNC path notation
-    	record = new SupBookRecord(startMarker + "" + CH_VOLUME + "@servername" + CH_DOWN_DIR + "test.xls", sheetNames);
-    	assertEquals("\\\\servername" + PATH_SEPERATOR + "test.xls", record.getURL());
-    	
-    	//Absolute path notation - different device
-    	record = new SupBookRecord(startMarker + "" + CH_VOLUME + "D" + CH_DOWN_DIR + "test.xls", sheetNames);
-    	assertEquals("D:" + PATH_SEPERATOR + "test.xls", record.getURL());
-
-    	//Absolute path notation - same device
-    	record = new SupBookRecord(startMarker + "" + CH_SAME_VOLUME + "folder" + CH_DOWN_DIR + "test.xls", sheetNames);
-    	assertEquals(PATH_SEPERATOR + "folder" + PATH_SEPERATOR + "test.xls", record.getURL());
-    	
-    	//Relative path notation - down
-    	record = new SupBookRecord(startMarker + "folder" + CH_DOWN_DIR + "test.xls", sheetNames);
-    	assertEquals("folder" + PATH_SEPERATOR + "test.xls", record.getURL());
-    	
-    	//Relative path notation - up
-    	record = new SupBookRecord(startMarker +""+ CH_UP_DIR + "test.xls", sheetNames);
-    	assertEquals(".." + PATH_SEPERATOR + "test.xls", record.getURL());
-
-    	//Relative path notation - for EXCEL.exe - fallback
-    	record = new SupBookRecord(startMarker +""+ CH_STARTUP_DIR + "test.xls", sheetNames);
-    	assertEquals("." + PATH_SEPERATOR + "test.xls", record.getURL());
-
-    	//Relative path notation - for EXCEL lib folder - fallback
-    	record = new SupBookRecord(startMarker +""+ CH_LIB_DIR + "test.xls", sheetNames);
-    	assertEquals("." + PATH_SEPERATOR + "test.xls", record.getURL());
-
-    	//Relative path notation - for alternative EXCEL.exe - fallback
-    	record = new SupBookRecord(startMarker +""+ CH_ALT_STARTUP_DIR+ "test.xls", sheetNames);
-    	assertEquals("." + PATH_SEPERATOR + "test.xls", record.getURL());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
deleted file mode 100644
index 3a2ada6..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the TableRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- */
-public final class TestTableRecord extends TestCase {
-	byte[] header = new byte[] {
-			0x36, 02, 0x10, 00, // sid=x236, 16 bytes long
-	};
-	byte[] data = new byte[] {
-			03, 00,  // from row 3 
-			8, 00,   // to row 8
-			04,      // from col 4
-			06,      // to col 6
-			00, 00,  // no flags set
-			04, 00,  // row inp row 4
-			01, 00,  // col inp row 1
-			0x76, 0x40, // row inp col 0x4076 (!)
-			00, 00   // col inp col 0
-	};
-
-	public void testLoad() {
-
-		TableRecord record = new TableRecord(TestcaseRecordInputStream.create(0x236, data));
-
-		CellRangeAddress8Bit range = record.getRange();
-		assertEquals(3, range.getFirstRow());
-		assertEquals(8, range.getLastRow());
-		assertEquals(4, range.getFirstColumn());
-		assertEquals(6, range.getLastColumn());
-		assertEquals(0, record.getFlags());
-		assertEquals(4, record.getRowInputRow());
-		assertEquals(1, record.getColInputRow());
-		assertEquals(0x4076, record.getRowInputCol());
-		assertEquals(0, record.getColInputCol());
-
-		assertEquals( 16 + 4, record.getRecordSize() );
-	}
-
-    public void testStore()
-    {
-//    	Offset 0x3bd9 (15321)
-//    	recordid = 0x236, size = 16
-//    	[TABLE]
-//    	    .row from      = 3
-//    	    .row to        = 8
-//    	    .column from   = 4
-//    	    .column to     = 6
-//    	    .flags         = 0
-//    	        .always calc     =false
-//    	    .reserved      = 0
-//    	    .row input row = 4
-//    	    .col input row = 1
-//    	    .row input col = 4076
-//    	    .col input col = 0
-//    	[/TABLE]
-
-		CellRangeAddress8Bit crab = new CellRangeAddress8Bit(3, 8, 4, 6);
-		TableRecord record = new TableRecord(crab);
-		record.setFlags((byte)0);
-		record.setRowInputRow(4);
-		record.setColInputRow(1);
-		record.setRowInputCol(0x4076);
-		record.setColInputCol(0);
-
-		byte [] recordBytes = record.serialize();
-		assertEquals(recordBytes.length - 4, data.length);
-		for (int i = 0; i < data.length; i++)
-			assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
deleted file mode 100644
index b14fd76..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.util.HexRead;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the TextObjectBaseRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestTextObjectBaseRecord extends TestCase {
-	/** data for one TXO rec and two continue recs */
-    private static final byte[] data = HexRead.readFromString(
-        "B6 01 " + // TextObjectRecord.sid
-        "12 00 " + // size 18
-        "44 02 02 00 00 00 00 00" +
-        "00 00 " +
-        "02 00 " + // strLen 2
-        "10 00 " + // 16 bytes for 2 format runs
-        "00 00" +
-        "00 00 " +
-        "3C 00 " + // ContinueRecord.sid
-        "03 00 " + // size 3
-        "00 " + // unicode compressed
-        "41 42 " + // 'AB'
-        "3C 00 " + // ContinueRecord.sid
-        "10 00 " + // size 16
-        "00 00 18 00 00 00 00 00 " +
-        "02 00 00 00 00 00 00 00 "
-    );
-
-
-    public void testLoad() {
-        RecordInputStream in = TestcaseRecordInputStream.create(data);
-        TextObjectRecord record = new TextObjectRecord(in);
-
-        assertEquals(TextObjectRecord.HORIZONTAL_TEXT_ALIGNMENT_CENTERED, record.getHorizontalTextAlignment());
-        assertEquals(TextObjectRecord.VERTICAL_TEXT_ALIGNMENT_JUSTIFY, record.getVerticalTextAlignment());
-        assertEquals(true, record.isTextLocked());
-        assertEquals(TextObjectRecord.TEXT_ORIENTATION_ROT_RIGHT, record.getTextOrientation());
-
-        assertEquals(49, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        TextObjectRecord record = new TextObjectRecord();
-
-
-        HSSFRichTextString str = new HSSFRichTextString("AB");
-        str.applyFont(0, 2, (short)0x0018);
-        str.applyFont(2, 2, (short)0x0320);
-
-        record.setHorizontalTextAlignment(TextObjectRecord.HORIZONTAL_TEXT_ALIGNMENT_CENTERED);
-        record.setVerticalTextAlignment(TextObjectRecord.VERTICAL_TEXT_ALIGNMENT_JUSTIFY);
-        record.setTextLocked(true);
-        record.setTextOrientation(TextObjectRecord.TEXT_ORIENTATION_ROT_RIGHT);
-        record.setStr(str);
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
deleted file mode 100644
index 330e93d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Tests that serialization and deserialization of the TextObjectRecord .
- * Test data taken directly from a real Excel file.
- *
- * @author Yegor Kozlov
- */
-public final class TestTextObjectRecord extends TestCase {
-
-    private static final byte[] simpleData = HexRead.readFromString(
-        "B6 01 12 00 " +
-        "12 02 00 00 00 00 00 00" +
-        "00 00 0D 00 08 00    00 00" +
-        "00 00 " +
-        "3C 00 0E 00 " +
-        "00 48 65 6C 6C 6F 2C 20 57 6F 72 6C 64 21 " +
-        "3C 00 08 " +
-        "00 0D 00 00 00 00 00 00 00"
-    );
-
-
-    public void testRead() {
-
-        RecordInputStream is =TestcaseRecordInputStream.create(simpleData);
-        TextObjectRecord record = new TextObjectRecord(is);
-
-        assertEquals(TextObjectRecord.sid, record.getSid());
-        assertEquals(TextObjectRecord.HORIZONTAL_TEXT_ALIGNMENT_LEFT_ALIGNED, record.getHorizontalTextAlignment());
-        assertEquals(TextObjectRecord.VERTICAL_TEXT_ALIGNMENT_TOP, record.getVerticalTextAlignment());
-        assertEquals(TextObjectRecord.TEXT_ORIENTATION_NONE, record.getTextOrientation());
-        assertEquals("Hello, World!", record.getStr().getString());
-    }
-
-    public void testWrite() {
-        HSSFRichTextString str = new HSSFRichTextString("Hello, World!");
-
-        TextObjectRecord record = new TextObjectRecord();
-        record.setStr(str);
-        record.setHorizontalTextAlignment( TextObjectRecord.HORIZONTAL_TEXT_ALIGNMENT_LEFT_ALIGNED );
-        record.setVerticalTextAlignment( TextObjectRecord.VERTICAL_TEXT_ALIGNMENT_TOP );
-        record.setTextLocked( true );
-        record.setTextOrientation( TextObjectRecord.TEXT_ORIENTATION_NONE );
-
-        byte [] ser = record.serialize();
-        assertEquals(ser.length , simpleData.length);
-
-        assertArrayEquals(simpleData, ser);
-
-        //read again
-        RecordInputStream is = TestcaseRecordInputStream.create(simpleData);
-        record = new TextObjectRecord(is);
-    }
-
-    /**
-     * Zero {@link ContinueRecord}s follow a {@link TextObjectRecord} if the text is empty
-     */
-    public void testWriteEmpty() {
-        HSSFRichTextString str = new HSSFRichTextString("");
-
-        TextObjectRecord record = new TextObjectRecord();
-        record.setStr(str);
-
-        byte [] ser = record.serialize();
-
-        int formatDataLen = LittleEndian.getUShort(ser, 16);
-        assertEquals("formatDataLength", 0, formatDataLen);
-
-        assertEquals(22, ser.length); // just the TXO record
-
-        //read again
-        RecordInputStream is = TestcaseRecordInputStream.create(ser);
-        record = new TextObjectRecord(is);
-        assertEquals(0, record.getStr().length());
-    }
-
-    /**
-     * Test that TextObjectRecord serializes logs records properly.
-     */
-    public void testLongRecords() {
-        int[] lengths = {1024, 2048, 4096, 8192, 16384}; //test against strings of different length
-        for (int length : lengths) {
-            StringBuffer buff = new StringBuffer(length);
-            for (int j = 0; j < length; j++) {
-                buff.append("x");
-            }
-            HSSFRichTextString str = new HSSFRichTextString(buff.toString());
-
-            TextObjectRecord obj = new TextObjectRecord();
-            obj.setStr(str);
-
-            byte [] data = obj.serialize();
-            RecordInputStream is = new RecordInputStream(new ByteArrayInputStream(data));
-            is.nextRecord();
-            TextObjectRecord record = new TextObjectRecord(is);
-            str = record.getStr();
-
-            assertEquals(buff.length(), str.length());
-            assertEquals(buff.toString(), str.getString());
-        }
-    }
-
-    /**
-     * Test cloning
-     */
-    public void testClone() {
-        String text = "Hello, World";
-        HSSFRichTextString str = new HSSFRichTextString(text);
-
-        TextObjectRecord obj = new TextObjectRecord();
-        obj.setStr( str );
-
-
-        TextObjectRecord cloned = (TextObjectRecord)obj.clone();
-        assertEquals(obj.getRecordSize(), cloned.getRecordSize());
-        assertEquals(obj.getHorizontalTextAlignment(), cloned.getHorizontalTextAlignment());
-        assertEquals(obj.getStr().getString(), cloned.getStr().getString());
-
-        //finally check that the serialized data is the same
-        byte[] src = obj.serialize();
-        byte[] cln = cloned.serialize();
-        assertArrayEquals(src, cln);
-    }
-
-    /** similar to {@link #simpleData} but with link formula at end of TXO rec*/
-    private static final byte[] linkData = HexRead.readFromString(
-            "B6 01 " + // TextObjectRecord.sid
-            "1E 00 " + // size 18
-            "44 02 02 00 00 00 00 00" +
-            "00 00 " +
-            "02 00 " + // strLen 2
-            "10 00 " + // 16 bytes for 2 format runs
-            "00 00 00 00 " +
-
-            "05 00 " +          // formula size
-            "D4 F0 8A 03 " +    // unknownInt
-            "24 01 00 13 C0 " + //tRef(T2)
-            "13 " +             // ??
-
-            "3C 00 " + // ContinueRecord.sid
-            "03 00 " + // size 3
-            "00 " + // unicode compressed
-            "41 42 " + // 'AB'
-            "3C 00 " + // ContinueRecord.sid
-            "10 00 " + // size 16
-            "00 00 18 00 00 00 00 00 " +
-            "02 00 00 00 00 00 00 00 "
-        );
-
-
-    public void testLinkFormula() {
-        RecordInputStream is = new RecordInputStream(new ByteArrayInputStream(linkData));
-        is.nextRecord();
-        TextObjectRecord rec = new TextObjectRecord(is);
-
-        Ptg ptg = rec.getLinkRefPtg();
-        assertNotNull(ptg);
-        assertEquals(RefPtg.class, ptg.getClass());
-        RefPtg rptg = (RefPtg) ptg;
-        assertEquals("T2", rptg.toFormulaString());
-
-        byte [] data2 = rec.serialize();
-        assertEquals(linkData.length, data2.length);
-        assertArrayEquals(linkData, data2);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
deleted file mode 100644
index 6ec0803..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-/**
- * 
- */
-public final class TestUnicodeNameRecord extends TestCase {
-
-	public void testReadBook() {
-
-		// This bit used to crash
-		HSSFWorkbook book = HSSFTestDataSamples.openSampleWorkbook("unicodeNameRecord.xls");
-		book.getSheetAt(0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
deleted file mode 100644
index fa0700c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests for {@link WriteAccessRecord}
- *
- * @author Josh Micich
- */
-public final class TestWriteAccessRecord extends TestCase {
-
-	private static final String HEX_SIXTYFOUR_SPACES = ""
-		+ "20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 "
-		+ "20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 "
-		+ "20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 "
-		+ "20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20";
-
-
-	public void testMissingStringHeader_bug47001a() {
-		/*
-		 * Data taken from offset 0x0224 in
-		 * attachment 23468 from bugzilla 47001
-		 */
-		byte[] data = HexRead.readFromString(""
-				+ "5C 00 70 00 "
-				+ "4A 61 76 61 20 45 78 63 65 6C 20 41 50 49 20 76 "
-				+ "32 2E 36 2E 34"
-				+                "20 20 20 20 20 20 20 20 20 20 20 "
-				+ "20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 "
-				+ HEX_SIXTYFOUR_SPACES);
-
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-
-		WriteAccessRecord rec;
-		try {
-			rec = new WriteAccessRecord(in);
-		} catch (RecordFormatException e) {
-			if (e.getMessage().equals("Not enough data (0) to read requested (1) bytes")) {
-				throw new AssertionFailedError("Identified bug 47001a");
-			}
-			throw e;
-		}
-		assertEquals("Java Excel API v2.6.4", rec.getUsername());
-
-
-		byte[] expectedEncoding = HexRead.readFromString(""
-				+ "15 00 00 4A 61 76 61 20 45 78 63 65 6C 20 41 50 "
-				+ "49 20 76 32 2E 36 2E 34"
-				+                         "20 20 20 20 20 20 20 20 "
-				+ "20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 "
-				+ HEX_SIXTYFOUR_SPACES);
-
-		TestcaseRecordInputStream.confirmRecordEncoding(WriteAccessRecord.sid, expectedEncoding, rec.serialize());
-	}
-
-	public void testShortRecordWrittenByMSAccess() {
-		/*
-		 * Data taken from two example files
-		 * ex42564-21435.xls
-		 * bug_42794.xls (from bug 42794 attachment 20429)
-		 * In both cases, this data is found at offset 0x0C1C.
-		 */
-		byte[] data = HexRead.readFromString(""
-				+ "5C 00 39 00 "
-				+ "36 00 00 41 20 73 61 74 69 73 66 69 65 64 20 4D "
-				+ "69 63 72 6F 73 6F 66 74 20 4F 66 66 69 63 65 39 "
-				+ "20 55 73 65 72"
-				+                "20 20 20 20 20 20 20 20 20 20 20 "
-				+ "20 20 20 20 20 20 20 20 20");
-
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		WriteAccessRecord rec = new WriteAccessRecord(in);
-		assertEquals("A satisfied Microsoft Office9 User", rec.getUsername());
-		byte[] expectedEncoding = HexRead.readFromString(""
-				+ "22 00 00 41 20 73 61 74 69 73 66 69 65 64 20 4D "
-				+ "69 63 72 6F 73 6F 66 74 20 4F 66 66 69 63 65 39 "
-				+ "20 55 73 65 72"
-				+                "20 20 20 20 20 20 20 20 20 20 20 "
-				+ HEX_SIXTYFOUR_SPACES);
-
-		TestcaseRecordInputStream.confirmRecordEncoding(WriteAccessRecord.sid, expectedEncoding, rec.serialize());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java b/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
deleted file mode 100644
index 3fc8040..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * A Record Input Stream derivative that makes access to byte arrays used in the
- * test cases work a bit easier.
- * <p> Creates the stream and moves to the first record.
- *
- * @author Jason Height (jheight at apache.org)
- */
-public final class TestcaseRecordInputStream {
-
-	private TestcaseRecordInputStream() {
-		// no instances of this class
-	}
-
-	/**
-	 * Prepends a mock record identifier to the supplied data and opens a record input stream
-	 */
-	public static LittleEndianInput createLittleEndian(byte[] data) {
-		return new LittleEndianByteArrayInputStream(data);
-
-	}
-	public static RecordInputStream create(int sid, byte[] data) {
-		return create(mergeDataAndSid(sid, data.length, data));
-	}
-	/**
-	 * First 4 bytes of <tt>data</tt> are assumed to be record identifier and length. The supplied
-	 * <tt>data</tt> can contain multiple records (sequentially encoded in the same way)
-	 */
-	public static RecordInputStream create(byte[] data) {
-		InputStream is = new ByteArrayInputStream(data);
-		RecordInputStream result = new RecordInputStream(is);
-		result.nextRecord();
-		return result;
-	}
-
-	public static byte[] mergeDataAndSid(int sid, int length, byte[] data) {
-	  byte[] result = new byte[data.length + 4];
-	  LittleEndian.putUShort(result, 0, sid);
-	  LittleEndian.putUShort(result, 2, length);
-	  System.arraycopy(data, 0, result, 4, data.length);
-	  return result;
-	}
-	/**
-	 * Confirms data sections are equal
-	 * @param expectedData - just raw data (without sid or size short ints)
-	 * @param actualRecordBytes this includes 4 prefix bytes (sid & size)
-	 */
-	public static void confirmRecordEncoding(int expectedSid, byte[] expectedData, byte[] actualRecordBytes)
-			throws AssertionFailedError {
-		confirmRecordEncoding(null, expectedSid, expectedData, actualRecordBytes);
-	}
-	/**
-	 * Confirms data sections are equal
-	 * @param msgPrefix message prefix to be displayed in case of failure
-	 * @param expectedData - just raw data (without ushort sid, ushort size)
-	 * @param actualRecordBytes this includes 4 prefix bytes (sid & size)
-	 */
-	public static void confirmRecordEncoding(String msgPrefix, int expectedSid, byte[] expectedData, byte[] actualRecordBytes)
-			throws AssertionFailedError {
-		int expectedDataSize = expectedData.length;
-		Assert.assertEquals("Size of encode data mismatch", actualRecordBytes.length - 4, expectedDataSize);
-		Assert.assertEquals(expectedSid, LittleEndian.getShort(actualRecordBytes, 0));
-		Assert.assertEquals(expectedDataSize, LittleEndian.getShort(actualRecordBytes, 2));
-		for (int i = 0; i < expectedDataSize; i++)
-			if (expectedData[i] != actualRecordBytes[i+4]) {
-				StringBuilder sb = new StringBuilder(64);
-				if (msgPrefix != null) {
-					sb.append(msgPrefix).append(": ");
-				}
-				sb.append("At offset ").append(i);
-				sb.append(": expected ").append(HexDump.byteToHex(expectedData[i]));
-				sb.append(" but found ").append(HexDump.byteToHex(actualRecordBytes[i+4]));
-				throw new AssertionFailedError(sb.toString());
-			}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java
deleted file mode 100644
index 4edf3eb..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for package <tt>org.apache.poi.hssf.record.aggregates</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestCFRecordsAggregate.class,
-    TestColumnInfoRecordsAggregate.class,
-    TestFormulaRecordAggregate.class,
-    TestRowRecordsAggregate.class,
-    TestSharedValueManager.class,
-    TestValueRecordsAggregate.class,
-    TestPageSettingsBlock.class
-})
-public final class AllRecordAggregateTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
deleted file mode 100644
index ee04ed0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.CFHeaderBase;
-import org.apache.poi.hssf.record.CFHeaderRecord;
-import org.apache.poi.hssf.record.CFRule12Record;
-import org.apache.poi.hssf.record.CFRuleBase;
-import org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator;
-import org.apache.poi.hssf.record.CFRuleRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFactory;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.LittleEndian;
-
-/**
- * Tests the serialization and deserialization of the CFRecordsAggregate
- * class works correctly.  
- */
-@SuppressWarnings("resource")
-public final class TestCFRecordsAggregate extends TestCase {
-    public void testCFRecordsAggregate() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-
-        List<Record> recs = new ArrayList<Record>();
-        CFHeaderBase header = new CFHeaderRecord();
-        CFRuleBase rule1 = CFRuleRecord.create(sheet, "7");
-        CFRuleBase rule2 = CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "2", "5");
-        CFRuleBase rule3 = CFRuleRecord.create(sheet, ComparisonOperator.GE, "100", null);
-        header.setNumberOfConditionalFormats(3);
-        CellRangeAddress[] cellRanges = {
-                new CellRangeAddress(0,1,0,0),
-                new CellRangeAddress(0,1,2,2),
-        };
-        header.setCellRanges(cellRanges);
-        recs.add(header);
-        recs.add(rule1);
-        recs.add(rule2);
-        recs.add(rule3);
-        CFRecordsAggregate record = CFRecordsAggregate.createCFAggregate(new RecordStream(recs, 0));
-
-        // Serialize
-        byte [] serializedRecord = new byte[record.getRecordSize()];
-        record.serialize(0, serializedRecord);
-        InputStream in = new ByteArrayInputStream(serializedRecord);
-
-        //Parse
-        recs = RecordFactory.createRecords(in);
-
-        // Verify
-        assertNotNull(recs);
-        assertEquals(4, recs.size());
-
-        header = (CFHeaderRecord)recs.get(0);
-        rule1 = (CFRuleRecord)recs.get(1);
-        assertNotNull(rule1);
-        rule2 = (CFRuleRecord)recs.get(2);
-        assertNotNull(rule2);
-        rule3 = (CFRuleRecord)recs.get(3);
-        assertNotNull(rule3);
-        cellRanges = header.getCellRanges();
-
-        assertEquals(2, cellRanges.length);
-        assertEquals(3, header.getNumberOfConditionalFormats());
-        assertFalse(header.getNeedRecalculation());
-
-        record = CFRecordsAggregate.createCFAggregate(new RecordStream(recs, 0));
-
-        record = record.cloneCFAggregate();
-
-        assertNotNull(record.getHeader());
-        assertEquals(3,record.getNumberOfRules());
-
-        header = record.getHeader();
-        rule1 = record.getRule(0);
-        assertNotNull(rule1);
-        rule2 = record.getRule(1);
-        assertNotNull(rule2);
-        rule3 = record.getRule(2);
-        assertNotNull(rule3);
-        cellRanges = header.getCellRanges();
-
-        assertEquals(2, cellRanges.length);
-        assertEquals(3, header.getNumberOfConditionalFormats());
-        assertFalse(header.getNeedRecalculation());
-    }
-
-    /**
-     * Make sure that the CF Header record is properly updated with the number of rules
-     */
-    public void testNRules() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        CellRangeAddress[] cellRanges = {
-                new CellRangeAddress(0,1,0,0),
-                new CellRangeAddress(0,1,2,2),
-        };
-        CFRuleRecord[] rules = {
-                CFRuleRecord.create(sheet, "7"),
-                CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "2", "5"),
-        };
-        CFRecordsAggregate agg = new CFRecordsAggregate(cellRanges, rules);
-        byte[] serializedRecord = new byte[agg.getRecordSize()];
-        agg.serialize(0, serializedRecord);
-
-        int nRules = LittleEndian.getUShort(serializedRecord, 4);
-        if (nRules == 0) {
-            throw new AssertionFailedError("Identified bug 45682 b");
-        }
-        assertEquals(rules.length, nRules);
-    }
-    
-    public void testCantMixTypes() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        CellRangeAddress[] cellRanges = {
-                new CellRangeAddress(0,1,0,0),
-                new CellRangeAddress(0,1,2,2),
-        };
-        CFRuleBase[] rules = {
-                CFRuleRecord.create(sheet, "7"),
-                CFRule12Record.create(sheet, ComparisonOperator.BETWEEN, "2", "5"),
-        };
-        try {
-            new CFRecordsAggregate(cellRanges, rules);
-            fail("Shouldn't be able to mix between types");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-        
-        
-        rules = new CFRuleBase[] { CFRuleRecord.create(sheet, "7") };
-        CFRecordsAggregate agg = new CFRecordsAggregate(cellRanges, rules);
-        assertTrue(agg.getHeader().getNeedRecalculation());
-        
-        try {
-            agg.addRule(CFRule12Record.create(sheet, "7"));
-            fail("Shouldn't be able to mix between types");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
deleted file mode 100644
index 28299b8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.record.ColumnInfoRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-public final class TestColumnInfoRecordsAggregate {
-
-	@Test
-    public void testGetRecordSize() {
-		ColumnInfoRecordsAggregate agg = new ColumnInfoRecordsAggregate();
-		agg.insertColumn(createColInfo(1, 3));
-		agg.insertColumn(createColInfo(4, 7));
-		agg.insertColumn(createColInfo(8, 8));
-		agg.groupColumnRange((short) 2, (short) 5, true);
-		assertEquals(4, agg.getNumColumns());
-
-		confirmSerializedSize(agg);
-
-		agg = new ColumnInfoRecordsAggregate();
-		agg.groupColumnRange((short) 3, (short) 6, true);
-		confirmSerializedSize(agg);
-	}
-
-	private static void confirmSerializedSize(RecordBase cirAgg) {
-		int estimatedSize = cirAgg.getRecordSize();
-		byte[] buf = new byte[estimatedSize];
-		int serializedSize = cirAgg.serialize(0, buf);
-		assertEquals(estimatedSize, serializedSize);
-	}
-
-	private static ColumnInfoRecord createColInfo(int firstCol, int lastCol) {
-		ColumnInfoRecord columnInfoRecord = new ColumnInfoRecord();
-		columnInfoRecord.setFirstColumn((short) firstCol);
-		columnInfoRecord.setLastColumn((short) lastCol);
-		return columnInfoRecord;
-	}
-
-	private static final class CIRCollector implements RecordVisitor {
-
-		private final List<Record> _list = new ArrayList<Record>();
-
-		@Override
-        public void visitRecord(Record r) {
-			_list.add(r);
-		}
-
-		public static ColumnInfoRecord[] getRecords(ColumnInfoRecordsAggregate agg) {
-			CIRCollector circ = new CIRCollector();
-			agg.visitContainedRecords(circ);
-			ColumnInfoRecord[] result =
-	            circ._list.toArray(new ColumnInfoRecord[circ._list.size()]);
-			return result;
-		}
-	}
-
-	@Test
-	public void testGroupColumns_bug45639() {
-		ColumnInfoRecordsAggregate agg = new ColumnInfoRecordsAggregate();
-		agg.groupColumnRange( 7, 9, true);
-		agg.groupColumnRange( 4, 12, true);
-		try {
-			agg.groupColumnRange( 1, 15, true);
-		} catch (ArrayIndexOutOfBoundsException e) {
-			throw new AssertionFailedError("Identified bug 45639");
-		}
-		ColumnInfoRecord[] cirs = CIRCollector.getRecords(agg);
-		assertEquals(5, cirs.length);
-		confirmCIR(cirs, 0,  1,  3, 1, false, false);
-		confirmCIR(cirs, 1,  4,  6, 2, false, false);
-		confirmCIR(cirs, 2,  7,  9, 3, false, false);
-		confirmCIR(cirs, 3, 10, 12, 2, false, false);
-		confirmCIR(cirs, 4, 13, 15, 1, false, false);
-	}
-
-	/**
-	 * Check that an inner group remains hidden
-	 */
-	@Test
-	public void testHiddenAfterExpanding() {
-		ColumnInfoRecordsAggregate agg = new ColumnInfoRecordsAggregate();
-		agg.groupColumnRange(1, 15, true);
-		agg.groupColumnRange(4, 12, true);
-
-		ColumnInfoRecord[] cirs;
-
-		// collapse both inner and outer groups
-		agg.collapseColumn(6);
-		agg.collapseColumn(3);
-
-		cirs = CIRCollector.getRecords(agg);
-		assertEquals(5, cirs.length);
-		confirmCIR(cirs, 0,  1,  3, 1, true, false);
-		confirmCIR(cirs, 1,  4, 12, 2, true, false);
-		confirmCIR(cirs, 2, 13, 13, 1, true, true);
-		confirmCIR(cirs, 3, 14, 15, 1, true, false);
-		confirmCIR(cirs, 4, 16, 16, 0, false, true);
-
-		// just expand the inner group
-		agg.expandColumn(6);
-
-		cirs = CIRCollector.getRecords(agg);
-		assertEquals(4, cirs.length);
-		if (!cirs[1].getHidden()) {
-			throw new AssertionFailedError("Inner group should still be hidden");
-		}
-		confirmCIR(cirs, 0,  1,  3, 1, true, false);
-		confirmCIR(cirs, 1,  4, 12, 2, true, false);
-		confirmCIR(cirs, 2, 13, 15, 1, true, false);
-		confirmCIR(cirs, 3, 16, 16, 0, false, true);
-	}
-	
-	private static void confirmCIR(ColumnInfoRecord[] cirs, int ix, int startColIx, int endColIx, int level, boolean isHidden, boolean isCollapsed) {
-		ColumnInfoRecord cir = cirs[ix];
-		assertEquals("startColIx", startColIx, cir.getFirstColumn());
-		assertEquals("endColIx", endColIx, cir.getLastColumn());
-		assertEquals("level", level, cir.getOutlineLevel());
-		assertEquals("hidden", isHidden, cir.getHidden());
-		assertEquals("collapsed", isCollapsed, cir.getCollapsed());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
deleted file mode 100644
index 677134e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.ExpPtg;
-import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.FormulaRenderer;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- *
- * @author avik
- */
-public final class TestFormulaRecordAggregate extends TestCase {
-
-	public void testBasic() {
-		FormulaRecord f = new FormulaRecord();
-		f.setCachedResultTypeString();
-		StringRecord s = new StringRecord();
-		s.setString("abc");
-		FormulaRecordAggregate fagg = new FormulaRecordAggregate(f, s, SharedValueManager.createEmpty());
-		assertEquals("abc", fagg.getStringValue());
-		assertFalse(fagg.isPartOfArrayFormula());
-	}
-
-	/**
-	 * Sometimes a {@link StringRecord} appears after a {@link FormulaRecord} even though the
-	 * formula has evaluated to a text value.  This might be more likely to occur when the formula
-	 * <i>can</i> evaluate to a text value.<br/>
-	 * Bug 46213 attachment 22874 has such an extra {@link StringRecord} at stream offset 0x5765.
-	 * This file seems to open in Excel (2007) with no trouble.  When it is re-saved, Excel omits
-	 * the extra record.  POI should do the same.
-	 */
-	public void testExtraStringRecord_bug46213() {
-		FormulaRecord fr = new FormulaRecord();
-		fr.setValue(2.0);
-		StringRecord sr = new StringRecord();
-		sr.setString("NA");
-		SharedValueManager svm = SharedValueManager.createEmpty();
-		FormulaRecordAggregate fra;
-
-		try {
-			fra = new FormulaRecordAggregate(fr, sr, svm);
-		} catch (RecordFormatException e) {
-			if ("String record was  supplied but formula record flag is not  set".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 46213");
-			}
-			throw e;
-		}
-		RecordCollector rc = new RecordCollector();
-		fra.visitContainedRecords(rc);
-		Record[] vraRecs = rc.getRecords();
-		assertEquals(1, vraRecs.length);
-		assertEquals(fr, vraRecs[0]);
-	}
-
-	public void testArrayFormulas() {
-		int rownum = 4;
-		int colnum = 4;
-
-		FormulaRecord fr = new FormulaRecord();
-		fr.setRow(rownum);
-		fr.setColumn((short)colnum);
-
-		FormulaRecordAggregate agg = new FormulaRecordAggregate(fr, null, SharedValueManager.createEmpty());
-		Ptg[] ptgsForCell = {new ExpPtg(rownum, colnum)};
-		agg.setParsedExpression(ptgsForCell);
-
-		String formula = "SUM(A1:A3*B1:B3)";
-		Ptg[] ptgs = HSSFFormulaParser.parse(formula, null, FormulaType.ARRAY, 0);
-		agg.setArrayFormula(new CellRangeAddress(rownum, rownum, colnum, colnum), ptgs);
-
-		assertTrue(agg.isPartOfArrayFormula());
-		assertEquals("E5", agg.getArrayFormulaRange().formatAsString());
-		Ptg[] ptg = agg.getFormulaTokens();
-		String fmlaSer = FormulaRenderer.toFormulaString(null, ptg);
-		assertEquals(formula, fmlaSer);
-
-        agg.removeArrayFormula(rownum, colnum);
-        assertFalse(agg.isPartOfArrayFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
deleted file mode 100644
index a63fd7b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.Arrays;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.hssf.usermodel.HSSFPrintSetup;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tess for {@link PageSettingsBlock}
- *
- * @author Dmitriy Kumshayev
- */
-public final class TestPageSettingsBlock extends TestCase {
-
-	public void testPrintSetup_bug46548() {
-
-		// PageSettingBlock in this file contains PLS (sid=x004D) record
-		// followed by ContinueRecord (sid=x003C)
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex46548-23133.xls");
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFPrintSetup ps = sheet.getPrintSetup();
-
-		try {
-			ps.getCopies();
-		} catch (NullPointerException e) {
-			e.printStackTrace();
-			throw new AssertionFailedError("Identified bug 46548: PageSettingBlock missing PrintSetupRecord record");
-		}
-	}
-
-	/**
-	 * Bug 46840 occurred because POI failed to recognise HEADERFOOTER as part of the
-	 * {@link PageSettingsBlock}.
-	 */
-	public void testHeaderFooter_bug46840() {
-
-		int rowIx = 5;
-		int colIx = 6;
-		NumberRecord nr = new NumberRecord();
-		nr.setRow(rowIx);
-		nr.setColumn((short) colIx);
-		nr.setValue(3.0);
-
-		Record[] recs = {
-				BOFRecord.createSheetBOF(),
-				new HeaderRecord("&LSales Figures"),
-				new FooterRecord("&LJanuary"),
-				new HeaderFooterRecord(HexRead.readFromString("9C 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 C4 60 00 00 00 00 00 00 00 00")),
-				new DimensionsRecord(),
-				new WindowTwoRecord(),
-				new UserSViewBegin(HexRead.readFromString("ED 77 3B 86 BC 3F 37 4C A9 58 60 23 43 68 54 4B 01 00 00 00 64 00 00 00 40 00 00 00 02 00 00 00 3D 80 04 00 00 00 00 00 00 00 0C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 F0 3F FF FF 01 00")),
-				new HeaderRecord("&LSales Figures"),
-				new FooterRecord("&LJanuary"),
-				new HeaderFooterRecord(HexRead.readFromString("9C 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 C4 60 00 00 00 00 00 00 00 00")),
-				new UserSViewEnd(HexRead.readFromString("01, 00")),
-
-				EOFRecord.instance,
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-		InternalSheet sheet;
-		try {
-			sheet = InternalSheet.createSheet(rs);
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("two Page Settings Blocks found in the same sheet")) {
-				throw new AssertionFailedError("Identified bug 46480");
-			}
-			throw e;
-		}
-
-		RecordCollector rv = new RecordCollector();
-		sheet.visitContainedRecords(rv, rowIx);
-		Record[] outRecs = rv.getRecords();
-		assertEquals(13, outRecs.length);
-	}
-
-	/**
-	 * Bug 46953 occurred because POI didn't handle late PSB records properly.
-	 */
-	public void testLateHeaderFooter_bug46953() {
-
-		int rowIx = 5;
-		int colIx = 6;
-		NumberRecord nr = new NumberRecord();
-		nr.setRow(rowIx);
-		nr.setColumn((short) colIx);
-		nr.setValue(3.0);
-
-		Record[] recs = {
-				BOFRecord.createSheetBOF(),
-				new HeaderRecord("&LSales Figures"),
-				new FooterRecord("&LJanuary"),
-				new DimensionsRecord(),
-				new WindowTwoRecord(),
-				new HeaderFooterRecord(HexRead.readFromString("9C 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 C4 60 00 00 00 00 00 00 00 00")),
-				EOFRecord.instance,
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-		InternalSheet sheet = InternalSheet.createSheet(rs);
-
-		RecordCollector rv = new RecordCollector();
-		sheet.visitContainedRecords(rv, 0);
-		Record[] outRecs = rv.getRecords();
-		if (outRecs[4] == EOFRecord.instance) {
-			throw new AssertionFailedError("Identified bug 46953 - EOF incorrectly appended to PSB");
-		}
-		assertEquals(recs.length+1, outRecs.length); // +1 for index record
-
-		assertEquals(BOFRecord.class, outRecs[0].getClass());
-		assertEquals(IndexRecord.class, outRecs[1].getClass());
-		assertEquals(HeaderRecord.class, outRecs[2].getClass());
-		assertEquals(FooterRecord.class, outRecs[3].getClass());
-		assertEquals(HeaderFooterRecord.class, outRecs[4].getClass());
-		assertEquals(DimensionsRecord.class, outRecs[5].getClass());
-		assertEquals(WindowTwoRecord.class, outRecs[6].getClass());
-		assertEquals(EOFRecord.instance, outRecs[7]);
-	}
-	/**
-	 * Bug 47199 was due to the margin records being located well after the initial PSB records.
-	 * The example file supplied (attachment 23710) had three non-PSB record types
-	 * between the PRINTSETUP record and first MARGIN record:
-	 * <ul>
-	 * <li>PRINTSETUP(0x00A1)</li>
-	 * <li>DEFAULTCOLWIDTH(0x0055)</li>
-	 * <li>COLINFO(0x007D)</li>
-	 * <li>DIMENSIONS(0x0200)</li>
-	 * <li>BottomMargin(0x0029)</li>
-	 * </ul>
-	 */
-	public void testLateMargins_bug47199() {
-
-		Record[] recs = {
-				BOFRecord.createSheetBOF(),
-				new HeaderRecord("&LSales Figures"),
-				new FooterRecord("&LJanuary"),
-				new DimensionsRecord(),
-				createBottomMargin(0.787F),
-				new WindowTwoRecord(),
-				EOFRecord.instance,
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-
-		InternalSheet sheet;
-		try {
-			sheet = InternalSheet.createSheet(rs);
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("two Page Settings Blocks found in the same sheet")) {
-				throw new AssertionFailedError("Identified bug 47199a - failed to process late margings records");
-			}
-			throw e;
-		}
-
-		RecordCollector rv = new RecordCollector();
-		sheet.visitContainedRecords(rv, 0);
-		Record[] outRecs = rv.getRecords();
-		assertEquals(recs.length+1, outRecs.length); // +1 for index record
-
-		assertEquals(BOFRecord.class, outRecs[0].getClass());
-		assertEquals(IndexRecord.class, outRecs[1].getClass());
-		assertEquals(HeaderRecord.class, outRecs[2].getClass());
-		assertEquals(FooterRecord.class, outRecs[3].getClass());
-		assertEquals(DimensionsRecord.class, outRecs[5].getClass());
-		assertEquals(WindowTwoRecord.class, outRecs[6].getClass());
-		assertEquals(EOFRecord.instance, outRecs[7]);
-	}
-
-	private Record createBottomMargin(float value) {
-		BottomMarginRecord result = new BottomMarginRecord();
-		result.setMargin(value);
-		return result;
-	}
-
-	/**
-	 * The PageSettingsBlock should not allow multiple copies of the same record.  This extra assertion
-	 * was added while fixing bug 47199.  All existing POI test samples comply with this requirement.
-	 */
-	public void testDuplicatePSBRecord_bug47199() {
-
-		// Hypothetical setup of PSB records which should cause POI to crash
-		Record[] recs = {
-				new HeaderRecord("&LSales Figures"),
-				new HeaderRecord("&LInventory"),
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-
-		try {
-			new PageSettingsBlock(rs);
-			throw new AssertionFailedError("Identified bug 47199b - duplicate PSB records should not be allowed");
-		} catch (RecordFormatException e) {
-			if (e.getMessage().equals("Duplicate PageSettingsBlock record (sid=0x14)")) {
-				// expected during successful test
-			} else {
-				throw new AssertionFailedError("Expected RecordFormatException due to duplicate PSB record");
-			}
-		}
-	}
-
-	private static UnknownRecord ur(int sid, String hexData) {
-		return new UnknownRecord(sid, HexRead.readFromString(hexData));
-	}
-
-	/**
-	 * Excel tolerates missing header / footer records, but adds them (empty) in when re-saving.
-	 * This is not critical functionality but it has been decided to keep POI consistent with
-	 * Excel in this regard.
-	 */
-	public void testMissingHeaderFooter() {
-		// initialise PSB with some records, but not the header / footer
-		Record[] recs = {
-				new HCenterRecord(),
-				new VCenterRecord(),
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-		PageSettingsBlock psb = new PageSettingsBlock(rs);
-
-		// serialize the PSB to see what records come out
-		RecordCollector rc = new RecordCollector();
-		psb.visitContainedRecords(rc);
-		Record[] outRecs = rc.getRecords();
-
-		if (outRecs.length == 2) {
-			throw new AssertionFailedError("PageSettingsBlock didn't add missing header/footer records");
-		}
-		assertEquals(4, outRecs.length);
-		assertEquals(HeaderRecord.class, outRecs[0].getClass());
-		assertEquals(FooterRecord.class, outRecs[1].getClass());
-		assertEquals(HCenterRecord.class, outRecs[2].getClass());
-		assertEquals(VCenterRecord.class, outRecs[3].getClass());
-
-		// make sure the added header / footer records are empty
-		HeaderRecord hr = (HeaderRecord) outRecs[0];
-		assertEquals("", hr.getText());
-		FooterRecord fr = (FooterRecord) outRecs[1];
-		assertEquals("", fr.getText());
-	}
-
-	/**
-	 * Apparently it's OK to have more than one PLS record.
-	 * Attachment 23866 from bug 47415 had a PageSettingsBlock with two PLS records.  This file
-	 * seems to open OK in Excel(2007) but both PLS records are removed (perhaps because the
-	 * specified printers were not available on the testing machine).  Since the example file does
-	 * not upset Excel, POI will preserve multiple PLS records.</p>
-	 *
-	 * As of June 2009, PLS is still uninterpreted by POI
-	 */
-	public void testDuplicatePLS_bug47415() {
-		Record plsA = ur(UnknownRecord.PLS_004D, "BA AD F0 0D");
-		Record plsB = ur(UnknownRecord.PLS_004D, "DE AD BE EF");
-		Record contB1 = new ContinueRecord(HexRead.readFromString("FE ED"));
-		Record contB2 = new ContinueRecord(HexRead.readFromString("FA CE"));
-		Record[] recs = {
-				new HeaderRecord("&LSales Figures"),
-				new FooterRecord("&LInventory"),
-				new HCenterRecord(),
-				new VCenterRecord(),
-				plsA,
-				plsB, contB1, contB2, // make sure continuing PLS is still OK
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-		PageSettingsBlock psb;
-		try {
-			psb = new PageSettingsBlock(rs);
-		} catch (RecordFormatException e) {
-			if ("Duplicate PageSettingsBlock record (sid=0x4d)".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 47415");
-			}
-			throw e;
-		}
-
-		// serialize the PSB to see what records come out
-		RecordCollector rc = new RecordCollector();
-		psb.visitContainedRecords(rc);
-		Record[] outRecs = rc.getRecords();
-
-		// records were assembled in standard order, so this simple check is OK
-		assertArrayEquals(recs, outRecs);
-	}
-
-    public void testDuplicateHeaderFooter_bug48026() {
-
-        Record[] recs = {
-                BOFRecord.createSheetBOF(),
-                new IndexRecord(),
-
-                //PageSettingsBlock
-                new HeaderRecord("&LDecember"),
-                new FooterRecord("&LJanuary"),
-                new DimensionsRecord(),
-
-                new WindowTwoRecord(),
-
-                //CustomViewSettingsRecordAggregate
-                new UserSViewBegin(HexRead.readFromString("53 CE BD CC DE 38 44 45 97 C1 5C 89 F9 37 32 1B 01 00 00 00 64 00 00 00 40 00 00 00 03 00 00 00 7D 00 00 20 00 00 34 00 00 00 18 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF FF FF")),
-                new SelectionRecord(0, 0),
-                new UserSViewEnd(HexRead.readFromString("01 00")),
-
-                // two HeaderFooterRecord records, the first one has zero GUID (16 bytes at offset 12) and belongs to the PSB,
-                // the other is matched with a CustomViewSettingsRecordAggregate having UserSViewBegin with the same GUID
-                new HeaderFooterRecord(HexRead.readFromString("9C 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 34 33 00 00 00 00 00 00 00 00")),
-                new HeaderFooterRecord(HexRead.readFromString("9C 08 00 00 00 00 00 00 00 00 00 00 53 CE BD CC DE 38 44 45 97 C1 5C 89 F9 37 32 1B 34 33 00 00 00 00 00 00 00 00")),
-
-                EOFRecord.instance,
-        };
-        RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-        InternalSheet sheet;
-        try {
-            sheet = InternalSheet.createSheet(rs);
-        } catch (RuntimeException e) {
-            if (e.getMessage().equals("Duplicate PageSettingsBlock record (sid=0x89c)")) {
-                throw new AssertionFailedError("Identified bug 48026");
-            }
-            throw e;
-        }
-
-        RecordCollector rv = new RecordCollector();
-        sheet.visitContainedRecords(rv, 0);
-        Record[] outRecs = rv.getRecords();
-
-        assertEquals(recs.length, outRecs.length);
-        //expected order of records:
-        Record[] expectedRecs = {
-                recs[0],  //BOFRecord
-                recs[1],  //IndexRecord
-
-                //PageSettingsBlock
-                recs[2],  //HeaderRecord
-                recs[3],  //FooterRecord
-                recs[9],  //HeaderFooterRecord
-                recs[4],  // DimensionsRecord
-                recs[5],  // WindowTwoRecord
-
-                //CustomViewSettingsRecordAggregate
-                recs[6],  // UserSViewBegin
-                recs[7],  // SelectionRecord
-                recs[10], // HeaderFooterRecord
-                recs[8],  // UserSViewEnd
-
-                recs[11],  //EOFRecord
-        };
-        for(int i=0; i < expectedRecs.length; i++){
-            assertEquals("Record mismatch at index " + i,  expectedRecs[i].getClass(), outRecs[i].getClass());
-        }
-        HeaderFooterRecord hd1 = (HeaderFooterRecord)expectedRecs[4];
-        //GUID is zero
-        assertArrayEquals(new byte[16], hd1.getGuid());
-        assertTrue(hd1.isCurrentSheet());
-
-        UserSViewBegin svb = (UserSViewBegin)expectedRecs[7];
-        HeaderFooterRecord hd2 = (HeaderFooterRecord)expectedRecs[9];
-        assertFalse(hd2.isCurrentSheet());
-        //GUIDs of HeaderFooterRecord and UserSViewBegin must be the same
-        assertArrayEquals(svb.getGuid(), hd2.getGuid());
-    }
-
-    public void testDuplicateHeaderFooterInside_bug48026() {
-
-        Record[] recs = {
-                BOFRecord.createSheetBOF(),
-                new IndexRecord(),
-
-                //PageSettingsBlock
-                new HeaderRecord("&LDecember"),
-                new FooterRecord("&LJanuary"),
-                new DimensionsRecord(),
-
-                new WindowTwoRecord(),
-
-                //CustomViewSettingsRecordAggregate
-                new UserSViewBegin(HexRead.readFromString("53 CE BD CC DE 38 44 45 97 C1 5C 89 F9 37 32 1B 01 00 00 00 64 00 00 00 40 00 00 00 03 00 00 00 7D 00 00 20 00 00 34 00 00 00 18 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF FF FF")),
-                new SelectionRecord(0, 0),
-
-                // two HeaderFooterRecord records, the first one has zero GUID (16 bytes at offset 12) and belongs to the PSB,
-                // the other is matched with a CustomViewSettingsRecordAggregate having UserSViewBegin with the same GUID
-                new HeaderFooterRecord(HexRead.readFromString("9C 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 34 33 00 00 00 00 00 00 00 00")),
-                new HeaderFooterRecord(HexRead.readFromString("9C 08 00 00 00 00 00 00 00 00 00 00 53 CE BD CC DE 38 44 45 97 C1 5C 89 F9 37 32 1B 34 33 00 00 00 00 00 00 00 00")),
-
-                new UserSViewEnd(HexRead.readFromString("01 00")),
-
-                EOFRecord.instance,
-        };
-        RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
-        InternalSheet sheet;
-        try {
-            sheet = InternalSheet.createSheet(rs);
-        } catch (RuntimeException e) {
-            if (e.getMessage().equals("Duplicate PageSettingsBlock record (sid=0x89c)")) {
-                throw new AssertionFailedError("Identified bug 48026");
-            }
-            throw e;
-        }
-
-        RecordCollector rv = new RecordCollector();
-        sheet.visitContainedRecords(rv, 0);
-        Record[] outRecs = rv.getRecords();
-
-        assertEquals(recs.length+1, outRecs.length);
-        //expected order of records:
-        Record[] expectedRecs = {
-                recs[0],  //BOFRecord
-                recs[1],  //IndexRecord
-
-                //PageSettingsBlock
-                recs[2],  //HeaderRecord
-                recs[3],  //FooterRecord
-                recs[4],  // DimensionsRecord
-                recs[5],  // WindowTwoRecord
-
-                //CustomViewSettingsRecordAggregate
-                recs[6],  // UserSViewBegin
-                recs[7],  // SelectionRecord
-                recs[2],  //HeaderRecord
-                recs[3],  //FooterRecord
-                recs[8], // HeaderFooterRecord
-//                recs[9],  //HeaderFooterRecord
-                recs[10],  // UserSViewEnd
-
-                recs[11],  //EOFRecord
-        };
-        for(int i=0; i < expectedRecs.length; i++){
-            assertEquals("Record mismatch at index " + i,  expectedRecs[i].getClass(), outRecs[i].getClass());
-        }
-        HeaderFooterRecord hd1 = (HeaderFooterRecord)expectedRecs[10];
-        //GUID is zero
-        assertArrayEquals(new byte[16], hd1.getGuid());
-        assertTrue(hd1.isCurrentSheet());
-
-        UserSViewBegin svb = (UserSViewBegin)expectedRecs[6];
-        HeaderFooterRecord hd2 = (HeaderFooterRecord)recs[9];
-        assertFalse(hd2.isCurrentSheet());
-        //GUIDs of HeaderFooterRecord and UserSViewBegin must be the same
-        assertArrayEquals(svb.getGuid(), hd2.getGuid());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
deleted file mode 100644
index 1d8b508..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.record.ArrayRecord;
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.SharedValueRecordBase;
-import org.apache.poi.hssf.record.TableRecord;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.RecordInspector;
-import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
-import org.apache.poi.hssf.util.CellRangeAddress8Bit;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Tests for {@link RowRecordsAggregate}
- */
-public final class TestRowRecordsAggregate {
-
-    @Test
-	public void testRowGet() {
-		RowRecordsAggregate rra = new RowRecordsAggregate();
-		RowRecord rr = new RowRecord(4);
-		rra.insertRow(rr);
-		rra.insertRow(new RowRecord(1));
-
-		RowRecord rr1 = rra.getRow(4);
-
-		assertNotNull(rr1);
-		assertEquals("Row number is 1", 4, rr1.getRowNumber());
-		assertTrue("Row record retrieved is identical ", rr1 == rr);
-	}
-
-	/**
-	 * Prior to Aug 2008, POI would re-serialize spreadsheets with {@link ArrayRecord}s or
-	 * {@link TableRecord}s with those records out of order.  Similar to
-	 * {@link SharedFormulaRecord}s, these records should appear immediately after the first
-	 * {@link FormulaRecord}s that they apply to (and only once).<br/>
-	 */
-    @Test
-	public void testArraysAndTables() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("testArraysAndTables.xls");
-		Record[] sheetRecs = RecordInspector.getRecords(wb.getSheetAt(0), 0);
-
-		int countArrayFormulas = verifySharedValues(sheetRecs, ArrayRecord.class);
-		assertEquals(5, countArrayFormulas);
-		int countTableFormulas = verifySharedValues(sheetRecs, TableRecord.class);
-		assertEquals(3, countTableFormulas);
-
-		// Note - SharedFormulaRecords are currently not re-serialized by POI (each is extracted
-		// into many non-shared formulas), but if they ever were, the same rules would apply.
-		int countSharedFormulas = verifySharedValues(sheetRecs, SharedFormulaRecord.class);
-		assertEquals(0, countSharedFormulas);
-
-
-//		if (false) { // set true to observe re-serialized file
-//			File f = new File(System.getProperty("java.io.tmpdir") + "/testArraysAndTables-out.xls");
-//			try {
-//				OutputStream os = new FileOutputStream(f);
-//				wb.write(os);
-//				os.close();
-//			} catch (IOException e) {
-//				throw new RuntimeException(e);
-//			}
-//			System.out.println("Output file to " + f.getAbsolutePath());
-//		}
-		
-		wb.close();
-	}
-
-	private static int verifySharedValues(Record[] recs, Class<? extends SharedValueRecordBase> shfClass) {
-
-		int result =0;
-		for(int i=0; i<recs.length; i++) {
-			Record rec = recs[i];
-			if (rec.getClass() == shfClass) {
-				result++;
-				Record prevRec = recs[i-1];
-				if (!(prevRec instanceof FormulaRecord)) {
-					fail("Bad record order at index "
-							+ i + ": Formula record expected but got ("
-							+ prevRec.getClass().getName() + ")");
-				}
-				verifySharedFormula((FormulaRecord) prevRec, rec);
-			}
-		}
-		return result;
-	}
-
-	private static void verifySharedFormula(FormulaRecord firstFormula, Record rec) {
-		CellRangeAddress8Bit range = ((SharedValueRecordBase)rec).getRange();
-		assertEquals(range.getFirstRow(), firstFormula.getRow());
-		assertEquals(range.getFirstColumn(), firstFormula.getColumn());
-	}
-
-	/**
-	 * This problem was noted as the overt symptom of bug 46280.  The logic for skipping {@link
-	 * UnknownRecord}s in the constructor {@link RowRecordsAggregate} did not allow for the
-	 * possibility of tailing {@link ContinueRecord}s.<br/>
-	 * The functionality change being tested here is actually not critical to the overall fix
-	 * for bug 46280, since the fix involved making sure the that offending <i>PivotTable</i>
-	 * records do not get into {@link RowRecordsAggregate}.<br/>
-	 * This fix in {@link RowRecordsAggregate} was implemented anyway since any {@link
-	 * UnknownRecord} has the potential of being 'continued'.
-	 */
-	@Test
-	public void testUnknownContinue_bug46280() {
-		Record[] inRecs = {
-			new RowRecord(0),
-			new NumberRecord(),
-			new UnknownRecord(0x5555, "dummydata".getBytes(LocaleUtil.CHARSET_1252)),
-			new ContinueRecord("moredummydata".getBytes(LocaleUtil.CHARSET_1252)),
-		};
-		RecordStream rs = new RecordStream(Arrays.asList(inRecs), 0);
-		RowRecordsAggregate rra;
-		try {
-			rra = new RowRecordsAggregate(rs, SharedValueManager.createEmpty());
-		} catch (RuntimeException e) {
-			if (e.getMessage().startsWith("Unexpected record type")) {
-				fail("Identified bug 46280a");
-			}
-			throw e;
-		}
-		RecordCollector rv = new RecordCollector();
-		rra.visitContainedRecords(rv);
-		Record[] outRecs = rv.getRecords();
-		assertEquals(5, outRecs.length);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
deleted file mode 100644
index 66f8e89..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import java.util.Collection;
-import java.util.HashMap;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.POITestCase;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.RecordInspector;
-
-/**
- * Tests for {@link SharedValueManager}
- *
- * @author Josh Micich
- */
-public final class TestSharedValueManager extends TestCase {
-
-	/**
-	 * This Excel workbook contains two sheets that each have a pair of overlapping shared formula
-	 * ranges.  The first sheet has one row and one column shared formula ranges which intersect.
-	 * The second sheet has two column shared formula ranges - one contained within the other.
-	 * These shared formula ranges were created by fill-dragging a single cell formula across the
-	 * desired region.  The larger shared formula ranges were placed first.<br/>
-	 *
-	 * There are probably many ways to produce similar effects, but it should be noted that Excel
-	 * is quite temperamental in this regard.  Slight variations in technique can cause the shared
-	 * formulas to spill out into plain formula records (which would make these tests pointless).
-	 *
-	 */
-	private static final String SAMPLE_FILE_NAME = "overlapSharedFormula.xls";
-	/**
-	 * Some of these bugs are intermittent, and the test author couldn't think of a way to write
-	 * test code to hit them bug deterministically. The reason for the unpredictability is that
-	 * the bugs depended on the {@link SharedFormulaRecord}s being searched in a particular order.
-	 * At the time of writing of the test, the order was being determined by the call to {@link
-	 * Collection#toArray(Object[])} on {@link HashMap#values()} where the items in the map were
-	 * using default {@link Object#hashCode()}<br/>
-	 */
-	private static final int MAX_ATTEMPTS=5;
-
-	/**
-	 * This bug happened when there were two or more shared formula ranges that overlapped.  POI
-	 * would sometimes associate formulas in the overlapping region with the wrong shared formula
-	 */
-	public void testPartiallyOverlappingRanges() {
-		Record[] records;
-
-		int attempt=1;
-		do {
-			HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(SAMPLE_FILE_NAME);
-
-			HSSFSheet sheet = wb.getSheetAt(0);
-			RecordInspector.getRecords(sheet, 0);
-			assertEquals("1+1", sheet.getRow(2).getCell(0).getCellFormula());
-			if ("1+1".equals(sheet.getRow(3).getCell(0).getCellFormula())) {
-				throw new AssertionFailedError("Identified bug - wrong shared formula record chosen"
-						+ " (attempt " + attempt + ")");
-			}
-			assertEquals("2+2", sheet.getRow(3).getCell(0).getCellFormula());
-			records = RecordInspector.getRecords(sheet, 0);
-		} while (attempt++ < MAX_ATTEMPTS);
-
-		int count=0;
-		for (Record record : records) {
-			if (record instanceof SharedFormulaRecord) {
-				count++;
-			}
-		}
-		assertEquals(2, count);
-	}
-
-	/**
-	 * This bug occurs for similar reasons to the bug in {@link #testPartiallyOverlappingRanges()}
-	 * but the symptoms are much uglier - serialization fails with {@link NullPointerException}.<br/>
-	 */
-	public void testCompletelyOverlappedRanges() {
-		Record[] records;
-
-		int attempt=1;
-		do {
-			HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(SAMPLE_FILE_NAME);
-
-			HSSFSheet sheet = wb.getSheetAt(1);
-			try {
-				records = RecordInspector.getRecords(sheet, 0);
-			} catch (NullPointerException e) {
-				throw new AssertionFailedError("Identified bug " +
-						"- cannot reserialize completely overlapped shared formula"
-						+ " (attempt " + attempt + ")");
-			}
-		} while (attempt++ < MAX_ATTEMPTS);
-
-		int count=0;
-		for (Record record : records) {
-			if (record instanceof SharedFormulaRecord) {
-				count++;
-			}
-		}
-		assertEquals(2, count);
-	}
-
-	/**
-	 * Tests fix for a bug in the way shared formula cells are associated with shared formula
-	 * records.  Prior to this fix, POI would attempt to use the upper left corner of the
-	 * shared formula range as the locator cell.  The correct cell to use is the 'first cell'
-	 * in the shared formula group which is not always the top left cell.  This is possible
-	 * because shared formula groups may be sparse and may overlap.<br/>
-	 *
-	 * Two existing sample files (15228.xls and ex45046-21984.xls) had similar issues.
-	 * These were not explored fully, but seem to be fixed now.
-	 */
-	public void testRecalculateFormulas47747() {
-
-		/*
-		 * ex47747-sharedFormula.xls is a heavily cut-down version of the spreadsheet from
-		 * the attachment (id=24176) in Bugzilla 47747.  This was done to make the sample
-		 * file smaller, which hopefully allows the special data encoding condition to be
-		 * seen more easily.  Care must be taken when modifying this file since the
-		 * special conditions are easily destroyed (which would make this test useless).
-		 * It seems that removing the worksheet protection has made this more so - if the
-		 * current file is re-saved in Excel(2007) the bug condition disappears.
-		 *
-		 *
-		 * Using BiffViewer, one can see that there are two shared formula groups representing
-		 * the essentially same formula over ~20 cells.  The shared group ranges overlap and
-		 * are A12:Q20 and A20:Q27.  The locator cell ('first cell') for the second group is
-		 * Q20 which is not the top left cell of the enclosing range.  It is this specific
-		 * condition which caused the bug to occur
-		 */
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex47747-sharedFormula.xls");
-
-		// pick out a cell from within the second shared formula group
-		HSSFCell cell = wb.getSheetAt(0).getRow(23).getCell(0);
-		String formulaText;
-		try {
-			formulaText = cell.getCellFormula();
-			// succeeds if the formula record has been associated
-			// with the second shared formula group
-		} catch (RuntimeException e) {
-			// bug occurs if the formula record has been associated
-			// with the first shared formula group
-			if ("Shared Formula Conversion: Coding Error".equals(e.getMessage())) {
-				throw new AssertionFailedError("Identified bug 47747");
-			}
-			throw e;
-		}
-		assertEquals("$AF24*A$7", formulaText);
-	}
-
-	/**
-	 * Convenience test method for digging the {@link SharedValueManager} out of a
-	 * {@link RowRecordsAggregate}.
-	 */
-	public static SharedValueManager extractFromRRA(RowRecordsAggregate rra) {
-		return POITestCase.getFieldValue(RowRecordsAggregate.class, rra, SharedValueManager.class, "_sharedValueManager");
-	}
-
-    public void testBug52527() {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("52527.xls");
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-
-        assertEquals("IF(H3,LINEST(N9:N14,K9:M14,FALSE),LINEST(N8:N14,K8:M14,FALSE))",
-                wb1.getSheetAt(0).getRow(4).getCell(11).getCellFormula());
-        assertEquals("IF(H3,LINEST(N9:N14,K9:M14,FALSE),LINEST(N8:N14,K8:M14,FALSE))",
-                wb2.getSheetAt(0).getRow(4).getCell(11).getCellFormula());
-
-        assertEquals("1/SQRT(J9)",
-                wb1.getSheetAt(0).getRow(8).getCell(10).getCellFormula());
-        assertEquals("1/SQRT(J9)",
-                wb2.getSheetAt(0).getRow(8).getCell(10).getCellFormula());
-
-        assertEquals("1/SQRT(J26)",
-                wb1.getSheetAt(0).getRow(25).getCell(10).getCellFormula());
-        assertEquals("1/SQRT(J26)",
-                wb2.getSheetAt(0).getRow(25).getCell(10).getCellFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
deleted file mode 100644
index f31c49d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.zip.CRC32;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.RecordStream;
-import org.apache.poi.hssf.model.RowBlocksReader;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.MulBlankRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SharedFormulaRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.HexRead;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * Tests for {@link ValueRecordsAggregate}
- */
-public final class TestValueRecordsAggregate {
-	private static final String ABNORMAL_SHARED_FORMULA_FLAG_TEST_FILE = "AbnormalSharedFormulaFlag.xls";
-	private final ValueRecordsAggregate valueRecord = new ValueRecordsAggregate();
-	
-	private List<CellValueRecordInterface> getValueRecords() {
-	    List<CellValueRecordInterface> list = new ArrayList<CellValueRecordInterface>();
-	    for ( CellValueRecordInterface rec : valueRecord ) {
-	        list.add(rec);
-	    }
-	    return Collections.unmodifiableList(list);
-	}
-
-	/**
-	 * Make sure the shared formula DOESNT makes it to the FormulaRecordAggregate when being parsed
-	 * as part of the value records
-	 */
-    @Test
-	public void testSharedFormula() {
-		List<Record> records = new ArrayList<Record>();
-		records.add(new FormulaRecord());
-		records.add(new SharedFormulaRecord());
-		records.add(new WindowTwoRecord());
-
-		constructValueRecord(records);
-		List<CellValueRecordInterface> cvrs = getValueRecords();
-		//Ensure that the SharedFormulaRecord has been converted
-		assertEquals(1, cvrs.size());
-
-		CellValueRecordInterface record = cvrs.get(0);
-		assertNotNull( "Row contains a value", record );
-		assertTrue( "First record is a FormulaRecordsAggregate", ( record instanceof FormulaRecordAggregate ) );
-	}
-
-	private void constructValueRecord(List<Record> records) {
-		RowBlocksReader rbr = new RowBlocksReader(new RecordStream(records, 0));
-		SharedValueManager sfrh = rbr.getSharedFormulaManager();
-		RecordStream rs = rbr.getPlainRecordStream();
-		while(rs.hasNext()) {
-			Record rec = rs.getNext();
-			valueRecord.construct((CellValueRecordInterface)rec, rs, sfrh);
-		}
-	}
-
-	private static List<Record> testData() {
-		List<Record> records = new ArrayList<Record>();
-		FormulaRecord formulaRecord = new FormulaRecord();
-		BlankRecord blankRecord = new BlankRecord();
-		formulaRecord.setRow(1);
-		formulaRecord.setColumn((short) 1);
-		blankRecord.setRow(2);
-		blankRecord.setColumn((short) 2);
-		records.add(formulaRecord);
-		records.add(blankRecord);
-		records.add(new WindowTwoRecord());
-		return records;
-	}
-
-    @Test
-	public void testInsertCell() {
-		assertEquals(0, getValueRecords().size());
-
-		BlankRecord blankRecord = newBlankRecord();
-		valueRecord.insertCell( blankRecord );
-		assertEquals(1, getValueRecords().size());
-	}
-
-    @Test
-    public void testRemoveCell() {
-		BlankRecord blankRecord1 = newBlankRecord();
-		valueRecord.insertCell( blankRecord1 );
-		BlankRecord blankRecord2 = newBlankRecord();
-		valueRecord.removeCell( blankRecord2 );
-		assertEquals(0, getValueRecords().size());
-
-		// removing an already empty cell just falls through
-		valueRecord.removeCell( blankRecord2 );
-	}
-
-    @Test
-	public void testGetPhysicalNumberOfCells() {
-		assertEquals(0, valueRecord.getPhysicalNumberOfCells());
-		BlankRecord blankRecord1 = newBlankRecord();
-		valueRecord.insertCell( blankRecord1 );
-		assertEquals(1, valueRecord.getPhysicalNumberOfCells());
-		valueRecord.removeCell( blankRecord1 );
-		assertEquals(0, valueRecord.getPhysicalNumberOfCells());
-	}
-
-    @Test
-	public void testGetFirstCellNum() {
-		assertEquals( -1, valueRecord.getFirstCellNum() );
-		valueRecord.insertCell( newBlankRecord( 2, 2 ) );
-		assertEquals( 2, valueRecord.getFirstCellNum() );
-		valueRecord.insertCell( newBlankRecord( 3, 3 ) );
-		assertEquals( 2, valueRecord.getFirstCellNum() );
-
-		// Note: Removal doesn't currently reset the first column.  It probably should but it doesn't.
-		valueRecord.removeCell( newBlankRecord( 2, 2 ) );
-		assertEquals( 2, valueRecord.getFirstCellNum() );
-	}
-
-    @Test
-	public void testGetLastCellNum() {
-		assertEquals( -1, valueRecord.getLastCellNum() );
-		valueRecord.insertCell( newBlankRecord( 2, 2 ) );
-		assertEquals( 2, valueRecord.getLastCellNum() );
-		valueRecord.insertCell( newBlankRecord( 3, 3 ) );
-		assertEquals( 3, valueRecord.getLastCellNum() );
-
-		// Note: Removal doesn't currently reset the last column.  It probably should but it doesn't.
-		valueRecord.removeCell( newBlankRecord( 3, 3 ) );
-		assertEquals( 3, valueRecord.getLastCellNum() );
-
-	}
-
-
-	private static final class SerializerVisitor implements RecordVisitor {
-		private final byte[] _buf;
-		private int _writeIndex;
-		public SerializerVisitor(byte[] buf) {
-			_buf = buf;
-			_writeIndex = 0;
-
-		}
-		@Override
-        public void visitRecord(Record r) {
-			r.serialize(_writeIndex, _buf);
-			_writeIndex += r.getRecordSize();
-		}
-		public int getWriteIndex() {
-			return _writeIndex;
-		}
-	}
-
-    @Test
-	public void testSerialize() {
-		byte[] expectedArray = HexRead.readFromString(""
-				+ "06 00 16 00 " // Formula
-				+ "01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 "
-				+ "01 02 06 00 " // Blank
-				+ "02 00 02 00 00 00");
-		byte[] actualArray = new byte[expectedArray.length];
-		List<Record> records = testData();
-		constructValueRecord(records);
-
-		SerializerVisitor sv = new SerializerVisitor(actualArray);
-		valueRecord.visitCellsForRow(1, sv);
-		valueRecord.visitCellsForRow(2, sv);
-		assertEquals(actualArray.length, sv.getWriteIndex());
-		assertArrayEquals(expectedArray, actualArray);
-	}
-
-	private static BlankRecord newBlankRecord() {
-		return newBlankRecord( 2, 2 );
-	}
-
-	private static BlankRecord newBlankRecord(int col, int row) {
-		BlankRecord blankRecord = new BlankRecord();
-		blankRecord.setRow( row );
-		blankRecord.setColumn( (short) col );
-		return blankRecord;
-	}
-
-	/**
-	 * Sometimes the 'shared formula' flag (<tt>FormulaRecord.isSharedFormula()</tt>) is set when
-	 * there is no corresponding SharedFormulaRecord available. SharedFormulaRecord definitions do
-	 * not span multiple sheets.  They are are only defined within a sheet, and thus they do not
-	 * have a sheet index field (only row and column range fields).<br/>
-	 * So it is important that the code which locates the SharedFormulaRecord for each
-	 * FormulaRecord does not allow matches across sheets.</br>
-	 *
-	 * Prior to bugzilla 44449 (Feb 2008), POI <tt>ValueRecordsAggregate.construct(int, List)</tt>
-	 * allowed <tt>SharedFormulaRecord</tt>s to be erroneously used across sheets.  That incorrect
-	 * behaviour is shown by this test.<p/>
-	 *
-	 * <b>Notes on how to produce the test spreadsheet</b>:</p>
-	 * The setup for this test (AbnormalSharedFormulaFlag.xls) is rather fragile, insomuchas
-	 * re-saving the file (either with Excel or POI) clears the flag.<br/>
-	 * <ol>
-	 * <li>A new spreadsheet was created in Excel (File | New | Blank Workbook).</li>
-	 * <li>Sheet3 was deleted.</li>
-	 * <li>Sheet2!A1 formula was set to '="second formula"', and fill-dragged through A1:A8.</li>
-	 * <li>Sheet1!A1 formula was set to '="first formula"', and also fill-dragged through A1:A8.</li>
-	 * <li>Four rows on Sheet1 "5" through "8" were deleted ('delete rows' alt-E D, not 'clear' Del).</li>
-	 * <li>The spreadsheet was saved as AbnormalSharedFormulaFlag.xls.</li>
-	 * </ol>
-	 * Prior to the row delete action the spreadsheet has two <tt>SharedFormulaRecord</tt>s. One
-	 * for each sheet. To expose the bug, the shared formulas have been made to overlap.<br/>
-	 * The row delete action (as described here) seems to to delete the
-	 * <tt>SharedFormulaRecord</tt> from Sheet1 (but not clear the 'shared formula' flags.<br/>
-	 * There are other variations on this theme to create the same effect.
-	 *
-	 */
-    @Test
-	public void testSpuriousSharedFormulaFlag() throws Exception {
-
-		long actualCRC = getFileCRC(HSSFTestDataSamples.openSampleFileStream(ABNORMAL_SHARED_FORMULA_FLAG_TEST_FILE));
-		long expectedCRC = 2277445406L;
-		if(actualCRC != expectedCRC) {
-			System.err.println("Expected crc " + expectedCRC  + " but got " + actualCRC);
-			throw failUnexpectedTestFileChange();
-		}
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(ABNORMAL_SHARED_FORMULA_FLAG_TEST_FILE);
-
-		HSSFSheet s = wb.getSheetAt(0); // Sheet1
-
-		String cellFormula;
-		cellFormula = getFormulaFromFirstCell(s, 0); // row "1"
-		// the problem is not observable in the first row of the shared formula
-		assertEquals("Something else wrong with this test case", "\"first formula\"", cellFormula);
-
-		// but the problem is observable in rows 2,3,4
-		cellFormula = getFormulaFromFirstCell(s, 1); // row "2"
-		assertNotEquals("found bug 44449 (Wrong SharedFormulaRecord was used).", "\"second formula\"", cellFormula);
-
-		assertEquals("Something else wrong with this test case", "\"first formula\"", cellFormula);
-		
-		wb.close();
-	}
-	private static String getFormulaFromFirstCell(HSSFSheet s, int rowIx) {
-		return s.getRow(rowIx).getCell(0).getCellFormula();
-	}
-
-	/**
-	 * If someone opened this particular test file in Excel and saved it, the peculiar condition
-	 * which causes the target bug would probably disappear.  This test would then just succeed
-	 * regardless of whether the fix was present.  So a CRC check is performed to make it less easy
-	 * for that to occur.
-	 */
-	private static RuntimeException failUnexpectedTestFileChange() {
-		String msg = "Test file '" + ABNORMAL_SHARED_FORMULA_FLAG_TEST_FILE + "' has changed.  "
-			+ "This junit may not be properly testing for the target bug.  "
-			+ "Either revert the test file or ensure that the new version "
-			+ "has the right characteristics to test the target bug.";
-		// A breakpoint in ValueRecordsAggregate.handleMissingSharedFormulaRecord(FormulaRecord)
-		// should get hit during parsing of Sheet1.
-		// If the test spreadsheet is created as directed, this condition should occur.
-		// It is easy to upset the test spreadsheet (for example re-saving will destroy the
-		// peculiar condition we are testing for).
-		throw new RuntimeException(msg);
-	}
-
-	/**
-	 * gets a CRC checksum for the content of a file
-	 */
-	private static long getFileCRC(InputStream is) {
-		CRC32 crc = new CRC32();
-		byte[] buf = new byte[2048];
-		try {
-			while(true) {
-				int bytesRead = is.read(buf);
-				if(bytesRead < 1) {
-					break;
-				}
-				crc.update(buf, 0, bytesRead);
-			}
-			is.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-
-		return crc.getValue();
-	}
-	
-    @Test
-	public void testRemoveNewRow_bug46312() {
-		// To make bug occur, rowIndex needs to be >= ValueRecordsAggregate.records.length
-		int rowIndex = 30;
-
-		ValueRecordsAggregate vra = new ValueRecordsAggregate();
-		try {
-			vra.removeAllCellsValuesForRow(rowIndex);
-		} catch (IllegalArgumentException e) {
-			if (e.getMessage().equals("Specified rowIndex 30 is outside the allowable range (0..30)")) {
-				throw new AssertionFailedError("Identified bug 46312");
-			}
-			throw e;
-		}
-
-//		if (false) { // same bug as demonstrated through usermodel API
-//
-//			HSSFWorkbook wb = new HSSFWorkbook();
-//			HSSFSheet sheet = wb.createSheet();
-//			HSSFRow row = sheet.createRow(rowIndex);
-//			if (false) { // must not add any cells to the new row if we want to see the bug
-//				row.createCell(0); // this causes ValueRecordsAggregate.records to auto-extend
-//			}
-//			try {
-//				sheet.createRow(rowIndex);
-//			} catch (IllegalArgumentException e) {
-//				throw new AssertionFailedError("Identified bug 46312");
-//			}
-//		}
-	}
-
-	/**
-	 * Tests various manipulations of blank cells, to make sure that {@link MulBlankRecord}s
-	 * are use appropriately
-	 */
-    @Test
-	public void testMultipleBlanks() {
-		BlankRecord brA2 = newBlankRecord(0, 1);
-		BlankRecord brB2 = newBlankRecord(1, 1);
-		BlankRecord brC2 = newBlankRecord(2, 1);
-		BlankRecord brD2 = newBlankRecord(3, 1);
-		BlankRecord brE2 = newBlankRecord(4, 1);
-		BlankRecord brB3 = newBlankRecord(1, 2);
-		BlankRecord brC3 = newBlankRecord(2, 2);
-
-		valueRecord.insertCell(brA2);
-		valueRecord.insertCell(brB2);
-		valueRecord.insertCell(brD2);
-		confirmMulBlank(3, 1, 1);
-
-		valueRecord.insertCell(brC3);
-		confirmMulBlank(4, 1, 2);
-
-		valueRecord.insertCell(brB3);
-		valueRecord.insertCell(brE2);
-		confirmMulBlank(6, 3, 0);
-
-		valueRecord.insertCell(brC2);
-		confirmMulBlank(7, 2, 0);
-
-		valueRecord.removeCell(brA2);
-		confirmMulBlank(6, 2, 0);
-
-		valueRecord.removeCell(brC2);
-		confirmMulBlank(5, 2, 1);
-
-		valueRecord.removeCell(brC3);
-		confirmMulBlank(4, 1, 2);
-	}
-
-	private void confirmMulBlank(int expectedTotalBlankCells,
-			int expectedNumberOfMulBlankRecords, int expectedNumberOfSingleBlankRecords) {
-		// assumed row ranges set-up by caller:
-		final int firstRow = 1;
-		final int lastRow = 2;
-
-
-		final class BlankStats {
-			public int countBlankCells;
-			public int countMulBlankRecords;
-			public int countSingleBlankRecords;
-		}
-
-		final BlankStats bs = new BlankStats();
-		RecordVisitor rv = new RecordVisitor() {
-
-			@Override
-            public void visitRecord(Record r) {
-				if (r instanceof MulBlankRecord) {
-					MulBlankRecord mbr = (MulBlankRecord) r;
-					bs.countMulBlankRecords++;
-					bs.countBlankCells += mbr.getNumColumns();
-				} else if (r instanceof BlankRecord) {
-					bs.countSingleBlankRecords++;
-					bs.countBlankCells++;
-				}
-			}
-		};
-
-		for (int rowIx = firstRow; rowIx <=lastRow; rowIx++) {
-			if (valueRecord.rowHasCells(rowIx)) {
-				valueRecord.visitCellsForRow(rowIx, rv);
-			}
-		}
-		assertEquals(expectedTotalBlankCells, bs.countBlankCells);
-		assertEquals(expectedNumberOfMulBlankRecords, bs.countMulBlankRecords);
-		assertEquals(expectedNumberOfSingleBlankRecords, bs.countSingleBlankRecords);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java b/trunk/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
deleted file mode 100644
index 54f1702..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/* ====================================================================
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.cf;
-
-import java.util.Arrays;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeUtil;
-
-/**
- * Tests CellRange operations.
- */
-public final class TestCellRange extends TestCase
-{
-	private static final CellRangeAddress biggest     = createCR( 0, -1, 0,-1);
-	private static final CellRangeAddress tenthColumn = createCR( 0, -1,10,10);
-	private static final CellRangeAddress tenthRow    = createCR(10, 10, 0,-1);
-	private static final CellRangeAddress box10x10    = createCR( 0, 10, 0,10);
-	private static final CellRangeAddress box9x9      = createCR( 0,  9, 0, 9);
-	private static final CellRangeAddress box10to20c  = createCR( 0, 10,10,20);
-	private static final CellRangeAddress oneCell     = createCR(10, 10,10,10);
-
-	private static final CellRangeAddress[] sampleRanges = {
-		biggest, tenthColumn, tenthRow, box10x10, box9x9, box10to20c, oneCell,
-	};
-	
-	/** cross-reference of <tt>contains()</tt> operations for sampleRanges against itself */
-	private static final boolean [][] containsExpectedResults = 
-    {
-	//               biggest, tenthColumn, tenthRow, box10x10, box9x9, box10to20c, oneCell
-	/*biggest    */ {true,       true ,    true ,    true ,    true ,      true ,  true},	
-	/*tenthColumn*/ {false,      true ,    false,    false,    false,      false,  true},	
-	/*tenthRow   */ {false,      false,    true ,    false,    false,      false,  true},	
-	/*box10x10   */ {false,      false,    false,    true ,    true ,      false,  true},	
-	/*box9x9     */ {false,      false,    false,    false,    true ,      false, false},	
-	/*box10to20c */ {false,      false,    false,    false,    false,      true ,  true},	
-	/*oneCell    */ {false,      false,    false,    false,    false,      false,  true},	
-     } ;
-
-	/**
-	 * @param lastRow pass -1 for max row index 
-	 * @param lastCol pass -1 for max col index
-	 */
-	private static CellRangeAddress createCR(int firstRow, int lastRow, int firstCol, int lastCol) {
-		// max row & max col limit as per BIFF8
-		return new CellRangeAddress(
-				firstRow, 
-				lastRow == -1 ? 0xFFFF : lastRow, 
-				firstCol,
-				lastCol == -1 ? 0x00FF : lastCol);
-	}
-	
-	public void testContainsMethod()
-	{
-		CellRangeAddress [] ranges = sampleRanges;
-		for(int i=0; i!=ranges.length;i++)
-		{
-			for(int j=0; j!=ranges.length;j++)
-			{
-				boolean expectedResult = containsExpectedResults[i][j];
-				assertEquals("("+i+","+j+"): ", expectedResult, CellRangeUtil.contains(ranges[i], ranges[j]));
-			}
-		}
-	}
-
-	private static final CellRangeAddress col1     = createCR( 0, -1, 1,1);
-	private static final CellRangeAddress col2     = createCR( 0, -1, 2,2);
-	private static final CellRangeAddress row1     = createCR( 1,  1, 0,-1);
-	private static final CellRangeAddress row2     = createCR( 2,  2, 0,-1);
-
-	private static final CellRangeAddress box0     = createCR( 0, 2, 0,2);
-	private static final CellRangeAddress box1     = createCR( 0, 1, 0,1);
-	private static final CellRangeAddress box2     = createCR( 0, 1, 2,3);
-	private static final CellRangeAddress box3     = createCR( 2, 3, 0,1);
-	private static final CellRangeAddress box4     = createCR( 2, 3, 2,3);
-	private static final CellRangeAddress box5     = createCR( 1, 3, 1,3);
-
-	public void testHasSharedBorderMethod()
-	{
-		assertFalse(CellRangeUtil.hasExactSharedBorder(col1, col1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(col2, col2));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(col1, col2));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(col2, col1));
-
-		assertFalse(CellRangeUtil.hasExactSharedBorder(row1, row1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(row2, row2));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(row1, row2));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(row2, row1));
-		
-		assertFalse(CellRangeUtil.hasExactSharedBorder(row1, col1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(row1, col2));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(col1, row1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(col2, row1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(row2, col1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(row2, col2));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(col1, row2));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(col2, row2));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(col2, col1));
-		
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box1, box1));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box1, box2));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box1, box3));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box1, box4));
-		
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box2, box1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box2, box2));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box2, box3));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box2, box4));
-		
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box3, box1));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box3, box2));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box3, box3));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box3, box4));
-		
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box4, box1));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box4, box2));
-		assertTrue(CellRangeUtil.hasExactSharedBorder(box4, box3));
-		assertFalse(CellRangeUtil.hasExactSharedBorder(box4, box4));
-	}
-
-	public void testIntersectMethod()
-	{
-		assertEquals(CellRangeUtil.OVERLAP, CellRangeUtil.intersect(box0, box5));
-		assertEquals(CellRangeUtil.OVERLAP, CellRangeUtil.intersect(box5, box0));
-		assertEquals(CellRangeUtil.NO_INTERSECTION, CellRangeUtil.intersect(box1, box4));
-		assertEquals(CellRangeUtil.NO_INTERSECTION, CellRangeUtil.intersect(box4, box1));
-		assertEquals(CellRangeUtil.NO_INTERSECTION, CellRangeUtil.intersect(box2, box3));
-		assertEquals(CellRangeUtil.NO_INTERSECTION, CellRangeUtil.intersect(box3, box2));
-		assertEquals(CellRangeUtil.INSIDE, CellRangeUtil.intersect(box0, box1));
-		assertEquals(CellRangeUtil.INSIDE, CellRangeUtil.intersect(box0, box0));
-		assertEquals(CellRangeUtil.ENCLOSES, CellRangeUtil.intersect(box1, box0));
-		assertEquals(CellRangeUtil.INSIDE, CellRangeUtil.intersect(tenthColumn, oneCell));
-		assertEquals(CellRangeUtil.ENCLOSES, CellRangeUtil.intersect(oneCell, tenthColumn));
-		assertEquals(CellRangeUtil.OVERLAP, CellRangeUtil.intersect(tenthColumn, tenthRow));
-		assertEquals(CellRangeUtil.OVERLAP, CellRangeUtil.intersect(tenthRow, tenthColumn));
-		assertEquals(CellRangeUtil.INSIDE, CellRangeUtil.intersect(tenthColumn, tenthColumn));
-		assertEquals(CellRangeUtil.INSIDE, CellRangeUtil.intersect(tenthRow, tenthRow));
-		
-		// Bug 55380
-		assertEquals(CellRangeUtil.OVERLAP, CellRangeUtil.intersect(
-		        CellRangeAddress.valueOf("C1:D2"), CellRangeAddress.valueOf("C2:C3")));
-	}
-	
-	/**
-	 * Cell ranges like the following are valid
-	 * =$C:$IV,$B$1:$B$8,$B$10:$B$65536,$A:$A
-	 */
-	public void testCreate() {
-		CellRangeAddress cr;
-		
-		cr = createCR(0, -1, 2, 255); // $C:$IV
-		confirmRange(cr, false, true);
-		cr = createCR(0, 7, 1, 1); // $B$1:$B$8
-		
-		try {
-			cr = createCR(9, -1, 1, 1); // $B$65536
-		} catch (IllegalArgumentException e) {
-			if(e.getMessage().startsWith("invalid cell range")) {
-				throw new AssertionFailedError("Identified bug 44739");
-			}
-			throw e;
-		}
-		cr = createCR(0, -1, 0, 0); // $A:$A
-	}
-
-	private static void confirmRange(CellRangeAddress cr, boolean isFullRow, boolean isFullColumn) {
-		assertEquals("isFullRowRange", isFullRow, cr.isFullRowRange());
-		assertEquals("isFullColumnRange", isFullColumn, cr.isFullColumnRange());
-	}
-	
-	public void testNumberOfCells() {
-		assertEquals(1, oneCell.getNumberOfCells());
-		assertEquals(100, box9x9.getNumberOfCells());
-		assertEquals(121, box10to20c.getNumberOfCells());
-	}
-
-    public void testMergeCellRanges() {
-        // no result on empty
-        cellRangeTest(new String[]{ });
-
-        // various cases with two ranges
-        cellRangeTest(new String[]{"A1:B1", "A2:B2"}, "A1:B2");
-        cellRangeTest(new String[]{"A1:B1" }, "A1:B1");
-        cellRangeTest(new String[]{"A1:B2", "A2:B2"}, "A1:B2");
-        cellRangeTest(new String[]{"A1:B3", "A2:B2"}, "A1:B3");
-        cellRangeTest(new String[]{"A1:C1", "A2:B2"}, new String[] {"A1:C1", "A2:B2"});
-        
-        // cases with three ranges
-        cellRangeTest(new String[]{"A1:A1", "A2:B2", "A1:C1"}, new String[] {"A1:C1", "A2:B2"});
-        cellRangeTest(new String[]{"A1:C1", "A2:B2", "A1:A1"}, new String[] {"A1:C1", "A2:B2"});
-        
-        // "standard" cases
-        // enclose
-        cellRangeTest(new String[]{"A1:D4", "B2:C3"}, new String[] {"A1:D4"});
-        // inside
-        cellRangeTest(new String[]{"B2:C3", "A1:D4"}, new String[] {"A1:D4"});
-        cellRangeTest(new String[]{"B2:C3", "A1:D4"}, new String[] {"A1:D4"});
-        // disjunct
-        cellRangeTest(new String[]{"A1:B2", "C3:D4"}, new String[] {"A1:B2", "C3:D4"});
-        cellRangeTest(new String[]{"A1:B2", "A3:D4"}, new String[] {"A1:B2", "A3:D4"});
-        // overlap that cannot be merged
-        cellRangeTest(new String[]{"C1:D2", "C2:C3"}, new String[] {"C1:D2", "C2:C3"});
-        // overlap which could theoretically be merged, but isn't because the implementation was buggy and therefore was removed
-        cellRangeTest(new String[]{"A1:C3", "B1:D3"}, new String[] {"A1:C3", "B1:D3"}); // could be one region "A1:D3"
-        cellRangeTest(new String[]{"A1:C3", "B1:D1"}, new String[] {"A1:C3", "B1:D1"}); // could be one region "A1:D3"
-    }
-
-    public void testMergeCellRanges55380() {
-        cellRangeTest(new String[]{"C1:D2", "C2:C3"}, new String[] {"C1:D2", "C2:C3"});
-        cellRangeTest(new String[]{"A1:C3", "B2:D2"}, new String[] {"A1:C3", "B2:D2"});
-        cellRangeTest(new String[]{"C9:D30", "C7:C31"}, new String[] {"C9:D30",  "C7:C31"});
-    }
-    
-//    public void testResolveRangeOverlap() {
-//        resolveRangeOverlapTest("C1:D2", "C2:C3");
-//    }
-    
-    private void cellRangeTest(String[] input, String... expectedOutput) {
-        CellRangeAddress[] inputArr = new CellRangeAddress[input.length];
-        for(int i = 0;i < input.length;i++) {
-            inputArr[i] = CellRangeAddress.valueOf(input[i]);
-        }
-        CellRangeAddress[] result = CellRangeUtil.mergeCellRanges(inputArr);
-        verifyExpectedResult(result, expectedOutput);
-    }
-
-//    private void resolveRangeOverlapTest(String a, String b, String...expectedOutput) {
-//        CellRangeAddress rangeA = CellRangeAddress.valueOf(a);
-//        CellRangeAddress rangeB = CellRangeAddress.valueOf(b);
-//        CellRangeAddress[] result = CellRangeUtil.resolveRangeOverlap(rangeA, rangeB);
-//        verifyExpectedResult(result, expectedOutput);
-//    }
-    
-    private void verifyExpectedResult(CellRangeAddress[] result, String... expectedOutput) {
-        assertEquals("\nExpected: " + Arrays.toString(expectedOutput) + "\nHad: " + Arrays.toString(result), 
-                expectedOutput.length, result.length);
-        for(int i = 0;i < expectedOutput.length;i++) {
-            assertEquals("\nExpected: " + Arrays.toString(expectedOutput) + "\nHad: " + Arrays.toString(result),
-                    expectedOutput[i], result[i].formatAsString());
-        }
-    }
-    
-    public void testValueOf() {
-        CellRangeAddress cr1 = CellRangeAddress.valueOf("A1:B1");
-        assertEquals(0, cr1.getFirstColumn());
-        assertEquals(0, cr1.getFirstRow());
-        assertEquals(1, cr1.getLastColumn());
-        assertEquals(0, cr1.getLastRow());
-
-        CellRangeAddress cr2 = CellRangeAddress.valueOf("B1");
-        assertEquals(1, cr2.getFirstColumn());
-        assertEquals(0, cr2.getFirstRow());
-        assertEquals(1, cr2.getLastColumn());
-        assertEquals(0, cr2.getLastRow());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
deleted file mode 100644
index 84b07e9..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for package <tt>org.apache.poi.hssf.record.class</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestAreaFormatRecord.class,
-    TestAreaRecord.class,
-    TestAxisLineFormatRecord.class,
-    TestAxisOptionsRecord.class,
-    TestAxisParentRecord.class,
-    TestAxisRecord.class,
-    TestAxisUsedRecord.class,
-    TestBarRecord.class,
-    TestCategorySeriesAxisRecord.class,
-    TestChartFormatRecord.class,
-    TestChartRecord.class,
-    TestChartTitleFormatRecord.class,
-    TestDatRecord.class,
-    TestDataFormatRecord.class,
-    TestDefaultDataLabelTextPropertiesRecord.class,
-    TestFontBasisRecord.class,
-    TestFontIndexRecord.class,
-    TestFrameRecord.class,
-    TestLegendRecord.class,
-    TestLineFormatRecord.class,
-    TestLinkedDataRecord.class,
-    TestNumberFormatIndexRecord.class,
-    TestObjectLinkRecord.class,
-    TestPlotAreaRecord.class,
-    TestPlotGrowthRecord.class,
-    TestSeriesChartGroupIndexRecord.class,
-    TestSeriesIndexRecord.class,
-    TestSeriesLabelsRecord.class,
-    TestSeriesListRecord.class,
-    TestSeriesRecord.class,
-    TestSeriesTextRecord.class,
-    TestSeriesToChartGroupRecord.class,
-    TestSheetPropertiesRecord.class,
-    TestTextRecord.class,
-    TestTickRecord.class,
-    TestUnitsRecord.class,
-    TestValueRangeRecord.class
-})
-public class AllChartRecordTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
deleted file mode 100644
index c47a8b4..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the AreaFormatRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestAreaFormatRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0x00,    // forecolor
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,    // backcolor
-        (byte)0x01,(byte)0x00,                          // pattern
-        (byte)0x01,(byte)0x00,                          // format
-        (byte)0x4E,(byte)0x00,                          // forecolor index
-        (byte)0x4D,(byte)0x00                           // backcolor index
-
-    };
-
-    public void testLoad() {
-
-        AreaFormatRecord record = new AreaFormatRecord(TestcaseRecordInputStream.create(0x100a, data));
-        assertEquals( 0xFFFFFF, record.getForegroundColor());
-        assertEquals( 0x000000, record.getBackgroundColor());
-        assertEquals( 1, record.getPattern());
-        assertEquals( 1, record.getFormatFlags());
-        assertEquals( true, record.isAutomatic() );
-        assertEquals( false, record.isInvert() );
-        assertEquals( 0x4e, record.getForecolorIndex());
-        assertEquals( 0x4d, record.getBackcolorIndex());
-
-
-        assertEquals( 20, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        AreaFormatRecord record = new AreaFormatRecord();
-        record.setForegroundColor( 0xFFFFFF );
-        record.setBackgroundColor( 0x000000 );
-        record.setPattern( (short)1 );
-        record.setAutomatic( true );
-        record.setInvert( false );
-        record.setForecolorIndex( (short)0x4e );
-        record.setBackcolorIndex( (short)0x4d );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
deleted file mode 100644
index 2570d2e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the AreaRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestAreaRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x02,(byte)0x00       // format flags
-    };
-
-    public void testLoad() {
-
-        AreaRecord record = new AreaRecord(TestcaseRecordInputStream.create(0x101A, data));
-        assertEquals( 2, record.getFormatFlags());
-        assertEquals( false, record.isStacked() );
-        assertEquals( true, record.isDisplayAsPercentage() );
-        assertEquals( false, record.isShadow() );
-
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        AreaRecord record = new AreaRecord();
-        record.setStacked( false );
-        record.setDisplayAsPercentage( true );
-        record.setShadow( false );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
deleted file mode 100644
index ae80fe2..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the AxisLineFormatRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestAxisLineFormatRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x01,(byte)0x00
-    };
-
-    public void testLoad() {
-        AxisLineFormatRecord record = new AxisLineFormatRecord(TestcaseRecordInputStream.create(0x1021, data));
-        assertEquals( AxisLineFormatRecord.AXIS_TYPE_MAJOR_GRID_LINE, record.getAxisType());
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        AxisLineFormatRecord record = new AxisLineFormatRecord();
-        record.setAxisType( AxisLineFormatRecord.AXIS_TYPE_MAJOR_GRID_LINE );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
deleted file mode 100644
index 344bdee..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the AxisOptionsRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Andrew C. Oliver(acoliver at apache.org)
- */
-public final class TestAxisOptionsRecord extends TestCase {
-    private static final byte[] data = {
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,(byte)0x00,
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-        (byte)0x00,(byte)0xEF,(byte)0x00
-    };
-
-    public void testLoad() {
-        AxisOptionsRecord record = new AxisOptionsRecord(TestcaseRecordInputStream.create(0x1062, data));
-        assertEquals( 0, record.getMinimumCategory());
-        assertEquals( 0, record.getMaximumCategory());
-        assertEquals( 1, record.getMajorUnitValue());
-        assertEquals( 0, record.getMajorUnit());
-        assertEquals( 1, record.getMinorUnitValue());
-        assertEquals( 0, record.getMinorUnit());
-        assertEquals( 0, record.getBaseUnit());
-        assertEquals( 0, record.getCrossingPoint());
-        assertEquals( 239, record.getOptions());
-        assertEquals( true, record.isDefaultMinimum() );
-        assertEquals( true, record.isDefaultMaximum() );
-        assertEquals( true, record.isDefaultMajor() );
-        assertEquals( true, record.isDefaultMinorUnit() );
-        assertEquals( false, record.isIsDate() );
-        assertEquals( true, record.isDefaultBase() );
-        assertEquals( true, record.isDefaultCross() );
-        assertEquals( true, record.isDefaultDateSettings() );
-
-        assertEquals( 22, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        AxisOptionsRecord record = new AxisOptionsRecord();
-        record.setMinimumCategory( (short)0 );
-        record.setMaximumCategory( (short)0 );
-        record.setMajorUnitValue( (short)1 );
-        record.setMajorUnit( (short)0 );
-        record.setMinorUnitValue( (short)1 );
-        record.setMinorUnit( (short)0 );
-        record.setBaseUnit( (short)0 );
-        record.setCrossingPoint( (short)0 );
-        record.setOptions( (short)239 );
-        record.setDefaultMinimum( true );
-        record.setDefaultMaximum( true );
-        record.setDefaultMajor( true );
-        record.setDefaultMinorUnit( true );
-        record.setIsDate( false );
-        record.setDefaultBase( true );
-        record.setDefaultCross( true );
-        record.setDefaultDateSettings( true );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
deleted file mode 100644
index 323f7f3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the AxisParentRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestAxisParentRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,                                   // axis type
-        (byte)0x1D,(byte)0x02,(byte)0x00,(byte)0x00,             // x
-        (byte)0xDD,(byte)0x00,(byte)0x00,(byte)0x00,             // y
-        (byte)0x31,(byte)0x0B,(byte)0x00,(byte)0x00,             // width
-        (byte)0x56,(byte)0x0B,(byte)0x00,(byte)0x00              // height
-    };
-
-    public void testLoad() {
-        AxisParentRecord record = new AxisParentRecord(TestcaseRecordInputStream.create(0x1041, data));
-        assertEquals( AxisParentRecord.AXIS_TYPE_MAIN, record.getAxisType());
-        assertEquals( 0x021d, record.getX());
-        assertEquals( 0xdd, record.getY());
-        assertEquals( 0x0b31, record.getWidth());
-        assertEquals( 0x0b56, record.getHeight());
-
-        assertEquals( 22, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        AxisParentRecord record = new AxisParentRecord();
-        record.setAxisType( AxisParentRecord.AXIS_TYPE_MAIN );
-        record.setX( 0x021d );
-        record.setY( 0xdd );
-        record.setWidth( 0x0b31 );
-        record.setHeight( 0x0b56 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
deleted file mode 100644
index e8ebf32..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the AxisRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestAxisRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,                               // type
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00
-    };
-
-    public void testLoad() {
-
-        AxisRecord record = new AxisRecord(TestcaseRecordInputStream.create(0x101d, data));
-        assertEquals( AxisRecord.AXIS_TYPE_CATEGORY_OR_X_AXIS, record.getAxisType());
-        assertEquals( 0, record.getReserved1());
-        assertEquals( 0, record.getReserved2());
-        assertEquals( 0, record.getReserved3());
-        assertEquals( 0, record.getReserved4());
-
-        assertEquals( 4 + 18, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        AxisRecord record = new AxisRecord();
-        record.setAxisType( AxisRecord.AXIS_TYPE_CATEGORY_OR_X_AXIS );
-        record.setReserved1( 0 );
-        record.setReserved2( 0 );
-        record.setReserved3( 0 );
-        record.setReserved4( 0 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
deleted file mode 100644
index f421b4f..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the AxisUsedRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestAxisUsedRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x01,(byte)0x00,
-    };
-
-    public void testLoad() {
-        AxisUsedRecord record = new AxisUsedRecord(TestcaseRecordInputStream.create(0x1046, data));
-        assertEquals( 1, record.getNumAxis());
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        AxisUsedRecord record = new AxisUsedRecord();
-        record.setNumAxis( (short)1 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
deleted file mode 100644
index 4781fe9..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the BarRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestBarRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,   // bar space
-        (byte)0x96,(byte)0x00,   // category space
-        (byte)0x00,(byte)0x00    // format flags
-    };
-
-    public void testLoad() {
-
-        BarRecord record = new BarRecord(TestcaseRecordInputStream.create(0x1017, data));
-        assertEquals( 0, record.getBarSpace());
-        assertEquals( 0x96, record.getCategorySpace());
-        assertEquals( 0, record.getFormatFlags());
-        assertEquals( false, record.isHorizontal() );
-        assertEquals( false, record.isStacked() );
-        assertEquals( false, record.isDisplayAsPercentage() );
-        assertEquals( false, record.isShadow() );
-
-        assertEquals( 10, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        BarRecord record = new BarRecord();
-        record.setBarSpace( (short)0 );
-        record.setCategorySpace( (short)0x96 );
-        record.setHorizontal( false );
-        record.setStacked( false );
-        record.setDisplayAsPercentage( false );
-        record.setShadow( false );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
deleted file mode 100644
index 948241d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the CategorySeriesAxisRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestCategorySeriesAxisRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x01,(byte)0x00,    // crossing point
-        (byte)0x01,(byte)0x00,    // label frequency
-        (byte)0x01,(byte)0x00,    // tick mark frequency
-        (byte)0x01,(byte)0x00     // options
-    };
-
-    public void testLoad() {
-
-        CategorySeriesAxisRecord record = new CategorySeriesAxisRecord(TestcaseRecordInputStream.create(0x1020, data));
-        assertEquals( 1, record.getCrossingPoint());
-        assertEquals( 1, record.getLabelFrequency());
-        assertEquals( 1, record.getTickMarkFrequency());
-        assertEquals( 1, record.getOptions());
-        assertEquals( true, record.isValueAxisCrossing() );
-        assertEquals( false, record.isCrossesFarRight() );
-        assertEquals( false, record.isReversed() );
-
-        assertEquals( 4 + 8, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        CategorySeriesAxisRecord record = new CategorySeriesAxisRecord();
-        record.setCrossingPoint( (short)1 );
-        record.setLabelFrequency( (short)1 );
-        record.setTickMarkFrequency( (short)1 );
-        record.setValueAxisCrossing( true );
-        record.setCrossesFarRight( false );
-        record.setReversed( false );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
deleted file mode 100644
index 15c2090..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests for {@link ChartFormatRecord} Test data taken directly from a real
- * Excel file.
- *
- * @author Josh Micich
- */
-public final class TestChartFormatRecord extends TestCase {
-	/**
-	 * This rather uninteresting data came from attachment 23347 of bug 46693 at
-	 * offsets 0x6BB2 and 0x7BAF
-	 */
-	private static final byte[] data = HexRead.readFromString(
-			"14 10 14 00 " // BIFF header
-			+ "00 00 00 00 00 00 00 00 "
-			+ "00 00 00 00 00 00 00 00 "
-			+ "00 00 00 00");
-
-	/**
-	 * The correct size of a {@link ChartFormatRecord} is 20 bytes (not including header).
-	 */
-	public void testLoad() {
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		ChartFormatRecord record = new ChartFormatRecord(in);
-		if (in.remaining() == 2) {
-			throw new AssertionFailedError("Identified bug 44693d");
-		}
-		assertEquals(0, in.remaining());
-		assertEquals(24, record.getRecordSize());
-
-		byte[] data2 = record.serialize();
-		assertArrayEquals(data, data2);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
deleted file mode 100644
index c423d1b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the ChartRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestChartRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-        (byte)0xE8,(byte)0xFF,(byte)0xD0,(byte)0x01,
-        (byte)0xC8,(byte)0xCC,(byte)0xE5,(byte)0x00
-    };
-
-    public void testLoad() {
-
-        ChartRecord record = new ChartRecord(TestcaseRecordInputStream.create(0x1002, data));
-        assertEquals( 0, record.getX());
-        assertEquals( 0, record.getY());
-        assertEquals( 30474216, record.getWidth());
-        assertEquals( 15060168, record.getHeight());
-
-        assertEquals( 20, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        ChartRecord record = new ChartRecord();
-        record.setX( 0 );
-        record.setY( 0 );
-        record.setWidth( 30474216 );
-        record.setHeight( 15060168 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
deleted file mode 100644
index d65c37e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
-import org.apache.poi.hssf.eventusermodel.HSSFListener;
-import org.apache.poi.hssf.eventusermodel.HSSFRequest;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.junit.Test;
-
-public final class TestChartTitleFormatRecord {
-
-	@Test
-    public void testRecord() throws Exception {
-		NPOIFSFileSystem fs = new NPOIFSFileSystem(
-				HSSFTestDataSamples.getSampleFile("WithFormattedGraphTitle.xls"));
-		
-		// Check we can open the file via usermodel
-		HSSFWorkbook hssf = new HSSFWorkbook(fs);
-		
-		// Now process it through eventusermodel, and
-		//  look out for the title records
-		ChartTitleFormatRecordGrabber grabber = new ChartTitleFormatRecordGrabber();
-		InputStream din = fs.createDocumentInputStream("Workbook");
-		HSSFRequest req = new HSSFRequest();
-		req.addListenerForAllRecords(grabber);
-		HSSFEventFactory factory = new HSSFEventFactory();
-		factory.processEvents(req, din);
-		din.close();
-		
-		// Should've found one
-		assertEquals(1, grabber.chartTitleFormatRecords.size());
-		// And it should be of something interesting
-		ChartTitleFormatRecord r = grabber.chartTitleFormatRecords.get(0);
-		assertEquals(3, r.getFormatCount());
-		
-		hssf.close();
-		fs.close();
-		
-	}
-	
-	private static final class ChartTitleFormatRecordGrabber implements HSSFListener {
-		private final List<ChartTitleFormatRecord> chartTitleFormatRecords;
-		
-		public ChartTitleFormatRecordGrabber() {
-			chartTitleFormatRecords = new ArrayList<ChartTitleFormatRecord>();
-		}
-
-		@Override
-        public void processRecord(Record record) {
-			if(record instanceof ChartTitleFormatRecord) {
-				chartTitleFormatRecords.add((ChartTitleFormatRecord)record);
-			}
-		}
-		
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
deleted file mode 100644
index 93b25ed..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the DatRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestDatRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x0D,(byte)0x00   // options
-    };
-
-    public void testLoad() {
-
-        DatRecord record = new DatRecord(TestcaseRecordInputStream.create(0x1063, data));
-        assertEquals( 0xD, record.getOptions());
-        assertEquals( true, record.isHorizontalBorder() );
-        assertEquals( false, record.isVerticalBorder() );
-        assertEquals( true, record.isBorder() );
-        assertEquals( true, record.isShowSeriesKey() );
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        DatRecord record = new DatRecord();
-        record.setHorizontalBorder( true );
-        record.setVerticalBorder( false );
-        record.setBorder( true );
-        record.setShowSeriesKey( true );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
deleted file mode 100644
index c9958f5..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the DataFormatRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestDataFormatRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0xFF,(byte)0xFF,      // point number
-        (byte)0x00,(byte)0x00,      // series index
-        (byte)0x00,(byte)0x00,      // series number
-        (byte)0x00,(byte)0x00       // format flags
-    };
-
-    public void testLoad() {
-
-        DataFormatRecord record = new DataFormatRecord(TestcaseRecordInputStream.create(0x1006, data));
-        assertEquals( (short)0xFFFF, record.getPointNumber());
-        assertEquals( 0, record.getSeriesIndex());
-        assertEquals( 0, record.getSeriesNumber());
-        assertEquals( 0, record.getFormatFlags());
-        assertEquals( false, record.isUseExcel4Colors() );
-
-        assertEquals( 12, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        DataFormatRecord record = new DataFormatRecord();
-        record.setPointNumber( (short)0xFFFF );
-        record.setSeriesIndex( (short)0 );
-        record.setSeriesNumber( (short)0 );
-        record.setFormatFlags( (short)0 );
-        record.setUseExcel4Colors( false );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
deleted file mode 100644
index 32bddd8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the DefaultDataLabelTextPropertiesRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestDefaultDataLabelTextPropertiesRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x02,(byte)0x00
-    };
-
-    public void testLoad() {
-
-        DefaultDataLabelTextPropertiesRecord record = new DefaultDataLabelTextPropertiesRecord(TestcaseRecordInputStream.create(0x1024, data));
-        assertEquals( 2, record.getCategoryDataType());
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        DefaultDataLabelTextPropertiesRecord record = new DefaultDataLabelTextPropertiesRecord();
-        record.setCategoryDataType( (short)2 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
deleted file mode 100644
index c783a34..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the FontBasisRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestFontBasisRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x28,(byte)0x1A,   // x basis
-        (byte)0x9C,(byte)0x0F,   // y basis
-        (byte)0xC8,(byte)0x00,   // height basis
-        (byte)0x00,(byte)0x00,   // scale
-        (byte)0x05,(byte)0x00    // index to font table
-    };
-
-    public void testLoad() {
-
-        FontBasisRecord record = new FontBasisRecord(TestcaseRecordInputStream.create(0x1060, data));
-        assertEquals( 0x1a28, record.getXBasis());
-        assertEquals( 0x0f9c, record.getYBasis());
-        assertEquals( 0xc8, record.getHeightBasis());
-        assertEquals( 0x00, record.getScale());
-        assertEquals( 0x05, record.getIndexToFontTable());
-
-        assertEquals( 14, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        FontBasisRecord record = new FontBasisRecord();
-        record.setXBasis( (short)0x1a28 );
-        record.setYBasis( (short)0x0f9c );
-        record.setHeightBasis( (short)0xc8 );
-        record.setScale( (short)0x00 );
-        record.setIndexToFontTable( (short)0x05 );
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
deleted file mode 100644
index fb09d30..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the FontIndexRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestFontIndexRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x05,(byte)0x00
-    };
-
-    public void testLoad() {
-
-        FontIndexRecord record = new FontIndexRecord(TestcaseRecordInputStream.create(0x1026, data));
-        assertEquals( 5, record.getFontIndex());
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        FontIndexRecord record = new FontIndexRecord();
-        record.setFontIndex( (short)5 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
deleted file mode 100644
index da2a8a3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the FrameRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestFrameRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,      // border type
-        (byte)0x02,(byte)0x00       // options
-    };
-
-    public void testLoad() {
-
-        FrameRecord record = new FrameRecord(TestcaseRecordInputStream.create(0x1032, data));
-        assertEquals( FrameRecord.BORDER_TYPE_REGULAR, record.getBorderType());
-        assertEquals( 2, record.getOptions());
-        assertEquals( false, record.isAutoSize() );
-        assertEquals( true, record.isAutoPosition() );
-
-        assertEquals( 8, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        FrameRecord record = new FrameRecord();
-        record.setBorderType( FrameRecord.BORDER_TYPE_REGULAR );
-        record.setOptions( (short)2 );
-        record.setAutoSize( false );
-        record.setAutoPosition( true );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
deleted file mode 100644
index a23d674..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the LegendRecord class works
- * correctly. Test data taken directly from a real Excel file.
- * 
- * 
- * @author Andrew C. Oliver (acoliver at apache.org)
- */
-public final class TestLegendRecord extends TestCase {
-	byte[] data = new byte[] { (byte) 0x76, (byte) 0x0E, (byte) 0x00, (byte) 0x00, (byte) 0x86,
-			(byte) 0x07, (byte) 0x00, (byte) 0x00, (byte) 0x19, (byte) 0x01, (byte) 0x00,
-			(byte) 0x00, (byte) 0x8B, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03,
-			(byte) 0x01, (byte) 0x1F, (byte) 0x00 };
-
-	public void testLoad() {
-		LegendRecord record = new LegendRecord(TestcaseRecordInputStream.create(0x1015, data));
-
-		assertEquals(0xe76, record.getXAxisUpperLeft());
-
-		assertEquals(0x786, record.getYAxisUpperLeft());
-
-		assertEquals(0x119, record.getXSize());
-
-		assertEquals(0x8b, record.getYSize());
-
-		assertEquals((byte) 0x3, record.getType());
-
-		assertEquals((byte) 0x1, record.getSpacing());
-
-		assertEquals((short) 0x1f, record.getOptions());
-		assertEquals(true, record.isAutoPosition());
-		assertEquals(true, record.isAutoSeries());
-		assertEquals(true, record.isAutoXPositioning());
-		assertEquals(true, record.isAutoYPositioning());
-		assertEquals(true, record.isVertical());
-		assertEquals(false, record.isDataTable());
-
-		assertEquals(24, record.getRecordSize());
-	}
-
-	public void testStore() {
-		LegendRecord record = new LegendRecord();
-
-		record.setXAxisUpperLeft(0xe76);
-
-		record.setYAxisUpperLeft(0x786);
-
-		record.setXSize(0x119);
-
-		record.setYSize(0x8b);
-
-		record.setType((byte) 0x3);
-
-		record.setSpacing((byte) 0x1);
-
-		record.setOptions((short) 0x1f);
-		record.setAutoPosition(true);
-		record.setAutoSeries(true);
-		record.setAutoXPositioning(true);
-		record.setAutoYPositioning(true);
-		record.setVertical(true);
-		record.setDataTable(false);
-
-		byte[] recordBytes = record.serialize();
-		assertEquals(recordBytes.length - 4, data.length);
-		for (int i = 0; i < data.length; i++)
-			assertEquals("At offset " + i, data[i], recordBytes[i + 4]);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
deleted file mode 100644
index 5b58b22..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the LineFormatRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestLineFormatRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,    // colour
-        (byte)0x00,(byte)0x00,                          // pattern
-        (byte)0x00,(byte)0x00,                          // weight
-        (byte)0x01,(byte)0x00,                          // format
-        (byte)0x4D,(byte)0x00                           // index
-    };
-
-    public void testLoad() {
-        LineFormatRecord record = new LineFormatRecord(TestcaseRecordInputStream.create(0x1007, data));
-        assertEquals( 0, record.getLineColor());
-        assertEquals( 0, record.getLinePattern());
-        assertEquals( 0, record.getWeight());
-        assertEquals( 1, record.getFormat());
-        assertEquals( true, record.isAuto() );
-        assertEquals( false, record.isDrawTicks() );
-        assertEquals( 0x4d, record.getColourPaletteIndex());
-
-        assertEquals( 16, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        LineFormatRecord record = new LineFormatRecord();
-        record.setLineColor( 0 );
-        record.setLinePattern( (short)0 );
-        record.setWeight( (short)0 );
-        record.setAuto( true );
-        record.setDrawTicks( false );
-        record.setColourPaletteIndex( (short)0x4d );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
deleted file mode 100644
index 3fa87dc..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-
-/**
- * Tests the serialization and deserialization of the LinkedDataRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestLinkedDataRecord extends TestCase {
-
-/*
-    The records below are records that would appear in a simple bar chart
-
-    The first record links to the series title (linkType = 0).   It's
-    reference type is 1 which means that it links directly to data entered
-    into the forumula bar.  There seems to be no reference to any data
-    however.  The formulaOfLink field contains two 0 bytes.  This probably
-    means that there is no particular heading set.
-
-
-============================================
-Offset 0xf9c (3996)
-rectype = 0x1051, recsize = 0x8
--BEGIN DUMP---------------------------------
-00000000 00 01 00 00 00 00 00 00                         ........
--END DUMP-----------------------------------
-recordid = 0x1051, size =8
-[AI]
-.linkType             = 0x00 (0 )
-.referenceType        = 0x01 (1 )
-.options              = 0x0000 (0 )
-    .customNumberFormat       = false
-.indexNumberFmtRecord = 0x0000 (0 )
-.formulaOfLink        =  (org.apache.poi.hssf.record.LinkedDataFormulaField@95fd19 )
-[/AI]
-
-
-    The second record links to the series data (linkType=1).  The
-    referenceType = 2 which means it's linked to the worksheet.
-    It links using a formula.  The formula value is
-    0B 00 3B 00 00 00 00 1E 00 01 00 01 00.
-
-    0B 00   11 bytes length
-    3B (tArea3d) Rectangular area
-        00 00 index to REF entry in extern sheet
-        00 00 index to first row
-        1E 00 index to last row
-        01 00 index to first column and relative flags
-        01 00 index to last column and relative flags
-
-============================================
-Offset 0xfa8 (4008)
-rectype = 0x1051, recsize = 0x13
--BEGIN DUMP---------------------------------
-00000000 01 02 00 00 00 00 0B 00 3B 00 00 00 00 1E 00 01 ........;.......
-00000010 00 01 00                                        ...
--END DUMP-----------------------------------
-recordid = 0x1051, size =19
-[AI]
-.linkType             = 0x01 (1 )
-.referenceType        = 0x02 (2 )
-.options              = 0x0000 (0 )
-    .customNumberFormat       = false
-.indexNumberFmtRecord = 0x0000 (0 )
-.formulaOfLink        =  (org.apache.poi.hssf.record.LinkedDataFormulaField@11b9fb1 )
-[/AI]
-
-    The third record links to the series categories (linkType=2).  The
-    reference type of 2 means that it's linked to the worksheet.
-    It links using a formula.  The formula value is
-    0B 00 3B 00 00 00 00 1E 00 01 00 01 00
-
-    0B 00   11 bytes in length
-        3B (tArea3d) Rectangular area
-        00 00 index to REF entry in extern sheet
-        00 00  index to first row
-        00 1F  index to last row
-        00 00 index to first column and relative flags
-        00 00 index to last column and relative flags
-
-
-============================================
-Offset 0xfbf (4031)
-rectype = 0x1051, recsize = 0x13
--BEGIN DUMP---------------------------------
-00000000 02 02 00 00 69 01 0B 00 3B 00 00 00 00 1F 00 00 ....i...;.......
-00000010 00 00 00                                        ...
--END DUMP-----------------------------------
-recordid = 0x1051, size =19
-[AI]
-.linkType             = 0x02 (2 )
-.referenceType        = 0x02 (2 )
-.options              = 0x0000 (0 )
-    .customNumberFormat       = false
-.indexNumberFmtRecord = 0x0169 (361 )
-.formulaOfLink        =  (org.apache.poi.hssf.record.LinkedDataFormulaField@913fe2 )
-[/AI]
-
-This third link type does not seem to be documented and does not appear to
-contain any useful information anyway.
-
-============================================
-Offset 0xfd6 (4054)
-rectype = 0x1051, recsize = 0x8
--BEGIN DUMP---------------------------------
-00000000 03 01 00 00 00 00 00 00                         ........
--END DUMP-----------------------------------
-recordid = 0x1051, size =8
-[AI]
-.linkType             = 0x03 (3 )
-.referenceType        = 0x01 (1 )
-.options              = 0x0000 (0 )
-    .customNumberFormat       = false
-.indexNumberFmtRecord = 0x0000 (0 )
-.formulaOfLink        =  (org.apache.poi.hssf.record.LinkedDataFormulaField@1f934ad )
-[/AI]
-
-*/
-
-    byte[] data = new byte[]{
-        (byte)0x01,                 // link type
-        (byte)0x02,                 // reference type
-        (byte)0x00,(byte)0x00,      // options
-        (byte)0x00,(byte)0x00,      // index number format record
-        (byte)0x0B,(byte)0x00,      // 11 bytes length
-        (byte)0x3B,                 // formula of link
-        (byte)0x00,(byte)0x00,          // index to ref entry in extern sheet
-        (byte)0x00,(byte)0x00,          // index to first row
-        (byte)0x00,(byte)0x1F,          // index to last row
-        (byte)0x00,(byte)0x00,          // index to first column and relative flags
-        (byte)0x00,(byte)0x00,          // index to last column and relative flags
-    };
-
-    public void testLoad() {
-
-        LinkedDataRecord record = new LinkedDataRecord(TestcaseRecordInputStream.create(0x1051, data));
-        assertEquals( LinkedDataRecord.LINK_TYPE_VALUES, record.getLinkType());
-        assertEquals( LinkedDataRecord.REFERENCE_TYPE_WORKSHEET, record.getReferenceType());
-        assertEquals( 0, record.getOptions());
-        assertEquals( false, record.isCustomNumberFormat() );
-        assertEquals( 0, record.getIndexNumberFmtRecord());
-
-        Area3DPtg ptgExpected = new Area3DPtg(0, 7936, 0, 0,
-                false, false, false, false, 0);
-        
-        Ptg ptgActual = record.getFormulaOfLink()[0];
-        assertEquals(ptgExpected.toString(),  ptgActual.toString());
-
-        assertEquals( data.length + 4, record.getRecordSize() );
-    }
-
-    public void testStore() {
-        LinkedDataRecord record = new LinkedDataRecord();
-        record.setLinkType( LinkedDataRecord.LINK_TYPE_VALUES );
-        record.setReferenceType( LinkedDataRecord.REFERENCE_TYPE_WORKSHEET );
-        record.setOptions( (short)0 );
-        record.setCustomNumberFormat( false );
-        record.setIndexNumberFmtRecord( (short)0 );
-        Area3DPtg ptg = new Area3DPtg(0, 7936, 0, 0,
-        		false, false, false, false, 0);
-        record.setFormulaOfLink(new Ptg[] { ptg, } );
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
deleted file mode 100644
index d06f646..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the NumberFormatIndexRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestNumberFormatIndexRecord extends TestCase {
-    byte[] data = new byte[] {
-        0x05,0x00
-    };
-
-    public void testLoad() {
-
-        NumberFormatIndexRecord record = new NumberFormatIndexRecord(TestcaseRecordInputStream.create(0x104e, data));
-        assertEquals( 5, record.getFormatIndex());
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        NumberFormatIndexRecord record = new NumberFormatIndexRecord();
-        record.setFormatIndex( (short)5 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
deleted file mode 100644
index f12babe..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the ObjectLinkRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
- */
-public final class TestObjectLinkRecord extends TestCase {
-    byte[] data = new byte[] {
-	(byte)0x03,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00
-    };
-
-    public void testLoad() {
-        ObjectLinkRecord record = new ObjectLinkRecord(TestcaseRecordInputStream.create(0x1027, data));
-        
-        assertEquals( (short)3, record.getAnchorId());
-        assertEquals( (short)0x00, record.getLink1());
-        assertEquals( (short)0x00, record.getLink2());
-
-        assertEquals( 10, record.getRecordSize() );
-    }
-
-    public void testStore() {
-        ObjectLinkRecord record = new ObjectLinkRecord();
-
-        record.setAnchorId( (short)3 );
-        record.setLink1( (short)0x00 );
-        record.setLink2( (short)0x00 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
deleted file mode 100644
index bfd678b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the PlotAreaRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
- */
-public final class TestPlotAreaRecord extends TestCase {
-    byte[] data = new byte[] {
-	
-    };
-
-    public void testLoad() {
-        PlotAreaRecord record = new PlotAreaRecord(TestcaseRecordInputStream.create(0x1035, data));
-
-        assertEquals( 4, record.getRecordSize() );
-    }
-
-    public void testStore() {
-        PlotAreaRecord record = new PlotAreaRecord();
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
deleted file mode 100644
index cb7de70..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the PlotGrowthRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestPlotGrowthRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,(byte)0x01,(byte)0x00,    // horizontal
-        (byte)0x00,(byte)0x00,(byte)0x01,(byte)0x00     // vertical
-    };
-
-    public void testLoad() {
-
-        PlotGrowthRecord record = new PlotGrowthRecord(TestcaseRecordInputStream.create(0x1064, data));
-        assertEquals( 65536, record.getHorizontalScale());
-        assertEquals( 65536, record.getVerticalScale());
-
-        assertEquals( 12, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        PlotGrowthRecord record = new PlotGrowthRecord();
-        record.setHorizontalScale( 65536 );
-        record.setVerticalScale( 65536 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
deleted file mode 100644
index d216cc2..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the SeriesChartGroupIndexRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSeriesChartGroupIndexRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00
-    };
-
-    public void testLoad() {
-        SeriesChartGroupIndexRecord record = new SeriesChartGroupIndexRecord(TestcaseRecordInputStream.create(0x1045, data));
-        assertEquals( 0, record.getChartGroupIndex());
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        SeriesChartGroupIndexRecord record = new SeriesChartGroupIndexRecord();
-        record.setChartGroupIndex( (short)0 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
deleted file mode 100644
index 86f24a3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the SeriesIndexRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
- */
-public final class TestSeriesIndexRecord extends TestCase {
-    byte[] data = new byte[] {
-	(byte)0x03,(byte)0x00
-    };
-
-    public void testLoad() {
-        SeriesIndexRecord record = new SeriesIndexRecord(TestcaseRecordInputStream.create(0x1065, data));
-        
-        assertEquals( (short)3, record.getIndex());
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        SeriesIndexRecord record = new SeriesIndexRecord();
-
-
-
-        record.setIndex( (short)3 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
deleted file mode 100644
index 9f0f1f1..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the SeriesLabelsRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSeriesLabelsRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x03,(byte)0x00
-    };
-
-    public void testLoad() {
-        SeriesLabelsRecord record = new SeriesLabelsRecord(TestcaseRecordInputStream.create(0x100c, data));
-        assertEquals( 3, record.getFormatFlags());
-        assertEquals( true, record.isShowActual() );
-        assertEquals( true, record.isShowPercent() );
-        assertEquals( false, record.isLabelAsPercentage() );
-        assertEquals( false, record.isSmoothedLine() );
-        assertEquals( false, record.isShowLabel() );
-        assertEquals( false, record.isShowBubbleSizes() );
-
-
-        assertEquals( 2+4, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        SeriesLabelsRecord record = new SeriesLabelsRecord();
-        record.setShowActual( true );
-        record.setShowPercent( true );
-        record.setLabelAsPercentage( false );
-        record.setSmoothedLine( false );
-        record.setShowLabel( false );
-        record.setShowBubbleSizes( false );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
deleted file mode 100644
index c049de4..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the SeriesListRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSeriesListRecord extends TestCase {
-    private static final byte[] data = {
-        (byte)0x02,(byte)0x00,(byte)0x01,(byte)0x20,(byte)0xff,(byte)0xf0
-    };
-
-    public void testLoad() {
-
-        SeriesListRecord record = new SeriesListRecord(TestcaseRecordInputStream.create(0x1016, data));
-        assertEquals( (short)0x2001, record.getSeriesNumbers()[0]);
-        assertEquals( (short)0xf0ff, record.getSeriesNumbers()[1]);
-        assertEquals( 2, record.getSeriesNumbers().length);
-
-        assertEquals( 4 + 6, record.getRecordSize() );
-    }
-
-    public void testStore() {
-        SeriesListRecord record = new SeriesListRecord(new short[] { (short)0x2001, (short)0xf0ff } );
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
deleted file mode 100644
index dacaae1..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the SeriesRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSeriesRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x01,(byte)0x00,      // category data type
-        (byte)0x01,(byte)0x00,      // values data type
-        (byte)0x1B,(byte)0x00,      // num categories
-        (byte)0x1B,(byte)0x00,      // num values
-        (byte)0x01,(byte)0x00,      // bubble series type
-        (byte)0x00,(byte)0x00       // num bubble values
-    };
-
-    public void testLoad() {
-
-        SeriesRecord record = new SeriesRecord(TestcaseRecordInputStream.create(0x1003, data));
-        assertEquals( SeriesRecord.CATEGORY_DATA_TYPE_NUMERIC, record.getCategoryDataType());
-        assertEquals( SeriesRecord.VALUES_DATA_TYPE_NUMERIC, record.getValuesDataType());
-        assertEquals( 27, record.getNumCategories());
-        assertEquals( 27, record.getNumValues());
-        assertEquals( SeriesRecord.BUBBLE_SERIES_TYPE_NUMERIC, record.getBubbleSeriesType());
-        assertEquals( 0, record.getNumBubbleValues());
-
-
-        assertEquals( 16, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        SeriesRecord record = new SeriesRecord();
-        record.setCategoryDataType( SeriesRecord.CATEGORY_DATA_TYPE_NUMERIC );
-        record.setValuesDataType( SeriesRecord.VALUES_DATA_TYPE_NUMERIC );
-        record.setNumCategories( (short)27 );
-        record.setNumValues( (short)27 );
-        record.setBubbleSeriesType( SeriesRecord.BUBBLE_SERIES_TYPE_NUMERIC );
-        record.setNumBubbleValues( (short)0 );
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
deleted file mode 100644
index 2d11999..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests the serialization and deserialization of the SeriesTextRecord class
- * works correctly. Test data taken directly from a real Excel file.
- * 
- * 
- * @author Andrew C. Oliver (acoliver at apache.org)
- */
-public final class TestSeriesTextRecord extends TestCase {
-	private static final byte[] SIMPLE_DATA = HexRead
-			.readFromString("00 00 0C 00 56 61 6C 75 65 20 4E 75 6D 62 65 72");
-
-	public void testLoad() {
-		SeriesTextRecord record = new SeriesTextRecord(TestcaseRecordInputStream.create(0x100d, SIMPLE_DATA));
-
-		assertEquals((short) 0, record.getId());
-		assertEquals("Value Number", record.getText());
-
-		assertEquals(SIMPLE_DATA.length + 4, record.getRecordSize());
-	}
-
-	public void testStore() {
-		SeriesTextRecord record = new SeriesTextRecord();
-
-		record.setId(0);
-		record.setText("Value Number");
-
-		byte[] recordBytes = record.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(SeriesTextRecord.sid, SIMPLE_DATA,
-				recordBytes);
-	}
-
-	public void testReserializeLongTitle() {
-		// Hex dump from bug 45784 attachment 22560 streamOffset=0x0CD1
-		byte[] data = HexRead.readFromString(
-				"00 00, "
-				+ "82 "
-				+ "01 "
-				+ "50 00 6C 00 61 00 73 00 6D 00 61 00 20 00 4C 00 "
-				+ "65 00 76 00 65 00 6C 00 73 00 20 00 6F 00 66 00 "
-				+ "20 00 4C 00 2D 00 30 00 30 00 30 00 31 00 31 00 "
-				+ "31 00 32 00 32 00 32 00 2D 00 33 00 33 00 33 00 "
-				+ "58 00 34 00 34 00 34 00 20 00 69 00 6E 00 20 00 "
-				+ "53 00 44 00 20 00 72 00 61 00 74 00 0A 00 50 00 "
-				+ "4F 00 20 00 33 00 2E 00 30 00 20 00 6D 00 67 00 "
-				+ "2F 00 6B 00 67 00 20 00 28 00 35 00 2E 00 30 00 "
-				+ "20 00 6D 00 4C 00 2F 00 6B 00 67 00 29 00 20 00 "
-				+ "69 00 6E 00 20 00 4D 00 65 00 74 00 68 00 6F 00 "
-				+ "63 00 65 00 6C 00 0A 00 49 00 56 00 20 00 30 00 "
-				+ "2E 00 35 00 20 00 6D 00 67 00 2F 00 6B 00 67 00 "
-				+ "20 00 28 00 31 00 2E 00 30 00 20 00 6D 00 4C 00 "
-				+ "2F 00 6B 00 67 00 29 00 20 00 69 00 6E 00 20 00 "
-				+ "36 00 30 00 25 00 20 00 50 00 45 00 47 00 20 00 "
-				+ "32 00 30 00 30 00 0A 00 46 00 20 00 3D 00 61 00 "
-				+ "62 00 63 00");
-
-		RecordInputStream in = TestcaseRecordInputStream.create(SeriesTextRecord.sid, data);
-		SeriesTextRecord str;
-		try {
-			str = new SeriesTextRecord(in);
-		} catch (RecordFormatException e) {
-			if (e.getCause() instanceof IllegalArgumentException) {
-				// 'would be' error msg changed at svn r703620
-				// "Illegal length - asked for -126 but only 130 left!"
-				// "Bad requested string length (-126)"
-				throw new AssertionFailedError("Identified bug 45784a");
-			}
-			throw e;
-		}
-
-		if (str.getRecordSize() < 0) {
-			throw new AssertionFailedError("Identified bug 45784b");
-		}
-		byte[] ser;
-		try {
-			ser = str.serialize();
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		TestcaseRecordInputStream.confirmRecordEncoding(SeriesTextRecord.sid, data, ser);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
deleted file mode 100644
index 22ad685..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the SeriesToChartGroupRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
- */
-public final class TestSeriesToChartGroupRecord extends TestCase {
-    byte[] data = new byte[] {
-	(byte)0x0, (byte)0x0
-    };
-
-    public void testLoad() {
-        SeriesToChartGroupRecord record = new SeriesToChartGroupRecord(TestcaseRecordInputStream.create(0x1045, data));
-        assertEquals( 0x0, record.getChartGroupIndex());
-
-        assertEquals( 0x6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        SeriesToChartGroupRecord record = new SeriesToChartGroupRecord();
-        record.setChartGroupIndex( (short)0x0 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
deleted file mode 100644
index ba1415e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link SheetPropertiesRecord}
- * Test data taken directly from a real Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSheetPropertiesRecord extends TestCase {
-    private static final byte[] data = {
-        (byte)0x0A,(byte)0x00,
-        (byte)0x00,
-        (byte)0x00,      // not sure where that last byte comes from
-    };
-
-    public void testLoad() {
-        RecordInputStream in = TestcaseRecordInputStream.create(0x1044, data);
-        SheetPropertiesRecord record = new SheetPropertiesRecord(in);
-        if (in.remaining() == 1) {
-            throw new AssertionFailedError("Identified bug 44693c");
-        }
-        assertEquals(0, in.remaining());
-        assertEquals( 10, record.getFlags());
-        assertEquals( false, record.isChartTypeManuallyFormatted() );
-        assertEquals( true, record.isPlotVisibleOnly() );
-        assertEquals( false, record.isDoNotSizeWithWindow() );
-        assertEquals( true, record.isDefaultPlotDimensions() );
-        assertEquals( false, record.isAutoPlotArea() );
-        assertEquals( 0, record.getEmpty());
-
-        assertEquals( 8, record.getRecordSize() );
-    }
-
-    public void testStore() {
-        SheetPropertiesRecord record = new SheetPropertiesRecord();
-        record.setChartTypeManuallyFormatted( false );
-        record.setPlotVisibleOnly( true );
-        record.setDoNotSizeWithWindow( false );
-        record.setDefaultPlotDimensions( true );
-        record.setAutoPlotArea( false );
-        record.setEmpty( (byte)0 );
-
-
-        byte [] recordBytes = record.serialize();
-        TestcaseRecordInputStream.confirmRecordEncoding(SheetPropertiesRecord.sid, data, recordBytes);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
deleted file mode 100644
index 4214b0a..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the TextRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestTextRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x02,                                          // horiz align
-        (byte)0x02,                                          // vert align
-        (byte)0x01,(byte)0x00,                               // display mode
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,         // rgb color
-        (byte)0xD6,(byte)0xFF,(byte)0xFF,(byte)0xFF,         // x
-        (byte)0xC4,(byte)0xFF,(byte)0xFF,(byte)0xFF,         // y
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,         // width
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,         // height
-        (byte)0xB1,(byte)0x00,                               // options 1
-        (byte)0x4D,(byte)0x00,                               // index of color value
-        (byte)0x50,(byte)0x2B,                               // options 2       -- strange upper bits supposed to be 0'd
-        (byte)0x00,(byte)0x00                                // text rotation
-    };
-
-    public void testLoad() {
-
-        TextRecord record = new TextRecord(TestcaseRecordInputStream.create(0x1025, data));
-        assertEquals( TextRecord.HORIZONTAL_ALIGNMENT_CENTER, record.getHorizontalAlignment());
-        assertEquals( TextRecord.VERTICAL_ALIGNMENT_CENTER, record.getVerticalAlignment());
-        assertEquals( TextRecord.DISPLAY_MODE_TRANSPARENT, record.getDisplayMode());
-        assertEquals( 0, record.getRgbColor());
-        assertEquals( -42, record.getX());
-        assertEquals( -60, record.getY());
-        assertEquals( 0, record.getWidth());
-        assertEquals( 0, record.getHeight());
-        assertEquals( 177, record.getOptions1());
-        assertEquals( true, record.isAutoColor() );
-        assertEquals( false, record.isShowKey() );
-        assertEquals( false, record.isShowValue() );
-        assertEquals( false, record.isVertical() );
-        assertEquals( true, record.isAutoGeneratedText() );
-        assertEquals( true, record.isGenerated() );
-        assertEquals( false, record.isAutoLabelDeleted() );
-        assertEquals( true, record.isAutoBackground() );
-        assertEquals(  TextRecord.ROTATION_NONE, record.getRotation() );
-        assertEquals( false, record.isShowCategoryLabelAsPercentage() );
-        assertEquals( false, record.isShowValueAsPercentage() );
-        assertEquals( false, record.isShowBubbleSizes() );
-        assertEquals( false, record.isShowLabel() );
-        assertEquals( 77, record.getIndexOfColorValue());
-        assertEquals( 11088, record.getOptions2());
-        assertEquals( 0, record.getDataLabelPlacement() );
-        assertEquals( 0, record.getTextRotation());
-
-
-        assertEquals( 36, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        TextRecord record = new TextRecord();
-        record.setHorizontalAlignment( TextRecord.HORIZONTAL_ALIGNMENT_CENTER );
-        record.setVerticalAlignment( TextRecord.VERTICAL_ALIGNMENT_CENTER );
-        record.setDisplayMode( TextRecord.DISPLAY_MODE_TRANSPARENT );
-        record.setRgbColor( 0 );
-        record.setX( -42 );
-        record.setY( -60 );
-        record.setWidth( 0 );
-        record.setHeight( 0 );
-        record.setAutoColor( true );
-        record.setShowKey( false );
-        record.setShowValue( false );
-        record.setVertical( false );
-        record.setAutoGeneratedText( true );
-        record.setGenerated( true );
-        record.setAutoLabelDeleted( false );
-        record.setAutoBackground( true );
-        record.setRotation(  TextRecord.ROTATION_NONE );
-        record.setShowCategoryLabelAsPercentage( false );
-        record.setShowValueAsPercentage( false );
-        record.setShowBubbleSizes( false );
-        record.setShowLabel( false );
-        record.setIndexOfColorValue( (short)77 );
-        record.setOptions2( (short)0x2b50 );
-//        record.setDataLabelPlacement( (short)0x2b50 );
-        record.setTextRotation( (short)0 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
deleted file mode 100644
index 28d1317..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the TickRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- * @author Andrew C. Oliver(acoliver at apache.org)
- */
-public final class TestTickRecord extends TestCase {
-    private static final byte[] data = {
-        (byte)0x02, (byte)0x00, (byte)0x03, (byte)0x01,
-        (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
-        (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
-        (byte)0x00, (byte)0x00, (byte)0x00,
-        (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
-        (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x23, (byte)0x00,
-        (byte)0x4D, (byte)0x00, (byte)0x00, (byte)0x00
-    };
-
-    public void testLoad() {
-        TickRecord record = new TickRecord(TestcaseRecordInputStream.create(0x101e, data));
-        assertEquals( (byte)2, record.getMajorTickType());
-        assertEquals( (byte)0, record.getMinorTickType());
-        assertEquals( (byte)3, record.getLabelPosition());
-        assertEquals( (short)1, record.getBackground());
-        assertEquals( 0, record.getLabelColorRgb());
-        assertEquals( (short)0, record.getZero1());
-        assertEquals( (short)0, record.getZero2());
-        assertEquals( (short)35, record.getOptions());
-        assertEquals( true, record.isAutoTextColor() );
-        assertEquals( true, record.isAutoTextBackground() );
-        assertEquals( (short)0x0, record.getRotation() );
-        assertEquals( true, record.isAutorotate() );
-        assertEquals( (short)77, record.getTickColor());
-        assertEquals( (short)0x0, record.getZero3());
-
-
-        assertEquals( 34, record.getRecordSize() );
-    }
-
-    public void testStore() {
-        TickRecord record = new TickRecord();
-        record.setMajorTickType( (byte)2 );
-        record.setMinorTickType( (byte)0 );
-        record.setLabelPosition( (byte)3 );
-        record.setBackground( (byte)1 );
-        record.setLabelColorRgb( 0 );
-        record.setZero1( (short)0 );
-        record.setZero2( (short)0 );
-        record.setOptions( (short)35 );
-        record.setAutoTextColor( true );
-        record.setAutoTextBackground( true );
-        record.setRotation( (short)0 );
-        record.setAutorotate( true );
-        record.setTickColor( (short)77 );
-        record.setZero3( (short)0 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
deleted file mode 100644
index 4c142bd..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the UnitsRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestUnitsRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00, (byte)0x00
-    };
-
-    public void testLoad() {
-
-        UnitsRecord record = new UnitsRecord(TestcaseRecordInputStream.create(0x1001, data));
-        assertEquals( 0, record.getUnits());
-
-        assertEquals( 6, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        UnitsRecord record = new UnitsRecord();
-        record.setUnits( (short)0 );
-
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
deleted file mode 100644
index d2a08df..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the ValueRangeRecord
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestValueRangeRecord extends TestCase {
-    byte[] data = new byte[] {
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,     // min axis value
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,     // max axis value
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,     // major increment
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,     // minor increment
-        (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,     // cross over
-        (byte)0x1F,(byte)0x01                                    // options
-    };
-
-    public void testLoad() {
-
-        ValueRangeRecord record = new ValueRangeRecord(TestcaseRecordInputStream.create(0x101f, data));
-        assertEquals( 0.0, record.getMinimumAxisValue(), 0.001);
-        assertEquals( 0.0, record.getMaximumAxisValue(), 0.001);
-        assertEquals( 0.0, record.getMajorIncrement(), 0.001);
-        assertEquals( 0.0, record.getMinorIncrement(), 0.001);
-        assertEquals( 0.0, record.getCategoryAxisCross(), 0.001);
-        assertEquals( 0x011f, record.getOptions());
-        assertEquals( true, record.isAutomaticMinimum() );
-        assertEquals( true, record.isAutomaticMaximum() );
-        assertEquals( true, record.isAutomaticMajor() );
-        assertEquals( true, record.isAutomaticMinor() );
-        assertEquals( true, record.isAutomaticCategoryCrossing() );
-        assertEquals( false, record.isLogarithmicScale() );
-        assertEquals( false, record.isValuesInReverse() );
-        assertEquals( false, record.isCrossCategoryAxisAtMaximum() );
-        assertEquals( true, record.isReserved() );
-
-        assertEquals( 42+4, record.getRecordSize() );
-    }
-
-    public void testStore()
-    {
-        ValueRangeRecord record = new ValueRangeRecord();
-        record.setMinimumAxisValue( 0 );
-        record.setMaximumAxisValue( 0 );
-        record.setMajorIncrement( 0 );
-        record.setMinorIncrement( 0 );
-        record.setCategoryAxisCross( 0 );
-        record.setAutomaticMinimum( true );
-        record.setAutomaticMaximum( true );
-        record.setAutomaticMajor( true );
-        record.setAutomaticMinor( true );
-        record.setAutomaticCategoryCrossing( true );
-        record.setLogarithmicScale( false );
-        record.setValuesInReverse( false );
-        record.setCrossCategoryAxisAtMaximum( false );
-        record.setReserved( true );
-
-        byte [] recordBytes = record.serialize();
-        assertEquals(recordBytes.length - 4, data.length);
-        for (int i = 0; i < data.length; i++)
-            assertEquals("At offset " + i, data[i], recordBytes[i+4]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java b/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
deleted file mode 100644
index c1c585d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.common;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.poi.hssf.record.ContinueRecord;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.common.UnicodeString.ExtRst;
-import org.apache.poi.hssf.record.common.UnicodeString.FormatRun;
-import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
-import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianConsts;
-import org.apache.poi.util.LittleEndianInput;
-import org.apache.poi.util.LittleEndianInputStream;
-import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.StringUtil;
-import org.junit.Test;
-
-/**
- * Tests that {@link UnicodeString} record size calculates correctly.  The record size
- * is used when serializing {@link SSTRecord}s.
- *
- * @author Jason Height (jheight at apache.org)
- */
-public final class TestUnicodeString {
-    private static final int MAX_DATA_SIZE = RecordInputStream.MAX_RECORD_DATA_SIZE;
-
-    /** a 4 character string requiring 16 bit encoding */
-    private static final String STR_16_BIT = "A\u591A\u8A00\u8A9E";
-
-    private static void confirmSize(int expectedSize, UnicodeString s) {
-        confirmSize(expectedSize, s, 0);
-    }
-    /**
-     * Note - a value of zero for <tt>amountUsedInCurrentRecord</tt> would only ever occur just
-     * after a {@link ContinueRecord} had been started.  In the initial {@link SSTRecord} this 
-     * value starts at 8 (for the first {@link UnicodeString} written).  In general, it can be
-     * any value between 0 and {@link #MAX_DATA_SIZE}
-     */
-    private static void confirmSize(int expectedSize, UnicodeString s, int amountUsedInCurrentRecord) {
-        ContinuableRecordOutput out = ContinuableRecordOutput.createForCountingOnly();
-        out.writeContinue();
-        for(int i=amountUsedInCurrentRecord; i>0; i--) {
-            out.writeByte(0);
-        }
-        int size0 = out.getTotalSize();
-        s.serialize(out);
-        int size1 = out.getTotalSize();
-        int actualSize = size1-size0;
-        assertEquals(expectedSize, actualSize);
-    }
-
-    @Test
-    public void smallStringSize() {
-        //Test a basic string
-        UnicodeString s = makeUnicodeString("Test");
-        confirmSize(7, s);
-
-        //Test a small string that is uncompressed
-        s = makeUnicodeString(STR_16_BIT);
-        s.setOptionFlags((byte)0x01);
-        confirmSize(11, s);
-
-        //Test a compressed small string that has rich text formatting
-        s.setString("Test");
-        s.setOptionFlags((byte)0x8);
-        UnicodeString.FormatRun r = new UnicodeString.FormatRun((short)0,(short)1);
-        s.addFormatRun(r);
-        UnicodeString.FormatRun r2 = new UnicodeString.FormatRun((short)2,(short)2);
-        s.addFormatRun(r2);
-        confirmSize(17, s);
-
-        //Test a uncompressed small string that has rich text formatting
-        s.setString(STR_16_BIT);
-        s.setOptionFlags((byte)0x9);
-        confirmSize(21, s);
-
-        //Test a compressed small string that has rich text and extended text
-        s.setString("Test");
-        s.setOptionFlags((byte)0xC);
-        confirmSize(17, s);
-        
-        // Extended phonetics data
-        // Minimum size is 14
-        // Also adds 4 bytes to hold the length
-        s.setExtendedRst(
-              new ExtRst()
-        );
-        confirmSize(35, s);
-
-        //Test a uncompressed small string that has rich text and extended text
-        s.setString(STR_16_BIT);
-        s.setOptionFlags((byte)0xD);
-        confirmSize(39, s);
-        
-        s.setExtendedRst(null);
-        confirmSize(21, s);
-    }
-
-    @Test
-    public void perfectStringSize() {
-      //Test a basic string
-      UnicodeString s = makeUnicodeString(MAX_DATA_SIZE-2-1);
-      confirmSize(MAX_DATA_SIZE, s);
-
-      //Test an uncompressed string
-      //Note that we can only ever get to a maximim size of 8227 since an uncompressed
-      //string is writing double bytes.
-      s = makeUnicodeString((MAX_DATA_SIZE-2-1)/2, true);
-      s.setOptionFlags((byte)0x1);
-      confirmSize(MAX_DATA_SIZE-1, s);
-    }
-
-    @Test
-    public void perfectRichStringSize() {
-      //Test a rich text string
-      UnicodeString s = makeUnicodeString(MAX_DATA_SIZE-2-1-8-2);
-      s.addFormatRun(new UnicodeString.FormatRun((short)1,(short)0));
-      s.addFormatRun(new UnicodeString.FormatRun((short)2,(short)1));
-      s.setOptionFlags((byte)0x8);
-      confirmSize(MAX_DATA_SIZE, s);
-
-      //Test an uncompressed rich text string
-      //Note that we can only ever get to a maximum size of 8227 since an uncompressed
-      //string is writing double bytes.
-      s = makeUnicodeString((MAX_DATA_SIZE-2-1-8-2)/2, true);
-      s.addFormatRun(new UnicodeString.FormatRun((short)1,(short)0));
-      s.addFormatRun(new UnicodeString.FormatRun((short)2,(short)1));
-      s.setOptionFlags((byte)0x9);
-      confirmSize(MAX_DATA_SIZE-1, s);
-    }
-
-    @Test
-    public void continuedStringSize() {
-      //Test a basic string
-      UnicodeString s = makeUnicodeString(MAX_DATA_SIZE-2-1+20);
-      confirmSize(MAX_DATA_SIZE+4+1+20, s);
-    }
-
-    /** Tests that a string size calculation that fits neatly in two records, the second being a continue*/
-    @Test
-    public void perfectContinuedStringSize() {
-      //Test a basic string
-      int strSize = MAX_DATA_SIZE*2;
-      //String overhead
-      strSize -= 3;
-      //Continue Record overhead
-      strSize -= 4;
-      //Continue Record additional byte overhead
-      strSize -= 1;
-      UnicodeString s = makeUnicodeString(strSize);
-      confirmSize(MAX_DATA_SIZE*2, s);
-    }
-    
-    @Test
-    public void formatRun() throws Exception {
-       FormatRun fr = new FormatRun((short)4, (short)0x15c);
-       assertEquals(4, fr.getCharacterPos());
-       assertEquals(0x15c, fr.getFontIndex());
-       
-       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-       LittleEndianOutputStream out = new LittleEndianOutputStream(baos);
-       
-       fr.serialize(out);
-       
-       byte[] b = baos.toByteArray();
-       assertEquals(4, b.length);
-       assertEquals(4, b[0]);
-       assertEquals(0, b[1]);
-       assertEquals(0x5c, b[2]);
-       assertEquals(0x01, b[3]);
-       
-       LittleEndianInputStream inp = new LittleEndianInputStream(
-             new ByteArrayInputStream(b)
-       );
-       fr = new FormatRun(inp);
-       assertEquals(4, fr.getCharacterPos());
-       assertEquals(0x15c, fr.getFontIndex());
-    }
-    
-    @Test
-    public void extRstFromEmpty() throws Exception {
-       ExtRst ext = new ExtRst();
-       
-       assertEquals(0, ext.getNumberOfRuns());
-       assertEquals(0, ext.getFormattingFontIndex());
-       assertEquals(0, ext.getFormattingOptions());
-       assertEquals("", ext.getPhoneticText());
-       assertEquals(0, ext.getPhRuns().length);
-       assertEquals(10, ext.getDataSize()); // Excludes 4 byte header
-       
-       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-       LittleEndianOutputStream out = new LittleEndianOutputStream(baos);
-       ContinuableRecordOutput cout = new ContinuableRecordOutput(out, 0xffff);
-       
-       ext.serialize(cout);
-       cout.writeContinue();
-       
-       byte[] b = baos.toByteArray();
-       assertEquals(20, b.length);
-       
-       // First 4 bytes from the outputstream
-       assertEquals(-1, b[0]);
-       assertEquals(-1, b[1]);
-       assertEquals(14, b[2]);
-       assertEquals(00, b[3]);
-       
-       // Reserved
-       assertEquals(1, b[4]);
-       assertEquals(0, b[5]);
-       // Data size
-       assertEquals(10, b[6]);
-       assertEquals(00, b[7]);
-       // Font*2
-       assertEquals(0, b[8]);
-       assertEquals(0, b[9]);
-       assertEquals(0, b[10]);
-       assertEquals(0, b[11]);
-       // 0 Runs
-       assertEquals(0, b[12]);
-       assertEquals(0, b[13]);
-       // Size=0, *2
-       assertEquals(0, b[14]);
-       assertEquals(0, b[15]);
-       assertEquals(0, b[16]);
-       assertEquals(0, b[17]);
-       
-       // Last 2 bytes from the outputstream
-       assertEquals(ContinueRecord.sid, b[18]);
-       assertEquals(0, b[19]);
-       
-       
-       // Load in again and re-test
-       byte[] data = new byte[14];
-       System.arraycopy(b, 4, data, 0, data.length);
-       LittleEndianInputStream inp = new LittleEndianInputStream(
-             new ByteArrayInputStream(data)
-       );
-       ext = new ExtRst(inp, data.length);
-       
-       assertEquals(0, ext.getNumberOfRuns());
-       assertEquals(0, ext.getFormattingFontIndex());
-       assertEquals(0, ext.getFormattingOptions());
-       assertEquals("", ext.getPhoneticText());
-       assertEquals(0, ext.getPhRuns().length);
-    }
-    
-    @Test
-    public void extRstFromData() throws Exception {
-       byte[] data = new byte[] {
-             01, 00, 0x0C, 00, 
-             00, 00, 0x37, 00, 
-             00, 00, 
-             00, 00, 00, 00, 
-             00, 00 // Cruft at the end, as found from real files
-       };
-       assertEquals(16, data.length);
-       
-       LittleEndianInputStream inp = new LittleEndianInputStream(
-             new ByteArrayInputStream(data)
-       );
-       ExtRst ext = new ExtRst(inp, data.length);
-       assertEquals(0x0c, ext.getDataSize()); // Excludes 4 byte header
-       
-       assertEquals(0, ext.getNumberOfRuns());
-       assertEquals(0x37, ext.getFormattingOptions());
-       assertEquals(0, ext.getFormattingFontIndex());
-       assertEquals("", ext.getPhoneticText());
-       assertEquals(0, ext.getPhRuns().length);
-    }
-    
-    @Test
-    public void corruptExtRstDetection() throws Exception {
-       byte[] data = new byte[] {
-             0x79, 0x79, 0x11, 0x11, 
-             0x22, 0x22, 0x33, 0x33, 
-       };
-       assertEquals(8, data.length);
-       
-       LittleEndianInputStream inp = new LittleEndianInputStream(
-             new ByteArrayInputStream(data)
-       );
-       ExtRst ext = new ExtRst(inp, data.length);
-       
-       // Will be empty
-       assertEquals(ext, new ExtRst());
-
-       // If written, will be the usual size
-       assertEquals(10, ext.getDataSize()); // Excludes 4 byte header
-     
-       // Is empty
-       assertEquals(0, ext.getNumberOfRuns());
-       assertEquals(0, ext.getFormattingOptions());
-       assertEquals(0, ext.getFormattingFontIndex());
-       assertEquals("", ext.getPhoneticText());
-       assertEquals(0, ext.getPhRuns().length);
-    }
-
-    @Test
-    public void extRstEqualsAndHashCode() {
-        byte buf[] = new byte[200];
-        LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(buf, 0);
-        String str = "\u1d02\u1d12\u1d22";
-        bos.writeShort(1);
-        bos.writeShort(5*LittleEndianConsts.SHORT_SIZE+str.length()*2+3*LittleEndianConsts.SHORT_SIZE+2); // data size
-        bos.writeShort(0x4711);
-        bos.writeShort(0x0815);
-        bos.writeShort(1);
-        bos.writeShort(str.length());
-        bos.writeShort(str.length());
-        StringUtil.putUnicodeLE(str, bos);
-        bos.writeShort(1);
-        bos.writeShort(1);
-        bos.writeShort(3);
-        bos.writeShort(42);
-        
-        LittleEndianInput in = new LittleEndianByteArrayInputStream(buf, 0, bos.getWriteIndex());
-        UnicodeString.ExtRst extRst1 = new UnicodeString.ExtRst(in, bos.getWriteIndex());
-        in = new LittleEndianByteArrayInputStream(buf, 0, bos.getWriteIndex());
-        UnicodeString.ExtRst extRst2 = new UnicodeString.ExtRst(in, bos.getWriteIndex());
-        
-        assertEquals(extRst1, extRst2);
-        assertEquals(extRst1.hashCode(), extRst2.hashCode());
-    }
-
-    private static UnicodeString makeUnicodeString(String s) {
-      UnicodeString st = new UnicodeString(s);
-      st.setOptionFlags((byte)0);
-      return st;
-    }
-
-    private static UnicodeString makeUnicodeString(int numChars) {
-        return makeUnicodeString(numChars, false);
-    }
-    /**
-     * @param is16Bit if <code>true</code> the created string will have characters > 0x00FF
-     * @return a string of the specified number of characters
-     */
-    private static UnicodeString makeUnicodeString(int numChars, boolean is16Bit) {
-      StringBuffer b = new StringBuffer(numChars);
-      int charBase = is16Bit ? 0x8A00 : 'A';
-      for (int i=0;i<numChars;i++) {
-        char ch = (char) ((i%16)+charBase);
-        b.append(ch);
-      }
-      return makeUnicodeString(b.toString());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java b/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
deleted file mode 100644
index 1787317..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivot;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Collects all tests for <tt>org.apache.poi.hssf.record.pivot</tt>.
- * 
- * @author Josh Micich
- */
-public final class AllPivotRecordTests {
-	
-	public static Test suite() {
-		TestSuite result = new TestSuite(AllPivotRecordTests.class.getName());
-		
-		result.addTestSuite(TestExtendedPivotTableViewFieldsRecord.class);
-		result.addTestSuite(TestPageItemRecord.class);
-		result.addTestSuite(TestViewFieldsRecord.class);
-		return result;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
deleted file mode 100644
index 945528d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivot;
-
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.hssf.record.pivottable.ExtendedPivotTableViewFieldsRecord;
-import org.apache.poi.util.HexRead;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link ExtendedPivotTableViewFieldsRecord}
- * 
- * @author Josh Micich
- */
-public final class TestExtendedPivotTableViewFieldsRecord extends TestCase {
-	
-	public void testSubNameNotPresent_bug46693() {
-		// This data came from attachment 23347 of bug 46693 at offset 0xAA43
-		byte[] data = HexRead.readFromString(
-				"00 01 14 00" + // BIFF header
-				"1E 14 00 0A FF FF FF FF 00 00 FF FF 00 00 00 00 00 00 00 00");
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		ExtendedPivotTableViewFieldsRecord rec;
-		try {
-			rec = new ExtendedPivotTableViewFieldsRecord(in);
-		} catch (RecordFormatException e) {
-			if (e.getMessage().equals("Expected to find a ContinueRecord in order to read remaining 65535 of 65535 chars")) {
-				throw new AssertionFailedError("Identified bug 46693a");
-			}
-			throw e;
-		}
-		
-		assertEquals(data.length, rec.getRecordSize());
-	}
-	
-	public void testOlderFormat_bug46918() {
-		// There are 10 SXVDEX records in the file (not uploaded) that originated bugzilla 46918
-		// They all had the following hex encoding:
-		byte data[] = HexRead.readFromString("00 01 0A 00 1E 14 00 0A FF FF FF FF 00 00");  
-
-		RecordInputStream in = TestcaseRecordInputStream.create(data);
-		ExtendedPivotTableViewFieldsRecord rec;
-		try {
-			rec = new ExtendedPivotTableViewFieldsRecord(in);
-		} catch (RecordFormatException e) {
-			if (e.getMessage().equals("Not enough data (0) to read requested (2) bytes")) {
-				throw new AssertionFailedError("Identified bug 46918");
-			}
-			throw e;
-		}
-
-		byte expReserData[] = HexRead.readFromString("1E 14 00 0A FF FF FF FF 00 00" +
-				"FF FF 00 00 00 00 00 00 00 00");  
-		
-		TestcaseRecordInputStream.confirmRecordEncoding(ExtendedPivotTableViewFieldsRecord.sid, expReserData, rec.serialize());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
deleted file mode 100644
index 7cf3b49..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivot;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.hssf.record.pivottable.PageItemRecord;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests for {@link PageItemRecord}
- * 
- * @author Josh Micich
- */
-public final class TestPageItemRecord extends TestCase {
-	
-	public void testMoreThanOneInfoItem_bug46917() {
-		byte[] data = HexRead.readFromString("01 02 03 04 05 06 07 08 09 0A 0B 0C");
-		RecordInputStream in = TestcaseRecordInputStream.create(PageItemRecord.sid, data);
-		PageItemRecord rec = new PageItemRecord(in);
-		if (in.remaining() == 6) {
-			throw new AssertionFailedError("Identified bug 46917");
-		}
-		assertEquals(0, in.remaining());
-		
-		assertEquals(4+data.length, rec.getRecordSize());
-	}
-	
-	public void testSerialize() {
-		confirmSerialize("01 02 03 04 05 06");
-		confirmSerialize("01 02 03 04 05 06 07 08 09 0A 0B 0C");
-		confirmSerialize("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12");
-	}
-
-	private static PageItemRecord confirmSerialize(String hexDump) {
-		byte[] data = HexRead.readFromString(hexDump);
-		RecordInputStream in = TestcaseRecordInputStream.create(PageItemRecord.sid, data);
-		PageItemRecord rec = new PageItemRecord(in);
-		assertEquals(0, in.remaining());
-		assertEquals(4+data.length, rec.getRecordSize());
-		byte[] data2 = rec.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(PageItemRecord.sid, data, data2);
-		return rec;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java b/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
deleted file mode 100644
index 448a2ac..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivot;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.hssf.record.pivottable.ViewFieldsRecord;
-import org.apache.poi.util.HexRead;
-
-/**
- * Tests for {@link ViewFieldsRecord}
- * 
- * @author Josh Micich
- */
-public final class TestViewFieldsRecord extends TestCase {
-	
-	public void testUnicodeFlag_bug46693() {
-		byte[] data = HexRead.readFromString("01 00 01 00 01 00 04 00 05 00 00 6D 61 72 63 6F");
-		RecordInputStream in = TestcaseRecordInputStream.create(ViewFieldsRecord.sid, data);
-		ViewFieldsRecord rec = new ViewFieldsRecord(in);
-		if (in.remaining() == 1) {
-			throw new AssertionFailedError("Identified bug 46693b");
-		}
-		assertEquals(0, in.remaining());
-		assertEquals(4+data.length, rec.getRecordSize());
-	}
-	
-	public void testSerialize() {
-		// This hex data was produced by changing the 'Custom Name' property, 
-		// available under 'Field Settings' from the 'PivotTable Field List' (Excel 2007)
-		confirmSerialize("00 00 01 00 01 00 00 00 FF FF");
-		confirmSerialize("01 00 01 00 01 00 04 00 05 00 00 6D 61 72 63 6F");
-		confirmSerialize("01 00 01 00 01 00 04 00 0A 00 01 48 00 69 00 73 00 74 00 6F 00 72 00 79 00 2D 00 82 69 81 89");
-	}
-
-	private static ViewFieldsRecord confirmSerialize(String hexDump) {
-		byte[] data = HexRead.readFromString(hexDump);
-		RecordInputStream in = TestcaseRecordInputStream.create(ViewFieldsRecord.sid, data);
-		ViewFieldsRecord rec = new ViewFieldsRecord(in);
-		assertEquals(0, in.remaining());
-		assertEquals(4+data.length, rec.getRecordSize());
-		byte[] data2 = rec.serialize();
-		TestcaseRecordInputStream.confirmRecordEncoding(ViewFieldsRecord.sid, data, data2);
-		return rec;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
deleted file mode 100644
index bcbddf0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for the <tt>org.apache.poi.hssf.usermodel</tt> package.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestBug42464.class,
-    TestBugs.class,
-    TestCellStyle.class,
-    TestCloneSheet.class,
-    TestDataValidation.class,
-    TestEscherGraphics.class,
-    TestEscherGraphics2d.class,
-    TestFontDetails.class,
-    TestFormulaEvaluatorBugs.class,
-    TestFormulaEvaluatorDocs.class,
-    TestFormulas.class,
-    TestHSSFCell.class,
-    TestHSSFClientAnchor.class,
-    //TestHSSFComment.class, //converted to junit4
-    TestHSSFConditionalFormatting.class,
-    TestHSSFDataFormat.class,
-    TestHSSFDataFormatter.class,
-    TestHSSFDateUtil.class,
-    TestHSSFFont.class,
-    TestHSSFFormulaEvaluator.class,
-    TestHSSFHeaderFooter.class,
-    TestHSSFHyperlink.class,
-    TestHSSFName.class,
-    TestHSSFOptimiser.class,
-    TestHSSFPalette.class,
-    TestHSSFPatriarch.class,
-    TestHSSFPicture.class,
-    TestHSSFPictureData.class,
-    TestHSSFRichTextString.class,
-    TestHSSFRow.class,
-    TestHSSFSheet.class,
-    TestHSSFSheetShiftRows.class,
-    TestHSSFSheetUpdateArrayFormulas.class,
-    TestHSSFTextbox.class,
-    TestHSSFWorkbook.class,
-    TestOLE2Embeding.class,
-    TestPOIFSProperties.class,
-    TestReadWriteChart.class,
-    TestRowStyle.class,
-    TestSanityChecker.class,
-    TestSheetHiding.class,
-    /* deliberately avoiding this one
-    TestUnfixedBugs.class,*/
-    TestUnicodeWorkbook.class,
-    TestNonStandardWorkbookStreamNames.class,
-    TestWorkbook.class
-})
-public class AllUserModelTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java
deleted file mode 100644
index c44b3c0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.ss.formula.ptg.Ptg;
-
-/**
- * Test utility class to get <tt>Ptg</tt> arrays out of formula cells
- * 
- * @author Josh Micich
- */
-public final class FormulaExtractor {
-
-	private FormulaExtractor() {
-		// no instances of this class
-	}
-	
-	public static Ptg[] getPtgs(HSSFCell cell) {
-		CellValueRecordInterface vr = cell.getCellValueRecord();
-		if (!(vr instanceof FormulaRecordAggregate)) {
-			throw new IllegalArgumentException("Not a formula cell");
-		}
-		FormulaRecordAggregate fra = (FormulaRecordAggregate) vr;
-		return fra.getFormulaRecord().getParsedExpression();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
deleted file mode 100644
index 96196c1..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ss.formula.EvaluationCell;
-
-/**
- * Raises visibility of some internal functionality for test purposes 
- * 
- * @author Josh Micich
- */
-public final class HSSFEvaluationTestHelper {
-
-	public static EvaluationCell wrapCell(HSSFCell cell) {
-		return new HSSFEvaluationCell(cell);
-	}
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
deleted file mode 100644
index 1016f6d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.model.DrawingManager2;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.TextObjectRecord;
-
-/**
- * Helper class for HSSF tests that aren't within the
- *  HSSF UserModel package, but need to do internal
- *  UserModel things.
- */
-public class HSSFTestHelper {
-
-    public static class MockDrawingManager extends DrawingManager2 {
-
-        public MockDrawingManager (){
-            super(null);
-        }
-
-        @Override
-        public int allocateShapeId(short drawingGroupId) {
-            return 1025; //Mock value
-        }
-
-        @Override
-        public int allocateShapeId(short drawingGroupId, EscherDgRecord dg) {
-            return 1025;
-        }
-
-        @Override
-        public EscherDgRecord createDgRecord()
-        {
-            EscherDgRecord dg = new EscherDgRecord();
-            dg.setRecordId( EscherDgRecord.RECORD_ID );
-            dg.setOptions( (short) (16) );
-            dg.setNumShapes( 1 );
-            dg.setLastMSOSPID( 1024 );
-            return dg;
-        }
-    }
-	/**
-	 * Lets non UserModel tests at the low level Workbook
-	 */
-	public static InternalWorkbook getWorkbookForTest(HSSFWorkbook wb) {
-		return wb.getWorkbook();
-	}
-	public static InternalSheet getSheetForTest(HSSFSheet sheet) {
-		return sheet.getSheet();
-	}
-
-    public static HSSFPatriarch createTestPatriarch(HSSFSheet sheet, EscherAggregate agg){
-        return new HSSFPatriarch(sheet, agg);
-    }
-
-    public static EscherAggregate getEscherAggregate(HSSFPatriarch patriarch){
-        return patriarch.getBoundAggregate();
-    }
-
-    public static int allocateNewShapeId(HSSFPatriarch patriarch){
-        return patriarch.newShapeId();
-    }
-
-    public static EscherOptRecord getOptRecord(HSSFShape shape){
-        return shape.getOptRecord();
-    }
-
-    public static void setShapeId(HSSFShape shape, int id){
-        shape.setShapeId(id);
-    }
-
-    public static EscherContainerRecord getEscherContainer(HSSFShape shape){
-        return shape.getEscherContainer();
-    }
-
-    public static TextObjectRecord getTextObjRecord(HSSFSimpleShape shape){
-        return shape.getTextObjectRecord();
-    }
-
-    public static ObjRecord getObjRecord(HSSFShape shape){
-        return shape.getObjRecord();
-    }
-
-    public static EscherRecord getEscherAnchor(HSSFAnchor anchor){
-        return anchor.getEscherAnchor();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java
deleted file mode 100644
index 1784d95..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-
-/**
- * Test utility class to get {@link Record}s out of HSSF objects
- * 
- * @author Josh Micich
- */
-public final class RecordInspector {
-
-	private RecordInspector() {
-		// no instances of this class
-	}
-
-	public static final class RecordCollector implements RecordVisitor {
-
-		private final List<Record> _list;
-
-		public RecordCollector() {
-			_list = new ArrayList<Record>(128);
-		}
-
-		@Override
-        public void visitRecord(Record r) {
-			_list.add(r);
-		}
-
-		public Record[] getRecords() {
-			Record[] result = new Record[_list.size()];
-			_list.toArray(result);
-			return result;
-		}
-	}
-
-	/**
-	 * @param streamOffset start position for serialization. This affects values in some
-	 *         records such as INDEX, but most callers will be OK to pass zero.
-	 * @return the {@link Record}s (in order) which will be output when the
-	 *         specified sheet is serialized
-	 */
-	public static Record[] getRecords(HSSFSheet hSheet, int streamOffset) {
-		RecordCollector rc = new RecordCollector();
-		hSheet.getSheet().visitContainedRecords(rc, streamOffset);
-		return rc.getRecords();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
deleted file mode 100644
index 5f90b72..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
+++ /dev/null
@@ -1,375 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BackupRecord;
-import org.apache.poi.hssf.record.BookBoolRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.CalcModeRecord;
-import org.apache.poi.hssf.record.CodepageRecord;
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.DSFRecord;
-import org.apache.poi.hssf.record.DateWindow1904Record;
-import org.apache.poi.hssf.record.DefaultColWidthRecord;
-import org.apache.poi.hssf.record.DefaultRowHeightRecord;
-import org.apache.poi.hssf.record.DeltaRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.ExtSSTRecord;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.FnGroupCountRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.GutsRecord;
-import org.apache.poi.hssf.record.HideObjRecord;
-import org.apache.poi.hssf.record.InterfaceEndRecord;
-import org.apache.poi.hssf.record.InterfaceHdrRecord;
-import org.apache.poi.hssf.record.IterationRecord;
-import org.apache.poi.hssf.record.MMSRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.PasswordRev4Record;
-import org.apache.poi.hssf.record.PrecisionRecord;
-import org.apache.poi.hssf.record.PrintGridlinesRecord;
-import org.apache.poi.hssf.record.PrintHeadersRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RefModeRecord;
-import org.apache.poi.hssf.record.RefreshAllRecord;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.SaveRecalcRecord;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.hssf.record.StyleRecord;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.hssf.record.TabIdRecord;
-import org.apache.poi.hssf.record.UseSelFSRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowOneRecord;
-import org.apache.poi.hssf.record.WindowProtectRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.WriteAccessRecord;
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-
-/**
- * Designed to check wither the records written actually make sense.
- */
-public class SanityChecker {
-    static class CheckRecord
-    {
-        Class<? extends RecordBase> record;
-        char occurance;  // 1 = one time, M = 1..many times, * = 0..many, 0 = optional
-        private final boolean together;
-
-        public CheckRecord( Class<? extends RecordBase> record, char occurance )
-        {
-            this(record, occurance, true);
-        }
-
-        /**
-         * @param record        The record type to check
-         * @param occurance     The occurance 1 = occurs once, M = occurs many times
-         * @param together
-         */
-        public CheckRecord(Class<? extends RecordBase> record, char occurance, boolean together)
-        {
-            this.record = record;
-            this.occurance = occurance;
-            this.together = together;
-        }
-
-        public Class<? extends RecordBase> getRecord()
-        {
-            return record;
-        }
-
-        public char getOccurance()
-        {
-            return occurance;
-        }
-
-        public boolean isRequired()
-        {
-            return occurance == '1' || occurance == 'M';
-        }
-
-        public boolean isOptional()
-        {
-            return occurance == '0' || occurance == '*';
-        }
-
-        public boolean isTogether()
-        {
-            return together;
-        }
-
-        public boolean isMany()
-        {
-            return occurance == '*' || occurance == 'M';
-        }
-
-        public int match( List<? extends RecordBase> records, int recordIdx )
-        {
-            int firstRecord = findFirstRecord(records, getRecord(), recordIdx);
-            if (isRequired())
-            {
-                return matchRequired( firstRecord, records, recordIdx );
-            }
-            return matchOptional( firstRecord, records, recordIdx );
-        }
-
-        private int matchOptional( int firstRecord, List<? extends RecordBase> records, int recordIdx )
-        {
-            if (firstRecord == -1)
-            {
-                return recordIdx;
-            }
-
-            return matchOneOrMany( records, firstRecord );
-        }
-
-        private int matchRequired( int firstRecord, List<? extends RecordBase> records, int recordIdx )
-        {
-            if (firstRecord == -1)
-            {
-                fail("Manditory record missing or out of order: " + record);
-            }
-
-            return matchOneOrMany( records, firstRecord );
-        }
-
-        private int matchOneOrMany( List<? extends RecordBase> records, int recordIdx )
-        {
-            if (isZeroOrOne())
-            {
-                // check no other records
-                if (findFirstRecord(records, getRecord(), recordIdx+1) != -1)
-                    fail("More than one record matched for " + getRecord().getName());
-            }
-            else if (isZeroToMany())
-            {
-                if (together)
-                {
-                    int nextIdx = findFirstRecord(records, record, recordIdx+1);
-                    while (nextIdx != -1)
-                    {
-                        if (nextIdx - 1 != recordIdx)
-                            fail("Records are not together " + record.getName());
-                        recordIdx = nextIdx;
-                        nextIdx = findFirstRecord(records, record, recordIdx+1);
-                    }
-                }
-            }
-            return recordIdx+1;
-        }
-
-        private boolean isZeroToMany()
-        {
-            return occurance == '*' || occurance == 'M';
-        }
-
-        private boolean isZeroOrOne()
-        {
-            return occurance == '0' || occurance == '1';
-        }
-    }
-
-    CheckRecord[] workbookRecords = new CheckRecord[] {
-        new CheckRecord(BOFRecord.class, '1'),
-        new CheckRecord(InterfaceHdrRecord.class, '1'),
-        new CheckRecord(MMSRecord.class, '1'),
-        new CheckRecord(InterfaceEndRecord.class, '1'),
-        new CheckRecord(WriteAccessRecord.class, '1'),
-        new CheckRecord(CodepageRecord.class, '1'),
-        new CheckRecord(DSFRecord.class, '1'),
-        new CheckRecord(TabIdRecord.class, '1'),
-        new CheckRecord(FnGroupCountRecord.class, '1'),
-        new CheckRecord(WindowProtectRecord.class, '1'),
-        new CheckRecord(ProtectRecord.class, '1'),
-        new CheckRecord(PasswordRev4Record.class, '1'),
-        new CheckRecord(WindowOneRecord.class, '1'),
-        new CheckRecord(BackupRecord.class, '1'),
-        new CheckRecord(HideObjRecord.class, '1'),
-        new CheckRecord(DateWindow1904Record.class, '1'),
-        new CheckRecord(PrecisionRecord.class, '1'),
-        new CheckRecord(RefreshAllRecord.class, '1'),
-        new CheckRecord(BookBoolRecord.class, '1'),
-        new CheckRecord(FontRecord.class, 'M'),
-        new CheckRecord(FormatRecord.class, 'M'),
-        new CheckRecord(ExtendedFormatRecord.class, 'M'),
-        new CheckRecord(StyleRecord.class, 'M'),
-        new CheckRecord(UseSelFSRecord.class, '1'),
-        new CheckRecord(BoundSheetRecord.class, 'M'),
-        new CheckRecord(CountryRecord.class, '1'),
-        new CheckRecord(SupBookRecord.class, '0'),
-        new CheckRecord(ExternSheetRecord.class, '0'),
-        new CheckRecord(NameRecord.class, '*'),
-        new CheckRecord(SSTRecord.class, '1'),
-        new CheckRecord(ExtSSTRecord.class, '1'),
-        new CheckRecord(EOFRecord.class, '1'),
-    };
-
-    CheckRecord[] sheetRecords = new CheckRecord[] {
-        new CheckRecord(BOFRecord.class, '1'),
-        new CheckRecord(CalcModeRecord.class, '1'),
-        new CheckRecord(RefModeRecord.class, '1'),
-        new CheckRecord(IterationRecord.class, '1'),
-        new CheckRecord(DeltaRecord.class, '1'),
-        new CheckRecord(SaveRecalcRecord.class, '1'),
-        new CheckRecord(PrintHeadersRecord.class, '1'),
-        new CheckRecord(PrintGridlinesRecord.class, '1'),
-        new CheckRecord(GridsetRecord.class, '1'),
-        new CheckRecord(GutsRecord.class, '1'),
-        new CheckRecord(DefaultRowHeightRecord.class, '1'),
-        new CheckRecord(WSBoolRecord.class, '1'),
-        new CheckRecord(PageSettingsBlock.class, '1'),
-        new CheckRecord(DefaultColWidthRecord.class, '1'),
-        new CheckRecord(DimensionsRecord.class, '1'),
-        new CheckRecord(WindowTwoRecord.class, '1'),
-        new CheckRecord(SelectionRecord.class, '1'),
-        new CheckRecord(EOFRecord.class, '1')
-    };
-
-    private void checkWorkbookRecords(InternalWorkbook workbook)
-    {
-        List<Record> records = workbook.getRecords();
-        assertTrue(records.get(0) instanceof BOFRecord);
-        assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
-
-        checkRecordOrder(records, workbookRecords);
-//        checkRecordsTogether(records, workbookRecords);
-    }
-
-    private void checkSheetRecords(InternalSheet sheet) {
-        List<RecordBase> records = sheet.getRecords();
-        assertTrue(records.get(0) instanceof BOFRecord);
-        assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
-
-        checkRecordOrder(records, sheetRecords);
-//        checkRecordsTogether(records, sheetRecords);
-    }
-
-    public void checkHSSFWorkbook(HSSFWorkbook wb)
-    {
-        checkWorkbookRecords(wb.getWorkbook());
-        for (int i = 0; i < wb.getNumberOfSheets(); i++)
-            checkSheetRecords(wb.getSheetAt(i).getSheet());
-
-    }
-
-    /*
-    private void checkRecordsTogether(List records, CheckRecord[] check)
-    {
-        for ( int checkIdx = 0; checkIdx < check.length; checkIdx++ )
-        {
-            int recordIdx = findFirstRecord(records, check[checkIdx].getRecord());
-            boolean notFoundAndRecordRequired = (recordIdx == -1 && check[checkIdx].isRequired());
-            if (notFoundAndRecordRequired)
-            {
-                fail("Expected to find record of class " + check.getClass() + " but did not");
-            }
-            else if (recordIdx >= 0)
-            {
-                if (check[checkIdx].isMany())
-                {
-                    // Skip records that are together
-                    while (recordIdx < records.size() && check[checkIdx].getRecord().isInstance(records.get(recordIdx)))
-                        recordIdx++;
-                }
-
-                // Make sure record does not occur in remaining records (after the next)
-                recordIdx++;
-                for (int recordIdx2 = recordIdx; recordIdx2 < records.size(); recordIdx2++)
-                {
-                    if (check[checkIdx].getRecord().isInstance(records.get(recordIdx2)))
-                        fail("Record occurs scattered throughout record chain:\n" + records.get(recordIdx2));
-                }
-            }
-        }
-    } */
-
-    /* package */ static int findFirstRecord( List<? extends RecordBase> records, Class<? extends RecordBase> record, int startIndex )
-    {
-        for (int i = startIndex; i < records.size(); i++)
-        {
-            if (record.getName().equals(records.get(i).getClass().getName()))
-                return i;
-        }
-        return -1;
-    }
-
-    void checkRecordOrder(List<? extends RecordBase> records, CheckRecord[] check)
-    {
-        int recordIdx = 0;
-        for (CheckRecord element : check) {
-            recordIdx = element.match(records, recordIdx);
-        }
-    }
-
-    /*
-    void checkRecordOrder(List records, CheckRecord[] check)
-    {
-        int checkIndex = 0;
-        for (int recordIndex = 0; recordIndex < records.size(); recordIndex++)
-        {
-            Record record = (Record) records.get(recordIndex);
-            if (check[checkIndex].getRecord().isInstance(record))
-            {
-                if (check[checkIndex].getOccurance() == 'M')
-                {
-                    // skip over duplicate records if multiples are allowed
-                    while (recordIndex+1 < records.size() && check[checkIndex].getRecord().isInstance(records.get(recordIndex+1)))
-                        recordIndex++;
-//                    lastGoodMatch = recordIndex;
-                }
-                else if (check[checkIndex].getOccurance() == '1')
-                {
-                    // Check next record to make sure there's not more than one
-                    if (recordIndex != records.size() - 1)
-                    {
-                        if (check[checkIndex].getRecord().isInstance(records.get(recordIndex+1)))
-                        {
-                            fail("More than one occurance of record found:\n" + records.get(recordIndex).toString());
-                        }
-                    }
-//                    lastGoodMatch = recordIndex;
-                }
-//                else if (check[checkIndex].getOccurance() == '0')
-//                {
-//
-//                }
-                checkIndex++;
-            }
-            if (checkIndex >= check.length)
-                return;
-        }
-        fail("Could not find required record: " + check[checkIndex]);
-    } */
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java
deleted file mode 100644
index 06aa0b8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Utility class to help test code verify that generated files do not differ from proof copies in
- * any significant detail.  Normally this task would be simple except for the presence of artifacts
- * in the file that change every time it is generated.  Usually these volatile artifacts are
- * time-stamps, user names, or other machine dependent parameters.
- *
- * @author Josh Micich
- */
-public final class StreamUtility {
-
-	/**
-	 * Compares two streams with expected differences in specified regions.  The streams are
-	 * expected to be of equal length and comparison is always byte for byte.  That is -
-	 * differences can only involve exchanging each individual byte for another single byte.<br>
-	 * Both input streams are closed.
-	 *
-	 * @param allowableDifferenceRegions array of integer pairs: (offset, length).
-	 * Any differences encountered in these regions of the streams will be ignored
-	 * @return <code>null</code> if streams are identical, else the
-	 * byte indexes of differing data.  If streams were different lengths,
-	 * the returned indexes will be -1 and the length of the shorter stream
-	 */
-	public static int[] diffStreams(InputStream isA, InputStream isB, int[] allowableDifferenceRegions) {
-
-		if((allowableDifferenceRegions.length % 2) != 0) {
-			throw new RuntimeException("allowableDifferenceRegions length is odd");
-		}
-		boolean success = false;
-		int[] result;
-		try {
-			result = diffInternal(isA, isB, allowableDifferenceRegions);
-			success = true;
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} finally {
-			close(isA, success);
-			close(isB, success);
-		}
-		return result;
-	}
-
-	/**
-	 * @param success <code>false</code> if the outer method is throwing an exception.
-	 */
-	private static void close(InputStream is, boolean success) {
-		try {
-			is.close();
-		} catch (IOException e) {
-			if(success) {
-				// this is a new error. ok to throw
-				throw new RuntimeException(e);
-			}
-			// else don't subvert original exception. just print stack trace for this one
-			e.printStackTrace();
-		}
-	}
-
-	private static int[] diffInternal(InputStream isA, InputStream isB, int[] allowableDifferenceRegions)
-			throws IOException {
-		int offset = 0;
-		List<Integer> temp = new ArrayList<Integer>();
-		while (true) {
-			int b = isA.read();
-			int b2 = isB.read();
-			if (b == -1) {
-				// EOF
-				if (b2 == -1) {
-					return toPrimitiveIntArray(temp);
-				}
-				return new int[] { -1, offset, };
-			}
-			if (b2 == -1) {
-				return new int[] { -1, offset, };
-			}
-			if (b != b2 && !isIgnoredRegion(allowableDifferenceRegions, offset)) {
-				temp.add(Integer.valueOf(offset));
-			}
-			offset++;
-		}
-	}
-
-	private static boolean isIgnoredRegion(int[] allowableDifferenceRegions, int offset) {
-		for (int i = 0; i < allowableDifferenceRegions.length; i+=2) {
-			int start = allowableDifferenceRegions[i];
-			int end = start + allowableDifferenceRegions[i+1];
-			if(start <= offset && offset < end) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static int[] toPrimitiveIntArray(List<Integer> temp) {
-		int nItems = temp.size();
-		if(nItems < 1) {
-			return null;
-		}
-		Integer[] boxInts = new Integer[nItems];
-		temp.toArray(boxInts);
-
-		int[] result = new int[nItems];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = boxInts[i].intValue();
-		}
-		return result;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
deleted file mode 100644
index cbfc6d9..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Iterator;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.Row;
-import org.junit.Test;
-
-/**
- *
- */
-public final class TestBug42464 {
-
-    @Test
-	public void testOKFile() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("42464-ExpPtg-ok.xls");
-		process(wb);
-		wb.close();
-	}
-    
-    @Test
-	public void testExpSharedBadFile() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("42464-ExpPtg-bad.xls");
-		process(wb);
-		wb.close();
-	}
-
-	private static void process(HSSFWorkbook wb) {
-		HSSFFormulaEvaluator eval =	new HSSFFormulaEvaluator(wb);
-		for(int i=0; i<wb.getNumberOfSheets(); i++) {
-			HSSFSheet s = wb.getSheetAt(i);
-
-			Iterator<Row> it = s.rowIterator();
-			while(it.hasNext()) {
-				HSSFRow r = (HSSFRow)it.next();
-				process(r, eval);
-			}
-		}
-	}
-
-	private static void process(HSSFRow row, HSSFFormulaEvaluator eval) {
-		Iterator<Cell> it = row.cellIterator();
-		while(it.hasNext()) {
-			HSSFCell cell = (HSSFCell)it.next();
-			if(cell.getCellTypeEnum() != CellType.FORMULA) {
-			    continue;
-			}
-			FormulaRecordAggregate record = (FormulaRecordAggregate) cell.getCellValueRecord();
-			FormulaRecord r = record.getFormulaRecord();
-			Ptg[] ptgs = r.getParsedExpression();
-
-			String cellRef = new CellReference(row.getRowNum(), cell.getColumnIndex(), false, false).formatAsString();
-//			if(false && cellRef.equals("BP24")) { // TODO - replace System.out.println()s with asserts
-//				System.out.print(cellRef);
-//				System.out.println(" - has " + ptgs.length + " ptgs:");
-//				for(int i=0; i<ptgs.length; i++) {
-//					String c = ptgs[i].getClass().toString();
-//					System.out.println("\t" + c.substring(c.lastIndexOf('.')+1) );
-//				}
-//				System.out.println("-> " + cell.getCellFormula());
-//			}
-
-			CellValue evalResult = eval.evaluate(cell);
-			assertNotNull(evalResult);
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
deleted file mode 100644
index 1308b2c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ /dev/null
@@ -1,3074 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.CellValueRecordInterface;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.EmbeddedObjectRefSubRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.TabIdRecord;
-import org.apache.poi.hssf.record.UnknownRecord;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate;
-import org.apache.poi.hssf.record.common.UnicodeString;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.DeletedArea3DPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.BaseTestBugzillaIssues;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-import org.apache.poi.ss.usermodel.ComparisonOperator;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Testcases for bugs entered in bugzilla
- * the Test name contains the bugzilla bug id
- *
- * <b>YK: If a bug can be tested in terms of common ss interfaces,
- *  define the test in the base class {@link BaseTestBugzillaIssues}</b>
- */
-@SuppressWarnings("deprecation")
-public final class TestBugs extends BaseTestBugzillaIssues {
-    // to not affect other tests running in the same JVM
-    @After
-    public void resetPassword() {
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-    }
-
-    public TestBugs() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    private static HSSFWorkbook openSample(String sampleFileName) {
-        return HSSFITestDataProvider.instance.openSampleWorkbook(sampleFileName);
-    }
-
-    private static HSSFWorkbook writeOutAndReadBack(HSSFWorkbook original) {
-        return HSSFITestDataProvider.instance.writeOutAndReadBack(original);
-    }
-
-    /** Test reading AND writing a complicated workbook
-     *Test opening resulting sheet in excel*/
-    @Test
-    public void bug15228() throws Exception {
-        HSSFWorkbook wb = openSample("15228.xls");
-        HSSFSheet s = wb.getSheetAt(0);
-        HSSFRow r = s.createRow(0);
-        HSSFCell c = r.createCell(0);
-        c.setCellValue(10);
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    @Test
-    public void bug13796() throws Exception {
-        HSSFWorkbook wb = openSample("13796.xls");
-        HSSFSheet s = wb.getSheetAt(0);
-        HSSFRow r = s.createRow(0);
-        HSSFCell c = r.createCell(0);
-        c.setCellValue(10);
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /** test reading of a formula with a name and a cell ref in one
-     **/
-    @Test
-    public void bug14460() throws Exception {
-        HSSFWorkbook wb = openSample("14460.xls");
-        wb.getSheetAt(0);
-        wb.close();
-    }
-
-    @Test
-    public void bug14330() throws Exception {
-        HSSFWorkbook wb1 = openSample("14330-1.xls");
-        wb1.getSheetAt(0);
-        wb1.close();
-
-        HSSFWorkbook wb2 = openSample("14330-2.xls");
-        wb2.getSheetAt(0);
-        wb2.close();
-    }
-
-    private static void setCellText(HSSFCell cell, String text) {
-        cell.setCellValue(new HSSFRichTextString(text));
-    }
-
-    /** test rewriting a file with large number of unique strings
-     *open resulting file in Excel to check results!*/
-    @Test
-    public void bug15375() throws Exception {
-        HSSFWorkbook wb = openSample("15375.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        HSSFRow row = sheet.getRow(5);
-        HSSFCell cell = row.getCell(3);
-        if (cell == null)
-            cell = row.createCell(3);
-
-        // Write test
-        cell.setCellType(CellType.STRING);
-        setCellText(cell, "a test");
-
-        // change existing numeric cell value
-
-        HSSFRow oRow = sheet.getRow(14);
-        HSSFCell oCell = oRow.getCell(4);
-        oCell.setCellValue(75);
-        oCell = oRow.getCell(5);
-        setCellText(oCell, "0.3");
-
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-    /**
-     * test writing a file with large number of unique strings,
-     * open resulting file in Excel to check results!
-     */
-    @Test
-    public void bug15375_2() throws Exception {
-        bug15375(6000);
-    }
-
-    /**Double byte strings*/
-    @Test
-    public void bug15556() throws Exception {
-        HSSFWorkbook wb = openSample("15556.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFRow row = sheet.getRow(45);
-        assertNotNull("Read row fine!" , row);
-        wb.close();
-    }
-
-    /**Double byte strings */
-    @Test
-    public void bug22742() {
-        openSample("22742.xls");
-    }
-
-    /**Double byte strings */
-    @Test
-    public void bug12561_1() {
-        openSample("12561-1.xls");
-    }
-
-    /** Double byte strings */
-    @Test
-    public void bug12561_2() {
-        openSample("12561-2.xls");
-    }
-
-    /** Double byte strings
-     File supplied by jubeson*/
-    @Test
-    public void bug12843_1() {
-        openSample("12843-1.xls");
-    }
-
-    /** Double byte strings
-     File supplied by Paul Chung*/
-    @Test
-    public void bug12843_2() {
-        openSample("12843-2.xls");
-    }
-
-    /** Reference to Name*/
-    @Test
-    public void bug13224() {
-        openSample("13224.xls");
-    }
-
-    /** Illegal argument exception - cannot store duplicate value in Map*/
-    @Test
-    public void bug19599() {
-        openSample("19599-1.xls");
-        openSample("19599-2.xls");
-    }
-
-    @Test
-    public void bug24215() throws Exception {
-        HSSFWorkbook wb = openSample("24215.xls");
-
-        for (int sheetIndex = 0; sheetIndex < wb.getNumberOfSheets();sheetIndex++) {
-            HSSFSheet sheet = wb.getSheetAt(sheetIndex);
-            int rows = sheet.getLastRowNum();
-
-            for (int rowIndex = 0; rowIndex < rows; rowIndex++) {
-                HSSFRow row = sheet.getRow(rowIndex);
-                int cells = row.getLastCellNum();
-
-                for (int cellIndex = 0; cellIndex < cells; cellIndex++) {
-                    row.getCell(cellIndex);
-                }
-            }
-        }
-        wb.close();
-    }
-
-    /**Tests read and write of Unicode strings in formula results
-     * bug and testcase submitted by Sompop Kumnoonsate
-     * The file contains THAI unicode characters.
-     */
-    @Test
-    public void bugUnicodeStringFormulaRead() throws Exception {
-
-        HSSFWorkbook w = openSample("25695.xls");
-
-        HSSFCell a1 = w.getSheetAt(0).getRow(0).getCell(0);
-        HSSFCell a2 = w.getSheetAt(0).getRow(0).getCell(1);
-        HSSFCell b1 = w.getSheetAt(0).getRow(1).getCell(0);
-        HSSFCell b2 = w.getSheetAt(0).getRow(1).getCell(1);
-        HSSFCell c1 = w.getSheetAt(0).getRow(2).getCell(0);
-        HSSFCell c2 = w.getSheetAt(0).getRow(2).getCell(1);
-        HSSFCell d1 = w.getSheetAt(0).getRow(3).getCell(0);
-        HSSFCell d2 = w.getSheetAt(0).getRow(3).getCell(1);
-
-        /*
-            // THAI code page
-            System.out.println("a1="+unicodeString(a1));
-            System.out.println("a2="+unicodeString(a2));
-            // US code page
-            System.out.println("b1="+unicodeString(b1));
-            System.out.println("b2="+unicodeString(b2));
-            // THAI+US
-            System.out.println("c1="+unicodeString(c1));
-            System.out.println("c2="+unicodeString(c2));
-            // US+THAI
-            System.out.println("d1="+unicodeString(d1));
-            System.out.println("d2="+unicodeString(d2));
-        */
-
-        confirmSameCellText(a1, a2);
-        confirmSameCellText(b1, b2);
-        confirmSameCellText(c1, c2);
-        confirmSameCellText(d1, d2);
-
-        HSSFWorkbook rw = writeOutAndReadBack(w);
-        w.close();
-
-        HSSFCell ra1 = rw.getSheetAt(0).getRow(0).getCell(0);
-        HSSFCell ra2 = rw.getSheetAt(0).getRow(0).getCell(1);
-        HSSFCell rb1 = rw.getSheetAt(0).getRow(1).getCell(0);
-        HSSFCell rb2 = rw.getSheetAt(0).getRow(1).getCell(1);
-        HSSFCell rc1 = rw.getSheetAt(0).getRow(2).getCell(0);
-        HSSFCell rc2 = rw.getSheetAt(0).getRow(2).getCell(1);
-        HSSFCell rd1 = rw.getSheetAt(0).getRow(3).getCell(0);
-        HSSFCell rd2 = rw.getSheetAt(0).getRow(3).getCell(1);
-
-        confirmSameCellText(a1, ra1);
-        confirmSameCellText(b1, rb1);
-        confirmSameCellText(c1, rc1);
-        confirmSameCellText(d1, rd1);
-
-        confirmSameCellText(a1, ra2);
-        confirmSameCellText(b1, rb2);
-        confirmSameCellText(c1, rc2);
-        confirmSameCellText(d1, rd2);
-        
-        rw.close();
-    }
-
-    private static void confirmSameCellText(HSSFCell a, HSSFCell b) {
-        assertEquals(a.getRichStringCellValue().getString(), b.getRichStringCellValue().getString());
-    }
-
-    /*private static String unicodeString(HSSFCell cell) {
-        String ss = cell.getRichStringCellValue().getString();
-        char s[] = ss.toCharArray();
-        StringBuffer sb = new StringBuffer();
-        for (int x=0;x<s.length;x++) {
-            sb.append("\\u").append(Integer.toHexString(s[x]));
-        }
-        return sb.toString();
-    }*/
-
-    /** Error in opening wb*/
-    @Test
-    public void bug32822() {
-        openSample("32822.xls");
-    }
-
-    /**fail to read wb with chart */
-    @Test
-    public void bug15573() {
-        openSample("15573.xls");
-    }
-
-    /**names and macros */
-    @Test
-    public void bug27852() throws Exception {
-        HSSFWorkbook wb = openSample("27852.xls");
-
-        for(int i = 0 ; i < wb.getNumberOfNames(); i++){
-          HSSFName name = wb.getNameAt(i);
-          name.getNameName();
-          if (name.isFunctionName()) {
-              continue;
-          }
-          name.getRefersToFormula();
-        }
-        wb.close();
-    }
-
-    @Test
-    public void bug33082() {
-        openSample("33082.xls");
-    }
-
-    @Test
-    public void bug34775() {
-        try {
-            openSample("34775.xls");
-        } catch (NullPointerException e) {
-            fail("identified bug 34775");
-        }
-    }
-
-    /** Error when reading then writing ArrayValues in NameRecord's*/
-    @Test
-    public void bug37630() throws Exception {
-        HSSFWorkbook wb = openSample("37630.xls");
-        writeOutAndReadBack(wb);
-        wb.close();
-    }
-
-    /**
-     * Bug 25183: org.apache.poi.hssf.usermodel.HSSFSheet.setPropertiesFromSheet
-     */
-    @Test
-    public void bug25183() throws Exception {
-        HSSFWorkbook wb = openSample("25183.xls");
-        writeOutAndReadBack(wb);
-        wb.close();
-    }
-
-    /**
-     * Bug 26100: 128-character message in IF statement cell causes HSSFWorkbook open failure
-     */
-    @Test
-    public void bug26100() throws Exception {
-        HSSFWorkbook wb = openSample("26100.xls");
-        writeOutAndReadBack(wb);
-        wb.close();
-    }
-
-    /**
-     * Bug 27933: Unable to use a template (xls) file containing a wmf graphic
-     */
-    @Test
-    public void bug27933() throws Exception {
-        HSSFWorkbook wb = openSample("27933.xls");
-        writeOutAndReadBack(wb);
-        wb.close();
-    }
-
-    /**
-     * Bug 29206:      NPE on HSSFSheet.getRow for blank rows
-     */
-    @Test
-    public void bug29206() throws Exception {
-        //the first check with blank workbook
-        HSSFWorkbook wb = openSample("Simple.xls");
-        HSSFSheet sheet = wb.createSheet();
-        for(int i = 1; i < 400; i++) {
-            HSSFRow row = sheet.getRow(i);
-            if(row != null) {
-                row.getCell(0);
-            }
-        }
-        wb.close();
-    }
-
-    /**
-     * Bug 29675: POI 2.5 final corrupts output when starting workbook has a graphic
-     */
-    @Test
-    public void bug29675() throws Exception {
-        HSSFWorkbook wb = openSample("29675.xls");
-        writeOutAndReadBack(wb);
-        wb.close();
-    }
-
-    /**
-     * Bug 29942: Importing Excel files that have been created by Open Office on Linux
-     */
-    @Test
-    public void bug29942() throws Exception {
-        HSSFWorkbook wb = openSample("29942.xls");
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-        int count = 0;
-        for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
-            HSSFRow row =  sheet.getRow(i);
-            if (row != null) {
-                HSSFCell cell = row .getCell(0);
-                assertEquals(CellType.STRING, cell.getCellTypeEnum());
-                count++;
-            }
-        }
-        assertEquals(85, count); //should read 85 rows
-
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 29982: Unable to read spreadsheet when dropdown list cell is selected -
-     *  Unable to construct record instance
-     */
-    @Test
-    public void bug29982() throws Exception {
-        HSSFWorkbook wb = openSample("29982.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 30540: HSSFSheet.setRowBreak throws NullPointerException
-     */
-    @Test
-    public void bug30540() throws Exception {
-        HSSFWorkbook wb = openSample("30540.xls");
-
-        HSSFSheet s = wb.getSheetAt(0);
-        s.setRowBreak(1);
-        writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    /**
-     * Bug 31749: {Need help urgently}[This is critical] workbook.write() corrupts the file......?
-     */
-    @Test
-    public void bug31749() throws Exception {
-        HSSFWorkbook wb = openSample("31749.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 31979: {urgent help needed .....}poi library does not support form objects properly.
-     */
-    @Test
-    public void bug31979() throws Exception {
-        HSSFWorkbook wb = openSample("31979.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 35564: HSSFCell.java: NullPtrExc in isGridsPrinted() and getProtect()
-     *  when HSSFWorkbook is created from file
-     */
-    @Test
-    public void bug35564() throws Exception {
-        HSSFWorkbook wb = openSample("35564.xls");
-
-        HSSFSheet sheet = wb.getSheetAt( 0 );
-        assertEquals(false, sheet.isGridsPrinted());
-        assertEquals(false, sheet.getProtect());
-
-        writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    /**
-     * Bug 35565: HSSFCell.java: NullPtrExc in getColumnBreaks() when HSSFWorkbook is created from file
-     */
-    @Test
-    public void bug35565() throws Exception {
-        HSSFWorkbook wb = openSample("35565.xls");
-
-        HSSFSheet sheet = wb.getSheetAt( 0 );
-        assertNotNull(sheet);
-        writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    /**
-     * Bug 37376: Cannot open the saved Excel file if checkbox controls exceed certain limit
-     */
-    @Test
-    public void bug37376() throws Exception {
-        HSSFWorkbook wb = openSample("37376.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 40285:      CellIterator Skips First Column
-     */
-    @Test
-    public void bug40285() throws Exception {
-        HSSFWorkbook wb = openSample("40285.xls");
-
-        HSSFSheet sheet = wb.getSheetAt( 0 );
-        int rownum = 0;
-        for (Iterator<Row> it = sheet.rowIterator(); it.hasNext(); rownum++) {
-            Row row = it.next();
-            assertEquals(rownum, row.getRowNum());
-            int cellNum = 0;
-            for (Iterator<Cell> it2 = row.cellIterator(); it2.hasNext(); cellNum++) {
-                Cell cell = it2.next();
-                assertEquals(cellNum, cell.getColumnIndex());
-            }
-        }
-        wb.close();
-    }
-
-    /**
-     * Test bug 38266: NPE when adding a row break
-     *
-     * User's diagnosis:
-     * 1. Manually (i.e., not using POI) create an Excel Workbook, making sure it
-     * contains a sheet that doesn't have any row breaks
-     * 2. Using POI, create a new HSSFWorkbook from the template in step #1
-     * 3. Try adding a row break (via sheet.setRowBreak()) to the sheet mentioned in step #1
-     * 4. Get a NullPointerException
-     */
-    @Test
-    public void bug38266() throws Exception {
-        String[] files = {"Simple.xls", "SimpleMultiCell.xls", "duprich1.xls"};
-        for (String file : files) {
-            HSSFWorkbook wb = openSample(file);
-
-            HSSFSheet sheet = wb.getSheetAt( 0 );
-            int[] breaks = sheet.getRowBreaks();
-            assertEquals(0, breaks.length);
-
-            //add 3 row breaks
-            for (int j = 1; j <= 3; j++) {
-                sheet.setRowBreak(j*20);
-            }
-            wb.close();
-        }
-    }
-
-    @Test
-    public void bug40738() throws Exception {
-        HSSFWorkbook wb = openSample("SimpleWithAutofilter.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 44200: Sheet not cloneable when Note added to excel cell
-     */
-    @Test
-    public void bug44200() throws Exception {
-        HSSFWorkbook wb = openSample("44200.xls");
-        wb.cloneSheet(0);
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 44201: Sheet not cloneable when validation added to excel cell
-     */
-    @Test
-    public void bug44201() throws Exception {
-        HSSFWorkbook wb = openSample("44201.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 37684  : Unhandled Continue Record Error
-     */
-    @Test
-    public void bug37684() throws Exception {
-        HSSFWorkbook wb1 = openSample("37684-1.xls");
-        writeOutAndReadBack(wb1).close();
-        wb1.close();
-        HSSFWorkbook wb2 = openSample("37684-2.xls");
-        writeOutAndReadBack(wb2).close();
-        wb2.close();
-    }
-
-    /**
-     * Bug 41139: Constructing HSSFWorkbook is failed,threw threw ArrayIndexOutOfBoundsException for creating UnknownRecord
-     */
-    @Test
-    public void bug41139() throws Exception {
-        HSSFWorkbook wb = openSample("41139.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 41546: Constructing HSSFWorkbook is failed,
-     *  Unknown Ptg in Formula: 0x1a (26)
-     */
-    @Test
-    public void bug41546() throws Exception {
-        HSSFWorkbook wb1 = openSample("41546.xls");
-        assertEquals(1, wb1.getNumberOfSheets());
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        assertEquals(1, wb2.getNumberOfSheets());
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Bug 42564: Some files from Access were giving a RecordFormatException
-     *  when reading the BOFRecord
-     */
-    @Test
-    public void bug42564() throws Exception {
-        HSSFWorkbook wb = openSample("ex42564-21435.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 42564: Some files from Access also have issues
-     *  with the NameRecord, once you get past the BOFRecord
-     *  issue.
-     */
-    @Test
-    public void bug42564Alt() throws Exception {
-        HSSFWorkbook wb = openSample("ex42564-21503.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Bug 42618: RecordFormatException reading a file containing
-     *     =CHOOSE(2,A2,A3,A4)
-     */
-    @Test
-    public void bug42618() throws Exception {
-        HSSFWorkbook wb1 = openSample("SimpleWithChoose.xls");
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-        // Check we detect the string properly too
-        HSSFSheet s = wb2.getSheetAt(0);
-
-        // Textual value
-        HSSFRow r1 = s.getRow(0);
-        HSSFCell c1 = r1.getCell(1);
-        assertEquals("=CHOOSE(2,A2,A3,A4)", c1.getRichStringCellValue().toString());
-
-        // Formula Value
-        HSSFRow r2 = s.getRow(1);
-        HSSFCell c2 = r2.getCell(1);
-        assertEquals(25, (int)c2.getNumericCellValue());
-
-        try {
-            assertEquals("CHOOSE(2,A2,A3,A4)", c2.getCellFormula());
-        } catch (IllegalStateException e) {
-            if (e.getMessage().startsWith("Too few arguments")
-                && e.getMessage().indexOf("ConcatPtg") > 0) {
-                fail("identified bug 44306");
-            }
-        }
-        wb2.close();
-    }
-
-    /**
-     * Something up with the FileSharingRecord
-     */
-    @Test
-    public void bug43251() throws Exception {
-        // Used to blow up with an IllegalArgumentException
-        //  when creating a FileSharingRecord
-        HSSFWorkbook wb = openSample("43251.xls");
-        assertEquals(1, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    /**
-     * Crystal reports generates files with short
-     *  StyleRecords, which is against the spec
-     */
-    @Test
-    public void bug44471() throws Exception {
-        // Used to blow up with an ArrayIndexOutOfBounds
-        //  when creating a StyleRecord
-        HSSFWorkbook wb = openSample("OddStyleRecord.xls");
-        assertEquals(1, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    /**
-     * Files with "read only recommended" were giving
-     *  grief on the FileSharingRecord
-     */
-    @Test
-    public void bug44536() throws Exception {
-        // Used to blow up with an IllegalArgumentException
-        //  when creating a FileSharingRecord
-        HSSFWorkbook wb1 = openSample("ReadOnlyRecommended.xls");
-
-        // Check read only advised
-        assertEquals(3, wb1.getNumberOfSheets());
-        assertTrue(wb1.isWriteProtected());
-        wb1.close();
-
-        // But also check that another wb isn't
-        HSSFWorkbook wb2 = openSample("SimpleWithChoose.xls");
-        assertFalse(wb2.isWriteProtected());
-        wb2.close();
-    }
-
-    /**
-     * Some files were having problems with the DVRecord,
-     *  probably due to dropdowns
-     */
-    @Test
-    public void bug44593() throws Exception {
-        // Used to blow up with an IllegalArgumentException
-        //  when creating a DVRecord
-        // Now won't, but no idea if this means we have
-        //  rubbish in the DVRecord or not...
-        HSSFWorkbook wb = openSample("44593.xls");
-        assertEquals(2, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    /**
-     * Used to give problems due to trying to read a zero
-     *  length string, but that's now properly handled
-     */
-    @Test
-    public void bug44643() throws Exception {
-        // Used to blow up with an IllegalArgumentException
-        HSSFWorkbook wb = openSample("44643.xls");
-        assertEquals(1, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    /**
-     * User reported the wrong number of rows from the
-     *  iterator, but we can't replicate that
-     */
-    @Test
-    public void bug44693() throws Exception {
-        HSSFWorkbook wb = openSample("44693.xls");
-        HSSFSheet s = wb.getSheetAt(0);
-
-        // Rows are 1 to 713
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(712, s.getLastRowNum());
-        assertEquals(713, s.getPhysicalNumberOfRows());
-
-        // Now check the iterator
-        int rowsSeen = 0;
-        for(Iterator<Row> i = s.rowIterator(); i.hasNext(); ) {
-            Row r = i.next();
-            assertNotNull(r);
-            rowsSeen++;
-        }
-        assertEquals(713, rowsSeen);
-        wb.close();
-    }
-
-    /**
-     * Bug 28774: Excel will crash when opening xls-files with images.
-     */
-    @Test
-    public void bug28774() throws Exception {
-        HSSFWorkbook wb = openSample("28774.xls");
-        assertTrue("no errors reading sample xls", true);
-        writeOutAndReadBack(wb).close();
-        assertTrue("no errors writing sample xls", true);
-        wb.close();
-    }
-
-    /**
-     * Had a problem apparently, not sure what as it
-     *  works just fine...
-     */
-    @Test
-    public void bug44891() throws Exception {
-        HSSFWorkbook wb = openSample("44891.xls");
-        assertTrue("no errors reading sample xls", true);
-        writeOutAndReadBack(wb).close();
-        assertTrue("no errors writing sample xls", true);
-        wb.close();
-    }
-
-    /**
-     * Bug 44235: Ms Excel can't open save as excel file
-     *
-     * Works fine with poi-3.1-beta1.
-     */
-    @Test
-    public void bug44235() throws Exception {
-        HSSFWorkbook wb = openSample("44235.xls");
-        assertTrue("no errors reading sample xls", true);
-        writeOutAndReadBack(wb).close();
-        assertTrue("no errors writing sample xls", true);
-        wb.close();
-    }
-
-    @Test
-    public void bug36947() throws Exception {
-        HSSFWorkbook wb = openSample("36947.xls");
-        assertTrue("no errors reading sample xls", true);
-        writeOutAndReadBack(wb).close();
-        assertTrue("no errors writing sample xls", true);
-        wb.close();
-    }
-
-    @Test
-    public void bug39634() throws Exception {
-        HSSFWorkbook wb = openSample("39634.xls");
-        assertTrue("no errors reading sample xls", true);
-        writeOutAndReadBack(wb).close();
-        assertTrue("no errors writing sample xls", true);
-        wb.close();
-    }
-
-    /**
-     * Problems with extracting check boxes from
-     *  HSSFObjectData
-     */
-    @Test(expected=FileNotFoundException.class)
-    public void bug44840() throws Exception {
-        HSSFWorkbook wb = openSample("WithCheckBoxes.xls");
-
-        // Take a look at the embedded objects
-        List<HSSFObjectData> objects = wb.getAllEmbeddedObjects();
-        assertEquals(1, objects.size());
-
-        HSSFObjectData obj = objects.get(0);
-        assertNotNull(obj);
-
-        // Peek inside the underlying record
-        EmbeddedObjectRefSubRecord rec = obj.findObjectRecord();
-        assertNotNull(rec);
-
-//        assertEquals(32, rec.field_1_stream_id_offset);
-        assertEquals(0, rec.getStreamId().intValue()); // WRONG!
-        assertEquals("Forms.CheckBox.1", rec.getOLEClassName());
-        assertEquals(12, rec.getObjectData().length);
-
-        // Doesn't have a directory
-        assertFalse(obj.hasDirectoryEntry());
-        assertNotNull(obj.getObjectData());
-        assertEquals(12, obj.getObjectData().length);
-        assertEquals("Forms.CheckBox.1", obj.getOLE2ClassName());
-
-        try {
-            obj.getDirectory();
-        } finally {
-            wb.close();
-        }
-    }
-
-    /**
-     * Test that we can delete sheets without
-     *  breaking the build in named ranges
-     *  used for printing stuff.
-     */
-    @Test
-    public void bug30978() throws Exception {
-        HSSFWorkbook wb1 = openSample("30978-alt.xls");
-        assertEquals(1, wb1.getNumberOfNames());
-        assertEquals(3, wb1.getNumberOfSheets());
-
-        // Check all names fit within range, and use
-        //  DeletedArea3DPtg
-        InternalWorkbook w = wb1.getWorkbook();
-        assertNames(wb1, w);
-
-        // Delete the 2nd sheet
-        wb1.removeSheetAt(1);
-
-        // Re-check
-        assertEquals(1, wb1.getNumberOfNames());
-        assertEquals(2, wb1.getNumberOfSheets());
-        assertNames(wb1, w);
-
-        // Save and re-load
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-        w = wb2.getWorkbook();
-
-        assertEquals(1, wb2.getNumberOfNames());
-        assertEquals(2, wb2.getNumberOfSheets());
-
-        assertNames(wb2, w);
-        wb2.close();
-    }
-
-    private void assertNames(HSSFWorkbook wb1, InternalWorkbook w) {
-        for(int i=0; i<w.getNumNames(); i++) {
-            NameRecord r = w.getNameRecord(i);
-            assertTrue(r.getSheetNumber() <= wb1.getNumberOfSheets());
-
-            Ptg[] nd = r.getNameDefinition();
-            assertEquals(1, nd.length);
-            assertTrue(nd[0] instanceof DeletedArea3DPtg);
-        }
-    }
-
-    /**
-     * Test that fonts get added properly
-     */
-    @Test
-    public void bug45338() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        assertEquals(4, wb.getNumberOfFonts());
-
-        HSSFSheet s = wb.createSheet();
-        s.createRow(0);
-        s.createRow(1);
-        s.getRow(0).createCell(0);
-        s.getRow(1).createCell(0);
-
-        assertEquals(4, wb.getNumberOfFonts());
-
-        HSSFFont f1 = wb.getFontAt((short)0);
-        assertEquals(400, f1.getBoldweight());
-
-        // Check that asking for the same font
-        //  multiple times gives you the same thing.
-        // Otherwise, our tests wouldn't work!
-        assertEquals(
-                wb.getFontAt((short)0),
-                wb.getFontAt((short)0)
-        );
-        assertEquals(
-                wb.getFontAt((short)2),
-                wb.getFontAt((short)2)
-        );
-        assertTrue(
-                wb.getFontAt((short)0)
-                !=
-                wb.getFontAt((short)2)
-        );
-
-        // Look for a new font we have
-        //  yet to add
-        assertNull(
-            wb.findFont(
-                (short)11, (short)123, (short)22,
-                "Thingy", false, true, (short)2, (byte)2
-            )
-        );
-
-        HSSFFont nf = wb.createFont();
-        assertEquals(5, wb.getNumberOfFonts());
-
-        assertEquals(5, nf.getIndex());
-        assertEquals(nf, wb.getFontAt((short)5));
-
-        nf.setBoldweight((short)11);
-        nf.setColor((short)123);
-        nf.setFontHeight((short)22);
-        nf.setFontName("Thingy");
-        nf.setItalic(false);
-        nf.setStrikeout(true);
-        nf.setTypeOffset((short)2);
-        nf.setUnderline((byte)2);
-
-        assertEquals(5, wb.getNumberOfFonts());
-        assertEquals(nf, wb.getFontAt((short)5));
-
-        // Find it now
-        assertNotNull(
-            wb.findFont(
-                (short)11, (short)123, (short)22,
-                "Thingy", false, true, (short)2, (byte)2
-            )
-        );
-        HSSFFont font = wb.findFont(
-                (short) 11, (short) 123, (short) 22,
-                "Thingy", false, true, (short) 2, (byte) 2
-        );
-        assertNotNull(font);
-        assertEquals(
-            5,
-            font.getIndex()
-        );
-        assertEquals(nf,
-               wb.findFont(
-                   (short)11, (short)123, (short)22,
-                   "Thingy", false, true, (short)2, (byte)2
-               )
-        );
-        
-        wb.close();
-    }
-
-    /**
-     * From the mailing list - ensure we can handle a formula
-     *  containing a zip code, eg ="70164"
-     */
-    @Test
-    public void bugZipCodeFormulas() throws Exception {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet s = wb1.createSheet();
-        s.createRow(0);
-        HSSFCell c1 = s.getRow(0).createCell(0);
-        HSSFCell c2 = s.getRow(0).createCell(1);
-        HSSFCell c3 = s.getRow(0).createCell(2);
-
-        // As number and string
-        c1.setCellFormula("70164");
-        c2.setCellFormula("\"70164\"");
-        c3.setCellFormula("\"90210\"");
-
-        // Check the formulas
-        assertEquals("70164", c1.getCellFormula());
-        assertEquals("\"70164\"", c2.getCellFormula());
-
-        // And check the values - blank
-        confirmCachedValue(0.0, c1);
-        confirmCachedValue(0.0, c2);
-        confirmCachedValue(0.0, c3);
-
-        // Try changing the cached value on one of the string
-        //  formula cells, so we can see it updates properly
-        c3.setCellValue(new HSSFRichTextString("test"));
-        confirmCachedValue("test", c3);
-        try {
-            c3.getNumericCellValue();
-            fail("exception should have been thrown");
-        } catch (IllegalStateException e) {
-            assertEquals("Cannot get a NUMERIC value from a STRING formula cell", e.getMessage());
-        }
-
-
-        // Now evaluate, they should all be changed
-        HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb1);
-        eval.evaluateFormulaCellEnum(c1);
-        eval.evaluateFormulaCellEnum(c2);
-        eval.evaluateFormulaCellEnum(c3);
-
-        // Check that the cells now contain
-        //  the correct values
-        confirmCachedValue(70164.0, c1);
-        confirmCachedValue("70164", c2);
-        confirmCachedValue("90210", c3);
-
-
-        // Write and read
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-        HSSFSheet ns = wb2.getSheetAt(0);
-        HSSFCell nc1 = ns.getRow(0).getCell(0);
-        HSSFCell nc2 = ns.getRow(0).getCell(1);
-        HSSFCell nc3 = ns.getRow(0).getCell(2);
-
-        // Re-check
-        confirmCachedValue(70164.0, nc1);
-        confirmCachedValue("70164", nc2);
-        confirmCachedValue("90210", nc3);
-
-        int i = 0;
-        for (Iterator<CellValueRecordInterface> it = ns.getSheet().getCellValueIterator(); it.hasNext(); i++) {
-            CellValueRecordInterface cvr = it.next();
-            if(cvr instanceof FormulaRecordAggregate) {
-                FormulaRecordAggregate fr = (FormulaRecordAggregate)cvr;
-
-                if(i == 0) {
-                    assertEquals(70164.0, fr.getFormulaRecord().getValue(), 0.0001);
-                    assertNull(fr.getStringRecord());
-                } else if (i == 1) {
-                    assertEquals(0.0, fr.getFormulaRecord().getValue(), 0.0001);
-                    assertNotNull(fr.getStringRecord());
-                    assertEquals("70164", fr.getStringRecord().getString());
-                } else {
-                    assertEquals(0.0, fr.getFormulaRecord().getValue(), 0.0001);
-                    assertNotNull(fr.getStringRecord());
-                    assertEquals("90210", fr.getStringRecord().getString());
-                }
-            }
-        }
-        assertEquals(3, i);
-        wb2.close();
-    }
-
-    private static void confirmCachedValue(double expectedValue, HSSFCell cell) {
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultTypeEnum());
-        assertEquals(expectedValue, cell.getNumericCellValue(), 0.0);
-    }
-    private static void confirmCachedValue(String expectedValue, HSSFCell cell) {
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals(CellType.STRING, cell.getCachedFormulaResultTypeEnum());
-        assertEquals(expectedValue, cell.getRichStringCellValue().getString());
-    }
-
-    /**
-     * Problem with "Vector Rows", eg a whole
-     *  column which is set to the result of
-     *  {=sin(B1:B9)}(9,1), so that each cell is
-     *  shown to have the contents
-     *  {=sin(B1:B9){9,1)[rownum][0]
-     * In this sample file, the vector column
-     *  is C, and the data column is B.
-     *
-     *  Expected ExpPtg to be converted from Shared to Non-Shared...
-     */
-    @Ignore("For now, blows up with an exception from ExtPtg")
-    @Test
-    public void test43623() throws Exception {
-        HSSFWorkbook wb1 = openSample("43623.xls");
-        assertEquals(1, wb1.getNumberOfSheets());
-
-        HSSFSheet s1 = wb1.getSheetAt(0);
-
-        HSSFCell c1 = s1.getRow(0).getCell(2);
-        HSSFCell c2 = s1.getRow(1).getCell(2);
-        HSSFCell c3 = s1.getRow(2).getCell(2);
-
-        // These formula contents are a guess...
-        assertEquals("{=sin(B1:B9){9,1)[0][0]", c1.getCellFormula());
-        assertEquals("{=sin(B1:B9){9,1)[1][0]", c2.getCellFormula());
-        assertEquals("{=sin(B1:B9){9,1)[2][0]", c3.getCellFormula());
-
-        // Save and re-open, ensure it still works
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-        HSSFSheet ns1 = wb2.getSheetAt(0);
-        HSSFCell nc1 = ns1.getRow(0).getCell(2);
-        HSSFCell nc2 = ns1.getRow(1).getCell(2);
-        HSSFCell nc3 = ns1.getRow(2).getCell(2);
-
-        assertEquals("{=sin(B1:B9){9,1)[0][0]", nc1.getCellFormula());
-        assertEquals("{=sin(B1:B9){9,1)[1][0]", nc2.getCellFormula());
-        assertEquals("{=sin(B1:B9){9,1)[2][0]", nc3.getCellFormula());
-        wb2.close();
-    }
-
-    /**
-     * People are all getting confused about the last
-     *  row and cell number
-     */
-    @Test
-    public void bug30635() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-
-        // No rows, everything is 0
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(0, s.getLastRowNum());
-        assertEquals(0, s.getPhysicalNumberOfRows());
-
-        // One row, most things are 0, physical is 1
-        s.createRow(0);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(0, s.getLastRowNum());
-        assertEquals(1, s.getPhysicalNumberOfRows());
-
-        // And another, things change
-        s.createRow(4);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(4, s.getLastRowNum());
-        assertEquals(2, s.getPhysicalNumberOfRows());
-
-
-        // Now start on cells
-        HSSFRow r = s.getRow(0);
-        assertEquals(-1, r.getFirstCellNum());
-        assertEquals(-1, r.getLastCellNum());
-        assertEquals(0, r.getPhysicalNumberOfCells());
-
-        // Add a cell, things move off -1
-        r.createCell(0);
-        assertEquals(0, r.getFirstCellNum());
-        assertEquals(1, r.getLastCellNum()); // last cell # + 1
-        assertEquals(1, r.getPhysicalNumberOfCells());
-
-        r.createCell(1);
-        assertEquals(0, r.getFirstCellNum());
-        assertEquals(2, r.getLastCellNum()); // last cell # + 1
-        assertEquals(2, r.getPhysicalNumberOfCells());
-
-        r.createCell(4);
-        assertEquals(0, r.getFirstCellNum());
-        assertEquals(5, r.getLastCellNum()); // last cell # + 1
-        assertEquals(3, r.getPhysicalNumberOfCells());
-        
-        wb.close();
-    }
-
-    /**
-     * Data Tables - ptg 0x2
-     */
-    @Test
-    public void bug44958() throws Exception {
-        HSSFWorkbook wb = openSample("44958.xls");
-        HSSFSheet s;
-        HSSFRow r;
-        HSSFCell c;
-
-        // Check the contents of the formulas
-
-        // E4 to G9 of sheet 4 make up the table
-        s = wb.getSheet("OneVariable Table Completed");
-        r = s.getRow(3);
-        c = r.getCell(4);
-        assertEquals(CellType.FORMULA, c.getCellTypeEnum());
-
-        // TODO - check the formula once tables and
-        //  arrays are properly supported
-
-
-        // E4 to H9 of sheet 5 make up the table
-        s = wb.getSheet("TwoVariable Table Example");
-        r = s.getRow(3);
-        c = r.getCell(4);
-        assertEquals(CellType.FORMULA, c.getCellTypeEnum());
-
-        // TODO - check the formula once tables and
-        //  arrays are properly supported
-        wb.close();
-    }
-
-    /**
-     * 45322: HSSFSheet.autoSizeColumn fails when style.getDataFormat() returns -1
-     */
-    @Test
-    public void bug45322() throws Exception {
-        HSSFWorkbook wb = openSample("44958.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        for(short i=0; i < 30; i++) sh.autoSizeColumn(i);
-        wb.close();
-     }
-
-    /**
-     * We used to add too many UncalcRecords to sheets
-     *  with diagrams on. Don't any more
-     */
-    @Test
-    public void bug45414() throws Exception {
-        HSSFWorkbook wb1 = openSample("WithThreeCharts.xls");
-        wb1.getSheetAt(0).setForceFormulaRecalculation(true);
-        wb1.getSheetAt(1).setForceFormulaRecalculation(false);
-        wb1.getSheetAt(2).setForceFormulaRecalculation(true);
-
-        // Write out and back in again
-        // This used to break
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-
-        // Check now set as it should be
-        assertTrue(wb2.getSheetAt(0).getForceFormulaRecalculation());
-        assertFalse(wb2.getSheetAt(1).getForceFormulaRecalculation());
-        assertTrue(wb2.getSheetAt(2).getForceFormulaRecalculation());
-        wb2.close();
-    }
-
-    /**
-     * Very hidden sheets not displaying as such
-     */
-    @Test
-    public void bug45761() throws Exception {
-        HSSFWorkbook wb1 = openSample("45761.xls");
-        assertEquals(3, wb1.getNumberOfSheets());
-
-        assertFalse(wb1.isSheetHidden(0));
-        assertFalse(wb1.isSheetVeryHidden(0));
-        assertTrue(wb1.isSheetHidden(1));
-        assertFalse(wb1.isSheetVeryHidden(1));
-        assertFalse(wb1.isSheetHidden(2));
-        assertTrue(wb1.isSheetVeryHidden(2));
-
-        // Change 0 to be very hidden, and re-load
-        wb1.setSheetHidden(0, Workbook.SHEET_STATE_VERY_HIDDEN);
-
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-
-        assertFalse(wb2.isSheetHidden(0));
-        assertTrue(wb2.isSheetVeryHidden(0));
-        assertTrue(wb2.isSheetHidden(1));
-        assertFalse(wb2.isSheetVeryHidden(1));
-        assertFalse(wb2.isSheetHidden(2));
-        assertTrue(wb2.isSheetVeryHidden(2));
-        wb2.close();
-    }
-
-    /**
-     * The resolution for bug 45777 assumed that the maximum text length in a header / footer
-     * record was 256 bytes.  This assumption appears to be wrong.  Since the fix for bug 47244,
-     * POI now supports header / footer text lengths beyond 256 bytes.
-     */
-    @Test
-    public void bug45777() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-
-        char[] cc248 = new char[248];
-        Arrays.fill(cc248, 'x');
-        String s248 = new String(cc248);
-
-        String s249 = s248 + "1";
-        String s250 = s248 + "12";
-        String s251 = s248 + "123";
-        assertEquals(248, s248.length());
-        assertEquals(249, s249.length());
-        assertEquals(250, s250.length());
-        assertEquals(251, s251.length());
-
-
-        // Try on headers
-        s.getHeader().setCenter(s248);
-        assertEquals(254, s.getHeader().getRawText().length());
-        writeOutAndReadBack(wb).close();
-
-        s.getHeader().setCenter(s251);
-        assertEquals(257, s.getHeader().getRawText().length());
-        writeOutAndReadBack(wb).close();
-
-        // header can be more than 256 bytes
-        s.getHeader().setCenter(s250); // 256 bytes required
-        s.getHeader().setCenter(s251); // 257 bytes required
-
-        // Now try on footers
-        s.getFooter().setCenter(s248);
-        assertEquals(254, s.getFooter().getRawText().length());
-        writeOutAndReadBack(wb).close();
-
-        s.getFooter().setCenter(s251);
-        assertEquals(257, s.getFooter().getRawText().length());
-        writeOutAndReadBack(wb).close();
-
-        // footer can be more than 256 bytes
-        s.getFooter().setCenter(s250); // 256 bytes required
-        s.getFooter().setCenter(s251); // 257 bytes required
-        
-        wb.close();
-    }
-
-    /**
-     * Charts with long titles
-     */
-    @Test
-    public void bug45784() throws Exception {
-        // This used to break
-        HSSFWorkbook wb = openSample("45784.xls");
-        assertEquals(1, wb.getNumberOfSheets());
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-   /**
-     * Cell background colours
-     */
-    @Test
-    public void bug45492() throws Exception {
-        HSSFWorkbook wb = openSample("45492.xls");
-        HSSFSheet s = wb.getSheetAt(0);
-        HSSFRow r = s.getRow(0);
-        HSSFPalette p = wb.getCustomPalette();
-
-        HSSFCell auto = r.getCell(0);
-        HSSFCell grey = r.getCell(1);
-        HSSFCell red = r.getCell(2);
-        HSSFCell blue = r.getCell(3);
-        HSSFCell green = r.getCell(4);
-
-        assertEquals(64, auto.getCellStyle().getFillForegroundColor());
-        assertEquals(64, auto.getCellStyle().getFillBackgroundColor());
-        assertEquals("0:0:0", p.getColor(64).getHexString());
-
-        assertEquals(22, grey.getCellStyle().getFillForegroundColor());
-        assertEquals(64, grey.getCellStyle().getFillBackgroundColor());
-        assertEquals("C0C0:C0C0:C0C0", p.getColor(22).getHexString());
-
-        assertEquals(10, red.getCellStyle().getFillForegroundColor());
-        assertEquals(64, red.getCellStyle().getFillBackgroundColor());
-        assertEquals("FFFF:0:0", p.getColor(10).getHexString());
-
-        assertEquals(12, blue.getCellStyle().getFillForegroundColor());
-        assertEquals(64, blue.getCellStyle().getFillBackgroundColor());
-        assertEquals("0:0:FFFF", p.getColor(12).getHexString());
-
-        assertEquals(11, green.getCellStyle().getFillForegroundColor());
-        assertEquals(64, green.getCellStyle().getFillBackgroundColor());
-        assertEquals("0:FFFF:0", p.getColor(11).getHexString());
-        wb.close();
-    }
-
-    /**
-     * ContinueRecord after EOF
-     */
-    @Test
-    public void bug46137() throws Exception {
-        // This used to break
-        HSSFWorkbook wb = openSample("46137.xls");
-        assertEquals(7, wb.getNumberOfSheets());
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Odd POIFS blocks issue:
-     * block[ 44 ] already removed from org.apache.poi.poifs.storage.BlockListImpl.remove
-     */
-    @Test
-    public void bug45290() throws Exception {
-        HSSFWorkbook wb = openSample("45290.xls");
-        assertEquals(1, wb.getNumberOfSheets());
-        wb.close();
-    }
-
-    /**
-     * In POI-2.5 user reported exception when parsing a name with a custom VBA function:
-     *  =MY_VBA_FUNCTION("lskdjflsk")
-     */
-    @Test
-    public void bug30070() throws Exception {
-        HSSFWorkbook wb = openSample("30070.xls"); //contains custom VBA function 'Commission'
-        HSSFSheet sh = wb.getSheetAt(0);
-        HSSFCell cell = sh.getRow(0).getCell(1);
-
-        //B1 uses VBA in the formula
-        assertEquals("Commission(A1)", cell.getCellFormula());
-
-        //name sales_1 refers to Commission(Sheet0!$A$1)
-        int idx = wb.getNameIndex("sales_1");
-        assertTrue(idx != -1);
-
-        HSSFName name = wb.getNameAt(idx);
-        assertEquals("Commission(Sheet0!$A$1)", name.getRefersToFormula());
-        wb.close();
-    }
-
-    /**
-     * The link formulas which is referring to other books cannot be taken (the bug existed prior to POI-3.2)
-     * Expected:
-     *
-     * [link_sub.xls]Sheet1!$A$1
-     * [link_sub.xls]Sheet1!$A$2
-     * [link_sub.xls]Sheet1!$A$3
-     *
-     * POI-3.1 output:
-     *
-     * Sheet1!$A$1
-     * Sheet1!$A$2
-     * Sheet1!$A$3
-     *
-     */
-    @Test
-    public void bug27364() throws Exception {
-        HSSFWorkbook wb = openSample("27364.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        assertEquals("[link_sub.xls]Sheet1!$A$1", sheet.getRow(0).getCell(0).getCellFormula());
-        assertEquals("[link_sub.xls]Sheet1!$A$2", sheet.getRow(1).getCell(0).getCellFormula());
-        assertEquals("[link_sub.xls]Sheet1!$A$3", sheet.getRow(2).getCell(0).getCellFormula());
-        wb.close();
-    }
-
-    /**
-     * Similar to bug#27364:
-     * HSSFCell.getCellFormula() fails with references to external workbooks
-     */
-    @Test
-    public void bug31661() throws Exception {
-        HSSFWorkbook wb = openSample("31661.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFCell cell = sheet.getRow(11).getCell(10); //K11
-        assertEquals("+'[GM Budget.xls]8085.4450'!$B$2", cell.getCellFormula());
-        wb.close();
-    }
-
-    /**
-     * Incorrect handling of non-ISO 8859-1 characters in Windows ANSII Code Page 1252
-     */
-    @Test
-    public void bug27394() throws Exception {
-        HSSFWorkbook wb = openSample("27394.xls");
-        assertEquals("\u0161\u017E", wb.getSheetName(0));
-        assertEquals("\u0161\u017E\u010D\u0148\u0159", wb.getSheetName(1));
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        assertEquals("\u0161\u017E", sheet.getRow(0).getCell(0).getStringCellValue());
-        assertEquals("\u0161\u017E\u010D\u0148\u0159", sheet.getRow(1).getCell(0).getStringCellValue());
-        wb.close();
-    }
-
-    /**
-     * Multiple calls of HSSFWorkbook.write result in corrupted xls
-     */
-    @Test
-    public void bug32191() throws IOException {
-        HSSFWorkbook wb = openSample("27394.xls");
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        wb.write(out);
-        out.close();
-        int size1 = out.size();
-
-        out = new ByteArrayOutputStream();
-        wb.write(out);
-        out.close();
-        int size2 = out.size();
-
-        assertEquals(size1, size2);
-        out = new ByteArrayOutputStream();
-        wb.write(out);
-        out.close();
-        int size3 = out.size();
-        assertEquals(size2, size3);
-        wb.close();
-    }
-
-    /**
-     * java.io.IOException: block[ 0 ] already removed
-     * (is an excel 95 file though)
-     */
-    @Test
-    public void bug46904() throws Exception {
-        try {
-            OPOIFSFileSystem fs = new OPOIFSFileSystem(
-                    HSSFITestDataProvider.instance.openWorkbookStream("46904.xls"));
-            new HSSFWorkbook(fs.getRoot(), false).close();
-            fail("Should catch exception here");
-        } catch(OldExcelFormatException e) {
-            assertTrue(e.getMessage().startsWith(
-                    "The supplied spreadsheet seems to be Excel"
-            ));
-        }
-        try {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(
-                    HSSFITestDataProvider.instance.openWorkbookStream("46904.xls"));
-            try {
-                new HSSFWorkbook(fs.getRoot(), false).close();
-            fail("Should catch exception here");
-            } finally {
-                fs.close();
-            }
-        } catch(OldExcelFormatException e) {
-            assertTrue(e.getMessage().startsWith(
-                    "The supplied spreadsheet seems to be Excel"
-            ));
-        }
-    }
-
-    /**
-     * java.lang.NegativeArraySizeException reading long
-     *  non-unicode data for a name record
-     */
-    @Test
-    public void bug47034() throws Exception {
-        HSSFWorkbook wb = openSample("47034.xls");
-        assertEquals(893, wb.getNumberOfNames());
-        assertEquals("Matthew\\Matthew11_1\\Matthew2331_1\\Matthew2351_1\\Matthew2361_1___lab", wb.getNameName(300));
-        wb.close();
-    }
-
-    /**
-     * HSSFRichTextString.length() returns negative for really long strings.
-     * The test file was created in OpenOffice 3.0 as Excel does not allow cell text longer than 32,767 characters
-     */
-    @Test
-    public void bug46368() throws Exception {
-        HSSFWorkbook wb = openSample("46368.xls");
-    	HSSFSheet s = wb.getSheetAt(0);
-        HSSFCell cell1 = s.getRow(0).getCell(0);
-        assertEquals(32770, cell1.getStringCellValue().length());
-
-        HSSFCell cell2 = s.getRow(2).getCell(0);
-        assertEquals(32766, cell2.getStringCellValue().length());
-        wb.close();
-    }
-
-    /**
-     * Short records on certain sheets with charts in them
-     */
-    @Test
-    public void bug48180() throws Exception {
-        HSSFWorkbook wb = openSample("48180.xls");
-
-    	HSSFSheet s = wb.getSheetAt(0);
-        HSSFCell cell1 = s.getRow(0).getCell(0);
-        assertEquals("test ", cell1.getStringCellValue());
-
-        HSSFCell cell2 = s.getRow(0).getCell(1);
-        assertEquals(1.0, cell2.getNumericCellValue(), 0.0);
-        wb.close();
-    }
-
-    /**
-     * POI 3.5 beta 7 can not read excel file contain list box (Form Control)
-     */
-    @Test
-    public void bug47701() {
-        openSample("47701.xls");
-    }
-
-    @Test
-    public void bug48026() {
-        openSample("48026.xls");
-    }
-
-    @Test
-    public void bug47251() {
-        // Firstly, try with one that triggers on InterfaceHdrRecord
-        openSample("47251.xls");
-
-        // Now with one that triggers on NoteRecord
-        openSample("47251_1.xls");
-    }
-
-    /**
-     * Round trip a file with an unusual UnicodeString/ExtRst record parts
-     */
-    @Test
-    public void bug47847() throws Exception {
-       HSSFWorkbook wb1 = openSample("47847.xls");
-       assertEquals(3, wb1.getNumberOfSheets());
-
-       // Find the SST record
-       UnicodeString withExt = wb1.getWorkbook().getSSTString(0);
-       UnicodeString withoutExt = wb1.getWorkbook().getSSTString(31);
-
-       assertEquals("O:Alloc:Qty", withExt.getString());
-       assertTrue((withExt.getOptionFlags() & 0x0004) == 0x0004);
-
-       assertEquals("RT", withoutExt.getString());
-       assertTrue((withoutExt.getOptionFlags() & 0x0004) == 0x0000);
-
-       // Something about continues...
-
-
-       // Write out and re-read
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-       assertEquals(3, wb2.getNumberOfSheets());
-
-       // Check it's the same now
-       withExt = wb2.getWorkbook().getSSTString(0);
-       withoutExt = wb2.getWorkbook().getSSTString(31);
-
-       assertEquals("O:Alloc:Qty", withExt.getString());
-       assertTrue((withExt.getOptionFlags() & 0x0004) == 0x0004);
-
-       assertEquals("RT", withoutExt.getString());
-       assertTrue((withoutExt.getOptionFlags() & 0x0004) == 0x0000);
-       wb2.close();
-    }
-
-    /**
-     * Problem with cloning a sheet with a chart
-     *  contained in it.
-     */
-    @Test
-    public void bug49096() throws Exception {
-       HSSFWorkbook wb1 = openSample("49096.xls");
-       assertEquals(1, wb1.getNumberOfSheets());
-
-       assertNotNull(wb1.getSheetAt(0));
-       wb1.cloneSheet(0);
-       assertEquals(2, wb1.getNumberOfSheets());
-
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-       assertEquals(2, wb2.getNumberOfSheets());
-       wb2.close();
-    }
-
-    /**
-     * Newly created sheets need to get a
-     *  proper TabID, otherwise print setup
-     *  gets confused on them.
-     * Also ensure that print setup refs are
-     *  by reference not value
-     */
-    @Test
-    public void bug46664() throws Exception {
-       HSSFWorkbook wb1 = new HSSFWorkbook();
-       HSSFSheet sheet = wb1.createSheet("new_sheet");
-       HSSFRow row = sheet.createRow((short)0);
-       row.createCell(0).setCellValue(new HSSFRichTextString("Column A"));
-       row.createCell(1).setCellValue(new HSSFRichTextString("Column B"));
-       row.createCell(2).setCellValue(new HSSFRichTextString("Column C"));
-       row.createCell(3).setCellValue(new HSSFRichTextString("Column D"));
-       row.createCell(4).setCellValue(new HSSFRichTextString("Column E"));
-       row.createCell(5).setCellValue(new HSSFRichTextString("Column F"));
-
-       //set print area from column a to column c (on first row)
-       wb1.setPrintArea(
-               0, //sheet index
-               0, //start column
-               2, //end column
-               0, //start row
-               0  //end row
-       );
-
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-
-       // Ensure the tab index
-       TabIdRecord tr = null;
-       for(Record r : wb2.getWorkbook().getRecords()) {
-          if(r instanceof TabIdRecord) {
-             tr = (TabIdRecord)r;
-          }
-       }
-       assertNotNull(tr);
-       assertEquals(1, tr._tabids.length);
-       assertEquals(0, tr._tabids[0]);
-
-       // Ensure the print setup
-       assertEquals("new_sheet!$A$1:$C$1", wb2.getPrintArea(0));
-        HSSFName printArea = wb2.getName("Print_Area");
-        assertNotNull(printArea);
-        assertEquals("new_sheet!$A$1:$C$1", printArea.getRefersToFormula());
-
-       // Needs reference not value
-       NameRecord nr = wb2.getWorkbook().getNameRecord(
-               wb2.getNameIndex("Print_Area")
-       );
-       assertEquals("Print_Area", nr.getNameText());
-       assertEquals(1, nr.getNameDefinition().length);
-       assertEquals(
-             "new_sheet!$A$1:$C$1",
-             ((Area3DPtg)nr.getNameDefinition()[0]).toFormulaString(HSSFEvaluationWorkbook.create(wb2))
-       );
-       assertEquals('R', nr.getNameDefinition()[0].getRVAType());
-       wb2.close();
-    }
-
-    /**
-     * Problems with formula references to
-     *  sheets via URLs
-     */
-    @Test
-    public void bug45970() throws Exception {
-       HSSFWorkbook wb1 = openSample("FormulaRefs.xls");
-       assertEquals(3, wb1.getNumberOfSheets());
-
-       HSSFSheet s = wb1.getSheetAt(0);
-       HSSFRow row;
-
-       row = s.getRow(0);
-       assertEquals(CellType.NUMERIC, row.getCell(1).getCellTypeEnum());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       row = s.getRow(1);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("B1", row.getCell(1).getCellFormula());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       row = s.getRow(2);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("Sheet1!B1", row.getCell(1).getCellFormula());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       row = s.getRow(3);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("[Formulas2.xls]Sheet1!B2", row.getCell(1).getCellFormula());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       row = s.getRow(4);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("'[$http://gagravarr.org/FormulaRefs.xls]Sheet1'!B1", row.getCell(1).getCellFormula());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       // Change 4
-       row.getCell(1).setCellFormula("'[$http://gagravarr.org/FormulaRefs2.xls]Sheet1'!B2");
-       row.getCell(1).setCellValue(123.0);
-
-       // Add 5
-       row = s.createRow(5);
-       row.createCell(1, CellType.FORMULA);
-       row.getCell(1).setCellFormula("'[$http://example.com/FormulaRefs.xls]Sheet1'!B1");
-       row.getCell(1).setCellValue(234.0);
-
-
-       // Re-test
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-       s = wb2.getSheetAt(0);
-
-       row = s.getRow(0);
-       assertEquals(CellType.NUMERIC, row.getCell(1).getCellTypeEnum());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(),0);
-
-       row = s.getRow(1);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("B1", row.getCell(1).getCellFormula());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       row = s.getRow(2);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("Sheet1!B1", row.getCell(1).getCellFormula());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       row = s.getRow(3);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("[Formulas2.xls]Sheet1!B2", row.getCell(1).getCellFormula());
-       assertEquals(112.0, row.getCell(1).getNumericCellValue(), 0);
-
-       // TODO - Fix these so they work...
-       /*row = s.getRow(4);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("'[$http://gagravarr.org/FormulaRefs2.xls]Sheet1'!B2", row.getCell(1).getCellFormula());
-       assertEquals(123.0, row.getCell(1).getNumericCellValue(), 0);
-
-       row = s.getRow(5);
-       assertEquals(CellType.FORMULA, row.getCell(1).getCellTypeEnum());
-       assertEquals("'[$http://example.com/FormulaRefs.xls]Sheet1'!B1", row.getCell(1).getCellFormula());
-       assertEquals(234.0, row.getCell(1).getNumericCellValue(), 0);*/
-       
-       wb2.close();
-    }
-
-    /**
-     * Test for a file with NameRecord with NameCommentRecord comments
-     */
-    @Test
-    public void bug49185() throws Exception {
-        HSSFWorkbook wb1 = openSample("49185.xls");
-        Name name = wb1.getName("foobarName");
-        assertNotNull(name);
-        assertEquals("This is a comment", name.getComment());
-
-        // Rename the name, comment comes with it
-        name.setNameName("ChangedName");
-        assertEquals("This is a comment", name.getComment());
-
-        // Save and re-check
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-        name = wb2.getName("ChangedName");
-        assertNotNull(name);
-        assertEquals("This is a comment", name.getComment());
-
-        // Now try to change it
-        name.setComment("Changed Comment");
-        assertEquals("Changed Comment", name.getComment());
-
-        // Save and re-check
-        HSSFWorkbook wb3 = writeOutAndReadBack(wb2);
-        wb2.close();
-        name = wb3.getName("ChangedName");
-        assertNotNull(name);
-        assertEquals("Changed Comment", name.getComment());
-        wb3.close();
-    }
-
-    /**
-     * Vertically aligned text
-     */
-    @Test
-    public void bug49524() throws Exception {
-       HSSFWorkbook wb1 = openSample("49524.xls");
-       Sheet s = wb1.getSheetAt(0);
-       Row r = s.getRow(0);
-       Cell rotated = r.getCell(0);
-       Cell normal = r.getCell(1);
-
-       // Check the current ones
-       assertEquals(0, normal.getCellStyle().getRotation());
-       assertEquals(0xff, rotated.getCellStyle().getRotation());
-
-       // Add a new style, also rotated
-       CellStyle cs = wb1.createCellStyle();
-       cs.setRotation((short)0xff);
-       Cell nc = r.createCell(2);
-       nc.setCellValue("New Rotated Text");
-       nc.setCellStyle(cs);
-       assertEquals(0xff, nc.getCellStyle().getRotation());
-
-       // Write out and read back
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-
-       // Re-check
-       s = wb2.getSheetAt(0);
-       r = s.getRow(0);
-       rotated = r.getCell(0);
-       normal = r.getCell(1);
-       nc = r.getCell(2);
-
-       assertEquals(0, normal.getCellStyle().getRotation());
-       assertEquals(0xff, rotated.getCellStyle().getRotation());
-       assertEquals(0xff, nc.getCellStyle().getRotation());
-       wb2.close();
-    }
-
-    /**
-     * Setting the user style name on custom styles
-     */
-    @Test
-    public void bug49689() throws Exception {
-       HSSFWorkbook wb1 = new HSSFWorkbook();
-       HSSFSheet s = wb1.createSheet("Test");
-       HSSFRow r = s.createRow(0);
-       HSSFCell c = r.createCell(0);
-
-       HSSFCellStyle cs1 = wb1.createCellStyle();
-       HSSFCellStyle cs2 = wb1.createCellStyle();
-       HSSFCellStyle cs3 = wb1.createCellStyle();
-
-       assertEquals(21, cs1.getIndex());
-       cs1.setUserStyleName("Testing");
-
-       assertEquals(22, cs2.getIndex());
-       cs2.setUserStyleName("Testing 2");
-
-       assertEquals(23, cs3.getIndex());
-       cs3.setUserStyleName("Testing 3");
-
-       // Set one
-       c.setCellStyle(cs1);
-
-       // Write out and read back
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-
-       // Re-check
-       assertEquals("Testing", wb2.getCellStyleAt((short)21).getUserStyleName());
-       assertEquals("Testing 2", wb2.getCellStyleAt((short)22).getUserStyleName());
-       assertEquals("Testing 3", wb2.getCellStyleAt((short)23).getUserStyleName());
-       
-       wb2.close();
-    }
-
-    @Test
-    public void bug49751() throws Exception {
-        HSSFWorkbook wb = openSample("49751.xls");
-        int numCellStyles = wb.getNumCellStyles();
-        List<String> namedStyles = Arrays.asList(
-                "20% - Accent1", "20% - Accent2", "20% - Accent3", "20% - Accent4", "20% - Accent5",
-                "20% - Accent6", "40% - Accent1", "40% - Accent2", "40% - Accent3", "40% - Accent4",
-                "40% - Accent5", "40% - Accent6", "60% - Accent1", "60% - Accent2", "60% - Accent3",
-                "60% - Accent4", "60% - Accent5", "60% - Accent6", "Accent1", "Accent2", "Accent3",
-                "Accent4", "Accent5", "Accent6", "Bad", "Calculation", "Check Cell", "Explanatory Text",
-                "Good", "Heading 1", "Heading 2", "Heading 3", "Heading 4", "Input", "Linked Cell",
-                "Neutral", "Note", "Output", "Title", "Total", "Warning Text");
-
-        List<String> collecteddStyles = new ArrayList<String>();
-        for (int i = 0; i < numCellStyles; i++) {
-            HSSFCellStyle cellStyle = wb.getCellStyleAt(i);
-            String styleName = cellStyle.getUserStyleName();
-            if (styleName != null) {
-                collecteddStyles.add(styleName);
-            }
-        }
-        assertTrue(namedStyles.containsAll(collecteddStyles));
-        wb.close();
-    }
-
-    /**
-     * Regression with the PageSettingsBlock
-     */
-    @Test
-    public void bug49931() throws Exception {
-       HSSFWorkbook wb = openSample("49931.xls");
-       assertEquals(1, wb.getNumberOfSheets());
-       assertEquals("Foo", wb.getSheetAt(0).getRow(0).getCell(0).getRichStringCellValue().toString());
-       wb.close();
-    }
-
-    /**
-     * Missing left/right/centre options on a footer
-     */
-    @Test
-    public void bug48325() throws Exception {
-       HSSFWorkbook wb = openSample("48325.xls");
-       HSSFSheet sh = wb.getSheetAt(0);
-       HSSFFooter f = sh.getFooter();
-
-       // Will show as the center, as that is what excel does
-       //  with an invalid footer lacking left/right/center details
-       assertEquals("Left text should be empty", "", f.getLeft());
-       assertEquals("Right text should be empty", "", f.getRight());
-       assertEquals(
-             "Center text should contain the illegal value",
-             "BlahBlah blah blah  ", f.getCenter()
-       );
-       wb.close();
-    }
-
-    /**
-     * IllegalStateException received when creating Data validation in sheet with macro
-     */
-    @Test
-    public void bug50020() throws Exception {
-       HSSFWorkbook wb = openSample("50020.xls");
-       writeOutAndReadBack(wb).close();
-       wb.close();
-    }
-
-    @Test
-    public void bug50426() throws Exception {
-       HSSFWorkbook wb = openSample("50426.xls");
-       writeOutAndReadBack(wb).close();
-       wb.close();
-    }
-
-    /**
-     * Last row number when shifting rows
-     */
-    @Test
-    public void bug50416LastRowNumber() throws IOException {
-       // Create the workbook with 1 sheet which contains 3 rows
-       HSSFWorkbook workbook = new HSSFWorkbook();
-       Sheet sheet = workbook.createSheet("Bug50416");
-       Row row1 = sheet.createRow(0);
-       Cell cellA_1 = row1.createCell(0,CellType.STRING);
-       cellA_1.setCellValue("Cell A,1");
-       Row row2 = sheet.createRow(1);
-       Cell cellA_2 = row2.createCell(0,CellType.STRING);
-       cellA_2.setCellValue("Cell A,2");
-       Row row3 = sheet.createRow(2);
-       Cell cellA_3 = row3.createCell(0,CellType.STRING);
-       cellA_3.setCellValue("Cell A,3");
-
-       // Test the last Row number it currently correct
-       assertEquals(2, sheet.getLastRowNum());
-
-       // Shift the first row to the end
-       sheet.shiftRows(0, 0, 3);
-       assertEquals(3, sheet.getLastRowNum());
-       assertEquals(-1,         sheet.getRow(0).getLastCellNum());
-       assertEquals("Cell A,2", sheet.getRow(1).getCell(0).getStringCellValue());
-       assertEquals("Cell A,3", sheet.getRow(2).getCell(0).getStringCellValue());
-       assertEquals("Cell A,1", sheet.getRow(3).getCell(0).getStringCellValue());
-
-       // Shift the 2nd row up to the first one
-       sheet.shiftRows(1, 1, -1);
-       assertEquals(3, sheet.getLastRowNum());
-       assertEquals("Cell A,2", sheet.getRow(0).getCell(0).getStringCellValue());
-       assertEquals(-1,         sheet.getRow(1).getLastCellNum());
-       assertEquals("Cell A,3", sheet.getRow(2).getCell(0).getStringCellValue());
-       assertEquals("Cell A,1", sheet.getRow(3).getCell(0).getStringCellValue());
-
-       // Shift the 4th row up into the gap in the 3rd row
-       sheet.shiftRows(3, 3, -2);
-       assertEquals(2, sheet.getLastRowNum());
-       assertEquals("Cell A,2", sheet.getRow(0).getCell(0).getStringCellValue());
-       assertEquals("Cell A,1", sheet.getRow(1).getCell(0).getStringCellValue());
-       assertEquals("Cell A,3", sheet.getRow(2).getCell(0).getStringCellValue());
-       assertEquals(-1,         sheet.getRow(3).getLastCellNum());
-
-       // Now zap the empty 4th row - won't do anything
-       sheet.removeRow(sheet.getRow(3));
-
-       // Test again the last row number which should be 2
-       assertEquals(2, sheet.getLastRowNum());
-       assertEquals("Cell A,2", sheet.getRow(0).getCell(0).getStringCellValue());
-       assertEquals("Cell A,1", sheet.getRow(1).getCell(0).getStringCellValue());
-       assertEquals("Cell A,3", sheet.getRow(2).getCell(0).getStringCellValue());
-       
-       workbook.close();
-    }
-
-    /**
-     * If you send a file between Excel and OpenOffice enough, something
-     *  will turn the "General" format into "GENERAL"
-     */
-    @Test
-    public void bug50756() throws Exception {
-       HSSFWorkbook wb = openSample("50756.xls");
-       HSSFSheet s = wb.getSheetAt(0);
-       HSSFRow r17 = s.getRow(16);
-       HSSFRow r18 = s.getRow(17);
-       HSSFDataFormatter df = new HSSFDataFormatter();
-
-       assertEquals(10.0, r17.getCell(1).getNumericCellValue(), 0);
-       assertEquals(20.0, r17.getCell(2).getNumericCellValue(), 0);
-       assertEquals(20.0, r17.getCell(3).getNumericCellValue(), 0);
-       assertEquals("GENERAL", r17.getCell(1).getCellStyle().getDataFormatString());
-       assertEquals("GENERAL", r17.getCell(2).getCellStyle().getDataFormatString());
-       assertEquals("GENERAL", r17.getCell(3).getCellStyle().getDataFormatString());
-       assertEquals("10", df.formatCellValue(r17.getCell(1)));
-       assertEquals("20", df.formatCellValue(r17.getCell(2)));
-       assertEquals("20", df.formatCellValue(r17.getCell(3)));
-
-       assertEquals(16.0, r18.getCell(1).getNumericCellValue(), 0);
-       assertEquals(35.0, r18.getCell(2).getNumericCellValue(), 0);
-       assertEquals(123.0, r18.getCell(3).getNumericCellValue(), 0);
-       assertEquals("GENERAL", r18.getCell(1).getCellStyle().getDataFormatString());
-       assertEquals("GENERAL", r18.getCell(2).getCellStyle().getDataFormatString());
-       assertEquals("GENERAL", r18.getCell(3).getCellStyle().getDataFormatString());
-       assertEquals("16", df.formatCellValue(r18.getCell(1)));
-       assertEquals("35", df.formatCellValue(r18.getCell(2)));
-       assertEquals("123", df.formatCellValue(r18.getCell(3)));
-       wb.close();
-    }
-
-    /**
-     * A protected sheet with comments, when written out by
-     *  POI, ends up upsetting excel.
-     * TODO Identify the cause and add extra asserts for
-     *  the bit excel cares about
-     */
-    @Test
-    public void bug50833() throws Exception {
-       Biff8EncryptionKey.setCurrentUserPassword(null);
-
-       HSSFWorkbook wb1 = openSample("50833.xls");
-       HSSFSheet s = wb1.getSheetAt(0);
-       assertEquals("Sheet1", s.getSheetName());
-       assertEquals(false, s.getProtect());
-
-       HSSFCell c = s.getRow(0).getCell(0);
-       assertEquals("test cell value", c.getRichStringCellValue().getString());
-
-       HSSFComment cmt = c.getCellComment();
-       assertNotNull(cmt);
-       assertEquals("Robert Lawrence", cmt.getAuthor());
-       assertEquals("Robert Lawrence:\ntest comment", cmt.getString().getString());
-
-       // Reload
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-       s = wb2.getSheetAt(0);
-       c = s.getRow(0).getCell(0);
-
-       // Re-check the comment
-       cmt = c.getCellComment();
-       assertNotNull(cmt);
-       assertEquals("Robert Lawrence", cmt.getAuthor());
-       assertEquals("Robert Lawrence:\ntest comment", cmt.getString().getString());
-
-       // TODO Identify what excel doesn't like, and check for that
-       wb2.close();
-    }
-
-    @Test
-    public void bug50779() throws Exception {
-        HSSFWorkbook wb1 = openSample("50779_1.xls");
-        writeOutAndReadBack(wb1).close();
-        wb1.close();
-
-        HSSFWorkbook wb2 = openSample("50779_2.xls");
-        writeOutAndReadBack(wb2).close();
-        wb2.close();
-    }
-
-    /**
-     * The spec says that ChartEndObjectRecord has 6 reserved
-     *  bytes on the end, but we sometimes find files without...
-     */
-    @Test
-    public void bug50939() throws Exception {
-       HSSFWorkbook wb = openSample("50939.xls");
-       assertEquals(2, wb.getNumberOfSheets());
-       wb.close();
-    }
-
-    @Test
-    public void bug49219() throws Exception {
-       HSSFWorkbook wb = openSample("49219.xls");
-       assertEquals(1, wb.getNumberOfSheets());
-       assertEquals("DGATE", wb.getSheetAt(0).getRow(1).getCell(0).getStringCellValue());
-       wb.close();
-    }
-
-    @Test
-    public void bug48968() throws Exception {
-        TimeZone userTimeZone = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
-        try {
-           HSSFWorkbook wb = openSample("48968.xls");
-           assertEquals(1, wb.getNumberOfSheets());
-    
-           DataFormatter fmt = new DataFormatter();
-    
-           // Check the dates
-           HSSFSheet s = wb.getSheetAt(0);
-           Cell cell_d20110325 = s.getRow(0).getCell(0);
-           Cell cell_d19000102 = s.getRow(11).getCell(0);
-           Cell cell_d19000100 = s.getRow(21).getCell(0);
-           assertEquals(s.getRow(0).getCell(3).getStringCellValue(), fmt.formatCellValue(cell_d20110325));
-           assertEquals(s.getRow(11).getCell(3).getStringCellValue(), fmt.formatCellValue(cell_d19000102));
-           // There is no such thing as 00/01/1900...
-           assertEquals("00/01/1900 06:14:24", s.getRow(21).getCell(3).getStringCellValue());
-           assertEquals("31/12/1899 06:14:24", fmt.formatCellValue(cell_d19000100));
-    
-           // Check the cached values
-           assertEquals("HOUR(A1)",   s.getRow(5).getCell(0).getCellFormula());
-           assertEquals(11.0,         s.getRow(5).getCell(0).getNumericCellValue(), 0);
-           assertEquals("MINUTE(A1)", s.getRow(6).getCell(0).getCellFormula());
-           assertEquals(39.0,         s.getRow(6).getCell(0).getNumericCellValue(), 0);
-           assertEquals("SECOND(A1)", s.getRow(7).getCell(0).getCellFormula());
-           assertEquals(54.0,         s.getRow(7).getCell(0).getNumericCellValue(), 0);
-    
-           // Re-evaluate and check
-           HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-           assertEquals("HOUR(A1)",   s.getRow(5).getCell(0).getCellFormula());
-           assertEquals(11.0,         s.getRow(5).getCell(0).getNumericCellValue(), 0);
-           assertEquals("MINUTE(A1)", s.getRow(6).getCell(0).getCellFormula());
-           assertEquals(39.0,         s.getRow(6).getCell(0).getNumericCellValue(), 0);
-           assertEquals("SECOND(A1)", s.getRow(7).getCell(0).getCellFormula());
-           assertEquals(54.0,         s.getRow(7).getCell(0).getNumericCellValue(), 0);
-    
-           // Push the time forward a bit and check
-           double date = s.getRow(0).getCell(0).getNumericCellValue();
-           s.getRow(0).getCell(0).setCellValue(date + 1.26);
-    
-           HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-           assertEquals("HOUR(A1)",   s.getRow(5).getCell(0).getCellFormula());
-           assertEquals(11.0+6.0,     s.getRow(5).getCell(0).getNumericCellValue(), 0);
-           assertEquals("MINUTE(A1)", s.getRow(6).getCell(0).getCellFormula());
-           assertEquals(39.0+14.0+1,  s.getRow(6).getCell(0).getNumericCellValue(), 0);
-           assertEquals("SECOND(A1)", s.getRow(7).getCell(0).getCellFormula());
-           assertEquals(54.0+24.0-60, s.getRow(7).getCell(0).getNumericCellValue(), 0);
-           
-           wb.close();
-        } finally {
-            LocaleUtil.setUserTimeZone(userTimeZone);
-        }
-    }
-       
-
-    /**
-     * Mixture of Ascii and Unicode strings in a
-     *  NameComment record
-     */
-    @Test
-    public void bug51143() throws Exception {
-       HSSFWorkbook wb1 = openSample("51143.xls");
-       assertEquals(1, wb1.getNumberOfSheets());
-       HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-       wb1.close();
-       assertEquals(1, wb2.getNumberOfSheets());
-       wb2.close();
-    }
-
-    /**
-     * File with exactly 256 data blocks (+header block)
-     *  shouldn't break on POIFS loading
-     */
-    @SuppressWarnings("resource")
-    @Test
-    public void bug51461() throws Exception {
-       byte[] data = HSSFITestDataProvider.instance.getTestDataFileContent("51461.xls");
-
-       HSSFWorkbook wbPOIFS = new HSSFWorkbook(new POIFSFileSystem(
-             new ByteArrayInputStream(data)).getRoot(), false);
-       HSSFWorkbook wbNPOIFS = new HSSFWorkbook(new NPOIFSFileSystem(
-             new ByteArrayInputStream(data)).getRoot(), false);
-
-       assertEquals(2, wbPOIFS.getNumberOfSheets());
-       assertEquals(2, wbNPOIFS.getNumberOfSheets());
-    }
-
-    /**
-     * Large row numbers and NPOIFS vs POIFS
-     */
-    @SuppressWarnings("resource")
-    @Test
-    public void bug51535() throws Exception {
-       byte[] data = HSSFITestDataProvider.instance.getTestDataFileContent("51535.xls");
-
-       HSSFWorkbook wbPOIFS = new HSSFWorkbook(new POIFSFileSystem(
-             new ByteArrayInputStream(data)).getRoot(), false);
-       HSSFWorkbook wbNPOIFS = new HSSFWorkbook(new NPOIFSFileSystem(
-             new ByteArrayInputStream(data)).getRoot(), false);
-
-       for(HSSFWorkbook wb : new HSSFWorkbook[] {wbPOIFS, wbNPOIFS}) {
-          assertEquals(3, wb.getNumberOfSheets());
-
-          // Check directly
-          HSSFSheet s = wb.getSheetAt(0);
-          assertEquals("Top Left Cell", s.getRow(0).getCell(0).getStringCellValue());
-          assertEquals("Top Right Cell", s.getRow(0).getCell(255).getStringCellValue());
-          assertEquals("Bottom Left Cell", s.getRow(65535).getCell(0).getStringCellValue());
-          assertEquals("Bottom Right Cell", s.getRow(65535).getCell(255).getStringCellValue());
-
-          // Extract and check
-          ExcelExtractor ex = new ExcelExtractor(wb);
-          String text = ex.getText();
-          assertTrue(text.contains("Top Left Cell"));
-          assertTrue(text.contains("Top Right Cell"));
-          assertTrue(text.contains("Bottom Left Cell"));
-          assertTrue(text.contains("Bottom Right Cell"));
-          ex.close();
-       }
-    }
-
-    @Test
-    public void bug51670() throws Exception {
-        HSSFWorkbook wb = openSample("51670.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /**
-     * Sum across multiple workbooks
-     *  eg =SUM($Sheet2.A1:$Sheet3.A1)
-     */
-    @Test
-    public void test48703() throws Exception {
-        HSSFWorkbook wb = openSample("48703.xls");
-        assertEquals(3, wb.getNumberOfSheets());
-
-        // Check reading the formula
-        Sheet sheet = wb.getSheetAt(0);
-        Row r = sheet.getRow(0);
-        Cell c = r.getCell(0);
-
-        assertEquals("SUM(Sheet2:Sheet3!A1)", c.getCellFormula());
-        assertEquals(4.0, c.getNumericCellValue(), 0);
-
-        // Check the evaluated result
-        HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb);
-        eval.evaluateFormulaCellEnum(c);
-        assertEquals(4.0, c.getNumericCellValue(), 0);
-        wb.close();
-    }
-
-    /**
-     * Normally encrypted files have BOF then FILEPASS, but
-     *  some may squeeze a WRITEPROTECT in the middle
-     */
-    @Test(expected=EncryptedDocumentException.class)
-    public void bug51832() {
-        openSample("51832.xls");
-    }
-
-    @Test
-    public void bug49896() throws Exception {
-        HSSFWorkbook wb = openSample("49896.xls");
-        HSSFCell  cell = wb.getSheetAt(0).getRow(1).getCell(1);
-        String PATH_SEPARATOR = System.getProperty("file.separator");
-        assertEquals("VLOOKUP(A2,'[C:Documents and Settings" + PATH_SEPARATOR+"Yegor"+PATH_SEPARATOR
-                +"My Documents"+PATH_SEPARATOR+"csco.xls]Sheet1'!$A$2:$B$3,2,FALSE)",
-                cell.getCellFormula());
-        wb.close();
-     }
-
-    @Test
-    public void bug49529() throws Exception {
-        // user code reported in Bugzilla #49529
-        HSSFWorkbook wb = openSample("49529.xls");
-        wb.getSheetAt(0).createDrawingPatriarch();
-        // prior to the fix the line below failed with
-        // java.lang.IllegalStateException: EOF - next record not available
-        wb.cloneSheet(0);
-
-        // make sure we are still readable
-        writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    /**
-     * Note - part of this test is still failing, see
-     * {@link TestUnfixedBugs#test49612()}
-     */
-    @Test
-    public void bug49612_part() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49612.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        HSSFRow row = sh.getRow(0);
-        HSSFCell c1 = row.getCell(2);
-        HSSFCell d1 = row.getCell(3);
-        HSSFCell e1 = row.getCell(2);
-
-        assertEquals("SUM(BOB+JIM)", c1.getCellFormula());
-
-        // Problem 1: See TestUnfixedBugs#test49612()
-        // Problem 2: TestUnfixedBugs#test49612()
-
-        // Problem 3: These used to fail, now pass
-        HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb);
-        assertEquals("evaluating c1", 30.0, eval.evaluate(c1).getNumberValue(), 0.001);
-        assertEquals("evaluating d1", 30.0, eval.evaluate(d1).getNumberValue(), 0.001);
-        assertEquals("evaluating e1", 30.0, eval.evaluate(e1).getNumberValue(), 0.001);
-        wb.close();
-    }
-
-    @Test
-    public void bug51675() throws Exception {
-        final List<Short> list = new ArrayList<Short>();
-        HSSFWorkbook wb = openSample("51675.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
-        PageSettingsBlock psb = (PageSettingsBlock) ish.getRecords().get(13);
-        psb.visitContainedRecords(new RecordAggregate.RecordVisitor() {
-            @Override
-            public void visitRecord(Record r) {
-                list.add(r.getSid());
-            }
-        });
-        assertTrue(list.get(list.size()-1).intValue() == UnknownRecord.BITMAP_00E9);
-        assertTrue(list.get(list.size()-2).intValue() == UnknownRecord.HEADER_FOOTER_089C);
-        wb.close();
-    }
-
-    @Test
-    public void bug52272() throws IOException{
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch p = sh.createDrawingPatriarch();
-
-        HSSFSimpleShape s = p.createSimpleShape(new HSSFClientAnchor());
-        s.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
-
-        HSSFSheet sh2 = wb.cloneSheet(0);
-        assertNotNull(sh2.getDrawingPatriarch());
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug53432() throws IOException{
-        Workbook wb1 = new HSSFWorkbook(); //or new HSSFWorkbook();
-        wb1.addPicture(new byte[]{123,22}, Workbook.PICTURE_TYPE_JPEG);
-        assertEquals(wb1.getAllPictures().size(), 1);
-        wb1.close();
-
-        wb1.close();
-        wb1 = new HSSFWorkbook();
-
-        Workbook wb2 = writeOutAndReadBack((HSSFWorkbook) wb1);
-        wb1.close();
-        assertEquals(wb2.getAllPictures().size(), 0);
-        wb2.addPicture(new byte[]{123,22}, Workbook.PICTURE_TYPE_JPEG);
-        assertEquals(wb2.getAllPictures().size(), 1);
-
-        Workbook wb3 = writeOutAndReadBack((HSSFWorkbook) wb2);
-        wb2.close();
-        assertEquals(wb3.getAllPictures().size(), 1);
-        
-        wb3.close();
-    }
-
-    @Test
-    public void bug46250() throws Exception {
-        HSSFWorkbook wb = openSample("46250.xls");
-        Sheet sh = wb.getSheet("Template");
-        Sheet cSh = wb.cloneSheet(wb.getSheetIndex(sh));
-
-        HSSFPatriarch patriarch = (HSSFPatriarch) cSh.createDrawingPatriarch();
-        HSSFTextbox tb = (HSSFTextbox) patriarch.getChildren().get(2);
-
-        tb.setString(new HSSFRichTextString("POI test"));
-        tb.setAnchor(new HSSFClientAnchor(0,0,0,0,(short)0,0,(short)10,10));
-
-        writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug53404() throws Exception {
-        HSSFWorkbook wb = openSample("53404.xls");
-        Sheet sheet = wb.getSheet("test-sheet");
-        int rowCount = sheet.getLastRowNum() + 1;
-        int newRows = 5;
-        Calendar cal = LocaleUtil.getLocaleCalendar(); 
-        for (int r = rowCount; r < rowCount + newRows; r++) {
-            Row row = sheet.createRow((short) r);
-            row.createCell(0).setCellValue(1.03 * (r + 7));
-            row.createCell(1).setCellValue(cal.getTime());
-            row.createCell(2).setCellValue(cal);
-            row.createCell(3).setCellValue(String.format(Locale.ROOT, "row:%d/col:%d", r, 3));
-            row.createCell(4).setCellValue(true);
-            row.createCell(5).setCellType(CellType.ERROR);
-            row.createCell(6).setCellValue("added cells.");
-        }
-
-        writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug54016() throws Exception {
-        // This used to break
-        HSSFWorkbook wb = openSample("54016.xls");
-        writeOutAndReadBack(wb).close();
-        wb.close();
-    }
-
-    /** Row style information is 12 not 16 bits */
-    @Test
-    public void bug49237() throws Exception {
-        Workbook wb = openSample("49237.xls");
-        Sheet sheet = wb.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        CellStyle rstyle = row.getRowStyle();
-        assertNotNull(rstyle);
-        assertEquals(BorderStyle.DOUBLE, rstyle.getBorderBottomEnum());
-        wb.close();
-    }
-
-    /** POI doesn't currently support the RC4 CryptoAPI encryption header structure */
-    @Test(expected=EncryptedDocumentException.class)
-    public void bug35897() throws Exception {
-        // password is abc
-        try {
-            Biff8EncryptionKey.setCurrentUserPassword("abc");
-            openSample("xor-encryption-abc.xls").close();
-        } finally {
-            Biff8EncryptionKey.setCurrentUserPassword(null);
-        }
-
-        // One using the only-recently-documented encryption header type 4,
-        //  and the RC4 CryptoAPI encryption header structure
-        openSample("35897-type4.xls").close();
-    }
-
-    @Test
-    public void bug56450() throws Exception {
-        HSSFWorkbook wb = openSample("56450.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-        int comments = 0;
-        for (Row r : sheet) {
-            for (Cell c : r) {
-                if (c.getCellComment() != null) {
-                    assertNotNull(c.getCellComment().getString().getString());
-                    comments++;
-                }
-            }
-        }
-        assertEquals(0, comments);
-        wb.close();
-    }
-
-    /**
-     * Files initially created with Excel 2010 can have >3 CF rules
-     */
-    @Test
-    public void bug56482() throws Exception {
-        HSSFWorkbook wb = openSample("56482.xls");
-        assertEquals(1, wb.getNumberOfSheets());
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFSheetConditionalFormatting cf = sheet.getSheetConditionalFormatting();
-
-        assertEquals(5, cf.getNumConditionalFormattings());
-        wb.close();
-    }
-
-    @Test
-    public void bug56325() throws IOException {
-        HSSFWorkbook wb1;
-        POIFSFileSystem fs;
-
-        File file = HSSFTestDataSamples.getSampleFile("56325.xls");
-        InputStream stream = new FileInputStream(file);
-        try {
-            fs = new POIFSFileSystem(stream);
-            wb1 = new HSSFWorkbook(fs);
-        } finally {
-            stream.close();
-        }
-
-        assertEquals(3, wb1.getNumberOfSheets());
-        wb1.removeSheetAt(0);
-        assertEquals(2, wb1.getNumberOfSheets());
-
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        wb1.close();
-        fs.close();
-        assertEquals(2, wb2.getNumberOfSheets());
-        wb2.removeSheetAt(0);
-        assertEquals(1, wb2.getNumberOfSheets());
-        wb2.removeSheetAt(0);
-        assertEquals(0, wb2.getNumberOfSheets());
-
-        HSSFWorkbook wb3 = writeOutAndReadBack(wb2);
-        wb2.close();
-        
-        assertEquals(0, wb3.getNumberOfSheets());
-        wb3.close();
-    }
-
-    @Test
-    public void bug56325a() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("56325a.xls");
-
-        HSSFSheet sheet = wb1.cloneSheet(2);
-        wb1.setSheetName(3, "Clone 1");
-        sheet.setRepeatingRows(CellRangeAddress.valueOf("2:3"));
-        wb1.setPrintArea(3, "$A$4:$C$10");
-
-        sheet = wb1.cloneSheet(2);
-        wb1.setSheetName(4, "Clone 2");
-        sheet.setRepeatingRows(CellRangeAddress.valueOf("2:3"));
-        wb1.setPrintArea(4, "$A$4:$C$10");
-
-        wb1.removeSheetAt(2);
-
-        Workbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        assertEquals(4, wb2.getNumberOfSheets());
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Formulas which reference named ranges, either in other
-     *  sheets, or workbook scoped but in other workbooks.
-     * Used to fail with
-     * java.lang.RuntimeException: Unexpected eval class (org.apache.poi.ss.formula.eval.NameXEval)
-     */
-    @Test
-    public void bug56737() throws IOException {
-        Workbook wb = openSample("56737.xls");
-
-        // Check the named range definitions
-        Name nSheetScope = wb.getName("NR_To_A1");
-        Name nWBScope = wb.getName("NR_Global_B2");
-
-        assertNotNull(nSheetScope);
-        assertNotNull(nWBScope);
-
-        assertEquals("Defines!$A$1", nSheetScope.getRefersToFormula());
-        assertEquals("Defines!$B$2", nWBScope.getRefersToFormula());
-
-        // Check the different kinds of formulas
-        Sheet s = wb.getSheetAt(0);
-        Cell cRefSName = s.getRow(1).getCell(3);
-        Cell cRefWName = s.getRow(2).getCell(3);
-
-        assertEquals("Defines!NR_To_A1", cRefSName.getCellFormula());
-
-        // TODO Correct this, so that the filename is shown too, see bug #56742
-        // This is what Excel itself shows
-        //assertEquals("'56737.xls'!NR_Global_B2", cRefWName.getCellFormula());
-        // TODO This isn't right, but it's what we currently generate....
-        assertEquals("NR_Global_B2", cRefWName.getCellFormula());
-
-        // Try to evaluate them
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals("Test A1", eval.evaluate(cRefSName).getStringValue());
-        assertEquals(142, (int)eval.evaluate(cRefWName).getNumberValue());
-
-        // Try to evaluate everything
-        eval.evaluateAll();
-        wb.close();
-    }
-
-    /**
-     * ClassCastException in HSSFOptimiser - StyleRecord cannot be cast to
-     * ExtendedFormatRecord when removing un-used styles
-     */
-    @Test
-    public void bug54443() throws Exception {
-        HSSFWorkbook workbook = new HSSFWorkbook( );
-        HSSFCellStyle style = workbook.createCellStyle();
-        HSSFCellStyle newStyle = workbook.createCellStyle();
-
-        HSSFSheet mySheet = workbook.createSheet();
-        HSSFRow row = mySheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-
-        // Use style
-        cell.setCellStyle(style);
-        // Switch to newStyle, style is now un-used
-        cell.setCellStyle(newStyle);
-
-        // Optimize
-        HSSFOptimiser.optimiseCellStyles(workbook);
-        workbook.close();
-    }
-
-    /**
-     * Intersection formula ranges, eg =(C2:D3 D3:E4)
-     */
-    @Test
-    public void bug52111() throws Exception {
-        Workbook wb = openSample("Intersection-52111.xls");
-        Sheet s = wb.getSheetAt(0);
-        assertFormula(wb, s.getRow(2).getCell(0), "(C2:D3 D3:E4)", "4.0");
-        assertFormula(wb, s.getRow(6).getCell(0), "Tabelle2!E:E Tabelle2!$A11:$IV11", "5.0");
-        assertFormula(wb, s.getRow(8).getCell(0), "Tabelle2!E:F Tabelle2!$A11:$IV12", null);
-        wb.close();
-    }
-    
-    private void assertFormula(Workbook wb, Cell intF, String expectedFormula, String expectedResultOrNull) {
-        assertEquals(CellType.FORMULA, intF.getCellTypeEnum());
-        if (null == expectedResultOrNull) {
-            assertEquals(CellType.ERROR, intF.getCachedFormulaResultTypeEnum());
-            expectedResultOrNull = "#VALUE!";
-        }
-        else {
-            assertEquals(CellType.NUMERIC, intF.getCachedFormulaResultTypeEnum());
-        }
-        
-        assertEquals(expectedFormula, intF.getCellFormula());
-
-        // Check we can evaluate it correctly
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals(expectedResultOrNull, eval.evaluate(intF).formatAsString());
-    }
-
-    @Test
-    public void bug42016() throws Exception {
-        Workbook wb = openSample("42016.xls");
-        Sheet s = wb.getSheetAt(0);
-        for(int row = 0;row < 7;row++) {
-            assertEquals("A$1+B$1", s.getRow(row).getCell(2).getCellFormula());
-        }
-        wb.close();
-    }
-
-    /**
-     * Unexpected record type (org.apache.poi.hssf.record.ColumnInfoRecord)
-     */
-    @Test
-    public void bug53984() throws Exception {
-        Workbook wb = openSample("53984.xls");
-        Sheet s = wb.getSheetAt(0);
-        assertEquals("International Communication Services SA", s.getRow(2).getCell(0).getStringCellValue());
-        assertEquals("Saudi Arabia-Riyadh", s.getRow(210).getCell(0).getStringCellValue());
-        wb.close();
-    }
-
-    /**
-     * Read, write, read for formulas point to cells in other files.
-     * See {@link #bug46670()} for the main test, this just
-     *  covers reading an existing file and checking it.
-     * TODO Fix this so that it works - formulas are ending up as
-     *  #REF when being changed
-     */
-    @Test
-    @Ignore
-    public void bug46670_existing() throws Exception {
-        Sheet s;
-        Cell c;
-
-        // Expected values
-        String refLocal = "'[refs/airport.xls]Sheet1'!$A$2";
-        String refHttp  = "'[9http://www.principlesofeconometrics.com/excel/airline.xls]Sheet1'!$A$2";
-
-        // Check we can read them correctly
-        HSSFWorkbook wb1 = openSample("46670_local.xls");
-        s = wb1.getSheetAt(0);
-        assertEquals(refLocal, s.getRow(0).getCell(0).getCellFormula());
-        wb1.close();
-
-        HSSFWorkbook wb2 = openSample("46670_http.xls");
-        s = wb2.getSheetAt(0);
-        assertEquals(refHttp, s.getRow(0).getCell(0).getCellFormula());
-        wb2.close();
-
-        // Now try to set them to the same values, and ensure that
-        //  they end up as they did before, even with a save and re-load
-        HSSFWorkbook wb3 = openSample("46670_local.xls");
-        s = wb3.getSheetAt(0);
-        c = s.getRow(0).getCell(0);
-        c.setCellFormula(refLocal);
-        assertEquals(refLocal, c.getCellFormula());
-
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-        s = wb4.getSheetAt(0);
-        assertEquals(refLocal, s.getRow(0).getCell(0).getCellFormula());
-        wb4.close();
-
-        HSSFWorkbook wb5 = openSample("46670_http.xls");
-        s = wb5.getSheetAt(0);
-        c = s.getRow(0).getCell(0);
-        c.setCellFormula(refHttp);
-        assertEquals(refHttp, c.getCellFormula());
-
-        HSSFWorkbook wb6 = HSSFTestDataSamples.writeOutAndReadBack(wb5);
-        wb5.close();
-        s = wb6.getSheetAt(0);
-        assertEquals(refHttp, s.getRow(0).getCell(0).getCellFormula());
-        wb6.close();
-    }
-
-    @Test
-    public void test57456() throws IOException {
-        Workbook wb = openSample("57456.xls");
-        wb.close();
-    }
-
-    @Test
-    public void test57163() throws IOException {
-        Workbook wb = openSample("57163.xls");
-
-        while (wb.getNumberOfSheets() > 1) {
-            wb.removeSheetAt(1);
-        }
-        wb.close();
-    }
-
-    @Test
-    public void test53109() throws IOException {
-        HSSFWorkbook wb1 = openSample("53109.xls");
-        
-        HSSFWorkbook wb2 = writeOutAndReadBack(wb1);
-        assertNotNull(wb2);
-        wb2.close();
-        
-        wb1.close();
-    }
-    
-    @Test
-    public void test53109a() throws IOException {
-        HSSFWorkbook wb1 = openSample("com.aida-tour.www_SPO_files_maldives%20august%20october.xls");
-        
-        Workbook wb2 = writeOutAndReadBack(wb1);
-        assertNotNull(wb2);
-        wb2.close();
-        
-        wb1.close();
-    }
-    
-    @Test
-    public void test48043() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("56325a.xls");
-        
-        wb.removeSheetAt(2);
-        wb.removeSheetAt(1);
-        
-        //Sheet s = wb.createSheet("sheetname");
-        Sheet s = wb.getSheetAt(0);
-        Row row = s.createRow(0);
-        Cell cell = row.createCell(0);
-
-        cell.setCellFormula(
-                "IF(AND(ISBLANK(A10)," +
-                "ISBLANK(B10)),\"\"," + 
-                "CONCATENATE(A10,\"-\",B10))");
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        
-        eval.evaluateAll();
-        
-        /*OutputStream out = new FileOutputStream("C:\\temp\\48043.xls");
-        try {
-          wb.write(out);
-        } finally {
-          out.close();
-        }*/
-        
-        Workbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        assertNotNull(wbBack);
-        wbBack.close();
-
-        wb.close();
-    }
-    
-    @Test
-    public void test57925() throws IOException {
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("57925.xls");
-        
-        wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-        
-        for(int i = 0;i < wb.getNumberOfSheets();i++) {
-            Sheet sheet = wb.getSheetAt(i);
-            for(Row row : sheet) {
-                for(Cell cell : row) {
-                    new DataFormatter().formatCellValue(cell);
-                }
-            }
-        }
-        
-        wb.close();
-    }
-    
-    @Test
-    public void test46515() throws IOException {
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("46515.xls");
-
-        // Get structure from webservice
-        String urlString = "http://poi.apache.org/resources/images/project-logo.jpg";
-        URL structURL = new URL(urlString);
-        BufferedImage bimage;
-        try {
-            bimage = ImageIO.read(structURL);
-        } catch (IOException e) {
-            Assume.assumeNoException("Downloading a jpg from poi.apache.org should work", e);
-            return;
-        } finally {
-            wb.close();
-        }
-
-        // Convert BufferedImage to byte[]
-        ByteArrayOutputStream imageBAOS = new ByteArrayOutputStream();
-        ImageIO.write(bimage, "jpeg", imageBAOS);
-        imageBAOS.flush();
-        byte[]imageBytes = imageBAOS.toByteArray();
-        imageBAOS.close();
-
-        // Pop structure into Structure HSSFSheet
-        int pict = wb.addPicture(imageBytes, HSSFWorkbook.PICTURE_TYPE_JPEG);
-        Sheet sheet = wb.getSheet("Structure");
-        assertNotNull("Did not find sheet", sheet);
-        HSSFPatriarch patriarch = (HSSFPatriarch) sheet.createDrawingPatriarch();
-        HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 1, 1, (short) 10, 22);
-        anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE);
-        patriarch.createPicture(anchor, pict);
-
-        // Write out destination file
-//        FileOutputStream fileOut = new FileOutputStream("/tmp/46515.xls");
-//        wb.write(fileOut);
-//        fileOut.close();
-
-        wb.close();
-    }
-
-    @Test
-    public void test55668() throws IOException {
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("55668.xls");
-
-        Sheet sheet = wb.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell(0);
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("IF(TRUE,\"\",\"\")", cell.getCellFormula());
-        assertEquals("", cell.getStringCellValue());
-        cell.setCellType(CellType.STRING);
-
-        assertEquals(CellType.BLANK, cell.getCellTypeEnum());
-        try {
-            assertNull(cell.getCellFormula());
-            fail("Should throw an exception here");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-        assertEquals("", cell.getStringCellValue());
-
-        wb.close();
-    }
-
-    @Test
-    public void test55982() throws IOException {
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("55982.xls");
-        Sheet newSheet = wb.cloneSheet(1);
-        assertNotNull(newSheet);
-        wb.close();
-    }
-
-    /**
-     * Test generator of ids for the CommonObjectDataSubRecord record.
-     */
-    @Test
-    public void test51332() {
-        HSSFClientAnchor anchor = new HSSFClientAnchor();
-        HSSFSimpleShape shape;
-        CommonObjectDataSubRecord cmo;
-        
-        shape = new HSSFTextbox(null, anchor);
-        shape.setShapeId(1025);
-        cmo = (CommonObjectDataSubRecord)shape.getObjRecord().getSubRecords().get(0);
-        assertEquals(1, cmo.getObjectId());
-
-        shape = new HSSFPicture(null, anchor);
-        shape.setShapeId(1026);
-        cmo = (CommonObjectDataSubRecord)shape.getObjRecord().getSubRecords().get(0);
-        assertEquals(2, cmo.getObjectId());
-
-        shape = new HSSFComment(null, anchor);
-        shape.setShapeId(1027);
-        cmo = (CommonObjectDataSubRecord)shape.getObjRecord().getSubRecords().get(0);
-        assertEquals(1027, cmo.getObjectId());
-    }
-    
-    // As of POI 3.15 beta 2, LibreOffice does not display the diagonal border while it does display the bottom border
-    // I have not checked Excel to know if this is a LibreOffice or a POI problem.
-    @Test
-    public void test53564() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Page 1");
-        final short BLUE = 30;
-        
-        HSSFSheetConditionalFormatting scf = sheet.getSheetConditionalFormatting();
-        HSSFConditionalFormattingRule rule = scf.createConditionalFormattingRule(ComparisonOperator.GT, "10");
-        
-        HSSFBorderFormatting bord = rule.createBorderFormatting();
-        bord.setBorderDiagonal(BorderStyle.THICK);
-        assertEquals(BorderStyle.THICK, bord.getBorderDiagonalEnum());
-
-        bord.setBackwardDiagonalOn(true);
-        assertTrue(bord.isBackwardDiagonalOn());
-
-        bord.setForwardDiagonalOn(true);
-        assertTrue(bord.isForwardDiagonalOn());
-        
-        bord.setDiagonalBorderColor(BLUE);
-        assertEquals(BLUE, bord.getDiagonalBorderColor());
-
-        // Create the bottom border style so we know what a border is supposed to look like
-        bord.setBorderBottom(BorderStyle.THICK);
-        assertEquals(BorderStyle.THICK, bord.getBorderBottomEnum());
-        bord.setBottomBorderColor(BLUE);
-        assertEquals(BLUE, bord.getBottomBorderColor());
-        
-        CellRangeAddress[] A2_D4 = {new CellRangeAddress(1, 3, 0, 3)};
-        scf.addConditionalFormatting(A2_D4, rule);
-        
-        // Set a cell value within the conditional formatting range whose rule would resolve to True.
-        Cell C3 = sheet.createRow(2).createCell(2);
-        C3.setCellValue(30.0);
-        
-        // Manually check the output file with Excel to see if the diagonal border is present
-        //OutputStream fos = new FileOutputStream("/tmp/53564.xls");
-        //wb.write(fos);
-        //fos.close();
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
deleted file mode 100644
index f02b950..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.TempFile;
-import org.junit.Test;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test cell styling functionality
- */
-
-public final class TestCellStyle extends TestCase {
-
-    private static HSSFWorkbook openSample(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleWorkbook(sampleFileName);
-    }
-
-
-    /**
-     * TEST NAME:  Test Write Sheet Font <P>
-     * OBJECTIVE:  Test that HSSF can create a simple spreadsheet with numeric and string values and styled with fonts.<P>
-     * SUCCESS:    HSSF creates a sheet.  Filesize matches a known good.  HSSFSheet objects
-     *             Last row, first row is tested against the correct values (99,0).<P>
-     * FAILURE:    HSSF does not create a sheet or excepts.  Filesize does not match the known good.
-     *             HSSFSheet last row or first row is incorrect.             <P>
-     *
-     */
-    public void testWriteSheetFont() throws IOException{
-        File             file = TempFile.createTempFile("testWriteSheetFont",
-                                                    ".xls");
-        FileOutputStream out  = new FileOutputStream(file);
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFSheet        s    = wb.createSheet();
-        HSSFRow          r    = null;
-        HSSFCell         c    = null;
-        HSSFFont         fnt  = wb.createFont();
-        HSSFCellStyle    cs   = wb.createCellStyle();
-
-        fnt.setColor(HSSFFont.COLOR_RED);
-        fnt.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-        cs.setFont(fnt);
-        for (int rownum = 0; rownum < 100; rownum++) {
-            r = s.createRow(rownum);
-
-            for (int cellnum = 0; cellnum < 50; cellnum += 2) {
-                c = r.createCell(cellnum);
-                c.setCellValue(rownum * 10000 + cellnum
-                               + ((( double ) rownum / 1000)
-                                  + (( double ) cellnum / 10000)));
-                c = r.createCell(cellnum + 1);
-                c.setCellValue("TEST");
-                c.setCellStyle(cs);
-            }
-        }
-        wb.write(out);
-        out.close();
-        SanityChecker sanityChecker = new SanityChecker();
-        sanityChecker.checkHSSFWorkbook(wb);
-        assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
-        assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
-
-        // assert((s.getLastRowNum() == 99));
-    }
-
-    /**
-     * Tests that is creating a file with a date or an calendar works correctly.
-     */
-    public void testDataStyle() throws IOException {
-        File             file = TempFile.createTempFile("testWriteSheetStyleDate",
-                                                    ".xls");
-        FileOutputStream out  = new FileOutputStream(file);
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFSheet        s    = wb.createSheet();
-        HSSFCellStyle    cs   = wb.createCellStyle();
-        HSSFRow row = s.createRow(0);
-
-        // with Date:
-        HSSFCell cell = row.createCell(1);
-        cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
-        cell.setCellStyle(cs);
-        cell.setCellValue(new Date());
-
-        // with Calendar:
-        cell = row.createCell(2);
-        cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
-        cell.setCellStyle(cs);
-        Calendar cal = LocaleUtil.getLocaleCalendar();
-        cell.setCellValue(cal);
-
-        wb.write(out);
-        out.close();
-        SanityChecker sanityChecker = new SanityChecker();
-        sanityChecker.checkHSSFWorkbook(wb);
-
-        assertEquals("LAST ROW ", 0, s.getLastRowNum());
-        assertEquals("FIRST ROW ", 0, s.getFirstRowNum());
-    }
-    
-    public void testHashEquals() throws IOException {
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFSheet        s    = wb.createSheet();
-        HSSFCellStyle    cs1  = wb.createCellStyle();
-        HSSFCellStyle    cs2  = wb.createCellStyle();
-        HSSFRow row = s.createRow(0);
-        HSSFCell cell1 = row.createCell(1);
-        HSSFCell cell2 = row.createCell(2);
-        
-        cs1.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
-        cs2.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/dd/yy"));
-        
-        cell1.setCellStyle(cs1);
-        cell1.setCellValue(new Date());
-        
-        cell2.setCellStyle(cs2);
-        cell2.setCellValue(new Date());
-        
-        assertEquals(cs1.hashCode(), cs1.hashCode());
-        assertEquals(cs2.hashCode(), cs2.hashCode());
-        assertTrue(cs1.equals(cs1));
-        assertTrue(cs2.equals(cs2));
-        
-        // Change cs1, hash will alter
-        int hash1 = cs1.hashCode();
-        cs1.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/dd/yy"));
-        assertFalse(hash1 == cs1.hashCode());
-        
-        wb.close();
-    }
-
-    /**
-     * TEST NAME:  Test Write Sheet Style <P>
-     * OBJECTIVE:  Test that HSSF can create a simple spreadsheet with numeric and string values and styled with colors
-     *             and borders.<P>
-     * SUCCESS:    HSSF creates a sheet.  Filesize matches a known good.  HSSFSheet objects
-     *             Last row, first row is tested against the correct values (99,0).<P>
-     * FAILURE:    HSSF does not create a sheet or excepts.  Filesize does not match the known good.
-     *             HSSFSheet last row or first row is incorrect.             <P>
-     *
-     */
-    public void testWriteSheetStyle() throws IOException {
-        File             file = TempFile.createTempFile("testWriteSheetStyle",
-                                                    ".xls");
-        FileOutputStream out  = new FileOutputStream(file);
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFSheet        s    = wb.createSheet();
-        HSSFRow          r    = null;
-        HSSFCell         c    = null;
-        HSSFFont         fnt  = wb.createFont();
-        HSSFCellStyle    cs   = wb.createCellStyle();
-        HSSFCellStyle    cs2  = wb.createCellStyle();
-
-        cs.setBorderBottom(BorderStyle.THIN);
-        cs.setBorderLeft(BorderStyle.THIN);
-        cs.setBorderRight(BorderStyle.THIN);
-        cs.setBorderTop(BorderStyle.THIN);
-        cs.setFillForegroundColor(( short ) 0xA);
-        cs.setFillPattern(( short ) 1);
-        fnt.setColor(( short ) 0xf);
-        fnt.setItalic(true);
-        cs2.setFillForegroundColor(( short ) 0x0);
-        cs2.setFillPattern(( short ) 1);
-        cs2.setFont(fnt);
-        for (int rownum = 0; rownum < 100; rownum++) {
-            r = s.createRow(rownum);
-
-            for (int cellnum = 0; cellnum < 50; cellnum += 2) {
-                c = r.createCell(cellnum);
-                c.setCellValue(rownum * 10000 + cellnum
-                               + ((( double ) rownum / 1000)
-                                  + (( double ) cellnum / 10000)));
-                c.setCellStyle(cs);
-                c = r.createCell(cellnum + 1);
-                c.setCellValue("TEST");
-                c.setCellStyle(cs2);
-            }
-        }
-        wb.write(out);
-        out.close();
-        SanityChecker sanityChecker = new SanityChecker();
-        sanityChecker.checkHSSFWorkbook(wb);
-        assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
-        assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
-    }
-    
-    /**
-     * Cloning one HSSFCellStyle onto Another, same
-     *  HSSFWorkbook
-     */
-    public void testCloneStyleSameWB() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFFont fnt = wb.createFont();
-        fnt.setFontName("TestingFont");
-        assertEquals(5, wb.getNumberOfFonts());
-        
-        HSSFCellStyle orig = wb.createCellStyle();
-        orig.setAlignment(HSSFCellStyle.ALIGN_RIGHT);
-        orig.setFont(fnt);
-        orig.setDataFormat((short)18);
-        
-        assertTrue(HSSFCellStyle.ALIGN_RIGHT == orig.getAlignment());
-        assertTrue(fnt == orig.getFont(wb));
-        assertTrue(18 == orig.getDataFormat());
-        
-        HSSFCellStyle clone = wb.createCellStyle();
-        assertFalse(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
-        assertFalse(fnt == clone.getFont(wb));
-        assertFalse(18 == clone.getDataFormat());
-        
-        clone.cloneStyleFrom(orig);
-        assertTrue(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
-        assertTrue(fnt == clone.getFont(wb));
-        assertTrue(18 == clone.getDataFormat());
-        assertEquals(5, wb.getNumberOfFonts());
-    }
-    
-    /**
-     * Cloning one HSSFCellStyle onto Another, across
-     *  two different HSSFWorkbooks
-     */
-    public void testCloneStyleDiffWB() {
-        HSSFWorkbook wbOrig = new HSSFWorkbook();
-        
-        HSSFFont fnt = wbOrig.createFont();
-        fnt.setFontName("TestingFont");
-        assertEquals(5, wbOrig.getNumberOfFonts());
-        
-        HSSFDataFormat fmt = wbOrig.createDataFormat();
-        fmt.getFormat("MadeUpOne");
-        fmt.getFormat("MadeUpTwo");
-        
-        HSSFCellStyle orig = wbOrig.createCellStyle();
-        orig.setAlignment(HSSFCellStyle.ALIGN_RIGHT);
-        orig.setFont(fnt);
-        orig.setDataFormat(fmt.getFormat("Test##"));
-        
-        assertTrue(HSSFCellStyle.ALIGN_RIGHT == orig.getAlignment());
-        assertTrue(fnt == orig.getFont(wbOrig));
-        assertTrue(fmt.getFormat("Test##") == orig.getDataFormat());
-        
-        // Now a style on another workbook
-        HSSFWorkbook wbClone = new HSSFWorkbook();
-        assertEquals(4, wbClone.getNumberOfFonts());
-        HSSFDataFormat fmtClone = wbClone.createDataFormat();
-        
-        HSSFCellStyle clone = wbClone.createCellStyle();
-        assertEquals(4, wbClone.getNumberOfFonts());
-        
-        assertFalse(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
-        assertFalse("TestingFont" == clone.getFont(wbClone).getFontName());
-        
-        clone.cloneStyleFrom(orig);
-        assertTrue(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
-        assertTrue("TestingFont" == clone.getFont(wbClone).getFontName());
-        assertTrue(fmtClone.getFormat("Test##") == clone.getDataFormat());
-        assertFalse(fmtClone.getFormat("Test##") == fmt.getFormat("Test##"));
-        assertEquals(5, wbClone.getNumberOfFonts());
-    }
-    
-    public void testStyleNames() {
-        HSSFWorkbook wb = openSample("WithExtendedStyles.xls");
-        HSSFSheet s = wb.getSheetAt(0);
-        HSSFCell c1 = s.getRow(0).getCell(0);
-        HSSFCell c2 = s.getRow(1).getCell(0);
-        HSSFCell c3 = s.getRow(2).getCell(0);
-        
-        HSSFCellStyle cs1 = c1.getCellStyle();
-        HSSFCellStyle cs2 = c2.getCellStyle();
-        HSSFCellStyle cs3 = c3.getCellStyle();
-        
-        assertNotNull(cs1);
-        assertNotNull(cs2);
-        assertNotNull(cs3);
-        
-        // Check we got the styles we'd expect
-        assertEquals(10, cs1.getFont(wb).getFontHeightInPoints());
-        assertEquals(9,  cs2.getFont(wb).getFontHeightInPoints());
-        assertEquals(12, cs3.getFont(wb).getFontHeightInPoints());
-        
-        assertEquals(15, cs1.getIndex());
-        assertEquals(23, cs2.getIndex());
-        assertEquals(24, cs3.getIndex());
-        
-        assertNull(cs1.getParentStyle());
-        assertNotNull(cs2.getParentStyle());
-        assertNotNull(cs3.getParentStyle());
-        
-        assertEquals(21, cs2.getParentStyle().getIndex());
-        assertEquals(22, cs3.getParentStyle().getIndex());
-        
-        // Now check we can get style records for 
-        //  the parent ones
-        assertNull(wb.getWorkbook().getStyleRecord(15));
-        assertNull(wb.getWorkbook().getStyleRecord(23));
-        assertNull(wb.getWorkbook().getStyleRecord(24));
-        
-        assertNotNull(wb.getWorkbook().getStyleRecord(21));
-        assertNotNull(wb.getWorkbook().getStyleRecord(22));
-        
-        // Now check the style names
-        assertEquals(null, cs1.getUserStyleName());
-        assertEquals(null, cs2.getUserStyleName());
-        assertEquals(null, cs3.getUserStyleName());
-        assertEquals("style1", cs2.getParentStyle().getUserStyleName());
-        assertEquals("style2", cs3.getParentStyle().getUserStyleName());
-
-        // now apply a named style to a new cell
-        HSSFCell c4 = s.getRow(0).createCell(1);
-        c4.setCellStyle(cs2);
-        assertEquals("style1", c4.getCellStyle().getParentStyle().getUserStyleName());
-    }
-    
-    public void testGetSetBorderHair() {
-    	HSSFWorkbook wb = openSample("55341_CellStyleBorder.xls");
-    	HSSFSheet s = wb.getSheetAt(0);
-    	HSSFCellStyle cs;
-
-    	cs = s.getRow(0).getCell(0).getCellStyle();
-    	assertEquals(BorderStyle.HAIR, cs.getBorderRightEnum());
-
-    	cs = s.getRow(1).getCell(1).getCellStyle();
-    	assertEquals(BorderStyle.DOTTED, cs.getBorderRightEnum());
-
-    	cs = s.getRow(2).getCell(2).getCellStyle();
-    	assertEquals(BorderStyle.DASH_DOT_DOT, cs.getBorderRightEnum());
-
-    	cs = s.getRow(3).getCell(3).getCellStyle();
-    	assertEquals(BorderStyle.DASHED, cs.getBorderRightEnum());
-
-    	cs = s.getRow(4).getCell(4).getCellStyle();
-    	assertEquals(BorderStyle.THIN, cs.getBorderRightEnum());
-
-    	cs = s.getRow(5).getCell(5).getCellStyle();
-    	assertEquals(BorderStyle.MEDIUM_DASH_DOT_DOT, cs.getBorderRightEnum());
-
-    	cs = s.getRow(6).getCell(6).getCellStyle();
-    	assertEquals(BorderStyle.SLANTED_DASH_DOT, cs.getBorderRightEnum());
-
-    	cs = s.getRow(7).getCell(7).getCellStyle();
-    	assertEquals(BorderStyle.MEDIUM_DASH_DOT, cs.getBorderRightEnum());
-
-    	cs = s.getRow(8).getCell(8).getCellStyle();
-    	assertEquals(BorderStyle.MEDIUM_DASHED, cs.getBorderRightEnum());
-
-    	cs = s.getRow(9).getCell(9).getCellStyle();
-    	assertEquals(BorderStyle.MEDIUM, cs.getBorderRightEnum());
-
-    	cs = s.getRow(10).getCell(10).getCellStyle();
-    	assertEquals(BorderStyle.THICK, cs.getBorderRightEnum());
-
-    	cs = s.getRow(11).getCell(11).getCellStyle();
-    	assertEquals(BorderStyle.DOUBLE, cs.getBorderRightEnum());
-    }
-
-    public void testShrinkToFit() {
-    	// Existing file
-    	HSSFWorkbook wb = openSample("ShrinkToFit.xls");
-    	HSSFSheet s = wb.getSheetAt(0);
-    	HSSFRow r = s.getRow(0);
-    	HSSFCellStyle cs = r.getCell(0).getCellStyle();
-
-    	assertEquals(true, cs.getShrinkToFit());
-
-    	// New file
-    	HSSFWorkbook wbOrig = new HSSFWorkbook();
-    	s = wbOrig.createSheet();
-    	r = s.createRow(0);
-
-    	cs = wbOrig.createCellStyle();
-    	cs.setShrinkToFit(false);
-    	r.createCell(0).setCellStyle(cs);
-
-    	cs = wbOrig.createCellStyle();
-    	cs.setShrinkToFit(true);
-    	r.createCell(1).setCellStyle(cs);
-
-    	// Write out, read, and check
-    	wb = HSSFTestDataSamples.writeOutAndReadBack(wbOrig);
-    	s = wb.getSheetAt(0);
-    	r = s.getRow(0);
-    	assertEquals(false, r.getCell(0).getCellStyle().getShrinkToFit());
-    	assertEquals(true,  r.getCell(1).getCellStyle().getShrinkToFit());
-    }
-    
-    
-    
-    private static class CellFormatBugExample extends Thread {
-        private final String fileName;
-        private Throwable exception = null;
-
-        public CellFormatBugExample(String fileName) {
-            this.fileName = fileName;
-        }
-
-        @Override
-        public void run() {
-            try {
-                for(int i = 0;i< 10;i++) {
-                    Workbook wb = HSSFTestDataSamples.openSampleWorkbook(fileName);
-                    Sheet sheet = wb.getSheetAt(0);
-        
-                    for (Row row : sheet) {
-                        for (Integer idxCell = 0; idxCell < row.getLastCellNum(); idxCell++) {
-        
-                            Cell cell = row.getCell(idxCell);
-                            cell.getCellStyle().getDataFormatString();
-                            if (cell.getCellTypeEnum() == CellType.NUMERIC) {
-                                boolean isDate = HSSFDateUtil.isCellDateFormatted(cell);
-                                if (idxCell > 0 && isDate) {
-                                    fail("cell " + idxCell + " is not a date: " + idxCell.toString());
-                                }
-                            }
-                        }
-                    }
-                }
-            } catch (Throwable e) {
-                exception = e;
-            }
-        }
-
-        public Throwable getException() {
-            return exception;
-        }
-    }
-
-    public void test56563() throws Throwable {
-        CellFormatBugExample threadA = new CellFormatBugExample("56563a.xls");
-        threadA.start();
-        CellFormatBugExample threadB = new CellFormatBugExample("56563b.xls");
-        threadB.start();
-        
-        threadA.join();
-        threadB.join();
-        
-        if(threadA.getException() != null) {
-            throw threadA.getException();
-        }
-        if(threadB.getException() != null) {
-            throw threadB.getException();
-        }
-    }
-    
-    public void test56959() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("somesheet");
-        
-        Row row = sheet.createRow(0);
-        
-        // Create a new font and alter it.
-        Font font = wb.createFont();
-        font.setFontHeightInPoints((short)24);
-        font.setFontName("Courier New");
-        font.setItalic(true);
-        font.setStrikeout(true);
-        font.setColor(Font.COLOR_RED);
-        
-        CellStyle style = wb.createCellStyle();
-        style.setBorderBottom(BorderStyle.DOTTED);
-        style.setFont(font);
-        
-        Cell cell = row.createCell(0);
-        cell.setCellStyle(style);
-        cell.setCellValue("testtext");
-        
-        Cell newCell = row.createCell(1);
-        
-        newCell.setCellStyle(style);
-        newCell.setCellValue("2testtext2");
-
-        CellStyle newStyle = newCell.getCellStyle();
-        assertEquals(BorderStyle.DOTTED, newStyle.getBorderBottomEnum());
-        assertEquals(Font.COLOR_RED, ((HSSFCellStyle)newStyle).getFont(wb).getColor());
-        
-//        OutputStream out = new FileOutputStream("/tmp/56959.xls");
-//        try {
-//            wb.write(out);
-//        } finally {
-//            out.close();
-//        }
-    }
-
-
-    @Test
-    public void test58043() throws IOException {
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFCellStyle    cellStyle   = wb.createCellStyle();
-
-        assertEquals(0, cellStyle.getRotation());
-
-        cellStyle.setRotation((short)89);
-        assertEquals(89, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)90);
-        assertEquals(90, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)-1);
-        assertEquals(-1, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)-89);
-        assertEquals(-89, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)-90);
-        assertEquals(-90, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)-89);
-        assertEquals(-89, cellStyle.getRotation());
-
-        // values above 90 are mapped to the correct values for compatibility between HSSF and XSSF
-        cellStyle.setRotation((short)179);
-        assertEquals(-89, cellStyle.getRotation());
-        
-        cellStyle.setRotation((short)180);
-        assertEquals(-90, cellStyle.getRotation());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
deleted file mode 100644
index 5bdfe62..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.ss.usermodel.BaseTestCloneSheet;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import static org.junit.Assert.*;
-
-/**
- * Test the ability to clone a sheet.
- *  If adding new records that belong to a sheet (as opposed to a book)
- *  add that record to the sheet in the testCloneSheetBasic method.
- * @author  avik
- */
-public final class TestCloneSheet extends BaseTestCloneSheet {
-    public TestCloneSheet() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void testCloneSheetWithoutDrawings(){
-        HSSFWorkbook b = new HSSFWorkbook();
-        HSSFSheet s = b.createSheet("Test");
-        HSSFSheet s2 = s.cloneSheet(b);
-        
-        assertNull(s.getDrawingPatriarch());
-        assertNull(s2.getDrawingPatriarch());
-        assertEquals(HSSFTestHelper.getSheetForTest(s).getRecords().size(), HSSFTestHelper.getSheetForTest(s2).getRecords().size());
-    }
-
-    @Test
-    public void testCloneSheetWithEmptyDrawingAggregate(){
-        HSSFWorkbook b = new HSSFWorkbook();
-        HSSFSheet s = b.createSheet("Test");
-        HSSFPatriarch patriarch = s.createDrawingPatriarch();
-
-        EscherAggregate agg1 = patriarch.getBoundAggregate();
-
-        HSSFSheet s2 = s.cloneSheet(b);
-
-        patriarch = s2.getDrawingPatriarch();
-
-        EscherAggregate agg2 = patriarch.getBoundAggregate();
-
-        EscherSpRecord sp1 = (EscherSpRecord) agg1.getEscherContainer().getChild(1).getChild(0).getChild(1);
-        EscherSpRecord sp2 = (EscherSpRecord) agg2.getEscherContainer().getChild(1).getChild(0).getChild(1);
-
-        assertEquals(sp1.getShapeId(), 1024);
-        assertEquals(sp2.getShapeId(), 2048);
-
-        EscherDgRecord dg = (EscherDgRecord) agg2.getEscherContainer().getChild(0);
-
-        assertEquals(dg.getLastMSOSPID(), 2048);
-        assertEquals(dg.getInstance(), 0x2);
-
-        //everything except id and DgRecord.lastMSOSPID and DgRecord.Instance must be the same
-
-        sp2.setShapeId(1024);
-        dg.setLastMSOSPID(1024);
-        dg.setInstance((short) 0x1);
-
-        assertEquals(agg1.serialize().length, agg2.serialize().length);
-        assertEquals(agg1.toXml(""), agg2.toXml(""));
-        assertArrayEquals(agg1.serialize(), agg2.serialize());
-    }
-
-    @Test
-    public void testCloneComment() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch p = sh.createDrawingPatriarch();
-        HSSFComment c = p.createComment(new HSSFClientAnchor(0,0,100,100, (short) 0,0,(short)5,5));
-        c.setColumn(1);
-        c.setRow(2);
-        c.setString(new HSSFRichTextString("qwertyuio"));
-        
-        HSSFSheet sh2 = wb.cloneSheet(0);
-        HSSFPatriarch p2 = sh2.getDrawingPatriarch();
-        HSSFComment c2 = (HSSFComment) p2.getChildren().get(0);
-
-        assertEquals(c.getString(), c2.getString());
-        assertEquals(c.getRow(), c2.getRow());
-        assertEquals(c.getColumn(), c2.getColumn());
-
-        // The ShapeId is not equal? 
-        // assertEquals(c.getNoteRecord().getShapeId(), c2.getNoteRecord().getShapeId());
-        
-        assertArrayEquals(c2.getTextObjectRecord().serialize(), c.getTextObjectRecord().serialize());
-        
-        // ShapeId is different
-        CommonObjectDataSubRecord subRecord = (CommonObjectDataSubRecord) c2.getObjRecord().getSubRecords().get(0);
-        subRecord.setObjectId(1025);
-
-        assertArrayEquals(c2.getObjRecord().serialize(), c.getObjRecord().serialize());
-
-        // ShapeId is different
-        c2.getNoteRecord().setShapeId(1025);
-        assertArrayEquals(c2.getNoteRecord().serialize(), c.getNoteRecord().serialize());
-
-        //everything except spRecord.shapeId must be the same
-        assertFalse(Arrays.equals(c2.getEscherContainer().serialize(), c.getEscherContainer().serialize()));
-        EscherSpRecord sp = (EscherSpRecord) c2.getEscherContainer().getChild(0);
-        sp.setShapeId(1025);
-        assertArrayEquals(c2.getEscherContainer().serialize(), c.getEscherContainer().serialize());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
deleted file mode 100644
index 3baafa8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.POITestCase.assertContains;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.junit.AfterClass;
-import org.junit.Test;
-
-public class TestCryptoAPI {
-    final HSSFITestDataProvider ssTests = HSSFITestDataProvider.instance;
-
-    @AfterClass
-    public static void resetPW() {
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-    }
-
-    @Test
-    public void bug59857() throws IOException {
-        // XOR-Obfuscation
-        // TODO: XOR-Obfuscation is currently flawed - although the de-/obfuscation initially works,
-        // it suddenly differs from the result of encrypted files via Office ...
-        // and only very small files can be opened without file validation errors
-        validateContent("xor-encryption-abc.xls", "abc", "Sheet1\n1\n2\n3\n");
-
-        // BinaryRC4
-        validateContent("password.xls", "password", "A ZIP bomb is a variant of mail-bombing. After most commercial mail servers began checking mail with anti-virus software and filtering certain malicious file types, trojan horse viruses tried to send themselves compressed into archives, such as ZIP, RAR or 7-Zip. Mail server software was then configured to unpack archives and check their contents as well. That gave black hats the idea to compose a \"bomb\" consisting of an enormous text file, containing, for example, only the letter z repeated millions of times. Such a file compresses into a relatively small archive, but its unpacking (especially by early versions of mail servers) would use a high amount of processing power, RAM and swap space, which could result in denial of service. Modern mail server computers usually have sufficient intelligence to recognize such attacks as well as sufficient processing power and memory space to process malicious attachments without interruption of service, though some are still susceptible to this technique if the ZIP bomb is mass-mailed.");
-
-        // CryptoAPI
-        validateContent("35897-type4.xls", "freedom", "Sheet1\nhello there!\n");
-    }
-    
-    private void validateContent(String wbFile, String password, String textExpected) throws IOException {
-        Biff8EncryptionKey.setCurrentUserPassword(password);
-        HSSFWorkbook wb = ssTests.openSampleWorkbook(wbFile);
-        ExcelExtractor ee1 = new ExcelExtractor(wb);
-        String textActual = ee1.getText();
-        assertContains(textActual, textExpected);
-
-        Biff8EncryptionKey.setCurrentUserPassword("bla");
-        HSSFWorkbook wbBla = ssTests.writeOutAndReadBack(wb);
-        ExcelExtractor ee2 = new ExcelExtractor(wbBla);
-        textActual = ee2.getText();
-        assertContains(textActual, textExpected);
-        ee2.close();
-        ee1.close();
-        wbBla.close();
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
deleted file mode 100644
index a440a39..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.List;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.DVRecord;
-import org.apache.poi.ss.usermodel.BaseTestDataValidation;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidation.ErrorStyle;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.junit.Test;
-
-/**
- * Class for testing Excel's data validation mechanism
- *
- * @author Dragos Buleandra ( dragos.buleandra@trade2b.ro )
- */
-public final class TestDataValidation extends BaseTestDataValidation {
-
-    public TestDataValidation(){
-        super(HSSFITestDataProvider.instance);
-    }
-
-
-	public void assertDataValidation(Workbook wb) {
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(22000);
-		try {
-			wb.write(baos);
-			baos.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		byte[] generatedContent = baos.toByteArray();
-		boolean isSame;
-//		if (false) {
-//			// TODO - add proof spreadsheet and compare
-//			InputStream proofStream = HSSFTestDataSamples.openSampleFileStream("TestDataValidation.xls");
-//			isSame = compareStreams(proofStream, generatedContent);
-//		}
-		isSame = true;
-		
-		if (isSame) {
-			return;
-		}
-		File tempDir = new File(System.getProperty("java.io.tmpdir"));
-		File generatedFile = new File(tempDir, "GeneratedTestDataValidation.xls");
-		try {
-			FileOutputStream fileOut = new FileOutputStream(generatedFile);
-			fileOut.write(generatedContent);
-			fileOut.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	
-		PrintStream ps = System.out;
-	
-		ps.println("This test case has failed because the generated file differs from proof copy '" 
-				); // TODO+ proofFile.getAbsolutePath() + "'.");
-		ps.println("The cause is usually a change to this test, or some common spreadsheet generation code.  "
-				+ "The developer has to decide whether the changes were wanted or unwanted.");
-		ps.println("If the changes to the generated version were unwanted, "
-				+ "make the fix elsewhere (do not modify this test or the proof spreadsheet to get the test working).");
-		ps.println("If the changes were wanted, make sure to open the newly generated file in Excel "
-				+ "and verify it manually.  The new proof file should be submitted after it is verified to be correct.");
-		ps.println("");
-		ps.println("One other possible (but less likely) cause of a failed test is a problem in the "
-				+ "comparison logic used here. Perhaps some extra file regions need to be ignored.");
-		ps.println("The generated file has been saved to '" + generatedFile.getAbsolutePath() + "' for manual inspection.");
-	
-		fail("Generated file differs from proof copy.  See sysout comments for details on how to fix.");
-		
-	}
-	
-//	private static boolean compareStreams(InputStream isA, byte[] generatedContent) {
-//
-//		InputStream isB = new ByteArrayInputStream(generatedContent);
-//
-//		// The allowable regions where the generated file can differ from the 
-//		// proof should be small (i.e. much less than 1K)
-//		int[] allowableDifferenceRegions = { 
-//				0x0228, 16,  // a region of the file containing the OS username
-//				0x506C, 8,   // See RootProperty (super fields _seconds_2 and _days_2)
-//		};
-//		int[] diffs = StreamUtility.diffStreams(isA, isB, allowableDifferenceRegions);
-//		if (diffs == null) {
-//			return true;
-//		}
-//		System.err.println("Diff from proof: ");
-//		for (int i = 0; i < diffs.length; i++) {
-//			System.err.println("diff at offset: 0x" + Integer.toHexString(diffs[i]));
-//		}
-//		return false;
-//	}
-  
-
-
-
-
-    /* package */ static void setCellValue(HSSFCell cell, String text) {
-	  cell.setCellValue(new HSSFRichTextString(text));
-	  
-    }
-  
-	@Test
-    public void testAddToExistingSheet() throws Exception {
-
-		// dvEmpty.xls is a simple one sheet workbook.  With a DataValidations header record but no 
-		// DataValidations.  It's important that the example has one SHEETPROTECTION record.
-		// Such a workbook can be created in Excel (2007) by adding datavalidation for one cell
-		// and then deleting the row that contains the cell.
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("dvEmpty.xls");  
-		int dvRow = 0;
-		Sheet sheet = wb.getSheetAt(0);
-		DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-		DataValidationConstraint dc = dataValidationHelper.createIntegerConstraint(OperatorType.EQUAL, "42", null);
-		DataValidation dv = dataValidationHelper.createValidation(dc,new CellRangeAddressList(dvRow, dvRow, 0, 0));
-		
-		dv.setEmptyCellAllowed(false);
-		dv.setErrorStyle(ErrorStyle.STOP);
-		dv.setShowPromptBox(true);
-		dv.createErrorBox("Xxx", "Yyy");
-		dv.setSuppressDropDownArrow(true);
-
-		sheet.addValidationData(dv);
-		
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		wb.write(baos);
-		
-		byte[] wbData = baos.toByteArray();
-		
-//		if (false) { // TODO (Jul 2008) fix EventRecordFactory to process unknown records, (and DV records for that matter)
-//
-//			ERFListener erfListener = null; // new MyERFListener();
-//			EventRecordFactory erf = new EventRecordFactory(erfListener, null);
-//			try {
-//				POIFSFileSystem fs = new POIFSFileSystem(new ByteArrayInputStream(baos.toByteArray()));
-//				erf.processRecords(fs.createDocumentInputStream("Workbook"));
-//			} catch (RecordFormatException e) {
-//				throw new RuntimeException(e);
-//			} catch (IOException e) {
-//				throw new RuntimeException(e);
-//			}
-//		}
-		// else verify record ordering by navigating the raw bytes
-		
-		byte[] dvHeaderRecStart= { (byte)0xB2, 0x01, 0x12, 0x00, };
-		int dvHeaderOffset = findIndex(wbData, dvHeaderRecStart);
-		assertTrue(dvHeaderOffset > 0);
-		int nextRecIndex = dvHeaderOffset + 22;
-		int nextSid 
-			= ((wbData[nextRecIndex + 0] << 0) & 0x00FF) 
-			+ ((wbData[nextRecIndex + 1] << 8) & 0xFF00)
-			;
-		// nextSid should be for a DVRecord.  If anything comes between the DV header record 
-		// and the DV records, Excel will not be able to open the workbook without error.
-		
-		if (nextSid == 0x0867) {
-			fail("Identified bug 45519");
-		}
-		assertEquals(DVRecord.sid, nextSid);
-		
-		wb.close();
-	}
-	
-	private int findIndex(byte[] largeData, byte[] searchPattern) {
-		byte firstByte = searchPattern[0];
-		for (int i = 0; i < largeData.length; i++) {
-			if(largeData[i] != firstByte) {
-				continue;
-			}
-			boolean match = true;
-			for (int j = 1; j < searchPattern.length; j++) {
-				if(searchPattern[j] != largeData[i+j]) {
-					match = false;
-					break;
-				}
-			}
-			if (match) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	@Test
-    public void testGetDataValidationsAny() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createNumericConstraint(ValidationType.ANY,
-                OperatorType.IGNORED, null, null);
-        CellRangeAddressList addressList = new CellRangeAddressList(1, 2, 3, 4);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        validation.setEmptyCellAllowed(true);
-        validation.createErrorBox("error-title", "error-text");
-        validation.createPromptBox("prompt-title", "prompt-text");
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        {
-            CellRangeAddressList regions = dv.getRegions();
-            assertEquals(1, regions.countRanges());
-
-            CellRangeAddress address = regions.getCellRangeAddress(0);
-            assertEquals(1, address.getFirstRow());
-            assertEquals(2, address.getLastRow());
-            assertEquals(3, address.getFirstColumn());
-            assertEquals(4, address.getLastColumn());
-        }
-        assertEquals(true, dv.getEmptyCellAllowed());
-        assertEquals(false, dv.getSuppressDropDownArrow());
-        assertEquals(true, dv.getShowErrorBox());
-        assertEquals("error-title", dv.getErrorBoxTitle());
-        assertEquals("error-text", dv.getErrorBoxText());
-        assertEquals(true, dv.getShowPromptBox());
-        assertEquals("prompt-title", dv.getPromptBoxTitle());
-        assertEquals("prompt-text", dv.getPromptBoxText());
-
-        DataValidationConstraint c = dv.getValidationConstraint();
-        assertEquals(ValidationType.ANY, c.getValidationType());
-        assertEquals(OperatorType.IGNORED, c.getOperator());
-        
-        wb.close();
-    }
-
-	@Test
-    public void testGetDataValidationsIntegerFormula() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createIntegerConstraint(OperatorType.BETWEEN, "=A2",
-                "=A3");
-        CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        DVConstraint c = dv.getConstraint();
-        assertEquals(ValidationType.INTEGER, c.getValidationType());
-        assertEquals(OperatorType.BETWEEN, c.getOperator());
-        assertEquals("A2", c.getFormula1());
-        assertEquals("A3", c.getFormula2());
-        assertEquals(null, c.getValue1());
-        assertEquals(null, c.getValue2());
-        
-        wb.close();
-    }
-
-	@Test
-    public void testGetDataValidationsIntegerValue() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createIntegerConstraint(OperatorType.BETWEEN, "100",
-                "200");
-        CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        DVConstraint c = dv.getConstraint();
-        assertEquals(ValidationType.INTEGER, c.getValidationType());
-        assertEquals(OperatorType.BETWEEN, c.getOperator());
-        assertEquals(null, c.getFormula1());
-        assertEquals(null, c.getFormula2());
-        assertEquals(new Double("100"), c.getValue1());
-        assertEquals(new Double("200"), c.getValue2());
-        
-        wb.close();
-    }
-
-	@Test
-    public void testGetDataValidationsDecimal() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createDecimalConstraint(OperatorType.BETWEEN, "=A2",
-                "200");
-        CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        DVConstraint c = dv.getConstraint();
-        assertEquals(ValidationType.DECIMAL, c.getValidationType());
-        assertEquals(OperatorType.BETWEEN, c.getOperator());
-        assertEquals("A2", c.getFormula1());
-        assertEquals(null, c.getFormula2());
-        assertEquals(null, c.getValue1());
-        assertEquals(new Double("200"), c.getValue2());
-        
-        wb.close();
-    }
-
-	@Test
-    public void testGetDataValidationsDate() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createDateConstraint(OperatorType.EQUAL,
-                "2014/10/25", null, null);
-        CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        DVConstraint c = dv.getConstraint();
-        assertEquals(ValidationType.DATE, c.getValidationType());
-        assertEquals(OperatorType.EQUAL, c.getOperator());
-        assertEquals(null, c.getFormula1());
-        assertEquals(null, c.getFormula2());
-        assertEquals(DateUtil.getExcelDate(DateUtil.parseYYYYMMDDDate("2014/10/25")), c.getValue1(), 0);
-        assertEquals(null, c.getValue2());
-        
-        wb.close();
-    }
-
-	@Test
-    public void testGetDataValidationsListExplicit() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createExplicitListConstraint(new String[] { "aaa",
-                "bbb", "ccc" });
-        CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        validation.setSuppressDropDownArrow(true);
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        assertEquals(true, dv.getSuppressDropDownArrow());
-
-        DVConstraint c = dv.getConstraint();
-        assertEquals(ValidationType.LIST, c.getValidationType());
-        assertEquals(null, c.getFormula1());
-        assertEquals(null, c.getFormula2());
-        assertEquals(null, c.getValue1());
-        assertEquals(null, c.getValue2());
-        String[] values = c.getExplicitListValues();
-        assertEquals(3, values.length);
-        assertEquals("aaa", values[0]);
-        assertEquals("bbb", values[1]);
-        assertEquals("ccc", values[2]);
-        
-        wb.close();
-    }
-
-	@Test
-    public void testGetDataValidationsListFormula() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createFormulaListConstraint("A2");
-        CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        validation.setSuppressDropDownArrow(true);
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        assertEquals(true, dv.getSuppressDropDownArrow());
-
-        DVConstraint c = dv.getConstraint();
-        assertEquals(ValidationType.LIST, c.getValidationType());
-        assertEquals("A2", c.getFormula1());
-        assertEquals(null, c.getFormula2());
-        assertEquals(null, c.getValue1());
-        assertEquals(null, c.getValue2());
-        
-        wb.close();
-    }
-
-	@Test
-    public void testGetDataValidationsFormula() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        List<HSSFDataValidation> list = sheet.getDataValidations();
-        assertEquals(0, list.size());
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = dataValidationHelper.createCustomConstraint("A2:A3");
-        CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
-        DataValidation validation = dataValidationHelper.createValidation(constraint, addressList);
-        sheet.addValidationData(validation);
-
-        list = sheet.getDataValidations(); // <-- works
-        assertEquals(1, list.size());
-
-        HSSFDataValidation dv = list.get(0);
-        DVConstraint c = dv.getConstraint();
-        assertEquals(ValidationType.FORMULA, c.getValidationType());
-        assertEquals("A2:A3", c.getFormula1());
-        assertEquals(null, c.getFormula2());
-        assertEquals(null, c.getValue1());
-        assertEquals(null, c.getValue2());
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
deleted file mode 100644
index fe04ebb..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Tests for the embedded object fetching support in HSSF
- */
-public class TestEmbeddedObjects extends TestCase{
-    public void testReadExistingObject() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        List<HSSFObjectData> list = wb.getAllEmbeddedObjects();
-        assertEquals(list.size(), 1);
-        HSSFObjectData obj = list.get(0);
-        assertNotNull(obj.getObjectData());
-        assertNotNull(obj.getDirectory());
-        assertNotNull(obj.getOLE2ClassName());
-    }
-    
-    /**
-     * Need to recurse into the shapes to find this one
-     * See https://github.com/apache/poi/pull/2
-     */
-    public void testReadNestedObject() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithCheckBoxes.xls");
-        List<HSSFObjectData> list = wb.getAllEmbeddedObjects();
-        assertEquals(list.size(), 1);
-        HSSFObjectData obj = list.get(0);
-        assertNotNull(obj.getObjectData());
-        assertNotNull(obj.getOLE2ClassName());
-    }
-    
-    /**
-     * One with large numbers of recursivly embedded resources
-     * See https://github.com/apache/poi/pull/2
-     */
-    public void testReadManyNestedObjects() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("45538_form_Header.xls");
-        List<HSSFObjectData> list = wb.getAllEmbeddedObjects();
-        assertEquals(list.size(), 40);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
deleted file mode 100644
index e6d5693..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests the capabilities of the EscherGraphics class.
- *
- * All tests have two escher groups available to them,
- *  one anchored at 0,0,1022,255 and another anchored
- *  at 20,30,500,200
- */
-public final class TestEscherGraphics {
-	private HSSFWorkbook workbook;
-	private HSSFPatriarch patriarch;
-    private HSSFShapeGroup escherGroupA;
-    private EscherGraphics graphics;
-
-    @Before
-    public void setUp() throws IOException {
-        workbook = new HSSFWorkbook();
-
-        HSSFSheet sheet = workbook.createSheet("test");
-        patriarch = sheet.createDrawingPatriarch();
-        escherGroupA = patriarch.createGroup(new HSSFClientAnchor(0,0,1022,255,(short)0,0,(short) 0,0));
-        patriarch.createGroup(new HSSFClientAnchor(20,30,500,200,(short)0,0,(short) 0,0));
-        graphics = new EscherGraphics(escherGroupA, workbook, Color.black, 1.0f);
-    }
-    
-    @After
-    public void closeResources() throws IOException {
-        workbook.close();
-    }
-
-    @Test
-    public void testGetFont() {
-        Font f = graphics.getFont();
-        if (f.toString().indexOf("dialog") == -1 && f.toString().indexOf("Dialog") == -1) {
-            assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
-        }
-    }
-
-    @Test
-    public void testGetFontMetrics() {
-        Font f = graphics.getFont();
-        if (f.toString().indexOf("dialog") != -1 || f.toString().indexOf("Dialog") != -1) {
-            return;
-        }
-        FontMetrics fontMetrics = graphics.getFontMetrics(graphics.getFont());
-        assertEquals(7, fontMetrics.charWidth('X'));
-        assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", fontMetrics.getFont().toString());
-    }
-
-    @Test
-    public void testSetFont() {
-        Font f = new Font("Helvetica", 0, 12);
-        graphics.setFont(f);
-        assertEquals(f, graphics.getFont());
-    }
-
-    @Test
-    public void testSetColor() {
-        graphics.setColor(Color.red);
-        assertEquals(Color.red, graphics.getColor());
-    }
-
-    @Test
-    public void testFillRect() {
-        graphics.fillRect( 10, 10, 20, 20 );
-        HSSFSimpleShape s = (HSSFSimpleShape) escherGroupA.getChildren().get(0);
-        assertEquals(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE, s.getShapeType());
-        assertEquals(10, s.getAnchor().getDx1());
-        assertEquals(10, s.getAnchor().getDy1());
-        assertEquals(30, s.getAnchor().getDy2());
-        assertEquals(30, s.getAnchor().getDx2());
-    }
-
-    @Test
-    public void testDrawString() {
-        graphics.drawString("This is a test", 10, 10);
-        HSSFTextbox t = (HSSFTextbox) escherGroupA.getChildren().get(0);
-        assertEquals("This is a test", t.getString().getString());
-    }
-
-    @Test
-    public void testGetDataBackAgain() throws Exception {
-    	HSSFSheet s;
-    	HSSFShapeGroup s1;
-    	HSSFShapeGroup s2;
-
-    	patriarch.setCoordinates(10, 20, 30, 40);
-
-    	ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    	workbook.write(baos);
-    	workbook = new HSSFWorkbook(new ByteArrayInputStream(baos.toByteArray()));
-    	s = workbook.getSheetAt(0);
-
-    	patriarch = s.getDrawingPatriarch();
-
-    	assertNotNull(patriarch);
-    	assertEquals(10, patriarch.getX1());
-    	assertEquals(20, patriarch.getY1());
-    	assertEquals(30, patriarch.getX2());
-    	assertEquals(40, patriarch.getY2());
-
-    	// Check the two groups too
-    	assertEquals(2, patriarch.countOfAllChildren());
-    	assertTrue(patriarch.getChildren().get(0) instanceof HSSFShapeGroup);
-    	assertTrue(patriarch.getChildren().get(1) instanceof HSSFShapeGroup);
-
-    	s1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
-    	s2 = (HSSFShapeGroup)patriarch.getChildren().get(1);
-
-    	assertEquals(0, s1.getX1());
-    	assertEquals(0, s1.getY1());
-    	assertEquals(1023, s1.getX2());
-    	assertEquals(255, s1.getY2());
-    	assertEquals(0, s2.getX1());
-    	assertEquals(0, s2.getY1());
-    	assertEquals(1023, s2.getX2());
-    	assertEquals(255, s2.getY2());
-
-    	assertEquals(0, s1.getAnchor().getDx1());
-    	assertEquals(0, s1.getAnchor().getDy1());
-    	assertEquals(1022, s1.getAnchor().getDx2());
-    	assertEquals(255, s1.getAnchor().getDy2());
-    	assertEquals(20, s2.getAnchor().getDx1());
-    	assertEquals(30, s2.getAnchor().getDy1());
-    	assertEquals(500, s2.getAnchor().getDx2());
-    	assertEquals(200, s2.getAnchor().getDy2());
-
-
-    	// Write and re-load once more, to check that's ok
-    	baos = new ByteArrayOutputStream();
-    	workbook.write(baos);
-    	workbook = new HSSFWorkbook(new ByteArrayInputStream(baos.toByteArray()));
-    	s = workbook.getSheetAt(0);
-    	patriarch = s.getDrawingPatriarch();
-
-    	assertNotNull(patriarch);
-    	assertEquals(10, patriarch.getX1());
-    	assertEquals(20, patriarch.getY1());
-    	assertEquals(30, patriarch.getX2());
-    	assertEquals(40, patriarch.getY2());
-
-    	// Check the two groups too
-    	assertEquals(2, patriarch.countOfAllChildren());
-    	assertTrue(patriarch.getChildren().get(0) instanceof HSSFShapeGroup);
-    	assertTrue(patriarch.getChildren().get(1) instanceof HSSFShapeGroup);
-
-    	s1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
-    	s2 = (HSSFShapeGroup)patriarch.getChildren().get(1);
-
-    	assertEquals(0, s1.getX1());
-    	assertEquals(0, s1.getY1());
-    	assertEquals(1023, s1.getX2());
-    	assertEquals(255, s1.getY2());
-    	assertEquals(0, s2.getX1());
-    	assertEquals(0, s2.getY1());
-    	assertEquals(1023, s2.getX2());
-    	assertEquals(255, s2.getY2());
-
-    	assertEquals(0, s1.getAnchor().getDx1());
-    	assertEquals(0, s1.getAnchor().getDy1());
-    	assertEquals(1022, s1.getAnchor().getDx2());
-    	assertEquals(255, s1.getAnchor().getDy2());
-    	assertEquals(20, s2.getAnchor().getDx1());
-    	assertEquals(30, s2.getAnchor().getDy1());
-    	assertEquals(500, s2.getAnchor().getDx2());
-    	assertEquals(200, s2.getAnchor().getDy2());
-
-    	// Change the positions of the first groups,
-    	//  but not of their anchors
-    	s1.setCoordinates(2, 3, 1021, 242);
-
-    	baos = new ByteArrayOutputStream();
-    	workbook.write(baos);
-    	workbook = new HSSFWorkbook(new ByteArrayInputStream(baos.toByteArray()));
-    	s = workbook.getSheetAt(0);
-    	patriarch = s.getDrawingPatriarch();
-
-    	assertNotNull(patriarch);
-    	assertEquals(10, patriarch.getX1());
-    	assertEquals(20, patriarch.getY1());
-    	assertEquals(30, patriarch.getX2());
-    	assertEquals(40, patriarch.getY2());
-
-    	// Check the two groups too
-    	assertEquals(2, patriarch.countOfAllChildren());
-    	assertEquals(2, patriarch.getChildren().size());
-    	assertTrue(patriarch.getChildren().get(0) instanceof HSSFShapeGroup);
-    	assertTrue(patriarch.getChildren().get(1) instanceof HSSFShapeGroup);
-
-    	s1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
-    	s2 = (HSSFShapeGroup)patriarch.getChildren().get(1);
-
-    	assertEquals(2, s1.getX1());
-    	assertEquals(3, s1.getY1());
-    	assertEquals(1021, s1.getX2());
-    	assertEquals(242, s1.getY2());
-    	assertEquals(0, s2.getX1());
-    	assertEquals(0, s2.getY1());
-    	assertEquals(1023, s2.getX2());
-    	assertEquals(255, s2.getY2());
-
-    	assertEquals(0, s1.getAnchor().getDx1());
-    	assertEquals(0, s1.getAnchor().getDy1());
-    	assertEquals(1022, s1.getAnchor().getDx2());
-    	assertEquals(255, s1.getAnchor().getDy2());
-    	assertEquals(20, s2.getAnchor().getDx1());
-    	assertEquals(30, s2.getAnchor().getDy1());
-    	assertEquals(500, s2.getAnchor().getDx2());
-    	assertEquals(200, s2.getAnchor().getDy2());
-
-
-    	// Now add some text to one group, and some more
-    	//  to the base, and check we can get it back again
-    	HSSFTextbox tbox1 =
-    		patriarch.createTextbox(new HSSFClientAnchor(1,2,3,4, (short)0,0,(short)0,0));
-    	tbox1.setString(new HSSFRichTextString("I am text box 1"));
-    	HSSFTextbox tbox2 =
-    		s2.createTextbox(new HSSFChildAnchor(41,42,43,44));
-    	tbox2.setString(new HSSFRichTextString("This is text box 2"));
-
-    	assertEquals(3, patriarch.getChildren().size());
-
-
-    	baos = new ByteArrayOutputStream();
-    	workbook.write(baos);
-    	workbook = new HSSFWorkbook(new ByteArrayInputStream(baos.toByteArray()));
-    	s = workbook.getSheetAt(0);
-
-    	patriarch = s.getDrawingPatriarch();
-
-    	assertNotNull(patriarch);
-    	assertEquals(10, patriarch.getX1());
-    	assertEquals(20, patriarch.getY1());
-    	assertEquals(30, patriarch.getX2());
-    	assertEquals(40, patriarch.getY2());
-
-    	// Check the two groups and the text
-    	// Result of patriarch.countOfAllChildren() makes no sense: 
-    	// Returns 4 for 2 empty groups + 1 TextBox.
-    	//assertEquals(3, patriarch.countOfAllChildren()); 
-    	assertEquals(3, patriarch.getChildren().size());
-
-    	// Should be two groups and a text
-    	assertTrue(patriarch.getChildren().get(0) instanceof HSSFShapeGroup);
-    	assertTrue(patriarch.getChildren().get(1) instanceof HSSFShapeGroup);
-    	assertTrue(patriarch.getChildren().get(2) instanceof HSSFTextbox);
-
-    	s1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
-    	tbox1 = (HSSFTextbox)patriarch.getChildren().get(2);
-
-    	s2 = (HSSFShapeGroup)patriarch.getChildren().get(1);
-
-    	assertEquals(2, s1.getX1());
-    	assertEquals(3, s1.getY1());
-    	assertEquals(1021, s1.getX2());
-    	assertEquals(242, s1.getY2());
-    	assertEquals(0, s2.getX1());
-    	assertEquals(0, s2.getY1());
-    	assertEquals(1023, s2.getX2());
-    	assertEquals(255, s2.getY2());
-
-    	assertEquals(0, s1.getAnchor().getDx1());
-    	assertEquals(0, s1.getAnchor().getDy1());
-    	assertEquals(1022, s1.getAnchor().getDx2());
-    	assertEquals(255, s1.getAnchor().getDy2());
-    	assertEquals(20, s2.getAnchor().getDx1());
-    	assertEquals(30, s2.getAnchor().getDy1());
-    	assertEquals(500, s2.getAnchor().getDx2());
-    	assertEquals(200, s2.getAnchor().getDy2());
-
-    	// Not working just yet
-    	assertEquals("I am text box 1", tbox1.getString().getString());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
deleted file mode 100644
index b0b4293..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.geom.Line2D;
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests the Graphics2d drawing capability.
- */
-public final class TestEscherGraphics2d {
-    private HSSFWorkbook workbook;
-	private HSSFShapeGroup escherGroup;
-	private EscherGraphics2d graphics;
-
-	@Before
-    public void setUp() {
-		workbook = new HSSFWorkbook();
-		HSSFSheet sheet = workbook.createSheet("test");
-		escherGroup = sheet.createDrawingPatriarch().createGroup(new HSSFClientAnchor(0,0,1023,255,(short)0,0,(short) 0,0));
-		escherGroup = new HSSFShapeGroup(null, new HSSFChildAnchor());
-		EscherGraphics g = new EscherGraphics(escherGroup, workbook, Color.black, 1.0f);
-		graphics = new EscherGraphics2d(g);
-	}
-	
-	@After
-	public void closeResources() throws IOException {
-	    workbook.close();
-	}
-
-	@Test
-	public void testDrawString() {
-		graphics.drawString("This is a test", 10, 10);
-		HSSFTextbox t = (HSSFTextbox) escherGroup.getChildren().get(0);
-		assertEquals("This is a test", t.getString().getString());
-
-		// Check that with a valid font, it's still ok
-		Font font = new Font("Forte", Font.PLAIN, 12);
-		graphics.setFont(font);
-		graphics.drawString("This is another test", 10, 10);
-
-		// And test with ones that need the style appending
-		font = new Font("dialog", Font.PLAIN, 12);
-		graphics.setFont(font);
-		graphics.drawString("This is another test", 10, 10);
-
-		font = new Font("dialog", Font.BOLD, 12);
-		graphics.setFont(font);
-		graphics.drawString("This is another test", 10, 10);
-
-		// But with an invalid font, we get an exception
-		font = new Font("IamAmadeUPfont", Font.PLAIN, 22);
-		graphics.setFont(font);
-		try {
-			graphics.drawString("This is another test", 10, 10);
-			fail();
-		} catch(IllegalArgumentException e) {
-			// expected
-		}
-	}
-
-	@Test
-    public void testFillRect() {
-		graphics.fillRect( 10, 10, 20, 20 );
-		HSSFSimpleShape s = (HSSFSimpleShape) escherGroup.getChildren().get(0);
-		assertEquals(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE, s.getShapeType());
-		assertEquals(10, s.getAnchor().getDx1());
-		assertEquals(10, s.getAnchor().getDy1());
-		assertEquals(30, s.getAnchor().getDy2());
-		assertEquals(30, s.getAnchor().getDx2());
-	}
-
-	@Test
-    public void testGetFontMetrics() {
-		FontMetrics fontMetrics = graphics.getFontMetrics(graphics.getFont());
-		if (isDialogPresent()) {
-		    // if dialog is returned we can't run the test properly.
-			return;
-		}
-		assertEquals(7, fontMetrics.charWidth('X'));
-		assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", fontMetrics.getFont().toString());
-	}
-
-	@Test
-    public void testSetFont() {
-		Font f = new Font("Helvetica", 0, 12);
-		graphics.setFont(f);
-		assertEquals(f, graphics.getFont());
-	}
-
-	@Test
-    public void testSetColor() {
-		graphics.setColor(Color.red);
-		assertEquals(Color.red, graphics.getColor());
-	}
-
-	@Test
-    public void testGetFont() {
-		Font f = graphics.getFont();
-		if (isDialogPresent()) {
-		    // if dialog is returned we can't run the test properly.
-			return;
-        }
-
-		assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
-	}
-
-	private boolean isDialogPresent() {
-		String fontDebugStr = graphics.getFont().toString();
-		return fontDebugStr.indexOf("dialog") != -1 || fontDebugStr.indexOf("Dialog") != -1;
-	}
-
-	@Test
-    public void testDraw() {
-		graphics.draw(new Line2D.Double(10,10,20,20));
-		HSSFSimpleShape s = (HSSFSimpleShape) escherGroup.getChildren().get(0);
-		assertTrue(s.getShapeType() == HSSFSimpleShape.OBJECT_TYPE_LINE);
-		assertEquals(10, s.getAnchor().getDx1());
-		assertEquals(10, s.getAnchor().getDy1());
-		assertEquals(20, s.getAnchor().getDx2());
-		assertEquals(20, s.getAnchor().getDy2());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
deleted file mode 100644
index a059f1f..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.CellType;
-
-import junit.framework.TestCase;
-
-public class TestExternalReferenceChange extends TestCase {
-
-	private static final String MAIN_WORKBOOK_FILENAME = "52575_main.xls";
-	private static final String SOURCE_DUMMY_WORKBOOK_FILENAME = "source_dummy.xls";
-	private static final String SOURCE_WORKBOOK_FILENAME = "52575_source.xls";
-	
-	private HSSFWorkbook mainWorkbook;
-	private HSSFWorkbook sourceWorkbook;
-	
-	@Override
-	protected void setUp() throws Exception {
-		mainWorkbook = HSSFTestDataSamples.openSampleWorkbook(MAIN_WORKBOOK_FILENAME);
-		sourceWorkbook = HSSFTestDataSamples.openSampleWorkbook(SOURCE_WORKBOOK_FILENAME);
-		
-		assertNotNull(mainWorkbook);
-		assertNotNull(sourceWorkbook);
-	}
-	
-	public void testDummyToSource() throws IOException {
-		boolean changed = mainWorkbook.changeExternalReference("DOESNOTEXIST", SOURCE_WORKBOOK_FILENAME);
-		assertFalse(changed);
-		
-		changed = mainWorkbook.changeExternalReference(SOURCE_DUMMY_WORKBOOK_FILENAME, SOURCE_WORKBOOK_FILENAME);
-		assertTrue(changed);
-
-		HSSFSheet lSheet = mainWorkbook.getSheetAt(0);
-		HSSFCell lA1Cell = lSheet.getRow(0).getCell(0);
-		
-		assertEquals(CellType.FORMULA, lA1Cell.getCellTypeEnum());
-		
-		HSSFFormulaEvaluator lMainWorkbookEvaluator = new HSSFFormulaEvaluator(mainWorkbook);
-		HSSFFormulaEvaluator lSourceEvaluator = new HSSFFormulaEvaluator(sourceWorkbook);
-		HSSFFormulaEvaluator.setupEnvironment(
-				new String[]{MAIN_WORKBOOK_FILENAME, SOURCE_WORKBOOK_FILENAME}, 
-				new HSSFFormulaEvaluator[] {lMainWorkbookEvaluator, lSourceEvaluator});
-		
-		assertEquals(CellType.NUMERIC, lMainWorkbookEvaluator.evaluateFormulaCellEnum(lA1Cell));
-
-		assertEquals(20.0d, lA1Cell.getNumericCellValue(), 0.00001d);
-
-	}
-	
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
deleted file mode 100644
index 724d264..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-
-import java.util.Properties;
-
-/**
- * Tests the implementation of the FontDetails class.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestFontDetails extends TestCase {
-    private Properties properties;
-    private FontDetails fontDetails;
-
-    @Override
-    protected void setUp() {
-        properties = new Properties();
-        properties.setProperty("font.Arial.height", "13");
-        properties.setProperty("font.Arial.characters", "a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ");
-        properties.setProperty("font.Arial.widths",     "6, 6, 6, 6, 6, 3, 6, 6, 3, 4, 6, 3, 9, 6, 6, 6, 6, 4, 6, 3, 6, 7, 9, 6, 5, 5, 7, 7, 7, 7, 7, 6, 8, 7, 3, 6, 7, 6, 9, 7, 8, 7, 8, 7, 7, 5, 7, 7, 9, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, ");
-        fontDetails = FontDetails.create("Arial", properties);
-    }
-
-    public void testCreate() {
-        assertEquals(13, fontDetails.getHeight());
-        assertEquals(6, fontDetails.getCharWidth('a'));
-        assertEquals(3, fontDetails.getCharWidth('f'));
-    }
-
-    public void testGetStringWidth() {
-        assertEquals(9, fontDetails.getStringWidth("af"));
-    }
-
-    public void testGetCharWidth() {
-        assertEquals(6, fontDetails.getCharWidth('a'));
-        assertEquals(9, fontDetails.getCharWidth('='));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
deleted file mode 100644
index 9e8c4a3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Calendar;
-import java.util.Iterator;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationListener;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.WorkbookEvaluatorTestHelper;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- */
-public final class TestFormulaEvaluatorBugs {
-    private static boolean OUTPUT_TEST_FILES = false;
-    private static String tmpDirName;
-
-    @BeforeClass
-    public static void setUp() {
-        tmpDirName = System.getProperty("java.io.tmpdir");
-        OUTPUT_TEST_FILES = Boolean.parseBoolean(
-                System.getProperty("org.apache.poi.test.output_test_files", "False"));
-    }
-
-    /**
-     * An odd problem with evaluateFormulaCell giving the
-     *  right values when file is opened, but changes
-     *  to the source data in some versions of excel
-     *  doesn't cause them to be updated. However, other
-     *  versions of excel, and gnumeric, work just fine
-     * WARNING - tedious bug where you actually have to
-     *  open up excel
-     */
-    @Test
-    public void test44636() throws Exception {
-        // Open the existing file, tweak one value and
-        // re-calculate
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("44636.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFRow row = sheet.getRow(0);
-
-        row.getCell(0).setCellValue(4.2);
-        row.getCell(2).setCellValue(25);
-
-        HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-        assertEquals(4.2 * 25, row.getCell(3).getNumericCellValue(), 0.0001);
-
-        if (OUTPUT_TEST_FILES) {
-            // Save
-            File existing = new File(tmpDirName, "44636-existing.xls");
-            FileOutputStream out = new FileOutputStream(existing);
-            wb.write(out);
-            out.close();
-            System.err.println("Existing file for bug #44636 written to " + existing.toString());
-        }
-        wb.close();
-        
-        // Now, do a new file from scratch
-        wb = new HSSFWorkbook();
-        sheet = wb.createSheet();
-
-        row = sheet.createRow(0);
-        row.createCell(0).setCellValue(1.2);
-        row.createCell(1).setCellValue(4.2);
-
-        row = sheet.createRow(1);
-        row.createCell(0).setCellFormula("SUM(A1:B1)");
-
-        HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-        assertEquals(5.4, row.getCell(0).getNumericCellValue(), 0.0001);
-
-        if (OUTPUT_TEST_FILES) {
-            // Save
-            File scratch = new File(tmpDirName, "44636-scratch.xls");
-            FileOutputStream out = new FileOutputStream(scratch);
-            wb.write(out);
-            out.close();
-            System.err.println("New file for bug #44636 written to " + scratch.toString());
-        }
-        wb.close();
-    }
-
-    /**
-     * Bug 44297: 32767+32768 is evaluated to -1
-     * Fix: IntPtg must operate with unsigned short. Reading signed short results in incorrect formula calculation
-     * if a formula has values in the interval [Short.MAX_VALUE, (Short.MAX_VALUE+1)*2]
-     */
-    @Test
-    public void test44297() throws Exception {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("44297.xls");
-
-        HSSFRow row;
-        HSSFCell cell;
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        HSSFFormulaEvaluator eva = new HSSFFormulaEvaluator(wb);
-
-        row = sheet.getRow(0);
-        cell = row.getCell(0);
-        assertEquals("31+46", cell.getCellFormula());
-        assertEquals(77, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(1);
-        cell = row.getCell(0);
-        assertEquals("30+53", cell.getCellFormula());
-        assertEquals(83, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(2);
-        cell = row.getCell(0);
-        assertEquals("SUM(A1:A2)", cell.getCellFormula());
-        assertEquals(160, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(4);
-        cell = row.getCell(0);
-        assertEquals("32767+32768", cell.getCellFormula());
-        assertEquals(65535, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(7);
-        cell = row.getCell(0);
-        assertEquals("32744+42333", cell.getCellFormula());
-        assertEquals(75077, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(8);
-        cell = row.getCell(0);
-        assertEquals("327680/32768", cell.getCellFormula());
-        assertEquals(10, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(9);
-        cell = row.getCell(0);
-        assertEquals("32767+32769", cell.getCellFormula());
-        assertEquals(65536, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(10);
-        cell = row.getCell(0);
-        assertEquals("35000+36000", cell.getCellFormula());
-        assertEquals(71000, eva.evaluate(cell).getNumberValue(), 0);
-
-        row = sheet.getRow(11);
-        cell = row.getCell(0);
-        assertEquals("-1000000-3000000", cell.getCellFormula());
-        assertEquals(-4000000, eva.evaluate(cell).getNumberValue(), 0);
-        
-        wb.close();
-    }
-
-    /**
-     * Bug 44410: SUM(C:C) is valid in excel, and means a sum
-     *  of all the rows in Column C
-     */
-    @Test
-    public void test44410() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SingleLetterRanges.xls");
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        HSSFFormulaEvaluator eva = new HSSFFormulaEvaluator(wb);
-
-        // =index(C:C,2,1) -> 2
-        HSSFRow rowIDX = sheet.getRow(3);
-        // =sum(C:C) -> 6
-        HSSFRow rowSUM = sheet.getRow(4);
-        // =sum(C:D) -> 66
-        HSSFRow rowSUM2D = sheet.getRow(5);
-
-        // Test the sum
-        HSSFCell cellSUM = rowSUM.getCell(0);
-
-        FormulaRecordAggregate frec = (FormulaRecordAggregate) cellSUM.getCellValueRecord();
-        Ptg[] ops = frec.getFormulaRecord().getParsedExpression();
-        assertEquals(2, ops.length);
-        assertEquals(AreaPtg.class, ops[0].getClass());
-        assertEquals(FuncVarPtg.class, ops[1].getClass());
-
-        // Actually stored as C1 to C65536
-        // (last row is -1 === 65535)
-        AreaPtg ptg = (AreaPtg) ops[0];
-        assertEquals(2, ptg.getFirstColumn());
-        assertEquals(2, ptg.getLastColumn());
-        assertEquals(0, ptg.getFirstRow());
-        assertEquals(65535, ptg.getLastRow());
-        assertEquals("C:C", ptg.toFormulaString());
-
-        // Will show as C:C, but won't know how many
-        // rows it covers as we don't have the sheet
-        // to hand when turning the Ptgs into a string
-        assertEquals("SUM(C:C)", cellSUM.getCellFormula());
-
-        // But the evaluator knows the sheet, so it
-        // can do it properly
-        assertEquals(6, eva.evaluate(cellSUM).getNumberValue(), 0);
-
-        // Test the index
-        // Again, the formula string will be right but
-        // lacking row count, evaluated will be right
-        HSSFCell cellIDX = rowIDX.getCell(0);
-        assertEquals("INDEX(C:C,2,1)", cellIDX.getCellFormula());
-        assertEquals(2, eva.evaluate(cellIDX).getNumberValue(), 0);
-
-        // Across two colums
-        HSSFCell cellSUM2D = rowSUM2D.getCell(0);
-        assertEquals("SUM(C:D)", cellSUM2D.getCellFormula());
-        assertEquals(66, eva.evaluate(cellSUM2D).getNumberValue(), 0);
-        
-        wb.close();
-    }
-
-    /**
-     * Tests that we can evaluate boolean cells properly
-     */
-    @Test
-    public void testEvaluateBooleanInCell_bug44508() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        wb.setSheetName(0, "Sheet1");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-
-        cell.setCellFormula("1=1");
-
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        try {
-            fe.evaluateInCell(cell);
-        } catch (NumberFormatException e) {
-            fail("Identified bug 44508");
-        }
-        assertEquals(true, cell.getBooleanCellValue());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testClassCast_bug44861() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("44861.xls");
-
-        // Check direct
-        HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-
-        // And via calls
-        int numSheets = wb.getNumberOfSheets();
-        for (int i = 0; i < numSheets; i++) {
-            HSSFSheet s = wb.getSheetAt(i);
-            HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb);
-
-            for (Iterator<Row> rows = s.rowIterator(); rows.hasNext();) {
-                HSSFRow r = (HSSFRow)rows.next();
-                for (Iterator<Cell> cells = r.cellIterator(); cells.hasNext();) {
-                    HSSFCell c = (HSSFCell)cells.next();
-                    eval.evaluateFormulaCellEnum(c);
-                }
-            }
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public void testEvaluateInCellWithErrorCode_bug44950() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFRow row = sheet.createRow(1);
-        HSSFCell cell = row.createCell(0);
-        cell.setCellFormula("na()"); // this formula evaluates to an Excel error code '#N/A'
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        try {
-            fe.evaluateInCell(cell);
-        } catch (NumberFormatException e) {
-            if (e.getMessage().equals("You cannot get an error value from a non-error cell")) {
-                fail("Identified bug 44950 b");
-            }
-            throw e;
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testDateWithNegativeParts_bug48528() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFRow row = sheet.createRow(1);
-        HSSFCell cell = row.createCell(0);
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        // 5th Feb 2012 = 40944
-        // 1st Feb 2012 = 40940
-        // 5th Jan 2012 = 40913
-        // 5th Dec 2011 = 40882
-        // 5th Feb 2011 = 40579
-
-        cell.setCellFormula("DATE(2012,2,1)");
-        fe.notifyUpdateCell(cell);
-        assertEquals(40940.0, fe.evaluate(cell).getNumberValue(), 0);
-
-        cell.setCellFormula("DATE(2012,2,1+4)");
-        fe.notifyUpdateCell(cell);
-        assertEquals(40944.0, fe.evaluate(cell).getNumberValue(), 0);
-
-        cell.setCellFormula("DATE(2012,2-1,1+4)");
-        fe.notifyUpdateCell(cell);
-        assertEquals(40913.0, fe.evaluate(cell).getNumberValue(), 0);
-
-        cell.setCellFormula("DATE(2012,2,1-27)");
-        fe.notifyUpdateCell(cell);
-        assertEquals(40913.0, fe.evaluate(cell).getNumberValue(), 0);
-
-        cell.setCellFormula("DATE(2012,2-2,1+4)");
-        fe.notifyUpdateCell(cell);
-        assertEquals(40882.0, fe.evaluate(cell).getNumberValue(), 0);
-
-        cell.setCellFormula("DATE(2012,2,1-58)");
-        fe.notifyUpdateCell(cell);
-        assertEquals(40882.0, fe.evaluate(cell).getNumberValue(), 0);
-
-        cell.setCellFormula("DATE(2012,2-12,1+4)");
-        fe.notifyUpdateCell(cell);
-        assertEquals(40579.0, fe.evaluate(cell).getNumberValue(), 0);
-        
-        wb.close();
-    }
-
-    private static final class EvalListener extends EvaluationListener {
-        private int _countCacheHits;
-        private int _countCacheMisses;
-
-        public EvalListener() {
-            _countCacheHits = 0;
-            _countCacheMisses = 0;
-        }
-        public int getCountCacheHits() {
-            return _countCacheHits;
-        }
-        public int getCountCacheMisses() {
-            return _countCacheMisses;
-        }
-
-        @Override
-        public void onCacheHit(int sheetIndex, int srcRowNum, int srcColNum, ValueEval result) {
-            _countCacheHits++;
-        }
-        @Override
-        public void onStartEvaluate(EvaluationCell cell, ICacheEntry entry) {
-            _countCacheMisses++;
-        }
-    }
-
-    /**
-     * The HSSFFormula evaluator performance benefits greatly from caching of intermediate cell values
-     */
-    @Test
-    public void testSlowEvaluate45376() throws Exception {
-        /*
-         * Note - to observe behaviour without caching, disable the call to
-         * updateValue() from FormulaCellCacheEntry.updateFormulaResult().
-         */
-
-        // Firstly set up a sequence of formula cells where each depends on the  previous multiple
-        // times.  Without caching, each subsequent cell take about 4 times longer to evaluate.
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFRow row = sheet.createRow(0);
-        for(int i=1; i<10; i++) {
-            HSSFCell cell = row.createCell(i);
-            char prevCol = (char) ('A' + i-1);
-            String prevCell = prevCol + "1";
-            // this formula is inspired by the offending formula of the attachment for bug 45376
-            // IF(DATE(YEAR(A1),MONTH(A1)+1,1)<=$D$3,DATE(YEAR(A1),MONTH(A1)+1,1),NA()) etc
-            String formula = "IF(DATE(YEAR(" + prevCell + "),MONTH(" + prevCell + ")+1,1)<=$D$3," +
-                    "DATE(YEAR(" + prevCell + "),MONTH(" + prevCell + ")+1,1),NA())";
-            cell.setCellFormula(formula);
-        }
-        Calendar cal = LocaleUtil.getLocaleCalendar(2000, 0, 1, 0, 0, 0);
-        row.createCell(0).setCellValue(cal);
-
-        // Choose cell A9 instead of A10, so that the failing test case doesn't take too long to execute.
-        HSSFCell cell = row.getCell(8);
-        EvalListener evalListener = new EvalListener();
-        WorkbookEvaluator evaluator = WorkbookEvaluatorTestHelper.createEvaluator(wb, evalListener);
-        ValueEval ve = evaluator.evaluate(HSSFEvaluationTestHelper.wrapCell(cell));
-        int evalCount = evalListener.getCountCacheMisses();
-        if (evalCount > 10) {
-            // Without caching, evaluating cell 'A9' takes 21845 evaluations which consumes
-            // much time (~3 sec on Core 2 Duo 2.2GHz)
-            // short-circuit-if optimisation cuts this down to 255 evaluations which is still too high
-            // System.err.println("Cell A9 took " + evalCount + " intermediate evaluations");
-            fail("Identifed bug 45376 - Formula evaluator should cache values");
-        }
-        // With caching, the evaluationCount is 8 which is exactly the
-        // number of formula cells that needed to be evaluated.
-        assertEquals(8, evalCount);
-
-        // The cache hits would be 24 if fully evaluating all arguments of the
-        // "IF()" functions (Each of the 8 formulas has 4 refs to formula cells
-        // which result in 1 cache miss and 3 cache hits). However with the
-        // short-circuit-if optimisation, 2 of the cell refs get skipped
-        // reducing this metric 8.
-        assertEquals(8, evalListener.getCountCacheHits());
-
-        // confirm the evaluation result too
-        assertEquals(ErrorEval.NA, ve);
-        
-        wb.close();
-    }
-
-    @SuppressWarnings("resource")
-    @Test
-    public void test55747_55324() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFFormulaEvaluator ev = wb.getCreationHelper().createFormulaEvaluator();
-        HSSFSheet ws = wb.createSheet();
-        HSSFRow row = ws.createRow(0);
-        HSSFCell cell;
-
-        // Our test value
-        cell = row.createCell(0);
-        cell.setCellValue("abc");
-
-        // Lots of IF cases
-
-        cell = row.createCell(1);
-        cell.setCellFormula("IF(A1<>\"\",MID(A1,1,2),\"X\")");//if(expr,func,val)
-
-        cell = row.createCell(2);
-        cell.setCellFormula("IF(A1<>\"\",\"A\",\"B\")");// if(expr,val,val)
-
-        cell = row.createCell(3);
-        cell.setCellFormula("IF(A1=\"\",\"X\",MID(A1,1,2))");//if(expr,val,func),
-
-        cell = row.createCell(4);
-        cell.setCellFormula("IF(A1<>\"\",\"X\",MID(A1,1,2))");//if(expr,val,func),
-
-        cell = row.createCell(5);
-        cell.setCellFormula("IF(A1=\"\",MID(A1,1,2),MID(A1,2,2))");//if(exp,func,func)
-        cell = row.createCell(6);
-        cell.setCellFormula("IF(A1<>\"\",MID(A1,1,2),MID(A1,2,2))");//if(exp,func,func)
-
-        cell = row.createCell(7);
-        cell.setCellFormula("IF(MID(A1,1,2)<>\"\",\"A\",\"B\")");//if(func_expr,val,val)
-
-        // And some MID ones just to check
-        row = ws.createRow(1);
-        cell = row.createCell(1);
-        cell.setCellFormula("MID(A1,1,2)");
-        cell = row.createCell(2);
-        cell.setCellFormula("MID(A1,2,2)");
-        cell = row.createCell(3);
-        cell.setCellFormula("MID(A1,2,1)");
-        cell = row.createCell(4);
-        cell.setCellFormula("MID(A1,3,1)");
-
-        // Evaluate
-        ev.evaluateAll();
-
-        // Save and re-load
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        ws = wb.getSheetAt(0);
-
-        // Check the MID Ptgs in Row 2 have V RefPtgs for A1
-        row = ws.getRow(1);
-        for (int i=1; i<=4; i++) {
-            cell = row.getCell(i);
-            Ptg[] ptgs = getPtgs(cell);
-            assertEquals(4, ptgs.length);
-            assertEquals(FuncPtg.class,   ptgs[3].getClass());
-            assertEquals("MID", ((FuncPtg)ptgs[3]).getName());
-            assertRefPtgA1('V', ptgs, 0);
-        }
-
-        // Now check the IF formulas
-        row = ws.getRow(0);
-
-        // H1, MID is used in the expression IF checks, so A1 should be V
-        cell = row.getCell(CellReference.convertColStringToIndex("H"));
-        assertRefPtgA1('V', getPtgs(cell), 0);
-
-        // E1, MID is used in the FALSE route, so:
-        //  A1 should be V in the IF check
-        //  A1 should be R in the FALSE route
-        cell = row.getCell(CellReference.convertColStringToIndex("E"));
-        assertRefPtgA1('V', getPtgs(cell), 0);
-        assertRefPtgA1('R', getPtgs(cell), 6);
-
-        // Check that, for B1, D1, F1 and G1, the references to A1
-        //  from all of IF check, True and False are V
-        cell = row.getCell(CellReference.convertColStringToIndex("B"));
-        assertRefPtgA1('V', getPtgs(cell), 0);
-//      assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
-        
-        cell = row.getCell(CellReference.convertColStringToIndex("D"));
-        assertRefPtgA1('V', getPtgs(cell), 0);
-//      assertRefPtgA1('V', getPtgs(cell), 6); // FIXME!
-        
-        cell = row.getCell(CellReference.convertColStringToIndex("F"));
-        assertRefPtgA1('V', getPtgs(cell), 0);
-//      assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
-//      assertRefPtgA1('V', getPtgs(cell), 9); // FIXME!
-        
-        cell = row.getCell(CellReference.convertColStringToIndex("G"));
-        assertRefPtgA1('V', getPtgs(cell), 0);
-//      assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
-//      assertRefPtgA1('V', getPtgs(cell), 9); // FIXME!
-        
-        
-        // Check our cached values were correctly evaluated
-        cell = row.getCell(CellReference.convertColStringToIndex("A"));
-        assertEquals("abc", cell.getStringCellValue());
-        cell = row.getCell(CellReference.convertColStringToIndex("B"));
-        assertEquals("ab", cell.getStringCellValue());
-        cell = row.getCell(CellReference.convertColStringToIndex("C"));
-        assertEquals("A", cell.getStringCellValue());
-        cell = row.getCell(CellReference.convertColStringToIndex("D"));
-        assertEquals("ab", cell.getStringCellValue());
-        cell = row.getCell(CellReference.convertColStringToIndex("E"));
-        assertEquals("X", cell.getStringCellValue());
-        cell = row.getCell(CellReference.convertColStringToIndex("F"));
-        assertEquals("bc", cell.getStringCellValue());
-        cell = row.getCell(CellReference.convertColStringToIndex("G"));
-        assertEquals("ab", cell.getStringCellValue());
-        cell = row.getCell(CellReference.convertColStringToIndex("H"));
-        assertEquals("A", cell.getStringCellValue());
-
-        // Enable this to write out + check in Excel
-        if (OUTPUT_TEST_FILES) {
-            FileOutputStream out = new FileOutputStream("/tmp/test.xls");
-            wb.write(out);
-            out.close();
-        }
-    }
-    private Ptg[] getPtgs(HSSFCell cell) {
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals(FormulaRecordAggregate.class, cell.getCellValueRecord().getClass());
-        FormulaRecordAggregate agg = (FormulaRecordAggregate)cell.getCellValueRecord();
-        FormulaRecord rec = agg.getFormulaRecord();
-        return rec.getParsedExpression();
-    }
-    private void assertRefPtgA1(char rv, Ptg[] ptgs, int at) {
-        Ptg ptg = ptgs[at];
-        assertEquals(RefPtg.class, ptg.getClass());
-        assertEquals(0,  ((RefPtg)ptg).getRow());
-        assertEquals(0,  ((RefPtg)ptg).getColumn());
-        assertEquals(rv, ((RefPtg)ptg).getRVAType());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
deleted file mode 100644
index 3ceebff..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.util.Iterator;
-
-import org.apache.poi.ss.usermodel.CellType;
-
-import junit.framework.TestCase;
-
-/**
- * Tests to show that our documentation at
- *  http://poi.apache.org/hssf/eval.html
- * all actually works as we'd expect them to
- */
-public final class TestFormulaEvaluatorDocs extends TestCase {
-
-	/**
-	 * http://poi.apache.org/hssf/eval.html#EvaluateAll
-	 */
-	public void testEvaluateAll() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet s1 = wb.createSheet();
-		HSSFSheet s2 = wb.createSheet();
-		wb.setSheetName(0, "S1");
-		wb.setSheetName(1, "S2");
-		
-		HSSFRow s1r1 = s1.createRow(0);
-		HSSFRow s1r2 = s1.createRow(1);
-		HSSFRow s2r1 = s2.createRow(0);
-		
-		HSSFCell s1r1c1 = s1r1.createCell(0);
-		HSSFCell s1r1c2 = s1r1.createCell(1);
-		HSSFCell s1r1c3 = s1r1.createCell(2);
-		s1r1c1.setCellValue(22.3);
-		s1r1c2.setCellValue(33.4);
-		s1r1c3.setCellFormula("SUM(A1:B1)");
-		
-		HSSFCell s1r2c1 = s1r2.createCell(0);
-		HSSFCell s1r2c2 = s1r2.createCell(1);
-		HSSFCell s1r2c3 = s1r2.createCell(2);
-		s1r2c1.setCellValue(-1.2);
-		s1r2c2.setCellValue(-3.4);
-		s1r2c3.setCellFormula("SUM(A2:B2)");
-		
-		HSSFCell s2r1c1 = s2r1.createCell(0);
-		s2r1c1.setCellFormula("S1!A1");
-		
-		// Not evaluated yet
-		assertEquals(0.0, s1r1c3.getNumericCellValue(), 0);
-		assertEquals(0.0, s1r2c3.getNumericCellValue(), 0);
-		assertEquals(0.0, s2r1c1.getNumericCellValue(), 0);
-		
-		// Do a full evaluate, as per our docs
-		// uses evaluateFormulaCell()
-		for(int sheetNum = 0; sheetNum < wb.getNumberOfSheets(); sheetNum++) {
-			HSSFSheet sheet = wb.getSheetAt(sheetNum);
-			HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb);
-
-			for(Iterator rit = sheet.rowIterator(); rit.hasNext();) {
-				HSSFRow r = (HSSFRow)rit.next();
-
-				for(Iterator cit = r.cellIterator(); cit.hasNext();) {
-					HSSFCell c = (HSSFCell)cit.next();
-					if(c.getCellTypeEnum() == CellType.FORMULA) {
-						evaluator.evaluateFormulaCellEnum(c);
-						
-						// For testing - all should be numeric
-						assertEquals(CellType.NUMERIC, evaluator.evaluateFormulaCellEnum(c));
-					}
-				}
-			}
-		}
-		
-		// Check now as expected
-		assertEquals(55.7, wb.getSheetAt(0).getRow(0).getCell(2).getNumericCellValue(), 0);
-		assertEquals("SUM(A1:B1)", wb.getSheetAt(0).getRow(0).getCell(2).getCellFormula());
-		assertEquals(CellType.FORMULA, wb.getSheetAt(0).getRow(0).getCell(2).getCellTypeEnum());
-		
-		assertEquals(-4.6, wb.getSheetAt(0).getRow(1).getCell(2).getNumericCellValue(), 0);
-		assertEquals("SUM(A2:B2)", wb.getSheetAt(0).getRow(1).getCell(2).getCellFormula());
-		assertEquals(CellType.FORMULA, wb.getSheetAt(0).getRow(1).getCell(2).getCellTypeEnum());
-		
-		assertEquals(22.3, wb.getSheetAt(1).getRow(0).getCell(0).getNumericCellValue(), 0);
-		assertEquals("'S1'!A1", wb.getSheetAt(1).getRow(0).getCell(0).getCellFormula());
-		assertEquals(CellType.FORMULA, wb.getSheetAt(1).getRow(0).getCell(0).getCellTypeEnum());
-		
-		
-		// Now do the alternate call, which zaps the formulas
-		// uses evaluateInCell()
-		for(int sheetNum = 0; sheetNum < wb.getNumberOfSheets(); sheetNum++) {
-			HSSFSheet sheet = wb.getSheetAt(sheetNum);
-			HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb);
-
-			for(Iterator rit = sheet.rowIterator(); rit.hasNext();) {
-				HSSFRow r = (HSSFRow)rit.next();
-
-				for(Iterator cit = r.cellIterator(); cit.hasNext();) {
-					HSSFCell c = (HSSFCell)cit.next();
-					if(c.getCellTypeEnum() == CellType.FORMULA) {
-						evaluator.evaluateInCell(c);
-					}
-				}
-			}
-		}
-		
-		assertEquals(55.7, wb.getSheetAt(0).getRow(0).getCell(2).getNumericCellValue(), 0);
-		assertEquals(CellType.NUMERIC, wb.getSheetAt(0).getRow(0).getCell(2).getCellTypeEnum());
-		
-		assertEquals(-4.6, wb.getSheetAt(0).getRow(1).getCell(2).getNumericCellValue(), 0);
-		assertEquals(CellType.NUMERIC, wb.getSheetAt(0).getRow(1).getCell(2).getCellTypeEnum());
-		
-		assertEquals(22.3, wb.getSheetAt(1).getRow(0).getCell(0).getNumericCellValue(), 0);
-		assertEquals(CellType.NUMERIC, wb.getSheetAt(1).getRow(0).getCell(0).getCellTypeEnum());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
deleted file mode 100644
index e2a9927..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
+++ /dev/null
@@ -1,990 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.util.TempFile;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Cell;
-
-/**
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Avik Sengupta
- */
-public final class TestFormulas extends TestCase {
-
-    private static HSSFWorkbook openSample(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleWorkbook(sampleFileName);
-    }
-
-    /**
-     * Add 1+1 -- WHoohoo!
-     */
-    public void testBasicAddIntegers() {
-
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        //get our minimum values
-        r = s.createRow(1);
-        c = r.createCell(1);
-        c.setCellFormula(1 + "+" + 1);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s  = wb.getSheetAt(0);
-        r  = s.getRow(1);
-        c  = r.getCell(1);
-
-        assertTrue("Formula is as expected",("1+1".equals(c.getCellFormula())));
-    }
-
-    /**
-     * Add various integers
-     */
-    public void testAddIntegers() {
-        binomialOperator("+");
-    }
-
-    /**
-     * Multiply various integers
-     */
-    public void testMultplyIntegers() {
-        binomialOperator("*");
-    }
-
-    /**
-     * Subtract various integers
-     */
-    public void testSubtractIntegers() {
-        binomialOperator("-");
-    }
-
-    /**
-     * Subtract various integers
-     */
-    public void testDivideIntegers() {
-        binomialOperator("/");
-    }
-
-    /**
-     * Exponentialize various integers;
-     */
-    public void testPowerIntegers() {
-        binomialOperator("^");
-    }
-
-    /**
-     * Concatenate two numbers 1&2 = 12
-     */
-    public void testConcatIntegers() {
-        binomialOperator("&");
-    }
-
-    /**
-     * tests 1*2+3*4
-     */
-    public void testOrderOfOperationsMultiply() {
-        orderTest("1*2+3*4");
-    }
-
-    /**
-     * tests 1*2+3^4
-     */
-    public void testOrderOfOperationsPower() {
-        orderTest("1*2+3^4");
-    }
-
-    /**
-     * Tests that parenthesis are obeyed
-     */
-    public void testParenthesis() {
-        orderTest("(1*3)+2+(1+2)*(3^4)^5");
-    }
-
-    public void testReferencesOpr() {
-        String[] operation = new String[] {
-                            "+", "-", "*", "/", "^", "&"
-                           };
-        for (final String op : operation) {
-            operationRefTest(op);
-        }
-    }
-
-    /**
-     * Tests creating a file with floating point in a formula.
-     *
-     */
-    public void testFloat() {
-        floatTest("*");
-        floatTest("/");
-    }
-
-    private static void floatTest(String operator) {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        //get our minimum values
-
-        r = s.createRow(0);
-        c = r.createCell(1);
-        c.setCellFormula(""+Float.MIN_VALUE + operator + Float.MIN_VALUE);
-
-       for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2) ) {
-            r = s.createRow(x);
-
-            for (int y = 1; y < 256 && y > 0; y= (short) (y +2)) {
-
-                c = r.createCell(y);
-                c.setCellFormula("" + x+"."+y + operator + y +"."+x);
-
-
-            }
-        }
-        if (s.getLastRowNum() < Short.MAX_VALUE) {
-            r = s.createRow(0);
-            c = r.createCell(0);
-            c.setCellFormula("" + Float.MAX_VALUE + operator + Float.MAX_VALUE);
-        }
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-
-        floatVerify(operator, wb);
-    }
-
-    private static void floatVerify(String operator, HSSFWorkbook wb) {
-
-        HSSFSheet        s      = wb.getSheetAt(0);
-
-        // don't know how to check correct result .. for the moment, we just verify that the file can be read.
-
-        for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
-            HSSFRow r = s.getRow(x);
-
-            for (int y = 1; y < 256 && y > 0; y=(short)(y+2)) {
-
-                HSSFCell c = r.getCell(y);
-                assertTrue("got a formula",c.getCellFormula()!=null);
-
-                assertTrue("loop Formula is as expected "+x+"."+y+operator+y+"."+x+"!="+c.getCellFormula(),(
-                (""+x+"."+y+operator+y+"."+x).equals(c.getCellFormula()) ));
-            }
-        }
-    }
-
-    public void testAreaSum() {
-        areaFunctionTest("SUM");
-    }
-
-    public void testAreaAverage() {
-        areaFunctionTest("AVERAGE");
-    }
-
-    public void testRefArraySum() {
-        refArrayFunctionTest("SUM");
-    }
-
-    public void testAreaArraySum() {
-        refAreaArrayFunctionTest("SUM");
-    }
-
-    private static void operationRefTest(String operator) {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        //get our minimum values
-        r = s.createRow(0);
-        c = r.createCell(1);
-        c.setCellFormula("A2" + operator + "A3");
-
-        for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
-            r = s.createRow(x);
-
-            for (int y = 1; y < 256 && y > 0; y++) {
-
-                String ref=null;
-                String ref2=null;
-                short refx1=0;
-                short refy1=0;
-                short refx2=0;
-                short refy2=0;
-                if (x +50 < Short.MAX_VALUE) {
-                    refx1=(short)(x+50);
-                    refx2=(short)(x+46);
-                } else {
-                    refx1=(short)(x-4);
-                    refx2=(short)(x-3);
-                }
-
-                if (y+50 < 255) {
-                    refy1=(short)(y+50);
-                    refy2=(short)(y+49);
-                } else {
-                    refy1=(short)(y-4);
-                    refy2=(short)(y-3);
-                }
-
-                c = r.getCell(y);
-                CellReference cr= new CellReference(refx1,refy1, false, false);
-                ref=cr.formatAsString();
-                cr=new CellReference(refx2,refy2, false, false);
-                ref2=cr.formatAsString();
-
-                c = r.createCell(y);
-                c.setCellFormula("" + ref + operator + ref2);
-
-
-
-            }
-        }
-
-        //make sure we do the maximum value of the Int operator
-        if (s.getLastRowNum() < Short.MAX_VALUE) {
-            r = s.getRow(0);
-            c = r.createCell(0);
-            c.setCellFormula("" + "B1" + operator + "IV255");
-        }
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        operationalRefVerify(operator, wb);
-    }
-
-    /**
-     * Opens the sheet we wrote out by binomialOperator and makes sure the formulas
-     * all match what we expect (x operator y)
-     */
-    private static void operationalRefVerify(String operator, HSSFWorkbook wb) {
-
-        HSSFSheet        s      = wb.getSheetAt(0);
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        //get our minimum values
-        r = s.getRow(0);
-        c = r.getCell(1);
-        //get our minimum values
-        assertTrue("minval Formula is as expected A2"+operator+"A3 != "+c.getCellFormula(),
-        ( ("A2"+operator+"A3").equals(c.getCellFormula())
-        ));
-
-
-        for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
-            r = s.getRow(x);
-
-            for (int y = 1; y < 256 && y > 0; y++) {
-
-                int refx1;
-                int refy1;
-                int refx2;
-                int refy2;
-                if (x +50 < Short.MAX_VALUE) {
-                    refx1=x+50;
-                    refx2=x+46;
-                } else {
-                    refx1=x-4;
-                    refx2=x-3;
-                }
-
-                if (y+50 < 255) {
-                    refy1=y+50;
-                    refy2=y+49;
-                } else {
-                    refy1=y-4;
-                    refy2=y-3;
-                }
-
-                c = r.getCell(y);
-                CellReference cr= new CellReference(refx1, refy1, false, false);
-                String ref=cr.formatAsString();
-                ref=cr.formatAsString();
-                cr=new CellReference(refx2,refy2, false, false);
-                String ref2=cr.formatAsString();
-
-
-                assertTrue("loop Formula is as expected "+ref+operator+ref2+"!="+c.getCellFormula(),(
-                (""+ref+operator+ref2).equals(c.getCellFormula())
-                                                         )
-                );
-            }
-        }
-
-        //test our maximum values
-        r = s.getRow(0);
-        c = r.getCell(0);
-
-        assertEquals("B1"+operator+"IV255", c.getCellFormula());
-    }
-
-
-
-    /**
-     * tests order wrting out == order writing in for a given formula
-     */
-    private static void orderTest(String formula) {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        //get our minimum values
-        r = s.createRow(0);
-        c = r.createCell(1);
-        c.setCellFormula(formula);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s      = wb.getSheetAt(0);
-
-        //get our minimum values
-        r = s.getRow(0);
-        c = r.getCell(1);
-        assertTrue("minval Formula is as expected",
-                   formula.equals(c.getCellFormula())
-                  );
-    }
-
-    /**
-     * All multi-binomial operator tests use this to create a worksheet with a
-     * huge set of x operator y formulas.  Next we call binomialVerify and verify
-     * that they are all how we expect.
-     */
-    private static void binomialOperator(String operator) {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        //get our minimum values
-        r = s.createRow(0);
-        c = r.createCell(1);
-        c.setCellFormula(1 + operator + 1);
-
-        for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
-            r = s.createRow(x);
-
-            for (int y = 1; y < 256 && y > 0; y++) {
-
-                c = r.createCell(y);
-                c.setCellFormula("" + x + operator + y);
-
-            }
-        }
-
-        //make sure we do the maximum value of the Int operator
-        if (s.getLastRowNum() < Short.MAX_VALUE) {
-            r = s.getRow(0);
-            c = r.createCell(0);
-            c.setCellFormula("" + Short.MAX_VALUE + operator + Short.MAX_VALUE);
-        }
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        binomialVerify(operator, wb);
-    }
-
-    /**
-     * Opens the sheet we wrote out by binomialOperator and makes sure the formulas
-     * all match what we expect (x operator y)
-     */
-    private static void binomialVerify(String operator, HSSFWorkbook wb) {
-        HSSFSheet        s      = wb.getSheetAt(0);
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        //get our minimum values
-        r = s.getRow(0);
-        c = r.getCell(1);
-        assertTrue("minval Formula is as expected 1"+operator+"1 != "+c.getCellFormula(),
-        ( ("1"+operator+"1").equals(c.getCellFormula())
-        ));
-
-        for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
-            r = s.getRow(x);
-
-            for (int y = 1; y < 256 && y > 0; y++) {
-
-                c = r.getCell(y);
-
-                assertTrue("loop Formula is as expected "+x+operator+y+"!="+c.getCellFormula(),(
-                (""+x+operator+y).equals(c.getCellFormula())
-                                                         )
-                );
-            }
-        }
-
-        //test our maximum values
-        r = s.getRow(0);
-        c = r.getCell(0);
-
-        assertTrue("maxval Formula is as expected",(
-        (""+Short.MAX_VALUE+operator+Short.MAX_VALUE).equals(c.getCellFormula())
-                                                   )
-        );
-    }
-
-    /**
-     * Writes a function then tests to see if its correct
-     */
-    public static void areaFunctionTest(String function) {
-
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-
-        r = s.createRow(0);
-
-        c = r.createCell(0);
-        c.setCellFormula(function+"(A2:A3)");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s = wb.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-
-        assertTrue("function ="+function+"(A2:A3)",
-                    ( (function+"(A2:A3)").equals((function+"(A2:A3)")) )
-                  );
-    }
-
-    /**
-     * Writes a function then tests to see if its correct
-     */
-    public void refArrayFunctionTest(String function) {
-
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-
-        r = s.createRow(0);
-
-        c = r.createCell(0);
-        c.setCellFormula(function+"(A2,A3)");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s = wb.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-
-        assertTrue("function ="+function+"(A2,A3)",
-                    ( (function+"(A2,A3)").equals(c.getCellFormula()) )
-                  );
-    }
-
-
-    /**
-     * Writes a function then tests to see if its correct
-     *
-     */
-    public void refAreaArrayFunctionTest(String function) {
-
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-
-        r = s.createRow(0);
-
-        c = r.createCell(0);
-        c.setCellFormula(function+"(A2:A4,B2:B4)");
-        c=r.createCell(1);
-        c.setCellFormula(function+"($A$2:$A4,B$2:B4)");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s = wb.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-
-        assertTrue("function ="+function+"(A2:A4,B2:B4)",
-                    ( (function+"(A2:A4,B2:B4)").equals(c.getCellFormula()) )
-                  );
-
-        c=r.getCell(1);
-        assertTrue("function ="+function+"($A$2:$A4,B$2:B4)",
-                    ( (function+"($A$2:$A4,B$2:B4)").equals(c.getCellFormula()) )
-                  );
-    }
-
-
-
-    public void testAbsRefs() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        HSSFRow r;
-        HSSFCell c;
-
-        r = s.createRow(0);
-        c = r.createCell(0);
-        c.setCellFormula("A3+A2");
-        c=r.createCell(1);
-        c.setCellFormula("$A3+$A2");
-        c=r.createCell(2);
-        c.setCellFormula("A$3+A$2");
-        c=r.createCell(3);
-        c.setCellFormula("$A$3+$A$2");
-        c=r.createCell(4);
-        c.setCellFormula("SUM($A$3,$A$2)");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s = wb.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-        assertTrue("A3+A2", ("A3+A2").equals(c.getCellFormula()));
-         c = r.getCell(1);
-        assertTrue("$A3+$A2", ("$A3+$A2").equals(c.getCellFormula()));
-         c = r.getCell(2);
-        assertTrue("A$3+A$2", ("A$3+A$2").equals(c.getCellFormula()));
-         c = r.getCell(3);
-        assertTrue("$A$3+$A$2", ("$A$3+$A$2").equals(c.getCellFormula()));
-         c = r.getCell(4);
-        assertTrue("SUM($A$3,$A$2)", ("SUM($A$3,$A$2)").equals(c.getCellFormula()));
-    }
-
-    public void testSheetFunctions() {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet("A");
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-        r = s.createRow(0);
-        c = r.createCell(0);c.setCellValue(1);
-        c = r.createCell(1);c.setCellValue(2);
-
-        s      = wb.createSheet("B");
-        r = s.createRow(0);
-        c=r.createCell(0); c.setCellFormula("AVERAGE(A!A1:B1)");
-        c=r.createCell(1); c.setCellFormula("A!A1+A!B1");
-        c=r.createCell(2); c.setCellFormula("A!$A$1+A!$B1");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-
-        s = wb.getSheet("B");
-        r = s.getRow(0);
-        c = r.getCell(0);
-        assertTrue("expected: AVERAGE(A!A1:B1) got: "+c.getCellFormula(), ("AVERAGE(A!A1:B1)").equals(c.getCellFormula()));
-        c = r.getCell(1);
-        assertTrue("expected: A!A1+A!B1 got: "+c.getCellFormula(), ("A!A1+A!B1").equals(c.getCellFormula()));
-    }
-
-    public void testRVAoperands() throws Exception {
-        File file = TempFile.createTempFile("testFormulaRVA",".xls");
-        FileOutputStream out    = new FileOutputStream(file);
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet();
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-
-        r = s.createRow(0);
-
-        c = r.createCell(0);
-        c.setCellFormula("A3+A2");
-        c=r.createCell(1);
-        c.setCellFormula("AVERAGE(A3,A2)");
-        c=r.createCell(2);
-        c.setCellFormula("ROW(A3)");
-        c=r.createCell(3);
-        c.setCellFormula("AVERAGE(A2:A3)");
-        c=r.createCell(4);
-        c.setCellFormula("POWER(A2,A3)");
-        c=r.createCell(5);
-        c.setCellFormula("SIN(A2)");
-
-        c=r.createCell(6);
-        c.setCellFormula("SUM(A2:A3)");
-
-        c=r.createCell(7);
-        c.setCellFormula("SUM(A2,A3)");
-
-        r = s.createRow(1);c=r.createCell(0); c.setCellValue(2.0);
-         r = s.createRow(2);c=r.createCell(0); c.setCellValue(3.0);
-
-        wb.write(out);
-        out.close();
-        assertTrue("file exists",file.exists());
-    }
-
-    public void testStringFormulas() {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet("A");
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-        r = s.createRow(0);
-        c=r.createCell(1); c.setCellFormula("UPPER(\"abc\")");
-        c=r.createCell(2); c.setCellFormula("LOWER(\"ABC\")");
-        c=r.createCell(3); c.setCellFormula("CONCATENATE(\" my \",\" name \")");
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb);
-
-        wb = openSample("StringFormulas.xls");
-        s = wb.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-        assertEquals("UPPER(\"xyz\")", c.getCellFormula());
-    }
-
-    public void testLogicalFormulas() {
-
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet("A");
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-        r = s.createRow(0);
-        c=r.createCell(1); c.setCellFormula("IF(A1<A2,B1,B2)");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s = wb.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(1);
-        assertEquals("Formula in cell 1 ","IF(A1<A2,B1,B2)",c.getCellFormula());
-    }
-
-    public void testDateFormulas() {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet("testSheet1");
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-
-        r = s.createRow(0 );
-        c = r.createCell(0 );
-
-        HSSFCellStyle cellStyle = wb.createCellStyle();
-        cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy h:mm"));
-        c.setCellValue(new Date());
-        c.setCellStyle(cellStyle);
-
-       // assertEquals("Checking hour = " + hour, date.getTime().getTime(),
-       //              HSSFDateUtil.getJavaDate(excelDate).getTime());
-
-        for (int k=1; k < 100; k++) {
-          r=s.createRow(k);
-          c=r.createCell(0);
-          c.setCellFormula("A"+(k)+"+1");
-          c.setCellStyle(cellStyle);
-        }
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb);
-    }
-
-
-    public void testIfFormulas() {
-        HSSFWorkbook     wb     = new HSSFWorkbook();
-        HSSFSheet        s      = wb.createSheet("testSheet1");
-        HSSFRow          r      = null;
-        HSSFCell         c      = null;
-        r = s.createRow(0);
-        c=r.createCell(1); c.setCellValue(1);
-        c=r.createCell(2); c.setCellValue(2);
-        c=r.createCell(3); c.setCellFormula("MAX(A1:B1)");
-        c=r.createCell(4); c.setCellFormula("IF(A1=D1,\"A1\",\"B1\")");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        s = wb.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(4);
-
-        assertTrue("expected: IF(A1=D1,\"A1\",\"B1\") got "+c.getCellFormula(), ("IF(A1=D1,\"A1\",\"B1\")").equals(c.getCellFormula()));
-
-        wb = openSample("IfFormulaTest.xls");
-        s = wb.getSheetAt(0);
-        r = s.getRow(3);
-        c = r.getCell(0);
-        assertTrue("expected: IF(A3=A1,\"A1\",\"A2\") got "+c.getCellFormula(), ("IF(A3=A1,\"A1\",\"A2\")").equals(c.getCellFormula()));
-        //c = r.getCell((short)1);
-        //assertTrue("expected: A!A1+A!B1 got: "+c.getCellFormula(), ("A!A1+A!B1").equals(c.getCellFormula()));
-
-
-        wb     = new HSSFWorkbook();
-        s      = wb.createSheet("testSheet1");
-        r      = null;
-        c      = null;
-        r = s.createRow(0);
-        c=r.createCell(0); c.setCellFormula("IF(1=1,0,1)");
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb);
-
-        wb     = new HSSFWorkbook();
-        s      = wb.createSheet("testSheet1");
-        r      = null;
-        c      = null;
-        r = s.createRow(0);
-        c=r.createCell(0);
-        c.setCellValue(1);
-
-        c=r.createCell(1);
-        c.setCellValue(3);
-
-
-        HSSFCell formulaCell=r.createCell(3);
-
-        r = s.createRow(1);
-        c=r.createCell(0);
-        c.setCellValue(3);
-
-        c=r.createCell(1);
-        c.setCellValue(7);
-
-        formulaCell.setCellFormula("IF(A1=B1,AVERAGE(A1:B1),AVERAGE(A2:B2))");
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb);
-    }
-
-    public void testSumIf() {
-        String function ="SUMIF(A1:A5,\">4000\",B1:B5)";
-
-        HSSFWorkbook wb = openSample("sumifformula.xls");
-
-        HSSFSheet        s      = wb.getSheetAt(0);
-        HSSFRow          r      = s.getRow(0);
-        HSSFCell         c      = r.getCell(2);
-        assertEquals(function, c.getCellFormula());
-
-
-        wb     = new HSSFWorkbook();
-        s      = wb.createSheet();
-
-        r = s.createRow(0);
-        c=r.createCell(0); c.setCellValue(1000);
-        c=r.createCell(1); c.setCellValue(1);
-
-
-        r = s.createRow(1);
-        c=r.createCell(0); c.setCellValue(2000);
-        c=r.createCell(1); c.setCellValue(2);
-
-        r = s.createRow(2);
-        c=r.createCell(0); c.setCellValue(3000);
-        c=r.createCell(1); c.setCellValue(3);
-
-        r = s.createRow(3);
-        c=r.createCell(0); c.setCellValue(4000);
-        c=r.createCell(1); c.setCellValue(4);
-
-        r = s.createRow(4);
-        c=r.createCell(0); c.setCellValue(5000);
-        c=r.createCell(1); c.setCellValue(5);
-
-        r = s.getRow(0);
-        c=r.createCell(2); c.setCellFormula(function);
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb);
-    }
-
-    public void testSquareMacro() {
-        HSSFWorkbook w = openSample("SquareMacro.xls");
-
-        HSSFSheet s0 = w.getSheetAt(0);
-        HSSFRow[] r = {s0.getRow(0), s0.getRow(1)};
-
-        HSSFCell a1 = r[0].getCell(0);
-        assertEquals("square(1)", a1.getCellFormula());
-        assertEquals(1d, a1.getNumericCellValue(), 1e-9);
-
-        HSSFCell a2 = r[1].getCell(0);
-        assertEquals("square(2)", a2.getCellFormula());
-        assertEquals(4d, a2.getNumericCellValue(), 1e-9);
-
-        HSSFCell b1 = r[0].getCell(1);
-        assertEquals("IF(TRUE,square(1))", b1.getCellFormula());
-        assertEquals(1d, b1.getNumericCellValue(), 1e-9);
-
-        HSSFCell b2 = r[1].getCell(1);
-        assertEquals("IF(TRUE,square(2))", b2.getCellFormula());
-        assertEquals(4d, b2.getNumericCellValue(), 1e-9);
-
-        HSSFCell c1 = r[0].getCell(2);
-        assertEquals("square(square(1))", c1.getCellFormula());
-        assertEquals(1d, c1.getNumericCellValue(), 1e-9);
-
-        HSSFCell c2 = r[1].getCell(2);
-        assertEquals("square(square(2))", c2.getCellFormula());
-        assertEquals(16d, c2.getNumericCellValue(), 1e-9);
-
-        HSSFCell d1 = r[0].getCell(3);
-        assertEquals("square(one())", d1.getCellFormula());
-        assertEquals(1d, d1.getNumericCellValue(), 1e-9);
-
-        HSSFCell d2 = r[1].getCell(3);
-        assertEquals("square(two())", d2.getCellFormula());
-        assertEquals(4d, d2.getNumericCellValue(), 1e-9);
-    }
-
-    public void testStringFormulaRead() {
-        HSSFWorkbook w = openSample("StringFormulas.xls");
-        HSSFCell c = w.getSheetAt(0).getRow(0).getCell(0);
-        assertEquals("String Cell value","XYZ",c.getRichStringCellValue().getString());
-    }
-
-    /** test for bug 34021*/
-    public void testComplexSheetRefs () throws IOException {
-         HSSFWorkbook sb = new HSSFWorkbook();
-         try {
-             HSSFSheet s1 = sb.createSheet("Sheet a.1");
-             HSSFSheet s2 = sb.createSheet("Sheet.A");
-             s2.createRow(1).createCell(2).setCellFormula("'Sheet a.1'!A1");
-             s1.createRow(1).createCell(2).setCellFormula("'Sheet.A'!A1");
-             File file = TempFile.createTempFile("testComplexSheetRefs",".xls");
-             FileOutputStream stream = new FileOutputStream(file);
-             try {
-                 sb.write(stream);
-             } finally {
-                 stream.close();
-             }
-         } finally {
-             sb.close();
-         }
-    }
-
-    /** Unknown Ptg 3C*/
-    public void test27272_1() throws Exception {
-        HSSFWorkbook wb = openSample("27272_1.xls");
-        wb.getSheetAt(0);
-        assertEquals("Reference for named range ", "Compliance!#REF!",wb.getNameAt(0).getRefersToFormula());
-        File outF = TempFile.createTempFile("bug27272_1",".xls");
-        FileOutputStream stream = new FileOutputStream(outF);
-        try {
-            wb.write(stream);
-        } finally {
-            stream.close();
-        }
-        System.out.println("Open "+outF.getAbsolutePath()+" in Excel");
-    }
-    /** Unknown Ptg 3D*/
-    public void test27272_2() throws Exception {
-        HSSFWorkbook wb = openSample("27272_2.xls");
-        assertEquals("Reference for named range ", "LOAD.POD_HISTORIES!#REF!",wb.getNameAt(0).getRefersToFormula());
-        File outF = TempFile.createTempFile("bug27272_2",".xls");
-        FileOutputStream stream = new FileOutputStream(outF);
-        try {
-            wb.write(stream);
-        } finally {
-            stream.close();
-        }
-        System.out.println("Open "+outF.getAbsolutePath()+" in Excel");
-    }
-
-    /** MissingArgPtg 
-     * @throws IOException */
-    public void testMissingArgPtg() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        try {
-            HSSFCell cell = wb.createSheet("Sheet1").createRow(4).createCell(0);
-            cell.setCellFormula("IF(A1=\"A\",1,)");
-        } finally {
-            wb.close();
-        }
-    }
-
-    public void testSharedFormula() {
-        HSSFWorkbook wb = openSample("SharedFormulaTest.xls");
-
-        assertEquals("A$1*2", wb.getSheetAt(0).getRow(1).getCell(1).toString());
-        assertEquals("$A11*2", wb.getSheetAt(0).getRow(11).getCell(1).toString());
-        assertEquals("DZ2*2", wb.getSheetAt(0).getRow(1).getCell(128).toString());
-        assertEquals("B32770*2", wb.getSheetAt(0).getRow(32768).getCell(1).toString());
-    }
-
-    /**
-     * Test creation / evaluation of formulas with sheet-level names
-     */
-    public void testSheetLevelFormulas(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        HSSFRow row;
-        HSSFSheet sh1 = wb.createSheet("Sheet1");
-        HSSFName nm1 = wb.createName();
-        nm1.setNameName("sales_1");
-        nm1.setSheetIndex(0);
-        nm1.setRefersToFormula("Sheet1!$A$1");
-        row = sh1.createRow(0);
-        row.createCell(0).setCellValue(3);
-        row.createCell(1).setCellFormula("sales_1");
-        row.createCell(2).setCellFormula("sales_1*2");
-
-
-        HSSFSheet sh2 = wb.createSheet("Sheet2");
-        HSSFName nm2 = wb.createName();
-        nm2.setNameName("sales_1");
-        nm2.setSheetIndex(1);
-        nm2.setRefersToFormula("Sheet2!$A$1");
-
-        row = sh2.createRow(0);
-        row.createCell(0).setCellValue(5);
-        row.createCell(1).setCellFormula("sales_1");
-        row.createCell(2).setCellFormula("sales_1*3");
-
-        //check that NamePtg refers to the correct NameRecord
-        Ptg[] ptgs1 = HSSFFormulaParser.parse("sales_1", wb, FormulaType.CELL, 0);
-        NamePtg nPtg1 = (NamePtg)ptgs1[0];
-        assertSame(nm1, wb.getNameAt(nPtg1.getIndex()));
-
-        Ptg[] ptgs2 = HSSFFormulaParser.parse("sales_1", wb, FormulaType.CELL, 1);
-        NamePtg nPtg2 = (NamePtg)ptgs2[0];
-        assertSame(nm2, wb.getNameAt(nPtg2.getIndex()));
-
-        //check that the formula evaluator returns the correct result
-        HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb);
-        assertEquals(3.0, evaluator.evaluate(sh1.getRow(0).getCell(1)).getNumberValue(), 0.0);
-        assertEquals(6.0, evaluator.evaluate(sh1.getRow(0).getCell(2)).getNumberValue(), 0.0);
-
-        assertEquals(5.0, evaluator.evaluate(sh2.getRow(0).getCell(1)).getNumberValue(), 0.0);
-        assertEquals(15.0, evaluator.evaluate(sh2.getRow(0).getCell(2)).getNumberValue(), 0.0);
-    }
-
-    /**
-     * Verify that FormulaParser handles defined names beginning with underscores,
-     * see Bug #49640
-     * @throws IOException 
-     */
-    public void testFormulasWithUnderscore() throws IOException{
-        HSSFWorkbook wb = new HSSFWorkbook();
-        try {
-            Name nm1 = wb.createName();
-            nm1.setNameName("_score1");
-            nm1.setRefersToFormula("A1");
-    
-            Name nm2 = wb.createName();
-            nm2.setNameName("_score2");
-            nm2.setRefersToFormula("A2");
-    
-            Sheet sheet = wb.createSheet();
-            Cell cell = sheet.createRow(0).createCell(2);
-            cell.setCellFormula("_score1*SUM(_score1+_score2)");
-            assertEquals("_score1*SUM(_score1+_score2)", cell.getCellFormula());
-        } finally {
-            wb.close();
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
deleted file mode 100644
index fd3b1a6..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.record.DBCellRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.ss.usermodel.BaseTestCell;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * Tests various functionality having to do with {@link HSSFCell}.  For instance support for
- * particular datatypes, etc.
- */
-public final class TestHSSFCell extends BaseTestCell {
-
-	public TestHSSFCell() {
-		super(HSSFITestDataProvider.instance);
-	}
-
-	/**
-	 * Checks that the recognition of files using 1904 date windowing
-	 *  is working properly. Conversion of the date is also an issue,
-	 *  but there's a separate unit test for that.
-	 */
-	@Test
-	public void testDateWindowingRead() throws IOException {
-	    Calendar cal = LocaleUtil.getLocaleCalendar(2000, 0, 1, 0, 0, 0);// Jan. 1, 2000
-		Date date = cal.getTime();
-
-		// first check a file with 1900 Date Windowing
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("1900DateWindowing.xls");
-		HSSFSheet sheet = wb.getSheetAt(0);
-
-		assertEquals("Date from file using 1900 Date Windowing",
-				date.getTime(),
-				sheet.getRow(0).getCell(0).getDateCellValue().getTime());
-		wb.close();
-
-		// now check a file with 1904 Date Windowing
-		wb = HSSFTestDataSamples.openSampleWorkbook("1904DateWindowing.xls");
-		sheet	= wb.getSheetAt(0);
-
-		assertEquals("Date from file using 1904 Date Windowing",
-				date.getTime(),
-				sheet.getRow(0).getCell(0).getDateCellValue().getTime());
-		wb.close();
-	}
-
-
-
-	/**
-	 * Checks that dates are properly written to both types of files:
-	 * those with 1900 and 1904 date windowing.  Note that if the
-	 * previous test ({@link #testDateWindowingRead}) fails, the
-	 * results of this test are meaningless.
-	 */
-	@Test
-	public void testDateWindowingWrite() throws IOException {
-	    Calendar cal = LocaleUtil.getLocaleCalendar(2000,0,1,0,0,0); // Jan. 1, 2000
-		Date date = cal.getTime();
-
-		// first check a file with 1900 Date Windowing
-		HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("1900DateWindowing.xls");
-
-		setCell(wb1, 0, 1, date);
-		HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-
-		assertEquals("Date from file using 1900 Date Windowing",
-				date.getTime(),
-				readCell(wb2, 0, 1).getTime());
-        wb1.close();
-		wb2.close();
-
-		// now check a file with 1904 Date Windowing
-		wb1 = HSSFTestDataSamples.openSampleWorkbook("1904DateWindowing.xls");
-		setCell(wb1, 0, 1, date);
-		wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-		assertEquals("Date from file using 1900 Date Windowing",
-				date.getTime(),
-				readCell(wb2, 0, 1).getTime());
-        wb1.close();
-        wb2.close();
-	}
-
-	private static void setCell(HSSFWorkbook workbook, int rowIdx, int colIdx, Date date) {
-		HSSFSheet sheet = workbook.getSheetAt(0);
-		HSSFRow row = sheet.getRow(rowIdx);
-		HSSFCell cell = row.getCell(colIdx);
-
-		if (cell == null) {
-			cell = row.createCell(colIdx);
-		}
-		cell.setCellValue(date);
-	}
-
-	private static Date readCell(HSSFWorkbook workbook, int rowIdx, int colIdx) {
-		HSSFSheet sheet = workbook.getSheetAt(0);
-		HSSFRow row = sheet.getRow(rowIdx);
-		HSSFCell cell = row.getCell(colIdx);
-		return cell.getDateCellValue();
-	}
-
-	/**
-	 * Tests that the active cell can be correctly read and set
-	 */
-	@Test
-	public void testActiveCell() throws IOException {
-		//read in sample
-		HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("Simple.xls");
-
-		//check initial position
-		HSSFSheet umSheet = wb1.getSheetAt(0);
-		InternalSheet s = umSheet.getSheet();
-		assertEquals("Initial active cell should be in col 0",
-			(short) 0, s.getActiveCellCol());
-		assertEquals("Initial active cell should be on row 1",
-			1, s.getActiveCellRow());
-
-		//modify position through HSSFCell
-		HSSFCell cell = umSheet.createRow(3).createCell(2);
-		cell.setAsActiveCell();
-		assertEquals("After modify, active cell should be in col 2",
-			(short) 2, s.getActiveCellCol());
-		assertEquals("After modify, active cell should be on row 3",
-			3, s.getActiveCellRow());
-
-		//write book to temp file; read and verify that position is serialized
-		HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-		wb1.close();
-
-		umSheet = wb2.getSheetAt(0);
-		s = umSheet.getSheet();
-
-		assertEquals("After serialize, active cell should be in col 2",
-			(short) 2, s.getActiveCellCol());
-		assertEquals("After serialize, active cell should be on row 3",
-			3, s.getActiveCellRow());
-		
-		wb2.close();
-	}
-
-	
-	@Test
-	public void testActiveCellBug56114() throws IOException {
-	    Workbook wb = new HSSFWorkbook();
-	    Sheet sh = wb.createSheet();
-
-	    sh.createRow(0);
-	    sh.createRow(1);
-	    sh.createRow(2);
-	    sh.createRow(3);
-
-	    Cell cell = sh.getRow(1).createCell(3);
-	    sh.getRow(3).createCell(3);
-        
-        assertEquals(0, ((HSSFSheet)wb.getSheetAt(0)).getSheet().getActiveCellRow());
-        assertEquals(0, ((HSSFSheet)wb.getSheetAt(0)).getSheet().getActiveCellCol());
-
-	    cell.setAsActiveCell();
-        
-        assertEquals(1, ((HSSFSheet)wb.getSheetAt(0)).getSheet().getActiveCellRow());
-        assertEquals(3, ((HSSFSheet)wb.getSheetAt(0)).getSheet().getActiveCellCol());
-
-//	    FileOutputStream fos = new FileOutputStream("/tmp/56114.xls");
-//
-//	    wb.write(fos);
-//
-//	    fos.close();
-	            
-	    Workbook wbBack = _testDataProvider.writeOutAndReadBack(wb);
-	    wb.close();
-
-	    assertEquals(1, ((HSSFSheet)wbBack.getSheetAt(0)).getSheet().getActiveCellRow());
-	    assertEquals(3, ((HSSFSheet)wbBack.getSheetAt(0)).getSheet().getActiveCellCol());
-	    
-	    wbBack.getSheetAt(0).getRow(3).getCell(3).setAsActiveCell();
-        
-        assertEquals(3, ((HSSFSheet)wbBack.getSheetAt(0)).getSheet().getActiveCellRow());
-        assertEquals(3, ((HSSFSheet)wbBack.getSheetAt(0)).getSheet().getActiveCellCol());
-	    
-//	    fos = new FileOutputStream("/tmp/56114a.xls");
-//
-//	    wbBack.write(fos);
-//
-//	    fos.close();
-	            
-        Workbook wbBack2 = _testDataProvider.writeOutAndReadBack(wbBack);
-        wbBack.close();
-        
-        assertEquals(3, ((HSSFSheet)wbBack2.getSheetAt(0)).getSheet().getActiveCellRow());
-        assertEquals(3, ((HSSFSheet)wbBack2.getSheetAt(0)).getSheet().getActiveCellCol());
-        wbBack2.close();
-	}
-
-	/**
-	 * Test reading hyperlinks
-	 */
-	@Test
-	public void testWithHyperlink() throws IOException {
-
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithHyperlink.xls");
-
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFCell cell = sheet.getRow(4).getCell(0);
-		HSSFHyperlink link = cell.getHyperlink();
-		assertNotNull(link);
-
-		assertEquals("Foo", link.getLabel());
-		assertEquals("http://poi.apache.org/", link.getAddress());
-		assertEquals(4, link.getFirstRow());
-		assertEquals(0, link.getFirstColumn());
-		
-		wb.close();
-	}
-
-	/**
-	 * Test reading hyperlinks
-	 */
-	@Test
-	public void testWithTwoHyperlinks() throws IOException {
-
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithTwoHyperLinks.xls");
-
-		HSSFSheet sheet = wb.getSheetAt(0);
-
-		HSSFCell cell1 = sheet.getRow(4).getCell(0);
-		HSSFHyperlink link1 = cell1.getHyperlink();
-		assertNotNull(link1);
-		assertEquals("Foo", link1.getLabel());
-		assertEquals("http://poi.apache.org/", link1.getAddress());
-		assertEquals(4, link1.getFirstRow());
-		assertEquals(0, link1.getFirstColumn());
-
-		HSSFCell cell2 = sheet.getRow(8).getCell(1);
-		HSSFHyperlink link2 = cell2.getHyperlink();
-		assertNotNull(link2);
-		assertEquals("Bar", link2.getLabel());
-		assertEquals("http://poi.apache.org/hssf/", link2.getAddress());
-		assertEquals(8, link2.getFirstRow());
-		assertEquals(1, link2.getFirstColumn());
-		
-		wb.close();
-	}
-
-	/**
-	 * Test to ensure we can only assign cell styles that belong
-	 *  to our workbook, and not those from other workbooks.
-	 */
-	@Test
-	public void testCellStyleWorkbookMatch() throws IOException {
-		HSSFWorkbook wbA = new HSSFWorkbook();
-		HSSFWorkbook wbB = new HSSFWorkbook();
-
-		HSSFCellStyle styA = wbA.createCellStyle();
-		HSSFCellStyle styB = wbB.createCellStyle();
-
-		styA.verifyBelongsToWorkbook(wbA);
-		styB.verifyBelongsToWorkbook(wbB);
-		try {
-			styA.verifyBelongsToWorkbook(wbB);
-			fail();
-		} catch (IllegalArgumentException e) {
-			// expected during successful test
-		}
-		try {
-			styB.verifyBelongsToWorkbook(wbA);
-			fail();
-		} catch (IllegalArgumentException e) {
-			// expected during successful test
-		}
-
-		Cell cellA = wbA.createSheet().createRow(0).createCell(0);
-		Cell cellB = wbB.createSheet().createRow(0).createCell(0);
-
-		cellA.setCellStyle(styA);
-		cellB.setCellStyle(styB);
-		try {
-			cellA.setCellStyle(styB);
-			fail();
-		} catch (IllegalArgumentException e) {
-			// expected during successful test
-		}
-		try {
-			cellB.setCellStyle(styA);
-			fail();
-		} catch (IllegalArgumentException e) {
-			// expected during successful test
-		}
-		
-		wbB.close();
-		wbA.close();
-	}
-
-	/**
-	 * Test for small bug observable around r736460 (prior to version 3.5).  POI fails to remove
-	 * the {@link StringRecord} following the {@link FormulaRecord} after the result type had been
-	 * changed to number/boolean/error.  Excel silently ignores the extra record, but some POI
-	 * versions (prior to bug 46213 / r717883) crash instead.
-	 * @throws IOException 
-	 */
-	@Test
-	public void testCachedTypeChange() throws IOException {
-		HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-		Cell cell = sheet.createRow(0).createCell(0);
-		cell.setCellFormula("A1");
-		cell.setCellValue("abc");
-		confirmStringRecord(sheet, true);
-		cell.setCellValue(123);
-		Record[] recs = RecordInspector.getRecords(sheet, 0);
-		if (recs.length == 28 && recs[23] instanceof StringRecord) {
-		    wb.close();
-			throw new AssertionFailedError("Identified bug - leftover StringRecord");
-		}
-		confirmStringRecord(sheet, false);
-
-		// string to error code
-		cell.setCellValue("abc");
-		confirmStringRecord(sheet, true);
-		cell.setCellErrorValue(FormulaError.REF.getCode());
-		confirmStringRecord(sheet, false);
-
-		// string to boolean
-		cell.setCellValue("abc");
-		confirmStringRecord(sheet, true);
-		cell.setCellValue(false);
-		confirmStringRecord(sheet, false);
-		wb.close();
-	}
-
-	private static void confirmStringRecord(HSSFSheet sheet, boolean isPresent) {
-		Record[] recs = RecordInspector.getRecords(sheet, 0);
-		assertEquals(isPresent ? 28 : 27, recs.length);
-		int index = 22;
-		Record fr = recs[index++];
-		assertEquals(FormulaRecord.class, fr.getClass());
-		if (isPresent) {
-			assertEquals(StringRecord.class, recs[index++].getClass());
-		} else {
-			assertFalse(StringRecord.class == recs[index].getClass());
-		}
-		Record dbcr = recs[index];
-		assertEquals(DBCellRecord.class, dbcr.getClass());
-	}
-
-    /**
-     * HSSF prior to version 3.7 had a bug: it could write a NaN but could not read such a file back.
-     */
-	@Test
-	public void testReadNaN() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49761.xls");
-        assertNotNull(wb);
-        wb.close();
-    }
-
-	@Test
-	public void testHSSFCell() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        HSSFRow row = sheet.createRow(0);
-        row.createCell(0);
-        HSSFCell cell = new HSSFCell(wb, sheet, 0, (short)0);
-        assertNotNull(cell);
-        wb.close();
-    }
-
-    @Test
-    public void testDeprecatedMethods() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-
-        // cover some deprecated methods and other smaller stuff...
-        assertEquals(wb.getWorkbook(), cell.getBoundWorkbook());
-
-        try {
-            cell.getCachedFormulaResultTypeEnum();
-            fail("Should catch exception");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-        
-        cell.removeCellComment();
-        cell.removeCellComment();
-        
-        wb.close();
-    }
-
-    @Test
-    public void testCellType() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-
-        cell.setCellType(CellType.BLANK);
-        assertNull(null, cell.getDateCellValue());
-        assertFalse(cell.getBooleanCellValue());
-        assertEquals("", cell.toString());
-        
-        cell.setCellType(CellType.STRING);
-        assertEquals("", cell.toString());
-        cell.setCellType(CellType.STRING);
-        cell.setCellValue(1.2);
-        cell.setCellType(CellType.NUMERIC);
-        assertEquals("1.2", cell.toString());
-        cell.setCellType(CellType.BOOLEAN);
-        assertEquals("TRUE", cell.toString());
-        cell.setCellType(CellType.BOOLEAN);
-        cell.setCellValue("" + FormulaError.VALUE.name());
-        cell.setCellType(CellType.ERROR);
-        assertEquals("#VALUE!", cell.toString());
-        cell.setCellType(CellType.ERROR);
-        cell.setCellType(CellType.BOOLEAN);
-        assertEquals("FALSE", cell.toString());
-        cell.setCellValue(1.2);
-        cell.setCellType(CellType.NUMERIC);
-        assertEquals("1.2", cell.toString());
-        cell.setCellType(CellType.BOOLEAN);
-        cell.setCellType(CellType.STRING);
-        cell.setCellType(CellType.ERROR);
-        cell.setCellType(CellType.STRING);
-        cell.setCellValue(1.2);
-        cell.setCellType(CellType.NUMERIC);
-        cell.setCellType(CellType.STRING);
-        assertEquals("1.2", cell.toString());
-        
-        cell.setCellValue((String)null);
-        cell.setCellValue((RichTextString)null);
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
deleted file mode 100644
index 96c2d92..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherClientAnchorRecord;
-import org.apache.poi.hssf.model.ConvertAnchor;
-
-/**
- * Various tests for HSSFClientAnchor.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Yegor Kozlov (yegor at apache.org)
- */
-public final class TestHSSFClientAnchor extends TestCase {
-    public void testGetAnchorHeightInPoints() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("test");
-        HSSFClientAnchor a = new HSSFClientAnchor(0,0,1023,255,(short)0,0,(short)0,0);
-        float p = a.getAnchorHeightInPoints(sheet);
-        assertEquals(12.7,p,0.001);
-
-        sheet.createRow(0).setHeightInPoints(14);
-        a = new HSSFClientAnchor(0,0,1023,255,(short)0,0,(short)0,0);
-        p = a.getAnchorHeightInPoints(sheet);
-        assertEquals(13.945,p,0.001);
-
-        a = new HSSFClientAnchor(0,0,1023,127,(short)0,0,(short)0,0);
-        p = a.getAnchorHeightInPoints(sheet);
-        assertEquals(6.945,p,0.001);
-
-        a = new HSSFClientAnchor(0,126,1023,127,(short)0,0,(short)0,0);
-        p = a.getAnchorHeightInPoints(sheet);
-        assertEquals(0.054,p,0.001);
-
-        a = new HSSFClientAnchor(0,0,1023,0,(short)0,0,(short)0,1);
-        p = a.getAnchorHeightInPoints(sheet);
-        assertEquals(14.0,p,0.001);
-
-        sheet.createRow(0).setHeightInPoints(12);
-        a = new HSSFClientAnchor(0,127,1023,127,(short)0,0,(short)0,1);
-        p = a.getAnchorHeightInPoints(sheet);
-        assertEquals(12.372,p,0.001);
-
-    }
-
-    /**
-     * When HSSFClientAnchor is converted into EscherClientAnchorRecord
-     * check that dx1, dx2, dy1 and dy2 are written "as is".
-     * (Bug 42999 reported that dx1 and dx2 are swapped if dx1>dx2. It doesn't make sense for client anchors.)
-     */
-    public void testConvertAnchor() {
-        HSSFClientAnchor[] anchors = {
-            new HSSFClientAnchor( 0 , 0 , 0 , 0 ,(short)0, 1,(short)1,3),
-            new HSSFClientAnchor( 100 , 0 , 900 , 255 ,(short)0, 1,(short)1,3),
-            new HSSFClientAnchor( 900 , 0 , 100 , 255 ,(short)0, 1,(short)1,3)
-        };
-        for (HSSFClientAnchor anchor : anchors) {
-            EscherClientAnchorRecord record = (EscherClientAnchorRecord)ConvertAnchor.createAnchor(anchor);
-            assertEquals(anchor.getDx1(), record.getDx1());
-            assertEquals(anchor.getDx2(), record.getDx2());
-            assertEquals(anchor.getDy1(), record.getDy1());
-            assertEquals(anchor.getDy2(), record.getDy2());
-            assertEquals(anchor.getCol1(), record.getCol1());
-            assertEquals(anchor.getCol2(), record.getCol2());
-            assertEquals(anchor.getRow1(), record.getRow1());
-            assertEquals(anchor.getRow2(), record.getRow2());
-        }
-    }
-
-    public void testAnchorHeightInPoints(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-
-        HSSFClientAnchor[] anchor = {
-            new HSSFClientAnchor( 0 , 0,    0 , 0 ,(short)0, 1,(short)1, 3),
-            new HSSFClientAnchor( 0 , 254 , 0 , 126 ,(short)0, 1,(short)1, 3),
-            new HSSFClientAnchor( 0 , 128 , 0 , 128 ,(short)0, 1,(short)1, 3),
-            new HSSFClientAnchor( 0 , 0 , 0 , 128 ,(short)0, 1,(short)1, 3),
-        };
-        float[] ref = {25.5f, 19.125f, 25.5f, 31.875f};
-        for (int i = 0; i < anchor.length; i++) {
-            float height = anchor[i].getAnchorHeightInPoints(sheet);
-            assertEquals(ref[i], height, 0);
-        }
-    }
-
-    /**
-     * Check {@link HSSFClientAnchor} constructor does not treat 32768 as -32768.
-     */
-    public void testCanHaveRowGreaterThan32767() {
-        // Maximum permitted row number should be 65535.
-        HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 32768, (short) 0, 32768);
-
-        assertEquals(32768, anchor.getRow1());
-        assertEquals(32768, anchor.getRow2());
-    }
-
-    /**
-     * Check the maximum is not set at 255*256 instead of 256*256 - 1.
-     */
-    public void testCanHaveRowUpTo65535() {
-        HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 65535, (short) 0, 65535);
-
-        assertEquals(65535, anchor.getRow1());
-        assertEquals(65535, anchor.getRow2());
-    }
-
-    public void testCannotHaveRowGreaterThan65535() {
-        try {
-            new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 65536, (short) 0, 65536);
-            fail("Expected IllegalArgumentException to be thrown");
-        } catch (IllegalArgumentException ex) {
-            // pass
-        }
-    }
-
-    /**
-     * Check the same maximum value enforced when using {@link HSSFClientAnchor#setRow1}.
-     */
-    public void testCanSetRowUpTo65535() {
-        HSSFClientAnchor anchor = new HSSFClientAnchor();
-        anchor.setRow1(65535);
-        anchor.setRow2(65535);
-
-        assertEquals(65535, anchor.getRow1());
-        assertEquals(65535, anchor.getRow2());
-    }
-
-    public void testCannotSetRow1GreaterThan65535() {
-        try {
-            new HSSFClientAnchor().setRow1(65536);
-            fail("Expected IllegalArgumentException to be thrown");
-        } catch (IllegalArgumentException ex) {
-            // pass
-        }
-    }
-    public void testCannotSetRow2GreaterThan65535() {
-        try {
-            new HSSFClientAnchor().setRow2(65536);
-            fail("Expected IllegalArgumentException to be thrown");
-        } catch (IllegalArgumentException ex) {
-            // pass
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
deleted file mode 100644
index 9e40695..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.hssf.model.TestDrawingAggregate.decompress;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.hssf.record.NoteRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.TextObjectRecord;
-import org.apache.poi.ss.usermodel.BaseTestCellComment;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.junit.Test;
-
-/**
- * Tests TestHSSFCellComment.
- *
- * @author  Yegor Kozlov
- */
-public final class TestHSSFComment extends BaseTestCellComment {
-
-    public TestHSSFComment() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void defaultShapeType() {
-        HSSFComment comment = new HSSFComment((HSSFShape)null, new HSSFClientAnchor());
-        assertEquals(HSSFSimpleShape.OBJECT_TYPE_COMMENT, comment.getShapeType());
-    }
-
-    /**
-     *  HSSFCell#findCellComment should NOT rely on the order of records
-     * when matching cells and their cell comments. The correct algorithm is to map
-     */
-    @Test
-    public void bug47924() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("47924.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFCell cell;
-        HSSFComment comment;
-
-        cell = sheet.getRow(0).getCell(0);
-        comment = cell.getCellComment();
-        assertEquals("a1", comment.getString().getString());
-
-        cell = sheet.getRow(1).getCell(0);
-        comment = cell.getCellComment();
-        assertEquals("a2", comment.getString().getString());
-
-        cell = sheet.getRow(2).getCell(0);
-        comment = cell.getCellComment();
-        assertEquals("a3", comment.getString().getString());
-
-        cell = sheet.getRow(2).getCell(2);
-        comment = cell.getCellComment();
-        assertEquals("c3", comment.getString().getString());
-
-        cell = sheet.getRow(4).getCell(1);
-        comment = cell.getCellComment();
-        assertEquals("b5", comment.getString().getString());
-
-        cell = sheet.getRow(5).getCell(2);
-        comment = cell.getCellComment();
-        assertEquals("c6", comment.getString().getString());
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testBug56380InsertComments() throws Exception {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        Sheet sheet = workbook.createSheet();
-        Drawing drawing = sheet.createDrawingPatriarch();
-        int noOfRows = 1025;
-        String comment = "c";
-        
-        for(int i = 0; i < noOfRows; i++) {
-            Row row = sheet.createRow(i);
-            Cell cell = row.createCell(0);
-            insertComment(drawing, cell, comment + i);
-        }
-
-        // assert that the comments are created properly before writing
-        checkComments(sheet, noOfRows, comment);
-
-        /*// store in temp-file
-        OutputStream fs = new FileOutputStream("/tmp/56380.xls");
-        try {
-            sheet.getWorkbook().write(fs);
-        } finally {
-            fs.close();
-        }*/
-        
-        // save and recreate the workbook from the saved file
-        HSSFWorkbook workbookBack = HSSFTestDataSamples.writeOutAndReadBack(workbook);
-        sheet = workbookBack.getSheetAt(0);
-        
-        // assert that the comments are created properly after reading back in
-        checkComments(sheet, noOfRows, comment);
-        
-        workbook.close();
-        workbookBack.close();
-    }
-
-    @Test
-    public void testBug56380InsertTooManyComments() throws Exception {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        try {
-            Sheet sheet = workbook.createSheet();
-            Drawing drawing = sheet.createDrawingPatriarch();
-            String comment = "c";
-    
-            for(int rowNum = 0;rowNum < 258;rowNum++) {
-            	sheet.createRow(rowNum);
-            }
-            
-            // should still work, for some reason DrawingManager2.allocateShapeId() skips the first 1024...
-            for(int count = 1025;count < 65535;count++) {
-            	int rowNum = count / 255;
-            	int cellNum = count % 255;
-                Cell cell = sheet.getRow(rowNum).createCell(cellNum);
-                try {
-                	Comment commentObj = insertComment(drawing, cell, comment + cellNum);
-                	
-                	assertEquals(count, ((HSSFComment)commentObj).getNoteRecord().getShapeId());
-                } catch (IllegalArgumentException e) {
-                	throw new IllegalArgumentException("While adding shape number " + count, e);
-                }
-            }        	
-            
-            // this should now fail to insert
-            Row row = sheet.createRow(257);
-            Cell cell = row.createCell(0);
-            insertComment(drawing, cell, comment + 0);
-        } finally {
-        	workbook.close();
-        }
-    }
-
-    private void checkComments(Sheet sheet, int noOfRows, String comment) {
-        for(int i = 0; i < noOfRows; i++) {
-            assertNotNull(sheet.getRow(i));
-            assertNotNull(sheet.getRow(i).getCell(0));
-            assertNotNull("Did not get a Cell Comment for row " + i, sheet.getRow(i).getCell(0).getCellComment());
-            assertNotNull(sheet.getRow(i).getCell(0).getCellComment().getString());
-            assertEquals(comment + i, sheet.getRow(i).getCell(0).getCellComment().getString().getString());
-        }
-    }
-
-    private Comment insertComment(Drawing drawing, Cell cell, String message) {
-        CreationHelper factory = cell.getSheet().getWorkbook().getCreationHelper();
-        
-        ClientAnchor anchor = factory.createClientAnchor();
-        anchor.setCol1(cell.getColumnIndex());
-        anchor.setCol2(cell.getColumnIndex() + 1);
-        anchor.setRow1(cell.getRowIndex());
-        anchor.setRow2(cell.getRowIndex() + 1);
-        anchor.setDx1(100); 
-        anchor.setDx2(100);
-        anchor.setDy1(100);
-        anchor.setDy2(100);
-            
-        Comment comment = drawing.createCellComment(anchor);
-        
-        RichTextString str = factory.createRichTextString(message);
-        comment.setString(str);
-        comment.setAuthor("fanfy");
-        cell.setCellComment(comment);
-        
-        return comment;
-    }
-    
-    @Test
-    public void resultEqualsToNonExistingAbstractShape() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFComment comment = patriarch.createCellComment(new HSSFClientAnchor());
-        HSSFRow row = sh.createRow(0);
-        HSSFCell cell = row.createCell(0);
-        cell.setCellComment(comment);
-
-        assertEquals(comment.getEscherContainer().getChildRecords().size(), 5);
-
-        //sp record
-        byte[] expected = decompress("H4sIAAAAAAAAAFvEw/WBg4GBgZEFSHAxMAAA9gX7nhAAAAA=");
-        byte[] actual = comment.getEscherContainer().getChild(0).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNgEPggxIANAABK4+laGgAAAA==");
-        actual = comment.getEscherContainer().getChild(2).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNgEPzAAAQACl6c5QgAAAA=");
-        actual = comment.getEscherContainer().getChild(3).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNg4P3AAAQA6pyIkQgAAAA=");
-        actual = comment.getEscherContainer().getChild(4).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        ObjRecord obj = comment.getObjRecord();
-
-        expected = decompress("H4sIAAAAAAAAAItlMGEQZRBikGRgZBF0YEACvAxiDLgBAJZsuoU4AAAA");
-        actual = obj.serialize();
-
-        assertEquals(expected.length, actual.length);
-        //assertArrayEquals(expected, actual);
-
-        TextObjectRecord tor = comment.getTextObjectRecord();
-
-        expected = decompress("H4sIAAAAAAAAANvGKMQgxMSABgBGi8T+FgAAAA==");
-        actual = tor.serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        NoteRecord note = comment.getNoteRecord();
-
-        expected = decompress("H4sIAAAAAAAAAJNh4GGAAEYWEAkAS0KXuRAAAAA=");
-        actual = note.serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        wb.close();
-    }
-
-    @Test
-    public void addToExistingFile() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-        int idx = wb.addPicture(new byte[]{1,2,3}, HSSFWorkbook.PICTURE_TYPE_PNG);
-
-        HSSFComment comment = patriarch.createCellComment(new HSSFClientAnchor());
-        comment.setColumn(5);
-        comment.setString(new HSSFRichTextString("comment1"));
-        comment = patriarch.createCellComment(new HSSFClientAnchor(0,0,100,100,(short)0,0,(short)10,10));
-        comment.setRow(5);
-        comment.setString(new HSSFRichTextString("comment2"));
-        comment.setBackgroundImage(idx);
-        assertEquals(comment.getBackgroundImageId(), idx);
-
-        assertEquals(patriarch.getChildren().size(), 2);
-
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wbBack.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        comment = (HSSFComment) patriarch.getChildren().get(1);
-        assertEquals(comment.getBackgroundImageId(), idx);
-        comment.resetBackgroundImage();
-        assertEquals(comment.getBackgroundImageId(), 0);
-
-        assertEquals(patriarch.getChildren().size(), 2);
-        comment = patriarch.createCellComment(new HSSFClientAnchor());
-        comment.setString(new HSSFRichTextString("comment3"));
-
-        assertEquals(patriarch.getChildren().size(), 3);
-        HSSFWorkbook wbBack2 = HSSFTestDataSamples.writeOutAndReadBack(wbBack);
-        sh = wbBack2.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-        comment = (HSSFComment) patriarch.getChildren().get(1);
-        assertEquals(comment.getBackgroundImageId(), 0);
-        assertEquals(patriarch.getChildren().size(), 3);
-        assertEquals(((HSSFComment) patriarch.getChildren().get(0)).getString().getString(), "comment1");
-        assertEquals(((HSSFComment) patriarch.getChildren().get(1)).getString().getString(), "comment2");
-        assertEquals(((HSSFComment) patriarch.getChildren().get(2)).getString().getString(), "comment3");
-        
-        wb.close();
-        wbBack.close();
-        wbBack2.close();
-    }
-
-    @Test
-    public void setGetProperties() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFComment comment = patriarch.createCellComment(new HSSFClientAnchor());
-        comment.setString(new HSSFRichTextString("comment1"));
-        assertEquals(comment.getString().getString(), "comment1");
-
-        comment.setAuthor("poi");
-        assertEquals(comment.getAuthor(), "poi");
-
-        comment.setColumn(3);
-        assertEquals(comment.getColumn(), 3);
-
-        comment.setRow(4);
-        assertEquals(comment.getRow(), 4);
-
-        comment.setVisible(false);
-        assertEquals(comment.isVisible(), false);
-
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wbBack.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        comment = (HSSFComment) patriarch.getChildren().get(0);
-
-        assertEquals(comment.getString().getString(), "comment1");
-        assertEquals("poi", comment.getAuthor());
-        assertEquals(comment.getColumn(), 3);
-        assertEquals(comment.getRow(), 4);
-        assertEquals(comment.isVisible(), false);
-
-        comment.setString(new HSSFRichTextString("comment12"));
-        comment.setAuthor("poi2");
-        comment.setColumn(32);
-        comment.setRow(42);
-        comment.setVisible(true);
-
-        HSSFWorkbook wbBack2 = HSSFTestDataSamples.writeOutAndReadBack(wbBack);
-        sh = wbBack2.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-        comment = (HSSFComment) patriarch.getChildren().get(0);
-
-        assertEquals(comment.getString().getString(), "comment12");
-        assertEquals("poi2", comment.getAuthor());
-        assertEquals(comment.getColumn(), 32);
-        assertEquals(comment.getRow(), 42);
-        assertEquals(comment.isVisible(), true);
-        
-        wb.close();
-        wbBack.close();
-        wbBack2.close();
-    }
-
-    @Test
-    public void existingFileWithComment() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("comments");
-        HSSFPatriarch drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-        HSSFComment comment = (HSSFComment) drawing.getChildren().get(0);
-        assertEquals(comment.getAuthor(), "evgeniy");
-        assertEquals(comment.getString().getString(), "evgeniy:\npoi test");
-        assertEquals(comment.getColumn(), 1);
-        assertEquals(comment.getRow(), 2);
-        wb.close();
-    }
-
-    @Test
-    public void findComments() throws IOException{
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFComment comment = patriarch.createCellComment(new HSSFClientAnchor());
-        HSSFRow row = sh.createRow(5);
-        HSSFCell cell = row.createCell(4);
-        cell.setCellComment(comment);
-
-        assertNotNull(sh.findCellComment(5, 4));
-        assertNull(sh.findCellComment(5, 5));
-
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wbBack.getSheetAt(0);
-
-        assertNotNull(sh.findCellComment(5, 4));
-        assertNull(sh.findCellComment(5, 5));
-        
-        wb.close();
-        wbBack.close();
-    }
-
-    @Test
-    public void initState() throws IOException{
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        EscherAggregate agg = HSSFTestHelper.getEscherAggregate(patriarch);
-        assertEquals(agg.getTailRecords().size(), 0);
-
-        HSSFComment comment = patriarch.createCellComment(new HSSFClientAnchor());
-        assertEquals(agg.getTailRecords().size(), 1);
-
-        HSSFSimpleShape shape = patriarch.createSimpleShape(new HSSFClientAnchor());
-        assertNotNull(shape);
-
-        assertEquals(comment.getOptRecord().getEscherProperties().size(), 10);
-        
-        wb.close();
-    }
-
-    @Test
-    public void shapeId() throws IOException{
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFComment comment = patriarch.createCellComment(new HSSFClientAnchor());
-
-        comment.setShapeId(2024);
-
-        assertEquals(comment.getShapeId(), 2024);
-
-        CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) comment.getObjRecord().getSubRecords().get(0);
-        assertEquals(2024, cod.getObjectId());
-        EscherSpRecord spRecord = (EscherSpRecord) comment.getEscherContainer().getChild(0);
-        assertEquals(2024, spRecord.getShapeId(), 2024);
-        assertEquals(2024, comment.getShapeId(), 2024);
-        assertEquals(2024, comment.getNoteRecord().getShapeId());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
deleted file mode 100644
index 63ba22c..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.*;
-import org.junit.Test;
-
-/**
- * HSSF-specific Conditional Formatting tests
- */
-public final class TestHSSFConditionalFormatting extends BaseTestConditionalFormatting {
-    public TestHSSFConditionalFormatting(){
-        super(HSSFITestDataProvider.instance);
-    }
-    @Override
-    protected void assertColour(String hexExpected, Color actual) {
-        assertNotNull("Colour must be given", actual);
-        if (actual instanceof HSSFColor) {
-            HSSFColor colour = (HSSFColor)actual;
-            assertEquals(hexExpected, colour.getHexString());
-        } else {
-            HSSFExtendedColor colour = (HSSFExtendedColor)actual;
-            if (hexExpected.length() == 8) {
-                assertEquals(hexExpected, colour.getARGBHex());
-            } else {
-                assertEquals(hexExpected, colour.getARGBHex().substring(2));
-            }
-        }
-    }
-
-    @Test
-    public void testRead() throws IOException {
-        testRead("WithConditionalFormatting.xls");
-    }
-    
-    @Test
-    public void testReadOffice2007() throws IOException {
-        testReadOffice2007("NewStyleConditionalFormattings.xls");
-    }
-
-    @Test
-    public void test53691() throws IOException {
-        SheetConditionalFormatting cf;
-        final Workbook wb = HSSFITestDataProvider.instance.openSampleWorkbook("53691.xls");
-        /*
-        FileInputStream s = new FileInputStream("C:\\temp\\53691bbadfixed.xls");
-        try {
-            wb = new HSSFWorkbook(s);
-        } finally {
-            s.close();
-        }
-
-        wb.removeSheetAt(1);*/
-        
-        // initially it is good
-        writeTemp53691(wb, "agood");
-        
-        // clone sheet corrupts it
-        Sheet sheet = wb.cloneSheet(0);
-        writeTemp53691(wb, "bbad");
-
-        // removing the sheet makes it good again
-        wb.removeSheetAt(wb.getSheetIndex(sheet));
-        writeTemp53691(wb, "cgood");
-        
-        // cloning again and removing the conditional formatting makes it good again
-        sheet = wb.cloneSheet(0);
-        removeConditionalFormatting(sheet);        
-        writeTemp53691(wb, "dgood");
-        
-        // cloning the conditional formatting manually makes it bad again
-        cf = sheet.getSheetConditionalFormatting();
-        SheetConditionalFormatting scf = wb.getSheetAt(0).getSheetConditionalFormatting();
-        for (int j = 0; j < scf.getNumConditionalFormattings(); j++) {
-            cf.addConditionalFormatting(scf.getConditionalFormattingAt(j));
-        }        
-        writeTemp53691(wb, "ebad");
-
-        // remove all conditional formatting for comparing BIFF output
-        removeConditionalFormatting(sheet);        
-        removeConditionalFormatting(wb.getSheetAt(0));        
-        writeTemp53691(wb, "fgood");
-        
-        wb.close();
-    }
-    
-    private void removeConditionalFormatting(Sheet sheet) {
-        SheetConditionalFormatting cf = sheet.getSheetConditionalFormatting();
-        for (int j = 0; j < cf.getNumConditionalFormattings(); j++) {
-            cf.removeConditionalFormatting(j);
-        }
-    }
-
-    private void writeTemp53691(Workbook wb, @SuppressWarnings("UnusedParameters") String suffix) throws IOException {
-        // assert that we can write/read it in memory
-        Workbook wbBack = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        assertNotNull(wbBack);
-        wbBack.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
deleted file mode 100644
index dd334b0..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.BaseTestDataFormat;
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.junit.Test;
-
-/**
- * Tests for {@link HSSFDataFormat}
- */
-public final class TestHSSFDataFormat extends BaseTestDataFormat {
-    private static POILogger _logger = POILogFactory.getLogger(TestHSSFDataFormat.class);
-
-    public TestHSSFDataFormat() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    /**
-     * [Bug 49928] formatCellValue returns incorrect value for \u00a3 formatted cells
-     */
-    @Override
-    @Test
-    public void test49928() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49928.xls");
-        doTest49928Core(wb);
-
-        // an attempt to register an existing format returns its index
-        int poundFmtIdx = wb.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getDataFormat();
-        assertEquals(poundFmtIdx, wb.createDataFormat().getFormat(poundFmt));
-
-        // now create a custom format with Pound (\u00a3)
-        DataFormat dataFormat = wb.createDataFormat();
-        short customFmtIdx = dataFormat.getFormat("\u00a3##.00[Yellow]");
-        assertTrue(customFmtIdx >= BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX );
-        assertEquals("\u00a3##.00[Yellow]", dataFormat.getFormat(customFmtIdx));
-        
-        wb.close();
-    }
-
-    /**
-     * [Bug 58532] Handle formats that go numnum, numK, numM etc 
-     */
-    @Override
-    @Test
-    public void test58532() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("FormatKM.xls");
-        doTest58532Core(wb);
-        wb.close();
-    }
-
-    /**
-     * Bug 51378: getDataFormatString method call crashes when reading the test file
-     */
-    @Test
-    public void test51378() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("12561-1.xls");
-        for (int i = 0; i < wb.getNumberOfSheets(); i++) {
-            HSSFSheet sheet = wb.getSheetAt(i);
-            for (Row row : sheet) {
-                for (Cell cell : row) {
-                    CellStyle style = cell.getCellStyle();
-
-                    String fmt = style.getDataFormatString();
-                    if(fmt == null) {
-                        _logger.log(POILogger.WARN, cell + ": " + fmt);
-                    }
-                }
-            }
-        }
-        wb.close();
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
deleted file mode 100644
index 35c307b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.Format;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Unit tests for HSSFDataFormatter.java
- */
-public final class TestHSSFDataFormatter {
-    private static TimeZone userTimeZone;
-
-    @BeforeClass
-    public static void setTimeZone() {
-        userTimeZone = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
-        LocaleUtil.setUserLocale(Locale.US);
-    }
-
-    @AfterClass
-    public static void resetTimeZone() {
-        LocaleUtil.setUserTimeZone(userTimeZone);
-        LocaleUtil.setUserLocale(Locale.ROOT);
-    }
-
-
-    private final HSSFDataFormatter formatter;
-    private final HSSFWorkbook wb;
-
-    public TestHSSFDataFormatter() {
-        // create the formatter to test
-        formatter = new HSSFDataFormatter();
-
-        // create a workbook to test with
-        wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        HSSFDataFormat format = wb.createDataFormat();
-
-        // create a row and put some cells in it
-        HSSFRow row = sheet.createRow(0);
-
-        // date value for July 8 1901 1:19 PM
-        double dateNum = 555.555;
-        // date value for July 8 1901 11:23 AM
-        double timeNum = 555.47431;
-
-        //valid date formats -- all should have "Jul" in output
-        String[] goodDatePatterns = {
-            "[$-F800]dddd\\,\\ mmmm\\ dd\\,\\ yyyy",
-            "mmm/d/yy\\ h:mm PM;@",
-            "mmmm/d/yy\\ h:mm;@",
-            "mmmm/d;@",
-            "mmmm/d/yy;@",
-            "mmm/dd/yy;@",
-            "[$-409]d\\-mmm;@",
-            "[$-409]d\\-mmm\\-yy;@",
-            "[$-409]dd\\-mmm\\-yy;@",
-            "[$-409]mmm\\-yy;@",
-            "[$-409]mmmm\\-yy;@",
-            "[$-409]mmmm\\ d\\,\\ yyyy;@",
-            "[$-409]mmm/d/yy\\ h:mm:ss;@",
-            "[$-409]mmmm/d/yy\\ h:mm:ss am;@",
-            "[$-409]mmmmm;@",
-            "[$-409]mmmmm\\-yy;@",
-            "mmmm/d/yyyy;@",
-            "[$-409]d\\-mmm\\-yyyy;@",
-            "[$-409]d\\-mmm;[$-3]d\\-mmm;@",      // international three-part
-            "[$-41f]d\\-mmm;[$-41f]d\\-mmm;@",      // turkish international three-part
-            "[$-F40f]d\\-mmm;[$-F40f]d\\-mmm;@",      // custom international three-part
-            "[$-F40f]d\\-mmm;[$-F40f]d\\-mmm;0;@"      // custom international four-part
-        };
-
-        //valid time formats - all should have 11:23 in output
-        String[] goodTimePatterns = {
-            "HH:MM",
-            "HH:MM:SS",
-            "HH:MM;HH:MM;HH:MM", 
-            // This is fun - blue if positive time,
-            //  red if negative time or green for zero!
-            "[BLUE]HH:MM;[RED]HH:MM;[GREEN]HH:MM", 
-            "yyyy-mm-dd hh:mm",
-            "yyyy-mm-dd hh:mm:ss",
-        };
-
-        // valid number formats
-        String[] goodNumPatterns = {
-            "#,##0.0000",
-            "#,##0;[Red]#,##0",
-            "(#,##0.00_);(#,##0.00)",
-            "($#,##0.00_);[Red]($#,##0.00)",
-            "$#,##0.00",
-            "[$-809]#,##0.00", // international format
-            "[$-2]#,##0.00", // international format
-            "[$-041f]#,##0.00", // international format
-            "0000.00000%",
-            "0.000E+00",
-            "0.00E+00",
-            "[BLACK]0.00;[COLOR 5]##.##",
-            "[>999999]#,,\"M\";[>999]#,\"K\";#", // num/K/M
-            "[>999999]#.000,,\"M\";[>999]#.000,\"K\";#.000", // with decimals
-            "[$-809]#,##0.00;[$-809]#,##0.00", // two-part international format
-            "[$-809]#,##0.00;[$-809]#,##0.00;0", // three-part international format
-            "[$-809]#,##0.00;[$-809]#,##0.00;0;@", // four-part international format
-        };
-
-        // invalid date formats -- will throw exception in DecimalFormat ctor
-        String[] badNumPatterns = {
-            "#,#$'#0.0000",
-            "'#','#ABC#0;##,##0",
-            "000 '123 4'5'6 000",
-            "#''0#0'1#10L16EE"
-        };
-
-        // create cells with good date patterns
-        for (int i = 0; i < goodDatePatterns.length; i++) {
-            HSSFCell cell = row.createCell(i);
-            cell.setCellValue(dateNum);
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat(goodDatePatterns[i]));
-            cell.setCellStyle(cellStyle);
-        }
-        row = sheet.createRow(1);
-
-        // create cells with time patterns
-        for (int i = 0; i < goodTimePatterns.length; i++) {
-            HSSFCell cell = row.createCell(i);
-            cell.setCellValue(timeNum);
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat(goodTimePatterns[i]));
-            cell.setCellStyle(cellStyle);
-        }
-        row = sheet.createRow(2);
-
-        // create cells with num patterns
-        for (int i = 0; i < goodNumPatterns.length; i++) {
-            HSSFCell cell = row.createCell(i);
-            cell.setCellValue(-1234567890.12345);
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat(goodNumPatterns[i]));
-            cell.setCellStyle(cellStyle);
-        }
-        row = sheet.createRow(3);
-
-        // create cells with bad num patterns
-        for (int i = 0; i < badNumPatterns.length; i++) {
-            HSSFCell cell = row.createCell(i);
-            // If the '.' is any later, ExcelGeneralNumberFormat will render an integer, as Excel does.
-            cell.setCellValue(12345678.9012345);
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat(badNumPatterns[i]));
-            cell.setCellStyle(cellStyle);
-        }
-
-        // Built in formats
-
-        { // Zip + 4 format
-            row = sheet.createRow(4);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellValue(123456789);
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat("00000-0000"));
-            cell.setCellStyle(cellStyle);
-        }
-
-        { // Phone number format
-            row = sheet.createRow(5);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellValue(5551234567D);
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat("[<=9999999]###-####;(###) ###-####"));
-            cell.setCellStyle(cellStyle);
-        }
-
-        { // SSN format
-            row = sheet.createRow(6);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellValue(444551234);
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat("000-00-0000"));
-            cell.setCellStyle(cellStyle);
-        }
-
-        { // formula cell
-            row = sheet.createRow(7);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellType(CellType.FORMULA);
-            cell.setCellFormula("SUM(12.25,12.25)/100");
-            HSSFCellStyle cellStyle = wb.createCellStyle();
-            cellStyle.setDataFormat(format.getFormat("##.00%;"));
-            cell.setCellStyle(cellStyle);
-        }
-    }
-
-    /**
-     * Test getting formatted values from numeric and date cells.
-     */
-    @Test
-    public void testGetFormattedCellValueHSSFCell() {
-        // Valid date formats -- cell values should be date formatted & not "555.555"
-        HSSFRow row = wb.getSheetAt(0).getRow(0);
-        Iterator<Cell> it = row.cellIterator();
-        log("==== VALID DATE FORMATS ====");
-        while (it.hasNext()) {
-            Cell cell = it.next();
-            String fmtval = formatter.formatCellValue(cell);
-            log(fmtval);
-
-            // should not be equal to "555.555"
-            assertTrue( DateUtil.isCellDateFormatted(cell) );
-            assertTrue( ! "555.555".equals(fmtval));
-
-            String fmt = cell.getCellStyle().getDataFormatString();
-
-            //assert the correct month form, as in the original Excel format
-            String monthPtrn = fmt.contains("mmmm") ? "MMMM" : "MMM";
-            // this line is intended to compute how "July" would look like in the current locale
-            SimpleDateFormat sdf = new SimpleDateFormat(monthPtrn, LocaleUtil.getUserLocale());
-            sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-            Calendar calDef = LocaleUtil.getLocaleCalendar(2010, 6, 15, 0, 0, 0);
-            String jul = sdf.format(calDef.getTime());
-            // special case for MMMMM = 1st letter of month name
-            if(fmt.contains("mmmmm")) {
-                jul = jul.substring(0,1);
-            }
-            // check we found july properly
-            assertTrue("Format came out incorrect - " + fmt, fmtval.contains(jul));
-        }
-
-        row = wb.getSheetAt(0).getRow(1);
-        it = row.cellIterator();
-        log("==== VALID TIME FORMATS ====");
-        while (it.hasNext()) {
-            Cell cell = it.next();
-            String fmt = cell.getCellStyle().getDataFormatString();
-            String fmtval = formatter.formatCellValue(cell);
-            log(fmtval);
-
-            // should not be equal to "555.47431"
-            assertTrue( DateUtil.isCellDateFormatted(cell) );
-            assertTrue( ! "555.47431".equals(fmtval));
-
-            // check we found the time properly
-            assertTrue("Format came out incorrect - " + fmt + " - found " + fmtval + 
-                       ", but expected to find '11:23'", fmtval.contains("11:23"));
-        }
-
-        // test number formats
-        row = wb.getSheetAt(0).getRow(1);
-        it = row.cellIterator();
-        log("\n==== VALID NUMBER FORMATS ====");
-        while (it.hasNext()) {
-            HSSFCell cell = (HSSFCell) it.next();
-            final String formatted = formatter.formatCellValue(cell);
-            log(formatted);
-
-            // should not include "12345678" - note that the input value was negative
-            assertTrue(formatted != null && ! formatted.contains("12345678"));
-        }
-
-        // test bad number formats
-        row = wb.getSheetAt(0).getRow(3);
-        it = row.cellIterator();
-        log("\n==== INVALID NUMBER FORMATS ====");
-        while (it.hasNext()) {
-            HSSFCell cell = (HSSFCell) it.next();
-            log(formatter.formatCellValue(cell));
-            // in some locales the the decimal delimiter is a comma, not a dot
-            char decimalSeparator = DecimalFormatSymbols.getInstance(LocaleUtil.getUserLocale()).getDecimalSeparator();
-            assertEquals("12345678" + decimalSeparator + "9", formatter.formatCellValue(cell));
-        }
-
-        // test Zip+4 format
-        row = wb.getSheetAt(0).getRow(4);
-        HSSFCell cell = row.getCell(0);
-        log("\n==== ZIP FORMAT ====");
-        log(formatter.formatCellValue(cell));
-        assertEquals("12345-6789", formatter.formatCellValue(cell));
-
-        // test phone number format
-        row = wb.getSheetAt(0).getRow(5);
-        cell = row.getCell(0);
-        log("\n==== PHONE FORMAT ====");
-        log(formatter.formatCellValue(cell));
-        assertEquals("(555) 123-4567", formatter.formatCellValue(cell));
-
-        // test SSN format
-        row = wb.getSheetAt(0).getRow(6);
-        cell = row.getCell(0);
-        log("\n==== SSN FORMAT ====");
-        log(formatter.formatCellValue(cell));
-        assertEquals("444-55-1234", formatter.formatCellValue(cell));
-
-        // null test-- null cell should result in empty String
-        assertEquals(formatter.formatCellValue(null), "");
-
-        // null test-- null cell should result in empty String
-        assertEquals(formatter.formatCellValue(null), "");
-    }
-
-    @Test
-    public void testGetFormattedCellValueHSSFCellHSSFFormulaEvaluator() {
-        // test formula format
-        HSSFRow row = wb.getSheetAt(0).getRow(7);
-        HSSFCell cell = row.getCell(0);
-        log("\n==== FORMULA CELL ====");
-
-        // first without a formula evaluator
-        log(formatter.formatCellValue(cell) + "\t (without evaluator)");
-        assertEquals("SUM(12.25,12.25)/100", formatter.formatCellValue(cell));
-
-        // now with a formula evaluator
-        HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb);
-        log(formatter.formatCellValue(cell, evaluator) + "\t\t\t (with evaluator)");
-        char decimalSeparator = DecimalFormatSymbols.getInstance(LocaleUtil.getUserLocale()).getDecimalSeparator();
-        assertEquals("24" + decimalSeparator + "50%", formatter.formatCellValue(cell,evaluator));
-
-    }
-
-    /**
-     * Test using a default number format. The format should be used when a
-     * format pattern cannot be parsed by DecimalFormat.
-     */
-    @Test
-    public void testSetDefaultNumberFormat() {
-        HSSFRow row = wb.getSheetAt(0).getRow(3);
-        Iterator<Cell> it = row.cellIterator();
-        DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(LocaleUtil.getUserLocale());
-        Format defaultFormat = new DecimalFormat("Balance $#,#00.00 USD;Balance -$#,#00.00 USD", dfs);
-        formatter.setDefaultNumberFormat(defaultFormat);
-
-        log("\n==== DEFAULT NUMBER FORMAT ====");
-        while (it.hasNext()) {
-            Cell cell = it.next();
-            cell.setCellValue(cell.getNumericCellValue() * Math.random() / 1000000 - 1000);
-            log(formatter.formatCellValue(cell));
-            
-            String formatted = formatter.formatCellValue(cell); 
-            assertTrue("Doesn't start with Balance: " + formatted, formatted.startsWith("Balance "));
-            assertTrue("Doesn't end with USD: " + formatted, formatted.endsWith(" USD"));
-        }
-    }
-
-    /**
-     * A format of "@" means use the general format
-     */
-    @Test
-    public void testGeneralAtFormat() {
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("47154.xls");
-        HSSFSheet sheet = workbook.getSheetAt(0);
-        HSSFRow row = sheet.getRow(0);
-        HSSFCell cellA1 = row.getCell(0);
-
-        assertEquals(CellType.NUMERIC, cellA1.getCellTypeEnum());
-        assertEquals(2345.0, cellA1.getNumericCellValue(), 0.0001);
-        assertEquals("@", cellA1.getCellStyle().getDataFormatString());
-
-        HSSFDataFormatter f = new HSSFDataFormatter();
-
-        assertEquals("2345", f.formatCellValue(cellA1));
-    }
-
-    /**
-     * Tests various formattings of dates and numbers
-     */
-    @Test
-    public void testFromFile() {
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("Formatting.xls");
-        HSSFSheet sheet = workbook.getSheetAt(0);
-
-        HSSFDataFormatter f = new HSSFDataFormatter();
-
-        // This one is one of the nasty auto-locale changing ones...
-        assertEquals("dd/mm/yyyy", sheet.getRow(1).getCell(0).getStringCellValue());
-        assertEquals("m/d/yy",     sheet.getRow(1).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("11/24/06",   f.formatCellValue(sheet.getRow(1).getCell(1)));
-
-        assertEquals("yyyy/mm/dd", sheet.getRow(2).getCell(0).getStringCellValue());
-        assertEquals("yyyy/mm/dd", sheet.getRow(2).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("2006/11/24", f.formatCellValue(sheet.getRow(2).getCell(1)));
-
-        assertEquals("yyyy-mm-dd", sheet.getRow(3).getCell(0).getStringCellValue());
-        assertEquals("yyyy\\-mm\\-dd", sheet.getRow(3).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("2006-11-24", f.formatCellValue(sheet.getRow(3).getCell(1)));
-
-        assertEquals("yy/mm/dd", sheet.getRow(4).getCell(0).getStringCellValue());
-        assertEquals("yy/mm/dd", sheet.getRow(4).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("06/11/24", f.formatCellValue(sheet.getRow(4).getCell(1)));
-
-        // Another builtin fun one
-        assertEquals("dd/mm/yy", sheet.getRow(5).getCell(0).getStringCellValue());
-        assertEquals("d/m/yy;@", sheet.getRow(5).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("24/11/06", f.formatCellValue(sheet.getRow(5).getCell(1)));
-
-        assertEquals("dd-mm-yy", sheet.getRow(6).getCell(0).getStringCellValue());
-        assertEquals("dd\\-mm\\-yy", sheet.getRow(6).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("24-11-06", f.formatCellValue(sheet.getRow(6).getCell(1)));
-
-
-        // Another builtin fun one
-        assertEquals("nn.nn", sheet.getRow(9).getCell(0).getStringCellValue());
-        assertEquals("General", sheet.getRow(9).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("10.52", f.formatCellValue(sheet.getRow(9).getCell(1)));
-
-        // text isn't quite the format rule...
-        assertEquals("nn.nnn", sheet.getRow(10).getCell(0).getStringCellValue());
-        assertEquals("0.000", sheet.getRow(10).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("10.520", f.formatCellValue(sheet.getRow(10).getCell(1)));
-
-        // text isn't quite the format rule...
-        assertEquals("nn.n", sheet.getRow(11).getCell(0).getStringCellValue());
-        assertEquals("0.0", sheet.getRow(11).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("10.5", f.formatCellValue(sheet.getRow(11).getCell(1)));
-
-        // text isn't quite the format rule...
-        assertEquals("\u00a3nn.nn", sheet.getRow(12).getCell(0).getStringCellValue());
-        assertEquals("\"\u00a3\"#,##0.00", sheet.getRow(12).getCell(1).getCellStyle().getDataFormatString());
-        assertEquals("\u00a310.52", f.formatCellValue(sheet.getRow(12).getCell(1)));
-    }
-
-    private static void log(@SuppressWarnings("UnusedParameters") String msg) {
-//      if (false) { // successful tests should be silent
-//         System.out.println(msg);
-//      }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
deleted file mode 100644
index 3cbd904..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static java.util.Calendar.AUGUST;
-import static java.util.Calendar.FEBRUARY;
-import static java.util.Calendar.JANUARY;
-import static java.util.Calendar.JULY;
-import static java.util.Calendar.MARCH;
-import static java.util.Calendar.MAY;
-import static java.util.Calendar.OCTOBER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Class TestHSSFDateUtil
- */
-public class TestHSSFDateUtil {
-
-    static TimeZone userTimeZone;
-    
-    @BeforeClass
-    public static void setCEST() {
-        userTimeZone = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CEST"));
-    }
-    
-    @AfterClass
-    public static void resetTimeZone() {
-        LocaleUtil.setUserTimeZone(userTimeZone);
-    }
-    
-    /**
-     * Checks the date conversion functions in the HSSFDateUtil class.
-     */
-    @Test
-    public void dateConversion() {
-
-        // Iteratating over the hours exposes any rounding issues.
-        Calendar cal = LocaleUtil.getLocaleCalendar(2002,JANUARY,1,0,1,1);
-        for (int hour = 0; hour < 23; hour++) {
-            double excelDate = HSSFDateUtil.getExcelDate(cal.getTime(), false);
-
-            assertEquals("Checking hour = " + hour, cal.getTime().getTime(),
-                    HSSFDateUtil.getJavaDate(excelDate, false).getTime());
-
-            cal.add(Calendar.HOUR_OF_DAY, 1);
-        }
-
-        // check 1900 and 1904 date windowing conversions
-        double excelDate = 36526.0;
-        // with 1900 windowing, excelDate is Jan. 1, 2000
-        // with 1904 windowing, excelDate is Jan. 2, 2004
-        cal.set(2000,JANUARY,1,0,0,0); // Jan. 1, 2000
-        Date dateIf1900 = cal.getTime();
-        cal.add(Calendar.YEAR,4); // now Jan. 1, 2004
-        cal.add(Calendar.DATE,1); // now Jan. 2, 2004
-        Date dateIf1904 = cal.getTime();
-        // 1900 windowing
-        assertEquals("Checking 1900 Date Windowing",
-                dateIf1900.getTime(),
-                HSSFDateUtil.getJavaDate(excelDate,false).getTime());
-        // 1904 windowing
-        assertEquals("Checking 1904 Date Windowing",
-                dateIf1904.getTime(),
-                HSSFDateUtil.getJavaDate(excelDate,true).getTime());
-    }
-
-    /**
-     * Checks the conversion of a java.util.date to Excel on a day when
-     * Daylight Saving Time starts.
-     */
-    @Test
-    public void excelConversionOnDSTStart() {
-        Calendar cal = LocaleUtil.getLocaleCalendar(2004,MARCH,28,0,0,0);
-        for (int hour = 0; hour < 24; hour++) {
-            
-            // Skip 02:00 CET as that is the Daylight change time
-            // and Java converts it automatically to 03:00 CEST
-            if (hour == 2) {
-                continue;
-            }
-
-            cal.set(Calendar.HOUR_OF_DAY, hour);
-            Date javaDate = cal.getTime();
-
-            
-            double excelDate = HSSFDateUtil.getExcelDate(javaDate, false);
-            double difference = excelDate - Math.floor(excelDate);
-            int differenceInHours = (int) (difference * 24 * 60 + 0.5) / 60;
-            assertEquals("Checking " + hour + " hour on Daylight Saving Time start date",
-                    hour,
-                    differenceInHours);
-            assertEquals("Checking " + hour + " hour on Daylight Saving Time start date",
-                    javaDate.getTime(),
-                    HSSFDateUtil.getJavaDate(excelDate, false).getTime());
-        }
-    }
-
-    /**
-     * Checks the conversion of an Excel date to a java.util.date on a day when
-     * Daylight Saving Time starts.
-     */
-    @Test
-    public void javaConversionOnDSTStart() {
-        Calendar cal = LocaleUtil.getLocaleCalendar(2004,MARCH,28,0,0,0);
-        double excelDate = HSSFDateUtil.getExcelDate(cal.getTime(), false);
-        double oneHour = 1.0 / 24;
-        double oneMinute = oneHour / 60;
-        for (int hour = 0; hour < 24; hour++, excelDate += oneHour) {
-
-            // Skip 02:00 CET as that is the Daylight change time
-            // and Java converts it automatically to 03:00 CEST
-            if (hour == 2) {
-                continue;
-            }
-
-            cal.set(Calendar.HOUR_OF_DAY, hour);
-            Date javaDate = HSSFDateUtil.getJavaDate(excelDate, false);
-            double actDate = HSSFDateUtil.getExcelDate(javaDate, false);
-            assertEquals("Checking " + hour + " hours on Daylight Saving Time start date",
-                    excelDate, actDate, oneMinute);
-        }
-    }
-
-    /**
-     * Checks the conversion of a java.util.Date to Excel on a day when
-     * Daylight Saving Time ends.
-     */
-    @Test
-    public void excelConversionOnDSTEnd() {
-        Calendar cal = LocaleUtil.getLocaleCalendar(2004,OCTOBER,31,0,0,0);
-        for (int hour = 0; hour < 24; hour++) {
-            cal.set(Calendar.HOUR_OF_DAY, hour);
-            Date javaDate = cal.getTime();
-            double excelDate = HSSFDateUtil.getExcelDate(javaDate, false);
-            double difference = excelDate - Math.floor(excelDate);
-            int differenceInHours = (int) (difference * 24 * 60 + 0.5) / 60;
-            assertEquals("Checking " + hour + " hour on Daylight Saving Time end date",
-                    hour,
-                    differenceInHours);
-            assertEquals("Checking " + hour + " hour on Daylight Saving Time start date",
-                    javaDate.getTime(),
-                    HSSFDateUtil.getJavaDate(excelDate, false).getTime());
-        }
-    }
-
-    /**
-     * Checks the conversion of an Excel date to java.util.Date on a day when
-     * Daylight Saving Time ends.
-     */
-    @Test
-    public void javaConversionOnDSTEnd() {
-        Calendar cal = LocaleUtil.getLocaleCalendar(2004,OCTOBER,31,0,0,0);
-        double excelDate = HSSFDateUtil.getExcelDate(cal.getTime(), false);
-        double oneHour = 1.0 / 24;
-        double oneMinute = oneHour / 60;
-        for (int hour = 0; hour < 24; hour++, excelDate += oneHour) {
-            cal.set(Calendar.HOUR_OF_DAY, hour);
-            Date javaDate = HSSFDateUtil.getJavaDate(excelDate, false);
-            assertEquals("Checking " + hour + " hours on Daylight Saving Time start date",
-                    excelDate,
-                    HSSFDateUtil.getExcelDate(javaDate, false), oneMinute);
-        }
-    }
-
-    /**
-     * Tests that we deal with time-zones properly
-     */
-    @Test
-    public void calendarConversion() {
-        TimeZone userTZ = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
-        try {
-            Calendar cal = LocaleUtil.getLocaleCalendar(2002,JANUARY,1,12,1,1);
-            Date expected = cal.getTime();
-    
-            // Iterating over the hours exposes any rounding issues.
-            for (int hour = -12; hour <= 12; hour++)
-            {
-                String id = "GMT" + (hour < 0 ? "" : "+") + hour + ":00";
-                cal.setTimeZone(TimeZone.getTimeZone(id));
-                cal.set(Calendar.HOUR_OF_DAY, 12);
-                double excelDate = HSSFDateUtil.getExcelDate(cal, false);
-                Date javaDate = HSSFDateUtil.getJavaDate(excelDate);
-    
-                // Should match despite time-zone
-                assertEquals("Checking timezone " + id, expected.getTime(), javaDate.getTime());
-            }
-            
-            // Check that the timezone aware getter works correctly 
-            TimeZone cet = TimeZone.getTimeZone("Europe/Copenhagen");
-            TimeZone ldn = TimeZone.getTimeZone("Europe/London");
-            
-            // 12:45 on 27th April 2012
-            double excelDate = 41026.53125;
-            
-            // Same, no change
-            assertEquals(
-                  HSSFDateUtil.getJavaDate(excelDate, false).getTime(),
-                  HSSFDateUtil.getJavaDate(excelDate, false, cet).getTime()
-            );
-            
-            // London vs Copenhagen, should differ by an hour
-            Date cetDate = HSSFDateUtil.getJavaDate(excelDate, false);
-            Date ldnDate = HSSFDateUtil.getJavaDate(excelDate, false, ldn);
-            assertEquals(ldnDate.getTime() - cetDate.getTime(), 60*60*1000);
-        } finally {
-            LocaleUtil.setUserTimeZone(userTZ);
-        }
-    }
-
-    /**
-     * Tests that we correctly detect date formats as such
-     */
-    @Test
-    public void identifyDateFormats() {
-        // First up, try with a few built in date formats
-        short[] builtins = new short[] { 0x0e, 0x0f, 0x10, 0x16, 0x2d, 0x2e };
-        for (short builtin : builtins) {
-            String formatStr = HSSFDataFormat.getBuiltinFormat(builtin);
-            assertTrue( HSSFDateUtil.isInternalDateFormat(builtin) );
-            assertTrue( HSSFDateUtil.isADateFormat(builtin,formatStr) );
-        }
-
-        // Now try a few built-in non date formats
-        builtins = new short[] { 0x01, 0x02, 0x17, 0x1f, 0x30 };
-        for (short builtin : builtins) {
-            String formatStr = HSSFDataFormat.getBuiltinFormat(builtin);
-            assertFalse( HSSFDateUtil.isInternalDateFormat(builtin) );
-            assertFalse( HSSFDateUtil.isADateFormat(builtin,formatStr) );
-        }
-
-        // Now for some non-internal ones
-        // These come after the real ones
-        int numBuiltins = HSSFDataFormat.getNumberOfBuiltinBuiltinFormats();
-        assertTrue(numBuiltins < 60);
-        short formatId = 60;
-        assertFalse( HSSFDateUtil.isInternalDateFormat(formatId) );
-
-        // Valid ones first
-        String[] formats = new String[] {
-                "yyyy-mm-dd", "yyyy/mm/dd", "yy/mm/dd", "yy/mmm/dd",
-                "dd/mm/yy", "dd/mm/yyyy", "dd/mmm/yy",
-                "dd-mm-yy", "dd-mm-yyyy",
-                "DD-MM-YY", "DD-mm-YYYY",
-                "dd\\-mm\\-yy", // Sometimes escaped
-                "dd.mm.yyyy", "dd\\.mm\\.yyyy",
-                "dd\\ mm\\.yyyy AM", "dd\\ mm\\.yyyy pm",
-                 "dd\\ mm\\.yyyy\\-dd", "[h]:mm:ss",
-                 "mm/dd/yy", "\"mm\"/\"dd\"/\"yy\"",
-                 "m\\/d\\/yyyy", 
-
-                // These crazy ones are valid
-                "yyyy-mm-dd;@", "yyyy/mm/dd;@",
-                "dd-mm-yy;@", "dd-mm-yyyy;@",
-                // These even crazier ones are also valid
-                // (who knows what they mean though...)
-                "[$-F800]dddd\\,\\ mmm\\ dd\\,\\ yyyy",
-                "[$-F900]ddd/mm/yyy",
-                // These ones specify colours, who knew that was allowed?
-                "[BLACK]dddd/mm/yy",
-                "[yeLLow]yyyy-mm-dd"
-        };
-        for (String format : formats) {
-            assertTrue(
-                    format + " is a date format",
-                    HSSFDateUtil.isADateFormat(formatId, format)
-            );
-        }
-
-        // Then time based ones too
-        formats = new String[] {
-                "yyyy-mm-dd hh:mm:ss", "yyyy/mm/dd HH:MM:SS",
-                "mm/dd HH:MM", "yy/mmm/dd SS",
-                "mm/dd HH:MM AM", "mm/dd HH:MM am",
-                "mm/dd HH:MM PM", "mm/dd HH:MM pm",
-                "m/d/yy h:mm AM/PM",
-                "hh:mm:ss", "hh:mm:ss.0", "mm:ss.0",
-                //support elapsed time [h],[m],[s]
-                "[hh]", "[mm]", "[ss]", "[SS]", "[red][hh]"
-        };
-        for (String format : formats) {
-            assertTrue(
-                    format + " is a datetime format",
-                    HSSFDateUtil.isADateFormat(formatId, format)
-            );
-        }
-
-        // Then invalid ones
-        formats = new String[] {
-                "yyyy*mm*dd",
-                "0.0", "0.000",
-                "0%", "0.0%",
-                "[]Foo", "[BLACK]0.00%",
-                "[ms]", "[Mh]",
-                "", null
-        };
-        for (String format : formats) {
-            assertFalse(
-                    format + " is not a date or datetime format",
-                    HSSFDateUtil.isADateFormat(formatId, format)
-            );
-        }
-
-        // And these are ones we probably shouldn't allow,
-        //  but would need a better regexp
-        formats = new String[] {
-                "yyyy:mm:dd",
-        };
-        for (String format : formats) {
-        //    assertFalse( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
-        }
-    }
-
-    /**
-     * Test that against a real, test file, we still do everything
-     *  correctly
-     * @throws IOException 
-     */
-    @Test
-    public void onARealFile() throws IOException {
-
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("DateFormats.xls");
-        HSSFSheet sheet       = workbook.getSheetAt(0);
-        InternalWorkbook wb           = workbook.getWorkbook();
-        assertNotNull(wb);
-
-        HSSFRow  row;
-        HSSFCell cell;
-        HSSFCellStyle style;
-
-        double aug_10_2007 = 39304.0;
-
-        // Should have dates in 2nd column
-        // All of them are the 10th of August
-        // 2 US dates, 3 UK dates
-        row  = sheet.getRow(0);
-        cell = row.getCell(1);
-        style = cell.getCellStyle();
-        assertEquals(aug_10_2007, cell.getNumericCellValue(), 0.0001);
-        assertEquals("d-mmm-yy", style.getDataFormatString());
-        assertTrue(HSSFDateUtil.isInternalDateFormat(style.getDataFormat()));
-        assertTrue(HSSFDateUtil.isADateFormat(style.getDataFormat(), style.getDataFormatString()));
-        assertTrue(HSSFDateUtil.isCellDateFormatted(cell));
-
-        row  = sheet.getRow(1);
-        cell = row.getCell(1);
-        style = cell.getCellStyle();
-        assertEquals(aug_10_2007, cell.getNumericCellValue(), 0.0001);
-        assertFalse(HSSFDateUtil.isInternalDateFormat(cell.getCellStyle().getDataFormat()));
-        assertTrue(HSSFDateUtil.isADateFormat(style.getDataFormat(), style.getDataFormatString()));
-        assertTrue(HSSFDateUtil.isCellDateFormatted(cell));
-
-        row  = sheet.getRow(2);
-        cell = row.getCell(1);
-        style = cell.getCellStyle();
-        assertEquals(aug_10_2007, cell.getNumericCellValue(), 0.0001);
-        assertTrue(HSSFDateUtil.isInternalDateFormat(cell.getCellStyle().getDataFormat()));
-        assertTrue(HSSFDateUtil.isADateFormat(style.getDataFormat(), style.getDataFormatString()));
-        assertTrue(HSSFDateUtil.isCellDateFormatted(cell));
-
-        row  = sheet.getRow(3);
-        cell = row.getCell(1);
-        style = cell.getCellStyle();
-        assertEquals(aug_10_2007, cell.getNumericCellValue(), 0.0001);
-        assertFalse(HSSFDateUtil.isInternalDateFormat(cell.getCellStyle().getDataFormat()));
-        assertTrue(HSSFDateUtil.isADateFormat(style.getDataFormat(), style.getDataFormatString()));
-        assertTrue(HSSFDateUtil.isCellDateFormatted(cell));
-
-        row  = sheet.getRow(4);
-        cell = row.getCell(1);
-        style = cell.getCellStyle();
-        assertEquals(aug_10_2007, cell.getNumericCellValue(), 0.0001);
-        assertFalse(HSSFDateUtil.isInternalDateFormat(cell.getCellStyle().getDataFormat()));
-        assertTrue(HSSFDateUtil.isADateFormat(style.getDataFormat(), style.getDataFormatString()));
-        assertTrue(HSSFDateUtil.isCellDateFormatted(cell));
-        
-        workbook.close();
-    }
-
-    @Test
-    public void excelDateBorderCases() throws ParseException {
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
-        df.setTimeZone(LocaleUtil.getUserTimeZone());
-        
-        assertEquals(1.0, DateUtil.getExcelDate(df.parse("1900-01-01")), 0.00001);
-        assertEquals(31.0, DateUtil.getExcelDate(df.parse("1900-01-31")), 0.00001);
-        assertEquals(32.0, DateUtil.getExcelDate(df.parse("1900-02-01")), 0.00001);
-        assertEquals(/* BAD_DATE! */ -1.0, DateUtil.getExcelDate(df.parse("1899-12-31")), 0.00001);
-    }
-
-    @Test
-    public void dateBug_2Excel() {
-        assertEquals(59.0, HSSFDateUtil.getExcelDate(createDate(1900, FEBRUARY, 28), false), 0.00001);
-        assertEquals(61.0, HSSFDateUtil.getExcelDate(createDate(1900, MARCH, 1), false), 0.00001);
-
-        assertEquals(37315.00, HSSFDateUtil.getExcelDate(createDate(2002, FEBRUARY, 28), false), 0.00001);
-        assertEquals(37316.00, HSSFDateUtil.getExcelDate(createDate(2002, MARCH, 1), false), 0.00001);
-        assertEquals(37257.00, HSSFDateUtil.getExcelDate(createDate(2002, JANUARY, 1), false), 0.00001);
-        assertEquals(38074.00, HSSFDateUtil.getExcelDate(createDate(2004, MARCH, 28), false), 0.00001);
-    }
-
-    @Test
-    public void dateBug_2Java() {
-        assertEquals(createDate(1900, FEBRUARY, 28), HSSFDateUtil.getJavaDate(59.0, false));
-        assertEquals(createDate(1900, MARCH, 1), HSSFDateUtil.getJavaDate(61.0, false));
-
-        assertEquals(createDate(2002, FEBRUARY, 28), HSSFDateUtil.getJavaDate(37315.00, false));
-        assertEquals(createDate(2002, MARCH, 1), HSSFDateUtil.getJavaDate(37316.00, false));
-        assertEquals(createDate(2002, JANUARY, 1), HSSFDateUtil.getJavaDate(37257.00, false));
-        assertEquals(createDate(2004, MARCH, 28), HSSFDateUtil.getJavaDate(38074.00, false));
-    }
-
-    @Test
-    public void date1904() {
-        assertEquals(createDate(1904, JANUARY, 2), HSSFDateUtil.getJavaDate(1.0, true));
-        assertEquals(createDate(1904, JANUARY, 1), HSSFDateUtil.getJavaDate(0.0, true));
-        assertEquals(0.0, HSSFDateUtil.getExcelDate(createDate(1904, JANUARY, 1), true), 0.00001);
-        assertEquals(1.0, HSSFDateUtil.getExcelDate(createDate(1904, JANUARY, 2), true), 0.00001);
-
-        assertEquals(createDate(1998, JULY, 5), HSSFDateUtil.getJavaDate(35981, false));
-        assertEquals(createDate(1998, JULY, 5), HSSFDateUtil.getJavaDate(34519, true));
-
-        assertEquals(35981.0, HSSFDateUtil.getExcelDate(createDate(1998, JULY, 5), false), 0.00001);
-        assertEquals(34519.0, HSSFDateUtil.getExcelDate(createDate(1998, JULY, 5), true), 0.00001);
-    }
-
-    /**
-     * @param month zero based
-     * @param day one based
-     */
-    private static Date createDate(int year, int month, int day) {
-        return createDate(year, month, day, 0, 0, 0);
-    }
-
-    /**
-     * @param month zero based
-     * @param day one based
-     */
-    private static Date createDate(int year, int month, int day, int hour, int minute, int second) {
-        Calendar c = LocaleUtil.getLocaleCalendar(year, month, day, hour, minute, second);
-        return c.getTime();
-    }
-
-    /**
-     * Check if HSSFDateUtil.getAbsoluteDay works as advertised.
-     */
-    @Test
-    public void absoluteDay() {
-        // 1 Jan 1900 is 1 day after 31 Dec 1899
-        Calendar cal = LocaleUtil.getLocaleCalendar(1900,JANUARY,1,0,0,0);
-        assertEquals("Checking absolute day (1 Jan 1900)", 1, HSSFDateUtil.absoluteDay(cal, false));
-        // 1 Jan 1901 is 366 days after 31 Dec 1899
-        cal.set(1901,JANUARY,1,0,0,0);
-        assertEquals("Checking absolute day (1 Jan 1901)", 366, HSSFDateUtil.absoluteDay(cal, false));
-    }
-
-    @Test
-    public void absoluteDayYearTooLow() {
-        Calendar cal = LocaleUtil.getLocaleCalendar(1899,JANUARY,1,0,0,0);
-        try {
-        	HSSFDateUtil.absoluteDay(cal, false);
-        	fail("Should fail here");
-        } catch (IllegalArgumentException e) {
-        	// expected here
-        }
-
-        try {
-            cal.set(1903,JANUARY,1,0,0,0);
-            HSSFDateUtil.absoluteDay(cal, true);
-        	fail("Should fail here");
-        } catch (IllegalArgumentException e) {
-        	// expected here
-        }
-    }
-
-    @Test
-    public void convertTime() {
-
-        final double delta = 1E-7; // a couple of digits more accuracy than strictly required
-        assertEquals(0.5, HSSFDateUtil.convertTime("12:00"), delta);
-        assertEquals(2.0/3, HSSFDateUtil.convertTime("16:00"), delta);
-        assertEquals(0.0000116, HSSFDateUtil.convertTime("0:00:01"), delta);
-        assertEquals(0.7330440, HSSFDateUtil.convertTime("17:35:35"), delta);
-    }
-
-    @Test
-    public void parseDate() {
-        assertEquals(createDate(2008, AUGUST, 3), HSSFDateUtil.parseYYYYMMDDDate("2008/08/03"));
-        assertEquals(createDate(1994, MAY, 1), HSSFDateUtil.parseYYYYMMDDDate("1994/05/01"));
-    }
-
-    /**
-     * Ensure that date values *with* a fractional portion get the right time of day
-     */
-    @Test
-    public void convertDateTime() {
-    	// Excel day 30000 is date 18-Feb-1982
-        // 0.7 corresponds to time 16:48:00
-        Date actual = HSSFDateUtil.getJavaDate(30000.7);
-        Date expected = createDate(1982, 1, 18, 16, 48, 0);
-        assertEquals(expected, actual);
-    }
-
-    /**
-     * User reported a datetime issue in POI-2.5:
-     *  Setting Cell's value to Jan 1, 1900 without a time doesn't return the same value set to
-     * @throws IOException 
-     */
-    @Test
-    public void bug19172() throws IOException
-    {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        HSSFCell cell = sheet.createRow(0).createCell(0);
-
-        // A pseudo special Excel dates
-        Calendar cal = LocaleUtil.getLocaleCalendar(1900, JANUARY, 1);
-
-        Date valueToTest = cal.getTime();
-
-        cell.setCellValue(valueToTest);
-
-        Date returnedValue = cell.getDateCellValue();
-
-        assertEquals(valueToTest.getTime(), returnedValue.getTime());
-        
-        workbook.close();
-    }
-
-    /**
-     * DateUtil.isCellFormatted(Cell) should not true for a numeric cell 
-     * that's formatted as ".0000"
-     */
-    @Test
-    public void bug54557() throws Exception {
-       final String format = ".0000";
-       boolean isDateFormat = HSSFDateUtil.isADateFormat(165, format);
-       
-       assertEquals(false, isDateFormat);
-    }
-    
-    @Test
-    public void bug56269() throws Exception {
-        double excelFraction = 41642.45833321759d;
-        Calendar calNoRound = HSSFDateUtil.getJavaCalendar(excelFraction, false);
-        assertEquals(10, calNoRound.get(Calendar.HOUR));
-        assertEquals(59, calNoRound.get(Calendar.MINUTE));
-        assertEquals(59, calNoRound.get(Calendar.SECOND));
-        Calendar calRound = HSSFDateUtil.getJavaCalendar(excelFraction, false, null, true);
-        assertEquals(11, calRound.get(Calendar.HOUR));
-        assertEquals(0, calRound.get(Calendar.MINUTE));
-        assertEquals(0, calRound.get(Calendar.SECOND));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
deleted file mode 100644
index cb897c6..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.formula.BaseTestExternalFunctions;
-
-/**
- * Tests setting and evaluating user-defined functions in HSSF
- */
-public final class TestHSSFExternalFunctions extends BaseTestExternalFunctions {
-	public TestHSSFExternalFunctions() {
-		super(HSSFITestDataProvider.instance, "atp.xls");
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
deleted file mode 100644
index 81f28d8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.usermodel.BaseTestFont;
-import org.apache.poi.ss.usermodel.Font;
-import org.junit.Test;
-
-/**
- * Tests various functionality having to do with {@link org.apache.poi.ss.usermodel.Name}.
- *
- * @author Yegor Kozlov
- */
-public final class TestHSSFFont extends BaseTestFont {
-
-    public TestHSSFFont() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void testDefaultFont() throws IOException {
-        baseTestDefaultFont(HSSFFont.FONT_ARIAL, (short)200, Font.COLOR_NORMAL);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
deleted file mode 100644
index d898749..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.ss.formula.EvaluationCell;
-import org.apache.poi.ss.formula.EvaluationListener;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.WorkbookEvaluatorTestHelper;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.BaseTestFormulaEvaluator;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Test;
-
-public final class TestHSSFFormulaEvaluator extends BaseTestFormulaEvaluator {
-
-    public TestHSSFFormulaEvaluator() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-	/**
-	 * Test that the HSSFFormulaEvaluator can evaluate simple named ranges
-	 *  (single cells and rectangular areas)
-	 */
-    @Test
-	public void testEvaluateSimple() throws IOException {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("testNames.xls");
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFCell cell = sheet.getRow(8).getCell(0);
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		CellValue cv = fe.evaluate(cell);
-		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-		assertEquals(3.72, cv.getNumberValue(), 0.0);
-		wb.close();
-	}
-
-	/**
-	 * Test for bug due to attempt to convert a cached formula error result to a boolean
-	 */
-    @Test
-	@Override
-	public void testUpdateCachedFormulaResultFromErrorToNumber_bug46479() throws IOException {
-
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFRow row = sheet.createRow(0);
-		HSSFCell cellA1 = row.createCell(0);
-		HSSFCell cellB1 = row.createCell(1);
-		cellB1.setCellFormula("A1+1");
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-		cellA1.setCellErrorValue(FormulaError.NAME.getCode());
-		fe.evaluateFormulaCellEnum(cellB1);
-
-		cellA1.setCellValue(2.5);
-		fe.notifyUpdateCell(cellA1);
-		try {
-			fe.evaluateInCell(cellB1);
-		} catch (IllegalStateException e) {
-			if (e.getMessage().equals("Cannot get a numeric value from a error formula cell")) {
-				fail("Identified bug 46479a");
-			}
-		}
-		assertEquals(3.5, cellB1.getNumericCellValue(), 0.0);
-		
-		wb.close();
-	}
-
-	/**
-	 * When evaluating defined names, POI has to decide whether it is capable.  Currently
-	 * (May2009) POI only supports simple cell and area refs.<br/>
-	 * The sample spreadsheet (bugzilla attachment 23508) had a name flagged as 'complex'
-	 * which contained a simple area ref.  It is not clear what the 'complex' flag is used
-	 * for but POI should look elsewhere to decide whether it can evaluate the name.
-	 */
-    @Test
-	public void testDefinedNameWithComplexFlag_bug47048() throws IOException {
-		// Mock up a spreadsheet to match the critical details of the sample
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("Input");
-		HSSFName definedName = wb.createName();
-		definedName.setNameName("Is_Multicar_Vehicle");
-		definedName.setRefersToFormula("Input!$B$17:$G$17");
-
-		// Set up some data and the formula
-		HSSFRow row17 = sheet.createRow(16);
-		row17.createCell(0).setCellValue(25.0);
-		row17.createCell(1).setCellValue(1.33);
-		row17.createCell(2).setCellValue(4.0);
-
-		HSSFRow row = sheet.createRow(0);
-		HSSFCell cellA1 = row.createCell(0);
-		cellA1.setCellFormula("SUM(Is_Multicar_Vehicle)");
-
-		// Set the complex flag - POI doesn't usually manipulate this flag
-		NameRecord nameRec = TestHSSFName.getNameRecord(definedName);
-		nameRec.setOptionFlag((short)0x10); // 0x10 -> complex
-
-		HSSFFormulaEvaluator hsf = new HSSFFormulaEvaluator(wb);
-		CellValue value;
-		try {
-			value = hsf.evaluate(cellA1);
-
-	        assertEquals(CellType.NUMERIC, value.getCellTypeEnum());
-	        assertEquals(5.33, value.getNumberValue(), 0.0);
-	        
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("Don't now how to evalate name 'Is_Multicar_Vehicle'")) {
-				fail("Identified bug 47048a");
-			}
-			throw e;
-		} finally {
-	        wb.close();
-		}
-	}
-    
-	private static final class EvalCountListener extends EvaluationListener {
-		private int _evalCount;
-		public EvalCountListener() {
-			_evalCount = 0;
-		}
-		@Override
-		public void onStartEvaluate(EvaluationCell cell, ICacheEntry entry) {
-			_evalCount++;
-		}
-		public int getEvalCount() {
-			return _evalCount;
-		}
-	}
-
-	/**
-	 * The HSSFFormula evaluator performance benefits greatly from caching of intermediate cell values
-	 */
-	@Test
-	public void testShortCircuitIfEvaluation() throws IOException {
-
-		// Set up a simple IF() formula that has measurable evaluation cost for its operands.
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFRow row = sheet.createRow(0);
-		HSSFCell cellA1 = row.createCell(0);
-		cellA1.setCellFormula("if(B1,C1,D1+E1+F1)");
-		// populate cells B1..F1 with simple formulas instead of plain values so we can use
-		// EvaluationListener to check which parts of the first formula get evaluated
-		for (int i=1; i<6; i++) {
-			// formulas are just literal constants "1".."5"
-			row.createCell(i).setCellFormula(String.valueOf(i));
-		}
-
-		EvalCountListener evalListener = new EvalCountListener();
-		WorkbookEvaluator evaluator = WorkbookEvaluatorTestHelper.createEvaluator(wb, evalListener);
-		ValueEval ve = evaluator.evaluate(HSSFEvaluationTestHelper.wrapCell(cellA1));
-		int evalCount = evalListener.getEvalCount();
-		if (evalCount == 6) {
-			// Without short-circuit-if evaluation, evaluating cell 'A1' takes 3 extra evaluations (for D1,E1,F1)
-			fail("Identifed bug 48195 - Formula evaluator should short-circuit IF() calculations.");
-		}
-		assertEquals(3, evalCount);
-		assertEquals(2.0, ((NumberEval)ve).getNumberValue(), 0D);
-		
-		wb.close();
-	}
-	
-	/**
-	 * Ensures that we can handle NameXPtgs in the formulas
-	 *  we parse.
-	 */
-	@Test
-	public void testXRefs() throws IOException {
-      HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("XRefCalc.xls");
-      HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook("XRefCalcData.xls");
-      Cell cell;
-      
-      // VLookup on a name in another file
-      cell = wb1.getSheetAt(0).getRow(1).getCell(2);
-      assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-      assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultTypeEnum());
-      assertEquals(12.30, cell.getNumericCellValue(), 0.0001);
-      // WARNING - this is wrong!
-      // The file name should be showing, but bug #45970 is fixed
-      //  we seem to loose it
-      assertEquals("VLOOKUP(PART,COSTS,2,FALSE)", cell.getCellFormula());
-      
-      
-      // Simple reference to a name in another file
-      cell = wb1.getSheetAt(0).getRow(1).getCell(4);
-      assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-      assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultTypeEnum());
-      assertEquals(36.90, cell.getNumericCellValue(), 0.0001);
-      // TODO Correct this!
-      // The file name should be shown too, see bug #56742
-      assertEquals("Cost*Markup_Cost", cell.getCellFormula());
-      
-      
-      // Evaluate the cells
-      HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb1);
-      HSSFFormulaEvaluator.setupEnvironment(
-            new String[] { "XRefCalc.xls", "XRefCalcData.xls" },
-            new HSSFFormulaEvaluator[] {
-                  eval,
-                  new HSSFFormulaEvaluator(wb2)
-            }
-      );
-      eval.evaluateFormulaCellEnum(
-            wb1.getSheetAt(0).getRow(1).getCell(2)
-      );      
-      eval.evaluateFormulaCellEnum(
-            wb1.getSheetAt(0).getRow(1).getCell(4)
-      );      
-      
-
-      // Re-check VLOOKUP one
-      cell = wb1.getSheetAt(0).getRow(1).getCell(2);
-      assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-      assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultTypeEnum());
-      assertEquals(12.30, cell.getNumericCellValue(), 0.0001);
-      
-      // Re-check ref one
-      cell = wb1.getSheetAt(0).getRow(1).getCell(4);
-      assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-      assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultTypeEnum());
-      assertEquals(36.90, cell.getNumericCellValue(), 0.0001);
-      
-      
-      // Add a formula that refers to one of the existing external workbooks
-      cell = wb1.getSheetAt(0).getRow(1).createCell(40);
-      cell.setCellFormula("Cost*[XRefCalcData.xls]MarkupSheet!$B$1");
-      
-      // Check is was stored correctly
-      assertEquals("Cost*[XRefCalcData.xls]MarkupSheet!$B$1", cell.getCellFormula());
-      
-      // Check it evaluates correctly
-      eval.evaluateFormulaCellEnum(cell);
-      assertEquals(24.60*1.8, cell.getNumericCellValue(), 0);
-      
-      
-      // Try to add a formula for a new external workbook, won't be allowed to start
-      try {
-          cell = wb1.getSheetAt(0).getRow(1).createCell(42);
-          cell.setCellFormula("[alt.xls]Sheet0!$A$1");
-          fail("New workbook not linked, shouldn't be able to add");
-      } catch(Exception e) {}
-      
-      // Link our new workbook
-      HSSFWorkbook wb3 = new HSSFWorkbook();
-      wb3.createSheet().createRow(0).createCell(0).setCellValue("In another workbook");
-      wb1.linkExternalWorkbook("alt.xls", wb3);
-      
-      // Now add a formula that refers to our new workbook
-      cell.setCellFormula("[alt.xls]Sheet0!$A$1");
-      assertEquals("[alt.xls]Sheet0!$A$1", cell.getCellFormula());
-
-      // Evaluate it, without a link to that workbook
-      try {
-          eval.evaluate(cell);
-          fail("No cached value and no link to workbook, shouldn't evaluate");
-      } catch(Exception e) {}
-      
-      // Add a link, check it does
-      HSSFFormulaEvaluator.setupEnvironment(
-              new String[] { "XRefCalc.xls", "XRefCalcData.xls", "alt.xls" },
-              new HSSFFormulaEvaluator[] {
-                    eval,
-                    new HSSFFormulaEvaluator(wb2),
-                    new HSSFFormulaEvaluator(wb3)
-              }
-      );
-      eval.evaluateFormulaCellEnum(cell);
-      assertEquals("In another workbook", cell.getStringCellValue());
-      
-      
-      // Save and re-load
-      HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-      eval = new HSSFFormulaEvaluator(wb4);
-      HSSFFormulaEvaluator.setupEnvironment(
-              new String[] { "XRefCalc.xls", "XRefCalcData.xls", "alt.xls" },
-              new HSSFFormulaEvaluator[] {
-                    eval,
-                    new HSSFFormulaEvaluator(wb2),
-                    new HSSFFormulaEvaluator(wb3)
-              }
-      );
-      
-      // Check the one referring to the previously existing workbook behaves
-      cell = wb4.getSheetAt(0).getRow(1).getCell(40);
-      assertEquals("Cost*[XRefCalcData.xls]MarkupSheet!$B$1", cell.getCellFormula());
-      eval.evaluateFormulaCellEnum(cell);
-      assertEquals(24.60*1.8, cell.getNumericCellValue(), 0);
-      
-      // Now check the newly added reference
-      cell = wb4.getSheetAt(0).getRow(1).getCell(42);
-      assertEquals("[alt.xls]Sheet0!$A$1", cell.getCellFormula());
-      eval.evaluateFormulaCellEnum(cell);
-      assertEquals("In another workbook", cell.getStringCellValue());
-      
-      wb4.close();
-      wb3.close();
-      wb2.close();
-      wb1.close();
-   }
-
-	@Test
-    public void testSharedFormulas() throws IOException {
-        baseTestSharedFormulas("shared_formulas.xls");
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
deleted file mode 100644
index d2e8200..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-
-/**
- * Tests for {@link HSSFHeader} / {@link HSSFFooter}
- *
- * @author Shawn Laubach (slaubach at apache dot com)
- */
-public final class TestHSSFHeaderFooter extends TestCase {
-
-	/**
-	 * Tests that get header retrieves the proper values.
-	 *
-	 * @author Shawn Laubach (slaubach at apache dot org)
-	 */
-	public void testRetrieveCorrectHeader() {
-
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("EmbeddedChartHeaderTest.xls");
-		HSSFSheet s = wb.getSheetAt( 0 );
-		HSSFHeader head = s.getHeader();
-
-		assertEquals("Top Left", head.getLeft());
-		assertEquals("Top Center", head.getCenter());
-		assertEquals("Top Right", head.getRight());
-	}
-
-	public void testSpecialChars() {
-		assertEquals("&U", HSSFHeader.startUnderline());
-		assertEquals("&U", HSSFHeader.endUnderline());
-		assertEquals("&P", HSSFHeader.page());
-
-		assertEquals("&22", HSSFFooter.fontSize((short)22));
-		assertEquals("&\"Arial,bold\"", HSSFFooter.font("Arial", "bold"));
-	}
-
-	public void testStripFields() {
-		String simple = "I am a test header";
-		String withPage = "I am a&P test header";
-		String withLots = "I&A am&N a&P test&T header&U";
-		String withFont = "I&22 am a&\"Arial,bold\" test header";
-		String withOtherAnds = "I am a&P test header&&";
-		String withOtherAnds2 = "I am a&P test header&a&b";
-
-		assertEquals(simple, HSSFHeader.stripFields(simple));
-		assertEquals(simple, HSSFHeader.stripFields(withPage));
-		assertEquals(simple, HSSFHeader.stripFields(withLots));
-		assertEquals(simple, HSSFHeader.stripFields(withFont));
-		assertEquals(simple + "&&", HSSFHeader.stripFields(withOtherAnds));
-		assertEquals(simple + "&a&b", HSSFHeader.stripFields(withOtherAnds2));
-
-		// Now test the default strip flag
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("EmbeddedChartHeaderTest.xls");
-		HSSFSheet s = wb.getSheetAt( 0 );
-		HSSFHeader head = s.getHeader();
-
-		assertEquals("Top Left", head.getLeft());
-		assertEquals("Top Center", head.getCenter());
-		assertEquals("Top Right", head.getRight());
-
-		head.setLeft("Top &P&F&D Left");
-		assertEquals("Top &P&F&D Left", head.getLeft());
-
-		assertEquals("Top  Left", HeaderFooter.stripFields(head.getLeft()));
-
-		// Now even more complex
-		head.setCenter("HEADER TEXT &P&N&D&T&Z&F&F&A&G&X END");
-		assertEquals("HEADER TEXT  END",  HeaderFooter.stripFields(head.getCenter()));
-	}
-
-	/**
-	 * Tests that get header retrieves the proper values.
-	 *
-	 * @author Shawn Laubach (slaubach at apache dot org)
-	 */
-	public void testRetrieveCorrectFooter() {
-
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("EmbeddedChartHeaderTest.xls");
-		HSSFSheet s = wb.getSheetAt(0);
-		HSSFFooter foot = s.getFooter();
-
-		assertEquals("Bottom Left", foot.getLeft());
-		assertEquals("Bottom Center", foot.getCenter());
-		assertEquals("Bottom Right", foot.getRight());
-	}
-
-	/**
-	 * Testcase for Bug 17039 HSSFHeader  does not support DBCS
-	 */
-	public void testHeaderHas16bitCharacter() {
-		HSSFWorkbook b = new HSSFWorkbook();
-		HSSFSheet s = b.createSheet("Test");
-		HSSFHeader h = s.getHeader();
-		h.setLeft("\u0391");
-		h.setCenter("\u0392");
-		h.setRight("\u0393");
-
-		HSSFWorkbook b2 = HSSFTestDataSamples.writeOutAndReadBack(b);
-		HSSFHeader h2 = b2.getSheet("Test").getHeader();
-
-		assertEquals(h2.getLeft(),"\u0391");
-		assertEquals(h2.getCenter(),"\u0392");
-		assertEquals(h2.getRight(),"\u0393");
-	}
-
-	/**
-	 * Testcase for Bug 17039 HSSFFooter does not support DBCS
-	 */
-	 public void testFooterHas16bitCharacter() {
-		HSSFWorkbook b = new HSSFWorkbook();
-		HSSFSheet s = b.createSheet("Test");
-		HSSFFooter f = s.getFooter();
-		f.setLeft("\u0391");
-		f.setCenter("\u0392");
-		f.setRight("\u0393");
-
-		HSSFWorkbook b2 = HSSFTestDataSamples.writeOutAndReadBack(b);
-		HSSFFooter f2 = b2.getSheet("Test").getFooter();
-
-		assertEquals(f2.getLeft(),"\u0391");
-		assertEquals(f2.getCenter(),"\u0392");
-		assertEquals(f2.getRight(),"\u0393");
-	}
-
-	public void testReadDBCSHeaderFooter() {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DBCSHeader.xls");
-		HSSFSheet s = wb.getSheetAt(0);
-		HSSFHeader h = s.getHeader();
-		assertEquals("Header Left " ,h.getLeft(),"\u090f\u0915");
-		assertEquals("Header Center " ,h.getCenter(),"\u0939\u094b\u0917\u093e");
-		assertEquals("Header Right " ,h.getRight(),"\u091c\u093e");
-
-		HSSFFooter f = s.getFooter();
-		assertEquals("Footer Left " ,f.getLeft(),"\u091c\u093e");
-		assertEquals("Footer Center " ,f.getCenter(),"\u091c\u093e");
-		assertEquals("Footer Right " ,f.getRight(),"\u091c\u093e");
-	}
-
-	/**
-	 * Excel tolerates files with missing HEADER/FOOTER records.  POI should do the same.
-	 */
-	public void testMissingHeaderFooterRecord_bug47244() {
-		// noHeaderFooter47244.xls was created by a slightly modified POI
-		// which omitted the HEADER/FOOTER records
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("noHeaderFooter47244.xls");
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFFooter footer;
-		try {
-			footer = sheet.getFooter();
-		} catch (NullPointerException e) {
-			throw new AssertionFailedError("Identified bug 47244a");
-		}
-		assertEquals("", footer.getRawText());
-		HSSFHeader header = sheet.getHeader();
-		assertEquals("", header.getRawText());
-
-		// make sure header / footer is properly linked to underlying data 
-		HSSFHeader header2 = sheet.getHeader();
-		header.setCenter("foo");
-		assertEquals("foo", header2.getCenter());
-
-		HSSFFooter footer2 = sheet.getFooter();
-		footer.setCenter("bar");
-		assertEquals("bar", footer2.getCenter());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
deleted file mode 100644
index 9ad147a..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.BaseTestHyperlink;
-import org.apache.poi.ss.usermodel.Hyperlink;
-/*
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFCreationHelper;
-import org.apache.poi.xssf.usermodel.XSSFHyperlink;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-*/
-import org.junit.Test;
-
-/**
- * Tests HSSFHyperlink.
- *
- * @author  Yegor Kozlov
- */
-public final class TestHSSFHyperlink extends BaseTestHyperlink {
-
-    public TestHSSFHyperlink() {
-        super(HSSFITestDataProvider.instance);
-    }
-    /**
-     * Test that we can read hyperlinks.
-     */
-    @Test
-    public void testRead() {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("HyperlinksOnManySheets.xls");
-
-        HSSFSheet sheet;
-        HSSFCell cell;
-        HSSFHyperlink link;
-
-        sheet = wb.getSheet("WebLinks");
-        cell = sheet.getRow(4).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("POI", link.getLabel());
-        assertEquals("POI", cell.getRichStringCellValue().getString());
-        assertEquals("http://poi.apache.org/", link.getAddress());
-        assertEquals(HyperlinkType.URL, link.getTypeEnum());
-
-        cell = sheet.getRow(8).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("HSSF", link.getLabel());
-        assertEquals("HSSF", cell.getRichStringCellValue().getString());
-        assertEquals("http://poi.apache.org/hssf/", link.getAddress());
-        assertEquals(HyperlinkType.URL, link.getTypeEnum());
-
-        sheet = wb.getSheet("Emails");
-        cell = sheet.getRow(4).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("dev", link.getLabel());
-        assertEquals("dev", cell.getRichStringCellValue().getString());
-        assertEquals("mailto:dev@poi.apache.org", link.getAddress());
-        assertEquals(HyperlinkType.EMAIL, link.getTypeEnum());
-
-        sheet = wb.getSheet("Internal");
-        cell = sheet.getRow(4).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("Link To First Sheet", link.getLabel());
-        assertEquals("Link To First Sheet", cell.getRichStringCellValue().getString());
-        assertEquals("WebLinks!A1", link.getTextMark());
-        assertEquals("WebLinks!A1", link.getAddress());
-        assertEquals(HyperlinkType.DOCUMENT, link.getTypeEnum());
-    }
-
-    @Test
-    public void testModify() {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("HyperlinksOnManySheets.xls");
-
-        HSSFSheet sheet;
-        HSSFCell cell;
-        HSSFHyperlink link;
-
-        sheet = wb.getSheet("WebLinks");
-        cell = sheet.getRow(4).getCell(0);
-        link = cell.getHyperlink();
-        //modify the link
-        link.setAddress("www.apache.org");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheet("WebLinks");
-        cell = sheet.getRow(4).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("www.apache.org", link.getAddress());
-
-    }
-
-    /**
-     * HSSF-specific ways of creating links to a place in workbook.
-     * You can set the target  in two ways:
-     *  link.setTextMark("'Target Sheet-1'!A1"); //HSSF-specific
-     *  or
-     *  link.setAddress("'Target Sheet-1'!A1"); //common between XSSF and HSSF
-     * @throws IOException 
-     */
-    @Test
-    public void testCreateDocumentLink() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        //link to a place in this workbook
-        HSSFHyperlink link;
-        HSSFCell cell;
-        HSSFSheet sheet = wb.createSheet("Hyperlinks");
-
-        //create a target sheet and cell
-        HSSFSheet sheet2 = wb.createSheet("Target Sheet");
-        sheet2.createRow(0).createCell(0).setCellValue("Target Cell");
-
-        //cell A1 has a link to 'Target Sheet-1'!A1
-        cell = sheet.createRow(0).createCell(0);
-        cell.setCellValue("Worksheet Link");
-        link = new HSSFHyperlink(HyperlinkType.DOCUMENT);
-        link.setTextMark("'Target Sheet'!A1");
-        cell.setHyperlink(link);
-
-        //cell B1 has a link to cell A1 on the same sheet
-        cell = sheet.createRow(1).createCell(0);
-        cell.setCellValue("Worksheet Link");
-        link = new HSSFHyperlink(HyperlinkType.DOCUMENT);
-        link.setAddress("'Hyperlinks'!A1");
-        cell.setHyperlink(link);
-
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        wb.close();
-        
-        sheet = wbBack.getSheet("Hyperlinks");
-
-        cell = sheet.getRow(0).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("'Target Sheet'!A1", link.getTextMark());
-        assertEquals("'Target Sheet'!A1", link.getAddress());
-
-        cell = sheet.getRow(1).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("'Hyperlinks'!A1", link.getTextMark());
-        assertEquals("'Hyperlinks'!A1", link.getAddress());
-        
-        wbBack.close();
-    }
-
-    @Test
-    public void testCloneSheet() {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("HyperlinksOnManySheets.xls");
-
-        HSSFCell cell;
-        HSSFHyperlink link;
-
-        HSSFSheet sheet = wb.cloneSheet(0);
-
-        cell = sheet.getRow(4).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("http://poi.apache.org/", link.getAddress());
-
-        cell = sheet.getRow(8).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("http://poi.apache.org/hssf/", link.getAddress());
-    }
-
-    @Test
-    public void testCreate() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        HSSFHyperlink link;
-        HSSFCell cell;
-        HSSFSheet sheet = wb.createSheet("Hyperlinks");
-
-        cell = sheet.createRow(1).createCell(0);
-        cell.setCellValue("File Link");
-        link = new HSSFHyperlink(HyperlinkType.FILE);
-        link.setAddress("testfolder\\test.PDF");
-        cell.setHyperlink(link);
-
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        
-        wb.close();
-
-        sheet = wbBack.getSheet("Hyperlinks");
-
-        cell = sheet.getRow(1).getCell(0);
-        link = cell.getHyperlink();
-        assertNotNull(link);
-        assertEquals("testfolder\\test.PDF", link.getAddress());
-        
-        wbBack.close();
-    }
-
-    /**
-     * Test that HSSFSheet#shiftRows moves hyperlinks,
-     * see bugs #46445 and #29957
-     */
-    @Test
-    public void testShiftRows(){
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("46445.xls");
-
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        //verify existing hyperlink in A3
-        HSSFCell cell1 = sheet.getRow(2).getCell(0);
-        HSSFHyperlink link1 = cell1.getHyperlink();
-        assertNotNull(link1);
-        assertEquals(2, link1.getFirstRow());
-        assertEquals(2, link1.getLastRow());
-
-        //assign a hyperlink to A4
-        HSSFHyperlink link2 = new HSSFHyperlink(HyperlinkType.DOCUMENT);
-        link2.setAddress("Sheet2!A2");
-        HSSFCell cell2 = sheet.getRow(3).getCell(0);
-        cell2.setHyperlink(link2);
-        assertEquals(3, link2.getFirstRow());
-        assertEquals(3, link2.getLastRow());
-
-        //move the 3rd row two rows down
-        sheet.shiftRows(sheet.getFirstRowNum(), sheet.getLastRowNum(), 2);
-
-        //cells A3 and A4 don't contain hyperlinks anymore
-        assertNull(sheet.getRow(2).getCell(0).getHyperlink());
-        assertNull(sheet.getRow(3).getCell(0).getHyperlink());
-
-        //the first hyperlink now belongs to A5
-        HSSFHyperlink link1_shifted = sheet.getRow(2+2).getCell(0).getHyperlink();
-        assertNotNull(link1_shifted);
-        assertEquals(4, link1_shifted.getFirstRow());
-        assertEquals(4, link1_shifted.getLastRow());
-
-        //the second hyperlink now belongs to A6
-        HSSFHyperlink link2_shifted = sheet.getRow(3+2).getCell(0).getHyperlink();
-        assertNotNull(link2_shifted);
-        assertEquals(5, link2_shifted.getFirstRow());
-        assertEquals(5, link2_shifted.getLastRow());
-    }
-    
-    @Override
-    public HSSFHyperlink copyHyperlink(Hyperlink link) {
-        return new HSSFHyperlink(link);
-    }
-    
-    /*
-    @Test
-    public void testCopyXSSFHyperlink() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFCreationHelper helper = wb.getCreationHelper();
-        XSSFHyperlink xlink = helper.createHyperlink(Hyperlink.LINK_URL);
-        xlink.setAddress("http://poi.apache.org/");
-        xlink.setCellReference("D3");
-        xlink.setTooltip("tooltip");
-        HSSFHyperlink hlink = new HSSFHyperlink(xlink);
-        
-        assertEquals("http://poi.apache.org/", hlink.getAddress());
-        assertEquals("D3", new CellReference(hlink.getFirstRow(), hlink.getFirstColumn()).formatAsString());
-        // Are HSSFHyperlink.label and XSSFHyperlink.tooltip the same? If so, perhaps one of these needs renamed for a consistent Hyperlink interface
-        // assertEquals("tooltip", hlink.getLabel());
-        
-        wb.close();
-    }*/
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
deleted file mode 100644
index 16333fc..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.POITestCase;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.BaseTestNamedRange;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Tests various functionality having to do with {@link org.apache.poi.ss.usermodel.Name}.
- */
-public final class TestHSSFName extends BaseTestNamedRange {
-
-    /**
-     * For manipulating the internals of {@link HSSFName} during testing.<br/>
-     * Some tests need a {@link NameRecord} with unusual state, not normally producible by POI.
-     * This method achieves the aims at low cost without augmenting the POI usermodel api.
-     * @return a reference to the wrapped {@link NameRecord}
-     */
-    public static NameRecord getNameRecord(HSSFName definedName) {
-        return POITestCase.getFieldValue(HSSFName.class, definedName, NameRecord.class, "_definedNameRec");
-    }
-
-    public TestHSSFName() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void testRepeatingRowsAndColumsNames() throws Exception {
-         // First test that setting RR&C for same sheet more than once only creates a
-         // single  Print_Titles built-in record
-         HSSFWorkbook wb = new HSSFWorkbook();
-         HSSFSheet sheet = wb.createSheet("FirstSheet");
-
-         // set repeating rows and columns twice for the first sheet
-         CellRangeAddress cra = CellRangeAddress.valueOf("A1:A3");
-         for (int i = 0; i < 2; i++) {
-             sheet.setRepeatingColumns(cra);
-             sheet.setRepeatingRows(cra);
-             sheet.createFreezePane(0, 3);
-         }
-         assertEquals(1, wb.getNumberOfNames());
-         HSSFName nr1 = wb.getNameAt(0);
-
-         assertEquals("Print_Titles", nr1.getNameName());
-         // TODO - full column references not rendering properly, absolute markers not present either
-         // assertEquals("FirstSheet!$A:$A,FirstSheet!$1:$3", nr1.getRefersToFormula());
-         assertEquals("FirstSheet!A:A,FirstSheet!$A$1:$IV$3", nr1.getRefersToFormula());
-
-         // Save and re-open
-         HSSFWorkbook nwb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-         wb.close();
-
-         assertEquals(1, nwb.getNumberOfNames());
-         nr1 = nwb.getNameAt(0);
-
-         assertEquals("Print_Titles", nr1.getNameName());
-         assertEquals("FirstSheet!A:A,FirstSheet!$A$1:$IV$3", nr1.getRefersToFormula());
-
-         // check that setting RR&C on a second sheet causes a new Print_Titles built-in
-         // name to be created
-         sheet = nwb.createSheet("SecondSheet");
-         cra = CellRangeAddress.valueOf("B1:C1");
-         sheet.setRepeatingColumns(cra);
-         sheet.setRepeatingRows(cra);
-
-         assertEquals(2, nwb.getNumberOfNames());
-         HSSFName nr2 = nwb.getNameAt(1);
-
-         assertEquals("Print_Titles", nr2.getNameName());
-         assertEquals("SecondSheet!B:C,SecondSheet!$A$1:$IV$1", nr2.getRefersToFormula());
-
-         nwb.close();
-     }
-
-    @Test
-    public void testNamedRange() throws Exception {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("Simple.xls");
-
-        //Creating new Named Range
-        HSSFName newNamedRange = wb1.createName();
-
-        //Getting Sheet Name for the reference
-        String sheetName = wb1.getSheetName(0);
-
-        //Setting its name
-        newNamedRange.setNameName("RangeTest");
-        //Setting its reference
-        newNamedRange.setRefersToFormula(sheetName + "!$D$4:$E$8");
-
-        //Getting NAmed Range
-        HSSFName namedRange1 = wb1.getNameAt(0);
-        //Getting it sheet name
-        sheetName = namedRange1.getSheetName();
-        assertNotNull(sheetName);
-
-        // sanity check
-        SanityChecker c = new SanityChecker();
-        c.checkHSSFWorkbook(wb1);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        HSSFName nm = wb2.getNameAt(wb2.getNameIndex("RangeTest"));
-        assertTrue("Name is "+nm.getNameName(),"RangeTest".equals(nm.getNameName()));
-        assertEquals(wb2.getSheetName(0)+"!$D$4:$E$8", nm.getRefersToFormula());
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Reads an excel file already containing a named range.
-     * <p>
-     * Addresses Bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9632" target="_bug">#9632</a>
-     */
-    @Test
-    public void testNamedRead() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("namedinput.xls");
-
-        //Get index of the named range with the name = "NamedRangeName" , which was defined in input.xls as A1:D10
-        int NamedRangeIndex     = wb.getNameIndex("NamedRangeName");
-
-        //Getting NAmed Range
-        HSSFName namedRange1 = wb.getNameAt(NamedRangeIndex);
-        String sheetName = wb.getSheetName(0);
-
-        //Getting its reference
-        String reference = namedRange1.getRefersToFormula();
-
-        assertEquals(sheetName+"!$A$1:$D$10", reference);
-
-        HSSFName namedRange2 = wb.getNameAt(1);
-
-        assertEquals(sheetName+"!$D$17:$G$27", namedRange2.getRefersToFormula());
-        assertEquals("SecondNamedRange", namedRange2.getNameName());
-        
-        wb.close();
-    }
-
-    /**
-     * Reads an excel file already containing a named range and updates it
-     * <p>
-     * Addresses Bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=16411" target="_bug">#16411</a>
-     */
-    @Test
-    public void testNamedReadModify() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("namedinput.xls");
-
-        HSSFName name = wb.getNameAt(0);
-        String sheetName = wb.getSheetName(0);
-
-        assertEquals(sheetName+"!$A$1:$D$10", name.getRefersToFormula());
-
-        name = wb.getNameAt(1);
-        String newReference = sheetName +"!$A$1:$C$36";
-
-        name.setRefersToFormula(newReference);
-        assertEquals(newReference, name.getRefersToFormula());
-        
-        wb.close();
-    }
-
-     /**
-      * Test to see if the print area can be retrieved from an excel created file
-      */
-    @Test
-    public void testPrintAreaFileRead() throws Exception {
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPrintArea.xls");
-
-        String sheetName = workbook.getSheetName(0);
-        String reference = sheetName+"!$A$1:$C$5";
-
-        assertEquals(reference, workbook.getPrintArea(0));
-        workbook.close();
-    }
-
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testDeletedReference() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("24207.xls");
-        assertEquals(2, wb.getNumberOfNames());
-
-        HSSFName name1 = wb.getNameAt(0);
-        assertEquals("a", name1.getNameName());
-        assertEquals("Sheet1!$A$1", name1.getRefersToFormula());
-        new AreaReference(name1.getRefersToFormula());
-        assertTrue("Successfully constructed first reference", true);
-
-        HSSFName name2 = wb.getNameAt(1);
-        assertEquals("b", name2.getNameName());
-        assertEquals("Sheet1!#REF!", name2.getRefersToFormula());
-        assertTrue(name2.isDeleted());
-        try {
-            new AreaReference(name2.getRefersToFormula());
-            fail("attempt to supply an invalid reference to AreaReference constructor results in exception");
-        } catch (IllegalArgumentException e) { // TODO - use a stronger typed exception for this condition
-            // expected during successful test
-        }
-        wb.close();
-    }
-
-    /**
-     * When setting A1 type of references with HSSFName.setRefersToFormula
-     * must set the type of operands to Ptg.CLASS_REF,
-     * otherwise created named don't appear in the drop-down to the left of formula bar in Excel
-     */
-    @Test
-    public void testTypeOfRootPtg() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("CSCO");
-
-        Ptg[] ptgs = HSSFFormulaParser.parse("CSCO!$E$71", wb, FormulaType.NAMEDRANGE, 0);
-        for (Ptg ptg : ptgs) {
-            assertEquals('R', ptg.getRVAType());
-        }
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
deleted file mode 100644
index acb4974..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-
-import junit.framework.TestCase;
-
-public final class TestHSSFOptimiser extends TestCase {
-	public void testDoesNoHarmIfNothingToDo() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-
-		// New files start with 4 built in fonts, and 21 built in styles
-      assertEquals(4, wb.getNumberOfFonts());
-      assertEquals(21, wb.getNumCellStyles());
-
-      // Create a test font and style, and use them
-      HSSFFont f = wb.createFont();
-		f.setFontName("Testing");
-		HSSFCellStyle s = wb.createCellStyle();
-		s.setFont(f);
-		
-		HSSFSheet sheet = wb.createSheet();
-		HSSFRow row = sheet.createRow(0);
-		row.createCell(0).setCellStyle(s);
-
-		// Should have one more than the default of each
-		assertEquals(5, wb.getNumberOfFonts());
-		assertEquals(22, wb.getNumCellStyles());
-
-		// Optimise fonts
-		HSSFOptimiser.optimiseFonts(wb);
-
-		assertEquals(5, wb.getNumberOfFonts());
-		assertEquals(22, wb.getNumCellStyles());
-
-		assertEquals(f, s.getFont(wb));
-
-		// Optimise styles
-		HSSFOptimiser.optimiseCellStyles(wb);
-
-		assertEquals(5, wb.getNumberOfFonts());
-		assertEquals(22, wb.getNumCellStyles());
-
-		assertEquals(f, s.getFont(wb));
-	}
-
-	public void testOptimiseFonts() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-
-		// Add 6 fonts, some duplicates
-		HSSFFont f1 = wb.createFont();
-		f1.setFontHeight((short) 11);
-		f1.setFontName("Testing");
-
-		HSSFFont f2 = wb.createFont();
-		f2.setFontHeight((short) 22);
-		f2.setFontName("Also Testing");
-
-		HSSFFont f3 = wb.createFont();
-		f3.setFontHeight((short) 33);
-		f3.setFontName("Unique");
-
-		HSSFFont f4 = wb.createFont();
-		f4.setFontHeight((short) 11);
-		f4.setFontName("Testing");
-
-		HSSFFont f5 = wb.createFont();
-		f5.setFontHeight((short) 22);
-		f5.setFontName("Also Testing");
-
-		HSSFFont f6 = wb.createFont();
-		f6.setFontHeight((short) 66);
-		f6.setFontName("Also Unique");
-
-		// Use all three of the four in cell styles
-		assertEquals(21, wb.getNumCellStyles());
-
-		HSSFCellStyle cs1 = wb.createCellStyle();
-		cs1.setFont(f1);
-		assertEquals(5, cs1.getFontIndex());
-
-		HSSFCellStyle cs2 = wb.createCellStyle();
-		cs2.setFont(f4);
-		assertEquals(8, cs2.getFontIndex());
-
-		HSSFCellStyle cs3 = wb.createCellStyle();
-		cs3.setFont(f5);
-		assertEquals(9, cs3.getFontIndex());
-
-		HSSFCellStyle cs4 = wb.createCellStyle();
-		cs4.setFont(f6);
-		assertEquals(10, cs4.getFontIndex());
-
-		assertEquals(25, wb.getNumCellStyles());
-
-		// And three in rich text
-		HSSFSheet s = wb.createSheet();
-		HSSFRow r = s.createRow(0);
-
-		HSSFRichTextString rtr1 = new HSSFRichTextString("Test");
-		rtr1.applyFont(0, 2, f1);
-		rtr1.applyFont(3, 4, f2);
-		r.createCell(0).setCellValue(rtr1);
-
-		HSSFRichTextString rtr2 = new HSSFRichTextString("AlsoTest");
-		rtr2.applyFont(0, 2, f3);
-		rtr2.applyFont(3, 5, f5);
-		rtr2.applyFont(6, 8, f6);
-		r.createCell(1).setCellValue(rtr2);
-
-		// Check what we have now
-		assertEquals(10, wb.getNumberOfFonts());
-		assertEquals(25, wb.getNumCellStyles());
-
-		// Optimise
-		HSSFOptimiser.optimiseFonts(wb);
-
-		// Check font count
-		assertEquals(8, wb.getNumberOfFonts());
-		assertEquals(25, wb.getNumCellStyles());
-
-		// Check font use in cell styles
-		assertEquals(5, cs1.getFontIndex());
-		assertEquals(5, cs2.getFontIndex()); // duplicate of 1
-		assertEquals(6, cs3.getFontIndex()); // duplicate of 2
-		assertEquals(8, cs4.getFontIndex()); // two have gone
-
-		// And in rich text
-
-		// RTR 1 had f1 and f2, unchanged
-		assertEquals(5, r.getCell(0).getRichStringCellValue().getFontAtIndex(0));
-		assertEquals(5, r.getCell(0).getRichStringCellValue().getFontAtIndex(1));
-		assertEquals(6, r.getCell(0).getRichStringCellValue().getFontAtIndex(3));
-		assertEquals(6, r.getCell(0).getRichStringCellValue().getFontAtIndex(4));
-
-		// RTR 2 had f3 (unchanged), f5 (=f2) and f6 (moved down)
-		assertEquals(7, r.getCell(1).getRichStringCellValue().getFontAtIndex(0));
-		assertEquals(7, r.getCell(1).getRichStringCellValue().getFontAtIndex(1));
-		assertEquals(6, r.getCell(1).getRichStringCellValue().getFontAtIndex(3));
-		assertEquals(6, r.getCell(1).getRichStringCellValue().getFontAtIndex(4));
-		assertEquals(8, r.getCell(1).getRichStringCellValue().getFontAtIndex(6));
-		assertEquals(8, r.getCell(1).getRichStringCellValue().getFontAtIndex(7));
-	}
-
-	public void testOptimiseStyles() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-
-		// Two fonts
-		assertEquals(4, wb.getNumberOfFonts());
-
-		HSSFFont f1 = wb.createFont();
-		f1.setFontHeight((short) 11);
-		f1.setFontName("Testing");
-
-		HSSFFont f2 = wb.createFont();
-		f2.setFontHeight((short) 22);
-		f2.setFontName("Also Testing");
-
-		assertEquals(6, wb.getNumberOfFonts());
-
-		// Several styles
-		assertEquals(21, wb.getNumCellStyles());
-
-		HSSFCellStyle cs1 = wb.createCellStyle();
-		cs1.setFont(f1);
-
-		HSSFCellStyle cs2 = wb.createCellStyle();
-		cs2.setFont(f2);
-
-		HSSFCellStyle cs3 = wb.createCellStyle();
-		cs3.setFont(f1);
-
-		HSSFCellStyle cs4 = wb.createCellStyle();
-		cs4.setFont(f1);
-		cs4.setAlignment((short) 22);
-
-		HSSFCellStyle cs5 = wb.createCellStyle();
-		cs5.setFont(f2);
-		cs5.setAlignment((short) 111);
-
-		HSSFCellStyle cs6 = wb.createCellStyle();
-		cs6.setFont(f2);
-
-		assertEquals(27, wb.getNumCellStyles());
-
-		// Use them
-		HSSFSheet s = wb.createSheet();
-		HSSFRow r = s.createRow(0);
-
-		r.createCell(0).setCellStyle(cs1);
-		r.createCell(1).setCellStyle(cs2);
-		r.createCell(2).setCellStyle(cs3);
-		r.createCell(3).setCellStyle(cs4);
-		r.createCell(4).setCellStyle(cs5);
-		r.createCell(5).setCellStyle(cs6);
-		r.createCell(6).setCellStyle(cs1);
-		r.createCell(7).setCellStyle(cs2);
-
-		assertEquals(21, r.getCell(0).getCellValueRecord().getXFIndex());
-		assertEquals(26, r.getCell(5).getCellValueRecord().getXFIndex());
-		assertEquals(21, r.getCell(6).getCellValueRecord().getXFIndex());
-
-		// Optimise
-		HSSFOptimiser.optimiseCellStyles(wb);
-
-		// Check
-		assertEquals(6, wb.getNumberOfFonts());
-		assertEquals(25, wb.getNumCellStyles());
-
-		// cs1 -> 21
-		assertEquals(21, r.getCell(0).getCellValueRecord().getXFIndex());
-		// cs2 -> 22
-		assertEquals(22, r.getCell(1).getCellValueRecord().getXFIndex());
-		assertEquals(22, r.getCell(1).getCellStyle().getFont(wb).getFontHeight());
-		// cs3 = cs1 -> 21
-		assertEquals(21, r.getCell(2).getCellValueRecord().getXFIndex());
-		// cs4 --> 24 -> 23
-		assertEquals(23, r.getCell(3).getCellValueRecord().getXFIndex());
-		// cs5 --> 25 -> 24
-		assertEquals(24, r.getCell(4).getCellValueRecord().getXFIndex());
-		// cs6 = cs2 -> 22
-		assertEquals(22, r.getCell(5).getCellValueRecord().getXFIndex());
-		// cs1 -> 21
-		assertEquals(21, r.getCell(6).getCellValueRecord().getXFIndex());
-		// cs2 -> 22
-		assertEquals(22, r.getCell(7).getCellValueRecord().getXFIndex());
-		
-		
-		// Add a new duplicate, and two that aren't used
-      HSSFCellStyle csD = wb.createCellStyle();
-      csD.setFont(f1);
-      r.createCell(8).setCellStyle(csD);
-      
-      HSSFFont f3 = wb.createFont();
-      f3.setFontHeight((short) 23);
-      f3.setFontName("Testing 3");
-      HSSFFont f4 = wb.createFont();
-      f4.setFontHeight((short) 24);
-      f4.setFontName("Testing 4");
-
-      HSSFCellStyle csU1 = wb.createCellStyle();
-      csU1.setFont(f3);
-      HSSFCellStyle csU2 = wb.createCellStyle();
-      csU2.setFont(f4);
-      
-      // Check before the optimise
-      assertEquals(8, wb.getNumberOfFonts());
-      assertEquals(28, wb.getNumCellStyles());
-      
-      // Optimise, should remove the two un-used ones and the one duplicate
-      HSSFOptimiser.optimiseCellStyles(wb);
-      
-      // Check
-      assertEquals(8, wb.getNumberOfFonts());
-      assertEquals(25, wb.getNumCellStyles());
-      
-      // csD -> cs1 -> 21
-      assertEquals(21, r.getCell(8).getCellValueRecord().getXFIndex());
-	}
-
-	public void testOptimiseStylesCheckActualStyles() {
-	    HSSFWorkbook wb = new HSSFWorkbook();
-	    
-	    // Several styles
-	    assertEquals(21, wb.getNumCellStyles());
-	    
-	    HSSFCellStyle cs1 = wb.createCellStyle();
-	    cs1.setBorderBottom(BorderStyle.THICK);
-	    
-	    HSSFCellStyle cs2 = wb.createCellStyle();
-	    cs2.setBorderBottom(BorderStyle.DASH_DOT);
-	    
-	    HSSFCellStyle cs3 = wb.createCellStyle(); // = cs1
-	    cs3.setBorderBottom(BorderStyle.THICK);
-	    
-	    assertEquals(24, wb.getNumCellStyles());
-	    
-	    // Use them
-	    HSSFSheet s = wb.createSheet();
-	    HSSFRow r = s.createRow(0);
-	    
-	    r.createCell(0).setCellStyle(cs1);
-	    r.createCell(1).setCellStyle(cs2);
-	    r.createCell(2).setCellStyle(cs3);
-	    
-	    assertEquals(21, r.getCell(0).getCellValueRecord().getXFIndex());
-	    assertEquals(22, r.getCell(1).getCellValueRecord().getXFIndex());
-	    assertEquals(23, r.getCell(2).getCellValueRecord().getXFIndex());
-	    
-	    // Optimise
-	    HSSFOptimiser.optimiseCellStyles(wb);
-	    
-	    // Check
-	    assertEquals(23, wb.getNumCellStyles());
-	    
-	    assertEquals(BorderStyle.THICK, r.getCell(0).getCellStyle().getBorderBottomEnum());
-	    assertEquals(BorderStyle.DASH_DOT, r.getCell(1).getCellStyle().getBorderBottomEnum());
-	    assertEquals(BorderStyle.THICK, r.getCell(2).getCellStyle().getBorderBottomEnum());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
deleted file mode 100644
index fb2ae45..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.PaletteRecord;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.junit.Test;
-
-import junit.framework.TestCase;
-
-/**
- * @author Brian Sanders (bsanders at risklabs dot com)
- */
-public final class TestHSSFPalette extends TestCase {
-    private PaletteRecord _palette;
-    private HSSFPalette _hssfPalette;
-
-
-    @Override
-    public void setUp()
-    {
-        _palette = new PaletteRecord();
-        _hssfPalette = new HSSFPalette(_palette);
-    }
-
-    /**
-     * Verifies that a custom palette can be created, saved, and reloaded
-     */
-    public void testCustomPalette() {
-        //reading sample xls
-        HSSFWorkbook book = HSSFTestDataSamples.openSampleWorkbook("Simple.xls");
-
-        //creating custom palette
-        HSSFPalette palette = book.getCustomPalette();
-        palette.setColorAtIndex((short) 0x12, (byte) 101, (byte) 230, (byte) 100);
-        palette.setColorAtIndex((short) 0x3b, (byte) 0, (byte) 255, (byte) 52);
-
-        //writing to disk; reading in and verifying palette
-        book = HSSFTestDataSamples.writeOutAndReadBack(book);
-
-        palette = book.getCustomPalette();
-        HSSFColor color = palette.getColor(HSSFColor.CORAL.index);  //unmodified
-        assertNotNull("Unexpected null in custom palette (unmodified index)", color);
-        short[] expectedRGB = HSSFColor.CORAL.triplet;
-        short[] actualRGB = color.getTriplet();
-        String msg = "Expected palette position to remain unmodified";
-        assertEquals(msg, expectedRGB[0], actualRGB[0]);
-        assertEquals(msg, expectedRGB[1], actualRGB[1]);
-        assertEquals(msg, expectedRGB[2], actualRGB[2]);
-
-        color = palette.getColor((short) 0x12);
-        assertNotNull("Unexpected null in custom palette (modified)", color);
-        actualRGB = color.getTriplet();
-        msg = "Expected palette modification to be preserved across save";
-        assertEquals(msg, (short) 101, actualRGB[0]);
-        assertEquals(msg, (short) 230, actualRGB[1]);
-        assertEquals(msg, (short) 100, actualRGB[2]);
-    }
-
-    /**
-     * Uses the palette from cell stylings
-     */
-    public void testPaletteFromCellColours() {
-        HSSFWorkbook book = HSSFTestDataSamples.openSampleWorkbook("SimpleWithColours.xls");
-
-        HSSFPalette p = book.getCustomPalette();
-
-        HSSFCell cellA = book.getSheetAt(0).getRow(0).getCell(0);
-        HSSFCell cellB = book.getSheetAt(0).getRow(1).getCell(0);
-        HSSFCell cellC = book.getSheetAt(0).getRow(2).getCell(0);
-        HSSFCell cellD = book.getSheetAt(0).getRow(3).getCell(0);
-        HSSFCell cellE = book.getSheetAt(0).getRow(4).getCell(0);
-
-        // Plain
-        assertEquals("I'm plain", cellA.getStringCellValue());
-        assertEquals(64, cellA.getCellStyle().getFillForegroundColor());
-        assertEquals(64, cellA.getCellStyle().getFillBackgroundColor());
-        assertEquals(HSSFFont.COLOR_NORMAL, cellA.getCellStyle().getFont(book).getColor());
-        assertEquals(0, cellA.getCellStyle().getFillPattern());
-        assertEquals("0:0:0", p.getColor((short)64).getHexString());
-        assertEquals(null, p.getColor((short)32767));
-
-        // Red
-        assertEquals("I'm red", cellB.getStringCellValue());
-        assertEquals(64, cellB.getCellStyle().getFillForegroundColor());
-        assertEquals(64, cellB.getCellStyle().getFillBackgroundColor());
-        assertEquals(10, cellB.getCellStyle().getFont(book).getColor());
-        assertEquals(0, cellB.getCellStyle().getFillPattern());
-        assertEquals("0:0:0", p.getColor((short)64).getHexString());
-        assertEquals("FFFF:0:0", p.getColor((short)10).getHexString());
-
-        // Red + green bg
-        assertEquals("I'm red with a green bg", cellC.getStringCellValue());
-        assertEquals(11, cellC.getCellStyle().getFillForegroundColor());
-        assertEquals(64, cellC.getCellStyle().getFillBackgroundColor());
-        assertEquals(10, cellC.getCellStyle().getFont(book).getColor());
-        assertEquals(1, cellC.getCellStyle().getFillPattern());
-        assertEquals("0:FFFF:0", p.getColor((short)11).getHexString());
-        assertEquals("FFFF:0:0", p.getColor((short)10).getHexString());
-
-        // Pink with yellow
-        assertEquals("I'm pink with a yellow pattern (none)", cellD.getStringCellValue());
-        assertEquals(13, cellD.getCellStyle().getFillForegroundColor());
-        assertEquals(64, cellD.getCellStyle().getFillBackgroundColor());
-        assertEquals(14, cellD.getCellStyle().getFont(book).getColor());
-        assertEquals(0, cellD.getCellStyle().getFillPattern());
-        assertEquals("FFFF:FFFF:0", p.getColor((short)13).getHexString());
-        assertEquals("FFFF:0:FFFF", p.getColor((short)14).getHexString());
-
-        // Pink with yellow - full
-        assertEquals("I'm pink with a yellow pattern (full)", cellE.getStringCellValue());
-        assertEquals(13, cellE.getCellStyle().getFillForegroundColor());
-        assertEquals(64, cellE.getCellStyle().getFillBackgroundColor());
-        assertEquals(14, cellE.getCellStyle().getFont(book).getColor());
-        assertEquals(0, cellE.getCellStyle().getFillPattern());
-        assertEquals("FFFF:FFFF:0", p.getColor((short)13).getHexString());
-        assertEquals("FFFF:0:FFFF", p.getColor((short)14).getHexString());
-    }
-
-    public void testFindSimilar() throws IOException {
-        HSSFWorkbook book = new HSSFWorkbook();
-        HSSFPalette p = book.getCustomPalette();
-        
-        /* first test the defaults */
-        assertArrayEquals(
-        				new short[] {(short) 255, (short) 255, (short) 0}, // not [204, 255, 255]
-        				p.findSimilarColor((byte) 204, (byte) 255, (byte) 0).getTriplet()
-        );
-
-        assertArrayEquals(
-        				new short[] {(short) 153, (short) 204, (short) 0}, // not [128, 0, 0]
-        				p.findSimilarColor((byte) 128, (byte) 255, (byte) 0).getTriplet()
-        );
-
-        assertArrayEquals(
-        				new short[] {(short) 0, (short) 255, (short) 0}, // not [0, 51, 102]
-        				p.findSimilarColor((byte) 0, (byte) 255, (byte) 102).getTriplet()
-        );
-
-        assertArrayEquals(
-        				new short[] {(short) 0, (short) 102, (short) 204}, // not [255, 102, 0]
-        				p.findSimilarColor((byte) 0, (byte) 102, (byte) 255).getTriplet()
-        );
-
-        assertArrayEquals(
-        				new short[] {(short) 255, (short) 0, (short) 255}, // not [128, 0, 0]
-        				p.findSimilarColor((byte) 128, (byte) 0, (byte) 255).getTriplet()
-        );
-
-        assertArrayEquals(
-        				new short[] {(short) 255, (short) 0, (short) 255}, // not [255, 255, 153]
-        				p.findSimilarColor((byte) 255, (byte) 0, (byte) 153).getTriplet()
-        );
-
-
-        // Add a few edge colours in
-        p.setColorAtIndex((short)8, (byte)-1, (byte)0, (byte)0);
-        p.setColorAtIndex((short)9, (byte)0, (byte)-1, (byte)0);
-        p.setColorAtIndex((short)10, (byte)0, (byte)0, (byte)-1);
-
-        // And some near a few of them
-        p.setColorAtIndex((short)11, (byte)-1, (byte)2, (byte)2);
-        p.setColorAtIndex((short)12, (byte)-2, (byte)2, (byte)10);
-        p.setColorAtIndex((short)13, (byte)-4, (byte)0, (byte)0);
-        p.setColorAtIndex((short)14, (byte)-8, (byte)0, (byte)0);
-
-        assertEquals(
-                "FFFF:0:0", p.getColor((short)8).getHexString()
-        );
-
-        // Now check we get the right stuff back
-        assertEquals(
-                p.getColor((short)8).getHexString(),
-                p.findSimilarColor((byte)-1, (byte)0, (byte)0).getHexString()
-        );
-        assertEquals(
-                p.getColor((short)8).getHexString(),
-                p.findSimilarColor((byte)-2, (byte)0, (byte)0).getHexString()
-        );
-        assertEquals(
-                p.getColor((short)8).getHexString(),
-                p.findSimilarColor((byte)-1, (byte)1, (byte)0).getHexString()
-        );
-        assertEquals(
-                p.getColor((short)11).getHexString(),
-                p.findSimilarColor((byte)-1, (byte)2, (byte)1).getHexString()
-        );
-        assertEquals(
-                p.getColor((short)12).getHexString(),
-                p.findSimilarColor((byte)-1, (byte)2, (byte)10).getHexString()
-        );
-        
-        // And with ints not bytes
-        assertEquals(
-                p.getColor((short)11).getHexString(),
-                p.findSimilarColor(255, 2, 1).getHexString()
-        );
-        assertEquals(
-                p.getColor((short)12).getHexString(),
-                p.findSimilarColor(255, 2, 10).getHexString()
-        );
-        
-        book.close();
-    }
-    
-    /**
-     * Verifies that the generated gnumeric-format string values match the
-     * hardcoded values in the HSSFColor default color palette
-     */
-    public void testGnumericStrings() {
-        compareToDefaults(new ColorComparator() {
-            @Override
-            public void compare(HSSFColor expected, HSSFColor palette)
-            {
-                assertEquals(expected.getHexString(), palette.getHexString());
-            }
-        });
-    }
-
-    /**
-     * Verifies that the palette handles invalid palette indexes
-     */
-    public void testBadIndexes() {
-        //too small
-        _hssfPalette.setColorAtIndex((short) 2, (byte) 255, (byte) 255, (byte) 255);
-        //too large
-        _hssfPalette.setColorAtIndex((short) 0x45, (byte) 255, (byte) 255, (byte) 255);
-
-        //should still match defaults;
-        compareToDefaults(new ColorComparator() {
-            @Override
-            public void compare(HSSFColor expected, HSSFColor palette)
-            {
-                short[] s1 = expected.getTriplet();
-                short[] s2 = palette.getTriplet();
-                assertEquals(s1[0], s2[0]);
-                assertEquals(s1[1], s2[1]);
-                assertEquals(s1[2], s2[2]);
-            }
-        });
-    }
-
-    private void compareToDefaults(ColorComparator c) {
-        Map<Integer,HSSFColor> colors = HSSFColor.getIndexHash();
-        Iterator<Integer> it = colors.keySet().iterator();
-        while (it.hasNext())
-        {
-            Number index = it.next();
-            HSSFColor expectedColor = colors.get(index);
-            HSSFColor paletteColor = _hssfPalette.getColor(index.shortValue());
-            c.compare(expectedColor, paletteColor);
-        }
-    }
-
-    public void testAddColor() {
-        try
-        {
-            _hssfPalette.addColor((byte)10,(byte)10,(byte)10);
-            fail();
-        } catch (RuntimeException e) {
-            // Failing because by default there are no colours left in the palette.
-        }
-    }
-
-    private static interface ColorComparator {
-        void compare(HSSFColor expected, HSSFColor palette);
-    }
-
-    @Test
-    public void test48403() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        Color color = Color.decode("#006B6B");
-        HSSFPalette palette = wb.getCustomPalette();
-        
-        HSSFColor hssfColor = palette.findColor((byte) color.getRed(),
-                (byte) color.getGreen(), (byte) color.getBlue());
-        assertNull(hssfColor);
-
-        palette.setColorAtIndex(
-                (short) (PaletteRecord.STANDARD_PALETTE_SIZE - 1),
-                (byte) color.getRed(), (byte) color.getGreen(),
-                (byte) color.getBlue());
-        hssfColor = palette.getColor((short) (PaletteRecord.STANDARD_PALETTE_SIZE - 1));
-        assertNotNull(hssfColor);
-        assertEquals(55, hssfColor.getIndex());
-        assertArrayEquals(new short[] {0, 107, 107}, hssfColor.getTriplet());
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
deleted file mode 100644
index e3428cc..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * @author Josh Micich
- */
-public final class TestHSSFPatriarch extends TestCase {
-
-	public void testBasic() {
-
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet();
-
-		HSSFPatriarch patr = sheet.createDrawingPatriarch();
-		assertNotNull(patr);
-
-		// assert something more interesting
-	}
-
-	public void test44916() {
-
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet();
-
-		// 1. Create drawing patriarch
-		HSSFPatriarch patr = sheet.createDrawingPatriarch();
-
-		// 2. Try to re-get the patriarch
-		HSSFPatriarch existingPatr;
-		try {
-			existingPatr = sheet.getDrawingPatriarch();
-		} catch (NullPointerException e) {
-			throw new AssertionFailedError("Identified bug 44916");
-		}
-
-		// 3. Use patriarch
-		HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 600, 245, (short) 1, 1, (short) 1, 2);
-		anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-		byte[] pictureData = HSSFTestDataSamples.getTestDataFileContent("logoKarmokar4.png");
-		int idx1 = wb.addPicture(pictureData, HSSFWorkbook.PICTURE_TYPE_PNG);
-		patr.createPicture(anchor, idx1);
-
-		// 4. Try to re-use patriarch later
-		existingPatr = sheet.getDrawingPatriarch();
-		assertNotNull(existingPatr);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
deleted file mode 100644
index 09387f5..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.ss.usermodel.BaseTestPicture;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
-
-/**
- * Test <code>HSSFPicture</code>.
- *
- * @author Yegor Kozlov (yegor at apache.org)
- */
-public final class TestHSSFPicture extends BaseTestPicture {
-
-    public TestHSSFPicture() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void resize() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("resize_compare.xls");
-        HSSFPatriarch dp = wb.getSheetAt(0).createDrawingPatriarch();
-        List<HSSFShape> pics = dp.getChildren();
-        HSSFPicture inpPic = (HSSFPicture)pics.get(0);
-        HSSFPicture cmpPic = (HSSFPicture)pics.get(1);
-        
-        baseTestResize(inpPic, cmpPic, 2.0, 2.0);
-        wb.close();
-    }
-    
-    /**
-     * Bug # 45829 reported ArithmeticException (/ by zero) when resizing png with zero DPI.
-     */
-    @Test
-    public void bug45829() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh1 = wb.createSheet();
-        HSSFPatriarch p1 = sh1.createDrawingPatriarch();
-
-        byte[] pictureData = HSSFTestDataSamples.getTestDataFileContent("45829.png");
-        int idx1 = wb.addPicture( pictureData, HSSFWorkbook.PICTURE_TYPE_PNG );
-        HSSFPicture pic = p1.createPicture(new HSSFClientAnchor(), idx1);
-        pic.resize();
-        
-        wb.close();
-    }
-
-
-    @SuppressWarnings("resource")
-    @Test
-    public void addPictures() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        
-        HSSFSheet sh = wb.createSheet("Pictures");
-        HSSFPatriarch dr = sh.createDrawingPatriarch();
-        assertEquals(0, dr.getChildren().size());
-        HSSFClientAnchor anchor = wb.getCreationHelper().createClientAnchor();
-
-        //register a picture
-        byte[] data1 = new byte[]{1, 2, 3};
-        int idx1 = wb.addPicture(data1, Workbook.PICTURE_TYPE_JPEG);
-        assertEquals(1, idx1);
-        HSSFPicture p1 = dr.createPicture(anchor, idx1);
-        assertArrayEquals(data1, p1.getPictureData().getData());
-
-        // register another one
-        byte[] data2 = new byte[]{4, 5, 6};
-        int idx2 = wb.addPicture(data2, Workbook.PICTURE_TYPE_JPEG);
-        assertEquals(2, idx2);
-        HSSFPicture p2 = dr.createPicture(anchor, idx2);
-        assertEquals(2, dr.getChildren().size());
-        assertArrayEquals(data2, p2.getPictureData().getData());
-
-        // confirm that HSSFPatriarch.getChildren() returns two picture shapes 
-        assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData());
-        assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData());
-
-        // write, read back and verify that our pictures are there
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        List<? extends PictureData> lst2 =  wb.getAllPictures();
-        assertEquals(2, lst2.size());
-        assertArrayEquals(data1, lst2.get(0).getData());
-        assertArrayEquals(data2, lst2.get(1).getData());
-
-        // confirm that the pictures are in the Sheet's drawing
-        sh = wb.getSheet("Pictures");
-        dr = sh.createDrawingPatriarch();
-        assertEquals(2, dr.getChildren().size());
-        assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData());
-        assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData());
-
-        // add a third picture
-        byte[] data3 = new byte[]{7, 8, 9};
-        // picture index must increment across write-read
-        int idx3 = wb.addPicture(data3, Workbook.PICTURE_TYPE_JPEG);
-        assertEquals(3, idx3);
-        HSSFPicture p3 = dr.createPicture(anchor, idx3);
-        assertArrayEquals(data3, p3.getPictureData().getData());
-        assertEquals(3, dr.getChildren().size());
-        assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData());
-        assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData());
-        assertArrayEquals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData());
-
-        // write and read again
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        List<? extends PictureData> lst3 =  wb.getAllPictures();
-        // all three should be there
-        assertEquals(3, lst3.size());
-        assertArrayEquals(data1, lst3.get(0).getData());
-        assertArrayEquals(data2, lst3.get(1).getData());
-        assertArrayEquals(data3, lst3.get(2).getData());
-
-        sh = wb.getSheet("Pictures");
-        dr = sh.createDrawingPatriarch();
-        assertEquals(3, dr.getChildren().size());
-
-        // forth picture
-        byte[] data4 = new byte[]{10, 11, 12};
-        int idx4 = wb.addPicture(data4, Workbook.PICTURE_TYPE_JPEG);
-        assertEquals(4, idx4);
-        dr.createPicture(anchor, idx4);
-        assertEquals(4, dr.getChildren().size());
-        assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData());
-        assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData());
-        assertArrayEquals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData());
-        assertArrayEquals(data4, ((HSSFPicture)dr.getChildren().get(3)).getPictureData().getData());
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        List<? extends PictureData> lst4 =  wb.getAllPictures();
-        assertEquals(4, lst4.size());
-        assertArrayEquals(data1, lst4.get(0).getData());
-        assertArrayEquals(data2, lst4.get(1).getData());
-        assertArrayEquals(data3, lst4.get(2).getData());
-        assertArrayEquals(data4, lst4.get(3).getData());
-        sh = wb.getSheet("Pictures");
-        dr = sh.createDrawingPatriarch();
-        assertEquals(4, dr.getChildren().size());
-        assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData());
-        assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData());
-        assertArrayEquals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData());
-        assertArrayEquals(data4, ((HSSFPicture)dr.getChildren().get(3)).getPictureData().getData());
-        
-        wb.close();
-    }
-
-    @SuppressWarnings("unused")
-    @Test
-    public void bsePictureRef() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        HSSFSheet sh = wb.createSheet("Pictures");
-        HSSFPatriarch dr = sh.createDrawingPatriarch();
-        HSSFClientAnchor anchor = new HSSFClientAnchor();
-
-        InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
-
-        //register a picture
-        byte[] data1 = new byte[]{1, 2, 3};
-        int idx1 = wb.addPicture(data1, Workbook.PICTURE_TYPE_JPEG);
-        assertEquals(1, idx1);
-        HSSFPicture p1 = dr.createPicture(anchor, idx1);
-
-        EscherBSERecord bse = wb.getWorkbook().getBSERecord(idx1);
-
-        assertEquals(bse.getRef(), 1);
-        dr.createPicture(new HSSFClientAnchor(), idx1);
-        assertEquals(bse.getRef(), 2);
-
-        HSSFShapeGroup gr = dr.createGroup(new HSSFClientAnchor());
-        gr.createPicture(new HSSFChildAnchor(), idx1);
-        assertEquals(bse.getRef(), 3);
-        
-        wb.close();
-    }
-
-    @Test
-    public void readExistingImage(){
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("picture");
-        HSSFPatriarch drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-
-        HSSFPicture picture = (HSSFPicture) drawing.getChildren().get(0);
-        assertEquals(picture.getFileName(), "test");
-    }
-
-    @SuppressWarnings("resource")
-    @Test
-    public void setGetProperties() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        HSSFSheet sh = wb.createSheet("Pictures");
-        HSSFPatriarch dr = sh.createDrawingPatriarch();
-        HSSFClientAnchor anchor = new HSSFClientAnchor();
-
-        //register a picture
-        byte[] data1 = new byte[]{1, 2, 3};
-        int idx1 = wb.addPicture(data1, Workbook.PICTURE_TYPE_JPEG);
-        HSSFPicture p1 = dr.createPicture(anchor, idx1);
-
-        assertEquals(p1.getFileName(), "");
-        p1.setFileName("aaa");
-        assertEquals(p1.getFileName(), "aaa");
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wb.getSheet("Pictures");
-        dr = sh.getDrawingPatriarch();
-
-        p1 = (HSSFPicture) dr.getChildren().get(0);
-        assertEquals(p1.getFileName(), "aaa");
-        wb.close();
-    }
-
-    @SuppressWarnings("resource")
-    @Test
-    public void bug49658() throws IOException {
-    	// test if inserted EscherMetafileBlip will be read again
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        byte pictureDataEmf[] = POIDataSamples.getDocumentInstance().readFile("vector_image.emf");
-        int indexEmf = wb.addPicture(pictureDataEmf, HSSFWorkbook.PICTURE_TYPE_EMF);
-        byte pictureDataPng[] = POIDataSamples.getSpreadSheetInstance().readFile("logoKarmokar4.png");
-        int indexPng = wb.addPicture(pictureDataPng, HSSFWorkbook.PICTURE_TYPE_PNG);
-        byte pictureDataWmf[] = POIDataSamples.getSlideShowInstance().readFile("santa.wmf");
-        int indexWmf = wb.addPicture(pictureDataWmf, HSSFWorkbook.PICTURE_TYPE_WMF);
-
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-        CreationHelper ch = wb.getCreationHelper();
-
-        ClientAnchor anchor = ch.createClientAnchor();
-        anchor.setCol1(2);
-        anchor.setCol2(5);
-        anchor.setRow1(1);
-        anchor.setRow2(6);
-        patriarch.createPicture(anchor, indexEmf);
-        
-        anchor = ch.createClientAnchor();
-        anchor.setCol1(2);
-        anchor.setCol2(5);
-        anchor.setRow1(10);
-        anchor.setRow2(16);
-        patriarch.createPicture(anchor, indexPng);
-
-        anchor = ch.createClientAnchor();
-        anchor.setCol1(6);
-        anchor.setCol2(9);
-        anchor.setRow1(1);
-        anchor.setRow2(6);
-        patriarch.createPicture(anchor, indexWmf);
-        
-        
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        byte pictureDataOut[] = wb.getAllPictures().get(0).getData();
-        assertArrayEquals(pictureDataEmf, pictureDataOut);
-
-        byte wmfNoHeader[] = new byte[pictureDataWmf.length-22];
-        System.arraycopy(pictureDataWmf, 22, wmfNoHeader, 0, pictureDataWmf.length-22);
-        pictureDataOut = wb.getAllPictures().get(2).getData();
-        assertArrayEquals(wmfNoHeader, pictureDataOut);
-
-        wb.close();
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
deleted file mode 100644
index 6c6631a..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.List;
-
-import javax.imageio.ImageIO;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-
-/**
- * Test <code>HSSFPictureData</code>.
- * The code to retrieve images from a workbook provided by Trejkaz (trejkaz at trypticon dot org) in Bug 41223.
- *
- * @author Yegor Kozlov (yegor at apache dot org)
- * @author Trejkaz (trejkaz at trypticon dot org)
- */
-public final class TestHSSFPictureData extends TestCase{
-
-
-	public void testPictures() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleWithImages.xls");
-
-        @SuppressWarnings("unchecked") // TODO - add getFormat() to interface PictureData and genericise wb.getAllPictures()
-        List<HSSFPictureData> lst = (List<HSSFPictureData>)(List<?>)wb.getAllPictures();
-        //assertEquals(2, lst.size());
-
-        for (final HSSFPictureData pict : lst) {
-            String ext = pict.suggestFileExtension();
-            byte[] data = pict.getData();
-            if (ext.equals("jpeg")){
-                //try to read image data using javax.imageio.* (JDK 1.4+)
-                BufferedImage jpg = ImageIO.read(new ByteArrayInputStream(data));
-                assertNotNull(jpg);
-                assertEquals(192, jpg.getWidth());
-                assertEquals(176, jpg.getHeight());
-                assertEquals(HSSFWorkbook.PICTURE_TYPE_JPEG, pict.getFormat());
-                assertEquals("image/jpeg", pict.getMimeType());
-            } else if (ext.equals("png")){
-                //try to read image data using javax.imageio.* (JDK 1.4+)
-                BufferedImage png = ImageIO.read(new ByteArrayInputStream(data));
-                assertNotNull(png);
-                assertEquals(300, png.getWidth());
-                assertEquals(300, png.getHeight());
-                assertEquals(HSSFWorkbook.PICTURE_TYPE_PNG, pict.getFormat());
-                assertEquals("image/png", pict.getMimeType());
-            } else {
-                //TODO: test code for PICT, WMF and EMF
-            }
-        }
-    }
-	
-	public void testMacPicture() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("53446.xls");
-
-        @SuppressWarnings("unchecked")
-        List<HSSFPictureData> lst = (List<HSSFPictureData>)(List<?>)wb.getAllPictures();
-        assertEquals(1, lst.size());
-
-        HSSFPictureData pict = lst.get(0);
-        String ext = pict.suggestFileExtension();
-        if (!ext.equals("png")) {
-            fail("Expected a PNG.");
-        }
-
-        //try to read image data using javax.imageio.* (JDK 1.4+)
-        byte[] data = pict.getData();
-        BufferedImage png = ImageIO.read(new ByteArrayInputStream(data));
-        assertNotNull(png);
-        assertEquals(78, png.getWidth());
-        assertEquals(76, png.getHeight());
-        assertEquals(HSSFWorkbook.PICTURE_TYPE_PNG, pict.getFormat());
-        assertEquals("image/png", pict.getMimeType());
-    }
-
-    public void testNotNullPictures() throws IOException {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls");
-
-        @SuppressWarnings("unchecked") // TODO - add getFormat() to interface PictureData and genericise wb.getAllPictures()
-        List<HSSFPictureData> lst = (List<HSSFPictureData>)(List<?>)wb.getAllPictures();
-        for(HSSFPictureData pict : lst){
-            assertNotNull(pict);
-        }
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
deleted file mode 100644
index 8ce707d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-
-public final class TestHSSFRichTextString extends TestCase {
-    public void testApplyFont() {
-
-        HSSFRichTextString r = new HSSFRichTextString("testing");
-        assertEquals(0,r.numFormattingRuns());
-        r.applyFont(2,4, new HSSFFont((short)1, null));
-        assertEquals(2,r.numFormattingRuns());
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(0));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(1));
-        assertEquals(1, r.getFontAtIndex(2));
-        assertEquals(1, r.getFontAtIndex(3));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(4));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(5));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(6));
-
-        r.applyFont(6,7, new HSSFFont((short)2, null));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(0));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(1));
-        assertEquals(1, r.getFontAtIndex(2));
-        assertEquals(1, r.getFontAtIndex(3));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(4));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(5));
-        assertEquals(2, r.getFontAtIndex(6));
-
-        r.applyFont(HSSFRichTextString.NO_FONT);
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(0));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(1));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(2));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(3));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(4));
-        assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(5));
-
-        r.applyFont(new HSSFFont((short)1, null));
-        assertEquals(1, r.getFontAtIndex(0));
-        assertEquals(1, r.getFontAtIndex(1));
-        assertEquals(1, r.getFontAtIndex(2));
-        assertEquals(1, r.getFontAtIndex(3));
-        assertEquals(1, r.getFontAtIndex(4));
-        assertEquals(1, r.getFontAtIndex(5));
-        assertEquals(1, r.getFontAtIndex(6));
-
-    }
-
-    public void testClearFormatting() {
-
-      HSSFRichTextString r = new HSSFRichTextString("testing");
-      assertEquals(0, r.numFormattingRuns());
-      r.applyFont(2, 4, new HSSFFont( (short) 1, null));
-      assertEquals(2, r.numFormattingRuns());
-      r.clearFormatting();
-      assertEquals(0, r.numFormattingRuns());
-    }
-
-
-    /**
-     * Test case proposed in Bug 40520:  formated twice => will format whole String
-     */
-    public void test40520_1() {
-
-        short font = 3;
-
-        HSSFRichTextString r = new HSSFRichTextString("f0_123456789012345678901234567890123456789012345678901234567890");
-
-        r.applyFont(0,7,font);
-        r.applyFont(5,9,font);
-
-        for(int i=0; i < 7; i++) assertEquals(font, r.getFontAtIndex(i));
-        for(int i=5; i < 9; i++) assertEquals(font, r.getFontAtIndex(i));
-        for(int i=9; i < r.length(); i++) assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(i));
-    }
-
-    /**
-     * Test case proposed in Bug 40520:  overlapped range => will format whole String
-     */
-    public void test40520_2() {
-
-        short font = 3;
-        HSSFRichTextString r = new HSSFRichTextString("f0_123456789012345678901234567890123456789012345678901234567890");
-
-        r.applyFont(0,2,font);
-        for(int i=0; i < 2; i++) assertEquals(font, r.getFontAtIndex(i));
-        for(int i=2; i < r.length(); i++) assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(i));
-
-        r.applyFont(0,2,font);
-        for(int i=0; i < 2; i++) assertEquals(font, r.getFontAtIndex(i));
-        for(int i=2; i < r.length(); i++) assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(i));
-    }
-
-    /**
-     * Test case proposed in Bug 40520:  formated twice => will format whole String
-     */
-    public void test40520_3() {
-
-        short font = 3;
-        HSSFRichTextString r = new HSSFRichTextString("f0_123456789012345678901234567890123456789012345678901234567890");
-
-        // wrong order => will format 0-6
-        r.applyFont(0,2,font);
-        r.applyFont(5,7,font);
-        r.applyFont(0,2,font);
-
-        r.applyFont(0,2,font);
-        for(int i=0; i < 2; i++) assertEquals(font, r.getFontAtIndex(i));
-        for(int i=2; i < 5; i++) assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(i));
-        for(int i=5; i < 7; i++) assertEquals(font, r.getFontAtIndex(i));
-        for(int i=7; i < r.length(); i++) assertEquals(HSSFRichTextString.NO_FONT, r.getFontAtIndex(i));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
deleted file mode 100644
index 53d799e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.record.BlankRecord;
-import org.apache.poi.hssf.record.RowRecord;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.BaseTestRow;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Test HSSFRow is okay.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestHSSFRow extends BaseTestRow {
-
-    public TestHSSFRow() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    @Test
-    public void testRowBounds() throws IOException {
-        baseTestRowBounds(SpreadsheetVersion.EXCEL97.getLastRowIndex());
-    }
-
-    @Test
-    public void testCellBounds() throws IOException {
-        baseTestCellBounds(SpreadsheetVersion.EXCEL97.getLastColumnIndex());
-    }
-
-    @Test
-    public void testLastAndFirstColumns_bug46654() throws IOException {
-        int ROW_IX = 10;
-        int COL_IX = 3;
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet("Sheet1");
-        RowRecord rowRec = new RowRecord(ROW_IX);
-        rowRec.setFirstCol((short)2);
-        rowRec.setLastCol((short)5);
-
-        BlankRecord br = new BlankRecord();
-        br.setRow(ROW_IX);
-        br.setColumn((short)COL_IX);
-
-        sheet.getSheet().addValueRecord(ROW_IX, br);
-        HSSFRow row = new HSSFRow(workbook, sheet, rowRec);
-        HSSFCell cell = row.createCellFromRecord(br);
-
-        if (row.getFirstCellNum() == 2 && row.getLastCellNum() == 5) {
-            fail("Identified bug 46654a");
-        }
-        assertEquals(COL_IX, row.getFirstCellNum());
-        assertEquals(COL_IX + 1, row.getLastCellNum());
-        row.removeCell(cell);
-        assertEquals(-1, row.getFirstCellNum());
-        assertEquals(-1, row.getLastCellNum());
-
-        workbook.close();
-    }
-
-    @Test
-    public void testMoveCell() throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        HSSFRow row = sheet.createRow(0);
-        HSSFRow rowB = sheet.createRow(1);
-
-        HSSFCell cellA2 = rowB.createCell(0);
-        assertEquals(0, rowB.getFirstCellNum());
-        assertEquals(0, rowB.getFirstCellNum());
-
-        assertEquals(-1, row.getLastCellNum());
-        assertEquals(-1, row.getFirstCellNum());
-        HSSFCell cellB2 = row.createCell(1);
-        row.createCell(2); // C2
-        row.createCell(3); // D2
-
-        assertEquals(1, row.getFirstCellNum());
-        assertEquals(4, row.getLastCellNum());
-
-        // Try to move to somewhere else that's used
-        try {
-            row.moveCell(cellB2, (short)3);
-            fail("IllegalArgumentException should have been thrown");
-        } catch(IllegalArgumentException e) {
-            // expected during successful test
-        }
-
-        // Try to move one off a different row
-        try {
-            row.moveCell(cellA2, (short)3);
-            fail("IllegalArgumentException should have been thrown");
-        } catch(IllegalArgumentException e) {
-            // expected during successful test
-        }
-
-        // Move somewhere spare
-        assertNotNull(row.getCell(1));
-        row.moveCell(cellB2, (short)5);
-        assertNull(row.getCell(1));
-        assertNotNull(row.getCell(5));
-
-        assertEquals(5, cellB2.getColumnIndex());
-        assertEquals(2, row.getFirstCellNum());
-        assertEquals(6, row.getLastCellNum());
-        
-        workbook.close();
-    }
-
-    @Override
-    @Test
-    public void testRowHeight() throws IOException{
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        HSSFRow row = sheet.createRow(0);
-
-        assertEquals(row.getHeight(), sheet.getDefaultRowHeight());
-        assertFalse(row.getRowRecord().getBadFontHeight());
-
-        row.setHeight((short) 123);
-        assertEquals(123, row.getHeight());
-        assertTrue(row.getRowRecord().getBadFontHeight());
-
-        row.setHeight((short) -1);
-        assertEquals(row.getHeight(), sheet.getDefaultRowHeight());
-        assertFalse(row.getRowRecord().getBadFontHeight());
-
-        row.setHeight((short) 123);
-        assertEquals(123, row.getHeight());
-        assertTrue(row.getRowRecord().getBadFontHeight());
-
-        row.setHeightInPoints(-1);
-        assertEquals(row.getHeight(), sheet.getDefaultRowHeight());
-        assertFalse(row.getRowRecord().getBadFontHeight());
-
-        row.setHeightInPoints(432);
-        assertEquals(432*20, row.getHeight());
-        assertTrue(row.getRowRecord().getBadFontHeight());
-
-        workbook.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
deleted file mode 100644
index 65a5f21..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ /dev/null
@@ -1,1238 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.DrawingManager2;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.AutoFilterInfoRecord;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.FtCblsSubRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.HCenterRecord;
-import org.apache.poi.hssf.record.LbsDataSubRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.ObjectProtectRecord;
-import org.apache.poi.hssf.record.PasswordRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.ScenarioProtectRecord;
-import org.apache.poi.hssf.record.SubRecord;
-import org.apache.poi.hssf.record.VCenterRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
-import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.AutoFilter;
-import org.apache.poi.ss.usermodel.BaseTestSheet;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.junit.Test;
-
-/**
- * Tests HSSFSheet.  This test case is very incomplete at the moment.
- *
- *
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Andrew C. Oliver (acoliver apache org)
- */
-public final class TestHSSFSheet extends BaseTestSheet {
-
-    public TestHSSFSheet() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    /**
-     * Test for Bugzilla #29747.
-     * Moved from TestHSSFWorkbook#testSetRepeatingRowsAndColumns().
-     */
-    @Test
-    public void setRepeatingRowsAndColumnsBug29747() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet();
-        wb.createSheet();
-        HSSFSheet sheet2 = wb.createSheet();
-        sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:2"));
-        NameRecord nameRecord = wb.getWorkbook().getNameRecord(0);
-        assertEquals(3, nameRecord.getSheetNumber());
-        wb.close();
-    }
-
-
-    @Test
-    public void getSetMargin() throws IOException {
-        baseTestGetSetMargin(new double[]{0.75, 0.75, 1.0, 1.0, 0.3, 0.3});
-    }
-
-    /**
-     * Test the gridset field gets set as expected.
-     */
-    @Test
-    public void backupRecord() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        GridsetRecord gridsetRec = s.getSheet().getGridsetRecord();
-        assertTrue(gridsetRec.getGridset());
-        s.setGridsPrinted(true);
-        assertFalse(gridsetRec.getGridset());
-        wb.close();
-    }
-
-    /**
-     * Test vertically centered output.
-     */
-    @Test
-    public void verticallyCenter() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        VCenterRecord record = s.getSheet().getPageSettings().getVCenter();
-
-        assertFalse(record.getVCenter());
-        assertFalse(s.getVerticallyCenter());
-        s.setVerticallyCenter(true);
-        assertTrue(record.getVCenter());
-        assertTrue(s.getVerticallyCenter());
-
-        wb.close();
-    }
-
-    /**
-     * Test horizontally centered output.
-     */
-    @Test
-    public void horizontallyCenter() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        HCenterRecord record = s.getSheet().getPageSettings().getHCenter();
-
-        assertFalse(record.getHCenter());
-        assertFalse(s.getHorizontallyCenter());
-        s.setHorizontallyCenter(true);
-        assertTrue(record.getHCenter());
-        assertTrue(s.getHorizontallyCenter());
-
-        wb.close();
-    }
-
-
-    /**
-     * Test WSBboolRecord fields get set in the user model.
-     */
-    @Test
-    public void wsBool() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        WSBoolRecord record =
-                (WSBoolRecord) s.getSheet().findFirstRecordBySid(WSBoolRecord.sid);
-
-        // Check defaults
-        assertTrue(record.getAlternateExpression());
-        assertTrue(record.getAlternateFormula());
-        assertFalse(record.getAutobreaks());
-        assertFalse(record.getDialog());
-        assertFalse(record.getDisplayGuts());
-        assertTrue(record.getFitToPage());
-        assertFalse(record.getRowSumsBelow());
-        assertFalse(record.getRowSumsRight());
-
-        // Alter
-        s.setAlternativeExpression(false);
-        s.setAlternativeFormula(false);
-        s.setAutobreaks(true);
-        s.setDialog(true);
-        s.setDisplayGuts(true);
-        s.setFitToPage(false);
-        s.setRowSumsBelow(true);
-        s.setRowSumsRight(true);
-
-        // Check
-        assertTrue(record.getAlternateExpression()); //sheet.setRowSumsBelow alters this field too
-        assertFalse(record.getAlternateFormula());
-        assertTrue(record.getAutobreaks());
-        assertTrue(record.getDialog());
-        assertTrue(record.getDisplayGuts());
-        assertFalse(record.getFitToPage());
-        assertTrue(record.getRowSumsBelow());
-        assertTrue(record.getRowSumsRight());
-        assertTrue(s.getAlternateExpression());
-        assertFalse(s.getAlternateFormula());
-        assertTrue(s.getAutobreaks());
-        assertTrue(s.getDialog());
-        assertTrue(s.getDisplayGuts());
-        assertFalse(s.getFitToPage());
-        assertTrue(s.getRowSumsBelow());
-        assertTrue(s.getRowSumsRight());
-        
-        wb.close();
-    }
-
-    /**
-     * Setting landscape and portrait stuff on existing sheets
-     */
-    @Test
-    public void printSetupLandscapeExisting() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls");
-
-        assertEquals(3, wb1.getNumberOfSheets());
-
-        HSSFSheet sheetL = wb1.getSheetAt(0);
-        HSSFSheet sheetPM = wb1.getSheetAt(1);
-        HSSFSheet sheetLS = wb1.getSheetAt(2);
-
-        // Check two aspects of the print setup
-        assertFalse(sheetL.getPrintSetup().getLandscape());
-        assertTrue(sheetPM.getPrintSetup().getLandscape());
-        assertTrue(sheetLS.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(1, sheetPM.getPrintSetup().getCopies());
-        assertEquals(1, sheetLS.getPrintSetup().getCopies());
-
-        // Change one on each
-        sheetL.getPrintSetup().setLandscape(true);
-        sheetPM.getPrintSetup().setLandscape(false);
-        sheetPM.getPrintSetup().setCopies((short)3);
-
-        // Check taken
-        assertTrue(sheetL.getPrintSetup().getLandscape());
-        assertFalse(sheetPM.getPrintSetup().getLandscape());
-        assertTrue(sheetLS.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(3, sheetPM.getPrintSetup().getCopies());
-        assertEquals(1, sheetLS.getPrintSetup().getCopies());
-
-        // Save and re-load, and check still there
-        Workbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sheetL = wb1.getSheetAt(0);
-        sheetPM = wb1.getSheetAt(1);
-        sheetLS = wb1.getSheetAt(2);
-        
-        assertTrue(sheetL.getPrintSetup().getLandscape());
-        assertFalse(sheetPM.getPrintSetup().getLandscape());
-        assertTrue(sheetLS.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(3, sheetPM.getPrintSetup().getCopies());
-        assertEquals(1, sheetLS.getPrintSetup().getCopies());
-        
-        wb2.close();
-    }
-
-    @Test
-    public void groupRows() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet s = wb1.createSheet();
-        HSSFRow r1 = s.createRow(0);
-        HSSFRow r2 = s.createRow(1);
-        HSSFRow r3 = s.createRow(2);
-        HSSFRow r4 = s.createRow(3);
-        HSSFRow r5 = s.createRow(4);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(0, r3.getOutlineLevel());
-        assertEquals(0, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-
-        s.groupRow(2,3);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-
-        // Save and re-open
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        s = wb2.getSheetAt(0);
-        r1 = s.getRow(0);
-        r2 = s.getRow(1);
-        r3 = s.getRow(2);
-        r4 = s.getRow(3);
-        r5 = s.getRow(4);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-        wb2.close();
-    }
-
-    @Test
-    public void groupRowsExisting() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("NoGutsRecords.xls");
-
-        HSSFSheet s = wb1.getSheetAt(0);
-        HSSFRow r1 = s.getRow(0);
-        HSSFRow r2 = s.getRow(1);
-        HSSFRow r3 = s.getRow(2);
-        HSSFRow r4 = s.getRow(3);
-        HSSFRow r5 = s.getRow(4);
-        HSSFRow r6 = s.getRow(5);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(0, r3.getOutlineLevel());
-        assertEquals(0, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-        assertEquals(0, r6.getOutlineLevel());
-
-        // This used to complain about lacking guts records
-        s.groupRow(2, 4);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(1, r5.getOutlineLevel());
-        assertEquals(0, r6.getOutlineLevel());
-
-        // Save and re-open
-        HSSFWorkbook wb2 = null;
-        try {
-            wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        } catch (OutOfMemoryError e) {
-            fail("Identified bug 39903");
-        }
-
-        s = wb2.getSheetAt(0);
-        r1 = s.getRow(0);
-        r2 = s.getRow(1);
-        r3 = s.getRow(2);
-        r4 = s.getRow(3);
-        r5 = s.getRow(4);
-        r6 = s.getRow(5);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(1, r5.getOutlineLevel());
-        assertEquals(0, r6.getOutlineLevel());
-
-        wb2.close();
-        wb1.close();
-    }
-
-    @Test
-    public void createDrawings() throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        HSSFPatriarch p1 = sheet.createDrawingPatriarch();
-        HSSFPatriarch p2 = sheet.createDrawingPatriarch();
-        assertSame(p1, p2);
-        workbook.close();
-    }
-
-    @Test
-    public void getDrawings() throws IOException {
-        HSSFWorkbook wb1c = HSSFTestDataSamples.openSampleWorkbook("WithChart.xls");
-        HSSFWorkbook wb2c = HSSFTestDataSamples.openSampleWorkbook("WithTwoCharts.xls");
-
-        // 1 chart sheet -> data on 1st, chart on 2nd
-        assertNotNull(wb1c.getSheetAt(0).getDrawingPatriarch());
-        assertSame(wb1c.getSheetAt(0).getDrawingPatriarch(), wb1c.getSheetAt(0).getDrawingPatriarch());
-        assertNotNull(wb1c.getSheetAt(1).getDrawingPatriarch());
-        assertSame(wb1c.getSheetAt(1).getDrawingPatriarch(), wb1c.getSheetAt(1).getDrawingPatriarch());
-        assertFalse(wb1c.getSheetAt(0).getDrawingPatriarch().containsChart());
-        assertTrue(wb1c.getSheetAt(1).getDrawingPatriarch().containsChart());
-
-        // 2 chart sheet -> data on 1st, chart on 2nd+3rd
-        assertNotNull(wb2c.getSheetAt(0).getDrawingPatriarch());
-        assertNotNull(wb2c.getSheetAt(1).getDrawingPatriarch());
-        assertNotNull(wb2c.getSheetAt(2).getDrawingPatriarch());
-        assertFalse(wb2c.getSheetAt(0).getDrawingPatriarch().containsChart());
-        assertTrue(wb2c.getSheetAt(1).getDrawingPatriarch().containsChart());
-        assertTrue(wb2c.getSheetAt(2).getDrawingPatriarch().containsChart());
-        wb2c.close();
-        wb1c.close();
-    }
-
-    /**
-     * Test that the ProtectRecord is included when creating or cloning a sheet
-     */
-    @Test
-    public void cloneWithProtect() throws IOException {
-        String passwordA = "secrect";
-        int expectedHashA = -6810;
-        String passwordB = "admin";
-        int expectedHashB = -14556;
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet hssfSheet = workbook.createSheet();
-        assertFalse(hssfSheet.getObjectProtect());
-        hssfSheet.protectSheet(passwordA);
-        assertTrue(hssfSheet.getObjectProtect());
-        assertEquals(expectedHashA, hssfSheet.getPassword());
-
-        assertEquals(expectedHashA, hssfSheet.getSheet().getProtectionBlock().getPasswordHash());
-
-        // Clone the sheet, and make sure the password hash is preserved
-        HSSFSheet sheet2 = workbook.cloneSheet(0);
-        assertTrue(hssfSheet.getObjectProtect());
-        assertEquals(expectedHashA, sheet2.getSheet().getProtectionBlock().getPasswordHash());
-
-        // change the password on the first sheet
-        hssfSheet.protectSheet(passwordB);
-        assertTrue(hssfSheet.getObjectProtect());
-        assertEquals(expectedHashB, hssfSheet.getSheet().getProtectionBlock().getPasswordHash());
-        assertEquals(expectedHashB, hssfSheet.getPassword());
-        // but the cloned sheet's password should remain unchanged
-        assertEquals(expectedHashA, sheet2.getSheet().getProtectionBlock().getPasswordHash());
-        workbook.close();
-    }
-
-    @Test
-    public void protectSheetA() throws IOException {
-        int expectedHash = (short)0xfef1;
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        s.protectSheet("abcdefghij");
-        WorksheetProtectionBlock pb = s.getSheet().getProtectionBlock();
-        assertTrue("protection should be on", pb.isSheetProtected());
-        assertTrue("object protection should be on",pb.isObjectProtected());
-        assertTrue("scenario protection should be on",pb.isScenarioProtected());
-        assertEquals("well known value for top secret hash should be "+Integer.toHexString(expectedHash).substring(4), expectedHash, pb.getPasswordHash());
-        wb.close();
-    }
-
-    /**
-     * {@link PasswordRecord} belongs with the rest of the Worksheet Protection Block
-     * (which should be before {@link DimensionsRecord}).
-     */
-    @Test
-    public void protectSheetRecordOrder_bug47363a() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        s.protectSheet("secret");
-        RecordCollector rc = new RecordCollector();
-        s.getSheet().visitContainedRecords(rc, 0);
-        Record[] recs = rc.getRecords();
-        int nRecs = recs.length;
-        if (recs[nRecs-2] instanceof PasswordRecord && recs[nRecs-5] instanceof DimensionsRecord) {
-           fail("Identified bug 47363a - PASSWORD after DIMENSION");
-        }
-        // Check that protection block is together, and before DIMENSION
-        confirmRecordClass(recs, nRecs-4, DimensionsRecord.class);
-        confirmRecordClass(recs, nRecs-9, ProtectRecord.class);
-        confirmRecordClass(recs, nRecs-8, ObjectProtectRecord.class);
-        confirmRecordClass(recs, nRecs-7, ScenarioProtectRecord.class);
-        confirmRecordClass(recs, nRecs-6, PasswordRecord.class);
-        
-        wb.close();
-    }
-
-    private static void confirmRecordClass(Record[] recs, int index, Class<? extends Record> cls) {
-        if (recs.length <= index) {
-            fail("Expected (" + cls.getName() + ") at index "
-                + index + " but array length is " + recs.length + ".");
-        }
-        assertEquals(cls, recs[index].getClass());
-    }
-
-    /**
-     * There should be no problem with adding data validations after sheet protection
-     */
-    @Test
-    public void dvProtectionOrder_bug47363b() throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet("Sheet1");
-        sheet.protectSheet("secret");
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint dvc = dataValidationHelper.createIntegerConstraint(DataValidationConstraint.OperatorType.BETWEEN, "10", "100");
-        CellRangeAddressList numericCellAddressList = new CellRangeAddressList(0, 0, 1, 1);
-        DataValidation dv = dataValidationHelper.createValidation(dvc,numericCellAddressList);
-        try {
-            sheet.addValidationData(dv);
-        } catch (IllegalStateException e) {
-            String expMsg = "Unexpected (org.apache.poi.hssf.record.PasswordRecord) while looking for DV Table insert pos";
-            if (expMsg.equals(e.getMessage())) {
-                fail("Identified bug 47363b");
-            }
-            workbook.close();
-            throw e;
-        }
-        RecordCollector rc;
-        rc = new RecordCollector();
-        sheet.getSheet().visitContainedRecords(rc, 0);
-        int nRecsWithProtection = rc.getRecords().length;
-
-        sheet.protectSheet(null);
-        rc = new RecordCollector();
-        sheet.getSheet().visitContainedRecords(rc, 0);
-        int nRecsWithoutProtection = rc.getRecords().length;
-
-        assertEquals(4, nRecsWithProtection - nRecsWithoutProtection);
-        
-        workbook.close();
-    }
-
-    @SuppressWarnings("deprecation")
-    @Test
-    public void zoom() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        assertEquals(-1, sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid));
-        sheet.setZoom(75);
-        assertTrue(sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid) > 0);
-        SCLRecord sclRecord = (SCLRecord) sheet.getSheet().findFirstRecordBySid(SCLRecord.sid);
-        assertEquals(75, 100*sclRecord.getNumerator()/sclRecord.getDenominator());
-
-        int sclLoc = sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid);
-        int window2Loc = sheet.getSheet().findFirstRecordLocBySid(WindowTwoRecord.sid);
-        assertTrue(sclLoc == window2Loc + 1);
-        
-        // verify limits
-        try {
-            sheet.setZoom(0);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
-        }
-        try {
-            sheet.setZoom(65536);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
-        }
-        try {
-            sheet.setZoom(2, 0);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
-        }
-        try {
-            sheet.setZoom(2, 65536);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
-        }
-        
-        wb.close();
-    }
-
-
-    /**
-     * When removing one merged region, it would break
-     * Make sure the excel file loads work
-     */
-    @Test
-    public void pageBreakFiles() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls");
-
-        HSSFSheet sheet = wb1.getSheetAt(0);
-        assertNotNull(sheet);
-
-        assertEquals("1 row page break", 1, sheet.getRowBreaks().length);
-        assertEquals("1 column page break", 1, sheet.getColumnBreaks().length);
-
-        assertTrue("No row page break", sheet.isRowBroken(22));
-        assertTrue("No column page break", sheet.isColumnBroken((short)4));
-
-        sheet.setRowBreak(10);
-        sheet.setColumnBreak((short)13);
-
-        assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
-        assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-
-        assertTrue("No row page break", sheet.isRowBroken(22));
-        assertTrue("No column page break", sheet.isColumnBroken((short)4));
-
-        assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
-        assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
-        
-        wb2.close();
-    }
-
-    @Test
-    public void dbcsName () throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DBCSSheetName.xls");
-        wb.getSheetAt(1);
-        assertEquals ("DBCS Sheet Name 2", wb.getSheetName(1),"\u090f\u0915" );
-        assertEquals("DBCS Sheet Name 1", wb.getSheetName(0),"\u091c\u093e");
-        wb.close();
-    }
-
-    /**
-     * Testing newly added method that exposes the WINDOW2.toprow
-     * parameter to allow setting the toprow in the visible view
-     * of the sheet when it is first opened.
-     */
-    @Test
-    public void topRow() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls");
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-        assertNotNull(sheet);
-
-        short toprow = (short) 100;
-        short leftcol = (short) 50;
-        sheet.showInPane(toprow,leftcol);
-        assertEquals("HSSFSheet.getTopRow()", toprow, sheet.getTopRow());
-        assertEquals("HSSFSheet.getLeftCol()", leftcol, sheet.getLeftCol());
-        
-        wb.close();
-    }
-
-    @Test
-    public void addEmptyRow() throws IOException {
-        //try to add 5 empty rows to a new sheet
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        for (int i = 0; i < 5; i++) {
-            sheet.createRow(i);
-        }
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-        wb1.close();
-
-        //try adding empty rows in an existing worksheet
-        HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook("Simple.xls");
-
-        sheet = wb2.getSheetAt(0);
-        for (int i = 3; i < 10; i++) sheet.createRow(i);
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-        wb2.close();
-    }
-
-    @Test
-    public void autoSizeColumn() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("43902.xls");
-        String sheetName = "my sheet";
-        HSSFSheet sheet = wb1.getSheet(sheetName);
-
-        // Can't use literal numbers for column sizes, as
-        //  will come out with different values on different
-        //  machines based on the fonts available.
-        // So, we use ranges, which are pretty large, but
-        //  thankfully don't overlap!
-        int minWithRow1And2 = 6400;
-        int maxWithRow1And2 = 7800;
-        int minWithRow1Only = 2750;
-        int maxWithRow1Only = 3400;
-
-        // autoSize the first column and check its size before the merged region (1,0,1,1) is set:
-        // it has to be based on the 2nd row width
-        sheet.autoSizeColumn((short)0);
-        assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) >= minWithRow1And2);
-        assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) <= maxWithRow1And2);
-
-        //create a region over the 2nd row and auto size the first column
-        sheet.addMergedRegion(new CellRangeAddress(1,1,0,1));
-        assertNotNull(sheet.getMergedRegion(0));
-        sheet.autoSizeColumn((short)0);
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-
-        // check that the autoSized column width has ignored the 2nd row
-        // because it is included in a merged region (Excel like behavior)
-        HSSFSheet sheet2 = wb2.getSheet(sheetName);
-        assertTrue(sheet2.getColumnWidth(0) >= minWithRow1Only);
-        assertTrue(sheet2.getColumnWidth(0) <= maxWithRow1Only);
-
-        // remove the 2nd row merged region and check that the 2nd row value is used to the autoSizeColumn width
-        sheet2.removeMergedRegion(1);
-        sheet2.autoSizeColumn((short)0);
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        HSSFSheet sheet3 = wb3.getSheet(sheetName);
-        assertTrue(sheet3.getColumnWidth(0) >= minWithRow1And2);
-        assertTrue(sheet3.getColumnWidth(0) <= maxWithRow1And2);
-        
-        wb3.close();
-        wb2.close();
-        wb1.close();
-    }
-    
-    @Test
-    public void autoSizeDate() throws IOException {
-       HSSFWorkbook wb = new HSSFWorkbook();
-       HSSFSheet s = wb.createSheet("Sheet1");
-       HSSFRow r = s.createRow(0);
-       r.createCell(0).setCellValue(1);
-       r.createCell(1).setCellValue(123456);
-       
-       // Will be sized fairly small
-       s.autoSizeColumn((short)0);
-       s.autoSizeColumn((short)1);
-       
-       // Size ranges due to different fonts on different machines
-       assertTrue("Single number column too small: " + s.getColumnWidth(0), s.getColumnWidth(0) > 350); 
-       assertTrue("Single number column too big: " + s.getColumnWidth(0),   s.getColumnWidth(0) < 550); 
-       assertTrue("6 digit number column too small: " + s.getColumnWidth(1), s.getColumnWidth(1) > 1500); 
-       assertTrue("6 digit number column too big: " + s.getColumnWidth(1),   s.getColumnWidth(1) < 2000);
-       
-       // Set a date format
-       HSSFCellStyle cs = wb.createCellStyle();
-       HSSFDataFormat f = wb.createDataFormat();
-       cs.setDataFormat(f.getFormat("yyyy-mm-dd MMMM hh:mm:ss"));
-       r.getCell(0).setCellStyle(cs);
-       r.getCell(1).setCellStyle(cs);
-       
-       assertTrue(DateUtil.isCellDateFormatted(r.getCell(0)));
-       assertTrue(DateUtil.isCellDateFormatted(r.getCell(1)));
-       
-       // Should get much bigger now
-       s.autoSizeColumn((short)0);
-       s.autoSizeColumn((short)1);
-
-       assertTrue("Date column too small: " + s.getColumnWidth(0), s.getColumnWidth(0) > 4750); 
-       assertTrue("Date column too small: " + s.getColumnWidth(1), s.getColumnWidth(1) > 4750); 
-       assertTrue("Date column too big: " + s.getColumnWidth(0), s.getColumnWidth(0) < 6500); 
-       assertTrue("Date column too big: " + s.getColumnWidth(0), s.getColumnWidth(0) < 6500);
-       
-       wb.close();
-    }
-
-    /**
-     * Setting ForceFormulaRecalculation on sheets
-     */
-    @Test
-    public void forceRecalculation() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("UncalcedRecord.xls");
-
-        HSSFSheet sheet = wb1.getSheetAt(0);
-        HSSFSheet sheet2 = wb1.getSheetAt(0);
-        HSSFRow row = sheet.getRow(0);
-        row.createCell(0).setCellValue(5);
-        row.createCell(1).setCellValue(8);
-        assertFalse(sheet.getForceFormulaRecalculation());
-        assertFalse(sheet2.getForceFormulaRecalculation());
-
-        // Save and manually verify that on column C we have 0, value in template
-        HSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-        sheet.setForceFormulaRecalculation(true);
-        assertTrue(sheet.getForceFormulaRecalculation());
-
-        // Save and manually verify that on column C we have now 13, calculated value
-        // Try it can be opened
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        // And check correct sheet settings found
-        sheet = wb2.getSheetAt(0);
-        sheet2 = wb2.getSheetAt(1);
-        assertTrue(sheet.getForceFormulaRecalculation());
-        assertFalse(sheet2.getForceFormulaRecalculation());
-
-        // Now turn if back off again
-        sheet.setForceFormulaRecalculation(false);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-
-        assertFalse(wb3.getSheetAt(0).getForceFormulaRecalculation());
-        assertFalse(wb3.getSheetAt(1).getForceFormulaRecalculation());
-        assertFalse(wb3.getSheetAt(2).getForceFormulaRecalculation());
-
-        // Now add a new sheet, and check things work
-        //  with old ones unset, new one set
-        HSSFSheet s4 = wb3.createSheet();
-        s4.setForceFormulaRecalculation(true);
-
-        assertFalse(sheet.getForceFormulaRecalculation());
-        assertFalse(sheet2.getForceFormulaRecalculation());
-        assertTrue(s4.getForceFormulaRecalculation());
-
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-        
-        assertFalse(wb4.getSheetAt(0).getForceFormulaRecalculation());
-        assertFalse(wb4.getSheetAt(1).getForceFormulaRecalculation());
-        assertFalse(wb4.getSheetAt(2).getForceFormulaRecalculation());
-        assertTrue(wb4.getSheetAt(3).getForceFormulaRecalculation());
-        wb4.close();
-    }
-
-    @Test
-    public void columnWidthA() throws IOException {
-        //check we can correctly read column widths from a reference workbook
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("colwidth.xls");
-
-        //reference values
-        int[] ref = {365, 548, 731, 914, 1097, 1280, 1462, 1645, 1828, 2011, 2194, 2377, 2560, 2742, 2925, 3108, 3291, 3474, 3657};
-
-        HSSFSheet sh = wb1.getSheetAt(0);
-        for (char i = 'A'; i <= 'S'; i++) {
-            int idx = i - 'A';
-            int w = sh.getColumnWidth(idx);
-            assertEquals(ref[idx], w);
-        }
-
-        //the second sheet doesn't have overridden column widths
-        sh = wb1.getSheetAt(1);
-        int def_width = sh.getDefaultColumnWidth();
-        for (char i = 'A'; i <= 'S'; i++) {
-            int idx = i - 'A';
-            int w = sh.getColumnWidth(idx);
-            //getDefaultColumnWidth returns width measured in characters
-            //getColumnWidth returns width measured in 1/256th units
-            assertEquals(def_width*256, w);
-        }
-        wb1.close();
-
-        //test new workbook
-        HSSFWorkbook wb2 = new HSSFWorkbook();
-        sh = wb2.createSheet();
-        sh.setDefaultColumnWidth(10);
-        assertEquals(10, sh.getDefaultColumnWidth());
-        assertEquals(256*10, sh.getColumnWidth(0));
-        assertEquals(256*10, sh.getColumnWidth(1));
-        assertEquals(256*10, sh.getColumnWidth(2));
-        for (char i = 'D'; i <= 'F'; i++) {
-            short w = (256*12);
-            sh.setColumnWidth(i, w);
-            assertEquals(w, sh.getColumnWidth(i));
-        }
-
-        //serialize and read again
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-
-        sh = wb3.getSheetAt(0);
-        assertEquals(10, sh.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*10, sh.getColumnWidth(0));
-        assertEquals(256*10, sh.getColumnWidth(1));
-        assertEquals(256*10, sh.getColumnWidth(2));
-        //columns D-F have custom width
-        for (char i = 'D'; i <= 'F'; i++) {
-            short w = (256*12);
-            assertEquals(w, sh.getColumnWidth(i));
-        }
-
-        // check for 16-bit signed/unsigned error:
-        sh.setColumnWidth(0, 40000);
-        assertEquals(40000, sh.getColumnWidth(0));
-        wb3.close();
-    }
-
-
-    @Test
-    public void defaultColumnWidth() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook( "12843-1.xls" );
-        HSSFSheet sheet = wb1.getSheetAt( 7 );
-        // shall not be NPE
-        assertEquals(8, sheet.getDefaultColumnWidth());
-        assertEquals(8*256, sheet.getColumnWidth(0));
-
-        assertEquals(0xFF, sheet.getDefaultRowHeight());
-        
-        wb1.close();
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook( "34775.xls" );
-        // second and third sheets miss DefaultColWidthRecord
-        for(int i = 1; i <= 2; i++){
-            int dw = wb2.getSheetAt( i ).getDefaultColumnWidth();
-            assertEquals(8, dw);
-            int cw = wb2.getSheetAt( i ).getColumnWidth(0);
-            assertEquals(8*256, cw);
-
-            assertEquals(0xFF, sheet.getDefaultRowHeight());
-        }
-        wb2.close();
-    }
-
-    /**
-     * Some utilities write Excel files without the ROW records.
-     * Excel, ooo, and google docs are OK with this.
-     * Now POI is too.
-     */
-    @Test
-    public void missingRowRecords_bug41187() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex41187-19267.xls");
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFRow row = sheet.getRow(0);
-        assertNotNull("Identified bug 41187 a", row);
-
-        assertNotEquals("Identified bug 41187 b", (short)0, row.getHeight());
-
-        assertEquals("Hi Excel!", row.getCell(0).getRichStringCellValue().getString());
-        // check row height for 'default' flag
-        assertEquals((short)0xFF, row.getHeight());
-
-        HSSFTestDataSamples.writeOutAndReadBack(wb).close();
-        
-        wb.close();
-    }
-
-    /**
-     * If we clone a sheet containing drawings,
-     * we must allocate a new ID of the drawing group and re-create shape IDs
-     *
-     * See bug #45720.
-     */
-    @Test
-    public void cloneSheetWithDrawings() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("45720.xls");
-
-        HSSFSheet sheet1 = wb1.getSheetAt(0);
-
-        wb1.getWorkbook().findDrawingGroup();
-        DrawingManager2 dm1 = wb1.getWorkbook().getDrawingManager();
-
-        wb1.cloneSheet(0);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        wb2.getWorkbook().findDrawingGroup();
-        DrawingManager2 dm2 = wb2.getWorkbook().getDrawingManager();
-
-        //check EscherDggRecord - a workbook-level registry of drawing objects
-        assertEquals(dm1.getDgg().getMaxDrawingGroupId() + 1, dm2.getDgg().getMaxDrawingGroupId());
-
-        HSSFSheet sheet2 = wb2.getSheetAt(1);
-
-        //check that id of the drawing group was updated
-        EscherDgRecord dg1 = (EscherDgRecord)sheet1.getDrawingPatriarch().getBoundAggregate().findFirstWithId(EscherDgRecord.RECORD_ID);
-        EscherDgRecord dg2 = (EscherDgRecord)sheet2.getDrawingPatriarch().getBoundAggregate().findFirstWithId(EscherDgRecord.RECORD_ID);
-        int dg_id_1 = dg1.getOptions() >> 4;
-        int dg_id_2 = dg2.getOptions() >> 4;
-        assertEquals(dg_id_1 + 1, dg_id_2);
-
-        //TODO: check shapeId in the cloned sheet
-        wb2.close();
-    }
-
-    /**
-     * POI now (Sep 2008) allows sheet names longer than 31 chars (for other apps besides Excel).
-     * Since Excel silently truncates to 31, make sure that POI enforces uniqueness on the first
-     * 31 chars.
-     */
-    @Test
-    public void longSheetNames() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        final String SAME_PREFIX = "A123456789B123456789C123456789"; // 30 chars
-
-        wb.createSheet(SAME_PREFIX + "Dxxxx");
-        try {
-            wb.createSheet(SAME_PREFIX + "Dyyyy"); // identical up to the 32nd char
-            fail("Expected exception not thrown");
-        } catch (IllegalArgumentException e) {
-            assertEquals("The workbook already contains a sheet named 'A123456789B123456789C123456789Dyyyy'", e.getMessage());
-        }
-        wb.createSheet(SAME_PREFIX + "Exxxx"); // OK - differs in the 31st char
-        wb.close();
-    }
-
-    /**
-     * Tests that we can read existing column styles
-     */
-    @Test
-    public void readColumnStyles() throws IOException {
-        HSSFWorkbook wbNone = HSSFTestDataSamples.openSampleWorkbook("ColumnStyleNone.xls");
-        HSSFWorkbook wbSimple = HSSFTestDataSamples.openSampleWorkbook("ColumnStyle1dp.xls");
-        HSSFWorkbook wbComplex = HSSFTestDataSamples.openSampleWorkbook("ColumnStyle1dpColoured.xls");
-
-        // Presence / absence checks
-        assertNull(wbNone.getSheetAt(0).getColumnStyle(0));
-        assertNull(wbNone.getSheetAt(0).getColumnStyle(1));
-
-        assertNull(wbSimple.getSheetAt(0).getColumnStyle(0));
-        assertNotNull(wbSimple.getSheetAt(0).getColumnStyle(1));
-
-        assertNull(wbComplex.getSheetAt(0).getColumnStyle(0));
-        assertNotNull(wbComplex.getSheetAt(0).getColumnStyle(1));
-
-        // Details checks
-        HSSFCellStyle bs = wbSimple.getSheetAt(0).getColumnStyle(1);
-        assertEquals(62, bs.getIndex());
-        assertEquals("#,##0.0_ ;\\-#,##0.0\\ ", bs.getDataFormatString());
-        assertEquals("Calibri", bs.getFont(wbSimple).getFontName());
-        assertEquals(11*20, bs.getFont(wbSimple).getFontHeight());
-        assertEquals(8, bs.getFont(wbSimple).getColor());
-        assertFalse(bs.getFont(wbSimple).getItalic());
-        assertEquals(HSSFFont.BOLDWEIGHT_NORMAL, bs.getFont(wbSimple).getBoldweight());
-
-
-        HSSFCellStyle cs = wbComplex.getSheetAt(0).getColumnStyle(1);
-        assertEquals(62, cs.getIndex());
-        assertEquals("#,##0.0_ ;\\-#,##0.0\\ ", cs.getDataFormatString());
-        assertEquals("Arial", cs.getFont(wbComplex).getFontName());
-        assertEquals(8*20, cs.getFont(wbComplex).getFontHeight());
-        assertEquals(10, cs.getFont(wbComplex).getColor());
-        assertFalse(cs.getFont(wbComplex).getItalic());
-        assertEquals(HSSFFont.BOLDWEIGHT_BOLD, cs.getFont(wbComplex).getBoldweight());
-        
-        wbComplex.close();
-        wbSimple.close();
-        wbNone.close();
-    }
-
-    /**
-     * Tests the arabic setting
-     */
-    @Test
-    public void arabic() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-
-        assertFalse(s.isRightToLeft());
-        s.setRightToLeft(true);
-        assertTrue(s.isRightToLeft());
-        wb.close();
-    }
-
-    @Test
-    public void autoFilter() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sh = wb1.createSheet();
-        InternalWorkbook iwb = wb1.getWorkbook();
-        InternalSheet ish = sh.getSheet();
-
-        assertNull( iwb.getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1) );
-        assertNull( ish.findFirstRecordBySid(AutoFilterInfoRecord.sid) );
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A1:B10");
-        sh.setAutoFilter(range);
-
-        NameRecord name = iwb.getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1);
-        assertNotNull( name );
-
-        // The built-in name for auto-filter must consist of a single Area3d Ptg.
-        Ptg[] ptg = name.getNameDefinition();
-        assertEquals("The built-in name for auto-filter must consist of a single Area3d Ptg", 1, ptg.length);
-        assertTrue("The built-in name for auto-filter must consist of a single Area3d Ptg", ptg[0] instanceof Area3DPtg);
-
-        Area3DPtg aref = (Area3DPtg)ptg[0];
-        assertEquals(range.getFirstColumn(), aref.getFirstColumn());
-        assertEquals(range.getFirstRow(), aref.getFirstRow());
-        assertEquals(range.getLastColumn(), aref.getLastColumn());
-        assertEquals(range.getLastRow(), aref.getLastRow());
-
-        // verify  AutoFilterInfoRecord
-        AutoFilterInfoRecord afilter = (AutoFilterInfoRecord)ish.findFirstRecordBySid(AutoFilterInfoRecord.sid);
-        assertNotNull(afilter );
-        assertEquals(2, afilter.getNumEntries()); //filter covers two columns
-
-        HSSFPatriarch dr = sh.getDrawingPatriarch();
-        assertNotNull(dr);
-        HSSFSimpleShape comboBoxShape = (HSSFSimpleShape)dr.getChildren().get(0);
-        assertEquals(comboBoxShape.getShapeType(),  HSSFSimpleShape.OBJECT_TYPE_COMBO_BOX);
-
-        assertNull( ish.findFirstRecordBySid(ObjRecord.sid) ); // ObjRecord will appear after serializetion
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        ish = sh.getSheet();
-        ObjRecord objRecord = (ObjRecord)ish.findFirstRecordBySid(ObjRecord.sid);
-        List<SubRecord> subRecords = objRecord.getSubRecords();
-        assertEquals(3, subRecords.size());
-        assertTrue(subRecords.get(0) instanceof CommonObjectDataSubRecord );
-        assertTrue(subRecords.get(1) instanceof FtCblsSubRecord ); // must be present, see Bug 51481
-        assertTrue(subRecords.get(2) instanceof LbsDataSubRecord );
-        wb2.close();
-    }
-
-    @Test
-    public void getSetColumnHiddenShort() throws IOException {
-        Workbook workbook = new HSSFWorkbook();
-        Sheet sheet = workbook.createSheet("Sheet 1");
-        sheet.setColumnHidden((short)2, true);
-        assertTrue(sheet.isColumnHidden((short)2));
-        workbook.close();
-    }
-
-    @Test
-    public void columnWidthShort() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        //default column width measured in characters
-        sheet.setDefaultColumnWidth((short)10);
-        assertEquals(10, sheet.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*10, sheet.getColumnWidth((short)0));
-        assertEquals(256*10, sheet.getColumnWidth((short)1));
-        assertEquals(256*10, sheet.getColumnWidth((short)2));
-
-        //set custom width for D-F
-        for (char i = 'D'; i <= 'F'; i++) {
-            //Sheet#setColumnWidth accepts the width in units of 1/256th of a character width
-            int w = 256*12;
-            sheet.setColumnWidth((short)i, w);
-            assertEquals(w, sheet.getColumnWidth((short)i));
-        }
-        //reset the default column width, columns A-C change, D-F still have custom width
-        sheet.setDefaultColumnWidth((short)20);
-        assertEquals(20, sheet.getDefaultColumnWidth());
-        assertEquals(256*20, sheet.getColumnWidth((short)0));
-        assertEquals(256*20, sheet.getColumnWidth((short)1));
-        assertEquals(256*20, sheet.getColumnWidth((short)2));
-        for (char i = 'D'; i <= 'F'; i++) {
-            int w = 256*12;
-            assertEquals(w, sheet.getColumnWidth((short)i));
-        }
-
-        // check for 16-bit signed/unsigned error:
-        sheet.setColumnWidth((short)10, 40000);
-        assertEquals(40000, sheet.getColumnWidth((short)10));
-
-        //The maximum column width for an individual cell is 255 characters
-        try {
-            sheet.setColumnWidth((short)9, 256*256);
-            fail("expected exception");
-        } catch(IllegalArgumentException e){
-            assertEquals("The maximum column width for an individual cell is 255 characters.", e.getMessage());
-        }
-
-        //serialize and read again
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sheet = wb2.getSheetAt(0);
-        assertEquals(20, sheet.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*20, sheet.getColumnWidth((short)0));
-        assertEquals(256*20, sheet.getColumnWidth((short)1));
-        assertEquals(256*20, sheet.getColumnWidth((short)2));
-        //columns D-F have custom width
-        for (char i = 'D'; i <= 'F'; i++) {
-            short w = (256*12);
-            assertEquals(w, sheet.getColumnWidth((short)i));
-        }
-        assertEquals(40000, sheet.getColumnWidth((short)10));
-        
-        wb2.close();
-    }
-
-    @Test
-    public void showInPane() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        sheet.showInPane(2, 3);
-        
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Maximum row number is 65535");
-        sheet.showInPane(Integer.MAX_VALUE, 3);
-        wb.close();
-    }
-    
-    @Test
-    public void drawingRecords() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-
-        /* TODO: NPE?
-        sheet.dumpDrawingRecords(false);
-        sheet.dumpDrawingRecords(true);*/
-        assertNull(sheet.getDrawingEscherAggregate());
-        wb.close();
-    }
-
-    @Test
-    public void bug55723b() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        // stored with a special name
-        assertNull(wb.getWorkbook().getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1));
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A:B");
-        AutoFilter filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-        
-        // stored with a special name
-        NameRecord record = wb.getWorkbook().getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1);
-        assertNotNull(record);
-        wb.close();
-    }
-    
-    @Test
-    public void test58746() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        
-        HSSFSheet first = wb.createSheet("first");
-        first.createRow(0).createCell(0).setCellValue(1);
-        
-        HSSFSheet second = wb.createSheet("second");
-        second.createRow(0).createCell(0).setCellValue(2);
-        
-        HSSFSheet third = wb.createSheet("third");
-        HSSFRow row = third.createRow(0);
-        row.createCell(0).setCellFormula("first!A1");
-        row.createCell(1).setCellFormula("second!A1");
-
-        // re-order for sheet "third"
-        wb.setSheetOrder("third", 0);
-        
-        // verify results
-        assertEquals("third", wb.getSheetAt(0).getSheetName());
-        assertEquals("first", wb.getSheetAt(1).getSheetName());
-        assertEquals("second", wb.getSheetAt(2).getSheetName());
-        
-        assertEquals("first!A1", wb.getSheetAt(0).getRow(0).getCell(0).getCellFormula());
-        assertEquals("second!A1", wb.getSheetAt(0).getRow(0).getCell(1).getCellFormula());
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug59135() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        wb1.createSheet().protectSheet("1111.2222.3333.1234");
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        assertEquals((short)0xb86b, wb2.getSheetAt(0).getPassword());
-        wb2.close();
-
-        HSSFWorkbook wb3 = new HSSFWorkbook();
-        wb3.createSheet().protectSheet("1111.2222.3333.12345");
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-        
-        assertEquals((short)0xbecc, wb4.getSheetAt(0).getPassword());
-        wb4.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
deleted file mode 100644
index 7538d4a..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.usermodel.*;
-
-/**
- * Test auto-sizing columns in HSSF
- *
- * @author Yegor Kozlov
- */
-public final class TestHSSFSheetAutosizeColumn extends BaseTestSheetAutosizeColumn {
-
-    public TestHSSFSheetAutosizeColumn() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
deleted file mode 100644
index 8c4c08d..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.usermodel.BaseTestSheetShiftRows;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestHSSFSheetShiftRows extends BaseTestSheetShiftRows {
-
-    public TestHSSFSheetShiftRows() {
-        super(HSSFITestDataProvider.instance);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
deleted file mode 100644
index dfa2bae..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.record.ArrayRecord;
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.hssf.record.aggregates.RowRecordsAggregate;
-import org.apache.poi.hssf.record.aggregates.SharedValueManager;
-import org.apache.poi.hssf.record.aggregates.TestSharedValueManager;
-import org.apache.poi.ss.usermodel.BaseTestSheetUpdateArrayFormulas;
-import org.apache.poi.ss.usermodel.CellRange;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
-
-/**
- * Test array formulas in HSSF
- *
- * @author Yegor Kozlov
- * @author Josh Micich
- */
-public final class TestHSSFSheetUpdateArrayFormulas extends BaseTestSheetUpdateArrayFormulas {
-
-    public TestHSSFSheetUpdateArrayFormulas() {
-        super(HSSFITestDataProvider.instance);
-    }
-
-    // Test methods common with XSSF are in superclass
-    // Local methods here test HSSF-specific details of updating array formulas
-    @Test
-    public void testHSSFSetArrayFormula_singleCell() throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet("Sheet1");
-
-        CellRangeAddress range = new CellRangeAddress(2, 2, 2, 2);
-        HSSFCell[] cells = sheet.setArrayFormula("SUM(C11:C12*D11:D12)", range).getFlattenedCells();
-        assertEquals(1, cells.length);
-
-        // sheet.setArrayFormula creates rows and cells for the designated range
-        assertNotNull(sheet.getRow(2));
-        HSSFCell cell = sheet.getRow(2).getCell(2);
-        assertNotNull(cell);
-
-        assertTrue(cell.isPartOfArrayFormulaGroup());
-        //retrieve the range and check it is the same
-        assertEquals(range.formatAsString(), cell.getArrayFormulaRange().formatAsString());
-
-        FormulaRecordAggregate agg = (FormulaRecordAggregate)cell.getCellValueRecord();
-        assertEquals(range.formatAsString(), agg.getArrayFormulaRange().formatAsString());
-        assertTrue(agg.isPartOfArrayFormula());
-        
-        workbook.close();
-    }
-
-    /**
-     * Makes sure the internal state of HSSFSheet is consistent after removing array formulas
-     */
-    @Test
-    public void testAddRemoveArrayFormulas_recordUpdates() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet("Sheet1");
-
-        CellRange<HSSFCell> cr = s.setArrayFormula("123", CellRangeAddress.valueOf("B5:C6"));
-        Record[] recs;
-        int ix;
-        recs = RecordInspector.getRecords(s, 0);
-        ix = findRecordOfType(recs, ArrayRecord.class, 0);
-        confirmRecordClass(recs, ix-1, FormulaRecord.class);
-        confirmRecordClass(recs, ix+1, FormulaRecord.class);
-        confirmRecordClass(recs, ix+2, FormulaRecord.class);
-        confirmRecordClass(recs, ix+3, FormulaRecord.class);
-        // just one array record
-        assertTrue(findRecordOfType(recs, ArrayRecord.class, ix+1) < 0);
-
-        s.removeArrayFormula(cr.getTopLeftCell());
-
-        // Make sure the array formula has been removed properly
-
-        recs = RecordInspector.getRecords(s, 0);
-        assertTrue(findRecordOfType(recs, ArrayRecord.class, 0) < 0);
-        assertTrue(findRecordOfType(recs, FormulaRecord.class, 0) < 0);
-        RowRecordsAggregate rra = s.getSheet().getRowsAggregate();
-        SharedValueManager svm = TestSharedValueManager.extractFromRRA(rra);
-        if (svm.getArrayRecord(4, 1) != null) {
-            fail("Array record was not cleaned up properly.");
-        }
-        
-        wb.close();
-    }
-
-    private static void confirmRecordClass(Record[] recs, int index, Class<? extends Record> cls) {
-        if (recs.length <= index) {
-            fail("Expected (" + cls.getName() + ") at index "
-                + index + " but array length is " + recs.length + ".");
-        }
-        assertEquals(cls, recs[index].getClass());
-    }
-    /**
-     * @return <tt>-1<tt> if not found
-     */
-    private static int findRecordOfType(Record[] recs, Class<?> type, int fromIndex) {
-        for (int i=fromIndex; i<recs.length; i++) {
-            if (type.isInstance(recs[i])) {
-                return i;
-            }
-        }
-        return -1;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
deleted file mode 100644
index ab32e99..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-
-/**
- * Test <code>HSSFTextbox</code>.
- *
- * @author Yegor Kozlov (yegor at apache.org)
- */
-public final class TestHSSFTextbox extends TestCase{
-
-    /**
-     * Test that accessors to horizontal and vertical alignment work properly
-     */
-    public void testAlignment() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh1 = wb.createSheet();
-        HSSFPatriarch patriarch = sh1.createDrawingPatriarch();
-
-        HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor(0, 0, 0, 0, (short) 1, 1, (short) 6, 4));
-        HSSFRichTextString str = new HSSFRichTextString("Hello, World");
-        textbox.setString(str);
-        textbox.setHorizontalAlignment(HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
-        textbox.setVerticalAlignment(HSSFTextbox.VERTICAL_ALIGNMENT_CENTER);
-
-        assertEquals(HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED, textbox.getHorizontalAlignment());
-        assertEquals(HSSFTextbox.VERTICAL_ALIGNMENT_CENTER, textbox.getVerticalAlignment());
-    }
-
-    /**
-     * Excel requires at least one format run in HSSFTextbox.
-     * When inserting text make sure that if font is not set we must set the default one.
-     */
-    public void testSetDeafultTextFormat() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFTextbox textbox1 = patriarch.createTextbox(new HSSFClientAnchor(0,0,0,0,(short)1,1,(short)3,3));
-        HSSFRichTextString rt1 = new HSSFRichTextString("Hello, World!");
-        assertEquals(0, rt1.numFormattingRuns());
-        textbox1.setString(rt1);
-
-        HSSFRichTextString rt2 = textbox1.getString();
-        assertEquals(1, rt2.numFormattingRuns());
-        assertEquals(HSSFRichTextString.NO_FONT, rt2.getFontOfFormattingRun(0));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
deleted file mode 100644
index 55e1d77..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
+++ /dev/null
@@ -1,1327 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.hpsf.ClassID;
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.CFRuleRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.WindowOneRecord;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.usermodel.BaseTestWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.ConditionalFormatting;
-import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.TempFile;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests for {@link HSSFWorkbook}
- */
-public final class TestHSSFWorkbook extends BaseTestWorkbook {
-    private static final HSSFITestDataProvider _testDataProvider = HSSFITestDataProvider.instance;
-    
-    public TestHSSFWorkbook() {
-        super(_testDataProvider);
-    }
-
-    /**
-     * gives test code access to the {@link InternalWorkbook} within {@link HSSFWorkbook}
-     */
-    public static InternalWorkbook getInternalWorkbook(HSSFWorkbook wb) {
-        return wb.getWorkbook();
-    }
-
-    /**
-     * Tests for {@link HSSFWorkbook#isHidden()} etc
-     * @throws IOException
-     */
-    @Test
-    public void hidden() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        WindowOneRecord w1 = wb.getWorkbook().getWindowOne();
-
-        assertEquals(false, wb.isHidden());
-        assertEquals(false, w1.getHidden());
-
-        wb.setHidden(true);
-        assertEquals(true, wb.isHidden());
-        assertEquals(true, w1.getHidden());
-
-        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        w1 = wbBack.getWorkbook().getWindowOne();
-
-        wbBack.setHidden(true);
-        assertEquals(true, wbBack.isHidden());
-        assertEquals(true, w1.getHidden());
-
-        wbBack.setHidden(false);
-        assertEquals(false, wbBack.isHidden());
-        assertEquals(false, w1.getHidden());
-
-        wbBack.close();
-        wb.close();
-    }
-
-    @Test
-    public void readWriteWithCharts() throws IOException {
-        Sheet s;
-
-        // Single chart, two sheets
-        HSSFWorkbook b1 = HSSFTestDataSamples.openSampleWorkbook("44010-SingleChart.xls");
-        assertEquals(2, b1.getNumberOfSheets());
-        assertEquals("Graph2", b1.getSheetName(1));
-        s = b1.getSheetAt(1);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(8, s.getLastRowNum());
-
-        // Has chart on 1st sheet??
-        // FIXME
-        assertNotNull(b1.getSheetAt(0).getDrawingPatriarch());
-        assertNull(b1.getSheetAt(1).getDrawingPatriarch());
-        assertFalse(b1.getSheetAt(0).getDrawingPatriarch().containsChart());
-        b1.close();
-
-        // We've now called getDrawingPatriarch() so
-        //  everything will be all screwy
-        // So, start again
-        HSSFWorkbook b2 = HSSFTestDataSamples.openSampleWorkbook("44010-SingleChart.xls");
-
-        HSSFWorkbook b3 = HSSFTestDataSamples.writeOutAndReadBack(b2);
-        b2.close();
-
-        assertEquals(2, b3.getNumberOfSheets());
-        s = b3.getSheetAt(1);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(8, s.getLastRowNum());
-        b3.close();
-
-        // Two charts, three sheets
-        HSSFWorkbook b4 = HSSFTestDataSamples.openSampleWorkbook("44010-TwoCharts.xls");
-        assertEquals(3, b4.getNumberOfSheets());
-
-        s = b4.getSheetAt(1);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(8, s.getLastRowNum());
-        s = b4.getSheetAt(2);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(8, s.getLastRowNum());
-
-        // Has chart on 1st sheet??
-        // FIXME
-        assertNotNull(b4.getSheetAt(0).getDrawingPatriarch());
-        assertNull(b4.getSheetAt(1).getDrawingPatriarch());
-        assertNull(b4.getSheetAt(2).getDrawingPatriarch());
-        assertFalse(b4.getSheetAt(0).getDrawingPatriarch().containsChart());
-        b4.close();
-
-        // We've now called getDrawingPatriarch() so
-        //  everything will be all screwy
-        // So, start again
-        HSSFWorkbook b5 = HSSFTestDataSamples.openSampleWorkbook("44010-TwoCharts.xls");
-
-        Workbook b6 = HSSFTestDataSamples.writeOutAndReadBack(b5);
-        b5.close();
-        assertEquals(3, b6.getNumberOfSheets());
-
-        s = b6.getSheetAt(1);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(8, s.getLastRowNum());
-        s = b6.getSheetAt(2);
-        assertEquals(0, s.getFirstRowNum());
-        assertEquals(8, s.getLastRowNum());
-        b6.close();
-    }
-
-    @Test
-    public void selectedSheet_bug44523() throws IOException {
-        HSSFWorkbook wb=new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("Sheet1");
-        HSSFSheet sheet2 = wb.createSheet("Sheet2");
-        HSSFSheet sheet3 = wb.createSheet("Sheet3");
-        HSSFSheet sheet4 = wb.createSheet("Sheet4");
-
-        confirmActiveSelected(sheet1, true);
-        confirmActiveSelected(sheet2, false);
-        confirmActiveSelected(sheet3, false);
-        confirmActiveSelected(sheet4, false);
-
-        wb.setSelectedTab(1);
-
-        // Demonstrate bug 44525:
-        // Well... not quite, since isActive + isSelected were also added in the same bug fix
-        assertFalse("Identified bug 44523 a", sheet1.isSelected());
-        wb.setActiveSheet(1);
-        assertFalse("Identified bug 44523 b", sheet1.isActive());
-
-        confirmActiveSelected(sheet1, false);
-        confirmActiveSelected(sheet2, true);
-        confirmActiveSelected(sheet3, false);
-        confirmActiveSelected(sheet4, false);
-        
-        wb.close();
-    }
-    
-    private static List<Integer> arrayToList(int[] array) {
-        List<Integer> list = new ArrayList<Integer>(array.length);
-        for ( Integer element : array ) {
-            list.add(element);
-        }
-        return list;
-    }
-    
-    private static void assertCollectionsEquals(Collection<Integer> expected, Collection<Integer> actual) {
-        assertEquals("size", expected.size(), actual.size());
-        for (int e : expected) {
-            assertTrue(actual.contains(e));
-        }
-        for (int a : actual) {
-            assertTrue(expected.contains(a));
-        }
-    }
-
-    @Test
-    public void selectMultiple() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet0 = wb.createSheet("Sheet0");
-        HSSFSheet sheet1 = wb.createSheet("Sheet1");
-        HSSFSheet sheet2 = wb.createSheet("Sheet2");
-        HSSFSheet sheet3 = wb.createSheet("Sheet3");
-        HSSFSheet sheet4 = wb.createSheet("Sheet4");
-        HSSFSheet sheet5 = wb.createSheet("Sheet5");
-
-        
-        List<Integer> selected = arrayToList(new int[] { 0, 2, 3 });
-        wb.setSelectedTabs(selected);
-
-        assertCollectionsEquals(selected, wb.getSelectedTabs());
-        assertEquals(true, sheet0.isSelected());
-        assertEquals(false, sheet1.isSelected());
-        assertEquals(true, sheet2.isSelected());
-        assertEquals(true, sheet3.isSelected());
-        assertEquals(false, sheet4.isSelected());
-        assertEquals(false, sheet5.isSelected());
-
-        selected = arrayToList(new int[] { 1, 3, 5 });
-        wb.setSelectedTabs(selected);
-
-        // previous selection should be cleared
-        assertCollectionsEquals(selected, wb.getSelectedTabs());
-        assertEquals(false, sheet0.isSelected());
-        assertEquals(true, sheet1.isSelected());
-        assertEquals(false, sheet2.isSelected());
-        assertEquals(true, sheet3.isSelected());
-        assertEquals(false, sheet4.isSelected());
-        assertEquals(true, sheet5.isSelected());
-
-        assertEquals(true, sheet0.isActive());
-        assertEquals(false, sheet2.isActive());
-        wb.setActiveSheet(2);
-        assertEquals(false, sheet0.isActive());
-        assertEquals(true, sheet2.isActive());
-
-        /*{ // helpful if viewing this workbook in excel:
-            sheet0.createRow(0).createCell(0).setCellValue(new HSSFRichTextString("Sheet0"));
-            sheet1.createRow(0).createCell(0).setCellValue(new HSSFRichTextString("Sheet1"));
-            sheet2.createRow(0).createCell(0).setCellValue(new HSSFRichTextString("Sheet2"));
-            sheet3.createRow(0).createCell(0).setCellValue(new HSSFRichTextString("Sheet3"));
-
-            try {
-                File fOut = TempFile.createTempFile("sheetMultiSelect", ".xls");
-                FileOutputStream os = new FileOutputStream(fOut);
-                wb.write(os);
-                os.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }*/
-        
-        wb.close();
-    }
-
-
-    @Test
-    public void activeSheetAfterDelete_bug40414() throws IOException {
-        HSSFWorkbook wb=new HSSFWorkbook();
-        HSSFSheet sheet0 = wb.createSheet("Sheet0");
-        HSSFSheet sheet1 = wb.createSheet("Sheet1");
-        HSSFSheet sheet2 = wb.createSheet("Sheet2");
-        HSSFSheet sheet3 = wb.createSheet("Sheet3");
-        HSSFSheet sheet4 = wb.createSheet("Sheet4");
-
-        // confirm default activation/selection
-        confirmActiveSelected(sheet0, true);
-        confirmActiveSelected(sheet1, false);
-        confirmActiveSelected(sheet2, false);
-        confirmActiveSelected(sheet3, false);
-        confirmActiveSelected(sheet4, false);
-
-        wb.setActiveSheet(3);
-        wb.setSelectedTab(3);
-
-        confirmActiveSelected(sheet0, false);
-        confirmActiveSelected(sheet1, false);
-        confirmActiveSelected(sheet2, false);
-        confirmActiveSelected(sheet3, true);
-        confirmActiveSelected(sheet4, false);
-
-        wb.removeSheetAt(3);
-        // after removing the only active/selected sheet, another should be active/selected in its place
-        assertTrue("identified bug 40414 a", sheet4.isSelected());
-        assertTrue("identified bug 40414 b", sheet4.isActive());
-
-        confirmActiveSelected(sheet0, false);
-        confirmActiveSelected(sheet1, false);
-        confirmActiveSelected(sheet2, false);
-        confirmActiveSelected(sheet4, true);
-
-        sheet3 = sheet4; // re-align local vars in this test case
-
-        // Some more cases of removing sheets
-
-        // Starting with a multiple selection, and different active sheet
-        wb.setSelectedTabs(new int[] { 1, 3, });
-        wb.setActiveSheet(2);
-        confirmActiveSelected(sheet0, false, false);
-        confirmActiveSelected(sheet1, false, true);
-        confirmActiveSelected(sheet2, true,  false);
-        confirmActiveSelected(sheet3, false, true);
-
-        // removing a sheet that is not active, and not the only selected sheet
-        wb.removeSheetAt(3);
-        confirmActiveSelected(sheet0, false, false);
-        confirmActiveSelected(sheet1, false, true);
-        confirmActiveSelected(sheet2, true,  false);
-
-        // removing the only selected sheet
-        wb.removeSheetAt(1);
-        confirmActiveSelected(sheet0, false, false);
-        confirmActiveSelected(sheet2, true,  true);
-
-        // The last remaining sheet should always be active+selected
-        wb.removeSheetAt(1);
-        confirmActiveSelected(sheet0, true,  true);
-        
-        wb.close();
-    }
-
-    private static void confirmActiveSelected(HSSFSheet sheet, boolean expected) {
-        confirmActiveSelected(sheet, expected, expected);
-    }
-
-
-    private static void confirmActiveSelected(HSSFSheet sheet,
-            boolean expectedActive, boolean expectedSelected) {
-        assertEquals("active", expectedActive, sheet.isActive());
-        assertEquals("selected", expectedSelected, sheet.isSelected());
-    }
-
-    /**
-     * If Sheet.getSize() returns a different result to Sheet.serialize(), this will cause the BOF
-     * records to be written with invalid offset indexes.  Excel does not like this, and such
-     * errors are particularly hard to track down.  This test ensures that HSSFWorkbook throws
-     * a specific exception as soon as the situation is detected. See bugzilla 45066
-     * @throws IOException 
-     */
-    @Test
-    public void sheetSerializeSizeMismatch_bug45066() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        InternalSheet sheet = wb.createSheet("Sheet1").getSheet();
-        List<RecordBase> sheetRecords = sheet.getRecords();
-        // one way (of many) to cause the discrepancy is with a badly behaved record:
-        sheetRecords.add(new BadlyBehavedRecord());
-        // There is also much logic inside Sheet that (if buggy) might also cause the discrepancy
-        try {
-            wb.getBytes();
-            fail("Identified bug 45066 a");
-        } catch (IllegalStateException e) {
-            // Expected badly behaved sheet record to cause exception
-            assertTrue(e.getMessage().startsWith("Actual serialized sheet size"));
-        }
-        
-        wb.close();
-    }
-
-    /**
-     * Checks that us and HSSFName play nicely with named ranges
-     *  that point to deleted sheets
-     */
-    @Test
-    public void namesToDeleteSheets() throws IOException {
-        HSSFWorkbook b = HSSFTestDataSamples.openSampleWorkbook("30978-deleted.xls");
-        assertEquals(3, b.getNumberOfNames());
-
-        // Sheet 2 is deleted
-        assertEquals("Sheet1", b.getSheetName(0));
-        assertEquals("Sheet3", b.getSheetName(1));
-
-        Area3DPtg ptg;
-        NameRecord nr;
-        HSSFName n;
-
-        /* ======= Name pointing to deleted sheet ====== */
-
-        // First at low level
-        nr = b.getWorkbook().getNameRecord(0);
-        assertEquals("On2", nr.getNameText());
-        assertEquals(0, nr.getSheetNumber());
-        assertEquals(1, nr.getExternSheetNumber());
-        assertEquals(1, nr.getNameDefinition().length);
-
-        ptg = (Area3DPtg)nr.getNameDefinition()[0];
-        assertEquals(1, ptg.getExternSheetIndex());
-        assertEquals(0, ptg.getFirstColumn());
-        assertEquals(0, ptg.getFirstRow());
-        assertEquals(0, ptg.getLastColumn());
-        assertEquals(2, ptg.getLastRow());
-
-        // Now at high level
-        n = b.getNameAt(0);
-        assertEquals("On2", n.getNameName());
-        assertEquals("", n.getSheetName());
-        assertEquals("#REF!$A$1:$A$3", n.getRefersToFormula());
-
-
-        /* ======= Name pointing to 1st sheet ====== */
-
-        // First at low level
-        nr = b.getWorkbook().getNameRecord(1);
-        assertEquals("OnOne", nr.getNameText());
-        assertEquals(0, nr.getSheetNumber());
-        assertEquals(0, nr.getExternSheetNumber());
-        assertEquals(1, nr.getNameDefinition().length);
-
-        ptg = (Area3DPtg)nr.getNameDefinition()[0];
-        assertEquals(0, ptg.getExternSheetIndex());
-        assertEquals(0, ptg.getFirstColumn());
-        assertEquals(2, ptg.getFirstRow());
-        assertEquals(0, ptg.getLastColumn());
-        assertEquals(3, ptg.getLastRow());
-
-        // Now at high level
-        n = b.getNameAt(1);
-        assertEquals("OnOne", n.getNameName());
-        assertEquals("Sheet1", n.getSheetName());
-        assertEquals("Sheet1!$A$3:$A$4", n.getRefersToFormula());
-
-
-        /* ======= Name pointing to 3rd sheet ====== */
-
-        // First at low level
-        nr = b.getWorkbook().getNameRecord(2);
-        assertEquals("OnSheet3", nr.getNameText());
-        assertEquals(0, nr.getSheetNumber());
-        assertEquals(2, nr.getExternSheetNumber());
-        assertEquals(1, nr.getNameDefinition().length);
-
-        ptg = (Area3DPtg)nr.getNameDefinition()[0];
-        assertEquals(2, ptg.getExternSheetIndex());
-        assertEquals(0, ptg.getFirstColumn());
-        assertEquals(0, ptg.getFirstRow());
-        assertEquals(0, ptg.getLastColumn());
-        assertEquals(1, ptg.getLastRow());
-
-        // Now at high level
-        n = b.getNameAt(2);
-        assertEquals("OnSheet3", n.getNameName());
-        assertEquals("Sheet3", n.getSheetName());
-        assertEquals("Sheet3!$A$1:$A$2", n.getRefersToFormula());
-        
-        b.close();
-    }
-
-    /**
-     * result returned by getRecordSize() differs from result returned by serialize()
-     */
-    private static final class BadlyBehavedRecord extends Record {
-        public BadlyBehavedRecord() {
-            //
-        }
-        @Override
-		public short getSid() {
-            return 0x777;
-        }
-        @Override
-		public int serialize(int offset, byte[] data) {
-            return 4;
-        }
-        @Override
-		public int getRecordSize() {
-            return 8;
-        }
-    }
-
-    /**
-     * The sample file provided with bug 45582 seems to have one extra byte after the EOFRecord
-     */
-    @Test
-    public void extraDataAfterEOFRecord() {
-        try {
-            HSSFTestDataSamples.openSampleWorkbook("ex45582-22397.xls");
-        } catch (RecordFormatException e) {
-            if (e.getCause() instanceof LittleEndian.BufferUnderrunException) {
-                throw new AssertionFailedError("Identified bug 45582");
-            }
-        }
-    }
-
-    /**
-     * Test to make sure that NameRecord.getSheetNumber() is interpreted as a
-     * 1-based sheet tab index (not a 1-based extern sheet index)
-     */
-    @Test
-    public void findBuiltInNameRecord() throws IOException {
-        // testRRaC has multiple (3) built-in name records
-        // The second print titles name record has getSheetNumber()==4
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("testRRaC.xls");
-        NameRecord nr;
-        assertEquals(3, wb1.getWorkbook().getNumNames());
-        nr = wb1.getWorkbook().getNameRecord(2);
-        // TODO - render full row and full column refs properly
-        assertEquals("Sheet2!$A$1:$IV$1", HSSFFormulaParser.toFormulaString(wb1, nr.getNameDefinition())); // 1:1
-
-        try {
-          wb1.getSheetAt(3).setRepeatingRows(CellRangeAddress.valueOf("9:12"));
-          wb1.getSheetAt(3).setRepeatingColumns(CellRangeAddress.valueOf("E:F"));
-        } catch (RuntimeException e) {
-            if (e.getMessage().equals("Builtin (7) already exists for sheet (4)")) {
-                // there was a problem in the code which locates the existing print titles name record
-                fail("Identified bug 45720b");
-            }
-            wb1.close();
-            throw e;
-        }
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        assertEquals(3, wb2.getWorkbook().getNumNames());
-        nr = wb2.getWorkbook().getNameRecord(2);
-        assertEquals("Sheet2!E:F,Sheet2!$A$9:$IV$12", HSSFFormulaParser.toFormulaString(wb2, nr.getNameDefinition())); // E:F,9:12
-        wb2.close();
-    }
-
-    /**
-     * Test that the storage clsid property is preserved
-     */
-    @Test
-    public void bug47920() throws IOException {
-        POIFSFileSystem fs1 = new POIFSFileSystem(POIDataSamples.getSpreadSheetInstance().openResourceAsStream("47920.xls"));
-        HSSFWorkbook wb = new HSSFWorkbook(fs1);
-        ClassID clsid1 = fs1.getRoot().getStorageClsid();
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream(4096);
-        wb.write(out);
-        byte[] bytes = out.toByteArray();
-        POIFSFileSystem fs2 = new POIFSFileSystem(new ByteArrayInputStream(bytes));
-        ClassID clsid2 = fs2.getRoot().getStorageClsid();
-
-        assertTrue(clsid1.equals(clsid2));
-        
-        fs2.close();
-        wb.close();
-        fs1.close();
-    }
-    
-    /**
-     * If we try to open an old (pre-97) workbook, we get a helpful
-     *  Exception give to explain what we've done wrong
-     */
-    @Test
-    public void helpfulExceptionOnOldFiles() throws Exception {
-        InputStream excel4 = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("testEXCEL_4.xls");
-        try {
-            new HSSFWorkbook(excel4).close();
-            fail("Shouldn't be able to load an Excel 4 file");
-        } catch (OldExcelFormatException e) {
-            assertContains(e.getMessage(), "BIFF4");
-        }
-        excel4.close();
-        
-        InputStream excel5 = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("testEXCEL_5.xls");
-        try {
-            new HSSFWorkbook(excel5).close();
-            fail("Shouldn't be able to load an Excel 5 file");
-        } catch (OldExcelFormatException e) {
-            assertContains(e.getMessage(), "BIFF5");
-        }
-        excel5.close();
-        
-        InputStream excel95 = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("testEXCEL_95.xls");
-        try {
-            new HSSFWorkbook(excel95).close();
-            fail("Shouldn't be able to load an Excel 95 file");
-        } catch (OldExcelFormatException e) {
-            assertContains(e.getMessage(), "BIFF5");
-        }
-        excel95.close();
-    }
-
-    /**
-     * Tests that we can work with both {@link POIFSFileSystem}
-     *  and {@link NPOIFSFileSystem}
-     */
-    @Test
-    public void differentPOIFS() throws Exception {
-       // Open the two filesystems
-       DirectoryNode[] files = new DirectoryNode[2];
-       POIFSFileSystem poifsFileSystem = new POIFSFileSystem(HSSFTestDataSamples.openSampleFileStream("Simple.xls"));
-       try {
-           files[0] = poifsFileSystem.getRoot();
-           NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem(HSSFTestDataSamples.getSampleFile("Simple.xls"));
-           try {
-               files[1] = npoifsFileSystem.getRoot();
-               
-               // Open without preserving nodes 
-               for(DirectoryNode dir : files) {
-                  HSSFWorkbook workbook = new HSSFWorkbook(dir, false);
-                  HSSFSheet sheet = workbook.getSheetAt(0);
-                  HSSFCell cell = sheet.getRow(0).getCell(0);
-                  assertEquals("replaceMe", cell .getRichStringCellValue().getString());
-                  
-                  workbook.close();
-               }
-        
-               // Now re-check with preserving
-               for(DirectoryNode dir : files) {
-                  HSSFWorkbook workbook = new HSSFWorkbook(dir, true);
-                  HSSFSheet sheet = workbook.getSheetAt(0);
-                  HSSFCell cell = sheet.getRow(0).getCell(0);
-                  assertEquals("replaceMe", cell .getRichStringCellValue().getString());
-                  
-                  workbook.close();
-               }
-           } finally {
-               npoifsFileSystem.close();
-           }
-       } finally {
-           poifsFileSystem.close();
-       }
-    }
-
-    @Test
-    public void wordDocEmbeddedInXls() throws IOException {
-       // Open the two filesystems
-       DirectoryNode[] files = new DirectoryNode[2];
-       POIFSFileSystem poifsFileSystem = new POIFSFileSystem(HSSFTestDataSamples.openSampleFileStream("WithEmbeddedObjects.xls"));
-       try {
-           files[0] = poifsFileSystem.getRoot();
-           NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem(HSSFTestDataSamples.getSampleFile("WithEmbeddedObjects.xls"));
-           try {
-               files[1] = npoifsFileSystem.getRoot();
-               
-               // Check the embedded parts
-               for(DirectoryNode root : files) {
-                  HSSFWorkbook hw = new HSSFWorkbook(root, true);
-                  List<HSSFObjectData> objects = hw.getAllEmbeddedObjects();
-                  boolean found = false;
-                   for (HSSFObjectData embeddedObject : objects) {
-                       if (embeddedObject.hasDirectoryEntry()) {
-                           DirectoryEntry dir = embeddedObject.getDirectory();
-                           if (dir instanceof DirectoryNode) {
-                               DirectoryNode dNode = (DirectoryNode) dir;
-                               if (hasEntry(dNode, "WordDocument")) {
-                                   found = true;
-                               }
-                           }
-                       }
-                   }
-                  assertTrue(found);
-                  
-                  hw.close();
-               }
-           } finally {
-               npoifsFileSystem.close();
-           }
-       } finally {
-           poifsFileSystem.close();
-       }
-    }
-
-    /**
-     * Checks that we can open a workbook with NPOIFS, and write it out
-     *  again (via POIFS) and have it be valid
-     * @throws IOException
-     */
-    @Test
-    public void writeWorkbookFromNPOIFS() throws IOException {
-       InputStream is = HSSFTestDataSamples.openSampleFileStream("WithEmbeddedObjects.xls");
-       try {
-           NPOIFSFileSystem fs = new NPOIFSFileSystem(is);
-           try {
-               // Start as NPOIFS
-               HSSFWorkbook wb = new HSSFWorkbook(fs.getRoot(), true);
-               assertEquals(3, wb.getNumberOfSheets());
-               assertEquals("Root xls", wb.getSheetAt(0).getRow(0).getCell(0).getStringCellValue());
-
-               // Will switch to POIFS
-               HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
-               assertEquals(3, wbBack.getNumberOfSheets());
-               assertEquals("Root xls", wbBack.getSheetAt(0).getRow(0).getCell(0).getStringCellValue());
-               wbBack.close();
-               
-               wb.close();
-           } finally {
-        	   fs.close();
-           }
-       } finally {
-    	   is.close();
-       }
-    }
-
-    @Test
-    public void cellStylesLimit() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        int numBuiltInStyles = wb.getNumCellStyles();
-        int MAX_STYLES = 4030;
-        int limit = MAX_STYLES - numBuiltInStyles;
-        for(int i=0; i < limit; i++){
-            /* HSSFCellStyle style =*/ wb.createCellStyle();
-        }
-
-        assertEquals(MAX_STYLES, wb.getNumCellStyles());
-        try {
-            /*HSSFCellStyle style =*/ wb.createCellStyle();
-            fail("expected exception");
-        } catch (IllegalStateException e){
-            assertEquals("The maximum number of cell styles was exceeded. " +
-                    "You can define up to 4000 styles in a .xls workbook", e.getMessage());
-        }
-        assertEquals(MAX_STYLES, wb.getNumCellStyles());
-        
-        wb.close();
-    }
-
-    @Test
-    public void setSheetOrderHSSF() throws IOException{
-        Workbook wb = new HSSFWorkbook();
-        Sheet s1 = wb.createSheet("first sheet");
-        Sheet s2 = wb.createSheet("other sheet");
-
-        Name name1 = wb.createName();
-        name1.setNameName("name1");
-        name1.setRefersToFormula("'first sheet'!D1");
-
-        Name name2 = wb.createName();
-        name2.setNameName("name2");
-        name2.setRefersToFormula("'other sheet'!C1");
-
-
-        Row s1r1 = s1.createRow(2);
-        Cell c1 = s1r1.createCell(3);
-        c1.setCellValue(30);
-        Cell c2 = s1r1.createCell(2);
-        c2.setCellFormula("SUM('other sheet'!C1,'first sheet'!C1)");
-
-        Row s2r1 = s2.createRow(0);
-        Cell c3 = s2r1.createCell(1);
-        c3.setCellFormula("'first sheet'!D3");
-        Cell c4 = s2r1.createCell(2);
-        c4.setCellFormula("'other sheet'!D3");
-
-        // conditional formatting
-        SheetConditionalFormatting sheetCF = s1.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(
-                CFRuleRecord.ComparisonOperator.BETWEEN, "'first sheet'!D1", "'other sheet'!D1");
-
-        ConditionalFormattingRule [] cfRules = { rule1 };
-
-        CellRangeAddress[] regions = {
-            new CellRangeAddress(2, 4, 0, 0), // A3:A5
-        };
-        sheetCF.addConditionalFormatting(regions, cfRules);
-
-        wb.setSheetOrder("other sheet", 0);
-
-        // names
-        assertEquals("'first sheet'!D1", wb.getName("name1").getRefersToFormula());
-        assertEquals("'other sheet'!C1", wb.getName("name2").getRefersToFormula());
-
-        // cells
-        assertEquals("SUM('other sheet'!C1,'first sheet'!C1)", c2.getCellFormula());
-        assertEquals("'first sheet'!D3", c3.getCellFormula());
-        assertEquals("'other sheet'!D3", c4.getCellFormula());
-
-        // conditional formatting
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertEquals("'first sheet'!D1", cf.getRule(0).getFormula1());
-        assertEquals("'other sheet'!D1", cf.getRule(0).getFormula2());
-
-        wb.close();
-    }
-
-    private boolean hasEntry(DirectoryNode dirNode, String entryName) {
-       try {
-           dirNode.getEntry(entryName);
-           return true;
-       } catch (FileNotFoundException e) {
-           return false;
-       }
-   }
-
-    @Test
-    public void clonePictures() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleWithImages.xls");
-        InternalWorkbook iwb = wb.getWorkbook();
-        iwb.findDrawingGroup();
-
-        for(int pictureIndex=1; pictureIndex <= 4; pictureIndex++){
-            EscherBSERecord bse = iwb.getBSERecord(pictureIndex);
-            assertEquals(1, bse.getRef());
-        }
-
-        wb.cloneSheet(0);
-        for(int pictureIndex=1; pictureIndex <= 4; pictureIndex++){
-            EscherBSERecord bse = iwb.getBSERecord(pictureIndex);
-            assertEquals(2, bse.getRef());
-        }
-
-        wb.cloneSheet(0);
-        for(int pictureIndex=1; pictureIndex <= 4; pictureIndex++){
-            EscherBSERecord bse = iwb.getBSERecord(pictureIndex);
-            assertEquals(3, bse.getRef());
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public void changeSheetNameWithSharedFormulas() throws IOException {
-        changeSheetNameWithSharedFormulas("shared_formulas.xls");
-    }
-
-    // Should throw exception about invalid POIFSFileSystem
-    @Test(expected=IllegalArgumentException.class)
-    public void emptyDirectoryNode() throws IOException {
-        POIFSFileSystem fs = new POIFSFileSystem();
-        try {
-            new HSSFWorkbook(fs).close();
-        } finally {
-            fs.close();
-        }
-    }
-
-    @Test
-    public void selectedSheetShort() throws IOException {
-        HSSFWorkbook wb=new HSSFWorkbook();
-        
-        HSSFSheet sheet1 = wb.createSheet("Sheet1");
-        HSSFSheet sheet2 = wb.createSheet("Sheet2");
-        HSSFSheet sheet3 = wb.createSheet("Sheet3");
-        HSSFSheet sheet4 = wb.createSheet("Sheet4");
-
-        confirmActiveSelected(sheet1, true);
-        confirmActiveSelected(sheet2, false);
-        confirmActiveSelected(sheet3, false);
-        confirmActiveSelected(sheet4, false);
-
-        wb.setSelectedTab((short)1);
-
-        // Demonstrate bug 44525:
-        // Well... not quite, since isActive + isSelected were also added in the same bug fix
-        assertFalse("Identified bug 44523 a", sheet1.isSelected());
-        wb.setActiveSheet(1);
-        assertFalse("Identified bug 44523 b", sheet1.isActive());
-
-        confirmActiveSelected(sheet1, false);
-        confirmActiveSelected(sheet2, true);
-        confirmActiveSelected(sheet3, false);
-        confirmActiveSelected(sheet4, false);
-
-        assertEquals(0, wb.getFirstVisibleTab());
-        wb.setFirstVisibleTab((short)2);
-        assertEquals(2, wb.getFirstVisibleTab());
-
-        wb.close();
-    }
-
-    @Test
-    public void names() throws IOException {
-        HSSFWorkbook wb=new HSSFWorkbook();
-
-        try {
-            wb.getNameAt(0);
-            fail("Fails without any defined names");
-        } catch (IllegalStateException e) {
-            assertTrue(e.getMessage(), e.getMessage().contains("no defined names"));
-        }
-
-        HSSFName name = wb.createName();
-        assertNotNull(name);
-
-        assertNull(wb.getName("somename"));
-
-        name.setNameName("myname");
-        assertNotNull(wb.getName("myname"));
-
-        assertEquals(0, wb.getNameIndex(name));
-        assertEquals(0, wb.getNameIndex("myname"));
-
-        try {
-            wb.getNameAt(5);
-            fail("Fails without any defined names");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage(), e.getMessage().contains("outside the allowable range"));
-        }
-
-        try {
-            wb.getNameAt(-3);
-            fail("Fails without any defined names");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage(), e.getMessage().contains("outside the allowable range"));
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public void testMethods() throws IOException {
-        HSSFWorkbook wb=new HSSFWorkbook();
-        wb.insertChartRecord();
-        //wb.dumpDrawingGroupRecords(true);
-        //wb.dumpDrawingGroupRecords(false);
-        
-        wb.close();
-    }
-
-    @Test
-    public void writeProtection() throws IOException {
-        HSSFWorkbook wb=new HSSFWorkbook();
-
-        assertFalse(wb.isWriteProtected());
-
-        wb.writeProtectWorkbook("mypassword", "myuser");
-        assertTrue(wb.isWriteProtected());
-        
-//        OutputStream os = new FileOutputStream("/tmp/protected.xls");
-//        try {
-//            wb.write(os);
-//        } finally {
-//            os.close();
-//        }
-
-        wb.unwriteProtectWorkbook();
-        assertFalse(wb.isWriteProtected());
-
-        wb.close();
-    }
-
-    @Test
-	public void bug50298() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("50298.xls");
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received");
-
-		HSSFSheet sheet = wb.cloneSheet(0);
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received", "Invoice (2)");
-
-		wb.setSheetName(wb.getSheetIndex(sheet), "copy");
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received", "copy");
-
-		wb.setSheetOrder("copy", 0);
-
-		assertSheetOrder(wb, "copy", "Invoice", "Invoice1", "Digest", "Deferred", "Received");
-
-		wb.removeSheetAt(0);
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received");
-
-		// check that the overall workbook serializes with its correct size
-		int expected = wb.getWorkbook().getSize();
-		int written = wb.getWorkbook().serialize(0, new byte[expected*2]);
-
-		assertEquals("Did not have the expected size when writing the workbook: written: " + written + ", but expected: " + expected,
-				expected, written);
-
-		HSSFWorkbook read = HSSFTestDataSamples.writeOutAndReadBack(wb);
-		assertSheetOrder(read, "Invoice", "Invoice1", "Digest", "Deferred", "Received");
-		read.close();
-		wb.close();
-	}
-
-    @Test
-	public void bug50298a() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("50298.xls");
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received");
-
-		HSSFSheet sheet = wb.cloneSheet(0);
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received", "Invoice (2)");
-
-		wb.setSheetName(wb.getSheetIndex(sheet), "copy");
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received", "copy");
-
-		wb.setSheetOrder("copy", 0);
-
-		assertSheetOrder(wb, "copy", "Invoice", "Invoice1", "Digest", "Deferred", "Received");
-
-		wb.removeSheetAt(0);
-
-		assertSheetOrder(wb, "Invoice", "Invoice1", "Digest", "Deferred", "Received");
-
-		wb.removeSheetAt(1);
-
-		assertSheetOrder(wb, "Invoice", "Digest", "Deferred", "Received");
-
-		wb.setSheetOrder("Digest", 3);
-
-		assertSheetOrder(wb, "Invoice", "Deferred", "Received", "Digest");
-
-		// check that the overall workbook serializes with its correct size
-		int expected = wb.getWorkbook().getSize();
-		int written = wb.getWorkbook().serialize(0, new byte[expected*2]);
-
-		assertEquals("Did not have the expected size when writing the workbook: written: " + written + ", but expected: " + expected,
-				expected, written);
-
-		HSSFWorkbook read = HSSFTestDataSamples.writeOutAndReadBack(wb);
-		assertSheetOrder(read, "Invoice", "Deferred", "Received", "Digest");
-		read.close();
-		wb.close();
-	}
-	
-    @Test
-	public void bug54500() throws Exception {
-		String nameName = "AName";
-		String sheetName = "ASheet";
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("54500.xls");
-
-		assertSheetOrder(wb, "Sheet1", "Sheet2", "Sheet3");
-		
-		wb.createSheet(sheetName);
-
-		assertSheetOrder(wb, "Sheet1", "Sheet2", "Sheet3", "ASheet");
-
-		Name n = wb.createName();
-		n.setNameName(nameName);
-		n.setSheetIndex(3);
-		n.setRefersToFormula(sheetName + "!A1");
-
-		assertSheetOrder(wb, "Sheet1", "Sheet2", "Sheet3", "ASheet");
-        final HSSFName name = wb.getName(nameName);
-        assertNotNull(name);
-        assertEquals("ASheet!A1", name.getRefersToFormula());
-		
-		ByteArrayOutputStream stream = new ByteArrayOutputStream();
-		wb.write(stream);
-
-		assertSheetOrder(wb, "Sheet1", "Sheet2", "Sheet3", "ASheet");
-		assertEquals("ASheet!A1", name.getRefersToFormula());
-
-		wb.removeSheetAt(1);
-
-		assertSheetOrder(wb, "Sheet1", "Sheet3", "ASheet");
-		assertEquals("ASheet!A1", name.getRefersToFormula());
-
-		ByteArrayOutputStream stream2 = new ByteArrayOutputStream();
-		wb.write(stream2);
-
-		assertSheetOrder(wb, "Sheet1", "Sheet3", "ASheet");
-		assertEquals("ASheet!A1", name.getRefersToFormula());
-
-		HSSFWorkbook wb2 = new HSSFWorkbook(new ByteArrayInputStream(stream.toByteArray()));
-		expectName(wb2, nameName, "ASheet!A1");
-		HSSFWorkbook wb3 = new HSSFWorkbook(new ByteArrayInputStream(stream2.toByteArray()));
-		expectName(wb3, nameName, "ASheet!A1");
-		wb3.close();
-		wb2.close();
-		wb.close();
-	}
-
-	private void expectName(HSSFWorkbook wb, String name, String expect) {
-        final HSSFName hssfName = wb.getName(name);
-        assertNotNull(hssfName);
-        assertEquals(expect, hssfName.getRefersToFormula());
-	}
-
-	@Test
-	public void test49423() throws Exception
-    {
-		HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("49423.xls");
-		
-		boolean found = false;
-        int numSheets = workbook.getNumberOfSheets();
-        for (int i = 0; i < numSheets; i++) {
-            HSSFSheet sheet = workbook.getSheetAt(i);
-            List<HSSFShape> shapes = sheet.getDrawingPatriarch().getChildren();
-            for(HSSFShape shape : shapes){
-                HSSFAnchor anchor = shape.getAnchor();
-    
-                if(anchor instanceof HSSFClientAnchor){
-                    // absolute coordinates
-                    HSSFClientAnchor clientAnchor = (HSSFClientAnchor)anchor;
-                    assertNotNull(clientAnchor);
-                    //System.out.println(clientAnchor.getRow1() + "," + clientAnchor.getRow2());
-                    found = true;
-                } else if (anchor instanceof HSSFChildAnchor){
-                    // shape is grouped and the anchor is expressed in the coordinate system of the group 
-                    HSSFChildAnchor childAnchor = (HSSFChildAnchor)anchor;
-                    assertNotNull(childAnchor);
-                    //System.out.println(childAnchor.getDy1() + "," + childAnchor.getDy2());
-                    found = true;
-                }
-            }
-        }
-        
-        assertTrue("Should find some images via Client or Child anchors, but did not find any at all", found);
-        workbook.close();
-    }
-
-    @Test
-    public void testRewriteFileBug58480() throws IOException {
-        final File file = TempFile.createTempFile("TestHSSFWorkbook", ".xls");
-
-        try {
-            // create new workbook
-            {
-                final Workbook workbook = new HSSFWorkbook();
-                final Sheet sheet = workbook.createSheet("foo");
-                final Row row = sheet.createRow(1);
-                row.createCell(1).setCellValue("bar");
-                
-                writeAndCloseWorkbook(workbook, file);
-            }
-    
-            // edit the workbook
-            {
-                NPOIFSFileSystem fs = new NPOIFSFileSystem(file, false);
-                try {
-                    DirectoryNode root = fs.getRoot();
-                    final Workbook workbook = new HSSFWorkbook(root, true);
-                    final Sheet sheet = workbook.getSheet("foo");
-                    sheet.getRow(1).createCell(2).setCellValue("baz");
-                    
-                    writeAndCloseWorkbook(workbook, file);
-                } finally {
-                    fs.close();
-                }
-            }
-        } finally {
-            assertTrue(file.exists());
-            assertTrue(file.delete());
-        }
-    }
-
-    private void writeAndCloseWorkbook(Workbook workbook, File file)
-    throws IOException {
-        final ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-        workbook.write(bytesOut);
-        workbook.close();
-
-        final byte[] byteArray = bytesOut.toByteArray();
-        bytesOut.close();
-
-        final FileOutputStream fileOut = new FileOutputStream(file);
-        fileOut.write(byteArray);
-        fileOut.close();
-
-    }
-    
-    @Test
-    public void closeDoesNotModifyWorkbook() throws IOException {
-        final String filename = "SampleSS.xls";
-        final File file = POIDataSamples.getSpreadSheetInstance().getFile(filename);
-        Workbook wb;
-        
-        // File via POIFileStream (java.io)
-        wb = new HSSFWorkbook(new POIFSFileSystem(file));
-        assertCloseDoesNotModifyFile(filename, wb);
-        
-        // File via NPOIFileStream (java.nio)
-        wb = new HSSFWorkbook(new NPOIFSFileSystem(file));
-        assertCloseDoesNotModifyFile(filename, wb);
-        
-        // InputStream
-        wb = new HSSFWorkbook(new FileInputStream(file));
-        assertCloseDoesNotModifyFile(filename, wb);
-    }
-
-    @Test
-    public void setSheetOrderToEnd() throws Exception {
-        final HSSFWorkbook workbook = new HSSFWorkbook();
-        workbook.createSheet("A");
-        try {
-            for (int i = 0; i < 2 * workbook.getInternalWorkbook().getRecords().size(); i++) {
-                workbook.setSheetOrder("A", 0);
-            }
-        } catch (Exception e) {
-            throw new Exception("Moving a sheet to the end should not throw an exception, but threw ", e);
-        }
-    }
-    
-    @Test
-    public void invalidInPlaceWrite() throws Exception {
-        HSSFWorkbook wb;
-        
-        // Can't work for new files
-        wb = new HSSFWorkbook();
-        try {
-            wb.write();
-            fail("Shouldn't work for new files");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-        wb.close();
-        
-        // Can't work for InputStream opened files
-        wb = new HSSFWorkbook(
-            POIDataSamples.getSpreadSheetInstance().openResourceAsStream("SampleSS.xls"));
-        try {
-            wb.write();
-            fail("Shouldn't work for InputStream");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-        wb.close();
-        
-        // Can't work for OPOIFS
-        OPOIFSFileSystem ofs = new OPOIFSFileSystem(
-                POIDataSamples.getSpreadSheetInstance().openResourceAsStream("SampleSS.xls"));
-        wb = new HSSFWorkbook(ofs.getRoot(), true);
-        try {
-            wb.write();
-            fail("Shouldn't work for OPOIFSFileSystem");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-        wb.close();
-        
-        // Can't work for Read-Only files
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(
-                POIDataSamples.getSpreadSheetInstance().getFile("SampleSS.xls"), true);
-        wb = new HSSFWorkbook(fs);
-        try {
-            wb.write();
-            fail("Shouldn't work for Read Only");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-        wb.close();
-    }
-    
-    @Test
-    public void inPlaceWrite() throws Exception {
-        // Setup as a copy of a known-good file
-        final File file = TempFile.createTempFile("TestHSSFWorkbook", ".xls");
-        InputStream inputStream = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("SampleSS.xls");
-        try {
-            FileOutputStream outputStream = new FileOutputStream(file);
-            try {
-                IOUtils.copy(inputStream, outputStream);
-            } finally {
-                outputStream.close();
-            }
-        } finally {
-            inputStream.close();
-        }
-        
-        // Open from the temp file in read-write mode
-        HSSFWorkbook wb = new HSSFWorkbook(new NPOIFSFileSystem(file, false));
-        assertEquals(3, wb.getNumberOfSheets());
-        
-        // Change
-        wb.removeSheetAt(2);
-        wb.removeSheetAt(1);
-        wb.getSheetAt(0).getRow(0).getCell(0).setCellValue("Changed!");
-        
-        // Save in-place, close, re-open and check
-        wb.write();
-        wb.close();
-        
-        wb = new HSSFWorkbook(new NPOIFSFileSystem(file));
-        assertEquals(1, wb.getNumberOfSheets());
-        assertEquals("Changed!", wb.getSheetAt(0).getRow(0).getCell(0).toString());
-
-        wb.close();
-    }
-    
-    @Test
-    public void testWriteToNewFile() throws Exception {
-        // Open from a Stream
-        HSSFWorkbook wb = new HSSFWorkbook(
-                POIDataSamples.getSpreadSheetInstance().openResourceAsStream("SampleSS.xls"));
-
-        // Save to a new temp file
-        final File file = TempFile.createTempFile("TestHSSFWorkbook", ".xls");
-        wb.write(file);
-        wb.close();
-        
-        // Read and check
-        wb = new HSSFWorkbook(new NPOIFSFileSystem(file));
-        assertEquals(3, wb.getNumberOfSheets());
-        wb.close();
-    }
-    
-    @Ignore
-    @Test
-    @Override
-    public void createDrawing() throws Exception {
-        super.createDrawing();
-        // the dimensions for this image are different than for XSSF and SXSSF
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
deleted file mode 100644
index 1a69540..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Tests for how HSSFWorkbook behaves with XLS files
- *  with a WORKBOOK or BOOK directory entry (instead of 
- *  the more usual, Workbook)
- */
-public final class TestNonStandardWorkbookStreamNames extends TestCase {
-	private final String xlsA = "WORKBOOK_in_capitals.xls";
-   private final String xlsB = "BOOK_in_capitals.xls";
-
-	/**
-	 * Test that we can open a file with WORKBOOK
-	 */
-	public void testOpenWORKBOOK() throws Exception {
-		InputStream is = HSSFTestDataSamples.openSampleFileStream(xlsA);
-		
-		POIFSFileSystem fs = new POIFSFileSystem(is);
-
-		// Ensure that we have a WORKBOOK entry
-		fs.getRoot().getEntry("WORKBOOK");
-		// And a summary
-		fs.getRoot().getEntry("\005SummaryInformation");
-		assertTrue(true);
-
-		// But not a Workbook one
-		try {
-			fs.getRoot().getEntry("Workbook");
-			fail();
-		} catch(FileNotFoundException e) {}
-		
-		// Try to open the workbook
-		HSSFWorkbook wb = new HSSFWorkbook(fs);
-	}
-
-   /**
-    * Test that we can open a file with BOOK
-    */
-   public void testOpenBOOK() throws Exception {
-      InputStream is = HSSFTestDataSamples.openSampleFileStream(xlsB);
-      
-      POIFSFileSystem fs = new POIFSFileSystem(is);
-
-      // Ensure that we have a BOOK entry
-      fs.getRoot().getEntry("BOOK");
-      assertTrue(true);
-
-      // But not a Workbook one
-      try {
-         fs.getRoot().getEntry("Workbook");
-         fail();
-      } catch(FileNotFoundException e) {}
-      // And not a Summary one
-      try {
-         fs.getRoot().getEntry("\005SummaryInformation");
-         fail();
-      } catch(FileNotFoundException e) {}
-      
-      // Try to open the workbook
-      HSSFWorkbook wb = new HSSFWorkbook(fs);
-   }
-
-	/**
-	 * Test that when we write out, we go back to the correct case
-	 */
-	public void testWrite() throws Exception {
-	   for (String file : new String[] {xlsA, xlsB}) {
-   		InputStream is = HSSFTestDataSamples.openSampleFileStream(file);
-   		POIFSFileSystem fs = new POIFSFileSystem(is);
-   
-   		// Open the workbook, not preserving nodes
-   		HSSFWorkbook wb = new HSSFWorkbook(fs);
-   		ByteArrayOutputStream out = new ByteArrayOutputStream();
-   		wb.write(out);
-   
-   		// Check now
-   		ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-   		POIFSFileSystem fs2 = new POIFSFileSystem(in);
-   
-   		// Check that we have the new entries
-   		fs2.getRoot().getEntry("Workbook");
-   		try {
-   			fs2.getRoot().getEntry("BOOK");
-   			fail();
-   		} catch(FileNotFoundException e) {}
-         try {
-            fs2.getRoot().getEntry("WORKBOOK");
-            fail();
-         } catch(FileNotFoundException e) {}
-   
-   		// And it can be opened
-   		HSSFWorkbook wb2 = new HSSFWorkbook(fs2);
-	   }
-	}
-
-	/**
-	 * Test that when we write out preserving nodes, we go back to the
-	 *  correct case
-	 */
-	public void testWritePreserve() throws Exception {
-		InputStream is = HSSFTestDataSamples.openSampleFileStream(xlsA);
-		POIFSFileSystem fs = new POIFSFileSystem(is);
-
-		// Open the workbook, not preserving nodes
-		HSSFWorkbook wb = new HSSFWorkbook(fs,true);
-
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		wb.write(out);
-
-		// Check now
-		ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-		POIFSFileSystem fs2 = new POIFSFileSystem(in);
-
-		// Check that we have the new entries
-		fs2.getRoot().getEntry("Workbook");
-		try {
-			fs2.getRoot().getEntry("WORKBOOK");
-			fail();
-		} catch(FileNotFoundException e) {}
-
-		// As we preserved, should also have a few other streams
-		fs2.getRoot().getEntry("\005SummaryInformation");
-
-		// And it can be opened
-		HSSFWorkbook wb2 = new HSSFWorkbook(fs2);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
deleted file mode 100644
index fea681e..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.Ole10Native;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * 
- */
-public final class TestOLE2Embeding {
-
-    @Test
-    public void testEmbeding() throws Exception {
-        // This used to break, until bug #43116 was fixed
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("ole2-embedding.xls");
-
-        // Check we can get at the Escher layer still
-        workbook.getAllPictures();
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testEmbeddedObjects() throws Exception {
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("ole2-embedding.xls");
-
-        List<HSSFObjectData> objects = workbook.getAllEmbeddedObjects();
-        assertEquals("Wrong number of objects", 2, objects.size());
-        assertEquals("Wrong name for first object", "MBD06CAB431",
-                objects.get(0).getDirectory().getName());
-        assertEquals("Wrong name for second object", "MBD06CAC85A",
-                objects.get(1).getDirectory().getName());
-        
-        workbook.close();
-    }
-    
-    @Test
-    public void testReallyEmbedSomething() throws Exception {
-    	HSSFWorkbook wb1 = new HSSFWorkbook();
-    	HSSFSheet sheet = wb1.createSheet();
-    	HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-    	byte[] pictureData = HSSFTestDataSamples.getTestDataFileContent("logoKarmokar4.png");
-    	byte[] picturePPT = POIDataSamples.getSlideShowInstance().readFile("clock.jpg");
-    	int imgIdx = wb1.addPicture(pictureData, HSSFWorkbook.PICTURE_TYPE_PNG);
-    	POIFSFileSystem pptPoifs = getSamplePPT();
-    	int pptIdx = wb1.addOlePackage(pptPoifs, "Sample-PPT", "sample.ppt", "sample.ppt");
-    	POIFSFileSystem xlsPoifs = getSampleXLS();
-    	int imgPPT = wb1.addPicture(picturePPT, HSSFWorkbook.PICTURE_TYPE_JPEG);
-    	int xlsIdx = wb1.addOlePackage(xlsPoifs, "Sample-XLS", "sample.xls", "sample.xls");
-    	int txtIdx = wb1.addOlePackage(getSampleTXT(), "Sample-TXT", "sample.txt", "sample.txt");
-    	
-        int rowoffset = 5;
-        int coloffset = 5;
-
-        CreationHelper ch = wb1.getCreationHelper();
-        HSSFClientAnchor anchor = (HSSFClientAnchor)ch.createClientAnchor();
-        anchor.setAnchor((short)(2+coloffset), 1+rowoffset, 0, 0, (short)(3+coloffset), 5+rowoffset, 0, 0);
-        anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-    	
-        patriarch.createObjectData(anchor, pptIdx, imgPPT);
-
-        anchor = (HSSFClientAnchor)ch.createClientAnchor();
-        anchor.setAnchor((short)(5+coloffset), 1+rowoffset, 0, 0, (short)(6+coloffset), 5+rowoffset, 0, 0);
-        anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-        
-        patriarch.createObjectData(anchor, xlsIdx, imgIdx);
-        
-        anchor = (HSSFClientAnchor)ch.createClientAnchor();
-        anchor.setAnchor((short)(3+coloffset), 10+rowoffset, 0, 0, (short)(5+coloffset), 11+rowoffset, 0, 0);
-        anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-        
-        patriarch.createObjectData(anchor, txtIdx, imgIdx);
-        
-        anchor = (HSSFClientAnchor)ch.createClientAnchor();
-        anchor.setAnchor((short)(1+coloffset), -2+rowoffset, 0, 0, (short)(7+coloffset), 14+rowoffset, 0, 0);
-        anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-
-        HSSFSimpleShape circle = patriarch.createSimpleShape(anchor);
-        circle.setShapeType(HSSFSimpleShape.OBJECT_TYPE_OVAL);
-        circle.setNoFill(true);
-
-//        if (false) {
-//	        FileOutputStream fos = new FileOutputStream("embed.xls");
-//	        wb.write(fos);
-//	        fos.close();
-//        }
-        
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        HSSFObjectData od = wb2.getAllEmbeddedObjects().get(0);
-        Ole10Native ole10 = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)od.getDirectory());
-        bos.reset();
-        pptPoifs.writeFilesystem(bos);
-        assertArrayEquals(ole10.getDataBuffer(), bos.toByteArray());
-
-        od = wb2.getAllEmbeddedObjects().get(1);
-        ole10 = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)od.getDirectory());
-        bos.reset();
-        xlsPoifs.writeFilesystem(bos);
-        assertArrayEquals(ole10.getDataBuffer(), bos.toByteArray());
-
-        od = wb2.getAllEmbeddedObjects().get(2);
-        ole10 = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)od.getDirectory());
-        assertArrayEquals(ole10.getDataBuffer(), getSampleTXT());
-    
-        xlsPoifs.close();
-        pptPoifs.close();
-        wb2.close();
-    }
-    
-    static POIFSFileSystem getSamplePPT() throws IOException {
-    	// scratchpad classes are not available, so we use something pre-cooked
-    	InputStream is = POIDataSamples.getSlideShowInstance().openResourceAsStream("with_textbox.ppt");
-    	POIFSFileSystem poifs = new POIFSFileSystem(is);
-    	is.close();
-        
-        return poifs;
-    }
-    
-    static POIFSFileSystem getSampleXLS() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        sheet.createRow(5).createCell(2).setCellValue("yo dawg i herd you like embeddet objekts, so we put a ole in your ole so you can save a file while you save a file");
-
-    	ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    	wb.write(bos);
-    	wb.close();
-    	POIFSFileSystem poifs = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-        
-        return poifs;
-    }
-    
-    static byte[] getSampleTXT() {
-        return "All your base are belong to us".getBytes(LocaleUtil.CHARSET_1252);
-    }    
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
deleted file mode 100644
index feaf77b..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-/**
- * Old-style setting of POIFS properties doesn't work with POI 3.0.2
- *
- * @author Yegor Kozlov
- */
-public class TestPOIFSProperties extends TestCase{
-
-    private static final String title = "Testing POIFS properties";
-
-    public void testFail() throws Exception {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream("Simple.xls");
-        POIFSFileSystem fs = new POIFSFileSystem(is);
-
-        HSSFWorkbook wb = new HSSFWorkbook(fs);
-
-        //set POIFS properties after constructing HSSFWorkbook
-        //(a piece of code that used to work up to POI 3.0.2)
-        SummaryInformation summary1 = (SummaryInformation)PropertySetFactory.create(fs.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME));
-        summary1.setTitle(title);
-        //write the modified property back to POIFS
-        fs.getRoot().getEntry(SummaryInformation.DEFAULT_STREAM_NAME).delete();
-        fs.createDocument(summary1.toInputStream(), SummaryInformation.DEFAULT_STREAM_NAME);
-
-        //save the workbook and read the property
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        wb.write(out);
-        out.close();
-
-        POIFSFileSystem fs2 = new POIFSFileSystem(new ByteArrayInputStream(out.toByteArray()));
-        SummaryInformation summary2 = (SummaryInformation)PropertySetFactory.create(fs2.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME));
-
-        //failing assertion
-        assertEquals(title, summary2.getTitle());
-    }
-
-    public void testOK() throws Exception {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream("Simple.xls");
-        POIFSFileSystem fs = new POIFSFileSystem(is);
-
-        //set POIFS properties before constructing HSSFWorkbook
-        SummaryInformation summary1 = (SummaryInformation)PropertySetFactory.create(fs.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME));
-        summary1.setTitle(title);
-
-        fs.getRoot().getEntry(SummaryInformation.DEFAULT_STREAM_NAME).delete();
-        fs.createDocument(summary1.toInputStream(), SummaryInformation.DEFAULT_STREAM_NAME);
-
-        HSSFWorkbook wb = new HSSFWorkbook(fs);
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        wb.write(out);
-        out.close();
-
-        //read the property
-        POIFSFileSystem fs2 = new POIFSFileSystem(new ByteArrayInputStream(out.toByteArray()));
-        SummaryInformation summary2 = (SummaryInformation)PropertySetFactory.create(fs2.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME));
-        assertEquals(title, summary2.getTitle());
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java
deleted file mode 100644
index 49cbaee..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.EscherAggregate;
-
-/**
- * @author Evgeniy Berlog
- * @date 01.08.12
- */
-public class TestPatriarch extends TestCase {
-
-    public void testGetPatriarch(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        assertNull(sh.getDrawingPatriarch());
-
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-        assertNotNull(patriarch);
-        patriarch.createSimpleShape(new HSSFClientAnchor());
-        patriarch.createSimpleShape(new HSSFClientAnchor());
-
-        assertSame(patriarch, sh.getDrawingPatriarch());
-
-        EscherAggregate agg = patriarch.getBoundAggregate();
-
-        EscherDgRecord dg = agg.getEscherContainer().getChildById(EscherDgRecord.RECORD_ID);
-        int lastId = dg.getLastMSOSPID();
-        
-        assertSame(patriarch, sh.createDrawingPatriarch());
-        
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wb.getSheetAt(0);
-        patriarch = sh.createDrawingPatriarch();
-        dg = patriarch.getBoundAggregate().getEscherContainer().getChildById(EscherDgRecord.RECORD_ID);
-
-        assertEquals(lastId, dg.getLastMSOSPID());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java
deleted file mode 100644
index 6174a5f..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.hssf.model.TestDrawingAggregate.decompress;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.ddf.EscherArrayProperty;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSpRecord;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.junit.Test;
-
-public class TestPolygon {
-    @Test
-    public void testResultEqualsToAbstractShape() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFPolygon polygon = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon.setPolygonDrawArea( 100, 100 );
-        polygon.setPoints( new int[]{0, 90, 50}, new int[]{5, 5, 44} );
-        polygon.setShapeId(1024);
-
-        assertEquals(polygon.getEscherContainer().getChildRecords().size(), 4);
-
-        //sp record
-        byte[] expected = decompress("H4sIAAAAAAAAAGNi4PrAwQAELEDMxcAAAAU6ZlwQAAAA");
-        byte[] actual = polygon.getEscherContainer().getChild(0).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNgEPggxIANAABK4+laGgAAAA==");
-        actual = polygon.getEscherContainer().getChild(2).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNgEPzAAAQACl6c5QgAAAA=");
-        actual = polygon.getEscherContainer().getChild(3).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        ObjRecord obj = polygon.getObjRecord();
-
-        expected = decompress("H4sIAAAAAAAAAItlkGIQZRBikGNgYBBMYEADAOAV/ZkeAAAA");
-        actual = obj.serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testPolygonPoints() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFPolygon polygon = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon.setPolygonDrawArea( 100, 100 );
-        polygon.setPoints( new int[]{0, 90, 50, 90}, new int[]{5, 5, 44, 88} );
-
-        EscherArrayProperty verticesProp1 = polygon.getOptRecord().lookup(EscherProperties.GEOMETRY__VERTICES);
-
-        String expected =
-            "<EscherArrayProperty id=\"0x8145\" name=\"geometry.vertices\" blipId=\"false\">"+
-            "<Element>[00, 00, 05, 00]</Element>"+
-            "<Element>[5A, 00, 05, 00]</Element>"+
-            "<Element>[32, 00, 2C, 00]</Element>"+
-            "<Element>[5A, 00, 58, 00]</Element>"+
-            "<Element>[00, 00, 05, 00]</Element>"+
-            "</EscherArrayProperty>";
-        String actual = verticesProp1.toXml("").replaceAll("[\r\n\t]","");
-        
-        assertEquals(verticesProp1.getNumberOfElementsInArray(), 5);
-        assertEquals(expected, actual);
-        
-        polygon.setPoints(new int[]{1,2,3}, new int[] {4,5,6});
-        assertArrayEquals(polygon.getXPoints(), new int[]{1, 2, 3});
-        assertArrayEquals(polygon.getYPoints(), new int[]{4, 5, 6});
-
-        verticesProp1 = polygon.getOptRecord().lookup(EscherProperties.GEOMETRY__VERTICES);
-
-        expected =
-            "<EscherArrayProperty id=\"0x8145\" name=\"geometry.vertices\" blipId=\"false\">" +
-            "<Element>[01, 00, 04, 00]</Element>" +
-            "<Element>[02, 00, 05, 00]</Element>" +
-            "<Element>[03, 00, 06, 00]</Element>" +
-            "<Element>[01, 00, 04, 00]</Element>" +
-            "</EscherArrayProperty>";
-        actual = verticesProp1.toXml("").replaceAll("[\r\n\t]","");
-        
-        assertEquals(verticesProp1.getNumberOfElementsInArray(), 4);
-        assertEquals(expected, actual);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testSetGetProperties() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sh = wb1.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFPolygon polygon = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon.setPolygonDrawArea( 102, 101 );
-        polygon.setPoints( new int[]{1,2,3}, new int[]{4,5,6} );
-
-        assertArrayEquals(polygon.getXPoints(), new int[]{1,2,3});
-        assertArrayEquals(polygon.getYPoints(), new int[]{4, 5, 6});
-        assertEquals(polygon.getDrawAreaHeight(), 101);
-        assertEquals(polygon.getDrawAreaWidth(), 102);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        polygon = (HSSFPolygon) patriarch.getChildren().get(0);
-        assertArrayEquals(polygon.getXPoints(), new int[]{1, 2, 3});
-        assertArrayEquals(polygon.getYPoints(), new int[]{4, 5, 6});
-        assertEquals(polygon.getDrawAreaHeight(), 101);
-        assertEquals(polygon.getDrawAreaWidth(), 102);
-
-        polygon.setPolygonDrawArea( 1021, 1011 );
-        polygon.setPoints( new int[]{11,21,31}, new int[]{41,51,61} );
-
-        assertArrayEquals(polygon.getXPoints(), new int[]{11, 21, 31});
-        assertArrayEquals(polygon.getYPoints(), new int[]{41, 51, 61});
-        assertEquals(polygon.getDrawAreaHeight(), 1011);
-        assertEquals(polygon.getDrawAreaWidth(), 1021);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sh = wb3.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        polygon = (HSSFPolygon) patriarch.getChildren().get(0);
-
-        assertArrayEquals(polygon.getXPoints(), new int[]{11, 21, 31});
-        assertArrayEquals(polygon.getYPoints(), new int[]{41, 51, 61});
-        assertEquals(polygon.getDrawAreaHeight(), 1011);
-        assertEquals(polygon.getDrawAreaWidth(), 1021);
-        
-        wb3.close();
-    }
-
-    @Test
-    public void testAddToExistingFile() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sh = wb1.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFPolygon polygon = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon.setPolygonDrawArea( 102, 101 );
-        polygon.setPoints( new int[]{1,2,3}, new int[]{4,5,6} );
-
-        HSSFPolygon polygon1 = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon1.setPolygonDrawArea( 103, 104 );
-        polygon1.setPoints( new int[]{11,12,13}, new int[]{14,15,16} );
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        assertEquals(patriarch.getChildren().size(), 2);
-
-        HSSFPolygon polygon2 = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon2.setPolygonDrawArea( 203, 204 );
-        polygon2.setPoints( new int[]{21,22,23}, new int[]{24,25,26} );
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sh = wb3.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        assertEquals(patriarch.getChildren().size(), 3);
-
-        polygon = (HSSFPolygon) patriarch.getChildren().get(0);
-        polygon1 = (HSSFPolygon) patriarch.getChildren().get(1);
-        polygon2 = (HSSFPolygon) patriarch.getChildren().get(2);
-
-        assertArrayEquals(polygon.getXPoints(), new int[]{1, 2, 3});
-        assertArrayEquals(polygon.getYPoints(), new int[]{4,5,6});
-        assertEquals(polygon.getDrawAreaHeight(), 101);
-        assertEquals(polygon.getDrawAreaWidth(), 102);
-
-        assertArrayEquals(polygon1.getXPoints(), new int[]{11,12,13});
-        assertArrayEquals(polygon1.getYPoints(), new int[]{14,15,16});
-        assertEquals(polygon1.getDrawAreaHeight(), 104);
-        assertEquals(polygon1.getDrawAreaWidth(), 103);
-
-        assertArrayEquals(polygon2.getXPoints(), new int[]{21,22,23});
-        assertArrayEquals(polygon2.getYPoints(), new int[]{24,25,26});
-        assertEquals(polygon2.getDrawAreaHeight(), 204);
-        assertEquals(polygon2.getDrawAreaWidth(), 203);
-        
-        wb3.close();
-    }
-
-    @Test
-    public void testExistingFile() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("polygon");
-        HSSFPatriarch drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-
-        HSSFPolygon polygon = (HSSFPolygon) drawing.getChildren().get(0);
-        assertEquals(polygon.getDrawAreaHeight(), 2466975);
-        assertEquals(polygon.getDrawAreaWidth(), 3686175);
-        assertArrayEquals(polygon.getXPoints(), new int[]{0, 0, 31479, 16159, 19676, 20502});
-        assertArrayEquals(polygon.getYPoints(), new int[]{0, 0, 36, 56, 34, 18});
-        
-        wb.close();
-    }
-
-    @Test
-    public void testPolygonType() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sh = wb1.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-
-        HSSFPolygon polygon = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon.setPolygonDrawArea( 102, 101 );
-        polygon.setPoints( new int[]{1,2,3}, new int[]{4,5,6} );
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        HSSFPolygon polygon1 = patriarch.createPolygon(new HSSFClientAnchor());
-        polygon1.setPolygonDrawArea( 102, 101 );
-        polygon1.setPoints( new int[]{1,2,3}, new int[]{4,5,6} );
-
-        EscherSpRecord spRecord = polygon1.getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
-
-        spRecord.setShapeType((short)77/**RANDOM**/);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sh = wb3.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        assertEquals(patriarch.getChildren().size(), 2);
-        assertTrue(patriarch.getChildren().get(0) instanceof HSSFPolygon);
-        assertTrue(patriarch.getChildren().get(1) instanceof HSSFPolygon);
-        wb3.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
deleted file mode 100644
index 57be4a6..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.InternalSheet;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestReadWriteChart {
-
-    /**
-     * In the presence of a chart we need to make sure BOF/EOF records still exist.
-     */
-    @Test
-    public void testBOFandEOFRecords() throws Exception {
-        HSSFWorkbook workbook  = HSSFTestDataSamples.openSampleWorkbook("SimpleChart.xls");
-        HSSFSheet       sheet     = workbook.getSheetAt(0);
-        HSSFRow         firstRow  = sheet.getRow(0);
-        HSSFCell        firstCell = firstRow.getCell(0);
-
-        //System.out.println("first assertion for date");
-        Calendar calExp = LocaleUtil.getLocaleCalendar(2000, 0, 1, 10, 51, 2);
-        Date dateAct = HSSFDateUtil.getJavaDate(firstCell.getNumericCellValue(), false);
-        assertEquals(calExp.getTime(), dateAct);
-        HSSFRow  row  = sheet.createRow(15);
-        HSSFCell cell = row.createCell(1);
-
-        cell.setCellValue(22);
-        InternalSheet newSheet = workbook.getSheetAt(0).getSheet();
-        List<RecordBase> records  = newSheet.getRecords();
-
-        assertTrue(records.get(0) instanceof BOFRecord);
-        assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
-        
-        workbook.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java
deleted file mode 100644
index 35519d3..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.BorderStyle;
-
-/**
- * Class to test row styling functionality
- *
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- */
-public final class TestRowStyle extends TestCase {
-
-    /**
-     * TEST NAME:  Test Write Sheet Font <P>
-     * OBJECTIVE:  Test that HSSF can create a simple spreadsheet with numeric and string values and styled with fonts.<P>
-     * SUCCESS:    HSSF creates a sheet.  Filesize matches a known good.  HSSFSheet objects
-     *             Last row, first row is tested against the correct values (99,0).<P>
-     * FAILURE:    HSSF does not create a sheet or excepts.  Filesize does not match the known good.
-     *             HSSFSheet last row or first row is incorrect.             <P>
-     *
-     */
-    public void testWriteSheetFont() {
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFSheet        s    = wb.createSheet();
-        HSSFRow          r    = null;
-        HSSFFont         fnt  = wb.createFont();
-        HSSFCellStyle    cs   = wb.createCellStyle();
-
-        fnt.setColor(HSSFFont.COLOR_RED);
-        fnt.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-        cs.setFont(fnt);
-        for (int rownum = 0; rownum < 100; rownum++)
-        {
-            r = s.createRow(rownum);
-            r.setRowStyle(cs);
-            r.createCell(0);
-        }
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        		
-        SanityChecker sanityChecker = new SanityChecker();
-        sanityChecker.checkHSSFWorkbook(wb);
-        assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
-        assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
-    }
-
-    /**
-     * Tests that is creating a file with a date or an calendar works correctly.
-     */
-    public void testDataStyle() {
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFSheet        s    = wb.createSheet();
-        HSSFCellStyle    cs   = wb.createCellStyle();
-        HSSFRow row = s.createRow(0);
-
-        // with Date:
-        cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
-        row.setRowStyle(cs);
-        row.createCell(0);
-
-
-        // with Calendar:
-        row = s.createRow(1);
-        cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
-        row.setRowStyle(cs);
-        row.createCell(0);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        
-        SanityChecker sanityChecker = new SanityChecker();
-        sanityChecker.checkHSSFWorkbook(wb);
-
-        assertEquals("LAST ROW ", 1, s.getLastRowNum());
-        assertEquals("FIRST ROW ", 0, s.getFirstRowNum());
-
-    }
-
-    /**
-     * TEST NAME:  Test Write Sheet Style <P>
-     * OBJECTIVE:  Test that HSSF can create a simple spreadsheet with numeric and string values and styled with colors
-     *             and borders.<P>
-     * SUCCESS:    HSSF creates a sheet.  Filesize matches a known good.  HSSFSheet objects
-     *             Last row, first row is tested against the correct values (99,0).<P>
-     * FAILURE:    HSSF does not create a sheet or excepts.  Filesize does not match the known good.
-     *             HSSFSheet last row or first row is incorrect.             <P>
-     *
-     */
-    public void testWriteSheetStyle() {
-        HSSFWorkbook     wb   = new HSSFWorkbook();
-        HSSFSheet        s    = wb.createSheet();
-        HSSFRow          r    = null;
-        HSSFFont         fnt  = wb.createFont();
-        HSSFCellStyle    cs   = wb.createCellStyle();
-        HSSFCellStyle    cs2  = wb.createCellStyle();
-
-        cs.setBorderBottom(BorderStyle.THIN);
-        cs.setBorderLeft(BorderStyle.THIN);
-        cs.setBorderRight(BorderStyle.THIN);
-        cs.setBorderTop(BorderStyle.THIN);
-        cs.setFillForegroundColor(( short ) 0xA);
-        cs.setFillPattern(( short ) 1);
-        fnt.setColor(( short ) 0xf);
-        fnt.setItalic(true);
-        cs2.setFillForegroundColor(( short ) 0x0);
-        cs2.setFillPattern(( short ) 1);
-        cs2.setFont(fnt);
-        for (int rownum = 0; rownum < 100; rownum++)
-        {
-            r = s.createRow(rownum);
-            r.setRowStyle(cs);
-            r.createCell(0);
-
-            rownum++;
-            if (rownum >= 100) break; // I feel too lazy to check if this isreqd :-/ 
-            
-            r = s.createRow(rownum);
-            r.setRowStyle(cs2);
-            r.createCell(0);
-        }
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        
-        SanityChecker sanityChecker = new SanityChecker();
-        sanityChecker.checkHSSFWorkbook(wb);
-        assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
-        assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
-        
-        s    = wb.getSheetAt(0);
-        assertNotNull("Sheet is not null", s);
-        
-        for (int rownum = 0; rownum < 100; rownum++)
-        {
-            r = s.getRow(rownum);
-            assertNotNull("Row is not null", r);
-            
-            cs = r.getRowStyle();
-            assertEquals("Bottom Border Style for row:", BorderStyle.THIN, cs.getBorderBottomEnum());
-            assertEquals("Left Border Style for row:",   BorderStyle.THIN, cs.getBorderLeftEnum());
-            assertEquals("Right Border Style for row:",  BorderStyle.THIN, cs.getBorderRightEnum());
-            assertEquals("Top Border Style for row:",    BorderStyle.THIN, cs.getBorderTopEnum());
-            assertEquals("FillForegroundColor for row:", 0xA, cs.getFillForegroundColor());
-            assertEquals("FillPattern for row:",         0x1, cs.getFillPattern());
-            
-            rownum++;
-            if (rownum >= 100) break; // I feel too lazy to check if this isreqd :-/ 
-            
-            r = s.getRow(rownum);
-            assertNotNull("Row is not null", r);
-            cs2 = r.getRowStyle();
-            assertEquals("FillForegroundColor for row: ", cs2.getFillForegroundColor(), (short) 0x0);
-            assertEquals("FillPattern for row: ", cs2.getFillPattern(), (short) 0x1);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
deleted file mode 100644
index 3401872..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.InterfaceHdrRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.usermodel.SanityChecker.CheckRecord;
-import org.junit.Test;
-
-/**
- * A Test case for a test utility class.<br/>
- * Okay, this may seem strange but I need to test my test logic.
- *
- * @author Glen Stampoultzis (glens at apache.org)
- */
-public final class TestSanityChecker {
-	private static final Record INTERFACEHDR = new InterfaceHdrRecord(InterfaceHdrRecord.CODEPAGE);
-	private static BoundSheetRecord createBoundSheetRec() {
-		return new BoundSheetRecord("Sheet1");
-	}
-	
-	@Test
-	public void testCheckRecordOrder() {
-		final SanityChecker c = new SanityChecker();
-		List<Record> records = new ArrayList<Record>();
-		records.add(new BOFRecord());
-		records.add(INTERFACEHDR);
-		records.add(createBoundSheetRec());
-		records.add(EOFRecord.instance);
-		CheckRecord[] check = {
-				new CheckRecord(BOFRecord.class, '1'),
-				new CheckRecord(InterfaceHdrRecord.class, '0'),
-				new CheckRecord(BoundSheetRecord.class, 'M'),
-				new CheckRecord(NameRecord.class, '*'),
-				new CheckRecord(EOFRecord.class, '1'),
-		};
-		// check pass
-		c.checkRecordOrder(records, check);
-		records.add(2, createBoundSheetRec());
-		c.checkRecordOrder(records, check);
-		records.remove(1);	  // optional record missing
-		c.checkRecordOrder(records, check);
-		records.add(3, new NameRecord());
-		records.add(3, new NameRecord()); // optional multiple record occurs more than one time
-		c.checkRecordOrder(records, check);
-
-		// check fail
-		confirmBadRecordOrder(check, new Record[] {
-				new BOFRecord(),
-				createBoundSheetRec(),
-				INTERFACEHDR,
-				EOFRecord.instance,
-		});
-
-		confirmBadRecordOrder(check, new Record[] {
-				new BOFRecord(),
-				INTERFACEHDR,
-				createBoundSheetRec(),
-				INTERFACEHDR,
-				EOFRecord.instance,
-		});
-
-		confirmBadRecordOrder(check, new Record[] {
-				new BOFRecord(),
-				createBoundSheetRec(),
-				new NameRecord(),
-				EOFRecord.instance,
-				new NameRecord(),
-		});
-
-		confirmBadRecordOrder(check, new Record[] {
-				INTERFACEHDR,
-				createBoundSheetRec(),
-				EOFRecord.instance,
-		});
-
-		confirmBadRecordOrder(check, new Record[] {
-				new BOFRecord(),
-				INTERFACEHDR,
-				EOFRecord.instance,
-		});
-
-		confirmBadRecordOrder(check, new Record[] {
-				INTERFACEHDR,
-				createBoundSheetRec(),
-				new BOFRecord(),
-				EOFRecord.instance,
-		});
-
-		confirmBadRecordOrder(check, new Record[] {
-				new BOFRecord(),
-				createBoundSheetRec(),
-				INTERFACEHDR,
-				EOFRecord.instance,
-		});
-	}
-	private static void confirmBadRecordOrder(final SanityChecker.CheckRecord[] check, Record[] recs) {
-		final SanityChecker c = new SanityChecker();
-		final List<Record> records = Arrays.asList(recs);
-		try {
-			new Runnable() {
-				@Override
-                public void run() {
-					c.checkRecordOrder(records, check);
-				}
-			}.run();
-		} catch (AssertionError pass) {
-			// expected during normal test
-			return;
-		}
-		fail("Did not get failure exception as expected");
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java
deleted file mode 100644
index e1e2ebc..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.POITestCase;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherSpgrRecord;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.EscherAggregate;
-
-import junit.framework.TestCase;
-
-/**
- * @author Evgeniy Berlog
- * @date 29.06.12
- */
-public class TestShapeGroup extends TestCase{
-
-    public void testSetGetCoordinates(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-        HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
-        assertEquals(group.getX1(), 0);
-        assertEquals(group.getY1(), 0);
-        assertEquals(group.getX2(), 1023);
-        assertEquals(group.getY2(), 255);
-
-        group.setCoordinates(1,2,3,4);
-
-        assertEquals(group.getX1(), 1);
-        assertEquals(group.getY1(), 2);
-        assertEquals(group.getX2(), 3);
-        assertEquals(group.getY2(), 4);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wb.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        group = (HSSFShapeGroup) patriarch.getChildren().get(0);
-        assertEquals(group.getX1(), 1);
-        assertEquals(group.getY1(), 2);
-        assertEquals(group.getX2(), 3);
-        assertEquals(group.getY2(), 4);
-    }
-
-    public void testAddToExistingFile(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-        HSSFShapeGroup group1 = patriarch.createGroup(new HSSFClientAnchor());
-        HSSFShapeGroup group2 = patriarch.createGroup(new HSSFClientAnchor());
-
-        group1.setCoordinates(1,2,3,4);
-        group2.setCoordinates(5,6,7,8);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wb.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        assertEquals(patriarch.getChildren().size(), 2);
-
-        HSSFShapeGroup group3 = patriarch.createGroup(new HSSFClientAnchor());
-        group3.setCoordinates(9,10,11,12);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sh = wb.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        assertEquals(patriarch.getChildren().size(), 3);
-    }
-
-    public void testModify() throws Exception {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        // create a sheet with a text box
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFShapeGroup group1 = patriarch.createGroup(new
-                HSSFClientAnchor(0,0,0,0,
-                (short)0, 0, (short)15, 25));
-        group1.setCoordinates(0, 0, 792, 612);
-
-        HSSFTextbox textbox1 = group1.createTextbox(new
-                HSSFChildAnchor(100, 100, 300, 300));
-        HSSFRichTextString rt1 = new HSSFRichTextString("Hello, World!");
-        textbox1.setString(rt1);
-
-        // write, read back and check that our text box is there
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-        assertEquals(1, patriarch.getChildren().size());
-
-        group1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
-        assertEquals(1, group1.getChildren().size());
-        textbox1 = (HSSFTextbox)group1.getChildren().get(0);
-        assertEquals("Hello, World!", textbox1.getString().getString());
-
-        // modify anchor
-        assertEquals(new HSSFChildAnchor(100, 100, 300, 300),
-                textbox1.getAnchor());
-        HSSFChildAnchor newAnchor = new HSSFChildAnchor(200,200, 400, 400);
-        textbox1.setAnchor(newAnchor);
-        // modify text
-        textbox1.setString(new HSSFRichTextString("Hello, World! (modified)"));
-
-        // add a new text box
-        HSSFTextbox textbox2 = group1.createTextbox(new
-                HSSFChildAnchor(400, 400, 600, 600));
-        HSSFRichTextString rt2 = new HSSFRichTextString("Hello, World-2");
-        textbox2.setString(rt2);
-        assertEquals(2, group1.getChildren().size());
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-        assertEquals(1, patriarch.getChildren().size());
-
-        group1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
-        assertEquals(2, group1.getChildren().size());
-        textbox1 = (HSSFTextbox)group1.getChildren().get(0);
-        assertEquals("Hello, World! (modified)",
-                textbox1.getString().getString());
-        assertEquals(new HSSFChildAnchor(200,200, 400, 400),
-                textbox1.getAnchor());
-
-        textbox2 = (HSSFTextbox)group1.getChildren().get(1);
-        assertEquals("Hello, World-2", textbox2.getString().getString());
-        assertEquals(new HSSFChildAnchor(400, 400, 600, 600),
-                textbox2.getAnchor());
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-        group1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
-        textbox1 = (HSSFTextbox)group1.getChildren().get(0);
-        textbox2 = (HSSFTextbox)group1.getChildren().get(1);
-        HSSFTextbox textbox3 = group1.createTextbox(new
-                HSSFChildAnchor(400,200, 600, 400));
-        HSSFRichTextString rt3 = new HSSFRichTextString("Hello, World-3");
-        textbox3.setString(rt3);
-    }
-
-    public void testAddShapesToGroup(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        // create a sheet with a text box
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
-        int index = wb.addPicture(new byte[]{1,2,3}, HSSFWorkbook.PICTURE_TYPE_JPEG);
-        group.createPicture(new HSSFChildAnchor(), index);
-        HSSFPolygon polygon = group.createPolygon(new HSSFChildAnchor());
-        polygon.setPoints(new int[]{1,100, 1}, new int[]{1, 50, 100});
-        group.createTextbox(new HSSFChildAnchor());
-        group.createShape(new HSSFChildAnchor());
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-        assertEquals(1, patriarch.getChildren().size());
-
-        assertTrue(patriarch.getChildren().get(0) instanceof HSSFShapeGroup);
-        group = (HSSFShapeGroup) patriarch.getChildren().get(0);
-
-        assertEquals(group.getChildren().size(), 4);
-
-        assertTrue(group.getChildren().get(0) instanceof HSSFPicture);
-        assertTrue(group.getChildren().get(1) instanceof HSSFPolygon);
-        assertTrue(group.getChildren().get(2) instanceof HSSFTextbox);
-        assertTrue(group.getChildren().get(3) instanceof HSSFSimpleShape);
-
-        HSSFShapeGroup group2 = patriarch.createGroup(new HSSFClientAnchor());
-
-        index = wb.addPicture(new byte[]{2,2,2}, HSSFWorkbook.PICTURE_TYPE_JPEG);
-        group2.createPicture(new HSSFChildAnchor(), index);
-        polygon = group2.createPolygon(new HSSFChildAnchor());
-        polygon.setPoints(new int[]{1,100, 1}, new int[]{1, 50, 100});
-        group2.createTextbox(new HSSFChildAnchor());
-        group2.createShape(new HSSFChildAnchor());
-        group2.createShape(new HSSFChildAnchor());
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-        assertEquals(2, patriarch.getChildren().size());
-
-        group = (HSSFShapeGroup) patriarch.getChildren().get(1);
-
-        assertEquals(group.getChildren().size(), 5);
-
-        assertTrue(group.getChildren().get(0) instanceof HSSFPicture);
-        assertTrue(group.getChildren().get(1) instanceof HSSFPolygon);
-        assertTrue(group.getChildren().get(2) instanceof HSSFTextbox);
-        assertTrue(group.getChildren().get(3) instanceof HSSFSimpleShape);
-        assertTrue(group.getChildren().get(4) instanceof HSSFSimpleShape);
-
-        group.getShapeId();
-    }
-
-    public void testSpgrRecord(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        // create a sheet with a text box
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
-        HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
-        assertSame(((EscherContainerRecord)group.getEscherContainer().getChild(0)).getChildById(EscherSpgrRecord.RECORD_ID), getSpgrRecord(group));
-    }
-
-    private static EscherSpgrRecord getSpgrRecord(HSSFShapeGroup group) {
-        return POITestCase.getFieldValue(HSSFShapeGroup.class, group, EscherSpgrRecord.class, "_spgrRecord");
-    }
-
-    public void testClearShapes(){
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-        HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
-
-        group.createShape(new HSSFChildAnchor());
-        group.createShape(new HSSFChildAnchor());
-
-        EscherAggregate agg = HSSFTestHelper.getEscherAggregate(patriarch);
-
-        assertEquals(agg.getShapeToObjMapping().size(), 5);
-        assertEquals(agg.getTailRecords().size(), 0);
-        assertEquals(group.getChildren().size(), 2);
-
-        group.clear();
-
-        assertEquals(agg.getShapeToObjMapping().size(), 1);
-        assertEquals(agg.getTailRecords().size(), 0);
-        assertEquals(group.getChildren().size(), 0);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheetAt(0);
-        patriarch = sheet.getDrawingPatriarch();
-
-        group = (HSSFShapeGroup) patriarch.getChildren().get(0);
-
-        assertEquals(agg.getShapeToObjMapping().size(), 1);
-        assertEquals(agg.getTailRecords().size(), 0);
-        assertEquals(group.getChildren().size(), 0);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java
deleted file mode 100644
index ef70b13..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.usermodel.BaseTestSheetHiding;
-
-public final class TestSheetHiding extends BaseTestSheetHiding {
-    public TestSheetHiding() {
-        super(HSSFITestDataProvider.instance,
-                "TwoSheetsOneHidden.xls", "TwoSheetsNoneHidden.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java
deleted file mode 100644
index c8203d8..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.apache.poi.hssf.model.TestDrawingAggregate.decompress;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.TextObjectRecord;
-import org.junit.Test;
-
-/**
- * @author Evgeniy Berlog
- * @date 25.06.12
- */
-public class TestText {
-
-    @Test
-    public void testResultEqualsToNonExistingAbstractShape() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sh = wb.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-        HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
-
-        assertEquals(textbox.getEscherContainer().getChildRecords().size(), 5);
-
-        //sp record
-        byte[] expected = decompress("H4sIAAAAAAAAAFvEw/WBg4GBgZEFSHAxMAAA9gX7nhAAAAA=");
-        byte[] actual = textbox.getEscherContainer().getChild(0).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNgEPggxIANAABK4+laGgAAAA==");
-        actual = textbox.getEscherContainer().getChild(2).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNgEPzAAAQACl6c5QgAAAA=");
-        actual = textbox.getEscherContainer().getChild(3).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        expected = decompress("H4sIAAAAAAAAAGNg4P3AAAQA6pyIkQgAAAA=");
-        actual = textbox.getEscherContainer().getChild(4).serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-
-        ObjRecord obj = textbox.getObjRecord();
-
-        expected = decompress("H4sIAAAAAAAAAItlkGIQZRBiYGNgZBBMYEADAOdCLuweAAAA");
-        actual = obj.serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-        
-        TextObjectRecord tor = textbox.getTextObjectRecord();
-
-        expected = decompress("H4sIAAAAAAAAANvGKMQgxMSABgBGi8T+FgAAAA==");
-        actual = tor.serialize();
-
-        assertEquals(expected.length, actual.length);
-        assertArrayEquals(expected, actual);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testAddTextToExistingFile() throws Exception {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sh = wb1.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-        HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
-        textbox.setString(new HSSFRichTextString("just for test"));
-        HSSFTextbox textbox2 = patriarch.createTextbox(new HSSFClientAnchor());
-        textbox2.setString(new HSSFRichTextString("just for test2"));
-
-        assertEquals(patriarch.getChildren().size(), 2);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        assertEquals(patriarch.getChildren().size(), 2);
-        HSSFTextbox text3 = patriarch.createTextbox(new HSSFClientAnchor());
-        text3.setString(new HSSFRichTextString("text3"));
-        assertEquals(patriarch.getChildren().size(), 3);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sh = wb3.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-
-        assertEquals(patriarch.getChildren().size(), 3);
-        assertEquals(((HSSFTextbox) patriarch.getChildren().get(0)).getString().getString(), "just for test");
-        assertEquals(((HSSFTextbox) patriarch.getChildren().get(1)).getString().getString(), "just for test2");
-        assertEquals(((HSSFTextbox) patriarch.getChildren().get(2)).getString().getString(), "text3");
-        
-        wb3.close();
-    }
-
-    @Test
-    public void testSetGetProperties() throws Exception {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sh = wb1.createSheet();
-        HSSFPatriarch patriarch = sh.createDrawingPatriarch();
-        HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
-        textbox.setString(new HSSFRichTextString("test"));
-        assertEquals(textbox.getString().getString(), "test");
-
-        textbox.setHorizontalAlignment((short) 5);
-        assertEquals(textbox.getHorizontalAlignment(), 5);
-
-        textbox.setVerticalAlignment((short) 6);
-        assertEquals(textbox.getVerticalAlignment(), (short) 6);
-
-        textbox.setMarginBottom(7);
-        assertEquals(textbox.getMarginBottom(), 7);
-
-        textbox.setMarginLeft(8);
-        assertEquals(textbox.getMarginLeft(), 8);
-
-        textbox.setMarginRight(9);
-        assertEquals(textbox.getMarginRight(), 9);
-
-        textbox.setMarginTop(10);
-        assertEquals(textbox.getMarginTop(), 10);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-        textbox = (HSSFTextbox) patriarch.getChildren().get(0);
-        assertEquals(textbox.getString().getString(), "test");
-        assertEquals(textbox.getHorizontalAlignment(), 5);
-        assertEquals(textbox.getVerticalAlignment(), (short) 6);
-        assertEquals(textbox.getMarginBottom(), 7);
-        assertEquals(textbox.getMarginLeft(), 8);
-        assertEquals(textbox.getMarginRight(), 9);
-        assertEquals(textbox.getMarginTop(), 10);
-
-        textbox.setString(new HSSFRichTextString("test1"));
-        textbox.setHorizontalAlignment(HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
-        textbox.setVerticalAlignment(HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
-        textbox.setMarginBottom(71);
-        textbox.setMarginLeft(81);
-        textbox.setMarginRight(91);
-        textbox.setMarginTop(101);
-
-        assertEquals(textbox.getString().getString(), "test1");
-        assertEquals(textbox.getHorizontalAlignment(), HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
-        assertEquals(textbox.getVerticalAlignment(), HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
-        assertEquals(textbox.getMarginBottom(), 71);
-        assertEquals(textbox.getMarginLeft(), 81);
-        assertEquals(textbox.getMarginRight(), 91);
-        assertEquals(textbox.getMarginTop(), 101);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-        sh = wb3.getSheetAt(0);
-        patriarch = sh.getDrawingPatriarch();
-        textbox = (HSSFTextbox) patriarch.getChildren().get(0);
-
-        assertEquals(textbox.getString().getString(), "test1");
-        assertEquals(textbox.getHorizontalAlignment(), HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
-        assertEquals(textbox.getVerticalAlignment(), HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
-        assertEquals(textbox.getMarginBottom(), 71);
-        assertEquals(textbox.getMarginLeft(), 81);
-        assertEquals(textbox.getMarginRight(), 91);
-        assertEquals(textbox.getMarginTop(), 101);
-        
-        wb3.close();
-    }
-
-    @Test
-    public void testExistingFileWithText() throws Exception {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
-        HSSFSheet sheet = wb.getSheet("text");
-        HSSFPatriarch drawing = sheet.getDrawingPatriarch();
-        assertEquals(1, drawing.getChildren().size());
-        HSSFTextbox textbox = (HSSFTextbox) drawing.getChildren().get(0);
-        assertEquals(textbox.getHorizontalAlignment(), HSSFTextbox.HORIZONTAL_ALIGNMENT_LEFT);
-        assertEquals(textbox.getVerticalAlignment(), HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
-        assertEquals(textbox.getMarginTop(), 0);
-        assertEquals(textbox.getMarginBottom(), 3600000);
-        assertEquals(textbox.getMarginLeft(), 3600000);
-        assertEquals(textbox.getMarginRight(), 0);
-        assertEquals(textbox.getString().getString(), "teeeeesssstttt");
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
deleted file mode 100644
index a059a02..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * @author aviks
- * 
- * This testcase contains tests for bugs that are yet to be fixed. Therefore,
- * the standard ant test target does not run these tests. Run this testcase with
- * the single-test target. The names of the tests usually correspond to the
- * Bugzilla id's PLEASE MOVE tests from this class to TestBugs once the bugs are
- * fixed, so that they are then run automatically.
- */
-public final class TestUnfixedBugs {
-
-    @Test
-	public void test43493() {
-		// Has crazy corrupt sub-records on
-		// a EmbeddedObjectRefSubRecord
-		try {
-			HSSFTestDataSamples.openSampleWorkbook("43493.xls");
-		} catch (RecordFormatException e) {
-			if (e.getCause().getCause() instanceof ArrayIndexOutOfBoundsException) {
-				throw new AssertionFailedError("Identified bug 43493");
-			}
-			throw e;
-		}
-	}
-
-	/**
-	 * Note - some parts of this bug have been fixed, and have been
-	 * transfered over to {@link TestBugs#bug49612_part()}
-	 */
-    @Test
-    public void test49612() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49612.xls");
-        HSSFSheet sh = wb.getSheetAt(0);
-        HSSFRow row = sh.getRow(0);
-        HSSFCell c1 = row.getCell(2);
-        HSSFCell d1 = row.getCell(3);
-        HSSFCell e1 = row.getCell(2);
-
-        assertEquals("SUM(BOB+JIM)", c1.getCellFormula());
-
-        // Problem 1: Filename missing, see bug #56742
-        assertEquals("SUM('49612.xls'!BOB+'49612.xls'!JIM)", d1.getCellFormula());
-
-        //Problem 2: Filename missing, see bug #56742
-        //junit.framework.ComparisonFailure:
-        //Expected :SUM('49612.xls'!BOB+'49612.xls'!JIM)
-        //Actual   :SUM(BOB+JIM)
-        assertEquals("SUM('49612.xls'!BOB+'49612.xls'!JIM)", e1.getCellFormula());
-        
-        // Problem 3 - fixed and transfered
-        wb.close();
-    }
-
-    @Test
-    public void testFormulaRecordAggregate_1() throws Exception {
-        // fails at formula "=MEHRFACH.OPERATIONEN(E$3;$B$5;$D4)"
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("44958_1.xls");
-        try {
-            for(int i = 0;i < wb.getNumberOfSheets();i++) {
-                Sheet sheet = wb.getSheetAt(i);
-                assertNotNull(wb.getSheet(sheet.getSheetName()));
-                sheet.groupColumn((short) 4, (short) 5);
-                sheet.setColumnGroupCollapsed(4, true);
-                sheet.setColumnGroupCollapsed(4, false);
-                
-                for(Row row : sheet) {
-                    for(Cell cell : row) {
-                        try {
-                            cell.toString();
-                        } catch (Exception e) {
-                            throw new Exception("While handling: " + sheet.getSheetName() + "/" + row.getRowNum() + "/" + cell.getColumnIndex(), e);
-                        }
-                    }
-                }
-            }
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testFormulaRecordAggregate() throws Exception {
-        // fails at formula "=MEHRFACH.OPERATIONEN(E$3;$B$5;$D4)"
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("44958.xls");
-        try {
-            for(int i = 0;i < wb.getNumberOfSheets();i++) {
-                Sheet sheet = wb.getSheetAt(i);
-                assertNotNull(wb.getSheet(sheet.getSheetName()));
-                sheet.groupColumn((short) 4, (short) 5);
-                sheet.setColumnGroupCollapsed(4, true);
-                sheet.setColumnGroupCollapsed(4, false);
-                
-                for(Row row : sheet) {
-                    for(Cell cell : row) {
-                        try {
-                            cell.toString();
-                        } catch (Exception e) {
-                            throw new Exception("While handling: " + sheet.getSheetName() + "/" + row.getRowNum() + "/" + cell.getColumnIndex(), e);
-                        }
-                    }
-                }
-            } 
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testBug57074() throws IOException {
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("57074.xls");
-        Sheet sheet = wb.getSheet("Sheet1");
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell(0);
-        
-        HSSFColor bgColor = (HSSFColor) cell.getCellStyle().getFillBackgroundColorColor();
-        String bgColorStr = bgColor.getTriplet()[0]+", "+bgColor.getTriplet()[1]+", "+bgColor.getTriplet()[2];
-        //System.out.println(bgColorStr);
-        assertEquals("215, 228, 188", bgColorStr);
-
-        HSSFColor fontColor = (HSSFColor) cell.getCellStyle().getFillForegroundColorColor();
-        String fontColorStr = fontColor.getTriplet()[0]+", "+fontColor.getTriplet()[1]+", "+fontColor.getTriplet()[2];
-        //System.out.println(fontColorStr);
-        assertEquals("0, 128, 128", fontColorStr);
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
deleted file mode 100644
index b0efff9..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-
-public final class TestUnicodeWorkbook extends TestCase {
-
-    /**
-     *  Tests Bug38230
-     *  That a Umlat is written  and then read back.
-     *  It should have been written as a compressed unicode.
-     */
-    public void testUmlatReadWrite() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-
-        //Create a unicode sheet name (euro symbol)
-        HSSFSheet s = wb.createSheet("test");
-
-        HSSFRow r = s.createRow(0);
-        HSSFCell c = r.createCell(1);
-        c.setCellValue(new HSSFRichTextString("\u00e4"));
-
-        //Confirm that the sring will be compressed
-        assertEquals(c.getRichStringCellValue().getUnicodeString().getOptionFlags(), 0);
-
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-
-        //Test the sheetname
-        s = wb.getSheet("test");
-        assertNotNull(s);
-
-        c = r.getCell(1);
-        assertEquals(c.getRichStringCellValue().getString(), "\u00e4");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java b/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
deleted file mode 100644
index 347fb21..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
+++ /dev/null
@@ -1,682 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.BackupRecord;
-import org.apache.poi.hssf.record.LabelSSTRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
-
-/**
- * Class to test Workbook functionality
- */
-public final class TestWorkbook {
-    private static final String LAST_NAME_KEY        = "lastName";
-    private static final String FIRST_NAME_KEY       = "firstName";
-    private static final String SSN_KEY              = "ssn";
-    private static final String REPLACE_ME           = "replaceMe";
-    private static final String REPLACED             = "replaced";
-    private static final String DO_NOT_REPLACE       = "doNotReplace";
-    private static final String EMPLOYEE_INFORMATION = "Employee Info";
-    private static final String LAST_NAME_VALUE      = "Bush";
-    private static final String FIRST_NAME_VALUE     = "George";
-    private static final String SSN_VALUE            = "555555555";
-    private final SanityChecker sanityChecker = new SanityChecker();
-
-
-    private static HSSFWorkbook openSample(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleWorkbook(sampleFileName);
-    }
-
-    /**
-     * TEST NAME:  Test Write Sheet Simple <P>
-     * OBJECTIVE:  Test that HSSF can create a simple spreadsheet with numeric and string values.<P>
-     * SUCCESS:    HSSF creates a sheet.  Filesize matches a known good.  HSSFSheet objects
-     *             Last row, first row is tested against the correct values (99,0).<P>
-     * FAILURE:    HSSF does not create a sheet or excepts.  Filesize does not match the known good.
-     *             HSSFSheet last row or first row is incorrect.             <P>
-     */
-    @Test
-    public void testWriteSheetSimple() throws IOException {
-        HSSFWorkbook wb1  = new HSSFWorkbook();
-        HSSFSheet s = wb1.createSheet();
-
-        for (int rownum = 0; rownum < 100; rownum++) {
-            HSSFRow r = s.createRow(rownum);
-
-            for (int cellnum = 0; cellnum < 50; cellnum += 2) {
-                HSSFCell c = r.createCell(cellnum);
-                c.setCellValue(rownum * 10000 + cellnum
-                               + ((( double ) rownum / 1000)
-                                  + (( double ) cellnum / 10000)));
-                c = r.createCell(cellnum + 1);
-                c.setCellValue(new HSSFRichTextString("TEST"));
-            }
-        }
-        
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        
-        sanityChecker.checkHSSFWorkbook(wb1);
-        assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
-        assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
-
-        sanityChecker.checkHSSFWorkbook(wb2);
-        s = wb2.getSheetAt(0);
-        assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
-        assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * TEST NAME:  Test Write/Modify Sheet Simple <P>
-     * OBJECTIVE:  Test that HSSF can create a simple spreadsheet with numeric and string values,
-     *             remove some rows, yet still have a valid file/data.<P>
-     * SUCCESS:    HSSF creates a sheet.  Filesize matches a known good.  HSSFSheet objects
-     *             Last row, first row is tested against the correct values (74,25).<P>
-     * FAILURE:    HSSF does not create a sheet or excepts.  Filesize does not match the known good.
-     *             HSSFSheet last row or first row is incorrect.             <P>
-     */
-    @Test
-    public void testWriteModifySheetSimple() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet s = wb1.createSheet();
-
-        for (int rownum = 0; rownum < 100; rownum++) {
-            HSSFRow r = s.createRow(rownum);
-
-            for (int cellnum = 0; cellnum < 50; cellnum += 2) {
-                HSSFCell c = r.createCell(cellnum);
-                c.setCellValue(rownum * 10000 + cellnum
-                               + ((( double ) rownum / 1000)
-                                  + (( double ) cellnum / 10000)));
-                c = r.createCell(cellnum + 1);
-                c.setCellValue(new HSSFRichTextString("TEST"));
-            }
-        }
-        for (int rownum = 0; rownum < 25; rownum++) {
-            HSSFRow r = s.getRow(rownum);
-            s.removeRow(r);
-        }
-        for (int rownum = 75; rownum < 100; rownum++) {
-            HSSFRow r = s.getRow(rownum);
-            s.removeRow(r);
-        }
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        
-        sanityChecker.checkHSSFWorkbook(wb1);
-        assertEquals("LAST ROW == 74", 74, s.getLastRowNum());
-        assertEquals("FIRST ROW == 25", 25, s.getFirstRowNum());
-
-        sanityChecker.checkHSSFWorkbook(wb2);
-        s = wb2.getSheetAt(0);
-        assertEquals("LAST ROW == 74", 74, s.getLastRowNum());
-        assertEquals("FIRST ROW == 25", 25, s.getFirstRowNum());
-    
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * TEST NAME:  Test Read Simple <P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet (Simple.xls).<P>
-     * SUCCESS:    HSSF reads the sheet.  Matches values in their particular positions.<P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF cannot identify values
-     *             in the sheet in their known positions.<P>
-     */
-    @Test
-    public void testReadSimple() throws IOException {
-        HSSFWorkbook wb = openSample("Simple.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        HSSFCell cell = sheet.getRow(0).getCell(0);
-        assertEquals(REPLACE_ME, cell .getRichStringCellValue().getString());
-        wb.close();
-    }
-
-    /**
-     * TEST NAME:  Test Read Simple w/ Data Format<P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet (SimpleWithDataFormat.xls).<P>
-     * SUCCESS:    HSSF reads the sheet.  Matches values in their particular positions and format is correct<P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF cannot identify values
-     *             in the sheet in their known positions.<P>
-     */
-    @Test
-    public void testReadSimpleWithDataFormat() throws IOException {
-        HSSFWorkbook wb = openSample("SimpleWithDataFormat.xls");
-        HSSFSheet       sheet    = wb.getSheetAt(0);
-        HSSFDataFormat  format   = wb.createDataFormat();
-        HSSFCell cell = sheet.getRow(0).getCell(0);
-
-        assertEquals(1.25,cell.getNumericCellValue(), 1e-10);
-
-        assertEquals(format.getFormat(cell.getCellStyle().getDataFormat()), "0.0");
-        
-        wb.close();
-    }
-
-/**
-     * TEST NAME:  Test Read/Write Simple w/ Data Format<P>
-     * OBJECTIVE:  Test that HSSF can write a sheet with custom data formats and then read it and get the proper formats.<P>
-     * SUCCESS:    HSSF reads the sheet.  Matches values in their particular positions and format is correct<P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF cannot identify values
-     *             in the sheet in their known positions.<P>
-     */
-    @Test
-    public void testWriteDataFormat() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet s1 = wb1.createSheet();
-        HSSFDataFormat format = wb1.createDataFormat();
-        HSSFCellStyle cs = wb1.createCellStyle();
-
-        short df = format.getFormat("0.0");
-        cs.setDataFormat(df);
-
-        HSSFCell c1 = s1.createRow(0).createCell(0);
-        c1.setCellStyle(cs);
-        c1.setCellValue(1.25);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        HSSFSheet s2 = wb2.getSheetAt(0);
-        HSSFCell c2 = s2.getRow(0).getCell(0);
-        format = wb2.createDataFormat();
-
-        assertEquals(1.25, c2.getNumericCellValue(), 1e-10);
-
-        assertEquals(format.getFormat(df), "0.0");
-
-        assertEquals(format, wb2.createDataFormat());
-
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * TEST NAME:  Test Read Employee Simple <P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet (Employee.xls).<P>
-     * SUCCESS:    HSSF reads the sheet.  Matches values in their particular positions.<P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF cannot identify values
-     *             in the sheet in their known positions.<P>
-     *
-     */
-    @Test
-    public void testReadEmployeeSimple() throws IOException {
-        HSSFWorkbook wb = openSample("Employee.xls");
-        HSSFSheet sheet = wb.getSheetAt(0);
-
-        assertEquals(EMPLOYEE_INFORMATION, sheet.getRow(1).getCell(1).getRichStringCellValue().getString());
-        assertEquals(LAST_NAME_KEY, sheet.getRow(3).getCell(2).getRichStringCellValue().getString());
-        assertEquals(FIRST_NAME_KEY, sheet.getRow(4).getCell(2).getRichStringCellValue().getString());
-        assertEquals(SSN_KEY, sheet.getRow(5).getCell(2).getRichStringCellValue().getString());
-        
-        wb.close();
-    }
-
-    /**
-     * TEST NAME:  Test Modify Sheet Simple <P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet with a string value and replace
-     *             it with another string value.<P>
-     * SUCCESS:    HSSF reads a sheet.  HSSF replaces the cell value with another cell value. HSSF
-     *             writes the sheet out to another file.  HSSF reads the result and ensures the value
-     *             has been properly replaced.    <P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF does not write the sheet or excepts.
-     *             HSSF does not re-read the sheet or excepts.  Upon re-reading the sheet the value
-     *             is incorrect or has not been replaced. <P>
-     */
-    @Test
-    public void testModifySimple() throws IOException {
-        HSSFWorkbook wb1 = openSample("Simple.xls");
-        HSSFSheet sheet = wb1.getSheetAt(0);
-        HSSFCell cell = sheet.getRow(0).getCell(0);
-
-        cell.setCellValue(new HSSFRichTextString(REPLACED));
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        sheet    = wb2.getSheetAt(0);
-        cell     = sheet.getRow(0).getCell(0);
-        assertEquals(REPLACED, cell.getRichStringCellValue().getString());
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * TEST NAME:  Test Modify Sheet Simple With Skipped cells<P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet with string values and replace
-     *             them with other string values while not replacing other cells.<P>
-     * SUCCESS:    HSSF reads a sheet.  HSSF replaces the cell value with another cell value. HSSF
-     *             writes the sheet out to another file.  HSSF reads the result and ensures the value
-     *             has been properly replaced and unreplaced values are still unreplaced.    <P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF does not write the sheet or excepts.
-     *             HSSF does not re-read the sheet or excepts.  Upon re-reading the sheet the value
-     *             is incorrect or has not been replaced or the incorrect cell has its value replaced
-     *             or is incorrect. <P>
-     */
-    @Test
-    public void testModifySimpleWithSkip() throws IOException {
-        HSSFWorkbook wb1 = openSample("SimpleWithSkip.xls");
-        HSSFSheet sheet = wb1.getSheetAt(0);
-        HSSFCell cell = sheet.getRow(0).getCell(1);
-
-        cell.setCellValue(new HSSFRichTextString(REPLACED));
-        cell = sheet.getRow(1).getCell(0);
-        cell.setCellValue(new HSSFRichTextString(REPLACED));
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-
-        sheet    = wb2.getSheetAt(0);
-        cell     = sheet.getRow(0).getCell(1);
-        assertEquals(REPLACED, cell.getRichStringCellValue().getString());
-        cell = sheet.getRow(0).getCell(0);
-        assertEquals(DO_NOT_REPLACE, cell.getRichStringCellValue().getString());
-        cell = sheet.getRow(1).getCell(0);
-        assertEquals(REPLACED, cell.getRichStringCellValue().getString());
-        cell = sheet.getRow(1).getCell(1);
-        assertEquals(DO_NOT_REPLACE, cell.getRichStringCellValue().getString());
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * TEST NAME:  Test Modify Sheet With Styling<P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet with string values and replace
-     *             them with other string values despite any styling.  In this release of HSSF styling will
-     *             probably be lost and is NOT tested.<P>
-     * SUCCESS:    HSSF reads a sheet.  HSSF replaces the cell values with other cell values. HSSF
-     *             writes the sheet out to another file.  HSSF reads the result and ensures the value
-     *             has been properly replaced.    <P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF does not write the sheet or excepts.
-     *             HSSF does not re-read the sheet or excepts.  Upon re-reading the sheet the value
-     *             is incorrect or has not been replaced. <P>
-     */
-    @Test
-    public void testModifySimpleWithStyling() throws IOException {
-        HSSFWorkbook wb1 = openSample("SimpleWithStyling.xls");
-        HSSFSheet  sheet = wb1.getSheetAt(0);
-
-        for (int k = 0; k < 4; k++) {
-            HSSFCell cell = sheet.getRow(k).getCell(0);
-            cell.setCellValue(new HSSFRichTextString(REPLACED));
-        }
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        sheet    = wb2.getSheetAt(0);
-        for (int k = 0; k < 4; k++) {
-            HSSFCell cell = sheet.getRow(k).getCell(0);
-            assertEquals(REPLACED, cell.getRichStringCellValue().getString());
-        }
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * TEST NAME:  Test Modify Employee Sheet<P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet with string values and replace
-     *             them with other string values despite any styling.  In this release of HSSF styling will
-     *             probably be lost and is NOT tested.<P>
-     * SUCCESS:    HSSF reads a sheet.  HSSF replaces the cell values with other cell values. HSSF
-     *             writes the sheet out to another file.  HSSF reads the result and ensures the value
-     *             has been properly replaced.    <P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF does not write the sheet or excepts.
-     *             HSSF does not re-read the sheet or excepts.  Upon re-reading the sheet the value
-     *             is incorrect or has not been replaced. <P>
-     */
-    @Test
-    public void testModifyEmployee() throws IOException {
-        HSSFWorkbook wb1 = openSample("Employee.xls");
-        HSSFSheet  sheet = wb1.getSheetAt(0);
-        HSSFCell    cell = sheet.getRow(3).getCell(2);
-
-        cell.setCellValue(new HSSFRichTextString(LAST_NAME_VALUE));
-        cell = sheet.getRow(4).getCell(2);
-        cell.setCellValue(new HSSFRichTextString(FIRST_NAME_VALUE));
-        cell = sheet.getRow(5).getCell(2);
-        cell.setCellValue(new HSSFRichTextString(SSN_VALUE));
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        sheet = wb2.getSheetAt(0);
-        assertEquals(EMPLOYEE_INFORMATION, sheet.getRow(1).getCell(1).getRichStringCellValue().getString());
-        assertEquals(LAST_NAME_VALUE, sheet.getRow(3).getCell(2).getRichStringCellValue().getString());
-        assertEquals(FIRST_NAME_VALUE, sheet.getRow(4).getCell(2).getRichStringCellValue().getString());
-        assertEquals(SSN_VALUE, sheet.getRow(5).getCell(2).getRichStringCellValue().getString());
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * TEST NAME:  Test Read Sheet with an RK number<P>
-     * OBJECTIVE:  Test that HSSF can read a simple spreadsheet with and RKRecord and correctly
-     *             identify the cell as numeric and convert it to a NumberRecord.  <P>
-     * SUCCESS:    HSSF reads a sheet.  HSSF returns that the cell is a numeric type cell.    <P>
-     * FAILURE:    HSSF does not read a sheet or excepts.  HSSF incorrectly identifies the cell<P>
-     */
-    @Test
-    public void testReadSheetWithRK() throws IOException {
-        HSSFWorkbook wb = openSample("rk.xls");
-        HSSFSheet    s  = wb.getSheetAt(0);
-        HSSFCell     c  = s.getRow(0).getCell(0);
-
-        assertEquals(CellType.NUMERIC, c.getCellTypeEnum());
-        
-        wb.close();
-    }
-
-    /**
-     * TEST NAME:  Test Write/Modify Sheet Simple <P>
-     * OBJECTIVE:  Test that HSSF can create a simple spreadsheet with numeric and string values,
-     *             remove some rows, yet still have a valid file/data.<P>
-     * SUCCESS:    HSSF creates a sheet.  Filesize matches a known good.  HSSFSheet objects
-     *             Last row, first row is tested against the correct values (74,25).<P>
-     * FAILURE:    HSSF does not create a sheet or excepts.  Filesize does not match the known good.
-     *             HSSFSheet last row or first row is incorrect.             <P>
-     */
-    @Test
-    public void testWriteModifySheetMerged() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet    s   = wb1.createSheet();
-
-        for (int rownum = 0; rownum < 100; rownum++) {
-            HSSFRow r = s.createRow(rownum);
-
-            for (int cellnum = 0; cellnum < 50; cellnum += 2) {
-                HSSFCell c = r.createCell(cellnum);
-                c.setCellValue(rownum * 10000 + cellnum
-                               + ((( double ) rownum / 1000)
-                                  + (( double ) cellnum / 10000)));
-                c = r.createCell(cellnum + 1);
-                c.setCellValue(new HSSFRichTextString("TEST"));
-            }
-        }
-        s.addMergedRegion(new CellRangeAddress(0, 10, 0, 10));
-        s.addMergedRegion(new CellRangeAddress(30, 40, 5, 15));
-        sanityChecker.checkHSSFWorkbook(wb1);
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-
-        s  = wb2.getSheetAt(0);
-        CellRangeAddress r1 = s.getMergedRegion(0);
-        CellRangeAddress r2 = s.getMergedRegion(1);
-
-        confirmRegion(new CellRangeAddress(0, 10, 0, 10), r1);
-        confirmRegion(new CellRangeAddress(30, 40,5, 15), r2);
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    private static void confirmRegion(CellRangeAddress ra, CellRangeAddress rb) {
-        assertEquals(ra.getFirstRow(), rb.getFirstRow());
-        assertEquals(ra.getLastRow(), rb.getLastRow());
-        assertEquals(ra.getFirstColumn(), rb.getFirstColumn());
-        assertEquals(ra.getLastColumn(), rb.getLastColumn());
-    }
-
-    /**
-     * Test the backup field gets set as expected.
-     * @throws IOException 
-     */
-    @Test
-    public void testBackupRecord() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-		wb.createSheet();
-		InternalWorkbook workbook = wb.getWorkbook();
-        BackupRecord record   = workbook.getBackupRecord();
-
-        assertEquals(0, record.getBackup());
-        assertFalse(wb.getBackupFlag());
-        wb.setBackupFlag(true);
-        assertEquals(1, record.getBackup());
-        assertTrue(wb.getBackupFlag());
-        wb.setBackupFlag(false);
-        assertEquals(0, record.getBackup());
-        assertFalse(wb.getBackupFlag());
-        
-        wb.close();
-    }
-
-    private static final class RecordCounter implements RecordVisitor {
-        private int _count;
-
-        public RecordCounter() {
-            _count=0;
-        }
-        public int getCount() {
-            return _count;
-        }
-        @Override
-        public void visitRecord(Record r) {
-            if (r instanceof LabelSSTRecord) {
-                _count++;
-            }
-        }
-    }
-
-    /**
-     * This tests is for bug [ #506658 ] Repeating output.
-     *
-     * We need to make sure only one LabelSSTRecord is produced.
-     * @throws IOException 
-     */
-    @Test
-    public void testRepeatingBug() throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet    sheet    = workbook.createSheet("Design Variants");
-        HSSFRow      row      = sheet.createRow(2);
-        HSSFCell     cell     = row.createCell(1);
-
-        cell.setCellValue(new HSSFRichTextString("Class"));
-        cell = row.createCell(2);
-
-        RecordCounter rc = new RecordCounter();
-        sheet.getSheet().visitContainedRecords(rc, 0);
-        assertEquals(1, rc.getCount());
-        
-        workbook.close();
-    }
-
-
-    /**
-     * Test for row indexes beyond {@link Short#MAX_VALUE}.
-     * This bug was first fixed in svn r352609.
-     */
-    @Test
-    public void testRowIndexesBeyond32768() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        HSSFRow row;
-        HSSFCell cell;
-        for (int i = 32700; i < 32771; i++) {
-            row = sheet.createRow(i);
-            cell = row.createCell(0);
-            cell.setCellValue(i);
-        }
-        sanityChecker.checkHSSFWorkbook(wb1);
-        assertEquals("LAST ROW == 32770", 32770, sheet.getLastRowNum());
-        cell = sheet.getRow(32770).getCell(0);
-        double lastVal = cell.getNumericCellValue();
-
-        HSSFWorkbook    wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        HSSFSheet       s    = wb2.getSheetAt(0);
-        row = s.getRow(32770);
-        cell = row.getCell(0);
-        assertEquals("Value from last row == 32770", lastVal, cell.getNumericCellValue(), 0);
-        assertEquals("LAST ROW == 32770", 32770, s.getLastRowNum());
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Generate a file to verify repeating rows and cols made it
-     */
-    @Test
-    public void testRepeatingColsRows() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet("Test Print Titles");
-
-        HSSFRow row = sheet.createRow(0);
-
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue(new HSSFRichTextString("hi"));
-
-        CellRangeAddress cra = CellRangeAddress.valueOf("A1:B1");
-        sheet.setRepeatingColumns(cra);
-        sheet.setRepeatingRows(cra);
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        sheet = wb2.getSheetAt(0);
-        assertEquals("A:B", sheet.getRepeatingColumns().formatAsString());
-        assertEquals("1:1", sheet.getRepeatingRows().formatAsString());
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Test setRepeatingRowsAndColumns when startRow and startColumn are -1.
-     */
-    @Test
-    public void testRepeatingColsRowsMinusOne() throws IOException
-    {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet("Test Print Titles");
-
-        HSSFRow row = sheet.createRow(0);
-
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue(new HSSFRichTextString("hi"));
-        CellRangeAddress cra = new CellRangeAddress(-1, 1, -1, 1);
-        try {
-            sheet.setRepeatingColumns(cra);
-            fail("invalid start index is ignored");
-        } catch (IllegalArgumentException e) {}
-        
-        try {
-            sheet.setRepeatingRows(cra);
-            fail("invalid start index is ignored");
-        } catch (IllegalArgumentException e) {}
-
-        sheet.setRepeatingColumns(null);
-        sheet.setRepeatingRows(null);
-        
-        HSSFTestDataSamples.writeOutAndReadBack(workbook).close();
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testAddMergedRegionWithRegion() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet    s   = wb1.createSheet();
-
-        for (int rownum = 0; rownum < 100; rownum++) {
-            HSSFRow r = s.createRow(rownum);
-
-            for (int cellnum = 0; cellnum < 50; cellnum += 2) {
-                HSSFCell c = r.createCell(cellnum);
-                c.setCellValue(rownum * 10000 + cellnum
-                               + ((( double ) rownum / 1000)
-                                  + (( double ) cellnum / 10000)));
-                c = r.createCell(cellnum + 1);
-                c.setCellValue(new HSSFRichTextString("TEST"));
-            }
-        }
-        s.addMergedRegion(new CellRangeAddress(0, 10, 0, 10));
-        s.addMergedRegion(new CellRangeAddress(30, 40, 5, 15));
-        sanityChecker.checkHSSFWorkbook(wb1);
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-
-        s  = wb2.getSheetAt(0);
-        CellRangeAddress r1 = s.getMergedRegion(0);
-        CellRangeAddress r2 = s.getMergedRegion(1);
-
-        confirmRegion(new CellRangeAddress(0, 10, 0, 10), r1);
-        confirmRegion(new CellRangeAddress(30, 40,5, 15), r2);
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    @Test
-    public void testBug58085RemoveSheetWithNames() throws Exception {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        Sheet sheet1 = wb1.createSheet("sheet1");
-        Sheet sheet2 = wb1.createSheet("sheet2");
-        Sheet sheet3 = wb1.createSheet("sheet3");
-
-        sheet1.createRow(0).createCell((short) 0).setCellValue("val1");
-        sheet2.createRow(0).createCell((short) 0).setCellValue("val2");
-        sheet3.createRow(0).createCell((short) 0).setCellValue("val3");
-        
-        Name namedCell1 = wb1.createName();
-        namedCell1.setNameName("name1");
-        String reference1 = "sheet1!$A$1";
-        namedCell1.setRefersToFormula(reference1);
-        
-        Name namedCell2= wb1.createName();
-        namedCell2.setNameName("name2");
-        String reference2 = "sheet2!$A$1";
-        namedCell2.setRefersToFormula(reference2);
-
-        Name namedCell3 = wb1.createName();
-        namedCell3.setNameName("name3");
-        String reference3 = "sheet3!$A$1";
-        namedCell3.setRefersToFormula(reference3);
-
-        Workbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        Name nameCell = wb2.getName("name1");
-        assertEquals("sheet1!$A$1", nameCell.getRefersToFormula());
-        nameCell = wb2.getName("name2");
-        assertEquals("sheet2!$A$1", nameCell.getRefersToFormula());
-        nameCell = wb2.getName("name3");
-        assertEquals("sheet3!$A$1", nameCell.getRefersToFormula());
-        
-        wb2.removeSheetAt(wb2.getSheetIndex("sheet1"));
-        
-        nameCell = wb2.getName("name1");
-        assertEquals("#REF!$A$1", nameCell.getRefersToFormula());
-        nameCell = wb2.getName("name2");
-        assertEquals("sheet2!$A$1", nameCell.getRefersToFormula());
-        nameCell = wb2.getName("name3");
-        assertEquals("sheet3!$A$1", nameCell.getRefersToFormula());
-        
-        wb2.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/util/AllHSSFUtilTests.java b/trunk/src/testcases/org/apache/poi/hssf/util/AllHSSFUtilTests.java
deleted file mode 100644
index 6faba78..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/util/AllHSSFUtilTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Collects all tests for org.apache.poi.hssf.util.
- * 
- * @author Josh Micich
- */
-public class AllHSSFUtilTests {
-	
-	public static Test suite() {
-		TestSuite result = new TestSuite(AllHSSFUtilTests.class.getName());
-		result.addTestSuite(TestAreaReference.class);
-		// result.addTestSuite(TestCellReference.class); //converted to junit4
-		result.addTestSuite(TestHSSFColor.class);
-		result.addTestSuite(TestRKUtil.class);
-		return result;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java b/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java
deleted file mode 100644
index 4bc3d07..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.UnionPtg;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFName;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.TestHSSFWorkbook;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-/**
- *
- */
-public final class TestAreaReference extends TestCase {
-
-    public void testAreaRef1() {
-        AreaReference ar = new AreaReference("$A$1:$B$2");
-        assertFalse("Two cells expected", ar.isSingleCell());
-        CellReference cf = ar.getFirstCell();
-        assertTrue("row is 4",cf.getRow()==0);
-        assertTrue("col is 1",cf.getCol()==0);
-        assertTrue("row is abs",cf.isRowAbsolute());
-        assertTrue("col is abs",cf.isColAbsolute());
-        assertTrue("string is $A$1",cf.formatAsString().equals("$A$1"));
-
-        cf = ar.getLastCell();
-        assertTrue("row is 4",cf.getRow()==1);
-        assertTrue("col is 1",cf.getCol()==1);
-        assertTrue("row is abs",cf.isRowAbsolute());
-        assertTrue("col is abs",cf.isColAbsolute());
-        assertTrue("string is $B$2",cf.formatAsString().equals("$B$2"));
-
-        CellReference[] refs = ar.getAllReferencedCells();
-        assertEquals(4, refs.length);
-
-        assertEquals(0, refs[0].getRow());
-        assertEquals(0, refs[0].getCol());
-        assertNull(refs[0].getSheetName());
-
-        assertEquals(0, refs[1].getRow());
-        assertEquals(1, refs[1].getCol());
-        assertNull(refs[1].getSheetName());
-
-        assertEquals(1, refs[2].getRow());
-        assertEquals(0, refs[2].getCol());
-        assertNull(refs[2].getSheetName());
-
-        assertEquals(1, refs[3].getRow());
-        assertEquals(1, refs[3].getCol());
-        assertNull(refs[3].getSheetName());
-    }
-
-    /**
-     * References failed when sheet names were being used
-     * Reported by Arne.Clauss@gedas.de
-     */
-    public void testReferenceWithSheet() {
-        AreaReference ar;
-
-        ar = new AreaReference("Tabelle1!B5:B5");
-        assertTrue(ar.isSingleCell());
-        TestCellReference.confirmCell(ar.getFirstCell(), "Tabelle1", 4, 1, false, false, "Tabelle1!B5");
-
-        assertEquals(1, ar.getAllReferencedCells().length);
-
-
-        ar = new AreaReference("Tabelle1!$B$5:$B$7");
-        assertFalse(ar.isSingleCell());
-
-        TestCellReference.confirmCell(ar.getFirstCell(), "Tabelle1", 4, 1, true, true, "Tabelle1!$B$5");
-        TestCellReference.confirmCell(ar.getLastCell(), "Tabelle1", 6, 1, true, true, "Tabelle1!$B$7");
-
-        // And all that make it up
-        CellReference[] allCells = ar.getAllReferencedCells();
-        assertEquals(3, allCells.length);
-        TestCellReference.confirmCell(allCells[0], "Tabelle1", 4, 1, true, true, "Tabelle1!$B$5");
-        TestCellReference.confirmCell(allCells[1], "Tabelle1", 5, 1, true, true, "Tabelle1!$B$6");
-        TestCellReference.confirmCell(allCells[2], "Tabelle1", 6, 1, true, true, "Tabelle1!$B$7");
-    }
-
-    public void testContiguousReferences() {
-        String refSimple = "$C$10:$C$10";
-        String ref2D = "$C$10:$D$11";
-        String refDCSimple = "$C$10:$C$10,$D$12:$D$12,$E$14:$E$14";
-        String refDC2D = "$C$10:$C$11,$D$12:$D$12,$E$14:$E$20";
-        String refDC3D = "Tabelle1!$C$10:$C$14,Tabelle1!$D$10:$D$12";
-
-        // Check that we detect as contiguous properly
-        assertTrue(AreaReference.isContiguous(refSimple));
-        assertTrue(AreaReference.isContiguous(ref2D));
-        assertFalse(AreaReference.isContiguous(refDCSimple));
-        assertFalse(AreaReference.isContiguous(refDC2D));
-        assertFalse(AreaReference.isContiguous(refDC3D));
-
-        // Check we can only create contiguous entries
-        new AreaReference(refSimple);
-        new AreaReference(ref2D);
-        try {
-            new AreaReference(refDCSimple);
-            fail();
-        } catch(IllegalArgumentException e) {
-        	// expected during successful test
-        }
-        try {
-            new AreaReference(refDC2D);
-            fail();
-        } catch(IllegalArgumentException e) {
-        	// expected during successful test
-        }
-        try {
-            new AreaReference(refDC3D);
-            fail();
-        } catch(IllegalArgumentException e) {
-        	// expected during successful test
-        }
-
-        // Test that we split as expected
-        AreaReference[] refs;
-
-        refs = AreaReference.generateContiguous(refSimple);
-        assertEquals(1, refs.length);
-        assertTrue(refs[0].isSingleCell());
-        assertEquals("$C$10", refs[0].formatAsString());
-
-        refs = AreaReference.generateContiguous(ref2D);
-        assertEquals(1, refs.length);
-        assertFalse(refs[0].isSingleCell());
-        assertEquals("$C$10:$D$11", refs[0].formatAsString());
-
-        refs = AreaReference.generateContiguous(refDCSimple);
-        assertEquals(3, refs.length);
-        assertTrue(refs[0].isSingleCell());
-        assertTrue(refs[1].isSingleCell());
-        assertTrue(refs[2].isSingleCell());
-        assertEquals("$C$10", refs[0].formatAsString());
-        assertEquals("$D$12", refs[1].formatAsString());
-        assertEquals("$E$14", refs[2].formatAsString());
-
-        refs = AreaReference.generateContiguous(refDC2D);
-        assertEquals(3, refs.length);
-        assertFalse(refs[0].isSingleCell());
-        assertTrue(refs[1].isSingleCell());
-        assertFalse(refs[2].isSingleCell());
-        assertEquals("$C$10:$C$11", refs[0].formatAsString());
-        assertEquals("$D$12", refs[1].formatAsString());
-        assertEquals("$E$14:$E$20", refs[2].formatAsString());
-
-        refs = AreaReference.generateContiguous(refDC3D);
-        assertEquals(2, refs.length);
-        assertFalse(refs[0].isSingleCell());
-        assertFalse(refs[0].isSingleCell());
-        assertEquals("Tabelle1!$C$10:$C$14", refs[0].formatAsString());
-        assertEquals("Tabelle1!$D$10:$D$12", refs[1].formatAsString());
-        assertEquals("Tabelle1", refs[0].getFirstCell().getSheetName());
-        assertEquals("Tabelle1", refs[0].getLastCell().getSheetName());
-        assertEquals("Tabelle1", refs[1].getFirstCell().getSheetName());
-        assertEquals("Tabelle1", refs[1].getLastCell().getSheetName());
-    }
-
-    public void testDiscontinousReference() throws Exception {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream("44167.xls");
-        HSSFWorkbook wb = new HSSFWorkbook(is);
-        InternalWorkbook workbook = TestHSSFWorkbook.getInternalWorkbook(wb);
-        HSSFEvaluationWorkbook eb = HSSFEvaluationWorkbook.create(wb);
-
-        assertEquals(1, wb.getNumberOfNames());
-        String sheetName = "Tabelle1";
-        String rawRefA = "$C$10:$C$14";
-        String rawRefB = "$C$16:$C$18";
-        String refA = sheetName + "!" + rawRefA;
-        String refB = sheetName + "!" + rawRefB;
-        String ref = refA + "," + refB;
-
-        // Check the low level record
-        NameRecord nr = workbook.getNameRecord(0);
-        assertNotNull(nr);
-        assertEquals("test", nr.getNameText());
-
-        Ptg[] def =nr.getNameDefinition();
-        assertEquals(4, def.length);
-
-        MemFuncPtg ptgA = (MemFuncPtg)def[0];
-        Area3DPtg ptgB = (Area3DPtg)def[1];
-        Area3DPtg ptgC = (Area3DPtg)def[2];
-        UnionPtg ptgD = (UnionPtg)def[3];
-        assertEquals("", ptgA.toFormulaString());
-        assertEquals(refA, ptgB.toFormulaString(eb));
-        assertEquals(refB, ptgC.toFormulaString(eb));
-        assertEquals(",", ptgD.toFormulaString());
-
-        assertEquals(ref, HSSFFormulaParser.toFormulaString(wb, nr.getNameDefinition()));
-
-        // Check the high level definition
-        int idx = wb.getNameIndex("test");
-        assertEquals(0, idx);
-        HSSFName aNamedCell = wb.getNameAt(idx);
-
-        // Should have 2 references
-        assertEquals(ref, aNamedCell.getRefersToFormula());
-
-        // Check the parsing of the reference into cells
-        assertFalse(AreaReference.isContiguous(aNamedCell.getRefersToFormula()));
-        AreaReference[] arefs = AreaReference.generateContiguous(aNamedCell.getRefersToFormula());
-        assertEquals(2, arefs.length);
-        assertEquals(refA, arefs[0].formatAsString());
-        assertEquals(refB, arefs[1].formatAsString());
-
-        for (AreaReference ar : arefs) {
-            confirmResolveCellRef(wb, ar.getFirstCell());
-            confirmResolveCellRef(wb, ar.getLastCell());
-        }
-    }
-
-    private static void confirmResolveCellRef(HSSFWorkbook wb, CellReference cref) {
-        HSSFSheet s = wb.getSheet(cref.getSheetName());
-        HSSFRow r = s.getRow(cref.getRow());
-        HSSFCell c = r.getCell((int)cref.getCol());
-        assertNotNull(c);
-    }
-
-    public void testSpecialSheetNames() {
-        AreaReference ar;
-        ar = new AreaReference("'Sheet A'!A1:A1");
-        confirmAreaSheetName(ar, "Sheet A", "'Sheet A'!A1");
-
-        ar = new AreaReference("'Hey! Look Here!'!A1:A1");
-        confirmAreaSheetName(ar, "Hey! Look Here!", "'Hey! Look Here!'!A1");
-
-        ar = new AreaReference("'O''Toole'!A1:B2");
-        confirmAreaSheetName(ar, "O'Toole", "'O''Toole'!A1:B2");
-
-        ar = new AreaReference("'one:many'!A1:B2");
-        confirmAreaSheetName(ar, "one:many", "'one:many'!A1:B2");
-    }
-
-    private static void confirmAreaSheetName(AreaReference ar, String sheetName, String expectedFullText) {
-        CellReference[] cells = ar.getAllReferencedCells();
-        assertEquals(sheetName, cells[0].getSheetName());
-        assertEquals(expectedFullText, ar.formatAsString());
-    }
-
-    public void testWholeColumnRefs() {
-        confirmWholeColumnRef("A:A", 0, 0, false, false);
-        confirmWholeColumnRef("$C:D", 2, 3, true, false);
-        confirmWholeColumnRef("AD:$AE", 29, 30, false, true);
-    }
-
-    private static void confirmWholeColumnRef(String ref, int firstCol, int lastCol, boolean firstIsAbs, boolean lastIsAbs) {
-        AreaReference ar = new AreaReference(ref);
-        confirmCell(ar.getFirstCell(), 0, firstCol, true, firstIsAbs);
-        confirmCell(ar.getLastCell(), 0xFFFF, lastCol, true, lastIsAbs);
-    }
-
-    private static void confirmCell(CellReference cell, int row, int col, boolean isRowAbs,
-            boolean isColAbs) {
-        assertEquals(row, cell.getRow());
-        assertEquals(col, cell.getCol());
-        assertEquals(isRowAbs, cell.isRowAbsolute());
-        assertEquals(isColAbs, cell.isColAbsolute());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/util/TestCellReference.java b/trunk/src/testcases/org/apache/poi/hssf/util/TestCellReference.java
deleted file mode 100644
index ee08781..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/util/TestCellReference.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.CellReference.NameType;
-import org.apache.poi.ss.SpreadsheetVersion;
-
-/**
- * Tests for the HSSF and SS versions of CellReference.
- * See also {@link org.apache.poi.ss.util.TestCellReference}
- */
-public final class TestCellReference {
-    @Test
-    public void testColNumConversion() {
-        assertEquals(0, CellReference.convertColStringToIndex("A"));
-        assertEquals(1, CellReference.convertColStringToIndex("B"));
-        assertEquals(25, CellReference.convertColStringToIndex("Z"));
-        assertEquals(26, CellReference.convertColStringToIndex("AA"));
-        assertEquals(27, CellReference.convertColStringToIndex("AB"));
-        assertEquals(51, CellReference.convertColStringToIndex("AZ"));
-        assertEquals(701, CellReference.convertColStringToIndex("ZZ"));
-        assertEquals(702, CellReference.convertColStringToIndex("AAA"));
-        assertEquals(18277, CellReference.convertColStringToIndex("ZZZ"));
-        
-        assertEquals("A", CellReference.convertNumToColString(0));
-        assertEquals("B", CellReference.convertNumToColString(1));
-        assertEquals("Z", CellReference.convertNumToColString(25));
-        assertEquals("AA", CellReference.convertNumToColString(26));
-        assertEquals("ZZ", CellReference.convertNumToColString(701));
-        assertEquals("AAA", CellReference.convertNumToColString(702));
-        assertEquals("ZZZ", CellReference.convertNumToColString(18277));
-        
-        // Absolute references are allowed for the string ones
-        assertEquals(0, CellReference.convertColStringToIndex("$A"));
-        assertEquals(25, CellReference.convertColStringToIndex("$Z"));
-        assertEquals(26, CellReference.convertColStringToIndex("$AA"));
-        
-        // $ sign isn't allowed elsewhere though
-        try {
-            CellReference.convertColStringToIndex("A$B$");
-            fail("Column reference is invalid and shouldn't be accepted");
-        } catch (IllegalArgumentException e) {}
-    }
-
-    @Test
-    public void testAbsRef1(){
-        CellReference cf = new CellReference("$B$5");
-        confirmCell(cf, null, 4, 1, true, true, "$B$5");
-    }
-
-    @Test
-    public void  testAbsRef2(){
-        CellReference cf = new CellReference(4,1,true,true);
-        confirmCell(cf, null, 4, 1, true, true, "$B$5");
-    }
-
-    @Test
-    public void  testAbsRef3(){
-        CellReference cf = new CellReference("B$5");
-        confirmCell(cf, null, 4, 1, true, false, "B$5");
-    }
-
-    @Test
-    public void  testAbsRef4(){
-        CellReference cf = new CellReference(4,1,true,false);
-        confirmCell(cf, null, 4, 1, true, false, "B$5");
-    }
-
-    @Test
-    public void  testAbsRef5(){
-        CellReference cf = new CellReference("$B5");
-        confirmCell(cf, null, 4, 1, false, true, "$B5");
-    }
-
-    @Test
-    public void  testAbsRef6(){
-        CellReference cf = new CellReference(4,1,false,true);
-        confirmCell(cf, null, 4, 1, false, true, "$B5");
-    }
-
-    @Test
-    public void  testAbsRef7(){
-        CellReference cf = new CellReference("B5");
-        confirmCell(cf, null, 4, 1, false, false, "B5");
-    }
-
-    @Test
-    public void  testAbsRef8(){
-        CellReference cf = new CellReference(4,1,false,false);
-        confirmCell(cf, null, 4, 1, false, false, "B5");
-    }
-
-    @Test
-    public void testSpecialSheetNames() {
-        CellReference cf;
-        cf = new CellReference("'profit + loss'!A1");
-        confirmCell(cf, "profit + loss", 0, 0, false, false, "'profit + loss'!A1");
-
-        cf = new CellReference("'O''Brien''s Sales'!A1");
-        confirmCell(cf, "O'Brien's Sales", 0, 0, false, false, "'O''Brien''s Sales'!A1");
-
-        cf = new CellReference("'Amazing!'!A1");
-        confirmCell(cf, "Amazing!", 0, 0, false, false, "'Amazing!'!A1");
-    }
-
-    /* package */ static void confirmCell(CellReference cf, String expSheetName, int expRow,
-            int expCol, boolean expIsRowAbs, boolean expIsColAbs, String expText) {
-
-        assertEquals(expSheetName, cf.getSheetName());
-        assertEquals("row index is wrong", expRow, cf.getRow());
-        assertEquals("col index is wrong", expCol, cf.getCol());
-        assertEquals("isRowAbsolute is wrong", expIsRowAbs, cf.isRowAbsolute());
-        assertEquals("isColAbsolute is wrong", expIsColAbs, cf.isColAbsolute());
-        assertEquals("text is wrong", expText, cf.formatAsString());
-    }
-
-    @Test
-    public void testClassifyCellReference() {
-        confirmNameType("a1", NameType.CELL);
-        confirmNameType("pfy1", NameType.NAMED_RANGE);
-        confirmNameType("pf1", NameType.NAMED_RANGE); // (col) out of cell range
-        confirmNameType("fp1", NameType.CELL);
-        confirmNameType("pf$1", NameType.BAD_CELL_OR_NAMED_RANGE);
-        confirmNameType("_A1", NameType.NAMED_RANGE);
-        confirmNameType("A_1", NameType.NAMED_RANGE);
-        confirmNameType("A1_", NameType.NAMED_RANGE);
-        confirmNameType(".A1", NameType.BAD_CELL_OR_NAMED_RANGE);
-        confirmNameType("A.1", NameType.NAMED_RANGE);
-        confirmNameType("A1.", NameType.NAMED_RANGE);
-    }
-
-    @Test
-    public void testClassificationOfRowReferences(){
-        confirmNameType("10", NameType.ROW);
-        confirmNameType("$10", NameType.ROW);
-        confirmNameType("65536", NameType.ROW);
-
-        confirmNameType("65537", NameType.BAD_CELL_OR_NAMED_RANGE);
-        confirmNameType("$100000", NameType.BAD_CELL_OR_NAMED_RANGE);
-        confirmNameType("$1$1", NameType.BAD_CELL_OR_NAMED_RANGE);
-    }
-
-    private void confirmNameType(String ref, NameType expectedResult) {
-        NameType actualResult = CellReference.classifyCellReference(ref, SpreadsheetVersion.EXCEL97);
-        assertEquals(expectedResult, actualResult);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java b/trunk/src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java
deleted file mode 100644
index 319a744..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import java.util.Map;
-
-import junit.framework.TestCase;
-/**
- * @author Nick Burch
- */
-public final class TestHSSFColor extends TestCase {
-	public void testBasics() {
-		assertNotNull(HSSFColor.YELLOW.class);
-		assertTrue(HSSFColor.YELLOW.index > 0);
-		assertTrue(HSSFColor.YELLOW.index2 > 0);
-	}
-	
-	public void testContents() {
-		assertEquals(3, HSSFColor.YELLOW.triplet.length);
-		assertEquals(255, HSSFColor.YELLOW.triplet[0]);
-		assertEquals(255, HSSFColor.YELLOW.triplet[1]);
-		assertEquals(0, HSSFColor.YELLOW.triplet[2]);
-		
-		assertEquals("FFFF:FFFF:0", HSSFColor.YELLOW.hexString);
-	}
-	
-	public void testTrippletHash() {
-		Map<String, HSSFColor> tripplets = HSSFColor.getTripletHash();
-		
-		assertEquals(
-				HSSFColor.MAROON.class,
-				tripplets.get(HSSFColor.MAROON.hexString).getClass()
-		);
-		assertEquals(
-				HSSFColor.YELLOW.class,
-				tripplets.get(HSSFColor.YELLOW.hexString).getClass()
-		);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java b/trunk/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java
deleted file mode 100644
index 5b84577..0000000
--- a/trunk/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.util;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests the {@link RKUtil} class.
- */
-public final class TestRKUtil extends TestCase {
-
-	/**
-	 * Check we can decode correctly.
-	 */
-	public void testDecode() {
-
-		int[] values = { 1074266112, 1081384961, 1081397249, 
-				0x3FF00000, 0x405EC001, 0x02F1853A, 0x02F1853B, 0xFCDD699A,
-		};
-		double[] rvalues = { 3.0, 3.3, 3.33,
-				1, 1.23, 12345678, 123456.78, -13149594, 
-		};
-
-		for (int j = 0; j < values.length; j++) {
-
-			int intBits = values[j];
-			double expectedValue = rvalues[j];
-			double actualValue = RKUtil.decodeNumber(intBits);
-			if (expectedValue != actualValue) {
-				throw new AssertionFailedError("0x" + Integer.toHexString(intBits)
-						+ " should decode to " + expectedValue + " but got " + actualValue);
-			}
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/AllPOIFSTests.java b/trunk/src/testcases/org/apache/poi/poifs/AllPOIFSTests.java
deleted file mode 100644
index a50bfe6..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/AllPOIFSTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs;
-
-import org.apache.poi.poifs.eventfilesystem.TestPOIFSReaderRegistry;
-import org.apache.poi.poifs.filesystem.AllPOIFSFileSystemTests;
-import org.apache.poi.poifs.macros.TestVBAMacroReader;
-import org.apache.poi.poifs.nio.TestDataSource;
-import org.apache.poi.poifs.property.AllPOIFSPropertyTests;
-import org.apache.poi.poifs.storage.AllPOIFSStorageTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Test suite for all sub-packages of org.apache.poi.poifs
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-      TestPOIFSReaderRegistry.class
-    , TestDataSource.class
-    , TestVBAMacroReader.class
-    , AllPOIFSFileSystemTests.class
-    , AllPOIFSPropertyTests.class
-    , AllPOIFSStorageTests.class
-})
-public final class AllPOIFSTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/crypt/AllEncryptionTests.java b/trunk/src/testcases/org/apache/poi/poifs/crypt/AllEncryptionTests.java
deleted file mode 100644
index 8bd67db..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/crypt/AllEncryptionTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for package <tt>org.apache.poi.poifs.crypt</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestBiff8DecryptingStream.class,
-    TestCipherAlgorithm.class,
-    TestXorEncryption.class
-})
-public final class AllEncryptionTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java b/trunk/src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
deleted file mode 100644
index d8a7858..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import java.io.InputStream;
-import java.util.Arrays;
-
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.poi.hssf.record.crypto.Biff8DecryptingStream;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.ComparisonFailure;
-
-/**
- * Tests for {@link Biff8DecryptingStream}
- */
-public final class TestBiff8DecryptingStream {
-
-	/**
-	 * A mock {@link InputStream} that keeps track of position and also produces
-	 * slightly interesting data. Each successive data byte value is one greater
-	 * than the previous.
-	 */
-	private static final class MockStream extends InputStream {
-		private final int _initialValue;
-		private int _position;
-
-		public MockStream(int initialValue) {
-			_initialValue = initialValue;
-		}
-
-		@Override
-        public int read() {
-			return (_initialValue+_position++) & 0xFF;
-		}
-	}
-
-	private static final class StreamTester {
-		private static final boolean ONLY_LOG_ERRORS = true;
-
-		private final MockStream _ms;
-		private final Biff8DecryptingStream _bds;
-		private boolean _errorsOccurred;
-
-		/**
-		 * @param expectedFirstInt expected value of the first int read from the decrypted stream
-		 */
-		public StreamTester(MockStream ms, String keyDigestHex, int expectedFirstInt) {
-			_ms = ms;
-			byte[] keyDigest = HexRead.readFromString(keyDigestHex);
-			EncryptionInfo ei = new EncryptionInfo(EncryptionMode.binaryRC4);
-			Decryptor dec = ei.getDecryptor();
-			dec.setSecretKey(new SecretKeySpec(keyDigest, "RC4"));
-			
-			_bds = new Biff8DecryptingStream(_ms, 0, ei);
-			assertEquals(expectedFirstInt, _bds.readInt());
-			_errorsOccurred = false;
-		}
-
-		public Biff8DecryptingStream getBDS() {
-			return _bds;
-		}
-
-		/**
-		 * Used to 'skip over' the uninteresting middle bits of the key blocks.
-		 * Also confirms that read position of the underlying stream is aligned.
-		 */
-		public void rollForward(int fromPosition, int toPosition) {
-			assertEquals(fromPosition, _bds.getPosition());
-			for (int i = fromPosition; i < toPosition; i++) {
-				_bds.readByte();
-			}
-			assertEquals(toPosition, _bds.getPosition());
-		}
-
-		public void confirmByte(int expVal) {
-		    assertEquals(HexDump.byteToHex(expVal), HexDump.byteToHex(_bds.readUByte()));
-		}
-
-		public void confirmShort(int expVal) {
-		    assertEquals(HexDump.shortToHex(expVal), HexDump.shortToHex(_bds.readShort()));
-		}
-
-        public void confirmUShort(int expVal) {
-            assertEquals(HexDump.shortToHex(expVal), HexDump.shortToHex(_bds.readUShort()));
-        }
-        
-        public short readShort() {
-            return _bds.readShort();
-        }
-
-        public int readUShort() {
-            return _bds.readUShort();
-        }
-
-		public void confirmInt(int expVal) {
-			assertEquals(HexDump.intToHex(expVal), HexDump.intToHex(_bds.readInt()));
-		}
-
-		public void confirmLong(long expVal) {
-		    assertEquals(HexDump.longToHex(expVal), HexDump.longToHex(_bds.readLong()));
-		}
-		
-		public void confirmData(String expHexData) {
-
-			byte[] expData = HexRead.readFromString(expHexData);
-			byte[] actData = new byte[expData.length];
-			_bds.readFully(actData);
-			if (Arrays.equals(expData, actData)) {
-				return;
-			}
-			_errorsOccurred = true;
-			if (ONLY_LOG_ERRORS) {
-				logErr(2, "Data mismatch " + HexDump.toHex(expData) + " - "
-						+ HexDump.toHex(actData));
-				return;
-			}
-			throw new ComparisonFailure("Data mismatch", HexDump.toHex(expData), HexDump.toHex(actData));
-		}
-
-		private static void logErr(int stackFrameCount, String msg) {
-			StackTraceElement ste = new Exception().getStackTrace()[stackFrameCount];
-			System.err.print("(" + ste.getFileName() + ":" + ste.getLineNumber() + ") ");
-			System.err.println(msg);
-		}
-
-		public void assertNoErrors() {
-			assertFalse("Some values decrypted incorrectly", _errorsOccurred);
-		}
-	}
-
-	/**
-	 * Tests reading of 64,32,16 and 8 bit integers aligned with key changing boundaries
-	 */
-	@Test
-	public void readsAlignedWithBoundary() {
-		StreamTester st = createStreamTester(0x50, "BA AD F0 0D 00", 0x96C66829);
-
-		st.rollForward(0x0004, 0x03FF);
-		st.confirmByte(0x3E);
-		st.confirmByte(0x28);
-		st.rollForward(0x0401, 0x07FE);
-		st.confirmShort(0x76CC);
-		st.confirmShort(0xD83E);
-		st.rollForward(0x0802, 0x0BFC);
-		st.confirmInt(0x25F280EB);
-		st.confirmInt(0xB549E99B);
-		st.rollForward(0x0C04, 0x0FF8);
-		st.confirmLong(0x6AA2D5F6B975D10CL);
-		st.confirmLong(0x34248ADF7ED4F029L);
-		// check for signed/unsigned shorts #58069
-		st.rollForward(0x1008, 0x7213);
-		st.confirmUShort(0xFFFF);
-		st.rollForward(0x7215, 0x1B9AD);
-        st.confirmShort(-1);
-        st.rollForward(0x1B9AF, 0x37D99);
-        assertEquals(0xFFFF, st.readUShort());
-        st.rollForward(0x37D9B, 0x4A6F2);
-        assertEquals(-1, st.readShort());
-		st.assertNoErrors();
-	}
-
-	/**
-	 * Tests reading of 64,32 and 16 bit integers <i>across</i> key changing boundaries
-	 */
-    @Test
-	public void readsSpanningBoundary() {
-		StreamTester st = createStreamTester(0x50, "BA AD F0 0D 00", 0x96C66829);
-
-		st.rollForward(0x0004, 0x03FC);
-		st.confirmLong(0x885243283E2A5EEFL);
-		st.rollForward(0x0404, 0x07FE);
-		st.confirmInt(0xD83E76CC);
-		st.rollForward(0x0802, 0x0BFF);
-		st.confirmShort(0x9B25);
-		st.assertNoErrors();
-	}
-
-	/**
-	 * Checks that the BIFF header fields (sid, size) get read without applying decryption,
-	 * and that the RC4 stream stays aligned during these calls
-	 */
-    @Test
-	public void readHeaderUShort() {
-		StreamTester st = createStreamTester(0x50, "BA AD F0 0D 00", 0x96C66829);
-
-		st.rollForward(0x0004, 0x03FF);
-
-		Biff8DecryptingStream bds = st.getBDS();
-		int hval = bds.readDataSize();   // unencrypted
-		int nextInt = bds.readInt();
-		if (nextInt == 0x8F534029) {
-			throw new AssertionFailedError(
-					"Indentified bug in key alignment after call to readHeaderUShort()");
-		}
-		assertEquals(0x16885243, nextInt);
-		if (hval == 0x283E) {
-			throw new AssertionFailedError("readHeaderUShort() incorrectly decrypted result");
-		}
-		assertEquals(0x504F, hval);
-
-		// confirm next key change
-		st.rollForward(0x0405, 0x07FC);
-		st.confirmInt(0x76CC1223);
-		st.confirmInt(0x4842D83E);
-		st.assertNoErrors();
-	}
-
-	/**
-	 * Tests reading of byte sequences <i>across</i> and <i>aligned with</i> key changing boundaries
-	 */
-    @Test
-	public void readByteArrays() {
-		StreamTester st = createStreamTester(0x50, "BA AD F0 0D 00", 0x96C66829);
-
-		st.rollForward(0x0004, 0x2FFC);
-		st.confirmData("66 A1 20 B1 04 A3 35 F5"); // 4 bytes on either side of boundary
-		st.rollForward(0x3004, 0x33F8);
-		st.confirmData("F8 97 59 36");  // last 4 bytes in block
-		st.confirmData("01 C2 4E 55");  // first 4 bytes in next block
-		st.assertNoErrors();
-	}
-
-	private static StreamTester createStreamTester(int mockStreamStartVal, String keyDigestHex, int expectedFirstInt) {
-		return new StreamTester(new MockStream(mockStreamStartVal), keyDigestHex, expectedFirstInt);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java b/trunk/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
deleted file mode 100644
index 68d6ab2..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.junit.Test;
-
-public class TestCipherAlgorithm {
-    @Test
-    public void validInputs() {
-        assertEquals(128, CipherAlgorithm.aes128.defaultKeySize);
-        
-        for(CipherAlgorithm alg : CipherAlgorithm.values()) {
-            assertEquals(alg, CipherAlgorithm.valueOf(alg.toString()));
-        }
-
-        assertEquals(CipherAlgorithm.aes128, CipherAlgorithm.fromEcmaId(0x660E));
-        assertEquals(CipherAlgorithm.aes192, CipherAlgorithm.fromXmlId("AES", 192));
-    }
-    
-    @Test(expected=EncryptedDocumentException.class)
-    public void invalidEcmaId() {
-        CipherAlgorithm.fromEcmaId(0);
-    }
-    
-    @Test(expected=EncryptedDocumentException.class)
-    public void invalidXmlId1() {
-        CipherAlgorithm.fromXmlId("AES", 1);
-    }
-    
-    @Test(expected=EncryptedDocumentException.class)
-    public void invalidXmlId2() {
-        CipherAlgorithm.fromXmlId("RC1", 0x40);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java b/trunk/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java
deleted file mode 100644
index cae6426..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.HexRead;
-import org.junit.After;
-import org.junit.Test;
-
-public class TestXorEncryption {
-    
-    private static HSSFTestDataSamples samples = new HSSFTestDataSamples();
-    
-    // to not affect other tests running in the same JVM
-    @After
-    public void resetPassword() {
-        Biff8EncryptionKey.setCurrentUserPassword(null);
-    }
-
-    @Test
-    public void testXorEncryption() throws Exception {
-        // Xor-Password: abc
-        // 2.5.343 XORObfuscation
-        // key = 20810
-        // verifier = 52250
-        int verifier = CryptoFunctions.createXorVerifier1("abc");
-        int key = CryptoFunctions.createXorKey1("abc");
-        assertEquals(20810, key);
-        assertEquals(52250, verifier);
-        
-        byte xorArrAct[] = CryptoFunctions.createXorArray1("abc");
-        byte xorArrExp[] = HexRead.readFromString("AC-CC-A4-AB-D6-BA-C3-BA-D6-A3-2B-45-D3-79-29-BB");
-        assertThat(xorArrExp, equalTo(xorArrAct));
-    }
-
-    @SuppressWarnings("static-access")
-    @Test
-    public void testUserFile() throws Exception {
-        Biff8EncryptionKey.setCurrentUserPassword("abc");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(samples.getSampleFile("xor-encryption-abc.xls"), true);
-        HSSFWorkbook hwb = new HSSFWorkbook(fs.getRoot(), true);
-        
-        HSSFSheet sh = hwb.getSheetAt(0);
-        assertEquals(1.0, sh.getRow(0).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals(2.0, sh.getRow(1).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals(3.0, sh.getRow(2).getCell(0).getNumericCellValue(), 0.0);
-
-        fs.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java b/trunk/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
deleted file mode 100644
index b1155c3..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.crypt.binaryrc4;
-
-import static org.apache.poi.util.HexRead.readFromString;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.security.GeneralSecurityException;
-
-import javax.crypto.SecretKey;
-
-import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EncryptionInfo;
-import org.apache.poi.poifs.crypt.EncryptionMode;
-import org.junit.Test;
-
-public class TestBinaryRC4 {
-    @Test
-    public void createKeyDigest() throws GeneralSecurityException {
-        byte[] docIdData = readFromString("17 F6 D1 6B 09 B1 5F 7B 4C 9D 03 B4 81 B5 B4 4A");
-        byte[] expResult = readFromString("C2 D9 56 B2 6B");
-        
-        EncryptionInfo ei = new EncryptionInfo(EncryptionMode.binaryRC4);
-        BinaryRC4EncryptionVerifier ver = (BinaryRC4EncryptionVerifier)ei.getVerifier();
-        ver.setSalt(docIdData);
-        SecretKey sk = BinaryRC4Decryptor.generateSecretKey("MoneyForNothing", ver);
-        
-        assertArrayEquals("keyDigest mismatch", expResult, sk.getEncoded());
-    }
-
-    @Test
-    public void testValidateWithDefaultPassword() throws GeneralSecurityException {
-
-        String docIdSuffixA = "F 35 52 38 0D 75 4A E6 85 C2 FD 78 CE 3D D1 B6"; // valid prefix is 'D'
-        String saltHashA = "30 38 BE 5E 93 C5 7E B4 5F 52 CD A1 C6 8F B6 2A";
-        String saltDataA = "D4 04 43 EC B7 A7 6F 6A D2 68 C7 DF CF A8 80 68";
-
-        String docIdB = "39 D7 80 41 DA E4 74 2C 8C 84 F9 4D 39 9A 19 2D";
-        String saltDataSuffixB = "3 EA 8D 52 11 11 37 D2 BD 55 4C 01 0A 47 6E EB"; // valid prefix is 'C'
-        String saltHashB = "96 19 F5 D0 F1 63 08 F1 3E 09 40 1E 87 F0 4E 16";
-
-        confirmValid(true, "D" + docIdSuffixA, saltDataA, saltHashA);
-        confirmValid(true, docIdB, "C" + saltDataSuffixB, saltHashB);
-        confirmValid(false, "E" + docIdSuffixA, saltDataA, saltHashA);
-        confirmValid(false, docIdB, "B" + saltDataSuffixB, saltHashB);
-    }
-
-    @Test
-    public void testValidateWithSuppliedPassword() throws GeneralSecurityException {
-
-        String docId = "DF 35 52 38 0D 75 4A E6 85 C2 FD 78 CE 3D D1 B6";
-        String saltData = "D4 04 43 EC B7 A7 6F 6A D2 68 C7 DF CF A8 80 68";
-        String saltHashA = "8D C2 63 CC E1 1D E0 05 20 16 96 AF 48 59 94 64"; // for password '5ecret'
-        String saltHashB = "31 0B 0D A4 69 55 8E 27 A1 03 AD C9 AE F8 09 04"; // for password '5ecret'
-
-        confirmValid(true, docId, saltData, saltHashA, "5ecret");
-        confirmValid(false, docId, saltData, saltHashA, "Secret");
-        confirmValid(true, docId, saltData, saltHashB, "Secret");
-        confirmValid(false, docId, saltData, saltHashB, "secret");
-    }
-
-
-    private static void confirmValid(boolean expectedResult,
-            String docIdHex, String saltDataHex, String saltHashHex) throws GeneralSecurityException {
-        confirmValid(expectedResult, docIdHex, saltDataHex, saltHashHex, null);
-    }
-    
-    private static void confirmValid(boolean expectedResult, String docIdHex,
-            String saltDataHex, String saltHashHex, String password) throws GeneralSecurityException {
-        byte[] docId = readFromString(docIdHex);
-        byte[] saltData = readFromString(saltDataHex);
-        byte[] saltHash = readFromString(saltHashHex);
-
-        EncryptionInfo ei = new EncryptionInfo(EncryptionMode.binaryRC4);
-        BinaryRC4EncryptionVerifier ver = (BinaryRC4EncryptionVerifier)ei.getVerifier();
-        ver.setSalt(docId);
-        ver.setEncryptedVerifier(saltData);
-        ver.setEncryptedVerifierHash(saltHash);
-
-        String pass = password == null ? Decryptor.DEFAULT_PASSWORD : password;
-        boolean actResult = ei.getDecryptor().verifyPassword(pass);
-        if (expectedResult) {
-            assertTrue("validate failed", actResult);
-        } else {
-            assertFalse("validate succeeded unexpectedly", actResult);
-        }        
-    }
-    
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java b/trunk/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java
deleted file mode 100644
index 3c50507..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.dev;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.poifs.filesystem.NotOLE2FileException;
-import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
-import org.apache.poi.poifs.property.NPropertyTable;
-import org.apache.poi.util.TempFile;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import static org.junit.Assert.*;
-
-public class TestPOIFSDump {
-
-    private static final String TEST_FILE = HSSFTestDataSamples.getSampleFile("46515.xls").getAbsolutePath();
-    private static final String INVALID_FILE = HSSFTestDataSamples.getSampleFile("48936-strings.txt").getAbsolutePath();
-    private static final String INVALID_XLSX_FILE = HSSFTestDataSamples.getSampleFile("47668.xlsx").getAbsolutePath();
-
-    private static final String[] DUMP_OPTIONS = {
-        "-dumprops",
-        "-dump-props",
-        "-dump-properties",
-        "-dumpmini",
-        "-dump-mini",
-        "-dump-ministream",
-        "-dump-mini-stream",
-    };
-
-    @After
-    public void tearDown() throws IOException {
-        // clean up the directory that POIFSDump writes to
-        deleteDirectory(new File(new File(TEST_FILE+"_dump").getName()));
-    }
-
-    public static void deleteDirectory(File directory) throws IOException {
-        if (!directory.exists()) {
-            return;
-        }
-
-        cleanDirectory(directory);
-
-        if (!directory.delete()) {
-            String message =
-                    "Unable to delete directory " + directory + ".";
-            throw new IOException(message);
-        }
-    }
-
-    public static void cleanDirectory(File directory) throws IOException {
-        if (!directory.isDirectory()) {
-            String message = directory + " is not a directory";
-            throw new IllegalArgumentException(message);
-        }
-
-        File[] files = directory.listFiles();
-        if (files == null) {  // null if security restricted
-            throw new IOException("Failed to list contents of " + directory);
-        }
-
-        IOException exception = null;
-        for (File file : files) {
-            try {
-                forceDelete(file);
-            } catch (IOException ioe) {
-                exception = ioe;
-            }
-        }
-
-        if (null != exception) {
-            throw exception;
-        }
-    }
-
-    public static void forceDelete(File file) throws IOException {
-        if (file.isDirectory()) {
-            deleteDirectory(file);
-        } else {
-            boolean filePresent = file.exists();
-            if (!file.delete()) {
-                if (!filePresent){
-                    throw new FileNotFoundException("File does not exist: " + file);
-                }
-                String message =
-                        "Unable to delete file: " + file;
-                throw new IOException(message);
-            }
-        }
-    }
-
-    @Test
-    public void testMain() throws Exception {
-        POIFSDump.main(new String[] {
-                TEST_FILE
-        });
-
-        for(String option : DUMP_OPTIONS) {
-            POIFSDump.main(new String[]{
-                    option,
-                    TEST_FILE
-            });
-        }
-    }
-    @Test
-    public void testInvalidFile() throws Exception {
-        try {
-            POIFSDump.main(new String[]{
-                    INVALID_FILE
-            });
-            fail("Should fail with an exception");
-        } catch (NotOLE2FileException e) {
-            // expected here
-        }
-
-        try {
-            POIFSDump.main(new String[]{
-                    INVALID_XLSX_FILE
-            });
-            fail("Should fail with an exception");
-        } catch (OfficeXmlFileException e) {
-            // expected here
-        }
-
-        for(String option : DUMP_OPTIONS) {
-            try {
-                POIFSDump.main(new String[]{
-                        option,
-                        INVALID_FILE
-                });
-                fail("Should fail with an exception");
-            } catch (NotOLE2FileException e) {
-                // expected here
-            }
-
-            try {
-                POIFSDump.main(new String[]{
-                        option,
-                        INVALID_XLSX_FILE
-                });
-                fail("Should fail with an exception");
-            } catch (OfficeXmlFileException e) {
-                // expected here
-            }
-        }
-    }
-
-    @Ignore("Calls System.exit()")
-    @Test
-    public void testMainNoArgs() throws Exception {
-        POIFSDump.main(new String[] {});
-    }
-
-    @Test(expected=IndexOutOfBoundsException.class)
-    public void testFailToWrite() throws IOException {
-        File dir = TempFile.createTempFile("TestPOIFSDump", ".tst");
-        assertTrue("Had: " + dir, dir.exists());
-        assertTrue("Had: " + dir, dir.delete());
-        assertTrue("Had: " + dir, dir.mkdirs());
-
-        FileInputStream is = new FileInputStream(TEST_FILE);
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(is);
-        is.close();
-
-        NPropertyTable props = fs.getPropertyTable();
-        assertNotNull(props);
-
-        // try with an invalid startBlock to trigger an exception
-        // to validate that file-handles are closed properly
-        POIFSDump.dump(fs, 999999999, "mini-stream", dir);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java b/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java
deleted file mode 100644
index 4b597c1..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.eventfilesystem;
-
-/**
- * Class Listener
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- * @version %I%, %G%
- */
-
-class Listener
-    implements POIFSReaderListener
-{
-
-    /**
-     * Process a POIFSReaderEvent that this listener had registered
-     * for
-     *
-     * @param event the POIFSReaderEvent
-     */
-
-    @Override
-    public void processPOIFSReaderEvent(POIFSReaderEvent event)
-    {
-    }
-}   // end class Listener
-
diff --git a/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java b/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
deleted file mode 100644
index 7a0e3d6..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.eventfilesystem;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
-
-/**
- * Class to test POIFSReaderRegistry functionality
- *
- * @author Marc Johnson
- */
-public final class TestPOIFSReaderRegistry extends TestCase {
-    private final POIFSReaderListener[] listeners =
-    {
-        new Listener(), new Listener(), new Listener(), new Listener()
-    };
-    private final POIFSDocumentPath[]   paths     =
-    {
-        new POIFSDocumentPath(), new POIFSDocumentPath(new String[]
-        {
-            "a"
-        }), new POIFSDocumentPath(new String[]
-        {
-            "b"
-        }), new POIFSDocumentPath(new String[]
-        {
-            "c"
-        })
-    };
-    private final String[]              names     =
-    {
-        "a0", "a1", "a2", "a3"
-    };
-
-    /**
-     * Test empty registry
-     */
-    public void testEmptyRegistry() {
-        POIFSReaderRegistry registry = new POIFSReaderRegistry();
-
-        for (POIFSDocumentPath path : paths) {
-            for (String name : names) {
-                Iterator<POIFSReaderListener> listeners =
-                    registry.getListeners(path, name);
-
-                assertTrue(!listeners.hasNext());
-            }
-        }
-    }
-
-    /**
-     * Test mixed registration operations
-     */
-    public void testMixedRegistrationOperations() {
-        POIFSReaderRegistry registry = new POIFSReaderRegistry();
-
-        for (int j = 0; j < listeners.length; j++)
-        {
-            for (int k = 0; k < paths.length; k++)
-            {
-                for (int n = 0; n < names.length; n++)
-                {
-                    if ((j != k) && (k != n))
-                    {
-                        registry.registerListener(
-                                listeners[ j ], paths[ k ], names[ n ]);
-                    }
-                }
-            }
-        }
-        for (int k = 0; k < paths.length; k++)
-        {
-            for (int n = 0; n < names.length; n++)
-            {
-                Iterator<POIFSReaderListener> listeners =
-                    registry.getListeners(paths[ k ], names[ n ]);
-
-                if (k == n)
-                {
-                    assertTrue(!listeners.hasNext());
-                }
-                else
-                {
-                    Set<POIFSReaderListener> registeredListeners =
-                            new HashSet<POIFSReaderListener>();
-
-                    while (listeners.hasNext())
-                    {
-                        registeredListeners.add(listeners.next());
-                    }
-                    assertEquals(this.listeners.length - 1,
-                                 registeredListeners.size());
-                    for (int j = 0; j < this.listeners.length; j++)
-                    {
-                        if (j == k)
-                        {
-                            assertTrue(!registeredListeners
-                                .contains(this.listeners[ j ]));
-                        }
-                        else
-                        {
-                            assertTrue(registeredListeners
-                                .contains(this.listeners[ j ]));
-                        }
-                    }
-                }
-            }
-        }
-        for (POIFSReaderListener listener : listeners) {
-            registry.registerListener(listener);
-        }
-        for (POIFSDocumentPath path : paths) {
-            for (String name : names) {
-                Iterator<POIFSReaderListener> listeners =
-                    registry.getListeners(path, name);
-                Set<POIFSReaderListener> registeredListeners =
-                    new HashSet<POIFSReaderListener>();
-
-                while (listeners.hasNext())
-                {
-                    registeredListeners.add(listeners.next());
-                }
-                assertEquals(this.listeners.length,
-                             registeredListeners.size());
-                for (POIFSReaderListener listener : this.listeners) {
-                    assertTrue(registeredListeners
-                        .contains(listener));
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
deleted file mode 100644
index 999f2de..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Tests for org.apache.poi.poifs.filesystem<br/>
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-      TestDirectoryNode.class
-    , TestDocument.class
-    , TestDocumentDescriptor.class
-    , TestDocumentInputStream.class
-    , TestDocumentNode.class
-    , TestDocumentOutputStream.class
-    , TestEmptyDocument.class
-    , TestOfficeXMLException.class
-    , TestPOIFSDocumentPath.class
-    , TestPOIFSFileSystem.class
-    , TestNPOIFSFileSystem.class
-    , TestPropertySorter.class
-    , TestOle10Native.class
-})
-public final class AllPOIFSFileSystemTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
deleted file mode 100644
index b3a328c..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
+++ /dev/null
@@ -1,193 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.poifs.eventfilesystem.POIFSReader;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
-import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
-
-/**
- * Test (Proof of concept) program that employs the
- * POIFSReaderListener and POIFSWriterListener interfaces
- *
- * @author Marc Johnson (mjohnson at apache dot org)
- */
-
-public class ReaderWriter
-    implements POIFSReaderListener, POIFSWriterListener
-{
-    private final POIFSFileSystem filesystem;
-    private final DirectoryEntry  root;
-
-    // keys are DocumentDescriptors, values are byte[]s
-    private final Map<DocumentDescriptor, byte[]>             dataMap;
-
-    /**
-     * Constructor ReaderWriter
-     *
-     *
-     * @param filesystem
-     *
-     */
-
-    ReaderWriter(final POIFSFileSystem filesystem)
-    {
-        this.filesystem = filesystem;
-        root            = this.filesystem.getRoot();
-        dataMap         = new HashMap<DocumentDescriptor, byte[]>();
-    }
-
-    /**
-     * Method main
-     *
-     *
-     * @param args
-     *
-     * @exception IOException
-     *
-     */
-
-    public static void main(String [] args)
-        throws IOException
-    {
-        if (args.length != 2)
-        {
-            System.err.println(
-                "two arguments required: one input file name and one output file name");
-        }
-        else
-        {
-            POIFSReader     reader     = new POIFSReader();
-            POIFSFileSystem filesystem = new POIFSFileSystem();
-
-            reader.registerListener(new ReaderWriter(filesystem));
-            FileInputStream istream = new FileInputStream(args[ 0 ]);
-
-            reader.read(istream);
-            istream.close();
-            FileOutputStream ostream = new FileOutputStream(args[ 1 ]);
-
-            filesystem.writeFilesystem(ostream);
-            ostream.close();
-        }
-    }
-
-    /* ********** START implementation of POIFSReaderListener ********** */
-
-    /**
-     * Process a POIFSReaderEvent that this listener had registered
-     * for
-     *
-     * @param event the POIFSReaderEvent
-     */
-
-    @Override
-    public void processPOIFSReaderEvent(final POIFSReaderEvent event)
-    {
-        DocumentInputStream istream = event.getStream();
-        POIFSDocumentPath   path    = event.getPath();
-        String              name    = event.getName();
-
-        try
-        {
-            int    size = istream.available();
-            byte[] data = new byte[ istream.available() ];
-
-            istream.read(data);
-            DocumentDescriptor descriptor = new DocumentDescriptor(path,
-                                                name);
-
-            System.out.println("adding document: " + descriptor + " (" + size
-                               + " bytes)");
-            dataMap.put(descriptor, data);
-            //int            pathLength = path.length();
-            DirectoryEntry entry      = root;
-
-            for (int k = 0; k < path.length(); k++)
-            {
-                String componentName = path.getComponent(k);
-                Entry  nextEntry     = null;
-
-                try
-                {
-                    nextEntry = entry.getEntry(componentName);
-                }
-                catch (FileNotFoundException ignored)
-                {
-                    try
-                    {
-                        nextEntry = entry.createDirectory(componentName);
-                    }
-                    catch (IOException e)
-                    {
-                        System.out.println("Unable to create directory");
-                        e.printStackTrace();
-                        System.exit(1);
-                    }
-                }
-                entry = ( DirectoryEntry ) nextEntry;
-            }
-            entry.createDocument(name, size, this);
-        }
-        catch (IOException ignored)
-        {
-        }
-    }
-
-    /* **********  END  implementation of POIFSReaderListener ********** */
-    /* ********** START implementation of POIFSWriterListener ********** */
-
-    /**
-     * Process a POIFSWriterEvent that this listener had registered
-     * for
-     *
-     * @param event the POIFSWriterEvent
-     */
-
-    @Override
-    public void processPOIFSWriterEvent(final POIFSWriterEvent event)
-    {
-        try
-        {
-            DocumentDescriptor descriptor =
-                new DocumentDescriptor(event.getPath(), event.getName());
-
-            System.out.println("looking up document: " + descriptor + " ("
-                               + event.getLimit() + " bytes)");
-            event.getStream().write(dataMap.get(descriptor));
-        }
-        catch (IOException e)
-        {
-            System.out.println("Unable to write document");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    /* **********  END  implementation of POIFSWriterListener ********** */
-}   // end public class ReaderWriter
-
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java
deleted file mode 100644
index f818d21..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.*;
-import java.util.Random;
-
-/**
- * Returns a random amount of requested data. Used to check conformance with
- * InputStream API contracts.
- */
-public class SlowInputStream extends FilterInputStream
-{
-    private final Random r = new Random(0);
-    
-    public SlowInputStream(InputStream in) {
-        super(in);
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        return super.read(b, off, r.nextInt(len) + 1);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
deleted file mode 100644
index 41d1a34..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
+++ /dev/null
@@ -1,220 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.DocumentProperty;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test DirectoryNode functionality
- *
- * @author Marc Johnson
- */
-public final class TestDirectoryNode extends TestCase {
-
-    /**
-     * test trivial constructor (a DirectoryNode with no children)
-     */
-    public void testEmptyConstructor() {
-        POIFSFileSystem   fs        = new POIFSFileSystem();
-        DirectoryProperty property1 = new DirectoryProperty("parent");
-        DirectoryProperty property2 = new DirectoryProperty("child");
-        DirectoryNode     parent    = new DirectoryNode(property1, fs, null);
-        DirectoryNode     node      = new DirectoryNode(property2, fs,
-                                          parent);
-
-        assertEquals(0, parent.getPath().length());
-        assertEquals(1, node.getPath().length());
-        assertEquals("child", node.getPath().getComponent(0));
-
-        // verify that getEntries behaves correctly
-        int      count = 0;
-        Iterator<Entry> iter  = node.getEntries();
-
-        while (iter.hasNext())
-        {
-            count++;
-            iter.next();
-        }
-        assertEquals(0, count);
-
-        // verify behavior of isEmpty
-        assertTrue(node.isEmpty());
-
-        // verify behavior of getEntryCount
-        assertEquals(0, node.getEntryCount());
-
-        // verify behavior of getEntry
-        try
-        {
-            node.getEntry("foo");
-            fail("should have caught FileNotFoundException");
-        }
-        catch (FileNotFoundException ignored)
-        {
-
-            // as expected
-        }
-
-        // verify behavior of isDirectoryEntry
-        assertTrue(node.isDirectoryEntry());
-
-        // verify behavior of getName
-        assertEquals(property2.getName(), node.getName());
-
-        // verify behavior of isDocumentEntry
-        assertTrue(!node.isDocumentEntry());
-
-        // verify behavior of getParent
-        assertEquals(parent, node.getParent());
-    }
-
-    /**
-     * test non-trivial constructor (a DirectoryNode with children)
-     */
-    public void testNonEmptyConstructor() throws IOException {
-        DirectoryProperty property1 = new DirectoryProperty("parent");
-        DirectoryProperty property2 = new DirectoryProperty("child1");
-
-        property1.addChild(property2);
-        property1.addChild(new DocumentProperty("child2", 2000));
-        property2.addChild(new DocumentProperty("child3", 30000));
-        DirectoryNode node  = new DirectoryNode(property1,
-                                                new POIFSFileSystem(), null);
-
-        // verify that getEntries behaves correctly
-        int           count = 0;
-        Iterator<Entry>      iter  = node.getEntries();
-
-        while (iter.hasNext())
-        {
-            count++;
-            iter.next();
-        }
-        assertEquals(2, count);
-
-        // verify behavior of isEmpty
-        assertTrue(!node.isEmpty());
-
-        // verify behavior of getEntryCount
-        assertEquals(2, node.getEntryCount());
-
-        // verify behavior of getEntry
-        DirectoryNode child1 = ( DirectoryNode ) node.getEntry("child1");
-
-        child1.getEntry("child3");
-        node.getEntry("child2");
-        try
-        {
-            node.getEntry("child3");
-            fail("should have caught FileNotFoundException");
-        }
-        catch (FileNotFoundException ignored)
-        {
-
-            // as expected
-        }
-
-        // verify behavior of isDirectoryEntry
-        assertTrue(node.isDirectoryEntry());
-
-        // verify behavior of getName
-        assertEquals(property1.getName(), node.getName());
-
-        // verify behavior of isDocumentEntry
-        assertTrue(!node.isDocumentEntry());
-
-        // verify behavior of getParent
-        assertNull(node.getParent());
-    }
-
-    /**
-     * test deletion methods
-     */
-    public void testDeletion() throws IOException {
-        POIFSFileSystem fs   = new POIFSFileSystem();
-        DirectoryEntry  root = fs.getRoot();
-
-        // verify cannot delete the root directory
-        assertFalse(root.delete());
-        assertTrue(root.isEmpty());
-
-        DirectoryEntry dir = fs.createDirectory("myDir");
-
-        assertFalse(root.isEmpty());
-        assertTrue(dir.isEmpty());
-
-        // verify can delete empty directory
-        assertFalse(root.delete());
-        assertTrue(dir.delete());
-
-        // Now look at a non-empty one
-        dir = fs.createDirectory("NextDir");
-        DocumentEntry doc =
-            dir.createDocument("foo",
-                               new ByteArrayInputStream(new byte[ 1 ]));
-
-        assertFalse(root.isEmpty());
-        assertFalse(dir.isEmpty());
-
-        // verify cannot delete non-empty directory
-        assertFalse(dir.delete());
-
-        // but we can delete it if we remove the document
-        assertTrue(doc.delete());
-        assertTrue(dir.isEmpty());
-        assertTrue(dir.delete());
-
-        // It's really gone!
-        assertTrue(root.isEmpty());
-
-        fs.close();
-    }
-
-    /**
-     * test change name methods
-     */
-    public void testRename() throws IOException {
-        POIFSFileSystem fs   = new POIFSFileSystem();
-        DirectoryEntry  root = fs.getRoot();
-
-        // verify cannot rename the root directory
-        assertTrue(!root.renameTo("foo"));
-        DirectoryEntry dir = fs.createDirectory("myDir");
-
-        assertTrue(dir.renameTo("foo"));
-        assertEquals("foo", dir.getName());
-        DirectoryEntry dir2 = fs.createDirectory("myDir");
-
-        assertTrue(!dir2.renameTo("foo"));
-        assertEquals("myDir", dir2.getName());
-        assertTrue(dir.renameTo("FirstDir"));
-        assertTrue(dir2.renameTo("foo"));
-        assertEquals("foo", dir2.getName());
-
-        fs.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java
deleted file mode 100644
index f670b9a..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.poifs.property.DocumentProperty;
-import org.apache.poi.poifs.storage.RawDataBlock;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test OPOIFSDocument functionality
- */
-public final class TestDocument extends TestCase {
-
-    /**
-     * Integration test -- really about all we can do
-     */
-    public void testOPOIFSDocument() throws IOException {
-
-        // verify correct number of blocks get created for document
-        // that is exact multituple of block size
-        OPOIFSDocument document;
-        byte[]        array = new byte[ 4096 ];
-
-        for (int j = 0; j < array.length; j++)
-        {
-            array[ j ] = ( byte ) j;
-        }
-        document = new OPOIFSDocument("foo", new SlowInputStream(new ByteArrayInputStream(array)));
-        checkDocument(document, array);
-
-        // verify correct number of blocks get created for document
-        // that is not an exact multiple of block size
-        array = new byte[ 4097 ];
-        for (int j = 0; j < array.length; j++)
-        {
-            array[ j ] = ( byte ) j;
-        }
-        document = new OPOIFSDocument("bar", new ByteArrayInputStream(array));
-        checkDocument(document, array);
-
-        // verify correct number of blocks get created for document
-        // that is small
-        array = new byte[ 4095 ];
-        for (int j = 0; j < array.length; j++)
-        {
-            array[ j ] = ( byte ) j;
-        }
-        document = new OPOIFSDocument("_bar", new ByteArrayInputStream(array));
-        checkDocument(document, array);
-
-        // verify correct number of blocks get created for document
-        // that is rather small
-        array = new byte[ 199 ];
-        for (int j = 0; j < array.length; j++)
-        {
-            array[ j ] = ( byte ) j;
-        }
-        document = new OPOIFSDocument("_bar2",
-                                     new ByteArrayInputStream(array));
-        checkDocument(document, array);
-
-        // verify that output is correct
-        array = new byte[ 4097 ];
-        for (int j = 0; j < array.length; j++)
-        {
-            array[ j ] = ( byte ) j;
-        }
-        document = new OPOIFSDocument("foobar",
-                                     new ByteArrayInputStream(array));
-        checkDocument(document, array);
-        document.setStartBlock(0x12345678);   // what a big file!!
-        DocumentProperty      property = document.getDocumentProperty();
-        ByteArrayOutputStream stream   = new ByteArrayOutputStream();
-
-        property.writeData(stream);
-        byte[] output = stream.toByteArray();
-        byte[] array2 =
-        {
-            ( byte ) 'f', ( byte ) 0, ( byte ) 'o', ( byte ) 0, ( byte ) 'o',
-            ( byte ) 0, ( byte ) 'b', ( byte ) 0, ( byte ) 'a', ( byte ) 0,
-            ( byte ) 'r', ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 14,
-            ( byte ) 0, ( byte ) 2, ( byte ) 1, ( byte ) -1, ( byte ) -1,
-            ( byte ) -1, ( byte ) -1, ( byte ) -1, ( byte ) -1, ( byte ) -1,
-            ( byte ) -1, ( byte ) -1, ( byte ) -1, ( byte ) -1, ( byte ) -1,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0x78, ( byte ) 0x56, ( byte ) 0x34,
-            ( byte ) 0x12, ( byte ) 1, ( byte ) 16, ( byte ) 0, ( byte ) 0,
-            ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0
-        };
-
-        assertEquals(array2.length, output.length);
-        for (int j = 0; j < output.length; j++)
-        {
-            assertEquals("Checking property offset " + j, array2[ j ],
-                         output[ j ]);
-        }
-    }
-
-    private static OPOIFSDocument makeCopy(OPOIFSDocument document, byte[] input, byte[] data)
-            throws IOException {
-        OPOIFSDocument copy = null;
-
-        if (input.length >= 4096)
-        {
-            RawDataBlock[]       blocks =
-                new RawDataBlock[ (input.length + 511) / 512 ];
-            ByteArrayInputStream stream = new ByteArrayInputStream(data);
-            int                  index  = 0;
-
-            while (true)
-            {
-                RawDataBlock block = new RawDataBlock(stream);
-
-                if (block.eof())
-                {
-                    break;
-                }
-                blocks[ index++ ] = block;
-            }
-            copy = new OPOIFSDocument("test" + input.length, blocks,
-                                     input.length);
-        }
-        else
-        {
-            copy = new OPOIFSDocument("test"+input.length, document.getSmallBlocks(), input.length);
-        }
-        return copy;
-    }
-
-    private static void checkDocument(final OPOIFSDocument document, final byte[] input)
-            throws IOException {
-        int big_blocks   = 0;
-        int small_blocks = 0;
-        int total_output = 0;
-
-        if (input.length >= 4096)
-        {
-            big_blocks   = (input.length + 511) / 512;
-            total_output = big_blocks * 512;
-        }
-        else
-        {
-            small_blocks = (input.length + 63) / 64;
-            total_output = 0;
-        }
-        checkValues(
-            big_blocks, small_blocks, total_output,
-            makeCopy(
-            document, input,
-            checkValues(
-                big_blocks, small_blocks, total_output, document,
-                input)), input);
-    }
-
-    private static byte[] checkValues(int big_blocks, int small_blocks, int total_output,
-            OPOIFSDocument document, byte[] input) throws IOException {
-        assertEquals(document, document.getDocumentProperty().getDocument());
-        int increment = ( int ) Math.sqrt(input.length);
-
-        for (int j = 1; j <= input.length; j += increment)
-        {
-            byte[] buffer = new byte[ j ];
-            int    offset = 0;
-
-            for (int k = 0; k < (input.length / j); k++)
-            {
-                document.read(buffer, offset);
-                for (int n = 0; n < buffer.length; n++)
-                {
-                    assertEquals("checking byte " + (k * j) + n,
-                                 input[ (k * j) + n ], buffer[ n ]);
-                }
-                offset += j;
-            }
-        }
-        assertEquals(big_blocks, document.countBlocks());
-        assertEquals(small_blocks, document.getSmallBlocks().length);
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-        document.writeBlocks(stream);
-        byte[] output = stream.toByteArray();
-
-        assertEquals(total_output, output.length);
-        int limit = Math.min(total_output, input.length);
-
-        for (int j = 0; j < limit; j++)
-        {
-            assertEquals("Checking document offset " + j, input[ j ],
-                         output[ j ]);
-        }
-        for (int j = limit; j < output.length; j++)
-        {
-            assertEquals("Checking document offset " + j, ( byte ) -1,
-                         output[ j ]);
-        }
-        return output;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
deleted file mode 100644
index 9b69b1a..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test DocumentDescriptor functionality
- *
- * @author Marc Johnson
- */
-public final class TestDocumentDescriptor extends TestCase {
-
-    /**
-     * test equality
-     */
-    public void testEquality() {
-        String[] names = { "c1", "c2", "c3", "c4", "c5" };
-        POIFSDocumentPath   a1    = new POIFSDocumentPath();
-        POIFSDocumentPath   a2    = new POIFSDocumentPath(null);
-        POIFSDocumentPath   a3    = new POIFSDocumentPath(new String[ 0 ]);
-        POIFSDocumentPath   a4    = new POIFSDocumentPath(a1, null);
-        POIFSDocumentPath   a5    = new POIFSDocumentPath(a1,
-                                        new String[ 0 ]);
-        POIFSDocumentPath[] paths = { a1, a2, a3, a4, a5 };
-
-        for (int j = 0; j < paths.length; j++)
-        {
-            for (int k = 0; k < paths.length; k++)
-            {
-                for (int m = 0; m < names.length; m++)
-                {
-                    DocumentDescriptor d1 = new DocumentDescriptor(paths[ j ],
-                                                names[ m ]);
-
-                    for (int n = 0; n < names.length; n++)
-                    {
-                        DocumentDescriptor d2 =
-                            new DocumentDescriptor(paths[ k ], names[ n ]);
-
-                        if (m == n)
-                        {
-                            assertEquals("" + j + "," + k + "," + m + ","
-                                         + n, d1, d2);
-                        }
-                        else
-                        {
-                            assertTrue("" + j + "," + k + "," + m + "," + n,
-                                       !d1.equals(d2));
-                        }
-                    }
-                }
-            }
-        }
-        a2 = new POIFSDocumentPath(a1, new String[]
-        {
-            "foo"
-        });
-        a3 = new POIFSDocumentPath(a2, new String[]
-        {
-            "bar"
-        });
-        a4 = new POIFSDocumentPath(a3, new String[]
-        {
-            "fubar"
-        });
-        a5 = new POIFSDocumentPath(a4, new String[]
-        {
-            "foobar"
-        });
-        POIFSDocumentPath[] builtUpPaths =
-        {
-            a1, a2, a3, a4, a5
-        };
-        POIFSDocumentPath[] fullPaths    =
-        {
-            new POIFSDocumentPath(), new POIFSDocumentPath(new String[]
-            {
-                "foo"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "fubar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "fubar", "foobar"
-            })
-        };
-
-        for (int k = 0; k < builtUpPaths.length; k++)
-        {
-            for (int j = 0; j < fullPaths.length; j++)
-            {
-                for (int m = 0; m < names.length; m++)
-                {
-                    DocumentDescriptor d1 =
-                        new DocumentDescriptor(fullPaths[ j ], names[ m ]);
-
-                    for (int n = 0; n < names.length; n++)
-                    {
-                        DocumentDescriptor d2 =
-                            new DocumentDescriptor(builtUpPaths[ k ],
-                                                   names[ n ]);
-
-                        if ((k == j) && (m == n))
-                        {
-                            assertEquals("" + j + "," + k + "," + m + ","
-                                         + n, d1, d2);
-                        }
-                        else
-                        {
-                            assertTrue("" + j + "," + k + "," + m + "," + n,
-                                       !(d1.equals(d2)));
-                        }
-                    }
-                }
-            }
-        }
-        POIFSDocumentPath[] badPaths =
-        {
-            new POIFSDocumentPath(new String[]
-            {
-                "_foo"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "_bar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "_fubar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "fubar", "_foobar"
-            })
-        };
-
-        for (int k = 0; k < builtUpPaths.length; k++)
-        {
-            for (int j = 0; j < badPaths.length; j++)
-            {
-                for (int m = 0; m < names.length; m++)
-                {
-                    DocumentDescriptor d1 =
-                        new DocumentDescriptor(badPaths[ j ], names[ m ]);
-
-                    for (int n = 0; n < names.length; n++)
-                    {
-                        DocumentDescriptor d2 =
-                            new DocumentDescriptor(builtUpPaths[ k ],
-                                                   names[ n ]);
-
-                        assertTrue("" + j + "," + k + "," + m + "," + n,
-                                   !(d1.equals(d2)));
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
deleted file mode 100644
index bbe1e39..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.storage.RawDataBlock;
-
-/**
- * Class to test DocumentInputStream functionality
- */
-public final class TestDocumentInputStream extends TestCase {
-   private DocumentNode     _workbook_n;
-   private DocumentNode     _workbook_o;
-   private byte[]           _workbook_data;
-   private static final int _workbook_size = 5000;
-
-   // non-even division of _workbook_size, also non-even division of
-   // any block size
-   private static final int _buffer_size   = 6;
-
-	@Override
-    protected void setUp() throws Exception {
-        int blocks = (_workbook_size + 511) / 512;
-
-        _workbook_data = new byte[ 512 * blocks ];
-        Arrays.fill(_workbook_data, ( byte ) -1);
-        for (int j = 0; j < _workbook_size; j++)
-        {
-            _workbook_data[ j ] = ( byte ) (j * j);
-        }
-        
-        // Create the Old POIFS Version
-        RawDataBlock[]       rawBlocks = new RawDataBlock[ blocks ];
-        ByteArrayInputStream stream    =
-            new ByteArrayInputStream(_workbook_data);
-
-        for (int j = 0; j < blocks; j++)
-        {
-            rawBlocks[ j ] = new RawDataBlock(stream);
-        }
-        OPOIFSDocument document = new OPOIFSDocument("Workbook", rawBlocks,
-                                                     _workbook_size);
-
-        _workbook_o = new DocumentNode(
-            document.getDocumentProperty(),
-            new DirectoryNode(
-                new DirectoryProperty("Root Entry"), (POIFSFileSystem)null, null));
-        
-        // Now create the NPOIFS Version
-        byte[] _workbook_data_only = new byte[_workbook_size];
-        System.arraycopy(_workbook_data, 0, _workbook_data_only, 0, _workbook_size);
-        
-        NPOIFSFileSystem npoifs = new NPOIFSFileSystem();
-        // Make it easy when debugging to see what isn't the doc
-        byte[] minus1 = new byte[512];
-        Arrays.fill(minus1, (byte)-1);
-        npoifs.getBlockAt(-1).put(minus1);
-        npoifs.getBlockAt(0).put(minus1);
-        npoifs.getBlockAt(1).put(minus1);
-        
-        // Create the NPOIFS document
-        _workbook_n = (DocumentNode)npoifs.createDocument(
-              new ByteArrayInputStream(_workbook_data_only),
-              "Workbook"
-        );
-    }
-
-	/**
-     * test constructor
-     */
-    public void testConstructor() throws IOException {
-        DocumentInputStream ostream = new ODocumentInputStream(_workbook_o);
-        DocumentInputStream nstream = new NDocumentInputStream(_workbook_n);
-        
-        assertEquals(_workbook_size, _workbook_o.getSize());
-        assertEquals(_workbook_size, _workbook_n.getSize());
-
-        assertEquals(_workbook_size, ostream.available());
-        assertEquals(_workbook_size, nstream.available());
-        
-        ostream.close();
-        nstream.close();
-    }
-
-    /**
-     * test available() behavior
-     */
-    public void testAvailable() throws IOException {
-        DocumentInputStream ostream = new DocumentInputStream(_workbook_o);
-        DocumentInputStream nstream = new NDocumentInputStream(_workbook_n);
-
-        assertEquals(_workbook_size, ostream.available());
-        assertEquals(_workbook_size, nstream.available());
-        ostream.close();
-        nstream.close();
-        
-        try {
-           ostream.available();
-           fail("Should have caught IOException");
-        } catch (IllegalStateException ignored) {
-           // as expected
-        }
-        try {
-           nstream.available();
-           fail("Should have caught IOException");
-       } catch (IllegalStateException ignored) {
-           // as expected
-       }
-    }
-
-    /**
-     * test mark/reset/markSupported.
-     */
-    public void testMarkFunctions() throws IOException {
-        byte[] buffer = new byte[ _workbook_size / 5 ];
-        byte[] small_buffer = new byte[212];
-       
-        DocumentInputStream[] streams = new DocumentInputStream[] {
-              new DocumentInputStream(_workbook_o),
-              new NDocumentInputStream(_workbook_n)
-        };
-        for(DocumentInputStream stream : streams) {
-           // Read a fifth of it, and check all's correct
-           stream.read(buffer);
-           for (int j = 0; j < buffer.length; j++) {
-              assertEquals(
-                    "checking byte " + j, 
-                    _workbook_data[ j ], buffer[ j ]
-              );
-           }
-           assertEquals(_workbook_size - buffer.length, stream.available());
-           
-           // Reset, and check the available goes back to being the
-           //  whole of the stream
-           stream.reset();
-           assertEquals(_workbook_size, stream.available());
-           
-           
-           // Read part of a block
-           stream.read(small_buffer);
-           for (int j = 0; j < small_buffer.length; j++) {
-              assertEquals(
-                    "checking byte " + j, 
-                    _workbook_data[ j ], small_buffer[ j ]
-              );
-           }
-           assertEquals(_workbook_size - small_buffer.length, stream.available());
-           stream.mark(0);
-           
-           // Read the next part
-           stream.read(small_buffer);
-           for (int j = 0; j < small_buffer.length; j++) {
-              assertEquals(
-                    "checking byte " + j, 
-                    _workbook_data[ j+small_buffer.length ], small_buffer[ j ]
-              );
-           }
-           assertEquals(_workbook_size - 2*small_buffer.length, stream.available());
-           
-           // Reset, check it goes back to where it was
-           stream.reset();
-           assertEquals(_workbook_size - small_buffer.length, stream.available());
-           
-           // Read 
-           stream.read(small_buffer);
-           for (int j = 0; j < small_buffer.length; j++) {
-              assertEquals(
-                    "checking byte " + j, 
-                    _workbook_data[ j+small_buffer.length ], small_buffer[ j ]
-              );
-           }
-           assertEquals(_workbook_size - 2*small_buffer.length, stream.available());
-           
-           
-           // Now read at various points
-           Arrays.fill(small_buffer, ( byte ) 0);
-           stream.read(small_buffer, 6, 8);
-           stream.read(small_buffer, 100, 10);
-           stream.read(small_buffer, 150, 12);
-           int pos = small_buffer.length * 2;
-           for (int j = 0; j < small_buffer.length; j++) {
-              byte exp = 0;
-              if(j>= 6 && j<6+8) {
-                 exp = _workbook_data[pos];
-                 pos++;
-              }
-              if(j>= 100 && j<100+10) {
-                 exp = _workbook_data[pos];
-                 pos++;
-              }
-              if(j>= 150 && j<150+12) {
-                 exp = _workbook_data[pos];
-                 pos++;
-              }
-              
-              assertEquals("checking byte " + j, exp, small_buffer[j]);
-           }
-        }
-           
-        // Now repeat it with spanning multiple blocks
-        streams = new DocumentInputStream[] {
-              new DocumentInputStream(_workbook_o),
-              new NDocumentInputStream(_workbook_n)
-        };
-        for(DocumentInputStream stream : streams) {
-           // Read several blocks work
-           buffer = new byte[ _workbook_size / 5 ];
-           stream.read(buffer);
-           for (int j = 0; j < buffer.length; j++) {
-              assertEquals(
-                    "checking byte " + j, 
-                    _workbook_data[ j ], buffer[ j ]
-              );
-           }
-           assertEquals(_workbook_size - buffer.length, stream.available());
-           
-           // Read all of it again, check it began at the start again
-           stream.reset();
-           assertEquals(_workbook_size, stream.available());
-           
-           stream.read(buffer);
-           for (int j = 0; j < buffer.length; j++) {
-              assertEquals(
-                    "checking byte " + j, 
-                    _workbook_data[ j ], buffer[ j ]
-              );
-           }
-           
-           // Mark our position, and read another whole buffer
-           stream.mark(12);
-           stream.read(buffer);
-           assertEquals(_workbook_size - (2 * buffer.length),
-                 stream.available());
-           for (int j = buffer.length; j < (2 * buffer.length); j++)
-           {
-              assertEquals("checking byte " + j, _workbook_data[ j ],
-                    buffer[ j - buffer.length ]);
-           }
-           
-           // Reset, should go back to only one buffer full read
-           stream.reset();
-           assertEquals(_workbook_size - buffer.length, stream.available());
-           
-           // Read the buffer again
-           stream.read(buffer);
-           assertEquals(_workbook_size - (2 * buffer.length),
-                 stream.available());
-           for (int j = buffer.length; j < (2 * buffer.length); j++)
-           {
-              assertEquals("checking byte " + j, _workbook_data[ j ],
-                    buffer[ j - buffer.length ]);
-           }
-           assertTrue(stream.markSupported());
-        }
-    }
-
-    /**
-     * test simple read method
-     */
-    public void testReadSingleByte() throws IOException {
-       DocumentInputStream[] streams = new DocumentInputStream[] {
-             new DocumentInputStream(_workbook_o),
-             new NDocumentInputStream(_workbook_n)
-       };
-       for(DocumentInputStream stream : streams) {
-          int remaining = _workbook_size;
-
-          // Try and read each byte in turn
-          for (int j = 0; j < _workbook_size; j++) {
-             int b = stream.read();
-             assertTrue("checking sign of " + j, b >= 0);
-             assertEquals("validating byte " + j, _workbook_data[ j ],
-                   ( byte ) b);
-             remaining--;
-             assertEquals("checking remaining after reading byte " + j,
-                   remaining, stream.available());
-          }
-          
-          // Ensure we fell off the end
-          assertEquals(-1, stream.read());
-          
-          // Check that after close we can no longer read
-          stream.close();
-          try {
-             stream.read();
-             fail("Should have caught IOException");
-          } catch (IOException ignored) {
-             // as expected
-          }
-       }
-    }
-
-    /**
-     * Test buffered read
-     */
-    public void testBufferRead() throws IOException {
-       DocumentInputStream[] streams = new DocumentInputStream[] {
-             new DocumentInputStream(_workbook_o),
-             new NDocumentInputStream(_workbook_n)
-       };
-       for(DocumentInputStream stream : streams) {
-          // Need to give a byte array to read
-          try {
-             stream.read(null);
-             fail("Should have caught NullPointerException");
-          } catch (NullPointerException ignored) {
-             // as expected
-          }
-
-          // test reading zero length buffer
-          assertEquals(0, stream.read(new byte[ 0 ]));
-          assertEquals(_workbook_size, stream.available());
-          byte[] buffer = new byte[ _buffer_size ];
-          int    offset = 0;
-
-          while (stream.available() >= buffer.length)
-          {
-             assertEquals(_buffer_size, stream.read(buffer));
-             for (byte data : buffer) {
-                assertEquals("in main loop, byte " + offset,
-                      _workbook_data[ offset ], data);
-                offset++;
-             }
-             assertEquals("offset " + offset, _workbook_size - offset,
-                   stream.available());
-          }
-          assertEquals(_workbook_size % _buffer_size, stream.available());
-          Arrays.fill(buffer, ( byte ) 0);
-          int count = stream.read(buffer);
-
-          assertEquals(_workbook_size % _buffer_size, count);
-          for (int j = 0; j < count; j++)
-          {
-             assertEquals("past main loop, byte " + offset,
-                   _workbook_data[ offset ], buffer[ j ]);
-             offset++;
-          }
-          assertEquals(_workbook_size, offset);
-          for (int j = count; j < buffer.length; j++)
-          {
-             assertEquals("checking remainder, byte " + j, 0, buffer[ j ]);
-          }
-          assertEquals(-1, stream.read(buffer));
-          stream.close();
-          try {
-             stream.read(buffer);
-             fail("Should have caught IOException");
-          } catch (IOException ignored) {
-             // as expected
-          }
-       }
-    }
-
-    /**
-     * Test complex buffered read
-     */
-    public void testComplexBufferRead() throws IOException {
-       DocumentInputStream[] streams = new DocumentInputStream[] {
-             new DocumentInputStream(_workbook_o),
-             new NDocumentInputStream(_workbook_n)
-       };
-       for(DocumentInputStream stream : streams) {
-          try {
-             stream.read(null, 0, 1);
-             fail("Should have caught NullPointerException");
-          } catch (IllegalArgumentException ignored) {
-             // as expected
-          }
-
-          // test illegal offsets and lengths
-          try {
-             stream.read(new byte[ 5 ], -4, 0);
-             fail("Should have caught IndexOutOfBoundsException");
-          } catch (IndexOutOfBoundsException ignored) {
-             // as expected
-          }
-          try {
-             stream.read(new byte[ 5 ], 0, -4);
-             fail("Should have caught IndexOutOfBoundsException");
-          } catch (IndexOutOfBoundsException ignored) {
-             // as expected
-          }
-          try {
-             stream.read(new byte[ 5 ], 0, 6);
-             fail("Should have caught IndexOutOfBoundsException");
-          } catch (IndexOutOfBoundsException ignored) {
-             // as expected
-          }
-
-          // test reading zero
-          assertEquals(0, stream.read(new byte[ 5 ], 0, 0));
-          assertEquals(_workbook_size, stream.available());
-          byte[] buffer = new byte[ _workbook_size ];
-          int    offset = 0;
-
-          while (stream.available() >= _buffer_size)
-          {
-             Arrays.fill(buffer, ( byte ) 0);
-             assertEquals(_buffer_size,
-                   stream.read(buffer, offset, _buffer_size));
-             for (int j = 0; j < offset; j++)
-             {
-                assertEquals("checking byte " + j, 0, buffer[ j ]);
-             }
-             for (int j = offset; j < (offset + _buffer_size); j++)
-             {
-                assertEquals("checking byte " + j, _workbook_data[ j ],
-                      buffer[ j ]);
-             }
-             for (int j = offset + _buffer_size; j < buffer.length; j++)
-             {
-                assertEquals("checking byte " + j, 0, buffer[ j ]);
-             }
-             offset += _buffer_size;
-             assertEquals("offset " + offset, _workbook_size - offset,
-                   stream.available());
-          }
-          assertEquals(_workbook_size % _buffer_size, stream.available());
-          Arrays.fill(buffer, ( byte ) 0);
-          int count = stream.read(buffer, offset,
-                _workbook_size % _buffer_size);
-
-          assertEquals(_workbook_size % _buffer_size, count);
-          for (int j = 0; j < offset; j++)
-          {
-             assertEquals("checking byte " + j, 0, buffer[ j ]);
-          }
-          for (int j = offset; j < buffer.length; j++)
-          {
-             assertEquals("checking byte " + j, _workbook_data[ j ],
-                   buffer[ j ]);
-          }
-          assertEquals(_workbook_size, offset + count);
-          for (int j = count; j < offset; j++)
-          {
-             assertEquals("byte " + j, 0, buffer[ j ]);
-          }
-          
-          assertEquals(-1, stream.read(buffer, 0, 1));
-          stream.close();
-          try {
-             stream.read(buffer, 0, 1);
-             fail("Should have caught IOException");
-          } catch (IOException ignored) {
-             // as expected
-          }
-       }
-    }
-
-    /**
-     * Tests that we can skip within the stream
-     */
-    public void testSkip() throws IOException {
-       DocumentInputStream[] streams = new DocumentInputStream[] {
-             new DocumentInputStream(_workbook_o),
-             new NDocumentInputStream(_workbook_n)
-       };
-       for(DocumentInputStream stream : streams) {
-          assertEquals(_workbook_size, stream.available());
-          int count = stream.available();
-
-          while (stream.available() >= _buffer_size) {
-             assertEquals(_buffer_size, stream.skip(_buffer_size));
-             count -= _buffer_size;
-             assertEquals(count, stream.available());
-          }
-          assertEquals(_workbook_size % _buffer_size,
-                stream.skip(_buffer_size));
-          assertEquals(0, stream.available());
-          stream.reset();
-          assertEquals(_workbook_size, stream.available());
-          assertEquals(_workbook_size, stream.skip(_workbook_size * 2));
-          assertEquals(0, stream.available());
-          stream.reset();
-          assertEquals(_workbook_size, stream.available());
-          assertEquals(_workbook_size,
-                stream.skip(2 + ( long ) Integer.MAX_VALUE));
-          assertEquals(0, stream.available());
-       }
-    }
-    
-    /**
-     * Test that we can read files at multiple levels down the tree
-     */
-    public void testReadMultipleTreeLevels() throws Exception {
-       final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
-       File sample = _samples.getFile("Sample.pub");
-       
-       DocumentInputStream stream;
-       
-       NPOIFSFileSystem npoifs = new NPOIFSFileSystem(sample);
-       try {
-           OPOIFSFileSystem  opoifs = new OPOIFSFileSystem(new FileInputStream(sample));
-           
-           // Ensure we have what we expect on the root
-           assertEquals(npoifs, npoifs.getRoot().getNFileSystem());
-           assertEquals(npoifs, npoifs.getRoot().getFileSystem());
-           assertEquals(null,   npoifs.getRoot().getOFileSystem());
-           assertEquals(null,   opoifs.getRoot().getFileSystem());
-           assertEquals(opoifs, opoifs.getRoot().getOFileSystem());
-           assertEquals(null,   opoifs.getRoot().getNFileSystem());
-           
-           // Check inside
-           for(DirectoryNode root : new DirectoryNode[] { opoifs.getRoot(), npoifs.getRoot() }) {
-              // Top Level
-              Entry top = root.getEntry("Contents");
-              assertEquals(true, top.isDocumentEntry());
-              stream = root.createDocumentInputStream(top);
-              stream.read();
-              
-              // One Level Down
-              DirectoryNode escher = (DirectoryNode)root.getEntry("Escher");
-              Entry one = escher.getEntry("EscherStm");
-              assertEquals(true, one.isDocumentEntry());
-              stream = escher.createDocumentInputStream(one);
-              stream.read();
-              
-              // Two Levels Down
-              DirectoryNode quill = (DirectoryNode)root.getEntry("Quill");
-              DirectoryNode quillSub = (DirectoryNode)quill.getEntry("QuillSub");
-              Entry two = quillSub.getEntry("CONTENTS");
-              assertEquals(true, two.isDocumentEntry());
-              stream = quillSub.createDocumentInputStream(two);
-              stream.read();
-           }
-       } finally {
-           npoifs.close();
-       }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentNode.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentNode.java
deleted file mode 100644
index 69d1677..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentNode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.*;
-
-import junit.framework.*;
-
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.DocumentProperty;
-import org.apache.poi.poifs.storage.RawDataBlock;
-
-/**
- * Class to test DocumentNode functionality
- *
- * @author Marc Johnson
- */
-public final class TestDocumentNode extends TestCase {
-
-    /**
-     * test constructor
-     */
-    public void testConstructor() throws IOException {
-        DirectoryProperty    property1 = new DirectoryProperty("directory");
-        RawDataBlock[]       rawBlocks = new RawDataBlock[ 4 ];
-        ByteArrayInputStream stream    =
-            new ByteArrayInputStream(new byte[ 2048 ]);
-
-        for (int j = 0; j < 4; j++)
-        {
-            rawBlocks[ j ] = new RawDataBlock(stream);
-        }
-        OPOIFSDocument   document  = new OPOIFSDocument("document", rawBlocks,
-                                         2000);
-        DocumentProperty property2 = document.getDocumentProperty();
-        DirectoryNode    parent    = new DirectoryNode(property1, (POIFSFileSystem)null, null);
-        DocumentNode     node      = new DocumentNode(property2, parent);
-
-        // verify we can retrieve the document
-        assertEquals(property2.getDocument(), node.getDocument());
-
-        // verify we can get the size
-        assertEquals(property2.getSize(), node.getSize());
-
-        // verify isDocumentEntry returns true
-        assertTrue(node.isDocumentEntry());
-
-        // verify isDirectoryEntry returns false
-        assertTrue(!node.isDirectoryEntry());
-
-        // verify getName behaves correctly
-        assertEquals(property2.getName(), node.getName());
-
-        // verify getParent behaves correctly
-        assertEquals(parent, node.getParent());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
deleted file mode 100644
index 4218367..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
+++ /dev/null
@@ -1,166 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test DocumentOutputStream functionality
- *
- * @author Marc Johnson
- */
-public final class TestDocumentOutputStream extends TestCase {
-
-    /**
-     * test write(int) behavior
-     */
-    public void testWrite1() throws IOException {
-        ByteArrayOutputStream stream  = new ByteArrayOutputStream();
-        DocumentOutputStream  dstream = new DocumentOutputStream(stream, 25);
-
-        for (int j = 0; j < 25; j++)
-        {
-            dstream.write(j);
-        }
-        try
-        {
-            dstream.write(0);
-            fail("Should have caught IOException");
-        }
-        catch (IOException ignored)
-        {
-        }
-        byte[] output = stream.toByteArray();
-
-        assertEquals(25, output.length);
-        for (int j = 0; j < 25; j++)
-        {
-            assertEquals(( byte ) j, output[ j ]);
-        }
-        stream.close();
-    }
-
-    /**
-     * test write(byte[]) behavior
-     */
-    public void testWrite2() throws IOException {
-        ByteArrayOutputStream stream  = new ByteArrayOutputStream();
-        DocumentOutputStream  dstream = new DocumentOutputStream(stream, 25);
-
-        for (int j = 0; j < 6; j++)
-        {
-            byte[] array = new byte[ 4 ];
-
-            Arrays.fill(array, ( byte ) j);
-            dstream.write(array);
-        }
-        try
-        {
-            byte[] array = new byte[ 4 ];
-
-            Arrays.fill(array, ( byte ) 7);
-            dstream.write(array);
-            fail("Should have caught IOException");
-        }
-        catch (IOException ignored)
-        {
-        }
-        byte[] output = stream.toByteArray();
-
-        assertEquals(24, output.length);
-        for (int j = 0; j < 6; j++)
-        {
-            for (int k = 0; k < 4; k++)
-            {
-                assertEquals(String.valueOf((j * 4) + k), ( byte ) j,
-                             output[ (j * 4) + k ]);
-            }
-        }
-        stream.close();
-    }
-
-    /**
-     * test write(byte[], int, int) behavior
-     */
-    public void testWrite3() throws IOException {
-        ByteArrayOutputStream stream  = new ByteArrayOutputStream();
-        DocumentOutputStream  dstream = new DocumentOutputStream(stream, 25);
-        byte[]                array   = new byte[ 50 ];
-
-        for (int j = 0; j < 50; j++)
-        {
-            array[ j ] = ( byte ) j;
-        }
-        dstream.write(array, 1, 25);
-        try
-        {
-            dstream.write(array, 0, 1);
-            fail("Should have caught IOException");
-        }
-        catch (IOException ignored)
-        {
-        }
-        byte[] output = stream.toByteArray();
-
-        assertEquals(25, output.length);
-        for (int j = 0; j < 25; j++)
-        {
-            assertEquals(( byte ) (j + 1), output[ j ]);
-        }
-        stream.close();
-    }
-
-    /**
-     * test writeFiller()
-     */
-    public void testWriteFiller() throws IOException {
-        ByteArrayOutputStream stream  = new ByteArrayOutputStream();
-        DocumentOutputStream  dstream = new DocumentOutputStream(stream, 25);
-
-        for (int j = 0; j < 25; j++)
-        {
-            dstream.write(j);
-        }
-        try
-        {
-            dstream.write(0);
-            fail("Should have caught IOException");
-        }
-        catch (IOException ignored)
-        {
-        }
-        dstream.writeFiller(100, ( byte ) 0xff);
-        byte[] output = stream.toByteArray();
-
-        assertEquals(100, output.length);
-        for (int j = 0; j < 25; j++)
-        {
-            assertEquals(( byte ) j, output[ j ]);
-        }
-        for (int j = 25; j < 100; j++)
-        {
-            assertEquals(String.valueOf(j), ( byte ) 0xff, output[ j ]);
-        }
-        stream.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
deleted file mode 100644
index 22449e5..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.poifs.filesystem.POIFSWriterEvent;
-import org.apache.poi.poifs.filesystem.POIFSWriterListener;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-public final class TestEmptyDocument extends TestCase {
-    private static POILogger _logger = POILogFactory.getLogger(TestEmptyDocument.class);
-
-	public void testSingleEmptyDocument() throws IOException {
-		POIFSFileSystem fs = new POIFSFileSystem();
-		DirectoryEntry dir = fs.getRoot();
-		dir.createDocument("Foo", new ByteArrayInputStream(new byte[] {}));
-
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		fs.writeFilesystem(out);
-		new POIFSFileSystem(new ByteArrayInputStream(out.toByteArray()));
-	}
-
-	public void testSingleEmptyDocumentEvent() throws IOException {
-		POIFSFileSystem fs = new POIFSFileSystem();
-		DirectoryEntry dir = fs.getRoot();
-		dir.createDocument("Foo", 0, new POIFSWriterListener() {
-			@Override
-            public void processPOIFSWriterEvent(POIFSWriterEvent event) {
-				_logger.log(POILogger.WARN, "written");
-			}
-		});
-
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		fs.writeFilesystem(out);
-		new POIFSFileSystem(new ByteArrayInputStream(out.toByteArray()));
-	}
-
-	public void testEmptyDocumentWithFriend() throws IOException {
-		POIFSFileSystem fs = new POIFSFileSystem();
-		DirectoryEntry dir = fs.getRoot();
-		dir.createDocument("Bar", new ByteArrayInputStream(new byte[] { 0 }));
-		dir.createDocument("Foo", new ByteArrayInputStream(new byte[] {}));
-
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		fs.writeFilesystem(out);
-		new POIFSFileSystem(new ByteArrayInputStream(out.toByteArray()));
-	}
-
-	public void testEmptyDocumentEventWithFriend() throws IOException {
-		POIFSFileSystem fs = new POIFSFileSystem();
-		DirectoryEntry dir = fs.getRoot();
-		dir.createDocument("Bar", 1, new POIFSWriterListener() {
-			@Override
-            public void processPOIFSWriterEvent(POIFSWriterEvent event) {
-				try {
-					event.getStream().write(0);
-				} catch (IOException exception) {
-					throw new RuntimeException("exception on write: " + exception);
-				}
-			}
-		});
-		dir.createDocument("Foo", 0, new POIFSWriterListener() {
-			@Override
-            public void processPOIFSWriterEvent(POIFSWriterEvent event) {
-			}
-		});
-
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		fs.writeFilesystem(out);
-		new POIFSFileSystem(new ByteArrayInputStream(out.toByteArray()));
-	}
-
-	public void testEmptyDocumentBug11744() throws Exception {
-		byte[] testData = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-		POIFSFileSystem fs = new POIFSFileSystem();
-		fs.createDocument(new ByteArrayInputStream(new byte[0]), "Empty");
-		fs.createDocument(new ByteArrayInputStream(testData), "NotEmpty");
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		fs.writeFilesystem(out);
-		out.toByteArray();
-
-		// This line caused the error.
-		fs = new POIFSFileSystem(new ByteArrayInputStream(out.toByteArray()));
-
-		DocumentEntry entry = (DocumentEntry) fs.getRoot().getEntry("Empty");
-		assertEquals("Expected zero size", 0, entry.getSize());
-		byte[] actualReadbackData;
-		actualReadbackData = IOUtils.toByteArray(new DocumentInputStream(entry));
-		assertEquals("Expected zero read from stream", 0, actualReadbackData.length);
-
-		entry = (DocumentEntry) fs.getRoot().getEntry("NotEmpty");
-		actualReadbackData = IOUtils.toByteArray(new DocumentInputStream(entry));
-		assertEquals("Expected size was wrong", testData.length, entry.getSize());
-		assertTrue("Expected different data read from stream", Arrays.equals(testData,
-				actualReadbackData));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java
deleted file mode 100644
index 2800e94..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-public class TestEntryUtils extends TestCase {
-    private final byte[] dataSmallA = new byte[] { 12, 42, 11, -12, -121 };
-    private final byte[] dataSmallB = new byte[] { 11, 73, 21, -92, -103 };
-
-    public void testCopyRecursively() throws Exception {
-       POIFSFileSystem fsD = new POIFSFileSystem();
-       POIFSFileSystem fs = new POIFSFileSystem();
-       DirectoryEntry dirA = fs.createDirectory("DirA");
-       DirectoryEntry dirB = fs.createDirectory("DirB");
-       
-       DocumentEntry entryR = fs.createDocument(new ByteArrayInputStream(dataSmallA), "EntryRoot");
-       DocumentEntry entryA1 = dirA.createDocument("EntryA1", new ByteArrayInputStream(dataSmallA));
-       DocumentEntry entryA2 = dirA.createDocument("EntryA2", new ByteArrayInputStream(dataSmallB));
-       
-       // Copy docs
-       assertEquals(0, fsD.getRoot().getEntryCount());
-       EntryUtils.copyNodeRecursively(entryR, fsD.getRoot());
-       
-       assertEquals(1, fsD.getRoot().getEntryCount());
-       assertNotNull(fsD.getRoot().getEntry("EntryRoot"));
-       
-       EntryUtils.copyNodeRecursively(entryA1, fsD.getRoot());
-       assertEquals(2, fsD.getRoot().getEntryCount());
-       assertNotNull(fsD.getRoot().getEntry("EntryRoot"));
-       assertNotNull(fsD.getRoot().getEntry("EntryA1"));
-       
-       EntryUtils.copyNodeRecursively(entryA2, fsD.getRoot());
-       assertEquals(3, fsD.getRoot().getEntryCount());
-       assertNotNull(fsD.getRoot().getEntry("EntryRoot"));
-       assertNotNull(fsD.getRoot().getEntry("EntryA1"));
-       assertNotNull(fsD.getRoot().getEntry("EntryA2"));
-       
-       // Copy directories
-       fsD = new POIFSFileSystem();
-       assertEquals(0, fsD.getRoot().getEntryCount());
-       
-       EntryUtils.copyNodeRecursively(dirB, fsD.getRoot());
-       assertEquals(1, fsD.getRoot().getEntryCount());
-       assertNotNull(fsD.getRoot().getEntry("DirB"));
-       assertEquals(0, ((DirectoryEntry)fsD.getRoot().getEntry("DirB")).getEntryCount());
-       
-       EntryUtils.copyNodeRecursively(dirA, fsD.getRoot());
-       assertEquals(2, fsD.getRoot().getEntryCount());
-       assertNotNull(fsD.getRoot().getEntry("DirB"));
-       assertEquals(0, ((DirectoryEntry)fsD.getRoot().getEntry("DirB")).getEntryCount());
-       assertNotNull(fsD.getRoot().getEntry("DirA"));
-       assertEquals(2, ((DirectoryEntry)fsD.getRoot().getEntry("DirA")).getEntryCount());
-       
-       // Copy the whole lot
-       fsD = new POIFSFileSystem();
-       assertEquals(0, fsD.getRoot().getEntryCount());
-       
-       EntryUtils.copyNodes(fs, fsD, new ArrayList<String>());
-       assertEquals(3, fsD.getRoot().getEntryCount());
-       assertNotNull(fsD.getRoot().getEntry(dirA.getName()));
-       assertNotNull(fsD.getRoot().getEntry(dirB.getName()));
-       assertNotNull(fsD.getRoot().getEntry(entryR.getName()));
-       assertEquals(0, ((DirectoryEntry)fsD.getRoot().getEntry("DirB")).getEntryCount());
-       assertEquals(2, ((DirectoryEntry)fsD.getRoot().getEntry("DirA")).getEntryCount());
-    }
-
-    public void testAreDocumentsIdentical() throws Exception {
-       POIFSFileSystem fs = new POIFSFileSystem();
-       DirectoryEntry dirA = fs.createDirectory("DirA");
-       DirectoryEntry dirB = fs.createDirectory("DirB");
-       
-       DocumentEntry entryA1 = dirA.createDocument("Entry1", new ByteArrayInputStream(dataSmallA));
-       DocumentEntry entryA1b = dirA.createDocument("Entry1b", new ByteArrayInputStream(dataSmallA));
-       DocumentEntry entryA2 = dirA.createDocument("Entry2", new ByteArrayInputStream(dataSmallB));
-       DocumentEntry entryB1 = dirB.createDocument("Entry1", new ByteArrayInputStream(dataSmallA));
-       
-       
-       // Names must match
-       assertEquals(false, entryA1.getName().equals(entryA1b.getName()));
-       assertEquals(false, EntryUtils.areDocumentsIdentical(entryA1, entryA1b));
-       
-       // Contents must match
-       assertEquals(false, EntryUtils.areDocumentsIdentical(entryA1, entryA2));
-       
-       // Parents don't matter if contents + names are the same
-       assertEquals(false, entryA1.getParent().equals(entryB1.getParent()));
-       assertEquals(true, EntryUtils.areDocumentsIdentical(entryA1, entryB1));
-       
-       
-       // Can work with NPOIFS + POIFS
-       ByteArrayOutputStream tmpO = new ByteArrayOutputStream();
-       fs.writeFilesystem(tmpO);
-       ByteArrayInputStream tmpI = new ByteArrayInputStream(tmpO.toByteArray());
-       NPOIFSFileSystem nfs = new NPOIFSFileSystem(tmpI);
-       
-       DirectoryEntry dN1 = (DirectoryEntry)nfs.getRoot().getEntry("DirA");
-       DirectoryEntry dN2 = (DirectoryEntry)nfs.getRoot().getEntry("DirB");
-       DocumentEntry eNA1 = (DocumentEntry)dN1.getEntry(entryA1.getName());
-       DocumentEntry eNA2 = (DocumentEntry)dN1.getEntry(entryA2.getName());
-       DocumentEntry eNB1 = (DocumentEntry)dN2.getEntry(entryB1.getName());
-       
-       assertEquals(false, EntryUtils.areDocumentsIdentical(eNA1, eNA2));
-       assertEquals(true, EntryUtils.areDocumentsIdentical(eNA1, eNB1));
-       
-       assertEquals(false, EntryUtils.areDocumentsIdentical(eNA1, entryA1b));
-       assertEquals(false, EntryUtils.areDocumentsIdentical(eNA1, entryA2));
-       
-       assertEquals(true, EntryUtils.areDocumentsIdentical(eNA1, entryA1));
-       assertEquals(true, EntryUtils.areDocumentsIdentical(eNA1, entryB1));
-    }
-
-    public void testAreDirectoriesIdentical() throws Exception {
-       POIFSFileSystem fs = new POIFSFileSystem();
-       DirectoryEntry dirA = fs.createDirectory("DirA");
-       DirectoryEntry dirB = fs.createDirectory("DirB");
-       
-       // Names must match
-       assertEquals(false, EntryUtils.areDirectoriesIdentical(dirA, dirB));
-       
-       // Empty dirs are fine
-       DirectoryEntry dirA1 = dirA.createDirectory("TheDir"); 
-       DirectoryEntry dirB1 = dirB.createDirectory("TheDir");
-       assertEquals(0, dirA1.getEntryCount());
-       assertEquals(0, dirB1.getEntryCount());
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(dirA1, dirB1));
-       
-       // Otherwise children must match
-       dirA1.createDocument("Entry1", new ByteArrayInputStream(dataSmallA));
-       assertEquals(false, EntryUtils.areDirectoriesIdentical(dirA1, dirB1));
-       
-       dirB1.createDocument("Entry1", new ByteArrayInputStream(dataSmallA));
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(dirA1, dirB1));
-       
-       dirA1.createDirectory("DD");
-       assertEquals(false, EntryUtils.areDirectoriesIdentical(dirA1, dirB1));
-       dirB1.createDirectory("DD");
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(dirA1, dirB1));
-       
-       
-       // Excludes support
-       List<String> excl = Arrays.asList(new String[] {"Ignore1", "IgnDir/Ign2"});
-       FilteringDirectoryNode fdA = new FilteringDirectoryNode(dirA1, excl);
-       FilteringDirectoryNode fdB = new FilteringDirectoryNode(dirB1, excl);
-       
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(fdA, fdB));
-       
-       // Add an ignored doc, no notice is taken
-       fdA.createDocument("Ignore1", new ByteArrayInputStream(dataSmallA));
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(fdA, fdB));
-       
-       // Add a directory with filtered contents, not the same
-       DirectoryEntry dirAI = dirA1.createDirectory("IgnDir");
-       assertEquals(false, EntryUtils.areDirectoriesIdentical(fdA, fdB));
-       
-       DirectoryEntry dirBI = dirB1.createDirectory("IgnDir");
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(fdA, fdB));
-       
-       // Add something to the filtered subdir that gets ignored
-       dirAI.createDocument("Ign2", new ByteArrayInputStream(dataSmallA));
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(fdA, fdB));
-       
-       // And something that doesn't
-       dirAI.createDocument("IgnZZ", new ByteArrayInputStream(dataSmallA));
-       assertEquals(false, EntryUtils.areDirectoriesIdentical(fdA, fdB));
-       
-       dirBI.createDocument("IgnZZ", new ByteArrayInputStream(dataSmallA));
-       assertEquals(true, EntryUtils.areDirectoriesIdentical(fdA, fdB));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
deleted file mode 100644
index 2bdcb00..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-
-/**
- * Tests bugs across both POIFSFileSystem and NPOIFSFileSystem
- */
-public final class TestFileSystemBugs extends TestCase {
-    protected static POIDataSamples _samples = POIDataSamples.getPOIFSInstance();
-    protected static POIDataSamples _ssSamples = POIDataSamples.getSpreadSheetInstance();
-    
-    protected List<NPOIFSFileSystem> openedFSs;
-    @Override
-    protected void tearDown() throws Exception {
-        if (openedFSs != null && !openedFSs.isEmpty()) {
-            for (NPOIFSFileSystem fs : openedFSs) {
-                try {
-                    fs.close();
-                } catch (Exception e) {
-                    System.err.println("Error closing FS: " + e);
-                }
-            }
-        }
-        openedFSs = null;
-    }
-    protected DirectoryNode[] openSample(String name, boolean oldFails) throws Exception {
-        return openSamples(new InputStream[] {
-                _samples.openResourceAsStream(name),
-                _samples.openResourceAsStream(name)
-        }, oldFails);
-    }
-    protected DirectoryNode[] openSSSample(String name, boolean oldFails) throws Exception {
-        return openSamples(new InputStream[] {
-                _ssSamples.openResourceAsStream(name),
-                _ssSamples.openResourceAsStream(name)
-        }, oldFails);
-    }
-    protected DirectoryNode[] openSamples(InputStream[] inps, boolean oldFails) throws Exception {
-        NPOIFSFileSystem nfs = new NPOIFSFileSystem(inps[0]);
-        if (openedFSs == null) openedFSs = new ArrayList<NPOIFSFileSystem>();
-        openedFSs.add(nfs);
-        
-        OPOIFSFileSystem ofs = null;
-        try {
-            ofs = new OPOIFSFileSystem(inps[1]);
-            if (oldFails) fail("POIFSFileSystem should have failed but didn't");
-        } catch (Exception e) {
-            if (!oldFails) throw e;
-        }
-
-        if (ofs == null) return new DirectoryNode[] { nfs.getRoot() };
-        return new DirectoryNode[] { ofs.getRoot(), nfs.getRoot() };
-    }
-
-    /**
-     * Test that we can open files that come via Lotus notes.
-     * These have a top level directory without a name....
-     */
-    public void testNotesOLE2Files() throws Exception {
-        // Check the contents
-        for (DirectoryNode root : openSample("Notes.ole2", false)) {
-            assertEquals(1, root.getEntryCount());
-
-            Entry entry = root.getEntries().next();
-            assertTrue(entry.isDirectoryEntry());
-            assertTrue(entry instanceof DirectoryEntry);
-
-            // The directory lacks a name!
-            DirectoryEntry dir = (DirectoryEntry)entry;
-            assertEquals("", dir.getName());
-
-            // Has two children
-            assertEquals(2, dir.getEntryCount());
-
-            // Check them
-            Iterator<Entry> it = dir.getEntries();
-            entry = it.next();
-            assertEquals(true, entry.isDocumentEntry());
-            assertEquals("\u0001Ole10Native", entry.getName());
-
-            entry = it.next();
-            assertEquals(true, entry.isDocumentEntry());
-            assertEquals("\u0001CompObj", entry.getName());
-        }
-    }
-    
-    /**
-     * Ensure that a file with a corrupted property in the
-     *  properties table can still be loaded, and the remaining
-     *  properties used
-     * Note - only works for NPOIFSFileSystem, POIFSFileSystem
-     *  can't cope with this level of corruption
-     */
-    public void testCorruptedProperties() throws Exception {
-        for (DirectoryNode root : openSample("unknown_properties.msg", true)) {
-            assertEquals(42, root.getEntryCount());
-        }
-    }
-    
-    /**
-     * With heavily nested documents, ensure we still re-write the same
-     */
-    public void testHeavilyNestedReWrite() throws Exception {
-        for (DirectoryNode root : openSSSample("ex42570-20305.xls", false)) {
-            // Record the structure
-            Map<String,Integer> entries = new HashMap<String, Integer>();
-            fetchSizes("/", root, entries);
-            
-            // Prepare to copy
-            DirectoryNode dest;
-            if (root.getNFileSystem() != null) {
-                dest = (new NPOIFSFileSystem()).getRoot();
-            } else {
-                dest = (new OPOIFSFileSystem()).getRoot();
-            }
-            
-            // Copy over
-            EntryUtils.copyNodes(root, dest);
-            
-            // Re-load, always as NPOIFS
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            if (root.getNFileSystem() != null) {
-                root.getNFileSystem().writeFilesystem(baos);
-            } else {
-                root.getOFileSystem().writeFilesystem(baos);
-            }
-            NPOIFSFileSystem read = new NPOIFSFileSystem(
-                    new ByteArrayInputStream(baos.toByteArray()));
-            
-            // Check the structure matches
-            checkSizes("/", read.getRoot(), entries);
-        }
-    }
-    private void fetchSizes(String path, DirectoryNode dir, Map<String,Integer> entries) {
-        for (Entry entry : dir) {
-            if (entry instanceof DirectoryNode) {
-                String ourPath = path + entry.getName() + "/";
-                entries.put(ourPath, -1);
-                fetchSizes(ourPath, (DirectoryNode)entry, entries);
-            } else {
-                DocumentNode doc = (DocumentNode)entry;
-                entries.put(path+entry.getName(), doc.getSize());
-            }
-        }
-    }
-    private void checkSizes(String path, DirectoryNode dir, Map<String,Integer> entries) {
-        for (Entry entry : dir) {
-            if (entry instanceof DirectoryNode) {
-                String ourPath = path + entry.getName() + "/";
-                assertTrue(entries.containsKey(ourPath));
-                assertEquals(-1, entries.get(ourPath).intValue());
-                checkSizes(ourPath, (DirectoryNode)entry, entries);
-            } else {
-                DocumentNode doc = (DocumentNode)entry;
-                assertEquals(entries.get(path+entry.getName()).intValue(), doc.getSize());
-            }
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
deleted file mode 100644
index bef0281..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
+++ /dev/null
@@ -1,172 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test FilteringDirectoryNode functionality
- */
-public final class TestFilteringDirectoryNode extends TestCase {
-    private POIFSFileSystem fs;
-    private DirectoryEntry dirA;
-    private DirectoryEntry dirAA;
-    private DirectoryEntry dirB;
-    private DocumentEntry eRoot;
-    private DocumentEntry eA;
-    private DocumentEntry eAA;
-    
-    @Override
-    protected void setUp() throws Exception {
-       fs = new POIFSFileSystem();
-       dirA = fs.createDirectory("DirA");
-       dirB = fs.createDirectory("DirB");
-       dirAA = dirA.createDirectory("DirAA");
-       eRoot = fs.getRoot().createDocument("Root", new ByteArrayInputStream(new byte[] {}));
-       eA  = dirA.createDocument("NA", new ByteArrayInputStream(new byte[] {}));
-       eAA = dirAA.createDocument("NAA", new ByteArrayInputStream(new byte[] {}));
-    }
-    
-    public void testNoFiltering() throws Exception {
-       FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), new HashSet<String>());
-       assertEquals(3, d.getEntryCount());
-       assertEquals(dirA.getName(), d.getEntry(dirA.getName()).getName());
-       
-       assertEquals(true, d.getEntry(dirA.getName()).isDirectoryEntry());
-       assertEquals(false, d.getEntry(dirA.getName()).isDocumentEntry());
-       
-       assertEquals(true, d.getEntry(dirB.getName()).isDirectoryEntry());
-       assertEquals(false, d.getEntry(dirB.getName()).isDocumentEntry());
-       
-       assertEquals(false, d.getEntry(eRoot.getName()).isDirectoryEntry());
-       assertEquals(true, d.getEntry(eRoot.getName()).isDocumentEntry());
-       
-       Iterator<Entry> i = d.getEntries();
-       assertEquals(dirA, i.next());
-       assertEquals(dirB, i.next());
-       assertEquals(eRoot, i.next());
-       assertEquals(null, i.next());
-    }
-    
-    public void testChildFiltering() throws Exception {
-       List<String> excl = Arrays.asList(new String[] {"NotThere","AlsoNotThere", eRoot.getName()});
-       FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), excl);
-       
-       assertEquals(2, d.getEntryCount());
-       assertEquals(true, d.hasEntry(dirA.getName()));
-       assertEquals(true, d.hasEntry(dirB.getName()));
-       assertEquals(false, d.hasEntry(eRoot.getName()));
-       
-       assertEquals(dirA, d.getEntry(dirA.getName()));
-       assertEquals(dirB, d.getEntry(dirB.getName()));
-       try {
-          d.getEntry(eRoot.getName());
-          fail("Should be filtered");
-       } catch(FileNotFoundException e) {}
-       
-       Iterator<Entry> i = d.getEntries();
-       assertEquals(dirA, i.next());
-       assertEquals(dirB, i.next());
-       assertEquals(null, i.next());
-       
-       
-       // Filter more
-       excl = Arrays.asList(new String[] {"NotThere","AlsoNotThere", eRoot.getName(), dirA.getName()});
-       d = new FilteringDirectoryNode(fs.getRoot(), excl);
-       
-       assertEquals(1, d.getEntryCount());
-       assertEquals(false, d.hasEntry(dirA.getName()));
-       assertEquals(true, d.hasEntry(dirB.getName()));
-       assertEquals(false, d.hasEntry(eRoot.getName()));
-       
-       try {
-          d.getEntry(dirA.getName());
-          fail("Should be filtered");
-       } catch(FileNotFoundException e) {}
-       assertEquals(dirB, d.getEntry(dirB.getName()));
-       try {
-          d.getEntry(eRoot.getName());
-          fail("Should be filtered");
-       } catch(FileNotFoundException e) {}
-       
-       i = d.getEntries();
-       assertEquals(dirB, i.next());
-       assertEquals(null, i.next());
-       
-       
-       // Filter everything
-       excl = Arrays.asList(new String[] {"NotThere", eRoot.getName(), dirA.getName(), dirB.getName()});
-       d = new FilteringDirectoryNode(fs.getRoot(), excl);
-       
-       assertEquals(0, d.getEntryCount());
-       assertEquals(false, d.hasEntry(dirA.getName()));
-       assertEquals(false, d.hasEntry(dirB.getName()));
-       assertEquals(false, d.hasEntry(eRoot.getName()));
-       
-       try {
-          d.getEntry(dirA.getName());
-          fail("Should be filtered");
-       } catch(FileNotFoundException e) {}
-       try {
-          d.getEntry(dirB.getName());
-          fail("Should be filtered");
-       } catch(FileNotFoundException e) {}
-       try {
-          d.getEntry(eRoot.getName());
-          fail("Should be filtered");
-       } catch(FileNotFoundException e) {}
-       
-       i = d.getEntries();
-       assertEquals(null, i.next());
-    }
-    
-    public void testNestedFiltering() throws Exception {
-       List<String> excl = Arrays.asList(new String[] {
-             dirA.getName()+"/"+"MadeUp",
-             dirA.getName()+"/"+eA.getName(),
-             dirA.getName()+"/"+dirAA.getName()+"/Test",
-             eRoot.getName()
-       });
-       FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), excl);
-       
-       // Check main
-       assertEquals(2, d.getEntryCount());
-       assertEquals(true, d.hasEntry(dirA.getName()));
-       assertEquals(true, d.hasEntry(dirB.getName()));
-       assertEquals(false, d.hasEntry(eRoot.getName()));
-       
-       // Check filtering down
-       assertEquals(true, d.getEntry(dirA.getName()) instanceof FilteringDirectoryNode);
-       assertEquals(false, d.getEntry(dirB.getName()) instanceof FilteringDirectoryNode);
-       
-       DirectoryEntry fdA = (DirectoryEntry)d.getEntry(dirA.getName()); 
-       assertEquals(false, fdA.hasEntry(eA.getName()));
-       assertEquals(true, fdA.hasEntry(dirAA.getName()));
-       
-       DirectoryEntry fdAA = (DirectoryEntry)fdA.getEntry(dirAA.getName()); 
-       assertEquals(true, fdAA.hasEntry(eAA.getName()));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
deleted file mode 100644
index f4a18a0..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
+++ /dev/null
@@ -1,1486 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import static org.hamcrest.core.IsCollectionContaining.hasItem;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.PropertySet;
-import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.property.NPropertyTable;
-import org.apache.poi.poifs.property.Property;
-import org.apache.poi.poifs.property.RootProperty;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.TempFile;
-import org.junit.Test;
-
-/**
- * Tests for the new NIO POIFSFileSystem implementation
- */
-public final class TestNPOIFSFileSystem {
-   private static final POIDataSamples _inst = POIDataSamples.getPOIFSInstance();
-   
-   /**
-    * Returns test files with 512 byte and 4k block sizes, loaded
-    *  both from InputStreams and Files
-    */
-   protected NPOIFSFileSystem[] get512and4kFileAndInput() throws Exception {
-       NPOIFSFileSystem fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-       NPOIFSFileSystem fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-       NPOIFSFileSystem fsC = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-       NPOIFSFileSystem fsD = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-       return new NPOIFSFileSystem[] {fsA,fsB,fsC,fsD};
-   }
-
-   protected static void assertBATCount(NPOIFSFileSystem fs, int expectedBAT, int expectedXBAT) throws IOException {
-       int foundBAT = 0;
-       int foundXBAT = 0;
-       int sz = (int)(fs.size() / fs.getBigBlockSize());
-       for (int i=0; i<sz; i++) {
-           if(fs.getNextBlock(i) == POIFSConstants.FAT_SECTOR_BLOCK) {
-               foundBAT++;
-           }
-           if(fs.getNextBlock(i) == POIFSConstants.DIFAT_SECTOR_BLOCK) {
-               foundXBAT++;
-           }
-       }
-       assertEquals("Wrong number of BATs", expectedBAT, foundBAT);
-       assertEquals("Wrong number of XBATs with " + expectedBAT + " BATs", expectedXBAT, foundXBAT);
-   }
-   protected void assertContentsMatches(byte[] expected, DocumentEntry doc) throws IOException {
-       NDocumentInputStream inp = new NDocumentInputStream(doc);
-       byte[] contents = new byte[doc.getSize()];
-       assertEquals(doc.getSize(), inp.read(contents));
-       inp.close();
-       
-       if (expected != null)
-           assertThat(expected, equalTo(contents));
-   }
-   
-   protected static HeaderBlock writeOutAndReadHeader(NPOIFSFileSystem fs) throws IOException {
-       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-       fs.writeFilesystem(baos);
-       
-       HeaderBlock header = new HeaderBlock(new ByteArrayInputStream(baos.toByteArray()));
-       return header;
-   }
-
-    protected static NPOIFSFileSystem writeOutAndReadBack(NPOIFSFileSystem original) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        original.writeFilesystem(baos);
-        original.close();
-        return new NPOIFSFileSystem(new ByteArrayInputStream(baos.toByteArray()));
-    }
-
-    protected static NPOIFSFileSystem writeOutFileAndReadBack(NPOIFSFileSystem original) throws IOException {
-        final File file = TempFile.createTempFile("TestPOIFS", ".ole2");
-        final OutputStream fout = new FileOutputStream(file);
-        try {
-            original.writeFilesystem(fout);
-        } finally {
-            fout.close();
-        }
-        original.close();
-        return new NPOIFSFileSystem(file, false);
-    }
-   
-   @Test
-   public void basicOpen() throws Exception {
-      NPOIFSFileSystem fsA, fsB;
-      
-      // With a simple 512 block file
-      fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         assertEquals(512, fs.getBigBlockSize());
-      }
-      fsA.close();
-      fsB.close();
-      
-      // Now with a simple 4096 block file
-      fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-      fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         assertEquals(4096, fs.getBigBlockSize());
-      }
-      fsA.close();
-      fsB.close();
-   }
-
-   @Test
-   public void propertiesAndFatOnRead() throws Exception {
-      NPOIFSFileSystem fsA, fsB;
-      
-      // With a simple 512 block file
-      fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         // Check the FAT was properly processed:
-         // Verify we only got one block
-         fs.getBATBlockAndIndex(0);
-         fs.getBATBlockAndIndex(1);
-         try {
-            fs.getBATBlockAndIndex(140);
-            fail("Should only be one BAT, but a 2nd was found");
-         } catch(IndexOutOfBoundsException e) {}
-         
-         // Verify a few next offsets
-         // 97 -> 98 -> END
-         assertEquals(98, fs.getNextBlock(97));
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(98));
-         
-         
-         // Check the properties
-         NPropertyTable props = fs._get_property_table();
-         assertEquals(90, props.getStartBlock());
-         assertEquals(7, props.countBlocks());
-         
-         // Root property tells us about the Mini Stream
-         RootProperty root = props.getRoot();
-         assertEquals("Root Entry", root.getName());
-         assertEquals(11564, root.getSize());
-         assertEquals(0, root.getStartBlock());
-         
-         // Check its children too
-         Property prop;
-         Iterator<Property> pi = root.getChildren();
-         prop = pi.next();
-         assertEquals("Thumbnail", prop.getName());
-         prop = pi.next();
-         assertEquals("\u0005DocumentSummaryInformation", prop.getName());
-         prop = pi.next();
-         assertEquals("\u0005SummaryInformation", prop.getName());
-         prop = pi.next();
-         assertEquals("Image", prop.getName());
-         prop = pi.next();
-         assertEquals("Tags", prop.getName());
-         assertEquals(false, pi.hasNext());
-         
-         
-         // Check the SBAT (Small Blocks FAT) was properly processed
-         NPOIFSMiniStore ministore = fs.getMiniStore();
-         
-         // Verify we only got two SBAT blocks
-         ministore.getBATBlockAndIndex(0);
-         ministore.getBATBlockAndIndex(128);
-         try {
-            ministore.getBATBlockAndIndex(256);
-            fail("Should only be two SBATs, but a 3rd was found");
-         } catch(IndexOutOfBoundsException e) {}
-         
-         // Verify a few offsets: 0->50 is a stream
-         for(int i=0; i<50; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(50));
-         
-         fs.close();
-      }
-      
-      // Now with a simple 4096 block file
-      fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-      fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         // Check the FAT was properly processed
-         // Verify we only got one block
-         fs.getBATBlockAndIndex(0);
-         fs.getBATBlockAndIndex(1);
-         try {
-            fs.getBATBlockAndIndex(1040);
-            fail("Should only be one BAT, but a 2nd was found");
-         } catch(IndexOutOfBoundsException e) {}
-         
-         // Verify a few next offsets
-         // 0 -> 1 -> 2 -> END
-         assertEquals(1, fs.getNextBlock(0));
-         assertEquals(2, fs.getNextBlock(1));
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(2));
-
-         
-         // Check the properties
-         NPropertyTable props = fs._get_property_table();
-         assertEquals(12, props.getStartBlock());
-         assertEquals(1, props.countBlocks());
-         
-         // Root property tells us about the Mini Stream
-         RootProperty root = props.getRoot();
-         assertEquals("Root Entry", root.getName());
-         assertEquals(11564, root.getSize());
-         assertEquals(0, root.getStartBlock());
-         
-         // Check its children too
-         Property prop;
-         Iterator<Property> pi = root.getChildren();
-         prop = pi.next();
-         assertEquals("Thumbnail", prop.getName());
-         prop = pi.next();
-         assertEquals("\u0005DocumentSummaryInformation", prop.getName());
-         prop = pi.next();
-         assertEquals("\u0005SummaryInformation", prop.getName());
-         prop = pi.next();
-         assertEquals("Image", prop.getName());
-         prop = pi.next();
-         assertEquals("Tags", prop.getName());
-         assertEquals(false, pi.hasNext());
-         
-         
-         // Check the SBAT (Small Blocks FAT) was properly processed
-         NPOIFSMiniStore ministore = fs.getMiniStore();
-         
-         // Verify we only got one SBAT block
-         ministore.getBATBlockAndIndex(0);
-         ministore.getBATBlockAndIndex(128);
-         ministore.getBATBlockAndIndex(1023);
-         try {
-            ministore.getBATBlockAndIndex(1024);
-            fail("Should only be one SBAT, but a 2nd was found");
-         } catch(IndexOutOfBoundsException e) {}
-         
-         // Verify a few offsets: 0->50 is a stream
-         for(int i=0; i<50; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(50));
-         
-         fs.close();
-      }
-   }
-   
-   /**
-    * Check that for a given block, we can correctly figure
-    *  out what the next one is
-    */
-   @Test
-   public void nextBlock() throws Exception {
-      NPOIFSFileSystem fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      NPOIFSFileSystem fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         // 0 -> 21 are simple
-         for(int i=0; i<21; i++) {
-            assertEquals(i+1, fs.getNextBlock(i));
-         }
-         // 21 jumps to 89, then ends
-         assertEquals(89, fs.getNextBlock(21));
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(89));
-         
-         // 22 -> 88 simple sequential stream
-         for(int i=22; i<88; i++) {
-            assertEquals(i+1, fs.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(88));
-         
-         // 90 -> 96 is another stream
-         for(int i=90; i<96; i++) {
-            assertEquals(i+1, fs.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(96));
-         
-         // 97+98 is another
-         assertEquals(98, fs.getNextBlock(97));
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(98));
-         
-         // 99 is our FAT block
-         assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-         
-         // 100 onwards is free
-         for(int i=100; i<fs.getBigBlockSizeDetails().getBATEntriesPerBlock(); i++) {
-            assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(i));
-         }
-         
-         fs.close();
-      }
-      
-      // Quick check on 4096 byte blocks too
-      fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-      fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         // 0 -> 1 -> 2 -> end
-         assertEquals(1, fs.getNextBlock(0));
-         assertEquals(2, fs.getNextBlock(1));
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(2));
-         
-         // 4 -> 11 then end
-         for(int i=4; i<11; i++) {
-            assertEquals(i+1, fs.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(11));
-         
-         fs.close();
-      }
-   }
-
-   /**
-    * Check we get the right data back for each block
-    */
-   @Test
-   public void getBlock() throws Exception {
-      NPOIFSFileSystem fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      NPOIFSFileSystem fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         ByteBuffer b;
-         
-         // The 0th block is the first data block
-         b = fs.getBlockAt(0);
-         assertEquals((byte)0x9e, b.get());
-         assertEquals((byte)0x75, b.get());
-         assertEquals((byte)0x97, b.get());
-         assertEquals((byte)0xf6, b.get());
-         
-         // And the next block
-         b = fs.getBlockAt(1);
-         assertEquals((byte)0x86, b.get());
-         assertEquals((byte)0x09, b.get());
-         assertEquals((byte)0x22, b.get());
-         assertEquals((byte)0xfb, b.get());
-         
-         // Check the final block too
-         b = fs.getBlockAt(99);
-         assertEquals((byte)0x01, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x02, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         
-         fs.close();
-      }
-      
-      // Quick check on 4096 byte blocks too
-      fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-      fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB}) {
-         ByteBuffer b;
-         
-         // The 0th block is the first data block
-         b = fs.getBlockAt(0);
-         assertEquals((byte)0x9e, b.get());
-         assertEquals((byte)0x75, b.get());
-         assertEquals((byte)0x97, b.get());
-         assertEquals((byte)0xf6, b.get());
-         
-         // And the next block
-         b = fs.getBlockAt(1);
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x03, b.get());
-         assertEquals((byte)0x00, b.get());
-
-         // The 14th block is the FAT
-         b = fs.getBlockAt(14);
-         assertEquals((byte)0x01, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x02, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         
-         fs.close();
-      }
-   }
-   
-   /**
-    * Ask for free blocks where there are some already
-    *  to be had from the FAT
-    */
-   @Test
-   public void getFreeBlockWithSpare() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      
-      // Our first BAT block has spares
-      assertEquals(true, fs.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      
-      // First free one is 100
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(100));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(101));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(102));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(103));
-      
-      // Ask, will get 100
-      assertEquals(100, fs.getFreeBlock());
-      
-      // Ask again, will still get 100 as not written to
-      assertEquals(100, fs.getFreeBlock());
-      
-      // Allocate it, then ask again
-      fs.setNextBlock(100, POIFSConstants.END_OF_CHAIN);
-      assertEquals(101, fs.getFreeBlock());
-      
-      // All done
-      fs.close();
-   }
-
-   /**
-    * Ask for free blocks where no free ones exist, and so the
-    *  file needs to be extended and another BAT/XBAT added
-    */
-   @Test
-   public void getFreeBlockWithNoneSpare() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      int free;
-
-      // We have one BAT at block 99
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-      assertBATCount(fs, 1, 0);
-      
-      // We've spare ones from 100 to 128
-      for(int i=100; i<128; i++) {
-         assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(i));
-      }
-      
-      // Check our BAT knows it's free
-      assertEquals(true, fs.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      
-      // Allocate all the spare ones
-      for(int i=100; i<128; i++) {
-         fs.setNextBlock(i, POIFSConstants.END_OF_CHAIN);
-      }
-      
-      // BAT is now full, but there's only the one
-      assertEquals(false, fs.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      try {
-         assertEquals(false, fs.getBATBlockAndIndex(128).getBlock().hasFreeSectors());
-         fail("Should only be one BAT");
-      } catch(IndexOutOfBoundsException e) {}
-      assertBATCount(fs, 1, 0);
-
-      
-      // Now ask for a free one, will need to extend the file
-      assertEquals(129, fs.getFreeBlock());
-      
-      assertEquals(false, fs.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      assertEquals(true, fs.getBATBlockAndIndex(128).getBlock().hasFreeSectors());
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(128));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(129));
-      
-      // We now have 2 BATs, but no XBATs
-      assertBATCount(fs, 2, 0);
-      
-      
-      // Fill up to hold 109 BAT blocks
-      for(int i=0; i<109; i++) {
-         fs.getFreeBlock();
-         int startOffset = i*128;
-         while( fs.getBATBlockAndIndex(startOffset).getBlock().hasFreeSectors() ) {
-            free = fs.getFreeBlock();
-            fs.setNextBlock(free, POIFSConstants.END_OF_CHAIN);
-         }
-      }
-      
-      assertEquals(false, fs.getBATBlockAndIndex(109*128-1).getBlock().hasFreeSectors());
-      try {
-         assertEquals(false, fs.getBATBlockAndIndex(109*128).getBlock().hasFreeSectors());
-         fail("Should only be 109 BATs");
-      } catch(IndexOutOfBoundsException e) {}
-      
-      // We now have 109 BATs, but no XBATs
-      assertBATCount(fs, 109, 0);
-      
-      
-      // Ask for it to be written out, and check the header
-      HeaderBlock header = writeOutAndReadHeader(fs);
-      assertEquals(109, header.getBATCount());
-      assertEquals(0, header.getXBATCount());
-      
-      
-      // Ask for another, will get our first XBAT
-      free = fs.getFreeBlock();
-      assertEquals(false, fs.getBATBlockAndIndex(109*128-1).getBlock().hasFreeSectors());
-      assertEquals(true, fs.getBATBlockAndIndex(110*128-1).getBlock().hasFreeSectors());
-      try {
-         assertEquals(false, fs.getBATBlockAndIndex(110*128).getBlock().hasFreeSectors());
-         fail("Should only be 110 BATs");
-      } catch(IndexOutOfBoundsException e) {}
-      assertBATCount(fs, 110, 1);
-      
-      header = writeOutAndReadHeader(fs);
-      assertEquals(110, header.getBATCount());
-      assertEquals(1, header.getXBATCount());
-
-      
-      // Fill the XBAT, which means filling 127 BATs
-      for(int i=109; i<109+127; i++) {
-         fs.getFreeBlock();
-         int startOffset = i*128;
-         while( fs.getBATBlockAndIndex(startOffset).getBlock().hasFreeSectors() ) {
-            free = fs.getFreeBlock();
-            fs.setNextBlock(free, POIFSConstants.END_OF_CHAIN);
-         }
-         assertBATCount(fs, i+1, 1);
-      }
-      
-      // Should now have 109+127 = 236 BATs
-      assertEquals(false, fs.getBATBlockAndIndex(236*128-1).getBlock().hasFreeSectors());
-      try {
-         assertEquals(false, fs.getBATBlockAndIndex(236*128).getBlock().hasFreeSectors());
-         fail("Should only be 236 BATs");
-      } catch(IndexOutOfBoundsException e) {}
-      assertBATCount(fs, 236, 1);
-
-      
-      // Ask for another, will get our 2nd XBAT
-      free = fs.getFreeBlock();
-      assertEquals(false, fs.getBATBlockAndIndex(236*128-1).getBlock().hasFreeSectors());
-      assertEquals(true, fs.getBATBlockAndIndex(237*128-1).getBlock().hasFreeSectors());
-      try {
-         assertEquals(false, fs.getBATBlockAndIndex(237*128).getBlock().hasFreeSectors());
-         fail("Should only be 237 BATs");
-      } catch(IndexOutOfBoundsException e) {}
-      
-      
-      // Check the counts now
-      assertBATCount(fs, 237, 2);
-
-      // Check the header
-      header = writeOutAndReadHeader(fs);
-      
-      
-      // Now, write it out, and read it back in again fully
-      fs = writeOutAndReadBack(fs);
-
-      // Check that it is seen correctly
-      assertBATCount(fs, 237, 2);
-
-      assertEquals(false, fs.getBATBlockAndIndex(236*128-1).getBlock().hasFreeSectors());
-      assertEquals(true, fs.getBATBlockAndIndex(237*128-1).getBlock().hasFreeSectors());
-      try {
-         assertEquals(false, fs.getBATBlockAndIndex(237*128).getBlock().hasFreeSectors());
-         fail("Should only be 237 BATs");
-      } catch(IndexOutOfBoundsException e) {}
-
-      
-      // All done
-      fs.close();
-   }
-   
-   /**
-    * Test that we can correctly get the list of directory
-    *  entries, and the details on the files in them
-    */
-   @Test
-   public void listEntries() throws Exception {
-      for(NPOIFSFileSystem fs : get512and4kFileAndInput()) {
-         DirectoryEntry root = fs.getRoot();
-         assertEquals(5, root.getEntryCount());
-         
-         // Check by the names
-         Entry thumbnail = root.getEntry("Thumbnail");
-         Entry dsi = root.getEntry("\u0005DocumentSummaryInformation");
-         Entry si = root.getEntry("\u0005SummaryInformation");
-         Entry image = root.getEntry("Image");
-         Entry tags = root.getEntry("Tags");
-         
-         assertEquals(false, thumbnail.isDirectoryEntry());
-         assertEquals(false, dsi.isDirectoryEntry());
-         assertEquals(false, si.isDirectoryEntry());
-         assertEquals(true, image.isDirectoryEntry());
-         assertEquals(false, tags.isDirectoryEntry());
-         
-         // Check via the iterator
-         Iterator<Entry> it = root.getEntries();
-         assertEquals(thumbnail.getName(), it.next().getName());
-         assertEquals(dsi.getName(), it.next().getName());
-         assertEquals(si.getName(), it.next().getName());
-         assertEquals(image.getName(), it.next().getName());
-         assertEquals(tags.getName(), it.next().getName());
-         
-         // Look inside another
-         DirectoryEntry imageD = (DirectoryEntry)image;
-         assertEquals(7, imageD.getEntryCount());
-         
-         fs.close();
-      }
-   }
-   
-   /**
-    * Tests that we can get the correct contents for
-    *  a document in the filesystem 
-    */
-   @Test
-   public void getDocumentEntry() throws Exception {
-      for(NPOIFSFileSystem fs : get512and4kFileAndInput()) {
-         DirectoryEntry root = fs.getRoot();
-         Entry si = root.getEntry("\u0005SummaryInformation");
-         
-         assertEquals(true, si.isDocumentEntry());
-         DocumentNode doc = (DocumentNode)si;
-         
-         // Check we can read it
-         assertContentsMatches(null, doc);
-         
-         // Now try to build the property set
-         DocumentInputStream inp = new NDocumentInputStream(doc);
-         PropertySet ps = PropertySetFactory.create(inp);
-         SummaryInformation inf = (SummaryInformation)ps;
-         
-         // Check some bits in it
-         assertEquals(null, inf.getApplicationName());
-         assertEquals(null, inf.getAuthor());
-         assertEquals(null, inf.getSubject());
-         assertEquals(131333, inf.getOSVersion());
-         
-         // Finish with this one
-         inp.close();
-         
-         
-         // Try the other summary information
-         si = root.getEntry("\u0005DocumentSummaryInformation");
-         assertEquals(true, si.isDocumentEntry());
-         doc = (DocumentNode)si;
-         assertContentsMatches(null, doc);
-         
-         inp = new NDocumentInputStream(doc);
-         ps = PropertySetFactory.create(inp);
-         DocumentSummaryInformation dinf = (DocumentSummaryInformation)ps;
-         assertEquals(131333, dinf.getOSVersion());
-         
-         fs.close();
-      }
-   }
-   
-   /**
-    * Read a file, write it and read it again.
-    * Then, alter+add some streams, write and read
-    */
-   @Test
-   public void readWriteRead() throws Exception {
-       SummaryInformation sinf = null;
-       DocumentSummaryInformation dinf = null;
-       DirectoryEntry root = null, testDir = null;
-       
-       for(NPOIFSFileSystem fs : get512and4kFileAndInput()) {
-           // Check we can find the entries we expect
-           root = fs.getRoot();
-           assertEquals(5, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Tags"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-
-           
-           // Write out, re-load
-           fs = writeOutAndReadBack(fs);
-           
-           // Check they're still there
-           root = fs.getRoot();
-           assertEquals(5, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Tags"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-           
-           
-           // Check the contents of them - parse the summary block and check
-           sinf = (SummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, sinf.getOSVersion());
-           
-           dinf = (DocumentSummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, dinf.getOSVersion());
-           
-           
-           // Add a test mini stream
-           testDir = root.createDirectory("Testing 123");
-           testDir.createDirectory("Testing 456");
-           testDir.createDirectory("Testing 789");
-           byte[] mini = new byte[] { 42, 0, 1, 2, 3, 4, 42 };
-           testDir.createDocument("Mini", new ByteArrayInputStream(mini));
-           
-           
-           // Write out, re-load
-           fs = writeOutAndReadBack(fs);
-           
-           root = fs.getRoot();
-           testDir = (DirectoryEntry)root.getEntry("Testing 123");
-           assertEquals(6, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Tags"));
-           assertThat(root.getEntryNames(), hasItem("Testing 123"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-
-           
-           // Check old and new are there
-           sinf = (SummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, sinf.getOSVersion());
-           
-           dinf = (DocumentSummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, dinf.getOSVersion());
-
-           assertContentsMatches(mini, (DocumentEntry)testDir.getEntry("Mini"));
-           
-           
-           // Write out and read once more, just to be sure
-           fs = writeOutAndReadBack(fs);
-           
-           root = fs.getRoot();
-           testDir = (DirectoryEntry)root.getEntry("Testing 123");
-           assertEquals(6, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Tags"));
-           assertThat(root.getEntryNames(), hasItem("Testing 123"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-
-           sinf = (SummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, sinf.getOSVersion());
-           
-           dinf = (DocumentSummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, dinf.getOSVersion());
-
-           assertContentsMatches(mini, (DocumentEntry)testDir.getEntry("Mini"));
-           
-           
-           // Add a full stream, delete a full stream
-           byte[] main4096 = new byte[4096];
-           main4096[0] = -10;
-           main4096[4095] = -11;
-           testDir.createDocument("Normal4096", new ByteArrayInputStream(main4096));
-           
-           root.getEntry("Tags").delete();
-           
-           
-           // Write out, re-load
-           fs = writeOutAndReadBack(fs);
-
-           // Check it's all there
-           root = fs.getRoot();
-           testDir = (DirectoryEntry)root.getEntry("Testing 123");
-           assertEquals(5, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Testing 123"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-
-           
-           // Check old and new are there
-           sinf = (SummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(SummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, sinf.getOSVersion());
-           
-           dinf = (DocumentSummaryInformation)PropertySetFactory.create(new NDocumentInputStream(
-                   (DocumentEntry)root.getEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)));
-           assertEquals(131333, dinf.getOSVersion());
-
-           assertContentsMatches(mini, (DocumentEntry)testDir.getEntry("Mini"));
-           assertContentsMatches(main4096, (DocumentEntry)testDir.getEntry("Normal4096"));
-
-           
-           // Delete a directory, and add one more
-           testDir.getEntry("Testing 456").delete();
-           testDir.createDirectory("Testing ABC");
-           
-           
-           // Save
-           fs = writeOutAndReadBack(fs);
-
-           // Check
-           root = fs.getRoot();
-           testDir = (DirectoryEntry)root.getEntry("Testing 123");
-           
-           assertEquals(5, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Testing 123"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-           
-           assertEquals(4, testDir.getEntryCount());
-           assertThat(testDir.getEntryNames(), hasItem("Mini"));
-           assertThat(testDir.getEntryNames(), hasItem("Normal4096"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing 789"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing ABC"));
-           
-           
-           // Add another mini stream
-           byte[] mini2 = new byte[] { -42, 0, -1, -2, -3, -4, -42 };
-           testDir.createDocument("Mini2", new ByteArrayInputStream(mini2));
-           
-           // Save, load, check
-           fs = writeOutAndReadBack(fs);
-           
-           root = fs.getRoot();
-           testDir = (DirectoryEntry)root.getEntry("Testing 123");
-           
-           assertEquals(5, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Testing 123"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-           
-           assertEquals(5, testDir.getEntryCount());
-           assertThat(testDir.getEntryNames(), hasItem("Mini"));
-           assertThat(testDir.getEntryNames(), hasItem("Mini2"));
-           assertThat(testDir.getEntryNames(), hasItem("Normal4096"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing 789"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing ABC"));
-
-           assertContentsMatches(mini, (DocumentEntry)testDir.getEntry("Mini"));
-           assertContentsMatches(mini2, (DocumentEntry)testDir.getEntry("Mini2"));
-           assertContentsMatches(main4096, (DocumentEntry)testDir.getEntry("Normal4096"));
-
-           
-           // Delete a mini stream, add one more
-           testDir.getEntry("Mini").delete();
-           
-           byte[] mini3 = new byte[] { 42, 0, 42, 0, 42, 0, 42 };
-           testDir.createDocument("Mini3", new ByteArrayInputStream(mini3));
-
-           
-           // Save, load, check
-           fs = writeOutAndReadBack(fs);
-           
-           root = fs.getRoot();
-           testDir = (DirectoryEntry)root.getEntry("Testing 123");
-           
-           assertEquals(5, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Testing 123"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-           
-           assertEquals(5, testDir.getEntryCount());
-           assertThat(testDir.getEntryNames(), hasItem("Mini2"));
-           assertThat(testDir.getEntryNames(), hasItem("Mini3"));
-           assertThat(testDir.getEntryNames(), hasItem("Normal4096"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing 789"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing ABC"));
-
-           assertContentsMatches(mini2, (DocumentEntry)testDir.getEntry("Mini2"));
-           assertContentsMatches(mini3, (DocumentEntry)testDir.getEntry("Mini3"));
-           assertContentsMatches(main4096, (DocumentEntry)testDir.getEntry("Normal4096"));
-           
-           
-           // Change some existing streams
-           NPOIFSDocument mini2Doc = new NPOIFSDocument((DocumentNode)testDir.getEntry("Mini2"));
-           mini2Doc.replaceContents(new ByteArrayInputStream(mini));
-           
-           byte[] main4106 = new byte[4106];
-           main4106[0] = 41;
-           main4106[4105] = 42;
-           NPOIFSDocument mainDoc = new NPOIFSDocument((DocumentNode)testDir.getEntry("Normal4096"));
-           mainDoc.replaceContents(new ByteArrayInputStream(main4106));
-           
-           
-           // Re-check
-           fs = writeOutAndReadBack(fs);
-           
-           root = fs.getRoot();
-           testDir = (DirectoryEntry)root.getEntry("Testing 123");
-           
-           assertEquals(5, root.getEntryCount());
-           assertThat(root.getEntryNames(), hasItem("Thumbnail"));
-           assertThat(root.getEntryNames(), hasItem("Image"));
-           assertThat(root.getEntryNames(), hasItem("Testing 123"));
-           assertThat(root.getEntryNames(), hasItem("\u0005DocumentSummaryInformation"));
-           assertThat(root.getEntryNames(), hasItem("\u0005SummaryInformation"));
-           
-           assertEquals(5, testDir.getEntryCount());
-           assertThat(testDir.getEntryNames(), hasItem("Mini2"));
-           assertThat(testDir.getEntryNames(), hasItem("Mini3"));
-           assertThat(testDir.getEntryNames(), hasItem("Normal4096"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing 789"));
-           assertThat(testDir.getEntryNames(), hasItem("Testing ABC"));
-
-           assertContentsMatches(mini, (DocumentEntry)testDir.getEntry("Mini2"));
-           assertContentsMatches(mini3, (DocumentEntry)testDir.getEntry("Mini3"));
-           assertContentsMatches(main4106, (DocumentEntry)testDir.getEntry("Normal4096"));
-           
-           
-           // All done
-           fs.close();
-       }
-   }
-   
-   /**
-    * Create a new file, write it and read it again
-    * Then, add some streams, write and read
-    */
-   @Test
-   @SuppressWarnings("resource")
-   public void createWriteRead() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem();
-      DocumentEntry miniDoc;
-      DocumentEntry normDoc;
-      
-      // Initially has Properties + BAT but not SBAT
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(2));
-      
-      // Check that the SBAT is empty
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getRoot().getProperty().getStartBlock());
-      
-      // Check that properties table was given block 0
-      assertEquals(0, fs._get_property_table().getStartBlock());
-
-      // Write and read it
-      fs = writeOutAndReadBack(fs);
-      
-      // No change, SBAT remains empty 
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(2));
-      assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(3));
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getRoot().getProperty().getStartBlock());
-      assertEquals(0, fs._get_property_table().getStartBlock());
-
-      
-      // Check the same but with saving to a file
-      fs = new NPOIFSFileSystem();
-      fs = writeOutFileAndReadBack(fs);
-      
-      // Same, no change, SBAT remains empty 
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(2));
-      assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(3));
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getRoot().getProperty().getStartBlock());
-      assertEquals(0, fs._get_property_table().getStartBlock());
-
-      
-      
-      // Put everything within a new directory
-      DirectoryEntry testDir = fs.createDirectory("Test Directory");
-      
-      // Add a new Normal Stream (Normal Streams minimum 4096 bytes)
-      byte[] main4096 = new byte[4096];
-      main4096[0] = -10;
-      main4096[4095] = -11;
-      testDir.createDocument("Normal4096", new ByteArrayInputStream(main4096));
-
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      assertEquals(3, fs.getNextBlock(2));
-      assertEquals(4, fs.getNextBlock(3));
-      assertEquals(5, fs.getNextBlock(4));
-      assertEquals(6, fs.getNextBlock(5));
-      assertEquals(7, fs.getNextBlock(6));
-      assertEquals(8, fs.getNextBlock(7));
-      assertEquals(9, fs.getNextBlock(8));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(9));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(10));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(11));
-      // SBAT still unused
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getRoot().getProperty().getStartBlock());
-
-      
-      // Add a bigger Normal Stream
-      byte[] main5124 = new byte[5124];
-      main5124[0] = -22;
-      main5124[5123] = -33;
-      testDir.createDocument("Normal5124", new ByteArrayInputStream(main5124));
-
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      assertEquals(3, fs.getNextBlock(2));
-      assertEquals(4, fs.getNextBlock(3));
-      assertEquals(5, fs.getNextBlock(4));
-      assertEquals(6, fs.getNextBlock(5));
-      assertEquals(7, fs.getNextBlock(6));
-      assertEquals(8, fs.getNextBlock(7));
-      assertEquals(9, fs.getNextBlock(8));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(9));
-
-      assertEquals(11, fs.getNextBlock(10));
-      assertEquals(12, fs.getNextBlock(11));
-      assertEquals(13, fs.getNextBlock(12));
-      assertEquals(14, fs.getNextBlock(13));
-      assertEquals(15, fs.getNextBlock(14));
-      assertEquals(16, fs.getNextBlock(15));
-      assertEquals(17, fs.getNextBlock(16));
-      assertEquals(18, fs.getNextBlock(17));
-      assertEquals(19, fs.getNextBlock(18));
-      assertEquals(20, fs.getNextBlock(19));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(20));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(21));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(22));
-
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getRoot().getProperty().getStartBlock());
-      
-      
-      // Now Add a mini stream
-      byte[] mini = new byte[] { 42, 0, 1, 2, 3, 4, 42 };
-      testDir.createDocument("Mini", new ByteArrayInputStream(mini));
-      
-      // Mini stream will get one block for fat + one block for data
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      assertEquals(3, fs.getNextBlock(2));
-      assertEquals(4, fs.getNextBlock(3));
-      assertEquals(5, fs.getNextBlock(4));
-      assertEquals(6, fs.getNextBlock(5));
-      assertEquals(7, fs.getNextBlock(6));
-      assertEquals(8, fs.getNextBlock(7));
-      assertEquals(9, fs.getNextBlock(8));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(9));
-
-      assertEquals(11, fs.getNextBlock(10));
-      assertEquals(12, fs.getNextBlock(11));
-      assertEquals(13, fs.getNextBlock(12));
-      assertEquals(14, fs.getNextBlock(13));
-      assertEquals(15, fs.getNextBlock(14));
-      assertEquals(16, fs.getNextBlock(15));
-      assertEquals(17, fs.getNextBlock(16));
-      assertEquals(18, fs.getNextBlock(17));
-      assertEquals(19, fs.getNextBlock(18));
-      assertEquals(20, fs.getNextBlock(19));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(20));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(21));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(22));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(23));
-
-      // Check the mini stream location was set
-      // (21 is mini fat, 22 is first mini stream block)
-      assertEquals(22, fs.getRoot().getProperty().getStartBlock());
-      
-      
-      // Write and read back
-      fs = writeOutAndReadBack(fs);
-      HeaderBlock header = writeOutAndReadHeader(fs);
-      
-      // Check the header has the right points in it
-      assertEquals(1, header.getBATCount());
-      assertEquals(1, header.getBATArray()[0]);
-      assertEquals(0, header.getPropertyStart());
-      assertEquals(1, header.getSBATCount());
-      assertEquals(21, header.getSBATStart());
-      assertEquals(22, fs._get_property_table().getRoot().getStartBlock());
-      
-      // Block use should be almost the same, except the properties
-      //  stream will have grown out to cover 2 blocks
-      // Check the block use is all unchanged
-      assertEquals(23, fs.getNextBlock(0)); // Properties now extends over 2 blocks
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      
-      assertEquals(3, fs.getNextBlock(2));
-      assertEquals(4, fs.getNextBlock(3));
-      assertEquals(5, fs.getNextBlock(4));
-      assertEquals(6, fs.getNextBlock(5));
-      assertEquals(7, fs.getNextBlock(6));
-      assertEquals(8, fs.getNextBlock(7));
-      assertEquals(9, fs.getNextBlock(8));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(9)); // End of normal4096
-
-      assertEquals(11, fs.getNextBlock(10));
-      assertEquals(12, fs.getNextBlock(11));
-      assertEquals(13, fs.getNextBlock(12));
-      assertEquals(14, fs.getNextBlock(13));
-      assertEquals(15, fs.getNextBlock(14));
-      assertEquals(16, fs.getNextBlock(15));
-      assertEquals(17, fs.getNextBlock(16));
-      assertEquals(18, fs.getNextBlock(17));
-      assertEquals(19, fs.getNextBlock(18));
-      assertEquals(20, fs.getNextBlock(19));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(20)); // End of normal5124 
-      
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(21)); // Mini Stream FAT
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(22)); // Mini Stream data
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(23)); // Properties #2
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(24));
-
-      
-      // Check some data
-      assertEquals(1, fs.getRoot().getEntryCount());
-      testDir = (DirectoryEntry)fs.getRoot().getEntry("Test Directory");
-      assertEquals(3, testDir.getEntryCount());
-
-      miniDoc = (DocumentEntry)testDir.getEntry("Mini");
-      assertContentsMatches(mini, miniDoc);
-      
-      normDoc = (DocumentEntry)testDir.getEntry("Normal4096");
-      assertContentsMatches(main4096, normDoc);
-
-      normDoc = (DocumentEntry)testDir.getEntry("Normal5124");
-      assertContentsMatches(main5124, normDoc);
-      
-      
-      // Delete a couple of streams
-      miniDoc.delete();
-      normDoc.delete();
-
-      
-      // Check - will have un-used sectors now
-      fs = writeOutAndReadBack(fs);
-      
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0)); // Props back in 1 block
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-      
-      assertEquals(3, fs.getNextBlock(2));
-      assertEquals(4, fs.getNextBlock(3));
-      assertEquals(5, fs.getNextBlock(4));
-      assertEquals(6, fs.getNextBlock(5));
-      assertEquals(7, fs.getNextBlock(6));
-      assertEquals(8, fs.getNextBlock(7));
-      assertEquals(9, fs.getNextBlock(8));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(9)); // End of normal4096
-
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(10));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(11));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(12));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(13));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(14));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(15));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(16));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(17));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(18));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(19));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(20));
-      
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(21)); // Mini Stream FAT
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(22)); // Mini Stream data
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(23)); // Properties gone
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(24));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(25));
-      
-      // All done
-      fs.close();
-   }
-   
-   @Test
-   public void addBeforeWrite() throws Exception {
-       NPOIFSFileSystem fs = new NPOIFSFileSystem();
-       DocumentEntry miniDoc;
-       DocumentEntry normDoc;
-       HeaderBlock hdr;
-       
-       // Initially has Properties + BAT but nothing else
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(2));
-       
-       hdr = writeOutAndReadHeader(fs);
-       // No mini stream, and no xbats
-       // Will have fat then properties stream
-       assertEquals(1, hdr.getBATCount());
-       assertEquals(1, hdr.getBATArray()[0]);
-       assertEquals(0, hdr.getPropertyStart());
-       assertEquals(POIFSConstants.END_OF_CHAIN, hdr.getSBATStart());
-       assertEquals(POIFSConstants.END_OF_CHAIN, hdr.getXBATIndex());
-       assertEquals(POIFSConstants.SMALLER_BIG_BLOCK_SIZE*3, fs.size());
-       
-       
-       // Get a clean filesystem to start with
-       fs = new NPOIFSFileSystem();
-       
-       // Put our test files in a non-standard place
-       DirectoryEntry parentDir = fs.createDirectory("Parent Directory");
-       DirectoryEntry testDir = parentDir.createDirectory("Test Directory");
-       
-       
-       // Add to the mini stream
-       byte[] mini = new byte[] { 42, 0, 1, 2, 3, 4, 42 };
-       testDir.createDocument("Mini", new ByteArrayInputStream(mini));
-       
-       // Add to the main stream
-       byte[] main4096 = new byte[4096];
-       main4096[0] = -10;
-       main4096[4095] = -11;
-       testDir.createDocument("Normal4096", new ByteArrayInputStream(main4096));
-
-       
-       // Check the mini stream was added, then the main stream
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1)); 
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(2)); // Mini Fat
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(3)); // Mini Stream
-       assertEquals(5,                           fs.getNextBlock(4)); // Main Stream
-       assertEquals(6,                           fs.getNextBlock(5));
-       assertEquals(7,                           fs.getNextBlock(6));
-       assertEquals(8,                           fs.getNextBlock(7));
-       assertEquals(9,                           fs.getNextBlock(8));
-       assertEquals(10,                          fs.getNextBlock(9));
-       assertEquals(11,                          fs.getNextBlock(10));
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(11));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(12));
-       assertEquals(POIFSConstants.SMALLER_BIG_BLOCK_SIZE*13, fs.size());
-       
-       
-       // Check that we can read the right data pre-write
-       miniDoc = (DocumentEntry)testDir.getEntry("Mini");
-       assertContentsMatches(mini, miniDoc);
-
-       normDoc = (DocumentEntry)testDir.getEntry("Normal4096");
-       assertContentsMatches(main4096, normDoc);
-       
-       
-       // Write, read, check
-       hdr = writeOutAndReadHeader(fs);
-       fs = writeOutAndReadBack(fs);
-       
-       // Check the header details - will have the sbat near the start,
-       //  then the properties at the end
-       assertEquals(1, hdr.getBATCount());
-       assertEquals(1, hdr.getBATArray()[0]);
-       assertEquals(2, hdr.getSBATStart());
-       assertEquals(0, hdr.getPropertyStart());
-       assertEquals(POIFSConstants.END_OF_CHAIN, hdr.getXBATIndex());
-       
-       // Check the block allocation is unchanged, other than
-       //  the properties stream going in at the end
-       assertEquals(12,                          fs.getNextBlock(0)); // Properties
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(2));
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(3));
-       assertEquals(5,                           fs.getNextBlock(4));
-       assertEquals(6,                           fs.getNextBlock(5));
-       assertEquals(7,                           fs.getNextBlock(6));
-       assertEquals(8,                           fs.getNextBlock(7));
-       assertEquals(9,                           fs.getNextBlock(8));
-       assertEquals(10,                          fs.getNextBlock(9));
-       assertEquals(11,                          fs.getNextBlock(10));
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(11));
-       assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(12));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(13));
-       assertEquals(POIFSConstants.SMALLER_BIG_BLOCK_SIZE*14, fs.size());
-       
-       
-       // Check the data
-       DirectoryEntry fsRoot = fs.getRoot();
-       assertEquals(1, fsRoot.getEntryCount());
-       
-       parentDir = (DirectoryEntry)fsRoot.getEntry("Parent Directory");
-       assertEquals(1, parentDir.getEntryCount());
-       
-       testDir = (DirectoryEntry)parentDir.getEntry("Test Directory");
-       assertEquals(2, testDir.getEntryCount());
-
-       miniDoc = (DocumentEntry)testDir.getEntry("Mini");
-       assertContentsMatches(mini, miniDoc);
-
-       normDoc = (DocumentEntry)testDir.getEntry("Normal4096");
-       assertContentsMatches(main4096, normDoc);
-       
-       
-       // Add one more stream to each, then save and re-load
-       byte[] mini2 = new byte[] { -42, 0, -1, -2, -3, -4, -42 };
-       testDir.createDocument("Mini2", new ByteArrayInputStream(mini2));
-       
-       // Add to the main stream
-       byte[] main4106 = new byte[4106];
-       main4106[0] = 41;
-       main4106[4105] = 42;
-       testDir.createDocument("Normal4106", new ByteArrayInputStream(main4106));
-       
-       
-       // Recheck the data in all 4 streams
-       fs = writeOutAndReadBack(fs);
-       
-       fsRoot = fs.getRoot();
-       assertEquals(1, fsRoot.getEntryCount());
-       
-       parentDir = (DirectoryEntry)fsRoot.getEntry("Parent Directory");
-       assertEquals(1, parentDir.getEntryCount());
-       
-       testDir = (DirectoryEntry)parentDir.getEntry("Test Directory");
-       assertEquals(4, testDir.getEntryCount());
-
-       miniDoc = (DocumentEntry)testDir.getEntry("Mini");
-       assertContentsMatches(mini, miniDoc);
-
-       miniDoc = (DocumentEntry)testDir.getEntry("Mini2");
-       assertContentsMatches(mini2, miniDoc);
-
-       normDoc = (DocumentEntry)testDir.getEntry("Normal4106");
-       assertContentsMatches(main4106, normDoc);
-       
-       // All done
-       fs.close();
-   }
-   
-   @Test
-   public void readZeroLengthEntries() throws Exception {
-       NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("only-zero-byte-streams.ole2"));
-       DirectoryNode testDir = fs.getRoot();
-       assertEquals(3, testDir.getEntryCount());
-       DocumentEntry entry;
-       
-       entry = (DocumentEntry)testDir.getEntry("test-zero-1");
-       assertNotNull(entry);
-       assertEquals(0, entry.getSize());
-       
-       entry = (DocumentEntry)testDir.getEntry("test-zero-2");
-       assertNotNull(entry);
-       assertEquals(0, entry.getSize());
-       
-       entry = (DocumentEntry)testDir.getEntry("test-zero-3");
-       assertNotNull(entry);
-       assertEquals(0, entry.getSize());
-       
-       // Check properties, all have zero length, no blocks
-       NPropertyTable props = fs._get_property_table();
-       assertEquals(POIFSConstants.END_OF_CHAIN, props.getRoot().getStartBlock());
-       for (Property prop : props.getRoot()) {
-           assertEquals("test-zero-", prop.getName().substring(0, 10));
-           assertEquals(POIFSConstants.END_OF_CHAIN, prop.getStartBlock());
-       }
-       
-       // All done
-       fs.close();
-   }
-   
-   @Test
-   public void writeZeroLengthEntries() throws Exception {
-       NPOIFSFileSystem fs = new NPOIFSFileSystem();
-       DirectoryNode testDir = fs.getRoot();
-       DocumentEntry miniDoc;
-       DocumentEntry normDoc;
-       DocumentEntry emptyDoc;
-       
-       // Add mini and normal sized entries to start
-       byte[] mini2 = new byte[] { -42, 0, -1, -2, -3, -4, -42 };
-       testDir.createDocument("Mini2", new ByteArrayInputStream(mini2));
-       
-       // Add to the main stream
-       byte[] main4106 = new byte[4106];
-       main4106[0] = 41;
-       main4106[4105] = 42;
-       testDir.createDocument("Normal4106", new ByteArrayInputStream(main4106));
-       
-       // Now add some empty ones
-       byte[] empty = new byte[0];
-       testDir.createDocument("empty-1", new ByteArrayInputStream(empty));
-       testDir.createDocument("empty-2", new ByteArrayInputStream(empty));
-       testDir.createDocument("empty-3", new ByteArrayInputStream(empty));
-       
-       // Check
-       miniDoc = (DocumentEntry)testDir.getEntry("Mini2");
-       assertContentsMatches(mini2, miniDoc);
-
-       normDoc = (DocumentEntry)testDir.getEntry("Normal4106");
-       assertContentsMatches(main4106, normDoc);
-       
-       emptyDoc = (DocumentEntry)testDir.getEntry("empty-1");
-       assertContentsMatches(empty, emptyDoc);
-       
-       emptyDoc = (DocumentEntry)testDir.getEntry("empty-2");
-       assertContentsMatches(empty, emptyDoc);
-       
-       emptyDoc = (DocumentEntry)testDir.getEntry("empty-3");
-       assertContentsMatches(empty, emptyDoc);
-       
-       // Look at the properties entry, and check the empty ones
-       //  have zero size and no start block
-       NPropertyTable props = fs._get_property_table();
-       Iterator<Property> propsIt = props.getRoot().getChildren();
-       
-       Property prop = propsIt.next();
-       assertEquals("Mini2", prop.getName());
-       assertEquals(0, prop.getStartBlock());
-       assertEquals(7, prop.getSize());
-       
-       prop = propsIt.next();
-       assertEquals("Normal4106", prop.getName());
-       assertEquals(4, prop.getStartBlock()); // BAT, Props, SBAT, MIni
-       assertEquals(4106, prop.getSize());
-       
-       prop = propsIt.next();
-       assertEquals("empty-1", prop.getName());
-       assertEquals(POIFSConstants.END_OF_CHAIN, prop.getStartBlock());
-       assertEquals(0, prop.getSize());
-       
-       prop = propsIt.next();
-       assertEquals("empty-2", prop.getName());
-       assertEquals(POIFSConstants.END_OF_CHAIN, prop.getStartBlock());
-       assertEquals(0, prop.getSize());
-       
-       prop = propsIt.next();
-       assertEquals("empty-3", prop.getName());
-       assertEquals(POIFSConstants.END_OF_CHAIN, prop.getStartBlock());
-       assertEquals(0, prop.getSize());
-       
-       
-       // Save and re-check
-       fs = writeOutAndReadBack(fs);
-       testDir = fs.getRoot();
-       
-       miniDoc = (DocumentEntry)testDir.getEntry("Mini2");
-       assertContentsMatches(mini2, miniDoc);
-
-       normDoc = (DocumentEntry)testDir.getEntry("Normal4106");
-       assertContentsMatches(main4106, normDoc);
-       
-       emptyDoc = (DocumentEntry)testDir.getEntry("empty-1");
-       assertContentsMatches(empty, emptyDoc);
-       
-       emptyDoc = (DocumentEntry)testDir.getEntry("empty-2");
-       assertContentsMatches(empty, emptyDoc);
-       
-       emptyDoc = (DocumentEntry)testDir.getEntry("empty-3");
-       assertContentsMatches(empty, emptyDoc);
-       
-       // Check that a mini-stream was assigned, with one block used
-       assertEquals(3, testDir.getProperty().getStartBlock()); 
-       assertEquals(64, testDir.getProperty().getSize()); 
-       
-       // All done
-       fs.close();
-   }
-
-   /**
-    * Test that we can read a file with NPOIFS, create a new NPOIFS instance,
-    *  write it out, read it with POIFS, and see the original data
-    */
-   @Test
-   public void NPOIFSReadCopyWritePOIFSRead() throws Exception {
-       File testFile = POIDataSamples.getSpreadSheetInstance().getFile("Simple.xls");
-       NPOIFSFileSystem src = new NPOIFSFileSystem(testFile);
-       byte wbDataExp[] = IOUtils.toByteArray(src.createDocumentInputStream("Workbook"));
-       
-       NPOIFSFileSystem nfs = new NPOIFSFileSystem();
-       EntryUtils.copyNodes(src.getRoot(), nfs.getRoot());
-       src.close();
-
-       ByteArrayOutputStream bos = new ByteArrayOutputStream();
-       nfs.writeFilesystem(bos);
-       nfs.close();
-       
-       POIFSFileSystem pfs = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
-       byte wbDataAct[] = IOUtils.toByteArray(pfs.createDocumentInputStream("Workbook"));
-       
-       assertThat(wbDataExp, equalTo(wbDataAct));
-   }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java
deleted file mode 100644
index d8eb43b..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.IOUtils;
-import org.junit.Test;
-
-/**
- * Tests for the Mini Store in the NIO POIFS
- */
-public final class TestNPOIFSMiniStore {
-   private static final POIDataSamples _inst = POIDataSamples.getPOIFSInstance();
-   
-   /**
-    * Check that for a given mini block, we can correctly figure
-    *  out what the next one is
-    */
-   @Test
-   public void testNextBlock() throws Exception {
-      // It's the same on 512 byte and 4096 byte block files!
-      NPOIFSFileSystem fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      NPOIFSFileSystem fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      NPOIFSFileSystem fsC = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-      NPOIFSFileSystem fsD = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB,fsC,fsD}) {
-         NPOIFSMiniStore ministore = fs.getMiniStore();
-         
-         // 0 -> 51 is one stream
-         for(int i=0; i<50; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(50));
-         
-         // 51 -> 103 is the next
-         for(int i=51; i<103; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(103));
-         
-         // Then there are 3 one block ones
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(104));
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(105));
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(106));
-         
-         // 107 -> 154 is the next
-         for(int i=107; i<154; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(154));
-
-         // 155 -> 160 is the next
-         for(int i=155; i<160; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(160));
-         
-         // 161 -> 166 is the next
-         for(int i=161; i<166; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(166));
-         
-         // 167 -> 172 is the next
-         for(int i=167; i<172; i++) {
-            assertEquals(i+1, ministore.getNextBlock(i));
-         }
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(172));
-         
-         // Now some short ones
-         assertEquals(174                        , ministore.getNextBlock(173));
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(174));
-         
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(175));
-         
-         assertEquals(177                        , ministore.getNextBlock(176));
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(177));
-         
-         assertEquals(179                        , ministore.getNextBlock(178));
-         assertEquals(180                        , ministore.getNextBlock(179));
-         assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(180));
-         
-         // 181 onwards is free
-         for(int i=181; i<fs.getBigBlockSizeDetails().getBATEntriesPerBlock(); i++) {
-            assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(i));
-         }
-      }
-      fsD.close();
-      fsC.close();
-      fsB.close();
-      fsA.close();
-   }
-
-   /**
-    * Check we get the right data back for each block
-    */
-   @Test
-   public void testGetBlock() throws Exception {
-      // It's the same on 512 byte and 4096 byte block files!
-      NPOIFSFileSystem fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      NPOIFSFileSystem fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      NPOIFSFileSystem fsC = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-      NPOIFSFileSystem fsD = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-      for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB,fsC,fsD}) {
-         // Mini stream should be at big block zero
-         assertEquals(0, fs._get_property_table().getRoot().getStartBlock());
-         
-         // Grab the ministore
-         NPOIFSMiniStore ministore = fs.getMiniStore();
-         ByteBuffer b;
-         
-         // Runs from the start of the data section in 64 byte chungs
-         b = ministore.getBlockAt(0);
-         assertEquals((byte)0x9e, b.get());
-         assertEquals((byte)0x75, b.get());
-         assertEquals((byte)0x97, b.get());
-         assertEquals((byte)0xf6, b.get());
-         assertEquals((byte)0xff, b.get());
-         assertEquals((byte)0x21, b.get());
-         assertEquals((byte)0xd2, b.get());
-         assertEquals((byte)0x11, b.get());
-         
-         // And the next block
-         b = ministore.getBlockAt(1);
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x03, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x12, b.get());
-         assertEquals((byte)0x02, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         
-         // Check the last data block
-         b = ministore.getBlockAt(180);
-         assertEquals((byte)0x30, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x00, b.get());
-         assertEquals((byte)0x80, b.get());
-         
-         // And the rest until the end of the big block is zeros
-         for(int i=181; i<184; i++) {
-            b = ministore.getBlockAt(i);
-            assertEquals((byte)0, b.get());
-            assertEquals((byte)0, b.get());
-            assertEquals((byte)0, b.get());
-            assertEquals((byte)0, b.get());
-            assertEquals((byte)0, b.get());
-            assertEquals((byte)0, b.get());
-            assertEquals((byte)0, b.get());
-            assertEquals((byte)0, b.get());
-         }
-      }
-      fsD.close();
-      fsC.close();
-      fsB.close();
-      fsA.close();
-   }
-   
-   /**
-    * Ask for free blocks where there are some already
-    *  to be had from the SFAT
-    */
-   @Test
-   public void testGetFreeBlockWithSpare() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      NPOIFSMiniStore ministore = fs.getMiniStore();
-      
-      // Our 2nd SBAT block has spares
-      assertEquals(false, ministore.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      assertEquals(true,  ministore.getBATBlockAndIndex(128).getBlock().hasFreeSectors());
-      
-      // First free one at 181
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(181));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(182));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(183));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(184));
-      
-      // Ask, will get 181
-      assertEquals(181, ministore.getFreeBlock());
-      
-      // Ask again, will still get 181 as not written to
-      assertEquals(181, ministore.getFreeBlock());
-      
-      // Allocate it, then ask again
-      ministore.setNextBlock(181, POIFSConstants.END_OF_CHAIN);
-      assertEquals(182, ministore.getFreeBlock());
-      
-      fs.close();
-   }
-
-   /**
-    * Ask for free blocks where no free ones exist, and so the
-    *  stream needs to be extended and another SBAT added
-    */
-   @Test
-   public void testGetFreeBlockWithNoneSpare() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      NPOIFSMiniStore ministore = fs.getMiniStore();
-      
-      // We've spare ones from 181 to 255
-      for(int i=181; i<256; i++) {
-         assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(i));
-      }
-      
-      // Check our SBAT free stuff is correct
-      assertEquals(false, ministore.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      assertEquals(true,  ministore.getBATBlockAndIndex(128).getBlock().hasFreeSectors());
-      
-      // Allocate all the spare ones
-      for(int i=181; i<256; i++) {
-         ministore.setNextBlock(i, POIFSConstants.END_OF_CHAIN);
-      }
-      
-      // SBAT are now full, but there's only the two
-      assertEquals(false, ministore.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      assertEquals(false, ministore.getBATBlockAndIndex(128).getBlock().hasFreeSectors());
-      try {
-         assertEquals(false, ministore.getBATBlockAndIndex(256).getBlock().hasFreeSectors());
-         fail("Should only be two SBATs");
-      } catch(IndexOutOfBoundsException e) {}
-      
-      // Now ask for a free one, will need to extend the SBAT chain
-      assertEquals(256, ministore.getFreeBlock());
-      
-      assertEquals(false, ministore.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      assertEquals(false, ministore.getBATBlockAndIndex(128).getBlock().hasFreeSectors());
-      assertEquals(true, ministore.getBATBlockAndIndex(256).getBlock().hasFreeSectors());
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(254)); // 2nd SBAT 
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(255)); // 2nd SBAT
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(256)); // 3rd SBAT
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(257)); // 3rd SBAT
-      
-      fs.close();
-   }
-   
-   /**
-    * Test that we will extend the underlying chain of 
-    *  big blocks that make up the ministream as needed
-    */
-   @Test
-   public void testCreateBlockIfNeeded() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      NPOIFSMiniStore ministore = fs.getMiniStore();
-      
-      // 178 -> 179 -> 180, 181+ is free
-      assertEquals(179                        , ministore.getNextBlock(178));
-      assertEquals(180                        , ministore.getNextBlock(179));
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(180));
-      for(int i=181; i<256; i++) {
-         assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(i));
-      }
-      
-      // However, the ministore data only covers blocks to 183
-      for(int i=0; i<=183; i++) {
-         ministore.getBlockAt(i);
-      }
-      try {
-         ministore.getBlockAt(184);
-         fail("No block at 184");
-      } catch(IndexOutOfBoundsException e) {}
-      
-      // The ministore itself is made up of 23 big blocks
-      Iterator<ByteBuffer> it = new NPOIFSStream(fs, fs.getRoot().getProperty().getStartBlock()).getBlockIterator();
-      int count = 0;
-      while(it.hasNext()) {
-         count++;
-         it.next();
-      }
-      assertEquals(23, count);
-      
-      // Ask it to get block 184 with creating, it will do
-      ministore.createBlockIfNeeded(184);
-      
-      // The ministore should be one big block bigger now
-      it = new NPOIFSStream(fs, fs.getRoot().getProperty().getStartBlock()).getBlockIterator();
-      count = 0;
-      while(it.hasNext()) {
-         count++;
-         it.next();
-      }
-      assertEquals(24, count);
-      
-      // The mini block block counts now run to 191
-      for(int i=0; i<=191; i++) {
-         ministore.getBlockAt(i);
-      }
-      try {
-         ministore.getBlockAt(192);
-         fail("No block at 192");
-      } catch(IndexOutOfBoundsException e) {}
-      
-      
-      // Now try writing through to 192, check that the SBAT and blocks are there
-      byte[] data = new byte[15*64];
-      NPOIFSStream stream = new NPOIFSStream(ministore, 178);
-      stream.updateContents(data);
-      
-      // Check now
-      assertEquals(179                        , ministore.getNextBlock(178));
-      assertEquals(180                        , ministore.getNextBlock(179));
-      assertEquals(181                        , ministore.getNextBlock(180));
-      assertEquals(182                        , ministore.getNextBlock(181));
-      assertEquals(183                        , ministore.getNextBlock(182));
-      assertEquals(184                        , ministore.getNextBlock(183));
-      assertEquals(185                        , ministore.getNextBlock(184));
-      assertEquals(186                        , ministore.getNextBlock(185));
-      assertEquals(187                        , ministore.getNextBlock(186));
-      assertEquals(188                        , ministore.getNextBlock(187));
-      assertEquals(189                        , ministore.getNextBlock(188));
-      assertEquals(190                        , ministore.getNextBlock(189));
-      assertEquals(191                        , ministore.getNextBlock(190));
-      assertEquals(192                        , ministore.getNextBlock(191));
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(192));
-      for(int i=193; i<256; i++) {
-         assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(i));
-      }
-      
-      fs.close();
-   }
-   
-   @Test
-   public void testCreateMiniStoreFirst() throws Exception {
-       NPOIFSFileSystem fs = new NPOIFSFileSystem();
-       NPOIFSMiniStore ministore = fs.getMiniStore();
-       DocumentInputStream dis;
-       DocumentEntry entry;
-
-       // Initially has Properties + BAT but nothing else
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-       assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(2));
-       // Ministore has no blocks, so can't iterate until used
-       try {
-           ministore.getNextBlock(0);
-       } catch (IndexOutOfBoundsException e) {}
-       
-       // Write a very small new document, will populate the ministore for us
-       byte[] data = new byte[8];
-       for (int i=0; i<data.length; i++) {
-           data[i] = (byte)(i+42);
-       }
-       fs.getRoot().createDocument("mini", new ByteArrayInputStream(data));
-       
-       // Should now have a mini-fat and a mini-stream
-       assertEquals(POIFSConstants.END_OF_CHAIN,    fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,fs.getNextBlock(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN,    fs.getNextBlock(2));
-       assertEquals(POIFSConstants.END_OF_CHAIN,    fs.getNextBlock(3));
-       assertEquals(POIFSConstants.UNUSED_BLOCK,    fs.getNextBlock(4));
-       assertEquals(POIFSConstants.END_OF_CHAIN,    ministore.getNextBlock(0));
-       assertEquals(POIFSConstants.UNUSED_BLOCK,    ministore.getNextBlock(1));
-       
-       // Re-fetch the mini store, and add it a second time
-       ministore = fs.getMiniStore();
-       fs.getRoot().createDocument("mini2", new ByteArrayInputStream(data));
-       
-       // Main unchanged, ministore has a second
-       assertEquals(POIFSConstants.END_OF_CHAIN,    fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,fs.getNextBlock(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN,    fs.getNextBlock(2));
-       assertEquals(POIFSConstants.END_OF_CHAIN,    fs.getNextBlock(3));
-       assertEquals(POIFSConstants.UNUSED_BLOCK,    fs.getNextBlock(4));
-       assertEquals(POIFSConstants.END_OF_CHAIN,    ministore.getNextBlock(0));
-       assertEquals(POIFSConstants.END_OF_CHAIN,    ministore.getNextBlock(1));
-       assertEquals(POIFSConstants.UNUSED_BLOCK,    ministore.getNextBlock(2));
-       
-       // Check the data is unchanged and the right length
-       entry = (DocumentEntry)fs.getRoot().getEntry("mini");
-       assertEquals(data.length, entry.getSize());
-       byte[] rdata = new byte[data.length];
-       dis = new DocumentInputStream(entry);
-       IOUtils.readFully(dis, rdata);
-       assertArrayEquals(data, rdata);
-       dis.close();
-       
-       entry = (DocumentEntry)fs.getRoot().getEntry("mini2");
-       assertEquals(data.length, entry.getSize());
-       rdata = new byte[data.length];
-       dis = new DocumentInputStream(entry);
-       IOUtils.readFully(dis, rdata);
-       assertArrayEquals(data, rdata);
-       dis.close();
-
-       // Done
-       fs.close();
-   }
-   
-   @Test
-   public void testMultiBlockStream() throws Exception {
-       byte[] data1B = new byte[63];
-       byte[] data2B = new byte[64+14];
-       for (int i=0; i<data1B.length; i++) {
-           data1B[i] = (byte)(i+2);
-       }
-       for (int i=0; i<data2B.length; i++) {
-           data2B[i] = (byte)(i+4);
-       }
-       
-       // New filesystem and store to use
-       NPOIFSFileSystem fs = new NPOIFSFileSystem();
-       NPOIFSMiniStore ministore = fs.getMiniStore();
-
-       // Initially has Properties + BAT but nothing else
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-       assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(2));
-       
-       // Store the 2 block one, should use 2 mini blocks, and request
-       // the use of 2 big blocks
-       ministore = fs.getMiniStore();
-       fs.getRoot().createDocument("mini2", new ByteArrayInputStream(data2B));
-       
-       // Check
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(2)); // SBAT
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(3)); // Mini
-       assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(4));
-       
-       // First 2 Mini blocks will be used
-       assertEquals(2, ministore.getFreeBlock());
-       
-       // Add one more mini-stream, and check
-       fs.getRoot().createDocument("mini1", new ByteArrayInputStream(data1B));
-       
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(2)); // SBAT
-       assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(3)); // Mini
-       assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(4));
-       
-       // One more mini-block will be used
-       assertEquals(3, ministore.getFreeBlock());
-       
-       // Check the contents too
-       byte[] r1 = new byte[data1B.length];
-       DocumentInputStream dis = fs.createDocumentInputStream("mini1");
-       IOUtils.readFully(dis, r1);
-       dis.close();
-       assertArrayEquals(data1B, r1);
-       
-       byte[] r2 = new byte[data2B.length];
-       dis = fs.createDocumentInputStream("mini2");
-       IOUtils.readFully(dis, r2);
-       dis.close();
-       assertArrayEquals(data2B, r2);
-       fs.close();
-   }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSStream.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSStream.java
deleted file mode 100644
index f1c8c18..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSStream.java
+++ /dev/null
@@ -1,1115 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import static org.apache.poi.poifs.filesystem.TestNPOIFSFileSystem.writeOutAndReadBack;
-
-import java.io.ByteArrayInputStream;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.storage.BATBlock;
-
-/**
- * Tests {@link NPOIFSStream}
- */
-@SuppressWarnings("resource")
-public final class TestNPOIFSStream extends TestCase {
-   private static final POIDataSamples _inst = POIDataSamples.getPOIFSInstance();
-
-   /**
-    * Read a single block stream
-    */
-   public void testReadTinyStream() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-
-      // 98 is actually the last block in a two block stream...
-      NPOIFSStream stream = new NPOIFSStream(fs, 98);
-      Iterator<ByteBuffer> i = stream.getBlockIterator();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b = i.next();
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      
-      // Check the contents
-      assertEquals((byte)0x81, b.get());
-      assertEquals((byte)0x00, b.get());
-      assertEquals((byte)0x00, b.get());
-      assertEquals((byte)0x00, b.get());
-      assertEquals((byte)0x82, b.get());
-      assertEquals((byte)0x00, b.get());
-      assertEquals((byte)0x00, b.get());
-      assertEquals((byte)0x00, b.get());
-      
-      fs.close();
-   }
-
-   /**
-    * Read a stream with only two blocks in it 
-    */
-   public void testReadShortStream() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      
-      // 97 -> 98 -> end
-      NPOIFSStream stream = new NPOIFSStream(fs, 97);
-      Iterator<ByteBuffer> i = stream.getBlockIterator();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b97 = i.next();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b98 = i.next();
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      
-      // Check the contents of the 1st block
-      assertEquals((byte)0x01, b97.get());
-      assertEquals((byte)0x00, b97.get());
-      assertEquals((byte)0x00, b97.get());
-      assertEquals((byte)0x00, b97.get());
-      assertEquals((byte)0x02, b97.get());
-      assertEquals((byte)0x00, b97.get());
-      assertEquals((byte)0x00, b97.get());
-      assertEquals((byte)0x00, b97.get());
-      
-      // Check the contents of the 2nd block
-      assertEquals((byte)0x81, b98.get());
-      assertEquals((byte)0x00, b98.get());
-      assertEquals((byte)0x00, b98.get());
-      assertEquals((byte)0x00, b98.get());
-      assertEquals((byte)0x82, b98.get());
-      assertEquals((byte)0x00, b98.get());
-      assertEquals((byte)0x00, b98.get());
-      assertEquals((byte)0x00, b98.get());
-      
-      fs.close();
-   }
-   
-   /**
-    * Read a stream with many blocks 
-    */
-   public void testReadLongerStream() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      
-      ByteBuffer b0 = null;
-      ByteBuffer b1 = null;
-      ByteBuffer b22 = null;
-      
-      // The stream at 0 has 23 blocks in it
-      NPOIFSStream stream = new NPOIFSStream(fs, 0);
-      Iterator<ByteBuffer> i = stream.getBlockIterator();
-      int count = 0;
-      while(i.hasNext()) {
-         ByteBuffer b = i.next();
-         if(count == 0) {
-            b0 = b;
-         }
-         if(count == 1) {
-            b1 = b;
-         }
-         if(count == 22) {
-            b22 = b;
-         }
-         
-         count++;
-      }
-      assertEquals(23, count);
-      
-      // Check the contents
-      //  1st block is at 0
-      assertEquals((byte)0x9e, b0.get());
-      assertEquals((byte)0x75, b0.get());
-      assertEquals((byte)0x97, b0.get());
-      assertEquals((byte)0xf6, b0.get());
-            
-      //  2nd block is at 1
-      assertEquals((byte)0x86, b1.get());
-      assertEquals((byte)0x09, b1.get());
-      assertEquals((byte)0x22, b1.get());
-      assertEquals((byte)0xfb, b1.get());
-      
-      //  last block is at 89
-      assertEquals((byte)0xfe, b22.get());
-      assertEquals((byte)0xff, b22.get());
-      assertEquals((byte)0x00, b22.get());
-      assertEquals((byte)0x00, b22.get());
-      assertEquals((byte)0x05, b22.get());
-      assertEquals((byte)0x01, b22.get());
-      assertEquals((byte)0x02, b22.get());
-      assertEquals((byte)0x00, b22.get());
-      
-      fs.close();
-   }
-
-   /**
-    * Read a stream with several blocks in a 4096 byte block file 
-    */
-   public void testReadStream4096() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi"));
-      
-      // 0 -> 1 -> 2 -> end
-      NPOIFSStream stream = new NPOIFSStream(fs, 0);
-      Iterator<ByteBuffer> i = stream.getBlockIterator();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b0 = i.next();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b1 = i.next();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b2 = i.next();
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      
-      // Check the contents of the 1st block
-      assertEquals((byte)0x9E, b0.get());
-      assertEquals((byte)0x75, b0.get());
-      assertEquals((byte)0x97, b0.get());
-      assertEquals((byte)0xF6, b0.get());
-      assertEquals((byte)0xFF, b0.get());
-      assertEquals((byte)0x21, b0.get());
-      assertEquals((byte)0xD2, b0.get());
-      assertEquals((byte)0x11, b0.get());
-      
-      // Check the contents of the 2nd block
-      assertEquals((byte)0x00, b1.get());
-      assertEquals((byte)0x00, b1.get());
-      assertEquals((byte)0x03, b1.get());
-      assertEquals((byte)0x00, b1.get());
-      assertEquals((byte)0x00, b1.get());
-      assertEquals((byte)0x00, b1.get());
-      assertEquals((byte)0x00, b1.get());
-      assertEquals((byte)0x00, b1.get());
-      
-      // Check the contents of the 3rd block
-      assertEquals((byte)0x6D, b2.get());
-      assertEquals((byte)0x00, b2.get());
-      assertEquals((byte)0x00, b2.get());
-      assertEquals((byte)0x00, b2.get());
-      assertEquals((byte)0x03, b2.get());
-      assertEquals((byte)0x00, b2.get());
-      assertEquals((byte)0x46, b2.get());
-      assertEquals((byte)0x00, b2.get());
-      
-      fs.close();
-   }
-   
-   /**
-    * Craft a nasty file with a loop, and ensure we don't get stuck
-    */
-   public void testReadFailsOnLoop() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      
-      // Hack the FAT so that it goes 0->1->2->0
-      fs.setNextBlock(0, 1);
-      fs.setNextBlock(1, 2);
-      fs.setNextBlock(2, 0);
-      
-      // Now try to read
-      NPOIFSStream stream = new NPOIFSStream(fs, 0);
-      Iterator<ByteBuffer> i = stream.getBlockIterator();
-      assertEquals(true, i.hasNext());
-      
-      // 1st read works
-      i.next();
-      assertEquals(true, i.hasNext());
-      
-      // 2nd read works
-      i.next();
-      assertEquals(true, i.hasNext());
-      
-      // 3rd read works
-      i.next();
-      assertEquals(true, i.hasNext());
-      
-      // 4th read blows up as it loops back to 0
-      try {
-         i.next();
-         fail("Loop should have been detected but wasn't!");
-      } catch(RuntimeException e) {
-         // Good, it was detected
-      }
-      assertEquals(true, i.hasNext());
-      
-      fs.close();
-   }
-
-   /**
-    * Tests that we can load some streams that are
-    *  stored in the mini stream.
-    */
-   public void testReadMiniStreams() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      NPOIFSMiniStore ministore = fs.getMiniStore();
-      
-      // 178 -> 179 -> 180 -> end
-      NPOIFSStream stream = new NPOIFSStream(ministore, 178);
-      Iterator<ByteBuffer> i = stream.getBlockIterator();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b178 = i.next();
-      assertEquals(true, i.hasNext());
-      assertEquals(true, i.hasNext());
-      ByteBuffer b179 = i.next();
-      assertEquals(true, i.hasNext());
-      ByteBuffer b180 = i.next();
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      assertEquals(false, i.hasNext());
-      
-      // Check the contents of the 1st block
-      assertEquals((byte)0xfe, b178.get());
-      assertEquals((byte)0xff, b178.get());
-      assertEquals((byte)0x00, b178.get());
-      assertEquals((byte)0x00, b178.get());
-      assertEquals((byte)0x05, b178.get());
-      assertEquals((byte)0x01, b178.get());
-      assertEquals((byte)0x02, b178.get());
-      assertEquals((byte)0x00, b178.get());
-      
-      // And the 2nd
-      assertEquals((byte)0x6c, b179.get());
-      assertEquals((byte)0x00, b179.get());
-      assertEquals((byte)0x00, b179.get());
-      assertEquals((byte)0x00, b179.get());
-      assertEquals((byte)0x28, b179.get());
-      assertEquals((byte)0x00, b179.get());
-      assertEquals((byte)0x00, b179.get());
-      assertEquals((byte)0x00, b179.get());
-      
-      // And the 3rd
-      assertEquals((byte)0x30, b180.get());
-      assertEquals((byte)0x00, b180.get());
-      assertEquals((byte)0x00, b180.get());
-      assertEquals((byte)0x00, b180.get());
-      assertEquals((byte)0x00, b180.get());
-      assertEquals((byte)0x00, b180.get());
-      assertEquals((byte)0x00, b180.get());
-      assertEquals((byte)0x80, b180.get());
-      
-      fs.close();
-   }
-
-   /**
-    * Writing the same amount of data as before
-    */
-   public void testReplaceStream() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      
-      byte[] data = new byte[512];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i%256);
-      }
-      
-      // 98 is actually the last block in a two block stream...
-      NPOIFSStream stream = new NPOIFSStream(fs, 98);
-      stream.updateContents(data);
-      
-      // Check the reading of blocks
-      Iterator<ByteBuffer> it = stream.getBlockIterator();
-      assertEquals(true, it.hasNext());
-      ByteBuffer b = it.next();
-      assertEquals(false, it.hasNext());
-      
-      // Now check the contents
-      data = new byte[512];
-      b.get(data);
-      for(int i=0; i<data.length; i++) {
-         byte exp = (byte)(i%256);
-         assertEquals(exp, data[i]);
-      }
-      
-      fs.close();
-   }
-   
-   /**
-    * Writes less data than before, some blocks will need
-    *  to be freed
-    */
-   public void testReplaceStreamWithLess() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      
-      byte[] data = new byte[512];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i%256);
-      }
-      
-      // 97 -> 98 -> end
-      assertEquals(98, fs.getNextBlock(97));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(98));
-      
-      // Create a 2 block stream, will become a 1 block one
-      NPOIFSStream stream = new NPOIFSStream(fs, 97);
-      stream.updateContents(data);
-      
-      // 97 should now be the end, and 98 free
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(97));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(98));
-      
-      // Check the reading of blocks
-      Iterator<ByteBuffer> it = stream.getBlockIterator();
-      assertEquals(true, it.hasNext());
-      ByteBuffer b = it.next();
-      assertEquals(false, it.hasNext());
-      
-      // Now check the contents
-      data = new byte[512];
-      b.get(data);
-      for(int i=0; i<data.length; i++) {
-         byte exp = (byte)(i%256);
-         assertEquals(exp, data[i]);
-      }
-      
-      fs.close();
-   }
-   
-   /**
-    * Writes more data than before, new blocks will be needed
-    */
-   public void testReplaceStreamWithMore() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      
-      byte[] data = new byte[512*3];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i%256);
-      }
-      
-      // 97 -> 98 -> end
-      assertEquals(98, fs.getNextBlock(97));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(98));
-      
-      // 100 is our first free one
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(100));
-      
-      // Create a 2 block stream, will become a 3 block one
-      NPOIFSStream stream = new NPOIFSStream(fs, 97);
-      stream.updateContents(data);
-      
-      // 97 -> 98 -> 100 -> end
-      assertEquals(98, fs.getNextBlock(97));
-      assertEquals(100, fs.getNextBlock(98));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(100));
-      
-      // Check the reading of blocks
-      Iterator<ByteBuffer> it = stream.getBlockIterator();
-      int count = 0;
-      while(it.hasNext()) {
-         ByteBuffer b = it.next();
-         data = new byte[512];
-         b.get(data);
-         for(int i=0; i<data.length; i++) {
-            byte exp = (byte)(i%256);
-            assertEquals(exp, data[i]);
-         }
-         count++;
-      }
-      assertEquals(3, count);
-      
-      fs.close();
-   }
-   
-   /**
-    * Writes to a new stream in the file
-    */
-   public void testWriteNewStream() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      
-      // 100 is our first free one
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(100));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(101));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(102));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(103));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(104));
-      
-      
-      // Add a single block one
-      byte[] data = new byte[512];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i%256);
-      }
-      
-      NPOIFSStream stream = new NPOIFSStream(fs);
-      stream.updateContents(data);
-      
-      // Check it was allocated properly
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(100));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(101));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(102));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(103));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(104));
-      
-      // And check the contents
-      Iterator<ByteBuffer> it = stream.getBlockIterator();
-      int count = 0;
-      while(it.hasNext()) {
-         ByteBuffer b = it.next();
-         data = new byte[512];
-         b.get(data);
-         for(int i=0; i<data.length; i++) {
-            byte exp = (byte)(i%256);
-            assertEquals(exp, data[i]);
-         }
-         count++;
-      }
-      assertEquals(1, count);
-      
-      
-      // And a multi block one
-      data = new byte[512*3];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i%256);
-      }
-      
-      stream = new NPOIFSStream(fs);
-      stream.updateContents(data);
-      
-      // Check it was allocated properly
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(100));
-      assertEquals(102,                         fs.getNextBlock(101));
-      assertEquals(103,                         fs.getNextBlock(102));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(103));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(104));
-      
-      // And check the contents
-      it = stream.getBlockIterator();
-      count = 0;
-      while(it.hasNext()) {
-         ByteBuffer b = it.next();
-         data = new byte[512];
-         b.get(data);
-         for(int i=0; i<data.length; i++) {
-            byte exp = (byte)(i%256);
-            assertEquals(exp, data[i]);
-         }
-         count++;
-      }
-      assertEquals(3, count);
-      
-      // Free it
-      stream.free();
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(100));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(101));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(102));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(103));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(104));
-      
-      fs.close();
-   }
-   
-   /**
-    * Writes to a new stream in the file, where we've not enough
-    *  free blocks so new FAT segments will need to be allocated
-    *  to support this
-    */
-   public void testWriteNewStreamExtraFATs() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      
-      // Allocate almost all the blocks
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(99));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(100));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(127));
-      for(int i=100; i<127; i++) {
-         fs.setNextBlock(i, POIFSConstants.END_OF_CHAIN);
-      }
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(127));
-      assertEquals(true, fs.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-
-      
-      // Write a 3 block stream
-      byte[] data = new byte[512*3];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i%256);
-      }
-      NPOIFSStream stream = new NPOIFSStream(fs);
-      stream.updateContents(data);
-      
-      // Check we got another BAT
-      assertEquals(false, fs.getBATBlockAndIndex(0).getBlock().hasFreeSectors());
-      assertEquals(true,  fs.getBATBlockAndIndex(128).getBlock().hasFreeSectors());
-      
-      // the BAT will be in the first spot of the new block
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(126));
-      assertEquals(129,                         fs.getNextBlock(127));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(128));
-      assertEquals(130,                         fs.getNextBlock(129));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(130));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(131));
-      
-      fs.close();
-   }
-   
-   /**
-    * Replaces data in an existing stream, with a bit
-    *  more data than before, in a 4096 byte block file
-    */
-   public void testWriteStream4096() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi"));
-      
-      // 0 -> 1 -> 2 -> end
-      assertEquals(1, fs.getNextBlock(0));
-      assertEquals(2, fs.getNextBlock(1));
-      assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(2));
-      assertEquals(4, fs.getNextBlock(3));
-      
-      // First free one is at 15
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(14));
-      assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(15));
-      
-      
-      // Write a 5 block file 
-      byte[] data = new byte[4096*5];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i%256);
-      }
-      NPOIFSStream stream = new NPOIFSStream(fs, 0);
-      stream.updateContents(data);
-      
-      
-      // Check it
-      assertEquals(1, fs.getNextBlock(0));
-      assertEquals(2, fs.getNextBlock(1));
-      assertEquals(15, fs.getNextBlock(2)); // Jumps
-      assertEquals(4, fs.getNextBlock(3));  // Next stream
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(14));
-      assertEquals(16,                              fs.getNextBlock(15)); // Continues
-      assertEquals(POIFSConstants.END_OF_CHAIN,     fs.getNextBlock(16)); // Ends
-      assertEquals(POIFSConstants.UNUSED_BLOCK,     fs.getNextBlock(17)); // Free
-
-      // Check the contents too
-      Iterator<ByteBuffer> it = stream.getBlockIterator();
-      int count = 0;
-      while(it.hasNext()) {
-         ByteBuffer b = it.next();
-         data = new byte[512];
-         b.get(data);
-         for(int i=0; i<data.length; i++) {
-            byte exp = (byte)(i%256);
-            assertEquals(exp, data[i]);
-         }
-         count++;
-      }
-      assertEquals(5, count);
-      
-      fs.close();
-   }
-   
-   /**
-    * Tests that we can write into the mini stream
-    */
-   public void testWriteMiniStreams() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
-      NPOIFSMiniStore ministore = fs.getMiniStore();
-      NPOIFSStream stream = new NPOIFSStream(ministore, 178);
-      
-      // 178 -> 179 -> 180 -> end
-      assertEquals(179, ministore.getNextBlock(178));
-      assertEquals(180, ministore.getNextBlock(179));
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(180));
-      
-      
-      // Try writing 3 full blocks worth
-      byte[] data = new byte[64*3];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)i;
-      }
-      stream = new NPOIFSStream(ministore, 178);
-      stream.updateContents(data);
-      
-      // Check
-      assertEquals(179, ministore.getNextBlock(178));
-      assertEquals(180, ministore.getNextBlock(179));
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(180));
-      
-      stream = new NPOIFSStream(ministore, 178);
-      Iterator<ByteBuffer> it = stream.getBlockIterator();
-      ByteBuffer b178 = it.next();
-      ByteBuffer b179 = it.next();
-      ByteBuffer b180 = it.next();
-      assertEquals(false, it.hasNext());
-      
-      assertEquals((byte)0x00, b178.get());
-      assertEquals((byte)0x01, b178.get());
-      assertEquals((byte)0x40, b179.get());
-      assertEquals((byte)0x41, b179.get());
-      assertEquals((byte)0x80, b180.get());
-      assertEquals((byte)0x81, b180.get());
-
-      
-      // Try writing just into 3 blocks worth
-      data = new byte[64*2 + 12];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i+4);
-      }
-      stream = new NPOIFSStream(ministore, 178);
-      stream.updateContents(data);
-      
-      // Check
-      assertEquals(179, ministore.getNextBlock(178));
-      assertEquals(180, ministore.getNextBlock(179));
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(180));
-      
-      stream = new NPOIFSStream(ministore, 178);
-      it = stream.getBlockIterator();
-      b178 = it.next();
-      b179 = it.next();
-      b180 = it.next();
-      assertEquals(false, it.hasNext());
-      
-      assertEquals((byte)0x04, b178.get(0));
-      assertEquals((byte)0x05, b178.get(1));
-      assertEquals((byte)0x44, b179.get(0));
-      assertEquals((byte)0x45, b179.get(1));
-      assertEquals((byte)0x84, b180.get(0));
-      assertEquals((byte)0x85, b180.get(1));
-
-      
-      // Try writing 1, should truncate
-      data = new byte[12];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i+9);
-      }
-      stream = new NPOIFSStream(ministore, 178);
-      stream.updateContents(data);
-
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(178));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(179));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(180));
-      
-      stream = new NPOIFSStream(ministore, 178);
-      it = stream.getBlockIterator();
-      b178 = it.next();
-      assertEquals(false, it.hasNext());
-      
-      assertEquals((byte)0x09, b178.get(0));
-      assertEquals((byte)0x0a, b178.get(1));
-
-      
-      // Try writing 5, should extend
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(178));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(179));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(180));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(181));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(182));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(183));
-      
-      data = new byte[64*4 + 12];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i+3);
-      }
-      stream = new NPOIFSStream(ministore, 178);
-      stream.updateContents(data);
-      
-      assertEquals(179, ministore.getNextBlock(178));
-      assertEquals(180, ministore.getNextBlock(179));
-      assertEquals(181, ministore.getNextBlock(180));
-      assertEquals(182, ministore.getNextBlock(181));
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(182));
-      
-      stream = new NPOIFSStream(ministore, 178);
-      it = stream.getBlockIterator();
-      b178 = it.next();
-      b179 = it.next();
-      b180 = it.next();
-      ByteBuffer b181 = it.next();
-      ByteBuffer b182 = it.next();
-      assertEquals(false, it.hasNext());
-      
-      assertEquals((byte)0x03, b178.get(0));
-      assertEquals((byte)0x04, b178.get(1));
-      assertEquals((byte)0x43, b179.get(0));
-      assertEquals((byte)0x44, b179.get(1));
-      assertEquals((byte)0x83, b180.get(0));
-      assertEquals((byte)0x84, b180.get(1));
-      assertEquals((byte)0xc3, b181.get(0));
-      assertEquals((byte)0xc4, b181.get(1));
-      assertEquals((byte)0x03, b182.get(0));
-      assertEquals((byte)0x04, b182.get(1));
-
-      
-      // Write lots, so it needs another big block
-      ministore.getBlockAt(183);
-      try {
-         ministore.getBlockAt(184);
-         fail("Block 184 should be off the end of the list");
-      } catch(IndexOutOfBoundsException e) {}
-      
-      data = new byte[64*6 + 12];
-      for(int i=0; i<data.length; i++) {
-         data[i] = (byte)(i+1);
-      }
-      stream = new NPOIFSStream(ministore, 178);
-      stream.updateContents(data);
-      
-      // Should have added 2 more blocks to the chain
-      assertEquals(179, ministore.getNextBlock(178));
-      assertEquals(180, ministore.getNextBlock(179));
-      assertEquals(181, ministore.getNextBlock(180));
-      assertEquals(182, ministore.getNextBlock(181));
-      assertEquals(183, ministore.getNextBlock(182));
-      assertEquals(184, ministore.getNextBlock(183));
-      assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(184));
-      assertEquals(POIFSConstants.UNUSED_BLOCK, ministore.getNextBlock(185));
-      
-      // Block 184 should exist
-      ministore.getBlockAt(183);
-      ministore.getBlockAt(184);
-      ministore.getBlockAt(185);
-      
-      // Check contents
-      stream = new NPOIFSStream(ministore, 178);
-      it = stream.getBlockIterator();
-      b178 = it.next();
-      b179 = it.next();
-      b180 = it.next();
-      b181 = it.next();
-      b182 = it.next();
-      ByteBuffer b183 = it.next();
-      ByteBuffer b184 = it.next();
-      assertEquals(false, it.hasNext());
-      
-      assertEquals((byte)0x01, b178.get(0));
-      assertEquals((byte)0x02, b178.get(1));
-      assertEquals((byte)0x41, b179.get(0));
-      assertEquals((byte)0x42, b179.get(1));
-      assertEquals((byte)0x81, b180.get(0));
-      assertEquals((byte)0x82, b180.get(1));
-      assertEquals((byte)0xc1, b181.get(0));
-      assertEquals((byte)0xc2, b181.get(1));
-      assertEquals((byte)0x01, b182.get(0));
-      assertEquals((byte)0x02, b182.get(1));
-      assertEquals((byte)0x41, b183.get(0));
-      assertEquals((byte)0x42, b183.get(1));
-      assertEquals((byte)0x81, b184.get(0));
-      assertEquals((byte)0x82, b184.get(1));
-      
-      fs.close();
-   }
-
-   /**
-    * Craft a nasty file with a loop, and ensure we don't get stuck
-    */
-   public void testWriteFailsOnLoop() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-      
-      // Hack the FAT so that it goes 0->1->2->0
-      fs.setNextBlock(0, 1);
-      fs.setNextBlock(1, 2);
-      fs.setNextBlock(2, 0);
-      
-      // Try to write a large amount, should fail on the write
-      byte[] data = new byte[512*4];
-      NPOIFSStream stream = new NPOIFSStream(fs, 0);
-      try {
-         stream.updateContents(data);
-         fail("Loop should have been detected but wasn't!");
-      } catch(IllegalStateException e) {}
-      
-      // Now reset, and try on a small bit
-      // Should fail during the freeing set
-      fs.setNextBlock(0, 1);
-      fs.setNextBlock(1, 2);
-      fs.setNextBlock(2, 0);
-      
-      data = new byte[512];
-      stream = new NPOIFSStream(fs, 0);
-      try {
-         stream.updateContents(data);
-         fail("Loop should have been detected but wasn't!");
-      } catch(IllegalStateException e) {}
-      
-      fs.close();
-   }
-   
-   /**
-    * Tests adding a new stream, writing and reading it.
-    */
-   public void testReadWriteNewStream() throws Exception {
-      NPOIFSFileSystem fs = new NPOIFSFileSystem();
-      NPOIFSStream stream = new NPOIFSStream(fs);
-      
-      // Check our filesystem has Properties then BAT
-      assertEquals(2, fs.getFreeBlock());
-      BATBlock bat = fs.getBATBlockAndIndex(0).getBlock();
-      assertEquals(POIFSConstants.END_OF_CHAIN,    bat.getValueAt(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,bat.getValueAt(1));
-      assertEquals(POIFSConstants.UNUSED_BLOCK,    bat.getValueAt(2));
-      
-      // Check the stream as-is
-      assertEquals(POIFSConstants.END_OF_CHAIN, stream.getStartBlock());
-      try {
-         stream.getBlockIterator();
-         fail("Shouldn't be able to get an iterator before writing");
-      } catch(IllegalStateException e) {}
-      
-      // Write in two blocks
-      byte[] data = new byte[512+20];
-      for(int i=0; i<512; i++) {
-         data[i] = (byte)(i%256);
-      }
-      for(int i=512; i<data.length; i++) {
-         data[i] = (byte)(i%256 + 100);
-      }
-      stream.updateContents(data);
-      
-      // Check now
-      assertEquals(4, fs.getFreeBlock());
-      bat = fs.getBATBlockAndIndex(0).getBlock();
-      assertEquals(POIFSConstants.END_OF_CHAIN,    bat.getValueAt(0));
-      assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,bat.getValueAt(1));
-      assertEquals(3,                              bat.getValueAt(2));
-      assertEquals(POIFSConstants.END_OF_CHAIN,    bat.getValueAt(3));
-      assertEquals(POIFSConstants.UNUSED_BLOCK,    bat.getValueAt(4));
-      
-      
-      Iterator<ByteBuffer> it = stream.getBlockIterator();
-      assertEquals(true, it.hasNext());
-      ByteBuffer b = it.next();
-      
-      byte[] read = new byte[512];
-      b.get(read);
-      for(int i=0; i<read.length; i++) {
-         assertEquals("Wrong value at " + i, data[i], read[i]);
-      }
-      
-      assertEquals(true, it.hasNext());
-      b = it.next();
-      
-      read = new byte[512];
-      b.get(read);
-      for(int i=0; i<20; i++) {
-         assertEquals(data[i+512], read[i]);
-      }
-      for(int i=20; i<read.length; i++) {
-         assertEquals(0, read[i]);
-      }
-      
-      assertEquals(false, it.hasNext());
-      
-      fs.close();
-   }
-   
-   /**
-    * Writes a stream, then replaces it
-    */
-   public void testWriteThenReplace() throws Exception {
-       NPOIFSFileSystem fs = new NPOIFSFileSystem();
-
-       // Starts empty, other that Properties and BAT
-       BATBlock bat = fs.getBATBlockAndIndex(0).getBlock();
-       assertEquals(POIFSConstants.END_OF_CHAIN,    bat.getValueAt(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,bat.getValueAt(1));
-       assertEquals(POIFSConstants.UNUSED_BLOCK,    bat.getValueAt(2));
-
-       // Write something that uses a main stream
-       byte[] main4106 = new byte[4106];
-       main4106[0] = -10;
-       main4106[4105] = -11;
-       DocumentEntry normal = fs.getRoot().createDocument(
-               "Normal", new ByteArrayInputStream(main4106));
-       
-       // Should have used 9 blocks
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,bat.getValueAt(1));
-       assertEquals(3,                           bat.getValueAt(2));
-       assertEquals(4,                           bat.getValueAt(3));
-       assertEquals(5,                           bat.getValueAt(4));
-       assertEquals(6,                           bat.getValueAt(5));
-       assertEquals(7,                           bat.getValueAt(6));
-       assertEquals(8,                           bat.getValueAt(7));
-       assertEquals(9,                           bat.getValueAt(8));
-       assertEquals(10,                          bat.getValueAt(9));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(10));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(11));
-       
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       assertEquals(4106, normal.getSize());
-       assertEquals(4106, ((DocumentNode)normal).getProperty().getSize());
-
-       
-       // Replace with one still big enough for a main stream, but one block smaller
-       byte[] main4096 = new byte[4096];
-       main4096[0] = -10;
-       main4096[4095] = -11;
-       
-       NDocumentOutputStream nout = new NDocumentOutputStream(normal);
-       nout.write(main4096);
-       nout.close();
-       
-       // Will have dropped to 8
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,bat.getValueAt(1));
-       assertEquals(3,                           bat.getValueAt(2));
-       assertEquals(4,                           bat.getValueAt(3));
-       assertEquals(5,                           bat.getValueAt(4));
-       assertEquals(6,                           bat.getValueAt(5));
-       assertEquals(7,                           bat.getValueAt(6));
-       assertEquals(8,                           bat.getValueAt(7));
-       assertEquals(9,                           bat.getValueAt(8));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(9));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(10));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(11));
-
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       assertEquals(4096, normal.getSize());
-       assertEquals(4096, ((DocumentNode)normal).getProperty().getSize());
-       
-       
-       // Write and check
-       fs = writeOutAndReadBack(fs);
-       bat = fs.getBATBlockAndIndex(0).getBlock();
-       
-       // No change after write
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(0)); // Properties
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,bat.getValueAt(1));
-       assertEquals(3,                           bat.getValueAt(2));
-       assertEquals(4,                           bat.getValueAt(3));
-       assertEquals(5,                           bat.getValueAt(4));
-       assertEquals(6,                           bat.getValueAt(5));
-       assertEquals(7,                           bat.getValueAt(6));
-       assertEquals(8,                           bat.getValueAt(7));
-       assertEquals(9,                           bat.getValueAt(8));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(9)); // End of Normal
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(10));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(11));
-       
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       assertEquals(4096, normal.getSize());
-       assertEquals(4096, ((DocumentNode)normal).getProperty().getSize());
-       
-       
-       // Make longer, take 1 block at the end
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       nout = new NDocumentOutputStream(normal);
-       nout.write(main4106);
-       nout.close();
-
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK,bat.getValueAt(1));
-       assertEquals(3,                           bat.getValueAt(2));
-       assertEquals(4,                           bat.getValueAt(3));
-       assertEquals(5,                           bat.getValueAt(4));
-       assertEquals(6,                           bat.getValueAt(5));
-       assertEquals(7,                           bat.getValueAt(6));
-       assertEquals(8,                           bat.getValueAt(7));
-       assertEquals(9,                           bat.getValueAt(8));
-       assertEquals(10,                          bat.getValueAt(9));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(10)); // Normal
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(11));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(12));
-       
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       assertEquals(4106, normal.getSize());
-       assertEquals(4106, ((DocumentNode)normal).getProperty().getSize());
-
-       
-       // Make it small, will trigger the SBAT stream and free lots up
-       byte[] mini = new byte[] { 42, 0, 1, 2, 3, 4, 42 };
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       nout = new NDocumentOutputStream(normal);
-       nout.write(mini);
-       nout.close();
-       
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, bat.getValueAt(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(2)); // SBAT
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(3)); // Mini Stream
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(4));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(5));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(6));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(7));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(8));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(9));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(10));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(11));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(12));
-       
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       assertEquals(7, normal.getSize());
-       assertEquals(7, ((DocumentNode)normal).getProperty().getSize());
-
-       
-       // Finally back to big again
-       nout = new NDocumentOutputStream(normal);
-       nout.write(main4096);
-       nout.close();
-       
-       // Will keep the mini stream, now empty
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, bat.getValueAt(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(2)); // SBAT
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(3)); // Mini Stream
-       assertEquals(5,                           bat.getValueAt(4));
-       assertEquals(6,                           bat.getValueAt(5));
-       assertEquals(7,                           bat.getValueAt(6));
-       assertEquals(8,                           bat.getValueAt(7));
-       assertEquals(9,                           bat.getValueAt(8));
-       assertEquals(10,                          bat.getValueAt(9));
-       assertEquals(11,                          bat.getValueAt(10));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(11));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(12));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(13));
-       
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       assertEquals(4096, normal.getSize());
-       assertEquals(4096, ((DocumentNode)normal).getProperty().getSize());
-       
-       
-       // Save, re-load, re-check
-       fs = writeOutAndReadBack(fs);
-       bat = fs.getBATBlockAndIndex(0).getBlock();
-       
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(0));
-       assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, bat.getValueAt(1));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(2)); // SBAT
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(3)); // Mini Stream
-       assertEquals(5,                           bat.getValueAt(4));
-       assertEquals(6,                           bat.getValueAt(5));
-       assertEquals(7,                           bat.getValueAt(6));
-       assertEquals(8,                           bat.getValueAt(7));
-       assertEquals(9,                           bat.getValueAt(8));
-       assertEquals(10,                          bat.getValueAt(9));
-       assertEquals(11,                          bat.getValueAt(10));
-       assertEquals(POIFSConstants.END_OF_CHAIN, bat.getValueAt(11));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(12));
-       assertEquals(POIFSConstants.UNUSED_BLOCK, bat.getValueAt(13));
-       
-       normal = (DocumentEntry)fs.getRoot().getEntry("Normal");
-       assertEquals(4096, normal.getSize());
-       assertEquals(4096, ((DocumentNode)normal).getProperty().getSize());
-       
-       fs.close();
-   }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
deleted file mode 100644
index 087fbb2..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.util.Arrays;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test that POIFS complains when given an Office 2003 XML
- *  of Office Open XML (OOXML, 2007+) document
- */
-public class TestOfficeXMLException extends TestCase {
-
-	private static final InputStream openSampleStream(String sampleFileName) {
-		return HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-	}
-	public void testOOXMLException() throws IOException
-	{
-		InputStream in = openSampleStream("sample.xlsx");
-
-		try {
-			new POIFSFileSystem(in).close();
-			fail("expected exception was not thrown");
-		} catch(OfficeXmlFileException e) {
-			// expected during successful test
-			assertTrue(e.getMessage().indexOf("The supplied data appears to be in the Office 2007+ XML") > -1);
-			assertTrue(e.getMessage().indexOf("You are calling the part of POI that deals with OLE2 Office Documents") > -1);
-		}
-	}
-    public void test2003XMLException() throws IOException
-    {
-        InputStream in = openSampleStream("SampleSS.xml");
-
-        try {
-            new POIFSFileSystem(in).close();
-            fail("expected exception was not thrown");
-        } catch(NotOLE2FileException e) {
-            // expected during successful test
-            assertTrue(e.getMessage().indexOf("The supplied data appears to be a raw XML file") > -1);
-            assertTrue(e.getMessage().indexOf("Formats such as Office 2003 XML") > -1);
-        }
-    }
-	
-	public void testDetectAsPOIFS() throws IOException {
-		// ooxml file isn't
-		confirmIsPOIFS("SampleSS.xlsx", false);
-		
-        // 2003 xml file isn't
-        confirmIsPOIFS("SampleSS.xml", false);
-        
-		// xls file is
-		confirmIsPOIFS("SampleSS.xls", true);
-		
-		// text file isn't
-		confirmIsPOIFS("SampleSS.txt", false);
-	}
-	private void confirmIsPOIFS(String sampleFileName, boolean expectedResult) throws IOException {
-		InputStream in  = new PushbackInputStream(openSampleStream(sampleFileName), 10);
-		try {
-    		boolean actualResult;
-    		try {
-    			actualResult = POIFSFileSystem.hasPOIFSHeader(in);
-    		} catch (IOException e) {
-    			throw new RuntimeException(e);
-    		}
-    		assertEquals(expectedResult, actualResult);
-		} finally {
-		    in.close();
-		}
-	}
-    
-    public void testFileCorruption() throws Exception {
-        
-        // create test InputStream
-        byte[] testData = { (byte)1, (byte)2, (byte)3 };
-        InputStream testInput = new ByteArrayInputStream(testData);
-        
-        // detect header
-        InputStream in = new PushbackInputStream(testInput, 10);
-        assertFalse(POIFSFileSystem.hasPOIFSHeader(in));
-        
-        // check if InputStream is still intact
-        byte[] test = new byte[3];
-        in.read(test);
-        assertTrue(Arrays.equals(testData, test));
-        assertEquals(-1, in.read());
-    }
-
-
-    public void testFileCorruptionOPOIFS() throws Exception {
-        
-        // create test InputStream
-        byte[] testData = { (byte)1, (byte)2, (byte)3 };
-        InputStream testInput = new ByteArrayInputStream(testData);
-        
-        // detect header
-        InputStream in = new PushbackInputStream(testInput, 10);
-        assertFalse(OPOIFSFileSystem.hasPOIFSHeader(in));
-
-        // check if InputStream is still intact
-        byte[] test = new byte[3];
-        in.read(test);
-        assertTrue(Arrays.equals(testData, test));
-        assertEquals(-1, in.read());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java
deleted file mode 100644
index 0abdf84..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.IOUtils;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class TestOle10Native {
-    private static final POIDataSamples dataSamples = POIDataSamples.getPOIFSInstance();
-
-    @Test
-    public void testOleNative() throws IOException, Ole10NativeException {
-        POIFSFileSystem fs = new POIFSFileSystem(dataSamples.openResourceAsStream("oleObject1.bin"));
-
-        Ole10Native ole = Ole10Native.createFromEmbeddedOleObject(fs);
-
-        assertEquals("File1.svg", ole.getLabel());
-        assertEquals("D:\\Documents and Settings\\rsc\\My Documents\\file1.svg", ole.getCommand());
-    }
-
-    @Test
-    public void testFiles() throws IOException, Ole10NativeException {
-        File files[] = {
-            // bug 51891
-            POIDataSamples.getPOIFSInstance().getFile("multimedia.doc"),
-            // tika bug 1072
-            POIDataSamples.getPOIFSInstance().getFile("20-Force-on-a-current-S00.doc"),
-            // other files containing ole10native records ...
-            POIDataSamples.getDocumentInstance().getFile("Bug53380_3.doc"),
-            POIDataSamples.getDocumentInstance().getFile("Bug47731.doc")
-        };
-        
-        for (File f : files) {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(f, true);
-            List<Entry> entries = new ArrayList<Entry>();
-            findOle10(entries, fs.getRoot(), "/", "");
-            
-            for (Entry e : entries) {
-                ByteArrayOutputStream bosExp = new ByteArrayOutputStream();
-                InputStream is = ((DirectoryNode)e.getParent()).createDocumentInputStream(e);
-                IOUtils.copy(is,bosExp);
-                is.close();
-                
-                Ole10Native ole = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)e.getParent());
-                
-                ByteArrayOutputStream bosAct = new ByteArrayOutputStream();
-                ole.writeOut(bosAct);
-                
-                assertThat(bosExp.toByteArray(), equalTo(bosAct.toByteArray()));
-            }
-            
-            fs.close();
-        }
-    }
-
-    /*
-    void searchOle10Files() throws Exception {
-        File dir = new File("test-data/document");
-        for (File file : dir.listFiles(new FileFilter(){
-            public boolean accept(File pathname) {
-                return pathname.getName().endsWith("doc");
-            }
-        })) {
-            NPOIFSFileSystem fs = new NPOIFSFileSystem(file, true);
-            findOle10(null, fs.getRoot(), "/", file.getName());
-            fs.close();
-        }
-    }*/
-    
-    void findOle10(List<Entry> entries, DirectoryNode dn, String path, String filename) {
-        Iterator<Entry> iter = dn.getEntries();
-        while (iter.hasNext()) {
-            Entry e = iter.next();
-            if (Ole10Native.OLE10_NATIVE.equals(e.getName())) {
-                if (entries != null) entries.add(e);
-                // System.out.println(filename+" : "+path);
-            } else if (e.isDirectoryEntry()) {
-                findOle10(entries, (DirectoryNode)e, path+e.getName()+"/", filename);
-            }
-        }
-    }
-
-    @Test
-    public void testOleNativeOOM() throws IOException, Ole10NativeException {
-        POIFSFileSystem fs = new POIFSFileSystem(dataSamples.openResourceAsStream("60256.bin"));
-        try {
-            Ole10Native.createFromEmbeddedOleObject(fs);
-            fail("Should have thrown exception because OLENative lacks a length parameter");
-        } catch (Ole10NativeException e) {
-            assertTrue(e.getMessage().indexOf("declared data length") > -1);
-        }
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
deleted file mode 100644
index 0ca0304..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test POIFSDocumentPath functionality
- *
- * @author Marc Johnson
- */
-public final class TestPOIFSDocumentPath extends TestCase {
-
-
-    /**
-     * Test default constructor
-     */
-    public void testDefaultConstructor() {
-        POIFSDocumentPath path = new POIFSDocumentPath();
-
-        assertEquals(0, path.length());
-    }
-
-    /**
-     * Test full path constructor
-     */
-    public void testFullPathConstructor() {
-        String[] components =
-        {
-            "foo", "bar", "foobar", "fubar"
-        };
-
-        for (int j = 0; j < components.length; j++)
-        {
-            String[] params = new String[ j ];
-
-            for (int k = 0; k < j; k++)
-            {
-                params[ k ] = components[ k ];
-            }
-            POIFSDocumentPath path = new POIFSDocumentPath(params);
-
-            assertEquals(j, path.length());
-            for (int k = 0; k < j; k++)
-            {
-                assertEquals(components[ k ], path.getComponent(k));
-            }
-            if (j == 0)
-            {
-                assertNull(path.getParent());
-            }
-            else
-            {
-                POIFSDocumentPath parent = path.getParent();
-
-                assertNotNull(parent);
-                assertEquals(j - 1, parent.length());
-                for (int k = 0; k < j - 1; k++)
-                {
-                    assertEquals(components[ k ], parent.getComponent(k));
-                }
-            }
-        }
-
-        // test weird variants
-        assertEquals(0, new POIFSDocumentPath(null).length());
-        try
-        {
-            new POIFSDocumentPath(new String[]
-            {
-                "fu", ""
-            });
-            fail("should have caught IllegalArgumentException");
-        }
-        catch (IllegalArgumentException ignored)
-        {
-        }
-        try
-        {
-            new POIFSDocumentPath(new String[]
-            {
-                "fu", null
-            });
-            fail("should have caught IllegalArgumentException");
-        }
-        catch (IllegalArgumentException ignored)
-        {
-        }
-    }
-
-    /**
-     * Test relative path constructor
-     */
-    public void testRelativePathConstructor() {
-        String[] initialComponents =
-        {
-            "a", "b", "c"
-        };
-
-        for (int n = 0; n < initialComponents.length; n++)
-        {
-            String[] initialParams = new String[ n ];
-
-            for (int k = 0; k < n; k++)
-            {
-                initialParams[ k ] = initialComponents[ k ];
-            }
-            POIFSDocumentPath base       =
-                new POIFSDocumentPath(initialParams);
-            String[]          components =
-            {
-                "foo", "bar", "foobar", "fubar"
-            };
-
-            for (int j = 0; j < components.length; j++)
-            {
-                String[] params = new String[ j ];
-
-                for (int k = 0; k < j; k++)
-                {
-                    params[ k ] = components[ k ];
-                }
-                POIFSDocumentPath path = new POIFSDocumentPath(base, params);
-
-                assertEquals(j + n, path.length());
-                for (int k = 0; k < n; k++)
-                {
-                    assertEquals(initialComponents[ k ],
-                                 path.getComponent(k));
-                }
-                for (int k = 0; k < j; k++)
-                {
-                    assertEquals(components[ k ], path.getComponent(k + n));
-                }
-                if ((j + n) == 0)
-                {
-                    assertNull(path.getParent());
-                }
-                else
-                {
-                    POIFSDocumentPath parent = path.getParent();
-
-                    assertNotNull(parent);
-                    assertEquals(j + n - 1, parent.length());
-                    for (int k = 0; k < (j + n - 1); k++)
-                    {
-                        assertEquals(path.getComponent(k),
-                                     parent.getComponent(k));
-                    }
-                }
-            }
-
-            // Test weird variants
-            
-            // This one is allowed, even if it's really odd
-            assertEquals(n, new POIFSDocumentPath(base, null).length());
-            new POIFSDocumentPath(base, new String[]
-            {
-                 "fu", ""
-            });
-            
-            // This one is allowed too
-            new POIFSDocumentPath(base, new String[]
-            {
-                 "", "fu"
-            });
-            
-            // This one shouldn't be allowed
-            try
-            {
-                new POIFSDocumentPath(base, new String[]
-                {
-                    "fu", null
-                });
-                fail("should have caught IllegalArgumentException");
-            }
-            catch (IllegalArgumentException ignored)
-            {
-            }
-            
-            // Ditto
-            try
-            {
-                new POIFSDocumentPath(base, new String[]
-                {
-                    null, "fu"
-                });
-                fail("should have caught IllegalArgumentException");
-            }
-            catch (IllegalArgumentException ignored)
-            {
-            }
-        }
-    }
-
-    /**
-     * test equality
-     */
-    public void testEquality() {
-        POIFSDocumentPath   a1    = new POIFSDocumentPath();
-        POIFSDocumentPath   a2    = new POIFSDocumentPath(null);
-        POIFSDocumentPath   a3    = new POIFSDocumentPath(new String[ 0 ]);
-        POIFSDocumentPath   a4    = new POIFSDocumentPath(a1, null);
-        POIFSDocumentPath   a5    = new POIFSDocumentPath(a1,
-                                        new String[ 0 ]);
-        POIFSDocumentPath[] paths =
-        {
-            a1, a2, a3, a4, a5
-        };
-
-        for (int j = 0; j < paths.length; j++)
-        {
-            for (int k = 0; k < paths.length; k++)
-            {
-                assertEquals(j + "<>" + k,
-                             paths[ j ], paths[ k ]);
-            }
-        }
-        a2 = new POIFSDocumentPath(a1, new String[]
-        {
-            "foo"
-        });
-        a3 = new POIFSDocumentPath(a2, new String[]
-        {
-            "bar"
-        });
-        a4 = new POIFSDocumentPath(a3, new String[]
-        {
-            "fubar"
-        });
-        a5 = new POIFSDocumentPath(a4, new String[]
-        {
-            "foobar"
-        });
-        POIFSDocumentPath[] builtUpPaths =
-        {
-            a1, a2, a3, a4, a5
-        };
-        POIFSDocumentPath[] fullPaths    =
-        {
-            new POIFSDocumentPath(), new POIFSDocumentPath(new String[]
-            {
-                "foo"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "fubar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "fubar", "foobar"
-            })
-        };
-
-        for (int k = 0; k < builtUpPaths.length; k++)
-        {
-            for (int j = 0; j < fullPaths.length; j++)
-            {
-                if (k == j)
-                {
-                    assertEquals(j + "<>"
-                                 + k, fullPaths[ j ],
-                                                      builtUpPaths[ k ]);
-                }
-                else
-                {
-                    assertTrue(j + "<>" + k,
-                               !(fullPaths[ j ].equals(builtUpPaths[ k ])));
-                }
-            }
-        }
-        POIFSDocumentPath[] badPaths =
-        {
-            new POIFSDocumentPath(new String[]
-            {
-                "_foo"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "_bar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "_fubar"
-            }), new POIFSDocumentPath(new String[]
-            {
-                "foo", "bar", "fubar", "_foobar"
-            })
-        };
-
-        for (int k = 0; k < builtUpPaths.length; k++)
-        {
-            for (int j = 0; j < badPaths.length; j++)
-            {
-                assertTrue(j + "<>" + k,
-                           !(fullPaths[ k ].equals(badPaths[ j ])));
-            }
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
deleted file mode 100644
index 73aafb8..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.storage.BATBlock;
-import org.apache.poi.poifs.storage.BlockAllocationTableReader;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.poifs.storage.RawDataBlockList;
-
-/**
- * Tests for the older OPOIFS-based POIFSFileSystem
- */
-public final class TestPOIFSFileSystem extends TestCase {
-   private final POIDataSamples _samples = POIDataSamples.getPOIFSInstance();
-
-	/**
-	 * Mock exception used to ensure correct error handling
-	 */
-	private static final class MyEx extends RuntimeException {
-		public MyEx() {
-			// no fields to initialise
-		}
-	}
-	/**
-	 * Helps facilitate testing. Keeps track of whether close() was called.
-	 * Also can throw an exception at a specific point in the stream.
-	 */
-	private static final class TestIS extends InputStream {
-
-		private final InputStream _is;
-		private final int _failIndex;
-		private int _currentIx;
-		private boolean _isClosed;
-
-		public TestIS(InputStream is, int failIndex) {
-			_is = is;
-			_failIndex = failIndex;
-			_currentIx = 0;
-			_isClosed = false;
-		}
-
-		@Override
-        public int read() throws IOException {
-			int result = _is.read();
-			if(result >=0) {
-				checkRead(1);
-			}
-			return result;
-		}
-		@Override
-        public int read(byte[] b, int off, int len) throws IOException {
-			int result = _is.read(b, off, len);
-			checkRead(result);
-			return result;
-		}
-
-		private void checkRead(int nBytes) {
-			_currentIx += nBytes;
-			if(_failIndex > 0 && _currentIx > _failIndex) {
-				throw new MyEx();
-			}
-		}
-		@Override
-        public void close() throws IOException {
-			_isClosed = true;
-			_is.close();
-		}
-		public boolean isClosed() {
-			return _isClosed;
-		}
-	}
-
-	/**
-	 * Test for undesired behaviour observable as of svn revision 618865 (5-Feb-2008).
-	 * POIFSFileSystem was not closing the input stream.
-	 */
-	public void testAlwaysClose() {
-		TestIS testIS;
-
-		// Normal case - read until EOF and close
-		testIS = new TestIS(openSampleStream("13224.xls"), -1);
-		try {
-			new OPOIFSFileSystem(testIS);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		assertTrue("input stream was not closed", testIS.isClosed());
-
-		// intended to crash after reading 10000 bytes
-		testIS = new TestIS(openSampleStream("13224.xls"), 10000);
-		try {
-			new OPOIFSFileSystem(testIS);
-			fail("ex should have been thrown");
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} catch (MyEx e) {
-			// expected
-		}
-		assertTrue("input stream was not closed", testIS.isClosed()); // but still should close
-	}
-
-	/**
-	 * Test for bug # 48898 - problem opening an OLE2
-	 *  file where the last block is short (i.e. not a full
-	 *  multiple of 512 bytes)
-	 *
-	 * As yet, this problem remains. One school of thought is
-	 *  not not issue an EOF when we discover the last block
-	 *  is short, but this seems a bit wrong.
-	 * The other is to fix the handling of the last block in
-	 *  POIFS, since it seems to be slight wrong
-	 */
-	public void testShortLastBlock() throws Exception {
-		String[] files = new String[] {
-			"ShortLastBlock.qwp", "ShortLastBlock.wps"
-		};
-
-		for (String file : files) {
-			// Open the file up
-			OPOIFSFileSystem fs = new OPOIFSFileSystem(
-			    _samples.openResourceAsStream(file)
-			);
-
-			// Write it into a temp output array
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			fs.writeFilesystem(baos);
-
-			// Check sizes
-		}
-	}
-	
-	/**
-	 * Check that we do the right thing when the list of which
-	 *  sectors are BAT blocks points off the list of
-	 *  sectors that exist in the file.
-	 */
-	public void testFATandDIFATsectors() throws Exception {
-        // Open the file up
-        try {
-            InputStream stream = _samples.openResourceAsStream("ReferencesInvalidSectors.mpp");
-            try {
-                new OPOIFSFileSystem(stream);
-                fail("File is corrupt and shouldn't have been opened");
-            } finally {
-                stream.close();
-            }
-        } catch (IOException e) {
-            String msg = e.getMessage();
-            assertTrue(msg.startsWith("Your file contains 695 sectors"));
-        }
-	}
-	
-	/**
-	 * Tests that we can write and read a file that contains XBATs
-	 *  as well as regular BATs.
-	 * However, because a file needs to be at least 6.875mb big
-	 *  to have an XBAT in it, we don't have a test one. So, generate it.
-	 */
-	public void testBATandXBAT() throws Exception {
-	   byte[] hugeStream = new byte[8*1024*1024];
-	   OPOIFSFileSystem fs = new OPOIFSFileSystem();
-	   fs.getRoot().createDocument(
-	         "BIG", new ByteArrayInputStream(hugeStream)
-	   );
-	   
-	   ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	   fs.writeFilesystem(baos);
-	   byte[] fsData = baos.toByteArray();
-	   
-	   
-	   // Check the header was written properly
-	   InputStream inp = new ByteArrayInputStream(fsData); 
-	   HeaderBlock header = new HeaderBlock(inp);
-	   assertEquals(109+21, header.getBATCount());
-	   assertEquals(1, header.getXBATCount());
-	   
-	   
-	   // We should have 21 BATs in the XBAT
-	   ByteBuffer xbatData = ByteBuffer.allocate(512);
-	   xbatData.put(fsData, (1+header.getXBATIndex())*512, 512);
-	   xbatData.position(0);
-	   BATBlock xbat = BATBlock.createBATBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, xbatData);
-	   for(int i=0; i<21; i++) {
-	      assertTrue(xbat.getValueAt(i) != POIFSConstants.UNUSED_BLOCK);
-	   }
-	   for(int i=21; i<127; i++) {
-	      assertEquals(POIFSConstants.UNUSED_BLOCK, xbat.getValueAt(i));
-	   }
-	   assertEquals(POIFSConstants.END_OF_CHAIN, xbat.getValueAt(127));
-	   
-	   
-	   // Load the blocks and check with that
-	   RawDataBlockList blockList = new RawDataBlockList(inp, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-	   assertEquals(fsData.length / 512, blockList.blockCount() + 1); // Header not counted
-	   new BlockAllocationTableReader(header.getBigBlockSize(),
-            header.getBATCount(),
-            header.getBATArray(),
-            header.getXBATCount(),
-            header.getXBATIndex(),
-            blockList);
-      assertEquals(fsData.length / 512, blockList.blockCount() + 1); // Header not counted
-      
-	   // Now load it and check
-	   fs = null;
-	   fs = new OPOIFSFileSystem(
-	         new ByteArrayInputStream(fsData)
-	   );
-	   
-	   DirectoryNode root = fs.getRoot();
-	   assertEquals(1, root.getEntryCount());
-	   DocumentNode big = (DocumentNode)root.getEntry("BIG");
-	   assertEquals(hugeStream.length, big.getSize());
-	}
-	
-	/**
-	 * Most OLE2 files use 512byte blocks. However, a small number
-	 *  use 4k blocks. Check that we can open these.
-	 */
-	public void test4KBlocks() throws Exception {
-        POIDataSamples _samples = POIDataSamples.getPOIFSInstance();
-        InputStream inp = _samples.openResourceAsStream("BlockSize4096.zvi");
-        try {
-            // First up, check that we can process the header properly
-            HeaderBlock header_block = new HeaderBlock(inp);
-            POIFSBigBlockSize bigBlockSize = header_block.getBigBlockSize();
-            assertEquals(4096, bigBlockSize.getBigBlockSize());
-
-            // Check the fat info looks sane
-            assertEquals(1, header_block.getBATArray().length);
-            assertEquals(1, header_block.getBATCount());
-            assertEquals(0, header_block.getXBATCount());
-
-            // Now check we can get the basic fat
-            RawDataBlockList data_blocks = new RawDataBlockList(inp,
-                    bigBlockSize);
-            assertEquals(15, data_blocks.blockCount());
-
-            // Now try and open properly
-            OPOIFSFileSystem fs = new OPOIFSFileSystem(
-                    _samples.openResourceAsStream("BlockSize4096.zvi"));
-            assertTrue(fs.getRoot().getEntryCount() > 3);
-
-            // Check we can get at all the contents
-            checkAllDirectoryContents(fs.getRoot());
-
-            // Finally, check we can do a similar 512byte one too
-            fs = new OPOIFSFileSystem(
-                    _samples.openResourceAsStream("BlockSize512.zvi"));
-            assertTrue(fs.getRoot().getEntryCount() > 3);
-            checkAllDirectoryContents(fs.getRoot());
-        } finally {
-            inp.close();
-        }
-	}
-	private void checkAllDirectoryContents(DirectoryEntry dir) throws IOException {
-	   for(Entry entry : dir) {
-	      if(entry instanceof DirectoryEntry) {
-	         checkAllDirectoryContents((DirectoryEntry)entry);
-	      } else {
-	         DocumentNode doc = (DocumentNode) entry;
-	         DocumentInputStream dis = new DocumentInputStream(doc);
-	         try {
-    	         int numBytes = dis.available();
-    	         byte[] data = new byte [numBytes];
-                dis.read(data);
-	         } finally {
-	             dis.close();
-	         }
-	      }
-	   }
-	}
-
-	private static InputStream openSampleStream(String sampleFileName) {
-		return HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java b/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java
deleted file mode 100644
index 09388c2..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.filesystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.ComparisonFailure;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.property.DirectoryProperty;
-import org.apache.poi.poifs.property.Property;
-
-/**
- * Verify the order of entries <code>DirectoryProperty</code> .
- * <p>
- * In particular it is important to serialize ROOT._VBA_PROJECT_CUR.VBA node.
- * See bug 39234 in bugzilla. Thanks to Bill Seddon for providing the solution.
- * </p>
- *
- * @author Yegor Kozlov
- */
-public final class TestPropertySorter extends TestCase {
-
-    //the correct order of entries in the test file
-    private static final String[] _entries = {
-        "dir", "JML", "UTIL", "Loader", "Sheet1", "Sheet2", "Sheet3",
-        "__SRP_0", "__SRP_1", "__SRP_2", "__SRP_3", "__SRP_4", "__SRP_5",
-        "ThisWorkbook", "_VBA_PROJECT",
-    };
-
-    private static POIFSFileSystem openSampleFS() {
-        InputStream is = HSSFTestDataSamples.openSampleFileStream("39234.xls");
-        try {
-            return new POIFSFileSystem(is);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Test sorting of properties in <code>DirectoryProperty</code>
-     */
-    public void testSortProperties() throws IOException {
-        POIFSFileSystem fs = openSampleFS();
-        Property[] props = getVBAProperties(fs);
-
-        assertEquals(_entries.length, props.length);
-
-        // (1). See that there is a problem with the old case-sensitive property comparator
-        Arrays.sort(props, OldCaseSensitivePropertyComparator);
-        try {
-            for (int i = 0; i < props.length; i++) {
-                assertEquals(_entries[i], props[i].getName());
-            }
-            fail("expected old case-sensitive property comparator to return properties in wrong order");
-        } catch (ComparisonFailure e){
-            // expected during successful test
-            assertNotNull(e.getMessage());
-        }
-
-        // (2) Verify that the fixed property comparator works right
-        Arrays.sort(props, new DirectoryProperty.PropertyComparator());
-        for (int i = 0; i < props.length; i++) {
-            assertEquals(_entries[i], props[i].getName());
-        }
-    }
-
-    /**
-     * Serialize file system and verify that the order of properties is the same as in the original file.
-     */
-    public void testSerialization() throws IOException {
-        POIFSFileSystem fs = openSampleFS();
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        fs.writeFilesystem(out);
-        out.close();
-        InputStream is = new ByteArrayInputStream(out.toByteArray());
-        fs = new POIFSFileSystem(is);
-        is.close();
-        Property[] props = getVBAProperties(fs);
-        Arrays.sort(props, new DirectoryProperty.PropertyComparator());
-
-        assertEquals(_entries.length, props.length);
-        for (int i = 0; i < props.length; i++) {
-            assertEquals(_entries[i], props[i].getName());
-        }
-    }
-
-    /**
-     * @return array of properties read from ROOT._VBA_PROJECT_CUR.VBA node
-     */
-    protected Property[] getVBAProperties(POIFSFileSystem fs) throws IOException {
-        String _VBA_PROJECT_CUR = "_VBA_PROJECT_CUR";
-        String VBA = "VBA";
-
-        DirectoryEntry root = fs.getRoot();
-        DirectoryEntry vba_project = (DirectoryEntry)root.getEntry(_VBA_PROJECT_CUR);
-
-        DirectoryNode vba = (DirectoryNode)vba_project.getEntry(VBA);
-        DirectoryProperty  p = (DirectoryProperty)vba.getProperty();
-
-        List<Property> lst = new ArrayList<Property>();
-        for (Iterator<Property> it = p.getChildren(); it.hasNext();){
-            Property ch = it.next();
-            lst.add(ch);
-        }
-        return lst.toArray(new Property[ 0 ]);
-    }
-
-    /**
-     * Old version of case-sensitive PropertyComparator to demonstrate the problem
-     */
-    private static final Comparator<Property> OldCaseSensitivePropertyComparator = new Comparator<Property>() {
-
-        @Override
-        public int compare(Property o1, Property o2) {
-            String name1  = o1.getName();
-            String name2  = o2.getName();
-            int result = name1.length() - name2.length();
-
-            if (result == 0) {
-                result = name1.compareTo(name2);
-            }
-            return result;
-        }
-    };
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java b/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
deleted file mode 100644
index eeb43b4..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.macros;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.StringUtil;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-public class TestVBAMacroReader {
-    private static final Map<POIDataSamples, String> expectedMacroContents;
-
-    protected static String readVBA(POIDataSamples poiDataSamples) {
-        File macro = poiDataSamples.getFile("SimpleMacro.vba");
-        final byte[] bytes;
-        try {
-            FileInputStream stream = new FileInputStream(macro);
-            try {
-                bytes = IOUtils.toByteArray(stream);
-            } finally {
-                stream.close();
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        String testMacroContents = new String(bytes, StringUtil.UTF8);
-        
-        if (! testMacroContents.startsWith("Sub ")) {
-            throw new IllegalArgumentException("Not a macro");
-        }
-
-        return testMacroContents.substring(testMacroContents.indexOf("()")+3);
-    }
-
-    static {
-        final Map<POIDataSamples, String> _expectedMacroContents = new HashMap<POIDataSamples, String>();
-        final POIDataSamples[] dataSamples = {
-                POIDataSamples.getSpreadSheetInstance(),
-                POIDataSamples.getSlideShowInstance(),
-                POIDataSamples.getDocumentInstance(),
-                POIDataSamples.getDiagramInstance()
-        };
-        for (POIDataSamples sample : dataSamples) {
-            _expectedMacroContents.put(sample, readVBA(sample));
-        }
-        expectedMacroContents = Collections.unmodifiableMap(_expectedMacroContents);
-    }
-    
-    //////////////////////////////// From Stream /////////////////////////////
-    @Test
-    public void HSSFfromStream() throws Exception {
-        fromStream(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xls");
-    }
-    @Test
-    public void XSSFfromStream() throws Exception {
-        fromStream(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xlsm");
-    }
-    @Ignore("bug 59302: Found 0 macros; See org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" +
-            "for an example of how to get macros out of ppt. TODO: make integration across file formats more elegant")
-    @Test
-    public void HSLFfromStream() throws Exception {
-        fromStream(POIDataSamples.getSlideShowInstance(), "SimpleMacro.ppt");
-    }
-    @Test
-    public void XSLFfromStream() throws Exception {
-        fromStream(POIDataSamples.getSlideShowInstance(), "SimpleMacro.pptm");
-    }
-    @Test
-    public void HWPFfromStream() throws Exception {
-        fromStream(POIDataSamples.getDocumentInstance(), "SimpleMacro.doc");
-    }
-    @Test
-    public void XWPFfromStream() throws Exception {
-        fromStream(POIDataSamples.getDocumentInstance(), "SimpleMacro.docm");
-    }
-    @Ignore("Found 0 macros")
-    @Test
-    public void HDGFfromStream() throws Exception {
-        fromStream(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsd");
-    }
-    @Test
-    public void XDGFfromStream() throws Exception {
-        fromStream(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsdm");
-    }
-
-    //////////////////////////////// From File /////////////////////////////
-    @Test
-    public void HSSFfromFile() throws Exception {
-        fromFile(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xls");
-    }
-    @Test
-    public void XSSFfromFile() throws Exception {
-        fromFile(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xlsm");
-    }
-    @Ignore("bug 59302: Found 0 macros; See org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" +
-            "for an example of how to get macros out of ppt. TODO: make integration across file formats more elegant")
-    @Test
-    public void HSLFfromFile() throws Exception {
-        fromFile(POIDataSamples.getSlideShowInstance(), "SimpleMacro.ppt");
-    }
-    @Test
-    public void XSLFfromFile() throws Exception {
-        fromFile(POIDataSamples.getSlideShowInstance(), "SimpleMacro.pptm");
-    }
-    @Test
-    public void HWPFfromFile() throws Exception {
-        fromFile(POIDataSamples.getDocumentInstance(), "SimpleMacro.doc");
-    }
-    @Test
-    public void XWPFfromFile() throws Exception {
-        fromFile(POIDataSamples.getDocumentInstance(), "SimpleMacro.docm");
-    }
-    @Ignore("Found 0 macros")
-    @Test
-    public void HDGFfromFile() throws Exception {
-        fromFile(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsd");
-    }
-    @Test
-    public void XDGFfromFile() throws Exception {
-        fromFile(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsdm");
-    }
-
-    //////////////////////////////// From NPOIFS /////////////////////////////
-    @Test
-    public void HSSFfromNPOIFS() throws Exception {
-        fromNPOIFS(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xls");
-    }
-    @Ignore("bug 59302: Found 0 macros")
-    @Test
-    public void HSLFfromNPOIFS() throws Exception {
-        fromNPOIFS(POIDataSamples.getSlideShowInstance(), "SimpleMacro.ppt");
-    }
-    @Test
-    public void HWPFfromNPOIFS() throws Exception {
-        fromNPOIFS(POIDataSamples.getDocumentInstance(), "SimpleMacro.doc");
-    }
-    @Ignore("Found 0 macros")
-    @Test
-    public void HDGFfromNPOIFS() throws Exception {
-        fromNPOIFS(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsd");
-    }
-
-    protected void fromFile(POIDataSamples dataSamples, String filename) throws IOException {
-        File f = dataSamples.getFile(filename);
-        VBAMacroReader r = new VBAMacroReader(f);
-        try {
-            assertMacroContents(dataSamples, r);
-        } finally {
-            r.close();
-        }
-    }
-
-    protected void fromStream(POIDataSamples dataSamples, String filename) throws IOException {
-        InputStream fis = dataSamples.openResourceAsStream(filename);
-        try {
-            VBAMacroReader r = new VBAMacroReader(fis);
-            try {
-                assertMacroContents(dataSamples, r);
-            } finally {
-                r.close();
-            }
-        } finally {
-            fis.close();
-        }
-    }
-
-    protected void fromNPOIFS(POIDataSamples dataSamples, String filename) throws IOException {
-        File f = dataSamples.getFile(filename);
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(f);
-        try {
-            VBAMacroReader r = new VBAMacroReader(fs);
-            try {
-                assertMacroContents(dataSamples, r);
-            } finally {
-                r.close();
-            }
-        } finally {
-            fs.close();
-        }
-    }
-    
-    protected void assertMacroContents(POIDataSamples samples, VBAMacroReader r) throws IOException {
-        assertNotNull(r);
-        Map<String,String> contents = r.readMacros();
-        assertNotNull(contents);
-        assertFalse("Found 0 macros", contents.isEmpty());
-        /*
-        assertEquals(5, contents.size());
-        
-        // Check the ones without scripts
-        String[] noScripts = new String[] { "ThisWorkbook",
-                "Sheet1", "Sheet2", "Sheet3" };
-        for (String entry : noScripts) {
-            assertTrue(entry, contents.containsKey(entry));
-            
-            String content = contents.get(entry);
-            assertContains(content, "Attribute VB_Exposed = True");
-            assertContains(content, "Attribute VB_Customizable = True");
-            assertContains(content, "Attribute VB_TemplateDerived = False");
-            assertContains(content, "Attribute VB_GlobalNameSpace = False");
-            assertContains(content, "Attribute VB_Exposed = True");
-        }
-        */
-        
-        // Check the script one
-        assertContains(contents, "Module1");
-        String content = contents.get("Module1");
-        assertNotNull(content);
-        assertContains(content, "Attribute VB_Name = \"Module1\"");
-        //assertContains(content, "Attribute TestMacro.VB_Description = \"This is a test macro\"");
-
-        // And the macro itself
-        String testMacroNoSub = expectedMacroContents.get(samples);
-        assertContains(content, testMacroNoSub);
-    }
-    
-
-    @Test
-    public void bug59830() throws IOException {
-        //test file is "609751.xls" in govdocs1
-        File f = POIDataSamples.getSpreadSheetInstance().getFile("59830.xls");
-        VBAMacroReader r = new VBAMacroReader(f);
-        Map<String, String> macros = r.readMacros();
-        assertNotNull(macros.get("Module20"));
-        assertContains(macros.get("Module20"), "here start of superscripting");
-        r.close();
-    }
-
-    @Test
-    public void bug59858() throws IOException {
-        File f = POIDataSamples.getSpreadSheetInstance().getFile("59858.xls");
-        VBAMacroReader r = new VBAMacroReader(f);
-        Map<String, String> macros = r.readMacros();
-        assertNotNull(macros.get("Sheet4"));
-        assertContains(macros.get("Sheet4"), "intentional constituent");
-        r.close();
-    }
-
-    @Test
-    public void bug60158() throws IOException {
-        File f = POIDataSamples.getDocumentInstance().getFile("60158.docm");
-        VBAMacroReader r = new VBAMacroReader(f);
-        Map<String, String> macros = r.readMacros();
-        assertNotNull(macros.get("NewMacros"));
-        assertContains(macros.get("NewMacros"), "' dirty");
-        r.close();
-    }
-
-    @Test
-    public void bug60273() throws IOException {
-        //test file derives from govdocs1 147240.xls
-        File f = POIDataSamples.getSpreadSheetInstance().getFile("60273.xls");
-        VBAMacroReader r = new VBAMacroReader(f);
-        Map<String, String> macros = r.readMacros();
-        assertNotNull(macros.get("Module1"));
-        assertContains(macros.get("Module1"), "9/8/2004");
-        r.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java b/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
deleted file mode 100644
index 1bc3f45..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
+++ /dev/null
@@ -1,274 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.nio;
-
-import junit.framework.TestCase;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.TempFile;
-
-import java.io.*;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-
-/**
- * Tests for the datasource implementations
- */
-public class TestDataSource extends TestCase
-{
-   private static POIDataSamples data = POIDataSamples.getPOIFSInstance();
-   
-   public void testFile() throws Exception {
-      File f = data.getFile("Notes.ole2");
-      
-      FileBackedDataSource ds = new FileBackedDataSource(f);
-      try {
-          checkDataSource(ds, false);
-      } finally {
-          ds.close();
-      }
-      
-      // try a second time
-      ds = new FileBackedDataSource(f);
-      try {
-          checkDataSource(ds, false);
-      } finally {
-          ds.close();
-      }
-   }
-
-   public void testFileWritable() throws Exception {
-       File temp = TempFile.createTempFile("TestDataSource", ".test");
-       try {
-           writeDataToFile(temp);
-       
-           FileBackedDataSource ds = new FileBackedDataSource(temp, false);
-           try {
-               checkDataSource(ds, true);
-           } finally {
-               ds.close();
-           }
-           
-           // try a second time
-           ds = new FileBackedDataSource(temp, false);
-           try {
-               checkDataSource(ds, true);
-           } finally {
-               ds.close();
-           }
-
-           writeDataToFile(temp);
-       } finally {
-           assertTrue(temp.exists());
-           assertTrue("Could not delete file " + temp, temp.delete());
-       }
-    }
-
-
-   public void testRewritableFile() throws Exception {
-       File temp = TempFile.createTempFile("TestDataSource", ".test");
-       try {
-           writeDataToFile(temp);
-           
-           FileBackedDataSource ds = new FileBackedDataSource(temp, true);
-           try {
-               ByteBuffer buf = ds.read(0, 10);
-               assertNotNull(buf);
-               buf = ds.read(8, 0x400);
-               assertNotNull(buf);
-           } finally {
-               ds.close();
-           }
-           
-           // try a second time
-           ds = new FileBackedDataSource(temp, true);
-           try {
-               ByteBuffer buf = ds.read(0, 10);
-               assertNotNull(buf);
-               buf = ds.read(8, 0x400);
-               assertNotNull(buf);
-           } finally {
-               ds.close();
-           }
-           
-           writeDataToFile(temp);
-       } finally {
-           assertTrue(temp.exists());
-           assertTrue(temp.delete());
-       }
-    }
-
-    private void writeDataToFile(File temp) throws IOException {
-        OutputStream str = new FileOutputStream(temp);
-           try {
-               InputStream in = data.openResourceAsStream("Notes.ole2");
-               try {
-                   IOUtils.copy(in, str);
-               } finally {
-                   in.close();
-               }
-           } finally {
-               str.close();
-           }
-    }
-    
-    private void checkDataSource(FileBackedDataSource ds, boolean writeable) throws IOException {
-        assertEquals(writeable, ds.isWriteable());
-        assertNotNull(ds.getChannel());
-        
-        // rewriting changes the size
-        if(writeable) {
-            assertTrue("Had: " + ds.size(), ds.size() == 8192 || ds.size() == 8198); 
-        } else {
-            assertEquals(8192, ds.size());
-        }
-
-        // Start of file
-        ByteBuffer bs;
-        bs = ds.read(4, 0);
-        assertEquals(4, bs.capacity());
-        assertEquals(0, bs.position());
-        assertEquals(0xd0 - 256, bs.get(0));
-        assertEquals(0xcf - 256, bs.get(1));
-        assertEquals(0x11, bs.get(2));
-        assertEquals(0xe0 - 256, bs.get(3));
-        assertEquals(0xd0 - 256, bs.get());
-        assertEquals(0xcf - 256, bs.get());
-        assertEquals(0x11, bs.get());
-        assertEquals(0xe0 - 256, bs.get());
-
-        // Mid way through
-        bs = ds.read(8, 0x400);
-        assertEquals(8, bs.capacity());
-        assertEquals(0, bs.position());
-        assertEquals((byte) 'R', bs.get(0));
-        assertEquals(0, bs.get(1));
-        assertEquals((byte) 'o', bs.get(2));
-        assertEquals(0, bs.get(3));
-        assertEquals((byte) 'o', bs.get(4));
-        assertEquals(0, bs.get(5));
-        assertEquals((byte) 't', bs.get(6));
-        assertEquals(0, bs.get(7));
-
-        // Can go to the end, but not past it
-        bs = ds.read(8, 8190);
-        assertEquals(0, bs.position()); // TODO How best to warn of a short read?
-
-        // Can't go off the end
-        try {
-            ds.read(4, 8192);
-            if(!writeable) {
-                fail("Shouldn't be able to read off the end of the file");
-            }
-        } catch (IndexOutOfBoundsException e) {
-            // expected here
-        }
-    }
-
-   public void testByteArray() throws Exception {
-      byte[] data = new byte[256];
-      byte b;
-      for(int i=0; i<data.length; i++) {
-         b = (byte)i;
-         data[i] = b;
-      }
-      
-      ByteArrayBackedDataSource ds = new ByteArrayBackedDataSource(data);
-      
-      // Start
-      ByteBuffer bs; 
-      bs = ds.read(4, 0);
-      assertEquals(0, bs.position());
-      assertEquals(0x00, bs.get());
-      assertEquals(0x01, bs.get());
-      assertEquals(0x02, bs.get());
-      assertEquals(0x03, bs.get());
-      
-      // Middle
-      bs = ds.read(4, 100);
-      assertEquals(100, bs.position());
-      assertEquals(100, bs.get());
-      assertEquals(101, bs.get());
-      assertEquals(102, bs.get());
-      assertEquals(103, bs.get());
-      
-      // End
-      bs = ds.read(4, 252);
-      assertEquals(-4, bs.get());
-      assertEquals(-3, bs.get());
-      assertEquals(-2, bs.get());
-      assertEquals(-1, bs.get());
-      
-      // Off the end
-      bs = ds.read(4, 254);
-      assertEquals(-2, bs.get());
-      assertEquals(-1, bs.get());
-      try {
-         bs.get();
-         fail("Shouldn't be able to read off the end");
-      } catch(BufferUnderflowException e) {
-          // expected here
-      }
-
-      // Past the end
-      try {
-         ds.read(4, 256);
-         fail("Shouldn't be able to read off the end");
-      } catch(IndexOutOfBoundsException e) {
-          // expected here
-      }
-      
-      
-      // Overwrite
-      bs = ByteBuffer.allocate(4);
-      bs.put(0, (byte)-55);
-      bs.put(1, (byte)-54);
-      bs.put(2, (byte)-53);
-      bs.put(3, (byte)-52);
-      
-      assertEquals(256, ds.size());
-      ds.write(bs, 40);
-      assertEquals(256, ds.size());
-      bs = ds.read(4, 40);
-      
-      assertEquals(-55, bs.get());
-      assertEquals(-54, bs.get());
-      assertEquals(-53, bs.get());
-      assertEquals(-52, bs.get());
-      
-      // Append
-      bs = ByteBuffer.allocate(4);
-      bs.put(0, (byte)-55);
-      bs.put(1, (byte)-54);
-      bs.put(2, (byte)-53);
-      bs.put(3, (byte)-52);
-      
-      assertEquals(256, ds.size());
-      ds.write(bs, 256);
-      assertEquals(260, ds.size());
-      
-      bs = ds.read(4, 256);
-      assertEquals(256, bs.position());
-      assertEquals(-55, bs.get());
-      assertEquals(-54, bs.get());
-      assertEquals(-53, bs.get());
-      assertEquals(-52, bs.get());
-   }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java b/trunk/src/testcases/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java
deleted file mode 100644
index c4f03a3..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Tests for org.apache.poi.poifs.property<br/>
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestDirectoryProperty.class,
-    TestDocumentProperty.class,
-    TestPropertyFactory.class,
-    TestPropertyTable.class,
-    TestRootProperty.class
-})
-public final class AllPOIFSPropertyTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/property/LocalProperty.java b/trunk/src/testcases/org/apache/poi/poifs/property/LocalProperty.java
deleted file mode 100644
index f578129..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/property/LocalProperty.java
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.property;
-
-class LocalProperty
-    extends Property
-{
-
-    /**
-     * Constructor LocalProperty
-     *
-     * @param index
-     */
-
-    LocalProperty(int index)
-    {
-        super();
-        setName("foo" + index);
-        setIndex(index);
-    }
-
-    /**
-     * Method preWrite
-     */
-
-    @Override
-    protected void preWrite()
-    {
-    }
-
-    /**
-     * Method isDirectory
-     *
-     * @return false
-     */
-
-    @Override
-    public boolean isDirectory()
-    {
-        return false;
-    }
-}   // end package-scope class LocalProperty
-
diff --git a/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java b/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java
deleted file mode 100644
index 8db101c..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.poi.poifs.storage.RawDataUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Class to test DirectoryProperty functionality
- */
-public final class TestDirectoryProperty {
-    private DirectoryProperty _property;
-    private byte[]            _testblock;
-
-    /**
-     * Test constructing DirectoryProperty
-     */
-    @Test
-    public void testConstructor() throws IOException {
-        createBasicDirectoryProperty();
-        verifyProperty();
-    }
-
-    /**
-     * Test pre-write functionality
-     */
-    @Test
-    public void testPreWrite() throws IOException {
-        createBasicDirectoryProperty();
-        _property.preWrite();
-
-        // shouldn't change anything at all
-        verifyProperty();
-        verifyChildren(0);
-
-        // now try adding 1 property
-        createBasicDirectoryProperty();
-        _property.addChild(new LocalProperty(1));
-        _property.preWrite();
-
-        // update children index
-        _testblock[ 0x4C ] = 1;
-        _testblock[ 0x4D ] = 0;
-        _testblock[ 0x4E ] = 0;
-        _testblock[ 0x4F ] = 0;
-        verifyProperty();
-        verifyChildren(1);
-
-        // now try adding 2 properties
-        createBasicDirectoryProperty();
-        _property.addChild(new LocalProperty(1));
-        _property.addChild(new LocalProperty(2));
-        _property.preWrite();
-
-        // update children index
-        _testblock[ 0x4C ] = 2;
-        _testblock[ 0x4D ] = 0;
-        _testblock[ 0x4E ] = 0;
-        _testblock[ 0x4F ] = 0;
-        verifyProperty();
-        verifyChildren(2);
-
-        // beat on the children allocation code
-        for (int count = 1; count < 100; count++)
-        {
-            createBasicDirectoryProperty();
-            for (int j = 1; j < (count + 1); j++)
-            {
-                _property.addChild(new LocalProperty(j));
-            }
-            _property.preWrite();
-            verifyChildren(count);
-        }
-    }
-
-    private void verifyChildren(int count) {
-        Iterator<Property> iter = _property.getChildren();
-        List<Property> children = new ArrayList<Property>();
-
-        while (iter.hasNext())
-        {
-            children.add(iter.next());
-        }
-        assertEquals(count, children.size());
-        if (count != 0)
-        {
-            boolean[] found = new boolean[ count ];
-
-            found[ _property.getChildIndex() - 1 ] = true;
-            int total_found = 1;
-
-            Arrays.fill(found, false);
-            iter = children.iterator();
-            while (iter.hasNext())
-            {
-                Property child = iter.next();
-                Child    next  = child.getNextChild();
-
-                if (next != null)
-                {
-                    int index = (( Property ) next).getIndex();
-
-                    if (index != -1)
-                    {
-                        assertTrue("found index " + index + " twice",
-                                   !found[ index - 1 ]);
-                        found[ index - 1 ] = true;
-                        total_found++;
-                    }
-                }
-                Child previous = child.getPreviousChild();
-
-                if (previous != null)
-                {
-                    int index = (( Property ) previous).getIndex();
-
-                    if (index != -1)
-                    {
-                        assertTrue("found index " + index + " twice",
-                                   !found[ index - 1 ]);
-                        found[ index - 1 ] = true;
-                        total_found++;
-                    }
-                }
-            }
-            assertEquals(count, total_found);
-        }
-    }
-
-    private void createBasicDirectoryProperty() {
-        String name = "MyDirectory";
-
-        _property  = new DirectoryProperty(name);
-        _testblock = new byte[ 128 ];
-        int index = 0;
-
-        for (; index < 0x40; index++)
-        {
-            _testblock[ index ] = ( byte ) 0;
-        }
-        int limit = Math.min(31, name.length());
-
-        _testblock[ index++ ] = ( byte ) (2 * (limit + 1));
-        _testblock[ index++ ] = ( byte ) 0;
-        _testblock[ index++ ] = ( byte ) 1;
-        _testblock[ index++ ] = ( byte ) 1;
-        for (; index < 0x50; index++)
-        {
-            _testblock[ index ] = ( byte ) 0xff;
-        }
-        for (; index < 0x80; index++)
-        {
-            _testblock[ index ] = ( byte ) 0;
-        }
-        byte[] name_bytes = name.getBytes(LocaleUtil.CHARSET_1252);
-
-        for (index = 0; index < limit; index++)
-        {
-            _testblock[ index * 2 ] = name_bytes[ index ];
-        }
-    }
-
-    private void verifyProperty() throws IOException {
-        ByteArrayOutputStream stream = new ByteArrayOutputStream(512);
-
-        _property.writeData(stream);
-        byte[] output = stream.toByteArray();
-
-        assertEquals(_testblock.length, output.length);
-        for (int j = 0; j < _testblock.length; j++)
-        {
-            assertEquals("mismatch at offset " + j, _testblock[ j ],
-                         output[ j ]);
-        }
-    }
-
-    @Test
-    public void testAddChild() throws IOException {
-        createBasicDirectoryProperty();
-        _property.addChild(new LocalProperty(1));
-        _property.addChild(new LocalProperty(2));
-        try
-        {
-            _property.addChild(new LocalProperty(1));
-            fail("should have caught IOException");
-        }
-        catch (IOException ignored)
-        {
-
-            // as expected
-        }
-        try
-        {
-            _property.addChild(new LocalProperty(2));
-            fail("should have caught IOException");
-        }
-        catch (IOException ignored)
-        {
-
-            // as expected
-        }
-        _property.addChild(new LocalProperty(3));
-    }
-
-    @Test
-    public void testDeleteChild() throws IOException {
-        createBasicDirectoryProperty();
-        Property p1 = new LocalProperty(1);
-
-        _property.addChild(p1);
-        try
-        {
-            _property.addChild(new LocalProperty(1));
-            fail("should have caught IOException");
-        }
-        catch (IOException ignored)
-        {
-
-            // as expected
-        }
-        assertTrue(_property.deleteChild(p1));
-        assertTrue(!_property.deleteChild(p1));
-        _property.addChild(new LocalProperty(1));
-    }
-
-    @Test
-    public void testChangeName() throws IOException {
-        createBasicDirectoryProperty();
-        Property p1           = new LocalProperty(1);
-        String   originalName = p1.getName();
-
-        _property.addChild(p1);
-        assertTrue(_property.changeName(p1, "foobar"));
-        assertEquals("foobar", p1.getName());
-        assertTrue(!_property.changeName(p1, "foobar"));
-        assertEquals("foobar", p1.getName());
-        Property p2 = new LocalProperty(1);
-
-        _property.addChild(p2);
-        assertTrue(!_property.changeName(p1, originalName));
-        assertTrue(_property.changeName(p2, "foo"));
-        assertTrue(_property.changeName(p1, originalName));
-    }
-
-    @Test
-    public void testReadingConstructor() {
-        String[] input = {
-            "42 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "16 00 01 01 FF FF FF FF FF FF FF FF 02 00 00 00 20 08 02 00 00 00 00 00 C0 00 00 00 00 00 00 46",
-            "00 00 00 00 00 00 00 00 00 00 00 00 C0 5C E8 23 9E 6B C1 01 FE FF FF FF 00 00 00 00 00 00 00 00",
-        };
-        verifyReadingProperty(0, RawDataUtil.decode(input), 0, "Boot Entry");
-    }
-
-    private static void verifyReadingProperty(int index, byte[] input, int offset, String name) {
-        DirectoryProperty property = new DirectoryProperty(index, input, offset);
-        ByteArrayOutputStream stream = new ByteArrayOutputStream(128);
-        byte[] expected = new byte[128];
-
-        System.arraycopy(input, offset, expected, 0, 128);
-        try {
-            property.writeData(stream);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        byte[] output = stream.toByteArray();
-
-        assertEquals(128, output.length);
-        for (int j = 0; j < 128; j++) {
-            assertEquals("mismatch at offset " + j, expected[j], output[j]);
-        }
-        assertEquals(index, property.getIndex());
-        assertEquals(name, property.getName());
-        assertTrue(!property.getChildren().hasNext());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java b/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java
deleted file mode 100644
index bd0b30e..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.poifs.storage.RawDataUtil;
-import org.apache.poi.util.LocaleUtil;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test DocumentProperty functionality
- *
- * @author Marc Johnson
- */
-public final class TestDocumentProperty extends TestCase {
-
-    public void testConstructor() throws IOException {
-        // test with short name, small file
-        verifyProperty("foo", 1234);
-
-        // test with just long enough name, small file
-        verifyProperty("A.really.long.long.long.name123", 2345);
-
-        // test with longer name, just small enough file
-        verifyProperty("A.really.long.long.long.name1234", 4095);
-
-        // test with just long enough file
-        verifyProperty("A.really.long.long.long.name123", 4096);
-    }
-
-    public void testReadingConstructor() throws IOException {
-        String[] hexData = {
-            "52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "16 00 05 01 FF FF FF FF FF FF FF FF 02 00 00 00 20 08 02 00 00 00 00 00 C0 00 00 00 00 00 00 46",
-            "00 00 00 00 00 00 00 00 00 00 00 00 C0 5C E8 23 9E 6B C1 01 FE FF FF FF 00 00 00 00 00 00 00 00",
-            "57 00 6F 00 72 00 6B 00 62 00 6F 00 6F 00 6B 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "12 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10 00 00 00 00 00 00",
-            "05 00 53 00 75 00 6D 00 6D 00 61 00 72 00 79 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00",
-            "69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "28 00 02 01 01 00 00 00 03 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 00 00 00 00 10 00 00 00 00 00 00",
-            "05 00 44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 53 00 75 00 6D 00 6D 00 61 00 72 00 79 00",
-            "49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00",
-            "38 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-            "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10 00 00 00 00 10 00 00 00 00 00 00",
-        };
-        byte[] input = RawDataUtil.decode(hexData);
-
-        verifyReadingProperty(1, input, 128, "Workbook");
-        verifyReadingProperty(2, input, 256, "\005SummaryInformation");
-        verifyReadingProperty(3, input, 384, "\005DocumentSummaryInformation");
-    }
-
-    private void verifyReadingProperty(int index, byte[] input, int offset, String name)
-            throws IOException {
-        DocumentProperty      property = new DocumentProperty(index, input,
-                                             offset);
-        ByteArrayOutputStream stream   = new ByteArrayOutputStream(128);
-        byte[]                expected = new byte[ 128 ];
-
-        System.arraycopy(input, offset, expected, 0, 128);
-        property.writeData(stream);
-        byte[] output = stream.toByteArray();
-
-        assertEquals(128, output.length);
-        for (int j = 0; j < 128; j++)
-        {
-            assertEquals("mismatch at offset " + j, expected[ j ],
-                         output[ j ]);
-        }
-        assertEquals(index, property.getIndex());
-        assertEquals(name, property.getName());
-    }
-
-    private void verifyProperty(String name, int size) throws IOException {
-        DocumentProperty property = new DocumentProperty(name, size);
-
-        if (size >= 4096)
-        {
-            assertTrue(!property.shouldUseSmallBlocks());
-        }
-        else
-        {
-            assertTrue(property.shouldUseSmallBlocks());
-        }
-        byte[] testblock = new byte[ 128 ];
-        int    index     = 0;
-
-        for (; index < 0x40; index++)
-        {
-            testblock[ index ] = ( byte ) 0;
-        }
-        int limit = Math.min(31, name.length());
-
-        testblock[ index++ ] = ( byte ) (2 * (limit + 1));
-        testblock[ index++ ] = ( byte ) 0;
-        testblock[ index++ ] = ( byte ) 2;
-        testblock[ index++ ] = ( byte ) 1;
-        for (; index < 0x50; index++)
-        {
-            testblock[ index ] = ( byte ) 0xFF;
-        }
-        for (; index < 0x78; index++)
-        {
-            testblock[ index ] = ( byte ) 0;
-        }
-        int sz = size;
-
-        testblock[ index++ ] = ( byte ) sz;
-        sz                   /= 256;
-        testblock[ index++ ] = ( byte ) sz;
-        sz                   /= 256;
-        testblock[ index++ ] = ( byte ) sz;
-        sz                   /= 256;
-        testblock[ index++ ] = ( byte ) sz;
-        for (; index < 0x80; index++)
-        {
-            testblock[ index ] = ( byte ) 0x0;
-        }
-        byte[] name_bytes = name.getBytes(LocaleUtil.CHARSET_1252);
-
-        for (index = 0; index < limit; index++)
-        {
-            testblock[ index * 2 ] = name_bytes[ index ];
-        }
-        ByteArrayOutputStream stream = new ByteArrayOutputStream(512);
-
-        property.writeData(stream);
-        byte[] output = stream.toByteArray();
-
-        assertEquals(testblock.length, output.length);
-        for (int j = 0; j < testblock.length; j++)
-        {
-            assertEquals("mismatch at offset " + j, testblock[ j ],
-                         output[ j ]);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java b/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java
deleted file mode 100644
index e6d2c65..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.storage.RawDataBlock;
-import org.apache.poi.poifs.storage.RawDataUtil;
-
-/**
- * Class to test PropertyFactory functionality
- *
- * @author Marc Johnson
- */
-public final class TestPropertyFactory extends TestCase {
-
-    public void testConvertToProperties() throws IOException {
-
-		// real data from a real file!
-		String[] hexData = {
-			"52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 05 00 FF FF FF FF FF FF FF FF 0D 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 C0 47 A4 DE EC 65 C1 01 03 00 00 00 40 0C 00 00 00 00 00 00",
-			"44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 20 00 44 00 65 00 74 00 61 00 69 00 6C 00 73 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 A0 7F 29 08 59 56 C1 01 C0 20 31 08 59 56 C1 01 00 00 00 00 00 00 00 00 00 00 00 00",
-			"43 00 72 00 65 00 61 00 74 00 69 00 6F 00 6E 00 20 00 4E 00 61 00 6D 00 65 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 2C 00 00 00 00 00 00 00",
-			"43 00 72 00 65 00 61 00 74 00 69 00 6F 00 6E 00 20 00 44 00 61 00 74 00 65 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 0A 00 00 00 00 00 00 00",
-			"4C 00 61 00 73 00 74 00 20 00 53 00 61 00 76 00 65 00 64 00 20 00 44 00 61 00 74 00 65 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 0A 00 00 00 00 00 00 00",
-			"44 00 61 00 74 00 65 00 20 00 46 00 69 00 6C 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 0A 00 00 00 00 00 00 00",
-			"44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 20 00 56 00 65 00 72 00 73 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"42 00 61 00 63 00 63 00 68 00 75 00 73 00 20 00 44 00 65 00 61 00 6C 00 20 00 4E 00 75 00 6D 00",
-			"62 00 65 00 72 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 20 00 4C 00 6F 00 63 00 6B 00 65 00 64 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 20 00 44 00 65 00 61 00 6C 00 20 00 54 00 79 00",
-			"70 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"26 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 06 00 00 00 00 00 00 00",
-			"44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 20 00 41 00 75 00 64 00 69 00 74 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1E 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 C0 20 31 08 59 56 C1 01 80 48 3A 08 59 56 C1 01 00 00 00 00 00 00 00 00 00 00 00 00",
-			"55 00 73 00 65 00 72 00 20 00 41 00 75 00 64 00 69 00 74 00 20 00 54 00 72 00 61 00 69 00 6C 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 42 00 00 00 00 00 00 00",
-			"43 00 6F 00 6E 00 74 00 72 00 61 00 63 00 74 00 20 00 47 00 65 00 6E 00 65 00 72 00 61 00 74 00",
-			"69 00 6F 00 6E 00 20 00 49 00 6E 00 66 00 6F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"32 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 80 48 3A 08 59 56 C1 01 80 48 3A 08 59 56 C1 01 00 00 00 00 00 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 01 01 FF FF FF FF FF FF FF FF 19 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 80 48 3A 08 59 56 C1 01 80 B2 52 08 59 56 C1 01 00 00 00 00 00 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 44 00 65 00 73 00 63 00 72 00 69 00 70 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 00 16 00 00 00 26 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 09 00 00 00 00 00 00 00",
-			"53 00 61 00 6C 00 65 00 73 00 20 00 41 00 72 00 65 00 61 00 20 00 43 00 6F 00 64 00 65 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 02 01 12 00 00 00 2A 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0B 00 00 00 04 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 43 00 75 00 72 00 72 00 65 00 6E 00 63 00 79 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 02 01 1B 00 00 00 20 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 00 00 07 00 00 00 00 00 00 00",
-			"4F 00 75 00 74 00 62 00 6F 00 75 00 6E 00 64 00 20 00 54 00 72 00 61 00 76 00 65 00 6C 00 20 00",
-			"44 00 61 00 74 00 65 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 25 00 00 00 27 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0D 00 00 00 21 00 00 00 00 00 00 00",
-			"4D 00 61 00 78 00 69 00 6D 00 75 00 6D 00 20 00 53 00 74 00 61 00 79 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1A 00 02 01 14 00 00 00 10 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0E 00 00 00 05 00 00 00 00 00 00 00",
-			"4D 00 61 00 78 00 69 00 6D 00 75 00 6D 00 20 00 53 00 74 00 61 00 79 00 20 00 50 00 65 00 72 00",
-			"69 00 6F 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 00 18 00 00 00 23 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0F 00 00 00 04 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 00 15 00 00 00 28 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 75 00 62 00 20 00 44 00 65 00 61 00 6C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"12 00 02 01 2E 00 00 00 1F 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 6F 00 6D 00 6D 00 69 00 73 00 73 00 69 00 6F 00 6E 00 20 00 56 00 61 00 6C 00 75 00 65 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 12 00 00 00 04 00 00 00 00 00 00 00",
-			"46 00 61 00 72 00 65 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 13 00 00 00 04 00 00 00 00 00 00 00",
-			"46 00 55 00 44 00 20 00 47 00 72 00 69 00 64 00 20 00 44 00 69 00 6D 00 65 00 6E 00 73 00 69 00",
-			"6F 00 6E 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 04 00 00 00 00 00 00 00",
-			"46 00 55 00 44 00 20 00 47 00 72 00 69 00 64 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00",
-			"74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2A 00 02 01 0F 00 00 00 1A 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"44 00 6F 00 75 00 62 00 6C 00 65 00 20 00 44 00 65 00 61 00 6C 00 69 00 6E 00 67 00 20 00 49 00",
-			"6E 00 64 00 69 00 63 00 61 00 74 00 6F 00 72 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"32 00 02 01 11 00 00 00 21 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 15 00 00 00 04 00 00 00 00 00 00 00",
-			"42 00 75 00 73 00 69 00 6E 00 65 00 73 00 73 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16 00 00 00 04 00 00 00 00 00 00 00",
-			"55 00 6D 00 62 00 72 00 65 00 6C 00 6C 00 61 00 20 00 4C 00 69 00 6E 00 6B 00 73 00 20 00 61 00",
-			"6E 00 64 00 20 00 50 00 61 00 73 00 73 00 65 00 6E 00 67 00 65 00 72 00 73 00 00 00 00 00 00 00",
-			"3C 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"41 00 67 00 65 00 6E 00 74 00 73 00 20 00 4E 00 61 00 6D 00 65 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"18 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 17 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 75 00 6D 00 62 00 65 00 72 00 20 00 6F 00 66 00 20 00 50 00 61 00 73 00 73 00 65 00 6E 00",
-			"67 00 65 00 72 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2A 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 18 00 00 00 04 00 00 00 00 00 00 00",
-			"41 00 4C 00 43 00 20 00 43 00 6F 00 64 00 65 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"43 00 6F 00 6E 00 73 00 6F 00 72 00 74 00 69 00 61 00 20 00 43 00 6F 00 64 00 65 00 73 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"43 00 68 00 69 00 6C 00 64 00 20 00 50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00",
-			"20 00 50 00 65 00 72 00 6D 00 69 00 74 00 74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"36 00 02 01 24 00 00 00 2C 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 19 00 00 00 04 00 00 00 00 00 00 00",
-			"50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00 20 00 6F 00 66 00 20 00 59 00 69 00",
-			"65 00 6C 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1A 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 65 00 74 00 20 00 52 00 65 00 6D 00 69 00 74 00 20 00 50 00 65 00 72 00 6D 00 69 00 74 00",
-			"74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 29 00 00 00 22 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1B 00 00 00 04 00 00 00 00 00 00 00",
-			"49 00 6E 00 66 00 61 00 6E 00 74 00 20 00 44 00 69 00 73 00 63 00 6F 00 75 00 6E 00 74 00 20 00",
-			"50 00 65 00 72 00 6D 00 69 00 74 00 74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"34 00 02 01 2D 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1C 00 00 00 04 00 00 00 00 00 00 00",
-			"49 00 6E 00 66 00 61 00 6E 00 74 00 20 00 44 00 69 00 73 00 63 00 6F 00 75 00 6E 00 74 00 20 00",
-			"56 00 61 00 6C 00 75 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 1E 00 00 00 2F 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1D 00 00 00 04 00 00 00 00 00 00 00",
-			"54 00 52 00 56 00 41 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 30 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1E 00 00 00 04 00 00 00 00 00 00 00",
-			"42 00 75 00 73 00 69 00 6E 00 65 00 73 00 73 00 20 00 4A 00 75 00 73 00 74 00 69 00 66 00 69 00",
-			"63 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2E 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1F 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 75 00 72 00 63 00 68 00 61 00 72 00 67 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 17 00 00 00 1D 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 61 00 74 00 75 00 72 00 65 00 20 00 6F 00 66 00 20 00 56 00 61 00 72 00 69 00 61 00 74 00",
-			"69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 21 00 00 00 50 00 00 00 00 00 00 00",
-			"4F 00 74 00 68 00 65 00 72 00 20 00 52 00 65 00 66 00 75 00 6E 00 64 00 20 00 54 00 65 00 78 00",
-			"74 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"24 00 02 01 0E 00 00 00 13 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 23 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00 00 00 00 00 00 00 00 00 00 00",
-			"38 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 24 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 46 00 69 00 78 00 65 00 64 00 20 00 56 00 61 00 6C 00 75 00 65 00 00 00 00 00 00 00 00 00",
-			"3A 00 02 01 2B 00 00 00 1C 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 25 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 43 00 75 00 72 00 72 00 65 00 6E 00 63 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"34 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 26 00 00 00 07 00 00 00 00 00 00 00",
-			"52 00 65 00 6D 00 61 00 72 00 6B 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"10 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"4F 00 74 00 68 00 65 00 72 00 20 00 43 00 61 00 72 00 72 00 69 00 65 00 72 00 20 00 53 00 65 00",
-			"63 00 74 00 6F 00 72 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 27 00 00 00 04 00 00 00 00 00 00 00",
-			"50 00 72 00 6F 00 72 00 61 00 74 00 65 00 20 00 43 00 6F 00 6D 00 6D 00 65 00 6E 00 74 00 73 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"4E 00 65 00 67 00 6F 00 74 00 69 00 61 00 74 00 69 00 6F 00 6E 00 20 00 49 00 6E 00 66 00 6F 00",
-			"72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"30 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 80 B2 52 08 59 56 C1 01 80 B2 52 08 59 56 C1 01 00 00 00 00 00 00 00 00 00 00 00 00",
-			"52 00 65 00 73 00 74 00 72 00 69 00 63 00 74 00 65 00 64 00 20 00 43 00 61 00 72 00 72 00 69 00",
-			"65 00 72 00 73 00 20 00 26 00 20 00 53 00 74 00 6E 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"36 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"41 00 64 00 64 00 69 00 74 00 69 00 6F 00 6E 00 61 00 6C 00 20 00 43 00 6F 00 6D 00 6D 00 65 00",
-			"6E 00 74 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"52 00 65 00 76 00 65 00 6E 00 75 00 65 00 20 00 4D 00 61 00 6E 00 61 00 67 00 65 00 6D 00 65 00",
-			"6E 00 74 00 20 00 43 00 6F 00 6D 00 6D 00 65 00 6E 00 74 00 73 00 00 00 00 00 00 00 00 00 00 00",
-			"38 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"52 00 65 00 76 00 65 00 6E 00 75 00 65 00 20 00 4D 00 61 00 6E 00 61 00 67 00 65 00 6D 00 65 00",
-			"6E 00 74 00 20 00 52 00 65 00 66 00 65 00 72 00 65 00 6E 00 63 00 65 00 00 00 00 00 00 00 00 00",
-			"3A 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"4D 00 69 00 6E 00 69 00 6D 00 75 00 6D 00 20 00 53 00 74 00 61 00 79 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1A 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"43 00 72 00 65 00 61 00 74 00 65 00 64 00 20 00 42 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 1B 00 00 00 00 00 00 00",
-			"4F 00 6E 00 20 00 42 00 65 00 68 00 61 00 6C 00 66 00 20 00 4F 00 66 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1A 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 04 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 50 00 61 00 67 00 65 00 20 00 41 00 75 00 74 00 68 00 20 00 4C 00",
-			"6F 00 63 00 6B 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2A 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 10 00 00 00 00 00 00 00",
-			"47 00 72 00 6F 00 75 00 70 00 20 00 41 00 75 00 74 00 68 00 6F 00 72 00 69 00 73 00 61 00 74 00",
-			"69 00 6F 00 6E 00 20 00 49 00 6E 00 66 00 6F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"32 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 80 B2 52 08 59 56 C1 01 40 DA 5B 08 59 56 C1 01 00 00 00 00 00 00 00 00 00 00 00 00",
-			"4C 00 61 00 73 00 74 00 20 00 49 00 73 00 73 00 75 00 65 00 64 00 20 00 47 00 72 00 6F 00 75 00",
-			"70 00 20 00 4E 00 75 00 6D 00 62 00 65 00 72 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"32 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 06 00 00 00 00 00 00 00",
-			"47 00 72 00 6F 00 75 00 70 00 20 00 4E 00 75 00 6D 00 62 00 65 00 72 00 73 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 00 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-		};
-
-		byte[] testdata = RawDataUtil.decode(hexData);
-		ByteArrayInputStream stream = new ByteArrayInputStream(testdata);
-		RawDataBlock[] raw_data = new RawDataBlock[testdata.length / 512];
-
-		for (int j = 0; j < raw_data.length; j++) {
-			raw_data[j] = new RawDataBlock(stream);
-		}
-		List properties = PropertyFactory.convertToProperties(raw_data);
-
-		assertEquals(64, properties.size());
-		String[] names = {
-			"Root Entry", null, null, null, null, null, null, null, null,
-			null, null, null, null, "Deal Information", "Deal Description",
-			"Sales Area Code", "Deal Currency", "Outbound Travel Dates",
-			"Maximum Stay", "Maximum Stay Period", "Deal Type", "Sub Deal",
-			"Commission Value", "Fare Type", "FUD Grid Dimensions",
-			"FUD Grid Information", "Double Dealing Indicator",
-			"Business Type", "Umbrella Links and Passengers", "Agents Name",
-			"Number of Passengers", "ALC Codes", "Consortia Codes",
-			"Child Percentage Permitted", "Percentage of Yield",
-			"Net Remit Permitted", "Infant Discount Permitted",
-			"Infant Discount Value", "TRVA Information",
-			"Business Justification", "Surcharge", "Nature of Variation",
-			"Other Refund Text", "Cancellation Fee Percentage",
-			"Cancellation Fee Fixed Value", "Cancellation Fee Currency",
-			"Remarks", "Other Carrier Sectors", "Prorate Comments", null,
-			null, null, null, null, null, null, null, null, null, null, null,
-			null, null, null
-		};
-		assertEquals(64, names.length);
-
-		boolean[] isRoot = {
-			true, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false
-		};
-		assertEquals(64, isRoot.length);
-
-		boolean[] isDocument = {
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false
-		};
-		assertEquals(64, isDocument.length);
-
-		boolean[] isDirectory = {
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, true, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false
-		};
-		assertEquals(64, isDirectory.length);
-
-		boolean[] isNull = {
-			false, true, true, true, true, true, true, true, true, true, true,
-			true, true, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true
-		};
-		assertEquals(64, isNull.length);
-
-		for (int j = 0; j < 64; j++) {
-			if (isNull[j]) {
-				assertNull("Checking property " + j, properties.get(j));
-			} else {
-				assertNotNull("Checking property " + j, properties.get(j));
-				if (isRoot[j]) {
-					assertTrue("Checking property " + j, properties.get(j) instanceof RootProperty);
-				}
-				if (isDirectory[j]) {
-					assertTrue("Checking property " + j,
-							properties.get(j) instanceof DirectoryProperty);
-				}
-				if (isDocument[j]) {
-					assertTrue("Checking property " + j,
-							properties.get(j) instanceof DocumentProperty);
-				}
-				assertEquals("Checking property " + j, names[j], ((Property) properties.get(j))
-						.getName());
-			}
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java b/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
deleted file mode 100644
index 52e4aaf..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Iterator;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.storage.BlockAllocationTableReader;
-import org.apache.poi.poifs.storage.HeaderBlock;
-import org.apache.poi.poifs.storage.RawDataBlockList;
-import org.apache.poi.poifs.storage.RawDataUtil;
-
-/**
- * Class to test PropertyTable functionality
- *
- * @author Marc Johnson
- */
-public final class TestPropertyTable extends TestCase {
-
-	private static void confirmBlockEncoding(String[] expectedDataHexDumpLines, PropertyTable table) {
-		byte[] expectedData = RawDataUtil.decode(expectedDataHexDumpLines);
-		ByteArrayOutputStream stream = new ByteArrayOutputStream();
-		try {
-			table.writeBlocks(stream);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		byte[] output = stream.toByteArray();
-
-		assertEquals("length check #1", expectedData.length, output.length);
-		for (int j = 0; j < expectedData.length; j++) {
-			assertEquals("content check #1: mismatch at offset " + j, expectedData[j], output[j]);
-		}
-	}
-
-	/**
-	 * Test PropertyTable
-	 * <p>
-	 * Running individual tests of the PropertyTable methods, which is the
-	 * traditional way to write unit tests (at least for me), seems somewhat
-	 * useless in this case. Of greater relevance: if one follows the normal
-	 * steps of creating a PropertyTable, and then checking the output, does it
-	 * make sense? In other words, more of an integration test.
-	 * <p>
-	 * So, the test consists of creating a PropertyTable instance, adding three
-	 * DocumentProperty instances to it, and then getting the output (including
-	 * the preWrite phase first), and comparing it against a real property table
-	 * extracted from a file known to be acceptable to Excel.
-	 */
-	public void testWriterPropertyTable() throws IOException {
-
-		// create the PropertyTable
-	   HeaderBlock   headerBlock = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		PropertyTable table = new PropertyTable(headerBlock);
-
-		// create three DocumentProperty instances and add them to the
-		// PropertyTable
-		DocumentProperty workbook = new DocumentProperty("Workbook", 0x00046777);
-
-		workbook.setStartBlock(0);
-		DocumentProperty summary1 = new DocumentProperty("\005SummaryInformation", 0x00001000);
-
-		summary1.setStartBlock(0x00000234);
-		DocumentProperty summary2 = new DocumentProperty("\005DocumentSummaryInformation",
-				0x00001000);
-
-		summary2.setStartBlock(0x0000023C);
-		table.addProperty(workbook);
-		RootProperty root = table.getRoot();
-
-		root.addChild(workbook);
-		table.addProperty(summary1);
-		root = table.getRoot();
-		root.addChild(summary1);
-		table.addProperty(summary2);
-		root = table.getRoot();
-		root.addChild(summary2);
-		table.preWrite();
-
-		String[] testblock = {
-			"52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 05 01 FF FF FF FF FF FF FF FF 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"57 00 6F 00 72 00 6B 00 62 00 6F 00 6F 00 6B 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"12 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 77 67 04 00 00 00 00 00",
-			"05 00 53 00 75 00 6D 00 6D 00 61 00 72 00 79 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00",
-			"69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 01 00 00 00 03 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 34 02 00 00 00 10 00 00 00 00 00 00",
-			"05 00 44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 53 00 75 00 6D 00 6D 00 61 00 72 00 79 00",
-			"49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00",
-			"38 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3C 02 00 00 00 10 00 00 00 00 00 00",
-		};
-		confirmBlockEncoding(testblock, table);
-
-		table.removeProperty(summary1);
-		root = table.getRoot();
-		root.deleteChild(summary1);
-		table.preWrite();
-
-		String[] testblock2 = {
-			"52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 05 01 FF FF FF FF FF FF FF FF 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"57 00 6F 00 72 00 6B 00 62 00 6F 00 6F 00 6B 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"12 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 77 67 04 00 00 00 00 00",
-			"05 00 44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 53 00 75 00 6D 00 6D 00 61 00 72 00 79 00",
-			"49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00",
-			"38 00 02 01 01 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3C 02 00 00 00 10 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-		};
-		confirmBlockEncoding(testblock2, table);
-
-		table.addProperty(summary1);
-		root = table.getRoot();
-		root.addChild(summary1);
-		table.preWrite();
-
-		String[] testblock3 = {
-			"52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 05 01 FF FF FF FF FF FF FF FF 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 00 00 00",
-			"57 00 6F 00 72 00 6B 00 62 00 6F 00 6F 00 6B 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"12 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 77 67 04 00 00 00 00 00",
-			"05 00 44 00 6F 00 63 00 75 00 6D 00 65 00 6E 00 74 00 53 00 75 00 6D 00 6D 00 61 00 72 00 79 00",
-			"49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00",
-			"38 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3C 02 00 00 00 10 00 00 00 00 00 00",
-			"05 00 53 00 75 00 6D 00 6D 00 61 00 72 00 79 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00",
-			"69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 01 00 00 00 02 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 34 02 00 00 00 10 00 00 00 00 00 00",
-		};
-		confirmBlockEncoding(testblock3, table);
-	}
-
-	public void testReadingConstructor() throws IOException {
-
-		// first, we need the raw data blocks
-		String[] raw_data_array = {
-			"52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 05 01 FF FF FF FF FF FF FF FF 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 80 07 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 01 01 FF FF FF FF FF FF FF FF 15 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"46 00 55 00 44 00 20 00 47 00 72 00 69 00 64 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00",
-			"74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2A 00 02 01 FF FF FF FF 0E 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"44 00 6F 00 75 00 62 00 6C 00 65 00 20 00 44 00 65 00 61 00 6C 00 69 00 6E 00 67 00 20 00 49 00",
-			"6E 00 64 00 69 00 63 00 61 00 74 00 6F 00 72 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"32 00 02 01 FF FF FF FF 09 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 68 00 69 00 6C 00 64 00 20 00 50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00",
-			"20 00 50 00 65 00 72 00 6D 00 69 00 74 00 74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"36 00 02 01 FF FF FF FF 07 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 46 00 69 00 78 00 65 00 64 00 20 00 56 00 61 00 6C 00 75 00 65 00 00 00 00 00 00 00 00 00",
-			"3A 00 02 01 FF FF FF FF 06 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00 00 00 04 00 00 00 00 00 00 00",
-			"55 00 6D 00 62 00 72 00 65 00 6C 00 6C 00 61 00 20 00 4C 00 69 00 6E 00 6B 00 73 00 20 00 61 00",
-			"6E 00 64 00 20 00 50 00 61 00 73 00 73 00 65 00 6E 00 67 00 65 00 72 00 73 00 00 00 00 00 00 00",
-			"3C 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00 00 00 00 00 00 00 00 00 00 00",
-			"38 00 02 01 FF FF FF FF 05 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00 00 00 04 00 00 00 00 00 00 00",
-			"49 00 6E 00 66 00 61 00 6E 00 74 00 20 00 44 00 69 00 73 00 63 00 6F 00 75 00 6E 00 74 00 20 00",
-			"50 00 65 00 72 00 6D 00 69 00 74 00 74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"34 00 02 01 FF FF FF FF 04 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 43 00 75 00 72 00 72 00 65 00 6E 00 63 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"34 00 02 01 FF FF FF FF 08 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 07 00 00 00 00 00 00 00",
-			"4F 00 75 00 74 00 62 00 6F 00 75 00 6E 00 64 00 20 00 54 00 72 00 61 00 76 00 65 00 6C 00 20 00",
-			"44 00 61 00 74 00 65 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 FF FF FF FF 0B 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 06 00 00 00 21 00 00 00 00 00 00 00",
-			"42 00 75 00 73 00 69 00 6E 00 65 00 73 00 73 00 20 00 4A 00 75 00 73 00 74 00 69 00 66 00 69 00",
-			"63 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2E 00 02 01 FF FF FF FF 03 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 07 00 00 00 04 00 00 00 00 00 00 00",
-			"49 00 6E 00 66 00 61 00 6E 00 74 00 20 00 44 00 69 00 73 00 63 00 6F 00 75 00 6E 00 74 00 20 00",
-			"56 00 61 00 6C 00 75 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 FF FF FF FF 0D 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 00 00 00 04 00 00 00 00 00 00 00",
-			"4F 00 74 00 68 00 65 00 72 00 20 00 43 00 61 00 72 00 72 00 69 00 65 00 72 00 20 00 53 00 65 00",
-			"63 00 74 00 6F 00 72 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 FF FF FF FF 0A 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 09 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 75 00 6D 00 62 00 65 00 72 00 20 00 6F 00 66 00 20 00 50 00 61 00 73 00 73 00 65 00 6E 00",
-			"67 00 65 00 72 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2A 00 02 01 FF FF FF FF 0C 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 61 00 6C 00 65 00 73 00 20 00 41 00 72 00 65 00 61 00 20 00 43 00 6F 00 64 00 65 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 02 01 1C 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0B 00 00 00 04 00 00 00 00 00 00 00",
-			"4F 00 74 00 68 00 65 00 72 00 20 00 52 00 65 00 66 00 75 00 6E 00 64 00 20 00 54 00 65 00 78 00",
-			"74 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"24 00 02 01 17 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 00 00 04 00 00 00 00 00 00 00",
-			"4D 00 61 00 78 00 69 00 6D 00 75 00 6D 00 20 00 53 00 74 00 61 00 79 00 20 00 50 00 65 00 72 00",
-			"69 00 6F 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 14 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0D 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 65 00 74 00 20 00 52 00 65 00 6D 00 69 00 74 00 20 00 50 00 65 00 72 00 6D 00 69 00 74 00",
-			"74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 13 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0E 00 00 00 04 00 00 00 00 00 00 00",
-			"50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00 20 00 6F 00 66 00 20 00 59 00 69 00",
-			"65 00 6C 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 02 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0F 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 61 00 74 00 75 00 72 00 65 00 20 00 6F 00 66 00 20 00 56 00 61 00 72 00 69 00 61 00 74 00",
-			"69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 12 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10 00 00 00 50 00 00 00 00 00 00 00",
-			"46 00 55 00 44 00 20 00 47 00 72 00 69 00 64 00 20 00 44 00 69 00 6D 00 65 00 6E 00 73 00 69 00",
-			"6F 00 6E 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 10 00 00 00 11 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 12 00 00 00 04 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 44 00 65 00 73 00 63 00 72 00 69 00 70 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 19 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 13 00 00 00 09 00 00 00 00 00 00 00",
-			"54 00 52 00 56 00 41 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 18 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 04 00 00 00 00 00 00 00",
-			"50 00 72 00 6F 00 72 00 61 00 74 00 65 00 20 00 43 00 6F 00 6D 00 6D 00 65 00 6E 00 74 00 73 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 16 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"43 00 6F 00 6D 00 6D 00 69 00 73 00 73 00 69 00 6F 00 6E 00 20 00 56 00 61 00 6C 00 75 00 65 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 0F 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 15 00 00 00 04 00 00 00 00 00 00 00",
-			"4D 00 61 00 78 00 69 00 6D 00 75 00 6D 00 20 00 53 00 74 00 61 00 79 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1A 00 02 01 20 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16 00 00 00 05 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 43 00 75 00 72 00 72 00 65 00 6E 00 63 00 79 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 02 01 1D 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 17 00 00 00 07 00 00 00 00 00 00 00",
-			"43 00 6F 00 6E 00 73 00 6F 00 72 00 74 00 69 00 61 00 20 00 43 00 6F 00 64 00 65 00 73 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 02 01 1B 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"42 00 75 00 73 00 69 00 6E 00 65 00 73 00 73 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 02 01 1A 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 18 00 00 00 04 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 23 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 19 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 75 00 72 00 63 00 68 00 61 00 72 00 67 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 21 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1A 00 00 00 04 00 00 00 00 00 00 00",
-			"41 00 67 00 65 00 6E 00 74 00 73 00 20 00 4E 00 61 00 6D 00 65 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"18 00 02 01 1F 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1B 00 00 00 04 00 00 00 00 00 00 00",
-			"46 00 61 00 72 00 65 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 1E 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1C 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 75 00 62 00 20 00 44 00 65 00 61 00 6C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"12 00 02 01 24 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1D 00 00 00 04 00 00 00 00 00 00 00",
-			"41 00 4C 00 43 00 20 00 43 00 6F 00 64 00 65 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 22 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"52 00 65 00 6D 00 61 00 72 00 6B 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"10 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 03 00 47 42 50 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 1D 00 28 41 29 31 36 2D 4F 63 74 2D 32 30 30 31 20 74 6F 20 31 36 2D 4F 63 74 2D 32 30 30",
-			"31 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 01 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 18 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 05 00 6A 61 6D 65 73 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 01 00 31 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 03 00 47 42 50 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"11 00 00 00 FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"01 00 00 00 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00 06 00 00 00 07 00 00 00 08 00 00 00",
-			"09 00 00 00 FE FF FF FF 0B 00 00 00 0C 00 00 00 0D 00 00 00 FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-
-		RawDataBlockList data_blocks = new RawDataBlockList(new ByteArrayInputStream(RawDataUtil
-				.decode(raw_data_array)), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		int[] bat_array = { 15 };
-
-		// need to initialize the block list with a block allocation
-		// table
-		new BlockAllocationTableReader(
-		      POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 1, bat_array, 0, -2, data_blocks);
-
-      // Fake up a header
-      HeaderBlock header_block = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-      header_block.setPropertyStart(0);
-      
-		// get property table from the document
-		PropertyTable table = new PropertyTable(header_block, data_blocks);
-
-		assertEquals(30 * 64, table.getRoot().getSize());
-		int count = 0;
-		Property child = null;
-		Iterator iter = table.getRoot().getChildren();
-
-		while (iter.hasNext()) {
-			child = (Property) iter.next();
-			++count;
-		}
-		if (child == null) {
-			throw new AssertionFailedError("no children found");
-		}
-		assertEquals(1, count);
-		assertTrue(child.isDirectory());
-		iter = ((DirectoryProperty) child).getChildren();
-		count = 0;
-		while (iter.hasNext()) {
-			iter.next();
-			++count;
-		}
-		assertEquals(35, count);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java b/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
deleted file mode 100644
index 27708a4..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.property;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.storage.RawDataUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Class to test RootProperty functionality
- *
- * @author Marc Johnson
- */
-public final class TestRootProperty {
-	private RootProperty _property;
-	private byte[] _testblock;
-
-	@Test
-	public void testConstructor() throws IOException {
-		createBasicRootProperty();
-		verifyProperty();
-	}
-
-	private void createBasicRootProperty() {
-		_property = new RootProperty();
-		_testblock = new byte[128];
-		int index = 0;
-
-		for (; index < 0x40; index++) {
-			_testblock[index] = (byte) 0;
-		}
-		String name = "Root Entry";
-		int limit = Math.min(31, name.length());
-
-		_testblock[index++] = (byte) (2 * (limit + 1));
-		_testblock[index++] = (byte) 0;
-		_testblock[index++] = (byte) 5;
-		_testblock[index++] = (byte) 1;
-		for (; index < 0x50; index++) {
-			_testblock[index] = (byte) 0xff;
-		}
-		for (; index < 0x74; index++) {
-			_testblock[index] = (byte) 0;
-		}
-		_testblock[index++] = (byte) POIFSConstants.END_OF_CHAIN;
-		for (; index < 0x78; index++) {
-			_testblock[index] = (byte) 0xff;
-		}
-		for (; index < 0x80; index++) {
-			_testblock[index] = (byte) 0;
-		}
-		byte[] name_bytes = name.getBytes(LocaleUtil.CHARSET_1252);
-
-		for (index = 0; index < limit; index++) {
-			_testblock[index * 2] = name_bytes[index];
-		}
-	}
-
-	private void verifyProperty() throws IOException {
-		ByteArrayOutputStream stream = new ByteArrayOutputStream(512);
-
-		_property.writeData(stream);
-		byte[] output = stream.toByteArray();
-
-		assertEquals(_testblock.length, output.length);
-		for (int j = 0; j < _testblock.length; j++) {
-			assertEquals("mismatch at offset " + j, _testblock[j], output[j]);
-		}
-	}
-
-	@Test
-	public void testSetSize() {
-		for (int j = 0; j < 10; j++) {
-			createBasicRootProperty();
-			_property.setSize(j);
-			assertEquals("trying block count of " + j, j * 64, _property.getSize());
-		}
-	}
-
-	@Test
-	public void testReadingConstructor() {
-		String[] input = {
-			"52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 05 01 FF FF FF FF FF FF FF FF 02 00 00 00 20 08 02 00 00 00 00 00 C0 00 00 00 00 00 00 46",
-			"00 00 00 00 00 00 00 00 00 00 00 00 C0 5C E8 23 9E 6B C1 01 FE FF FF FF 00 00 00 00 00 00 00 00",
-		};
-		verifyReadingProperty(0, RawDataUtil.decode(input), 0, "Root Entry",
-				"{00020820-0000-0000-C000-000000000046}");
-	}
-
-	private void verifyReadingProperty(int index, byte[] input, int offset, String name,
-			String sClsId) {
-		RootProperty property = new RootProperty(index, input, offset);
-		ByteArrayOutputStream stream = new ByteArrayOutputStream(128);
-		byte[] expected = new byte[128];
-
-		System.arraycopy(input, offset, expected, 0, 128);
-		try {
-			property.writeData(stream);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		byte[] output = stream.toByteArray();
-
-		assertEquals(128, output.length);
-		for (int j = 0; j < 128; j++) {
-			assertEquals("mismatch at offset " + j, expected[j], output[j]);
-		}
-		assertEquals(index, property.getIndex());
-		assertEquals(name, property.getName());
-		assertTrue(!property.getChildren().hasNext());
-		assertEquals(property.getStorageClsid().toString(), sClsId);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java b/trunk/src/testcases/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java
deleted file mode 100644
index 8061545..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-/**
- * Tests for org.apache.poi.poifs.storage<br/>
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestBATBlock.class,
-    TestBlockAllocationTableReader.class,
-    TestBlockAllocationTableWriter.class,
-    TestBlockListImpl.class,
-    TestDocumentBlock.class,
-    TestHeaderBlockReading.class,
-    TestHeaderBlockWriting.class,
-    TestPropertyBlock.class,
-    TestRawDataBlock.class,
-    TestRawDataBlockList.class,
-    TestSmallBlockTableReader.class,
-    TestSmallBlockTableWriter.class,
-    TestSmallDocumentBlock.class,
-    TestSmallDocumentBlockList.class
-})
-public class AllPOIFSStorageTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/LocalProperty.java b/trunk/src/testcases/org/apache/poi/poifs/storage/LocalProperty.java
deleted file mode 100644
index 13a1c52..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/LocalProperty.java
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-        
-
-package org.apache.poi.poifs.storage;
-
-import org.apache.poi.poifs.property.Property;
-
-class LocalProperty
-    extends Property
-{
-
-    /**
-     * Constructor TestProperty
-     *
-     * @param name name of the property
-     */
-
-    LocalProperty(String name)
-    {
-        super();
-        setName(name);
-    }
-
-    /**
-     * do nothing
-     */
-
-    @Override
-    protected void preWrite()
-    {
-    }
-
-    /**
-     * @return false
-     */
-
-    @Override
-    public boolean isDirectory()
-    {
-        return false;
-    }
-}   // end package scope class LocalProperty
-
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java b/trunk/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java
deleted file mode 100644
index 7358f00..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * Class LocalRawDataBlockList
- *
- * @author Marc Johnson(mjohnson at apache dot org)
- */
-public final class LocalRawDataBlockList extends RawDataBlockList {
-    private final List<RawDataBlock> _list;
-    private RawDataBlock[] _array;
-
-    public LocalRawDataBlockList()
-        throws IOException
-    {
-        super(new ByteArrayInputStream(new byte[ 0 ]), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        _list  = new ArrayList<RawDataBlock>();
-        _array = null;
-    }
-
-    /**
-     * create and a new XBAT block
-     *
-     * @param start index of first BAT block
-     * @param end index of last BAT block
-     * @param chain index of next XBAT block
-     */
-    public void createNewXBATBlock(final int start, final int end,
-                                   final int chain)
-        throws IOException
-    {
-        byte[] data   = new byte[ 512 ];
-        int    offset = 0;
-
-        for (int k = start; k <= end; k++)
-        {
-            LittleEndian.putInt(data, offset, k);
-            offset += LittleEndianConsts.INT_SIZE;
-        }
-        while (offset != 508)
-        {
-            LittleEndian.putInt(data, offset, -1);
-            offset += LittleEndianConsts.INT_SIZE;
-        }
-        LittleEndian.putInt(data, offset, chain);
-        add(new RawDataBlock(new ByteArrayInputStream(data)));
-    }
-
-    /**
-     * create a BAT block and add it to the list
-     *
-     * @param start_index initial index for the block list
-     */
-    public void createNewBATBlock(final int start_index)
-        throws IOException
-    {
-        byte[] data   = new byte[ 512 ];
-        int    offset = 0;
-
-        for (int j = 0; j < 128; j++)
-        {
-            int index = start_index + j;
-
-            if (index % 256 == 0)
-            {
-                LittleEndian.putInt(data, offset, -1);
-            }
-            else if (index % 256 == 255)
-            {
-                LittleEndian.putInt(data, offset, -2);
-            }
-            else
-            {
-                LittleEndian.putInt(data, offset, index + 1);
-            }
-            offset += LittleEndianConsts.INT_SIZE;
-        }
-        add(new RawDataBlock(new ByteArrayInputStream(data)));
-    }
-
-    /**
-     * fill the list with dummy blocks
-     *
-     * @param count of blocks
-     */
-    public void fill(final int count)
-        throws IOException
-    {
-        int limit = 128 * count;
-
-        for (int j = _list.size(); j < limit; j++)
-        {
-            add(new RawDataBlock(new ByteArrayInputStream(new byte[ 0 ])));
-        }
-    }
-
-    /**
-     * add a new block
-     *
-     * @param block new block to add
-     */
-    public void add(RawDataBlock block)
-    {
-        _list.add(block);
-    }
-
-    /**
-     * override of remove method
-     *
-     * @param index of block to be removed
-     *
-     * @return desired block
-     */
-    @Override
-    public ListManagedBlock remove(final int index)
-        throws IOException
-    {
-        ensureArrayExists();
-        RawDataBlock rvalue = null;
-
-        try
-        {
-            rvalue = _array[ index ];
-            if (rvalue == null)
-            {
-                throw new IOException("index " + index + " is null");
-            }
-            _array[ index ] = null;
-        }
-        catch (ArrayIndexOutOfBoundsException ignored)
-        {
-            throw new IOException("Cannot remove block[ " + index
-                                  + " ]; out of range");
-        }
-        return rvalue;
-    }
-
-    /**
-     * remove the specified block from the list
-     *
-     * @param index the index of the specified block; if the index is
-     *              out of range, that's ok
-     */
-    @Override
-    public void zap(final int index)
-    {
-        ensureArrayExists();
-        if ((index >= 0) && (index < _array.length))
-        {
-            _array[ index ] = null;
-        }
-    }
-
-    private void ensureArrayExists()
-    {
-        if (_array == null)
-        {
-            _array = _list.toArray(new RawDataBlock[ 0 ]);
-        }
-    }
-    
-    @Override
-    public int blockCount() {
-       return _list.size();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java b/trunk/src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java
deleted file mode 100644
index 487c8eb..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Arrays;
-
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-/**
- * Test utility class.<br/>
- *
- * Creates raw <code>byte[]</code> data from hex-dump String arrays.
- *
- * @author Josh Micich
- */
-public final class RawDataUtil {
-
-	public static byte[] decode(String[] hexDataLines) {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(hexDataLines.length * 32 + 32);
-
-		for (String hexDataLine : hexDataLines) {
-			byte[] lineData = HexRead.readFromString(hexDataLine);
-			baos.write(lineData, 0, lineData.length);
-		}
-		return baos.toByteArray();
-	}
-
-	/**
-	 * Development time utility method.<br/>
-	 * Transforms a byte array into hex-dump String lines in java source code format.
-	 */
-	public static void dumpData(byte[] data) {
-		int i=0;
-		System.out.println("String[] hexDataLines = {");
-		System.out.print("\t\"");
-		while(true) {
-			System.out.print(HexDump.byteToHex(data[i]).substring(2));
-			i++;
-			if (i>=data.length) {
-				break;
-			}
-			if (i % 32 == 0) {
-				System.out.println("\",");
-				System.out.print("\t\"");
-			} else {
-				System.out.print(" ");
-			}
-		}
-		System.out.println("\",");
-		System.out.println("};");
-	}
-
-	/**
-	 * Development time utility method.<br/>
-	 * Confirms that the specified byte array is equivalent to the hex-dump String lines.
-	 */
-	public static void confirmEqual(byte[] expected, String[] hexDataLines) {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(hexDataLines.length * 32 + 32);
-
-		for (String hexDataLine : hexDataLines) {
-			byte[] lineData = HexRead.readFromString(hexDataLine);
-			baos.write(lineData, 0, lineData.length);
-		}
-		if (!Arrays.equals(expected, baos.toByteArray())) {
-			throw new RuntimeException("different");
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java
deleted file mode 100644
index 5ee5309..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-
-/**
- * Class to test BATBlock functionality
- *
- * @author Marc Johnson
- */
-public final class TestBATBlock extends TestCase {
-
-    /**
-     * Test the createBATBlocks method. The test involves setting up
-     * various arrays of int's and ensuring that the correct number of
-     * BATBlocks is created for each array, and that the data from
-     * each array is correctly written to the BATBlocks.
-     */
-    public void testCreateBATBlocks() throws IOException {
-
-        // test 0 length array (basic sanity)
-        BATBlock[] rvalue = BATBlock.createBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(0));
-
-        assertEquals(0, rvalue.length);
-
-        // test array of length 1
-        rvalue = BATBlock.createBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(1));
-        assertEquals(1, rvalue.length);
-        verifyContents(rvalue, 1);
-
-        // test array of length 127
-        rvalue = BATBlock.createBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(127));
-        assertEquals(1, rvalue.length);
-        verifyContents(rvalue, 127);
-
-        // test array of length 128
-        rvalue = BATBlock.createBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(128));
-        assertEquals(1, rvalue.length);
-        verifyContents(rvalue, 128);
-
-        // test array of length 129
-        rvalue = BATBlock.createBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(129));
-        assertEquals(2, rvalue.length);
-        verifyContents(rvalue, 129);
-    }
-
-    private static int[] createTestArray(int count) {
-        int[] rvalue = new int[ count ];
-
-        for (int j = 0; j < count; j++)
-        {
-            rvalue[ j ] = j;
-        }
-        return rvalue;
-    }
-
-    private static void verifyContents(BATBlock[] blocks, int entries) throws IOException {
-        byte[] expected = new byte[ 512 * blocks.length ];
-
-        Arrays.fill(expected, ( byte ) 0xFF);
-        int offset = 0;
-
-        for (int j = 0; j < entries; j++)
-        {
-            expected[ offset++ ] = ( byte ) j;
-            expected[ offset++ ] = 0;
-            expected[ offset++ ] = 0;
-            expected[ offset++ ] = 0;
-        }
-        ByteArrayOutputStream stream = new ByteArrayOutputStream(512
-                                           * blocks.length);
-
-        for (BATBlock block : blocks) {
-            block.writeBlocks(stream);
-        }
-        byte[] actual = stream.toByteArray();
-
-        assertEquals(expected.length, actual.length);
-        for (int j = 0; j < expected.length; j++)
-        {
-            assertEquals(expected[ j ], actual[ j ]);
-        }
-    }
-
-    public void testCreateXBATBlocks() throws IOException {
-        // test 0 length array (basic sanity)
-        BATBlock[] rvalue = BATBlock.createXBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(0), 1);
-
-        assertEquals(0, rvalue.length);
-
-        // test array of length 1
-        rvalue = BATBlock.createXBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(1), 1);
-        assertEquals(1, rvalue.length);
-        verifyXBATContents(rvalue, 1, 1);
-
-        // test array of length 127
-        rvalue = BATBlock.createXBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(127), 1);
-        assertEquals(1, rvalue.length);
-        verifyXBATContents(rvalue, 127, 1);
-
-        // test array of length 128
-        rvalue = BATBlock.createXBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(128), 1);
-        assertEquals(2, rvalue.length);
-        verifyXBATContents(rvalue, 128, 1);
-
-        // test array of length 254
-        rvalue = BATBlock.createXBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(254), 1);
-        assertEquals(2, rvalue.length);
-        verifyXBATContents(rvalue, 254, 1);
-
-        // test array of length 255
-        rvalue = BATBlock.createXBATBlocks(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, createTestArray(255), 1);
-        assertEquals(3, rvalue.length);
-        verifyXBATContents(rvalue, 255, 1);
-    }
-
-    private static void verifyXBATContents(BATBlock[] blocks, int entries, int start_block)
-			throws IOException {
-        byte[] expected = new byte[ 512 * blocks.length ];
-
-        Arrays.fill(expected, ( byte ) 0xFF);
-        int offset = 0;
-
-        for (int j = 0; j < entries; j++)
-        {
-            if ((j % 127) == 0)
-            {
-                if (j != 0)
-                {
-                    offset += 4;
-                }
-            }
-            expected[ offset++ ] = ( byte ) j;
-            expected[ offset++ ] = 0;
-            expected[ offset++ ] = 0;
-            expected[ offset++ ] = 0;
-        }
-        for (int j = 0; j < (blocks.length - 1); j++)
-        {
-            offset               = 508 + (j * 512);
-            expected[ offset++ ] = ( byte ) (start_block + j + 1);
-            expected[ offset++ ] = 0;
-            expected[ offset++ ] = 0;
-            expected[ offset++ ] = 0;
-        }
-        offset               = (blocks.length * 512) - 4;
-        expected[ offset++ ] = ( byte ) -2;
-        expected[ offset++ ] = ( byte ) -1;
-        expected[ offset++ ] = ( byte ) -1;
-        expected[ offset++ ] = ( byte ) -1;
-        ByteArrayOutputStream stream = new ByteArrayOutputStream(512
-                                           * blocks.length);
-
-        for (BATBlock block : blocks) {
-            block.writeBlocks(stream);
-        }
-        byte[] actual = stream.toByteArray();
-
-        assertEquals(expected.length, actual.length);
-        for (int j = 0; j < expected.length; j++)
-        {
-            assertEquals("offset " + j, expected[ j ], actual[ j ]);
-        }
-    }
-
-    public void testCalculateXBATStorageRequirements() {
-        int[] blockCounts = { 0, 1, 127, 128 };
-        int[] requirements = { 0, 1, 1, 2 };
-
-        for (int j = 0; j < blockCounts.length; j++)
-        {
-            assertEquals(
-                "requirement for " + blockCounts[ j ], requirements[ j ],
-                BATBlock.calculateXBATStorageRequirements(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, blockCounts[ j ]));
-        }
-    }
-
-    public void testEntriesPerBlock() {
-        assertEquals(128, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS.getBATEntriesPerBlock()); 
-    }
-    public void testEntriesPerXBATBlock() {
-        assertEquals(127, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS.getXBATEntriesPerBlock());
-    }
-    public void testGetXBATChainOffset() {
-        assertEquals(508, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS.getNextXBATChainOffset());
-    }
-    
-    public void testCalculateMaximumSize() throws Exception {
-       // Zero fat blocks isn't technically valid, but it'd be header only
-       assertEquals(
-             512, 
-             BATBlock.calculateMaximumSize(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 0)
-       );
-       assertEquals(
-             4096, 
-             BATBlock.calculateMaximumSize(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS, 0)
-       );
-       
-       // A single FAT block can address 128/1024 blocks
-       assertEquals(
-             512 + 512*128, 
-             BATBlock.calculateMaximumSize(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 1)
-       );
-       assertEquals(
-             4096 + 4096*1024, 
-             BATBlock.calculateMaximumSize(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS, 1)
-       );
-       
-       assertEquals(
-             512 + 4*512*128, 
-             BATBlock.calculateMaximumSize(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 4)
-       );
-       assertEquals(
-             4096 + 4*4096*1024, 
-             BATBlock.calculateMaximumSize(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS, 4)
-       );
-       
-       // One XBAT block holds 127/1023 individual BAT blocks, so they can address
-       //  a fairly hefty amount of space themselves
-       // However, the BATs continue as before
-       assertEquals(
-             512 + 109*512*128, 
-             BATBlock.calculateMaximumSize(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 109)
-       );
-       assertEquals(
-             4096 + 109*4096*1024, 
-             BATBlock.calculateMaximumSize(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS, 109)
-       );
-             
-       assertEquals(
-             512 + 110*512*128, 
-             BATBlock.calculateMaximumSize(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 110)
-       );
-       assertEquals(
-             4096 + 110*4096*1024, 
-             BATBlock.calculateMaximumSize(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS, 110)
-       );
-       
-       assertEquals(
-             512 + 112*512*128, 
-             BATBlock.calculateMaximumSize(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 112)
-       );
-       assertEquals(
-             4096 + 112*4096*1024, 
-             BATBlock.calculateMaximumSize(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS, 112)
-       );
-       
-       // Check for >2gb, which we only support via a File
-       assertEquals(
-               512 + 8030l*512*128, 
-               BATBlock.calculateMaximumSize(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 8030)
-       );
-       assertEquals(
-               4096 + 8030l*4096*1024, 
-               BATBlock.calculateMaximumSize(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS, 8030)
-       );
-    }
-    
-    public void testUsedSectors() throws Exception {
-        POIFSBigBlockSize b512 = POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS;
-        POIFSBigBlockSize b4096 = POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS;
-        
-        // Try first with 512 block sizes, which can hold 128 entries
-        BATBlock block512 = BATBlock.createEmptyBATBlock(b512, false);
-        assertEquals(true, block512.hasFreeSectors());
-        assertEquals(0, block512.getUsedSectors(false));
-
-        // Allocate a few
-        block512.setValueAt(0, 42);
-        block512.setValueAt(10, 42);
-        block512.setValueAt(20, 42);
-        assertEquals(true, block512.hasFreeSectors());
-        assertEquals(3, block512.getUsedSectors(false));
-        
-        // Allocate all
-        for (int i=0; i<b512.getBATEntriesPerBlock(); i++) {
-            block512.setValueAt(i, 82);
-        }
-        // Check
-        assertEquals(false, block512.hasFreeSectors());
-        assertEquals(128, block512.getUsedSectors(false));
-        assertEquals(127, block512.getUsedSectors(true));
-        
-        // Release one
-        block512.setValueAt(10, POIFSConstants.UNUSED_BLOCK);
-        assertEquals(true, block512.hasFreeSectors());
-        assertEquals(127, block512.getUsedSectors(false));
-        assertEquals(126, block512.getUsedSectors(true));
-        
-        
-        // Now repeat with 4096 block sizes
-        BATBlock block4096 = BATBlock.createEmptyBATBlock(b4096, false);
-        assertEquals(true, block4096.hasFreeSectors());
-        assertEquals(0, block4096.getUsedSectors(false));
-        
-        block4096.setValueAt(0, 42);
-        block4096.setValueAt(10, 42);
-        block4096.setValueAt(20, 42);
-        assertEquals(true, block4096.hasFreeSectors());
-        assertEquals(3, block4096.getUsedSectors(false));
-        
-        // Allocate all
-        for (int i=0; i<b4096.getBATEntriesPerBlock(); i++) {
-            block4096.setValueAt(i, 82);
-        }
-        // Check
-        assertEquals(false, block4096.hasFreeSectors());
-        assertEquals(1024, block4096.getUsedSectors(false));
-        assertEquals(1023, block4096.getUsedSectors(true));
-    }
-    
-    public void testGetBATBlockAndIndex() throws Exception {
-       HeaderBlock header = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-       List<BATBlock> blocks = new ArrayList<BATBlock>();
-       int offset;
-       
-       
-       // First, try a one BAT block file
-       header.setBATCount(1);
-       blocks.add(
-             BATBlock.createBATBlock(header.getBigBlockSize(), ByteBuffer.allocate(512))
-       );
-       
-       offset = 0;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 1;
-       assertEquals(1, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 127;
-       assertEquals(127, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       
-       // Now go for one with multiple BAT blocks
-       header.setBATCount(2);
-       blocks.add(
-             BATBlock.createBATBlock(header.getBigBlockSize(), ByteBuffer.allocate(512))
-       );
-       
-       offset = 0;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 127;
-       assertEquals(127, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 128;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(1, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 129;
-       assertEquals(1, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(1, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       
-       // The XBAT count makes no difference, as we flatten in memory
-       header.setBATCount(1);
-       header.setXBATCount(1);
-       offset = 0;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 126;
-       assertEquals(126, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 127;
-       assertEquals(127, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 128;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(1, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 129;
-       assertEquals(1, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(1, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       
-       // Check with the bigger block size too
-       header = new HeaderBlock(POIFSConstants.LARGER_BIG_BLOCK_SIZE_DETAILS);
-       
-       offset = 0;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 1022;
-       assertEquals(1022, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 1023;
-       assertEquals(1023, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 1024;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(1, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-
-       // Biggr block size, back to real BATs
-       header.setBATCount(2);
-       
-       offset = 0;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 1022;
-       assertEquals(1022, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 1023;
-       assertEquals(1023, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(0, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-       
-       offset = 1024;
-       assertEquals(0, BATBlock.getBATBlockAndIndex(offset, header, blocks).getIndex());
-       assertEquals(1, blocks.indexOf( BATBlock.getBATBlockAndIndex(offset, header, blocks).getBlock() ));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java
deleted file mode 100644
index 6a249af..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSBigBlockSize;
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * Class to test BlockAllocationTableReader functionality
- *
- * @author Marc Johnson
- */
-public final class TestBlockAllocationTableReader extends TestCase {
-
-	/**
-	 * Test small block allocation table constructor
-	 */
-	public void testSmallBATConstructor() throws IOException {
-
-		// need to create an array of raw blocks containing the SBAT,
-		// and a small document block list
-		String[] sbat_data = {
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FE FF FF FF 22 00 00 00 FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-
-		RawDataBlock[] sbats = { new RawDataBlock(makeDataStream(sbat_data)) };
-
-		String[] sbt_data = {
-			"08 00 28 00 6A 61 6D 65 73 2D 55 37 37 32 37 39 32 2D 28 31 36 2D 4F 63 74 2D 32 30 30 31 40 31",
-			"36 2D 34 31 2D 33 33 29 2E 5A 44 46 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"07 00 00 00 00 00 80 27 E2 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"07 00 00 00 00 00 80 27 E2 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"0B 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"03 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 02 00 20 31 08 00 05 00 53 61 76 65 64 08 00 17 00 53 2E 48 55 53 53 41 49 4E 20 41 20 44",
-			"45 56 20 4F 46 46 52 20 55 4B 08 00 0B 00 31 36 2D 4F 63 74 2D 32 30 30 31 08 00 05 00 35 2E 33",
-			"2E 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 05 00 6A 61 6D 65 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 03 00 47 42 50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 1D 00 28 41 29 31 36 2D 4F 63 74 2D 32 30 30 31 20 74 6F 20 31 36 2D 4F 63 74 2D 32 30 30",
-			"31 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 01 00 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 18 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 03 00 47 42 50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 17 00 53 2E 48 55 53 53 41 49 4E 20 41 20 44 45 56 20 4F 46 46 52 20 55 4B 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 02 00 00 00 02 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-		};
-
-		RawDataBlock[] sbts = new RawDataBlock[7];
-		InputStream sbt_input = makeDataStream(sbt_data);
-
-		for (int j = 0; j < 7; j++) {
-			sbts[j] = new RawDataBlock(sbt_input);
-		}
-		SmallDocumentBlockList small_blocks = new SmallDocumentBlockList(SmallDocumentBlock
-				.extract(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, sbts));
-		BlockAllocationTableReader sbat = new BlockAllocationTableReader(
-		      POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, sbats, small_blocks);
-		boolean[] isUsed = {
-			false, false, false, false, false, false, false, false, false,
-			false, true, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false
-		};
-		int[] nextIndex = {
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2,
-			-2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-			-2, 34, -2, -2, -2, -2, -2, -2, -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-		};
-
-		for (int j = 0; j < 128; j++) {
-			if (isUsed[j]) {
-				assertTrue("checking usage of block " + j, sbat.isUsed(j));
-				assertEquals("checking usage of block " + j, nextIndex[j], sbat
-						.getNextBlockIndex(j));
-				small_blocks.remove(j);
-			} else {
-				assertTrue("checking usage of block " + j, !sbat.isUsed(j));
-				try {
-					small_blocks.remove(j);
-					fail("removing block " + j + " should have failed");
-				} catch (IOException ignored) {
-					// expected during successful test
-				}
-			}
-		}
-	}
-
-	private static InputStream makeDataStream(String[] hexDataLines) {
-		return new ByteArrayInputStream(RawDataUtil.decode(hexDataLines));
-	}
-
-	public void testReadingConstructor() throws IOException {
-
-		// create a document, minus the header block, and use that to
-		// create a RawDataBlockList. The document will exist entire
-		// of BATBlocks and XBATBlocks
-		//
-		// we will create two XBAT blocks, which will encompass 128
-		// BAT blocks between them, and two extra BAT blocks which
-		// will be in the block array passed to the constructor. This
-		// makes a total of 130 BAT blocks, which will encompass
-		// 16,640 blocks, for a file size of some 8.5 megabytes.
-		//
-		// Naturally, we'll fake that out ...
-		//
-		// map of blocks:
-		// block 0: xbat block 0
-		// block 1: xbat block 1
-		// block 2: bat block 0
-		// block 3: bat block 1
-		// blocks 4-130: bat blocks 2-128, contained in xbat block 0
-		// block 131: bat block 129, contained in xbat block 1
-		// blocks 132-16639: fictitious blocks, faked out. All blocks
-		// whose index is evenly divisible by 256
-		// will be unused
-		LocalRawDataBlockList list = new LocalRawDataBlockList();
-
-		list.createNewXBATBlock(4, 130, 1);
-		list.createNewXBATBlock(131, 131, -2);
-		for (int j = 0; j < 130; j++) {
-			list.createNewBATBlock(j * 128);
-		}
-		list.fill(132);
-		int[] blocks = { 2, 3 };
-		BlockAllocationTableReader table = new BlockAllocationTableReader(
-		      POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 130, blocks, 2, 0, list);
-
-		for (int i = 0; i < (130 * 128); i++) {
-			if (i % 256 == 0) {
-				assertTrue("verifying block " + i + " is unused", !table.isUsed(i));
-			} else if (i % 256 == 255) {
-				assertEquals("Verify end of chain for block " + i, POIFSConstants.END_OF_CHAIN,
-						table.getNextBlockIndex(i));
-			} else {
-				assertEquals("Verify next index for block " + i, i + 1, table.getNextBlockIndex(i));
-			}
-		}
-	}
-
-	public void testFetchBlocks() throws IOException {
-
-		// strategy:
-		//
-		// 1. set up a single BAT block from which to construct a
-		// BAT. create nonsense blocks in the raw data block list
-		// corresponding to the indices in the BAT block.
-		// 2. The indices will include very short documents (0 and 1
-		// block in length), longer documents, and some screwed up
-		// documents (one with a loop, one that will peek into
-		// another document's data, one that includes an unused
-		// document, one that includes a reserved (BAT) block, one
-		// that includes a reserved (XBAT) block, and one that
-		// points off into space somewhere
-		LocalRawDataBlockList list = new LocalRawDataBlockList();
-		byte[] data = new byte[512];
-		int offset = 0;
-
-		LittleEndian.putInt(data, offset, -3); // for the BAT block itself
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 1: is at end of file already; start block = -2
-		// document 2: has only one block; start block = 1
-		LittleEndian.putInt(data, offset, -2);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 3: has a loop in it; start block = 2
-		LittleEndian.putInt(data, offset, 2);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 4: peeks into document 2's data; start block = 3
-		LittleEndian.putInt(data, offset, 4);
-		offset += LittleEndianConsts.INT_SIZE;
-		LittleEndian.putInt(data, offset, 1);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 5: includes an unused block; start block = 5
-		LittleEndian.putInt(data, offset, 6);
-		offset += LittleEndianConsts.INT_SIZE;
-		LittleEndian.putInt(data, offset, -1);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 6: includes a BAT block; start block = 7
-		LittleEndian.putInt(data, offset, 8);
-		offset += LittleEndianConsts.INT_SIZE;
-		LittleEndian.putInt(data, offset, 0);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 7: includes an XBAT block; start block = 9
-		LittleEndian.putInt(data, offset, 10);
-		offset += LittleEndianConsts.INT_SIZE;
-		LittleEndian.putInt(data, offset, -4);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 8: goes off into space; start block = 11;
-		LittleEndian.putInt(data, offset, 1000);
-		offset += LittleEndianConsts.INT_SIZE;
-
-		// document 9: no screw ups; start block = 12;
-		int index = 13;
-
-		for (; offset < 508; offset += LittleEndianConsts.INT_SIZE) {
-			LittleEndian.putInt(data, offset, index++);
-		}
-		LittleEndian.putInt(data, offset, -2);
-		list.add(new RawDataBlock(new ByteArrayInputStream(data)));
-		list.fill(1);
-		int[] blocks = { 0 };
-		BlockAllocationTableReader table = new BlockAllocationTableReader(
-		      POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 1, blocks, 0, -2, list);
-		int[] start_blocks = { -2, 1, 2, 3, 5, 7, 9, 11, 12 };
-		int[] expected_length = { 0, 1, -1, -1, -1, -1, -1, -1, 116 };
-
-		for (int j = 0; j < start_blocks.length; j++) {
-			try {
-				ListManagedBlock[] dataBlocks = table.fetchBlocks(start_blocks[j], -1, list);
-
-				if (expected_length[j] == -1) {
-					fail("document " + j + " should have failed, but found a length of "
-							+ dataBlocks.length);
-				} else {
-					assertEquals(expected_length[j], dataBlocks.length);
-				}
-			} catch (IOException e) {
-				if (expected_length[j] == -1) {
-
-					// no problem, we expected a failure here
-				} else {
-					throw e;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Bugzilla 48085 describes an error where a corrupted Excel file causes POI to throw an
-	 * {@link OutOfMemoryError}.
-	 */
-	public void testBadSectorAllocationTableSize_bug48085() {
-		int BLOCK_SIZE = 512;
-		POIFSBigBlockSize bigBlockSize = POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS;
-		assertEquals(BLOCK_SIZE, bigBlockSize.getBigBlockSize());
-		
-		// 512 bytes take from the start of bugzilla attachment 24444
-		byte[] initData = HexRead.readFromString(
-
-		"D0 CF 11 E0 A1 B1 1A E1 20 20 20 20 20 20 20 20  20 20 20 20 20 20 20 20 3E 20 03 20 FE FF 09 20" +
-		"06 20 20 20 20 20 20 20 20 20 20 20 01 20 20 20  01 20 20 20 20 20 20 20 20 10 20 20 02 20 20 20" +
-		"02 20 20 20 FE FF FF FF 20 20 20 20 20 20 20 20  "
-		);
-		// the rest of the block is 'FF'
-		byte[] data = new byte[BLOCK_SIZE];
-		Arrays.fill(data, (byte)0xFF);
-		System.arraycopy(initData, 0, data, 0, initData.length);
-
-		// similar code to POIFSFileSystem.<init>:
-		InputStream stream = new ByteArrayInputStream(data);
-		HeaderBlock hb;
-		RawDataBlockList dataBlocks;
-		try {
-			hb = new HeaderBlock(stream);
-			dataBlocks = new RawDataBlockList(stream, bigBlockSize);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		try {
-			new BlockAllocationTableReader(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 
-			      hb.getBATCount(), hb.getBATArray(), hb.getXBATCount(),
-					hb.getXBATIndex(), dataBlocks);
-		} catch (IOException e) {
-			// expected during successful test
-         assertEquals("Block count 538976257 is too high. POI maximum is 65535.", e.getMessage());
-		} catch (OutOfMemoryError e) {
-			if (e.getStackTrace()[1].getMethodName().equals("testBadSectorAllocationTableSize")) {
-				throw new AssertionFailedError("Identified bug 48085");
-			}
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java
deleted file mode 100644
index 023dc6f..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * Class to test BlockAllocationTableWriter functionality
- *
- * @author Marc Johnson
- */
-public final class TestBlockAllocationTableWriter extends TestCase {
-
-    public void testAllocateSpace() {
-        BlockAllocationTableWriter table         =
-            new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        int[]                      blockSizes    =
-        {
-            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-        };
-        int                        expectedIndex = 0;
-
-        for (int blockSize : blockSizes) {
-            assertEquals(expectedIndex, table.allocateSpace(blockSize));
-            expectedIndex += blockSize;
-        }
-    }
-
-    public void testCreateBlocks() {
-        BlockAllocationTableWriter table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-
-        table.allocateSpace(127);
-        table.createBlocks();
-        verifyBlocksCreated(table, 1);
-        table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        table.allocateSpace(128);
-        table.createBlocks();
-        verifyBlocksCreated(table, 2);
-        table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        table.allocateSpace(254);
-        table.createBlocks();
-        verifyBlocksCreated(table, 2);
-        table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        table.allocateSpace(255);
-        table.createBlocks();
-        verifyBlocksCreated(table, 3);
-        table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        table.allocateSpace(13843);
-        table.createBlocks();
-        verifyBlocksCreated(table, 109);
-        table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        table.allocateSpace(13844);
-        table.createBlocks();
-        verifyBlocksCreated(table, 110);
-        table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        table.allocateSpace(13969);
-        table.createBlocks();
-        verifyBlocksCreated(table, 110);
-        table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        table.allocateSpace(13970);
-        table.createBlocks();
-        verifyBlocksCreated(table, 111);
-    }
-
-    /**
-     * Test content produced by BlockAllocationTableWriter
-     */
-    public void testProduct() throws IOException {
-        BlockAllocationTableWriter table = new BlockAllocationTableWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-
-        for (int k = 1; k <= 22; k++)
-        {
-            table.allocateSpace(k);
-        }
-        table.createBlocks();
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-        table.writeBlocks(stream);
-        byte[] output = stream.toByteArray();
-
-        assertEquals(1024, output.length);
-        byte[] expected = new byte[ 1024 ];
-
-        Arrays.fill(expected, ( byte ) 0xFF);
-        int offset      = 0;
-        int block_index = 1;
-
-        for (int k = 1; k <= 22; k++)
-        {
-            int limit = k - 1;
-
-            for (int j = 0; j < limit; j++)
-            {
-                LittleEndian.putInt(expected, offset, block_index++);
-                offset += LittleEndianConsts.INT_SIZE;
-            }
-            LittleEndian.putInt(expected, offset,
-                                POIFSConstants.END_OF_CHAIN);
-            offset += 4;
-            block_index++;
-        }
-
-        // add BAT block indices
-        LittleEndian.putInt(expected, offset, block_index++);
-        offset += LittleEndianConsts.INT_SIZE;
-        LittleEndian.putInt(expected, offset, POIFSConstants.END_OF_CHAIN);
-        for (int k = 0; k < expected.length; k++)
-        {
-            assertEquals("At offset " + k, expected[ k ], output[ k ]);
-        }
-    }
-
-    private static void verifyBlocksCreated(BlockAllocationTableWriter table, int count){
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-        try {
-			table.writeBlocks(stream);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-        byte[] output = stream.toByteArray();
-
-        assertEquals(count * 512, output.length);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java
deleted file mode 100644
index 344b514..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-import org.junit.Test;
-
-/**
- * Class to test BlockListImpl functionality
- *
- * @author Marc Johnson
- */
-public final class TestBlockListImpl {
-    private static final class BlockListTestImpl extends BlockListImpl {
-        public BlockListTestImpl() {
-            // no extra initialisation
-        }
-    }
-    private static BlockListImpl create() {
-        return new BlockListTestImpl();
-    }
-
-    @Test
-    public void testZap() throws IOException {
-        BlockListImpl list = create();
-
-        // verify that you can zap anything
-        for (int j = -2; j < 10; j++)
-        {
-            list.zap(j);
-        }
-        RawDataBlock[] blocks = new RawDataBlock[ 5 ];
-
-        for (int j = 0; j < 5; j++)
-        {
-            blocks[ j ] =
-                new RawDataBlock(new ByteArrayInputStream(new byte[ 512 ]));
-        }
-        list.setBlocks(blocks);
-        for (int j = -2; j < 10; j++)
-        {
-            list.zap(j);
-        }
-
-        // verify that all blocks are gone
-        for (int j = 0; j < 5; j++)
-        {
-            try
-            {
-                list.remove(j);
-                fail("removing item " + j + " should not have succeeded");
-            }
-            catch (IOException ignored)
-            {
-            }
-        }
-    }
-
-    @Test
-    public void testRemove() throws IOException {
-        BlockListImpl  list   = create();
-        RawDataBlock[] blocks = new RawDataBlock[ 5 ];
-        byte[]         data   = new byte[ 512 * 5 ];
-
-        for (int j = 0; j < 5; j++)
-        {
-            Arrays.fill(data, j * 512, (j * 512) + 512, ( byte ) j);
-        }
-        ByteArrayInputStream stream = new ByteArrayInputStream(data);
-
-        for (int j = 0; j < 5; j++)
-        {
-            blocks[ j ] = new RawDataBlock(stream);
-        }
-        list.setBlocks(blocks);
-
-        // verify that you can't remove illegal indices
-        for (int j = -2; j < 10; j++)
-        {
-            if ((j < 0) || (j >= 5))
-            {
-                try
-                {
-                    list.remove(j);
-                    fail("removing item " + j + " should have failed");
-                }
-                catch (IOException ignored)
-                {
-                }
-            }
-        }
-
-        // verify we can safely and correctly remove all blocks
-        for (int j = 0; j < 5; j++)
-        {
-            byte[] output = list.remove(j).getData();
-
-            for (int k = 0; k < 512; k++)
-            {
-                assertEquals("testing block " + j + ", index " + k,
-                             data[ (j * 512) + k ], output[ k ]);
-            }
-        }
-
-        // verify that all blocks are gone
-        for (int j = 0; j < 5; j++)
-        {
-            try
-            {
-                list.remove(j);
-                fail("removing item " + j + " should not have succeeded");
-            }
-            catch (IOException ignored)
-            {
-            }
-        }
-    }
-
-    @Test
-    public void testSetBAT() throws IOException {
-        BlockListImpl list = create();
-
-        list.setBAT(null);
-        list.setBAT(new BlockAllocationTableReader(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS));
-        try
-        {
-            list.setBAT(new BlockAllocationTableReader(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS));
-            fail("second attempt should have failed");
-        }
-        catch (IOException ignored)
-        {
-        }
-    }
-
-    @Test
-    public void testFetchBlocks() throws IOException {
-
-        // strategy:
-        //
-        // 1. set up a single BAT block from which to construct a
-        // BAT. create nonsense blocks in the raw data block list
-        // corresponding to the indices in the BAT block.
-        // 2. The indices will include very short documents (0 and 1
-        // block in length), longer documents, and some screwed up
-        // documents (one with a loop, one that will peek into
-        // another document's data, one that includes an unused
-        // document, one that includes a reserved (BAT) block, one
-        // that includes a reserved (XBAT) block, and one that
-        // points off into space somewhere
-        BlockListImpl list       = create();
-        List<RawDataBlock>  raw_blocks = new ArrayList<RawDataBlock>();
-        byte[]        data       = new byte[ 512 ];
-        int           offset     = 0;
-
-        LittleEndian.putInt(data, offset, -3);   // for the BAT block itself
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 1: is at end of file already; start block = -2
-        // document 2: has only one block; start block = 1
-        LittleEndian.putInt(data, offset, -2);
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 3: has a loop in it; start block = 2
-        LittleEndian.putInt(data, offset, 2);
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 4: peeks into document 2's data; start block = 3
-        LittleEndian.putInt(data, offset, 4);
-        offset += LittleEndianConsts.INT_SIZE;
-        LittleEndian.putInt(data, offset, 1);
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 5: includes an unused block; start block = 5
-        LittleEndian.putInt(data, offset, 6);
-        offset += LittleEndianConsts.INT_SIZE;
-        LittleEndian.putInt(data, offset, -1);
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 6: includes a BAT block; start block = 7
-        LittleEndian.putInt(data, offset, 8);
-        offset += LittleEndianConsts.INT_SIZE;
-        LittleEndian.putInt(data, offset, 0);
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 7: includes an XBAT block; start block = 9
-        LittleEndian.putInt(data, offset, 10);
-        offset += LittleEndianConsts.INT_SIZE;
-        LittleEndian.putInt(data, offset, -4);
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 8: goes off into space; start block = 11;
-        LittleEndian.putInt(data, offset, 1000);
-        offset += LittleEndianConsts.INT_SIZE;
-
-        // document 9: no screw ups; start block = 12;
-        int index = 13;
-
-        for (; offset < 508; offset += LittleEndianConsts.INT_SIZE)
-        {
-            LittleEndian.putInt(data, offset, index++);
-        }
-        LittleEndian.putInt(data, offset, -2);
-        raw_blocks.add(new RawDataBlock(new ByteArrayInputStream(data)));
-        for (int j = raw_blocks.size(); j < 128; j++)
-        {
-            raw_blocks.add(
-                new RawDataBlock(new ByteArrayInputStream(new byte[ 0 ])));
-        }
-        list.setBlocks(raw_blocks.toArray(new RawDataBlock[raw_blocks.size()]));
-        int[]                      blocks          =
-        {
-            0
-        };
-        BlockAllocationTableReader table           =
-            new BlockAllocationTableReader(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 1, blocks, 0, -2, list);
-        int[]                      start_blocks    =
-        {
-            -2, 1, 2, 3, 5, 7, 9, 11, 12
-        };
-        int[]                      expected_length =
-        {
-            0, 1, -1, -1, -1, -1, -1, -1, 116
-        };
-
-        for (int j = 0; j < start_blocks.length; j++)
-        {
-            try
-            {
-                ListManagedBlock[] dataBlocks =
-                    list.fetchBlocks(start_blocks[ j ], -1);
-
-                if (expected_length[ j ] == -1)
-                {
-                    fail("document " + j + " should have failed");
-                }
-                else
-                {
-                    assertEquals(expected_length[ j ], dataBlocks.length);
-                }
-            }
-            catch (IOException e)
-            {
-                if (expected_length[ j ] == -1)
-                {
-
-                    // no problem, we expected a failure here
-                }
-                else
-                {
-                    throw e;
-                }
-            }
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestDocumentBlock.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestDocumentBlock.java
deleted file mode 100644
index 313d92c..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestDocumentBlock.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test DocumentBlock functionality
- *
- * @author Marc Johnson
- */
-public final class TestDocumentBlock extends TestCase {
-    static final private byte[] _testdata;
-
-    static
-    {
-        _testdata = new byte[ 2000 ];
-        for (int j = 0; j < _testdata.length; j++)
-        {
-            _testdata[ j ] = ( byte ) j;
-        }
-    }
-
-    /**
-     * Test the writing DocumentBlock constructor.
-     */
-    public void testConstructor()
-        throws IOException
-    {
-        ByteArrayInputStream input = new ByteArrayInputStream(_testdata);
-        int                  index = 0;
-        int                  size  = 0;
-
-        while (true)
-        {
-            byte[] data = new byte[ Math.min(_testdata.length - index, 512) ];
-
-            System.arraycopy(_testdata, index, data, 0, data.length);
-            DocumentBlock block = new DocumentBlock(input, POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-
-            verifyOutput(block, data);
-            size += block.size();
-            if (block.partiallyRead())
-            {
-                break;
-            }
-            index += 512;
-        }
-        assertEquals(_testdata.length, size);
-    }
-
-
-    /**
-     * Test 'reading' constructor
-     */
-    public void testReadingConstructor()
-        throws IOException
-    {
-        RawDataBlock input =
-            new RawDataBlock(new ByteArrayInputStream(_testdata));
-
-        verifyOutput(new DocumentBlock(input), input.getData());
-    }
-
-    private void verifyOutput(DocumentBlock block, byte [] input)
-        throws IOException
-    {
-        assertEquals(input.length, block.size());
-        if (input.length < 512)
-        {
-            assertTrue(block.partiallyRead());
-        }
-        else
-        {
-            assertTrue(!block.partiallyRead());
-        }
-        ByteArrayOutputStream output = new ByteArrayOutputStream(512);
-
-        block.writeBlocks(output);
-        byte[] copy = output.toByteArray();
-        int    j    = 0;
-
-        for (; j < input.length; j++)
-        {
-            assertEquals(input[ j ], copy[ j ]);
-        }
-        for (; j < 512; j++)
-        {
-            assertEquals(( byte ) 0xFF, copy[ j ]);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
deleted file mode 100644
index 15077c4..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test HeaderBlockReader functionality
- *
- * @author Marc Johnson
- */
-public final class TestHeaderBlockReading extends TestCase {
-
-	public void testConstructors() throws IOException {
-		String[] hexData = {
-			"D0 CF 11 E0 A1 B1 1A E1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3B 00 03 00 FE FF 09 00",
-			"06 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 10 00 00 FE FF FF FF",
-			"01 00 00 00 FE FF FF FF 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-		byte[] content = RawDataUtil.decode(hexData);
-		HeaderBlock block = new HeaderBlock(new ByteArrayInputStream(content));
-
-		assertEquals(-2, block.getPropertyStart());
-
-		// verify we can't read a short block
-		byte[] shortblock = new byte[511];
-
-		System.arraycopy(content, 0, shortblock, 0, 511);
-		try {
-			block = new HeaderBlock(new ByteArrayInputStream(shortblock));
-			fail("Should have caught IOException reading a short block");
-		} catch (IOException ignored) {
-
-			// as expected
-		}
-
-		// try various forms of corruption
-		for (int index = 0; index < 8; index++) {
-			content[index] = (byte) (content[index] - 1);
-			try {
-				block = new HeaderBlock(new ByteArrayInputStream(content));
-				fail("Should have caught IOException corrupting byte " + index);
-			} catch (IOException ignored) {
-
-				// as expected
-			}
-
-			// restore byte value
-			content[index] = (byte) (content[index] + 1);
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockWriting.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockWriting.java
deleted file mode 100644
index e01c788..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockWriting.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.LittleEndianConsts;
-
-/**
- * Class to test HeaderBlockWriter functionality
- *
- * @author Marc Johnson
- */
-public final class TestHeaderBlockWriting extends TestCase {
-
-	private static void confirmEqual(String[] expectedDataHexDumpLines, byte[] actual) {
-		byte[] expected = RawDataUtil.decode(expectedDataHexDumpLines);
-
-		assertEquals(expected.length, actual.length);
-		for (int j = 0; j < expected.length; j++) {
-			assertEquals("testing byte " + j, expected[j], actual[j]);
-		}
-	}
-
-	/**
-	 * Test creating a HeaderBlockWriter
-	 */
-	public void testConstructors() throws IOException {
-		HeaderBlockWriter block = new HeaderBlockWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		ByteArrayOutputStream output = new ByteArrayOutputStream(512);
-
-		block.writeBlocks(output);
-		byte[] copy = output.toByteArray();
-		String[] expected = {
-			"D0 CF 11 E0 A1 B1 1A E1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3B 00 03 00 FE FF 09 00",
-			"06 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 10 00 00 FE FF FF FF",
-			"00 00 00 00 FE FF FF FF 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-
-		confirmEqual(expected, copy);
-
-		// verify we can read a 'good' HeaderBlockWriter (also test
-		// getPropertyStart)
-		block.setPropertyStart(0x87654321);
-		output = new ByteArrayOutputStream(512);
-		block.writeBlocks(output);
-		assertEquals(0x87654321, new HeaderBlock(
-		      new ByteArrayInputStream(output.toByteArray())).getPropertyStart());
-	}
-
-	/**
-	 * Test setting the SBAT start block
-	 */
-	public void testSetSBATStart() throws IOException {
-	   HeaderBlockWriter block = new HeaderBlockWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-
-		block.setSBATStart(0x01234567);
-		ByteArrayOutputStream output = new ByteArrayOutputStream(512);
-
-		block.writeBlocks(output);
-		byte[] copy = output.toByteArray();
-		String[] expected = {
-			"D0 CF 11 E0 A1 B1 1A E1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3B 00 03 00 FE FF 09 00",
-			"06 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FE FF FF FF 00 00 00 00 00 10 00 00 67 45 23 01",
-			"00 00 00 00 FE FF FF FF 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-		confirmEqual(expected, copy);
-	}
-
-	/**
-	 * test setPropertyStart and getPropertyStart
-	 */
-	public void testSetPropertyStart() throws IOException {
-	   HeaderBlockWriter block = new HeaderBlockWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-
-		block.setPropertyStart(0x01234567);
-		ByteArrayOutputStream output = new ByteArrayOutputStream(512);
-
-		block.writeBlocks(output);
-		byte[] copy = output.toByteArray();
-		String[] expected = {
-			"D0 CF 11 E0 A1 B1 1A E1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3B 00 03 00 FE FF 09 00",
-			"06 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 67 45 23 01 00 00 00 00 00 10 00 00 FE FF FF FF",
-			"00 00 00 00 FE FF FF FF 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-		confirmEqual(expected, copy);
-	}
-
-	/**
-	 * test setting the BAT blocks; also tests getBATCount, getBATArray,
-	 * getXBATCount
-	 */
-	public void testSetBATBlocks() throws IOException {
-
-		// first, a small set of blocks
-	   HeaderBlockWriter block = new HeaderBlockWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		BATBlock[] xbats = block.setBATBlocks(5, 0x01234567);
-
-		assertEquals(0, xbats.length);
-		assertEquals(0, HeaderBlockWriter.calculateXBATStorageRequirements(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,5));
-		ByteArrayOutputStream output = new ByteArrayOutputStream(512);
-
-		block.writeBlocks(output);
-		byte[] copy = output.toByteArray();
-		String[] expected = {
-			"D0 CF 11 E0 A1 B1 1A E1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3B 00 03 00 FE FF 09 00",
-			"06 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 FE FF FF FF 00 00 00 00 00 10 00 00 FE FF FF FF",
-			"00 00 00 00 FE FF FF FF 00 00 00 00 67 45 23 01 68 45 23 01 69 45 23 01 6A 45 23 01 6B 45 23 01",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-
-		confirmEqual(expected, copy);
-
-		// second, a full set of blocks (109 blocks)
-		block = new HeaderBlockWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		xbats = block.setBATBlocks(109, 0x01234567);
-		assertEquals(0, xbats.length);
-		assertEquals(0, HeaderBlockWriter.calculateXBATStorageRequirements(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,109));
-		output = new ByteArrayOutputStream(512);
-		block.writeBlocks(output);
-		copy = output.toByteArray();
-		String[] expected2 = {
-			"D0 CF 11 E0 A1 B1 1A E1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3B 00 03 00 FE FF 09 00",
-			"06 00 00 00 00 00 00 00 00 00 00 00 6D 00 00 00 FE FF FF FF 00 00 00 00 00 10 00 00 FE FF FF FF",
-			"00 00 00 00 FE FF FF FF 00 00 00 00 67 45 23 01 68 45 23 01 69 45 23 01 6A 45 23 01 6B 45 23 01",
-			"6C 45 23 01 6D 45 23 01 6E 45 23 01 6F 45 23 01 70 45 23 01 71 45 23 01 72 45 23 01 73 45 23 01",
-			"74 45 23 01 75 45 23 01 76 45 23 01 77 45 23 01 78 45 23 01 79 45 23 01 7A 45 23 01 7B 45 23 01",
-			"7C 45 23 01 7D 45 23 01 7E 45 23 01 7F 45 23 01 80 45 23 01 81 45 23 01 82 45 23 01 83 45 23 01",
-			"84 45 23 01 85 45 23 01 86 45 23 01 87 45 23 01 88 45 23 01 89 45 23 01 8A 45 23 01 8B 45 23 01",
-			"8C 45 23 01 8D 45 23 01 8E 45 23 01 8F 45 23 01 90 45 23 01 91 45 23 01 92 45 23 01 93 45 23 01",
-			"94 45 23 01 95 45 23 01 96 45 23 01 97 45 23 01 98 45 23 01 99 45 23 01 9A 45 23 01 9B 45 23 01",
-			"9C 45 23 01 9D 45 23 01 9E 45 23 01 9F 45 23 01 A0 45 23 01 A1 45 23 01 A2 45 23 01 A3 45 23 01",
-			"A4 45 23 01 A5 45 23 01 A6 45 23 01 A7 45 23 01 A8 45 23 01 A9 45 23 01 AA 45 23 01 AB 45 23 01",
-			"AC 45 23 01 AD 45 23 01 AE 45 23 01 AF 45 23 01 B0 45 23 01 B1 45 23 01 B2 45 23 01 B3 45 23 01",
-			"B4 45 23 01 B5 45 23 01 B6 45 23 01 B7 45 23 01 B8 45 23 01 B9 45 23 01 BA 45 23 01 BB 45 23 01",
-			"BC 45 23 01 BD 45 23 01 BE 45 23 01 BF 45 23 01 C0 45 23 01 C1 45 23 01 C2 45 23 01 C3 45 23 01",
-			"C4 45 23 01 C5 45 23 01 C6 45 23 01 C7 45 23 01 C8 45 23 01 C9 45 23 01 CA 45 23 01 CB 45 23 01",
-			"CC 45 23 01 CD 45 23 01 CE 45 23 01 CF 45 23 01 D0 45 23 01 D1 45 23 01 D2 45 23 01 D3 45 23 01",
-		};
-		confirmEqual(expected2, copy);
-
-		// finally, a really large set of blocks (256 blocks)
-		block = new HeaderBlockWriter(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		xbats = block.setBATBlocks(256, 0x01234567);
-		assertEquals(2, xbats.length);
-		assertEquals(2, HeaderBlockWriter.calculateXBATStorageRequirements(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,256));
-		output = new ByteArrayOutputStream(512);
-		block.writeBlocks(output);
-		copy = output.toByteArray();
-		String[] expected3 = {
-			"D0 CF 11 E0 A1 B1 1A E1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3B 00 03 00 FE FF 09 00",
-			"06 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 FE FF FF FF 00 00 00 00 00 10 00 00 FE FF FF FF",
-			"00 00 00 00 67 46 23 01 02 00 00 00 67 45 23 01 68 45 23 01 69 45 23 01 6A 45 23 01 6B 45 23 01",
-			"6C 45 23 01 6D 45 23 01 6E 45 23 01 6F 45 23 01 70 45 23 01 71 45 23 01 72 45 23 01 73 45 23 01",
-			"74 45 23 01 75 45 23 01 76 45 23 01 77 45 23 01 78 45 23 01 79 45 23 01 7A 45 23 01 7B 45 23 01",
-			"7C 45 23 01 7D 45 23 01 7E 45 23 01 7F 45 23 01 80 45 23 01 81 45 23 01 82 45 23 01 83 45 23 01",
-			"84 45 23 01 85 45 23 01 86 45 23 01 87 45 23 01 88 45 23 01 89 45 23 01 8A 45 23 01 8B 45 23 01",
-			"8C 45 23 01 8D 45 23 01 8E 45 23 01 8F 45 23 01 90 45 23 01 91 45 23 01 92 45 23 01 93 45 23 01",
-			"94 45 23 01 95 45 23 01 96 45 23 01 97 45 23 01 98 45 23 01 99 45 23 01 9A 45 23 01 9B 45 23 01",
-			"9C 45 23 01 9D 45 23 01 9E 45 23 01 9F 45 23 01 A0 45 23 01 A1 45 23 01 A2 45 23 01 A3 45 23 01",
-			"A4 45 23 01 A5 45 23 01 A6 45 23 01 A7 45 23 01 A8 45 23 01 A9 45 23 01 AA 45 23 01 AB 45 23 01",
-			"AC 45 23 01 AD 45 23 01 AE 45 23 01 AF 45 23 01 B0 45 23 01 B1 45 23 01 B2 45 23 01 B3 45 23 01",
-			"B4 45 23 01 B5 45 23 01 B6 45 23 01 B7 45 23 01 B8 45 23 01 B9 45 23 01 BA 45 23 01 BB 45 23 01",
-			"BC 45 23 01 BD 45 23 01 BE 45 23 01 BF 45 23 01 C0 45 23 01 C1 45 23 01 C2 45 23 01 C3 45 23 01",
-			"C4 45 23 01 C5 45 23 01 C6 45 23 01 C7 45 23 01 C8 45 23 01 C9 45 23 01 CA 45 23 01 CB 45 23 01",
-			"CC 45 23 01 CD 45 23 01 CE 45 23 01 CF 45 23 01 D0 45 23 01 D1 45 23 01 D2 45 23 01 D3 45 23 01",
-		};
-
-		confirmEqual(expected3, copy);
-
-		output = new ByteArrayOutputStream(1028);
-		xbats[0].writeBlocks(output);
-		xbats[1].writeBlocks(output);
-		copy = output.toByteArray();
-		int correct = 0x012345D4;
-		int offset = 0;
-		int k = 0;
-
-		for (; k < 127; k++) {
-			assertEquals("XBAT entry " + k, correct, LittleEndian.getInt(copy, offset));
-			correct++;
-			offset += LittleEndianConsts.INT_SIZE;
-		}
-		assertEquals("XBAT Chain", 0x01234567 + 257, LittleEndian.getInt(copy, offset));
-		offset += LittleEndianConsts.INT_SIZE;
-		k++;
-		for (; k < 148; k++) {
-			assertEquals("XBAT entry " + k, correct, LittleEndian.getInt(copy, offset));
-			correct++;
-			offset += LittleEndianConsts.INT_SIZE;
-		}
-		for (; k < 255; k++) {
-			assertEquals("XBAT entry " + k, -1, LittleEndian.getInt(copy, offset));
-			offset += LittleEndianConsts.INT_SIZE;
-		}
-		assertEquals("XBAT End of chain", -2, LittleEndian.getInt(copy, offset));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java
deleted file mode 100644
index e4af23a..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.property.Property;
-import org.junit.Test;
-
-/**
- * Class to test PropertyBlock functionality
- */
-public final class TestPropertyBlock {
-
-    @Test
-    public void testCreatePropertyBlocks() throws Exception {
-
-        // test with 0 properties
-        List<Property> properties = new ArrayList<Property>();
-        BlockWritable[] blocks     =
-            PropertyBlock.createPropertyBlockArray(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,properties);
-
-        assertEquals(0, blocks.length);
-
-        // test with 1 property
-        properties.add(new LocalProperty("Root Entry"));
-        blocks = PropertyBlock.createPropertyBlockArray(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,properties);
-        assertEquals(1, blocks.length);
-        byte[] testblock = new byte[ 512 ];
-
-        for (int j = 0; j < 4; j++)
-        {
-            setDefaultBlock(testblock, j);
-        }
-        testblock[ 0x0000 ] = ( byte ) 'R';
-        testblock[ 0x0002 ] = ( byte ) 'o';
-        testblock[ 0x0004 ] = ( byte ) 'o';
-        testblock[ 0x0006 ] = ( byte ) 't';
-        testblock[ 0x0008 ] = ( byte ) ' ';
-        testblock[ 0x000A ] = ( byte ) 'E';
-        testblock[ 0x000C ] = ( byte ) 'n';
-        testblock[ 0x000E ] = ( byte ) 't';
-        testblock[ 0x0010 ] = ( byte ) 'r';
-        testblock[ 0x0012 ] = ( byte ) 'y';
-        testblock[ 0x0040 ] = ( byte ) 22;
-        verifyCorrect(blocks, testblock);
-
-        // test with 3 properties
-        properties.add(new LocalProperty("workbook"));
-        properties.add(new LocalProperty("summary"));
-        blocks = PropertyBlock.createPropertyBlockArray(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,properties);
-        assertEquals(1, blocks.length);
-        testblock[ 0x0080 ] = ( byte ) 'w';
-        testblock[ 0x0082 ] = ( byte ) 'o';
-        testblock[ 0x0084 ] = ( byte ) 'r';
-        testblock[ 0x0086 ] = ( byte ) 'k';
-        testblock[ 0x0088 ] = ( byte ) 'b';
-        testblock[ 0x008A ] = ( byte ) 'o';
-        testblock[ 0x008C ] = ( byte ) 'o';
-        testblock[ 0x008E ] = ( byte ) 'k';
-        testblock[ 0x00C0 ] = ( byte ) 18;
-        testblock[ 0x0100 ] = ( byte ) 's';
-        testblock[ 0x0102 ] = ( byte ) 'u';
-        testblock[ 0x0104 ] = ( byte ) 'm';
-        testblock[ 0x0106 ] = ( byte ) 'm';
-        testblock[ 0x0108 ] = ( byte ) 'a';
-        testblock[ 0x010A ] = ( byte ) 'r';
-        testblock[ 0x010C ] = ( byte ) 'y';
-        testblock[ 0x0140 ] = ( byte ) 16;
-        verifyCorrect(blocks, testblock);
-
-        // test with 4 properties
-        properties.add(new LocalProperty("wintery"));
-        blocks = PropertyBlock.createPropertyBlockArray(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,properties);
-        assertEquals(1, blocks.length);
-        testblock[ 0x0180 ] = ( byte ) 'w';
-        testblock[ 0x0182 ] = ( byte ) 'i';
-        testblock[ 0x0184 ] = ( byte ) 'n';
-        testblock[ 0x0186 ] = ( byte ) 't';
-        testblock[ 0x0188 ] = ( byte ) 'e';
-        testblock[ 0x018A ] = ( byte ) 'r';
-        testblock[ 0x018C ] = ( byte ) 'y';
-        testblock[ 0x01C0 ] = ( byte ) 16;
-        verifyCorrect(blocks, testblock);
-
-        // test with 5 properties
-        properties.add(new LocalProperty("foo"));
-        blocks = PropertyBlock.createPropertyBlockArray(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,properties);
-        assertEquals(2, blocks.length);
-        testblock = new byte[ 1024 ];
-        for (int j = 0; j < 8; j++)
-        {
-            setDefaultBlock(testblock, j);
-        }
-        testblock[ 0x0000 ] = ( byte ) 'R';
-        testblock[ 0x0002 ] = ( byte ) 'o';
-        testblock[ 0x0004 ] = ( byte ) 'o';
-        testblock[ 0x0006 ] = ( byte ) 't';
-        testblock[ 0x0008 ] = ( byte ) ' ';
-        testblock[ 0x000A ] = ( byte ) 'E';
-        testblock[ 0x000C ] = ( byte ) 'n';
-        testblock[ 0x000E ] = ( byte ) 't';
-        testblock[ 0x0010 ] = ( byte ) 'r';
-        testblock[ 0x0012 ] = ( byte ) 'y';
-        testblock[ 0x0040 ] = ( byte ) 22;
-        testblock[ 0x0080 ] = ( byte ) 'w';
-        testblock[ 0x0082 ] = ( byte ) 'o';
-        testblock[ 0x0084 ] = ( byte ) 'r';
-        testblock[ 0x0086 ] = ( byte ) 'k';
-        testblock[ 0x0088 ] = ( byte ) 'b';
-        testblock[ 0x008A ] = ( byte ) 'o';
-        testblock[ 0x008C ] = ( byte ) 'o';
-        testblock[ 0x008E ] = ( byte ) 'k';
-        testblock[ 0x00C0 ] = ( byte ) 18;
-        testblock[ 0x0100 ] = ( byte ) 's';
-        testblock[ 0x0102 ] = ( byte ) 'u';
-        testblock[ 0x0104 ] = ( byte ) 'm';
-        testblock[ 0x0106 ] = ( byte ) 'm';
-        testblock[ 0x0108 ] = ( byte ) 'a';
-        testblock[ 0x010A ] = ( byte ) 'r';
-        testblock[ 0x010C ] = ( byte ) 'y';
-        testblock[ 0x0140 ] = ( byte ) 16;
-        testblock[ 0x0180 ] = ( byte ) 'w';
-        testblock[ 0x0182 ] = ( byte ) 'i';
-        testblock[ 0x0184 ] = ( byte ) 'n';
-        testblock[ 0x0186 ] = ( byte ) 't';
-        testblock[ 0x0188 ] = ( byte ) 'e';
-        testblock[ 0x018A ] = ( byte ) 'r';
-        testblock[ 0x018C ] = ( byte ) 'y';
-        testblock[ 0x01C0 ] = ( byte ) 16;
-        testblock[ 0x0200 ] = ( byte ) 'f';
-        testblock[ 0x0202 ] = ( byte ) 'o';
-        testblock[ 0x0204 ] = ( byte ) 'o';
-        testblock[ 0x0240 ] = ( byte ) 8;
-        verifyCorrect(blocks, testblock);
-    }
-
-    private static void setDefaultBlock(byte [] testblock, int j)
-    {
-        int base  = j * 128;
-        int index = 0;
-
-        for (; index < 0x40; index++)
-        {
-            testblock[ base++ ] = ( byte ) 0;
-        }
-        testblock[ base++ ] = ( byte ) 2;
-        testblock[ base++ ] = ( byte ) 0;
-        index               += 2;
-        for (; index < 0x44; index++)
-        {
-            testblock[ base++ ] = ( byte ) 0;
-        }
-        for (; index < 0x50; index++)
-        {
-            testblock[ base++ ] = ( byte ) 0xff;
-        }
-        for (; index < 0x80; index++)
-        {
-            testblock[ base++ ] = ( byte ) 0;
-        }
-    }
-
-    private static void verifyCorrect(BlockWritable[] blocks, byte[] testblock)
-    throws IOException {
-        ByteArrayOutputStream stream = new ByteArrayOutputStream(512
-                                           * blocks.length);
-
-        for (BlockWritable b : blocks) {
-			b.writeBlocks(stream);
-        }
-        byte[] output = stream.toByteArray();
-
-        assertEquals(testblock.length, output.length);
-        for (int j = 0; j < testblock.length; j++) {
-            assertEquals("mismatch at offset " + j, testblock[ j ],
-                         output[ j ]);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlock.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlock.java
deleted file mode 100644
index ea995c1..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlock.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.util.DummyPOILogger;
-import org.apache.poi.util.POILogger;
-
-/**
- * Class to test RawDataBlock functionality
- *
- * @author Marc Johnson
- */
-public final class TestRawDataBlock extends TestCase {
-	/**
-	 * Test creating a normal RawDataBlock
-	 */
-	public void testNormalConstructor() throws IOException {
-		byte[] data = new byte[ 512 ];
-
-		for (int j = 0; j < 512; j++)
-		{
-			data[ j ] = ( byte ) j;
-		}
-		RawDataBlock block = new RawDataBlock(new ByteArrayInputStream(data));
-
-		assertTrue("Should not be at EOF", !block.eof());
-		byte[] out_data = block.getData();
-
-		assertEquals("Should be same length", data.length, out_data.length);
-		for (int j = 0; j < 512; j++)
-		{
-			assertEquals("Should be same value at offset " + j, data[ j ],
-						 out_data[ j ]);
-		}
-	}
-
-	/**
-	 * Test creating an empty RawDataBlock
-	 */
-	public void testEmptyConstructor() throws IOException {
-		byte[]	   data  = new byte[ 0 ];
-		RawDataBlock block = new RawDataBlock(new ByteArrayInputStream(data));
-
-		assertTrue("Should be at EOF", block.eof());
-		try
-		{
-			block.getData();
-		}
-		catch (IOException ignored)
-		{
-
-			// as expected
-		}
-	}
-
-	/**
-	 * Test creating a short RawDataBlock
-	 * Will trigger a warning, but no longer an IOException,
-	 *  as people seem to have "valid" truncated files
-	 */
-	public void testShortConstructor() throws Exception {
-		// Get the logger to be used
-	    POILogger oldLogger = RawDataBlock.log;
-		DummyPOILogger logger = new DummyPOILogger();
-		try {
-    		RawDataBlock.log = logger;
-    		assertEquals(0, logger.logged.size());
-    
-    		// Test for various data sizes
-    		for (int k = 1; k <= 512; k++)
-    		{
-    			byte[] data = new byte[ k ];
-    
-    			for (int j = 0; j < k; j++)
-    			{
-    				data[ j ] = ( byte ) j;
-    			}
-    			RawDataBlock block = null;
-    
-    			logger.reset();
-    			assertEquals(0, logger.logged.size());
-    
-    			// Have it created
-    			block = new RawDataBlock(new ByteArrayInputStream(data));
-    			assertNotNull(block);
-    
-    			// Check for the warning is there for <512
-    			if(k < 512) {
-    				assertEquals(
-    						"Warning on " + k + " byte short block",
-    						1, logger.logged.size()
-    				);
-    
-    				// Build the expected warning message, and check
-    				String bts = k + " byte";
-    				if(k > 1) {
-    					bts += "s";
-    				}
-    
-    				assertEquals(
-    						"7 - Unable to read entire block; "+bts+" read before EOF; expected 512 bytes. Your document was either written by software that ignores the spec, or has been truncated!",
-    						logger.logged.get(0)
-    				);
-    			} else {
-    				assertEquals(0, logger.logged.size());
-    			}
-    		}
-		} finally {
-		    RawDataBlock.log = oldLogger;
-		}
-	}
-
-	/**
-	 * Tests that when using a slow input stream, which
-	 *  won't return a full block at a time, we don't
-	 *  incorrectly think that there's not enough data
-	 */
-	public void testSlowInputStream() throws Exception {
-		// Get the logger to be used
-        POILogger oldLogger = RawDataBlock.log;
-        DummyPOILogger logger = new DummyPOILogger();
-        try {
-            RawDataBlock.log = logger;
-     		assertEquals(0, logger.logged.size());
-    
-    		// Test for various ok data sizes
-    		for (int k = 1; k < 512; k++) {
-    			byte[] data = new byte[ 512 ];
-    			for (int j = 0; j < data.length; j++) {
-    				data[j] = (byte) j;
-    			}
-    
-    			// Shouldn't complain, as there is enough data,
-    			//  even if it dribbles through
-    			RawDataBlock block =
-    				new RawDataBlock(new SlowInputStream(data, k));
-    			assertFalse(block.eof());
-    		}
-    
-    		// But if there wasn't enough data available, will
-    		//  complain
-    		for (int k = 1; k < 512; k++) {
-    			byte[] data = new byte[ 511 ];
-    			for (int j = 0; j < data.length; j++) {
-    				data[j] = (byte) j;
-    			}
-    
-    			logger.reset();
-    			assertEquals(0, logger.logged.size());
-    
-    			// Should complain, as there isn't enough data
-    			RawDataBlock block =
-    				new RawDataBlock(new SlowInputStream(data, k));
-    			assertNotNull(block);
-    			assertEquals(
-    					"Warning on " + k + " byte short block",
-    					1, logger.logged.size()
-    			);
-    		}
-        } finally {
-            RawDataBlock.log = oldLogger;
-        }
-	}
-
-	/**
-	 * An input stream which will return a maximum of
-	 *  a given number of bytes to read, and often claims
-	 *  not to have any data
-	 */
-	public static class SlowInputStream extends InputStream {
-		private final Random rnd = new Random();
-		private final byte[] data;
-		private final int chunkSize;
-		private int pos = 0;
-
-		public SlowInputStream(byte[] data, int chunkSize) {
-			this.chunkSize = chunkSize;
-			this.data = data;
-		}
-
-		/**
-		 * 75% of the time, claim there's no data available
-		 */
-		private boolean claimNoData() {
-			if(rnd.nextFloat() < 0.25f) {
-				return false;
-			}
-			return true;
-		}
-
-		@Override
-        public int read() {
-			if(pos >= data.length) {
-				return -1;
-			}
-			int ret = data[pos];
-			pos++;
-
-			if(ret < 0) ret += 256;
-			return ret;
-		}
-
-		/**
-		 * Reads the requested number of bytes, or the chunk
-		 *  size, whichever is lower.
-		 * Quite often will simply claim to have no data
-		 */
-		@Override
-        public int read(byte[] b, int off, int len) {
-			// Keep the length within the chunk size
-			if(len > chunkSize) {
-				len = chunkSize;
-			}
-			// Don't read off the end of the data
-			if(pos + len > data.length) {
-				len = data.length - pos;
-
-				// Spot when we're out of data
-				if(len == 0) {
-					return -1;
-				}
-			}
-
-			// 75% of the time, claim there's no data
-			if(claimNoData()) {
-				return 0;
-			}
-
-			// Copy, and return what we read
-			System.arraycopy(data, pos, b, off, len);
-			pos += len;
-			return len;
-		}
-
-		@Override
-        public int read(byte[] b) {
-			return read(b, 0, b.length);
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlockList.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlockList.java
deleted file mode 100644
index cc38bbc..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlockList.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.util.DummyPOILogger;
-import org.apache.poi.util.POILogger;
-
-/**
- * Class to test RawDataBlockList functionality
- *
- * @author Marc Johnson
- */
-public final class TestRawDataBlockList extends TestCase {
-    /**
-     * Test creating a normal RawDataBlockList
-     */
-    public void testNormalConstructor() throws IOException {
-        byte[] data = new byte[ 2560 ];
-
-        for (int j = 0; j < 2560; j++)
-        {
-            data[ j ] = ( byte ) j;
-        }
-        new RawDataBlockList(new ByteArrayInputStream(data), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-    }
-
-    /**
-     * Test creating an empty RawDataBlockList
-     */
-    public void testEmptyConstructor() throws IOException {
-        new RawDataBlockList(new ByteArrayInputStream(new byte[ 0 ]), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-    }
-
-    /**
-     * Test creating a short RawDataBlockList
-     */
-    public void testShortConstructor() throws Exception {
-        // Get the logger to be used
-        POILogger oldLogger = RawDataBlock.log;
-        DummyPOILogger logger = new DummyPOILogger();
-        try {
-            RawDataBlock.log = logger;
-            assertEquals(0, logger.logged.size());
-    
-            // Test for various short sizes
-            for (int k = 2049; k < 2560; k++)
-            {
-                byte[] data = new byte[ k ];
-    
-                for (int j = 0; j < k; j++)
-                {
-                    data[ j ] = ( byte ) j;
-                }
-    
-                // Check we logged the error
-                logger.reset();
-                new RawDataBlockList(new ByteArrayInputStream(data), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-                assertEquals(1, logger.logged.size());
-            }
-        } finally {
-            RawDataBlock.log = oldLogger;
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableReader.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableReader.java
deleted file mode 100644
index ee8ac39..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableReader.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.property.PropertyTable;
-import org.apache.poi.poifs.property.RootProperty;
-
-/**
- * Class to test SmallBlockTableReader functionality
- *
- * @author Marc Johnson
- */
-public final class TestSmallBlockTableReader extends TestCase {
-
-	public void testReadingConstructor() throws IOException {
-
-		// first, we need the raw data blocks
-		String[] raw_data_array = {
-			"52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"16 00 05 01 FF FF FF FF FF FF FF FF 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 80 07 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 01 01 FF FF FF FF FF FF FF FF 15 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"46 00 55 00 44 00 20 00 47 00 72 00 69 00 64 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00",
-			"74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2A 00 02 01 FF FF FF FF 0E 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"44 00 6F 00 75 00 62 00 6C 00 65 00 20 00 44 00 65 00 61 00 6C 00 69 00 6E 00 67 00 20 00 49 00",
-			"6E 00 64 00 69 00 63 00 61 00 74 00 6F 00 72 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"32 00 02 01 FF FF FF FF 09 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 68 00 69 00 6C 00 64 00 20 00 50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00",
-			"20 00 50 00 65 00 72 00 6D 00 69 00 74 00 74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"36 00 02 01 FF FF FF FF 07 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 46 00 69 00 78 00 65 00 64 00 20 00 56 00 61 00 6C 00 75 00 65 00 00 00 00 00 00 00 00 00",
-			"3A 00 02 01 FF FF FF FF 06 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00 00 00 04 00 00 00 00 00 00 00",
-			"55 00 6D 00 62 00 72 00 65 00 6C 00 6C 00 61 00 20 00 4C 00 69 00 6E 00 6B 00 73 00 20 00 61 00",
-			"6E 00 64 00 20 00 50 00 61 00 73 00 73 00 65 00 6E 00 67 00 65 00 72 00 73 00 00 00 00 00 00 00",
-			"3C 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00 00 00 00 00 00 00 00 00 00 00",
-			"38 00 02 01 FF FF FF FF 05 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00 00 00 04 00 00 00 00 00 00 00",
-			"49 00 6E 00 66 00 61 00 6E 00 74 00 20 00 44 00 69 00 73 00 63 00 6F 00 75 00 6E 00 74 00 20 00",
-			"50 00 65 00 72 00 6D 00 69 00 74 00 74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"34 00 02 01 FF FF FF FF 04 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 04 00 00 00 00 00 00 00",
-			"43 00 61 00 6E 00 63 00 65 00 6C 00 6C 00 61 00 74 00 69 00 6F 00 6E 00 20 00 46 00 65 00 65 00",
-			"20 00 43 00 75 00 72 00 72 00 65 00 6E 00 63 00 79 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"34 00 02 01 FF FF FF FF 08 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 07 00 00 00 00 00 00 00",
-			"4F 00 75 00 74 00 62 00 6F 00 75 00 6E 00 64 00 20 00 54 00 72 00 61 00 76 00 65 00 6C 00 20 00",
-			"44 00 61 00 74 00 65 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 FF FF FF FF 0B 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 06 00 00 00 21 00 00 00 00 00 00 00",
-			"42 00 75 00 73 00 69 00 6E 00 65 00 73 00 73 00 20 00 4A 00 75 00 73 00 74 00 69 00 66 00 69 00",
-			"63 00 61 00 74 00 69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2E 00 02 01 FF FF FF FF 03 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 07 00 00 00 04 00 00 00 00 00 00 00",
-			"49 00 6E 00 66 00 61 00 6E 00 74 00 20 00 44 00 69 00 73 00 63 00 6F 00 75 00 6E 00 74 00 20 00",
-			"56 00 61 00 6C 00 75 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 FF FF FF FF 0D 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 00 00 00 04 00 00 00 00 00 00 00",
-			"4F 00 74 00 68 00 65 00 72 00 20 00 43 00 61 00 72 00 72 00 69 00 65 00 72 00 20 00 53 00 65 00",
-			"63 00 74 00 6F 00 72 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2C 00 02 01 FF FF FF FF 0A 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 09 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 75 00 6D 00 62 00 65 00 72 00 20 00 6F 00 66 00 20 00 50 00 61 00 73 00 73 00 65 00 6E 00",
-			"67 00 65 00 72 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"2A 00 02 01 FF FF FF FF 0C 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 61 00 6C 00 65 00 73 00 20 00 41 00 72 00 65 00 61 00 20 00 43 00 6F 00 64 00 65 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 02 01 1C 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0B 00 00 00 04 00 00 00 00 00 00 00",
-			"4F 00 74 00 68 00 65 00 72 00 20 00 52 00 65 00 66 00 75 00 6E 00 64 00 20 00 54 00 65 00 78 00",
-			"74 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"24 00 02 01 17 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0C 00 00 00 04 00 00 00 00 00 00 00",
-			"4D 00 61 00 78 00 69 00 6D 00 75 00 6D 00 20 00 53 00 74 00 61 00 79 00 20 00 50 00 65 00 72 00",
-			"69 00 6F 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 14 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0D 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 65 00 74 00 20 00 52 00 65 00 6D 00 69 00 74 00 20 00 50 00 65 00 72 00 6D 00 69 00 74 00",
-			"74 00 65 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 13 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0E 00 00 00 04 00 00 00 00 00 00 00",
-			"50 00 65 00 72 00 63 00 65 00 6E 00 74 00 61 00 67 00 65 00 20 00 6F 00 66 00 20 00 59 00 69 00",
-			"65 00 6C 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 02 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0F 00 00 00 04 00 00 00 00 00 00 00",
-			"4E 00 61 00 74 00 75 00 72 00 65 00 20 00 6F 00 66 00 20 00 56 00 61 00 72 00 69 00 61 00 74 00",
-			"69 00 6F 00 6E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 FF FF FF FF 12 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10 00 00 00 50 00 00 00 00 00 00 00",
-			"46 00 55 00 44 00 20 00 47 00 72 00 69 00 64 00 20 00 44 00 69 00 6D 00 65 00 6E 00 73 00 69 00",
-			"6F 00 6E 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"28 00 02 01 10 00 00 00 11 00 00 00 FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 12 00 00 00 04 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 44 00 65 00 73 00 63 00 72 00 69 00 70 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 19 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 13 00 00 00 09 00 00 00 00 00 00 00",
-			"54 00 52 00 56 00 41 00 20 00 49 00 6E 00 66 00 6F 00 72 00 6D 00 61 00 74 00 69 00 6F 00 6E 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 18 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 04 00 00 00 00 00 00 00",
-			"50 00 72 00 6F 00 72 00 61 00 74 00 65 00 20 00 43 00 6F 00 6D 00 6D 00 65 00 6E 00 74 00 73 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 16 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"43 00 6F 00 6D 00 6D 00 69 00 73 00 73 00 69 00 6F 00 6E 00 20 00 56 00 61 00 6C 00 75 00 65 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"22 00 02 01 0F 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 15 00 00 00 04 00 00 00 00 00 00 00",
-			"4D 00 61 00 78 00 69 00 6D 00 75 00 6D 00 20 00 53 00 74 00 61 00 79 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1A 00 02 01 20 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16 00 00 00 05 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 43 00 75 00 72 00 72 00 65 00 6E 00 63 00 79 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 02 01 1D 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 17 00 00 00 07 00 00 00 00 00 00 00",
-			"43 00 6F 00 6E 00 73 00 6F 00 72 00 74 00 69 00 61 00 20 00 43 00 6F 00 64 00 65 00 73 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"20 00 02 01 1B 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"42 00 75 00 73 00 69 00 6E 00 65 00 73 00 73 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"1C 00 02 01 1A 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 18 00 00 00 04 00 00 00 00 00 00 00",
-			"44 00 65 00 61 00 6C 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 23 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 19 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 75 00 72 00 63 00 68 00 61 00 72 00 67 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 21 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1A 00 00 00 04 00 00 00 00 00 00 00",
-			"41 00 67 00 65 00 6E 00 74 00 73 00 20 00 4E 00 61 00 6D 00 65 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"18 00 02 01 1F 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1B 00 00 00 04 00 00 00 00 00 00 00",
-			"46 00 61 00 72 00 65 00 20 00 54 00 79 00 70 00 65 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 1E 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1C 00 00 00 04 00 00 00 00 00 00 00",
-			"53 00 75 00 62 00 20 00 44 00 65 00 61 00 6C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"12 00 02 01 24 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1D 00 00 00 04 00 00 00 00 00 00 00",
-			"41 00 4C 00 43 00 20 00 43 00 6F 00 64 00 65 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"14 00 02 01 22 00 00 00 FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"52 00 65 00 6D 00 61 00 72 00 6B 00 73 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"10 00 02 01 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 03 00 47 42 50 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 1D 00 28 41 29 31 36 2D 4F 63 74 2D 32 30 30 31 20 74 6F 20 31 36 2D 4F 63 74 2D 32 30 30",
-			"31 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 01 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00",
-			"02 00 00 00 08 00 00 00 02 00 00 00 08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 18 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 05 00 6A 61 6D 65 73 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 01 00 31 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 03 00 47 42 50 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"08 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"02 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"11 00 00 00 FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FE FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"01 00 00 00 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00 06 00 00 00 07 00 00 00 08 00 00 00",
-			"09 00 00 00 FE FF FF FF 0B 00 00 00 0C 00 00 00 0D 00 00 00 FE FF FF FF FE FF FF FF FE FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-			"FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF",
-		};
-
-		RawDataBlockList data_blocks = new RawDataBlockList(new ByteArrayInputStream(RawDataUtil
-				.decode(raw_data_array)), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		int[] bat_array = { 15 };
-
-		// need to initialize the block list with a block allocation
-		// table
-		new BlockAllocationTableReader(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, 1, bat_array, 0, -2, data_blocks);
-		
-		// Fake up a header
-		HeaderBlock header_block = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-		header_block.setPropertyStart(0);
-
-		// get property table from the document
-		PropertyTable properties = new PropertyTable(header_block, data_blocks);
-		RootProperty root = properties.getRoot();
-		BlockList bl = SmallBlockTableReader.getSmallDocumentBlocks(
-		      POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, data_blocks, root, 14);
-		assertNotNull(bl);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java
deleted file mode 100644
index 9bb4f6a..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-import org.apache.poi.poifs.filesystem.OPOIFSDocument;
-import org.apache.poi.poifs.property.PropertyTable;
-import org.apache.poi.poifs.property.RootProperty;
-
-/**
- * Class to test SmallBlockTableWriter functionality
- *
- * @author Marc Johnson
- */
-public final class TestSmallBlockTableWriter extends TestCase {
-
-    public void testWritingConstructor() throws IOException {
-        List<OPOIFSDocument> documents = new ArrayList<OPOIFSDocument>();
-
-        documents.add(
-            new OPOIFSDocument(
-                "doc340", new ByteArrayInputStream(new byte[ 340 ])));
-        documents.add(
-            new OPOIFSDocument(
-                "doc5000", new ByteArrayInputStream(new byte[ 5000 ])));
-        documents
-            .add(new OPOIFSDocument("doc0",
-                                   new ByteArrayInputStream(new byte[ 0 ])));
-        documents
-            .add(new OPOIFSDocument("doc1",
-                                   new ByteArrayInputStream(new byte[ 1 ])));
-        documents
-            .add(new OPOIFSDocument("doc2",
-                                   new ByteArrayInputStream(new byte[ 2 ])));
-        documents
-            .add(new OPOIFSDocument("doc3",
-                                   new ByteArrayInputStream(new byte[ 3 ])));
-        documents
-            .add(new OPOIFSDocument("doc4",
-                                   new ByteArrayInputStream(new byte[ 4 ])));
-        documents
-            .add(new OPOIFSDocument("doc5",
-                                   new ByteArrayInputStream(new byte[ 5 ])));
-        documents
-            .add(new OPOIFSDocument("doc6",
-                                   new ByteArrayInputStream(new byte[ 6 ])));
-        documents
-            .add(new OPOIFSDocument("doc7",
-                                   new ByteArrayInputStream(new byte[ 7 ])));
-        documents
-            .add(new OPOIFSDocument("doc8",
-                                   new ByteArrayInputStream(new byte[ 8 ])));
-        documents
-            .add(new OPOIFSDocument("doc9",
-                                   new ByteArrayInputStream(new byte[ 9 ])));
-        
-        HeaderBlock              header = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-        RootProperty               root = new PropertyTable(header).getRoot();
-        SmallBlockTableWriter      sbtw = new SmallBlockTableWriter(
-              POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, documents,root);
-        BlockAllocationTableWriter bat  = sbtw.getSBAT();
-
-        // 15 small blocks: 6 for doc340, 0 for doc5000 (too big), 0
-        // for doc0 (no storage needed), 1 each for doc1 through doc9
-        assertEquals(15 * 64, root.getSize());
-
-        // 15 small blocks rounds up to 2 big blocks
-        assertEquals(2, sbtw.countBlocks());
-        int start_block = 1000 + root.getStartBlock();
-
-        sbtw.setStartBlock(start_block);
-        assertEquals(start_block, root.getStartBlock());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java
deleted file mode 100644
index 2d6ef18..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-
-/**
- * Class to test SmallDocumentBlock functionality
- *
- * @author Marc Johnson
- */
-public final class TestSmallDocumentBlock extends TestCase {
-    static final private byte[] _testdata;
-    static final private int    _testdata_size = 2999;
-
-    static
-    {
-        _testdata = new byte[ _testdata_size ];
-        for (int j = 0; j < _testdata.length; j++)
-        {
-            _testdata[ j ] = ( byte ) j;
-        }
-    }
-
-    /**
-     * Test conversion from DocumentBlocks
-     */
-    public void testConvert1()
-        throws IOException
-    {
-        ByteArrayInputStream stream    = new ByteArrayInputStream(_testdata);
-        List<DocumentBlock> documents  = new ArrayList<DocumentBlock>();
-
-        while (true)
-        {
-            DocumentBlock block = new DocumentBlock(stream,POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS);
-
-            documents.add(block);
-            if (block.partiallyRead())
-            {
-                break;
-            }
-        }
-        SmallDocumentBlock[] results =
-            SmallDocumentBlock.convert(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,
-                          documents.toArray(new DocumentBlock[ 0 ]), _testdata_size);
-
-        assertEquals("checking correct result size: ",
-                     (_testdata_size + 63) / 64, results.length);
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-
-        for (SmallDocumentBlock result : results) {
-            result.writeBlocks(output);
-        }
-        byte[] output_array = output.toByteArray();
-
-        assertEquals("checking correct output size: ", 64 * results.length,
-                     output_array.length);
-        int index = 0;
-
-        for (; index < _testdata_size; index++)
-        {
-            assertEquals("checking output " + index, _testdata[ index ],
-                         output_array[ index ]);
-        }
-        for (; index < output_array.length; index++)
-        {
-            assertEquals("checking output " + index, ( byte ) 0xff,
-                         output_array[ index ]);
-        }
-    }
-
-    /**
-     * Test conversion from byte array
-     */
-    public void testConvert2()
-        throws IOException
-    {
-        for (int j = 0; j < 320; j++)
-        {
-            byte[] array = new byte[ j ];
-
-            for (int k = 0; k < j; k++)
-            {
-                array[ k ] = ( byte ) k;
-            }
-            SmallDocumentBlock[] blocks = SmallDocumentBlock.convert(
-                  POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, array, 319);
-
-            assertEquals(5, blocks.length);
-            ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-            for (SmallDocumentBlock block : blocks) {
-                block.writeBlocks(stream);
-            }
-            stream.close();
-            byte[] output = stream.toByteArray();
-
-            for (int k = 0; k < array.length; k++)
-            {
-                assertEquals(String.valueOf(k), array[ k ], output[ k ]);
-            }
-            for (int k = array.length; k < 320; k++)
-            {
-                assertEquals(String.valueOf(k), ( byte ) 0xFF, output[ k ]);
-            }
-        }
-    }
-
-    /**
-     * test fill
-     */
-    public void testFill()
-        throws IOException
-    {
-        for (int j = 0; j <= 8; j++)
-        {
-            List<SmallDocumentBlock> blocks = new ArrayList<SmallDocumentBlock>();
-
-            for (int k = 0; k < j; k++)
-            {
-                blocks.add(new SmallDocumentBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS));
-            }
-            int result = SmallDocumentBlock.fill(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS, blocks);
-
-            assertEquals("correct big block count: ", (j + 7) / 8, result);
-            assertEquals("correct small block count: ", 8 * result,
-                         blocks.size());
-            for (int m = j; m < blocks.size(); m++)
-            {
-                BlockWritable         block  = blocks.get(m);
-                ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-                block.writeBlocks(stream);
-                byte[] output = stream.toByteArray();
-
-                assertEquals("correct output size (block[ " + m + " ]): ",
-                             64, output.length);
-                for (int n = 0; n < 64; n++)
-                {
-                    assertEquals("correct value (block[ " + m + " ][ " + n
-                                 + " ]): ", ( byte ) 0xff, output[ n ]);
-                }
-            }
-        }
-    }
-
-    /**
-     * test calcSize
-     */
-
-    public void testCalcSize()
-    {
-        for (int j = 0; j < 10; j++)
-        {
-            assertEquals("testing " + j, j * 64,
-                         SmallDocumentBlock.calcSize(j));
-        }
-    }
-
-    /**
-     * test extract method
-     *
-     * @exception IOException
-     */
-
-    public void testExtract()
-        throws IOException
-    {
-        byte[] data   = new byte[ 512 ];
-        int    offset = 0;
-
-        for (int j = 0; j < 8; j++)
-        {
-            for (int k = 0; k < 64; k++)
-            {
-                data[ offset++ ] = ( byte ) (k + j);
-            }
-        }
-        RawDataBlock[] blocks =
-        {
-            new RawDataBlock(new ByteArrayInputStream(data))
-        };
-        List<SmallDocumentBlock> output = SmallDocumentBlock.extract(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,blocks);
-
-        offset = 0;
-        for (SmallDocumentBlock block : output)
-        {
-            byte[] out_data = block.getData();
-
-            assertEquals("testing block at offset " + offset, 64,
-                         out_data.length);
-            for (byte b : out_data) {
-                assertEquals("testing byte at offset " + offset,
-                             data[ offset ], b);
-                offset++;
-            }
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlockList.java b/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlockList.java
deleted file mode 100644
index 5301214..0000000
--- a/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlockList.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.poifs.storage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.apache.poi.poifs.common.POIFSConstants;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test SmallDocumentBlockList functionality
- *
- * @author Marc Johnson
- */
-public final class TestSmallDocumentBlockList extends TestCase {
-
-    public void testConstructor() throws IOException {
-        byte[] data = new byte[ 2560 ];
-
-        for (int j = 0; j < 2560; j++)
-        {
-            data[ j ] = ( byte ) j;
-        }
-        ByteArrayInputStream stream = new ByteArrayInputStream(data);
-        RawDataBlock[]       blocks = new RawDataBlock[ 5 ];
-
-        for (int j = 0; j < 5; j++)
-        {
-            blocks[ j ] = new RawDataBlock(stream);
-        }
-        SmallDocumentBlockList sdbl =
-            new SmallDocumentBlockList(SmallDocumentBlock.extract(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,blocks));
-
-        // proof we added the blocks
-        for (int j = 0; j < 40; j++)
-        {
-            sdbl.remove(j);
-        }
-        try
-        {
-            sdbl.remove(41);
-            fail("there should have been an Earth-shattering ka-boom!");
-        }
-        catch (IOException ignored)
-        {
-
-            // it better have thrown one!!
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/sl/TestCommonSL.java b/trunk/src/testcases/org/apache/poi/sl/TestCommonSL.java
deleted file mode 100644
index ab27ca4..0000000
--- a/trunk/src/testcases/org/apache/poi/sl/TestCommonSL.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.sl;
-
-import java.awt.Color;
-
-import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.usermodel.PaintStyle;
-import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
-import org.junit.Ignore;
-
-/**
- * Currently only contains helper methods
- */
-@Ignore
-public class TestCommonSL {
-
-    public static boolean sameColor(Color colorExpected, PaintStyle paintActual) {
-        if (!(paintActual instanceof SolidPaint)) return false;
-        Color thisC = DrawPaint.applyColorTransform(((SolidPaint)paintActual).getSolidColor());
-        return thisC.equals(colorExpected);
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java b/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
deleted file mode 100644
index 43a4083..0000000
--- a/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-package org.apache.poi.sl.draw.geom;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class TestPresetGeometries {
-    @Test
-    public void testRead(){
-        Map<String, CustomGeometry> shapes = PresetGeometries.getInstance();
-        assertEquals(187, shapes.size());
-
-        for(String name : shapes.keySet()) {
-            CustomGeometry geom = shapes.get(name);
-            Context ctx = new Context(geom, new Rectangle2D.Double(0, 0, 100, 100), new IAdjustableShape() {
-                @Override
-                public Guide getAdjustValue(String presetName) {
-                    return null;
-                }
-            });
-            for(Path p : geom){
-                Path2D path = p.getPath(ctx);
-                assertNotNull(path);
-            }
-        }
-        
-        // we get the same instance on further calls
-        assertTrue(shapes == PresetGeometries.getInstance());
-    }
-
-    // helper methods to adjust list of presets for other tests
-    public static void clearPreset() {
-        // ensure that we are initialized
-        assertNotNull(PresetGeometries.getInstance());
-        
-        // test handling if some presets are not found
-        PresetGeometries._inst.clear();
-    }
-    
-    public static void resetPreset() {
-        PresetGeometries._inst = null;
-    }
-
-    @Test
-    public void testCheckXMLParser() throws Exception{
-        // Gump reports a strange error because of an unavailable XML Parser, let's try to find out where 
-        // this comes from
-        // 
-        Enumeration<URL> resources = this.getClass().getClassLoader().getResources("META-INF/services/javax.xml.stream.XMLEventFactory");
-        printURLs(resources);
-        resources = ClassLoader.getSystemResources("META-INF/services/javax.xml.stream.XMLEventFactory");
-        printURLs(resources);
-        resources = ClassLoader.getSystemResources("org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml");
-        printURLs(resources);
-    }
-
-    private void printURLs(Enumeration<URL> resources) {
-        while(resources.hasMoreElements()) {
-            URL url = resources.nextElement();
-            System.out.println("URL: " + url);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java b/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
deleted file mode 100644
index e022608..0000000
--- a/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.sl.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.junit.Test;
-
-public abstract class BaseTestSlideShow {
-    protected static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-    
-    public abstract SlideShow<?, ?> createSlideShow();
-    
-    @Test
-    public void addPicture_File() throws IOException {
-        SlideShow<?,?> show = createSlideShow();
-        File f = slTests.getFile("clock.jpg");
-        
-        assertEquals(0, show.getPictureData().size());
-        PictureData picture = show.addPicture(f, PictureType.JPEG);
-        assertEquals(1, show.getPictureData().size());
-        assertSame(picture, show.getPictureData().get(0));
-        
-        show.close();
-    }
-    
-    @Test
-    public void addPicture_Stream() throws IOException {
-        SlideShow<?,?> show = createSlideShow();
-        try {
-            InputStream stream = slTests.openResourceAsStream("clock.jpg");
-            try {
-                assertEquals(0, show.getPictureData().size());
-                PictureData picture = show.addPicture(stream, PictureType.JPEG);
-                assertEquals(1, show.getPictureData().size());
-                assertSame(picture, show.getPictureData().get(0));
-
-            } finally {
-                stream.close();
-            }
-        } finally {
-            show.close();
-        }
-    }
-    
-    @Test
-    public void addPicture_ByteArray() throws IOException {
-        SlideShow<?,?> show = createSlideShow();
-        byte[] data = slTests.readFile("clock.jpg");
-        
-        assertEquals(0, show.getPictureData().size());
-        PictureData picture = show.addPicture(data, PictureType.JPEG);
-        assertEquals(1, show.getPictureData().size());
-        assertSame(picture, show.getPictureData().get(0));
-        
-        show.close();
-    }
-    
-    @Test
-    public void findPicture() throws IOException {
-        SlideShow<?,?> show = createSlideShow();
-        byte[] data = slTests.readFile("clock.jpg");
-        
-        assertNull(show.findPictureData(data));
-        PictureData picture = show.addPicture(data, PictureType.JPEG);
-        PictureData found = show.findPictureData(data);
-        assertNotNull(found);
-        assertEquals(picture, found);
-        
-        show.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java b/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
deleted file mode 100644
index 1686790..0000000
--- a/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-
-public class BaseTestSlideShowFactory {
-    private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
-
-    @SuppressWarnings("resource")
-    protected static void testFactoryFromFile(String file) throws Exception {
-        SlideShow<?,?> ss;
-        // from file
-        ss = SlideShowFactory.create(fromFile(file));
-        assertNotNull(ss);
-        assertCloseDoesNotModifyFile(file, ss);
-    }
-
-    @SuppressWarnings("resource")
-    protected static void testFactoryFromStream(String file) throws Exception {
-        SlideShow<?,?> ss;
-        // from stream
-        ss = SlideShowFactory.create(fromStream(file));
-        assertNotNull(ss);
-        assertCloseDoesNotModifyFile(file, ss);
-    }
-
-    @SuppressWarnings("resource")
-    protected static void testFactoryFromNative(String file) throws Exception {
-        SlideShow<?,?> ss;
-        // from NPOIFS
-        if (file.endsWith(".ppt")) {
-            NPOIFSFileSystem npoifs = new NPOIFSFileSystem(fromFile(file));
-            ss = SlideShowFactory.create(npoifs);
-            assertNotNull(ss);
-            npoifs.close();
-            assertCloseDoesNotModifyFile(file, ss);
-        }
-        // from OPCPackage
-        else if (file.endsWith(".pptx")) {
-            // not implemented
-            throw new UnsupportedOperationException("Test not implemented");
-        }
-        else {
-            fail("Unexpected file extension: " + file);
-        }
-    }
-
-    @SuppressWarnings("resource")
-    protected static void testFactoryFromProtectedFile(String protectedFile, String password) throws Exception {
-        SlideShow<?,?> ss;
-        // from protected file 
-        ss = SlideShowFactory.create(fromFile(protectedFile), password);
-        assertNotNull(ss);
-        assertCloseDoesNotModifyFile(protectedFile, ss);
-    }
-
-    @SuppressWarnings("resource")
-    protected static void testFactoryFromProtectedStream(String protectedFile, String password) throws Exception {
-        SlideShow<?,?> ss;
-        // from protected stream
-        ss = SlideShowFactory.create(fromStream(protectedFile), password);
-        assertNotNull(ss);
-        assertCloseDoesNotModifyFile(protectedFile, ss);
-    }
-
-    @SuppressWarnings("resource")
-    protected static void testFactoryFromProtectedNative(String protectedFile, String password) throws Exception {
-        SlideShow<?,?> ss;
-        // Encryption layer is a BIFF8 binary format that can be read by NPOIFSFileSystem,
-        // used for both HSLF and XSLF
-
-        // from protected NPOIFS
-        if (protectedFile.endsWith(".ppt") || protectedFile.endsWith(".pptx")) {
-            NPOIFSFileSystem npoifs = new NPOIFSFileSystem(fromFile(protectedFile));
-            ss = SlideShowFactory.create(npoifs, password);
-            assertNotNull(ss);
-            npoifs.close();
-            assertCloseDoesNotModifyFile(protectedFile, ss);
-        }
-        else {
-            fail("Unrecognized file extension: " + protectedFile);
-        }
-    }
-
-    public static void testFactory(String file, String protectedFile, String password)
-    throws Exception {
-        testFactoryFromFile(file);
-        testFactoryFromStream(file);
-        testFactoryFromNative(file);
-
-        testFactoryFromProtectedFile(protectedFile, password);
-        testFactoryFromProtectedStream(protectedFile, password);
-        testFactoryFromProtectedNative(protectedFile, password);
-    }
-
-    /**
-     * reads either a test-data file (filename) or a file outside the test-data folder (full path)
-     */
-    private static byte[] readFile(String filename) {
-        byte[] bytes;
-        try {
-            bytes = _slTests.readFile(filename);
-        } catch (final RuntimeException e) {
-            if (!e.getMessage().startsWith("Sample file '" + filename + "' not found in data dir")) {
-                throw e;
-            }
-            bytes = readExternalFile(filename);
-        }
-        return bytes;
-    }
-
-    private static byte[] readExternalFile(String path) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-        try {
-            InputStream fis = new FileInputStream(path);
-            byte[] buf = new byte[512];
-            while (true) {
-                int bytesRead = fis.read(buf);
-                if (bytesRead < 1) {
-                    break;
-                }
-                baos.write(buf, 0, bytesRead);
-            }
-            fis.close();
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-        final byte[] bytes = baos.toByteArray();
-        return bytes;
-    }
-
-    /**
-     * FIXME:
-     * bug 58779: Closing an XMLSlideShow that was created with {@link SlideShowFactory#create(File)} modifies the file
-     *
-     * @param filename the sample filename or full path of the slideshow to check before and after closing
-     * @param ss the slideshow to close or revert
-     * @throws IOException
-     */
-    private static void assertCloseDoesNotModifyFile(String filename, SlideShow<?,?> ss) throws IOException {
-        final byte[] before = readFile(filename);
-        ss.close();
-        final byte[] after = readFile(filename);
-
-        try {
-            assertArrayEquals(filename + " sample file was modified as a result of closing the slideshow",
-                    before, after);
-        } catch (AssertionError e) {
-            // if the file after closing is different, then re-set 
-            // the file to the state before in order to not have a dirty SCM 
-            // working tree when running this test
-            FileOutputStream str = new FileOutputStream(_slTests.getFile(filename));
-            try {
-                str.write(before);
-            } finally {
-                str.close();
-            }
-            
-            throw e;
-        }
-    }
-
-    private static File fromFile(String file) {
-        return (file.contains("/") || file.contains("\\"))
-            ? new File(file)
-            : _slTests.getFile(file);
-    }
-
-    private static InputStream fromStream(String file) throws IOException {
-        return (file.contains("/") || file.contains("\\"))
-            ? new FileInputStream(file)
-            : _slTests.openResourceAsStream(file);
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/ITestDataProvider.java b/trunk/src/testcases/org/apache/poi/ss/ITestDataProvider.java
deleted file mode 100644
index e258e1a..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/ITestDataProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss;
-
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * Encapsulates a provider of test data for common HSSF / XSSF tests.
- */
-public interface ITestDataProvider {
-    /**
-     * Provides HSSF / XSSF specific way for re-serialising a workbook
-     *
-     * @param wb the workbook to re-serialize
-     * @return the re-serialized workbook
-     */
-    Workbook writeOutAndReadBack(Workbook wb);
-
-    /**
-     * Provides way of loading HSSF / XSSF sample workbooks
-     *
-     * @param sampleFileName the file name to load
-     * @return an instance of Workbook loaded from the supplied file name
-     */
-    Workbook openSampleWorkbook(String sampleFileName);
-
-    /**
-     * Provides way of creating HSSF / XSSF workbooks
-     * @return an instance of Workbook
-     */
-    Workbook createWorkbook();
-    
-    
-    //************ SXSSF-specific methods ***************//
-    /**
-     * Provides way of creating a SXSSFWorkbook with a specific row access window size.
-     * Equivalent to createWorkbook on others.
-     * @return an instance of Workbook
-     */
-    Workbook createWorkbook(int rowAccessWindowSize);
-    
-    /**
-     * Only matters for SXSSF - enables tracking of the column
-     *  widths so that autosizing can work. No-op on others.
-     */
-    void trackAllColumnsForAutosizing(Sheet sheet);
-    //************ End SXSSF-specific methods ***************//
-
-    /**
-     * Creates the corresponding {@link FormulaEvaluator} for the
-     * type of Workbook handled by this Provider. 
-     *
-     * @param wb The workbook to base the formula evaluator on.
-     * @return A new instance of a matching type of formula evaluator. 
-     */
-    FormulaEvaluator createFormulaEvaluator(Workbook wb);
-
-    /**
-     * Opens a sample file from the standard HSSF test data directory
-     *
-     * @return an open <tt>InputStream</tt> for the specified sample file
-     */
-    byte[] getTestDataFileContent(String fileName);
-
-    SpreadsheetVersion getSpreadsheetVersion();
-
-    /**
-     * @return "xls" or "xlsx"
-     */
-    String getStandardFileNameExtension();
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java b/trunk/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java
deleted file mode 100644
index 93b549e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss;
-
-import junit.framework.TestCase;
-
-/**
- * Check that all enum values are properly set
- *
- * @author Yegor Kozlov
- */
-public final class TestSpreadsheetVersion extends TestCase {
-
-    public void testExcel97(){
-        SpreadsheetVersion v = SpreadsheetVersion.EXCEL97;
-        assertEquals(1 << 8, v.getMaxColumns());
-        assertEquals(v.getMaxColumns() - 1, v.getLastColumnIndex());
-        assertEquals(1 << 16, v.getMaxRows());
-        assertEquals(v.getMaxRows() - 1, v.getLastRowIndex());
-        assertEquals(30, v.getMaxFunctionArgs());
-        assertEquals(3, v.getMaxConditionalFormats());
-        assertEquals("IV", v.getLastColumnName());
-    }
-
-    public void testExcel2007(){
-        SpreadsheetVersion v = SpreadsheetVersion.EXCEL2007;
-        assertEquals(1 << 14, v.getMaxColumns());
-        assertEquals(v.getMaxColumns() - 1, v.getLastColumnIndex());
-        assertEquals(1 << 20, v.getMaxRows());
-        assertEquals(v.getMaxRows() - 1, v.getLastRowIndex());
-        assertEquals(255, v.getMaxFunctionArgs());
-        assertEquals(Integer.MAX_VALUE, v.getMaxConditionalFormats());
-        assertEquals("XFD", v.getLastColumnName());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java b/trunk/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java
deleted file mode 100644
index d28ac88..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import static java.awt.Color.BLACK;
-import static java.awt.Color.BLUE;
-import static java.awt.Color.CYAN;
-import static java.awt.Color.GREEN;
-import static java.awt.Color.MAGENTA;
-import static java.awt.Color.ORANGE;
-import static java.awt.Color.RED;
-import static java.awt.Color.WHITE;
-import static java.awt.Color.YELLOW;
-import static org.junit.Assert.assertEquals;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import javax.swing.JLabel;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * This class is a base class for spreadsheet-based tests, such as are used for
- * cell formatting.  This reads tests from the spreadsheet, as well as reading
- * flags that can be used to paramterize these tests.
- * <p/>
- * Each test has four parts: The expected result (column A), the format string
- * (column B), the value to format (column C), and a comma-separated list of
- * categores that this test falls in. Normally all tests are run, but if the
- * flag "Categories" is not empty, only tests that have at least one category
- * listed in "Categories" are run.
- */
-public class CellFormatTestBase {
-    private static final POILogger logger = POILogFactory.getLogger(CellFormatTestBase.class);
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected Workbook workbook;
-
-    private String testFile;
-    private Map<String, String> testFlags;
-    private boolean tryAllColors;
-    private JLabel label;
-
-    private static final String[] COLOR_NAMES =
-            {"Black", "Red", "Green", "Blue", "Yellow", "Cyan", "Magenta",
-                    "White"};
-    private static final Color[] COLORS =
-            {BLACK, RED, GREEN, BLUE, YELLOW, CYAN, MAGENTA, WHITE};
-
-    public static final Color TEST_COLOR = ORANGE.darker();
-
-    protected CellFormatTestBase(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    abstract static class CellValue {
-        abstract Object getValue(Cell cell);
-
-        Color getColor(Cell cell) {
-            return TEST_COLOR;
-        }
-
-        void equivalent(String expected, String actual, CellFormatPart format) {
-            assertEquals("format \"" + format + "\"", '"' + expected + '"',
-                    '"' + actual + '"');
-        }
-    }
-
-    protected void runFormatTests(String workbookName, CellValue valueGetter)
-            throws IOException {
-
-        openWorkbook(workbookName);
-
-        readFlags(workbook);
-
-        Set<String> runCategories = new TreeSet<String>(
-                String.CASE_INSENSITIVE_ORDER);
-        String runCategoryList = flagString("Categories", "");
-        if (runCategoryList != null) {
-            runCategories.addAll(Arrays.asList(runCategoryList.split(
-                    "\\s*,\\s*")));
-            runCategories.remove(""); // this can be found and means nothing
-        }
-
-        Sheet sheet = workbook.getSheet("Tests");
-        Iterator<Row> rowIter = sheet.rowIterator();
-        // Skip the header row
-        rowIter.next();
-        while (rowIter.hasNext()) {
-            Row row = rowIter.next();
-            if (row == null) continue;
-            String expectedText     = row.getCell(0).getStringCellValue();
-            String format           = row.getCell(1).getStringCellValue();
-            Cell value              = row.getCell(2);
-            String testCategoryList = row.getCell(3).getStringCellValue();
-            boolean byCategory = runByCategory(runCategories, testCategoryList);
-            if ((expectedText.length() > 0 || format.length() > 0) && byCategory) {
-                tryFormat(row.getRowNum(), expectedText, format, valueGetter, value);
-            }
-        }
-    }
-
-    /**
-     * Open a given workbook.
-     *
-     * @param workbookName The workbook name.  This is presumed to live in the
-     *                     "spreadsheets" directory under the directory named in
-     *                     the Java property "POI.testdata.path".
-     *
-     * @throws IOException
-     */
-    protected void openWorkbook(String workbookName)
-            throws IOException {
-        workbook = _testDataProvider.openSampleWorkbook(workbookName);
-        workbook.setMissingCellPolicy(MissingCellPolicy.CREATE_NULL_AS_BLANK);
-        testFile = workbookName;
-    }
-
-    /**
-     * Read the flags from the workbook.  Flags are on the sheet named "Flags",
-     * and consist of names in column A and values in column B.  These are put
-     * into a map that can be queried later.
-     *
-     * @param wb The workbook to look in.
-     */
-    private void readFlags(Workbook wb) {
-        Sheet flagSheet = wb.getSheet("Flags");
-        testFlags = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
-        if (flagSheet != null) {
-            int end = flagSheet.getLastRowNum();
-            // Skip the header row, therefore "+ 1"
-            for (int r = flagSheet.getFirstRowNum() + 1; r <= end; r++) {
-                Row row = flagSheet.getRow(r);
-                if (row == null)
-                    continue;
-                String flagName = row.getCell(0).getStringCellValue();
-                String flagValue = row.getCell(1).getStringCellValue();
-                if (flagName.length() > 0) {
-                    testFlags.put(flagName, flagValue);
-                }
-            }
-        }
-
-        tryAllColors = flagBoolean("AllColors", true);
-    }
-
-    /**
-     * Returns <tt>true</tt> if any of the categories for this run are contained
-     * in the test's listed categories.
-     *
-     * @param categories     The categories of tests to be run.  If this is
-     *                       empty, then all tests will be run.
-     * @param testCategories The categories that this test is in.  This is a
-     *                       comma-separated list.  If <em>any</em> tests in
-     *                       this list are in <tt>categories</tt>, the test will
-     *                       be run.
-     *
-     * @return <tt>true</tt> if the test should be run.
-     */
-    private boolean runByCategory(Set<String> categories,
-            String testCategories) {
-
-        if (categories.isEmpty())
-            return true;
-        // If there are specified categories, find out if this has one of them
-        for (String category : testCategories.split("\\s*,\\s*")) {
-            if (categories.contains(category)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void tryFormat(int row, String expectedText, String desc,
-            CellValue getter, Cell cell) {
-
-        Object value = getter.getValue(cell);
-        Color testColor = getter.getColor(cell);
-        if (testColor == null)
-            testColor = TEST_COLOR;
-
-        if (label == null)
-            label = new JLabel();
-        label.setForeground(testColor);
-        label.setText("xyzzy");
-
-        logger.log(POILogger.INFO, String.format(LocaleUtil.getUserLocale(),
-                "Row %d: \"%s\" -> \"%s\": expected \"%s\"",
-                row + 1, String.valueOf(value), desc, expectedText));
-        String actualText = tryColor(desc, null, getter, value, expectedText,
-                testColor);
-        logger.log(POILogger.INFO, String.format(LocaleUtil.getUserLocale(),
-                ", actual \"%s\")%n", actualText));
-
-        if (tryAllColors && testColor != TEST_COLOR) {
-            for (int i = 0; i < COLOR_NAMES.length; i++) {
-                tryColor(desc, COLOR_NAMES[i], getter, value, expectedText, COLORS[i]);
-            }
-        }
-    }
-
-    private String tryColor(String desc, String cname, CellValue getter,
-            Object value, String expectedText, Color expectedColor) {
-
-        if (cname != null)
-            desc = "[" + cname + "]" + desc;
-        Color origColor = label.getForeground();
-        CellFormatPart format = new CellFormatPart(desc);
-        if (!format.apply(label, value).applies) {
-            // If this doesn't apply, no color change is expected
-            expectedColor = origColor;
-        }
-
-        String actualText = label.getText();
-        Color actualColor = label.getForeground();
-        getter.equivalent(expectedText, actualText, format);
-        assertEquals(cname == null ? "no color" : "color " + cname,
-                expectedColor, actualColor);
-        return actualText;
-    }
-
-    /**
-     * Returns the value for the given flag.  The flag has the value of
-     * <tt>true</tt> if the text value is <tt>"true"</tt>, <tt>"yes"</tt>, or
-     * <tt>"on"</tt> (ignoring case).
-     *
-     * @param flagName The name of the flag to fetch.
-     * @param expected The value for the flag that is expected when the tests
-     *                 are run for a full test.  If the current value is not the
-     *                 expected one, you will get a warning in the test output.
-     *                 This is so that you do not accidentally leave a flag set
-     *                 to a value that prevents running some tests, thereby
-     *                 letting you accidentally release code that is not fully
-     *                 tested.
-     *
-     * @return The value for the flag.
-     */
-    protected boolean flagBoolean(String flagName, boolean expected) {
-        String value = testFlags.get(flagName);
-        boolean isSet;
-        if (value == null)
-            isSet = false;
-        else {
-            isSet = value.equalsIgnoreCase("true") || value.equalsIgnoreCase(
-                    "yes") || value.equalsIgnoreCase("on");
-        }
-        warnIfUnexpected(flagName, expected, isSet);
-        return isSet;
-    }
-
-    /**
-     * Returns the value for the given flag.
-     *
-     * @param flagName The name of the flag to fetch.
-     * @param expected The value for the flag that is expected when the tests
-     *                 are run for a full test.  If the current value is not the
-     *                 expected one, you will get a warning in the test output.
-     *                 This is so that you do not accidentally leave a flag set
-     *                 to a value that prevents running some tests, thereby
-     *                 letting you accidentally release code that is not fully
-     *                 tested.
-     *
-     * @return The value for the flag.
-     */
-    protected String flagString(String flagName, String expected) {
-        String value = testFlags.get(flagName);
-        if (value == null)
-            value = "";
-        warnIfUnexpected(flagName, expected, value);
-        return value;
-    }
-
-    private void warnIfUnexpected(String flagName, Object expected,
-            Object actual) {
-        if (!actual.equals(expected)) {
-            System.err.println(
-                    "WARNING: " + testFile + ": " + "Flag " + flagName +
-                            " = \"" + actual + "\" [not \"" + expected + "\"]");
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java b/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java
deleted file mode 100644
index 5d19c63..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java
+++ /dev/null
@@ -1,1014 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import javax.swing.JLabel;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class TestCellFormat {
-    
-    private static TimeZone userTimeZone;
-    
-    @BeforeClass
-    public static void setTimeZone() {
-        userTimeZone = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
-        LocaleUtil.setUserLocale(Locale.US);
-    }
-    
-    @AfterClass
-    public static void resetTimeZone() {
-        LocaleUtil.setUserTimeZone(userTimeZone);
-        LocaleUtil.setUserLocale(Locale.ROOT);
-    }
-    
-    
-    private static final String _255_POUND_SIGNS;
-    static {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 1; i <= 255; i++) {
-            sb.append('#');
-        }
-        _255_POUND_SIGNS = sb.toString();
-    }
-    
-    @Test
-    public void testSome() {
-        JLabel l = new JLabel();
-        CellFormat fmt = CellFormat.getInstance(
-                "\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)");
-        fmt.apply(l, 1.1);
-    }
-    
-    @Test
-    public void testPositiveFormatHasOnePart() {
-        CellFormat fmt = CellFormat.getInstance("0.00");
-        CellFormatResult result = fmt.apply(12.345);
-        assertEquals("12.35", result.text);
-    }
-    
-    @Test
-    public void testNegativeFormatHasOnePart() {
-        CellFormat fmt = CellFormat.getInstance("0.00");
-        CellFormatResult result = fmt.apply(-12.345);
-        assertEquals("-12.35", result.text);
-    }
-    
-    @Test
-    public void testZeroFormatHasOnePart() {
-        CellFormat fmt = CellFormat.getInstance("0.00");
-        CellFormatResult result = fmt.apply(0.0);
-        assertEquals("0.00", result.text);
-    }
-    
-    @Test
-    public void testPositiveFormatHasPosAndNegParts() {
-        CellFormat fmt = CellFormat.getInstance("0.00;-0.00");
-        CellFormatResult result = fmt.apply(12.345);
-        assertEquals("12.35", result.text);
-    }
-    
-    @Test
-    public void testNegativeFormatHasPosAndNegParts() {
-        CellFormat fmt = CellFormat.getInstance("0.00;-0.00");
-        CellFormatResult result = fmt.apply(-12.345);
-        assertEquals("-12.35", result.text);
-    }
-
-    @Test
-    public void testNegativeFormatHasPosAndNegParts2() {
-        CellFormat fmt = CellFormat.getInstance("0.00;(0.00)");
-        CellFormatResult result = fmt.apply(-12.345);
-        assertEquals("(12.35)", result.text);
-    }
-    
-    @Test
-    public void testZeroFormatHasPosAndNegParts() {
-        CellFormat fmt = CellFormat.getInstance("0.00;-0.00");
-        CellFormatResult result = fmt.apply(0.0);
-        assertEquals("0.00", result.text);
-    }
-
-    @Test
-    public void testFormatWithThreeSections() {
-        CellFormat fmt = CellFormat.getInstance("0.00;-0.00;-");
-        
-        assertEquals("12.35",  fmt.apply(12.345).text);
-        assertEquals("-12.35", fmt.apply(-12.345).text);
-        assertEquals("-",      fmt.apply(0.0).text);
-        assertEquals("abc",    fmt.apply("abc").text);
-    }
-    
-    @Test
-    public void testFormatWithFourSections() {
-        CellFormat fmt = CellFormat.getInstance("0.00;-0.00;-; @ ");
-        
-        assertEquals("12.35",  fmt.apply(12.345).text);
-        assertEquals("-12.35", fmt.apply(-12.345).text);
-        assertEquals("-",      fmt.apply(0.0).text);
-        assertEquals(" abc ",  fmt.apply("abc").text);
-    }
-
-    @Test
-    public void testApplyCellForGeneralFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        Cell cell2 = row.createCell(2);
-        Cell cell3 = row.createCell(3);
-        Cell cell4 = row.createCell(4);
-        
-        CellFormat cf = CellFormat.getInstance("General");
-        
-        // case CellType.BLANK
-        CellFormatResult result0 = cf.apply(cell0);
-        assertEquals("", result0.text);
-        
-        // case CellType.BOOLEAN
-        cell1.setCellValue(true);
-        CellFormatResult result1 = cf.apply(cell1);
-        assertEquals("TRUE", result1.text);
-        
-        // case CellType.NUMERIC
-        cell2.setCellValue(1.23);
-        CellFormatResult result2 = cf.apply(cell2);
-        assertEquals("1.23", result2.text);
-        
-        cell3.setCellValue(123.0);
-        CellFormatResult result3 = cf.apply(cell3);
-        assertEquals("123", result3.text);
-        
-        // case CellType.STRING
-        cell4.setCellValue("abc");
-        CellFormatResult result4 = cf.apply(cell4);
-        assertEquals("abc", result4.text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyCellForAtFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        Cell cell2 = row.createCell(2);
-        Cell cell3 = row.createCell(3);
-        Cell cell4 = row.createCell(4);
-        
-        CellFormat cf = CellFormat.getInstance("@");
-        
-        // case CellType.BLANK
-        CellFormatResult result0 = cf.apply(cell0);
-        assertEquals("", result0.text);
-        
-        // case CellType.BOOLEAN
-        cell1.setCellValue(true);
-        CellFormatResult result1 = cf.apply(cell1);
-        assertEquals("TRUE", result1.text);
-        
-        // case CellType.NUMERIC
-        cell2.setCellValue(1.23);
-        CellFormatResult result2 = cf.apply(cell2);
-        assertEquals("1.23", result2.text);
-        
-        cell3.setCellValue(123.0);
-        CellFormatResult result3 = cf.apply(cell3);
-        assertEquals("123", result3.text);
-        
-        // case CellType.STRING
-        cell4.setCellValue("abc");
-        CellFormatResult result4 = cf.apply(cell4);
-        assertEquals("abc", result4.text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyCellForDateFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        
-        CellFormat cf = CellFormat.getInstance("dd/mm/yyyy");
-        
-        cell0.setCellValue(10);
-        CellFormatResult result0 = cf.apply(cell0);
-        assertEquals("10/01/1900", result0.text);
-        
-        cell1.setCellValue(-1);
-        CellFormatResult result1 = cf.apply(cell1);
-        assertEquals(_255_POUND_SIGNS, result1.text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyCellForTimeFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-
-        CellFormat cf = CellFormat.getInstance("hh:mm");
-        
-        cell.setCellValue(DateUtil.convertTime("03:04:05"));        
-        CellFormatResult result = cf.apply(cell);
-        assertEquals("03:04", result.text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyCellForDateFormatAndNegativeFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        
-        CellFormat cf = CellFormat.getInstance("dd/mm/yyyy;(0)");
-        
-        cell0.setCellValue(10);
-        CellFormatResult result0 = cf.apply(cell0);
-        assertEquals("10/01/1900", result0.text);
-        
-        cell1.setCellValue(-1);
-        CellFormatResult result1 = cf.apply(cell1);
-        assertEquals("(1)", result1.text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyJLabelCellForGeneralFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        Cell cell2 = row.createCell(2);
-        Cell cell3 = row.createCell(3);
-        Cell cell4 = row.createCell(4);
-        
-        CellFormat cf = CellFormat.getInstance("General");
-        
-        JLabel label0 = new JLabel();
-        JLabel label1 = new JLabel();
-        JLabel label2 = new JLabel();
-        JLabel label3 = new JLabel();
-        JLabel label4 = new JLabel();
-        
-        // case CellType.BLANK
-        CellFormatResult result0 = cf.apply(label0, cell0);
-        assertEquals("", result0.text);
-        assertEquals("", label0.getText());
-        
-        // case CellType.BOOLEAN
-        cell1.setCellValue(true);
-        CellFormatResult result1 = cf.apply(label1, cell1);
-        assertEquals("TRUE", result1.text);
-        assertEquals("TRUE", label1.getText());
-        
-        // case CellType.NUMERIC
-        cell2.setCellValue(1.23);
-        CellFormatResult result2 = cf.apply(label2, cell2);
-        assertEquals("1.23", result2.text);
-        assertEquals("1.23", label2.getText());
-        
-        cell3.setCellValue(123.0);
-        CellFormatResult result3 = cf.apply(label3, cell3);
-        assertEquals("123", result3.text);
-        assertEquals("123", label3.getText());
-        
-        // case CellType.STRING
-        cell4.setCellValue("abc");
-        CellFormatResult result4 = cf.apply(label4, cell4);
-        assertEquals("abc", result4.text);
-        assertEquals("abc", label4.getText());
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyJLabelCellForAtFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        Cell cell2 = row.createCell(2);
-        Cell cell3 = row.createCell(3);
-        Cell cell4 = row.createCell(4);
-        
-        CellFormat cf = CellFormat.getInstance("@");
-        
-        JLabel label0 = new JLabel();
-        JLabel label1 = new JLabel();
-        JLabel label2 = new JLabel();
-        JLabel label3 = new JLabel();
-        JLabel label4 = new JLabel();
-        
-        // case CellType.BLANK
-        CellFormatResult result0 = cf.apply(label0, cell0);
-        assertEquals("", result0.text);
-        assertEquals("", label0.getText());
-        
-        // case CellType.BOOLEAN
-        cell1.setCellValue(true);
-        CellFormatResult result1 = cf.apply(label1, cell1);
-        assertEquals("TRUE", result1.text);
-        assertEquals("TRUE", label1.getText());
-        
-        // case CellType.NUMERIC
-        cell2.setCellValue(1.23);
-        CellFormatResult result2 = cf.apply(label2, cell2);
-        assertEquals("1.23", result2.text);
-        assertEquals("1.23", label2.getText());
-        
-        cell3.setCellValue(123.0);
-        CellFormatResult result3 = cf.apply(label3, cell3);
-        assertEquals("123", result3.text);
-        assertEquals("123", label3.getText());
-        
-        // case CellType.STRING
-        cell4.setCellValue("abc");
-        CellFormatResult result4 = cf.apply(label4, cell4);
-        assertEquals("abc", result4.text);
-        assertEquals("abc", label4.getText());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testApplyJLabelCellForDateFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        
-        CellFormat cf = CellFormat.getInstance("dd/mm/yyyy");
-        
-        JLabel label0 = new JLabel();
-        JLabel label1 = new JLabel();
-        
-        cell0.setCellValue(10);
-        CellFormatResult result0 = cf.apply(label0, cell0);
-        assertEquals("10/01/1900", result0.text);
-        assertEquals("10/01/1900", label0.getText());
-        
-        cell1.setCellValue(-1);
-        CellFormatResult result1 = cf.apply(label1, cell1);
-        assertEquals(_255_POUND_SIGNS, result1.text);
-        assertEquals(_255_POUND_SIGNS, label1.getText());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testApplyJLabelCellForTimeFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-
-        CellFormat cf = CellFormat.getInstance("hh:mm");
-        
-        JLabel label = new JLabel();
-        
-        cell.setCellValue(DateUtil.convertTime("03:04:05"));        
-        CellFormatResult result = cf.apply(label, cell);
-        assertEquals("03:04", result.text);
-        assertEquals("03:04", label.getText());
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyJLabelCellForDateFormatAndNegativeFormat() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        
-        CellFormat cf = CellFormat.getInstance("dd/mm/yyyy;(0)");
-        
-        JLabel label0 = new JLabel();
-        JLabel label1 = new JLabel();
-        
-        cell0.setCellValue(10);
-        CellFormatResult result0 = cf.apply(label0, cell0);
-        assertEquals("10/01/1900", result0.text);
-        assertEquals("10/01/1900", label0.getText());
-        
-        cell1.setCellValue(-1);
-        CellFormatResult result1 = cf.apply(label1, cell1);
-        assertEquals("(1)", result1.text);
-        assertEquals("(1)", label1.getText());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testApplyFormatHasOnePartAndPartHasCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10", cf.apply(cell).text);
-        
-        cell.setCellValue(0.123456789012345);
-        assertEquals("0.123456789", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyFormatHasTwoPartsFirstHasCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;0.000");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.000", cf.apply(cell).text);
-        
-        cell.setCellValue(0.123456789012345);
-        assertEquals("0.123", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0.000", cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals("-10.000", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        cell.setCellValue("TRUE");
-        assertEquals("TRUE", cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyFormatHasTwoPartsBothHaveCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;[>=10]0.000");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.000", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals(_255_POUND_SIGNS, cf.apply(cell).text);
-        
-        cell.setCellValue(-0.123456789012345);
-        assertEquals(_255_POUND_SIGNS, cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals(_255_POUND_SIGNS, cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyFormatHasThreePartsFirstHasCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;0.000;0.0000");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.0000", cf.apply(cell).text);
-        
-        cell.setCellValue(0.123456789012345);
-        assertEquals("0.1235", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0.0000", cf.apply(cell).text);
-        
-        // Second format part ('0.000') is used for negative numbers
-        // so result does not have a minus sign
-        cell.setCellValue(-10);
-        assertEquals("10.000", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyFormatHasThreePartsFirstTwoHaveCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;[>=10]0.000;0.0000");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.000", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0.0000", cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals("-10.0000", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testApplyFormatHasThreePartsFirstIsDateFirstTwoHaveCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;[>=10]dd/mm/yyyy;0.0");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10/01/1900", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0.0", cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals("-10.0", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testApplyFormatHasTwoPartsFirstHasConditionSecondIsGeneral() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;General");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0", cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals("-10", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testApplyFormatHasThreePartsFirstTwoHaveConditionThirdIsGeneral() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;[>=10]0.000;General");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.000", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0", cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals("-10", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("abc", cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyFormatHasFourPartsFirstHasCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;0.000;0.0000;~~@~~");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.0000", cf.apply(cell).text);
-        
-        cell.setCellValue(0.123456789012345);
-        assertEquals("0.1235", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0.0000", cf.apply(cell).text);
-        
-        // Second format part ('0.000') is used for negative numbers
-        // so result does not have a minus sign
-        cell.setCellValue(-10);
-        assertEquals("10.000", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("~~abc~~", cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testApplyFormatHasFourPartsSecondHasCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("0.00;[>=100]0.000;0.0000;~~@~~");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.00", cf.apply(cell).text);
-        
-        cell.setCellValue(0.123456789012345);
-        assertEquals("0.12", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0.0000", cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals("-10.0000", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("~~abc~~", cf.apply(cell).text);
-        
-        cell.setCellValue(true);
-        assertEquals("~~TRUE~~", cf.apply(cell).text);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testApplyFormatHasFourPartsFirstTwoHaveCondition() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[>=100]0.00;[>=10]0.000;0.0000;~~@~~");
-        
-        cell.setCellValue(100);
-        assertEquals("100.00", cf.apply(cell).text);
-        
-        cell.setCellValue(10);
-        assertEquals("10.000", cf.apply(cell).text);
-        
-        cell.setCellValue(0);
-        assertEquals("0.0000", cf.apply(cell).text);
-        
-        cell.setCellValue(-10);
-        assertEquals("-10.0000", cf.apply(cell).text);
-        
-        cell.setCellValue("abc");
-        assertEquals("~~abc~~", cf.apply(cell).text);
-        
-        cell.setCellValue(true);
-        assertEquals("~~TRUE~~", cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    /*
-     * Test apply(Object value) with a number as parameter
-     */
-    @Test
-    public void testApplyObjectNumber() {
-        
-        CellFormat cf1 = CellFormat.getInstance("0.000");
-        
-        assertEquals("1.235", cf1.apply(1.2345).text);
-        assertEquals("-1.235", cf1.apply(-1.2345).text);
-        
-        CellFormat cf2 = CellFormat.getInstance("0.000;(0.000)");
-        
-        assertEquals("1.235", cf2.apply(1.2345).text);
-        assertEquals("(1.235)", cf2.apply(-1.2345).text);
-        
-        CellFormat cf3 = CellFormat.getInstance("[>1]0.000;0.0000");
-        
-        assertEquals("1.235", cf3.apply(1.2345).text);
-        assertEquals("-1.2345", cf3.apply(-1.2345).text);
-        
-        CellFormat cf4 = CellFormat.getInstance("0.000;[>1]0.0000");
-        
-        assertEquals("1.235", cf4.apply(1.2345).text);
-        assertEquals(_255_POUND_SIGNS, cf4.apply(-1.2345).text);
-        
-    }
-    
-    /*
-     * Test apply(Object value) with a Date as parameter
-     */
-    @Test
-    public void testApplyObjectDate() throws ParseException {
-        
-        CellFormat cf1 = CellFormat.getInstance("m/d/yyyy");
-        Date date1 = new SimpleDateFormat("M/d/y", Locale.ROOT).parse("01/11/2012");
-        assertEquals("1/11/2012", cf1.apply(date1).text);
-        
-    }
-
-    @Test
-    public void testApplyCellForDateFormatWithConditions() throws Exception {
-        
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        CellFormat cf = CellFormat.getInstance("[<1]hh:mm:ss AM/PM;[>=1]dd/mm/yyyy hh:mm:ss AM/PM;General");
-        
-        cell.setCellValue(0.5);
-        assertEquals("12:00:00 PM", cf.apply(cell).text);
-        
-        cell.setCellValue(1.5);
-        assertEquals("01/01/1900 12:00:00 PM", cf.apply(cell).text);
-        
-        cell.setCellValue(-1);
-        assertEquals(_255_POUND_SIGNS, cf.apply(cell).text);
-        
-        wb.close();
-    }
-    
-    /*
-     * Test apply(Object value) with a String as parameter
-     */
-    @Test
-    public void testApplyObjectString() {
-        
-        CellFormat cf = CellFormat.getInstance("0.00");
-        
-        assertEquals("abc", cf.apply("abc").text);
-        
-    }
-    
-    /*
-     * Test apply(Object value) with a Boolean as parameter
-     */
-    @Test
-    public void testApplyObjectBoolean() {
-        
-        CellFormat cf1 = CellFormat.getInstance("0");
-        CellFormat cf2 = CellFormat.getInstance("General");
-        CellFormat cf3 = CellFormat.getInstance("@");
-        
-        assertEquals("TRUE", cf1.apply(true).text);
-        assertEquals("FALSE", cf2.apply(false).text);
-        assertEquals("TRUE", cf3.apply(true).text);
-        
-    }
-    
-    @Test
-    public void testSimpleFractionFormat() throws IOException {
-        CellFormat cf1 = CellFormat.getInstance("# ?/?");
-        // Create a workbook, row and cell to test with
-        Workbook wb = new HSSFWorkbook();
-        try {
-            Sheet sheet = wb.createSheet();
-            Row row = sheet.createRow(0);
-            Cell cell = row.createCell(0);
-            cell.setCellValue(123456.6);
-            //System.out.println(cf1.apply(cell).text);
-            assertEquals("123456 3/5", cf1.apply(cell).text);
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void testAccountingFormats() throws IOException {
-        char pound = '\u00A3';
-        char euro  = '\u20AC';
-        
-        // Accounting -> 0 decimal places, default currency symbol
-        String formatDft = "_-\"$\"* #,##0_-;\\-\"$\"* #,##0_-;_-\"$\"* \"-\"_-;_-@_-";
-        // Accounting -> 0 decimal places, US currency symbol
-        String formatUS  = "_-[$$-409]* #,##0_ ;_-[$$-409]* -#,##0 ;_-[$$-409]* \"-\"_-;_-@_-";
-        // Accounting -> 0 decimal places, UK currency symbol
-        String formatUK  = "_-[$"+pound+"-809]* #,##0_-;\\-[$"+pound+"-809]* #,##0_-;_-[$"+pound+"-809]* \"-\"??_-;_-@_-";
-        // French style accounting, euro sign comes after not before
-        String formatFR  = "_-#,##0* [$"+euro+"-40C]_-;\\-#,##0* [$"+euro+"-40C]_-;_-\"-\"??* [$"+euro+"-40C] _-;_-@_-";
-        
-        // Has +ve, -ve and zero rules
-        CellFormat cfDft = CellFormat.getInstance(formatDft);
-        CellFormat cfUS  = CellFormat.getInstance(formatUS);
-        CellFormat cfUK  = CellFormat.getInstance(formatUK);
-        CellFormat cfFR  = CellFormat.getInstance(formatFR);
-        
-        // For +ve numbers, should be Space + currency symbol + spaces + whole number with commas + space
-        // (Except French, which is mostly reversed...)
-        assertEquals(" $   12 ", cfDft.apply(Double.valueOf(12.33)).text);
-        assertEquals(" $   12 ",  cfUS.apply(Double.valueOf(12.33)).text);
-        assertEquals(" "+pound+"   12 ", cfUK.apply(Double.valueOf(12.33)).text);
-        assertEquals(" 12   "+euro+" ", cfFR.apply(Double.valueOf(12.33)).text);
-        
-        assertEquals(" $   16,789 ", cfDft.apply(Double.valueOf(16789.2)).text);
-        assertEquals(" $   16,789 ",  cfUS.apply(Double.valueOf(16789.2)).text);
-        assertEquals(" "+pound+"   16,789 ", cfUK.apply(Double.valueOf(16789.2)).text);
-        assertEquals(" 16,789   "+euro+" ", cfFR.apply(Double.valueOf(16789.2)).text);
-        
-        // For -ve numbers, gets a bit more complicated...
-        assertEquals("-$   12 ", cfDft.apply(Double.valueOf(-12.33)).text);
-        assertEquals(" $   -12 ",  cfUS.apply(Double.valueOf(-12.33)).text);
-        assertEquals("-"+pound+"   12 ", cfUK.apply(Double.valueOf(-12.33)).text);
-        assertEquals("-12   "+euro+" ", cfFR.apply(Double.valueOf(-12.33)).text);
-        
-        assertEquals("-$   16,789 ", cfDft.apply(Double.valueOf(-16789.2)).text);
-        assertEquals(" $   -16,789 ",  cfUS.apply(Double.valueOf(-16789.2)).text);
-        assertEquals("-"+pound+"   16,789 ", cfUK.apply(Double.valueOf(-16789.2)).text);
-        assertEquals("-16,789   "+euro+" ", cfFR.apply(Double.valueOf(-16789.2)).text);
-        
-        // For zero, should be Space + currency symbol + spaces + Minus + spaces
-        assertEquals(" $   - ", cfDft.apply(Double.valueOf(0)).text);
-        // TODO Fix the exception this incorrectly triggers
-        //assertEquals(" $   - ",  cfUS.apply(Double.valueOf(0)).text);
-        // TODO Fix these to not have an incorrect bonus 0 on the end 
-        //assertEquals(" "+pound+"   -  ", cfUK.apply(Double.valueOf(0)).text);
-        //assertEquals(" -    "+euro+"  ", cfFR.apply(Double.valueOf(0)).text);
-    }
-
-    @Test
-    public void testThreePartComplexFormat1() {
-        // verify a rather complex format found e.g. in http://wahl.land-oberoesterreich.gv.at/Downloads/bp10.xls
-        CellFormatPart posPart = new CellFormatPart("[$-F400]h:mm:ss\\ AM/PM");
-        assertNotNull(posPart);
-        assertEquals("1:00:12 AM", posPart.apply(new Date(12345)).text);
-        
-        CellFormatPart negPart = new CellFormatPart("[$-F40]h:mm:ss\\ AM/PM");
-        assertNotNull(negPart);
-        assertEquals("1:00:12 AM", posPart.apply(new Date(12345)).text);
-
-        //assertNotNull(new CellFormatPart("_-* \"\"??_-;_-@_-"));
-        
-        CellFormat instance = CellFormat.getInstance("[$-F400]h:mm:ss\\ AM/PM;[$-F40]h:mm:ss\\ AM/PM;_-* \"\"??_-;_-@_-");
-        assertNotNull(instance);
-        assertEquals("1:00:12 AM", instance.apply(new Date(12345)).text);
-    }
-    
-    @Test
-    public void testThreePartComplexFormat2() {
-        // verify a rather complex format found e.g. in http://wahl.land-oberoesterreich.gv.at/Downloads/bp10.xls
-        CellFormatPart posPart = new CellFormatPart("dd/mm/yyyy");
-        assertNotNull(posPart);
-        assertEquals("01/01/1970", posPart.apply(new Date(12345)).text);
-        
-        CellFormatPart negPart = new CellFormatPart("dd/mm/yyyy");
-        assertNotNull(negPart);
-        assertEquals("01/01/1970", posPart.apply(new Date(12345)).text);
-
-        //assertNotNull(new CellFormatPart("_-* \"\"??_-;_-@_-"));
-        
-        CellFormat instance = CellFormat.getInstance("dd/mm/yyyy;dd/mm/yyyy;_-* \"\"??_-;_-@_-");
-        assertNotNull(instance);
-        assertEquals("01/01/1970", instance.apply(new Date(12345)).text);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java b/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java
deleted file mode 100644
index 1a56b82..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import junit.framework.TestCase;
-
-public class TestCellFormatCondition extends TestCase {
-    public void testSVConditions() {
-        CellFormatCondition lt = CellFormatCondition.getInstance("<", "1.5");
-        assertTrue(lt.pass(1.4));
-        assertFalse(lt.pass(1.5));
-        assertFalse(lt.pass(1.6));
-
-        CellFormatCondition le = CellFormatCondition.getInstance("<=", "1.5");
-        assertTrue(le.pass(1.4));
-        assertTrue(le.pass(1.5));
-        assertFalse(le.pass(1.6));
-
-        CellFormatCondition gt = CellFormatCondition.getInstance(">", "1.5");
-        assertFalse(gt.pass(1.4));
-        assertFalse(gt.pass(1.5));
-        assertTrue(gt.pass(1.6));
-
-        CellFormatCondition ge = CellFormatCondition.getInstance(">=", "1.5");
-        assertFalse(ge.pass(1.4));
-        assertTrue(ge.pass(1.5));
-        assertTrue(ge.pass(1.6));
-
-        CellFormatCondition eqs = CellFormatCondition.getInstance("=", "1.5");
-        assertFalse(eqs.pass(1.4));
-        assertTrue(eqs.pass(1.5));
-        assertFalse(eqs.pass(1.6));
-
-        CellFormatCondition eql = CellFormatCondition.getInstance("==", "1.5");
-        assertFalse(eql.pass(1.4));
-        assertTrue(eql.pass(1.5));
-        assertFalse(eql.pass(1.6));
-
-        CellFormatCondition neo = CellFormatCondition.getInstance("<>", "1.5");
-        assertTrue(neo.pass(1.4));
-        assertFalse(neo.pass(1.5));
-        assertTrue(neo.pass(1.6));
-
-        CellFormatCondition nen = CellFormatCondition.getInstance("!=", "1.5");
-        assertTrue(nen.pass(1.4));
-        assertFalse(nen.pass(1.5));
-        assertTrue(nen.pass(1.6));
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java b/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java
deleted file mode 100644
index 6e77df2..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.format;
-
-import java.awt.Color;
-
-import junit.framework.TestCase;
-
-public class TestCellFormatResult extends TestCase {
-    
-    public void testNullTextRaisesException() {
-        try {
-            final boolean applies = true;
-            final String text = null;
-            final Color textColor = Color.BLACK;
-            final CellFormatResult result = new CellFormatResult(applies, text, textColor);
-            fail("Cannot initialize CellFormatResult with null text parameter");
-        }
-        catch (IllegalArgumentException e) {
-            //Expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/AllSSFormulaTests.java b/trunk/src/testcases/org/apache/poi/ss/formula/AllSSFormulaTests.java
deleted file mode 100644
index 5963101..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/AllSSFormulaTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.forked.TestForkedEvaluator;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Test suite for org.apache.poi.ss.formula
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestCellCacheEntry.class,
-    TestEvaluationCache.class,
-    TestWorkbookEvaluator.class,
-    TestForkedEvaluator.class
-})
-public class AllSSFormulaTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java b/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
deleted file mode 100644
index 7642015..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.ss.formula.eval.NotImplementedFunctionException;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.udf.DefaultUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
-
-/**
- * Test setting / evaluating of Analysis Toolpack and user-defined functions
- */
-public abstract class BaseTestExternalFunctions {
-    // define two custom user-defined functions
-    private static class MyFunc implements FreeRefFunction {
-        public MyFunc() {
-            //
-        }
-
-        @Override
-        public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-            if (args.length != 1 || !(args[0] instanceof StringEval)) {
-                return ErrorEval.VALUE_INVALID;
-            }
-            StringEval input = (StringEval) args[0];
-            return new StringEval(input.getStringValue() + "abc");
-        }
-    }
-
-    private static class MyFunc2 implements FreeRefFunction {
-        public MyFunc2() {
-            //
-        }
-
-        @Override
-        public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-            if (args.length != 1 || !(args[0] instanceof StringEval)) {
-                return ErrorEval.VALUE_INVALID;
-            }
-            StringEval input = (StringEval) args[0];
-            return new StringEval(input.getStringValue() + "abc2");
-        }
-    }
-
-    /**
-     * register the two test UDFs in a UDF finder, to be passed to the workbook
-     */
-    private static UDFFinder customToolpack = new DefaultUDFFinder(
-            new String[] { "myFunc", "myFunc2"},
-            new FreeRefFunction[] { new MyFunc(), new MyFunc2()}
-    );
-
-
-    private final ITestDataProvider _testDataProvider;
-    private final String atpFile;
-
-    /**
-     * @param testDataProvider an object that provides test data in HSSF / XSSF specific way
-     */
-    protected BaseTestExternalFunctions(ITestDataProvider testDataProvider, String atpFile) {
-        _testDataProvider = testDataProvider;
-        this.atpFile = atpFile;
-    }
-
-    @Test
-    public void testExternalFunctions() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-
-        Cell cell1 = sh.createRow(0).createCell(0);
-        // functions from the Excel Analysis Toolpack
-        cell1.setCellFormula("ISODD(1)+ISEVEN(2)");
-        assertEquals("ISODD(1)+ISEVEN(2)", cell1.getCellFormula());
-
-        Cell cell2 = sh.createRow(1).createCell(0);
-        // unregistered functions are parseable and renderable, but may not be evaluateable
-        cell2.setCellFormula("MYFUNC(\"B1\")"); 
-        try {
-            evaluator.evaluate(cell2);
-            fail("Expected NotImplementedFunctionException/NotImplementedException");
-        } catch (final NotImplementedException e) {
-            assertTrue(e.getCause() instanceof NotImplementedFunctionException);
-            // Alternatively, a future implementation of evaluate could return #NAME? error to align behavior with Excel
-            // assertEquals(ErrorEval.NAME_INVALID, ErrorEval.valueOf(evaluator.evaluate(cell2).getErrorValue()));
-        }
-
-        wb.addToolPack(customToolpack);
-
-        cell2.setCellFormula("MYFUNC(\"B1\")");
-        assertEquals("MYFUNC(\"B1\")", cell2.getCellFormula());
-
-        Cell cell3 = sh.createRow(2).createCell(0);
-        cell3.setCellFormula("MYFUNC2(\"C1\")&\"-\"&A2");  //where A2 is defined above
-        assertEquals("MYFUNC2(\"C1\")&\"-\"&A2", cell3.getCellFormula());
-
-        assertEquals(2.0, evaluator.evaluate(cell1).getNumberValue(), 0);
-        assertEquals("B1abc", evaluator.evaluate(cell2).getStringValue());
-        assertEquals("C1abc2-B1abc", evaluator.evaluate(cell3).getStringValue());
-
-        wb.close();
-    }
-
-    /**
-     * test invoking saved ATP functions
-     *
-     * @param testFile  either atp.xls or atp.xlsx
-     */
-    @Test
-    public void baseTestInvokeATP() throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook(atpFile);
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh  = wb.getSheetAt(0);
-        // these two are not implemented in r
-        assertEquals("DELTA(1.3,1.5)", sh.getRow(0).getCell(1).getCellFormula());
-        assertEquals("COMPLEX(2,4)", sh.getRow(1).getCell(1).getCellFormula());
-
-        Cell cell2 = sh.getRow(2).getCell(1);
-        assertEquals("ISODD(2)", cell2.getCellFormula());
-        assertEquals(false, evaluator.evaluate(cell2).getBooleanValue());
-        assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCellEnum(cell2));
-
-        Cell cell3 = sh.getRow(3).getCell(1);
-        assertEquals("ISEVEN(2)", cell3.getCellFormula());
-        assertEquals(true, evaluator.evaluate(cell3).getBooleanValue());
-        assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCellEnum(cell3));
-
-        wb.close();
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/EvaluationListener.java b/trunk/src/testcases/org/apache/poi/ss/formula/EvaluationListener.java
deleted file mode 100644
index babbbf6..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/EvaluationListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests should extend this class if they need to track the internal working of the {@link WorkbookEvaluator}.<br/>
- *
- * Default method implementations all do nothing
- *
- * @author Josh Micich
- */
-public abstract class EvaluationListener implements IEvaluationListener {
-	@Override
-    public void onCacheHit(int sheetIndex, int rowIndex, int columnIndex, ValueEval result) {
-		// do nothing
-	}
-	@Override
-    public void onReadPlainValue(int sheetIndex, int rowIndex, int columnIndex, ICacheEntry entry) {
-		// do nothing
-	}
-	@Override
-    public void onStartEvaluate(EvaluationCell cell, ICacheEntry entry) {
-		// do nothing
-	}
-	@Override
-    public void onEndEvaluate(ICacheEntry entry, ValueEval result) {
-		// do nothing
-	}
-	@Override
-    public void onClearWholeCache() {
-		// do nothing
-	}
-	@Override
-    public void onClearCachedValue(ICacheEntry entry) {
-		// do nothing
-	}
-	@Override
-    public void onChangeFromBlankValue(int sheetIndex, int rowIndex, int columnIndex,
-			EvaluationCell cell, ICacheEntry entry) {
-		// do nothing
-	}
-	@Override
-    public void sortDependentCachedValues(ICacheEntry[] entries) {
-		// do nothing
-	}
-	@Override
-    public void onClearDependentCachedValue(ICacheEntry entry, int depth) {
-		// do nothing
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java
deleted file mode 100644
index 128a767..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests {@link org.apache.poi.ss.formula.CellCacheEntry}.
- *
- * @author Josh Micich
- */
-public class TestCellCacheEntry extends TestCase {
-
-	public void testBasic() {
-		CellCacheEntry pcce = new PlainValueCellCacheEntry(new NumberEval(42.0));
-		ValueEval ve = pcce.getValue();
-		assertEquals(42, ((NumberEval)ve).getNumberValue(), 0.0);
-		
-		FormulaCellCacheEntry fcce = new FormulaCellCacheEntry();
-		fcce.updateFormulaResult(new NumberEval(10.0), CellCacheEntry.EMPTY_ARRAY, null);
-		
-		ve = fcce.getValue();
-		assertEquals(10, ((NumberEval)ve).getNumberValue(), 0.0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
deleted file mode 100644
index 4641c4f..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.hssf.usermodel.FormulaExtractor;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFEvaluationTestHelper;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.ss.formula.IEvaluationListener.ICacheEntry;
-import org.apache.poi.ss.formula.PlainCellCache.Loc;
-import org.apache.poi.ss.usermodel.*;
-
-/**
- * Tests {@link org.apache.poi.ss.formula.EvaluationCache}.  Makes sure that where possible (previously calculated) cached
- * values are used.  Also checks that changing cell values causes the correct (minimal) set of
- * dependent cached values to be cleared.
- *
- * @author Josh Micich
- */
-public class TestEvaluationCache extends TestCase {
-
-	private static final class FormulaCellCacheEntryComparer implements Comparator<ICacheEntry> {
-
-		private final Map<ICacheEntry,EvaluationCell> _formulaCellsByCacheEntry;
-
-		public FormulaCellCacheEntryComparer(Map<ICacheEntry,EvaluationCell> formulaCellsByCacheEntry) {
-			_formulaCellsByCacheEntry = formulaCellsByCacheEntry;
-		}
-		private EvaluationCell getCell(ICacheEntry a) {
-			return _formulaCellsByCacheEntry.get(a);
-		}
-		@Override
-        public int compare(ICacheEntry oa, ICacheEntry ob) {
-			EvaluationCell a = getCell(oa);
-			EvaluationCell b = getCell(ob);
-			int cmp;
-			cmp = a.getRowIndex() - b.getRowIndex();
-			if (cmp != 0) {
-				return cmp;
-			}
-			cmp = a.getColumnIndex() - b.getColumnIndex();
-			if (cmp != 0) {
-				return cmp;
-			}
-			if (a.getSheet() == b.getSheet()) {
-				return 0;
-			}
-			throw new RuntimeException("Incomplete code - don't know how to order sheets");
-		}
-	}
-
-	private static final class EvalListener extends EvaluationListener {
-
-		private final List<String> _logList;
-		private final HSSFWorkbook _book;
-		private final Map<ICacheEntry,EvaluationCell> _formulaCellsByCacheEntry;
-		private final Map<ICacheEntry,Loc> _plainCellLocsByCacheEntry;
-
-		public EvalListener(HSSFWorkbook wb) {
-			_book = wb;
-			_logList = new ArrayList<String>();
-			_formulaCellsByCacheEntry = new HashMap<ICacheEntry,EvaluationCell>();
-			_plainCellLocsByCacheEntry = new HashMap<ICacheEntry, Loc>();
-		}
-		@Override
-        public void onCacheHit(int sheetIndex, int rowIndex, int columnIndex, ValueEval result) {
-			log("hit", rowIndex, columnIndex, result);
-		}
-		@Override
-        public void onReadPlainValue(int sheetIndex, int rowIndex, int columnIndex, ICacheEntry entry) {
-			Loc loc = new Loc(0, sheetIndex, rowIndex, columnIndex);
-			_plainCellLocsByCacheEntry.put(entry, loc);
-			log("value", rowIndex, columnIndex, entry.getValue());
-		}
-		@Override
-        public void onStartEvaluate(EvaluationCell cell, ICacheEntry entry) {
-			_formulaCellsByCacheEntry.put(entry, cell);
-			HSSFCell hc = _book.getSheetAt(0).getRow(cell.getRowIndex()).getCell(cell.getColumnIndex());
-			log("start", cell.getRowIndex(), cell.getColumnIndex(), FormulaExtractor.getPtgs(hc));
-		}
-		@Override
-        public void onEndEvaluate(ICacheEntry entry, ValueEval result) {
-			EvaluationCell cell = _formulaCellsByCacheEntry.get(entry);
-			log("end", cell.getRowIndex(), cell.getColumnIndex(), result);
-		}
-		@Override
-        public void onClearCachedValue(ICacheEntry entry) {
-			int rowIndex;
-			int columnIndex;
-			EvaluationCell cell = _formulaCellsByCacheEntry.get(entry);
-			if (cell == null) {
-				Loc loc = _plainCellLocsByCacheEntry.get(entry);
-				if (loc == null) {
-					throw new IllegalStateException("can't find cell or location");
-				}
-				rowIndex = loc.getRowIndex();
-				columnIndex = loc.getColumnIndex();
-			} else {
-				rowIndex = cell.getRowIndex();
-				columnIndex = cell.getColumnIndex();
-			}
-			log("clear", rowIndex, columnIndex, entry.getValue());
-		}
-		@Override
-        public void sortDependentCachedValues(ICacheEntry[] entries) {
-			Arrays.sort(entries, new FormulaCellCacheEntryComparer(_formulaCellsByCacheEntry));
-		}
-		@Override
-        public void onClearDependentCachedValue(ICacheEntry entry, int depth) {
-			EvaluationCell cell = _formulaCellsByCacheEntry.get(entry);
-			log("clear" + depth, cell.getRowIndex(), cell.getColumnIndex(), entry.getValue());
-		}
-
-		@Override
-        public void onChangeFromBlankValue(int sheetIndex, int rowIndex, int columnIndex,
-				EvaluationCell cell, ICacheEntry entry) {
-			log("changeFromBlank", rowIndex, columnIndex, entry.getValue());
-			if (entry.getValue() == null) { // hack to tell the difference between formula and plain value
-				// perhaps the API could be improved: onChangeFromBlankToValue, onChangeFromBlankToFormula
-				_formulaCellsByCacheEntry.put(entry, cell);
-			} else {
-				Loc loc = new Loc(0, sheetIndex, rowIndex, columnIndex);
-				_plainCellLocsByCacheEntry.put(entry, loc);
-			}
-		}
-		private void log(String tag, int rowIndex, int columnIndex, Object value) {
-			StringBuffer sb = new StringBuffer(64);
-			sb.append(tag).append(' ');
-			sb.append(new CellReference(rowIndex, columnIndex, false, false).formatAsString());
-			if (value != null) {
-				sb.append(' ').append(formatValue(value));
-			}
-			_logList.add(sb.toString());
-		}
-		private String formatValue(Object value) {
-			if (value instanceof Ptg[]) {
-				Ptg[] ptgs = (Ptg[]) value;
-				return HSSFFormulaParser.toFormulaString(_book, ptgs);
-			}
-			if (value instanceof NumberEval) {
-				NumberEval ne = (NumberEval) value;
-				return ne.getStringValue();
-			}
-			if (value instanceof StringEval) {
-				StringEval se = (StringEval) value;
-				return "'" + se.getStringValue() + "'";
-			}
-			if (value instanceof BoolEval) {
-				BoolEval be = (BoolEval) value;
-				return be.getStringValue();
-			}
-			if (value == BlankEval.instance) {
-				return "#BLANK#";
-			}
-			if (value instanceof ErrorEval) {
-				ErrorEval ee = (ErrorEval) value;
-				return ErrorEval.getText(ee.getErrorCode());
-			}
-			throw new IllegalArgumentException("Unexpected value class ("
-					+ value.getClass().getName() + ")");
-		}
-		public String[] getAndClearLog() {
-			String[] result = new String[_logList.size()];
-			_logList.toArray(result);
-			_logList.clear();
-			return result;
-		}
-	}
-	/**
-	 * Wrapper class to manage repetitive tasks from this test,
-	 *
-	 * Note - this class does a little bit more than just plain set-up of data. The method
-	 * {@link WorkbookEvaluator#clearCachedResultValue(HSSFSheet, int, int)} is called whenever a
-	 * cell value is changed.
-	 *
-	 */
-	private static final class MySheet {
-
-		private final HSSFSheet _sheet;
-		private final WorkbookEvaluator _evaluator;
-		private final HSSFWorkbook _wb;
-		private final EvalListener _evalListener;
-
-		public MySheet() {
-			_wb = new HSSFWorkbook();
-			_evalListener = new EvalListener(_wb);
-			_evaluator = WorkbookEvaluatorTestHelper.createEvaluator(_wb, _evalListener);
-			_sheet = _wb.createSheet("Sheet1");
-		}
-
-		private static EvaluationCell wrapCell(HSSFCell cell) {
-			return HSSFEvaluationTestHelper.wrapCell(cell);
-		}
-
-		public void setCellValue(String cellRefText, double value) {
-			HSSFCell cell = getOrCreateCell(cellRefText);
-			// be sure to blank cell, in case it is currently a formula
-			cell.setCellType(CellType.BLANK);
-			// otherwise this line will only set the formula cached result;
-			cell.setCellValue(value);
-			_evaluator.notifyUpdateCell(wrapCell(cell));
-		}
-		public void clearCell(String cellRefText) {
-			HSSFCell cell = getOrCreateCell(cellRefText);
-			cell.setCellType(CellType.BLANK);
-			_evaluator.notifyUpdateCell(wrapCell(cell));
-		}
-
-		public void setCellFormula(String cellRefText, String formulaText) {
-			HSSFCell cell = getOrCreateCell(cellRefText);
-			cell.setCellFormula(formulaText);
-			_evaluator.notifyUpdateCell(wrapCell(cell));
-		}
-
-		private HSSFCell getOrCreateCell(String cellRefText) {
-			CellReference cr = new CellReference(cellRefText);
-			int rowIndex = cr.getRow();
-			HSSFRow row = _sheet.getRow(rowIndex);
-			if (row == null) {
-				row = _sheet.createRow(rowIndex);
-			}
-			int cellIndex = cr.getCol();
-			HSSFCell cell = row.getCell(cellIndex);
-			if (cell == null) {
-				cell = row.createCell(cellIndex);
-			}
-			return cell;
-		}
-
-		public ValueEval evaluateCell(String cellRefText) {
-			return _evaluator.evaluate(wrapCell(getOrCreateCell(cellRefText)));
-		}
-
-		public String[] getAndClearLog() {
-			return _evalListener.getAndClearLog();
-		}
-
-		public void clearAllCachedResultValues() {
-			_evaluator.clearAllCachedResultValues();
-		}
-	}
-
-	private static MySheet createMediumComplex() {
-		MySheet ms = new MySheet();
-
-		// plain data in D1:F3
-		ms.setCellValue("D1", 12);
-		ms.setCellValue("E1", 13);
-		ms.setCellValue("D2", 14);
-		ms.setCellValue("E2", 15);
-		ms.setCellValue("D3", 16);
-		ms.setCellValue("E3", 17);
-
-
-		ms.setCellFormula("C1", "SUM(D1:E2)");
-		ms.setCellFormula("C2", "SUM(D2:E3)");
-		ms.setCellFormula("C3", "SUM(D3:E4)");
-
-		ms.setCellFormula("B1", "C2-C1");
-		ms.setCellFormula("B2", "B3*C1-C2");
-		ms.setCellValue("B3", 2);
-
-		ms.setCellFormula("A1", "MAX(B1:B2)");
-		ms.setCellFormula("A2", "MIN(B3,D2:F2)");
-		ms.setCellFormula("A3", "B3*C3");
-
-		// clear all the logging from the above initialisation
-		ms.getAndClearLog();
-		ms.clearAllCachedResultValues();
-		return ms;
-	}
-
-	public void testMediumComplex() {
-
-		MySheet ms = createMediumComplex();
-		// completely fresh evaluation
-		confirmEvaluate(ms, "A1", 46);
-		confirmLog(ms, new String[] {
-			"start A1 MAX(B1:B2)",
-				"start B1 C2-C1",
-					"start C2 SUM(D2:E3)",
-						"value D2 14", "value E2 15", "value D3 16", "value E3 17",
-					"end C2 62",
-					"start C1 SUM(D1:E2)",
-						"value D1 12", "value E1 13", "hit D2 14", "hit E2 15",
-					"end C1 54",
-				"end B1 8",
-				"start B2 B3*C1-C2",
-					"value B3 2",
-					"hit C1 54",
-					"hit C2 62",
-				"end B2 46",
-			"end A1 46",
-		});
-
-
-		// simple cache hit - immediate re-evaluation with no changes
-		confirmEvaluate(ms, "A1", 46);
-		confirmLog(ms, new String[] { "hit A1 46", });
-
-		// change a low level cell
-		ms.setCellValue("D1", 10);
-		confirmLog(ms, new String[] {
-				"clear D1 10",
-				"clear1 C1 54",
-				"clear2 B1 8",
-				"clear3 A1 46",
-				"clear2 B2 46",
-		});
-		confirmEvaluate(ms, "A1", 42);
-		confirmLog(ms, new String[] {
-			"start A1 MAX(B1:B2)",
-				"start B1 C2-C1",
-					"hit C2 62",
-					"start C1 SUM(D1:E2)",
-						"hit D1 10", "hit E1 13", "hit D2 14", "hit E2 15",
-					"end C1 52",
-				"end B1 10",
-				"start B2 B3*C1-C2",
-					"hit B3 2",
-					"hit C1 52",
-					"hit C2 62",
-				"end B2 42",
-			"end A1 42",
-		});
-
-		// Reset and try changing an intermediate value
-		ms = createMediumComplex();
-		confirmEvaluate(ms, "A1", 46);
-		ms.getAndClearLog();
-
-		ms.setCellValue("B3", 3); // B3 is in the middle of the dependency tree
-		confirmLog(ms, new String[] {
-				"clear B3 3",
-				"clear1 B2 46",
-				"clear2 A1 46",
-		});
-		confirmEvaluate(ms, "A1", 100);
-		confirmLog(ms, new String[] {
-			"start A1 MAX(B1:B2)",
-				"hit B1 8",
-				"start B2 B3*C1-C2",
-					"hit B3 3",
-					"hit C1 54",
-					"hit C2 62",
-				"end B2 100",
-			"end A1 100",
-		});
-	}
-
-	public void testMediumComplexWithDependencyChange() {
-
-		// Changing an intermediate formula
-		MySheet ms = createMediumComplex();
-		confirmEvaluate(ms, "A1", 46);
-		ms.getAndClearLog();
-		ms.setCellFormula("B2", "B3*C2-C3"); // used to be "B3*C1-C2"
-		confirmLog(ms, new String[] {
-			"clear B2 46",
-			"clear1 A1 46",
-		});
-
-		confirmEvaluate(ms, "A1", 91);
-		confirmLog(ms, new String[] {
-			"start A1 MAX(B1:B2)",
-				"hit B1 8",
-				"start B2 B3*C2-C3",
-					"hit B3 2",
-					"hit C2 62",
-					"start C3 SUM(D3:E4)",
-						"hit D3 16", "hit E3 17",
-//						"value D4 #BLANK#", "value E4 #BLANK#",
-					"end C3 33",
-				"end B2 91",
-			"end A1 91",
-		});
-
-		//----------------
-		// Note - From now on the demonstrated POI behaviour is not optimal
-		//----------------
-
-		// Now change a value that should no longer affect B2
-		ms.setCellValue("D1", 11);
-		confirmLog(ms, new String[] {
-			"clear D1 11",
-			"clear1 C1 54",
-			// note there is no "clear2 B2 91" here because B2 doesn't depend on C1 anymore
-			"clear2 B1 8",
-			"clear3 A1 91",
-		});
-
-		confirmEvaluate(ms, "B2", 91);
-		confirmLog(ms, new String[] {
-			"hit B2 91",  // further confirmation that B2 was not cleared due to changing D1 above
-		});
-
-		// things should be back to normal now
-		ms.setCellValue("D1", 11);
-		confirmLog(ms, new String[] {  });
-		confirmEvaluate(ms, "B2", 91);
-		confirmLog(ms, new String[] {
-			"hit B2 91",
-		});
-	}
-
-	/**
-	 * verifies that when updating a plain cell, depending (formula) cell cached values are cleared
-	 * only when the plain cell's value actually changes
-	 */
-	public void testRedundantUpdate() {
-		MySheet ms = new MySheet();
-
-		ms.setCellValue("B1", 12);
-		ms.setCellValue("C1", 13);
-		ms.setCellFormula("A1", "B1+C1");
-
-		// evaluate twice to confirm caching looks OK
-		ms.evaluateCell("A1");
-		ms.getAndClearLog();
-		confirmEvaluate(ms, "A1", 25);
-		confirmLog(ms, new String[] {
-			"hit A1 25",
-		});
-
-		// Make redundant update, and check re-evaluation
-		ms.setCellValue("B1", 12); // value didn't change
-		confirmLog(ms, new String[] {});
-		confirmEvaluate(ms, "A1", 25);
-		confirmLog(ms, new String[] {
-			"hit A1 25",
-		});
-
-		ms.setCellValue("B1", 11); // value changing
-		confirmLog(ms, new String[] {
-			"clear B1 11",
-			"clear1 A1 25",	// expect consuming formula cached result to get cleared
-		});
-		confirmEvaluate(ms, "A1", 24);
-		confirmLog(ms, new String[] {
-			"start A1 B1+C1",
-			"hit B1 11",
-			"hit C1 13",
-			"end A1 24",
-		});
-	}
-
-	/**
-	 * Changing any input to a formula may cause the formula to 'use' a different set of cells.
-	 * Functions like INDEX and OFFSET make this effect obvious, with functions like MATCH
-	 * and VLOOKUP the effect can be subtle.  The presence of error values can also produce this
-	 * effect in almost every function and operator.
-	 */
-	public void testSimpleWithDependencyChange() {
-
-		MySheet ms = new MySheet();
-
-		ms.setCellFormula("A1", "INDEX(C1:E1,1,B1)");
-		ms.setCellValue("B1", 1);
-		ms.setCellValue("C1", 17);
-		ms.setCellValue("D1", 18);
-		ms.setCellValue("E1", 19);
-		ms.clearAllCachedResultValues();
-		ms.getAndClearLog();
-
-		confirmEvaluate(ms, "A1", 17);
-		confirmLog(ms, new String[] {
-			"start A1 INDEX(C1:E1,1,B1)",
-			"value B1 1",
-			"value C1 17",
-			"end A1 17",
-		});
-		ms.setCellValue("B1", 2);
-		ms.getAndClearLog();
-
-		confirmEvaluate(ms, "A1", 18);
-		confirmLog(ms, new String[] {
-			"start A1 INDEX(C1:E1,1,B1)",
-			"hit B1 2",
-			"value D1 18",
-			"end A1 18",
-		});
-
-		// change C1. Note - last time A1 evaluated C1 was not used
-		ms.setCellValue("C1", 15);
-		ms.getAndClearLog();
-		confirmEvaluate(ms, "A1", 18);
-		confirmLog(ms, new String[] {
-			"hit A1 18",
-		});
-
-		// but A1 still uses D1, so if it changes...
-		ms.setCellValue("D1", 25);
-		ms.getAndClearLog();
-		confirmEvaluate(ms, "A1", 25);
-		confirmLog(ms, new String[] {
-			"start A1 INDEX(C1:E1,1,B1)",
-			"hit B1 2",
-			"hit D1 25",
-			"end A1 25",
-		});
-	}
-
-	public void testBlankCells() {
-
-
-		MySheet ms = new MySheet();
-
-		ms.setCellFormula("A1", "sum(B1:D4,B5:E6)");
-		ms.setCellValue("B1", 12);
-		ms.clearAllCachedResultValues();
-		ms.getAndClearLog();
-
-		confirmEvaluate(ms, "A1", 12);
-		confirmLog(ms, new String[] {
-			"start A1 SUM(B1:D4,B5:E6)",
-			"value B1 12",
-			"end A1 12",
-		});
-		ms.setCellValue("B6", 2);
-		ms.getAndClearLog();
-
-		confirmEvaluate(ms, "A1", 14);
-		confirmLog(ms, new String[] {
-			"start A1 SUM(B1:D4,B5:E6)",
-			"hit B1 12",
-			"hit B6 2",
-			"end A1 14",
-		});
-		ms.setCellValue("E4", 2);
-		ms.getAndClearLog();
-
-		confirmEvaluate(ms, "A1", 14);
-		confirmLog(ms, new String[] {
-			"hit A1 14",
-		});
-
-		ms.setCellValue("D1", 1);
-		ms.getAndClearLog();
-
-		confirmEvaluate(ms, "A1", 15);
-		confirmLog(ms, new String[] {
-			"start A1 SUM(B1:D4,B5:E6)",
-			"hit B1 12",
-			"hit D1 1",
-			"hit B6 2",
-			"end A1 15",
-		});
-	}
-
-	/**
-	 * Make sure that when blank cells are changed to value/formula cells, any dependent formulas
-	 * have their cached results cleared.
-	 */
-	public void testBlankCellChangedToValueCell_bug46053() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFRow row = sheet.createRow(0);
-		HSSFCell cellA1 = row.createCell(0);
-		HSSFCell cellB1 = row.createCell(1);
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-		cellA1.setCellFormula("B1+2.2");
-		cellB1.setCellValue(1.5);
-
-		fe.notifyUpdateCell(cellA1);
-		fe.notifyUpdateCell(cellB1);
-
-		CellValue cv;
-		cv = fe.evaluate(cellA1);
-		assertEquals(3.7, cv.getNumberValue(), 0.0);
-
-		cellB1.setCellType(CellType.BLANK);
-		fe.notifyUpdateCell(cellB1);
-		cv = fe.evaluate(cellA1); // B1 was used to evaluate A1
-		assertEquals(2.2, cv.getNumberValue(), 0.0);
-
-		cellB1.setCellValue(0.4);  // changing B1, so A1 cached result should be cleared
-		fe.notifyUpdateCell(cellB1);
-		cv = fe.evaluate(cellA1);
-		if (cv.getNumberValue() == 2.2) {
-			// looks like left-over cached result from before change to B1
-			throw new AssertionFailedError("Identified bug 46053");
-		}
-		assertEquals(2.6, cv.getNumberValue(), 0.0);
-	}
-
-	/**
-	 * same use-case as the test for bug 46053, but checking trace values too
-	 */
-	public void testBlankCellChangedToValueCell() {
-
-		MySheet ms = new MySheet();
-
-		ms.setCellFormula("A1", "B1+2.2");
-		ms.setCellValue("B1", 1.5);
-		ms.clearAllCachedResultValues();
-		ms.clearCell("B1");
-		ms.getAndClearLog();
-
-		confirmEvaluate(ms, "A1", 2.2);
-		confirmLog(ms, new String[] {
-			"start A1 B1+2.2",
-			"end A1 2.2",
-		});
-		ms.setCellValue("B1", 0.4);
-		confirmLog(ms, new String[] {
-			"changeFromBlank B1 0.4",
-			"clear A1",
-		});
-
-		confirmEvaluate(ms, "A1", 2.6);
-		confirmLog(ms, new String[] {
-			"start A1 B1+2.2",
-			"hit B1 0.4",
-			"end A1 2.6",
-		});
-	}
-
-	private static void confirmEvaluate(MySheet ms, String cellRefText, double expectedValue) {
-		ValueEval v = ms.evaluateCell(cellRefText);
-		assertEquals(NumberEval.class, v.getClass());
-		assertEquals(expectedValue, ((NumberEval)v).getNumberValue(), 0.0);
-	}
-
-	private static void confirmLog(MySheet ms, String[] expectedLog) {
-		String[] actualLog = ms.getAndClearLog();
-		int endIx = actualLog.length;
-		PrintStream ps = System.err;
-		if (endIx != expectedLog.length) {
-			ps.println("Log lengths mismatch");
-			dumpCompare(ps, expectedLog, actualLog);
-			throw new AssertionFailedError("Log lengths mismatch");
-		}
-		for (int i=0; i< endIx; i++) {
-			if (!actualLog[i].equals(expectedLog[i])) {
-				String msg = "Log entry mismatch at index " + i;
-				ps.println(msg);
-				dumpCompare(ps, expectedLog, actualLog);
-				throw new AssertionFailedError(msg);
-			}
-		}
-
-	}
-
-	private static void dumpCompare(PrintStream ps, String[] expectedLog, String[] actualLog) {
-		int max = Math.max(actualLog.length, expectedLog.length);
-		ps.println("Index\tExpected\tActual");
-		for(int i=0; i<max; i++) {
-			ps.print(i + "\t");
-			printItem(ps, expectedLog, i);
-			ps.print("\t");
-			printItem(ps, actualLog, i);
-			ps.println();
-		}
-		ps.println();
-		debugPrint(ps, actualLog);
-	}
-
-	private static void printItem(PrintStream ps, String[] ss, int index) {
-		if (index < ss.length) {
-			ps.print(ss[index]);
-		}
-	}
-
-	private static void debugPrint(PrintStream ps, String[] log) {
-		for (String element : log) {
-			ps.println('"' + element + "\",");
-		}
-	}
-
-    private static void testPlainValueCache(Workbook wb, int numberOfSheets) {
-
-        Row row;
-        Cell cell;
-
-        //create summary sheet
-        Sheet summary = wb.createSheet("summary");
-        wb.setActiveSheet(wb.getSheetIndex(summary));
-
-        //formula referring all sheets created below
-        row = summary.createRow(0);
-        Cell summaryCell = row.createCell(0);
-        summaryCell.setCellFormula("SUM(A2:A" + (numberOfSheets + 2) + ")");
-
-
-        //create sheets with cells having (different) numbers
-        // and add a row to summary
-        for (int i = 1; i < numberOfSheets; i++) {
-            Sheet sheet = wb.createSheet("new" + i);
-
-            row = sheet.createRow(0);
-            cell = row.createCell(0);
-            cell.setCellValue(i);
-
-            row = summary.createRow(i);
-            cell = row.createCell(0);
-            cell.setCellFormula("new" + i + "!A1");
-
-        }
-
-
-        //calculate
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        evaluator.evaluateFormulaCellEnum(summaryCell);
-    }
-
-
-    public void testPlainValueCache()  {
-
-        Workbook wb = new HSSFWorkbook();
-        int numberOfSheets = 4098; // Bug 51448 reported that  Evaluation Cache got messed up after 256 sheets
-
-        Row row;
-        Cell cell;
-
-        //create summary sheet
-        Sheet summary = wb.createSheet("summary");
-        wb.setActiveSheet(wb.getSheetIndex(summary));
-
-        //formula referring all sheets created below
-        row = summary.createRow(0);
-        Cell summaryCell = row.createCell(0);
-        summaryCell.setCellFormula("SUM(A2:A" + (numberOfSheets + 2) + ")");
-
-
-        //create sheets with cells having (different) numbers
-        // and add a row to summary
-        for (int i = 1; i < numberOfSheets; i++) {
-            Sheet sheet = wb.createSheet("new" + i);
-
-            row = sheet.createRow(0);
-            cell = row.createCell(0);
-            cell.setCellValue(i);
-
-            row = summary.createRow(i);
-            cell = row.createCell(0);
-            cell.setCellFormula("new" + i + "!A1");
-
-        }
-
-
-        //calculate
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        evaluator.evaluateFormulaCellEnum(summaryCell);
-        assertEquals(8394753.0, summaryCell.getNumericCellValue());
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
deleted file mode 100644
index 7353682..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.formula.ptg.AreaErrPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.util.CellReference;
-
-import org.junit.Test;
-
-/**
- * Tests for {@link FormulaShifter}.
- *
- * @author Josh Micich
- */
-public final class TestFormulaShifter {
-    // Note - the expected result row coordinates here were determined/verified
-    // in Excel 2007 by manually testing.
-
-    /**
-     * Tests what happens to area refs when a range of rows from inside, or overlapping are
-     * moved
-     */
-    @Test
-    public void testShiftAreasSourceRows() {
-
-        // all these operations are on an area ref spanning rows 10 to 20
-        AreaPtg aptg  = createAreaPtg(10, 20);
-
-        confirmAreaShift(aptg,  9, 21, 20, 30, 40);
-        confirmAreaShift(aptg, 10, 21, 20, 30, 40);
-        confirmAreaShift(aptg,  9, 20, 20, 30, 40);
-
-        confirmAreaShift(aptg, 8, 11,  -3, 7, 20); // simple expansion of top
-        // rows containing area top being shifted down:
-        confirmAreaShift(aptg, 8, 11,  3, 13, 20);
-        confirmAreaShift(aptg, 8, 11,  7, 17, 20);
-        confirmAreaShift(aptg, 8, 11,  8, 18, 20);
-        confirmAreaShift(aptg, 8, 11,  9, 12, 20); // note behaviour changes here
-        confirmAreaShift(aptg, 8, 11, 10, 12, 21);
-        confirmAreaShift(aptg, 8, 11, 12, 12, 23);
-        confirmAreaShift(aptg, 8, 11, 13, 10, 20);  // ignored
-
-        // rows from within being moved:
-        confirmAreaShift(aptg, 12, 16,  3, 10, 20);  // stay within - no change
-        confirmAreaShift(aptg, 11, 19, 20, 10, 20);  // move completely out - no change
-        confirmAreaShift(aptg, 16, 17, -6, 10, 20);  // moved exactly to top - no change
-        confirmAreaShift(aptg, 16, 17, -7, 11, 20);  // truncation at top
-        confirmAreaShift(aptg, 12, 16,  4, 10, 20);  // moved exactly to bottom - no change
-        confirmAreaShift(aptg, 12, 16,  6, 10, 17);  // truncation at bottom
-
-        // rows containing area bottom being shifted up:
-        confirmAreaShift(aptg, 18, 22, -1, 10, 19); // simple contraction at bottom
-        confirmAreaShift(aptg, 18, 22, -7, 10, 13); // simple contraction at bottom
-        confirmAreaShift(aptg, 18, 22, -8, 10, 17); // top calculated differently here
-        confirmAreaShift(aptg, 18, 22, -9,  9, 17);
-        confirmAreaShift(aptg, 18, 22,-15, 10, 20); // no change because range would be turned inside out
-        confirmAreaShift(aptg, 15, 19, -7, 13, 20); // dest truncates top (even though src is from inside range)
-        confirmAreaShift(aptg, 19, 23,-12,  7, 18); // complex: src encloses bottom, dest encloses top
-
-        confirmAreaShift(aptg, 18, 22,  5, 10, 25); // simple expansion at bottom
-    }
-    
-    @Test
-    public void testCopyAreasSourceRowsRelRel() {
-
-        // all these operations are on an area ref spanning rows 10 to 20
-        final AreaPtg aptg  = createAreaPtg(10, 20, true, true);
-
-        confirmAreaCopy(aptg,  0, 30, 20, 30, 40, true);
-        confirmAreaCopy(aptg,  15, 25, -15, -1, -1, true); //DeletedRef
-    }
-    
-    @Test
-    public void testCopyAreasSourceRowsRelAbs() {
-
-        // all these operations are on an area ref spanning rows 10 to 20
-        final AreaPtg aptg  = createAreaPtg(10, 20, true, false);
-
-        // Only first row should move
-        confirmAreaCopy(aptg,  0, 30, 20, 20, 30, true);
-        confirmAreaCopy(aptg,  15, 25, -15, -1, -1, true); //DeletedRef
-    }
-    
-    @Test
-    public void testCopyAreasSourceRowsAbsRel() {
-        // aptg is part of a formula in a cell that was just copied to another row
-        // aptg row references should be updated by the difference in rows that the cell was copied
-        // No other references besides the cells that were involved in the copy need to be updated
-        // this makes the row copy significantly different from the row shift, where all references
-        // in the workbook need to track the row shift
-
-        // all these operations are on an area ref spanning rows 10 to 20
-        final AreaPtg aptg  = createAreaPtg(10, 20, false, true);
-
-        // Only last row should move
-        confirmAreaCopy(aptg,  0, 30, 20, 10, 40, true);
-        confirmAreaCopy(aptg,  15, 25, -15, 5, 10, true); //sortTopLeftToBottomRight swapped firstRow and lastRow because firstRow is absolute
-    }
-    
-    @Test
-    public void testCopyAreasSourceRowsAbsAbs() {
-        // aptg is part of a formula in a cell that was just copied to another row
-        // aptg row references should be updated by the difference in rows that the cell was copied
-        // No other references besides the cells that were involved in the copy need to be updated
-        // this makes the row copy significantly different from the row shift, where all references
-        // in the workbook need to track the row shift
-        
-        // all these operations are on an area ref spanning rows 10 to 20
-        final AreaPtg aptg  = createAreaPtg(10, 20, false, false);
-
-        //AbsFirstRow AbsLastRow references should't change when copied to a different row
-        confirmAreaCopy(aptg,  0, 30, 20, 10, 20, false);
-        confirmAreaCopy(aptg,  15, 25, -15, 10, 20, false);
-    }
-    
-    /**
-     * Tests what happens to an area ref when some outside rows are moved to overlap
-     * that area ref
-     */
-    @Test
-    public void testShiftAreasDestRows() {
-        // all these operations are on an area ref spanning rows 20 to 25
-        AreaPtg aptg  = createAreaPtg(20, 25);
-
-        // no change because no overlap:
-        confirmAreaShift(aptg,  5, 10,  9, 20, 25);
-        confirmAreaShift(aptg,  5, 10, 21, 20, 25);
-
-        confirmAreaShift(aptg, 11, 14, 10, 20, 25);
-
-        confirmAreaShift(aptg,   7, 17, 10, -1, -1); // converted to DeletedAreaRef
-        confirmAreaShift(aptg,   5, 15,  7, 23, 25); // truncation at top
-        confirmAreaShift(aptg,  13, 16, 10, 20, 22); // truncation at bottom
-    }
-
-    private static void confirmAreaShift(AreaPtg aptg,
-            int firstRowMoved, int lastRowMoved, int numberRowsMoved,
-            int expectedAreaFirstRow, int expectedAreaLastRow) {
-
-        FormulaShifter fs = FormulaShifter.createForRowShift(0, "", firstRowMoved, lastRowMoved, numberRowsMoved, SpreadsheetVersion.EXCEL2007);
-        boolean expectedChanged = aptg.getFirstRow() != expectedAreaFirstRow || aptg.getLastRow() != expectedAreaLastRow;
-
-        AreaPtg copyPtg = (AreaPtg) aptg.copy(); // clone so we can re-use aptg in calling method
-        Ptg[] ptgs = { copyPtg, };
-        boolean actualChanged = fs.adjustFormula(ptgs, 0);
-        if (expectedAreaFirstRow < 0) {
-            assertEquals(AreaErrPtg.class, ptgs[0].getClass());
-            return;
-        }
-        assertEquals(expectedChanged, actualChanged);
-        assertEquals(copyPtg, ptgs[0]);  // expected to change in place (although this is not a strict requirement)
-        assertEquals(expectedAreaFirstRow, copyPtg.getFirstRow());
-        assertEquals(expectedAreaLastRow, copyPtg.getLastRow());
-
-    }
-    
-    
-    private static void confirmAreaCopy(AreaPtg aptg,
-            int firstRowCopied, int lastRowCopied, int rowOffset,
-            int expectedFirstRow, int expectedLastRow, boolean expectedChanged) {
-
-        final AreaPtg copyPtg = (AreaPtg) aptg.copy(); // clone so we can re-use aptg in calling method
-        final Ptg[] ptgs = { copyPtg, };
-        final FormulaShifter fs = FormulaShifter.createForRowCopy(0, null, firstRowCopied, lastRowCopied, rowOffset, SpreadsheetVersion.EXCEL2007);
-        final boolean actualChanged = fs.adjustFormula(ptgs, 0);
-        
-        // DeletedAreaRef
-        if (expectedFirstRow < 0 || expectedLastRow < 0) {
-            assertEquals("Reference should have shifted off worksheet, producing #REF! error: " + ptgs[0],
-                    AreaErrPtg.class, ptgs[0].getClass());
-            return;
-        }
-        
-        assertEquals("Should this AreaPtg change due to row copy?", expectedChanged, actualChanged);
-        assertEquals("AreaPtgs should be modified in-place when a row containing the AreaPtg is copied", copyPtg, ptgs[0]);  // expected to change in place (although this is not a strict requirement)
-        assertEquals("AreaPtg first row", expectedFirstRow, copyPtg.getFirstRow());
-        assertEquals("AreaPtg last row", expectedLastRow, copyPtg.getLastRow());
-
-    }
-    
-    private static AreaPtg createAreaPtg(int initialAreaFirstRow, int initialAreaLastRow) {
-        return createAreaPtg(initialAreaFirstRow, initialAreaLastRow, false, false);
-    }
-    
-    private static AreaPtg createAreaPtg(int initialAreaFirstRow, int initialAreaLastRow, boolean firstRowRelative, boolean lastRowRelative) {
-        return new AreaPtg(initialAreaFirstRow, initialAreaLastRow, 2, 5, firstRowRelative, lastRowRelative, false, false);
-    }
-
-    @Test
-    public void testShiftSheet() {
-        // 4 sheets, move a sheet from pos 2 to pos 0, i.e. current 0 becomes 1, current 1 becomes pos 2 
-        FormulaShifter shifter = FormulaShifter.createForSheetShift(2, 0);
-        
-        Ptg[] ptgs = new Ptg[] {
-          new Ref3DPtg(new CellReference("first", 0, 0, true, true), 0),
-          new Ref3DPtg(new CellReference("second", 0, 0, true, true), 1),
-          new Ref3DPtg(new CellReference("third", 0, 0, true, true), 2),
-          new Ref3DPtg(new CellReference("fourth", 0, 0, true, true), 3),
-        };
-        
-        shifter.adjustFormula(ptgs, -1);
-        
-        assertEquals("formula previously pointing to sheet 0 should now point to sheet 1", 
-                1, ((Ref3DPtg)ptgs[0]).getExternSheetIndex());
-        assertEquals("formula previously pointing to sheet 1 should now point to sheet 2", 
-                2, ((Ref3DPtg)ptgs[1]).getExternSheetIndex());
-        assertEquals("formula previously pointing to sheet 2 should now point to sheet 0", 
-                0, ((Ref3DPtg)ptgs[2]).getExternSheetIndex());
-        assertEquals("formula previously pointing to sheet 3 should be unchanged", 
-                3, ((Ref3DPtg)ptgs[3]).getExternSheetIndex());
-    }
-
-    @Test
-    public void testShiftSheet2() {
-        // 4 sheets, move a sheet from pos 1 to pos 2, i.e. current 2 becomes 1, current 1 becomes pos 2 
-        FormulaShifter shifter = FormulaShifter.createForSheetShift(1, 2);
-        
-        Ptg[] ptgs = new Ptg[] {
-          new Ref3DPtg(new CellReference("first", 0, 0, true, true), 0),
-          new Ref3DPtg(new CellReference("second", 0, 0, true, true), 1),
-          new Ref3DPtg(new CellReference("third", 0, 0, true, true), 2),
-          new Ref3DPtg(new CellReference("fourth", 0, 0, true, true), 3),
-        };
-
-        shifter.adjustFormula(ptgs, -1);
-        
-        assertEquals("formula previously pointing to sheet 0 should be unchanged", 
-                0, ((Ref3DPtg)ptgs[0]).getExternSheetIndex());
-        assertEquals("formula previously pointing to sheet 1 should now point to sheet 2", 
-                2, ((Ref3DPtg)ptgs[1]).getExternSheetIndex());
-        assertEquals("formula previously pointing to sheet 2 should now point to sheet 1", 
-                1, ((Ref3DPtg)ptgs[2]).getExternSheetIndex());
-        assertEquals("formula previously pointing to sheet 3 should be unchanged", 
-                3, ((Ref3DPtg)ptgs[3]).getExternSheetIndex());
-    }
-    
-    @Test
-    public void testInvalidArgument() {
-        try {
-            FormulaShifter.createForRowShift(1, "name", 1, 2, 0, SpreadsheetVersion.EXCEL97);
-            fail("Should catch exception here");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-
-        try {
-            FormulaShifter.createForRowShift(1, "name", 2, 1, 2, SpreadsheetVersion.EXCEL97);
-            fail("Should catch exception here");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-    }
-    
-    @Test
-    public void testConstructor() {
-        assertNotNull(FormulaShifter.createForRowShift(1, "name", 1, 2, 2, SpreadsheetVersion.EXCEL97));
-    }
-
-    @Test
-    public void testToString() {
-        FormulaShifter shifter = FormulaShifter.createForRowShift(0, "sheet", 123, 456, 789,
-                SpreadsheetVersion.EXCEL2007);
-        assertNotNull(shifter);
-        assertNotNull(shifter.toString());
-        assertTrue(shifter.toString().contains("123"));
-        assertTrue(shifter.toString().contains("456"));
-        assertTrue(shifter.toString().contains("789"));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java
deleted file mode 100644
index f816b6b..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.formula.atp.AnalysisToolPak;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.FunctionEval;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.functions.Function;
-import org.apache.poi.ss.usermodel.CellValue;
-
-/**
- *
- * @author Yegor Kozlov
- */
-public class TestFunctionRegistry extends TestCase {
-
-	public void testRegisterInRuntime() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFRow row = sheet.createRow(0);
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-		HSSFCell cellA = row.createCell(0);
-		cellA.setCellFormula("FISHER(A5)");
-		CellValue cv;
-		try {
-			cv = fe.evaluate(cellA);
-            fail("expectecd exception");
-		} catch (NotImplementedException e) {
-        }
-
-        FunctionEval.registerFunction("FISHER", new Function() {
-            @Override
-            public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-                return ErrorEval.NA;
-            }
-        });
-
-        cv = fe.evaluate(cellA);
-        assertEquals(ErrorEval.NA.getErrorCode(), cv.getErrorValue());
-
-        HSSFCell cellB = row.createCell(1);
-        cellB.setCellFormula("CUBEMEMBERPROPERTY(A5)");
-        try {
-            cv = fe.evaluate(cellB);
-            fail("expectecd exception");
-        } catch (NotImplementedException e) {
-        }
-
-        AnalysisToolPak.registerFunction("CUBEMEMBERPROPERTY", new FreeRefFunction() {
-            @Override
-            public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-                return ErrorEval.NUM_ERROR;
-            }
-        });
-
-        cv = fe.evaluate(cellB);
-        assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), cv.getErrorValue());
-	}
-
-    public void testExceptions() {
-        Function func = new Function() {
-            @Override
-            public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
-                return ErrorEval.NA;
-            }
-        };
-        try {
-            FunctionEval.registerFunction("SUM", func);
-            fail("expectecd exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("POI already implememts SUM" +
-                    ". You cannot override POI's implementations of Excel functions", e.getMessage());
-        }
-        try {
-            FunctionEval.registerFunction("SUMXXX", func);
-            fail("expectecd exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("Unknown function: SUMXXX", e.getMessage());
-        }
-        try {
-            FunctionEval.registerFunction("ISODD", func);
-            fail("expectecd exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("ISODD is a function from the Excel Analysis Toolpack. " +
-                    "Use AnalysisToolpack.registerFunction(String name, FreeRefFunction func) instead.", e.getMessage());
-        }
-
-        FreeRefFunction atpFunc = new FreeRefFunction() {
-            @Override
-            public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-                return ErrorEval.NUM_ERROR;
-            }
-        };
-        try {
-            AnalysisToolPak.registerFunction("ISODD", atpFunc);
-            fail("expectecd exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("POI already implememts ISODD" +
-                    ". You cannot override POI's implementations of Excel functions", e.getMessage());
-        }
-        try {
-            AnalysisToolPak.registerFunction("ISODDXXX", atpFunc);
-            fail("expectecd exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("ISODDXXX is not a function from the Excel Analysis Toolpack.", e.getMessage());
-        }
-        try {
-            AnalysisToolPak.registerFunction("SUM", atpFunc);
-            fail("expectecd exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("SUM is a built-in Excel function. " +
-                    "Use FunctoinEval.registerFunction(String name, Function func) instead.", e.getMessage());
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java
deleted file mode 100644
index 304daff..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-public class TestMissingWorkbook extends TestCase {
-    protected Workbook mainWorkbook;
-    protected Workbook sourceWorkbook;
-    
-    protected final String MAIN_WORKBOOK_FILENAME;
-    protected final String SOURCE_DUMMY_WORKBOOK_FILENAME;
-    protected final String SOURCE_WORKBOOK_FILENAME;
-    
-    public TestMissingWorkbook() {
-        this("52575_main.xls", "source_dummy.xls", "52575_source.xls");
-    }
-    protected TestMissingWorkbook(String MAIN_WORKBOOK_FILENAME, 
-            String SOURCE_DUMMY_WORKBOOK_FILENAME, String SOURCE_WORKBOOK_FILENAME) {
-        this.MAIN_WORKBOOK_FILENAME = MAIN_WORKBOOK_FILENAME; 
-        this.SOURCE_DUMMY_WORKBOOK_FILENAME = SOURCE_DUMMY_WORKBOOK_FILENAME;
-        this.SOURCE_WORKBOOK_FILENAME = SOURCE_WORKBOOK_FILENAME;
-    }
-	
-	@Override
-	protected void setUp() throws Exception {
-		mainWorkbook = HSSFTestDataSamples.openSampleWorkbook(MAIN_WORKBOOK_FILENAME);
-		sourceWorkbook = HSSFTestDataSamples.openSampleWorkbook(SOURCE_WORKBOOK_FILENAME);
-		
-		assertNotNull(mainWorkbook);
-		assertNotNull(sourceWorkbook);
-	}
-
-	public void testMissingWorkbookMissing() throws IOException {
-		FormulaEvaluator evaluator = mainWorkbook.getCreationHelper().createFormulaEvaluator();
-		
-		Sheet lSheet = mainWorkbook.getSheetAt(0);
-		Row lARow = lSheet.getRow(0);
-		Cell lA1Cell = lARow.getCell(0);
-		
-		assertEquals(CellType.FORMULA, lA1Cell.getCellTypeEnum());
-		try {
-			evaluator.evaluateFormulaCellEnum(lA1Cell);
-			fail("Missing external workbook reference exception expected!");
-		}catch(RuntimeException re) {
-			assertTrue("Unexpected exception: " + re, re.getMessage().indexOf(SOURCE_DUMMY_WORKBOOK_FILENAME) != -1);
-		}
-	}
-	
-	public void testMissingWorkbookMissingOverride() throws IOException {
-		Sheet lSheet = mainWorkbook.getSheetAt(0);
-		Cell lA1Cell = lSheet.getRow(0).getCell(0);
-		Cell lB1Cell = lSheet.getRow(1).getCell(0);
-		Cell lC1Cell = lSheet.getRow(2).getCell(0);
-		
-		assertEquals(CellType.FORMULA, lA1Cell.getCellTypeEnum());
-		assertEquals(CellType.FORMULA, lB1Cell.getCellTypeEnum());
-		assertEquals(CellType.FORMULA, lC1Cell.getCellTypeEnum());
-
-		// Check cached values
-        assertEquals(10.0d, lA1Cell.getNumericCellValue(), 0.00001d);
-        assertEquals("POI rocks!", lB1Cell.getStringCellValue());
-        assertEquals(true, lC1Cell.getBooleanCellValue());
-		
-        // Evaluate
-		FormulaEvaluator evaluator = mainWorkbook.getCreationHelper().createFormulaEvaluator();
-        evaluator.setIgnoreMissingWorkbooks(true);
-
-		assertEquals(CellType.NUMERIC, evaluator.evaluateFormulaCellEnum(lA1Cell));
-		assertEquals(CellType.STRING,  evaluator.evaluateFormulaCellEnum(lB1Cell));
-		assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCellEnum(lC1Cell));
-
-		assertEquals(10.0d, lA1Cell.getNumericCellValue(), 0.00001d);
-		assertEquals("POI rocks!", lB1Cell.getStringCellValue());
-		assertEquals(true, lC1Cell.getBooleanCellValue());
-	}
-	
-
-	public void testExistingWorkbook() throws IOException {
-		Sheet lSheet = mainWorkbook.getSheetAt(0);
-		Cell lA1Cell = lSheet.getRow(0).getCell(0);
-		Cell lB1Cell = lSheet.getRow(1).getCell(0);
-		Cell lC1Cell = lSheet.getRow(2).getCell(0);
-		
-		assertEquals(CellType.FORMULA, lA1Cell.getCellTypeEnum());
-		assertEquals(CellType.FORMULA, lB1Cell.getCellTypeEnum());
-		assertEquals(CellType.FORMULA, lC1Cell.getCellTypeEnum());
-
-		FormulaEvaluator lMainWorkbookEvaluator = mainWorkbook.getCreationHelper().createFormulaEvaluator();
-		FormulaEvaluator lSourceEvaluator = sourceWorkbook.getCreationHelper().createFormulaEvaluator();
-		Map<String,FormulaEvaluator> workbooks = new HashMap<String, FormulaEvaluator>();
-		workbooks.put(MAIN_WORKBOOK_FILENAME, lMainWorkbookEvaluator);
-		workbooks.put(SOURCE_DUMMY_WORKBOOK_FILENAME, lSourceEvaluator);
-		lMainWorkbookEvaluator.setupReferencedWorkbooks(workbooks);
-		
-		assertEquals(CellType.NUMERIC, lMainWorkbookEvaluator.evaluateFormulaCellEnum(lA1Cell));
-		assertEquals(CellType.STRING, lMainWorkbookEvaluator.evaluateFormulaCellEnum(lB1Cell));
-		assertEquals(CellType.BOOLEAN, lMainWorkbookEvaluator.evaluateFormulaCellEnum(lC1Cell));
-
-		assertEquals(20.0d, lA1Cell.getNumericCellValue(), 0.00001d);
-		assertEquals("Apache rocks!", lB1Cell.getStringCellValue());
-		assertEquals(false, lC1Cell.getBooleanCellValue());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
deleted file mode 100644
index e40100d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.formula.PlainCellCache.Loc;
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * @author Yegor Kozlov
- */
-public class TestPlainCellCache extends TestCase {
-
-    /**
-     *
-     */
-    public void testLoc(){
-        PlainCellCache cache = new PlainCellCache();
-        for (int bookIndex = 0; bookIndex < 0x1000; bookIndex += 0x100) {
-            for (int sheetIndex = 0; sheetIndex < 0x1000; sheetIndex += 0x100) {
-                for (int rowIndex = 0; rowIndex < 0x100000; rowIndex += 0x1000) {
-                    for (int columnIndex = 0; columnIndex < 0x4000; columnIndex += 0x100) {
-                        Loc loc = new Loc(bookIndex, sheetIndex, rowIndex, columnIndex);
-                        assertEquals(bookIndex, loc.getBookIndex());
-                        assertEquals(sheetIndex, loc.getSheetIndex());
-                        assertEquals(rowIndex, loc.getRowIndex());
-                        assertEquals(columnIndex, loc.getColumnIndex());
-
-                        Loc sameLoc = new Loc(bookIndex, sheetIndex, rowIndex, columnIndex);
-                        assertEquals(loc.hashCode(), sameLoc.hashCode());
-                        assertTrue(loc.equals(sameLoc));
-
-                        assertNull(cache.get(loc));
-                        PlainValueCellCacheEntry entry = new PlainValueCellCacheEntry(new NumberEval(0));
-                        cache.put(loc, entry);
-                        assertSame(entry, cache.get(loc));
-                        cache.remove(loc);
-                        assertNull(cache.get(loc));
-
-                        cache.put(loc, entry);
-                    }
-                    cache.clear();
-                }
-            }
-
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java
deleted file mode 100644
index 69b0c9b..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.formula.SheetNameFormatter;
-
-/**
- * Tests for {@link SheetNameFormatter}
- * 
- * @author Josh Micich
- */
-public final class TestSheetNameFormatter extends TestCase {
-
-	private static void confirmFormat(String rawSheetName, String expectedSheetNameEncoding) {
-		assertEquals(expectedSheetNameEncoding, SheetNameFormatter.format(rawSheetName));
-	}
-
-	/**
-	 * Tests main public method 'format' 
-	 */
-	public void testFormat() {
-		
-		confirmFormat("abc", "abc");
-		confirmFormat("123", "'123'");
-		
-		confirmFormat("my sheet", "'my sheet'"); // space
-		confirmFormat("A:MEM", "'A:MEM'"); // colon
-
-		confirmFormat("O'Brian", "'O''Brian'"); // single quote gets doubled
-		
-		
-		confirmFormat("3rdTimeLucky", "'3rdTimeLucky'"); // digit in first pos
-		confirmFormat("_", "_"); // plain underscore OK
-		confirmFormat("my_3rd_sheet", "my_3rd_sheet"); // underscores and digits OK
-		confirmFormat("A12220", "'A12220'"); 
-		confirmFormat("TAXRETURN19980415", "TAXRETURN19980415"); 
-	}
-	
-	public void testBooleanLiterals() {
-		confirmFormat("TRUE", "'TRUE'");
-		confirmFormat("FALSE", "'FALSE'");
-		confirmFormat("True", "'True'");
-		confirmFormat("fAlse", "'fAlse'");
-		
-		confirmFormat("Yes", "Yes");
-		confirmFormat("No", "No");
-	}
-	
-	private static void confirmCellNameMatch(String rawSheetName, boolean expected) {
-		assertEquals(expected, SheetNameFormatter.nameLooksLikePlainCellReference(rawSheetName));
-	}
-	
-	/**
-	 * Tests functionality to determine whether a sheet name containing only letters and digits
-	 * would look (to Excel) like a cell name.
-	 */
-	public void testLooksLikePlainCellReference() {
-		
-		confirmCellNameMatch("A1", true);
-		confirmCellNameMatch("a111", true);
-		confirmCellNameMatch("AA", false);
-		confirmCellNameMatch("aa1", true);
-		confirmCellNameMatch("A1A", false);
-		confirmCellNameMatch("A1A1", false);
-		confirmCellNameMatch("Sh3", false);
-		confirmCellNameMatch("SALES20080101", false); // out of range
-	}
-	
-	private static void confirmCellRange(String text, int numberOfPrefixLetters, boolean expected) {
-		String prefix = text.substring(0, numberOfPrefixLetters);
-		String suffix = text.substring(numberOfPrefixLetters);
-		assertEquals(expected, SheetNameFormatter.cellReferenceIsWithinRange(prefix, suffix));
-	}
-	
-	/**
-	 * Tests exact boundaries for names that look very close to cell names (i.e. contain 1 or more
-	 * letters followed by one or more digits).
-	 */
-	public void testCellRange() {
-		confirmCellRange("A1", 1, true);
-		confirmCellRange("a111", 1, true);
-		confirmCellRange("A65536", 1, true);
-		confirmCellRange("A65537", 1, false);
-		confirmCellRange("iv1", 2, true);
-		confirmCellRange("IW1", 2, false);
-		confirmCellRange("AAA1", 3, false);
-		confirmCellRange("a111", 1, true);
-		confirmCellRange("Sheet1", 6, false);
-		confirmCellRange("iV65536", 2, true);  // max cell in Excel 97-2003
-		confirmCellRange("IW65537", 2, false);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
deleted file mode 100644
index 7c89363..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.AreaErrPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.DeletedArea3DPtg;
-import org.apache.poi.ss.formula.ptg.DeletedRef3DPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RefErrorPtg;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests {@link WorkbookEvaluator}.
- *
- * @author Josh Micich
- */
-public class TestWorkbookEvaluator {
-
-    private static final double EPSILON = 0.0000001;
-
-    private static ValueEval evaluateFormula(Ptg[] ptgs) {
-        OperationEvaluationContext ec = new OperationEvaluationContext(null, null, 0, 0, 0, null);
-        return new WorkbookEvaluator(null, null, null).evaluateFormula(ec, ptgs);
-    }
-
-    /**
-     * Make sure that the evaluator can directly handle tAttrSum (instead of relying on re-parsing
-     * the whole formula which converts tAttrSum to tFuncVar("SUM") )
-     */
-    @Test
-    public void testAttrSum() {
-
-        Ptg[] ptgs = {
-            new IntPtg(42),
-            AttrPtg.SUM,
-        };
-
-        ValueEval result = evaluateFormula(ptgs);
-        assertEquals(42, ((NumberEval)result).getNumberValue(), 0.0);
-    }
-
-    /**
-     * Make sure that the evaluator can directly handle (deleted) ref error tokens
-     * (instead of relying on re-parsing the whole formula which converts these
-     * to the error constant #REF! )
-     */
-    @Test
-    public void testRefErr() {
-
-        confirmRefErr(new RefErrorPtg());
-        confirmRefErr(new AreaErrPtg());
-        confirmRefErr(new DeletedRef3DPtg(0));
-        confirmRefErr(new DeletedArea3DPtg(0));
-    }
-    private static void confirmRefErr(Ptg ptg) {
-        Ptg[] ptgs = {
-            ptg,
-        };
-
-        ValueEval result = evaluateFormula(ptgs);
-        assertEquals(ErrorEval.REF_INVALID, result);
-    }
-
-    /**
-     * Make sure that the evaluator can directly handle tAttrSum (instead of relying on re-parsing
-     * the whole formula which converts tAttrSum to tFuncVar("SUM") )
-     */
-    @Test
-    public void testMemFunc() {
-
-        Ptg[] ptgs = {
-            new IntPtg(42),
-            AttrPtg.SUM,
-        };
-
-        ValueEval result = evaluateFormula(ptgs);
-        assertEquals(42, ((NumberEval)result).getNumberValue(), 0.0);
-    }
-
-
-    @Test
-    public void testEvaluateMultipleWorkbooks() {
-        HSSFWorkbook wbA = HSSFTestDataSamples.openSampleWorkbook("multibookFormulaA.xls");
-        HSSFWorkbook wbB = HSSFTestDataSamples.openSampleWorkbook("multibookFormulaB.xls");
-
-        HSSFFormulaEvaluator evaluatorA = new HSSFFormulaEvaluator(wbA);
-        HSSFFormulaEvaluator evaluatorB = new HSSFFormulaEvaluator(wbB);
-
-        // Hook up the workbook evaluators to enable evaluation of formulas across books
-        String[] bookNames = { "multibookFormulaA.xls", "multibookFormulaB.xls", };
-        HSSFFormulaEvaluator[] evaluators = { evaluatorA, evaluatorB, };
-        HSSFFormulaEvaluator.setupEnvironment(bookNames, evaluators);
-
-        HSSFCell cell;
-
-        HSSFSheet aSheet1 = wbA.getSheetAt(0);
-        HSSFSheet bSheet1 = wbB.getSheetAt(0);
-
-        // Simple case - single link from wbA to wbB
-        confirmFormula(wbA, 0, 0, 0, "[multibookFormulaB.xls]BSheet1!B1");
-        cell = aSheet1.getRow(0).getCell(0);
-        confirmEvaluation(35, evaluatorA, cell);
-
-
-        // more complex case - back link into wbA
-        // [wbA]ASheet1!A2 references (among other things) [wbB]BSheet1!B2
-        confirmFormula(wbA, 0, 1, 0, "[multibookFormulaB.xls]BSheet1!$B$2+2*A3");
-        // [wbB]BSheet1!B2 references (among other things) [wbA]AnotherSheet!A1:B2
-        confirmFormula(wbB, 0, 1, 1, "SUM([multibookFormulaA.xls]AnotherSheet!$A$1:$B$2)+B3");
-
-        cell = aSheet1.getRow(1).getCell(0);
-        confirmEvaluation(264, evaluatorA, cell);
-
-        // change [wbB]BSheet1!B3 (from 50 to 60)
-        HSSFCell cellB3 = bSheet1.getRow(2).getCell(1);
-        cellB3.setCellValue(60);
-        evaluatorB.notifyUpdateCell(cellB3);
-        confirmEvaluation(274, evaluatorA, cell);
-
-        // change [wbA]ASheet1!A3 (from 100 to 80)
-        HSSFCell cellA3 = aSheet1.getRow(2).getCell(0);
-        cellA3.setCellValue(80);
-        evaluatorA.notifyUpdateCell(cellA3);
-        confirmEvaluation(234, evaluatorA, cell);
-
-        // change [wbA]AnotherSheet!A1 (from 2 to 3)
-        HSSFCell cellA1 = wbA.getSheetAt(1).getRow(0).getCell(0);
-        cellA1.setCellValue(3);
-        evaluatorA.notifyUpdateCell(cellA1);
-        confirmEvaluation(235, evaluatorA, cell);
-    }
-
-    private static void confirmEvaluation(double expectedValue, HSSFFormulaEvaluator fe, HSSFCell cell) {
-        assertEquals(expectedValue, fe.evaluate(cell).getNumberValue(), 0.0);
-    }
-
-    private static void confirmFormula(HSSFWorkbook wb, int sheetIndex, int rowIndex, int columnIndex,
-            String expectedFormula) {
-        HSSFCell cell = wb.getSheetAt(sheetIndex).getRow(rowIndex).getCell(columnIndex);
-        assertEquals(expectedFormula, cell.getCellFormula());
-    }
-
-    /**
-     * This test makes sure that any {@link MissingArgEval} that propagates to
-     * the result of a function gets translated to {@link BlankEval}.
-     */
-    @Test
-    public void testMissingArg() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFRow row = sheet.createRow(0);
-        HSSFCell cell = row.createCell(0);
-        cell.setCellFormula("1+IF(1,,)");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        CellValue cv = null;
-        try {
-            cv = fe.evaluate(cell);
-        } catch (RuntimeException e) {
-            fail("Missing arg result not being handled correctly.");
-        }
-        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-        // adding blank to 1.0 gives 1.0
-        assertEquals(1.0, cv.getNumberValue(), 0.0);
-
-        // check with string operand
-        cell.setCellFormula("\"abc\"&IF(1,,)");
-        fe.notifySetFormula(cell);
-        cv = fe.evaluate(cell);
-        assertEquals(CellType.STRING, cv.getCellTypeEnum());
-        // adding blank to "abc" gives "abc"
-        assertEquals("abc", cv.getStringValue());
-
-        // check CHOOSE()
-        cell.setCellFormula("\"abc\"&CHOOSE(2,5,,9)");
-        fe.notifySetFormula(cell);
-        cv = fe.evaluate(cell);
-        assertEquals(CellType.STRING, cv.getCellTypeEnum());
-        // adding blank to "abc" gives "abc"
-        assertEquals("abc", cv.getStringValue());
-    }
-
-    /**
-     * Functions like IF, INDIRECT, INDEX, OFFSET etc can return AreaEvals which
-     * should be dereferenced by the evaluator
-     * @throws IOException 
-     */
-    @Test
-    public void testResultOutsideRange() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        try {
-            Cell cell = wb.createSheet("Sheet1").createRow(0).createCell(0);
-            cell.setCellFormula("D2:D5"); // IF(TRUE,D2:D5,D2) or  OFFSET(D2:D5,0,0) would work too
-            FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-            CellValue cv;
-            try {
-                cv = fe.evaluate(cell);
-            } catch (IllegalArgumentException e) {
-                if ("Specified row index (0) is outside the allowed range (1..4)".equals(e.getMessage())) {
-                    fail("Identified bug in result dereferencing");
-                }
-                throw new RuntimeException(e);
-            }
-            assertEquals(CellType.ERROR, cv.getCellTypeEnum());
-            assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), cv.getErrorValue());
-
-            // verify circular refs are still detected properly
-            fe.clearAllCachedResultValues();
-            cell.setCellFormula("OFFSET(A1,0,0)");
-            cv = fe.evaluate(cell);
-            assertEquals(CellType.ERROR, cv.getCellTypeEnum());
-            assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cv.getErrorValue());
-        } finally {
-            wb.close();
-        }
-    }
-
-
-    /**
-     * formulas with defined names.
-     * @throws IOException 
-     */
-    @Test
-    public void testNamesInFormulas() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-        
-        Name name1 = wb.createName();
-        name1.setNameName("aConstant");
-        name1.setRefersToFormula("3.14");
-
-        Name name2 = wb.createName();
-        name2.setNameName("aFormula");
-        name2.setRefersToFormula("SUM(Sheet1!$A$1:$A$3)");
-
-        Name name3 = wb.createName();
-        name3.setNameName("aSet");
-        name3.setRefersToFormula("Sheet1!$A$2:$A$4");
-
-        
-        Row row0 = sheet.createRow(0);
-        Row row1 = sheet.createRow(1);
-        Row row2 = sheet.createRow(2);
-        Row row3 = sheet.createRow(3);
-        row0.createCell(0).setCellValue(2);
-        row1.createCell(0).setCellValue(5);
-        row2.createCell(0).setCellValue(3);
-        row3.createCell(0).setCellValue(7);
-        
-        row0.createCell(2).setCellFormula("aConstant");
-        row1.createCell(2).setCellFormula("aFormula");
-        row2.createCell(2).setCellFormula("SUM(aSet)");
-        row3.createCell(2).setCellFormula("aConstant+aFormula+SUM(aSet)");
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals(3.14, fe.evaluate(row0.getCell(2)).getNumberValue(), EPSILON);
-        assertEquals(10.0, fe.evaluate(row1.getCell(2)).getNumberValue(), EPSILON);
-        assertEquals(15.0, fe.evaluate(row2.getCell(2)).getNumberValue(), EPSILON);
-        assertEquals(28.14, fe.evaluate(row3.getCell(2)).getNumberValue(), EPSILON);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testIgnoreMissingWorkbooks() {
-        // TODO: update this test for meaningful functional behavior
-        WorkbookEvaluator evaluator = new WorkbookEvaluator(null, null, null);
-        assertFalse(evaluator.isIgnoreMissingWorkbooks());
-
-        evaluator.setIgnoreMissingWorkbooks(true);
-        assertTrue(evaluator.isIgnoreMissingWorkbooks());
-
-        evaluator.setIgnoreMissingWorkbooks(false);
-        assertFalse(evaluator.isIgnoreMissingWorkbooks());
-    }
-
-    @Test
-    public void testDebugEvaluationOutputForNextEval() {
-        // TODO: update this test for meaningful functional behavior
-        WorkbookEvaluator evaluator = new WorkbookEvaluator(null, null, null);
-        assertFalse(evaluator.isDebugEvaluationOutputForNextEval());
-
-        evaluator.setDebugEvaluationOutputForNextEval(true);
-        assertTrue(evaluator.isDebugEvaluationOutputForNextEval());
-
-        evaluator.setDebugEvaluationOutputForNextEval(false);
-        assertFalse(evaluator.isDebugEvaluationOutputForNextEval());
-    }
-    
-// Test IF-Equals Formula Evaluation (bug 58591)
-    
-    private Workbook testIFEqualsFormulaEvaluation_setup(String formula, CellType a1CellType) {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("IFEquals");
-        Row row = sheet.createRow(0);
-        Cell A1 = row.createCell(0);
-        Cell B1 = row.createCell(1);
-        Cell C1 = row.createCell(2);
-        Cell D1 = row.createCell(3);
-        
-        switch (a1CellType) {
-            case NUMERIC:
-                A1.setCellValue(1.0);
-                // "A1=1" should return true
-                break;
-            case STRING:
-                A1.setCellValue("1");
-                // "A1=1" should return false
-                // "A1=\"1\"" should return true
-                break;
-            case BOOLEAN:
-                A1.setCellValue(true);
-                // "A1=1" should return true
-                break;
-            case FORMULA:
-                A1.setCellFormula("1");
-                // "A1=1" should return true
-                break;
-            case BLANK:
-                A1.setCellValue((String) null);
-                // "A1=1" should return false
-                break;
-            default:
-                throw new IllegalArgumentException("unexpected cell type: " + a1CellType);
-        }
-        B1.setCellValue(2.0);
-        C1.setCellValue(3.0);
-        D1.setCellFormula(formula);
-        
-        return wb;
-    }
-    
-    private void testIFEqualsFormulaEvaluation_teardown(Workbook wb) {
-        try {
-            wb.close();
-        } catch (final IOException e) {
-            fail("Unable to close workbook");
-        }
-    }
-    
-    
-    
-    private void testIFEqualsFormulaEvaluation_evaluate(
-        String formula, CellType cellType, String expectedFormula, double expectedResult) {
-        Workbook wb = testIFEqualsFormulaEvaluation_setup(formula, cellType);
-        Cell D1 = wb.getSheet("IFEquals").getRow(0).getCell(3);
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        CellValue result = eval.evaluate(D1);
-        
-        // Call should not modify the contents
-        assertEquals(CellType.FORMULA, D1.getCellTypeEnum());
-        assertEquals(expectedFormula, D1.getCellFormula());
-        
-        assertEquals(CellType.NUMERIC, result.getCellTypeEnum());
-        assertEquals(expectedResult, result.getNumberValue(), EPSILON);
-        
-        testIFEqualsFormulaEvaluation_teardown(wb);
-    }
-    
-    private void testIFEqualsFormulaEvaluation_eval(
-            final String formula, final CellType cellType, final String expectedFormula, final double expectedValue) {
-        testIFEqualsFormulaEvaluation_evaluate(formula, cellType, expectedFormula, expectedValue);
-        testIFEqualsFormulaEvaluation_evaluateFormulaCell(formula, cellType, expectedFormula, expectedValue);
-        testIFEqualsFormulaEvaluation_evaluateInCell(formula, cellType, expectedFormula, expectedValue);
-        testIFEqualsFormulaEvaluation_evaluateAll(formula, cellType, expectedFormula, expectedValue);
-        testIFEqualsFormulaEvaluation_evaluateAllFormulaCells(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_NumericLiteral() {
-        final String formula = "IF(A1=1, 2, 3)";
-        final CellType cellType = CellType.NUMERIC;
-        final String expectedFormula = "IF(A1=1,2,3)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_Numeric() {
-        final String formula = "IF(A1=1, B1, C1)";
-        final CellType cellType = CellType.NUMERIC;
-        final String expectedFormula = "IF(A1=1,B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_NumericCoerceToString() {
-        final String formula = "IF(A1&\"\"=\"1\", B1, C1)";
-        final CellType cellType = CellType.NUMERIC;
-        final String expectedFormula = "IF(A1&\"\"=\"1\",B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_String() {
-        final String formula = "IF(A1=1, B1, C1)";
-        final CellType cellType = CellType.STRING;
-        final String expectedFormula = "IF(A1=1,B1,C1)";
-        final double expectedValue = 3.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_StringCompareToString() {
-        final String formula = "IF(A1=\"1\", B1, C1)";
-        final CellType cellType = CellType.STRING;
-        final String expectedFormula = "IF(A1=\"1\",B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_StringCoerceToNumeric() {
-        final String formula = "IF(A1+0=1, B1, C1)";
-        final CellType cellType = CellType.STRING;
-        final String expectedFormula = "IF(A1+0=1,B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Ignore("Bug 58591: this test currently fails")
-    @Test
-    public void testIFEqualsFormulaEvaluation_Boolean() {
-        final String formula = "IF(A1=1, B1, C1)";
-        final CellType cellType = CellType.BOOLEAN;
-        final String expectedFormula = "IF(A1=1,B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Ignore("Bug 58591: this test currently fails")
-    @Test
-    public void testIFEqualsFormulaEvaluation_BooleanSimple() {
-        final String formula = "3-(A1=1)";
-        final CellType cellType = CellType.BOOLEAN;
-        final String expectedFormula = "3-(A1=1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_Formula() {
-        final String formula = "IF(A1=1, B1, C1)";
-        final CellType cellType = CellType.FORMULA;
-        final String expectedFormula = "IF(A1=1,B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_Blank() {
-        final String formula = "IF(A1=1, B1, C1)";
-        final CellType cellType = CellType.BLANK;
-        final String expectedFormula = "IF(A1=1,B1,C1)";
-        final double expectedValue = 3.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Test
-    public void testIFEqualsFormulaEvaluation_BlankCompareToZero() {
-        final String formula = "IF(A1=0, B1, C1)";
-        final CellType cellType = CellType.BLANK;
-        final String expectedFormula = "IF(A1=0,B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Ignore("Bug 58591: this test currently fails")
-    @Test
-    public void testIFEqualsFormulaEvaluation_BlankInverted() {
-        final String formula = "IF(NOT(A1)=1, B1, C1)";
-        final CellType cellType = CellType.BLANK;
-        final String expectedFormula = "IF(NOT(A1)=1,B1,C1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    @Ignore("Bug 58591: this test currently fails")
-    @Test
-    public void testIFEqualsFormulaEvaluation_BlankInvertedSimple() {
-        final String formula = "3-(NOT(A1)=1)";
-        final CellType cellType = CellType.BLANK;
-        final String expectedFormula = "3-(NOT(A1)=1)";
-        final double expectedValue = 2.0;
-        testIFEqualsFormulaEvaluation_eval(formula, cellType, expectedFormula, expectedValue);
-    }
-    
-    
-    private void testIFEqualsFormulaEvaluation_evaluateFormulaCell(
-            String formula, CellType cellType, String expectedFormula, double expectedResult) {
-        Workbook wb = testIFEqualsFormulaEvaluation_setup(formula, cellType);
-        Cell D1 = wb.getSheet("IFEquals").getRow(0).getCell(3);
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        CellType resultCellType = eval.evaluateFormulaCellEnum(D1);
-        
-        // Call should modify the contents, but leave the formula intact
-        assertEquals(CellType.FORMULA, D1.getCellTypeEnum());
-        assertEquals(expectedFormula, D1.getCellFormula());
-        assertEquals(CellType.NUMERIC, resultCellType);
-        assertEquals(CellType.NUMERIC, D1.getCachedFormulaResultTypeEnum());
-        assertEquals(expectedResult, D1.getNumericCellValue(), EPSILON);
-        
-        testIFEqualsFormulaEvaluation_teardown(wb);
-    }
-    
-    private void testIFEqualsFormulaEvaluation_evaluateInCell(
-            String formula, CellType cellType, String expectedFormula, double expectedResult) {
-        Workbook wb = testIFEqualsFormulaEvaluation_setup(formula, cellType);
-        Cell D1 = wb.getSheet("IFEquals").getRow(0).getCell(3);
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        Cell result = eval.evaluateInCell(D1);
-        
-        // Call should modify the contents and replace the formula with the result
-        assertSame(D1, result); // returns the same cell that was provided as an argument so that calls can be chained.
-        try {
-            D1.getCellFormula();
-            fail("cell formula should be overwritten with formula result");
-        } catch (final IllegalStateException expected) { }
-        assertEquals(CellType.NUMERIC, D1.getCellTypeEnum());
-        assertEquals(expectedResult, D1.getNumericCellValue(), EPSILON);
-        
-        testIFEqualsFormulaEvaluation_teardown(wb);
-    }
-    
-    private void testIFEqualsFormulaEvaluation_evaluateAll(
-            String formula, CellType cellType, String expectedFormula, double expectedResult) {
-        Workbook wb = testIFEqualsFormulaEvaluation_setup(formula, cellType);
-        Cell D1 = wb.getSheet("IFEquals").getRow(0).getCell(3);
-        
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-        eval.evaluateAll();
-        
-        // Call should modify the contents
-        assertEquals(CellType.FORMULA, D1.getCellTypeEnum());
-        assertEquals(expectedFormula, D1.getCellFormula());
-        
-        assertEquals(CellType.NUMERIC, D1.getCachedFormulaResultTypeEnum());
-        assertEquals(expectedResult, D1.getNumericCellValue(), EPSILON);
-        
-        testIFEqualsFormulaEvaluation_teardown(wb);
-    }
-    
-    private void testIFEqualsFormulaEvaluation_evaluateAllFormulaCells(
-            String formula, CellType cellType, String expectedFormula, double expectedResult) {
-        Workbook wb = testIFEqualsFormulaEvaluation_setup(formula, cellType);
-        Cell D1 = wb.getSheet("IFEquals").getRow(0).getCell(3);
-        
-        HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
-        
-        // Call should modify the contents
-        assertEquals(CellType.FORMULA, D1.getCellTypeEnum());
-        // whitespace gets deleted because formula is parsed and re-rendered
-        assertEquals(expectedFormula, D1.getCellFormula());
-        
-        assertEquals(CellType.NUMERIC, D1.getCachedFormulaResultTypeEnum());
-        assertEquals(expectedResult, D1.getNumericCellValue(), EPSILON);
-        
-        testIFEqualsFormulaEvaluation_teardown(wb);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java b/trunk/src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
deleted file mode 100644
index 673cb95..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Allows tests to execute {@link WorkbookEvaluator}s and track the internal workings.
- *
- * @author Josh Micich
- */
-public final class WorkbookEvaluatorTestHelper {
-
-	private WorkbookEvaluatorTestHelper() {
-		// no instances of this class
-	}
-
-	public static WorkbookEvaluator createEvaluator(HSSFWorkbook wb, EvaluationListener listener) {
-		return new WorkbookEvaluator(HSSFEvaluationWorkbook.create(wb), listener, null, null);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java
deleted file mode 100644
index 95f5ea0..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-public class TestDateParser {
-    @Test
-    public void testFailWhenNoDate() {
-        try {
-            DateParser.parseDate("potato");
-            fail("Shouldn't parse potato!");
-        } catch (EvaluationException e) {
-            assertEquals(ErrorEval.VALUE_INVALID, e.getErrorEval());
-        }
-    }
-
-    @Test
-    public void testFailWhenLooksLikeDateButItIsnt() {
-        try {
-            DateParser.parseDate("potato/cucumber/banana");
-            fail("Shouldn't parse this thing!");
-        } catch (EvaluationException e) {
-            assertEquals(ErrorEval.VALUE_INVALID, e.getErrorEval());
-        }
-    }
-
-    @Test
-    public void testFailWhenIsInvalidDate() {
-        try {
-            DateParser.parseDate("13/13/13");
-            fail("Shouldn't parse this thing!");
-        } catch (EvaluationException e) {
-            assertEquals(ErrorEval.VALUE_INVALID, e.getErrorEval());
-        }
-    }
-
-    @Test
-    public void testShouldParseValidDate() throws EvaluationException {
-        Calendar expDate = LocaleUtil.getLocaleCalendar(1984, Calendar.OCTOBER, 20);
-        Calendar actDate = DateParser.parseDate("1984/10/20");
-        assertEquals("Had: " + expDate.getTime() + " and " + actDate.getTime() + "/" + 
-                expDate.getTimeInMillis() + "ms and " + actDate.getTimeInMillis() + "ms", 
-                expDate, actDate);
-    }
-
-    @Test
-    public void testShouldIgnoreTimestamp() throws EvaluationException {
-        Calendar expDate = LocaleUtil.getLocaleCalendar(1984, Calendar.OCTOBER, 20);
-        Calendar actDate = DateParser.parseDate("1984/10/20 12:34:56");
-        assertEquals("Had: " + expDate.getTime() + " and " + actDate.getTime() + "/" + 
-                expDate.getTimeInMillis() + "ms and " + actDate.getTimeInMillis() + "ms", 
-                expDate, actDate);
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java
deleted file mode 100644
index 3a0a5b9..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellReference;
-
-import junit.framework.TestCase;
-
-/**
- * Testcase for 'Analysis Toolpak' function IFERROR()
- * 
- * @author Johan Karlsteen
- */
-public class TestIfError extends TestCase {
-
-    /**
-     * =IFERROR(210/35,\"Error in calculation\")"  Divides 210 by 35 and returns 6.0
-     * =IFERROR(55/0,\"Error in calculation\")"    Divides 55 by 0 and returns the error text
-     * =IFERROR(C1,\"Error in calculation\")"      References the result of dividing 55 by 0 and returns the error text
-     */
-    public static void testEvaluate(){
-        Workbook wb = new HSSFWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row1 = sh.createRow(0);
-        Row row2 = sh.createRow(1);
-
-        // Create cells
-        row1.createCell(0, CellType.NUMERIC);
-        row1.createCell(1, CellType.NUMERIC);
-        row1.createCell(2, CellType.NUMERIC);
-        row2.createCell(0, CellType.NUMERIC);
-        row2.createCell(1, CellType.NUMERIC);
-
-        // Create references
-        CellReference a1 = new CellReference("A1");
-        CellReference a2 = new CellReference("A2");
-        CellReference b1 = new CellReference("B1");
-        CellReference b2 = new CellReference("B2");
-        CellReference c1 = new CellReference("C1");
-        
-        // Set values
-        sh.getRow(a1.getRow()).getCell(a1.getCol()).setCellValue(210);
-        sh.getRow(a2.getRow()).getCell(a2.getCol()).setCellValue(55);
-        sh.getRow(b1.getRow()).getCell(b1.getCol()).setCellValue(35);
-        sh.getRow(b2.getRow()).getCell(b2.getCol()).setCellValue(0);
-        sh.getRow(c1.getRow()).getCell(c1.getCol()).setCellFormula("A1/B2");
-        
-        Cell cell1 = sh.createRow(3).createCell(0);
-        cell1.setCellFormula("IFERROR(A1/B1,\"Error in calculation\")");
-        Cell cell2 = sh.createRow(3).createCell(0);
-        cell2.setCellFormula("IFERROR(A2/B2,\"Error in calculation\")");
-        Cell cell3 = sh.createRow(3).createCell(0);
-        cell3.setCellFormula("IFERROR(C1,\"error\")");
-        
-        double accuracy = 1E-9;
-
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        assertEquals("Checks that the cell is numeric",
-        		CellType.NUMERIC, evaluator.evaluate(cell1).getCellTypeEnum());
-        assertEquals("Divides 210 by 35 and returns 6.0",
-                6.0, evaluator.evaluate(cell1).getNumberValue(), accuracy);
-        
-        
-        assertEquals("Checks that the cell is numeric",
-        		CellType.STRING, evaluator.evaluate(cell2).getCellTypeEnum());
-        assertEquals("Rounds -10 to a nearest multiple of -3 (-9)",
-                "Error in calculation", evaluator.evaluate(cell2).getStringValue());
-        
-        assertEquals("Check that C1 returns string", 
-        		CellType.STRING, evaluator.evaluate(cell3).getCellTypeEnum());
-        assertEquals("Check that C1 returns string \"error\"", 
-        		"error", evaluator.evaluate(cell3).getStringValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java
deleted file mode 100644
index 2338fbb..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.atp;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.*;
-
-/**
- * Testcase for 'Analysis Toolpak' function MROUND()
- * 
- * @author Yegor Kozlov
- */
-public class TestMRound extends TestCase {
-
-    /**
-=MROUND(10, 3) 	Rounds 10 to a nearest multiple of 3 (9)
-=MROUND(-10, -3) 	Rounds -10 to a nearest multiple of -3 (-9)
-=MROUND(1.3, 0.2) 	Rounds 1.3 to a nearest multiple of 0.2 (1.4)
-=MROUND(5, -2) 	Returns an error, because -2 and 5 have different signs (#NUM!)     *
-     */
-    public static void testEvaluate(){
-        Workbook wb = new HSSFWorkbook();
-        Sheet sh = wb.createSheet();
-        Cell cell1 = sh.createRow(0).createCell(0);
-        cell1.setCellFormula("MROUND(10, 3)");
-        Cell cell2 = sh.createRow(0).createCell(0);
-        cell2.setCellFormula("MROUND(-10, -3)");
-        Cell cell3 = sh.createRow(0).createCell(0);
-        cell3.setCellFormula("MROUND(1.3, 0.2)");
-        Cell cell4 = sh.createRow(0).createCell(0);
-        cell4.setCellFormula("MROUND(5, -2)");
-        Cell cell5 = sh.createRow(0).createCell(0);
-        cell5.setCellFormula("MROUND(5, 0)");
-
-        double accuracy = 1E-9;
-
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        assertEquals("Rounds 10 to a nearest multiple of 3 (9)",
-                9.0, evaluator.evaluate(cell1).getNumberValue(), accuracy);
-
-        assertEquals("Rounds -10 to a nearest multiple of -3 (-9)",
-                -9.0, evaluator.evaluate(cell2).getNumberValue(), accuracy);
-
-        assertEquals("Rounds 1.3 to a nearest multiple of 0.2 (1.4)",
-                1.4, evaluator.evaluate(cell3).getNumberValue(), accuracy);
-
-        assertEquals("Returns an error, because -2 and 5 have different signs (#NUM!)",
-                ErrorEval.NUM_ERROR.getErrorCode(), evaluator.evaluate(cell4).getErrorValue());
-
-        assertEquals("Returns 0 because the multiple is 0",
-                0.0, evaluator.evaluate(cell5).getNumberValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
deleted file mode 100644
index f92204d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import static org.apache.poi.ss.formula.eval.ErrorEval.NAME_INVALID;
-import static org.apache.poi.ss.formula.eval.ErrorEval.VALUE_INVALID;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.AreaEvalBase;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-import junit.framework.TestCase;
-
-public class TestNetworkdaysFunction extends TestCase {
-
-    private static final String STARTING_DATE = "2008/10/01";
-    private static final String END_DATE = "2009/03/01";
-    private static final String FIRST_HOLIDAY = "2008/11/26";
-    private static final String SECOND_HOLIDAY = "2008/12/04";
-    private static final String THIRD_HOLIDAY = "2009/01/21";
-
-    private static final OperationEvaluationContext EC = new OperationEvaluationContext(null, null, 1, 1, 1, null);
-
-    public void testFailWhenNoArguments() {
-        assertEquals(VALUE_INVALID, NetworkdaysFunction.instance.evaluate(new ValueEval[0], null));
-    }
-
-    public void testFailWhenLessThan2Arguments() {
-        assertEquals(VALUE_INVALID, NetworkdaysFunction.instance.evaluate(new ValueEval[1], null));
-    }
-
-    public void testFailWhenMoreThan3Arguments() {
-        assertEquals(VALUE_INVALID, NetworkdaysFunction.instance.evaluate(new ValueEval[4], null));
-    }
-
-    public void testFailWhenArgumentsAreNotDates() {
-        assertEquals(VALUE_INVALID, NetworkdaysFunction.instance.evaluate(new ValueEval[]{ new StringEval("Potato"),
-                new StringEval("Cucumber") }, EC));
-    }
-
-    public void testFailWhenStartDateAfterEndDate() {
-        assertEquals(NAME_INVALID, NetworkdaysFunction.instance.evaluate(new ValueEval[]{ new StringEval(END_DATE),
-                new StringEval(STARTING_DATE) }, EC));
-    }
-
-    public void testReturnNetworkdays() {
-        assertEquals(108, (int) ((NumericValueEval) NetworkdaysFunction.instance.evaluate(new ValueEval[]{
-                new StringEval(STARTING_DATE), new StringEval(END_DATE) }, EC)).getNumberValue());
-    }
-
-    public void testReturnNetworkdaysWithAHoliday() {
-        assertEquals(107, (int) ((NumericValueEval) NetworkdaysFunction.instance.evaluate(new ValueEval[]{
-                new StringEval(STARTING_DATE), new StringEval(END_DATE), new StringEval(FIRST_HOLIDAY) },
-                EC)).getNumberValue());
-    }
-
-    public void testReturnNetworkdaysWithManyHolidays() {
-        assertEquals(105, (int) ((NumericValueEval) NetworkdaysFunction.instance.evaluate(new ValueEval[]{
-                new StringEval(STARTING_DATE), new StringEval(END_DATE),
-                new MockAreaEval(FIRST_HOLIDAY, SECOND_HOLIDAY, THIRD_HOLIDAY) }, EC)).getNumberValue());
-    }
-
-    private class MockAreaEval extends AreaEvalBase {
-
-        private List<ValueEval> holidays;
-
-        public MockAreaEval(String... holidays) {
-            this(0, 0, 0, holidays.length - 1);
-            this.holidays = new ArrayList<ValueEval>();
-            for (String holiday : holidays) {
-                this.holidays.add(new StringEval(holiday));
-            }
-        }
-
-        protected MockAreaEval(int firstRow, int firstColumn, int lastRow, int lastColumn) {
-            super(firstRow, firstColumn, lastRow, lastColumn);
-        }
-
-        @Override
-        public ValueEval getRelativeValue(int sheetIndex, int relativeRowIndex, int relativeColumnIndex) {
-            return this.holidays.get(relativeColumnIndex);
-        }
-        @Override
-        public ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex) {
-            return getRelativeValue(-1, relativeRowIndex, relativeColumnIndex);
-        }
-
-        @Override
-        public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
-            return null;
-        }
-
-        @Override
-        public TwoDEval getColumn(int columnIndex) {
-            return null;
-        }
-
-        @Override
-        public TwoDEval getRow(int rowIndex) {
-            return null;
-        }
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java
deleted file mode 100644
index 8107d97..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.atp;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.AggregateFunction;
-import org.apache.poi.ss.formula.functions.EvalFactory;
-
-import junit.framework.TestCase;
-
-/**
- * Testcase for Excel function PERCENTILE()
- *
- * @author T. Gordon
- */
-public class TestPercentile extends TestCase {
-
-    public void testPercentile() {
-        testBasic();
-        testUnusualArgs();
-        testUnusualArgs2();
-        testUnusualArgs3();
-        testErrors();
-        testErrors2();
-    }
-
-    private static ValueEval invokePercentile(ValueEval[] args, ValueEval percentile) {
-        AreaEval aeA = EvalFactory.createAreaEval("A1:A" + args.length, args);
-        ValueEval[] args2 = { aeA, percentile };
-        return AggregateFunction.PERCENTILE.evaluate(args2, -1, -1);
-    }
-
-    private void confirmPercentile(ValueEval percentile, ValueEval[] args, double expected) {
-        ValueEval result = invokePercentile(args, percentile);
-        assertEquals(NumberEval.class, result.getClass());
-        double delta = 0.00000001;
-        assertEquals(expected, ((NumberEval) result).getNumberValue(), delta);
-    }
-
-    private void confirmPercentile(ValueEval percentile, ValueEval[] args, ErrorEval expectedError) {
-        ValueEval result = invokePercentile(args, percentile);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(expectedError.getErrorCode(), ((ErrorEval) result).getErrorCode());
-    }
-
-    public void testBasic() {
-        ValueEval[] values = { new NumberEval(210.128), new NumberEval(65.2182), new NumberEval(32.231),
-                new NumberEval(12.123), new NumberEval(45.32) };
-        ValueEval percentile = new NumberEval(0.95);
-        confirmPercentile(percentile, values, 181.14604);
-    }
-
-    public void testBlanks() {
-        ValueEval[] values = { new NumberEval(210.128), new NumberEval(65.2182), new NumberEval(32.231),
-                BlankEval.instance, new NumberEval(45.32) };
-        ValueEval percentile = new NumberEval(0.95);
-        confirmPercentile(percentile, values, 188.39153);
-    }
-
-    public void testUnusualArgs() {
-        ValueEval[] values = { new NumberEval(1), new NumberEval(2), BoolEval.TRUE, BoolEval.FALSE };
-        ValueEval percentile = new NumberEval(0.95);
-        confirmPercentile(percentile, values, 1.95);
-    }
-
-    //percentile has to be between 0 and 1 - here we test less than zero
-    public void testUnusualArgs2() {
-        ValueEval[] values = { new NumberEval(1), new NumberEval(2), };
-        ValueEval percentile = new NumberEval(-0.1);
-        confirmPercentile(percentile, values, ErrorEval.NUM_ERROR);
-    }
-
-    //percentile has to be between 0 and 1 - here we test more than 1
-    public void testUnusualArgs3() {
-        ValueEval[] values = { new NumberEval(1), new NumberEval(2) };
-        ValueEval percentile = new NumberEval(1.1);
-        confirmPercentile(percentile, values, ErrorEval.NUM_ERROR);
-    }
-
-    //here we test where there are errors as part of inputs
-    public void testErrors() {
-        ValueEval[] values = { new NumberEval(1), ErrorEval.NAME_INVALID, new NumberEval(3), ErrorEval.DIV_ZERO, };
-        ValueEval percentile = new NumberEval(0.95);
-        confirmPercentile(percentile, values, ErrorEval.NAME_INVALID);
-    }
-
-    //here we test where there are errors as part of inputs
-    public void testErrors2() {
-        ValueEval[] values = { new NumberEval(1), new NumberEval(2), new NumberEval(3), ErrorEval.DIV_ZERO, };
-        ValueEval percentile = new NumberEval(0.95);
-        confirmPercentile(percentile, values, ErrorEval.DIV_ZERO);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
deleted file mode 100644
index 51bbdf0..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.atp;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * Testcase for 'Analysis Toolpak' function RANDBETWEEN()
- * 
- * @author Brendan Nolan
- */
-public class TestRandBetween extends TestCase {
-
-	private Workbook wb;
-	private FormulaEvaluator evaluator;
-	private Cell bottomValueCell;
-	private Cell topValueCell;
-	private Cell formulaCell;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		wb = HSSFTestDataSamples.openSampleWorkbook("TestRandBetween.xls");
-		evaluator = wb.getCreationHelper().createFormulaEvaluator();
-		
-		Sheet sheet = wb.createSheet("RandBetweenSheet");
-		Row row = sheet.createRow(0);
-		bottomValueCell = row.createCell(0);
-		topValueCell = row.createCell(1);
-		formulaCell = row.createCell(2, CellType.FORMULA);
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		// TODO Auto-generated method stub
-		super.tearDown();
-	}
-	
-	/**
-	 * Check where values are the same
-	 */
-	public void testRandBetweenSameValues() {
-		
-		evaluator.clearAllCachedResultValues();
-		formulaCell.setCellFormula("RANDBETWEEN(1,1)");
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(1, formulaCell.getNumericCellValue(), 0);
-		evaluator.clearAllCachedResultValues();
-		formulaCell.setCellFormula("RANDBETWEEN(-1,-1)");
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(-1, formulaCell.getNumericCellValue(), 0);
-
-	}
-	
-	/**
-	 * Check special case where rounded up bottom value is greater than 
-	 * top value.
-	 */
-	public void testRandBetweenSpecialCase() {
-		
-
-		bottomValueCell.setCellValue(0.05);		
-		topValueCell.setCellValue(0.1);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(1, formulaCell.getNumericCellValue(), 0);
-		bottomValueCell.setCellValue(-0.1);		
-		topValueCell.setCellValue(-0.05);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(0, formulaCell.getNumericCellValue(), 0);
-		bottomValueCell.setCellValue(-1.1);		
-		topValueCell.setCellValue(-1.05);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(-1, formulaCell.getNumericCellValue(), 0);
-		bottomValueCell.setCellValue(-1.1);		
-		topValueCell.setCellValue(-1.1);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(-1, formulaCell.getNumericCellValue(), 0);
-	}
-	
-	/**
-	 * Check top value of BLANK which Excel will evaluate as 0
-	 */
-	public void testRandBetweenTopBlank() {
-
-		bottomValueCell.setCellValue(-1);		
-		topValueCell.setCellType(CellType.BLANK);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertTrue(formulaCell.getNumericCellValue() == 0 || formulaCell.getNumericCellValue() == -1);
-	
-	}
-	/**
-	 * Check where input values are of wrong type
-	 */
-	public void testRandBetweenWrongInputTypes() {
-		// Check case where bottom input is of the wrong type
-		bottomValueCell.setCellValue("STRING");		
-		topValueCell.setCellValue(1);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
-		assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue());
-		
-		
-		// Check case where top input is of the wrong type
-		bottomValueCell.setCellValue(1);
-		topValueCell.setCellValue("STRING");		
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
-		assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue());
-
-		// Check case where both inputs are of wrong type
-		bottomValueCell.setCellValue("STRING");
-		topValueCell.setCellValue("STRING");		
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
-		assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue());
-	
-	}
-	
-	/**
-	 * Check case where bottom is greater than top
-	 */
-	public void testRandBetweenBottomGreaterThanTop() {
-
-		// Check case where bottom is greater than top
-		bottomValueCell.setCellValue(1);		
-		topValueCell.setCellValue(0);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
-		assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), formulaCell.getErrorCellValue());		
-		bottomValueCell.setCellValue(1);		
-		topValueCell.setCellType(CellType.BLANK);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
-		assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), formulaCell.getErrorCellValue());
-	}
-	
-	/**
-	 * Boundary check of Double MIN and MAX values
-	 */
-	public void testRandBetweenBoundaryCheck() {
-
-		bottomValueCell.setCellValue(Double.MIN_VALUE);		
-		topValueCell.setCellValue(Double.MAX_VALUE);
-		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
-		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCellEnum(formulaCell);
-		assertTrue(formulaCell.getNumericCellValue() >= Double.MIN_VALUE && formulaCell.getNumericCellValue() <= Double.MAX_VALUE);		
-		
-	}
-	
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
deleted file mode 100644
index 055149c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import static java.util.Calendar.SATURDAY;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-public class TestWorkdayCalculator {
-
-    @Test
-    public void testCalculateWorkdaysShouldReturnJustWeekdaysWhenNoWeekend() {
-        final double A_MONDAY = DateUtil.getExcelDate(d(2011, 12, 12));
-        final double A_FRIDAY = DateUtil.getExcelDate(d(2011, 12, 16));
-        assertEquals(5, WorkdayCalculator.instance.calculateWorkdays(A_MONDAY, A_FRIDAY, new double[0]));
-    }
-
-    @Test
-    public void testCalculateWorkdaysShouldReturnAllDaysButNoSaturdays() {
-        final double A_WEDNESDAY = DateUtil.getExcelDate(d(2011, 12, 14));
-        final double A_SATURDAY = DateUtil.getExcelDate(d(2011, 12, 18));
-        assertEquals(3, WorkdayCalculator.instance.calculateWorkdays(A_WEDNESDAY, A_SATURDAY, new double[0]));
-    }
-
-    @Test
-    public void testCalculateWorkdaysShouldReturnAllDaysButNoSundays() {
-        final double A_SUNDAY = DateUtil.getExcelDate(d(2011, 12, 11));
-        final double A_THURSDAY = DateUtil.getExcelDate(d(2011, 12, 15));
-        assertEquals(4, WorkdayCalculator.instance.calculateWorkdays(A_SUNDAY, A_THURSDAY, new double[0]));
-    }
-
-    @Test
-    public void testCalculateWorkdaysShouldReturnAllDaysButNoHolidays() {
-        final double A_MONDAY = DateUtil.getExcelDate(d(2011, 12, 12));
-        final double A_FRIDAY = DateUtil.getExcelDate(d(2011, 12, 16));
-        final double A_WEDNESDAY = DateUtil.getExcelDate(d(2011, 12, 14));
-        assertEquals(4, WorkdayCalculator.instance.calculateWorkdays(A_MONDAY, A_FRIDAY, new double[]{ A_WEDNESDAY }));
-    }
-
-    @Test
-    public void testCalculateWorkdaysShouldIgnoreWeekendHolidays() {
-        final double A_FRIDAY = DateUtil.getExcelDate(d(2011, 12, 16));
-        final double A_SATURDAY = DateUtil.getExcelDate(d(2011, 12, 17));
-        final double A_SUNDAY = DateUtil.getExcelDate(d(2011, 12, 18));
-        final double A_WEDNESDAY = DateUtil.getExcelDate(d(2011, 12, 21));
-        assertEquals(4, WorkdayCalculator.instance.calculateWorkdays(A_FRIDAY, A_WEDNESDAY, new double[]{ A_SATURDAY, A_SUNDAY }));
-    }
-
-    @Test
-    public void testCalculateWorkdaysNumberOfDays() {
-    	double start = 41553.0;
-    	int days = 1;
-        assertEquals(d(2013, 10, 7), WorkdayCalculator.instance.calculateWorkdays(start, days, new double[0]));
-    }
-
-    @Test
-    public void testPastDaysOfWeekShouldReturn0Past0Saturdays() {
-        final double A_WEDNESDAY = DateUtil.getExcelDate(d(2011, 12, 7));
-        final double A_FRIDAY = DateUtil.getExcelDate(d(2011, 12, 9));
-        assertEquals(0, WorkdayCalculator.instance.pastDaysOfWeek(A_WEDNESDAY, A_FRIDAY, SATURDAY));
-    }
-
-    @Test
-    public void testPastDaysOfWeekShouldReturn1Past1Saturdays() {
-        final double A_WEDNESDAY = DateUtil.getExcelDate(d(2011, 12, 7));
-        final double A_SUNDAY = DateUtil.getExcelDate(d(2011, 12, 11));
-        assertEquals(1, WorkdayCalculator.instance.pastDaysOfWeek(A_WEDNESDAY, A_SUNDAY, SATURDAY));
-    }
-
-    @Test
-    public void testPastDaysOfWeekShouldReturn2Past2Saturdays() {
-        final double A_THURSDAY = DateUtil.getExcelDate(d(2011, 12, 8));
-        final double A_MONDAY = DateUtil.getExcelDate(d(2011, 12, 19));
-        assertEquals(2, WorkdayCalculator.instance.pastDaysOfWeek(A_THURSDAY, A_MONDAY, SATURDAY));
-    }
-
-    @Test
-    public void testPastDaysOfWeekShouldReturn1BeginningFromASaturday() {
-        final double A_SATURDAY = DateUtil.getExcelDate(d(2011, 12, 10));
-        final double A_SUNDAY = DateUtil.getExcelDate(d(2011, 12, 11));
-        assertEquals(1, WorkdayCalculator.instance.pastDaysOfWeek(A_SATURDAY, A_SUNDAY, SATURDAY));
-    }
-
-    @Test
-    public void testPastDaysOfWeekShouldReturn1EndingAtASaturday() {
-        final double A_THURSDAY = DateUtil.getExcelDate(d(2011, 12, 8));
-        final double A_SATURDAY = DateUtil.getExcelDate(d(2011, 12, 10));
-        assertEquals(1, WorkdayCalculator.instance.pastDaysOfWeek(A_THURSDAY, A_SATURDAY, SATURDAY));
-    }
-    
-    private static Date d(int year, int month, int day) {
-        Calendar cal = LocaleUtil.getLocaleCalendar(year, month-1, day, 0, 0, 0);
-        return cal.getTime();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
deleted file mode 100644
index bbd6e56..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.ss.formula.atp;
-
-
-import static org.apache.poi.ss.formula.eval.ErrorEval.VALUE_INVALID;
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.AreaEvalBase;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-public class TestWorkdayFunction {
-
-    private static final String STARTING_DATE      = "2008/10/01";
-    private static final String FIRST_HOLIDAY      = "2008/11/26";
-    private static final String SECOND_HOLIDAY     = "2008/12/04";
-    private static final String THIRD_HOLIDAY      = "2009/01/21";
-    private static final String RETROATIVE_HOLIDAY = "2008/09/29";
-
-    private static final OperationEvaluationContext EC = new OperationEvaluationContext(null, null, 1, 1, 1, null);
-
-    @Test
-    public void testFailWhenNoArguments() {
-        ValueEval ve[] = new ValueEval[0];
-        assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, null));
-    }
-
-    @Test
-    public void testFailWhenLessThan2Arguments() {
-        ValueEval ve[] = new ValueEval[1];
-        assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, null));
-    }
-
-    @Test
-    public void testFailWhenMoreThan3Arguments() {
-        ValueEval ve[] = new ValueEval[4];
-        assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, null));
-    }
-
-    @Test
-    public void testFailWhenArgumentsAreNotDatesNorNumbers() {
-        ValueEval ve[] = { new StringEval("Potato"), new StringEval("Cucumber") };
-        assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, EC));
-    }
-
-    @Test
-    public void testReturnWorkdays() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2009, 3, 30);
-        Date expDate = expCal.getTime();
-        ValueEval ve[] = { new StringEval(STARTING_DATE), new NumberEval(151) };
-        Date actDate = DateUtil.getJavaDate(((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue());
-        assertEquals(expDate, actDate);
-    }
-
-    @Test
-    public void testReturnWorkdaysSpanningAWeekendSubtractingDays() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 8, 27);
-        Date expDate = expCal.getTime();
-
-    	ValueEval ve[] = { new StringEval("2013/09/30"), new NumberEval(-1) };
-		double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue();
-		assertEquals(41544.0, numberValue, 0);
-		
-		Date actDate = DateUtil.getJavaDate(numberValue);
-        assertEquals(expDate, actDate);
-    }
-
-    @Test
-    public void testReturnWorkdaysSpanningAWeekendAddingDays() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 8, 30);
-        Date expDate = expCal.getTime();
-        
-        ValueEval ve[] = { new StringEval("2013/09/27"), new NumberEval(1) };
-        double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue();
-        assertEquals(41547.0, numberValue, 0);
-
-        Date actDate = DateUtil.getJavaDate(numberValue);
-        assertEquals(expDate, actDate);
-    }
-
-    @Test
-    public void testReturnWorkdaysWhenStartIsWeekendAddingDays() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 9, 7);
-        Date expDate = expCal.getTime();
-        
-        ValueEval ve[] = { new StringEval("2013/10/06"), new NumberEval(1) };
-        double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue();
-        assertEquals(41554.0, numberValue, 0);
-
-        Date actDate = DateUtil.getJavaDate(numberValue);
-        assertEquals(expDate, actDate);
-    }
-
-    @Test
-    public void testReturnWorkdaysWhenStartIsWeekendSubtractingDays() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 9, 4);
-        Date expDate = expCal.getTime();
-        
-        ValueEval ve[] = { new StringEval("2013/10/06"), new NumberEval(-1) };
-        double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue();
-        assertEquals(41551.0, numberValue, 0);
-
-        Date actDate = DateUtil.getJavaDate(numberValue);
-        assertEquals(expDate, actDate);
-    }
-
-    @Test
-    public void testReturnWorkdaysWithDaysTruncated() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2009, 3, 30);
-        Date expDate = expCal.getTime();
-        
-        ValueEval ve[] = { new StringEval(STARTING_DATE), new NumberEval(151.99999) };
-        double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue();
-        
-        Date actDate = DateUtil.getJavaDate(numberValue);
-        assertEquals(expDate, actDate);
-    }
-
-    @Test
-    public void testReturnRetroativeWorkday() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2008, 8, 23);
-        Date expDate = expCal.getTime();
-        
-        ValueEval ve[] = { new StringEval(STARTING_DATE), new NumberEval(-5), new StringEval(RETROATIVE_HOLIDAY) };
-        double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue();
-        
-        Date actDate = DateUtil.getJavaDate(numberValue);
-        assertEquals(expDate, actDate);
-    }
-
-    @Test
-    public void testReturnNetworkdaysWithManyHolidays() {
-        Calendar expCal = LocaleUtil.getLocaleCalendar(2009, 4, 5);
-        Date expDate = expCal.getTime();
-        
-        ValueEval ve[] = {
-            new StringEval(STARTING_DATE), new NumberEval(151),
-            new MockAreaEval(FIRST_HOLIDAY, SECOND_HOLIDAY, THIRD_HOLIDAY) };
-        double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue();
-        
-        Date actDate = DateUtil.getJavaDate(numberValue);
-        assertEquals(expDate, actDate);
-    }
-
-    private class MockAreaEval extends AreaEvalBase {
-
-        private List<ValueEval> holidays;
-
-        public MockAreaEval(String... holidays) {
-            this(0, 0, 0, holidays.length - 1);
-            this.holidays = new ArrayList<ValueEval>();
-            for (String holiday : holidays) {
-                this.holidays.add(new StringEval(holiday));
-            }
-        }
-
-        protected MockAreaEval(int firstRow, int firstColumn, int lastRow, int lastColumn) {
-            super(firstRow, firstColumn, lastRow, lastColumn);
-        }
-
-        @Override
-        public ValueEval getRelativeValue(int sheetIndex, int relativeRowIndex, int relativeColumnIndex) {
-            return this.holidays.get(relativeColumnIndex);
-        }
-        @Override
-        public ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex) {
-            return getRelativeValue(-1, relativeRowIndex, relativeColumnIndex);
-        }
-
-        @Override
-        public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
-            return null;
-        }
-
-        @Override
-        public TwoDEval getColumn(int columnIndex) {
-            return null;
-        }
-
-        @Override
-        public TwoDEval getRow(int rowIndex) {
-            return null;
-        }
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
deleted file mode 100644
index 6094d18..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Calendar;
-
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Specific test cases for YearFracCalculator
- */
-public final class TestYearFracCalculator {
-
-    @Test
-	public void testBasis1() {
-		confirm(md(1999, 1, 1), md(1999, 4, 5), 1, 0.257534247);
-		confirm(md(1999, 4, 1), md(1999, 4, 5), 1, 0.010958904);
-		confirm(md(1999, 4, 1), md(1999, 4, 4), 1, 0.008219178);
-		confirm(md(1999, 4, 2), md(1999, 4, 5), 1, 0.008219178);
-		confirm(md(1999, 3, 31), md(1999, 4, 3), 1, 0.008219178);
-		confirm(md(1999, 4, 5), md(1999, 4, 8), 1, 0.008219178);
-		confirm(md(1999, 4, 4), md(1999, 4, 7), 1, 0.008219178);
-		confirm(md(2000, 2, 5), md(2000, 6, 1), 0, 0.322222222);
-	}
-
-	private void confirm(double startDate, double endDate, int basis, double expectedValue) {
-		double actualValue;
-		try {
-			actualValue = YearFracCalculator.calculate(startDate, endDate, basis);
-		} catch (EvaluationException e) {
-			throw new RuntimeException(e);
-		}
-		double diff = actualValue - expectedValue;
-		if (Math.abs(diff) >  0.000000001) {
-			double hours = diff * 365 * 24;
-			System.out.println(startDate + " " + endDate + " off by " + hours + " hours");
-			assertEquals(expectedValue, actualValue, 0.000000001);
-		}
-		
-	}
-
-	private static double md(int year, int month, int day) {
-		Calendar c = LocaleUtil.getLocaleCalendar(year, month-1, day);
-		return DateUtil.getExcelDate(c.getTime());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
deleted file mode 100644
index f683e5d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.atp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Iterator;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Tests YearFracCalculator using test-cases listed in a sample spreadsheet
- */
-public final class TestYearFracCalculatorFromSpreadsheet {
-	
-	private static final class SS {
-
-		public static final int BASIS_COLUMN = 1; // "B"
-		public static final int START_YEAR_COLUMN = 2; // "C"
-		public static final int END_YEAR_COLUMN = 5; // "F"
-		public static final int YEARFRAC_FORMULA_COLUMN = 11; // "L"
-		public static final int EXPECTED_RESULT_COLUMN = 13; // "N"
-	}
-
-	@Test
-	public void testAll() throws Exception {
-		
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("yearfracExamples.xls");
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFFormulaEvaluator formulaEvaluator = new HSSFFormulaEvaluator(wb);
-		int nSuccess = 0;
-		Iterator<Row> rowIterator = sheet.rowIterator();
-		while(rowIterator.hasNext()) {
-			HSSFRow row = (HSSFRow) rowIterator.next();
-			
-			HSSFCell cell = row.getCell(SS.YEARFRAC_FORMULA_COLUMN);
-			if (cell == null || cell.getCellTypeEnum() != CellType.FORMULA) {
-				continue;
-			}
-            processRow(row, cell, formulaEvaluator);
-            nSuccess++;
-		}
-
-		assertTrue("No test sample cases found", nSuccess > 0);
-		wb.close();
-	}
-	
-	private void processRow(HSSFRow row, HSSFCell cell, HSSFFormulaEvaluator formulaEvaluator)
-	throws EvaluationException {
-		
-		double startDate = makeDate(row, SS.START_YEAR_COLUMN);
-		double endDate = makeDate(row, SS.END_YEAR_COLUMN);
-		
-		int basis = getIntCell(row, SS.BASIS_COLUMN);
-		
-		double expectedValue = getDoubleCell(row, SS.EXPECTED_RESULT_COLUMN);
-		
-		double actualValue = YearFracCalculator.calculate(startDate, endDate, basis);
-
-		String loc = " - row " + (row.getRowNum()+1);
-		assertEquals("Direct calculate failed"+loc, expectedValue, actualValue, 0);
-		actualValue = formulaEvaluator.evaluate(cell).getNumberValue();
-		assertEquals("Formula evaluate failed"+loc, expectedValue, actualValue, 0);
-	}
-
-	private static double makeDate(HSSFRow row, int yearColumn) {
-		int year = getIntCell(row, yearColumn + 0);
-		int month = getIntCell(row, yearColumn + 1);
-		int day = getIntCell(row, yearColumn + 2);
-		Calendar c = LocaleUtil.getLocaleCalendar(year, month-1, day);
-		return HSSFDateUtil.getExcelDate(c.getTime());
-	}
-
-	private static int getIntCell(HSSFRow row, int colIx) {
-		double dVal = getDoubleCell(row, colIx);
-		String msg = "Non integer value (" + dVal + ") cell found at column " + (char)('A' + colIx);
-		assertEquals(msg, Math.floor(dVal), dVal, 0);
-		return (int)dVal;
-	}
-
-	private static double getDoubleCell(HSSFRow row, int colIx) {
-		HSSFCell cell = row.getCell(colIx);
-		assertNotNull("No cell found at column " + colIx, cell);
-		double dVal = cell.getNumericCellValue();
-		return dVal;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java b/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
deleted file mode 100644
index 08ce2d9..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.constant;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInput;
-import org.junit.Test;
-
-public final class TestConstantValueParser {
-	private static final Object[] SAMPLE_VALUES = {
-			Boolean.TRUE,
-			null,
-			new Double(1.1),
-			"Sample text",
-			ErrorConstant.valueOf(FormulaError.DIV0.getCode()),
-		};
-	private static final byte[] SAMPLE_ENCODING = HexRead.readFromString(
-		"04 01 00 00 00 00 00 00 00 " +
-		"00 00 00 00 00 00 00 00 00 " +
-		"01 9A 99 99 99 99 99 F1 3F " +
-		"02 0B 00 00 53 61 6D 70 6C 65 20 74 65 78 74 " +
-		"10 07 00 00 00 00 00 00 00");
-	
-	@Test
-	public void testGetEncodedSize() {
-		int actual = ConstantValueParser.getEncodedSize(SAMPLE_VALUES);
-		assertEquals(51, actual);
-	}
-	
-	@Test
-	public void testEncode() {
-		int size = ConstantValueParser.getEncodedSize(SAMPLE_VALUES);
-		byte[] data = new byte[size];
-		
-		ConstantValueParser.encode(new LittleEndianByteArrayOutputStream(data, 0), SAMPLE_VALUES);
-		
-		if (!Arrays.equals(data, SAMPLE_ENCODING)) {
-			fail("Encoding differs");
-		}
-	}
-	
-	@Test
-	public void testDecode() {
-		LittleEndianInput in = TestcaseRecordInputStream.createLittleEndian(SAMPLE_ENCODING);
-		
-		Object[] values = ConstantValueParser.parse(in, 4);
-		for (int i = 0; i < values.length; i++) {
-			if(!isEqual(SAMPLE_VALUES[i], values[i])) {
-				fail("Decoded result differs");
-			}
-		}
-	}
-	private static boolean isEqual(Object a, Object b) {
-		if (a == null) {
-			return b == null;
-		}
-		return a.equals(b);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java
deleted file mode 100644
index d30e5e5..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests the package <tt>org.apache.poi.hssf.record.formula.eval</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestAreaEval.class,
-    TestHSSFCircularReferences.class,
-    TestDivideEval.class,
-    TestEqualEval.class,
-    TestExternalFunction.class,
-    TestFormulaBugs.class,
-    TestFormulasFromSpreadsheet.class,
-    TestMinusZeroResult.class,
-    TestMissingArgEval.class,
-    TestPercentEval.class,
-    TestRangeEval.class,
-    TestUnaryPlusEval.class
-})
-public class AllFormulaEvalTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
deleted file mode 100644
index ec3aa91..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.eval;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * Common superclass for testing cases of circular references
- * both for HSSF and XSSF
- */
-public abstract class BaseTestCircularReferences {
-
-    protected final ITestDataProvider _testDataProvider;
-
-    /**
-     * @param testDataProvider an object that provides test data in HSSF / XSSF specific way
-     */
-    protected BaseTestCircularReferences(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-
-    /**
-     * Translates StackOverflowError into AssertionFailedError
-     */
-    private CellValue evaluateWithCycles(Workbook wb, Cell testCell)
-            throws AssertionFailedError {
-        FormulaEvaluator evaluator = _testDataProvider.createFormulaEvaluator(wb);
-        try {
-            return evaluator.evaluate(testCell);
-        } catch (StackOverflowError e) {
-            throw new AssertionFailedError( "circular reference caused stack overflow error");
-        }
-    }
-    /**
-     * Makes sure that the specified evaluated cell value represents a circular reference error.
-     */
-    private static void confirmCycleErrorCode(CellValue cellValue) {
-        assertTrue(cellValue.getCellTypeEnum() == CellType.ERROR);
-        assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cellValue.getErrorValue());
-    }
-
-
-    /**
-     * ASF Bugzilla Bug 44413
-     * "INDEX() formula cannot contain its own location in the data array range"
-     */
-    @Test
-    public void testIndexFormula() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-
-        int colB = 1;
-        sheet.createRow(0).createCell(colB).setCellValue(1);
-        sheet.createRow(1).createCell(colB).setCellValue(2);
-        sheet.createRow(2).createCell(colB).setCellValue(3);
-        Row row4 = sheet.createRow(3);
-        Cell testCell = row4.createCell(0);
-        // This formula should evaluate to the contents of B2,
-        testCell.setCellFormula("INDEX(A1:B4,2,2)");
-        // However the range A1:B4 also includes the current cell A4.  If the other parameters
-        // were 4 and 1, this would represent a circular reference.  Prior to v3.2 POI would
-        // 'fully' evaluate ref arguments before invoking operators, which raised the possibility of
-        // cycles / StackOverflowErrors.
-
-
-        CellValue cellValue = evaluateWithCycles(wb, testCell);
-
-        assertTrue(cellValue.getCellTypeEnum() == CellType.NUMERIC);
-        assertEquals(2, cellValue.getNumberValue(), 0);
-        wb.close();
-    }
-
-    /**
-     * Cell A1 has formula "=A1"
-     */
-    @Test
-    public void testSimpleCircularReference() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-
-        Row row = sheet.createRow(0);
-        Cell testCell = row.createCell(0);
-        testCell.setCellFormula("A1");
-
-        CellValue cellValue = evaluateWithCycles(wb, testCell);
-
-        confirmCycleErrorCode(cellValue);
-        
-        wb.close();
-    }
-
-    /**
-     * A1=B1, B1=C1, C1=D1, D1=A1
-     */
-    @Test
-    public void testMultiLevelCircularReference() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-
-        Row row = sheet.createRow(0);
-        row.createCell(0).setCellFormula("B1");
-        row.createCell(1).setCellFormula("C1");
-        row.createCell(2).setCellFormula("D1");
-        Cell testCell = row.createCell(3);
-        testCell.setCellFormula("A1");
-
-        CellValue cellValue = evaluateWithCycles(wb, testCell);
-
-        confirmCycleErrorCode(cellValue);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testIntermediateCircularReferenceResults_bug46898() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-
-        Row row = sheet.createRow(0);
-
-        Cell cellA1 = row.createCell(0);
-        Cell cellB1 = row.createCell(1);
-        Cell cellC1 = row.createCell(2);
-        Cell cellD1 = row.createCell(3);
-        Cell cellE1 = row.createCell(4);
-
-        cellA1.setCellFormula("IF(FALSE, 1+B1, 42)");
-        cellB1.setCellFormula("1+C1");
-        cellC1.setCellFormula("1+D1");
-        cellD1.setCellFormula("1+E1");
-        cellE1.setCellFormula("1+A1");
-
-        FormulaEvaluator fe = _testDataProvider.createFormulaEvaluator(wb);
-        CellValue cv;
-
-        // Happy day flow - evaluate A1 first
-        cv = fe.evaluate(cellA1);
-        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-        assertEquals(42.0, cv.getNumberValue(), 0.0);
-        cv = fe.evaluate(cellB1); // no circ-ref-error because A1 result is cached
-        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-        assertEquals(46.0, cv.getNumberValue(), 0.0);
-
-        // Show the bug - evaluate another cell from the loop first
-        fe.clearAllCachedResultValues();
-        cv = fe.evaluate(cellB1);
-        // Identified bug 46898
-        assertNotEquals(cv.getCellTypeEnum(), ErrorEval.CIRCULAR_REF_ERROR.getErrorCode());
-        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-        assertEquals(46.0, cv.getNumberValue(), 0.0);
-
-        // start evaluation on another cell
-        fe.clearAllCachedResultValues();
-        cv = fe.evaluate(cellE1);
-        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-        assertEquals(43.0, cv.getNumberValue(), 0.0);
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java
deleted file mode 100644
index 4a15444..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.ss.formula.functions.Function;
-
-/**
- * Collects eval instances for easy access by tests in this package
- *
- * @author Josh Micich
- */
-final class EvalInstances {
-	private EvalInstances() {
-		// no instances of this class
-	}
-
-	public static final Function Add = TwoOperandNumericOperation.AddEval;
-	public static final Function Subtract = TwoOperandNumericOperation.SubtractEval;
-	public static final Function Multiply = TwoOperandNumericOperation.MultiplyEval;
-	public static final Function Divide = TwoOperandNumericOperation.DivideEval;
-
-	public static final Function Power = TwoOperandNumericOperation.PowerEval;
-
-	public static final Function Percent = PercentEval.instance;
-
-	public static final Function UnaryMinus = UnaryMinusEval.instance;
-	public static final Function UnaryPlus = UnaryPlusEval.instance;
-
-	public static final Function Equal = RelationalOperationEval.EqualEval;
-	public static final Function LessThan = RelationalOperationEval.LessThanEval;
-	public static final Function LessEqual = RelationalOperationEval.LessEqualEval;
-	public static final Function GreaterThan = RelationalOperationEval.GreaterThanEval;
-	public static final Function GreaterEqual = RelationalOperationEval.GreaterEqualEval;
-	public static final Function NotEqual = RelationalOperationEval.NotEqualEval;
-
-	public static final Function Range = RangeEval.instance;
-	public static final Function Concat = ConcatEval.instance;
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java
deleted file mode 100644
index a3ace44..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.functions.EvalFactory;
-
-/**
- * Tests for <tt>AreaEval</tt>
- *
- * @author Josh Micich
- */
-public final class TestAreaEval extends TestCase {
-
-	public void testGetValue_bug44950() {
-		// TODO - this test probably isn't testing much anymore
-		AreaPtg ptg = new AreaPtg("B2:D3");
-		NumberEval one = new NumberEval(1);
-		ValueEval[] values = {
-				one,
-				new NumberEval(2),
-				new NumberEval(3),
-				new NumberEval(4),
-				new NumberEval(5),
-				new NumberEval(6),
-		};
-		AreaEval ae = EvalFactory.createAreaEval(ptg, values);
-		if (one == ae.getAbsoluteValue(1, 2)) {
-			throw new AssertionFailedError("Identified bug 44950 a");
-		}
-		confirm(1, ae, 1, 1);
-		confirm(2, ae, 1, 2);
-		confirm(3, ae, 1, 3);
-		confirm(4, ae, 2, 1);
-		confirm(5, ae, 2, 2);
-		confirm(6, ae, 2, 3);
-
-	}
-
-	private static void confirm(int expectedValue, AreaEval ae, int row, int col) {
-		NumberEval v = (NumberEval) ae.getAbsoluteValue(row, col);
-		assertEquals(expectedValue, v.getNumberValue(), 0.0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java
deleted file mode 100644
index 11c661d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.functions.EvalFactory;
-import org.apache.poi.ss.formula.functions.NumericFunctionInvoker;
-
-/**
- * Test for divide operator evaluator.
- *
- * @author Josh Micich
- */
-public final class TestDivideEval extends TestCase {
-
-	private static void confirm(ValueEval arg0, ValueEval arg1, double expectedResult) {
-		ValueEval[] args = {
-			arg0, arg1,
-		};
-
-		double result = NumericFunctionInvoker.invoke(EvalInstances.Divide, args, 0, 0);
-
-		assertEquals(expectedResult, result, 0);
-	}
-
-	public void testBasic() {
-		confirm(new NumberEval(5), new NumberEval(2), 2.5);
-		confirm(new NumberEval(3), new NumberEval(16), 0.1875);
-		confirm(new NumberEval(-150), new NumberEval(-15), 10.0);
-		confirm(new StringEval("0.2"), new NumberEval(0.05), 4.0);
-		confirm(BoolEval.TRUE, new StringEval("-0.2"), -5.0);
-	}
-
-	public void test1x1Area() {
-		AreaEval ae0 = EvalFactory.createAreaEval("B2:B2", new ValueEval[] { new NumberEval(50), });
-		AreaEval ae1 = EvalFactory.createAreaEval("C2:C2", new ValueEval[] { new NumberEval(10), });
-		confirm(ae0, ae1, 5);
-	}
-	public void testDivZero() {
-		ValueEval[] args = {
-			new NumberEval(5), NumberEval.ZERO,
-		};
-		ValueEval result = EvalInstances.Divide.evaluate(args, 0, (short) 0);
-		assertEquals(ErrorEval.DIV_ZERO, result);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java
deleted file mode 100644
index e10de01..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.functions.EvalFactory;
-import org.apache.poi.ss.formula.functions.Function;
-
-/**
- * Test for {@link EqualEval}
- *
- * @author Josh Micich
- */
-public final class TestEqualEval extends TestCase {
-	// convenient access to namepace
-	private static final EvalInstances EI = null;
-
-	/**
-	 * Test for bug observable at svn revision 692218 (Sep 2008)<br/>
-	 * The value from a 1x1 area should be taken immediately, regardless of srcRow and srcCol
-	 */
-	public void test1x1AreaOperand() {
-
-		ValueEval[] values = { BoolEval.FALSE, };
-		ValueEval[] args = {
-			EvalFactory.createAreaEval("B1:B1", values),
-			BoolEval.FALSE,
-		};
-		ValueEval result = evaluate(EvalInstances.Equal, args, 10, 10);
-		if (result instanceof ErrorEval) {
-			if (result == ErrorEval.VALUE_INVALID) {
-				throw new AssertionFailedError("Identified bug in evaluation of 1x1 area");
-			}
-		}
-		assertEquals(BoolEval.class, result.getClass());
-		assertTrue(((BoolEval)result).getBooleanValue());
-	}
-	/**
-	 * Empty string is equal to blank
-	 */
-	public void testBlankEqualToEmptyString() {
-
-		ValueEval[] args = {
-			new StringEval(""),
-			BlankEval.instance,
-		};
-		ValueEval result = evaluate(EvalInstances.Equal, args, 10, 10);
-		assertEquals(BoolEval.class, result.getClass());
-		BoolEval be = (BoolEval) result;
-		if (!be.getBooleanValue()) {
-			throw new AssertionFailedError("Identified bug blank/empty string equality");
-		}
-		assertTrue(be.getBooleanValue());
-	}
-
-	/**
-	 * Test for bug 46613 (observable at svn r737248)
-	 */
-	public void testStringInsensitive_bug46613() {
-		if (!evalStringCmp("abc", "aBc", EvalInstances.Equal)) {
-			throw new AssertionFailedError("Identified bug 46613");
-		}
-		assertTrue(evalStringCmp("abc", "aBc", EvalInstances.Equal));
-		assertTrue(evalStringCmp("ABC", "azz", EvalInstances.LessThan));
-		assertTrue(evalStringCmp("abc", "AZZ", EvalInstances.LessThan));
-		assertTrue(evalStringCmp("ABC", "aaa", EvalInstances.GreaterThan));
-		assertTrue(evalStringCmp("abc", "AAA", EvalInstances.GreaterThan));
-	}
-
-	private static boolean evalStringCmp(String a, String b, Function cmpOp) {
-		ValueEval[] args = {
-			new StringEval(a),
-			new StringEval(b),
-		};
-		ValueEval result = evaluate(cmpOp, args, 10, 20);
-		assertEquals(BoolEval.class, result.getClass());
-		BoolEval be = (BoolEval) result;
-		return be.getBooleanValue();
-	}
-
-	public void testBooleanCompares() {
-		confirmCompares(BoolEval.TRUE, new StringEval("TRUE"), +1);
-		confirmCompares(BoolEval.TRUE, new NumberEval(1.0), +1);
-		confirmCompares(BoolEval.TRUE, BoolEval.TRUE, 0);
-		confirmCompares(BoolEval.TRUE, BoolEval.FALSE, +1);
-
-		confirmCompares(BoolEval.FALSE, new StringEval("TRUE"), +1);
-		confirmCompares(BoolEval.FALSE, new StringEval("FALSE"), +1);
-		confirmCompares(BoolEval.FALSE, new NumberEval(0.0), +1);
-		confirmCompares(BoolEval.FALSE, BoolEval.FALSE, 0);
-	}
-	private static void confirmCompares(ValueEval a, ValueEval b, int expRes) {
-		confirm(a, b, expRes>0,  EvalInstances.GreaterThan);
-		confirm(a, b, expRes>=0, EvalInstances.GreaterEqual);
-		confirm(a, b, expRes==0, EvalInstances.Equal);
-		confirm(a, b, expRes<=0, EvalInstances.LessEqual);
-		confirm(a, b, expRes<0,  EvalInstances.LessThan);
-
-		confirm(b, a, expRes<0,  EvalInstances.GreaterThan);
-		confirm(b, a, expRes<=0, EvalInstances.GreaterEqual);
-		confirm(b, a, expRes==0, EvalInstances.Equal);
-		confirm(b, a, expRes>=0, EvalInstances.LessEqual);
-		confirm(b, a, expRes>0,  EvalInstances.LessThan);
-	}
-	private static void confirm(ValueEval a, ValueEval b, boolean expectedResult, Function cmpOp) {
-		ValueEval[] args = { a, b, };
-		ValueEval result = evaluate(cmpOp, args, 10, 20);
-		assertEquals(BoolEval.class, result.getClass());
-		assertEquals(expectedResult, ((BoolEval) result).getBooleanValue());
-	}
-
-	/**
-	 * Bug 47198 involved a formula "-A1=0" where cell A1 was 0.0.
-	 * Excel evaluates "-A1=0" to TRUE, not because it thinks -0.0==0.0
-	 * but because "-A1" evaluated to +0.0
-	 * <p/>
-	 * Note - the original diagnosis of bug 47198 was that
-	 * "Excel considers -0.0 to be equal to 0.0" which is NQR
-	 * See {@link TestMinusZeroResult} for more specific tests regarding -0.0.
-	 */
-	public void testZeroEquality_bug47198() {
-		NumberEval zero = new NumberEval(0.0);
-		NumberEval mZero = (NumberEval) evaluate(UnaryMinusEval.instance, new ValueEval[] { zero, }, 0, 0);
-		if (Double.doubleToLongBits(mZero.getNumberValue()) == 0x8000000000000000L) {
-			throw new AssertionFailedError("Identified bug 47198: unary minus should convert -0.0 to 0.0");
-		}
-		ValueEval[] args = { zero, mZero, };
-		BoolEval result = (BoolEval) evaluate(EvalInstances.Equal, args, 0, 0);
-		if (!result.getBooleanValue()) {
-			throw new AssertionFailedError("Identified bug 47198: -0.0 != 0.0");
-		}
-	}
-
-	public void testRounding_bug47598() {
-		double x = 1+1.0028-0.9973; // should be 1.0055, but has IEEE rounding
-		assertFalse(x == 1.0055);
-
-		NumberEval a = new NumberEval(x);
-		NumberEval b = new NumberEval(1.0055);
-		assertEquals("1.0055", b.getStringValue());
-
-		ValueEval[] args = { a, b, };
-		BoolEval result = (BoolEval) evaluate(EvalInstances.Equal, args, 0, 0);
-		if (!result.getBooleanValue()) {
-			throw new AssertionFailedError("Identified bug 47598: 1+1.0028-0.9973 != 1.0055");
-		}
-	}
-
-	private static ValueEval evaluate(Function oper, ValueEval[] args, int srcRowIx, int srcColIx) {
-		return oper.evaluate(args, srcRowIx, (short) srcColIx);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java
deleted file mode 100644
index 7a153e5..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.udf.DefaultUDFFinder;
-import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
-import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-
-/**
- * @author Josh Micich
- * @author Petr Udalau - registering UDFs in workbook and using ToolPacks.
- */
-public final class TestExternalFunction extends TestCase {
-
-	private static class MyFunc implements FreeRefFunction {
-		public MyFunc() {
-			//
-		}
-
-		@Override
-        public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-			if (args.length != 1 || !(args[0] instanceof StringEval)) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			StringEval input = (StringEval) args[0];
-			return new StringEval(input.getStringValue() + "abc");
-		}
-	}
-
-	private static class MyFunc2 implements FreeRefFunction {
-		public MyFunc2() {
-			//
-		}
-
-		@Override
-        public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-			if (args.length != 1 || !(args[0] instanceof StringEval)) {
-				return ErrorEval.VALUE_INVALID;
-			}
-			StringEval input = (StringEval) args[0];
-			return new StringEval(input.getStringValue() + "abc2");
-		}
-	}
-
-	/**
-	 * Checks that an external function can get invoked from the formula
-	 * evaluator.
-	 */
-	public void testInvoke() {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("testNames.xls");
-		HSSFSheet sheet = wb.getSheetAt(0);
-
-		/**
-		 * register the two test UDFs in a UDF finder, to be passed to the evaluator
-		 */
-		UDFFinder udff1 = new DefaultUDFFinder(new String[] { "myFunc", },
-				new FreeRefFunction[] { new MyFunc(), });
-		UDFFinder udff2 = new DefaultUDFFinder(new String[] { "myFunc2", },
-				new FreeRefFunction[] { new MyFunc2(), });
-		UDFFinder udff = new AggregatingUDFFinder(udff1, udff2);
-
-
-		HSSFRow row = sheet.getRow(0);
-		HSSFCell myFuncCell = row.getCell(1); // =myFunc("_")
-
-		HSSFCell myFunc2Cell = row.getCell(2); // =myFunc2("_")
-
-		HSSFFormulaEvaluator fe = HSSFFormulaEvaluator.create(wb, null, udff);
-		assertEquals("_abc", fe.evaluate(myFuncCell).getStringValue());
-		assertEquals("_abc2", fe.evaluate(myFunc2Cell).getStringValue());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
deleted file mode 100644
index 98fe731..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * Miscellaneous tests for bugzilla entries.<p/> The test name contains the
- * bugzilla bug id.
- */
-public final class TestFormulaBugs {
-
-	/**
-	 * Bug 27349 - VLOOKUP with reference to another sheet.<p/> This test was
-	 * added <em>long</em> after the relevant functionality was fixed.
-	 */
-    @Test
-	public void test27349() throws Exception {
-		// 27349-vlookupAcrossSheets.xls is bugzilla/attachment.cgi?id=10622
-		InputStream is = HSSFTestDataSamples.openSampleFileStream("27349-vlookupAcrossSheets.xls");
-        // original bug may have thrown exception here,
-        // or output warning to stderr
-		Workbook wb = new HSSFWorkbook(is);
-
-		Sheet sheet = wb.getSheetAt(0);
-		Row row = sheet.getRow(1);
-		Cell cell = row.getCell(0);
-
-		// this definitely would have failed due to 27349
-		assertEquals("VLOOKUP(1,'DATA TABLE'!$A$8:'DATA TABLE'!$B$10,2)", cell
-				.getCellFormula());
-
-		// We might as well evaluate the formula
-		FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-		CellValue cv = fe.evaluate(cell);
-
-		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-		assertEquals(3.0, cv.getNumberValue(), 0.0);
-		
-		wb.close();
-		is.close();
-	}
-
-	/**
-	 * Bug 27405 - isnumber() formula always evaluates to false in if statement<p/>
-	 * 
-	 * seems to be a duplicate of 24925
-	 */
-    @Test
-	public void test27405() throws Exception {
-		Workbook wb = new HSSFWorkbook();
-		Sheet sheet = wb.createSheet("input");
-		// input row 0
-		Row row = sheet.createRow(0);
-		/*Cell cell =*/ row.createCell(0);
-		Cell cell = row.createCell(1);
-		cell.setCellValue(1); // B1
-		// input row 1
-		row = sheet.createRow(1);
-		cell = row.createCell(1);
-		cell.setCellValue(999); // B2
-
-		int rno = 4;
-		row = sheet.createRow(rno);
-		cell = row.createCell(1); // B5
-		cell.setCellFormula("isnumber(b1)");
-		cell = row.createCell(3); // D5
-		cell.setCellFormula("IF(ISNUMBER(b1),b1,b2)");
-
-//		if (false) { // set true to check excel file manually
-//			// bug report mentions 'Editing the formula in excel "fixes" the problem.'
-//			try {
-//				FileOutputStream fileOut = new FileOutputStream("27405output.xls");
-//				wb.write(fileOut);
-//				fileOut.close();
-//			} catch (IOException e) {
-//				throw new RuntimeException(e);
-//			}
-//		}
-		
-		// use POI's evaluator as an extra sanity check
-		FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-		CellValue cv;
-		cv = fe.evaluate(cell);
-		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-		assertEquals(1.0, cv.getNumberValue(), 0.0);
-		
-		cv = fe.evaluate(row.getCell(1));
-		assertEquals(CellType.BOOLEAN, cv.getCellTypeEnum());
-		assertEquals(true, cv.getBooleanValue());
-		
-		wb.close();
-	}
-
-	/**
-	 * Bug 42448 - Can't parse SUMPRODUCT(A!C7:A!C67, B8:B68) / B69 <p/>
-	 * @throws IOException 
-	 */
-    @Test
-	public void test42448() throws IOException {
-		Workbook wb = new HSSFWorkbook();
-		Sheet sheet1 = wb.createSheet("Sheet1");
-
-		Row row = sheet1.createRow(0);
-		Cell cell = row.createCell(0);
-
-		// it's important to create the referenced sheet first
-		Sheet sheet2 = wb.createSheet("A"); // note name 'A'
-		// TODO - POI crashes if the formula is added before this sheet
-		// RuntimeException("Zero length string is an invalid sheet name")
-		// Excel doesn't crash but the formula doesn't work until it is
-		// re-entered
-
-		String inputFormula = "SUMPRODUCT(A!C7:A!C67, B8:B68) / B69"; // as per bug report
-		try {
-			cell.setCellFormula(inputFormula); 
-		} catch (StringIndexOutOfBoundsException e) {
-			fail("Identified bug 42448");
-		}
-
-		assertEquals("SUMPRODUCT(A!C7:A!C67,B8:B68)/B69", cell.getCellFormula());
-
-		// might as well evaluate the sucker...
-
-		addCell(sheet2, 5, 2, 3.0); // A!C6
-		addCell(sheet2, 6, 2, 4.0); // A!C7
-		addCell(sheet2, 66, 2, 5.0); // A!C67
-		addCell(sheet2, 67, 2, 6.0); // A!C68
-
-		addCell(sheet1, 6, 1, 7.0); // B7
-		addCell(sheet1, 7, 1, 8.0); // B8
-		addCell(sheet1, 67, 1, 9.0); // B68
-		addCell(sheet1, 68, 1, 10.0); // B69
-
-		double expectedResult = (4.0 * 8.0 + 5.0 * 9.0) / 10.0;
-
-		FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-		CellValue cv = fe.evaluate(cell);
-
-		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-		assertEquals(expectedResult, cv.getNumberValue(), 0.0);
-
-		wb.close();
-	}
-
-	private static void addCell(Sheet sheet, int rowIx, int colIx,
-			double value) {
-		sheet.createRow(rowIx).createCell(colIx).setCellValue(value);
-	}
-
-	@Test
-	public void test55032() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("input");
-
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(1);
-
-        checkFormulaValue(wb, cell, "PV(0.08/12, 20*12, 500, ,0)", -59777.14585);
-        checkFormulaValue(wb, cell, "PV(0.08/12, 20*12, 500, ,)", -59777.14585);
-        checkFormulaValue(wb, cell, "PV(0.08/12, 20*12, 500, 500,)", -59878.6315455);
-        
-        checkFormulaValue(wb, cell, "FV(0.08/12, 20*12, 500, ,)", -294510.2078107270);
-        checkFormulaValue(wb, cell, "PMT(0.08/12, 20*12, 500, ,)", -4.1822003450);
-        checkFormulaValue(wb, cell, "NPER(0.08/12, 20*12, 500, ,)", -2.0758873434);
-
-        wb.close();
-	}
-
-    private void checkFormulaValue(Workbook wb, Cell cell, String formula, double expectedValue) {
-        cell.setCellFormula(formula);
-	    
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        CellValue value = evaluator.evaluate(cell);
-        
-        assertEquals(expectedValue, value.getNumberValue(), 0.0001);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
deleted file mode 100644
index 9ce0488..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.functions.TestMathX;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * Tests formulas and operators as loaded from a test data spreadsheet.<p/>
- * This class does not test implementors of <tt>Function</tt> and <tt>OperationEval</tt> in
- * isolation.  Much of the evaluation engine (i.e. <tt>HSSFFormulaEvaluator</tt>, ...) gets
- * exercised as well.  Tests for bug fixes and specific/tricky behaviour can be found in the
- * corresponding test class (<tt>TestXxxx</tt>) of the target (<tt>Xxxx</tt>) implementor,
- * where execution can be observed more easily.
- */
-@RunWith(Parameterized.class)
-public final class TestFormulasFromSpreadsheet {
-
-    private static HSSFWorkbook workbook;
-    private static Sheet sheet;
-    private static HSSFFormulaEvaluator evaluator;
-    private static Locale userLocale;
-    
-    /**
-	 * This class defines constants for navigating around the test data spreadsheet used for these tests.
-	 */
-	private static interface SS {
-
-		/**
-		 * Name of the test spreadsheet (found in the standard test data folder)
-		 */
-		String FILENAME = "FormulaEvalTestData.xls";
-		/**
-		 * Row (zero-based) in the test spreadsheet where the operator examples start.
-		 */
-		int START_OPERATORS_ROW_INDEX = 22; // Row '23'
-		/**
-		 * Row (zero-based) in the test spreadsheet where the function examples start.
-		 */
-		int START_FUNCTIONS_ROW_INDEX = 95; // Row '96'
-		/**
-		 * Index of the column that contains the function names
-		 */
-		int COLUMN_INDEX_FUNCTION_NAME = 1; // Column 'B'
-
-		/**
-		 * Used to indicate when there are no more functions left
-		 */
-		String FUNCTION_NAMES_END_SENTINEL = "<END-OF-FUNCTIONS>";
-
-		/**
-		 * Index of the column where the test values start (for each function)
-		 */
-		short COLUMN_INDEX_FIRST_TEST_VALUE = 3; // Column 'D'
-
-		/**
-		 * Each function takes 4 rows in the test spreadsheet
-		 */
-		int NUMBER_OF_ROWS_PER_FUNCTION = 4;
-	}
-
-    @Parameter(value = 0)
-    public String targetFunctionName;
-    @Parameter(value = 1)
-    public int formulasRowIdx;
-    @Parameter(value = 2)
-    public int expectedValuesRowIdx;
-
-    @AfterClass
-    public static void closeResource() throws Exception {
-        LocaleUtil.setUserLocale(userLocale);
-        workbook.close();
-    }
-
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        // Function "Text" uses custom-formats which are locale specific
-        // can't set the locale on a per-testrun execution, as some settings have been
-        // already set, when we would try to change the locale by then
-        userLocale = LocaleUtil.getUserLocale();
-        LocaleUtil.setUserLocale(Locale.ROOT);
-
-        workbook = HSSFTestDataSamples.openSampleWorkbook(SS.FILENAME);
-        sheet = workbook.getSheetAt( 0 );
-        evaluator = new HSSFFormulaEvaluator(workbook);
-        
-        List<Object[]> data = new ArrayList<Object[]>();
-        
-        processFunctionGroup(data, SS.START_OPERATORS_ROW_INDEX, null);
-        processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, null);
-        // example for debugging individual functions/operators:
-        // processFunctionGroup(data, SS.START_OPERATORS_ROW_INDEX, "ConcatEval");
-        // processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, "Text");
-
-        return data;
-    }
-    
-    /**
-     * @param startRowIndex row index in the spreadsheet where the first function/operator is found
-     * @param testFocusFunctionName name of a single function/operator to test alone.
-     * Typically pass <code>null</code> to test all functions
-     */
-    private static void processFunctionGroup(List<Object[]> data, int startRowIndex, String testFocusFunctionName) {
-        for (int rowIndex = startRowIndex; true; rowIndex += SS.NUMBER_OF_ROWS_PER_FUNCTION) {
-            Row r = sheet.getRow(rowIndex);
-            String targetFunctionName = getTargetFunctionName(r);
-            assertNotNull("Test spreadsheet cell empty on row ("
-                    + (rowIndex+1) + "). Expected function name or '"
-                    + SS.FUNCTION_NAMES_END_SENTINEL + "'", targetFunctionName);
-            if(targetFunctionName.equals(SS.FUNCTION_NAMES_END_SENTINEL)) {
-                // found end of functions list
-                break;
-            }
-            if(testFocusFunctionName == null || targetFunctionName.equalsIgnoreCase(testFocusFunctionName)) {
-
-                // expected results are on the row below
-                Row expectedValuesRow = sheet.getRow(rowIndex + 1);
-                int missingRowNum = rowIndex + 2; //+1 for 1-based, +1 for next row
-                assertNotNull("Missing expected values row for function '"
-                        + targetFunctionName + " (row " + missingRowNum + ")", expectedValuesRow);
-
-                data.add(new Object[]{targetFunctionName, rowIndex, rowIndex + 1});
-            }
-        }
-    }
-
-    @Test
-    public void processFunctionRow() {
-        Row formulasRow = sheet.getRow(formulasRowIdx);
-        Row expectedValuesRow = sheet.getRow(expectedValuesRowIdx);
-
-        short endcolnum = formulasRow.getLastCellNum();
-
-       // iterate across the row for all the evaluation cases
-       for (int colnum=SS.COLUMN_INDEX_FIRST_TEST_VALUE; colnum < endcolnum; colnum++) {
-           Cell c = formulasRow.getCell(colnum);
-           if (c == null || c.getCellTypeEnum() != CellType.FORMULA) {
-               continue;
-           }
-
-           CellValue actValue = evaluator.evaluate(c);
-           Cell expValue = (expectedValuesRow == null) ? null : expectedValuesRow.getCell(colnum);
-
-           String msg = String.format(Locale.ROOT, "Function '%s': Formula: %s @ %d:%d"
-                   , targetFunctionName, c.getCellFormula(), formulasRow.getRowNum(), colnum);
-
-           assertNotNull(msg + " - Bad setup data expected value is null", expValue);
-           assertNotNull(msg + " - actual value was null", actValue);
-
-           final CellType cellType = expValue.getCellTypeEnum();
-           switch (cellType) {
-               case BLANK:
-                   assertEquals(msg, CellType.BLANK, actValue.getCellTypeEnum());
-                   break;
-               case BOOLEAN:
-                   assertEquals(msg, CellType.BOOLEAN, actValue.getCellTypeEnum());
-                   assertEquals(msg, expValue.getBooleanCellValue(), actValue.getBooleanValue());
-                   break;
-               case ERROR:
-                   assertEquals(msg, CellType.ERROR, actValue.getCellTypeEnum());
-                   assertEquals(msg, ErrorEval.getText(expValue.getErrorCellValue()), ErrorEval.getText(actValue.getErrorValue()));
-                   break;
-               case FORMULA: // will never be used, since we will call method after formula evaluation
-                   fail("Cannot expect formula as result of formula evaluation: " + msg);
-               case NUMERIC:
-                   assertEquals(msg, CellType.NUMERIC, actValue.getCellTypeEnum());
-                   TestMathX.assertEquals(msg, expValue.getNumericCellValue(), actValue.getNumberValue(), TestMathX.POS_ZERO, TestMathX.DIFF_TOLERANCE_FACTOR);
-                   break;
-               case STRING:
-                   assertEquals(msg, CellType.STRING, actValue.getCellTypeEnum());
-                   assertEquals(msg, expValue.getRichStringCellValue().getString(), actValue.getStringValue());
-                   break;
-               default:
-                   fail("Unexpected cell type: " + cellType);
-           }
-       }
-   }
-	/**
-	 * @return <code>null</code> if cell is missing, empty or blank
-	 */
-	private static String getTargetFunctionName(Row r) {
-		if(r == null) {
-			System.err.println("Warning - given null row, can't figure out function name");
-			return null;
-		}
-		Cell cell = r.getCell(SS.COLUMN_INDEX_FUNCTION_NAME);
-		if(cell == null) {
-			System.err.println("Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.BLANK) {
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.STRING) {
-			return cell.getRichStringCellValue().getString();
-		}
-
-		throw new AssertionFailedError("Bad cell type for 'function name' column: ("
-				+ cell.getCellTypeEnum() + ") row (" + (r.getRowNum() +1) + ")");
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
deleted file mode 100644
index f1e21b4..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-
-/**
- * Tests HSSFFormulaEvaluator for its handling of cell formula circular references.
- *
- * @author Josh Micich
- */
-public final class TestHSSFCircularReferences extends BaseTestCircularReferences {
-	public TestHSSFCircularReferences() {
-        super(HSSFITestDataProvider.instance);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
deleted file mode 100644
index 7500be5..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.ComparisonFailure;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.functions.Function;
-import org.apache.poi.util.HexDump;
-
-/**
- * IEEE 754 defines a quantity '-0.0' which is distinct from '0.0'.
- * Negative zero is not easy to observe in Excel, since it is usually converted to 0.0.
- * (Note - the results of XLL add-in functions don't seem to be converted, so they are one
- * reliable avenue to observe Excel's treatment of '-0.0' as an operand.)
- * <p/>
- * POI attempts to emulate Excel faithfully, so this class tests
- * two aspects of '-0.0' in formula evaluation:
- * <ol>
- * <li>For most operation results '-0.0' is converted to '0.0'.</li>
- * <li>Comparison operators have slightly different rules regarding '-0.0'.</li>
- * </ol>
- * @author Josh Micich
- */
-public final class TestMinusZeroResult extends TestCase {
-	private static final double MINUS_ZERO = -0.0;
-
-	public void testSimpleOperators() {
-
-		// unary plus is a no-op
-		checkEval(MINUS_ZERO, UnaryPlusEval.instance, MINUS_ZERO);
-
-		// most simple operators convert -0.0 to +0.0
-		checkEval(0.0, EvalInstances.UnaryMinus, 0.0);
-		checkEval(0.0, EvalInstances.Percent, MINUS_ZERO);
-		checkEval(0.0, EvalInstances.Multiply, MINUS_ZERO, 1.0);
-		checkEval(0.0, EvalInstances.Divide, MINUS_ZERO, 1.0);
-		checkEval(0.0, EvalInstances.Power, MINUS_ZERO, 1.0);
-
-		// but SubtractEval does not convert -0.0, so '-' and '+' work like java
-		checkEval(MINUS_ZERO, EvalInstances.Subtract, MINUS_ZERO, 0.0); // this is the main point of bug 47198
-		checkEval(0.0, EvalInstances.Add, MINUS_ZERO, 0.0);
-	}
-
-	/**
-	 * These results are hard to see in Excel (since -0.0 is usually converted to +0.0 before it
-	 * gets to the comparison operator)
-	 */
-	public void testComparisonOperators() {
-		checkEval(false, EvalInstances.Equal, 0.0, MINUS_ZERO);
-		checkEval(true, EvalInstances.GreaterThan, 0.0, MINUS_ZERO);
-		checkEval(true, EvalInstances.LessThan, MINUS_ZERO, 0.0);
-	}
-
-	public void testTextRendering() {
-		confirmTextRendering("-0", MINUS_ZERO);
-		// sub-normal negative numbers also display as '-0'
-		confirmTextRendering("-0", Double.longBitsToDouble(0x8000100020003000L));
-	}
-
-	/**
-	 * Uses {@link ConcatEval} to force number-to-text conversion
-	 */
-	private static void confirmTextRendering(String expRendering, double d) {
-		ValueEval[] args = { StringEval.EMPTY_INSTANCE, new NumberEval(d), };
-		StringEval se = (StringEval) EvalInstances.Concat.evaluate(args, -1, (short)-1);
-		String result = se.getStringValue();
-		assertEquals(expRendering, result);
-	}
-
-	private static void checkEval(double expectedResult, Function instance, double... dArgs) {
-		NumberEval result = (NumberEval) evaluate(instance, dArgs);
-		assertDouble(expectedResult, result.getNumberValue());
-	}
-	private static void checkEval(boolean expectedResult, Function instance, double... dArgs) {
-		BoolEval result = (BoolEval) evaluate(instance, dArgs);
-		assertEquals(expectedResult, result.getBooleanValue());
-	}
-	private static ValueEval evaluate(Function instance, double... dArgs) {
-		ValueEval[] evalArgs;
-		evalArgs = new ValueEval[dArgs.length];
-		for (int i = 0; i < evalArgs.length; i++) {
-			evalArgs[i] = new NumberEval(dArgs[i]);
-		}
-		ValueEval r = instance.evaluate(evalArgs, -1, (short)-1);
-		return r;
-	}
-
-	/**
-	 * Not really a POI test - just shows similar behaviour of '-0.0' in Java.
-	 */
-	public void testJava() {
-
-		assertEquals(0x8000000000000000L, Double.doubleToLongBits(MINUS_ZERO));
-
-		// The simple operators consider all zeros to be the same
-		assertTrue(MINUS_ZERO == MINUS_ZERO);
-		assertTrue(MINUS_ZERO == +0.0);
-		assertFalse(MINUS_ZERO < +0.0);
-
-		// Double.compare() considers them different
-		assertTrue(Double.compare(MINUS_ZERO, +0.0) < 0);
-
-		// multiplying zero by any negative quantity yields minus zero
-		assertDouble(MINUS_ZERO, 0.0*-1);
-		assertDouble(MINUS_ZERO, 0.0*-1e300);
-		assertDouble(MINUS_ZERO, 0.0*-1e-300);
-
-		// minus zero can be produced as a result of underflow
-		assertDouble(MINUS_ZERO, -1e-300 / 1e100);
-
-		// multiplying or dividing minus zero by a positive quantity yields minus zero
-		assertDouble(MINUS_ZERO, MINUS_ZERO * 1.0);
-		assertDouble(MINUS_ZERO, MINUS_ZERO / 1.0);
-
-		// subtracting positive zero gives minus zero
-		assertDouble(MINUS_ZERO, MINUS_ZERO - 0.0);
-		// BUT adding positive zero gives positive zero
-		assertDouble(0.0, MINUS_ZERO + 0.0);  // <<----
-	}
-
-	/**
-	 * Just so there is no ambiguity.  The two double values have to be exactly equal
-	 */
-	private static void assertDouble(double a, double b) {
-		long bitsA = Double.doubleToLongBits(a);
-		long bitsB = Double.doubleToLongBits(b);
-		if (bitsA != bitsB) {
-			throw new ComparisonFailure("value different to expected",
-					HexDump.longToHex(bitsA), HexDump.longToHex(bitsB));
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
deleted file mode 100644
index 2bef73c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import java.util.EmptyStackException;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellValue;
-
-/**
- * Tests for {@link MissingArgEval}
- *
- * @author Josh Micich
- */
-public final class TestMissingArgEval extends TestCase {
-	
-	public void testEvaluateMissingArgs() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFCell cell = sheet.createRow(0).createCell(0);
-		
-		cell.setCellFormula("if(true,)"); 
-		fe.clearAllCachedResultValues();
-		CellValue cv;
-		try {
-			cv = fe.evaluate(cell);
-		} catch (EmptyStackException e) {
-			throw new AssertionFailedError("Missing args evaluation not implemented (bug 43354");
-		}
-		// MissingArg -> BlankEval -> zero (as formula result)
-		assertEquals(0.0, cv.getNumberValue(), 0.0);
-		
-		// MissingArg -> BlankEval -> empty string (in concatenation)
-		cell.setCellFormula("\"abc\"&if(true,)"); 
-		fe.clearAllCachedResultValues();
-		assertEquals("abc", fe.evaluate(cell).getStringValue());
-	}
-	
-	public void testCountFuncs() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFCell cell = sheet.createRow(0).createCell(0);
-		
-		cell.setCellFormula("COUNT(C5,,,,)"); // 4 missing args, C5 is blank 
-		assertEquals(4.0, fe.evaluate(cell).getNumberValue(), 0.0);
-
-		cell.setCellFormula("COUNTA(C5,,)"); // 2 missing args, C5 is blank 
-		fe.clearAllCachedResultValues();
-		assertEquals(2.0, fe.evaluate(cell).getNumberValue(), 0.0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
deleted file mode 100644
index 9db99b1..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import java.io.PrintStream;
-import java.util.Collection;
-import java.util.Locale;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.functions.TestMathX;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Tests formulas for multi sheet reference (i.e. SUM(Sheet1:Sheet5!A1))
- */
-public final class TestMultiSheetEval extends TestCase {
-    private static final POILogger logger = POILogFactory.getLogger(TestFormulasFromSpreadsheet.class);
-
-	private static final class Result {
-		public static final int SOME_EVALUATIONS_FAILED = -1;
-		public static final int ALL_EVALUATIONS_SUCCEEDED = +1;
-		public static final int NO_EVALUATIONS_FOUND = 0;
-	}
-
-	/**
-	 * This class defines constants for navigating around the test data spreadsheet used for these tests.
-	 */
-	private static final class SS {
-
-		/**
-		 * Name of the test spreadsheet (found in the standard test data folder)
-		 */
-		public final static String FILENAME = "FormulaSheetRange.xls";
-		/**
-		 * Row (zero-based) in the test spreadsheet where the function examples start.
-		 */
-		public static final int START_FUNCTIONS_ROW_INDEX = 10; // Row '11'
-		/**
-		 * Index of the column that contains the function names
-		 */
-		public static final int COLUMN_INDEX_FUNCTION_NAME = 0; // Column 'A'
-		/**
-		 * Index of the column that contains the test names
-		 */
-		public static final int COLUMN_INDEX_TEST_NAME = 1; // Column 'B'
-		/**
-		 * Used to indicate when there are no more functions left
-		 */
-		public static final String FUNCTION_NAMES_END_SENTINEL = "<END>";
-
-		/**
-		 * Index of the column where the test expected value is present
-		 */
-		public static final short COLUMN_INDEX_EXPECTED_VALUE = 2; // Column 'C'
-		/**
-		 * Index of the column where the test actual value is present
-		 */
-		public static final short COLUMN_INDEX_ACTUAL_VALUE = 3; // Column 'D'
-		/**
-		 * Test sheet name (sheet with all test formulae)
-		 */
-		public static final String TEST_SHEET_NAME = "test";
-	}
-
-	private HSSFWorkbook workbook;
-	private Sheet sheet;
-	// Note - multiple failures are aggregated before ending.
-	// If one or more functions fail, a single AssertionFailedError is thrown at the end
-	private int _functionFailureCount;
-	private int _functionSuccessCount;
-	private int _evaluationFailureCount;
-	private int _evaluationSuccessCount;
-
-	private static void confirmExpectedResult(String msg, Cell expected, CellValue actual) {
-		if (expected == null) {
-			throw new AssertionFailedError(msg + " - Bad setup data expected value is null");
-		}
-		if(actual == null) {
-			throw new AssertionFailedError(msg + " - actual value was null");
-		}
-		
-		final CellType cellType = expected.getCellTypeEnum();
-
-		switch (cellType) {
-			case BLANK:
-				assertEquals(msg, CellType.BLANK, actual.getCellTypeEnum());
-				break;
-			case BOOLEAN:
-				assertEquals(msg, CellType.BOOLEAN, actual.getCellTypeEnum());
-				assertEquals(msg, expected.getBooleanCellValue(), actual.getBooleanValue());
-				break;
-			case ERROR:
-				assertEquals(msg, CellType.ERROR, actual.getCellTypeEnum());
-				assertEquals(msg, ErrorEval.getText(expected.getErrorCellValue()), ErrorEval.getText(actual.getErrorValue()));
-				break;
-			case FORMULA: // will never be used, since we will call method after formula evaluation
-				throw new AssertionFailedError("Cannot expect formula as result of formula evaluation: " + msg);
-			case NUMERIC:
-				assertEquals(msg, CellType.NUMERIC, actual.getCellTypeEnum());
-				TestMathX.assertEquals(msg, expected.getNumericCellValue(), actual.getNumberValue(), TestMathX.POS_ZERO, TestMathX.DIFF_TOLERANCE_FACTOR);
-				break;
-			case STRING:
-				assertEquals(msg, CellType.STRING, actual.getCellTypeEnum());
-				assertEquals(msg, expected.getRichStringCellValue().getString(), actual.getStringValue());
-				break;
-			default:
-				throw new AssertionFailedError("Unexpected cell type: " + cellType);
-		}
-	}
-
-
-	@Override
-    protected void setUp() {
-		if (workbook == null) {
-			workbook = HSSFTestDataSamples.openSampleWorkbook(SS.FILENAME);
-			sheet = workbook.getSheet( SS.TEST_SHEET_NAME );
-		}
-		_functionFailureCount = 0;
-		_functionSuccessCount = 0;
-		_evaluationFailureCount = 0;
-		_evaluationSuccessCount = 0;
-	}
-
-	public void testFunctionsFromTestSpreadsheet() {
-
-		processFunctionGroup(SS.START_FUNCTIONS_ROW_INDEX, null);
-
-		// confirm results
-		String successMsg = "There were "
-				+ _evaluationSuccessCount + " successful evaluation(s) and "
-				+ _functionSuccessCount + " function(s) without error";
-		if(_functionFailureCount > 0) {
-			String msg = _functionFailureCount + " function(s) failed in "
-			+ _evaluationFailureCount + " evaluation(s).  " + successMsg;
-			throw new AssertionFailedError(msg);
-		}
-        logger.log(POILogger.INFO, getClass().getName() + ": " + successMsg);
-	}
-
-	/**
-	 * @param startRowIndex row index in the spreadsheet where the first function/operator is found
-	 * @param testFocusFunctionName name of a single function/operator to test alone.
-	 * Typically pass <code>null</code> to test all functions
-	 */
-	private void processFunctionGroup(int startRowIndex, String testFocusFunctionName) {
-		HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(workbook);
-        Collection<String> funcs = FunctionEval.getSupportedFunctionNames();
-
-		int rowIndex = startRowIndex;
-		while (true) {
-			Row r = sheet.getRow(rowIndex);
-			
-			// only evaluate non empty row
-			if( r != null )
-			{
-				String targetFunctionName = getTargetFunctionName(r);
-				String targetTestName = getTargetTestName(r);
-				if(targetFunctionName == null) {
-					throw new AssertionFailedError("Test spreadsheet cell empty on row ("
-							+ (rowIndex+1) + "). Expected function name or '"
-							+ SS.FUNCTION_NAMES_END_SENTINEL + "'");
-				}
-				if(targetFunctionName.equals(SS.FUNCTION_NAMES_END_SENTINEL)) {
-					// found end of functions list
-					break;
-				}
-				if(testFocusFunctionName == null || targetFunctionName.equalsIgnoreCase(testFocusFunctionName)) {
-
-					// expected results are on the row below
-					Cell expectedValueCell = r.getCell(SS.COLUMN_INDEX_EXPECTED_VALUE);
-					if(expectedValueCell == null) {
-						int missingRowNum = rowIndex + 1;
-						throw new AssertionFailedError("Missing expected values cell for function '"
-								+ targetFunctionName + ", test" + targetTestName + " (row " + 
-								missingRowNum + ")");
-					}
-					
-					switch(processFunctionRow(evaluator, targetFunctionName, targetTestName, r, expectedValueCell)) {
-						case Result.ALL_EVALUATIONS_SUCCEEDED: _functionSuccessCount++; break;
-						case Result.SOME_EVALUATIONS_FAILED: _functionFailureCount++; break;
-						default:
-							throw new RuntimeException("unexpected result");
-						case Result.NO_EVALUATIONS_FOUND: // do nothing
-							String uname = targetFunctionName.toUpperCase(Locale.ROOT);
-							if(startRowIndex >= SS.START_FUNCTIONS_ROW_INDEX &&
-									funcs.contains(uname)) {
-								logger.log(POILogger.WARN, uname + ": function is supported but missing test data");
-							}
-							break;
-					}
-				}
-			}
-			rowIndex ++;
-		}
-	}
-
-	/**
-	 *
-	 * @return a constant from the local Result class denoting whether there were any evaluation
-	 * cases, and whether they all succeeded.
-	 */
-	private int processFunctionRow(HSSFFormulaEvaluator evaluator, String targetFunctionName, 
-			String targetTestName, Row formulasRow, Cell expectedValueCell) {
-
-		int result = Result.NO_EVALUATIONS_FOUND; // so far
-
-		Cell c = formulasRow.getCell(SS.COLUMN_INDEX_ACTUAL_VALUE);
-		if (c == null || c.getCellTypeEnum() != CellType.FORMULA) {
-			return result;
-		}
-
-		CellValue actualValue = evaluator.evaluate(c);
-
-		try {
-			confirmExpectedResult("Function '" + targetFunctionName + "': Test: '" + targetTestName + "' Formula: " + c.getCellFormula() 
-			+ " @ " + formulasRow.getRowNum() + ":" + SS.COLUMN_INDEX_ACTUAL_VALUE,
-					expectedValueCell, actualValue);
-			_evaluationSuccessCount ++;
-			if(result != Result.SOME_EVALUATIONS_FAILED) {
-				result = Result.ALL_EVALUATIONS_SUCCEEDED;
-			}
-		} catch (AssertionFailedError e) {
-			_evaluationFailureCount ++;
-			printShortStackTrace(System.err, e);
-			result = Result.SOME_EVALUATIONS_FAILED;
-		}
-	
-		return result;
-	}
-
-	/**
-	 * Useful to keep output concise when expecting many failures to be reported by this test case
-	 */
-	private static void printShortStackTrace(PrintStream ps, AssertionFailedError e) {
-		StackTraceElement[] stes = e.getStackTrace();
-
-		int startIx = 0;
-		// skip any top frames inside junit.framework.Assert
-		while(startIx<stes.length) {
-			if(!stes[startIx].getClassName().equals(Assert.class.getName())) {
-				break;
-			}
-			startIx++;
-		}
-		// skip bottom frames (part of junit framework)
-		int endIx = startIx+1;
-		while(endIx < stes.length) {
-			if(stes[endIx].getClassName().equals(TestCase.class.getName())) {
-				break;
-			}
-			endIx++;
-		}
-		if(startIx >= endIx) {
-			// something went wrong. just print the whole stack trace
-			e.printStackTrace(ps);
-		}
-		endIx -= 4; // skip 4 frames of reflection invocation
-		ps.println(e.toString());
-		for(int i=startIx; i<endIx; i++) {
-			ps.println("\tat " + stes[i].toString());
-		}
-	}
-
-	/**
-	 * @return <code>null</code> if cell is missing, empty or blank
-	 */
-	private static String getTargetFunctionName(Row r) {
-		if(r == null) {
-			System.err.println("Warning - given null row, can't figure out function name");
-			return null;
-		}
-		Cell cell = r.getCell(SS.COLUMN_INDEX_FUNCTION_NAME);
-		if(cell == null) {
-			System.err.println("Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.BLANK) {
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.STRING) {
-			return cell.getRichStringCellValue().getString();
-		}
-
-		throw new AssertionFailedError("Bad cell type for 'function name' column: ("
-				+ cell.getCellTypeEnum() + ") row (" + (r.getRowNum() +1) + ")");
-	}
-	/**
-	 * @return <code>null</code> if cell is missing, empty or blank
-	 */
-	private static String getTargetTestName(Row r) {
-		if(r == null) {
-			System.err.println("Warning - given null row, can't figure out test name");
-			return null;
-		}
-		Cell cell = r.getCell(SS.COLUMN_INDEX_TEST_NAME);
-		if(cell == null) {
-			System.err.println("Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_TEST_NAME + ", can't figure out test name");
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.BLANK) {
-			return null;
-		}
-		if(cell.getCellTypeEnum() == CellType.STRING) {
-			return cell.getRichStringCellValue().getString();
-		}
-
-		throw new AssertionFailedError("Bad cell type for 'test name' column: ("
-				+ cell.getCellTypeEnum() + ") row (" + (r.getRowNum() +1) + ")");
-	}
-	
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java
deleted file mode 100644
index 4e24f84..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests for <tt>OperandResolver</tt>
- *
- * @author Brendan Nolan
- */
-public final class TestOperandResolver extends TestCase {
-
-	public void testParseDouble_bug48472() {
-		
-		String value = "-";
-		
-		Double resolvedValue = null;
-		
-		try {
-			resolvedValue = OperandResolver.parseDouble(value);
-		} catch (StringIndexOutOfBoundsException e) { 
-			throw new AssertionFailedError("Identified bug 48472");
-		}
-		
-		assertEquals(null, resolvedValue);
-		
-	}
-	
-	public void testParseDouble_bug49723() {
-		
-		String value = ".1";
-		
-		Double resolvedValue = null;
-		
-		resolvedValue = OperandResolver.parseDouble(value);
-		
-		assertNotNull("Identified bug 49723", resolvedValue);
-		
-	}
-	
-	/**
-	 * 
-	 * Tests that a list of valid strings all return a non null value from {@link OperandResolver#parseDouble(String)}
-	 * 
-	 */
-	public void testParseDoubleValidStrings() {
-				
-		String[] values = new String[]{".19", "0.19", "1.9", "1E4", "-.19", "-0.19", "8.5","-1E4", ".5E6","+1.5","+1E5", "  +1E5  "};
-		
-		for (String value : values) {
-			assertTrue(OperandResolver.parseDouble(value) != null);
-			assertEquals(OperandResolver.parseDouble(value), Double.parseDouble(value));
-		}
-
-	}
-	
-	/**
-	 * 
-	 * Tests that a list of invalid strings all return null from {@link OperandResolver#parseDouble(String)}
-	 * 
-	 */
-	public void testParseDoubleInvalidStrings() {
-		
-		String[] values = new String[]{"-", "ABC", "-X", "1E5a", "Infinity", "NaN", ".5F", "1,000"};
-		
-		for (String value : values) {
-			assertEquals(null, OperandResolver.parseDouble(value));
-		}
-
-	}
-	
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java
deleted file mode 100644
index 71cf649..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.functions.EvalFactory;
-import org.apache.poi.ss.formula.functions.NumericFunctionInvoker;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-/**
- * Test for percent operator evaluator.
- *
- * @author Josh Micich
- */
-public final class TestPercentEval extends TestCase {
-
-	private static void confirm(ValueEval arg, double expectedResult) {
-		ValueEval[] args = {
-			arg,
-		};
-
-		double result = NumericFunctionInvoker.invoke(PercentEval.instance, args, 0, 0);
-
-		assertEquals(expectedResult, result, 0);
-	}
-
-	public void testBasic() {
-		confirm(new NumberEval(5), 0.05);
-		confirm(new NumberEval(3000), 30.0);
-		confirm(new NumberEval(-150), -1.5);
-		confirm(new StringEval("0.2"), 0.002);
-		confirm(BoolEval.TRUE, 0.01);
-	}
-
-	public void test1x1Area() {
-		AreaEval ae = EvalFactory.createAreaEval("B2:B2", new ValueEval[] { new NumberEval(50), });
-		confirm(ae, 0.5);
-	}
-	public void testInSpreadSheet() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFRow row = sheet.createRow(0);
-		HSSFCell cell = row.createCell(0);
-		cell.setCellFormula("B1%");
-		row.createCell(1).setCellValue(50.0);
-
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		CellValue cv;
-		try {
-			cv = fe.evaluate(cell);
-		} catch (RuntimeException e) {
-			if(e.getCause() instanceof NullPointerException) {
-				throw new AssertionFailedError("Identified bug 44608");
-			}
-			// else some other unexpected error
-			throw e;
-		}
-		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
-		assertEquals(0.5, cv.getNumberValue(), 0.0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
deleted file mode 100644
index 6a64436..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaI.OffsetArea;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Test for unary plus operator evaluator.
- *
- * @author Josh Micich
- */
-public final class TestRangeEval extends TestCase {
-
-	public void testPermutations() {
-
-		confirm("B3", "D7", "B3:D7");
-		confirm("B1", "B1", "B1:B1");
-
-		confirm("B7", "D3", "B3:D7");
-		confirm("D3", "B7", "B3:D7");
-		confirm("D7", "B3", "B3:D7");
-	}
-
-	private static void confirm(String refA, String refB, String expectedAreaRef) {
-
-		ValueEval[] args = {
-			createRefEval(refA),
-			createRefEval(refB),
-		};
-		@SuppressWarnings("deprecation")
-        AreaReference ar = new AreaReference(expectedAreaRef);
-		ValueEval result = EvalInstances.Range.evaluate(args, 0, (short)0);
-		assertTrue(result instanceof AreaEval);
-		AreaEval ae = (AreaEval) result;
-		assertEquals(ar.getFirstCell().getRow(), ae.getFirstRow());
-		assertEquals(ar.getLastCell().getRow(), ae.getLastRow());
-		assertEquals(ar.getFirstCell().getCol(), ae.getFirstColumn());
-		assertEquals(ar.getLastCell().getCol(), ae.getLastColumn());
-	}
-
-	private static ValueEval createRefEval(String refStr) {
-		CellReference cr = new CellReference(refStr);
-		return new MockRefEval(cr.getRow(), cr.getCol());
-
-	}
-
-	private static final class MockRefEval extends RefEvalBase {
-		public MockRefEval(int rowIndex, int columnIndex) {
-			super(-1, -1, rowIndex, columnIndex);
-		}
-		@Override
-        public ValueEval getInnerValueEval(int sheetIndex) {
-			throw new RuntimeException("not expected to be called during this test");
-		}
-		@Override
-        public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx,
-				int relLastColIx) {
-			AreaI area = new OffsetArea(getRow(), getColumn(),
-					relFirstRowIx, relLastRowIx, relFirstColIx, relLastColIx);
-			return new MockAreaEval(area);
-		}
-	}
-
-	private static final class MockAreaEval extends AreaEvalBase {
-
-		public MockAreaEval(AreaI ptg) {
-			super(ptg);
-		}
-		private MockAreaEval(int firstRow, int firstColumn, int lastRow, int lastColumn) {
-			super(firstRow, firstColumn, lastRow, lastColumn);
-		}
-		@Override
-        public ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex) {
-			throw new RuntimeException("not expected to be called during this test");
-		}
-        @Override
-        public ValueEval getRelativeValue(int sheetIndex, int relativeRowIndex, int relativeColumnIndex) {
-            throw new RuntimeException("not expected to be called during this test");
-        }
-		@Override
-        public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx,
-				int relLastColIx) {
-			AreaI area = new OffsetArea(getFirstRow(), getFirstColumn(),
-					relFirstRowIx, relLastRowIx, relFirstColIx, relLastColIx);
-
-			return new MockAreaEval(area);
-		}
-		@Override
-        public TwoDEval getRow(int rowIndex) {
-			if (rowIndex >= getHeight()) {
-				throw new IllegalArgumentException("Invalid rowIndex " + rowIndex
-						+ ".  Allowable range is (0.." + getHeight() + ").");
-			}
-			return new MockAreaEval(rowIndex, getFirstColumn(), rowIndex, getLastColumn());
-		}
-		@Override
-        public TwoDEval getColumn(int columnIndex) {
-			if (columnIndex >= getWidth()) {
-				throw new IllegalArgumentException("Invalid columnIndex " + columnIndex
-						+ ".  Allowable range is (0.." + getWidth() + ").");
-			}
-			return new MockAreaEval(getFirstRow(), columnIndex, getLastRow(), columnIndex);
-		}
-	}
-
-	public void testRangeUsingOffsetFunc_bug46948() {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFRow row = wb.createSheet("Sheet1").createRow(0);
-		HSSFCell cellA1 = row.createCell(0);
-		HSSFCell cellB1 = row.createCell(1);
-		row.createCell(2).setCellValue(5.0); // C1
-		row.createCell(3).setCellValue(7.0); // D1
-		row.createCell(4).setCellValue(9.0); // E1
-
-
-		cellA1.setCellFormula("SUM(C1:OFFSET(C1,0,B1))");
-
-		cellB1.setCellValue(1.0); // range will be C1:D1
-
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		CellValue cv;
-		try {
-			cv = fe.evaluate(cellA1);
-		} catch (IllegalArgumentException e) {
-			if (e.getMessage().equals("Unexpected ref arg class (org.apache.poi.ss.formula.LazyAreaEval)")) {
-				throw new AssertionFailedError("Identified bug 46948");
-			}
-			throw e;
-		}
-
-		assertEquals(12.0, cv.getNumberValue(), 0.0);
-
-		cellB1.setCellValue(2.0); // range will be C1:E1
-		fe.notifyUpdateCell(cellB1);
-		cv = fe.evaluate(cellA1);
-		assertEquals(21.0, cv.getNumberValue(), 0.0);
-
-		cellB1.setCellValue(0.0); // range will be C1:C1
-		fe.notifyUpdateCell(cellB1);
-		cv = fe.evaluate(cellA1);
-		assertEquals(5.0, cv.getNumberValue(), 0.0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
deleted file mode 100644
index c4a39fc..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.functions.EvalFactory;
-import org.apache.poi.ss.formula.functions.NumericFunctionInvoker;
-
-/**
- * Test for unary plus operator evaluator.
- *
- * @author Josh Micich
- */
-public final class TestUnaryPlusEval extends TestCase {
-
-	/**
-	 * Test for bug observable at svn revision 618865 (5-Feb-2008)<br/>
-	 * The code for handling column operands had been copy-pasted from the row handling code.
-	 */
-	public void testColumnOperand() {
-
-		short firstRow = (short)8;
-		short lastRow = (short)12;
-		short colNum = (short)5;
-		AreaPtg areaPtg = new AreaPtg(firstRow, lastRow, colNum, colNum, false, false, false, false);
-		ValueEval[] values = {
-				new NumberEval(27),
-				new NumberEval(29),
-				new NumberEval(35),	// value in row 10
-				new NumberEval(37),
-				new NumberEval(38),
-		};
-		ValueEval[] args = {
-			EvalFactory.createAreaEval(areaPtg, values),
-		};
-
-		double result = NumericFunctionInvoker.invoke(EvalInstances.UnaryPlus, args, 10, (short)20);
-
-		assertEquals(35, result, 0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java b/trunk/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java
deleted file mode 100644
index e00dbaf..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.eval.forked;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-public class TestForkedEvaluator {
-    
-    @Rule
-    public ExpectedException expectedEx = ExpectedException.none();
-    
-    protected Workbook newWorkbook() {
-        return new HSSFWorkbook();
-    }
-    
-	/**
-	 * set up a calculation workbook with input cells nicely segregated on a
-	 * sheet called "Inputs"
-	 */
-	protected Workbook createWorkbook() {
-		Workbook wb = newWorkbook();
-		Sheet sheet1 = wb.createSheet("Inputs");
-		Sheet sheet2 = wb.createSheet("Calculations");
-		Row row;
-		row = sheet2.createRow(0);
-		row.createCell(0).setCellFormula("B1*Inputs!A1-Inputs!B1");
-		row.createCell(1).setCellValue(5.0); // Calculations!B1
-
-		// some default input values
-		row = sheet1.createRow(0);
-		row.createCell(0).setCellValue(2.0); // Inputs!A1
-		row.createCell(1).setCellValue(3.0); // Inputs!B1
-		return wb;
-	}
-
-	/**
-	 * Shows a basic use-case for {@link ForkedEvaluator}
-	 */
-	@Test
-	public void testBasic() throws IOException {
-		Workbook wb = createWorkbook();
-
-		// The stability classifier is useful to reduce memory consumption of caching logic
-		IStabilityClassifier stabilityClassifier = new IStabilityClassifier() {
-			@Override
-            public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
-				return sheetIndex == 1;
-			}
-		};
-
-		ForkedEvaluator fe1 = ForkedEvaluator.create(wb, stabilityClassifier, null);
-		ForkedEvaluator fe2 = ForkedEvaluator.create(wb, stabilityClassifier, null);
-
-		// fe1 and fe2 can be used concurrently on separate threads
-
-		fe1.updateCell("Inputs", 0, 0, new NumberEval(4.0));
-		fe1.updateCell("Inputs", 0, 1, new NumberEval(1.1));
-
-		fe2.updateCell("Inputs", 0, 0, new NumberEval(1.2));
-		fe2.updateCell("Inputs", 0, 1, new NumberEval(2.0));
-
-		assertEquals(18.9, ((NumberEval) fe1.evaluate("Calculations", 0, 0)).getNumberValue(), 0.0);
-		assertEquals(4.0, ((NumberEval) fe2.evaluate("Calculations", 0, 0)).getNumberValue(), 0.0);
-		fe1.updateCell("Inputs", 0, 0, new NumberEval(3.0));
-		assertEquals(13.9, ((NumberEval) fe1.evaluate("Calculations", 0, 0)).getNumberValue(), 0.0);
-		
-		wb.close();
-	}
-
-	/**
-	 * As of Sep 2009, the Forked evaluator can update values from existing cells (this is because
-	 * the underlying 'master' cell is used as a key into the calculation cache.  Prior to the fix
-	 * for this bug, an attempt to update a missing cell would result in NPE.  This junit tests for
-	 * a more meaningful error message.<br/>
-	 *
-	 * An alternate solution might involve allowing empty cells to be created as necessary.  That
-	 * was considered less desirable because so far, the underlying 'master' workbook is strictly
-	 * <i>read-only</i> with respect to the ForkedEvaluator.
-	 */
-	@Test
-	public void testMissingInputCellH() throws IOException {
-	    expectedEx.expect(UnsupportedOperationException.class);
-	    expectedEx.expectMessage("Underlying cell 'A2' is missing in master sheet.");
-	    
-		Workbook wb = createWorkbook();
-
-		try {
-    		ForkedEvaluator fe = ForkedEvaluator.create(wb, null, null);
-    		// attempt update input at cell A2 (which is missing)
-            fe.updateCell("Inputs", 1, 0, new NumberEval(4.0));
-		} finally {
-		    wb.close();
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java b/trunk/src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java
deleted file mode 100644
index 1931bdb..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for this <tt>org.apache.poi.hssf.record.formula.function</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestFunctionMetadataRegistry.class,
-    TestParseMissingBuiltInFuncs.class,
-    TestReadMissingBuiltInFuncs.class
-})
-public class AllFormulaFunctionTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java b/trunk/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
deleted file mode 100644
index 2dab84c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.apache.poi.poifs.crypt.CryptoFunctions;
-import org.apache.poi.poifs.crypt.HashAlgorithm;
-import org.apache.poi.util.TempFile;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * This class is not used during normal POI run-time but is used at development time to generate
- * the file 'functionMetadata.txt'.   There are more than 300 built-in functions in Excel and the
- * intention of this class is to make it easier to maintain the metadata, by extracting it from
- * a reliable source.
- */
-public final class ExcelFileFormatDocFunctionExtractor {
-
-	private static final String SOURCE_DOC_FILE_NAME = "excelfileformat.odt";
-
-	/**
-	 * For simplicity, the output file is strictly simple ASCII.
-	 * This method detects any unexpected characters.
-	 */
-	/* package */ static boolean isSimpleAscii(char c) {
-
-		if (c>=0x21 && c<=0x7E) {
-			// everything from '!' to '~' (includes letters, digits, punctuation
-			return true;
-		}
-		// some specific whitespace chars below 0x21:
-		switch(c) {
-			case ' ':
-			case '\t':
-			case '\r':
-			case '\n':
-				return true;
-		}
-		return false;
-	}
-
-
-	private static final class FunctionData {
-		// special characters from the ooo document
-		private static final int CHAR_ELLIPSIS_8230 = 8230;
-		private static final int CHAR_NDASH_8211 = 8211;
-
-		private final int _index;
-		private final boolean _hasFootnote;
-		private final String _name;
-		private final int _minParams;
-		private final int _maxParams;
-		private final String _returnClass;
-		private final String _paramClasses;
-		private final boolean _isVolatile;
-
-		public FunctionData(int funcIx, boolean hasFootnote, String funcName, int minParams, int maxParams,
-					String returnClass, String paramClasses, boolean isVolatile) {
-			_index = funcIx;
-			_hasFootnote = hasFootnote;
-			_name = funcName;
-			_minParams = minParams;
-			_maxParams = maxParams;
-			_returnClass = convertSpecialChars(returnClass);
-			_paramClasses = convertSpecialChars(paramClasses);
-			_isVolatile = isVolatile;
-		}
-		private static String convertSpecialChars(String ss) {
-			StringBuffer sb = new StringBuffer(ss.length() + 4);
-			for(int i=0; i<ss.length(); i++) {
-				char c = ss.charAt(i);
-				if (isSimpleAscii(c)) {
-					sb.append(c);
-					continue;
-				}
-				switch (c) {
-					case CHAR_NDASH_8211:
-						sb.append('-');
-						continue;
-					case CHAR_ELLIPSIS_8230:
-						sb.append("...");
-						continue;
-				}
-				throw new RuntimeException("bad char (" + ((int)c) + ") in string '" + ss + "'");
-			}
-			return sb.toString();
-		}
-		public int getIndex() {
-			return _index;
-		}
-		public String getName() {
-			return _name;
-		}
-		public boolean hasFootnote() {
-			return _hasFootnote;
-		}
-		public String formatAsDataLine() {
-			return _index + "\t" + _name + "\t" + _minParams + "\t"
-					+ _maxParams + "\t" + _returnClass + "\t" + _paramClasses
-					+ "\t" + checkMark(_isVolatile) + "\t" + checkMark(_hasFootnote);
-		}
-		private static String checkMark(boolean b) {
-			return b ? "x" : "";
-		}
-	}
-
-	private static final class FunctionDataCollector {
-
-		private final Map<Integer, FunctionData> _allFunctionsByIndex;
-		private final Map<String, FunctionData> _allFunctionsByName;
-		private final Set<Integer> _groupFunctionIndexes;
-		private final Set<String> _groupFunctionNames;
-		private final PrintStream _ps;
-
-		public FunctionDataCollector(PrintStream ps) {
-			_ps = ps;
-			_allFunctionsByIndex = new HashMap<Integer, FunctionData>();
-			_allFunctionsByName = new HashMap<String, FunctionData>();
-			_groupFunctionIndexes = new HashSet<Integer>();
-			_groupFunctionNames = new HashSet<String>();
-		}
-
-		public void addFuntion(int funcIx, boolean hasFootnote, String funcName, int minParams, int maxParams,
-				String returnClass, String paramClasses, String volatileFlagStr) {
-			boolean isVolatile = volatileFlagStr.length() > 0;
-
-			Integer funcIxKey = Integer.valueOf(funcIx);
-			if(!_groupFunctionIndexes.add(funcIxKey)) {
-				throw new RuntimeException("Duplicate function index (" + funcIx + ")");
-			}
-			if(!_groupFunctionNames.add(funcName)) {
-				throw new RuntimeException("Duplicate function name '" + funcName + "'");
-			}
-
-			checkRedefinedFunction(hasFootnote, funcName, funcIxKey);
-			FunctionData fd = new FunctionData(funcIx, hasFootnote, funcName,
-					minParams, maxParams, returnClass, paramClasses, isVolatile);
-
-			_allFunctionsByIndex.put(funcIxKey, fd);
-			_allFunctionsByName.put(funcName, fd);
-		}
-
-		/**
-		 * Some extra validation here.
-		 * Any function which changes definition will have a footnote in the source document
-		 */
-		private void checkRedefinedFunction(boolean hasNote, String funcName, Integer funcIxKey) {
-			FunctionData fdPrev;
-			// check by index
-			fdPrev = _allFunctionsByIndex.get(funcIxKey);
-			if(fdPrev != null) {
-				if(!fdPrev.hasFootnote() || !hasNote) {
-					throw new RuntimeException("changing function ["
-							+ funcIxKey + "] definition without foot-note");
-				}
-				_allFunctionsByName.remove(fdPrev.getName());
-			}
-			// check by name
-			fdPrev = _allFunctionsByName.get(funcName);
-			if(fdPrev != null) {
-				if(!fdPrev.hasFootnote() || !hasNote) {
-					throw new RuntimeException("changing function '"
-							+ funcName + "' definition without foot-note");
-				}
-				_allFunctionsByIndex.remove(Integer.valueOf(fdPrev.getIndex()));
-			}
-		}
-
-		public void endTableGroup(String headingText) {
-			Integer[] keys = new Integer[_groupFunctionIndexes.size()];
-			_groupFunctionIndexes.toArray(keys);
-			_groupFunctionIndexes.clear();
-			_groupFunctionNames.clear();
-			Arrays.sort(keys);
-
-			_ps.println("# " + headingText);
-			for (Integer key : keys) {
-				FunctionData fd = _allFunctionsByIndex.get(key);
-				_ps.println(fd.formatAsDataLine());
-			}
-		}
-	}
-
-	/**
-	 * To avoid drag-in - parse XML using only JDK.
-	 */
-	private static class EFFDocHandler implements ContentHandler {
-		private static final String[] HEADING_PATH_NAMES = {
-			"office:document-content", "office:body", "office:text", "text:h",
-		};
-		private static final String[] TABLE_BASE_PATH_NAMES = {
-			"office:document-content", "office:body", "office:text", "table:table",
-		};
-		private static final String[] TABLE_ROW_RELPATH_NAMES = {
-			"table:table-row",
-		};
-		private static final String[] TABLE_CELL_RELPATH_NAMES = {
-			"table:table-row", "table:table-cell", "text:p",
-		};
-		// after May 2008 there was one more style applied to the footnotes
-		private static final String[] NOTE_REF_RELPATH_NAMES_OLD = {
-			"table:table-row", "table:table-cell", "text:p", "text:span", "text:note-ref",
-		};
-		private static final String[] NOTE_REF_RELPATH_NAMES = {
-			"table:table-row", "table:table-cell", "text:p", "text:span", "text:span", "text:note-ref",
-		};
-
-
-		private final Stack<String> _elemNameStack;
-		/** <code>true</code> only when parsing the target tables */
-		private boolean _isInsideTable;
-
-		private final List<String> _rowData;
-		private final StringBuffer _textNodeBuffer;
-		private final List<Boolean> _rowNoteFlags;
-		private boolean _cellHasNote;
-
-		private final FunctionDataCollector _fdc;
-		private String _lastHeadingText;
-
-		public EFFDocHandler(FunctionDataCollector fdc) {
-			_fdc = fdc;
-			_elemNameStack = new Stack<String>();
-			_isInsideTable = false;
-			_rowData = new ArrayList<String>();
-			_textNodeBuffer = new StringBuffer();
-			_rowNoteFlags = new ArrayList<Boolean>();
-		}
-
-		private boolean matchesTargetPath() {
-			return matchesPath(0, TABLE_BASE_PATH_NAMES);
-		}
-
-		private boolean matchesRelPath(String[] pathNames) {
-			return matchesPath(TABLE_BASE_PATH_NAMES.length, pathNames);
-		}
-
-		private boolean matchesPath(int baseStackIndex, String[] pathNames) {
-			if(_elemNameStack.size() != baseStackIndex + pathNames.length) {
-				return false;
-			}
-			for (int i = 0; i < pathNames.length; i++) {
-				if(!_elemNameStack.get(baseStackIndex + i).equals(pathNames[i])) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		@Override
-        public void characters(char[] ch, int start, int length) {
-			// only 2 text nodes where text is collected:
-			if(matchesRelPath(TABLE_CELL_RELPATH_NAMES) || matchesPath(0, HEADING_PATH_NAMES)) {
-				_textNodeBuffer.append(ch, start, length);
-			}
-		}
-
-		@Override
-        public void endElement(String namespaceURI, String localName, String name) {
-			String expectedName = _elemNameStack.peek();
-			if(expectedName != name) {
-				throw new RuntimeException("close tag mismatch");
-			}
-			if(matchesPath(0, HEADING_PATH_NAMES)) {
-				_lastHeadingText = _textNodeBuffer.toString().trim();
-				_textNodeBuffer.setLength(0);
-			}
-			if(_isInsideTable) {
-				if(matchesTargetPath()) {
-					_fdc.endTableGroup(_lastHeadingText);
-					_isInsideTable = false;
-				} else if(matchesRelPath(TABLE_ROW_RELPATH_NAMES)) {
-					String[] cellData = new String[_rowData.size()];
-					_rowData.toArray(cellData);
-					_rowData.clear();
-					Boolean[] noteFlags = new Boolean[_rowNoteFlags.size()];
-					_rowNoteFlags.toArray(noteFlags);
-					_rowNoteFlags.clear();
-					processTableRow(cellData, noteFlags);
-				} else if(matchesRelPath(TABLE_CELL_RELPATH_NAMES)) {
-					_rowData.add(_textNodeBuffer.toString().trim());
-					_rowNoteFlags.add(Boolean.valueOf(_cellHasNote));
-					_textNodeBuffer.setLength(0);
-				}
-			}
-			_elemNameStack.pop();
-		}
-
-		private void processTableRow(String[] cellData, Boolean[] noteFlags) {
-			// each table row of the document contains data for two functions
-			if(cellData.length != 15) {
-				throw new RuntimeException("Bad table row size");
-			}
-			processFunction(cellData, noteFlags, 0);
-			processFunction(cellData, noteFlags, 8);
-		}
-		
-		public void processFunction(String[] cellData, Boolean[] noteFlags, int i) {
-			String funcIxStr = cellData[i + 0];
-			if (funcIxStr.length() < 1) {
-				// empty (happens on the right hand side when there is an odd number of functions)
-				return;
-			}
-			int funcIx = parseInt(funcIxStr);
-
-			boolean hasFootnote = noteFlags[i + 1].booleanValue();
-			String funcName = cellData[i + 1];
-			int minParams = parseInt(cellData[i + 2]);
-			int maxParams = parseInt(cellData[i + 3]);
-
-			String returnClass = cellData[i + 4];
-			String paramClasses = cellData[i + 5];
-			String volatileFlagStr = cellData[i + 6];
-
-			_fdc.addFuntion(funcIx, hasFootnote, funcName, minParams, maxParams, returnClass, paramClasses, volatileFlagStr);
-		}
-
-		private static int parseInt(String valStr) {
-			try {
-				return Integer.parseInt(valStr);
-			} catch (NumberFormatException e) {
-				throw new RuntimeException("Value '" + valStr + "' could not be parsed as an integer");
-			}
-		}
-
-		@Override
-        public void startElement(String namespaceURI, String localName, String name, Attributes atts) {
-			_elemNameStack.add(name);
-			if(matchesTargetPath()) {
-				String tableName = atts.getValue("table:name");
-				if(tableName.startsWith("tab_fml_func") && !tableName.equals("tab_fml_func0")) {
-					_isInsideTable = true;
-				}
-				return;
-			}
-			if(matchesPath(0, HEADING_PATH_NAMES)) {
-				_textNodeBuffer.setLength(0);
-			} else if(matchesRelPath(TABLE_ROW_RELPATH_NAMES)) {
-				_rowData.clear();
-				_rowNoteFlags.clear();
-			} else if(matchesRelPath(TABLE_CELL_RELPATH_NAMES)) {
-				_textNodeBuffer.setLength(0);
-				_cellHasNote = false;
-			} else if(matchesRelPath(NOTE_REF_RELPATH_NAMES_OLD)) {
-				_cellHasNote = true;
-			} else if(matchesRelPath(NOTE_REF_RELPATH_NAMES)) {
-				_cellHasNote = true;
-			}
-		}
-
-		@Override
-        public void endDocument() {
-			// do nothing
-		}
-		@Override
-        public void endPrefixMapping(String prefix) {
-			// do nothing
-		}
-        @Override
-		public void ignorableWhitespace(char[] ch, int start, int length) {
-			// do nothing
-		}
-        @Override
-		public void processingInstruction(String target, String data) {
-			// do nothing
-		}
-        @Override
-		public void setDocumentLocator(Locator locator) {
-			// do nothing
-		}
-        @Override
-		public void skippedEntity(String name) {
-			// do nothing
-		}
-        @Override
-		public void startDocument() {
-			// do nothing
-		}
-        @Override
-		public void startPrefixMapping(String prefix, String uri) {
-			// do nothing
-		}
-	}
-
-	private static void extractFunctionData(FunctionDataCollector fdc, InputStream is) {
-		XMLReader xr;
-
-		try {
-			// First up, try the default one
-			xr = XMLReaderFactory.createXMLReader();
-		} catch (SAXException e) {
-			// Try one for java 1.4
-			System.setProperty("org.xml.sax.driver", "org.apache.crimson.parser.XMLReaderImpl");
-			try {
-				xr = XMLReaderFactory.createXMLReader();
-			} catch (SAXException e2) {
-				throw new RuntimeException(e2);
-			}
-		}
-		xr.setContentHandler(new EFFDocHandler(fdc));
-
-		InputSource inSrc = new InputSource(is);
-
-		try {
-			xr.parse(inSrc);
-			is.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} catch (SAXException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	/**
-	 * To be sure that no tricky unicode chars make it through to the output file.
-	 */
-	private static final class SimpleAsciiOutputStream extends OutputStream {
-
-		private final OutputStream _os;
-
-		public SimpleAsciiOutputStream(OutputStream os) {
-			_os = os;
-		}
-		
-		@Override
-        public void write(int b) throws IOException {
-			checkByte(b);
-			_os.write(b);
-		}
-
-		private static void checkByte(int b) {
-			if (!isSimpleAscii((char)b)) {
-				throw new RuntimeException("Encountered char (" + b + ") which was not simple ascii as expected");
-			}
-		}
-
-		@Override
-        public void write(byte[] b, int off, int len) throws IOException {
-			for (int i = 0; i < len; i++) {
-				checkByte(b[i + off]);
-
-			}
-			_os.write(b, off, len);
-		}
-	}
-
-	private static void processFile(File effDocFile, File outFile) {
-		if(!effDocFile.exists()) {
-			throw new RuntimeException("file '" + effDocFile.getAbsolutePath() + "' does not exist");
-		}
-		OutputStream os;
-		try {
-			os = new FileOutputStream(outFile);
-		} catch (FileNotFoundException e) {
-			throw new RuntimeException(e);
-		}
-		os = new SimpleAsciiOutputStream(os);
-		PrintStream ps;
-		try {
-			ps = new PrintStream(os, true, "UTF-8");
-		} catch(UnsupportedEncodingException e) {
-			throw new RuntimeException(e);
-		}
-
-		outputLicenseHeader(ps);
-		Class<?> genClass = ExcelFileFormatDocFunctionExtractor.class;
-		ps.println("# Created by (" + genClass.getName() + ")");
-		// identify the source file
-		ps.print("# from source file '" + SOURCE_DOC_FILE_NAME + "'");
-		ps.println(" (size=" + effDocFile.length() + ", md5=" + getFileMD5(effDocFile) + ")");
-		ps.println("#");
-		ps.println("#Columns: (index, name, minParams, maxParams, returnClass, paramClasses, isVolatile, hasFootnote )");
-		ps.println("");
-		try {
-		    // can't use ZipHelper here, because its in a different module
-			ZipFile zf = new ZipFile(effDocFile);
-			InputStream is = zf.getInputStream(zf.getEntry("content.xml"));
-			extractFunctionData(new FunctionDataCollector(ps), is);
-			zf.close();
-		} catch (ZipException e) {
-			throw new RuntimeException(e);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		ps.close();
-
-		String canonicalOutputFileName;
-		try {
-			canonicalOutputFileName = outFile.getCanonicalPath();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		System.out.println("Successfully output to '" + canonicalOutputFileName + "'");
-	}
-
-	private static void outputLicenseHeader(PrintStream ps) {
-		String[] lines= {
-			"Licensed to the Apache Software Foundation (ASF) under one or more",
-			"contributor license agreements.  See the NOTICE file distributed with",
-			"this work for additional information regarding copyright ownership.",
-			"The ASF licenses this file to You under the Apache License, Version 2.0",
-			"(the \"License\"); you may not use this file except in compliance with",
-			"the License.  You may obtain a copy of the License at",
-			"",
-			"    http://www.apache.org/licenses/LICENSE-2.0",
-			"",
-			"Unless required by applicable law or agreed to in writing, software",
-			"distributed under the License is distributed on an \"AS IS\" BASIS,",
-			"WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
-			"See the License for the specific language governing permissions and",
-			"limitations under the License.",
-		};
-		for (String line : lines) {
-			ps.print("# ");
-			ps.println(line);
-		}
-		ps.println();
-	}
-
-	/**
-	 * Helps identify the source file
-	 */
-	private static String getFileMD5(File f) {
-	    MessageDigest m = CryptoFunctions.getMessageDigest(HashAlgorithm.md5);
-
-		byte[]buf = new byte[2048];
-		try {
-			InputStream is = new FileInputStream(f);
-			while(true) {
-				int bytesRead = is.read(buf);
-				if(bytesRead<1) {
-					break;
-				}
-				m.update(buf, 0, bytesRead);
-			}
-			is.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-
-		return "0x" + new BigInteger(1, m.digest()).toString(16);
-	}
-
-	private static File downloadSourceFile() {
-		URL url;
-		try {
-			url = new URL("http://sc.openoffice.org/" + SOURCE_DOC_FILE_NAME);
-		} catch (MalformedURLException e) {
-			throw new RuntimeException(e);
-		}
-
-		File result;
-		byte[]buf = new byte[2048];
-		try {
-			URLConnection conn = url.openConnection();
-			InputStream is = conn.getInputStream();
-			System.out.println("downloading " + url.toExternalForm());
-			result = TempFile.createTempFile("excelfileformat", ".odt");
-			OutputStream os = new FileOutputStream(result);
-			while(true) {
-				int bytesRead = is.read(buf);
-				if(bytesRead<1) {
-					break;
-				}
-				os.write(buf, 0, bytesRead);
-			}
-			is.close();
-			os.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		System.out.println("file downloaded ok");
-		return result;
-	}
-
-	public static void main(String[] args) {
-
-		File outFile = new File("functionMetadata-asGenerated.txt");
-
-//		if (false) { // set true to use local file
-//			File dir = new File("c:/temp");
-//			File effDocFile = new File(dir, SOURCE_DOC_FILE_NAME);
-//			processFile(effDocFile, outFile);
-//			return;
-//		}
-
-		File tempEFFDocFile = downloadSourceFile();
-		processFile(tempEFFDocFile, outFile);
-		tempEFFDocFile.delete();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java b/trunk/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
deleted file mode 100644
index b050401..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import junit.framework.TestCase;
-
-/**
- * 
- * @author Josh Micich
- */
-public final class TestFunctionMetadataRegistry extends TestCase {
-
-	public void testWellKnownFunctions() {
-		confirmFunction(0, "COUNT");
-		confirmFunction(1, "IF");
-
-	}
-
-	private static void confirmFunction(int index, String funcName) {
-		FunctionMetadata fm;
-		fm = FunctionMetadataRegistry.getFunctionByIndex(index);
-		assertNotNull(fm);
-		assertEquals(funcName, fm.getName());
-
-		fm = FunctionMetadataRegistry.getFunctionByName(funcName);
-		assertNotNull(fm);
-		assertEquals(index, fm.getIndex());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java b/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
deleted file mode 100644
index 38afaaa..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-/**
- * Tests parsing of some built-in functions that were not properly
- * registered in POI as of bug #44675, #44733 (March/April 2008).
- */
-public final class TestParseMissingBuiltInFuncs {
-
-	private static Ptg[] parse(String formula) throws IOException {
-		HSSFWorkbook book = new HSSFWorkbook();
-		Ptg[] ptgs = HSSFFormulaParser.parse(formula, book);
-		book.close();
-		return ptgs;
-	}
-	
-	private static void confirmFunc(String formula, int expPtgArraySize, boolean isVarArgFunc, int funcIx)
-	throws IOException {
-		Ptg[] ptgs = parse(formula);
-		Ptg ptgF = ptgs[ptgs.length-1];  // func is last RPN token in all these formulas
-		
-		// Check critical things in the Ptg array encoding.
-		if(!(ptgF instanceof AbstractFunctionPtg)) {
-		    throw new RuntimeException("function token missing");
-		}
-		AbstractFunctionPtg func = (AbstractFunctionPtg) ptgF;
-		if(func.getFunctionIndex() == 255) {
-			throw new AssertionFailedError("Failed to recognise built-in function in formula '" 
-					+ formula + "'");
-		}
-		assertEquals(expPtgArraySize, ptgs.length);
-		assertEquals(funcIx, func.getFunctionIndex());
-		Class<? extends AbstractFunctionPtg> expCls = isVarArgFunc ? FuncVarPtg.class : FuncPtg.class;
-		assertEquals(expCls, ptgF.getClass());
-		
-		// check that parsed Ptg array converts back to formula text OK
-		HSSFWorkbook book = new HSSFWorkbook();
-		String reRenderedFormula = HSSFFormulaParser.toFormulaString(book, ptgs);
-		assertEquals(formula, reRenderedFormula);
-		book.close();
-	}
-	
-	@Test
-	public void testDatedif() throws IOException {
-		int expSize = 4;   // NB would be 5 if POI added tAttrVolatile properly
-		confirmFunc("DATEDIF(NOW(),NOW(),\"d\")", expSize, false, 351);
-	}
-
-	@Test
-	public void testDdb() throws IOException {
-		confirmFunc("DDB(1,1,1,1,1)", 6, true, 144);
-	}
-	
-	@Test
-	public void testAtan() throws IOException {
-		confirmFunc("ATAN(1)", 2, false, 18);
-	}
-	
-	@Test
-	public void testUsdollar() throws IOException {
-		confirmFunc("USDOLLAR(1)", 2, true, 204);
-	}
-
-	@Test
-	public void testDBCS() throws IOException {
-		confirmFunc("DBCS(\"abc\")", 2, false, 215);
-	}
-	
-	@Test
-	public void testIsnontext() throws IOException {
-		confirmFunc("ISNONTEXT(\"abc\")", 2, false, 190);
-	}
-	
-	@Test
-	public void testDproduct() throws IOException {
-		confirmFunc("DPRODUCT(C1:E5,\"HarvestYield\",G1:H2)", 4, false, 189);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java b/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
deleted file mode 100644
index d286537..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.function;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests reading from a sample spreadsheet some built-in functions that were not properly
- * registered in POI as of bug #44675, #44733 (March/April 2008).
- */
-public final class TestReadMissingBuiltInFuncs {
-
-	/**
-	 * This spreadsheet has examples of calls to the interesting built-in functions in cells A1:A7
-	 */
-	private static final String SAMPLE_SPREADSHEET_FILE_NAME = "missingFuncs44675.xls";
-
-	private static HSSFWorkbook wb;
-	private static HSSFSheet _sheet;
-
-	@BeforeClass
-	public static void initSheet() {
-        wb = HSSFTestDataSamples.openSampleWorkbook(SAMPLE_SPREADSHEET_FILE_NAME);
-        try {
-            _sheet = wb.getSheetAt(0);
-	    } catch (RecordFormatException e) {
-            if(e.getCause() instanceof InvocationTargetException) {
-                InvocationTargetException ite = (InvocationTargetException) e.getCause();
-                if(ite.getTargetException() instanceof RuntimeException) {
-                    RuntimeException re = (RuntimeException) ite.getTargetException();
-                    if(re.getMessage().equals("Invalid built-in function index (189)")) {
-                        fail("DPRODUCT() registered with wrong index");
-                    }
-                }
-            }
-            // some other unexpected error
-            throw e;
-        }
-	}
-
-	@AfterClass
-	public static void closeResources() throws Exception {
-	    wb.close();
-	}
-
-	@Test
-	public void testDatedif() {
-		String formula;
-		try {
-			formula = getCellFormula(0);
-		} catch (IllegalStateException e) {
-		    if(e.getMessage().startsWith("Too few arguments")) {
-				if(e.getMessage().indexOf("AttrPtg") > 0) {
-					fail("tAttrVolatile not supported in FormulaParser.toFormulaString");
-				}
-				fail("NOW() registered with 1 arg instead of 0");
-			}
-			if(e.getMessage().startsWith("too much stuff")) {
-				fail("DATEDIF() not registered");
-			}
-			// some other unexpected error
-			throw e;
-		}
-		assertEquals("DATEDIF(NOW(),NOW(),\"d\")", formula);
-	}
-	
-	@Test
-	public void testDdb() {
-		String formula = getCellFormula(1);
-		if("externalflag(1,1,1,1,1)".equals(formula)) {
-			fail("DDB() not registered");
-		}
-		assertEquals("DDB(1,1,1,1,1)", formula);
-	}
-	
-	@Test
-	public void testAtan() {
-		String formula = getCellFormula(2);
-		if("ARCTAN(1)".equals(formula)) {
-			fail("func ix 18 registered as ARCTAN() instead of ATAN()");
-		}
-		assertEquals("ATAN(1)", formula);
-	}
-
-	@Test
-	public void testUsdollar() {
-		String formula = getCellFormula(3);
-		if("YEN(1)".equals(formula)) {
-			fail("func ix 204 registered as YEN() instead of USDOLLAR()");
-		}
-		assertEquals("USDOLLAR(1)", formula);
-	}
-
-	@Test
-	public void testDBCS() {
-		String formula = "";
-		try {
-			formula = getCellFormula(4);
-		} catch (IllegalStateException e) {
-			if(e.getMessage().startsWith("too much stuff")) {
-				fail("DBCS() not registered");
-			}
-			// some other unexpected error
-			throw e;
-		} catch (NegativeArraySizeException e) {
-			fail("found err- DBCS() registered with -1 args");
-		}
-		if("JIS(\"abc\")".equals(formula)) {
-			fail("func ix 215 registered as JIS() instead of DBCS()");
-		}
-		assertEquals("DBCS(\"abc\")", formula);
-	}
-	
-	@Test
-	public void testIsnontext() {
-		String formula;
-		try {
-			formula = getCellFormula(5);
-		} catch (IllegalStateException e) {
-			if(e.getMessage().startsWith("too much stuff")) {
-				fail("ISNONTEXT() registered with wrong index");
-			}
-			// some other unexpected error
-			throw e;
-		}
-		assertEquals("ISNONTEXT(\"abc\")", formula);
-	}
-	
-	@Test
-	public void testDproduct() {
-		String formula = getCellFormula(6);
-		assertEquals("DPRODUCT(C1:E5,\"HarvestYield\",G1:H2)", formula);
-	}
-
-	private String getCellFormula(int rowIx) {
-		String result = _sheet.getRow(rowIx).getCell(0).getCellFormula();
-//		if (false) {
-//			System.err.println(result);
-//		}
-		return result;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java
deleted file mode 100644
index cc8b5c5..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * Created on May 29, 2005
- *
- */
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- */
-public abstract class AbstractNumericTestCase extends TestCase {
-
-    public static final double POS_ZERO = 1E-4;
-    public static final double DIFF_TOLERANCE_FACTOR = 1E-8;
-
-    @Override
-    public void setUp() {
-    }
-
-    @Override
-    public void tearDown() {
-    }
-
-    /**
-     * Why doesnt JUnit have a method like this for doubles? 
-     * The current impl (3.8.1) of Junit has a retar*** method
-     * for comparing doubles. DO NOT use that.
-     * TODO: This class should really be in an abstract super class
-     * to avoid code duplication across this project.
-     * @param message
-     * @param baseval
-     * @param checkval
-     */
-    public static void assertEquals(String message, double baseval, double checkval, double almostZero, double diffToleranceFactor) {
-        double posZero = Math.abs(almostZero);
-        double negZero = -1 * posZero;
-        if (Double.isNaN(baseval)) {
-            assertTrue(message+": Expected " + baseval + " but was " + checkval
-                    , Double.isNaN(baseval));
-        }
-        else if (Double.isInfinite(baseval)) {
-            assertTrue(message+": Expected " + baseval + " but was " + checkval
-                    , Double.isInfinite(baseval) && ((baseval<0) == (checkval<0)));
-        }
-        else {
-            assertTrue(message+": Expected " + baseval + " but was " + checkval
-                ,baseval != 0
-                    ? Math.abs(baseval - checkval) <= Math.abs(diffToleranceFactor * baseval)
-                    : checkval < posZero && checkval > negZero);
-        }
-    }
-
-    public static void assertEquals(String msg, double baseval, double checkval) {
-        assertEquals(msg, baseval, checkval, POS_ZERO, DIFF_TOLERANCE_FACTOR);
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java
deleted file mode 100644
index 272c51a..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Direct tests for all implementors of <code>Function</code>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestAverage.class,
-    TestCountFuncs.class,
-    TestDate.class,
-    TestDays360.class,
-    TestFinanceLib.class,
-    TestFind.class,
-    TestIndex.class,
-    TestIndexFunctionFromSpreadsheet.class,
-    TestIndirect.class,
-    TestIsBlank.class,
-    TestLen.class,
-    TestLookupFunctionsFromSpreadsheet.class,
-    TestMatch.class,
-    TestMathX.class,
-    TestMid.class,
-    TestNper.class,
-    TestOffset.class,
-    TestPmt.class,
-    TestRoundFuncs.class,
-    TestRowCol.class,
-    TestStatsLib.class,
-    TestSubtotal.class,
-    TestSumif.class,
-    TestSumproduct.class,
-    TestText.class,
-    TestTFunc.class,
-    TestTime.class,
-    TestTrim.class,
-    TestTrunc.class,
-    TestValue.class,
-    TestXYNumericFunction.class,
-    TestAddress.class,
-    TestClean.class
-})
-public class AllIndividualFunctionEvaluationTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllSpreadsheetBasedTests.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllSpreadsheetBasedTests.java
deleted file mode 100644
index e2d0095..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllSpreadsheetBasedTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Direct tests for all implementors of <code>Function</code>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestCodeFunctionsFromSpreadsheet.class,
-    TestComplexFunctionsFromSpreadsheet.class,
-    TestDeltaFunctionsFromSpreadsheet.class,
-    TestDGetFunctionsFromSpreadsheet.class,
-    TestDStarFunctionsFromSpreadsheet.class,
-    TestFactDoubleFunctionsFromSpreadsheet.class,
-    TestFixedFunctionsFromSpreadsheet.class,
-    TestImaginaryFunctionsFromSpreadsheet.class,
-    TestImRealFunctionsFromSpreadsheet.class,
-    TestIndexFunctionFromSpreadsheet.class,
-    TestIndirectFunctionFromSpreadsheet.class,
-    TestLookupFunctionsFromSpreadsheet.class,
-    TestMatchFunctionsFromSpreadsheet.class,
-    TestQuotientFunctionsFromSpreadsheet.class,
-    TestReptFunctionsFromSpreadsheet.class,
-    TestRomanFunctionsFromSpreadsheet.class,
-    TestWeekNumFunctionsFromSpreadsheet.class,
-    TestWeekNumFunctionsFromSpreadsheet2013.class
-})
-public class AllSpreadsheetBasedTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
deleted file mode 100644
index e32f3e0..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-
-@RunWith(Parameterized.class)
-public abstract class BaseTestFunctionsFromSpreadsheet {
-
-    /**
-     * This class defines constants for navigating around the test data spreadsheet used for these tests.
-     */
-    interface SS {
-        /** Name of the test spreadsheet (found in the standard test data folder) */
-
-        /** Name of the first sheet in the spreadsheet (contains comments) */
-        String README_SHEET_NAME = "Read Me";
-
-        /** Row (zero-based) in each sheet where the evaluation cases start.   */
-        int START_TEST_CASES_ROW_INDEX = 4; // Row '5'
-        /**  Index of the column that contains the function names */
-        int COLUMN_INDEX_MARKER = 0; // Column 'A'
-        int COLUMN_INDEX_EVALUATION = 1; // Column 'B'
-        int COLUMN_INDEX_EXPECTED_RESULT = 2; // Column 'C'
-        int COLUMN_ROW_COMMENT = 3; // Column 'D'
-
-        /** Used to indicate when there are no more test cases on the current sheet   */
-        String TEST_CASES_END_MARKER = "<end>";
-        /** Used to indicate that the test on the current row should be ignored */
-        String SKIP_CURRENT_TEST_CASE_MARKER = "<skip>";
-
-    }
-
-    @Parameter(value = 0)
-    public String testName;
-    @Parameter(value = 1)
-    public String filename;
-    @Parameter(value = 2)
-    public HSSFSheet sheet;
-    @Parameter(value = 3)
-    public int formulasRowIdx;
-    @Parameter(value = 4)
-    public HSSFFormulaEvaluator evaluator;
-
-
-    
-    protected static Collection<Object[]> data(Class<? extends BaseTestFunctionsFromSpreadsheet> clazz, String filename) throws Exception {
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook(filename);
-        confirmReadMeSheet(workbook, clazz);
-
-        List<Object[]> data = new ArrayList<Object[]>();
-
-        int nSheets = workbook.getNumberOfSheets();
-        for(int sheetIdx=1; sheetIdx< nSheets; sheetIdx++) {
-            HSSFSheet sheet = workbook.getSheetAt(sheetIdx);
-            processFunctionGroup(data, sheet, SS.START_TEST_CASES_ROW_INDEX, null, filename);
-        }
-        
-        workbook.close();
-        
-        return data;
-    }
-
-    private static void processFunctionGroup(List<Object[]> data, HSSFSheet sheet, final int startRowIndex, String testFocusFunctionName, String filename) {
-        HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(sheet.getWorkbook());
-
-        String currentGroupComment = "";
-        final int maxRows = sheet.getLastRowNum()+1;
-        for(int rowIndex=startRowIndex; rowIndex<maxRows; rowIndex++) {
-            HSSFRow r = sheet.getRow(rowIndex);
-            if(r == null) {
-                continue;
-            }
-            String newMarkerValue = getCellTextValue(r, SS.COLUMN_INDEX_MARKER, "marker");                    
-            if(SS.TEST_CASES_END_MARKER.equalsIgnoreCase(newMarkerValue)) {
-                // normal exit point
-                return;
-            }
-            if(SS.SKIP_CURRENT_TEST_CASE_MARKER.equalsIgnoreCase(newMarkerValue)) {
-                // currently disabled test case row
-                continue;
-            }
-            if(newMarkerValue != null) {
-                currentGroupComment = newMarkerValue;
-            }
-            HSSFCell evalCell = r.getCell(SS.COLUMN_INDEX_EVALUATION);
-            if (evalCell == null || evalCell.getCellTypeEnum() != CellType.FORMULA) {
-                continue;
-            }
-            String rowComment = getCellTextValue(r, SS.COLUMN_ROW_COMMENT, "row comment");
-
-            String testName = (currentGroupComment+'\n'+rowComment).replace("null", "").trim().replace("\n", " - ");
-            if ("".equals(testName)) {
-                testName = evalCell.getCellFormula();
-            }
-            
-            data.add(new Object[]{testName, filename, sheet, rowIndex, evaluator});
-        }
-        fail("Missing end marker '" + SS.TEST_CASES_END_MARKER + "' on sheet '" + sheet.getSheetName() + "'");
-    }
-
-    @Test
-    public void processFunctionRow() throws Exception {
-        HSSFRow r = sheet.getRow(formulasRowIdx);
-        HSSFCell evalCell = r.getCell(SS.COLUMN_INDEX_EVALUATION);
-        HSSFCell expectedCell = r.getCell(SS.COLUMN_INDEX_EXPECTED_RESULT);
-        
-        CellReference cr = new CellReference(sheet.getSheetName(), formulasRowIdx, evalCell.getColumnIndex(), false, false);
-        String msg = String.format(Locale.ROOT, "In %s %s {=%s} '%s'"
-            , filename, cr.formatAsString(), evalCell.getCellFormula(), testName);
-
-        CellValue actualValue = evaluator.evaluate(evalCell);
-
-        assertNotNull(msg + " - Bad setup data expected value is null", expectedCell);
-        assertNotNull(msg + " - actual value was null", actualValue);
-
-        if (expectedCell.getCellTypeEnum() == CellType.ERROR) {
-            int expectedErrorCode = expectedCell.getErrorCellValue();
-            assertEquals(msg, CellType.ERROR, actualValue.getCellTypeEnum());
-            assertEquals(msg, ErrorEval.getText(expectedErrorCode), actualValue.formatAsString());
-            assertEquals(msg, expectedErrorCode, actualValue.getErrorValue());
-            assertEquals(msg, ErrorEval.getText(expectedErrorCode), ErrorEval.getText(actualValue.getErrorValue()));
-            return;
-        }
-
-        // unexpected error
-        assertNotEquals(msg, CellType.ERROR, actualValue.getCellTypeEnum());
-        assertNotEquals(msg, formatValue(expectedCell), ErrorEval.getText(actualValue.getErrorValue()));
-
-        // wrong type error
-        assertEquals(msg, expectedCell.getCellTypeEnum(), actualValue.getCellTypeEnum());
-
-        final CellType expectedCellType = expectedCell.getCellTypeEnum();
-        switch (expectedCellType) {
-            case BOOLEAN:
-                assertEquals(msg, expectedCell.getBooleanCellValue(), actualValue.getBooleanValue());
-                break;
-            case FORMULA: // will never be used, since we will call method after formula evaluation
-                fail("Cannot expect formula as result of formula evaluation: " + msg);
-            case NUMERIC:
-                assertEquals(expectedCell.getNumericCellValue(), actualValue.getNumberValue(), 0.0);
-                break;
-            case STRING:
-                assertEquals(msg, expectedCell.getRichStringCellValue().getString(), actualValue.getStringValue());
-                break;
-            default:
-                fail("Unexpected cell type: " + expectedCellType);
-        }
-    }
-
-    /**
-     * Asserts that the 'read me' comment page exists, and has this class' name in one of the
-     * cells.  This back-link is to make it easy to find this class if a reader encounters the
-     * spreadsheet first.
-     */
-    private static void confirmReadMeSheet(HSSFWorkbook workbook, Class<? extends BaseTestFunctionsFromSpreadsheet> clazz) {
-        String firstSheetName = workbook.getSheetName(0);
-        assertTrue("First sheet's name was '" + firstSheetName + "' but expected '" + SS.README_SHEET_NAME + "'",
-            firstSheetName.equalsIgnoreCase(SS.README_SHEET_NAME));
-        HSSFSheet sheet = workbook.getSheetAt(0);
-        String specifiedClassName = sheet.getRow(2).getCell(0).getRichStringCellValue().getString();
-        assertEquals("Test class name in spreadsheet comment", clazz.getName(), specifiedClassName);
-    }
-
-    /**
-     * @return <code>null</code> if cell is missing, empty or blank
-     */
-    private static String getCellTextValue(HSSFRow r, int colIndex, String columnName) {
-        if(r == null) {
-            return null;
-        }
-        HSSFCell cell = r.getCell(colIndex);
-        if(cell == null) {
-            return null;
-        }
-        if(cell.getCellTypeEnum() == CellType.BLANK) {
-            return null;
-        }
-        if(cell.getCellTypeEnum() == CellType.STRING) {
-            return cell.getRichStringCellValue().getString();
-        }
-
-        fail("Bad cell type for '" + columnName + "' column: ("
-                + cell.getCellTypeEnum() + ") row (" + (r.getRowNum() +1) + ")");
-        return "";
-    }
-
-    private static String formatValue(HSSFCell expecedCell) {
-        switch (expecedCell.getCellTypeEnum()) {
-            case BLANK: return "<blank>";
-            case BOOLEAN: return Boolean.toString(expecedCell.getBooleanCellValue());
-            case NUMERIC: return Double.toString(expecedCell.getNumericCellValue());
-            case STRING: return expecedCell.getRichStringCellValue().getString();
-            default: fail("Unexpected cell type of expected value (" + expecedCell.getCellTypeEnum() + ")");
-        }
-        return "";
-    }
-
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java
deleted file mode 100644
index 5dfc15a..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-
-import junit.framework.TestCase;
-
-public class CountifsTests extends TestCase {
-
-    public void testCallFunction() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        Sheet sheet = workbook.createSheet("test");
-        Row row1 = sheet.createRow(0);
-        Cell cellA1 = row1.createCell(0, CellType.FORMULA);
-        Cell cellB1 = row1.createCell(1, CellType.NUMERIC);
-        Cell cellC1 = row1.createCell(2, CellType.NUMERIC);
-        Cell cellD1 = row1.createCell(3, CellType.NUMERIC);
-        Cell cellE1 = row1.createCell(4, CellType.NUMERIC);
-        cellB1.setCellValue(1);
-        cellC1.setCellValue(1);
-        cellD1.setCellValue(2);
-        cellE1.setCellValue(4);
-
-        cellA1.setCellFormula("COUNTIFS(B1:C1,1, D1:E1,2)");
-        FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-        CellValue evaluate = evaluator.evaluate(cellA1);
-        assertEquals(1.0d, evaluate.getNumberValue());
-    }
-
-    public void testCallFunction_invalidArgs() {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        Sheet sheet = workbook.createSheet("test");
-        Row row1 = sheet.createRow(0);
-        Cell cellA1 = row1.createCell(0, CellType.FORMULA);
-        cellA1.setCellFormula("COUNTIFS()");
-        FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-        CellValue evaluate = evaluator.evaluate(cellA1);
-        assertEquals(15, evaluate.getErrorValue());
-        cellA1.setCellFormula("COUNTIFS(A1:C1)");
-        evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-        evaluate = evaluator.evaluate(cellA1);
-        assertEquals(15, evaluate.getErrorValue());
-        cellA1.setCellFormula("COUNTIFS(A1:C1,2,2)");
-        evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-        evaluate = evaluator.evaluate(cellA1);
-        assertEquals(15, evaluate.getErrorValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
deleted file mode 100644
index dfe8e53..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.AreaEvalBase;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.RefEvalBase;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-
-/**
- * Test helper class for creating mock <code>Eval</code> objects
- *
- * @author Josh Micich
- */
-public final class EvalFactory {
-
-	private EvalFactory() {
-		// no instances of this class
-	}
-
-	/**
-	 * Creates a dummy AreaEval
-	 * @param values empty (<code>null</code>) entries in this array will be converted to NumberEval.ZERO
-	 */
-	public static AreaEval createAreaEval(String areaRefStr, ValueEval[] values) {
-		AreaPtg areaPtg = new AreaPtg(areaRefStr);
-		return createAreaEval(areaPtg, values);
-	}
-
-	/**
-	 * Creates a dummy AreaEval
-	 * @param values empty (<code>null</code>) entries in this array will be converted to NumberEval.ZERO
-	 */
-	public static AreaEval createAreaEval(AreaPtg areaPtg, ValueEval[] values) {
-		int nCols = areaPtg.getLastColumn() - areaPtg.getFirstColumn() + 1;
-		int nRows = areaPtg.getLastRow() - areaPtg.getFirstRow() + 1;
-		int nExpected = nRows * nCols;
-		if (values.length != nExpected) {
-			throw new RuntimeException("Expected " + nExpected + " values but got " + values.length);
-		}
-		for (int i = 0; i < nExpected; i++) {
-			if (values[i] == null) {
-				values[i] = NumberEval.ZERO;
-			}
-		}
-		return new MockAreaEval(areaPtg, values);
-	}
-
-	/**
-	 * Creates a single RefEval (with value zero)
-	 */
-	public static RefEval createRefEval(String refStr) {
-		return createRefEval(refStr, NumberEval.ZERO);
-	}
-	public static RefEval createRefEval(String refStr, ValueEval value) {
-		return new MockRefEval(new RefPtg(refStr), value);
-	}
-
-	private static final class MockAreaEval extends AreaEvalBase {
-		private final ValueEval[] _values;
-		public MockAreaEval(AreaI areaPtg, ValueEval[] values) {
-			super(areaPtg);
-			_values = values;
-		}
-		private MockAreaEval(int firstRow, int firstColumn, int lastRow, int lastColumn, ValueEval[] values) {
-			super(firstRow, firstColumn, lastRow, lastColumn);
-			_values = values;
-		}
-		@Override
-        public ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex) {
-		    return getRelativeValue(-1, relativeRowIndex, relativeColumnIndex);
-		}
-        @Override
-        public ValueEval getRelativeValue(int sheetIndex, int relativeRowIndex, int relativeColumnIndex) {
-			if (relativeRowIndex < 0 || relativeRowIndex >=getHeight()) {
-				throw new IllegalArgumentException("row index out of range");
-			}
-			int width = getWidth();
-			if (relativeColumnIndex < 0 || relativeColumnIndex >=width) {
-				throw new IllegalArgumentException("column index out of range");
-			}
-			int oneDimensionalIndex = relativeRowIndex * width + relativeColumnIndex;
-			return _values[oneDimensionalIndex];
-		}
-		@Override
-        public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
-			if (relFirstRowIx < 0 || relFirstColIx < 0
-					|| relLastRowIx >= getHeight() || relLastColIx >= getWidth()) {
-				throw new RuntimeException("Operation not implemented on this mock object");
-			}
-
-			if (relFirstRowIx == 0 && relFirstColIx == 0
-					&& relLastRowIx == getHeight()-1 && relLastColIx == getWidth()-1) {
-				return this;
-			}
-			ValueEval[] values = transpose(_values, getWidth(), relFirstRowIx, relLastRowIx, relFirstColIx, relLastColIx);
-			return new MockAreaEval(getFirstRow() + relFirstRowIx, getFirstColumn() + relFirstColIx,
-					getFirstRow() + relLastRowIx, getFirstColumn() + relLastColIx, values);
-		}
-		private static ValueEval[] transpose(ValueEval[] srcValues, int srcWidth,
-				int relFirstRowIx, int relLastRowIx,
-				int relFirstColIx, int relLastColIx) {
-			int height = relLastRowIx - relFirstRowIx + 1;
-			int width = relLastColIx - relFirstColIx + 1;
-			ValueEval[] result = new ValueEval[height * width];
-			for (int r=0; r<height; r++) {
-				int srcRowIx = r + relFirstRowIx;
-				for (int c=0; c<width; c++) {
-					int srcColIx = c + relFirstColIx;
-					int destIx = r * width + c;
-					int srcIx = srcRowIx * srcWidth + srcColIx;
-					result[destIx] = srcValues[srcIx];
-				}
-			}
-			return result;
-		}
-		@Override
-        public TwoDEval getRow(int rowIndex) {
-			if (rowIndex >= getHeight()) {
-				throw new IllegalArgumentException("Invalid rowIndex " + rowIndex
-						+ ".  Allowable range is (0.." + getHeight() + ").");
-			}
-			ValueEval[] values = new ValueEval[getWidth()];
-			for (int i = 0; i < values.length; i++) {
-				values[i] = getRelativeValue(rowIndex, i);
-			}
-			return new MockAreaEval(rowIndex, getFirstColumn(), rowIndex, getLastColumn(), values);
-		}
-		@Override
-        public TwoDEval getColumn(int columnIndex) {
-			if (columnIndex >= getWidth()) {
-				throw new IllegalArgumentException("Invalid columnIndex " + columnIndex
-						+ ".  Allowable range is (0.." + getWidth() + ").");
-			}
-			ValueEval[] values = new ValueEval[getHeight()];
-			for (int i = 0; i < values.length; i++) {
-				values[i] = getRelativeValue(i, columnIndex);
-			}
-			return new MockAreaEval(getFirstRow(), columnIndex, getLastRow(), columnIndex, values);
-		}
-	}
-
-	private static final class MockRefEval extends RefEvalBase {
-		private final ValueEval _value;
-		public MockRefEval(RefPtg ptg, ValueEval value) {
-			super(-1, -1, ptg.getRow(), ptg.getColumn());
-			_value = value;
-		}
-		public MockRefEval(Ref3DPtg ptg, ValueEval value) {
-			super(-1, -1, ptg.getRow(), ptg.getColumn());
-			_value = value;
-		}
-		@Override
-        public ValueEval getInnerValueEval(int sheetIndex) {
-			return _value;
-		}
-		@Override
-        public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
-			throw new RuntimeException("Operation not implemented on this mock object");
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
deleted file mode 100644
index f51e8a2..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.AssertionFailedError;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
-
-/**
- * Test helper class for invoking functions with numeric results.
- *
- * @author Josh Micich
- */
-public final class NumericFunctionInvoker {
-
-	private NumericFunctionInvoker() {
-		// no instances of this class
-	}
-
-	private static final class NumericEvalEx extends Exception {
-		public NumericEvalEx(String msg) {
-			super(msg);
-		}
-	}
-
-	/**
-	 * Invokes the specified function with the arguments.
-	 * <p/>
-	 * Assumes that the cell coordinate parameters of
-	 *  <code>Function.evaluate(args, srcCellRow, srcCellCol)</code>
-	 * are not required.
-	 * <p/>
-	 * This method cannot be used for confirming error return codes.  Any non-numeric evaluation
-	 * result causes the current junit test to fail.
-	 */
-	public static double invoke(Function f, ValueEval[] args) {
-		return invoke(f, args, -1, -1);
-	}
-	/**
-	 * Invokes the specified operator with the arguments.
-	 * <p/>
-	 * This method cannot be used for confirming error return codes.  Any non-numeric evaluation
-	 * result causes the current junit test to fail.
-	 */
-	public static double invoke(Function f, ValueEval[] args, int srcCellRow, int srcCellCol) {
-		try {
-			return invokeInternal(f, args, srcCellRow, srcCellCol);
-		} catch (NumericEvalEx e) {
-			throw new AssertionFailedError("Evaluation of function (" + f.getClass().getName()
-					+ ") failed: " + e.getMessage());
-		}
-	}
-	/**
-	 * Formats nicer error messages for the junit output
-	 */
-	private static double invokeInternal(Function target, ValueEval[] args, int srcCellRow, int srcCellCol)
-				throws NumericEvalEx {
-		ValueEval evalResult;
-		try {
-			evalResult = target.evaluate(args, srcCellRow, (short)srcCellCol);
-		} catch (NotImplementedException e) {
-			throw new NumericEvalEx("Not implemented:" + e.getMessage());
-		}
-
-		if(evalResult == null) {
-			throw new NumericEvalEx("Result object was null");
-		}
-		if(evalResult instanceof ErrorEval) {
-			ErrorEval ee = (ErrorEval) evalResult;
-			throw new NumericEvalEx(formatErrorMessage(ee));
-		}
-		if(!(evalResult instanceof NumericValueEval)) {
-			throw new NumericEvalEx("Result object type (" + evalResult.getClass().getName()
-					+ ") is invalid.  Expected implementor of ("
-					+ NumericValueEval.class.getName() + ")");
-		}
-
-		NumericValueEval result = (NumericValueEval) evalResult;
-		return result.getNumberValue();
-	}
-	private static String formatErrorMessage(ErrorEval ee) {
-		if(errorCodesAreEqual(ee, ErrorEval.VALUE_INVALID)) {
-			return "Error code: #VALUE! (invalid value)";
-		}
-		return "Error code=" + ee.getErrorCode();
-	}
-	private static boolean errorCodesAreEqual(ErrorEval a, ErrorEval b) {
-		if(a==b) {
-			return true;
-		}
-		return a.getErrorCode() == b.getErrorCode();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/RefEvalImplementation.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
deleted file mode 100644
index 1a3fc1e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-final class RefEvalImplementation implements RefEval {
-
-    private final ValueEval value;
-
-    public RefEvalImplementation(ValueEval value) {
-        this.value = value;
-    }
-
-    @Override
-    public AreaEval offset(int relFirstRowIx, int relLastRowIx,
-            int relFirstColIx, int relLastColIx) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ValueEval getInnerValueEval(int sheetIndex) {
-        return value;
-    }
-
-    @Override
-    public int getNumberOfSheets() {
-        return 1;
-    }
-
-    @Override
-    public int getFirstSheetIndex() {
-        return 0;
-    }
-
-    @Override
-    public int getLastSheetIndex() {
-        return 0;
-    }
-
-    @Override
-    public int getRow() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getColumn() {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
deleted file mode 100644
index 84c1778..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import junit.framework.TestCase;
-
-public final class TestAddress extends TestCase {
-
-    public void testAddress() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        String formulaText = "ADDRESS(1,2)";
-        confirmResult(fe, cell, formulaText, "$B$1");
-
-        formulaText = "ADDRESS(1,2,)";					// with explicitly empty third parameter
-        confirmResult(fe, cell, formulaText, "$B$1");
-
-        formulaText = "ADDRESS(22,44)";
-        confirmResult(fe, cell, formulaText, "$AR$22");
-
-        formulaText = "ADDRESS(1,1)";
-        confirmResult(fe, cell, formulaText, "$A$1");
-
-        formulaText = "ADDRESS(1,128)";
-        confirmResult(fe, cell, formulaText, "$DX$1");
-
-        formulaText = "ADDRESS(1,512)";
-        confirmResult(fe, cell, formulaText, "$SR$1");
-
-        formulaText = "ADDRESS(1,1000)";
-        confirmResult(fe, cell, formulaText, "$ALL$1");
-
-        formulaText = "ADDRESS(1,10000)";
-        confirmResult(fe, cell, formulaText, "$NTP$1");
-
-        formulaText = "ADDRESS(2,3)";
-        confirmResult(fe, cell, formulaText, "$C$2");
-
-        formulaText = "ADDRESS(2,3,2)";
-        confirmResult(fe, cell, formulaText, "C$2");
-
-        formulaText = "ADDRESS(2,3,2,,\"EXCEL SHEET\")";
-        confirmResult(fe, cell, formulaText, "'EXCEL SHEET'!C$2");
-
-        formulaText = "ADDRESS(2,3,3,TRUE,\"[Book1]Sheet1\")";
-        confirmResult(fe, cell, formulaText, "'[Book1]Sheet1'!$C2");
-    }
-
-    private static void confirmResult(HSSFFormulaEvaluator fe, HSSFCell cell, String formulaText,
-                                      String expectedResult) {
-        cell.setCellFormula(formulaText);
-        fe.notifyUpdateCell(cell);
-        CellValue result = fe.evaluate(cell);
-        assertEquals(result.getCellTypeEnum(), CellType.STRING);
-        assertEquals(expectedResult, result.getStringValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java
deleted file mode 100644
index 1dcba00..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Tests for Excel function AVERAGE()
- *
- * @author Josh Micich
- */
-public final class TestAverage extends TestCase {
-
-	private static ValueEval invokeAverage(ValueEval[] args) {
-		return AggregateFunction.AVERAGE.evaluate(args, -1, (short)-1);
-	}
-
-	private void confirmAverage(ValueEval[] args, double expected) {
-		ValueEval result = invokeAverage(args);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval)result).getNumberValue(), 0);
-	}
-
-	private void confirmAverage(ValueEval[] args, ErrorEval expectedError) {
-		ValueEval result = invokeAverage(args);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(expectedError.getErrorCode(), ((ErrorEval)result).getErrorCode());
-	}
-
-	public void testBasic() {
-
-		ValueEval[] values = {
-				new NumberEval(1),
-				new NumberEval(2),
-				new NumberEval(3),
-				new NumberEval(4),
-		};
-
-		confirmAverage(values, 2.5);
-
-		values = new ValueEval[] {
-				new NumberEval(1),
-				new NumberEval(2),
-				BlankEval.instance,
-				new NumberEval(3),
-				BlankEval.instance,
-				new NumberEval(4),
-				BlankEval.instance,
-		};
-
-		confirmAverage(values, 2.5);
-	}
-
-	/**
-	 * Valid cases where values are not pure numbers
-	 */
-	public void testUnusualArgs() {
-		ValueEval[] values = {
-				new NumberEval(1),
-				new NumberEval(2),
-				BoolEval.TRUE,
-				BoolEval.FALSE,
-		};
-
-		confirmAverage(values, 1.0);
-
-	}
-
-	public void testErrors() {
-		ValueEval[] values = {
-				new NumberEval(1),
-				ErrorEval.NAME_INVALID,
-				new NumberEval(3),
-				ErrorEval.DIV_ZERO,
-		};
-		confirmAverage(values, ErrorEval.NAME_INVALID);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
deleted file mode 100644
index 134975e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link Bin2Dec}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public final class TestBin2Dec extends TestCase {
-
-    private static ValueEval invokeValue(String number1) {
-		ValueEval[] args = new ValueEval[] { new StringEval(number1) };
-		return new Bin2Dec().evaluate(args, -1, -1);
-	}
-
-    private static void confirmValue(String msg, String number1, String expected) {
-		ValueEval result = invokeValue(number1);
-		assertEquals("Had: " + result.toString(), NumberEval.class, result.getClass());
-		assertEquals(msg, expected, ((NumberEval) result).getStringValue());
-	}
-
-    private static void confirmValueError(String msg, String number1, ErrorEval numError) {
-        ValueEval result = invokeValue(number1);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-	public void testBasic() {
-		confirmValue("Converts binary '00101' to decimal (5)", "00101", "5");
-		confirmValue("Converts binary '1111111111' to decimal (-1)", "1111111111", "-1");
-		confirmValue("Converts binary '1111111110' to decimal (-2)", "1111111110", "-2");
-        confirmValue("Converts binary '0111111111' to decimal (511)", "0111111111", "511");
-	}
-
-    public void testErrors() {
-        confirmValueError("does not support more than 10 digits","01010101010", ErrorEval.NUM_ERROR);
-        confirmValueError("not a valid binary number","GGGGGGG", ErrorEval.NUM_ERROR);
-        confirmValueError("not a valid binary number","3.14159", ErrorEval.NUM_ERROR);
-    }
-
-    public void testEvalOperationEvaluationContext() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
-        ValueEval result = new Bin2Dec().evaluate(args, ctx);
-
-        assertEquals(NumberEval.class, result.getClass());
-        assertEquals("0", ((NumberEval) result).getStringValue());
-    }
-    
-    public void testEvalOperationEvaluationContextFails() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 0) };
-        ValueEval result = new Bin2Dec().evaluate(args, ctx);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    private OperationEvaluationContext createContext() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet();
-        HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
-        WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, new IStabilityClassifier() {
-            
-            @Override
-            public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
-                return true;
-            }
-        }, null);
-        OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, 
-                workbook, 0, 0, 0, null);
-        return ctx;
-    }
-
-    public void testRefs() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
-        ValueEval result = new Bin2Dec().evaluate(args, -1, -1);
-
-        assertEquals(NumberEval.class, result.getClass());
-        assertEquals("0", ((NumberEval) result).getStringValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
deleted file mode 100644
index c7c33ad..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Test for YEAR / MONTH / DAY / HOUR / MINUTE / SECOND
- */
-public final class TestCalendarFieldFunction extends TestCase {
-
-    private HSSFCell cell11;
-    private HSSFFormulaEvaluator evaluator;
-
-    @Override
-    public void setUp() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        cell11 = sheet.createRow(0).createCell(0);
-        cell11.setCellType(CellType.FORMULA);
-        evaluator = new HSSFFormulaEvaluator(wb);
-    }
-
-    public void testValid() {
-        confirm("YEAR(2.26)", 1900);
-        confirm("MONTH(2.26)", 1);
-        confirm("DAY(2.26)", 2);
-        confirm("HOUR(2.26)", 6);
-        confirm("MINUTE(2.26)", 14);
-        confirm("SECOND(2.26)", 24);
-        
-        confirm("YEAR(40627.4860417)", 2011);
-        confirm("MONTH(40627.4860417)", 3);
-        confirm("DAY(40627.4860417)", 25);
-        confirm("HOUR(40627.4860417)", 11);
-        confirm("MINUTE(40627.4860417)", 39);
-        confirm("SECOND(40627.4860417)", 54);
-    }
-
-    public void testRounding() {
-		// 41484.999994200 = 23:59:59,499
-		// 41484.9999942129 = 23:59:59,500  (but sub-milliseconds are below 0.5 (0.49999453965575), XLS-second results in 59)
-		// 41484.9999942130 = 23:59:59,500  (sub-milliseconds are 0.50000334065408, XLS-second results in 00)
-
-        confirm("DAY(41484.999994200)", 29);
-        confirm("SECOND(41484.999994200)", 59);
-
-        confirm("DAY(41484.9999942129)", 29);
-        confirm("HOUR(41484.9999942129)", 23);
-        confirm("MINUTE(41484.9999942129)", 59);
-        confirm("SECOND(41484.9999942129)", 59);
-		
-        confirm("DAY(41484.9999942130)", 30);
-        confirm("HOUR(41484.9999942130)", 0);
-        confirm("MINUTE(41484.9999942130)", 0);
-        confirm("SECOND(41484.9999942130)", 0);
-	}
-
-    public void testDaylightSaving() {
-        confirm("HOUR(41364.08263888890000)", 1);		// 31.03.2013 01:59:00,000
-        confirm("HOUR(41364.08333333330000)", 2);		// 31.03.2013 02:00:00,000 (this time does not exist in TZ CET, but EXCEL does not care)
-        confirm("HOUR(41364.08402777780000)", 2);		// 31.03.2013 02:01:00,000
-        confirm("HOUR(41364.12430555560000)", 2);		// 31.03.2013 02:59:00,000
-        confirm("HOUR(41364.12500000000000)", 3);		// 31.03.2013 03:00:00,000
-	}
-
-    public void testBugDate() {
-        confirm("YEAR(0.0)", 1900);
-        confirm("MONTH(0.0)", 1);
-        confirm("DAY(0.0)", 0);
-        
-        confirm("YEAR(0.26)", 1900);
-        confirm("MONTH(0.26)", 1);
-        confirm("DAY(0.26)", 0);
-        confirm("HOUR(0.26)", 6);
-        confirm("MINUTE(0.26)", 14);
-        confirm("SECOND(0.26)", 24);
-    }
-
-    private void confirm(String formulaText, double expectedResult) {
-        cell11.setCellFormula(formulaText);
-        evaluator.clearAllCachedResultValues();
-        CellValue cv = evaluator.evaluate(cell11);
-        if (cv.getCellTypeEnum() != CellType.NUMERIC) {
-            throw new AssertionFailedError("Wrong result type: " + cv.formatAsString());
-        }
-        double actualValue = cv.getNumberValue();
-        assertEquals(expectedResult, actualValue, 0);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java
deleted file mode 100644
index e0137ae..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import junit.framework.TestCase;
-
-public final class TestClean extends TestCase {
-
-    public void testClean() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        String[] asserts = {
-            "aniket\u0007\u0017\u0019", "aniket",
-            "\u0011aniket\u0007\u0017\u0010", "aniket",
-            "\u0011aniket\u0007\u0017\u007F", "aniket\u007F",
-            "\u2116aniket\u2211\uFB5E\u2039", "\u2116aniket\u2211\uFB5E\u2039",
-        };
-
-        for(int i = 0; i < asserts.length; i+= 2){
-            String formulaText = "CLEAN(\"" + asserts[i] + "\")";
-            confirmResult(fe, cell, formulaText, asserts[i + 1]);
-        }
-
-        asserts = new String[] {
-            "CHAR(7)&\"text\"&CHAR(7)", "text",
-            "CHAR(7)&\"text\"&CHAR(17)", "text",
-            "CHAR(181)&\"text\"&CHAR(190)", "\u00B5text\u00BE",
-            "\"text\"&CHAR(160)&\"'\"", "text\u00A0'",
-        };
-        for(int i = 0; i < asserts.length; i+= 2){
-            String formulaText = "CLEAN(" + asserts[i] + ")";
-            confirmResult(fe, cell, formulaText, asserts[i + 1]);
-        }
-    }
-
-    private static void confirmResult(HSSFFormulaEvaluator fe, HSSFCell cell, String formulaText,
-                                      String expectedResult) {
-        cell.setCellFormula(formulaText);
-        fe.notifyUpdateCell(cell);
-        CellValue result = fe.evaluate(cell);
-        assertEquals(result.getCellTypeEnum(), CellType.STRING);
-        assertEquals(expectedResult, result.getStringValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java
deleted file mode 100644
index 7a83f9c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link Code}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class TestCode extends TestCase
-{
-    private static ValueEval invokeValue(String number1) {
-        ValueEval[] args = new ValueEval[]{new StringEval(number1),};
-        return new Code().evaluate(args, -1, -1);
-    }
-
-    private static void confirmValue(String msg, String number1, String expected) {
-        ValueEval result = invokeValue(number1);
-        assertEquals(StringEval.class, result.getClass());
-        assertEquals(msg, expected, ((StringEval) result).getStringValue());
-    }
-
-    private static void confirmValueError(String msg, String number1, ErrorEval numError) {
-        ValueEval result = invokeValue(number1);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-
-    public void testBasic() {
-        confirmValue("Displays the numeric code for A (65)", "A", "65");
-        confirmValue("Displays the numeric code for the first character in text ABCDEFGHI (65)", "ABCDEFGHI", "65");
-
-        confirmValue("Displays the numeric code for ! (33)", "!", "33");
-    }
-
-    public void testErrors() {
-        confirmValueError("Empty text", "", ErrorEval.VALUE_INVALID);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
deleted file mode 100644
index 3d78d40..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests CODE() as loaded from a test data spreadsheet.<p/>
- */
-public class TestCodeFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestCodeFunctionsFromSpreadsheet.class, "CodeFunctionTestCaseData.xls");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java
deleted file mode 100644
index a371588..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link Complex}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class TestComplex extends TestCase
-{
-    private static ValueEval invokeValue(String real_num, String i_num, String suffix) {
-        ValueEval[] args = new ValueEval[]{new StringEval(real_num), new StringEval(i_num), new StringEval(suffix)};
-        return new Complex().evaluate(args, -1, -1);
-    }
-
-    private static void confirmValue(String msg, String real_num, String i_num, String suffix, String expected) {
-        ValueEval result = invokeValue(real_num, i_num, suffix);
-        assertEquals(StringEval.class, result.getClass());
-        assertEquals(msg, expected, ((StringEval) result).getStringValue());
-    }
-
-    private static void confirmValueError(String msg, String real_num, String i_num, String suffix, ErrorEval numError) {
-        ValueEval result = invokeValue(real_num, i_num, suffix);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-    public void testBasic() {
-        confirmValue("Complex number with 3 and 4 as the real and imaginary coefficients (3 + 4i)", "3","4", "", "3+4i");
-        confirmValue("Complex number with 3 and 4 as the real and imaginary coefficients, and j as the suffix (3 + 4j)", "3","4", "j", "3+4j");
-
-        confirmValue("Complex number with 0 and 1 as the real and imaginary coefficients (i)", "0","1", "", "i");
-        confirmValue("Complex number with 1 and 0 as the real and imaginary coefficients (1)", "1","0", "", "1");
-
-        confirmValue("Complex number with 2 and 3 as the real and imaginary coefficients (2 + 3i)", "2","3", "", "2+3i");
-        confirmValue("Complex number with -2 and -3 as the real and imaginary coefficients (-2-3i)", "-2","-3", "", "-2-3i");
-
-        confirmValue("Complex number with -2 and -3 as the real and imaginary coefficients (-0.5-3.2i)", "-0.5","-3.2", "", "-0.5-3.2i");
-    }
-
-    public void testErrors() {
-        confirmValueError("argument is nonnumeric", "ABCD", "","", ErrorEval.VALUE_INVALID);
-        confirmValueError("argument is nonnumeric", "1", "ABCD","", ErrorEval.VALUE_INVALID);
-        confirmValueError("f suffix is neither \"i\" nor \"j\"", "1", "1","k", ErrorEval.VALUE_INVALID);
-
-        confirmValueError("never use \"I\" ", "1", "1","I", ErrorEval.VALUE_INVALID);
-        confirmValueError("never use \"J\" ", "1", "1","J", ErrorEval.VALUE_INVALID);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
deleted file mode 100644
index 748b0ca..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests COMPLEX() as loaded from a test data spreadsheet.<p/>
- */
-public class TestComplexFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestComplexFunctionsFromSpreadsheet.class, "ComplexFunctionTestCaseData.xls");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
deleted file mode 100644
index 39b1f28..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
+++ /dev/null
@@ -1,575 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.util.CellReference;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Test cases for COUNT(), COUNTA() COUNTIF(), COUNTBLANK()
- */
-public final class TestCountFuncs extends TestCase {
-
-	private static final String NULL = null;
-
-	public void testCountBlank() {
-		AreaEval range;
-		ValueEval[] values;
-
-		values = new ValueEval[] {
-				new NumberEval(0),
-				new StringEval(""),	// note - does match blank
-				BoolEval.TRUE,
-				BoolEval.FALSE,
-				ErrorEval.DIV_ZERO,
-				BlankEval.instance,
-		};
-		range = EvalFactory.createAreaEval("A1:B3", values);
-		confirmCountBlank(2, range);
-
-		values = new ValueEval[] {
-				new NumberEval(0),
-				new StringEval(""),	// does match blank
-				BlankEval.instance,
-				BoolEval.FALSE,
-				BoolEval.TRUE,
-				BlankEval.instance,
-		};
-		range = EvalFactory.createAreaEval("A1:B3", values);
-		confirmCountBlank(3, range);
-	}
-
-	public void testCountA() {
-		ValueEval[] args;
-
-		args = new ValueEval[] {
-			new NumberEval(0),
-		};
-		confirmCountA(1, args);
-
-		args = new ValueEval[] {
-			new NumberEval(0),
-			new NumberEval(0),
-			new StringEval(""),
-		};
-		confirmCountA(3, args);
-
-		args = new ValueEval[] {
-			EvalFactory.createAreaEval("D2:F5", new ValueEval[12]),
-		};
-		confirmCountA(12, args);
-
-		args = new ValueEval[] {
-			EvalFactory.createAreaEval("D1:F5", new ValueEval[15]),
-			EvalFactory.createRefEval("A1"),
-			EvalFactory.createAreaEval("A1:G6", new ValueEval[42]),
-			new NumberEval(0),
-		};
-		confirmCountA(59, args);
-	}
-
-	public void testCountIf() {
-		AreaEval range;
-		ValueEval[] values;
-
-		// when criteria is a boolean value
-		values = new ValueEval[] {
-				new NumberEval(0),
-				new StringEval("TRUE"),	// note - does not match boolean TRUE
-				BoolEval.TRUE,
-				BoolEval.FALSE,
-				BoolEval.TRUE,
-				BlankEval.instance,
-		};
-		range = EvalFactory.createAreaEval("A1:B3", values);
-		confirmCountIf(2, range, BoolEval.TRUE);
-
-		// when criteria is numeric
-		values = new ValueEval[] {
-				new NumberEval(0),
-				new StringEval("2"),
-				new StringEval("2.001"),
-				new NumberEval(2),
-				new NumberEval(2),
-				BoolEval.TRUE,
-		};
-		range = EvalFactory.createAreaEval("A1:B3", values);
-		confirmCountIf(3, range, new NumberEval(2));
-		// note - same results when criteria is a string that parses as the number with the same value
-		confirmCountIf(3, range, new StringEval("2.00"));
-
-		// when criteria is an expression (starting with a comparison operator)
-		confirmCountIf(2, range, new StringEval(">1"));
-		// when criteria is an expression (starting with a comparison operator)
-		confirmCountIf(2, range, new StringEval(">0.5"));
-	}
-
-	public void testCriteriaPredicateNe_Bug46647() {
-		I_MatchPredicate mp = Countif.createCriteriaPredicate(new StringEval("<>aa"), 0, 0);
-		assertNotNull(mp);
-		StringEval seA = new StringEval("aa"); // this should not match the criteria '<>aa'
-		StringEval seB = new StringEval("bb"); // this should match
-		if (mp.matches(seA) && !mp.matches(seB)) {
-			throw new AssertionFailedError("Identified bug 46647");
-		}
-		assertFalse(mp.matches(seA));
-		assertTrue(mp.matches(seB));
-
-		// general tests for not-equal (<>) operator
-		AreaEval range;
-		ValueEval[] values;
-
-		values = new ValueEval[] {
-				new StringEval("aa"),
-				new StringEval("def"),
-				new StringEval("aa"),
-				new StringEval("ghi"),
-				new StringEval("aa"),
-				new StringEval("aa"),
-		};
-
-		range = EvalFactory.createAreaEval("A1:A6", values);
-		confirmCountIf(2, range, new StringEval("<>aa"));
-
-		values = new ValueEval[] {
-				new StringEval("ab"),
-				new StringEval("aabb"),
-				new StringEval("aa"), // match
-				new StringEval("abb"),
-				new StringEval("aab"),
-				new StringEval("ba"), // match
-		};
-
-		range = EvalFactory.createAreaEval("A1:A6", values);
-		confirmCountIf(2, range, new StringEval("<>a*b"));
-
-
-		values = new ValueEval[] {
-				new NumberEval(222),
-				new NumberEval(222),
-				new NumberEval(111),
-				new StringEval("aa"),
-				new StringEval("111"),
-		};
-
-		range = EvalFactory.createAreaEval("A1:A5", values);
-		confirmCountIf(4, range, new StringEval("<>111"));
-	}
-
-    /**
-     * String criteria in COUNTIF are case insensitive;
-     * for example, the string "apples" and the string "APPLES" will match the same cells.
-     */
-    public void testCaseInsensitiveStringComparison() {
-        AreaEval range;
-        ValueEval[] values;
-
-        values = new ValueEval[] {
-                new StringEval("no"),
-                new StringEval("NO"),
-                new StringEval("No"),
-                new StringEval("Yes")
-        };
-
-        range = EvalFactory.createAreaEval("A1:A4", values);
-        confirmCountIf(3, range, new StringEval("no"));
-        confirmCountIf(3, range, new StringEval("NO"));
-        confirmCountIf(3, range, new StringEval("No"));
-    }
-
-	/**
-	 * special case where the criteria argument is a cell reference
-	 */
-	public void testCountIfWithCriteriaReference() {
-
-		ValueEval[] values = {
-				new NumberEval(22),
-				new NumberEval(25),
-				new NumberEval(21),
-				new NumberEval(25),
-				new NumberEval(25),
-				new NumberEval(25),
-		};
-		AreaEval arg0 = EvalFactory.createAreaEval("C1:C6", values);
-
-		ValueEval criteriaArg = EvalFactory.createRefEval("A1", new NumberEval(25));
-		ValueEval[] args=  { arg0, criteriaArg, };
-
-		double actual = NumericFunctionInvoker.invoke(new Countif(), args);
-		assertEquals(4, actual, 0D);
-	}
-
-	private static void confirmCountA(int expected, ValueEval[] args) {
-		double result = NumericFunctionInvoker.invoke(new Counta(), args);
-		assertEquals(expected, result, 0);
-	}
-	private static void confirmCountIf(int expected, AreaEval range, ValueEval criteria) {
-
-		ValueEval[] args = { range, criteria, };
-		double result = NumericFunctionInvoker.invoke(new Countif(), args);
-		assertEquals(expected, result, 0);
-	}
-	private static void confirmCountBlank(int expected, AreaEval range) {
-
-		ValueEval[] args = { range };
-		double result = NumericFunctionInvoker.invoke(new Countblank(), args);
-		assertEquals(expected, result, 0);
-	}
-
-	private static I_MatchPredicate createCriteriaPredicate(ValueEval ev) {
-		return Countif.createCriteriaPredicate(ev, 0, 0);
-	}
-
-	/**
-	 * the criteria arg is mostly handled by {@link OperandResolver#getSingleValue(org.apache.poi.ss.formula.eval.ValueEval, int, int)}}
-	 */
-	public void testCountifAreaCriteria() {
-		int srcColIx = 2; // anything but column A
-
-		ValueEval v0 = new NumberEval(2.0);
-		ValueEval v1 = new StringEval("abc");
-		ValueEval v2 = ErrorEval.DIV_ZERO;
-
-		AreaEval ev = EvalFactory.createAreaEval("A10:A12", new ValueEval[] { v0, v1, v2, });
-
-		I_MatchPredicate mp;
-		mp = Countif.createCriteriaPredicate(ev, 9, srcColIx);
-		confirmPredicate(true, mp, srcColIx);
-		confirmPredicate(false, mp, "abc");
-		confirmPredicate(false, mp, ErrorEval.DIV_ZERO);
-
-		mp = Countif.createCriteriaPredicate(ev, 10, srcColIx);
-		confirmPredicate(false, mp, srcColIx);
-		confirmPredicate(true, mp, "abc");
-		confirmPredicate(false, mp, ErrorEval.DIV_ZERO);
-
-		mp = Countif.createCriteriaPredicate(ev, 11, srcColIx);
-		confirmPredicate(false, mp, srcColIx);
-		confirmPredicate(false, mp, "abc");
-		confirmPredicate(true, mp, ErrorEval.DIV_ZERO);
-		confirmPredicate(false, mp, ErrorEval.VALUE_INVALID);
-
-		// tricky: indexing outside of A10:A12
-		// even this #VALUE! error gets used by COUNTIF as valid criteria
-		mp = Countif.createCriteriaPredicate(ev, 12, srcColIx);
-		confirmPredicate(false, mp, srcColIx);
-		confirmPredicate(false, mp, "abc");
-		confirmPredicate(false, mp, ErrorEval.DIV_ZERO);
-		confirmPredicate(true, mp, ErrorEval.VALUE_INVALID);
-	}
-
-	public void testCountifEmptyStringCriteria() {
-		I_MatchPredicate mp;
-
-		// pred '=' matches blank cell but not empty string
-		mp = createCriteriaPredicate(new StringEval("="));
-		confirmPredicate(false, mp, "");
-		confirmPredicate(true, mp, NULL);
-
-		// pred '' matches both blank cell but not empty string
-		mp = createCriteriaPredicate(new StringEval(""));
-		confirmPredicate(true, mp, "");
-		confirmPredicate(true, mp, NULL);
-
-		// pred '<>' matches empty string but not blank cell
-		mp = createCriteriaPredicate(new StringEval("<>"));
-		confirmPredicate(false, mp, NULL);
-		confirmPredicate(true, mp, "");
-	}
-
-	public void testCountifComparisons() {
-		I_MatchPredicate mp;
-
-		mp = createCriteriaPredicate(new StringEval(">5"));
-		confirmPredicate(false, mp, 4);
-		confirmPredicate(false, mp, 5);
-		confirmPredicate(true, mp, 6);
-
-		mp = createCriteriaPredicate(new StringEval("<=5"));
-		confirmPredicate(true, mp, 4);
-		confirmPredicate(true, mp, 5);
-		confirmPredicate(false, mp, 6);
-		confirmPredicate(false, mp, "4.9");
-		confirmPredicate(false, mp, "4.9t");
-		confirmPredicate(false, mp, "5.1");
-		confirmPredicate(false, mp, NULL);
-
-		mp = createCriteriaPredicate(new StringEval("=abc"));
-		confirmPredicate(true, mp, "abc");
-
-		mp = createCriteriaPredicate(new StringEval("=42"));
-		confirmPredicate(false, mp, 41);
-		confirmPredicate(true, mp, 42);
-		confirmPredicate(true, mp, "42");
-
-		mp = createCriteriaPredicate(new StringEval(">abc"));
-		confirmPredicate(false, mp, 4);
-		confirmPredicate(false, mp, "abc");
-		confirmPredicate(true, mp, "abd");
-
-		mp = createCriteriaPredicate(new StringEval(">4t3"));
-		confirmPredicate(false, mp, 4);
-		confirmPredicate(false, mp, 500);
-		confirmPredicate(true, mp, "500");
-		confirmPredicate(true, mp, "4t4");
-	}
-
-	/**
-	 * the criteria arg value can be an error code (the error does not
-	 * propagate to the COUNTIF result).
-	 */
-	public void testCountifErrorCriteria() {
-		I_MatchPredicate mp;
-
-		mp = createCriteriaPredicate(new StringEval("#REF!"));
-		confirmPredicate(false, mp, 4);
-		confirmPredicate(false, mp, "#REF!");
-		confirmPredicate(true, mp, ErrorEval.REF_INVALID);
-
-		mp = createCriteriaPredicate(new StringEval("<#VALUE!"));
-		confirmPredicate(false, mp, 4);
-		confirmPredicate(false, mp, "#DIV/0!");
-		confirmPredicate(false, mp, "#REF!");
-		confirmPredicate(true, mp, ErrorEval.DIV_ZERO);
-		confirmPredicate(false, mp, ErrorEval.REF_INVALID);
-
-		// not quite an error literal, should be treated as plain text
-		mp = createCriteriaPredicate(new StringEval("<=#REF!a"));
-		confirmPredicate(false, mp, 4);
-		confirmPredicate(true, mp, "#DIV/0!");
-		confirmPredicate(true, mp, "#REF!");
-		confirmPredicate(false, mp, ErrorEval.DIV_ZERO);
-		confirmPredicate(false, mp, ErrorEval.REF_INVALID);
-	}
-
-   /**
-    * Bug #51498 - Check that CountIf behaves correctly for GTE, LTE
-    *  and NEQ cases
-    */
-	public void testCountifBug51498() throws Exception {
-		final int REF_COL = 4;
-		final int EVAL_COL = 3;
-		
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("51498.xls");
-		FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-		HSSFSheet sheet = workbook.getSheetAt(0);
-
-		// numeric criteria
-        for (int i = 0; i < 8; i++) {
-			CellValue expected = evaluator.evaluate(sheet.getRow(i).getCell(REF_COL));
-			CellValue actual = evaluator.evaluate(sheet.getRow(i).getCell(EVAL_COL));
-			assertEquals(expected.formatAsString(), actual.formatAsString());
-		}
-
-        // boolean criteria
-        for (int i = 0; i < 8; i++) {
-            HSSFCell cellFmla = sheet.getRow(i).getCell(8);
-            HSSFCell cellRef = sheet.getRow(i).getCell(9);
-
-            double expectedValue = cellRef.getNumericCellValue();
-            double actualValue = evaluator.evaluate(cellFmla).getNumberValue();
-
-            assertEquals(
-                    "Problem with a formula at " +
-                            new CellReference(cellFmla).formatAsString() + "[" + cellFmla.getCellFormula()+"] ",
-                    expectedValue, actualValue, 0.0001);
-        }
-
-        // string criteria
-        for (int i = 1; i < 9; i++) {
-            HSSFCell cellFmla = sheet.getRow(i).getCell(13);
-            HSSFCell cellRef = sheet.getRow(i).getCell(14);
-
-            double expectedValue = cellRef.getNumericCellValue();
-            double actualValue = evaluator.evaluate(cellFmla).getNumberValue();
-
-            assertEquals(
-                    "Problem with a formula at " +
-                            new CellReference(cellFmla).formatAsString() + "[" + cellFmla.getCellFormula()+"] ",
-                    expectedValue, actualValue, 0.0001);
-        }
-	}
-
-	public void testWildCards() {
-		I_MatchPredicate mp;
-
-		mp = createCriteriaPredicate(new StringEval("a*b"));
-		confirmPredicate(false, mp, "abc");
-		confirmPredicate(true, mp, "ab");
-		confirmPredicate(true, mp, "axxb");
-		confirmPredicate(false, mp, "xab");
-
-		mp = createCriteriaPredicate(new StringEval("a?b"));
-		confirmPredicate(false, mp, "abc");
-		confirmPredicate(false, mp, "ab");
-		confirmPredicate(false, mp, "axxb");
-		confirmPredicate(false, mp, "xab");
-		confirmPredicate(true, mp, "axb");
-
-		mp = createCriteriaPredicate(new StringEval("a~?"));
-		confirmPredicate(false, mp, "a~a");
-		confirmPredicate(false, mp, "a~?");
-		confirmPredicate(true, mp, "a?");
-
-		mp = createCriteriaPredicate(new StringEval("~*a"));
-		confirmPredicate(false, mp, "~aa");
-		confirmPredicate(false, mp, "~*a");
-		confirmPredicate(true, mp, "*a");
-
-		mp = createCriteriaPredicate(new StringEval("12?12"));
-		confirmPredicate(false, mp, 12812);
-		confirmPredicate(true, mp, "12812");
-		confirmPredicate(false, mp, "128812");
-	}
-	public void testNotQuiteWildCards() {
-		I_MatchPredicate mp;
-
-		// make sure special reg-ex chars are treated like normal chars
-		mp = createCriteriaPredicate(new StringEval("a.b"));
-		confirmPredicate(false, mp, "aab");
-		confirmPredicate(true, mp, "a.b");
-
-
-		mp = createCriteriaPredicate(new StringEval("a~b"));
-		confirmPredicate(false, mp, "ab");
-		confirmPredicate(false, mp, "axb");
-		confirmPredicate(false, mp, "a~~b");
-		confirmPredicate(true, mp, "a~b");
-
-		mp = createCriteriaPredicate(new StringEval(">a*b"));
-		confirmPredicate(false, mp, "a(b");
-		confirmPredicate(true, mp, "aab");
-		confirmPredicate(false, mp, "a*a");
-		confirmPredicate(true, mp, "a*c");
-	}
-
-	private static void confirmPredicate(boolean expectedResult, I_MatchPredicate matchPredicate, int value) {
-		assertEquals(expectedResult, matchPredicate.matches(new NumberEval(value)));
-	}
-	private static void confirmPredicate(boolean expectedResult, I_MatchPredicate matchPredicate, String value) {
-		ValueEval ev = value == null ? BlankEval.instance : new StringEval(value);
-		assertEquals(expectedResult, matchPredicate.matches(ev));
-	}
-	private static void confirmPredicate(boolean expectedResult, I_MatchPredicate matchPredicate, ErrorEval value) {
-		assertEquals(expectedResult, matchPredicate.matches(value));
-	}
-
-	public void testCountifFromSpreadsheet() {
-		testCountFunctionFromSpreadsheet("countifExamples.xls", 1, 2, 3, "countif");
-	}
-
-    /**
-     * Two COUNTIF examples taken from
-     * http://office.microsoft.com/en-us/excel-help/countif-function-HP010069840.aspx?CTT=5&origin=HA010277524
-     */
-    public void testCountifExamples() {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("countifExamples.xls");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        HSSFSheet sheet1 = wb.getSheet("MSDN Example 1");
-        for (int rowIx=7; rowIx<=12; rowIx++) {
-            HSSFRow row = sheet1.getRow(rowIx-1);
-            HSSFCell cellA = row.getCell(0);  // cell containing a formula with COUNTIF
-            assertEquals(CellType.FORMULA, cellA.getCellTypeEnum());
-            HSSFCell cellC = row.getCell(2);  // cell with a reference value
-            assertEquals(CellType.NUMERIC, cellC.getCellTypeEnum());
-
-            CellValue cv = fe.evaluate(cellA);
-            double actualValue = cv.getNumberValue();
-            double expectedValue = cellC.getNumericCellValue();
-            assertEquals(
-                    "Problem with a formula at  " + new CellReference(cellA).formatAsString()
-                            + ": " + cellA.getCellFormula() + " :"
-                    + "Expected = (" + expectedValue + ") Actual=(" + actualValue + ") ",
-                    expectedValue, actualValue, 0.0001);
-        }
-
-        HSSFSheet sheet2 = wb.getSheet("MSDN Example 2");
-        for (int rowIx=9; rowIx<=14; rowIx++) {
-            HSSFRow row = sheet2.getRow(rowIx-1);
-            HSSFCell cellA = row.getCell(0);  // cell containing a formula with COUNTIF
-            assertEquals(CellType.FORMULA, cellA.getCellTypeEnum());
-            HSSFCell cellC = row.getCell(2);  // cell with a reference value
-            assertEquals(CellType.NUMERIC, cellC.getCellTypeEnum());
-
-            CellValue cv = fe.evaluate(cellA);
-            double actualValue = cv.getNumberValue();
-            double expectedValue = cellC.getNumericCellValue();
-
-            assertEquals(
-                    "Problem with a formula at " +
-                            new CellReference(cellA).formatAsString() + "[" + cellA.getCellFormula()+"]: "
-                            + "Expected = (" + expectedValue + ") Actual=(" + actualValue + ") ",
-                    expectedValue, actualValue, 0.0001);
-
-        }
-    }
-
-	public void testCountBlankFromSpreadsheet() {
-		testCountFunctionFromSpreadsheet("countblankExamples.xls", 1, 3, 4, "countblank");
-	}
-
-	private static void testCountFunctionFromSpreadsheet(String FILE_NAME, int START_ROW_IX, int COL_IX_ACTUAL, int COL_IX_EXPECTED, String functionName) {
-
-		int failureCount = 0;
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(FILE_NAME);
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		int maxRow = sheet.getLastRowNum();
-		for (int rowIx=START_ROW_IX; rowIx<maxRow; rowIx++) {
-			HSSFRow row = sheet.getRow(rowIx);
-			if(row == null) {
-				continue;
-			}
-			HSSFCell cell = row.getCell(COL_IX_ACTUAL);
-			CellValue cv = fe.evaluate(cell);
-			double actualValue = cv.getNumberValue();
-			double expectedValue = row.getCell(COL_IX_EXPECTED).getNumericCellValue();
-			if (actualValue != expectedValue) {
-				System.err.println("Problem with test case on row " + (rowIx+1) + " "
-						+ "Expected = (" + expectedValue + ") Actual=(" + actualValue + ") ");
-				failureCount++;
-			}
-		}
-
-		if (failureCount > 0) {
-			throw new AssertionFailedError(failureCount + " " + functionName
-					+ " evaluations failed. See stderr for more details");
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
deleted file mode 100644
index 4ac7b98..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
-* Tests DGET() as loaded from a test data spreadsheet.
-*/
-public class TestDGetFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestDGetFunctionsFromSpreadsheet.class, "DGet.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
deleted file mode 100644
index 0d20d98..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
-* Tests D*() functions as loaded from a test data spreadsheet.
-*/
-public class TestDStarFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestDStarFunctionsFromSpreadsheet.class, "DStar.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
deleted file mode 100644
index 45241f6..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * @author Pavel Krupets (pkrupets at palmtreebusiness dot com)
- */
-public final class TestDate extends TestCase {
-
-    private HSSFCell cell11;
-    private HSSFFormulaEvaluator evaluator;
-
-    @Override
-    public void setUp() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        cell11 = sheet.createRow(0).createCell(0);
-        cell11.setCellType(CellType.FORMULA);
-        evaluator = new HSSFFormulaEvaluator(wb);
-    }
-
-    /**
-     * Test disabled pending a fix in the formula evaluator
-     * TODO - create MissingArgEval and modify the formula evaluator to handle this
-     */
-    public void DISABLEDtestSomeArgumentsMissing() {
-        confirm("DATE(, 1, 0)", 0.0);
-        confirm("DATE(, 1, 1)", 1.0);
-    }
-
-    public void testValid() {
-
-        confirm("DATE(1900, 1, 1)", 1);
-        confirm("DATE(1900, 1, 32)", 32);
-        confirm("DATE(1900, 222, 1)", 6727);
-        confirm("DATE(1900, 2, 0)", 31);
-        confirm("DATE(2000, 1, 222)", 36747.00);
-        confirm("DATE(2007, 1, 1)", 39083);
-    }
-
-    public void testBugDate() {
-        confirm("DATE(1900, 2, 29)", 60);
-        confirm("DATE(1900, 2, 30)", 61);
-        confirm("DATE(1900, 1, 222)", 222);
-        confirm("DATE(1900, 1, 2222)", 2222);
-        confirm("DATE(1900, 1, 22222)", 22222);
-    }
-
-    public void testPartYears() {
-        confirm("DATE(4, 1, 1)", 1462.00);
-        confirm("DATE(14, 1, 1)", 5115.00);
-        confirm("DATE(104, 1, 1)", 37987.00);
-        confirm("DATE(1004, 1, 1)", 366705.00);
-    }
-
-    private void confirm(String formulaText, double expectedResult) {
-        cell11.setCellFormula(formulaText);
-        evaluator.clearAllCachedResultValues();
-        CellValue cv = evaluator.evaluate(cell11);
-        if (cv.getCellTypeEnum() != CellType.NUMERIC) {
-            throw new AssertionFailedError("Wrong result type: " + cv.formatAsString());
-        }
-        double actualValue = cv.getNumberValue();
-        assertEquals(expectedResult, actualValue, 0);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
deleted file mode 100644
index 1594770..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-public final class TestDays360 {
-
-    /**
-     * @param month 1-based
-     */
-    private static Date makeDate(int year, int month, int day) {
-        Calendar cal = LocaleUtil.getLocaleCalendar(year, month-1, day);
-        return cal.getTime();
-    }
-
-    private static Date decrementDay(Date d) {
-        Calendar c = LocaleUtil.getLocaleCalendar();
-        c.setTime(d);
-        c.add(Calendar.DAY_OF_MONTH, -1);
-        return c.getTime();
-    }
-
-    @Test
-    public void testBasic() {
-        confirm(120, 2009, 1, 15, 2009, 5, 15);
-        confirm(158, 2009, 1, 26, 2009, 7, 4);
-
-        // same results in leap years
-        confirm(120, 2008, 1, 15, 2008, 5, 15);
-        confirm(158, 2008, 1, 26, 2008, 7, 4);
-
-        // longer time spans
-        confirm(562, 2008, 8, 11, 2010, 3, 3);
-        confirm(916, 2007, 2, 23, 2009, 9, 9);
-        
-        // other tests
-        confirm(1, makeDate(1993, 2, 28), makeDate(1993, 3, 1), false);
-        confirm(1, makeDate(1996, 2, 29), makeDate(1996, 3, 1), false);
-        confirm(-2, makeDate(1993, 2, 28), makeDate(1993, 2, 28), false);
-        confirm(3, makeDate(1993, 2, 28), makeDate(1993, 3, 1), true);
-        confirm(2, makeDate(1996, 2, 29), makeDate(1996, 3, 1), true);
-
-        // from https://support.office.com/en-us/article/DAYS360-function-B9A509FD-49EF-407E-94DF-0CBDA5718C2A
-        confirm(1, makeDate(2011, 1, 30), makeDate(2011, 2, 1), false);
-        confirm(360, makeDate(2011, 1, 1), makeDate(2011, 12, 31), false);
-        confirm(30, makeDate(2011, 1, 1), makeDate(2011, 2, 1), false);
-    }
-
-    private static void confirm(int expResult, int y1, int m1, int d1, int y2, int m2, int d2) {
-        confirm(expResult, makeDate(y1, m1, d1), makeDate(y2, m2, d2), false);
-        confirm(-expResult, makeDate(y2, m2, d2), makeDate(y1, m1, d1), false);
-    }
-    
-    /**
-     * The <tt>method</tt> parameter only makes a difference when the second parameter
-     * is the last day of the month that does <em>not</em> have 30 days.
-     */
-    @Test
-    public void testMonthBoundaries() {
-        // jan
-        confirmMonthBoundary(false, 2001, 1, 0, 0, 2, 3, 4);
-        confirmMonthBoundary(true,  2001, 1, 0, 0, 1, 2, 3);
-        // feb
-        confirmMonthBoundary(false, 2001, 2,-2, 1, 2, 3, 4);
-        confirmMonthBoundary(true,  2001, 2, 0, 1, 2, 3, 4);
-        // mar
-        confirmMonthBoundary(false, 2001, 3, 0, 0, 2, 3, 4);
-        confirmMonthBoundary(true,  2001, 3, 0, 0, 1, 2, 3);
-        // apr
-        confirmMonthBoundary(false, 2001, 4, 0, 1, 2, 3, 4);
-        confirmMonthBoundary(true,  2001, 4, 0, 1, 2, 3, 4);
-        // may
-        confirmMonthBoundary(false, 2001, 5, 0, 0, 2, 3, 4);
-        confirmMonthBoundary(true,  2001, 5, 0, 0, 1, 2, 3);
-        // jun
-        confirmMonthBoundary(false, 2001, 6, 0, 1, 2, 3, 4);
-        confirmMonthBoundary(true,  2001, 6, 0, 1, 2, 3, 4);
-        // leap year
-        confirmMonthBoundary(false, 2012, 2, -1, 1, 2, 3, 4);
-        confirmMonthBoundary(true,  2012, 2, 0, 1, 2, 3, 4);
-
-        // bug 60029
-        Date start = makeDate(2018, 2, 28);
-        Date end = makeDate(2018, 3, 31);
-        confirm(30, start, end, false);
-
-        // examples from https://support.office.com/en-us/article/DAYS360-function-B9A509FD-49EF-407E-94DF-0CBDA5718C2A
-        start = makeDate(2011, 1, 30);
-        end = makeDate(2011, 2, 1);
-        confirm(1, start, end, false);
-
-        start = makeDate(2011, 1, 1);
-        end = makeDate(2011, 12, 31);
-        confirm(360, start, end, false);
-
-        start = makeDate(2011, 1, 1);
-        end = makeDate(2011, 2, 1);
-        confirm(30, start, end, false);
-    }
-
-
-    /**
-     * @param monthNo 1-based
-     */
-    private static void confirmMonthBoundary(boolean method, int year, int monthNo, int...diffs) {
-        Date firstDayOfNextMonth = makeDate(year, monthNo+1, 1);
-        Date secondArg = decrementDay(firstDayOfNextMonth);
-        Date firstArg = secondArg;
-
-        for (int expResult : diffs) {
-            confirm(expResult, firstArg, secondArg, method);
-            firstArg = decrementDay(firstArg);
-        }
-
-    }
-    private static void confirm(int expResult, Date firstArg, Date secondArg, boolean method) {
-        ValueEval ve;
-        if (method) {
-            ve = invokeDays360(convert(firstArg), convert(secondArg), BoolEval.TRUE);
-        } else {
-            ve = invokeDays360(convert(firstArg), convert(secondArg));
-        }
-        assertTrue("wrong return type (" + ve.getClass().getName() + ")", ve instanceof NumberEval);
-
-        NumberEval numberEval = (NumberEval) ve;
-        String err = String.format(Locale.ROOT, "days360(%tF,%tF,%b) wrong result", firstArg, secondArg, method);
-        assertEquals(err, expResult, numberEval.getNumberValue(), 0);
-    }
-    
-    private static ValueEval invokeDays360(ValueEval...args) {
-        return new Days360().evaluate(args, -1, -1);
-    }
-    
-    private static NumberEval convert(Date d) {
-        return new NumberEval(HSSFDateUtil.getExcelDate(d));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
deleted file mode 100644
index c12dbe9..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-
-/**
- * Tests for {@link Dec2Bin}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public final class TestDec2Bin extends TestCase {
-
-    private static ValueEval invokeValue(String number1) {
-		ValueEval[] args = new ValueEval[] { new StringEval(number1) };
-		return new Dec2Bin().evaluate(args, -1, -1);
-	}
-
-    private static ValueEval invokeBack(String number1) {
-        ValueEval[] args = new ValueEval[] { new StringEval(number1) };
-        return new Bin2Dec().evaluate(args, -1, -1);
-    }
-
-    private static void confirmValue(String msg, String number1, String expected) {
-		ValueEval result = invokeValue(number1);
-		assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
-		assertEquals(msg, expected, ((StringEval) result).getStringValue());
-	}
-
-    private static void confirmValueError(String msg, String number1, ErrorEval numError) {
-        ValueEval result = invokeValue(number1);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-	public void testBasic() {
-		confirmValue("Converts binary '00101' from binary (5)", "5", "101");
-		confirmValue("Converts binary '1111111111' from binary (-1)", "-1",    "1111111111");
-		confirmValue("Converts binary '1111111110' from binary (-2)", "-2",    "1111111110");
-        confirmValue("Converts binary '0111111111' from binary (511)", "511",   "111111111");
-        confirmValue("Converts binary '1000000000' from binary (511)", "-512", "1000000000");
-	}
-
-    public void testErrors() {
-        confirmValueError("fails for >= 512 or < -512","512", ErrorEval.NUM_ERROR);
-        confirmValueError("fails for >= 512 or < -512","-513", ErrorEval.NUM_ERROR);
-        confirmValueError("not a valid decimal number","GGGGGGG", ErrorEval.VALUE_INVALID);
-        confirmValueError("not a valid decimal number","3.14159a", ErrorEval.VALUE_INVALID);
-    }
-
-    public void testEvalOperationEvaluationContext() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
-        ValueEval result = new Dec2Bin().evaluate(args, ctx);
-
-        assertEquals(StringEval.class, result.getClass());
-        assertEquals("1101", ((StringEval) result).getStringValue());
-    }
-
-    public void testEvalOperationEvaluationContextFails() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ErrorEval.VALUE_INVALID };
-        ValueEval result = new Dec2Bin().evaluate(args, ctx);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    private OperationEvaluationContext createContext() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        cell.setCellValue("13.43");
-        cell = row.createCell(1);
-        cell.setCellValue("8");
-        cell = row.createCell(2);
-        cell.setCellValue("-8");
-        cell = row.createCell(3);
-        cell.setCellValue("1");
-
-        HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
-        WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, new IStabilityClassifier() {
-            
-            @Override
-            public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
-                return true;
-            }
-        }, null);
-        OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, 
-                workbook, 0, 0, 0, null);
-        return ctx;
-    }
-
-    public void testRefs() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
-        assertEquals("1101", ((StringEval) result).getStringValue());
-    }
-
-    public void testWithPlacesIntInt() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
-        // TODO: documentation and behavior do not match here!
-        assertEquals("1101", ((StringEval) result).getStringValue());
-    }
-
-    public void testWithPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Bin().evaluate(args, ctx);
-
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
-        // TODO: documentation and behavior do not match here!
-        assertEquals("1101", ((StringEval) result).getStringValue());
-    }
-
-    public void testWithToShortPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 3) };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.NUM_ERROR, result);
-    }
-
-    public void testWithTooManyParamsIntInt() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    public void testWithTooManyParams() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Bin().evaluate(args, ctx);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    public void testWithErrorPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ErrorEval.NULL_INTERSECTION };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.NULL_INTERSECTION, result);
-    }
-
-    public void testWithNegativePlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 2) };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.NUM_ERROR, result);
-    }
-
-    public void testWithZeroPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), new NumberEval(0.0) };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.NUM_ERROR, result);
-    }
-
-    public void testWithEmptyPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(1, 0) };
-        ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-    
-    public void testBackAndForth() {
-        for (int i = -512; i < 512; i++) {
-            ValueEval result = invokeValue(Integer.toString(i));
-            assertEquals("Had: " + result.toString(), StringEval.class,
-                    result.getClass());
-
-            ValueEval back = invokeBack(((StringEval) result).getStringValue());
-            assertEquals("Had: " + back.toString(), NumberEval.class,
-                    back.getClass());
-
-            assertEquals(Integer.toString(i),
-                    ((NumberEval) back).getStringValue());
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
deleted file mode 100644
index 6084d65..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-
-/**
- * Tests for {@link Dec2Hex}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public final class TestDec2Hex extends TestCase {
-
-	private static ValueEval invokeValue(String number1, String number2) {
-		ValueEval[] args = new ValueEval[] { new StringEval(number1), new StringEval(number2), };
-		return new Dec2Hex().evaluate(args, -1, -1);
-	}
-
-    private static ValueEval invokeBack(String number1) {
-        ValueEval[] args = new ValueEval[] { new StringEval(number1) };
-        return new Hex2Dec().evaluate(args, -1, -1);
-    }
-
-    private static ValueEval invokeValue(String number1) {
-		ValueEval[] args = new ValueEval[] { new StringEval(number1), };
-		return new Dec2Hex().evaluate(args, -1, -1);
-	}
-
-	private static void confirmValue(String msg, String number1, String number2, String expected) {
-		ValueEval result = invokeValue(number1, number2);
-		assertEquals(StringEval.class, result.getClass());
-		assertEquals(msg, expected, ((StringEval) result).getStringValue());
-	}
-
-    private static void confirmValue(String msg, String number1, String expected) {
-		ValueEval result = invokeValue(number1);
-		assertEquals(StringEval.class, result.getClass());
-		assertEquals(msg, expected, ((StringEval) result).getStringValue());
-	}
-
-    private static void confirmValueError(String msg, String number1, String number2, ErrorEval numError) {
-        ValueEval result = invokeValue(number1, number2);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-	public void testBasic() {
-		confirmValue("Converts decimal 100 to hexadecimal with 0 characters (64)", "100","0", "64");
-		confirmValue("Converts decimal 100 to hexadecimal with 4 characters (0064)", "100","4", "0064");
-		confirmValue("Converts decimal 100 to hexadecimal with 5 characters (0064)", "100","5", "00064");
-		confirmValue("Converts decimal 100 to hexadecimal with 10 (default) characters", "100","10", "0000000064");
-		confirmValue("If argument places contains a decimal value, dec2hex ignores the numbers to the right side of the decimal point.", "100","10.0", "0000000064");
-
-		confirmValue("Converts decimal -54 to hexadecimal, 2 is ignored","-54", "2",  "FFFFFFFFCA");
-		confirmValue("places is optionnal","-54", "FFFFFFFFCA");
-		
-		confirmValue("Converts normal decimal number to hexadecimal", "100", "64");
-        
-		String maxInt = Integer.toString(Integer.MAX_VALUE);
-        assertEquals("2147483647", maxInt);
-        confirmValue("Converts INT_MAX to hexadecimal", maxInt, "7FFFFFFF");
-
-        String minInt = Integer.toString(Integer.MIN_VALUE);
-        assertEquals("-2147483648", minInt);
-        confirmValue("Converts INT_MIN to hexadecimal", minInt, "FF80000000");
-
-        String maxIntPlusOne = Long.toString(((long)Integer.MAX_VALUE)+1);
-        assertEquals("2147483648", maxIntPlusOne);
-        confirmValue("Converts INT_MAX + 1 to hexadecimal", maxIntPlusOne, "80000000");
-        
-        String maxLong = Long.toString(549755813887l);
-        assertEquals("549755813887", maxLong);
-        confirmValue("Converts the max supported value to hexadecimal", maxLong, "7FFFFFFFFF");
-        
-        String minLong = Long.toString(-549755813888l);
-        assertEquals("-549755813888", minLong);
-        confirmValue("Converts the min supported value to hexadecimal", minLong, "FF80000000");
-	}
-
-    public void testErrors() {
-        confirmValueError("Out of range min number","-549755813889","0", ErrorEval.NUM_ERROR);
-        confirmValueError("Out of range max number","549755813888","0", ErrorEval.NUM_ERROR);
-
-        confirmValueError("negative places not allowed","549755813888","-10", ErrorEval.NUM_ERROR);
-        confirmValueError("non number places not allowed","ABCDEF","0", ErrorEval.VALUE_INVALID);
-    }
-
-    public void testEvalOperationEvaluationContextFails() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ErrorEval.VALUE_INVALID };
-        ValueEval result = new Dec2Hex().evaluate(args, ctx);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    private OperationEvaluationContext createContext() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        cell.setCellValue("123.43");
-        cell = row.createCell(1);
-        cell.setCellValue("8");
-        cell = row.createCell(2);
-        cell.setCellValue("-8");
-
-        HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
-        WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, new IStabilityClassifier() {
-            
-            @Override
-            public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
-                return true;
-            }
-        }, null);
-        OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, 
-                workbook, 0, 0, 0, null);
-        return ctx;
-    }
-
-    public void testRefs() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
-        ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
-
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
-        assertEquals("7B", ((StringEval) result).getStringValue());
-    }
-
-    public void testWithPlacesIntInt() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
-
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
-        assertEquals("0000007B", ((StringEval) result).getStringValue());
-    }
-
-    public void testWithPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Hex().evaluate(args, ctx);
-
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
-        assertEquals("0000007B", ((StringEval) result).getStringValue());
-    }
-
-    public void testWithTooManyParamsIntInt() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    public void testWithTooManyParams() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1), ctx.getRefEval(0, 1) };
-        ValueEval result = new Dec2Hex().evaluate(args, ctx);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    public void testWithErrorPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ErrorEval.NULL_INTERSECTION };
-        ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.NULL_INTERSECTION, result);
-    }
-
-    public void testWithNegativePlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 2) };
-        ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.NUM_ERROR, result);
-    }
-
-    public void testWithEmptyPlaces() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(1, 0) };
-        ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    public void testBackAndForth() {
-        for (int i = -512; i < 512; i++) {
-            ValueEval result = invokeValue(Integer.toString(i));
-            assertEquals("Had: " + result.toString(), StringEval.class,
-                    result.getClass());
-
-            ValueEval back = invokeBack(((StringEval) result).getStringValue());
-            assertEquals("Had: " + back.toString(), NumberEval.class,
-                    back.getClass());
-
-            assertEquals(Integer.toString(i),
-                    ((NumberEval) back).getStringValue());
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java
deleted file mode 100644
index 30ce140..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link org.apache.poi.ss.formula.functions.Delta}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public final class TestDelta extends TestCase {
-
-	private static ValueEval invokeValue(String number1, String number2) {
-		ValueEval[] args = new ValueEval[] { new StringEval(number1), new StringEval(number2), };
-		return new Delta().evaluate(args, -1, -1);
-	}
-
-	private static void confirmValue(String number1, String number2, double expected) {
-		ValueEval result = invokeValue(number1, number2);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval) result).getNumberValue(), 0.0);
-	}
-
-    private static void confirmValueError(String number1, String number2) {
-        ValueEval result = invokeValue(number1, number2);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-	public void testBasic() {
-		confirmValue("5","4", 0); // Checks whether 5 equals 4 (0)
-		confirmValue("5","5", 1); // Checks whether 5 equals 5 (1)
-
-        confirmValue("0.5","0", 0); // Checks whether 0.5 equals 0 (0)
-        confirmValue("0.50","0.5", 1);
-        confirmValue("0.5000000000","0.5", 1);
-	}
-
-    public void testErrors() {
-        confirmValueError("A1","B2");
-        confirmValueError("AAAA","BBBB");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
deleted file mode 100644
index 68b281d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests DELTA() as loaded from a test data spreadsheet.<p/>
- */
-public class TestDeltaFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestDeltaFunctionsFromSpreadsheet.class, "DeltaFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java
deleted file mode 100644
index 1b13448..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-public class TestEDate {
-
-    @Test
-    public void testEDateProperValues() {
-        // verify some border-case combinations of startDate and month-increase
-        checkValue(1000, 0, 1000d);
-        checkValue(1, 0, 1d);
-        checkValue(0, 1, 31d);
-        checkValue(1, 1, 32d);
-        checkValue(0, 0, /* BAD_DATE! */ -1.0d);
-        checkValue(0, -2, /* BAD_DATE! */ -1.0d);
-        checkValue(0, -3, /* BAD_DATE! */ -1.0d);
-        checkValue(49104, 0, 49104d);
-        checkValue(49104, 1, 49134d);
-    }
-
-    private void checkValue(int startDate, int monthInc, double expectedResult) {
-        EDate eDate = new EDate();
-        NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(startDate), new NumberEval(monthInc)}, null);
-        assertEquals(expectedResult, result.getNumberValue(), 0);
-    }
-    
-    @Test
-    public void testEDateInvalidValues() {
-        EDate eDate = new EDate();
-        ErrorEval result = (ErrorEval) eDate.evaluate(new ValueEval[]{new NumberEval(1000)}, null);
-        assertEquals(FormulaError.VALUE.getCode(), result.getErrorCode(), 0);
-    }
-
-    @Test
-    public void testEDateIncrease() {
-        EDate eDate = new EDate();
-        Date startDate = new Date();
-        int offset = 2;
-        NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(DateUtil.getExcelDate(startDate)), new NumberEval(offset)}, null);
-        Date resultDate = DateUtil.getJavaDate(result.getNumberValue());
-        Calendar instance = LocaleUtil.getLocaleCalendar();
-        instance.setTime(startDate);
-        instance.add(Calendar.MONTH, offset);
-        assertEquals(resultDate, instance.getTime());
-
-    }
-
-    @Test
-    public void testEDateDecrease() {
-        EDate eDate = new EDate();
-        Date startDate = new Date();
-        int offset = -2;
-        NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(DateUtil.getExcelDate(startDate)), new NumberEval(offset)}, null);
-        Date resultDate = DateUtil.getJavaDate(result.getNumberValue());
-        Calendar instance = LocaleUtil.getLocaleCalendar();
-        instance.setTime(startDate);
-        instance.add(Calendar.MONTH, offset);
-        assertEquals(resultDate, instance.getTime());
-    }
-    
-    @Test
-    public void testBug56688() {        
-        EDate eDate = new EDate();
-        NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(1000), new RefEvalImplementation(new NumberEval(0))}, null);
-        assertEquals(1000d, result.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testRefEvalStartDate() {
-        EDate eDate = new EDate();
-        NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new RefEvalImplementation(new NumberEval(1000)), new NumberEval(0)}, null);
-        assertEquals(1000d, result.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testEDateInvalidValueEval() {
-        ValueEval evaluate = new EDate().evaluate(new ValueEval[]{new ValueEval() {}, new NumberEval(0)}, null);
-        assertTrue(evaluate instanceof ErrorEval);
-        assertEquals(ErrorEval.VALUE_INVALID, evaluate);
-    }
-
-    @Test
-    public void testEDateBlankValueEval() {
-        NumberEval evaluate = (NumberEval) new EDate().evaluate(new ValueEval[]{BlankEval.instance, new NumberEval(0)}, null);
-        assertEquals(-1.0d, evaluate.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testEDateBlankRefValueEval() {
-        EDate eDate = new EDate();
-        NumberEval result = (NumberEval) eDate.evaluate(new ValueEval[]{new RefEvalImplementation(BlankEval.instance), new NumberEval(0)}, null);
-        assertEquals("0 startDate triggers BAD_DATE currently, thus -1.0!", 
-                -1.0d, result.getNumberValue(), 0);
-
-        result = (NumberEval) eDate.evaluate(new ValueEval[]{new NumberEval(1), new RefEvalImplementation(BlankEval.instance)}, null);
-        assertEquals("Blank is handled as 0 otherwise", 
-                1.0d, result.getNumberValue(), 0);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java
deleted file mode 100644
index ecaecec..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-public class TestEOMonth {
-
-    private static final double BAD_DATE = -1.0;
-
-    private static final double DATE_1900_01_01 = 1.0;
-    private static final double DATE_1900_01_31 = 31.0;
-    private static final double DATE_1900_02_28 = 59.0;
-    private static final double DATE_1902_09_26 = 1000.0;
-    private static final double DATE_1902_09_30 = 1004.0;
-    private static final double DATE_2034_06_09 = 49104.0;
-    private static final double DATE_2034_06_30 = 49125.0;
-    private static final double DATE_2034_07_31 = 49156.0;
-
-    private final FreeRefFunction eOMonth = EOMonth.instance;
-    private final OperationEvaluationContext ec = new OperationEvaluationContext(null, null, 0, 0, 0, null);
-
-    @Test
-    public void testEOMonthProperValues() {
-        // verify some border-case combinations of startDate and month-increase
-        checkValue(DATE_1900_01_01, 0, DATE_1900_01_31);
-        checkValue(DATE_1900_01_01, 1, DATE_1900_02_28);
-        checkValue(DATE_1902_09_26, 0, DATE_1902_09_30);
-        checkValue(DATE_2034_06_09, 0, DATE_2034_06_30);
-        checkValue(DATE_2034_06_09, 1, DATE_2034_07_31);
-    }
-
-    @Test
-    public void testEOMonthBadDateValues() {
-        checkValue(0.0, -2, BAD_DATE);
-        checkValue(0.0, -3, BAD_DATE);
-        checkValue(DATE_1900_01_31, -1, BAD_DATE);
-    }
-
-    private void checkValue(double startDate, int monthInc, double expectedResult) {
-        ValueEval ve[] = {new NumberEval(startDate), new NumberEval(monthInc)};
-        NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec);
-        assertEquals(expectedResult, result.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testEOMonthZeroDate() {
-        NumberEval result = (NumberEval) eOMonth.evaluate(new ValueEval[] {new NumberEval(0), new NumberEval(0)}, ec);
-        assertEquals("0 startDate is 1900-01-00", DATE_1900_01_31, result.getNumberValue(), 0);
-
-        result = (NumberEval) eOMonth.evaluate(new ValueEval[] {new NumberEval(0), new NumberEval(1)}, ec);
-        assertEquals("0 startDate is 1900-01-00", DATE_1900_02_28, result.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testEOMonthInvalidArguments() {
-        ValueEval result = eOMonth.evaluate(new ValueEval[] {new NumberEval(DATE_1902_09_26)}, ec);
-        assertTrue(result instanceof ErrorEval);
-        assertEquals(FormulaError.VALUE.getCode(), ((ErrorEval) result).getErrorCode(), 0);
-
-        result = eOMonth.evaluate(new ValueEval[] {new StringEval("a"), new StringEval("b")}, ec);
-        assertTrue(result instanceof ErrorEval);
-        assertEquals(FormulaError.VALUE.getCode(), ((ErrorEval) result).getErrorCode(), 0);
-    }
-
-    @Test
-    public void checkOffset() {
-        for (int offset=-12; offset<=12; offset++) {
-            Calendar cal = LocaleUtil.getLocaleCalendar();
-            Date startDate = cal.getTime();
-
-            cal.add(Calendar.MONTH, offset);
-            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
-            cal.clear(Calendar.HOUR);
-            cal.set(Calendar.HOUR_OF_DAY, 0);
-            cal.clear(Calendar.MINUTE);
-            cal.clear(Calendar.SECOND);
-            cal.clear(Calendar.MILLISECOND);
-            Date expDate = cal.getTime();
-            
-            ValueEval ve[] = {
-                new NumberEval(DateUtil.getExcelDate(startDate)),
-                new NumberEval(offset)
-            };
-            NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec);
-            Date actDate = DateUtil.getJavaDate(result.getNumberValue());
-            
-            assertEquals(expDate, actDate);
-        }
-    }
-
-    @Test
-    public void testBug56688() {
-        ValueEval ve[] = {new NumberEval(DATE_1902_09_26), new RefEvalImplementation(new NumberEval(0))};
-        NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec);
-        assertEquals(DATE_1902_09_30, result.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testRefEvalStartDate() {
-        ValueEval ve[] = {new RefEvalImplementation(new NumberEval(DATE_1902_09_26)), new NumberEval(0)};
-        NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec);
-        assertEquals(DATE_1902_09_30, result.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testEOMonthBlankValueEval() {
-        NumberEval evaluate = (NumberEval) eOMonth.evaluate(new ValueEval[] {BlankEval.instance, new NumberEval(0)}, ec);
-        assertEquals("Blank is handled as 0", DATE_1900_01_31, evaluate.getNumberValue(), 0);
-    }
-
-    @Test
-    public void testEOMonthBlankRefValueEval() {
-        ValueEval[] ve1 = {new RefEvalImplementation(BlankEval.instance), new NumberEval(1)};
-        NumberEval result = (NumberEval) eOMonth.evaluate(ve1, ec);
-        assertEquals("Blank is handled as 0", DATE_1900_02_28, result.getNumberValue(), 0);
-
-        ValueEval[] ve2 = {new NumberEval(1), new RefEvalImplementation(BlankEval.instance)};
-        result = (NumberEval) eOMonth.evaluate(ve2, ec);
-        assertEquals("Blank is handled as 0", DATE_1900_01_31, result.getNumberValue(), 0);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
deleted file mode 100644
index fb45ac2..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests FactDouble() as loaded from a test data spreadsheet.<p/>
- */
-public class TestFactDoubleFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestFactDoubleFunctionsFromSpreadsheet.class, "FactDoubleFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java
deleted file mode 100644
index 90300bf..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * Created on May 23, 2005
- *
- */
-package org.apache.poi.ss.formula.functions;
-
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- */
-public class TestFinanceLib extends AbstractNumericTestCase {
-
-    public void testFv() {
-        double f, r, y, p, x;
-        int n;
-        boolean t = false;
-        
-        r = 0; n = 3; y = 2; p = 7; t = true;
-        f = FinanceLib.fv(r, n, y, p, t);
-        x = -13;
-        assertEquals("fv ", x, f);
-        
-        r = 1; n = 10; y = 100; p = 10000; t = false;
-        f = FinanceLib.fv(r, n, y, p, t);
-        x = -10342300;
-        assertEquals("fv ", x, f);
-        
-        r = 1; n = 10; y = 100; p = 10000; t = true;
-        f = FinanceLib.fv(r, n, y, p, t);
-        x = -10444600;
-        assertEquals("fv ", x, f);
-        
-        r = 2; n = 12; y = 120; p = 12000; t = false;
-        f = FinanceLib.fv(r, n, y, p, t);
-        x = -6409178400d;
-        assertEquals("fv ", x, f);
-        
-        r = 2; n = 12; y = 120; p = 12000; t = true;
-        f = FinanceLib.fv(r, n, y, p, t);
-        x = -6472951200d;
-        assertEquals("fv ", x, f);
-        
-        // cross tests with pv
-        r = 2.95; n = 13; y = 13000; p = -4406.78544294496; t = false;
-        f = FinanceLib.fv(r, n, y, p, t);
-        x = 333891.230010986; // as returned by excel
-        assertEquals("fv ", x, f);
-        
-        r = 2.95; n = 13; y = 13000; p = -17406.7852148156; t = true;
-        f = FinanceLib.fv(r, n, y, p, t);
-        x = 333891.230102539; // as returned by excel
-        assertEquals("fv ", x, f);
-        
-    }
-    public void testNpv() {
-        double r, v[], npv, x;
-        
-        r = 1; v = new double[]{100, 200, 300, 400};
-        npv = FinanceLib.npv(r, v);
-        x = 162.5;
-        assertEquals("npv ", x, npv);
-        
-        r = 2.5; v = new double[]{1000, 666.66666, 333.33, 12.2768416};
-        npv = FinanceLib.npv(r, v);
-        x = 347.99232604144827;
-        assertEquals("npv ", x, npv);
-        
-        r = 12.33333; v = new double[]{1000, 0, -900, -7777.5765};
-        npv = FinanceLib.npv(r, v);
-        x = 74.3742433377061;
-        assertEquals("npv ", x, npv);
-        
-        r = 0.05; v = new double[]{200000, 300000.55, 400000, 1000000, 6000000, 7000000, -300000};
-        npv = FinanceLib.npv(r, v);
-        x = 11342283.4233124;
-        assertEquals("npv ", x, npv);
-    }
-    public void testPmt() {
-        double f, r, y, p, x;
-        int n;
-        boolean t = false;
-
-        r = 0; n = 3; p = 2; f = 7; t = true;
-        y = FinanceLib.pmt(r, n, p, f, t);
-        x = -3;
-        assertEquals("pmt ", x, y);    
-        
-        // cross check with pv
-        r = 1; n = 10; p = -109.66796875; f = 10000; t = false;
-        y = FinanceLib.pmt(r, n, p, f, t);
-        x = 100;
-        assertEquals("pmt ", x, y);    
-        
-        r = 1; n = 10; p = -209.5703125; f = 10000; t = true;
-        y = FinanceLib.pmt(r, n, p, f, t);
-        x = 100;
-        assertEquals("pmt ", x, y);
-        
-        // cross check with fv
-        r = 2; n = 12; f = -6409178400d; p = 12000; t = false;
-        y = FinanceLib.pmt(r, n, p, f, t);
-        x = 120;
-        assertEquals("pmt ", x, y);    
-        
-        r = 2; n = 12; f = -6472951200d; p = 12000; t = true;
-        y = FinanceLib.pmt(r, n, p, f, t);
-        x = 120;
-        assertEquals("pmt ", x, y);
-    }
-    
-    public void testPv() {
-        double f, r, y, p, x;
-        int n;
-        boolean t = false;
-
-        r = 0; n = 3; y = 2; f = 7; t = true;
-        f = FinanceLib.pv(r, n, y, f, t);
-        x = -13;
-        assertEquals("pv ", x, f);
-
-        r = 1; n = 10; y = 100; f = 10000; t = false;
-        p = FinanceLib.pv(r, n, y, f, t);
-        x = -109.66796875;
-        assertEquals("pv ", x, p);    
-        
-        r = 1; n = 10; y = 100; f = 10000; t = true;
-        p = FinanceLib.pv(r, n, y, f, t);
-        x = -209.5703125;
-        assertEquals("pv ", x, p);    
-        
-        r = 2.95; n = 13; y = 13000; f = 333891.23; t = false;
-        p = FinanceLib.pv(r, n, y, f, t);
-        x = -4406.78544294496;
-        assertEquals("pv ", x, p);
-        
-        r = 2.95; n = 13; y = 13000; f = 333891.23; t = true;
-        p = FinanceLib.pv(r, n, y, f, t);
-        x = -17406.7852148156;
-        assertEquals("pv ", x, p);
-        
-        // cross tests with fv
-        r = 2; n = 12; y = 120; f = -6409178400d; t = false;
-        p = FinanceLib.pv(r, n, y, f, t);
-        x = 12000;
-        assertEquals("pv ", x, p);
-        
-        r = 2; n = 12; y = 120; f = -6472951200d; t = true;
-        p = FinanceLib.pv(r, n, y, f, t);
-        x = 12000; 
-        assertEquals("pv ", x, p);
-        
-    }
-    
-    public void testNper() {
-        double f, r, y, p, x, n;
-        boolean t = false;
-        
-        r = 0; y = 7; p = 2; f = 3; t = false;
-        n = FinanceLib.nper(r, y, p, f, t);
-        x = -0.71428571429; // can you believe it? excel returns nper as a fraction!??
-        assertEquals("nper ", x, n);    
-        
-        // cross check with pv
-        r = 1; y = 100; p = -109.66796875; f = 10000; t = false;
-        n = FinanceLib.nper(r, y, p, f, t);
-        x = 10;
-        assertEquals("nper ", x, n);    
-        
-        r = 1; y = 100; p = -209.5703125; f = 10000; t = true;
-        n = FinanceLib.nper(r, y, p, f, t);
-        x = 10;
-        assertEquals("nper ", x, n);
-        
-        // cross check with fv
-        r = 2; y = 120; f = -6409178400d; p = 12000; t = false;
-        n = FinanceLib.nper(r, y, p, f, t);
-        x = 12;
-        assertEquals("nper ", x, n);    
-        
-        r = 2; y = 120; f = -6472951200d; p = 12000; t = true;
-        n = FinanceLib.nper(r, y, p, f, t);
-        x = 12; 
-        assertEquals("nper ", x, n);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
deleted file mode 100644
index 5ac75d6..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Test;
-
-/**
- * Tests for {@link Financed}
- */
-public final class TestFind {
-
-    @Test
-	public void testFind() throws IOException {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
-
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-		confirmResult(fe, cell, "find(\"h\", \"haystack\")", 1);
-		confirmResult(fe, cell, "find(\"a\", \"haystack\",2)", 2);
-		confirmResult(fe, cell, "find(\"a\", \"haystack\",3)", 6);
-
-		// number args converted to text
-		confirmResult(fe, cell, "find(7, 32768)", 3);
-		confirmResult(fe, cell, "find(\"34\", 1341235233412, 3)", 10);
-		confirmResult(fe, cell, "find(5, 87654)", 4);
-
-		// Errors
-		confirmError(fe, cell, "find(\"n\", \"haystack\")", FormulaError.VALUE);
-		confirmError(fe, cell, "find(\"k\", \"haystack\",9)", FormulaError.VALUE);
-		confirmError(fe, cell, "find(\"k\", \"haystack\",#REF!)", FormulaError.REF);
-		confirmError(fe, cell, "find(\"k\", \"haystack\",0)", FormulaError.VALUE);
-		confirmError(fe, cell, "find(#DIV/0!, #N/A, #REF!)", FormulaError.DIV0);
-		confirmError(fe, cell, "find(2, #N/A, #REF!)", FormulaError.NA);
-		
-		wb.close();
-	}
-
-	private static void confirmResult(HSSFFormulaEvaluator fe, HSSFCell cell, String formulaText,
-			int expectedResult) {
-		cell.setCellFormula(formulaText);
-		fe.notifyUpdateCell(cell);
-		CellValue result = fe.evaluate(cell);
-		assertEquals(result.getCellTypeEnum(), CellType.NUMERIC);
-		assertEquals(expectedResult, result.getNumberValue(), 0.0);
-	}
-
-	private static void confirmError(HSSFFormulaEvaluator fe, HSSFCell cell, String formulaText,
-			FormulaError expectedErrorCode) {
-		cell.setCellFormula(formulaText);
-		fe.notifyUpdateCell(cell);
-		CellValue result = fe.evaluate(cell);
-		assertEquals(result.getCellTypeEnum(), CellType.ERROR);
-		assertEquals(expectedErrorCode.getCode(), result.getErrorValue());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
deleted file mode 100644
index f6e1f38..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Before;
-import org.junit.Test;
-
-public final class TestFixed {
-
-    private HSSFCell cell11;
-    private HSSFFormulaEvaluator evaluator;
-
-    @Before
-    public void setUp() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        try {
-            HSSFSheet sheet = wb.createSheet("new sheet");
-            cell11 = sheet.createRow(0).createCell(0);
-            cell11.setCellType(CellType.FORMULA);
-            evaluator = new HSSFFormulaEvaluator(wb);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testValid() {
-        // thousands separator
-        confirm("FIXED(1234.56789,2,TRUE)", "1234.57");
-        confirm("FIXED(1234.56789,2,FALSE)", "1,234.57");
-        // rounding
-        confirm("FIXED(1.8,0,TRUE)", "2");
-        confirm("FIXED(1.2,0,TRUE)", "1");
-        confirm("FIXED(1.5,0,TRUE)", "2");
-        confirm("FIXED(1,0,TRUE)", "1");
-        // fractional digits
-        confirm("FIXED(1234.56789,7,TRUE)", "1234.5678900");
-        confirm("FIXED(1234.56789,0,TRUE)", "1235");
-        confirm("FIXED(1234.56789,-1,TRUE)", "1230");
-        // less than three arguments
-        confirm("FIXED(1234.56789)", "1,234.57");
-        confirm("FIXED(1234.56789,3)", "1,234.568");
-        // invalid arguments
-        confirmValueError("FIXED(\"invalid\")");
-        confirmValueError("FIXED(1,\"invalid\")");
-        confirmValueError("FIXED(1,2,\"invalid\")");
-        // strange arguments
-        confirm("FIXED(1000,2,8)", "1000.00");
-        confirm("FIXED(1000,2,0)", "1,000.00");
-        // corner cases
-        confirm("FIXED(1.23456789012345,15,TRUE)", "1.234567890123450");
-        // Seems POI accepts longer numbers than Excel does, excel trims the
-        // number to 15 digits and removes the "9" in the formula itself.
-        // Not the fault of FIXED though.
-        // confirm("FIXED(1.234567890123459,15,TRUE)", "1.234567890123450");
-        confirm("FIXED(60,-2,TRUE)", "100");
-        confirm("FIXED(10,-2,TRUE)", "0");
-        // rounding propagation
-        confirm("FIXED(99.9,0,TRUE)", "100");
-    }
-    
-    @Test
-    public void testOptionalParams() {
-        Fixed fixed = new Fixed();
-        ValueEval evaluate = fixed.evaluate(0, 0, new NumberEval(1234.56789));
-        assertTrue(evaluate instanceof StringEval);
-        assertEquals("1,234.57", ((StringEval)evaluate).getStringValue());
-        
-        evaluate = fixed.evaluate(0, 0, new NumberEval(1234.56789), new NumberEval(1));
-        assertTrue(evaluate instanceof StringEval);
-        assertEquals("1,234.6", ((StringEval)evaluate).getStringValue());
-
-        evaluate = fixed.evaluate(0, 0, new NumberEval(1234.56789), new NumberEval(1), BoolEval.TRUE);
-        assertTrue(evaluate instanceof StringEval);
-        assertEquals("1234.6", ((StringEval)evaluate).getStringValue());
-
-        evaluate = fixed.evaluate(new ValueEval[] {}, 1, 1);
-        assertTrue(evaluate instanceof ErrorEval);
-
-        evaluate = fixed.evaluate(new ValueEval[] { new NumberEval(1), new NumberEval(1), new NumberEval(1), new NumberEval(1) }, 1, 1);
-        assertTrue(evaluate instanceof ErrorEval);
-    }
-
-    private void confirm(String formulaText, String expectedResult) {
-        cell11.setCellFormula(formulaText);
-        evaluator.clearAllCachedResultValues();
-        CellValue cv = evaluator.evaluate(cell11);
-        assertEquals("Wrong result type: " + cv.formatAsString(), CellType.STRING, cv.getCellTypeEnum());
-        String actualValue = cv.getStringValue();
-        assertEquals(expectedResult, actualValue);
-    }
-    
-    private void confirmValueError(String formulaText) {
-        cell11.setCellFormula(formulaText);
-        evaluator.clearAllCachedResultValues();
-        CellValue cv = evaluator.evaluate(cell11);
-        assertTrue("Wrong result type: " + cv.formatAsString(), 
-                cv.getCellTypeEnum() == CellType.ERROR
-                && cv.getErrorValue() == FormulaError.VALUE.getCode());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
deleted file mode 100644
index a5efd75..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests FIXED() as loaded from a test data spreadsheet.
- */
-public class TestFixedFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestFixedFunctionsFromSpreadsheet.class, "57003-FixedFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
deleted file mode 100644
index b1bcb2f..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.IStabilityClassifier;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link Hex2Dec}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public final class TestHex2Dec extends TestCase {
-
-    private static ValueEval invokeValue(String number1) {
-		ValueEval[] args = new ValueEval[] { new StringEval(number1) };
-		return new Hex2Dec().evaluate(args, -1, -1);
-	}
-
-    private static void confirmValue(String msg, String number1, String expected) {
-		ValueEval result = invokeValue(number1);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(msg, expected, ((NumberEval) result).getStringValue());
-	}
-
-    private static void confirmValueError(String msg, String number1, ErrorEval numError) {
-        ValueEval result = invokeValue(number1);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-	public void testBasic() {
-		confirmValue("Converts hex 'A5' to decimal (165)", "A5", "165");
-		confirmValue("Converts hex FFFFFFFF5B to decimal (-165)", "FFFFFFFF5B", "-165");
-		confirmValue("Converts hex 3DA408B9 to decimal (-165)", "3DA408B9", "1034160313");
-	}
-
-    public void testErrors() {
-        confirmValueError("not a valid hex number","GGGGGGG", ErrorEval.NUM_ERROR);
-        confirmValueError("not a valid hex number","3.14159", ErrorEval.NUM_ERROR);
-    }
-
-    public void testEvalOperationEvaluationContext() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
-        ValueEval result = new Hex2Dec().evaluate(args, ctx);
-
-        assertEquals(NumberEval.class, result.getClass());
-        assertEquals("0", ((NumberEval) result).getStringValue());
-    }
-    
-    public void testEvalOperationEvaluationContextFails() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 0) };
-        ValueEval result = new Hex2Dec().evaluate(args, ctx);
-
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    private OperationEvaluationContext createContext() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet();
-        HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
-        WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook, new IStabilityClassifier() {
-            
-            @Override
-            public boolean isCellFinal(int sheetIndex, int rowIndex, int columnIndex) {
-                return true;
-            }
-        }, null);
-        OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, 
-                workbook, 0, 0, 0, null);
-        return ctx;
-    }
-
-    public void testRefs() {
-        OperationEvaluationContext ctx = createContext();
-        
-        ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
-        ValueEval result = new Hex2Dec().evaluate(args, -1, -1);
-
-        assertEquals(NumberEval.class, result.getClass());
-        assertEquals("0", ((NumberEval) result).getStringValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java
deleted file mode 100644
index 8ec8fbc..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import junit.framework.TestCase;
-
-/**
- * Test cases for IPMT()
- *
- */
-public final class TestIPMT extends TestCase {
-
-
-    /**
-     *  from http://office.microsoft.com/en-001/excel-help/ipmt-HP005209145.aspx
-     */
-    public void testFromFile() {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("finance.xls");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        HSSFSheet example1 = wb.getSheet("IPMT");
-        HSSFCell ex1cell1 = example1.getRow(6).getCell(0);
-        fe.evaluate(ex1cell1);
-        assertEquals(-22.41, ex1cell1.getNumericCellValue(), 0.1);
-
-        HSSFCell ex1cell2 = example1.getRow(7).getCell(0);
-        fe.evaluate(ex1cell2);
-        assertEquals(-292.45, ex1cell2.getNumericCellValue(), 0.1);
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
deleted file mode 100644
index db98cff..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests ImReal() as loaded from a test data spreadsheet.<p/>
- */
-public class TestImRealFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestImRealFunctionsFromSpreadsheet.class, "ImRealFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
deleted file mode 100644
index 9693025..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests Imaginary() as loaded from a test data spreadsheet.<p/>
- */
-public class TestImaginaryFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestImaginaryFunctionsFromSpreadsheet.class, "ImaginaryFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java
deleted file mode 100644
index ce03252..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Arrays;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.MissingArgEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.WorkbookEvaluator;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * Tests for the INDEX() function.</p>
- *
- * This class contains just a few specific cases that directly invoke {@link Index},
- * with minimum overhead.<br/>
- * Another test: {@link TestIndexFunctionFromSpreadsheet} operates from a higher level
- * and has far greater coverage of input permutations.<br/>
- *
- * @author Josh Micich
- */
-public final class TestIndex extends TestCase {
-
-	private static final Index FUNC_INST = new Index();
-	private static final double[] TEST_VALUES0 = {
-			1, 2,
-			3, 4,
-			5, 6,
-			7, 8,
-			9, 10,
-			11, 12,
-	};
-
-	/**
-	 * For the case when the first argument to INDEX() is an area reference
-	 */
-	public void testEvaluateAreaReference() {
-
-		double[] values = TEST_VALUES0;
-		confirmAreaEval("C1:D6", values, 4, 1, 7);
-		confirmAreaEval("C1:D6", values, 6, 2, 12);
-		confirmAreaEval("C1:D6", values, 3, 1, 5);
-
-		// now treat same data as 3 columns, 4 rows
-		confirmAreaEval("C10:E13", values, 2, 2, 5);
-		confirmAreaEval("C10:E13", values, 4, 1, 10);
-	}
-
-	/**
-	 * @param areaRefString in Excel notation e.g. 'D2:E97'
-	 * @param dValues array of evaluated values for the area reference
-	 * @param rowNum 1-based
-	 * @param colNum 1-based, pass -1 to signify argument not present
-	 */
-	private static void confirmAreaEval(String areaRefString, double[] dValues,
-			int rowNum, int colNum, double expectedResult) {
-		ValueEval[] values = new ValueEval[dValues.length];
-		for (int i = 0; i < values.length; i++) {
-			values[i] = new NumberEval(dValues[i]);
-		}
-		AreaEval arg0 = EvalFactory.createAreaEval(areaRefString, values);
-
-		ValueEval[] args;
-		if (colNum > 0) {
-			args = new ValueEval[] { arg0, new NumberEval(rowNum), new NumberEval(colNum), };
-		} else {
-			args = new ValueEval[] { arg0, new NumberEval(rowNum), };
-		}
-
-		double actual = invokeAndDereference(args);
-		assertEquals(expectedResult, actual, 0D);
-	}
-
-	private static double invokeAndDereference(ValueEval[] args) {
-		ValueEval ve = FUNC_INST.evaluate(args, -1, -1);
-		ve = WorkbookEvaluator.dereferenceResult(ve, -1, -1);
-		assertEquals(NumberEval.class, ve.getClass());
-		return ((NumberEval)ve).getNumberValue();
-	}
-
-	/**
-	 * Tests expressions like "INDEX(A1:C1,,2)".<br/>
-	 * This problem was found while fixing bug 47048 and is observable up to svn r773441.
-	 */
-	public void testMissingArg() {
-		ValueEval[] values = {
-				new NumberEval(25.0),
-				new NumberEval(26.0),
-				new NumberEval(28.0),
-		};
-		AreaEval arg0 = EvalFactory.createAreaEval("A10:C10", values);
-		ValueEval[] args = new ValueEval[] { arg0, MissingArgEval.instance, new NumberEval(2), };
-		ValueEval actualResult;
-		try {
-			actualResult = FUNC_INST.evaluate(args, -1, -1);
-		} catch (RuntimeException e) {
-			if (e.getMessage().equals("Unexpected arg eval type (org.apache.poi.hssf.record.formula.eval.MissingArgEval")) {
-				throw new AssertionFailedError("Identified bug 47048b - INDEX() should support missing-arg");
-			}
-			throw e;
-		}
-		// result should be an area eval "B10:B10"
-		AreaEval ae = confirmAreaEval("B10:B10", actualResult);
-		actualResult = ae.getValue(0, 0);
-		assertEquals(NumberEval.class, actualResult.getClass());
-		assertEquals(26.0, ((NumberEval)actualResult).getNumberValue(), 0.0);
-	}
-
-	/**
-	 * When the argument to INDEX is a reference, the result should be a reference
-	 * A formula like "OFFSET(INDEX(A1:B2,2,1),1,1,1,1)" should return the value of cell B3.
-	 * This works because the INDEX() function returns a reference to A2 (not the value of A2)
-	 */
-	public void testReferenceResult() {
-		ValueEval[] values = new ValueEval[4];
-		Arrays.fill(values, NumberEval.ZERO);
-		AreaEval arg0 = EvalFactory.createAreaEval("A1:B2", values);
-		ValueEval[] args = new ValueEval[] { arg0, new NumberEval(2), new NumberEval(1), };
-		ValueEval ve = FUNC_INST.evaluate(args, -1, -1);
-		confirmAreaEval("A2:A2", ve);
-	}
-
-	/**
-	 * Confirms that the result is an area ref with the specified coordinates
-	 * @return <tt>ve</tt> cast to {@link AreaEval} if it is valid
-	 */
-	private static AreaEval confirmAreaEval(String refText, ValueEval ve) {
-		CellRangeAddress cra = CellRangeAddress.valueOf(refText);
-		assertTrue(ve instanceof AreaEval);
-		AreaEval ae = (AreaEval) ve;
-		assertEquals(cra.getFirstRow(), ae.getFirstRow());
-		assertEquals(cra.getFirstColumn(), ae.getFirstColumn());
-		assertEquals(cra.getLastRow(), ae.getLastRow());
-		assertEquals(cra.getLastColumn(), ae.getLastColumn());
-		return ae;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
deleted file mode 100644
index 0370b62..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests INDEX() as loaded from a test data spreadsheet.<p/>
- */
-public final class TestIndexFunctionFromSpreadsheet  extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestIndexFunctionFromSpreadsheet.class, "IndexFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
deleted file mode 100644
index 99d370b..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFName;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.junit.Test;
-
-/**
- * Tests for the INDIRECT() function.</p>
- */
-public final class TestIndirect {
-    // convenient access to namespace
-    // private static final ErrorEval EE = null;
-
-    private static void createDataRow(HSSFSheet sheet, int rowIndex, double... vals) {
-        HSSFRow row = sheet.createRow(rowIndex);
-        for (int i = 0; i < vals.length; i++) {
-            row.createCell(i).setCellValue(vals[i]);
-        }
-    }
-
-    private static HSSFWorkbook createWBA() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("Sheet1");
-        HSSFSheet sheet2 = wb.createSheet("Sheet2");
-        HSSFSheet sheet3 = wb.createSheet("John's sales");
-
-        createDataRow(sheet1, 0, 11, 12, 13, 14);
-        createDataRow(sheet1, 1, 21, 22, 23, 24);
-        createDataRow(sheet1, 2, 31, 32, 33, 34);
-
-        createDataRow(sheet2, 0, 50, 55, 60, 65);
-        createDataRow(sheet2, 1, 51, 56, 61, 66);
-        createDataRow(sheet2, 2, 52, 57, 62, 67);
-
-        createDataRow(sheet3, 0, 30, 31, 32);
-        createDataRow(sheet3, 1, 33, 34, 35);
-
-        HSSFName name1 = wb.createName();
-        name1.setNameName("sales1");
-        name1.setRefersToFormula("Sheet1!A1:D1");
-
-        HSSFName name2 = wb.createName();
-        name2.setNameName("sales2");
-        name2.setRefersToFormula("Sheet2!B1:C3");
-
-        HSSFRow row = sheet1.createRow(3);
-        row.createCell(0).setCellValue("sales1");  //A4
-        row.createCell(1).setCellValue("sales2");  //B4
-
-        return wb;
-    }
-
-    private static HSSFWorkbook createWBB() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("Sheet1");
-        HSSFSheet sheet2 = wb.createSheet("Sheet2");
-        HSSFSheet sheet3 = wb.createSheet("## Look here!");
-
-        createDataRow(sheet1, 0, 400, 440, 480, 520);
-        createDataRow(sheet1, 1, 420, 460, 500, 540);
-
-        createDataRow(sheet2, 0, 50, 55, 60, 65);
-        createDataRow(sheet2, 1, 51, 56, 61, 66);
-
-        createDataRow(sheet3, 0, 42);
-
-        return wb;
-    }
-
-    @Test
-    public void testBasic() throws Exception {
-
-        HSSFWorkbook wbA = createWBA();
-        HSSFCell c = wbA.getSheetAt(0).createRow(5).createCell(2);
-        HSSFFormulaEvaluator feA = new HSSFFormulaEvaluator(wbA);
-
-        // non-error cases
-        confirm(feA, c, "INDIRECT(\"C2\")", 23);
-        confirm(feA, c, "INDIRECT(\"C2\", TRUE)", 23);
-        confirm(feA, c, "INDIRECT(\"$C2\")", 23);
-        confirm(feA, c, "INDIRECT(\"C$2\")", 23);
-        confirm(feA, c, "SUM(INDIRECT(\"Sheet2!B1:C3\"))", 351); // area ref
-        confirm(feA, c, "SUM(INDIRECT(\"Sheet2! B1 : C3 \"))", 351); // spaces in area ref
-        confirm(feA, c, "SUM(INDIRECT(\"'John''s sales'!A1:C1\"))", 93); // special chars in sheet name
-        confirm(feA, c, "INDIRECT(\"'Sheet1'!B3\")", 32); // redundant sheet name quotes
-        confirm(feA, c, "INDIRECT(\"sHeet1!B3\")", 32); // case-insensitive sheet name
-        confirm(feA, c, "INDIRECT(\" D3 \")", 34); // spaces around cell ref
-        confirm(feA, c, "INDIRECT(\"Sheet1! D3 \")", 34); // spaces around cell ref
-        confirm(feA, c, "INDIRECT(\"A1\", TRUE)", 11); // explicit arg1. only TRUE supported so far
-
-        confirm(feA, c, "INDIRECT(\"A1:G1\")", 13); // de-reference area ref (note formula is in C4)
-
-        confirm(feA, c, "SUM(INDIRECT(A4))", 50); // indirect defined name
-        confirm(feA, c, "SUM(INDIRECT(B4))", 351); // indirect defined name pointinh to other sheet
-
-        // simple error propagation:
-
-        // arg0 is evaluated to text first
-        confirm(feA, c, "INDIRECT(#DIV/0!)", ErrorEval.DIV_ZERO);
-        confirm(feA, c, "INDIRECT(#DIV/0!)", ErrorEval.DIV_ZERO);
-        confirm(feA, c, "INDIRECT(#NAME?, \"x\")", ErrorEval.NAME_INVALID);
-        confirm(feA, c, "INDIRECT(#NUM!, #N/A)", ErrorEval.NUM_ERROR);
-
-        // arg1 is evaluated to boolean before arg0 is decoded
-        confirm(feA, c, "INDIRECT(\"garbage\", #N/A)", ErrorEval.NA);
-        confirm(feA, c, "INDIRECT(\"garbage\", \"\")", ErrorEval.VALUE_INVALID); // empty string is not valid boolean
-        confirm(feA, c, "INDIRECT(\"garbage\", \"flase\")", ErrorEval.VALUE_INVALID); // must be "TRUE" or "FALSE"
-
-
-        // spaces around sheet name (with or without quotes makes no difference)
-        confirm(feA, c, "INDIRECT(\"'Sheet1 '!D3\")", ErrorEval.REF_INVALID);
-        confirm(feA, c, "INDIRECT(\" Sheet1!D3\")", ErrorEval.REF_INVALID);
-        confirm(feA, c, "INDIRECT(\"'Sheet1' !D3\")", ErrorEval.REF_INVALID);
-
-
-        confirm(feA, c, "SUM(INDIRECT(\"'John's sales'!A1:C1\"))", ErrorEval.REF_INVALID); // bad quote escaping
-        confirm(feA, c, "INDIRECT(\"[Book1]Sheet1!A1\")", ErrorEval.REF_INVALID); // unknown external workbook
-        confirm(feA, c, "INDIRECT(\"Sheet3!A1\")", ErrorEval.REF_INVALID); // unknown sheet
-//        if (false) { // TODO - support evaluation of defined names
-//            confirm(feA, c, "INDIRECT(\"Sheet1!IW1\")", ErrorEval.REF_INVALID); // bad column
-//            confirm(feA, c, "INDIRECT(\"Sheet1!A65537\")", ErrorEval.REF_INVALID); // bad row
-//        }
-        confirm(feA, c, "INDIRECT(\"Sheet1!A 1\")", ErrorEval.REF_INVALID); // space in cell ref
-
-        wbA.close();
-    }
-
-    @Test
-    public void testMultipleWorkbooks() throws Exception {
-        HSSFWorkbook wbA = createWBA();
-        HSSFCell cellA = wbA.getSheetAt(0).createRow(10).createCell(0);
-        HSSFFormulaEvaluator feA = new HSSFFormulaEvaluator(wbA);
-
-        HSSFWorkbook wbB = createWBB();
-        HSSFCell cellB = wbB.getSheetAt(0).createRow(10).createCell(0);
-        HSSFFormulaEvaluator feB = new HSSFFormulaEvaluator(wbB);
-
-        String[] workbookNames = { "MyBook", "Figures for January", };
-        HSSFFormulaEvaluator[] evaluators = { feA, feB, };
-        HSSFFormulaEvaluator.setupEnvironment(workbookNames, evaluators);
-
-        confirm(feB, cellB, "INDIRECT(\"'[Figures for January]## Look here!'!A1\")", 42); // same wb
-        confirm(feA, cellA, "INDIRECT(\"'[Figures for January]## Look here!'!A1\")", 42); // across workbooks
-
-        // 2 level recursion
-        confirm(feB, cellB, "INDIRECT(\"[MyBook]Sheet2!A1\")", 50); // set up (and check) first level
-        confirm(feA, cellA, "INDIRECT(\"'[Figures for January]Sheet1'!A11\")", 50); // points to cellB
-        
-        wbB.close();
-        wbA.close();
-    }
-
-    private static void confirm(FormulaEvaluator fe, Cell cell, String formula,
-            double expectedResult) {
-        fe.clearAllCachedResultValues();
-        cell.setCellFormula(formula);
-        CellValue cv = fe.evaluate(cell);
-        if (cv.getCellTypeEnum() != CellType.NUMERIC) {
-            fail("expected numeric cell type but got " + cv.formatAsString());
-        }
-        assertEquals(expectedResult, cv.getNumberValue(), 0.0);
-    }
-    
-    private static void confirm(FormulaEvaluator fe, Cell cell, String formula,
-            ErrorEval expectedResult) {
-        fe.clearAllCachedResultValues();
-        cell.setCellFormula(formula);
-        CellValue cv = fe.evaluate(cell);
-        if (cv.getCellTypeEnum() != CellType.ERROR) {
-            fail("expected error cell type but got " + cv.formatAsString());
-        }
-        int expCode = expectedResult.getErrorCode();
-        if (cv.getErrorValue() != expCode) {
-            fail("Expected error '" + ErrorEval.getText(expCode)
-                    + "' but got '" + cv.formatAsString() + "'.");
-        }
-    }
-
-    @Test
-    public void testInvalidInput() {
-        assertEquals(ErrorEval.VALUE_INVALID, Indirect.instance.evaluate(new ValueEval[] {}, null));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
deleted file mode 100644
index c475ef5..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests INDIRECT() as loaded from a test data spreadsheet.<p/>
- *
- * Tests for bug fixes and specific/tricky behaviour can be found in the corresponding test class
- * (<tt>TestXxxx</tt>) of the target (<tt>Xxxx</tt>) implementor, where execution can be observed
- *  more easily.
- */
-public final class TestIndirectFunctionFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestIndirectFunctionFromSpreadsheet.class, "IndirectFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java
deleted file mode 100644
index 34b6d85..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Test for Excel function INTERCEPT()
- *
- * @author Johan Karlsteen
- */
-public final class TestIntercept extends TestCase {
-	private static final Function INTERCEPT = new Intercept();
-
-	private static ValueEval invoke(Function function, ValueEval xArray, ValueEval yArray) {
-		ValueEval[] args = new ValueEval[] { xArray, yArray, };
-		return function.evaluate(args, -1, (short)-1);
-	}
-
-	private void confirm(Function function, ValueEval xArray, ValueEval yArray, double expected) {
-		ValueEval result = invoke(function, xArray, yArray);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval)result).getNumberValue(), 0);
-	}
-	private void confirmError(Function function, ValueEval xArray, ValueEval yArray, ErrorEval expectedError) {
-		ValueEval result = invoke(function, xArray, yArray);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(expectedError.getErrorCode(), ((ErrorEval)result).getErrorCode());
-	}
-
-	private void confirmError(ValueEval xArray, ValueEval yArray, ErrorEval expectedError) {
-		confirmError(INTERCEPT, xArray, yArray, expectedError);
-	}
-
-	public void testBasic() {
-		Double exp = Math.pow(10, 7.5);
-		ValueEval[] yValues = {
-			new NumberEval(3+exp),
-			new NumberEval(4+exp),
-			new NumberEval(2+exp),
-			new NumberEval(5+exp),
-			new NumberEval(4+exp),
-			new NumberEval(7+exp),
-		};
-		ValueEval areaEvalY = createAreaEval(yValues);
-
-		ValueEval[] xValues = {
-			new NumberEval(1),
-			new NumberEval(2),
-			new NumberEval(3),
-			new NumberEval(4),
-			new NumberEval(5),
-			new NumberEval(6),
-		};
-		ValueEval areaEvalX = createAreaEval(xValues);
-		confirm(INTERCEPT, areaEvalX, areaEvalY, -24516534.39905822);
-		// Excel 2010 gives -24516534.3990583
-	}
-
-	/**
-	 * number of items in array is not limited to 30
-	 */
-	public void testLargeArrays() {
-		ValueEval[] yValues = createMockNumberArray(100, 3); // [1,2,0,1,2,0,...,0,1]
-		yValues[0] = new NumberEval(2.0); // Changes first element to 2
-		ValueEval[] xValues = createMockNumberArray(100, 101); // [1,2,3,4,...,99,100]
-
-		confirm(INTERCEPT, createAreaEval(xValues), createAreaEval(yValues), 51.74384236453202);
-		// Excel 2010 gives 51.74384236453200
-	}
-
-	private ValueEval[] createMockNumberArray(int size, double value) {
-		ValueEval[] result = new ValueEval[size];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new NumberEval((i+1)%value);
-		}
-		return result;
-	}
-
-	private static ValueEval createAreaEval(ValueEval[] values) {
-		String refStr = "A1:A" + values.length;
-		return EvalFactory.createAreaEval(refStr, values);
-	}
-
-	public void testErrors() {
-		ValueEval[] xValues = {
-				ErrorEval.REF_INVALID,
-				new NumberEval(2),
-		};
-		ValueEval areaEvalX = createAreaEval(xValues);
-		ValueEval[] yValues = {
-				new NumberEval(2),
-				ErrorEval.NULL_INTERSECTION,
-		};
-		ValueEval areaEvalY = createAreaEval(yValues);
-		ValueEval[] zValues = { // wrong size
-				new NumberEval(2),
-		};
-		ValueEval areaEvalZ = createAreaEval(zValues);
-
-		// if either arg is an error, that error propagates
-		confirmError(ErrorEval.REF_INVALID, ErrorEval.NAME_INVALID, ErrorEval.REF_INVALID);
-		confirmError(areaEvalX, ErrorEval.NAME_INVALID, ErrorEval.NAME_INVALID);
-		confirmError(ErrorEval.NAME_INVALID, areaEvalX, ErrorEval.NAME_INVALID);
-
-		// array sizes must match
-		confirmError(areaEvalX, areaEvalZ, ErrorEval.NA);
-		confirmError(areaEvalZ, areaEvalY, ErrorEval.NA);
-
-		// any error in an array item propagates up
-		confirmError(areaEvalX, areaEvalX, ErrorEval.REF_INVALID);
-
-		// search for errors array by array, not pair by pair
-		confirmError(areaEvalX, areaEvalY, ErrorEval.NULL_INTERSECTION);
-		confirmError(areaEvalY, areaEvalX, ErrorEval.REF_INVALID);
-	}
-
-    /**
-     *  Example from
-     *  http://office.microsoft.com/en-us/excel-help/intercept-function-HP010062512.aspx?CTT=5&origin=HA010277524
-     */
-    public void testFromFile() {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("intercept.xls");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        HSSFSheet example1 = wb.getSheet("Example 1");
-        HSSFCell a8 = example1.getRow(7).getCell(0);
-        assertEquals("INTERCEPT(A2:A6,B2:B6)", a8.getCellFormula());
-        fe.evaluate(a8);
-        assertEquals(0.048387097, a8.getNumericCellValue(), 0.000000001);
-
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
deleted file mode 100644
index 40fac0d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link Irr}
- *
- * @author Marcel May
- */
-public final class TestIrr extends TestCase {
-
-    public void testIrr() {
-        // http://en.wikipedia.org/wiki/Internal_rate_of_return#Example
-        double[] incomes = {-4000d, 1200d, 1410d, 1875d, 1050d};
-        double irr = Irr.irr(incomes);
-        double irrRounded = Math.round(irr * 1000d) / 1000d;
-        assertEquals("irr", 0.143d, irrRounded);
-
-        // http://www.techonthenet.com/excel/formulas/irr.php
-        incomes = new double[]{-7500d, 3000d, 5000d, 1200d, 4000d};
-        irr = Irr.irr(incomes);
-        irrRounded = Math.round(irr * 100d) / 100d;
-        assertEquals("irr", 0.28d, irrRounded);
-
-        incomes = new double[]{-10000d, 3400d, 6500d, 1000d};
-        irr = Irr.irr(incomes);
-        irrRounded = Math.round(irr * 100d) / 100d;
-        assertEquals("irr", 0.05, irrRounded);
-
-        incomes = new double[]{100d, -10d, -110d};
-        irr = Irr.irr(incomes);
-        irrRounded = Math.round(irr * 100d) / 100d;
-        assertEquals("irr", 0.1, irrRounded);
-
-        incomes = new double[]{-70000d, 12000, 15000};
-        irr = Irr.irr(incomes, -0.1);
-        irrRounded = Math.round(irr * 100d) / 100d;
-        assertEquals("irr", -0.44, irrRounded);
-    }
-
-    public void testEvaluateInSheet() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFRow row = sheet.createRow(0);
-
-        row.createCell(0).setCellValue(-4000d);
-        row.createCell(1).setCellValue(1200d);
-        row.createCell(2).setCellValue(1410d);
-        row.createCell(3).setCellValue(1875d);
-        row.createCell(4).setCellValue(1050d);
-
-        HSSFCell cell = row.createCell(5);
-        cell.setCellFormula("IRR(A1:E1)");
-
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cell);
-        double res = cell.getNumericCellValue();
-        assertEquals(0.143d, Math.round(res * 1000d) / 1000d);
-    }
-
-    public void testIrrFromSpreadsheet(){
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("IrrNpvTestCaseData.xls");
-        HSSFSheet sheet = wb.getSheet("IRR-NPV");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        StringBuffer failures = new StringBuffer();
-        int failureCount = 0;
-        // TODO YK: Formulas in rows 16 and 17 operate with ArrayPtg which isn't yet supported
-        // FormulaEvaluator as of r1041407 throws "Unexpected ptg class (org.apache.poi.ss.formula.ptg.ArrayPtg)"
-        for(int rownum = 9; rownum <= 15; rownum++){
-            HSSFRow row = sheet.getRow(rownum);
-            HSSFCell cellA = row.getCell(0);
-            try {
-                CellValue cv = fe.evaluate(cellA);
-                assertFormulaResult(cv, cellA);
-            } catch (Throwable e){
-                if(failures.length() > 0) failures.append('\n');
-                failures.append("Row[" + (cellA.getRowIndex() + 1)+ "]: " + cellA.getCellFormula() + " ");
-                failures.append(e.getMessage());
-                failureCount++;
-            }
-
-            HSSFCell cellC = row.getCell(2); //IRR-NPV relationship: NPV(IRR(values), values) = 0
-            try {
-                CellValue cv = fe.evaluate(cellC);
-                assertEquals(0, cv.getNumberValue(), 0.0001);  // should agree within 0.01%
-            } catch (Throwable e){
-                if(failures.length() > 0) failures.append('\n');
-                failures.append("Row[" + (cellC.getRowIndex() + 1)+ "]: " + cellC.getCellFormula() + " ");
-                failures.append(e.getMessage());
-                failureCount++;
-            }
-        }
-
-        if(failures.length() > 0) {
-            throw new AssertionFailedError(failureCount + " IRR assertions failed:\n" + failures.toString());
-        }
-
-    }
-
-    private static void assertFormulaResult(CellValue cv, HSSFCell cell){
-        double actualValue = cv.getNumberValue();
-        double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel
-        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellTypeEnum());
-        assertEquals(expectedValue, actualValue, 1E-4); // should agree within 0.01%
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
deleted file mode 100644
index e723711..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import junit.framework.TestCase;
-/**
- * Tests for Excel function ISBLANK()
- * 
- * @author Josh Micich
- */
-public final class TestIsBlank extends TestCase {
-
-	public void test3DArea() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet();
-        wb.setSheetName(0, "Sheet1");
-        wb.createSheet();
-        wb.setSheetName(1, "Sheet2");
-        HSSFRow row = sheet1.createRow(0);
-        HSSFCell cell = row.createCell(0);
-
-         
-        cell.setCellFormula("isblank(Sheet2!A1:A1)");
-        
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        CellValue result = fe.evaluate(cell);
-        assertEquals(CellType.BOOLEAN, result.getCellTypeEnum());
-        assertEquals(true, result.getBooleanValue());
-        
-        cell.setCellFormula("isblank(D7:D7)");
-        
-        result = fe.evaluate(cell);
-        assertEquals(CellType.BOOLEAN, result.getCellTypeEnum());
-        assertEquals(true, result.getBooleanValue());
-   }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java
deleted file mode 100644
index 58160bd..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-import junit.framework.TestCase;
-
-/**
- * 
- * Test cases for {@link TextFunction#LEFT} and {@link TextFunction#RIGHT}
- * 
- * @author Brendan Nolan
- *
- */
-public class TestLeftRight extends TestCase {
-
-	private static final NumberEval NEGATIVE_OPERAND = new NumberEval(-1.0);
-	private static final StringEval ANY_STRING_VALUE = new StringEval("ANYSTRINGVALUE");
-
-	
-	private static ValueEval invokeLeft(ValueEval text, ValueEval operand) {
-		ValueEval[] args = new ValueEval[] { text, operand };
-		return TextFunction.LEFT.evaluate(args, -1, (short)-1);
-	}
-	
-	private static ValueEval invokeRight(ValueEval text, ValueEval operand) {
-		ValueEval[] args = new ValueEval[] { text, operand };
-		return TextFunction.RIGHT.evaluate(args, -1, (short)-1);
-	}
-	
-	public void testLeftRight_bug49841() {
-
-		try {
-			invokeLeft(ANY_STRING_VALUE, NEGATIVE_OPERAND);
-			invokeRight(ANY_STRING_VALUE, NEGATIVE_OPERAND);
-		} catch (StringIndexOutOfBoundsException e) {
-			fail("Identified bug 49841");
-		}
-
-	}
-	
-	public void testLeftRightNegativeOperand() {
-		
-		assertEquals(ErrorEval.VALUE_INVALID, invokeRight(ANY_STRING_VALUE, NEGATIVE_OPERAND));		
-		assertEquals(ErrorEval.VALUE_INVALID, invokeLeft(ANY_STRING_VALUE, NEGATIVE_OPERAND));
-
-	}
-	
-	
-	
-	
-
-	
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java
deleted file mode 100644
index a9a3d4c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Tests for Excel function LEN()
- *
- * @author Josh Micich
- */
-public final class TestLen extends TestCase {
-
-	private static ValueEval invokeLen(ValueEval text) {
-		ValueEval[] args = new ValueEval[] { text, };
-		return TextFunction.LEN.evaluate(args, -1, (short)-1);
-	}
-
-	private void confirmLen(ValueEval text, int expected) {
-		ValueEval result = invokeLen(text);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval)result).getNumberValue(), 0);
-	}
-
-	private void confirmLen(ValueEval text, ErrorEval expectedError) {
-		ValueEval result = invokeLen(text);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(expectedError.getErrorCode(), ((ErrorEval)result).getErrorCode());
-	}
-
-	public void testBasic() {
-
-		confirmLen(new StringEval("galactic"), 8);
-	}
-
-	/**
-	 * Valid cases where text arg is not exactly a string
-	 */
-	public void testUnusualArgs() {
-
-		// text (first) arg type is number, other args are strings with fractional digits
-		confirmLen(new NumberEval(123456), 6);
-		confirmLen(BoolEval.FALSE, 5);
-		confirmLen(BoolEval.TRUE, 4);
-		confirmLen(BlankEval.instance, 0);
-	}
-
-	public void testErrors() {
-		confirmLen(ErrorEval.NAME_INVALID, ErrorEval.NAME_INVALID);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
deleted file mode 100644
index 52b72df..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellReference;
-
-import junit.framework.TestCase;
-
-/**
- * LogicalFunction unit tests.
- */
-public class TestLogicalFunction extends TestCase {
-
-    private FormulaEvaluator evaluator;
-    private Row row3;
-    private Cell cell1;
-    private Cell cell2;
-
-    @Override
-    public void setUp() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        try {
-            buildWorkbook(wb);
-        } finally {
-            wb.close();
-        }
-    }
-
-    private void buildWorkbook(Workbook wb) {
-        Sheet sh = wb.createSheet();
-        Row row1 = sh.createRow(0);
-        Row row2 = sh.createRow(1);
-        row3 = sh.createRow(2);
-
-        row1.createCell(0, CellType.NUMERIC);
-        row1.createCell(1, CellType.NUMERIC);
-
-        row2.createCell(0, CellType.NUMERIC);
-        row2.createCell(1, CellType.NUMERIC);
-
-        row3.createCell(0);
-        row3.createCell(1);
-
-        CellReference a1 = new CellReference("A1");
-        CellReference a2 = new CellReference("A2");
-        CellReference b1 = new CellReference("B1");
-        CellReference b2 = new CellReference("B2");
-
-        sh.getRow(a1.getRow()).getCell(a1.getCol()).setCellValue(35);
-        sh.getRow(a2.getRow()).getCell(a2.getCol()).setCellValue(0);
-        sh.getRow(b1.getRow()).getCell(b1.getCol()).setCellFormula("A1/A2");
-        sh.getRow(b2.getRow()).getCell(b2.getCol()).setCellFormula("NA()");
-
-        evaluator = wb.getCreationHelper().createFormulaEvaluator();
-    }
-
-    public void testIsErr() {
-        cell1 = row3.createCell(0);
-        cell1.setCellFormula("ISERR(B1)"); // produces #DIV/0!
-        cell2 = row3.createCell(1);
-        cell2.setCellFormula("ISERR(B2)"); // produces #N/A
-
-        CellValue cell1Value = evaluator.evaluate(cell1);
-        CellValue cell2Value = evaluator.evaluate(cell2);
-
-        assertEquals(true, cell1Value.getBooleanValue());
-        assertEquals(false, cell2Value.getBooleanValue());
-    }
-
-    public void testIsError() {
-        cell1 = row3.createCell(0);
-        cell1.setCellFormula("ISERROR(B1)"); // produces #DIV/0!
-        cell2 = row3.createCell(1);
-        cell2.setCellFormula("ISERROR(B2)"); // produces #N/A
-
-        CellValue cell1Value = evaluator.evaluate(cell1);
-        CellValue cell2Value = evaluator.evaluate(cell2);
-
-        assertEquals(true, cell1Value.getBooleanValue());
-        assertEquals(true, cell2Value.getBooleanValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
deleted file mode 100644
index 6d95561..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests lookup functions (VLOOKUP, HLOOKUP, LOOKUP, MATCH) as loaded from a test data spreadsheet.<p/>
- * These tests have been separated from the common function and operator tests because the lookup
- * functions have more complex test cases and test data setup.
- *
- * Tests for bug fixes and specific/tricky behaviour can be found in the corresponding test class
- * (<tt>TestXxxx</tt>) of the target (<tt>Xxxx</tt>) implementor, where execution can be observed
- *  more easily.
- */
-public final class TestLookupFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestLookupFunctionsFromSpreadsheet.class, "LookupFunctionsTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
deleted file mode 100644
index 40731e2..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-import junit.framework.TestCase;
-
-/**
- * Test cases for MATCH()
- */
-public final class TestMatch extends TestCase {
-	/** less than or equal to */
-	private static final NumberEval MATCH_LARGEST_LTE = new NumberEval(1);
-	private static final NumberEval MATCH_EXACT = new NumberEval(0);
-	/** greater than or equal to */
-	private static final NumberEval MATCH_SMALLEST_GTE = new NumberEval(-1);
-
-    private static final StringEval MATCH_INVALID = new StringEval("blabla");
-
-	private static ValueEval invokeMatch(ValueEval lookup_value, ValueEval lookup_array, ValueEval match_type) {
-		ValueEval[] args = { lookup_value, lookup_array, match_type, };
-		return new Match().evaluate(args, -1, (short)-1);
-	}
-
-    private static ValueEval invokeMatch(ValueEval lookup_value, ValueEval lookup_array) {
-        ValueEval[] args = { lookup_value, lookup_array, };
-        return new Match().evaluate(args, -1, (short)-1);
-    }
-
-    private static void confirmInt(int expected, ValueEval actualEval) {
-		if(!(actualEval instanceof NumericValueEval)) {
-			fail("Expected numeric result but had " + actualEval);
-		}
-		NumericValueEval nve = (NumericValueEval)actualEval;
-		assertEquals(expected, nve.getNumberValue(), 0);
-	}
-
-	public void testSimpleNumber() {
-
-		ValueEval[] values = {
-			new NumberEval(4),
-			new NumberEval(5),
-			new NumberEval(10),
-			new NumberEval(10),
-			new NumberEval(25),
-		};
-
-		AreaEval ae = EvalFactory.createAreaEval("A1:A5", values);
-
-		confirmInt(2, invokeMatch(new NumberEval(5), ae, MATCH_LARGEST_LTE));
-        confirmInt(2, invokeMatch(new NumberEval(5), ae));
-		confirmInt(2, invokeMatch(new NumberEval(5), ae, MATCH_EXACT));
-		confirmInt(4, invokeMatch(new NumberEval(10), ae, MATCH_LARGEST_LTE));
-		confirmInt(3, invokeMatch(new NumberEval(10), ae, MATCH_EXACT));
-		confirmInt(4, invokeMatch(new NumberEval(20), ae, MATCH_LARGEST_LTE));
-		assertEquals(ErrorEval.NA, invokeMatch(new NumberEval(20), ae, MATCH_EXACT));
-	}
-
-	public void testReversedNumber() {
-
-		ValueEval[] values = {
-			new NumberEval(25),
-			new NumberEval(10),
-			new NumberEval(10),
-			new NumberEval(10),
-			new NumberEval(4),
-		};
-
-		AreaEval ae = EvalFactory.createAreaEval("A1:A5", values);
-
-		confirmInt(2, invokeMatch(new NumberEval(10), ae, MATCH_SMALLEST_GTE));
-		confirmInt(2, invokeMatch(new NumberEval(10), ae, MATCH_EXACT));
-		confirmInt(4, invokeMatch(new NumberEval(9), ae, MATCH_SMALLEST_GTE));
-		confirmInt(1, invokeMatch(new NumberEval(20), ae, MATCH_SMALLEST_GTE));
-		confirmInt(5, invokeMatch(new NumberEval(3), ae, MATCH_SMALLEST_GTE));
-		assertEquals(ErrorEval.NA, invokeMatch(new NumberEval(20), ae, MATCH_EXACT));
-		assertEquals(ErrorEval.NA, invokeMatch(new NumberEval(26), ae, MATCH_SMALLEST_GTE));
-	}
-
-	public void testSimpleString() {
-        // Arrange
-		ValueEval[] values = {
-			new StringEval("Albert"),
-			new StringEval("Charles"),
-			new StringEval("Ed"),
-			new StringEval("Greg"),
-			new StringEval("Ian"),
-		};
-
-		AreaEval ae = EvalFactory.createAreaEval("A1:A5", values);
-
-		// Note String comparisons are case insensitive
-		confirmInt(3, invokeMatch(new StringEval("Ed"), ae, MATCH_LARGEST_LTE));
-		confirmInt(3, invokeMatch(new StringEval("eD"), ae, MATCH_LARGEST_LTE));
-		confirmInt(3, invokeMatch(new StringEval("Ed"), ae, MATCH_EXACT));
-		confirmInt(3, invokeMatch(new StringEval("ed"), ae, MATCH_EXACT));
-
-		assertEquals(ErrorEval.NA, invokeMatch(new StringEval("Hugh"), ae, MATCH_EXACT));
-	}
-
-    public void testSimpleWildcardValuesString() {
-        // Arrange
-        ValueEval[] values = {
-                new StringEval("Albert"),
-                new StringEval("Charles"),
-                new StringEval("Ed"),
-                new StringEval("Greg"),
-                new StringEval("Ian"),
-        };
-
-        AreaEval ae = EvalFactory.createAreaEval("A1:A5", values);
-
-        // Note String comparisons are case insensitive
-        confirmInt(3, invokeMatch(new StringEval("e*"), ae, MATCH_EXACT));
-        confirmInt(3, invokeMatch(new StringEval("*d"), ae, MATCH_EXACT));
-
-        confirmInt(1, invokeMatch(new StringEval("Al*"), ae, MATCH_EXACT));
-        confirmInt(2, invokeMatch(new StringEval("Char*"), ae, MATCH_EXACT));
-
-        confirmInt(4, invokeMatch(new StringEval("*eg"), ae, MATCH_EXACT));
-        confirmInt(4, invokeMatch(new StringEval("G?eg"), ae, MATCH_EXACT));
-        confirmInt(4, invokeMatch(new StringEval("??eg"), ae, MATCH_EXACT));
-        confirmInt(4, invokeMatch(new StringEval("G*?eg"), ae, MATCH_EXACT));
-        confirmInt(4, invokeMatch(new StringEval("Hugh"), ae, MATCH_LARGEST_LTE));
-
-        confirmInt(5, invokeMatch(new StringEval("*Ian*"), ae, MATCH_EXACT));
-        confirmInt(5, invokeMatch(new StringEval("*Ian*"), ae, MATCH_LARGEST_LTE));
-    }
-
-    public void testTildeString() {
-
-        ValueEval[] values = {
-                new StringEval("what?"),
-                new StringEval("all*")
-        };
-
-        AreaEval ae = EvalFactory.createAreaEval("A1:A2", values);
-
-        confirmInt(1, invokeMatch(new StringEval("what~?"), ae, MATCH_EXACT));
-        confirmInt(2, invokeMatch(new StringEval("all~*"), ae, MATCH_EXACT));
-    }
-
-	public void testSimpleBoolean() {
-
-		ValueEval[] values = {
-				BoolEval.FALSE,
-				BoolEval.FALSE,
-				BoolEval.TRUE,
-				BoolEval.TRUE,
-		};
-
-		AreaEval ae = EvalFactory.createAreaEval("A1:A4", values);
-
-		// Note String comparisons are case insensitive
-		confirmInt(2, invokeMatch(BoolEval.FALSE, ae, MATCH_LARGEST_LTE));
-		confirmInt(1, invokeMatch(BoolEval.FALSE, ae, MATCH_EXACT));
-		confirmInt(4, invokeMatch(BoolEval.TRUE, ae, MATCH_LARGEST_LTE));
-		confirmInt(3, invokeMatch(BoolEval.TRUE, ae, MATCH_EXACT));
-	}
-
-	public void testHeterogeneous() {
-
-		ValueEval[] values = {
-				new NumberEval(4),
-				BoolEval.FALSE,
-				new NumberEval(5),
-				new StringEval("Albert"),
-				BoolEval.FALSE,
-				BoolEval.TRUE,
-				new NumberEval(10),
-				new StringEval("Charles"),
-				new StringEval("Ed"),
-				new NumberEval(10),
-				new NumberEval(25),
-				BoolEval.TRUE,
-				new StringEval("Ed"),
-		};
-
-		AreaEval ae = EvalFactory.createAreaEval("A1:A13", values);
-
-		assertEquals(ErrorEval.NA, invokeMatch(new StringEval("Aaron"), ae, MATCH_LARGEST_LTE));
-
-		confirmInt(5, invokeMatch(BoolEval.FALSE, ae, MATCH_LARGEST_LTE));
-		confirmInt(2, invokeMatch(BoolEval.FALSE, ae, MATCH_EXACT));
-		confirmInt(3, invokeMatch(new NumberEval(5), ae, MATCH_LARGEST_LTE));
-		confirmInt(3, invokeMatch(new NumberEval(5), ae, MATCH_EXACT));
-
-		confirmInt(8, invokeMatch(new StringEval("CHARLES"), ae, MATCH_EXACT));
-        //wildcard values
-        confirmInt(8, invokeMatch(new StringEval("CHAR*"), ae, MATCH_EXACT));
-        confirmInt(8, invokeMatch(new StringEval("*CHARLES"), ae, MATCH_EXACT));
-
-		confirmInt(4, invokeMatch(new StringEval("Ben"), ae, MATCH_LARGEST_LTE));
-
-		confirmInt(13, invokeMatch(new StringEval("ED"), ae, MATCH_LARGEST_LTE));
-		confirmInt(13, invokeMatch(new StringEval("ED*"), ae, MATCH_LARGEST_LTE));
-		confirmInt(13, invokeMatch(new StringEval("*ED"), ae, MATCH_LARGEST_LTE));
-		confirmInt(9, invokeMatch(new StringEval("ED"), ae, MATCH_EXACT));
-		confirmInt(9, invokeMatch(new StringEval("ED*"), ae, MATCH_EXACT));
-
-		confirmInt(13, invokeMatch(new StringEval("Hugh"), ae, MATCH_LARGEST_LTE));
-		assertEquals(ErrorEval.NA, invokeMatch(new StringEval("Hugh"), ae, MATCH_EXACT));
-
-		confirmInt(11, invokeMatch(new NumberEval(30), ae, MATCH_LARGEST_LTE));
-		confirmInt(12, invokeMatch(BoolEval.TRUE, ae, MATCH_LARGEST_LTE));
-	}
-
-
-	/**
-	 * Ensures that the match_type argument can be an <tt>AreaEval</tt>.<br/>
-	 * Bugzilla 44421
-	 */
-	public void testMatchArgTypeArea() {
-
-		ValueEval[] values = {
-			new NumberEval(4),
-			new NumberEval(5),
-			new NumberEval(10),
-			new NumberEval(10),
-			new NumberEval(25),
-		};
-
-		AreaEval ae = EvalFactory.createAreaEval("A1:A5", values);
-
-		AreaEval matchAE = EvalFactory.createAreaEval("C1:C1", new ValueEval[] { MATCH_LARGEST_LTE, });
-
-		try {
-			confirmInt(4, invokeMatch(new NumberEval(10), ae, matchAE));
-		} catch (RuntimeException e) {
-			if(e.getMessage().startsWith("Unexpected match_type type")) {
-				// identified bug 44421
-				fail(e.getMessage());
-			}
-			// some other error ??
-			throw e;
-		}
-	}
-	
-	public void testInvalidMatchType() {
-
-        ValueEval[] values = {
-            new NumberEval(4),
-            new NumberEval(5),
-            new NumberEval(10),
-            new NumberEval(10),
-            new NumberEval(25),
-        };
-
-        AreaEval ae = EvalFactory.createAreaEval("A1:A5", values);
-
-        confirmInt(2, invokeMatch(new NumberEval(5), ae, MATCH_LARGEST_LTE));
-        
-        assertEquals("Should return #REF! for invalid match type", 
-                ErrorEval.REF_INVALID, invokeMatch(new StringEval("Ben"), ae, MATCH_INVALID));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
deleted file mode 100644
index dce2927..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests Match functions as loaded from a test data spreadsheet.<p/>
- *
- * Tests for bug fixes and specific/tricky behaviour can be found in the corresponding test class
- * (<tt>TestXxxx</tt>) of the target (<tt>Xxxx</tt>) implementor, where execution can be observed
- *  more easily.
- */
-public final class TestMatchFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestMatchFunctionsFromSpreadsheet.class, "MatchFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
deleted file mode 100644
index 1826806..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * Created on May 23, 2005
- *
- */
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.functions.XYNumericFunction.Accumulator;
-
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *  
- */
-public class TestMathX extends AbstractNumericTestCase {
-
-    public void testAcosh() {
-        double d = 0;
-
-        d = MathX.acosh(0);
-        assertTrue("Acosh 0 is NaN", Double.isNaN(d));
-
-        d = MathX.acosh(1);
-        assertEquals("Acosh 1 ", 0, d);
-
-        d = MathX.acosh(-1);
-        assertTrue("Acosh -1 is NaN", Double.isNaN(d));
-
-        d = MathX.acosh(100);
-        assertEquals("Acosh 100 ", 5.298292366d, d);
-
-        d = MathX.acosh(101.001);
-        assertEquals("Acosh 101.001 ", 5.308253091d, d);
-
-        d = MathX.acosh(200000);
-        assertEquals("Acosh 200000 ", 12.89921983d, d);
-
-    }
-
-    public void testAsinh() {
-        double d = 0;
-
-        d = MathX.asinh(0);
-        assertEquals("asinh 0", d, 0);
-
-        d = MathX.asinh(1);
-        assertEquals("asinh 1 ", 0.881373587, d);
-
-        d = MathX.asinh(-1);
-        assertEquals("asinh -1 ", -0.881373587, d);
-
-        d = MathX.asinh(-100);
-        assertEquals("asinh -100 ", -5.298342366, d);
-
-        d = MathX.asinh(100);
-        assertEquals("asinh 100 ", 5.298342366, d);
-
-        d = MathX.asinh(200000);
-        assertEquals("asinh 200000", 12.899219826096400, d);
-
-        d = MathX.asinh(-200000);
-        assertEquals("asinh -200000 ", -12.899223853137, d);
-
-    }
-
-    public void testAtanh() {
-        double d = 0;
-        d = MathX.atanh(0);
-        assertEquals("atanh 0", d, 0);
-
-        d = MathX.atanh(1);
-        assertEquals("atanh 1 ", Double.POSITIVE_INFINITY, d);
-
-        d = MathX.atanh(-1);
-        assertEquals("atanh -1 ", Double.NEGATIVE_INFINITY, d);
-
-        d = MathX.atanh(-100);
-        assertEquals("atanh -100 ", Double.NaN, d);
-
-        d = MathX.atanh(100);
-        assertEquals("atanh 100 ", Double.NaN, d);
-
-        d = MathX.atanh(200000);
-        assertEquals("atanh 200000", Double.NaN, d);
-
-        d = MathX.atanh(-200000);
-        assertEquals("atanh -200000 ", Double.NaN, d);
-
-        d = MathX.atanh(0.1);
-        assertEquals("atanh 0.1", 0.100335348, d);
-
-        d = MathX.atanh(-0.1);
-        assertEquals("atanh -0.1 ", -0.100335348, d);
-
-    }
-
-    public void testCosh() {
-        double d = 0;
-        d = MathX.cosh(0);
-        assertEquals("cosh 0", 1, d);
-
-        d = MathX.cosh(1);
-        assertEquals("cosh 1 ", 1.543080635, d);
-
-        d = MathX.cosh(-1);
-        assertEquals("cosh -1 ", 1.543080635, d);
-
-        d = MathX.cosh(-100);
-        assertEquals("cosh -100 ", 1.344058570908070E+43, d);
-
-        d = MathX.cosh(100);
-        assertEquals("cosh 100 ", 1.344058570908070E+43, d);
-
-        d = MathX.cosh(15);
-        assertEquals("cosh 15", 1634508.686, d);
-
-        d = MathX.cosh(-15);
-        assertEquals("cosh -15 ", 1634508.686, d);
-
-        d = MathX.cosh(0.1);
-        assertEquals("cosh 0.1", 1.005004168, d);
-
-        d = MathX.cosh(-0.1);
-        assertEquals("cosh -0.1 ", 1.005004168, d);
-
-    }
-
-    public void testTanh() {
-        double d = 0;
-        d = MathX.tanh(0);
-        assertEquals("tanh 0", 0, d);
-
-        d = MathX.tanh(1);
-        assertEquals("tanh 1 ", 0.761594156, d);
-
-        d = MathX.tanh(-1);
-        assertEquals("tanh -1 ", -0.761594156, d);
-
-        d = MathX.tanh(-100);
-        assertEquals("tanh -100 ", -1, d);
-
-        d = MathX.tanh(100);
-        assertEquals("tanh 100 ", 1, d);
-
-        d = MathX.tanh(15);
-        assertEquals("tanh 15", 1, d);
-
-        d = MathX.tanh(-15);
-        assertEquals("tanh -15 ", -1, d);
-
-        d = MathX.tanh(0.1);
-        assertEquals("tanh 0.1", 0.099667995, d);
-
-        d = MathX.tanh(-0.1);
-        assertEquals("tanh -0.1 ", -0.099667995, d);
-
-    }
-
-    public void testMax() {
-        double[] d = new double[100];
-        d[0] = 1.1;     d[1] = 2.1;     d[2] = 3.1;     d[3] = 4.1; 
-        d[4] = 5.1;     d[5] = 6.1;     d[6] = 7.1;     d[7] = 8.1;
-        d[8] = 9.1;     d[9] = 10.1;    d[10] = 11.1;   d[11] = 12.1;
-        d[12] = 13.1;   d[13] = 14.1;   d[14] = 15.1;   d[15] = 16.1;
-        d[16] = 17.1;   d[17] = 18.1;   d[18] = 19.1;   d[19] = 20.1; 
-        
-        double m = MathX.max(d);
-        assertEquals("Max ", 20.1, m);
-        
-        d = new double[1000];
-        m = MathX.max(d);
-        assertEquals("Max ", 0, m);
-        
-        d[0] = -1.1;     d[1] = 2.1;     d[2] = -3.1;     d[3] = 4.1; 
-        d[4] = -5.1;     d[5] = 6.1;     d[6] = -7.1;     d[7] = 8.1;
-        d[8] = -9.1;     d[9] = 10.1;    d[10] = -11.1;   d[11] = 12.1;
-        d[12] = -13.1;   d[13] = 14.1;   d[14] = -15.1;   d[15] = 16.1;
-        d[16] = -17.1;   d[17] = 18.1;   d[18] = -19.1;   d[19] = 20.1; 
-        m = MathX.max(d);
-        assertEquals("Max ", 20.1, m);
-        
-        d = new double[20];
-        d[0] = -1.1;     d[1] = -2.1;     d[2] = -3.1;     d[3] = -4.1; 
-        d[4] = -5.1;     d[5] = -6.1;     d[6] = -7.1;     d[7] = -8.1;
-        d[8] = -9.1;     d[9] = -10.1;    d[10] = -11.1;   d[11] = -12.1;
-        d[12] = -13.1;   d[13] = -14.1;   d[14] = -15.1;   d[15] = -16.1;
-        d[16] = -17.1;   d[17] = -18.1;   d[18] = -19.1;   d[19] = -20.1; 
-        m = MathX.max(d);
-        assertEquals("Max ", -1.1, m);
-        
-    }
-
-    public void testMin() {
-        double[] d = new double[100];
-        d[0] = 1.1;     d[1] = 2.1;     d[2] = 3.1;     d[3] = 4.1; 
-        d[4] = 5.1;     d[5] = 6.1;     d[6] = 7.1;     d[7] = 8.1;
-        d[8] = 9.1;     d[9] = 10.1;    d[10] = 11.1;   d[11] = 12.1;
-        d[12] = 13.1;   d[13] = 14.1;   d[14] = 15.1;   d[15] = 16.1;
-        d[16] = 17.1;   d[17] = 18.1;   d[18] = 19.1;   d[19] = 20.1; 
-        
-        double m = MathX.min(d);
-        assertEquals("Min ", 0, m);
-        
-        d = new double[20];
-        d[0] = 1.1;     d[1] = 2.1;     d[2] = 3.1;     d[3] = 4.1; 
-        d[4] = 5.1;     d[5] = 6.1;     d[6] = 7.1;     d[7] = 8.1;
-        d[8] = 9.1;     d[9] = 10.1;    d[10] = 11.1;   d[11] = 12.1;
-        d[12] = 13.1;   d[13] = 14.1;   d[14] = 15.1;   d[15] = 16.1;
-        d[16] = 17.1;   d[17] = 18.1;   d[18] = 19.1;   d[19] = 20.1; 
-        
-        m = MathX.min(d);
-        assertEquals("Min ", 1.1, m);
-        
-        d = new double[1000];
-        m = MathX.min(d);
-        assertEquals("Min ", 0, m);
-        
-        d[0] = -1.1;     d[1] = 2.1;     d[2] = -3.1;     d[3] = 4.1; 
-        d[4] = -5.1;     d[5] = 6.1;     d[6] = -7.1;     d[7] = 8.1;
-        d[8] = -9.1;     d[9] = 10.1;    d[10] = -11.1;   d[11] = 12.1;
-        d[12] = -13.1;   d[13] = 14.1;   d[14] = -15.1;   d[15] = 16.1;
-        d[16] = -17.1;   d[17] = 18.1;   d[18] = -19.1;   d[19] = 20.1; 
-        m = MathX.min(d);
-        assertEquals("Min ", -19.1, m);
-        
-        d = new double[20];
-        d[0] = -1.1;     d[1] = -2.1;     d[2] = -3.1;     d[3] = -4.1; 
-        d[4] = -5.1;     d[5] = -6.1;     d[6] = -7.1;     d[7] = -8.1;
-        d[8] = -9.1;     d[9] = -10.1;    d[10] = -11.1;   d[11] = -12.1;
-        d[12] = -13.1;   d[13] = -14.1;   d[14] = -15.1;   d[15] = -16.1;
-        d[16] = -17.1;   d[17] = -18.1;   d[18] = -19.1;   d[19] = -20.1; 
-        m = MathX.min(d);
-        assertEquals("Min ", -20.1, m);
-    }
-
-    public void testProduct() {
-        assertEquals("Product ", 0, MathX.product(null));
-        assertEquals("Product ", 0, MathX.product(new double[] {}));
-        assertEquals("Product ", 0, MathX.product(new double[] {1, 0}));
-
-        assertEquals("Product ", 1, MathX.product(new double[] { 1 }));
-        assertEquals("Product ", 1, MathX.product(new double[] { 1, 1 }));
-        assertEquals("Product ", 10, MathX.product(new double[] { 10, 1 }));
-        assertEquals("Product ", -2, MathX.product(new double[] { 2, -1 }));
-        assertEquals("Product ", 99988000209999d, MathX.product(new double[] { 99999, 99999, 9999 }));
-        
-        double[] d = new double[100];
-        d[0] = 1.1;     d[1] = 2.1;     d[2] = 3.1;     d[3] = 4.1; 
-        d[4] = 5.1;     d[5] = 6.1;     d[6] = 7.1;     d[7] = 8.1;
-        d[8] = 9.1;     d[9] = 10.1;    d[10] = 11.1;   d[11] = 12.1;
-        d[12] = 13.1;   d[13] = 14.1;   d[14] = 15.1;   d[15] = 16.1;
-        d[16] = 17.1;   d[17] = 18.1;   d[18] = 19.1;   d[19] = 20.1; 
-        
-        double m = MathX.product(d);
-        assertEquals("Product ", 0, m);
-        
-        d = new double[20];
-        d[0] = 1.1;     d[1] = 2.1;     d[2] = 3.1;     d[3] = 4.1; 
-        d[4] = 5.1;     d[5] = 6.1;     d[6] = 7.1;     d[7] = 8.1;
-        d[8] = 9.1;     d[9] = 10.1;    d[10] = 11.1;   d[11] = 12.1;
-        d[12] = 13.1;   d[13] = 14.1;   d[14] = 15.1;   d[15] = 16.1;
-        d[16] = 17.1;   d[17] = 18.1;   d[18] = 19.1;   d[19] = 20.1; 
-        
-        m = MathX.product(d);
-        assertEquals("Product ", 3459946360003355534d, m);
-        
-        d = new double[1000];
-        m = MathX.product(d);
-        assertEquals("Product ", 0, m);
-        
-        d = new double[20];
-        d[0] = -1.1;     d[1] = -2.1;     d[2] = -3.1;     d[3] = -4.1; 
-        d[4] = -5.1;     d[5] = -6.1;     d[6] = -7.1;     d[7] = -8.1;
-        d[8] = -9.1;     d[9] = -10.1;    d[10] = -11.1;   d[11] = -12.1;
-        d[12] = -13.1;   d[13] = -14.1;   d[14] = -15.1;   d[15] = -16.1;
-        d[16] = -17.1;   d[17] = -18.1;   d[18] = -19.1;   d[19] = -20.1; 
-        m = MathX.product(d);
-        assertEquals("Product ", 3459946360003355534d, m);
-    }
-
-    public void testMod() {
-
-        //example from Excel help
-        assertEquals(1.0, MathX.mod(3, 2));
-        assertEquals(1.0, MathX.mod(-3, 2));
-        assertEquals(-1.0, MathX.mod(3, -2));
-        assertEquals(-1.0, MathX.mod(-3, -2));
-
-        assertEquals(0.0, MathX.mod(0, 2));
-        assertEquals(Double.NaN, MathX.mod(3, 0));
-        assertEquals(1.4, MathX.mod(3.4, 2));
-        assertEquals(-1.4, MathX.mod(-3.4, -2));
-        assertEquals(0.6000000000000001, MathX.mod(-3.4, 2.0));// should actually be 0.6
-        assertEquals(-0.6000000000000001, MathX.mod(3.4, -2.0));// should actually be -0.6
-        assertEquals(3.0, MathX.mod(3, Double.MAX_VALUE));
-        assertEquals(2.0, MathX.mod(Double.MAX_VALUE, 3));
-
-        // Bugzilla 50033
-        assertEquals(1.0, MathX.mod(13, 12));
-    }
-
-    public void testNChooseK() {
-        int n=100;
-        int k=50;
-        double d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 1.00891344545564E29, d);
-        
-        n = -1; k = 1;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", Double.NaN, d);
-        
-        n = 1; k = -1;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", Double.NaN, d);
-        
-        n = 0; k = 1;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", Double.NaN, d);
-        
-        n = 1; k = 0;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 1, d);
-        
-        n = 10; k = 9;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 10, d);
-        
-        n = 10; k = 10;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 1, d);
-        
-        n = 10; k = 1;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 10, d);
-        
-        n = 1000; k = 1;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 1000, d); // awesome ;)
-        
-        n = 1000; k = 2;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 499500, d); // awesome ;)
-        
-        n = 13; k = 7;
-        d = MathX.nChooseK(n, k);
-        assertEquals("NChooseK ", 1716, d);
-        
-    }
-
-    public void testSign() {
-        final short minus = -1;
-        final short zero = 0;
-        final short plus = 1;
-        double d = 0;
-        
-        
-        assertEquals("Sign ", minus, MathX.sign(minus));
-        assertEquals("Sign ", plus, MathX.sign(plus));
-        assertEquals("Sign ", zero, MathX.sign(zero));
-        
-        d = 0;
-        assertEquals("Sign ", zero, MathX.sign(d));
-        
-        d = -1.000001;
-        assertEquals("Sign ", minus, MathX.sign(d));
-        
-        d = -.000001;
-        assertEquals("Sign ", minus, MathX.sign(d));
-        
-        d = -1E-200;
-        assertEquals("Sign ", minus, MathX.sign(d));
-        
-        d = Double.NEGATIVE_INFINITY;
-        assertEquals("Sign ", minus, MathX.sign(d));
-        
-        d = -200.11;
-        assertEquals("Sign ", minus, MathX.sign(d));
-        
-        d = -2000000000000.11;
-        assertEquals("Sign ", minus, MathX.sign(d));
-        
-        d = 1.000001;
-        assertEquals("Sign ", plus, MathX.sign(d));
-        
-        d = .000001;
-        assertEquals("Sign ", plus, MathX.sign(d));
-        
-        d = 1E-200;
-        assertEquals("Sign ", plus, MathX.sign(d));
-        
-        d = Double.POSITIVE_INFINITY;
-        assertEquals("Sign ", plus, MathX.sign(d));
-        
-        d = 200.11;
-        assertEquals("Sign ", plus, MathX.sign(d));
-        
-        d = 2000000000000.11;
-        assertEquals("Sign ", plus, MathX.sign(d));
-        
-    }
-
-    public void testSinh() {
-        double d = 0;
-        d = MathX.sinh(0);
-        assertEquals("sinh 0", 0, d);
-
-        d = MathX.sinh(1);
-        assertEquals("sinh 1 ", 1.175201194, d);
-
-        d = MathX.sinh(-1);
-        assertEquals("sinh -1 ", -1.175201194, d);
-
-        d = MathX.sinh(-100);
-        assertEquals("sinh -100 ", -1.344058570908070E+43, d);
-
-        d = MathX.sinh(100);
-        assertEquals("sinh 100 ", 1.344058570908070E+43, d);
-
-        d = MathX.sinh(15);
-        assertEquals("sinh 15", 1634508.686, d);
-
-        d = MathX.sinh(-15);
-        assertEquals("sinh -15 ", -1634508.686, d);
-
-        d = MathX.sinh(0.1);
-        assertEquals("sinh 0.1", 0.10016675, d);
-
-        d = MathX.sinh(-0.1);
-        assertEquals("sinh -0.1 ", -0.10016675, d);
-
-    }
-
-    public void testSum() {
-        double[] d = new double[100];
-        d[0] = 1.1;     d[1] = 2.1;     d[2] = 3.1;     d[3] = 4.1; 
-        d[4] = 5.1;     d[5] = 6.1;     d[6] = 7.1;     d[7] = 8.1;
-        d[8] = 9.1;     d[9] = 10.1;    d[10] = 11.1;   d[11] = 12.1;
-        d[12] = 13.1;   d[13] = 14.1;   d[14] = 15.1;   d[15] = 16.1;
-        d[16] = 17.1;   d[17] = 18.1;   d[18] = 19.1;   d[19] = 20.1; 
-        
-        double s = MathX.sum(d);
-        assertEquals("Sum ", 212, s);
-        
-        d = new double[1000];
-        s = MathX.sum(d);
-        assertEquals("Sum ", 0, s);
-        
-        d[0] = -1.1;     d[1] = 2.1;     d[2] = -3.1;     d[3] = 4.1; 
-        d[4] = -5.1;     d[5] = 6.1;     d[6] = -7.1;     d[7] = 8.1;
-        d[8] = -9.1;     d[9] = 10.1;    d[10] = -11.1;   d[11] = 12.1;
-        d[12] = -13.1;   d[13] = 14.1;   d[14] = -15.1;   d[15] = 16.1;
-        d[16] = -17.1;   d[17] = 18.1;   d[18] = -19.1;   d[19] = 20.1; 
-        s = MathX.sum(d);
-        assertEquals("Sum ", 10, s);
-        
-        d[0] = -1.1;     d[1] = -2.1;     d[2] = -3.1;     d[3] = -4.1; 
-        d[4] = -5.1;     d[5] = -6.1;     d[6] = -7.1;     d[7] = -8.1;
-        d[8] = -9.1;     d[9] = -10.1;    d[10] = -11.1;   d[11] = -12.1;
-        d[12] = -13.1;   d[13] = -14.1;   d[14] = -15.1;   d[15] = -16.1;
-        d[16] = -17.1;   d[17] = -18.1;   d[18] = -19.1;   d[19] = -20.1; 
-        s = MathX.sum(d);
-        assertEquals("Sum ", -212, s);
-        
-    }
-
-    public void testSumsq() {
-        double[] d = new double[100];
-        d[0] = 1.1;     d[1] = 2.1;     d[2] = 3.1;     d[3] = 4.1; 
-        d[4] = 5.1;     d[5] = 6.1;     d[6] = 7.1;     d[7] = 8.1;
-        d[8] = 9.1;     d[9] = 10.1;    d[10] = 11.1;   d[11] = 12.1;
-        d[12] = 13.1;   d[13] = 14.1;   d[14] = 15.1;   d[15] = 16.1;
-        d[16] = 17.1;   d[17] = 18.1;   d[18] = 19.1;   d[19] = 20.1; 
-        
-        double s = MathX.sumsq(d);
-        assertEquals("Sumsq ", 2912.2, s);
-        
-        d = new double[1000];
-        s = MathX.sumsq(d);
-        assertEquals("Sumsq ", 0, s);
-        
-        d[0] = -1.1;     d[1] = 2.1;     d[2] = -3.1;     d[3] = 4.1; 
-        d[4] = -5.1;     d[5] = 6.1;     d[6] = -7.1;     d[7] = 8.1;
-        d[8] = -9.1;     d[9] = 10.1;    d[10] = -11.1;   d[11] = 12.1;
-        d[12] = -13.1;   d[13] = 14.1;   d[14] = -15.1;   d[15] = 16.1;
-        d[16] = -17.1;   d[17] = 18.1;   d[18] = -19.1;   d[19] = 20.1; 
-        s = MathX.sumsq(d);
-        assertEquals("Sumsq ", 2912.2, s);
-        
-        d[0] = -1.1;     d[1] = -2.1;     d[2] = -3.1;     d[3] = -4.1; 
-        d[4] = -5.1;     d[5] = -6.1;     d[6] = -7.1;     d[7] = -8.1;
-        d[8] = -9.1;     d[9] = -10.1;    d[10] = -11.1;   d[11] = -12.1;
-        d[12] = -13.1;   d[13] = -14.1;   d[14] = -15.1;   d[15] = -16.1;
-        d[16] = -17.1;   d[17] = -18.1;   d[18] = -19.1;   d[19] = -20.1; 
-        s = MathX.sumsq(d);
-        assertEquals("Sumsq ", 2912.2, s);
-    }
-
-    public void testFactorial() {
-        int n = 0;
-        double s = 0;
-        
-        n = 0;
-        s = MathX.factorial(n);
-        assertEquals("Factorial ", 1, s);
-        
-        n = 1;
-        s = MathX.factorial(n);
-        assertEquals("Factorial ", 1, s);
-        
-        n = 10;
-        s = MathX.factorial(n);
-        assertEquals("Factorial ", 3628800, s);
-        
-        n = 99;
-        s = MathX.factorial(n);
-        assertEquals("Factorial ", 9.33262154439E+155, s);
-        
-        n = -1;
-        s = MathX.factorial(n);
-        assertEquals("Factorial ", Double.NaN, s);
-        
-        n = Integer.MAX_VALUE;
-        s = MathX.factorial(n);
-        assertEquals("Factorial ", Double.POSITIVE_INFINITY, s);
-    }
-
-    public void testSumx2my2() {
-        double[] xarr = null;
-        double[] yarr = null;
-        
-        xarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        yarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        confirmSumx2my2(xarr, yarr, 100);
-        
-        xarr = new double[]{-1, -2, -3, -4, -5, -6, -7, -8, -9, -10};
-        yarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        confirmSumx2my2(xarr, yarr, 100);
-        
-        xarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        yarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        confirmSumx2my2(xarr, yarr, -100);
-        
-        xarr = new double[]{10};
-        yarr = new double[]{9};
-        confirmSumx2my2(xarr, yarr, 19);
-        
-        xarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        yarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        confirmSumx2my2(xarr, yarr, 0);
-    }
-
-    public void testSumx2py2() {
-        double[] xarr = null;
-        double[] yarr = null;
-        
-        xarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        yarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        confirmSumx2py2(xarr, yarr, 670);
-        
-        xarr = new double[]{-1, -2, -3, -4, -5, -6, -7, -8, -9, -10};
-        yarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        confirmSumx2py2(xarr, yarr, 670);
-        
-        xarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        yarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        confirmSumx2py2(xarr, yarr, 670);
-        
-        xarr = new double[]{10};
-        yarr = new double[]{9};
-        confirmSumx2py2(xarr, yarr, 181);
-        
-        xarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        yarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        confirmSumx2py2(xarr, yarr, 770);
-    }
-
-    public void testSumxmy2() {
-        double[] xarr = null;
-        double[] yarr = null;
-        
-        xarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        yarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        confirmSumxmy2(xarr, yarr, 10);
-        
-        xarr = new double[]{-1, -2, -3, -4, -5, -6, -7, -8, -9, -10};
-        yarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        confirmSumxmy2(xarr, yarr, 1330);
-        
-        xarr = new double[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        yarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        confirmSumxmy2(xarr, yarr, 10);
-        
-        xarr = new double[]{10};
-        yarr = new double[]{9};
-        confirmSumxmy2(xarr, yarr, 1);
-        
-        xarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        yarr = new double[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        confirmSumxmy2(xarr, yarr, 0);
-    }
-
-    private static void confirmSumx2my2(double[] xarr, double[] yarr, double expectedResult) {
-        confirmXY(new Sumx2my2().createAccumulator(), xarr, yarr, expectedResult);
-    }
-    private static void confirmSumx2py2(double[] xarr, double[] yarr, double expectedResult) {
-        confirmXY(new Sumx2py2().createAccumulator(), xarr, yarr, expectedResult);
-    }
-    private static void confirmSumxmy2(double[] xarr, double[] yarr, double expectedResult) {
-        confirmXY(new Sumxmy2().createAccumulator(), xarr, yarr, expectedResult);
-    }
-
-    private static void confirmXY(Accumulator acc, double[] xarr, double[] yarr,
-            double expectedResult) {
-        double result = 0.0;
-        for (int i = 0; i < xarr.length; i++) {
-            result += acc.accumulate(xarr[i], yarr[i]);
-        }
-        assertEquals(expectedResult, result, 0.0);
-    }
-    
-    public void testRound() {
-        double d = 0;
-        int p = 0;
-        
-        d = 0; p = 0;
-        assertEquals("round ", 0, MathX.round(d, p));
-        
-        d = 10; p = 0;
-        assertEquals("round ", 10, MathX.round(d, p));
-        
-        d = 123.23; p = 0;
-        assertEquals("round ", 123, MathX.round(d, p));
-        
-        d = -123.23; p = 0;
-        assertEquals("round ", -123, MathX.round(d, p));
-        
-        d = 123.12; p = 2;
-        assertEquals("round ", 123.12, MathX.round(d, p));
-        
-        d = 88.123459; p = 5;
-        assertEquals("round ", 88.12346, MathX.round(d, p));
-        
-        d = 0; p = 2;
-        assertEquals("round ", 0, MathX.round(d, p));
-        
-        d = 0; p = -1;
-        assertEquals("round ", 0, MathX.round(d, p));
-        
-        d = 0.01; p = -1;
-        assertEquals("round ", 0, MathX.round(d, p));
-
-        d = 123.12; p = -2;
-        assertEquals("round ", 100, MathX.round(d, p));
-        
-        d = 88.123459; p = -3;
-        assertEquals("round ", 0, MathX.round(d, p));
-        
-        d = 49.00000001; p = -1;
-        assertEquals("round ", 50, MathX.round(d, p));
-        
-        d = 149.999999; p = -2;
-        assertEquals("round ", 100, MathX.round(d, p));
-        
-        d = 150.0; p = -2;
-        assertEquals("round ", 200, MathX.round(d, p));
-
-        d = 2162.615d; p = 2;
-        assertEquals("round ", 2162.62d, MathX.round(d, p));
-        
-        d = 0.049999999999999975d; p = 2;
-        assertEquals("round ", 0.05d, MathX.round(d, p));
-
-        d = 0.049999999999999975d; p = 1;
-        assertEquals("round ", 0.1d, MathX.round(d, p));
-        
-        d = Double.NaN; p = 1;
-        assertEquals("round ", Double.NaN, MathX.round(d, p));
-
-        d = Double.POSITIVE_INFINITY; p = 1;
-        assertEquals("round ", Double.NaN, MathX.round(d, p));
-
-        d = Double.NEGATIVE_INFINITY; p = 1;
-        assertEquals("round ", Double.NaN, MathX.round(d, p));
-
-        d = Double.MAX_VALUE; p = 1;
-        assertEquals("round ", Double.MAX_VALUE, MathX.round(d, p));
-
-        d = Double.MIN_VALUE; p = 1;
-        assertEquals("round ", 0.0d, MathX.round(d, p));
-    }
-
-    public void testRoundDown() {
-        double d = 0;
-        int p = 0;
-        
-        d = 0; p = 0;
-        assertEquals("roundDown ", 0, MathX.roundDown(d, p));
-        
-        d = 10; p = 0;
-        assertEquals("roundDown ", 10, MathX.roundDown(d, p));
-        
-        d = 123.99; p = 0;
-        assertEquals("roundDown ", 123, MathX.roundDown(d, p));
-        
-        d = -123.99; p = 0;
-        assertEquals("roundDown ", -123, MathX.roundDown(d, p));
-        
-        d = 123.99; p = 2;
-        assertEquals("roundDown ", 123.99, MathX.roundDown(d, p));
-        
-        d = 88.123459; p = 5;
-        assertEquals("roundDown ", 88.12345, MathX.roundDown(d, p));
-        
-        d = 0; p = 2;
-        assertEquals("roundDown ", 0, MathX.roundDown(d, p));
-        
-        d = 0; p = -1;
-        assertEquals("roundDown ", 0, MathX.roundDown(d, p));
-        
-        d = 0.01; p = -1;
-        assertEquals("roundDown ", 0, MathX.roundDown(d, p));
-
-        d = 199.12; p = -2;
-        assertEquals("roundDown ", 100, MathX.roundDown(d, p));
-        
-        d = 88.123459; p = -3;
-        assertEquals("roundDown ", 0, MathX.roundDown(d, p));
-        
-        d = 99.00000001; p = -1;
-        assertEquals("roundDown ", 90, MathX.roundDown(d, p));
-        
-        d = 100.00001; p = -2;
-        assertEquals("roundDown ", 100, MathX.roundDown(d, p));
-        
-        d = 150.0; p = -2;
-        assertEquals("roundDown ", 100, MathX.roundDown(d, p));
-        
-        d = 0.049999999999999975d; p = 2;
-        assertEquals("round ", 0.04d, MathX.roundDown(d, p));
-
-        d = 0.049999999999999975d; p = 1;
-        assertEquals("round ", 0.0d, MathX.roundDown(d, p));
-        
-        d = Double.NaN; p = 1;
-        assertEquals("round ", Double.NaN, MathX.roundDown(d, p));
-
-        d = Double.POSITIVE_INFINITY; p = 1;
-        assertEquals("round ", Double.NaN, MathX.roundDown(d, p));
-
-        d = Double.NEGATIVE_INFINITY; p = 1;
-        assertEquals("round ", Double.NaN, MathX.roundDown(d, p));
-
-        d = Double.MAX_VALUE; p = 1;
-        assertEquals("round ", Double.MAX_VALUE, MathX.roundDown(d, p));
-
-        d = Double.MIN_VALUE; p = 1;
-        assertEquals("round ", 0.0d, MathX.roundDown(d, p));
-    }
-
-    public void testRoundUp() {
-        double d = 0;
-        int p = 0;
-        
-        d = 0; p = 0;
-        assertEquals("roundUp ", 0, MathX.roundUp(d, p));
-        
-        d = 10; p = 0;
-        assertEquals("roundUp ", 10, MathX.roundUp(d, p));
-        
-        d = 123.23; p = 0;
-        assertEquals("roundUp ", 124, MathX.roundUp(d, p));
-        
-        d = -123.23; p = 0;
-        assertEquals("roundUp ", -124, MathX.roundUp(d, p));
-        
-        d = 123.12; p = 2;
-        assertEquals("roundUp ", 123.12, MathX.roundUp(d, p));
-        
-        d = 88.123459; p = 5;
-        assertEquals("roundUp ", 88.12346, MathX.roundUp(d, p));
-        
-        d = 0; p = 2;
-        assertEquals("roundUp ", 0, MathX.roundUp(d, p));
-        
-        d = 0; p = -1;
-        assertEquals("roundUp ", 0, MathX.roundUp(d, p));
-        
-        d = 0.01; p = -1;
-        assertEquals("roundUp ", 10, MathX.roundUp(d, p));
-
-        d = 123.12; p = -2;
-        assertEquals("roundUp ", 200, MathX.roundUp(d, p));
-        
-        d = 88.123459; p = -3;
-        assertEquals("roundUp ", 1000, MathX.roundUp(d, p));
-        
-        d = 49.00000001; p = -1;
-        assertEquals("roundUp ", 50, MathX.roundUp(d, p));
-        
-        d = 149.999999; p = -2;
-        assertEquals("roundUp ", 200, MathX.roundUp(d, p));
-        
-        d = 150.0; p = -2;
-        assertEquals("roundUp ", 200, MathX.roundUp(d, p));
-        
-        d = 0.049999999999999975d; p = 2;
-        assertEquals("round ", 0.05d, MathX.roundUp(d, p));
-
-        d = 0.049999999999999975d; p = 1;
-        assertEquals("round ", 0.1d, MathX.roundUp(d, p));
-        
-        d = Double.NaN; p = 1;
-        assertEquals("round ", Double.NaN, MathX.roundUp(d, p));
-
-        d = Double.POSITIVE_INFINITY; p = 1;
-        assertEquals("round ", Double.NaN, MathX.roundUp(d, p));
-
-        d = Double.NEGATIVE_INFINITY; p = 1;
-        assertEquals("round ", Double.NaN, MathX.roundUp(d, p));
-
-        d = Double.MAX_VALUE; p = 1;
-        assertEquals("round ", Double.MAX_VALUE, MathX.roundUp(d, p));
-
-        d = Double.MIN_VALUE; p = 1;
-        assertEquals("round ", 0.1d, MathX.roundUp(d, p));
-    }
-
-    public void testCeiling() {
-        double d = 0;
-        double s = 0;
-        
-        d = 0; s = 0;
-        assertEquals("ceiling ", 0, MathX.ceiling(d, s));
-        
-        d = 1; s = 0;
-        assertEquals("ceiling ", 0, MathX.ceiling(d, s));
-        
-        d = 0; s = 1;
-        assertEquals("ceiling ", 0, MathX.ceiling(d, s));
-        
-        d = -1; s = 0;
-        assertEquals("ceiling ", 0, MathX.ceiling(d, s));
-        
-        d = 0; s = -1;
-        assertEquals("ceiling ", 0, MathX.ceiling(d, s));
-        
-        d = 10; s = 1.11;
-        assertEquals("ceiling ", 11.1, MathX.ceiling(d, s));
-        
-        d = 11.12333; s = 0.03499;
-        assertEquals("ceiling ", 11.12682, MathX.ceiling(d, s));
-        
-        d = -11.12333; s = 0.03499;
-        assertEquals("ceiling ", Double.NaN, MathX.ceiling(d, s));
-        
-        d = 11.12333; s = -0.03499;
-        assertEquals("ceiling ", Double.NaN, MathX.ceiling(d, s));
-        
-        d = -11.12333; s = -0.03499;
-        assertEquals("ceiling ", -11.12682, MathX.ceiling(d, s));
-        
-        d = 100; s = 0.001;
-        assertEquals("ceiling ", 100, MathX.ceiling(d, s));
-        
-        d = -0.001; s = -9.99;
-        assertEquals("ceiling ", -9.99, MathX.ceiling(d, s));
-        
-        d = 4.42; s = 0.05;
-        assertEquals("ceiling ", 4.45, MathX.ceiling(d, s));
-        
-        d = 0.05; s = 4.42;
-        assertEquals("ceiling ", 4.42, MathX.ceiling(d, s));
-        
-        d = 0.6666; s = 3.33;
-        assertEquals("ceiling ", 3.33, MathX.ceiling(d, s));
-        
-        d = 2d/3; s = 3.33;
-        assertEquals("ceiling ", 3.33, MathX.ceiling(d, s));
-    }
-
-    public void testFloor() {
-        double d = 0;
-        double s = 0;
-        
-        d = 0; s = 0;
-        assertEquals("floor ", 0, MathX.floor(d, s));
-        
-        d = 1; s = 0;
-        assertEquals("floor ", Double.NaN, MathX.floor(d, s));
-        
-        d = 0; s = 1;
-        assertEquals("floor ", 0, MathX.floor(d, s));
-        
-        d = -1; s = 0;
-        assertEquals("floor ", Double.NaN, MathX.floor(d, s));
-        
-        d = 0; s = -1;
-        assertEquals("floor ", 0, MathX.floor(d, s));
-        
-        d = 10; s = 1.11;
-        assertEquals("floor ", 9.99, MathX.floor(d, s));
-        
-        d = 11.12333; s = 0.03499;
-        assertEquals("floor ", 11.09183, MathX.floor(d, s));
-        
-        d = -11.12333; s = 0.03499;
-        assertEquals("floor ", Double.NaN, MathX.floor(d, s));
-        
-        d = 11.12333; s = -0.03499;
-        assertEquals("floor ", Double.NaN, MathX.floor(d, s));
-        
-        d = -11.12333; s = -0.03499;
-        assertEquals("floor ", -11.09183, MathX.floor(d, s));
-        
-        d = 100; s = 0.001;
-        assertEquals("floor ", 100, MathX.floor(d, s));
-        
-        d = -0.001; s = -9.99;
-        assertEquals("floor ", 0, MathX.floor(d, s));
-        
-        d = 4.42; s = 0.05;
-        assertEquals("floor ", 4.4, MathX.floor(d, s));
-        
-        d = 0.05; s = 4.42;
-        assertEquals("floor ", 0, MathX.floor(d, s));
-        
-        d = 0.6666; s = 3.33;
-        assertEquals("floor ", 0, MathX.floor(d, s));
-        
-        d = 2d/3; s = 3.33;
-        assertEquals("floor ", 0, MathX.floor(d, s));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java
deleted file mode 100644
index 7c19d44..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Tests for Excel function MID()
- *
- * @author Josh Micich
- */
-public final class TestMid extends TestCase {
-
-
-	private static ValueEval invokeMid(ValueEval text, ValueEval startPos, ValueEval numChars) {
-		ValueEval[] args = new ValueEval[] { text, startPos, numChars, };
-		return TextFunction.MID.evaluate(args, -1, (short)-1);
-	}
-
-	private void confirmMid(ValueEval text, ValueEval startPos, ValueEval numChars, String expected) {
-		ValueEval result = invokeMid(text, startPos, numChars);
-		assertEquals(StringEval.class, result.getClass());
-		assertEquals(expected, ((StringEval)result).getStringValue());
-	}
-
-	private void confirmMid(ValueEval text, ValueEval startPos, ValueEval numChars, ErrorEval expectedError) {
-		ValueEval result = invokeMid(text, startPos, numChars);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(expectedError.getErrorCode(), ((ErrorEval)result).getErrorCode());
-	}
-
-	public void testBasic() {
-
-		confirmMid(new StringEval("galactic"), new NumberEval(3), new NumberEval(4), "lact");
-	}
-
-	/**
-	 * Valid cases where args are not precisely (string, int, int) but can be resolved OK.
-	 */
-	public void testUnusualArgs() {
-		// startPos with fractional digits
-		confirmMid(new StringEval("galactic"), new NumberEval(3.1), new NumberEval(4), "lact");
-
-		// string startPos
-		confirmMid(new StringEval("galactic"), new StringEval("3"), new NumberEval(4), "lact");
-
-		// text (first) arg type is number, other args are strings with fractional digits
-		confirmMid(new NumberEval(123456), new StringEval("3.1"), new StringEval("2.9"), "34");
-
-		// startPos is 1x1 area ref, numChars is cell ref
-		AreaEval aeStart = EvalFactory.createAreaEval("A1:A1", new ValueEval[] { new NumberEval(2), } );
-		RefEval reNumChars = EvalFactory.createRefEval("B1", new NumberEval(3));
-		confirmMid(new StringEval("galactic"), aeStart, reNumChars, "ala");
-
-		confirmMid(new StringEval("galactic"), new NumberEval(3.1), BlankEval.instance, "");
-
-		confirmMid(new StringEval("galactic"), new NumberEval(3), BoolEval.FALSE, "");
-		confirmMid(new StringEval("galactic"), new NumberEval(3), BoolEval.TRUE, "l");
-		confirmMid(BlankEval.instance, new NumberEval(3), BoolEval.TRUE, "");
-
-	}
-
-	/**
-	 * Extreme values for startPos and numChars
-	 */
-	public void testExtremes() {
-		confirmMid(new StringEval("galactic"), new NumberEval(4), new NumberEval(400), "actic");
-
-		confirmMid(new StringEval("galactic"), new NumberEval(30), new NumberEval(4), "");
-		confirmMid(new StringEval("galactic"), new NumberEval(3), new NumberEval(0), "");
-	}
-
-	/**
-	 * All sorts of ways to make MID return defined errors.
-	 */
-	public void testErrors() {
-		confirmMid(ErrorEval.NAME_INVALID, new NumberEval(3), new NumberEval(4), ErrorEval.NAME_INVALID);
-		confirmMid(new StringEval("galactic"), ErrorEval.NAME_INVALID, new NumberEval(4), ErrorEval.NAME_INVALID);
-		confirmMid(new StringEval("galactic"), new NumberEval(3), ErrorEval.NAME_INVALID, ErrorEval.NAME_INVALID);
-		confirmMid(new StringEval("galactic"), ErrorEval.DIV_ZERO, ErrorEval.NAME_INVALID, ErrorEval.DIV_ZERO);
-
-		confirmMid(new StringEval("galactic"), BlankEval.instance, new NumberEval(3.1), ErrorEval.VALUE_INVALID);
-
-		confirmMid(new StringEval("galactic"), new NumberEval(0), new NumberEval(4), ErrorEval.VALUE_INVALID);
-		confirmMid(new StringEval("galactic"), new NumberEval(1), new NumberEval(-1), ErrorEval.VALUE_INVALID);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
deleted file mode 100644
index 6a92551..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link org.apache.poi.ss.formula.functions.Mirr}
- *
- * @author Carlos Delgado (carlos dot del dot est at gmail dot com)
- * @author Cedric Walter (cedric dot walter at gmail dot com)
- * @see {@link org.apache.poi.ss.formula.functions.TestIrr}
- */
-public final class TestMirr extends TestCase {
-
-    public void testMirr() {
-        Mirr mirr = new Mirr();
-        double mirrValue;
-
-        double financeRate = 0.12;
-        double reinvestRate = 0.1;
-        double[] values = {-120000d, 39000d, 30000d, 21000d, 37000d, 46000d, reinvestRate, financeRate};
-        try {
-            mirrValue = mirr.evaluate(values);
-        } catch (EvaluationException e) {
-            throw new AssertionFailedError("MIRR should not failed with these parameters" + e);
-        }
-        assertEquals("mirr", 0.126094130366, mirrValue, 0.0000000001);
-
-        reinvestRate = 0.05;
-        financeRate = 0.08;
-        values = new double[]{-7500d, 3000d, 5000d, 1200d, 4000d, reinvestRate, financeRate};
-        try {
-            mirrValue = mirr.evaluate(values);
-        } catch (EvaluationException e) {
-            throw new AssertionFailedError("MIRR should not failed with these parameters" + e);
-        }
-        assertEquals("mirr", 0.18736225093, mirrValue, 0.0000000001);
-
-        reinvestRate = 0.065;
-        financeRate = 0.1;
-        values = new double[]{-10000, 3400d, 6500d, 1000d, reinvestRate, financeRate};
-        try {
-            mirrValue = mirr.evaluate(values);
-        } catch (EvaluationException e) {
-            throw new AssertionFailedError("MIRR should not failed with these parameters" + e);
-        }
-        assertEquals("mirr", 0.07039493966, mirrValue, 0.0000000001);
-
-        reinvestRate = 0.07;
-        financeRate = 0.01;
-        values = new double[]{-10000d, -3400d, -6500d, -1000d, reinvestRate, financeRate};
-        try {
-            mirrValue = mirr.evaluate(values);
-        } catch (EvaluationException e) {
-            throw new AssertionFailedError("MIRR should not failed with these parameters" + e);
-        }
-        assertEquals("mirr", -1, mirrValue, 0.0);
-
-    }
-
-    public void testMirrErrors_expectDIV0() {
-        Mirr mirr = new Mirr();
-
-        double reinvestRate = 0.05;
-        double financeRate = 0.08;
-        double[] incomes = {120000d, 39000d, 30000d, 21000d, 37000d, 46000d, reinvestRate, financeRate};
-        try {
-            mirr.evaluate(incomes);
-        } catch (EvaluationException e) {
-            assertEquals(ErrorEval.DIV_ZERO, e.getErrorEval());
-            return;
-        }
-        throw new AssertionFailedError("MIRR should failed with all these positives values");
-    }
-
-
-    public void testEvaluateInSheet() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFRow row = sheet.createRow(0);
-
-        row.createCell(0).setCellValue(-7500d);
-        row.createCell(1).setCellValue(3000d);
-        row.createCell(2).setCellValue(5000d);
-        row.createCell(3).setCellValue(1200d);
-        row.createCell(4).setCellValue(4000d);
-
-        row.createCell(5).setCellValue(0.05d);
-        row.createCell(6).setCellValue(0.08d);
-
-        HSSFCell cell = row.createCell(7);
-        cell.setCellFormula("MIRR(A1:E1, F1, G1)");
-
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cell);
-        double res = cell.getNumericCellValue();
-        assertEquals(0.18736225093, res, 0.00000001);
-    }
-
-    public void testMirrFromSpreadsheet() {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("mirrTest.xls");
-        HSSFSheet sheet = wb.getSheet("Mirr");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        StringBuilder failures = new StringBuilder();
-        int failureCount = 0;
-        int[] resultRows = {9, 19, 29, 45};
-
-        for (int rowNum : resultRows) {
-            HSSFRow row = sheet.getRow(rowNum);
-            HSSFCell cellA = row.getCell(0);
-            try {
-                CellValue cv = fe.evaluate(cellA);
-                assertFormulaResult(cv, cellA);
-            } catch (Throwable e) {
-                if (failures.length() > 0) failures.append('\n');
-                failures.append("Row[").append(cellA.getRowIndex() + 1).append("]: ").append(cellA.getCellFormula()).append(" ");
-                failures.append(e.getMessage());
-                failureCount++;
-            }
-        }
-
-        HSSFRow row = sheet.getRow(37);
-        HSSFCell cellA = row.getCell(0);
-        CellValue cv = fe.evaluate(cellA);
-        assertEquals(ErrorEval.DIV_ZERO.getErrorCode(), cv.getErrorValue());
-
-        if (failures.length() > 0) {
-            throw new AssertionFailedError(failureCount + " IRR assertions failed:\n" + failures.toString());
-        }
-
-    }
-
-    private static void assertFormulaResult(CellValue cv, HSSFCell cell) {
-        double actualValue = cv.getNumberValue();
-        double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel
-        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellTypeEnum());
-        assertEquals(expectedValue, actualValue, 1E-8);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java
deleted file mode 100644
index 7952b5c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Test;
-
-/**
- * Tests for {@link FinanceFunction#NPER}
- */
-public final class TestNper {
-
-    @Test
-	public void testSimpleEvaluate() {
-		ValueEval[] args = {
-			new NumberEval(0.05),
-			new NumberEval(250),
-			new NumberEval(-1000),
-		};
-		ValueEval result = FinanceFunction.NPER.evaluate(args, 0, (short)0);
-
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(4.57353557, ((NumberEval)result).getNumberValue(), 0.00000001);
-	}
-
-    @Test
-	public void testEvaluate_bug_45732() throws IOException {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("Sheet1");
-		HSSFCell cell = sheet.createRow(0).createCell(0);
-
-		cell.setCellFormula("NPER(12,4500,100000,100000)");
-		cell.setCellValue(15.0);
-		assertEquals("NPER(12,4500,100000,100000)", cell.getCellFormula());
-		assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultTypeEnum());
-		assertEquals(15.0, cell.getNumericCellValue(), 0.0);
-
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		fe.evaluateFormulaCellEnum(cell);
-		assertEquals(CellType.ERROR, cell.getCachedFormulaResultTypeEnum());
-		assertEquals(FormulaError.NUM.getCode(), cell.getErrorCellValue());
-		wb.close();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
deleted file mode 100644
index f26b70f..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.CellValue;
-
-/**
- * Tests for {@link Npv}
- *
- * @author Marcel May
- * @see <a href="http://office.microsoft.com/en-us/excel-help/npv-HP005209199.aspx">Excel Help</a>
- */
-public final class TestNpv extends TestCase {
-
-    public void testEvaluateInSheetExample2() {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Sheet1");
-        HSSFRow row = sheet.createRow(0);
-
-        sheet.createRow(1).createCell(0).setCellValue(0.08d);
-        sheet.createRow(2).createCell(0).setCellValue(-40000d);
-        sheet.createRow(3).createCell(0).setCellValue(8000d);
-        sheet.createRow(4).createCell(0).setCellValue(9200d);
-        sheet.createRow(5).createCell(0).setCellValue(10000d);
-        sheet.createRow(6).createCell(0).setCellValue(12000d);
-        sheet.createRow(7).createCell(0).setCellValue(14500d);
-
-        HSSFCell cell = row.createCell(8);
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        // Enumeration
-        cell.setCellFormula("NPV(A2, A4,A5,A6,A7,A8)+A3");
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cell);
-        double res = cell.getNumericCellValue();
-        assertEquals(1922.06d, Math.round(res * 100d) / 100d);
-
-        // Range
-        cell.setCellFormula("NPV(A2, A4:A8)+A3");
-
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cell);
-        res = cell.getNumericCellValue();
-        assertEquals(1922.06d, Math.round(res * 100d) / 100d);
-    }
-
-    /**
-     * evaluate formulas with NPV and compare the result with
-     * the cached formula result pre-calculated by Excel
-     */
-    public void testNpvFromSpreadsheet(){
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("IrrNpvTestCaseData.xls");
-        HSSFSheet sheet = wb.getSheet("IRR-NPV");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-        StringBuffer failures = new StringBuffer();
-        int failureCount = 0;
-        // TODO YK: Formulas in rows 16 and 17 operate with ArrayPtg which isn't yet supported
-        // FormulaEvaluator as of r1041407 throws "Unexpected ptg class (org.apache.poi.ss.formula.ptg.ArrayPtg)"
-        for(int rownum = 9; rownum <= 15; rownum++){
-            HSSFRow row = sheet.getRow(rownum);
-            HSSFCell cellB = row.getCell(1);
-            try {
-                CellValue cv = fe.evaluate(cellB);
-                assertFormulaResult(cv, cellB);
-            } catch (Throwable e){
-                if(failures.length() > 0) failures.append('\n');
-                failures.append("Row[" + (cellB.getRowIndex() + 1)+ "]: " + cellB.getCellFormula() + " ");
-                failures.append(e.getMessage());
-                failureCount++;
-            }
-        }
-
-        if(failures.length() > 0) {
-            throw new AssertionFailedError(failureCount + " IRR evaluations failed:\n" + failures.toString());
-        }
-    }
-
-    private static void assertFormulaResult(CellValue cv, HSSFCell cell){
-        double actualValue = cv.getNumberValue();
-        double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel
-        assertEquals(expectedValue, actualValue, 1E-4); // should agree within 0.01%
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java
deleted file mode 100644
index 7599ec9..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link org.apache.poi.ss.formula.functions.Oct2Dec}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public final class TestOct2Dec extends TestCase {
-
-    private static ValueEval invokeValue(String number1) {
-		ValueEval[] args = new ValueEval[] { new StringEval(number1) };
-		return new Oct2Dec().evaluate(args, -1, -1);
-	}
-
-    private static void confirmValue(String msg, String number1, String expected) {
-		ValueEval result = invokeValue(number1);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(msg, expected, ((NumberEval) result).getStringValue());
-	}
-
-    private static void confirmValueError(String msg, String number1, ErrorEval numError) {
-        ValueEval result = invokeValue(number1);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-	public void testBasic() {
-		confirmValue("Converts octal '' to decimal (0)", "", "0");
-		confirmValue("Converts octal 54 to decimal (44)", "54", "44");
-		confirmValue("Converts octal 7777777533 to decimal (-165)", "7777777533", "-165");
-		confirmValue("Converts octal 7000000000 to decimal (-134217728)", "7000000000", "-134217728");
-		confirmValue("Converts octal 7776667533 to decimal (-299173)", "7776667533", "-299173");
-	}
-
-    public void testErrors() {
-        confirmValueError("not a valid octal number","ABCDEFGH", ErrorEval.NUM_ERROR);
-        confirmValueError("not a valid octal number","99999999", ErrorEval.NUM_ERROR);
-        confirmValueError("not a valid octal number","3.14159", ErrorEval.NUM_ERROR);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
deleted file mode 100644
index 24d3472..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.functions.Offset.LinearOffsetRange;
-
-/**
- * Tests for OFFSET function implementation
- *
- * @author Josh Micich
- */
-public final class TestOffset extends TestCase {
-
-	private static void confirmDoubleConvert(double doubleVal, int expected) {
-		try {
-			assertEquals(expected, Offset.evaluateIntArg(new NumberEval(doubleVal), -1, -1));
-		} catch (EvaluationException e) {
-			throw new AssertionFailedError("Unexpected error '" + e.getErrorEval().toString() + "'.");
-		}
-	}
-	/**
-	 * Excel's double to int conversion (for function 'OFFSET()') behaves more like Math.floor().
-	 * Note - negative values are not symmetrical
-	 * Fractional values are silently truncated.
-	 * Truncation is toward negative infinity.
-	 */
-	public void testDoubleConversion() {
-
-		confirmDoubleConvert(100.09, 100);
-		confirmDoubleConvert(100.01, 100);
-		confirmDoubleConvert(100.00, 100);
-		confirmDoubleConvert(99.99, 99);
-
-		confirmDoubleConvert(+2.01, +2);
-		confirmDoubleConvert(+2.00, +2);
-		confirmDoubleConvert(+1.99, +1);
-		confirmDoubleConvert(+1.01, +1);
-		confirmDoubleConvert(+1.00, +1);
-		confirmDoubleConvert(+0.99,  0);
-		confirmDoubleConvert(+0.01,  0);
-		confirmDoubleConvert( 0.00,  0);
-		confirmDoubleConvert(-0.01, -1);
-		confirmDoubleConvert(-0.99, -1);
-		confirmDoubleConvert(-1.00, -1);
-		confirmDoubleConvert(-1.01, -2);
-		confirmDoubleConvert(-1.99, -2);
-		confirmDoubleConvert(-2.00, -2);
-		confirmDoubleConvert(-2.01, -3);
-	}
-
-	public void testLinearOffsetRange() {
-		LinearOffsetRange lor;
-
-		lor = new LinearOffsetRange(3, 2);
-		assertEquals(3, lor.getFirstIndex());
-		assertEquals(4, lor.getLastIndex());
-		lor = lor.normaliseAndTranslate(0); // expected no change
-		assertEquals(3, lor.getFirstIndex());
-		assertEquals(4, lor.getLastIndex());
-
-		lor = lor.normaliseAndTranslate(5);
-		assertEquals(8, lor.getFirstIndex());
-		assertEquals(9, lor.getLastIndex());
-
-		// negative length
-
-		lor = new LinearOffsetRange(6, -4).normaliseAndTranslate(0);
-		assertEquals(3, lor.getFirstIndex());
-		assertEquals(6, lor.getLastIndex());
-
-
-		// bounds checking
-		lor = new LinearOffsetRange(0, 100);
-		assertFalse(lor.isOutOfBounds(0, 16383));
-		lor = lor.normaliseAndTranslate(16300);
-		assertTrue(lor.isOutOfBounds(0, 16383));
-		assertFalse(lor.isOutOfBounds(0, 65535));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java
deleted file mode 100644
index 45472f6..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Test cases for PPMT()
- *
- */
-public final class TestPPMT extends TestCase {
-
-
-    /**
-     *  http://office.microsoft.com/en-001/excel-help/ppmt-function-HP010342774.aspx
-     */
-    public void testFromFile() {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("finance.xls");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        HSSFSheet example1 = wb.getSheet("PPMT");
-        HSSFCell ex1cell1 = example1.getRow(5).getCell(0);
-        fe.evaluate(ex1cell1);
-        assertEquals(-75.62, ex1cell1.getNumericCellValue(), 0.1);
-
-        HSSFCell ex1cell2 = example1.getRow(16).getCell(0);
-        fe.evaluate(ex1cell2);
-        assertEquals(-27598.05, ex1cell2.getNumericCellValue(), 0.1);
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
deleted file mode 100644
index f408a42..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Test;
-
-public final class TestPmt {
-
-	private static void confirm(double expected, NumberEval ne) {
-		// only asserting accuracy to 4 fractional digits
-		assertEquals(expected, ne.getNumberValue(), 0.00005);
-	}
-	private static ValueEval invoke(ValueEval[] args) {
-		return FinanceFunction.PMT.evaluate(args, -1, (short)-1);
-	}
-	/**
-	 * Invocation when not expecting an error result
-	 */
-	private static NumberEval invokeNormal(ValueEval[] args) {
-		ValueEval ev = invoke(args);
-		if(ev instanceof ErrorEval) {
-			fail("Normal evaluation failed with error code: " + ev.toString());
-		}
-		return (NumberEval) ev;
-	}
-
-	private static void confirm(double expected, double rate, double nper, double pv, double fv, boolean isBeginning) {
-		ValueEval[] args = {
-				new NumberEval(rate),
-				new NumberEval(nper),
-				new NumberEval(pv),
-				new NumberEval(fv),
-				new NumberEval(isBeginning ? 1 : 0),
-		};
-		confirm(expected, invokeNormal(args));
-	}
-
-	@Test
-	public void testBasic() {
-		confirm(-1037.0321, (0.08/12), 10, 10000, 0, false);
-		confirm(-1030.1643, (0.08/12), 10, 10000, 0, true);
-	}
-
-	@Test
-	public void test3args() {
-
-		ValueEval[] args = {
-				new NumberEval(0.005),
-				new NumberEval(24),
-				new NumberEval(1000),
-		};
-		ValueEval ev = invoke(args);
-		if(ev instanceof ErrorEval) {
-			ErrorEval err = (ErrorEval) ev;
-			if(err.getErrorCode() == FormulaError.VALUE.getCode()) {
-				fail("Identified bug 44691");
-			}
-		}
-
-		confirm(-44.3206, invokeNormal(args));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
deleted file mode 100644
index e18d66e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for Excel function POISSON(x,mean,cumulative)
- * @author Kalpesh Parmar
- */
-public class TestPoisson extends TestCase {
-
-    private static final double DELTA = 1E-15;
-
-    private static ValueEval invokePoisson(double x, double mean, boolean cumulative)
-    {
-
-        ValueEval[] valueEvals = new ValueEval[3];
-        valueEvals[0] = new NumberEval(x);
-        valueEvals[1] = new NumberEval(mean);
-        valueEvals[2] = BoolEval.valueOf(cumulative);
-
-        return NumericFunction.POISSON.evaluate(valueEvals,-1,-1);
-	}
-
-    public void testCumulativeProbability()
-    {
-        double x = 1;
-        double mean = 0.2;
-        double result = 0.9824769036935787; // known result
-
-        NumberEval myResult = (NumberEval)invokePoisson(x,mean,true);
-
-        assertEquals(myResult.getNumberValue(), result, DELTA);
-    }
-
-    public void testNonCumulativeProbability()
-    {
-        double x = 0;
-        double mean = 0.2;
-        double result = 0.8187307530779818; // known result
-        
-        NumberEval myResult = (NumberEval)invokePoisson(x,mean,false);
-
-        assertEquals(myResult.getNumberValue(), result, DELTA);
-    }
-
-    public void testNegativeMean()
-    {
-        double x = 0;
-        double mean = -0.2;
-
-        ErrorEval myResult = (ErrorEval)invokePoisson(x,mean,false);
-
-        assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), myResult.getErrorCode());
-    }
-
-    public void testNegativeX()
-    {
-        double x = -1;
-        double mean = 0.2;
-
-        ErrorEval myResult = (ErrorEval)invokePoisson(x,mean,false);
-
-        assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), myResult.getErrorCode());    
-    }
-
-
-
-    public void testXAsDecimalNumber()
-    {
-        double x = 1.1;
-        double mean = 0.2;
-        double result = 0.9824769036935787; // known result
-
-        NumberEval myResult = (NumberEval)invokePoisson(x,mean,true);
-
-        assertEquals(myResult.getNumberValue(), result, DELTA);
-    }
-
-    public void testXZeroMeanZero()
-    {
-        double x = 0;
-        double mean = 0;
-        double result = 1; // known result in excel
-
-        NumberEval myResult = (NumberEval)invokePoisson(x,mean,true);
-
-        assertEquals(myResult.getNumberValue(), result, DELTA);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java
deleted file mode 100644
index 05c6a0a..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link Quotient}
- *
- * @author cedric dot walter @ gmail dot com
- */
-public class TestQuotient extends TestCase {
-    private static ValueEval invokeValue(String numerator, String denominator) {
-        ValueEval[] args = new ValueEval[]{new StringEval(numerator), new StringEval(denominator)};
-        return new Quotient().evaluate(args, -1, -1);
-    }
-
-    private static void confirmValue(String msg, String numerator, String denominator, String expected) {
-        ValueEval result = invokeValue(numerator, denominator);
-        assertEquals(NumberEval.class, result.getClass());
-        assertEquals(msg, expected, ((NumberEval) result).getStringValue());
-    }
-
-    private static void confirmValueError(String msg, String numerator, String denominator, ErrorEval numError) {
-        ValueEval result = invokeValue(numerator, denominator);
-        assertEquals(ErrorEval.class, result.getClass());
-        assertEquals(msg, numError, result);
-    }
-
-    public void testBasic() {
-        confirmValue("Integer portion of 5/2 (2)", "5", "2", "2");
-        confirmValue("Integer portion of 4.5/3.1 (1)", "4.5", "3.1", "1");
-
-        confirmValue("Integer portion of -10/3 (-3)", "-10", "3", "-3");
-        confirmValue("Integer portion of -5.5/2 (-2)", "-5.5", "2", "-2");
-
-        confirmValue("Integer portion of Pi/Avogadro (0)", "3.14159", "6.02214179E+23", "0");
-    }
-
-    public void testErrors() {
-        confirmValueError("numerator is nonnumeric", "ABCD", "", ErrorEval.VALUE_INVALID);
-        confirmValueError("denominator is nonnumeric", "", "ABCD", ErrorEval.VALUE_INVALID);
-
-        confirmValueError("dividing by zero", "3.14159", "0", ErrorEval.DIV_ZERO);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
deleted file mode 100644
index 62c4c10..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests QUOTIENT() as loaded from a test data spreadsheet.<p/>
- */
-public class TestQuotientFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestQuotientFunctionsFromSpreadsheet.class, "QuotientFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java
deleted file mode 100644
index b62dffa..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellReference;
-
-/**
- * Test cases for RANK()
- */
-public final class TestRank extends TestCase {
-
-    public void testFromFile() {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("rank.xls");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        HSSFSheet example1 = wb.getSheet("Example 1");
-        HSSFCell ex1cell1 = example1.getRow(7).getCell(0);
-        assertEquals(3.0, fe.evaluate(ex1cell1).getNumberValue());
-        HSSFCell ex1cell2 = example1.getRow(8).getCell(0);
-        assertEquals(5.0, fe.evaluate(ex1cell2).getNumberValue());
-
-        HSSFSheet example2 = wb.getSheet("Example 2");
-        for(int rownum = 1; rownum<= 10; rownum ++){
-            HSSFCell cell = example2.getRow(rownum).getCell(2);
-            double cachedResult = cell.getNumericCellValue(); //cached formula result
-            assertEquals(cachedResult, fe.evaluate(cell).getNumberValue());
-        }
-
-        HSSFSheet example3 = wb.getSheet("Example 3");
-        for(int rownum = 1; rownum<= 10; rownum ++){
-            HSSFCell cellD = example3.getRow(rownum).getCell(3);
-            double cachedResultD = cellD.getNumericCellValue(); //cached formula result
-            assertEquals(new CellReference(cellD).formatAsString(), cachedResultD, fe.evaluate(cellD).getNumberValue());
-
-            HSSFCell cellE = example3.getRow(rownum).getCell(4);
-            double cachedResultE = cellE.getNumericCellValue(); //cached formula result
-            assertEquals(new CellReference(cellE).formatAsString(), cachedResultE, fe.evaluate(cellE).getNumberValue());
-
-            HSSFCell cellF = example3.getRow(rownum).getCell(5);
-            double cachedResultF = cellF.getNumericCellValue(); //cached formula result
-            assertEquals(new CellReference(cellF).formatAsString(), cachedResultF, fe.evaluate(cellF).getNumberValue());
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
deleted file mode 100644
index c0c11ea..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests REPT() as loaded from a test data spreadsheet.<p/>
- */
-public class TestReptFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestReptFunctionsFromSpreadsheet.class, "ReptFunctionTestCaseData.xls");
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
deleted file mode 100644
index 687c7b8..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests Roman() as loaded from a test data spreadsheet.<p/>
- */
-public class TestRomanFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestRomanFunctionsFromSpreadsheet.class, "RomanFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
deleted file mode 100644
index 5d2398d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-
-/**
- * Test cases for ROUND(), ROUNDUP(), ROUNDDOWN()
- *
- * @author Josh Micich
- */
-public final class TestRoundFuncs extends TestCase {
-	private static final NumericFunction F = null;
-	public void testRounddownWithStringArg() {
-
-		ValueEval strArg = new StringEval("abc");
-		ValueEval[] args = { strArg, new NumberEval(2), };
-		ValueEval result = NumericFunction.ROUNDDOWN.evaluate(args, -1, (short)-1);
-		assertEquals(ErrorEval.VALUE_INVALID, result);
-	}
-
-	public void testRoundupWithStringArg() {
-
-		ValueEval strArg = new StringEval("abc");
-		ValueEval[] args = { strArg, new NumberEval(2), };
-		ValueEval result = NumericFunction.ROUNDUP.evaluate(args, -1, (short)-1);
-		assertEquals(ErrorEval.VALUE_INVALID, result);
-	}
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java
deleted file mode 100644
index a27a63e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for ROW(), ROWS(), COLUMN(), COLUMNS()
- *
- * @author Josh Micich
- */
-public final class TestRowCol extends TestCase {
-
-	public void testCol() {
-		Function target = new Column();
-		{
-			ValueEval[] args = { EvalFactory.createRefEval("C5"), };
-			double actual = NumericFunctionInvoker.invoke(target, args);
-			assertEquals(3, actual, 0D);
-		}
-		{
-			ValueEval[] args = { EvalFactory.createAreaEval("E2:H12", new ValueEval[44]), };
-			double actual = NumericFunctionInvoker.invoke(target, args);
-			assertEquals(5, actual, 0D);
-		}
-	}
-
-	public void testRow() {
-		Function target = new RowFunc();
-		{
-			ValueEval[] args = { EvalFactory.createRefEval("C5"), };
-			double actual = NumericFunctionInvoker.invoke(target, args);
-			assertEquals(5, actual, 0D);
-		}
-		{
-			ValueEval[] args = { EvalFactory.createAreaEval("E2:H12", new ValueEval[44]), };
-			double actual = NumericFunctionInvoker.invoke(target, args);
-			assertEquals(2, actual, 0D);
-		}
-	}
-
-	public void testColumns() {
-
-		confirmColumnsFunc("A1:F1", 6, 1);
-		confirmColumnsFunc("A1:C2", 3, 2);
-		confirmColumnsFunc("A1:B3", 2, 3);
-		confirmColumnsFunc("A1:A6", 1, 6);
-
-		ValueEval[] args = { EvalFactory.createRefEval("C5"), };
-		double actual = NumericFunctionInvoker.invoke(new Columns(), args);
-		assertEquals(1, actual, 0D);
-	}
-
-	public void testRows() {
-
-		confirmRowsFunc("A1:F1", 6, 1);
-		confirmRowsFunc("A1:C2", 3, 2);
-		confirmRowsFunc("A1:B3", 2, 3);
-		confirmRowsFunc("A1:A6", 1, 6);
-
-		ValueEval[] args = { EvalFactory.createRefEval("C5"), };
-		double actual = NumericFunctionInvoker.invoke(new Rows(), args);
-		assertEquals(1, actual, 0D);
-	}
-
-	private static void confirmRowsFunc(String areaRefStr, int nCols, int nRows) {
-		ValueEval[] args = { EvalFactory.createAreaEval(areaRefStr, new ValueEval[nCols * nRows]), };
-
-		double actual = NumericFunctionInvoker.invoke(new Rows(), args);
-		assertEquals(nRows, actual, 0D);
-	}
-
-
-	private static void confirmColumnsFunc(String areaRefStr, int nCols, int nRows) {
-		ValueEval[] args = { EvalFactory.createAreaEval(areaRefStr, new ValueEval[nCols * nRows]), };
-
-		double actual = NumericFunctionInvoker.invoke(new Columns(), args);
-		assertEquals(nCols, actual, 0D);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java
deleted file mode 100644
index db5fee1..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Test for Excel function SLOPE()
- *
- * @author Johan Karlsteen
- */
-public final class TestSlope extends TestCase {
-	private static final Function SLOPE = new Slope();
-
-	private static ValueEval invoke(Function function, ValueEval xArray, ValueEval yArray) {
-		ValueEval[] args = new ValueEval[] { xArray, yArray, };
-		return function.evaluate(args, -1, (short)-1);
-	}
-
-	private void confirm(Function function, ValueEval xArray, ValueEval yArray, double expected) {
-		ValueEval result = invoke(function, xArray, yArray);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval)result).getNumberValue(), 0);
-	}
-	private void confirmError(Function function, ValueEval xArray, ValueEval yArray, ErrorEval expectedError) {
-		ValueEval result = invoke(function, xArray, yArray);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(expectedError.getErrorCode(), ((ErrorEval)result).getErrorCode());
-	}
-
-	private void confirmError(ValueEval xArray, ValueEval yArray, ErrorEval expectedError) {
-		confirmError(SLOPE, xArray, yArray, expectedError);
-	}
-
-	public void testBasic() {
-		Double exp = Math.pow(10, 7.5);
-		ValueEval[] yValues = {
-			new NumberEval(3+exp),
-			new NumberEval(4+exp),
-			new NumberEval(2+exp),
-			new NumberEval(5+exp),
-			new NumberEval(4+exp),
-			new NumberEval(7+exp),
-		};
-		ValueEval areaEvalY = createAreaEval(yValues);
-
-		ValueEval[] xValues = {
-			new NumberEval(1),
-			new NumberEval(2),
-			new NumberEval(3),
-			new NumberEval(4),
-			new NumberEval(5),
-			new NumberEval(6),
-		};
-		ValueEval areaEvalX = createAreaEval(xValues);
-		confirm(SLOPE, areaEvalX, areaEvalY, 0.7752808988764045);
-		// Excel 2010 gives 0.775280898876405
-	}
-
-	/**
-	 * number of items in array is not limited to 30
-	 */
-	public void testLargeArrays() {
-		ValueEval[] yValues = createMockNumberArray(100, 3); // [1,2,0,1,2,0,...,0,1]
-		yValues[0] = new NumberEval(2.0); // Changes first element to 2
-		ValueEval[] xValues = createMockNumberArray(100, 101); // [1,2,3,4,...,99,100]
-
-		confirm(SLOPE, createAreaEval(xValues), createAreaEval(yValues), -1.231527093596059);
-		// Excel 2010 gives -1.23152709359606
-	}
-
-	private ValueEval[] createMockNumberArray(int size, double value) {
-		ValueEval[] result = new ValueEval[size];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new NumberEval((i+1)%value);
-		}
-		return result;
-	}
-
-	private static ValueEval createAreaEval(ValueEval[] values) {
-		String refStr = "A1:A" + values.length;
-		return EvalFactory.createAreaEval(refStr, values);
-	}
-
-	public void testErrors() {
-		ValueEval[] xValues = {
-				ErrorEval.REF_INVALID,
-				new NumberEval(2),
-		};
-		ValueEval areaEvalX = createAreaEval(xValues);
-		ValueEval[] yValues = {
-				new NumberEval(2),
-				ErrorEval.NULL_INTERSECTION,
-		};
-		ValueEval areaEvalY = createAreaEval(yValues);
-		ValueEval[] zValues = { // wrong size
-				new NumberEval(2),
-		};
-		ValueEval areaEvalZ = createAreaEval(zValues);
-
-		// if either arg is an error, that error propagates
-		confirmError(ErrorEval.REF_INVALID, ErrorEval.NAME_INVALID, ErrorEval.REF_INVALID);
-		confirmError(areaEvalX, ErrorEval.NAME_INVALID, ErrorEval.NAME_INVALID);
-		confirmError(ErrorEval.NAME_INVALID, areaEvalX, ErrorEval.NAME_INVALID);
-
-		// array sizes must match
-		confirmError(areaEvalX, areaEvalZ, ErrorEval.NA);
-		confirmError(areaEvalZ, areaEvalY, ErrorEval.NA);
-
-		// any error in an array item propagates up
-		confirmError(areaEvalX, areaEvalX, ErrorEval.REF_INVALID);
-
-		// search for errors array by array, not pair by pair
-		confirmError(areaEvalX, areaEvalY, ErrorEval.NULL_INTERSECTION);
-		confirmError(areaEvalY, areaEvalX, ErrorEval.REF_INVALID);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
deleted file mode 100644
index cd0176f..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * Created on May 30, 2005
- *
- */
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.AssertionFailedError;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.EvaluationException;
-
-
-/**
- * @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
- *
- */
-public class TestStatsLib extends AbstractNumericTestCase {
-
-    public void testDevsq() {
-        double[] v = null;
-        double d, x = 0;
-        
-        v = new double[] {1,2,3,4,5,6,7,8,9,10};
-        d = StatsLib.devsq(v);
-        x = 82.5;
-        assertEquals("devsq ", x, d);
-        
-        v = new double[] {1,1,1,1,1,1,1,1,1,1};
-        d = StatsLib.devsq(v);
-        x = 0;
-        assertEquals("devsq ", x, d);
-        
-        v = new double[] {0,0,0,0,0,0,0,0,0,0};
-        d = StatsLib.devsq(v);
-        x = 0;
-        assertEquals("devsq ", x, d);
-        
-        v = new double[] {1,2,1,2,1,2,1,2,1,2};
-        d = StatsLib.devsq(v);
-        x = 2.5;
-        assertEquals("devsq ", x, d);
-        
-        v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999};
-        d = StatsLib.devsq(v);
-        x = 10953.7416965767;
-        assertEquals("devsq ", x, d);
-        
-        v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10};
-        d = StatsLib.devsq(v);
-        x = 82.5;
-        assertEquals("devsq ", x, d);
-    }
-
-    public void testKthLargest() {
-        double[] v = null;
-        double d, x = 0;
-        
-        v = new double[] {1,2,3,4,5,6,7,8,9,10};
-        d = StatsLib.kthLargest(v, 3);
-        x = 8;
-        assertEquals("kthLargest ", x, d);
-        
-        v = new double[] {1,1,1,1,1,1,1,1,1,1};
-        d = StatsLib.kthLargest(v, 3);
-        x = 1;
-        assertEquals("kthLargest ", x, d);
-        
-        v = new double[] {0,0,0,0,0,0,0,0,0,0};
-        d = StatsLib.kthLargest(v, 3);
-        x = 0;
-        assertEquals("kthLargest ", x, d);
-        
-        v = new double[] {1,2,1,2,1,2,1,2,1,2};
-        d = StatsLib.kthLargest(v, 3);
-        x = 2;
-        assertEquals("kthLargest ", x, d);
-        
-        v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999};
-        d = StatsLib.kthLargest(v, 3);
-        x = 5.37828;
-        assertEquals("kthLargest ", x, d);
-        
-        v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10};
-        d = StatsLib.kthLargest(v, 3);
-        x = -3;
-        assertEquals("kthLargest ", x, d);
-    }
-
-    public void testKthSmallest() {
-    }
-
-    public void testAvedev() {
-        double[] v = null;
-        double d, x = 0;
-        
-        v = new double[] {1,2,3,4,5,6,7,8,9,10};
-        d = StatsLib.avedev(v);
-        x = 2.5;
-        assertEquals("avedev ", x, d);
-        
-        v = new double[] {1,1,1,1,1,1,1,1,1,1};
-        d = StatsLib.avedev(v);
-        x = 0;
-        assertEquals("avedev ", x, d);
-        
-        v = new double[] {0,0,0,0,0,0,0,0,0,0};
-        d = StatsLib.avedev(v);
-        x = 0;
-        assertEquals("avedev ", x, d);
-        
-        v = new double[] {1,2,1,2,1,2,1,2,1,2};
-        d = StatsLib.avedev(v);
-        x = 0.5;
-        assertEquals("avedev ", x, d);
-        
-        v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999};
-        d = StatsLib.avedev(v);
-        x = 36.42176053333;
-        assertEquals("avedev ", x, d);
-        
-        v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10};
-        d = StatsLib.avedev(v);
-        x = 2.5;
-        assertEquals("avedev ", x, d);
-    }
-
-    public void testMedian() {
-        double[] v = null;
-        double d, x = 0;
-        
-        v = new double[] {1,2,3,4,5,6,7,8,9,10};
-        d = StatsLib.median(v);
-        x = 5.5;
-        assertEquals("median ", x, d);
-        
-        v = new double[] {1,1,1,1,1,1,1,1,1,1};
-        d = StatsLib.median(v);
-        x = 1;
-        assertEquals("median ", x, d);
-        
-        v = new double[] {0,0,0,0,0,0,0,0,0,0};
-        d = StatsLib.median(v);
-        x = 0;
-        assertEquals("median ", x, d);
-        
-        v = new double[] {1,2,1,2,1,2,1,2,1,2};
-        d = StatsLib.median(v);
-        x = 1.5;
-        assertEquals("median ", x, d);
-        
-        v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999};
-        d = StatsLib.median(v);
-        x = 5.37828;
-        assertEquals("median ", x, d);
-        
-        v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10};
-        d = StatsLib.median(v);
-        x = -5.5;
-        assertEquals("median ", x, d);
-        
-        v = new double[] {-2,-3,-4,-5,-6,-7,-8,-9,-10};
-        d = StatsLib.median(v);
-        x = -6;
-        assertEquals("median ", x, d);
-        
-        v = new double[] {1,2,3,4,5,6,7,8,9};
-        d = StatsLib.median(v);
-        x = 5;
-        assertEquals("median ", x, d);
-    }
-
-    public void testMode() {
-        double[] v;
-        double d, x = 0;
-        
-        v = new double[] {1,2,3,4,5,6,7,8,9,10};
-        confirmMode(v, null);
-        
-        v = new double[] {1,1,1,1,1,1,1,1,1,1};
-        confirmMode(v, 1.0);
-        
-        v = new double[] {0,0,0,0,0,0,0,0,0,0};
-        confirmMode(v, 0.0);
-        
-        v = new double[] {1,2,1,2,1,2,1,2,1,2};
-        confirmMode(v, 1.0);
-        
-        v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999};
-        confirmMode(v, null);
-        
-        v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10};
-        confirmMode(v, null);
-        
-        v = new double[] {1,2,3,4,1,1,1,1,0,0,0,0,0};
-        confirmMode(v, 1.0);
-        
-        v = new double[] {0,1,2,3,4,1,1,1,0,0,0,0,1};
-        confirmMode(v, 0.0);
-    }
-    private static void confirmMode(double[] v, double expectedResult) {
-    	confirmMode(v, new Double(expectedResult));
-    }
-    private static void confirmMode(double[] v, Double expectedResult) {
-    	double actual;
-		try {
-			actual = Mode.evaluate(v);
-			if (expectedResult == null) {
-				throw new AssertionFailedError("Expected N/A exception was not thrown");
-			}
-		} catch (EvaluationException e) {
-			if (expectedResult == null) {
-				assertEquals(ErrorEval.NA, e.getErrorEval());
-				return;
-			}
-			throw new RuntimeException(e);
-		}
-    	assertEquals("mode", expectedResult.doubleValue(), actual);
-    }
-    
-
-    public void testStddev() {
-        double[] v = null;
-        double d, x = 0;
-        
-        v = new double[] {1,2,3,4,5,6,7,8,9,10};
-        d = StatsLib.stdev(v);
-        x = 3.02765035410;
-        assertEquals("stdev ", x, d);
-        
-        v = new double[] {1,1,1,1,1,1,1,1,1,1};
-        d = StatsLib.stdev(v);
-        x = 0;
-        assertEquals("stdev ", x, d);
-        
-        v = new double[] {0,0,0,0,0,0,0,0,0,0};
-        d = StatsLib.stdev(v);
-        x = 0;
-        assertEquals("stdev ", x, d);
-        
-        v = new double[] {1,2,1,2,1,2,1,2,1,2};
-        d = StatsLib.stdev(v);
-        x = 0.52704627669;
-        assertEquals("stdev ", x, d);
-        
-        v = new double[] {123.12,33.3333,2d/3d,5.37828,0.999};
-        d = StatsLib.stdev(v);
-        x = 52.33006233652;
-        assertEquals("stdev ", x, d);
-        
-        v = new double[] {-1,-2,-3,-4,-5,-6,-7,-8,-9,-10};
-        d = StatsLib.stdev(v);
-        x = 3.02765035410;
-        assertEquals("stdev ", x, d);
-    }
-
-    public void testVar() {
-        double[] v = null;
-        double d, x = 0;
-
-        v = new double[] {3.50, 5.00, 7.23, 2.99};
-        d = StatsLib.var(v);
-        x = 3.6178;
-        assertEquals("var ", x, d);
-
-        v = new double[] {34.5, 2.0, 8.9, -4.0};
-        d = StatsLib.var(v);
-        x = 286.99;
-        assertEquals("var ", x, d);
-
-        v = new double[] {7.0, 25.0, 21.69};
-        d = StatsLib.var(v);
-        x = 91.79203333;
-        assertEquals("var ", x, d);
-
-        v = new double[] {1345,1301,1368,1322,1310,1370,1318,1350,1303,1299};
-        d = StatsLib.var(v);
-        x = 754.2666667;
-        assertEquals("var ", x, d);
-    }
-
-    public void testVarp() {
-        double[] v = null;
-        double d, x = 0;
-
-        v = new double[] {3.50, 5.00, 7.23, 2.99};
-        d = StatsLib.varp(v);
-        x = 2.71335;
-        assertEquals("varp ", x, d);
-
-        v = new double[] {34.5, 2.0, 8.9, -4.0};
-        d = StatsLib.varp(v);
-        x = 215.2425;
-        assertEquals("varp ", x, d);
-
-        v = new double[] {7.0, 25.0, 21.69};
-        d = StatsLib.varp(v);
-        x = 61.19468889;
-        assertEquals("varp ", x, d);
-
-        v = new double[] {1345,1301,1368,1322,1310,1370,1318,1350,1303,1299};
-        d = StatsLib.varp(v);
-        x = 678.84;
-        assertEquals("varp ", x, d);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
deleted file mode 100644
index f2750b5..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.formula.eval.*;
-
-import junit.framework.TestCase;
-import org.apache.poi.ss.usermodel.*;
-
-/**
- * Tests for {@link Subtotal}
- *
- * @author Paul Tomlin
- */
-public final class TestSubtotal extends TestCase {
-	private static final int FUNCTION_AVERAGE = 1;
-	private static final int FUNCTION_COUNT = 2;
-	private static final int FUNCTION_MAX = 4;
-	private static final int FUNCTION_MIN = 5;
-	private static final int FUNCTION_PRODUCT = 6;
-	private static final int FUNCTION_STDEV = 7;
-	private static final int FUNCTION_SUM = 9;
-
-	private static final double[] TEST_VALUES0 = {
-		1, 2,
-		3, 4,
-		5, 6,
-		7, 8,
-		9, 10
-	};
-
-	private static void confirmSubtotal(int function, double expected) {
-		ValueEval[] values = new ValueEval[TEST_VALUES0.length];
-		for (int i = 0; i < TEST_VALUES0.length; i++) {
-			values[i] = new NumberEval(TEST_VALUES0[i]);
-		}
-
-		AreaEval arg1 = EvalFactory.createAreaEval("C1:D5", values);
-		ValueEval args[] = { new NumberEval(function), arg1 };
-
-		ValueEval result = new Subtotal().evaluate(args, 0, 0);
-
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval) result).getNumberValue(), 0.0);
-	}
-
-	public void testBasics() {
-		confirmSubtotal(FUNCTION_SUM, 55.0);
-		confirmSubtotal(FUNCTION_AVERAGE, 5.5);
-		confirmSubtotal(FUNCTION_COUNT, 10.0);
-		confirmSubtotal(FUNCTION_MAX, 10.0);
-		confirmSubtotal(FUNCTION_MIN, 1.0);
-		confirmSubtotal(FUNCTION_PRODUCT, 3628800.0);
-		confirmSubtotal(FUNCTION_STDEV, 3.0276503540974917);
-	}
-
-     public void testAvg(){
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellValue(3);
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(1,B2:B3)");
-        Cell a4 = sh.createRow(4).createCell(1);
-        a4.setCellValue(1);
-        Cell a5 = sh.createRow(5).createCell(1);
-        a5.setCellValue(7);
-        Cell a6 = sh.createRow(6).createCell(1);
-        a6.setCellFormula("SUBTOTAL(1,B2:B6)*2 + 2");
-        Cell a7 = sh.createRow(7).createCell(1);
-        a7.setCellFormula("SUBTOTAL(1,B2:B7)");
-        Cell a8 = sh.createRow(8).createCell(1);
-        a8.setCellFormula("SUBTOTAL(1,B2,B3,B4,B5,B6,B7,B8)");
-
-        fe.evaluateAll();
-
-        assertEquals(2.0, a3.getNumericCellValue());
-        assertEquals(8.0, a6.getNumericCellValue());
-        assertEquals(3.0, a7.getNumericCellValue());
-        assertEquals(3.0, a8.getNumericCellValue());
-    }
-
-    public void testSum(){
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellValue(3);
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(9,B2:B3)");
-        Cell a4 = sh.createRow(4).createCell(1);
-        a4.setCellValue(1);
-        Cell a5 = sh.createRow(5).createCell(1);
-        a5.setCellValue(7);
-        Cell a6 = sh.createRow(6).createCell(1);
-        a6.setCellFormula("SUBTOTAL(9,B2:B6)*2 + 2");
-        Cell a7 = sh.createRow(7).createCell(1);
-        a7.setCellFormula("SUBTOTAL(9,B2:B7)");
-        Cell a8 = sh.createRow(8).createCell(1);
-        a8.setCellFormula("SUBTOTAL(9,B2,B3,B4,B5,B6,B7,B8)");
-
-        fe.evaluateAll();
-
-        assertEquals(4.0, a3.getNumericCellValue());
-        assertEquals(26.0, a6.getNumericCellValue());
-        assertEquals(12.0, a7.getNumericCellValue());
-        assertEquals(12.0, a8.getNumericCellValue());
-    }
-
-    public void testCount(){
-
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellValue(3);
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(2,B2:B3)");
-        Cell a4 = sh.createRow(4).createCell(1);
-        a4.setCellValue("POI");                  // A4 is string and not counted
-        /*Cell a5 =*/ sh.createRow(5).createCell(1); // A5 is blank and not counted
-
-        Cell a6 = sh.createRow(6).createCell(1);
-        a6.setCellFormula("SUBTOTAL(2,B2:B6)*2 + 2");
-        Cell a7 = sh.createRow(7).createCell(1);
-        a7.setCellFormula("SUBTOTAL(2,B2:B7)");
-        Cell a8 = sh.createRow(8).createCell(1);
-        a8.setCellFormula("SUBTOTAL(2,B2,B3,B4,B5,B6,B7,B8)");
-
-        fe.evaluateAll();
-
-        assertEquals(2.0, a3.getNumericCellValue());
-        assertEquals(6.0, a6.getNumericCellValue());
-        assertEquals(2.0, a7.getNumericCellValue());
-        assertEquals(2.0, a8.getNumericCellValue());
-    }
-
-    public void testCounta(){
-
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellValue(3);
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(3,B2:B3)");
-        Cell a4 = sh.createRow(4).createCell(1);
-        a4.setCellValue("POI");                  // A4 is string and not counted
-        /*Cell a5 =*/ sh.createRow(5).createCell(1); // A5 is blank and not counted
-
-        Cell a6 = sh.createRow(6).createCell(1);
-        a6.setCellFormula("SUBTOTAL(3,B2:B6)*2 + 2");
-        Cell a7 = sh.createRow(7).createCell(1);
-        a7.setCellFormula("SUBTOTAL(3,B2:B7)");
-        Cell a8 = sh.createRow(8).createCell(1);
-        a8.setCellFormula("SUBTOTAL(3,B2,B3,B4,B5,B6,B7,B8)");
-
-        fe.evaluateAll();
-
-        assertEquals(2.0, a3.getNumericCellValue());
-        assertEquals(8.0, a6.getNumericCellValue());
-        assertEquals(3.0, a7.getNumericCellValue());
-        assertEquals(3.0, a8.getNumericCellValue());
-    }
-
-    public void testMax(){
-
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellValue(3);
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(4,B2:B3)");
-        Cell a4 = sh.createRow(4).createCell(1);
-        a4.setCellValue(1);
-        Cell a5 = sh.createRow(5).createCell(1);
-        a5.setCellValue(7);
-        Cell a6 = sh.createRow(6).createCell(1);
-        a6.setCellFormula("SUBTOTAL(4,B2:B6)*2 + 2");
-        Cell a7 = sh.createRow(7).createCell(1);
-        a7.setCellFormula("SUBTOTAL(4,B2:B7)");
-        Cell a8 = sh.createRow(8).createCell(1);
-        a8.setCellFormula("SUBTOTAL(4,B2,B3,B4,B5,B6,B7,B8)");
-
-        fe.evaluateAll();
-
-        assertEquals(3.0, a3.getNumericCellValue());
-        assertEquals(16.0, a6.getNumericCellValue());
-        assertEquals(7.0, a7.getNumericCellValue());
-        assertEquals(7.0, a8.getNumericCellValue());
-    }
-
-    public void testMin(){
-
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellValue(3);
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(5,B2:B3)");
-        Cell a4 = sh.createRow(4).createCell(1);
-        a4.setCellValue(1);
-        Cell a5 = sh.createRow(5).createCell(1);
-        a5.setCellValue(7);
-        Cell a6 = sh.createRow(6).createCell(1);
-        a6.setCellFormula("SUBTOTAL(5,B2:B6)*2 + 2");
-        Cell a7 = sh.createRow(7).createCell(1);
-        a7.setCellFormula("SUBTOTAL(5,B2:B7)");
-        Cell a8 = sh.createRow(8).createCell(1);
-        a8.setCellFormula("SUBTOTAL(5,B2,B3,B4,B5,B6,B7,B8)");
-
-        fe.evaluateAll();
-
-        assertEquals(1.0, a3.getNumericCellValue());
-        assertEquals(4.0, a6.getNumericCellValue());
-        assertEquals(1.0, a7.getNumericCellValue());
-        assertEquals(1.0, a8.getNumericCellValue());
-    }
-
-    public void testStdev(){
-
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellValue(3);
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(7,B2:B3)");
-        Cell a4 = sh.createRow(4).createCell(1);
-        a4.setCellValue(1);
-        Cell a5 = sh.createRow(5).createCell(1);
-        a5.setCellValue(7);
-        Cell a6 = sh.createRow(6).createCell(1);
-        a6.setCellFormula("SUBTOTAL(7,B2:B6)*2 + 2");
-        Cell a7 = sh.createRow(7).createCell(1);
-        a7.setCellFormula("SUBTOTAL(7,B2:B7)");
-        Cell a8 = sh.createRow(8).createCell(1);
-        a8.setCellFormula("SUBTOTAL(7,B2,B3,B4,B5,B6,B7,B8)");
-
-        fe.evaluateAll();
-
-        assertEquals(1.41421, a3.getNumericCellValue(), 0.0001);
-        assertEquals(7.65685, a6.getNumericCellValue(), 0.0001);
-        assertEquals(2.82842, a7.getNumericCellValue(), 0.0001);
-        assertEquals(2.82842, a8.getNumericCellValue(), 0.0001);
-    }
-
-    public void test50209(){
-        Workbook wb = new HSSFWorkbook();
-        Sheet sh = wb.createSheet();
-        Cell a1 = sh.createRow(1).createCell(1);
-        a1.setCellValue(1);
-        Cell a2 = sh.createRow(2).createCell(1);
-        a2.setCellFormula("SUBTOTAL(9,B2)");
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(9,B2:B3)");
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-        fe.evaluateAll();
-        assertEquals(1.0, a2.getNumericCellValue());
-        assertEquals(1.0, a3.getNumericCellValue());
-    }
-
-    private static void confirmExpectedResult(FormulaEvaluator evaluator, String msg, Cell cell, double expected) {
-
-        CellValue value = evaluator.evaluate(cell);
-        if (value.getErrorValue() != 0)
-            throw new RuntimeException(msg + ": " + value.formatAsString());
-        assertEquals(msg, expected, value.getNumberValue());
-    }
-
-    public void testFunctionsFromTestSpreadsheet() {
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("SubtotalsNested.xls");
-        HSSFSheet sheet = workbook.getSheetAt(0);
-        FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-
-        assertEquals("B2", 10.0, sheet.getRow(1).getCell(1).getNumericCellValue());
-        assertEquals("B3", 20.0, sheet.getRow(2).getCell(1).getNumericCellValue());
-
-        //Test simple subtotal over one area
-        Cell cellA3 = sheet.getRow(3).getCell(1);
-        confirmExpectedResult(evaluator, "B4", cellA3, 30.0);
-
-        //Test existence of the second area
-        assertNotNull("C2 must not be null", sheet.getRow(1).getCell(2));
-        assertEquals("C2", 7.0, sheet.getRow(1).getCell(2).getNumericCellValue());
-
-        Cell cellC1 = sheet.getRow(1).getCell(3);
-        Cell cellC2 = sheet.getRow(2).getCell(3);
-        Cell cellC3 = sheet.getRow(3).getCell(3);
-
-        //Test Functions SUM, COUNT and COUNTA calculation of SUBTOTAL
-        //a) areas A and B are used
-        //b) first 2 subtotals don't consider the value of nested subtotal in A3
-        confirmExpectedResult(evaluator, "SUBTOTAL(SUM;B2:B8;C2:C8)", cellC1, 37.0);
-        confirmExpectedResult(evaluator, "SUBTOTAL(COUNT;B2:B8,C2:C8)", cellC2, 3.0);
-        confirmExpectedResult(evaluator, "SUBTOTAL(COUNTA;B2:B8,C2:C8)", cellC3, 5.0);
-    }
-
-    public void testUnimplemented(){
-        Workbook wb = new HSSFWorkbook();
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sh = wb.createSheet();
-        Cell a3 = sh.createRow(3).createCell(1);
-        a3.setCellFormula("SUBTOTAL(8,B2:B3)");
-
-        try {
-            fe.evaluateAll();
-            fail("Should catch an NotImplementedFunctionException here, adjust these tests if it was actually implemented");
-        } catch (NotImplementedException e) {
-            // expected here
-        }
-
-        a3.setCellFormula("SUBTOTAL(10,B2:B3)");
-
-        try {
-            fe.evaluateAll();
-            fail("Should catch an NotImplementedFunctionException here, adjust these tests if it was actually implemented");
-        } catch (NotImplementedException e) {
-            // expected here
-        }
-
-        a3.setCellFormula("SUBTOTAL(11,B2:B3)");
-
-        try {
-            fe.evaluateAll();
-            fail("Should catch an NotImplementedFunctionException here, adjust these tests if it was actually implemented");
-        } catch (NotImplementedException e) {
-            // expected here
-        }
-
-        a3.setCellFormula("SUBTOTAL(107,B2:B3)");
-
-        try {
-            fe.evaluateAll();
-            fail("Should catch an NotImplementedFunctionException here, adjust these tests if it was actually implemented");
-        } catch (NotImplementedException e) {
-            // expected here
-        }
-
-        a3.setCellFormula("SUBTOTAL(0,B2:B3)");
-        fe.evaluateAll();
-        assertEquals(FormulaError.VALUE.getCode(), a3.getErrorCellValue());
-
-        try {
-            a3.setCellFormula("SUBTOTAL(9)");
-            fail("Should catch an exception here");
-        } catch (FormulaParseException e) {
-            // expected here
-        }
-
-        try {
-            a3.setCellFormula("SUBTOTAL()");
-            fail("Should catch an exception here");
-        } catch (FormulaParseException e) {
-            // expected here
-        }
-
-        Subtotal subtotal = new Subtotal();
-        assertEquals(ErrorEval.VALUE_INVALID, subtotal.evaluate(new ValueEval[] {}, 0, 0));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java
deleted file mode 100644
index c761d22..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Test cases for SUMPRODUCT()
- *
- * @author Josh Micich
- */
-public final class TestSumif extends TestCase {
-	private static final NumberEval _30 = new NumberEval(30);
-	private static final NumberEval _40 = new NumberEval(40);
-	private static final NumberEval _50 = new NumberEval(50);
-	private static final NumberEval _60 = new NumberEval(60);
-
-	private static ValueEval invokeSumif(int rowIx, int colIx, ValueEval...args) {
-		return new Sumif().evaluate(args, rowIx, colIx);
-	}
-	private static void confirmDouble(double expected, ValueEval actualEval) {
-		if(!(actualEval instanceof NumericValueEval)) {
-			throw new AssertionFailedError("Expected numeric result");
-		}
-		NumericValueEval nve = (NumericValueEval)actualEval;
-		assertEquals(expected, nve.getNumberValue(), 0);
-	}
-
-	public void testBasic() {
-		ValueEval[] arg0values = new ValueEval[] { _30, _30, _40, _40, _50, _50  };
-		ValueEval[] arg2values = new ValueEval[] { _30, _40, _50, _60, _60, _60 };
-
-		AreaEval arg0;
-		AreaEval arg2;
-
-		arg0 = EvalFactory.createAreaEval("A3:B5", arg0values);
-		arg2 = EvalFactory.createAreaEval("D1:E3", arg2values);
-
-		confirm(60.0, arg0, new NumberEval(30.0));
-		confirm(70.0, arg0, new NumberEval(30.0), arg2);
-		confirm(100.0, arg0, new StringEval(">45"));
-		confirm(100.0, arg0, new StringEval(">=45"));
-		confirm(100.0, arg0, new StringEval(">=50.0"));
-		confirm(140.0, arg0, new StringEval("<45"));
-		confirm(140.0, arg0, new StringEval("<=45"));
-		confirm(140.0, arg0, new StringEval("<=40.0"));
-		confirm(160.0, arg0, new StringEval("<>40.0"));
-		confirm(80.0, arg0, new StringEval("=40.0"));
-		
-
-	}
-	private static void confirm(double expectedResult, ValueEval...args) {
-		confirmDouble(expectedResult, invokeSumif(-1, -1, args));
-	}
-
-
-	/**
-	 * test for bug observed near svn r882931
-	 */
-	public void testCriteriaArgRange() {
-		ValueEval[] arg0values = new ValueEval[] { _50, _60, _50, _50, _50, _30,  };
-		ValueEval[] arg1values = new ValueEval[] { _30, _40, _50, _60,  };
-
-		AreaEval arg0;
-		AreaEval arg1;
-		ValueEval ve;
-
-		arg0 = EvalFactory.createAreaEval("A3:B5", arg0values);
-		arg1 = EvalFactory.createAreaEval("A2:D2", arg1values); // single row range
-
-		ve = invokeSumif(0, 2, arg0, arg1);  // invoking from cell C1
-		if (ve instanceof NumberEval) {
-			NumberEval ne = (NumberEval) ve;
-			if (ne.getNumberValue() == 30.0) {
-				throw new AssertionFailedError("identified error in SUMIF - criteria arg not evaluated properly");
-			}
-		}
-
-		confirmDouble(200, ve);
-
-		arg0 = EvalFactory.createAreaEval("C1:D3", arg0values);
-		arg1 = EvalFactory.createAreaEval("B1:B4", arg1values); // single column range
-
-		ve = invokeSumif(3, 0, arg0, arg1); // invoking from cell A4
-
-		confirmDouble(60, ve);
-	}
-
-	public void testEvaluateException() {
-	    assertEquals(ErrorEval.VALUE_INVALID, invokeSumif(-1, -1, BlankEval.instance, new NumberEval(30.0)));
-        assertEquals(ErrorEval.VALUE_INVALID, invokeSumif(-1, -1, BlankEval.instance, new NumberEval(30.0), new NumberEval(30.0)));
-        assertEquals(ErrorEval.VALUE_INVALID, invokeSumif(-1, -1, new NumberEval(30.0), BlankEval.instance, new NumberEval(30.0)));
-        assertEquals(ErrorEval.VALUE_INVALID, invokeSumif(-1, -1, new NumberEval(30.0), new NumberEval(30.0), BlankEval.instance));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java
deleted file mode 100644
index 3f611cb..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-
-/**
- * Test cases for SUMIFS()
- *
- * @author Yegor Kozlov
- */
-public final class TestSumifs extends TestCase {
-
-    private static final OperationEvaluationContext EC = new OperationEvaluationContext(null, null, 0, 1, 0, null);
-
-	private static ValueEval invokeSumifs(ValueEval[] args, OperationEvaluationContext ec) {
-		return new Sumifs().evaluate(args, EC);
-	}
-	private static void confirmDouble(double expected, ValueEval actualEval) {
-		if(!(actualEval instanceof NumericValueEval)) {
-			throw new AssertionFailedError("Expected numeric result");
-		}
-		NumericValueEval nve = (NumericValueEval)actualEval;
-		assertEquals(expected, nve.getNumberValue(), 0);
-	}
-
-    private static void confirm(double expectedResult, ValueEval[] args) {
-        confirmDouble(expectedResult, invokeSumifs(args, EC));
-    }
-
-    /**
-     *  Example 1 from
-     *  http://office.microsoft.com/en-us/excel-help/sumifs-function-HA010047504.aspx
-     */
-	public void testExample1() {
-        // mimic test sample from http://office.microsoft.com/en-us/excel-help/sumifs-function-HA010047504.aspx
-        ValueEval[] a2a9 = new ValueEval[] {
-                new NumberEval(5),
-                new NumberEval(4),
-                new NumberEval(15),
-                new NumberEval(3),
-                new NumberEval(22),
-                new NumberEval(12),
-                new NumberEval(10),
-                new NumberEval(33)
-        };
-
-        ValueEval[] b2b9 = new ValueEval[] {
-                new StringEval("Apples"),
-                new StringEval("Apples"),
-                new StringEval("Artichokes"),
-                new StringEval("Artichokes"),
-                new StringEval("Bananas"),
-                new StringEval("Bananas"),
-                new StringEval("Carrots"),
-                new StringEval("Carrots"),
-        };
-
-        ValueEval[] c2c9 = new ValueEval[] {
-                new NumberEval(1),
-                new NumberEval(2),
-                new NumberEval(1),
-                new NumberEval(2),
-                new NumberEval(1),
-                new NumberEval(2),
-                new NumberEval(1),
-                new NumberEval(2)
-        };
-
-        ValueEval[] args;
-        // "=SUMIFS(A2:A9, B2:B9, "=A*", C2:C9, 1)"
-        args = new ValueEval[]{
-                EvalFactory.createAreaEval("A2:A9", a2a9),
-                EvalFactory.createAreaEval("B2:B9", b2b9),
-                new StringEval("A*"),
-                EvalFactory.createAreaEval("C2:C9", c2c9),
-                new NumberEval(1),
-        };
-        confirm(20.0, args);
-
-        // "=SUMIFS(A2:A9, B2:B9, "<>Bananas", C2:C9, 1)"
-        args = new ValueEval[]{
-                EvalFactory.createAreaEval("A2:A9", a2a9),
-                EvalFactory.createAreaEval("B2:B9", b2b9),
-                new StringEval("<>Bananas"),
-                EvalFactory.createAreaEval("C2:C9", c2c9),
-                new NumberEval(1),
-        };
-        confirm(30.0, args);
-
-        // a test case that returns ErrorEval.VALUE_INVALID :
-        // the dimensions of the first and second criteria ranges are different
-        // "=SUMIFS(A2:A9, B2:B8, "<>Bananas", C2:C9, 1)"
-        args = new ValueEval[]{
-                EvalFactory.createAreaEval("A2:A9", a2a9),
-                EvalFactory.createAreaEval("B2:B8", new ValueEval[] {
-                        new StringEval("Apples"),
-                        new StringEval("Apples"),
-                        new StringEval("Artichokes"),
-                        new StringEval("Artichokes"),
-                        new StringEval("Bananas"),
-                        new StringEval("Bananas"),
-                        new StringEval("Carrots"),
-                }),
-                new StringEval("<>Bananas"),
-                EvalFactory.createAreaEval("C2:C9", c2c9),
-                new NumberEval(1),
-        };
-        assertEquals(ErrorEval.VALUE_INVALID, invokeSumifs(args, EC));
-
-	}
-
-    /**
-     *  Example 2 from
-     *  http://office.microsoft.com/en-us/excel-help/sumifs-function-HA010047504.aspx
-     */
-    public void testExample2() {
-        ValueEval[] b2e2 = new ValueEval[] {
-                new NumberEval(100),
-                new NumberEval(390),
-                new NumberEval(8321),
-                new NumberEval(500)
-        };
-        // 1%	0.5%	3%	4%
-        ValueEval[] b3e3 = new ValueEval[] {
-                new NumberEval(0.01),
-                new NumberEval(0.005),
-                new NumberEval(0.03),
-                new NumberEval(0.04)
-        };
-
-        // 1%	1.3%	2.1%	2%
-        ValueEval[] b4e4 = new ValueEval[] {
-                new NumberEval(0.01),
-                new NumberEval(0.013),
-                new NumberEval(0.021),
-                new NumberEval(0.02)
-        };
-
-        // 0.5%	3%	1%	4%
-        ValueEval[] b5e5 = new ValueEval[] {
-                new NumberEval(0.005),
-                new NumberEval(0.03),
-                new NumberEval(0.01),
-                new NumberEval(0.04)
-        };
-
-        ValueEval[] args;
-
-        // "=SUMIFS(B2:E2, B3:E3, ">3%", B4:E4, ">=2%")"
-        args = new ValueEval[]{
-                EvalFactory.createAreaEval("B2:E2", b2e2),
-                EvalFactory.createAreaEval("B3:E3", b3e3),
-                new StringEval(">0.03"), // 3% in the MSFT example
-                EvalFactory.createAreaEval("B4:E4", b4e4),
-                new StringEval(">=0.02"),   // 2% in the MSFT example
-        };
-        confirm(500.0, args);
-    }
-
-    /**
-     *  Example 3 from
-     *  http://office.microsoft.com/en-us/excel-help/sumifs-function-HA010047504.aspx
-     */
-    public void testExample3() {
-        //3.3	0.8	5.5	5.5
-        ValueEval[] b2e2 = new ValueEval[] {
-                new NumberEval(3.3),
-                new NumberEval(0.8),
-                new NumberEval(5.5),
-                new NumberEval(5.5)
-        };
-        // 55	39	39	57.5
-        ValueEval[] b3e3 = new ValueEval[] {
-                new NumberEval(55),
-                new NumberEval(39),
-                new NumberEval(39),
-                new NumberEval(57.5)
-        };
-
-        // 6.5	19.5	6	6.5
-        ValueEval[] b4e4 = new ValueEval[] {
-                new NumberEval(6.5),
-                new NumberEval(19.5),
-                new NumberEval(6),
-                new NumberEval(6.5)
-        };
-
-        ValueEval[] args;
-
-        // "=SUMIFS(B2:E2, B3:E3, ">=40", B4:E4, "<10")"
-        args = new ValueEval[]{
-                EvalFactory.createAreaEval("B2:E2", b2e2),
-                EvalFactory.createAreaEval("B3:E3", b3e3),
-                new StringEval(">=40"),
-                EvalFactory.createAreaEval("B4:E4", b4e4),
-                new StringEval("<10"),
-        };
-        confirm(8.8, args);
-    }
-
-    /**
-     *  Example 5 from
-     *  http://office.microsoft.com/en-us/excel-help/sumifs-function-HA010047504.aspx
-     *
-     *  Criteria entered as reference and by using wildcard characters
-     */
-    public void testFromFile() {
-
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("sumifs.xls");
-        HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-
-        HSSFSheet example1 = wb.getSheet("Example 1");
-        HSSFCell ex1cell1 = example1.getRow(10).getCell(2);
-        fe.evaluate(ex1cell1);
-        assertEquals(20.0, ex1cell1.getNumericCellValue());
-        HSSFCell ex1cell2 = example1.getRow(11).getCell(2);
-        fe.evaluate(ex1cell2);
-        assertEquals(30.0, ex1cell2.getNumericCellValue());
-
-        HSSFSheet example2 = wb.getSheet("Example 2");
-        HSSFCell ex2cell1 = example2.getRow(6).getCell(2);
-        fe.evaluate(ex2cell1);
-        assertEquals(500.0, ex2cell1.getNumericCellValue());
-        HSSFCell ex2cell2 = example2.getRow(7).getCell(2);
-        fe.evaluate(ex2cell2);
-        assertEquals(8711.0, ex2cell2.getNumericCellValue());
-
-        HSSFSheet example3 = wb.getSheet("Example 3");
-        HSSFCell ex3cell = example3.getRow(5).getCell(2);
-        fe.evaluate(ex3cell);
-        assertEquals(8,8, ex3cell.getNumericCellValue());
-
-        HSSFSheet example4 = wb.getSheet("Example 4");
-        HSSFCell ex4cell = example4.getRow(8).getCell(2);
-        fe.evaluate(ex4cell);
-        assertEquals(3.5, ex4cell.getNumericCellValue());
-
-        HSSFSheet example5 = wb.getSheet("Example 5");
-        HSSFCell ex5cell = example5.getRow(8).getCell(2);
-        fe.evaluate(ex5cell);
-        assertEquals(625000., ex5cell.getNumericCellValue());
-
-    }
-    
-    public void testBug56655() {
-        ValueEval[] a2a9 = new ValueEval[] {
-                new NumberEval(5),
-                new NumberEval(4),
-                new NumberEval(15),
-                new NumberEval(3),
-                new NumberEval(22),
-                new NumberEval(12),
-                new NumberEval(10),
-                new NumberEval(33)
-        };
-
-        ValueEval[] args = new ValueEval[]{
-                EvalFactory.createAreaEval("A2:A9", a2a9),
-                ErrorEval.VALUE_INVALID,
-                new StringEval("A*"),
-        };
-        
-        ValueEval result = invokeSumifs(args, EC);
-        assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval);
-
-        args = new ValueEval[]{
-                EvalFactory.createAreaEval("A2:A9", a2a9),
-                EvalFactory.createAreaEval("A2:A9", a2a9),
-                ErrorEval.VALUE_INVALID,
-        };
-        
-        result = invokeSumifs(args, EC);
-        assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval);
-    }
-
-    public void testBug56655b() {
-/*
-        setCellFormula(sheet, 0, 0, "B1*C1");
-        sheet.getRow(0).createCell(1).setCellValue("A");
-        setCellFormula(sheet, 1, 0, "B1*C1");
-        sheet.getRow(1).createCell(1).setCellValue("A");
-        setCellFormula(sheet, 0, 3, "SUMIFS(A:A,A:A,A2)");
- */
-    	ValueEval[] a0a1 = new ValueEval[] {
-                NumberEval.ZERO,
-                NumberEval.ZERO
-        };
-
-        ValueEval[] args = new ValueEval[]{
-                EvalFactory.createAreaEval("A0:A1", a0a1),
-                EvalFactory.createAreaEval("A0:A1", a0a1),
-                ErrorEval.VALUE_INVALID
-        };
-        
-        ValueEval result = invokeSumifs(args, EC);
-        assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval);
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-
-    public void testBug56655c() {
-/*
-        setCellFormula(sheet, 0, 0, "B1*C1");
-        sheet.getRow(0).createCell(1).setCellValue("A");
-        setCellFormula(sheet, 1, 0, "B1*C1");
-        sheet.getRow(1).createCell(1).setCellValue("A");
-        setCellFormula(sheet, 0, 3, "SUMIFS(A:A,A:A,A2)");
- */
-        ValueEval[] a0a1 = new ValueEval[] {
-                NumberEval.ZERO,
-                NumberEval.ZERO
-        };
-
-        ValueEval[] args = new ValueEval[]{
-                EvalFactory.createAreaEval("A0:A1", a0a1),
-                EvalFactory.createAreaEval("A0:A1", a0a1),
-                ErrorEval.NAME_INVALID
-        };
-        
-        ValueEval result = invokeSumifs(args, EC);
-        assertTrue("Expect to have an error when an input is an invalid value, but had: " + result.getClass(), result instanceof ErrorEval);
-        assertEquals(ErrorEval.NAME_INVALID, result);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java
deleted file mode 100644
index a8ccf47..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Test cases for SUMPRODUCT()
- *
- * @author Josh Micich
- */
-public final class TestSumproduct extends TestCase {
-
-	private static ValueEval invokeSumproduct(ValueEval[] args) {
-		// srcCellRow and srcCellColumn are ignored by SUMPRODUCT
-		return new Sumproduct().evaluate(args, -1, (short)-1);
-	}
-	private static void confirmDouble(double expected, ValueEval actualEval) {
-		if(!(actualEval instanceof NumericValueEval)) {
-			fail("Expected numeric result");
-		}
-		NumericValueEval nve = (NumericValueEval)actualEval;
-		assertEquals(expected, nve.getNumberValue(), 0);
-	}
-
-	public void testScalarSimple() {
-
-		RefEval refEval = EvalFactory.createRefEval("A1", new NumberEval(3));
-		ValueEval[] args = {
-			refEval,
-			new NumberEval(2),
-		};
-		ValueEval result = invokeSumproduct(args);
-		confirmDouble(6D, result);
-	}
-
-	public void testAreaSimple() {
-		ValueEval[] aValues = {
-			new NumberEval(2),
-			new NumberEval(4),
-			new NumberEval(5),
-		};
-		ValueEval[] bValues = {
-			new NumberEval(3),
-			new NumberEval(6),
-			new NumberEval(7),
-		};
-		AreaEval aeA = EvalFactory.createAreaEval("A1:A3", aValues);
-		AreaEval aeB = EvalFactory.createAreaEval("B1:B3", bValues);
-
-		ValueEval[] args = { aeA, aeB, };
-		ValueEval result = invokeSumproduct(args);
-		confirmDouble(65D, result);
-	}
-
-	/**
-	 * For scalar products, the terms may be 1x1 area refs
-	 */
-	public void testOneByOneArea() {
-
-		AreaEval ae = EvalFactory.createAreaEval("A1:A1", new ValueEval[] { new NumberEval(7), });
-
-		ValueEval[] args = {
-				ae,
-				new NumberEval(2),
-			};
-		ValueEval result = invokeSumproduct(args);
-		confirmDouble(14D, result);
-	}
-
-	public void testMismatchAreaDimensions() {
-
-		AreaEval aeA = EvalFactory.createAreaEval("A1:A3", new ValueEval[3]);
-		AreaEval aeB = EvalFactory.createAreaEval("B1:D1", new ValueEval[3]);
-
-		ValueEval[] args;
-		args = new ValueEval[] { aeA, aeB, };
-		assertEquals(ErrorEval.VALUE_INVALID, invokeSumproduct(args));
-
-		args = new ValueEval[] { aeA, new NumberEval(5), };
-		assertEquals(ErrorEval.VALUE_INVALID, invokeSumproduct(args));
-	}
-
-	public void testAreaWithErrorCell() {
-		ValueEval[] aValues = {
-			ErrorEval.REF_INVALID,
-			null,
-		};
-		AreaEval aeA = EvalFactory.createAreaEval("A1:A2", aValues);
-		AreaEval aeB = EvalFactory.createAreaEval("B1:B2", new ValueEval[2]);
-
-		ValueEval[] args = { aeA, aeB, };
-		assertEquals(ErrorEval.REF_INVALID, invokeSumproduct(args));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java
deleted file mode 100644
index 4e1209b..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.AreaEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Test cases for Excel function T()
- *
- * @author Josh Micich
- */
-public final class TestTFunc extends TestCase {
-
-	/**
-	 * @return the result of calling function T() with the specified argument
-	 */
-	private static ValueEval invokeT(ValueEval arg) {
-		ValueEval[] args = { arg, };
-		ValueEval result = new T().evaluate(args, -1, (short)-1);
-		assertNotNull("result may never be null", result);
-		return result;
-	}
-	/**
-	 * Simulates call: T(A1)
-	 * where cell A1 has the specified innerValue
-	 */
-	private ValueEval invokeTWithReference(ValueEval innerValue) {
-		ValueEval arg = EvalFactory.createRefEval("$B$2", innerValue);
-		return invokeT(arg);
-	}
-
-	private static void confirmText(String text) {
-		ValueEval arg = new StringEval(text);
-		ValueEval eval = invokeT(arg);
-		StringEval se = (StringEval) eval;
-		assertEquals(text, se.getStringValue());
-	}
-
-	public void testTextValues() {
-
-		confirmText("abc");
-		confirmText("");
-		confirmText(" ");
-		confirmText("~");
-		confirmText("123");
-		confirmText("TRUE");
-	}
-
-	private static void confirmError(ValueEval arg) {
-		ValueEval eval = invokeT(arg);
-		assertTrue(arg == eval);
-	}
-
-	public void testErrorValues() {
-
-		confirmError(ErrorEval.VALUE_INVALID);
-		confirmError(ErrorEval.NA);
-		confirmError(ErrorEval.REF_INVALID);
-	}
-
-	private static void confirmString(ValueEval eval, String expected) {
-		assertTrue(eval instanceof StringEval);
-		assertEquals(expected, ((StringEval)eval).getStringValue());
-	}
-
-	private static void confirmOther(ValueEval arg) {
-		ValueEval eval = invokeT(arg);
-		confirmString(eval, "");
-	}
-
-	public void testOtherValues() {
-		confirmOther(new NumberEval(2));
-		confirmOther(BoolEval.FALSE);
-		confirmOther(BlankEval.instance);  // can this particular case be verified?
-	}
-
-	public void testRefValues() {
-		ValueEval eval;
-
-		eval = invokeTWithReference(new StringEval("def"));
-		confirmString(eval, "def");
-		eval = invokeTWithReference(new StringEval(" "));
-		confirmString(eval, " ");
-
-		eval = invokeTWithReference(new NumberEval(2));
-		confirmString(eval, "");
-		eval = invokeTWithReference(BoolEval.TRUE);
-		confirmString(eval, "");
-
-		eval = invokeTWithReference(ErrorEval.NAME_INVALID);
-		assertTrue(eval == ErrorEval.NAME_INVALID);
-	}
-
-	public void testAreaArg() {
-		ValueEval[] areaValues = new ValueEval[] {
-			new StringEval("abc"), new StringEval("def"),
-			new StringEval("ghi"), new StringEval("jkl"),
-		};
-		AreaEval ae = EvalFactory.createAreaEval("C10:D11", areaValues);
-
-		ValueEval ve;
-		ve = invokeT(ae);
-		confirmString(ve, "abc");
-
-		areaValues[0] = new NumberEval(5.0);
-		ve = invokeT(ae);
-		confirmString(ve, "");
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestText.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestText.java
deleted file mode 100644
index 0e6521e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestText.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-
-import java.text.DateFormatSymbols;
-import java.text.DecimalFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Test case for TEXT()
- */
-public final class TestText {
-    @Test
-    public void testTextWithStringFirstArg() {
-        ValueEval strArg = new StringEval("abc");
-        ValueEval formatArg = new StringEval("abc");
-        ValueEval[] args = { strArg, formatArg };
-        ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-        assertEquals(ErrorEval.VALUE_INVALID, result);
-    }
-
-    @Test
-    public void testTextWithDeciamlFormatSecondArg() {
-        ValueEval numArg = new NumberEval(321321.321);
-        ValueEval formatArg = new StringEval("#,###.00000");
-        ValueEval[] args = { numArg, formatArg };
-        ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-        DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(LocaleUtil.getUserLocale());
-        char groupSeparator = dfs.getGroupingSeparator();
-        char decimalSeparator = dfs.getDecimalSeparator();
-        ValueEval testResult = new StringEval("321" + groupSeparator + "321" + decimalSeparator + "32100");
-        assertEquals(testResult.toString(), result.toString());
-        numArg = new NumberEval(321.321);
-        formatArg = new StringEval("00000.00000");
-        args[0] = numArg;
-        args[1] = formatArg;
-        result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-        testResult = new StringEval("00321" + decimalSeparator + "32100");
-        assertEquals(testResult.toString(), result.toString());
-
-        formatArg = new StringEval("$#.#");
-        args[1] = formatArg;
-        result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-        testResult = new StringEval("$321" + decimalSeparator + "3");
-        assertEquals(testResult.toString(), result.toString());
-    }
-
-    @Test
-    public void testTextWithFractionFormatSecondArg() {
-        ValueEval numArg = new NumberEval(321.321);
-        ValueEval formatArg = new StringEval("# #/#");
-        ValueEval[] args = { numArg, formatArg };
-        ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-        ValueEval testResult = new StringEval("321 1/3");
-        assertEquals(testResult.toString(), result.toString());
-
-        formatArg = new StringEval("# #/##");
-        args[1] = formatArg;
-        result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-        testResult = new StringEval("321 26/81");
-        assertEquals(testResult.toString(), result.toString());
-
-        formatArg = new StringEval("#/##");
-        args[1] = formatArg;
-        result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-        testResult = new StringEval("26027/81");
-        assertEquals(testResult.toString(), result.toString());
-    }
-
-    @Test
-    public void testTextWithDateFormatSecondArg() {
-        TimeZone userTZ = LocaleUtil.getUserTimeZone();
-        LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
-        try {
-            // Test with Java style M=Month
-            ValueEval numArg = new NumberEval(321.321);
-            ValueEval formatArg = new StringEval("dd:MM:yyyy hh:mm:ss");
-            ValueEval[] args = { numArg, formatArg };
-            ValueEval result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-            ValueEval testResult = new StringEval("16:11:1900 07:42:14");
-            assertEquals(testResult.toString(), result.toString());
-    
-            // Excel also supports "m before h is month"
-            formatArg = new StringEval("dd:mm:yyyy hh:mm:ss");
-            args[1] = formatArg;
-            result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-            testResult = new StringEval("16:11:1900 07:42:14");
-            assertEquals(testResult.toString(), result.toString());
-    
-            // this line is intended to compute how "November" would look like in the current locale
-            // update: now the locale will be (if not set otherwise) always Locale.getDefault() (see LocaleUtil)
-            DateFormatSymbols dfs = DateFormatSymbols.getInstance(LocaleUtil.getUserLocale());
-            SimpleDateFormat sdf = new SimpleDateFormat("MMMM", dfs);
-            sdf.setTimeZone(LocaleUtil.getUserTimeZone());
-            String november = sdf.format(LocaleUtil.getLocaleCalendar(2015,10,1).getTime());
-    
-            // Again with Java style
-            formatArg = new StringEval("MMMM dd, yyyy");
-            args[1] = formatArg;
-            result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-            testResult = new StringEval(november + " 16, 1900");
-            assertEquals(testResult.toString(), result.toString());
-    
-            // And Excel style
-            formatArg = new StringEval("mmmm dd, yyyy");
-            args[1] = formatArg;
-            result = TextFunction.TEXT.evaluate(args, -1, (short)-1);
-            testResult = new StringEval(november + " 16, 1900");
-            assertEquals(testResult.toString(), result.toString());
-        } finally {
-            LocaleUtil.setUserTimeZone(userTZ);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java
deleted file mode 100644
index 7f12c13..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.regex.Pattern;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataFormat;
-import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests for {@link TimeFunc}
- */
-public final class TestTime {
-
-	private static final int SECONDS_PER_MINUTE = 60;
-	private static final int SECONDS_PER_HOUR = 60 * SECONDS_PER_MINUTE;
-	private static final double SECONDS_PER_DAY = 24 * SECONDS_PER_HOUR;
-	private HSSFCell cell11;
-	private HSSFFormulaEvaluator evaluator;
-	private HSSFWorkbook wb;
-	private HSSFDataFormatter form;
-	private HSSFCellStyle style;
-	
-	@Before
-	public void setUp() {
-		wb = new HSSFWorkbook();
-		HSSFSheet sheet = wb.createSheet("new sheet");
-		style = wb.createCellStyle();
-		HSSFDataFormat fmt = wb.createDataFormat();
-		style.setDataFormat(fmt.getFormat("hh:mm:ss"));
-
-		cell11 = sheet.createRow(0).createCell(0);
-		form = new HSSFDataFormatter();
-
-		evaluator = new HSSFFormulaEvaluator(wb);
-	}
-
-	@Test
-	public void testSomeArgumentsMissing() {
-		confirm("00:00:00", "TIME(, 0, 0)");
-		confirm("12:00:00", "TIME(12, , )");
-	}
-
-	@Test
-	public void testValid() {
-		confirm("00:00:01", 0, 0, 1);
-		confirm("00:01:00", 0, 1, 0);
-
-		confirm("00:00:00", 0, 0, 0);
-
-		confirm("01:00:00", 1, 0, 0);
-		confirm("12:00:00", 12, 0, 0);
-		confirm("23:00:00", 23, 0, 0);
-		confirm("00:00:00", 24, 0, 0);
-		confirm("01:00:00", 25, 0, 0);
-		confirm("00:00:00", 48, 0, 0);
-		confirm("06:00:00", 6, 0, 0);
-		confirm("06:01:00", 6, 1, 0);
-		confirm("06:30:00", 6, 30, 0);
-
-		confirm("06:59:00", 6, 59, 0);
-		confirm("07:00:00", 6, 60, 0);
-		confirm("07:01:00", 6, 61, 0);
-		confirm("08:00:00", 6, 120, 0);
-		confirm("06:00:00", 6, 1440, 0);
-		confirm("18:49:00", 18, 49, 0);
-		confirm("18:49:01", 18, 49, 1);
-		confirm("18:49:30", 18, 49, 30);
-		confirm("18:49:59", 18, 49, 59);
-		confirm("18:50:00", 18, 49, 60);
-		confirm("18:50:01", 18, 49, 61);
-		confirm("18:50:59", 18, 49, 119);
-		confirm("18:51:00", 18, 49, 120);
-		confirm("03:55:07", 18, 49, 32767);
-		confirm("12:08:01", 18, 32767, 61);
-		confirm("07:50:01", 32767, 49, 61);
-	}
-	private void confirm(String expectedTimeStr, int inH, int inM, int inS) {
-		confirm(expectedTimeStr, "TIME(" + inH + "," + inM + "," + inS + ")");
-	}
-
-	private void confirm(String expectedTimeStr, String formulaText) {
-		String[] parts = Pattern.compile(":").split(expectedTimeStr);
-		int expH = Integer.parseInt(parts[0]);
-		int expM = Integer.parseInt(parts[1]);
-		int expS = Integer.parseInt(parts[2]);
-
-		double expectedValue = (expH*SECONDS_PER_HOUR + expM*SECONDS_PER_MINUTE + expS)/SECONDS_PER_DAY;
-
-		cell11.setCellFormula(formulaText);
-		cell11.setCellStyle(style);
-		evaluator.clearAllCachedResultValues();
-
-		double actualValue = evaluator.evaluate(cell11).getNumberValue();
-		assertEquals(expectedValue, actualValue, 0.0);
-
-		String actualText = form.formatCellValue(cell11, evaluator);
-		assertEquals(expectedTimeStr, actualText);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java
deleted file mode 100644
index bb5efa7..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.BlankEval;
-import org.apache.poi.ss.formula.eval.BoolEval;
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Tests for Excel function TRIM()
- *
- * @author Josh Micich
- */
-public final class TestTrim extends TestCase {
-
-
-	private static ValueEval invokeTrim(ValueEval text) {
-		ValueEval[] args = new ValueEval[] { text, };
-		return TextFunction.TRIM.evaluate(args, -1, (short)-1);
-	}
-
-	private void confirmTrim(ValueEval text, String expected) {
-		ValueEval result = invokeTrim(text);
-		assertEquals(StringEval.class, result.getClass());
-		assertEquals(expected, ((StringEval)result).getStringValue());
-	}
-
-	private void confirmTrim(ValueEval text, ErrorEval expectedError) {
-		ValueEval result = invokeTrim(text);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(expectedError.getErrorCode(), ((ErrorEval)result).getErrorCode());
-	}
-
-	public void testBasic() {
-
-		confirmTrim(new StringEval(" hi "), "hi");
-		confirmTrim(new StringEval("hi "), "hi");
-		confirmTrim(new StringEval("  hi"), "hi");
-		confirmTrim(new StringEval(" hi there  "), "hi there");
-		confirmTrim(new StringEval(""), "");
-		confirmTrim(new StringEval("   "), "");
-	}
-
-	/**
-	 * Valid cases where text arg is not exactly a string
-	 */
-	public void testUnusualArgs() {
-
-		// text (first) arg type is number, other args are strings with fractional digits
-		confirmTrim(new NumberEval(123456), "123456");
-		confirmTrim(BoolEval.FALSE, "FALSE");
-		confirmTrim(BoolEval.TRUE, "TRUE");
-		confirmTrim(BlankEval.instance, "");
-	}
-
-	public void testErrors() {
-		confirmTrim(ErrorEval.NAME_INVALID, ErrorEval.NAME_INVALID);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java
deleted file mode 100644
index 91bb8e7..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-
-/**
- * Test case for TRUNC()
- *
- * @author Stephen Wolke (smwolke at geistig.com)
- */
-public final class TestTrunc extends AbstractNumericTestCase {
-	private static final NumericFunction F = null;
-	public void testTruncWithStringArg() {
-
-		ValueEval strArg = new StringEval("abc");
-		ValueEval[] args = { strArg, new NumberEval(2) };
-		ValueEval result = NumericFunction.TRUNC.evaluate(args, -1, (short)-1);
-		assertEquals(ErrorEval.VALUE_INVALID, result);
-	}
-
-	public void testTruncWithWholeNumber() {
-		ValueEval[] args = { new NumberEval(200), new NumberEval(2) };
-		@SuppressWarnings("static-access")
-		ValueEval result = F.TRUNC.evaluate(args, -1, (short)-1);
-		assertEquals("TRUNC", (new NumberEval(200d)).getNumberValue(), ((NumberEval)result).getNumberValue());
-	}
-	
-	public void testTruncWithDecimalNumber() {
-		ValueEval[] args = { new NumberEval(2.612777), new NumberEval(3) };
-		@SuppressWarnings("static-access")
-		ValueEval result = F.TRUNC.evaluate(args, -1, (short)-1);
-		assertEquals("TRUNC", (new NumberEval(2.612d)).getNumberValue(), ((NumberEval)result).getNumberValue());
-	}
-	
-	public void testTruncWithDecimalNumberOneArg() {
-		ValueEval[] args = { new NumberEval(2.612777) };
-		ValueEval result = NumericFunction.TRUNC.evaluate(args, -1, (short)-1);
-		assertEquals("TRUNC", (new NumberEval(2d)).getNumberValue(), ((NumberEval)result).getNumberValue());
-	}
-
-    public void testNegative() {
-        ValueEval[] args = { new NumberEval(-8.9), new NumberEval(0) };
-        @SuppressWarnings("static-access")
-        ValueEval result = F.TRUNC.evaluate(args, -1, (short)-1);
-        assertEquals("TRUNC", (new NumberEval(-8)).getNumberValue(), ((NumberEval)result).getNumberValue());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
deleted file mode 100644
index fb18a95..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.StringEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-
-/**
- * Tests for {@link Value}
- */
-public final class TestValue extends TestCase {
-
-	private static ValueEval invokeValue(String strText) {
-		ValueEval[] args = new ValueEval[] { new StringEval(strText), };
-		return new Value().evaluate(args, -1, (short) -1);
-	}
-
-	private static void confirmValue(String strText, double expected) {
-		ValueEval result = invokeValue(strText);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval) result).getNumberValue(), 0.0);
-	}
-
-	private static void confirmValueError(String strText) {
-		ValueEval result = invokeValue(strText);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(ErrorEval.VALUE_INVALID, result);
-	}
-
-	public void testBasic() {
-
-		confirmValue("100", 100);
-		confirmValue("-2.3", -2.3);
-		confirmValue(".5", 0.5);
-		confirmValue(".5e2", 50);
-		confirmValue(".5e-2", 0.005);
-		confirmValue(".5e+2", 50);
-		confirmValue("+5", 5);
-		confirmValue("$1,000", 1000);
-		confirmValue("100.5e1", 1005);
-		confirmValue("1,0000", 10000);
-		confirmValue("1,000,0000", 10000000);
-		confirmValue("1,000,0000,00000", 1000000000000.0);
-		confirmValue(" 100 ", 100);
-		confirmValue(" + 100", 100);
-		confirmValue("10000", 10000);
-		confirmValue("$-5", -5);
-		confirmValue("$.5", 0.5);
-		confirmValue("123e+5", 12300000);
-		confirmValue("1,000e2", 100000);
-		confirmValue("$10e2", 1000);
-		confirmValue("$1,000e2", 100000);
-        confirmValue("30%", 0.3);
-        confirmValue("30 %", 0.3);
-	}
-
-	public void testErrors() {
-		confirmValueError("1+1");
-		confirmValueError("1 1");
-		confirmValueError("1,00.0");
-		confirmValueError("1,00");
-		confirmValueError("$1,00.5e1");
-		confirmValueError("1,00.5e1");
-		confirmValueError("1,0,000");
-		confirmValueError("1,00,000");
-		confirmValueError("++100");
-		confirmValueError("$$5");
-		confirmValueError("-");
-		confirmValueError("+");
-		confirmValueError("$");
-		confirmValueError(",300");
-		confirmValueError("0.233,4");
-		confirmValueError("1e2.5");
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
deleted file mode 100644
index c2e41dd..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests WeekNum() as loaded from a test data spreadsheet.<p/>
- */
-public class TestWeekNumFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        return data(TestWeekNumFunctionsFromSpreadsheet.class, "WeekNumFunctionTestCaseData.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
deleted file mode 100644
index b75a419..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import java.util.Collection;
-
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Tests WeekNum() as loaded from a test data 2013 excel spreadsheet.<p/>
- */
-public class TestWeekNumFunctionsFromSpreadsheet2013 extends BaseTestFunctionsFromSpreadsheet {
-    @Parameters(name="{0}")
-    public static Collection<Object[]> data() throws Exception {
-        //Only open this file with Excel 2013 to keep binary specific to that version
-        return data(TestWeekNumFunctionsFromSpreadsheet2013.class, "WeekNumFunctionTestCaseData2013.xls");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
deleted file mode 100644
index c6c797c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import org.apache.poi.ss.formula.eval.*;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-
-public class TestWeekdayFunc {
-    @Test
-    public void testEvaluate() throws Exception {
-        assertEquals(2.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(2.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(1.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(1.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(2.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(0.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(3.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(1.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(11.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(7.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(12.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(6.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(13.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(5.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(14.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(4.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(15.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(3.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(16.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(2.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(17.0)}, 0, 0)).getNumberValue(), 0.001);
-
-        assertEquals(3.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(3.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(1.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(2.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(2.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(1.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(3.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(2.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(11.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(1.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(12.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(7.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(13.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(6.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(14.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(5.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(15.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(4.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(16.0)}, 0, 0)).getNumberValue(), 0.001);
-        assertEquals(3.0, ((NumberEval)WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(39448.0), new NumberEval(17.0)}, 0, 0)).getNumberValue(), 0.001);
-    }
-
-    @Test
-    public void testEvaluateInvalid() throws Exception {
-        assertEquals(ErrorEval.VALUE_INVALID, WeekdayFunc.instance.evaluate(new ValueEval[]{}, 0, 0));
-        assertEquals(ErrorEval.VALUE_INVALID, WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(1.0), new NumberEval(1.0)}, 0, 0));
-
-        assertEquals(ErrorEval.NUM_ERROR, WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(-1.0)}, 0, 0));
-        assertEquals(ErrorEval.VALUE_INVALID, WeekdayFunc.instance.evaluate(new ValueEval[]{new StringEval("")}, 0, 0));
-        assertEquals(ErrorEval.VALUE_INVALID, WeekdayFunc.instance.evaluate(new ValueEval[]{new StringEval("1"), new StringEval("")}, 0, 0));
-        assertEquals(ErrorEval.NUM_ERROR, WeekdayFunc.instance.evaluate(new ValueEval[]{new StringEval("2"), BlankEval.instance}, 0, 0));
-        assertEquals(ErrorEval.NUM_ERROR, WeekdayFunc.instance.evaluate(new ValueEval[]{new StringEval("3"), MissingArgEval.instance}, 0, 0));
-        assertEquals(ErrorEval.NUM_ERROR, WeekdayFunc.instance.evaluate(new ValueEval[]{new NumberEval(1.0), new NumberEval(18.0)}, 0, 0));
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java b/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
deleted file mode 100644
index cc7f91a..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.functions;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
-/**
- * Tests for Excel functions SUMX2MY2(), SUMX2PY2(), SUMXMY2()
- *
- * @author Josh Micich
- */
-public final class TestXYNumericFunction extends TestCase {
-	private static final Function SUM_SQUARES = new Sumx2py2();
-	private static final Function DIFF_SQUARES = new Sumx2my2();
-	private static final Function SUM_SQUARES_OF_DIFFS = new Sumxmy2();
-
-	private static ValueEval invoke(Function function, ValueEval xArray, ValueEval yArray) {
-		ValueEval[] args = new ValueEval[] { xArray, yArray, };
-		return function.evaluate(args, -1, (short)-1);
-	}
-
-	private void confirm(Function function, ValueEval xArray, ValueEval yArray, double expected) {
-		ValueEval result = invoke(function, xArray, yArray);
-		assertEquals(NumberEval.class, result.getClass());
-		assertEquals(expected, ((NumberEval)result).getNumberValue(), 0);
-	}
-	private void confirmError(Function function, ValueEval xArray, ValueEval yArray, ErrorEval expectedError) {
-		ValueEval result = invoke(function, xArray, yArray);
-		assertEquals(ErrorEval.class, result.getClass());
-		assertEquals(expectedError.getErrorCode(), ((ErrorEval)result).getErrorCode());
-	}
-
-	private void confirmError(ValueEval xArray, ValueEval yArray, ErrorEval expectedError) {
-		confirmError(SUM_SQUARES, xArray, yArray, expectedError);
-		confirmError(DIFF_SQUARES, xArray, yArray, expectedError);
-		confirmError(SUM_SQUARES_OF_DIFFS, xArray, yArray, expectedError);
-	}
-
-	public void testBasic() {
-		ValueEval[] xValues = {
-			new NumberEval(1),
-			new NumberEval(2),
-		};
-		ValueEval areaEvalX = createAreaEval(xValues);
-		confirm(SUM_SQUARES, areaEvalX, areaEvalX, 10.0);
-		confirm(DIFF_SQUARES, areaEvalX, areaEvalX, 0.0);
-		confirm(SUM_SQUARES_OF_DIFFS, areaEvalX, areaEvalX, 0.0);
-
-		ValueEval[] yValues = {
-			new NumberEval(3),
-			new NumberEval(4),
-		};
-		ValueEval areaEvalY = createAreaEval(yValues);
-		confirm(SUM_SQUARES, areaEvalX, areaEvalY, 30.0);
-		confirm(DIFF_SQUARES, areaEvalX, areaEvalY, -20.0);
-		confirm(SUM_SQUARES_OF_DIFFS, areaEvalX, areaEvalY, 8.0);
-	}
-
-	/**
-	 * number of items in array is not limited to 30
-	 */
-	public void testLargeArrays() {
-		ValueEval[] xValues = createMockNumberArray(100, 3);
-		ValueEval[] yValues = createMockNumberArray(100, 2);
-
-		confirm(SUM_SQUARES, createAreaEval(xValues), createAreaEval(yValues), 1300.0);
-		confirm(DIFF_SQUARES, createAreaEval(xValues), createAreaEval(yValues), 500.0);
-		confirm(SUM_SQUARES_OF_DIFFS, createAreaEval(xValues), createAreaEval(yValues), 100.0);
-	}
-
-
-	private ValueEval[] createMockNumberArray(int size, double value) {
-		ValueEval[] result = new ValueEval[size];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new NumberEval(value);
-		}
-		return result;
-	}
-
-	private static ValueEval createAreaEval(ValueEval[] values) {
-		String refStr = "A1:A" + values.length;
-		return EvalFactory.createAreaEval(refStr, values);
-	}
-
-	public void testErrors() {
-		ValueEval[] xValues = {
-				ErrorEval.REF_INVALID,
-				new NumberEval(2),
-		};
-		ValueEval areaEvalX = createAreaEval(xValues);
-		ValueEval[] yValues = {
-				new NumberEval(2),
-				ErrorEval.NULL_INTERSECTION,
-		};
-		ValueEval areaEvalY = createAreaEval(yValues);
-		ValueEval[] zValues = { // wrong size
-				new NumberEval(2),
-		};
-		ValueEval areaEvalZ = createAreaEval(zValues);
-
-		// if either arg is an error, that error propagates
-		confirmError(ErrorEval.REF_INVALID, ErrorEval.NAME_INVALID, ErrorEval.REF_INVALID);
-		confirmError(areaEvalX, ErrorEval.NAME_INVALID, ErrorEval.NAME_INVALID);
-		confirmError(ErrorEval.NAME_INVALID, areaEvalX, ErrorEval.NAME_INVALID);
-
-		// array sizes must match
-		confirmError(areaEvalX, areaEvalZ, ErrorEval.NA);
-		confirmError(areaEvalZ, areaEvalY, ErrorEval.NA);
-
-		// any error in an array item propagates up
-		confirmError(areaEvalX, areaEvalX, ErrorEval.REF_INVALID);
-
-		// search for errors array by array, not pair by pair
-		confirmError(areaEvalX, areaEvalY, ErrorEval.REF_INVALID);
-		confirmError(areaEvalY, areaEvalX, ErrorEval.NULL_INTERSECTION);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java
deleted file mode 100644
index 202a9e0..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Convenient abstract class to reduce the amount of boilerplate code needed
- * in ptg-related unit tests.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public abstract class AbstractPtgTestCase extends TestCase {
-
-    /**
-     * Loads a workbook from the given filename in the test data dir.
-     *
-     * @param sampleFileName the filename.
-     * @return the loaded workbook.
-     */
-    protected static final HSSFWorkbook loadWorkbook(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleWorkbook(sampleFileName);
-    }
-
-    /**
-     * Creates a new Workbook and adds one sheet with the specified name
-     */
-    protected static final HSSFWorkbook createWorkbookWithSheet(String sheetName) {
-        HSSFWorkbook book = new HSSFWorkbook();
-        book.createSheet(sheetName);
-        return book;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java
deleted file mode 100644
index 93797a7..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.ss.formula.TestSheetNameFormatter;
-import org.apache.poi.ss.formula.eval.AllFormulaEvalTests;
-import org.apache.poi.ss.formula.function.AllFormulaFunctionTests;
-import org.apache.poi.ss.formula.functions.AllIndividualFunctionEvaluationTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for <tt>org.apache.poi.hssf.record.formula</tt>.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    AllFormulaEvalTests.class,
-    AllFormulaFunctionTests.class,
-    AllIndividualFunctionEvaluationTests.class,
-    TestArea3DPtg.class,
-    TestAreaErrPtg.class,
-    TestAreaPtg.class,
-    TestArrayPtg.class,
-    TestAttrPtg.class,
-    TestErrPtg.class,
-    TestExternalFunctionFormulas.class,
-    //TestFormulaShifter.class, //converted to junit4
-    TestFuncPtg.class,
-    TestFuncVarPtg.class,
-    TestIntersectionPtg.class,
-    TestPercentPtg.class,
-    TestRangePtg.class,
-    TestRef3DPtg.class,
-    TestReferencePtg.class,
-    TestSheetNameFormatter.class,
-    TestUnionPtg.class
-})
-public class AllFormulaTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
deleted file mode 100644
index bb11807..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for Area3DPtg
- * 
- * @author Josh Micich
- */
-public final class TestArea3DPtg extends AbstractPtgTestCase {
-
-	/**
-	 * confirms that sheet names get properly escaped
-	 */
-	public void testToFormulaString() {
-
-		Area3DPtg target = new Area3DPtg("A1:B1", (short)0);
-
-		String sheetName = "my sheet";
-		HSSFWorkbook wb = createWorkbookWithSheet(sheetName);
-		HSSFEvaluationWorkbook book = HSSFEvaluationWorkbook.create(wb);
-		assertEquals("'my sheet'!A1:B1", target.toFormulaString(book));
-
-		wb.setSheetName(0, "Sheet1");
-		assertEquals("Sheet1!A1:B1", target.toFormulaString(book));
-
-		wb.setSheetName(0, "C64");
-		assertEquals("'C64'!A1:B1", target.toFormulaString(book));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
deleted file mode 100644
index e8032cb..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for {@link AreaErrPtg}.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class TestAreaErrPtg extends AbstractPtgTestCase {
-    /**
-     * Tests reading a file containing this ptg.
-     */
-    public void testReading() {
-        HSSFWorkbook workbook = loadWorkbook("AreaErrPtg.xls");
-        assertEquals("Wrong formula string for area error", "SUM(#REF!)",
-                     workbook.getSheetAt(0).getRow(0).getCell(2).getCellFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
deleted file mode 100644
index 559dd8c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
+++ /dev/null
@@ -1,143 +0,0 @@
-        
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for {@link AreaPtg}.
- *
- * @author Dmitriy Kumshayev
- */
-public final class TestAreaPtg extends TestCase {
-
-	AreaPtg relative;
-	AreaPtg absolute;
-	
-	@Override
-	protected void setUp() {
-		short firstRow=5;
-		short lastRow=13;
-		short firstCol=7;
-		short lastCol=17;
-		relative = new AreaPtg(firstRow,lastRow,firstCol,lastCol,true,true,true,true);
-		absolute = new AreaPtg(firstRow,lastRow,firstCol,lastCol,false,false,false,false);
-	}
-	
-	public static void testSortTopLeftToBottomRight() {
-	    AreaPtg ptg = new AreaPtg("A$1:$B5");
-	    assertEquals("A$1:$B5", ptg.toFormulaString());
-	    ptg.setFirstColumn(3);
-	    assertEquals("Area Ptg should not implicitly re-sort itself (except during construction)",
-	            "D$1:$B5", ptg.toFormulaString());
-	    ptg.sortTopLeftToBottomRight();
-	    assertEquals("Area Ptg should restore itself to top-left to lower-right order when explicitly asked",
-	            "$B$1:D5", ptg.toFormulaString());
-	}
-
-	public void testSetColumnsAbsolute()
-	{
-		resetColumns(absolute);
-		validateReference(true, absolute);
-	}
-	public void testSetColumnsRelative()
-	{
-		resetColumns(relative);
-		validateReference(false, relative);
-	}
-
-	private void validateReference(boolean abs, AreaPtg ref)
-	{
-		assertEquals("First column reference is not "+(abs?"absolute":"relative"),abs,!ref.isFirstColRelative());
-		assertEquals("Last column reference is not "+(abs?"absolute":"relative"),abs,!ref.isLastColRelative());
-		assertEquals("First row reference is not "+(abs?"absolute":"relative"),abs,!ref.isFirstRowRelative());
-		assertEquals("Last row reference is not "+(abs?"absolute":"relative"),abs,!ref.isLastRowRelative());
-	}
-
-
-	private static void resetColumns(AreaPtg aptg) {
-		int fc = aptg.getFirstColumn();
-		int lc = aptg.getLastColumn();
-		aptg.setFirstColumn(fc);
-		aptg.setLastColumn(lc);
-		assertEquals(fc , aptg.getFirstColumn() );
-		assertEquals(lc , aptg.getLastColumn() );
-	}
-	
-    public void testAbsoluteRelativeRefs() {
-        AreaPtg sca1 = new AreaPtg(4, 5, 6, 7, true, false, true, false);
-        AreaPtg sca2 = new AreaPtg(4, 5, 6, 7, false, true, false, true);
-        AreaPtg sca3 = new AreaPtg(5, 5, 7, 7, true, false, true, false);
-        AreaPtg sca4 = new AreaPtg(5, 5, 7, 7, false, true, false, true);
-
-        assertEquals("first rel., last abs.", "G5:$H$6", sca1.toFormulaString());
-        assertEquals("first abs., last rel.", "$G$5:H6", sca2.toFormulaString());
-        assertEquals("first rel., last abs.", "H6:$H$6", sca3.toFormulaString());
-        assertEquals("first abs., last rel.", "$H$6:H6", sca4.toFormulaString());
-
-        AreaPtg cla1 = cloneArea(sca1);
-        AreaPtg cla2 = cloneArea(sca2);
-        AreaPtg cla3 = cloneArea(sca3);
-        AreaPtg cla4 = cloneArea(sca4);
-
-        assertEquals("first rel., last abs.", "G5:$H$6", cla1.toFormulaString());
-        assertEquals("first abs., last rel.", "$G$5:H6", cla2.toFormulaString());
-        assertEquals("first rel., last abs.", "H6:$H$6", cla3.toFormulaString());
-        assertEquals("first abs., last rel.", "$H$6:H6", cla4.toFormulaString());
-    }
-    private AreaPtg cloneArea(AreaPtg a)
-    {
-        return new AreaPtg(
-                a.getFirstRow(), a.getLastRow(), a.getFirstColumn(), a.getLastColumn(),
-                a.isFirstRowRelative(), a.isLastRowRelative(), a.isFirstColRelative(), a.isLastColRelative()
-        );
-    }
-	
-	public void testFormulaParser()
-	{
-		String formula1="SUM($E$5:$E$6)";
-		String expectedFormula1="SUM($F$5:$F$6)";
-		String newFormula1 = shiftAllColumnsBy1(formula1);
-		assertEquals("Absolute references changed", expectedFormula1, newFormula1);
-		
-		String formula2="SUM(E5:E6)";
-		String expectedFormula2="SUM(F5:F6)";
-		String newFormula2 = shiftAllColumnsBy1(formula2);
-		assertEquals("Relative references changed", expectedFormula2, newFormula2);
-	}
-	
-	private static String shiftAllColumnsBy1(String  formula) {
-		int letUsShiftColumn1By1Column=1;
-		HSSFWorkbook wb = null;
-		Ptg[] ptgs = HSSFFormulaParser.parse(formula, wb);
-		for (Ptg ptg : ptgs) {
-			if (ptg instanceof AreaPtg )
-			{
-				AreaPtg aptg = (AreaPtg)ptg;
-				aptg.setFirstColumn((short)(aptg.getFirstColumn()+letUsShiftColumn1By1Column));
-				aptg.setLastColumn((short)(aptg.getLastColumn()+letUsShiftColumn1By1Column));
-			}
-		}
-		String newFormula = HSSFFormulaParser.toFormulaString(wb, ptgs);
-		return newFormula;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
deleted file mode 100644
index 36783a4..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
-import org.apache.poi.util.LittleEndianInput;
-/**
- * Tests for <tt>ArrayPtg</tt>
- *
- * @author Josh Micich
- */
-public final class TestArrayPtg extends TestCase {
-
-	private static final byte[] ENCODED_PTG_DATA = {
-		0x40,
-		0, 0, 0, 0, 0, 0, 0,
-	};
-	private static final byte[] ENCODED_CONSTANT_DATA = {
-		2,    // 3 columns
-		1, 0, // 2 rows
-		4, 1, 0, 0, 0, 0, 0, 0, 0, // TRUE
-		2, 4, 0, 0, 65, 66, 67, 68, // "ABCD"
-		2, 1, 0, 0, 69, // "E"
-		1, 0, 0, 0, 0, 0, 0, 0, 0, // 0
-		4, 0, 0, 0, 0, 0, 0, 0, 0, // FALSE
-		2, 2, 0, 0, 70, 71, // "FG"
-	};
-
-	private static ArrayPtg create(byte[] initialData, byte[] constantData) {
-		ArrayPtg.Initial ptgInit = new ArrayPtg.Initial(TestcaseRecordInputStream.createLittleEndian(initialData));
-		return ptgInit.finishReading(TestcaseRecordInputStream.createLittleEndian(constantData));
-	}
-
-	/**
-	 * Lots of problems with ArrayPtg's decoding and encoding of the element value data
-	 */
-	public void testReadWriteTokenValueBytes() {
-		ArrayPtg ptg = create(ENCODED_PTG_DATA, ENCODED_CONSTANT_DATA);
-		assertEquals(3, ptg.getColumnCount());
-		assertEquals(2, ptg.getRowCount());
-		Object[][] values = ptg.getTokenArrayValues();
-		assertEquals(2, values.length);
-
-
-		assertEquals(Boolean.TRUE, values[0][0]);
-		assertEquals("ABCD", values[0][1]);
-		assertEquals(new Double(0), values[1][0]);
-		assertEquals(Boolean.FALSE, values[1][1]);
-		assertEquals("FG", values[1][2]);
-
-		byte[] outBuf = new byte[ENCODED_CONSTANT_DATA.length];
-		ptg.writeTokenValueBytes(new LittleEndianByteArrayOutputStream(outBuf, 0));
-
-		if(outBuf[0] == 4) {
-			throw new AssertionFailedError("Identified bug 42564b");
-		}
-		assertArrayEquals(ENCODED_CONSTANT_DATA, outBuf);
-	}
-
-
-	/**
-	 * Excel stores array elements column by column.  This test makes sure POI does the same.
-	 */
-	public void testElementOrdering() {
-		ArrayPtg ptg = create(ENCODED_PTG_DATA, ENCODED_CONSTANT_DATA);
-		assertEquals(3, ptg.getColumnCount());
-		assertEquals(2, ptg.getRowCount());
-
-		assertEquals(0, ptg.getValueIndex(0, 0));
-		assertEquals(1, ptg.getValueIndex(1, 0));
-		assertEquals(2, ptg.getValueIndex(2, 0));
-		assertEquals(3, ptg.getValueIndex(0, 1));
-		assertEquals(4, ptg.getValueIndex(1, 1));
-		assertEquals(5, ptg.getValueIndex(2, 1));
-	}
-
-	/**
-	 * Test for a bug which was temporarily introduced by the fix for bug 42564.
-	 * A spreadsheet was added to make the ordering clearer.
-	 */
-	public void testElementOrderingInSpreadsheet() {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex42564-elementOrder.xls");
-
-		// The formula has an array with 3 rows and 5 columns
-		String formula = wb.getSheetAt(0).getRow(0).getCell(0).getCellFormula();
-
-		if (formula.equals("SUM({1,6,11;2,7,12;3,8,13;4,9,14;5,10,15})")) {
-			throw new AssertionFailedError("Identified bug 42564 b");
-		}
-		assertEquals("SUM({1,2,3,4,5;6,7,8,9,10;11,12,13,14,15})", formula);
-	}
-
-	public void testToFormulaString() {
-		ArrayPtg ptg = create(ENCODED_PTG_DATA, ENCODED_CONSTANT_DATA);
-		String actualFormula;
-		try {
-			actualFormula = ptg.toFormulaString();
-		} catch (IllegalArgumentException e) {
-			if (e.getMessage().equals("Unexpected constant class (java.lang.Boolean)")) {
-				throw new AssertionFailedError("Identified bug 45380");
-			}
-			throw e;
-		}
-		assertEquals("{TRUE,\"ABCD\",\"E\";0,FALSE,\"FG\"}", actualFormula);
-	}
-
-	/**
-	 * worth checking since AttrPtg.sid=0x20 and Ptg.CLASS_* = (0x00, 0x20, and 0x40)
-	 */
-	public void testOperandClassDecoding() {
-		confirmOperandClassDecoding(Ptg.CLASS_REF);
-		confirmOperandClassDecoding(Ptg.CLASS_VALUE);
-		confirmOperandClassDecoding(Ptg.CLASS_ARRAY);
-	}
-
-	private static void confirmOperandClassDecoding(byte operandClass) {
-		byte[] fullData = concat(ENCODED_PTG_DATA, ENCODED_CONSTANT_DATA);
-
-		// Force encoded operand class for tArray
-		fullData[0] = (byte) (ArrayPtg.sid + operandClass);
-
-		LittleEndianInput in = TestcaseRecordInputStream.createLittleEndian(fullData);
-
-		Ptg[] ptgs = Ptg.readTokens(ENCODED_PTG_DATA.length, in);
-		assertEquals(1, ptgs.length);
-		ArrayPtg aPtg = (ArrayPtg) ptgs[0];
-		assertEquals(operandClass, aPtg.getPtgClass());
-	}
-
-	private static byte[] concat(byte[] a, byte[] b) {
-		byte[] result = new byte[a.length + b.length];
-		System.arraycopy(a, 0, result, 0, a.length);
-		System.arraycopy(b, 0, result, a.length, b.length);
-		return result;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
deleted file mode 100644
index 6146449..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.util.HexRead;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * Tests for {@link AttrPtg}.
- * 
- * @author Josh Micich
- */
-public final class TestAttrPtg extends AbstractPtgTestCase {
-
-	/**
-	 * Fix for bug visible around svn r706772.
-	 */
-	public void testReserializeAttrChoose() {
-		byte[] data = HexRead.readFromString("19, 04, 03, 00, 08, 00, 11, 00, 1A, 00, 23, 00");
-		LittleEndianInput in = TestcaseRecordInputStream.createLittleEndian(data);
-		Ptg[] ptgs = Ptg.readTokens(data.length, in);
-		byte[] data2 = new byte[data.length];
-		try {
-			Ptg.serializePtgs(ptgs, data2, 0);
-		} catch (ArrayIndexOutOfBoundsException e) {
-			throw new AssertionFailedError("incorrect re-serialization of tAttrChoose");
-		}
-		assertArrayEquals(data, data2);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java
deleted file mode 100644
index 735ba39..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for {@link ErrPtg}.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class TestErrPtg extends AbstractPtgTestCase {
-    /**
-     * Tests reading a file containing this ptg.
-     */
-    public void testReading() {
-        HSSFWorkbook workbook = loadWorkbook("ErrPtg.xls");
-        HSSFCell cell = workbook.getSheetAt(0).getRow(3).getCell(0);
-        assertEquals("Wrong cell value", 4.0, cell.getNumericCellValue(), 0.0);
-        assertEquals("Wrong cell formula", "ERROR.TYPE(#REF!)", cell.getCellFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
deleted file mode 100644
index bb32207..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
-
-/**
- * Tests for functions from external workbooks (e.g. YEARFRAC).
- */
-public final class TestExternalFunctionFormulas {
-
-	/**
-	 * tests <tt>NameXPtg.toFormulaString(Workbook)</tt> and logic in Workbook below that   
-	 */
-    @Test
-	public void testReadFormulaContainingExternalFunction() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("externalFunctionExample.xls");
-		
-		String expectedFormula = "YEARFRAC(B1,C1)";
-		HSSFSheet sht = wb.getSheetAt(0);
-		String cellFormula = sht.getRow(0).getCell(0).getCellFormula();
-		assertEquals(expectedFormula, cellFormula);
-		
-		wb.close();
-	}
-	
-    @Test
-    public void testParse() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("externalFunctionExample.xls");
-		Ptg[] ptgs = HSSFFormulaParser.parse("YEARFRAC(B1,C1)", wb);
-		assertEquals(4, ptgs.length);
-		assertEquals(NameXPtg.class, ptgs[0].getClass());
-		
-		wb.getSheetAt(0).getRow(0).createCell(6).setCellFormula("YEARFRAC(C1,B1)");
-//		if (false) {
-//			// In case you fancy checking in excel
-//			try {
-//				File tempFile = TempFile.createTempFile("testExtFunc", ".xls");
-//				FileOutputStream fout = new FileOutputStream(tempFile);
-//				wb.write(fout);
-//				fout.close();
-//				System.out.println("check out " + tempFile.getAbsolutePath());
-//			} catch (IOException e) {
-//				throw new RuntimeException(e);
-//			}
-//		}
-		wb.close();
-	}
-	
-    @Test
-	public void testEvaluate() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("externalFunctionExample.xls");
-		HSSFSheet sheet = wb.getSheetAt(0);
-		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-		confirmCellEval(sheet, 0, 0, fe, "YEARFRAC(B1,C1)", 29.0/90.0);
-		confirmCellEval(sheet, 1, 0, fe, "YEARFRAC(B2,C2)", 0.0);
-		confirmCellEval(sheet, 2, 0, fe, "YEARFRAC(B3,C3,D3)", 0.0);
-		confirmCellEval(sheet, 3, 0, fe, "IF(ISEVEN(3),1.2,1.6)", 1.6);
-		confirmCellEval(sheet, 4, 0, fe, "IF(ISODD(3),1.2,1.6)", 1.2);
-		wb.close();
-	}
-
-	private static void confirmCellEval(HSSFSheet sheet, int rowIx, int colIx, 
-			HSSFFormulaEvaluator fe, String expectedFormula, double expectedResult) {
-		HSSFCell cell = sheet.getRow(rowIx).getCell(colIx);
-		assertEquals(expectedFormula, cell.getCellFormula());
-		CellValue cv = fe.evaluate(cell);
-		assertEquals(expectedResult, cv.getNumberValue(), 0.0);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
deleted file mode 100644
index 6fa94df..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.CellReference;
-/**
- * Tests for proper calculation of named ranges from external workbooks.
- * 
- * 
- * @author Stephen Wolke (smwolke at geistig.com)
- */
-public final class TestExternalNameReference extends TestCase {
-	double MARKUP_COST = 1.9d;
-	double MARKUP_COST_1 = 1.8d;
-	double MARKUP_COST_2 = 1.5d;
-	double PART_COST = 12.3d;
-	double NEW_QUANT = 7.0d;
-	double NEW_PART_COST = 15.3d;
-	/**
-	 * tests <tt>NameXPtg for external cell reference by name</tt> and logic in Workbook below that   
-	 */
-	public void testReadCalcSheet() {
-	    try{
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("XRefCalc.xls");
-		assertEquals("Sheet1!$A$2", wb.getName("QUANT").getRefersToFormula());
-		assertEquals("Sheet1!$B$2", wb.getName("PART").getRefersToFormula());
-		assertEquals("x123",wb.getSheet("Sheet1").getRow(1).getCell(1).getStringCellValue());
-		assertEquals("Sheet1!$C$2", wb.getName("UNITCOST").getRefersToFormula());
-		CellReference cellRef = new CellReference(wb.getName("UNITCOST").getRefersToFormula());
-		HSSFCell cell = wb.getSheet(cellRef.getSheetName()).getRow(cellRef.getRow()).getCell((int)cellRef.getCol());
-		assertEquals("VLOOKUP(PART,COSTS,2,FALSE)",cell.getCellFormula());
-		assertEquals("Sheet1!$D$2", wb.getName("COST").getRefersToFormula());
-		cellRef = new CellReference(wb.getName("COST").getRefersToFormula());
-		cell = wb.getSheet(cellRef.getSheetName()).getRow(cellRef.getRow()).getCell((int)cellRef.getCol());
-		assertEquals("UNITCOST*Quant",cell.getCellFormula());
-		assertEquals("Sheet1!$E$2", wb.getName("TOTALCOST").getRefersToFormula());
-		cellRef = new CellReference(wb.getName("TOTALCOST").getRefersToFormula());
-		cell = wb.getSheet(cellRef.getSheetName()).getRow(cellRef.getRow()).getCell((int)cellRef.getCol());
-		assertEquals("Cost*Markup_Cost",cell.getCellFormula());
-	    }catch(Exception e){
-		fail();
-	    }
-	}
-	
-	public void testReadReferencedSheet() {
-	    try{
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("XRefCalcData.xls");
-		assertEquals("CostSheet!$A$2:$B$3", wb.getName("COSTS").getRefersToFormula());
-		assertEquals("x123",wb.getSheet("CostSheet").getRow(1).getCell(0).getStringCellValue());
-		assertEquals(PART_COST,wb.getSheet("CostSheet").getRow(1).getCell(1).getNumericCellValue());
-		assertEquals("MarkupSheet!$B$1", wb.getName("Markup_Cost").getRefersToFormula());
-		assertEquals(MARKUP_COST_1,wb.getSheet("MarkupSheet").getRow(0).getCell(1).getNumericCellValue());
-	    }catch(Exception e){
-		fail();
-	    }
-	}
-	
-	public void testEvaluate() throws Exception {
-		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("XRefCalc.xls");
-		HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook("XRefCalcData.xls");
-		CellReference cellRef = new CellReference(wb.getName("QUANT").getRefersToFormula());
-		HSSFCell cell = wb.getSheet(cellRef.getSheetName()).getRow(cellRef.getRow()).getCell((int)cellRef.getCol());
-		cell.setCellValue(NEW_QUANT);
-		cell = wb2.getSheet("CostSheet").getRow(1).getCell(1);
-		cell.setCellValue(NEW_PART_COST);
-		HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb);
-		HSSFFormulaEvaluator evaluatorCost = new HSSFFormulaEvaluator(wb2);
-		String[] bookNames = { "XRefCalc.xls", "XRefCalcData.xls" };
-		HSSFFormulaEvaluator[] evaluators = { evaluator, evaluatorCost, };
-		HSSFFormulaEvaluator.setupEnvironment(bookNames, evaluators);
-		cellRef = new CellReference(wb.getName("UNITCOST").getRefersToFormula());
-		HSSFCell uccell = wb.getSheet(cellRef.getSheetName()).getRow(cellRef.getRow()).getCell((int)cellRef.getCol());
-		cellRef = new CellReference(wb.getName("COST").getRefersToFormula());
-		HSSFCell ccell = wb.getSheet(cellRef.getSheetName()).getRow(cellRef.getRow()).getCell((int)cellRef.getCol());
-		cellRef = new CellReference(wb.getName("TOTALCOST").getRefersToFormula());
-		HSSFCell tccell = wb.getSheet(cellRef.getSheetName()).getRow(cellRef.getRow()).getCell((int)cellRef.getCol());
-		evaluator.evaluateFormulaCellEnum(uccell);
-		evaluator.evaluateFormulaCellEnum(ccell);
-		evaluator.evaluateFormulaCellEnum(tccell);
-		assertEquals(NEW_PART_COST, uccell.getNumericCellValue());
-		assertEquals(NEW_PART_COST*NEW_QUANT, ccell.getNumericCellValue());
-		assertEquals(NEW_PART_COST*NEW_QUANT*MARKUP_COST_2, tccell.getNumericCellValue());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
deleted file mode 100644
index fd1af26..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-/**
- * Make sure the FuncPtg performs as expected
- *
- * @author Danny Mui (dmui at apache dot org)
- */
-public final class TestFuncPtg extends TestCase {
-
-    public void testRead() {
-    	// This function index represents the LEN() function
-        byte[] fakeData = { 0x20, 0x00,};
-
-        FuncPtg ptg = FuncPtg.create(TestcaseRecordInputStream.createLittleEndian(fakeData) );
-        assertEquals( "Len formula index is not 32(20H)", 0x20, ptg.getFunctionIndex() );
-        assertEquals( "Number of operands in the len formula", 1, ptg.getNumberOfOperands() );
-        assertEquals( "Function Name", "LEN", ptg.getName() );
-        assertEquals( "Ptg Size", 3, ptg.getSize() );
-    }
-
-    public void testNumberOfOperands() {
-        FuncPtg funcPtg = FuncPtg.create(27); // ROUND() - takes 2 args
-        assertEquals(2, funcPtg.getNumberOfOperands());
-        assertEquals("ROUND", funcPtg.getName());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
deleted file mode 100644
index ecc07aa..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-/**
- * @author Josh Micich
- */
-public final class TestFuncVarPtg extends TestCase {
-
-	/**
-	 * The first fix for bugzilla 44675 broke the encoding of SUM formulas (and probably others).
-	 * The operand classes of the parameters to SUM() should be coerced to 'reference' not 'value'.
-	 * In the case of SUM, Excel evaluates the formula to '#VALUE!' if a parameter operand class is
-	 * wrong.  In other cases Excel seems to tolerate bad operand classes.</p>
-	 * This functionality is related to the setParameterRVA() methods of <tt>FormulaParser</tt>
-	 */
-	public void testOperandClass() {
-		HSSFWorkbook book = new HSSFWorkbook();
-		Ptg[] ptgs = HSSFFormulaParser.parse("sum(A1:A2)", book);
-		assertEquals(2, ptgs.length);
-		assertEquals(AreaPtg.class, ptgs[0].getClass());
-		
-		switch(ptgs[0].getPtgClass()) {
-			case Ptg.CLASS_REF:
-				// correct behaviour
-				break;
-			case Ptg.CLASS_VALUE:
-				throw new AssertionFailedError("Identified bug 44675b");
-			default:
-				throw new RuntimeException("Unexpected operand class");
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
deleted file mode 100644
index c06b80e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for {@link IntersectionPtg}.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class TestIntersectionPtg extends AbstractPtgTestCase {
-    /**
-     * Tests reading a file containing this ptg.
-     */
-    public void testReading() {
-        HSSFWorkbook workbook = loadWorkbook("IntersectionPtg.xls");
-        HSSFCell cell = workbook.getSheetAt(0).getRow(4).getCell(2);
-        assertEquals("Wrong cell value", 5.0, cell.getNumericCellValue(), 0.0);
-        assertEquals("Wrong cell formula", "SUM(A1:B2 B2:C3)", cell.getCellFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
deleted file mode 100644
index 79d3453..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for {@link PercentPtg}.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class TestPercentPtg extends AbstractPtgTestCase {
-    /**
-     * Tests reading a file containing this ptg.
-     */
-    public void testReading() {
-        HSSFWorkbook workbook = loadWorkbook("PercentPtg.xls");
-        HSSFSheet sheet = workbook.getSheetAt(0);
-
-        assertEquals("Wrong numeric value for original number", 53000.0,
-                     sheet.getRow(0).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals("Wrong numeric value for percent formula result", 5300.0,
-                     sheet.getRow(1).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals("Wrong formula string for percent formula", "A1*10%",
-                     sheet.getRow(1).getCell(0).getCellFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
deleted file mode 100644
index 3b02684..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for {@link RangePtg}.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class TestRangePtg extends AbstractPtgTestCase {
-    /**
-     * Tests reading a file containing this ptg.
-     */
-    public void testReading() {
-        HSSFWorkbook workbook = loadWorkbook("RangePtg.xls");
-        HSSFCell cell = workbook.getSheetAt(0).getRow(3).getCell(1);
-        assertEquals("Wrong cell value", 10.0, cell.getNumericCellValue(), 0.0);
-        assertEquals("Wrong cell formula", "SUM(pineapple:B2)", cell.getCellFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
deleted file mode 100644
index 3aca4c4..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for Ref3DPtg
- * 
- * @author Josh Micich
- */
-public final class TestRef3DPtg extends AbstractPtgTestCase {
-
-	public void testToFormulaString() {
-
-		Ref3DPtg target = new Ref3DPtg("A1", (short)0);
-
-		HSSFWorkbook wb = createWorkbookWithSheet("my sheet");
-		HSSFEvaluationWorkbook book = HSSFEvaluationWorkbook.create(wb);
-		assertEquals("'my sheet'!A1", target.toFormulaString(book));
-
-		wb.setSheetName(0, "ProfitAndLoss");
-		assertEquals("ProfitAndLoss!A1", target.toFormulaString(book));
-
-		wb.setSheetName(0, "profit+loss");
-		assertEquals("'profit+loss'!A1", target.toFormulaString(book));
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
deleted file mode 100644
index 7167c2e..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.util.LittleEndianInput;
-
-/**
- * Tests for {@link RefPtg}.
- */
-public final class TestReferencePtg extends TestCase {
-    /**
-     * Tests reading a file containing this ptg.
-     */
-    public void testReading() {
-        HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook("ReferencePtg.xls");
-        HSSFSheet sheet = workbook.getSheetAt(0);
-
-        // First row
-        assertEquals("Wrong numeric value for original number", 55.0,
-                     sheet.getRow(0).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals("Wrong numeric value for referemce", 55.0,
-                     sheet.getRow(0).getCell(1).getNumericCellValue(), 0.0);
-        assertEquals("Wrong formula string for reference", "A1",
-                     sheet.getRow(0).getCell(1).getCellFormula());
-        
-        // Now moving over the 2**15 boundary
-        // (Remember that excel row (n) is poi row (n-1)
-        assertEquals("Wrong numeric value for original number", 32767.0,
-                sheet.getRow(32766).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals("Wrong numeric value for referemce", 32767.0,
-                sheet.getRow(32766).getCell(1).getNumericCellValue(), 0.0);
-        assertEquals("Wrong formula string for reference", "A32767",
-                sheet.getRow(32766).getCell(1).getCellFormula());
-        
-        assertEquals("Wrong numeric value for original number", 32768.0,
-                sheet.getRow(32767).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals("Wrong numeric value for referemce", 32768.0,
-                sheet.getRow(32767).getCell(1).getNumericCellValue(), 0.0);
-        assertEquals("Wrong formula string for reference", "A32768",
-                sheet.getRow(32767).getCell(1).getCellFormula());
-        
-        assertEquals("Wrong numeric value for original number", 32769.0,
-                sheet.getRow(32768).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals("Wrong numeric value for referemce", 32769.0,
-                sheet.getRow(32768).getCell(1).getNumericCellValue(), 0.0);
-        assertEquals("Wrong formula string for reference", "A32769",
-                sheet.getRow(32768).getCell(1).getCellFormula());
-        
-        assertEquals("Wrong numeric value for original number", 32770.0,
-                sheet.getRow(32769).getCell(0).getNumericCellValue(), 0.0);
-        assertEquals("Wrong numeric value for referemce", 32770.0,
-                sheet.getRow(32769).getCell(1).getNumericCellValue(), 0.0);
-        assertEquals("Wrong formula string for reference", "A32770",
-                sheet.getRow(32769).getCell(1).getCellFormula());
-    }
-    
-    public void testBug44921() {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex44921-21902.xls");
-        
-        try {
-            HSSFTestDataSamples.writeOutAndReadBack(wb);
-        } catch (RuntimeException e) {
-            if(e.getMessage().equals("Coding Error: This method should never be called. This ptg should be converted")) {
-                throw new AssertionFailedError("Identified bug 44921");
-            }
-            throw e;
-        }
-    }
-    private static final byte[] tRefN_data = {
-    	0x2C, 33, 44, 55, 66,
-    };
-    public void testReadWrite_tRefN_bug45091() {
-    	LittleEndianInput in = TestcaseRecordInputStream.createLittleEndian(tRefN_data);
-        Ptg[] ptgs = Ptg.readTokens(tRefN_data.length, in);
-        byte[] outData = new byte[5];
-        Ptg.serializePtgs(ptgs, outData, 0);
-        if (outData[0] == 0x24) {
-            throw new AssertionFailedError("Identified bug 45091");
-        }
-        assertArrayEquals(tRefN_data, outData);
-    }
-
-    /**
-     * test that RefPtgBase can handle references with column index greater than 255,
-     * see Bugzilla 50096
-     */
-    public void testColumnGreater255() {
-        RefPtgBase ptg;
-        ptg = new RefPtg("IW1");
-        assertEquals(256, ptg.getColumn());
-        assertEquals("IW1", ptg.formatReferenceAsString());
-
-        ptg = new RefPtg("JA1");
-        assertEquals(260, ptg.getColumn());
-        assertEquals("JA1", ptg.formatReferenceAsString());
-    }
-}
-
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java b/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
deleted file mode 100644
index 9ea7560..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.formula.ptg;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-/**
- * Tests for {@link UnionPtg}.
- *
- * @author Daniel Noll (daniel at nuix dot com dot au)
- */
-public final class TestUnionPtg extends AbstractPtgTestCase {
-    /**
-     * Tests reading a file containing this ptg.
-     */
-    public void testReading() {
-        HSSFWorkbook workbook = loadWorkbook("UnionPtg.xls");
-        HSSFCell cell = workbook.getSheetAt(0).getRow(4).getCell(2);
-        assertEquals("Wrong cell value", 24.0, cell.getNumericCellValue(), 0.0);
-        assertEquals("Wrong cell formula", "SUM(A1:B2,B2:C3)", cell.getCellFormula());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/udf/BaseTestUDFFinder.java b/trunk/src/testcases/org/apache/poi/ss/formula/udf/BaseTestUDFFinder.java
deleted file mode 100644
index ab3aa98..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/udf/BaseTestUDFFinder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.udf;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-
-public class BaseTestUDFFinder {
-
-    protected UDFFinder _instance;
-    protected static final FreeRefFunction NotImplemented = new FreeRefFunction() {
-        @Override
-        public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-            throw new RuntimeException("not implemented");
-        }
-    };
-
-    protected void confirmFindFunction(String name) {
-        FreeRefFunction func = _instance.findFunction(name);
-        assertNotNull(func);
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java b/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java
deleted file mode 100644
index 88d7e84..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.udf;
-
-import org.apache.poi.ss.formula.atp.AnalysisToolPak;
-import org.junit.Test;
-
-public class TestAggregatingUDFFinder extends BaseTestUDFFinder {
-
-    public TestAggregatingUDFFinder() {
-        _instance = new AggregatingUDFFinder(AnalysisToolPak.instance);
-    }
-
-    @Test
-    public void findFunction() {
-        confirmFindFunction("BESSELJ");
-    }
-
-    @Test
-    public void add() {
-        ((AggregatingUDFFinder)_instance).add(AnalysisToolPak.instance);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java b/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java
deleted file mode 100644
index 010b19d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-	   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.formula.udf;
-
-import org.apache.poi.ss.formula.functions.FreeRefFunction;
-import org.junit.Test;
-
-public class TestDefaultUDFFinder extends BaseTestUDFFinder {
-
-    public TestDefaultUDFFinder() {
-        _instance = new DefaultUDFFinder(
-                new String[] { "NotImplemented" },
-                new FreeRefFunction[] { NotImplemented }
-        );
-    }
-
-    @Test
-    public void findFunction() {
-        confirmFindFunction("NotImplemented");
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
deleted file mode 100644
index 2fd2c37..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   2012 - Alfresco Software, Ltd.
-   Alfresco Software has modified source of this file
-   The details of changes as svn diff can be found in svn at location root/projects/3rd-party/src 
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.junit.Test;
-
-/**
- * Tests of {@link BorderStyle}
- */
-public class BaseTestBorderStyle {
-    
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestBorderStyle(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    /**
-     * Test that we use the specified locale when deciding
-     *   how to format normal numbers
-     */
-    @Test
-    public void testBorderStyle() throws IOException {
-        String ext = _testDataProvider.getStandardFileNameExtension();
-        Workbook wb = _testDataProvider.openSampleWorkbook("59264."+ext);
-        Sheet sh = wb.getSheetAt(0);
-        
-        assertBorderStyleEquals(BorderStyle.NONE, getDiagonalCell(sh, 0));
-        assertBorderStyleEquals(BorderStyle.THIN, getDiagonalCell(sh, 1));
-        assertBorderStyleEquals(BorderStyle.MEDIUM, getDiagonalCell(sh, 2));
-        assertBorderStyleEquals(BorderStyle.DASHED, getDiagonalCell(sh, 3));
-        assertBorderStyleEquals(BorderStyle.DOTTED, getDiagonalCell(sh, 4));
-        assertBorderStyleEquals(BorderStyle.THICK, getDiagonalCell(sh, 5));
-        assertBorderStyleEquals(BorderStyle.DOUBLE, getDiagonalCell(sh, 6));
-        assertBorderStyleEquals(BorderStyle.HAIR, getDiagonalCell(sh, 7));
-        assertBorderStyleEquals(BorderStyle.MEDIUM_DASHED, getDiagonalCell(sh, 8));
-        assertBorderStyleEquals(BorderStyle.DASH_DOT, getDiagonalCell(sh, 9));
-        assertBorderStyleEquals(BorderStyle.MEDIUM_DASH_DOT, getDiagonalCell(sh, 10));
-        assertBorderStyleEquals(BorderStyle.DASH_DOT_DOT, getDiagonalCell(sh, 11));
-        assertBorderStyleEquals(BorderStyle.MEDIUM_DASH_DOT_DOT, getDiagonalCell(sh, 12));
-        assertBorderStyleEquals(BorderStyle.SLANTED_DASH_DOT, getDiagonalCell(sh, 13));
-        
-        wb.close();
-    }
-    
-    private Cell getDiagonalCell(Sheet sheet, int n) {
-        return sheet.getRow(n).getCell(n);
-    }
-    
-    protected void assertBorderStyleEquals(BorderStyle expected, Cell cell) {
-        CellStyle style = cell.getCellStyle();
-        assertEquals(expected, style.getBorderTopEnum());
-        assertEquals(expected, style.getBorderBottomEnum());
-        assertEquals(expected, style.getBorderLeftEnum());
-        assertEquals(expected, style.getBorderRightEnum());
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
deleted file mode 100644
index b5649ef..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
+++ /dev/null
@@ -1,1782 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.PaneInformation;
-import org.apache.poi.ss.util.SheetUtil;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextAttribute;
-import java.awt.font.TextLayout;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.text.AttributedString;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-/**
- * A base class for bugzilla issues that can be described in terms of common ss interfaces.
- *
- * @author Yegor Kozlov
- */
-public abstract class BaseTestBugzillaIssues {
-    
-    private static final POILogger logger = POILogFactory.getLogger(BaseTestBugzillaIssues.class);
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestBugzillaIssues(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    /**
-     * Unlike org.junit.Assert.assertEquals(double expected, double actual, double delta),
-     * where delta is an absolute error value, this function's factor is a relative error,
-     * so it's easier to express "actual is within 5% of expected".
-     */
-    public static void assertAlmostEquals(double expected, double actual, float factor) {
-        double diff = Math.abs(expected - actual);
-        double fuzz = expected * factor;
-        if (diff > fuzz)
-            fail(actual + " not within " + fuzz + " of " + expected);
-    }
-
-    /**
-     * Test writing a hyperlink
-     * Open resulting sheet in Excel and check that A1 contains a hyperlink
-     *
-     * Also tests bug 15353 (problems with hyperlinks to Google)
-     */
-    @Test
-    public final void bug23094() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet s = wb1.createSheet();
-        Row r = s.createRow(0);
-        r.createCell(0).setCellFormula("HYPERLINK(\"http://jakarta.apache.org\",\"Jakarta\")");
-        r.createCell(1).setCellFormula("HYPERLINK(\"http://google.com\",\"Google\")");
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        r = wb2.getSheetAt(0).getRow(0);
-
-        Cell cell_0 = r.getCell(0);
-        assertEquals("HYPERLINK(\"http://jakarta.apache.org\",\"Jakarta\")", cell_0.getCellFormula());
-        Cell cell_1 = r.getCell(1);
-        assertEquals("HYPERLINK(\"http://google.com\",\"Google\")", cell_1.getCellFormula());
-
-        wb2.close();
-    }
-
-    /**
-     * test writing a file with large number of unique strings,
-     * open resulting file in Excel to check results!
-     * @param  num the number of strings to generate
-     */
-    public final void bug15375(int num) throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-        CreationHelper factory = wb1.getCreationHelper();
-
-        for (int i = 0; i < num; i++) {
-            String tmp1 = "Test1" + i;
-            String tmp2 = "Test2" + i;
-            String tmp3 = "Test3" + i;
-
-            Row row = sheet.createRow(i);
-
-            Cell cell = row.createCell(0);
-            cell.setCellValue(factory.createRichTextString(tmp1));
-            cell = row.createCell(1);
-            cell.setCellValue(factory.createRichTextString(tmp2));
-            cell = row.createCell(2);
-            cell.setCellValue(factory.createRichTextString(tmp3));
-        }
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sheet = wb2.getSheetAt(0);
-        for (int i = 0; i < num; i++) {
-            String tmp1 = "Test1" + i;
-            String tmp2 = "Test2" + i;
-            String tmp3 = "Test3" + i;
-
-            Row row = sheet.getRow(i);
-
-            assertEquals(tmp1, row.getCell(0).getStringCellValue());
-            assertEquals(tmp2, row.getCell(1).getStringCellValue());
-            assertEquals(tmp3, row.getCell(2).getStringCellValue());
-        }
-        wb2.close();
-    }
-
-    /**
-     * Merged regions were being removed from the parent in cloned sheets
-     */
-    @Test
-    public void bug22720() throws IOException {
-       Workbook wb = _testDataProvider.createWorkbook();
-       wb.createSheet("TEST");
-       Sheet template = wb.getSheetAt(0);
-
-       template.addMergedRegion(new CellRangeAddress(0, 1, 0, 2));
-       template.addMergedRegion(new CellRangeAddress(2, 3, 0, 2));
-
-       Sheet clone = wb.cloneSheet(0);
-       int originalMerged = template.getNumMergedRegions();
-       assertEquals("2 merged regions", 2, originalMerged);
-
-       //remove merged regions from clone
-       for (int i=template.getNumMergedRegions()-1; i>=0; i--) {
-           clone.removeMergedRegion(i);
-       }
-
-       assertEquals("Original Sheet's Merged Regions were removed", originalMerged, template.getNumMergedRegions());
-       //check if template's merged regions are OK
-       if (template.getNumMergedRegions()>0) {
-            // fetch the first merged region...EXCEPTION OCCURS HERE
-            template.getMergedRegion(0);
-       }
-       //make sure we dont exception
-       wb.close();
-    }
-
-    @Test
-    public final void bug28031() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-        wb1.setSheetName(0, "Sheet1");
-
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        String formulaText =
-            "IF(ROUND(A2*B2*C2,2)>ROUND(B2*D2,2),ROUND(A2*B2*C2,2),ROUND(B2*D2,2))";
-        cell.setCellFormula(formulaText);
-
-        assertEquals(formulaText, cell.getCellFormula());
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        cell = wb2.getSheetAt(0).getRow(0).getCell(0);
-        assertEquals("IF(ROUND(A2*B2*C2,2)>ROUND(B2*D2,2),ROUND(A2*B2*C2,2),ROUND(B2*D2,2))", cell.getCellFormula());
-        wb2.close();
-    }
-
-    /**
-     * Bug 21334: "File error: data may have been lost" with a file
-     * that contains macros and this formula:
-     * {=SUM(IF(FREQUENCY(IF(LEN(V4:V220)>0,MATCH(V4:V220,V4:V220,0),""),IF(LEN(V4:V220)>0,MATCH(V4:V220,V4:V220,0),""))>0,1))}
-     */
-    @Test
-    public final void bug21334() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sh = wb1.createSheet();
-        Cell cell = sh.createRow(0).createCell(0);
-        String formula = "SUM(IF(FREQUENCY(IF(LEN(V4:V220)>0,MATCH(V4:V220,V4:V220,0),\"\"),IF(LEN(V4:V220)>0,MATCH(V4:V220,V4:V220,0),\"\"))>0,1))";
-        cell.setCellFormula(formula);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        Cell cell_sv = wb2.getSheetAt(0).getRow(0).getCell(0);
-        assertEquals(formula, cell_sv.getCellFormula());
-        wb2.close();
-    }
-
-    /** another test for the number of unique strings issue
-     *test opening the resulting file in Excel*/
-    @Test
-    public final void bug22568() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet("ExcelTest") ;
-
-        int col_cnt = 3;
-        int rw_cnt = 2000;
-
-        Row rw ;
-        rw = sheet.createRow(0) ;
-        //Header row
-        for(int j=0; j<col_cnt; j++){
-            Cell cell = rw.createCell(j) ;
-            cell.setCellValue("Col " + (j+1));
-        }
-
-        for(int i=1; i<rw_cnt; i++){
-            rw = sheet.createRow(i) ;
-            for(int j=0; j<col_cnt; j++){
-                Cell cell = rw.createCell(j) ;
-                cell.setCellValue("Row:" + (i+1) + ",Column:" + (j+1));
-            }
-        }
-
-        sheet.setDefaultColumnWidth(18) ;
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        rw = sheet.getRow(0);
-        //Header row
-        for(int j=0; j<col_cnt; j++){
-            Cell cell = rw.getCell(j) ;
-            assertEquals("Col " + (j+1), cell.getStringCellValue());
-        }
-        for(int i=1; i<rw_cnt; i++){
-            rw = sheet.getRow(i) ;
-            for(int j=0; j<col_cnt; j++){
-                Cell cell = rw.getCell(j) ;
-                assertEquals("Row:" + (i+1) + ",Column:" + (j+1), cell.getStringCellValue());
-            }
-        }
-        wb2.close();
-    }
-
-    /**
-     * Bug 42448: Can't parse SUMPRODUCT(A!C7:A!C67, B8:B68) / B69
-     */
-    @Test
-    public final void bug42448() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Cell cell = wb.createSheet().createRow(0).createCell(0);
-        cell.setCellFormula("SUMPRODUCT(A!C7:A!C67, B8:B68) / B69");
-        assertTrue("no errors parsing formula", true);
-        wb.close();
-    }
-
-    @Test
-    public void bug18800() throws IOException {
-       Workbook wb1 = _testDataProvider.createWorkbook();
-       wb1.createSheet("TEST");
-       Sheet sheet = wb1.cloneSheet(0);
-       wb1.setSheetName(1,"CLONE");
-       sheet.createRow(0).createCell(0).setCellValue("Test");
-
-       Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-       wb1.close();
-       sheet = wb2.getSheet("CLONE");
-       Row row = sheet.getRow(0);
-       Cell cell = row.getCell(0);
-       assertEquals("Test", cell.getRichStringCellValue().getString());
-       wb2.close();
-   }
-
-    private static void addNewSheetWithCellsA1toD4(Workbook book, int sheet) {
-
-        Sheet sht = book .createSheet("s" + sheet);
-        for (int r=0; r < 4; r++) {
-
-            Row   row = sht.createRow (r);
-            for (int c=0; c < 4; c++) {
-
-                Cell cel = row.createCell(c);
-                cel.setCellValue(sheet*100 + r*10 + c);
-            }
-        }
-    }
-
-    @Test
-    public void bug43093() throws IOException {
-        Workbook xlw = _testDataProvider.createWorkbook();
-
-        addNewSheetWithCellsA1toD4(xlw, 1);
-        addNewSheetWithCellsA1toD4(xlw, 2);
-        addNewSheetWithCellsA1toD4(xlw, 3);
-        addNewSheetWithCellsA1toD4(xlw, 4);
-
-        Sheet s2   = xlw.getSheet("s2");
-        Row   s2r3 = s2.getRow(3);
-        Cell  s2E4 = s2r3.createCell(4);
-        s2E4.setCellFormula("SUM(s3!B2:C3)");
-
-        FormulaEvaluator eva = xlw.getCreationHelper().createFormulaEvaluator();
-        double d = eva.evaluate(s2E4).getNumberValue();
-
-        assertEquals(d, (311+312+321+322), 0.0000001);
-
-        xlw.close();
-    }
-
-    @Test
-    public void bug46729_testMaxFunctionArguments() throws IOException {
-        String[] func = {"COUNT", "AVERAGE", "MAX", "MIN", "OR", "SUBTOTAL", "SKEW"};
-
-        SpreadsheetVersion ssVersion = _testDataProvider.getSpreadsheetVersion();
-        Workbook wb = _testDataProvider.createWorkbook();
-        Cell cell = wb.createSheet().createRow(0).createCell(0);
-
-        String fmla;
-        for (String name : func) {
-
-            fmla = createFunction(name, 5);
-            cell.setCellFormula(fmla);
-
-            fmla = createFunction(name, ssVersion.getMaxFunctionArgs());
-            cell.setCellFormula(fmla);
-
-            try {
-                fmla = createFunction(name, ssVersion.getMaxFunctionArgs() + 1);
-                cell.setCellFormula(fmla);
-                fail("Expected FormulaParseException");
-            } catch (RuntimeException e){
-                 assertTrue(e.getMessage().startsWith("Too many arguments to function '"+name+"'"));
-            }
-        }
-        wb.close();
-    }
-
-    private static String createFunction(String name, int maxArgs){
-        StringBuilder fmla = new StringBuilder();
-        fmla.append(name);
-        fmla.append("(");
-        for(int i=0; i < maxArgs; i++){
-            if(i > 0) fmla.append(',');
-            fmla.append("A1");
-        }
-        fmla.append(")");
-        return fmla.toString();
-    }
-
-    @Test
-    public final void bug50681_testAutoSize() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        BaseTestSheetAutosizeColumn.fixFonts(wb);
-        Sheet sheet = wb.createSheet("Sheet1");
-        _testDataProvider.trackAllColumnsForAutosizing(sheet);
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-
-        String longValue = "www.hostname.com, www.hostname.com, " +
-                "www.hostname.com, www.hostname.com, www.hostname.com, " +
-                "www.hostname.com, www.hostname.com, www.hostname.com, " +
-                "www.hostname.com, www.hostname.com, www.hostname.com, " +
-                "www.hostname.com, www.hostname.com, www.hostname.com, " +
-                "www.hostname.com, www.hostname.com, www.hostname.com, www.hostname.com";
-
-        cell0.setCellValue(longValue);
-
-        // autoSize will fail if required fonts are not installed, skip this test then
-        Font font = wb.getFontAt(cell0.getCellStyle().getFontIndex());
-        Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font,
-                SheetUtil.canComputeColumnWidth(font));
-
-        assertEquals("Expecting no indentation in this test",
-                0, cell0.getCellStyle().getIndention());
-        assertEquals("Expecting no rotation in this test",
-                0, cell0.getCellStyle().getRotation());
-
-        // check computing size up to a large size
-//        StringBuilder b = new StringBuilder();
-//        for(int i = 0;i < longValue.length()*5;i++) {
-//            b.append("w");
-//            assertTrue("Had zero length starting at length " + i, computeCellWidthFixed(font, b.toString()) > 0);
-//        }
-        double widthManual = computeCellWidthManually(cell0, font);
-        double widthBeforeCell = SheetUtil.getCellWidth(cell0, 8, null, false);
-        double widthBeforeCol = SheetUtil.getColumnWidth(sheet, 0, false);
-
-        String info = widthManual + "/" + widthBeforeCell + "/" + widthBeforeCol + "/" +
-                        SheetUtil.canComputeColumnWidth(font) + "/" + computeCellWidthFixed(font, "1") + "/" + computeCellWidthFixed(font, "w") + "/" +
-                        computeCellWidthFixed(font, "1w") + "/" + computeCellWidthFixed(font, "0000") + "/" + computeCellWidthFixed(font, longValue);
-        assertTrue("Expected to have cell width > 0 when computing manually, but had " + info, widthManual > 0);
-        assertTrue("Expected to have cell width > 0 BEFORE auto-size, but had " + info, widthBeforeCell > 0);
-        assertTrue("Expected to have column width > 0 BEFORE auto-size, but had " + info, widthBeforeCol > 0);
-
-        sheet.autoSizeColumn(0);
-
-        double width = SheetUtil.getColumnWidth(sheet, 0, false);
-        assertTrue("Expected to have column width > 0 AFTER auto-size, but had " + width, width > 0);
-        width = SheetUtil.getCellWidth(cell0, 8, null, false);
-        assertTrue("Expected to have cell width > 0 AFTER auto-size, but had " + width, width > 0);
-
-        assertEquals(255*256, sheet.getColumnWidth(0)); // maximum column width is 255 characters
-        sheet.setColumnWidth(0, sheet.getColumnWidth(0)); // Bug 50681 reports exception at this point
-        wb.close();
-    }
-    
-    @Test
-    public final void bug51622_testAutoSizeShouldRecognizeLeadingSpaces() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        BaseTestSheetAutosizeColumn.fixFonts(wb);
-        Sheet sheet = wb.createSheet();
-        _testDataProvider.trackAllColumnsForAutosizing(sheet);
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        Cell cell1 = row.createCell(1);
-        Cell cell2 = row.createCell(2);
-        
-        cell0.setCellValue("Test Column AutoSize");
-        cell1.setCellValue("         Test Column AutoSize");
-        cell2.setCellValue("Test Column AutoSize         ");
-        
-        sheet.autoSizeColumn(0);
-        sheet.autoSizeColumn(1);
-        sheet.autoSizeColumn(2);
-        
-        int noWhitespaceColWidth = sheet.getColumnWidth(0);
-        int leadingWhitespaceColWidth = sheet.getColumnWidth(1);
-        int trailingWhitespaceColWidth = sheet.getColumnWidth(2);
-        
-        // Based on the amount of text and whitespace used, and the default font
-        // assume that the cell with whitespace should be at least 20% wider than
-        // the cell without whitespace. This number is arbitrary, but should be large
-        // enough to guarantee that the whitespace cell isn't wider due to chance.
-        // Experimentally, I calculated the ratio as 1.2478181, though this ratio may change
-        // if the default font or margins change.
-        final double expectedRatioThreshold = 1.2f;
-        double leadingWhitespaceRatio = ((double) leadingWhitespaceColWidth)/noWhitespaceColWidth;
-        double trailingWhitespaceRatio = ((double) leadingWhitespaceColWidth)/noWhitespaceColWidth;
-        
-        assertGreaterThan("leading whitespace is longer than no whitespace", leadingWhitespaceRatio, expectedRatioThreshold);
-        assertGreaterThan("trailing whitespace is longer than no whitespace", trailingWhitespaceRatio, expectedRatioThreshold);
-        assertEquals("cells with equal leading and trailing whitespace have equal width",
-                leadingWhitespaceColWidth, trailingWhitespaceColWidth);
-        
-        wb.close();
-    }
-    
-    /**
-     * Test if a > b. Fails if false.
-     */
-    private void assertGreaterThan(String message, double a, double b) {
-        if (a <= b) {
-            String msg = "Expected: " + a + " > " + b;
-            fail(message + ": " + msg);
-        }
-    }
-
-    // FIXME: this function is a self-fulfilling prophecy: this test will always pass as long
-    // as the code-under-test and the testcase code are written the same way (have the same bugs). 
-    private double computeCellWidthManually(Cell cell0, Font font) {
-        final FontRenderContext fontRenderContext = new FontRenderContext(null, true, true);
-        RichTextString rt = cell0.getRichStringCellValue();
-        String[] lines = rt.getString().split("\\n");
-        assertEquals(1, lines.length);
-        String txt = lines[0] + "0";
-
-        AttributedString str = new AttributedString(txt);
-        copyAttributes(font, str, 0, txt.length());
-
-        // TODO: support rich text fragments
-        /*if (rt.numFormattingRuns() > 0) {
-        }*/
-
-        TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
-        double frameWidth = getFrameWidth(layout);
-        return ((frameWidth / 1) / 8);
-    }
-    
-    private double getFrameWidth(TextLayout layout) {
-        Rectangle2D bounds = layout.getBounds();
-        return bounds.getX() + bounds.getWidth();
-    }
-
-    private double computeCellWidthFixed(Font font, String txt) {
-        final FontRenderContext fontRenderContext = new FontRenderContext(null, true, true);
-        AttributedString str = new AttributedString(txt);
-        copyAttributes(font, str, 0, txt.length());
-
-        TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
-        return getFrameWidth(layout);
-    }
-
-    private static void copyAttributes(Font font, AttributedString str, int startIdx, int endIdx) {
-        str.addAttribute(TextAttribute.FAMILY, font.getFontName(), startIdx, endIdx);
-        str.addAttribute(TextAttribute.SIZE, (float)font.getFontHeightInPoints());
-        if (font.getBoldweight() == Font.BOLDWEIGHT_BOLD) str.addAttribute(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD, startIdx, endIdx);
-        if (font.getItalic() ) str.addAttribute(TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE, startIdx, endIdx);
-        if (font.getUnderline() == Font.U_SINGLE ) str.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON, startIdx, endIdx);
-    }
-
-    /**
-     * CreateFreezePane column/row order check
-     */
-    @Test
-    public void bug49381() throws IOException {
-       Workbook wb = _testDataProvider.createWorkbook();
-       int colSplit = 1;
-       int rowSplit = 2;
-       int leftmostColumn = 3;
-       int topRow = 4;
-
-        Sheet s = wb.createSheet();
-
-        // Populate
-        for(int rn=0; rn<= topRow; rn++) {
-           Row r = s.createRow(rn);
-           for(int cn=0; cn<leftmostColumn; cn++) {
-              Cell c = r.createCell(cn, CellType.NUMERIC);
-              c.setCellValue(100*rn + cn);
-           }
-        }
-
-        // Create the Freeze Pane
-        s.createFreezePane(colSplit, rowSplit, leftmostColumn, topRow);
-        PaneInformation paneInfo = s.getPaneInformation();
-
-        // Check it
-        assertEquals(colSplit,       paneInfo.getVerticalSplitPosition());
-        assertEquals(rowSplit,       paneInfo.getHorizontalSplitPosition());
-        assertEquals(leftmostColumn, paneInfo.getVerticalSplitLeftColumn());
-        assertEquals(topRow,         paneInfo.getHorizontalSplitTopRow());
-
-
-        // Now a row only freezepane
-        s.createFreezePane(0, 3);
-        paneInfo = s.getPaneInformation();
-
-        assertEquals(0,  paneInfo.getVerticalSplitPosition());
-        assertEquals(3,  paneInfo.getHorizontalSplitPosition());
-        assertEquals(0,  paneInfo.getVerticalSplitLeftColumn());
-        assertEquals(3,  paneInfo.getHorizontalSplitTopRow());
-
-        // Now a column only freezepane
-        s.createFreezePane(4, 0);
-        paneInfo = s.getPaneInformation();
-
-        assertEquals(4,  paneInfo.getVerticalSplitPosition());
-        assertEquals(0,  paneInfo.getHorizontalSplitPosition());
-        assertEquals(4 , paneInfo.getVerticalSplitLeftColumn());
-        assertEquals(0,  paneInfo.getHorizontalSplitTopRow());
-        wb.close();
-    }
-
-    /**
-     * Test hyperlinks
-     * open resulting file in excel, and check that there is a link to Google
-     */
-    @Test
-    public void bug15353() throws IOException {
-        String hyperlinkF = "HYPERLINK(\"http://google.com\",\"Google\")";
-
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet("My sheet");
-
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        cell.setCellFormula(hyperlinkF);
-
-        assertEquals(hyperlinkF, cell.getCellFormula());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheet("My Sheet");
-        row = sheet.getRow(0);
-        cell = row.getCell(0);
-
-        assertEquals(hyperlinkF, cell.getCellFormula());
-        wb2.close();
-    }
-
-    /**
-     * HLookup and VLookup with optional arguments
-     */
-    @Test
-    public void bug51024() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r1 = s.createRow(0);
-        Row r2 = s.createRow(1);
-
-        r1.createCell(0).setCellValue("v A1");
-        r2.createCell(0).setCellValue("v A2");
-        r1.createCell(1).setCellValue("v B1");
-
-        Cell c = r1.createCell(4);
-
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-
-        c.setCellFormula("VLOOKUP(\"v A1\", A1:B2, 1)");
-        assertEquals("v A1", eval.evaluate(c).getStringValue());
-
-        c.setCellFormula("VLOOKUP(\"v A1\", A1:B2, 1, 1)");
-        assertEquals("v A1", eval.evaluate(c).getStringValue());
-
-        c.setCellFormula("VLOOKUP(\"v A1\", A1:B2, 1, )");
-        assertEquals("v A1", eval.evaluate(c).getStringValue());
-
-
-        c.setCellFormula("HLOOKUP(\"v A1\", A1:B2, 1)");
-        assertEquals("v A1", eval.evaluate(c).getStringValue());
-
-        c.setCellFormula("HLOOKUP(\"v A1\", A1:B2, 1, 1)");
-        assertEquals("v A1", eval.evaluate(c).getStringValue());
-
-        c.setCellFormula("HLOOKUP(\"v A1\", A1:B2, 1, )");
-        assertEquals("v A1", eval.evaluate(c).getStringValue());
-
-        wb.close();
-    }
-
-    @Test
-    public void stackoverflow23114397() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        DataFormat format = wb.getCreationHelper().createDataFormat();
-
-        // How close the sizing should be, given that not all
-        //  systems will have quite the same fonts on them
-        float fontAccuracy = 0.22f;
-
-        // x%
-        CellStyle iPercent = wb.createCellStyle();
-        iPercent.setDataFormat(format.getFormat("0%"));
-        // x.x%
-        CellStyle d1Percent = wb.createCellStyle();
-        d1Percent.setDataFormat(format.getFormat("0.0%"));
-        // x.xx%
-        CellStyle d2Percent = wb.createCellStyle();
-        d2Percent.setDataFormat(format.getFormat("0.00%"));
-
-        Sheet s = wb.createSheet();
-        _testDataProvider.trackAllColumnsForAutosizing(s);
-        Row r1 = s.createRow(0);
-
-        for (int i=0; i<3; i++) {
-            r1.createCell(i, CellType.NUMERIC).setCellValue(0);
-        }
-        for (int i=3; i<6; i++) {
-            r1.createCell(i, CellType.NUMERIC).setCellValue(1);
-        }
-        for (int i=6; i<9; i++) {
-            r1.createCell(i, CellType.NUMERIC).setCellValue(0.12345);
-        }
-        for (int i=9; i<12; i++) {
-            r1.createCell(i, CellType.NUMERIC).setCellValue(1.2345);
-        }
-        for (int i=0; i<12; i+=3) {
-            r1.getCell(i).setCellStyle(iPercent);
-            r1.getCell(i+1).setCellStyle(d1Percent);
-            r1.getCell(i+2).setCellStyle(d2Percent);
-        }
-        for (int i=0; i<12; i++) {
-            s.autoSizeColumn(i);
-        }
-
-        // Check the 0(.00)% ones
-        assertAlmostEquals(980, s.getColumnWidth(0), fontAccuracy);
-        assertAlmostEquals(1400, s.getColumnWidth(1), fontAccuracy);
-        assertAlmostEquals(1700, s.getColumnWidth(2), fontAccuracy);
-
-        // Check the 100(.00)% ones
-        assertAlmostEquals(1500, s.getColumnWidth(3), fontAccuracy);
-        assertAlmostEquals(1950, s.getColumnWidth(4), fontAccuracy);
-        assertAlmostEquals(2225, s.getColumnWidth(5), fontAccuracy);
-
-        // Check the 12(.34)% ones
-        assertAlmostEquals(1225, s.getColumnWidth(6), fontAccuracy);
-        assertAlmostEquals(1650, s.getColumnWidth(7), fontAccuracy);
-        assertAlmostEquals(1950, s.getColumnWidth(8), fontAccuracy);
-
-        // Check the 123(.45)% ones
-        assertAlmostEquals(1500, s.getColumnWidth(9), fontAccuracy);
-        assertAlmostEquals(1950, s.getColumnWidth(10), fontAccuracy);
-        assertAlmostEquals(2225, s.getColumnWidth(11), fontAccuracy);
-
-        wb.close();
-    }
-
-    /**
-     * =ISNUMBER(SEARCH("AM",A1)) evaluation
-     */
-    @Test
-    public void stackoverflow26437323() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r1 = s.createRow(0);
-        Row r2 = s.createRow(1);
-
-        // A1 is a number
-        r1.createCell(0).setCellValue(1.1);
-        // B1 is a string, with the wanted text in it
-        r1.createCell(1).setCellValue("This is text with AM in it");
-        // C1 is a string, with different text
-        r1.createCell(2).setCellValue("This some other text");
-        // D1 is a blank cell
-        r1.createCell(3, CellType.BLANK);
-        // E1 is null
-
-        // A2 will hold our test formulas
-        Cell cf = r2.createCell(0, CellType.FORMULA);
-
-
-        // First up, check that TRUE and ISLOGICAL both behave
-        cf.setCellFormula("TRUE()");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISLOGICAL(TRUE())");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISLOGICAL(4)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-
-        // Now, check ISNUMBER / ISTEXT / ISNONTEXT
-        cf.setCellFormula("ISNUMBER(A1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(B1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(C1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(D1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(E1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-
-        cf.setCellFormula("ISTEXT(A1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISTEXT(B1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISTEXT(C1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISTEXT(D1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISTEXT(E1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-
-        cf.setCellFormula("ISNONTEXT(A1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNONTEXT(B1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNONTEXT(C1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNONTEXT(D1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNONTEXT(E1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue()); // Blank and Null the same
-
-
-        // Next up, SEARCH on its own
-        cf.setCellFormula("SEARCH(\"am\", A1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(FormulaError.VALUE.getCode(), cf.getErrorCellValue());
-
-        cf.setCellFormula("SEARCH(\"am\", B1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(19, (int)cf.getNumericCellValue());
-
-        cf.setCellFormula("SEARCH(\"am\", C1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(FormulaError.VALUE.getCode(), cf.getErrorCellValue());
-
-        cf.setCellFormula("SEARCH(\"am\", D1)");
-        cf = evaluateCell(wb, cf);
-        assertEquals(FormulaError.VALUE.getCode(), cf.getErrorCellValue());
-
-
-        // Finally, bring it all together
-        cf.setCellFormula("ISNUMBER(SEARCH(\"am\", A1))");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(SEARCH(\"am\", B1))");
-        cf = evaluateCell(wb, cf);
-        assertEquals(true, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(SEARCH(\"am\", C1))");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(SEARCH(\"am\", D1))");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        cf.setCellFormula("ISNUMBER(SEARCH(\"am\", E1))");
-        cf = evaluateCell(wb, cf);
-        assertEquals(false, cf.getBooleanCellValue());
-
-        wb.close();
-    }
-
-    private Cell evaluateCell(Workbook wb, Cell c) {
-        Sheet s = c.getSheet();
-        wb.getCreationHelper().createFormulaEvaluator().evaluateFormulaCellEnum(c);
-        return s.getRow(c.getRowIndex()).getCell(c.getColumnIndex());
-    }
-
-    /**
-     * Should be able to write then read formulas with references
-     *  to cells in other files, eg '[refs/airport.xls]Sheet1'!$A$2
-     *  or 'http://192.168.1.2/[blank.xls]Sheet1'!$A$1 .
-     * Additionally, if a reference to that file is provided, it should
-     *  be possible to evaluate them too
-     * TODO Fix this to evaluate for XSSF
-     * TODO Fix this to work at all for HSSF
-     */
-    @Ignore("Fix this to evaluate for XSSF, Fix this to work at all for HSSF")
-    @Test
-    public void bug46670() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet s = wb1.createSheet();
-        Row r1 = s.createRow(0);
-
-
-        // References to try
-        String ext = _testDataProvider.getStandardFileNameExtension();
-        String refLocal = "'[test."+ext+"]Sheet1'!$A$2";
-        String refHttp  = "'[http://example.com/test."+ext+"]Sheet1'!$A$2";
-        String otherCellText = "In Another Workbook";
-
-
-        // Create the references
-        Cell c1 = r1.createCell(0, CellType.FORMULA);
-        c1.setCellFormula(refLocal);
-
-        Cell c2 = r1.createCell(1, CellType.FORMULA);
-        c2.setCellFormula(refHttp);
-
-
-        // Check they were set correctly
-        assertEquals(refLocal, c1.getCellFormula());
-        assertEquals(refHttp,  c2.getCellFormula());
-
-
-        // Reload, and ensure they were serialised and read correctly
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        s = wb2.getSheetAt(0);
-        r1 = s.getRow(0);
-
-        c1 = r1.getCell(0);
-        c2 = r1.getCell(1);
-        assertEquals(refLocal, c1.getCellFormula());
-        assertEquals(refHttp,  c2.getCellFormula());
-
-
-        // Try to evaluate, without giving a way to get at the other file
-        try {
-            evaluateCell(wb2, c1);
-            fail("Shouldn't be able to evaluate without the other file");
-        } catch (Exception e) {
-            // expected here
-        }
-        try {
-            evaluateCell(wb2, c2);
-            fail("Shouldn't be able to evaluate without the other file");
-        } catch (Exception e) {
-            // expected here
-        }
-
-
-        // Set up references to the other file
-        Workbook wb3 = _testDataProvider.createWorkbook();
-        wb3.createSheet().createRow(1).createCell(0).setCellValue(otherCellText);
-
-        Map<String,FormulaEvaluator> evaluators = new HashMap<String, FormulaEvaluator>();
-        evaluators.put(refLocal, wb3.getCreationHelper().createFormulaEvaluator());
-        evaluators.put(refHttp,  wb3.getCreationHelper().createFormulaEvaluator());
-
-        FormulaEvaluator evaluator = wb2.getCreationHelper().createFormulaEvaluator();
-        evaluator.setupReferencedWorkbooks(evaluators);
-
-
-        // Try to evaluate, with the other file
-        evaluator.evaluateFormulaCellEnum(c1);
-        evaluator.evaluateFormulaCellEnum(c2);
-
-        assertEquals(otherCellText, c1.getStringCellValue());
-        assertEquals(otherCellText, c2.getStringCellValue());
-
-        wb3.close();
-        wb2.close();
-    }
-
-    @Test
-    public void test56574OverwriteExistingRow() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        { // create the Formula-Cell
-            Row row = sheet.createRow(0);
-            Cell cell = row.createCell(0);
-            cell.setCellFormula("A2");
-        }
-
-        { // check that it is there now
-            Row row = sheet.getRow(0);
-
-           /* CTCell[] cArray = ((XSSFRow)row).getCTRow().getCArray();
-            assertEquals(1, cArray.length);*/
-
-            Cell cell = row.getCell(0);
-            assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        }
-
-        { // overwrite the row
-            Row row = sheet.createRow(0);
-            assertNotNull(row);
-        }
-
-        { // creating a row in place of another should remove the existing data,
-            // check that the cell is gone now
-            Row row = sheet.getRow(0);
-
-            /*CTCell[] cArray = ((XSSFRow)row).getCTRow().getCArray();
-            assertEquals(0, cArray.length);*/
-
-            Cell cell = row.getCell(0);
-            assertNull(cell);
-        }
-
-        // the calculation chain in XSSF is empty in a newly created workbook, so we cannot check if it is correctly updated
-        /*assertNull(((XSSFWorkbook)wb).getCalculationChain());
-        assertNotNull(((XSSFWorkbook)wb).getCalculationChain().getCTCalcChain());
-        assertNotNull(((XSSFWorkbook)wb).getCalculationChain().getCTCalcChain().getCArray());
-        assertEquals(0, ((XSSFWorkbook)wb).getCalculationChain().getCTCalcChain().getCArray().length);*/
-
-        wb.close();
-    }
-
-    /**
-     * With HSSF, if you create a font, don't change it, and
-     *  create a 2nd, you really do get two fonts that you
-     *  can alter as and when you want.
-     * With XSSF, that wasn't the case, but this verfies
-     *  that it now is again
-     */
-    @Test
-    public void bug48718() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        int startingFonts = wb instanceof HSSFWorkbook ? 4 : 1;
-
-        assertEquals(startingFonts, wb.getNumberOfFonts());
-
-        // Get a font, and slightly change it
-        Font a = wb.createFont();
-        assertEquals(startingFonts+1, wb.getNumberOfFonts());
-        a.setFontHeightInPoints((short)23);
-        assertEquals(startingFonts+1, wb.getNumberOfFonts());
-
-        // Get two more, unchanged
-        /*Font b =*/ wb.createFont();
-        assertEquals(startingFonts+2, wb.getNumberOfFonts());
-        /*Font c =*/ wb.createFont();
-        assertEquals(startingFonts+3, wb.getNumberOfFonts());
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug57430() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet1");
-
-        Name name1 = wb.createName();
-        name1.setNameName("FMLA");
-        name1.setRefersToFormula("Sheet1!$B$3");
-        wb.close();
-    }
-
-    @Test
-    public void bug56981() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        CellStyle vertTop = wb.createCellStyle();
-        vertTop.setVerticalAlignment(CellStyle.VERTICAL_TOP);
-        CellStyle vertBottom = wb.createCellStyle();
-        vertBottom.setVerticalAlignment(CellStyle.VERTICAL_BOTTOM);
-        Sheet sheet = wb.createSheet("Sheet 1");
-        Row row = sheet.createRow(0);
-        Cell top = row.createCell(0);
-        Cell bottom = row.createCell(1);
-        top.setCellValue("Top");
-        top.setCellStyle(vertTop); // comment this out to get all bottom-aligned
-                                   // cells
-        bottom.setCellValue("Bottom");
-        bottom.setCellStyle(vertBottom);
-        row.setHeightInPoints(85.75f); // make it obvious
-
-        /*FileOutputStream out = new FileOutputStream("c:\\temp\\56981.xlsx");
-        try {
-            wb.write(out);
-        } finally {
-            out.close();
-        }*/
-
-        wb.close();
-    }
-
-    @Test
-    public void test57973() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        CreationHelper factory = wb.getCreationHelper();
-
-        Sheet sheet = wb.createSheet();
-        Drawing drawing = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = factory.createClientAnchor();
-
-        Cell cell0 = sheet.createRow(0).createCell(0);
-        cell0.setCellValue("Cell0");
-
-        Comment comment0 = drawing.createCellComment(anchor);
-        RichTextString str0 = factory.createRichTextString("Hello, World1!");
-        comment0.setString(str0);
-        comment0.setAuthor("Apache POI");
-        cell0.setCellComment(comment0);
-
-        anchor = factory.createClientAnchor();
-        anchor.setCol1(1);
-        anchor.setCol2(1);
-        anchor.setRow1(1);
-        anchor.setRow2(1);
-        Cell cell1 = sheet.createRow(3).createCell(5);
-        cell1.setCellValue("F4");
-        Comment comment1 = drawing.createCellComment(anchor);
-        RichTextString str1 = factory.createRichTextString("Hello, World2!");
-        comment1.setString(str1);
-        comment1.setAuthor("Apache POI");
-        cell1.setCellComment(comment1);
-
-        Cell cell2 = sheet.createRow(2).createCell(2);
-        cell2.setCellValue("C3");
-
-        anchor = factory.createClientAnchor();
-        anchor.setCol1(2);
-        anchor.setCol2(2);
-        anchor.setRow1(2);
-        anchor.setRow2(2);
-
-        Comment comment2 = drawing.createCellComment(anchor);
-        RichTextString str2 = factory.createRichTextString("XSSF can set cell comments");
-        //apply custom font to the text in the comment
-        Font font = wb.createFont();
-        font.setFontName("Arial");
-        font.setFontHeightInPoints((short)14);
-        font.setBoldweight(Font.BOLDWEIGHT_BOLD);
-        font.setColor(IndexedColors.RED.getIndex());
-        str2.applyFont(font);
-
-        comment2.setString(str2);
-        comment2.setAuthor("Apache POI");
-        comment2.setColumn(2);
-        comment2.setRow(2);
-
-        wb.close();
-    }
-
-    /**
-     * Ensures that XSSF and HSSF agree with each other,
-     *  and with the docs on when fetching the wrong
-     *  kind of value from a Formula cell
-     */
-    @Test
-    public void bug47815() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r = s.createRow(0);
-
-        // Setup
-        Cell cn = r.createCell(0, CellType.NUMERIC);
-        cn.setCellValue(1.2);
-        Cell cs = r.createCell(1, CellType.STRING);
-        cs.setCellValue("Testing");
-
-        Cell cfn = r.createCell(2, CellType.FORMULA);
-        cfn.setCellFormula("A1");
-        Cell cfs = r.createCell(3, CellType.FORMULA);
-        cfs.setCellFormula("B1");
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals(CellType.NUMERIC, fe.evaluate(cfn).getCellTypeEnum());
-        assertEquals(CellType.STRING, fe.evaluate(cfs).getCellTypeEnum());
-        fe.evaluateFormulaCellEnum(cfn);
-        fe.evaluateFormulaCellEnum(cfs);
-
-        // Now test
-        assertEquals(CellType.NUMERIC, cn.getCellTypeEnum());
-        assertEquals(CellType.STRING, cs.getCellTypeEnum());
-        assertEquals(CellType.FORMULA, cfn.getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, cfn.getCachedFormulaResultTypeEnum());
-        assertEquals(CellType.FORMULA, cfs.getCellTypeEnum());
-        assertEquals(CellType.STRING, cfs.getCachedFormulaResultTypeEnum());
-
-        // Different ways of retrieving
-        assertEquals(1.2, cn.getNumericCellValue(), 0);
-        try {
-            cn.getRichStringCellValue();
-            fail();
-        } catch(IllegalStateException e) {
-            // expected here
-        }
-
-        assertEquals("Testing", cs.getStringCellValue());
-        try {
-            cs.getNumericCellValue();
-            fail();
-        } catch(IllegalStateException e) {
-            // expected here
-        }
-
-        assertEquals(1.2, cfn.getNumericCellValue(), 0);
-        try {
-            cfn.getRichStringCellValue();
-            fail();
-        } catch(IllegalStateException e) {
-            // expected here
-        }
-
-        assertEquals("Testing", cfs.getStringCellValue());
-        try {
-            cfs.getNumericCellValue();
-            fail();
-        } catch(IllegalStateException e) {
-            // expected here
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public void test58113() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet( "Test" );
-
-        Row row = sheet.createRow(0);
-
-        Cell cell = row.createCell(0);
-        // verify that null-values can be set, this was possible up to 3.11, but broken in 3.12
-        cell.setCellValue((String)null);
-        String value = cell.getStringCellValue();
-        assertTrue("HSSF will currently return empty string, XSSF/SXSSF will return null, but had: " + value,
-                value == null || value.length() == 0);
-
-        cell = row.createCell(1);
-        // also verify that setting formulas to null works
-        cell.setCellType(CellType.FORMULA);
-        cell.setCellValue((String)null);
-
-        wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-
-        value = cell.getStringCellValue();
-        assertTrue("HSSF will currently return empty string, XSSF/SXSSF will return null, but had: " + value,
-                value == null || value.length() == 0);
-
-        // set some value
-        cell.setCellType(CellType.STRING);
-        cell.setCellValue("somevalue");
-
-        value = cell.getStringCellValue();
-        assertTrue("can set value afterwards: " + value,
-                value.equals("somevalue"));
-
-        // verify that the null-value is actually set even if there was some value in the cell before
-        cell.setCellValue((String)null);
-        value = cell.getStringCellValue();
-        assertTrue("HSSF will currently return empty string, XSSF/SXSSF will return null, but had: " + value,
-                value == null || value.length() == 0);
-        
-        wb.close();
-    }
-
-    /**
-     * Formulas with Nested Ifs, or If with text functions like
-     *  Mid in it, can give #VALUE in Excel
-     */
-    @Test
-    public void bug55747() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        FormulaEvaluator ev = wb1.getCreationHelper().createFormulaEvaluator();
-        Sheet s = wb1.createSheet();
-
-        Row row = s.createRow(0);
-        row.createCell(0).setCellValue("abc");
-        row.createCell(1).setCellValue("");
-        row.createCell(2).setCellValue(3);
-
-        Cell cell = row.createCell(5);
-        cell.setCellFormula("IF(A1<>\"\",MID(A1,1,2),\" \")");
-        ev.evaluateAll();
-        assertEquals("ab", cell.getStringCellValue());
-
-        cell = row.createCell(6);
-        cell.setCellFormula("IF(B1<>\"\",MID(A1,1,2),\"empty\")");
-        ev.evaluateAll();
-        assertEquals("empty", cell.getStringCellValue());
-
-        cell = row.createCell(7);
-        cell.setCellFormula("IF(A1<>\"\",IF(C1<>\"\",MID(A1,1,2),\"c1\"),\"c2\")");
-        ev.evaluateAll();
-        assertEquals("ab", cell.getStringCellValue());
-
-        // Write it back out, and re-read
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        ev = wb2.getCreationHelper().createFormulaEvaluator();
-        s = wb2.getSheetAt(0);
-        row = s.getRow(0);
-
-        // Check read ok, and re-evaluate fine
-        cell = row.getCell(5);
-        assertEquals("ab", cell.getStringCellValue());
-        ev.evaluateFormulaCellEnum(cell);
-        assertEquals("ab", cell.getStringCellValue());
-
-        cell = row.getCell(6);
-        assertEquals("empty", cell.getStringCellValue());
-        ev.evaluateFormulaCellEnum(cell);
-        assertEquals("empty", cell.getStringCellValue());
-
-        cell = row.getCell(7);
-        assertEquals("ab", cell.getStringCellValue());
-        ev.evaluateFormulaCellEnum(cell);
-        assertEquals("ab", cell.getStringCellValue());
-        wb2.close();
-    }
-
-    @Test
-    public void bug58260() throws IOException {
-        //Create workbook and worksheet
-        Workbook wb = _testDataProvider.createWorkbook();
-        //Sheet worksheet = wb.createSheet("sample");
-
-        //Loop through and add all values from array list
-        // use a fixed seed to always produce the same file which makes comparing stuff easier
-        //Random rnd = new Random(4352345);
-        int maxStyles = (wb instanceof HSSFWorkbook) ? 4009 : 64000;
-        for(int i = 0;i < maxStyles;i++) {
-            //Create new row
-            //Row row = worksheet.createRow(i);
-
-            //Create cell style
-            CellStyle style = null;
-            try {
-                style = wb.createCellStyle();
-            } catch (IllegalStateException e) {
-               fail("Failed for row " + i);
-            }
-            style.setAlignment(CellStyle.ALIGN_RIGHT);
-            if((wb instanceof HSSFWorkbook)) {
-                // there are some predefined styles
-                assertEquals(i+21, style.getIndex());
-            } else {
-                // getIndex() returns short, which is not sufficient for > 32767
-                // we should really change the API to be "int" for getIndex() but
-                // that needs API changes
-                assertEquals(i+1, style.getIndex() & 0xffff);
-            }
-
-            //Create cell
-            //Cell cell = row.createCell(0);
-
-            //Set cell style
-            //cell.setCellStyle(style);
-
-            //Set cell value
-            //cell.setCellValue("r" + rnd.nextInt());
-        }
-
-        // should fail if we try to add more now
-        try {
-            wb.createCellStyle();
-            fail("Should fail after " + maxStyles + " styles, but did not fail");
-        } catch (IllegalStateException e) {
-            // expected here
-        }
-
-        /*//add column width for appearance sake
-        worksheet.setColumnWidth(0, 5000);
-
-        // Write the output to a file
-        System.out.println("Writing...");
-        OutputStream fileOut = new FileOutputStream("C:\\temp\\58260." + _testDataProvider.getStandardFileNameExtension());
-
-        // the resulting file can be compressed nicely, so we need to disable the zip bomb detection here
-        double before = ZipSecureFile.getMinInflateRatio();
-        try {
-            ZipSecureFile.setMinInflateRatio(0.00001);
-            wb.write(fileOut);
-        } finally {
-            fileOut.close();
-            ZipSecureFile.setMinInflateRatio(before);
-        }*/
-
-        wb.close();
-    }
-
-    @Test
-    public void test50319() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("Test");
-        sheet.createRow(0);
-        sheet.groupRow(0, 0);
-        sheet.setRowGroupCollapsed(0, true);
-        
-        sheet.groupColumn(0, 0);
-        sheet.setColumnGroupCollapsed(0, true);
-        
-        wb.close();
-    }
-    
-    // Bug 58648: FormulaParser throws exception in parseSimpleFactor() when getCellFormula()
-    // is called on a cell and the formula contains spaces between closing parentheses ") )"
-    // https://bz.apache.org/bugzilla/show_bug.cgi?id=58648
-    @Test
-    public void test58648() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Cell cell = wb.createSheet().createRow(0).createCell(0);
-        cell.setCellFormula("((1 + 1) )");
-        // fails with
-        // org.apache.poi.ss.formula.FormulaParseException: Parse error near char ... ')'
-        // in specified formula '((1 + 1) )'. Expected cell ref or constant literal
-
-        wb.close();
-    }
-    
-    /**
-     * If someone sets a null string as a cell value, treat
-     *  it as an empty cell, and avoid a NPE on auto-sizing
-     */
-    @Test
-    public void test57034() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Cell cell = s.createRow(0).createCell(0);
-        cell.setCellValue((String)null);
-        assertEquals(CellType.BLANK, cell.getCellTypeEnum());
-        
-        _testDataProvider.trackAllColumnsForAutosizing(s);
-        
-        s.autoSizeColumn(0);
-        assertEquals(2048, s.getColumnWidth(0));
-
-        s.autoSizeColumn(0, true);
-        assertEquals(2048, s.getColumnWidth(0));
-
-        wb.close();
-    }
-
-    @Test
-    public void test52684() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Sheet sheet = wb.createSheet("test");
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-
-        cell.setCellValue(12312345123L);
-
-        DataFormat format = wb.createDataFormat();
-        CellStyle style = wb.createCellStyle();
-        style.setDataFormat(format.getFormat("000-00000-000"));
-        cell.setCellStyle(style);
-
-        assertEquals("000-00000-000",
-                cell.getCellStyle().getDataFormatString());
-        assertEquals(164, cell.getCellStyle().getDataFormat());
-
-        DataFormatter formatter = new DataFormatter();
-
-        assertEquals("12-312-345-123", formatter.formatCellValue(cell));
-
-        wb.close();
-    }
-    
-    @Test
-    public void test58896() throws IOException {
-        final int nrows = 160;
-        final int ncols = 139;
-        
-        // Create a workbook
-        final Workbook wb = _testDataProvider.createWorkbook(nrows+1);
-        final Sheet sh = wb.createSheet();
-        if (logger.check(POILogger.DEBUG)) {
-            logger.log(POILogger.DEBUG, wb.getClass().getName() + " column autosizing timing...");
-        }
-
-        final long t0 = time();
-        _testDataProvider.trackAllColumnsForAutosizing(sh);
-        for (int r=0; r<nrows; r++) {
-            final Row row = sh.createRow(r);
-            for (int c=0; c<ncols; c++) {
-                final Cell cell = row.createCell(c);
-                cell.setCellValue("Cell[r="+r+",c="+c+"]");
-            }
-        }
-        final double populateSheetTime = delta(t0);
-        final double populateSheetTimePerCell_ns = (1000000 * populateSheetTime / (nrows*ncols));
-        if (logger.check(POILogger.DEBUG)) {
-            logger.log(POILogger.DEBUG, "Populate sheet time: " + populateSheetTime + " ms (" + populateSheetTimePerCell_ns + " ns/cell)");
-            
-            logger.log(POILogger.DEBUG, "Autosizing...");
-        }
-        final long t1 = time();
-        for (int c=0; c<ncols; c++) {
-            final long t2 = time();
-            sh.autoSizeColumn(c);
-            if (logger.check(POILogger.DEBUG)) {
-                logger.log(POILogger.DEBUG, "Column " + c + " took " + delta(t2) + " ms");
-            }
-            
-        }
-        final double autoSizeColumnsTime = delta(t1);
-        final double autoSizeColumnsTimePerColumn = autoSizeColumnsTime / ncols;
-        final double bestFitWidthTimePerCell_ns = 1000000 * autoSizeColumnsTime / (ncols * nrows);
-        
-        if (logger.check(POILogger.DEBUG)) {
-            logger.log(POILogger.DEBUG, "Auto sizing columns took a total of " + autoSizeColumnsTime + " ms (" + autoSizeColumnsTimePerColumn + " ms per column)");
-            logger.log(POILogger.DEBUG, "Best fit width time per cell: " + bestFitWidthTimePerCell_ns + " ns");
-        }
-        
-        final double totalTime_s = (populateSheetTime + autoSizeColumnsTime) / 1000;
-        if (logger.check(POILogger.DEBUG)) {
-            logger.log(POILogger.DEBUG, "Total time: " + totalTime_s + " s");
-        }
-        
-        wb.close();
-        
-        //if (bestFitWidthTimePerCell_ns > 50000) {
-        //    fail("Best fit width time per cell exceeded 50000 ns: " + bestFitWidthTimePerCell_ns + " ns");
-        //}
-        
-        //if (totalTime_s > 10) {
-        //    fail("Total time exceeded 10 seconds: " + totalTime_s + " s");
-        //}
-    }
-    
-    protected long time() {
-        return System.currentTimeMillis();
-    }
-
-    protected double delta(long startTimeMillis) {
-        return time() - startTimeMillis;
-    }
-    
-    @Ignore("bug 59393")
-    @Test
-    public void bug59393_commentsCanHaveSameAnchor() throws IOException
-    {
-        Workbook wb = _testDataProvider.createWorkbook();
-        
-        Sheet sheet = wb.createSheet();
-        
-        CreationHelper helper = wb.getCreationHelper();
-        ClientAnchor anchor = helper.createClientAnchor();
-        Drawing drawing = sheet.createDrawingPatriarch();
-        
-        Row row = sheet.createRow(0);
-        
-        Cell cell1 = row.createCell(0);
-        Cell cell2 = row.createCell(1);
-        Cell cell3 = row.createCell(2);
-
-        Comment comment1 = drawing.createCellComment(anchor);
-        RichTextString richTextString1 = helper.createRichTextString("comment1");
-        comment1.setString(richTextString1);
-        cell1.setCellComment(comment1);
-         
-        // fails with IllegalArgumentException("Multiple cell comments in one cell are not allowed, cell: A1")
-        // because createCellComment tries to create a cell at A1
-        // (from CellAddress(anchor.getRow1(), anchor.getCell1())),
-        // but cell A1 already has a comment (comment1).
-        // Need to atomically create a comment and attach it to a cell.
-        // Current workaround: change anchor between each usage
-        // anchor.setCol1(1);
-        Comment comment2 = drawing.createCellComment(anchor);
-        RichTextString richTextString2 = helper.createRichTextString("comment2");
-        comment2.setString(richTextString2);
-        cell2.setCellComment(comment2);
-
-        // anchor.setCol1(2);
-        Comment comment3 = drawing.createCellComment(anchor);
-        RichTextString richTextString3 = helper.createRichTextString("comment3");
-        comment3.setString(richTextString3);
-        cell3.setCellComment(comment3);
-        
-        wb.close();
-    }
-
-
-    @Test
-    public void bug57798() throws Exception {
-        String fileName = "57798." + _testDataProvider.getStandardFileNameExtension();
-        Workbook workbook = _testDataProvider.openSampleWorkbook(fileName);
-
-        Sheet sheet = workbook.getSheet("Sheet1");
-
-        // *******************************
-        // First cell of array formula, OK
-        int rowId = 0;
-        int cellId = 1;
-        System.out.println("Reading row " + rowId + ", col " + cellId);
-
-        Row row = sheet.getRow(rowId);
-        Cell cell = row.getCell(cellId);
-
-        System.out.println("Formula:" + cell.getCellFormula());
-        if (CellType.FORMULA == cell.getCellTypeEnum()) {
-            CellType formulaResultType = cell.getCachedFormulaResultTypeEnum();
-            System.out.println("Formula Result Type:" + formulaResultType);
-        }
-
-        // *******************************
-        // Second cell of array formula, NOT OK for xlsx files
-        rowId = 1;
-        cellId = 1;
-        System.out.println("Reading row " + rowId + ", col " + cellId);
-
-        row = sheet.getRow(rowId);
-        cell = row.getCell(cellId);
-        System.out.println("Formula:" + cell.getCellFormula());
-
-        if (CellType.FORMULA == cell.getCellTypeEnum()) {
-            CellType formulaResultType = cell.getCachedFormulaResultTypeEnum();
-            System.out.println("Formula Result Type:" + formulaResultType);
-        }
-
-        workbook.close();
-    }
-    
-    @Ignore
-    @Test
-    public void test57929() throws IOException {
-        // Create a workbook with print areas on 2 sheets
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet0");
-        wb.createSheet("Sheet1");
-        wb.setPrintArea(0, "$A$1:$C$6");
-        wb.setPrintArea(1, "$B$1:$C$5");
-        
-        // Verify the print areas were set correctly
-        assertEquals("Sheet0!$A$1:$C$6", wb.getPrintArea(0));
-        assertEquals("Sheet1!$B$1:$C$5", wb.getPrintArea(1));
-        
-        // Remove the print area on Sheet0 and change the print area on Sheet1
-        wb.removePrintArea(0);
-        wb.setPrintArea(1, "$A$1:$A$1");
-        
-        // Verify that the changes were made
-        assertNull("Sheet0 before write", wb.getPrintArea(0));
-        assertEquals("Sheet1 before write", "Sheet1!$A$1:$A$1", wb.getPrintArea(1));
-        
-        // Verify that the changes are non-volatile
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb);
-        wb.close();
-        
-        assertNull("Sheet0 after write", wb2.getPrintArea(0)); // CURRENTLY FAILS with "Sheet0!$A$1:$C$6"
-        assertEquals("Sheet1 after write", "Sheet1!$A$1:$A$1", wb2.getPrintArea(1));
-    }
-
-
-    @Test
-    public void test55384() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
-            Sheet sh = wb.createSheet();
-            for (int rownum = 0; rownum < 10; rownum++) {
-                org.apache.poi.ss.usermodel.Row row = sh.createRow(rownum);
-                for (int cellnum = 0; cellnum < 3; cellnum++) {
-                    Cell cell = row.createCell(cellnum);
-                    cell.setCellValue(rownum + cellnum);
-                }
-            }
-            Row row = sh.createRow(10);
-            // setting no precalculated value works just fine.
-            Cell cell1 = row.createCell(0);
-            cell1.setCellFormula("SUM(A1:A10)");
-
-            // but setting a precalculated STRING value fails totally in SXSSF
-            Cell cell2 = row.createCell(1);
-            cell2.setCellFormula("SUM(B1:B10)");
-            cell2.setCellValue("55");
-
-            // setting a precalculated int value works as expected
-            Cell cell3 = row.createCell(2);
-            cell3.setCellFormula("SUM(C1:C10)");
-            cell3.setCellValue(65);
-
-            assertEquals(CellType.FORMULA, cell1.getCellTypeEnum());
-            assertEquals(CellType.FORMULA, cell2.getCellTypeEnum());
-            assertEquals(CellType.FORMULA, cell3.getCellTypeEnum());
-
-            assertEquals("SUM(A1:A10)", cell1.getCellFormula());
-            assertEquals("SUM(B1:B10)", cell2.getCellFormula());
-            assertEquals("SUM(C1:C10)", cell3.getCellFormula());
-
-            /*String name = wb.getClass().getCanonicalName();
-            String ext = (wb instanceof HSSFWorkbook) ? ".xls" : ".xlsx";
-            OutputStream output = new FileOutputStream("/tmp" + name + ext);
-            try {
-                wb.write(output);
-            } finally {
-                output.close();
-            }*/
-
-            Workbook wbBack = _testDataProvider.writeOutAndReadBack(wb);
-            checkFormulaPreevaluatedString(wbBack);
-            wbBack.close();
-        } finally {
-            wb.close();
-        }
-    }
-
-    private void checkFormulaPreevaluatedString(Workbook readFile) {
-        Sheet sheet = readFile.getSheetAt(0);
-        Row row = sheet.getRow(sheet.getLastRowNum());
-        assertEquals(10, row.getRowNum());
-
-        for (Cell cell : row) {
-            String cellValue = null;
-            switch (cell.getCellTypeEnum()) {
-                case STRING:
-                    cellValue = cell.getRichStringCellValue().getString();
-                    break;
-                case FORMULA:
-                    cellValue = cell.getCellFormula();
-                    break;
-            }
-            assertNotNull(cellValue);
-            cellValue = cellValue.isEmpty() ? null : cellValue;
-            assertNotNull(cellValue);
-        }
-    }
-    
-    // bug 60197: setSheetOrder should update sheet-scoped named ranges to maintain references to the sheets before the re-order
-    @Test
-    public void bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb.createSheet("Sheet1");
-        Sheet sheet2 = wb.createSheet("Sheet2");
-        Sheet sheet3 = wb.createSheet("Sheet3");
-    
-        Name nameOnSheet1 = wb.createName();
-        nameOnSheet1.setSheetIndex(wb.getSheetIndex(sheet1));
-        nameOnSheet1.setNameName("NameOnSheet1");
-        nameOnSheet1.setRefersToFormula("Sheet1!A1");
-        
-        Name nameOnSheet2 = wb.createName();
-        nameOnSheet2.setSheetIndex(wb.getSheetIndex(sheet2));
-        nameOnSheet2.setNameName("NameOnSheet2");
-        nameOnSheet2.setRefersToFormula("Sheet2!A1");
-        
-        Name nameOnSheet3 = wb.createName();
-        nameOnSheet3.setSheetIndex(wb.getSheetIndex(sheet3));
-        nameOnSheet3.setNameName("NameOnSheet3");
-        nameOnSheet3.setRefersToFormula("Sheet3!A1");
-        
-        // workbook-scoped name
-        Name name = wb.createName();
-        name.setNameName("WorkbookScopedName");
-        name.setRefersToFormula("Sheet2!A1");
-        
-        assertEquals("Sheet1", nameOnSheet1.getSheetName());
-        assertEquals("Sheet2", nameOnSheet2.getSheetName());
-        assertEquals("Sheet3", nameOnSheet3.getSheetName());
-        assertEquals(-1, name.getSheetIndex());
-        assertEquals("Sheet2!A1", name.getRefersToFormula());
-        
-        // rearrange the sheets several times to make sure the names always refer to the right sheet
-        for (int i=0; i<=9; i++) {
-            wb.setSheetOrder("Sheet3", i % 3);
-            
-            // Current bug in XSSF:
-            // Call stack:
-            //   XSSFWorkbook.write(OutputStream)
-            //   XSSFWorkbook.commit()
-            //   XSSFWorkbook.saveNamedRanges()
-            // This dumps the current namedRanges to CTDefinedName and writes these to the CTWorkbook
-            // Then the XSSFName namedRanges list is cleared and rebuilt
-            // Thus, any XSSFName object becomes invalid after a write
-            // This re-assignment to the XSSFNames is not necessary if wb.write is not called.
-            nameOnSheet1 = wb.getName("NameOnSheet1");
-            nameOnSheet2 = wb.getName("NameOnSheet2");
-            nameOnSheet3 = wb.getName("NameOnSheet3");
-            name = wb.getName("WorkbookScopedName");
-            
-            // The name should still refer to the same sheet after the sheets are re-ordered
-            assertEquals(i % 3, wb.getSheetIndex("Sheet3"));
-            assertEquals(nameOnSheet1.getNameName(), "Sheet1", nameOnSheet1.getSheetName());
-            assertEquals(nameOnSheet2.getNameName(), "Sheet2", nameOnSheet2.getSheetName());
-            assertEquals(nameOnSheet3.getNameName(), "Sheet3", nameOnSheet3.getSheetName());
-            assertEquals(name.getNameName(), -1, name.getSheetIndex());
-            assertEquals(name.getNameName(), "Sheet2!A1", name.getRefersToFormula());
-            
-            // make sure the changes to the names stick after writing out the workbook
-            Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb);
-            
-            // See note above. XSSFNames become invalid after workbook write
-            // Without reassignment here, an XmlValueDisconnectedException may occur
-            nameOnSheet1 = wb.getName("NameOnSheet1");
-            nameOnSheet2 = wb.getName("NameOnSheet2");
-            nameOnSheet3 = wb.getName("NameOnSheet3");
-            name = wb.getName("WorkbookScopedName");
-            
-            // Saving the workbook should not change the sheet names
-            assertEquals(i % 3, wb.getSheetIndex("Sheet3"));
-            assertEquals(nameOnSheet1.getNameName(), "Sheet1", nameOnSheet1.getSheetName());
-            assertEquals(nameOnSheet2.getNameName(), "Sheet2", nameOnSheet2.getSheetName());
-            assertEquals(nameOnSheet3.getNameName(), "Sheet3", nameOnSheet3.getSheetName());
-            assertEquals(name.getNameName(), -1, name.getSheetIndex());
-            assertEquals(name.getNameName(), "Sheet2!A1", name.getRefersToFormula());
-            
-            // Verify names in wb2
-            nameOnSheet1 = wb2.getName("NameOnSheet1");
-            nameOnSheet2 = wb2.getName("NameOnSheet2");
-            nameOnSheet3 = wb2.getName("NameOnSheet3");
-            name = wb2.getName("WorkbookScopedName");
-            
-            assertEquals(i % 3, wb2.getSheetIndex("Sheet3"));
-            assertEquals(nameOnSheet1.getNameName(), "Sheet1", nameOnSheet1.getSheetName());
-            assertEquals(nameOnSheet2.getNameName(), "Sheet2", nameOnSheet2.getSheetName());
-            assertEquals(nameOnSheet3.getNameName(), "Sheet3", nameOnSheet3.getSheetName());
-            assertEquals(name.getNameName(), -1, name.getSheetIndex());
-            assertEquals(name.getNameName(), "Sheet2!A1", name.getRefersToFormula());
-            
-            wb2.close();
-        }
-        
-        wb.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
deleted file mode 100644
index be097d3..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
+++ /dev/null
@@ -1,1052 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.apache.poi.ss.usermodel.FormulaError.forInt;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Calendar;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Common superclass for testing implementations of
- *  {@link org.apache.poi.ss.usermodel.Cell}
- */
-public abstract class BaseTestCell {
-
-    protected final ITestDataProvider _testDataProvider;
-
-    /**
-     * @param testDataProvider an object that provides test data in HSSF / XSSF specific way
-     */
-    protected BaseTestCell(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    @Test
-    public void testSetValues() throws Exception {
-        Workbook book = _testDataProvider.createWorkbook();
-        Sheet sheet = book.createSheet("test");
-        Row row = sheet.createRow(0);
-
-        CreationHelper factory = book.getCreationHelper();
-        Cell cell = row.createCell(0);
-
-        cell.setCellValue(1.2);
-        assertEquals(1.2, cell.getNumericCellValue(), 0.0001);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertProhibitedValueAccess(cell, CellType.BOOLEAN, CellType.STRING,
-                CellType.FORMULA, CellType.ERROR);
-
-        cell.setCellValue(false);
-        assertEquals(false, cell.getBooleanCellValue());
-        assertEquals(CellType.BOOLEAN, cell.getCellTypeEnum());
-        cell.setCellValue(true);
-        assertEquals(true, cell.getBooleanCellValue());
-        assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.STRING,
-                CellType.FORMULA, CellType.ERROR);
-
-        cell.setCellValue(factory.createRichTextString("Foo"));
-        assertEquals("Foo", cell.getRichStringCellValue().getString());
-        assertEquals("Foo", cell.getStringCellValue());
-        assertEquals(CellType.STRING, cell.getCellTypeEnum());
-        assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.BOOLEAN,
-                CellType.FORMULA, CellType.ERROR);
-
-        cell.setCellValue("345");
-        assertEquals("345", cell.getRichStringCellValue().getString());
-        assertEquals("345", cell.getStringCellValue());
-        assertEquals(CellType.STRING, cell.getCellTypeEnum());
-        assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.BOOLEAN,
-                CellType.FORMULA, CellType.ERROR);
-
-        Calendar c = LocaleUtil.getLocaleCalendar();
-        c.setTimeInMillis(123456789);
-        cell.setCellValue(c.getTime());
-        assertEquals(c.getTime().getTime(), cell.getDateCellValue().getTime());
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertProhibitedValueAccess(cell, CellType.BOOLEAN, CellType.STRING,
-                CellType.FORMULA, CellType.ERROR);
-
-        cell.setCellValue(c);
-        assertEquals(c.getTime().getTime(), cell.getDateCellValue().getTime());
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertProhibitedValueAccess(cell, CellType.BOOLEAN, CellType.STRING,
-                CellType.FORMULA, CellType.ERROR);
-
-        cell.setCellErrorValue(FormulaError.NA.getCode());
-        assertEquals(FormulaError.NA.getCode(), cell.getErrorCellValue());
-        assertEquals(CellType.ERROR, cell.getCellTypeEnum());
-        assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.BOOLEAN,
-                CellType.FORMULA, CellType.STRING);
-        
-        book.close();
-    }
-
-    private static void assertProhibitedValueAccess(Cell cell, CellType ... types) {
-        for(CellType type : types){
-            try {
-                switch (type) {
-                    case NUMERIC:
-                        cell.getNumericCellValue();
-                        break;
-                    case STRING:
-                        cell.getStringCellValue();
-                        break;
-                    case BOOLEAN:
-                        cell.getBooleanCellValue();
-                        break;
-                    case FORMULA:
-                        cell.getCellFormula();
-                        break;
-                    case ERROR:
-                        cell.getErrorCellValue();
-                        break;
-                    default:
-                        fail("Should get exception when reading cell type (" + type + ").");
-                }
-                
-            } catch (IllegalStateException e){
-                // expected during successful test
-                assertTrue(e.getMessage().startsWith("Cannot get a"));
-            }
-        }
-    }
-
-    /**
-     * test that Boolean (BoolErrRecord) are supported properly.
-     * @see testErr
-     */
-    @Test
-    public void testBool() throws IOException {
-
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet s = wb1.createSheet("testSheet1");
-        Row r;
-        Cell c;
-        // B1
-        r = s.createRow(0);
-        c=r.createCell(1);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(1, c.getColumnIndex());
-        c.setCellValue(true);
-        assertEquals("B1 value", true, c.getBooleanCellValue());
-
-        // C1
-        c=r.createCell(2);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(2, c.getColumnIndex());
-        c.setCellValue(false);
-        assertEquals("C1 value", false, c.getBooleanCellValue());
-
-        // Make sure values are saved and re-read correctly.
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        s = wb2.getSheet("testSheet1");
-        r = s.getRow(0);
-        assertEquals("Row 1 should have 2 cells", 2, r.getPhysicalNumberOfCells());
-        
-        c = r.getCell(1);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(1, c.getColumnIndex());
-        assertEquals(CellType.BOOLEAN, c.getCellTypeEnum());
-        assertEquals("B1 value", true, c.getBooleanCellValue());
-        
-        c = r.getCell(2);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(2, c.getColumnIndex());
-        assertEquals(CellType.BOOLEAN, c.getCellTypeEnum());
-        assertEquals("C1 value", false, c.getBooleanCellValue());
-        
-        wb2.close();
-    }
-    
-    /**
-     * test that Error types (BoolErrRecord) are supported properly.
-     * @see testBool
-     */
-    @Test
-    public void testErr() throws IOException {
-
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet s = wb1.createSheet("testSheet1");
-        Row r;
-        Cell c;
-
-        // B1
-        r = s.createRow(0);
-        c=r.createCell(1);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(1, c.getColumnIndex());
-        c.setCellErrorValue(FormulaError.NULL.getCode());
-        assertEquals("B1 value == #NULL!", FormulaError.NULL.getCode(), c.getErrorCellValue());
-
-        // C1
-        c=r.createCell(2);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(2, c.getColumnIndex());
-        c.setCellErrorValue(FormulaError.DIV0.getCode());
-        assertEquals("C1 value == #DIV/0!", FormulaError.DIV0.getCode(), c.getErrorCellValue());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        s = wb2.getSheet("testSheet1");
-
-        r = s.getRow(0);
-        assertEquals("Row 1 should have 2 cells", 2, r.getPhysicalNumberOfCells());
-
-        c = r.getCell(1);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(1, c.getColumnIndex());
-        assertEquals(CellType.ERROR, c.getCellTypeEnum());
-        assertEquals("B1 value == #NULL!", FormulaError.NULL.getCode(), c.getErrorCellValue());
-
-        c = r.getCell(2);
-        assertEquals(0, c.getRowIndex());
-        assertEquals(2, c.getColumnIndex());
-        assertEquals(CellType.ERROR, c.getCellTypeEnum());
-        assertEquals("C1 value == #DIV/0!", FormulaError.DIV0.getCode(), c.getErrorCellValue());
-
-        wb2.close();
-    }
-
-    /**
-     * test that Cell Styles being applied to formulas remain intact
-     */
-    @Test
-    public void testFormulaStyle() throws Exception {
-
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet s = wb1.createSheet("testSheet1");
-        Row r = null;
-        Cell c = null;
-        CellStyle cs = wb1.createCellStyle();
-        Font f = wb1.createFont();
-        f.setFontHeightInPoints((short) 20);
-        f.setColor(IndexedColors.RED.getIndex());
-        f.setBoldweight(Font.BOLDWEIGHT_BOLD);
-        f.setFontName("Arial Unicode MS");
-        cs.setFillBackgroundColor((short)3);
-        cs.setFont(f);
-        cs.setBorderTop(BorderStyle.THIN);
-        cs.setBorderRight(BorderStyle.THIN);
-        cs.setBorderLeft(BorderStyle.THIN);
-        cs.setBorderBottom(BorderStyle.THIN);
-
-        r = s.createRow(0);
-        c=r.createCell(0);
-        c.setCellStyle(cs);
-        c.setCellFormula("2*3");
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        s = wb2.getSheetAt(0);
-        r = s.getRow(0);
-        c = r.getCell(0);
-
-        assertEquals("Formula Cell at 0,0", CellType.FORMULA, c.getCellTypeEnum());
-        cs = c.getCellStyle();
-
-        assertNotNull("Formula Cell Style", cs);
-        assertEquals("Font Index Matches", f.getIndex(), cs.getFontIndex());
-        assertEquals("Top Border", BorderStyle.THIN, cs.getBorderTopEnum());
-        assertEquals("Left Border", BorderStyle.THIN, cs.getBorderLeftEnum());
-        assertEquals("Right Border", BorderStyle.THIN, cs.getBorderRightEnum());
-        assertEquals("Bottom Border", BorderStyle.THIN, cs.getBorderBottomEnum());
-        wb2.close();
-    }
-
-    /**tests the toString() method of HSSFCell*/
-    @Test
-    public void testToString() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Row r = wb1.createSheet("Sheet1").createRow(0);
-        CreationHelper factory = wb1.getCreationHelper();
-
-        r.createCell(0).setCellValue(false);
-        r.createCell(1).setCellValue(true);
-        r.createCell(2).setCellValue(1.5);
-        r.createCell(3).setCellValue(factory.createRichTextString("Astring"));
-        r.createCell(4).setCellErrorValue(FormulaError.DIV0.getCode());
-        r.createCell(5).setCellFormula("A1+B1");
-        r.createCell(6); // blank
-
-        // create date-formatted cell
-        Calendar c = LocaleUtil.getLocaleCalendar();
-        c.set(2010, 01, 02, 00, 00, 00);
-        r.createCell(7).setCellValue(c);
-        CellStyle dateStyle = wb1.createCellStyle();
-        short formatId = wb1.getCreationHelper().createDataFormat().getFormat("m/d/yy h:mm"); // any date format will do
-        dateStyle.setDataFormat(formatId);
-        r.getCell(7).setCellStyle(dateStyle);
-
-        assertEquals("Boolean", "FALSE", r.getCell(0).toString());
-        assertEquals("Boolean", "TRUE", r.getCell(1).toString());
-        assertEquals("Numeric", "1.5", r.getCell(2).toString());
-        assertEquals("String", "Astring", r.getCell(3).toString());
-        assertEquals("Error", "#DIV/0!", r.getCell(4).toString());
-        assertEquals("Formula", "A1+B1", r.getCell(5).toString());
-        assertEquals("Blank", "", r.getCell(6).toString());
-        // toString on a date-formatted cell displays dates as dd-MMM-yyyy, which has locale problems with the month
-        String dateCell1 = r.getCell(7).toString();
-        assertTrue("Date (Day)", dateCell1.startsWith("02-"));
-        assertTrue("Date (Year)", dateCell1.endsWith("-2010"));
-
-
-        //Write out the file, read it in, and then check cell values
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        r = wb2.getSheetAt(0).getRow(0);
-        assertEquals("Boolean", "FALSE", r.getCell(0).toString());
-        assertEquals("Boolean", "TRUE", r.getCell(1).toString());
-        assertEquals("Numeric", "1.5", r.getCell(2).toString());
-        assertEquals("String", "Astring", r.getCell(3).toString());
-        assertEquals("Error", "#DIV/0!", r.getCell(4).toString());
-        assertEquals("Formula", "A1+B1", r.getCell(5).toString());
-        assertEquals("Blank", "", r.getCell(6).toString());
-        String dateCell2 = r.getCell(7).toString();
-        assertEquals("Date", dateCell1, dateCell2);
-        wb2.close();
-    }
-
-    /**
-     *  Test that setting cached formula result keeps the cell type
-     */
-    @Test
-    public void testSetFormulaValue() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r = s.createRow(0);
-
-        Cell c1 = r.createCell(0);
-        c1.setCellFormula("NA()");
-        assertEquals(0.0, c1.getNumericCellValue(), 0.0);
-        assertEquals(CellType.NUMERIC, c1.getCachedFormulaResultTypeEnum());
-        c1.setCellValue(10);
-        assertEquals(10.0, c1.getNumericCellValue(), 0.0);
-        assertEquals(CellType.FORMULA, c1.getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, c1.getCachedFormulaResultTypeEnum());
-
-        Cell c2 = r.createCell(1);
-        c2.setCellFormula("NA()");
-        assertEquals(0.0, c2.getNumericCellValue(), 0.0);
-        assertEquals(CellType.NUMERIC, c2.getCachedFormulaResultTypeEnum());
-        c2.setCellValue("I changed!");
-        assertEquals("I changed!", c2.getStringCellValue());
-        assertEquals(CellType.FORMULA, c2.getCellTypeEnum());
-        assertEquals(CellType.STRING, c2.getCachedFormulaResultTypeEnum());
-
-        //calglin Cell.setCellFormula(null) for a non-formula cell
-        Cell c3 = r.createCell(2);
-        c3.setCellFormula(null);
-        assertEquals(CellType.BLANK, c3.getCellTypeEnum());
-        wb.close();
-
-    }
-
-    private Cell createACell(Workbook wb) {
-        return wb.createSheet("Sheet1").createRow(0).createCell(0);
-    }
-    
-    /**
-     * bug 58452: Copy cell formulas containing unregistered function names
-     * Make sure that formulas with unknown/unregistered UDFs can be written to and read back from a file.
-     *
-     * @throws IOException
-     */
-    @Test
-    public void testFormulaWithUnknownUDF() throws IOException {
-        final Workbook wb1 = _testDataProvider.createWorkbook();
-        final FormulaEvaluator evaluator1 = wb1.getCreationHelper().createFormulaEvaluator();
-        try {
-            final Cell cell1 = wb1.createSheet().createRow(0).createCell(0);
-            final String formula = "myFunc(\"arg\")";
-            cell1.setCellFormula(formula);
-            confirmFormulaWithUnknownUDF(formula, cell1, evaluator1);
-            
-            final Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-            final FormulaEvaluator evaluator2 = wb2.getCreationHelper().createFormulaEvaluator();
-            try {
-                final Cell cell2 = wb2.getSheetAt(0).getRow(0).getCell(0);
-                confirmFormulaWithUnknownUDF(formula, cell2, evaluator2);
-            } finally {
-                wb2.close();
-            }
-        } finally {
-            wb1.close();
-        }
-    }
-    
-    private static void confirmFormulaWithUnknownUDF(String expectedFormula, Cell cell, FormulaEvaluator evaluator) {
-        assertEquals(expectedFormula, cell.getCellFormula());
-        try {
-            evaluator.evaluate(cell);
-            fail("Expected NotImplementedFunctionException/NotImplementedException");
-        } catch (final org.apache.poi.ss.formula.eval.NotImplementedException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void testChangeTypeStringToBool() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Cell cell = createACell(wb);
-
-        cell.setCellValue("TRUE");
-        assertEquals(CellType.STRING, cell.getCellTypeEnum());
-        // test conversion of cell from text to boolean
-        cell.setCellType(CellType.BOOLEAN);
-
-        assertEquals(CellType.BOOLEAN, cell.getCellTypeEnum());
-        assertEquals(true, cell.getBooleanCellValue());
-        cell.setCellType(CellType.STRING);
-        assertEquals("TRUE", cell.getRichStringCellValue().getString());
-
-        // 'false' text to bool and back
-        cell.setCellValue("FALSE");
-        cell.setCellType(CellType.BOOLEAN);
-        assertEquals(CellType.BOOLEAN, cell.getCellTypeEnum());
-        assertEquals(false, cell.getBooleanCellValue());
-        cell.setCellType(CellType.STRING);
-        assertEquals("FALSE", cell.getRichStringCellValue().getString());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testChangeTypeBoolToString() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Cell cell = createACell(wb);
-
-        cell.setCellValue(true);
-        // test conversion of cell from boolean to text
-        cell.setCellType(CellType.STRING);
-        assertEquals("TRUE", cell.getRichStringCellValue().getString());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testChangeTypeErrorToNumber() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Cell cell = createACell(wb);
-        cell.setCellErrorValue(FormulaError.NAME.getCode());
-        try {
-            cell.setCellValue(2.5);
-        } catch (ClassCastException e) {
-            fail("Identified bug 46479b");
-        }
-        assertEquals(2.5, cell.getNumericCellValue(), 0.0);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testChangeTypeErrorToBoolean() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Cell cell = createACell(wb);
-        cell.setCellErrorValue(FormulaError.NAME.getCode());
-        cell.setCellValue(true);
-        // Identify bug 46479c
-        assertEquals(true, cell.getBooleanCellValue());
-        
-        wb.close();
-    }
-
-    /**
-     * Test for a bug observed around svn r886733 when using
-     * {@link FormulaEvaluator#evaluateInCell(Cell)} with a
-     * string result type.
-     */
-    @Test
-    public void testConvertStringFormulaCell() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Cell cellA1 = createACell(wb);
-        cellA1.setCellFormula("\"abc\"");
-
-        // default cached formula result is numeric zero
-        assertEquals(0.0, cellA1.getNumericCellValue(), 0.0);
-
-        FormulaEvaluator fe = cellA1.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
-
-        fe.evaluateFormulaCellEnum(cellA1);
-        assertEquals("abc", cellA1.getStringCellValue());
-
-        fe.evaluateInCell(cellA1);
-        assertFalse("Identified bug with writing back formula result of type string", cellA1.getStringCellValue().equals(""));
-        assertEquals("abc", cellA1.getStringCellValue());
-        
-        wb.close();
-    }
-    
-    /**
-     * similar to {@link #testConvertStringFormulaCell()} but  checks at a
-     * lower level that {#link {@link Cell#setCellType(int)} works properly
-     */
-    @Test
-    public void testSetTypeStringOnFormulaCell() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Cell cellA1 = createACell(wb);
-        FormulaEvaluator fe = cellA1.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
-
-        cellA1.setCellFormula("\"DEF\"");
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cellA1);
-        assertEquals("DEF", cellA1.getStringCellValue());
-        cellA1.setCellType(CellType.STRING);
-        assertEquals("DEF", cellA1.getStringCellValue());
-
-        cellA1.setCellFormula("25.061");
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cellA1);
-        confirmCannotReadString(cellA1);
-        assertEquals(25.061, cellA1.getNumericCellValue(), 0.0);
-        cellA1.setCellType(CellType.STRING);
-        assertEquals("25.061", cellA1.getStringCellValue());
-
-        cellA1.setCellFormula("TRUE");
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cellA1);
-        confirmCannotReadString(cellA1);
-        assertEquals(true, cellA1.getBooleanCellValue());
-        cellA1.setCellType(CellType.STRING);
-        assertEquals("TRUE", cellA1.getStringCellValue());
-
-        cellA1.setCellFormula("#NAME?");
-        fe.clearAllCachedResultValues();
-        fe.evaluateFormulaCellEnum(cellA1);
-        confirmCannotReadString(cellA1);
-        assertEquals(FormulaError.NAME, forInt(cellA1.getErrorCellValue()));
-        cellA1.setCellType(CellType.STRING);
-        assertEquals("#NAME?", cellA1.getStringCellValue());
-        
-        wb.close();
-    }
-
-    private static void confirmCannotReadString(Cell cell) {
-        assertProhibitedValueAccess(cell, CellType.STRING);
-    }
-
-    /**
-     * Test for bug in convertCellValueToBoolean to make sure that formula results get converted
-     */
-    @Test
-    public void testChangeTypeFormulaToBoolean() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Cell cell = createACell(wb);
-        cell.setCellFormula("1=1");
-        cell.setCellValue(true);
-        cell.setCellType(CellType.BOOLEAN);
-        assertTrue("Identified bug 46479d", cell.getBooleanCellValue());
-        assertEquals(true, cell.getBooleanCellValue());
-        
-        wb.close();
-    }
-
-    /**
-     * Bug 40296:      HSSFCell.setCellFormula throws
-     *   ClassCastException if cell is created using HSSFRow.createCell(short column, int type)
-     */
-    @Test
-    public void test40296() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet workSheet = wb1.createSheet("Sheet1");
-        Cell cell;
-        Row row = workSheet.createRow(0);
-
-        cell = row.createCell(0, CellType.NUMERIC);
-        cell.setCellValue(1.0);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals(1.0, cell.getNumericCellValue(), 0.0);
-
-        cell = row.createCell(1, CellType.NUMERIC);
-        cell.setCellValue(2.0);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals(2.0, cell.getNumericCellValue(), 0.0);
-
-        cell = row.createCell(2, CellType.FORMULA);
-        cell.setCellFormula("SUM(A1:B1)");
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("SUM(A1:B1)", cell.getCellFormula());
-
-        //serialize and check again
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        row = wb2.getSheetAt(0).getRow(0);
-        cell = row.getCell(0);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals(1.0, cell.getNumericCellValue(), 0.0);
-
-        cell = row.getCell(1);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        assertEquals(2.0, cell.getNumericCellValue(), 0.0);
-
-        cell = row.getCell(2);
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("SUM(A1:B1)", cell.getCellFormula());
-        wb2.close();
-    }
-
-    @Test
-    public void testSetStringInFormulaCell_bug44606() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Cell cell = wb.createSheet("Sheet1").createRow(0).createCell(0);
-        cell.setCellFormula("B1&C1");
-        cell.setCellValue(wb.getCreationHelper().createRichTextString("hello"));
-        wb.close();
-    }
-
-    /**
-     *  Make sure that cell.setCellType(CellType.BLANK) preserves the cell style
-     */
-    @Test
-    public void testSetBlank_bug47028() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        CellStyle style = wb.createCellStyle();
-        Cell cell = wb.createSheet("Sheet1").createRow(0).createCell(0);
-        cell.setCellStyle(style);
-        int i1 = cell.getCellStyle().getIndex();
-        cell.setCellType(CellType.BLANK);
-        int i2 = cell.getCellStyle().getIndex();
-        assertEquals(i1, i2);
-        wb.close();
-    }
-
-    /**
-     * Excel's implementation of floating number arithmetic does not fully adhere to IEEE 754:
-     *
-     * From http://support.microsoft.com/kb/78113:
-     *
-     * <ul>
-     * <li> Positive/Negative Infinities:
-     *   Infinities occur when you divide by 0. Excel does not support infinities, rather,
-     *   it gives a #DIV/0! error in these cases.
-     * </li>
-     * <li>
-     *   Not-a-Number (NaN):
-     *   NaN is used to represent invalid operations (such as infinity/infinity, 
-     *   infinity-infinity, or the square root of -1). NaNs allow a program to
-     *   continue past an invalid operation. Excel instead immediately generates
-     *   an error such as #NUM! or #DIV/0!.
-     * </li>
-     * </ul>
-     */
-    @Test
-    public void testNanAndInfinity() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet workSheet = wb1.createSheet("Sheet1");
-        Row row = workSheet.createRow(0);
-
-        Cell cell0 = row.createCell(0);
-        cell0.setCellValue(Double.NaN);
-        assertEquals("Double.NaN should change cell type to CellType#ERROR", CellType.ERROR, cell0.getCellTypeEnum());
-        assertEquals("Double.NaN should change cell value to #NUM!", FormulaError.NUM, forInt(cell0.getErrorCellValue()));
-
-        Cell cell1 = row.createCell(1);
-        cell1.setCellValue(Double.POSITIVE_INFINITY);
-        assertEquals("Double.POSITIVE_INFINITY should change cell type to CellType#ERROR", CellType.ERROR, cell1.getCellTypeEnum());
-        assertEquals("Double.POSITIVE_INFINITY should change cell value to #DIV/0!", FormulaError.DIV0, forInt(cell1.getErrorCellValue()));
-
-        Cell cell2 = row.createCell(2);
-        cell2.setCellValue(Double.NEGATIVE_INFINITY);
-        assertEquals("Double.NEGATIVE_INFINITY should change cell type to CellType#ERROR", CellType.ERROR, cell2.getCellTypeEnum());
-        assertEquals("Double.NEGATIVE_INFINITY should change cell value to #DIV/0!", FormulaError.DIV0, forInt(cell2.getErrorCellValue()));
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        row = wb2.getSheetAt(0).getRow(0);
-
-        cell0 = row.getCell(0);
-        assertEquals(CellType.ERROR, cell0.getCellTypeEnum());
-        assertEquals(FormulaError.NUM, forInt(cell0.getErrorCellValue()));
-
-        cell1 = row.getCell(1);
-        assertEquals(CellType.ERROR, cell1.getCellTypeEnum());
-        assertEquals(FormulaError.DIV0, forInt(cell1.getErrorCellValue()));
-
-        cell2 = row.getCell(2);
-        assertEquals(CellType.ERROR, cell2.getCellTypeEnum());
-        assertEquals(FormulaError.DIV0, forInt(cell2.getErrorCellValue()));
-        wb2.close();
-    }
-
-    @Test
-    public void testDefaultStyleProperties() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-
-        Cell cell = wb1.createSheet("Sheet1").createRow(0).createCell(0);
-        CellStyle style = cell.getCellStyle();
-
-        assertTrue(style.getLocked());
-        assertFalse(style.getHidden());
-        assertEquals(0, style.getIndention());
-        assertEquals(0, style.getFontIndex());
-        assertEquals(0, style.getAlignment());
-        assertEquals(0, style.getDataFormat());
-        assertEquals(false, style.getWrapText());
-
-        CellStyle style2 = wb1.createCellStyle();
-        assertTrue(style2.getLocked());
-        assertFalse(style2.getHidden());
-        style2.setLocked(false);
-        style2.setHidden(true);
-        assertFalse(style2.getLocked());
-        assertTrue(style2.getHidden());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        cell = wb2.getSheetAt(0).getRow(0).getCell(0);
-        style = cell.getCellStyle();
-        assertFalse(style2.getLocked());
-        assertTrue(style2.getHidden());
-
-        style2.setLocked(true);
-        style2.setHidden(false);
-        assertTrue(style2.getLocked());
-        assertFalse(style2.getHidden());
-        wb2.close();
-    }
-
-    @Test
-    public void testBug55658SetNumericValue() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sh = wb1.createSheet();
-        Row row = sh.createRow(0);
-        Cell cell = row.createCell(0);
-        cell.setCellValue(Integer.valueOf(23));
-        
-        cell.setCellValue("some");
-
-        cell = row.createCell(1);
-        cell.setCellValue(Integer.valueOf(23));
-        
-        cell.setCellValue("24");
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        assertEquals("some", wb2.getSheetAt(0).getRow(0).getCell(0).getStringCellValue());
-        assertEquals("24", wb2.getSheetAt(0).getRow(0).getCell(1).getStringCellValue());
-        wb2.close();
-    }
-
-    @Test
-    public void testRemoveHyperlink() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sh = wb1.createSheet("test");
-        Row row = sh.createRow(0);
-        CreationHelper helper = wb1.getCreationHelper();
-
-        Cell cell1 = row.createCell(1);
-        Hyperlink link1 = helper.createHyperlink(HyperlinkType.URL);
-        cell1.setHyperlink(link1);
-        assertNotNull(cell1.getHyperlink());
-        cell1.removeHyperlink();
-        assertNull(cell1.getHyperlink());
-
-        Cell cell2 = row.createCell(0);
-        Hyperlink link2 = helper.createHyperlink(HyperlinkType.URL);
-        cell2.setHyperlink(link2);
-        assertNotNull(cell2.getHyperlink());
-        cell2.setHyperlink(null);
-        assertNull(cell2.getHyperlink());
-
-        Cell cell3 = row.createCell(2);
-        Hyperlink link3 = helper.createHyperlink(HyperlinkType.URL);
-        link3.setAddress("http://poi.apache.org/");
-        cell3.setHyperlink(link3);
-        assertNotNull(cell3.getHyperlink());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        assertNotNull(wb2);
-        
-        cell1 = wb2.getSheet("test").getRow(0).getCell(1);
-        assertNull(cell1.getHyperlink());
-        cell2 = wb2.getSheet("test").getRow(0).getCell(0);
-        assertNull(cell2.getHyperlink());
-        cell3 = wb2.getSheet("test").getRow(0).getCell(2);
-        assertNotNull(cell3.getHyperlink());
-        wb2.close();
-    }
-
-    /**
-     * Cell with the formula that returns error must return error code(There was
-     * an problem that cell could not return error value form formula cell).
-     * @throws IOException 
-     */
-    @Test
-    public void testGetErrorCellValueFromFormulaCell() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
-            Sheet sheet = wb.createSheet();
-            Row row = sheet.createRow(0);
-            Cell cell = row.createCell(0);
-            cell.setCellFormula("SQRT(-1)");
-            wb.getCreationHelper().createFormulaEvaluator().evaluateFormulaCellEnum(cell);
-            assertEquals(36, cell.getErrorCellValue());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void testSetRemoveStyle() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        // different default style indexes for HSSF and XSSF/SXSSF
-        CellStyle defaultStyle = wb.getCellStyleAt(wb instanceof HSSFWorkbook ? (short)15 : (short)0);
-        
-        // Starts out with the default style
-        assertEquals(defaultStyle, cell.getCellStyle());
-        
-        // Create some styles, no change
-        CellStyle style1 = wb.createCellStyle();
-        CellStyle style2 = wb.createCellStyle();
-        style1.setDataFormat((short)2);
-        style2.setDataFormat((short)3);
-        
-        assertEquals(defaultStyle, cell.getCellStyle());
-        
-        // Apply one, changes
-        cell.setCellStyle(style1);
-        assertEquals(style1, cell.getCellStyle());
-        
-        // Apply the other, changes
-        cell.setCellStyle(style2);
-        assertEquals(style2, cell.getCellStyle());
-        
-        // Remove, goes back to default
-        cell.setCellStyle(null);
-        assertEquals(defaultStyle, cell.getCellStyle());
-        
-        // Add back, returns
-        cell.setCellStyle(style2);
-        assertEquals(style2, cell.getCellStyle());
-        
-        wb.close();
-    }
-
-    @Test
-    public void test57008() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-        
-        Row row0 = sheet.createRow(0);
-        Cell cell0 = row0.createCell(0);
-        cell0.setCellValue("row 0, cell 0 _x0046_ without changes");
-        
-        Cell cell1 = row0.createCell(1);
-        cell1.setCellValue("row 0, cell 1 _x005fx0046_ with changes");
-        
-        Cell cell2 = row0.createCell(2);
-        cell2.setCellValue("hgh_x0041_**_x0100_*_x0101_*_x0190_*_x0200_*_x0300_*_x0427_*");
-
-        checkUnicodeValues(wb1);
-        
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        checkUnicodeValues(wb2);
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Setting a cell value of a null RichTextString should set
-     *  the cell to Blank, test case for 58558
-     */
-    @Test
-    public void testSetCellValueNullRichTextString() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Cell cell = sheet.createRow(0).createCell(0);
-
-        RichTextString nullStr = null;
-        cell.setCellValue(nullStr);
-        assertEquals("", cell.getStringCellValue());
-        assertEquals(CellType.BLANK, cell.getCellTypeEnum());
-
-        cell = sheet.createRow(0).createCell(1);
-        cell.setCellValue(1.2d);
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum());
-        cell.setCellValue(nullStr);
-        assertEquals("", cell.getStringCellValue());
-        assertEquals(CellType.BLANK, cell.getCellTypeEnum());
-
-        cell = sheet.createRow(0).createCell(1);
-        cell.setCellValue(wb.getCreationHelper().createRichTextString("Test"));
-        assertEquals(CellType.STRING, cell.getCellTypeEnum());
-        cell.setCellValue(nullStr);
-        assertEquals("", cell.getStringCellValue());
-        assertEquals(CellType.BLANK, cell.getCellTypeEnum());
-
-        wb.close();
-    }
-
-    private void checkUnicodeValues(Workbook wb) {
-        assertEquals((wb instanceof HSSFWorkbook ? "row 0, cell 0 _x0046_ without changes" : "row 0, cell 0 F without changes"), 
-                wb.getSheetAt(0).getRow(0).getCell(0).toString());
-        assertEquals((wb instanceof HSSFWorkbook ? "row 0, cell 1 _x005fx0046_ with changes" : "row 0, cell 1 _x005fx0046_ with changes"), 
-                wb.getSheetAt(0).getRow(0).getCell(1).toString());
-        assertEquals((wb instanceof HSSFWorkbook ? "hgh_x0041_**_x0100_*_x0101_*_x0190_*_x0200_*_x0300_*_x0427_*" : "hghA**\u0100*\u0101*\u0190*\u0200*\u0300*\u0427*"), 
-                wb.getSheetAt(0).getRow(0).getCell(2).toString());
-    }
-
-    /**
-     *  The maximum length of cell contents (text) is 32,767 characters.
-     * @throws IOException 
-     */
-    @Test
-    public void testMaxTextLength() throws IOException{
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Cell cell = sheet.createRow(0).createCell(0);
-
-        int maxlen = wb instanceof HSSFWorkbook ? 
-                SpreadsheetVersion.EXCEL97.getMaxTextLength()
-                : SpreadsheetVersion.EXCEL2007.getMaxTextLength();
-        assertEquals(32767, maxlen);
-
-        StringBuffer b = new StringBuffer() ;
-
-        // 32767 is okay
-        for( int i = 0 ; i < maxlen ; i++ )
-        {
-            b.append( "X" ) ;
-        }
-        cell.setCellValue(b.toString());
-
-        b.append("X");
-        // 32768 produces an invalid XLS file
-        try {
-            cell.setCellValue(b.toString());
-            fail("Expected exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("The maximum length of cell contents (text) is 32,767 characters", e.getMessage());
-        }
-        wb.close();
-    }
-
-    /**
-     * Tests that the setAsActiveCell and getActiveCell function pairs work together
-     */
-    @Test
-    public void setAsActiveCell() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell A1 = row.createCell(0);
-        Cell B1 = row.createCell(1);
-
-        A1.setAsActiveCell();
-        assertEquals(A1.getAddress(), sheet.getActiveCell());
-
-        B1.setAsActiveCell();
-        assertEquals(B1.getAddress(), sheet.getActiveCell());
-        
-        wb.close();
-    }
-
-    @Test
-    public void getCellComment() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        CreationHelper factory = wb.getCreationHelper();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(1);
-        
-        // cell does not have a comment
-        assertNull(cell.getCellComment());
- 
-        // add a cell comment
-        ClientAnchor anchor = factory.createClientAnchor();
-        anchor.setCol1(cell.getColumnIndex());
-        anchor.setCol2(cell.getColumnIndex()+1);
-        anchor.setRow1(row.getRowNum());
-        anchor.setRow2(row.getRowNum()+3);
-
-        Drawing drawing = sheet.createDrawingPatriarch();
-        Comment comment = drawing.createCellComment(anchor);
-        RichTextString str = factory.createRichTextString("Hello, World!");
-        comment.setString(str);
-        comment.setAuthor("Apache POI");
-        cell.setCellComment(comment);
-        // ideally assertSame, but XSSFCell creates a new XSSFCellComment wrapping the same bean for every call to getCellComment.
-        assertEquals(comment, cell.getCellComment());
-
-        wb.close();
-    }
-
-    @Test
-    public void primitiveToEnumReplacementDoesNotBreakBackwardsCompatibility() throws IOException {
-        // bug 59836
-        // until we have changes POI from working on primitives (int) to enums,
-        // we should make sure we minimize backwards compatibility breakages.
-        // This method tests the old way of working with cell types, alignment, etc.
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-
-        // Cell.CELL_TYPE_* -> CellType.*
-        cell.setCellValue(5.0);
-        assertEquals(Cell.CELL_TYPE_NUMERIC, cell.getCellType());
-        assertEquals(0, cell.getCellType()); //make sure that hard-coded int literals still work, even though users should be using the named constants
-        assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); // make sure old way and new way are compatible
-
-        // make sure switch(int|Enum) still works. Cases must be statically resolvable in Java 6 ("constant expression required")
-        switch(cell.getCellType()) {
-            case Cell.CELL_TYPE_NUMERIC:
-                // expected
-                break;
-            case Cell.CELL_TYPE_STRING:
-            case Cell.CELL_TYPE_BOOLEAN:
-            case Cell.CELL_TYPE_ERROR:
-            case Cell.CELL_TYPE_FORMULA:
-            case Cell.CELL_TYPE_BLANK:
-            default:
-                fail("unexpected cell type: " + cell.getCellType());
-        }
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java
deleted file mode 100644
index 17de8cf..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.apache.poi.util.Units.EMU_PER_PIXEL;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.util.Units;
-import org.junit.Test;
-
-/**
- * Common superclass for testing implementations of
- * {@link Comment}
- */
-public abstract class BaseTestCellComment {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestCellComment(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    @Test
-    public final void find() throws IOException {
-        Workbook book = _testDataProvider.createWorkbook();
-        Sheet sheet = book.createSheet();
-        assertNull(sheet.getCellComment(new CellAddress(0, 0)));
-
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        assertNull(sheet.getCellComment(new CellAddress(0, 0)));
-        assertNull(cell.getCellComment());
-        book.close();
-    }
-
-    @Test
-    public final void create() throws IOException {
-        String cellText = "Hello, World";
-        String commentText = "We can set comments in POI";
-        String commentAuthor = "Apache Software Foundation";
-        int cellRow = 3;
-        int cellColumn = 1;
-
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        CreationHelper factory = wb1.getCreationHelper();
-
-        Sheet sheet = wb1.createSheet();
-        assertNull(sheet.getCellComment(new CellAddress(cellRow, cellColumn)));
-
-        Cell cell = sheet.createRow(cellRow).createCell(cellColumn);
-        cell.setCellValue(factory.createRichTextString(cellText));
-        assertNull(cell.getCellComment());
-        assertNull(sheet.getCellComment(new CellAddress(cellRow, cellColumn)));
-
-        Drawing patr = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = factory.createClientAnchor();
-        anchor.setCol1(2);
-        anchor.setCol2(5);
-        anchor.setRow1(1);
-        anchor.setRow2(2);
-        Comment comment = patr.createCellComment(anchor);
-        assertFalse(comment.isVisible());
-        comment.setVisible(true);
-        assertTrue(comment.isVisible());
-        RichTextString string1 = factory.createRichTextString(commentText);
-        comment.setString(string1);
-        comment.setAuthor(commentAuthor);
-        cell.setCellComment(comment);
-        assertNotNull(cell.getCellComment());
-        assertNotNull(sheet.getCellComment(new CellAddress(cellRow, cellColumn)));
-
-        //verify our settings
-        assertEquals(commentAuthor, comment.getAuthor());
-        assertEquals(commentText, comment.getString().getString());
-        assertEquals(cellRow, comment.getRow());
-        assertEquals(cellColumn, comment.getColumn());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        sheet = wb2.getSheetAt(0);
-        cell = sheet.getRow(cellRow).getCell(cellColumn);
-        comment = cell.getCellComment();
-
-        assertNotNull(comment);
-        assertEquals(commentAuthor, comment.getAuthor());
-        assertEquals(commentText, comment.getString().getString());
-        assertEquals(cellRow, comment.getRow());
-        assertEquals(cellColumn, comment.getColumn());
-        assertTrue(comment.isVisible());
-
-        // Change slightly, and re-test
-        comment.setString(factory.createRichTextString("New Comment Text"));
-        comment.setVisible(false);
-
-        Workbook wb3 = _testDataProvider.writeOutAndReadBack(wb2);
-        wb2.close();
-
-        sheet = wb3.getSheetAt(0);
-        cell = sheet.getRow(cellRow).getCell(cellColumn);
-        comment = cell.getCellComment();
-
-        assertNotNull(comment);
-        assertEquals(commentAuthor, comment.getAuthor());
-        assertEquals("New Comment Text", comment.getString().getString());
-        assertEquals(cellRow, comment.getRow());
-        assertEquals(cellColumn, comment.getColumn());
-        assertFalse(comment.isVisible());
-
-        // Test Comment.equals and Comment.hashCode
-        assertEquals(comment, cell.getCellComment());
-        assertEquals(comment.hashCode(), cell.getCellComment().hashCode());
-        
-        wb3.close();
-    }
-
-    /**
-     * test that we can read cell comments from an existing workbook.
-     */
-    @Test
-    public final void readComments() throws IOException {
-
-        Workbook wb = _testDataProvider.openSampleWorkbook("SimpleWithComments." + _testDataProvider.getStandardFileNameExtension());
-
-        Sheet sheet = wb.getSheetAt(0);
-
-        Cell cell;
-        Row row;
-        Comment comment;
-
-        for (int rownum = 0; rownum < 3; rownum++) {
-            row = sheet.getRow(rownum);
-            cell = row.getCell(0);
-            comment = cell.getCellComment();
-            assertNull("Cells in the first column are not commented", comment);
-            assertNull(sheet.getCellComment(new CellAddress(rownum, 0)));
-        }
-
-        for (int rownum = 0; rownum < 3; rownum++) {
-            row = sheet.getRow(rownum);
-            cell = row.getCell(1);
-            comment = cell.getCellComment();
-            assertNotNull("Cells in the second column have comments", comment);
-            assertNotNull("Cells in the second column have comments", sheet.getCellComment(new CellAddress(rownum, 1)));
-
-            assertEquals("Yegor Kozlov", comment.getAuthor());
-            assertFalse("cells in the second column have not empyy notes",
-                    "".equals(comment.getString().getString()));
-            assertEquals(rownum, comment.getRow());
-            assertEquals(cell.getColumnIndex(), comment.getColumn());
-        }
-        
-        wb.close();
-    }
-
-    /**
-     * test that we can modify existing cell comments
-     */
-    @Test
-    public final void modifyComments() throws IOException {
-
-        Workbook wb1 = _testDataProvider.openSampleWorkbook("SimpleWithComments." + _testDataProvider.getStandardFileNameExtension());
-        CreationHelper factory = wb1.getCreationHelper();
-
-        Sheet sheet = wb1.getSheetAt(0);
-
-        Cell cell;
-        Row row;
-        Comment comment;
-
-        for (int rownum = 0; rownum < 3; rownum++) {
-            row = sheet.getRow(rownum);
-            cell = row.getCell(1);
-            comment = cell.getCellComment();
-            comment.setAuthor("Mofified[" + rownum + "] by Yegor");
-            comment.setString(factory.createRichTextString("Modified comment at row " + rownum));
-        }
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-
-        for (int rownum = 0; rownum < 3; rownum++) {
-            row = sheet.getRow(rownum);
-            cell = row.getCell(1);
-            comment = cell.getCellComment();
-
-            assertEquals("Mofified[" + rownum + "] by Yegor", comment.getAuthor());
-            assertEquals("Modified comment at row " + rownum, comment.getString().getString());
-        }
-        
-        wb2.close();
-    }
-
-    @Test
-    public final void deleteComments() throws IOException {
-        Workbook wb1 = _testDataProvider.openSampleWorkbook("SimpleWithComments." + _testDataProvider.getStandardFileNameExtension());
-        Sheet sheet = wb1.getSheetAt(0);
-
-        // Zap from rows 1 and 3
-        assertNotNull(sheet.getRow(0).getCell(1).getCellComment());
-        assertNotNull(sheet.getRow(1).getCell(1).getCellComment());
-        assertNotNull(sheet.getRow(2).getCell(1).getCellComment());
-
-        sheet.getRow(0).getCell(1).removeCellComment();
-        sheet.getRow(2).getCell(1).setCellComment(null);
-
-        // Check gone so far
-        assertNull(sheet.getRow(0).getCell(1).getCellComment());
-        assertNotNull(sheet.getRow(1).getCell(1).getCellComment());
-        assertNull(sheet.getRow(2).getCell(1).getCellComment());
-
-        // Save and re-load
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        // Check
-        assertNull(sheet.getRow(0).getCell(1).getCellComment());
-        assertNotNull(sheet.getRow(1).getCell(1).getCellComment());
-        assertNull(sheet.getRow(2).getCell(1).getCellComment());
-        
-        wb2.close();
-    }
-
-    /**
-     * code from the quick guide
-     */
-    @Test
-    public void quickGuide() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-
-        CreationHelper factory = wb1.getCreationHelper();
-
-        Sheet sheet = wb1.createSheet();
-
-        Cell cell = sheet.createRow(3).createCell(5);
-        cell.setCellValue("F4");
-
-        Drawing drawing = sheet.createDrawingPatriarch();
-
-        ClientAnchor anchor = factory.createClientAnchor();
-        Comment comment = drawing.createCellComment(anchor);
-        RichTextString str = factory.createRichTextString("Hello, World!");
-        comment.setString(str);
-        comment.setAuthor("Apache POI");
-        //assign the comment to the cell
-        cell.setCellComment(comment);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        cell = sheet.getRow(3).getCell(5);
-        comment = cell.getCellComment();
-        assertNotNull(comment);
-        assertEquals("Hello, World!", comment.getString().getString());
-        assertEquals("Apache POI", comment.getAuthor());
-        assertEquals(3, comment.getRow());
-        assertEquals(5, comment.getColumn());
-        
-        wb2.close();
-    }
-
-    @Test
-    public void getClientAnchor() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(10);
-        Cell cell = row.createCell(5);
-        CreationHelper factory = wb.getCreationHelper();
-        
-        Drawing drawing = sheet.createDrawingPatriarch();
-        
-        double r_mul, c_mul;
-        if (sheet instanceof HSSFSheet) {
-            double rowheight = Units.toEMU(row.getHeightInPoints())/EMU_PER_PIXEL;
-            r_mul = 256.0/rowheight;
-            double colwidth = sheet.getColumnWidthInPixels(2);
-            c_mul = 1024.0/colwidth;
-        } else {
-            r_mul = c_mul = EMU_PER_PIXEL;
-        }
-
-        int dx1 = (int)Math.round(10*c_mul);
-        int dy1 = (int)Math.round(10*r_mul);
-        int dx2 = (int)Math.round(3*c_mul);
-        int dy2 = (int)Math.round(4*r_mul);
-        int col1 = cell.getColumnIndex()+1;
-        int row1 = row.getRowNum();
-        int col2 = cell.getColumnIndex()+2;
-        int row2 = row.getRowNum()+1;
-        
-        ClientAnchor anchor = drawing.createAnchor(dx1, dy1, dx2, dy2, col1, row1, col2, row2);
-        Comment comment = drawing.createCellComment(anchor);
-        comment.setVisible(true);
-        cell.setCellComment(comment);
-        
-        anchor = comment.getClientAnchor();
-        assertEquals(dx1, anchor.getDx1());
-        assertEquals(dy1, anchor.getDy1());
-        assertEquals(dx2, anchor.getDx2());
-        assertEquals(dy2, anchor.getDy2());
-        assertEquals(col1, anchor.getCol1());
-        assertEquals(row1, anchor.getRow1());
-        assertEquals(col2, anchor.getCol2());
-        assertEquals(row2, anchor.getRow2());
-
-        anchor = factory.createClientAnchor();
-        comment = drawing.createCellComment(anchor);
-        cell.setCellComment(comment);
-        anchor = comment.getClientAnchor();
-        
-        if (sheet instanceof HSSFSheet) {
-            assertEquals(0, anchor.getCol1());
-            assertEquals(0, anchor.getDx1());
-            assertEquals(0, anchor.getRow1());
-            assertEquals(0, anchor.getDy1());
-            assertEquals(0, anchor.getCol2());
-            assertEquals(0, anchor.getDx2());
-            assertEquals(0, anchor.getRow2());
-            assertEquals(0, anchor.getDy2());            
-        } else {
-            // when anchor is initialized without parameters, the comment anchor attributes default to
-            // "1, 15, 0, 2, 3, 15, 3, 16" ... see XSSFVMLDrawing.newCommentShape()
-            assertEquals( 1, anchor.getCol1());
-            assertEquals(15*EMU_PER_PIXEL, anchor.getDx1());
-            assertEquals( 0, anchor.getRow1());
-            assertEquals( 2*EMU_PER_PIXEL, anchor.getDy1());
-            assertEquals( 3, anchor.getCol2());
-            assertEquals(15*EMU_PER_PIXEL, anchor.getDx2());
-            assertEquals( 3, anchor.getRow2());
-            assertEquals(16*EMU_PER_PIXEL, anchor.getDy2());
-        }
-        
-        wb.close();
-    }
-    
-    @Test
-    public void attemptToSave2CommentsWithSameCoordinates() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        CreationHelper factory = wb.getCreationHelper();
-        Drawing patriarch = sh.createDrawingPatriarch();
-        patriarch.createCellComment(factory.createClientAnchor());
-        
-        try {
-            patriarch.createCellComment(factory.createClientAnchor());
-            _testDataProvider.writeOutAndReadBack(wb);
-            fail("Should not be able to create a corrupted workbook with multiple cell comments in one cell");
-        } catch (IllegalStateException e) {
-            // HSSFWorkbooks fail when writing out workbook
-            assertEquals("found multiple cell comments for cell $A$1", e.getMessage());
-        } catch (IllegalArgumentException e) {
-            // XSSFWorkbooks fail when creating and setting the cell address of the comment
-            assertEquals("Multiple cell comments in one cell are not allowed, cell: A1", e.getMessage());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test
-    public void getAddress() {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        CreationHelper factory = wb.getCreationHelper();
-        Drawing patriarch = sh.createDrawingPatriarch();
-        Comment comment = patriarch.createCellComment(factory.createClientAnchor());
-        
-        assertEquals(CellAddress.A1, comment.getAddress());
-        Cell C2 = sh.createRow(1).createCell(2);
-        C2.setCellComment(comment);
-        assertEquals(new CellAddress("C2"), comment.getAddress());
-    }
-    
-    @Test
-    public void setAddress() {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        CreationHelper factory = wb.getCreationHelper();
-        Drawing patriarch = sh.createDrawingPatriarch();
-        Comment comment = patriarch.createCellComment(factory.createClientAnchor());
-        
-        assertEquals(CellAddress.A1, comment.getAddress());
-        CellAddress C2 = new CellAddress("C2");
-        assertEquals("C2", C2.formatAsString());
-        comment.setAddress(C2);
-        assertEquals(C2, comment.getAddress());
-        
-        CellAddress E10 = new CellAddress(9, 4);
-        assertEquals("E10", E10.formatAsString());
-        comment.setAddress(9, 4);
-        assertEquals(E10, comment.getAddress());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
deleted file mode 100644
index f6c47af..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
-
-import java.io.IOException;
-
-import static org.junit.Assert.*;
-
-/**
- * Common superclass for testing implementations of
- * Workbook.cloneSheet()
- */
-public abstract class BaseTestCloneSheet {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestCloneSheet(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    @Test
-    public void testCloneSheetBasic() throws IOException{
-        Workbook b = _testDataProvider.createWorkbook();
-        Sheet s = b.createSheet("Test");
-        s.addMergedRegion(new CellRangeAddress(0, 1, 0, 1));
-        Sheet clonedSheet = b.cloneSheet(0);
-
-        assertEquals("One merged area", 1, clonedSheet.getNumMergedRegions());
-
-        b.close();
-    }
-
-    /**
-     * Ensures that pagebreak cloning works properly
-     * @throws IOException
-     */
-    @Test
-    public void testPageBreakClones() throws IOException {
-        Workbook b = _testDataProvider.createWorkbook();
-        Sheet s = b.createSheet("Test");
-        s.setRowBreak(3);
-        s.setColumnBreak((short) 6);
-
-        Sheet clone = b.cloneSheet(0);
-        assertTrue("Row 3 not broken", clone.isRowBroken(3));
-        assertTrue("Column 6 not broken", clone.isColumnBroken((short) 6));
-
-        s.removeRowBreak(3);
-
-        assertTrue("Row 3 still should be broken", clone.isRowBroken(3));
-
-        b.close();
-    }
-
-    @Test
-    public void testCloneSheetIntValid() {
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet01");
-        wb.cloneSheet(0);
-        assertEquals(2, wb.getNumberOfSheets());
-        try {
-            wb.cloneSheet(2);
-            fail("ShouldFail");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-    }
-
-    @Test
-    public void testCloneSheetIntInvalid() {
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet01");
-        try {
-            wb.cloneSheet(1);
-            fail("Should Fail");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-        assertEquals(1, wb.getNumberOfSheets());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
deleted file mode 100644
index 1111960..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ /dev/null
@@ -1,1436 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.hssf.usermodel.HSSFConditionalFormatting;
-import org.apache.poi.hssf.usermodel.HSSFConditionalFormattingRule;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
-import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
-
-import java.io.IOException;
-
-import static org.junit.Assert.*;
-
-/**
- * Base tests for Conditional Formatting, for both HSSF and XSSF
- */
-public abstract class BaseTestConditionalFormatting {
-    private final ITestDataProvider _testDataProvider;
-
-    public BaseTestConditionalFormatting(ITestDataProvider testDataProvider){
-        _testDataProvider = testDataProvider;
-    }
-    
-    protected abstract void assertColour(String hexExpected, Color actual);
-
-    @Test
-    public void testBasic() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        SheetConditionalFormatting sheetCF = sh.getSheetConditionalFormatting();
-
-        assertEquals(0, sheetCF.getNumConditionalFormattings());
-        try {
-            assertNull(sheetCF.getConditionalFormattingAt(0));
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Specified CF index 0 is outside the allowable range"));
-        }
-
-        try {
-            sheetCF.removeConditionalFormatting(0);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Specified CF index 0 is outside the allowable range"));
-        }
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("1");
-        ConditionalFormattingRule rule2 = sheetCF.createConditionalFormattingRule("2");
-        ConditionalFormattingRule rule3 = sheetCF.createConditionalFormattingRule("3");
-        ConditionalFormattingRule rule4 = sheetCF.createConditionalFormattingRule("4");
-        try {
-            sheetCF.addConditionalFormatting(null, rule1);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("regions must not be null"));
-        }
-        try {
-            sheetCF.addConditionalFormatting(
-                    new CellRangeAddress[]{ CellRangeAddress.valueOf("A1:A3") },
-                    (ConditionalFormattingRule)null);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("cfRules must not be null"));
-        }
-
-        try {
-            sheetCF.addConditionalFormatting(
-                    new CellRangeAddress[]{ CellRangeAddress.valueOf("A1:A3") },
-                    new ConditionalFormattingRule[0]);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("cfRules must not be empty"));
-        }
-
-        try {
-            sheetCF.addConditionalFormatting(
-                    new CellRangeAddress[]{ CellRangeAddress.valueOf("A1:A3") },
-                    new ConditionalFormattingRule[]{rule1, rule2, rule3, rule4});
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Number of rules must not exceed 3"));
-        }
-        wb.close();
-    }
-
-    /**
-     * Test format conditions based on a boolean formula
-     */
-    @Test
-    public void testBooleanFormulaConditions() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        SheetConditionalFormatting sheetCF = sh.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule("SUM(A1:A5)>10");
-        assertEquals(ConditionType.FORMULA, rule1.getConditionType());
-        assertEquals("SUM(A1:A5)>10", rule1.getFormula1());
-        int formatIndex1 = sheetCF.addConditionalFormatting(
-                new CellRangeAddress[]{
-                        CellRangeAddress.valueOf("B1"),
-                        CellRangeAddress.valueOf("C3"),
-                }, rule1);
-        assertEquals(0, formatIndex1);
-        assertEquals(1, sheetCF.getNumConditionalFormattings());
-        CellRangeAddress[] ranges1 = sheetCF.getConditionalFormattingAt(formatIndex1).getFormattingRanges();
-        assertEquals(2, ranges1.length);
-        assertEquals("B1", ranges1[0].formatAsString());
-        assertEquals("C3", ranges1[1].formatAsString());
-
-        // adjacent address are merged
-        int formatIndex2 = sheetCF.addConditionalFormatting(
-                new CellRangeAddress[]{
-                        CellRangeAddress.valueOf("B1"),
-                        CellRangeAddress.valueOf("B2"),
-                        CellRangeAddress.valueOf("B3"),
-                }, rule1);
-        assertEquals(1, formatIndex2);
-        assertEquals(2, sheetCF.getNumConditionalFormattings());
-        CellRangeAddress[] ranges2 = sheetCF.getConditionalFormattingAt(formatIndex2).getFormattingRanges();
-        assertEquals(1, ranges2.length);
-        assertEquals("B1:B3", ranges2[0].formatAsString());
-        wb.close();
-    }
-
-    @Test
-    public void testSingleFormulaConditions() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        SheetConditionalFormatting sheetCF = sh.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.EQUAL, "SUM(A1:A5)+10");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule1.getConditionType());
-        assertEquals("SUM(A1:A5)+10", rule1.getFormula1());
-        assertEquals(ComparisonOperator.EQUAL, rule1.getComparisonOperation());
-
-        ConditionalFormattingRule rule2 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.NOT_EQUAL, "15");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule2.getConditionType());
-        assertEquals("15", rule2.getFormula1());
-        assertEquals(ComparisonOperator.NOT_EQUAL, rule2.getComparisonOperation());
-
-        ConditionalFormattingRule rule3 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.NOT_EQUAL, "15");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule3.getConditionType());
-        assertEquals("15", rule3.getFormula1());
-        assertEquals(ComparisonOperator.NOT_EQUAL, rule3.getComparisonOperation());
-
-        ConditionalFormattingRule rule4 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.GT, "0");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule4.getConditionType());
-        assertEquals("0", rule4.getFormula1());
-        assertEquals(ComparisonOperator.GT, rule4.getComparisonOperation());
-
-        ConditionalFormattingRule rule5 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.LT, "0");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule5.getConditionType());
-        assertEquals("0", rule5.getFormula1());
-        assertEquals(ComparisonOperator.LT, rule5.getComparisonOperation());
-
-        ConditionalFormattingRule rule6 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.GE, "0");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule6.getConditionType());
-        assertEquals("0", rule6.getFormula1());
-        assertEquals(ComparisonOperator.GE, rule6.getComparisonOperation());
-
-        ConditionalFormattingRule rule7 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.LE, "0");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule7.getConditionType());
-        assertEquals("0", rule7.getFormula1());
-        assertEquals(ComparisonOperator.LE, rule7.getComparisonOperation());
-
-        ConditionalFormattingRule rule8 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.BETWEEN, "0", "5");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule8.getConditionType());
-        assertEquals("0", rule8.getFormula1());
-        assertEquals("5", rule8.getFormula2());
-        assertEquals(ComparisonOperator.BETWEEN, rule8.getComparisonOperation());
-
-        ConditionalFormattingRule rule9 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.NOT_BETWEEN, "0", "5");
-        assertEquals(ConditionType.CELL_VALUE_IS, rule9.getConditionType());
-        assertEquals("0", rule9.getFormula1());
-        assertEquals("5", rule9.getFormula2());
-        assertEquals(ComparisonOperator.NOT_BETWEEN, rule9.getComparisonOperation());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testCopy() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb.createSheet();
-        Sheet sheet2 = wb.createSheet();
-        SheetConditionalFormatting sheet1CF = sheet1.getSheetConditionalFormatting();
-        SheetConditionalFormatting sheet2CF = sheet2.getSheetConditionalFormatting();
-        assertEquals(0, sheet1CF.getNumConditionalFormattings());
-        assertEquals(0, sheet2CF.getNumConditionalFormattings());
-
-        ConditionalFormattingRule rule1 = sheet1CF.createConditionalFormattingRule(
-                ComparisonOperator.EQUAL, "SUM(A1:A5)+10");
-
-        ConditionalFormattingRule rule2 = sheet1CF.createConditionalFormattingRule(
-                ComparisonOperator.NOT_EQUAL, "15");
-
-        // adjacent address are merged
-        int formatIndex = sheet1CF.addConditionalFormatting(
-                new CellRangeAddress[]{
-                        CellRangeAddress.valueOf("A1:A5"),
-                        CellRangeAddress.valueOf("C1:C5")
-                }, rule1, rule2);
-        assertEquals(0, formatIndex);
-        assertEquals(1, sheet1CF.getNumConditionalFormattings());
-
-        assertEquals(0, sheet2CF.getNumConditionalFormattings());
-        sheet2CF.addConditionalFormatting(sheet1CF.getConditionalFormattingAt(formatIndex));
-        assertEquals(1, sheet2CF.getNumConditionalFormattings());
-
-        ConditionalFormatting sheet2cf = sheet2CF.getConditionalFormattingAt(0);
-        assertEquals(2, sheet2cf.getNumberOfRules());
-        assertEquals("SUM(A1:A5)+10", sheet2cf.getRule(0).getFormula1());
-        assertEquals(ComparisonOperator.EQUAL, sheet2cf.getRule(0).getComparisonOperation());
-        assertEquals(ConditionType.CELL_VALUE_IS, sheet2cf.getRule(0).getConditionType());
-        assertEquals("15", sheet2cf.getRule(1).getFormula1());
-        assertEquals(ComparisonOperator.NOT_EQUAL, sheet2cf.getRule(1).getComparisonOperation());
-        assertEquals(ConditionType.CELL_VALUE_IS, sheet2cf.getRule(1).getConditionType());
-        
-        wb.close();
-    }
-
-    @Test
-    public void testRemove() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb.createSheet();
-        SheetConditionalFormatting sheetCF = sheet1.getSheetConditionalFormatting();
-        assertEquals(0, sheetCF.getNumConditionalFormattings());
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.EQUAL, "SUM(A1:A5)");
-
-        // adjacent address are merged
-        int formatIndex = sheetCF.addConditionalFormatting(
-                new CellRangeAddress[]{
-                        CellRangeAddress.valueOf("A1:A5")
-                }, rule1);
-        assertEquals(0, formatIndex);
-        assertEquals(1, sheetCF.getNumConditionalFormattings());
-        sheetCF.removeConditionalFormatting(0);
-        assertEquals(0, sheetCF.getNumConditionalFormattings());
-        try {
-            assertNull(sheetCF.getConditionalFormattingAt(0));
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Specified CF index 0 is outside the allowable range"));
-        }
-
-        formatIndex = sheetCF.addConditionalFormatting(
-                new CellRangeAddress[]{
-                        CellRangeAddress.valueOf("A1:A5")
-                }, rule1);
-        assertEquals(0, formatIndex);
-        assertEquals(1, sheetCF.getNumConditionalFormattings());
-        sheetCF.removeConditionalFormatting(0);
-        assertEquals(0, sheetCF.getNumConditionalFormattings());
-        try {
-            assertNull(sheetCF.getConditionalFormattingAt(0));
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Specified CF index 0 is outside the allowable range"));
-        }
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testCreateCF() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        String formula = "7";
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(formula);
-        FontFormatting fontFmt = rule1.createFontFormatting();
-        fontFmt.setFontStyle(true, false);
-
-        BorderFormatting bordFmt = rule1.createBorderFormatting();
-        bordFmt.setBorderBottom(BorderStyle.THIN);
-        bordFmt.setBorderTop(BorderStyle.THICK);
-        bordFmt.setBorderLeft(BorderStyle.DASHED);
-        bordFmt.setBorderRight(BorderStyle.DOTTED);
-
-        PatternFormatting patternFmt = rule1.createPatternFormatting();
-        patternFmt.setFillBackgroundColor(IndexedColors.YELLOW.index);
-
-
-        ConditionalFormattingRule rule2 = sheetCF.createConditionalFormattingRule(ComparisonOperator.BETWEEN, "1", "2");
-        ConditionalFormattingRule [] cfRules =
-        {
-            rule1, rule2
-        };
-
-        short col = 1;
-        CellRangeAddress [] regions = {
-            new CellRangeAddress(0, 65535, col, col)
-        };
-
-        sheetCF.addConditionalFormatting(regions, cfRules);
-        sheetCF.addConditionalFormatting(regions, cfRules);
-
-        // Verification
-        assertEquals(2, sheetCF.getNumConditionalFormattings());
-        sheetCF.removeConditionalFormatting(1);
-        assertEquals(1, sheetCF.getNumConditionalFormattings());
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertNotNull(cf);
-
-        regions = cf.getFormattingRanges();
-        assertNotNull(regions);
-        assertEquals(1, regions.length);
-        CellRangeAddress r = regions[0];
-        assertEquals(1, r.getFirstColumn());
-        assertEquals(1, r.getLastColumn());
-        assertEquals(0, r.getFirstRow());
-        assertEquals(65535, r.getLastRow());
-
-        assertEquals(2, cf.getNumberOfRules());
-
-        rule1 = cf.getRule(0);
-        assertEquals("7",rule1.getFormula1());
-        assertNull(rule1.getFormula2());
-
-        FontFormatting    r1fp = rule1.getFontFormatting();
-        assertNotNull(r1fp);
-
-        assertTrue(r1fp.isItalic());
-        assertFalse(r1fp.isBold());
-
-        BorderFormatting  r1bf = rule1.getBorderFormatting();
-        assertNotNull(r1bf);
-        assertEquals(BorderStyle.THIN, r1bf.getBorderBottomEnum());
-        assertEquals(BorderStyle.THICK,r1bf.getBorderTopEnum());
-        assertEquals(BorderStyle.DASHED,r1bf.getBorderLeftEnum());
-        assertEquals(BorderStyle.DOTTED,r1bf.getBorderRightEnum());
-
-        PatternFormatting r1pf = rule1.getPatternFormatting();
-        assertNotNull(r1pf);
-//        assertEquals(IndexedColors.YELLOW.index,r1pf.getFillBackgroundColor());
-
-        rule2 = cf.getRule(1);
-        assertEquals("2",rule2.getFormula2());
-        assertEquals("1",rule2.getFormula1());
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testClone() throws IOException {
-
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        String formula = "7";
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(formula);
-        FontFormatting fontFmt = rule1.createFontFormatting();
-        fontFmt.setFontStyle(true, false);
-
-        PatternFormatting patternFmt = rule1.createPatternFormatting();
-        patternFmt.setFillBackgroundColor(IndexedColors.YELLOW.index);
-
-
-        ConditionalFormattingRule rule2 = sheetCF.createConditionalFormattingRule(ComparisonOperator.BETWEEN, "1", "2");
-        ConditionalFormattingRule [] cfRules =
-        {
-            rule1, rule2
-        };
-
-        short col = 1;
-        CellRangeAddress [] regions = {
-            new CellRangeAddress(0, 65535, col, col)
-        };
-
-        sheetCF.addConditionalFormatting(regions, cfRules);
-
-        try {
-            wb.cloneSheet(0);
-            assertEquals(2, wb.getNumberOfSheets());
-        } catch (RuntimeException e) {
-            if (e.getMessage().indexOf("needs to define a clone method") > 0) {
-                fail("Identified bug 45682");
-            }
-            throw e;
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testShiftRows() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.BETWEEN, "SUM(A10:A15)", "1+SUM(B16:B30)");
-        FontFormatting fontFmt = rule1.createFontFormatting();
-        fontFmt.setFontStyle(true, false);
-
-        PatternFormatting patternFmt = rule1.createPatternFormatting();
-        patternFmt.setFillBackgroundColor(IndexedColors.YELLOW.index);
-
-        ConditionalFormattingRule rule2 = sheetCF.createConditionalFormattingRule(
-                ComparisonOperator.BETWEEN, "SUM(A10:A15)", "1+SUM(B16:B30)");
-        BorderFormatting borderFmt = rule2.createBorderFormatting();
-        borderFmt.setBorderDiagonal(BorderStyle.MEDIUM);
-
-        CellRangeAddress [] regions = {
-            new CellRangeAddress(2, 4, 0, 0), // A3:A5
-        };
-        sheetCF.addConditionalFormatting(regions, rule1);
-        sheetCF.addConditionalFormatting(regions, rule2);
-
-        // This row-shift should destroy the CF region
-        sheet.shiftRows(10, 20, -9);
-        assertEquals(0, sheetCF.getNumConditionalFormattings());
-
-        // re-add the CF
-        sheetCF.addConditionalFormatting(regions, rule1);
-        sheetCF.addConditionalFormatting(regions, rule2);
-
-        // This row shift should only affect the formulas
-        sheet.shiftRows(14, 17, 8);
-        ConditionalFormatting cf1 = sheetCF.getConditionalFormattingAt(0);
-        assertEquals("SUM(A10:A23)", cf1.getRule(0).getFormula1());
-        assertEquals("1+SUM(B24:B30)", cf1.getRule(0).getFormula2());
-        ConditionalFormatting cf2 = sheetCF.getConditionalFormattingAt(1);
-        assertEquals("SUM(A10:A23)", cf2.getRule(0).getFormula1());
-        assertEquals("1+SUM(B24:B30)", cf2.getRule(0).getFormula2());
-
-        sheet.shiftRows(0, 8, 21);
-        cf1 = sheetCF.getConditionalFormattingAt(0);
-        assertEquals("SUM(A10:A21)", cf1.getRule(0).getFormula1());
-        assertEquals("1+SUM(#REF!)", cf1.getRule(0).getFormula2());
-        cf2 = sheetCF.getConditionalFormattingAt(1);
-        assertEquals("SUM(A10:A21)", cf2.getRule(0).getFormula1());
-        assertEquals("1+SUM(#REF!)", cf2.getRule(0).getFormula2());
-
-        wb.close();
-    }
-
-    protected void testRead(String filename) throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook(filename);
-        Sheet sh = wb.getSheet("CF");
-        SheetConditionalFormatting sheetCF = sh.getSheetConditionalFormatting();
-        assertEquals(3, sheetCF.getNumConditionalFormattings());
-
-        ConditionalFormatting cf1 = sheetCF.getConditionalFormattingAt(0);
-        assertEquals(2, cf1.getNumberOfRules());
-
-        CellRangeAddress[] regions1 = cf1.getFormattingRanges();
-        assertEquals(1, regions1.length);
-        assertEquals("A1:A8", regions1[0].formatAsString());
-
-        // CF1 has two rules: values less than -3 are bold-italic red, values greater than 3 are green
-        ConditionalFormattingRule rule1 = cf1.getRule(0);
-        assertEquals(ConditionType.CELL_VALUE_IS, rule1.getConditionType());
-        assertEquals(ComparisonOperator.GT, rule1.getComparisonOperation());
-        assertEquals("3", rule1.getFormula1());
-        assertNull(rule1.getFormula2());
-        // fills and borders are not set
-        assertNull(rule1.getPatternFormatting());
-        assertNull(rule1.getBorderFormatting());
-
-        FontFormatting fmt1 = rule1.getFontFormatting();
-//        assertEquals(IndexedColors.GREEN.index, fmt1.getFontColorIndex());
-        assertTrue(fmt1.isBold());
-        assertFalse(fmt1.isItalic());
-
-        ConditionalFormattingRule rule2 = cf1.getRule(1);
-        assertEquals(ConditionType.CELL_VALUE_IS, rule2.getConditionType());
-        assertEquals(ComparisonOperator.LT, rule2.getComparisonOperation());
-        assertEquals("-3", rule2.getFormula1());
-        assertNull(rule2.getFormula2());
-        assertNull(rule2.getPatternFormatting());
-        assertNull(rule2.getBorderFormatting());
-
-        FontFormatting fmt2 = rule2.getFontFormatting();
-//        assertEquals(IndexedColors.RED.index, fmt2.getFontColorIndex());
-        assertTrue(fmt2.isBold());
-        assertTrue(fmt2.isItalic());
-
-
-        ConditionalFormatting cf2 = sheetCF.getConditionalFormattingAt(1);
-        assertEquals(1, cf2.getNumberOfRules());
-        CellRangeAddress[] regions2 = cf2.getFormattingRanges();
-        assertEquals(1, regions2.length);
-        assertEquals("B9", regions2[0].formatAsString());
-
-        ConditionalFormattingRule rule3 = cf2.getRule(0);
-        assertEquals(ConditionType.FORMULA, rule3.getConditionType());
-        assertEquals(ComparisonOperator.NO_COMPARISON, rule3.getComparisonOperation());
-        assertEquals("$A$8>5", rule3.getFormula1());
-        assertNull(rule3.getFormula2());
-
-        FontFormatting fmt3 = rule3.getFontFormatting();
-//        assertEquals(IndexedColors.RED.index, fmt3.getFontColorIndex());
-        assertTrue(fmt3.isBold());
-        assertTrue(fmt3.isItalic());
-
-        PatternFormatting fmt4 = rule3.getPatternFormatting();
-//        assertEquals(IndexedColors.LIGHT_CORNFLOWER_BLUE.index, fmt4.getFillBackgroundColor());
-//        assertEquals(IndexedColors.AUTOMATIC.index, fmt4.getFillForegroundColor());
-        assertEquals(PatternFormatting.NO_FILL, fmt4.getFillPattern());
-        // borders are not set
-        assertNull(rule3.getBorderFormatting());
-
-        ConditionalFormatting cf3 = sheetCF.getConditionalFormattingAt(2);
-        CellRangeAddress[] regions3 = cf3.getFormattingRanges();
-        assertEquals(1, regions3.length);
-        assertEquals("B1:B7", regions3[0].formatAsString());
-        assertEquals(2, cf3.getNumberOfRules());
-
-        ConditionalFormattingRule rule4 = cf3.getRule(0);
-        assertEquals(ConditionType.CELL_VALUE_IS, rule4.getConditionType());
-        assertEquals(ComparisonOperator.LE, rule4.getComparisonOperation());
-        assertEquals("\"AAA\"", rule4.getFormula1());
-        assertNull(rule4.getFormula2());
-
-        ConditionalFormattingRule rule5 = cf3.getRule(1);
-        assertEquals(ConditionType.CELL_VALUE_IS, rule5.getConditionType());
-        assertEquals(ComparisonOperator.BETWEEN, rule5.getComparisonOperation());
-        assertEquals("\"A\"", rule5.getFormula1());
-        assertEquals("\"AAA\"", rule5.getFormula2());
-        
-        wb.close();
-    }
-
-    public void testReadOffice2007(String filename) throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook(filename);
-        Sheet s = wb.getSheet("CF");
-
-        // Sanity check data
-        assertEquals("Values", s.getRow(0).getCell(0).toString());
-        assertEquals("10.0", s.getRow(2).getCell(0).toString());
-
-        // Check we found all the conditional formatting rules we should have
-        SheetConditionalFormatting sheetCF = s.getSheetConditionalFormatting();
-        int numCF = 3;
-        int numCF12 = 15;
-        int numCFEX = 0; // TODO This should be 2, but we don't support CFEX formattings yet, see #58149
-        assertEquals(numCF+numCF12+numCFEX, sheetCF.getNumConditionalFormattings());
-        
-        int fCF = 0, fCF12 = 0, fCFEX = 0;
-        for (int i=0; i<sheetCF.getNumConditionalFormattings(); i++) {
-            ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(i);
-            if (cf instanceof HSSFConditionalFormatting) {
-                String str = cf.toString();
-                if (str.contains("[CF]")) fCF++;
-                if (str.contains("[CF12]")) fCF12++;
-                if (str.contains("[CFEX]")) fCFEX++;
-            } else {
-                ConditionType type = cf.getRule(cf.getNumberOfRules()-1).getConditionType();
-                if (type == ConditionType.CELL_VALUE_IS ||
-                    type == ConditionType.FORMULA) {
-                    fCF++;
-                } else {
-                    // TODO Properly detect Ext ones from the xml
-                    fCF12++;
-                }
-            }
-        }
-        assertEquals(numCF, fCF);
-        assertEquals(numCF12, fCF12);
-        assertEquals(numCFEX, fCFEX);
-        
-        
-        // Check the rules / values in detail
-        
-        
-        // Highlight Positive values - Column C
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("C2:C17", cf.getFormattingRanges()[0].formatAsString());
-        
-        assertEquals(1, cf.getNumberOfRules());
-        ConditionalFormattingRule cr = cf.getRule(0);
-        assertEquals(ConditionType.CELL_VALUE_IS, cr.getConditionType());
-        assertEquals(ComparisonOperator.GT, cr.getComparisonOperation());
-        assertEquals("0", cr.getFormula1());
-        assertEquals(null, cr.getFormula2());
-        // When it matches:
-        //   Sets the font colour to dark green
-        //   Sets the background colour to lighter green
-        // TODO Should the colours be slightly different between formats? Would CFEX support help for HSSF?
-        if (cr instanceof HSSFConditionalFormattingRule) {
-            assertColour("0:8080:0", cr.getFontFormatting().getFontColor());
-            assertColour("CCCC:FFFF:CCCC", cr.getPatternFormatting().getFillBackgroundColorColor());
-        } else {
-            assertColour("006100", cr.getFontFormatting().getFontColor());
-            assertColour("C6EFCE", cr.getPatternFormatting().getFillBackgroundColorColor());
-        }
-        
-        
-        // Highlight 10-30 - Column D
-        cf = sheetCF.getConditionalFormattingAt(1);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("D2:D17", cf.getFormattingRanges()[0].formatAsString());
-        
-        assertEquals(1, cf.getNumberOfRules());
-        cr = cf.getRule(0);
-        assertEquals(ConditionType.CELL_VALUE_IS, cr.getConditionType());
-        assertEquals(ComparisonOperator.BETWEEN, cr.getComparisonOperation());
-        assertEquals("10", cr.getFormula1());
-        assertEquals("30", cr.getFormula2());
-        // When it matches:
-        //   Sets the font colour to dark red
-        //   Sets the background colour to lighter red
-        // TODO Should the colours be slightly different between formats? Would CFEX support help for HSSF?
-        if (cr instanceof HSSFConditionalFormattingRule) {
-            assertColour("8080:0:8080", cr.getFontFormatting().getFontColor());
-            assertColour("FFFF:9999:CCCC", cr.getPatternFormatting().getFillBackgroundColorColor());
-        } else {
-            assertColour("9C0006", cr.getFontFormatting().getFontColor());
-            assertColour("FFC7CE", cr.getPatternFormatting().getFillBackgroundColorColor());
-        }
-
-        
-        // Data Bars - Column E
-        cf = sheetCF.getConditionalFormattingAt(2);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("E2:E17", cf.getFormattingRanges()[0].formatAsString());
-        assertDataBar(cf, "FF63C384");
-        
-        
-        // Colours Red->Yellow->Green - Column F
-        cf = sheetCF.getConditionalFormattingAt(3);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("F2:F17", cf.getFormattingRanges()[0].formatAsString());
-        assertColorScale(cf, "F8696B", "FFEB84", "63BE7B");
-
-        
-        // Colours Blue->White->Red - Column G
-        cf = sheetCF.getConditionalFormattingAt(4);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("G2:G17", cf.getFormattingRanges()[0].formatAsString());
-        assertColorScale(cf, "5A8AC6", "FCFCFF", "F8696B");
-
-        
-        // Icons : Default - Column H, percentage thresholds
-        cf = sheetCF.getConditionalFormattingAt(5);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("H2:H17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_TRAFFIC_LIGHTS, 0d, 33d, 67d);
-        
-        
-        // Icons : 3 signs - Column I
-        cf = sheetCF.getConditionalFormattingAt(6);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("I2:I17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_SHAPES, 0d, 33d, 67d);
-        
-        
-        // Icons : 3 traffic lights 2 - Column J
-        cf = sheetCF.getConditionalFormattingAt(7);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("J2:J17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_TRAFFIC_LIGHTS_BOX, 0d, 33d, 67d);
-        
-        
-        // Icons : 4 traffic lights - Column K
-        cf = sheetCF.getConditionalFormattingAt(8);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("K2:K17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYRB_4_TRAFFIC_LIGHTS, 0d, 25d, 50d, 75d);
-
-        
-        // Icons : 3 symbols with backgrounds - Column L
-        cf = sheetCF.getConditionalFormattingAt(9);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("L2:L17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_SYMBOLS_CIRCLE, 0d, 33d, 67d);
-
-        
-        // Icons : 3 flags - Column M2 Only
-        cf = sheetCF.getConditionalFormattingAt(10);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("M2", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_FLAGS, 0d, 33d, 67d);
-
-        // Icons : 3 flags - Column M (all)
-        cf = sheetCF.getConditionalFormattingAt(11);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("M2:M17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_FLAGS, 0d, 33d, 67d);
-
-        
-        // Icons : 3 symbols 2 (no background) - Column N
-        cf = sheetCF.getConditionalFormattingAt(12);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("N2:N17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_SYMBOLS, 0d, 33d, 67d);
-
-        
-        // Icons : 3 arrows - Column O
-        cf = sheetCF.getConditionalFormattingAt(13);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("O2:O17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GYR_3_ARROW, 0d, 33d, 67d);
-
-        
-        // Icons : 5 arrows grey - Column P    
-        cf = sheetCF.getConditionalFormattingAt(14);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("P2:P17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.GREY_5_ARROWS, 0d, 20d, 40d, 60d, 80d);
-
-        
-        // Icons : 3 stars (ext) - Column Q
-        // TODO Support EXT formattings
-
-        
-        // Icons : 4 ratings - Column R
-        cf = sheetCF.getConditionalFormattingAt(15);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("R2:R17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.RATINGS_4, 0d, 25d, 50d, 75d);
-
-        
-        // Icons : 5 ratings - Column S
-        cf = sheetCF.getConditionalFormattingAt(16);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("S2:S17", cf.getFormattingRanges()[0].formatAsString());
-        assertIconSetPercentages(cf, IconSet.RATINGS_5, 0d, 20d, 40d, 60d, 80d);
-
-        
-        // Custom Icon+Format - Column T
-        cf = sheetCF.getConditionalFormattingAt(17);
-        assertEquals(1, cf.getFormattingRanges().length);
-        assertEquals("T2:T17", cf.getFormattingRanges()[0].formatAsString());
-        
-        // TODO Support IconSet + Other CFs with 2 rules
-//        assertEquals(2, cf.getNumberOfRules());
-//        cr = cf.getRule(0);
-//        assertIconSetPercentages(cr, IconSet.GYR_3_TRAFFIC_LIGHTS_BOX, 0d, 33d, 67d);
-//        cr = cf.getRule(1);
-//        assertEquals(ConditionType.FORMULA, cr.getConditionType());
-//        assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());
-//        // TODO Why aren't these two the same between formats?
-//        if (cr instanceof HSSFConditionalFormattingRule) {
-//            assertEquals("MOD(ROW($T1),2)=1", cr.getFormula1());
-//        } else {
-//            assertEquals("MOD(ROW($T2),2)=1", cr.getFormula1());
-//        }
-//        assertEquals(null, cr.getFormula2());
-        
-        
-        // Mixed icons - Column U
-        // TODO Support EXT formattings
-        
-        wb.close();
-    }
-    
-    private void assertDataBar(ConditionalFormatting cf, String color) {
-        assertEquals(1, cf.getNumberOfRules());
-        ConditionalFormattingRule cr = cf.getRule(0);
-        assertDataBar(cr, color);
-    }
-    private void assertDataBar(ConditionalFormattingRule cr, String color) {
-        assertEquals(ConditionType.DATA_BAR, cr.getConditionType());
-        assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());
-        assertEquals(null, cr.getFormula1());
-        assertEquals(null, cr.getFormula2());
-        
-        DataBarFormatting databar = cr.getDataBarFormatting();
-        assertNotNull(databar);
-        assertEquals(false, databar.isIconOnly());
-        assertEquals(true, databar.isLeftToRight());
-        assertEquals(0, databar.getWidthMin());
-        assertEquals(100, databar.getWidthMax());
-        
-        assertColour(color, databar.getColor());
-        
-        ConditionalFormattingThreshold th;
-        th = databar.getMinThreshold();
-        assertEquals(RangeType.MIN, th.getRangeType());
-        assertEquals(null, th.getValue());
-        assertEquals(null, th.getFormula());
-        th = databar.getMaxThreshold();
-        assertEquals(RangeType.MAX, th.getRangeType());
-        assertEquals(null, th.getValue());
-        assertEquals(null, th.getFormula());
-    }
-    
-    private void assertIconSetPercentages(ConditionalFormatting cf, IconSet iconset, Double...vals) {
-        assertEquals(1, cf.getNumberOfRules());
-        ConditionalFormattingRule cr = cf.getRule(0);
-        assertIconSetPercentages(cr, iconset, vals);
-    }        
-    private void assertIconSetPercentages(ConditionalFormattingRule cr, IconSet iconset, Double...vals) {
-        assertEquals(ConditionType.ICON_SET, cr.getConditionType());
-        assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());
-        assertEquals(null, cr.getFormula1());
-        assertEquals(null, cr.getFormula2());
-        
-        IconMultiStateFormatting icon = cr.getMultiStateFormatting();
-        assertNotNull(icon);
-        assertEquals(iconset, icon.getIconSet());
-        assertEquals(false, icon.isIconOnly());
-        assertEquals(false, icon.isReversed());
-        
-        assertNotNull(icon.getThresholds());
-        assertEquals(vals.length, icon.getThresholds().length);
-        for (int i=0; i<vals.length; i++) {
-            Double v = vals[i];
-            ConditionalFormattingThreshold th = icon.getThresholds()[i];
-            assertEquals(RangeType.PERCENT, th.getRangeType());
-            assertEquals(v, th.getValue());
-            assertEquals(null, th.getFormula());
-        }
-    }
-    
-    private void assertColorScale(ConditionalFormatting cf, String... colors) {
-        assertEquals(1, cf.getNumberOfRules());
-        ConditionalFormattingRule cr = cf.getRule(0);
-        assertColorScale(cr, colors);
-    }        
-    private void assertColorScale(ConditionalFormattingRule cr, String... colors) {
-        assertEquals(ConditionType.COLOR_SCALE, cr.getConditionType());
-        assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());
-        assertEquals(null, cr.getFormula1());
-        assertEquals(null, cr.getFormula2());
-        
-        ColorScaleFormatting color = cr.getColorScaleFormatting();
-        assertNotNull(color);
-        assertNotNull(color.getColors());
-        assertNotNull(color.getThresholds());
-        assertEquals(colors.length, color.getNumControlPoints());
-        assertEquals(colors.length, color.getColors().length);
-        assertEquals(colors.length, color.getThresholds().length);
-        
-        // Thresholds should be Min / (evenly spaced) / Max
-        int steps = 100 / (colors.length-1);
-        for (int i=0; i<colors.length; i++) {
-            ConditionalFormattingThreshold th = color.getThresholds()[i];
-            if (i == 0) {
-                assertEquals(RangeType.MIN, th.getRangeType());
-            } else if (i == colors.length-1) {
-                assertEquals(RangeType.MAX, th.getRangeType());
-            } else {
-                assertEquals(RangeType.PERCENTILE, th.getRangeType());
-                assertEquals(steps*i, th.getValue().intValue());
-            }
-            assertEquals(null, th.getFormula());
-        }
-        
-        // Colors should match
-        for (int i=0; i<colors.length; i++) {
-            assertColour(colors[i], color.getColors()[i]);
-        }
-    }
-
-    @Test
-    public void testCreateFontFormatting() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(ComparisonOperator.EQUAL, "7");
-        FontFormatting fontFmt = rule1.createFontFormatting();
-        assertFalse(fontFmt.isItalic());
-        assertFalse(fontFmt.isBold());
-        fontFmt.setFontStyle(true, true);
-        assertTrue(fontFmt.isItalic());
-        assertTrue(fontFmt.isBold());
-
-        assertEquals(-1, fontFmt.getFontHeight()); // not modified
-        fontFmt.setFontHeight(200);
-        assertEquals(200, fontFmt.getFontHeight()); 
-        fontFmt.setFontHeight(100);
-        assertEquals(100, fontFmt.getFontHeight());
-
-        assertEquals(FontFormatting.SS_NONE, fontFmt.getEscapementType());
-        fontFmt.setEscapementType(FontFormatting.SS_SUB);
-        assertEquals(FontFormatting.SS_SUB, fontFmt.getEscapementType());
-        fontFmt.setEscapementType(FontFormatting.SS_NONE);
-        assertEquals(FontFormatting.SS_NONE, fontFmt.getEscapementType());
-        fontFmt.setEscapementType(FontFormatting.SS_SUPER);
-        assertEquals(FontFormatting.SS_SUPER, fontFmt.getEscapementType());
-
-        assertEquals(FontFormatting.U_NONE, fontFmt.getUnderlineType());
-        fontFmt.setUnderlineType(FontFormatting.U_SINGLE);
-        assertEquals(FontFormatting.U_SINGLE, fontFmt.getUnderlineType());
-        fontFmt.setUnderlineType(FontFormatting.U_NONE);
-        assertEquals(FontFormatting.U_NONE, fontFmt.getUnderlineType());
-        fontFmt.setUnderlineType(FontFormatting.U_DOUBLE);
-        assertEquals(FontFormatting.U_DOUBLE, fontFmt.getUnderlineType());
-
-        assertEquals(-1, fontFmt.getFontColorIndex());
-        fontFmt.setFontColorIndex(IndexedColors.RED.index);
-        assertEquals(IndexedColors.RED.index, fontFmt.getFontColorIndex());
-        fontFmt.setFontColorIndex(IndexedColors.AUTOMATIC.index);
-        assertEquals(IndexedColors.AUTOMATIC.index, fontFmt.getFontColorIndex());
-        fontFmt.setFontColorIndex(IndexedColors.BLUE.index);
-        assertEquals(IndexedColors.BLUE.index, fontFmt.getFontColorIndex());
-
-        ConditionalFormattingRule [] cfRules = { rule1 };
-
-        CellRangeAddress [] regions = { CellRangeAddress.valueOf("A1:A5") };
-
-        sheetCF.addConditionalFormatting(regions, cfRules);
-
-        // Verification
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertNotNull(cf);
-
-        assertEquals(1, cf.getNumberOfRules());
-
-        FontFormatting  r1fp = cf.getRule(0).getFontFormatting();
-        assertNotNull(r1fp);
-
-        assertTrue(r1fp.isItalic());
-        assertTrue(r1fp.isBold());
-        assertEquals(FontFormatting.SS_SUPER, r1fp.getEscapementType());
-        assertEquals(FontFormatting.U_DOUBLE, r1fp.getUnderlineType());
-        assertEquals(IndexedColors.BLUE.index, r1fp.getFontColorIndex());
-
-        workbook.close();
-    }
-
-    @Test
-    public void testCreatePatternFormatting() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(ComparisonOperator.EQUAL, "7");
-        PatternFormatting patternFmt = rule1.createPatternFormatting();
-
-        assertEquals(0, patternFmt.getFillBackgroundColor());
-        patternFmt.setFillBackgroundColor(IndexedColors.RED.index);
-        assertEquals(IndexedColors.RED.index, patternFmt.getFillBackgroundColor());
-
-        assertEquals(0, patternFmt.getFillForegroundColor());
-        patternFmt.setFillForegroundColor(IndexedColors.BLUE.index);
-        assertEquals(IndexedColors.BLUE.index, patternFmt.getFillForegroundColor());
-
-        assertEquals(PatternFormatting.NO_FILL, patternFmt.getFillPattern());
-        patternFmt.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-        assertEquals(PatternFormatting.SOLID_FOREGROUND, patternFmt.getFillPattern());
-        patternFmt.setFillPattern(PatternFormatting.NO_FILL);
-        assertEquals(PatternFormatting.NO_FILL, patternFmt.getFillPattern());
-        patternFmt.setFillPattern(PatternFormatting.BRICKS);
-        assertEquals(PatternFormatting.BRICKS, patternFmt.getFillPattern());
-
-        ConditionalFormattingRule [] cfRules = { rule1 };
-
-        CellRangeAddress [] regions = { CellRangeAddress.valueOf("A1:A5") };
-
-        sheetCF.addConditionalFormatting(regions, cfRules);
-
-        // Verification
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertNotNull(cf);
-
-        assertEquals(1, cf.getNumberOfRules());
-
-        PatternFormatting  r1fp = cf.getRule(0).getPatternFormatting();
-        assertNotNull(r1fp);
-
-        assertEquals(IndexedColors.RED.index, r1fp.getFillBackgroundColor());
-        assertEquals(IndexedColors.BLUE.index, r1fp.getFillForegroundColor());
-        assertEquals(PatternFormatting.BRICKS, r1fp.getFillPattern());
-        
-        workbook.close();
-    }
-    
-    @Test
-    public void testAllCreateBorderFormatting() throws IOException {
-        // Make sure it is possible to create a conditional formatting rule
-        // with every type of Border Style
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(ComparisonOperator.EQUAL, "7");
-        BorderFormatting borderFmt = rule1.createBorderFormatting();
-
-        for (BorderStyle border : BorderStyle.values()) {
-            borderFmt.setBorderTop(border);
-            assertEquals(border, borderFmt.getBorderTopEnum());
-
-            borderFmt.setBorderBottom(border);
-            assertEquals(border, borderFmt.getBorderBottomEnum());
-
-            borderFmt.setBorderLeft(border);
-            assertEquals(border, borderFmt.getBorderLeftEnum());
-
-            borderFmt.setBorderRight(border);
-            assertEquals(border, borderFmt.getBorderRightEnum());
-
-            borderFmt.setBorderDiagonal(border);
-            assertEquals(border, borderFmt.getBorderDiagonalEnum());
-        }
-
-        workbook.close();
-    }
-
-    @Test
-    public void testCreateBorderFormatting() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule1 = sheetCF.createConditionalFormattingRule(ComparisonOperator.EQUAL, "7");
-        BorderFormatting borderFmt = rule1.createBorderFormatting();
-
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderBottomEnum());
-        borderFmt.setBorderBottom(BorderStyle.DOTTED);
-        assertEquals(BorderStyle.DOTTED, borderFmt.getBorderBottomEnum());
-        borderFmt.setBorderBottom(BorderStyle.NONE);
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderBottomEnum());
-        borderFmt.setBorderBottom(BorderStyle.THICK);
-        assertEquals(BorderStyle.THICK, borderFmt.getBorderBottomEnum());
-
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderTopEnum());
-        borderFmt.setBorderTop(BorderStyle.DOTTED);
-        assertEquals(BorderStyle.DOTTED, borderFmt.getBorderTopEnum());
-        borderFmt.setBorderTop(BorderStyle.NONE);
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderTopEnum());
-        borderFmt.setBorderTop(BorderStyle.THICK);
-        assertEquals(BorderStyle.THICK, borderFmt.getBorderTopEnum());
-
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderLeftEnum());
-        borderFmt.setBorderLeft(BorderStyle.DOTTED);
-        assertEquals(BorderStyle.DOTTED, borderFmt.getBorderLeftEnum());
-        borderFmt.setBorderLeft(BorderStyle.NONE);
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderLeftEnum());
-        borderFmt.setBorderLeft(BorderStyle.THIN);
-        assertEquals(BorderStyle.THIN, borderFmt.getBorderLeftEnum());
-
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderRightEnum());
-        borderFmt.setBorderRight(BorderStyle.DOTTED);
-        assertEquals(BorderStyle.DOTTED, borderFmt.getBorderRightEnum());
-        borderFmt.setBorderRight(BorderStyle.NONE);
-        assertEquals(BorderStyle.NONE, borderFmt.getBorderRightEnum());
-        borderFmt.setBorderRight(BorderStyle.HAIR);
-        assertEquals(BorderStyle.HAIR, borderFmt.getBorderRightEnum());
-
-        ConditionalFormattingRule [] cfRules = { rule1 };
-
-        CellRangeAddress [] regions = { CellRangeAddress.valueOf("A1:A5") };
-
-        sheetCF.addConditionalFormatting(regions, cfRules);
-
-        // Verification
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertNotNull(cf);
-
-        assertEquals(1, cf.getNumberOfRules());
-
-        BorderFormatting  r1fp = cf.getRule(0).getBorderFormatting();
-        assertNotNull(r1fp);
-        assertEquals(BorderStyle.THICK, r1fp.getBorderBottomEnum());
-        assertEquals(BorderStyle.THICK, r1fp.getBorderTopEnum());
-        assertEquals(BorderStyle.THIN, r1fp.getBorderLeftEnum());
-        assertEquals(BorderStyle.HAIR, r1fp.getBorderRightEnum());
-        
-        workbook.close();
-    }
-    
-    @Test
-    public void testCreateIconFormatting() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-        ConditionalFormattingRule rule1 = 
-                sheetCF.createConditionalFormattingRule(IconSet.GYRB_4_TRAFFIC_LIGHTS);
-        IconMultiStateFormatting iconFmt = rule1.getMultiStateFormatting();
-        
-        assertEquals(IconSet.GYRB_4_TRAFFIC_LIGHTS, iconFmt.getIconSet());
-        assertEquals(4, iconFmt.getThresholds().length);
-        assertEquals(false, iconFmt.isIconOnly());
-        assertEquals(false, iconFmt.isReversed());
-        
-        iconFmt.setIconOnly(true);
-        iconFmt.getThresholds()[0].setRangeType(RangeType.MIN);
-        iconFmt.getThresholds()[1].setRangeType(RangeType.NUMBER);
-        iconFmt.getThresholds()[1].setValue(10d);
-        iconFmt.getThresholds()[2].setRangeType(RangeType.PERCENT);
-        iconFmt.getThresholds()[2].setValue(75d);
-        iconFmt.getThresholds()[3].setRangeType(RangeType.MAX);
-        
-        CellRangeAddress [] regions = { CellRangeAddress.valueOf("A1:A5") };
-        sheetCF.addConditionalFormatting(regions, rule1);
-
-        // Save, re-load and re-check
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        sheetCF = sheet.getSheetConditionalFormatting();
-        assertEquals(1, sheetCF.getNumConditionalFormattings());
-        
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertEquals(1, cf.getNumberOfRules());
-        rule1 = cf.getRule(0);
-        assertEquals(ConditionType.ICON_SET, rule1.getConditionType());
-        iconFmt = rule1.getMultiStateFormatting();
-        
-        assertEquals(IconSet.GYRB_4_TRAFFIC_LIGHTS, iconFmt.getIconSet());
-        assertEquals(4, iconFmt.getThresholds().length);
-        assertEquals(true, iconFmt.isIconOnly());
-        assertEquals(false, iconFmt.isReversed());
-
-        assertEquals(RangeType.MIN,    iconFmt.getThresholds()[0].getRangeType());
-        assertEquals(RangeType.NUMBER, iconFmt.getThresholds()[1].getRangeType());
-        assertEquals(RangeType.PERCENT,iconFmt.getThresholds()[2].getRangeType());
-        assertEquals(RangeType.MAX,    iconFmt.getThresholds()[3].getRangeType());
-        assertEquals(null, iconFmt.getThresholds()[0].getValue());
-        assertEquals(10d,  iconFmt.getThresholds()[1].getValue(), 0);
-        assertEquals(75d,  iconFmt.getThresholds()[2].getValue(), 0);
-        assertEquals(null, iconFmt.getThresholds()[3].getValue());
-        
-        wb2.close();
-    }
-    
-    @Test
-    public void testCreateColorScaleFormatting() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-        ConditionalFormattingRule rule1 = 
-                sheetCF.createConditionalFormattingColorScaleRule();
-        ColorScaleFormatting clrFmt = rule1.getColorScaleFormatting();
-        
-        assertEquals(3, clrFmt.getNumControlPoints());
-        assertEquals(3, clrFmt.getColors().length);
-        assertEquals(3, clrFmt.getThresholds().length);
-        
-        clrFmt.getThresholds()[0].setRangeType(RangeType.MIN);
-        clrFmt.getThresholds()[1].setRangeType(RangeType.NUMBER);
-        clrFmt.getThresholds()[1].setValue(10d);
-        clrFmt.getThresholds()[2].setRangeType(RangeType.MAX);
-        
-        CellRangeAddress [] regions = { CellRangeAddress.valueOf("A1:A5") };
-        sheetCF.addConditionalFormatting(regions, rule1);
-        
-        // Save, re-load and re-check
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        sheetCF = sheet.getSheetConditionalFormatting();
-        assertEquals(1, sheetCF.getNumConditionalFormattings());
-        
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertEquals(1, cf.getNumberOfRules());
-        rule1 = cf.getRule(0);
-        clrFmt = rule1.getColorScaleFormatting();
-        assertEquals(ConditionType.COLOR_SCALE, rule1.getConditionType());
-        
-        assertEquals(3, clrFmt.getNumControlPoints());
-        assertEquals(3, clrFmt.getColors().length);
-        assertEquals(3, clrFmt.getThresholds().length);
-
-        assertEquals(RangeType.MIN,    clrFmt.getThresholds()[0].getRangeType());
-        assertEquals(RangeType.NUMBER, clrFmt.getThresholds()[1].getRangeType());
-        assertEquals(RangeType.MAX,    clrFmt.getThresholds()[2].getRangeType());
-        assertEquals(null, clrFmt.getThresholds()[0].getValue());
-        assertEquals(10d,  clrFmt.getThresholds()[1].getValue(), 0);
-        assertEquals(null, clrFmt.getThresholds()[2].getValue());
-        
-        wb2.close();
-    }
-    
-    @Test
-    public void testCreateDataBarFormatting() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        String colorHex = "FFFFEB84";
-        ExtendedColor color = wb1.getCreationHelper().createExtendedColor();
-        color.setARGBHex(colorHex);
-        SheetConditionalFormatting sheetCF = sheet.getSheetConditionalFormatting();
-        ConditionalFormattingRule rule1 = 
-                sheetCF.createConditionalFormattingRule(color);
-        DataBarFormatting dbFmt = rule1.getDataBarFormatting();
-        
-        assertEquals(false, dbFmt.isIconOnly());
-        assertEquals(true, dbFmt.isLeftToRight());
-        assertEquals(0,   dbFmt.getWidthMin());
-        assertEquals(100, dbFmt.getWidthMax());
-        assertColour(colorHex, dbFmt.getColor());
-        
-        dbFmt.getMinThreshold().setRangeType(RangeType.MIN);
-        dbFmt.getMaxThreshold().setRangeType(RangeType.MAX);
-        
-        CellRangeAddress [] regions = { CellRangeAddress.valueOf("A1:A5") };
-        sheetCF.addConditionalFormatting(regions, rule1);
-        
-        // Save, re-load and re-check
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        sheetCF = sheet.getSheetConditionalFormatting();
-        assertEquals(1, sheetCF.getNumConditionalFormattings());
-        
-        ConditionalFormatting cf = sheetCF.getConditionalFormattingAt(0);
-        assertEquals(1, cf.getNumberOfRules());
-        rule1 = cf.getRule(0);
-        dbFmt = rule1.getDataBarFormatting();
-        assertEquals(ConditionType.DATA_BAR, rule1.getConditionType());
-        
-        assertEquals(false, dbFmt.isIconOnly());
-        assertEquals(true, dbFmt.isLeftToRight());
-        assertEquals(0,   dbFmt.getWidthMin());
-        assertEquals(100, dbFmt.getWidthMax());
-        assertColour(colorHex, dbFmt.getColor());
-
-        assertEquals(RangeType.MIN, dbFmt.getMinThreshold().getRangeType());
-        assertEquals(RangeType.MAX, dbFmt.getMaxThreshold().getRangeType());
-        assertEquals(null, dbFmt.getMinThreshold().getValue());
-        assertEquals(null, dbFmt.getMaxThreshold().getValue());
-        
-        wb2.close();
-    }
-    
-    @Test
-    public void testBug55380() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        CellRangeAddress[] ranges = new CellRangeAddress[] {
-            CellRangeAddress.valueOf("C9:D30"), CellRangeAddress.valueOf("C7:C31")
-        };
-        ConditionalFormattingRule rule = sheet.getSheetConditionalFormatting().createConditionalFormattingRule("$A$1>0");
-        sheet.getSheetConditionalFormatting().addConditionalFormatting(ranges, rule);
-        wb.close();
-    }
-
-    @Test
-    public void testSetCellRangeAddresswithSingleRange() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        final Sheet sheet = wb.createSheet("S1");
-        final SheetConditionalFormatting cf = sheet.getSheetConditionalFormatting();
-        assertEquals(0, cf.getNumConditionalFormattings());
-        ConditionalFormattingRule rule1 = cf.createConditionalFormattingRule("$A$1>0");
-        cf.addConditionalFormatting(new CellRangeAddress[] {
-                CellRangeAddress.valueOf("A1:A5")
-        }, rule1);
-
-        assertEquals(1, cf.getNumConditionalFormattings());
-        ConditionalFormatting readCf = cf.getConditionalFormattingAt(0);
-        CellRangeAddress[] formattingRanges = readCf.getFormattingRanges();
-        assertEquals(1, formattingRanges.length);
-        CellRangeAddress formattingRange = formattingRanges[0];
-        assertEquals("A1:A5", formattingRange.formatAsString());
-
-        readCf.setFormattingRanges(new CellRangeAddress[] {
-                CellRangeAddress.valueOf("A1:A6")
-        });
-
-        readCf = cf.getConditionalFormattingAt(0);
-        formattingRanges = readCf.getFormattingRanges();
-        assertEquals(1, formattingRanges.length);
-        formattingRange = formattingRanges[0];
-        assertEquals("A1:A6", formattingRange.formatAsString());
-    }
-
-    @Test
-    public void testSetCellRangeAddressWithMultipleRanges() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        final Sheet sheet = wb.createSheet("S1");
-        final SheetConditionalFormatting cf = sheet.getSheetConditionalFormatting();
-        assertEquals(0, cf.getNumConditionalFormattings());
-        ConditionalFormattingRule rule1 = cf.createConditionalFormattingRule("$A$1>0");
-        cf.addConditionalFormatting(new CellRangeAddress[] {
-                CellRangeAddress.valueOf("A1:A5")
-        }, rule1);
-
-        assertEquals(1, cf.getNumConditionalFormattings());
-        ConditionalFormatting readCf = cf.getConditionalFormattingAt(0);
-        CellRangeAddress[] formattingRanges = readCf.getFormattingRanges();
-        assertEquals(1, formattingRanges.length);
-        CellRangeAddress formattingRange = formattingRanges[0];
-        assertEquals("A1:A5", formattingRange.formatAsString());
-
-        readCf.setFormattingRanges(new CellRangeAddress[] {
-                CellRangeAddress.valueOf("A1:A6"),
-                CellRangeAddress.valueOf("B1:B6")
-        });
-
-        readCf = cf.getConditionalFormattingAt(0);
-        formattingRanges = readCf.getFormattingRanges();
-        assertEquals(2, formattingRanges.length);
-        formattingRange = formattingRanges[0];
-        assertEquals("A1:A6", formattingRange.formatAsString());
-        formattingRange = formattingRanges[1];
-        assertEquals("B1:B6", formattingRange.formatAsString());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetCellRangeAddressWithNullRanges() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        final Sheet sheet = wb.createSheet("S1");
-        final SheetConditionalFormatting cf = sheet.getSheetConditionalFormatting();
-        assertEquals(0, cf.getNumConditionalFormattings());
-        ConditionalFormattingRule rule1 = cf.createConditionalFormattingRule("$A$1>0");
-        cf.addConditionalFormatting(new CellRangeAddress[] {
-                CellRangeAddress.valueOf("A1:A5")
-        }, rule1);
-
-        assertEquals(1, cf.getNumConditionalFormattings());
-        ConditionalFormatting readCf = cf.getConditionalFormattingAt(0);
-        readCf.setFormattingRanges(null);
-    }
-
-
-    @SuppressWarnings("deprecation")
-    @Test
-    public void test52122() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("Conditional Formatting Test");
-        sheet.setColumnWidth(0, 256 * 10);
-        sheet.setColumnWidth(1, 256 * 10);
-        sheet.setColumnWidth(2, 256 * 10);
-
-        // Create some content.
-        // row 0
-        Row row = sheet.createRow(0);
-
-        Cell cell0 = row.createCell(0);
-        cell0.setCellType(CellType.NUMERIC);
-        cell0.setCellValue(100);
-
-        Cell cell1 = row.createCell(1);
-        cell1.setCellType(CellType.NUMERIC);
-        cell1.setCellValue(120);
-
-        Cell cell2 = row.createCell(2);
-        cell2.setCellType(CellType.NUMERIC);
-        cell2.setCellValue(130);
-
-        // row 1
-        row = sheet.createRow(1);
-
-        cell0 = row.createCell(0);
-        cell0.setCellType(CellType.NUMERIC);
-        cell0.setCellValue(200);
-
-        cell1 = row.createCell(1);
-        cell1.setCellType(CellType.NUMERIC);
-        cell1.setCellValue(220);
-
-        cell2 = row.createCell(2);
-        cell2.setCellType(CellType.NUMERIC);
-        cell2.setCellValue(230);
-
-        // row 2
-        row = sheet.createRow(2);
-
-        cell0 = row.createCell(0);
-        cell0.setCellType(CellType.NUMERIC);
-        cell0.setCellValue(300);
-
-        cell1 = row.createCell(1);
-        cell1.setCellType(CellType.NUMERIC);
-        cell1.setCellValue(320);
-
-        cell2 = row.createCell(2);
-        cell2.setCellType(CellType.NUMERIC);
-        cell2.setCellValue(330);
-
-        // Create conditional formatting, CELL1 should be yellow if CELL0 is not blank.
-        SheetConditionalFormatting formatting = sheet.getSheetConditionalFormatting();
-
-        ConditionalFormattingRule rule = formatting.createConditionalFormattingRule("$A$1>75");
-
-        PatternFormatting pattern = rule.createPatternFormatting();
-        pattern.setFillBackgroundColor(IndexedColors.BLUE.index);
-        pattern.setFillPattern(PatternFormatting.SOLID_FOREGROUND);
-
-        CellRangeAddress[] range = {CellRangeAddress.valueOf("B2:C2")};
-        CellRangeAddress[] range2 = {CellRangeAddress.valueOf("B1:C1")};
-
-        formatting.addConditionalFormatting(range, rule);
-        formatting.addConditionalFormatting(range2, rule);
-
-        // Write file.
-        /*FileOutputStream fos = new FileOutputStream("c:\\temp\\52122_conditional-sheet.xls");
-        try {
-            workbook.write(fos);
-        } finally {
-            fos.close();
-        }*/
-
-        Workbook wbBack = _testDataProvider.writeOutAndReadBack(workbook);
-        Sheet sheetBack = wbBack.getSheetAt(0);
-        final SheetConditionalFormatting sheetConditionalFormattingBack = sheetBack.getSheetConditionalFormatting();
-        assertNotNull(sheetConditionalFormattingBack);
-        final ConditionalFormatting formattingBack = sheetConditionalFormattingBack.getConditionalFormattingAt(0);
-        assertNotNull(formattingBack);
-        final ConditionalFormattingRule ruleBack = formattingBack.getRule(0);
-        assertNotNull(ruleBack);
-        final PatternFormatting patternFormattingBack1 = ruleBack.getPatternFormatting();
-        assertNotNull(patternFormattingBack1);
-        assertEquals(IndexedColors.BLUE.index, patternFormattingBack1.getFillBackgroundColor());
-        assertEquals(PatternFormatting.SOLID_FOREGROUND, patternFormattingBack1.getFillPattern());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
deleted file mode 100644
index 70ba300..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.junit.Test;
-
-/**
- * Tests of implementation of {@link DataFormat}
- *
- */
-public abstract class BaseTestDataFormat {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestDataFormat(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    public void assertNotBuiltInFormat(String customFmt) {
-        //check it is not in built-in formats
-        assertEquals(-1, BuiltinFormats.getBuiltinFormat(customFmt));
-    }
-
-    @Test
-    public final void testBuiltinFormats() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        DataFormat df = wb.createDataFormat();
-
-        String[] formats = BuiltinFormats.getAll();
-        for (int idx = 0; idx < formats.length; idx++) {
-            String fmt = formats[idx];
-            assertEquals(idx, df.getFormat(fmt));
-        }
-
-        //default format for new cells is General
-        Sheet sheet = wb.createSheet();
-        Cell cell = sheet.createRow(0).createCell(0);
-        assertEquals(0, cell.getCellStyle().getDataFormat());
-        assertEquals("General", cell.getCellStyle().getDataFormatString());
-
-        //create a custom data format
-        String customFmt = "#0.00 AM/PM";
-        //check it is not in built-in formats
-        assertNotBuiltInFormat(customFmt);
-        int customIdx = df.getFormat(customFmt);
-        //The first user-defined format starts at 164.
-        assertTrue(customIdx >= BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX);
-        //read and verify the string representation
-        assertEquals(customFmt, df.getFormat((short)customIdx));
-
-        wb.close();
-    }
-
-    /**
-     * [Bug 49928] formatCellValue returns incorrect value for \u00a3 formatted cells
-     */
-    @Test
-    public abstract void test49928() throws IOException;
-    protected final static String poundFmt = "\"\u00a3\"#,##0;[Red]\\-\"\u00a3\"#,##0";
-    public void doTest49928Core(Workbook wb){
-        DataFormatter df = new DataFormatter();
-
-        Sheet sheet = wb.getSheetAt(0);
-        Cell cell = sheet.getRow(0).getCell(0);
-        CellStyle style = cell.getCellStyle();
-
-        // not expected normally, id of a custom format should be greater
-        // than BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX
-        short  poundFmtIdx = 6;
-
-        assertEquals(poundFmt, style.getDataFormatString());
-        assertEquals(poundFmtIdx, style.getDataFormat());
-        assertEquals("\u00a31", df.formatCellValue(cell));
-
-
-        DataFormat dataFormat = wb.createDataFormat();
-        assertEquals(poundFmtIdx, dataFormat.getFormat(poundFmt));
-        assertEquals(poundFmt, dataFormat.getFormat(poundFmtIdx));
-    }
-
-    @Test
-    public void testReadbackFormat() throws IOException {
-        readbackFormat("built-in format", "0.00");
-        readbackFormat("overridden built-in format", poundFmt);
-
-        String customFormat = "#0.00 AM/PM";
-        assertNotBuiltInFormat(customFormat);
-        readbackFormat("custom format", customFormat);
-    }
-
-    private void readbackFormat(String msg, String fmt) throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
-            DataFormat dataFormat = wb.createDataFormat();
-            short fmtIdx = dataFormat.getFormat(fmt);
-            String readbackFmt = dataFormat.getFormat(fmtIdx);
-            assertEquals(msg, fmt, readbackFmt);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public abstract void test58532() throws IOException;
-    public void doTest58532Core(Workbook wb) {
-        Sheet s = wb.getSheetAt(0);
-        DataFormatter fmt = new DataFormatter();
-        FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator();
-
-        // Column A is the raw values
-        // Column B is the ##/#K/#M values
-        // Column C is strings of what they should look like
-        // Column D is the #.##/#.#K/#.#M values
-        // Column E is strings of what they should look like
-
-        String formatKMWhole = "[>999999]#,,\"M\";[>999]#,\"K\";#";
-        String formatKM3dp = "[>999999]#.000,,\"M\";[>999]#.000,\"K\";#.000";
-
-        // Check the formats are as expected
-        Row headers = s.getRow(0);
-        assertNotNull(headers);
-        assertEquals(formatKMWhole, headers.getCell(1).getStringCellValue());
-        assertEquals(formatKM3dp, headers.getCell(3).getStringCellValue());
-
-        Row r2 = s.getRow(1);
-        assertNotNull(r2);
-        assertEquals(formatKMWhole, r2.getCell(1).getCellStyle().getDataFormatString());
-        assertEquals(formatKM3dp, r2.getCell(3).getCellStyle().getDataFormatString());
-
-        // For all of the contents rows, check that DataFormatter is able
-        //  to format the cells to the same value as the one next to it
-        for (int rn=1; rn<s.getLastRowNum(); rn++) {
-            Row r = s.getRow(rn);
-            if (r == null) break;
-
-            double value = r.getCell(0).getNumericCellValue();
-
-            String expWhole = r.getCell(2).getStringCellValue();
-            String exp3dp   = r.getCell(4).getStringCellValue();
-
-            assertEquals("Wrong formatting of " + value + " for row " + rn,
-                         expWhole, fmt.formatCellValue(r.getCell(1), eval));
-            assertEquals("Wrong formatting of " + value + " for row " + rn,
-                         exp3dp, fmt.formatCellValue(r.getCell(3), eval));
-        }
-    }
-
-    /**
-     * Localized accountancy formats
-     */
-    @Test
-    public final void test58536() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        DataFormatter formatter = new DataFormatter();
-        DataFormat fmt = wb.createDataFormat();
-        Sheet sheet = wb.createSheet();
-        Row r = sheet.createRow(0);
-
-        char pound = '\u00A3';
-        String formatUK  = "_-[$"+pound+"-809]* #,##0_-;\\-[$"+pound+"-809]* #,##0_-;_-[$"+pound+"-809]* \"-\"??_-;_-@_-";
-
-        CellStyle cs = wb.createCellStyle();
-        cs.setDataFormat(fmt.getFormat(formatUK));
-
-        Cell pve = r.createCell(0);
-        pve.setCellValue(12345);
-        pve.setCellStyle(cs);
-
-        Cell nve = r.createCell(1);
-        nve.setCellValue(-12345);
-        nve.setCellStyle(cs);
-
-        Cell zero = r.createCell(2);
-        zero.setCellValue(0);
-        zero.setCellStyle(cs);
-
-        assertEquals(pound+"   12,345", formatter.formatCellValue(pve));
-        assertEquals("-"+pound+"   12,345", formatter.formatCellValue(nve));
-        // TODO Fix this to not have an extra 0 at the end
-        //assertEquals(pound+"   -  ", formatter.formatCellValue(zero));
-        
-        wb.close();
-    }
-
-    /**
-     * Using a single quote (') instead of a comma (,) as
-     *  a number separator, eg 1000 -> 1'000
-     */
-    @Test
-    public final void test55265() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        DataFormatter formatter = new DataFormatter();
-        DataFormat fmt = wb.createDataFormat();
-        Sheet sheet = wb.createSheet();
-        Row r = sheet.createRow(0);
-
-        CellStyle cs = wb.createCellStyle();
-        cs.setDataFormat(fmt.getFormat("#'##0"));
-
-        Cell zero = r.createCell(0);
-        zero.setCellValue(0);
-        zero.setCellStyle(cs);
-
-        Cell sml = r.createCell(1);
-        sml.setCellValue(12);
-        sml.setCellStyle(cs);
-
-        Cell med = r.createCell(2);
-        med.setCellValue(1234);
-        med.setCellStyle(cs);
-
-        Cell lge = r.createCell(3);
-        lge.setCellValue(12345678);
-        lge.setCellStyle(cs);
-
-        assertEquals("0", formatter.formatCellValue(zero));
-        assertEquals("12", formatter.formatCellValue(sml));
-        assertEquals("1'234", formatter.formatCellValue(med));
-        assertEquals("12'345'678", formatter.formatCellValue(lge));
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
deleted file mode 100644
index 5b8bdc8..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.usermodel.DataValidation.ErrorStyle;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.OperatorType;
-import org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-import org.junit.Test;
-
-/**
- * Class for testing Excel's data validation mechanism
- *
- * @author Dragos Buleandra ( dragos.buleandra@trade2b.ro )
- */
-public abstract class BaseTestDataValidation {
-    private final ITestDataProvider _testDataProvider;
-
-    private static final POILogger log = POILogFactory.getLogger(BaseTestDataValidation.class);
-
-    protected BaseTestDataValidation(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-	/** Convenient access to ERROR_STYLE constants */
-	protected static final DataValidation.ErrorStyle ES = null;
-	/** Convenient access to OPERATOR constants */
-	protected static final DataValidationConstraint.ValidationType VT = null;
-	/** Convenient access to OPERATOR constants */
-	protected static final DataValidationConstraint.OperatorType OP = null;
-
-	private static final class ValidationAdder {
-
-		private final CellStyle _style_1;
-		private final CellStyle _style_2;
-		private  final int _validationType;
-		private final Sheet _sheet;
-		private int _currentRowIndex;
-		private final CellStyle _cellStyle;
-
-		public ValidationAdder(Sheet fSheet, CellStyle style_1, CellStyle style_2,
-				CellStyle cellStyle, int validationType) {
-			_sheet = fSheet;
-			_style_1 = style_1;
-			_style_2 = style_2;
-			_cellStyle = cellStyle;
-			_validationType = validationType;
-			_currentRowIndex = fSheet.getPhysicalNumberOfRows();
-		}
-		public void addValidation(int operatorType, String firstFormula, String secondFormula,
-				int errorStyle, String ruleDescr, String promptDescr,
-				boolean allowEmpty, boolean inputBox, boolean errorBox) {
-			String[] explicitListValues = null;
-
-			addValidationInternal(operatorType, firstFormula, secondFormula, errorStyle, ruleDescr,
-					promptDescr, allowEmpty, inputBox, errorBox, true,
-					explicitListValues);
-		}
-
-		private void addValidationInternal(int operatorType, String firstFormula,
-				String secondFormula, int errorStyle, String ruleDescr, String promptDescr,
-				boolean allowEmpty, boolean inputBox, boolean errorBox, boolean suppressDropDown,
-				String[] explicitListValues) {
-			int rowNum = _currentRowIndex++;
-
-			DataValidationHelper dataValidationHelper = _sheet.getDataValidationHelper();
-			DataValidationConstraint dc = createConstraint(dataValidationHelper,operatorType, firstFormula, secondFormula, explicitListValues);
-
-			DataValidation dv = dataValidationHelper.createValidation(dc,new CellRangeAddressList(rowNum, rowNum, 0, 0));
-
-			dv.setEmptyCellAllowed(allowEmpty);
-			dv.setErrorStyle(errorStyle);
-			dv.createErrorBox("Invalid Input", "Something is wrong - check condition!");
-			dv.createPromptBox("Validated Cell", "Allowable values have been restricted");
-
-			dv.setShowPromptBox(inputBox);
-			dv.setShowErrorBox(errorBox);
-			dv.setSuppressDropDownArrow(suppressDropDown);
-
-
-			_sheet.addValidationData(dv);
-			writeDataValidationSettings(_sheet, _style_1, _style_2, ruleDescr, allowEmpty,
-					inputBox, errorBox);
-			if (_cellStyle != null) {
-				Row row = _sheet.getRow(_sheet.getPhysicalNumberOfRows() - 1);
-				Cell cell = row.createCell(0);
-				cell.setCellStyle(_cellStyle);
-			}
-			writeOtherSettings(_sheet, _style_1, promptDescr);
-		}
-		private DataValidationConstraint createConstraint(DataValidationHelper dataValidationHelper,int operatorType, String firstFormula,
-				String secondFormula, String[] explicitListValues) {
-			if (_validationType == ValidationType.LIST) {
-				if (explicitListValues != null) {
-					return dataValidationHelper.createExplicitListConstraint(explicitListValues);
-				}
-				return dataValidationHelper.createFormulaListConstraint(firstFormula);
-			}
-			if (_validationType == ValidationType.TIME) {
-				return dataValidationHelper.createTimeConstraint(operatorType, firstFormula, secondFormula);
-			}
-			if (_validationType == ValidationType.DATE) {
-				return dataValidationHelper.createDateConstraint(operatorType, firstFormula, secondFormula, null);
-			}
-			if (_validationType == ValidationType.FORMULA) {
-				return dataValidationHelper.createCustomConstraint(firstFormula);
-			}
-
-			if( _validationType == ValidationType.INTEGER) {
-				return dataValidationHelper.createIntegerConstraint(operatorType, firstFormula, secondFormula);
-			}
-			if( _validationType == ValidationType.DECIMAL) {
-				return dataValidationHelper.createDecimalConstraint(operatorType, firstFormula, secondFormula);
-			}
-			if( _validationType == ValidationType.TEXT_LENGTH) {
-				return dataValidationHelper.createTextLengthConstraint(operatorType, firstFormula, secondFormula);
-			}
-			return null;
-		}
-		/**
-		 * writes plain text values into cells in a tabular format to form comments readable from within
-		 * the spreadsheet.
-		 */
-		private static void writeDataValidationSettings(Sheet sheet, CellStyle style_1,
-				CellStyle style_2, String strCondition, boolean allowEmpty, boolean inputBox,
-				boolean errorBox) {
-			Row row = sheet.createRow(sheet.getPhysicalNumberOfRows());
-			// condition's string
-			Cell cell = row.createCell(1);
-			cell.setCellStyle(style_1);
-			setCellValue(cell, strCondition);
-			// allow empty cells
-			cell = row.createCell(2);
-			cell.setCellStyle(style_2);
-			setCellValue(cell, ((allowEmpty) ? "yes" : "no"));
-			// show input box
-			cell = row.createCell(3);
-			cell.setCellStyle(style_2);
-			setCellValue(cell, ((inputBox) ? "yes" : "no"));
-			// show error box
-			cell = row.createCell(4);
-			cell.setCellStyle(style_2);
-			setCellValue(cell, ((errorBox) ? "yes" : "no"));
-		}
-		private static void writeOtherSettings(Sheet sheet, CellStyle style,
-				String strStettings) {
-			Row row = sheet.getRow(sheet.getPhysicalNumberOfRows() - 1);
-			Cell cell = row.createCell(5);
-			cell.setCellStyle(style);
-			setCellValue(cell, strStettings);
-		}
-		public void addListValidation(String[] explicitListValues, String listFormula, String listValsDescr,
-				boolean allowEmpty, boolean suppressDropDown) {
-			String promptDescr = (allowEmpty ? "empty ok" : "not empty")
-					+ ", " + (suppressDropDown ? "no drop-down" : "drop-down");
-			addValidationInternal(ValidationType.LIST, listFormula, null, ErrorStyle.STOP, listValsDescr, promptDescr,
-					allowEmpty, false, true, suppressDropDown, explicitListValues);
-		}
-	}
-
-    private static void log(String msg) {
-        log.log(POILogger.INFO, msg);
-    }
-
-	/**
-	 * Manages the cell styles used for formatting the output spreadsheet
-	 */
-	private static final class WorkbookFormatter {
-
-		private final Workbook _wb;
-		private final CellStyle _style_1;
-		private final CellStyle _style_2;
-		private final CellStyle _style_3;
-		private final CellStyle _style_4;
-		private Sheet _currentSheet;
-
-		public WorkbookFormatter(Workbook wb) {
-			_wb = wb;
-			_style_1 = createStyle( wb, HorizontalAlignment.LEFT );
-			_style_2 = createStyle( wb, HorizontalAlignment.CENTER );
-			_style_3 = createStyle( wb, HorizontalAlignment.CENTER, IndexedColors.GREY_25_PERCENT.getIndex(), true );
-			_style_4 = createHeaderStyle(wb);
-		}
-
-		private static CellStyle createStyle(Workbook wb, HorizontalAlignment h_align, short color,
-				boolean bold) {
-			Font font = wb.createFont();
-			if (bold) {
-				font.setBold(true);
-			}
-
-			CellStyle cellStyle = wb.createCellStyle();
-			cellStyle.setFont(font);
-			cellStyle.setFillForegroundColor(color);
-			cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-			cellStyle.setAlignment(h_align);
-			cellStyle.setBorderLeft(BorderStyle.THIN);
-			cellStyle.setLeftBorderColor(IndexedColors.BLACK.getIndex());
-			cellStyle.setBorderTop(BorderStyle.THIN);
-			cellStyle.setTopBorderColor(IndexedColors.BLACK.getIndex());
-			cellStyle.setBorderRight(BorderStyle.THIN);
-			cellStyle.setRightBorderColor(IndexedColors.BLACK.getIndex());
-			cellStyle.setBorderBottom(BorderStyle.THIN);
-			cellStyle.setBottomBorderColor(IndexedColors.BLACK.getIndex());
-
-			return cellStyle;
-		}
-
-		private static CellStyle createStyle(Workbook wb, HorizontalAlignment h_align) {
-			return createStyle(wb, h_align, IndexedColors.WHITE.getIndex(), false);
-		}
-		private static CellStyle createHeaderStyle(Workbook wb) {
-			Font font = wb.createFont();
-			font.setColor( IndexedColors.WHITE.getIndex() );
-			font.setBold(true);
-
-			CellStyle cellStyle = wb.createCellStyle();
-			cellStyle.setFillForegroundColor(IndexedColors.BLUE_GREY.getIndex());
-			cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-			cellStyle.setAlignment(HorizontalAlignment.CENTER);
-			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-			cellStyle.setBorderLeft(BorderStyle.THIN);
-			cellStyle.setLeftBorderColor(IndexedColors.WHITE.getIndex());
-			cellStyle.setBorderTop(BorderStyle.THIN);
-			cellStyle.setTopBorderColor(IndexedColors.WHITE.getIndex());
-			cellStyle.setBorderRight(BorderStyle.THIN);
-			cellStyle.setRightBorderColor(IndexedColors.WHITE.getIndex());
-			cellStyle.setBorderBottom(BorderStyle.THIN);
-			cellStyle.setBottomBorderColor(IndexedColors.WHITE.getIndex());
-			cellStyle.setFont(font);
-			return cellStyle;
-		}
-
-
-		public Sheet createSheet(String sheetName) {
-			_currentSheet = _wb.createSheet(sheetName);
-			return _currentSheet;
-		}
-		public void createDVTypeRow(String strTypeDescription) {
-			Sheet sheet = _currentSheet;
-			Row row = sheet.createRow(sheet.getPhysicalNumberOfRows());
-			sheet.addMergedRegion(new CellRangeAddress(sheet.getPhysicalNumberOfRows()-1, sheet.getPhysicalNumberOfRows()-1, 0, 5));
-			Cell cell = row.createCell(0);
-			setCellValue(cell, strTypeDescription);
-			cell.setCellStyle(_style_3);
-			row = sheet.createRow(sheet.getPhysicalNumberOfRows());
-		}
-
-		public void createHeaderRow() {
-			Sheet sheet = _currentSheet;
-			Row row = sheet.createRow(sheet.getPhysicalNumberOfRows());
-			row.setHeight((short) 400);
-			for (int i = 0; i < 6; i++) {
-				row.createCell(i).setCellStyle(_style_4);
-				if (i == 2 || i == 3 || i == 4) {
-					sheet.setColumnWidth(i, 3500);
-				} else if (i == 5) {
-					sheet.setColumnWidth(i, 10000);
-				} else {
-					sheet.setColumnWidth(i, 8000);
-				}
-			}
-			Cell cell = row.getCell(0);
-			setCellValue(cell, "Data validation cells");
-			cell = row.getCell(1);
-			setCellValue(cell, "Condition");
-			cell = row.getCell(2);
-			setCellValue(cell, "Allow blank");
-			cell = row.getCell(3);
-			setCellValue(cell, "Prompt box");
-			cell = row.getCell(4);
-			setCellValue(cell, "Error box");
-			cell = row.getCell(5);
-			setCellValue(cell, "Other settings");
-		}
-
-		public ValidationAdder createValidationAdder(CellStyle cellStyle, int dataValidationType) {
-			return new ValidationAdder(_currentSheet, _style_1, _style_2, cellStyle, dataValidationType);
-		}
-
-		public void createDVDescriptionRow(String strTypeDescription) {
-			Sheet sheet = _currentSheet;
-			Row row = sheet.getRow(sheet.getPhysicalNumberOfRows()-1);
-			sheet.addMergedRegion(new CellRangeAddress(sheet.getPhysicalNumberOfRows()-1, sheet.getPhysicalNumberOfRows()-1, 0, 5));
-			Cell cell = row.createCell(0);
-			setCellValue(cell, strTypeDescription);
-			cell.setCellStyle(_style_3);
-			row = sheet.createRow(sheet.getPhysicalNumberOfRows());
-		}
-	}
-
-
-	private void addCustomValidations(WorkbookFormatter wf) {
-		wf.createSheet("Custom");
-		wf.createHeaderRow();
-
-		ValidationAdder va = wf.createValidationAdder(null, ValidationType.FORMULA);
-		va.addValidation(OperatorType.BETWEEN, "ISNUMBER($A2)", null, ErrorStyle.STOP, "ISNUMBER(A2)", "Error box type = STOP", true, true, true);
-		va.addValidation(OperatorType.BETWEEN, "IF(SUM(A2:A3)=5,TRUE,FALSE)", null, ErrorStyle.WARNING, "IF(SUM(A2:A3)=5,TRUE,FALSE)", "Error box type = WARNING", false, false, true);
-	}
-
-	private static void addSimpleNumericValidations(WorkbookFormatter wf) {
-		// data validation's number types
-		wf.createSheet("Numbers");
-
-		// "Whole number" validation type
-		wf.createDVTypeRow("Whole number");
-		wf.createHeaderRow();
-
-		ValidationAdder va = wf.createValidationAdder(null, ValidationType.INTEGER);
-		va.addValidation(OperatorType.BETWEEN, "2", "6", ErrorStyle.STOP, "Between 2 and 6 ", "Error box type = STOP", true, true, true);
-		va.addValidation(OperatorType.NOT_BETWEEN, "2", "6", ErrorStyle.INFO, "Not between 2 and 6 ", "Error box type = INFO", false, true, true);
-		va.addValidation(OperatorType.EQUAL, "=3+2", null, ErrorStyle.WARNING, "Equal to (3+2)", "Error box type = WARNING", false, false, true);
-		va.addValidation(OperatorType.NOT_EQUAL, "3", null, ErrorStyle.WARNING, "Not equal to 3", "-", false, false, false);
-		va.addValidation(OperatorType.GREATER_THAN, "3", null, ErrorStyle.WARNING, "Greater than 3", "-", true, false, false);
-		va.addValidation(OperatorType.LESS_THAN, "3", null, ErrorStyle.WARNING, "Less than 3", "-", true, true, false);
-		va.addValidation(OperatorType.GREATER_OR_EQUAL, "4", null, ErrorStyle.STOP, "Greater than or equal to 4", "Error box type = STOP", true, false, true);
-		va.addValidation(OperatorType.LESS_OR_EQUAL, "4", null, ErrorStyle.STOP, "Less than or equal to 4", "-", false, true, false);
-
-		// "Decimal" validation type
-		wf.createDVTypeRow("Decimal");
-		wf.createHeaderRow();
-
-		va = wf.createValidationAdder(null, ValidationType.DECIMAL);
-		va.addValidation(OperatorType.BETWEEN, "2", "6", ErrorStyle.STOP, "Between 2 and 6 ", "Error box type = STOP", true, true, true);
-		va.addValidation(OperatorType.NOT_BETWEEN, "2", "6", ErrorStyle.INFO, "Not between 2 and 6 ", "Error box type = INFO", false, true, true);
-		va.addValidation(OperatorType.EQUAL, "3", null, ErrorStyle.WARNING, "Equal to 3", "Error box type = WARNING", false, false, true);
-		va.addValidation(OperatorType.NOT_EQUAL, "3", null, ErrorStyle.WARNING, "Not equal to 3", "-", false, false, false);
-		va.addValidation(OperatorType.GREATER_THAN, "=12/6", null, ErrorStyle.WARNING, "Greater than (12/6)", "-", true, false, false);
-		va.addValidation(OperatorType.LESS_THAN, "3", null, ErrorStyle.WARNING, "Less than 3", "-", true, true, false);
-		va.addValidation(OperatorType.GREATER_OR_EQUAL, "4", null, ErrorStyle.STOP, "Greater than or equal to 4", "Error box type = STOP", true, false, true);
-		va.addValidation(OperatorType.LESS_OR_EQUAL, "4", null, ErrorStyle.STOP, "Less than or equal to 4", "-", false, true, false);
-	}
-
-	private static void addListValidations(WorkbookFormatter wf, Workbook wb) {
-		final String cellStrValue
-		 = "a b c d e f g h i j k l m n o p r s t u v x y z w 0 1 2 3 4 "
-		+ "a b c d e f g h i j k l m n o p r s t u v x y z w 0 1 2 3 4 "
-		+ "a b c d e f g h i j k l m n o p r s t u v x y z w 0 1 2 3 4 "
-		+ "a b c d e f g h i j k l m n o p r s t u v x y z w 0 1 2 3 4 ";
-		final String dataSheetName = "list_data";
-		// "List" Data Validation type
-		Sheet fSheet = wf.createSheet("Lists");
-		Sheet dataSheet = wb.createSheet(dataSheetName);
-
-
-		wf.createDVTypeRow("Explicit lists - list items are explicitly provided");
-		wf.createDVDescriptionRow("Disadvantage - sum of item's length should be less than 255 characters");
-		wf.createHeaderRow();
-
-		ValidationAdder va = wf.createValidationAdder(null, ValidationType.LIST);
-		String listValsDescr = "POIFS,HSSF,HWPF,HPSF";
-		String[] listVals = listValsDescr.split(",");
-		va.addListValidation(listVals, null, listValsDescr, false, false);
-		va.addListValidation(listVals, null, listValsDescr, false, true);
-		va.addListValidation(listVals, null, listValsDescr, true, false);
-		va.addListValidation(listVals, null, listValsDescr, true, true);
-
-
-
-		wf.createDVTypeRow("Reference lists - list items are taken from others cells");
-		wf.createDVDescriptionRow("Advantage - no restriction regarding the sum of item's length");
-		wf.createHeaderRow();
-		va = wf.createValidationAdder(null, ValidationType.LIST);
-		String strFormula = "$A$30:$A$39";
-		va.addListValidation(null, strFormula, strFormula, false, false);
-
-		strFormula = dataSheetName + "!$A$1:$A$10";
-		va.addListValidation(null, strFormula, strFormula, false, false);
-		Name namedRange = wb.createName();
-		namedRange.setNameName("myName");
-		namedRange.setRefersToFormula(dataSheetName + "!$A$2:$A$7");
-		strFormula = "myName";
-		va.addListValidation(null, strFormula, strFormula, false, false);
-		strFormula = "offset(myName, 2, 1, 4, 2)"; // Note about last param '2':
-		// - Excel expects single row or single column when entered in UI, but process this OK otherwise
-		va.addListValidation(null, strFormula, strFormula, false, false);
-
-		// add list data on same sheet
-		for (int i = 0; i < 10; i++) {
-			Row currRow = fSheet.createRow(i + 29);
-			setCellValue(currRow.createCell(0), cellStrValue);
-		}
-		// add list data on another sheet
-		for (int i = 0; i < 10; i++) {
-			Row currRow = dataSheet.createRow(i + 0);
-			setCellValue(currRow.createCell(0), "Data a" + i);
-			setCellValue(currRow.createCell(1), "Data b" + i);
-			setCellValue(currRow.createCell(2), "Data c" + i);
-		}
-	}
-
-	private static void addDateTimeValidations(WorkbookFormatter wf, Workbook wb) {
-		wf.createSheet("Dates and Times");
-
-		DataFormat dataFormat = wb.createDataFormat();
-		short fmtDate = dataFormat.getFormat("m/d/yyyy");
-		short fmtTime = dataFormat.getFormat("h:mm");
-		CellStyle cellStyle_date = wb.createCellStyle();
-		cellStyle_date.setDataFormat(fmtDate);
-		CellStyle cellStyle_time = wb.createCellStyle();
-		cellStyle_time.setDataFormat(fmtTime);
-
-		wf.createDVTypeRow("Date ( cells are already formated as date - m/d/yyyy)");
-		wf.createHeaderRow();
-
-		ValidationAdder va = wf.createValidationAdder(cellStyle_date, ValidationType.DATE);
-		va.addValidation(OperatorType.BETWEEN,     "2004/01/02", "2004/01/06", ErrorStyle.STOP, "Between 1/2/2004 and 1/6/2004 ", "Error box type = STOP", true, true, true);
-		va.addValidation(OperatorType.NOT_BETWEEN, "2004/01/01", "2004/01/06", ErrorStyle.INFO, "Not between 1/2/2004 and 1/6/2004 ", "Error box type = INFO", false, true, true);
-		va.addValidation(OperatorType.EQUAL,       "2004/03/02", null,       ErrorStyle.WARNING, "Equal to 3/2/2004", "Error box type = WARNING", false, false, true);
-		va.addValidation(OperatorType.NOT_EQUAL,   "2004/03/02", null,       ErrorStyle.WARNING, "Not equal to 3/2/2004", "-", false, false, false);
-		va.addValidation(OperatorType.GREATER_THAN,"=DATEVALUE(\"4-Jul-2001\")", null,       ErrorStyle.WARNING, "Greater than DATEVALUE('4-Jul-2001')", "-", true, false, false);
-		va.addValidation(OperatorType.LESS_THAN,   "2004/03/02", null,       ErrorStyle.WARNING, "Less than 3/2/2004", "-", true, true, false);
-		va.addValidation(OperatorType.GREATER_OR_EQUAL, "2004/03/02", null,       ErrorStyle.STOP, "Greater than or equal to 3/2/2004", "Error box type = STOP", true, false, true);
-		va.addValidation(OperatorType.LESS_OR_EQUAL, "2004/03/04", null,       ErrorStyle.STOP, "Less than or equal to 3/4/2004", "-", false, true, false);
-
-		// "Time" validation type
-		wf.createDVTypeRow("Time ( cells are already formated as time - h:mm)");
-		wf.createHeaderRow();
-
-		va = wf.createValidationAdder(cellStyle_time, ValidationType.TIME);
-		va.addValidation(OperatorType.BETWEEN,     "12:00", "16:00", ErrorStyle.STOP, "Between 12:00 and 16:00 ", "Error box type = STOP", true, true, true);
-		va.addValidation(OperatorType.NOT_BETWEEN, "12:00", "16:00", ErrorStyle.INFO, "Not between 12:00 and 16:00 ", "Error box type = INFO", false, true, true);
-		va.addValidation(OperatorType.EQUAL,       "13:35", null,    ErrorStyle.WARNING, "Equal to 13:35", "Error box type = WARNING", false, false, true);
-		va.addValidation(OperatorType.NOT_EQUAL,   "13:35", null,    ErrorStyle.WARNING, "Not equal to 13:35", "-", false, false, false);
-		va.addValidation(OperatorType.GREATER_THAN,"12:00", null,    ErrorStyle.WARNING, "Greater than 12:00", "-", true, false, false);
-		va.addValidation(OperatorType.LESS_THAN,   "=1/2", null,    ErrorStyle.WARNING, "Less than (1/2) -> 12:00", "-", true, true, false);
-		va.addValidation(OperatorType.GREATER_OR_EQUAL, "14:00", null,    ErrorStyle.STOP, "Greater than or equal to 14:00", "Error box type = STOP", true, false, true);
-		va.addValidation(OperatorType.LESS_OR_EQUAL,"14:00", null,    ErrorStyle.STOP, "Less than or equal to 14:00", "-", false, true, false);
-	}
-
-	private static void addTextLengthValidations(WorkbookFormatter wf) {
-		wf.createSheet("Text lengths");
-		wf.createHeaderRow();
-
-		ValidationAdder va = wf.createValidationAdder(null, ValidationType.TEXT_LENGTH);
-		va.addValidation(OperatorType.BETWEEN, "2", "6", ErrorStyle.STOP, "Between 2 and 6 ", "Error box type = STOP", true, true, true);
-		va.addValidation(OperatorType.NOT_BETWEEN, "2", "6", ErrorStyle.INFO, "Not between 2 and 6 ", "Error box type = INFO", false, true, true);
-		va.addValidation(OperatorType.EQUAL, "3", null, ErrorStyle.WARNING, "Equal to 3", "Error box type = WARNING", false, false, true);
-		va.addValidation(OperatorType.NOT_EQUAL, "3", null, ErrorStyle.WARNING, "Not equal to 3", "-", false, false, false);
-		va.addValidation(OperatorType.GREATER_THAN, "3", null, ErrorStyle.WARNING, "Greater than 3", "-", true, false, false);
-		va.addValidation(OperatorType.LESS_THAN, "3", null, ErrorStyle.WARNING, "Less than 3", "-", true, true, false);
-		va.addValidation(OperatorType.GREATER_OR_EQUAL, "4", null, ErrorStyle.STOP, "Greater than or equal to 4", "Error box type = STOP", true, false, true);
-		va.addValidation(OperatorType.LESS_OR_EQUAL, "4", null, ErrorStyle.STOP, "Less than or equal to 4", "-", false, true, false);
-	}
-
-	@Test
-	public void testDataValidation() throws Exception {
-		log("\nTest no. 2 - Test Excel's Data validation mechanism");
-		Workbook wb = _testDataProvider.createWorkbook();
-		WorkbookFormatter wf = new WorkbookFormatter(wb);
-
-		log("    Create sheet for Data Validation's number types ... ");
-		addSimpleNumericValidations(wf);
-		log("done !");
-
-		log("    Create sheet for 'List' Data Validation type ... ");
-		addListValidations(wf, wb);
-		log("done !");
-
-		log("    Create sheet for 'Date' and 'Time' Data Validation types ... ");
-		addDateTimeValidations(wf, wb);
-		log("done !");
-
-		log("    Create sheet for 'Text length' Data Validation type... ");
-		addTextLengthValidations(wf);
-		log("done !");
-
-		// Custom Validation type
-		log("    Create sheet for 'Custom' Data Validation type ... ");
-		addCustomValidations(wf);
-		log("done !");
-
-        _testDataProvider.writeOutAndReadBack(wb).close();
-        
-        wb.close();
-	}
-
-
-
-  /* package */ static void setCellValue(Cell cell, String text) {
-	  cell.setCellValue(text);
-
-      }
-
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
deleted file mode 100644
index cc4a903..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public abstract class BaseTestFont {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestFont(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    protected final void baseTestDefaultFont(String defaultName, short defaultSize, short defaultColor) throws IOException {
-        //get default font and check against default value
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Font fontFind=workbook.findFont(Font.BOLDWEIGHT_NORMAL, defaultColor, defaultSize, defaultName, false, false, Font.SS_NONE, Font.U_NONE);
-        assertNotNull(fontFind);
-
-        //get default font, then change 2 values and check against different values (height changes)
-        Font font=workbook.createFont();
-        font.setBoldweight(Font.BOLDWEIGHT_BOLD);
-        assertEquals(Font.BOLDWEIGHT_BOLD, font.getBoldweight());
-        font.setUnderline(Font.U_DOUBLE);
-        assertEquals(Font.U_DOUBLE, font.getUnderline());
-        font.setFontHeightInPoints((short)15);
-        assertEquals(15*20, font.getFontHeight());
-        assertEquals(15, font.getFontHeightInPoints());
-        fontFind=workbook.findFont(Font.BOLDWEIGHT_BOLD, defaultColor, (short)(15*20), defaultName, false, false, Font.SS_NONE, Font.U_DOUBLE);
-        assertNotNull(fontFind);
-        workbook.close();
-    }
-
-    @Test
-    public final void testGetNumberOfFonts() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        int num0 = wb.getNumberOfFonts();
-
-        Font f1=wb.createFont();
-        f1.setBoldweight(Font.BOLDWEIGHT_BOLD);
-        short idx1 = f1.getIndex();
-        wb.createCellStyle().setFont(f1);
-
-        Font f2=wb.createFont();
-        f2.setUnderline(Font.U_DOUBLE);
-        short idx2 = f2.getIndex();
-        wb.createCellStyle().setFont(f2);
-
-        Font f3=wb.createFont();
-        f3.setFontHeightInPoints((short)23);
-        short idx3 = f3.getIndex();
-        wb.createCellStyle().setFont(f3);
-
-        assertEquals(num0 + 3,wb.getNumberOfFonts());
-        assertEquals(Font.BOLDWEIGHT_BOLD,wb.getFontAt(idx1).getBoldweight());
-        assertEquals(Font.U_DOUBLE,wb.getFontAt(idx2).getUnderline());
-        assertEquals(23,wb.getFontAt(idx3).getFontHeightInPoints());
-        wb.close();
-	}
-
-    /**
-     * Tests that we can define fonts to a new
-     *  file, save, load, and still see them
-     */
-    @Test
-    public final void testCreateSave() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet s1 = wb1.createSheet();
-        Row r1 = s1.createRow(0);
-        Cell r1c1 = r1.createCell(0);
-        r1c1.setCellValue(2.2);
-
-        int num0 = wb1.getNumberOfFonts();
-
-        Font font=wb1.createFont();
-        font.setBoldweight(Font.BOLDWEIGHT_BOLD);
-        font.setStrikeout(true);
-        font.setColor(IndexedColors.YELLOW.getIndex());
-        font.setFontName("Courier");
-        short font1Idx = font.getIndex();
-        wb1.createCellStyle().setFont(font);
-        assertEquals(num0 + 1, wb1.getNumberOfFonts());
-
-        CellStyle cellStyleTitle=wb1.createCellStyle();
-        cellStyleTitle.setFont(font);
-        r1c1.setCellStyle(cellStyleTitle);
-
-        // Save and re-load
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        s1 = wb2.getSheetAt(0);
-
-        assertEquals(num0 + 1, wb2.getNumberOfFonts());
-        short idx = s1.getRow(0).getCell(0).getCellStyle().getFontIndex();
-        Font fnt = wb2.getFontAt(idx);
-        assertNotNull(fnt);
-        assertEquals(IndexedColors.YELLOW.getIndex(), fnt.getColor());
-        assertEquals("Courier", fnt.getFontName());
-
-        // Now add an orphaned one
-        Font font2 = wb2.createFont();
-        font2.setItalic(true);
-        font2.setFontHeightInPoints((short)15);
-        short font2Idx = font2.getIndex();
-        wb2.createCellStyle().setFont(font2);
-        assertEquals(num0 + 2, wb2.getNumberOfFonts());
-
-        // Save and re-load
-        Workbook wb3 = _testDataProvider.writeOutAndReadBack(wb2);
-        wb2.close();
-        s1 = wb3.getSheetAt(0);
-
-        assertEquals(num0 + 2, wb3.getNumberOfFonts());
-        assertNotNull(wb3.getFontAt(font1Idx));
-        assertNotNull(wb3.getFontAt(font2Idx));
-
-        assertEquals(15, wb3.getFontAt(font2Idx).getFontHeightInPoints());
-        assertEquals(true, wb3.getFontAt(font2Idx).getItalic());
-        wb3.close();
-    }
-
-    /**
-     * Test that fonts get added properly
-     *
-     * @see org.apache.poi.hssf.usermodel.TestBugs#test45338()
-     */
-    @Test
-    public final void test45338() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        int num0 = wb.getNumberOfFonts();
-
-        Sheet s = wb.createSheet();
-        s.createRow(0);
-        s.createRow(1);
-        s.getRow(0).createCell(0);
-        s.getRow(1).createCell(0);
-
-        //default font
-        Font f1 = wb.getFontAt((short)0);
-        assertEquals(Font.BOLDWEIGHT_NORMAL, f1.getBoldweight());
-
-        // Check that asking for the same font
-        //  multiple times gives you the same thing.
-        // Otherwise, our tests wouldn't work!
-        assertSame(wb.getFontAt((short)0), wb.getFontAt((short)0));
-
-        // Look for a new font we have
-        //  yet to add
-        assertNull(
-            wb.findFont(
-                Font.BOLDWEIGHT_BOLD, (short)123, (short)(22*20),
-                "Thingy", false, true, (short)2, (byte)2
-            )
-        );
-
-        Font nf = wb.createFont();
-        short nfIdx = nf.getIndex();
-        assertEquals(num0 + 1, wb.getNumberOfFonts());
-
-        assertSame(nf, wb.getFontAt(nfIdx));
-
-        nf.setBoldweight(Font.BOLDWEIGHT_BOLD);
-        nf.setColor((short)123);
-        nf.setFontHeightInPoints((short)22);
-        nf.setFontName("Thingy");
-        nf.setItalic(false);
-        nf.setStrikeout(true);
-        nf.setTypeOffset((short)2);
-        nf.setUnderline((byte)2);
-
-        assertEquals(num0 + 1, wb.getNumberOfFonts());
-        assertEquals(nf, wb.getFontAt(nfIdx));
-
-        assertEquals(wb.getFontAt(nfIdx), wb.getFontAt(nfIdx));
-        assertTrue(wb.getFontAt((short)0) != wb.getFontAt(nfIdx));
-
-        // Find it now
-        assertNotNull(
-            wb.findFont(
-                Font.BOLDWEIGHT_BOLD, (short)123, (short)(22*20),
-                "Thingy", false, true, (short)2, (byte)2
-            )
-        );
-        assertSame(nf,
-               wb.findFont(
-                   Font.BOLDWEIGHT_BOLD, (short)123, (short)(22*20),
-                   "Thingy", false, true, (short)2, (byte)2
-               )
-        );
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
deleted file mode 100644
index c4922a7..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.junit.Test;
-
-/**
- * Common superclass for testing implementation of {@link FormulaEvaluator}
- */
-public abstract class BaseTestFormulaEvaluator {
-
-	protected final ITestDataProvider _testDataProvider;
-
-	/**
-	 * @param testDataProvider an object that provides test data in  /  specific way
-	 */
-	protected BaseTestFormulaEvaluator(ITestDataProvider testDataProvider) {
-		_testDataProvider = testDataProvider;
-	}
-
-	@Test
-    public void testSimpleArithmetic() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r = s.createRow(0);
-
-        Cell c1 = r.createCell(0);
-        c1.setCellFormula("1+5");
-        assertEquals(0.0, c1.getNumericCellValue(), 0.0);
-
-        Cell c2 = r.createCell(1);
-        c2.setCellFormula("10/2");
-        assertEquals(0.0, c2.getNumericCellValue(), 0.0);
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        fe.evaluateFormulaCellEnum(c1);
-        fe.evaluateFormulaCellEnum(c2);
-
-        assertEquals(6.0, c1.getNumericCellValue(), 0.0001);
-        assertEquals(5.0, c2.getNumericCellValue(), 0.0001);
-        
-        wb.close();
-    }
-
-	@Test
-	public void testSumCount() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r = s.createRow(0);
-        r.createCell(0).setCellValue(2.5);
-        r.createCell(1).setCellValue(1.1);
-        r.createCell(2).setCellValue(3.2);
-        r.createCell(4).setCellValue(10.7);
-
-        r = s.createRow(1);
-
-        Cell c1 = r.createCell(0);
-        c1.setCellFormula("SUM(A1:B1)");
-        assertEquals(0.0, c1.getNumericCellValue(), 0.0);
-
-        Cell c2 = r.createCell(1);
-        c2.setCellFormula("SUM(A1:E1)");
-        assertEquals(0.0, c2.getNumericCellValue(), 0.0);
-
-        Cell c3 = r.createCell(2);
-        c3.setCellFormula("COUNT(A1:A1)");
-        assertEquals(0.0, c3.getNumericCellValue(), 0.0);
-
-        Cell c4 = r.createCell(3);
-        c4.setCellFormula("COUNTA(A1:E1)");
-        assertEquals(0.0, c4.getNumericCellValue(), 0.0);
-
-
-        // Evaluate and test
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        fe.evaluateFormulaCellEnum(c1);
-        fe.evaluateFormulaCellEnum(c2);
-        fe.evaluateFormulaCellEnum(c3);
-        fe.evaluateFormulaCellEnum(c4);
-
-        assertEquals(3.6, c1.getNumericCellValue(), 0.0001);
-        assertEquals(17.5, c2.getNumericCellValue(), 0.0001);
-        assertEquals(1, c3.getNumericCellValue(), 0.0001);
-        assertEquals(4, c4.getNumericCellValue(), 0.0001);
-        
-        wb.close();
-    }
-
-	public void baseTestSharedFormulas(String sampleFile) throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook(sampleFile);
-
-        Sheet sheet = wb.getSheetAt(0);
-
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        Cell cell;
-
-        cell = sheet.getRow(1).getCell(0);
-        assertEquals("B2", cell.getCellFormula());
-        assertEquals("ProductionOrderConfirmation", evaluator.evaluate(cell).getStringValue());
-
-        cell = sheet.getRow(2).getCell(0);
-        assertEquals("B3", cell.getCellFormula());
-        assertEquals("RequiredAcceptanceDate", evaluator.evaluate(cell).getStringValue());
-
-        cell = sheet.getRow(3).getCell(0);
-        assertEquals("B4", cell.getCellFormula());
-        assertEquals("Header", evaluator.evaluate(cell).getStringValue());
-
-        cell = sheet.getRow(4).getCell(0);
-        assertEquals("B5", cell.getCellFormula());
-        assertEquals("UniqueDocumentNumberID", evaluator.evaluate(cell).getStringValue());
-        
-        wb.close();
-    }
-
-    /**
-     * Test creation / evaluation of formulas with sheet-level names
-     */
-	@Test
-    public void testSheetLevelFormulas() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        Row row;
-        Sheet sh1 = wb.createSheet("Sheet1");
-        Name nm1 = wb.createName();
-        nm1.setNameName("sales_1");
-        nm1.setSheetIndex(0);
-        nm1.setRefersToFormula("Sheet1!$A$1");
-        row = sh1.createRow(0);
-        row.createCell(0).setCellValue(3);
-        row.createCell(1).setCellFormula("sales_1");
-        row.createCell(2).setCellFormula("sales_1*2");
-
-        Sheet sh2 = wb.createSheet("Sheet2");
-        Name nm2 = wb.createName();
-        nm2.setNameName("sales_1");
-        nm2.setSheetIndex(1);
-        nm2.setRefersToFormula("Sheet2!$A$1");
-
-        row = sh2.createRow(0);
-        row.createCell(0).setCellValue(5);
-        row.createCell(1).setCellFormula("sales_1");
-        row.createCell(2).setCellFormula("sales_1*3");
-
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals(3.0, evaluator.evaluate(sh1.getRow(0).getCell(1)).getNumberValue(), 0.0);
-        assertEquals(6.0, evaluator.evaluate(sh1.getRow(0).getCell(2)).getNumberValue(), 0.0);
-
-        assertEquals(5.0, evaluator.evaluate(sh2.getRow(0).getCell(1)).getNumberValue(), 0.0);
-        assertEquals(15.0, evaluator.evaluate(sh2.getRow(0).getCell(2)).getNumberValue(), 0.0);
-        
-        wb.close();
-    }
-
-	@Test
-    public void testFullColumnRefs() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-        Row row = sheet.createRow(0);
-        Cell cell0 = row.createCell(0);
-        cell0.setCellFormula("sum(D:D)");
-        Cell cell1 = row.createCell(1);
-        cell1.setCellFormula("sum(D:E)");
-
-        // some values in column D
-        setValue(sheet, 1, 3, 5.0);
-        setValue(sheet, 2, 3, 6.0);
-        setValue(sheet, 5, 3, 7.0);
-        setValue(sheet, 50, 3, 8.0);
-
-        // some values in column E
-        setValue(sheet, 1, 4, 9.0);
-        setValue(sheet, 2, 4, 10.0);
-        setValue(sheet, 30000, 4, 11.0);
-
-        // some other values
-        setValue(sheet, 1, 2, 100.0);
-        setValue(sheet, 2, 5, 100.0);
-        setValue(sheet, 3, 6, 100.0);
-
-
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals(26.0, fe.evaluate(cell0).getNumberValue(), 0.0);
-        assertEquals(56.0, fe.evaluate(cell1).getNumberValue(), 0.0);
-        
-        wb.close();
-    }
-    
-	@Test
-    public void testRepeatedEvaluation() throws IOException {
-       Workbook wb = _testDataProvider.createWorkbook();
-       FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-       Sheet sheet = wb.createSheet("Sheet1");
-       Row r = sheet.createRow(0);
-       Cell c = r.createCell(0, CellType.FORMULA);
-       
-       // Create a value and check it
-       c.setCellFormula("Date(2011,10,6)");
-       CellValue cellValue = fe.evaluate(c);
-       assertEquals(40822.0, cellValue.getNumberValue(), 0.0);
-       cellValue = fe.evaluate(c);
-       assertEquals(40822.0, cellValue.getNumberValue(), 0.0);
-       
-       // Change it
-       c.setCellFormula("Date(2011,10,4)");
-       
-       // Evaluate it, no change as the formula evaluator
-       //  won't know to clear the cache
-       cellValue = fe.evaluate(c);
-       assertEquals(40822.0, cellValue.getNumberValue(), 0.0);
-       
-       // Manually flush for this cell, and check
-       fe.notifySetFormula(c);
-       cellValue = fe.evaluate(c);
-       assertEquals(40820.0, cellValue.getNumberValue(), 0.0);
-       
-       // Change again, without notifying
-       c.setCellFormula("Date(2010,10,4)");
-       cellValue = fe.evaluate(c);
-       assertEquals(40820.0, cellValue.getNumberValue(), 0.0);
-       
-       // Now manually clear all, will see the new value
-       fe.clearAllCachedResultValues();
-       cellValue = fe.evaluate(c);
-       assertEquals(40455.0, cellValue.getNumberValue(), 0.0);
-       
-       wb.close();
-    }
-
-    private static void setValue(Sheet sheet, int rowIndex, int colIndex, double value) {
-        Row row = sheet.getRow(rowIndex);
-        if (row == null) {
-            row = sheet.createRow(rowIndex);
-        }
-        row.createCell(colIndex).setCellValue(value);
-    }
-
-    /**
-     * {@link FormulaEvaluator#evaluate(org.apache.poi.ss.usermodel.Cell)} should behave the same whether the cell
-     * is <code>null</code> or blank.
-     */
-    @Test
-    public void testEvaluateBlank() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-        assertNull(fe.evaluate(null));
-        Sheet sheet = wb.createSheet("Sheet1");
-        Cell cell = sheet.createRow(0).createCell(0);
-        assertNull(fe.evaluate(cell));
-        wb.close();
-    }
-
-    /**
-     * Test for bug due to attempt to convert a cached formula error result to a boolean
-     */
-    @Test
-    public void testUpdateCachedFormulaResultFromErrorToNumber_bug46479() throws IOException {
-
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-        Row row = sheet.createRow(0);
-        Cell cellA1 = row.createCell(0);
-        Cell cellB1 = row.createCell(1);
-        cellB1.setCellFormula("A1+1");
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        cellA1.setCellErrorValue(FormulaError.NAME.getCode());
-        fe.evaluateFormulaCellEnum(cellB1);
-
-        cellA1.setCellValue(2.5);
-        fe.notifyUpdateCell(cellA1);
-        try {
-            fe.evaluateInCell(cellB1);
-        } catch (IllegalStateException e) {
-            if (e.getMessage().equals("Cannot get a numeric value from a error formula cell")) {
-                fail("Identified bug 46479a");
-            }
-        }
-        assertEquals(3.5, cellB1.getNumericCellValue(), 0.0);
-        
-        wb.close();
-    }
-
-    @Test
-    public void testRounding_bug51339() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Sheet1");
-        Row row = sheet.createRow(0);
-        Cell cellA1 = row.createCell(0);
-        cellA1.setCellValue(2162.615d);
-        Cell cellB1 = row.createCell(1);
-        cellB1.setCellFormula("round(a1,2)");
-        Cell cellC1 = row.createCell(2);
-        cellC1.setCellFormula("roundup(a1,2)");
-        Cell cellD1 = row.createCell(3);
-        cellD1.setCellFormula("rounddown(a1,2)");
-        FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-
-        assertEquals(2162.62, fe.evaluateInCell(cellB1).getNumericCellValue(), 0.0);
-        assertEquals(2162.62, fe.evaluateInCell(cellC1).getNumericCellValue(), 0.0);
-        assertEquals(2162.61, fe.evaluateInCell(cellD1).getNumericCellValue(), 0.0);
-        
-        wb.close();
-    }
-    
-    @Test
-    public void evaluateInCellReturnsSameCell() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet().createRow(0).createCell(0);
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        Cell cell = wb.getSheetAt(0).getRow(0).getCell(0);
-        Cell same = evaluator.evaluateInCell(cell);
-        assertSame(cell, same);
-        wb.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
deleted file mode 100644
index d5b7175..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotSame;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.junit.Test;
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.ss.ITestDataProvider;
-
-/**
- * Test diffrent types of Excel hyperlinks
- *
- * @author Yegor Kozlov
- */
-public abstract class BaseTestHyperlink {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestHyperlink(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    @Test
-    public final void testBasicTypes() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        CreationHelper createHelper = wb1.getCreationHelper();
-
-        Cell cell;
-        Hyperlink link;
-        Sheet sheet = wb1.createSheet("Hyperlinks");
-
-        //URL
-        cell = sheet.createRow(0).createCell((short) 0);
-        cell.setCellValue("URL Link");
-        link = createHelper.createHyperlink(HyperlinkType.URL);
-        link.setAddress("http://poi.apache.org/");
-        cell.setHyperlink(link);
-
-        //link to a file in the current directory
-        cell = sheet.createRow(1).createCell((short) 0);
-        cell.setCellValue("File Link");
-        link = createHelper.createHyperlink(HyperlinkType.FILE);
-        link.setAddress("hyperinks-beta4-dump.txt");
-        cell.setHyperlink(link);
-
-        //e-mail link
-        cell = sheet.createRow(2).createCell((short) 0);
-        cell.setCellValue("Email Link");
-        link = createHelper.createHyperlink(HyperlinkType.EMAIL);
-        //note, if subject contains white spaces, make sure they are url-encoded
-        link.setAddress("mailto:poi@apache.org?subject=Hyperlinks");
-        cell.setHyperlink(link);
-
-        //link to a place in this workbook
-
-        //create a target sheet and cell
-        Sheet sheet2 = wb1.createSheet("Target Sheet");
-        sheet2.createRow(0).createCell((short) 0).setCellValue("Target Cell");
-
-        cell = sheet.createRow(3).createCell((short) 0);
-        cell.setCellValue("Worksheet Link");
-        link = createHelper.createHyperlink(HyperlinkType.DOCUMENT);
-        link.setAddress("'Target Sheet'!A1");
-        cell.setHyperlink(link);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sheet = wb2.getSheetAt(0);
-        link = sheet.getRow(0).getCell(0).getHyperlink();
-
-        assertEquals("http://poi.apache.org/", link.getAddress());
-        link = sheet.getRow(1).getCell(0).getHyperlink();
-        assertEquals("hyperinks-beta4-dump.txt", link.getAddress());
-        link = sheet.getRow(2).getCell(0).getHyperlink();
-        assertEquals("mailto:poi@apache.org?subject=Hyperlinks", link.getAddress());
-        link = sheet.getRow(3).getCell(0).getHyperlink();
-        assertEquals("'Target Sheet'!A1", link.getAddress());
-        
-        wb2.close();
-    }
-    
-    // copy a hyperlink via the copy constructor
-    @Test
-    public void testCopyHyperlink() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        final CreationHelper createHelper = wb.getCreationHelper();
-
-        final Sheet sheet = wb.createSheet("Hyperlinks");
-        final Row row = sheet.createRow(0);
-        final Cell cell1, cell2;
-        final Hyperlink link1, link2;
-
-        //URL
-        cell1 = row.createCell(0);
-        cell2 = row.createCell(1);
-        cell1.setCellValue("URL Link");
-        link1 = createHelper.createHyperlink(HyperlinkType.URL);
-        link1.setAddress("http://poi.apache.org/");
-        cell1.setHyperlink(link1);
-        
-        link2 = copyHyperlink(link1);
-        
-        // Change address (type is not changeable)
-        link2.setAddress("http://apache.org/");
-        cell2.setHyperlink(link2);
-        
-        // Make sure hyperlinks were deep-copied, and modifying one does not modify the other. 
-        assertNotSame(link1, link2);
-        assertNotEquals(link1, link2);
-        assertEquals("http://poi.apache.org/", link1.getAddress());
-        assertEquals("http://apache.org/", link2.getAddress());
-        assertEquals(link1, cell1.getHyperlink());
-        assertEquals(link2, cell2.getHyperlink());
-        
-        // Make sure both hyperlinks were added to the sheet
-        @SuppressWarnings("unchecked")
-        final List<Hyperlink> actualHyperlinks = (List<Hyperlink>) sheet.getHyperlinkList();
-        assertEquals(2, actualHyperlinks.size());
-        assertEquals(link1, actualHyperlinks.get(0));
-        assertEquals(link2, actualHyperlinks.get(1));
-        
-        wb.close();
-    }
-    
-    public abstract Hyperlink copyHyperlink(Hyperlink link);
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
deleted file mode 100644
index 1bb73f9..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
+++ /dev/null
@@ -1,740 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellReference;
-import org.junit.Test;
-
-/**
- * Tests of implementations of {@link org.apache.poi.ss.usermodel.Name}.
- *
- * @author Yegor Kozlov
- */
-public abstract class BaseTestNamedRange {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestNamedRange(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    @Test
-    public final void testCreate() throws Exception {
-        // Create a new workbook
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Test1");
-        wb.createSheet("Testing Named Ranges");
-
-        Name name1 = wb.createName();
-        name1.setNameName("testOne");
-
-        //setting a duplicate name should throw IllegalArgumentException
-        Name name2 = wb.createName();
-        try {
-            name2.setNameName("testOne");
-            fail("expected exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("The workbook already contains this name: testOne", e.getMessage());
-        }
-        //the check for duplicates is case-insensitive
-        try {
-            name2.setNameName("TESTone");
-            fail("expected exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("The workbook already contains this name: TESTone", e.getMessage());
-        }
-
-        name2.setNameName("testTwo");
-
-        String ref1 = "Test1!$A$1:$B$1";
-        name1.setRefersToFormula(ref1);
-        assertEquals(ref1, name1.getRefersToFormula());
-        assertEquals("Test1", name1.getSheetName());
-
-        String ref2 = "'Testing Named Ranges'!$A$1:$B$1";
-        name1.setRefersToFormula(ref2);
-        assertEquals("'Testing Named Ranges'!$A$1:$B$1", name1.getRefersToFormula());
-        assertEquals("Testing Named Ranges", name1.getSheetName());
-
-        assertEquals(-1, name1.getSheetIndex());
-        name1.setSheetIndex(-1);
-        assertEquals(-1, name1.getSheetIndex());
-        try {
-            name1.setSheetIndex(2);
-            fail("should throw IllegalArgumentException");
-        } catch(IllegalArgumentException e){
-            assertEquals("Sheet index (2) is out of range (0..1)", e.getMessage());
-        }
-
-        name1.setSheetIndex(1);
-        assertEquals(1, name1.getSheetIndex());
-
-        //-1 means the name applies to the entire workbook
-        name1.setSheetIndex(-1);
-        assertEquals(-1, name1.getSheetIndex());
-
-        //names cannot be blank and must begin with a letter or underscore and not contain spaces
-        String[] invalidNames = {"", "123", "1Name", "Named Range"};
-        for (String name : invalidNames) {
-            try {
-                name1.setNameName(name);
-                fail("should have thrown exceptiuon due to invalid name: " + name);
-            } catch (IllegalArgumentException e) {
-                // expected during successful test
-            }
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public final void testUnicodeNamedRange() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        wb1.createSheet("Test");
-        Name name = wb1.createName();
-        name.setNameName("\u03B1");
-        name.setRefersToFormula("Test!$D$3:$E$8");
-
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        Name name2 = wb2.getNameAt(0);
-
-        assertEquals("\u03B1", name2.getNameName());
-        assertEquals("Test!$D$3:$E$8", name2.getRefersToFormula());
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    @Test
-    public final void testAddRemove() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        assertEquals(0, wb.getNumberOfNames());
-        Name name1 = wb.createName();
-        name1.setNameName("name1");
-        assertEquals(1, wb.getNumberOfNames());
-
-        Name name2 = wb.createName();
-        name2.setNameName("name2");
-        assertEquals(2, wb.getNumberOfNames());
-
-        Name name3 = wb.createName();
-        name3.setNameName("name3");
-        assertEquals(3, wb.getNumberOfNames());
-
-        wb.removeName("name2");
-        assertEquals(2, wb.getNumberOfNames());
-
-        wb.removeName(0);
-        assertEquals(1, wb.getNumberOfNames());
-        
-        wb.close();
-    }
-
-    @Test
-    public final void testScope() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet();
-        wb.createSheet();
-
-        Name name;
-
-        name = wb.createName();
-        name.setNameName("aaa");
-        name = wb.createName();
-        try {
-            name.setNameName("aaa");
-            fail("Expected exception");
-        } catch(Exception e){
-            assertEquals("The workbook already contains this name: aaa", e.getMessage());
-        }
-
-        name = wb.createName();
-        name.setSheetIndex(0);
-        name.setNameName("aaa");
-        name = wb.createName();
-        name.setSheetIndex(0);
-        try {
-            name.setNameName("aaa");
-            fail("Expected exception");
-        } catch(Exception e){
-            assertEquals("The sheet already contains this name: aaa", e.getMessage());
-        }
-
-        name = wb.createName();
-        name.setSheetIndex(1);
-        name.setNameName("aaa");
-        name = wb.createName();
-        name.setSheetIndex(1);
-        try {
-            name.setNameName("aaa");
-            fail("Expected exception");
-        } catch(Exception e){
-            assertEquals("The sheet already contains this name: aaa", e.getMessage());
-        }
-
-        assertEquals(3, wb.getNames("aaa").size());
-        
-        wb.close();
-    }
-
-    /**
-     * Test case provided by czhang@cambian.com (Chun Zhang)
-     * <p>
-     * Addresses Bug <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13775" target="_bug">#13775</a>
-     */
-    @Test
-    public final void testMultiNamedRange() throws Exception {
-
-         // Create a new workbook
-         Workbook wb1 = _testDataProvider.createWorkbook();
-
-         // Create a worksheet 'sheet1' in the new workbook
-         wb1.createSheet ();
-         wb1.setSheetName (0, "sheet1");
-
-         // Create another worksheet 'sheet2' in the new workbook
-         wb1.createSheet ();
-         wb1.setSheetName (1, "sheet2");
-
-         // Create a new named range for worksheet 'sheet1'
-         Name namedRange1 = wb1.createName();
-
-         // Set the name for the named range for worksheet 'sheet1'
-         namedRange1.setNameName("RangeTest1");
-
-         // Set the reference for the named range for worksheet 'sheet1'
-         namedRange1.setRefersToFormula("sheet1" + "!$A$1:$L$41");
-
-         // Create a new named range for worksheet 'sheet2'
-         Name namedRange2 = wb1.createName();
-
-         // Set the name for the named range for worksheet 'sheet2'
-         namedRange2.setNameName("RangeTest2");
-
-         // Set the reference for the named range for worksheet 'sheet2'
-         namedRange2.setRefersToFormula("sheet2" + "!$A$1:$O$21");
-
-         // Write the workbook to a file
-         // Read the Excel file and verify its content
-         Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-         Name nm1 = wb2.getName("RangeTest1");
-         assertTrue("Name is "+nm1.getNameName(),"RangeTest1".equals(nm1.getNameName()));
-         assertTrue("Reference is "+nm1.getRefersToFormula(),(wb2.getSheetName(0)+"!$A$1:$L$41").equals(nm1.getRefersToFormula()));
-
-         Name nm2 = wb2.getName("RangeTest2");
-         assertTrue("Name is "+nm2.getNameName(),"RangeTest2".equals(nm2.getNameName()));
-         assertTrue("Reference is "+nm2.getRefersToFormula(),(wb2.getSheetName(1)+"!$A$1:$O$21").equals(nm2.getRefersToFormula()));
-         
-         wb2.close();
-         wb1.close();
-     }
-
-    /**
-     * Test to see if the print areas can be retrieved/created in memory
-     */
-    @Test
-    public final void testSinglePrintArea() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        workbook.createSheet("Test Print Area");
-        String sheetName = workbook.getSheetName(0);
-
-        String reference = "$A$1:$B$1";
-        workbook.setPrintArea(0, reference);
-
-        String retrievedPrintArea = workbook.getPrintArea(0);
-
-        assertNotNull("Print Area not defined for first sheet", retrievedPrintArea);
-        assertEquals("'" + sheetName + "'!$A$1:$B$1", retrievedPrintArea);
-        
-        workbook.close();
-    }
-
-     /**
-      * For Convenience, don't force sheet names to be used
-      */
-    @Test
-     public final void testSinglePrintAreaWOSheet() throws Exception
-     {
-         Workbook workbook = _testDataProvider.createWorkbook();
-         workbook.createSheet("Test Print Area");
-         String sheetName = workbook.getSheetName(0);
-
-         String reference = "$A$1:$B$1";
-         workbook.setPrintArea(0, reference);
-
-         String retrievedPrintArea = workbook.getPrintArea(0);
-
-         assertNotNull("Print Area not defined for first sheet", retrievedPrintArea);
-         assertEquals("'" + sheetName + "'!" + reference, retrievedPrintArea);
-         
-         workbook.close();
-     }
-
-     /**
-      * Test to see if the print area made it to the file
-      */
-    @Test
-    public final void testPrintAreaFile() throws Exception {
-         Workbook wb1 = _testDataProvider.createWorkbook();
-         wb1.createSheet("Test Print Area");
-         String sheetName = wb1.getSheetName(0);
-
-
-         String reference = "$A$1:$B$1";
-         wb1.setPrintArea(0, reference);
-
-         Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-
-         String retrievedPrintArea = wb2.getPrintArea(0);
-         assertNotNull("Print Area not defined for first sheet", retrievedPrintArea);
-         assertEquals("References Match", "'" + sheetName + "'!$A$1:$B$1", retrievedPrintArea);
-         
-         wb2.close();
-         wb1.close();
-    }
-
-    /**
-     * Test to see if multiple print areas made it to the file
-     */
-    @Test
-    public final void testMultiplePrintAreaFile() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-
-        wb1.createSheet("Sheet1");
-        wb1.createSheet("Sheet2");
-        wb1.createSheet("Sheet3");
-        String reference1 = "$A$1:$B$1";
-        String reference2 = "$B$2:$D$5";
-        String reference3 = "$D$2:$F$5";
-
-        wb1.setPrintArea(0, reference1);
-        wb1.setPrintArea(1, reference2);
-        wb1.setPrintArea(2, reference3);
-
-        //Check created print areas
-        String retrievedPrintArea;
-
-        retrievedPrintArea = wb1.getPrintArea(0);
-        assertNotNull("Print Area Not Found (Sheet 1)", retrievedPrintArea);
-        assertEquals("Sheet1!" + reference1, retrievedPrintArea);
-
-        retrievedPrintArea = wb1.getPrintArea(1);
-        assertNotNull("Print Area Not Found (Sheet 2)", retrievedPrintArea);
-        assertEquals("Sheet2!" + reference2, retrievedPrintArea);
-
-        retrievedPrintArea = wb1.getPrintArea(2);
-        assertNotNull("Print Area Not Found (Sheet 3)", retrievedPrintArea);
-        assertEquals("Sheet3!" + reference3, retrievedPrintArea);
-
-        // Check print areas after re-reading workbook
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-
-        retrievedPrintArea = wb2.getPrintArea(0);
-        assertNotNull("Print Area Not Found (Sheet 1)", retrievedPrintArea);
-        assertEquals("Sheet1!" + reference1, retrievedPrintArea);
-
-        retrievedPrintArea = wb2.getPrintArea(1);
-        assertNotNull("Print Area Not Found (Sheet 2)", retrievedPrintArea);
-        assertEquals("Sheet2!" + reference2, retrievedPrintArea);
-
-        retrievedPrintArea = wb2.getPrintArea(2);
-        assertNotNull("Print Area Not Found (Sheet 3)", retrievedPrintArea);
-        assertEquals("Sheet3!" + reference3, retrievedPrintArea);
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    /**
-     * Tests the setting of print areas with coordinates (Row/Column designations)
-     *
-     */
-    @Test
-    public final void testPrintAreaCoords() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        workbook.createSheet("Test Print Area");
-        String sheetName = workbook.getSheetName(0);
-
-        workbook.setPrintArea(0, 0, 1, 0, 0);
-
-        String retrievedPrintArea = workbook.getPrintArea(0);
-
-        assertNotNull("Print Area not defined for first sheet", retrievedPrintArea);
-        assertEquals("'" + sheetName + "'!$A$1:$B$1", retrievedPrintArea);
-        
-        workbook.close();
-    }
-
-
-    /**
-     * Tests the parsing of union area expressions, and re-display in the presence of sheet names
-     * with special characters.
-     */
-    @Test
-    public final void testPrintAreaUnion() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        workbook.createSheet("Test Print Area");
-
-        String reference = "$A$1:$B$1,$D$1:$F$2";
-        workbook.setPrintArea(0, reference);
-        String retrievedPrintArea = workbook.getPrintArea(0);
-        assertNotNull("Print Area not defined for first sheet", retrievedPrintArea);
-        assertEquals("'Test Print Area'!$A$1:$B$1,'Test Print Area'!$D$1:$F$2", retrievedPrintArea);
-        
-        workbook.close();
-    }
-
-    /**
-     * Verifies an existing print area is deleted
-     *
-     */
-    @Test
-    public final void testPrintAreaRemove() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        workbook.createSheet("Test Print Area");
-        workbook.getSheetName(0);
-
-        workbook.setPrintArea(0, 0, 1, 0, 0);
-
-        String retrievedPrintArea = workbook.getPrintArea(0);
-
-        assertNotNull("Print Area not defined for first sheet", retrievedPrintArea);
-
-        workbook.removePrintArea(0);
-        assertNull("PrintArea was not removed", workbook.getPrintArea(0));
-        workbook.close();
-    }
-
-    /**
-     * Test that multiple named ranges can be added written and read
-     */
-    @Test
-    public final void testMultipleNamedWrite() throws Exception {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-
-
-        wb1.createSheet("testSheet1");
-        String sheetName = wb1.getSheetName(0);
-
-        assertEquals("testSheet1", sheetName);
-
-        //Creating new Named Range
-        Name newNamedRange = wb1.createName();
-
-        newNamedRange.setNameName("RangeTest");
-        newNamedRange.setRefersToFormula(sheetName + "!$D$4:$E$8");
-
-        //Creating another new Named Range
-        Name newNamedRange2 = wb1.createName();
-
-        newNamedRange2.setNameName("AnotherTest");
-        newNamedRange2.setRefersToFormula(sheetName + "!$F$1:$G$6");
-
-        wb1.getNameAt(0);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        Name nm =wb2.getName("RangeTest");
-        assertTrue("Name is "+nm.getNameName(),"RangeTest".equals(nm.getNameName()));
-        assertTrue("Reference is "+nm.getRefersToFormula(),(wb2.getSheetName(0)+"!$D$4:$E$8").equals(nm.getRefersToFormula()));
-
-        nm = wb2.getName("AnotherTest");
-        assertTrue("Name is "+nm.getNameName(),"AnotherTest".equals(nm.getNameName()));
-        assertTrue("Reference is "+nm.getRefersToFormula(),newNamedRange2.getRefersToFormula().equals(nm.getRefersToFormula()));
-        
-        wb2.close();
-        wb1.close();
-    }
-    /**
-     * Verifies correct functioning for "single cell named range" (aka "named cell")
-     */
-    @Test
-    public final void testNamedCell_1() throws Exception {
-
-        // setup for this testcase
-        String sheetName = "Test Named Cell";
-        String cellName = "named_cell";
-        String cellValue = "TEST Value";
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet(sheetName);
-        CreationHelper factory = wb.getCreationHelper();
-        sheet.createRow(0).createCell(0).setCellValue(factory.createRichTextString(cellValue));
-
-        // create named range for a single cell using areareference
-        Name namedCell = wb.createName();
-        namedCell.setNameName(cellName);
-        String reference = "'" + sheetName + "'" + "!A1:A1";
-        namedCell.setRefersToFormula(reference);
-
-        // retrieve the newly created named range
-        Name aNamedCell = wb.getName(cellName);
-        assertNotNull(aNamedCell);
-
-        // retrieve the cell at the named range and test its contents
-        @SuppressWarnings("deprecation")
-        AreaReference aref = new AreaReference(aNamedCell.getRefersToFormula());
-        assertTrue("Should be exactly 1 cell in the named cell :'" +cellName+"'", aref.isSingleCell());
-
-        CellReference cref = aref.getFirstCell();
-        assertNotNull(cref);
-        Sheet s = wb.getSheet(cref.getSheetName());
-        assertNotNull(s);
-        Row r = sheet.getRow(cref.getRow());
-        Cell c = r.getCell(cref.getCol());
-        String contents = c.getRichStringCellValue().getString();
-        assertEquals("Contents of cell retrieved by its named reference", contents, cellValue);
-        
-        wb.close();
-    }
-
-    /**
-     * Verifies correct functioning for "single cell named range" (aka "named cell")
-     */
-    @Test
-    public final void testNamedCell_2() throws Exception {
-
-        // setup for this testcase
-        String sname = "TestSheet", cname = "TestName", cvalue = "TestVal";
-        Workbook wb = _testDataProvider.createWorkbook();
-        CreationHelper factory = wb.getCreationHelper();
-        Sheet sheet = wb.createSheet(sname);
-        sheet.createRow(0).createCell(0).setCellValue(factory.createRichTextString(cvalue));
-
-        // create named range for a single cell using cellreference
-        Name namedCell = wb.createName();
-        namedCell.setNameName(cname);
-        String reference = sname+"!A1";
-        namedCell.setRefersToFormula(reference);
-
-        // retrieve the newly created named range
-        Name aNamedCell = wb.getName(cname);
-        assertNotNull(aNamedCell);
-
-        // retrieve the cell at the named range and test its contents
-        CellReference cref = new CellReference(aNamedCell.getRefersToFormula());
-        assertNotNull(cref);
-        Sheet s = wb.getSheet(cref.getSheetName());
-        assertNotNull(s);
-        Row r = sheet.getRow(cref.getRow());
-        Cell c = r.getCell(cref.getCol());
-        String contents = c.getRichStringCellValue().getString();
-        assertEquals("Contents of cell retrieved by its named reference", contents, cvalue);
-        
-        wb.close();
-    }
-
-
-    /**
-     * Bugzilla attachment 23444 (from bug 46973) has a NAME record with the following encoding:
-     * <pre>
-     * 00000000 | 18 00 17 00 00 00 00 08 00 00 00 00 00 00 00 00 | ................
-     * 00000010 | 00 00 00 55 50 53 53 74 61 74 65                | ...UPSState
-     * </pre>
-     *
-     * This caused trouble for anything that requires {@link Name#getRefersToFormula()}
-     * It is easy enough to re-create the the same data (by not setting the formula). Excel
-     * seems to gracefully remove this uninitialized name record.  It would be nice if POI
-     * could do the same, but that would involve adjusting subsequent name indexes across
-     * all formulas. <p/>
-     *
-     * For the moment, POI has been made to behave more sensibly with uninitialized name
-     * records.
-     */
-    @Test
-    public final void testUninitialisedNameGetRefersToFormula_bug46973() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Name n = wb.createName();
-        n.setNameName("UPSState");
-        String formula = n.getRefersToFormula();
-        
-        // bug 46973: fails here with IllegalArgumentException
-        // ptgs must not be null
-
-        assertNull(formula);
-        // according to exact definition of isDeleted()
-        assertFalse(n.isDeleted());
-        wb.close();
-    }
-
-    @Test
-    public final void testDeletedCell() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Name n = wb.createName();
-        n.setNameName("MyName");
-        // contrived example to expose bug:
-        n.setRefersToFormula("if(A1,\"#REF!\", \"\")");
-
-        assertFalse("Identified bug in recoginising formulas referring to deleted cells", n.isDeleted());
-        
-        wb.close();
-    }
-
-    @Test
-    public final void testFunctionNames() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Name n = wb.createName();
-        assertFalse(n.isFunctionName());
-
-        n.setFunction(false);
-        assertFalse(n.isFunctionName());
-
-        n.setFunction(true);
-        assertTrue(n.isFunctionName());
-
-        n.setFunction(false);
-        assertFalse(n.isFunctionName());
-        
-        wb.close();
-    }
-
-    @Test
-    public final void testDefferedSetting() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Name n1 = wb.createName();
-        assertNull(n1.getRefersToFormula());
-        assertEquals("", n1.getNameName());
-
-        Name n2 = wb.createName();
-        assertNull(n2.getRefersToFormula());
-        assertEquals("", n2.getNameName());
-
-        n1.setNameName("sale_1");
-        n1.setRefersToFormula("10");
-
-        n2.setNameName("sale_2");
-        n2.setRefersToFormula("20");
-
-        try {
-            n2.setNameName("sale_1");
-            fail("Expected exception");
-        } catch(Exception e){
-            assertEquals("The workbook already contains this name: sale_1", e.getMessage());
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public void testBug56930() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        // x1 on sheet1 defines "x=1"
-        wb.createSheet("sheet1");
-        Name x1 = wb.createName();
-
-        x1.setNameName("x");
-        x1.setRefersToFormula("1");
-        x1.setSheetIndex(wb.getSheetIndex("sheet1"));
-
-        // x2 on sheet2 defines "x=2"
-        wb.createSheet("sheet2");
-        Name x2 = wb.createName();
-        x2.setNameName("x");
-        x2.setRefersToFormula("2");
-        x2.setSheetIndex(wb.getSheetIndex("sheet2"));
-
-        List<? extends Name> names = wb.getNames("x");
-        assertEquals("Had: " + names, 2, names.size());
-        assertEquals("1", names.get(0).getRefersToFormula());
-        assertEquals("2", names.get(1).getRefersToFormula());
-
-        assertEquals("1", wb.getName("x").getRefersToFormula());
-        wb.removeName("x");
-        assertEquals("2", wb.getName("x").getRefersToFormula());
-        
-        wb.close();
-    }
-    
-    // bug 56781: name validation only checks for first character's validity and presence of spaces
-    // bug 60246: validate name does not allow DOT in named ranges
-    @Test
-    public void testValid() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        
-        Name name = wb.createName();
-        for (String valid : Arrays.asList(
-                "Hello",
-                "number1",
-                "_underscore",
-                "underscore_",
-                "p.e.r.o.i.d.s",
-                "\\Backslash",
-                "Backslash\\"
-                )) {
-            name.setNameName(valid);
-        }
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testInvalid() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        
-        Name name = wb.createName();
-        try {
-            name.setNameName("");
-            fail("expected exception: (blank)");
-        } catch (final IllegalArgumentException e) {
-            assertEquals("Name cannot be blank", e.getMessage());
-        }
-        
-        for (String invalid : Arrays.asList(
-                "1number",
-                "Sheet1!A1",
-                "Exclamation!",
-                "Has Space",
-                "Colon:",
-                "A-Minus",
-                "A+Plus",
-                "Dollar$",
-                ".periodAtBeginning",
-                "R", //special shorthand
-                "C", //special shorthand
-                "A1", // A1-style cell reference
-                "R1C1", // R1C1-style cell reference
-                "NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters..."+
-                "NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters..."+
-                "NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters..."+
-                "NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters..."+
-                "NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters.NameThatIsLongerThan255Characters"
-                )) {
-            try {
-                name.setNameName(invalid);
-                fail("expected exception: " + invalid);
-            } catch (final IllegalArgumentException e) {
-                assertTrue(invalid,
-                        e.getMessage().startsWith("Invalid name: '"+invalid+"'"));
-            }
-        }
-        
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
deleted file mode 100644
index e573e79..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.util.ImageUtils;
-import org.apache.poi.util.Units;
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public abstract class BaseTestPicture {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestPicture(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    public void baseTestResize(Picture input, Picture compare, double scaleX, double scaleY) {
-        input.resize(scaleX, scaleY);
-        
-        ClientAnchor inpCA = input.getClientAnchor();
-        ClientAnchor cmpCA = compare.getClientAnchor();
-        
-        Dimension inpDim = ImageUtils.getDimensionFromAnchor(input);
-        Dimension cmpDim = ImageUtils.getDimensionFromAnchor(compare);
-
-        double emuPX = Units.EMU_PER_PIXEL;
-        
-        assertEquals("the image height differs", inpDim.getHeight(), cmpDim.getHeight(), emuPX*6);
-        assertEquals("the image width differs", inpDim.getWidth(),  cmpDim.getWidth(),  emuPX*6);
-        assertEquals("the starting column differs", inpCA.getCol1(), cmpCA.getCol1());
-        assertEquals("the column x-offset differs", inpCA.getDx1(), cmpCA.getDx1(), 1);
-        assertEquals("the column y-offset differs", inpCA.getDy1(), cmpCA.getDy1(), 1);
-        assertEquals("the ending columns differs", inpCA.getCol2(), cmpCA.getCol2());
-        // can't compare row heights because of variable test heights
-        
-        input.resize();
-        inpDim = ImageUtils.getDimensionFromAnchor(input);
-        
-        Dimension imgDim = input.getImageDimension();
-
-        assertEquals("the image height differs", imgDim.getHeight(), inpDim.getHeight()/emuPX, 1);
-        assertEquals("the image width differs",  imgDim.getWidth(), inpDim.getWidth()/emuPX,  1);
-    }
-
-
-    @Test
-    public void testResizeNoColumns() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
-            Sheet sheet = wb.createSheet();
-    
-            Row row = sheet.createRow(0);
-            
-            handleResize(wb, sheet, row);
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testResizeWithColumns() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
-            Sheet sheet = wb.createSheet();
-    
-            Row row = sheet.createRow(0);
-            row.createCell(0);
-            
-            handleResize(wb, sheet, row);
-        } finally {
-            wb.close();
-        }
-    }
-
-
-    private void handleResize(Workbook wb, Sheet sheet, Row row) throws IOException {
-        Drawing drawing = sheet.createDrawingPatriarch();
-        CreationHelper createHelper = wb.getCreationHelper();
-
-        final byte[] bytes = HSSFITestDataProvider.instance.getTestDataFileContent("logoKarmokar4.png");
-        
-        row.setHeightInPoints(getImageSize(bytes).y);
-   
-        int pictureIdx = wb.addPicture(bytes, Workbook.PICTURE_TYPE_PNG);
-   
-        //add a picture shape
-        ClientAnchor anchor = createHelper.createClientAnchor();
-        //set top-left corner of the picture,
-        //subsequent call of Picture#resize() will operate relative to it
-        anchor.setCol1(0);
-        anchor.setRow1(0);
-   
-        Picture pict = drawing.createPicture(anchor, pictureIdx);
-   
-        //auto-size picture relative to its top-left corner
-        pict.resize();
-    }
-    
-    private static Point getImageSize( byte [] image) throws IOException {
-        BufferedImage img = ImageIO.read(new ByteArrayInputStream(image));
-        
-        assertNotNull(img);
-        
-        return new Point(img.getWidth(), img.getHeight());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
deleted file mode 100644
index 2492c20..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.junit.Test;
-
-/**
- * A base class for testing implementations of
- * {@link org.apache.poi.ss.usermodel.Row}
- */
-public abstract class BaseTestRow {
-
-    protected final ITestDataProvider _testDataProvider;
-
-    protected BaseTestRow(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    @Test
-    public void testLastAndFirstColumns() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        Row row = sheet.createRow(0);
-        assertEquals(-1, row.getFirstCellNum());
-        assertEquals(-1, row.getLastCellNum());
-
-        //getting cells from an empty row should returns null
-        for(int i=0; i < 10; i++) assertNull(row.getCell(i));
-
-        row.createCell(2);
-        assertEquals(2, row.getFirstCellNum());
-        assertEquals(3, row.getLastCellNum());
-
-        row.createCell(1);
-        assertEquals(1, row.getFirstCellNum());
-        assertEquals(3, row.getLastCellNum());
-
-        // check the exact case reported in 'bug' 43901 - notice that the cellNum is '0' based
-        row.createCell(3);
-        assertEquals(1, row.getFirstCellNum());
-        assertEquals(4, row.getLastCellNum());
-        workbook.close();
-    }
-
-    /**
-     * Make sure that there is no cross-talk between rows especially with getFirstCellNum and getLastCellNum
-     * This test was added in response to bug report 44987.
-     */
-    @Test
-    public void testBoundsInMultipleRows() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        Row rowA = sheet.createRow(0);
-
-        rowA.createCell(10);
-        rowA.createCell(5);
-        assertEquals(5, rowA.getFirstCellNum());
-        assertEquals(11, rowA.getLastCellNum());
-
-        Row rowB = sheet.createRow(1);
-        rowB.createCell(15);
-        rowB.createCell(30);
-        assertEquals(15, rowB.getFirstCellNum());
-        assertEquals(31, rowB.getLastCellNum());
-
-        assertEquals(5, rowA.getFirstCellNum());
-        assertEquals(11, rowA.getLastCellNum());
-        rowA.createCell(50);
-        assertEquals(51, rowA.getLastCellNum());
-
-        assertEquals(31, rowB.getLastCellNum());
-        workbook.close();
-    }
-
-    @Test
-    public void testRemoveCell() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        {
-            Sheet sheet = wb1.createSheet();
-            Row row = sheet.createRow(0);
-
-            assertEquals(0, row.getPhysicalNumberOfCells());
-            assertEquals(-1, row.getLastCellNum());
-            assertEquals(-1, row.getFirstCellNum());
-
-            row.createCell(1);
-            assertEquals(2, row.getLastCellNum());
-            assertEquals(1, row.getFirstCellNum());
-            assertEquals(1, row.getPhysicalNumberOfCells());
-            row.createCell(3);
-            assertEquals(4, row.getLastCellNum());
-            assertEquals(1, row.getFirstCellNum());
-            assertEquals(2, row.getPhysicalNumberOfCells());
-            row.removeCell(row.getCell(3));
-            assertEquals(2, row.getLastCellNum());
-            assertEquals(1, row.getFirstCellNum());
-            assertEquals(1, row.getPhysicalNumberOfCells());
-            row.removeCell(row.getCell(1));
-            assertEquals(-1, row.getLastCellNum());
-            assertEquals(-1, row.getFirstCellNum());
-            assertEquals(0, row.getPhysicalNumberOfCells());
-        }
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        {
-            Sheet sheet = wb2.getSheetAt(0);
-            Row row = sheet.getRow(0);
-            assertEquals(-1, row.getLastCellNum());
-            assertEquals(-1, row.getFirstCellNum());
-            assertEquals(0, row.getPhysicalNumberOfCells());
-        }
-        
-        wb2.close();
-    }
-
-    protected void baseTestRowBounds(int maxRowNum) throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        //Test low row bound
-        sheet.createRow(0);
-        //Test low row bound exception
-        try {
-            sheet.createRow(-1);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-            assertTrue("Did not find expected error message, had: " + e, 
-                    e.getMessage().startsWith("Invalid row number (-1)"));
-        }
-
-        //Test high row bound
-        sheet.createRow(maxRowNum);
-        //Test high row bound exception
-        try {
-            sheet.createRow(maxRowNum + 1);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-            assertEquals("Invalid row number ("+(maxRowNum + 1)+") outside allowable range (0.."+maxRowNum+")", e.getMessage());
-        }
-        
-        workbook.close();
-    }
-
-    protected void baseTestCellBounds(int maxCellNum) throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        Row row = sheet.createRow(0);
-        //Test low cell bound
-        try {
-            row.createCell(-1);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-            assertTrue(e.getMessage().startsWith("Invalid column index (-1)"));
-        }
-
-        //Test high cell bound
-        try {
-            row.createCell(maxCellNum + 1);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-            assertTrue(e.getMessage().startsWith("Invalid column index ("+(maxCellNum+1)+")"));
-        }
-        for(int i=0; i < maxCellNum; i++){
-            row.createCell(i);
-        }
-        assertEquals(maxCellNum, row.getPhysicalNumberOfCells());
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        sheet = wb2.getSheetAt(0);
-        row = sheet.getRow(0);
-        assertEquals(maxCellNum, row.getPhysicalNumberOfCells());
-        for(int i=0; i < maxCellNum; i++){
-            Cell cell = row.getCell(i);
-            assertEquals(i, cell.getColumnIndex());
-        }
-        wb2.close();
-    }
-
-    /**
-     * Prior to patch 43901, POI was producing files with the wrong last-column
-     * number on the row
-     */
-    @Test
-    public void testLastCellNumIsCorrectAfterAddCell_bug43901() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("test");
-        Row row = sheet.createRow(0);
-
-        // New row has last col -1
-        assertEquals(-1, row.getLastCellNum());
-        if(row.getLastCellNum() == 0) {
-            fail("Identified bug 43901");
-        }
-
-        // Create two cells, will return one higher
-        //  than that for the last number
-        row.createCell(0);
-        assertEquals(1, row.getLastCellNum());
-        row.createCell(255);
-        assertEquals(256, row.getLastCellNum());
-        workbook.close();
-    }
-
-    /**
-     * Tests for the missing/blank cell policy stuff
-     */
-    @Test
-    public void testGetCellPolicy() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("test");
-        Row row = sheet.createRow(0);
-
-        // 0 -> string
-        // 1 -> num
-        // 2 missing
-        // 3 missing
-        // 4 -> blank
-        // 5 -> num
-        row.createCell(0).setCellValue("test");
-        row.createCell(1).setCellValue(3.2);
-        row.createCell(4, CellType.BLANK);
-        row.createCell(5).setCellValue(4);
-
-        // First up, no policy given, uses default
-        assertEquals(CellType.STRING,  row.getCell(0).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(1).getCellTypeEnum());
-        assertEquals(null, row.getCell(2));
-        assertEquals(null, row.getCell(3));
-        assertEquals(CellType.BLANK,   row.getCell(4).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(5).getCellTypeEnum());
-
-        // RETURN_NULL_AND_BLANK - same as default
-        assertEquals(CellType.STRING,  row.getCell(0, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(1, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellTypeEnum());
-        assertEquals(null, row.getCell(2, MissingCellPolicy.RETURN_NULL_AND_BLANK));
-        assertEquals(null, row.getCell(3, MissingCellPolicy.RETURN_NULL_AND_BLANK));
-        assertEquals(CellType.BLANK,   row.getCell(4, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(5, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellTypeEnum());
-
-        // RETURN_BLANK_AS_NULL - nearly the same
-        assertEquals(CellType.STRING,  row.getCell(0, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(1, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellTypeEnum());
-        assertEquals(null, row.getCell(2, MissingCellPolicy.RETURN_BLANK_AS_NULL));
-        assertEquals(null, row.getCell(3, MissingCellPolicy.RETURN_BLANK_AS_NULL));
-        assertEquals(null, row.getCell(4, MissingCellPolicy.RETURN_BLANK_AS_NULL));
-        assertEquals(CellType.NUMERIC, row.getCell(5, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellTypeEnum());
-
-        // CREATE_NULL_AS_BLANK - creates as needed
-        assertEquals(CellType.STRING,  row.getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(1, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellTypeEnum());
-        assertEquals(CellType.BLANK,   row.getCell(2, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellTypeEnum());
-        assertEquals(CellType.BLANK,   row.getCell(3, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellTypeEnum());
-        assertEquals(CellType.BLANK,   row.getCell(4, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(5, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellTypeEnum());
-
-        // Check created ones get the right column
-        assertEquals(0, row.getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getColumnIndex());
-        assertEquals(1, row.getCell(1, MissingCellPolicy.CREATE_NULL_AS_BLANK).getColumnIndex());
-        assertEquals(2, row.getCell(2, MissingCellPolicy.CREATE_NULL_AS_BLANK).getColumnIndex());
-        assertEquals(3, row.getCell(3, MissingCellPolicy.CREATE_NULL_AS_BLANK).getColumnIndex());
-        assertEquals(4, row.getCell(4, MissingCellPolicy.CREATE_NULL_AS_BLANK).getColumnIndex());
-        assertEquals(5, row.getCell(5, MissingCellPolicy.CREATE_NULL_AS_BLANK).getColumnIndex());
-
-
-        // Now change the cell policy on the workbook, check
-        //  that that is now used if no policy given
-        workbook.setMissingCellPolicy(MissingCellPolicy.RETURN_BLANK_AS_NULL);
-
-        assertEquals(CellType.STRING,  row.getCell(0).getCellTypeEnum());
-        assertEquals(CellType.NUMERIC, row.getCell(1).getCellTypeEnum());
-        assertEquals(null, row.getCell(2));
-        assertEquals(null, row.getCell(3));
-        assertEquals(null, row.getCell(4));
-        assertEquals(CellType.NUMERIC, row.getCell(5).getCellTypeEnum());
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testRowHeight() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-        Row row1 = sheet.createRow(0);
-
-        assertEquals(sheet.getDefaultRowHeight(), row1.getHeight());
-
-        sheet.setDefaultRowHeightInPoints(20);
-        row1.setHeight((short)-1); //reset the row height
-        assertEquals(20.0f, row1.getHeightInPoints(), 0F);
-        assertEquals(20*20, row1.getHeight());
-
-        Row row2 = sheet.createRow(1);
-        assertEquals(sheet.getDefaultRowHeight(), row2.getHeight());
-        row2.setHeight((short)310);
-        assertEquals(310, row2.getHeight());
-        assertEquals(310F/20, row2.getHeightInPoints(), 0F);
-
-        Row row3 = sheet.createRow(2);
-        row3.setHeightInPoints(25.5f);
-        assertEquals((short)(25.5f*20), row3.getHeight());
-        assertEquals(25.5f, row3.getHeightInPoints(), 0F);
-
-        Row row4 = sheet.createRow(3);
-        assertFalse(row4.getZeroHeight());
-        row4.setZeroHeight(true);
-        assertTrue(row4.getZeroHeight());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-
-        row1 = sheet.getRow(0);
-        row2 = sheet.getRow(1);
-        row3 = sheet.getRow(2);
-        row4 = sheet.getRow(3);
-        assertEquals(20.0f, row1.getHeightInPoints(), 0F);
-        assertEquals(20*20, row1.getHeight());
-
-        assertEquals(310, row2.getHeight());
-        assertEquals(310F/20, row2.getHeightInPoints(), 0F);
-
-        assertEquals((short)(25.5f*20), row3.getHeight());
-        assertEquals(25.5f, row3.getHeightInPoints(), 0F);
-
-        assertFalse(row1.getZeroHeight());
-        assertFalse(row2.getZeroHeight());
-        assertFalse(row3.getZeroHeight());
-        assertTrue(row4.getZeroHeight());
-        wb2.close();
-    }
-
-    /**
-     * Test adding cells to a row in various places and see if we can find them again.
-     */
-    @Test
-    public void testCellIterator() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-
-        // One cell at the beginning
-        Cell cell1 = row.createCell(1);
-        Iterator<Cell> it = row.cellIterator();
-        assertTrue(it.hasNext());
-        assertTrue(cell1 == it.next());
-        assertFalse(it.hasNext());
-
-        // Add another cell at the end
-        Cell cell2 = row.createCell(99);
-        it = row.cellIterator();
-        assertTrue(it.hasNext());
-        assertTrue(cell1 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell2 == it.next());
-
-        // Add another cell at the beginning
-        Cell cell3 = row.createCell(0);
-        it = row.cellIterator();
-        assertTrue(it.hasNext());
-        assertTrue(cell3 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell1 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell2 == it.next());
-
-        // Replace cell1
-        Cell cell4 = row.createCell(1);
-        it = row.cellIterator();
-        assertTrue(it.hasNext());
-        assertTrue(cell3 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell4 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell2 == it.next());
-        assertFalse(it.hasNext());
-
-        // Add another cell, specifying the cellType
-        Cell cell5 = row.createCell(2, CellType.STRING);
-        it = row.cellIterator();
-        assertNotNull(cell5);
-        assertTrue(it.hasNext());
-        assertTrue(cell3 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell4 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell5 == it.next());
-        assertTrue(it.hasNext());
-        assertTrue(cell2 == it.next());
-        assertEquals(CellType.STRING, cell5.getCellTypeEnum());
-        wb.close();
-    }
-
-    @Test
-    public void testRowStyle() throws IOException {
-       Workbook wb1 = _testDataProvider.createWorkbook();
-       Sheet sheet = wb1.createSheet("test");
-       Row row1 = sheet.createRow(0);
-       Row row2 = sheet.createRow(1);
-
-       // Won't be styled currently
-       assertEquals(false, row1.isFormatted());
-       assertEquals(false, row2.isFormatted());
-       assertEquals(null, row1.getRowStyle());
-       assertEquals(null, row2.getRowStyle());
-
-       // Style one
-       CellStyle style = wb1.createCellStyle();
-       style.setDataFormat((short)4);
-       row2.setRowStyle(style);
-
-       // Check
-       assertEquals(false, row1.isFormatted());
-       assertEquals(true, row2.isFormatted());
-       assertEquals(null, row1.getRowStyle());
-       assertEquals(style, row2.getRowStyle());
-
-       // Save, load and re-check
-       Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-       wb1.close();
-       
-       sheet = wb2.getSheetAt(0);
-
-       row1 = sheet.getRow(0);
-       row2 = sheet.getRow(1);
-       style = wb2.getCellStyleAt(style.getIndex());
-
-       assertEquals(false, row1.isFormatted());
-       assertEquals(true, row2.isFormatted());
-       assertEquals(null, row1.getRowStyle());
-       assertEquals(style, row2.getRowStyle());
-       assertEquals(4, style.getDataFormat());
-       
-       wb2.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
deleted file mode 100644
index 65db968..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
+++ /dev/null
@@ -1,1327 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.PaneInformation;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-/**
- * Common superclass for testing {@link org.apache.poi.xssf.usermodel.XSSFCell}  and
- * {@link org.apache.poi.hssf.usermodel.HSSFCell}
- */
-public abstract class BaseTestSheet {
-    private static final int ROW_COUNT = 40000;
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-    
-    protected final ITestDataProvider _testDataProvider;
-
-    protected BaseTestSheet(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-    
-    protected void trackColumnsForAutoSizingIfSXSSF(Sheet sheet) {
-        // do nothing for Sheet base class. This will be overridden for SXSSFSheets.
-    }
-
-    @Test
-    public void createRow() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        assertEquals(0, sheet.getPhysicalNumberOfRows());
-
-        //Test that we get null for undefined rownumber
-        assertNull(sheet.getRow(1));
-
-        // Test row creation with consecutive indexes
-        Row row1 = sheet.createRow(0);
-        Row row2 = sheet.createRow(1);
-        assertEquals(0, row1.getRowNum());
-        assertEquals(1, row2.getRowNum());
-        Iterator<Row> it = sheet.rowIterator();
-        assertTrue(it.hasNext());
-        assertSame(row1, it.next());
-        assertTrue(it.hasNext());
-        assertSame(row2, it.next());
-        assertEquals(1, sheet.getLastRowNum());
-
-        // Test row creation with non consecutive index
-        Row row101 = sheet.createRow(100);
-        assertNotNull(row101);
-        assertEquals(100, sheet.getLastRowNum());
-        assertEquals(3, sheet.getPhysicalNumberOfRows());
-
-        // Test overwriting an existing row
-        Row row2_ovrewritten = sheet.createRow(1);
-        Cell cell = row2_ovrewritten.createCell(0);
-        cell.setCellValue(100);
-        Iterator<Row> it2 = sheet.rowIterator();
-        assertTrue(it2.hasNext());
-        assertSame(row1, it2.next());
-        assertTrue(it2.hasNext());
-        Row row2_ovrewritten_ref = it2.next();
-        assertSame(row2_ovrewritten, row2_ovrewritten_ref);
-        assertEquals(100.0, row2_ovrewritten_ref.getCell(0).getNumericCellValue(), 0.0);
-        
-        workbook.close();
-    }
-    
-    @Test(expected=IllegalArgumentException.class)
-    public void createRowBeforeFirstRow() throws IOException {
-        final Workbook workbook = _testDataProvider.createWorkbook();
-        final Sheet sh = workbook.createSheet();
-        sh.createRow(0);
-        try {
-            // Negative rows not allowed
-            sh.createRow(-1);
-        } finally {
-            workbook.close();
-        }
-    }
-    
-    @Test(expected=IllegalArgumentException.class)
-    public void createRowAfterLastRow() throws IOException {
-        final SpreadsheetVersion version = _testDataProvider.getSpreadsheetVersion();
-        final Workbook workbook = _testDataProvider.createWorkbook();
-        final Sheet sh = workbook.createSheet();
-        sh.createRow(version.getLastRowIndex());
-        try {
-            // Row number must be between 0 and last row
-            sh.createRow(version.getLastRowIndex() + 1);
-        } finally {
-            workbook.close();
-        }
-    }
-
-    @Test
-    public void removeRow() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet1 = workbook.createSheet();
-        assertEquals(0, sheet1.getPhysicalNumberOfRows());
-        assertEquals(0, sheet1.getFirstRowNum());
-        assertEquals(0, sheet1.getLastRowNum());
-
-        Row row0 = sheet1.createRow(0);
-        assertEquals(1, sheet1.getPhysicalNumberOfRows());
-        assertEquals(0, sheet1.getFirstRowNum());
-        assertEquals(0, sheet1.getLastRowNum());
-        sheet1.removeRow(row0);
-        assertEquals(0, sheet1.getPhysicalNumberOfRows());
-        assertEquals(0, sheet1.getFirstRowNum());
-        assertEquals(0, sheet1.getLastRowNum());
-
-        sheet1.createRow(1);
-        Row row2 = sheet1.createRow(2);
-        assertEquals(2, sheet1.getPhysicalNumberOfRows());
-        assertEquals(1, sheet1.getFirstRowNum());
-        assertEquals(2, sheet1.getLastRowNum());
-
-        assertNotNull(sheet1.getRow(1));
-        assertNotNull(sheet1.getRow(2));
-        sheet1.removeRow(row2);
-        assertNotNull(sheet1.getRow(1));
-        assertNull(sheet1.getRow(2));
-        assertEquals(1, sheet1.getPhysicalNumberOfRows());
-        assertEquals(1, sheet1.getFirstRowNum());
-        assertEquals(1, sheet1.getLastRowNum());
-
-        Row row3 = sheet1.createRow(3);
-        Sheet sheet2 = workbook.createSheet();
-
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Specified row does not belong to this sheet");
-        sheet2.removeRow(row3);
-
-        workbook.close();
-    }
-
-    @Test
-    public void cloneSheet() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        CreationHelper factory = workbook.getCreationHelper();
-        Sheet sheet = workbook.createSheet("Test Clone");
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        Cell cell2 = row.createCell(1);
-        cell.setCellValue(factory.createRichTextString("clone_test"));
-        cell2.setCellFormula("SIN(1)");
-
-        Sheet clonedSheet = workbook.cloneSheet(0);
-        Row clonedRow = clonedSheet.getRow(0);
-
-        //Check for a good clone
-        assertEquals(clonedRow.getCell(0).getRichStringCellValue().getString(), "clone_test");
-
-        //Check that the cells are not somehow linked
-        cell.setCellValue(factory.createRichTextString("Difference Check"));
-        cell2.setCellFormula("cos(2)");
-        if ("Difference Check".equals(clonedRow.getCell(0).getRichStringCellValue().getString())) {
-            fail("string cell not properly cloned");
-        }
-        if ("COS(2)".equals(clonedRow.getCell(1).getCellFormula())) {
-            fail("formula cell not properly cloned");
-        }
-        assertEquals(clonedRow.getCell(0).getRichStringCellValue().getString(), "clone_test");
-        assertEquals(clonedRow.getCell(1).getCellFormula(), "SIN(1)");
-        
-        workbook.close();
-    }
-
-    /** tests that the sheet name for multiple clones of the same sheet is unique
-     * BUG 37416
-     */
-    @Test
-    public void cloneSheetMultipleTimes() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        CreationHelper factory = workbook.getCreationHelper();
-        Sheet sheet = workbook.createSheet("Test Clone");
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        cell.setCellValue(factory.createRichTextString("clone_test"));
-        //Clone the sheet multiple times
-        workbook.cloneSheet(0);
-        workbook.cloneSheet(0);
-
-        assertNotNull(workbook.getSheet("Test Clone"));
-        assertNotNull(workbook.getSheet("Test Clone (2)"));
-        assertEquals("Test Clone (3)", workbook.getSheetName(2));
-        assertNotNull(workbook.getSheet("Test Clone (3)"));
-
-        workbook.removeSheetAt(0);
-        workbook.removeSheetAt(0);
-        workbook.removeSheetAt(0);
-        workbook.createSheet("abc ( 123)");
-        workbook.cloneSheet(0);
-        assertEquals("abc (124)", workbook.getSheetName(1));
-        
-        workbook.close();
-    }
-
-    /**
-     * Setting landscape and portrait stuff on new sheets
-     */
-    @Test
-    public void printSetupLandscapeNew() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheetL = wb1.createSheet("LandscapeS");
-        Sheet sheetP = wb1.createSheet("LandscapeP");
-
-        // Check two aspects of the print setup
-        assertFalse(sheetL.getPrintSetup().getLandscape());
-        assertFalse(sheetP.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(1, sheetP.getPrintSetup().getCopies());
-
-        // Change one on each
-        sheetL.getPrintSetup().setLandscape(true);
-        sheetP.getPrintSetup().setCopies((short)3);
-
-        // Check taken
-        assertTrue(sheetL.getPrintSetup().getLandscape());
-        assertFalse(sheetP.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(3, sheetP.getPrintSetup().getCopies());
-
-        // Save and re-load, and check still there
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheetL = wb2.getSheet("LandscapeS");
-        sheetP = wb2.getSheet("LandscapeP");
-
-        assertTrue(sheetL.getPrintSetup().getLandscape());
-        assertFalse(sheetP.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(3, sheetP.getPrintSetup().getCopies());
-        wb2.close();
-    }
-    
-    /**
-     * Disallow creating wholly or partially overlapping merged regions
-     * as this results in a corrupted workbook
-     */
-    @Test
-    public void addOverlappingMergedRegions() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        final Sheet sheet = wb.createSheet();
-        
-        final CellRangeAddress baseRegion = new CellRangeAddress(0, 1, 0, 1); //A1:B2
-        sheet.addMergedRegion(baseRegion);
-        
-        try {
-            final CellRangeAddress duplicateRegion = new CellRangeAddress(0, 1, 0, 1); //A1:B2
-            sheet.addMergedRegion(duplicateRegion);
-            fail("Should not be able to add a merged region (" + duplicateRegion.formatAsString() + ") " +
-                 "if sheet already contains the same merged region (" + baseRegion.formatAsString() + ")");
-        } catch (final IllegalStateException e) { }
-        
-        try {
-            final CellRangeAddress partiallyOverlappingRegion = new CellRangeAddress(1, 2, 1, 2); //B2:C3
-            sheet.addMergedRegion(partiallyOverlappingRegion);
-            fail("Should not be able to add a merged region (" + partiallyOverlappingRegion.formatAsString() + ") " +
-                 "if it partially overlaps with an existing merged region (" + baseRegion.formatAsString() + ")");
-        } catch (final IllegalStateException e) { }
-        
-        try {
-            final CellRangeAddress subsetRegion = new CellRangeAddress(0, 1, 0, 0); //A1:A2
-            sheet.addMergedRegion(subsetRegion);
-            fail("Should not be able to add a merged region (" + subsetRegion.formatAsString() + ") " +
-                 "if it is a formal subset of an existing merged region (" + baseRegion.formatAsString() + ")");
-        } catch (final IllegalStateException e) { } //expected
-        
-        try {
-            final CellRangeAddress supersetRegion = new CellRangeAddress(0, 2, 0, 2); //A1:C3
-            sheet.addMergedRegion(supersetRegion);
-            fail("Should not be able to add a merged region (" + supersetRegion.formatAsString() + ") " +
-                 "if it is a formal superset of an existing merged region (" + baseRegion.formatAsString() + ")");
-        } catch (final IllegalStateException e) { }
-        
-        final CellRangeAddress disjointRegion = new CellRangeAddress(10, 11, 10, 11);
-        sheet.addMergedRegion(disjointRegion);
-        
-        wb.close();
-    }
-
-    /*
-     * Bug 56345: Reject single-cell merged regions
-     */
-    @Test
-    public void addMergedRegionWithSingleCellShouldFail() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-
-        final Sheet sheet = wb.createSheet();
-        final CellRangeAddress region = CellRangeAddress.valueOf("A1:A1");
-        try {
-            sheet.addMergedRegion(region);
-            fail("Should not be able to add a single-cell merged region (" + region.formatAsString() + ")");
-        } catch (final IllegalArgumentException e) {
-            // expected
-        }
-        wb.close();
-    }
-
-    /**
-     * Test adding merged regions. If the region's bounds are outside of the allowed range
-     * then an IllegalArgumentException should be thrown
-     *
-     */
-    @Test
-    public void addMerged() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        assertEquals(0, sheet.getNumMergedRegions());
-        SpreadsheetVersion ssVersion = _testDataProvider.getSpreadsheetVersion();
-
-        CellRangeAddress region = new CellRangeAddress(0, 1, 0, 1);
-        sheet.addMergedRegion(region);
-        assertEquals(1, sheet.getNumMergedRegions());
-
-        try {
-            region = new CellRangeAddress(-1, -1, -1, -1);
-            sheet.addMergedRegion(region);
-            fail("Expected exception");
-        } catch (IllegalArgumentException e){
-            // TODO: assertEquals("Minimum row number is 0.", e.getMessage());
-        }
-        try {
-            region = new CellRangeAddress(0, 0, 0, ssVersion.getLastColumnIndex() + 1);
-            sheet.addMergedRegion(region);
-            fail("Expected exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("Maximum column number is " + ssVersion.getLastColumnIndex(), e.getMessage());
-        }
-        try {
-            region = new CellRangeAddress(0, ssVersion.getLastRowIndex() + 1, 0, 1);
-            sheet.addMergedRegion(region);
-            fail("Expected exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("Maximum row number is " + ssVersion.getLastRowIndex(), e.getMessage());
-        }
-        assertEquals(1, sheet.getNumMergedRegions());
-        
-        wb.close();
-    }
-
-    /**
-     * When removing one merged region, it would break
-     *
-     */
-    @Test
-    public void removeMerged() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        CellRangeAddress region = new CellRangeAddress(0, 1, 0, 1);
-        sheet.addMergedRegion(region);
-        region = new CellRangeAddress(2, 3, 0, 1);
-        sheet.addMergedRegion(region);
-
-        sheet.removeMergedRegion(0);
-
-        region = sheet.getMergedRegion(0);
-        assertEquals("Left over region should be starting at row 2", 2, region.getFirstRow());
-
-        sheet.removeMergedRegion(0);
-
-        assertEquals("there should be no merged regions left!", 0, sheet.getNumMergedRegions());
-
-        //an, add, remove, get(0) would null pointer
-        sheet.addMergedRegion(region);
-        assertEquals("there should now be one merged region!", 1, sheet.getNumMergedRegions());
-        sheet.removeMergedRegion(0);
-        assertEquals("there should now be zero merged regions!", 0, sheet.getNumMergedRegions());
-        //add it again!
-        region.setLastRow(4);
-
-        sheet.addMergedRegion(region);
-        assertEquals("there should now be one merged region!", 1, sheet.getNumMergedRegions());
-
-        //should exist now!
-        assertTrue("there isn't more than one merged region in there", 1 <= sheet.getNumMergedRegions());
-        region = sheet.getMergedRegion(0);
-        assertEquals("the merged row to doesnt match the one we put in ", 4, region.getLastRow());
-        
-        wb.close();
-    }
-    
-    /**
-     * Remove multiple merged regions
-     */
-    @Test
-    public void removeMergedRegions() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        
-        Map<Integer, CellRangeAddress> mergedRegions = new HashMap<Integer, CellRangeAddress>();
-        for (int r=0; r<10; r++) {
-            CellRangeAddress region = new CellRangeAddress(r, r, 0, 1);
-            mergedRegions.put(r, region);
-            sheet.addMergedRegion(region);
-        }
-        assertCollectionEquals(mergedRegions.values(), sheet.getMergedRegions());
-        
-        Collection<Integer> removed = Arrays.asList(0, 2, 3, 6, 8);
-        mergedRegions.keySet().removeAll(removed);
-        sheet.removeMergedRegions(removed);
-        assertCollectionEquals(mergedRegions.values(), sheet.getMergedRegions());
-        
-        wb.close();
-    }
-    
-    private static void assertCollectionEquals(Collection<? extends Object> expected, Collection<? extends Object> actual) {
-        Set<Object> e = new HashSet<Object>(expected);
-        Set<Object> a = new HashSet<Object>(actual);
-        assertEquals(e, a);
-    }
-
-    @Test
-    public void shiftMerged() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        CreationHelper factory = wb.getCreationHelper();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        cell.setCellValue(factory.createRichTextString("first row, first cell"));
-
-        row = sheet.createRow(1);
-        cell = row.createCell(1);
-        cell.setCellValue(factory.createRichTextString("second row, second cell"));
-
-        CellRangeAddress region = CellRangeAddress.valueOf("A2:B2");
-        sheet.addMergedRegion(region);
-
-        sheet.shiftRows(1, 1, 1);
-
-        region = sheet.getMergedRegion(0);
-        
-        CellRangeAddress expectedRegion = CellRangeAddress.valueOf("A3:B3");
-        assertEquals("Merged region should shift down a row", expectedRegion, region);
-        
-        wb.close();
-    }
-
-    /**
-     * bug 58885: checking for overlapping merged regions when
-     * adding a merged region is safe, but runs in O(n).
-     * the check for merged regions when adding a merged region
-     * can be skipped (unsafe) and run in O(1).
-     */
-    @Test
-    public void addMergedRegionUnsafe() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        CellRangeAddress region1 = CellRangeAddress.valueOf("A1:B2");
-        CellRangeAddress region2 = CellRangeAddress.valueOf("B2:C3");
-        CellRangeAddress region3 = CellRangeAddress.valueOf("C3:D4");
-        CellRangeAddress region4 = CellRangeAddress.valueOf("J10:K11");
-        assumeTrue(region1.intersects(region2));
-        assumeTrue(region2.intersects(region3));
-
-        sh.addMergedRegionUnsafe(region1);
-        assertTrue(sh.getMergedRegions().contains(region1));
-
-        // adding a duplicate or overlapping merged region should not
-        // raise an exception with the unsafe version of addMergedRegion.
-
-        sh.addMergedRegionUnsafe(region2);
-
-        // the safe version of addMergedRegion should throw when trying to add a merged region that overlaps an existing region
-        assertTrue(sh.getMergedRegions().contains(region2));
-        try {
-            sh.addMergedRegion(region3);
-            fail("Expected IllegalStateException. region3 overlaps already added merged region2.");
-        } catch (final IllegalStateException e) {
-            // expected
-            assertFalse(sh.getMergedRegions().contains(region3));
-        }
-        // addMergedRegion should not re-validate previously-added merged regions
-        sh.addMergedRegion(region4);
-
-        // validation methods should detect a problem with previously added merged regions (runs in O(n^2) time)
-        try {
-            sh.validateMergedRegions();
-            fail("Expected validation to fail. Sheet contains merged regions A1:B2 and B2:C3, which overlap at B2.");
-        } catch (final IllegalStateException e) {
-            // expected
-        }
-
-        wb.close();
-    }
-
-    /**
-     * Tests the display of gridlines, formulas, and rowcolheadings.
-     */
-    @Test
-    public void displayOptions() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        assertEquals(sheet.isDisplayGridlines(), true);
-        assertEquals(sheet.isDisplayRowColHeadings(), true);
-        assertEquals(sheet.isDisplayFormulas(), false);
-        assertEquals(sheet.isDisplayZeros(), true);
-
-        sheet.setDisplayGridlines(false);
-        sheet.setDisplayRowColHeadings(false);
-        sheet.setDisplayFormulas(true);
-        sheet.setDisplayZeros(false);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-
-        assertEquals(sheet.isDisplayGridlines(), false);
-        assertEquals(sheet.isDisplayRowColHeadings(), false);
-        assertEquals(sheet.isDisplayFormulas(), true);
-        assertEquals(sheet.isDisplayZeros(), false);
-        
-        wb2.close();
-    }
-
-    @Test
-    public void columnWidth() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        //default column width measured in characters
-        sheet.setDefaultColumnWidth(10);
-        assertEquals(10, sheet.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*10, sheet.getColumnWidth(0));
-        assertEquals(256*10, sheet.getColumnWidth(1));
-        assertEquals(256*10, sheet.getColumnWidth(2));
-
-        //set custom width for D-F
-        for (char i = 'D'; i <= 'F'; i++) {
-            //Sheet#setColumnWidth accepts the width in units of 1/256th of a character width
-            int w = 256*12;
-            sheet.setColumnWidth(i, w);
-            assertEquals(w, sheet.getColumnWidth(i));
-        }
-        //reset the default column width, columns A-C change, D-F still have custom width
-        sheet.setDefaultColumnWidth(20);
-        assertEquals(20, sheet.getDefaultColumnWidth());
-        assertEquals(256*20, sheet.getColumnWidth(0));
-        assertEquals(256*20, sheet.getColumnWidth(1));
-        assertEquals(256*20, sheet.getColumnWidth(2));
-        for (char i = 'D'; i <= 'F'; i++) {
-            int w = 256*12;
-            assertEquals(w, sheet.getColumnWidth(i));
-        }
-
-        // check for 16-bit signed/unsigned error:
-        sheet.setColumnWidth(10, 40000);
-        assertEquals(40000, sheet.getColumnWidth(10));
-
-        //The maximum column width for an individual cell is 255 characters
-        try {
-            sheet.setColumnWidth(9, 256*256);
-            fail("expected exception");
-        } catch(IllegalArgumentException e){
-            assertEquals("The maximum column width for an individual cell is 255 characters.", e.getMessage());
-        }
-
-        //serialize and read again
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sheet = wb2.getSheetAt(0);
-        assertEquals(20, sheet.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*20, sheet.getColumnWidth(0));
-        assertEquals(256*20, sheet.getColumnWidth(1));
-        assertEquals(256*20, sheet.getColumnWidth(2));
-        //columns D-F have custom width
-        for (char i = 'D'; i <= 'F'; i++) {
-            short w = (256*12);
-            assertEquals(w, sheet.getColumnWidth(i));
-        }
-        assertEquals(40000, sheet.getColumnWidth(10));
-        
-        wb2.close();
-    }
-
-    
-    @Test
-    public void defaultRowHeight() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        sheet.setDefaultRowHeightInPoints(15);
-        assertEquals((short) 300, sheet.getDefaultRowHeight());
-        assertEquals(15.0F, sheet.getDefaultRowHeightInPoints(), 0F);
-
-        Row row = sheet.createRow(1);
-        // new row inherits  default height from the sheet
-        assertEquals(sheet.getDefaultRowHeight(), row.getHeight());
-
-        // Set a new default row height in twips and test getting the value in points
-        sheet.setDefaultRowHeight((short) 360);
-        assertEquals(18.0f, sheet.getDefaultRowHeightInPoints(), 0F);
-        assertEquals((short) 360, sheet.getDefaultRowHeight());
-
-        // Test that defaultRowHeight is a truncated short: E.G. 360inPoints -> 18; 361inPoints -> 18
-        sheet.setDefaultRowHeight((short) 361);
-        assertEquals((float)361/20, sheet.getDefaultRowHeightInPoints(), 0F);
-        assertEquals((short) 361, sheet.getDefaultRowHeight());
-
-        // Set a new default row height in points and test getting the value in twips
-        sheet.setDefaultRowHeightInPoints(17.5f);
-        assertEquals(17.5f, sheet.getDefaultRowHeightInPoints(), 0F);
-        assertEquals((short)(17.5f*20), sheet.getDefaultRowHeight());
-        
-        workbook.close();
-    }
-
-    /** cell with formula becomes null on cloning a sheet*/
-    @Test
-    public void bug35084() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet("Sheet1");
-        Row r = s.createRow(0);
-        r.createCell(0).setCellValue(1);
-        r.createCell(1).setCellFormula("A1*2");
-        Sheet s1 = wb.cloneSheet(0);
-        r = s1.getRow(0);
-        assertEquals("double", r.getCell(0).getNumericCellValue(), 1, 0); // sanity check
-        assertNotNull(r.getCell(1));
-        assertEquals("formula", r.getCell(1).getCellFormula(), "A1*2");
-        wb.close();
-    }
-
-    /** test that new default column styles get applied */
-    @Test
-    public void defaultColumnStyle() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        CellStyle style = wb.createCellStyle();
-        Sheet sheet = wb.createSheet();
-        sheet.setDefaultColumnStyle(0, style);
-        assertNotNull(sheet.getColumnStyle(0));
-        assertEquals(style.getIndex(), sheet.getColumnStyle(0).getIndex());
-
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        CellStyle style2 = cell.getCellStyle();
-        assertNotNull(style2);
-        assertEquals("style should match", style.getIndex(), style2.getIndex());
-        wb.close();
-    }
-
-    @Test
-    public void outlineProperties() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-
-        Sheet sheet = wb1.createSheet();
-
-        //TODO defaults are different in HSSF and XSSF
-        //assertTrue(sheet.getRowSumsBelow());
-        //assertTrue(sheet.getRowSumsRight());
-
-        sheet.setRowSumsBelow(false);
-        sheet.setRowSumsRight(false);
-
-        assertFalse(sheet.getRowSumsBelow());
-        assertFalse(sheet.getRowSumsRight());
-
-        sheet.setRowSumsBelow(true);
-        sheet.setRowSumsRight(true);
-
-        assertTrue(sheet.getRowSumsBelow());
-        assertTrue(sheet.getRowSumsRight());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        assertTrue(sheet.getRowSumsBelow());
-        assertTrue(sheet.getRowSumsRight());
-        wb2.close();
-    }
-
-    /**
-     * Test basic display and print properties
-     */
-    @Test
-    public void sheetProperties() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        assertFalse(sheet.getHorizontallyCenter());
-        sheet.setHorizontallyCenter(true);
-        assertTrue(sheet.getHorizontallyCenter());
-        sheet.setHorizontallyCenter(false);
-        assertFalse(sheet.getHorizontallyCenter());
-
-        assertFalse(sheet.getVerticallyCenter());
-        sheet.setVerticallyCenter(true);
-        assertTrue(sheet.getVerticallyCenter());
-        sheet.setVerticallyCenter(false);
-        assertFalse(sheet.getVerticallyCenter());
-
-        assertFalse(sheet.isPrintGridlines());
-        sheet.setPrintGridlines(true);
-        assertTrue(sheet.isPrintGridlines());
-        
-        assertFalse(sheet.isPrintRowAndColumnHeadings());
-        sheet.setPrintRowAndColumnHeadings(true);
-        assertTrue(sheet.isPrintRowAndColumnHeadings());
-
-        assertFalse(sheet.isDisplayFormulas());
-        sheet.setDisplayFormulas(true);
-        assertTrue(sheet.isDisplayFormulas());
-
-        assertTrue(sheet.isDisplayGridlines());
-        sheet.setDisplayGridlines(false);
-        assertFalse(sheet.isDisplayGridlines());
-
-        //TODO: default "guts" is different in HSSF and XSSF
-        //assertTrue(sheet.getDisplayGuts());
-        sheet.setDisplayGuts(false);
-        assertFalse(sheet.getDisplayGuts());
-
-        assertTrue(sheet.isDisplayRowColHeadings());
-        sheet.setDisplayRowColHeadings(false);
-        assertFalse(sheet.isDisplayRowColHeadings());
-
-        //TODO: default "autobreaks" is different in HSSF and XSSF
-        //assertTrue(sheet.getAutobreaks());
-        sheet.setAutobreaks(false);
-        assertFalse(sheet.getAutobreaks());
-
-        assertFalse(sheet.getScenarioProtect());
-
-        //TODO: default "fit-to-page" is different in HSSF and XSSF
-        //assertFalse(sheet.getFitToPage());
-        sheet.setFitToPage(true);
-        assertTrue(sheet.getFitToPage());
-        sheet.setFitToPage(false);
-        assertFalse(sheet.getFitToPage());
-        
-        wb.close();
-    }
-
-    public void baseTestGetSetMargin(double[] defaultMargins) throws IOException {
-        double marginLeft = defaultMargins[0];
-        double marginRight = defaultMargins[1];
-        double marginTop = defaultMargins[2];
-        double marginBottom = defaultMargins[3];
-        //double marginHeader = defaultMargins[4];
-        //double marginFooter = defaultMargins[5];
-
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("Sheet 1");
-        assertEquals(marginLeft, sheet.getMargin(Sheet.LeftMargin), 0.0);
-        sheet.setMargin(Sheet.LeftMargin, 10.0);
-        //left margin is custom, all others are default
-        assertEquals(10.0, sheet.getMargin(Sheet.LeftMargin), 0.0);
-        assertEquals(marginRight, sheet.getMargin(Sheet.RightMargin), 0.0);
-        assertEquals(marginTop, sheet.getMargin(Sheet.TopMargin), 0.0);
-        assertEquals(marginBottom, sheet.getMargin(Sheet.BottomMargin), 0.0);
-        sheet.setMargin(Sheet.RightMargin, 11.0);
-        assertEquals(11.0, sheet.getMargin(Sheet.RightMargin), 0.0);
-        sheet.setMargin(Sheet.TopMargin, 12.0);
-        assertEquals(12.0, sheet.getMargin(Sheet.TopMargin), 0.0);
-        sheet.setMargin(Sheet.BottomMargin, 13.0);
-        assertEquals(13.0, sheet.getMargin(Sheet.BottomMargin), 0.0);
-
-        sheet.setMargin(Sheet.FooterMargin, 5.6);
-        assertEquals(5.6, sheet.getMargin(Sheet.FooterMargin), 0.0);
-        sheet.setMargin(Sheet.HeaderMargin, 11.5);
-        assertEquals(11.5, sheet.getMargin(Sheet.HeaderMargin), 0.0);
-
-        // incorrect margin constant
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Unknown margin constant:  65");
-        sheet.setMargin((short) 65, 15);
-        
-        workbook.close();
-    }
-
-    @Test
-    public void rowBreaks() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        //Sheet#getRowBreaks() returns an empty array if no row breaks are defined
-        assertNotNull(sheet.getRowBreaks());
-        assertEquals(0, sheet.getRowBreaks().length);
-
-        sheet.setRowBreak(1);
-        assertEquals(1, sheet.getRowBreaks().length);
-        sheet.setRowBreak(15);
-        assertEquals(2, sheet.getRowBreaks().length);
-        assertEquals(1, sheet.getRowBreaks()[0]);
-        assertEquals(15, sheet.getRowBreaks()[1]);
-        sheet.setRowBreak(1);
-        assertEquals(2, sheet.getRowBreaks().length);
-        assertTrue(sheet.isRowBroken(1));
-        assertTrue(sheet.isRowBroken(15));
-
-        //now remove the created breaks
-        sheet.removeRowBreak(1);
-        assertEquals(1, sheet.getRowBreaks().length);
-        sheet.removeRowBreak(15);
-        assertEquals(0, sheet.getRowBreaks().length);
-
-        assertFalse(sheet.isRowBroken(1));
-        assertFalse(sheet.isRowBroken(15));
-        
-        workbook.close();
-    }
-
-    @Test
-    public void columnBreaks() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        assertNotNull(sheet.getColumnBreaks());
-        assertEquals(0, sheet.getColumnBreaks().length);
-
-        assertFalse(sheet.isColumnBroken(0));
-
-        sheet.setColumnBreak(11);
-        assertNotNull(sheet.getColumnBreaks());
-        assertEquals(11, sheet.getColumnBreaks()[0]);
-        sheet.setColumnBreak(12);
-        assertEquals(2, sheet.getColumnBreaks().length);
-        assertTrue(sheet.isColumnBroken(11));
-        assertTrue(sheet.isColumnBroken(12));
-
-        sheet.removeColumnBreak((short) 11);
-        assertEquals(1, sheet.getColumnBreaks().length);
-        sheet.removeColumnBreak((short) 15); //remove non-existing
-        assertEquals(1, sheet.getColumnBreaks().length);
-        sheet.removeColumnBreak((short) 12);
-        assertEquals(0, sheet.getColumnBreaks().length);
-
-        assertFalse(sheet.isColumnBroken(11));
-        assertFalse(sheet.isColumnBroken(12));
-        workbook.close();
-    }
-
-    @Test
-    public void getFirstLastRowNum() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("Sheet 1");
-        sheet.createRow(9);
-        sheet.createRow(0);
-        sheet.createRow(1);
-        assertEquals(0, sheet.getFirstRowNum());
-        assertEquals(9, sheet.getLastRowNum());
-        workbook.close();
-    }
-
-    @Test
-    public void getFooter() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("Sheet 1");
-        assertNotNull(sheet.getFooter());
-        sheet.getFooter().setCenter("test center footer");
-        assertEquals("test center footer", sheet.getFooter().getCenter());
-        workbook.close();
-    }
-
-    @Test
-    public void getSetColumnHidden() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("Sheet 1");
-        sheet.setColumnHidden(2, true);
-        assertTrue(sheet.isColumnHidden(2));
-        workbook.close();
-    }
-
-    @Test
-    public void protectSheet() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        assertFalse(sheet.getProtect());
-        sheet.protectSheet("Test");  
-        assertTrue(sheet.getProtect());
-        sheet.protectSheet(null);
-        assertFalse(sheet.getProtect());
-        wb.close();
-    }
-
-    @Test
-    public void createFreezePane() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        // create a workbook
-        Sheet sheet = wb.createSheet();
-        assertNull(sheet.getPaneInformation());
-        sheet.createFreezePane(0, 0);
-        // still null
-        assertNull(sheet.getPaneInformation());
-
-        sheet.createFreezePane(2, 3);
-
-        PaneInformation info = sheet.getPaneInformation();
-
-
-        assertEquals(PaneInformation.PANE_LOWER_RIGHT, info.getActivePane());
-        assertEquals(3, info.getHorizontalSplitPosition());
-        assertEquals(3, info.getHorizontalSplitTopRow());
-        assertEquals(2, info.getVerticalSplitLeftColumn());
-        assertEquals(2, info.getVerticalSplitPosition());
-
-        sheet.createFreezePane(0, 0);
-        // If both colSplit and rowSplit are zero then the existing freeze pane is removed
-        assertNull(sheet.getPaneInformation());
-
-        sheet.createFreezePane(0, 3);
-
-        info = sheet.getPaneInformation();
-
-        assertEquals(PaneInformation.PANE_LOWER_LEFT, info.getActivePane());
-        assertEquals(3, info.getHorizontalSplitPosition());
-        assertEquals(3, info.getHorizontalSplitTopRow());
-        assertEquals(0, info.getVerticalSplitLeftColumn());
-        assertEquals(0, info.getVerticalSplitPosition());
-
-        sheet.createFreezePane(3, 0);
-
-        info = sheet.getPaneInformation();
-
-        assertEquals(PaneInformation.PANE_UPPER_RIGHT, info.getActivePane());
-        assertEquals(0, info.getHorizontalSplitPosition());
-        assertEquals(0, info.getHorizontalSplitTopRow());
-        assertEquals(3, info.getVerticalSplitLeftColumn());
-        assertEquals(3, info.getVerticalSplitPosition());
-
-        sheet.createFreezePane(0, 0);
-        // If both colSplit and rowSplit are zero then the existing freeze pane is removed
-        assertNull(sheet.getPaneInformation());
-        
-        wb.close();
-    }
-
-    
-    @Test
-    public void getRepeatingRowsAndColumns() throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook(
-            "RepeatingRowsCols." 
-            + _testDataProvider.getStandardFileNameExtension());
-        
-        checkRepeatingRowsAndColumns(wb.getSheetAt(0), null, null);
-        checkRepeatingRowsAndColumns(wb.getSheetAt(1), "1:1", null);
-        checkRepeatingRowsAndColumns(wb.getSheetAt(2), null, "A:A");
-        checkRepeatingRowsAndColumns(wb.getSheetAt(3), "2:3", "A:B");
-        wb.close();
-    }
-
-
-    @Test
-    public void setRepeatingRowsAndColumnsBug47294() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb.createSheet();
-        sheet1.setRepeatingRows(CellRangeAddress.valueOf("1:4"));
-        assertEquals("1:4", sheet1.getRepeatingRows().formatAsString());
-
-        //must handle sheets with quotas, see Bugzilla #47294
-        Sheet sheet2 = wb.createSheet("My' Sheet");
-        sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:4"));
-        assertEquals("1:4", sheet2.getRepeatingRows().formatAsString());
-        wb.close();
-    }
-
-    @Test
-    public void setRepeatingRowsAndColumns() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb1.createSheet("Sheet1");
-        Sheet sheet2 = wb1.createSheet("Sheet2");
-        Sheet sheet3 = wb1.createSheet("Sheet3");
-        
-        checkRepeatingRowsAndColumns(sheet1, null, null);
-        
-        sheet1.setRepeatingRows(CellRangeAddress.valueOf("4:5"));
-        sheet2.setRepeatingColumns(CellRangeAddress.valueOf("A:C"));
-        sheet3.setRepeatingRows(CellRangeAddress.valueOf("1:4"));
-        sheet3.setRepeatingColumns(CellRangeAddress.valueOf("A:A"));
-        
-        checkRepeatingRowsAndColumns(sheet1, "4:5", null);
-        checkRepeatingRowsAndColumns(sheet2, null, "A:C");
-        checkRepeatingRowsAndColumns(sheet3, "1:4", "A:A");
-        
-        // write out, read back, and test refrain...
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet1 = wb2.getSheetAt(0);
-        sheet2 = wb2.getSheetAt(1);
-        sheet3 = wb2.getSheetAt(2);
-        
-        checkRepeatingRowsAndColumns(sheet1, "4:5", null);
-        checkRepeatingRowsAndColumns(sheet2, null, "A:C");
-        checkRepeatingRowsAndColumns(sheet3, "1:4", "A:A");
-        
-        // check removing repeating rows and columns       
-        sheet3.setRepeatingRows(null);
-        checkRepeatingRowsAndColumns(sheet3, null, "A:A");
-        
-        sheet3.setRepeatingColumns(null);
-        checkRepeatingRowsAndColumns(sheet3, null, null);
-        wb2.close();
-    }
-
-    private void checkRepeatingRowsAndColumns(
-        Sheet s, String expectedRows, String expectedCols) {
-        if (expectedRows == null) {
-            assertNull(s.getRepeatingRows());
-        } else {
-            assertEquals(expectedRows, s.getRepeatingRows().formatAsString());
-        }
-        if (expectedCols == null) {
-            assertNull(s.getRepeatingColumns());
-        } else {
-            assertEquals(expectedCols, s.getRepeatingColumns().formatAsString());
-        }
-    }
-
-    @Test
-    public void baseZoom() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        
-        // here we can only verify that setting some zoom values works, range-checking is different between the implementations
-        sheet.setZoom(75);
-        wb.close();
-    }
-    
-    @Test
-    public void baseShowInPane() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        sheet.showInPane(2, 3);
-        wb.close();
-    }
-
-    @Test
-    public void bug55723() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A:B");
-        AutoFilter filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-        // there seems to be currently no generic way to check the setting...
-
-        range = CellRangeAddress.valueOf("B:C");
-        filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-        // there seems to be currently no generic way to check the setting...
-        wb.close();
-    }
-
-    @Test
-    public void bug55723_Rows() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A4:B55000");
-        AutoFilter filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-        
-        wb.close();
-    }
-
-    @Test
-    public void bug55723d_RowsOver65k() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A4:B75000");
-        AutoFilter filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-        
-        wb.close();
-    }
-
-    /**
-     * XSSFSheet autoSizeColumn() on empty RichTextString fails
-     * @throws IOException 
-     */
-    @Test
-    public void bug48325() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Test");
-        trackColumnsForAutoSizingIfSXSSF(sheet);
-        CreationHelper factory = wb.getCreationHelper();
-
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-
-        Font font = wb.createFont();
-        RichTextString rts = factory.createRichTextString("");
-        rts.applyFont(font);
-        cell.setCellValue(rts);
-
-        sheet.autoSizeColumn(0);
-        
-        assertNotNull(_testDataProvider.writeOutAndReadBack(wb));
-        
-        wb.close();
-    }
-
-    @Test
-    public void getCellComment() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        Drawing dg = sheet.createDrawingPatriarch();
-        Comment comment = dg.createCellComment(workbook.getCreationHelper().createClientAnchor());
-        Cell cell = sheet.createRow(9).createCell(2);
-        comment.setAuthor("test C10 author");
-        cell.setCellComment(comment);
-
-        CellAddress ref = new CellAddress(9, 2);
-        assertNotNull(sheet.getCellComment(ref));
-        assertEquals("test C10 author", sheet.getCellComment(ref).getAuthor());
-        
-        assertNotNull(_testDataProvider.writeOutAndReadBack(workbook));
-        
-        workbook.close();
-    }
-    
-    
-    @Test
-    public void getCellComments() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("TEST");
-
-        // a sheet with no cell comments should return an empty map (not null or raise NPE).
-        assertEquals(Collections.emptyMap(), sheet.getCellComments());
-
-        Drawing dg = sheet.createDrawingPatriarch();
-        ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
-        
-        int nRows = 5;
-        int nCols = 6;
-        
-        for (int r=0; r<nRows; r++) {
-            sheet.createRow(r);
-            // Create columns in reverse order
-            for (int c=nCols-1; c>=0; c--) {
-                // When the comment box is visible, have it show in a 1x3 space
-                anchor.setCol1(c);
-                anchor.setCol2(c);
-                anchor.setRow1(r);
-                anchor.setRow2(r);
-                
-                // Create the comment and set the text-author
-                Comment comment = dg.createCellComment(anchor);
-                Cell cell = sheet.getRow(r).createCell(c);
-                comment.setAuthor("Author " + r);
-                RichTextString text = workbook.getCreationHelper().createRichTextString("Test comment at row=" + r + ", column=" + c);
-                comment.setString(text);
-                
-                // Assign the comment to the cell
-                cell.setCellComment(comment);
-            }
-        }
-        
-        Workbook wb = _testDataProvider.writeOutAndReadBack(workbook);
-        Sheet sh = wb.getSheet("TEST");
-        Map<CellAddress, ? extends Comment> cellComments = sh.getCellComments();
-        assertEquals(nRows*nCols, cellComments.size());
-        
-        for (Entry<CellAddress, ? extends Comment> e : cellComments.entrySet()) {
-            CellAddress ref = e.getKey();
-            Comment aComment = e.getValue();
-            assertEquals("Author " + ref.getRow(), aComment.getAuthor());
-            String text = "Test comment at row=" + ref.getRow() + ", column=" + ref.getColumn();
-            assertEquals(text, aComment.getString().getString());
-        }
-        
-        workbook.close();
-        wb.close();
-    }
-    
-    @Test
-    public void getHyperlink() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Hyperlink hyperlink = workbook.getCreationHelper().createHyperlink(HyperlinkType.URL);
-        hyperlink.setAddress("https://poi.apache.org/");
-        
-        Sheet sheet = workbook.createSheet();
-        Cell cell = sheet.createRow(5).createCell(1);
-        
-        assertEquals("list size before add", 0, sheet.getHyperlinkList().size());
-        cell.setHyperlink(hyperlink);
-        assertEquals("list size after add", 1, sheet.getHyperlinkList().size());
-        
-        assertEquals("list", hyperlink, sheet.getHyperlinkList().get(0));
-        CellAddress B6 = new CellAddress(5, 1);
-        assertEquals("row, col", hyperlink, sheet.getHyperlink(5, 1));
-        assertEquals("addr", hyperlink, sheet.getHyperlink(B6));
-        assertEquals("no hyperlink at A1", null, sheet.getHyperlink(CellAddress.A1));
-        
-        workbook.close();
-    }
-
-
-    @Test
-    public void newMergedRegionAt() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        CellRangeAddress region = CellRangeAddress.valueOf("B2:D4");
-        sheet.addMergedRegion(region);
-        assertEquals("B2:D4", sheet.getMergedRegion(0).formatAsString());
-        assertEquals(1, sheet.getNumMergedRegions());
-        
-        assertNotNull(_testDataProvider.writeOutAndReadBack(workbook));
-        
-        workbook.close();
-    }
-
-    @Test
-    public void showInPaneManyRowsBug55248() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet("Sheet 1");
-
-        sheet.showInPane(0, 0);
-
-        for(int i = ROW_COUNT/2;i < ROW_COUNT;i++) {
-            sheet.createRow(i);
-            sheet.showInPane(i, 0);
-            // this one fails: sheet.showInPane((short)i, 0);
-        }
-
-        int i = 0;
-        sheet.showInPane(i, i);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        checkRowCount(wb2);
-        
-        wb2.close();
-        wb1.close();
-    }
-
-    private void checkRowCount(Workbook wb) {
-        assertNotNull(wb);
-        final Sheet sh = wb.getSheet("Sheet 1");
-        assertNotNull(sh);
-        assertEquals(ROW_COUNT-1, sh.getLastRowNum());
-    }
-    
-    
-    @Test
-    public void testRightToLeft() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        assertFalse(sheet.isRightToLeft());
-        sheet.setRightToLeft(true);
-        assertTrue(sheet.isRightToLeft());
-        sheet.setRightToLeft(false);
-        assertFalse(sheet.isRightToLeft());
-        
-        wb.close();
-    }
-    
-    @Test
-    public void testNoMergedRegionsIsEmptyList() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        assertTrue(sheet.getMergedRegions().isEmpty());
-        wb.close();
-    }
-
-    /**
-     * Tests that the setAsActiveCell and getActiveCell function pairs work together
-     */
-    @Test
-    public void setActiveCell() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-        CellAddress B42 = new CellAddress("B42");
-        
-        // active cell behavior is undefined if not set.
-        // HSSFSheet defaults to A1 active cell, while XSSFSheet defaults to null.
-        if (sheet.getActiveCell() != null && !sheet.getActiveCell().equals(CellAddress.A1)) {
-            fail("If not set, active cell should default to null or A1");
-        }
-
-        sheet.setActiveCell(B42);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-
-        assertEquals(B42, sheet.getActiveCell());
-
-        wb1.close();
-        wb2.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
deleted file mode 100644
index 9224869..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Locale;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.JvmBugs;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Common superclass for testing automatic sizing of sheet columns
- *
- * @author Yegor Kozlov
- */
-public abstract class BaseTestSheetAutosizeColumn {
-
-    private final ITestDataProvider _testDataProvider;
-
-    private static Locale userLocale;
-    
-    @BeforeClass
-    public static void initLocale() {
-        userLocale = LocaleUtil.getUserLocale();
-        LocaleUtil.setUserLocale(Locale.ROOT);
-    }
-    
-    @AfterClass
-    public static void resetLocale() {
-        LocaleUtil.setUserLocale(userLocale);
-    }
-    
-    protected BaseTestSheetAutosizeColumn(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-    
-    protected void trackColumnsForAutoSizingIfSXSSF(Sheet sheet) {
-        // do nothing for Sheet base class. This will be overridden for SXSSFSheets.
-    }
-
-    @Test
-    public void numericCells() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        fixFonts(workbook);
-        DataFormat df = workbook.getCreationHelper().createDataFormat();
-        Sheet sheet = workbook.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(sheet);
-
-        Row row = sheet.createRow(0);
-        row.createCell(0).setCellValue(0); // getCachedFormulaResult() returns 0 for not evaluated formula cells
-        row.createCell(1).setCellValue(10);
-        row.createCell(2).setCellValue("10");
-        row.createCell(3).setCellFormula("(A1+B1)*1.0"); // a formula that returns '10'
-
-        Cell cell4 = row.createCell(4);       // numeric cell with a custom style
-        CellStyle style4 = workbook.createCellStyle();
-        style4.setDataFormat(df.getFormat("0.0000"));
-        cell4.setCellStyle(style4);
-        cell4.setCellValue(10); // formatted as '10.0000'
-
-        row.createCell(5).setCellValue("10.0000");
-
-        // autosize not-evaluated cells, formula cells are sized as if the result is 0
-        for (int i = 0; i < 6; i++) sheet.autoSizeColumn(i);
-
-        assertTrue(sheet.getColumnWidth(0) < sheet.getColumnWidth(1));  // width of '0' is less then width of '10'
-        assertEquals(sheet.getColumnWidth(1), sheet.getColumnWidth(2)); // 10 and '10' should be sized equally
-        assertEquals(sheet.getColumnWidth(3), sheet.getColumnWidth(0)); // formula result is unknown, the width is calculated  for '0'
-        assertEquals(sheet.getColumnWidth(4), sheet.getColumnWidth(5)); // 10.0000 and '10.0000'
-
-        // evaluate formulas and re-autosize
-        evaluateWorkbook(workbook);
-
-        for (int i = 0; i < 6; i++) sheet.autoSizeColumn(i);
-
-        assertTrue(sheet.getColumnWidth(0) < sheet.getColumnWidth(1));  // width of '0' is less then width of '10'
-        assertEquals(sheet.getColumnWidth(1), sheet.getColumnWidth(2)); // columns 1, 2 and 3 should have the same width
-        assertEquals(sheet.getColumnWidth(2), sheet.getColumnWidth(3)); // columns 1, 2 and 3 should have the same width
-        assertEquals(sheet.getColumnWidth(4), sheet.getColumnWidth(5)); // 10.0000 and '10.0000'
-        
-        workbook.close();
-    }
-
-    @Test
-    public void booleanCells() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        fixFonts(workbook);
-        Sheet sheet = workbook.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(sheet);
-
-        Row row = sheet.createRow(0);
-        row.createCell(0).setCellValue(0); // getCachedFormulaResult() returns 0 for not evaluated formula cells
-        row.createCell(1).setCellValue(true);
-        row.createCell(2).setCellValue("TRUE");
-        row.createCell(3).setCellFormula("1 > 0"); // a formula that returns true
-
-        // autosize not-evaluated cells, formula cells are sized as if the result is 0
-        for (int i = 0; i < 4; i++) sheet.autoSizeColumn(i);
-
-        assertTrue(sheet.getColumnWidth(1) > sheet.getColumnWidth(0));  // 'true' is wider than '0'
-        assertEquals(sheet.getColumnWidth(1), sheet.getColumnWidth(2));  // 10 and '10' should be sized equally
-        assertEquals(sheet.getColumnWidth(3), sheet.getColumnWidth(0));  // formula result is unknown, the width is calculated  for '0'
-
-        // evaluate formulas and re-autosize
-        evaluateWorkbook(workbook);
-
-        for (int i = 0; i < 4; i++) sheet.autoSizeColumn(i);
-
-        assertTrue(sheet.getColumnWidth(1) > sheet.getColumnWidth(0));  // 'true' is wider than '0'
-        assertEquals(sheet.getColumnWidth(1), sheet.getColumnWidth(2));  // columns 1, 2 and 3 should have the same width
-        assertEquals(sheet.getColumnWidth(2), sheet.getColumnWidth(3));  // columns 1, 2 and 3 should have the same width
-
-        workbook.close();
-    }
-
-    @Test
-    public void dateCells() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        fixFonts(workbook);
-        Sheet sheet = workbook.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(sheet);
-        DataFormat df = workbook.getCreationHelper().createDataFormat();
-
-        CellStyle style1 = workbook.createCellStyle();
-        style1.setDataFormat(df.getFormat("m"));
-
-        CellStyle style3 = workbook.createCellStyle();
-        style3.setDataFormat(df.getFormat("mmm"));
-
-        CellStyle style5 = workbook.createCellStyle(); //rotated text
-        style5.setDataFormat(df.getFormat("mmm/dd/yyyy"));
-
-        Calendar calendar = LocaleUtil.getLocaleCalendar(2010, 0, 1); // Jan 1 2010
-
-        Row row = sheet.createRow(0);
-        row.createCell(0).setCellValue(DateUtil.getJavaDate(0));   //default date
-
-        Cell cell1 = row.createCell(1);
-        cell1.setCellValue(calendar);
-        cell1.setCellStyle(style1);
-        row.createCell(2).setCellValue("1"); // column 1 should be sized as '1'
-
-        Cell cell3 = row.createCell(3);
-        cell3.setCellValue(calendar);
-        cell3.setCellStyle(style3);
-        row.createCell(4).setCellValue("Jan");
-
-        Cell cell5 = row.createCell(5);
-        cell5.setCellValue(calendar);
-        cell5.setCellStyle(style5);
-        row.createCell(6).setCellValue("Jan/01/2010");
-
-        Cell cell7 = row.createCell(7);
-        cell7.setCellFormula("DATE(2010,1,1)");
-        cell7.setCellStyle(style3); // should be sized as 'Jan'
-
-        // autosize not-evaluated cells, formula cells are sized as if the result is 0
-        for (int i = 0; i < 8; i++) sheet.autoSizeColumn(i);
-
-        assertEquals(sheet.getColumnWidth(2), sheet.getColumnWidth(1)); // date formatted as 'm'
-        assertTrue(sheet.getColumnWidth(3) > sheet.getColumnWidth(1));  // 'mmm' is wider than 'm'
-        assertEquals(sheet.getColumnWidth(4), sheet.getColumnWidth(3)); // date formatted as 'mmm'
-        assertTrue(sheet.getColumnWidth(5) > sheet.getColumnWidth(3));  // 'mmm/dd/yyyy' is wider than 'mmm'
-        assertEquals(sheet.getColumnWidth(6), sheet.getColumnWidth(5)); // date formatted as 'mmm/dd/yyyy'
-
-        // YK: width of not-evaluated formulas that return data is not determined
-        // POI seems to conevert '0' to Excel date which is the beginng of the Excel's date system
-
-        // evaluate formulas and re-autosize
-        evaluateWorkbook(workbook);
-
-        for (int i = 0; i < 8; i++) sheet.autoSizeColumn(i);
-
-        assertEquals(sheet.getColumnWidth(2), sheet.getColumnWidth(1)); // date formatted as 'm'
-        assertTrue(sheet.getColumnWidth(3) > sheet.getColumnWidth(1));  // 'mmm' is wider than 'm'
-        assertEquals(sheet.getColumnWidth(4), sheet.getColumnWidth(3)); // date formatted as 'mmm'
-        assertTrue(sheet.getColumnWidth(5) > sheet.getColumnWidth(3));  // 'mmm/dd/yyyy' is wider than 'mmm'
-        assertEquals(sheet.getColumnWidth(6), sheet.getColumnWidth(5)); // date formatted as 'mmm/dd/yyyy'
-        assertEquals(sheet.getColumnWidth(4), sheet.getColumnWidth(7)); // date formula formatted as 'mmm'
-        
-        workbook.close();
-    }
-
-    @Test
-    public void stringCells() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        fixFonts(workbook);
-        Sheet sheet = workbook.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(sheet);
-        Row row = sheet.createRow(0);
-        
-        Font defaultFont = workbook.getFontAt((short)0);
-
-        CellStyle style1 = workbook.createCellStyle();
-        Font font1 = workbook.createFont();
-        font1.setFontHeight((short)(2*defaultFont.getFontHeight()));
-        style1.setFont(font1);
-
-        row.createCell(0).setCellValue("x");
-        row.createCell(1).setCellValue("xxxx");
-        row.createCell(2).setCellValue("xxxxxxxxxxxx");
-        row.createCell(3).setCellValue("Apache\nSoftware Foundation"); // the text is splitted into two lines
-        row.createCell(4).setCellValue("Software Foundation");
-
-        Cell cell5 = row.createCell(5);
-        cell5.setCellValue("Software Foundation");
-        cell5.setCellStyle(style1); // same as in column 4 but the font is twice larger than the default font
-
-        for (int i = 0; i < 10; i++) sheet.autoSizeColumn(i);
-
-        assertTrue(2*sheet.getColumnWidth(0) < sheet.getColumnWidth(1)); // width is roughly proportional to the number of characters
-        assertTrue(2*sheet.getColumnWidth(1) < sheet.getColumnWidth(2));
-        assertEquals(sheet.getColumnWidth(4), sheet.getColumnWidth(3));
-        boolean ignoreFontSizeX2 = JvmBugs.hasLineBreakMeasurerBug();
-        assertTrue(ignoreFontSizeX2 || sheet.getColumnWidth(5) > sheet.getColumnWidth(4)); //larger font results in a wider column width
-        
-        workbook.close();
-    }
-
-    @Test
-    public void rotatedText() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        fixFonts(workbook);
-        Sheet sheet = workbook.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(sheet);
-        Row row = sheet.createRow(0);
-
-        CellStyle style1 = workbook.createCellStyle();
-        style1.setRotation((short)90);
-
-        Cell cell0 = row.createCell(0);
-        cell0.setCellValue("Apache Software Foundation");
-        cell0.setCellStyle(style1);
-
-        Cell cell1 = row.createCell(1);
-        cell1.setCellValue("Apache Software Foundation");
-
-        for (int i = 0; i < 2; i++) sheet.autoSizeColumn(i);
-
-        int w0 = sheet.getColumnWidth(0);
-        int w1 = sheet.getColumnWidth(1);
-
-        assertTrue(w0*5 < w1); // rotated text occupies at least five times less horizontal space than normal text
-        
-        workbook.close();
-    }
-
-    @Test
-    public void mergedCells() throws Exception {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        fixFonts(workbook);
-        Sheet sheet = workbook.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(sheet);
-
-        Row row = sheet.createRow(0);
-        sheet.addMergedRegion(CellRangeAddress.valueOf("A1:B1"));
-
-        Cell cell0 = row.createCell(0);
-        cell0.setCellValue("Apache Software Foundation");
-
-        int defaulWidth = sheet.getColumnWidth(0);
-        sheet.autoSizeColumn(0);
-        // column is unchanged if merged regions are ignored (Excel like behavior)
-        assertEquals(defaulWidth, sheet.getColumnWidth(0));
-
-        sheet.autoSizeColumn(0, true);
-        assertTrue(sheet.getColumnWidth(0) > defaulWidth);
-        
-        workbook.close();
-    }
-
-    
-    /**
-     * Auto-Sizing a column needs to work when we have rows
-     *  passed the 32767 boundary. See bug #48079
-     */
-    @Test
-    public void largeRowNumbers() throws Exception {
-       Workbook workbook = _testDataProvider.createWorkbook();
-       fixFonts(workbook);
-       Sheet sheet = workbook.createSheet();
-       trackColumnsForAutoSizingIfSXSSF(sheet);
-       
-       Row r0 = sheet.createRow(0);
-       r0.createCell(0).setCellValue("I am ROW 0");
-       Row r200 = sheet.createRow(200);
-       r200.createCell(0).setCellValue("I am ROW 200");
-       
-       // This should work fine
-       sheet.autoSizeColumn(0);
-       
-       // Get close to 32767
-       Row r32765 = sheet.createRow(32765);
-       r32765.createCell(0).setCellValue("Nearly there...");
-       sheet.autoSizeColumn(0);
-       
-       // To it
-       Row r32767 = sheet.createRow(32767);
-       r32767.createCell(0).setCellValue("At the boundary");
-       sheet.autoSizeColumn(0);
-       
-       // And passed it
-       Row r32768 = sheet.createRow(32768);
-       r32768.createCell(0).setCellValue("Passed");
-       Row r32769 = sheet.createRow(32769);
-       r32769.createCell(0).setCellValue("More Passed");
-       sheet.autoSizeColumn(0);
-       
-       // Long way passed
-       Row r60708 = sheet.createRow(60708);
-       r60708.createCell(0).setCellValue("Near the end");
-       sheet.autoSizeColumn(0);
-       
-       workbook.close();
-    }
-    
-    // TODO should we have this stuff in the FormulaEvaluator?
-    private void evaluateWorkbook(Workbook workbook){
-        FormulaEvaluator eval = workbook.getCreationHelper().createFormulaEvaluator();
-        for(int i=0; i < workbook.getNumberOfSheets(); i++) {
-            Sheet sheet = workbook.getSheetAt(i);
-            for (Row r : sheet) {
-                for (Cell c : r) {
-                    if (c.getCellTypeEnum() == CellType.FORMULA){
-                        eval.evaluateFormulaCellEnum(c);
-                    }
-                }
-            }
-        }
-    }
-
-    protected static void fixFonts(Workbook workbook) {
-        if (!JvmBugs.hasLineBreakMeasurerBug()) return;
-        for (int i=workbook.getNumberOfFonts()-1; i>=0; i--) {
-            Font f = workbook.getFontAt((short)0);
-            if ("Calibri".equals(f.getFontName())) {
-                f.setFontName("Lucida Sans");
-            } else if ("Cambria".equals(f.getFontName())) {
-                f.setFontName("Lucida Bright");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
deleted file mode 100644
index 6ce1e13..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public abstract class BaseTestSheetHiding {
-
-	protected final ITestDataProvider _testDataProvider;
-    protected Workbook wbH;
-    protected Workbook wbU;
-
-    private final String _file1, _file2;
-
-    /**
-	 * @param testDataProvider an object that provides test data in HSSF /  specific way
-	 */
-	protected BaseTestSheetHiding(ITestDataProvider testDataProvider,
-                                  String file1, String file2) {
-		_testDataProvider = testDataProvider;
-        _file1 = file1;
-        _file2 = file2;
-    }
-
-	@Before
-    public void setUp() {
-        wbH = _testDataProvider.openSampleWorkbook(_file1);
-        wbU = _testDataProvider.openSampleWorkbook(_file2);
-    }
-
-	@After
-	public void teadDown() throws IOException {
-	    wbH.close();
-	    wbU.close();
-	}
-	
-	@Test
-    public final void testSheetHidden() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("MySheet");
-
-        assertFalse(wb.isSheetHidden(0));
-        assertFalse(wb.isSheetVeryHidden(0));
-
-        wb.setSheetHidden(0, Workbook.SHEET_STATE_HIDDEN);
-        assertTrue(wb.isSheetHidden(0));
-        assertFalse(wb.isSheetVeryHidden(0));
-
-        wb.setSheetHidden(0, Workbook.SHEET_STATE_VERY_HIDDEN);
-        assertFalse(wb.isSheetHidden(0));
-        assertTrue(wb.isSheetVeryHidden(0));
-
-        wb.setSheetHidden(0, Workbook.SHEET_STATE_VISIBLE);
-        assertFalse(wb.isSheetHidden(0));
-        assertFalse(wb.isSheetVeryHidden(0));
-
-        try {
-            wb.setSheetHidden(0, -1);
-            fail("expectd exception");
-        } catch (IllegalArgumentException e){
-            // ok
-        }
-        try {
-            wb.setSheetHidden(0, 3);
-            fail("expectd exception");
-        } catch (IllegalArgumentException e){
-            // ok
-        }
-
-        wb.close();
-    }
-
-    /**
-     * Test that we get the right number of sheets,
-     *  with the right text on them, no matter what
-     *  the hidden flags are
-     */
-	@Test
-    public void testTextSheets() {
-        // Both should have two sheets
-        assertEquals(2, wbH.getNumberOfSheets());
-        assertEquals(2, wbU.getNumberOfSheets());
-
-        // All sheets should have one row
-        assertEquals(0, wbH.getSheetAt(0).getLastRowNum());
-        assertEquals(0, wbH.getSheetAt(1).getLastRowNum());
-        assertEquals(0, wbU.getSheetAt(0).getLastRowNum());
-        assertEquals(0, wbU.getSheetAt(1).getLastRowNum());
-
-        // All rows should have one column
-        assertEquals(1, wbH.getSheetAt(0).getRow(0).getLastCellNum());
-        assertEquals(1, wbH.getSheetAt(1).getRow(0).getLastCellNum());
-        assertEquals(1, wbU.getSheetAt(0).getRow(0).getLastCellNum());
-        assertEquals(1, wbU.getSheetAt(1).getRow(0).getLastCellNum());
-
-        // Text should be sheet based
-        assertEquals("Sheet1A1", wbH.getSheetAt(0).getRow(0).getCell(0).getRichStringCellValue().getString());
-        assertEquals("Sheet2A1", wbH.getSheetAt(1).getRow(0).getCell(0).getRichStringCellValue().getString());
-        assertEquals("Sheet1A1", wbU.getSheetAt(0).getRow(0).getCell(0).getRichStringCellValue().getString());
-        assertEquals("Sheet2A1", wbU.getSheetAt(1).getRow(0).getCell(0).getRichStringCellValue().getString());
-    }
-
-    /**
-     * Check that we can get and set the hidden flags
-     *  as expected
-     */
-	@Test
-    public void testHideUnHideFlags() {
-        assertTrue(wbH.isSheetHidden(0));
-        assertFalse(wbH.isSheetHidden(1));
-        assertFalse(wbU.isSheetHidden(0));
-        assertFalse(wbU.isSheetHidden(1));
-    }
-
-    /**
-     * Turn the sheet with none hidden into the one with
-     *  one hidden
-     */
-	@Test
-    public void testHide() throws IOException {
-        wbU.setSheetHidden(0, true);
-        assertTrue(wbU.isSheetHidden(0));
-        assertFalse(wbU.isSheetHidden(1));
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wbU);
-        assertTrue(wb2.isSheetHidden(0));
-        assertFalse(wb2.isSheetHidden(1));
-        wb2.close();
-    }
-
-    /**
-     * Turn the sheet with one hidden into the one with
-     *  none hidden
-     */
-	@Test
-    public void testUnHide() throws IOException {
-        wbH.setSheetHidden(0, false);
-        assertFalse(wbH.isSheetHidden(0));
-        assertFalse(wbH.isSheetHidden(1));
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wbH);
-        assertFalse(wb2.isSheetHidden(0));
-        assertFalse(wb2.isSheetHidden(1));
-        wb2.close();
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
deleted file mode 100644
index 556e89b..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
+++ /dev/null
@@ -1,717 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.apache.poi.POITestCase.skipTest;
-import static org.apache.poi.POITestCase.testPassesNow;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests row shifting capabilities.
- *
- * @author Shawn Laubach (slaubach at apache dot com)
- * @author Toshiaki Kamoshida (kamoshida.toshiaki at future dot co dot jp)
- */
-public abstract class BaseTestSheetShiftRows {
-
-    private final ITestDataProvider _testDataProvider;
-
-    protected BaseTestSheetShiftRows(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    /**
-     * Tests the shiftRows function.  Does three different shifts.
-     * After each shift, writes the workbook to file and reads back to
-     * check.  This ensures that if some changes code that breaks
-     * writing or what not, they realize it.
-     */
-    @Test
-    public final void testShiftRows() throws IOException {
-        // Read initial file in
-        String sampleName = "SimpleMultiCell." + _testDataProvider.getStandardFileNameExtension();
-        Workbook wb1 = _testDataProvider.openSampleWorkbook(sampleName);
-        Sheet s = wb1.getSheetAt( 0 );
-
-        // Shift the second row down 1 and write to temp file
-        s.shiftRows( 1, 1, 1 );
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        // Read from temp file and check the number of cells in each
-        // row (in original file each row was unique)
-        s = wb2.getSheetAt( 0 );
-
-        assertEquals(s.getRow(0).getPhysicalNumberOfCells(), 1);
-        confirmEmptyRow(s, 1);
-        assertEquals(s.getRow(2).getPhysicalNumberOfCells(), 2);
-        assertEquals(s.getRow(3).getPhysicalNumberOfCells(), 4);
-        assertEquals(s.getRow(4).getPhysicalNumberOfCells(), 5);
-
-        // Shift rows 1-3 down 3 in the current one.  This tests when
-        // 1 row is blank.  Write to a another temp file
-        s.shiftRows( 0, 2, 3 );
-        Workbook wb3 = _testDataProvider.writeOutAndReadBack(wb2);
-        wb2.close();
-
-        // Read and ensure things are where they should be
-        s = wb3.getSheetAt(0);
-        confirmEmptyRow(s, 0);
-        confirmEmptyRow(s, 1);
-        confirmEmptyRow(s, 2);
-        assertEquals(s.getRow(3).getPhysicalNumberOfCells(), 1);
-        confirmEmptyRow(s, 4);
-        assertEquals(s.getRow(5).getPhysicalNumberOfCells(), 2);
-
-        wb3.close();
-        
-        // Read the first file again
-        Workbook wb4 = _testDataProvider.openSampleWorkbook(sampleName);
-        s = wb4.getSheetAt( 0 );
-
-        // Shift rows 3 and 4 up and write to temp file
-        s.shiftRows( 2, 3, -2 );
-        Workbook wb5 = _testDataProvider.writeOutAndReadBack(wb4);
-        wb4.close();
-        s = wb5.getSheetAt( 0 );
-        assertEquals(s.getRow(0).getPhysicalNumberOfCells(), 3);
-        assertEquals(s.getRow(1).getPhysicalNumberOfCells(), 4);
-        confirmEmptyRow(s, 2);
-        confirmEmptyRow(s, 3);
-        assertEquals(s.getRow(4).getPhysicalNumberOfCells(), 5);
-        wb5.close();
-    }
-    private static void confirmEmptyRow(Sheet s, int rowIx) {
-        Row row = s.getRow(rowIx);
-        assertTrue(row == null || row.getPhysicalNumberOfCells() == 0);
-    }
-
-    /**
-     * Tests when rows are null.
-     */
-    @Test
-    public final void testShiftRow() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        s.createRow(0).createCell(0).setCellValue("TEST1");
-        s.createRow(3).createCell(0).setCellValue("TEST2");
-        s.shiftRows(0,4,1);
-        wb.close();
-    }
-
-    /**
-     * When shifting rows, the page breaks should go with it
-     */
-    @Test
-    public void testShiftRowBreaks() throws IOException { // TODO - enable XSSF test
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row row = s.createRow(4);
-        row.createCell(0).setCellValue("test");
-        s.setRowBreak(4);
-
-        s.shiftRows(4, 4, 2);
-        assertTrue("Row number 6 should have a pagebreak", s.isRowBroken(6));
-        wb.close();
-    }
-
-    @Test
-    public void testShiftWithComments() throws IOException {
-        Workbook wb1 = _testDataProvider.openSampleWorkbook("comments." + _testDataProvider.getStandardFileNameExtension());
-
-        Sheet sheet = wb1.getSheet("Sheet1");
-        assertEquals(3, sheet.getLastRowNum());
-
-        // Verify comments are in the position expected
-        assertNotNull(sheet.getCellComment(new CellAddress(0,0)));
-        assertNull(sheet.getCellComment(new CellAddress(1,0)));
-        assertNotNull(sheet.getCellComment(new CellAddress(2,0)));
-        assertNotNull(sheet.getCellComment(new CellAddress(3,0)));
-
-        String comment1 = sheet.getCellComment(new CellAddress(0,0)).getString().getString();
-        assertEquals(comment1,"comment top row1 (index0)\n");
-        String comment3 = sheet.getCellComment(new CellAddress(2,0)).getString().getString();
-        assertEquals(comment3,"comment top row3 (index2)\n");
-        String comment4 = sheet.getCellComment(new CellAddress(3,0)).getString().getString();
-        assertEquals(comment4,"comment top row4 (index3)\n");
-
-        //Workbook wbBack = _testDataProvider.writeOutAndReadBack(wb);
-
-        // Shifting all but first line down to test comments shifting
-        sheet.shiftRows(1, sheet.getLastRowNum(), 1, true, true);
-
-        // Test that comments were shifted as expected
-        assertEquals(4, sheet.getLastRowNum());
-        assertNotNull(sheet.getCellComment(new CellAddress(0,0)));
-        assertNull(sheet.getCellComment(new CellAddress(1,0)));
-        assertNull(sheet.getCellComment(new CellAddress(2,0)));
-        assertNotNull(sheet.getCellComment(new CellAddress(3,0)));
-        assertNotNull(sheet.getCellComment(new CellAddress(4,0)));
-
-        String comment1_shifted = sheet.getCellComment(new CellAddress(0,0)).getString().getString();
-        assertEquals(comment1,comment1_shifted);
-        String comment3_shifted = sheet.getCellComment(new CellAddress(3,0)).getString().getString();
-        assertEquals(comment3,comment3_shifted);
-        String comment4_shifted = sheet.getCellComment(new CellAddress(4,0)).getString().getString();
-        assertEquals(comment4,comment4_shifted);
-
-        // Write out and read back in again
-        // Ensure that the changes were persisted
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        sheet = wb2.getSheet("Sheet1");
-        assertEquals(4, sheet.getLastRowNum());
-
-        // Verify comments are in the position expected after the shift
-        assertNotNull(sheet.getCellComment(new CellAddress(0,0)));
-        assertNull(sheet.getCellComment(new CellAddress(1,0)));
-        assertNull(sheet.getCellComment(new CellAddress(2,0)));
-        assertNotNull(sheet.getCellComment(new CellAddress(3,0)));
-        assertNotNull(sheet.getCellComment(new CellAddress(4,0)));
-
-        comment1_shifted = sheet.getCellComment(new CellAddress(0,0)).getString().getString();
-        assertEquals(comment1,comment1_shifted);
-        comment3_shifted = sheet.getCellComment(new CellAddress(3,0)).getString().getString();
-        assertEquals(comment3,comment3_shifted);
-        comment4_shifted = sheet.getCellComment(new CellAddress(4,0)).getString().getString();
-        assertEquals(comment4,comment4_shifted);
-
-        // Shifting back up again, now two rows
-        sheet.shiftRows(2, sheet.getLastRowNum(), -2, true, true);
-
-        // TODO: it seems HSSFSheet does not correctly remove comments from rows that are overwritten
-        // by shifting rows...
-        if(!(wb2 instanceof HSSFWorkbook)) {
-            assertEquals(2, sheet.getLastRowNum());
-            
-            // Verify comments are in the position expected
-            assertNull("Had: " + (sheet.getCellComment(new CellAddress(0,0)) == null ? "null" : sheet.getCellComment(new CellAddress(0,0)).getString()),
-                    sheet.getCellComment(new CellAddress(0,0)));
-            assertNotNull(sheet.getCellComment(new CellAddress(1,0)));
-            assertNotNull(sheet.getCellComment(new CellAddress(2,0)));
-        }
-
-        comment1 = sheet.getCellComment(new CellAddress(1,0)).getString().getString();
-        assertEquals(comment1,"comment top row3 (index2)\n");
-        String comment2 = sheet.getCellComment(new CellAddress(2,0)).getString().getString();
-        assertEquals(comment2,"comment top row4 (index3)\n");
-        
-        wb2.close();
-    }
-
-    @Test
-    public final void testShiftWithNames() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb.createSheet("Sheet1");
-        wb.createSheet("Sheet2");
-        Row row = sheet1.createRow(0);
-        row.createCell(0).setCellValue(1.1);
-        row.createCell(1).setCellValue(2.2);
-
-        Name name1 = wb.createName();
-        name1.setNameName("name1");
-        name1.setRefersToFormula("Sheet1!$A$1+Sheet1!$B$1");
-
-        Name name2 = wb.createName();
-        name2.setNameName("name2");
-        name2.setRefersToFormula("Sheet1!$A$1");
-
-        //refers to A1 but on Sheet2. Should stay unaffected.
-        Name name3 = wb.createName();
-        name3.setNameName("name3");
-        name3.setRefersToFormula("Sheet2!$A$1");
-
-        //The scope of this one is Sheet2. Should stay unaffected.
-        Name name4 = wb.createName();
-        name4.setNameName("name4");
-        name4.setRefersToFormula("A1");
-        name4.setSheetIndex(1);
-
-        sheet1.shiftRows(0, 1, 2);  //shift down the top row on Sheet1.
-        name1 = wb.getName("name1");
-        assertEquals("Sheet1!$A$3+Sheet1!$B$3", name1.getRefersToFormula());
-
-        name2 = wb.getName("name2");
-        assertEquals("Sheet1!$A$3", name2.getRefersToFormula());
-
-        //name3 and name4 refer to Sheet2 and should not be affected
-        name3 = wb.getName("name3");
-        assertEquals("Sheet2!$A$1", name3.getRefersToFormula());
-
-        name4 = wb.getName("name4");
-        assertEquals("A1", name4.getRefersToFormula());
-        
-        wb.close();
-    }
-
-    @Test
-    public final void testShiftWithMergedRegions() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        Row row = sheet.createRow(0);
-        row.createCell(0).setCellValue(1.1);
-        row.createCell(1).setCellValue(2.2);
-        CellRangeAddress region = new CellRangeAddress(0, 0, 0, 2);
-        assertEquals("A1:C1", region.formatAsString());
-
-        sheet.addMergedRegion(region);
-
-        sheet.shiftRows(0, 1, 2);
-        region = sheet.getMergedRegion(0);
-        assertEquals("A3:C3", region.formatAsString());
-        wb.close();
-    }
-
-    //@Ignore("bug 56454: Incorrectly handles merged regions that do not contain column 0")
-    @Test
-    public final void shiftWithMergedRegions_bug56454() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        // populate sheet cells
-        for (int i = 0; i < 10; i++) {
-            Row row = sheet.createRow(i);
-            
-            for (int j = 0; j < 10; j++) {
-                Cell cell = row.createCell(j, CellType.STRING);
-                cell.setCellValue(i + "x" + j);
-            }
-        }
-        
-        CellRangeAddress A4_B7 = CellRangeAddress.valueOf("A4:B7");
-        CellRangeAddress C4_D7 = CellRangeAddress.valueOf("C4:D7");
-        
-        sheet.addMergedRegion(A4_B7);
-        sheet.addMergedRegion(C4_D7);
-        
-        assumeTrue(sheet.getLastRowNum() > 8);
-        
-        // Insert a row in the middle of both merged regions.
-        sheet.shiftRows(4, sheet.getLastRowNum(), 1);
-        
-        // all regions should still start at row 3, and elongate by 1 row
-        List<CellRangeAddress> expectedMergedRegions = new ArrayList<CellRangeAddress>();
-        CellRangeAddress A4_B8 = CellRangeAddress.valueOf("A4:B8"); //A4:B7 should be elongated by 1 row
-        CellRangeAddress C4_D8 = CellRangeAddress.valueOf("C4:D8"); //C4:B7 should be elongated by 1 row
-        expectedMergedRegions.add(A4_B8);
-        expectedMergedRegions.add(C4_D8);
-        
-        // This test is written as expected-to-fail and should be rewritten
-        // as expected-to-pass when the bug is fixed.
-        // FIXME: remove try, catch, and testPassesNow, skipTest when test passes
-        try {
-            assertEquals(expectedMergedRegions, sheet.getMergedRegions());
-            testPassesNow(56454);
-        } catch (AssertionError e) {
-            skipTest(e);
-        }
-        wb.close();
-    }
-    
-    
-
-    /**
-     * See bug #34023
-     */
-    @Test
-    public final void testShiftWithFormulas() throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook("ForShifting." + _testDataProvider.getStandardFileNameExtension());
-
-        Sheet sheet = wb.getSheet("Sheet1");
-        assertEquals(20, sheet.getLastRowNum());
-
-        confirmRow(sheet, 0, 1, 171, 1, "ROW(D1)", "100+B1", "COUNT(D1:E1)");
-        confirmRow(sheet, 1, 2, 172, 1, "ROW(D2)", "100+B2", "COUNT(D2:E2)");
-        confirmRow(sheet, 2, 3, 173, 1, "ROW(D3)", "100+B3", "COUNT(D3:E3)");
-
-        confirmCell(sheet, 6, 1, 271, "200+B1");
-        confirmCell(sheet, 7, 1, 272, "200+B2");
-        confirmCell(sheet, 8, 1, 273, "200+B3");
-
-        confirmCell(sheet, 14, 0, 0.0, "A12"); // the cell referred to by this formula will be replaced
-
-        // -----------
-        // Row index 1 -> 11 (row "2" -> row "12")
-        sheet.shiftRows(1, 1, 10);
-
-        // Now check what sheet looks like after move
-
-        // no changes on row "1"
-        confirmRow(sheet, 0, 1, 171, 1, "ROW(D1)", "100+B1", "COUNT(D1:E1)");
-
-        // row "2" is now empty
-        confirmEmptyRow(sheet, 1);
-
-        // Row "2" moved to row "12", and the formula has been updated.
-        // note however that the cached formula result (2) has not been updated. (POI differs from Excel here)
-        confirmRow(sheet, 11, 2, 172, 1, "ROW(D12)", "100+B12", "COUNT(D12:E12)");
-
-        // no changes on row "3"
-        confirmRow(sheet, 2, 3, 173, 1, "ROW(D3)", "100+B3", "COUNT(D3:E3)");
-
-
-        confirmCell(sheet, 14, 0, 0.0, "#REF!");
-
-
-        // Formulas on rows that weren't shifted:
-        confirmCell(sheet, 6, 1, 271, "200+B1");
-        confirmCell(sheet, 7, 1, 272, "200+B12"); // this one moved
-        confirmCell(sheet, 8, 1, 273, "200+B3");
-
-        // check formulas on other sheets
-        Sheet sheet2 = wb.getSheet("Sheet2");
-        confirmCell(sheet2,  0, 0, 371, "300+Sheet1!B1");
-        confirmCell(sheet2,  1, 0, 372, "300+Sheet1!B12");
-        confirmCell(sheet2,  2, 0, 373, "300+Sheet1!B3");
-
-        confirmCell(sheet2, 11, 0, 300, "300+Sheet1!#REF!");
-
-
-        // Note - named ranges formulas have not been updated
-        wb.close();
-    }
-
-    private static void confirmRow(Sheet sheet, int rowIx, double valA, double valB, double valC,
-                String formulaA, String formulaB, String formulaC) {
-        confirmCell(sheet, rowIx, 4, valA, formulaA);
-        confirmCell(sheet, rowIx, 5, valB, formulaB);
-        confirmCell(sheet, rowIx, 6, valC, formulaC);
-    }
-
-    private static void confirmCell(Sheet sheet, int rowIx, int colIx,
-            double expectedValue, String expectedFormula) {
-        Cell cell = sheet.getRow(rowIx).getCell(colIx);
-        assertEquals(expectedValue, cell.getNumericCellValue(), 0.0);
-        assertEquals(expectedFormula, cell.getCellFormula());
-    }
-
-    @Test
-    public final void testShiftSharedFormulasBug54206() throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook("54206." + _testDataProvider.getStandardFileNameExtension());
-
-        Sheet sheet = wb.getSheetAt(0);
-        assertEquals("SUMIF($B$19:$B$82,$B4,G$19:G$82)", sheet.getRow(3).getCell(6).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$82,$B4,H$19:H$82)", sheet.getRow(3).getCell(7).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$82,$B4,I$19:I$82)", sheet.getRow(3).getCell(8).getCellFormula());
-
-        assertEquals("SUMIF($B$19:$B$82,$B15,G$19:G$82)", sheet.getRow(14).getCell(6).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$82,$B15,H$19:H$82)", sheet.getRow(14).getCell(7).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$82,$B15,I$19:I$82)", sheet.getRow(14).getCell(8).getCellFormula());
-
-        // now the whole block G4L:15
-        for(int i = 3; i <= 14; i++){
-            for(int j = 6; j <= 8; j++){
-                String col = CellReference.convertNumToColString(j);
-                String expectedFormula = "SUMIF($B$19:$B$82,$B"+(i+1)+","+col+"$19:"+col+"$82)";
-                assertEquals(expectedFormula, sheet.getRow(i).getCell(j).getCellFormula());
-            }
-        }
-
-        assertEquals("SUM(G24:I24)", sheet.getRow(23).getCell(9).getCellFormula());
-        assertEquals("SUM(G25:I25)", sheet.getRow(24).getCell(9).getCellFormula());
-        assertEquals("SUM(G26:I26)", sheet.getRow(25).getCell(9).getCellFormula());
-
-        sheet.shiftRows(24, sheet.getLastRowNum(), 4, true, false);
-
-        assertEquals("SUMIF($B$19:$B$86,$B4,G$19:G$86)", sheet.getRow(3).getCell(6).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$86,$B4,H$19:H$86)", sheet.getRow(3).getCell(7).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$86,$B4,I$19:I$86)", sheet.getRow(3).getCell(8).getCellFormula());
-
-        assertEquals("SUMIF($B$19:$B$86,$B15,G$19:G$86)", sheet.getRow(14).getCell(6).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$86,$B15,H$19:H$86)", sheet.getRow(14).getCell(7).getCellFormula());
-        assertEquals("SUMIF($B$19:$B$86,$B15,I$19:I$86)", sheet.getRow(14).getCell(8).getCellFormula());
-
-        // now the whole block G4L:15
-        for(int i = 3; i <= 14; i++){
-            for(int j = 6; j <= 8; j++){
-                String col = CellReference.convertNumToColString(j);
-                String expectedFormula = "SUMIF($B$19:$B$86,$B"+(i+1)+","+col+"$19:"+col+"$86)";
-                assertEquals(expectedFormula, sheet.getRow(i).getCell(j).getCellFormula());
-            }
-        }
-
-        assertEquals("SUM(G24:I24)", sheet.getRow(23).getCell(9).getCellFormula());
-
-        // shifted rows
-        assertTrue( sheet.getRow(24) == null || sheet.getRow(24).getCell(9) == null);
-        assertTrue( sheet.getRow(25) == null || sheet.getRow(25).getCell(9) == null);
-        assertTrue( sheet.getRow(26) == null || sheet.getRow(26).getCell(9) == null);
-        assertTrue( sheet.getRow(27) == null || sheet.getRow(27).getCell(9) == null);
-
-        assertEquals("SUM(G29:I29)", sheet.getRow(28).getCell(9).getCellFormula());
-        assertEquals("SUM(G30:I30)", sheet.getRow(29).getCell(9).getCellFormula());
-        wb.close();
-    }
-
-    @Test
-    public void testBug55280() throws IOException {
-        Workbook w = _testDataProvider.createWorkbook();
-        Sheet s = w.createSheet();
-        for (int row = 0; row < 5000; ++row)
-            s.addMergedRegion(new CellRangeAddress(row, row, 0, 3));
-
-        s.shiftRows(0, 4999, 1);        // takes a long time...
-        w.close();
-    }
-
-    @Test
-    public void test47169() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet();
-        sheet.createRow(30);
-        sheet.shiftRows(29, 29, 1, true, true);
-        sheet.createRow(30);
-
-        wb.close();
-    }
-    
-    /**
-     * Unified test for:
-     * bug 46742: XSSFSheet.shiftRows should shift hyperlinks
-     * bug 52903: HSSFSheet.shiftRows should shift hyperlinks
-     *
-     * @throws IOException
-     */
-    @Test
-    public void testBug46742_52903_shiftHyperlinks() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("test");
-        Row row = sheet.createRow(0);
-        
-        // How to create hyperlinks
-        // https://poi.apache.org/spreadsheet/quick-guide.html#Hyperlinks
-        CreationHelper helper = wb.getCreationHelper();
-        CellStyle hlinkStyle = wb.createCellStyle();
-        Font hlinkFont = wb.createFont();
-        hlinkFont.setUnderline(Font.U_SINGLE);
-        hlinkFont.setColor(IndexedColors.BLUE.getIndex());
-        hlinkStyle.setFont(hlinkFont);
-
-        // 3D relative document link
-        // CellAddress=A1, shifted to A4
-        Cell cell = row.createCell(0);
-        cell.setCellStyle(hlinkStyle);
-        createHyperlink(helper, cell, HyperlinkType.DOCUMENT, "test!E1");
-        
-        // URL
-        cell = row.createCell(1);
-        // CellAddress=B1, shifted to B4
-        cell.setCellStyle(hlinkStyle);
-        createHyperlink(helper, cell, HyperlinkType.URL, "http://poi.apache.org/");
-        
-        // row0 will be shifted on top of row1, so this URL should be removed from the workbook
-        Row overwrittenRow = sheet.createRow(3);
-        cell = overwrittenRow.createCell(2);
-        // CellAddress=C4, will be overwritten (deleted)
-        cell.setCellStyle(hlinkStyle);
-        createHyperlink(helper, cell, HyperlinkType.EMAIL, "mailto:poi@apache.org");
-        
-        // hyperlinks on this row are unaffected by the row shifting, so the hyperlinks should not move
-        Row unaffectedRow = sheet.createRow(20);
-        cell = unaffectedRow.createCell(3);
-        // CellAddress=D21, will be unaffected
-        cell.setCellStyle(hlinkStyle);
-        createHyperlink(helper, cell, HyperlinkType.FILE, "54524.xlsx");
-        
-        cell = wb.createSheet("other").createRow(0).createCell(0);
-        // CellAddress=Other!A1, will be unaffected
-        cell.setCellStyle(hlinkStyle);
-        createHyperlink(helper, cell, HyperlinkType.URL, "http://apache.org/");
-        
-        int startRow = 0;
-        int endRow = 0;
-        int n = 3;
-        sheet.shiftRows(startRow, endRow, n);
-        
-        Workbook read = _testDataProvider.writeOutAndReadBack(wb);
-        wb.close();
-        
-        Sheet sh = read.getSheet("test");
-        
-        Row shiftedRow = sh.getRow(3);
-        
-        // document link anchored on a shifted cell should be moved
-        // Note that hyperlinks do not track what they point to, so this hyperlink should still refer to test!E1
-        verifyHyperlink(shiftedRow.getCell(0), HyperlinkType.DOCUMENT, "test!E1");
-        
-        // URL, EMAIL, and FILE links anchored on a shifted cell should be moved
-        verifyHyperlink(shiftedRow.getCell(1), HyperlinkType.URL, "http://poi.apache.org/");
-        
-        // Make sure hyperlinks were moved and not copied
-        assertNull("Document hyperlink should be moved, not copied", sh.getHyperlink(0, 0));
-        assertNull("URL hyperlink should be moved, not copied", sh.getHyperlink(0, 1));
-        
-        // Make sure hyperlink in overwritten row is deleted
-        assertEquals(3, sh.getHyperlinkList().size());
-        CellAddress unexpectedLinkAddress = new CellAddress("C4");
-        for (Hyperlink link : sh.getHyperlinkList()) {
-            final CellAddress linkAddress = new CellAddress(link.getFirstRow(), link.getFirstColumn());
-            if (linkAddress.equals(unexpectedLinkAddress)) {
-                fail("Row 4, including the hyperlink at C4, should have " +
-                     "been deleted when Row 1 was shifted on top of it.");
-            }
-        }
-        
-        // Make sure unaffected rows are not shifted
-        Cell unaffectedCell = sh.getRow(20).getCell(3);
-        assertTrue(cellHasHyperlink(unaffectedCell));
-        verifyHyperlink(unaffectedCell, HyperlinkType.FILE, "54524.xlsx");
-        
-        // Make sure cells on other sheets are not affected
-        unaffectedCell = read.getSheet("other").getRow(0).getCell(0);
-        assertTrue(cellHasHyperlink(unaffectedCell));
-        verifyHyperlink(unaffectedCell, HyperlinkType.URL, "http://apache.org/");
-        
-        read.close();
-    }
-    
-    //@Ignore("bug 56454: Incorrectly handles merged regions that do not contain column 0")
-    @Test
-    public void shiftRowsWithMergedRegionsThatDoNotContainColumnZero() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("test");
-        
-        // populate sheet cells
-        for (int i = 0; i < 10; i++) {
-            Row row = sheet.createRow(i);
-            for (int j = 0; j < 12; j++) {
-                Cell cell = row.createCell(j);
-                cell.setCellValue(i + "x" + j);
-            }
-        }
-
-        CellRangeAddress A4_B7 = new CellRangeAddress(3, 6, 0, 1);
-        CellRangeAddress C5_D7 = new CellRangeAddress(4, 6, 2, 3);
-
-        sheet.addMergedRegion(A4_B7);
-        sheet.addMergedRegion(C5_D7);
-
-        // A4:B7 will elongate vertically
-        // C5:D7 will be shifted down with same size
-        sheet.shiftRows(4, sheet.getLastRowNum(), 1);
-
-        // This test is written as expected-to-fail and should be rewritten
-        // as expected-to-pass when the bug is fixed.
-        // FIXME: remove try, catch, and testPassesNow, skipTest when test passes
-        try {
-            assertEquals(2, sheet.getNumMergedRegions());
-            assertEquals(CellRangeAddress.valueOf("A4:B8"), sheet.getMergedRegion(0));
-            assertEquals(CellRangeAddress.valueOf("C5:D8"), sheet.getMergedRegion(1));
-            testPassesNow(56454);
-        } catch (AssertionError e) {
-            skipTest(e);
-        }
-        
-        wb.close();
-    }
-
-    @Test
-    public void shiftMergedRowsToMergedRowsUp() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("test");
-        populateSheetCells(sheet);
-
-
-        CellRangeAddress A1_E1 = new CellRangeAddress(0, 0, 0, 4);
-        CellRangeAddress A2_C2 = new CellRangeAddress(1, 1, 0, 2);
-
-        sheet.addMergedRegion(A1_E1);
-        sheet.addMergedRegion(A2_C2);
-
-        // A1:E1 should be removed
-        // A2:C2 will be A1:C1
-        sheet.shiftRows(1, sheet.getLastRowNum(), -1);
-
-        assertEquals(1, sheet.getNumMergedRegions());
-        assertEquals(CellRangeAddress.valueOf("A1:C1"), sheet.getMergedRegion(0));
-
-        wb.close();
-    }
-
-    private void populateSheetCells(Sheet sheet) {
-        // populate sheet cells
-        for (int i = 0; i < 2; i++) {
-            Row row = sheet.createRow(i);
-            for (int j = 0; j < 5; j++) {
-                Cell cell = row.createCell(j);
-                cell.setCellValue(i + "x" + j);
-            }
-        }
-    }
-
-    @Test
-    public void shiftMergedRowsToMergedRowsDown() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("test");
-
-        // populate sheet cells
-        populateSheetCells(sheet);
-
-        CellRangeAddress A1_E1 = new CellRangeAddress(0, 0, 0, 4);
-        CellRangeAddress A2_C2 = new CellRangeAddress(1, 1, 0, 2);
-
-        sheet.addMergedRegion(A1_E1);
-        sheet.addMergedRegion(A2_C2);
-
-        // A1:E1 should be moved to A2:E2
-        // A2:C2 will be removed
-        sheet.shiftRows(0, 0, 1);
-
-        assertEquals(1, sheet.getNumMergedRegions());
-        assertEquals(CellRangeAddress.valueOf("A2:E2"), sheet.getMergedRegion(0));
-
-        wb.close();
-    }
-
-    private void createHyperlink(CreationHelper helper, Cell cell, HyperlinkType linkType, String ref) {
-        cell.setCellValue(ref);
-        Hyperlink link = helper.createHyperlink(linkType);
-        link.setAddress(ref);
-        cell.setHyperlink(link);
-    }
-    
-    private void verifyHyperlink(Cell cell, HyperlinkType linkType, String ref) {
-        assertTrue(cellHasHyperlink(cell));
-        Hyperlink link = cell.getHyperlink();
-        assertEquals(linkType, link.getTypeEnum());
-        assertEquals(ref, link.getAddress());
-    }
-    
-    private boolean cellHasHyperlink(Cell cell) {
-        return (cell != null) && (cell.getHyperlink() != null);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
deleted file mode 100644
index bbd95cc..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.formula.FormulaParseException;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Common superclass for testing usermodel API for array formulas.<br/>
- * Formula evaluation is not tested here.
- *
- * @author Yegor Kozlov
- * @author Josh Micich
- */
-public abstract class BaseTestSheetUpdateArrayFormulas {
-    protected final ITestDataProvider _testDataProvider;
-
-    protected BaseTestSheetUpdateArrayFormulas(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-
-    @Test
-    public final void testAutoCreateOtherCells() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet("Sheet1");
-
-        Row row1 = sheet.createRow(0);
-        Cell cellA1 = row1.createCell(0);
-        Cell cellB1 = row1.createCell(1);
-        String formula = "42";
-        sheet.setArrayFormula(formula, CellRangeAddress.valueOf("A1:B2"));
-
-        assertEquals(formula, cellA1.getCellFormula());
-        assertEquals(formula, cellB1.getCellFormula());
-        Row row2 = sheet.getRow(1);
-        assertNotNull(row2);
-        assertEquals(formula, row2.getCell(0).getCellFormula());
-        assertEquals(formula, row2.getCell(1).getCellFormula());
-        
-        workbook.close();
-    }
-    /**
-     *  Set single-cell array formula
-     */
-    @Test
-    public final void testSetArrayFormula_singleCell() throws IOException {
-        Cell[] cells;
-
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        Cell cell = sheet.createRow(0).createCell(0);
-        assertFalse(cell.isPartOfArrayFormulaGroup());
-        try {
-            cell.getArrayFormulaRange();
-            fail("expected exception");
-        } catch (IllegalStateException e){
-            assertEquals("Cell A1 is not part of an array formula.", e.getMessage());
-        }
-
-        // row 3 does not yet exist
-        assertNull(sheet.getRow(2));
-        CellRangeAddress range = new CellRangeAddress(2, 2, 2, 2);
-        cells = sheet.setArrayFormula("SUM(C11:C12*D11:D12)", range).getFlattenedCells();
-        assertEquals(1, cells.length);
-        // sheet.setArrayFormula creates rows and cells for the designated range
-        assertNotNull(sheet.getRow(2));
-        cell = sheet.getRow(2).getCell(2);
-        assertNotNull(cell);
-
-        assertTrue(cell.isPartOfArrayFormulaGroup());
-        //retrieve the range and check it is the same
-        assertEquals(range.formatAsString(), cell.getArrayFormulaRange().formatAsString());
-        //check the formula
-        assertEquals("SUM(C11:C12*D11:D12)", cell.getCellFormula());
-        
-        workbook.close();
-    }
-
-    /**
-     * Set multi-cell array formula
-     */
-    @Test
-    public final void testSetArrayFormula_multiCell() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        // multi-cell formula
-        // rows 3-5 don't exist yet
-        assertNull(sheet.getRow(3));
-        assertNull(sheet.getRow(4));
-        assertNull(sheet.getRow(5));
-
-        CellRangeAddress range = CellRangeAddress.valueOf("C4:C6");
-        Cell[] cells = sheet.setArrayFormula("SUM(A1:A3*B1:B3)", range).getFlattenedCells();
-        assertEquals(3, cells.length);
-
-        // sheet.setArrayFormula creates rows and cells for the designated range
-        assertSame(cells[0], sheet.getRow(3).getCell(2));
-        assertSame(cells[1], sheet.getRow(4).getCell(2));
-        assertSame(cells[2], sheet.getRow(5).getCell(2));
-
-        for(Cell acell : cells){
-            assertTrue(acell.isPartOfArrayFormulaGroup());
-            assertEquals(CellType.FORMULA, acell.getCellTypeEnum());
-            assertEquals("SUM(A1:A3*B1:B3)", acell.getCellFormula());
-            //retrieve the range and check it is the same
-            assertEquals(range.formatAsString(), acell.getArrayFormulaRange().formatAsString());
-        }
-        
-        workbook.close();
-    }
-
-    /**
-     * Passing an incorrect formula to sheet.setArrayFormula
-     *  should throw FormulaParseException
-     */
-    @Test
-    public final void testSetArrayFormula_incorrectFormula() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        try {
-            sheet.setArrayFormula("incorrect-formula(C11_C12*D11_D12)",
-                    new CellRangeAddress(10, 10, 10, 10));
-            fail("expected exception");
-        } catch (FormulaParseException e){
-            //expected exception
-        }
-        
-        workbook.close();
-    }
-
-    /**
-     * Calls of cell.getArrayFormulaRange and sheet.removeArrayFormula
-     * on a not-array-formula cell throw IllegalStateException
-     */
-    @Test
-    public final void testArrayFormulas_illegalCalls() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        Cell cell = sheet.createRow(0).createCell(0);
-        assertFalse(cell.isPartOfArrayFormulaGroup());
-        try {
-            cell.getArrayFormulaRange();
-            fail("expected exception");
-        } catch (IllegalStateException e){
-            assertEquals("Cell A1 is not part of an array formula.", e.getMessage());
-        }
-
-        try {
-            sheet.removeArrayFormula(cell);
-            fail("expected exception");
-        } catch (IllegalArgumentException e){
-            assertEquals("Cell A1 is not part of an array formula.", e.getMessage());
-        }
-        
-        workbook.close();
-    }
-
-    /**
-     * create and remove array formulas
-     */
-    @Test
-    public final void testRemoveArrayFormula() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        CellRangeAddress range = new CellRangeAddress(3, 5, 2, 2);
-        assertEquals("C4:C6", range.formatAsString());
-        CellRange<?> cr = sheet.setArrayFormula("SUM(A1:A3*B1:B3)", range);
-        assertEquals(3, cr.size());
-
-        // remove the formula cells in C4:C6
-        CellRange<?> dcells = sheet.removeArrayFormula(cr.getTopLeftCell());
-        // removeArrayFormula should return the same cells as setArrayFormula
-        assertArrayEquals(cr.getFlattenedCells(), dcells.getFlattenedCells());
-
-        for(Cell acell : cr){
-            assertFalse(acell.isPartOfArrayFormulaGroup());
-            assertEquals(CellType.BLANK, acell.getCellTypeEnum());
-        }
-
-        // cells C4:C6 are not included in array formula,
-        // invocation of sheet.removeArrayFormula on any of them throws IllegalArgumentException
-        for(Cell acell : cr){
-            try {
-                sheet.removeArrayFormula(acell);
-                fail("expected exception");
-            } catch (IllegalArgumentException e){
-                String ref = new CellReference(acell).formatAsString();
-                assertEquals("Cell "+ref+" is not part of an array formula.", e.getMessage());
-            }
-        }
-        
-        workbook.close();
-    }
-
-    /**
-     * Test that when reading a workbook from input stream, array formulas are recognized
-     */
-    @Test
-    public final void testReadArrayFormula() throws IOException {
-        Cell[] cells;
-
-        Workbook workbook1 = _testDataProvider.createWorkbook();
-        Sheet sheet1 = workbook1.createSheet();
-        cells = sheet1.setArrayFormula("SUM(A1:A3*B1:B3)", CellRangeAddress.valueOf("C4:C6")).getFlattenedCells();
-        assertEquals(3, cells.length);
-
-        cells = sheet1.setArrayFormula("MAX(A1:A3*B1:B3)", CellRangeAddress.valueOf("A4:A6")).getFlattenedCells();
-        assertEquals(3, cells.length);
-
-        Sheet sheet2 = workbook1.createSheet();
-        cells = sheet2.setArrayFormula("MIN(A1:A3*B1:B3)", CellRangeAddress.valueOf("D2:D4")).getFlattenedCells();
-        assertEquals(3, cells.length);
-
-        Workbook workbook2 = _testDataProvider.writeOutAndReadBack(workbook1);
-        workbook1.close();
-        sheet1 = workbook2.getSheetAt(0);
-        for(int rownum=3; rownum <= 5; rownum++) {
-            Cell cell1 = sheet1.getRow(rownum).getCell(2);
-            assertTrue( cell1.isPartOfArrayFormulaGroup());
-
-            Cell cell2 = sheet1.getRow(rownum).getCell(0);
-            assertTrue( cell2.isPartOfArrayFormulaGroup());
-        }
-
-        sheet2 = workbook2.getSheetAt(1);
-        for(int rownum=1; rownum <= 3; rownum++) {
-            Cell cell1 = sheet2.getRow(rownum).getCell(3);
-            assertTrue( cell1.isPartOfArrayFormulaGroup());
-        }
-        
-        workbook2.close();
-    }
-
-    /**
-     * Test that we can set pre-calculated formula result for array formulas
-     */
-    @Test
-    public void testModifyArrayCells_setFormulaResult() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        //single-cell array formula
-        CellRange<? extends Cell> srange =
-                sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5"));
-        Cell scell = srange.getTopLeftCell();
-        assertEquals(CellType.FORMULA, scell.getCellTypeEnum());
-        assertEquals(0.0, scell.getNumericCellValue(), 0);
-        scell.setCellValue(1.1);
-        assertEquals(1.1, scell.getNumericCellValue(), 0);
-
-        //multi-cell array formula
-        CellRange<? extends Cell> mrange =
-                sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3"));
-        for(Cell mcell : mrange){
-            assertEquals(CellType.FORMULA, mcell.getCellTypeEnum());
-            assertEquals(0.0, mcell.getNumericCellValue(), 0);
-            double fmlaResult = 1.2;
-            mcell.setCellValue(fmlaResult);
-            assertEquals(fmlaResult, mcell.getNumericCellValue(), 0);
-        }
-        workbook.close();
-    }
-
-    @Test
-    public void testModifyArrayCells_setCellType() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        // single-cell array formulas behave just like normal cells -
-        // changing cell type removes the array formula and associated cached result
-        CellRange<? extends Cell> srange =
-                sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5"));
-        Cell scell = srange.getTopLeftCell();
-        assertEquals(CellType.FORMULA, scell.getCellTypeEnum());
-        assertEquals(0.0, scell.getNumericCellValue(), 0);
-        scell.setCellType(CellType.STRING);
-        assertEquals(CellType.STRING, scell.getCellTypeEnum());
-        scell.setCellValue("string cell");
-        assertEquals("string cell", scell.getStringCellValue());
-
-        //once you create a multi-cell array formula, you cannot change the type of its cells
-        CellRange<? extends Cell> mrange =
-                sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3"));
-        for(Cell mcell : mrange){
-            try {
-                assertEquals(CellType.FORMULA, mcell.getCellTypeEnum());
-                mcell.setCellType(CellType.NUMERIC);
-                fail("expected exception");
-            } catch (IllegalStateException e){
-                CellReference ref = new CellReference(mcell);
-                String msg = "Cell "+ref.formatAsString()+" is part of a multi-cell array formula. You cannot change part of an array.";
-                assertEquals(msg, e.getMessage());
-            }
-            // a failed invocation of Cell.setCellType leaves the cell
-            // in the state that it was in prior to the invocation
-            assertEquals(CellType.FORMULA, mcell.getCellTypeEnum());
-            assertTrue(mcell.isPartOfArrayFormulaGroup());
-        }
-        workbook.close();
-    }
-
-    @Test
-    public void testModifyArrayCells_setCellFormula() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        CellRange<? extends Cell> srange =
-                sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5"));
-        Cell scell = srange.getTopLeftCell();
-        assertEquals("SUM(A4:A6,B4:B6)", scell.getCellFormula());
-        assertEquals(CellType.FORMULA, scell.getCellTypeEnum());
-        assertTrue(scell.isPartOfArrayFormulaGroup());
-        scell.setCellFormula("SUM(A4,A6)");
-        //we are now a normal formula cell
-        assertEquals("SUM(A4,A6)", scell.getCellFormula());
-        assertFalse(scell.isPartOfArrayFormulaGroup());
-        assertEquals(CellType.FORMULA, scell.getCellTypeEnum());
-        //check that setting formula result works
-        assertEquals(0.0, scell.getNumericCellValue(), 0);
-        scell.setCellValue(33.0);
-        assertEquals(33.0, scell.getNumericCellValue(), 0);
-
-        //multi-cell array formula
-        CellRange<? extends Cell> mrange =
-                sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3"));
-        for(Cell mcell : mrange){
-            //we cannot set individual formulas for cells included in an array formula
-            try {
-                assertEquals("A1:A3*B1:B3", mcell.getCellFormula());
-                mcell.setCellFormula("A1+A2");
-                fail("expected exception");
-            } catch (IllegalStateException e){
-                CellReference ref = new CellReference(mcell);
-                String msg = "Cell "+ref.formatAsString()+" is part of a multi-cell array formula. You cannot change part of an array.";
-                assertEquals(msg, e.getMessage());
-            }
-            // a failed invocation of Cell.setCellFormula leaves the cell
-            // in the state that it was in prior to the invocation
-            assertEquals("A1:A3*B1:B3", mcell.getCellFormula());
-            assertTrue(mcell.isPartOfArrayFormulaGroup());
-        }
-        workbook.close();
-    }
-
-    @Test
-    public void testModifyArrayCells_removeCell() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        //single-cell array formulas behave just like normal cells
-        CellRangeAddress cra = CellRangeAddress.valueOf("B5");
-        CellRange<? extends Cell> srange =
-                sheet.setArrayFormula("SUM(A4:A6,B4:B6)", cra);
-        Cell scell = srange.getTopLeftCell();
-
-        Row srow = sheet.getRow(cra.getFirstRow());
-        assertSame(srow, scell.getRow());
-        srow.removeCell(scell);
-        assertNull(srow.getCell(cra.getFirstColumn()));
-
-        //re-create the removed cell
-        scell = srow.createCell(cra.getFirstColumn());
-        assertEquals(CellType.BLANK, scell.getCellTypeEnum());
-        assertFalse(scell.isPartOfArrayFormulaGroup());
-
-        //we cannot remove cells included in a multi-cell array formula
-        CellRange<? extends Cell> mrange =
-                sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3"));
-        for(Cell mcell : mrange){
-            int columnIndex = mcell.getColumnIndex();
-            Row mrow = mcell.getRow();
-            try {
-                mrow.removeCell(mcell);
-                fail("expected exception");
-            } catch (IllegalStateException e){
-                CellReference ref = new CellReference(mcell);
-                String msg = "Cell "+ref.formatAsString()+" is part of a multi-cell array formula. You cannot change part of an array.";
-                assertEquals(msg, e.getMessage());
-            }
-            // a failed invocation of Row.removeCell leaves the row
-            // in the state that it was in prior to the invocation
-            assertSame(mcell, mrow.getCell(columnIndex));
-            assertTrue(mcell.isPartOfArrayFormulaGroup());
-            assertEquals(CellType.FORMULA, mcell.getCellTypeEnum());
-        }
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testModifyArrayCells_removeRow() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        //single-cell array formulas behave just like normal cells
-        CellRangeAddress cra = CellRangeAddress.valueOf("B5");
-        CellRange<? extends Cell> srange =
-                sheet.setArrayFormula("SUM(A4:A6,B4:B6)", cra);
-        Cell scell = srange.getTopLeftCell();
-        assertEquals(CellType.FORMULA, scell.getCellTypeEnum());
-
-        Row srow = scell.getRow();
-        assertSame(srow, sheet.getRow(cra.getFirstRow()));
-        sheet.removeRow(srow);
-        assertNull(sheet.getRow(cra.getFirstRow()));
-
-        //re-create the removed row and cell
-        scell = sheet.createRow(cra.getFirstRow()).createCell(cra.getFirstColumn());
-        assertEquals(CellType.BLANK, scell.getCellTypeEnum());
-        assertFalse(scell.isPartOfArrayFormulaGroup());
-
-        //we cannot remove rows with cells included in a multi-cell array formula
-        CellRange<? extends Cell> mrange =
-                sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3"));
-        for(Cell mcell : mrange){
-            int columnIndex = mcell.getColumnIndex();
-            Row mrow = mcell.getRow();
-            try {
-                sheet.removeRow(mrow);
-                fail("expected exception");
-            } catch (IllegalStateException e){
-                // String msg = "Row[rownum="+mrow.getRowNum()+"] contains cell(s) included in a multi-cell array formula. You cannot change part of an array.";
-                // assertEquals(msg, e.getMessage());
-            }
-            // a failed invocation of Row.removeCell leaves the row
-            // in the state that it was in prior to the invocation
-            assertSame(mrow, sheet.getRow(mrow.getRowNum()));
-            assertSame(mcell, mrow.getCell(columnIndex));
-            assertTrue(mcell.isPartOfArrayFormulaGroup());
-            assertEquals(CellType.FORMULA, mcell.getCellTypeEnum());
-        }
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testModifyArrayCells_mergeCellsSingle() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        assertEquals(0, sheet.getNumMergedRegions());
-
-        //single-cell array formulas behave just like normal cells
-        CellRange<? extends Cell> srange =
-                sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5"));
-        Cell scell = srange.getTopLeftCell();
-        sheet.addMergedRegion(CellRangeAddress.valueOf("B5:C6"));
-        //we are still an array formula
-        assertEquals(CellType.FORMULA, scell.getCellTypeEnum());
-        assertTrue(scell.isPartOfArrayFormulaGroup());
-        assertEquals(1, sheet.getNumMergedRegions());
-        
-        workbook.close();
-    }
-    
-    @Test
-    public void testModifyArrayCells_mergeCellsMulti() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        int expectedNumMergedRegions = 0;
-        assertEquals(expectedNumMergedRegions, sheet.getNumMergedRegions());
-
-        // we cannot merge cells included in an array formula
-        sheet.setArrayFormula("A1:A4*B1:B4", CellRangeAddress.valueOf("C2:F5"));
-        for (String ref : Arrays.asList(
-                "C2:F5", // identity
-                "D3:E4", "B1:G6", // contains
-                "B1:C2", "F1:G2", "F5:G6", "B5:C6", // 1x1 corner intersection
-                "B1:C6", "B1:G2", "F1:G6", "B5:G6", // 1-row/1-column intersection
-                "B1:D3", "E1:G3", "E4:G6", "B4:D6", // 2x2 corner intersection
-                "B1:D6", "B1:G3", "E1:G6", "B4:G6"  // 2-row/2-column intersection
-        )) {
-            CellRangeAddress cra = CellRangeAddress.valueOf(ref);
-            try {
-                sheet.addMergedRegion(cra);
-                fail("expected exception with ref " + ref);
-            } catch (IllegalStateException e) {
-                String msg = "The range "+cra.formatAsString()+" intersects with a multi-cell array formula. You cannot merge cells of an array.";
-                assertEquals(msg, e.getMessage());
-            }
-        }
-        //the number of merged regions remains the same
-        assertEquals(expectedNumMergedRegions, sheet.getNumMergedRegions());
-        
-        // we can merge non-intersecting cells
-        for (String ref : Arrays.asList(
-                "C1:F1", //above
-                "G2:G5", //right
-                "C6:F6",  //bottom
-                "B2:B5", "H7:J9")) {
-            CellRangeAddress cra = CellRangeAddress.valueOf(ref);
-            try {
-                sheet.addMergedRegion(cra);
-                expectedNumMergedRegions++;
-                assertEquals(expectedNumMergedRegions, sheet.getNumMergedRegions());
-            } catch (IllegalStateException e) {
-                fail("did not expect exception with ref: " + ref + "\n" + e.getMessage());
-            }
-        }
-        
-        workbook.close();
-    }
-
-    @Test
-    public void testModifyArrayCells_shiftRows() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-
-        //single-cell array formulas behave just like normal cells - we can change the cell type
-        CellRange<? extends Cell> srange =
-                sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5"));
-        Cell scell = srange.getTopLeftCell();
-        assertEquals("SUM(A4:A6,B4:B6)", scell.getCellFormula());
-        sheet.shiftRows(0, 0, 1);
-        sheet.shiftRows(0, 1, 1);
-
-        //we cannot set individual formulas for cells included in an array formula
-        sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3"));
-
-        try {
-            sheet.shiftRows(0, 0, 1);
-            fail("expected exception");
-        } catch (IllegalStateException e){
-            String msg = "Row[rownum=0] contains cell(s) included in a multi-cell array formula. You cannot change part of an array.";
-            assertEquals(msg, e.getMessage());
-        }
-        /*
-         TODO: enable shifting the whole array
-
-        sheet.shiftRows(0, 2, 1);
-        //the array C1:C3 is now C2:C4
-        CellRangeAddress cra = CellRangeAddress.valueOf("C2:C4");
-        for(Cell mcell : mrange){
-            //TODO define equals and hashcode for CellRangeAddress
-            assertEquals(cra.formatAsString(), mcell.getArrayFormulaRange().formatAsString());
-            assertEquals("A2:A4*B2:B4", mcell.getCellFormula());
-            assertTrue(mcell.isPartOfArrayFormulaGroup());
-            assertEquals(CellType.FORMULA, mcell.getCellTypeEnum());
-        }
-
-        */
-        workbook.close();
-    }
-    
-    @Ignore
-    @Test
-    public void shouldNotBeAbleToCreateArrayFormulaOnPreexistingMergedRegion() throws IOException {
-        /*
-         *  m  = merged region
-         *  f  = array formula
-         *  fm = cell belongs to a merged region and an array formula (illegal, that's what this tests for)
-         *  
-         *   A  B  C
-         * 1    f  f
-         * 2    fm fm
-         * 3    f  f
-         */
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        
-        CellRangeAddress mergedRegion = CellRangeAddress.valueOf("B2:C2");
-        sheet.addMergedRegion(mergedRegion);
-        CellRangeAddress arrayFormula = CellRangeAddress.valueOf("C1:C3");
-        assumeTrue(mergedRegion.intersects(arrayFormula));
-        assumeTrue(arrayFormula.intersects(mergedRegion));
-        try {
-            sheet.setArrayFormula("SUM(A1:A3)",  arrayFormula);
-            fail("expected exception: should not be able to create an array formula that intersects with a merged region");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-        
-        workbook.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
deleted file mode 100644
index e6e7f67..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
+++ /dev/null
@@ -1,958 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.NullOutputStream;
-import org.apache.poi.util.TempFile;
-import org.junit.Test;
-
-public abstract class BaseTestWorkbook {
-
-    protected final ITestDataProvider _testDataProvider;
-
-    protected BaseTestWorkbook(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-    
-    @Test
-    public void sheetIterator_forEach() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet0");
-        wb.createSheet("Sheet1");
-        wb.createSheet("Sheet2");
-        int i = 0;
-        for (Sheet sh : wb) {
-            assertEquals("Sheet"+i, sh.getSheetName());
-            i++;
-        }
-        wb.close();
-    }
-    
-    /**
-     * Expected ConcurrentModificationException:
-     * should not be able to advance an iterator when the
-     * underlying data has been reordered
-     */
-    @Test(expected=ConcurrentModificationException.class)
-    public void sheetIterator_sheetsReordered() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet0");
-        wb.createSheet("Sheet1");
-        wb.createSheet("Sheet2");
-        
-        Iterator<Sheet> it = wb.sheetIterator();
-        it.next();
-        wb.setSheetOrder("Sheet2", 1);
-        
-        // Iterator order should be fixed when iterator is created
-        try {
-            assertEquals("Sheet1", it.next().getSheetName());
-        } finally {
-            wb.close();
-        }
-    }
-    
-    /**
-     * Expected ConcurrentModificationException:
-     * should not be able to advance an iterator when the
-     * underlying data has been reordered
-     */
-    @Test(expected=ConcurrentModificationException.class)
-    public void sheetIterator_sheetRemoved() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet0");
-        wb.createSheet("Sheet1");
-        wb.createSheet("Sheet2");
-        
-        Iterator<Sheet> it = wb.sheetIterator();
-        wb.removeSheetAt(1);
-        
-        // Iterator order should be fixed when iterator is created
-        try {
-            it.next();
-        } finally {
-            wb.close();
-        }
-    }
-    
-    /**
-     * Expected UnsupportedOperationException:
-     * should not be able to remove sheets from the sheet iterator
-     */
-    @Test(expected=UnsupportedOperationException.class)
-    public void sheetIterator_remove() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        wb.createSheet("Sheet0");
-        
-        Iterator<Sheet> it = wb.sheetIterator();
-        it.next(); //Sheet0
-        try {
-            it.remove();
-        } finally {
-            wb.close();
-        }
-    }
-
-
-    @Test
-    public void createSheet() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        assertEquals(0, wb.getNumberOfSheets());
-
-        //getting a sheet by invalid index or non-existing name
-        assertNull(wb.getSheet("Sheet1"));
-        try {
-            wb.getSheetAt(0);
-            fail("should have thrown exceptiuon due to invalid sheet index");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-            // no negative index in the range message
-            assertFalse(e.getMessage().contains("-1"));
-        }
-
-        Sheet sheet0 = wb.createSheet();
-        Sheet sheet1 = wb.createSheet();
-        assertEquals("Sheet0", sheet0.getSheetName());
-        assertEquals("Sheet1", sheet1.getSheetName());
-        assertEquals(2, wb.getNumberOfSheets());
-
-        //fetching sheets by name is case-insensitive
-        Sheet originalSheet = wb.createSheet("Sheet3");
-        Sheet fetchedSheet = wb.getSheet("sheet3");
-        if (fetchedSheet == null) {
-            fail("Identified bug 44892");
-        }
-        assertEquals("Sheet3", fetchedSheet.getSheetName());
-        assertEquals(3, wb.getNumberOfSheets());
-        assertSame(originalSheet, fetchedSheet);
-        try {
-            wb.createSheet("sHeeT3");
-            fail("should have thrown exceptiuon due to duplicate sheet name");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-            assertEquals("The workbook already contains a sheet named 'sHeeT3'", e.getMessage());
-        }
-
-        //names cannot be blank or contain any of /\*?[]
-        String[] invalidNames = {"", "Sheet/", "Sheet\\",
-                "Sheet?", "Sheet*", "Sheet[", "Sheet]", "'Sheet'",
-                "My:Sheet"};
-        for (String sheetName : invalidNames) {
-            try {
-                wb.createSheet(sheetName);
-                fail("should have thrown exception due to invalid sheet name: " + sheetName);
-            } catch (IllegalArgumentException e) {
-                // expected during successful test
-            }
-        }
-        //still have 3 sheets
-        assertEquals(3, wb.getNumberOfSheets());
-
-        //change the name of the 3rd sheet
-        wb.setSheetName(2, "I changed!");
-
-        //try to assign an invalid name to the 2nd sheet
-        try {
-            wb.setSheetName(1, "[I'm invalid]");
-            fail("should have thrown exceptiuon due to invalid sheet name");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-        }
-
-        //try to assign an invalid name to the 2nd sheet
-        try {
-            wb.createSheet(null);
-            fail("should have thrown exceptiuon due to invalid sheet name");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-        }
-
-        try {
-            wb.setSheetName(2, null);
-
-            fail("should have thrown exceptiuon due to invalid sheet name");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-        }
-
-        //check
-        assertEquals(0, wb.getSheetIndex("sheet0"));
-        assertEquals(1, wb.getSheetIndex("sheet1"));
-        assertEquals(2, wb.getSheetIndex("I changed!"));
-
-        assertSame(sheet0, wb.getSheet("sheet0"));
-        assertSame(sheet1, wb.getSheet("sheet1"));
-        assertSame(originalSheet, wb.getSheet("I changed!"));
-        assertNull(wb.getSheet("unknown"));
-
-        //serialize and read again
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb);
-        wb.close();
-        assertEquals(3, wb2.getNumberOfSheets());
-        assertEquals(0, wb2.getSheetIndex("sheet0"));
-        assertEquals(1, wb2.getSheetIndex("sheet1"));
-        assertEquals(2, wb2.getSheetIndex("I changed!"));
-        wb2.close();
-    }
-
-    /**
-     * POI allows creating sheets with names longer than 31 characters.
-     *
-     * Excel opens files with long sheet names without error or warning.
-     * However, long sheet names are silently truncated to 31 chars.  In order to
-     * avoid funny duplicate sheet name errors, POI enforces uniqueness on only the first 31 chars.
-     * but for the purpose of uniqueness long sheet names are silently truncated to 31 chars.
-     */
-    @Test
-    public void createSheetWithLongNames() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-
-        String sheetName1 = "My very long sheet name which is longer than 31 chars";
-        String truncatedSheetName1 = sheetName1.substring(0, 31);
-        Sheet sh1 = wb1.createSheet(sheetName1);
-        assertEquals(truncatedSheetName1, sh1.getSheetName());
-        assertSame(sh1, wb1.getSheet(truncatedSheetName1));
-        // now via wb.setSheetName
-        wb1.setSheetName(0, sheetName1);
-        assertEquals(truncatedSheetName1, sh1.getSheetName());
-        assertSame(sh1, wb1.getSheet(truncatedSheetName1));
-
-        String sheetName2 = "My very long sheet name which is longer than 31 chars " +
-                "and sheetName2.substring(0, 31) == sheetName1.substring(0, 31)";
-        try {
-            /*Sheet sh2 =*/ wb1.createSheet(sheetName2);
-            fail("expected exception");
-        } catch (IllegalArgumentException e) {
-            // expected during successful test
-            assertEquals("The workbook already contains a sheet named 'My very long sheet name which is longer than 31 chars and sheetName2.substring(0, 31) == sheetName1.substring(0, 31)'", e.getMessage());
-        }
-
-        String sheetName3 = "POI allows creating sheets with names longer than 31 characters";
-        String truncatedSheetName3 = sheetName3.substring(0, 31);
-        Sheet sh3 = wb1.createSheet(sheetName3);
-        assertEquals(truncatedSheetName3, sh3.getSheetName());
-        assertSame(sh3, wb1.getSheet(truncatedSheetName3));
-
-        //serialize and read again
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        assertEquals(2, wb2.getNumberOfSheets());
-        assertEquals(0, wb2.getSheetIndex(truncatedSheetName1));
-        assertEquals(1, wb2.getSheetIndex(truncatedSheetName3));
-        wb2.close();
-    }
-
-    @Test
-    public void removeSheetAt() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        try {
-            workbook.createSheet("sheet1");
-            workbook.createSheet("sheet2");
-            workbook.createSheet("sheet3");
-            assertEquals(3, workbook.getNumberOfSheets());
-    
-            assertEquals(0, workbook.getActiveSheetIndex());
-    
-            workbook.removeSheetAt(1);
-            assertEquals(2, workbook.getNumberOfSheets());
-            assertEquals("sheet3", workbook.getSheetName(1));
-            assertEquals(0, workbook.getActiveSheetIndex());
-    
-            workbook.removeSheetAt(0);
-            assertEquals(1, workbook.getNumberOfSheets());
-            assertEquals("sheet3", workbook.getSheetName(0));
-            assertEquals(0, workbook.getActiveSheetIndex());
-    
-            workbook.removeSheetAt(0);
-            assertEquals(0, workbook.getNumberOfSheets());
-            assertEquals(0, workbook.getActiveSheetIndex());
-    
-            //re-create the sheets
-            workbook.createSheet("sheet1");
-            workbook.createSheet("sheet2");
-            workbook.createSheet("sheet3");
-            workbook.createSheet("sheet4");
-            assertEquals(4, workbook.getNumberOfSheets());
-    
-            assertEquals(0, workbook.getActiveSheetIndex());
-            workbook.setActiveSheet(2);
-            assertEquals(2, workbook.getActiveSheetIndex());
-    
-            workbook.removeSheetAt(2);
-            assertEquals(2, workbook.getActiveSheetIndex());
-    
-            workbook.removeSheetAt(1);
-            assertEquals(1, workbook.getActiveSheetIndex());
-    
-            workbook.removeSheetAt(0);
-            assertEquals(0, workbook.getActiveSheetIndex());
-    
-            workbook.removeSheetAt(0);
-            assertEquals(0, workbook.getActiveSheetIndex());
-        } finally {
-            workbook.close();
-        }
-    }
-
-    @Test
-    public void defaultValues() throws IOException {
-        Workbook b = _testDataProvider.createWorkbook();
-        assertEquals(0, b.getActiveSheetIndex());
-        assertEquals(0, b.getFirstVisibleTab());
-        assertEquals(0, b.getNumberOfNames());
-        assertEquals(0, b.getNumberOfSheets());
-        b.close();
-    }
-
-    @Test
-    public void sheetSelection() throws IOException {
-        Workbook b = _testDataProvider.createWorkbook();
-        b.createSheet("Sheet One");
-        b.createSheet("Sheet Two");
-        b.setActiveSheet(1);
-        b.setSelectedTab(1);
-        b.setFirstVisibleTab(1);
-        assertEquals(1, b.getActiveSheetIndex());
-        assertEquals(1, b.getFirstVisibleTab());
-        b.close();
-    }
-
-    @Test
-    public void printArea() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet1 = workbook.createSheet("Test Print Area");
-        String sheetName1 = sheet1.getSheetName();
-
-        // workbook.setPrintArea(0, reference);
-        workbook.setPrintArea(0, 1, 5, 4, 9);
-        String retrievedPrintArea = workbook.getPrintArea(0);
-        assertEquals("'" + sheetName1 + "'!$B$5:$F$10", retrievedPrintArea);
-
-        String reference = "$A$1:$B$1";
-        workbook.setPrintArea(0, reference);
-        retrievedPrintArea = workbook.getPrintArea(0);
-        assertEquals("'" + sheetName1 + "'!" + reference, retrievedPrintArea);
-
-        workbook.removePrintArea(0);
-        assertNull(workbook.getPrintArea(0));
-        workbook.close();
-    }
-
-    @Test
-    public void getSetActiveSheet() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        assertEquals(0, workbook.getActiveSheetIndex());
-
-        workbook.createSheet("sheet1");
-        workbook.createSheet("sheet2");
-        workbook.createSheet("sheet3");
-        // set second sheet
-        workbook.setActiveSheet(1);
-        // test if second sheet is set up
-        assertEquals(1, workbook.getActiveSheetIndex());
-
-        workbook.setActiveSheet(0);
-        // test if second sheet is set up
-        assertEquals(0, workbook.getActiveSheetIndex());
-        workbook.close();
-    }
-
-    @Test
-    public void setSheetOrder() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        for (int i=0; i < 10; i++) {
-            wb.createSheet("Sheet " + i);
-        }
-
-        // Check the initial order
-        assertEquals(0, wb.getSheetIndex("Sheet 0"));
-        assertEquals(1, wb.getSheetIndex("Sheet 1"));
-        assertEquals(2, wb.getSheetIndex("Sheet 2"));
-        assertEquals(3, wb.getSheetIndex("Sheet 3"));
-        assertEquals(4, wb.getSheetIndex("Sheet 4"));
-        assertEquals(5, wb.getSheetIndex("Sheet 5"));
-        assertEquals(6, wb.getSheetIndex("Sheet 6"));
-        assertEquals(7, wb.getSheetIndex("Sheet 7"));
-        assertEquals(8, wb.getSheetIndex("Sheet 8"));
-        assertEquals(9, wb.getSheetIndex("Sheet 9"));
-
-        // check active sheet
-        assertEquals(0, wb.getActiveSheetIndex());
-        
-        // Change
-        wb.setSheetOrder("Sheet 6", 0);
-        assertEquals(1, wb.getActiveSheetIndex());
-        wb.setSheetOrder("Sheet 3", 7);
-        wb.setSheetOrder("Sheet 1", 9);
-        
-        // now the first sheet is at index 1
-        assertEquals(1, wb.getActiveSheetIndex());
-
-        // Check they're currently right
-        assertEquals(0, wb.getSheetIndex("Sheet 6"));
-        assertEquals(1, wb.getSheetIndex("Sheet 0"));
-        assertEquals(2, wb.getSheetIndex("Sheet 2"));
-        assertEquals(3, wb.getSheetIndex("Sheet 4"));
-        assertEquals(4, wb.getSheetIndex("Sheet 5"));
-        assertEquals(5, wb.getSheetIndex("Sheet 7"));
-        assertEquals(6, wb.getSheetIndex("Sheet 3"));
-        assertEquals(7, wb.getSheetIndex("Sheet 8"));
-        assertEquals(8, wb.getSheetIndex("Sheet 9"));
-        assertEquals(9, wb.getSheetIndex("Sheet 1"));
-
-        Workbook wbr = _testDataProvider.writeOutAndReadBack(wb);
-        wb.close();
-
-        assertEquals(0, wbr.getSheetIndex("Sheet 6"));
-        assertEquals(1, wbr.getSheetIndex("Sheet 0"));
-        assertEquals(2, wbr.getSheetIndex("Sheet 2"));
-        assertEquals(3, wbr.getSheetIndex("Sheet 4"));
-        assertEquals(4, wbr.getSheetIndex("Sheet 5"));
-        assertEquals(5, wbr.getSheetIndex("Sheet 7"));
-        assertEquals(6, wbr.getSheetIndex("Sheet 3"));
-        assertEquals(7, wbr.getSheetIndex("Sheet 8"));
-        assertEquals(8, wbr.getSheetIndex("Sheet 9"));
-        assertEquals(9, wbr.getSheetIndex("Sheet 1"));
-
-        assertEquals(1, wb.getActiveSheetIndex());
-        
-        // Now get the index by the sheet, not the name
-        for(int i=0; i<10; i++) {
-        	Sheet s = wbr.getSheetAt(i);
-        	assertEquals(i, wbr.getSheetIndex(s));
-        }
-        
-        wbr.close();
-    }
-
-    @Test
-    public void cloneSheet() throws IOException {
-        Workbook book = _testDataProvider.createWorkbook();
-        Sheet sheet = book.createSheet("TEST");
-        sheet.createRow(0).createCell(0).setCellValue("Test");
-        sheet.createRow(1).createCell(0).setCellValue(36.6);
-        sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 2));
-        sheet.addMergedRegion(new CellRangeAddress(2, 3, 0, 2));
-        assertTrue(sheet.isSelected());
-
-        Sheet clonedSheet = book.cloneSheet(0);
-        assertEquals("TEST (2)", clonedSheet.getSheetName());
-        assertEquals(2, clonedSheet.getPhysicalNumberOfRows());
-        assertEquals(2, clonedSheet.getNumMergedRegions());
-        assertFalse(clonedSheet.isSelected());
-
-        //cloned sheet is a deep copy, adding rows or merged regions in the original does not affect the clone
-        sheet.createRow(2).createCell(0).setCellValue(1);
-        sheet.addMergedRegion(new CellRangeAddress(4, 5, 0, 2));
-        assertEquals(2, clonedSheet.getPhysicalNumberOfRows());
-        assertEquals(2, clonedSheet.getNumMergedRegions());
-
-        clonedSheet.createRow(2).createCell(0).setCellValue(1);
-        clonedSheet.addMergedRegion(new CellRangeAddress(6, 7, 0, 2));
-        assertEquals(3, clonedSheet.getPhysicalNumberOfRows());
-        assertEquals(3, clonedSheet.getNumMergedRegions());
-        book.close();
-    }
-
-    @Test
-    public void parentReferences() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Sheet sheet = wb1.createSheet();
-        assertSame(wb1, sheet.getWorkbook());
-
-        Row row = sheet.createRow(0);
-        assertSame(sheet, row.getSheet());
-
-        Cell cell = row.createCell(1);
-        assertSame(sheet, cell.getSheet());
-        assertSame(row, cell.getRow());
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
-        assertSame(wb2, sheet.getWorkbook());
-
-        row = sheet.getRow(0);
-        assertSame(sheet, row.getSheet());
-
-        cell = row.getCell(1);
-        assertSame(sheet, cell.getSheet());
-        assertSame(row, cell.getRow());
-        wb2.close();
-    }
-
-
-    /**
-     * Test to validate that replacement for removed setRepeatingRowsAnsColumns() methods
-     * is still working correctly 
-     */
-    @Test
-    public void setRepeatingRowsAnsColumns() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-
-        CellRangeAddress cra = new CellRangeAddress(0, 3, 0, 0);
-        String expRows = "1:4", expCols = "A:A";
-
-        
-        Sheet sheet1 = wb.createSheet();
-        sheet1.setRepeatingRows(cra);
-        sheet1.setRepeatingColumns(cra);
-        assertEquals(expRows, sheet1.getRepeatingRows().formatAsString());
-        assertEquals(expCols, sheet1.getRepeatingColumns().formatAsString());
-
-        //must handle sheets with quotas, see Bugzilla #47294
-        Sheet sheet2 = wb.createSheet("My' Sheet");
-        sheet2.setRepeatingRows(cra);
-        sheet2.setRepeatingColumns(cra);
-        assertEquals(expRows, sheet2.getRepeatingRows().formatAsString());
-        assertEquals(expCols, sheet2.getRepeatingColumns().formatAsString());
-        wb.close();
-    }
-
-    /**
-     * Tests that all of the unicode capable string fields can be set, written and then read back
-     */
-    @Test
-    public void unicodeInAll() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        CreationHelper factory = wb1.getCreationHelper();
-        //Create a unicode dataformat (contains euro symbol)
-        DataFormat df = wb1.createDataFormat();
-        final String formatStr = "_([$\u20ac-2]\\\\\\ * #,##0.00_);_([$\u20ac-2]\\\\\\ * \\\\\\(#,##0.00\\\\\\);_([$\u20ac-2]\\\\\\ *\\\"\\-\\\\\"??_);_(@_)";
-        short fmt = df.getFormat(formatStr);
-
-        //Create a unicode sheet name (euro symbol)
-        Sheet s = wb1.createSheet("\u20ac");
-
-        //Set a unicode header (you guessed it the euro symbol)
-        Header h = s.getHeader();
-        h.setCenter("\u20ac");
-        h.setLeft("\u20ac");
-        h.setRight("\u20ac");
-
-        //Set a unicode footer
-        Footer f = s.getFooter();
-        f.setCenter("\u20ac");
-        f.setLeft("\u20ac");
-        f.setRight("\u20ac");
-
-        Row r = s.createRow(0);
-        Cell c = r.createCell(1);
-        c.setCellValue(12.34);
-        c.getCellStyle().setDataFormat(fmt);
-
-        /*Cell c2 =*/ r.createCell(2); // TODO - c2 unused but changing next line ('c'->'c2') causes test to fail
-        c.setCellValue(factory.createRichTextString("\u20ac"));
-
-        Cell c3 = r.createCell(3);
-        String formulaString = "TEXT(12.34,\"\u20ac###,##\")";
-        c3.setCellFormula(formulaString);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        //Test the sheetname
-        s = wb2.getSheet("\u20ac");
-        assertNotNull(s);
-
-        //Test the header
-        h = s.getHeader();
-        assertEquals(h.getCenter(), "\u20ac");
-        assertEquals(h.getLeft(), "\u20ac");
-        assertEquals(h.getRight(), "\u20ac");
-
-        //Test the footer
-        f = s.getFooter();
-        assertEquals(f.getCenter(), "\u20ac");
-        assertEquals(f.getLeft(), "\u20ac");
-        assertEquals(f.getRight(), "\u20ac");
-
-        //Test the dataformat
-        r = s.getRow(0);
-        c = r.getCell(1);
-        df = wb2.createDataFormat();
-        assertEquals(formatStr, df.getFormat(c.getCellStyle().getDataFormat()));
-
-        //Test the cell string value
-        /*c2 =*/ r.getCell(2);
-        assertEquals(c.getRichStringCellValue().getString(), "\u20ac");
-
-        //Test the cell formula
-        c3 = r.getCell(3);
-        assertEquals(c3.getCellFormula(), formulaString);
-        wb2.close();
-    }
-
-    private Workbook newSetSheetNameTestingWorkbook() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh1 = wb.createSheet("Worksheet");
-        Sheet sh2 = wb.createSheet("Testing 47100");
-        Sheet sh3 = wb.createSheet("To be renamed");
-
-        Name name1 = wb.createName();
-        name1.setNameName("sale_1");
-        name1.setRefersToFormula("Worksheet!$A$1");
-
-        Name name2 = wb.createName();
-        name2.setNameName("sale_2");
-        name2.setRefersToFormula("'Testing 47100'!$A$1");
-
-        Name name3 = wb.createName();
-        name3.setNameName("sale_3");
-        name3.setRefersToFormula("'Testing 47100'!$B$1");
-
-        Name name4 = wb.createName();
-        name4.setNameName("sale_4");
-        name4.setRefersToFormula("'To be renamed'!$A$3");
-
-        sh1.createRow(0).createCell(0).setCellFormula("SUM('Testing 47100'!A1:C1)");
-        sh1.createRow(1).createCell(0).setCellFormula("SUM('Testing 47100'!A1:C1,'To be renamed'!A1:A5)");
-        sh1.createRow(2).createCell(0).setCellFormula("sale_2+sale_3+'Testing 47100'!C1");
-
-        sh2.createRow(0).createCell(0).setCellValue(1);
-        sh2.getRow(0).createCell(1).setCellValue(2);
-        sh2.getRow(0).createCell(2).setCellValue(3);
-
-        sh3.createRow(0).createCell(0).setCellValue(1);
-        sh3.createRow(1).createCell(0).setCellValue(2);
-        sh3.createRow(2).createCell(0).setCellValue(3);
-        sh3.createRow(3).createCell(0).setCellValue(4);
-        sh3.createRow(4).createCell(0).setCellValue(5);
-        sh3.createRow(5).createCell(0).setCellFormula("sale_3");
-        sh3.createRow(6).createCell(0).setCellFormula("'Testing 47100'!C1");
-
-        return wb;
-    }
-
-    /**
-     * Ensure that Workbook#setSheetName updates all dependent formulas and named ranges
-     *
-     * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=47100">Bugzilla 47100</a>
-     */
-    @Test
-    public void setSheetName() throws IOException {
-
-        Workbook wb1 = newSetSheetNameTestingWorkbook();
-
-        Sheet sh1 = wb1.getSheetAt(0);
-
-        Name sale_2 = wb1.getNameAt(1);
-        Name sale_3 = wb1.getNameAt(2);
-        Name sale_4 = wb1.getNameAt(3);
-
-        assertEquals("sale_2", sale_2.getNameName());
-        assertEquals("'Testing 47100'!$A$1", sale_2.getRefersToFormula());
-        assertEquals("sale_3", sale_3.getNameName());
-        assertEquals("'Testing 47100'!$B$1", sale_3.getRefersToFormula());
-        assertEquals("sale_4", sale_4.getNameName());
-        assertEquals("'To be renamed'!$A$3", sale_4.getRefersToFormula());
-
-        FormulaEvaluator evaluator = wb1.getCreationHelper().createFormulaEvaluator();
-
-        Cell cell0 = sh1.getRow(0).getCell(0);
-        Cell cell1 = sh1.getRow(1).getCell(0);
-        Cell cell2 = sh1.getRow(2).getCell(0);
-
-        assertEquals("SUM('Testing 47100'!A1:C1)", cell0.getCellFormula());
-        assertEquals("SUM('Testing 47100'!A1:C1,'To be renamed'!A1:A5)", cell1.getCellFormula());
-        assertEquals("sale_2+sale_3+'Testing 47100'!C1", cell2.getCellFormula());
-
-        assertEquals(6.0, evaluator.evaluate(cell0).getNumberValue(), 0);
-        assertEquals(21.0, evaluator.evaluate(cell1).getNumberValue(), 0);
-        assertEquals(6.0, evaluator.evaluate(cell2).getNumberValue(), 0);
-
-        wb1.setSheetName(1, "47100 - First");
-        wb1.setSheetName(2, "47100 - Second");
-
-        assertEquals("sale_2", sale_2.getNameName());
-        assertEquals("'47100 - First'!$A$1", sale_2.getRefersToFormula());
-        assertEquals("sale_3", sale_3.getNameName());
-        assertEquals("'47100 - First'!$B$1", sale_3.getRefersToFormula());
-        assertEquals("sale_4", sale_4.getNameName());
-        assertEquals("'47100 - Second'!$A$3", sale_4.getRefersToFormula());
-
-        assertEquals("SUM('47100 - First'!A1:C1)", cell0.getCellFormula());
-        assertEquals("SUM('47100 - First'!A1:C1,'47100 - Second'!A1:A5)", cell1.getCellFormula());
-        assertEquals("sale_2+sale_3+'47100 - First'!C1", cell2.getCellFormula());
-
-        evaluator.clearAllCachedResultValues();
-        assertEquals(6.0, evaluator.evaluate(cell0).getNumberValue(), 0);
-        assertEquals(21.0, evaluator.evaluate(cell1).getNumberValue(), 0);
-        assertEquals(6.0, evaluator.evaluate(cell2).getNumberValue(), 0);
-
-        Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sh1 = wb2.getSheetAt(0);
-
-        sale_2 = wb2.getNameAt(1);
-        sale_3 = wb2.getNameAt(2);
-        sale_4 = wb2.getNameAt(3);
-
-        cell0 = sh1.getRow(0).getCell(0);
-        cell1 = sh1.getRow(1).getCell(0);
-        cell2 = sh1.getRow(2).getCell(0);
-
-        assertEquals("sale_2", sale_2.getNameName());
-        assertEquals("'47100 - First'!$A$1", sale_2.getRefersToFormula());
-        assertEquals("sale_3", sale_3.getNameName());
-        assertEquals("'47100 - First'!$B$1", sale_3.getRefersToFormula());
-        assertEquals("sale_4", sale_4.getNameName());
-        assertEquals("'47100 - Second'!$A$3", sale_4.getRefersToFormula());
-
-        assertEquals("SUM('47100 - First'!A1:C1)", cell0.getCellFormula());
-        assertEquals("SUM('47100 - First'!A1:C1,'47100 - Second'!A1:A5)", cell1.getCellFormula());
-        assertEquals("sale_2+sale_3+'47100 - First'!C1", cell2.getCellFormula());
-
-        evaluator = wb2.getCreationHelper().createFormulaEvaluator();
-        assertEquals(6.0, evaluator.evaluate(cell0).getNumberValue(), 0);
-        assertEquals(21.0, evaluator.evaluate(cell1).getNumberValue(), 0);
-        assertEquals(6.0, evaluator.evaluate(cell2).getNumberValue(), 0);
-        wb2.close();
-    }
-
-    protected void changeSheetNameWithSharedFormulas(String sampleFile) throws IOException {
-        Workbook wb = _testDataProvider.openSampleWorkbook(sampleFile);
-
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        Sheet sheet = wb.getSheetAt(0);
-
-        for (int rownum = 1; rownum <= 40; rownum++) {
-            Cell cellA = sheet.getRow(1).getCell(0);
-            Cell cellB = sheet.getRow(1).getCell(1);
-
-            assertEquals(cellB.getStringCellValue(), evaluator.evaluate(cellA).getStringValue());
-        }
-
-        wb.setSheetName(0, "Renamed by POI");
-        evaluator.clearAllCachedResultValues();
-
-        for (int rownum = 1; rownum <= 40; rownum++) {
-            Cell cellA = sheet.getRow(1).getCell(0);
-            Cell cellB = sheet.getRow(1).getCell(1);
-
-            assertEquals(cellB.getStringCellValue(), evaluator.evaluate(cellA).getStringValue());
-        }
-        wb.close();
-    }
-
-	protected void assertSheetOrder(Workbook wb, String... sheets) {
-		StringBuilder sheetNames = new StringBuilder();
-		for(int i = 0;i < wb.getNumberOfSheets();i++) {
-			sheetNames.append(wb.getSheetAt(i).getSheetName()).append(",");
-		}
-		assertEquals("Had: " + sheetNames.toString(), 
-				sheets.length, wb.getNumberOfSheets());
-		for(int i = 0;i < wb.getNumberOfSheets();i++) {
-			assertEquals("Had: " + sheetNames.toString(), 
-					sheets[i], wb.getSheetAt(i).getSheetName());
-		}
-	}
-
-    @Test
-    public void test58499() throws IOException {
-        Workbook workbook = _testDataProvider.createWorkbook();
-        Sheet sheet = workbook.createSheet();
-        for (int i = 0; i < 900; i++) {
-            Row r = sheet.createRow(i);
-            Cell c = r.createCell(0);
-            CellStyle cs = workbook.createCellStyle();
-            c.setCellStyle(cs);
-            c.setCellValue("AAA");                
-        }
-        OutputStream os = new NullOutputStream();
-        try {
-            workbook.write(os);
-        } finally {
-            os.close();
-        }
-        //workbook.dispose();
-        workbook.close();
-    }
-
-
-    @Test
-    public void windowOneDefaults() throws IOException {
-        Workbook b = _testDataProvider.createWorkbook();
-        try {
-            assertEquals(b.getActiveSheetIndex(), 0);
-            assertEquals(b.getFirstVisibleTab(), 0);
-        } catch (NullPointerException npe) {
-            fail("WindowOneRecord in Workbook is probably not initialized");
-        }
-        
-        b.close();
-    }
-
-    @Test
-    public void getSpreadsheetVersion() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        assertEquals(_testDataProvider.getSpreadsheetVersion(), wb.getSpreadsheetVersion());
-        wb.close();
-    }
-    
-    /* FIXME copied from {@link org.apache.poi.ss.TestWorkbookFactory} */
-    protected static void assertCloseDoesNotModifyFile(String filename, Workbook wb) throws IOException {
-        final byte[] before = HSSFTestDataSamples.getTestDataFileContent(filename);
-        wb.close();
-        final byte[] after = HSSFTestDataSamples.getTestDataFileContent(filename);
-        assertArrayEquals(filename + " sample file was modified as a result of closing the workbook",
-                before, after);
-    }
-
-    @Test
-    public void sheetClone() throws IOException {
-        // First up, try a simple file
-        final Workbook b = _testDataProvider.createWorkbook();
-        assertEquals(0, b.getNumberOfSheets());
-        b.createSheet("Sheet One");
-        b.createSheet("Sheet Two");
-
-        assertEquals(2, b.getNumberOfSheets());
-        b.cloneSheet(0);
-        assertEquals(3, b.getNumberOfSheets());
-
-        // Now try a problem one with drawing records in it
-        Workbook bBack = HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls");
-        assertEquals(1, bBack.getNumberOfSheets());
-        bBack.cloneSheet(0);
-        assertEquals(2, bBack.getNumberOfSheets());
-
-        bBack.close();
-        b.close();
-    }
-
-    @Test
-    public void getSheetIndex() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb.createSheet("Sheet1");
-        Sheet sheet2 = wb.createSheet("Sheet2");
-        Sheet sheet3 = wb.createSheet("Sheet3");
-        Sheet sheet4 = wb.createSheet("Sheet4");
-
-        assertEquals(0, wb.getSheetIndex(sheet1));
-        assertEquals(1, wb.getSheetIndex(sheet2));
-        assertEquals(2, wb.getSheetIndex(sheet3));
-        assertEquals(3, wb.getSheetIndex(sheet4));
-
-        // remove sheets
-        wb.removeSheetAt(0);
-        wb.removeSheetAt(2);
-
-        // ensure that sheets are moved up and removed sheets are not found any more
-        assertEquals(-1, wb.getSheetIndex(sheet1));
-        assertEquals(0, wb.getSheetIndex(sheet2));
-        assertEquals(1, wb.getSheetIndex(sheet3));
-        assertEquals(-1, wb.getSheetIndex(sheet4));
-
-        wb.close();
-    }
-
-    @Test
-    public void addSheetTwice() throws IOException {
-        final Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet1 = wb.createSheet("Sheet1");
-        assertNotNull(sheet1);
-        try {
-            wb.createSheet("Sheet1");
-            fail("Should fail if we add the same sheet twice");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage(), e.getMessage().contains("already contains a sheet named 'Sheet1'"));
-        }
-
-        wb.close();
-    }
-    
-    // bug 51233 and 55075: correctly size image if added to a row with a custom height
-    @Test
-    public void createDrawing() throws Exception {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sheet = wb.createSheet("Main Sheet");
-        Row row0 = sheet.createRow(0);
-        Row row1 = sheet.createRow(1);
-        Cell cell = row1.createCell(0);
-        row0.createCell(1);
-        row1.createCell(0);
-        row1.createCell(1);
-
-        byte[] pictureData = _testDataProvider.getTestDataFileContent("logoKarmokar4.png");
-
-        int handle = wb.addPicture(pictureData, Workbook.PICTURE_TYPE_PNG);
-        Drawing drawing = sheet.createDrawingPatriarch();
-        CreationHelper helper = wb.getCreationHelper();
-        ClientAnchor anchor = helper.createClientAnchor();
-        anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE);
-        anchor.setCol1(0);
-        anchor.setRow1(0);
-        Picture picture = drawing.createPicture(anchor, handle);
-
-        row0.setHeightInPoints(144);
-        // set a column width so that XSSF and SXSSF have the same width (default widths may be different otherwise)
-        sheet.setColumnWidth(0, 100*256);
-        picture.resize();
-        
-        // The actual dimensions don't matter as much as having XSSF and SXSSF produce the same size drawings
-        
-        // Check drawing height
-        assertEquals(0, anchor.getRow1());
-        assertEquals(0, anchor.getRow2());
-        assertEquals(0, anchor.getDy1());
-        assertEquals(1609725, anchor.getDy2()); //HSSF: 225
-        
-        // Check drawing width
-        assertEquals(0, anchor.getCol1());
-        assertEquals(0, anchor.getCol2());
-        assertEquals(0, anchor.getDx1());
-        assertEquals(1114425, anchor.getDx2()); //HSSF: 171
-        
-        final boolean writeOut = false;
-        if (writeOut) {
-            String ext = "." + _testDataProvider.getStandardFileNameExtension();
-            String prefix = wb.getClass().getName() + "-createDrawing";
-            File f = TempFile.createTempFile(prefix, ext);
-            FileOutputStream out = new FileOutputStream(f);
-            wb.write(out);
-            out.close();
-        }
-        wb.close();
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
deleted file mode 100644
index 50276ae..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
+++ /dev/null
@@ -1,819 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   2012 - Alfresco Software, Ltd.
-   Alfresco Software has modified source of this file
-   The details of changes as svn diff can be found in svn at location root/projects/3rd-party/src 
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.TestHSSFDataFormatter;
-import org.apache.poi.ss.format.CellFormat;
-import org.apache.poi.ss.format.CellFormatResult;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.LocaleUtil;
-import org.apache.poi.util.SuppressForbidden;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests of {@link DataFormatter}
- *
- * See {@link TestHSSFDataFormatter} too for
- *  more tests.
- */
-public class TestDataFormatter {
-    private static final double _15_MINUTES = 0.041666667;
-
-    @BeforeClass
-    @SuppressForbidden
-    public static void setUpClass() {
-        // some pre-checks to hunt for a problem in the Maven build
-        // these checks ensure that the correct locale is set, so a failure here
-        // usually indicates an invalid locale during test-execution
-
-        assertFalse(DateUtil.isADateFormat(-1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-        Locale ul = LocaleUtil.getUserLocale();
-        assertTrue(Locale.ROOT.equals(ul) || Locale.getDefault().equals(ul));
-        final String textValue = NumberToTextConverter.toText(1234.56);
-        assertEquals(-1, textValue.indexOf('E'));
-        Object cellValueO = Double.valueOf(1234.56);
-
-        /*CellFormat cellFormat = new CellFormat("_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-");
-        CellFormatResult result = cellFormat.apply(cellValueO);
-        assertEquals("    1,234.56 ", result.text);*/
-
-        CellFormat cfmt = CellFormat.getInstance("_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-");
-        CellFormatResult result = cfmt.apply(cellValueO);
-        assertEquals("This failure can indicate that the wrong locale is used during test-execution, ensure you run with english/US via -Duser.language=en -Duser.country=US",
-                "    1,234.56 ", result.text);
-    }
-
-    /**
-     * Test that we use the specified locale when deciding
-     *   how to format normal numbers
-     */
-    @Test
-    public void testLocale() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-        DataFormatter dfFR = new DataFormatter(Locale.FRENCH);
-
-        assertEquals("1234", dfUS.formatRawCellContents(1234, -1, "@"));
-        assertEquals("1234", dfFR.formatRawCellContents(1234, -1, "@"));
-
-        assertEquals("12.34", dfUS.formatRawCellContents(12.34, -1, "@"));
-        assertEquals("12,34", dfFR.formatRawCellContents(12.34, -1, "@"));
-    }
-
-    /**
-     * At the moment, we don't decode the locale strings into
-     *  a specific locale, but we should format things as if
-     *  the locale (eg '[$-1010409]') isn't there
-     */
-    @Test
-    public void testLocaleBasedFormats() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        // Standard formats
-        assertEquals("63", dfUS.formatRawCellContents(63.0, -1, "[$-1010409]General"));
-        assertEquals("63", dfUS.formatRawCellContents(63.0, -1, "[$-1010409]@"));
-
-        // Regular numeric style formats
-        assertEquals("63", dfUS.formatRawCellContents(63.0, -1, "[$-1010409]##"));
-        assertEquals("63", dfUS.formatRawCellContents(63.0, -1, "[$-1010409]00"));        
-
-    }
-
-
-    /**
-     * Test that we use the specified locale when deciding
-     *   how to format normal numbers
-     */
-    @Test
-    public void testGrouping() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-        DataFormatter dfDE = new DataFormatter(Locale.GERMAN);
-
-        assertEquals("1,234.57", dfUS.formatRawCellContents(1234.567, -1, "#,##0.00"));
-        assertEquals("1'234.57", dfUS.formatRawCellContents(1234.567, -1, "#'##0.00"));
-        assertEquals("1 234.57", dfUS.formatRawCellContents(1234.567, -1, "# ##0.00"));
-
-        assertEquals("1.234,57", dfDE.formatRawCellContents(1234.567, -1, "#,##0.00"));
-        assertEquals("1'234,57", dfDE.formatRawCellContents(1234.567, -1, "#'##0.00"));
-        assertEquals("1 234,57", dfDE.formatRawCellContents(1234.567, -1, "# ##0.00"));
-    }
-
-    /**
-     * Ensure that colours get correctly
-     *  zapped from within the format strings
-     */
-    @Test
-    public void testColours() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        String[] formats = {
-                "##.##",
-                "[WHITE]##.##",
-                "[BLACK]##.##;[RED]-##.##",
-                "[COLOR11]##.##;[COLOR 43]-##.00",
-        };
-        for (String format : formats) {
-            assertEquals(
-                "Wrong format for: " + format,
-                "12.34",
-                dfUS.formatRawCellContents(12.343, -1, format)
-            );
-            assertEquals(
-                "Wrong format for: " + format,
-                "-12.34",
-                dfUS.formatRawCellContents(-12.343, -1, format)
-            );
-        }
-
-        // Ensure that random square brackets remain
-        assertEquals("12.34[a]", dfUS.formatRawCellContents(12.343, -1, "##.##[a]"));
-        assertEquals("[ab]12.34[x]", dfUS.formatRawCellContents(12.343, -1, "[ab]##.##[x]"));
-    }
-
-    @Test
-    public void testColoursAndBrackets() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        // Without currency symbols
-        String[] formats = { "#,##0.00;[Blue](#,##0.00)" };
-        for (String format : formats) {
-            assertEquals(
-                "Wrong format for: " + format,
-                "12.34",
-                dfUS.formatRawCellContents(12.343, -1, format)
-            );
-            assertEquals(
-                "Wrong format for: " + format,
-                "(12.34)",
-                dfUS.formatRawCellContents(-12.343, -1, format)
-            );
-        }
-
-        // With
-        formats = new String[] { "$#,##0.00;[Red]($#,##0.00)" };
-        for (String format : formats) {
-            assertEquals(
-                "Wrong format for: " + format,
-                "$12.34",
-                dfUS.formatRawCellContents(12.343, -1, format)
-            );
-            assertEquals(
-                "Wrong format for: " + format,
-                "($12.34)",
-                dfUS.formatRawCellContents(-12.343, -1, format)
-            );
-        }
-    }
-
-    /**
-     * Test how we handle negative and zeros.
-     * Note - some tests are disabled as DecimalFormat
-     *  and Excel differ, and workarounds are not
-     *  yet in place for all of these
-     */
-    @Test
-    public void testNegativeZero() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        String all2dp = "00.00";
-        String alln1dp = "(00.0)";
-        String p1dp_n1dp = "00.0;(00.0)";
-        String p2dp_n1dp = "00.00;(00.0)";
-        String p2dp_n1dp_z0 = "00.00;(00.0);0";
-        String all2dpTSP = "00.00_x";
-        String p2dp_n2dpTSP = "00.00_x;(00.00)_x";
-        //String p2dp_n1dpTSP = "00.00_x;(00.0)_x";
-
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, all2dp));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, p2dp_n1dp));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, p2dp_n1dp_z0));
-
-        assertEquals("(12.3)", dfUS.formatRawCellContents(12.343, -1, alln1dp));
-        assertEquals("-(12.3)", dfUS.formatRawCellContents(-12.343, -1, alln1dp));
-        assertEquals("12.3", dfUS.formatRawCellContents(12.343, -1, p1dp_n1dp));
-        assertEquals("(12.3)", dfUS.formatRawCellContents(-12.343, -1, p1dp_n1dp));
-
-        assertEquals("-12.34", dfUS.formatRawCellContents(-12.343, -1, all2dp));
-        // TODO - fix case of negative subpattern differing from the
-        //  positive one by more than just the prefix+suffix, which
-        //  is all DecimalFormat supports...
-//        assertEquals("(12.3)", dfUS.formatRawCellContents(-12.343, -1, p2dp_n1dp));
-//        assertEquals("(12.3)", dfUS.formatRawCellContents(-12.343, -1, p2dp_n1dp_z0));
-
-        assertEquals("00.00", dfUS.formatRawCellContents(0, -1, all2dp));
-        assertEquals("00.00", dfUS.formatRawCellContents(0, -1, p2dp_n1dp));
-        assertEquals("0", dfUS.formatRawCellContents(0, -1, p2dp_n1dp_z0));
-
-        // Spaces are skipped
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, all2dpTSP));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, p2dp_n2dpTSP));
-        assertEquals("(12.34)", dfUS.formatRawCellContents(-12.343, -1, p2dp_n2dpTSP));
-//        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, p2dp_n1dpTSP));
-//        assertEquals("(12.3)", dfUS.formatRawCellContents(-12.343, -1, p2dp_n1dpTSP));
-    }
-
-    /**
-     * Test that we correctly handle fractions in the
-     *  format string, eg # #/#
-     */
-    @Test
-    public void testFractions() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        // Excel often prefers "# #/#"
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "# #/#"));
-        assertEquals("321 26/81", dfUS.formatRawCellContents(321.321, -1, "# #/##"));
-        assertEquals("26027/81",  dfUS.formatRawCellContents(321.321, -1, "#/##"));
-
-        // OOo seems to like the "# ?/?" form
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "# ?/?"));
-        assertEquals("321 26/81", dfUS.formatRawCellContents(321.321, -1, "# ?/??"));
-        assertEquals("26027/81",  dfUS.formatRawCellContents(321.321, -1, "?/??"));
-
-        // p;n;z;s parts
-        assertEquals("321 1/3",  dfUS.formatRawCellContents(321.321,  -1, "# #/#;# ##/#;0;xxx"));
-        assertEquals("321 1/3",  dfUS.formatRawCellContents(-321.321, -1, "# #/#;# ##/#;0;xxx")); // Note the lack of - sign!
-        assertEquals("0",        dfUS.formatRawCellContents(0,       -1, "# #/#;# ##/#;0;xxx"));
-//        assertEquals(".",        dfUS.formatRawCellContents(0,       -1, "# #/#;# ##/#;#.#;xxx")); // Currently shows as 0. not .
-
-        // Custom formats with text
-        assertEquals("+ve",       dfUS.formatRawCellContents(1,        -1, "+ve;-ve;zero;xxx"));
-        assertEquals("-ve",       dfUS.formatRawCellContents(-1,       -1, "-ve;-ve;zero;xxx"));
-        assertEquals("zero",      dfUS.formatRawCellContents(0,        -1, "zero;-ve;zero;xxx"));
-
-        // Custom formats - check text is stripped, including multiple spaces
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "#   #/#"));
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "#\"  \" #/#"));
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "#\"FRED\" #/#"));
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "#\\ #/#"));
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "# \\q#/#"));
-
-        // Cases that were very slow
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "0\" \"?/?;?/?")); // 0" "?/?;?/?     - length of -ve part was used
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "0 \"#\"\\#\\#?/?")); // 0 "#"\#\#?/? - length of text was used
-
-        assertEquals("321 295/919",  dfUS.formatRawCellContents(321.321, -1, "# #/###"));
-        assertEquals("321 321/1000",  dfUS.formatRawCellContents(321.321, -1, "# #/####")); // Code limits to #### as that is as slow as we want to get
-        assertEquals("321 321/1000",  dfUS.formatRawCellContents(321.321, -1, "# #/##########"));
-
-        // Not a valid fraction formats (too many #/# or ?/?) - hence the strange expected results
-/*
-        assertEquals("321 / ?/?",   dfUS.formatRawCellContents(321.321, -1, "# #/# ?/?"));
-        assertEquals("321 / /",     dfUS.formatRawCellContents(321.321, -1, "# #/# #/#"));
-        assertEquals("321 ?/? ?/?",   dfUS.formatRawCellContents(321.321, -1, "# ?/? ?/?"));
-        assertEquals("321 ?/? / /",   dfUS.formatRawCellContents(321.321, -1, "# ?/? #/# #/#"));
-*/
-
-        //Bug54686 patch sets default behavior of # #/## if there is a failure to parse
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "# #/# ?/?"));
-        assertEquals("321 1/3",     dfUS.formatRawCellContents(321.321, -1, "# #/# #/#"));
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "# ?/? ?/?"));
-        assertEquals("321 1/3",   dfUS.formatRawCellContents(321.321, -1, "# ?/? #/# #/#"));
-
-        // Where +ve has a fraction, but -ve doesn't, we currently show both
-        assertEquals("123 1/3", dfUS.formatRawCellContents( 123.321, -1, "0 ?/?;0"));
-        //assertEquals("123",     dfUS.formatRawCellContents(-123.321, -1, "0 ?/?;0"));
-
-        //Bug54868 patch has a hit on the first string before the ";"
-        assertEquals("-123 1/3", dfUS.formatRawCellContents(-123.321, -1, "0 ?/?;0"));
-
-        //Bug53150 formatting a whole number with fractions should just give the number
-        assertEquals("1",   dfUS.formatRawCellContents(1.0, -1, "# #/#"));
-        assertEquals("11",   dfUS.formatRawCellContents(11.0, -1, "# #/#"));
-    }
-
-    /**
-     * Test that _x (blank with the space taken by "x")
-     *  and *x (fill to the column width with "x"s) are
-     *  correctly ignored by us.
-     */
-    @Test
-    public void testPaddingSpaces() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##_ "));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##_1"));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##_)"));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "_-##.##"));
-
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##* "));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##*1"));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##*)"));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "*-##.##"));
-    }
-
-    /**
-     * DataFormatter is the CSV mode preserves spaces
-     */
-    @Test
-    public void testPaddingSpacesCSV() {
-        DataFormatter dfUS = new DataFormatter(Locale.US, true);
-        assertEquals("12.34 ", dfUS.formatRawCellContents(12.343, -1, "##.##_ "));
-        assertEquals("-12.34 ", dfUS.formatRawCellContents(-12.343, -1, "##.##_ "));
-        assertEquals(". ", dfUS.formatRawCellContents(0.0, -1, "##.##_ "));
-        assertEquals("12.34 ", dfUS.formatRawCellContents(12.343, -1, "##.##_1"));
-        assertEquals("-12.34 ", dfUS.formatRawCellContents(-12.343, -1, "##.##_1"));
-        assertEquals(". ", dfUS.formatRawCellContents(0.0, -1, "##.##_1"));
-        assertEquals("12.34 ", dfUS.formatRawCellContents(12.343, -1, "##.##_)"));
-        assertEquals("-12.34 ", dfUS.formatRawCellContents(-12.343, -1, "##.##_)"));
-        assertEquals(". ", dfUS.formatRawCellContents(0.0, -1, "##.##_)"));
-        assertEquals(" 12.34", dfUS.formatRawCellContents(12.343, -1, "_-##.##"));
-        assertEquals("- 12.34", dfUS.formatRawCellContents(-12.343, -1, "_-##.##"));
-        assertEquals(" .", dfUS.formatRawCellContents(0.0, -1, "_-##.##"));
-
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##* "));
-        assertEquals("-12.34", dfUS.formatRawCellContents(-12.343, -1, "##.##* "));
-        assertEquals(".", dfUS.formatRawCellContents(0.0, -1, "##.##* "));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##*1"));
-        assertEquals("-12.34", dfUS.formatRawCellContents(-12.343, -1, "##.##*1"));
-        assertEquals(".", dfUS.formatRawCellContents(0.0, -1, "##.##*1"));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "##.##*)"));
-        assertEquals("-12.34", dfUS.formatRawCellContents(-12.343, -1, "##.##*)"));
-        assertEquals(".", dfUS.formatRawCellContents(0.0, -1, "##.##*)"));
-        assertEquals("12.34", dfUS.formatRawCellContents(12.343, -1, "*-##.##"));
-        assertEquals("-12.34", dfUS.formatRawCellContents(-12.343, -1, "*-##.##"));
-        assertEquals(".", dfUS.formatRawCellContents(0.0, -1, "*-##.##"));
-    }
-
-    /**
-     * Test that the special Excel month format MMMMM
-     *  gets turned into the first letter of the month
-     */
-    @Test
-    public void testMMMMM() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        Calendar c = LocaleUtil.getLocaleCalendar(2010, 5, 1, 2, 0, 0);
-
-        assertEquals("2010-J-1 2:00:00", dfUS.formatRawCellContents(
-                DateUtil.getExcelDate(c, false), -1, "YYYY-MMMMM-D h:mm:ss"
-        ));
-    }
-
-    /**
-     * Tests that we do AM/PM handling properly
-     */
-    @Test
-    public void testAMPM() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        assertEquals("06:00", dfUS.formatRawCellContents(0.25, -1, "hh:mm"));
-        assertEquals("18:00", dfUS.formatRawCellContents(0.75, -1, "hh:mm"));
-
-        assertEquals("06:00 AM", dfUS.formatRawCellContents(0.25, -1, "hh:mm AM/PM"));
-        assertEquals("06:00 PM", dfUS.formatRawCellContents(0.75, -1, "hh:mm AM/PM"));
-
-        assertEquals("1904-01-01 06:00:00 AM", dfUS.formatRawCellContents(0.25, -1, "yyyy-mm-dd hh:mm:ss AM/PM", true));
-        assertEquals("1904-01-01 06:00:00 PM", dfUS.formatRawCellContents(0.75, -1, "yyyy-mm-dd hh:mm:ss AM/PM", true));
-    }
-
-    /**
-     * Test that we can handle elapsed time,
-     *  eg formatting 1 day 4 hours as 28 hours
-     */
-    @Test
-    public void testElapsedTime() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        double hour = 1.0/24.0;
-
-        assertEquals("01:00", dfUS.formatRawCellContents(1*hour, -1, "hh:mm"));
-        assertEquals("05:00", dfUS.formatRawCellContents(5*hour, -1, "hh:mm"));
-        assertEquals("20:00", dfUS.formatRawCellContents(20*hour, -1, "hh:mm"));
-        assertEquals("23:00", dfUS.formatRawCellContents(23*hour, -1, "hh:mm"));
-        assertEquals("00:00", dfUS.formatRawCellContents(24*hour, -1, "hh:mm"));
-        assertEquals("02:00", dfUS.formatRawCellContents(26*hour, -1, "hh:mm"));
-        assertEquals("20:00", dfUS.formatRawCellContents(44*hour, -1, "hh:mm"));
-        assertEquals("02:00", dfUS.formatRawCellContents(50*hour, -1, "hh:mm"));
-
-        assertEquals("01:00", dfUS.formatRawCellContents(1*hour, -1, "[hh]:mm"));
-        assertEquals("05:00", dfUS.formatRawCellContents(5*hour, -1, "[hh]:mm"));
-        assertEquals("20:00", dfUS.formatRawCellContents(20*hour, -1, "[hh]:mm"));
-        assertEquals("23:00", dfUS.formatRawCellContents(23*hour, -1, "[hh]:mm"));
-        assertEquals("24:00", dfUS.formatRawCellContents(24*hour, -1, "[hh]:mm"));
-        assertEquals("26:00", dfUS.formatRawCellContents(26*hour, -1, "[hh]:mm"));
-        assertEquals("44:00", dfUS.formatRawCellContents(44*hour, -1, "[hh]:mm"));
-        assertEquals("50:00", dfUS.formatRawCellContents(50*hour, -1, "[hh]:mm"));
-
-        assertEquals("01", dfUS.formatRawCellContents(1*hour, -1, "[hh]"));
-        assertEquals("05", dfUS.formatRawCellContents(5*hour, -1, "[hh]"));
-        assertEquals("20", dfUS.formatRawCellContents(20*hour, -1, "[hh]"));
-        assertEquals("23", dfUS.formatRawCellContents(23*hour, -1, "[hh]"));
-        assertEquals("24", dfUS.formatRawCellContents(24*hour, -1, "[hh]"));
-        assertEquals("26", dfUS.formatRawCellContents(26*hour, -1, "[hh]"));
-        assertEquals("44", dfUS.formatRawCellContents(44*hour, -1, "[hh]"));
-        assertEquals("50", dfUS.formatRawCellContents(50*hour, -1, "[hh]"));
-
-        double minute = 1.0/24.0/60.0;
-        assertEquals("01:00", dfUS.formatRawCellContents(1*minute, -1, "[mm]:ss"));
-        assertEquals("05:00", dfUS.formatRawCellContents(5*minute, -1, "[mm]:ss"));
-        assertEquals("20:00", dfUS.formatRawCellContents(20*minute, -1, "[mm]:ss"));
-        assertEquals("23:00", dfUS.formatRawCellContents(23*minute, -1, "[mm]:ss"));
-        assertEquals("24:00", dfUS.formatRawCellContents(24*minute, -1, "[mm]:ss"));
-        assertEquals("26:00", dfUS.formatRawCellContents(26*minute, -1, "[mm]:ss"));
-        assertEquals("44:00", dfUS.formatRawCellContents(44*minute, -1, "[mm]:ss"));
-        assertEquals("50:00", dfUS.formatRawCellContents(50*minute, -1, "[mm]:ss"));
-        assertEquals("59:00", dfUS.formatRawCellContents(59*minute, -1, "[mm]:ss"));
-        assertEquals("60:00", dfUS.formatRawCellContents(60*minute, -1, "[mm]:ss"));
-        assertEquals("61:00", dfUS.formatRawCellContents(61*minute, -1, "[mm]:ss"));
-        assertEquals("119:00", dfUS.formatRawCellContents(119*minute, -1, "[mm]:ss"));
-        assertEquals("120:00", dfUS.formatRawCellContents(120*minute, -1, "[mm]:ss"));
-        assertEquals("121:00", dfUS.formatRawCellContents(121*minute, -1, "[mm]:ss"));
-
-        assertEquals("01", dfUS.formatRawCellContents(1*minute, -1, "[mm]"));
-        assertEquals("05", dfUS.formatRawCellContents(5*minute, -1, "[mm]"));
-        assertEquals("20", dfUS.formatRawCellContents(20*minute, -1, "[mm]"));
-        assertEquals("23", dfUS.formatRawCellContents(23*minute, -1, "[mm]"));
-        assertEquals("24", dfUS.formatRawCellContents(24*minute, -1, "[mm]"));
-        assertEquals("26", dfUS.formatRawCellContents(26*minute, -1, "[mm]"));
-        assertEquals("44", dfUS.formatRawCellContents(44*minute, -1, "[mm]"));
-        assertEquals("50", dfUS.formatRawCellContents(50*minute, -1, "[mm]"));
-        assertEquals("59", dfUS.formatRawCellContents(59*minute, -1, "[mm]"));
-        assertEquals("60", dfUS.formatRawCellContents(60*minute, -1, "[mm]"));
-        assertEquals("61", dfUS.formatRawCellContents(61*minute, -1, "[mm]"));
-        assertEquals("119", dfUS.formatRawCellContents(119*minute, -1, "[mm]"));
-        assertEquals("120", dfUS.formatRawCellContents(120*minute, -1, "[mm]"));
-        assertEquals("121", dfUS.formatRawCellContents(121*minute, -1, "[mm]"));
-
-        double second = 1.0/24.0/60.0/60.0;
-        assertEquals("86400", dfUS.formatRawCellContents(86400*second, -1, "[ss]"));
-        assertEquals("01", dfUS.formatRawCellContents(1*second, -1, "[ss]"));
-        assertEquals("05", dfUS.formatRawCellContents(5*second, -1, "[ss]"));
-        assertEquals("20", dfUS.formatRawCellContents(20*second, -1, "[ss]"));
-        assertEquals("23", dfUS.formatRawCellContents(23*second, -1, "[ss]"));
-        assertEquals("24", dfUS.formatRawCellContents(24*second, -1, "[ss]"));
-        assertEquals("26", dfUS.formatRawCellContents(26*second, -1, "[ss]"));
-        assertEquals("44", dfUS.formatRawCellContents(44*second, -1, "[ss]"));
-        assertEquals("50", dfUS.formatRawCellContents(50*second, -1, "[ss]"));
-        assertEquals("59", dfUS.formatRawCellContents(59*second, -1, "[ss]"));
-        assertEquals("60", dfUS.formatRawCellContents(60*second, -1, "[ss]"));
-        assertEquals("61", dfUS.formatRawCellContents(61*second, -1, "[ss]"));
-        assertEquals("119", dfUS.formatRawCellContents(119*second, -1, "[ss]"));
-        assertEquals("120", dfUS.formatRawCellContents(120*second, -1, "[ss]"));
-        assertEquals("121", dfUS.formatRawCellContents(121*second, -1, "[ss]"));
-
-        boolean jdk_1_5 = System.getProperty("java.vm.version").startsWith("1.5");
-        if(!jdk_1_5) {
-            // YK: the tests below were written under JDK 1.6 and assume that
-            // the rounding mode in the underlying decimal formatters is HALF_UP
-            // It is not so JDK 1.5 where the default rounding mode is HALV_EVEN and cannot be changed.
-
-            assertEquals("27:18:08", dfUS.formatRawCellContents(1.1376, -1, "[h]:mm:ss"));
-            assertEquals("28:48:00", dfUS.formatRawCellContents(1.2, -1,  "[h]:mm:ss"));
-            assertEquals("29:31:12", dfUS.formatRawCellContents(1.23, -1, "[h]:mm:ss"));
-            assertEquals("31:26:24", dfUS.formatRawCellContents(1.31, -1, "[h]:mm:ss"));
-
-            assertEquals("27:18:08", dfUS.formatRawCellContents(1.1376, -1, "[hh]:mm:ss"));
-            assertEquals("28:48:00", dfUS.formatRawCellContents(1.2, -1,  "[hh]:mm:ss"));
-            assertEquals("29:31:12", dfUS.formatRawCellContents(1.23, -1, "[hh]:mm:ss"));
-            assertEquals("31:26:24", dfUS.formatRawCellContents(1.31, -1, "[hh]:mm:ss"));
-
-            assertEquals("57:07.2", dfUS.formatRawCellContents(.123, -1, "mm:ss.0;@"));
-            assertEquals("57:41.8", dfUS.formatRawCellContents(.1234, -1, "mm:ss.0;@"));
-            assertEquals("57:41.76", dfUS.formatRawCellContents(.1234, -1, "mm:ss.00;@"));
-            assertEquals("57:41.760", dfUS.formatRawCellContents(.1234, -1, "mm:ss.000;@"));
-            assertEquals("24:00.0", dfUS.formatRawCellContents(123456.6, -1, "mm:ss.0"));
-        }
-    }
-
-    @Test
-    public void testDateWindowing() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        assertEquals("1899-12-31 00:00:00", dfUS.formatRawCellContents(0.0, -1, "yyyy-mm-dd hh:mm:ss"));
-        assertEquals("1899-12-31 00:00:00", dfUS.formatRawCellContents(0.0, -1, "yyyy-mm-dd hh:mm:ss", false));
-        assertEquals("1904-01-01 00:00:00", dfUS.formatRawCellContents(0.0, -1, "yyyy-mm-dd hh:mm:ss", true));
-    }
-
-    @Test
-    public void testScientificNotation() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        assertEquals("1.23E+01", dfUS.formatRawCellContents(12.343, -1, "0.00E+00"));
-        assertEquals("-1.23E+01", dfUS.formatRawCellContents(-12.343, -1, "0.00E+00"));
-        assertEquals("0.00E+00", dfUS.formatRawCellContents(0.0, -1, "0.00E+00"));
-    }
-
-    @Test
-    public void testInvalidDate() {
-        DataFormatter df1 = new DataFormatter(Locale.US);
-        assertEquals("-1.0", df1.formatRawCellContents(-1, -1, "mm/dd/yyyy"));
-
-        DataFormatter df2 = new DataFormatter(Locale.US, true);
-        assertEquals("###############################################################################################################################################################################################################################################################",
-                df2.formatRawCellContents(-1, -1, "mm/dd/yyyy"));
-    }
-
-    @Test
-    public void testEscapes() {
-        DataFormatter dfUS = new DataFormatter(Locale.US);
-
-        assertEquals("1901-01-01", dfUS.formatRawCellContents(367.0, -1, "yyyy-mm-dd"));
-        assertEquals("1901-01-01", dfUS.formatRawCellContents(367.0, -1, "yyyy\\-mm\\-dd"));
-
-        assertEquals("1901.01.01", dfUS.formatRawCellContents(367.0, -1, "yyyy.mm.dd"));
-        assertEquals("1901.01.01", dfUS.formatRawCellContents(367.0, -1, "yyyy\\.mm\\.dd"));
-
-        assertEquals("1901/01/01", dfUS.formatRawCellContents(367.0, -1, "yyyy/mm/dd"));
-        assertEquals("1901/01/01", dfUS.formatRawCellContents(367.0, -1, "yyyy\\/mm\\/dd"));
-    }
-
-    @Test
-    public void testFormatsWithPadding() {
-        DataFormatter dfUS = new DataFormatter(Locale.US, true);
-
-        // These request space-padding, based on the cell width
-        // There should always be one space after, variable (non-zero) amount before
-        // Because the Cell Width isn't available, this gets emulated with
-        //  4 leading spaces, or a minus then 3 leading spaces
-        // This isn't all that consistent, but it's the best we can really manage...
-        assertEquals("    1,234.56 ", dfUS.formatRawCellContents( 1234.56, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-        assertEquals("-   1,234.56 ", dfUS.formatRawCellContents(-1234.56, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-        assertEquals("    12.34 ", dfUS.formatRawCellContents( 12.34, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-        assertEquals("-   12.34 ", dfUS.formatRawCellContents(-12.34, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-
-        assertEquals("    0.10 ", dfUS.formatRawCellContents( 0.1, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-        assertEquals("-   0.10 ", dfUS.formatRawCellContents(-0.1, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-        // TODO Fix this, we are randomly adding a 0 at the end that shouldn't be there
-        //assertEquals("     -   ", dfUS.formatRawCellContents(0.0, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
-
-        assertEquals(" $   1.10 ", dfUS.formatRawCellContents( 1.1, -1, "_-$* #,##0.00_-;-$* #,##0.00_-;_-$* \"-\"??_-;_-@_-"));
-        assertEquals("-$   1.10 ", dfUS.formatRawCellContents(-1.1, -1, "_-$* #,##0.00_-;-$* #,##0.00_-;_-$* \"-\"??_-;_-@_-"));
-        // TODO Fix this, we are randomly adding a 0 at the end that shouldn't be there
-        //assertEquals(" $    -   ", dfUS.formatRawCellContents( 0.0, -1, "_-$* #,##0.00_-;-$* #,##0.00_-;_-$* \"-\"??_-;_-@_-"));
-    }
-
-    @Test
-    public void testErrors() throws IOException {
-        DataFormatter dfUS = new DataFormatter(Locale.US, true);
-
-        // Create a spreadsheet with some formula errors in it
-        Workbook wb = new HSSFWorkbook();
-        try {
-            Sheet s = wb.createSheet();
-            Row r = s.createRow(0);
-            Cell c = r.createCell(0, CellType.ERROR);
-
-            c.setCellErrorValue(FormulaError.DIV0.getCode());
-            assertEquals(FormulaError.DIV0.getString(), dfUS.formatCellValue(c));
-
-            c.setCellErrorValue(FormulaError.REF.getCode());
-            assertEquals(FormulaError.REF.getString(), dfUS.formatCellValue(c));
-        } finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testBoolean() throws IOException {
-        DataFormatter formatter = new DataFormatter();
-
-        // Create a spreadsheet with some TRUE/FALSE boolean values in it
-        Workbook wb = new HSSFWorkbook();
-        try {
-            Sheet s = wb.createSheet();
-            Row r = s.createRow(0);
-            Cell c = r.createCell(0);
-
-            c.setCellValue(true);
-            assertEquals("TRUE", formatter.formatCellValue(c));
-
-            c.setCellValue(false);
-            assertEquals("FALSE", formatter.formatCellValue(c));
-        } finally {
-            wb.close();
-        }
-    }
-
-    /**
-     * While we don't currently support using a locale code at
-     *  the start of a format string to format it differently, we
-     *  should at least handle it as it if wasn't there
-     */
-    @Test
-    public void testDatesWithLocales() {
-        DataFormatter dfUS = new DataFormatter(Locale.US, true);
-
-        String dateFormatEnglish = "[$-409]mmmm dd yyyy  h:mm AM/PM";
-        String dateFormatChinese = "[$-804]mmmm dd yyyy  h:mm AM/PM";
-
-        // Check we format the English one correctly
-        double date = 26995.477777777778;
-        assertEquals(
-            "November 27 1973  11:28 AM",
-            dfUS.formatRawCellContents(date, -1, dateFormatEnglish)
-        );
-
-        // Check that, in the absence of locale support, we handle
-        //  the Chinese one the same as the English one
-        assertEquals(
-            "November 27 1973  11:28 AM",
-            dfUS.formatRawCellContents(date, -1, dateFormatChinese)
-        );
-    }
-
-    /**
-     * TODO Fix these so that they work
-     */
-    @Test
-    @Ignore
-    public void testCustomFormats() {
-        DataFormatter dfUS = new DataFormatter(Locale.US, true);
-        String fmt;
-
-        fmt = "\"At\" H:MM AM/PM \"on\" DDDD MMMM D\",\" YYYY";
-        assertEquals(
-            "At 4:20 AM on Thursday May 17, 2007",
-            dfUS.formatRawCellContents(39219.1805636921, -1, fmt)
-        );
-
-        fmt = "0 \"dollars and\" .00 \"cents\"";
-        assertEquals("19 dollars and .99 cents", dfUS.formatRawCellContents(19.99, -1, fmt));
-    }
-
-    /**
-     * ExcelStyleDateFormatter should work for Milliseconds too
-     */
-    @Test
-    public void testExcelStyleDateFormatterStringOnMillis() {
-        // Test directly with the .000 style
-        DateFormat formatter1 = new ExcelStyleDateFormatter("ss.000");
-
-        assertEquals("00.001", formatter1.format(new Date(1L)));
-        assertEquals("00.010", formatter1.format(new Date(10L)));
-        assertEquals("00.100", formatter1.format(new Date(100L)));
-        assertEquals("01.000", formatter1.format(new Date(1000L)));
-        assertEquals("01.001", formatter1.format(new Date(1001L)));
-        assertEquals("10.000", formatter1.format(new Date(10000L)));
-        assertEquals("10.001", formatter1.format(new Date(10001L)));
-
-        // Test directly with the .SSS style
-        DateFormat formatter2 = new ExcelStyleDateFormatter("ss.SSS");
-
-        assertEquals("00.001", formatter2.format(new Date(1L)));
-        assertEquals("00.010", formatter2.format(new Date(10L)));
-        assertEquals("00.100", formatter2.format(new Date(100L)));
-        assertEquals("01.000", formatter2.format(new Date(1000L)));
-        assertEquals("01.001", formatter2.format(new Date(1001L)));
-        assertEquals("10.000", formatter2.format(new Date(10000L)));
-        assertEquals("10.001", formatter2.format(new Date(10001L)));
-
-
-        // Test via DataFormatter
-        DataFormatter dfUS = new DataFormatter(Locale.US, true);
-        assertEquals("01.010", dfUS.formatRawCellContents(0.0000116898, -1, "ss.000"));
-    }
-
-    @Test
-    public void testBug54786() {
-        DataFormatter formatter = new DataFormatter();
-        String format = "[h]\"\"h\"\" m\"\"m\"\"";
-        assertTrue(DateUtil.isADateFormat(-1,format));
-        assertTrue(DateUtil.isValidExcelDate(_15_MINUTES));
-        
-        assertEquals("1h 0m", formatter.formatRawCellContents(_15_MINUTES, -1, format, false));
-        assertEquals("0.041666667", formatter.formatRawCellContents(_15_MINUTES, -1, "[h]'h'", false));
-        assertEquals("1h 0m\"", formatter.formatRawCellContents(_15_MINUTES, -1, "[h]\"\"h\"\" m\"\"m\"\"\"", false));
-        assertEquals("1h", formatter.formatRawCellContents(_15_MINUTES, -1, "[h]\"\"h\"\"", false));
-        assertEquals("h1", formatter.formatRawCellContents(_15_MINUTES, -1, "\"\"h\"\"[h]", false));
-        assertEquals("h1", formatter.formatRawCellContents(_15_MINUTES, -1, "\"\"h\"\"h", false));
-        assertEquals(" 60", formatter.formatRawCellContents(_15_MINUTES, -1, " [m]", false));
-        assertEquals("h60", formatter.formatRawCellContents(_15_MINUTES, -1, "\"\"h\"\"[m]", false));
-        assertEquals("m1", formatter.formatRawCellContents(_15_MINUTES, -1, "\"\"m\"\"h", false));
-        
-        try {
-            assertEquals("1h 0m\"", formatter.formatRawCellContents(_15_MINUTES, -1, "[h]\"\"h\"\" m\"\"m\"\"\"\"", false));
-            fail("Catches exception because of invalid format, i.e. trailing quoting");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("Cannot format given Object as a Number"));
-        }
-    }
-    
-    @Test
-    public void testIsADateFormat() {
-        // first check some cases that should not be a date, also call multiple times to ensure the cache is used
-        assertFalse(DateUtil.isADateFormat(-1, null));
-        assertFalse(DateUtil.isADateFormat(-1, null));
-        assertFalse(DateUtil.isADateFormat(123, null));
-        assertFalse(DateUtil.isADateFormat(123, ""));
-        assertFalse(DateUtil.isADateFormat(124, ""));
-        assertFalse(DateUtil.isADateFormat(-1, ""));
-        assertFalse(DateUtil.isADateFormat(-1, ""));
-        assertFalse(DateUtil.isADateFormat(-1, "nodateformat"));
-
-        // then also do the same for some valid date formats
-        assertTrue(DateUtil.isADateFormat(0x0e, null));
-        assertTrue(DateUtil.isADateFormat(0x2f, null));
-        assertTrue(DateUtil.isADateFormat(-1, "yyyy"));
-        assertTrue(DateUtil.isADateFormat(-1, "yyyy"));
-        assertTrue(DateUtil.isADateFormat(-1, "dd/mm/yy;[red]dd/mm/yy"));
-        assertTrue(DateUtil.isADateFormat(-1, "dd/mm/yy;[red]dd/mm/yy"));
-        assertTrue(DateUtil.isADateFormat(-1, "[h]"));
-    }
-
-
-    @Test
-    public void testLargeNumbersAndENotation() throws IOException{
-        assertFormatsTo("1E+86", 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999d);
-        assertFormatsTo("1E-84", 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000001d);
-        // Smallest double
-        assertFormatsTo("1E-323", 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001d);
-
-        // "up to 11 numeric characters, with the decimal point counting as a numeric character"
-        // https://support.microsoft.com/en-us/kb/65903
-        assertFormatsTo( "12345678911",   12345678911d);
-        assertFormatsTo( "1.23457E+11",   123456789112d);  // 12th digit of integer -> scientific
-        assertFormatsTo( "-12345678911", -12345678911d);
-        assertFormatsTo( "-1.23457E+11", -123456789112d);
-        assertFormatsTo( "0.1",           0.1);
-        assertFormatsTo( "0.000000001",   0.000000001);
-        assertFormatsTo( "1E-10",         0.0000000001);  // 12th digit
-        assertFormatsTo( "-0.000000001", -0.000000001);
-        assertFormatsTo( "-1E-10",       -0.0000000001);
-        assertFormatsTo( "123.4567892",   123.45678919);  // excess decimals are simply rounded away
-        assertFormatsTo("-123.4567892",  -123.45678919);
-        assertFormatsTo( "1.234567893",   1.2345678925);  // rounding mode is half-up
-        assertFormatsTo("-1.234567893",  -1.2345678925);
-        assertFormatsTo( "1.23457E+19",   12345650000000000000d);
-        assertFormatsTo("-1.23457E+19",  -12345650000000000000d);
-        assertFormatsTo( "1.23457E-19",   0.0000000000000000001234565d);
-        assertFormatsTo("-1.23457E-19",  -0.0000000000000000001234565d);
-        assertFormatsTo( "1.000000001",   1.000000001);
-        assertFormatsTo( "1",             1.0000000001);
-        assertFormatsTo( "1234.567891",   1234.567891123456789d);
-        assertFormatsTo( "1234567.891",   1234567.891123456789d);
-        assertFormatsTo( "12345678912",   12345678911.63456789d);  // integer portion uses all 11 digits
-        assertFormatsTo( "12345678913",   12345678912.5d);  // half-up here too
-        assertFormatsTo("-12345678913",  -12345678912.5d);
-        assertFormatsTo( "1.23457E+11",   123456789112.3456789d);
-    }
-
-    private static void assertFormatsTo(String expected, double input) throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        try {
-            Sheet s1 = wb.createSheet();
-            Row row = s1.createRow(0);
-            Cell rawValue = row.createCell(0);
-            rawValue.setCellValue(input);
-            CellStyle newStyle = wb.createCellStyle();
-            DataFormat dataFormat = wb.createDataFormat();
-            newStyle.setDataFormat(dataFormat.getFormat("General"));
-            String actual = new DataFormatter().formatCellValue(rawValue);
-            assertEquals(expected, actual);
-        }
-        finally {
-            wb.close();
-        }
-    }
-
-    @Test
-    public void testFormulaEvaluation() throws IOException {
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("FormulaEvalTestData.xls");
-
-        CellReference ref = new CellReference("D47");
-
-        Cell cell = wb.getSheetAt(0).getRow(ref.getRow()).getCell(ref.getCol());
-        //noinspection deprecation
-        assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
-        assertEquals("G9:K9 I7:I12", cell.getCellFormula());
-
-        DataFormatter formatter = new DataFormatter();
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals("5.6789", formatter.formatCellValue(cell, evaluator));
-
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java
deleted file mode 100644
index 3f0ef4b..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-public class TestDateUtil {
-
-    @Test
-    public void getJavaDate_InvalidValue() {
-        double dateValue = -1;
-        TimeZone tz = LocaleUtil.getUserTimeZone();
-        boolean use1904windowing = false;
-        boolean roundSeconds = false;
-
-        assertEquals(null, DateUtil.getJavaDate(dateValue));
-        assertEquals(null, DateUtil.getJavaDate(dateValue, tz));
-        assertEquals(null, DateUtil.getJavaDate(dateValue, use1904windowing));
-        assertEquals(null, DateUtil.getJavaDate(dateValue, use1904windowing, tz));
-        assertEquals(null, DateUtil.getJavaDate(dateValue, use1904windowing, tz, roundSeconds));
-    }
-
-    @Test
-    public void getJavaDate_ValidValue() {
-        double dateValue = 0;
-        TimeZone tz = LocaleUtil.getUserTimeZone();
-        boolean use1904windowing = false;
-        boolean roundSeconds = false;
-
-        Calendar calendar = LocaleUtil.getLocaleCalendar(1900, 0, 0);
-        Date date = calendar.getTime();
-
-        assertEquals(date, DateUtil.getJavaDate(dateValue));
-        assertEquals(date, DateUtil.getJavaDate(dateValue, tz));
-        assertEquals(date, DateUtil.getJavaDate(dateValue, use1904windowing));
-        assertEquals(date, DateUtil.getJavaDate(dateValue, use1904windowing, tz));
-        assertEquals(date, DateUtil.getJavaDate(dateValue, use1904windowing, tz, roundSeconds));
-    }
-
-    @Test
-    public void getJavaCalendar_InvalidValue() {
-        double dateValue = -1;
-        TimeZone tz = LocaleUtil.getUserTimeZone();
-        boolean use1904windowing = false;
-        boolean roundSeconds = false;
-
-        assertEquals(null, DateUtil.getJavaCalendar(dateValue));
-        assertEquals(null, DateUtil.getJavaCalendar(dateValue, use1904windowing));
-        assertEquals(null, DateUtil.getJavaCalendar(dateValue, use1904windowing, tz));
-        assertEquals(null, DateUtil.getJavaCalendar(dateValue, use1904windowing, tz, roundSeconds));
-    }
-
-    @Test
-    public void getJavaCalendar_ValidValue() {
-        double dateValue = 0;
-        TimeZone tz = LocaleUtil.getUserTimeZone();
-        boolean use1904windowing = false;
-        boolean roundSeconds = false;
-
-        Calendar expCal = LocaleUtil.getLocaleCalendar(1900, 0, 0);
-
-        Calendar actCal[] = {
-            DateUtil.getJavaCalendar(dateValue),
-            DateUtil.getJavaCalendar(dateValue, use1904windowing),
-            DateUtil.getJavaCalendar(dateValue, use1904windowing, tz),
-            DateUtil.getJavaCalendar(dateValue, use1904windowing, tz, roundSeconds)
-        };
-        assertEquals(expCal, actCal[0]);
-        assertEquals(expCal, actCal[1]);
-        assertEquals(expCal, actCal[2]);
-        assertEquals(expCal, actCal[3]);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java
deleted file mode 100644
index e99c3fe..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
-
-/**
- * Tests for the Fraction Formatting part of DataFormatter.
- * Largely taken from bug #54686
- */
-public final class TestFractionFormat {
-    @Test
-    public void testSingle() throws Exception {
-        FractionFormat f = new FractionFormat("", "##");
-        double val = 321.321;
-        String ret = f.format(val);
-        assertEquals("26027/81", ret);
-    }
-     
-    @Test
-    public void testTruthFile() throws Exception {
-        File truthFile = HSSFTestDataSamples.getSampleFile("54686_fraction_formats.txt");
-        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(truthFile), LocaleUtil.CHARSET_1252));
-        Workbook wb = HSSFTestDataSamples.openSampleWorkbook("54686_fraction_formats.xls");
-        Sheet sheet = wb.getSheetAt(0);
-        DataFormatter formatter = new DataFormatter();
-        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-        // Skip over the header row
-        String truthLine = reader.readLine();
-        String[] headers = truthLine.split("\t");
-        truthLine = reader.readLine();
-
-        for (int i = 1; i < sheet.getLastRowNum() && truthLine != null; i++){
-            Row r = sheet.getRow(i);
-            String[] truths = truthLine.split("\t");
-            // Intentionally ignore the last column (tika-1132), for now
-            for (short j = 3; j < 12; j++){
-                Cell cell = r.getCell(j, MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                String formatted = clean(formatter.formatCellValue(cell, evaluator));
-                if (truths.length <= j){
-                    continue;
-                }
-
-                String truth = clean(truths[j]);
-                String testKey = truths[0]+":"+truths[1]+":"+headers[j];
-                assertEquals(testKey, truth, formatted);
-            }
-            truthLine = reader.readLine();
-        }
-        wb.close();
-        reader.close();
-    }
-
-    private String clean(String s){
-        s = s.trim().replaceAll(" +",  " ").replaceAll("- +", "-");
-        return s;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
deleted file mode 100644
index 7214645..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestHSSFBorderStyle extends BaseTestBorderStyle  {
-
-    public TestHSSFBorderStyle() {
-        super(HSSFITestDataProvider.instance);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java
deleted file mode 100644
index 5ca6621..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.usermodel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-
-/**
- * @author Yegor Kozlov
- */
-public final class TestIndexedColors {
-
-    @Test
-    public void fromInt() {
-        int[] illegalIndices = { -1, 0, 27, 65 };
-        for (int index : illegalIndices) {
-            try {
-                IndexedColors.fromInt(index);
-                fail("Expected IllegalArgumentException: " + index);
-            }
-            catch (final IllegalArgumentException e) {
-                // expected
-            }
-        }
-        assertEquals(IndexedColors.BLACK, IndexedColors.fromInt(8));
-        assertEquals(IndexedColors.GOLD, IndexedColors.fromInt(51));
-        assertEquals(IndexedColors.AUTOMATIC, IndexedColors.fromInt(64));
-    }
-    
-    @Test
-    public void getIndex() {
-        assertEquals(51, IndexedColors.GOLD.getIndex());
-    }
-    
-    @Test
-    public void index() {
-        assertEquals(51, IndexedColors.GOLD.index);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/usermodel/charts/TestDataSources.java b/trunk/src/testcases/org/apache/poi/ss/usermodel/charts/TestDataSources.java
deleted file mode 100644
index 6bf3551..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/usermodel/charts/TestDataSources.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.usermodel.charts;
-
-import junit.framework.TestCase;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.SheetBuilder;
-
-/**
- * Tests for {@link org.apache.poi.ss.usermodel.charts.DataSources}.
- *
- * @author Roman Kashitsyn
- */
-public class TestDataSources extends TestCase {
-
-    private static final Object[][] numericCells = {
-            {0.0,      1.0,       2.0,     3.0,      4.0},
-            {0.0, "=B1*2",  "=C1*2", "=D1*2", "=E1*2"}
-    };
-
-    private static final Object[][] stringCells = {
-            {  1,    2,    3,   4,    5},
-            {"A", "B", "C", "D", "E"}
-    };
-
-    private static final Object[][] mixedCells = {
-            {1.0, "2.0", 3.0, "4.0", 5.0, "6.0"}
-    };
-
-    public void testNumericArrayDataSource() {
-        Double[] doubles = new Double[]{1.0, 2.0, 3.0, 4.0, 5.0};
-        ChartDataSource<Double> doubleDataSource = DataSources.fromArray(doubles);
-        assertTrue(doubleDataSource.isNumeric());
-        assertFalse(doubleDataSource.isReference());
-        assertDataSourceIsEqualToArray(doubleDataSource, doubles);
-    }
-
-    public void testStringArrayDataSource() {
-        String[] strings = new String[]{"one", "two", "three", "four", "five"};
-        ChartDataSource<String> stringDataSource = DataSources.fromArray(strings);
-        assertFalse(stringDataSource.isNumeric());
-        assertFalse(stringDataSource.isReference());
-        assertDataSourceIsEqualToArray(stringDataSource, strings);
-    }
-
-    public void testNumericCellDataSource() {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, numericCells).build();
-        CellRangeAddress numCellRange = CellRangeAddress.valueOf("A2:E2");
-        ChartDataSource<Number> numDataSource = DataSources.fromNumericCellRange(sheet, numCellRange);
-        assertTrue(numDataSource.isReference());
-        assertTrue(numDataSource.isNumeric());
-        assertEquals(numericCells[0].length, numDataSource.getPointCount());
-        for (int i = 0; i < numericCells[0].length; ++i) {
-            assertEquals(((Number) numericCells[0][i]).doubleValue() * 2,
-                    numDataSource.getPointAt(i).doubleValue(), 0.00001);
-        }
-    }
-
-    public void testStringCellDataSource() {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, stringCells).build();
-        CellRangeAddress numCellRange = CellRangeAddress.valueOf("A2:E2");
-        ChartDataSource<String> numDataSource = DataSources.fromStringCellRange(sheet, numCellRange);
-        assertTrue(numDataSource.isReference());
-        assertFalse(numDataSource.isNumeric());
-        assertEquals(numericCells[0].length, numDataSource.getPointCount());
-        for (int i = 0; i < stringCells[1].length; ++i) {
-            assertEquals(stringCells[1][i], numDataSource.getPointAt(i));
-        }
-    }
-
-    public void testMixedCellDataSource() {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, mixedCells).build();
-        CellRangeAddress mixedCellRange = CellRangeAddress.valueOf("A1:F1");
-        ChartDataSource<String> strDataSource = DataSources.fromStringCellRange(sheet, mixedCellRange);
-        ChartDataSource<Number> numDataSource = DataSources.fromNumericCellRange(sheet, mixedCellRange);
-        for (int i = 0; i < mixedCells[0].length; ++i) {
-            if (i % 2 == 0) {
-                assertNull(strDataSource.getPointAt(i));
-                assertEquals(((Number) mixedCells[0][i]).doubleValue(),
-                        numDataSource.getPointAt(i).doubleValue(), 0.00001);
-            } else {
-                assertNull(numDataSource.getPointAt(i));
-                assertEquals(mixedCells[0][i], strDataSource.getPointAt(i));
-            }
-        }
-    }
-
-    public void testIOBExceptionOnInvalidIndex() {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, numericCells).build();
-        CellRangeAddress rangeAddress = CellRangeAddress.valueOf("A2:E2");
-        ChartDataSource<Number> numDataSource = DataSources.fromNumericCellRange(sheet, rangeAddress);
-        IndexOutOfBoundsException exception = null;
-        try {
-            numDataSource.getPointAt(-1);
-        } catch (IndexOutOfBoundsException e) {
-            exception = e;
-        }
-        assertNotNull(exception);
-
-        exception = null;
-        try {
-            numDataSource.getPointAt(numDataSource.getPointCount());
-        } catch (IndexOutOfBoundsException e) {
-            exception = e;
-        }
-        assertNotNull(exception);
-    }
-
-    private <T> void assertDataSourceIsEqualToArray(ChartDataSource<T> ds, T[] array) {
-        assertEquals(ds.getPointCount(), array.length);
-        for (int i = 0; i < array.length; ++i) {
-            assertEquals(ds.getPointAt(i), array[i]);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java b/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java
deleted file mode 100644
index 569fadc..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-/**
- * Test suite for <tt>org.apache.poi.ss.util</tt>
- *
- * @author Josh Micich
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    TestAreaReference.class,
-    //TestCellRangeAddress.class, //converted to junit4
-    //TestCellReference.class, //converted to junit4
-    TestDateFormatConverter.class,
-    TestExpandedDouble.class,
-    TestNumberComparer.class,
-    TestNumberToTextConverter.class,
-    TestSheetBuilder.class,
-    TestSheetUtil.class,
-    TestWorkbookUtil.class
-})
-public class AllSSUtilTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java b/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
deleted file mode 100644
index 29bc3cd..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
-
-/**
- * Tests Spreadsheet CellUtil
- *
- * @see org.apache.poi.ss.util.CellUtil
- */
-public class BaseTestCellUtil {
-    protected final ITestDataProvider _testDataProvider;
-
-    protected BaseTestCellUtil(ITestDataProvider testDataProvider) {
-        _testDataProvider = testDataProvider;
-    }
-    
-    @Test
-    public void setCellStyleProperty() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r = s.createRow(0);
-        Cell c = r.createCell(0);
-
-        // Add a border should create a new style
-        int styCnt1 = wb.getNumCellStyles();
-        CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
-        int styCnt2 = wb.getNumCellStyles();
-        assertEquals(styCnt1+1, styCnt2);
-
-        // Add same border to another cell, should not create another style
-        c = r.createCell(1);
-        CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
-        int styCnt3 = wb.getNumCellStyles();
-        assertEquals(styCnt2, styCnt3);
-
-        wb.close();
-    }
-    
-    @Test(expected=RuntimeException.class)
-    public void setCellStylePropertyWithInvalidValue() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
-            Sheet s = wb.createSheet();
-            Row r = s.createRow(0);
-            Cell c = r.createCell(0);
-
-            // An invalid BorderStyle constant
-            CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM, 42);
-        } finally {
-            wb.close();
-        }
-    }
-    
-    @Test()
-    public void setCellStylePropertyBorderWithShortAndEnum() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r = s.createRow(0);
-        Cell c = r.createCell(0);
-
-        // A valid BorderStyle constant, as a Short
-        CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM, BorderStyle.DASH_DOT.getCode());
-        assertEquals(BorderStyle.DASH_DOT, c.getCellStyle().getBorderBottomEnum());
-        
-        // A valid BorderStyle constant, as an Enum
-        CellUtil.setCellStyleProperty(c, CellUtil.BORDER_TOP, BorderStyle.MEDIUM_DASH_DOT);
-        assertEquals(BorderStyle.MEDIUM_DASH_DOT, c.getCellStyle().getBorderTopEnum());
-        
-        wb.close();
-    }
-
-    @Test
-    public void setCellStyleProperties() throws IOException {
-        System.out.println("setCellStyleProps start");
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet s = wb.createSheet();
-        Row r = s.createRow(0);
-        Cell c = r.createCell(0);
-
-        // Add multiple border properties to cell should create a single new style
-        int styCnt1 = wb.getNumCellStyles();
-        Map<String, Object> props = new HashMap<String, Object>();
-        props.put(CellUtil.BORDER_TOP, BorderStyle.THIN);
-        props.put(CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
-        props.put(CellUtil.BORDER_LEFT, BorderStyle.THIN);
-        props.put(CellUtil.BORDER_RIGHT, BorderStyle.THIN);
-        props.put(CellUtil.ALIGNMENT, HorizontalAlignment.CENTER.getCode()); // try it both with a Short (deprecated)
-        props.put(CellUtil.VERTICAL_ALIGNMENT, VerticalAlignment.CENTER); // and with an enum
-        CellUtil.setCellStyleProperties(c, props);
-        int styCnt2 = wb.getNumCellStyles();
-        assertEquals("Only one additional style should have been created", styCnt1 + 1, styCnt2);
-
-        // Add same border another to same cell, should not create another style
-        c = r.createCell(1);
-        CellUtil.setCellStyleProperties(c, props);
-        int styCnt3 = wb.getNumCellStyles();
-        System.out.println("setCellStyleProps nearing end");
-        assertEquals("No additional styles should have been created", styCnt2, styCnt3);
-
-        wb.close();
-        
-    }
-
-    @Test
-    public void getRow() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row1 = sh.createRow(0);
-        
-        // Get row that already exists
-        Row r1 = CellUtil.getRow(0, sh);
-        assertNotNull(r1);
-        assertSame("An existing row should not be recreated", row1, r1);
-
-        // Get row that does not exist yet
-        assertNotNull(CellUtil.getRow(1, sh));
-
-        wb.close();
-    }
-
-    @Test
-    public void getCell() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row = sh.createRow(0);
-        Cell A1 = row.createCell(0);
-
-        // Get cell that already exists
-        Cell a1 = CellUtil.getCell(row, 0);
-        assertNotNull(a1);
-        assertSame("An existing cell should not be recreated", A1, a1);
-
-        // Get cell that does not exist yet
-        assertNotNull(CellUtil.getCell(row, 1));
-
-        wb.close();
-    }
-
-    @Test
-    public void createCell() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row = sh.createRow(0);
-
-        CellStyle style = wb.createCellStyle();
-        style.setWrapText(true);
-
-        // calling createCell on a non-existing cell should create a cell and set the cell value and style.
-        Cell F1 = CellUtil.createCell(row, 5, "Cell Value", style);
-
-        assertSame(row.getCell(5), F1);
-        assertEquals("Cell Value", F1.getStringCellValue());
-        assertEquals(style, F1.getCellStyle());
-        // should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call.
-        // HSSFCellStyle wraps an underlying style record, and the underlying
-        // style record is the same between multiple getCellStyle() calls.
-
-        // calling createCell on an existing cell should return the existing cell and modify the cell value and style.
-        Cell f1 = CellUtil.createCell(row, 5, "Overwritten cell value", null);
-        assertSame(row.getCell(5), f1);
-        assertSame(F1, f1);
-        assertEquals("Overwritten cell value", f1.getStringCellValue());
-        assertEquals("Overwritten cell value", F1.getStringCellValue());
-        assertEquals("cell style should be unchanged with createCell(..., null)", style, f1.getCellStyle());
-        assertEquals("cell style should be unchanged with createCell(..., null)", style, F1.getCellStyle());
-
-        // test createCell(row, column, value) (no CellStyle)
-        f1 = CellUtil.createCell(row, 5, "Overwritten cell with default style");
-        assertSame(F1, f1);
-
-        wb.close();
-
-    }
-
-    /**
-     * @deprecated by {@link #setAlignmentEnum()}
-     *
-     * @throws IOException
-     * 
-     */
-    @Deprecated
-    @SuppressWarnings("deprecated")
-    @Test
-    public void setAlignment() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row = sh.createRow(0);
-        Cell A1 = row.createCell(0);
-        Cell B1 = row.createCell(1);
-
-        // Assumptions
-        assertEquals(A1.getCellStyle(), B1.getCellStyle());
-        // should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call. 
-        // HSSFCellStyle wraps an underlying style record, and the underlying
-        // style record is the same between multiple getCellStyle() calls.
-        assertEquals(CellStyle.ALIGN_GENERAL, A1.getCellStyle().getAlignment());
-        assertEquals(CellStyle.ALIGN_GENERAL, B1.getCellStyle().getAlignment());
-
-        // get/set alignment modifies the cell's style
-        CellUtil.setAlignment(A1, null, CellStyle.ALIGN_RIGHT);
-        assertEquals(CellStyle.ALIGN_RIGHT, A1.getCellStyle().getAlignment());
-
-        // get/set alignment doesn't affect the style of cells with
-        // the same style prior to modifying the style
-        assertNotEquals(A1.getCellStyle(), B1.getCellStyle());
-        assertEquals(CellStyle.ALIGN_GENERAL, B1.getCellStyle().getAlignment());
-
-        wb.close();
-    }
-    
-    @Test
-    public void setAlignmentEnum() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row = sh.createRow(0);
-        Cell A1 = row.createCell(0);
-        Cell B1 = row.createCell(1);
-
-        // Assumptions
-        assertEquals(A1.getCellStyle(), B1.getCellStyle());
-        // should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call. 
-        // HSSFCellStyle wraps an underlying style record, and the underlying
-        // style record is the same between multiple getCellStyle() calls.
-        assertEquals(HorizontalAlignment.GENERAL, A1.getCellStyle().getAlignmentEnum());
-        assertEquals(HorizontalAlignment.GENERAL, B1.getCellStyle().getAlignmentEnum());
-
-        // get/set alignment modifies the cell's style
-        CellUtil.setAlignment(A1, HorizontalAlignment.RIGHT);
-        assertEquals(HorizontalAlignment.RIGHT, A1.getCellStyle().getAlignmentEnum());
-
-        // get/set alignment doesn't affect the style of cells with
-        // the same style prior to modifying the style
-        assertNotEquals(A1.getCellStyle(), B1.getCellStyle());
-        assertEquals(HorizontalAlignment.GENERAL, B1.getCellStyle().getAlignmentEnum());
-
-        wb.close();
-    }
-    
-    @Test
-    public void setVerticalAlignmentEnum() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row = sh.createRow(0);
-        Cell A1 = row.createCell(0);
-        Cell B1 = row.createCell(1);
-
-        // Assumptions
-        assertEquals(A1.getCellStyle(), B1.getCellStyle());
-        // should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call. 
-        // HSSFCellStyle wraps an underlying style record, and the underlying
-        // style record is the same between multiple getCellStyle() calls.
-        assertEquals(VerticalAlignment.BOTTOM, A1.getCellStyle().getVerticalAlignmentEnum());
-        assertEquals(VerticalAlignment.BOTTOM, B1.getCellStyle().getVerticalAlignmentEnum());
-
-        // get/set alignment modifies the cell's style
-        CellUtil.setVerticalAlignment(A1, VerticalAlignment.TOP);
-        assertEquals(VerticalAlignment.TOP, A1.getCellStyle().getVerticalAlignmentEnum());
-
-        // get/set alignment doesn't affect the style of cells with
-        // the same style prior to modifying the style
-        assertNotEquals(A1.getCellStyle(), B1.getCellStyle());
-        assertEquals(VerticalAlignment.BOTTOM, B1.getCellStyle().getVerticalAlignmentEnum());
-
-        wb.close();
-    }
-
-    @Test
-    public void setFont() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        Sheet sh = wb.createSheet();
-        Row row = sh.createRow(0);
-        Cell A1 = row.createCell(0);
-        Cell B1 = row.createCell(1);
-        final short defaultFontIndex = 0;
-        Font font = wb.createFont();
-        font.setItalic(true);
-        final short customFontIndex = font.getIndex();
-
-        // Assumptions
-        assertNotEquals(defaultFontIndex, customFontIndex);
-        assertEquals(A1.getCellStyle(), B1.getCellStyle());
-        // should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call. 
-        // HSSFCellStyle wraps an underlying style record, and the underlying
-        // style record is the same between multiple getCellStyle() calls.
-        assertEquals(defaultFontIndex, A1.getCellStyle().getFontIndex());
-        assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndex());
-
-        // get/set alignment modifies the cell's style
-        CellUtil.setFont(A1, font);
-        assertEquals(customFontIndex, A1.getCellStyle().getFontIndex());
-
-        // get/set alignment doesn't affect the style of cells with
-        // the same style prior to modifying the style
-        assertNotEquals(A1.getCellStyle(), B1.getCellStyle());
-        assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndex());
-
-        wb.close();
-    }
-
-    @Test
-    public void setFontFromDifferentWorkbook() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Workbook wb2 = _testDataProvider.createWorkbook();
-        Font font1 = wb1.createFont();
-        Font font2 = wb2.createFont();
-        // do something to make font1 and font2 different
-        // so they are not same or equal.
-        font1.setItalic(true);
-        Cell A1 = wb1.createSheet().createRow(0).createCell(0);
-        
-        // okay
-        CellUtil.setFont(A1, font1);
-
-        // font belongs to different workbook
-        try {
-            CellUtil.setFont(A1, font2);
-            fail("setFont not allowed if font belongs to a different workbook");
-        } catch (final IllegalArgumentException e) {
-            // one specific message is expected
-            if (!e.getMessage().startsWith("Font does not belong to this workbook")) {
-                throw e;
-            }
-        } finally {
-            wb1.close();
-            wb2.close();
-        }
-    }
-    
-    /**
-     * bug 55555
-     * @deprecated Replaced by {@link #setFillForegroundColorBeforeFillBackgroundColorEnum()}
-     * @since POI 3.15 beta 3
-     */
-    @Deprecated
-    // bug 55555
-    @Test
-    public void setFillForegroundColorBeforeFillBackgroundColor() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Cell A1 = wb1.createSheet().createRow(0).createCell(0);
-        Map<String, Object> properties = new HashMap<String, Object>();
-        // FIXME: Use FillPatternType.BRICKS enum
-        properties.put(CellUtil.FILL_PATTERN, CellStyle.BRICKS);
-        properties.put(CellUtil.FILL_FOREGROUND_COLOR, IndexedColors.BLUE.index);
-        properties.put(CellUtil.FILL_BACKGROUND_COLOR, IndexedColors.RED.index);
-        
-        CellUtil.setCellStyleProperties(A1, properties);
-        CellStyle style = A1.getCellStyle();
-        // FIXME: Use FillPatternType.BRICKS enum
-        assertEquals("fill pattern", CellStyle.BRICKS, style.getFillPattern());
-        assertEquals("fill foreground color", IndexedColors.BLUE, IndexedColors.fromInt(style.getFillForegroundColor()));
-        assertEquals("fill background color", IndexedColors.RED, IndexedColors.fromInt(style.getFillBackgroundColor()));
-        wb1.close();
-    }
-    /**
-     * bug 55555
-     * @since POI 3.15 beta 3
-     */
-    @Test
-    public void setFillForegroundColorBeforeFillBackgroundColorEnum() throws IOException {
-        Workbook wb1 = _testDataProvider.createWorkbook();
-        Cell A1 = wb1.createSheet().createRow(0).createCell(0);
-        Map<String, Object> properties = new HashMap<String, Object>();
-        // FIXME: Use FillPatternType.BRICKS enum
-        properties.put(CellUtil.FILL_PATTERN, FillPatternType.BRICKS);
-        properties.put(CellUtil.FILL_FOREGROUND_COLOR, IndexedColors.BLUE.index);
-        properties.put(CellUtil.FILL_BACKGROUND_COLOR, IndexedColors.RED.index);
-        
-        CellUtil.setCellStyleProperties(A1, properties);
-        CellStyle style = A1.getCellStyle();
-        // FIXME: Use FillPatternType.BRICKS enum
-        assertEquals("fill pattern", FillPatternType.BRICKS, style.getFillPatternEnum());
-        assertEquals("fill foreground color", IndexedColors.BLUE, IndexedColors.fromInt(style.getFillForegroundColor()));
-        assertEquals("fill background color", IndexedColors.RED, IndexedColors.fromInt(style.getFillBackgroundColor()));
-
-        wb1.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java b/trunk/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
deleted file mode 100644
index 01bca57..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.NumberComparisonExamples.ComparisonExample;
-import org.apache.poi.util.HexDump;
-
-/**
- * Creates a spreadsheet that checks Excel's comparison of various IEEE double values.
- * The class {@link NumberComparisonExamples} contains specific comparison examples
- * (along with their expected results) that get encoded into rows of the spreadsheet.
- * Each example is checked with a formula (in column I) that displays either "OK" or
- * "ERROR" depending on whether actual results match those expected.
- *
- * @author Josh Micich
- */
-public class NumberComparingSpreadsheetGenerator {
-
-	private static final class SheetWriter {
-
-		private final HSSFSheet _sheet;
-		private int _rowIndex;
-
-		public SheetWriter(HSSFWorkbook wb) {
-			HSSFSheet sheet = wb.createSheet("Sheet1");
-
-			writeHeaderRow(wb, sheet);
-			_sheet = sheet;
-			_rowIndex = 1;
-		}
-
-		public void addTestRow(double a, double b, int expResult) {
-			writeDataRow(_sheet, _rowIndex++, a, b, expResult);
-		}
-	}
-
-	private static void writeHeaderCell(HSSFRow row, int i, String text, HSSFCellStyle style) {
-		HSSFCell cell = row.createCell(i);
-		cell.setCellValue(new HSSFRichTextString(text));
-		cell.setCellStyle(style);
-	}
-	static void writeHeaderRow(HSSFWorkbook wb, HSSFSheet sheet) {
-		sheet.setColumnWidth(0, 6000);
-		sheet.setColumnWidth(1, 6000);
-		sheet.setColumnWidth(2, 3600);
-		sheet.setColumnWidth(3, 3600);
-		sheet.setColumnWidth(4, 2400);
-		sheet.setColumnWidth(5, 2400);
-		sheet.setColumnWidth(6, 2400);
-		sheet.setColumnWidth(7, 2400);
-		sheet.setColumnWidth(8, 2400);
-		HSSFRow row = sheet.createRow(0);
-		HSSFCellStyle style = wb.createCellStyle();
-		HSSFFont font = wb.createFont();
-		font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-		style.setFont(font);
-		writeHeaderCell(row, 0, "Raw Long Bits A", style);
-		writeHeaderCell(row, 1, "Raw Long Bits B", style);
-		writeHeaderCell(row, 2, "Value A", style);
-		writeHeaderCell(row, 3, "Value B", style);
-		writeHeaderCell(row, 4, "Exp Cmp", style);
-		writeHeaderCell(row, 5, "LT", style);
-		writeHeaderCell(row, 6, "EQ", style);
-		writeHeaderCell(row, 7, "GT", style);
-		writeHeaderCell(row, 8, "Check", style);
-	}
-	/**
-	 * Fills a spreadsheet row with one comparison example. The two numeric values are written to
-	 * columns C and D. Columns (F, G and H) respectively get formulas ("v0<v1", "v0=v1", "v0>v1"),
-	 * which will be evaluated by Excel. Column D gets the expected comparison result. Column I
-	 * gets a formula to check that Excel's comparison results match that predicted in column D.
-	 *
-	 * @param v0 the first value to be compared
-	 * @param v1 the second value to be compared
-	 * @param expRes expected comparison result (-1, 0, or +1)
-	 */
-	static void writeDataRow(HSSFSheet sheet, int rowIx, double v0, double v1, int expRes) {
-		HSSFRow row = sheet.createRow(rowIx);
-
-		int rowNum = rowIx + 1;
-
-
-		row.createCell(0).setCellValue(formatDoubleAsHex(v0));
-		row.createCell(1).setCellValue(formatDoubleAsHex(v1));
-		row.createCell(2).setCellValue(v0);
-		row.createCell(3).setCellValue(v1);
-		row.createCell(4).setCellValue(expRes < 0 ? "LT" : expRes > 0 ? "GT" : "EQ");
-		row.createCell(5).setCellFormula("C" + rowNum + "<" + "D" + rowNum);
-		row.createCell(6).setCellFormula("C" + rowNum + "=" + "D" + rowNum);
-		row.createCell(7).setCellFormula("C" + rowNum + ">" + "D" + rowNum);
-		// TODO - bug elsewhere in POI - something wrong with encoding of NOT() function
-		String frm = "if(or(" +
-			"and(E#='LT', F#      , G#=FALSE, H#=FALSE)," +
-			"and(E#='EQ', F#=FALSE, G#      , H#=FALSE)," +
-			"and(E#='GT', F#=FALSE, G#=FALSE, H#      )" +
-			"), 'OK', 'error')"	;
-		row.createCell(8).setCellFormula(frm.replaceAll("#", String.valueOf(rowNum)).replace('\'', '"'));
-	}
-
-	private static String formatDoubleAsHex(double d) {
-		long l = Double.doubleToLongBits(d);
-		return HexDump.longToHex(l)+'L';
-	}
-
-	public static void main(String[] args) {
-
-		HSSFWorkbook wb = new HSSFWorkbook();
-		SheetWriter sw = new SheetWriter(wb);
-		ComparisonExample[] ces = NumberComparisonExamples.getComparisonExamples();
-		for (ComparisonExample ce : ces) {
-			sw.addTestRow(ce.getA(), ce.getB(), ce.getExpectedResult());
-		}
-
-
-		File outputFile = new File("ExcelNumberCompare.xls");
-
-		try {
-			FileOutputStream os = new FileOutputStream(outputFile);
-			wb.write(os);
-			os.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		System.out.println("Finished writing '" + outputFile.getAbsolutePath() + "'");
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java b/trunk/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java
deleted file mode 100644
index 265e40d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Contains specific examples of <tt>double</tt> value pairs and their comparison result according to Excel.
- *
- * @author Josh Micich
- */
-final class NumberComparisonExamples {
-
-	private NumberComparisonExamples() {
-		// no instances of this class
-	}
-
-	/**
-	 * represents one comparison test case
-	 */
-	public static final class ComparisonExample {
-		private final long _rawBitsA;
-		private final long _rawBitsB;
-		private final int _expectedResult;
-
-		public ComparisonExample(long rawBitsA, long rawBitsB, int expectedResult) {
-			_rawBitsA = rawBitsA;
-			_rawBitsB = rawBitsB;
-			_expectedResult = expectedResult;
-		}
-
-		public double getA() {
-			return Double.longBitsToDouble(_rawBitsA);
-		}
-		public double getB() {
-			return Double.longBitsToDouble(_rawBitsB);
-		}
-		public double getNegA() {
-			return -Double.longBitsToDouble(_rawBitsA);
-		}
-		public double getNegB() {
-			return -Double.longBitsToDouble(_rawBitsB);
-		}
-		public int getExpectedResult() {
-			return _expectedResult;
-		}
-	}
-
-	private static final ComparisonExample[] examples = initExamples();
-
-	private static ComparisonExample[] initExamples() {
-
-		List<ComparisonExample> temp = new ArrayList<ComparisonExample>();
-
-		addStepTransition(temp, 0x4010000000000005L);
-		addStepTransition(temp, 0x4010000000000010L);
-		addStepTransition(temp, 0x401000000000001CL);
-
-		addStepTransition(temp, 0x403CE0FFFFFFFFF1L);
-
-		addStepTransition(temp, 0x5010000000000006L);
-		addStepTransition(temp, 0x5010000000000010L);
-		addStepTransition(temp, 0x501000000000001AL);
-
-		addStepTransition(temp, 0x544CE6345CF32018L);
-		addStepTransition(temp, 0x544CE6345CF3205AL);
-		addStepTransition(temp, 0x544CE6345CF3209CL);
-		addStepTransition(temp, 0x544CE6345CF320DEL);
-
-		addStepTransition(temp, 0x54B250001000101DL);
-		addStepTransition(temp, 0x54B2500010001050L);
-		addStepTransition(temp, 0x54B2500010001083L);
-
-		addStepTransition(temp, 0x6230100010001000L);
-		addStepTransition(temp, 0x6230100010001005L);
-		addStepTransition(temp, 0x623010001000100AL);
-
-		addStepTransition(temp, 0x7F50300020001011L);
-		addStepTransition(temp, 0x7F5030002000102BL);
-		addStepTransition(temp, 0x7F50300020001044L);
-
-
-		addStepTransition(temp, 0x2B2BFFFF1000102AL);
-		addStepTransition(temp, 0x2B2BFFFF10001079L);
-		addStepTransition(temp, 0x2B2BFFFF100010C8L);
-
-		addStepTransition(temp, 0x2B2BFF001000102DL);
-		addStepTransition(temp, 0x2B2BFF0010001035L);
-		addStepTransition(temp, 0x2B2BFF001000103DL);
-
-		addStepTransition(temp, 0x2B61800040002024L);
-		addStepTransition(temp, 0x2B61800040002055L);
-		addStepTransition(temp, 0x2B61800040002086L);
-
-
-		addStepTransition(temp, 0x008000000000000BL);
-		// just outside 'subnormal' range
-		addStepTransition(temp, 0x0010000000000007L);
-		addStepTransition(temp, 0x001000000000001BL);
-		addStepTransition(temp, 0x001000000000002FL);
-
-		for(ComparisonExample ce : new ComparisonExample[] {
-				// negative, and exponents differ by more than 1
-				ce(0xBF30000000000000L, 0xBE60000000000000L, -1),
-
-				// negative zero *is* less than positive zero, but not easy to get out of calculations
-				ce(0x0000000000000000L, 0x8000000000000000L, +1),
-				// subnormal numbers compare without rounding for some reason
-				ce(0x0000000000000000L, 0x0000000000000001L, -1),
-				ce(0x0008000000000000L, 0x0008000000000001L, -1),
-				ce(0x000FFFFFFFFFFFFFL, 0x000FFFFFFFFFFFFEL, +1),
-				ce(0x000FFFFFFFFFFFFBL, 0x000FFFFFFFFFFFFCL, -1),
-				ce(0x000FFFFFFFFFFFFBL, 0x000FFFFFFFFFFFFEL, -1),
-
-				// across subnormal threshold (some mistakes when close)
-				ce(0x000FFFFFFFFFFFFFL, 0x0010000000000000L, +1),
-				ce(0x000FFFFFFFFFFFFBL, 0x0010000000000007L, +1),
-				ce(0x000FFFFFFFFFFFFAL, 0x0010000000000007L, 0),
-
-				// when a bit further apart - normal results
-				ce(0x000FFFFFFFFFFFF9L, 0x0010000000000007L, -1),
-				ce(0x000FFFFFFFFFFFFAL, 0x0010000000000008L, -1),
-				ce(0x000FFFFFFFFFFFFBL, 0x0010000000000008L, -1),
-		}) {
-			temp.add(ce);
-		}
-
-		ComparisonExample[] result = new ComparisonExample[temp.size()];
-		temp.toArray(result);
-		return result;
-	}
-
-	private static ComparisonExample ce(long rawBitsA, long rawBitsB, int expectedResult) {
-		return new ComparisonExample(rawBitsA, rawBitsB, expectedResult);
-	}
-
-	private static void addStepTransition(List<ComparisonExample> temp, long rawBits) {
-		for(ComparisonExample ce : new ComparisonExample[] {
-				ce(rawBits-1, rawBits+0, 0),
-				ce(rawBits+0, rawBits+1, -1),
-				ce(rawBits+1, rawBits+2, 0),
-		}) {
-			temp.add(ce);
-		}
-
-	}
-
-	public static ComparisonExample[] getComparisonExamples() {
-		return examples.clone();
-	}
-
-	public static ComparisonExample[] getComparisonExamples2() {
-		ComparisonExample[] result = examples.clone();
-
-		for (int i = 0; i < result.length; i++) {
-			int ha = ("a"+i).hashCode();
-			double a = ha * Math.pow(0.75, ha % 100);
-			int hb = ("b"+i).hashCode();
-			double b = hb * Math.pow(0.75, hb % 100);
-
-			result[i] = new ComparisonExample(Double.doubleToLongBits(a), Double.doubleToLongBits(b), Double.compare(a, b));
-		}
-
-		return result;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java b/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
deleted file mode 100644
index 0961134..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.NumberToTextConversionExamples.ExampleConversion;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.HexRead;
-
-/**
- * Creates a spreadsheet that demonstrates Excel's rendering of various IEEE double values.
- * 
- * @author Josh Micich
- */
-public class NumberRenderingSpreadsheetGenerator {
-
-	private static final class SheetWriter {
-
-		private final HSSFSheet _sheet;
-		private int _rowIndex;
-		private final List<Long> _replacementNaNs;
-
-		public SheetWriter(HSSFWorkbook wb) {
-			HSSFSheet sheet = wb.createSheet("Sheet1");
-
-			writeHeaderRow(wb, sheet);
-			_sheet = sheet;
-			_rowIndex = 1;
-			_replacementNaNs = new ArrayList<Long>();
-		}
-
-		public void addTestRow(long rawBits, String expectedExcelRendering) {
-			writeDataRow(_sheet, _rowIndex++, rawBits, expectedExcelRendering);
-			if(Double.isNaN(Double.longBitsToDouble(rawBits))) {
-				_replacementNaNs.add(Long.valueOf(rawBits));
-			}
-		}
-
-		public long[] getReplacementNaNs() {
-			int nRepls = _replacementNaNs.size();
-			long[] result = new long[nRepls];
-			for (int i = 0; i < nRepls; i++) {
-				result[i] = _replacementNaNs.get(i).longValue();
-			}
-			return result;
-		}
-
-	}
-	/** 0x7ff8000000000000 encoded in little endian order */
-	private static final byte[] JAVA_NAN_BYTES = HexRead.readFromString("00 00 00 00 00 00 F8 7F");
-	
-	private static void writeHeaderCell(HSSFRow row, int i, String text, HSSFCellStyle style) {
-		HSSFCell cell = row.createCell(i);
-		cell.setCellValue(new HSSFRichTextString(text));
-		cell.setCellStyle(style);
-	}
-	static void writeHeaderRow(HSSFWorkbook wb, HSSFSheet sheet) {
-		sheet.setColumnWidth(0, 3000);
-		sheet.setColumnWidth(1, 6000);
-		sheet.setColumnWidth(2, 6000);
-		sheet.setColumnWidth(3, 6000);
-		sheet.setColumnWidth(4, 6000);
-		sheet.setColumnWidth(5, 1600);
-		sheet.setColumnWidth(6, 20000);
-		HSSFRow row = sheet.createRow(0);
-		HSSFCellStyle style = wb.createCellStyle();
-		HSSFFont font = wb.createFont();
-		font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-		style.setFont(font);
-		writeHeaderCell(row, 0, "Value", style);
-		writeHeaderCell(row, 1, "Raw Long Bits", style);
-		writeHeaderCell(row, 2, "JDK Double Rendering", style);
-		writeHeaderCell(row, 3, "Actual Rendering", style);
-		writeHeaderCell(row, 4, "Expected Rendering", style);
-		writeHeaderCell(row, 5, "Match", style);  
-		writeHeaderCell(row, 6, "Java Metadata", style);
-	}
-	static void writeDataRow(HSSFSheet sheet, int rowIx, long rawLongBits, String expectedExcelRendering) {
-		double d = Double.longBitsToDouble(rawLongBits);
-		HSSFRow row = sheet.createRow(rowIx);
-		
-		int rowNum = rowIx + 1;
-		String cel0ref = "A" + rowNum;
-		String rawBitsText = formatLongAsHex(rawLongBits);
-		String jmExpr = "'ec(" + rawBitsText + ", ''\" & C" + rowNum + " & \"'', ''\" & D" + rowNum + " & \"''),'";
-		
-		// The 'Match' column will contain 'OK' if the metadata (from NumberToTextConversionExamples)
-		// matches Excel's rendering.
-		String matchExpr = "if(D" + rowNum + "=E" + rowNum + ", \"OK\", \"ERROR\")";
-		
-		row.createCell(0).setCellValue(d);
-		row.createCell(1).setCellValue(new HSSFRichTextString(rawBitsText));
-		row.createCell(2).setCellValue(new HSSFRichTextString(Double.toString(d)));
-		row.createCell(3).setCellFormula("\"\" & " + cel0ref);
-		row.createCell(4).setCellValue(new HSSFRichTextString(expectedExcelRendering));
-		row.createCell(5).setCellFormula(matchExpr);
-		row.createCell(6).setCellFormula(jmExpr.replaceAll("'", "\""));
-
-//		if (false) {
-//			// for observing arithmetic near numeric range boundaries
-//			row.createCell(7).setCellFormula(cel0ref + " * 1.0001");
-//			row.createCell(8).setCellFormula(cel0ref + " / 1.0001");
-//		}
-	}
-	
-	private static String formatLongAsHex(long l) {
-		StringBuilder sb = new StringBuilder(20);
-		sb.append(HexDump.longToHex(l)).append('L');
-		return sb.toString();
-	}
-
-	public static void main(String[] args) {
-		writeJavaDoc();
-		
-		HSSFWorkbook wb = new HSSFWorkbook();
-		SheetWriter sw = new SheetWriter(wb);
-		
-		ExampleConversion[] exampleValues = NumberToTextConversionExamples.getExampleConversions();
-		for (ExampleConversion example : exampleValues) {
-			sw.addTestRow(example.getRawDoubleBits(), example.getExcelRendering());
-		}
-		
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		try {
-			wb.write(baos);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		byte[] fileContent = baos.toByteArray();
-		replaceNaNs(fileContent, sw.getReplacementNaNs());
-		
-		
-		File outputFile = new File("ExcelNumberRendering.xls");
-		
-		try {
-			FileOutputStream os = new FileOutputStream(outputFile);
-			os.write(fileContent);
-			os.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		System.out.println("Finished writing '" + outputFile.getAbsolutePath() + "'");
-	}
-
-	public static void writeJavaDoc() {
-		
-		ExampleConversion[] exampleConversions = NumberToTextConversionExamples.getExampleConversions();
-		for (ExampleConversion ec : exampleConversions) {
-			String line = 	" * <tr><td>" 
-				+ formatLongAsHex(ec.getRawDoubleBits())
-				+ "</td><td>" + Double.toString(ec.getDoubleValue()) 
-				+ "</td><td>" + ec.getExcelRendering() + "</td></tr>";
-			
-			System.out.println(line);
-		}
-	}
-
-	
-	
-	private static void replaceNaNs(byte[] fileContent, long[] replacementNaNs) {
-		int countFound = 0;
-		for(int i=0; i<fileContent.length; i++) {
-			if(isNaNBytes(fileContent, i)) {
-				writeLong(fileContent, i, replacementNaNs[countFound]);
-				countFound++;
-			}
-		}
-		if (countFound < replacementNaNs.length) {
-			throw new RuntimeException("wrong repl count");
-		}
-		
-	}
-
-	private static void writeLong(byte[] bb, int i, long val) {
-		/*String oldVal =*/ interpretLong(bb, i);
-		bb[i+7] = (byte) (val >> 56);
-		bb[i+6] = (byte) (val >> 48);
-		bb[i+5] = (byte) (val >> 40);
-		bb[i+4] = (byte) (val >> 32);
-		bb[i+3] = (byte) (val >> 24);
-		bb[i+2] = (byte) (val >> 16);
-		bb[i+1] = (byte) (val >>  8);
-		bb[i+0] = (byte) (val >>  0);
-//		if (false) {
-//			String newVal = interpretLong(bb, i);
-//			System.out.println("changed offset " + i + " from " + oldVal + " to " + newVal);
-//		}
-		
-	}
-
-	private static String interpretLong(byte[] fileContent, int offset) {
-		InputStream is = new ByteArrayInputStream(fileContent, offset, 8);
-		long l;
-		try {
-			l = new DataInputStream(is).readLong();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		return "0x" + Long.toHexString(l).toUpperCase(Locale.ROOT);
-	}
-
-	private static boolean isNaNBytes(byte[] fileContent, int offset) {
-		if(offset + JAVA_NAN_BYTES.length > fileContent.length) {
-			return false;
-		}
-		// excel NaN bits: 0xFFFF0420003C0000L
-		// java NaN bits :0x7ff8000000000000L
-		return areArraySectionsEqual(fileContent, offset, JAVA_NAN_BYTES);
-	}
-	private static boolean areArraySectionsEqual(byte[] bb, int off, byte[] section) {
-		for (int i=section.length-1; i>=0; i--) {
-			if (bb[off+i] != section[i]){
-				return false;
-			}
-		}
-		return true;
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java b/trunk/src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java
deleted file mode 100644
index 1dcedc9..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.Locale;
-
-/**
- * Contains specific examples of <tt>double</tt> values and their rendering in Excel.
- */
-final class NumberToTextConversionExamples {
-
-	private NumberToTextConversionExamples() {
-		// no instances of this class
-	}
-
-	public static final class ExampleConversion {
-		private final String _javaRendering;
-		private final String _excelRendering;
-		private final double _doubleValue;
-		private final long _rawDoubleBits;
-
-		ExampleConversion(long rawDoubleBits, String javaRendering, String excelRendering) {
-			double d = Double.longBitsToDouble(rawDoubleBits);
-			if ("NaN".equals(javaRendering)) {
-				if (!Double.isNaN(d)) {
-					throw new IllegalArgumentException("value must be NaN");
-				}
-			} else {
-				if (Double.isNaN(d)) {
-					throw new IllegalArgumentException("value must not be NaN");
-				}
-				// just to be dead sure test conversion in java both ways
-				boolean javaToStringOk = javaRendering.equals(Double.toString(d));
-				boolean javaParseOk = Double.parseDouble(javaRendering) == d;
-				if(!javaToStringOk || !javaParseOk) {
-					String msgA = "Specified rawDoubleBits " + doubleToHexString(d) + " encodes to double '" + d + "'.";
-					String msgB = "Specified javaRendering '" + javaRendering+ "' parses as double with rawDoubleBits "
-						+ doubleToHexString(Double.parseDouble(javaRendering));
-					System.err.println(msgA);
-					System.err.println(msgB);
-
-					throw new RuntimeException(msgA + msgB);
-				}
-			}
-			_rawDoubleBits = rawDoubleBits;
-			_javaRendering = javaRendering;
-			_excelRendering = excelRendering;
-			_doubleValue = d;
-		}
-		private static String doubleToHexString(double d) {
-			return "0x" + Long.toHexString(Double.doubleToLongBits(d)).toUpperCase(Locale.ROOT) + "L";
-		}
-		public String getJavaRendering() {
-			return _javaRendering;
-		}
-		public String getExcelRendering() {
-			return _excelRendering;
-		}
-		public double getDoubleValue() {
-			return _doubleValue;
-		}
-		public boolean isNaN() {
-			return Double.isNaN(_doubleValue);
-		}
-		public long getRawDoubleBits() {
-			return _rawDoubleBits;
-		}
-	}
-
-
-	/**
-	 * Number rendering examples as observed from Excel.
-	 * TODO - some are currently disabled because POI does not pass these cases yet
-	 */
-	private static final ExampleConversion[] examples = {
-
-		// basic numbers
-		ec(0x0000000000000000L, "0.0", "0"),
-		ec(0x3FF0000000000000L, "1.0", "1"),
-		ec(0x3FF00068DB8BAC71L, "1.0001", "1.0001"),
-		ec(0x4087A00000000000L, "756.0", "756"),
-		ec(0x401E3D70A3D70A3DL, "7.56", "7.56"),
-
-		ec(0x405EDD3C07FB4C8CL, "123.4567890123455",  "123.456789012345"),
-		ec(0x405EDD3C07FB4C99L, "123.45678901234568", "123.456789012346"),
-		ec(0x405EDD3C07FB4CAEL, "123.45678901234598", "123.456789012346"),
-		ec(0x4132D687E3DF2180L, "1234567.8901234567", "1234567.89012346"),
-
-		ec(0x3F543A272D9E0E49L, "0.001234567890123455",  "0.00123456789012345"),
-		ec(0x3F543A272D9E0E4AL, "0.0012345678901234552", "0.00123456789012346"),
-		ec(0x3F543A272D9E0E55L, "0.0012345678901234576", "0.00123456789012346"),
-		ec(0x3F543A272D9E0E72L, "0.0012345678901234639", "0.00123456789012346"),
-		ec(0x3F543A272D9E0E76L, "0.0012345678901234647", "0.00123456789012346"),
-		ec(0x3F543A272D9E0E77L, "0.001234567890123465",  "0.00123456789012346"),
-
-		ec(0x3F543A272D9E0E78L, "0.0012345678901234652", "0.00123456789012347"),
-
-		ec(0x3F543A272D9E0EA5L, "0.001234567890123475",  "0.00123456789012347"),
-		ec(0x3F543A272D9E0EA6L, "0.0012345678901234751", "0.00123456789012348"),
-
-
-		ec(0x544CE6345CF3209CL, "1.2345678901234549E98",  "1.23456789012345E+98"),
-		ec(0x544CE6345CF3209DL, "1.234567890123455E98",   "1.23456789012346E+98"),
-		ec(0x544CE6345CF320DEL, "1.2345678901234649E98",  "1.23456789012346E+98"),
-		ec(0x544CE6345CF320DFL, "1.234567890123465E98",  "1.23456789012347E+98"),
-		ec(0x544CE6345CF32120L, "1.234567890123475E98",   "1.23456789012347E+98"),
-		ec(0x544CE6345CF32121L, "1.2345678901234751E98",  "1.23456789012348E+98"),
-
-
-		ec(0x54820FE0BA17F5E9L, "1.23456789012355E99",    "1.2345678901236E+99"),
-		ec(0x54820FE0BA17F5EAL, "1.2345678901235502E99",  "1.2345678901236E+99"),
-		ec(0x54820FE0BA17F784L, "1.2345678901236498E99",  "1.2345678901237E+99"),
-		ec(0x54820FE0BA17F785L, "1.23456789012365E99",    "1.2345678901237E+99"),
-		ec(0x54820FE0BA17F920L, "1.2345678901237498E99",  "1.2345678901238E+99"),
-		ec(0x54820FE0BA17F921L, "1.23456789012375E99",    "1.2345678901238E+99"),
-
-
-		// transitions around the E98,E99,E100 boundaries
-		ec(0x547D42AEA2879F19L,"9.999999999999974E98",  "9.99999999999997E+98"),
-		ec(0x547D42AEA2879F1AL,"9.999999999999975E98",  "9.99999999999998E+98"),
-		ec(0x547D42AEA2879F21L,"9.999999999999984E98",  "9.99999999999998E+98"),
-		ec(0x547D42AEA2879F22L,"9.999999999999985E98",  "9.99999999999999E+98"),
-		ec(0x547D42AEA2879F2AL,"9.999999999999995E98",  "9.99999999999999E+98"),
-		ec(0x547D42AEA2879F2BL,"9.999999999999996E98",  "1E+99"),
-		ec(0x547D42AEA287A0A0L,"1.0000000000000449E99", "1E+99"),
-		ec(0x547D42AEA287A0A1L,"1.000000000000045E99",  "1.0000000000001E+99"),
-		ec(0x547D42AEA287A3D8L,"1.0000000000001449E99", "1.0000000000001E+99"),
-		ec(0x547D42AEA287A3D9L,"1.000000000000145E99",  "1.0000000000002E+99"),
-		ec(0x547D42AEA287A710L,"1.000000000000245E99",  "1.0000000000002E+99"),
-		ec(0x547D42AEA287A711L,"1.0000000000002451E99", "1.0000000000003E+99"),
-
-
-		ec(0x54B249AD2594C2F9L,"9.999999999999744E99",  "9.9999999999997E+99"),
-		ec(0x54B249AD2594C2FAL,"9.999999999999746E99",  "9.9999999999998E+99"),
-		ec(0x54B249AD2594C32DL,"9.999999999999845E99",  "9.9999999999998E+99"),
-		ec(0x54B249AD2594C32EL,"9.999999999999847E99",  "9.9999999999999E+99"),
-		ec(0x54B249AD2594C360L,"9.999999999999944E99",  "9.9999999999999E+99"),
-		ec(0x54B249AD2594C361L,"9.999999999999946E99",  "1E+100"),
-		ec(0x54B249AD2594C464L,"1.0000000000000449E100","1E+100"),
-		ec(0x54B249AD2594C465L,"1.000000000000045E100", "1.0000000000001E+100"),
-		ec(0x54B249AD2594C667L,"1.000000000000145E100", "1.0000000000001E+100"),
-		ec(0x54B249AD2594C668L,"1.0000000000001451E100","1.0000000000002E+100"),
-		ec(0x54B249AD2594C86AL,"1.000000000000245E100", "1.0000000000002E+100"),
-		ec(0x54B249AD2594C86BL,"1.0000000000002452E100","1.0000000000003E+100"),
-
-
-		ec(0x2B95DF5CA28EF4A8L,"1.0000000000000251E-98","1.00000000000003E-98"),
-		ec(0x2B95DF5CA28EF4A7L,"1.000000000000025E-98", "1.00000000000002E-98"),
-		ec(0x2B95DF5CA28EF46AL,"1.000000000000015E-98", "1.00000000000002E-98"),
-		ec(0x2B95DF5CA28EF469L,"1.0000000000000149E-98","1.00000000000001E-98"),
-		ec(0x2B95DF5CA28EF42DL,"1.0000000000000051E-98","1.00000000000001E-98"),
-		ec(0x2B95DF5CA28EF42CL,"1.000000000000005E-98", "1E-98"),
-		ec(0x2B95DF5CA28EF3ECL,"9.999999999999946E-99", "1E-98"),
-		ec(0x2B95DF5CA28EF3EBL,"9.999999999999944E-99", "9.9999999999999E-99"),
-		ec(0x2B95DF5CA28EF3AEL,"9.999999999999845E-99", "9.9999999999999E-99"),
-		ec(0x2B95DF5CA28EF3ADL,"9.999999999999843E-99", "9.9999999999998E-99"),
-		ec(0x2B95DF5CA28EF371L,"9.999999999999746E-99", "9.9999999999998E-99"),
-		ec(0x2B95DF5CA28EF370L,"9.999999999999744E-99", "9.9999999999997E-99"),
-
-
-		ec(0x2B617F7D4ED8C7F5L,"1.000000000000245E-99", "1.0000000000003E-99"),
-		ec(0x2B617F7D4ED8C7F4L,"1.0000000000002449E-99","1.0000000000002E-99"),
-		ec(0x2B617F7D4ED8C609L,"1.0000000000001452E-99","1.0000000000002E-99"),
-		ec(0x2B617F7D4ED8C608L,"1.000000000000145E-99", "1.0000000000001E-99"),
-		ec(0x2B617F7D4ED8C41CL,"1.000000000000045E-99", "1.0000000000001E-99"),
-		ec(0x2B617F7D4ED8C41BL,"1.0000000000000449E-99","1E-99"),
-		ec(0x2B617F7D4ED8C323L,"9.999999999999945E-100","1E-99"),
-		ec(0x2B617F7D4ED8C322L,"9.999999999999943E-100","9.9999999999999E-100"),
-		ec(0x2B617F7D4ED8C2F2L,"9.999999999999846E-100","9.9999999999999E-100"),
-		ec(0x2B617F7D4ED8C2F1L,"9.999999999999844E-100","9.9999999999998E-100"),
-		ec(0x2B617F7D4ED8C2C1L,"9.999999999999746E-100","9.9999999999998E-100"),
-		ec(0x2B617F7D4ED8C2C0L,"9.999999999999744E-100","9.9999999999997E-100"),
-
-
-
-		// small numbers
-		ec(0x3EE9E409302678BAL, "1.2345678901234568E-5", "1.23456789012346E-05"),
-		ec(0x3F202E85BE180B74L, "1.2345678901234567E-4", "0.000123456789012346"),
-		ec(0x3F543A272D9E0E51L, "0.0012345678901234567", "0.00123456789012346"),
-		ec(0x3F8948B0F90591E6L, "0.012345678901234568", "0.0123456789012346"),
-
-		ec(0x3EE9E409301B5A02L, "1.23456789E-5", "0.0000123456789"),
-
-		ec(0x3E6E7D05BDABDE50L, "5.6789012345E-8", "0.000000056789012345"),
-		ec(0x3E6E7D05BDAD407EL, "5.67890123456E-8", "5.67890123456E-08"),
-		ec(0x3E6E7D06029F18BEL, "5.678902E-8", "0.00000005678902"),
-
-		ec(0x2BCB5733CB32AE6EL, "9.999999999999123E-98",  "9.99999999999912E-98"),
-		ec(0x2B617F7D4ED8C59EL, "1.0000000000001235E-99", "1.0000000000001E-99"),
-		ec(0x0036319916D67853L, "1.2345678901234578E-307", "1.2345678901235E-307"),
-
-		ec(0x359DEE7A4AD4B81FL, "2.0E-50", "2E-50"),
-
-		// large numbers
-		ec(0x41678C29DCD6E9E0L, "1.2345678901234567E7", "12345678.9012346"),
-		ec(0x42A674E79C5FE523L, "1.2345678901234568E13", "12345678901234.6"),
-		ec(0x42DC12218377DE6BL, "1.2345678901234567E14", "123456789012346"),
-		ec(0x43118B54F22AEB03L, "1.2345678901234568E15", "1234567890123460"),
-		ec(0x43E56A95319D63E1L, "1.2345678901234567E19", "12345678901234600000"),
-		ec(0x441AC53A7E04BCDAL, "1.2345678901234568E20", "1.23456789012346E+20"),
-		ec(0xC3E56A95319D63E1L, "-1.2345678901234567E19", "-12345678901234600000"),
-		ec(0xC41AC53A7E04BCDAL, "-1.2345678901234568E20", "-1.23456789012346E+20"),
-
-		ec(0x54820FE0BA17F46DL, "1.2345678901234577E99",  "1.2345678901235E+99"),
-		ec(0x54B693D8E89DF188L, "1.2345678901234576E100", "1.2345678901235E+100"),
-
-		ec(0x4A611B0EC57E649AL, "2.0E50", "2E+50"),
-
-		// range extremities
-		ec(0x7FEFFFFFFFFFFFFFL, "1.7976931348623157E308", "1.7976931348623E+308"),
-		ec(0x0010000000000000L, "2.2250738585072014E-308", "2.2250738585072E-308"),
-		ec(0x000FFFFFFFFFFFFFL, "2.225073858507201E-308", "0"),
-		ec(0x0000000000000001L, "4.9E-324", "0"),
-
-		// infinity
-		ec(0x7FF0000000000000L, "Infinity", "1.7976931348623E+308"),
-		ec(0xFFF0000000000000L, "-Infinity", "1.7976931348623E+308"),
-
-		// shortening due to rounding
-		ec(0x441AC7A08EAD02F2L, "1.234999999999999E20", "1.235E+20"),
-		ec(0x40FE26BFFFFFFFF9L, "123499.9999999999", "123500"),
-		ec(0x3E4A857BFB2F2809L, "1.234999999999999E-8", "0.00000001235"),
-		ec(0x3BCD291DEF868C89L, "1.234999999999999E-20", "1.235E-20"),
-
-		// carry up due to rounding
-		// For clarity these tests choose values that don't round in java,
-		// but will round in excel. In some cases there is almost no difference
-		// between excel and java (e.g. 9.9..9E-8)
-		ec(0x444B1AE4D6E2EF4FL, "9.999999999999999E20", "1E+21"),
-		ec(0x412E847FFFFFFFFFL, "999999.9999999999", "1000000"),
-		ec(0x3E45798EE2308C39L, "9.999999999999999E-9", "0.00000001"),
-		ec(0x3C32725DD1D243ABL, "9.999999999999999E-19", "0.000000000000000001"),
-		ec(0x3BFD83C94FB6D2ABL, "9.999999999999999E-20", "1E-19"),
-
-		ec(0xC44B1AE4D6E2EF4FL, "-9.999999999999999E20", "-1E+21"),
-		ec(0xC12E847FFFFFFFFFL, "-999999.9999999999", "-1000000"),
-		ec(0xBE45798EE2308C39L, "-9.999999999999999E-9", "-0.00000001"),
-		ec(0xBC32725DD1D243ABL, "-9.999999999999999E-19", "-0.000000000000000001"),
-		ec(0xBBFD83C94FB6D2ABL, "-9.999999999999999E-20", "-1E-19"),
-
-
-		// NaNs
-		// Currently these test cases are not critical, since other limitations prevent any variety in
-		// or control of the bit patterns used to encode NaNs in evaluations.
-		ec(0xFFFF0420003C0000L, "NaN", "3.484840871308E+308"),
-		ec(0x7FF8000000000000L, "NaN", "2.6965397022935E+308"),
-		ec(0x7FFF0420003C0000L, "NaN", "3.484840871308E+308"),
-		ec(0xFFF8000000000000L, "NaN", "2.6965397022935E+308"),
-		ec(0xFFFF0AAAAAAAAAAAL, "NaN", "3.4877119413344E+308"),
-		ec(0x7FF80AAAAAAAAAAAL, "NaN", "2.7012211948322E+308"),
-		ec(0xFFFFFFFFFFFFFFFFL, "NaN", "3.5953862697246E+308"),
-		ec(0x7FFFFFFFFFFFFFFFL, "NaN", "3.5953862697246E+308"),
-		ec(0xFFF7FFFFFFFFFFFFL, "NaN", "2.6965397022935E+308"),
-	};
-
-	private static ExampleConversion ec(long rawDoubleBits, String javaRendering, String excelRendering) {
-		return new ExampleConversion(rawDoubleBits, javaRendering, excelRendering);
-	}
-
-	public static ExampleConversion[] getExampleConversions() {
-		return examples.clone();
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestAreaReference.java b/trunk/src/testcases/org/apache/poi/ss/util/TestAreaReference.java
deleted file mode 100644
index de2226d..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestAreaReference.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.ss.util;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-
-import junit.framework.TestCase;
-
-/**
- * Test for {@link AreaReference} handling of max rows.
- * 
- * @author David North
- */
-public class TestAreaReference extends TestCase {
-    
-    public void testWholeColumn() {
-        AreaReference oldStyle = AreaReference.getWholeColumn(SpreadsheetVersion.EXCEL97, "A", "B");
-        assertEquals(0, oldStyle.getFirstCell().getCol());
-        assertEquals(0, oldStyle.getFirstCell().getRow());
-        assertEquals(1, oldStyle.getLastCell().getCol());
-        assertEquals(SpreadsheetVersion.EXCEL97.getLastRowIndex(), oldStyle.getLastCell().getRow());
-        assertTrue(oldStyle.isWholeColumnReference());
-
-        AreaReference oldStyleNonWholeColumn = new AreaReference("A1:B23", SpreadsheetVersion.EXCEL97);
-        assertFalse(oldStyleNonWholeColumn.isWholeColumnReference());
-
-        AreaReference newStyle = AreaReference.getWholeColumn(SpreadsheetVersion.EXCEL2007, "A", "B");
-        assertEquals(0, newStyle.getFirstCell().getCol());
-        assertEquals(0, newStyle.getFirstCell().getRow());
-        assertEquals(1, newStyle.getLastCell().getCol());
-        assertEquals(SpreadsheetVersion.EXCEL2007.getLastRowIndex(), newStyle.getLastCell().getRow());
-        assertTrue(newStyle.isWholeColumnReference());
-
-        AreaReference newStyleNonWholeColumn = new AreaReference("A1:B23", SpreadsheetVersion.EXCEL2007);
-        assertFalse(newStyleNonWholeColumn.isWholeColumnReference());
-    }
-    
-    public void testWholeRow() {
-        AreaReference oldStyle = AreaReference.getWholeRow(SpreadsheetVersion.EXCEL97, "1", "2");
-        assertEquals(0, oldStyle.getFirstCell().getCol());
-        assertEquals(0, oldStyle.getFirstCell().getRow());
-        assertEquals(SpreadsheetVersion.EXCEL97.getLastColumnIndex(), oldStyle.getLastCell().getCol());
-        assertEquals(1, oldStyle.getLastCell().getRow());
-        
-        AreaReference newStyle = AreaReference.getWholeRow(SpreadsheetVersion.EXCEL2007, "1", "2");
-        assertEquals(0, newStyle.getFirstCell().getCol());
-        assertEquals(0, newStyle.getFirstCell().getRow());
-        assertEquals(SpreadsheetVersion.EXCEL2007.getLastColumnIndex(), newStyle.getLastCell().getCol());
-        assertEquals(1, newStyle.getLastCell().getRow());
-    }
-
-    @SuppressWarnings("deprecation") // deliberate test for behaviour if deprecated constructor used.
-    public void testFallbackToExcel97IfVersionNotSupplied() {
-        assertTrue(new AreaReference("A:B").isWholeColumnReference());
-        assertTrue(AreaReference.isWholeColumnReference(null, new CellReference("A$1"), new CellReference("A$" + SpreadsheetVersion.EXCEL97.getMaxRows())));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestCellAddress.java b/trunk/src/testcases/org/apache/poi/ss/util/TestCellAddress.java
deleted file mode 100644
index 6ca6f65..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestCellAddress.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.ss.util.CellAddress;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assume.assumeTrue;
-
-import java.util.Arrays;
-
-/**
- * Tests that the common CellAddress works as we need it to.
- * Note - some additional testing is also done in the HSSF class,
- *  {@link org.apache.poi.hssf.util.TestCellAddress}
- */
-public final class TestCellAddress {
-    @Test
-    public void testConstructors() {
-        CellAddress cellAddress;
-        final CellReference cellRef = new CellReference("Sheet1", 0, 0, true, true);
-        final String address = "A1";
-        final int row = 0;
-        final int col = 0;
-
-        cellAddress = new CellAddress(row, col);
-        assertEquals(CellAddress.A1, cellAddress);
-
-        cellAddress = new CellAddress(address);
-        assertEquals(CellAddress.A1, cellAddress);
-
-        cellAddress = new CellAddress(cellRef);
-        assertEquals(CellAddress.A1, cellAddress);
-    }
-
-    @Test
-    public void testFormatAsString() {
-        assertEquals("A1", CellAddress.A1.formatAsString());
-    }
-
-    @Test
-    public void testEquals() {
-        assertEquals(new CellReference(6, 4), new CellReference(6, 4));
-        assertNotEquals(new CellReference(4, 6), new CellReference(6, 4));
-    }
-    
-    @Test
-    public void testCompareTo() {
-        final CellAddress A1 = new CellAddress(0, 0);
-        final CellAddress A2 = new CellAddress(1, 0);
-        final CellAddress B1 = new CellAddress(0, 1);
-        final CellAddress B2 = new CellAddress(1, 1);
-        
-        assertEquals(0,  A1.compareTo(A1));
-        assertEquals(-1, A1.compareTo(B1));
-        assertEquals(-1, A1.compareTo(A2));
-        assertEquals(-1, A1.compareTo(B2));
-        
-        assertEquals(1,  B1.compareTo(A1));
-        assertEquals(0,  B1.compareTo(B1));
-        assertEquals(-1, B1.compareTo(A2));
-        assertEquals(-1, B1.compareTo(B2));
-        
-        assertEquals(1,  A2.compareTo(A1));
-        assertEquals(1,  A2.compareTo(B1));
-        assertEquals(0,  A2.compareTo(A2));
-        assertEquals(-1, A2.compareTo(B2));
-        
-        assertEquals(1,  B2.compareTo(A1));
-        assertEquals(1,  B2.compareTo(B1));
-        assertEquals(1,  B2.compareTo(A2));
-        assertEquals(0,  B2.compareTo(B2));
-        
-        CellAddress[] sorted = {A1, B1, A2, B2};
-        CellAddress[] unsorted = {B1, B2, A1, A2};
-        assumeTrue(!sorted.equals(unsorted));
-        Arrays.sort(unsorted);
-        assertArrayEquals(sorted, unsorted);
-    }
-
-    @Test
-    public void testGetRow() {
-        final CellAddress addr = new CellAddress(6, 4);
-        assertEquals(6, addr.getRow());
-    }
-    
-    @Test
-    public void testGetColumn() {
-        final CellAddress addr = new CellAddress(6, 4);
-        assertEquals(4, addr.getColumn());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java b/trunk/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java
deleted file mode 100644
index 3f0f441..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/* ====================================================================
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.apache.poi.util.LittleEndianOutputStream;
-
-import org.junit.Test;
-
-public final class TestCellRangeAddress {
-    static final byte[] data = new byte[] {
-            0x02, 0x00, 0x04, 0x00,
-            0x00, 0x00, 0x03, 0x00,
-    };
-
-    @Test
-    public void testLoad() {
-        CellRangeAddress ref = new CellRangeAddress(
-                TestcaseRecordInputStream.create(0x000, data));
-        assertEquals(2, ref.getFirstRow());
-        assertEquals(4, ref.getLastRow());
-        assertEquals(0, ref.getFirstColumn());
-        assertEquals(3, ref.getLastColumn());
-
-        assertEquals(8, CellRangeAddress.ENCODED_SIZE);
-    }
-
-    @Test
-    public void testLoadInvalid() {
-        try {
-            assertNotNull(new CellRangeAddress(
-                TestcaseRecordInputStream.create(0x000, new byte[] { (byte)0x02 })));
-        } catch (RuntimeException e) {
-            assertTrue("Had: " + e, e.getMessage().contains("Ran out of data"));
-        }
-    }
-
-    @Test
-    public void testStore() throws IOException {
-        CellRangeAddress ref = new CellRangeAddress(0, 0, 0, 0);
-
-        byte[] recordBytes;
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        LittleEndianOutputStream out = new LittleEndianOutputStream(baos);
-        try {
-            // With nothing set
-            ref.serialize(out);
-            recordBytes = baos.toByteArray();
-            assertEquals(recordBytes.length, data.length);
-            for (int i = 0; i < data.length; i++) {
-                assertEquals("At offset " + i, 0, recordBytes[i]);
-            }
-
-            // Now set the flags
-            ref.setFirstRow((short) 2);
-            ref.setLastRow((short) 4);
-            ref.setFirstColumn((short) 0);
-            ref.setLastColumn((short) 3);
-
-            // Re-test
-            baos.reset();
-            ref.serialize(out);
-            recordBytes = baos.toByteArray();
-
-            assertEquals(recordBytes.length, data.length);
-            for (int i = 0; i < data.length; i++) {
-                assertEquals("At offset " + i, data[i], recordBytes[i]);
-            }
-        } finally {
-            out.close();
-        }
-    }
-    
-    @Test
-    public void testCreateIllegal() throws IOException {
-        // for some combinations we expected exceptions
-        try {
-            assertNotNull(new CellRangeAddress(1, 0, 0, 0));
-            fail("Expect to catch an exception");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-        try {
-            assertNotNull(new CellRangeAddress(0, 0, 1, 0));
-            fail("Expect to catch an exception");
-        } catch (IllegalArgumentException e) {
-            // expected here
-        }
-    }
-
-    @Test
-    public void testCopy() throws IOException {
-        CellRangeAddress ref = new CellRangeAddress(1, 2, 3, 4);
-        CellRangeAddress copy = ref.copy();
-        assertEquals(ref.toString(), copy.toString());
-    }
-
-    @Test
-    public void testGetEncodedSize() throws IOException {
-        assertEquals(2*CellRangeAddress.ENCODED_SIZE, CellRangeAddress.getEncodedSize(2));
-    }
-
-    @Test
-    public void testFormatAsString() throws IOException {
-        CellRangeAddress ref = new CellRangeAddress(1, 2, 3, 4);
-        
-        assertEquals("D2:E3", ref.formatAsString());
-        assertEquals("D2:E3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString());
-
-        assertEquals("sheet1!$D$2:$E$3", ref.formatAsString("sheet1", true));
-        assertEquals("sheet1!$D$2:$E$3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", true));
-        assertEquals("sheet1!$D$2:$E$3", CellRangeAddress.valueOf(ref.formatAsString("sheet1", true)).formatAsString("sheet1", true));
-
-        assertEquals("sheet1!D2:E3", ref.formatAsString("sheet1", false));
-        assertEquals("sheet1!D2:E3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", false));
-        assertEquals("sheet1!D2:E3", CellRangeAddress.valueOf(ref.formatAsString("sheet1", false)).formatAsString("sheet1", false));
-
-        assertEquals("D2:E3", ref.formatAsString(null, false));
-        assertEquals("D2:E3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString(null, false));
-        assertEquals("D2:E3", CellRangeAddress.valueOf(ref.formatAsString(null, false)).formatAsString(null, false));
-        
-        assertEquals("$D$2:$E$3", ref.formatAsString(null, true));
-        assertEquals("$D$2:$E$3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString(null, true));
-        assertEquals("$D$2:$E$3", CellRangeAddress.valueOf(ref.formatAsString(null, true)).formatAsString(null, true));
-        
-        ref = new CellRangeAddress(-1, -1, 3, 4);
-        assertEquals("D:E", ref.formatAsString());
-        assertEquals("sheet1!$D:$E", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", true));
-        assertEquals("sheet1!$D:$E", CellRangeAddress.valueOf(ref.formatAsString("sheet1", true)).formatAsString("sheet1", true));
-        assertEquals("$D:$E", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString(null, true));
-        assertEquals("$D:$E", CellRangeAddress.valueOf(ref.formatAsString(null, true)).formatAsString(null, true));
-        assertEquals("sheet1!D:E", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", false));
-        assertEquals("sheet1!D:E", CellRangeAddress.valueOf(ref.formatAsString("sheet1", false)).formatAsString("sheet1", false));
-
-        ref = new CellRangeAddress(1, 2, -1, -1);
-        assertEquals("2:3", ref.formatAsString());
-        assertEquals("sheet1!$2:$3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", true));
-        assertEquals("sheet1!$2:$3", CellRangeAddress.valueOf(ref.formatAsString("sheet1", true)).formatAsString("sheet1", true));
-        assertEquals("$2:$3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString(null, true));
-        assertEquals("$2:$3", CellRangeAddress.valueOf(ref.formatAsString(null, true)).formatAsString(null, true));
-        assertEquals("sheet1!2:3", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", false));
-        assertEquals("sheet1!2:3", CellRangeAddress.valueOf(ref.formatAsString("sheet1", false)).formatAsString("sheet1", false));
-
-        ref = new CellRangeAddress(1, 1, 2, 2);
-        assertEquals("C2", ref.formatAsString());
-        assertEquals("sheet1!$C$2", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", true));
-        assertEquals("sheet1!$C$2", CellRangeAddress.valueOf(ref.formatAsString("sheet1", true)).formatAsString("sheet1", true));
-        assertEquals("$C$2", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString(null, true));
-        assertEquals("$C$2", CellRangeAddress.valueOf(ref.formatAsString(null, true)).formatAsString(null, true));
-        assertEquals("sheet1!C2", CellRangeAddress.valueOf(ref.formatAsString()).formatAsString("sheet1", false));
-        assertEquals("sheet1!C2", CellRangeAddress.valueOf(ref.formatAsString("sheet1", false)).formatAsString("sheet1", false));
-
-        // is this a valid address?
-        ref = new CellRangeAddress(-1, -1, -1, -1);
-        assertEquals(":", ref.formatAsString());
-    }
-    
-    @Test
-    public void testEquals() {
-        final CellRangeAddress ref1 = new CellRangeAddress(1, 2, 3, 4);
-        final CellRangeAddress ref2 = new CellRangeAddress(1, 2, 3, 4);
-        assertEquals(ref1, ref2);
-        
-        // Invert first/last row, but refer to same area
-        ref2.setFirstRow(2);
-        ref2.setLastRow(1);
-        assertEquals(ref1, ref2);
-        
-        // Invert first/last column, but refer to same area
-        ref2.setFirstColumn(4);
-        ref2.setLastColumn(3);
-        assertEquals(ref1, ref2);
-        
-        // Refer to a different area
-        assertNotEquals(ref1, new CellRangeAddress(3, 4, 1, 2));
-    }
-    
-    @Test
-    public void testGetMinMaxRow() {
-        final CellRangeAddress ref = new CellRangeAddress(1, 2, 3, 4);
-        assertEquals(1, ref.getMinRow());
-        assertEquals(2, ref.getMaxRow());
-        
-        ref.setFirstRow(10);
-        //now ref is CellRangeAddress(10, 2, 3, 4)
-        assertEquals(2, ref.getMinRow());
-        assertEquals(10, ref.getMaxRow());
-    }
-    
-    @Test
-    public void testGetMinMaxColumn() {
-        final CellRangeAddress ref = new CellRangeAddress(1, 2, 3, 4);
-        assertEquals(3, ref.getMinColumn());
-        assertEquals(4, ref.getMaxColumn());
-        
-        ref.setFirstColumn(10);
-        //now ref is CellRangeAddress(1, 2, 10, 4)
-        assertEquals(4, ref.getMinColumn());
-        assertEquals(10, ref.getMaxColumn());
-    }
-    
-    @Test
-    public void testIntersects() {
-        final CellRangeAddress baseRegion = new CellRangeAddress(0, 1, 0, 1);
-        
-        final CellRangeAddress duplicateRegion = new CellRangeAddress(0, 1, 0, 1);
-        assertIntersects(baseRegion, duplicateRegion);
-        
-        final CellRangeAddress partiallyOverlappingRegion = new CellRangeAddress(1, 2, 1, 2);
-        assertIntersects(baseRegion, partiallyOverlappingRegion);
-        
-        final CellRangeAddress subsetRegion = new CellRangeAddress(0, 1, 0, 0);
-        assertIntersects(baseRegion, subsetRegion);
-    
-        final CellRangeAddress supersetRegion = new CellRangeAddress(0, 2, 0, 2);
-        assertIntersects(baseRegion, supersetRegion);
-        
-        final CellRangeAddress disjointRegion = new CellRangeAddress(10, 11, 10, 11);
-        assertNotIntersects(baseRegion, disjointRegion);
-    }
-    
-    @Test
-    public void containsRow() {
-        final CellRangeAddress region = new CellRangeAddress(10, 12, 3, 5);
-        
-        assertFalse(region.containsRow(9));
-        assertTrue(region.containsRow(10));
-        assertTrue(region.containsRow(11));
-        assertTrue(region.containsRow(12));
-        assertFalse(region.containsRow(13));
-    }
-    
-    @Test
-    public void containsColumn() {
-        final CellRangeAddress region = new CellRangeAddress(10, 12, 3, 5);
-        
-        assertFalse(region.containsColumn(2));
-        assertTrue(region.containsColumn(3));
-        assertTrue(region.containsColumn(4));
-        assertTrue(region.containsColumn(5));
-        assertFalse(region.containsColumn(6));
-    }
-    
-    private static void assertIntersects(CellRangeAddress regionA, CellRangeAddress regionB) {
-        if (!(regionA.intersects(regionB) && regionB.intersects(regionA))) {
-            final String A = regionA.formatAsString();
-            final String B = regionB.formatAsString();
-            fail("expected: regions "+A+" and "+B+" intersect");
-        }
-    }
-    private static void assertNotIntersects(CellRangeAddress regionA, CellRangeAddress regionB) {
-        if ((regionA.intersects(regionB) || regionB.intersects(regionA))) {
-            final String A = regionA.formatAsString();
-            final String B = regionB.formatAsString();
-            fail("expected: regions "+A+" and "+B+" do not intersect");
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestCellReference.java b/trunk/src/testcases/org/apache/poi/ss/util/TestCellReference.java
deleted file mode 100644
index d2f2e46..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestCellReference.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.util.CellReference;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * Tests that the common CellReference works as we need it to.
- * Note - some additional testing is also done in the HSSF class,
- *  {@link org.apache.poi.hssf.util.TestCellReference}
- */
-public final class TestCellReference {
-    @Test
-    public void testConstructors() {
-        CellReference cellReference;
-        final String sheet = "Sheet1";
-        final String cellRef = "A1";
-        final int row = 0;
-        final int col = 0;
-        final boolean absRow = true;
-        final boolean absCol = false;
-
-        cellReference = new CellReference(row, col);
-        assertEquals("A1", cellReference.formatAsString());
-
-        cellReference = new CellReference(row, col, absRow, absCol);
-        assertEquals("A$1", cellReference.formatAsString());
-
-        cellReference = new CellReference(row, (short)col);
-        assertEquals("A1", cellReference.formatAsString());
-
-        cellReference = new CellReference(cellRef);
-        assertEquals("A1", cellReference.formatAsString());
-
-        cellReference = new CellReference(sheet, row, col, absRow, absCol);
-        assertEquals("Sheet1!A$1", cellReference.formatAsString());
-    }
-
-    @Test
-    public void testFormatAsString() {
-        CellReference cellReference;
-
-        cellReference = new CellReference(null, 0, 0, false, false);
-        assertEquals("A1", cellReference.formatAsString());
-
-        //absolute references
-        cellReference = new CellReference(null, 0, 0, true, false);
-        assertEquals("A$1", cellReference.formatAsString());
-
-        //sheet name with no spaces
-        cellReference = new CellReference("Sheet1", 0, 0, true, false);
-        assertEquals("Sheet1!A$1", cellReference.formatAsString());
-
-        //sheet name with spaces
-        cellReference = new CellReference("Sheet 1", 0, 0, true, false);
-        assertEquals("'Sheet 1'!A$1", cellReference.formatAsString());
-    }
-
-    @Test
-    public void testGetCellRefParts() {
-        CellReference cellReference;
-        String[] parts;
-
-        String cellRef = "A1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(0, cellReference.getCol());
-        parts = cellReference.getCellRefParts();
-        assertNotNull(parts);
-        assertEquals(null, parts[0]);
-        assertEquals("1", parts[1]);
-        assertEquals("A", parts[2]);
-
-        cellRef = "AA1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26, cellReference.getCol());
-        parts = cellReference.getCellRefParts();
-        assertNotNull(parts);
-        assertEquals(null, parts[0]);
-        assertEquals("1", parts[1]);
-        assertEquals("AA", parts[2]);
-
-        cellRef = "AA100";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26, cellReference.getCol());
-        parts = cellReference.getCellRefParts();
-        assertNotNull(parts);
-        assertEquals(null, parts[0]);
-        assertEquals("100", parts[1]);
-        assertEquals("AA", parts[2]);
-
-        cellRef = "AAA300";
-        cellReference = new CellReference(cellRef);
-        assertEquals(702, cellReference.getCol());
-        parts = cellReference.getCellRefParts();
-        assertNotNull(parts);
-        assertEquals(null, parts[0]);
-        assertEquals("300", parts[1]);
-        assertEquals("AAA", parts[2]);
-
-        cellRef = "ZZ100521";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26*26+25, cellReference.getCol());
-        parts = cellReference.getCellRefParts();
-        assertNotNull(parts);
-        assertEquals(null, parts[0]);
-        assertEquals("100521", parts[1]);
-        assertEquals("ZZ", parts[2]);
-
-        cellRef = "ZYX987";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26*26*26 + 25*26 + 24 - 1, cellReference.getCol());
-        parts = cellReference.getCellRefParts();
-        assertNotNull(parts);
-        assertEquals(null, parts[0]);
-        assertEquals("987", parts[1]);
-        assertEquals("ZYX", parts[2]);
-
-        cellRef = "AABC10065";
-        cellReference = new CellReference(cellRef);
-        parts = cellReference.getCellRefParts();
-        assertNotNull(parts);
-        assertEquals(null, parts[0]);
-        assertEquals("10065", parts[1]);
-        assertEquals("AABC", parts[2]);
-    }
-
-    @Test
-    public void testGetColNumFromRef() {
-        String cellRef = "A1";
-        CellReference cellReference = new CellReference(cellRef);
-        assertEquals(0, cellReference.getCol());
-
-        cellRef = "AA1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26, cellReference.getCol());
-
-        cellRef = "AB1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(27, cellReference.getCol());
-
-        cellRef = "BA1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26+26, cellReference.getCol());
-
-        cellRef = "CA1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26+26+26, cellReference.getCol());
-
-        cellRef = "ZA1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26*26, cellReference.getCol());
-
-        cellRef = "ZZ1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26*26+25, cellReference.getCol());
-
-        cellRef = "AAA1";
-        cellReference = new CellReference(cellRef);
-        assertEquals(26*26+26, cellReference.getCol());
-
-
-        cellRef = "A1100";
-        cellReference = new CellReference(cellRef);
-        assertEquals(0, cellReference.getCol());
-
-        cellRef = "BC15";
-        cellReference = new CellReference(cellRef);
-        assertEquals(54, cellReference.getCol());
-    }
-
-    @Test
-    public void testGetRowNumFromRef() {
-        String cellRef = "A1";
-        CellReference cellReference = new CellReference(cellRef);
-        assertEquals(0, cellReference.getRow());
-
-        cellRef = "A12";
-        cellReference = new CellReference(cellRef);
-        assertEquals(11, cellReference.getRow());
-
-        cellRef = "AS121";
-        cellReference = new CellReference(cellRef);
-        assertEquals(120, cellReference.getRow());
-    }
-
-    @Test
-    public void testConvertNumToColString() {
-        short col = 702;
-        String collRef = new CellReference(0, col).formatAsString();
-        assertEquals("AAA1", collRef);
-
-        short col2 = 0;
-        String collRef2 = new CellReference(0, col2).formatAsString();
-        assertEquals("A1", collRef2);
-
-        short col3 = 27;
-        String collRef3 = new CellReference(0, col3).formatAsString();
-        assertEquals("AB1", collRef3);
-
-        short col4 = 2080;
-        String collRef4 = new CellReference(0, col4).formatAsString();
-        assertEquals("CBA1", collRef4);
-    }
-
-    @Test
-    public void testBadRowNumber() {
-        SpreadsheetVersion v97 = SpreadsheetVersion.EXCEL97;
-        SpreadsheetVersion v2007 = SpreadsheetVersion.EXCEL2007;
-
-        confirmCrInRange(true, "A", "1", v97);
-        confirmCrInRange(true, "IV", "65536", v97);
-        confirmCrInRange(false, "IV", "65537", v97);
-        confirmCrInRange(false, "IW", "65536", v97);
-
-        confirmCrInRange(true, "A", "1", v2007);
-        confirmCrInRange(true, "XFD", "1048576", v2007);
-        confirmCrInRange(false, "XFD", "1048577", v2007);
-        confirmCrInRange(false, "XFE", "1048576", v2007);
-
-        assertFalse("Identified bug 47312a", CellReference.cellReferenceIsWithinRange("B", "0", v97));
-
-        confirmCrInRange(false, "A", "0", v97);
-        confirmCrInRange(false, "A", "0", v2007);
-    }
-
-    @Test
-    public void testInvalidReference() {
-        try {
-            new CellReference("Sheet1!#REF!");
-            fail("Shouldn't be able to create a #REF! refence");
-        } catch(IllegalArgumentException expected) {}
-
-        try {
-            new CellReference("'MySheetName'!#REF!");
-            fail("Shouldn't be able to create a #REF! refence");
-        } catch(IllegalArgumentException expected) {}
-
-        try {
-            new CellReference("#REF!");
-            fail("Shouldn't be able to create a #REF! refence");
-        } catch(IllegalArgumentException expected) {}
-    }
-
-    private static void confirmCrInRange(boolean expResult, String colStr, String rowStr,
-            SpreadsheetVersion sv) {
-        if (expResult == CellReference.cellReferenceIsWithinRange(colStr, rowStr, sv)) {
-            return;
-        }
-        fail("expected (c='" + colStr + "', r='" + rowStr + "' to be "
-                + (expResult ? "within" : "out of") + " bounds for version " + sv.name());
-    }
-
-    @Test
-    public void testConvertColStringToIndex() {
-        assertEquals(0, CellReference.convertColStringToIndex("A"));
-        assertEquals(1, CellReference.convertColStringToIndex("B"));
-        assertEquals(14, CellReference.convertColStringToIndex("O"));
-        assertEquals(701, CellReference.convertColStringToIndex("ZZ"));
-        assertEquals(18252, CellReference.convertColStringToIndex("ZZA"));
-
-        assertEquals(0, CellReference.convertColStringToIndex("$A"));
-        assertEquals(1, CellReference.convertColStringToIndex("$B"));
-
-        try {
-            CellReference.convertColStringToIndex("A$");
-            fail("Should throw exception here");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(expected.getMessage().contains("A$"));
-        }
-    }
-
-    @Test
-    public void testConvertNumColColString() {
-        assertEquals("A", CellReference.convertNumToColString(0));
-        assertEquals("AV", CellReference.convertNumToColString(47));
-        assertEquals("AW", CellReference.convertNumToColString(48));
-        assertEquals("BF", CellReference.convertNumToColString(57));
-
-        assertEquals("", CellReference.convertNumToColString(-1));
-        assertEquals("", CellReference.convertNumToColString(Integer.MIN_VALUE));
-        assertEquals("", CellReference.convertNumToColString(Integer.MAX_VALUE));
-        assertEquals("FXSHRXW", CellReference.convertNumToColString(Integer.MAX_VALUE-1));
-    }
-
-    /**
-     * bug 59684: separateRefParts fails on entire-column references
-     */
-    @Test
-    public void entireColumnReferences() {
-        CellReference ref = new CellReference("HOME!$169");
-        assertEquals("HOME", ref.getSheetName());
-        assertEquals(168, ref.getRow());
-        assertEquals(-1, ref.getCol());
-        assertTrue("row absolute", ref.isRowAbsolute());
-        //assertFalse("column absolute/relative is undefined", ref.isColAbsolute());
-    }
-    
-    @Test
-    public void getSheetName() {
-        assertEquals(null, new CellReference("A5").getSheetName());
-        assertEquals(null, new CellReference(null, 0, 0, false, false).getSheetName());
-        // FIXME: CellReference is inconsistent
-        assertEquals("", new CellReference("", 0, 0, false, false).getSheetName());
-        assertEquals("Sheet1", new CellReference("Sheet1!A5").getSheetName());
-        assertEquals("Sheet 1", new CellReference("'Sheet 1'!A5").getSheetName());
-    }
-    
-    @Test
-    public void testToString() {
-        CellReference ref = new CellReference("'Sheet 1'!A5");
-        assertEquals("org.apache.poi.ss.util.CellReference ['Sheet 1'!A5]", ref.toString());
-    }
-    
-    @Test
-    public void testEqualsAndHashCode() {
-        CellReference ref1 = new CellReference("'Sheet 1'!A5");
-        CellReference ref2 = new CellReference("Sheet 1", 4, 0, false, false);
-        assertEquals("equals", ref1, ref2);
-        assertEquals("hash code", ref1.hashCode(), ref2.hashCode());
-        
-        assertFalse("null", ref1.equals(null));
-        assertFalse("3D vs 2D", ref1.equals(new CellReference("A5")));
-        assertFalse("type", ref1.equals(new Integer(0)));
-    }
-    
-    @Test
-    public void isRowWithinRange() {
-        SpreadsheetVersion ss = SpreadsheetVersion.EXCEL2007;
-        assertFalse("1 before first row", CellReference.isRowWithinRange("0", ss));
-        assertTrue("first row", CellReference.isRowWithinRange("1", ss));
-        assertTrue("last row", CellReference.isRowWithinRange("1048576", ss));
-        assertFalse("1 beyond last row", CellReference.isRowWithinRange("1048577", ss));
-    }
-    
-    @Test
-    public void isColWithinRange() {
-        SpreadsheetVersion ss = SpreadsheetVersion.EXCEL2007;
-        assertTrue("(empty)", CellReference.isColumnWithinRange("", ss));
-        assertTrue("first column (A)", CellReference.isColumnWithinRange("A", ss));
-        assertTrue("last column (XFD)", CellReference.isColumnWithinRange("XFD", ss));
-        assertFalse("1 beyond last column (XFE)", CellReference.isColumnWithinRange("XFE", ss));
-    }
-    
-    @Test(expected=IllegalArgumentException.class)
-    public void unquotedSheetName() {
-        new CellReference("'Sheet 1!A5");
-    }
-    @Test(expected=IllegalArgumentException.class)
-    public void mismatchedQuotesSheetName() {
-        new CellReference("Sheet 1!A5");
-    }
-    
-    @Test
-    public void escapedSheetName() {
-        String escapedName = "'Don''t Touch'!A5";
-        String unescapedName = "'Don't Touch'!A5";
-        new CellReference(escapedName);
-        try {
-            new CellReference(unescapedName);
-            fail("Sheet names containing apostrophe's must be escaped via a repeated apostrophe");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Bad sheet name quote escaping: "));
-        }
-    }
-    
-    @Test(expected=IllegalArgumentException.class)
-    public void negativeRow() {
-        new CellReference("sheet", -2, 0, false, false);
-    }
-    @Test(expected=IllegalArgumentException.class)
-    public void negativeColumn() {
-        new CellReference("sheet", 0, -2, false, false);
-    }
-    
-    @Test(expected=IllegalArgumentException.class)
-    public void classifyEmptyStringCellReference() {
-        CellReference.classifyCellReference("", SpreadsheetVersion.EXCEL2007);
-    }
-    @Test(expected=IllegalArgumentException.class)
-    public void classifyInvalidFirstCharCellReference() {
-        CellReference.classifyCellReference("!A5", SpreadsheetVersion.EXCEL2007);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java b/trunk/src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java
deleted file mode 100644
index 2b6e6e3..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ====================================================================
- */
-
-package org.apache.poi.ss.util;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Locale;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.TempFile;
-
-public final class TestDateFormatConverter extends TestCase {
-    private void outputLocaleDataFormats( Date date, boolean dates, boolean times, int style, String styleName ) throws Exception {
-
-        Workbook workbook = new HSSFWorkbook();
-        try {
-            String sheetName;
-            if( dates ) {
-                if( times ) {
-                    sheetName = "DateTimes";
-                } else {
-                    sheetName = "Dates";
-                }
-            } else {
-                sheetName = "Times";
-            }
-            Sheet sheet = workbook.createSheet(sheetName);
-            Row header = sheet.createRow(0);
-            header.createCell(0).setCellValue("locale");
-            header.createCell(1).setCellValue("DisplayName");
-            header.createCell(2).setCellValue("Excel " + styleName);
-            header.createCell(3).setCellValue("java.text.DateFormat");
-            header.createCell(4).setCellValue("Equals");
-            header.createCell(5).setCellValue("Java pattern");
-            header.createCell(6).setCellValue("Excel pattern");
-    
-            int rowNum = 1;
-            for( Locale locale : DateFormat.getAvailableLocales() ) {
-                try {
-                    Row row = sheet.createRow(rowNum++);
-        
-                    row.createCell(0).setCellValue(locale.toString());
-                    row.createCell(1).setCellValue(locale.getDisplayName(Locale.ROOT));
-        
-                    DateFormat dateFormat;
-                    if( dates ) {
-                        if( times ) {
-                            dateFormat = DateFormat.getDateTimeInstance(style, style, locale);
-                        } else {
-                            dateFormat = DateFormat.getDateInstance(style, locale);
-                        }
-                    } else {
-                        dateFormat = DateFormat.getTimeInstance(style, locale);
-                    }
-        
-                    Cell cell = row.createCell(2);
-        
-                    cell.setCellValue(date);
-                    CellStyle cellStyle = row.getSheet().getWorkbook().createCellStyle();
-        
-                    String javaDateFormatPattern = ((SimpleDateFormat)dateFormat).toPattern();
-                    String excelFormatPattern = DateFormatConverter.convert(locale, javaDateFormatPattern);
-        
-                    DataFormat poiFormat = row.getSheet().getWorkbook().createDataFormat();
-                    cellStyle.setDataFormat(poiFormat.getFormat(excelFormatPattern));
-                    row.createCell(3).setCellValue(dateFormat.format(date));
-        
-                    cell.setCellStyle(cellStyle);
-        
-                    // the formula returns TRUE is the formatted date in column C equals to the string in column D
-                    row.createCell(4).setCellFormula("TEXT(C"+rowNum+",G"+rowNum+")=D" + rowNum);
-                    row.createCell(5).setCellValue(javaDateFormatPattern);
-                    row.createCell(6).setCellValue(excelFormatPattern);
-                } catch (Exception e) {
-                    throw new RuntimeException("Failed for locale: " + locale + ", having locales: " + 
-                            Arrays.toString(DateFormat.getAvailableLocales()), e);
-                }
-            }
-    
-            File outputFile = TempFile.createTempFile("Locale" + sheetName + styleName, ".xlsx");
-            FileOutputStream outputStream = new FileOutputStream(outputFile);
-            try {
-                workbook.write(outputStream);
-            } finally {
-                outputStream.close();
-            }
-    
-            System.out.println("Open " + outputFile.getAbsolutePath()+" in Excel");
-        } finally {
-            workbook.close();
-        }
-    }
-
-    public void testJavaDateFormatsInExcel() throws Exception {
-        Date date = new Date();
-
-        outputLocaleDataFormats(date, true, false, DateFormat.DEFAULT, "Default" );
-        outputLocaleDataFormats(date, true, false, DateFormat.SHORT, "Short" );
-        outputLocaleDataFormats(date, true, false, DateFormat.MEDIUM, "Medium" );
-        outputLocaleDataFormats(date, true, false, DateFormat.LONG, "Long" );
-        outputLocaleDataFormats(date, true, false, DateFormat.FULL, "Full" );
-
-        outputLocaleDataFormats(date, true, true, DateFormat.DEFAULT, "Default" );
-        outputLocaleDataFormats(date, true, true, DateFormat.SHORT, "Short" );
-        outputLocaleDataFormats(date, true, true, DateFormat.MEDIUM, "Medium" );
-        outputLocaleDataFormats(date, true, true, DateFormat.LONG, "Long" );
-        outputLocaleDataFormats(date, true, true, DateFormat.FULL, "Full" );
-
-        outputLocaleDataFormats(date, false, true, DateFormat.DEFAULT, "Default" );
-        outputLocaleDataFormats(date, false, true, DateFormat.SHORT, "Short" );
-        outputLocaleDataFormats(date, false, true, DateFormat.MEDIUM, "Medium" );
-        outputLocaleDataFormats(date, false, true, DateFormat.LONG, "Long" );
-        outputLocaleDataFormats(date, false, true, DateFormat.FULL, "Full" );
-    }
-    
-    public void testJDK8EmptyLocale() {
-        // JDK 8 seems to add an empty locale-string to the list returned via DateFormat.getAvailableLocales()
-        // therefore we now cater for this special locale as well
-        DateFormatConverter.getPrefixForLocale(new Locale(""));
-    }
-
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java b/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java
deleted file mode 100644
index d4d6319..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.apache.poi.util.HexDump;
-import org.junit.Test;
-
-import junit.framework.AssertionFailedError;
-/**
- * Tests for {@link ExpandedDouble}
- *
- * @author Josh Micich
- */
-public final class TestExpandedDouble {
-	private static final BigInteger BIG_POW_10 = BigInteger.valueOf(1000000000);
-
-	@Test
-	public void testNegative() {
-		ExpandedDouble hd = new ExpandedDouble(0xC010000000000000L);
-
-		if (hd.getBinaryExponent() == -2046) {
-			throw new AssertionFailedError("identified bug - sign bit not masked out of exponent");
-		}
-		assertEquals(2, hd.getBinaryExponent());
-		BigInteger frac = hd.getSignificand();
-		assertEquals(64, frac.bitLength());
-		assertEquals(1, frac.bitCount());
-	}
-
-	@Test
-	public void testSubnormal() {
-		ExpandedDouble hd = new ExpandedDouble(0x0000000000000001L);
-
-		if (hd.getBinaryExponent() == -1023) {
-			throw new AssertionFailedError("identified bug - subnormal numbers not decoded properly");
-		}
-		assertEquals(-1086, hd.getBinaryExponent());
-		BigInteger frac = hd.getSignificand();
-		assertEquals(64, frac.bitLength());
-		assertEquals(1, frac.bitCount());
-	}
-
-	/**
-	 * Tests specific values for conversion from {@link ExpandedDouble} to {@link NormalisedDecimal} and back
-	 */
-	@Test
-	public void testRoundTripShifting() {
-		long[] rawValues = {
-				0x4010000000000004L,
-				0x7010000000000004L,
-				0x1010000000000004L,
-				0x0010000000000001L, // near lowest normal number
-				0x0010000000000000L, // lowest normal number
-				0x000FFFFFFFFFFFFFL, // highest subnormal number
-				0x0008000000000000L, // subnormal number
-
-				0xC010000000000004L,
-				0xE230100010001004L,
-				0x403CE0FFFFFFFFF2L,
-				0x0000000000000001L, // smallest non-zero number (subnormal)
-				0x6230100010000FFEL,
-				0x6230100010000FFFL,
-				0x6230100010001000L,
-				0x403CE0FFFFFFFFF0L, // has single digit round trip error
-				0x2B2BFFFF10001079L,
-		};
-		boolean success = true;
-		for (int i = 0; i < rawValues.length; i++) {
-			success &= confirmRoundTrip(i, rawValues[i]);
-		}
-		if (!success) {
-			throw new AssertionFailedError("One or more test examples failed.  See stderr.");
-		}
-	}
-	
-	public static boolean confirmRoundTrip(int i, long rawBitsA) {
-		double a = Double.longBitsToDouble(rawBitsA);
-		if (a == 0.0) {
-			// Can't represent 0.0 or -0.0 with NormalisedDecimal
-			return true;
-		}
-		ExpandedDouble ed1;
-		NormalisedDecimal nd2;
-		ExpandedDouble ed3;
-		try {
-			ed1 = new ExpandedDouble(rawBitsA);
-			nd2 = ed1.normaliseBaseTen();
-			checkNormaliseBaseTenResult(ed1, nd2);
-
-			ed3 = nd2.normaliseBaseTwo();
-		} catch (RuntimeException e) {
-			System.err.println("example[" + i + "] ("
-					+ formatDoubleAsHex(a) + ") exception:");
-			e.printStackTrace();
-			return false;
-		}
-		if (ed3.getBinaryExponent() != ed1.getBinaryExponent()) {
-			System.err.println("example[" + i + "] ("
-					+ formatDoubleAsHex(a) + ") bin exp mismatch");
-			return false;
-		}
-		BigInteger diff = ed3.getSignificand().subtract(ed1.getSignificand()).abs();
-		if (diff.signum() == 0) {
-			return true;
-		}
-		// original quantity only has 53 bits of precision
-		// these quantities may have errors in the 64th bit, which hopefully don't make any difference
-
-		if (diff.bitLength() < 2) {
-			// errors in the 64th bit happen from time to time
-			// this is well below the 53 bits of precision required
-			return true;
-		}
-
-		// but bigger errors are a concern
-		System.out.println("example[" + i + "] ("
-				+ formatDoubleAsHex(a) + ") frac mismatch: " + diff.toString());
-
-		for (int j=-2; j<3; j++) {
-			System.out.println((j<0?"":"+") + j + ": " + getNearby(ed1, j));
-		}
-		for (int j=-2; j<3; j++) {
-			System.out.println((j<0?"":"+") + j + ": " + getNearby(nd2, j));
-		}
-
-
-		return false;
-	}
-
-	public static String getBaseDecimal(ExpandedDouble hd) {
-		int gg = 64 - hd.getBinaryExponent() - 1;
-		BigDecimal bd = new BigDecimal(hd.getSignificand()).divide(new BigDecimal(BigInteger.ONE.shiftLeft(gg)));
-		int excessPrecision = bd.precision() - 23;
-		if (excessPrecision > 0) {
-			bd = bd.setScale(bd.scale() - excessPrecision, BigDecimal.ROUND_HALF_UP);
-		}
-		return bd.unscaledValue().toString();
-	}
-	
-	public static BigInteger getNearby(NormalisedDecimal md, int offset) {
-		BigInteger frac = md.composeFrac();
-		int be = frac.bitLength() - 24 - 1;
-		int sc = frac.bitLength() - 64;
-		return getNearby(frac.shiftRight(sc), be, offset);
-	}
-
-	public static BigInteger getNearby(ExpandedDouble hd, int offset) {
-		return getNearby(hd.getSignificand(), hd.getBinaryExponent(), offset);
-	}
-
-	private static BigInteger getNearby(BigInteger significand, int binExp, int offset) {
-		int nExtraBits = 1;
-		int nDec = (int) Math.round(3.0 + (64+nExtraBits) * Math.log10(2.0));
-		BigInteger newFrac = significand.shiftLeft(nExtraBits).add(BigInteger.valueOf(offset));
-
-		int gg = 64 + nExtraBits - binExp - 1;
-
-		BigDecimal bd = new BigDecimal(newFrac);
-		if (gg > 0) {
-			bd = bd.divide(new BigDecimal(BigInteger.ONE.shiftLeft(gg)));
-		} else {
-			BigInteger frac = newFrac;
-			while (frac.bitLength() + binExp < 180) {
-				frac = frac.multiply(BigInteger.TEN);
-			}
-			int binaryExp = binExp - newFrac.bitLength() + frac.bitLength();
-
-			bd = new BigDecimal( frac.shiftRight(frac.bitLength()-binaryExp-1));
-		}
-		int excessPrecision = bd.precision() - nDec;
-		if (excessPrecision > 0) {
-			bd = bd.setScale(bd.scale() - excessPrecision, BigDecimal.ROUND_HALF_UP);
-		}
-		return bd.unscaledValue();
-	}
-
-	private static void checkNormaliseBaseTenResult(ExpandedDouble orig, NormalisedDecimal result) {
-		String sigDigs = result.getSignificantDecimalDigits();
-		BigInteger frac = orig.getSignificand();
-		while (frac.bitLength() + orig.getBinaryExponent() < 200) {
-			frac = frac.multiply(BIG_POW_10);
-		}
-		int binaryExp = orig.getBinaryExponent() - orig.getSignificand().bitLength();
-
-		String origDigs = frac.shiftLeft(binaryExp+1).toString(10);
-
-		if (!origDigs.startsWith(sigDigs)) {
-			throw new AssertionFailedError("Expected '" + origDigs + "' but got '" + sigDigs + "'.");
-		}
-
-		double dO = Double.parseDouble("0." + origDigs.substring(sigDigs.length()));
-		double d1 = Double.parseDouble(result.getFractionalPart().toPlainString());
-		BigInteger subDigsO = BigInteger.valueOf((int) (dO * 32768 + 0.5));
-		BigInteger subDigsB = BigInteger.valueOf((int) (d1 * 32768 + 0.5));
-
-		if (subDigsO.equals(subDigsB)) {
-			return;
-		}
-		BigInteger diff = subDigsB.subtract(subDigsO).abs();
-		if (diff.intValue() > 100) {
-			// 100/32768 ~= 0.003
-			throw new AssertionFailedError("minor mistake");
-		}
-	}
-
-	private static String formatDoubleAsHex(double d) {
-		long l = Double.doubleToLongBits(d);
-		return HexDump.longToHex(l)+'L';
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestHSSFCellUtil.java b/trunk/src/testcases/org/apache/poi/ss/util/TestHSSFCellUtil.java
deleted file mode 100644
index 848d32a..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestHSSFCellUtil.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import org.apache.poi.hssf.HSSFITestDataProvider;
-
-public class TestHSSFCellUtil extends BaseTestCellUtil {
-    public TestHSSFCellUtil() {
-        super(HSSFITestDataProvider.instance);
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java b/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
deleted file mode 100644
index 506df67..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.poi.ss.util.NumberComparisonExamples.ComparisonExample;
-import org.apache.poi.util.HexDump;
-import org.junit.Test;
-/**
- * Tests for {@link NumberComparer}
- *
- * @author Josh Micich
- */
-public final class TestNumberComparer {
-
-    @Test
-	public void testAllComparisonExamples() {
-		ComparisonExample[] examples = NumberComparisonExamples.getComparisonExamples();
-		boolean success = true;
-
-		for(int i=0;i<examples.length; i++) {
-			ComparisonExample ce = examples[i];
-			success &= confirm(i, ce.getA(), ce.getB(), +ce.getExpectedResult());
-			success &= confirm(i, ce.getB(), ce.getA(), -ce.getExpectedResult());
-			success &= confirm(i, ce.getNegA(), ce.getNegB(), -ce.getExpectedResult());
-			success &= confirm(i, ce.getNegB(), ce.getNegA(), +ce.getExpectedResult());
-		}
-		
-		assertTrue("One or more cases failed.  See stderr", success);
-	}
-
-    @Test
-	public void testRoundTripOnComparisonExamples() {
-		ComparisonExample[] examples = NumberComparisonExamples.getComparisonExamples();
-		boolean success = true;
-		for(int i=0;i<examples.length; i++) {
-			ComparisonExample ce = examples[i];
-			success &= confirmRoundTrip(i, ce.getA());
-			success &= confirmRoundTrip(i, ce.getNegA());
-			success &= confirmRoundTrip(i, ce.getB());
-			success &= confirmRoundTrip(i, ce.getNegB());
-		}
-		
-		assertTrue("One or more cases failed.  See stderr", success);
-	}
-
-	private boolean confirmRoundTrip(int i, double a) {
-		return TestExpandedDouble.confirmRoundTrip(i, Double.doubleToLongBits(a));
-	}
-
-	/**
-	 * The actual example from bug 47598
-	 */
-	@Test
-	public void testSpecificExampleA() {
-		double a = 0.06-0.01;
-		double b = 0.05;
-		assertFalse(a == b);
-		assertEquals(0, NumberComparer.compare(a, b));
-	}
-
-	/**
-	 * The example from the nabble posting
-	 */
-	@Test
-	public void testSpecificExampleB() {
-		double a = 1+1.0028-0.9973;
-		double b = 1.0055;
-		assertFalse(a == b);
-		assertEquals(0, NumberComparer.compare(a, b));
-	}
-
-	private static boolean confirm(int i, double a, double b, int expRes) {
-		int actRes = NumberComparer.compare(a, b);
-
-		int sgnActRes = actRes < 0 ? -1 : actRes > 0 ? +1 : 0;
-		if (sgnActRes != expRes) {
-			System.err.println("Mismatch example[" + i + "] ("
-					+ formatDoubleAsHex(a) + ", " + formatDoubleAsHex(b) + ") expected "
-					+ expRes + " but got " + sgnActRes);
-			return false;
-		}
-		return true;
-	}
-	private static String formatDoubleAsHex(double d) {
-		long l = Double.doubleToLongBits(d);
-		return HexDump.longToHex(l)+'L';
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java b/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java
deleted file mode 100644
index f33ece4..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.ComparisonFailure;
-import junit.framework.TestCase;
-
-import java.util.Locale;
-
-import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.ss.formula.constant.ConstantValueParser;
-import org.apache.poi.ss.formula.ptg.NumberPtg;
-import org.apache.poi.ss.util.NumberToTextConversionExamples.ExampleConversion;
-/**
- * Tests for {@link NumberToTextConverter}
- * 
- * @author Josh Micich
- */
-public final class TestNumberToTextConverter extends TestCase {
-	
-
-	/**
-	 * Confirms that <tt>ExcelNumberToTextConverter.toText(d)</tt> produces the right results.
-	 * As part of preparing this test class, the <tt>ExampleConversion</tt> instances should be set
-	 * up to contain the rendering as produced by Excel.
-	 */
-	public void testAll() {
-		int failureCount = 0;
-		
-		ExampleConversion[] examples = NumberToTextConversionExamples.getExampleConversions();
-
-		for (int i = 0; i < examples.length; i++) {
-			ExampleConversion example = examples[i];
-			try {
-				if (example.isNaN()) {
-					confirmNaN(example.getRawDoubleBits(), example.getExcelRendering());
-					continue;
-				}
-				String actual = NumberToTextConverter.toText(example.getDoubleValue());
-				if (!example.getExcelRendering().equals(actual)) {
-					failureCount++;
-					String msg = "Error rendering for examples[" + i + "] "
-							+ formatExample(example) + " "
-							+ " bad-result='" + actual + "' "
-							+ new ComparisonFailure(null, example.getExcelRendering(), actual).getMessage();
-					System.err.println(msg);
-					continue;
-				}
-			} catch (RuntimeException e) {
-				failureCount++;
-				System.err.println("Error in excel rendering for examples[" + i + "] "
-						+ formatExample(example) + "':" + e.getMessage());
-				e.printStackTrace();
-			}
-		}
-		if (failureCount > 0) {
-			throw new AssertionFailedError(failureCount 
-					+ " error(s) in excel number to text conversion (see std-err)");
-		}
-	}
-
-	private static String formatExample(ExampleConversion example) {
-		String hexLong = Long.toHexString(example.getRawDoubleBits()).toUpperCase(Locale.ROOT);
-		String longRep = "0x" + "0000000000000000".substring(hexLong.length()) + hexLong+ "L";  
-		return "ec(" + longRep + ", \"" + example.getJavaRendering() + "\", \"" + example.getExcelRendering() + "\")";
-	}
-
-	/**
-	 * Excel's abnormal rendering of NaNs is both difficult to test and even reproduce in java. In
-	 * general, Excel does not attempt to use raw NaN in the IEEE sense. In {@link FormulaRecord}s,
-	 * Excel uses the NaN bit pattern to flag non-numeric (text, boolean, error) cached results.
-	 * If the formula result actually evaluates to raw NaN, Excel transforms it to <i>#NUM!</i>.
-	 * In other places (e.g. {@link NumberRecord}, {@link NumberPtg}, array items (via {@link 
-	 * ConstantValueParser}), there seems to be no special NaN translation scheme.  If a NaN bit 
-	 * pattern is somehow encoded into any of these places Excel actually attempts to render the 
-	 * values as a plain number. That is the unusual functionality that this method is testing.<p/>   
-	 * 
-	 * There are multiple encodings (bit patterns) for NaN, and CPUs and applications can convert
-	 * to a preferred NaN encoding  (Java prefers <tt>0x7FF8000000000000L</tt>).  Besides the 
-	 * special encoding in {@link FormulaRecord.SpecialCachedValue}, it is not known how/whether 
-	 * Excel attempts to encode NaN values.
-	 * 
-	 * Observed NaN behaviour on HotSpot/Windows:
-	 * <tt>Double.longBitsToDouble()</tt> will set one bit 51 (the NaN signaling flag) if it isn't
-	 *  already. <tt>Double.doubleToLongBits()</tt> will return a double with bit pattern 
-	 *  <tt>0x7FF8000000000000L</tt> for any NaN bit pattern supplied.<br/>
-	 * Differences are likely to be observed with other architectures.<p/>
-	 *  
-	 * <p/>
-	 * The few test case examples calling this method represent functionality which may not be 
-	 * important for POI to support.
-	 */
-	private void confirmNaN(long l, String excelRep) {
-		double d = Double.longBitsToDouble(l);
-		assertEquals("NaN", Double.toString(d));
-		
-		String strExcel = NumberToTextConverter.rawDoubleBitsToText(l);
-		
-		assertEquals(excelRep, strExcel);
-	}
-	
-	public void testSimpleRendering_bug56156() {
-		double dResult = 0.05+0.01; // values chosen to produce rounding anomaly
-		String actualText = NumberToTextConverter.toText(dResult);
-		String jdkText = Double.toString(dResult);
-		if (jdkText.equals(actualText)) {
-			// "0.060000000000000005"
-			throw new AssertionFailedError("Should not use default JDK IEEE double rendering");
-		}
-		assertEquals("0.06", actualText);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java b/trunk/src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java
deleted file mode 100644
index 6325c65..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java
+++ /dev/null
@@ -1,949 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.BorderExtent;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
-
-/**
- * Tests Spreadsheet PropertyTemplate
- *
- * @see org.apache.poi.ss.util.PropertyTemplate
- */
-public final class TestPropertyTemplate {
-    @Test
-    public void getNumBorders() throws IOException {
-        CellRangeAddress a1 = new CellRangeAddress(0, 0, 0, 0);
-        PropertyTemplate pt = new PropertyTemplate();
-        pt.drawBorders(a1, BorderStyle.THIN, BorderExtent.TOP);
-        assertEquals(1, pt.getNumBorders(0, 0));
-        pt.drawBorders(a1, BorderStyle.MEDIUM, BorderExtent.BOTTOM);
-        assertEquals(2, pt.getNumBorders(0, 0));
-        pt.drawBorders(a1, BorderStyle.MEDIUM, BorderExtent.NONE);
-        assertEquals(0, pt.getNumBorders(0, 0));
-    }
-
-    @Test
-    public void getNumBorderColors() throws IOException {
-        CellRangeAddress a1 = new CellRangeAddress(0, 0, 0, 0);
-        PropertyTemplate pt = new PropertyTemplate();
-        pt.drawBorderColors(a1, IndexedColors.RED.getIndex(), BorderExtent.TOP);
-        assertEquals(1, pt.getNumBorderColors(0, 0));
-        pt.drawBorderColors(a1, IndexedColors.RED.getIndex(), BorderExtent.BOTTOM);
-        assertEquals(2, pt.getNumBorderColors(0, 0));
-        pt.drawBorderColors(a1, IndexedColors.RED.getIndex(), BorderExtent.NONE);
-        assertEquals(0, pt.getNumBorderColors(0, 0));
-    }
-
-    @Test
-    public void getTemplateProperties() throws IOException {
-        CellRangeAddress a1 = new CellRangeAddress(0, 0, 0, 0);
-        PropertyTemplate pt = new PropertyTemplate();
-        pt.drawBorders(a1, BorderStyle.THIN, BorderExtent.TOP);
-        assertEquals(BorderStyle.THIN,
-                pt.getBorderStyle(0, 0, CellUtil.BORDER_TOP));
-        pt.drawBorders(a1, BorderStyle.MEDIUM, BorderExtent.BOTTOM);
-        assertEquals(BorderStyle.MEDIUM,
-                pt.getBorderStyle(0, 0, CellUtil.BORDER_BOTTOM));
-        pt.drawBorderColors(a1, IndexedColors.RED.getIndex(), BorderExtent.TOP);
-        assertEquals(IndexedColors.RED.getIndex(),
-                pt.getTemplateProperty(0, 0, CellUtil.TOP_BORDER_COLOR));
-        pt.drawBorderColors(a1, IndexedColors.BLUE.getIndex(), BorderExtent.BOTTOM);
-        assertEquals(IndexedColors.BLUE.getIndex(),
-                pt.getTemplateProperty(0, 0, CellUtil.BOTTOM_BORDER_COLOR));
-    }
-
-    @Test
-    public void drawBorders() throws IOException {
-        CellRangeAddress a1c3 = new CellRangeAddress(0, 2, 0, 2);
-        PropertyTemplate pt = new PropertyTemplate();
-        pt.drawBorders(a1c3, BorderStyle.THIN,
-                BorderExtent.ALL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt.getNumBorders(i, j));
-                assertEquals(BorderStyle.THIN,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                assertEquals(BorderStyle.THIN,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-                assertEquals(BorderStyle.THIN,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                assertEquals(BorderStyle.THIN,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.OUTSIDE);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt.getNumBorders(i, j));
-                if (i == 0) {
-                    if (j == 0) {
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    } else if (j == 2) {
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    } else {
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    }
-                } else if (i == 2) {
-                    if (j == 0) {
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    } else if (j == 2) {
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    } else {
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    }
-                } else {
-                    if (j == 0) {
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    } else if (j == 2) {
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.MEDIUM,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    } else {
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_TOP));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_BOTTOM));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_LEFT));
-                        assertEquals(BorderStyle.THIN,
-                                pt.getBorderStyle(i, j,
-                                        CellUtil.BORDER_RIGHT));
-                    }
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(0, pt.getNumBorders(i, j));
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.TOP);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.BOTTOM);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.LEFT);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.RIGHT);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.HORIZONTAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(2, pt.getNumBorders(i, j));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.INSIDE_HORIZONTAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-                } else if (i == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                } else {
-                    assertEquals(2, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.OUTSIDE_HORIZONTAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                } else if (i == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.VERTICAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(2, pt.getNumBorders(i, j));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.INSIDE_VERTICAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-                } else if (j == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                } else {
-                    assertEquals(2, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM,
-                BorderExtent.OUTSIDE_VERTICAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM,
-                            pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                } else if (j == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(BorderStyle.MEDIUM, pt
-                            .getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                }
-            }
-        }
-    }
-
-    @Test
-    public void drawBorderColors() throws IOException {
-        CellRangeAddress a1c3 = new CellRangeAddress(0, 2, 0, 2);
-        PropertyTemplate pt = new PropertyTemplate();
-        pt.drawBorderColors(a1c3, IndexedColors.RED.getIndex(),
-                BorderExtent.ALL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt.getNumBorders(i, j));
-                assertEquals(4, pt.getNumBorderColors(i, j));
-                assertEquals(IndexedColors.RED.getIndex(), pt
-                        .getTemplateProperty(i, j, CellUtil.TOP_BORDER_COLOR));
-                assertEquals(IndexedColors.RED.getIndex(),
-                        pt.getTemplateProperty(i, j,
-                                CellUtil.BOTTOM_BORDER_COLOR));
-                assertEquals(IndexedColors.RED.getIndex(), pt
-                        .getTemplateProperty(i, j, CellUtil.LEFT_BORDER_COLOR));
-                assertEquals(IndexedColors.RED.getIndex(),
-                        pt.getTemplateProperty(i, j,
-                                CellUtil.RIGHT_BORDER_COLOR));
-            }
-        }
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.OUTSIDE);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt.getNumBorders(i, j));
-                assertEquals(4, pt.getNumBorderColors(i, j));
-                if (i == 0) {
-                    if (j == 0) {
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    } else if (j == 2) {
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    } else {
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    }
-                } else if (i == 2) {
-                    if (j == 0) {
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    } else if (j == 2) {
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    } else {
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    }
-                } else {
-                    if (j == 0) {
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    } else if (j == 2) {
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.BLUE.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    } else {
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.TOP_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.BOTTOM_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.LEFT_BORDER_COLOR));
-                        assertEquals(IndexedColors.RED.getIndex(),
-                                pt.getTemplateProperty(i, j,
-                                        CellUtil.RIGHT_BORDER_COLOR));
-                    }
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(0, pt.getNumBorders(i, j));
-                assertEquals(0, pt.getNumBorderColors(i, j));
-            }
-        }
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.TOP);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.TOP_BORDER_COLOR));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                    assertEquals(0, pt.getNumBorderColors(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.BOTTOM);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.BOTTOM_BORDER_COLOR));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                    assertEquals(0, pt.getNumBorderColors(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.LEFT);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.LEFT_BORDER_COLOR));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                    assertEquals(0, pt.getNumBorderColors(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.RIGHT);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.RIGHT_BORDER_COLOR));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                    assertEquals(0, pt.getNumBorderColors(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.HORIZONTAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(2, pt.getNumBorders(i, j));
-                assertEquals(2, pt.getNumBorderColors(i, j));
-                assertEquals(IndexedColors.BLUE.getIndex(), pt
-                        .getTemplateProperty(i, j, CellUtil.TOP_BORDER_COLOR));
-                assertEquals(IndexedColors.BLUE.getIndex(),
-                        pt.getTemplateProperty(i, j,
-                                CellUtil.BOTTOM_BORDER_COLOR));
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.INSIDE_HORIZONTAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.BOTTOM_BORDER_COLOR));
-                } else if (i == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.TOP_BORDER_COLOR));
-                } else {
-                    assertEquals(2, pt.getNumBorders(i, j));
-                    assertEquals(2, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.TOP_BORDER_COLOR));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.BOTTOM_BORDER_COLOR));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.OUTSIDE_HORIZONTAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (i == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.TOP_BORDER_COLOR));
-                } else if (i == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.BOTTOM_BORDER_COLOR));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                    assertEquals(0, pt.getNumBorderColors(i, j));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.VERTICAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(2, pt.getNumBorders(i, j));
-                assertEquals(2, pt.getNumBorderColors(i, j));
-                assertEquals(IndexedColors.BLUE.getIndex(), pt
-                        .getTemplateProperty(i, j, CellUtil.LEFT_BORDER_COLOR));
-                assertEquals(IndexedColors.BLUE.getIndex(),
-                        pt.getTemplateProperty(i, j,
-                                CellUtil.RIGHT_BORDER_COLOR));
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.INSIDE_VERTICAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.RIGHT_BORDER_COLOR));
-                } else if (j == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.LEFT_BORDER_COLOR));
-                } else {
-                    assertEquals(2, pt.getNumBorders(i, j));
-                    assertEquals(2, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.LEFT_BORDER_COLOR));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.RIGHT_BORDER_COLOR));
-                }
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE,
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.AUTOMATIC.getIndex(),
-                BorderExtent.NONE);
-        pt.drawBorderColors(a1c3, IndexedColors.BLUE.getIndex(),
-                BorderExtent.OUTSIDE_VERTICAL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                if (j == 0) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.LEFT_BORDER_COLOR));
-                } else if (j == 2) {
-                    assertEquals(1, pt.getNumBorders(i, j));
-                    assertEquals(1, pt.getNumBorderColors(i, j));
-                    assertEquals(IndexedColors.BLUE.getIndex(),
-                            pt.getTemplateProperty(i, j,
-                                    CellUtil.RIGHT_BORDER_COLOR));
-                } else {
-                    assertEquals(0, pt.getNumBorders(i, j));
-                    assertEquals(0, pt.getNumBorderColors(i, j));
-                }
-            }
-        }
-    }
-    
-    @Test
-    public void drawBordersWithColors() throws IOException {
-        CellRangeAddress a1c3 = new CellRangeAddress(0, 2, 0, 2);
-        PropertyTemplate pt = new PropertyTemplate();
-        
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM, IndexedColors.RED.getIndex(), BorderExtent.ALL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt.getNumBorders(i, j));
-                assertEquals(4, pt.getNumBorderColors(i, j));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                assertEquals(BorderStyle.MEDIUM,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-                assertEquals(IndexedColors.RED.getIndex(), pt
-                        .getTemplateProperty(i, j, CellUtil.TOP_BORDER_COLOR));
-                assertEquals(IndexedColors.RED.getIndex(),
-                        pt.getTemplateProperty(i, j,
-                                CellUtil.BOTTOM_BORDER_COLOR));
-                assertEquals(IndexedColors.RED.getIndex(), pt
-                        .getTemplateProperty(i, j, CellUtil.LEFT_BORDER_COLOR));
-                assertEquals(IndexedColors.RED.getIndex(),
-                        pt.getTemplateProperty(i, j,
-                                CellUtil.RIGHT_BORDER_COLOR));
-            }
-        }
-        pt.drawBorders(a1c3, BorderStyle.NONE, BorderExtent.NONE);
-        pt.drawBorders(a1c3, BorderStyle.NONE, IndexedColors.RED.getIndex(), BorderExtent.ALL);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt.getNumBorders(i, j));
-                assertEquals(0, pt.getNumBorderColors(i, j));
-                assertEquals(BorderStyle.NONE,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_TOP));
-                assertEquals(BorderStyle.NONE,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_BOTTOM));
-                assertEquals(BorderStyle.NONE,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_LEFT));
-                assertEquals(BorderStyle.NONE,
-                        pt.getBorderStyle(i, j, CellUtil.BORDER_RIGHT));
-            }
-        }
-    }
-
-    @Test
-    public void applyBorders() throws IOException {
-        CellRangeAddress a1c3 = new CellRangeAddress(0, 2, 0, 2);
-        CellRangeAddress b2 = new CellRangeAddress(1, 1, 1, 1);
-        PropertyTemplate pt = new PropertyTemplate();
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        
-        pt.drawBorders(a1c3, BorderStyle.THIN, IndexedColors.RED.getIndex(), BorderExtent.ALL);
-        pt.applyBorders(sheet);
-        
-        for (Row row: sheet) {
-            for (Cell cell: row) {
-                CellStyle cs = cell.getCellStyle();
-                assertEquals(BorderStyle.THIN, cs.getBorderTopEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getTopBorderColor());
-                assertEquals(BorderStyle.THIN, cs.getBorderBottomEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getBottomBorderColor());
-                assertEquals(BorderStyle.THIN, cs.getBorderLeftEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getLeftBorderColor());
-                assertEquals(BorderStyle.THIN, cs.getBorderRightEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getRightBorderColor());
-            }
-        }
-        
-        pt.drawBorders(b2, BorderStyle.NONE, BorderExtent.ALL);
-        pt.applyBorders(sheet);
-        
-        for (Row row: sheet) {
-            for (Cell cell: row) {
-                CellStyle cs = cell.getCellStyle();
-                if (cell.getColumnIndex() != 1 || row.getRowNum() == 0) {
-                assertEquals(BorderStyle.THIN, cs.getBorderTopEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getTopBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderTopEnum());
-                }
-                if (cell.getColumnIndex() != 1 || row.getRowNum() == 2) {
-                assertEquals(BorderStyle.THIN, cs.getBorderBottomEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getBottomBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderBottomEnum());
-                }
-                if (cell.getColumnIndex() == 0 || row.getRowNum() != 1) {
-                assertEquals(BorderStyle.THIN, cs.getBorderLeftEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getLeftBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderLeftEnum());
-                }
-                if (cell.getColumnIndex() == 2 || row.getRowNum() != 1) {
-                assertEquals(BorderStyle.THIN, cs.getBorderRightEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getRightBorderColor());
-                } else {
-                    assertEquals(BorderStyle.NONE, cs.getBorderRightEnum());
-                }
-            }
-        }
-        
-        wb.close();
-    }
-    
-    @Test
-    public void clonePropertyTemplate() throws IOException {
-        CellRangeAddress a1c3 = new CellRangeAddress(0, 2, 0, 2);
-        PropertyTemplate pt = new PropertyTemplate();
-        pt.drawBorders(a1c3, BorderStyle.MEDIUM, IndexedColors.RED.getIndex(), BorderExtent.ALL);
-        PropertyTemplate pt2 = new PropertyTemplate(pt);
-        assertNotSame(pt2, pt);
-        for (int i = 0; i <= 2; i++) {
-            for (int j = 0; j <= 2; j++) {
-                assertEquals(4, pt2.getNumBorderColors(i, j));
-                assertEquals(4, pt2.getNumBorderColors(i, j));
-            }
-        }
-        
-        CellRangeAddress b2 = new CellRangeAddress(1,1,1,1);
-        pt2.drawBorders(b2, BorderStyle.THIN, BorderExtent.ALL);
-        
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        pt.applyBorders(sheet);
-        
-        for (Row row : sheet) {
-            for (Cell cell : row) {
-                CellStyle cs = cell.getCellStyle();
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderTopEnum());
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderBottomEnum());
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderLeftEnum());
-                assertEquals(BorderStyle.MEDIUM, cs.getBorderRightEnum());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getTopBorderColor());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getBottomBorderColor());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getLeftBorderColor());
-                assertEquals(IndexedColors.RED.getIndex(), cs.getRightBorderColor());
-            }
-        }
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestRegionUtil.java b/trunk/src/testcases/org/apache/poi/ss/util/TestRegionUtil.java
deleted file mode 100644
index 13fad63..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestRegionUtil.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import static org.junit.Assert.*;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-
-/**
- * Tests that the common RegionUtil works as we need it to.
- */
-public final class TestRegionUtil {
-    private static final CellRangeAddress A1C3 = new CellRangeAddress(0, 2, 0, 2);
-    private static final BorderStyle NONE = BorderStyle.NONE;
-    private static final BorderStyle THIN = BorderStyle.THIN;
-    private static final int RED = IndexedColors.RED.getIndex();
-    private static final int DEFAULT_COLOR = 0;
-    private Workbook wb;
-    private Sheet sheet;
-    
-    @Before
-    public void setUp() {
-        wb = new HSSFWorkbook();
-        sheet = wb.createSheet();
-    }
-    
-    @After
-    public void tearDown() throws IOException {
-        wb.close();
-    }
-    
-    private CellStyle getCellStyle(int rowIndex, int columnIndex) {
-        Row row = sheet.getRow(rowIndex);
-        if (row == null) row = sheet.createRow(rowIndex);
-        Cell cell = row.getCell(columnIndex);
-        if (cell == null) cell = row.createCell(columnIndex);
-        return cell.getCellStyle();
-    }
-    
-    @Test
-    public void setBorderTop() {
-        assertEquals(NONE, getCellStyle(0, 0).getBorderTopEnum());
-        assertEquals(NONE, getCellStyle(0, 1).getBorderTopEnum());
-        assertEquals(NONE, getCellStyle(0, 2).getBorderTopEnum());
-        RegionUtil.setBorderTop(THIN, A1C3, sheet);
-        assertEquals(THIN, getCellStyle(0, 0).getBorderTopEnum());
-        assertEquals(THIN, getCellStyle(0, 1).getBorderTopEnum());
-        assertEquals(THIN, getCellStyle(0, 2).getBorderTopEnum());
-    }
-    @Test
-    public void setBorderBottom() {
-        assertEquals(NONE, getCellStyle(2, 0).getBorderBottomEnum());
-        assertEquals(NONE, getCellStyle(2, 1).getBorderBottomEnum());
-        assertEquals(NONE, getCellStyle(2, 2).getBorderBottomEnum());
-        RegionUtil.setBorderBottom(THIN, A1C3, sheet);
-        assertEquals(THIN, getCellStyle(2, 0).getBorderBottomEnum());
-        assertEquals(THIN, getCellStyle(2, 1).getBorderBottomEnum());
-        assertEquals(THIN, getCellStyle(2, 2).getBorderBottomEnum());
-    }
-    @Test
-    public void setBorderRight() {
-        assertEquals(NONE, getCellStyle(0, 2).getBorderRightEnum());
-        assertEquals(NONE, getCellStyle(1, 2).getBorderRightEnum());
-        assertEquals(NONE, getCellStyle(2, 2).getBorderRightEnum());
-        RegionUtil.setBorderRight(THIN, A1C3, sheet);
-        assertEquals(THIN, getCellStyle(0, 2).getBorderRightEnum());
-        assertEquals(THIN, getCellStyle(1, 2).getBorderRightEnum());
-        assertEquals(THIN, getCellStyle(2, 2).getBorderRightEnum());
-    }
-    @Test
-    public void setBorderLeft() {
-        assertEquals(NONE, getCellStyle(0, 0).getBorderLeftEnum());
-        assertEquals(NONE, getCellStyle(1, 0).getBorderLeftEnum());
-        assertEquals(NONE, getCellStyle(2, 0).getBorderLeftEnum());
-        RegionUtil.setBorderLeft(THIN, A1C3, sheet);
-        assertEquals(THIN, getCellStyle(0, 0).getBorderLeftEnum());
-        assertEquals(THIN, getCellStyle(1, 0).getBorderLeftEnum());
-        assertEquals(THIN, getCellStyle(2, 0).getBorderLeftEnum());
-    }
-    
-    @Test
-    public void setTopBorderColor() {
-        assertEquals(DEFAULT_COLOR, getCellStyle(0, 0).getTopBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(0, 1).getTopBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(0, 2).getTopBorderColor());
-        RegionUtil.setTopBorderColor(RED, A1C3, sheet);
-        assertEquals(RED, getCellStyle(0, 0).getTopBorderColor());
-        assertEquals(RED, getCellStyle(0, 1).getTopBorderColor());
-        assertEquals(RED, getCellStyle(0, 2).getTopBorderColor());
-    }
-    @Test
-    public void setBottomBorderColor() {
-        assertEquals(DEFAULT_COLOR, getCellStyle(2, 0).getBottomBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(2, 1).getBottomBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(2, 2).getBottomBorderColor());
-        RegionUtil.setBottomBorderColor(RED, A1C3, sheet);
-        assertEquals(RED, getCellStyle(2, 0).getBottomBorderColor());
-        assertEquals(RED, getCellStyle(2, 1).getBottomBorderColor());
-        assertEquals(RED, getCellStyle(2, 2).getBottomBorderColor());
-    }
-    @Test
-    public void setRightBorderColor() {
-        assertEquals(DEFAULT_COLOR, getCellStyle(0, 2).getRightBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(1, 2).getRightBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(2, 2).getRightBorderColor());
-        RegionUtil.setRightBorderColor(RED, A1C3, sheet);
-        assertEquals(RED, getCellStyle(0, 2).getRightBorderColor());
-        assertEquals(RED, getCellStyle(1, 2).getRightBorderColor());
-        assertEquals(RED, getCellStyle(2, 2).getRightBorderColor());
-    }
-    @Test
-    public void setLeftBorderColor() {
-        assertEquals(DEFAULT_COLOR, getCellStyle(0, 0).getLeftBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(1, 0).getLeftBorderColor());
-        assertEquals(DEFAULT_COLOR, getCellStyle(2, 0).getLeftBorderColor());
-        RegionUtil.setLeftBorderColor(RED, A1C3, sheet);
-        assertEquals(RED, getCellStyle(0, 0).getLeftBorderColor());
-        assertEquals(RED, getCellStyle(1, 0).getLeftBorderColor());
-        assertEquals(RED, getCellStyle(2, 0).getLeftBorderColor());
-    }
-    
-    @Test
-    public void bordersCanBeAddedToNonExistantCells() {
-        RegionUtil.setBorderTop(THIN, A1C3, sheet);
-        assertEquals(THIN, getCellStyle(0, 0).getBorderTopEnum());
-        assertEquals(THIN, getCellStyle(0, 1).getBorderTopEnum());
-        assertEquals(THIN, getCellStyle(0, 2).getBorderTopEnum());
-    }
-    @Test
-    public void borderColorsCanBeAddedToNonExistantCells() {
-        RegionUtil.setTopBorderColor(RED, A1C3, sheet);
-        assertEquals(RED, getCellStyle(0, 0).getTopBorderColor());
-        assertEquals(RED, getCellStyle(0, 1).getTopBorderColor());
-        assertEquals(RED, getCellStyle(0, 2).getTopBorderColor());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java b/trunk/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java
deleted file mode 100644
index d081db0..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.util.Date;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-import junit.framework.TestCase;
-
-/**
- * Tests SheetBuilder.
- *
- * @see org.apache.poi.ss.util.SheetBuilder
- */
-public final class TestSheetBuilder extends TestCase {
-
-    private static Object[][] testData = new Object[][]{
-            {1, 2, 3},
-            {new Date(), null, null},
-            {"one", "two", "=A1+B2"}
-    };
-
-    public void testNotCreateEmptyCells() {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, testData).build();
-
-        assertEquals(sheet.getPhysicalNumberOfRows(), 3);
-
-        Row firstRow = sheet.getRow(0);
-        Cell firstCell = firstRow.getCell(0);
-
-        assertEquals(firstCell.getCellTypeEnum(), CellType.NUMERIC);
-        assertEquals(1.0, firstCell.getNumericCellValue(), 0.00001);
-
-
-        Row secondRow = sheet.getRow(1);
-        assertNotNull(secondRow.getCell(0));
-        assertNull(secondRow.getCell(2));
-
-        Row thirdRow = sheet.getRow(2);
-        assertEquals(CellType.STRING, thirdRow.getCell(0).getCellTypeEnum());
-        String cellValue = thirdRow.getCell(0).getStringCellValue();
-        assertEquals(testData[2][0].toString(), cellValue);
-
-        assertEquals(CellType.FORMULA, thirdRow.getCell(2).getCellTypeEnum());
-        assertEquals("A1+B2", thirdRow.getCell(2).getCellFormula());
-    }
-
-    public void testEmptyCells() {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, testData).setCreateEmptyCells(true).build();
-
-        Cell emptyCell = sheet.getRow(1).getCell(1);
-        assertNotNull(emptyCell);
-        assertEquals(CellType.BLANK, emptyCell.getCellTypeEnum());
-    }
-
-    public void testSheetName() {
-        final String sheetName = "TEST SHEET NAME";
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = new SheetBuilder(wb, testData).setSheetName(sheetName).build();
-        assertEquals(sheetName, sheet.getSheetName());
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java b/trunk/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java
deleted file mode 100644
index e1c7884..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import java.io.IOException;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-import junit.framework.TestCase;
-
-/**
- * Tests SheetUtil.
- *
- * @see org.apache.poi.ss.util.SheetUtil
- */
-public final class TestSheetUtil extends TestCase {
-    public void testCellWithMerges() throws Exception {
-        Workbook wb = new HSSFWorkbook();
-        Sheet s = wb.createSheet();
-        
-        // Create some test data
-        Row r2 = s.createRow(1);
-        r2.createCell(0).setCellValue(10);
-        r2.createCell(1).setCellValue(11);
-        Row r3 = s.createRow(2);
-        r3.createCell(0).setCellValue(20);
-        r3.createCell(1).setCellValue(21);
-        
-        s.addMergedRegion(new CellRangeAddress(2, 3, 0, 0));
-        s.addMergedRegion(new CellRangeAddress(2, 2, 1, 4));
-        
-        // With a cell that isn't defined, we'll get null
-        assertEquals(null, SheetUtil.getCellWithMerges(s, 0, 0));
-        
-        // With a cell that's not in a merged region, we'll get that
-        assertEquals(10.0, SheetUtil.getCellWithMerges(s, 1, 0).getNumericCellValue());
-        assertEquals(11.0, SheetUtil.getCellWithMerges(s, 1, 1).getNumericCellValue());
-        
-        // With a cell that's the primary one of a merged region, we get that cell
-        assertEquals(20.0, SheetUtil.getCellWithMerges(s, 2, 0).getNumericCellValue());
-        assertEquals(21., SheetUtil.getCellWithMerges(s, 2, 1).getNumericCellValue());
-        
-        // With a cell elsewhere in the merged region, get top-left
-        assertEquals(20.0, SheetUtil.getCellWithMerges(s, 3, 0).getNumericCellValue());
-        assertEquals(21.0, SheetUtil.getCellWithMerges(s, 2, 2).getNumericCellValue());
-        assertEquals(21.0, SheetUtil.getCellWithMerges(s, 2, 3).getNumericCellValue());
-        assertEquals(21.0, SheetUtil.getCellWithMerges(s, 2, 4).getNumericCellValue());
-        
-        wb.close();
-    }
-    
-    public void testCanComputeWidthHSSF() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        
-        // cannot check on result because on some machines we get back false here!
-        SheetUtil.canComputeColumnWidth(wb.getFontAt((short)0));
-
-        wb.close();        
-    }
-
-    public void testGetCellWidthEmpty() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet");
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        // no contents: cell.setCellValue("sometext");
-        
-        assertEquals(-1.0, SheetUtil.getCellWidth(cell, 1, null, true));
-        
-        wb.close();
-    }
-
-    public void testGetCellWidthString() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet");
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        cell.setCellValue("sometext");
-        
-        assertTrue(SheetUtil.getCellWidth(cell, 1, null, true) > 0);
-        
-        wb.close();
-    }
-
-    public void testGetCellWidthNumber() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet");
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        cell.setCellValue(88.234);
-        
-        assertTrue(SheetUtil.getCellWidth(cell, 1, null, true) > 0);
-        
-        wb.close();
-    }
-
-    public void testGetCellWidthBoolean() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet");
-        Row row = sheet.createRow(0);
-        Cell cell = row.createCell(0);
-        
-        cell.setCellValue(false);
-        
-        assertTrue(SheetUtil.getCellWidth(cell, 1, null, false) > 0);
-        
-        wb.close();
-    }
-
-    public void testGetColumnWidthString() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("sheet");
-        Row row = sheet.createRow(0);
-        sheet.createRow(1);
-        sheet.createRow(2);
-        Cell cell = row.createCell(0);
-        
-        cell.setCellValue("sometext");
-        
-        assertTrue("Having some width for rows with actual cells", 
-                SheetUtil.getColumnWidth(sheet, 0, true) > 0);
-        assertEquals("Not having any widht for rows with all empty cells", 
-                -1.0, SheetUtil.getColumnWidth(sheet, 0, true, 1, 2));
-        
-        wb.close();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java b/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java
deleted file mode 100644
index 2bd305c..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.ss.util;
-
-import junit.framework.TestCase;
-
-/**
- * Tests WorkbookUtil.
- *
- * @see org.apache.poi.ss.util.WorkbookUtil
- */
-public final class TestWorkbookUtil extends TestCase {
-	/**
-	 * borrowed test cases from 
-	 * {@link org.apache.poi.hssf.record.TestBoundSheetRecord#testValidNames()}
-	 */
-	public void testCreateSafeNames() {
-		
-		String p = "Sheet1";
-		String actual = WorkbookUtil.createSafeSheetName(p);
-		assertEquals(p, actual);
-		
-		p = "O'Brien's sales";
-		actual = WorkbookUtil.createSafeSheetName(p);
-		assertEquals(p, actual);
-		
-		p = " data # ";
-		actual = WorkbookUtil.createSafeSheetName(p);
-		assertEquals(p, actual);
-		
-		p = "data $1.00";
-		actual = WorkbookUtil.createSafeSheetName(p);
-		assertEquals(p, actual);
-		
-		// now the replaced versions ...
-		actual = WorkbookUtil.createSafeSheetName("data?");
-		assertEquals("data ", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("abc/def");
-		assertEquals("abc def", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("data[0]");
-		assertEquals("data 0 ", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("data*");
-		assertEquals("data ", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("abc\\def");
-		assertEquals("abc def", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("'data");
-		assertEquals(" data", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("data'");
-		assertEquals("data ", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("d'at'a");
-		assertEquals("d'at'a", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName(null);
-		assertEquals("null", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("");
-		assertEquals("empty", actual);
-		
-		actual = WorkbookUtil.createSafeSheetName("1234567890123456789012345678901TOOLONG");
-		assertEquals("1234567890123456789012345678901", actual);
-
-        actual = WorkbookUtil.createSafeSheetName("sheet:a4");
-        assertEquals("sheet a4", actual);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java b/trunk/src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
deleted file mode 100644
index d3adcce..0000000
--- a/trunk/src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-   
-   http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ==================================================================== */
-package org.apache.poi.ss.util.cellwalk;
-
-import junit.framework.TestCase;
-
-import java.util.Date;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.SheetBuilder;
-
-public class TestCellWalk extends TestCase {
-
-    private static Object[][] testData = new Object[][] {
-	{   1,          2,  null},
-	{null, new Date(),  null},
-	{null,       null, "str"}
-    };
-
-    private final CountCellHandler countCellHandler = new CountCellHandler();
-
-    public void testNotTraverseEmptyCells() {
-	Workbook wb = new HSSFWorkbook();
-	Sheet sheet = new SheetBuilder(wb, testData).build();
-	CellRangeAddress range = CellRangeAddress.valueOf("A1:C3");
-	
-	CellWalk cellWalk = new CellWalk(sheet, range);
-	countCellHandler.reset();
-	cellWalk.traverse(countCellHandler);
-
-	assertEquals(4, countCellHandler.getVisitedCellsNumber());
-	/* 1 + 2 + 5 + 9 */
-	assertEquals(17L, countCellHandler.getOrdinalNumberSum());
-    }
-
-
-    private static class CountCellHandler implements CellHandler {
-
-	private int cellsVisited = 0;
-	private long ordinalNumberSum = 0L;
-
-	@Override
-    public void onCell(Cell cell, CellWalkContext ctx) {
-	    ++cellsVisited;
-	    ordinalNumberSum += ctx.getOrdinalNumber();
-	}
-
-	public int getVisitedCellsNumber() {
-	    return cellsVisited;
-	}
-
-	public long getOrdinalNumberSum() {
-	    return ordinalNumberSum;
-	}
-
-	public void reset() {
-	    cellsVisited = 0;
-	    ordinalNumberSum = 0L;
-	}
-    }
-}
\ No newline at end of file
diff --git a/trunk/src/testcases/org/apache/poi/util/AllPOIUtilTests.java b/trunk/src/testcases/org/apache/poi/util/AllPOIUtilTests.java
deleted file mode 100644
index f018b02..0000000
--- a/trunk/src/testcases/org/apache/poi/util/AllPOIUtilTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Test suite for all sub-packages of org.apache.poi.util<br/>
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-      TestArrayUtil.class
-    , TestBitField.class
-    , TestByteField.class
-    , TestHexDump.class
-    , TestIntegerField.class
-    , TestIntList.class
-    , TestLittleEndian.class
-    , TestLongField.class
-    , TestPOILogFactory.class
-    , TestPOILogger.class
-    , TestShortField.class
-    , TestStringUtil.class
-    , TestTempFile.class
-})
-public final class AllPOIUtilTests {
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java b/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java
deleted file mode 100644
index 7da48ce..0000000
--- a/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * POILogger which logs into an ArrayList, so that 
- *  tests can see what got logged
- */
-@Internal
-public class DummyPOILogger extends POILogger {
-	public List<String>logged = new ArrayList<String>(); 
-
-	public void reset() {
-		logged = new ArrayList<String>();
-	}
-	
-    @Override
-	public boolean check(int level) {
-		return true;
-	}
-
-    @Override
-	public void initialize(String cat) {}
-
-    @Override
-	protected void _log(int level, Object obj1) {
-		logged.add(level + " - " + obj1);
-	}
-
-    @Override
-	protected void _log(int level, Object obj1, Throwable exception) {
-		logged.add(level + " - " + obj1 + " - " + exception);
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/LocalTestNode.java b/trunk/src/testcases/org/apache/poi/util/LocalTestNode.java
deleted file mode 100644
index fd56c14..0000000
--- a/trunk/src/testcases/org/apache/poi/util/LocalTestNode.java
+++ /dev/null
@@ -1,127 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-class LocalTestNode
-    implements Comparable
-{
-    private Comparable _key;
-    private Comparable _value;
-
-    /**
-     * construct a LocalTestNode
-     *
-     * @param key value used to create the key and value
-     */
-
-    LocalTestNode(final int key)
-    {
-        _key   = Integer.valueOf(key);
-        _value = String.valueOf(key);
-    }
-
-    /**
-     * @param key the unique key associated with the current node.
-     */
-
-    void setKey(Comparable key)
-    {
-        _key = key;
-    }
-
-    /**
-     * @return the unique key associated with the current node
-     */
-
-    Comparable getKey()
-    {
-        return _key;
-    }
-
-    /**
-     * @param value the unique value associated with the current node.
-     */
-
-    void setValue(Comparable value)
-    {
-        _value = value;
-    }
-
-    /**
-     * @return the unique value associated with the current node
-     */
-
-    Comparable getValue()
-    {
-        return _value;
-    }
-
-    /**
-     * Method compareTo
-     *
-     * @param o
-     */
-
-    @Override
-    public int compareTo(Object o)
-    {
-        LocalTestNode other = ( LocalTestNode ) o;
-        int           rval  = getKey().compareTo(other.getKey());
-
-        if (rval == 0)
-        {
-            rval = getValue().compareTo(other.getValue());
-        }
-        return rval;
-    }
-
-    /**
-     * Method equals
-     *
-     * @param o
-     *
-     * @return true if equal
-     */
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == null)
-        {
-            return false;
-        }
-        if (!(o.getClass().equals(this.getClass())))
-        {
-            return false;
-        }
-        LocalTestNode node = ( LocalTestNode ) o;
-
-        return (getKey().equals(node.getKey())
-                && getValue().equals(node.getValue()));
-    }
-
-    /**
-     * @return hash code
-     */
-    @Override
-    public int hashCode()
-    {
-        return getKey().hashCode() ^ getValue().hashCode();
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/NullOutputStream.java b/trunk/src/testcases/org/apache/poi/util/NullOutputStream.java
deleted file mode 100644
index ac76123..0000000
--- a/trunk/src/testcases/org/apache/poi/util/NullOutputStream.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.OutputStream;
-
-/**
- * Implementation of an OutputStream which does nothing, used
- * to redirect stdout to avoid spamming the console with output
- */
-public final class NullOutputStream extends OutputStream {
-    public NullOutputStream() {
-    }
-
-    @Override
-    public void write(byte[] b, int off, int len) {
-    }
-
-    @Override
-    public void write(int b) {
-    }
-
-    @Override
-    public void write(byte[] b) {
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestArrayUtil.java b/trunk/src/testcases/org/apache/poi/util/TestArrayUtil.java
deleted file mode 100644
index 2af0481..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestArrayUtil.java
+++ /dev/null
@@ -1,294 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import junit.framework.TestCase;
-
-/**
- * Unit test for ArrayUtil
- *
- * @author Nick Burch
- */
-public class TestArrayUtil extends TestCase {
-	/**
-	 * Test to ensure that our own arraycopy behaves as it should do
-	 */
-	public void testarraycopy() {
-		byte[] bytes = new byte[] { 0x01, 0x02, 0x03, 0x04 };
-
-		// Test copy whole thing
-		byte[] dest = new byte[4];
-		ArrayUtil.arraycopy(bytes, 0, dest, 0, 4);
-
-		assertEquals(dest.length, bytes.length);
-		for(int i=0; i<dest.length; i++) {
-			assertEquals(bytes[i], dest[i]);
-		}
-
-		// ToDo - test exceptions are as expected
-	}
-
-
-	/**
-	 * Helper for testArrayMoveWithin
-	 */
-	private Integer[] getIntsList() {
-		return new Integer[] {
-				Integer.valueOf(0),
-				Integer.valueOf(1),
-				Integer.valueOf(2),
-				Integer.valueOf(3),
-				Integer.valueOf(4),
-				Integer.valueOf(5),
-				Integer.valueOf(6),
-				Integer.valueOf(7),
-				Integer.valueOf(8),
-				Integer.valueOf(9)
-		};
-	}
-
-	private static void assertEquals(int exp, Integer act) {
-		assertEquals(exp, act.intValue());
-	}
-	
-	/**
-	 * Test to ensure that arrayMoveWithin works as expected
-	 */
-	public void testArrayMoveWithin() {
-		Integer[] ints = getIntsList();
-
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(2, ints[2]);
-		assertEquals(3, ints[3]);
-		assertEquals(4, ints[4]);
-		assertEquals(5, ints[5]);
-		assertEquals(6, ints[6]);
-		assertEquals(7, ints[7]);
-		assertEquals(8, ints[8]);
-		assertEquals(9, ints[9]);
-
-
-		//
-		// Moving to a later point in the array
-		//
-
-		// Shift 1 back
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 4, 8, 1);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(2, ints[2]);
-		assertEquals(3, ints[3]);
-		assertEquals(5, ints[4]);
-		assertEquals(6, ints[5]);
-		assertEquals(7, ints[6]);
-		assertEquals(8, ints[7]);
-		assertEquals(4, ints[8]);
-		assertEquals(9, ints[9]);
-
-		// Shift front 1 back
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 0, 7, 1);
-		assertEquals(1, ints[0]);
-		assertEquals(2, ints[1]);
-		assertEquals(3, ints[2]);
-		assertEquals(4, ints[3]);
-		assertEquals(5, ints[4]);
-		assertEquals(6, ints[5]);
-		assertEquals(7, ints[6]);
-		assertEquals(0, ints[7]);
-		assertEquals(8, ints[8]);
-		assertEquals(9, ints[9]);
-
-		// Shift 1 to end
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 4, 9, 1);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(2, ints[2]);
-		assertEquals(3, ints[3]);
-		assertEquals(5, ints[4]);
-		assertEquals(6, ints[5]);
-		assertEquals(7, ints[6]);
-		assertEquals(8, ints[7]);
-		assertEquals(9, ints[8]);
-		assertEquals(4, ints[9]);
-
-
-		//
-		// Moving to an earlier point in the array
-		//
-
-		// Shift 1 forward
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 8, 3, 1);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(2, ints[2]);
-		assertEquals(8, ints[3]);
-		assertEquals(3, ints[4]);
-		assertEquals(4, ints[5]);
-		assertEquals(5, ints[6]);
-		assertEquals(6, ints[7]);
-		assertEquals(7, ints[8]);
-		assertEquals(9, ints[9]);
-
-		// Shift end 1 forward
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 9, 2, 1);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(9, ints[2]);
-		assertEquals(2, ints[3]);
-		assertEquals(3, ints[4]);
-		assertEquals(4, ints[5]);
-		assertEquals(5, ints[6]);
-		assertEquals(6, ints[7]);
-		assertEquals(7, ints[8]);
-		assertEquals(8, ints[9]);
-
-		// Shift 1 to front
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 5, 0, 1);
-		assertEquals(5, ints[0]);
-		assertEquals(0, ints[1]);
-		assertEquals(1, ints[2]);
-		assertEquals(2, ints[3]);
-		assertEquals(3, ints[4]);
-		assertEquals(4, ints[5]);
-		assertEquals(6, ints[6]);
-		assertEquals(7, ints[7]);
-		assertEquals(8, ints[8]);
-		assertEquals(9, ints[9]);
-
-
-		//
-		// Moving many to a later point in the array
-		//
-
-		// Shift 3 back
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 2, 6, 3);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(5, ints[2]);
-		assertEquals(6, ints[3]);
-		assertEquals(7, ints[4]);
-		assertEquals(8, ints[5]);
-		assertEquals(2, ints[6]);
-		assertEquals(3, ints[7]);
-		assertEquals(4, ints[8]);
-		assertEquals(9, ints[9]);
-
-		// Shift 3 to back
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 2, 7, 3);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(5, ints[2]);
-		assertEquals(6, ints[3]);
-		assertEquals(7, ints[4]);
-		assertEquals(8, ints[5]);
-		assertEquals(9, ints[6]);
-		assertEquals(2, ints[7]);
-		assertEquals(3, ints[8]);
-		assertEquals(4, ints[9]);
-
-		// Shift from 3 front
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 0, 5, 3);
-		assertEquals(3, ints[0]);
-		assertEquals(4, ints[1]);
-		assertEquals(5, ints[2]);
-		assertEquals(6, ints[3]);
-		assertEquals(7, ints[4]);
-		assertEquals(0, ints[5]);
-		assertEquals(1, ints[6]);
-		assertEquals(2, ints[7]);
-		assertEquals(8, ints[8]);
-		assertEquals(9, ints[9]);
-
-
-		//
-		// Moving many to an earlier point in the array
-		//
-
-		// Shift 3 forward
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 6, 2, 3);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(6, ints[2]);
-		assertEquals(7, ints[3]);
-		assertEquals(8, ints[4]);
-		assertEquals(2, ints[5]);
-		assertEquals(3, ints[6]);
-		assertEquals(4, ints[7]);
-		assertEquals(5, ints[8]);
-		assertEquals(9, ints[9]);
-
-		// Shift 3 to front
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 6, 0, 3);
-		assertEquals(6, ints[0]);
-		assertEquals(7, ints[1]);
-		assertEquals(8, ints[2]);
-		assertEquals(0, ints[3]);
-		assertEquals(1, ints[4]);
-		assertEquals(2, ints[5]);
-		assertEquals(3, ints[6]);
-		assertEquals(4, ints[7]);
-		assertEquals(5, ints[8]);
-		assertEquals(9, ints[9]);
-
-		// Shift from 3 back
-		ints = getIntsList();
-		ArrayUtil.arrayMoveWithin(ints, 7, 3, 3);
-		assertEquals(0, ints[0]);
-		assertEquals(1, ints[1]);
-		assertEquals(2, ints[2]);
-		assertEquals(7, ints[3]);
-		assertEquals(8, ints[4]);
-		assertEquals(9, ints[5]);
-		assertEquals(3, ints[6]);
-		assertEquals(4, ints[7]);
-		assertEquals(5, ints[8]);
-		assertEquals(6, ints[9]);
-
-
-		// Check can't shift more than we have
-		try {
-			ints = getIntsList();
-			ArrayUtil.arrayMoveWithin(ints, 7, 3, 5);
-			fail();
-		} catch(IllegalArgumentException e) {
-			// Good, we don't have 5 from 7 onwards
-		}
-
-		// Check can't shift where would overshoot
-		try {
-			ints = getIntsList();
-			ArrayUtil.arrayMoveWithin(ints, 2, 7, 5);
-			fail();
-		} catch(IllegalArgumentException e) {
-			// Good, we can't fit 5 in starting at 7
-		}
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestBitField.java b/trunk/src/testcases/org/apache/poi/util/TestBitField.java
deleted file mode 100644
index a5c953a..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestBitField.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import junit.framework.*;
-
-/**
- * Class to test BitField functionality
- *
- * @author Marc Johnson
- * @author Glen Stampoultzis (gstamp@iprimus.com.au)
- */
-public final class TestBitField extends TestCase {
-    private static BitField bf_multi  = BitFieldFactory.getInstance(0x3F80);
-    private static BitField bf_single = BitFieldFactory.getInstance(0x4000);
-
-    public void testGetValue() {
-        assertEquals(bf_multi.getValue(-1), 127);
-        assertEquals(bf_multi.getValue(0), 0);
-        assertEquals(bf_single.getValue(-1), 1);
-        assertEquals(bf_single.getValue(0), 0);
-    }
-
-    public void testGetShortValue() {
-        assertEquals(bf_multi.getShortValue(( short ) -1), ( short ) 127);
-        assertEquals(bf_multi.getShortValue(( short ) 0), ( short ) 0);
-        assertEquals(bf_single.getShortValue(( short ) -1), ( short ) 1);
-        assertEquals(bf_single.getShortValue(( short ) 0), ( short ) 0);
-    }
-
-    public void testGetRawValue() {
-        assertEquals(bf_multi.getRawValue(-1), 0x3F80);
-        assertEquals(bf_multi.getRawValue(0), 0);
-        assertEquals(bf_single.getRawValue(-1), 0x4000);
-        assertEquals(bf_single.getRawValue(0), 0);
-    }
-
-    public void testGetShortRawValue() {
-        assertEquals(bf_multi.getShortRawValue(( short ) -1),
-                     ( short ) 0x3F80);
-        assertEquals(bf_multi.getShortRawValue(( short ) 0), ( short ) 0);
-        assertEquals(bf_single.getShortRawValue(( short ) -1),
-                     ( short ) 0x4000);
-        assertEquals(bf_single.getShortRawValue(( short ) 0), ( short ) 0);
-    }
-
-    public void testIsSet() {
-        assertTrue(!bf_multi.isSet(0));
-        for (int j = 0x80; j <= 0x3F80; j += 0x80)
-        {
-            assertTrue(bf_multi.isSet(j));
-        }
-        assertTrue(!bf_single.isSet(0));
-        assertTrue(bf_single.isSet(0x4000));
-    }
-
-    public void testIsAllSet() {
-        for (int j = 0; j < 0x3F80; j += 0x80)
-        {
-            assertTrue(!bf_multi.isAllSet(j));
-        }
-        assertTrue(bf_multi.isAllSet(0x3F80));
-        assertTrue(!bf_single.isAllSet(0));
-        assertTrue(bf_single.isAllSet(0x4000));
-    }
-
-    public void testSetValue() {
-        for (int j = 0; j < 128; j++)
-        {
-            assertEquals(bf_multi.getValue(bf_multi.setValue(0, j)), j);
-            assertEquals(bf_multi.setValue(0, j), j << 7);
-        }
-
-        // verify that excess bits are stripped off
-        assertEquals(bf_multi.setValue(0x3f80, 128), 0);
-        for (int j = 0; j < 2; j++)
-        {
-            assertEquals(bf_single.getValue(bf_single.setValue(0, j)), j);
-            assertEquals(bf_single.setValue(0, j), j << 14);
-        }
-
-        // verify that excess bits are stripped off
-        assertEquals(bf_single.setValue(0x4000, 2), 0);
-    }
-
-    public void testSetShortValue() {
-        for (int j = 0; j < 128; j++)
-        {
-            assertEquals(bf_multi
-                .getShortValue(bf_multi
-                    .setShortValue(( short ) 0, ( short ) j)), ( short ) j);
-            assertEquals(bf_multi.setShortValue(( short ) 0, ( short ) j),
-                         ( short ) (j << 7));
-        }
-
-        // verify that excess bits are stripped off
-        assertEquals(bf_multi.setShortValue(( short ) 0x3f80, ( short ) 128),
-                     ( short ) 0);
-        for (int j = 0; j < 2; j++)
-        {
-            assertEquals(bf_single
-                .getShortValue(bf_single
-                    .setShortValue(( short ) 0, ( short ) j)), ( short ) j);
-            assertEquals(bf_single.setShortValue(( short ) 0, ( short ) j),
-                         ( short ) (j << 14));
-        }
-
-        // verify that excess bits are stripped off
-        assertEquals(bf_single.setShortValue(( short ) 0x4000, ( short ) 2),
-                     ( short ) 0);
-    }
-
-    public void testByte() {
-        assertEquals(1, BitFieldFactory.getInstance(1).setByteBoolean(( byte ) 0, true));
-        assertEquals(2, BitFieldFactory.getInstance(2).setByteBoolean(( byte ) 0, true));
-        assertEquals(4, BitFieldFactory.getInstance(4).setByteBoolean(( byte ) 0, true));
-        assertEquals(8, BitFieldFactory.getInstance(8).setByteBoolean(( byte ) 0, true));
-        assertEquals(16, BitFieldFactory.getInstance(16).setByteBoolean(( byte ) 0, true));
-        assertEquals(32, BitFieldFactory.getInstance(32).setByteBoolean(( byte ) 0, true));
-        assertEquals(64, BitFieldFactory.getInstance(64).setByteBoolean(( byte ) 0, true));
-        assertEquals(-128,
-                     BitFieldFactory.getInstance(128).setByteBoolean(( byte ) 0, true));
-        assertEquals(0, BitFieldFactory.getInstance(1).setByteBoolean(( byte ) 1, false));
-        assertEquals(0, BitFieldFactory.getInstance(2).setByteBoolean(( byte ) 2, false));
-        assertEquals(0, BitFieldFactory.getInstance(4).setByteBoolean(( byte ) 4, false));
-        assertEquals(0, BitFieldFactory.getInstance(8).setByteBoolean(( byte ) 8, false));
-        assertEquals(0, BitFieldFactory.getInstance(16).setByteBoolean(( byte ) 16, false));
-        assertEquals(0, BitFieldFactory.getInstance(32).setByteBoolean(( byte ) 32, false));
-        assertEquals(0, BitFieldFactory.getInstance(64).setByteBoolean(( byte ) 64, false));
-        assertEquals(0, BitFieldFactory.getInstance(128).setByteBoolean(( byte ) 128,
-                                     false));
-        assertEquals(-2, BitFieldFactory.getInstance(1).setByteBoolean(( byte ) 255, false));
-        byte clearedBit = BitFieldFactory.getInstance(0x40).setByteBoolean(( byte ) -63,
-                                       false);
-
-        assertEquals(false, BitFieldFactory.getInstance(0x40).isSet(clearedBit));
-    }
-
-    public void testClear() {
-        assertEquals(bf_multi.clear(-1), 0xFFFFC07F);
-        assertEquals(bf_single.clear(-1), 0xFFFFBFFF);
-    }
-
-    public void testClearShort() {
-        assertEquals(bf_multi.clearShort(( short ) -1), ( short ) 0xC07F);
-        assertEquals(bf_single.clearShort(( short ) -1), ( short ) 0xBFFF);
-    }
-
-    public void testSet() {
-        assertEquals(bf_multi.set(0), 0x3F80);
-        assertEquals(bf_single.set(0), 0x4000);
-    }
-
-    public void testSetShort() {
-        assertEquals(bf_multi.setShort(( short ) 0), ( short ) 0x3F80);
-        assertEquals(bf_single.setShort(( short ) 0), ( short ) 0x4000);
-    }
-
-    public void testSetBoolean() {
-        assertEquals(bf_multi.set(0), bf_multi.setBoolean(0, true));
-        assertEquals(bf_single.set(0), bf_single.setBoolean(0, true));
-        assertEquals(bf_multi.clear(-1), bf_multi.setBoolean(-1, false));
-        assertEquals(bf_single.clear(-1), bf_single.setBoolean(-1, false));
-    }
-
-    public void testSetShortBoolean() {
-        assertEquals(bf_multi.setShort(( short ) 0),
-                     bf_multi.setShortBoolean(( short ) 0, true));
-        assertEquals(bf_single.setShort(( short ) 0),
-                     bf_single.setShortBoolean(( short ) 0, true));
-        assertEquals(bf_multi.clearShort(( short ) -1),
-                     bf_multi.setShortBoolean(( short ) -1, false));
-        assertEquals(bf_single.clearShort(( short ) -1),
-                     bf_single.setShortBoolean(( short ) -1, false));
-    }
-    
-    public void testSetLargeValues() {
-       final BitField bf1 = new BitField(0xF), bf2 = new BitField(0xF0000000);
-       int a = 0;
-       a = bf1.setValue(a, 9);
-       a = bf2.setValue(a, 9);
-       assertEquals(9, bf1.getValue(a));
-       assertEquals(9, bf2.getValue(a));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestByteField.java b/trunk/src/testcases/org/apache/poi/util/TestByteField.java
deleted file mode 100644
index ca2a149..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestByteField.java
+++ /dev/null
@@ -1,159 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- * Title:        Unit test for ByteField class
- * Description:  Unit test for ByteField class
- * @author       Marc Johnson (mjohnson at apache dot org)
- */
-public final class TestByteField extends TestCase {
-
-    private static final byte[] _test_array =
-    {
-        Byte.MIN_VALUE, ( byte ) -1, ( byte ) 0, ( byte ) 1, Byte.MAX_VALUE
-    };
-
-    public void testConstructors() {
-        try
-        {
-            new ByteField(-1);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        ByteField field = new ByteField(2);
-
-        assertEquals(( byte ) 0, field.get());
-        try
-        {
-            new ByteField(-1, ( byte ) 1);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new ByteField(2, ( byte ) 3);
-        assertEquals(( byte ) 3, field.get());
-        byte[] array = new byte[ 3 ];
-
-        try
-        {
-            new ByteField(-1, ( byte ) 1, array);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new ByteField(2, ( byte ) 4, array);
-        assertEquals(( byte ) 4, field.get());
-        assertEquals(( byte ) 4, array[ 2 ]);
-        array = new byte[ 2 ];
-        try
-        {
-            new ByteField(2, ( byte ) 5, array);
-            fail("should have gotten ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        for (byte b : _test_array) {
-            array = new byte[ 1 ];
-            new ByteField(0, b, array);
-            assertEquals(b, new ByteField(0, array).get());
-        }
-    }
-
-    public void testSet() {
-        ByteField field = new ByteField(0);
-        byte[]    array = new byte[ 1 ];
-
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            field.set(_test_array[ j ]);
-            assertEquals("testing _1 " + j, _test_array[ j ], field.get());
-            field = new ByteField(0);
-            field.set(_test_array[ j ], array);
-            assertEquals("testing _2 ", _test_array[ j ], field.get());
-            assertEquals("testing _3 ", _test_array[ j ], array[ 0 ]);
-        }
-    }
-
-    public void testReadFromBytes() {
-        ByteField field = new ByteField(1);
-        byte[]    array = new byte[ 1 ];
-
-        try
-        {
-            field.readFromBytes(array);
-            fail("should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new ByteField(0);
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            array[ 0 ] = _test_array[ j ];
-            field.readFromBytes(array);
-            assertEquals("testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testReadFromStream() throws IOException {
-        ByteField field  = new ByteField(0);
-        byte[]    buffer = new byte[ _test_array.length ];
-
-        System.arraycopy(_test_array, 0, buffer, 0, buffer.length);
-        ByteArrayInputStream stream = new ByteArrayInputStream(buffer);
-
-        for (int j = 0; j < buffer.length; j++)
-        {
-            field.readFromStream(stream);
-            assertEquals("Testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testWriteToBytes() {
-        ByteField field = new ByteField(0);
-        byte[]    array = new byte[ 1 ];
-
-        for (byte b : _test_array) {
-            field.set(b);
-            field.writeToBytes(array);
-            assertEquals("testing ", b, array[ 0 ]);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestHexDump.java b/trunk/src/testcases/org/apache/poi/util/TestHexDump.java
deleted file mode 100644
index a9d55ae..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestHexDump.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.junit.Test;
-
-public class TestHexDump {
-    @Test
-    public void testDump() throws IOException {
-        byte[] testArray = testArray();
-        ByteArrayOutputStream streamAct = new ByteArrayOutputStream();
-        HexDump.dump(testArray, 0, streamAct, 0);
-        byte bytesAct[] = streamAct.toByteArray();
-        byte bytesExp[] = toHexDump(0,0);
-
-        assertEquals("array size mismatch", bytesExp.length, bytesAct.length);
-        assertArrayEquals("array mismatch", bytesExp, bytesAct);
-
-        // verify proper behavior with non-zero offset
-        streamAct.reset();
-        HexDump.dump(testArray, 0x10000000L, streamAct, 0);
-        bytesAct = streamAct.toByteArray();
-        bytesExp = toHexDump(0x10000000L,0);
-
-        assertEquals("array size mismatch", bytesExp.length, bytesAct.length);
-        assertArrayEquals("array mismatch", bytesExp, bytesAct);
-
-        // verify proper behavior with negative offset
-        streamAct.reset();
-        HexDump.dump(testArray, 0xFF000000L, streamAct, 0);
-        bytesAct = streamAct.toByteArray();
-        bytesExp = toHexDump(0xFF000000L,0);
-
-        assertEquals("array size mismatch", bytesExp.length, bytesAct.length);
-        assertArrayEquals("array mismatch", bytesExp, bytesAct);
-
-        // verify proper behavior with non-zero index
-        streamAct.reset();
-        HexDump.dump(testArray, 0xFF000000L, streamAct, 0x81);
-        bytesAct = streamAct.toByteArray();
-        bytesExp = toHexDump(0xFF000000L,0x81);
-
-        assertEquals("array size mismatch", bytesExp.length, bytesAct.length);
-        assertArrayEquals("array mismatch", bytesExp, bytesAct);
-
-
-        // verify proper behavior with negative index
-        try {
-            streamAct.reset();
-            HexDump.dump(testArray, 0x10000000L, streamAct, -1);
-            fail("should have caught ArrayIndexOutOfBoundsException on negative index");
-        } catch (ArrayIndexOutOfBoundsException ignored_exception) {
-            // as expected
-        }
-
-        // verify proper behavior with index that is too large
-        try {
-            streamAct.reset();
-            HexDump.dump(testArray, 0x10000000L, streamAct, testArray.length);
-            fail("should have caught ArrayIndexOutOfBoundsException on large index");
-        } catch (ArrayIndexOutOfBoundsException ignored_exception) {
-            // as expected
-        }
-
-        // verify proper behavior with null stream
-        try {
-            HexDump.dump(testArray, 0x10000000L, null, 0);
-            fail("should have caught IllegalArgumentException on negative index");
-        } catch (IllegalArgumentException ignored_exception) {
-
-            // as expected
-        }
-
-        // verify proper behaviour with empty byte array
-        streamAct.reset();
-        HexDump.dump( new byte[0], 0, streamAct, 0 );
-        assertEquals( "No Data" + System.getProperty( "line.separator"), streamAct.toString(LocaleUtil.CHARSET_1252.name()) );
-
-    }
-
-    private byte[] toHexDump(long offset, int index) {
-        StringBuilder strExp = new StringBuilder(), chrs = new StringBuilder();
-        Object obj[] = new Object[33];
-        StringBuilder format = new StringBuilder();
-
-        for (int j = 0; j < 16 && (index + j*16) < 256; j++) {
-            obj[0] = offset+index+j*16;
-            chrs.setLength(0);
-            format.setLength(0);
-            format.append("%08X ");
-            for (int k = 0; k < 16; k++) {
-                if (index+j*16+k < 256){
-                    obj[k+1] = index+j*16+k;
-                    chrs.append(HexDump.toAscii(index+j*16+k));
-                    format.append("%02X ");
-                } else {
-                    format.append("   ");
-                }
-            }
-            obj[17] = chrs.toString();
-            format.append("%18$s").append(HexDump.EOL);
-
-            String str = String.format(LocaleUtil.getUserLocale(), format.toString(), obj);
-            strExp.append(str);
-        }
-        return strExp.toString().getBytes(HexDump.UTF8);
-    }
-
-    @Test
-    public void testToHex() {
-        assertEquals("000A", HexDump.toHex((short)0xA));
-
-        assertEquals("[]", HexDump.toHex(new short[] { }));
-        assertEquals("[000A]", HexDump.toHex(new short[] { 0xA }));
-        assertEquals("[000A, 000B]", HexDump.toHex(new short[] { 0xA, 0xB }));
-
-        assertEquals("0A", HexDump.toHex((byte)0xA));
-        assertEquals("0000000A", HexDump.toHex(0xA));
-
-        assertEquals("[]", HexDump.toHex(new byte[] { }));
-        assertEquals("[0A]", HexDump.toHex(new byte[] { 0xA }));
-        assertEquals("[0A, 0B]", HexDump.toHex(new byte[] { 0xA, 0xB }));
-
-        assertEquals(": 0", HexDump.toHex(new byte[] { }, 10));
-        assertEquals("0: 0A", HexDump.toHex(new byte[] { 0xA }, 10));
-        assertEquals("0: 0A, 0B", HexDump.toHex(new byte[] { 0xA, 0xB }, 10));
-        assertEquals("0: 0A, 0B\n2: 0C, 0D", HexDump.toHex(new byte[] { 0xA, 0xB, 0xC, 0xD }, 2));
-        assertEquals("0: 0A, 0B\n2: 0C, 0D\n4: 0E, 0F", HexDump.toHex(new byte[] { 0xA, 0xB, 0xC, 0xD, 0xE, 0xF }, 2));
-
-        assertEquals("FFFF", HexDump.toHex((short)0xFFFF));
-
-        assertEquals("00000000000004D2", HexDump.toHex(1234L));
-
-        assertEquals("0xFE", HexDump.byteToHex(-2));
-        assertEquals("0x25", HexDump.byteToHex(37));
-        assertEquals("0xFFFE", HexDump.shortToHex(-2));
-        assertEquals("0x0005", HexDump.shortToHex(5));
-        assertEquals("0xFFFFFF9C", HexDump.intToHex(-100));
-        assertEquals("0x00001001", HexDump.intToHex(4097));
-        assertEquals("0xFFFFFFFFFFFF0006", HexDump.longToHex(-65530));
-        assertEquals("0x0000000000003FCD", HexDump.longToHex(16333));
-    }
-
-	@Test
-    public void testDumpToString() throws Exception {
-        byte[] testArray = testArray();
-        String dump = HexDump.dump(testArray, 0, 0);
-        //System.out.println("Hex: \n" + dump);
-        assertTrue("Had: \n" + dump,
-                dump.contains("0123456789:;<=>?"));
-
-        dump = HexDump.dump(testArray, 2, 1);
-        //System.out.println("Hex: \n" + dump);
-        assertTrue("Had: \n" + dump,
-                dump.contains("123456789:;<=>?@"));
-    }
-
-    @Test(expected=ArrayIndexOutOfBoundsException.class)
-    public void testDumpToStringOutOfIndex1() throws Exception {
-        HexDump.dump(new byte[1], 0, -1);
-    }
-
-    @Test(expected=ArrayIndexOutOfBoundsException.class)
-    public void testDumpToStringOutOfIndex2() throws Exception {
-        HexDump.dump(new byte[1], 0, 2);
-    }
-
-    @Test(expected=ArrayIndexOutOfBoundsException.class)
-    public void testDumpToStringOutOfIndex3() throws Exception {
-        HexDump.dump(new byte[1], 0, 1);
-    }
-
-    @Test
-    public void testDumpToStringNoDataEOL1() throws Exception {
-        HexDump.dump(new byte[0], 0, 1);
-    }
-
-    @Test
-    public void testDumpToStringNoDataEOL2() throws Exception {
-        HexDump.dump(new byte[0], 0, 0);
-    }
-
-    @Test
-    public void testDumpToPrintStream() throws IOException {
-        byte[] testArray = testArray();
-        ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
-        PrintStream out = new PrintStream(byteOut,true,LocaleUtil.CHARSET_1252.name());
-        ByteArrayInputStream byteIn = new ByteArrayInputStream(testArray);
-        byteIn.mark(256);
-        String str;
-
-        byteIn.reset();
-        byteOut.reset();
-        HexDump.dump(byteIn, out, 0, 256);
-        str = new String(byteOut.toByteArray(), LocaleUtil.CHARSET_1252);
-        assertTrue("Had: \n" + str, str.contains("0123456789:;<=>?"));
-
-        // test with more than we have
-        byteIn.reset();
-        byteOut.reset();
-        HexDump.dump(byteIn, out, 0, 1000);
-        str = new String(byteOut.toByteArray(), LocaleUtil.CHARSET_1252);
-        assertTrue("Had: \n" + str, str.contains("0123456789:;<=>?"));
-
-        // test with -1
-        byteIn.reset();
-        byteOut.reset();
-        HexDump.dump(byteIn, out, 0, -1);
-        str = new String(byteOut.toByteArray(), LocaleUtil.CHARSET_1252);
-        assertTrue("Had: \n" + str, str.contains("0123456789:;<=>?"));
-
-        byteIn.reset();
-        byteOut.reset();
-        HexDump.dump(byteIn, out, 1, 235);
-        str = new String(byteOut.toByteArray(), LocaleUtil.CHARSET_1252);
-        assertTrue("Line contents should be moved by one now, but Had: \n" + str,
-                    str.contains("123456789:;<=>?@"));
-
-        byteIn.close();
-        byteOut.close();
-    }
-
-    @Test
-    public void testMain() throws Exception {
-        File file = TempFile.createTempFile("HexDump", ".dat");
-        try {
-            FileOutputStream out = new FileOutputStream(file);
-            try {
-                IOUtils.copy(new ByteArrayInputStream("teststring".getBytes(LocaleUtil.CHARSET_1252)), out);
-            } finally {
-                out.close();
-            }
-            assertTrue(file.exists());
-            assertTrue(file.length() > 0);
-
-            HexDump.main(new String[] { file.getAbsolutePath() });
-        } finally {
-            assertTrue(file.exists() && file.delete());
-        }
-    }
-
-    private static byte[] testArray() {
-        byte[] testArray = new byte[ 256 ];
-
-        for (int j = 0; j < 256; j++) {
-            testArray[ j ] = ( byte ) j;
-        }
-        
-        return testArray;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestIntList.java b/trunk/src/testcases/org/apache/poi/util/TestIntList.java
deleted file mode 100644
index abf5015..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestIntList.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import junit.framework.TestCase;
-
-/**
- * Class to test IntList
- *
- * @author Marc Johnson
- */
-public final class TestIntList extends TestCase {
-
-    public void testConstructors() {
-        IntList list = new IntList();
-
-        assertTrue(list.isEmpty());
-        list.add(0);
-        list.add(1);
-        IntList list2 = new IntList(list);
-
-        assertEquals(list, list2);
-        IntList list3 = new IntList(2);
-
-        assertTrue(list3.isEmpty());
-    }
-
-    public void testAdd() {
-        IntList list      = new IntList();
-        int[]   testArray =
-        {
-            0, 1, 2, 3, 5
-        };
-
-        for (int element : testArray) {
-            list.add(element);
-        }
-        for (int j = 0; j < testArray.length; j++)
-        {
-            assertEquals(testArray[ j ], list.get(j));
-        }
-        assertEquals(testArray.length, list.size());
-
-        // add at the beginning
-        list.add(0, -1);
-        assertEquals(-1, list.get(0));
-        assertEquals(testArray.length + 1, list.size());
-        for (int j = 0; j < testArray.length; j++)
-        {
-            assertEquals(testArray[ j ], list.get(j + 1));
-        }
-
-        // add in the middle
-        list.add(5, 4);
-        assertEquals(4, list.get(5));
-        assertEquals(testArray.length + 2, list.size());
-        for (int j = 0; j < list.size(); j++)
-        {
-            assertEquals(j - 1, list.get(j));
-        }
-
-        // add at the end
-        list.add(list.size(), 6);
-        assertEquals(testArray.length + 3, list.size());
-        for (int j = 0; j < list.size(); j++)
-        {
-            assertEquals(j - 1, list.get(j));
-        }
-
-        // add past end
-        try
-        {
-            list.add(list.size() + 1, 8);
-            fail("should have thrown exception");
-        }
-        catch (IndexOutOfBoundsException e)
-        {
-
-            // as expected
-        }
-
-        // test growth
-        list = new IntList(0);
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        assertEquals(1000, list.size());
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(j, list.get(j));
-        }
-        list = new IntList(0);
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(0, j);
-        }
-        assertEquals(1000, list.size());
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(j, list.get(999 - j));
-        }
-    }
-
-    public void testAddAll() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 5; j++)
-        {
-            list.add(j);
-        }
-        IntList list2 = new IntList(0);
-
-        list2.addAll(list);
-        list2.addAll(list);
-        assertEquals(2 * list.size(), list2.size());
-        for (int j = 0; j < 5; j++)
-        {
-            assertEquals(list2.get(j), j);
-            assertEquals(list2.get(j + list.size()), j);
-        }
-        IntList empty = new IntList();
-        int     limit = list.size();
-
-        for (int j = 0; j < limit; j++)
-        {
-            assertTrue(list.addAll(j, empty));
-            assertEquals(limit, list.size());
-        }
-        try
-        {
-            list.addAll(limit + 1, empty);
-            fail("should have thrown an exception");
-        }
-        catch (IndexOutOfBoundsException e)
-        {
-
-            // as expected
-        }
-
-        // try add at beginning
-        empty.addAll(0, list);
-        assertEquals(empty, list);
-
-        // try in the middle
-        empty.addAll(1, list);
-        assertEquals(2 * list.size(), empty.size());
-        assertEquals(list.get(0), empty.get(0));
-        assertEquals(list.get(0), empty.get(1));
-        assertEquals(list.get(1), empty.get(2));
-        assertEquals(list.get(1), empty.get(6));
-        assertEquals(list.get(2), empty.get(3));
-        assertEquals(list.get(2), empty.get(7));
-        assertEquals(list.get(3), empty.get(4));
-        assertEquals(list.get(3), empty.get(8));
-        assertEquals(list.get(4), empty.get(5));
-        assertEquals(list.get(4), empty.get(9));
-
-        // try at the end
-        empty.addAll(empty.size(), list);
-        assertEquals(3 * list.size(), empty.size());
-        assertEquals(list.get(0), empty.get(0));
-        assertEquals(list.get(0), empty.get(1));
-        assertEquals(list.get(0), empty.get(10));
-        assertEquals(list.get(1), empty.get(2));
-        assertEquals(list.get(1), empty.get(6));
-        assertEquals(list.get(1), empty.get(11));
-        assertEquals(list.get(2), empty.get(3));
-        assertEquals(list.get(2), empty.get(7));
-        assertEquals(list.get(2), empty.get(12));
-        assertEquals(list.get(3), empty.get(4));
-        assertEquals(list.get(3), empty.get(8));
-        assertEquals(list.get(3), empty.get(13));
-        assertEquals(list.get(4), empty.get(5));
-        assertEquals(list.get(4), empty.get(9));
-        assertEquals(list.get(4), empty.get(14));
-    }
-
-    public void testClear() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 500; j++)
-        {
-            list.add(j);
-        }
-        assertEquals(500, list.size());
-        list.clear();
-        assertEquals(0, list.size());
-        for (int j = 0; j < 500; j++)
-        {
-            list.add(j + 1);
-        }
-        assertEquals(500, list.size());
-        for (int j = 0; j < 500; j++)
-        {
-            assertEquals(j + 1, list.get(j));
-        }
-    }
-
-    public void testContains() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j += 2)
-        {
-            list.add(j);
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            if (j % 2 == 0)
-            {
-                assertTrue(list.contains(j));
-            }
-            else
-            {
-                assertTrue(!list.contains(j));
-            }
-        }
-    }
-
-    public void testContainsAll() {
-        IntList list = new IntList();
-
-        assertTrue(list.containsAll(list));
-        for (int j = 0; j < 10; j++)
-        {
-            list.add(j);
-        }
-        IntList list2 = new IntList(list);
-
-        assertTrue(list2.containsAll(list));
-        assertTrue(list.containsAll(list2));
-        list2.add(10);
-        assertTrue(list2.containsAll(list));
-        assertTrue(!list.containsAll(list2));
-        list.add(11);
-        assertTrue(!list2.containsAll(list));
-        assertTrue(!list.containsAll(list2));
-    }
-
-    public void testEquals() {
-        IntList list = new IntList();
-
-        assertEquals(list, list);
-        assertTrue(!list.equals(null));
-        IntList list2 = new IntList(200);
-
-        assertEquals(list, list2);
-        assertEquals(list2, list);
-        assertEquals(list.hashCode(), list2.hashCode());
-        list.add(0);
-        list.add(1);
-        list2.add(1);
-        list2.add(0);
-        assertTrue(!list.equals(list2));
-        list2.removeValue(1);
-        list2.add(1);
-        assertEquals(list, list2);
-        assertEquals(list2, list);
-        list2.add(2);
-        assertTrue(!list.equals(list2));
-        assertTrue(!list2.equals(list));
-    }
-
-    public void testGet() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        for (int j = 0; j < 1001; j++)
-        {
-            try
-            {
-                assertEquals(j, list.get(j));
-                if (j == 1000)
-                {
-                    fail("should have gotten exception");
-                }
-            }
-            catch (IndexOutOfBoundsException e)
-            {
-                if (j != 1000)
-                {
-                    fail("unexpected IndexOutOfBoundsException");
-                }
-            }
-        }
-    }
-
-    public void testIndexOf() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j / 2);
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            if (j < 500)
-            {
-                assertEquals(j * 2, list.indexOf(j));
-            }
-            else
-            {
-                assertEquals(-1, list.indexOf(j));
-            }
-        }
-    }
-
-    public void testIsEmpty() {
-        IntList list1 = new IntList();
-        IntList list2 = new IntList(1000);
-        IntList list3 = new IntList(list1);
-
-        assertTrue(list1.isEmpty());
-        assertTrue(list2.isEmpty());
-        assertTrue(list3.isEmpty());
-        list1.add(1);
-        list2.add(2);
-        list3 = new IntList(list2);
-        assertTrue(!list1.isEmpty());
-        assertTrue(!list2.isEmpty());
-        assertTrue(!list3.isEmpty());
-        list1.clear();
-        list2.remove(0);
-        list3.removeValue(2);
-        assertTrue(list1.isEmpty());
-        assertTrue(list2.isEmpty());
-        assertTrue(list3.isEmpty());
-    }
-
-    public void testLastIndexOf() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j / 2);
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            if (j < 500)
-            {
-                assertEquals(1 + j * 2, list.lastIndexOf(j));
-            }
-            else
-            {
-                assertEquals(-1, list.indexOf(j));
-            }
-        }
-    }
-
-    public void testRemove() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(j, list.remove(0));
-            assertEquals(999 - j, list.size());
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(999 - j, list.remove(999 - j));
-            assertEquals(999 - j, list.size());
-        }
-        try
-        {
-            list.remove(0);
-            fail("should have caught IndexOutOfBoundsException");
-        }
-        catch (IndexOutOfBoundsException e)
-        {
-
-            // as expected
-        }
-    }
-
-    public void testRemoveValue() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j / 2);
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            if (j < 500)
-            {
-                assertTrue(list.removeValue(j));
-                assertTrue(list.removeValue(j));
-            }
-            assertTrue(!list.removeValue(j));
-        }
-    }
-
-    public void testRemoveAll() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        IntList listCopy = new IntList(list);
-        IntList listOdd  = new IntList();
-        IntList listEven = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            if (j % 2 == 0)
-            {
-                listEven.add(j);
-            }
-            else
-            {
-                listOdd.add(j);
-            }
-        }
-        list.removeAll(listEven);
-        assertEquals(list, listOdd);
-        list.removeAll(listOdd);
-        assertTrue(list.isEmpty());
-        listCopy.removeAll(listOdd);
-        assertEquals(listCopy, listEven);
-        listCopy.removeAll(listEven);
-        assertTrue(listCopy.isEmpty());
-    }
-
-    public void testRetainAll() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        IntList listCopy = new IntList(list);
-        IntList listOdd  = new IntList();
-        IntList listEven = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            if (j % 2 == 0)
-            {
-                listEven.add(j);
-            }
-            else
-            {
-                listOdd.add(j);
-            }
-        }
-        list.retainAll(listOdd);
-        assertEquals(list, listOdd);
-        list.retainAll(listEven);
-        assertTrue(list.isEmpty());
-        listCopy.retainAll(listEven);
-        assertEquals(listCopy, listEven);
-        listCopy.retainAll(listOdd);
-        assertTrue(listCopy.isEmpty());
-    }
-
-    public void testSet() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        for (int j = 0; j < 1001; j++)
-        {
-            try
-            {
-                list.set(j, j + 1);
-                if (j == 1000)
-                {
-                    fail("Should have gotten exception");
-                }
-                assertEquals(j + 1, list.get(j));
-            }
-            catch (IndexOutOfBoundsException e)
-            {
-                if (j != 1000)
-                {
-                    fail("premature exception");
-                }
-            }
-        }
-    }
-
-    public void testSize() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(j, list.size());
-            list.add(j);
-            assertEquals(j + 1, list.size());
-        }
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(1000 - j, list.size());
-            list.removeValue(j);
-            assertEquals(999 - j, list.size());
-        }
-    }
-
-    public void testToArray() {
-        IntList list = new IntList();
-
-        for (int j = 0; j < 1000; j++)
-        {
-            list.add(j);
-        }
-        int[] a1 = list.toArray();
-
-        assertEquals(a1.length, list.size());
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(a1[ j ], list.get(j));
-        }
-        int[] a2 = new int[ list.size() ];
-        int[] a3 = list.toArray(a2);
-
-        assertSame(a2, a3);
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(a2[ j ], list.get(j));
-        }
-        int[] aShort = new int[ list.size() - 1 ];
-        int[] aLong  = new int[ list.size() + 1 ];
-        int[] a4     = list.toArray(aShort);
-        int[] a5     = list.toArray(aLong);
-
-        assertTrue(a4 != aShort);
-        assertTrue(a5 != aLong);
-        assertEquals(a4.length, list.size());
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(a3[ j ], list.get(j));
-        }
-        assertEquals(a5.length, list.size());
-        for (int j = 0; j < 1000; j++)
-        {
-            assertEquals(a5[ j ], list.get(j));
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestIntegerField.java b/trunk/src/testcases/org/apache/poi/util/TestIntegerField.java
deleted file mode 100644
index 228d398..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestIntegerField.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- * Test IntegerField code
- *
- * @author  Marc Johnson (mjohnson at apache dot org)
- */
-public final class TestIntegerField extends TestCase {
-
-    private static final int[] _test_array =
-    {
-        Integer.MIN_VALUE, -1, 0, 1, Integer.MAX_VALUE
-    };
-
-    public void testConstructors() {
-        try
-        {
-            new IntegerField(-1);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        IntegerField field = new IntegerField(2);
-
-        assertEquals(0, field.get());
-        try
-        {
-            new IntegerField(-1, 1);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new IntegerField(2, 0x12345678);
-        assertEquals(0x12345678, field.get());
-        byte[] array = new byte[ 6 ];
-
-        try
-        {
-            new IntegerField(-1, 1, array);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new IntegerField(2, 0x12345678, array);
-        assertEquals(0x12345678, field.get());
-        assertEquals(( byte ) 0x78, array[ 2 ]);
-        assertEquals(( byte ) 0x56, array[ 3 ]);
-        assertEquals(( byte ) 0x34, array[ 4 ]);
-        assertEquals(( byte ) 0x12, array[ 5 ]);
-        array = new byte[ 5 ];
-        try
-        {
-            new IntegerField(2, 5, array);
-            fail("should have gotten ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        for (int element : _test_array) {
-            array = new byte[ 4 ];
-            new IntegerField(0, element, array);
-            assertEquals(element, new IntegerField(0, array).get());
-        }
-    }
-
-    public void testSet() {
-        IntegerField field = new IntegerField(0);
-        byte[]       array = new byte[ 4 ];
-
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            field.set(_test_array[ j ]);
-            assertEquals("testing _1 " + j, _test_array[ j ], field.get());
-            field = new IntegerField(0);
-            field.set(_test_array[ j ], array);
-            assertEquals("testing _2 ", _test_array[ j ], field.get());
-            assertEquals("testing _3.0 " + _test_array[ j ],
-                         ( byte ) (_test_array[ j ] % 256), array[ 0 ]);
-            assertEquals("testing _3.1 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 8) % 256),
-                         array[ 1 ]);
-            assertEquals("testing _3.2 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 16) % 256),
-                         array[ 2 ]);
-            assertEquals("testing _3.3 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 24) % 256),
-                         array[ 3 ]);
-        }
-    }
-
-    public void testReadFromBytes() {
-        IntegerField field = new IntegerField(1);
-        byte[]       array = new byte[ 4 ];
-
-        try
-        {
-            field.readFromBytes(array);
-            fail("should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new IntegerField(0);
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            array[ 0 ] = ( byte ) (_test_array[ j ] % 256);
-            array[ 1 ] = ( byte ) ((_test_array[ j ] >> 8) % 256);
-            array[ 2 ] = ( byte ) ((_test_array[ j ] >> 16) % 256);
-            array[ 3 ] = ( byte ) ((_test_array[ j ] >> 24) % 256);
-            field.readFromBytes(array);
-            assertEquals("testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testReadFromStream() throws IOException {
-        IntegerField field  = new IntegerField(0);
-        byte[]       buffer = new byte[ _test_array.length * 4 ];
-
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            buffer[ (j * 4) + 0 ] = ( byte ) (_test_array[ j ] % 256);
-            buffer[ (j * 4) + 1 ] = ( byte ) ((_test_array[ j ] >> 8) % 256);
-            buffer[ (j * 4) + 2 ] = ( byte ) ((_test_array[ j ] >> 16) % 256);
-            buffer[ (j * 4) + 3 ] = ( byte ) ((_test_array[ j ] >> 24) % 256);
-        }
-        ByteArrayInputStream stream = new ByteArrayInputStream(buffer);
-
-        for (int j = 0; j < buffer.length / 4; j++)
-        {
-            field.readFromStream(stream);
-            assertEquals("Testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testWriteToBytes() {
-        IntegerField field = new IntegerField(0);
-        byte[]       array = new byte[ 4 ];
-
-        for (int b : _test_array) {
-            field.set(b);
-            field.writeToBytes(array);
-            int val = array[ 3 ] << 24;
-
-            val &= 0xFF000000;
-            val += (array[ 2 ] << 16) & 0x00FF0000;
-            val += (array[ 1 ] << 8) & 0x0000FF00;
-            val += (array[ 0 ] & 0x000000FF);
-            assertEquals("testing ", b, val);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestLittleEndian.java b/trunk/src/testcases/org/apache/poi/util/TestLittleEndian.java
deleted file mode 100644
index f398ff4..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestLittleEndian.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import junit.framework.TestCase;
-import org.apache.poi.util.LittleEndian.BufferUnderrunException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Class to test LittleEndian functionality
- *
- * @author Marc Johnson
- */
-public final class TestLittleEndian extends TestCase {
-
-    /**
-     * test the getShort() method
-     */
-    public void testGetShort() {
-        byte[] testdata = new byte[ LittleEndian.SHORT_SIZE + 1 ];
-
-        testdata[0] = 0x01;
-        testdata[1] = (byte) 0xFF;
-        testdata[2] = 0x02;
-        short expected[] = new short[2];
-
-        expected[0] = ( short ) 0xFF01;
-        expected[1] = 0x02FF;
-        assertEquals(expected[0], LittleEndian.getShort(testdata));
-        assertEquals(expected[1], LittleEndian.getShort(testdata, 1));
-    }
-
-    public void testGetUShort() {
-        byte[] testdata = {
-            (byte) 0x01,
-            (byte) 0xFF,
-            (byte) 0x02,
-        };
-        byte[] testdata2 = {
-            (byte) 0x0D,
-            (byte) 0x93,
-            (byte) 0xFF,
-        };
-
-        int expected0 = 0xFF01;
-        int expected1 = 0x02FF;
-        int expected2 = 0x930D;
-        int expected3 = 0xFF93;
-        assertEquals(expected0, LittleEndian.getUShort(testdata));
-        assertEquals(expected1, LittleEndian.getUShort(testdata, 1));
-        assertEquals(expected2, LittleEndian.getUShort(testdata2));
-        assertEquals(expected3, LittleEndian.getUShort(testdata2, 1));
-
-        byte[] testdata3 = new byte[ LittleEndian.SHORT_SIZE + 1 ];
-        LittleEndian.putUShort(testdata3, 0, expected2);
-        LittleEndian.putUShort(testdata3, 1, expected3);
-        assertEquals(testdata3[0], 0x0D);
-        assertEquals(testdata3[1], (byte)0x93);
-        assertEquals(testdata3[2], (byte)0xFF);
-        assertEquals(expected2, LittleEndian.getUShort(testdata3));
-        assertEquals(expected3, LittleEndian.getUShort(testdata3, 1));
-        
-    }
-
-    private static final byte[]   _double_array =
-    {
-        56, 50, -113, -4, -63, -64, -13, 63, 76, -32, -42, -35, 60, -43, 3, 64
-    };
-	/** 0x7ff8000000000000 encoded in little endian order */
-	private static final byte[] _nan_double_array = HexRead.readFromString("00 00 00 00 00 00 F8 7F");
-    private static final double[] _doubles      =
-    {
-        1.23456, 2.47912, Double.NaN
-    };
-
-    /**
-     * test the getDouble() method
-     */
-    public void testGetDouble() {
-        assertEquals(_doubles[0], LittleEndian.getDouble(_double_array, 0), 0.000001 );
-        assertEquals(_doubles[1], LittleEndian.getDouble( _double_array, LittleEndian.DOUBLE_SIZE), 0.000001);
-        assertTrue(Double.isNaN(LittleEndian.getDouble(_nan_double_array, 0)));
-
-        double nan = LittleEndian.getDouble(_nan_double_array, 0);
-        byte[] data = new byte[8];
-        LittleEndian.putDouble(data, 0, nan);
-        for ( int i = 0; i < data.length; i++ ) {
-            assertEquals(data[i], _nan_double_array[i]);
-        }
-    }
-
-    /**
-     * test the getInt() method
-     */
-    public void testGetInt() {
-        // reading 4 byte data from a 5 byte buffer
-        byte[] testdata = {
-                (byte) 0x01,
-                (byte) 0xFF,
-                (byte) 0xFF,
-                (byte) 0xFF,
-                (byte) 0x02,
-        };
-
-        assertEquals(0xFFFFFF01, LittleEndian.getInt(testdata));
-        assertEquals(0x02FFFFFF, LittleEndian.getInt(testdata, 1));
-    }
-
-    /**
-     * test the getLong method
-     */
-    public void testGetLong() {
-
-        // reading 8 byte values from a 9 byte buffer
-        byte[] testdata = {
-            (byte) 0x01,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0x02,
-        };
-
-        assertEquals(0xFFFFFFFFFFFFFF01L, LittleEndian.getLong(testdata, 0));
-        assertEquals(0x02FFFFFFFFFFFFFFL, LittleEndian.getLong(testdata, 1));
-    }
-
-    /**
-     * test the PutShort method
-     */
-    public void testPutShort() {
-        byte[] expected = new byte[ LittleEndian.SHORT_SIZE + 1 ];
-
-        expected[0] = 0x01;
-        expected[1] = (byte) 0xFF;
-        expected[2] = 0x02;
-        byte[] received   = new byte[ LittleEndian.SHORT_SIZE + 1 ];
-        short  testdata[] = new short[2];
-
-        testdata[0] = ( short ) 0xFF01;
-        testdata[1] = 0x02FF;
-        LittleEndian.putShort(received, 0, testdata[0]);
-        assertTrue(compareByteArrays(received, expected, 0, LittleEndian.SHORT_SIZE));
-        LittleEndian.putShort(received, 1, testdata[1]);
-        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.SHORT_SIZE));
-    }
-
-    /**
-     * test the putInt method
-     */
-    public void testPutInt() {
-        // writing 4 byte data to a 5 byte buffer
-        byte[] expected = {
-                (byte) 0x01,
-                (byte) 0xFF,
-                (byte) 0xFF,
-                (byte) 0xFF,
-                (byte) 0x02,
-        };
-        byte[] received = new byte[ LittleEndian.INT_SIZE + 1 ];
-
-        LittleEndian.putInt(received, 0, 0xFFFFFF01);
-        assertTrue(compareByteArrays(received, expected, 0, LittleEndian.INT_SIZE));
-        LittleEndian.putInt(received, 1, 0x02FFFFFF);
-        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.INT_SIZE));
-    }
-
-    /**
-     * test the putDouble methods
-     */
-    public void testPutDouble() {
-        byte[] received = new byte[ LittleEndian.DOUBLE_SIZE + 1 ];
-
-        LittleEndian.putDouble(received, 0, _doubles[0]);
-        assertTrue(compareByteArrays(received, _double_array, 0, LittleEndian.DOUBLE_SIZE));
-        LittleEndian.putDouble(received, 1, _doubles[1]);
-        byte[] expected = new byte[ LittleEndian.DOUBLE_SIZE + 1 ];
-
-        System.arraycopy(_double_array, LittleEndian.DOUBLE_SIZE, expected,
-                         1, LittleEndian.DOUBLE_SIZE);
-        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.DOUBLE_SIZE));
-    }
-
-    /**
-     * test the putLong method
-     */
-    public void testPutLong() {
-        // writing 8 byte values to a 9 byte buffer
-        byte[] expected = {
-            (byte) 0x01,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0xFF,
-            (byte) 0x02,
-        };
-        byte[] received   = new byte[ LittleEndian.LONG_SIZE + 1 ];
-
-        long testdata0 = 0xFFFFFFFFFFFFFF01L;
-        long testdata1 = 0x02FFFFFFFFFFFFFFL;
-        LittleEndian.putLong(received, 0, testdata0);
-        assertTrue(compareByteArrays(received, expected, 0, LittleEndian.LONG_SIZE));
-        LittleEndian.putLong(received, 1, testdata1);
-        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.LONG_SIZE));
-    }
-
-    private static byte[] _good_array = {
-        0x01, 0x02, 0x01, 0x02, 
-        0x01, 0x02, 0x01, 0x02, 
-        0x01, 0x02, 0x01, 0x02,
-        0x01, 0x02, 0x01, 0x02,
-    };
-    private static byte[] _bad_array  = {
-        0x01
-    };
-
-    /**
-     * test the readShort method
-     */
-    public void testReadShort() throws IOException {
-        short       expected_value = 0x0201;
-        InputStream stream         = new ByteArrayInputStream(_good_array);
-        int         count          = 0;
-
-        while (stream.available() > 0) {
-            short value = LittleEndian.readShort(stream);
-            assertEquals(value, expected_value);
-            count++;
-        }
-        assertEquals(count,
-                     _good_array.length / LittleEndianConsts.SHORT_SIZE);
-        stream = new ByteArrayInputStream(_bad_array);
-        try {
-            LittleEndian.readShort(stream);
-            fail("Should have caught BufferUnderrunException");
-        } catch (BufferUnderrunException ignored) {
-            // as expected
-        }
-    }
-
-    /**
-     * test the readInt method
-     */
-    public void testReadInt() throws IOException {
-        int         expected_value = 0x02010201;
-        InputStream stream         = new ByteArrayInputStream(_good_array);
-        int         count          = 0;
-
-        while (stream.available() > 0) {
-            int value = LittleEndian.readInt(stream);
-            assertEquals(value, expected_value);
-            count++;
-        }
-        assertEquals(count, _good_array.length / LittleEndianConsts.INT_SIZE);
-        stream = new ByteArrayInputStream(_bad_array);
-        try {
-            LittleEndian.readInt(stream);
-            fail("Should have caught BufferUnderrunException");
-        } catch (BufferUnderrunException ignored) {
-
-            // as expected
-        }
-    }
-
-    /**
-     * test the readLong method
-     */
-    public void testReadLong() throws IOException {
-        long        expected_value = 0x0201020102010201L;
-        InputStream stream         = new ByteArrayInputStream(_good_array);
-        int         count          = 0;
-
-        while (stream.available() > 0) {
-            long value = LittleEndian.readLong(stream);
-            assertEquals(value, expected_value);
-            count++;
-        }
-        assertEquals(count,
-                     _good_array.length / LittleEndianConsts.LONG_SIZE);
-        stream = new ByteArrayInputStream(_bad_array);
-        try {
-            LittleEndian.readLong(stream);
-            fail("Should have caught BufferUnderrunException");
-        } catch (BufferUnderrunException ignored) {
-            // as expected
-        }
-    }
-
-//    public void testReadFromStream() throws IOException {
-//        int actual;
-//        actual = LittleEndian.readUShort(new ByteArrayInputStream(new byte[] { 5, -128, }));
-//        assertEquals(32773, actual);
-//        
-//        actual = LittleEndian.readUShort(new ByteArrayInputStream(new byte[] { 1, 2, 3, 4, }));
-//        assertEquals(513, actual);
-//
-//        try {
-//            LittleEndian.readInt(new ByteArrayInputStream(new byte[] { 1, 2, 3, }));
-//            fail("Should have caught BufferUnderrunException");
-//        } catch (BufferUnderrunException ignored) {
-//            // as expected
-//        }
-//    }
-
-    public void testUnsignedByteToInt() {
-        assertEquals(255, LittleEndian.ubyteToInt((byte)255));
-    }
-
-    private static boolean compareByteArrays(byte [] received, byte [] expected,
-                                  int offset, int size) {
-
-        for (int j = offset; j < offset + size; j++) {
-            if (received[j] != expected[j]) {
-                System.out.println("difference at index " + j);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public void testUnsignedShort() {
-        assertEquals(0xffff, LittleEndian.getUShort(new byte[] { (byte)0xff, (byte)0xff }, 0));
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java b/trunk/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java
deleted file mode 100644
index c05e365..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-/**
- * Class to test {@link LittleEndianInputStream} and {@link LittleEndianOutputStream}
- *
- * @author Josh Micich
- */
-public final class TestLittleEndianStreams extends TestCase {
-
-	public void testRead() throws IOException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		LittleEndianOutput leo = new LittleEndianOutputStream(baos);
-		leo.writeInt(12345678);
-		leo.writeShort(12345);
-		leo.writeByte(123);
-		leo.writeShort(40000);
-		leo.writeByte(200);
-		leo.writeLong(1234567890123456789L);
-		leo.writeDouble(123.456);
-		((LittleEndianOutputStream)leo).close();
-
-		LittleEndianInput lei = new LittleEndianInputStream(new ByteArrayInputStream(baos.toByteArray()));
-
-		assertEquals(12345678, lei.readInt());
-		assertEquals(12345, lei.readShort());
-		assertEquals(123, lei.readByte());
-		assertEquals(40000, lei.readUShort());
-		assertEquals(200, lei.readUByte());
-		assertEquals(1234567890123456789L, lei.readLong());
-		assertEquals(123.456, lei.readDouble(), 0.0);
-        ((LittleEndianInputStream)lei).close();
-	}
-
-	/**
-	 * Up until svn r836101 {@link LittleEndianByteArrayInputStream#readFully(byte[], int, int)}
-	 * had an error which resulted in the data being read and written back to the source byte
-	 * array.
-	 */
-	public void testReadFully() {
-		byte[] srcBuf = HexRead.readFromString("99 88 77 66 55 44 33");
-		LittleEndianInput lei = new LittleEndianByteArrayInputStream(srcBuf);
-
-		// do initial read to increment the read index beyond zero
-		assertEquals(0x8899, lei.readUShort());
-
-		byte[] actBuf = new byte[4];
-		lei.readFully(actBuf);
-
-		if (actBuf[0] == 0x00 && srcBuf[0] == 0x77 && srcBuf[3] == 0x44) {
-			throw new AssertionFailedError("Identified bug in readFully() - source buffer was modified");
-		}
-
-		byte[] expBuf = HexRead.readFromString("77 66 55 44");
-		assertArrayEquals(actBuf, expBuf);
-		assertEquals(0x33, lei.readUByte());
-		assertEquals(0, lei.available());
-	}
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestLocaleUtil.java b/trunk/src/testcases/org/apache/poi/util/TestLocaleUtil.java
deleted file mode 100644
index 3a7c65a..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestLocaleUtil.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assume.assumeFalse;
-
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class TestLocaleUtil {
-    // This unit test assumes that the user's locale isn't ja-JP and timezone isn't Asia/Tokyo
-    // If this is the case, change the values to something else
-    private static final Locale ja_JP = Locale.JAPAN;
-    private static final TimeZone TOKYO = TimeZone.getTimeZone("Asia/Tokyo");
-    private static final Calendar JAPAN_CALENDAR = Calendar.getInstance(TOKYO, ja_JP);
-    
-    /**
-     * Reset the Locale to the user default before the test so that it isn't influenced
-     * by the LocaleUtil's state being changed by previous tests.
-     */
-    @Before
-    @SuppressForbidden("implementation around default locales in POI")
-    public void setUp() {
-        // reset the user locale and time zone so that tests do not interfere with each other
-        // the other and better way would be to run each test in its own thread since
-        // LocaleUtil uses per-thread settings.
-        // Helpful, but not ASL 2.0 licensed:
-        // http://www.codeaffine.com/2014/07/21/a-junit-rule-to-run-a-test-in-its-own-thread/
-        LocaleUtil.setUserLocale(Locale.getDefault());
-        LocaleUtil.setUserTimeZone(TimeZone.getDefault());
-        
-        assumeFalse(ja_JP.equals(LocaleUtil.getUserLocale()));
-        assumeFalse(TOKYO.equals(LocaleUtil.getUserTimeZone()));
-    }
-
-    /**
-     * Reset the Locale to the user default after the test so that it doesn't influence
-     * other tests.
-     */
-    @After
-    public void tearDown() {
-        LocaleUtil.resetUserLocale();
-        LocaleUtil.resetUserTimeZone();
-    }
-    
-    @Test
-    @SuppressForbidden("implementation around default locales in POI")
-    public void userLocale() {
-        Locale DEFAULT_LOCALE = LocaleUtil.getUserLocale();
-        
-        assertEquals(DEFAULT_LOCALE, LocaleUtil.getUserLocale());
-        assertNotEquals(ja_JP, LocaleUtil.getUserLocale());
-        
-        LocaleUtil.setUserLocale(ja_JP);
-        assertEquals(ja_JP, LocaleUtil.getUserLocale());
-        
-        LocaleUtil.resetUserLocale();
-        assertEquals(DEFAULT_LOCALE, LocaleUtil.getUserLocale());
-    }
-    
-    @Test
-    @SuppressForbidden("implementation around default locales in POI")
-    public void userTimeZone() {
-        TimeZone DEFAULT_TIME_ZONE = LocaleUtil.getUserTimeZone();
-        
-        assertEquals(DEFAULT_TIME_ZONE, LocaleUtil.getUserTimeZone());
-        assertNotEquals(TOKYO, LocaleUtil.getUserLocale());
-        
-        LocaleUtil.setUserTimeZone(TOKYO);
-        assertEquals(TOKYO, LocaleUtil.getUserTimeZone());
-    }
-    
-    @Test
-    @SuppressForbidden("implementation around default locales in POI")
-    public void localeCalendar() {
-        Locale DEFAULT_LOCALE = LocaleUtil.getUserLocale();
-        TimeZone DEFAULT_TIME_ZONE = LocaleUtil.getUserTimeZone();
-        Calendar DEFAULT_CALENDAR = LocaleUtil.getLocaleCalendar();
-        
-        assertEquals(DEFAULT_LOCALE, LocaleUtil.getUserLocale());
-        assertEquals(DEFAULT_TIME_ZONE, LocaleUtil.getUserTimeZone());
-        assertCalendarEquals(DEFAULT_CALENDAR, LocaleUtil.getLocaleCalendar());
-        assertNotEquals(ja_JP, LocaleUtil.getUserLocale());
-        assertNotEquals(TOKYO, LocaleUtil.getUserTimeZone());
-        assertCalendarNotEquals(JAPAN_CALENDAR, LocaleUtil.getLocaleCalendar());
-        
-        LocaleUtil.setUserLocale(ja_JP);
-        LocaleUtil.setUserTimeZone(TOKYO);
-        assertCalendarEquals(JAPAN_CALENDAR, LocaleUtil.getLocaleCalendar());
-        assertCalendarEquals(JAPAN_CALENDAR, LocaleUtil.getLocaleCalendar(TOKYO));
-        // FIXME: These might affect the time zone due to daylight savings:
-        //assertCalendarEquals(JAPAN_CALENDAR, LocaleUtil.getLocaleCalendar(2016, 00, 01));
-        //assertCalendarEquals(JAPAN_CALENDAR, LocaleUtil.getLocaleCalendar(2016, 00, 01, 00, 00, 00));
-    }
-    
-    private static void assertCalendarNotEquals(Calendar expected, Calendar actual) {
-        // FIXME: add more tests to compare calendars, ignoring whether the dates are equal
-        assertNotEquals("time zone", expected.getTimeZone(), actual.getTimeZone());
-    }
-    private static void assertCalendarEquals(Calendar expected, Calendar actual) {
-        // FIXME: add more tests to compare calendars, ignoring whether the set dates are equal
-        assertEquals("time zone", expected.getTimeZone(), actual.getTimeZone());
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestLongField.java b/trunk/src/testcases/org/apache/poi/util/TestLongField.java
deleted file mode 100644
index f613bae..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestLongField.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import junit.framework.*;
-
-import java.io.*;
-
-/**
- * Test LongField code
- *
- * @author  Marc Johnson (mjohnson at apache dot org)
- */
-public final class TestLongField extends TestCase {
-
-    static private final long[] _test_array =
-    {
-        Long.MIN_VALUE, -1L, 0L, 1L, Long.MAX_VALUE
-    };
-
-    public void testConstructors()
-    {
-        try
-        {
-            new LongField(-1);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        LongField field = new LongField(2);
-
-        assertEquals(0L, field.get());
-        try
-        {
-            new LongField(-1, 1L);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new LongField(2, 0x123456789ABCDEF0L);
-        assertEquals(0x123456789ABCDEF0L, field.get());
-        byte[] array = new byte[ 10 ];
-
-        try
-        {
-            new LongField(-1, 1L, array);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new LongField(2, 0x123456789ABCDEF0L, array);
-        assertEquals(0x123456789ABCDEF0L, field.get());
-        assertEquals(( byte ) 0xF0, array[ 2 ]);
-        assertEquals(( byte ) 0xDE, array[ 3 ]);
-        assertEquals(( byte ) 0xBC, array[ 4 ]);
-        assertEquals(( byte ) 0x9A, array[ 5 ]);
-        assertEquals(( byte ) 0x78, array[ 6 ]);
-        assertEquals(( byte ) 0x56, array[ 7 ]);
-        assertEquals(( byte ) 0x34, array[ 8 ]);
-        assertEquals(( byte ) 0x12, array[ 9 ]);
-        array = new byte[ 9 ];
-        try
-        {
-            new LongField(2, 5L, array);
-            fail("should have gotten ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        for (long element : _test_array) {
-            array = new byte[ 8 ];
-            new LongField(0, element, array);
-            assertEquals(element, new LongField(0, array).get());
-        }
-    }
-
-    public void testSet()
-    {
-        LongField field = new LongField(0);
-        byte[]    array = new byte[ 8 ];
-
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            field.set(_test_array[ j ]);
-            assertEquals("testing _1 " + j, _test_array[ j ], field.get());
-            field = new LongField(0);
-            field.set(_test_array[ j ], array);
-            assertEquals("testing _2 ", _test_array[ j ], field.get());
-            assertEquals("testing _3.0 " + _test_array[ j ],
-                         ( byte ) (_test_array[ j ] % 256), array[ 0 ]);
-            assertEquals("testing _3.1 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 8) % 256),
-                         array[ 1 ]);
-            assertEquals("testing _3.2 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 16) % 256),
-                         array[ 2 ]);
-            assertEquals("testing _3.3 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 24) % 256),
-                         array[ 3 ]);
-            assertEquals("testing _3.4 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 32) % 256),
-                         array[ 4 ]);
-            assertEquals("testing _3.5 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 40) % 256),
-                         array[ 5 ]);
-            assertEquals("testing _3.6 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 48) % 256),
-                         array[ 6 ]);
-            assertEquals("testing _3.7 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 56) % 256),
-                         array[ 7 ]);
-        }
-    }
-
-    public void testReadFromBytes()
-    {
-        LongField field = new LongField(1);
-        byte[]    array = new byte[ 8 ];
-
-        try
-        {
-            field.readFromBytes(array);
-            fail("should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new LongField(0);
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            array[ 0 ] = ( byte ) (_test_array[ j ] % 256);
-            array[ 1 ] = ( byte ) ((_test_array[ j ] >> 8) % 256);
-            array[ 2 ] = ( byte ) ((_test_array[ j ] >> 16) % 256);
-            array[ 3 ] = ( byte ) ((_test_array[ j ] >> 24) % 256);
-            array[ 4 ] = ( byte ) ((_test_array[ j ] >> 32) % 256);
-            array[ 5 ] = ( byte ) ((_test_array[ j ] >> 40) % 256);
-            array[ 6 ] = ( byte ) ((_test_array[ j ] >> 48) % 256);
-            array[ 7 ] = ( byte ) ((_test_array[ j ] >> 56) % 256);
-            field.readFromBytes(array);
-            assertEquals("testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testReadFromStream()
-        throws IOException
-    {
-        LongField field  = new LongField(0);
-        byte[]    buffer = new byte[ _test_array.length * 8 ];
-
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            buffer[ (j * 8) + 0 ] = ( byte ) ((_test_array[ j ] >>  0) % 256);
-            buffer[ (j * 8) + 1 ] = ( byte ) ((_test_array[ j ] >>  8) % 256);
-            buffer[ (j * 8) + 2 ] = ( byte ) ((_test_array[ j ] >> 16) % 256);
-            buffer[ (j * 8) + 3 ] = ( byte ) ((_test_array[ j ] >> 24) % 256);
-            buffer[ (j * 8) + 4 ] = ( byte ) ((_test_array[ j ] >> 32) % 256);
-            buffer[ (j * 8) + 5 ] = ( byte ) ((_test_array[ j ] >> 40) % 256);
-            buffer[ (j * 8) + 6 ] = ( byte ) ((_test_array[ j ] >> 48) % 256);
-            buffer[ (j * 8) + 7 ] = ( byte ) ((_test_array[ j ] >> 56) % 256);
-        }
-        ByteArrayInputStream stream = new ByteArrayInputStream(buffer);
-
-        for (int j = 0; j < buffer.length / 8; j++)
-        {
-            field.readFromStream(stream);
-            assertEquals("Testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testWriteToBytes()
-    {
-        LongField field = new LongField(0);
-        byte[]    array = new byte[ 8 ];
-
-        for (long element : _test_array) {
-            field.set(element);
-            field.writeToBytes(array);
-            long val = (( long ) array[ 7 ]) << 56;
-
-            val &= 0xFF00000000000000L;
-            val += ((( long ) array[ 6 ]) << 48) & 0x00FF000000000000L;
-            val += ((( long ) array[ 5 ]) << 40) & 0x0000FF0000000000L;
-            val += ((( long ) array[ 4 ]) << 32) & 0x000000FF00000000L;
-            val += ((( long ) array[ 3 ]) << 24) & 0x00000000FF000000L;
-            val += ((( long ) array[ 2 ]) << 16) & 0x0000000000FF0000L;
-            val += ((( long ) array[ 1 ]) << 8) & 0x000000000000FF00L;
-            val += (array[ 0 ] & 0x00000000000000FFL);
-            assertEquals("testing ", element, val);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestPOILogFactory.java b/trunk/src/testcases/org/apache/poi/util/TestPOILogFactory.java
deleted file mode 100644
index 115ec73..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestPOILogFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import junit.framework.TestCase;
-
-/**
- * @author Marc Johnson (mjohnson at apache dot org)
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Nicola Ken Barozzi (nicolaken at apache.org)
- */
-public final class TestPOILogFactory extends TestCase {
-
-
-    /**
-     * test log creation
-     */
-    public void testLog() {
-        //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" );
-
-        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" );
-
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java b/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java
deleted file mode 100644
index 6650ed9..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestPOILogger.java
+++ /dev/null
@@ -1,83 +0,0 @@
-
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * Tests the log class.
- */
-public final class TestPOILogger extends POILogger {
-    private String lastLog = "";
-    private Throwable lastEx = null;
-    
-    /**
-     * Test different types of log output.
-     */
-    @Test
-    public void testVariousLogTypes() throws Exception {
-        String oldLCN = POILogFactory._loggerClassName;
-        try {
-            POILogFactory._loggerClassName = TestPOILogger.class.getName();
-            POILogger log = POILogFactory.getLogger( "foo" );
-            assertTrue(log instanceof TestPOILogger);
-            
-            TestPOILogger tlog = (TestPOILogger)log;
-    
-            log.log(POILogger.WARN, "Test = ", 1);
-            assertEquals("Test = 1", tlog.lastLog);
-            
-            log.log(POILogger.ERROR, "Test ", 1,2,new Exception("bla"));
-            assertEquals("Test 12", tlog.lastLog);
-            assertNotNull(tlog.lastEx);
-            
-            log.log(POILogger.ERROR, "log\nforging", "\nevil","\nlog");
-            assertEquals("log forging evil log", tlog.lastLog);
-        } finally {
-            POILogFactory._loggerClassName = oldLCN;
-        }
-    }
-    
-    // ---------- POI Logger methods implemented for testing ----------
-
-    @Override
-    public void initialize(String cat) {
-    }
-
-    @Override
-    protected void _log(int level, Object obj1) {
-        lastLog = (obj1 == null) ? "" : obj1.toString();
-        lastEx = null;
-    }
-
-    @Override
-    protected void _log(int level, Object obj1, Throwable exception) {
-        lastLog = (obj1 == null) ? "" : obj1.toString();
-        lastEx = exception;
-    }
-
-    @Override
-    public boolean check(int level) {
-        return true;
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java b/trunk/src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java
deleted file mode 100644
index b403fc5..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.junit.Test;
-
-public class TestRLEDecompressingInputStream {
-    
-    /**
-     * Section 3.2.1 No Compression Example
-     * 
-     * The following string illustrates an ASCII text string with a set of characters that cannot be compressed
-     * by the compression algorithm specified in section 2.4.1.
-     * 
-     * abcdefghijklmnopqrstuv.
-     * 
-     * This example is provided to demonstrate the results of compressing and decompressing the string
-     * using an interoperable implementation of the algorithm specified in section 2.4.1.
-     * 
-     * The following hex array represents the compressed byte array of the example string as compressed by
-     * the compression algorithm.
-     * 
-     * 01 19 B0 00 61 62 63 64 65 66 67 68 00 69 6A 6B 6C
-     * 6D 6E 6F 70 00 71 72 73 74 75 76 2E
-     * 
-     * The following hex array represents the decompressed byte array of the example string as
-     * decompressed by the decompression algorithm.
-     * 
-     * 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71
-     * 72 73 74 75 76 2E
-     * 
-     */
-    @Test
-    public void noCompressionExample() {
-        final byte[] compressed = {
-            0x01, 0x19, (byte)0xB0, 0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x00, 0x69, 0x6A, 0x6B, 0x6C,
-            0x6D, 0x6E, 0x6F, 0x70, 0x00, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x2E
-        };
-        final String expected = "abcdefghijklmnopqrstuv.";
-        checkRLEDecompression(expected, compressed);
-    }
-
-    /**
-     * Section 3.2.2 Normal Compression Example
-     * 
-     * The following string illustrates an ASCII text string with a typical set of characters that can be
-     * compressed by the compression algorithm.
-     * 
-     *     #aaabcdefaaaaghijaaaaaklaaamnopqaaaaaaaaaaaarstuvwxyzaaa
-     * 
-     * This example is provided to demonstrate the results of compressing and decompressing the example
-     * string using an interoperable implementation of the algorithm specified in section 2.4.1.
-     * 
-     * The following hex array represents the compressed byte array of the example string as compressed by
-     * the compression algorithm:
-     * 
-     *     01 2F B0 00 23 61 61 61 62 63 64 65 82 66 00 70
-     *     61 67 68 69 6A 01 38 08 61 6B 6C 00 30 6D 6E 6F
-     *     70 06 71 02 70 04 10 72 73 74 75 76 10 77 78 79
-     *     7A 00 3C
-     * 
-     * The following hex array represents the decompressed byte array of the example string as
-     * decompressed by the decompression algorithm:
-     *
-     *     23 61 61 61 62 63 64 65  66 61 61 61 61 67 68 69
-     *     6a 61 61 61 61 61 6B 6C  61 61 61 6D 6E 6F 70 71
-     *     61 61 61 61 61 61 61 61  61 61 61 61 72 73 74 75
-     *     76 77 78 79 7A 61 61 61
-     */
-    @Test
-    public void normalCompressionExample() {
-        final byte[] compressed = {
-            0x01, 0x2F, (byte)0xB0, 0x00, 0x23, 0x61, 0x61, 0x61, 0x62, 0x63, 0x64, 0x65, (byte)0x82, 0x66, 0x00, 0x70,
-            0x61, 0x67, 0x68, 0x69, 0x6A, 0x01, 0x38, 0x08, 0x61, 0x6B, 0x6C, 0x00, 0x30, 0x6D, 0x6E, 0x6F,
-            0x70, 0x06, 0x71, 0x02, 0x70, 0x04, 0x10, 0x72, 0x73, 0x74, 0x75, 0x76, 0x10, 0x77, 0x78, 0x79,
-            0x7A, 0x00, 0x3C
-        };
-        final String expected = "#aaabcdefaaaaghijaaaaaklaaamnopqaaaaaaaaaaaarstuvwxyzaaa";
-        checkRLEDecompression(expected, compressed);
-    }
-    
-    /**
-     * Section 3.2.3 Maximum Compression Example
-     * 
-     * The following string illustrates an ASCII text string with a typical set of characters that can be
-     * compressed by the compression algorithm.
-     * 
-     *     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-     * 
-     * This example is provided to demonstrate the results of compressing and decompressing the example
-     * string using an interoperable implementation of the algorithm specified in section 2.4.1.
-     * 
-     * The following hex array represents the compressed byte array of the example string as compressed by
-     * the compression algorithm:
-     * 
-     *     01 03 B0 02 61 45 00
-     * 
-     * The following hex array represents the decompressed byte array of the example string as
-     * decompressed by the decompression algorithm:
-     *
-     *     61 61 61 61 61 61 61 61  61 61 61 61 61 61 61 61
-     *     61 61 61 61 61 61 61 61  61 61 61 61 61 61 61 61
-     *     61 61 61 61 61 61 61 61  61 61 61 61 61 61 61 61
-     *     61 61 61 61 61 61 61 61  61 61 61 61 61 61 61 61
-     *     61 61 61 61 61 61 61 61  61
-     */
-    @Test
-    public void maximumCompressionExample() {
-        final byte[] compressed = {
-            0x01, 0x03, (byte)0xB0, 0x02, 0x61, 0x45, 0x00
-        };
-        final String expected = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-        checkRLEDecompression(expected, compressed);
-    }
-    
-    @Test
-    public void decompress() throws IOException {
-        final byte[] compressed = {
-            0x01, 0x03, (byte)0xB0, 0x02, 0x61, 0x45, 0x00
-        };
-        final byte[] expanded = RLEDecompressingInputStream.decompress(compressed);
-        final byte[] expected = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".getBytes(StringUtil.UTF8);
-        assertArrayEquals(expected, expanded);
-    }
-    
-    private static void checkRLEDecompression(String expected, byte[] runLengthEncodedData) {
-        InputStream compressedStream = new ByteArrayInputStream(runLengthEncodedData);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        try {
-            InputStream stream = new RLEDecompressingInputStream(compressedStream);
-            try {
-                IOUtils.copy(stream, out);
-            } finally {
-                out.close();
-                stream.close();
-            }
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-        String expanded;
-        try {
-            expanded = out.toString(StringUtil.UTF8.name());
-        } catch (final UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        assertEquals(expected, expanded);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestShortField.java b/trunk/src/testcases/org/apache/poi/util/TestShortField.java
deleted file mode 100644
index 9e1fec6..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestShortField.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import junit.framework.*;
-
-import java.io.*;
-
-/**
- * Test ShortField code
- *
- * @author  Marc Johnson (mjohnson at apache dot org)
- */
-public final class TestShortField extends TestCase {
-
-    private static final short[] _test_array =
-    {
-        Short.MIN_VALUE, ( short ) -1, ( short ) 0, ( short ) 1,
-        Short.MAX_VALUE
-    };
-
-    public void testConstructors() {
-        try
-        {
-            new ShortField(-1);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        ShortField field = new ShortField(2);
-
-        assertEquals(0, field.get());
-        try
-        {
-            new ShortField(-1, ( short ) 1);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new ShortField(2, ( short ) 0x1234);
-        assertEquals(0x1234, field.get());
-        byte[] array = new byte[ 4 ];
-
-        try
-        {
-            new ShortField(-1, ( short ) 1, array);
-            fail("Should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new ShortField(2, ( short ) 0x1234, array);
-        assertEquals(( short ) 0x1234, field.get());
-        assertEquals(( byte ) 0x34, array[ 2 ]);
-        assertEquals(( byte ) 0x12, array[ 3 ]);
-        array = new byte[ 3 ];
-        try
-        {
-            new ShortField(2, ( short ) 5, array);
-            fail("should have gotten ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        for (short element : _test_array) {
-            array = new byte[ 2 ];
-            new ShortField(0, element, array);
-            assertEquals(element, new ShortField(0, array).get());
-        }
-    }
-
-    public void testSet() {
-        ShortField field = new ShortField(0);
-        byte[]     array = new byte[ 2 ];
-
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            field.set(_test_array[ j ]);
-            assertEquals("testing _1 " + j, _test_array[ j ], field.get());
-            field = new ShortField(0);
-            field.set(_test_array[ j ], array);
-            assertEquals("testing _2 ", _test_array[ j ], field.get());
-            assertEquals("testing _3.0 " + _test_array[ j ],
-                         ( byte ) (_test_array[ j ] % 256), array[ 0 ]);
-            assertEquals("testing _3.1 " + _test_array[ j ],
-                         ( byte ) ((_test_array[ j ] >> 8) % 256),
-                         array[ 1 ]);
-        }
-    }
-
-    public void testReadFromBytes() {
-        ShortField field = new ShortField(1);
-        byte[]     array = new byte[ 2 ];
-
-        try
-        {
-            field.readFromBytes(array);
-            fail("should have caught ArrayIndexOutOfBoundsException");
-        }
-        catch (ArrayIndexOutOfBoundsException ignored_e)
-        {
-
-            // as expected
-        }
-        field = new ShortField(0);
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            array[ 0 ] = ( byte ) (_test_array[ j ] % 256);
-            array[ 1 ] = ( byte ) ((_test_array[ j ] >> 8) % 256);
-            field.readFromBytes(array);
-            assertEquals("testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testReadFromStream() throws IOException {
-        ShortField field  = new ShortField(0);
-        byte[]     buffer = new byte[ _test_array.length * 2 ];
-
-        for (int j = 0; j < _test_array.length; j++)
-        {
-            buffer[ (j * 2) + 0 ] = ( byte ) (_test_array[ j ] % 256);
-            buffer[ (j * 2) + 1 ] = ( byte ) ((_test_array[ j ] >> 8) % 256);
-        }
-        ByteArrayInputStream stream = new ByteArrayInputStream(buffer);
-
-        for (int j = 0; j < buffer.length / 2; j++)
-        {
-            field.readFromStream(stream);
-            assertEquals("Testing " + j, _test_array[ j ], field.get());
-        }
-    }
-
-    public void testWriteToBytes() {
-        ShortField field = new ShortField(0);
-        byte[]     array = new byte[ 2 ];
-
-        for (short element : _test_array) {
-            field.set(element);
-            field.writeToBytes(array);
-            short val = ( short ) (array[ 1 ] << 8);
-
-            val &= ( short ) 0xFF00;
-            val += ( short ) (array[ 0 ] & 0x00FF);
-            assertEquals("testing ", element, val);
-        }
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java b/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java
deleted file mode 100644
index ec9792a..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.nio.charset.Charset;
-
-import org.apache.poi.util.StringUtil.StringsIterator;
-import org.junit.Test;
-
-/**
- * Unit test for StringUtil
- */
-public class TestStringUtil {
-
-    /**
-     * test getFromUnicodeHigh for symbols with code below and more 127
-     */
-    @Test
-    public void testGetFromUnicodeHighSymbolsWithCodesMoreThan127() {
-        byte[] test_data = new byte[]{0x22, 0x04,
-                                      0x35, 0x04,
-                                      0x41, 0x04,
-                                      0x42, 0x04,
-                                      0x20, 0x00,
-                                      0x74, 0x00,
-                                      0x65, 0x00,
-                                      0x73, 0x00,
-                                      0x74, 0x00,
-        };
-
-
-        assertEquals( "\u0422\u0435\u0441\u0442 test",
-                StringUtil.getFromUnicodeLE( test_data ) );
-    }
-
-    @Test
-    public void testPutCompressedUnicode() {
-        byte[] output = new byte[100];
-        byte[] expected_output =
-                {
-                    (byte) 'H', (byte) 'e', (byte) 'l', (byte) 'l',
-                    (byte) 'o', (byte) ' ', (byte) 'W', (byte) 'o',
-                    (byte) 'r', (byte) 'l', (byte) 'd', (byte) 0xAE
-                };
-        String input = new String( expected_output, Charset.forName(StringUtil.getPreferredEncoding()) );
-
-        StringUtil.putCompressedUnicode( input, output, 0 );
-        for ( int j = 0; j < expected_output.length; j++ )
-        {
-            assertEquals( "testing offset " + j, expected_output[j],
-                    output[j] );
-        }
-        StringUtil.putCompressedUnicode( input, output,
-                100 - expected_output.length );
-        for ( int j = 0; j < expected_output.length; j++ )
-        {
-            assertEquals( "testing offset " + j, expected_output[j],
-                    output[100 + j - expected_output.length] );
-        }
-        try
-        {
-            StringUtil.putCompressedUnicode( input, output,
-                    101 - expected_output.length );
-            fail( "Should have caught ArrayIndexOutOfBoundsException" );
-        }
-        catch ( ArrayIndexOutOfBoundsException ignored )
-        {
-            // as expected
-        }
-    }
-
-    @Test
-    public void testPutUncompressedUnicode() {
-        byte[] output = new byte[100];
-        String input = "Hello World";
-        byte[] expected_output =
-                {
-                    (byte) 'H', (byte) 0, (byte) 'e', (byte) 0, (byte) 'l',
-                    (byte) 0, (byte) 'l', (byte) 0, (byte) 'o', (byte) 0,
-                    (byte) ' ', (byte) 0, (byte) 'W', (byte) 0, (byte) 'o',
-                    (byte) 0, (byte) 'r', (byte) 0, (byte) 'l', (byte) 0,
-                    (byte) 'd', (byte) 0
-                };
-
-        StringUtil.putUnicodeLE( input, output, 0 );
-        for ( int j = 0; j < expected_output.length; j++ )
-        {
-            assertEquals( "testing offset " + j, expected_output[j],
-                    output[j] );
-        }
-        StringUtil.putUnicodeLE( input, output,
-                100 - expected_output.length );
-        for ( int j = 0; j < expected_output.length; j++ )
-        {
-            assertEquals( "testing offset " + j, expected_output[j],
-                    output[100 + j - expected_output.length] );
-        }
-        try
-        {
-            StringUtil.putUnicodeLE( input, output,
-                    101 - expected_output.length );
-            fail( "Should have caught ArrayIndexOutOfBoundsException" );
-        }
-        catch ( ArrayIndexOutOfBoundsException ignored )
-        {
-            // as expected
-        }
-    }
-
-    @Test
-    public void testStringsIterator() {
-       StringsIterator i;
-
-       
-       i = new StringsIterator(new String[0]);
-       assertFalse(i.hasNext());
-       try {
-          i.next();
-          fail();
-       } catch(ArrayIndexOutOfBoundsException e) {}
-
-       
-       i = new StringsIterator(new String[] {"1"});
-       assertTrue(i.hasNext());
-       assertEquals("1", i.next());
-       
-       assertFalse(i.hasNext());
-       try {
-          i.next();
-          fail();
-       } catch(ArrayIndexOutOfBoundsException e) {}
-
-       
-       i = new StringsIterator(new String[] {"1","2","3"});
-       assertTrue(i.hasNext());
-       assertEquals("1", i.next());
-       assertTrue(i.hasNext());
-       assertEquals("2", i.next());
-       assertTrue(i.hasNext());
-       assertEquals("3", i.next());
-       
-       assertFalse(i.hasNext());
-       try {
-          i.next();
-          fail();
-       } catch(ArrayIndexOutOfBoundsException e) {}
-    }
-    
-
-    @Test
-    public void startsWithIgnoreCase() {
-        assertTrue("same string", StringUtil.startsWithIgnoreCase("Apache POI", "Apache POI"));
-        assertTrue("longer string", StringUtil.startsWithIgnoreCase("Apache POI project", "Apache POI"));
-        assertTrue("different case", StringUtil.startsWithIgnoreCase("APACHE POI", "Apache POI"));
-        assertFalse("leading whitespace should not be ignored", StringUtil.startsWithIgnoreCase(" Apache POI project", "Apache POI"));
-        assertFalse("shorter string", StringUtil.startsWithIgnoreCase("Apache", "Apache POI"));;
-    }
-    
-    @Test
-    public void endsWithIgnoreCase() {
-        assertTrue("same string", StringUtil.endsWithIgnoreCase("Apache POI", "Apache POI"));
-        assertTrue("longer string", StringUtil.endsWithIgnoreCase("Project Apache POI", "Apache POI"));
-        assertTrue("different case", StringUtil.endsWithIgnoreCase("APACHE POI", "Apache POI"));
-        assertFalse("trailing whitespace should not be ignored", StringUtil.endsWithIgnoreCase("Apache POI project ", "Apache POI"));
-        assertFalse("shorter string", StringUtil.endsWithIgnoreCase("Apache", "Apache POI"));
-    }
-    
-    @Test
-    public void join() {
-        assertEquals("", StringUtil.join(",")); // degenerate case: nothing to join
-        assertEquals("abc", StringUtil.join(",", "abc")); // degenerate case: one thing to join, no trailing comma
-        assertEquals("abc|def|ghi", StringUtil.join("|", "abc", "def", "ghi"));
-        assertEquals("5|8.5|true|string", StringUtil.join("|", 5, 8.5, true, "string")); //assumes Locale prints number decimal point as a period rather than a comma
-        
-        String[] arr = new String[] { "Apache", "POI", "project" };
-        assertEquals("no separator", "ApachePOIproject", StringUtil.join(arr));
-        assertEquals("separator", "Apache POI project", StringUtil.join(arr, " "));
-    }
-    
-    @Test
-    public void count() {
-        String test = "Apache POI project\n\u00a9 Copyright 2016";
-        // supports search in null or empty string
-        assertEquals("null", 0, StringUtil.countMatches(null, 'A'));
-        assertEquals("empty string", 0, StringUtil.countMatches("", 'A'));
-        
-        assertEquals("normal", 2, StringUtil.countMatches(test, 'e'));
-        assertEquals("normal, should not find a in escaped copyright", 1, StringUtil.countMatches(test, 'a'));
-        
-        // search for non-printable characters
-        assertEquals("null character", 0, StringUtil.countMatches(test, '\0'));
-        assertEquals("CR", 0, StringUtil.countMatches(test, '\r'));
-        assertEquals("LF", 1, StringUtil.countMatches(test, '\n'));
-        
-        // search for unicode characters
-        assertEquals("Unicode", 1, StringUtil.countMatches(test, '\u00a9'));
-    }
-}
-
diff --git a/trunk/src/testcases/org/apache/poi/util/TestTempFile.java b/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
deleted file mode 100644
index e893f00..0000000
--- a/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.poifs.dev.TestPOIFSDump;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-public class TestTempFile {
-    private String previousTempDir;
-    private File tempDir;
-    
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Before
-    public void setUp() throws IOException {
-        previousTempDir = System.getProperty(TempFile.JAVA_IO_TMPDIR);
-
-        // use a separate tempdir for the tests to be able to check for leftover files
-        tempDir = File.createTempFile("TestTempFile", ".tst");
-        assertTrue(tempDir.delete());
-        assertTrue(tempDir.mkdirs());
-        System.setProperty(TempFile.JAVA_IO_TMPDIR, tempDir.getAbsolutePath());
-    }
-
-    @After
-    public void tearDown() throws IOException {
-        String[] files = tempDir.list();
-        // can have the "poifiles" subdir
-        if(files.length == 1) {
-            assertEquals("Had: " + Arrays.toString(files), DefaultTempFileCreationStrategy.POIFILES, files[0]);
-            files = new File(tempDir, files[0]).list();
-            assertEquals("Had: " + Arrays.toString(files), 0, files.length);
-        } else {
-            assertEquals("Had: " + Arrays.toString(files), 0, files.length);
-        }
-
-        // remove the directory after the tests
-        TestPOIFSDump.deleteDirectory(tempDir);
-
-        if(previousTempDir == null) {
-            System.clearProperty(TempFile.JAVA_IO_TMPDIR);
-        } else {
-            System.setProperty(TempFile.JAVA_IO_TMPDIR, previousTempDir);
-        }
-
-        // reset strategy to re-create the directory
-        TempFile.setTempFileCreationStrategy(new DefaultTempFileCreationStrategy());
-
-        // check that we can still create a tempfile
-        File testFile = TempFile.createTempFile("test", ".tst");
-        assertTrue(testFile.exists());
-        assertTrue(testFile.delete());
-    }
-
-    @Test
-    public void testCreateTempFile() throws IOException
-    {
-        File tempFile = TempFile.createTempFile("test", ".txt");
-        FileOutputStream fos = new FileOutputStream(tempFile);
-        fos.write(1); //file can be written to
-        fos.close();
-        assertTrue("temp file exists", tempFile.exists());
-        assertTrue("temp file is a file", tempFile.isFile());
-        assertTrue("temp file's name should start with test",
-                tempFile.getName().startsWith("test"));
-        assertTrue("temp file's name should end with .txt",
-                tempFile.getName().endsWith(".txt"));
-        assertEquals("temp file is saved in poifiles directory",
-                DefaultTempFileCreationStrategy.POIFILES, tempFile.getParentFile().getName());
-
-        // Can't think of a good way to check whether a file is actually deleted since it would require the VM to stop.
-        // Solution: set TempFileCreationStrategy to something that the unit test can trigger a deletion"
-        assertTrue("Unable to delete temp file", tempFile.delete());
-    }
-    
-    @Test
-    public void createTempFileWithDefaultSuffix() throws IOException {
-        File tempFile = TempFile.createTempFile("test", null);
-        assertTrue("temp file's name should end with .tmp",
-                tempFile.getName().endsWith(".tmp"));
-    }
-    
-    @Test
-    public void testCreateTempDirectory() throws IOException
-    {
-        File tempDir = TempFile.createTempDirectory("testDir");
-        assertTrue("testDir exists", tempDir.exists());
-        assertTrue("testDir is a directory", tempDir.isDirectory());
-        assertTrue("testDir's name starts with testDir",
-                tempDir.getName().startsWith("testDir"));
-        assertEquals("tempDir is saved in poifiles directory",
-                DefaultTempFileCreationStrategy.POIFILES, tempDir.getParentFile().getName());
-
-        // Can't think of a good way to check whether a directory is actually deleted since it would require the VM to stop.
-        // Solution: set TempFileCreationStrategy to something that the unit test can trigger a deletion"
-        assertTrue("Unable to delete tempDir", tempDir.delete());
-    }
-    
-    @Test
-    public void testSetTempFileCreationStrategy() throws IOException {
-        TempFile.setTempFileCreationStrategy(new DefaultTempFileCreationStrategy());
-        
-        // Should be able to create two tempfiles with same prefix and suffix
-        File file1 = TempFile.createTempFile("TestTempFile", ".tst");
-        File file2 = TempFile.createTempFile("TestTempFile", ".tst");
-        assertFalse(file1.equals(file2));
-        assertNotNull(file2);
-        assertTrue(file2.delete());
-        assertNotNull(file1);
-        assertTrue(file1.delete());
-        
-        thrown.expect(IllegalArgumentException.class);
-        TempFile.setTempFileCreationStrategy(null);
-    }
-}
diff --git a/trunk/src/testcases/org/apache/poi/util/data/test_properties1 b/trunk/src/testcases/org/apache/poi/util/data/test_properties1
deleted file mode 100644
index 5c88809..0000000
--- a/trunk/src/testcases/org/apache/poi/util/data/test_properties1
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set root category priority to DEBUG and its only appender to A1.
-log4j.rootCategory=DEBUG, A1
- 
-# A1 is set to be a FileAppender.
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=p1.log
- 
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-#log4j.category.org.apache.cocoon.poi=WARN
diff --git a/trunk/src/testcases/org/apache/poi/util/data/test_properties2 b/trunk/src/testcases/org/apache/poi/util/data/test_properties2
deleted file mode 100644
index dbf3f81..0000000
--- a/trunk/src/testcases/org/apache/poi/util/data/test_properties2
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set root category priority to DEBUG and its only appender to A2.
-log4j.rootCategory=DEBUG, A2
- 
-# A2 is set to be a FileAppender.
-log4j.appender.A2=org.apache.log4j.FileAppender
-log4j.appender.A2.File=p2.log
- 
-# A2 uses PatternLayout.
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-#log4j.category.org.apache.cocoon.poi=WARN
diff --git a/trunk/src/testcases/org/apache/poi/util/data/test_properties3 b/trunk/src/testcases/org/apache/poi/util/data/test_properties3
deleted file mode 100644
index 84ba40d..0000000
--- a/trunk/src/testcases/org/apache/poi/util/data/test_properties3
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set root category priority to DEBUG and its only appender to A3.
-log4j.rootCategory=DEBUG, A3
- 
-# A3 is set to be a FileAppender.
-log4j.appender.A3=org.apache.log4j.FileAppender
-log4j.appender.A3.File=POILogger.log
- 
-# A3 uses PatternLayout.
-log4j.appender.A3.layout=org.apache.log4j.PatternLayout
-log4j.appender.A3.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-#log4j.category.org.apache.cocoon.poi=WARN
diff --git a/trunk/src/types/definitions/FFData_type.xml b/trunk/src/types/definitions/FFData_type.xml
deleted file mode 100644
index 2016adb..0000000
--- a/trunk/src/types/definitions/FFData_type.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FFDataBase" package="org.apache.poi.hwpf.model.types">
-	<suffix>AbstractType</suffix>
-	<description>The FFData structure specifies form field data for a text
-		box, check box, or drop-down list box. &lt;p&gt;Class and fields
-		descriptions are quoted from [MS-DOC] -- v20121003 Word (.doc) Binary
-		File Format; Copyright (c) 2012 Microsoft Corporation; Release:
-		October 8, 2012
-	</description>
-	<author>Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word
-		(.doc) Binary File Format; Copyright (c) 2012 Microsoft Corporation;
-		Release: October 8, 2012
-	</author>
-	<fields>
-		<field type="long" size="4" name="version"
-			description="An unsigned integer that MUST be 0xFFFFFFFF" />
-		<field type="short" size="2" name="bits"
-			description="An FFDataBits that specifies the type and state of this form field">
-			<bit mask="0x0003" name="iType"
-				description="An unsigned integer that specifies the type of the form field. ">
-				<const type="byte" value="0" name="Text"
-					description="Specifies that the form field is a textbox." />
-				<const type="byte" value="1" name="Chck"
-					description="Specifies that the form field is a checkbox." />
-				<const type="byte" value="2" name="Drop"
-					description="Specifies that the form field is a dropdown list box." />
-			</bit>
-			<bit mask="0x007C" name="iRes"
-				description="An unsigned integer. If iType is iTypeText (0), then iRes MUST be 0. If iType is iTypeChck (1), iRes specifies the state of the checkbox and MUST be 0 (unchecked), 1 (checked), or 25 (undefined). Undefined checkboxes are treated as unchecked. If iType is iTypeDrop (2), iRes specifies the current selected list box item. A value of 25 specifies the selection is undefined. Otherwise, iRes is a zero-based index into FFData.hsttbDropList." />
-			<bit mask="0x0080" name="fOwnHelp"
-				description="A bit that specifies whether the form field has custom help text in FFData.xstzHelpText. If fOwnHelp is 0, FFData.xstzHelpText contains an empty or auto-generated string." />
-			<bit mask="0x0100" name="fOwnStat"
-				description="A bit that specifies whether the form field has custom status bar text in FFData.xstzStatText. If fOwnStat is 0, FFData.xstzStatText contains an empty or auto-generated string." />
-			<bit mask="0x0200" name="fProt"
-				description="A bit that specifies whether the form field is protected and its value cannot be changed." />
-			<bit mask="0x0400" name="iSize"
-				description="A bit that specifies whether the size of a checkbox is automatically determined by the text size where the checkbox is located. This value MUST be 0 if iType is not iTypeChck (1)." />
-			<bit mask="0x3800" name="iTypeTxt"
-				description="An unsigned integer that specifies the type of the textbox. If iType is not iTypeText (0), iTypeTxt MUST be 0 and MUST be ignored." >
-				<const type="byte" value="0" name="Reg"
-					description="Specifies that the textbox value is regular text." />
-				<const type="byte" value="0" name="Num"
-					description="Specifies that the textbox value is a number." />
-				<const type="byte" value="0" name="Date"
-					description="Specifies that the textbox value is a date or time." />
-				<const type="byte" value="0" name="CurDate"
-					description="Specifies that the textbox value is the current date." />
-				<const type="byte" value="0" name="CurTime"
-					description="Specifies that the textbox value is the current time." />
-				<const type="byte" value="0" name="Calc"
-					description="Specifies that the textbox value is calculated from an expression. The expression is given by FFData.xstzTextDef." />
-			</bit>
-			<bit mask="0x4000" name="fRecalc"
-				description="A bit that specifies whether the value of the field is automatically calculated after the field is modified." />
-			<bit mask="0x8000" name="fHasListBox"
-				description="A bit that specifies that the form field has a list box. This value MUST be 1 if iType is iTypeDrop (2). Otherwise, this value MUST be 0." />
-		</field>
-		<field type="int" size="2" name="cch"
-			description="An unsigned integer that specifies the maximum length, in characters, of the value of the textbox. This value MUST NOT exceed 32767. A value of 0 means there is no maximum length of the value of the textbox. If bits.iType is not iTypeText (0), this value MUST be 0." />
-		<field type="int" size="2" name="hps"
-			description="An unsigned integer. If bits.iType is iTypeChck (1), hps specifies the size, in half-points, of the checkbox and MUST be between 2 and 3168, inclusive. If bits.iType is not iTypeChck (1), hps is undefined and MUST be ignored." />
-	</fields>
-</record>
diff --git a/trunk/src/types/definitions/FibBase_type.xml b/trunk/src/types/definitions/FibBase_type.xml
deleted file mode 100644
index 37c81a4..0000000
--- a/trunk/src/types/definitions/FibBase_type.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FibBase" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>Base part of the File information Block (FibBase). Holds the core part of the FIB,
-        from the first 32 bytes. &lt;p&gt;Class and fields descriptions are quoted from Microsoft
-        Office Word 97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File
-        Format
-    </description>
-    <author>Andrew C. Oliver; Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
-        File Format Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="int" size="2" name="wIdent"
-            description="An unsigned integer that specifies that this is a Word Binary File. This value MUST be 0xA5EC"/>
-        <field type="int" size="2" name="nFib"
-            description="An unsigned integer that specifies the version number of the file format used. Superseded by FibRgCswNew.nFibNew if it is present. This value SHOULD be 0x00C1"/>
-        <field type="int" size="2" name="unused" description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="2" name="lid"
-            description="A LID that specifies the install language of the application that is producing the document. If nFib is 0x00D9 or greater, then any East Asian install lid or any install lid with a base language of Spanish, German or French MUST be recorded as lidAmerican. If the nFib is 0x0101 or greater, then any install lid with a base language of Vietnamese, Thai, or Hindi MUST be recorded as lidAmerican."/>
-        <field type="int" size="2" name="pnNext"
-            description="An unsigned integer that specifies the offset in the WordDocument stream of the FIB for the document which contains all the AutoText items"/>
-        <field type="short" size="2" name="flags1">
-            <bit mask="0x0001" name="fDot" description="Specifies whether this is a document template"/>
-            <bit mask="0x0002" name="fGlsy"
-                description="Specifies whether this is a document that contains only AutoText items"/>
-            <bit mask="0x0004" name="fComplex"
-                description="Specifies that the last save operation that was performed on this document was an incremental save operation"/>
-            <bit mask="0x0008" name="fHasPic" description="When set to 0, there SHOULD be no pictures in the document"/>
-            <bit mask="0x00F0" name="cQuickSaves"
-                description="An unsigned integer. If nFib is less than 0x00D9, then cQuickSaves specifies the number of consecutive times this document was incrementally saved. If nFib is 0x00D9 or greater, then cQuickSaves MUST be 0xF"/>
-            <bit mask="0x0100" name="fEncrypted"
-                description="Specifies whether the document is encrypted or obfuscated as specified in Encryption and Obfuscation"/>
-            <bit mask="0x0200" name="fWhichTblStm"
-                description="Specifies the Table stream to which the FIB refers. When this value is set to 1, use 1Table; when this value is set to 0, use 0Table."/>
-            <bit mask="0x0400" name="fReadOnlyRecommended"
-                description="Specifies whether the document author recommended that the document be opened in read-only mode"/>
-            <bit mask="0x0800" name="fWriteReservation"
-                description="Specifies whether the document has a write-reservation password"/>
-            <bit mask="0x1000" name="fExtChar" description="This value MUST be 1"/>
-            <bit mask="0x2000" name="fLoadOverride"
-                description="Specifies whether to override the language information and font that are specified in the paragraph style at istd 0 (the normal style) with the defaults that are appropriate for the installation language of the application"/>
-            <bit mask="0x4000" name="fFarEast"
-                description="Specifies whether the installation language of the application that created the document was an East Asian language"/>
-            <bit mask="0x8000" name="fObfuscated"
-                description="If fEncrypted is 1, this bit specifies whether the document is obfuscated by using XOR obfuscation; otherwise, this bit MUST be ignored"/>
-        </field>
-        <field type="int" size="2" name="nFibBack"
-            description="This value SHOULD be 0x00BF. This value MUST be 0x00BF or 0x00C1"/>
-        <field type="int" size="4" name="lKey"
-            description="If fEncryption is 1 and fObfuscation is 1, this value specifies the XOR obfuscation password verifier. If fEncryption is 1 and fObfuscation is 0, this value specifies the size of the EncryptionHeader that is stored at the beginning of the Table stream as described in Encryption and Obfuscation. Otherwise, this value MUST be 0"/>
-        <field type="byte" size="1" name="envr" deprecated="true"
-            description="This value MUST be 0, and MUST be ignored"/>
-        <field type="byte" size="1" name="flags2">
-            <bit mask="0x01" name="fMac" deprecated="true" description="This value MUST be 0, and MUST be ignored"/>
-            <bit mask="0x02" name="fEmptySpecial" deprecated="true"
-                description="This value SHOULD be 0 and SHOULD be ignored"/>
-            <bit mask="0x04" name="fLoadOverridePage"
-                description="Specifies whether to override the section properties for page size, orientation, and margins with the defaults that are appropriate for the installation language of the application"/>
-            <bit mask="0x08" name="reserved1" deprecated="true"
-                description="This value is undefined and MUST be ignored"/>
-            <bit mask="0x10" name="reserved2" deprecated="true"
-                description="This value is undefined and MUST be ignored"/>
-            <bit mask="0xFE" name="fSpare0" deprecated="true"
-                description="This value is undefined and MUST be ignored"/>
-        </field>
-        <field type="short" size="2" name="Chs" deprecated="true"
-            description="This value MUST be 0 and MUST be ignored"/>
-        <field type="short" size="2" name="chsTables" deprecated="true"
-            description="This value MUST be 0 and MUST be ignored"/>
-        <field type="int" size="4" name="fcMin" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="fcMac" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-    </fields>
-
-</record>
diff --git a/trunk/src/types/definitions/FibRgLw95_type.xml b/trunk/src/types/definitions/FibRgLw95_type.xml
deleted file mode 100644
index 74c5dc5..0000000
--- a/trunk/src/types/definitions/FibRgLw95_type.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FibRgLw95" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The FibRgLw95 structure is the third section of the FIB for Word95.
-    </description>
-    <author>Sergey Vladimirov
-    </author>
-    <fields>
-        <field type="int" size="4" name="cbMac"/>
-
-        <field type="int" size="4" name="reserved1" deprecated="true"/>
-        <field type="int" size="4" name="reserved2" deprecated="true"/>
-        <field type="int" size="4" name="reserved3" deprecated="true"/>
-        <field type="int" size="4" name="reserved4" deprecated="true"/>
-
-        <field type="int" size="4" name="ccpText"/>
-        <field type="int" size="4" name="ccpFtn"/>
-        <field type="int" size="4" name="ccpHdd"/>
-        <field type="int" size="4" name="ccpMcr"/>
-        <field type="int" size="4" name="ccpAtn"/>
-        <field type="int" size="4" name="ccpEdn"/>
-        <field type="int" size="4" name="ccpTxbx"/>
-        <field type="int" size="4" name="ccpHdrTxbx"/>
-
-        <field type="int" size="4" name="reserved5" deprecated="true"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/FibRgLw97_type.xml b/trunk/src/types/definitions/FibRgLw97_type.xml
deleted file mode 100644
index 0fafcc9..0000000
--- a/trunk/src/types/definitions/FibRgLw97_type.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FibRgLw97" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The FibRgLw97 structure is the third section of the FIB. This contains an array of
-        4-byte values. &lt;p&gt;Class and fields descriptions are quoted from Microsoft Office Word
-        97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="int" size="4" name="cbMac"
-            description="Specifies the count of bytes of those written to the WordDocument stream of the file that have any meaning. All bytes in the WordDocument stream at offset cbMac and greater MUST be ignored."/>
-
-        <field type="int" size="4" name="reserved1" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="reserved2" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-
-        <field type="int" size="4" name="ccpText"
-            description="A signed integer that specifies the count of CPs in the main document. This value MUST be zero, 1, or greater"/>
-        <field type="int" size="4" name="ccpFtn"
-            description="A signed integer that specifies the count of CPs in the footnote subdocument. This value MUST be zero, 1, or greater"/>
-        <field type="int" size="4" name="ccpHdd"
-            description="A signed integer that specifies the count of CPs in the header subdocument. This value MUST be zero, 1, or greater"/>
-
-        <field type="int" size="4" name="reserved3" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-
-        <field type="int" size="4" name="ccpAtn"
-            description="A signed integer that specifies the count of CPs in the comment subdocument. This value MUST be zero, 1, or greater"/>
-        <field type="int" size="4" name="ccpEdn"
-            description="A signed integer that specifies the count of CPs in the endnote subdocument. This value MUST be zero, 1, or greater"/>
-        <field type="int" size="4" name="ccpTxbx"
-            description="A signed integer that specifies the count of CPs in the textbox subdocument of the main document. This value MUST be zero, 1, or greater"/>
-        <field type="int" size="4" name="ccpHdrTxbx"
-            description="A signed integer that specifies the count of CPs in the textbox subdocument of the header. This value MUST be zero, 1, or greater"/>
-
-        <field type="int" size="4" name="reserved4" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="reserved5" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-
-        <field type="int" size="4" name="reserved6" deprecated="true"
-            description="This value MUST be equal or less than the number of data elements in PlcBteChpx, as specified by FibRgFcLcb97.fcPlcfBteChpx and FibRgFcLcb97.lcbPlcfBteChpx. This value MUST be ignored"/>
-
-        <field type="int" size="4" name="reserved7" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="reserved8" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="reserved9" deprecated="true"
-            description="This value MUST be less than or equal to the number of data elements in PlcBtePapx, as specified by FibRgFcLcb97.fcPlcfBtePapx and FibRgFcLcb97.lcbPlcfBtePapx. This value MUST be ignored"/>
-        <field type="int" size="4" name="reserved10" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="reserved11" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="reserved12" deprecated="true"
-            description="This value SHOULD be zero, and MUST be ignored"/>
-        <field type="int" size="4" name="reserved13" deprecated="true"
-            description="This value MUST be zero and MUST be ignored"/>
-        <field type="int" size="4" name="reserved14" deprecated="true"
-            description="This value MUST be zero and MUST be ignored"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/FibRgW97_type.xml b/trunk/src/types/definitions/FibRgW97_type.xml
deleted file mode 100644
index 7f902d2..0000000
--- a/trunk/src/types/definitions/FibRgW97_type.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FibRgW97" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The FibRgW97 structure is a variable-length portion of the Fib. &lt;p&gt;Class and
-        fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and
-        [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="short" size="2" name="wMagicCreated" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="wMagicRevised" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="wMagicCreatedPrivate" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="wMagicRevisedPrivate" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="pnFbpChpFirst_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="pnChpFirst_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="cpnBteChp_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="pnFbpPapFirst_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="pnPapFirst_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="cpnBtePap_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="pnFbpLvcFirst_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="pnLvcFirst_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="cpnBteLvc_W6" deprecated="true"
-            description="This value is undefined and MUST be ignored"/>
-        <field type="short" size="2" name="lidFE" description="A LID whose meaning depends on the nFib value"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/LFOLVLBase_type.xml b/trunk/src/types/definitions/LFOLVLBase_type.xml
deleted file mode 100644
index 1cafd75..0000000
--- a/trunk/src/types/definitions/LFOLVLBase_type.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="LFOLVLBase" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The LFOLVL structure contains information that is used to override the formatting
-        information of a corresponding LVL. &lt;p&gt;Class and fields descriptions are quoted from
-        Microsoft Office Word 97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary
-        File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="int" size="4" name="iStartAt"
-            description="If fStartAt is set to 0x1, this is a signed integer that specifies the start-at value that overrides lvlf.iStartAt of the corresponding LVL. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If both fStartAt and fFormatting are set to 0x1, or if fStartAt is set to 0x0, this value is undefined and MUST be ignored"/>
-        <field type="int" size="4" name="flags">
-            <bit mask="0x0000000F" name="iLvl"
-                description="An unsigned integer that specifies the zero-based level of the list that this overrides. This LFOLVL overrides the LVL that specifies the level formatting of this level of the LSTF that is specified by the lsid field of the LFO to which this LFOLVL corresponds. This value MUST be less than or equal to 0x08"/>
-            <bit mask="0x00000010" name="fStartAt"
-                description="A bit that specifies whether this LFOLVL overrides the start-at value of the level."/>
-            <bit mask="0x00000020" name="fFormatting"
-                description="A bit that specifies whether lvl is an LVL that overrides the corresponding LVL"/>
-            <bit mask="0x00003FC0" name="grfhic"
-                description="A grfhic that specifies the HTML incompatibilities of the overriding level formatting"/>
-            <bit mask="0x1FFFC000" name="unused1" deprecated="true" description="This MUST be ignored"/>
-            <bit mask="0xE0000000" name="unused2" deprecated="true" description="This MUST be ignored"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/StdfBase_type.xml b/trunk/src/types/definitions/StdfBase_type.xml
deleted file mode 100644
index 5b9918f..0000000
--- a/trunk/src/types/definitions/StdfBase_type.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="StdfBase" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The StdfBase structure specifies general information about a style. &lt;p&gt;Class
-        and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and
-        [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="short" size="2" name="info1">
-            <bit number="1" mask="0x0FFF" name="sti"
-                description="An unsigned integer that specifies the invariant style identifier for application-defined styles, or 0x0FFE for user-defined styles"/>
-            <bit number="2" mask="0x1000" name="fScratch"
-                description="spare field for any temporary use, always reset back to zero!"/>
-            <bit number="3" mask="0x2000" name="fInvalHeight"
-                description="Specifies whether the paragraph height information in the fcPlcfPhe field of FibRgFcLcb97, for any paragraphs having this paragraph style, MUST be ignored. SHOULD be 0"/>
-            <bit number="4" mask="0x4000" name="fHasUpe" description="This bit is undefined and MUST be ignored"/>
-            <bit number="5" mask="0x8000" name="fMassCopy" description="This bit is undefined and MUST be ignored"/>
-        </field>
-        <field type="short" size="2" name="info2">
-            <bit number="1" mask="0x000F" name="stk" description="style kind"/>
-            <bit number="2" mask="0xFFF0" name="istdBase" description="base style"/>
-        </field>
-        <field type="short" size="2" name="info3">
-            <bit number="1" mask="0x000F" name="cupx" description="number of UPXs (and UPEs)"/>
-            <bit number="2" mask="0xFFF0" name="istdNext" description="next style"/>
-        </field>
-        <field type="int" size="2" name="bchUpe"
-            description="An unsigned integer that specifies the size, in bytes, of std in LPStd. This value MUST be equal to cbStd in LPStd"/>
-        <field type="short" size="2" name="grfstd"
-            description="A GRFSTD that specifies miscellaneous style properties">
-            <bit number="1" mask="0x0001" name="fAutoRedef" description="number of UPXs (and UPEs)"/>
-            <bit number="2" mask="0x0002" name="fHidden"
-                description="Specifies whether this style is not shown in the application UI"/>
-            <bit number="3" mask="0x0004" name="f97LidsSet"
-                description="Specifies whether sprmCRgLid0_80 and sprmCRgLid1_80 were applied, as appropriate, to this paragraph or character style for compatibility with applications that do not support sprmCRgLid0, sprmCRgLid1, and sprmCFNoProof"/>
-            <bit number="4" mask="0x0008" name="fCopyLang"
-                description="If f97LidsSet is 1, this value specifies whether the applied compatibility sprmCRgLid0_80 or sprmCRgLid1_80 specified an actual language or a special LID value (0x0400) signifying that no proofing is needed for the text. This MUST be ignored if f97LidsSet is 0"/>
-            <bit number="5" mask="0x0010" name="fPersonalCompose"
-                description="Specifies whether this character style can be used to automatically format the new message text in a new e-mail"/>
-            <bit number="6" mask="0x0020" name="fPersonalReply"
-                description="Specifies whether this character style can be used to automatically format the new message text when replying to an e-mail"/>
-            <bit number="7" mask="0x0040" name="fPersonal"
-                description="Specifies whether this character style was applied to format all message text from one or more users in an e-mail"/>
-            <bit number="8" mask="0x0080" name="fNoHtmlExport" description="This value MUST be 0 and MUST be ignored"/>
-            <bit number="9" mask="0x0100" name="fSemiHidden"
-                description="Specifies whether this style is not shown in the simplified main styles UI of the application"/>
-            <bit number="10" mask="0x0200" name="fLocked"
-                description="Specifies whether this style is prevented from being applied by using the application UI"/>
-            <bit number="11" mask="0x0400" name="fInternalUse" description="This bit is undefined and MUST be ignored"/>
-            <bit number="12" mask="0x0800" name="fUnhideWhenUsed"
-                description="Specifies whether the fSemiHidden property is to be set to 0 when this style is used"/>
-            <bit number="13" mask="0x1000" name="fQFormat"
-                description="Specifies whether this style is shown in the Ribbon Style gallery"/>
-            <bit number="14" mask="0xE000" name="fReserved" description="This value MUST be 0 and MUST be ignored"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/StdfPost2000_type.xml b/trunk/src/types/definitions/StdfPost2000_type.xml
deleted file mode 100644
index 277962f..0000000
--- a/trunk/src/types/definitions/StdfPost2000_type.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="StdfPost2000" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The StdfPost2000 structure specifies general information about a style.
-        &lt;p&gt;Class and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary
-        File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="short" size="2" name="info1">
-            <bit number="1" mask="0x0FFF" name="istdLink"
-                description="An unsigned integer that specifies the istd of the style that is linked to this one, or 0x0000 if this style is not linked to any other style in the document."/>
-            <bit number="2" mask="0x1000" name="fHasOriginalStyle"
-                description="Specifies whether the style is revision-marked. A revision-marked style stores the pre-revision formatting in addition to the current formatting. If this bit is set to 1, the cupx member of StdfBase MUST include the formatting sets that specify that pre-revision formatting"/>
-            <bit number="3" mask="0xE000" name="fSpare"
-                description="Specifies whether the paragraph height information in the fcPlcfPhe field of FibRgFcLcb97"/>
-        </field>
-        <field type="long" size="4" name="rsid" description=" An unsigned integer that specifies the revision save identifier of the session when this style definition was last modified"/>
-        <field type="short" size="2" name="info3">
-            <bit number="1" mask="0x0007" name="iftcHtml" description="This field is undefined and MUST be ignored"/>
-            <bit number="2" mask="0x0008" name="unused" description="This value MUST be zero and MUST be ignored"/>
-            <bit number="2" mask="0xFFF0" name="iPriority" description="An unsigned integer that specifies the priority value that is assigned to this style and that is used when ordering the styles by priority in the user interface"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/Stshif_type.xml b/trunk/src/types/definitions/Stshif_type.xml
deleted file mode 100644
index cab4020..0000000
--- a/trunk/src/types/definitions/Stshif_type.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="Stshif" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The Stshif structure specifies general stylesheet information. &lt;p&gt;Class and
-        fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and
-        [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="int" size="2" name="cstd"
-            description="An unsigned integer that specifies the count of elements in STSH.rglpstd. This value MUST be equal to or greater than 0x000F, and MUST be less than 0x0FFE"/>
-        <field type="int" size="2" name="cbSTDBaseInFile"
-            description="An unsigned integer that specifies the size, in bytes, of the Stdf structure. The Stdf structure contains an StdfBase structure that is followed by a StdfPost2000OrNone structure which contains an optional StdfPost2000 structure. This value MUST be 0x000A when the Stdf structure does not contain an StdfPost2000 structure and MUST be 0x0012 when the Stdf structure does contain an StdfPost2000 structure."/>
-        <field type="int" size="2" name="info3">
-            <bit mask="0x0001" name="fHasOriginalStyle" description="This value MUST be 1 and MUST be ignored"/>
-            <bit mask="0xFFFE" name="fReserved" description="This value MUST be zero and MUST be ignored"/>
-        </field>
-        <field type="int" size="2" name="stiMaxWhenSaved"
-            description="An unsigned integer that specifies a value that is 1 larger than the largest StdfBase.sti index of any application-defined style. This SHOULD be equal to the largest sti index that is defined in the application, incremented by 1"/>
-        <field type="int" size="2" name="istdMaxFixedWhenSaved"
-            description="An unsigned integer that specifies the count of elements at the start of STSH.rglpstd that are reserved for fixed-index application-defined styles. This value MUST be 0x000F"/>
-        <field type="int" size="2" name="nVerBuiltInNamesWhenSaved"
-            description="An unsigned integer that specifies the version number of the style names as defined by the application that writes the file"/>
-        <field type="short" size="2" name="ftcAsci"
-            description="A signed integer that specifies an operand value for the sprmCRgFtc0 for default document formatting"/>
-        <field type="short" size="2" name="ftcFE"
-            description="A signed integer that specifies an operand value for the sprmCRgFtc1 for default document formatting, as defined in the section Determining Formatting Properties"/>
-        <field type="short" size="2" name="ftcOther"
-            description="A signed integer that specifies an operand value for the sprmCRgFtc2 for default document formatting, as defined in the section Determining Formatting Properties"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/bkf_type.xml b/trunk/src/types/definitions/bkf_type.xml
deleted file mode 100644
index 32a4b1c..0000000
--- a/trunk/src/types/definitions/bkf_type.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="BKF" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>BooKmark First descriptor (BKF). &lt;p&gt;Class and fields descriptions are
-        quoted
-        from Microsoft Office Word 97-2007 Binary File Format (.doc) Specification
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format (.doc)
-        Specification
-    </author>
-    <fields>
-        <field type="short" size="2" name="ibkl"
-            description="Index to BKL entry in plcfbkl that describes the ending position of this bookmark in the CP stream"/>
-        <field type="short" size="2" name="bkf_flags">
-            <bit number="0" mask="0x007F" name="itcFirst"
-                description="When bkf.fCol==1, this is the index to the first column of a table column bookmark"/>
-            <bit number="1" mask="0x0080" name="fPub"
-                description="When 1, this indicates that this bookmark is marking the range of a Macintosh Publisher section"/>
-            <bit number="2" mask="0x7F00" name="itcLim"
-                description="When bkf.fCol==1, this is the index to limit column of a table column bookmark"/>
-            <bit number="3" mask="0x8000" name="fCol"
-                description="When 1, this bookmark marks a range of columns in a table specified by (bkf.itcFirst, bkf.itcLim)"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/chp_type.xml b/trunk/src/types/definitions/chp_type.xml
deleted file mode 100644
index 5d77786..0000000
--- a/trunk/src/types/definitions/chp_type.xml
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record id="0x101B" name="CHP" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Character Properties.</description>
-    <author>S. Ryan Ackley</author>
-    <fields>
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 102 of 210 -->
-        <field type="int" size="4" name="grpfChp" description="Collection of the 32 flags">
-            <bit number="00" mask="0x00000001" name="fBold" description="Text is bold"/>
-            <bit number="01" mask="0x00000002" name="fItalic" description="Italic"/>
-            <bit number="02" mask="0x00000004" name="fRMarkDel"
-                description="has been deleted and will be displayed with strikethrough when revision marked text is to be displayed"/>
-            <bit number="03" mask="0x00000008" name="fOutline" description="Outlined"/>
-            <bit number="04" mask="0x00000010" name="fFldVanish" description="Used internally by Word"/>
-            <bit number="05" mask="0x00000020" name="fSmallCaps" description="Displayed with small caps"/>
-            <bit number="06" mask="0x00000040" name="fCaps" description="Displayed with caps"/>
-            <bit number="07" mask="0x00000080" name="fVanish"
-                description="text has hidden format, and is not displayed unless fPagHidden is set in the DOP"/>
-            <bit number="08" mask="0x00000100" name="fRMark"
-                description="text is newly typed since the last time revision marks have been accepted and will be displayed with an underline when revision marked text is to be displayed"/>
-            <bit number="09" mask="0x00000200" name="fSpec" description="Character is a Word special character"/>
-            <bit number="10" mask="0x00000400" name="fStrike" description="Displayed with strikethrough"/>
-            <bit number="11" mask="0x00000800" name="fObj" description="Embedded objec"/>
-            <bit number="12" mask="0x00001000" name="fShadow" description="Character is drawn with a shadow"/>
-            <bit number="13" mask="0x00002000" name="fLowerCase"
-                description="Character is displayed in lower case. This field may be set to 1 only when chp.fSmallCaps is 1."/>
-            <bit number="14" mask="0x00004000" name="fData"
-                description="chp.fcPic points to an FFDATA, the data structure binary data used by Word to describe a form field. The bit chp.fData may only be 1 when chp.fSpec is also 1 and the special character in the document stream that has this property is a chPicture (0x01)"/>
-            <bit number="15" mask="0x00008000" name="fOle2"
-                description="chp.lTagObj specifies a particular object in the object stream that specifies the particular OLE object in the stream that should be displayed when the chPicture fSpec character that is tagged with the fOle2 is encountered. The bit chp.fOle2 may only be 1 when chp.fSpec is also 1 and the special character in the document stream that has this property is a chPicture (0x01)."/>
-            <bit number="16" mask="0x00010000" name="fEmboss" description="Text is embossed"/>
-            <bit number="17" mask="0x00020000" name="fImprint" description="Text is engraved"/>
-            <bit number="18" mask="0x00040000" name="fDStrike" description="Displayed with double strikethrough"/>
-            <bit number="19" mask="0x00080000" name="fUsePgsuSettings" description="Used internally by Word"/>
-            <bit number="20" mask="0x00100000" name="fBoldBi" description="Complex Scripts text is bold"/>
-
-
-            <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-            <!-- Page 103 of 210 -->
-            <bit number="21" mask="0x00100000" name="fComplexScripts"
-                description="Complex Scripts text that requires special processing to display and process"/>
-            <bit number="22" mask="0x00200000" name="fItalicBi" description="Complex Scripts text is italics"/>
-            <bit number="23" mask="0x00400000" name="fBiDi"
-                description="Complex Scripts right-to-left text that requires special processing to display and process (character reordering; contextual shaping; display of combining characters and diacritics; specialized justification rules; cursor positioning)"/>
-            
-            <bit number="24" mask="0x00800000" name="fIcoBi" description="Used internally by Word"/>
-            <bit number="25" mask="0x01000000" name="fNonGlyph" description="Used internally by Word"/>
-            <bit number="25" mask="0x02000000" name="fBoldOther" description="Used internally by Word 97 and earlier versions"/>
-            <bit number="26" mask="0x04000000" name="fItalicOther" description="Used internally by Word 97 and earlier versions"/>
-
-            <bit number="27" mask="0x08000000" name="fNoProof" description="When set to 1, do not check spelling or grammar"/>
-            <bit number="28" mask="0x10000000" name="fWebHidden" description="Text should be hidden in Web View when set to 1"/>
-            <bit number="29" mask="0x20000000" name="fFitText" description="Fit text when set to 1"/>
-
-            <bit number="30" mask="0x40000000" name="fCalc" description="Used internally by Word"/>
-            <bit number="31" mask="0x80000000" name="fFmtLineProp" description="Used internally by Word"/>
-        </field>
-        <field type="int" size="2" name="hps" default="20" description="Font size in half points"/>
-        <field type="int" size="2" name="ftcAscii" description="Font for ASCII text"/>
-        <field type="int" size="2" name="ftcFE" description="Font for East Asian text"/>
-        <field type="int" size="2" name="ftcOther" description="Font for non-East Asian text"/>
-        <field type="int" size="2" name="ftcBi" description="Font for Complex Scripts text"/>
-        <!-- rgftc[iftcCompositeMax] -->
-        <field type="int" size="4" name="dxaSpace"
-            description="Space following each character in the run expressed in twip units."/>
-
-        <field type="Colorref" size="4" name="cv" description="24-bit color"/>
-
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 104 of 210 -->
-        <field type="byte" size="1" name="ico" description="Color of text for Word 97"/>
-        <field type="int" size="2" name="pctCharWidth" description="Character scale"/>
-        <!-- Lid -->
-        <!-- rglid[clidChpMax] -->
-        <field type="int" size="2" name="lidDefault" default="0x0400"/>
-        <field type="int" size="2" name="lidFE" default="0x0400"/>
-        <!-- lidBi -->
-        <field type="byte" size="1" name="kcd" description="Emphasis mark">
-            <const type="byte" value="0" name="NON"/>
-            <const type="byte" value="1" name="DOT"/>
-            <const type="byte" value="2" name="COMMA"/>
-            <const type="byte" value="3" name="CIRCLE"/>
-            <const type="byte" value="4" name="UNDER_DOT"/>
-        </field>
-        <field type="boolean" size="1" name="fUndetermine" description="Character is undetermined"/>
-        <field type="byte" size="1" name="iss" description="Superscript/subscript indices">
-            <const type="byte" value="0" name="NONE"/>
-            <const type="byte" value="1" name="SUPERSCRIPTED"/>
-            <const type="byte" value="2" name="SUBSCRIPTED"/>
-        </field>
-        <field type="boolean" size="1" name="fSpecSymbol" description="Used by Word internally"/>
-        <field type="byte" size="1" name="idct" description="Not stored in file"/>
-        <field type="byte" size="1" name="idctHint" description="Identifier of Character type"/>
-
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 105 of 210 -->
-        <field type="byte" size="1" name="kul" description="Underline code">
-            <const type="byte" value="0" name="NONE"/>
-            <const type="byte" value="1" name="SINGLE"/>
-            <const type="byte" value="2" name="BY_WORD"/>
-            <const type="byte" value="3" name="DOUBLE"/>
-            <const type="byte" value="4" name="DOTTED"/>
-            <const type="byte" value="5" name="HIDDEN"/>
-            <const type="byte" value="6" name="THICK"/>
-            <const type="byte" value="7" name="DASH"/>
-            <const type="byte" value="8" name="DOT"/>
-            <const type="byte" value="9" name="DOT_DASH"/>
-            <const type="byte" value="10" name="DOT_DOT_DASH"/>
-            <const type="byte" value="11" name="WAVE"/>
-            <const type="byte" value="20" name="DOTTED_HEAVY"/>
-            <const type="byte" value="23" name="DASHED_HEAVY"/>
-            <const type="byte" value="25" name="DOT_DASH_HEAVY"/>
-            <const type="byte" value="26" name="DOT_DOT_DASH_HEAVY"/>
-            <const type="byte" value="27" name="WAVE_HEAVY"/>
-            <const type="byte" value="39" name="DASH_LONG"/>
-            <const type="byte" value="43" name="WAVE_DOUBLE"/>
-            <const type="byte" value="55" name="DASH_LONG_HEAVY"/>
-        </field>
-
-        <field type="Hyphenation" size="2" name="hresi" />
-
-        <field type="int" size="2" name="hpsKern"
-            description="Kerning distance for characters in run recorded in half points"/>
-        <field type="short" size="2" name="hpsPos"
-            description="Reserved (actually used as vertical offset(?) value)"/>
-
-        <!-- cvUl -->
-
-        <field type="ShadingDescriptor" size="2" name="shd" description="Shading"/>
-        <field type="BorderCode" size="4" name="brc" description="Border"/>
-
-        <field type="int" size="2" name="ibstRMark"
-            description="Index to author IDs stored in hsttbfRMark. Used when text in run was newly typed when revision marking was enabled"/>
-
-        <field type="byte" size="1" name="sfxtText" description="Text animation">
-            <const type="byte" value="0" name="NO"/>
-            <const type="byte" value="1" name="LAS_VEGAS_LIGHTS"/>
-            <const type="byte" value="2" name="BACKGROUND_BLINK"/>
-            <const type="byte" value="3" name="SPARKLE_TEXT"/>
-            <const type="byte" value="4" name="MARCHING_ANTS"/>
-            <const type="byte" value="5" name="MARCHING_RED_ANTS"/>
-            <const type="byte" value="6" name="SHIMMER"/>
-        </field>
-        <field type="boolean" size="1" name="fDblBdr" description="Used internally by Word"/>
-        <field type="boolean" size="1" name="fBorderWS" description="Used internally by Word"/>
-
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 106 of 210 -->
-        <field type="short" size="2" name="ufel"
-            description="Collection properties represented by itypFELayout and copt (East Asian layout properties)">
-            <bit number="0" mask="0x00ff" name="itypFELayout"/>
-            <bit number="1" mask="0x0100" name="fTNY"
-                description="Tatenakayoko: Horizontal-in-vertical (range of text in a direction perpendicular to the text flow) is used"/>
-            <bit number="2" mask="0x0200" name="fWarichu"
-                description="Two lines in one (text in the group is displayed as two half-height lines within a line)"/>
-            <bit number="3" mask="0x0400" name="fKumimoji" description="combine characters"/>
-            <bit number="4" mask="0x0800" name="fRuby" description="Phonetic guide"/>
-            <bit number="5" mask="0x1000" name="fLSFitText" description="fit text"/>
-            <bit number="5" mask="0xe000" name="spare" description="Unused"/>
-        </field>
-
-        <field type="byte" size="1" name="copt" description="Collection of the 5 flags">
-            <bit number="0" mask="0x07" name="iWarichuBracket" description="Bracket character for two-lines-in-one"/>
-            <bit number="1" mask="0x08" name="fWarichuNoOpenBracket" description="Two-lines-in-one uses no open"/>
-            <bit number="2" mask="0x10" name="fTNYCompress" description="fit text in line"/>
-            <bit number="4" mask="0x20" name="fTNYFetchTxm" description="fetch text metrics"/>
-            <bit number="5" mask="0x40" name="fCellFitText" description="Fit text in cell"/>
-            <bit number="6" mask="0x80" name="unused" description="Not used"/>
-        </field>
-
-        <field type="int" size="2" name="hpsAsci" description="Font size for ASCII font"/>
-        <field type="int" size="2" name="hpsFE" description="Font size for East Asian text"/>
-        <field type="int" size="2" name="hpsBi" description="Font size for Complex Scripts text"/>
-        <!-- rghps[ihpsMax] -->
-
-        <field type="int" size="2" name="ftcSym"
-            description="an index into the rgffn structure. When chp.fSpec is 1 and the character recorded for the run in the document stream is chSymbol (0x28), chp.ftcSym identifies the font code of the symbol font that will be used to display the symbol character recorded in chp.xchSym."/>
-        <field type="int" size="2" name="xchSym"
-            description="When chp.fSpec==1 and the character recorded for the run in the document stream is chSymbol (0x28), the character stored chp.xchSym will be displayed using the font specified in chp.ftcSym."/>
-
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 107 of 210 -->
-
-        <!-- fNumRunBi -->
-        <!-- fSysVanish -->
-        <!-- fDiacRunBi -->
-        <!-- fBoldPresent -->
-        <!-- fItalicPresent -->
-
-        <field type="int" size="4" name="fcPic" default="-1"
-            description="Offset in data stream pointing to beginning of a picture when character is a picture character (character is 0x01 and chp.fSpec is 1)."/>
-        <field type="int" size="4" name="fcObj"
-            description="Offset in data stream pointing to beginning of a picture when character is an OLE1 object character (character is 0x20 and chp.fSpec is 1, chp.fOle2 is 0)."/>
-        <field type="int" size="4" name="lTagObj"
-            description="An object ID for an OLE object, only set if chp.fSpec and chp.fOle2 are both true, and chp.fObj."/>
-        <field type="int" size="4" name="fcData"
-            description="Points to location of picture data, only if chp.fSpec is true."/>
-
-        <!-- hsp -->
-        <!-- docPic -->
-        <!-- dummy -->
-        <!-- fDirty -->
-
-        <field type="Hyphenation" size="2" name="hresiOld" />
-
-        <!-- dummy3 -->
-
-        <!-- dxpKashida -->
-        <!-- dxpSpace -->
-
-        <field type="int" size="2" name="ibstRMarkDel"
-            description="Index to author IDs stored in hsttbfRMark. Used when text in run was deleted when revision marking was enabled."/>
-
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 108 of 210 -->
-
-        <field type="DateAndTime" size="4" name="dttmRMark"
-            description="Date/time at which this run of text was entered/modified by the author (Only recorded when revision marking is on.)"/>
-        <field type="DateAndTime" size="4" name="dttmRMarkDel"
-            description="Date/time at which this run of text was deleted by the author (Only recorded when revision marking is on.)"/>
-
-        <!-- cHpsInc -->
-
-        <field type="int" size="2" name="istd" default="10"
-            description="Index to character style descriptor in the stylesheet that tags this run of text. When istd is istdNormalChar (10 decimal), characters in run are not affected by a character style. If chp.istd contains any other value, chpx of the specified character style are applied to CHP for this run before any other exceptional properties are applied."/>
-
-        <field type="int" size="2" name="idslRMReason"
-            description="An index to strings displayed as reasons for actions taken by Word's AutoFormat code"/>
-        <field type="int" size="2" name="idslReasonDel"
-            description="An index to strings displayed as reasons for actions taken by Word's AutoFormat code"/>
-
-        <field type="int" size="2" name="cpg" description="Code page of run in pre-Unicode files"/>
-
-        <!-- iatrUndetType -->
-        <!-- fUlGap -->
-
-        <field type="short" size="2" name="Highlight">
-            <bit number="0" mask="0x001f" name="icoHighlight" description="Highlight color (see chp.ico)"/>
-            <bit number="1" mask="0x0020" name="fHighlight"
-                description="When 1, characters are highlighted with color specified by chp.icoHighlight"/>
-            <!-- fNavHighlight -->
-        </field>
-
-        <field type="short" size="2" name="CharsetFlags">
-            <bit number="0" mask="0x0001" name="fChsDiff"
-                description="Pre-Unicode files, char's char set different from FIB char set"/>
-            <bit number="1" mask="0x0020" name="fMacChs" description="fTrue if char's are Macintosh char set"/>
-            <!-- fFtcAsciSym -->
-            <!-- fFtcReq -->
-            <!-- fLangApplied -->
-            <!-- fSpareLangApplied -->
-            <!-- fForcedCvAuto -->
-        </field>
-        <!-- Undocumented, but referenced -->
-        <field type="short" size="2" name="chse"/>
-
-        <field type="boolean" size="2" name="fPropRMark"
-            description="properties have been changed with revision marking on"/>
-        <field type="int" size="2" name="ibstPropRMark"
-            description="Index to author IDs stored in hsttbfRMark. Used when properties have been changed when revision marking was enabled."/>
-        <field type="DateAndTime" size="4" name="dttmPropRMark"
-            description="Date/time at which properties of this were changed for this run of text by the author. (Only recorded when revision marking is on.)"/>
-        <!-- fAnmPropRMark -->
-
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 109 of 210 -->
-
-        <field type="boolean" size="1" name="fConflictOrig"
-            description="When chp.wConflict!=0, this is TRUE when text is part of the original version of text. When FALSE, text is alternative introduced by reconciliation operation."/>
-        <field type="boolean" size="1" name="fConflictOtherDel"
-            description="When fConflictOtherDel==fTrue, the other side of a reconciliation conflict causes this text to be deleted"/>
-        <field type="int" size="2" name="wConflict"
-            description="When != 0, index number that identifies all text participating in a particular conflict incident"/>
-        <field type="int" size="2" name="IbstConflict" description="Who made this change for this side of the conflict."/>
-        <field type="DateAndTime" size="4" name="dttmConflict" description="When the change was made"/>
-        <field type="boolean" size="1" name="fDispFldRMark"
-            description="the number for a ListNum field is being tracked in xstDispFldRMark. If that number is different from the current value, the number has changed. Only valid for ListNum fields."/>
-        <field type="int" size="2" name="ibstDispFldRMark"
-            description="Index to author IDs stored in hsttbfRMark. Used when ListNum field numbering has been changed when revision marking was enabled."/>
-        <field type="DateAndTime" size="4" name="dttmDispFldRMark" description="The date for the ListNum field number change"/>
-        <field type="byte[]" size="32" name="xstDispFldRMark"
-            description="The string value of the ListNum field when revision mark tracking began"/>
-
-        <!-- dxtSpaceExtra -->
-
-        <field type="int" size="4" name="fcObjp"
-            description="Offset in the data stream indicating the location of OLE object data"/>
-
-        <!-- dxaFitText -->
-        <!-- lFitTextID -->
-        <field type="byte" size="1" name="lbrCRJ" description="Line BReak code for xchCRJ">
-            <const type="byte" value="0" name="NONE"/>
-            <const type="byte" value="1" name="LEFT"/>
-            <const type="byte" value="2" name="RIGHT"/>
-            <const type="byte" value="3" name="BOTH"/>
-        </field>
-
-        <!-- iuhi -->
-        <!-- bTransNoProof0 -->
-        <!-- bTransNoProof1 -->
-        <!-- rsidProp -->
-        <!-- rsidText -->
-        <!-- rsidRMDel -->
-
-        <!-- Microsoft Office Word 97-2007 Binary File Format (.doc) Specification -->
-        <!-- Page 110 of 210 -->
-
-        <field type="boolean" size="1" name="fSpecVanish"
-            description="Special hidden for leading emphasis (always hidden)"/>
-        <field type="boolean" size="1" name="fHasOldProps"
-            description="Used for character property revision marking. The chp at the time fHasOldProps is set to 1, the is the old chp."/>
-
-        <!-- pbi -->
-        <!-- hplcnf -->
-        <!-- ffm -->
-
-        <field type="boolean" size="1" name="fSdtVanish" description="Mark the character as hidden."/>
-
-        <!-- Referenced by "The standard CHP is all zeros except" -->
-        <field type="int" size="2" name="wCharScale" default="100"/>
-
-        <!-- From old version of description -->
-
-        <!-- <field type="short" size="2" name="InternalFlags"> -->
-        <!-- <bit number="0" mask="0x000f" name="iatrUndetType" description="Used internally by Word"/> -->
-        <!-- <bit number="1" mask="0x0010" name="fUlGap" description="Used internally by Word 8"/> -->
-        <!-- <bit number="2" mask="0x0800" name="fScriptAnchor" description="Used internally by Word"/> -->
-        <!-- <bit number="3" mask="0x1000" name="fFixedObj" description="Used internally by Word"/> -->
-        <!-- <bit number="4" mask="0x2000" name="spare2" description="Not used"/> -->
-        <!-- </field> -->
-        <!-- Not documented, but referenced by sprmCChs -->
-        <!-- description="used to record a character set id for text that was pasted into the Word
-            document that used a character set different than Word's default character set"/> -->
-        <!-- <field type="byte" size="1" name="idctHint"/> -->
-        <!-- <field type="int" size="2" name="baseIstd"/> -->
-        <!-- <field type="int" size="2" name="xchSym"/> -->
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/dml-shapeGeometry.xjb b/trunk/src/types/definitions/dml-shapeGeometry.xjb
deleted file mode 100644
index 8d05c62..0000000
--- a/trunk/src/types/definitions/dml-shapeGeometry.xjb
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<jxb:bindings version="1.0"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd">
-	<jxb:globalBindings generateIsSetMethod="true"/>
-</jxb:bindings>
diff --git a/trunk/src/types/definitions/dop_type.xml b/trunk/src/types/definitions/dop_type.xml
deleted file mode 100644
index 77de331..0000000
--- a/trunk/src/types/definitions/dop_type.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record fromfile="true" name="DOP" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Document Properties.</description>
-    <author>S. Ryan Ackley</author>
-    <fields>
-      <field type="byte" size="1" name="formatFlags">
-        <bit number="0" mask="0x01" name="fFacingPages"/>
-        <bit number="1" mask="0x02" name="fWidowControl"/>
-        <bit number="2" mask="0x04" name="fPMHMainDoc"/>
-        <bit number="3" mask="0x18" name="grfSupression"/>
-        <bit number="4" mask="0x60" name="fpc"/>
-        <bit number="5" mask="0x80" name="unused1"/>
-      </field>
-      <field type="byte" size="1" name="unused2"/>
-      <field type="short" size="2" name="footnoteInfo">
-        <bit number="0" mask="0x0003" name="rncFtn"/>
-        <bit number="1" mask="0xfffc" name="nFtn"/>
-      </field>
-      <field type="byte" size="1" name="fOutlineDirtySave"/>
-      <field type="byte" size="1" name="docinfo">
-        <bit number="0" mask="0x01" name="fOnlyMacPics"/>
-        <bit number="1" mask="0x02" name="fOnlyWinPics"/>
-        <bit number="2" mask="0x04" name="fLabelDoc"/>
-        <bit number="3" mask="0x08" name="fHyphCapitals"/>
-        <bit number="4" mask="0x10" name="fAutoHyphen"/>
-        <bit number="5" mask="0x20" name="fFormNoFields"/>
-        <bit number="6" mask="0x40" name="fLinkStyles"/>
-        <bit number="7" mask="0x80" name="fRevMarking"/>
-      </field>
-      <field type="byte" size="1" name="docinfo1">
-        <bit number="0" mask="0x01" name="fBackup"/>
-        <bit number="1" mask="0x02" name="fExactCWords"/>
-        <bit number="2" mask="0x04" name="fPagHidden"/>
-        <bit number="3" mask="0x08" name="fPagResults"/>
-        <bit number="4" mask="0x10" name="fLockAtn"/>
-        <bit number="5" mask="0x20" name="fMirrorMargins"/>
-        <bit number="6" mask="0x40" name="unused3"/>
-        <bit number="7" mask="0x80" name="fDfltTrueType"/>
-      </field>
-      <field type="byte" size="1" name="docinfo2">
-        <bit number="0" mask="0x01" name="fPagSupressTopSpacing"/>
-        <bit number="1" mask="0x02" name="fProtEnabled"/>
-        <bit number="2" mask="0x04" name="fDispFormFldSel"/>
-        <bit number="3" mask="0x08" name="fRMView"/>
-        <bit number="4" mask="0x10" name="fRMPrint"/>
-        <bit number="5" mask="0x20" name="unused4"/>
-        <bit number="6" mask="0x40" name="fLockRev"/>
-        <bit number="7" mask="0x80" name="fEmbedFonts"/>
-      </field>
-      <field type="short" size="2" name="docinfo3">
-        <bit number="0" mask="0x0001" name="oldfNoTabForInd"/>
-        <bit number="1" mask="0x0002" name="oldfNoSpaceRaiseLower"/>
-        <bit number="2" mask="0x0004" name="oldfSuppressSpbfAfterPageBreak"/>
-        <bit number="3" mask="0x0008" name="oldfWrapTrailSpaces"/>
-        <bit number="4" mask="0x0010" name="oldfMapPrintTextColor"/>
-        <bit number="5" mask="0x0020" name="oldfNoColumnBalance"/>
-        <bit number="6" mask="0x0040" name="oldfConvMailMergeEsc"/>
-        <bit number="7" mask="0x0080" name="oldfSupressTopSpacing"/>
-        <bit number="8" mask="0x0100" name="oldfOrigWordTableRules"/>
-        <bit number="9" mask="0x0200" name="oldfTransparentMetafiles"/>
-        <bit number="10" mask="0x0400" name="oldfShowBreaksInFrames"/>
-        <bit number="11" mask="0x0800" name="oldfSwapBordersFacingPgs"/>
-        <bit number="12" mask="0xf000" name="unused5"/>
-      </field>
-      <field type="int" size="2" name="dxaTab"/>
-      <field type="int" size="2" name="wSpare"/>
-      <field type="int" size="2" name="dxaHotz"/>
-      <field type="int" size="2" name="cConsexHypLim"/>
-      <field type="int" size="2" name="wSpare2"/>
-      <field type="int" size="4" name="dttmCreated"/>
-      <field type="int" size="4" name="dttmRevised"/>
-      <field type="int" size="4" name="dttmLastPrint"/>
-      <field type="int" size="2" name="nRevision"/>
-      <field type="int" size="4" name="tmEdited"/>
-      <field type="int" size="4" name="cWords"/>
-      <field type="int" size="4" name="cCh"/>
-      <field type="int" size="2" name="cPg"/>
-      <field type="int" size="4" name="cParas"/>
-      <field type="short" size="2" name="Edn">
-        <bit number="0" mask="0x0003" name="rncEdn"/>
-        <bit number="1" mask="0xfffc" name="nEdn"/>
-      </field>
-      <field type="short" size="2" name="Edn1">
-        <bit number="0" mask="0x0003" name="epc"/>
-        <bit number="1" mask="0x003c" name="nfcFtnRef1"/>
-        <bit number="2" mask="0x03c0" name="nfcEdnRef1"/>
-        <bit number="3" mask="0x0400" name="fPrintFormData"/>
-        <bit number="4" mask="0x0800" name="fSaveFormData"/>
-        <bit number="5" mask="0x1000" name="fShadeFormData"/>
-        <bit number="6" mask="0x8000" name="fWCFtnEdn"/>
-      </field>
-      <field type="int" size="4" name="cLines"/>
-      <field type="int" size="4" name="cWordsFtnEnd"/>
-      <field type="int" size="4" name="cChFtnEdn"/>
-      <field type="short" size="2" name="cPgFtnEdn"/>
-      <field type="int" size="4" name="cParasFtnEdn"/>
-      <field type="int" size="4" name="cLinesFtnEdn"/>
-      <field type="int" size="4" name="lKeyProtDoc"/>
-      <field type="short" size="2" name="view">
-        <bit number="0" mask="0x0007" name="wvkSaved"/>
-        <bit number="1" mask="0x0ff8" name="wScaleSaved"/>
-        <bit number="2" mask="0x3000" name="zkSaved"/>
-        <bit number="3" mask="0x4000" name="fRotateFontW6"/>
-        <bit number="4" mask="0x8000" name="iGutterPos"/>
-      </field>
-      <field type="int" size="4" name="docinfo4">
-        <bit number="0" mask="0x00000001" name="fNoTabForInd"/>
-        <bit number="1" mask="0x00000002" name="fNoSpaceRaiseLower"/>
-        <bit number="2" mask="0x00000004" name="fSupressSpdfAfterPageBreak"/>
-        <bit number="3" mask="0x00000008" name="fWrapTrailSpaces"/>
-        <bit number="4" mask="0x00000010" name="fMapPrintTextColor"/>
-        <bit number="5" mask="0x00000020" name="fNoColumnBalance"/>
-        <bit number="6" mask="0x00000040" name="fConvMailMergeEsc"/>
-        <bit number="7" mask="0x00000080" name="fSupressTopSpacing"/>
-        <bit number="8" mask="0x00000100" name="fOrigWordTableRules"/>
-        <bit number="9" mask="0x00000200" name="fTransparentMetafiles"/>
-        <bit number="10" mask="0x00000400" name="fShowBreaksInFrames"/>
-        <bit number="11" mask="0x00000800" name="fSwapBordersFacingPgs"/>
-        <bit number="12" mask="0x00010000" name="fSuppressTopSPacingMac5"/>
-        <bit number="13" mask="0x00020000" name="fTruncDxaExpand"/>
-        <bit number="14" mask="0x00040000" name="fPrintBodyBeforeHdr"/>
-        <bit number="15" mask="0x00080000" name="fNoLeading"/>
-        <bit number="16" mask="0x00200000" name="fMWSmallCaps"/>
-      </field>
-      <field type="short" size="2" name="adt"/>
-      <field type="byte[]" size="310" name="doptypography"/>
-      <field type="byte[]" size="10" name="dogrid"/>
-      <field type="short" size="2" name="docinfo5">
-        <bit number="0" mask="0x001e" name="lvl"/>
-        <bit number="1" mask="0x0020" name="fGramAllDone"/>
-        <bit number="2" mask="0x0040" name="fGramAllClean"/>
-        <bit number="3" mask="0x0080" name="fSubsetFonts"/>
-        <bit number="4" mask="0x0100" name="fHideLastVersion"/>
-        <bit number="5" mask="0x0200" name="fHtmlDoc"/>
-        <bit number="6" mask="0x0800" name="fSnapBorder"/>
-        <bit number="7" mask="0x1000" name="fIncludeHeader"/>
-        <bit number="8" mask="0x2000" name="fIncludeFooter"/>
-        <bit number="9" mask="0x4000" name="fForcePageSizePag"/>
-        <bit number="10" mask="0x8000" name="fMinFontSizePag"/>
-      </field>
-      <field type="short" size="2" name="docinfo6">
-        <bit number="0" mask="0x0001" name="fHaveVersions"/>
-        <bit number="1" mask="0x0002" name="fAutoVersions"/>
-      </field>
-      <field type="byte[]" size="12" name="asumyi"/>
-      <field type="int" size="4" name="cChWS"/>
-      <field type="int" size="4" name="cChWSFtnEdn"/>
-      <field type="int" size="4" name="grfDocEvents"/>
-      <field type="int" size="4" name="virusinfo">
-        <bit number="0" mask="0x0001" name="fVirusPrompted"/>
-        <bit number="1" mask="0x0002" name="fVirusLoadSafe"/>
-        <bit number="2" mask="0xfffffffc" name="KeyVirusSession30"/>
-      </field>
-      <field type="byte[]" size="30" name="Spare"/>
-      <field type="int" size="4" name="reserved1"/>
-      <field type="int" size="4" name="reserved2"/>
-      <field type="int" size="4" name="cDBC"/>
-      <field type="int" size="4" name="cDBCFtnEdn"/>
-      <field type="int" size="4" name="reserved"/>
-      <field type="short" size="2" name="nfcFtnRef"/>
-      <field type="short" size="2" name="nfcEdnRef"/>
-      <field type="short" size="2" name="hpsZoonFontPag"/>
-      <field type="short" size="2" name="dywDispPag"/>
-    </fields>
-</record>
-
-
-
diff --git a/trunk/src/types/definitions/fld_type.xml b/trunk/src/types/definitions/fld_type.xml
deleted file mode 100644
index 2c7a0b9..0000000
--- a/trunk/src/types/definitions/fld_type.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FLD" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Field Descriptor (FLD). &lt;p&gt;Class and fields descriptions are
-        quoted from
-        Microsoft Office Word 97-2007 Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc]
-    </author>
-    <fields>
-        <field type="byte" size="1" name="chHolder" description="ch field holder (along with reserved bits)">
-            <bit number="0" mask="0x1f" name="ch"
-                description="Type of field boundary the FLD describes: 19 -- field begin mark, 20 -- field separation mark; 21 -- field end mark"/>
-            <bit number="0" mask="0xe0" name="reserved" description="Reserved"/>
-        </field>
-        <field type="byte" size="1" name="flt"
-            description="Field type when ch == 19 OR field flags when ch == 21 ">
-            <bit number="0" mask="0x01" name="fDiffer" description="Ignored for saved file"/>
-            <bit number="1" mask="0x02" name="fZombieEmbed"
-                description="==1 when result still believes this field is an EMBED or LINK field"/>
-            <bit number="2" mask="0x04" name="fResultDirty"
-                description="==1 when user has edited or formatted the result. == 0 otherwise"/>
-            <bit number="3" mask="0x08" name="fResultEdited"
-                description="==1 when user has inserted text into or deleted text from the result"/>
-            <bit number="4" mask="0x10" name="fLocked" description="==1 when field is locked from recalculation"/>
-            <bit number="5" mask="0x20" name="fPrivateResult"
-                description="==1 whenever the result of the field is never to be shown"/>
-            <bit number="6" mask="0x40" name="fNested" description="==1 when field is nested within another field"/>
-            <bit number="7" mask="0x40" name="fHasSep" description="==1 when field has a field separator"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/frd_type.xml b/trunk/src/types/definitions/frd_type.xml
deleted file mode 100644
index a447413..0000000
--- a/trunk/src/types/definitions/frd_type.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FRD" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Footnote Reference Descriptor (FRD). &lt;p&gt;Class and fields descriptions are
-        quoted from Microsoft Office Word 97-2007 Binary File Format (.doc) Specification
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format (.doc)
-        Specification
-    </author>
-    <fields>
-        <field type="short" size="2" name="nAuto"
-            description="If > 0, the note is an automatically numbered note, otherwise it has a custom mark"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/fspa_type.xml b/trunk/src/types/definitions/fspa_type.xml
deleted file mode 100644
index 42e464a..0000000
--- a/trunk/src/types/definitions/fspa_type.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="FSPA" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>File Shape Address (FSPA). &lt;p&gt;Class and fields descriptions are quoted from
-        Microsoft Office Word 97-2007 Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc]
-    </author>
-    <fields>
-        <field type="int" size="4" name="spid"
-            description="Shape Identifier. Used in conjunction with the office art data (found via fcDggInfo in the FIB) to find the actual data for this shape"/>
-        <field type="int" size="4" name="xaLeft"
-            description="Left of rectangle enclosing shape relative to the origin of the shape"/>
-        <field type="int" size="4" name="yaTop"
-            description="Top of rectangle enclosing shape relative to the origin of the shape"/>
-        <field type="int" size="4" name="xaRight"
-            description="Right of rectangle enclosing shape relative to the origin of the shape"/>
-        <field type="int" size="4" name="yaBottom"
-            description="Bottom of the rectangle enclosing shape relative to the origin of the shape"/>
-        <field type="short" size="2" name="flags">
-            <bit number="0" mask="0x0001" name="fHdr"
-                description="1 in the undo doc when shape is from the header doc, 0 otherwise (undefined when not in the undo doc)"/>
-            <bit number="1" mask="0x0006" name="bx" description="X position of shape relative to anchor CP">
-                <const type="byte" value="0" name="PAGEMARGIN" description="relative to page margin"/>
-                <const type="byte" value="1" name="PAGETOP" description="relative to top of page"/>
-                <const type="byte" value="2" name="TEXT"
-                    description="relative to text (column for horizontal text; paragraph for vertical text)"/>
-                <const type="byte" value="3" name="RESERVED" description="reserved for future use"/>
-            </bit>
-            <bit number="2" mask="0x0018" name="by" description="Y position of shape relative to anchor CP">
-                <const type="byte" value="0" name="PAGEMARGIN" description="relative to page margin"/>
-                <const type="byte" value="1" name="PAGETOP" description="relative to top of page"/>
-                <const type="byte" value="2" name="TEXT"
-                    description="relative to text (paragraph for horizontal text; column for vertical text)"/>
-            </bit>
-            <bit number="3" mask="0x01E0" name="wr" description="Text wrapping mode">
-                <const type="byte" value="0" name="AROUNDABSOLUTENR"
-                    description="like 2, but doesn‘t require absolute object"/>
-                <const type="byte" value="1" name="NOTEXTNEXTTO" description="no text next to shape"/>
-                <const type="byte" value="2" name="AROUNDABSOLUTE" description="wrap around absolute object"/>
-                <const type="byte" value="3" name="NOOBJECT" description="wrap as if no object present"/>
-                <const type="byte" value="4" name="TIGHTLY" description="wrap tightly around object"/>
-                <const type="byte" value="5" name="TIGHTLYWITHHOLES" description="wrap tightly, but allow holes"/>
-            </bit>
-            <bit number="4" mask="0x1E00" name="wrk"
-                description="Text wrapping mode type (valid only for wrapping modes 2 and 4"/>
-            <bit number="5" mask="0x2000" name="fRcaSimple"
-                description="When set, temporarily overrides bx, by, forcing the xaLeft, xaRight, yaTop, and yaBottom fields to all be page relative."/>
-            <bit number="6" mask="0x4000" name="fBelowText"/>
-            <bit number="7" mask="0x8000" name="fAnchorLock"/>
-        </field>
-        <field type="int" size="4" name="cTxbx" description="Count of textboxes in shape (undo doc only)"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/grfhic_type.xml b/trunk/src/types/definitions/grfhic_type.xml
deleted file mode 100644
index 0c1cf5c..0000000
--- a/trunk/src/types/definitions/grfhic_type.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="Grfhic" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The grfhic structure is a set of HTML incompatibility flags that specify the HTML
-        incompatibilities of a list structure. The values specify possible incompatibilities between
-        an LVL or LVLF and HTML lists. The values do not define list properties. &lt;p&gt;Class and
-        fields descriptions are quoted from [MS-DOC] -- v20110315 Word (.doc) Binary File Format
-        specification
-    </description>
-    <author>Sergey Vladimirov; according to [MS-DOC] -- v20110315 Word (.doc) Binary File Format
-        specification
-    </author>
-    <fields>
-        <field type="byte" size="1" name="grfhic" description="HTML compatibility flags">
-            <bit number="0" mask="0x01" name="fHtmlChecked" description="Checked"/>
-            <bit number="1" mask="0x02" name="fHtmlUnsupported"
-                description="The numbering sequence or format is unsupported (includes tab &amp; size)"/>
-            <bit number="2" mask="0x04" name="fHtmlListTextNotSharpDot" description="The list text is not &quot;#.&quot;"/>
-            <bit number="3" mask="0x08" name="fHtmlNotPeriod" description="Something other than a period is used"/>
-            <bit number="4" mask="0x10" name="fHtmlFirstLineMismatch" description="First line indent mismatch"/>
-            <bit number="5" mask="0x20" name="fHtmlTabLeftIndentMismatch"
-                description="The list tab and the dxaLeft don't match (need table?)"/>
-            <bit number="6" mask="0x40" name="fHtmlHangingIndentBeneathNumber"
-                description="The hanging indent falls beneath the number (need plain text)"/>
-            <bit number="7" mask="0x80" name="fHtmlBuiltInBullet" description="A built-in HTML bullet"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/hresi_type.xml b/trunk/src/types/definitions/hresi_type.xml
deleted file mode 100644
index aef96bd..0000000
--- a/trunk/src/types/definitions/hresi_type.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="HRESI" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>Hyphenation (HRESI). &lt;p&gt;Class and fields descriptions are
-        quoted from
-        Microsoft Office Word 97-2007 Binary File Format (.doc) Specification
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format (.doc)
-        Specification
-    </author>
-    <fields>
-        <field type="byte" size="1" name="hres" description="Hyphenation rule">
-            <const type="byte" value="0" name="NO"/>
-            <const type="byte" value="1" name="NORMAL"/>
-            <const type="byte" value="2" name="ADD_LETTER_BEFORE"/>
-            <const type="byte" value="3" name="CHANGE_LETTER_BEFORE"/>
-            <const type="byte" value="4" name="DELETE_LETTER_BEFORE"/>
-            <const type="byte" value="5" name="CHANGE_LETTER_AFTER"/>
-            <const type="byte" value="6" name="DELETE_BEFORE_CHANGE_BEFORE"/>
-        </field>
-        <field type="byte" size="1" name="chHres"
-            description="The character that will be used to add or change a letter when hres is 2, 3, 5 or 6"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/lfo_type.xml b/trunk/src/types/definitions/lfo_type.xml
deleted file mode 100644
index 911f6ce..0000000
--- a/trunk/src/types/definitions/lfo_type.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="LFO" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>List Format Override (LFO). &lt;p&gt;Class and fields descriptions are quoted from
-        [MS-DOC] --v20110315; Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to [MS-DOC] --v20110315; Word (.doc) Binary File Format;
-        Copyright (c) Microsoft Corporation
-    </author>
-    <fields>
-        <field type="int" size="4" name="lsid"
-            description="A signed integer that specifies the list identifier of an LSTF. This LFO corresponds to the LSTF in PlfLst.rgLstf that has an lsid whose value is equal to this value."/>
-        <field type="int" size="4" name="unused1" description="This field MUST be ignored"/>
-        <field type="int" size="4" name="unused2" description="This field MUST be ignored"/>
-        <field type="byte" size="1" name="clfolvl"
-            description="An unsigned integer that specifies the field that this LFO represents."/>
-        <field type="byte" size="1" name="ibstFltAutoNum" description="Used for AUTONUM field emulation"/>
-        <field type="Grfhic" size="1" name="grfhic" description="HTML compatibility flags"/>
-        <field type="byte" size="1" name="unused3" description="This field MUST be ignored"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/lstf_type.xml b/trunk/src/types/definitions/lstf_type.xml
deleted file mode 100644
index 5c7f1d3..0000000
--- a/trunk/src/types/definitions/lstf_type.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="LSTF" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The LSTF structure contains formatting properties that apply to an entire list.
-        &lt;p&gt;Class and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary
-        File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="int" size="4" name="lsid"
-            description="A signed integer that specifies the list identifier. This MUST be unique for each LSTF. This value MUST not be 0xFFFFFFFF"/>
-        <field type="int" size="4" name="tplc"
-            description="A Tplc that specifies a unique identifier for this LSTF that MAY be used for user interface purposes. If fHybrid is nonzero, this MUST be ignored"/>
-        <field type="short[]" size="18" name="rgistdPara"
-            description="An array of nine 16-bit signed integers. Each element of rgistdPara specifies the ISTD of the style that is linked to the corresponding level in the list. If no style is linked to a given level, the value of the corresponding element of rgistdPara MUST be 0x0FFF"/>
-        <field type="byte" size="1" name="flags">
-            <bit mask="0x01" name="fSimpleList"
-                description="A bit that, when set to 0x1, specifies that this LSTF represents a simple (one-level) list that has one corresponding LVL (see the fcPlfLst field of FibRgFcLcb97). Otherwise, this LSTF represents a multi-level list that has nine corresponding LVLs"/>
-            <bit mask="0x02" name="unused1" deprecated="true" description="This bit MUST be ignored"/>
-            <bit mask="0x04" name="fAutoNum"
-                description="A bit that specifies whether the list that this LSTF represents is used for the AUTONUMOUT, AUTONUMLGL, and AUTONUM fields (see AUTONUMOUT, AUTONUMLGL, and AUTONUM in flt)"/>
-            <bit mask="0x08" name="unused2" deprecated="true" description="This bit MUST be ignored"/>
-            <bit mask="0x10" name="fHybrid"
-                description="A bit that specifies whether the list this LSTF defines is a hybrid list"/>
-            <bit mask="0xE0" name="reserved1" deprecated="true"
-                description="This MUST be zero, and MUST be ignored."/>
-        </field>
-        <field type="Grfhic" size="1" name="grfhic"
-            description="A grfhic that specifies the HTML incompatibilities of the list."/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/lvlf_type.xml b/trunk/src/types/definitions/lvlf_type.xml
deleted file mode 100644
index c60a4f1..0000000
--- a/trunk/src/types/definitions/lvlf_type.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="LVLF" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The LVLF structure contains formatting properties for an individual level in a
-        list. &lt;p&gt;Class and fields descriptions are quoted from Microsoft Office Word 97-2007
-        Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="int" size="4" name="iStartAt"
-            description="A signed integer that specifies the beginning number for the number sequence belonging to this level. This value MUST be less than or equal to 0x7FFF and MUST be greater than or equal to zero. If this level does not have a number sequence (see nfc), this MUST be ignored"/>
-        <field type="byte" size="1" name="nfc"
-            description="An MSONFC, as specified in [MS-OSHARED] section 2.2.1.3, that specifies the format of the level numbers that replace the placeholders for this level in the xst fields of the LVLs in this list. This value MUST not be equal to 0x08, 0x09, 0x0F, or 0x13. If this is equal to 0xFF or 0x17, this level does not have a number sequence and therefore has no number formatting. If this is equal to 0x17, the level uses bullets"/>
-        <field type="byte" size="1" name="info">
-            <bit mask="0x03" name="jc"
-                description="An unsigned integer that specifies the justification of this level"/>
-            <bit mask="0x04" name="fLegal"
-                description="A bit that specifies whether this level overrides the nfc of all inherited level numbers. If the original nfc of a level number is msonfcArabicLZ, it is preserved. Otherwise, the nfc of the level number is overridden by msonfcArabic."/>
-            <bit mask="0x08" name="fNoRestart"
-                description="A bit that specifies whether the number sequence of the level does not restart after a level is encountered that is more significant than the level to which this LVLF corresponds"/>
-            <bit mask="0x10" name="fIndentSav"
-                description="A bit that specifies whether the level indented the text it was applied to and that the indent needs to be removed when numbering is removed. The indent to be removed is stored in dxaIndentSav"/>
-            <bit mask="0x20" name="fConverted"
-                description="A bit that specifies whether the nfc of this LVLF structure was previously a temporary value used for bidirectional compatibility that was converted into a standard MSONFC"/>
-            <bit mask="0x40" name="unused1" deprecated="true" description="This bit MUST be ignored"/>
-            <bit mask="0x80" name="fTentative"
-                description="A bit that specifies whether the format of the level is tentative"/>
-        </field>
-        <field type="byte[]" size="9" name="rgbxchNums"
-            description="An array of 8-bit integers. Each integer specifies a one-based character offset to a level placeholder in the xst.rgtchar of the LVL that contains this LVLF. This array is zero-terminated, unless it is full. The count of elements in this array, before to the first terminating zero, MUST be less than or equal to the one-based level of the list to which this LVL corresponds. The integers in this array, before the first terminating zero, MUST be in ascending order, and MUST be unique"/>
-        <field type="byte" size="1" name="ixchFollow"
-            description="An unsigned integer that specifies the character that follows the number text"/>
-        <field type="int" size="4" name="dxaIndentSav"
-            description="If fIndentSav is nonzero, this is a signed integer that specifies the size, in twips, of the indent that needs to be removed when the numbering is removed. This MUST be less than or equal to 0x00007BC0 or greater than or equal to 0xFFFF8440. If fIndentSav is zero, this MUST be ignored"/>
-        <field type="int" size="4" name="unused2" description="This field MUST be ignored"/>
-        <field type="short" size="1" name="cbGrpprlChpx"
-            description="An unsigned integer that specifies the size, in bytes, of the grpprlChpx in the LVL that contains this LVLF"/>
-        <field type="short" size="1" name="cbGrpprlPapx"
-            description="An unsigned integer that specifies the size, in bytes, of the grpprlPapx in the LVL that contains this LVLF"/>
-        <field type="short" size="1" name="ilvlRestartLim"
-            description="An unsigned integer that specifies the first (most-significant) zero-based level after which the number sequence of this level does not restart. The number sequence of this level does restart after any level that is more significant than the specified level. This MUST be less than or equal to the zero-based level of the list to which this LVLF corresponds. If fNoRestart is zero, this MUST be ignored. If this level does not have a number sequence (see nfc), this MUST be ignored"/>
-        <field type="Grfhic" size="1" name="grfhic"
-            description="A grfhic that specifies the HTML incompatibilities of the level."/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/pap_type.xml b/trunk/src/types/definitions/pap_type.xml
deleted file mode 100644
index 710425a..0000000
--- a/trunk/src/types/definitions/pap_type.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<record id="0x101A" name="PAP" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Paragraph Properties.</description>
-    <author>S. Ryan Ackley</author>
-    <fields>
-        <field type="int" size="2" name="istd" description="Index to style descriptor"/>
-        <field type="boolean" size="1" name="fSideBySide"/>
-        <field type="boolean" size="1" name="fKeep"/>
-        <field type="boolean" size="1" name="fKeepFollow"/>
-        <field type="boolean" size="1" name="fPageBreakBefore"/>
-
-        <field type="byte" size="1" name="brcl" description="Border line style">
-            <const type="byte" value="0" name="SINGLE"/>
-            <const type="byte" value="1" name="THICK"/>
-            <const type="byte" value="2" name="DOUBLE"/>
-            <const type="byte" value="3" name="SHADOW"/>
-        </field>
-        <field type="byte" size="1" name="brcp" description="Rectangle border codes">
-            <const type="byte" value="0" name="NONE"/>
-            <const type="byte" value="1" name="BORDER_ABOVE"/>
-            <const type="byte" value="2" name="BORDER_BELOW"/>
-            <const type="byte" value="15" name="BOX_AROUND"/>
-            <const type="byte" value="16" name="BAR_TO_LEFT_OF_PARAGRAPH"/>
-        </field>
-
-        <field type="byte" size="1" name="ilvl" description="List level if non-zero"/>
-        <!-- According to PAPX doc pointer is byte, but according to sprmPIlfo documentation pointer is short, 
-            we will use int -->
-        <field type="int" size="2" name="ilfo" description="1-based index into the pllfo (lists structure), if non-zero"/>
-        <field type="boolean" size="1" name="fNoLnn" description="No line numbering"/>
-
-        <field type="LineSpacingDescriptor" size="4" default="new LineSpacingDescriptor()" name="lspd" description="Line spacing descriptor"/>
-
-        <field type="int" size="4" name="dyaBefore" description="Space before paragraph"/>
-        <field type="int" size="4" name="dyaAfter" description="Space after paragraph"/>
-
-        <!-- Not documented in PAP, but referenced by SPRM doc -->
-        <field type="boolean" size="1" name="fInTable" description="Paragraph is in table flag"/>
-        <field type="boolean" size="1" name="finTableW97" description="Archaic paragraph is in table flag"/>
-        <field type="boolean" size="1" name="fTtp" description="Table trailer paragraph (last in table row)"/>
-
-        <field type="int" size="4" name="dxaAbs"/>
-        <field type="int" size="4" name="dyaAbs"/>
-        <field type="int" size="4" name="dxaWidth"/>
-
-        <field type="boolean" size="1" name="fBrLnAbove"/>
-        <field type="boolean" size="1" name="fBrLnBelow"/>
-
-        <field type="byte" size="1" name="pcVert"/>
-        <field type="byte" size="1" name="pcHorz"/>
-
-        <field type="byte" size="1" name="wr"/>
-
-        <field type="boolean" size="1" name="fNoAutoHyph"/>
-        
-        <!-- wHeightAbs? -->
-        <field type="int" size="2" name="dyaHeight"/>
-        <field type="boolean" size="1" name="fMinHeight" description="Minimum height is exact or auto">
-            <const type="boolean" value="false" name="EXACT"/>
-            <const type="boolean" value="true" name="AT_LEAST"/>
-        </field>
-
-        <field type="DropCapSpecifier" size="2" name="dcs"/>
-
-        <field type="int" size="4" name="dyaFromText" description="Vertical distance between text and absolutely positioned object"/>
-        <field type="int" size="4" name="dxaFromText" description="Horizontal distance between text and absolutely positioned object"/>
-
-        <field type="boolean" size="1" name="fLocked" description="Anchor of an absolutely positioned frame is locked"/>
-        <field type="boolean" size="1" default="true" name="fWidowControl" description="1, Word will prevent widowed lines in this paragraph from being placed at the beginning of a page"/>
-        <field type="boolean" size="1" name="fKinsoku" description="apply Kinsoku rules when performing line wrapping"/>
-        <field type="boolean" size="1" name="fWordWrap" description="perform word wrap"/>
-        <field type="boolean" size="1" name="fOverflowPunct" description="apply overflow punctuation rules when performing line wrapping"/>
-        <field type="boolean" size="1" name="fTopLinePunct" description="perform top line punctuation processing"/>
-        <field type="boolean" size="1" name="fAutoSpaceDE" description="auto space East Asian and alphabetic characters"/>
-        <field type="boolean" size="1" name="fAutoSpaceDN" description="auto space East Asian and numeric characters"/>
-        <field type="int" size="2" name="wAlignFont">
-            <const type="byte" value="0" name="HANGING"/>
-            <const type="byte" value="1" name="CENTERED"/>
-            <const type="byte" value="2" name="ROMAN"/>
-            <const type="byte" value="3" name="VARIABLE"/>
-            <const type="byte" value="4" name="AUTO"/>
-        </field>
-        <field type="short" size="2" name="fontAlign" description="Used internally by Word">
-          <bit number="0" mask="0x0001" name="fVertical"/>
-          <bit number="1" mask="0x0002" name="fBackward"/>
-          <bit number="2" mask="0x0004" name="fRotateFont"/>
-        </field>
-
-        <field type="byte" size="1" default="9" name="lvl" description="Outline level"/>
-        <field type="boolean" size="1" name="fBiDi"/>
-        <field type="boolean" size="1" name="fNumRMIns"/>
-        <field type="boolean" size="1" name="fCrLf"/>
-        <field type="boolean" size="1" name="fUsePgsuSettings"/>
-        <field type="boolean" size="1" name="fAdjustRight"/>
-
-        <field type="int" size="4" name="itap" description="Table nesting level"/>
-        <field type="boolean" size="1" name="fInnerTableCell" description="When 1, the end of paragraph mark is really an end of cell mark for a nested table cell"/>
-        <field type="boolean" size="1" name="fOpenTch" description="Ensure the Table Cell char doesn't show up as zero height"/>
-        <!-- not part of properties structure, but used anyway. See sprmPFInnerTtp doc. -->
-        <field type="boolean" size="1" name="fTtpEmbedded" description="Word 97 compatibility indicates this end of paragraph mark is really an end of row marker for a nested table"/>
-        
-        <field type="short" size="2" name="dxcRight" description="Right indent in character units"/>
-        <field type="short" size="2" name="dxcLeft" description="Left indent in character units"/>
-        <field type="short" size="2" name="dxcLeft1" description="First line indent in character units"/>
-
-        <field type="boolean" size="1" name="fDyaBeforeAuto" description="Vertical spacing before is automatic"/>
-        <field type="boolean" size="1" name="fDyaAfterAuto" description="Vertical spacing after is automatic"/>
-
-        <field type="int" size="4" name="dxaRight"/>
-        <field type="int" size="4" name="dxaLeft"/>
-        <field type="int" size="4" name="dxaLeft1"/>
-
-        <field type="byte" size="1" name="jc"/>
-
-        <field type="BorderCode" size="4" name="brcTop"/>
-        <field type="BorderCode" size="4" name="brcLeft"/>
-        <field type="BorderCode" size="4" name="brcBottom"/>
-        <field type="BorderCode" size="4" name="brcRight"/>
-        <field type="BorderCode" size="4" name="brcBetween"/>
-        <field type="BorderCode" size="4" name="brcBar"/>
-
-        <field type="ShadingDescriptor" size="10" name="shd"/>
-        <field type="byte[]" size="84" name="anld"/>
-        <field type="byte[]" size="12" name="phe"/>
-        <field type="boolean" size="1" name="fPropRMark"/>
-        <field type="int" size="2" name="ibstPropRMark"/>
-        <field type="DateAndTime" size="4" name="dttmPropRMark"/>
-
-        <field type="int" size="2" name="itbdMac" description="Number of tabs stops defined for paragraph. Must be &gt;= 0 and &lt;= 64."/>
-        <field type="int[]" size="128" name="rgdxaTab" description="Array of positions of itbdMac tab stops. itbdMax==64"/>
-        <field type="TabDescriptor[]" size="64" name="rgtbd" description="Array of itbdMac tab descriptors"/>
-
-        <field type="byte[]" size="128" name="numrm"/>
-        <field type="byte[]" size="4" name="ptap"/>
-
-        <field type="boolean" size="1" name="fNoAllowOverlap" description="When 1, absolutely positioned paragraph cannot overlap with another paragraph"/>
-        <field type="long" size="4" name="ipgp" description="HTML DIV ID for this paragraph"/>
-        <field type="long" size="4" name="rsid" description="Save ID for last time this PAP was revised"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/picf_type.xml b/trunk/src/types/definitions/picf_type.xml
deleted file mode 100644
index cdda965..0000000
--- a/trunk/src/types/definitions/picf_type.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="PICF" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The PICF structure specifies the type of a picture, as well as the size of the
-        picture and information about its border. &lt;p&gt;Class and fields descriptions are quoted
-        from Microsoft Office Word 97-2007
-        Binary File Format and [MS-DOC] - v20110608 Word (.doc)
-        Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format
-    </author>
-    <fields>
-        <field type="int" size="4" name="lcb"
-            description="A signed integer that specifies the size, in bytes, of this PICF structure and the subsequent data"/>
-        <field type="int" size="2" name="cbHeader"
-            description="An unsigned integer that specifies the size, in bytes, of this PICF structure. This value MUST be 0x44"/>
-
-        <!-- mfpf (8 bytes) -->
-        <field type="short" size="2" name="mm"
-            description="A signed integer that specifies the format of the picture data"/>
-        <field type="short" size="2" name="xExt" description="This field is unused and MUST be ignored"/>
-        <field type="short" size="2" name="yExt" description="This field is unused and MUST be ignored"/>
-        <field type="short" size="2" name="swHMF" description="This field is unused and MUST be ignored"/>
-
-        <!-- innerHeader (14 bytes) -->
-        <field type="int" size="4" name="grf" description="This field MUST be ignored"/>
-        <field type="int" size="4" name="padding" description="This value MUST be zero and MUST be ignored"/>
-        <field type="int" size="2" name="mmPM" description="This field MUST be ignored"/>
-        <field type="int" size="4" name="padding2" description="This value MUST be zero and MUST be ignored"/>
-
-        <!-- picmid (38 bytes): A PICMID structure that specifies the size and border information of
-            the picture. -->
-        <field type="short" size="2" name="dxaGoal"/>
-        <field type="short" size="2" name="dyaGoal"/>
-        <field type="int" size="2" name="mx"/>
-        <field type="int" size="2" name="my"/>
-        <field type="short" size="2" name="dxaReserved1"/>
-        <field type="short" size="2" name="dyaReserved1"/>
-        <field type="short" size="2" name="dxaReserved2"/>
-        <field type="short" size="2" name="dyaReserved2"/>
-        <field type="byte" size="1" name="fReserved"/>
-        <field type="byte" size="1" name="bpp"/>
-        <field type="byte[]" size="4" name="brcTop80"/>
-        <field type="byte[]" size="4" name="brcLeft80"/>
-        <field type="byte[]" size="4" name="brcBottom80"/>
-        <field type="byte[]" size="4" name="brcRight80"/>
-        <field type="short" size="2" name="dxaReserved3"/>
-        <field type="short" size="2" name="dyaReserved3"/>
-
-        <field type="short" size="2" name="cProps" description="This value MUST be 0 and MUST be ignored"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/sep_type.xml b/trunk/src/types/definitions/sep_type.xml
deleted file mode 100644
index ff0689b..0000000
--- a/trunk/src/types/definitions/sep_type.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record id="0x101B" name="SEP" fromfile="false" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Section Properties.</description>
-    <author>S. Ryan Ackley</author>
-    <fields>
-        <field type="byte" size="1" name="bkc" default="2" description="Break code">
-            <const type="byte" value="0" name="NO_BREAK" description="No break"/>
-            <const type="byte" value="1" name="NEW_COLUMN" description="New column"/>
-            <const type="byte" value="2" name="NEW_PAGE" description="New page"/>
-            <const type="byte" value="3" name="EVEN_PAGE" description="Even page"/>
-            <const type="byte" value="4" name="ODD_PAGE" description="Odd page"/>
-        </field>
-        <field type="boolean" size="1" name="fTitlePage" description="Set to 1 when a title page is to be displayed"/>
-        <field type="boolean" size="1" name="fAutoPgn"
-            description="Only for Macintosh compatibility, used only during open, when 1, sep.dxaPgn and sep.dyaPgn are valid page number locations"/>
-        <field type="byte" size="1" name="nfcPgn" description="Page number format code">
-            <const type="byte" name="ARABIC" value="0" description="Arabic"/>
-            <const type="byte" name="ROMAN_UPPER_CASE" value="1" description="Roman (upper case)"/>
-            <const type="byte" name="ROMAN_LOWER_CASE" value="2" description="Roman (lower case)"/>
-            <const type="byte" name="LETTER_UPPER_CASE" value="3" description="Letter (upper case)"/>
-            <const type="byte" name="LETTER_LOWER_CASE" value="4" description="Letter (lower case)"/>
-        </field>
-        <field type="boolean" size="1" name="fUnlocked"/>
-        <field type="byte" size="1" name="cnsPgn"/>
-        <field type="boolean" size="1" name="fPgnRestart"/>
-        <field type="boolean" size="1" default="true" name="fEndNote"/>
-        <field type="byte" size="1" name="lnc"/>
-        <field type="byte" size="1" name="grpfIhdt"/>
-        <field type="int" size="2" name="nLnnMod"/>
-        <field type="int" size="4" name="dxaLnn"/>
-        <field type="int" size="2" default="720" name="dxaPgn"/>
-        <field type="int" size="2" default="720" name="dyaPgn"/>
-        <field type="boolean" size="0" name="fLBetween"/>
-        <field type="byte" size="1" name="vjc"/>
-        <field type="int" size="2" name="dmBinFirst"/>
-        <field type="int" size="2" name="dmBinOther"/>
-        <field type="int" size="2" name="dmPaperReq"/>
-        <field type="BorderCode" size="4" name="brcTop"/>
-        <field type="BorderCode" size="4" name="brcLeft"/>
-        <field type="BorderCode" size="4" name="brcBottom"/>
-        <field type="BorderCode" size="4" name="brcRight"/>
-        <field type="boolean" size="1" name="fPropMark"/>
-        <field type="int" size="2" name="ibstPropRMark"/>
-        <field type="DateAndTime" size="4" name="dttmPropRMark"/>
-        <field type="int" size="4" name="dxtCharSpace"/>
-        <field type="int" size="4" name="dyaLinePitch"/>
-        <field type="int" size="2" name="clm"/>
-        <field type="int" size="2" name="unused2"/>
-        <field type="boolean" size="1" default="true" name="dmOrientPage">
-            <const type="boolean" name="LANDSCAPE" value="false"/>
-            <const type="boolean" name="PORTRAIT" value="true"/>
-        </field>
-        <field type="byte" size="1" name="iHeadingPgn"/>
-        <field type="int" size="2" default="1" name="pgnStart"/>
-        <field type="int" size="2" name="lnnMin"/>
-        <field type="int" size="2" name="wTextFlow"/>
-        <field type="short" size="2" name="unused3"/>
-        <field type="int" size="2" name="pgbProp"/>
-        <field type="short" size="2" name="unused4"/>
-        <field type="int" size="4" default="12240" name="xaPage"/>
-        <field type="int" size="4" default="15840" name="yaPage"/>
-        <field type="int" size="4" default="12240" name="xaPageNUp"/>
-        <field type="int" size="4" default="15840" name="yaPageNUp"/>
-        <field type="int" size="4" default="1800" name="dxaLeft"/>
-        <field type="int" size="4" default="1800" name="dxaRight"/>
-        <field type="int" size="4" default="1440" name="dyaTop"/>
-        <field type="int" size="4" default="1440" name="dyaBottom"/>
-        <field type="int" size="4" name="dzaGutter"/>
-        <field type="int" size="4" default="720" name="dyaHdrTop"/>
-        <field type="int" size="4" default="720" name="dyaHdrBottom"/>
-        <field type="int" size="2" name="ccolM1"/>
-        <field type="boolean" size="0" default="true" name="fEvenlySpaced"/>
-        <field type="byte" size="1" name="unused5"/>
-        <field type="int" size="4" default="720" name="dxaColumns"/>
-        <field type="int[]" size="356" name="rgdxaColumn"/>
-        <field type="int" size="4" name="dxaColumnWidth"/>
-        <field type="byte" size="1" name="dmOrientFirst"/>
-        <field type="byte" size="1" name="fLayout"/>
-        <field type="short" size="2" name="unused6"/>
-        <field type="byte[]" size="212" name="olstAnm"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/shd80_type.xml b/trunk/src/types/definitions/shd80_type.xml
deleted file mode 100644
index 22210ce..0000000
--- a/trunk/src/types/definitions/shd80_type.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="SHD80" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The Shd80 structure specifies the colors and pattern that are used for background
-        shading. As an exception to the constraints that are specified by Ico and Ipat, a Shd80 can
-        be set to Shd80Nil and specifies that no shading is applied. &lt;p&gt;Class and fields
-        descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation
-    </description>
-    <author>Sergey Vladimirov; according to Word (.doc) Binary File Format by Microsoft Corporation.
-    </author>
-    <fields>
-        <field type="short" size="2" name="value">
-            <bit number="1" mask="0x001F" name="icoFore" description="Foreground color"/>
-            <bit number="2" mask="0x03E0" name="icoBack" description="Background color"/>
-            <bit number="3" mask="0xFC00" name="ipat" description="Shading pattern"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/shd_type.xml b/trunk/src/types/definitions/shd_type.xml
deleted file mode 100644
index a2c1ba6..0000000
--- a/trunk/src/types/definitions/shd_type.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="SHD" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The Shd structure specifies the colors and pattern that are used for background shading. &lt;p&gt;Class
-        and
-        fields descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation
-    </description>
-    <author>Sergey Vladimirov; according to Word (.doc) Binary File Format by Microsoft Corporation.
-    </author>
-    <fields>
-        <field type="Colorref" size="4" name="cvFore" description="A COLORREF that specifies the foreground color of ipat"/>
-        <field type="Colorref" size="4" name="cvBack" description="A COLORREF that specifies the background color of ipat"/>
-        <field type="int" size="2" name="ipat" description="An Ipat that specifies the pattern used for shading"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/tap_type.xml b/trunk/src/types/definitions/tap_type.xml
deleted file mode 100644
index 2a56ddc..0000000
--- a/trunk/src/types/definitions/tap_type.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record id="0x101B" name="TAP" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Table Properties. Properties descriptions quoted from official 97-2007 binary file
-        format specification.
-    </description>
-    <author>S. Ryan Ackley</author>
-    <fields>
-        <!-- page 198 -->
-        <field type="short" size="2" name="istd" description="Table style for the Table"/>
-        <field type="short" size="2" name="jc"
-            description="Justification code. specifies how table row should be justified within its column. 0 -- left justify, 1 -- center, 2 -- right justify"/>
-        <field type="int" size="4" name="dxaGapHalf"
-            description="Measures half of the white space that will be maintained between text in adjacent columns of a table row. A dxaGapHalf width of white space will be maintained on both sides of a column boundary."/>
-        <field type="int" size="4" name="dyaRowHeight"
-            description="When greater than 0, guarantees that the height of the table will be at least dyaRowHeight high. When less than 0, guarantees that the height of the table will be exactly absolute value of dyaRowHeight high. When 0, table will be given a height large enough to represent all of the text in all of the cells of the table. Cells with vertical text flow make no contribution to the computation of the height of rows with auto or at least height. Neither do vertically merged cells, except in the last row of the vertical merge. If an auto height row consists entirely of cells which have vertical text direction or are vertically merged, and the row does not contain the last cell in any vertical cell merge, then the row is given height equal to that of the end of cell mark in the first cell."/>
-        <field type="boolean" size="0" name="fCantSplit"
-            description="When 1, table row may not be split across page bounds"/>
-        <field type="boolean" size="0" name="fCantSplit90"
-            description="When 1, table row may not be split across page bounds. Used for Word 2000 and Word 97."/>
-        <field type="boolean" size="0" name="fTableHeader"
-            description="When 1, table row is to be used as the header of the table"/>
-
-        <field type="TableAutoformatLookSpecifier" size="4" name="tlp" description="Table look specifier"/>
-
-        <field type="short" size="2" name="wWidth" description="Preferred table width"/>
-        <field type="short" size="2" name="wWidthIndent" description="Left Indent"/>
-        <field type="short" size="2" name="wWidthBefore"
-            description="Width of invisible cell (used for layout purposes) before the first visible cell in the row."/>
-        <field type="short" size="2" name="wWidthAfter"
-            description="Width of invisible cell (used for layout purposes) after the last visible cell in the row."/>
-
-        <field type="int" size="4" name="widthAndFitsFlags">
-            <bit number="0" mask="0x00000001" name="fAutofit" description="When set to 1, AutoFit this table"/>
-            <!-- page 199 -->
-            <bit number="1" mask="0x00000002" name="fKeepFollow"
-                description="When set to 1, keep this row with the following row"/>
-
-            <bit number="2" mask="0x0000001c" name="ftsWidth"
-                description="Units for wWidth: 0 -- null; 1 -- auto, ignores wWidth, 2 -- percentage (in 50ths of a percent), 3 -- twips"/>
-            <bit number="3" mask="0x000000e0" name="ftsWidthIndent"
-                description="Units for wWidthIndent: 0 -- null; 1 -- auto, ignores wWidthIndent, 2 -- percentage (in 50ths of a percent), 3 -- twips"/>
-            <bit number="4" mask="0x00000700" name="ftsWidthBefore"
-                description="Units for wWidthBefore: 0 -- null; 1 -- auto, ignores wWidthBefore, 2 -- percentage (in 50ths of a percent), 3 -- twips"/>
-            <bit number="5" mask="0x00003800" name="ftsWidthAfter"
-                description="Units for wWidthAfter: 0 -- null; 1 -- auto, ignores wWidthAfter, 2 -- percentage (in 50ths of a percent), 3 -- twips"/>
-
-            <bit number="6" mask="0x00004000" name="fNeverBeenAutofit" description="When 1, table has never been autofit"/>
-            <bit number="7" mask="0x00008000" name="fInvalAutofit"
-                description="When 1, TAP is still valid, but autofit properties aren't"/>
-            <bit number="8" mask="0x00070000" name="widthAndFitsFlags_empty1" description="Not used"/>
-            <bit number="9" mask="0x00080000" name="fVert" description="When 1, positioned in vertical text flow"/>
-            <bit number="10" mask="0x00300000" name="pcVert"
-                description="Vertical position code. Specifies coordinate frame to use when paragraphs are absolutely positioned. 0 -- vertical position coordinates are relative to margin; 1 -- coordinates are relative to page; 2 -- coordinates are relative to text. This means: relative to where the next non-APO text would have been placed if this APO did not exist."/>
-            <bit number="11" mask="0x00c00000" name="pcHorz"
-                description="Horizontal position code. Specifies coordinate frame to use when paragraphs are absolutely positioned. 0 -- horizontal position coordinates are relative to column; 1 -- coordinates are relative to margin; 2 -- coordinates are relative to page"/>
-            <bit number="12" mask="0xff000000" name="widthAndFitsFlags_empty2" description="Not used"/>
-        </field>
-
-        <field type="int" size="4" name="dxaAbs" description="Absolute horizontal position"/>
-        <field type="int" size="4" name="dyaAbs" description="Absolute vertical position"/>
-        <field type="int" size="4" name="dxaFromText"
-            description="Left distance from surrounding text when absolutely positioned"/>
-        <field type="int" size="4" name="dyaFromText"
-            description="Top distance from surrounding text when absolutely positioned"/>
-        <field type="int" size="4" name="dxaFromTextRight"
-            description="Right distance from surrounding text when absolutely positioned"/>
-        <field type="int" size="4" name="dyaFromTextBottom"
-            description="Bottom distance from surrounding text when absolutely positioned"/>
-
-        <field type="byte" size="1" name="fBiDi"
-            description="When 1, table is right-to-left. Logical right-to-left table: The CP stream of a right-to-left table is meant to be displayed from right to left. So for example the first table cell is displayed on the right side of the table instead of the left."/>
-        <field type="byte" size="1" name="fRTL"
-            description="Word 2000 style right-to-left table. Visual right-to-left table: The CP stream of a right-to-left table is displayed from left to right just as for a ―normal‖ table. So, the text which is meant to be in the ―first‖ (rightmost) table cell must be placed in the last table cell in the CP stream."/>
-        <field type="byte" size="1" name="fNoAllowOverlap"
-            description="When set to 1, do not allow absolutely positioned table to overlap with other tables"/>
-        <field type="byte" size="1" name="fSpare" description="Not used"/>
-
-        <field type="int" size="2" name="grpfTap" description="Used internally by Word"/>
-
-        <field type="int" size="2" name="internalFlags" description="Used internally by Word">
-            <bit number="1" mask="0x0001" name="fFirstRow" description="Used internally by Word: first row"/>
-            <bit number="2" mask="0x0002" name="fLastRow" description="Used internally by Word: last row"/>
-            <bit number="3" mask="0x0004" name="fOutline"
-                description="Used internally by Word: row was cached for outline mode"/>
-            <bit number="4" mask="0x0008" name="fOrigWordTableRules"
-                description="Used internally by Word: table combining like Word 5.x for the Macintosh and WinWord 1.x"/>
-            <bit number="5" mask="0x0010" name="fCellSpacing"
-                description="Used internally by Word: When set to 1 cell spacing is allowed"/>
-            <bit number="6" mask="0xffe0" name="grpfTap_unused" description="Not used"/>
-        </field>
-
-        <field type="short" size="2" name="itcMac"
-            description="Count of cells defined for this row. itcMac must be >= 0 and less than or equal to 64."/>
-
-        <field type="int" size="4" name="dxaAdjust" description="Used internally by Word"/>
-        <field type="int" size="4" name="dxaWebView" description="Used internally by Word"/>
-        <field type="int" size="4" name="dxaRTEWrapWidth" description="Used internally by Word"/>
-        <field type="int" size="4" name="dxaColWidthWwd" description="Used internally by Word"/>
-
-        <field type="short" size="2" name="pctWwd"
-            description="Used internally by Word: percent of Window size for AutoFit in WebView"/>
-
-        <field type="int" size="2" name="viewFlags" description="Used internally by Word">
-            <bit number="1" mask="0x0001" name="fWrapToWwd"
-                description="Used internally by Word: Wrap to window is on when set to 1"/>
-            <bit number="2" mask="0x0002" name="fNotPageView"
-                description="Used internally by Word: when set to 1 we are not in Page View"/>
-            <bit number="3" mask="0x0004" name="viewFlags_unused1" description="Not used"/>
-            <bit number="4" mask="0x0008" name="fWebView"
-                description="Used internally by Word: Web View is on when set to 1"/>
-            <bit number="5" mask="0x0010" name="fAdjusted" description="Used internally by Word"/>
-            <bit number="6" mask="0xffe0" name="viewFlags_unused2" description="Not used"/>
-        </field>
-
-        <field type="short[]" size="130" name="rgdxaCenter"
-            description="rgdxaCenter[0] is the left boundary of cell 0 measured relative to margin rgdxaCenter[tap.itcMac - 1] is left boundary of last cell rgdxaCenter[tap.itcMac] is right boundary of last cell."/>
-        <field type="short[]" size="130" name="rgdxaCenterPrint" description="Used internally by Word"/>
-
-        <field type="ShadingDescriptor" size="10" name="shdTable" description="Table shading"/>
-
-        <!-- rgbrcTable[ibrcTableMax]; Array of borders; ibrcTableMax==6 -->
-        <field type="BorderCode" size="4" name="brcBottom"/>
-        <field type="BorderCode" size="4" name="brcTop"/>
-        <field type="BorderCode" size="4" name="brcLeft"/>
-        <field type="BorderCode" size="4" name="brcRight"/>
-        <field type="BorderCode" size="4" name="brcVertical"/>
-        <field type="BorderCode" size="4" name="brcHorizontal"/>
-
-        <!-- mpibrcwCellPaddingDefault[cbrcTc]; Array of default cell margins. Index into the next four
-            properties. -->
-        <field type="short" size="2" name="wCellPaddingDefaultTop" description="Default top cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingDefaultLeft" description="Default left cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingDefaultBottom" description="Default bottom cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingDefaultRight" description="Default right cell margin/padding"/>
-
-        <!-- mpibrcftsCellPaddingDefault[cbrcTc]; Array of default cell margin units. Index into the
-            next four properties -->
-        <field type="byte" size="1" name="ftsCellPaddingDefaultTop"
-            description="Default top cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellPaddingDefaultLeft"
-            description="Default left cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellPaddingDefaultBottom"
-            description="Default bottom cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellPaddingDefaultRight"
-            description="Default right cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-
-        <!-- mpibrcwCellSpacingDefault[cbrcTc]; Array of default cell spacing. Index into the next four
-            properties -->
-        <field type="short" size="2" name="wCellSpacingDefaultTop" description="Default top cell spacings"/>
-        <field type="short" size="2" name="wCellSpacingDefaultLeft" description="Default left cell spacings"/>
-        <field type="short" size="2" name="wCellSpacingDefaultBottom" description="Default bottom cell spacings"/>
-        <field type="short" size="2" name="wCellSpacingDefaultRight" description="Default right cell spacings"/>
-
-        <!-- mpibrcftsCellSpacingDefault[cbrcTc]; Array of default cell spacing units. Index into the
-            next four properties -->
-        <field type="byte" size="1" name="ftsCellSpacingDefaultTop"
-            description="Default top cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellSpacingDefaultLeft"
-            description="Default left cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellSpacingDefaultBottom"
-            description="Default bottom cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellSpacingDefaultRight"
-            description="Default right cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-
-        <!-- mpibrcwCellPaddingOuter[cbrcTc]; Array of default outer cell margins. Index into the next
-            four properties. -->
-        <field type="short" size="2" name="wCellPaddingOuterTop" description="Default outer top cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingOuterLeft" description="Default outer left cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingOuterBottom" description="Default outer bottom cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingOuterRight" description="Default outer right cell margin/padding"/>
-
-        <!-- mpibrcftsCellPaddingOuter[cbrcTc]; Array of default outer cell margin units. Index into
-            the next four properties -->
-        <field type="byte" size="1" name="ftsCellPaddingOuterTop"
-            description="Default outer top cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellPaddingOuterLeft"
-            description="Default outer left cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellPaddingOuterBottom"
-            description="Default outer bottom cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellPaddingOuterRight"
-            description="Default outer right cell margin/padding units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-
-        <!-- mpibrcwCellSpacingOuter[cbrcTc]; Array of default outer cell spacing. Index into the next
-            four properties. -->
-        <field type="short" size="2" name="wCellSpacingOuterTop" description="Default outer top cell spacing"/>
-        <field type="short" size="2" name="wCellSpacingOuterLeft" description="Default outer left cell spacing"/>
-        <field type="short" size="2" name="wCellSpacingOuterBottom" description="Default outer bottom cell spacing"/>
-        <field type="short" size="2" name="wCellSpacingOuterRight" description="Default outer right cell spacing"/>
-
-        <!-- mpibrcftsCellSpacingOuter[cbrcTc]; Array of default outer cell spacing units. Index into
-            the next four properties. -->
-        <field type="byte" size="1" name="ftsCellSpacingOuterTop"
-            description="Default outer top cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellSpacingOuterLeft"
-            description="Default outer left cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellSpacingOuterBottom"
-            description="Default outer bottom cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-        <field type="byte" size="1" name="ftsCellSpacingOuterRight"
-            description="Default outer right cell spacings units. 0 -- null; 1-2 -- not relevant; 3 -- twips."/>
-
-        <field type="TableCellDescriptor[]" size="0" name="rgtc"/>
-        <field type="ShadingDescriptor[]" size="0" name="rgshd"/>
-
-        <field type="byte" size="1" name="fPropRMark" description="Set to 1 if property revision"/>
-        <!-- TODO: ibstPropRMark -->
-        <!-- TODO: dttmPropRMark -->
-        <field type="byte" size="1" name="fHasOldProps" description="Has old properties"/>
-
-        <!-- TODO: ipgp -->
-        <!-- TODO: hplcnf -->
-        <!-- TODO: rsid -->
-        <!-- TODO: tcDefault -->
-
-        <field type="short" size="1" name="cHorzBands"
-            description="Size of each horizontal style band, in number of rows"/>
-        <field type="short" size="1" name="cVertBands"
-            description="Size of a vertical style band, in number of columns"/>
-
-        <field type="BorderCode" size="8" name="rgbrcInsideDefault_0"
-            description="Border definition for inside horizontal borders"/>
-        <field type="BorderCode" size="8" name="rgbrcInsideDefault_1" description="Border definition for inside vertical borders"/>
-
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/tbd_type.xml b/trunk/src/types/definitions/tbd_type.xml
deleted file mode 100644
index 7faeb01..0000000
--- a/trunk/src/types/definitions/tbd_type.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="TBD" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <description>The TBD is a substructure of the PAP. &lt;p&gt;Class and fields descriptions are quoted from
-        Microsoft Office Word 97-2007 Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc]
-    </author>
-    <fields>
-        <field type="byte" size="1" name="value" >
-            <bit number="0" mask="0x07" name="jc" description="Justification code">
-                <const type="byte" value="0" name="LEFT"/>
-                <const type="byte" value="1" name="CENTERED"/>
-                <const type="byte" value="2" name="RIGHT"/>
-                <const type="byte" value="3" name="DECIMAL"/>
-                <const type="byte" value="4" name="BAR"/>
-            </bit>
-            <bit number="0" mask="0x38" name="tlc" description="Tab leader code">
-                <const type="byte" value="0" name="NONE"/>
-                <const type="byte" value="1" name="DOTTED"/>
-                <const type="byte" value="2" name="HYPENATED"/>
-                <const type="byte" value="3" name="SINGLELINE"/>
-                <const type="byte" value="4" name="HEAVYLINE"/>
-                <const type="byte" value="5" name="MIDDLEDOT"/>
-            </bit>
-            <bit number="3" mask="0xc0" name="reserved" />
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/tc_type.xml b/trunk/src/types/definitions/tc_type.xml
deleted file mode 100644
index 7df82bd..0000000
--- a/trunk/src/types/definitions/tc_type.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="false" id="0x101B" name="TC" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Table Cell Descriptor.</description>
-    <author>S. Ryan Ackley. Field descriptions are quoted from Microsoft Office Word 97-2007 Binary
-        File Format (.doc) Specification
-    </author>
-    <fields>
-        <field type="short" size="2" name="rgf">
-            <bit number="0" mask="0x0001" name="fFirstMerged"
-                description="When 1, cell is first cell of a range of cells that have been merged. When a cell is merged, the display areas of the merged cells are consolidated and the text within the cells is interpreted as belonging to one text stream for purposes of calculating line breaks."/>
-            <bit number="1" mask="0x0002" name="fMerged"
-                description="When 1, cell has been merged with preceding cell"/>
-            <bit number="2" mask="0x0004" name="fVertical" description="When 1, cell has vertical text flow"/>
-            <bit number="3" mask="0x0008" name="fBackward"
-                description="For a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0"/>
-            <bit number="4" mask="0x0010" name="fRotateFont"
-                description="When 1, cell has rotated characters (i.e. uses @font)"/>
-            <bit number="5" mask="0x0020" name="fVertMerge"
-                description="When 1, cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3)."/>
-            <bit number="6" mask="0x0040" name="fVertRestart"
-                description="When 1, the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty."/>
-            <bit number="7" mask="0x0180" name="vertAlign"
-                description="Specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary)"/>
-            <bit number="8" mask="0x0E00" name="ftsWidth" description="Units for wWidth"/>
-            <bit number="9" mask="0x1000" name="fFitText" description="When 1, make the text fit the table cell"/>
-            <bit number="10" mask="0x2000" name="fNoWrap"
-                description="When 1, do not allow text to wrap in the table cell"/>
-            <bit number="11" mask="0xC000" name="fUnused" description="Not used"/>
-        </field>
-        <field type="short" size="2" name="wWidth" description="Preferred cell width"/>
-        <field type="ShadingDescriptor" size="10" name="shd" description="Cell shading"/>
-        <!-- tcd -->
-        <field type="short" size="2" name="wCellPaddingLeft" description="Left cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingTop" description="Top cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingBottom" description="Bottom cell margin/padding"/>
-        <field type="short" size="2" name="wCellPaddingRight" description="Right cell margin/padding"/>
-        <field type="byte" size="1" name="ftsCellPaddingLeft" description="Left cell margin/padding units"/>
-        <field type="byte" size="1" name="ftsCellPaddingTop" description="Top cell margin/padding units"/>
-        <field type="byte" size="1" name="ftsCellPaddingBottom" description="Bottom cell margin/padding units"/>
-        <field type="byte" size="1" name="ftsCellPaddingRight" description="Right cell margin/padding units"/>
-        <field type="short" size="2" name="wCellSpacingLeft" description="Left cell spacing"/>
-        <field type="short" size="2" name="wCellSpacingTop" description="Top cell spacing"/>
-        <field type="short" size="2" name="wCellSpacingBottom" description="Bottom cell spacing"/>
-        <field type="short" size="2" name="wCellSpacingRight" description="Right cell spacing"/>
-        <field type="byte" size="1" name="ftsCellSpacingLeft" description="Left cell spacing units"/>
-        <field type="byte" size="1" name="ftsCellSpacingTop" description="Top cell spacing units"/>
-        <field type="byte" size="1" name="ftsCellSpacingBottom" description="Bottom cell spacing units"/>
-        <field type="byte" size="1" name="ftsCellSpacingRight" description="Right cell spacing units"/>
-        <!-- mpibrcfValidGapHalf[cbrcTc] -->
-        <!-- mpibrcdzaGapHalf[cbrcTc] -->
-        <field type="BorderCode" size="4" name="brcTop" description="Top border"/>
-        <field type="BorderCode" size="4" name="brcLeft" description="Left border"/>
-        <field type="BorderCode" size="4" name="brcBottom" description="Bottom border"/>
-        <field type="BorderCode" size="4" name="brcRight" description="Right border"/>
-    </fields>
-</record>
diff --git a/trunk/src/types/definitions/tlp_type.xml b/trunk/src/types/definitions/tlp_type.xml
deleted file mode 100644
index b915e6e..0000000
--- a/trunk/src/types/definitions/tlp_type.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ====================================================================
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ====================================================================
--->
-<record fromfile="true" name="TLP" package="org.apache.poi.hwpf.model.types">
-    <suffix>AbstractType</suffix>
-    <extends>HDFType</extends>
-    <description>Table Autoformat Look sPecifier (TLP). &lt;p&gt;Class and fields descriptions are
-        quoted from Microsoft Office Word 97-2007 Binary File Format
-    </description>
-    <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format
-        Specification [*.doc]
-    </author>
-    <fields>
-        <field type="short" size="2" name="itl"
-            description="Index to Word‘s table of table looks (see itl table below)"/>
-        <field type="byte" size="1" name="tlp_flags">
-            <bit number="0" mask="0x0001" name="fBorders"
-                description="When == 1, use the border properties from the selected table look"/>
-            <bit number="1" mask="0x0002" name="fShading"
-                description="When == 1, use the shading properties from the selected table look"/>
-            <bit number="2" mask="0x0004" name="fFont"
-                description="When == 1, use the font from the selected table look"/>
-            <bit number="3" mask="0x0008" name="fColor"
-                description="When == 1, use the color from the selected table look"/>
-            <bit number="4" mask="0x0010" name="fBestFit"
-                description="When == 1, do best fit from the selected table look"/>
-            <bit number="5" mask="0x0020" name="fHdrRows"
-                description="When == 1, apply properties from the selected table look to the header rows in the table"/>
-            <bit number="6" mask="0x0040" name="fLastRow"
-                description="When == 1, apply properties from the selected table look to the last row in the table"/>
-        </field>
-    </fields>
-</record>
diff --git a/trunk/src/types/styles/hdftype.xsl b/trunk/src/types/styles/hdftype.xsl
deleted file mode 100644
index d8c90e7..0000000
--- a/trunk/src/types/styles/hdftype.xsl
+++ /dev/null
@@ -1,642 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.hwpf.dev.RecordUtil"
-   xmlns:field="org.apache.poi.hwpf.dev.FieldIterator"
-   xmlns:java="java" >
-
-    <xsl:output method="text"/>
-
-    <xsl:template name="outputClassName">
-        <xsl:value-of select="/record/@name"/>
-        <xsl:value-of select="/record/suffix"/>
-    </xsl:template>
-
-	<xsl:template match="record">
-		<xsl:text>/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-</xsl:text>
-
-<xsl:if test="@package">
-package <xsl:value-of select="@package"/>;
-</xsl:if>
-
-import org.apache.poi.hwpf.usermodel.*;
-import org.apache.poi.util.*;
-
-/**
- * <xsl:value-of select="/record/description"/>
- * &lt;p&gt;
- * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
- *       remove the record in src/types/definitions.
- * &lt;p&gt;
- * This class is internal. It content or properties may change without notice 
- * due to changes in our knowledge of internal Microsoft Word binary structures.
-<xsl:apply-templates select="author"/><xsl:text>
- */
-@Internal
-public abstract class </xsl:text><xsl:call-template name="outputClassName"/><xsl:text>
-{
-
-</xsl:text>
-    <xsl:for-each select="//fields/field">
-        <xsl:if test="@deprecated='true'">
-            <xsl:call-template name="indent"/>
-            <xsl:text>@Deprecated</xsl:text>
-            <xsl:call-template name="linebreak"/>
-        </xsl:if>
-        <xsl:call-template name="indent"/>
-        <xsl:text>protected </xsl:text>
-        <xsl:value-of select="@type"/>
-        <xsl:text> field_</xsl:text>
-        <xsl:value-of select="position()"/>
-        <xsl:text>_</xsl:text>
-        <xsl:value-of select="@name"/>
-        <xsl:text>;</xsl:text>
-        <xsl:call-template name="linebreak"/>
-        <xsl:apply-templates select="./bit|./const"/>
-    </xsl:for-each>
-
-    <xsl:call-template name="linebreak"/>
-
-    <xsl:call-template name="indent"/>
-    <xsl:text>protected </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>AbstractType()</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>{</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:for-each select="//fields/field">
-        <!-- we don't include @default condition in for-each to preserve position() -->
-        <xsl:if test="@default">
-            <xsl:call-template name="indent"/>
-            <xsl:call-template name="indent"/>
-            <xsl:text>this.</xsl:text>
-            <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-            <xsl:text> = </xsl:text>
-            <xsl:value-of select="@default"/>
-            <xsl:text>;</xsl:text>
-            <xsl:call-template name="linebreak"/>
-        </xsl:if>
-        <xsl:choose>
-            <xsl:when test="@type='boolean'"/>
-            <xsl:when test="@type='byte'"/>
-            <xsl:when test="@type='int'"/>
-            <xsl:when test="@type='short'"/>
-            <xsl:when test="@type='long'"/>
-            <xsl:when test="@type='byte[]'">
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>this.</xsl:text>
-                <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-                <xsl:text> = new byte[</xsl:text>
-                <xsl:value-of select="@size"/>
-                <xsl:text>];</xsl:text>
-                <xsl:call-template name="linebreak"/>
-            </xsl:when>
-            <xsl:when test="substring(@type, string-length(@type) - 1) = '[]'">
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>this.</xsl:text>
-                <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-                <xsl:text> = new </xsl:text>
-                <xsl:value-of select="substring(@type, 0, string-length(@type) - 1)"/>
-                <xsl:text>[0];</xsl:text>
-                <xsl:call-template name="linebreak"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>this.</xsl:text>
-                <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-                <xsl:text> = new </xsl:text>
-                <xsl:value-of select="@type"/>
-                <xsl:text>();</xsl:text>
-                <xsl:call-template name="linebreak"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:for-each>
-    <xsl:call-template name="indent"/>
-    <xsl:text>}</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="linebreak"/>
-
-    <xsl:if test='/*/@fromfile="true"'>
-    <xsl:call-template name="indent"/>
-<xsl:text>protected void fillFields( byte[] data, int offset )
-    {
-</xsl:text>
-<xsl:variable name="fieldIterator" select="field:new()"/>
-    <xsl:for-each select="//fields/field">
-        <xsl:call-template name="indent"/>
-        <xsl:call-template name="indent"/>
-        <xsl:value-of select="recutil:getFieldName(position(),@name,30)"/>
-        <xsl:text> = </xsl:text>
-        <xsl:value-of select="field:fillDecoder($fieldIterator,@size,@type)"/>
-        <xsl:text>;
-</xsl:text>
-    </xsl:for-each>
-    <xsl:call-template name="indent"/>
-    <xsl:text>}</xsl:text>
-    <xsl:call-template name="linebreak"/>
-
-    <xsl:call-template name="linebreak"/>
-
-    <xsl:call-template name="indent"/>
-    <xsl:text>public void serialize( byte[] data, int offset )
-    {
-</xsl:text>
-<xsl:variable name="fieldIterator" select="field:new()"/>
-    <xsl:for-each select="//fields/field">
-        <xsl:call-template name="indent"/>
-        <xsl:call-template name="indent"/>
-        <xsl:value-of select="field:serialiseEncoder($fieldIterator,position(),@name,@size,@type)"/>
-        <xsl:call-template name="linebreak"/>
-    </xsl:for-each>
-    <xsl:call-template name="indent"/>
-    <xsl:text>}</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:text>
-    public byte[] serialize()
-    {
-        final byte[] result = new byte[ getSize() ];
-        serialize( result, 0 );
-        return result;
-    }
-</xsl:text>
-    <xsl:text>
-    /**
-     * Size of record
-     */
-    public static int getSize()
-    {
-</xsl:text>
-    <xsl:call-template name="indent"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>return 0</xsl:text>
-    <xsl:variable name="fieldIterator" select="field:new()"/>
-    <xsl:for-each select="//fields/field">
-        <xsl:value-of select="field:calcSize($fieldIterator,position(),@name,@size,@type)"/>
-    </xsl:for-each>
-    <xsl:text>;</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>}</xsl:text>
-    <xsl:call-template name="linebreak"/>
-</xsl:if>
-
-    <!-- equals() -->
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>@Override</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>public boolean equals( Object obj )
-    {
-        if ( this == obj )
-            return true;
-        if ( obj == null )
-            return false;
-        if ( getClass() != obj.getClass() )
-            return false;
-</xsl:text>
-    <xsl:call-template name="indent"/>
-    <xsl:call-template name="indent"/>
-    <xsl:call-template name="outputClassName"/>
-    <xsl:text> other = (</xsl:text>
-    <xsl:call-template name="outputClassName"/>
-    <xsl:text>) obj;</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:for-each select="//fields/field">
-        <xsl:variable name="fieldName" select="recutil:getFieldName(position(),@name,0)"/>
-        <xsl:call-template name="indent"/>
-        <xsl:call-template name="indent"/>
-        <xsl:choose>
-            <xsl:when test="substring(@type, string-length(@type)-1)='[]'">
-                <xsl:text>if ( </xsl:text>
-                <xsl:text>!Arrays.equals( </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text>, other.</xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text> )</xsl:text>
-                <xsl:text> )</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>return false;</xsl:text>
-                <xsl:call-template name="linebreak"/>
-            </xsl:when>
-            <xsl:when test="@type='boolean' or @type='byte' or @type='double' or @type='int' or @type='long' or @type='short'">
-                <xsl:text>if ( </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text> != other.</xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text> )</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>return false;</xsl:text>
-                <xsl:call-template name="linebreak"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>if ( </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text> == null )</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>{</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>if ( other.</xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text> != null )</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>return false;</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>}</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>else if ( !</xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text>.equals( other.</xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text> ) )</xsl:text>
-                <xsl:call-template name="linebreak"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:call-template name="indent"/>
-                <xsl:text>return false;</xsl:text>
-                <xsl:call-template name="linebreak"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:for-each>
-    <xsl:call-template name="indent"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>return true;</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>}</xsl:text>
-    <xsl:call-template name="linebreak"/>
-
-    <!-- hashCode() -->
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>@Override</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-</xsl:text>
-    <xsl:for-each select="//fields/field">
-        <xsl:call-template name="indent"/>
-        <xsl:call-template name="indent"/>
-        <xsl:text>result = prime * result</xsl:text>
-        <xsl:variable name="fieldName" select="recutil:getFieldName(position(),@name,0)" />
-        <xsl:choose>
-            <xsl:when test="substring(@type, string-length(@type)-1)='[]'">
-        		<xsl:text> + </xsl:text>
-                <xsl:text>Arrays.hashCode( </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text> )</xsl:text>
-            </xsl:when>
-            <xsl:when test="@type='boolean'">
-        		<xsl:text> + </xsl:text>
-                <xsl:text>( </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-                <xsl:text>? 1231 : 1237 )</xsl:text>
-            </xsl:when>
-            <xsl:when test="@type='byte' or @type='double' or @type='int' or @type='short'">
-        		<xsl:text> + </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-            </xsl:when>
-            <xsl:when test="@type='long'">
-				<xsl:call-template name="linebreak" />
-				<xsl:call-template name="indent" />
-				<xsl:call-template name="indent" />
-				<xsl:call-template name="indent" />
-				<xsl:call-template name="indent" />
-        		<xsl:text> + (int) ( </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-        		<xsl:text> ^ ( </xsl:text>
-                <xsl:value-of select="$fieldName"/>
-        		<xsl:text> >>> 32 ) )</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-				<xsl:call-template name="linebreak" />
-				<xsl:call-template name="indent" />
-				<xsl:call-template name="indent" />
-				<xsl:call-template name="indent" />
-				<xsl:call-template name="indent" />
-				<xsl:text>+ ((</xsl:text>
-				<xsl:value-of select="$fieldName" />
-				<xsl:text> == null) ? 0 : </xsl:text>
-				<xsl:value-of select="$fieldName" />
-				<xsl:text>.hashCode())</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:text>;</xsl:text>
-        <xsl:call-template name="linebreak"/>
-    </xsl:for-each>
-    <xsl:call-template name="indent"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>return result;</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>}</xsl:text>
-    <xsl:call-template name="linebreak"/>
-
-    <xsl:call-template name="linebreak"/>
-    
-    <xsl:call-template name="toString" />
-
-<xsl:apply-templates select="//field" mode="getset"/>
-<xsl:apply-templates select="//field" mode="bits"/>
-<xsl:text>
-}  // END OF CLASS
-</xsl:text>
-</xsl:template>
-
-<xsl:template match = "field" mode="bits">
-<xsl:variable name="fieldNum" select="position()"/>
-<xsl:for-each select="bit">
-    /**
-     * Sets the <xsl:value-of select="@name"/> field value.
-     * <xsl:value-of select="@description"/>
-     */
-    @Internal
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( <xsl:value-of select="recutil:getBitFieldType(@name, @mask, ../@type)"/> value )
-    {
-        <xsl:value-of select="recutil:getFieldName($fieldNum,../@name,0)"/> = <xsl:value-of select="recutil:getBitFieldSet(@name, @mask, ../@type, recutil:getFieldName($fieldNum,../@name,0))"/>;
-    }
-
-    /**
-     * <xsl:value-of select="@description"/>
-     * @return  the <xsl:value-of select="@name"/><xsl:text> field value.</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:if test="@deprecated='true'">
-        <xsl:call-template name="indent"/>
-        <xsl:text> * @deprecated This field should not be used according to specification</xsl:text>
-        <xsl:call-template name="linebreak"/>
-    </xsl:if>
-    <xsl:call-template name="indent"/>
-    <xsl:text> */</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:call-template name="indent"/>
-    <xsl:text>@Internal</xsl:text>
-    <xsl:call-template name="linebreak"/>
-    <xsl:if test="@deprecated='true'">
-        <xsl:call-template name="indent"/>
-        <xsl:text>@Deprecated</xsl:text>
-        <xsl:call-template name="linebreak"/>
-    </xsl:if>
-    <xsl:call-template name="indent"/>
-    <xsl:text>public </xsl:text><xsl:value-of select="recutil:getBitFieldFunction(@name,@mask,../@type, 'true')"/><xsl:text>()</xsl:text>
-    {
-        return <xsl:value-of select="recutil:getBitFieldGet(@name, @mask,../@type, recutil:getFieldName($fieldNum,../@name,0))"/>
-    }
-</xsl:for-each>
-</xsl:template>
-
-    <xsl:template match="bit">
-        <xsl:call-template name="indent"/>
-        <xsl:text>/**/private static final BitField </xsl:text>
-        <xsl:value-of select="@name"/>
-        <xsl:text> = new BitField(</xsl:text>
-        <xsl:value-of select="@mask"/>
-        <xsl:text>);</xsl:text>
-        <xsl:call-template name="linebreak"/>
-        <xsl:apply-templates select="const"/>
-    </xsl:template>
-
-	<xsl:template match="const">
-		<xsl:if test="@description">
-			<xsl:call-template name="indent" />
-			<xsl:choose>
-				<xsl:when test="name(..) = 'bit'">
-					<xsl:text>/**   </xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text>/** </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-			<xsl:value-of select="@description" />
-			<xsl:text> */</xsl:text>
-			<xsl:call-template name="linebreak" />
-		</xsl:if>
-		<xsl:call-template name="indent" />
-		<xsl:choose>
-			<xsl:when test="name(..) = 'bit'">
-				<xsl:text>/*  */</xsl:text>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:text>/**/</xsl:text>
-			</xsl:otherwise>
-		</xsl:choose>
-		<xsl:text>protected final static </xsl:text>
-		<xsl:value-of select="@type" />
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="recutil:getConstName(../@name,@name,0)" />
-		<xsl:text> = </xsl:text>
-		<xsl:value-of select="@value" />
-		<xsl:text>;</xsl:text>
-		<xsl:call-template name="linebreak" />
-	</xsl:template>
-
-    <xsl:template match="const" mode="listconsts">
-        <xsl:call-template name="linebreak"/>
-        <xsl:call-template name="indent"/>
-        <xsl:text> * &lt;li&gt;{@link #</xsl:text>
-        <xsl:value-of select="recutil:getConstName(../@name,@name,0)"/>
-        <xsl:text>}</xsl:text>
-    </xsl:template>
-
-    <xsl:template name="linebreak">
-        <xsl:text>
-</xsl:text>
-    </xsl:template>
-
-    <xsl:template name="indent">
-        <xsl:text>    </xsl:text>
-    </xsl:template>
-
-<xsl:template match="field" mode="getset">
-    /**
-     * <xsl:choose>
-        <xsl:when test="@description">
-            <xsl:value-of select="@description"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:text>Get the </xsl:text>
-            <xsl:value-of select="@name"/>
-            <xsl:text> field for the </xsl:text>
-            <xsl:value-of select="../../@name"/>
-            <xsl:text> record</xsl:text>
-        </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>.</xsl:text> 
-    <xsl:if test="./const">
-     *
-     * @return One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    @Internal
-    public <xsl:value-of select="@type"/> get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()
-    {
-        return <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-
-    /**
-     * <xsl:choose>
-        <xsl:when test="@description">
-            <xsl:value-of select="@description"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:text>Set the </xsl:text>
-            <xsl:value-of select="@name"/>
-            <xsl:text> field for the </xsl:text>
-            <xsl:value-of select="../../@name"/>
-            <xsl:text> record</xsl:text>
-        </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>.</xsl:text>
-    <xsl:if test="./const">
-     *
-     * @param <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>
-     *        One of <xsl:apply-templates select="./const" mode="listconsts"/></xsl:if>
-     */
-    @Internal
-    public void set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( <xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> )
-    {
-        this.<xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> = <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
-    }
-</xsl:template>
-
-	<xsl:template name="toString">
-		<xsl:call-template name="indent" />
-		<xsl:text>public String toString()</xsl:text>
-		<xsl:call-template name="linebreak" />
-
-		<xsl:call-template name="indent" />
-		<xsl:text>{</xsl:text>
-		<xsl:call-template name="linebreak" />
-
-		<xsl:call-template name="indent" />
-		<xsl:call-template name="indent" />
-		<xsl:text>StringBuilder builder = new StringBuilder();</xsl:text>
-		<xsl:call-template name="linebreak" />
-		<xsl:call-template name="linebreak" />
-
-		<xsl:call-template name="indent" />
-		<xsl:call-template name="indent" />
-		<xsl:text>builder.append("[</xsl:text>
-		<xsl:value-of select="@name" />
-		<xsl:text>]\n");</xsl:text>
-		<xsl:call-template name="linebreak" />
-
-		<xsl:apply-templates select="//field" mode="tostring" />
-
-		<xsl:call-template name="linebreak" />
-		<xsl:call-template name="indent" />
-		<xsl:call-template name="indent" />
-		<xsl:text>builder.append("[/</xsl:text>
-		<xsl:value-of select="@name" />
-		<xsl:text>]");
-        return builder.toString();
-    }
-</xsl:text>
-	</xsl:template>
-
-	<xsl:template match="field" mode="tostring">
-		<xsl:variable name="fieldName"
-			select="recutil:getFieldName(position(),@name,0)" />
-
-		<xsl:call-template name="indent" />
-		<xsl:call-template name="indent" />
-		<xsl:text>builder.append( "    .</xsl:text>
-		<xsl:value-of select="recutil:getFieldName(@name,20)" />
-		<xsl:text> = " );</xsl:text>
-		<xsl:call-template name="linebreak" />
-
-		<xsl:call-template name="indent" />
-		<xsl:call-template name="indent" />
-		<xsl:text>builder.append(" ( ").append( </xsl:text>
-		<xsl:choose>
-			<xsl:when
-				test="@type='boolean' or @type='byte' or @type='double' or @type='int' or @type='long' or @type='short'">
-				<xsl:value-of select="$fieldName" />
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="$fieldName" />
-				<xsl:text> == null ? "null" : </xsl:text>
-				<xsl:value-of select="$fieldName" />
-				<xsl:text>.toString().replaceAll( "\n", "\n    " )</xsl:text>
-			</xsl:otherwise>
-		</xsl:choose>
-		<xsl:text> ).append( " )\n" );</xsl:text>
-		<xsl:call-template name="linebreak" />
-
-		<xsl:apply-templates select="bit" mode="bittostring" />
-	</xsl:template>
-
-    <xsl:template match="bit" mode="bittostring">
-        <xsl:call-template name="indent"/>
-        <xsl:call-template name="indent"/>
-        <xsl:text>builder.append("         .</xsl:text>
-        <xsl:value-of select="recutil:getFieldName(@name,20)"/>
-        <xsl:text>     = ").append(</xsl:text>
-        <xsl:value-of select="recutil:getBitFieldFunction(@name, @mask, ../@type, 'false')"/>
-        <xsl:text>()).append('\n');</xsl:text>
-        <xsl:call-template name="linebreak"/>
-    </xsl:template>
-
-<xsl:template match="author">
- * @author <xsl:value-of select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/trunk/src/types/styles/hdftype_document.xsl b/trunk/src/types/styles/hdftype_document.xsl
deleted file mode 100644
index f7bfb72..0000000
--- a/trunk/src/types/styles/hdftype_document.xsl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="type">
-<document>
-    <header>
-        <title><xsl:value-of select="@name"/> Documentation For HDF Type</title>
-    </header>
-
-    <body>
-        <s1 title="Type Description">
-            <p><xsl:value-of select="/type/description"/>
-            </p>
-        </s1>
-        <s1 title="Fields">
-            <table>
-                <tr>
-                    <th colspan="1" rowspan="1">Name</th>
-                    <th colspan="1" rowspan="1">Size</th>
-                    <th colspan="1" rowspan="1">Offset</th>
-                    <th colspan="1" rowspan="1">Description</th>
-                    <th colspan="1" rowspan="1">Default Value</th>
-                </tr>
-                <xsl:apply-templates select="//field"/>
-            </table>
-        </s1>
-    </body>
-    <footer>
-        <legal>
-          Copyright (c) @year@ The Poi Project All rights reserved.
-        </legal>
-    </footer>
-
-</document>
-</xsl:template>
-
-<xsl:template match="field">
-    <tr>
-        <td><xsl:value-of select="@name"/></td>
-        <td><xsl:value-of select="@size"/></td>
-        <td> </td>
-        <td><xsl:value-of select="@description"/></td>
-        <td><xsl:value-of select="@default"/></td>
-    </tr>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/trunk/src/types/styles/hdftype_test.xsl b/trunk/src/types/styles/hdftype_test.xsl
deleted file mode 100644
index d95c81b..0000000
--- a/trunk/src/types/styles/hdftype_test.xsl
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   ====================================================================
--->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="type">
-
-<xsl:if test="@package">
-package <xsl:value-of select="@package"/>;
-</xsl:if>
-
-import junit.framework.TestCase;
-
-/**
- * Tests the serialization and deserialization of the <xsl:value-of select="@name"/>Type
- * class works correctly.  Test data taken directly from a real
- * Excel file.
- *
-<xsl:apply-templates select="author"/>
- */
-public class Test<xsl:value-of select="@name"/>Type
-        extends TestCase
-{
-    byte[] data = new byte[] {
-        // PASTE DATA HERE
-    };
-
-    public Test<xsl:value-of select="@name"/>Type(String name)
-    {
-        super(name);
-    }
-
-    public void testLoad()
-            throws Exception
-    {
-
-        <xsl:value-of select="@name"/>Type type = new <xsl:value-of select="@name"/>Type((short)<xsl:value-of select="@id"/>, (short)data.length, data);
-<xsl:for-each select="//fields/field">        assertEquals( XXX, type.get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>());
-<xsl:apply-templates select="./bit" mode="get"/>
-</xsl:for-each>
-
-        assertEquals( XXX, type.getSize() );
-
-        type.validateSid((short)<xsl:value-of select="@id"/>);
-    }
-
-    public void testStore()
-    {
-        <xsl:value-of select="@name"/>Type type = new <xsl:value-of select="@name"/>Type();
-<xsl:for-each select="//fields/field">        type.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( XXXX );
-<xsl:apply-templates select="./bit" mode="set"/>
-</xsl:for-each>
-
-        byte [] typeBytes = type.serialize();
-        assertEquals(typeBytes.length - 4, data.length);
-        for (int i = 0; i &lt; data.length; i++)
-            assertEquals("At offset " + i, data[i], typeBytes[i+4]);
-    }
-}
-</xsl:template>
-
-<xsl:template match="author">
- * @author <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template match="bit" mode="get">
-<xsl:text>        </xsl:text>assertEquals( XXX, type.is<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>() );<xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="bit" mode="set">
-<xsl:text>        </xsl:text>type.set<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>( XXX );<xsl:text>
-</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/trunk/test-data/ddf/47143.dat b/trunk/test-data/ddf/47143.dat
deleted file mode 100644
index 0745ce1..0000000
--- a/trunk/test-data/ddf/47143.dat
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/ddf/Container.dat b/trunk/test-data/ddf/Container.dat
deleted file mode 100644
index c1b5447..0000000
--- a/trunk/test-data/ddf/Container.dat
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44501.vsd b/trunk/test-data/diagram/44501.vsd
deleted file mode 100644
index 51de23a..0000000
--- a/trunk/test-data/diagram/44501.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44501a.vsd b/trunk/test-data/diagram/44501a.vsd
deleted file mode 100644
index 7d9a3ce..0000000
--- a/trunk/test-data/diagram/44501a.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44501b.vsd b/trunk/test-data/diagram/44501b.vsd
deleted file mode 100644
index c8bd7a1..0000000
--- a/trunk/test-data/diagram/44501b.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44501c.vsd b/trunk/test-data/diagram/44501c.vsd
deleted file mode 100644
index 51de23a..0000000
--- a/trunk/test-data/diagram/44501c.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44501d.vsd b/trunk/test-data/diagram/44501d.vsd
deleted file mode 100644
index 2c1632e..0000000
--- a/trunk/test-data/diagram/44501d.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44501e.vsd b/trunk/test-data/diagram/44501e.vsd
deleted file mode 100644
index 3ca5552..0000000
--- a/trunk/test-data/diagram/44501e.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44594-2.vsd b/trunk/test-data/diagram/44594-2.vsd
deleted file mode 100644
index a597a0d..0000000
--- a/trunk/test-data/diagram/44594-2.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/44594.vsd b/trunk/test-data/diagram/44594.vsd
deleted file mode 100644
index abed78b..0000000
--- a/trunk/test-data/diagram/44594.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/NegativeChunkLength.vsd b/trunk/test-data/diagram/NegativeChunkLength.vsd
deleted file mode 100644
index 58378bd..0000000
--- a/trunk/test-data/diagram/NegativeChunkLength.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/NegativeChunkLength2.vsd b/trunk/test-data/diagram/NegativeChunkLength2.vsd
deleted file mode 100644
index 3ca5552..0000000
--- a/trunk/test-data/diagram/NegativeChunkLength2.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/ShortChunk1.vsd b/trunk/test-data/diagram/ShortChunk1.vsd
deleted file mode 100644
index 2c1632e..0000000
--- a/trunk/test-data/diagram/ShortChunk1.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/ShortChunk2.vsd b/trunk/test-data/diagram/ShortChunk2.vsd
deleted file mode 100644
index 7d9a3ce..0000000
--- a/trunk/test-data/diagram/ShortChunk2.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/ShortChunk3.vsd b/trunk/test-data/diagram/ShortChunk3.vsd
deleted file mode 100644
index c8bd7a1..0000000
--- a/trunk/test-data/diagram/ShortChunk3.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/SimpleMacro.vba b/trunk/test-data/diagram/SimpleMacro.vba
deleted file mode 100644
index 7fcf1fd..0000000
--- a/trunk/test-data/diagram/SimpleMacro.vba
+++ /dev/null
@@ -1,12 +0,0 @@
-Sub TestMacro()
-'
-' TestMacro Macro
-' This is a test macro
-'
-
-'
-    With ActiveDocument.Pages(1).Shapes(1)
-        .Text = "This is a macro vector graphics drawing"
-    End With
-End Sub
-
diff --git a/trunk/test-data/diagram/SimpleMacro.vsd b/trunk/test-data/diagram/SimpleMacro.vsd
deleted file mode 100644
index df3f427..0000000
--- a/trunk/test-data/diagram/SimpleMacro.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/SimpleMacro.vsdm b/trunk/test-data/diagram/SimpleMacro.vsdm
deleted file mode 100644
index 6dc8784..0000000
--- a/trunk/test-data/diagram/SimpleMacro.vsdm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/Test_Visio-Some_Random_Text.vsd b/trunk/test-data/diagram/Test_Visio-Some_Random_Text.vsd
deleted file mode 100644
index d699e11..0000000
--- a/trunk/test-data/diagram/Test_Visio-Some_Random_Text.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/test.vsdx b/trunk/test-data/diagram/test.vsdx
deleted file mode 100644
index 1fa6903..0000000
--- a/trunk/test-data/diagram/test.vsdx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/test_text_extraction.vsdx b/trunk/test-data/diagram/test_text_extraction.vsdx
deleted file mode 100644
index 39b6401..0000000
--- a/trunk/test-data/diagram/test_text_extraction.vsdx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/v5_Connection_Types.vsd b/trunk/test-data/diagram/v5_Connection_Types.vsd
deleted file mode 100644
index 8c55e3e..0000000
--- a/trunk/test-data/diagram/v5_Connection_Types.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/v6-non-utf16le.vsd b/trunk/test-data/diagram/v6-non-utf16le.vsd
deleted file mode 100644
index 8d4fdb8..0000000
--- a/trunk/test-data/diagram/v6-non-utf16le.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/diagram/visio_with_embeded.vsd b/trunk/test-data/diagram/visio_with_embeded.vsd
deleted file mode 100644
index 91c306f..0000000
--- a/trunk/test-data/diagram/visio_with_embeded.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/45690.docm b/trunk/test-data/document/45690.docm
deleted file mode 100644
index 5f38e9f..0000000
--- a/trunk/test-data/document/45690.docm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/47304.doc b/trunk/test-data/document/47304.doc
deleted file mode 100644
index d59d8d7..0000000
--- a/trunk/test-data/document/47304.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/51921-Word-Crash067.doc b/trunk/test-data/document/51921-Word-Crash067.doc
deleted file mode 100644
index dc8bfff..0000000
--- a/trunk/test-data/document/51921-Word-Crash067.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/51921-Word-Crash067.docx b/trunk/test-data/document/51921-Word-Crash067.docx
deleted file mode 100644
index 12c27c8..0000000
--- a/trunk/test-data/document/51921-Word-Crash067.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/52117.doc b/trunk/test-data/document/52117.doc
deleted file mode 100644
index 4f966c0..0000000
--- a/trunk/test-data/document/52117.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/52288.docx b/trunk/test-data/document/52288.docx
deleted file mode 100644
index 0eb23b0..0000000
--- a/trunk/test-data/document/52288.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/52420.doc b/trunk/test-data/document/52420.doc
deleted file mode 100644
index f059d2a..0000000
--- a/trunk/test-data/document/52420.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/52449.docx b/trunk/test-data/document/52449.docx
deleted file mode 100644
index f294b85..0000000
--- a/trunk/test-data/document/52449.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/53379.doc b/trunk/test-data/document/53379.doc
deleted file mode 100644
index 5f1b3bd..0000000
--- a/trunk/test-data/document/53379.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/53446.doc b/trunk/test-data/document/53446.doc
deleted file mode 100644
index 4844cc9..0000000
--- a/trunk/test-data/document/53446.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/55733.docx b/trunk/test-data/document/55733.docx
deleted file mode 100644
index 521f50e..0000000
--- a/trunk/test-data/document/55733.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/56392.docx b/trunk/test-data/document/56392.docx
deleted file mode 100644
index 89a71ae..0000000
--- a/trunk/test-data/document/56392.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/56880.doc b/trunk/test-data/document/56880.doc
deleted file mode 100644
index 6aad5f4..0000000
--- a/trunk/test-data/document/56880.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/57312.docx b/trunk/test-data/document/57312.docx
deleted file mode 100644
index 3227597..0000000
--- a/trunk/test-data/document/57312.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/57603-seven_columns.doc b/trunk/test-data/document/57603-seven_columns.doc
deleted file mode 100644
index dff48ea..0000000
--- a/trunk/test-data/document/57603-seven_columns.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/57843.doc b/trunk/test-data/document/57843.doc
deleted file mode 100644
index 57be6c6..0000000
--- a/trunk/test-data/document/57843.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/58067.docx b/trunk/test-data/document/58067.docx
deleted file mode 100644
index ede9abb..0000000
--- a/trunk/test-data/document/58067.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/58618.docx b/trunk/test-data/document/58618.docx
deleted file mode 100644
index 5a77939..0000000
--- a/trunk/test-data/document/58618.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/58804.doc b/trunk/test-data/document/58804.doc
deleted file mode 100644
index 6461273..0000000
--- a/trunk/test-data/document/58804.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/58804_1.doc b/trunk/test-data/document/58804_1.doc
deleted file mode 100644
index c792079..0000000
--- a/trunk/test-data/document/58804_1.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/59030.docx b/trunk/test-data/document/59030.docx
deleted file mode 100644
index cf40dd2..0000000
--- a/trunk/test-data/document/59030.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/59378.docx b/trunk/test-data/document/59378.docx
deleted file mode 100644
index f3939ad..0000000
--- a/trunk/test-data/document/59378.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/60158.docm b/trunk/test-data/document/60158.docm
deleted file mode 100644
index 2b7908f..0000000
--- a/trunk/test-data/document/60158.docm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/60293.docx b/trunk/test-data/document/60293.docx
deleted file mode 100644
index 02dcabc..0000000
--- a/trunk/test-data/document/60293.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/AIOOB-Tap.doc b/trunk/test-data/document/AIOOB-Tap.doc
deleted file mode 100644
index bfd5906..0000000
--- a/trunk/test-data/document/AIOOB-Tap.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug28627.doc b/trunk/test-data/document/Bug28627.doc
deleted file mode 100644
index 91b031d..0000000
--- a/trunk/test-data/document/Bug28627.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug33519.doc b/trunk/test-data/document/Bug33519.doc
deleted file mode 100644
index b51fc0b..0000000
--- a/trunk/test-data/document/Bug33519.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug34898.doc b/trunk/test-data/document/Bug34898.doc
deleted file mode 100644
index fbe49d0..0000000
--- a/trunk/test-data/document/Bug34898.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug41898.doc b/trunk/test-data/document/Bug41898.doc
deleted file mode 100644
index a475813..0000000
--- a/trunk/test-data/document/Bug41898.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug44292.doc b/trunk/test-data/document/Bug44292.doc
deleted file mode 100644
index fd7ca6c..0000000
--- a/trunk/test-data/document/Bug44292.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug44431.doc b/trunk/test-data/document/Bug44431.doc
deleted file mode 100644
index c4b371c..0000000
--- a/trunk/test-data/document/Bug44431.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug44603.doc b/trunk/test-data/document/Bug44603.doc
deleted file mode 100644
index 00312ae..0000000
--- a/trunk/test-data/document/Bug44603.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug45269.doc b/trunk/test-data/document/Bug45269.doc
deleted file mode 100644
index aea4ff9..0000000
--- a/trunk/test-data/document/Bug45269.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug45473.doc b/trunk/test-data/document/Bug45473.doc
deleted file mode 100644
index 395e900..0000000
--- a/trunk/test-data/document/Bug45473.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug45877.doc b/trunk/test-data/document/Bug45877.doc
deleted file mode 100644
index af2d6ed..0000000
--- a/trunk/test-data/document/Bug45877.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug46220.doc b/trunk/test-data/document/Bug46220.doc
deleted file mode 100644
index 3af65fd..0000000
--- a/trunk/test-data/document/Bug46220.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug46610_1.doc b/trunk/test-data/document/Bug46610_1.doc
deleted file mode 100644
index 4291d9c..0000000
--- a/trunk/test-data/document/Bug46610_1.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug46610_2.doc b/trunk/test-data/document/Bug46610_2.doc
deleted file mode 100644
index be90831..0000000
--- a/trunk/test-data/document/Bug46610_2.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug46610_3.doc b/trunk/test-data/document/Bug46610_3.doc
deleted file mode 100644
index 72d60df..0000000
--- a/trunk/test-data/document/Bug46610_3.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug46817.doc b/trunk/test-data/document/Bug46817.doc
deleted file mode 100644
index 1574e6e..0000000
--- a/trunk/test-data/document/Bug46817.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug47286.doc b/trunk/test-data/document/Bug47286.doc
deleted file mode 100644
index 96b88c5..0000000
--- a/trunk/test-data/document/Bug47286.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug47287.doc b/trunk/test-data/document/Bug47287.doc
deleted file mode 100644
index 96b88c5..0000000
--- a/trunk/test-data/document/Bug47287.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug47731.doc b/trunk/test-data/document/Bug47731.doc
deleted file mode 100644
index c8cd88d..0000000
--- a/trunk/test-data/document/Bug47731.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug47742-text.txt b/trunk/test-data/document/Bug47742-text.txt
deleted file mode 100644
index 7b02712..0000000
--- a/trunk/test-data/document/Bug47742-text.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿{0>Der Aaa Satz.<}0{>The Aaa phrase.<0} {0>Der Bbb Satz.<}0{>The Bbb phrase.<0} {0>Der Ccc Satz.<}0{>The Ccc phrase.<0} {0>Der Ddd Satz.<}0{>The Ddd phrase.<0}
-{0>Der Eee Satz.<}0{>The Eee phrase.<0} {0>Der Fff Satz.<}0{>The Fff phrase.<0}
-{0>Der Ggg Satz .<}0{>The Ggg phrase .<0} 
-{0>Der Gggggg Satz .<}0{>The Gggggg phrase .<0} 
-{0>Ein Zeil
-enumbruch mittendrin.<}0{>A soft
-return in the center.<0}
-{0>Ein Satz
-mit soft return.<}0{>A sentence
-with soft return.<0}
-
-{0>Ein-Strich.<}0{>One-hyphen.<0}
-{0>Die G-20 Staaten.<}0{>The G-20 states.<0}
-{0>Ein—Geviertstrich hier.<}0{>An—EMdash here.<0}
-{0>Ein/Schrägstrich hier.<}0{>A/slash here.<0}
-{0>Senkrechter|Strich hier.<}0{>Vertical|line here.<0}
-{0>Umgekehrter\Schrägstrich hier.<}0{>A\backslash here.<0}
-{0>C'est la vie.<}0{>Such is life.<0}
-{0>Das sind 10'000 Euros.<}0{>These are 10'000 Euros.<0}
-{0>Eine Komma,Trennung hier.<}0{>A comma,separation here.<0}
-{0>Eine Semikolon;Trennung hier.<}0{>A semicolon;separation here.<0}
-{0>Das sind 77,mehr hier.<}0{>There are 77,more here.<0}
-{0>Das ist sein (Netto)Gehalt<}0{>This is his (net)salary.<0}
-{0>Das sind 50$ hier.<}0{>That is 50$ here.<0}
-{0>Das sind 3%Rabatt.<}0{>That is 3% discount.<0}
-{0>Es sind 25°C heute.<}0{>It is 25°C today.<0}
-{0>Es gilt Yen<Dollar.<}0{>It is Yen<Dollar.<0}
-{0>Keine Trennung® bei Sonderzeichen.<}0{>No separation® here..<0}
-{0>Ich zahle 7 Euro.<}0{>I pay 7 Euros.<0}
-{0>Die Disk ist 6 min lang.<}0{>The disk is 6 min long.<0}
-{0>Ein Satz, mit Komma.<}0{>A sentence, with comma.<0}
-{0>Ein Hochkomma hier.<}0{>An apostrophe here.<0}
-{0>Ein Satz mit  verschiedenen   Pausen.<}0{>A sentence with  different   blanks.<0}
-{0>Ein Satz mit geschützten Pausen.<}0{>A sentence with non-breaking blanks.<0}
-{0>Ein Satz mit speziellen  Pausen.<}0{>A sentence with special  blanks.<0}
diff --git a/trunk/test-data/document/Bug47742.doc b/trunk/test-data/document/Bug47742.doc
deleted file mode 100644
index be3959a..0000000
--- a/trunk/test-data/document/Bug47742.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug47958.doc b/trunk/test-data/document/Bug47958.doc
deleted file mode 100644
index c621b36..0000000
--- a/trunk/test-data/document/Bug47958.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug48065.doc b/trunk/test-data/document/Bug48065.doc
deleted file mode 100644
index 8dce3db..0000000
--- a/trunk/test-data/document/Bug48065.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug48075.doc b/trunk/test-data/document/Bug48075.doc
deleted file mode 100644
index 386b530..0000000
--- a/trunk/test-data/document/Bug48075.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug49820.doc b/trunk/test-data/document/Bug49820.doc
deleted file mode 100644
index b3a4aea..0000000
--- a/trunk/test-data/document/Bug49820.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug49908.doc b/trunk/test-data/document/Bug49908.doc
deleted file mode 100644
index 6a89732..0000000
--- a/trunk/test-data/document/Bug49908.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug49919.doc b/trunk/test-data/document/Bug49919.doc
deleted file mode 100644
index 656872c..0000000
--- a/trunk/test-data/document/Bug49919.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug49933.doc b/trunk/test-data/document/Bug49933.doc
deleted file mode 100644
index 7db961b..0000000
--- a/trunk/test-data/document/Bug49933.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug50075.doc b/trunk/test-data/document/Bug50075.doc
deleted file mode 100644
index 15303a4..0000000
--- a/trunk/test-data/document/Bug50075.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug50936_1.doc b/trunk/test-data/document/Bug50936_1.doc
deleted file mode 100644
index 3a700ad..0000000
--- a/trunk/test-data/document/Bug50936_1.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug50936_2.doc b/trunk/test-data/document/Bug50936_2.doc
deleted file mode 100644
index d153eef..0000000
--- a/trunk/test-data/document/Bug50936_2.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug50936_3.doc b/trunk/test-data/document/Bug50936_3.doc
deleted file mode 100644
index 7a644b7..0000000
--- a/trunk/test-data/document/Bug50936_3.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug50955.doc b/trunk/test-data/document/Bug50955.doc
deleted file mode 100644
index 9154c4f..0000000
--- a/trunk/test-data/document/Bug50955.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug51170.docx b/trunk/test-data/document/Bug51170.docx
deleted file mode 100644
index c712cdc..0000000
--- a/trunk/test-data/document/Bug51170.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug51604.doc b/trunk/test-data/document/Bug51604.doc
deleted file mode 100644
index c843fb4..0000000
--- a/trunk/test-data/document/Bug51604.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug51686.doc b/trunk/test-data/document/Bug51686.doc
deleted file mode 100644
index c1f4f3d..0000000
--- a/trunk/test-data/document/Bug51686.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug51834.doc b/trunk/test-data/document/Bug51834.doc
deleted file mode 100644
index c162825..0000000
--- a/trunk/test-data/document/Bug51834.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug51890.doc b/trunk/test-data/document/Bug51890.doc
deleted file mode 100644
index 82701bd..0000000
--- a/trunk/test-data/document/Bug51890.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug51944.doc b/trunk/test-data/document/Bug51944.doc
deleted file mode 100644
index 2598dc1..0000000
--- a/trunk/test-data/document/Bug51944.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug52032_1.doc b/trunk/test-data/document/Bug52032_1.doc
deleted file mode 100644
index adfa972..0000000
--- a/trunk/test-data/document/Bug52032_1.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug52032_2.doc b/trunk/test-data/document/Bug52032_2.doc
deleted file mode 100644
index cc0ede1..0000000
--- a/trunk/test-data/document/Bug52032_2.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug52032_3.doc b/trunk/test-data/document/Bug52032_3.doc
deleted file mode 100644
index c91d240..0000000
--- a/trunk/test-data/document/Bug52032_3.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug52311.doc b/trunk/test-data/document/Bug52311.doc
deleted file mode 100644
index 16f5568..0000000
--- a/trunk/test-data/document/Bug52311.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug52583.doc b/trunk/test-data/document/Bug52583.doc
deleted file mode 100644
index b6e8646..0000000
--- a/trunk/test-data/document/Bug52583.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug53182.doc b/trunk/test-data/document/Bug53182.doc
deleted file mode 100644
index c627d02..0000000
--- a/trunk/test-data/document/Bug53182.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug53380_1.doc b/trunk/test-data/document/Bug53380_1.doc
deleted file mode 100644
index 4233ac1..0000000
--- a/trunk/test-data/document/Bug53380_1.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug53380_2.doc b/trunk/test-data/document/Bug53380_2.doc
deleted file mode 100644
index 1dd3daa..0000000
--- a/trunk/test-data/document/Bug53380_2.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug53380_3.doc b/trunk/test-data/document/Bug53380_3.doc
deleted file mode 100644
index 5f1b3bd..0000000
--- a/trunk/test-data/document/Bug53380_3.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug53380_4.doc b/trunk/test-data/document/Bug53380_4.doc
deleted file mode 100644
index dc33d89..0000000
--- a/trunk/test-data/document/Bug53380_4.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug53453Section.doc b/trunk/test-data/document/Bug53453Section.doc
deleted file mode 100644
index 23275b6..0000000
--- a/trunk/test-data/document/Bug53453Section.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug54771a.docx b/trunk/test-data/document/Bug54771a.docx
deleted file mode 100644
index 19bbbd1..0000000
--- a/trunk/test-data/document/Bug54771a.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug54771b.docx b/trunk/test-data/document/Bug54771b.docx
deleted file mode 100644
index f9850bb..0000000
--- a/trunk/test-data/document/Bug54771b.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug54849.docx b/trunk/test-data/document/Bug54849.docx
deleted file mode 100644
index 836c147..0000000
--- a/trunk/test-data/document/Bug54849.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug55142.docx b/trunk/test-data/document/Bug55142.docx
deleted file mode 100644
index 1ae2ada..0000000
--- a/trunk/test-data/document/Bug55142.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug60337.docx b/trunk/test-data/document/Bug60337.docx
deleted file mode 100644
index 06d0339..0000000
--- a/trunk/test-data/document/Bug60337.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Bug60341.docx b/trunk/test-data/document/Bug60341.docx
deleted file mode 100644
index d97ebdc..0000000
--- a/trunk/test-data/document/Bug60341.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ComplexNumberedLists.docx b/trunk/test-data/document/ComplexNumberedLists.docx
deleted file mode 100644
index b4409c9..0000000
--- a/trunk/test-data/document/ComplexNumberedLists.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/DiffFirstPageHeadFoot.doc b/trunk/test-data/document/DiffFirstPageHeadFoot.doc
deleted file mode 100644
index 397aa2f..0000000
--- a/trunk/test-data/document/DiffFirstPageHeadFoot.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/DiffFirstPageHeadFoot.docx b/trunk/test-data/document/DiffFirstPageHeadFoot.docx
deleted file mode 100644
index d631c77..0000000
--- a/trunk/test-data/document/DiffFirstPageHeadFoot.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/EmbeddedDocument.docx b/trunk/test-data/document/EmbeddedDocument.docx
deleted file mode 100644
index 1cb35a5..0000000
--- a/trunk/test-data/document/EmbeddedDocument.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/EmptyDocumentWithHeaderFooter.docx b/trunk/test-data/document/EmptyDocumentWithHeaderFooter.docx
deleted file mode 100644
index f5af230..0000000
--- a/trunk/test-data/document/EmptyDocumentWithHeaderFooter.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/EnforcedWith.docx b/trunk/test-data/document/EnforcedWith.docx
deleted file mode 100644
index c50e358..0000000
--- a/trunk/test-data/document/EnforcedWith.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ExternalEntityInText.docx b/trunk/test-data/document/ExternalEntityInText.docx
deleted file mode 100644
index 0b47852..0000000
--- a/trunk/test-data/document/ExternalEntityInText.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/FancyFoot.doc b/trunk/test-data/document/FancyFoot.doc
deleted file mode 100644
index 5d3e662..0000000
--- a/trunk/test-data/document/FancyFoot.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/FancyFoot.docx b/trunk/test-data/document/FancyFoot.docx
deleted file mode 100644
index 3e571b3..0000000
--- a/trunk/test-data/document/FancyFoot.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/FieldCodes.docx b/trunk/test-data/document/FieldCodes.docx
deleted file mode 100644
index 3db97f5..0000000
--- a/trunk/test-data/document/FieldCodes.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/FldSimple.docx b/trunk/test-data/document/FldSimple.docx
deleted file mode 100644
index 029016c..0000000
--- a/trunk/test-data/document/FldSimple.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/FloatingPictures.doc b/trunk/test-data/document/FloatingPictures.doc
deleted file mode 100644
index 15b06cf..0000000
--- a/trunk/test-data/document/FloatingPictures.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/HeaderFooterProblematic.doc b/trunk/test-data/document/HeaderFooterProblematic.doc
deleted file mode 100644
index a4d9d30..0000000
--- a/trunk/test-data/document/HeaderFooterProblematic.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/HeaderFooterUnicode.doc b/trunk/test-data/document/HeaderFooterUnicode.doc
deleted file mode 100644
index 1b517f6..0000000
--- a/trunk/test-data/document/HeaderFooterUnicode.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/HeaderFooterUnicode.docx b/trunk/test-data/document/HeaderFooterUnicode.docx
deleted file mode 100644
index 643967c..0000000
--- a/trunk/test-data/document/HeaderFooterUnicode.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/HeaderWithMacros.doc b/trunk/test-data/document/HeaderWithMacros.doc
deleted file mode 100644
index 934970f..0000000
--- a/trunk/test-data/document/HeaderWithMacros.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Headers.docx b/trunk/test-data/document/Headers.docx
deleted file mode 100644
index ab1ec02..0000000
--- a/trunk/test-data/document/Headers.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/IllustrativeCases.docx b/trunk/test-data/document/IllustrativeCases.docx
deleted file mode 100644
index 29dacb6..0000000
--- a/trunk/test-data/document/IllustrativeCases.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ListEntryNoListTable.doc b/trunk/test-data/document/ListEntryNoListTable.doc
deleted file mode 100644
index 939f5a4..0000000
--- a/trunk/test-data/document/ListEntryNoListTable.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Lists.doc b/trunk/test-data/document/Lists.doc
deleted file mode 100644
index 80201ee..0000000
--- a/trunk/test-data/document/Lists.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/MarkAuthorsTable.doc b/trunk/test-data/document/MarkAuthorsTable.doc
deleted file mode 100644
index acafa3a..0000000
--- a/trunk/test-data/document/MarkAuthorsTable.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/NoHeadFoot.doc b/trunk/test-data/document/NoHeadFoot.doc
deleted file mode 100644
index 8c95f47..0000000
--- a/trunk/test-data/document/NoHeadFoot.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/NoHeadFoot.docx b/trunk/test-data/document/NoHeadFoot.docx
deleted file mode 100644
index 7af2a14..0000000
--- a/trunk/test-data/document/NoHeadFoot.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Numbering.docx b/trunk/test-data/document/Numbering.docx
deleted file mode 100644
index d5605c9..0000000
--- a/trunk/test-data/document/Numbering.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/NumberingWOverrides.docx b/trunk/test-data/document/NumberingWOverrides.docx
deleted file mode 100644
index 48a7e2c..0000000
--- a/trunk/test-data/document/NumberingWOverrides.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/PageSpecificHeadFoot.doc b/trunk/test-data/document/PageSpecificHeadFoot.doc
deleted file mode 100644
index 26866af..0000000
--- a/trunk/test-data/document/PageSpecificHeadFoot.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/PageSpecificHeadFoot.docx b/trunk/test-data/document/PageSpecificHeadFoot.docx
deleted file mode 100644
index 13097b9..0000000
--- a/trunk/test-data/document/PageSpecificHeadFoot.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/PasswordProtected.doc b/trunk/test-data/document/PasswordProtected.doc
deleted file mode 100644
index 0d6c169..0000000
--- a/trunk/test-data/document/PasswordProtected.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Picture_Alternative_Text.doc b/trunk/test-data/document/Picture_Alternative_Text.doc
deleted file mode 100644
index 55bf875..0000000
--- a/trunk/test-data/document/Picture_Alternative_Text.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/PngPicture.doc b/trunk/test-data/document/PngPicture.doc
deleted file mode 100644
index 4d8c417..0000000
--- a/trunk/test-data/document/PngPicture.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ProblemExtracting.doc b/trunk/test-data/document/ProblemExtracting.doc
deleted file mode 100644
index b980089..0000000
--- a/trunk/test-data/document/ProblemExtracting.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/SampleDoc.doc b/trunk/test-data/document/SampleDoc.doc
deleted file mode 100644
index e82c7de..0000000
--- a/trunk/test-data/document/SampleDoc.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/SampleDoc.docx b/trunk/test-data/document/SampleDoc.docx
deleted file mode 100644
index a43c77a..0000000
--- a/trunk/test-data/document/SampleDoc.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/SampleDoc.txt b/trunk/test-data/document/SampleDoc.txt
deleted file mode 100644
index 6b5fd46..0000000
--- a/trunk/test-data/document/SampleDoc.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Author = Nick Burch
-Title = Test Document
-Subject = This is a sample document
-Keywords = Testing Sample
-Comments = This document is used for testing text and metadata extraction
-
-
-I am a test document
-This is page 1
-I am Calibri (Body) in font size 11
- 
-This is page two
-It’s Arial Black in 16 point
-It’s also in blue
diff --git a/trunk/test-data/document/SimpleHeadThreeColFoot.doc b/trunk/test-data/document/SimpleHeadThreeColFoot.doc
deleted file mode 100644
index 2f8daec..0000000
--- a/trunk/test-data/document/SimpleHeadThreeColFoot.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/SimpleHeadThreeColFoot.docx b/trunk/test-data/document/SimpleHeadThreeColFoot.docx
deleted file mode 100644
index fb17df2..0000000
--- a/trunk/test-data/document/SimpleHeadThreeColFoot.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/SimpleMacro.doc b/trunk/test-data/document/SimpleMacro.doc
deleted file mode 100644
index a6311b3..0000000
--- a/trunk/test-data/document/SimpleMacro.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/SimpleMacro.docm b/trunk/test-data/document/SimpleMacro.docm
deleted file mode 100644
index 123b815..0000000
--- a/trunk/test-data/document/SimpleMacro.docm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/SimpleMacro.vba b/trunk/test-data/document/SimpleMacro.vba
deleted file mode 100644
index 684420c..0000000
--- a/trunk/test-data/document/SimpleMacro.vba
+++ /dev/null
@@ -1,10 +0,0 @@
-Sub TestMacro()
-'
-' TestMacro Macro
-' This is a test macro
-'
-
-'
-    ActiveDocument.Paragraphs(1).Range.Text = "This is a macro word processing document"
-End Sub
-
diff --git a/trunk/test-data/document/Styles.docx b/trunk/test-data/document/Styles.docx
deleted file mode 100644
index 27f66f4..0000000
--- a/trunk/test-data/document/Styles.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/TestDocument.docx b/trunk/test-data/document/TestDocument.docx
deleted file mode 100644
index d87a542..0000000
--- a/trunk/test-data/document/TestDocument.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/TestPoiXMLDocumentCorePropertiesGetKeywords.docx b/trunk/test-data/document/TestPoiXMLDocumentCorePropertiesGetKeywords.docx
deleted file mode 100644
index ee38479..0000000
--- a/trunk/test-data/document/TestPoiXMLDocumentCorePropertiesGetKeywords.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/TestTableCellAlign.docx b/trunk/test-data/document/TestTableCellAlign.docx
deleted file mode 100644
index cf40dd2..0000000
--- a/trunk/test-data/document/TestTableCellAlign.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ThreeColFoot.doc b/trunk/test-data/document/ThreeColFoot.doc
deleted file mode 100644
index d0d6daf..0000000
--- a/trunk/test-data/document/ThreeColFoot.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ThreeColFoot.docx b/trunk/test-data/document/ThreeColFoot.docx
deleted file mode 100644
index b01e356..0000000
--- a/trunk/test-data/document/ThreeColFoot.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ThreeColHead.doc b/trunk/test-data/document/ThreeColHead.doc
deleted file mode 100644
index 1a49b96..0000000
--- a/trunk/test-data/document/ThreeColHead.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ThreeColHead.docx b/trunk/test-data/document/ThreeColHead.docx
deleted file mode 100644
index 448d046..0000000
--- a/trunk/test-data/document/ThreeColHead.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ThreeColHeadFoot.doc b/trunk/test-data/document/ThreeColHeadFoot.doc
deleted file mode 100644
index 67e77de..0000000
--- a/trunk/test-data/document/ThreeColHeadFoot.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ThreeColHeadFoot.docx b/trunk/test-data/document/ThreeColHeadFoot.docx
deleted file mode 100644
index 51602cc..0000000
--- a/trunk/test-data/document/ThreeColHeadFoot.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Tika-792.docx b/trunk/test-data/document/Tika-792.docx
deleted file mode 100644
index e8ddc0b..0000000
--- a/trunk/test-data/document/Tika-792.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/VariousPictures.docx b/trunk/test-data/document/VariousPictures.docx
deleted file mode 100644
index 2ab9a16..0000000
--- a/trunk/test-data/document/VariousPictures.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/WithArtShapes.doc b/trunk/test-data/document/WithArtShapes.doc
deleted file mode 100644
index 27793c3..0000000
--- a/trunk/test-data/document/WithArtShapes.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/WithGIF.docx b/trunk/test-data/document/WithGIF.docx
deleted file mode 100644
index 8af42d5..0000000
--- a/trunk/test-data/document/WithGIF.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/WithTabs.docx b/trunk/test-data/document/WithTabs.docx
deleted file mode 100644
index e9b3a7a..0000000
--- a/trunk/test-data/document/WithTabs.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Word6.doc b/trunk/test-data/document/Word6.doc
deleted file mode 100644
index a614a07..0000000
--- a/trunk/test-data/document/Word6.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Word6_sections.doc b/trunk/test-data/document/Word6_sections.doc
deleted file mode 100644
index e7ac989..0000000
--- a/trunk/test-data/document/Word6_sections.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Word6_sections2.doc b/trunk/test-data/document/Word6_sections2.doc
deleted file mode 100644
index d07da5b..0000000
--- a/trunk/test-data/document/Word6_sections2.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/Word95.doc b/trunk/test-data/document/Word95.doc
deleted file mode 100644
index a214f29..0000000
--- a/trunk/test-data/document/Word95.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/WordWithAttachments.docx b/trunk/test-data/document/WordWithAttachments.docx
deleted file mode 100644
index ebefabc..0000000
--- a/trunk/test-data/document/WordWithAttachments.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/abstract1.jpg b/trunk/test-data/document/abstract1.jpg
deleted file mode 100644
index 2c61df9..0000000
--- a/trunk/test-data/document/abstract1.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/abstract2.jpg b/trunk/test-data/document/abstract2.jpg
deleted file mode 100644
index 598fbf6..0000000
--- a/trunk/test-data/document/abstract2.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/abstract3.jpg b/trunk/test-data/document/abstract3.jpg
deleted file mode 100644
index 178af68..0000000
--- a/trunk/test-data/document/abstract3.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/abstract4.jpg b/trunk/test-data/document/abstract4.jpg
deleted file mode 100644
index bb34774..0000000
--- a/trunk/test-data/document/abstract4.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/au.edu.utas.www___data_assets_word_doc_0003_154335_International-Travel-Approval-Request-Form.doc b/trunk/test-data/document/au.edu.utas.www___data_assets_word_doc_0003_154335_International-Travel-Approval-Request-Form.doc
deleted file mode 100644
index 82d0041..0000000
--- a/trunk/test-data/document/au.edu.utas.www___data_assets_word_doc_0003_154335_International-Travel-Approval-Request-Form.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bookmarks.docx b/trunk/test-data/document/bookmarks.docx
deleted file mode 100644
index b7816e7..0000000
--- a/trunk/test-data/document/bookmarks.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bug53475-password-is-pass.docx b/trunk/test-data/document/bug53475-password-is-pass.docx
deleted file mode 100644
index b969da6..0000000
--- a/trunk/test-data/document/bug53475-password-is-pass.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bug53475-password-is-solrcell.docx b/trunk/test-data/document/bug53475-password-is-solrcell.docx
deleted file mode 100644
index 2723d56..0000000
--- a/trunk/test-data/document/bug53475-password-is-solrcell.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bug56075-changeTracking_off.docx b/trunk/test-data/document/bug56075-changeTracking_off.docx
deleted file mode 100644
index a92202d..0000000
--- a/trunk/test-data/document/bug56075-changeTracking_off.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bug56075-changeTracking_on.docx b/trunk/test-data/document/bug56075-changeTracking_on.docx
deleted file mode 100644
index 401af50..0000000
--- a/trunk/test-data/document/bug56075-changeTracking_on.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bug56076.docx b/trunk/test-data/document/bug56076.docx
deleted file mode 100644
index a1ba93e..0000000
--- a/trunk/test-data/document/bug56076.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bug57031.docx b/trunk/test-data/document/bug57031.docx
deleted file mode 100644
index 6a1230e..0000000
--- a/trunk/test-data/document/bug57031.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/bug59058.docx b/trunk/test-data/document/bug59058.docx
deleted file mode 100644
index 08808da..0000000
--- a/trunk/test-data/document/bug59058.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/cap.stanford.edu_profiles_viewbiosketch_facultyid=4009&name=m_maciver.doc b/trunk/test-data/document/cap.stanford.edu_profiles_viewbiosketch_facultyid=4009&name=m_maciver.doc
deleted file mode 100644
index 643d822..0000000
--- a/trunk/test-data/document/cap.stanford.edu_profiles_viewbiosketch_facultyid=4009&name=m_maciver.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/checkboxes.docx b/trunk/test-data/document/checkboxes.docx
deleted file mode 100644
index c35b715..0000000
--- a/trunk/test-data/document/checkboxes.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/delins.docx b/trunk/test-data/document/delins.docx
deleted file mode 100644
index b530691..0000000
--- a/trunk/test-data/document/delins.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProperties.doc b/trunk/test-data/document/documentProperties.doc
deleted file mode 100644
index 09730cb..0000000
--- a/trunk/test-data/document/documentProperties.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProperties.docx b/trunk/test-data/document/documentProperties.docx
deleted file mode 100644
index 4ec577e..0000000
--- a/trunk/test-data/document/documentProperties.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProtection_comments_no_password.docx b/trunk/test-data/document/documentProtection_comments_no_password.docx
deleted file mode 100644
index 5cc800e..0000000
--- a/trunk/test-data/document/documentProtection_comments_no_password.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProtection_forms_no_password.docx b/trunk/test-data/document/documentProtection_forms_no_password.docx
deleted file mode 100644
index 8d31026..0000000
--- a/trunk/test-data/document/documentProtection_forms_no_password.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProtection_no_protection.docx b/trunk/test-data/document/documentProtection_no_protection.docx
deleted file mode 100644
index fc1089e..0000000
--- a/trunk/test-data/document/documentProtection_no_protection.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProtection_no_protection_tag_existing.docx b/trunk/test-data/document/documentProtection_no_protection_tag_existing.docx
deleted file mode 100644
index 2c655b6..0000000
--- a/trunk/test-data/document/documentProtection_no_protection_tag_existing.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProtection_readonly_no_password.docx b/trunk/test-data/document/documentProtection_readonly_no_password.docx
deleted file mode 100644
index 1ec7063..0000000
--- a/trunk/test-data/document/documentProtection_readonly_no_password.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/documentProtection_trackedChanges_no_password.docx b/trunk/test-data/document/documentProtection_trackedChanges_no_password.docx
deleted file mode 100644
index 8531573..0000000
--- a/trunk/test-data/document/documentProtection_trackedChanges_no_password.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/drawing.docx b/trunk/test-data/document/drawing.docx
deleted file mode 100644
index 23546b7..0000000
--- a/trunk/test-data/document/drawing.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/empty.doc b/trunk/test-data/document/empty.doc
deleted file mode 100644
index ceb841c..0000000
--- a/trunk/test-data/document/empty.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/endingnote.doc b/trunk/test-data/document/endingnote.doc
deleted file mode 100644
index 92c6780..0000000
--- a/trunk/test-data/document/endingnote.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/endnotes.docx b/trunk/test-data/document/endnotes.docx
deleted file mode 100644
index a5db349..0000000
--- a/trunk/test-data/document/endnotes.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/equation.doc b/trunk/test-data/document/equation.doc
deleted file mode 100644
index e1bda06..0000000
--- a/trunk/test-data/document/equation.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/footnote.doc b/trunk/test-data/document/footnote.doc
deleted file mode 100644
index 5e11a44..0000000
--- a/trunk/test-data/document/footnote.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/footnotes.docx b/trunk/test-data/document/footnotes.docx
deleted file mode 100644
index db4386c..0000000
--- a/trunk/test-data/document/footnotes.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/form_footnotes.docx b/trunk/test-data/document/form_footnotes.docx
deleted file mode 100644
index 70abb60..0000000
--- a/trunk/test-data/document/form_footnotes.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/headerFooter.docx b/trunk/test-data/document/headerFooter.docx
deleted file mode 100644
index 87a86c3..0000000
--- a/trunk/test-data/document/headerFooter.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/headerPic.docx b/trunk/test-data/document/headerPic.docx
deleted file mode 100644
index 01072e5..0000000
--- a/trunk/test-data/document/headerPic.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/header_image.doc b/trunk/test-data/document/header_image.doc
deleted file mode 100644
index 23444cd..0000000
--- a/trunk/test-data/document/header_image.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/heading123.docx b/trunk/test-data/document/heading123.docx
deleted file mode 100644
index cf61183..0000000
--- a/trunk/test-data/document/heading123.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/hyperlink.doc b/trunk/test-data/document/hyperlink.doc
deleted file mode 100644
index 5e64b25..0000000
--- a/trunk/test-data/document/hyperlink.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/innertable.doc b/trunk/test-data/document/innertable.doc
deleted file mode 100644
index e437a5f..0000000
--- a/trunk/test-data/document/innertable.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/issue_51265_1.docx b/trunk/test-data/document/issue_51265_1.docx
deleted file mode 100644
index a18f6fb..0000000
--- a/trunk/test-data/document/issue_51265_1.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/issue_51265_2.docx b/trunk/test-data/document/issue_51265_2.docx
deleted file mode 100644
index b528d7d..0000000
--- a/trunk/test-data/document/issue_51265_2.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/issue_51265_3.docx b/trunk/test-data/document/issue_51265_3.docx
deleted file mode 100644
index 721d9d4..0000000
--- a/trunk/test-data/document/issue_51265_3.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/lists-margins.doc b/trunk/test-data/document/lists-margins.doc
deleted file mode 100644
index 348a926..0000000
--- a/trunk/test-data/document/lists-margins.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/nature1.gif b/trunk/test-data/document/nature1.gif
deleted file mode 100644
index 838e051..0000000
--- a/trunk/test-data/document/nature1.gif
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/nature1.jpg b/trunk/test-data/document/nature1.jpg
deleted file mode 100644
index e461fd9..0000000
--- a/trunk/test-data/document/nature1.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/nature1.png b/trunk/test-data/document/nature1.png
deleted file mode 100644
index ba5b10a..0000000
--- a/trunk/test-data/document/nature1.png
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/nature2.jpg b/trunk/test-data/document/nature2.jpg
deleted file mode 100644
index 9fcbf4d..0000000
--- a/trunk/test-data/document/nature2.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/nature3.jpg b/trunk/test-data/document/nature3.jpg
deleted file mode 100644
index 0347998..0000000
--- a/trunk/test-data/document/nature3.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/nature4.jpg b/trunk/test-data/document/nature4.jpg
deleted file mode 100644
index 5d344cc..0000000
--- a/trunk/test-data/document/nature4.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/o_kurs.doc b/trunk/test-data/document/o_kurs.doc
deleted file mode 100644
index caab02a..0000000
--- a/trunk/test-data/document/o_kurs.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/ob_is.doc b/trunk/test-data/document/ob_is.doc
deleted file mode 100644
index 798a094..0000000
--- a/trunk/test-data/document/ob_is.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/page-break-before.doc b/trunk/test-data/document/page-break-before.doc
deleted file mode 100644
index dddc5b5..0000000
--- a/trunk/test-data/document/page-break-before.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/page-break.doc b/trunk/test-data/document/page-break.doc
deleted file mode 100644
index a54f2ab..0000000
--- a/trunk/test-data/document/page-break.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/pageref.doc b/trunk/test-data/document/pageref.doc
deleted file mode 100644
index c8a6977..0000000
--- a/trunk/test-data/document/pageref.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/parentinvguid.doc b/trunk/test-data/document/parentinvguid.doc
deleted file mode 100644
index f27cf3e..0000000
--- a/trunk/test-data/document/parentinvguid.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/picture.doc b/trunk/test-data/document/picture.doc
deleted file mode 100644
index c48038d..0000000
--- a/trunk/test-data/document/picture.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/pictures_escher.doc b/trunk/test-data/document/pictures_escher.doc
deleted file mode 100644
index 4870bc7..0000000
--- a/trunk/test-data/document/pictures_escher.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/protected_sample.docx b/trunk/test-data/document/protected_sample.docx
deleted file mode 100644
index e6b5e0b..0000000
--- a/trunk/test-data/document/protected_sample.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/rasp.doc b/trunk/test-data/document/rasp.doc
deleted file mode 100644
index df39b69..0000000
--- a/trunk/test-data/document/rasp.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/sample.docx b/trunk/test-data/document/sample.docx
deleted file mode 100644
index 8dd04bc..0000000
--- a/trunk/test-data/document/sample.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/saved-by-table.doc b/trunk/test-data/document/saved-by-table.doc
deleted file mode 100644
index c3ea6bc..0000000
--- a/trunk/test-data/document/saved-by-table.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/simple-list.doc b/trunk/test-data/document/simple-list.doc
deleted file mode 100644
index 75ed42e..0000000
--- a/trunk/test-data/document/simple-list.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/simple-table.doc b/trunk/test-data/document/simple-table.doc
deleted file mode 100644
index 6453e45..0000000
--- a/trunk/test-data/document/simple-table.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/simple-table2.doc b/trunk/test-data/document/simple-table2.doc
deleted file mode 100644
index 1a5ff5f..0000000
--- a/trunk/test-data/document/simple-table2.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/simple.doc b/trunk/test-data/document/simple.doc
deleted file mode 100644
index ac0384a..0000000
--- a/trunk/test-data/document/simple.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/simple_image.jpg b/trunk/test-data/document/simple_image.jpg
deleted file mode 100644
index af68bca..0000000
--- a/trunk/test-data/document/simple_image.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/simple_image.png b/trunk/test-data/document/simple_image.png
deleted file mode 100644
index a9120d7..0000000
--- a/trunk/test-data/document/simple_image.png
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/smarttag-snippet.docx b/trunk/test-data/document/smarttag-snippet.docx
deleted file mode 100644
index 2c54f18..0000000
--- a/trunk/test-data/document/smarttag-snippet.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/table-merges.doc b/trunk/test-data/document/table-merges.doc
deleted file mode 100644
index 77822ac..0000000
--- a/trunk/test-data/document/table-merges.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/table_footnotes.docx b/trunk/test-data/document/table_footnotes.docx
deleted file mode 100644
index f4d0b2b..0000000
--- a/trunk/test-data/document/table_footnotes.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/test-fields.doc b/trunk/test-data/document/test-fields.doc
deleted file mode 100644
index 2a6c516..0000000
--- a/trunk/test-data/document/test-fields.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/test.doc b/trunk/test-data/document/test.doc
deleted file mode 100644
index c183d57..0000000
--- a/trunk/test-data/document/test.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/test.dotx b/trunk/test-data/document/test.dotx
deleted file mode 100644
index 0b74e39..0000000
--- a/trunk/test-data/document/test.dotx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/test2.doc b/trunk/test-data/document/test2.doc
deleted file mode 100644
index 06921df..0000000
--- a/trunk/test-data/document/test2.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/testCroppedPictures.doc b/trunk/test-data/document/testCroppedPictures.doc
deleted file mode 100644
index 2f8b562..0000000
--- a/trunk/test-data/document/testCroppedPictures.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/testPictures.doc b/trunk/test-data/document/testPictures.doc
deleted file mode 100644
index d031993..0000000
--- a/trunk/test-data/document/testPictures.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/testRangeDelete.doc b/trunk/test-data/document/testRangeDelete.doc
deleted file mode 100644
index 8961083..0000000
--- a/trunk/test-data/document/testRangeDelete.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/testRangeInsertion.doc b/trunk/test-data/document/testRangeInsertion.doc
deleted file mode 100644
index 322431c..0000000
--- a/trunk/test-data/document/testRangeInsertion.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/testRangeReplacement.doc b/trunk/test-data/document/testRangeReplacement.doc
deleted file mode 100644
index 949980d..0000000
--- a/trunk/test-data/document/testRangeReplacement.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/two_images.doc b/trunk/test-data/document/two_images.doc
deleted file mode 100644
index f94867d..0000000
--- a/trunk/test-data/document/two_images.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/vector_image.doc b/trunk/test-data/document/vector_image.doc
deleted file mode 100644
index 8922471..0000000
--- a/trunk/test-data/document/vector_image.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/vector_image.emf b/trunk/test-data/document/vector_image.emf
deleted file mode 100644
index ccd5305..0000000
--- a/trunk/test-data/document/vector_image.emf
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/watermark.doc b/trunk/test-data/document/watermark.doc
deleted file mode 100644
index 7e9d586..0000000
--- a/trunk/test-data/document/watermark.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/word95err.doc b/trunk/test-data/document/word95err.doc
deleted file mode 100644
index 7db961b..0000000
--- a/trunk/test-data/document/word95err.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/word_with_embeded.doc b/trunk/test-data/document/word_with_embeded.doc
deleted file mode 100644
index 3641722..0000000
--- a/trunk/test-data/document/word_with_embeded.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/word_with_embeded_ooxml.doc b/trunk/test-data/document/word_with_embeded_ooxml.doc
deleted file mode 100644
index f25cacf..0000000
--- a/trunk/test-data/document/word_with_embeded_ooxml.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/document/zero-length.docx b/trunk/test-data/document/zero-length.docx
deleted file mode 100644
index eb34b47..0000000
--- a/trunk/test-data/document/zero-length.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hmef/bug52400-winmail-simple.dat b/trunk/test-data/hmef/bug52400-winmail-simple.dat
deleted file mode 100644
index cb9f5f5..0000000
--- a/trunk/test-data/hmef/bug52400-winmail-simple.dat
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hmef/bug52400-winmail-with-attachments.dat b/trunk/test-data/hmef/bug52400-winmail-with-attachments.dat
deleted file mode 100644
index 9f18a8a..0000000
--- a/trunk/test-data/hmef/bug52400-winmail-with-attachments.dat
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hmef/quick-contents/message.rtf b/trunk/test-data/hmef/quick-contents/message.rtf
deleted file mode 100644
index abbdc54..0000000
--- a/trunk/test-data/hmef/quick-contents/message.rtf
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hmef/quick-contents/quick.doc b/trunk/test-data/hmef/quick-contents/quick.doc
deleted file mode 100644
index eb307fb..0000000
--- a/trunk/test-data/hmef/quick-contents/quick.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hmef/quick-contents/quick.html b/trunk/test-data/hmef/quick-contents/quick.html
deleted file mode 100644
index 76c633d..0000000
--- a/trunk/test-data/hmef/quick-contents/quick.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-
-<head>
-   <meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-   <title>The quick brown fox jumps over the lazy dog</title>
-   <meta name="author" content="Nevin Nollop">
-   <meta name="keywords" content="Pangram, fox, dog">
-   <meta name="description" content="Gym class featuring a brown fox and lazy dog">
-</head>
-
-<body lang=EN-US>
-
-The quick brown fox jumps over the lazy dog
-
-</body>
-
-</html>
diff --git a/trunk/test-data/hmef/quick-contents/quick.pdf b/trunk/test-data/hmef/quick-contents/quick.pdf
deleted file mode 100644
index f7a1883..0000000
--- a/trunk/test-data/hmef/quick-contents/quick.pdf
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hmef/quick-contents/quick.txt b/trunk/test-data/hmef/quick-contents/quick.txt
deleted file mode 100644
index f89201f..0000000
--- a/trunk/test-data/hmef/quick-contents/quick.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The quick brown fox jumps over the lazy dog
-
-Le renard brun rapide saute par-dessus le chien paresseux
-
-Der schnelle braune Fuchs springt über den faulen Hund
-
-براون وكس السريع يقفز فوق الكلب كسالي
\ No newline at end of file
diff --git a/trunk/test-data/hmef/quick-contents/quick.xml b/trunk/test-data/hmef/quick-contents/quick.xml
deleted file mode 100644
index 3c9c602..0000000
--- a/trunk/test-data/hmef/quick-contents/quick.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<document>
-   <text>The quick brown fox jumps over the lazy dog</text>
-</document>
\ No newline at end of file
diff --git a/trunk/test-data/hmef/quick-winmail.dat b/trunk/test-data/hmef/quick-winmail.dat
deleted file mode 100644
index 4cdaa36..0000000
--- a/trunk/test-data/hmef/quick-winmail.dat
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hmef/winmail-sample1.dat b/trunk/test-data/hmef/winmail-sample1.dat
deleted file mode 100644
index b9f6295..0000000
--- a/trunk/test-data/hmef/winmail-sample1.dat
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/Test0313rur.adm b/trunk/test-data/hpsf/Test0313rur.adm
deleted file mode 100644
index 1e1f954..0000000
--- a/trunk/test-data/hpsf/Test0313rur.adm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestBug44375.xls b/trunk/test-data/hpsf/TestBug44375.xls
deleted file mode 100644
index 0ebd762..0000000
--- a/trunk/test-data/hpsf/TestBug44375.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestChineseProperties.doc b/trunk/test-data/hpsf/TestChineseProperties.doc
deleted file mode 100644
index fd2b478..0000000
--- a/trunk/test-data/hpsf/TestChineseProperties.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestCorel.shw b/trunk/test-data/hpsf/TestCorel.shw
deleted file mode 100644
index e0af194..0000000
--- a/trunk/test-data/hpsf/TestCorel.shw
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestEditTime.doc b/trunk/test-data/hpsf/TestEditTime.doc
deleted file mode 100644
index 8b30417..0000000
--- a/trunk/test-data/hpsf/TestEditTime.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestGermanWord90.doc b/trunk/test-data/hpsf/TestGermanWord90.doc
deleted file mode 100644
index 63bbed3..0000000
--- a/trunk/test-data/hpsf/TestGermanWord90.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestMickey.doc b/trunk/test-data/hpsf/TestMickey.doc
deleted file mode 100644
index f62ade3..0000000
--- a/trunk/test-data/hpsf/TestMickey.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestNon4ByteBoundary.doc b/trunk/test-data/hpsf/TestNon4ByteBoundary.doc
deleted file mode 100644
index 4ecb221..0000000
--- a/trunk/test-data/hpsf/TestNon4ByteBoundary.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestRobert_Flaherty.doc b/trunk/test-data/hpsf/TestRobert_Flaherty.doc
deleted file mode 100644
index ee3e142..0000000
--- a/trunk/test-data/hpsf/TestRobert_Flaherty.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestSectionDictionary.doc b/trunk/test-data/hpsf/TestSectionDictionary.doc
deleted file mode 100644
index 6114a76..0000000
--- a/trunk/test-data/hpsf/TestSectionDictionary.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestShiftJIS.doc b/trunk/test-data/hpsf/TestShiftJIS.doc
deleted file mode 100644
index f8516d3..0000000
--- a/trunk/test-data/hpsf/TestShiftJIS.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestSolidWorks.sldprt b/trunk/test-data/hpsf/TestSolidWorks.sldprt
deleted file mode 100644
index a7962b3..0000000
--- a/trunk/test-data/hpsf/TestSolidWorks.sldprt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestThumbnail.xls b/trunk/test-data/hpsf/TestThumbnail.xls
deleted file mode 100644
index 69cca03..0000000
--- a/trunk/test-data/hpsf/TestThumbnail.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestUnicode.xls b/trunk/test-data/hpsf/TestUnicode.xls
deleted file mode 100644
index 30c8f3c..0000000
--- a/trunk/test-data/hpsf/TestUnicode.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestVisioWithCodepage.vsd b/trunk/test-data/hpsf/TestVisioWithCodepage.vsd
deleted file mode 100644
index d699e11..0000000
--- a/trunk/test-data/hpsf/TestVisioWithCodepage.vsd
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestWriteWellKnown.doc b/trunk/test-data/hpsf/TestWriteWellKnown.doc
deleted file mode 100644
index d3a0433..0000000
--- a/trunk/test-data/hpsf/TestWriteWellKnown.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/TestZeroLengthCodePage.mpp b/trunk/test-data/hpsf/TestZeroLengthCodePage.mpp
deleted file mode 100644
index 4820ab7..0000000
--- a/trunk/test-data/hpsf/TestZeroLengthCodePage.mpp
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hpsf/Test_Humor-Generation.ppt b/trunk/test-data/hpsf/Test_Humor-Generation.ppt
deleted file mode 100644
index 7408832..0000000
--- a/trunk/test-data/hpsf/Test_Humor-Generation.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/51873.msg b/trunk/test-data/hsmf/51873.msg
deleted file mode 100644
index 28a0a57..0000000
--- a/trunk/test-data/hsmf/51873.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/53784_fails.msg b/trunk/test-data/hsmf/53784_fails.msg
deleted file mode 100644
index 9fb20e9..0000000
--- a/trunk/test-data/hsmf/53784_fails.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/53784_succeeds.msg b/trunk/test-data/hsmf/53784_succeeds.msg
deleted file mode 100644
index 451a982..0000000
--- a/trunk/test-data/hsmf/53784_succeeds.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/58214_extracted_attachment.msg b/trunk/test-data/hsmf/58214_extracted_attachment.msg
deleted file mode 100644
index a321ed5..0000000
--- a/trunk/test-data/hsmf/58214_extracted_attachment.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/58214_with_attachment.msg b/trunk/test-data/hsmf/58214_with_attachment.msg
deleted file mode 100644
index d0e11f6..0000000
--- a/trunk/test-data/hsmf/58214_with_attachment.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/attachment_msg_pdf.msg b/trunk/test-data/hsmf/attachment_msg_pdf.msg
deleted file mode 100644
index 35b66e1..0000000
--- a/trunk/test-data/hsmf/attachment_msg_pdf.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/attachment_test_msg.msg b/trunk/test-data/hsmf/attachment_test_msg.msg
deleted file mode 100644
index ea82d91..0000000
--- a/trunk/test-data/hsmf/attachment_test_msg.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/blank.msg b/trunk/test-data/hsmf/blank.msg
deleted file mode 100644
index 0bdb812..0000000
--- a/trunk/test-data/hsmf/blank.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/chinese-traditional.msg b/trunk/test-data/hsmf/chinese-traditional.msg
deleted file mode 100644
index c2b84c0..0000000
--- a/trunk/test-data/hsmf/chinese-traditional.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/cyrillic_message.msg b/trunk/test-data/hsmf/cyrillic_message.msg
deleted file mode 100644
index d0fc8ec..0000000
--- a/trunk/test-data/hsmf/cyrillic_message.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/example_received_regular.msg b/trunk/test-data/hsmf/example_received_regular.msg
deleted file mode 100644
index 57c66b0..0000000
--- a/trunk/test-data/hsmf/example_received_regular.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/example_received_unicode.msg b/trunk/test-data/hsmf/example_received_unicode.msg
deleted file mode 100644
index 08256f9..0000000
--- a/trunk/test-data/hsmf/example_received_unicode.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/example_sent_regular.msg b/trunk/test-data/hsmf/example_sent_regular.msg
deleted file mode 100644
index 0c1c3f6..0000000
--- a/trunk/test-data/hsmf/example_sent_regular.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/example_sent_unicode.msg b/trunk/test-data/hsmf/example_sent_unicode.msg
deleted file mode 100644
index 76aa324..0000000
--- a/trunk/test-data/hsmf/example_sent_unicode.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/logsat.com_signatures_valid.msg b/trunk/test-data/hsmf/logsat.com_signatures_valid.msg
deleted file mode 100644
index a074325..0000000
--- a/trunk/test-data/hsmf/logsat.com_signatures_valid.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/message_1979.msg b/trunk/test-data/hsmf/message_1979.msg
deleted file mode 100644
index 10083c8..0000000
--- a/trunk/test-data/hsmf/message_1979.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/message_1980.msg b/trunk/test-data/hsmf/message_1980.msg
deleted file mode 100644
index bb29540..0000000
--- a/trunk/test-data/hsmf/message_1980.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/message_1981.msg b/trunk/test-data/hsmf/message_1981.msg
deleted file mode 100644
index 6833d54..0000000
--- a/trunk/test-data/hsmf/message_1981.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/message_extra_hyphen_submission_chunk.msg b/trunk/test-data/hsmf/message_extra_hyphen_submission_chunk.msg
deleted file mode 100644
index 3bcb8d3..0000000
--- a/trunk/test-data/hsmf/message_extra_hyphen_submission_chunk.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/message_normal_submission_chunk.msg b/trunk/test-data/hsmf/message_normal_submission_chunk.msg
deleted file mode 100644
index bb15d27..0000000
--- a/trunk/test-data/hsmf/message_normal_submission_chunk.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/no_recipient_address.msg b/trunk/test-data/hsmf/no_recipient_address.msg
deleted file mode 100644
index e88d503..0000000
--- a/trunk/test-data/hsmf/no_recipient_address.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/outlook_30_msg.msg b/trunk/test-data/hsmf/outlook_30_msg.msg
deleted file mode 100644
index 0a58569..0000000
--- a/trunk/test-data/hsmf/outlook_30_msg.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/quick.msg b/trunk/test-data/hsmf/quick.msg
deleted file mode 100644
index 05326d2..0000000
--- a/trunk/test-data/hsmf/quick.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/hsmf/simple_test_msg.msg b/trunk/test-data/hsmf/simple_test_msg.msg
deleted file mode 100644
index 731fecc..0000000
--- a/trunk/test-data/hsmf/simple_test_msg.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/50154.xlsx b/trunk/test-data/openxml4j/50154.xlsx
deleted file mode 100644
index 7637fb3..0000000
--- a/trunk/test-data/openxml4j/50154.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/51444.xlsx b/trunk/test-data/openxml4j/51444.xlsx
deleted file mode 100644
index 5047dbf..0000000
--- a/trunk/test-data/openxml4j/51444.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/53282.xlsx b/trunk/test-data/openxml4j/53282.xlsx
deleted file mode 100644
index 6d88303..0000000
--- a/trunk/test-data/openxml4j/53282.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/ContentTypeHasEntities.ooxml b/trunk/test-data/openxml4j/ContentTypeHasEntities.ooxml
deleted file mode 100644
index 9581a2e..0000000
--- a/trunk/test-data/openxml4j/ContentTypeHasEntities.ooxml
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/ContentTypeHasParameters.ooxml b/trunk/test-data/openxml4j/ContentTypeHasParameters.ooxml
deleted file mode 100644
index b4410b0..0000000
--- a/trunk/test-data/openxml4j/ContentTypeHasParameters.ooxml
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/CorePropertiesHasEntities.ooxml b/trunk/test-data/openxml4j/CorePropertiesHasEntities.ooxml
deleted file mode 100644
index bdd884b..0000000
--- a/trunk/test-data/openxml4j/CorePropertiesHasEntities.ooxml
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/ExcelWithHyperlinks.xlsx b/trunk/test-data/openxml4j/ExcelWithHyperlinks.xlsx
deleted file mode 100644
index ba5ed27..0000000
--- a/trunk/test-data/openxml4j/ExcelWithHyperlinks.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/MultipleCoreProperties.docx b/trunk/test-data/openxml4j/MultipleCoreProperties.docx
deleted file mode 100644
index 4c19ae7..0000000
--- a/trunk/test-data/openxml4j/MultipleCoreProperties.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_AlternateTimezones.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_AlternateTimezones.docx
deleted file mode 100644
index b2a9418..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_AlternateTimezones.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
deleted file mode 100644
index 89533f0..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
deleted file mode 100644
index 63555e4..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
deleted file mode 100644
index 304e5ce..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
deleted file mode 100644
index 7b4f765..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
deleted file mode 100644
index 7a63ee1..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
deleted file mode 100644
index 3ee9fc3..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx
deleted file mode 100644
index 7a63ee1..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx b/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
deleted file mode 100644
index 3984aea..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx b/trunk/test-data/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx
deleted file mode 100644
index 8ccfb61..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/OPCCompliance_NoCoreProperties.xlsx b/trunk/test-data/openxml4j/OPCCompliance_NoCoreProperties.xlsx
deleted file mode 100644
index fa1049c..0000000
--- a/trunk/test-data/openxml4j/OPCCompliance_NoCoreProperties.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/PackageRelsHasEntities.ooxml b/trunk/test-data/openxml4j/PackageRelsHasEntities.ooxml
deleted file mode 100644
index 505fdce..0000000
--- a/trunk/test-data/openxml4j/PackageRelsHasEntities.ooxml
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/TestCreatePackageOUTPUT.docx b/trunk/test-data/openxml4j/TestCreatePackageOUTPUT.docx
deleted file mode 100644
index dfcacc5..0000000
--- a/trunk/test-data/openxml4j/TestCreatePackageOUTPUT.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/TestOpenPackageINPUT.docx b/trunk/test-data/openxml4j/TestOpenPackageINPUT.docx
deleted file mode 100644
index dc105f0..0000000
--- a/trunk/test-data/openxml4j/TestOpenPackageINPUT.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/TestOpenPackageOUTPUT.docx b/trunk/test-data/openxml4j/TestOpenPackageOUTPUT.docx
deleted file mode 100644
index 1e0996f..0000000
--- a/trunk/test-data/openxml4j/TestOpenPackageOUTPUT.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/TestPackageCommon.docx b/trunk/test-data/openxml4j/TestPackageCommon.docx
deleted file mode 100644
index 771cd18..0000000
--- a/trunk/test-data/openxml4j/TestPackageCommon.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/TestPackageCoreProperiesGetters.docx b/trunk/test-data/openxml4j/TestPackageCoreProperiesGetters.docx
deleted file mode 100644
index 2d8bb35..0000000
--- a/trunk/test-data/openxml4j/TestPackageCoreProperiesGetters.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/TestPackageCoreProperiesSetters.docx b/trunk/test-data/openxml4j/TestPackageCoreProperiesSetters.docx
deleted file mode 100644
index 2d8bb35..0000000
--- a/trunk/test-data/openxml4j/TestPackageCoreProperiesSetters.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/TestPackageThumbnail.docx b/trunk/test-data/openxml4j/TestPackageThumbnail.docx
deleted file mode 100644
index ccc990d..0000000
--- a/trunk/test-data/openxml4j/TestPackageThumbnail.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/at.pzp.www_uploads_media_PP_Scheinecker-jdk6error.pptx b/trunk/test-data/openxml4j/at.pzp.www_uploads_media_PP_Scheinecker-jdk6error.pptx
deleted file mode 100644
index 7f9ff0c..0000000
--- a/trunk/test-data/openxml4j/at.pzp.www_uploads_media_PP_Scheinecker-jdk6error.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/dcterms_bug_56479.zip b/trunk/test-data/openxml4j/dcterms_bug_56479.zip
deleted file mode 100644
index bce2019..0000000
--- a/trunk/test-data/openxml4j/dcterms_bug_56479.zip
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/invalid.xlsx b/trunk/test-data/openxml4j/invalid.xlsx
deleted file mode 100644
index 15cb0ec..0000000
--- a/trunk/test-data/openxml4j/invalid.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/sample.docx b/trunk/test-data/openxml4j/sample.docx
deleted file mode 100644
index 8e77521..0000000
--- a/trunk/test-data/openxml4j/sample.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/sample.xlsx b/trunk/test-data/openxml4j/sample.xlsx
deleted file mode 100644
index a275cf4..0000000
--- a/trunk/test-data/openxml4j/sample.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/openxml4j/thumbnail.jpg b/trunk/test-data/openxml4j/thumbnail.jpg
deleted file mode 100644
index 5119960..0000000
--- a/trunk/test-data/openxml4j/thumbnail.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/20-Force-on-a-current-S00.doc b/trunk/test-data/poifs/20-Force-on-a-current-S00.doc
deleted file mode 100644
index 3ad75eb..0000000
--- a/trunk/test-data/poifs/20-Force-on-a-current-S00.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/60256.bin b/trunk/test-data/poifs/60256.bin
deleted file mode 100644
index 1fed50b..0000000
--- a/trunk/test-data/poifs/60256.bin
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/60320-protected.xlsx b/trunk/test-data/poifs/60320-protected.xlsx
deleted file mode 100644
index 71c6b4c..0000000
--- a/trunk/test-data/poifs/60320-protected.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/BlockSize4096.zvi b/trunk/test-data/poifs/BlockSize4096.zvi
deleted file mode 100644
index 6379a04..0000000
--- a/trunk/test-data/poifs/BlockSize4096.zvi
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/BlockSize512.zvi b/trunk/test-data/poifs/BlockSize512.zvi
deleted file mode 100644
index 3a6be2f..0000000
--- a/trunk/test-data/poifs/BlockSize512.zvi
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/Notes.ole2 b/trunk/test-data/poifs/Notes.ole2
deleted file mode 100644
index 9aaed99..0000000
--- a/trunk/test-data/poifs/Notes.ole2
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/ReferencesInvalidSectors.mpp b/trunk/test-data/poifs/ReferencesInvalidSectors.mpp
deleted file mode 100644
index 583a0a1..0000000
--- a/trunk/test-data/poifs/ReferencesInvalidSectors.mpp
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/ShortLastBlock.qwp b/trunk/test-data/poifs/ShortLastBlock.qwp
deleted file mode 100644
index b278d06..0000000
--- a/trunk/test-data/poifs/ShortLastBlock.qwp
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/ShortLastBlock.wps b/trunk/test-data/poifs/ShortLastBlock.wps
deleted file mode 100644
index 1b1a627..0000000
--- a/trunk/test-data/poifs/ShortLastBlock.wps
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/extenxls_pwd123.xlsx b/trunk/test-data/poifs/extenxls_pwd123.xlsx
deleted file mode 100644
index a6ae896..0000000
--- a/trunk/test-data/poifs/extenxls_pwd123.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/multimedia.doc b/trunk/test-data/poifs/multimedia.doc
deleted file mode 100644
index 51b356d..0000000
--- a/trunk/test-data/poifs/multimedia.doc
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/oleObject1.bin b/trunk/test-data/poifs/oleObject1.bin
deleted file mode 100644
index fc46302..0000000
--- a/trunk/test-data/poifs/oleObject1.bin
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/only-zero-byte-streams.ole2 b/trunk/test-data/poifs/only-zero-byte-streams.ole2
deleted file mode 100644
index c1b8429..0000000
--- a/trunk/test-data/poifs/only-zero-byte-streams.ole2
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/poitest.pfx b/trunk/test-data/poifs/poitest.pfx
deleted file mode 100644
index 14be4d0..0000000
--- a/trunk/test-data/poifs/poitest.pfx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/protect.xlsx b/trunk/test-data/poifs/protect.xlsx
deleted file mode 100644
index 1767b14..0000000
--- a/trunk/test-data/poifs/protect.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/protected_agile.docx b/trunk/test-data/poifs/protected_agile.docx
deleted file mode 100644
index a7de3eb..0000000
--- a/trunk/test-data/poifs/protected_agile.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/protected_sha512.xlsx b/trunk/test-data/poifs/protected_sha512.xlsx
deleted file mode 100644
index 1f0ea82..0000000
--- a/trunk/test-data/poifs/protected_sha512.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/poifs/unknown_properties.msg b/trunk/test-data/poifs/unknown_properties.msg
deleted file mode 100644
index 2c76df9..0000000
--- a/trunk/test-data/poifs/unknown_properties.msg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/51318.pub b/trunk/test-data/publisher/51318.pub
deleted file mode 100644
index 728811c..0000000
--- a/trunk/test-data/publisher/51318.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/LinkAt0And10.pub b/trunk/test-data/publisher/LinkAt0And10.pub
deleted file mode 100644
index c4459fb..0000000
--- a/trunk/test-data/publisher/LinkAt0And10.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/LinkAt10.pub b/trunk/test-data/publisher/LinkAt10.pub
deleted file mode 100644
index 89c4a44..0000000
--- a/trunk/test-data/publisher/LinkAt10.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/LinkAt10And20And30.pub b/trunk/test-data/publisher/LinkAt10And20And30.pub
deleted file mode 100644
index 5f7f747..0000000
--- a/trunk/test-data/publisher/LinkAt10And20And30.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/LinkAt10And20And30And40.pub b/trunk/test-data/publisher/LinkAt10And20And30And40.pub
deleted file mode 100644
index d19ddc4..0000000
--- a/trunk/test-data/publisher/LinkAt10And20And30And40.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/LinkAt10Longer.pub b/trunk/test-data/publisher/LinkAt10Longer.pub
deleted file mode 100644
index 8a3dcc2..0000000
--- a/trunk/test-data/publisher/LinkAt10Longer.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/LinkAt20.pub b/trunk/test-data/publisher/LinkAt20.pub
deleted file mode 100644
index 091a38c..0000000
--- a/trunk/test-data/publisher/LinkAt20.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample.pub b/trunk/test-data/publisher/Sample.pub
deleted file mode 100644
index b870168..0000000
--- a/trunk/test-data/publisher/Sample.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample.txt b/trunk/test-data/publisher/Sample.txt
deleted file mode 100644
index 279395e..0000000
--- a/trunk/test-data/publisher/Sample.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-This is some text on the first page
-It’s in times new roman, font size 10, all normal
-
-
-This is in bold and italic
-It’s Arial, 20 point font
-It’s in the second textbox on the first page
-
-
-This is the second page
-
-It is also times new roman, 10 point
-
-
-Table on page 2    Top right
-P2 table left      P2 table right
-Bottom Left        Bottom Right
-
-
-This text is on page two
-This is a link to Apache POI
-More normal text
-Link to a file
-
-
-More text, more hyperlinks
-email link
-Final hyperlink
-Within doc to page 1
diff --git a/trunk/test-data/publisher/Sample2.pub b/trunk/test-data/publisher/Sample2.pub
deleted file mode 100644
index 610362c..0000000
--- a/trunk/test-data/publisher/Sample2.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample2.txt b/trunk/test-data/publisher/Sample2.txt
deleted file mode 100644
index f8a68bb..0000000
--- a/trunk/test-data/publisher/Sample2.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-This is some text on the first page
-It’s in times new roman, font size 10, all normal
-
-We’ve added some more text in here, to push all the offsets about a bit.
-
-
-
-This is in bold and italic
-It’s Arial, 20 point font
-It’s in the second textbox on the first page
-
-Ditto with more text in here.
-
-
-This is the second page
-
-It is also times new roman, 10 point
-
-
-Table on page 2    Top right
-P2 table left      P2 table right
-Bottom Left        Bottom Right
-
-
-This text is on page two
-This is a link to Apache POI
-More normal text
-Link to a file
-
-
-More text, more hyperlinks
-email link
-Final hyperlink
-Within doc to page 1
diff --git a/trunk/test-data/publisher/Sample2000.pub b/trunk/test-data/publisher/Sample2000.pub
deleted file mode 100644
index 2c6174e..0000000
--- a/trunk/test-data/publisher/Sample2000.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample2_2010.pub b/trunk/test-data/publisher/Sample2_2010.pub
deleted file mode 100644
index 74f4566..0000000
--- a/trunk/test-data/publisher/Sample2_2010.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample3.pub b/trunk/test-data/publisher/Sample3.pub
deleted file mode 100644
index 4f19bec..0000000
--- a/trunk/test-data/publisher/Sample3.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample3.txt b/trunk/test-data/publisher/Sample3.txt
deleted file mode 100644
index c2d791b..0000000
--- a/trunk/test-data/publisher/Sample3.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-This is some text on the first page
-It’s in times new roman, font size 10, all normal
-
-
-This is in bold and italic
-It’s Arial, 20 point font
-It’s in the second textbox on the first page
-
-
-This is the second page12345678
-
-It is also times new roman, 10 point
-
-
-Table on page 2    Top right
-P2 table left      P2 table right
-Bottom Left        Bottom Right
-
-
-This text is on page two
-This is a link to Apache POI
-More normal text
-Link to a file
-
-
-More text, more hyperlinks
-email link
-Final hyperlink
-Within doc to page 1
diff --git a/trunk/test-data/publisher/Sample3_2010.pub b/trunk/test-data/publisher/Sample3_2010.pub
deleted file mode 100644
index d2982c0..0000000
--- a/trunk/test-data/publisher/Sample3_2010.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample4.pub b/trunk/test-data/publisher/Sample4.pub
deleted file mode 100644
index 445df85..0000000
--- a/trunk/test-data/publisher/Sample4.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample4.txt b/trunk/test-data/publisher/Sample4.txt
deleted file mode 100644
index 279395e..0000000
--- a/trunk/test-data/publisher/Sample4.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-This is some text on the first page
-It’s in times new roman, font size 10, all normal
-
-
-This is in bold and italic
-It’s Arial, 20 point font
-It’s in the second textbox on the first page
-
-
-This is the second page
-
-It is also times new roman, 10 point
-
-
-Table on page 2    Top right
-P2 table left      P2 table right
-Bottom Left        Bottom Right
-
-
-This text is on page two
-This is a link to Apache POI
-More normal text
-Link to a file
-
-
-More text, more hyperlinks
-email link
-Final hyperlink
-Within doc to page 1
diff --git a/trunk/test-data/publisher/Sample4_2010.pub b/trunk/test-data/publisher/Sample4_2010.pub
deleted file mode 100644
index dd6c25b..0000000
--- a/trunk/test-data/publisher/Sample4_2010.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample98.pub b/trunk/test-data/publisher/Sample98.pub
deleted file mode 100644
index 8adffda..0000000
--- a/trunk/test-data/publisher/Sample98.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/SampleBrochure.pub b/trunk/test-data/publisher/SampleBrochure.pub
deleted file mode 100644
index 00deec1..0000000
--- a/trunk/test-data/publisher/SampleBrochure.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/SampleNewsletter.pub b/trunk/test-data/publisher/SampleNewsletter.pub
deleted file mode 100644
index 9490092..0000000
--- a/trunk/test-data/publisher/SampleNewsletter.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Sample_2010.pub b/trunk/test-data/publisher/Sample_2010.pub
deleted file mode 100644
index ace1540..0000000
--- a/trunk/test-data/publisher/Sample_2010.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/publisher/Simple.pub b/trunk/test-data/publisher/Simple.pub
deleted file mode 100644
index 2397b9d..0000000
--- a/trunk/test-data/publisher/Simple.pub
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/2411-Performance_Up.pptx b/trunk/test-data/slideshow/2411-Performance_Up.pptx
deleted file mode 100644
index 46fe397..0000000
--- a/trunk/test-data/slideshow/2411-Performance_Up.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/37625.ppt b/trunk/test-data/slideshow/37625.ppt
deleted file mode 100644
index d157798..0000000
--- a/trunk/test-data/slideshow/37625.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/38256.ppt b/trunk/test-data/slideshow/38256.ppt
deleted file mode 100644
index a0883bd..0000000
--- a/trunk/test-data/slideshow/38256.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/41071.ppt b/trunk/test-data/slideshow/41071.ppt
deleted file mode 100644
index 4a44302..0000000
--- a/trunk/test-data/slideshow/41071.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/41246-1.ppt b/trunk/test-data/slideshow/41246-1.ppt
deleted file mode 100644
index b785191..0000000
--- a/trunk/test-data/slideshow/41246-1.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/41246-2.ppt b/trunk/test-data/slideshow/41246-2.ppt
deleted file mode 100644
index 1b1a963..0000000
--- a/trunk/test-data/slideshow/41246-2.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/41384.ppt b/trunk/test-data/slideshow/41384.ppt
deleted file mode 100644
index 7a206ec..0000000
--- a/trunk/test-data/slideshow/41384.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/42474-1.ppt b/trunk/test-data/slideshow/42474-1.ppt
deleted file mode 100644
index 15b654d..0000000
--- a/trunk/test-data/slideshow/42474-1.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/42474-2.ppt b/trunk/test-data/slideshow/42474-2.ppt
deleted file mode 100644
index 5c6f8ca..0000000
--- a/trunk/test-data/slideshow/42474-2.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/42485.ppt b/trunk/test-data/slideshow/42485.ppt
deleted file mode 100644
index e9e3dda..0000000
--- a/trunk/test-data/slideshow/42485.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/42486.ppt b/trunk/test-data/slideshow/42486.ppt
deleted file mode 100644
index af45163..0000000
--- a/trunk/test-data/slideshow/42486.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/42520.ppt b/trunk/test-data/slideshow/42520.ppt
deleted file mode 100644
index 15bcf64..0000000
--- a/trunk/test-data/slideshow/42520.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/43781.ppt b/trunk/test-data/slideshow/43781.ppt
deleted file mode 100644
index ddea91f..0000000
--- a/trunk/test-data/slideshow/43781.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/44296.ppt b/trunk/test-data/slideshow/44296.ppt
deleted file mode 100644
index 1e0529d..0000000
--- a/trunk/test-data/slideshow/44296.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/44770.ppt b/trunk/test-data/slideshow/44770.ppt
deleted file mode 100644
index d7ae12b..0000000
--- a/trunk/test-data/slideshow/44770.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/45537_Footer.ppt b/trunk/test-data/slideshow/45537_Footer.ppt
deleted file mode 100644
index f358b14..0000000
--- a/trunk/test-data/slideshow/45537_Footer.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/45537_Header.ppt b/trunk/test-data/slideshow/45537_Header.ppt
deleted file mode 100644
index e09d775..0000000
--- a/trunk/test-data/slideshow/45537_Header.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/45541_Footer.pptx b/trunk/test-data/slideshow/45541_Footer.pptx
deleted file mode 100644
index 84e3f47..0000000
--- a/trunk/test-data/slideshow/45541_Footer.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/45541_Header.pptx b/trunk/test-data/slideshow/45541_Header.pptx
deleted file mode 100644
index fe7b7a1..0000000
--- a/trunk/test-data/slideshow/45541_Header.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/45543.ppt b/trunk/test-data/slideshow/45543.ppt
deleted file mode 100644
index d5b04f8..0000000
--- a/trunk/test-data/slideshow/45543.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/45545_Comment.pptx b/trunk/test-data/slideshow/45545_Comment.pptx
deleted file mode 100644
index ce34eea..0000000
--- a/trunk/test-data/slideshow/45545_Comment.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/45776.ppt b/trunk/test-data/slideshow/45776.ppt
deleted file mode 100644
index 637b06e..0000000
--- a/trunk/test-data/slideshow/45776.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/47261.ppt b/trunk/test-data/slideshow/47261.ppt
deleted file mode 100644
index 7a26a79..0000000
--- a/trunk/test-data/slideshow/47261.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/49386-null_dates.pptx b/trunk/test-data/slideshow/49386-null_dates.pptx
deleted file mode 100644
index 77fc378..0000000
--- a/trunk/test-data/slideshow/49386-null_dates.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/49541_symbol_map.ppt b/trunk/test-data/slideshow/49541_symbol_map.ppt
deleted file mode 100644
index 7810492..0000000
--- a/trunk/test-data/slideshow/49541_symbol_map.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/49648.ppt b/trunk/test-data/slideshow/49648.ppt
deleted file mode 100644
index 841b904..0000000
--- a/trunk/test-data/slideshow/49648.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/51187.pptx b/trunk/test-data/slideshow/51187.pptx
deleted file mode 100644
index 25816d5..0000000
--- a/trunk/test-data/slideshow/51187.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/51731.ppt b/trunk/test-data/slideshow/51731.ppt
deleted file mode 100644
index 07d6904..0000000
--- a/trunk/test-data/slideshow/51731.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/52244.ppt b/trunk/test-data/slideshow/52244.ppt
deleted file mode 100644
index aaf3843..0000000
--- a/trunk/test-data/slideshow/52244.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/52599.ppt b/trunk/test-data/slideshow/52599.ppt
deleted file mode 100644
index a1c2e8d..0000000
--- a/trunk/test-data/slideshow/52599.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/53446.ppt b/trunk/test-data/slideshow/53446.ppt
deleted file mode 100644
index 55333fc..0000000
--- a/trunk/test-data/slideshow/53446.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54111.ppt b/trunk/test-data/slideshow/54111.ppt
deleted file mode 100644
index 048bfb6..0000000
--- a/trunk/test-data/slideshow/54111.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54332a.ppt b/trunk/test-data/slideshow/54332a.ppt
deleted file mode 100644
index ebdedf5..0000000
--- a/trunk/test-data/slideshow/54332a.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54332b.ppt b/trunk/test-data/slideshow/54332b.ppt
deleted file mode 100644
index 41f20fa..0000000
--- a/trunk/test-data/slideshow/54332b.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54541_cropped_bitmap.ppt b/trunk/test-data/slideshow/54541_cropped_bitmap.ppt
deleted file mode 100644
index 3c631a1..0000000
--- a/trunk/test-data/slideshow/54541_cropped_bitmap.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54541_cropped_bitmap2.ppt b/trunk/test-data/slideshow/54541_cropped_bitmap2.ppt
deleted file mode 100644
index 3d79dbd..0000000
--- a/trunk/test-data/slideshow/54541_cropped_bitmap2.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54542_cropped_bitmap.pptx b/trunk/test-data/slideshow/54542_cropped_bitmap.pptx
deleted file mode 100644
index b8d960c..0000000
--- a/trunk/test-data/slideshow/54542_cropped_bitmap.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54722.ppt b/trunk/test-data/slideshow/54722.ppt
deleted file mode 100644
index c62a60b..0000000
--- a/trunk/test-data/slideshow/54722.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/54880_chinese.ppt b/trunk/test-data/slideshow/54880_chinese.ppt
deleted file mode 100644
index b9830f5..0000000
--- a/trunk/test-data/slideshow/54880_chinese.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/56260.ppt b/trunk/test-data/slideshow/56260.ppt
deleted file mode 100644
index 6c2c0d9..0000000
--- a/trunk/test-data/slideshow/56260.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/56812.pptx b/trunk/test-data/slideshow/56812.pptx
deleted file mode 100644
index 2fa070a..0000000
--- a/trunk/test-data/slideshow/56812.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/57272_corrupted_usereditatom.ppt b/trunk/test-data/slideshow/57272_corrupted_usereditatom.ppt
deleted file mode 100644
index b811d6b..0000000
--- a/trunk/test-data/slideshow/57272_corrupted_usereditatom.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/59302.ppt b/trunk/test-data/slideshow/59302.ppt
deleted file mode 100644
index bd53fe4..0000000
--- a/trunk/test-data/slideshow/59302.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/60003.ppt b/trunk/test-data/slideshow/60003.ppt
deleted file mode 100644
index 1a4cd2f..0000000
--- a/trunk/test-data/slideshow/60003.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/60294.ppt b/trunk/test-data/slideshow/60294.ppt
deleted file mode 100644
index ebcae62..0000000
--- a/trunk/test-data/slideshow/60294.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/KEY02.pptx b/trunk/test-data/slideshow/KEY02.pptx
deleted file mode 100644
index 142c6dd..0000000
--- a/trunk/test-data/slideshow/KEY02.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/OverlappingRelations.pptx b/trunk/test-data/slideshow/OverlappingRelations.pptx
deleted file mode 100644
index 7551630..0000000
--- a/trunk/test-data/slideshow/OverlappingRelations.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/PPT95.ppt b/trunk/test-data/slideshow/PPT95.ppt
deleted file mode 100644
index 3f338d4..0000000
--- a/trunk/test-data/slideshow/PPT95.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/PPTWithAttachments.pptm b/trunk/test-data/slideshow/PPTWithAttachments.pptm
deleted file mode 100644
index 00b148d..0000000
--- a/trunk/test-data/slideshow/PPTWithAttachments.pptm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/ParagraphStylesShorterThanCharStyles.ppt b/trunk/test-data/slideshow/ParagraphStylesShorterThanCharStyles.ppt
deleted file mode 100644
index 19a8a75..0000000
--- a/trunk/test-data/slideshow/ParagraphStylesShorterThanCharStyles.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/Password_Protected-56-hello.ppt b/trunk/test-data/slideshow/Password_Protected-56-hello.ppt
deleted file mode 100644
index d1e5d66..0000000
--- a/trunk/test-data/slideshow/Password_Protected-56-hello.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/Password_Protected-hello.ppt b/trunk/test-data/slideshow/Password_Protected-hello.ppt
deleted file mode 100644
index 3bbab4d..0000000
--- a/trunk/test-data/slideshow/Password_Protected-hello.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/Password_Protected-np-hello.ppt b/trunk/test-data/slideshow/Password_Protected-np-hello.ppt
deleted file mode 100644
index 8634183..0000000
--- a/trunk/test-data/slideshow/Password_Protected-np-hello.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/PictureTypeZero.ppt b/trunk/test-data/slideshow/PictureTypeZero.ppt
deleted file mode 100644
index 66b4e50..0000000
--- a/trunk/test-data/slideshow/PictureTypeZero.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/SampleShow.ppt b/trunk/test-data/slideshow/SampleShow.ppt
deleted file mode 100644
index 81b99e1..0000000
--- a/trunk/test-data/slideshow/SampleShow.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/SampleShow.pptx b/trunk/test-data/slideshow/SampleShow.pptx
deleted file mode 100644
index e5237f4..0000000
--- a/trunk/test-data/slideshow/SampleShow.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/SampleShow.txt b/trunk/test-data/slideshow/SampleShow.txt
deleted file mode 100644
index ccfe4d2..0000000
--- a/trunk/test-data/slideshow/SampleShow.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Author = Nick Burch
-Title = SlideShow Sample
-Subject = A sample slideshow
-Keywords = Sample Testing
-Comments = This is a sample slideshow, for use with testing etc
-
-(Slide 1)
-Title of the first slide
-
-Subtitle of the first slide
-
-This bit is in italic green
-
-(Notes 1)
-I am the notes of the first slide
-
-(Slide 2)
-This is the second slide
-
-* It has bullet points on it
-* They’re fun, aren’t they?
-* Especially in a different font like Arial Black at 16 point!
-
-(Notes 2)
-These are the notes of the 2nd slide
-THIS LINE IS BOLD
diff --git a/trunk/test-data/slideshow/SimpleMacro.ppt b/trunk/test-data/slideshow/SimpleMacro.ppt
deleted file mode 100644
index 228ebe9..0000000
--- a/trunk/test-data/slideshow/SimpleMacro.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/SimpleMacro.pptm b/trunk/test-data/slideshow/SimpleMacro.pptm
deleted file mode 100644
index d39de5c..0000000
--- a/trunk/test-data/slideshow/SimpleMacro.pptm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/SimpleMacro.vba b/trunk/test-data/slideshow/SimpleMacro.vba
deleted file mode 100644
index 2f26227..0000000
--- a/trunk/test-data/slideshow/SimpleMacro.vba
+++ /dev/null
@@ -1,14 +0,0 @@
-Sub TestMacro()
-'
-' TestMacro Macro
-' This is a test macro
-'
-
-'
-    With ActivePresentation.Slides(1).Shapes(1)
-        .Title.TextFrame.TextRange.Text = "This is a macro slideshow"
-    End With
-    With ActivePresentation.Slides(1).Shapes(2)
-        .Title.TextFrame.TextRange.Text = "subtitle"
-    EndWith
-End Sub
diff --git a/trunk/test-data/slideshow/Single_Coloured_Page.ppt b/trunk/test-data/slideshow/Single_Coloured_Page.ppt
deleted file mode 100644
index 4555025..0000000
--- a/trunk/test-data/slideshow/Single_Coloured_Page.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt b/trunk/test-data/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
deleted file mode 100644
index a177642..0000000
--- a/trunk/test-data/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/WithComments.ppt b/trunk/test-data/slideshow/WithComments.ppt
deleted file mode 100644
index 2b5f864..0000000
--- a/trunk/test-data/slideshow/WithComments.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/WithLinks.ppt b/trunk/test-data/slideshow/WithLinks.ppt
deleted file mode 100644
index 80d2e6d..0000000
--- a/trunk/test-data/slideshow/WithLinks.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/WithMacros.ppt b/trunk/test-data/slideshow/WithMacros.ppt
deleted file mode 100644
index 1c72231..0000000
--- a/trunk/test-data/slideshow/WithMacros.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/WithMaster.ppt b/trunk/test-data/slideshow/WithMaster.ppt
deleted file mode 100644
index 84a6d04..0000000
--- a/trunk/test-data/slideshow/WithMaster.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/WithMaster.pptx b/trunk/test-data/slideshow/WithMaster.pptx
deleted file mode 100644
index a746e10..0000000
--- a/trunk/test-data/slideshow/WithMaster.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/aascu.org_workarea_downloadasset.aspx_id=5864.pptx b/trunk/test-data/slideshow/aascu.org_workarea_downloadasset.aspx_id=5864.pptx
deleted file mode 100644
index 05c30aa..0000000
--- a/trunk/test-data/slideshow/aascu.org_workarea_downloadasset.aspx_id=5864.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx b/trunk/test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx
deleted file mode 100644
index ca9d791..0000000
--- a/trunk/test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/alterman_security.ppt b/trunk/test-data/slideshow/alterman_security.ppt
deleted file mode 100644
index 72c2261..0000000
--- a/trunk/test-data/slideshow/alterman_security.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/alterman_security.pptx b/trunk/test-data/slideshow/alterman_security.pptx
deleted file mode 100644
index e9869b9..0000000
--- a/trunk/test-data/slideshow/alterman_security.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/at.ecodesign.www_downloads_Vertiefungsvortrag_elektronik.pptx b/trunk/test-data/slideshow/at.ecodesign.www_downloads_Vertiefungsvortrag_elektronik.pptx
deleted file mode 100644
index 0578862..0000000
--- a/trunk/test-data/slideshow/at.ecodesign.www_downloads_Vertiefungsvortrag_elektronik.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/au.asn.aes.www_conferences_2011_presentations_Fri_20Room4Level4_20930_20Maloney.pptx b/trunk/test-data/slideshow/au.asn.aes.www_conferences_2011_presentations_Fri_20Room4Level4_20930_20Maloney.pptx
deleted file mode 100644
index e287ffe..0000000
--- a/trunk/test-data/slideshow/au.asn.aes.www_conferences_2011_presentations_Fri_20Room4Level4_20930_20Maloney.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/backgrounds.ppt b/trunk/test-data/slideshow/backgrounds.ppt
deleted file mode 100644
index 591efaf..0000000
--- a/trunk/test-data/slideshow/backgrounds.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/backgrounds.pptx b/trunk/test-data/slideshow/backgrounds.pptx
deleted file mode 100644
index 1ce0557..0000000
--- a/trunk/test-data/slideshow/backgrounds.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/badzip.ppt b/trunk/test-data/slideshow/badzip.ppt
deleted file mode 100644
index c8ff00e..0000000
--- a/trunk/test-data/slideshow/badzip.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/basic_test_ppt_file.ppt b/trunk/test-data/slideshow/basic_test_ppt_file.ppt
deleted file mode 100644
index af16393..0000000
--- a/trunk/test-data/slideshow/basic_test_ppt_file.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt b/trunk/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt
deleted file mode 100644
index ead1b49..0000000
--- a/trunk/test-data/slideshow/br.com.diversas.palestras_Nelson_20-_20Temas_20Diversos_20XXXVI_pmrg_462538ba7a204-programa_alianca_12-04-2007.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/br.com.tvcamboriu.www_pps_Pensar_5b1_5d.ppt b/trunk/test-data/slideshow/br.com.tvcamboriu.www_pps_Pensar_5b1_5d.ppt
deleted file mode 100644
index b3f01ed..0000000
--- a/trunk/test-data/slideshow/br.com.tvcamboriu.www_pps_Pensar_5b1_5d.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug-41015.ppt b/trunk/test-data/slideshow/bug-41015.ppt
deleted file mode 100644
index b804a60..0000000
--- a/trunk/test-data/slideshow/bug-41015.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug45088.ppt b/trunk/test-data/slideshow/bug45088.ppt
deleted file mode 100644
index e4be0f3..0000000
--- a/trunk/test-data/slideshow/bug45088.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug45124.ppt b/trunk/test-data/slideshow/bug45124.ppt
deleted file mode 100644
index 2fd87b1..0000000
--- a/trunk/test-data/slideshow/bug45124.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug45908.ppt b/trunk/test-data/slideshow/bug45908.ppt
deleted file mode 100644
index 2bd1b1d..0000000
--- a/trunk/test-data/slideshow/bug45908.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug46441.ppt b/trunk/test-data/slideshow/bug46441.ppt
deleted file mode 100644
index a7a019c..0000000
--- a/trunk/test-data/slideshow/bug46441.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug47261.ppt b/trunk/test-data/slideshow/bug47261.ppt
deleted file mode 100644
index cece730..0000000
--- a/trunk/test-data/slideshow/bug47261.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug52297.ppt b/trunk/test-data/slideshow/bug52297.ppt
deleted file mode 100644
index 79fd609..0000000
--- a/trunk/test-data/slideshow/bug52297.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug53192.ppt b/trunk/test-data/slideshow/bug53192.ppt
deleted file mode 100644
index 54797b5..0000000
--- a/trunk/test-data/slideshow/bug53192.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug54570.pptx b/trunk/test-data/slideshow/bug54570.pptx
deleted file mode 100644
index a5547e9..0000000
--- a/trunk/test-data/slideshow/bug54570.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug55030.ppt b/trunk/test-data/slideshow/bug55030.ppt
deleted file mode 100644
index 1f2f22b..0000000
--- a/trunk/test-data/slideshow/bug55030.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug55732.ppt b/trunk/test-data/slideshow/bug55732.ppt
deleted file mode 100644
index c0f84ac..0000000
--- a/trunk/test-data/slideshow/bug55732.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug55902-mixedChars.png b/trunk/test-data/slideshow/bug55902-mixedChars.png
deleted file mode 100644
index 4b17565..0000000
--- a/trunk/test-data/slideshow/bug55902-mixedChars.png
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug55902-mixedFontChineseCharacters.ppt b/trunk/test-data/slideshow/bug55902-mixedFontChineseCharacters.ppt
deleted file mode 100644
index 4524e36..0000000
--- a/trunk/test-data/slideshow/bug55902-mixedFontChineseCharacters.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug56240.ppt b/trunk/test-data/slideshow/bug56240.ppt
deleted file mode 100644
index 908f2cc..0000000
--- a/trunk/test-data/slideshow/bug56240.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug57820-initTableNullRefrenceException.ppt b/trunk/test-data/slideshow/bug57820-initTableNullRefrenceException.ppt
deleted file mode 100644
index e7525f9..0000000
--- a/trunk/test-data/slideshow/bug57820-initTableNullRefrenceException.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58144-headers-footers-2003.ppt b/trunk/test-data/slideshow/bug58144-headers-footers-2003.ppt
deleted file mode 100644
index 78915e8..0000000
--- a/trunk/test-data/slideshow/bug58144-headers-footers-2003.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58144-headers-footers-2007.ppt b/trunk/test-data/slideshow/bug58144-headers-footers-2007.ppt
deleted file mode 100644
index 2c22eaa..0000000
--- a/trunk/test-data/slideshow/bug58144-headers-footers-2007.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58144-headers-footers-2007.pptx b/trunk/test-data/slideshow/bug58144-headers-footers-2007.pptx
deleted file mode 100644
index 461f0c5..0000000
--- a/trunk/test-data/slideshow/bug58144-headers-footers-2007.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58159_headers-and-footers.ppt b/trunk/test-data/slideshow/bug58159_headers-and-footers.ppt
deleted file mode 100644
index 2bc6b70..0000000
--- a/trunk/test-data/slideshow/bug58159_headers-and-footers.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58516.ppt b/trunk/test-data/slideshow/bug58516.ppt
deleted file mode 100644
index b1cb7cd..0000000
--- a/trunk/test-data/slideshow/bug58516.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58718_008495.ppt b/trunk/test-data/slideshow/bug58718_008495.ppt
deleted file mode 100644
index 9d9009a..0000000
--- a/trunk/test-data/slideshow/bug58718_008495.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58718_008524.ppt b/trunk/test-data/slideshow/bug58718_008524.ppt
deleted file mode 100644
index 96eddb7..0000000
--- a/trunk/test-data/slideshow/bug58718_008524.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58718_008558.ppt b/trunk/test-data/slideshow/bug58718_008558.ppt
deleted file mode 100644
index c8a6d52..0000000
--- a/trunk/test-data/slideshow/bug58718_008558.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58718_349008.ppt b/trunk/test-data/slideshow/bug58718_349008.ppt
deleted file mode 100644
index 41d9759..0000000
--- a/trunk/test-data/slideshow/bug58718_349008.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug58733_671884.ppt b/trunk/test-data/slideshow/bug58733_671884.ppt
deleted file mode 100644
index 08c46e0..0000000
--- a/trunk/test-data/slideshow/bug58733_671884.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug59273.potx b/trunk/test-data/slideshow/bug59273.potx
deleted file mode 100644
index 72815da..0000000
--- a/trunk/test-data/slideshow/bug59273.potx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug60345_Jankovic_final_Retreat_2002.ppt b/trunk/test-data/slideshow/bug60345_Jankovic_final_Retreat_2002.ppt
deleted file mode 100644
index 5bb52fc..0000000
--- a/trunk/test-data/slideshow/bug60345_Jankovic_final_Retreat_2002.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug60345_paperfigures.ppt b/trunk/test-data/slideshow/bug60345_paperfigures.ppt
deleted file mode 100644
index 6a04556..0000000
--- a/trunk/test-data/slideshow/bug60345_paperfigures.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bug60345_suba.ppt b/trunk/test-data/slideshow/bug60345_suba.ppt
deleted file mode 100644
index 9ffea08..0000000
--- a/trunk/test-data/slideshow/bug60345_suba.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/bullets.ppt b/trunk/test-data/slideshow/bullets.ppt
deleted file mode 100644
index be2f8bb..0000000
--- a/trunk/test-data/slideshow/bullets.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/clock.dib b/trunk/test-data/slideshow/clock.dib
deleted file mode 100644
index e9c6e72..0000000
--- a/trunk/test-data/slideshow/clock.dib
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/clock.jpg b/trunk/test-data/slideshow/clock.jpg
deleted file mode 100644
index 5f05e42..0000000
--- a/trunk/test-data/slideshow/clock.jpg
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/cow.pict b/trunk/test-data/slideshow/cow.pict
deleted file mode 100644
index 71b81d2..0000000
--- a/trunk/test-data/slideshow/cow.pict
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/cryptoapi-proc2356.ppt b/trunk/test-data/slideshow/cryptoapi-proc2356.ppt
deleted file mode 100644
index bccc45d..0000000
--- a/trunk/test-data/slideshow/cryptoapi-proc2356.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/empty.ppt b/trunk/test-data/slideshow/empty.ppt
deleted file mode 100644
index 20d2398..0000000
--- a/trunk/test-data/slideshow/empty.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/empty_textbox.ppt b/trunk/test-data/slideshow/empty_textbox.ppt
deleted file mode 100644
index 403b286..0000000
--- a/trunk/test-data/slideshow/empty_textbox.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/headers_footers.ppt b/trunk/test-data/slideshow/headers_footers.ppt
deleted file mode 100644
index 891d73f..0000000
--- a/trunk/test-data/slideshow/headers_footers.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/headers_footers_2007.ppt b/trunk/test-data/slideshow/headers_footers_2007.ppt
deleted file mode 100644
index 51b2c53..0000000
--- a/trunk/test-data/slideshow/headers_footers_2007.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/iisd_report.ppt b/trunk/test-data/slideshow/iisd_report.ppt
deleted file mode 100644
index 976fa94..0000000
--- a/trunk/test-data/slideshow/iisd_report.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/incorrect_slide_order.ppt b/trunk/test-data/slideshow/incorrect_slide_order.ppt
deleted file mode 100644
index 6aead5d..0000000
--- a/trunk/test-data/slideshow/incorrect_slide_order.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/layouts.pptx b/trunk/test-data/slideshow/layouts.pptx
deleted file mode 100644
index 9087579..0000000
--- a/trunk/test-data/slideshow/layouts.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/master_text.ppt b/trunk/test-data/slideshow/master_text.ppt
deleted file mode 100644
index cdcf4bc..0000000
--- a/trunk/test-data/slideshow/master_text.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/missing_core_records.ppt b/trunk/test-data/slideshow/missing_core_records.ppt
deleted file mode 100644
index 67325eb..0000000
--- a/trunk/test-data/slideshow/missing_core_records.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/next_test_ppt_file.ppt b/trunk/test-data/slideshow/next_test_ppt_file.ppt
deleted file mode 100644
index 69b2c47..0000000
--- a/trunk/test-data/slideshow/next_test_ppt_file.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/numbers.ppt b/trunk/test-data/slideshow/numbers.ppt
deleted file mode 100644
index 970c3d7..0000000
--- a/trunk/test-data/slideshow/numbers.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/numbers2.ppt b/trunk/test-data/slideshow/numbers2.ppt
deleted file mode 100644
index 839cadd..0000000
--- a/trunk/test-data/slideshow/numbers2.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/numbers3.ppt b/trunk/test-data/slideshow/numbers3.ppt
deleted file mode 100644
index d76df10..0000000
--- a/trunk/test-data/slideshow/numbers3.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/ole2-embedding-2003.ppt b/trunk/test-data/slideshow/ole2-embedding-2003.ppt
deleted file mode 100644
index 506888f..0000000
--- a/trunk/test-data/slideshow/ole2-embedding-2003.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/painting.png b/trunk/test-data/slideshow/painting.png
deleted file mode 100644
index 28f1233..0000000
--- a/trunk/test-data/slideshow/painting.png
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/pictures.ppt b/trunk/test-data/slideshow/pictures.ppt
deleted file mode 100644
index 9f6ce6d..0000000
--- a/trunk/test-data/slideshow/pictures.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/pie-chart.pptx b/trunk/test-data/slideshow/pie-chart.pptx
deleted file mode 100644
index 33d28e1..0000000
--- a/trunk/test-data/slideshow/pie-chart.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/ppt_with_embeded.ppt b/trunk/test-data/slideshow/ppt_with_embeded.ppt
deleted file mode 100644
index 588dcef..0000000
--- a/trunk/test-data/slideshow/ppt_with_embeded.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/ppt_with_png.ppt b/trunk/test-data/slideshow/ppt_with_png.ppt
deleted file mode 100644
index 0e0ac67..0000000
--- a/trunk/test-data/slideshow/ppt_with_png.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/pptx2svg.pptx b/trunk/test-data/slideshow/pptx2svg.pptx
deleted file mode 100644
index 2f9a351..0000000
--- a/trunk/test-data/slideshow/pptx2svg.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/pptx2svg.svg b/trunk/test-data/slideshow/pptx2svg.svg
deleted file mode 100644
index 9ea3636..0000000
--- a/trunk/test-data/slideshow/pptx2svg.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'Dialog'" width="720" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-interpolation="auto" color-rendering="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="540" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">
-<!--Generated by the Batik Graphics2D SVG Generator-->
-<defs id="genericDefs"/>
-<g>
-<defs id="defs1">
-<pattern x="0" y="0" width="128" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern1" height="128" preserveAspectRatio="xMidYMid meet" xlink:show="other">
-<image x="0" y="0" width="128" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAIAAABMXPacAAAgAElEQVR42nW92Y4l&#10;SZIlprbb3dw9lqyaZjfJf+MT+UQQBAhi3gjwL8kB56FnKrMyIny5m+3Gs6ip3yqC&#10;XtnRvtg1U9NF5IjIEZHs//q1VlVY13C/j33f5/pa1xX/juO43+93O3wTliXgx7e3&#10;t69PL/jTNE34Ed80TeMfT6fq589rURT7fXu/98MwlGUZ8oy3K4t5nnF9CAHX4/fL&#10;suDHLONf8S9+v+gLz22btu9nj6Rtqrou8sDhzbMumEfcKqwLPoVncZDTxN+EUNe1&#10;B4NH4+O4AD+2beW3w/h1Fb/mee30hYt3ux2u8KPxp8OhnKbw48crfnM8HkNRLCtG&#10;iQd5DKufhZvjEZicpgnv793lcvny5UtZFn/7r3/767evYVl3uxa3PF8vuHnVNPf7&#10;HffHt0VV4g79OOD++BFjLvHhtm0xFPwq01fgC6+nU3O7FfgRA5qmBS+LoS7LEx6M&#10;T+J6frgs6zrXgKrLZbrhA5oUfJ2wIFW49zOmI+RZujOegt9g9vHxxwXwBVqF4OXH&#10;l+4Wcn4q4FO5rsZfp23xMABchOX34HWfwIUPYb+v9SLYN59zhy9MWllmeOVMt8I1&#10;vb4OhwN+xIN8B49hxrOmOcuDL/Y6eahfv+67jjfHrXwfDBXLgMmZhhGvOOmrbf2o&#10;vfefx+Ddgy98U/rF8DH8wCXSb3FR2+KdtVz9imtwG2wvjP7t1vkyPTL35sLd8UsP&#10;BU/F7/f7Chdcr1efAM8mXsBHAS/MudNR865c9YVvMJl+ec8+pmNd+Ag/tMj4/j4B&#10;2OD7fTnNGCd3vScIH9KiYHMEbZ3Vy5O+8Fy/ZZo4HAXPjo41/sZn+e1wkPHosM5e&#10;AA8Md8DHdzvs/R43xBnC7Xygdb6zdS68sdYM5xKbldsO32Ath2nETdLs4/uy1Sn1&#10;CZBI4dzOc47l9VthKJY2mGG8D3au5gJih4LCq4orv359wZH0xTPlBXcEvvGZ8K70&#10;CfD1eFtvBG+otL/yLP7Gq4tJXChj5uOxxj2XiePx4mmjhHzbnrjGo9Vfw/k8+vd4&#10;kF/Ew4A0mOfaGw6TlfMAt14bX4kXTOcSvynKeg1ZOqYYMD6KBbJAS8/1ay588UKS&#10;DZsg7wYsFaYRS/X+7duX7aDkFKwFRAvlMLbqHlPqicPz1tVnMFwuGMygUeIuBT48&#10;jgs2CxYZI8R9/ex0/G+3TnKt8PaRuA8vLy/40TOSbV+P6+G3SiIofZ9rYvA6WM1B&#10;X97ROFIYg+UAfvn2duaqPEwf9oR2wGqxq91S+UzjX0yuV3rUFyYRD8TfsYu9M/zl&#10;mUp7Ih3Q7YsyDXsPQuF43FtaHg7V4cCRbAPgCmE6cbQwb96RHraOYCYJwgUutd+5&#10;2fFiPhrYQxKaHEfJL2z2Ks2X7sJ9Z0G5bdXVE4dpwi7B6cGxxkpbN+YFZYiXysrD&#10;a5AUaVI8XOZhTYuhGVge7hy8g3Bq8XG86kQNHJJcTicM32BOcbb1KYjZ0o9OqMEL&#10;pmNRby/1D4oK/3psXLk8e1wDXQCZM0loF5LSfRI109BDCfv6W3fHMJpdC43oe25z&#10;mGYyK70+lhteEytDi2xtc55iLQ3nrr9DCe/xYtjoGAAGTJm88tBcr1A+PByGItzC&#10;K7BEs/B4TRglboi5q/WFx3nqt/nHTTDj+G5OU6HFhUzK9c5c9ZqHt9D846+NXwO/&#10;8aKmlxSIwCO4Tz0Sq5D00DTL2BU+H9qYlaWxJ9q3HcY5bTJt5MU7CT9iy/q53vVP&#10;T09Y3csd0CUqPO8GTAjOipQlToE2YlitRCkefDvvLK+5n4RbW4+nJwFfQhpdKb6p&#10;kAvta/8nWZS9vr7ijhY7+FTTVKvOii+wIPYM4rNYrXRuHk/AJpf4X843D0VGbXy5&#10;BIsR7Q+Ko03c47OZB+8J8jV4BGTV+XzGKxjwJUHkpUrP8peEO05M4d2gCaG4AAzN&#10;C6wKHrp6a3qch0MNeSj8fey6Ct8DR33/Vpxf16Ztnp4kRdaDzjFGi/nEkuQrZfaU&#10;LbNECzBkVfyP/8t/tPrGYbFgxR+wljjfXgxp8FqvxyV9Oh6wnQcKCogmvCF1BYaO&#10;EXgT4crTqTwccH243jr8u9tjC5eYC7zVt28v0A0fH3cvbdKf+MLrHw7Zfodzll0u&#10;I+AA8M/r6xt2DRQMbo7fYMDWXZhhSFLsv/f3K+bEghX3837XCeOUHQ44cM0G0mqg&#10;Qz/rH4Ev9x/GjEXEVr7d4tjwvrjocr3lBaQlrSKDKM8STtjhsMPvoGwgYaBKgcKB&#10;i/77//bLMhd4wXFc2x0gTQlEynl7gtTK+oGwpaRaLL3t+J2tqgRX8Gy8hQGM/+q3&#10;kvqtu27wCyQlgV+2Le5e+xjhvtA8goDBY73fSwsxqXq8LXerEZQAAyW1sCy2OQ4t&#10;zTocpnV9aeooFqztIa8hpWyI6XRjT3FUPkLSjauXEw8FYh6GWWITc2fdG6zbs4ev&#10;JLIwHLyQZ8RDTZJKmibid58SydhPUJeAUMOF59Exai8qvtS8FpqH4J2hw5WlIxgX&#10;wODdD9YCjNbXuFdSPhK+4e0y+Qhj5XENlUxDEeFp8onBzTQjXB5Phyyj/Wbx5kYj&#10;mxIOXgBchXse9gceVYKuEfLAhhuOF+zSXFbZus20cYUlDw6l95TNbImU4JfiuYHq&#10;ksZO9qYV8iPUwd73khih+ZWXEM06H5TN+gk6ECutEn08wUUgyo+PEUpYusS7avXr&#10;326cDeAC/lLCJO5gb2dv/6SaLJSENaN83PBosBw3kvOf8C8e4U2Nl5ShUEoVZxTg&#10;WYuJ0k6vdW68EfBijVWrDL3MEELWBv5kcBzxySaR46RxqFmh6Q70Tej9fZnluC8W&#10;bKUkadt9Mg9pplp7PIA6fyUE/PhX7zAIf89+Mj68ZkllGrnorIbre18V5WZGhCS4&#10;MDk2v6yNbZfwBNiEs5Q3FtJrlDKjgvGyZ18nI/OC4QKcMn1DrYUVbdv8dosmsWbf&#10;pw/vD3tk1fioV33ScZpvtx6HR5+dDUI8QZfLvN8XdhmtyyTn0s74GJeUXADqXdzN&#10;7p2kwL1+2+zHFRVGbD0LnlCbBY82h/UQ3ihNzSM6wOPCYhxcGHdg/H4WfkzyajO0&#10;6ZkACnoEzTUlR2G7BMcPc2yBH4+s18fIBCBtM/YAIaJp4zO7QdXc3+BkQ8rZIMBo&#10;veO8AYXMOPtd12PvQ0Fs2Jx7Wn9aAIF+/vz59etX6DG/gOEHHqVFhWTn9of2mjcX&#10;Gi7gIyTrMSfeH1w5GXobppz8OvpNeMSO1XYZVnaD4RH7etk26PXPJ2Bd5A6i1OIA&#10;tP2zTZeEzTNRWJ7grflQfkTyZ+YcZoSkxYNtP6UNRxGURqnpo8TQQQve+EkBJqeC&#10;fyNnEczjoAXi8YRGsPmz2xVysBAaV00tbTzZ95DndB9i+YBrLVuxphYO3jKQJXLx&#10;RdvCj7NLw1O2+t/Vp5NmZ755pYwLNm8Pd4BfMiFuYV/g6da+ueRZs2CB2vPFEreG&#10;15hJnIwC+0Bastxck9PmVsk9RYbstsAxKXJIyJBal+Tl/XRtbUafLbhPJSwvAg/4&#10;hu6xWRq8vpHW5inCTQ7WKtCHyxhg7C3TDGNv7On1PLWHug1DF4ZpzClA61HQYhq9&#10;l7kA2BMYxPfv3zEmrAQUbFPV+7aCwYwRDkBqVd3L8qCruKieTqHMd4A0YSlwL7xN&#10;joMC2YVLhy6XmyR50TUjJcHCW7AlZcNwt4tOQxgx3lKex2T9YCTG0HSiR/2JZ6z4&#10;4DDlM9ZgHmA/4b1m2MAFhCHmt8RKQeA3NV3WywxBN7V1BZSmYeQLLZl1mAEHeVlR&#10;+tCEAjINyzTN3e1a2ubCo7Vt1wQSdLIAtubL5YKxbj4/Qqi8LHAiPvDrYcSAIPKw&#10;n8q6wp92h9CP4c8f77vD/riv/vz5sT8+rVlR7/YYSjcs8zvl+PfvX/Dv29sN8uz7&#10;1y8Y5uuvV2wUhh9aOrifT+04cZfiGPz+t+5y/vj27ds8DdxMmBVZXgCp7e5LURWX&#10;6ygbu9ZOpOrD7CfVZ4GL7WQfBl7HCs/KM51OoWd6wwC3ICop6IpwqGDlYvmzCqKy&#10;zJcZQqbnMACB2ra/33Dqh3G8X84Y0AGj31dTPz1/Ke932DoX/Hw4VNktyFdRz8Os&#10;YVc4BtPITXw6HjhEm0GPjjBhuEy+sDF5UTziSiEFm5fY+OVcRTEtu3GkiAx12+BT&#10;MMK4jCXtDpngPLx9j30DwQKwL2CT4e3olYQdXwRArxwbHeBpxb+0PENWBIx42e+n&#10;fsjkiwYK3xQyj8yli4rKXiw7TqKfS1oumZP+3n5/C6XkhMBMCYn2vhIvI3eb0EFT&#10;z9Oos0IX5q4F6M6Sb9XKOYoETOu0YFD3Lkzz9PTMiA6jIUV4foG13POVMBEL5og+&#10;Xuvk8vv3Z8PB5DrXH3IL+jT7HquOS2nbJDk1rZblIIvmyW7XXmEEd93+eMSdyyrI&#10;nUNQzFfKaVjiPO73rWVBVLQrZPTc7ivs8GHC0OWVygIQTQ1hqLfFkhTCPNAdQ09L&#10;YFrD5iBbpAjXB6dhZgVghIrpwzTiNl03JVDvBTA8T64Xa2ID/DXP7MWi27pthA+j&#10;AbHhojJ5mfjZPDMsPh7xqHDTtsM5wDnMH76SBsLi2xuKf7NHdAzD2jEvg4dtYZYE&#10;FWwKJEjrc3O/c9aAI89n+q6fXp67DrKOWM7wefssTQFcP2Y4rR0eaJjbjWOTAaqH&#10;vpu6ftCZo6UNAUphZMcf9Vg2TwJmy8w4ZNPYpMSexhmWHRc2K1IOrxI4O/qHtQzJ&#10;j5Rv9gEMpWWzPfNk/WBX9dOYsPjmLfZmirIhAa2omfVB3FawE4s3yhdQJ9PXejvh&#10;rvLt7dOt701tI+DHDxoOEP3a1xNm07vG0Nunz8LHkSn83U5sbZDi0bU79XOIz14t&#10;aglkw87wz8oG5gLerBprXIdNTS0V8nmZ+xGiqqjz+uP9jJHQZ8XDIHcK5NAaEoT1&#10;f8lFiMWQHTRphKXDCdjLxyPd1BljVYYxe/pbi5DgOD5oiOUPLg8RSs+yd65dKQmt&#10;pq0NJfH0RJv/4+Oj7xtDcxtYAlFTinbY4GB0zeg7mSc+HH6q0Gf+GEjxpHun+FOH&#10;Q3ncY+9DQUXnGpS5F2/i5i+WT4dr0KamN+n5tLNTx/KN6wfBCdgH5DrTXQQNk9Nm&#10;G6ELoBag+uWXhsKnhgj0Wwc5CygKbGMrNhCEtbnTHcxJljwWQMjPvgQf+niauy56&#10;sewimygAB80ddgbE7MG+rLTn7HZMJrrgViUMGX79oP/ZQgmfkkOhMAx9dPcmP1IJ&#10;mGUcZt3l3+Lfl5cXoE95XBt7xOzbSbHsBLEBja73IIfE4MdAfImR0F5uNxw4RYX9&#10;+DkZSpgFSCfYurgSzzyfz2PXAy4VbT5iGSAV6iKbi7HHHOd46cNpzw1OMU4YBFwI&#10;NQYhVJdxGFvst/RIfF49ZTi+EOCYYeyJvp8wp5hGoBT8KUV07cGHQDJJYnPMBOiq&#10;mj7BUms2pUiqF8wGrdwncV3l7QiOfOB7j8Tx5+QvsR8F08wFgLDegpFrMqzx9fwM&#10;gJRjXnARIEpacLyUfaWeROwyWDfSMwdDI9sXhGT78PbBSWmIEAsRFHhEyDWpC5nK&#10;Hfb08djID1wDBVW7w99/npecQL6oKSgUEsdIK7xULu8ST4Gg/cqpLuZ+sDC1ivJR&#10;w7+EAHIoYQq8GYERrZwgfPAKRp+4Bi+NGTBXw7akQ0a+ra2uzQkxm8OAWcLW9FRK&#10;A1XScNF4somOO+PjP3/+wmwAQ2NTWnY5hoOzZblV/M//+/+Rxm1zznsH4k/Rw9pe&#10;6LbNFMnMfv36wG+en8llkaycfCTtW//jjz8UTniSfx8DbL5+rf/+9/fL+frlC6aj&#10;+PHjdRz6337bA/Pgxq+/3rBx8RawuYD9f71d62bfjzYMgT8xrRRbVFxUANj4lM54&#10;muLDPHc34noohNy+B+xW++6fn5/wvdzR+CuP7/3eXy7Dy0tz13lt212Ced6kimK2&#10;kieZHF0MrE4zZiYTlaiHSPAJSLrUsyljYrS/oCrplPSq40/HI8yDw+Y7KsQSYlBd&#10;vgZa8mUSLKY+pMP14wftiNOJ63m79RBF+DA2BwG7wsiO9iU/tlHT6XR6fj4ppj8p&#10;Hj3+7W/D8/Mzhvzz5xVbkwSmPPztbxecg2/f6n/5l7/IQzddLt3X5+PT8XQdGEqD&#10;zQIzZ6ZDWu/ZZHVh/w80FAMDNFZhSU5jGvlm369+I2v4NWppmsfAEzr4cUdjkI4l&#10;yA0XUZ+DwDgfthLw4+1+E7cHc93are3N+vXr84ZWgxGQPLWhu/Xe5sk1srnXKmv7&#10;DfQvXiHSNOydx2vgX+yCxFXSW+0MN+0Lwiefnuy4Z5zSs5+0t8XUFl2BZVALAFy/&#10;fD2UZGfg4dnphMMM+Tti+qap9jsIqGEczUCtmx92bdYGj6etDS6JimjBzJASC5Yw&#10;r0JV0FTMSZCZ7D83OowctMK4c0mhtwRUpBuJixyqxZX+qz4FeLNaFm2eiTJJecxh&#10;Xe+8qHhaZM0sMVYqPpIpQIDvmKvV86YbAJKEkoYjMR6OYOI+lSnQ+hDyXxRR2mMN&#10;LOmwKrDqHB4wE+uRN+CldsAEhv7HR+bfYBPs6FU9ns8DluLLlxbTfb0C1/S8OOBV&#10;w9vrq+RtpfsXl/f3kNfPx/q4w6pQsNZyOwNWDQqAYJjQw6VcsLumxsWWy95oHrnn&#10;zorqwbaKTje/JvSw3eMh8h5nzVr2yPbwzvOuohYPjxELCgBPRSLmyJccPPte1OQE&#10;tS4xC0bgeNnci2vpkNZKL97ebtsU+TTWxL/SS9EHebkEcYcyn98UsdvvG7vt/P62&#10;y/wMaPKa4usJP1Krjz2E0m5fyZk6yFNGssSuDudbC51SMY5D45kAyFBPVlfd7Iqs&#10;XhfoZMqiMs/aQ3nvCr+/lbBfLGm15Hb3LOC/X7/edFB2UiTRHE0WpQfsvelzWcox&#10;nmB7gkApRJNkgNfDe9+ILMFNHMvLpffwfHNPnfwCtB2idk4MJ/spIe5PJ44bs3q9&#10;2jtNw9WncqMWxcdDX1kbG0VIEdmjMEAx4GpoBQyS2GjhX3ECoHhNS4X8pafs6+H5&#10;eOwGzu/5EkZbwnUBaYH/MMetXNkjFCPU9IwdngEJ5Zvo2+LG0W0F6z9xch+N9hSI&#10;B/LcqEG558VA3FOh0EXDe264eWOnjdZ8iV2b4rj+7L6tEvUvgfW0U/04CzdfUJrM&#10;hZ+PRyj+/CrPos0HK2ubhZtvK1l95r3OiXFm/uiRXxSstxsGsQ5ay+Oxxll/f79j&#10;AZ6f92Vevr/zoSJOlVrFUS9GIFs3MKr7oZ8o6LHRRvyPUhUvmkPmYln7O42SZcrW&#10;6J4ke5DRuiGNfIsJ0yLb+FsxsINBep0e46+PzCJTV9cVP4rrGUzltP7EuzeJHf0Y&#10;0XzgXVWPZIYtbN4kwZB8JDESVRV5v8xQZfuWenwayqXIT8eCFKBr+POPi9E97XdF&#10;HwHtyoJcHJJTOrzzJO9AscKma7Ii21UFA9DAMLsGGpSRqaGfjc7xVBhfuA3R2F5k&#10;CClMDBGvkJXhfhkAy+WowFk5ynFGfKcwcnkfcOfbMPoI1pIIYRjnluubQ65iZqD4&#10;ASKhRF8/sDuwsBN5FnnRUMo1DtSEIc9KLF9Y7C7B7JY0XmFrQ8ffhx47AGcdpiR3&#10;z66ducxTr/vjU7n8S3aUFZE0lqKYq7QIpHdtA9Cru99zZzeQspXsxF5kfYny8uP1&#10;x/fv33e7vLvT8fByInkYr/xf/v2nz8u+gSnAgAHXeV4+3t/k5t4fD+WuLc3nZtAD&#10;Fi+pVOGP33/hBfARRnRzrIqswXHGIkHWYyso3EF39PmKI4S/0KuJSXh968xKMuGh&#10;n4ZxyRkAMY1HGH93epouKz73RNBewCzYPwFlhz/++IF9djgcMRV1Eyag5AGHL2va&#10;PeaH8a917QcMP//9978DKB+OlFvL2gD+3j4u2Ebzkh0ObVHmwLxVvQP+pqa94+Be&#10;X54O+7a8XjNYHlkRWhxSiQdg/a6/UiRsOL4f7rT3SEqgaRNJGKHo7ti4zeXjAit8&#10;v2/XeW2q5tDK13vc7wbOvSjb63J+v5ux9Zfv33xylRYxdRR9sBXn425f5MVw72/n&#10;ybEEOyoMQ/k8BooA20tKR8bzJLUiKsBWMq9tPhyKeH00DsOaTflSPPrAZUOVBvKw&#10;RZZRGlJ7/96PPSOAS1W2RRV2ioaUFSHyrcPS9i9fd8DKODGJdohFHaYZG6eo6hEI&#10;daGKYkgYJzoU4zy9n68C7NS6H5deAVuuCJ1OhAbYyHvJLgazBlro8yPFKC/CJlHp&#10;1VoEFjcGOOBc3RW4Z0aiyp1mWnetSb2Boj2fb30/Hg6Uerdbh+8xqI14wztsgrIy&#10;OyRRzD37kPqwcc7nzrOGUeL3chJz8F0/P+IBiN8tyFw8/p4eZkfPWzxl3QgNa1oP&#10;7HirytPpIDILQ104cVROdXQu2f6wYmR6yD0yUyyU8ScjC7kLl4RqrMMfmE5837c3&#10;3j9vSHEYALos3SnDg2hnk6kSeZGntBHssbyscHykz/rELq1K6g9yBGlLrTwth70N&#10;t7znZqdeMkhIJlzCc5ttnPiz4XYfErwz1Rm4pq0xrNbGJwDq5nqF1ZClQIIF2oMn&#10;6zPtJEXVfVv87jGrwoSDp6fdNDmSFdnh8uWWjA4Hx9oi0hCGKT8+VichaYSNI/4P&#10;iRgRsyUalmlrNjb9J2+UsmjSRjETe1EwK0QuSPHIb8T3bWta7pD8256WhMEshOUx&#10;hUYsShzYqoGN3MScqUMru2PY7etE0SCY24wvCPc8j2wUk2TO5+W8vUOCBNFnUuQA&#10;79mcJ2y+hW4yueOx68vkX6yooGqbsok3KeEWhKzD5gbYJxpImruEajwVIvNeUnKD&#10;FZUP69D1ybCnhzuTIYlVHidsXnz4/fViKwc2OCTY08uBY5Hz0kCLYQlo5klkTvxB&#10;RAFR0uXszPgjdQotBd4W8IRsNoCYsS7rSlxxSENeDgOzFOvvIAttEkqr9cIL5FLC&#10;1Cniw5HVO5w8J3FYRplpZD/oI7eS80IsEQqaLIUPWbIbsdcx1QkgmhW42TR5yv7Y&#10;XPlTyotKjgfNdDYOiycX2xf7VRkc2Oyj1ZKdE9btsE+gWv/++yX5ZyydN38RhEFp&#10;moxEBw8HVqtqQ0ZWuTDxUnok0AV9Z77pnCwAxSg4p37TJKhhI9PZJ53scJtFK44v&#10;DzF00b0nxq8aCtnrnQtbVM3rjx8mM6UAABdcTjebEvprEPm9tjp9JOxFaVMT7axa&#10;rYyxxtnT6vj+o/G55U2uDD9mIZ0hT6IJ2PL0RvdW0+DOxY2nNqWTRF3lHwk21rht&#10;t8wXyhC+0RqxP/fvEhRiwA0xvBUbFiCHi7fS+yTGeOinmAABVcd5k1sQ76edR6Rf&#10;KyhAugbMEaw/DJcCUxOy6KrJZDcM8kHxVoNmoG4DpEnpgJnoAjC+i4+PC0b2/LxT&#10;3qXJoJ+uOyYjiL1tF4JlaIIBFgsbR0wpWnkNnVFygUy9+mTxRV9gJOUV2zJMiurk&#10;yWIENMQHYeQJm1fpBCjuQcrM1y/fZV50KfmibTFZreWnZqD1YsvBGCBnHknRm+OB&#10;G/Pj48O0FLn774YYiluQ8HM47EwukmUaHncJpptxwzzSBpPTX1RWxi/o3xTfmZtp&#10;CnZrh/DE6fv4OMtsw8usm7lIer6ePeG9PBE4dCasPR+fgS6UgZRD4Yj3O17IK18c&#10;gfOpxzNaYt7s5aXpRgISElK08S0TxPqqFPCzoyqSv6dlNW8OaF15lrRlIDqgfej7&#10;FBzCHX79+tDvTxh/xpBya1+mjHDnpRT2xCXHvaXNcOuSe+ARbkB24bbKk2geyfcf&#10;FwfDM0DY8UPOzpIvbtLGaX+g6gL66kcITjwFNgaXdmEoCRudDiVGesbnly/AmUFQ&#10;7evXp2FaL5fb+eePMiXTbFZybpnr6LzRm7lZ1nUHvSpd9vN6vcaE42/fXnDQfSyA&#10;u/D6fnO82o+fyjt6SChMmUAbMSTmB+p6mHPm4cbDlzKKSKFQBCNhKgslaJlhk2bb&#10;rOaWco9ZGJH+BKtkWR11iYA9WglF07xYzpg/cTgcnHM4LYZejNJwokfZAXNghuxE&#10;jgyuz+hXgAiSQUrqCw1Syt6ZKOBYk2f+ccaur9asWJUWiK252x1OT4dyfzj5/bkA&#10;m5OIQgkmvn22eQV7fp2suHK/SVo26Ss6u3OyGmqdaNLnt5QgJfqQjI4BFbDM7UJJ&#10;fmyztR7pXynHyK7vjYBfGSYkwZWY8RhhP0bEua470aTozMHaJOCb8izwJCZw4UxY&#10;tNLGnIkHBOpgQhOt9hxVRX8srLN1Ms+DpAByTrKJdF1spPrAEcJAwOzjDGTBMx5e&#10;X99LAKiyHicZqutS7/ZWk5YNIx0k5f5YlzDcmsC8n5KlBJZNg62JZ+EpSBFHvTlf&#10;6H65nM9nhx4Ph3IjnUeieUpyN3619bDFjD7Ttf9JZ1jQ4f5j1zu469C2ta5LD/i0&#10;KYzO02B38a7dbRnek/mdBgJpIbcDxNNRAXjMS1rdlC/mNIqiaKQJbvjN6cT4xzxQ&#10;pq8kJOFTDeYa04dp1qcyOmTHISx1kKN+omk+2xsIuJLXoiLg0VWJxVu7FdYxIHA3&#10;0PW55HYcBNgBI897Zeb0bGxXt03dEsB0tyll8QXyt5YvL8dp09vJCW6llN4nwXPc&#10;8O39olS93IL4Id8of0yOSOGqZAQk6yaxaNIWwfL5NKxZTKK3SzmJJshxWMqPJShi&#10;3gCWJ0CWT92ss1tWoRR+m+YyLyoF0egghLIJDPtYnY6BYLMfSSqehjHPVshJygjB&#10;IFIrGZRfJpkXtNitnEvG1Vdp3dtluN3uK+32JaWBiOW6QAl/KKGpSXw589RtN5pl&#10;txFJ8Gio30maqmXiPbOLl21mKQdT0uSWU2u9Oqe5ToYFHpqMw83OxGWzXYyJdGRR&#10;9pAzO9u948jf/rC/34Ziy3lLofB0h8TA9aNk0PUAACAASURBVCFY80L5IUtKAZJs&#10;xFb7zJb1GkPHGvUfDk2/BHt1FmWYZjETTSjrIdXJdl8Mw82rZE6NQd9v3bm7HU9P&#10;3PXzymoFelJvAwVKDNJumc169r3CRHcH6VEyu8zKYqo0xFZ3d2YSLousG6PSp6ej&#10;uTEqrbKl4BQsGiFfZPxKrItkraQ1kLjn5konYHPj5CIRLSmmmMqjHI/hfgvJVWAF&#10;5sx6H4ukMD4lUp6n87ZxSUy5LBJV6zE4YzumUAbDqtTzfF0261qpUpiUNdFPi/0e&#10;Y2iUYBky+tuxe/bVnn7W2ZqZpPf1k5j18nI0oczbQRH5oOhK7eAnJvR2m24K9kOa&#10;PZ3asQPKHMVpJSJ6f39/e3vzjzKP1xQOLOrs9z/eys2pmdxNQMnAkZ+SQdYA3zz4&#10;s0B0YVzm3GJ65baAboByO8BQh1lwr/tpbKuyzsNhXwunmDZaTGN9v/f3gd57R5tp&#10;4lLOyOGB8zdMm39iIb9+jHY4dt+oeahqTNZid15dhD9/XbiN2tqinDE4al0ogBnq&#10;mG62jH4aHA3l0BQXRY9X/mZZ7mL1yWl3udxxH10pOnBTtZk82+fLNW0cLSA9rpBO&#10;TQuFTi7Ry8vh+aVUkm94PpU/f1wOiiNKkQZlBZ/+8pevr69nKwa8NI6trKdwEYh2&#10;9BiyDv++vLzgT7cb45TQ5AC4VuYyRJf+fvv6dOR0D8qsd7wQSzCFHUQWBDFsIsFa&#10;HJRpnN9+QTNzQnHkL7BZlpzTVzUQhxDrhbgROPFhnQ6NYiFACnmWiLEKaEZHA6Aa&#10;dl7PrIwCi4FdcL6MXXd7hj1yIqx8f+swpv0O5ks9D9Pl4/zbb1+xSOcrJGw4vpB5&#10;9v4OXZK5UMC9Z10NWDALWSDdmuVYM8rzqqSHtYtpa+WWilZYQ+52HHRd7/7888Mm&#10;jEM3DlL/+ee92VLOE9FRcvYzWU6OSSxPYbsJE02K6xLr6tgj7Qgi7gm4nWSug3Z0&#10;dkKLQGlrn+529RZcpLD4ZNrQ0UTLC9aPKAjYreVg1C9tPQnbZGsG3ZgvSofAc5fJ&#10;iZKjUDWWi5Uw5gWnreuoEgO9c7mpAHld1WFPDDIT6ZEygfmpm7YhAXueAFq58Ulw&#10;DaEb5NCoCvrlMA9FWbd7zPWstKpKW9CyceyHxTmHTsx+pNPI5lpT5ZS9gjvSbFDo&#10;OLPl/XqpNj2TEhON9BzT93E2sLNSwrgtZw0QU8YzYxGSWikMWztTpwhGTSmV1/Se&#10;x6o2m1tbZWOGKMc/QwuBIdcdLe1M7h7mCtnvFpjVUaz0rIiFpooGUMn81KLEI+mb&#10;WdAuWw3AqG9X11oStIcKwPVK9CBTT1Vqlvsd4kiJLcOyxckZotjyszO5L2tTsB4Z&#10;WpFlnrz285ZD/P37dyOTVOADa1B9/frx/l4IMqUMDvu457nc/CqOeZmymPfDmip0&#10;Wfcmv3+iGjwUW2FKULElswHm45x4Re3+TOGEDXvICxSyeVmxizE13Of5RqWi/cQ0&#10;rWKtnVjABMYt92+RM2dghA67NFc4F7KH+1eAWxtlZbksntUt5/SBKM4UGsh4KHuc&#10;m/uVQma/r80xlZVeani93qsWXMxlsca8/vtdJRgM3VI1ty1LPyjPrTfrFi+LqSDT&#10;cV8afthFkRA9DsdDgMneBVlYrhlHO1FnmwqVrnz6A2paqpMolXwDmqPcpLCDGO0t&#10;ckVxPwsW3RSuihYiPfiYvBXTdx9G412K7pIUdtzI2IG2oSzznFkbjF8S1fSDQvoN&#10;5CA5J+T8lsrjHVQeotBmXzD1uXz8MR2odGyrOLTkimGct5v8VzQteB3fhSZu9VhW&#10;KHyGSYIZ4/Ncbbn2wVkXnyEhG6KbiQj9SV8j3hbWLj4QQ4DLQURJJr4m+x7/Xq9V&#10;ShrBy6W8Jcj+4xMM19pASxUNIn1cLqMlmcGRrLGEbhxUeyf/p0Jq0NjJwE4g1cPG&#10;GhLyVfLw5MTKVZOqxQEsk1OdLSJBKFAj0crlXlYWbcio88jkgIEG4CUwlttzQKcx&#10;aczy8ATXN1uHfv0sXpB/GvnZuiROm1mq+N1GEo37Gy/uynpKBSyxuUvbDptHfn2w&#10;ZcwnZew/oWn89Xg4yMRdnTNlPyJWEne0T9gpQcm8gijCjGTKecM+wieytexu9+4m&#10;ygYZBYpQ4tewkEioOsCGhNWOyal5FHhiACsr5oVHSynVZ8J/LIpBoykUStOARuWC&#10;kqVBSBuU6UfRLB4i14LJojxDBXdD1o/M+YE0wLtI8U0rnQSxTANWR5E7OnlcQmOd&#10;mJ2G78U+z1zlYxLcAArgaV9ihQz7RTDLisAMTphlqZro96TcxhyXuM6eFp/0VDJA&#10;BRtYcASC2KF2aZhJj1zs/LJj1F6Bts3u98JBO9sADigCie73rcseQnodDoWLbOC2&#10;TuIws9ybAJP2/MwEB+ZurC55wQxemBr/9m//mup4bW6l3IU+pqVcZOIz/BLL2NUQ&#10;6QC1OiitkQ9PQ5kdDqfMpeIkBzJ65zkD//qvz/d7FKQ5i1vA7uXjIPm407PQ0GNa&#10;wxTCt4Y0SsXmluUCFFUed8CaskJkrlsTdPbVp3w6M97wmuWOxKPZBwfvKeJqa2qY&#10;31ZUw0JSrMcrYWWeSYPYuaqNSsLgQB2cDpdy8CIEondtUekBQltVKJicK/r1K8Su&#10;84TWxIfEzd/eBmV/FY/WyW+//Xa93g6H/W5XyNJ2zTjYg91+d3QgRSkhpF9xRsa+&#10;rUjTs2DEGY3HehENZ5rf7kx6tTfCPpj//J9/JCQtwlqOOwC24Ky6RA19gtOcwTzM&#10;YtSPWyor2l0LmdWPAZvT6C7KLgmf8/lqKep5N1XLAzufKWzKWMePhwXAZueJsIDb&#10;UnBiESkF6to7jCjpRv2mNi3A6QwKsVSuiAP9tCHOwt46uyiSBIck1FDJ+XFSn/+k&#10;kwvdUaXyVL7eUSPsJFe9cMHVHaR5ndXtLmMWsfBMtmCr4oXkRRiZpGhHEAu4cBYu&#10;t1iniLntS3QhYENYNKsQqYOJxmmZBQDlJOTQEivLuDYBIVxwHtt66yAH10ct9ehh&#10;FC38ltxZCn6UsfrQPC+bNzgYqqdqj5uHwPzWmNxcnk77XW22qFOLFYTbGepi9r0A&#10;yjSm+Ga1A6zHyHyKfIsE0Oboo8qq5f9Y509cq1A/ZTqRYVmkNYD07Yd+UFIGKVkk&#10;GPLdCslcc9MBPauidDJv30+32wXCSYe4BfjGhA8dURAJEcT7C9P5MlI9HLiPGWdc&#10;SPIAZdrnaXOkTEUsjOIIXKlFKy2SkpwvZfFYZSd91mWtIF82xL/Ka6D8gO3rk+uR&#10;MphdtiJlwmBv7eQjsjKx6HCGm4nJpi5YNGOPKgE/eAm3LIbIoHr0g6ZiV5jXdrcr&#10;WbXCJTuyjd68+til+sQ+psM8AR+64glgVxihi1njMJ8ZtTdfKicFBqq6mOiynyw8&#10;eQC4pWFAjCJhcJG89wFYXQZL85d7U0LclcRXuXyFQQplNSgOWQzxFxU0HMOT0lVZ&#10;2k+eUou7FImLOarlVlpIU1k8gsJUockB2xgAWAsKgMnmselvrsHQ3G73LcSY29KL&#10;aLfTAsD4VDYZM1rKwsgZZwLfjKE0VGc5mDqs40yuAt32sc5zLOglky3b8lhmxaro&#10;sl3rrYZvLtEhg3kagTIcvQmMGJPAMYzh3o9fvwJ3ZJDXdZORhDhVov8FlvlRAixm&#10;D/i0ECka2BaoqBtG/K+ty6beAUWzyIYQTvj/+Ur7Kbl7DTqg+zxvqWyushw+rbuU&#10;K8t8jVRf1Mlvyfh8zE5OvgHnAxuqmj6VaDzdfXCufXJCAN2k9IRUSNlEo7oJV4mm&#10;rfrCZ5bLt2/fXHHbsjFVUeOmpXeOJkxVAJXWRTDdKNRFDrVN+mBFh+UYeW1BlGmM&#10;sM68SwKDpsNNsZhFtv2yMTbqcuqXZADa6eTtaKeCHNkxwjGTbBVawZ6UypFUAnTM&#10;VnGG5V4V1OMrf1rCXgCvmeWPBEWENI9FFx7ywqL3zUrfgNK+nRQXhL1sOJTYhsmd&#10;kNJRjCAJ/5QhNM7jP5WVTIWEHSBKsUYsOtOGVRkM8LxS5lfJKkthHBjPgE2Hu2Dq&#10;B0EAoJpJfIWtJhI5gMq/dA1tV0OIRTBx3nPVV2LOaLVvqtzlLh4rFJB8qRqIVQUk&#10;7EBFmaI6j+WfDAk3tnrY0sGX8n7rx6lvm73f14tBvbrScozniGKY7wML/QrMJ4KU&#10;eZU6Ljt8Z/TiwGTCc3aI2jOzrs0WYCmchCvDPaTaaESKQ/H0pclHEv7TRC9ifY0E&#10;lyN+31CbpSpc2pILTJP7OHRVBvnernLnDeOc0xmXjSsXg37/LIdZi+nHMMm9yOio&#10;uZw/AN727UvbitJbmvDjWi2sDDLNw646wOqCDlCcCvOME1PRs0/Iv9QUVFA77agS&#10;r1XMKNZpU4LNVv9vnWIxAEhZ0rN/vZ+7/kZw5vLRfRfGnvmu60oj6z4y7+74RG7p&#10;yDrtLqkV/v3f/8D7v7wwWRXCxiwHBwil2WNCiJUzSbXPx3HgAWf6Di1vpUUSla7K&#10;PaYV+sFMgVFpB/WvP89LtsYyqoU7DdAH+SxWfzwxLHlDkU0tN5Ooc/j+nOfPeMvb&#10;MA0XQIbh6emln6bL+wcWY787BDrr5tPp6XbrlMoYuoFT8/J8ILel4NFeN8XjRGDI&#10;ela5oMTBvLQLHWIwhG5kmhz3dDgycRMWF4NXwHLLBEF/q7IDq7NuXhYu56oy6k1z&#10;G3otX+jfWXaNsZd9UzqKn8g51KgqQHK5MJO/v1GtkQnMc41tmP03/81fLY0gpT3F&#10;tni3ysfro1fVsdOHYiu58gOWLZyAk5Q7qi4SXK3SLceBpbBoX66KNj8fD9npgPtA&#10;AqvAEjZ0l+rTsRr6tNwfqBXNrj2Ue5Hsc8AfFT2pmM5zveHZ315ebFH7fRkVYzmR&#10;/OvXfSJw0AHOlY35wFuhdPFH7b2f4istEkR4liMcE7R1X8iPnRWM6hAuz0qVrRoy&#10;c8uamTym+eRKpCkfCQeP0sN0T6ePlUWe9O1OhCRIz83rEFJVvMcSkxuTpQCuKOUP&#10;S0pb+Zl4mcpLG9ZF/mdoPmaDMnlxFdSQ3GMAlpHX4AnFxlkXF36nq7VZ7FaPbGS6&#10;sysIgbypAwwAgmKygHIbBzSxQipLbHfLZ4lQGMumklOZPqTYYcKv19VWQjLBjGQe&#10;6XWpDAEvU9IHzdaM6ifHMWLaU8c4ZMWCg9bZuVzPpetCy4gt5zI3E8LFHuQsW1Ms&#10;14kC5/OUEIgn3R959OybXeyQ8utPNYjQ3LHEGmV2jkWhQxkzR6/bot8zujF02jJh&#10;SeVBFF/rH3jthcooND5Vdii5em8ylJRXHBIHQBkDPOgvLy8wTbKY2J7JCWh3IZ/y&#10;8fHhogwppdLY4XyePYBEskuEYhMGbNPExG7Ij6qMBRhFUaBFqcrnl9sV8nRu2CFB&#10;LsJsZU3FNRVjMoOeSz6rsK7WE9pfGnJwngldDrOyiLYqqX7n5rGq9VbPCJu9EIsJ&#10;W0nl+HS6V9Hn5U+/MkLCrBK8R0Vfu9y+r+cuK4tUfELbbVEth50op50XgIHZ2bT4&#10;MhHokp9jyxSvt7wPl4qtmByxWng6sy5TZaW7ywU8cpO2LNTy/f3sQLfFrGEYvjdJ&#10;cl3LZFgV8ct+l3EdGIt3tDXC1lg9nG+3KMPpfr2VJt4IGheEB1XYt0zBuF4XNfMQ&#10;YBq9JH6TDNs9FcNLZZZjVeSHzE3WP2bFYmb5OAY0y/GmgouM2D0YEyp+tRWeW/PP&#10;zJmNbEG38MdHdCv68DkylgT6YyUfbczFOf4u1Otsd0xLlSvzcuMPJKmbiPhpG6Wi&#10;EarfyIW8XFa/ta2wx9d3+I/EnILW3EQ/xsIiCyS0FOVaNpVC4oHV+HE8mA09cmHK&#10;f0x2VeGyJXUb4mZJFD65T5nokyxp175KOsNpN0qCzaL3bZ4rsvRi/HOVjyVWOKp2&#10;qjwf3ApldGAL1nC7X7Rx1sgLwulwdauAY7I/nPysVaKDcGOeCBmVouWQ/IIXm7Km&#10;VMEhA1xRSxepznUr9++aAphJGKippcM/ERrFdGs3+ytsVYMrmM0QD/ay6PVz16MU&#10;QPN/a3ThVXQR4W73XsEvaKWCkB4HkbXwYEOkMrouxY+xAWphiN+/f6cknMRvlTqS&#10;UbreZYWboCk3UcwcP5/P7uNDtvDnyGbCvjykRKpUPNjcKSVARxNavqT6BtOBVrEk&#10;WAyDZPan4qrn58rPVZMOfN1aTHRducSpQh+jIskDJL4jqVec5WXftq4exhp5ZXnC&#10;NS4R6qIOyR5MqTIpaO4CDfbHWPeKGEj0bBqgpXe6mOQaLTBpHUoNcEXk9/f3w+Gw&#10;BwxS1RHf6ihVWaUuTFlMM6Mn3RHkt19skvXy/GTD79u3fZbvTYN1nS6oNVN6IEKF&#10;0Dg1SkQJrMoUWG1vVAiJ12sWCK5GgPAFgIYtewr6imOrK9gfl2tRs8QTBAUefTqd&#10;jrvqep32+5IpqB/jlgWV7RmVaJZhxJnG1rjfBhsl1LfPz6MOL647qOoIUIgqArFY&#10;0GZFxuo1RjWJA6mOGGPKs8CjXl/fMHffvmEYh4+PqwMhUMypqv9jebRmv8PpDkXs&#10;AjWQ1tbdbjeTHOjODaugcnW79a+/fpVbyTM6OoaeAKDMXQuT6oIw/PnZNaXw9ePH&#10;9Xg64PKtcvKnq0B1QB3sHwyKVH17KWxEBNITyFEUZhA9b6GLLqyp2hhPvbhwqZnB&#10;lhLjWm/FVqykcKIhyUJrPlJo5ukYmfQJZOSqSYkabcHtMUOKuh7PNDXsYSFVkWoz&#10;b0WIo0dgp9wu/PjzZ3BsAPc8n2MO2pZaUbgqLJ2sleut0JEzPSBa2CKXy31h5sEu&#10;V5HGWK9rEwW1k285d6S3UxlA4e3bEgMY+tWkORFjoy83Tc2WPVm5fk5iDUWO0Bpf&#10;DD8w2SEK2XzNCljypu1KN6tMK9VUdr7CDGfQNS/rfuQqYUu+vp+dkYHZzqZoCS7a&#10;5pAiJWPLucIDmcr2hONu763NjcxMf0UBHxrobJ6+fOv0wtY08kM4R7x2Kde6jmE+&#10;J0ZANmBcHx/TPxbAD3YAQ/z+emdKFs/EPN+ud4GlSGNxOrTrdV4ZXFtxOkvr0pTd&#10;aOazurhl7EqSH/BGLO/cNIcDcFiD7w3SE3/L4vvpyXXT1kT0jCASJ64QMX8z2dSW&#10;J19tYsiKgu5dFSgP+lSKeaUal/jC2kMOyAu0OgkpiEHelKbQFQ+54DhPkJ8FTJ/U&#10;NMZ+tG4ctv42jY+FPa8mFWxOCNd8qTawT2mTsoidq20r9bEBjqOk0xrezx/YOhhn&#10;Kgaq7jA7t1jI5HRQ3ko83yVkLPb9Yw4w8KE4HWNqGOl/YU6n1MZE6k81hVTZbHI5&#10;8I0tcbvcb1XdYHoLQalVxXvDapvgsYZjtpodjdsWlWKH7OiiveMifOF0eoY+OBxo&#10;+IiTs+Ipp32Yb4uyNy0SyZfxu+CF02hdeF+MxDEBR/vXncyzlalanJ6lw115LaHs&#10;fv78icmCEFcfOMqIx9TzrXSkYmJz6VxSyCQYuVVDSu9+TybJn39cRWzIuvu0kKVS&#10;QtNDz9FedVsGznIm7smWmAfpf9jxgiJ/kVtCCQhi71rDeDsYff782TmVTHUIIy8D&#10;S5tXDRRuNi/K2WQ6P2eEHkqWRpXxxcmeVZ9gnLlfxJmp7SWVBcQmMCq/F7b46JLo&#10;TakSk0cioyx3b1LL5VRjTySMBshu3nrCOLsYJ/t0YoUt+9JTLqYFqe18OQsYB7zd&#10;Rn/wkVjv2eOPy9xG5vKSZINukonBf3A1vXnC+XbhTla7DikLJSqfhQLx5eVAUq3c&#10;Pk0DUYDlYgpnthXVsT40+JVle0s2QapHDqEx0/uK+Zor7gpaIaR7YLtNi4iDNFNs&#10;KYz01I/Q1q3K1kN4YQEJdFqHBsle7s6fZQKxgh/j+tSQTWhKbKqnQOw4TvLLGrPS&#10;s4nzjVvNLHhfPOQnR+wAqXu5LAL+lWLoQ+JDYiOqcCc13NZQan5wuc8P2efYjHS3&#10;3e/0XhRCB1JFWYqv0FWczUrIILeelARgrbaJfRIIt/O6ZeNU8p7e31m79dkwdJqe&#10;X5qP68wIHfvIhd3cssbq1oAilreDyc7SdAuMgv1h9/PnO9AOAxezaHx5oH28zGp1&#10;ySo1LYupywVPMiD20KCKRKG737v7laVh8irLFSy7TdcbafLHwxMdnOMCEfe0Oxl9&#10;Q9szOXS1D36exhkSAAoPs3a5XIFDgUKP61FelByWg+cdQOXONKzxdNq/X87UYc0L&#10;5T7L5OAVmmWaCYWP7OmrrAj6f+S6aPwkqzZ5hZUMW4apixZPo5xvHpFxkouelYt2&#10;TTawud9YhGp/VGn5qRtuatDIQ9rUqa7g62vXjX2zb7OSrI4w1+fb0rF9EEy4vah6&#10;RU82H917qq9EbDNOHDyefxun+8/XA0YK+8/tKoH/BT0hNf71PxwZkMJFt1vmdRvH&#10;++365bfvH9fL7UJd8u3LsahznJj9Lrz+tPNDEKrOyzZgGNmQv99hmlN44jHk9UPU&#10;lTm+HboRGqSfmN8FYVzSSNzVLSybO/AvC0btlT0w03mMqbtcx3a3hyy4XO+sQg/1&#10;3u4L7gWmYFxuQRKnwOvPdx6fWzcUJSeG9Xloy/BMD+dLe9jhgO9q+vWwwkNPIhA9&#10;/LVstK7PxIdoWF1pvl9DaT6amwqaEWWx7NIvSpg+iirKGz29NGc7GrNZceWJww/L&#10;5pAqBCzpcVsUXwTegelRMVoL+1IJ3wxTsStAd2NYPufFK8cEILhm2Jb9/cxDwAI7&#10;zEkRD5Fl/IYO64Tt05LfqHYTrC0Ki/3rYR7Z86EUdpgHstUWdVFk8GPm54V2MiZu&#10;daQEPD2xBiHk772XwcjUh6Vu81gCUSaLHAuZmdIJKWiWav26SjmwUgQzj2kh+vW0&#10;PBYPUVm+YoNJobGx8oACygdubJ5K8WEowDDSWrUtF5szjg+HLfGaeCZ88l4yL12G&#10;mxLfZxxUttw6mq1SszNNJ7HBM7bGrmqGJESjkS1V5U22H2cW2q9KsnvIqZ0X8cjF&#10;NSNvolKQiRWUsPZ1KdIRp1uF413SRcm/1o3m+GdsSMYIV38bb0N3fALGx5bqjT7Z&#10;JYZe1SbFkba2hlTvwzj9Q1WmPNtgz/zYgTGuBwtIjCKCx34X9PsHU0h7ldfQYsyf&#10;SLJMVes2hZ4qLY4vL2za+fpK60wVFLKPjw7AQZmC9HK4ooWJc02j5s7koWM6coZg&#10;i8CSd0srd79aho1LP3YsU7aMTdmQ810CZpZBXVdK7KGyLZaiWid3kBRwZHG+tS6b&#10;CkeCnTiASiYYj0BLNY7C6XIZUp1VByndOddAJfW4cytG5VjPHx+9O3CmFmCC2p/1&#10;aeVZClsrn+Wxt0gCXY8VGv2lKk5rIkh/tv3MV8Mk8VwKu2+3RN2qfLToPBojhC9f&#10;njHCy+WzD5kCWetj79ngGjkbq0WNw3giYMfCBKS51dRQ2eb8BPp8IJ33+bwWy3i/&#10;dqQIM0FzWaMnmsTwJq8GVkdnTGyhhF5h3zY5czBwslzZRCZYzgA6dDXLq4dsa1Ky&#10;KsjGm1W5iKfUpc7xV9JT9v347Uz33GJ/1ziqkX1bpbKbJhtsFVbnNCEPxP/8sS+o&#10;T0ac6+UzDXiLCW9ncZsle5dTVaUyGVbJtPNNX07h//5/XgEu/+3f/g0S8/fff+Eu&#10;f/2X366d2jvNbrVE9r29CxAOBL7rw1qu+VTVXT9SixUrHQVFyf4p8zqw6horuGEM&#10;yzhgAeYacgvidW0qhSqGRSuSK6GQIcZpGB2StduW5dMWurqYEDjWq3ZubHhAzJon&#10;dlRyPDACmpe7AzSqO27Re/j+nokc3jy0F4ndWm2KtmX9/+3snLIWNsERsyWozbZW&#10;D8n1m4d/qHeUut5H4R/pmA+MHTu2VJksNiLA/3cluDV2946Gq8kj4WFtMQan87jj&#10;Iy+FPidBQ51HeItJhVe7fXsASlGLrhlnY3VnBso0xupWdmZRK25pJSc4SOLzmYUy&#10;JrhsI9fVTR95OGJFeGjacD1/Moicmst6AyxfOm8R75jB4eTvVDc0NaJxZZZs/iQC&#10;bWxlERKzaqvcvXy2gyzLVIUhda9elNFuZlSmhufqBBj7yX1mZyTvAv6GLf/v//4T&#10;BoiLDY9j+9e/tnjK73+/tuzcLRafdACziyLxmqwNHPhqqcmi7Xt2u2pENbA7lJxZ&#10;YH3SaApW0mIdtwU4MVOpHen/jGnNpHeuJGIWHiUdfNfw8nKUu1A1WQCE2rpQhU7A&#10;s34r2F1pQ9pKZ9Vhxj/KlN7tyge/Xn8dTsfdrnUKDaZ9XXcOITzKdEdddrtwfg2P&#10;OkCF2FM7gViO67GMMell2VaJSLt5nWPLbGJFlQ6o40iVpPfly36rxx3Bxsycv/D9&#10;+7f39w/5wV/e3s5//pmrrGJ+vXan5/baz2PfPx1PkAzYPl++nMza8A5hfAumsmrv&#10;4VM46VieS0fXYyfW2/Gpdf1rp34AjcPqWsv6dMhvtyEL5tmVscdEjbnA2t8ul8tv&#10;v/3l5WX3X/4GMX59ef4ysYplWeXmygNVyQlxvf/6dQf0jtWU2gYi0xGY06mpLpUL&#10;DdqydSHzVG3eU+9wKYzhX7/6HS0Guoovl5t2dIt3+fXrl6wzWy+jHAd7Fqq7qbhD&#10;9tnpnc07VCAnkioKG8ufMavyfl8SitocF6NllnMQNgYGt9XptPvzF0sb+aDxYap6&#10;gU3QRClK6VzPLr7slGXqLOjzaYDWrZl3qBDx/cpAsHGo2Bc+5uHpqR6namZ5e7FC&#10;KbxyDNxLwgIVk1j8YttBaj4dSgDd2+2O5SksgRRT2rc7DDRWZd7DLNr3/fJx6Y9P&#10;J2WNz6lcnZ27yY+i3ZptFbb6Ys0euxA7DrM1fndWRGP6k13x+BFI2oTPUoBqf6DZ&#10;4UL3CxuZun7S1sTHaCxJ/5S162i4o2tbs+0ADWYWIsQxbISxH2BlNKp6WZaN5H62&#10;bhXZLPXJeaBlw0h7mUtLq7X6cL+RIqDODAAAGv5JREFUDm65ThIHdR8ZFFiGTDYP&#10;75VD3cN4znoR1muWnYBS5w8stsq7MadXMJeEp3kUj7N2hZBm13prj7PKKhX53M+7&#10;Q+PCT491SBK3J3UufcQjW0MfJ31MKYjrcvROHzK3JRYhCUuqGmN3tfxu6hOjvqD1&#10;VuqWCDPBWzvRUuRTiUeR1VzXLF/Gcn0la3NPH3xMW4fzGEsIvr2tbpVAXTex3jDf&#10;RCmErioqM3ufl3nP9pPDQs8rG4nGsp80Jghg1c2HEBQ7vmxgyNXLQMKWWr0pZy9n&#10;n3pO5bp0Qw5t/fHrLljIXb9Oc+JU3+73v/zly3EPHQbpAVSci9yww0T4Yu+qxyK0&#10;/9S72DSsOi+3umdlSptwdRhv6nLz3tMEUbU7NyBzoolrgAJnxcbbD9z0CENFbMpU&#10;dGn2fo+BpxBS5MFpt6o8Ox2eyrqr7YJOJVgfSM6smD2Z3m3q2aJq18TsrMeQdzzs&#10;2Kw5VXlGyDlNtBCK3GXMBgDTWe4ksbVXV7Os8vPH7XSiYdjT2oB93WGhihpGw0Qa&#10;oKDAoqjT4mqSW3KpqhrIPtCXi2lBYJqrotauIXWSSVGd1F2bTpusEqpZU31Xl2h3&#10;SSnH1DbQWf5TroA5V/g6HHZc4ikus6NAREd1ndmNnopGmAmDgQJH+HmuFeHcEhXa&#10;LkSYyLZu7JE7z2CTKIaUDpzuCkjlduvzpaH7gfCGK0ELP88wzZwh5qayTQNAJg9K&#10;EXZF+X7LumvX3dRjnGGAFmYcc5IU9O9vCzYbyU79tC/zp6cnFgHrB3vkvXfxf4Bw&#10;LPvS8W2PR1b17W7MfC6VhGwI5BIUVsKpREDK/PGE1HkryyA2NExcICe4pSoP8fek&#10;FevIul5g5FjU8nbYD5tH/s+W715uwaPFCmRL7p3Ul8fEv5wpvkxtbAEzWUqgyK43&#10;1lo/7g8un7k1Y8FwMcOVt16Qm4bmwSJ2OCzyilW/iDqLrAG2aegMmqchl0tjdV3P&#10;w5YJLFyHY8zy9b1aJdThegnk+LFAfAHRjn/rNky3jGswT2SCKiKlzZgBUK0sILqz&#10;uEhlm0xKZPuz682ljo1SUq2vVKnLDAkl2BSOCTtSpETazrEXh/5d8LZj6KZIadXZ&#10;VipNvjUOuxLlKWjBMJ+Y71J0KxY4UKOZ1iHQrrs/Px9kIrpYUo8pxq27niz3ii5i&#10;5kp8eT5Bzg8TBH3x8TGad0QcrNknKgAMZafgEHs8zdHXhNndHapdQz9h3zWrdEY/&#10;sDVsNleQP0D6+5Yu+663whyPx0NOeUqjCRAQYpLdk4uiv6+sP6KaY3YCr0p+ut95&#10;T4a3W47k44N9j10LkdHzUu34FrYE5TEsHKFV/ZpCJfqYrs2Uk/PH3Uy4+z3XWeHc&#10;3u+zaam2OkVgkS/2BuOeJMuaOla2ngR7aqmXKdltlF3WiPxQ/A//0/+2kp/Mxw8w&#10;c8YprEwsud/Goizmib0LIB40lPHj48328B44D0pMaAU7jpGKAsL03nd3uecY/C2Z&#10;r1Pcb1eM//hcYsYNV0LO8j7skgJceL5dIaSgA3E8WH2xfvs400W4htv1PvRTRU53&#10;RSsOA7hS1bfNju2UyYQupxGnh/Z/RaRaqts8+XfYdXjJ05EMYxzZ85lVzkjLYGVQ&#10;arX7dbxeLpjtp9PpGSi1KmRBsRpTU+Y1GcwTPeu4c1ldrj2Un/R2bRrW4UBHk41u&#10;zD/m9MrUqhyyjkEhlVdZGOphQgHO+m/fD919UP7TjE369Hw6PTVQlX/+eC+lfyKf&#10;g7EFlnRiCM2NlOomF8Kd2YNBxYxoIsxVXlphZEp5ZG3tOzPi8SYEo0r6ycd+/Xh/&#10;hy7uWICtXliybgUYWxdi0lzlmOtaFooS7AjDmG2BXdwskWvGMBwMaUzc05PBg1Od&#10;6GVjWG4eTu1+FneCPgSVPHELI5eTuV4jBcjxxd1hL5FIPc1ti3FWpGrSRb5EoC4D&#10;SUW6pJ/6udgc9Rq/SgTgZsfjLo/2FMWJ+3fhv+7KvsG2LdgeSX+2uk4pb0K6laFw&#10;mSoU/FMZdrfxbFvjn9h0nktCgchomMqyqHTPGolABBekHOHErbQeOeLpdDgCsVAH&#10;0Fs333sYukV72LuiucSxijtmjEZuqs+VwSs8QjuX43l74/fjbF9YEXk0NL3t888f&#10;mPFsSAX4a/KEz77d8RCV/W0yV5BOFyx2lYtmOq8xO07GM3MXMMtypeJKVXZVTtno&#10;VHc86/m51czMW7lsUtP6wWDUlhDXxjVsb7fV0u+xQqr1c5kA6WMTZCfzOZ3IEMj2&#10;ijKTFea+T2qOuAAa7ZVSM7E2MisXSNqvtxurPuKp0Bx3VvZfi62xlRd4cC1li5I8&#10;GubeACITxbxtVQ0g+/N8vf4jRldCcLam+j/We8LQwUFmt6Q9HvH06v19jbluD46v&#10;mIcr0CIK9yrQumzhhHxi32NgCtcHjz36NpzK2TeFyZF6Isv+doytKGONDleMUFm2&#10;epEnznwGNyyrVbB9/IcaCaXJiuF0skKONZ/drol1Td87Qc1581i12GvUlll9v3c4&#10;DTLNZzsGcGKc5bqVTuVMzdNq20fxvrVSUx87dJwkq3PqYkQKFBRQaAVAgdvJJ0qs&#10;IxFkfBex+rZnVvDPGZCd2Ci7ZCgBpMjsUyiPh446aZVHU65M5lTQy1Kw9kY+5yUO&#10;UF2xDoT6qKaO6HLVBBX3LB7r86Zmb8YyWB7bVSpUE+01o6ZlqaMh9sjr3/j1hR1+&#10;4gFErpXYolzSVd2v689y2OvlotJAVMV3nAbZz6WeTTrNvCbyKA6ZqNEhpvbNaijM&#10;OaQrP3LzcfDu3ThPc2qOZy8Nw3CEp87DUYVoER7X2QsRUutAHxBVcnGWVYyLKcKa&#10;369T8pRBwIwjk6gwCvyPbZNY5rz3AotolLJoJpf2lvfU1JuYNZb6t0YDWFILJ2qK&#10;zZ9qFUqoHmM7j30nypT381jeSdsnJNHkJbWv9HgSMZ3NPJeNR0RIag+M0khiNdsi&#10;ZjADttbsRtoPaifVkHJy2ep6LrNLhG+qZBJmn7a6Q7HAHsVod5fD3cXnIzOMu6Rn&#10;3TzF3KdkE2nHzapZGYlc7lCrcLKnH9czFzBkDc9Axry7vcz7dcxGzh8j1ljv+11W&#10;9RbYcndbfPP+HptLpD7ZlUr6TerB6VLQIibZboj+UUfO7fOPRomz7lP1X8/pozhy&#10;rXTjXBzoeLrvpFxjVPLKHgADzu+d2vYw2M22g1x6BgOmrldvC2Dke2CfBBrD166M&#10;To5AMn5d0SU0KvXDpbexKald9iVTSDoOCZatHXyu4belk0h8hyxlOGPMwGKQiv/p&#10;P/38+vWrCWjQhDZZe6W9m5IYVOiEnrXcIcZJbWGCf0/hoDKteM2ybhNx2mLNulTJ&#10;EJXLmLj7z+EIQ72RVl/Ey2NjZGxlB3xiafet6oBObVH8r//x/4S4OBz2hwN5d7ju&#10;6amF6QDxneL68svnYmqG8+Wmrrklq/MoAQgb6Xqlsx/AAMhd/YtPgB7Xiyqax5xn&#10;VlfDWLueaWvHJyglFn8caAP2orbxHGFLXi43vMABq3qosUHf39/xdAzvqlR/12iD&#10;GON2gZqdxvvlCvvxcOBxwX/7feUuFWL2sfz17TbBCjUJnEX18Jt7h2PVtCxrjhtN&#10;7Bm8nJ6OeYlNEHDURhKb7F5k6xGY/Ta7jsd9rpp3Vrlm4GqEMPH22Ob//l/+hKTc&#10;7avTMaO5uqTuuZVDW06JFCobYGOX8jnjXrXKkWRbbwvuFyA2NaGJ0nBL8gqm0ju3&#10;bRGJsWFt/VqluoIDsyxkuEWiSSKjPI7VRnul+RZDdRWqgTw6HHYntiZjf7uZ+3os&#10;5aqF+nEtKyET2vVEgYN5ibyAVs0yPrO3dJ5aB4sjTIicyrSnJkES3Iup1EyWXfNV&#10;HgdxgVmEtutWqOmMLj6LT2l6ks5ro8bHkl2pWbz9N657LrSzZweCmMMzpERP1T6M&#10;XJUUXXDdCzvXxP94aF9kX2sq/zFvDqaqKVMPkkkuhKZSZY8iT+rFDblSuRBNQTFO&#10;RqiL6A8xpfbQsKl9zaTVhCbbRvWJsQBu/Zhr+1RNrZwkJ6XEfpg4XZSZy2c9BtNP&#10;LEhTVU0LWBPfT88H7P4lpx+JpJxVBJicBVdxyGaSi3dNSZctxgt7ws7HrRHxnGrq&#10;OcZr/m8qZ01nfePMreDy7Vsnq9zvkqK/LGIhUFRaq3ibpKZP6qY6PkbKUsjCsVar&#10;h5klZaPd4EbtBrVbvm70/U5680GSiNYy03aZPRlU2IKuwI6me5W502Zgqxbux8xh&#10;8aIsaOdljyCPVYnpYZ1mcbJinRcnCdsaMM/5gb+vrRDhTUbaipDe5psKfUenTS56&#10;B5QrpDFdSbvd7T58Fpl6UJBxOzLBf6/0Ddq0hyPRyl3hcf/VTEN3HG9VWMxIQXkf&#10;vElpCnhqhyGa/KSZquU7+2zAFo9hpl7fWUxcdS6gLSwMehKTW6zpfAos1rY/nrwb&#10;C6bptnnFg6/jyUqBhZL92T+sKZu2qcgTYYOJOcQqUSqMp9hnFpIZmXIicNsvz7ui&#10;jFOp5jadgZD9X66eyrIHkofAJNzl9ERlJSx1teNZRlanHtg4IiOjv2Q1oY5hr7yo&#10;s+kymX7CCNOWW2A97KOwEeWzlLal7NLhsbOxwbTdDckpG8sH62jgM1WnrtF2ULiD&#10;syGotXyK2H37rYJYvisXI8ToeeGoEM39IhfhYElF/7cFr8uWbmEYp+dL/3G9KFvB&#10;vWKIyPLCKRK5C1csmSG2UICmb8+6gGwk6TR84kXWC2MBqbLK3F7PwVRvlM88ta1J&#10;h1p1la9vV/cOhSTLXWNvnsy+cTmuhwKohfWKE4wcP65rs1HW5PxwiZJN+ZH64iiv&#10;8+5T7Df5ezC3KeBDN7i8+RGlJeb76dTIDvjsuJsQESw7WNcuEaouq5VLkOVbt14s&#10;5/msvEPRtbe4a80SMpCMCgnh91++sEVXYXvHubVOXC4bun/KAGAD+MuCtqo4dDgU&#10;sGmHyfWLojGMAdMZcI9hwsdWBC7Z7uVP58bSdVZ/VZULV906KAFWw12ET0qV3J03&#10;rJJinKlAa2xjvhk95v8Uu13uoOEyEpsJDe9U0dkJScE2s0+htZT0R02TtdkduXeU&#10;PxXyDILg6RT+698GOmqEEUrWtyvMcPrzz3NCwcx92pn0GVpmJFfNjsf0rjTP4qkp&#10;mlYLQIZEP4wQO5jw3X73bd86JEIjV0UQqkLEoZx2Cezgpt41T7xVP0DYc+MpWTls&#10;wtchQL7Pt+/7/q5qIdiwRb5MM17EUFgVRUZV9i+d66SsDea/YbFdNQQnj8SFfdHd&#10;KLHlZBxswcbEPFw6Y+4qVpdjwRbA1uXeXYviKZg9vXDjwuYhnL7RJZJcZ5h6AGCb&#10;/e55baWNF4Bwlmo5ll++HbEVYAv99te/tHUA4lim8OvM3F3yq2gdcdz4htXZmWSy&#10;w0xZ0UEFfpxn55v//Rfrev75NjhUBHPrj18fmeyprr9Pqy31RnhjuXxwz14ul13b&#10;/uUvNWTd77+fYS98/+2pHOh2uN8u1yt9y1iwcQ3nbqx2h479jeirOBxYwuh6Ow99&#10;N+3rscNbTtBaT1/al+fdx3n3/n4B/MdMDfRp2PahD5WRj2Imrz8vN0oyTx+mCcKL&#10;OaAjceHT8cRmhT3ZXf/dvz7/+NEN3e3Ll6PKJUxjfwesZgEtALp8rtTZBeNh+6W+&#10;f/66+/vfx/nWFdUXdmVls+IFJiELIh1P2PtvH+eFXAXW7X99P5cRXQBQmAI0xCqh&#10;H5czoOvhxNn59eud8a8vX/7Df2jO5wj25bAli3CFqV5k/Ti1K+1awEbINLL+Osib&#10;8ViwHXy15bNF8hg16uCQ/PVap0ZuquLUAq3UOBxrwC6dVsVZl+Xnm1yPEx0yh6YG&#10;MGaz37a5fLztmvr09QWH7PKOhRixSXe7xl1fSSmiLKFWZwXReW4rlqaQ48/JByb5&#10;fTY3THXZCx2Oy8X6b7le+8uFINACanN7fHZDs4jGsm2VXPrkfoCcBkJxtkxy25mG&#10;XdrUMsZK/V8dJsXDbrdVwbPGVWEwGsnB7LE5lyG4wWrqW2UKKiMH4ZPa90gX2DKb&#10;GXBOItVF/uV3zVx1alLZpFguXfTjyGciTaipWA7nh6rzAKQv7lsBSWZITekf6xQF&#10;FRWDLQ4ZpSNmXKeAij3hcerz1GwxV5vMlnCoZoaPei3N+Aami6ulPCSFES5i7UfG&#10;vFZbyJb4p9PJFMcfP0ZTWlJDIs9A6aCK/XGxN5RItVgD8ybEh2jFWxk/PgYLx02n&#10;JUZpUHs6xgMg3YAAza6AFh273pzpf+qZFGtuiLznyLh+DCGWzfssLzGziH+s35lV&#10;pXGXM2fwxKfTCwTk6+s7n9g2z20D8/lyuf3216+QCbeeyQRLyaKpuyYABP/8c7UT&#10;97NWyzYeQ8ONHiFWTskotOpMZK4+aLe8TK0slRJMJqfd/fY/b97Qwm60jenlANm0&#10;1YLJStcNUSJ5k9yqeAZeCeL7+/dnnBu5k+iz+/p1J3S0bpj3s7BscrQ+lNPLXMPv&#10;cfsnxnIqNrd1tlTNRvaIJ8GCBqoC5Wu+5CqEcncv382Cp+rL8mUuG+UujMO8NkWr&#10;Bq8zKSQj4ccyUtqIlBd9FbODEwvXdw2PhRmjFGKoVA055tX1lAX8WMvHoMsV7F1f&#10;SG+aasPZTiIq223d5OdImqdtu9Ujinb19teyfJAJMU9m66HnFNnaDayM6nCj/T6I&#10;5xUDiltpoKDunZQiBvhbyGWBWa/SBvljcnPKb7bES6Uw8f8dgobuH7feUMucTQ8V&#10;RtVjZHHPBtz32t2ZO1YdXPWI2dIiBb2+vvEpzJSsVXsFin0dpp4m9BLC8sk9yVKz&#10;3twjjR1o7YDxydvyXthG7cYq5qwo5mYZiUhYfHKzY/H/1MIs9Vd1/M5K1OG/WLBp&#10;mmK+a3KiQXhBOJzPZ9hAYs3wGmhBJWx+1lDbnNiOZYbkxH7sp7e5A/5BB3hFHftM&#10;TTUbcQBU3IQV4fEznjFpskiiZvMkGQFzfBCuZ1Nq8k9LWSqxpafDalzdMqdjSSw2&#10;9moexsPO3W2npE64jkGJmuY4xDohqrvEZ5N0BAlRycS93jq5SA9SS8xyJZQtVaCN&#10;Uze61FtqVe/JxJHoOttS0Sj7dLtVlasaTYn0m5QkgJdJNW9vvdk437+Xb29sQuF+&#10;tKZXWpKo9uWnO8j2Fxvu9WreHdy3a0rp/TZQNYlYt9KU7FWcS7noyTtvyQVl85MA&#10;46R1Oc+Yu4LxliQ5kUEs+DAkp5uK/nf7LaPfMcicTs0KAkZ1PfPlgX/oiBr5vmo0&#10;4XiBmvsENQe5DtMo5tYJG8OlMk6nva3UVDuvIgpYteqNab/WB8b+bKi2aZfkmjWr&#10;szyf7ykUY71sLfHXv1Q/f60fH93xuPvypXF3xl+/FjfhcBY85v9yiTHLr19rleJh&#10;zpA0Nq/EUh1ath/A4r6/v7uPGLAPBAX229YvNaQUFMyjarUA6TejAnOz8s6cTMBe&#10;DSMw+zWbp92e8u52G3plxO/2mcpRK+00K5qlGHua7vfr7arNcTyWBZbwXkB+uK9J&#10;y45g0qJq2qh8NLaTzLTTuwECCDg/O5yO+4wC9ve//4E999d/YdXO+32MjXUB3wFv&#10;L7Hc0LppBYusRJFTWOImi68SdSEM8YsnoLIcsKNfQjl/eip+/2Owf7hnNdeIjjEO&#10;rf/J9Y7cc8+n6eNjcbgZytyFz1M6FRAxPvv09LT5FDlN1+uY2hSmJsYwK4Dx1XlO&#10;zgmVFOrHVfjPpCglZ20tdViag/namY6FIvJlRCb7FkrSXWhWd0K0Z7wq+L8yt/NO&#10;fYzXkEo+KjQd22Gy0g7gMGMDmYrKHuQGd+fSLCUtPdaIhmhsYAcVuxTQTgXjXesV&#10;s5WS8pIMMDdLDVX6UqZAezoxCeTbt294zdvt7iahdq04p0X+O9Zm2hoiV8l5mYq+&#10;JOhphfH8TKohdIpokNVDXbbwmeIT7CQhNzDbmlnFAkQUODQQ+LgsApJF5dqGSB2j&#10;M7FaKuYgj2Mrvi2EurORFD5a6roZJ+zWIjrvGJbqWznh2OGT0bsYenKYkzzWquhU&#10;t22npBpSemFFcAzFxkSKtVqoUVkM3WXQ8tRJxO8oMLmaxpI0dswTdvwE02ofhbJK&#10;nj3j6/rZTdbIXXoiZnEmsrzP0D/1A0hN3ewb2cqrOWt52chMiz23tgOwMfvrxZ3Y&#10;V5mv3kH4f26bHSJMcRbuzO6+eYmnjSq160qa9GDlc9f1WJIdG8UGVbhhJe5DW/7+&#10;56tpUYaVNgCxR4dp3k5ssAefZD2A2nyrYRJ2koSu62O0NlnUQBXFKDpz09awfjZl&#10;2zI1K6uEJBUSs780Zd6b15EWYfPht9+eISUcTbZ31y5G5aSRkq56HVmqNwglsSWQ&#10;TC7a405U1s8qdjAkTrZD21FuPiQ6j/NY5u4ZPjt9WKas0lFCogrQOTjJoQj12Ozb&#10;lSILynp7vdw+7Xl7VSYoKAEkmmDY+OJR5zjIi3yorvgmszZ27TVpTLhzcWVikR9z&#10;RxnXtVUR03vKP42WLd15o+oMZ6kZg18t1a5Pa2OuSWzUsFXUwa2eY25bDXGx+AGP&#10;YYStcvm6RS5jhTUvki8zAouhNCaRhWXzkrvKvcfHwrANTOidWlGy4whe6Rsrs7AW&#10;JRGgQrexHaO6rSjBk01O16HY0B6P8VJgJ+2msSdlWtQ2tjCMzXdib3q8OHbRcbdf&#10;Qh5LmZHZyD5dn0XiTCBYU8X+4nq5B9n5NQtShNQLzJWI8thQoog94ctyJOwpUrZl&#10;6o23fZ9bS/vc69BTPxy3FJHYRQC3u1yKlFuc+slYwhhaYcs7COPZT0lVKdfMzpta&#10;FJ3UqMkPAoDCYpEdX8ZGSrFZYATO2tNFjItHJRH/pDT47LOBN2v4lGrOPleAchHm&#10;wiK93irV9Jh61t7YNS2Lw650Rw9bPtdMYRVYiL1kFr69Q9HlFNl3LHau+kW5UVZV&#10;Ux5SSpdFqVQWUwiBTnw/qIEkjRMW8n63Mnsoay6whBEAMWPY0FKGK3LpsZDFt29P&#10;WHacg0QKI/9UX/rxs4mcjABskFaKrpJTyCJy2tXN9XpRjs4Bs6xO1UBZ4eOjdBDx&#10;169XG5ZbUKlTSYW2cAN7VzuWP4DSL1MxsTykLhWQCTnUUBPjgrky+PDj268eJx74&#10;CXiyIfGdbMBuULGDfCtz5aTUiv1LZruBaWes6UCYXFW1uYt7qIfnjtZJvuu6mM7l&#10;bC07DqCJd5V3WnDqUsq8dHUKBxvsLPJ2/H8BoyCACHhENV0AAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="128" preserveAspectRatio="none" xlink:show="embed"/>
-</pattern>
-</defs>
-<g fill="url(#pattern1)" stroke="url(#pattern1)">
-<rect x="0" width="720" height="540" y="0" stroke="none"/>
-</g>
-<g fill="rgb(144,60,58)" font-size="44" font-weight="bold" font-family="'Calibri'" stroke="rgb(144,60,58)">
-<text x="67.6621" xml:space="preserve" y="81.6641" stroke="none">Paragraphs and Rich Formatting</text>
-</g>
-<g fill="rgb(31,73,125)" font-size="17" font-family="'Wingdings'" stroke="rgb(31,73,125)">
-<text x="43.2" xml:space="preserve" y="144.8817" stroke="none">✭</text>
-<text fill="black" x="70.2" xml:space="preserve" y="145.7865" font-family="'Calibri'" stroke="none">The Paragraphs and Rich Formatting portion of the DrawingML framework stores text </text>
-<text fill="black" x="70.2" xml:space="preserve" y="165.7865" font-family="'Calibri'" stroke="none">and related formatting information for a text body contained within a shape. </text>
-<text fill="black" x="70.2" xml:space="preserve" y="185.7865" font-family="'Calibri'" stroke="none">Formatting for text within a shape can be broken down into three levels of precision, </text>
-<text fill="black" x="70.2" xml:space="preserve" y="205.7865" font-family="'Calibri'" stroke="none">namely body, paragraph, and run formatting properties.</text>
-<text x="43.2" xml:space="preserve" y="248.8817" stroke="none">✭</text>
-<text fill="black" x="70.2" xml:space="preserve" y="249.7865" font-family="'Calibri'" stroke="none">Body Formatting</text>
-<text x="79.2" xml:space="preserve" font-size="13.6" y="299.8254" stroke="none">✭</text>
-</g>
-<g font-family="'Calibri'" font-size="13.6">
-<text x="101.7" xml:space="preserve" y="300.5492" stroke="none">Being the highest level of formatting available within a shape, the body properties allow for the </text>
-<text x="101.7" xml:space="preserve" y="330.5492" stroke="none">manipulation of the text area as a whole. This means that all paragraphs and runs of text for the shape </text>
-<text x="101.7" xml:space="preserve" y="360.5492" stroke="none">in question would be encompassed within here and, therefore, follow the text body style defined here.</text>
-</g>
-<g fill="rgb(31,73,125)" font-size="23.8" font-family="'Wingdings'" stroke="rgb(31,73,125)">
-<text x="43.2" xml:space="preserve" y="422.9944" stroke="none">✭</text>
-</g>
-<g fill="rgb(116,140,67)" stroke="rgb(116,140,67)">
-<path d="M86.1674 441.7646 L83.7153 441.7646 L82.0186 436.9418 L74.5347 436.9418 L72.838 441.7646 L70.5021 441.7646 L76.8008 424.4608 L79.8687 424.4608 ZM81.3098 434.9662 L78.2767 426.4712 L75.2319 434.9662 Z" stroke="none"/>
-<path fill="black" d="M112.61 428.7838 L104.954 446.5525 L102.7693 446.5525 L105.4723 440.3003 Q104.2126 441.0789 103.1307 441.5496 Q102.0488 442.0203 100.7588 442.0203 Q98.9227 442.0203 98.0697 440.9104 Q97.2167 439.8006 97.6606 437.581 Q98.0348 435.71 98.9494 434.0424 Q99.864 432.3748 101.1144 431.1197 Q102.3509 429.8762 103.8442 429.1499 Q105.3375 428.4236 106.8483 428.4236 Q107.8826 428.4236 108.71 428.6444 Q109.5374 428.8652 110.2044 429.3068 L110.5647 428.7838 ZM109.4235 431.1197 Q108.7262 430.7129 108.0162 430.5154 Q107.3061 430.3178 106.4578 430.3178 Q105.2143 430.3178 104.1533 430.9163 Q103.0923 431.5148 102.2463 432.491 Q101.4468 433.409 100.8564 434.7048 Q100.2661 436.0005 100.0244 437.2091 Q99.7408 438.6269 100.2115 439.3242 Q100.6821 440.0214 102.0534 440.0214 Q103.0296 440.0214 104.1557 439.5333 Q105.2818 439.0453 106.2579 438.4642 ZM127.671 428.7838 L122.0766 441.7646 L119.8918 441.7646 L120.517 440.3236 Q119.1039 441.1719 117.9336 441.6484 Q116.7634 442.1248 115.5664 442.1248 Q113.893 442.1248 113.1202 441.2823 Q112.3474 440.4398 112.6704 438.8245 Q112.7495 438.4293 112.8761 438.0575 Q113.0028 437.6856 113.1911 437.2091 L116.8168 428.7838 L119.0016 428.7838 L115.8151 436.1748 Q115.6199 436.6281 115.4107 437.2091 Q115.2015 437.7902 115.1341 438.1272 Q114.9342 439.1266 115.3398 439.6263 Q115.7454 440.126 116.9656 440.126 Q117.8256 440.126 119.0353 439.6263 Q120.2451 439.1266 121.3165 438.4758 L125.4862 428.7838 ZM136.2287 424.3446 L135.2525 426.6107 L132.7889 426.6107 L133.765 424.3446 ZM134.1788 428.7838 L128.5844 441.7646 L126.3996 441.7646 L131.994 428.7838 ZM138.4739 442.0551 Q137.2421 442.0551 136.3531 441.7646 Q135.4641 441.4741 134.8807 440.8465 Q134.3159 440.2422 134.1276 439.3242 Q133.9394 438.4061 134.1834 437.1859 Q134.5483 435.3614 135.4338 433.7809 Q136.3194 432.2004 137.6047 431.0034 Q138.8481 429.8413 140.4716 429.1615 Q142.0951 428.4817 143.815 428.4817 Q144.9538 428.4817 145.8963 428.7954 Q146.8388 429.1092 147.5198 429.5392 L146.5715 431.8983 L146.4437 431.8983 Q146.2531 431.6891 145.9602 431.4102 Q145.6674 431.1313 145.2397 430.8872 Q144.8144 430.6316 144.267 430.4631 Q143.7197 430.2946 142.9759 430.2946 Q140.7214 430.2946 138.9167 432.2004 Q137.1119 434.1063 136.5657 436.8372 Q136.238 438.4758 136.9039 439.359 Q137.5698 440.2422 139.127 440.2422 Q139.8592 440.2422 140.6331 440.0331 Q141.4071 439.8239 141.9672 439.5798 Q142.5901 439.3125 143.1386 439.0104 Q143.6871 438.7083 143.9382 438.5572 L144.066 438.5572 L143.1247 440.9395 Q142.023 441.3927 140.8295 441.7239 Q139.636 442.0551 138.4739 442.0551 ZM157.2304 441.7646 L154.5807 441.7646 L151.5732 436.0586 L149.3861 437.581 L147.5965 441.7646 L145.3885 441.7646 L153.1886 423.6822 L155.3966 423.6822 L150.3763 435.3033 L159.2919 428.7838 L162.1624 428.7838 L153.5325 434.9198 Z" stroke="none"/>
-<path fill="rgb(96,40,39)" d="M187.3732 435.0592 Q187.3732 438.1388 185.6707 440.0795 Q183.9682 442.0203 181.4232 442.0203 Q180.3308 442.0203 179.5057 441.7878 Q178.6806 441.5554 177.9368 441.1138 L177.7625 441.7646 L173.7532 441.7646 L173.7532 423.6822 L177.9368 423.6822 L177.9368 430.0738 Q178.9014 429.3068 179.9066 428.8303 Q180.9118 428.3539 182.225 428.3539 Q184.7003 428.3539 186.0367 430.1377 Q187.3732 431.9215 187.3732 435.0592 ZM183.0617 435.1406 Q183.0617 433.3974 182.4691 432.4561 Q181.8764 431.5148 180.354 431.5148 Q179.7613 431.5148 179.1338 431.6949 Q178.5063 431.875 177.9368 432.212 L177.9368 438.7664 Q178.39 438.929 178.7968 438.9872 Q179.2035 439.0453 179.773 439.0453 Q181.4348 439.0453 182.2483 438.0691 Q183.0617 437.0929 183.0617 435.1406 ZM199.8542 432.7001 L199.4823 432.7001 Q199.215 432.6072 198.6224 432.5607 Q198.0297 432.5142 197.6346 432.5142 Q196.7398 432.5142 196.0541 432.6304 Q195.3685 432.7466 194.5782 433.0255 L194.5782 441.7646 L190.3946 441.7646 L190.3946 428.7141 L194.5782 428.7141 L194.5782 430.6316 Q195.9611 429.4462 196.9838 429.0569 Q198.0065 428.6676 198.8664 428.6676 Q199.0872 428.6676 199.3661 428.6792 Q199.645 428.6909 199.8542 428.7141 ZM215.5659 435.2451 Q215.5659 438.4642 213.6891 440.3177 Q211.8123 442.1713 208.419 442.1713 Q205.0256 442.1713 203.1488 440.3177 Q201.272 438.4642 201.272 435.2451 Q201.272 432.0029 203.1604 430.1551 Q205.0488 428.3074 208.419 428.3074 Q211.8356 428.3074 213.7007 430.1667 Q215.5659 432.0261 215.5659 435.2451 ZM210.4178 438.4177 Q210.8245 437.918 211.0279 437.2149 Q211.2313 436.5118 211.2313 435.2684 Q211.2313 434.1179 211.0221 433.3393 Q210.8129 432.5607 210.441 432.0958 Q210.0692 431.6194 209.5462 431.4218 Q209.0233 431.2242 208.419 431.2242 Q207.8147 431.2242 207.344 431.387 Q206.8734 431.5497 206.4434 432.0377 Q206.0599 432.491 205.8333 433.2812 Q205.6067 434.0714 205.6067 435.2684 Q205.6067 436.3375 205.8042 437.1219 Q206.0018 437.9064 206.3853 438.3828 Q206.7571 438.8361 207.2743 439.0453 Q207.7914 439.2544 208.4538 439.2544 Q209.0233 439.2544 209.5404 439.0627 Q210.0575 438.8709 210.4178 438.4177 ZM239.3776 428.7141 L235.3334 441.7646 L230.8942 441.7646 L228.2329 432.9674 L225.6182 441.7646 L221.1208 441.7646 L217.1115 428.7141 L221.5043 428.7141 L223.7356 437.7088 L226.5246 428.7141 L230.2318 428.7141 L232.8814 437.7088 L235.0778 428.7141 ZM254.9847 441.7646 L250.7778 441.7646 L250.7778 435.2916 Q250.7778 434.5014 250.6965 433.717 Q250.6151 432.9326 250.4176 432.5607 Q250.1852 432.1307 249.7377 431.9331 Q249.2903 431.7356 248.4885 431.7356 Q247.9191 431.7356 247.3322 431.9215 Q246.7453 432.1075 246.0597 432.5142 L246.0597 441.7646 L241.8761 441.7646 L241.8761 428.7141 L246.0597 428.7141 L246.0597 430.1551 Q247.1753 429.2835 248.2038 428.8187 Q249.2322 428.3539 250.4873 428.3539 Q252.6024 428.3539 253.7935 429.5857 Q254.9847 430.8175 254.9847 433.2696 Z" stroke="none"/>
-<path fill="black" d="M280.5552 414.9622 L280.3602 414.9622 Q279.7555 414.7866 278.7801 414.6013 Q277.8048 414.416 277.0635 414.416 Q274.7032 414.416 273.6401 415.4596 Q272.5769 416.5032 272.5769 419.2342 L272.5769 419.9755 L279.1898 419.9755 L279.1898 423.0575 L272.694 423.0575 L272.694 441.7646 L269.0267 441.7646 L269.0267 423.0575 L266.5493 423.0575 L266.5493 419.9755 L269.0267 419.9755 L269.0267 419.2537 Q269.0267 415.3718 270.9579 413.2944 Q272.8891 411.2169 276.5368 411.2169 Q277.7658 411.2169 278.7509 411.3339 Q279.736 411.451 280.5552 411.607 ZM301.4471 430.8798 Q301.4471 436.2051 298.7161 439.2872 Q295.9851 442.3693 291.401 442.3693 Q286.7779 442.3693 284.0567 439.2872 Q281.3355 436.2051 281.3355 430.8798 Q281.3355 425.5544 284.0567 422.4626 Q286.7779 419.3707 291.401 419.3707 Q295.9851 419.3707 298.7161 422.4626 Q301.4471 425.5544 301.4471 430.8798 ZM297.6628 430.8798 Q297.6628 426.6468 296.0047 424.5888 Q294.3466 422.5309 291.401 422.5309 Q288.4165 422.5309 286.7682 424.5888 Q285.1198 426.6468 285.1198 430.8798 Q285.1198 434.9762 286.7779 437.0927 Q288.436 439.2092 291.401 439.2092 Q294.3271 439.2092 295.9949 437.1122 Q297.6628 435.0152 297.6628 430.8798 ZM325.9867 441.7646 L321.3636 441.7646 L315.1799 433.3961 L308.9572 441.7646 L304.6852 441.7646 L313.1902 430.8993 L304.7632 419.9755 L309.3864 419.9755 L315.531 428.2073 L321.6952 419.9755 L325.9867 419.9755 L317.4232 430.7042 Z" stroke="none"/>
-<path fill="black" d="M342.2429 424.1393 L338.5024 432.8086 Q337.8423 434.3271 336.6368 435.2219 Q335.4313 436.1168 333.8276 436.1168 Q333.0451 436.1168 332.4842 436.0548 Q331.9233 435.9928 331.6212 435.9153 L332.478 433.9165 L332.6949 433.9165 Q332.932 434.0095 333.1823 434.0559 Q333.4325 434.1024 333.7502 434.1024 Q334.4877 434.0947 334.9828 433.7112 Q335.4778 433.3277 335.8714 432.4057 L338.6186 426.0296 L336.9684 426.0296 L337.7881 424.1393 ZM343.6653 420.7847 L342.7542 422.8997 L339.7947 422.8997 L340.7057 420.7847 ZM353.5385 424.1393 L349.7841 432.8396 L346.9796 432.8396 L347.3964 431.8789 Q346.9238 432.1501 346.4776 432.3864 Q346.0313 432.6227 345.6471 432.7621 Q345.1605 432.9481 344.7755 433.0139 Q344.3904 433.0798 344.0263 433.0798 Q342.8797 433.0798 342.3273 432.5297 Q341.7749 431.9796 341.9903 430.9027 Q342.0492 430.6083 342.1305 430.3566 Q342.2119 430.1048 342.342 429.8026 L344.784 424.1393 L347.604 424.1393 L345.7416 428.4546 Q345.5262 428.9504 345.3968 429.3068 Q345.2674 429.6632 345.2178 429.9111 Q345.1156 430.4224 345.3178 430.651 Q345.52 430.8795 346.2095 430.8795 Q346.5504 430.8795 347.0253 430.7323 Q347.5002 430.5851 348.0751 430.3062 L350.734 424.1393 ZM369.4517 426.0761 Q369.4037 426.3163 369.313 426.5952 Q369.2224 426.8741 369.0922 427.1762 L366.6503 432.8396 L363.8302 432.8396 L365.7066 428.4933 Q365.8972 428.044 366.0607 427.6334 Q366.2242 427.2227 366.2753 426.9671 Q366.3651 426.5177 366.1591 426.3085 Q365.953 426.0994 365.3177 426.0994 Q365.0156 426.0994 364.6034 426.2427 Q364.1912 426.386 363.5916 426.6727 L360.9327 432.8396 L358.1126 432.8396 L359.989 428.4933 Q360.1502 428.1137 360.3237 427.6721 Q360.4973 427.2305 360.5438 426.9981 Q360.6383 426.5255 360.4446 426.3124 Q360.2509 426.0994 359.6079 426.0994 Q359.2747 426.0994 358.8486 426.2543 Q358.4225 426.4093 357.874 426.6727 L355.2151 432.8396 L352.4106 432.8396 L356.1649 424.1393 L358.9695 424.1393 L358.5527 425.0999 Q359.518 424.5344 360.2672 424.2167 Q361.0164 423.8991 361.8143 423.8991 Q362.6743 423.8991 363.1864 424.2826 Q363.6985 424.6661 363.7822 425.4099 Q364.9706 424.6584 365.8678 424.2787 Q366.7649 423.8991 367.5319 423.8991 Q368.6785 423.8991 369.1697 424.4647 Q369.6609 425.0302 369.4517 426.0761 ZM380.656 426.9206 Q380.4158 428.1214 379.7991 429.2487 Q379.1824 430.3759 378.3457 431.1894 Q377.4687 432.0494 376.4855 432.5297 Q375.5024 433.01 374.4023 433.01 Q373.705 433.01 373.1518 432.8512 Q372.5987 432.6924 372.1834 432.4057 L370.6216 436.0315 L367.817 436.0315 L372.9458 424.1393 L375.7503 424.1393 L375.3598 425.0457 Q376.2585 424.5034 376.9891 424.2013 Q377.7197 423.8991 378.5332 423.8991 Q379.8503 423.8991 380.3949 424.701 Q380.9395 425.5028 380.656 426.9206 ZM376.412 429.9731 Q376.8427 429.485 377.1518 428.8303 Q377.4609 428.1757 377.6143 427.4087 Q377.7553 426.7037 377.5206 426.3279 Q377.2859 425.9522 376.4879 425.9522 Q376.0772 425.9522 375.6535 426.0955 Q375.2297 426.2388 374.7416 426.4713 L372.859 430.8485 Q373.0852 430.957 373.4029 431.0151 Q373.7205 431.0732 374.0691 431.0732 Q374.7741 431.0732 375.3769 430.7711 Q375.9796 430.4689 376.412 429.9731 ZM388.4297 427.3699 Q388.4809 427.2305 388.5157 427.1143 Q388.5506 426.9981 388.5754 426.8741 Q388.6978 426.2621 388.3832 425.9367 Q388.0687 425.6113 387.356 425.6113 Q386.496 425.6113 385.8181 426.0761 Q385.1402 426.541 384.6722 427.3699 ZM385.1588 433.072 Q382.9353 433.072 381.9235 432.0881 Q380.9117 431.1042 381.2587 429.3688 Q381.4958 428.1834 382.0893 427.1917 Q382.6827 426.2001 383.5768 425.4486 Q384.4352 424.7203 385.5895 424.2942 Q386.7439 423.8681 388.0222 423.8681 Q389.9668 423.8681 390.7973 424.6545 Q391.6279 425.4408 391.321 426.9748 Q391.2157 427.5016 391.0104 428.0052 Q390.8051 428.5088 390.5355 429.0046 L384.0742 429.0046 Q384.0648 429.0511 384.0563 429.0937 Q384.0478 429.1364 384.0385 429.1828 Q383.8572 430.0893 384.3902 430.6006 Q384.9232 431.1119 386.2326 431.1119 Q387.1468 431.1119 388.0261 430.802 Q388.9054 430.4921 389.5856 430.1125 L389.8955 430.1125 L388.9286 432.3515 Q388.0439 432.7079 387.1088 432.89 Q386.1737 433.072 385.1588 433.072 ZM404.5056 420.7847 L399.3055 432.8396 L396.5009 432.8396 L396.8914 431.9332 Q396.4374 432.1888 396.0903 432.3941 Q395.7433 432.5994 395.3373 432.7699 Q394.9577 432.9248 394.6052 433.0023 Q394.2527 433.0798 393.7801 433.0798 Q392.5172 433.0798 391.9261 432.2585 Q391.335 431.4373 391.6371 429.9266 Q391.885 428.687 392.5017 427.5985 Q393.1184 426.51 393.983 425.6732 Q394.8275 424.8598 395.8533 424.3795 Q396.879 423.8991 397.8939 423.8991 Q398.6067 423.8991 399.1049 424.0424 Q399.603 424.1858 400.1004 424.4879 L401.701 420.7847 ZM399.3768 426.1691 Q399.1738 426.0606 398.8275 425.9715 Q398.4812 425.8824 398.2023 425.8824 Q397.536 425.8824 396.9425 426.1768 Q396.3491 426.4713 395.875 426.9826 Q395.4504 427.4397 395.1149 428.1486 Q394.7795 428.8575 394.6478 429.516 Q394.4913 430.2985 394.7841 430.6548 Q395.077 431.0112 395.8207 431.0112 Q396.2003 431.0112 396.6567 430.8408 Q397.113 430.6703 397.5391 430.4379 Z" stroke="none"/>
-<path fill="black" d="M421.9023 429.3649 Q424.4008 429.3649 425.8767 431.108 Q427.3526 432.8512 427.3526 435.6984 Q427.3526 438.5688 425.8767 440.3236 Q424.4008 442.0784 421.9023 442.0784 Q419.3922 442.0784 417.9221 440.3294 Q416.452 438.5804 416.452 435.6984 Q416.452 432.8396 417.9279 431.1022 Q419.4038 429.3649 421.9023 429.3649 ZM421.9023 440.4979 Q423.5525 440.4979 424.5054 439.1034 Q425.4584 437.7088 425.4584 435.7216 Q425.4584 433.6298 424.5171 432.2818 Q423.5757 430.9337 421.9023 430.9337 Q420.2173 430.9337 419.2876 432.2643 Q418.3579 433.595 418.3579 435.7216 Q418.3579 437.7437 419.2992 439.1208 Q420.2405 440.4979 421.9023 440.4979 ZM441.4258 429.6554 L436.8354 441.7646 L435.1852 441.7646 L430.6181 429.6554 L432.5937 429.6554 L436.0219 439.2893 L439.4502 429.6554 ZM455.5221 435.7681 L447.213 435.7681 Q447.213 437.825 448.4042 439.1615 Q449.5954 440.4979 451.3269 440.4979 Q452.9771 440.4979 454.7319 439.9052 L455.0457 441.3578 Q453.442 442.0784 451.3037 442.0784 Q448.6076 442.0784 446.9574 440.3468 Q445.3072 438.6153 445.3072 435.6751 Q445.3072 432.7931 446.7889 431.079 Q448.2706 429.3649 450.618 429.3649 Q452.7098 429.3649 454.116 430.957 Q455.5221 432.5491 455.5221 435.1987 ZM453.5465 434.2922 Q453.5465 432.8745 452.6633 431.9041 Q451.7802 430.9337 450.6877 430.9337 Q449.2816 430.9337 448.3577 431.8634 Q447.4338 432.7931 447.3293 434.2922 ZM469.6302 429.9808 L468.898 431.724 Q467.701 431.201 466.8295 431.201 Q466.0276 431.201 465.2606 431.66 Q464.4937 432.1191 463.8487 432.9732 Q463.2037 433.8274 463.2037 433.932 L463.2037 441.7646 L461.4024 441.7646 L461.4024 429.6554 L463.2037 429.6554 L463.2037 432.1075 Q464.6563 429.3649 466.9689 429.3649 Q468.3402 429.3649 469.6302 429.9808 Z" stroke="none"/>
-</g>
-<g stroke-linecap="butt" stroke-width="1.9833">
-<line y2="443.0868" fill="none" x1="414.767" x2="471.8963" y1="443.0868"/>
-<line y2="444.0868" fill="none" stroke-width="2" x1="414.767" x2="471.8963" y1="444.0868"/>
-</g>
-<g fill="rgb(102,0,102)" stroke="rgb(102,0,102)">
-<path d="M492.2913 435.6054 Q491.1571 435.6984 490.1553 435.8262 Q489.1536 435.954 488.4192 436.1981 Q487.6591 436.4537 487.1943 436.9186 Q486.7294 437.3834 486.576 438.1504 Q486.4412 438.8245 486.8805 439.0975 Q487.3198 439.3706 488.2611 439.3706 Q488.877 439.3706 489.637 439.0859 Q490.3971 438.8012 491.1013 438.3596 ZM490.232 440.3817 Q489.7858 440.6373 489.1559 440.9976 Q488.5261 441.3578 488.0078 441.567 Q487.3035 441.8343 486.7062 441.9738 Q486.1089 442.1132 485.0978 442.1132 Q483.4709 442.1132 482.6249 441.201 Q481.7789 440.2887 482.0717 438.8245 Q482.3808 437.2788 483.3279 436.2039 Q484.2751 435.1289 485.8439 434.4898 Q487.3128 433.8855 489.2315 433.6182 Q491.1501 433.3509 493.3488 433.2231 Q493.3744 433.1534 493.4406 432.9965 Q493.5069 432.8396 493.5464 432.642 Q493.7114 431.8169 493.0107 431.4857 Q492.3099 431.1545 490.7875 431.1545 Q489.7532 431.1545 488.4343 431.5032 Q487.1153 431.8518 486.4412 432.0842 L486.0577 432.0842 L487.2919 428.993 Q488.0612 428.8071 489.6417 428.5746 Q491.2222 428.3422 492.7445 428.3422 Q495.8125 428.3422 497.0873 429.1441 Q498.3622 429.9459 498.0251 431.631 Q497.9787 431.8634 497.8636 432.2353 Q497.7486 432.6072 497.623 432.8861 L493.802 441.7646 L489.6417 441.7646 ZM517.767 423.6822 L509.967 441.7646 L505.7601 441.7646 L513.5602 423.6822 ZM524.4585 435.6054 Q523.3243 435.6984 522.3225 435.8262 Q521.3208 435.954 520.5863 436.1981 Q519.8263 436.4537 519.3615 436.9186 Q518.8966 437.3834 518.7432 438.1504 Q518.6084 438.8245 519.0477 439.0975 Q519.4869 439.3706 520.4283 439.3706 Q521.0442 439.3706 521.8042 439.0859 Q522.5642 438.8012 523.2685 438.3596 ZM522.3992 440.3817 Q521.9529 440.6373 521.3231 440.9976 Q520.6932 441.3578 520.1749 441.567 Q519.4707 441.8343 518.8734 441.9738 Q518.2761 442.1132 517.265 442.1132 Q515.6381 442.1132 514.7921 441.201 Q513.946 440.2887 514.2389 438.8245 Q514.548 437.2788 515.4951 436.2039 Q516.4423 435.1289 518.0111 434.4898 Q519.48 433.8855 521.3986 433.6182 Q523.3173 433.3509 525.516 433.2231 Q525.5416 433.1534 525.6078 432.9965 Q525.674 432.8396 525.7136 432.642 Q525.8785 431.8169 525.1778 431.4857 Q524.4771 431.1545 522.9547 431.1545 Q521.9204 431.1545 520.6014 431.5032 Q519.2824 431.8518 518.6084 432.0842 L518.2249 432.0842 L519.4591 428.993 Q520.2284 428.8071 521.8088 428.5746 Q523.3893 428.3422 524.9117 428.3422 Q527.9797 428.3422 529.2545 429.1441 Q530.5294 429.9459 530.1923 431.631 Q530.1458 431.8634 530.0308 432.2353 Q529.9157 432.6072 529.7902 432.8861 L525.9692 441.7646 L521.8088 441.7646 ZM541.0069 441.7646 L528.7466 441.7646 L529.8646 439.1963 L539.9494 431.6542 L533.3835 431.6542 L534.6571 428.7141 L546.5106 428.7141 L545.4136 431.2359 L535.4357 438.7664 L542.3038 438.7664 ZM547.8471 446.5525 L543.2568 446.5525 L547.5891 441.5089 L547.9982 428.7141 L552.2747 428.7141 L551.6913 437.2672 L558.3758 428.7141 L562.7918 428.7141 Z" stroke="none"/>
-<line stroke-linecap="butt" fill="none" x1="481.2629" x2="567.1544" y1="432.1935" y2="432.1935" stroke-width="1.9833"/>
-<line stroke-linecap="butt" fill="none" x1="481.2629" x2="567.1544" y1="443.0868" y2="443.0868" stroke-width="1.9833"/>
-<line stroke-linecap="butt" fill="none" x1="481.2629" x2="567.1544" y1="444.0868" y2="444.0868" stroke-width="2"/>
-<path fill="black" d="M577.0121 450.6896 L575.5557 450.6896 L575.5557 449.7831 Q574.9281 450.3254 574.2463 450.6276 Q573.5646 450.9297 572.7666 450.9297 Q571.2171 450.9297 570.3068 449.7366 Q569.3965 448.5435 569.3965 446.4285 Q569.3965 445.3284 569.7103 444.4684 Q570.024 443.6085 570.5586 443.0042 Q571.0854 442.4153 571.7866 442.1055 Q572.4877 441.7956 573.2392 441.7956 Q573.921 441.7956 574.4478 441.9389 Q574.9746 442.0822 575.5557 442.3844 L575.5557 438.6346 L577.0121 438.6346 ZM575.5557 448.5591 L575.5557 443.593 Q574.9669 443.3296 574.502 443.2288 Q574.0372 443.1281 573.4871 443.1281 Q572.263 443.1281 571.5812 443.9803 Q570.8995 444.8326 570.8995 446.3975 Q570.8995 447.9392 571.4263 448.7411 Q571.9531 449.543 573.1152 449.543 Q573.735 449.543 574.3703 449.2679 Q575.0056 448.9929 575.5557 448.5591 ZM587.2542 446.3665 Q587.2542 448.4816 586.1696 449.7057 Q585.085 450.9297 583.2643 450.9297 Q581.4282 450.9297 580.3474 449.7057 Q579.2667 448.4816 579.2667 446.3665 Q579.2667 444.2515 580.3474 443.0235 Q581.4282 441.7956 583.2643 441.7956 Q585.085 441.7956 586.1696 443.0235 Q587.2542 444.2515 587.2542 446.3665 ZM585.7512 446.3665 Q585.7512 444.6853 585.0927 443.868 Q584.4341 443.0506 583.2643 443.0506 Q582.079 443.0506 581.4243 443.868 Q580.7697 444.6853 580.7697 446.3665 Q580.7697 447.9935 581.4282 448.8341 Q582.0867 449.6747 583.2643 449.6747 Q584.4265 449.6747 585.0888 448.8418 Q585.7512 448.009 585.7512 446.3665 ZM596.5278 449.7057 Q596.5278 451.9059 595.5284 452.9363 Q594.529 453.9667 592.4527 453.9667 Q591.7632 453.9667 591.1085 453.8699 Q590.4539 453.773 589.8186 453.5948 L589.8186 452.1074 L589.8961 452.1074 Q590.2524 452.2468 591.0272 452.4521 Q591.8019 452.6574 592.5767 452.6574 Q593.3204 452.6574 593.8085 452.4792 Q594.2966 452.301 594.5677 451.9834 Q594.8389 451.6812 594.9551 451.2551 Q595.0714 450.829 595.0714 450.3022 L595.0714 449.512 Q594.4128 450.0388 593.8124 450.2983 Q593.212 450.5579 592.2823 450.5579 Q590.7328 450.5579 589.8224 449.4384 Q588.9122 448.3189 588.9122 446.2813 Q588.9122 445.1657 589.226 444.3561 Q589.5397 443.5465 590.082 442.9577 Q590.5856 442.4076 591.3061 442.1016 Q592.0266 441.7956 592.7394 441.7956 Q593.4908 441.7956 593.9984 441.9466 Q594.5058 442.0977 595.0714 442.4076 L595.1643 442.0357 L596.5278 442.0357 ZM595.0714 448.3111 L595.0714 443.593 Q594.4903 443.3296 593.9906 443.2172 Q593.4908 443.1049 592.9951 443.1049 Q591.7942 443.1049 591.1047 443.9106 Q590.4152 444.7163 590.4152 446.2503 Q590.4152 447.7068 590.9265 448.4583 Q591.4378 449.2098 592.6232 449.2098 Q593.2584 449.2098 593.8976 448.9658 Q594.5367 448.7217 595.0714 448.3111 Z" stroke="none"/>
-</g>
-<g fill="rgb(0,0,0)" fill-opacity="0.349" transform="translate(0,1.811)" stroke-opacity="0.349" stroke="rgb(0,0,0)">
-<path d="M139.7672 494.3594 L224.4545 494.3594 L224.4545 484.8195 L243.5345 503.8994 L224.4545 522.9794 L224.4545 513.4395 L139.7672 513.4395 Z" stroke="none"/>
-</g>
-<g fill="rgb(185,113,53)" fill-opacity="0.502" stroke-opacity="0.502" stroke="rgb(185,113,53)">
-<path d="M139.7672 494.3594 L224.4545 494.3594 L224.4545 484.8195 L243.5345 503.8994 L224.4545 522.9794 L224.4545 513.4395 L139.7672 513.4395 Z" stroke="none"/>
-</g>
-<g stroke-linecap="butt" transform="translate(0,1.811)" fill-opacity="0.349" fill="rgb(0,0,0)" stroke-linejoin="round" stroke="rgb(0,0,0)" stroke-width="0.75" stroke-opacity="0.349" stroke-miterlimit="1">
-<path fill="none" d="M139.7672 494.3594 L224.4545 494.3594 L224.4545 484.8195 L243.5345 503.8994 L224.4545 522.9794 L224.4545 513.4395 L139.7672 513.4395 Z"/>
-</g>
-<g fill="rgb(75,122,179)" stroke-width="0.75" stroke-miterlimit="1" stroke-linejoin="round" stroke-linecap="butt" stroke="rgb(75,122,179)">
-<path fill="none" d="M139.7672 494.3594 L224.4545 494.3594 L224.4545 484.8195 L243.5345 503.8994 L224.4545 522.9794 L224.4545 513.4395 L139.7672 513.4395 Z"/>
-</g>
-<g stroke-linecap="butt" transform="translate(0,1.811)" fill-opacity="0.349" fill="rgb(0,0,0)" stroke-linejoin="round" stroke="rgb(0,0,0)" stroke-width="0.75" stroke-opacity="0.349" stroke-miterlimit="1">
-<path d="M280.6709 500.5583 C280.6709 488.1755 303.5645 478.1372 331.8052 478.1372 C360.0459 478.1372 382.9395 488.1755 382.9395 500.5583 C382.9395 512.9412 360.0459 522.9794 331.8052 522.9794 C303.5645 522.9794 280.6709 512.9412 280.6709 500.5583 Z" stroke="none"/>
-</g>
-<g stroke-linecap="butt" fill-opacity="0.502" fill="rgb(185,113,53)" stroke-linejoin="round" stroke="rgb(185,113,53)" stroke-width="0.75" stroke-opacity="0.502" stroke-miterlimit="1">
-<path d="M280.6709 500.5583 C280.6709 488.1755 303.5645 478.1372 331.8052 478.1372 C360.0459 478.1372 382.9395 488.1755 382.9395 500.5583 C382.9395 512.9412 360.0459 522.9794 331.8052 522.9794 C303.5645 522.9794 280.6709 512.9412 280.6709 500.5583 Z" stroke="none"/>
-</g>
-<g font-size="18" stroke-linecap="butt" fill="white" font-family="'Calibri'" stroke-linejoin="round" stroke="white" stroke-width="0.75" stroke-miterlimit="1">
-<text x="318.9292" xml:space="preserve" y="506.7107" stroke="none">POI</text>
-</g>
-<g stroke-linecap="butt" transform="translate(0,1.811)" fill-opacity="0.349" fill="rgb(0,0,0)" stroke-linejoin="round" stroke="rgb(0,0,0)" stroke-width="0.75" stroke-opacity="0.349" stroke-miterlimit="1">
-<path fill="none" d="M280.6709 500.5583 C280.6709 488.1755 303.5645 478.1372 331.8052 478.1372 C360.0459 478.1372 382.9395 488.1755 382.9395 500.5583 C382.9395 512.9412 360.0459 522.9794 331.8052 522.9794 C303.5645 522.9794 280.6709 512.9412 280.6709 500.5583 Z"/>
-</g>
-<g fill="rgb(75,122,179)" stroke-width="0.75" stroke-miterlimit="1" stroke-linejoin="round" stroke-linecap="butt" stroke="rgb(75,122,179)">
-<path fill="none" d="M280.6709 500.5583 C280.6709 488.1755 303.5645 478.1372 331.8052 478.1372 C360.0459 478.1372 382.9395 488.1755 382.9395 500.5583 C382.9395 512.9412 360.0459 522.9794 331.8052 522.9794 C303.5645 522.9794 280.6709 512.9412 280.6709 500.5583 Z"/>
-</g>
-<g stroke-linecap="butt" transform="translate(0,1.811)" fill-opacity="0.349" fill="rgb(0,0,0)" stroke-linejoin="round" stroke="rgb(0,0,0)" stroke-width="0.75" stroke-opacity="0.349" stroke-miterlimit="1">
-<path d="M417.029 503.8994 L436.109 484.8195 L436.109 494.3594 L520.434 494.3594 L520.434 513.4395 L436.109 513.4395 L436.109 522.9794 Z" stroke="none"/>
-</g>
-<g stroke-linecap="butt" fill-opacity="0.502" fill="rgb(185,113,53)" stroke-linejoin="round" stroke="rgb(185,113,53)" stroke-width="0.75" stroke-opacity="0.502" stroke-miterlimit="1">
-<path d="M417.029 503.8994 L436.109 484.8195 L436.109 494.3594 L520.434 494.3594 L520.434 513.4395 L436.109 513.4395 L436.109 522.9794 Z" stroke="none"/>
-</g>
-<g stroke-linecap="butt" transform="translate(0,1.811)" fill-opacity="0.349" fill="rgb(0,0,0)" stroke-linejoin="round" stroke="rgb(0,0,0)" stroke-width="0.75" stroke-opacity="0.349" stroke-miterlimit="1">
-<path fill="none" d="M417.029 503.8994 L436.109 484.8195 L436.109 494.3594 L520.434 494.3594 L520.434 513.4395 L436.109 513.4395 L436.109 522.9794 Z"/>
-</g>
-<g fill="rgb(75,122,179)" stroke-width="0.75" stroke-miterlimit="1" stroke-linejoin="round" stroke-linecap="butt" stroke="rgb(75,122,179)">
-<path fill="none" d="M417.029 503.8994 L436.109 484.8195 L436.109 494.3594 L520.434 494.3594 L520.434 513.4395 L436.109 513.4395 L436.109 522.9794 Z"/>
-</g>
-</g>
-</svg>
diff --git a/trunk/test-data/slideshow/prProps.pptx b/trunk/test-data/slideshow/prProps.pptx
deleted file mode 100644
index 2829fca..0000000
--- a/trunk/test-data/slideshow/prProps.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/present1.pptx b/trunk/test-data/slideshow/present1.pptx
deleted file mode 100644
index c7f4c9f..0000000
--- a/trunk/test-data/slideshow/present1.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/ringin.wav b/trunk/test-data/slideshow/ringin.wav
deleted file mode 100644
index f8d4292..0000000
--- a/trunk/test-data/slideshow/ringin.wav
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/sample.pptx b/trunk/test-data/slideshow/sample.pptx
deleted file mode 100644
index fbd540c..0000000
--- a/trunk/test-data/slideshow/sample.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/sample_pptx_grouping_issues.pptx b/trunk/test-data/slideshow/sample_pptx_grouping_issues.pptx
deleted file mode 100644
index bf0c702..0000000
--- a/trunk/test-data/slideshow/sample_pptx_grouping_issues.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/santa.wmf b/trunk/test-data/slideshow/santa.wmf
deleted file mode 100644
index 20993ba..0000000
--- a/trunk/test-data/slideshow/santa.wmf
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/sci_cec.dib b/trunk/test-data/slideshow/sci_cec.dib
deleted file mode 100644
index 61bfb62..0000000
--- a/trunk/test-data/slideshow/sci_cec.dib
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/shapes.pptx b/trunk/test-data/slideshow/shapes.pptx
deleted file mode 100644
index 9d1500d..0000000
--- a/trunk/test-data/slideshow/shapes.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/slide_master.ppt b/trunk/test-data/slideshow/slide_master.ppt
deleted file mode 100644
index 0889a5d..0000000
--- a/trunk/test-data/slideshow/slide_master.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/sound.ppt b/trunk/test-data/slideshow/sound.ppt
deleted file mode 100644
index 2d1316a..0000000
--- a/trunk/test-data/slideshow/sound.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/table_test.ppt b/trunk/test-data/slideshow/table_test.ppt
deleted file mode 100644
index d1c688a..0000000
--- a/trunk/test-data/slideshow/table_test.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/table_test.pptx b/trunk/test-data/slideshow/table_test.pptx
deleted file mode 100644
index 451a6dc..0000000
--- a/trunk/test-data/slideshow/table_test.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/table_test2.pptx b/trunk/test-data/slideshow/table_test2.pptx
deleted file mode 100644
index 6250717..0000000
--- a/trunk/test-data/slideshow/table_test2.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/testPPT.ppsm b/trunk/test-data/slideshow/testPPT.ppsm
deleted file mode 100644
index 6ba1432..0000000
--- a/trunk/test-data/slideshow/testPPT.ppsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/testPPT.ppsx b/trunk/test-data/slideshow/testPPT.ppsx
deleted file mode 100644
index 814ec0e..0000000
--- a/trunk/test-data/slideshow/testPPT.ppsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/testPPT.pptm b/trunk/test-data/slideshow/testPPT.pptm
deleted file mode 100644
index e8fe162..0000000
--- a/trunk/test-data/slideshow/testPPT.pptm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/testPPT.pptx b/trunk/test-data/slideshow/testPPT.pptx
deleted file mode 100644
index 38bc6a2..0000000
--- a/trunk/test-data/slideshow/testPPT.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/testPPT.thmx b/trunk/test-data/slideshow/testPPT.thmx
deleted file mode 100644
index 9144088..0000000
--- a/trunk/test-data/slideshow/testPPT.thmx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/testPPT.xps b/trunk/test-data/slideshow/testPPT.xps
deleted file mode 100644
index 678033a..0000000
--- a/trunk/test-data/slideshow/testPPT.xps
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/testtiff.tif b/trunk/test-data/slideshow/testtiff.tif
deleted file mode 100644
index 99e6bde..0000000
--- a/trunk/test-data/slideshow/testtiff.tif
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/text-margins.ppt b/trunk/test-data/slideshow/text-margins.ppt
deleted file mode 100644
index cf539ae..0000000
--- a/trunk/test-data/slideshow/text-margins.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/text_shapes.ppt b/trunk/test-data/slideshow/text_shapes.ppt
deleted file mode 100644
index c36183a..0000000
--- a/trunk/test-data/slideshow/text_shapes.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/themes.pptx b/trunk/test-data/slideshow/themes.pptx
deleted file mode 100644
index 5f2e751..0000000
--- a/trunk/test-data/slideshow/themes.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/tomcat.png b/trunk/test-data/slideshow/tomcat.png
deleted file mode 100644
index b10c6b7..0000000
--- a/trunk/test-data/slideshow/tomcat.png
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/with_japanese.pptx b/trunk/test-data/slideshow/with_japanese.pptx
deleted file mode 100644
index 432a806..0000000
--- a/trunk/test-data/slideshow/with_japanese.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/with_textbox.ppt b/trunk/test-data/slideshow/with_textbox.ppt
deleted file mode 100644
index d79584f..0000000
--- a/trunk/test-data/slideshow/with_textbox.ppt
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/slideshow/wrench.emf b/trunk/test-data/slideshow/wrench.emf
deleted file mode 100644
index 8001607..0000000
--- a/trunk/test-data/slideshow/wrench.emf
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/12561-1.xls b/trunk/test-data/spreadsheet/12561-1.xls
deleted file mode 100644
index 40b7276..0000000
--- a/trunk/test-data/spreadsheet/12561-1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/12561-2.xls b/trunk/test-data/spreadsheet/12561-2.xls
deleted file mode 100644
index bb360c1..0000000
--- a/trunk/test-data/spreadsheet/12561-2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/12843-1.xls b/trunk/test-data/spreadsheet/12843-1.xls
deleted file mode 100644
index 0ef5df4..0000000
--- a/trunk/test-data/spreadsheet/12843-1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/12843-2.xls b/trunk/test-data/spreadsheet/12843-2.xls
deleted file mode 100644
index beff646..0000000
--- a/trunk/test-data/spreadsheet/12843-2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/13224.xls b/trunk/test-data/spreadsheet/13224.xls
deleted file mode 100644
index 81f69d3..0000000
--- a/trunk/test-data/spreadsheet/13224.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/13796.xls b/trunk/test-data/spreadsheet/13796.xls
deleted file mode 100644
index efae53f..0000000
--- a/trunk/test-data/spreadsheet/13796.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/14330-1.xls b/trunk/test-data/spreadsheet/14330-1.xls
deleted file mode 100644
index 6fd2d95..0000000
--- a/trunk/test-data/spreadsheet/14330-1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/14330-2.xls b/trunk/test-data/spreadsheet/14330-2.xls
deleted file mode 100644
index 8e56a6d..0000000
--- a/trunk/test-data/spreadsheet/14330-2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/14460.xls b/trunk/test-data/spreadsheet/14460.xls
deleted file mode 100644
index 284d684..0000000
--- a/trunk/test-data/spreadsheet/14460.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/15228.xls b/trunk/test-data/spreadsheet/15228.xls
deleted file mode 100644
index 3b26ed1..0000000
--- a/trunk/test-data/spreadsheet/15228.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/15375.xls b/trunk/test-data/spreadsheet/15375.xls
deleted file mode 100644
index 99ab193..0000000
--- a/trunk/test-data/spreadsheet/15375.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/15556.xls b/trunk/test-data/spreadsheet/15556.xls
deleted file mode 100644
index 82b48a5..0000000
--- a/trunk/test-data/spreadsheet/15556.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/15573.xls b/trunk/test-data/spreadsheet/15573.xls
deleted file mode 100644
index 172f255..0000000
--- a/trunk/test-data/spreadsheet/15573.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/1900DateWindowing.xls b/trunk/test-data/spreadsheet/1900DateWindowing.xls
deleted file mode 100644
index 94fe5c1..0000000
--- a/trunk/test-data/spreadsheet/1900DateWindowing.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/1904DateWindowing.xls b/trunk/test-data/spreadsheet/1904DateWindowing.xls
deleted file mode 100644
index 8c0dba1..0000000
--- a/trunk/test-data/spreadsheet/1904DateWindowing.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/19599-1.xls b/trunk/test-data/spreadsheet/19599-1.xls
deleted file mode 100644
index 4ce27d1..0000000
--- a/trunk/test-data/spreadsheet/19599-1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/19599-2.xls b/trunk/test-data/spreadsheet/19599-2.xls
deleted file mode 100644
index 17f4583..0000000
--- a/trunk/test-data/spreadsheet/19599-2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/22742.xls b/trunk/test-data/spreadsheet/22742.xls
deleted file mode 100644
index cd367ca..0000000
--- a/trunk/test-data/spreadsheet/22742.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/24207.xls b/trunk/test-data/spreadsheet/24207.xls
deleted file mode 100644
index eca5642..0000000
--- a/trunk/test-data/spreadsheet/24207.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/24215.xls b/trunk/test-data/spreadsheet/24215.xls
deleted file mode 100644
index bcbbe63..0000000
--- a/trunk/test-data/spreadsheet/24215.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/25183.xls b/trunk/test-data/spreadsheet/25183.xls
deleted file mode 100644
index 635a649..0000000
--- a/trunk/test-data/spreadsheet/25183.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/25695.xls b/trunk/test-data/spreadsheet/25695.xls
deleted file mode 100644
index 08b5035..0000000
--- a/trunk/test-data/spreadsheet/25695.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/26100.xls b/trunk/test-data/spreadsheet/26100.xls
deleted file mode 100644
index 802cf89..0000000
--- a/trunk/test-data/spreadsheet/26100.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/27272_1.xls b/trunk/test-data/spreadsheet/27272_1.xls
deleted file mode 100644
index 1715db8..0000000
--- a/trunk/test-data/spreadsheet/27272_1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/27272_2.xls b/trunk/test-data/spreadsheet/27272_2.xls
deleted file mode 100644
index 3e69928..0000000
--- a/trunk/test-data/spreadsheet/27272_2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/27349-vlookupAcrossSheets.xls b/trunk/test-data/spreadsheet/27349-vlookupAcrossSheets.xls
deleted file mode 100644
index c21d434..0000000
--- a/trunk/test-data/spreadsheet/27349-vlookupAcrossSheets.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/27364.xls b/trunk/test-data/spreadsheet/27364.xls
deleted file mode 100644
index 73aa3fa..0000000
--- a/trunk/test-data/spreadsheet/27364.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/27394.xls b/trunk/test-data/spreadsheet/27394.xls
deleted file mode 100644
index e9ba1cc..0000000
--- a/trunk/test-data/spreadsheet/27394.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/27852.xls b/trunk/test-data/spreadsheet/27852.xls
deleted file mode 100644
index b4b0a4c..0000000
--- a/trunk/test-data/spreadsheet/27852.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/27933.xls b/trunk/test-data/spreadsheet/27933.xls
deleted file mode 100644
index 7972237..0000000
--- a/trunk/test-data/spreadsheet/27933.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/28772.xls b/trunk/test-data/spreadsheet/28772.xls
deleted file mode 100644
index a5190de..0000000
--- a/trunk/test-data/spreadsheet/28772.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/28774.xls b/trunk/test-data/spreadsheet/28774.xls
deleted file mode 100644
index 476f3ba..0000000
--- a/trunk/test-data/spreadsheet/28774.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/29675.xls b/trunk/test-data/spreadsheet/29675.xls
deleted file mode 100644
index a80df1f..0000000
--- a/trunk/test-data/spreadsheet/29675.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/29942.xls b/trunk/test-data/spreadsheet/29942.xls
deleted file mode 100644
index 9fac290..0000000
--- a/trunk/test-data/spreadsheet/29942.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/29982.xls b/trunk/test-data/spreadsheet/29982.xls
deleted file mode 100644
index 8430ff7..0000000
--- a/trunk/test-data/spreadsheet/29982.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/30070.xls b/trunk/test-data/spreadsheet/30070.xls
deleted file mode 100644
index 5ae6685..0000000
--- a/trunk/test-data/spreadsheet/30070.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/30540.xls b/trunk/test-data/spreadsheet/30540.xls
deleted file mode 100644
index bf91e1b..0000000
--- a/trunk/test-data/spreadsheet/30540.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/30978-alt.xls b/trunk/test-data/spreadsheet/30978-alt.xls
deleted file mode 100644
index c591582..0000000
--- a/trunk/test-data/spreadsheet/30978-alt.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/30978-deleted.xls b/trunk/test-data/spreadsheet/30978-deleted.xls
deleted file mode 100644
index 0a2cabe..0000000
--- a/trunk/test-data/spreadsheet/30978-deleted.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/31661.xls b/trunk/test-data/spreadsheet/31661.xls
deleted file mode 100644
index 79050b4..0000000
--- a/trunk/test-data/spreadsheet/31661.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/31749.xls b/trunk/test-data/spreadsheet/31749.xls
deleted file mode 100644
index 6962a09..0000000
--- a/trunk/test-data/spreadsheet/31749.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/31979.xls b/trunk/test-data/spreadsheet/31979.xls
deleted file mode 100644
index a0c743d..0000000
--- a/trunk/test-data/spreadsheet/31979.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/32822.xls b/trunk/test-data/spreadsheet/32822.xls
deleted file mode 100644
index b95a5fc..0000000
--- a/trunk/test-data/spreadsheet/32822.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/33082.xls b/trunk/test-data/spreadsheet/33082.xls
deleted file mode 100644
index 74a2df4..0000000
--- a/trunk/test-data/spreadsheet/33082.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/34775.xls b/trunk/test-data/spreadsheet/34775.xls
deleted file mode 100644
index 9ad8f23..0000000
--- a/trunk/test-data/spreadsheet/34775.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/35564.xls b/trunk/test-data/spreadsheet/35564.xls
deleted file mode 100644
index db18e01..0000000
--- a/trunk/test-data/spreadsheet/35564.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/35565.xls b/trunk/test-data/spreadsheet/35565.xls
deleted file mode 100644
index ee97f0a..0000000
--- a/trunk/test-data/spreadsheet/35565.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/35897-type4.xls b/trunk/test-data/spreadsheet/35897-type4.xls
deleted file mode 100644
index c3eadbb..0000000
--- a/trunk/test-data/spreadsheet/35897-type4.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/36947.xls b/trunk/test-data/spreadsheet/36947.xls
deleted file mode 100644
index 4c7bde6..0000000
--- a/trunk/test-data/spreadsheet/36947.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/37376.xls b/trunk/test-data/spreadsheet/37376.xls
deleted file mode 100644
index 59176a6..0000000
--- a/trunk/test-data/spreadsheet/37376.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/37630.xls b/trunk/test-data/spreadsheet/37630.xls
deleted file mode 100644
index ad2b0ef..0000000
--- a/trunk/test-data/spreadsheet/37630.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/37684-1.xls b/trunk/test-data/spreadsheet/37684-1.xls
deleted file mode 100644
index a59769e..0000000
--- a/trunk/test-data/spreadsheet/37684-1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/37684-2.xls b/trunk/test-data/spreadsheet/37684-2.xls
deleted file mode 100644
index b17d0fa..0000000
--- a/trunk/test-data/spreadsheet/37684-2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/37684.xls b/trunk/test-data/spreadsheet/37684.xls
deleted file mode 100644
index 3aecf07..0000000
--- a/trunk/test-data/spreadsheet/37684.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/39234.xls b/trunk/test-data/spreadsheet/39234.xls
deleted file mode 100644
index 20fc9a0..0000000
--- a/trunk/test-data/spreadsheet/39234.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/39512.xls b/trunk/test-data/spreadsheet/39512.xls
deleted file mode 100644
index 44cf571..0000000
--- a/trunk/test-data/spreadsheet/39512.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/39634.xls b/trunk/test-data/spreadsheet/39634.xls
deleted file mode 100644
index 0f76bff..0000000
--- a/trunk/test-data/spreadsheet/39634.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/3dFormulas.xls b/trunk/test-data/spreadsheet/3dFormulas.xls
deleted file mode 100644
index 82519ed..0000000
--- a/trunk/test-data/spreadsheet/3dFormulas.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/40285.xls b/trunk/test-data/spreadsheet/40285.xls
deleted file mode 100644
index 077e1c8..0000000
--- a/trunk/test-data/spreadsheet/40285.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/41139.xls b/trunk/test-data/spreadsheet/41139.xls
deleted file mode 100644
index e4925fe..0000000
--- a/trunk/test-data/spreadsheet/41139.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/41546.xls b/trunk/test-data/spreadsheet/41546.xls
deleted file mode 100644
index 1332f3e..0000000
--- a/trunk/test-data/spreadsheet/41546.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/42016.xls b/trunk/test-data/spreadsheet/42016.xls
deleted file mode 100644
index 4cbdab7..0000000
--- a/trunk/test-data/spreadsheet/42016.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/42464-ExpPtg-bad.xls b/trunk/test-data/spreadsheet/42464-ExpPtg-bad.xls
deleted file mode 100644
index 54a7edb..0000000
--- a/trunk/test-data/spreadsheet/42464-ExpPtg-bad.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/42464-ExpPtg-ok.xls b/trunk/test-data/spreadsheet/42464-ExpPtg-ok.xls
deleted file mode 100644
index 5ae84bc..0000000
--- a/trunk/test-data/spreadsheet/42464-ExpPtg-ok.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/42726.xls b/trunk/test-data/spreadsheet/42726.xls
deleted file mode 100644
index e492c5d..0000000
--- a/trunk/test-data/spreadsheet/42726.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/42844.xls b/trunk/test-data/spreadsheet/42844.xls
deleted file mode 100644
index 50bb5a8..0000000
--- a/trunk/test-data/spreadsheet/42844.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/43251.xls b/trunk/test-data/spreadsheet/43251.xls
deleted file mode 100644
index abc476a..0000000
--- a/trunk/test-data/spreadsheet/43251.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/43493.xls b/trunk/test-data/spreadsheet/43493.xls
deleted file mode 100644
index 2a02f3d..0000000
--- a/trunk/test-data/spreadsheet/43493.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/43623.xls b/trunk/test-data/spreadsheet/43623.xls
deleted file mode 100644
index 401cb2a..0000000
--- a/trunk/test-data/spreadsheet/43623.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/43902.xls b/trunk/test-data/spreadsheet/43902.xls
deleted file mode 100644
index a67720d..0000000
--- a/trunk/test-data/spreadsheet/43902.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44010-SingleChart.xls b/trunk/test-data/spreadsheet/44010-SingleChart.xls
deleted file mode 100644
index fe0df27..0000000
--- a/trunk/test-data/spreadsheet/44010-SingleChart.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44010-TwoCharts.xls b/trunk/test-data/spreadsheet/44010-TwoCharts.xls
deleted file mode 100644
index 4a61523..0000000
--- a/trunk/test-data/spreadsheet/44010-TwoCharts.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44167.xls b/trunk/test-data/spreadsheet/44167.xls
deleted file mode 100644
index c547021..0000000
--- a/trunk/test-data/spreadsheet/44167.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44200.xls b/trunk/test-data/spreadsheet/44200.xls
deleted file mode 100644
index 691afed..0000000
--- a/trunk/test-data/spreadsheet/44200.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44201.xls b/trunk/test-data/spreadsheet/44201.xls
deleted file mode 100644
index 593d5aa..0000000
--- a/trunk/test-data/spreadsheet/44201.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44235.xls b/trunk/test-data/spreadsheet/44235.xls
deleted file mode 100644
index 39b7658..0000000
--- a/trunk/test-data/spreadsheet/44235.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44297.xls b/trunk/test-data/spreadsheet/44297.xls
deleted file mode 100644
index bc65efd..0000000
--- a/trunk/test-data/spreadsheet/44297.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44593.xls b/trunk/test-data/spreadsheet/44593.xls
deleted file mode 100644
index 84d1311..0000000
--- a/trunk/test-data/spreadsheet/44593.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44636.xls b/trunk/test-data/spreadsheet/44636.xls
deleted file mode 100644
index 3108a62..0000000
--- a/trunk/test-data/spreadsheet/44636.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44643.xls b/trunk/test-data/spreadsheet/44643.xls
deleted file mode 100644
index 7ae5071..0000000
--- a/trunk/test-data/spreadsheet/44643.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44693.xls b/trunk/test-data/spreadsheet/44693.xls
deleted file mode 100644
index dd954c6..0000000
--- a/trunk/test-data/spreadsheet/44693.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44840.xls b/trunk/test-data/spreadsheet/44840.xls
deleted file mode 100644
index 66dd918..0000000
--- a/trunk/test-data/spreadsheet/44840.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44861.xls b/trunk/test-data/spreadsheet/44861.xls
deleted file mode 100644
index bab82b3..0000000
--- a/trunk/test-data/spreadsheet/44861.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44891.xls b/trunk/test-data/spreadsheet/44891.xls
deleted file mode 100644
index 30082aa..0000000
--- a/trunk/test-data/spreadsheet/44891.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44958.xls b/trunk/test-data/spreadsheet/44958.xls
deleted file mode 100644
index c167011..0000000
--- a/trunk/test-data/spreadsheet/44958.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/44958_1.xls b/trunk/test-data/spreadsheet/44958_1.xls
deleted file mode 100644
index c407c2f..0000000
--- a/trunk/test-data/spreadsheet/44958_1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45129.xls b/trunk/test-data/spreadsheet/45129.xls
deleted file mode 100644
index c3c3a8a..0000000
--- a/trunk/test-data/spreadsheet/45129.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45290.xls b/trunk/test-data/spreadsheet/45290.xls
deleted file mode 100644
index dd06449..0000000
--- a/trunk/test-data/spreadsheet/45290.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45322.xls b/trunk/test-data/spreadsheet/45322.xls
deleted file mode 100644
index 7117214..0000000
--- a/trunk/test-data/spreadsheet/45322.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45365-2.xls b/trunk/test-data/spreadsheet/45365-2.xls
deleted file mode 100644
index b5e66c1..0000000
--- a/trunk/test-data/spreadsheet/45365-2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45365.xls b/trunk/test-data/spreadsheet/45365.xls
deleted file mode 100644
index fbf1d97..0000000
--- a/trunk/test-data/spreadsheet/45365.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45430.xlsx b/trunk/test-data/spreadsheet/45430.xlsx
deleted file mode 100644
index 48af3f9..0000000
--- a/trunk/test-data/spreadsheet/45430.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45431.xlsm b/trunk/test-data/spreadsheet/45431.xlsm
deleted file mode 100644
index fabbd0d..0000000
--- a/trunk/test-data/spreadsheet/45431.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45492.xls b/trunk/test-data/spreadsheet/45492.xls
deleted file mode 100644
index 7e044e8..0000000
--- a/trunk/test-data/spreadsheet/45492.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45538_classic_Footer.xls b/trunk/test-data/spreadsheet/45538_classic_Footer.xls
deleted file mode 100644
index 2ab1d24..0000000
--- a/trunk/test-data/spreadsheet/45538_classic_Footer.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45538_classic_Header.xls b/trunk/test-data/spreadsheet/45538_classic_Header.xls
deleted file mode 100644
index fe67b84..0000000
--- a/trunk/test-data/spreadsheet/45538_classic_Header.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45538_form_Footer.xls b/trunk/test-data/spreadsheet/45538_form_Footer.xls
deleted file mode 100644
index 6d1731d..0000000
--- a/trunk/test-data/spreadsheet/45538_form_Footer.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45538_form_Header.xls b/trunk/test-data/spreadsheet/45538_form_Header.xls
deleted file mode 100644
index c2a2821..0000000
--- a/trunk/test-data/spreadsheet/45538_form_Header.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45540_classic_Footer.xlsx b/trunk/test-data/spreadsheet/45540_classic_Footer.xlsx
deleted file mode 100644
index dda1c10..0000000
--- a/trunk/test-data/spreadsheet/45540_classic_Footer.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45540_classic_Header.xlsx b/trunk/test-data/spreadsheet/45540_classic_Header.xlsx
deleted file mode 100644
index b01180b..0000000
--- a/trunk/test-data/spreadsheet/45540_classic_Header.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45540_form_Footer.xlsx b/trunk/test-data/spreadsheet/45540_form_Footer.xlsx
deleted file mode 100644
index c14dcbf..0000000
--- a/trunk/test-data/spreadsheet/45540_form_Footer.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45540_form_Header.xlsx b/trunk/test-data/spreadsheet/45540_form_Header.xlsx
deleted file mode 100644
index 13df686..0000000
--- a/trunk/test-data/spreadsheet/45540_form_Header.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45544.xlsx b/trunk/test-data/spreadsheet/45544.xlsx
deleted file mode 100644
index 2390e6d..0000000
--- a/trunk/test-data/spreadsheet/45544.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45565.xls b/trunk/test-data/spreadsheet/45565.xls
deleted file mode 100644
index 7facba5..0000000
--- a/trunk/test-data/spreadsheet/45565.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45672.xls b/trunk/test-data/spreadsheet/45672.xls
deleted file mode 100644
index 752ce5d..0000000
--- a/trunk/test-data/spreadsheet/45672.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45720.xls b/trunk/test-data/spreadsheet/45720.xls
deleted file mode 100644
index 9c6c484..0000000
--- a/trunk/test-data/spreadsheet/45720.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45761.xls b/trunk/test-data/spreadsheet/45761.xls
deleted file mode 100644
index ee44612..0000000
--- a/trunk/test-data/spreadsheet/45761.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45784.xls b/trunk/test-data/spreadsheet/45784.xls
deleted file mode 100644
index f0d25fd..0000000
--- a/trunk/test-data/spreadsheet/45784.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/45829.png b/trunk/test-data/spreadsheet/45829.png
deleted file mode 100644
index eccaf30..0000000
--- a/trunk/test-data/spreadsheet/45829.png
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46136-NoWarnings.xls b/trunk/test-data/spreadsheet/46136-NoWarnings.xls
deleted file mode 100644
index 3a67049..0000000
--- a/trunk/test-data/spreadsheet/46136-NoWarnings.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46136-WithWarnings.xls b/trunk/test-data/spreadsheet/46136-WithWarnings.xls
deleted file mode 100644
index c943b82..0000000
--- a/trunk/test-data/spreadsheet/46136-WithWarnings.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46137.xls b/trunk/test-data/spreadsheet/46137.xls
deleted file mode 100644
index 5fc399d..0000000
--- a/trunk/test-data/spreadsheet/46137.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46250.xls b/trunk/test-data/spreadsheet/46250.xls
deleted file mode 100644
index 7260bf3..0000000
--- a/trunk/test-data/spreadsheet/46250.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46368.xls b/trunk/test-data/spreadsheet/46368.xls
deleted file mode 100644
index d421e77..0000000
--- a/trunk/test-data/spreadsheet/46368.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46445.xls b/trunk/test-data/spreadsheet/46445.xls
deleted file mode 100644
index 30aaf34..0000000
--- a/trunk/test-data/spreadsheet/46445.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46515.xls b/trunk/test-data/spreadsheet/46515.xls
deleted file mode 100644
index 01c1dfe..0000000
--- a/trunk/test-data/spreadsheet/46515.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46535.xlsx b/trunk/test-data/spreadsheet/46535.xlsx
deleted file mode 100644
index 555145b..0000000
--- a/trunk/test-data/spreadsheet/46535.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46536.xlsx b/trunk/test-data/spreadsheet/46536.xlsx
deleted file mode 100644
index 9b625bf..0000000
--- a/trunk/test-data/spreadsheet/46536.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46670_http.xls b/trunk/test-data/spreadsheet/46670_http.xls
deleted file mode 100644
index 789284d..0000000
--- a/trunk/test-data/spreadsheet/46670_http.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46670_local.xls b/trunk/test-data/spreadsheet/46670_local.xls
deleted file mode 100644
index 0d73e63..0000000
--- a/trunk/test-data/spreadsheet/46670_local.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46670_ref_airline.xls b/trunk/test-data/spreadsheet/46670_ref_airline.xls
deleted file mode 100644
index b0db5c9..0000000
--- a/trunk/test-data/spreadsheet/46670_ref_airline.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/46904.xls b/trunk/test-data/spreadsheet/46904.xls
deleted file mode 100644
index 5720672..0000000
--- a/trunk/test-data/spreadsheet/46904.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47026.xlsm b/trunk/test-data/spreadsheet/47026.xlsm
deleted file mode 100644
index 77e4eb9..0000000
--- a/trunk/test-data/spreadsheet/47026.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47034.xls b/trunk/test-data/spreadsheet/47034.xls
deleted file mode 100644
index 81c5849..0000000
--- a/trunk/test-data/spreadsheet/47034.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47089.xlsm b/trunk/test-data/spreadsheet/47089.xlsm
deleted file mode 100644
index 698f79b..0000000
--- a/trunk/test-data/spreadsheet/47089.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47090.xlsx b/trunk/test-data/spreadsheet/47090.xlsx
deleted file mode 100644
index c52ed66..0000000
--- a/trunk/test-data/spreadsheet/47090.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47154.xls b/trunk/test-data/spreadsheet/47154.xls
deleted file mode 100644
index 2840cc6..0000000
--- a/trunk/test-data/spreadsheet/47154.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47245_test.xls b/trunk/test-data/spreadsheet/47245_test.xls
deleted file mode 100644
index 2e30bd5..0000000
--- a/trunk/test-data/spreadsheet/47245_test.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47251.xls b/trunk/test-data/spreadsheet/47251.xls
deleted file mode 100644
index e498c2b..0000000
--- a/trunk/test-data/spreadsheet/47251.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47251_1.xls b/trunk/test-data/spreadsheet/47251_1.xls
deleted file mode 100644
index 7192fed..0000000
--- a/trunk/test-data/spreadsheet/47251_1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47504.xlsx b/trunk/test-data/spreadsheet/47504.xlsx
deleted file mode 100644
index 8805a78..0000000
--- a/trunk/test-data/spreadsheet/47504.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47668.xlsx b/trunk/test-data/spreadsheet/47668.xlsx
deleted file mode 100644
index 74a073f..0000000
--- a/trunk/test-data/spreadsheet/47668.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47701.xls b/trunk/test-data/spreadsheet/47701.xls
deleted file mode 100644
index f6cf8a2..0000000
--- a/trunk/test-data/spreadsheet/47701.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47737.xlsx b/trunk/test-data/spreadsheet/47737.xlsx
deleted file mode 100644
index 5737a59..0000000
--- a/trunk/test-data/spreadsheet/47737.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47804.xlsx b/trunk/test-data/spreadsheet/47804.xlsx
deleted file mode 100644
index 7e14346..0000000
--- a/trunk/test-data/spreadsheet/47804.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47813.xlsx b/trunk/test-data/spreadsheet/47813.xlsx
deleted file mode 100644
index 5ab22e3..0000000
--- a/trunk/test-data/spreadsheet/47813.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47847.xls b/trunk/test-data/spreadsheet/47847.xls
deleted file mode 100644
index 4a7a631..0000000
--- a/trunk/test-data/spreadsheet/47847.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47862.xlsx b/trunk/test-data/spreadsheet/47862.xlsx
deleted file mode 100644
index d5d19c8..0000000
--- a/trunk/test-data/spreadsheet/47862.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47889.xlsx b/trunk/test-data/spreadsheet/47889.xlsx
deleted file mode 100644
index d4b23ab..0000000
--- a/trunk/test-data/spreadsheet/47889.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47920.xls b/trunk/test-data/spreadsheet/47920.xls
deleted file mode 100644
index c01eabf..0000000
--- a/trunk/test-data/spreadsheet/47920.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/47924.xls b/trunk/test-data/spreadsheet/47924.xls
deleted file mode 100644
index 287f17b..0000000
--- a/trunk/test-data/spreadsheet/47924.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48026.xls b/trunk/test-data/spreadsheet/48026.xls
deleted file mode 100644
index 7463f75..0000000
--- a/trunk/test-data/spreadsheet/48026.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48180.xls b/trunk/test-data/spreadsheet/48180.xls
deleted file mode 100644
index be72749..0000000
--- a/trunk/test-data/spreadsheet/48180.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48325.xls b/trunk/test-data/spreadsheet/48325.xls
deleted file mode 100644
index 8b8c926..0000000
--- a/trunk/test-data/spreadsheet/48325.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48495.xlsx b/trunk/test-data/spreadsheet/48495.xlsx
deleted file mode 100644
index 73bc28b..0000000
--- a/trunk/test-data/spreadsheet/48495.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48539.xlsx b/trunk/test-data/spreadsheet/48539.xlsx
deleted file mode 100644
index 848382d..0000000
--- a/trunk/test-data/spreadsheet/48539.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48703.xls b/trunk/test-data/spreadsheet/48703.xls
deleted file mode 100644
index 95f19eb..0000000
--- a/trunk/test-data/spreadsheet/48703.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48703.xlsx b/trunk/test-data/spreadsheet/48703.xlsx
deleted file mode 100644
index 2589953..0000000
--- a/trunk/test-data/spreadsheet/48703.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48779.xlsx b/trunk/test-data/spreadsheet/48779.xlsx
deleted file mode 100644
index 513230e..0000000
--- a/trunk/test-data/spreadsheet/48779.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48923.xlsx b/trunk/test-data/spreadsheet/48923.xlsx
deleted file mode 100644
index 34aba59..0000000
--- a/trunk/test-data/spreadsheet/48923.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48936-strings.txt b/trunk/test-data/spreadsheet/48936-strings.txt
deleted file mode 100644
index 2ceefe3..0000000
--- a/trunk/test-data/spreadsheet/48936-strings.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-[IntegrityCheck-ERROR[MALE[50.0 < x < 199.0], FEMALE[50.0 < x < 199.0]], IntegrityCheck-WARNING[MALE[61.0 < x < 126.0], FEMALE[47.0 < x < 119.0]]]
-Computing[($1 + $2 + $3)/3,[Instrument[BloodPressure, RES_FIRST_DIASTOLIC_BP], Instrument[BloodPressure, RES_SEC_DIASTOLIC_BP], Instrument[BloodPressure, RES_THIRD_DIASTOLIC_BP]]]
-COMPUTED
-BloodPressure
-BloodPressure
-Average Pulse Rate
-Moyenne des lectures de pouls
-Computing[($1 + $2 + $3)/3,[Instrument[BloodPressure, RES_FIRST_PULSE_RATE], Instrument[BloodPressure, RES_SEC_PULSE_RATE], Instrument[BloodPressure, RES_THIRD_PULSE_RATE]]]
-COMPUTED
-BloodPressure
-BloodPressure
-Average Systolic Blood Pressure
-Pression artérielle systolique moyenne
-Computing[($1 + $2 + $3)/3,[Instrument[BloodPressure, RES_FIRST_SYSTOLIC_BP], Instrument[BloodPressure, RES_SEC_SYSTOLIC_BP], Instrument[BloodPressure, RES_THIRD_SYSTOLIC_BP]]]
-COMPUTED
-BloodPressure
-BloodPressure
-BloodPressure
-BloodPressure
-BloodPressure
-BloodPressure
-BloodPressure
-BloodPressure
-BloodPressure
-Armband size used
-Taille du brassard utilisé
-MANUAL
-Small
-Petit
-Medium
-Moyen
-Large
-Grand
-Extra Large
-Très grand
-BloodPressure
-BloodPressure
-Arm suggested to be used for measurement
-Bras suggéré pour la mesure
-Variable[Onyx.CIPreliminaryQuestionnaire.BP_ARM_CHOSEN]
-AUTOMATIC
-false
-BloodPressure
-BloodPressure
-What arm was actually used for the measurements?
-Quel bras a été utilisé pour les mesures?
-MANUAL
-Left
-Gauche
-Right
-Droit
-BloodPressure
-BloodPressure
-Circumference of upper arm at midpoint
-Circonférence du haut du bras
-[IntegrityCheck-ERROR[MALE[17.0 < x < 50.0], FEMALE[17.0 < x < 50.0]]]
-MANUAL
-BloodPressure
-BloodPressure
-Diastolic Blood Pressure reading (1)
-Lecture de la pression artérielle diastolique (1)
-[IntegrityCheck-ERROR[MALE[30 < x < 200 || ], FEMALE[30 < x < 200 || ]], IntegrityCheck-WARNING[MALE[51 < x < 96 || ], FEMALE[51 < x < 96 || ]], IntegrityCheck-ERROR[x < RES_FIRST_SYSTOLIC_BP]]
-MANUAL
-BloodPressure
-BloodPressure
-Pulse Rate reading (1)
-Lecture de pouls (1)
-[IntegrityCheck-ERROR[MALE[30 < x < 200 || ], FEMALE[30 < x < 200 || ]], IntegrityCheck-WARNING[MALE[40 < x < 100 || ], FEMALE[40 < x < 100 || ]]]
-MANUAL
-BloodPressure
-BloodPressure
-Systolic Blood Pressure reading (1)
-Lecture de la pression artérielle systolique  (1)
-[IntegrityCheck-ERROR[MALE[30 < x < 300 || ], FEMALE[30 < x < 300 || ]], IntegrityCheck-WARNING[MALE[77 < x < 192 || ], FEMALE[77 < x < 192 || ]]]
-MANUAL
-BloodPressure
-BloodPressure
-Diastolic Blood Pressure reading (2)
-Lecture de la pression artérielle diastolique (2)
-[IntegrityCheck-ERROR[MALE[30 < x < 200 || ], FEMALE[30 < x < 200 || ]], IntegrityCheck-WARNING[MALE[51 < x < 96 || ], FEMALE[51 < x < 96 || ]], IntegrityCheck-ERROR[x < RES_SEC_SYSTOLIC_BP]]
-
diff --git a/trunk/test-data/spreadsheet/48962.xlsx b/trunk/test-data/spreadsheet/48962.xlsx
deleted file mode 100644
index 7d14f77..0000000
--- a/trunk/test-data/spreadsheet/48962.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/48968.xls b/trunk/test-data/spreadsheet/48968.xls
deleted file mode 100644
index bbafffe..0000000
--- a/trunk/test-data/spreadsheet/48968.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49096.xls b/trunk/test-data/spreadsheet/49096.xls
deleted file mode 100644
index 4c1e817..0000000
--- a/trunk/test-data/spreadsheet/49096.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49156.xlsx b/trunk/test-data/spreadsheet/49156.xlsx
deleted file mode 100644
index ca41dc6..0000000
--- a/trunk/test-data/spreadsheet/49156.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49185.xls b/trunk/test-data/spreadsheet/49185.xls
deleted file mode 100644
index f40a837..0000000
--- a/trunk/test-data/spreadsheet/49185.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49219.xls b/trunk/test-data/spreadsheet/49219.xls
deleted file mode 100644
index 68605ea..0000000
--- a/trunk/test-data/spreadsheet/49219.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49237.xls b/trunk/test-data/spreadsheet/49237.xls
deleted file mode 100644
index bb525fd..0000000
--- a/trunk/test-data/spreadsheet/49237.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49273.xlsx b/trunk/test-data/spreadsheet/49273.xlsx
deleted file mode 100644
index ad1ad27..0000000
--- a/trunk/test-data/spreadsheet/49273.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49325.xlsx b/trunk/test-data/spreadsheet/49325.xlsx
deleted file mode 100644
index adcba90..0000000
--- a/trunk/test-data/spreadsheet/49325.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49423.xls b/trunk/test-data/spreadsheet/49423.xls
deleted file mode 100644
index 3d8524c..0000000
--- a/trunk/test-data/spreadsheet/49423.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49524.xls b/trunk/test-data/spreadsheet/49524.xls
deleted file mode 100644
index ca9dde2..0000000
--- a/trunk/test-data/spreadsheet/49524.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49529.xls b/trunk/test-data/spreadsheet/49529.xls
deleted file mode 100644
index 1989a6a..0000000
--- a/trunk/test-data/spreadsheet/49529.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49581.xls b/trunk/test-data/spreadsheet/49581.xls
deleted file mode 100644
index d7fbf13..0000000
--- a/trunk/test-data/spreadsheet/49581.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49609.xlsx b/trunk/test-data/spreadsheet/49609.xlsx
deleted file mode 100644
index 03d9d12..0000000
--- a/trunk/test-data/spreadsheet/49609.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49612.xls b/trunk/test-data/spreadsheet/49612.xls
deleted file mode 100644
index c31b62a..0000000
--- a/trunk/test-data/spreadsheet/49612.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49751.xls b/trunk/test-data/spreadsheet/49751.xls
deleted file mode 100644
index 09eaede..0000000
--- a/trunk/test-data/spreadsheet/49751.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49761.xls b/trunk/test-data/spreadsheet/49761.xls
deleted file mode 100644
index 948a0d1..0000000
--- a/trunk/test-data/spreadsheet/49761.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49783.xlsx b/trunk/test-data/spreadsheet/49783.xlsx
deleted file mode 100644
index 09cda15..0000000
--- a/trunk/test-data/spreadsheet/49783.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49872.xlsx b/trunk/test-data/spreadsheet/49872.xlsx
deleted file mode 100644
index 04b72a8..0000000
--- a/trunk/test-data/spreadsheet/49872.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49896.xls b/trunk/test-data/spreadsheet/49896.xls
deleted file mode 100644
index 908340b..0000000
--- a/trunk/test-data/spreadsheet/49896.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49928.xls b/trunk/test-data/spreadsheet/49928.xls
deleted file mode 100644
index d7249e7..0000000
--- a/trunk/test-data/spreadsheet/49928.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49928.xlsx b/trunk/test-data/spreadsheet/49928.xlsx
deleted file mode 100644
index 6a49ae3..0000000
--- a/trunk/test-data/spreadsheet/49928.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49931.xls b/trunk/test-data/spreadsheet/49931.xls
deleted file mode 100644
index 0ec10b0..0000000
--- a/trunk/test-data/spreadsheet/49931.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/49966.xlsx b/trunk/test-data/spreadsheet/49966.xlsx
deleted file mode 100644
index 9ccea41..0000000
--- a/trunk/test-data/spreadsheet/49966.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50020.xls b/trunk/test-data/spreadsheet/50020.xls
deleted file mode 100644
index 9f4001e..0000000
--- a/trunk/test-data/spreadsheet/50020.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50096.xlsx b/trunk/test-data/spreadsheet/50096.xlsx
deleted file mode 100644
index b887842..0000000
--- a/trunk/test-data/spreadsheet/50096.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50298.xls b/trunk/test-data/spreadsheet/50298.xls
deleted file mode 100644
index 99eb764..0000000
--- a/trunk/test-data/spreadsheet/50298.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50299.xlsx b/trunk/test-data/spreadsheet/50299.xlsx
deleted file mode 100644
index 7a1acf3..0000000
--- a/trunk/test-data/spreadsheet/50299.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50426.xls b/trunk/test-data/spreadsheet/50426.xls
deleted file mode 100644
index 1a807f8..0000000
--- a/trunk/test-data/spreadsheet/50426.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50755_workday_formula_example.xlsx b/trunk/test-data/spreadsheet/50755_workday_formula_example.xlsx
deleted file mode 100644
index c3ad479..0000000
--- a/trunk/test-data/spreadsheet/50755_workday_formula_example.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50756.xls b/trunk/test-data/spreadsheet/50756.xls
deleted file mode 100644
index f7e595d..0000000
--- a/trunk/test-data/spreadsheet/50756.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50779_1.xls b/trunk/test-data/spreadsheet/50779_1.xls
deleted file mode 100644
index 17d32ec..0000000
--- a/trunk/test-data/spreadsheet/50779_1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50779_2.xls b/trunk/test-data/spreadsheet/50779_2.xls
deleted file mode 100644
index ee29d0b..0000000
--- a/trunk/test-data/spreadsheet/50779_2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50784-font_theme_colours.xlsx b/trunk/test-data/spreadsheet/50784-font_theme_colours.xlsx
deleted file mode 100644
index 72e2dbb..0000000
--- a/trunk/test-data/spreadsheet/50784-font_theme_colours.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50786-indexed_colours.xlsx b/trunk/test-data/spreadsheet/50786-indexed_colours.xlsx
deleted file mode 100644
index df8bab6..0000000
--- a/trunk/test-data/spreadsheet/50786-indexed_colours.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50795.xlsx b/trunk/test-data/spreadsheet/50795.xlsx
deleted file mode 100644
index a58aeec..0000000
--- a/trunk/test-data/spreadsheet/50795.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50833.xls b/trunk/test-data/spreadsheet/50833.xls
deleted file mode 100644
index 0022778..0000000
--- a/trunk/test-data/spreadsheet/50833.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50846-border_colours.xlsx b/trunk/test-data/spreadsheet/50846-border_colours.xlsx
deleted file mode 100644
index 49ec532..0000000
--- a/trunk/test-data/spreadsheet/50846-border_colours.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50867_with_table.xlsx b/trunk/test-data/spreadsheet/50867_with_table.xlsx
deleted file mode 100644
index b42d6e4..0000000
--- a/trunk/test-data/spreadsheet/50867_with_table.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/50939.xls b/trunk/test-data/spreadsheet/50939.xls
deleted file mode 100644
index bcc2068..0000000
--- a/trunk/test-data/spreadsheet/50939.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51143.xls b/trunk/test-data/spreadsheet/51143.xls
deleted file mode 100644
index a89a109..0000000
--- a/trunk/test-data/spreadsheet/51143.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51222.xlsx b/trunk/test-data/spreadsheet/51222.xlsx
deleted file mode 100644
index 562154c..0000000
--- a/trunk/test-data/spreadsheet/51222.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51461.xls b/trunk/test-data/spreadsheet/51461.xls
deleted file mode 100644
index 0f6c1bd..0000000
--- a/trunk/test-data/spreadsheet/51461.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51470.xlsx b/trunk/test-data/spreadsheet/51470.xlsx
deleted file mode 100644
index 01768af..0000000
--- a/trunk/test-data/spreadsheet/51470.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51498.xls b/trunk/test-data/spreadsheet/51498.xls
deleted file mode 100644
index b5d2d65..0000000
--- a/trunk/test-data/spreadsheet/51498.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51535.xls b/trunk/test-data/spreadsheet/51535.xls
deleted file mode 100644
index ab73352..0000000
--- a/trunk/test-data/spreadsheet/51535.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51585.xlsx b/trunk/test-data/spreadsheet/51585.xlsx
deleted file mode 100644
index 479c8db..0000000
--- a/trunk/test-data/spreadsheet/51585.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51626.xlsx b/trunk/test-data/spreadsheet/51626.xlsx
deleted file mode 100644
index 6a5e3ff..0000000
--- a/trunk/test-data/spreadsheet/51626.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51626_contact.xlsx b/trunk/test-data/spreadsheet/51626_contact.xlsx
deleted file mode 100644
index a3e4e5b..0000000
--- a/trunk/test-data/spreadsheet/51626_contact.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51670.xls b/trunk/test-data/spreadsheet/51670.xls
deleted file mode 100644
index e7c929d..0000000
--- a/trunk/test-data/spreadsheet/51670.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51675.xls b/trunk/test-data/spreadsheet/51675.xls
deleted file mode 100644
index 78df32c..0000000
--- a/trunk/test-data/spreadsheet/51675.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51710.xlsx b/trunk/test-data/spreadsheet/51710.xlsx
deleted file mode 100644
index 772395b..0000000
--- a/trunk/test-data/spreadsheet/51710.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51832.xls b/trunk/test-data/spreadsheet/51832.xls
deleted file mode 100644
index 8b38bff..0000000
--- a/trunk/test-data/spreadsheet/51832.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51850.xlsx b/trunk/test-data/spreadsheet/51850.xlsx
deleted file mode 100644
index c04129a..0000000
--- a/trunk/test-data/spreadsheet/51850.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51963.xlsx b/trunk/test-data/spreadsheet/51963.xlsx
deleted file mode 100644
index 154c754..0000000
--- a/trunk/test-data/spreadsheet/51963.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/51998.xlsx b/trunk/test-data/spreadsheet/51998.xlsx
deleted file mode 100644
index 835ba63..0000000
--- a/trunk/test-data/spreadsheet/51998.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/52348.xlsx b/trunk/test-data/spreadsheet/52348.xlsx
deleted file mode 100644
index 356490d..0000000
--- a/trunk/test-data/spreadsheet/52348.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/52425.xlsx b/trunk/test-data/spreadsheet/52425.xlsx
deleted file mode 100644
index 0659822..0000000
--- a/trunk/test-data/spreadsheet/52425.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/52527.xls b/trunk/test-data/spreadsheet/52527.xls
deleted file mode 100644
index b20d7d7..0000000
--- a/trunk/test-data/spreadsheet/52527.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/52575_main.xls b/trunk/test-data/spreadsheet/52575_main.xls
deleted file mode 100644
index fbcf0dd..0000000
--- a/trunk/test-data/spreadsheet/52575_main.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/52575_main.xlsx b/trunk/test-data/spreadsheet/52575_main.xlsx
deleted file mode 100644
index bec34c2..0000000
--- a/trunk/test-data/spreadsheet/52575_main.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/52575_source.xls b/trunk/test-data/spreadsheet/52575_source.xls
deleted file mode 100644
index b75c142..0000000
--- a/trunk/test-data/spreadsheet/52575_source.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/52716.xlsx b/trunk/test-data/spreadsheet/52716.xlsx
deleted file mode 100644
index ba4f120..0000000
--- a/trunk/test-data/spreadsheet/52716.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53101.xlsx b/trunk/test-data/spreadsheet/53101.xlsx
deleted file mode 100644
index e52f424..0000000
--- a/trunk/test-data/spreadsheet/53101.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53105.xlsx b/trunk/test-data/spreadsheet/53105.xlsx
deleted file mode 100644
index 80ec056..0000000
--- a/trunk/test-data/spreadsheet/53105.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53109.xls b/trunk/test-data/spreadsheet/53109.xls
deleted file mode 100644
index 08b4dfe..0000000
--- a/trunk/test-data/spreadsheet/53109.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53282.xlsx b/trunk/test-data/spreadsheet/53282.xlsx
deleted file mode 100644
index 6d88303..0000000
--- a/trunk/test-data/spreadsheet/53282.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53282b.xlsx b/trunk/test-data/spreadsheet/53282b.xlsx
deleted file mode 100644
index 3ad5ad8..0000000
--- a/trunk/test-data/spreadsheet/53282b.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53404.xls b/trunk/test-data/spreadsheet/53404.xls
deleted file mode 100644
index d436e1e..0000000
--- a/trunk/test-data/spreadsheet/53404.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53433.xls b/trunk/test-data/spreadsheet/53433.xls
deleted file mode 100644
index c31c3a8..0000000
--- a/trunk/test-data/spreadsheet/53433.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53446.xls b/trunk/test-data/spreadsheet/53446.xls
deleted file mode 100644
index b33bd7a..0000000
--- a/trunk/test-data/spreadsheet/53446.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53568.xlsx b/trunk/test-data/spreadsheet/53568.xlsx
deleted file mode 100644
index 082333b..0000000
--- a/trunk/test-data/spreadsheet/53568.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53588.xls b/trunk/test-data/spreadsheet/53588.xls
deleted file mode 100644
index 716305b..0000000
--- a/trunk/test-data/spreadsheet/53588.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53691.xls b/trunk/test-data/spreadsheet/53691.xls
deleted file mode 100644
index 5c20dc5..0000000
--- a/trunk/test-data/spreadsheet/53691.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53734.xlsx b/trunk/test-data/spreadsheet/53734.xlsx
deleted file mode 100644
index 58aa499..0000000
--- a/trunk/test-data/spreadsheet/53734.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53798.xlsx b/trunk/test-data/spreadsheet/53798.xlsx
deleted file mode 100644
index f273308..0000000
--- a/trunk/test-data/spreadsheet/53798.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53798_shiftNegative_TMPL.xls b/trunk/test-data/spreadsheet/53798_shiftNegative_TMPL.xls
deleted file mode 100644
index 1f9f48f..0000000
--- a/trunk/test-data/spreadsheet/53798_shiftNegative_TMPL.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53798_shiftNegative_TMPL.xlsx b/trunk/test-data/spreadsheet/53798_shiftNegative_TMPL.xlsx
deleted file mode 100644
index f273308..0000000
--- a/trunk/test-data/spreadsheet/53798_shiftNegative_TMPL.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53972.xls b/trunk/test-data/spreadsheet/53972.xls
deleted file mode 100644
index 5fd0ec9..0000000
--- a/trunk/test-data/spreadsheet/53972.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/53984.xls b/trunk/test-data/spreadsheet/53984.xls
deleted file mode 100644
index 07d3e83..0000000
--- a/trunk/test-data/spreadsheet/53984.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54016.xls b/trunk/test-data/spreadsheet/54016.xls
deleted file mode 100644
index 4148ca7..0000000
--- a/trunk/test-data/spreadsheet/54016.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54034.xlsx b/trunk/test-data/spreadsheet/54034.xlsx
deleted file mode 100644
index 2ae2beb..0000000
--- a/trunk/test-data/spreadsheet/54034.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54071.xlsx b/trunk/test-data/spreadsheet/54071.xlsx
deleted file mode 100644
index be3a3e9..0000000
--- a/trunk/test-data/spreadsheet/54071.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54084 - Greek - beyond BMP.txt b/trunk/test-data/spreadsheet/54084 - Greek - beyond BMP.txt
deleted file mode 100644
index 1152352..0000000
--- a/trunk/test-data/spreadsheet/54084 - Greek - beyond BMP.txt
+++ /dev/null
@@ -1 +0,0 @@
-𝝊𝝋𝝌𝝍𝝎𝝏𝝐𝝑𝝒𝝓𝝔𝝕𝝖𝝗𝝘𝝙𝝚𝝛𝝜𝝝𝝞𝝟𝝠𝝡𝝢𝝣𝝤𝝥𝝦𝝧𝝨𝝩𝝪𝝫𝝬𝝭𝝮𝝯𝝰𝝱𝝲𝝳𝝴𝝵𝝶𝝷𝝸𝝹𝝺
diff --git a/trunk/test-data/spreadsheet/54084 - Greek - beyond BMP.xlsx b/trunk/test-data/spreadsheet/54084 - Greek - beyond BMP.xlsx
deleted file mode 100644
index bc27722..0000000
--- a/trunk/test-data/spreadsheet/54084 - Greek - beyond BMP.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54206.xls b/trunk/test-data/spreadsheet/54206.xls
deleted file mode 100644
index 24da03b..0000000
--- a/trunk/test-data/spreadsheet/54206.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54206.xlsx b/trunk/test-data/spreadsheet/54206.xlsx
deleted file mode 100644
index bd8be74..0000000
--- a/trunk/test-data/spreadsheet/54206.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54288-ref.xlsx b/trunk/test-data/spreadsheet/54288-ref.xlsx
deleted file mode 100644
index eb2f839..0000000
--- a/trunk/test-data/spreadsheet/54288-ref.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54288.xlsx b/trunk/test-data/spreadsheet/54288.xlsx
deleted file mode 100644
index fed0b4b..0000000
--- a/trunk/test-data/spreadsheet/54288.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54399.xlsx b/trunk/test-data/spreadsheet/54399.xlsx
deleted file mode 100644
index 1aefbac..0000000
--- a/trunk/test-data/spreadsheet/54399.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54436.xlsx b/trunk/test-data/spreadsheet/54436.xlsx
deleted file mode 100644
index 4f113b8..0000000
--- a/trunk/test-data/spreadsheet/54436.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54500.xls b/trunk/test-data/spreadsheet/54500.xls
deleted file mode 100644
index 0cd18b5..0000000
--- a/trunk/test-data/spreadsheet/54500.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54524.xlsx b/trunk/test-data/spreadsheet/54524.xlsx
deleted file mode 100644
index 5a16447..0000000
--- a/trunk/test-data/spreadsheet/54524.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54607.xlsx b/trunk/test-data/spreadsheet/54607.xlsx
deleted file mode 100644
index bdfe143..0000000
--- a/trunk/test-data/spreadsheet/54607.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54686_fraction_formats.txt b/trunk/test-data/spreadsheet/54686_fraction_formats.txt
deleted file mode 100644
index 0de773e..0000000
--- a/trunk/test-data/spreadsheet/54686_fraction_formats.txt
+++ /dev/null
@@ -1,374 +0,0 @@
-Numerator	Denominator	Double	1Digit	2Digit	3Digit	Half	Quarter	Eight	Sixteenth	Tenth	100th	Tika-1132
-4051	8750153	0.000462963	0    	0      	0        	0    	0    	0    	0      	0     	0       	 4051/8750153  
--105	100	-1.05	-1    	-1  1/20	-1   1/20 	-1    	-1    	-1    	-1  1/16	-1 1/10	-1  5/100	-1  1/20       
--104	100	-1.04	-1    	-1  1/25	-1   1/25 	-1    	-1    	-1    	-1  1/16	-1     	-1  4/100	-1  1/25       
--103	100	-1.03	-1    	-1  1/33	-1   3/100	-1    	-1    	-1    	-1      	-1     	-1  3/100	-1  3/100      
--102	100	-1.02	-1    	-1  1/50	-1   1/50 	-1    	-1    	-1    	-1      	-1     	-1  2/100	-1  1/50       
--101	100	-1.01	-1    	-1  1/99	-1   1/100	-1    	-1    	-1    	-1      	-1     	-1  1/100	-1  1/100      
--100	100	-1	-1    	-1      	-1        	-1    	-1    	-1    	-1      	-1     	-1       	-1             
--99	100	-0.99	-1    	- 98/99	-  99/100	-1    	-1    	-1    	-1      	-1     	- 99/100	- 99/100      
--98	100	-0.98	-1    	- 49/50	-  49/50 	-1    	-1    	-1    	-1      	-1     	- 98/100	- 49/50       
--97	100	-0.97	-1    	- 32/33	-  97/100	-1    	-1    	-1    	-1      	-1     	- 97/100	- 97/100      
--96	100	-0.96	-1    	- 24/25	-  24/25 	-1    	-1    	-1    	- 15/16	-1     	- 96/100	- 24/25       
--95	100	-0.95	-1    	- 19/20	-  19/20 	-1    	-1    	-1    	- 15/16	-1     	- 95/100	- 19/20       
--94	100	-0.94	-1    	- 47/50	-  47/50 	-1    	-1    	-1    	- 15/16	- 9/10	- 94/100	- 47/50       
--93	100	-0.93	-1    	- 40/43	-  93/100	-1    	-1    	- 7/8	- 15/16	- 9/10	- 93/100	- 93/100      
--92	100	-0.92	-1    	- 23/25	-  23/25 	-1    	-1    	- 7/8	- 15/16	- 9/10	- 92/100	- 23/25       
--91	100	-0.91	-1    	- 81/89	-  91/100	-1    	-1    	- 7/8	- 15/16	- 9/10	- 91/100	- 91/100      
--90	100	-0.9	- 8/9	-  9/10	-   9/10 	-1    	-1    	- 7/8	- 14/16	- 9/10	- 90/100	-  9/10       
--89	100	-0.89	- 8/9	-  8/9 	-  89/100	-1    	-1    	- 7/8	- 14/16	- 9/10	- 89/100	- 89/100      
--88	100	-0.88	- 7/8	- 22/25	-  22/25 	-1    	-1    	- 7/8	- 14/16	- 9/10	- 88/100	- 22/25       
--87	100	-0.87	- 7/8	- 67/77	-  87/100	-1    	- 3/4	- 7/8	- 14/16	- 9/10	- 87/100	- 87/100      
--86	100	-0.86	- 6/7	- 43/50	-  43/50 	-1    	- 3/4	- 7/8	- 14/16	- 9/10	- 86/100	- 43/50       
--85	100	-0.85	- 6/7	- 17/20	-  17/20 	-1    	- 3/4	- 7/8	- 14/16	- 9/10	- 85/100	- 17/20       
--84	100	-0.84	- 5/6	- 21/25	-  21/25 	-1    	- 3/4	- 7/8	- 13/16	- 8/10	- 84/100	- 21/25       
--83	100	-0.83	- 5/6	- 39/47	-  83/100	-1    	- 3/4	- 7/8	- 13/16	- 8/10	- 83/100	- 83/100      
--82	100	-0.82	- 5/6	- 41/50	-  41/50 	-1    	- 3/4	- 7/8	- 13/16	- 8/10	- 82/100	- 41/50       
--81	100	-0.81	- 4/5	- 64/79	-  81/100	-1    	- 3/4	- 6/8	- 13/16	- 8/10	- 81/100	- 81/100      
--80	100	-0.8	- 4/5	-  4/5 	-   4/5  	-1    	- 3/4	- 6/8	- 13/16	- 8/10	- 80/100	-  4/5        
--79	100	-0.79	- 4/5	- 64/81	-  79/100	-1    	- 3/4	- 6/8	- 13/16	- 8/10	- 79/100	- 79/100      
--78	100	-0.78	- 7/9	- 39/50	-  39/50 	-1    	- 3/4	- 6/8	- 12/16	- 8/10	- 78/100	- 39/50       
--77	100	-0.77	- 7/9	- 67/87	-  77/100	-1    	- 3/4	- 6/8	- 12/16	- 8/10	- 77/100	- 77/100      
--76	100	-0.76	- 3/4	- 19/25	-  19/25 	-1    	- 3/4	- 6/8	- 12/16	- 8/10	- 76/100	- 19/25       
--75	100	-0.75	- 3/4	-  3/4 	-   3/4  	-1    	- 3/4	- 6/8	- 12/16	- 8/10	- 75/100	-  3/4        
--74	100	-0.74	- 3/4	- 37/50	-  37/50 	- 1/2	- 3/4	- 6/8	- 12/16	- 7/10	- 74/100	- 37/50       
--73	100	-0.73	- 3/4	- 46/63	-  73/100	- 1/2	- 3/4	- 6/8	- 12/16	- 7/10	- 73/100	- 73/100      
--72	100	-0.72	- 5/7	- 18/25	-  18/25 	- 1/2	- 3/4	- 6/8	- 12/16	- 7/10	- 72/100	- 18/25       
--71	100	-0.71	- 5/7	- 22/31	-  71/100	- 1/2	- 3/4	- 6/8	- 11/16	- 7/10	- 71/100	- 71/100      
--70	100	-0.7	- 2/3	-  7/10	-   7/10 	- 1/2	- 3/4	- 6/8	- 11/16	- 7/10	- 70/100	-  7/10       
--69	100	-0.69	- 2/3	- 20/29	-  69/100	- 1/2	- 3/4	- 6/8	- 11/16	- 7/10	- 69/100	- 69/100      
--68	100	-0.68	- 2/3	- 17/25	-  17/25 	- 1/2	- 3/4	- 5/8	- 11/16	- 7/10	- 68/100	- 17/25       
--67	100	-0.67	- 2/3	- 65/97	-  67/100	- 1/2	- 3/4	- 5/8	- 11/16	- 7/10	- 67/100	- 67/100      
--66	100	-0.66	- 2/3	- 33/50	-  33/50 	- 1/2	- 3/4	- 5/8	- 11/16	- 7/10	- 66/100	- 33/50       
--65	100	-0.65	- 2/3	- 13/20	-  13/20 	- 1/2	- 3/4	- 5/8	- 10/16	- 7/10	- 65/100	- 13/20       
--64	100	-0.64	- 2/3	- 16/25	-  16/25 	- 1/2	- 3/4	- 5/8	- 10/16	- 6/10	- 64/100	- 16/25       
--63	100	-0.63	- 5/8	- 46/73	-  63/100	- 1/2	- 3/4	- 5/8	- 10/16	- 6/10	- 63/100	- 63/100      
--62	100	-0.62	- 5/8	- 31/50	-  31/50 	- 1/2	- 2/4	- 5/8	- 10/16	- 6/10	- 62/100	- 31/50       
--61	100	-0.61	- 3/5	- 36/59	-  61/100	- 1/2	- 2/4	- 5/8	- 10/16	- 6/10	- 61/100	- 61/100      
--60	100	-0.6	- 3/5	-  3/5 	-   3/5  	- 1/2	- 2/4	- 5/8	- 10/16	- 6/10	- 60/100	-  3/5        
--59	100	-0.59	- 3/5	- 23/39	-  59/100	- 1/2	- 2/4	- 5/8	-  9/16	- 6/10	- 59/100	- 59/100      
--58	100	-0.58	- 4/7	- 29/50	-  29/50 	- 1/2	- 2/4	- 5/8	-  9/16	- 6/10	- 58/100	- 29/50       
--57	100	-0.57	- 4/7	- 53/93	-  57/100	- 1/2	- 2/4	- 5/8	-  9/16	- 6/10	- 57/100	- 57/100      
--56	100	-0.56	- 5/9	- 14/25	-  14/25 	- 1/2	- 2/4	- 4/8	-  9/16	- 6/10	- 56/100	- 14/25       
--55	100	-0.55	- 5/9	- 11/20	-  11/20 	- 1/2	- 2/4	- 4/8	-  9/16	- 6/10	- 55/100	- 11/20       
--54	100	-0.54	- 1/2	- 27/50	-  27/50 	- 1/2	- 2/4	- 4/8	-  9/16	- 5/10	- 54/100	- 27/50       
--53	100	-0.53	- 1/2	- 44/83	-  53/100	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 53/100	- 53/100      
--52	100	-0.52	- 1/2	- 13/25	-  13/25 	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 52/100	- 13/25       
--51	100	-0.51	- 1/2	- 25/49	-  51/100	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 51/100	- 51/100      
--50	100	-0.5	- 1/2	-  1/2 	-   1/2  	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 50/100	-  1/2        
--49	100	-0.49	- 1/2	- 24/49	-  49/100	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 49/100	- 49/100      
--48	100	-0.48	- 1/2	- 12/25	-  12/25 	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 48/100	- 12/25       
--47	100	-0.47	- 1/2	-  8/17	-  47/100	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 47/100	- 47/100      
--46	100	-0.46	- 1/2	- 23/50	-  23/50 	- 1/2	- 2/4	- 4/8	-  7/16	- 5/10	- 46/100	- 23/50       
--45	100	-0.45	- 4/9	-  9/20	-   9/20 	- 1/2	- 2/4	- 4/8	-  7/16	- 5/10	- 45/100	-  9/20       
--44	100	-0.44	- 4/9	- 11/25	-  11/25 	- 1/2	- 2/4	- 4/8	-  7/16	- 4/10	- 44/100	- 11/25       
--43	100	-0.43	- 3/7	-  3/7 	-  43/100	- 1/2	- 2/4	- 3/8	-  7/16	- 4/10	- 43/100	- 43/100      
--42	100	-0.42	- 3/7	- 21/50	-  21/50 	- 1/2	- 2/4	- 3/8	-  7/16	- 4/10	- 42/100	- 21/50       
--41	100	-0.41	- 2/5	- 16/39	-  41/100	- 1/2	- 2/4	- 3/8	-  7/16	- 4/10	- 41/100	- 41/100      
--40	100	-0.4	- 2/5	-  2/5 	-   2/5  	- 1/2	- 2/4	- 3/8	-  6/16	- 4/10	- 40/100	-  2/5        
--39	100	-0.39	- 2/5	- 16/41	-  39/100	- 1/2	- 2/4	- 3/8	-  6/16	- 4/10	- 39/100	- 39/100      
--38	100	-0.38	- 3/8	- 19/50	-  19/50 	- 1/2	- 2/4	- 3/8	-  6/16	- 4/10	- 38/100	- 19/50       
--37	100	-0.37	- 3/8	- 10/27	-  37/100	- 1/2	- 1/4	- 3/8	-  6/16	- 4/10	- 37/100	- 37/100      
--36	100	-0.36	- 1/3	-  9/25	-   9/25 	- 1/2	- 1/4	- 3/8	-  6/16	- 4/10	- 36/100	-  9/25       
--35	100	-0.35	- 1/3	-  7/20	-   7/20 	- 1/2	- 1/4	- 3/8	-  6/16	- 4/10	- 35/100	-  7/20       
--34	100	-0.34	- 1/3	- 17/50	-  17/50 	- 1/2	- 1/4	- 3/8	-  5/16	- 3/10	- 34/100	- 17/50       
--33	100	-0.33	- 1/3	-  1/3 	-  33/100	- 1/2	- 1/4	- 3/8	-  5/16	- 3/10	- 33/100	- 33/100      
--32	100	-0.32	- 1/3	-  8/25	-   8/25 	- 1/2	- 1/4	- 3/8	-  5/16	- 3/10	- 32/100	-  8/25       
--31	100	-0.31	- 1/3	- 22/71	-  31/100	- 1/2	- 1/4	- 2/8	-  5/16	- 3/10	- 31/100	- 31/100      
--30	100	-0.3	- 2/7	-  3/10	-   3/10 	- 1/2	- 1/4	- 2/8	-  5/16	- 3/10	- 30/100	-  3/10       
--29	100	-0.29	- 2/7	- 20/69	-  29/100	- 1/2	- 1/4	- 2/8	-  5/16	- 3/10	- 29/100	- 29/100      
--28	100	-0.28	- 2/7	-  7/25	-   7/25 	- 1/2	- 1/4	- 2/8	-  4/16	- 3/10	- 28/100	-  7/25       
--27	100	-0.27	- 1/4	- 10/37	-  27/100	- 1/2	- 1/4	- 2/8	-  4/16	- 3/10	- 27/100	- 27/100      
--26	100	-0.26	- 1/4	- 13/50	-  13/50 	- 1/2	- 1/4	- 2/8	-  4/16	- 3/10	- 26/100	- 13/50       
--25	100	-0.25	- 1/4	-  1/4 	-   1/4  	- 1/2	- 1/4	- 2/8	-  4/16	- 3/10	- 25/100	-  1/4        
--24	100	-0.24	- 1/4	-  6/25	-   6/25 	-0    	- 1/4	- 2/8	-  4/16	- 2/10	- 24/100	-  6/25       
--23	100	-0.23	- 2/9	-  3/13	-  23/100	-0    	- 1/4	- 2/8	-  4/16	- 2/10	- 23/100	- 23/100      
--22	100	-0.22	- 2/9	- 11/50	-  11/50 	-0    	- 1/4	- 2/8	-  4/16	- 2/10	- 22/100	- 11/50       
--21	100	-0.21	- 1/5	- 17/81	-  21/100	-0    	- 1/4	- 2/8	-  3/16	- 2/10	- 21/100	- 21/100      
--20	100	-0.2	- 1/5	-  1/5 	-   1/5  	-0    	- 1/4	- 2/8	-  3/16	- 2/10	- 20/100	-  1/5        
--19	100	-0.19	- 1/5	- 15/79	-  19/100	-0    	- 1/4	- 2/8	-  3/16	- 2/10	- 19/100	- 19/100      
--18	100	-0.18	- 1/6	-  9/50	-   9/50 	-0    	- 1/4	- 1/8	-  3/16	- 2/10	- 18/100	-  9/50       
--17	100	-0.17	- 1/6	-  8/47	-  17/100	-0    	- 1/4	- 1/8	-  3/16	- 2/10	- 17/100	- 17/100      
--16	100	-0.16	- 1/6	-  4/25	-   4/25 	-0    	- 1/4	- 1/8	-  3/16	- 2/10	- 16/100	-  4/25       
--15	100	-0.15	- 1/7	-  3/20	-   3/20 	-0    	- 1/4	- 1/8	-  2/16	- 2/10	- 15/100	-  3/20       
--14	100	-0.14	- 1/7	-  7/50	-   7/50 	-0    	- 1/4	- 1/8	-  2/16	- 1/10	- 14/100	-  7/50       
--13	100	-0.13	- 1/8	-  3/23	-  13/100	-0    	- 1/4	- 1/8	-  2/16	- 1/10	- 13/100	- 13/100      
--12	100	-0.12	- 1/8	-  3/25	-   3/25 	-0    	-0    	- 1/8	-  2/16	- 1/10	- 12/100	-  3/25       
--11	100	-0.11	- 1/9	- 10/91	-  11/100	-0    	-0    	- 1/8	-  2/16	- 1/10	- 11/100	- 11/100      
--10	100	-0.1	-0    	-  1/10	-   1/10 	-0    	-0    	- 1/8	-  2/16	- 1/10	- 10/100	-  1/10       
--9	100	-0.09	-0    	-  1/11	-   9/100	-0    	-0    	- 1/8	-  1/16	- 1/10	-  9/100	-  9/100      
--8	100	-0.08	-0    	-  2/25	-   2/25 	-0    	-0    	- 1/8	-  1/16	- 1/10	-  8/100	-  2/25       
--7	100	-0.07	-0    	-  4/57	-   7/100	-0    	-0    	- 1/8	-  1/16	- 1/10	-  7/100	-  7/100      
--6	100	-0.06	-0    	-  3/50	-   3/50 	-0    	-0    	-0    	-  1/16	- 1/10	-  6/100	-  3/50       
--5	100	-0.05	-0    	-  1/20	-   1/20 	-0    	-0    	-0    	-  1/16	- 1/10	-  5/100	-  1/20       
--4	100	-0.04	-0    	-  1/25	-   1/25 	-0    	-0    	-0    	-  1/16	-0     	-  4/100	-  1/25       
--3	100	-0.03	-0    	-  2/67	-   3/100	-0    	-0    	-0    	-0      	-0     	-  3/100	-  3/100      
--2	100	-0.02	-0    	-  1/50	-   1/50 	-0    	-0    	-0    	-0      	-0     	-  2/100	-  1/50       
--1	100	-0.01	-0    	-0      	-   1/100	-0    	-0    	-0    	-0      	-0     	-  1/100	-  1/100      
-0	100	0	0    	0      	0        	0    	0    	0    	0      	0     	0       	0             
-1	100	0.01	0    	0      	   1/100	0    	0    	0    	0      	0     	  1/100	  1/100      
-2	100	0.02	0    	  1/50	   1/50 	0    	0    	0    	0      	0     	  2/100	  1/50       
-3	100	0.03	0    	  2/67	   3/100	0    	0    	0    	0      	0     	  3/100	  3/100      
-4	100	0.04	0    	  1/25	   1/25 	0    	0    	0    	  1/16	0     	  4/100	  1/25       
-5	100	0.05	0    	  1/20	   1/20 	0    	0    	0    	  1/16	 1/10	  5/100	  1/20       
-6	100	0.06	0    	  3/50	   3/50 	0    	0    	0    	  1/16	 1/10	  6/100	  3/50       
-7	100	0.07	0    	  4/57	   7/100	0    	0    	 1/8	  1/16	 1/10	  7/100	  7/100      
-8	100	0.08	0    	  2/25	   2/25 	0    	0    	 1/8	  1/16	 1/10	  8/100	  2/25       
-9	100	0.09	0    	  1/11	   9/100	0    	0    	 1/8	  1/16	 1/10	  9/100	  9/100      
-10	100	0.1	0    	  1/10	   1/10 	0    	0    	 1/8	  2/16	 1/10	 10/100	  1/10       
-11	100	0.11	 1/9	 10/91	  11/100	0    	0    	 1/8	  2/16	 1/10	 11/100	 11/100      
-12	100	0.12	 1/8	  3/25	   3/25 	0    	0    	 1/8	  2/16	 1/10	 12/100	  3/25       
-13	100	0.13	 1/8	  3/23	  13/100	0    	 1/4	 1/8	  2/16	 1/10	 13/100	 13/100      
-14	100	0.14	 1/7	  7/50	   7/50 	0    	 1/4	 1/8	  2/16	 1/10	 14/100	  7/50       
-15	100	0.15	 1/7	  3/20	   3/20 	0    	 1/4	 1/8	  2/16	 2/10	 15/100	  3/20       
-16	100	0.16	 1/6	  4/25	   4/25 	0    	 1/4	 1/8	  3/16	 2/10	 16/100	  4/25       
-17	100	0.17	 1/6	  8/47	  17/100	0    	 1/4	 1/8	  3/16	 2/10	 17/100	 17/100      
-18	100	0.18	 1/6	  9/50	   9/50 	0    	 1/4	 1/8	  3/16	 2/10	 18/100	  9/50       
-19	100	0.19	 1/5	 15/79	  19/100	0    	 1/4	 2/8	  3/16	 2/10	 19/100	 19/100      
-20	100	0.2	 1/5	  1/5 	   1/5  	0    	 1/4	 2/8	  3/16	 2/10	 20/100	  1/5        
-21	100	0.21	 1/5	 17/81	  21/100	0    	 1/4	 2/8	  3/16	 2/10	 21/100	 21/100      
-22	100	0.22	 2/9	 11/50	  11/50 	0    	 1/4	 2/8	  4/16	 2/10	 22/100	 11/50       
-23	100	0.23	 2/9	  3/13	  23/100	0    	 1/4	 2/8	  4/16	 2/10	 23/100	 23/100      
-24	100	0.24	 1/4	  6/25	   6/25 	0    	 1/4	 2/8	  4/16	 2/10	 24/100	  6/25       
-25	100	0.25	 1/4	  1/4 	   1/4  	 1/2	 1/4	 2/8	  4/16	 3/10	 25/100	  1/4        
-26	100	0.26	 1/4	 13/50	  13/50 	 1/2	 1/4	 2/8	  4/16	 3/10	 26/100	 13/50       
-27	100	0.27	 1/4	 10/37	  27/100	 1/2	 1/4	 2/8	  4/16	 3/10	 27/100	 27/100      
-28	100	0.28	 2/7	  7/25	   7/25 	 1/2	 1/4	 2/8	  4/16	 3/10	 28/100	  7/25       
-29	100	0.29	 2/7	 20/69	  29/100	 1/2	 1/4	 2/8	  5/16	 3/10	 29/100	 29/100      
-30	100	0.3	 2/7	  3/10	   3/10 	 1/2	 1/4	 2/8	  5/16	 3/10	 30/100	  3/10       
-31	100	0.31	 1/3	 22/71	  31/100	 1/2	 1/4	 2/8	  5/16	 3/10	 31/100	 31/100      
-32	100	0.32	 1/3	  8/25	   8/25 	 1/2	 1/4	 3/8	  5/16	 3/10	 32/100	  8/25       
-33	100	0.33	 1/3	  1/3 	  33/100	 1/2	 1/4	 3/8	  5/16	 3/10	 33/100	 33/100      
-34	100	0.34	 1/3	 17/50	  17/50 	 1/2	 1/4	 3/8	  5/16	 3/10	 34/100	 17/50       
-35	100	0.35	 1/3	  7/20	   7/20 	 1/2	 1/4	 3/8	  6/16	 4/10	 35/100	  7/20       
-36	100	0.36	 1/3	  9/25	   9/25 	 1/2	 1/4	 3/8	  6/16	 4/10	 36/100	  9/25       
-37	100	0.37	 3/8	 10/27	  37/100	 1/2	 1/4	 3/8	  6/16	 4/10	 37/100	 37/100      
-38	100	0.38	 3/8	 19/50	  19/50 	 1/2	 2/4	 3/8	  6/16	 4/10	 38/100	 19/50       
-39	100	0.39	 2/5	 16/41	  39/100	 1/2	 2/4	 3/8	  6/16	 4/10	 39/100	 39/100      
-40	100	0.4	 2/5	  2/5 	   2/5  	 1/2	 2/4	 3/8	  6/16	 4/10	 40/100	  2/5        
-41	100	0.41	 2/5	 16/39	  41/100	 1/2	 2/4	 3/8	  7/16	 4/10	 41/100	 41/100      
-42	100	0.42	 3/7	 21/50	  21/50 	 1/2	 2/4	 3/8	  7/16	 4/10	 42/100	 21/50       
-43	100	0.43	 3/7	  3/7 	  43/100	 1/2	 2/4	 3/8	  7/16	 4/10	 43/100	 43/100      
-44	100	0.44	 4/9	 11/25	  11/25 	 1/2	 2/4	 4/8	  7/16	 4/10	 44/100	 11/25       
-45	100	0.45	 4/9	  9/20	   9/20 	 1/2	 2/4	 4/8	  7/16	 5/10	 45/100	  9/20       
-46	100	0.46	 1/2	 23/50	  23/50 	 1/2	 2/4	 4/8	  7/16	 5/10	 46/100	 23/50       
-47	100	0.47	 1/2	  8/17	  47/100	 1/2	 2/4	 4/8	  8/16	 5/10	 47/100	 47/100      
-48	100	0.48	 1/2	 12/25	  12/25 	 1/2	 2/4	 4/8	  8/16	 5/10	 48/100	 12/25       
-49	100	0.49	 1/2	 24/49	  49/100	 1/2	 2/4	 4/8	  8/16	 5/10	 49/100	 49/100      
-50	100	0.5	 1/2	  1/2 	   1/2  	 1/2	 2/4	 4/8	  8/16	 5/10	 50/100	  1/2        
-51	100	0.51	 1/2	 25/49	  51/100	 1/2	 2/4	 4/8	  8/16	 5/10	 51/100	 51/100      
-52	100	0.52	 1/2	 13/25	  13/25 	 1/2	 2/4	 4/8	  8/16	 5/10	 52/100	 13/25       
-53	100	0.53	 1/2	 44/83	  53/100	 1/2	 2/4	 4/8	  8/16	 5/10	 53/100	 53/100      
-54	100	0.54	 1/2	 27/50	  27/50 	 1/2	 2/4	 4/8	  9/16	 5/10	 54/100	 27/50       
-55	100	0.55	 5/9	 11/20	  11/20 	 1/2	 2/4	 4/8	  9/16	 6/10	 55/100	 11/20       
-56	100	0.56	 5/9	 14/25	  14/25 	 1/2	 2/4	 4/8	  9/16	 6/10	 56/100	 14/25       
-57	100	0.57	 4/7	 53/93	  57/100	 1/2	 2/4	 5/8	  9/16	 6/10	 57/100	 57/100      
-58	100	0.58	 4/7	 29/50	  29/50 	 1/2	 2/4	 5/8	  9/16	 6/10	 58/100	 29/50       
-59	100	0.59	 3/5	 23/39	  59/100	 1/2	 2/4	 5/8	  9/16	 6/10	 59/100	 59/100      
-60	100	0.6	 3/5	  3/5 	   3/5  	 1/2	 2/4	 5/8	 10/16	 6/10	 60/100	  3/5        
-61	100	0.61	 3/5	 36/59	  61/100	 1/2	 2/4	 5/8	 10/16	 6/10	 61/100	 61/100      
-62	100	0.62	 5/8	 31/50	  31/50 	 1/2	 2/4	 5/8	 10/16	 6/10	 62/100	 31/50       
-63	100	0.63	 5/8	 46/73	  63/100	 1/2	 3/4	 5/8	 10/16	 6/10	 63/100	 63/100      
-64	100	0.64	 2/3	 16/25	  16/25 	 1/2	 3/4	 5/8	 10/16	 6/10	 64/100	 16/25       
-65	100	0.65	 2/3	 13/20	  13/20 	 1/2	 3/4	 5/8	 10/16	 7/10	 65/100	 13/20       
-66	100	0.66	 2/3	 33/50	  33/50 	 1/2	 3/4	 5/8	 11/16	 7/10	 66/100	 33/50       
-67	100	0.67	 2/3	 65/97	  67/100	 1/2	 3/4	 5/8	 11/16	 7/10	 67/100	 67/100      
-68	100	0.68	 2/3	 17/25	  17/25 	 1/2	 3/4	 5/8	 11/16	 7/10	 68/100	 17/25       
-69	100	0.69	 2/3	 20/29	  69/100	 1/2	 3/4	 6/8	 11/16	 7/10	 69/100	 69/100      
-70	100	0.7	 2/3	  7/10	   7/10 	 1/2	 3/4	 6/8	 11/16	 7/10	 70/100	  7/10       
-71	100	0.71	 5/7	 22/31	  71/100	 1/2	 3/4	 6/8	 11/16	 7/10	 71/100	 71/100      
-72	100	0.72	 5/7	 18/25	  18/25 	 1/2	 3/4	 6/8	 12/16	 7/10	 72/100	 18/25       
-73	100	0.73	 3/4	 46/63	  73/100	 1/2	 3/4	 6/8	 12/16	 7/10	 73/100	 73/100      
-74	100	0.74	 3/4	 37/50	  37/50 	 1/2	 3/4	 6/8	 12/16	 7/10	 74/100	 37/50       
-75	100	0.75	 3/4	  3/4 	   3/4  	1    	 3/4	 6/8	 12/16	 8/10	 75/100	  3/4        
-76	100	0.76	 3/4	 19/25	  19/25 	1    	 3/4	 6/8	 12/16	 8/10	 76/100	 19/25       
-77	100	0.77	 7/9	 67/87	  77/100	1    	 3/4	 6/8	 12/16	 8/10	 77/100	 77/100      
-78	100	0.78	 7/9	 39/50	  39/50 	1    	 3/4	 6/8	 12/16	 8/10	 78/100	 39/50       
-79	100	0.79	 4/5	 64/81	  79/100	1    	 3/4	 6/8	 13/16	 8/10	 79/100	 79/100      
-80	100	0.8	 4/5	  4/5 	   4/5  	1    	 3/4	 6/8	 13/16	 8/10	 80/100	  4/5        
-81	100	0.81	 4/5	 64/79	  81/100	1    	 3/4	 6/8	 13/16	 8/10	 81/100	 81/100      
-82	100	0.82	 5/6	 41/50	  41/50 	1    	 3/4	 7/8	 13/16	 8/10	 82/100	 41/50       
-83	100	0.83	 5/6	 39/47	  83/100	1    	 3/4	 7/8	 13/16	 8/10	 83/100	 83/100      
-84	100	0.84	 5/6	 21/25	  21/25 	1    	 3/4	 7/8	 13/16	 8/10	 84/100	 21/25       
-85	100	0.85	 6/7	 17/20	  17/20 	1    	 3/4	 7/8	 14/16	 9/10	 85/100	 17/20       
-86	100	0.86	 6/7	 43/50	  43/50 	1    	 3/4	 7/8	 14/16	 9/10	 86/100	 43/50       
-87	100	0.87	 7/8	 67/77	  87/100	1    	 3/4	 7/8	 14/16	 9/10	 87/100	 87/100      
-88	100	0.88	 7/8	 22/25	  22/25 	1    	1    	 7/8	 14/16	 9/10	 88/100	 22/25       
-89	100	0.89	 8/9	  8/9 	  89/100	1    	1    	 7/8	 14/16	 9/10	 89/100	 89/100      
-90	100	0.9	 8/9	  9/10	   9/10 	1    	1    	 7/8	 14/16	 9/10	 90/100	  9/10       
-91	100	0.91	1    	 81/89	  91/100	1    	1    	 7/8	 15/16	 9/10	 91/100	 91/100      
-92	100	0.92	1    	 23/25	  23/25 	1    	1    	 7/8	 15/16	 9/10	 92/100	 23/25       
-93	100	0.93	1    	 40/43	  93/100	1    	1    	 7/8	 15/16	 9/10	 93/100	 93/100      
-94	100	0.94	1    	 47/50	  47/50 	1    	1    	1    	 15/16	 9/10	 94/100	 47/50       
-95	100	0.95	1    	 19/20	  19/20 	1    	1    	1    	 15/16	1     	 95/100	 19/20       
-96	100	0.96	1    	 24/25	  24/25 	1    	1    	1    	 15/16	1     	 96/100	 24/25       
-97	100	0.97	1    	 32/33	  97/100	1    	1    	1    	1      	1     	 97/100	 97/100      
-98	100	0.98	1    	 49/50	  49/50 	1    	1    	1    	1      	1     	 98/100	 49/50       
-99	100	0.99	1    	 98/99	  99/100	1    	1    	1    	1      	1     	 99/100	 99/100      
-100	100	1	1    	1      	1        	1    	1    	1    	1      	1     	1       	1             
-101	100	1.01	1    	1  1/99	1   1/100	1    	1    	1    	1      	1     	1  1/100	1  1/100      
-102	100	1.02	1    	1  1/50	1   1/50 	1    	1    	1    	1      	1     	1  2/100	1  1/50       
-103	100	1.03	1    	1  1/33	1   3/100	1    	1    	1    	1      	1     	1  3/100	1  3/100      
-104	100	1.04	1    	1  1/25	1   1/25 	1    	1    	1    	1  1/16	1     	1  4/100	1  1/25       
-105	100	1.05	1    	1  1/20	1   1/20 	1    	1    	1    	1  1/16	1 1/10	1  5/100	1  1/20       
-106	100	1.06	1    	1  3/50	1   3/50 	1    	1    	1    	1  1/16	1 1/10	1  6/100	1  3/50       
-107	100	1.07	1    	1  4/57	1   7/100	1    	1    	1 1/8	1  1/16	1 1/10	1  7/100	1  7/100      
-108	100	1.08	1    	1  2/25	1   2/25 	1    	1    	1 1/8	1  1/16	1 1/10	1  8/100	1  2/25       
-109	100	1.09	1    	1  1/11	1   9/100	1    	1    	1 1/8	1  1/16	1 1/10	1  9/100	1  9/100      
-110	100	1.1	1 1/9	1  1/10	1   1/10 	1    	1    	1 1/8	1  2/16	1 1/10	1 10/100	1  1/10       
-111	100	1.11	1 1/9	1  1/9 	1  11/100	1    	1    	1 1/8	1  2/16	1 1/10	1 11/100	1 11/100      
-112	100	1.12	1 1/8	1  3/25	1   3/25 	1    	1    	1 1/8	1  2/16	1 1/10	1 12/100	1  3/25       
-113	100	1.13	1 1/8	1 10/77	1  13/100	1    	1 1/4	1 1/8	1  2/16	1 1/10	1 13/100	1 13/100      
-114	100	1.14	1 1/7	1  7/50	1   7/50 	1    	1 1/4	1 1/8	1  2/16	1 1/10	1 14/100	1  7/50       
-115	100	1.15	1 1/7	1  3/20	1   3/20 	1    	1 1/4	1 1/8	1  2/16	1 1/10	1 15/100	1  3/20       
-116	100	1.16	1 1/6	1  4/25	1   4/25 	1    	1 1/4	1 1/8	1  3/16	1 2/10	1 16/100	1  4/25       
-117	100	1.17	1 1/6	1  9/53	1  17/100	1    	1 1/4	1 1/8	1  3/16	1 2/10	1 17/100	1 17/100      
-118	100	1.18	1 1/6	1  9/50	1   9/50 	1    	1 1/4	1 1/8	1  3/16	1 2/10	1 18/100	1  9/50       
-119	100	1.19	1 1/5	1 15/79	1  19/100	1    	1 1/4	1 2/8	1  3/16	1 2/10	1 19/100	1 19/100      
-120	100	1.2	1 1/5	1  1/5 	1   1/5  	1    	1 1/4	1 2/8	1  3/16	1 2/10	1 20/100	1  1/5        
-121	100	1.21	1 1/5	1 17/81	1  21/100	1    	1 1/4	1 2/8	1  3/16	1 2/10	1 21/100	1 21/100      
-122	100	1.22	1 2/9	1 11/50	1  11/50 	1    	1 1/4	1 2/8	1  4/16	1 2/10	1 22/100	1 11/50       
-123	100	1.23	1 2/9	1 20/87	1  23/100	1    	1 1/4	1 2/8	1  4/16	1 2/10	1 23/100	1 23/100      
-124	100	1.24	1 1/4	1  6/25	1   6/25 	1    	1 1/4	1 2/8	1  4/16	1 2/10	1 24/100	1  6/25       
-125	100	1.25	1 1/4	1  1/4 	1   1/4  	1 1/2	1 1/4	1 2/8	1  4/16	1 3/10	1 25/100	1  1/4        
-126	100	1.26	1 1/4	1 13/50	1  13/50 	1 1/2	1 1/4	1 2/8	1  4/16	1 3/10	1 26/100	1 13/50       
-127	100	1.27	1 1/4	1 10/37	1  27/100	1 1/2	1 1/4	1 2/8	1  4/16	1 3/10	1 27/100	1 27/100      
--103	201	-0.512437811	- 1/2	- 41/80	- 103/201	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 51/100	- 103/201      
--100	201	-0.497512438	- 1/2	-  1/2 	- 100/201	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 50/100	- 100/201      
--97	201	-0.482587065	- 1/2	- 14/29	-  97/201	- 1/2	- 2/4	- 4/8	-  8/16	- 5/10	- 48/100	- 97/201      
--94	201	-0.467661692	- 1/2	- 29/62	-  94/201	- 1/2	- 2/4	- 4/8	-  7/16	- 5/10	- 47/100	- 94/201      
--91	201	-0.452736318	- 4/9	- 24/53	-  91/201	- 1/2	- 2/4	- 4/8	-  7/16	- 5/10	- 45/100	- 91/201      
--88	201	-0.437810945	- 4/9	-  7/16	-  88/201	- 1/2	- 2/4	- 4/8	-  7/16	- 4/10	- 44/100	- 88/201      
--85	201	-0.422885572	- 3/7	- 11/26	-  85/201	- 1/2	- 2/4	- 3/8	-  7/16	- 4/10	- 42/100	- 85/201      
--82	201	-0.407960199	- 2/5	- 31/76	-  82/201	- 1/2	- 2/4	- 3/8	-  7/16	- 4/10	- 41/100	- 82/201      
--79	201	-0.393034826	- 2/5	- 11/28	-  79/201	- 1/2	- 2/4	- 3/8	-  6/16	- 4/10	- 39/100	- 79/201      
--76	201	-0.378109453	- 3/8	- 31/82	-  76/201	- 1/2	- 2/4	- 3/8	-  6/16	- 4/10	- 38/100	- 76/201      
--73	201	-0.36318408	- 1/3	-  4/11	-  73/201	- 1/2	- 1/4	- 3/8	-  6/16	- 4/10	- 36/100	- 73/201      
--70	201	-0.348258706	- 1/3	- 31/89	-  70/201	- 1/2	- 1/4	- 3/8	-  6/16	- 3/10	- 35/100	- 70/201      
--67	201	-0.333333333	- 1/3	-  1/3 	-   1/3  	- 1/2	- 1/4	- 3/8	-  5/16	- 3/10	- 33/100	-  1/3        
--64	201	-0.31840796	- 1/3	-  7/22	-  64/201	- 1/2	- 1/4	- 3/8	-  5/16	- 3/10	- 32/100	- 64/201      
--61	201	-0.303482587	- 1/3	- 17/56	-  61/201	- 1/2	- 1/4	- 2/8	-  5/16	- 3/10	- 30/100	- 61/201      
--58	201	-0.288557214	- 2/7	- 15/52	-  58/201	- 1/2	- 1/4	- 2/8	-  5/16	- 3/10	- 29/100	- 58/201      
--55	201	-0.273631841	- 2/7	- 26/95	-  55/201	- 1/2	- 1/4	- 2/8	-  4/16	- 3/10	- 27/100	- 55/201      
--52	201	-0.258706468	- 1/4	- 15/58	-  52/201	- 1/2	- 1/4	- 2/8	-  4/16	- 3/10	- 26/100	- 52/201      
--49	201	-0.243781095	- 1/4	- 10/41	-  49/201	-0    	- 1/4	- 2/8	-  4/16	- 2/10	- 24/100	- 49/201      
--46	201	-0.228855721	- 2/9	- 19/83	-  46/201	-0    	- 1/4	- 2/8	-  4/16	- 2/10	- 23/100	- 46/201      
--43	201	-0.213930348	- 1/5	-  3/14	-  43/201	-0    	- 1/4	- 2/8	-  3/16	- 2/10	- 21/100	- 43/201      
--40	201	-0.199004975	- 1/5	-  1/5 	-  40/201	-0    	- 1/4	- 2/8	-  3/16	- 2/10	- 20/100	- 40/201      
--37	201	-0.184079602	- 1/5	-  7/38	-  37/201	-0    	- 1/4	- 1/8	-  3/16	- 2/10	- 18/100	- 37/201      
--34	201	-0.169154229	- 1/6	- 11/65	-  34/201	-0    	- 1/4	- 1/8	-  3/16	- 2/10	- 17/100	- 34/201      
--31	201	-0.154228856	- 1/6	-  2/13	-  31/201	-0    	- 1/4	- 1/8	-  2/16	- 2/10	- 15/100	- 31/201      
--28	201	-0.139303483	- 1/7	- 11/79	-  28/201	-0    	- 1/4	- 1/8	-  2/16	- 1/10	- 14/100	- 28/201      
--25	201	-0.124378109	- 1/8	-  1/8 	-  25/201	-0    	-0    	- 1/8	-  2/16	- 1/10	- 12/100	- 25/201      
--22	201	-0.109452736	- 1/9	-  7/64	-  22/201	-0    	-0    	- 1/8	-  2/16	- 1/10	- 11/100	- 22/201      
--19	201	-0.094527363	-0    	-  7/74	-  19/201	-0    	-0    	- 1/8	-  2/16	- 1/10	-  9/100	- 19/201      
--16	201	-0.07960199	-0    	-  7/88	-  16/201	-0    	-0    	- 1/8	-  1/16	- 1/10	-  8/100	- 16/201      
--13	201	-0.064676617	-0    	-  2/31	-  13/201	-0    	-0    	- 1/8	-  1/16	- 1/10	-  6/100	- 13/201      
--10	201	-0.049751244	-0    	-  1/20	-  10/201	-0    	-0    	-0    	-  1/16	-0     	-  5/100	- 10/201      
--7	201	-0.034825871	-0    	-  3/86	-   7/201	-0    	-0    	-0    	-  1/16	-0     	-  3/100	-  7/201      
--4	201	-0.019900498	-0    	-  1/50	-   4/201	-0    	-0    	-0    	-0      	-0     	-  2/100	-  4/201      
--1	201	-0.004975124	-0    	-0      	-   1/201	-0    	-0    	-0    	-0      	-0     	-0       	-  1/201      
-2	201	0.009950249	0    	0      	   2/201	0    	0    	0    	0      	0     	  1/100	  2/201      
-5	201	0.024875622	0    	  1/40	   5/201	0    	0    	0    	0      	0     	  2/100	  5/201      
-8	201	0.039800995	0    	  1/25	   8/201	0    	0    	0    	  1/16	0     	  4/100	  8/201      
-11	201	0.054726368	0    	  4/73	  11/201	0    	0    	0    	  1/16	 1/10	  5/100	 11/201      
-14	201	0.069651741	0    	  3/43	  14/201	0    	0    	 1/8	  1/16	 1/10	  7/100	 14/201      
-17	201	0.084577114	0    	  6/71	  17/201	0    	0    	 1/8	  1/16	 1/10	  8/100	 17/201      
-20	201	0.099502488	0    	  1/10	  20/201	0    	0    	 1/8	  2/16	 1/10	 10/100	 20/201      
-23	201	0.114427861	 1/9	  4/35	  23/201	0    	0    	 1/8	  2/16	 1/10	 11/100	 23/201      
-26	201	0.129353234	 1/8	 11/85	  26/201	0    	 1/4	 1/8	  2/16	 1/10	 13/100	 26/201      
-29	201	0.144278607	 1/7	 14/97	  29/201	0    	 1/4	 1/8	  2/16	 1/10	 14/100	 29/201      
-32	201	0.15920398	 1/6	  7/44	  32/201	0    	 1/4	 1/8	  3/16	 2/10	 16/100	 32/201      
-35	201	0.174129353	 1/6	  4/23	  35/201	0    	 1/4	 1/8	  3/16	 2/10	 17/100	 35/201      
-38	201	0.189054726	 1/5	  7/37	  38/201	0    	 1/4	 2/8	  3/16	 2/10	 19/100	 38/201      
-41	201	0.2039801	 1/5	 10/49	  41/201	0    	 1/4	 2/8	  3/16	 2/10	 20/100	 41/201      
-44	201	0.218905473	 2/9	  7/32	  44/201	0    	 1/4	 2/8	  4/16	 2/10	 22/100	 44/201      
-47	201	0.233830846	 1/4	 18/77	  47/201	0    	 1/4	 2/8	  4/16	 2/10	 23/100	 47/201      
-50	201	0.248756219	 1/4	  1/4 	  50/201	0    	 1/4	 2/8	  4/16	 2/10	 25/100	 50/201      
-53	201	0.263681592	 1/4	 24/91	  53/201	 1/2	 1/4	 2/8	  4/16	 3/10	 26/100	 53/201      
-56	201	0.278606965	 2/7	 17/61	  56/201	 1/2	 1/4	 2/8	  4/16	 3/10	 28/100	 56/201      
-59	201	0.293532338	 2/7	 27/92	  59/201	 1/2	 1/4	 2/8	  5/16	 3/10	 29/100	 59/201      
-62	201	0.308457711	 1/3	 29/94	  62/201	 1/2	 1/4	 2/8	  5/16	 3/10	 31/100	 62/201      
-65	201	0.323383085	 1/3	 11/34	  65/201	 1/2	 1/4	 3/8	  5/16	 3/10	 32/100	 65/201      
-68	201	0.338308458	 1/3	 23/68	  68/201	 1/2	 1/4	 3/8	  5/16	 3/10	 34/100	 68/201      
-71	201	0.353233831	 1/3	  6/17	  71/201	 1/2	 1/4	 3/8	  6/16	 4/10	 35/100	 71/201      
-74	201	0.368159204	 3/8	  7/19	  74/201	 1/2	 1/4	 3/8	  6/16	 4/10	 37/100	 74/201      
-77	201	0.383084577	 3/8	 18/47	  77/201	 1/2	 2/4	 3/8	  6/16	 4/10	 38/100	 77/201      
-80	201	0.39800995	 2/5	 39/98	  80/201	 1/2	 2/4	 3/8	  6/16	 4/10	 40/100	 80/201      
-83	201	0.412935323	 2/5	 19/46	  83/201	 1/2	 2/4	 3/8	  7/16	 4/10	 41/100	 83/201      
-86	201	0.427860697	 3/7	  3/7 	  86/201	 1/2	 2/4	 3/8	  7/16	 4/10	 43/100	 86/201      
-89	201	0.44278607	 4/9	 31/70	  89/201	 1/2	 2/4	 4/8	  7/16	 4/10	 44/100	 89/201      
-92	201	0.457711443	 1/2	 27/59	  92/201	 1/2	 2/4	 4/8	  7/16	 5/10	 46/100	 92/201      
-95	201	0.472636816	 1/2	 26/55	  95/201	 1/2	 2/4	 4/8	  8/16	 5/10	 47/100	 95/201      
-98	201	0.487562189	 1/2	 39/80	  98/201	 1/2	 2/4	 4/8	  8/16	 5/10	 49/100	 98/201      
-101	201	0.502487562	 1/2	  1/2 	 101/201	 1/2	 2/4	 4/8	  8/16	 5/10	 50/100	 101/201      
-104	201	0.517412935	 1/2	 15/29	 104/201	 1/2	 2/4	 4/8	  8/16	 5/10	 52/100	 104/201      
-107	201	0.532338308	 1/2	 33/62	 107/201	 1/2	 2/4	 4/8	  9/16	 5/10	 53/100	 107/201      
-110	201	0.547263682	 5/9	 29/53	 110/201	 1/2	 2/4	 4/8	  9/16	 5/10	 55/100	 110/201      
-113	201	0.562189055	 5/9	  9/16	 113/201	 1/2	 2/4	 4/8	  9/16	 6/10	 56/100	 113/201      
-116	201	0.577114428	 4/7	 15/26	 116/201	 1/2	 2/4	 5/8	  9/16	 6/10	 58/100	 116/201      
-119	201	0.592039801	 3/5	 45/76	 119/201	 1/2	 2/4	 5/8	  9/16	 6/10	 59/100	 119/201      
-122	201	0.606965174	 3/5	 17/28	 122/201	 1/2	 2/4	 5/8	 10/16	 6/10	 61/100	 122/201      
-125	201	0.621890547	 5/8	 51/82	 125/201	 1/2	 2/4	 5/8	 10/16	 6/10	 62/100	 125/201      
-128	201	0.63681592	 2/3	  7/11	 128/201	 1/2	 3/4	 5/8	 10/16	 6/10	 64/100	 128/201      
-131	201	0.651741294	 2/3	 58/89	 131/201	 1/2	 3/4	 5/8	 10/16	 7/10	 65/100	 131/201      
-134	201	0.666666667	 2/3	  2/3 	   2/3  	 1/2	 3/4	 5/8	 11/16	 7/10	 67/100	  2/3        
-137	201	0.68159204	 2/3	 15/22	 137/201	 1/2	 3/4	 5/8	 11/16	 7/10	 68/100	 137/201      
-140	201	0.696517413	 2/3	 39/56	 140/201	 1/2	 3/4	 6/8	 11/16	 7/10	 70/100	 140/201      
-143	201	0.711442786	 5/7	 37/52	 143/201	 1/2	 3/4	 6/8	 11/16	 7/10	 71/100	 143/201      
-146	201	0.726368159	 5/7	 69/95	 146/201	 1/2	 3/4	 6/8	 12/16	 7/10	 73/100	 146/201      
-149	201	0.741293532	 3/4	 43/58	 149/201	 1/2	 3/4	 6/8	 12/16	 7/10	 74/100	 149/201      
-152	201	0.756218905	 3/4	 31/41	 152/201	1    	 3/4	 6/8	 12/16	 8/10	 76/100	 152/201      
-155	201	0.771144279	 7/9	 64/83	 155/201	1    	 3/4	 6/8	 12/16	 8/10	 77/100	 155/201      
-158	201	0.786069652	 4/5	 11/14	 158/201	1    	 3/4	 6/8	 13/16	 8/10	 79/100	 158/201      
-161	201	0.800995025	 4/5	  4/5 	 161/201	1    	 3/4	 6/8	 13/16	 8/10	 80/100	 161/201      
-164	201	0.815920398	 4/5	 31/38	 164/201	1    	 3/4	 7/8	 13/16	 8/10	 82/100	 164/201      
-167	201	0.830845771	 5/6	 54/65	 167/201	1    	 3/4	 7/8	 13/16	 8/10	 83/100	 167/201      
-170	201	0.845771144	 5/6	 11/13	 170/201	1    	 3/4	 7/8	 14/16	 8/10	 85/100	 170/201      
-173	201	0.860696517	 6/7	 68/79	 173/201	1    	 3/4	 7/8	 14/16	 9/10	 86/100	 173/201      
-176	201	0.875621891	 7/8	  7/8 	 176/201	1    	1    	 7/8	 14/16	 9/10	 88/100	 176/201      
-179	201	0.890547264	 8/9	 57/64	 179/201	1    	1    	 7/8	 14/16	 9/10	 89/100	 179/201      
-182	201	0.905472637	1    	 67/74	 182/201	1    	1    	 7/8	 14/16	 9/10	 91/100	 182/201      
-185	201	0.92039801	1    	 81/88	 185/201	1    	1    	 7/8	 15/16	 9/10	 92/100	 185/201      
-188	201	0.935323383	1    	 29/31	 188/201	1    	1    	 7/8	 15/16	 9/10	 94/100	 188/201      
-191	201	0.950248756	1    	 19/20	 191/201	1    	1    	1    	 15/16	1     	 95/100	 191/201      
-194	201	0.965174129	1    	 83/86	 194/201	1    	1    	1    	 15/16	1     	 97/100	 194/201      
-197	201	0.980099502	1    	 49/50	 197/201	1    	1    	1    	1      	1     	 98/100	 197/201      
-200	201	0.995024876	1    	1      	 200/201	1    	1    	1    	1      	1     	1       	 200/201      
-203	201	1.009950249	1    	1      	1   2/201	1    	1    	1    	1      	1     	1  1/100	1  2/201      
-206	201	1.024875622	1    	1  1/40	1   5/201	1    	1    	1    	1      	1     	1  2/100	1  5/201      
-209	201	1.039800995	1    	1  1/25	1   8/201	1    	1    	1    	1  1/16	1     	1  4/100	1  8/201      
-212	201	1.054726368	1    	1  4/73	1  11/201	1    	1    	1    	1  1/16	1 1/10	1  5/100	1 11/201      
-215	201	1.069651741	1    	1  3/43	1  14/201	1    	1    	1 1/8	1  1/16	1 1/10	1  7/100	1 14/201      
-218	201	1.084577114	1    	1  6/71	1  17/201	1    	1    	1 1/8	1  1/16	1 1/10	1  8/100	1 17/201      
-221	201	1.099502488	1    	1  1/10	1  20/201	1    	1    	1 1/8	1  2/16	1 1/10	1 10/100	1 20/201      
-224	201	1.114427861	1 1/9	1  4/35	1  23/201	1    	1    	1 1/8	1  2/16	1 1/10	1 11/100	1 23/201      
-227	201	1.129353234	1 1/8	1 11/85	1  26/201	1    	1 1/4	1 1/8	1  2/16	1 1/10	1 13/100	1 26/201      
-230	201	1.144278607	1 1/7	1 14/97	1  29/201	1    	1 1/4	1 1/8	1  2/16	1 1/10	1 14/100	1 29/201      
-233	201	1.15920398	1 1/6	1  7/44	1  32/201	1    	1 1/4	1 1/8	1  3/16	1 2/10	1 16/100	1 32/201      
-236	201	1.174129353	1 1/6	1  4/23	1  35/201	1    	1 1/4	1 1/8	1  3/16	1 2/10	1 17/100	1 35/201      
-239	201	1.189054726	1 1/5	1  7/37	1  38/201	1    	1 1/4	1 2/8	1  3/16	1 2/10	1 19/100	1 38/201      
-242	201	1.2039801	1 1/5	1 10/49	1  41/201	1    	1 1/4	1 2/8	1  3/16	1 2/10	1 20/100	1 41/201      
-245	201	1.218905473	1 2/9	1  7/32	1  44/201	1    	1 1/4	1 2/8	1  4/16	1 2/10	1 22/100	1 44/201      
-248	201	1.233830846	1 1/4	1 18/77	1  47/201	1    	1 1/4	1 2/8	1  4/16	1 2/10	1 23/100	1 47/201      
-251	201	1.248756219	1 1/4	1  1/4 	1  50/201	1    	1 1/4	1 2/8	1  4/16	1 2/10	1 25/100	1 50/201      
-254	201	1.263681592	1 1/4	1 24/91	1  53/201	1 1/2	1 1/4	1 2/8	1  4/16	1 3/10	1 26/100	1 53/201      
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
-												
diff --git a/trunk/test-data/spreadsheet/54686_fraction_formats.xls b/trunk/test-data/spreadsheet/54686_fraction_formats.xls
deleted file mode 100644
index d802995..0000000
--- a/trunk/test-data/spreadsheet/54686_fraction_formats.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54764-2.xlsx b/trunk/test-data/spreadsheet/54764-2.xlsx
deleted file mode 100644
index 0d942ca..0000000
--- a/trunk/test-data/spreadsheet/54764-2.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/54764.xlsx b/trunk/test-data/spreadsheet/54764.xlsx
deleted file mode 100644
index 938245b..0000000
--- a/trunk/test-data/spreadsheet/54764.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55341_CellStyleBorder.xls b/trunk/test-data/spreadsheet/55341_CellStyleBorder.xls
deleted file mode 100644
index 6de09bc..0000000
--- a/trunk/test-data/spreadsheet/55341_CellStyleBorder.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55406_Conditional_formatting_sample.xlsx b/trunk/test-data/spreadsheet/55406_Conditional_formatting_sample.xlsx
deleted file mode 100644
index dc3e96d..0000000
--- a/trunk/test-data/spreadsheet/55406_Conditional_formatting_sample.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55640.xlsx b/trunk/test-data/spreadsheet/55640.xlsx
deleted file mode 100644
index d353bb3..0000000
--- a/trunk/test-data/spreadsheet/55640.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55668.xls b/trunk/test-data/spreadsheet/55668.xls
deleted file mode 100644
index 8aa8f50..0000000
--- a/trunk/test-data/spreadsheet/55668.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55745.xlsx b/trunk/test-data/spreadsheet/55745.xlsx
deleted file mode 100644
index 5726e74..0000000
--- a/trunk/test-data/spreadsheet/55745.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55850.xlsx b/trunk/test-data/spreadsheet/55850.xlsx
deleted file mode 100644
index ea8dc0e..0000000
--- a/trunk/test-data/spreadsheet/55850.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55864.xlsx b/trunk/test-data/spreadsheet/55864.xlsx
deleted file mode 100644
index 51c9d53..0000000
--- a/trunk/test-data/spreadsheet/55864.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55906-MultiSheetRefs.xls b/trunk/test-data/spreadsheet/55906-MultiSheetRefs.xls
deleted file mode 100644
index c31728d..0000000
--- a/trunk/test-data/spreadsheet/55906-MultiSheetRefs.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55906-MultiSheetRefs.xlsx b/trunk/test-data/spreadsheet/55906-MultiSheetRefs.xlsx
deleted file mode 100644
index 4099796..0000000
--- a/trunk/test-data/spreadsheet/55906-MultiSheetRefs.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55923.xlsx b/trunk/test-data/spreadsheet/55923.xlsx
deleted file mode 100644
index fbcb7bd..0000000
--- a/trunk/test-data/spreadsheet/55923.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55924.xlsx b/trunk/test-data/spreadsheet/55924.xlsx
deleted file mode 100644
index 2ce091a..0000000
--- a/trunk/test-data/spreadsheet/55924.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55926.xlsx b/trunk/test-data/spreadsheet/55926.xlsx
deleted file mode 100644
index 23907c1..0000000
--- a/trunk/test-data/spreadsheet/55926.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55927.xlsx b/trunk/test-data/spreadsheet/55927.xlsx
deleted file mode 100644
index 62fd046..0000000
--- a/trunk/test-data/spreadsheet/55927.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/55982.xls b/trunk/test-data/spreadsheet/55982.xls
deleted file mode 100644
index 2e09ddb..0000000
--- a/trunk/test-data/spreadsheet/55982.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56011.xlsx b/trunk/test-data/spreadsheet/56011.xlsx
deleted file mode 100644
index 7b5f70e..0000000
--- a/trunk/test-data/spreadsheet/56011.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56017.xlsx b/trunk/test-data/spreadsheet/56017.xlsx
deleted file mode 100644
index f3ddf3c..0000000
--- a/trunk/test-data/spreadsheet/56017.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56169.xlsx b/trunk/test-data/spreadsheet/56169.xlsx
deleted file mode 100644
index 98b8788..0000000
--- a/trunk/test-data/spreadsheet/56169.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56170.xlsx b/trunk/test-data/spreadsheet/56170.xlsx
deleted file mode 100644
index f80e386..0000000
--- a/trunk/test-data/spreadsheet/56170.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56274.xlsx b/trunk/test-data/spreadsheet/56274.xlsx
deleted file mode 100644
index 8c3573a..0000000
--- a/trunk/test-data/spreadsheet/56274.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56278.xlsx b/trunk/test-data/spreadsheet/56278.xlsx
deleted file mode 100644
index f710851..0000000
--- a/trunk/test-data/spreadsheet/56278.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56295.xlsx b/trunk/test-data/spreadsheet/56295.xlsx
deleted file mode 100644
index d929d99..0000000
--- a/trunk/test-data/spreadsheet/56295.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56315.xlsx b/trunk/test-data/spreadsheet/56315.xlsx
deleted file mode 100644
index 10e167a..0000000
--- a/trunk/test-data/spreadsheet/56315.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56325.xls b/trunk/test-data/spreadsheet/56325.xls
deleted file mode 100644
index 38b0e4a..0000000
--- a/trunk/test-data/spreadsheet/56325.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56325a.xls b/trunk/test-data/spreadsheet/56325a.xls
deleted file mode 100644
index a1e52cb..0000000
--- a/trunk/test-data/spreadsheet/56325a.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56420.xlsx b/trunk/test-data/spreadsheet/56420.xlsx
deleted file mode 100644
index bd1ceff..0000000
--- a/trunk/test-data/spreadsheet/56420.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56450.xls b/trunk/test-data/spreadsheet/56450.xls
deleted file mode 100644
index 66798a8..0000000
--- a/trunk/test-data/spreadsheet/56450.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56482.xls b/trunk/test-data/spreadsheet/56482.xls
deleted file mode 100644
index 466aa19..0000000
--- a/trunk/test-data/spreadsheet/56482.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56502.xlsx b/trunk/test-data/spreadsheet/56502.xlsx
deleted file mode 100644
index 72bd173..0000000
--- a/trunk/test-data/spreadsheet/56502.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56511.xlsx b/trunk/test-data/spreadsheet/56511.xlsx
deleted file mode 100644
index 1369584..0000000
--- a/trunk/test-data/spreadsheet/56511.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56514.xlsx b/trunk/test-data/spreadsheet/56514.xlsx
deleted file mode 100644
index 29163a5..0000000
--- a/trunk/test-data/spreadsheet/56514.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56563a.xls b/trunk/test-data/spreadsheet/56563a.xls
deleted file mode 100644
index 7fb4aa4..0000000
--- a/trunk/test-data/spreadsheet/56563a.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56563b.xls b/trunk/test-data/spreadsheet/56563b.xls
deleted file mode 100644
index 7fb4aa4..0000000
--- a/trunk/test-data/spreadsheet/56563b.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56574.xlsx b/trunk/test-data/spreadsheet/56574.xlsx
deleted file mode 100644
index 9cce54c..0000000
--- a/trunk/test-data/spreadsheet/56574.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56644.xlsx b/trunk/test-data/spreadsheet/56644.xlsx
deleted file mode 100644
index f82be17..0000000
--- a/trunk/test-data/spreadsheet/56644.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56688_1.xlsx b/trunk/test-data/spreadsheet/56688_1.xlsx
deleted file mode 100644
index 4246e96..0000000
--- a/trunk/test-data/spreadsheet/56688_1.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56688_2.xlsx b/trunk/test-data/spreadsheet/56688_2.xlsx
deleted file mode 100644
index 24098bd..0000000
--- a/trunk/test-data/spreadsheet/56688_2.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56688_3.xlsx b/trunk/test-data/spreadsheet/56688_3.xlsx
deleted file mode 100644
index 9a70761..0000000
--- a/trunk/test-data/spreadsheet/56688_3.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56688_4.xlsx b/trunk/test-data/spreadsheet/56688_4.xlsx
deleted file mode 100644
index 5aeb4ee..0000000
--- a/trunk/test-data/spreadsheet/56688_4.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56702.xlsx b/trunk/test-data/spreadsheet/56702.xlsx
deleted file mode 100644
index c17a0bc..0000000
--- a/trunk/test-data/spreadsheet/56702.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56730.xlsx b/trunk/test-data/spreadsheet/56730.xlsx
deleted file mode 100644
index 9883de4..0000000
--- a/trunk/test-data/spreadsheet/56730.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56737.xls b/trunk/test-data/spreadsheet/56737.xls
deleted file mode 100644
index 59ab233..0000000
--- a/trunk/test-data/spreadsheet/56737.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56737.xlsx b/trunk/test-data/spreadsheet/56737.xlsx
deleted file mode 100644
index 3783483..0000000
--- a/trunk/test-data/spreadsheet/56737.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/56957.xlsx b/trunk/test-data/spreadsheet/56957.xlsx
deleted file mode 100644
index b58aa62..0000000
--- a/trunk/test-data/spreadsheet/56957.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57003-FixedFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/57003-FixedFunctionTestCaseData.xls
deleted file mode 100644
index bd8b4ba..0000000
--- a/trunk/test-data/spreadsheet/57003-FixedFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57074.xls b/trunk/test-data/spreadsheet/57074.xls
deleted file mode 100644
index c29485a..0000000
--- a/trunk/test-data/spreadsheet/57074.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57163.xls b/trunk/test-data/spreadsheet/57163.xls
deleted file mode 100644
index 402c954..0000000
--- a/trunk/test-data/spreadsheet/57163.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57171_57163_57165.xlsx b/trunk/test-data/spreadsheet/57171_57163_57165.xlsx
deleted file mode 100644
index 5d94a47..0000000
--- a/trunk/test-data/spreadsheet/57171_57163_57165.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57176.xlsx b/trunk/test-data/spreadsheet/57176.xlsx
deleted file mode 100644
index cd7dd84..0000000
--- a/trunk/test-data/spreadsheet/57176.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57181.xlsm b/trunk/test-data/spreadsheet/57181.xlsm
deleted file mode 100644
index 3583a71..0000000
--- a/trunk/test-data/spreadsheet/57181.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57196.xlsx b/trunk/test-data/spreadsheet/57196.xlsx
deleted file mode 100644
index ed2b65e..0000000
--- a/trunk/test-data/spreadsheet/57196.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57231_MixedGasReport.xls b/trunk/test-data/spreadsheet/57231_MixedGasReport.xls
deleted file mode 100644
index d4a526c..0000000
--- a/trunk/test-data/spreadsheet/57231_MixedGasReport.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57236.xlsx b/trunk/test-data/spreadsheet/57236.xlsx
deleted file mode 100644
index 6568847..0000000
--- a/trunk/test-data/spreadsheet/57236.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57362.xlsx b/trunk/test-data/spreadsheet/57362.xlsx
deleted file mode 100644
index ec2be38..0000000
--- a/trunk/test-data/spreadsheet/57362.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57423.xlsx b/trunk/test-data/spreadsheet/57423.xlsx
deleted file mode 100644
index 54c65be..0000000
--- a/trunk/test-data/spreadsheet/57423.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57456.xls b/trunk/test-data/spreadsheet/57456.xls
deleted file mode 100644
index 86fde85..0000000
--- a/trunk/test-data/spreadsheet/57456.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57482-OnlyNumeric.xlsx b/trunk/test-data/spreadsheet/57482-OnlyNumeric.xlsx
deleted file mode 100644
index c905891..0000000
--- a/trunk/test-data/spreadsheet/57482-OnlyNumeric.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57523.xlsx b/trunk/test-data/spreadsheet/57523.xlsx
deleted file mode 100644
index 99fe81d..0000000
--- a/trunk/test-data/spreadsheet/57523.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57535.xlsx b/trunk/test-data/spreadsheet/57535.xlsx
deleted file mode 100644
index 897ef71..0000000
--- a/trunk/test-data/spreadsheet/57535.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57798.xls b/trunk/test-data/spreadsheet/57798.xls
deleted file mode 100644
index 6f66799..0000000
--- a/trunk/test-data/spreadsheet/57798.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57798.xlsx b/trunk/test-data/spreadsheet/57798.xlsx
deleted file mode 100644
index 415e450..0000000
--- a/trunk/test-data/spreadsheet/57798.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57826.xlsx b/trunk/test-data/spreadsheet/57826.xlsx
deleted file mode 100644
index ccf2dc3..0000000
--- a/trunk/test-data/spreadsheet/57826.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57828.xlsx b/trunk/test-data/spreadsheet/57828.xlsx
deleted file mode 100644
index c750a09..0000000
--- a/trunk/test-data/spreadsheet/57828.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57838.xlsx b/trunk/test-data/spreadsheet/57838.xlsx
deleted file mode 100644
index 59366d0..0000000
--- a/trunk/test-data/spreadsheet/57838.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57890.xlsx b/trunk/test-data/spreadsheet/57890.xlsx
deleted file mode 100644
index 91c751b..0000000
--- a/trunk/test-data/spreadsheet/57890.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57893-many-merges.xlsx b/trunk/test-data/spreadsheet/57893-many-merges.xlsx
deleted file mode 100644
index 572dfec..0000000
--- a/trunk/test-data/spreadsheet/57893-many-merges.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57914.xlsx b/trunk/test-data/spreadsheet/57914.xlsx
deleted file mode 100644
index 2477fa8..0000000
--- a/trunk/test-data/spreadsheet/57914.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/57925.xls b/trunk/test-data/spreadsheet/57925.xls
deleted file mode 100644
index ef13551..0000000
--- a/trunk/test-data/spreadsheet/57925.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58315.xlsx b/trunk/test-data/spreadsheet/58315.xlsx
deleted file mode 100644
index 0da751e..0000000
--- a/trunk/test-data/spreadsheet/58315.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58325_db.xlsx b/trunk/test-data/spreadsheet/58325_db.xlsx
deleted file mode 100644
index 8b85089..0000000
--- a/trunk/test-data/spreadsheet/58325_db.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58325_lt.xlsx b/trunk/test-data/spreadsheet/58325_lt.xlsx
deleted file mode 100644
index 342ad03..0000000
--- a/trunk/test-data/spreadsheet/58325_lt.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58616.xlsx b/trunk/test-data/spreadsheet/58616.xlsx
deleted file mode 100644
index 9ab5739..0000000
--- a/trunk/test-data/spreadsheet/58616.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58648.xlsx b/trunk/test-data/spreadsheet/58648.xlsx
deleted file mode 100644
index 9f2f7bf..0000000
--- a/trunk/test-data/spreadsheet/58648.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58731.xlsx b/trunk/test-data/spreadsheet/58731.xlsx
deleted file mode 100644
index 80e22f3..0000000
--- a/trunk/test-data/spreadsheet/58731.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58747.xlsx b/trunk/test-data/spreadsheet/58747.xlsx
deleted file mode 100644
index 2bfec8a..0000000
--- a/trunk/test-data/spreadsheet/58747.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/58760.xlsx b/trunk/test-data/spreadsheet/58760.xlsx
deleted file mode 100644
index 9795f8c..0000000
--- a/trunk/test-data/spreadsheet/58760.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59021.xlsx b/trunk/test-data/spreadsheet/59021.xlsx
deleted file mode 100644
index 0f485d2..0000000
--- a/trunk/test-data/spreadsheet/59021.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59026.xlsx b/trunk/test-data/spreadsheet/59026.xlsx
deleted file mode 100644
index 29c8c2d..0000000
--- a/trunk/test-data/spreadsheet/59026.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59074.xls b/trunk/test-data/spreadsheet/59074.xls
deleted file mode 100644
index 2b0a2d8..0000000
--- a/trunk/test-data/spreadsheet/59074.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59106.xlsx b/trunk/test-data/spreadsheet/59106.xlsx
deleted file mode 100644
index e47845a..0000000
--- a/trunk/test-data/spreadsheet/59106.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59132.xlsx b/trunk/test-data/spreadsheet/59132.xlsx
deleted file mode 100644
index 7fa2bdd..0000000
--- a/trunk/test-data/spreadsheet/59132.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59264.xls b/trunk/test-data/spreadsheet/59264.xls
deleted file mode 100644
index dcbaf2b..0000000
--- a/trunk/test-data/spreadsheet/59264.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59264.xlsx b/trunk/test-data/spreadsheet/59264.xlsx
deleted file mode 100644
index be0a4d0..0000000
--- a/trunk/test-data/spreadsheet/59264.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59687.xlsx b/trunk/test-data/spreadsheet/59687.xlsx
deleted file mode 100644
index 8ce567f..0000000
--- a/trunk/test-data/spreadsheet/59687.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59736.xlsx b/trunk/test-data/spreadsheet/59736.xlsx
deleted file mode 100644
index 1f29d54..0000000
--- a/trunk/test-data/spreadsheet/59736.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59746_NoRowNums.xlsx b/trunk/test-data/spreadsheet/59746_NoRowNums.xlsx
deleted file mode 100644
index 72c26e9..0000000
--- a/trunk/test-data/spreadsheet/59746_NoRowNums.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59775.xlsx b/trunk/test-data/spreadsheet/59775.xlsx
deleted file mode 100644
index 03238bd..0000000
--- a/trunk/test-data/spreadsheet/59775.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59830.xls b/trunk/test-data/spreadsheet/59830.xls
deleted file mode 100644
index 592d9ba..0000000
--- a/trunk/test-data/spreadsheet/59830.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/59858.xls b/trunk/test-data/spreadsheet/59858.xls
deleted file mode 100644
index 4f66c6d..0000000
--- a/trunk/test-data/spreadsheet/59858.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/60255_extra_drawingparts.xlsx b/trunk/test-data/spreadsheet/60255_extra_drawingparts.xlsx
deleted file mode 100644
index bc4865c..0000000
--- a/trunk/test-data/spreadsheet/60255_extra_drawingparts.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/60273.xls b/trunk/test-data/spreadsheet/60273.xls
deleted file mode 100644
index 07933cf..0000000
--- a/trunk/test-data/spreadsheet/60273.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/60284.xls b/trunk/test-data/spreadsheet/60284.xls
deleted file mode 100644
index 7e0f9fb..0000000
--- a/trunk/test-data/spreadsheet/60284.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/60289.xlsx b/trunk/test-data/spreadsheet/60289.xlsx
deleted file mode 100644
index 2d1b508..0000000
--- a/trunk/test-data/spreadsheet/60289.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/60825.xlsx b/trunk/test-data/spreadsheet/60825.xlsx
deleted file mode 100644
index ffcfe08..0000000
--- a/trunk/test-data/spreadsheet/60825.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/AbnormalSharedFormulaFlag.xls b/trunk/test-data/spreadsheet/AbnormalSharedFormulaFlag.xls
deleted file mode 100644
index 788865b..0000000
--- a/trunk/test-data/spreadsheet/AbnormalSharedFormulaFlag.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/AreaErrPtg.xls b/trunk/test-data/spreadsheet/AreaErrPtg.xls
deleted file mode 100644
index ce863b8..0000000
--- a/trunk/test-data/spreadsheet/AreaErrPtg.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/AverageTaxRates.xlsx b/trunk/test-data/spreadsheet/AverageTaxRates.xlsx
deleted file mode 100644
index fee8059..0000000
--- a/trunk/test-data/spreadsheet/AverageTaxRates.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/BOOK_in_capitals.xls b/trunk/test-data/spreadsheet/BOOK_in_capitals.xls
deleted file mode 100644
index 002d0ca..0000000
--- a/trunk/test-data/spreadsheet/BOOK_in_capitals.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord b/trunk/test-data/spreadsheet/BigSSTRecord
deleted file mode 100644
index 6cebff5..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord
+++ /dev/null
@@ -1,516 +0,0 @@
-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/trunk/test-data/spreadsheet/BigSSTRecord2 b/trunk/test-data/spreadsheet/BigSSTRecord2
deleted file mode 100644
index 88697cd..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2
+++ /dev/null
@@ -1,515 +0,0 @@
-    FC 00 1F 20 B2 6B 02 00 81 14 00 00 18 00 00
- 46 61 63 2E 20 43 61 73 75 61 6C 74 79 20 4D 61
- 6E 61 67 65 72 20 47 43 04 00 00 35 33 36 39 17
- 00 00 44 69 73 74 72 69 62 75 74 69 6F 6E 20 43
- 6F 6E 73 75 6C 74 61 6E 74 04 00 00 35 33 37 39
- 11 00 00 47 72 6C 2E 20 57 6F 72 6B 73 74 61 74
- 69 6F 6E 73 04 00 00 35 33 38 32 04 00 00 35 33
- 38 37 04 00 00 35 33 38 38 13 00 00 47 72 6C 2E
- 20 47 72 6F 75 70 20 41 63 63 6F 75 6E 74 73 04
- 00 00 35 34 33 34 04 00 00 35 34 33 35 0C 00 00
- 54 4C 20 54 65 6C 65 6D 61 74 69 6B 04 00 00 35
- 34 33 37 04 00 00 35 34 34 33 14 00 00 42 75 66
- 66 65 74 6D 69 74 61 72 62 65 69 74 65 72 2F 69
- 6E 04 00 00 35 34 34 36 04 00 00 35 34 36 32 12
- 00 00 54 65 61 6D 6C 65 61 64 65 72 20 4C 69 62
- 72 61 72 79 04 00 00 35 34 36 35 04 00 00 35 34
- 36 37 04 00 00 35 34 36 39 11 00 00 4C 65 69 74
- 65 72 20 46 61 68 72 64 69 65 6E 73 74 04 00 00
- 35 34 38 37 04 00 00 35 34 39 32 04 00 00 35 34
- 39 33 03 00 00 41 55 44 04 00 00 35 35 30 36 04
- 00 00 35 35 30 39 19 00 00 48 65 61 64 20 6F 66
- 20 41 70 70 6C 2E 20 44 65 76 65 6C 6F 70 6D 65
- 6E 74 04 00 00 35 35 31 31 04 00 00 35 35 31 33
- 04 00 00 35 35 33 32 04 00 00 35 35 33 37 04 00
- 00 35 35 35 34 04 00 00 35 35 35 35 16 00 00 54
- 65 61 6D 6C 65 69 74 65 72 69 6E 20 43 61 66 65
- 74 65 72 69 61 04 00 00 35 35 35 37 14 00 00 50
- 72 6F 6A 65 6B 74 6D 69 74 61 72 62 65 69 74 65
- 72 69 6E 04 00 00 35 35 36 33 04 00 00 35 35 37
- 39 04 00 00 35 35 38 39 15 00 00 45 78 70 65 72
- 74 65 20 54 72 6F 70 2E 20 5A 79 6B 6C 6F 6E 65
- 04 00 00 35 35 39 38 11 00 00 45 69 6E 6B 61 75
- 66 73 61 73 73 69 73 74 65 6E 74 04 00 00 35 36
- 30 36 04 00 00 35 36 33 38 04 00 00 35 36 34 32
- 04 00 00 35 36 36 33 04 00 00 35 36 36 34 13 00
- 00 48 65 61 64 20 6F 66 20 4C 41 2F 4C 45 2F 4C
- 4E 20 4F 50 04 00 00 35 36 37 35 04 00 00 35 36
- 37 39 04 00 00 35 36 38 30 04 00 00 35 36 38 32
- 04 00 00 35 36 38 38 0A 00 00 54 65 61 6D 6C 65
- 61 64 65 72 03 00 00 47 42 50 04 00 00 35 36 39
- 33 04 00 00 35 36 39 35 04 00 00 35 36 39 36 04
- 00 00 35 36 39 38 09 00 00 53 75 70 70 6F 72 74
- 65 72 04 00 00 35 36 39 39 04 00 00 35 37 30 36
- 13 00 00 48 65 61 64 20 6F 66 20 4C 41 2F 4C 45
- 2F 4C 4E 20 48 52 04 00 00 35 37 30 37 13 00 00
- 4B 6E 6F 77 6C 65 64 67 65 20 4E 65 74 77 6F 72
- 6B 65 72 04 00 00 35 37 30 38 0E 00 00 52 69 73
- 69 6B 6F 65 78 70 65 72 74 69 6E 04 00 00 35 37
- 31 30 04 00 00 35 37 31 39 04 00 00 35 37 32 33
- 18 00 00 47 72 6C 2E 20 43 65 6E 74 72 2E 20 4F
- 70 65 72 2E 20 53 79 73 74 65 6D 04 00 00 35 37
- 33 31 04 00 00 35 37 33 34 18 00 00 48 65 61 64
- 20 4D 65 64 69 61 4E 65 74 77 2E 61 74 20 52 FC
- 73 63 68 2E 04 00 00 35 37 33 38 04 00 00 35 37
- 35 31 04 00 00 35 37 35 39 04 00 00 35 37 36 30
- 04 00 00 35 37 36 35 04 00 00 35 37 36 36 02 00
- 00 42 4D 08 00 00 48 61 6D 69 6C 74 6F 6E 04 00
- 00 35 37 37 35 04 00 00 35 37 37 36 04 00 00 35
- 37 38 31 04 00 00 35 37 38 35 14 00 00 55 6E 64
- 65 72 77 72 69 74 69 6E 67 20 53 75 70 70 6F 72
- 74 04 00 00 35 37 38 37 16 00 00 54 65 61 6D 6C
- 65 69 74 65 72 20 65 78 74 2E 20 4B 75 72 69 65
- 72 04 00 00 35 37 39 31 04 00 00 35 38 31 31 04
- 00 00 35 38 32 30 04 00 00 35 38 32 32 04 00 00
- 35 38 33 32 04 00 00 35 38 35 30 14 00 00 50 72
- 6F 6A 65 6B 74 6C 65 69 74 65 72 20 50 20 2B 20
- 45 52 04 00 00 35 38 35 31 04 00 00 35 38 35 37
- 04 00 00 35 38 35 38 04 00 00 35 38 38 30 19 00
- 00 48 65 61 64 20 43 6F 72 70 2E 4C 65 61 72 6E
- 2E 61 74 20 52 FC 73 63 68 2E 04 00 00 35 38 38
- 31 04 00 00 35 38 38 35 0E 00 00 4C 65 69 74 65
- 72 20 48 52 20 53 52 47 53 04 00 00 35 38 39 33
- 02 00 00 42 45 04 00 00 35 38 39 36 04 00 00 35
- 39 30 30 15 00 00 48 65 61 64 20 6F 66 20 44 69
- 76 69 73 69 6F 6E 61 6C 20 49 54 04 00 00 35 39
- 31 34 14 00 00 43 6F 6D 70 65 6E 73 61 74 69 6F
- 6E 20 4D 61 6E 61 67 65 72 04 00 00 35 39 31 35
- 04 00 00 35 39 31 39 04 00 00 35 39 32 30 03 00
- 00 4E 5A 44 04 00 00 35 39 32 33 04 00 00 35 39
- 33 34 04 00 00 35 39 33 37 04 00 00 35 39 34 32
- 04 00 00 35 39 34 33 12 00 00 53 65 72 76 69 63
- 65 2D 53 70 65 7A 69 61 6C 69 73 74 04 00 00 35
- 39 34 38 04 00 00 35 39 35 32 04 00 00 35 39 35
- 36 04 00 00 35 39 35 37 04 00 00 35 39 35 38 17
- 00 00 47 72 6C 2E 20 53 74 6F 72 61 67 65 20 4D
- 61 6E 61 67 65 6D 65 6E 74 04 00 00 35 39 36 34
- 02 00 00 42 41 04 00 00 35 39 36 35 04 00 00 35
- 39 37 35 04 00 00 35 39 37 36 04 00 00 35 39 37
- 39 0F 00 00 52 65 63 68 74 73 6B 6F 6E 73 75 6C
- 65 6E 74 04 00 00 35 39 38 31 16 00 00 45 6E 67
- 6C 69 73 63 68 2D 55 65 62 65 72 73 65 74 7A 65
- 72 69 6E 04 00 00 35 39 39 34 18 00 00 48 65 61
- 64 20 47 50 4D 20 4D 61 72 69 6E 65 2F 41 76 69
- 61 74 69 6F 6E 04 00 00 36 30 30 32 0D 00 00 4B
- 65 6C 6C 65 72 6D 65 69 73 74 65 72 04 00 00 36
- 30 30 34 04 00 00 36 30 31 33 19 00 00 44 6F 63
- 75 6D 65 6E 74 20 4D 67 6D 74 2E 20 43 6F 6E 73
- 75 6C 74 61 6E 74 04 00 00 36 30 31 35 04 00 00
- 36 30 32 30 04 00 00 36 30 32 36 04 00 00 36 30
- 33 30 02 00 00 52 36 04 00 00 36 30 33 31 17 00
- 00 48 61 75 73 77 69 72 74 73 63 68 61 66 74 73
- 6C 65 69 74 65 72 69 6E 04 00 00 36 30 33 33 04
- 00 00 36 30 35 33 0A 00 00 46 61 68 72 64 69 65
- 6E 73 74 04 00 00 36 30 35 37 04 00 00 36 30 36
- 39 17 00 00 47 72 75 70 70 65 6E 6C 65 69 74 65
- 72 69 6E 20 53 75 70 70 6F 72 74 04 00 00 36 30
- 38 38 19 00 00 49 74 61 6C 69 65 6E 69 73 63 68
- 2D 55 65 62 65 72 73 65 74 7A 65 72 69 6E 02 00
- 00 48 4B 04 00 00 36 30 39 31 04 00 00 36 31 31
- 32 04 00 00 36 31 31 37 04 00 00 36 31 32 31 10
- 00 00 54 65 61 6D 6C 65 69 74 65 72 20 50 4D 2F
- 46 4D 04 00 00 36 31 32 37 04 00 00 36 31 33 34
- 04 00 00 36 31 34 36 0B 00 00 54 65 6C 65 6D 61
- 74 69 6B 65 72 04 00 00 36 31 35 36 19 00 00 44
- 69 76 2E 20 46 69 6E 61 6E 63 69 61 6C 20 43 6F
- 6E 74 72 6F 6C 6C 65 72 04 00 00 36 31 35 38 0B
- 00 00 55 53 4D 20 4D 6F 6E 74 65 75 72 04 00 00
- 36 31 36 32 0A 00 00 49 54 2D 41 75 64 69 74 6F
- 72 04 00 00 36 31 36 34 04 00 00 36 31 36 35 04
- 00 00 36 31 36 37 04 00 00 36 31 36 38 04 00 00
- 36 31 37 30 04 00 00 36 31 37 32 17 00 00 4C 65
- 69 74 65 72 20 47 61 73 74 72 6F 6E 6F 6D 69 65
- 62 65 74 72 2E 04 00 00 36 31 38 38 02 00 00 54
- 58 04 00 00 36 31 38 39 16 00 00 50 72 6F 64 75
- 63 74 20 54 61 78 20 53 70 65 63 69 61 6C 69 73
- 74 04 00 00 36 31 39 36 0A 00 00 43 46 4F 20 4F
- 66 66 69 63 65 02 00 00 53 50 04 00 00 36 32 30
- 33 14 00 00 41 73 73 69 73 74 65 6E 74 69 6E 20
- 55 2E 20 42 72 65 6D 69 04 00 00 36 32 30 37 04
- 00 00 36 32 31 31 10 00 00 47 72 6F 75 70 20 41
- 63 63 6F 75 6E 74 61 6E 74 04 00 00 36 32 31 35
- 19 00 00 4C 65 69 74 65 72 20 54 65 6C 65 63 6F
- 6D 6D 75 6E 69 63 61 74 69 6F 6E 73 04 00 00 36
- 32 32 35 04 00 00 36 32 33 32 04 00 00 36 32 35
- 30 06 00 00 4D 6F 73 63 6F 77 04 00 00 36 32 35
- 35 04 00 00 36 32 36 31 04 00 00 36 32 36 35 04
- 00 00 36 32 36 37 12 00 00 41 62 74 65 69 6C 75
- 6E 67 73 6C 65 69 74 65 72 69 6E 04 00 00 36 32
- 36 38 0F 00 00 53 70 6F 72 74 61 6E 6C 61 67 65
- 77 61 72 74 04 00 00 36 32 37 31 04 00 00 36 32
- 37 32 15 00 00 50 75 62 6C 69 73 68 69 6E 67 20
- 43 6F 6E 73 75 6C 74 61 6E 74 04 00 00 36 32 37
- 39 04 00 00 36 32 38 30 15 00 00 53 61 63 68 62
- 65 61 72 62 2E 20 4B 61 73 73 65 20 53 6F 6F 64
- 04 00 00 36 33 32 34 12 00 00 50 72 6F 64 75 63
- 74 20 53 70 65 63 69 61 6C 69 73 74 04 00 00 36
- 33 33 39 04 00 00 36 33 34 34 0F 00 00 50 72 6F
- 67 72 61 6D 20 4D 61 6E 61 67 65 72 04 00 00 36
- 33 34 36 04 00 00 36 33 34 37 12 00 00 45 6E 67
- 6C 69 73 63 68 FC 62 65 72 73 65 74 7A 65 72 04
- 00 00 36 33 34 39 19 00 00 53 65 63 74 69 6F 6E
- 20 48 65 61 64 20 43 6F 6E 74 72 2E 20 50 72 6F
- 6A 2E 04 00 00 36 33 35 30 10 00 00 52 65 73 65
- 61 72 63 68 20 4D 61 6E 61 67 65 72 04 00 00 36
- 33 36 38 0C 00 00 44 61 74 61 20 4D 61 6E 61 67
- 65 72 04 00 00 36 33 36 39 04 00 00 36 33 37 32
- 19 00 00 42 65 74 72 69 65 62 73 74 65 63 68 6E
- 69 6B 65 72 20 45 6C 65 6B 74 72 6F 04 00 00 36
- 33 37 34 04 00 00 36 33 37 35 04 00 00 36 33 39
- 39 11 00 00 44 65 73 69 67 6E 20 43 6F 6E 73 75
- 6C 74 61 6E 74 04 00 00 36 34 30 30 04 00 00 36
- 34 30 32 04 00 00 36 34 30 34 13 00 00 41 63 74
- 75 61 72 69 61 6C 20 41 73 73 69 73 74 61 6E 74
- 04 00 00 36 34 30 35 04 00 00 36 34 30 36 04 00
- 00 36 34 30 37 04 00 00 36 34 30 38 04 00 00 36
- 34 31 32 04 00 00 36 34 31 33 04 00 00 36 34 31
- 34 04 00 00 36 34 32 33 04 00 00 36 34 32 34 13
- 00 00 57 65 62 20 50 72 6F 6A 65 63 74 20 4D 61
- 6E 61 67 65 72 04 00 00 36 34 32 38 04 00 00 36
- 34 34 32 04 00 00 36 34 35 33 19 00 00 53 61 63
- 68 62 65 61 72 62 65 69 74 65 72 69 6E 20 43 61
- 73 75 61 6C 74 79 04 00 00 36 34 36 32 15 00 00
- 48 65 61 64 20 6F 66 20 42 61 6C 61 6E 63 65 20
- 53 68 65 65 74 04 00 00 36 34 37 33 10 00 00 41
- 63 63 6F 75 6E 74 20 4D 67 72 20 55 53 4C 4C 04
- 00 00 36 34 37 34 18 00 00 48 65 61 64 20 6F 66
- 20 45 61 72 74 68 71 75 61 6B 65 20 47 72 6F 75
- 70 04 00 00 36 34 37 36 04 00 00 36 34 38 30 0C
- 00 00 4C 65 69 74 65 72 69 6E 20 47 4E 53 04 00
- 00 36 34 38 36 17 00 00 4B 6F 6D 6D 75 6E 69 6B
- 61 74 69 6F 6E 73 62 65 72 61 74 65 72 69 6E 04
- 00 00 36 34 39 33 0E 00 00 46 26 42 20 4B 6F 6E
- 74 72 6F 6C 6C 65 72 04 00 00 36 34 39 36 16 00
- 00 4C 65 69 74 65 72 69 6E 20 43 61 66 65 74 65
- 72 69 61 20 42 36 36 04 00 00 36 34 39 38 09 00
- 00 41 73 73 69 73 74 61 6E 74 04 00 00 36 35 30
- 30 04 00 00 36 35 30 38 04 00 00 36 35 30 39 04
- 00 00 36 35 31 30 04 00 00 36 35 32 33 04 00 00
- 36 35 33 31 14 00 00 53 74 76 2E 20 43 68 65 66
- 20 64 65 20 53 65 72 76 69 63 65 04 00 00 36 35
- 33 32 04 00 00 36 35 33 33 04 00 00 36 35 33 35
- 12 00 00 42 65 74 72 69 65 62 73 61 6C 6C 72 6F
- 75 6E 64 65 72 04 00 00 36 35 34 32 14 00 00 45
- 6C 65 63 74 72 6F 6E 69 63 20 50 75 62 6C 69 73
- 68 65 72 04 00 00 36 35 35 32 18 00 00 54 72 65
- 61 74 79 20 55 57 20 50 72 6F 70 2E 2F 43 61 73
- 75 61 6C 74 79 04 00 00 36 35 35 37 04 00 00 36
- 35 36 33 13 00 00 54 65 61 6D 6C 65 69 74 65 72
- 20 4D 61 74 65 72 69 61 6C 04 00 00 36 35 36 36
- 04 00 00 36 35 37 38 10 00 00 53 74 72 61 74 65
- 67 79 20 41 6E 61 6C 79 73 74 02 00 00 46 47 04
- 00 00 36 35 37 39 18 00 00 48 65 61 64 20 6F 66
- 20 50 72 6F 63 65 73 73 20 50 6C 61 6E 26 4D 67
- 74 04 00 00 36 36 31 33 16 00 00 49 6E 74 65 72
- 6E 61 74 69 6F 6E 61 6C 20 41 73 73 69 67 6E 65
- 65 04 00 00 36 36 32 31 04 00 00 36 36 32 36 04
- 00 00 36 36 32 37 0D 00 00 45 76 65 6E 74 20 4D
- 61 6E 61 67 65 72 04 00 00 36 36 32 39 04 00 00
- 36 36 33 32 04 00 00 36 36 33 37 15 00 00 44 65
- 70 75 74 79 20 48 65 61 64 20 6F 66 20 45 76 65
- 6E 74 73 04 00 00 36 36 33 39 19 00 00 48 65 61
- 64 20 6F 66 20 43 65 6E 74 72 65 20 52 FC 73 63
- 68 6C 69 6B 6F 6E 04 00 00 36 36 34 34 11 00 00
- 53 65 6E 69 6F 72 20 43 6F 6E 74 72 6F 6C 6C 65
- 72 02 00 00 43 4D 04 00 00 36 36 34 38 12 00 00
- 47 6C 6F 62 61 6C 20 49 47 50 20 4D 61 6E 61 67
- 65 72 04 00 00 36 36 35 33 17 00 00 4C 65 69 74
- 65 72 20 4C 6F 74 75 73 20 4E 6F 74 65 73 20 47
- 4E 4E 4F 04 00 00 36 36 35 37 04 00 00 36 36 36
- 31 16 00 00 50 72 6F 6A 65 63 74 20 4D 61 6E 61
- 67 65 72 20 4D 61 67 6E 75 6D 04 00 00 36 36 36
- 37 04 00 00 36 36 37 35 04 00 00 36 36 38 33 04
- 00 00 36 36 38 35 17 00 00 4F 72 67 61 6E 69 73
- 61 74 69 6F 6E 73 2D 41 73 73 69 73 74 65 6E 74
- 04 00 00 36 36 38 36 04 00 00 36 36 39 32 14 00
- 00 50 65 72 73 6F 6E 61 6C 65 6E 74 77 69 63 6B
- 6C 65 72 69 6E 04 00 00 36 36 39 33 04 00 00 36
- 36 39 34 19 00 00 53 61 63 68 62 2E 45 69 6E 6B
- 61 75 66 2F 42 75 63 68 68 61 6C 74 75 6E 67 04
- 00 00 36 36 39 37 16 00 00 47 72 6C 2E 20 44 42
- 20 41 64 6D 69 6E 69 73 74 72 61 74 69 6F 6E 04
- 00 00 36 37 30 31 04 00 00 36 37 30 32 04 00 00
- 36 37 30 36 04 00 00 36 37 31 34 04 00 00 36 37
- 32 31 04 00 00 36 37 33 31 04 00 00 36 37 33 33
- 04 00 00 36 37 33 34 04 00 00 36 37 34 33 04 00
- 00 36 37 34 35 0A 00 00 50 52 2D 42 65 72 61 74
- 65 72 04 00 00 36 37 34 36 04 00 00 36 37 34 38
- 04 00 00 36 37 35 31 17 00 00 53 70 65 63 69 61
- 6C 69 73 74 20 52 65 74 72 6F 2F 43 52 45 53 54
- 41 04 00 00 36 37 35 33 17 00 00 53 65 6E 69 6F
- 72 20 43 6F 72 70 2E 20 41 63 63 6F 75 6E 74 61
- 6E 74 04 00 00 36 37 35 38 04 00 00 36 37 36 33
- 18 00 00 5A 65 69 74 73 63 68 72 69 66 74 65 6E
- 76 65 72 77 61 6C 74 65 72 69 6E 01 00 00 43 04
- 00 00 36 37 36 36 04 00 00 36 37 36 38 14 00 00
- 43 6F 6D 70 65 6E 73 61 74 69 6F 6E 20 53 75 70
- 70 6F 72 74 04 00 00 36 37 37 30 0A 00 00 54 65
- 61 6D 6C 65 69 74 65 72 04 00 00 36 37 37 32 16
- 00 00 49 6E 66 6F 72 6D 61 74 69 6F 6E 20 53 70
- 65 63 69 61 6C 69 73 74 04 00 00 36 37 37 33 15
- 00 00 48 65 61 64 20 6F 66 20 53 79 73 74 65 6D
- 73 20 47 72 6F 75 70 04 00 00 36 37 37 34 04 00
- 00 36 37 37 35 04 00 00 36 37 38 32 15 00 00 46
- 61 63 68 72 65 66 65 72 65 6E 74 69 6E 20 55 6D
- 77 65 6C 74 04 00 00 36 37 38 34 02 00 00 52 53
- 04 00 00 36 37 38 36 02 00 00 4B 52 05 00 00 53
- 65 6F 75 6C 04 00 00 36 37 38 38 04 00 00 36 37
- 39 38 0F 00 00 43 68 65 66 20 64 65 20 53 65 72
- 76 69 63 65 04 00 00 36 38 30 38 04 00 00 36 38
- 31 30 18 00 00 48 65 61 64 20 6F 66 20 52 69 73
- 6B 20 43 6F 6E 74 72 6F 6C 6C 69 6E 67 04 00 00
- 36 38 32 36 0F 00 00 53 74 65 75 65 72 6B 6F 6E
- 73 75 6C 65 6E 74 04 00 00 36 38 32 38 15 00 00
- 54 65 61 6D 6C 65 69 74 65 72 20 50 E2 74 69 73
- 73 65 72 69 65 04 00 00 36 38 33 31 0B 00 00 53
- 65 6B 72 65 74 61 72 69 61 74 04 00 00 36 38 35
- 30 04 00 00 36 38 35 32 04 00 00 36 38 35 35 04
- 00 00 36 38 36 36 04 00 00 36 38 37 35 04 00 00
- 36 38 37 36 04 00 00 36 38 37 37 04 00 00 44 61
- 74 65 04 00 00 44 65 70 74 04 00 00 43 69 74 79
- 04 00 00 55 6E 69 74 07 00 00 53 75 62 55 6E 69
- 74 03 00 00 49 44 32 05 00 00 50 68 6F 6E 65 04
- 00 00 4E 61 6D 65 09 00 00 46 69 72 73 74 4E 61
- 6D 65 06 00 00 4F 6C 64 4A 6F 62 08 00 00 4A 6F
- 62 44 65 73 63 72 06 00 00 53 74 61 74 75 73 05
- 00 00 53 74 61 74 33 05 00 00 53 74 61 74 34 06
- 00 00 44 65 67 72 65 65 08 00 00 50 6F 73 69 74
- 69 6F 6E 08 00 00 45 78 70 65 6E 73 65 73 09 00
- 00 45 78 70 65 6E 73 65 73 32 09 00 00 45 78 70
- 65 6E 73 65 73 34 09 00 00 45 78 70 65 6E 73 65
- 73 33 09 00 00 45 78 70 65 6E 73 65 73 35 09 00
- 00 45 78 70 65 6E 73 65 73 36 09 00 00 45 78 70
- 65 6E 73 65 73 37 05 00 00 4C 65 76 65 6C 06 00
- 00 52 65 70 6F 72 74 05 00 00 47 72 6F 75 70 04
- 00 00 50 6F 6F 6C 05 00 00 44 4B 65 79 50 05 00
- 00 44 4D 44 50 4D 08 00 00 42 65 6E 67 61 6C 69
- 78 07 00 00 54 65 6E 61 6C 69 78 0B 00 00 33 32
- 34 2D 54 65 6E 61 6C 69 78 06 00 00 48 61 6E 6E
- 69 78 05 00 00 31 30 39 33 30 04 00 00 32 38 39
- 37 04 00 00 38 39 31 37 04 00 00 33 31 35 33 04
- 00 00 38 37 33 36 04 00 00 34 33 32 33 05 00 00
- 31 31 35 37 35 04 00 00 37 31 35 34 04 00 00 33
- 38 35 38 04 00 00 33 32 35 34 04 00 00 39 37 30
- 39 04 00 00 37 33 36 39 04 00 00 34 31 39 35 04
- 00 00 39 37 30 37 04 00 00 36 38 31 37 04 00 00
- 35 35 34 34 08 00 00 53 61 6E 74 69 61 67 6F 04
- 00 00 34 32 30 33 05 00 00 31 30 38 34 37 05 00
- 00 31 31 36 35 36 05 00 00 31 33 30 31 34 04 00
- 00 31 39 30 36 04 00 00 35 35 39 34 04 00 00 35
- 32 32 31 04 00 00 38 36 38 31 04 00 00 38 31 37
- 38 04 00 00 36 31 38 30 05 00 00 31 31 32 39 39
- 04 00 00 39 33 33 33 05 00 00 31 32 33 31 35 05
- 00 00 31 31 30 34 35 05 00 00 31 32 32 32 37 01
- 00 00 49 04 00 00 33 36 39 31 04 00 00 37 30 33
- 34 04 00 00 32 31 30 37 04 00 00 35 32 30 35 04
- 00 00 36 30 35 35 04 00 00 34 36 30 30 04 00 00
- 36 38 39 39 04 00 00 36 39 30 35 05 00 00 31 32
- 31 34 30 04 00 00 37 36 35 35 05 00 00 38 30 30
- 39 37 04 00 00 34 32 37 32 05 00 00 31 30 38 37
- 36 04 00 00 37 33 38 35 04 00 00 34 31 30 31 04
- 00 00 38 32 32 35 04 00 00 32 34 37 31 04 00 00
- 35 31 37 35 04 00 00 38 36 34 31 05 00 00 31 32
- 33 32 31 05 00 00 31 32 38 39 32 04 00 00 37 36
- 38 37 04 00 00 37 32 37 37 04 00 00 37 31 34 37
- 05 00 00 31 30 32 39 34 04 00 00 35 31 31 37 05
- 00 00 31 30 30 30 32 04 00 00 37 37 38 30 04 00
- 00 36 34 38 32 05 00 00 38 30 32 35 30 08 00 00
- 41 63 74 75 61 72 79 2C 05 00 00 31 31 37 39 35
- 05 00 00 31 31 37 32 31 05 00 00 31 31 39 38 32
- 05 00 00 31 33 30 33 31 04 00 00 38 32 33 32 04
- 00 00 35 34 36 38 04 00 00 39 33 33 37 04 00 00
- 36 38 37 38 05 00 00 31 31 39 36 36 04 00 00 37
- 37 34 34 05 00 00 31 31 30 37 36 05 00 00 31 32
- 39 31 32 04 00 00 37 39 35 33 05 00 00 31 32 32
- 36 35 04 00 00 36 35 36 34 04 00 00 38 32 33 36
- 04 00 00 37 30 33 38 04 00 00 33 36 33 33 04 00
- 00 38 36 34 32 04 00 00 35 34 38 36 04 00 00 33
- 39 37 39 04 00 00 35 39 32 37 04 00 00 35 34 31
- 35 05 00 00 31 32 31 35 34 03 00 00 35 36 35 13
- 00 00 4C 61 74 69 6E 20 41 6D 65 72 69 63 61 20
- 53 6F 75 74 68 0E 00 00 43 6F 6C 6F 6D 62 69 61
- 20 26 20 4F 53 41 02 00 00 35 35 11 00 00 50 72
- 6F 64 75 63 74 20 45 78 65 63 75 74 69 76 65 02
- 00 00 53 48 02 00 00 4C 59 02 00 00 34 36 0F 00
- 00 48 65 61 64 20 4C 41 20 41 63 61 64 65 6D 79
- 07 00 00 54 72 61 69 6E 65 72 02 00 00 53 45 02
- 00 00 50 50 03 00 00 50 4C 4E 02 00 00 34 32 11
- 00 00 54 72 65 61 74 79 20 53 70 65 63 69 61 6C
- 69 73 74 04 00 00 31 31 31 35 13 00 00 55 6E 64
- 65 72 77 72 69 74 69 6E 67 20 54 72 65 61 74 79
- 02 00 00 53 41 02 00 00 4D 45 04 00 00 31 35 33
- 30 04 00 00 31 35 35 37 14 00 00 52 65 6C 61 74
- 69 6F 6E 73 68 69 70 20 4D 61 6E 61 67 65 72 04
- 00 00 31 35 37 36 04 00 00 31 38 32 31 0F 00 00
- 48 65 61 64 20 43 6F 72 70 6F 72 61 74 65 73 0A
- 00 00 41 63 63 6F 75 6E 74 69 6E 67 04 00 00 32
- 30 34 39 14 00 00 50 6C 61 6E 6E 69 6E 67 20 43
- 6F 6F 72 64 69 6E 61 74 6F 72 02 00 00 54 44 04
- 00 00 32 31 35 30 0F 00 00 48 65 61 64 20 43 4F
- 43 20 4D 61 72 69 6E 65 04 00 00 32 31 35 36 10
- 00 00 4D 61 72 6B 65 74 20 45 78 65 63 75 74 69
- 76 65 04 00 00 32 35 37 32 18 00 00 48 65 61 64
- 20 6F 66 20 46 61 63 75 6C 74 61 74 69 76 65 20
- 44 65 73 6B 0C 00 00 41 64 52 20 43 61 73 75 61
- 6C 74 79 04 00 00 32 38 34 32 0C 00 00 55 57 20
- 54 72 65 61 74 79 20 45 4E 02 00 00 53 4B 04 00
- 00 33 30 38 32 18 00 00 44 69 76 69 73 69 6F 6E
- 61 6C 20 43 6F 6D 6D 75 6E 69 63 61 74 69 6F 6E
- 02 00 00 50 43 04 00 00 33 30 38 30 19 00 00 48
- 65 61 64 20 43 65 6E 74 65 72 20 6F 66 20 43 6F
- 6D 70 2E 20 50 72 6F 70 0E 00 00 4C 6F 63 61 6C
- 20 53 65 72 76 69 63 65 73 19 00 00 43 6C 69 65
- 6E 74 20 4D 61 6E 61 67 65 72 20 43 6F 72 70 6F
- 72 61 74 65 73 04 00 00 33 34 30 39 18 00 00 55
- 6E 64 65 72 77 72 69 74 69 6E 67 20 45 6E 67 69
- 6E 65 65 72 69 6E 67 04 00 00 33 34 36 32 17 00
- 00 48 65 61 64 20 6F 66 20 42 55 53 20 50 72 6F
- 6A 65 63 74 73 20 5A 48 04 00 00 33 34 33 34 19
- 00 00 48 65 61 64 20 43 65 6E 74 65 72 20 6F 66
- 20 43 6F 6D 70 2E 20 43 61 73 2E 04 00 00 33 37
- 38 31 18 00 00 48 65 61 64 20 4D 61 72 6B 65 74
- 69 6E 67 20 26 20 52 65 6C 2E 20 5A 48 04 00 00
- 33 39 32 31 11 00 00 41 63 63 6F 75 6E 74 20 45
- 78 65 63 75 74 69 76 65 04 00 00 33 39 37 31 04
- 00 00 34 31 31 31 04 00 00 34 31 36 33 13 00 00
- 52 65 6C 61 74 69 6F 6E 20 4D 61 6E 61 67 65 72
- 20 55 53 04 00 00 34 30 38 33 0B 00 00 55 57 20
- 50 72 6F 70 65 72 74 79 04 00 00 34 33 34 30 04
- 00 00 34 34 37 38 16 00 00 43 65 6E 74 65 72 20
- 6F 66 20 43 6F 6D 70 2E 20 4D 61 72 69 6E 65 04
- 00 00 34 35 37 38 15 00 00 55 57 20 53 75 70 70
- 6F 72 74 20 43 6F 72 70 6F 72 61 74 65 73 04 00
- 00 34 35 38 31 18 00 00 43 65 6E 74 65 72 20 6F
- 66 20 43 6F 6D 70 2E 20 43 61 73 75 61 6C 74 79
- 04 00 00 34 39 33 37 14 00 00 41 73 73 69 73 74
- 61 6E 74 20 43 6F 72 70 6F 72 61 74 65 73 0C 00
- 00 43 6F 75 6E 74 72 79 20 48 65 61 64 04 00 00
- 35 33 31 36 17 00 00 48 65 61 64 20 43 65 6E 74
- 65 72 20 6F 66 20 43 6F 6D 70 2E 20 45 4E 04 00
- 00 35 33 39 35 16 00 00 41 73 73 2E 20 50 72 6F
- 64 75 63 74 20 45 78 65 63 75 74 69 76 65 04 00
- 00 35 36 31 39 12 00 00 50 72 6F 6A 65 63 74 20
- 4C 65 61 64 65 72 20 42 55 53 04 00 00 35 35 37
- 31 18 00 00 43 65 6E 74 65 72 20 6F 66 20 43 6F
- 6D 70 2E 20 50 72 6F 70 65 72 74 79 04 00 00 35
- 36 33 33 17 00 00 48 65 61 64 20 4D 61 6E 61 67
- 65 6D 65 6E 74 20 53 75 70 70 6F 72 74 04 00 00
- 35 37 35 32 10 00 00 48 65 61 64 20 54 72 65 61
- 74 79 20 44 65 73 6B 04 00 00 35 36 39 31 19 00
- 00 44 65 70 2E 48 65 61 64 20 43 65 6E 74 65 72
- 20 43 6F 6D 70 2E 43 61 73 2E 04 00 00 35 38 36
- 34 04 00 00 35 39 32 34 0F 00 00 50 72 6F 64 75
- 63 74 20 53 75 70 70 6F 72 74 04 00 00 35 39 34
- 30 19 00 00 44 65 70 2E 48 65 61 64 20 43 65 6E
- 74 65 72 20 43 6F 6D 70 2E 45 6E 67 2E 04 00 00
- 36 30 31 30 04 00 00 36 30 34 35 18 00 00 48 65
- 61 64 20 43 6F 43 20 53 74 72 75 63 74 2E 20 46
- 69 6E 61 6E 63 65 04 00 00 36 31 34 39 04 00 00
- 36 31 36 36 13 00 00 48 65 61 64 20 6F 66 20 43
- 6F 43 20 61 67 72 6F 20 4C 41 04 00 00 36 33 33
- 31 04 00 00 36 36 32 34 13 00 00 50 72 6F 64 75
- 63 74 20 44 65 76 65 6C 6F 70 6D 65 6E 74 04 00
- 00 36 35 33 37 04 00 00 36 38 30 36 04 00 00 36
- 39 33 38 15 00 00 55 57 20 53 74 72 75 63 74 75
- 72 65 73 20 46 69 6E 61 6E 63 65 04 00 00 37 30
- 37 33 0F 00 00 52 75 6E 2D 4F 66 66 20 41 6C 69
- 61 6E 7A 61 04 00 00 37 30 39 30 15 00 00 4A 75
- 6E 69 6F 72 20 43 6C 69 65 6E 74 20 4D 61 6E 61
- 67 65 72 04 00 00 37 34 33 37 0B 00 00 33 32 34
- 2C 20 42 6F 67 6F 74 61 04 00 00 37 35 32 39 10
- 00 00 53 70 65 63 69 61 6C 20 50 72 6F 6A 65 63
- 74 73 04 00 00 37 36 33 31 16 00 00 4F 70 65 72
- 61 74 69 6F 6E 73 20 4D 61 6E 61 67 65 72 20 44
- 55 4F 04 00 00 38 34 32 33 04 00 00 38 34 36 35
- 04 00 00 38 35 30 36 0F 00 00 54 72 61 69 6E 65
- 72 20 53 69 63 73 2F 6E 74 04 00 00 38 36 30 36
- 04 00 00 38 35 31 30 04 00 00 39 32 30 39 05 00
- 00 31 30 31 38 36 05 00 00 31 30 35 38 33 10 00
- 00 54 72 61 69 6E 69 6E 67 20 4D 61 6E 61 67 65
- 72 05 00 00 31 30 35 38 36 03 00 00 32 38 38 05
- 00 00 31 30 37 34 37 14 00 00 48 65 61 64 20 44
- 69 76 2E 20 49 54 20 55 6E 69 74 20 5A 48 03 00
- 00 49 4C 53 05 00 00 31 30 39 34 34 15 00 00 48
- 65 61 64 20 53 70 65 63 69 61 6C 20 50 72 6F 6A
- 65 63 74 73 04 00 00 37 30 37 37 05 00 00 31 30
- 39 38 36 03 00 00 45 45 4B 05 00 00 31 31 32 39
- 37 14 00 00 48 52 20 26 53 65 72 76 69 63 65 73
- 20 4D 61 6E 61 67 65 72 10 00 00 41 64 52 20 41
- 6C 67 6F 64 F3 6E 2F 41 67 72 6F 05 00 00 31 31
- 37 32 37 11 00 00 43 6C 61 69 6D 73 20 44 65 73
- 6B 2F 4C 65 67 61 6C 11 00 00 54 65 63 68 6E 69
- 63 61 6C 20 4D 61 6E 61 67 65 72 03 00 00 32 38
- 39 13 00 00 43 6C 69 65 6E 74 20 54 65 61 6D 20
- 53 75 70 70 6F 72 74 06 00 00 41 64 52 20 58 4C
- 05 00 00 31 31 38 37 31 0C 00 00 41 64 52 20 50
- 72 6F 70 65 72 74 79 05 00 00 31 32 36 30 30 06
- 00 00 4D 61 64 72 69 64 07 00 00 31 34 38 36 33
- 39 35 07 00 00 36 35 30 36 33 33 31 06 00 00 42
- 65 6A 69 6E 67 0C 00 00 42 75 65 6E 6F 73 20 41
- 69 72 65 73 07 00 00 43 6F 6C 6F 67 6E 65 08 00
- 00 42 72 75 73 73 65 6C 73 02 00 00 56 45 07 00
- 00 43 61 72 61 63 61 73 02 00 00 50 4C 06 00 00
- 57 61 72 73 61 77 02 00 00 4A 50 05 00 00 54 6F
- 6B 79 6F 04 00 00 52 6F 6D 65 05 00 00 31 32 36
- 30 31 19 00 00 48 65 61 64 20 6F 66 20 4C 69 66
- 65 26 48 65 61 6C 74 68 20 49 6E 64 69 61 16 00
- 00 41 73 73 69 73 74 65 6E 74 69 6E 20 4C 65 69
- 74 65 72 20 43 43 43 02 00 00 33 35 10 00 00 41
- 72 63 68 69 76 73 70 65 7A 69 61 6C 69 73 74 02
- 00 00 32 2B 02 00 00 33 2D 02 00 00 34 2D 12 00
- 00 41 72 63 68 69 76 73 70 65 7A 69 61 6C 69 73
- 74 69 6E 02 00 00 33 2B 02 00 00 48 43 0F 00 00
- 4D 69 74 67 6C 69 65 64 20 64 65 72 20 47 4C 13
- 00 00 41 64 76 65 72 74 69 73 69 6E 67 20 4D 61
- 6E 61 67 65 72 02 00 00 32 35 0C 00 00 50 34 30
- 30 20 53 75 70 70 6F 72 74 12 00 00 49 6E 74 65
- 72 6E 61 74 2E 20 54 72 61 6E 73 66 65 72 01 00
- 00 47 19 00 00 44 65 70 2E 43 68 69 65 66 45 78
- 65 63 75 74 69 76 65 4F 66 66 69 63 65 72 10 00
- 00 50 72 E4 73 69 64 65 6E 74 20 64 65 72 20 47
- 4C 0D 00 00 47 72 75 70 70 65 6E 6C 65 69 74 65
- 72 02 00 00 43 59 15 00 00 46 FC 68 72 75 6E 67
- 73 75 6E 74 65 72 73 74 FC 74 7A 75 6E 67 0C 00
- 00 43 49 2D 41 73 73 69 73 74 61 6E 74 06 00 00
- 32 30 30 30 30 39 03 00 00 37 32 30 10 00 00 48
- 65 61 64 20 6F 66 20 47 72 6F 75 70 20 49 41 02
- 00 00 53 54 19 00 00 49 6E 74 65 72 6E 2E 47 72
- 61 64 75 61 74 65 20 50 72 6F 67 2E 4D 67 74 2E
- 18 00 00 53 79 73 74 65 6D 76 65 72 61 6E 74 77
- 6F 72 74 6C 2E 20 50 49 4C 41 53 00 00 00 0A 00
- 00 33 35 33 2D 59 54 38 31 33 30 19 00 00 50 72
- 69 63 69 6E 67 20 41 63 74 75 61 72 69 61 6C 20
- 41 6E 61 6C 79 73 74 19 00 00 54 65 63 68 6E 69
- 63 61 6C 20 43 6C 61 69 6D 73 20 43 6F 6E 73 75
- 6C 74 2E 18 00 00 47 72 75 70 70 65 6E 6C 65 69
- 74 65 72 69 6E 20 43 61 73 75 61 6C 74 79 19 00
- 00 41 73 73 69 73 74 61 6E 74 20 47 72 6F 75 70
- 20 50 4D 20 4D 61 72 69 6E 65 0E 00 00 44 65 62
- 74 20 43 6F 6C 6C 65 63 74 6F 72 10 00 00 45 78
- 70 65 72 74 65 20 45 72 64 62 65 62 65 6E 15 00
- 00 47 72 6F 75 70 20 4C 69 61 69 73 6F 6E 20 4F
- 66 66 69 63 65 72 15 00 00 48 65 61 64 20 41 75
- 64 69 74 2F 49 6E 73 70 65 63 74 69 6F 6E 18 00
- 00 48 65 61 64 20 6F 66 20 43 6C 61 69 6D 73 20
- 26 20 43 2E 20 4D 67 74 2E 08 00 00 42 65 72 6D
- 75 64 61 73 04 00 00 4E 45 49 4E 1C 00 00 53 65
- 63 72 65 74 61 72 79 20 69 6E 20 4E 65 77 20 59
- 6F 72 6B 20 4F 66 66 69 63 65 02 00 00 31 32 01
- 00 00 31 03 00 00 32 32 30 02 00 00 31 30 15 00
- 00 54 65 6C 65 6D 61 74 69 6B 2D 53 75 70 70 6F
- 72 74 65 72 69 6E 13 00 00 54 4C 20 54 65 6C 65
- 6D 61 74 69 6B 73 75 70 70 6F 72 74 19 00 00 55
- 53 20 47 41 41 50 2D 50 72 6F 6A 65 6B 74 6C 65
- 69 74 65 72 20 53 52 5A 02 00 00 32 2D 09 00 00
- 41 73 73 69 73 74 65 6E 74 0D 00 00 42 57 20 45
- 78 70 65 72 74 65 20 43 4F 19 00 00 52 61 74 69
- 6E 67 20 41 67 65 6E 63 79 20 43 6F 6F 72 64 69
- 6E 61 74 6F 72 0F 00 00 50 72 6F 6A 65 6B 74 6C
- 65 69 74 65 72 69 6E 14 00 00 53 65 6E 69 6F 72
- 20 41 63 63 6F 75 6E 74 61 6E 74 20 51 41 14 00
- 00 53 65 6E 69 6F 72 20 4C 65 67 61 6C 20 41 64
- 76 69 73 65 72 16 00 00 53 65 6E 69 6F 72 20 50
- 72 6F 6A 65 63 74 20 4D 61 6E 61 67 65 72 13 00
- 00 41 73 73 69 73 74 61 6E 74 20 55 57 20 4D 61
- 72 69 6E 65                                    
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord2CR1 b/trunk/test-data/spreadsheet/BigSSTRecord2CR1
deleted file mode 100644
index 359e3b4..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2CR1
+++ /dev/null
@@ -1,514 +0,0 @@
-             3C 00 18 20 10 00 00 42 75 73 69 6E
- 65 73 73 20 53 75 70 70 6F 72 74 03 00 00 49 45
- 50 15 00 00 43 6F 75 6E 74 72 79 20 48 65 61 64
- 20 43 6F 6C 6F 6D 62 69 61 03 00 00 59 45 53 02
- 00 00 43 31 01 00 00 59 04 00 00 31 2E 30 30 02
- 00 00 43 34 02 00 00 43 35 01 00 00 20 02 00 00
- 43 37 02 00 00 43 38 02 00 00 43 39 03 00 00 43
- 31 30 03 00 00 43 31 31 13 00 00 4D 61 72 69 6E
- 65 20 52 69 73 6B 20 41 6E 61 6C 79 73 74 03 00
- 00 43 31 32 03 00 00 43 31 33 03 00 00 43 31 34
- 03 00 00 43 31 35 03 00 00 43 31 36 03 00 00 43
- 31 37 03 00 00 43 31 38 03 00 00 43 32 30 03 00
- 00 43 32 31 03 00 00 43 32 32 03 00 00 43 32 33
- 03 00 00 43 32 34 03 00 00 43 32 35 03 00 00 43
- 32 36 03 00 00 43 32 37 12 00 00 54 65 63 68 6E
- 69 63 61 6C 20 44 69 72 65 63 74 6F 72 03 00 00
- 43 32 38 03 00 00 43 32 39 03 00 00 43 33 30 03
- 00 00 43 33 31 09 00 00 35 2F 30 33 2F 31 39 36
- 31 03 00 00 43 33 32 03 00 00 43 33 33 03 00 00
- 43 33 34 03 00 00 43 33 35 03 00 00 43 33 36 03
- 00 00 43 33 37 03 00 00 43 33 38 03 00 00 43 33
- 39 03 00 00 43 34 30 03 00 00 43 34 31 0A 00 00
- 31 30 2E 31 32 2E 31 39 35 31 0A 00 00 31 35 2E
- 30 31 2E 31 39 39 36 01 00 00 66 0A 00 00 32 37
- 2E 30 31 2E 31 39 35 33 0A 00 00 30 39 2E 30 35
- 2E 31 39 39 35 01 00 00 6D 0A 00 00 30 36 2E 30
- 34 2E 31 39 36 37 0A 00 00 30 31 2E 30 31 2E 31
- 39 39 39 0A 00 00 31 37 2E 30 38 2E 31 39 35 35
- 0A 00 00 30 31 2E 31 32 2E 31 39 39 35 0A 00 00
- 32 30 2E 30 31 2E 31 39 37 33 0A 00 00 31 35 2E
- 30 39 2E 31 39 39 37 0A 00 00 30 34 2E 31 31 2E
- 31 39 35 39 0A 00 00 30 38 2E 31 31 2E 31 39 39
- 36 01 00 00 35 0A 00 00 31 35 2E 30 36 2E 31 39
- 37 31 0A 00 00 30 31 2E 30 39 2E 31 39 39 39 0A
- 00 00 32 30 2E 30 38 2E 31 39 37 30 0A 00 00 32
- 38 2E 30 38 2E 31 39 39 35 0A 00 00 31 30 2E 30
- 39 2E 31 39 35 35 0A 00 00 30 31 2E 30 38 2E 32
- 30 30 30 0A 00 00 31 38 2E 30 38 2E 31 39 36 35
- 0A 00 00 32 32 2E 30 37 2E 31 39 39 32 0A 00 00
- 32 34 2E 30 39 2E 31 39 35 36 0A 00 00 32 30 2E
- 31 30 2E 31 39 39 37 16 00 00 48 52 20 26 20 4C
- 6F 67 69 73 74 69 63 73 20 4D 61 6E 61 67 65 72
- 0A 00 00 32 38 2E 30 37 2E 31 39 36 33 0A 00 00
- 30 31 2E 31 30 2E 31 39 39 39 04 00 00 33 35 35
- 35 04 00 00 33 35 35 36 04 00 00 33 35 37 32 19
- 00 00 53 65 6E 2E 20 4C 65 67 61 6C 20 43 6C 61
- 69 6D 73 20 43 6F 75 6E 73 65 6C 04 00 00 33 35
- 37 33 0F 00 00 53 70 65 7A 69 61 6C 61 75 66 67
- 61 62 65 6E 04 00 00 33 35 38 37 04 00 00 33 36
- 31 34 19 00 00 43 6F 6D 6D 75 6E 69 63 61 74 69
- 6F 6E 73 20 43 6F 6E 73 75 6C 74 61 6E 74 04 00
- 00 33 36 32 31 04 00 00 33 36 32 32 14 00 00 47
- 72 6C 2E 20 4B 6F 70 69 65 72 7A 65 6E 74 72 61
- 6C 65 6E 04 00 00 33 36 32 38 04 00 00 33 36 33
- 35 11 00 00 48 65 61 64 20 6F 66 20 49 41 20 5A
- 75 72 69 63 68 04 00 00 33 36 33 36 0D 00 00 47
- 72 6C 2E 20 48 61 72 64 77 61 72 65 04 00 00 33
- 36 34 39 0D 00 00 44 6F 63 75 6D 65 6E 74 61 6C
- 69 73 74 04 00 00 33 36 37 31 11 00 00 43 6F 72
- 70 6F 72 61 74 65 20 41 63 74 75 61 72 79 04 00
- 00 33 36 37 36 0D 00 00 48 65 61 64 20 6F 66 20
- 4C 45 2F 41 53 04 00 00 33 36 37 39 04 00 00 33
- 36 38 39 04 00 00 33 37 31 31 15 00 00 53 70 65
- 7A 69 61 6C 69 73 74 20 50 75 62 6C 69 73 68 69
- 6E 67 04 00 00 33 37 31 33 04 00 00 33 37 31 34
- 04 00 00 33 37 32 32 04 00 00 33 37 32 39 19 00
- 00 4C 65 69 74 65 72 20 50 6C 61 74 66 6F 72 6D
- 20 45 6E 67 69 6E 65 65 72 2E 04 00 00 33 37 33
- 30 13 00 00 4D 61 6E 2E 20 41 64 6D 69 6E 69 73
- 74 72 61 74 69 6F 6E 04 00 00 33 37 33 36 17 00
- 00 48 65 61 64 20 6F 66 20 4C 6F 67 2E 20 4F 70
- 65 72 61 74 69 6F 6E 73 04 00 00 33 37 34 30 04
- 00 00 33 37 34 33 17 00 00 55 6E 64 65 72 77 72
- 69 74 69 6E 67 20 43 6F 6E 73 75 6C 74 61 6E 74
- 04 00 00 33 37 34 38 04 00 00 33 37 35 31 04 00
- 00 33 37 36 32 04 00 00 33 37 36 34 06 00 00 42
- 6F 67 6F 74 61 01 00 00 52 04 00 00 33 37 36 35
- 0D 00 00 52 65 67 69 6F 6E 61 6C 20 48 65 61 64
- 04 00 00 33 37 36 38 10 00 00 55 6E 64 65 72 77
- 72 69 74 65 72 20 41 67 72 6F 04 00 00 33 37 38
- 33 04 00 00 33 37 38 38 11 00 00 42 65 74 72 69
- 65 62 73 73 63 68 72 65 69 6E 65 72 04 00 00 33
- 37 39 33 19 00 00 53 65 6E 2E 20 47 72 6F 75 70
- 77 61 72 65 20 43 6F 6E 73 75 6C 74 61 6E 74 04
- 00 00 33 37 39 38 12 00 00 46 61 63 68 62 65 72
- 65 69 63 68 73 6C 65 69 74 65 72 04 00 00 33 38
- 30 30 0C 00 00 42 75 63 68 68 61 6C 74 65 72 69
- 6E 04 00 00 33 38 30 37 19 00 00 47 72 75 70 70
- 65 6E 6C 65 69 74 65 72 20 45 6E 74 77 69 63 6B
- 6C 75 6E 67 04 00 00 33 38 31 31 0D 00 00 44 61
- 74 65 6E 74 79 70 69 73 74 69 6E 04 00 00 33 38
- 31 38 19 00 00 48 61 75 73 77 69 72 74 73 63 68
- 61 66 74 73 6D 69 74 61 72 62 65 69 74 2E 04 00
- 00 33 38 32 35 04 00 00 33 38 32 36 17 00 00 48
- 65 61 64 20 6F 66 20 47 72 6F 75 70 20 50 4D 20
- 43 72 65 64 69 74 04 00 00 33 38 32 38 0F 00 00
- 4D 65 64 69 63 61 6C 20 4F 66 66 69 63 65 72 04
- 00 00 33 38 35 31 04 00 00 33 38 35 32 04 00 00
- 33 38 37 30 04 00 00 33 38 37 36 19 00 00 4D 61
- 6E 2E 20 4C 65 67 61 6C 20 43 6C 61 69 6D 73 20
- 43 6F 75 6E 73 65 6C 04 00 00 33 38 38 36 04 00
- 00 33 38 38 37 0C 00 00 50 52 2D 42 65 72 61 74
- 65 72 69 6E 04 00 00 33 38 38 38 17 00 00 54 65
- 61 6D 6C 65 69 74 65 72 20 41 75 73 67 61 6E 67
- 73 70 6F 73 74 04 00 00 33 38 38 39 08 00 00 48
- 61 75 73 77 61 72 74 04 00 00 33 38 39 38 10 00
- 00 42 75 73 69 6E 65 73 73 20 41 6E 61 6C 79 73
- 74 04 00 00 33 38 39 39 19 00 00 53 65 63 74 2E
- 20 48 65 61 64 20 49 6E 76 2E 20 52 65 6C 61 74
- 69 6F 6E 73 04 00 00 33 39 30 37 17 00 00 47 72
- 6C 2E 20 52 5A 20 50 6C 61 6E 2E 2F 53 74 65 75
- 65 72 75 6E 67 04 00 00 33 39 32 38 17 00 00 47
- 72 6C 2E 20 57 6F 72 6B 73 74 61 74 69 6F 6E 20
- 45 6E 67 69 6E 2E 04 00 00 33 39 33 35 02 00 00
- 43 50 04 00 00 33 39 33 36 11 00 00 47 72 6C 2E
- 20 46 6C 75 74 2F 53 79 73 74 65 6D 65 04 00 00
- 33 39 35 32 04 00 00 33 39 35 35 04 00 00 33 39
- 36 39 04 00 00 33 39 37 37 13 00 00 42 4C 20 44
- 61 74 61 62 61 73 65 20 53 79 73 74 65 6D 73 04
- 00 00 33 39 38 30 04 00 00 33 39 38 33 04 00 00
- 33 39 38 36 04 00 00 33 39 38 39 04 00 00 33 39
- 39 30 14 00 00 47 72 6F 75 70 77 61 72 65 20 43
- 6F 6E 73 75 6C 74 61 6E 74 04 00 00 34 30 31 31
- 04 00 00 34 30 31 32 04 00 00 34 30 31 38 04 00
- 00 34 30 32 35 04 00 00 34 30 33 30 19 00 00 4F
- 70 65 72 61 74 72 69 63 65 20 4B 6F 70 69 65 72
- 7A 65 6E 74 72 61 6C 65 04 00 00 34 30 33 31 0E
- 00 00 55 6D 7A 75 67 73 66 61 63 68 6D 61 6E 6E
- 04 00 00 34 30 33 35 04 00 00 34 30 33 37 04 00
- 00 34 30 33 39 04 00 00 34 30 34 32 04 00 00 34
- 30 35 32 04 00 00 34 30 35 38 04 00 00 34 30 35
- 39 04 00 00 34 30 36 34 18 00 00 48 65 61 64 20
- 6F 66 20 53 75 70 70 6F 72 74 20 53 65 72 76 69
- 63 65 73 04 00 00 34 30 38 30 15 00 00 53 61 63
- 68 62 65 61 72 62 65 69 74 65 72 69 6E 20 46 69
- 62 75 04 00 00 34 30 38 31 04 00 00 34 30 38 32
- 17 00 00 4D 69 74 61 72 62 2E 20 53 69 63 68 65
- 72 68 65 69 74 73 6C 6F 67 65 02 00 00 49 43 04
- 00 00 34 30 38 36 04 00 00 34 30 39 36 04 00 00
- 34 31 30 35 04 00 00 34 31 30 36 04 00 00 34 31
- 30 38 13 00 00 53 75 70 70 6F 72 74 65 72 20 48
- 65 6C 70 20 44 65 73 6B 04 00 00 34 31 32 30 0D
- 00 00 57 65 62 2D 50 75 62 6C 69 73 68 65 72 05
- 00 00 31 31 36 39 35 01 00 00 4B 05 00 00 31 31
- 36 39 36 05 00 00 31 31 36 39 37 05 00 00 31 31
- 37 30 32 05 00 00 31 31 37 31 30 05 00 00 31 31
- 37 31 31 11 00 00 53 6F 66 74 77 61 72 65 20 45
- 6E 67 69 6E 65 65 72 05 00 00 31 31 37 31 32 05
- 00 00 31 31 37 32 34 05 00 00 31 31 37 33 30 19
- 00 00 50 72 6F 6A 65 63 74 6D 61 6E 61 67 65 72
- 20 52 FC 73 63 68 6C 69 6B 6F 6E 05 00 00 31 31
- 37 33 31 05 00 00 31 31 37 33 32 05 00 00 31 31
- 37 34 30 05 00 00 31 31 37 34 31 05 00 00 31 31
- 37 34 34 19 00 00 48 65 61 64 20 4F 70 65 72 61
- 74 69 6F 6E 73 20 52 FC 73 63 68 6C 69 6B 2E 05
- 00 00 31 31 37 34 35 14 00 00 47 72 6C 2E 20 43
- 6F 73 74 20 41 63 63 6F 75 6E 74 69 6E 67 05 00
- 00 31 31 37 34 37 05 00 00 31 31 37 35 31 05 00
- 00 31 31 37 35 38 05 00 00 31 31 37 36 37 05 00
- 00 31 31 37 37 33 05 00 00 31 31 37 37 37 05 00
- 00 31 31 37 37 38 16 00 00 54 4C 20 52 61 75 6D
- 62 65 77 69 72 74 73 63 68 61 66 74 75 6E 67 05
- 00 00 31 31 37 38 34 05 00 00 31 31 37 38 37 05
- 00 00 31 31 37 39 34 05 00 00 31 31 37 39 39 05
- 00 00 31 31 38 30 30 05 00 00 31 31 38 30 31 05
- 00 00 31 31 38 30 32 05 00 00 31 31 38 30 33 05
- 00 00 31 31 38 30 34 05 00 00 31 31 38 31 39 05
- 00 00 31 31 38 32 31 05 00 00 31 31 38 33 38 05
- 00 00 31 31 38 35 32 17 00 00 4A 75 6E 69 6F 72
- 20 42 75 73 69 6E 65 73 73 20 41 6E 61 6C 79 73
- 74 05 00 00 31 31 38 35 35 18 00 00 48 65 61 64
- 20 6F 66 20 52 69 73 6B 20 4D 65 61 73 2E 20 4D
- 65 74 68 2E 05 00 00 31 31 38 35 36 14 00 00 47
- 49 53 2F 46 6C 6F 6F 64 20 53 70 65 63 69 61 6C
- 69 73 74 05 00 00 31 31 38 35 38 05 00 00 31 31
- 38 36 32 10 00 00 46 6C 6F 6F 64 20 53 70 65 63
- 69 61 6C 69 73 74 05 00 00 31 31 38 38 38 05 00
- 00 31 31 38 39 34 05 00 00 31 31 38 39 39 05 00
- 00 31 31 39 31 30 0D 00 00 48 65 61 64 20 6F 66
- 20 4C 4E 2F 4E 4F 05 00 00 31 31 39 31 36 05 00
- 00 31 31 39 32 33 05 00 00 31 31 39 33 31 05 00
- 00 31 31 39 33 32 05 00 00 31 31 39 33 33 05 00
- 00 31 31 39 34 36 05 00 00 31 31 39 35 30 09 00
- 00 50 61 74 69 73 73 69 65 72 05 00 00 31 31 39
- 35 31 05 00 00 31 31 39 35 36 19 00 00 42 72 61
- 6E 64 4D 61 6E 61 67 65 72 20 43 6F 72 70 2E 43
- 6F 6D 6D 75 6E 2E 05 00 00 31 31 39 36 37 15 00
- 00 45 78 65 63 75 74 69 76 65 2D 48 6F 75 73 65
- 6B 65 65 70 65 72 05 00 00 31 31 39 36 39 19 00
- 00 52 65 73 74 2E 2B 42 61 6E 71 75 65 74 20 53
- 65 72 76 69 63 65 20 4D 67 72 05 00 00 31 31 39
- 37 30 05 00 00 31 31 39 37 31 05 00 00 31 31 39
- 37 38 05 00 00 31 31 39 38 37 14 00 00 53 61 63
- 68 62 65 61 72 62 65 69 74 65 72 20 4B 61 73 73
- 65 05 00 00 31 31 39 39 35 05 00 00 31 31 39 39
- 36 13 00 00 45 78 65 63 75 74 69 76 65 20 41 73
- 73 69 73 74 61 6E 74 05 00 00 31 32 30 30 30 04
- 00 00 34 35 36 34 04 00 00 34 35 37 31 04 00 00
- 34 35 37 36 04 00 00 34 35 39 32 0F 00 00 45 78
- 74 65 72 6E 65 72 20 4B 75 72 69 65 72 01 00 00
- 48 04 00 00 34 35 39 35 04 00 00 34 36 30 34 04
- 00 00 34 36 30 38 0F 00 00 52 75 6E 2D 6F 66 66
- 20 4D 61 6E 61 67 65 72 04 00 00 34 36 31 38 04
- 00 00 34 36 34 31 04 00 00 34 37 32 37 10 00 00
- 4D 69 74 61 72 62 65 69 74 65 72 49 6E 20 52 57
- 04 00 00 34 37 32 38 04 00 00 34 38 36 35 04 00
- 00 34 39 31 31 16 00 00 53 70 65 7A 2E 20 45 72
- 64 62 65 62 65 6E 2F 53 79 73 74 65 6D 65 04 00
- 00 34 39 33 33 04 00 00 34 39 33 34 04 00 00 34
- 39 33 35 04 00 00 34 39 33 38 04 00 00 34 39 35
- 31 13 00 00 54 4C 20 53 69 63 68 65 72 68 65 69
- 74 73 6C 6F 67 65 6E 04 00 00 34 39 35 38 04 00
- 00 34 39 37 30 14 00 00 53 70 61 6E 69 73 63 68
- FC 62 65 72 73 65 74 7A 65 72 69 6E 04 00 00 34
- 39 37 32 16 00 00 44 65 70 75 74 79 20 47 50 4D
- 20 45 6E 67 69 6E 65 65 72 69 6E 67 04 00 00 34
- 39 39 36 14 00 00 53 65 72 76 69 63 65 6D 69 74
- 61 72 62 65 69 74 65 72 69 6E 04 00 00 35 30 30
- 34 11 00 00 46 69 6E 61 6E 63 69 61 6C 20 4F 66
- 66 69 63 65 72 04 00 00 35 30 30 39 04 00 00 35
- 30 31 32 02 00 00 4A 4B 04 00 00 35 30 32 34 19
- 00 00 48 65 61 64 20 4D 61 72 6B 65 74 2E 26 41
- 63 74 2E 20 53 75 70 70 6F 72 74 04 00 00 35 30
- 32 36 17 00 00 55 57 20 46 61 63 75 6C 74 61 74
- 69 76 65 20 43 61 73 75 61 6C 74 79 04 00 00 35
- 30 33 31 17 00 00 54 65 61 6D 6C 65 69 74 65 72
- 20 45 69 6E 67 61 6E 67 73 70 6F 73 74 04 00 00
- 35 30 33 39 04 00 00 35 30 35 34 04 00 00 35 30
- 36 30 16 00 00 44 69 76 2E 20 4F 70 2E 20 4F 66
- 66 69 63 65 72 20 28 44 4F 4F 29 04 00 00 35 30
- 36 38 18 00 00 42 4C 20 47 72 6F 75 70 20 4F 66
- 66 69 63 65 20 53 65 72 76 69 63 65 73 04 00 00
- 35 30 37 35 18 00 00 43 6F 2D 65 64 69 74 6F 72
- 20 61 6E 64 20 64 61 74 61 20 73 70 65 63 2E 04
- 00 00 35 30 38 39 0A 00 00 41 63 63 6F 75 6E 74
- 61 6E 74 04 00 00 35 31 31 36 14 00 00 4D 61 6E
- 61 67 65 6D 65 6E 74 20 41 73 73 69 73 74 61 6E
- 74 04 00 00 35 31 33 34 12 00 00 52 69 73 69 6B
- 6F 73 70 65 7A 69 61 6C 69 73 74 69 6E 04 00 00
- 35 31 34 37 04 00 00 35 31 36 35 0C 00 00 46 61
- 63 68 2D 45 78 70 65 72 74 65 04 00 00 35 31 38
- 31 04 00 00 35 31 38 36 13 00 00 50 72 6F 6A 65
- 63 74 20 43 6F 6F 72 64 69 6E 61 74 6F 72 04 00
- 00 35 32 30 37 04 00 00 35 32 30 39 11 00 00 52
- 65 63 68 74 73 6B 6F 6E 73 75 6C 65 6E 74 69 6E
- 04 00 00 35 32 31 35 04 00 00 35 32 31 39 04 00
- 00 35 32 34 33 15 00 00 47 72 61 64 2E 44 65 76
- 65 6C 2E 4D 67 72 2E 52 FC 73 63 68 2E 04 00 00
- 35 32 35 31 19 00 00 53 79 73 74 65 6D 65 6E 74
- 77 69 63 6B 6C 65 72 20 46 61 63 68 61 62 74 2E
- 04 00 00 35 32 35 32 14 00 00 41 64 6D 69 6E 2E
- 20 4D 69 74 61 72 62 65 69 74 65 72 69 6E 04 00
- 00 35 32 36 33 0E 00 00 52 65 69 73 65 62 65 72
- 61 74 65 72 69 6E 04 00 00 35 32 36 35 13 00 00
- 54 72 61 69 6E 69 6E 67 20 43 6F 6E 73 75 6C 74
- 61 6E 74 04 00 00 35 32 36 37 18 00 00 49 6E 66
- 6F 72 6D 61 74 69 6F 6E 73 73 70 65 7A 69 61 6C
- 69 73 74 69 6E 04 00 00 35 32 37 32 19 00 00 48
- 65 61 64 20 6F 66 20 45 63 6F 6E 6F 6D 69 63 20
- 52 65 73 65 61 72 63 68 04 00 00 35 32 38 32 11
- 00 00 43 6C 69 65 6E 74 20 4D 61 6E 61 67 65 6D
- 65 6E 74 04 00 00 35 32 38 33 04 00 00 35 32 39
- 32 0C 00 00 52 65 69 73 65 62 65 72 61 74 65 72
- 04 00 00 35 32 39 33 17 00 00 48 75 6D 61 6E 20
- 52 65 73 6F 75 72 63 65 73 20 53 75 70 70 6F 72
- 74 04 00 00 35 32 39 35 13 00 00 45 78 65 63 75
- 74 69 76 65 20 53 65 63 72 65 74 61 72 79 04 00
- 00 35 32 39 38 04 00 00 35 32 39 39 04 00 00 35
- 33 30 33 14 00 00 54 65 61 6D 6C 65 69 74 65 72
- 20 52 E9 63 2E 20 45 6E 67 65 04 00 00 35 33 30
- 38 0B 00 00 41 73 73 69 73 74 65 6E 74 69 6E 04
- 00 00 35 33 30 39 0D 00 00 50 6F 73 74 61 73 73
- 69 73 74 65 6E 74 04 00 00 35 33 32 34 04 00 00
- 35 33 33 31 04 00 00 35 33 34 31 13 00 00 44 65
- 70 2E 20 48 65 61 64 20 53 65 63 72 65 74 61 72
- 79 04 00 00 35 33 34 35 04 00 00 35 33 35 31 04
- 00 00 35 33 35 33 0A 00 00 35 30 39 2D 33 34 35
- 30 33 64 09 00 00 35 30 39 2D 33 34 35 30 33 09
- 00 00 35 30 39 2D 33 34 35 30 34 09 00 00 35 30
- 39 2D 33 34 35 30 35 09 00 00 35 30 39 2D 33 34
- 35 30 36 09 00 00 35 30 39 2D 33 34 35 30 37 09
- 00 00 35 30 39 2D 33 34 35 30 38 09 00 00 35 30
- 39 2D 33 34 35 30 39 09 00 00 35 30 39 2D 33 34
- 35 31 30 09 00 00 35 30 39 2D 33 34 35 31 31 09
- 00 00 35 30 39 2D 33 34 35 31 32 09 00 00 35 30
- 39 2D 33 34 35 31 33 09 00 00 35 30 39 2D 33 34
- 35 31 34 09 00 00 35 30 39 2D 33 34 35 31 35 09
- 00 00 35 30 39 2D 33 34 35 31 36 09 00 00 35 30
- 39 2D 33 34 35 31 37 09 00 00 35 30 39 2D 33 34
- 35 31 38 09 00 00 35 30 39 2D 33 34 35 31 39 09
- 00 00 35 30 39 2D 33 34 35 32 30 09 00 00 35 30
- 39 2D 33 34 35 32 31 09 00 00 35 30 39 2D 33 34
- 35 32 32 09 00 00 35 30 39 2D 33 34 35 32 33 09
- 00 00 35 30 39 2D 33 34 35 32 34 09 00 00 35 30
- 39 2D 33 34 35 32 35 09 00 00 35 30 39 2D 33 34
- 35 32 36 09 00 00 35 30 39 2D 33 34 35 32 37 09
- 00 00 35 30 39 2D 33 34 35 32 38 09 00 00 35 30
- 39 2D 33 34 35 32 39 09 00 00 35 30 39 2D 33 34
- 35 33 30 09 00 00 35 30 39 2D 33 34 35 33 31 09
- 00 00 35 30 39 2D 33 34 35 33 32 09 00 00 35 30
- 39 2D 33 34 35 33 33 09 00 00 35 30 39 2D 33 34
- 35 33 34 09 00 00 35 30 39 2D 33 34 35 33 35 09
- 00 00 35 30 39 2D 33 34 35 33 36 09 00 00 35 30
- 39 2D 33 34 35 33 37 09 00 00 35 30 39 2D 33 34
- 35 33 38 09 00 00 35 30 39 2D 33 34 35 33 39 09
- 00 00 35 30 39 2D 33 34 35 34 30 09 00 00 35 30
- 39 2D 33 34 35 34 31 09 00 00 35 30 39 2D 33 34
- 35 34 32 09 00 00 35 30 39 2D 33 34 35 34 33 09
- 00 00 35 30 39 2D 33 34 35 34 34 09 00 00 35 30
- 39 2D 33 34 35 34 35 09 00 00 35 30 39 2D 33 34
- 35 34 36 09 00 00 35 30 39 2D 33 34 35 34 37 09
- 00 00 35 30 39 2D 33 34 35 34 38 09 00 00 35 30
- 39 2D 33 34 35 34 39 09 00 00 35 30 39 2D 33 34
- 35 35 30 09 00 00 35 30 39 2D 33 34 35 35 31 09
- 00 00 35 30 39 2D 33 34 35 35 32 09 00 00 35 30
- 39 2D 33 34 35 35 33 09 00 00 35 30 39 2D 33 34
- 35 35 34 09 00 00 35 30 39 2D 33 34 35 35 35 09
- 00 00 35 30 39 2D 33 34 35 35 36 09 00 00 35 30
- 39 2D 33 34 35 35 37 09 00 00 35 30 39 2D 33 34
- 35 35 38 09 00 00 35 30 39 2D 33 34 35 35 39 09
- 00 00 35 30 39 2D 33 34 35 36 30 09 00 00 35 30
- 39 2D 33 34 35 36 31 09 00 00 35 30 39 2D 33 34
- 35 36 32 09 00 00 35 30 39 2D 33 34 35 36 33 09
- 00 00 35 30 39 2D 33 34 35 36 34 09 00 00 35 30
- 39 2D 33 34 35 36 35 09 00 00 35 30 39 2D 33 34
- 35 36 36 09 00 00 35 30 39 2D 33 34 35 36 37 09
- 00 00 35 30 39 2D 33 34 35 36 38 09 00 00 35 30
- 39 2D 33 34 35 36 39 09 00 00 35 30 39 2D 33 34
- 35 37 30 09 00 00 35 30 39 2D 33 34 35 37 31 09
- 00 00 35 30 39 2D 33 34 35 37 32 09 00 00 35 30
- 39 2D 33 34 35 37 33 09 00 00 35 30 39 2D 33 34
- 35 37 34 09 00 00 35 30 39 2D 33 34 35 37 35 09
- 00 00 35 30 39 2D 33 34 35 37 36 09 00 00 35 30
- 39 2D 33 34 35 37 37 09 00 00 35 30 39 2D 33 34
- 35 37 38 09 00 00 35 30 39 2D 33 34 35 37 39 09
- 00 00 35 30 39 2D 33 34 35 38 30 09 00 00 35 30
- 39 2D 33 34 35 38 31 09 00 00 35 30 39 2D 33 34
- 35 38 32 09 00 00 35 30 39 2D 33 34 35 38 33 09
- 00 00 35 30 39 2D 33 34 35 38 34 09 00 00 35 30
- 39 2D 33 34 35 38 35 09 00 00 35 30 39 2D 33 34
- 35 38 36 09 00 00 35 30 39 2D 33 34 35 38 37 09
- 00 00 35 30 39 2D 33 34 35 38 38 09 00 00 35 30
- 39 2D 33 34 35 38 39 09 00 00 35 30 39 2D 33 34
- 35 39 30 09 00 00 35 30 39 2D 33 34 35 39 31 09
- 00 00 35 30 39 2D 33 34 35 39 32 09 00 00 35 30
- 39 2D 33 34 35 39 33 09 00 00 35 30 39 2D 33 34
- 35 39 34 09 00 00 35 30 39 2D 33 34 35 39 35 09
- 00 00 35 30 39 2D 33 34 35 39 36 09 00 00 35 30
- 39 2D 33 34 35 39 37 09 00 00 35 30 39 2D 33 34
- 35 39 38 09 00 00 35 30 39 2D 33 34 35 39 39 09
- 00 00 35 30 39 2D 33 34 36 30 30 09 00 00 35 30
- 39 2D 33 34 36 30 31 09 00 00 35 30 39 2D 33 34
- 36 30 32 09 00 00 35 30 39 2D 33 34 36 30 33 09
- 00 00 35 30 39 2D 33 34 36 30 34 09 00 00 35 30
- 39 2D 33 34 36 30 35 09 00 00 35 30 39 2D 33 34
- 36 30 36 09 00 00 35 30 39 2D 33 34 36 30 37 09
- 00 00 35 30 39 2D 33 34 36 30 38 09 00 00 35 30
- 39 2D 33 34 36 30 39 09 00 00 35 30 39 2D 33 34
- 36 31 30 09 00 00 35 30 39 2D 33 34 36 31 31 09
- 00 00 35 30 39 2D 33 34 36 31 32 09 00 00 35 30
- 39 2D 33 34 36 31 33 09 00 00 35 30 39 2D 33 34
- 36 31 34 09 00 00 35 30 39 2D 33 34 36 31 35 09
- 00 00 35 30 39 2D 33 34 36 31 36 09 00 00 35 30
- 39 2D 33 34 36 31 37 09 00 00 35 30 39 2D 33 34
- 36 31 38 09 00 00 35 30 39 2D 33 34 36 31 39 09
- 00 00 35 30 39 2D 33 34 36 32 30 09 00 00 35 30
- 39 2D 33 34 36 32 31 09 00 00 35 30 39 2D 33 34
- 36 32 32 09 00 00 35 30 39 2D 33 34 36 32 33 09
- 00 00 35 30 39 2D 33 34 36 32 34 09 00 00 35 30
- 39 2D 33 34 36 32 35 09 00 00 35 30 39 2D 33 34
- 36 32 36 09 00 00 35 30 39 2D 33 34 36 32 37 09
- 00 00 35 30 39 2D 33 34 36 32 38 09 00 00 35 30
- 39 2D 33 34 36 32 39 09 00 00 35 30 39 2D 33 34
- 36 33 30 09 00 00 35 30 39 2D 33 34 36 33 31 09
- 00 00 35 30 39 2D 33 34 36 33 32 09 00 00 35 30
- 39 2D 33 34 36 33 33 09 00 00 35 30 39 2D 33 34
- 36 33 34 09 00 00 35 30 39 2D 33 34 36 33 35 09
- 00 00 35 30 39 2D 33 34 36 33 36 09 00 00 35 30
- 39 2D 33 34 36 33 37 09 00 00 35 30 39 2D 33 34
- 36 33 38 09 00 00 35 30 39 2D 33 34 36 33 39 09
- 00 00 35 30 39 2D 33 34 36 34 30 09 00 00 35 30
- 39 2D 33 34 36 34 31 09 00 00 35 30 39 2D 33 34
- 36 34 32 09 00 00 35 30 39 2D 33 34 36 34 33 09
- 00 00 35 30 39 2D 33 34 36 34 34 09 00 00 35 30
- 39 2D 33 34 36 34 35 09 00 00 35 30 39 2D 33 34
- 36 34 36 09 00 00 35 30 39 2D 33 34 36 34 37 09
- 00 00 35 30 39 2D 33 34 36 34 38 09 00 00 35 30
- 39 2D 33 34 36 34 39 09 00 00 35 30 39 2D 33 34
- 36 35 30 09 00 00 35 30 39 2D 33 34 36 35 31 09
- 00 00 35 30 39 2D 33 34 36 35 32 09 00 00 35 30
- 39 2D 33 34 36 35 33 09 00 00 35 30 39 2D 33 34
- 36 35 34 03 00 00 73 64 66 0D 00 00 6D 79 20 73
- 75 70 65 72 76 69 73 6F 72 01 00 00 3F 08 00 00
- 78 78 78 79 79 79 32 33 0E 00 00 34 31 20 31 20
- 78 78 78 20 39 39 20 39 39 08 00 00 75 6E 68 6B
- 6E 6F 77 6E 05 00 00 68 65 75 74 65 0A 00 00 74
- 68 69 73 20 6D 6F 6E 74 68 11 00 00 6D 79 20 72
- 65 70 6F 72 74 69 6E 67 20 75 6E 69 74 05 00 00
- 49 74 61 6C 79 0C 00 00 75 73 64 20 33 33 33 33
- 33 2C 33 34 13 00 00 75 73 64 20 33 33 33 34 20
- 2B 20 47 50 44 20 33 33 34 35 06 00 00 6B 65 69
- 6E 65 72 07 00 00 33 31 2E 32 2E 36 33 03 00 00
- 20 43 48 04 00 00 38 34 38 31 04 00 00 38 34 38
- 34 04 00 00 38 34 39 31 04 00 00 38 34 39 33 02
- 00 00 53 56 04 00 00 38 34 39 34 19 00 00 44 65
- 70 2E 48 65 61 64 20 6F 66 20 49 6E 74 65 72 6C
- 69 6E 65 20 4D 67 74 04 00 00 38 35 30 30 04 00
- 00 38 35 30 35 04 00 00 38 35 31 33 04 00 00 38
- 35 31 34 04 00 00 38 35 31 37 04 00 00 38 35 31
- 38 04 00 00 38 35 32 38 04 00 00 38 35 32 39 04
- 00 00 38 35 33 30 04 00 00 38 35 33 33 04 00 00
- 38 35 33 34 04 00 00 38 35 34 31 04 00 00 38 35
- 34 33 04 00 00 38 35 34 35 15 00 00 53 70 65 63
- 69 61 6C 69 73 74 20 65 2D 43 6F 6D 6D 65 72 63
- 65 04 00 00 38 35 34 36 17 00 00 46 61 63 68 72
- 65 66 65 72 65 6E 74 69 6E 20 43 61 73 75 61 6C
- 74 79 04 00 00 38 35 34 38 03 00 00 5A 57 44 04
- 00 00 38 35 35 30 04 00 00 38 35 35 32 14 00 00
- 46 69 6E 61 6E 63 69 61 6C 20 41 63 63 6F 75 6E
- 74 61 6E 74 04 00 00 38 35 35 36 04 00 00 38 35
- 35 38 04 00 00 38 35 36 33 04 00 00 38 35 37 36
- 03 00 00 49 54 4C 04 00 00 38 35 38 32 04 00 00
- 38 35 38 37 13 00 00 53 70 65 7A 69 61 6C 69 73
- 74 20 45 72 64 62 65 62 65 6E 03 00 00 45 53 50
- 04 00 00 38 35 39 37 04 00 00 38 36 30 32 03 00
- 00 46 52 46 04 00 00 38 36 30 37 04 00 00 38 36
- 30 38 04 00 00 38 36 31 36 03 00 00 43 4E 59 04
- 00 00 38 36 32 30 03 00 00 48 4B 44 04 00 00 38
- 36 32 32 04 00 00 38 36 32 37 12 00 00 65 2D 61
- 6C 6C 69 61 6E 63 65 20 6D 61 6E 61 67 65 72 03
- 00 00 4B 52 57 04 00 00 38 36 33 33 04 00 00 38
- 36 33 38 0D 00 00 48 65 61 64 20 6F 66 20 4C 45
- 2F 42 49 04 00 00 38 36 34 30 04 00 00 38 36 34
- 35 03 00 00 54 57 44 04 00 00 38 36 34 36 04 00
- 00 38 36 36 33 13 00 00 50 72 6F 6A 65 6B 74 2D
- 41 73 73 69 73 74 65 6E 74 69 6E 04 00 00 38 36
- 36 34 04 00 00 38 36 36 36 04 00 00 38 36 36 39
- 04 00 00 38 36 37 37 0F 00 00 4C 69 66 65 20 4D
- 61 6E 61 67 65 72 20 48 4B 04 00 00 38 36 38 32
- 18 00 00 4D 65 6D 62 65 72 20 45 78 65 63 75 74
- 69 76 65 20 54 65 61 6D 20 45 55 02 00 00 4C 4C
- 04 00 00 38 36 39 36 0B 00 00 4B 56 2D 4C 65 68
- 72 6C 69 6E 67 04 00 00 38 36 39 37 04 00 00 38
- 36 39 39 04 00 00 38 37 30 30 04 00 00 38 37 30
- 31 03 00 00 44 45 4D 04 00 00 38 37 30 32 04 00
- 00 38 37 30 34 04 00 00 38 37 30 35 03 00 00 43
- 4F 50 04 00 00 38 37 30 36 04 00 00 38 37 30 37
- 04 00 00 38 37 31 30 04 00 00 38 37 31 32 0F 00
- 00 4D 65 64 69 61 20 41 73 73 69 73 74 61 6E 74
- 04 00 00 38 37 31 36 04 00 00 38 37 31 37 13 00
- 00 48 65 61 64 20 6F 66 20 4C 41 2F 4C 45 2F 4C
- 4E 20 49 54 03 00 00 42 45 46 04 00 00 38 37 32
- 31 13 00 00 4C 65 69 74 65 72 20 52 65 63 68 74
- 73 64 69 65 6E 73 74 04 00 00 38 37 32 37 04 00
- 00 38 37 32 38 04 00 00 38 37 34 32 03 00 00 56
- 45 42 04 00 00 38 37 34 33 04 00 00 38 37 34 34
- 04 00 00 38 37 35 39 16 00 00 53 70 65 7A 69 61
- 6C 69 73 74 20 53 74 75 72 6D 2F 4D 65 74 65 6F
- 04 00 00 38 37 36 30 04 00 00 38 37 36 32 04 00
- 00 38 37 36 38 04 00 00 38 37 37 35 04 00 00 38
- 37 37 39 04 00 00 38 37 38 36 19 00 00 48 65 61
- 64 20 4D 65 64 65 78 20 4D 6F 6E 69 74 6F 72 69
- 6E 67 55 6E 69 74 04 00 00 38 37 38 37 17 00 00
- 48 65 61 64 20 52 69 73 6B 20 4D 67 6D 74 20 26
- 20 4D 61 67 6E 75 6D 04 00 00 38 38 31 37 04 00
- 00 38 38 32 33 04 00 00 38 38 33 34 04 00 00 38
- 38 33 38 04 00 00 38 38 33 39 04 00 00 38 38 35
- 34 16 00 00 48 65 61 64 20 6F 66 20 47 6C 6F 62
- 61 6C 20 43 6C 69 65 6E 74 73 04 00 00 38 38 36
- 34 04 00 00 38 38 36 35 04 00 00 38 38 36 38 19
- 00 00 43 6C 61 69 6D 73 2F 50 6F 72 74 66 6F 6C
- 69 6F 20 41 73 73 2E 4D 61 6E 2E 04 00 00 38 38
- 37 38 14 00 00 54 65 61 6D 6C 65 69 74 65 72 69
- 6E 20 53 65 72 76 69 63 65 04 00 00 38 38 39 32
- 04 00 00 38 38 39 33 19 00 00 47 72 6C 2E 20 54
- 65 6C 65 6D 61 74 69 6B 2F 41 56 2D 54 65 63 68
- 6E 69 6B 04 00 00 38 38 39 34 0D 00 00 54 65 6C
- 65 6D 61 74 69 6B 65 72 69 6E 04 00 00 38 38 39
- 37 04 00 00 38 39 30 30 13 00 00 50 72 6F 67 72
- 61 6D 20 43 6F 6F 72 64 69 6E 61 74 6F 72 04 00
- 00 38 39 30 35 03 00 00 52 55 52 04 00 00 38 39
- 30 37 10 00 00 47 65 62 E4 75 64 65 74 65 63 68
- 6E 69 6B 65 72 04 00 00 38 39 31 30 04 00 00 38
- 39 31 32 15 00 00 53 74 6F 72 61 67 65 20 41 64
- 6D 69 6E 69 73 74 72 61 74 6F 72 04 00 00 38 39
- 32 35 04 00 00 38 39 33 37 14 00 00 52 65 67 69
- 6F 6E 61 6C 20 49 47 50 20 4D 61 6E 61 67 65 72
- 04 00 00 38 39 33 38 04 00 00 38 39 34 31 04 00
- 00 38 39 34 33 04 00 00 38 39 34 35 04 00 00 38
- 39 34 38 04 00 00 38 39 35 38 04 00 00 38 39 36
- 33 07 00 00 41 75 64 69 74 6F 72 04 00 00 38 39
- 36 34 04 00 00 39 30 38 30 18 00 00 49 6E 76 2E
- 20 50 72 6F 66 2E 2F 4C 65 67 61 6C 20 43 6F 75
- 6E 73 65 6C 04 00 00 39 30 38 31 04 00 00 39 30
- 38 35 04 00 00 39 31 30 37 0F 00 00 50 61 79 72
- 6F 6C 6C 20 53 75 70 70 6F 72 74 04 00 00 39 31
- 31 34 11 00 00 41 73 73 69 73 74 61 6E 74 20 41
- 63 74 75 61 72 79 03 00 00 35 38 34 04 00 00 39
- 31 31 38 04 00 00 39 31 32 31 04 00 00 39 31 34
- 35 16 00 00 41 73 73 2E 20 46 69 6E 61 6E 63 69
- 61 6C 20 4F 66 66 69 63 65 72 04 00 00 39 31 34
- 36 0C 00 00 4B 6F 63 68 6C 65 68 72 6C 69 6E 67
- 04 00 00 39 31 34 37 04 00 00 39 31 34 38 04 00
- 00 39 31 34 39 04 00 00 39 31 35 35 04 00 00 39
- 31 35 39 04 00 00 39 31 37 31 04 00 00 39 31 37
- 35 18 00 00 53 70 65 63 69 61 6C 20 41 73 73 69
- 67 2E 26 4C 6F 67 69 73 74 69 63 73 04 00 00 39
- 31 38 35 04 00 00 39 31 38 36 04 00 00 39 31 38
- 39 04 00 00 39 32 30 35 04 00 00 39 32 30 37 19
- 00 00 44 65 70 75 74 79 20 43 68 69 65 66 20 4D
- 65 64 69 63 61 6C 20 4F 66 66 2E 04 00 00 39 32
- 35 35 16 00 00 48 65 61 64 20 6F 66 20 49 6E 74
- 65 72 6C 69 6E 65 20 4D 67 74 2E 04 00 00 39 33
- 30 33 04 00 00 39 33 31 37 04 00 00 39 33 32 35
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord2CR2 b/trunk/test-data/spreadsheet/BigSSTRecord2CR2
deleted file mode 100644
index 05aa7e9..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2CR2
+++ /dev/null
@@ -1,515 +0,0 @@
- 3C 00 20 20 04 00 00 39 33 34 35 04 00 00 39 33
- 35 39 10 00 00 48 65 61 64 20 6F 66 20 49 41 20
- 4D 67 6D 74 2E 04 00 00 39 34 33 31 04 00 00 39
- 34 34 35 0A 00 00 49 54 20 53 75 70 70 6F 72 74
- 04 00 00 39 34 34 39 04 00 00 39 34 36 37 04 00
- 00 39 34 38 35 04 00 00 39 34 38 37 19 00 00 47
- 72 6C 2E 20 46 69 6E 61 6E 63 69 61 6C 20 41 63
- 63 6F 75 6E 74 69 6E 67 04 00 00 39 34 38 39 04
- 00 00 39 35 30 31 04 00 00 39 35 30 33 04 00 00
- 39 35 30 39 11 00 00 54 65 61 6D 6C 65 69 74 65
- 72 20 55 6D 7A FC 67 65 04 00 00 39 35 31 33 04
- 00 00 39 35 32 37 04 00 00 39 35 35 35 04 00 00
- 39 35 37 31 04 00 00 39 35 37 33 04 00 00 39 35
- 39 39 04 00 00 39 36 30 37 04 00 00 39 36 35 37
- 19 00 00 50 6F 72 74 75 67 69 65 73 69 73 63 68
- FC 62 65 72 73 65 74 7A 65 72 69 6E 04 00 00 39
- 36 35 39 0B 00 00 50 52 2D 52 65 64 61 6B 74 6F
- 72 04 00 00 39 36 38 37 18 00 00 55 6D 77 65 6C
- 74 73 63 68 75 74 7A 62 65 61 75 66 74 72 61 67
- 74 65 72 04 00 00 39 37 30 35 19 00 00 48 65 61
- 64 20 54 65 63 68 6E 2E 20 53 75 70 70 6F 72 74
- 20 4C 41 2F 49 54 04 00 00 39 37 31 33 04 00 00
- 39 37 32 33 16 00 00 48 65 61 6C 74 68 20 43 61
- 72 65 20 53 70 65 63 69 61 6C 69 73 74 04 00 00
- 39 37 33 31 04 00 00 39 37 34 39 0C 00 00 52 69
- 73 6B 20 41 6E 61 6C 79 73 74 04 00 00 39 37 35
- 35 04 00 00 39 37 35 39 04 00 00 39 37 36 33 04
- 00 00 39 38 32 35 14 00 00 4D 61 72 6B 65 74 69
- 6E 67 20 52 FC 73 63 68 6C 69 6B 6F 6E 04 00 00
- 39 38 33 35 16 00 00 46 69 6E 61 6E 63 2E 53 6F
- 6C 75 74 69 6F 6E 73 20 43 6F 6E 73 2E 04 00 00
- 39 38 33 39 04 00 00 39 38 36 35 04 00 00 39 38
- 36 39 19 00 00 50 72 6F 6A 65 6B 74 6C 2E 20 46
- 69 6E 2E 20 41 63 63 6F 75 6E 74 69 6E 67 04 00
- 00 39 38 38 33 13 00 00 48 52 2D 4D 49 53 20 55
- 73 65 72 20 53 75 70 70 6F 72 74 04 00 00 39 38
- 38 35 12 00 00 48 65 61 64 20 6F 66 20 43 6C 61
- 69 6D 73 20 4D 67 74 04 00 00 39 38 38 37 04 00
- 00 39 38 39 39 03 00 00 50 4C 5A 04 00 00 39 39
- 31 33 04 00 00 39 39 32 30 03 00 00 53 47 44 04
- 00 00 39 39 32 32 04 00 00 39 39 33 30 04 00 00
- 39 39 35 31 0E 00 00 4D 44 2D 41 73 73 69 73 74
- 65 6E 74 69 6E 04 00 00 39 39 35 33 04 00 00 39
- 39 36 31 19 00 00 47 72 6F 75 70 20 50 72 6F 64
- 2E 4D 61 6E 61 67 2E 43 61 73 75 61 6C 74 79 0D
- 00 00 4E 65 77 20 59 6F 72 6B 2C 20 55 53 41 04
- 00 00 39 39 36 33 04 00 00 39 39 37 33 04 00 00
- 39 39 37 35 04 00 00 39 39 38 36 05 00 00 31 30
- 30 31 38 05 00 00 31 30 30 32 34 05 00 00 31 30
- 30 32 36 05 00 00 31 30 30 32 39 05 00 00 31 30
- 30 33 31 05 00 00 31 30 30 34 33 19 00 00 50 72
- 6F 6A 27 6D 69 74 61 72 62 65 69 74 65 72 20 46
- 61 63 68 61 62 74 2E 05 00 00 31 30 30 34 37 05
- 00 00 31 30 30 35 39 05 00 00 31 30 30 36 33 05
- 00 00 31 30 30 36 39 05 00 00 31 30 30 37 31 03
- 00 00 4A 50 59 05 00 00 31 30 30 37 33 05 00 00
- 31 30 30 37 35 19 00 00 47 72 75 70 70 65 6E 6C
- 65 69 74 65 72 20 50 6F 73 74 64 69 65 6E 73 74
- 65 05 00 00 31 30 30 38 31 14 00 00 54 4C 20 47
- 65 62 E4 75 64 65 6D 61 6E 61 67 65 6D 65 6E 74
- 05 00 00 31 30 30 38 33 11 00 00 43 6C 61 69 6D
- 73 20 43 6F 6E 73 75 6C 74 61 6E 74 05 00 00 31
- 30 30 39 31 05 00 00 31 30 30 39 35 05 00 00 31
- 30 30 39 39 05 00 00 31 30 31 37 32 12 00 00 47
- 72 75 70 70 65 6E 6C 65 69 74 65 72 20 46 69 62
- 75 05 00 00 31 30 31 38 32 05 00 00 31 30 31 38
- 38 05 00 00 31 30 31 39 34 12 00 00 45 69 6E 72
- 69 63 68 74 75 6E 67 73 70 6C 61 6E 65 72 05 00
- 00 31 30 31 39 36 05 00 00 31 30 32 30 30 05 00
- 00 31 30 32 30 34 0D 00 00 49 47 50 20 41 73 73
- 6F 63 69 61 74 65 05 00 00 31 30 32 33 36 0F 00
- 00 50 72 6F 6A 65 63 74 20 4F 66 66 69 63 65 72
- 05 00 00 31 30 32 36 30 05 00 00 31 30 32 36 32
- 03 00 00 4E 4C 47 05 00 00 31 30 32 38 30 05 00
- 00 31 30 32 39 38 05 00 00 31 30 33 32 38 05 00
- 00 31 30 33 33 34 0E 00 00 44 65 70 75 74 79 20
- 48 65 61 64 20 43 58 05 00 00 31 30 33 33 38 05
- 00 00 31 30 33 35 30 05 00 00 31 30 33 37 30 05
- 00 00 31 30 33 37 34 13 00 00 4C 65 69 74 65 72
- 20 45 69 6E 6B 61 75 66 20 53 52 47 53 05 00 00
- 31 30 33 39 32 15 00 00 41 62 74 65 69 6C 75 6E
- 67 73 2D 53 65 6B 72 65 74 E4 72 69 6E 05 00 00
- 31 30 33 39 34 05 00 00 31 30 33 39 36 05 00 00
- 31 30 33 39 38 15 00 00 41 63 63 6F 75 6E 74 61
- 6E 74 20 47 72 6F 75 70 20 52 65 70 2E 05 00 00
- 31 30 34 30 30 05 00 00 31 30 34 33 31 05 00 00
- 31 30 35 30 37 05 00 00 31 30 35 32 37 05 00 00
- 31 30 35 35 32 05 00 00 31 30 35 35 36 05 00 00
- 31 30 35 35 37 18 00 00 43 68 69 65 66 20 41 63
- 63 6F 75 6E 74 69 6E 67 20 4F 66 66 69 63 65 72
- 12 00 00 4D 61 6E 2E 20 4C 65 67 61 6C 20 43 6F
- 75 6E 73 65 6C 04 00 00 34 31 33 32 11 00 00 50
- 4C 20 4B 6F 6E 73 6F 6C 69 64 69 65 72 75 6E 67
- 04 00 00 34 31 33 33 04 00 00 34 31 33 34 17 00
- 00 48 75 6D 61 6E 20 52 65 73 6F 75 72 63 65 73
- 20 4D 61 6E 61 67 65 72 04 00 00 34 31 35 30 04
- 00 00 34 31 35 37 04 00 00 34 31 36 37 13 00 00
- 53 65 6E 2E 20 46 69 6E 61 6E 63 69 61 6C 20 41
- 63 63 2E 04 00 00 34 32 30 35 04 00 00 34 32 30
- 38 13 00 00 53 65 63 72 65 74 61 72 79 2F 41 73
- 73 69 73 74 61 6E 74 04 00 00 34 32 31 39 04 00
- 00 34 32 32 37 04 00 00 34 32 32 39 10 00 00 43
- 6F 6D 6D 2E 20 53 70 65 63 69 61 6C 69 73 74 04
- 00 00 34 32 33 36 19 00 00 44 65 70 2E 48 65 61
- 64 20 52 4E 2F 48 65 61 64 20 43 61 74 53 75 70
- 70 2E 04 00 00 34 32 33 38 04 00 00 34 32 34 32
- 04 00 00 34 32 34 37 04 00 00 34 32 35 35 04 00
- 00 34 32 36 32 11 00 00 44 65 70 75 74 79 20 48
- 65 61 64 20 6F 66 20 49 46 04 00 00 34 32 36 39
- 16 00 00 53 65 72 76 69 63 65 66 61 63 68 6D 69
- 74 61 72 62 65 69 74 65 72 04 00 00 34 32 37 37
- 09 00 00 43 68 61 75 66 66 65 75 72 04 00 00 34
- 32 38 33 0E 00 00 52 E9 63 65 70 74 69 6F 6E 69
- 73 74 69 6E 04 00 00 34 32 38 34 02 00 00 4D 4D
- 04 00 00 34 32 38 39 13 00 00 53 65 6E 69 6F 72
- 20 52 69 73 6B 20 41 6E 61 6C 79 73 74 04 00 00
- 34 33 30 36 04 00 00 34 33 30 39 19 00 00 48 65
- 61 64 20 6F 66 20 43 6F 6E 74 72 61 63 74 20 53
- 65 72 76 69 63 65 73 04 00 00 34 33 31 36 15 00
- 00 43 6F 6D 6D 2E 20 41 73 73 2E 20 52 FC 73 63
- 68 6C 69 6B 6F 6E 04 00 00 34 33 33 31 04 00 00
- 34 33 33 32 18 00 00 47 72 6F 75 70 20 43 6F 6D
- 70 6C 69 61 6E 63 65 20 4F 66 66 69 63 65 72 04
- 00 00 34 33 34 32 02 00 00 56 4F 04 00 00 34 33
- 34 35 10 00 00 53 65 6E 69 6F 72 20 45 63 6F 6E
- 6F 6D 69 73 74 04 00 00 34 33 34 36 16 00 00 47
- 72 6C 2E 20 47 65 6E 65 72 61 6C 20 4C 65 64 67
- 65 72 20 5A 48 04 00 00 34 33 34 39 04 00 00 34
- 33 35 32 10 00 00 4D 65 64 69 61 20 43 6F 6E 73
- 75 6C 74 61 6E 74 04 00 00 34 33 35 39 14 00 00
- 47 72 61 66 69 73 63 68 65 20 53 61 63 68 62 65
- 61 72 62 2E 02 00 00 4C 48 04 00 00 34 33 36 32
- 14 00 00 50 72 6F 6A 65 63 74 73 20 53 52 41 20
- 48 6F 6C 64 69 6E 67 04 00 00 34 33 36 39 04 00
- 00 34 33 38 34 0D 00 00 41 63 63 6F 75 6E 74 69
- 6E 67 20 50 56 04 00 00 34 33 39 39 04 00 00 34
- 34 30 32 04 00 00 34 34 31 31 01 00 00 44 04 00
- 00 34 34 32 32 04 00 00 34 34 32 39 04 00 00 34
- 34 35 36 04 00 00 34 34 35 37 12 00 00 54 65 63
- 68 6E 2E 20 4D 69 74 61 72 62 65 69 74 65 72 04
- 00 00 34 34 35 38 16 00 00 54 65 61 6D 6C 65 69
- 74 65 72 20 53 70 6F 72 74 61 6E 6C 61 67 65 04
- 00 00 34 34 36 32 16 00 00 54 65 61 6D 6C 65 69
- 74 65 72 69 6E 20 52 E9 63 65 70 74 69 6F 6E 04
- 00 00 34 34 36 34 04 00 00 34 34 36 39 04 00 00
- 34 34 37 39 15 00 00 47 72 6C 2E 20 42 65 74 72
- 69 65 62 20 41 64 6C 69 73 77 69 6C 04 00 00 34
- 34 38 30 04 00 00 34 34 38 31 11 00 00 54 4C 20
- 42 65 74 72 69 65 62 73 64 69 65 6E 73 74 04 00
- 00 34 34 38 32 12 00 00 42 65 74 72 69 65 62 73
- 65 6C 65 6B 74 72 69 6B 65 72 04 00 00 34 34 39
- 32 11 00 00 45 78 65 63 75 74 69 76 65 20 53 75
- 70 70 6F 72 74 04 00 00 34 35 33 35 04 00 00 34
- 35 34 30 04 00 00 34 35 36 30 19 00 00 4C 65 61
- 72 6E 69 6E 67 26 44 65 76 65 6C 6F 70 2E 20 4D
- 61 6E 61 67 65 72 06 00 00 6D 79 6E 61 6D 65 0B
- 00 00 6D 79 66 69 72 73 74 6E 61 6D 65 04 00 00
- 37 38 37 35 19 00 00 53 65 6D 69 6E 61 72 20 26
- 20 54 72 61 69 6E 69 6E 67 20 43 6F 6F 72 64 2E
- 04 00 00 37 38 37 37 19 00 00 47 72 6F 75 70 20
- 4D 61 6E 61 67 65 6D 65 6E 74 20 44 65 76 65 6C
- 6F 70 2E 03 00 00 31 33 37 04 00 00 37 38 38 38
- 04 00 00 37 38 39 37 03 00 00 5A 41 52 04 00 00
- 37 39 31 32 18 00 00 48 65 61 64 20 6F 66 20 49
- 6E 66 6F 72 6D 61 74 69 6F 6E 20 4D 67 6D 74 04
- 00 00 37 39 31 35 04 00 00 37 39 31 39 04 00 00
- 37 39 34 36 04 00 00 37 39 35 32 04 00 00 37 39
- 36 36 04 00 00 37 39 39 36 04 00 00 38 30 30 32
- 04 00 00 38 30 30 36 04 00 00 38 30 30 37 04 00
- 00 38 30 31 30 04 00 00 38 30 33 33 04 00 00 38
- 30 33 38 0B 00 00 54 65 72 6D 69 6E 6F 6C 6F 67
- 65 04 00 00 38 30 34 32 04 00 00 38 30 34 34 04
- 00 00 38 30 35 32 04 00 00 38 30 35 33 04 00 00
- 38 30 35 39 04 00 00 38 30 36 35 0B 00 00 56 52
- 2D 53 65 6B 72 65 74 E4 72 04 00 00 38 30 38 32
- 04 00 00 38 30 38 35 04 00 00 38 30 38 36 19 00
- 00 50 6F 72 74 75 67 69 65 73 69 73 63 68 2D 55
- 65 62 65 72 73 65 74 7A 65 72 04 00 00 38 30 38
- 38 04 00 00 38 30 39 35 12 00 00 4F 70 65 72 61
- 74 69 6F 6E 73 20 4D 61 6E 61 67 65 72 04 00 00
- 38 31 30 31 18 00 00 47 72 6C 2E 20 52 61 75 6D
- 62 65 77 69 72 74 73 63 68 61 66 74 75 6E 67 04
- 00 00 38 31 30 34 04 00 00 38 31 30 35 04 00 00
- 38 31 30 37 13 00 00 48 65 61 64 20 6F 66 20 46
- 6C 6F 6F 64 20 47 72 6F 75 70 04 00 00 38 31 30
- 38 04 00 00 38 31 31 33 04 00 00 38 31 31 37 04
- 00 00 38 31 31 38 03 00 00 35 33 30 04 00 00 38
- 31 32 32 11 00 00 54 65 63 68 6E 69 63 61 6C 20
- 53 75 70 70 6F 72 74 04 00 00 38 31 33 39 04 00
- 00 38 31 34 33 04 00 00 38 31 34 35 19 00 00 48
- 65 61 64 20 6F 66 20 52 69 73 63 20 52 65 70 2F
- 53 74 65 65 72 69 6E 67 04 00 00 38 31 34 37 04
- 00 00 38 31 34 38 04 00 00 38 31 34 39 04 00 00
- 38 31 35 30 04 00 00 38 31 35 34 04 00 00 38 31
- 35 39 0D 00 00 43 6C 61 69 6D 73 20 45 78 70 65
- 72 74 04 00 00 38 31 37 30 04 00 00 38 31 38 37
- 18 00 00 48 65 61 64 20 6F 66 20 48 52 20 53 79
- 73 74 65 6D 73 26 43 6F 6D 70 2E 04 00 00 38 31
- 39 34 04 00 00 38 31 39 35 0C 00 00 49 54 2D 53
- 75 70 70 6F 72 74 65 72 04 00 00 38 31 39 37 04
- 00 00 38 31 39 38 0F 00 00 52 69 73 69 6B 6F 69
- 6E 67 65 6E 69 65 75 72 04 00 00 38 32 30 39 04
- 00 00 38 32 31 35 04 00 00 38 32 31 36 0D 00 00
- 49 54 2D 53 70 65 63 69 61 6C 69 73 74 04 00 00
- 38 32 32 37 18 00 00 53 61 63 68 62 2E 4B 75 6E
- 64 65 6E 67 65 73 63 68 2E 2F 50 75 62 6C 2E 04
- 00 00 38 32 33 30 04 00 00 38 32 33 34 04 00 00
- 38 32 33 37 04 00 00 38 32 33 39 07 00 00 43 6F
- 75 6E 74 72 79 08 00 00 44 69 76 69 73 69 6F 6E
- 0B 00 00 44 61 74 65 4F 66 42 69 72 74 68 0B 00
- 00 44 61 74 65 4F 66 45 6E 74 72 79 03 00 00 53
- 65 78 08 00 00 46 75 6E 63 74 69 6F 6E 0A 00 00
- 53 75 70 65 72 76 69 73 6F 72 08 00 00 43 75 72
- 72 65 6E 63 79 03 00 00 33 32 34 02 00 00 43 48
- 06 00 00 5A 75 72 69 63 68 01 00 00 50 02 00 00
- 49 53 02 00 00 43 53 03 00 00 32 39 32 01 00 00
- 4D 11 00 00 47 72 6C 2E 20 41 63 63 65 73 73 20
- 4D 67 6D 74 2E 02 00 00 4E 6F 03 00 00 55 53 44
- 01 00 00 30 02 00 00 50 45 03 00 00 32 39 38 16
- 00 00 53 65 6E 69 6F 72 20 53 79 73 74 65 6D 20
- 45 6E 67 69 6E 65 65 72 03 00 00 32 39 39 18 00
- 00 4D 65 6D 62 65 72 20 45 78 65 63 75 74 69 76
- 65 20 54 65 61 6D 20 49 54 01 00 00 4F 02 00 00
- 52 47 02 00 00 54 54 03 00 00 33 31 32 0F 00 00
- 54 65 6D 70 6F 72 61 72 79 20 73 74 61 66 66 01
- 00 00 51 02 00 00 42 4F 01 00 00 32 17 00 00 47
- 72 6F 75 70 20 4E 6F 6E 20 4C 69 66 65 20 52 65
- 69 6E 73 75 72 2E 02 00 00 36 31 10 00 00 41 73
- 73 69 73 74 65 6E 74 20 64 65 72 20 47 4C 01 00
- 00 4A 02 00 00 46 52 02 00 00 52 41 02 00 00 38
- 31 0E 00 00 53 65 6B 74 69 6F 6E 73 6C 65 69 74
- 65 72 02 00 00 48 53 02 00 00 43 4F 03 00 00 31
- 30 39 0F 00 00 50 61 79 72 6F 6C 6C 20 4D 61 6E
- 61 67 65 72 03 00 00 31 34 30 02 00 00 49 45 03
- 00 00 31 34 37 14 00 00 50 72 6F 6A 65 6B 74 2D
- 42 65 61 75 66 74 72 61 67 74 65 72 02 00 00 52
- 50 03 00 00 31 34 38 19 00 00 48 65 61 64 20 6F
- 66 20 47 72 6F 75 70 20 50 4D 20 50 72 6F 70 65
- 72 74 79 02 00 00 52 54 03 00 00 31 34 39 17 00
- 00 53 65 6E 2E 20 50 72 6F 64 75 63 74 20 53 70
- 65 63 69 61 6C 69 73 74 03 00 00 31 35 33 0B 00
- 00 44 65 70 75 74 79 20 48 65 61 64 02 00 00 52
- 4C 02 00 00 47 43 03 00 00 31 37 35 18 00 00 47
- 72 70 20 43 6C 61 69 6D 73 20 26 20 43 6F 6E 74
- 72 20 43 6F 6F 72 64 02 00 00 44 52 03 00 00 31
- 37 37 12 00 00 47 72 6F 75 70 20 44 61 74 61 20
- 4F 66 66 69 63 65 72 02 00 00 52 4E 02 00 00 52
- 45 03 00 00 31 38 34 13 00 00 4C 65 69 74 65 72
- 20 52 65 74 72 6F 2F 43 52 45 53 54 41 01 00 00
- 46 02 00 00 4C 41 02 00 00 49 54 03 00 00 32 36
- 32 17 00 00 53 65 6E 69 6F 72 20 41 70 70 6C 69
- 63 2E 20 45 6E 67 69 6E 65 65 72 02 00 00 46 44
- 03 00 00 32 36 35 03 00 00 32 36 37 02 00 00 4F
- 50 03 00 00 32 36 38 12 00 00 50 72 6F 64 75 63
- 74 69 6F 6E 20 50 6C 61 6E 6E 65 72 03 00 00 4D
- 58 4E 02 00 00 4D 53 03 00 00 32 36 39 0F 00 00
- 53 79 73 74 65 6D 20 45 6E 67 69 6E 65 65 72 03
- 00 00 32 37 35 0D 00 00 49 54 2D 43 6F 6E 73 75
- 6C 74 61 6E 74 03 00 00 32 38 30 02 00 00 49 4D
- 03 00 00 32 38 31 03 00 00 42 52 4C 03 00 00 32
- 38 36 0F 00 00 53 79 73 74 65 6D 20 42 65 74 72
- 65 75 65 72 12 00 00 47 72 6C 2E 20 53 79 73 74
- 65 6D 20 43 6F 6E 74 72 2E 03 00 00 33 32 36 02
- 00 00 43 52 03 00 00 33 33 35 17 00 00 41 63 63
- 6F 75 6E 74 61 6E 74 20 53 75 62 73 69 64 69 61
- 72 69 65 73 02 00 00 4C 4F 03 00 00 33 33 39 0E
- 00 00 41 4C 2D 41 73 73 69 73 74 65 6E 74 69 6E
- 02 00 00 43 44 03 00 00 33 34 30 15 00 00 43 6F
- 6E 73 75 6C 74 61 6E 74 20 4F 72 67 2E 20 54 6F
- 6F 6C 73 03 00 00 33 34 34 02 00 00 44 45 03 00
- 00 33 36 30 19 00 00 42 65 61 75 66 74 72 61 67
- 74 65 72 20 4A 75 6E 69 6F 72 20 50 6F 77 65 72
- 03 00 00 33 36 35 02 00 00 49 44 03 00 00 33 36
- 37 0A 00 00 53 65 6B 72 65 74 E4 72 69 6E 02 00
- 00 42 4C 03 00 00 33 37 35 17 00 00 42 65 74 72
- 69 65 62 73 74 65 63 68 6E 69 6B 65 72 20 48 4C
- 4B 4B 53 03 00 00 33 39 35 19 00 00 47 72 6C 2E
- 53 74 61 62 73 74 65 6C 6C 65 20 53 69 63 68 65
- 72 68 65 69 74 03 00 00 33 39 37 0F 00 00 50 6F
- 73 74 61 73 73 69 73 74 65 6E 74 69 6E 03 00 00
- 34 32 34 02 00 00 52 42 03 00 00 34 33 32 03 00
- 00 34 35 36 19 00 00 48 65 61 64 20 6F 66 20 49
- 6E 64 69 61 2F 4D 69 64 64 6C 65 20 45 61 73 74
- 02 00 00 42 53 03 00 00 34 36 32 0D 00 00 48 65
- 61 64 20 6F 66 20 4C 41 2F 42 53 02 00 00 4C 45
- 02 00 00 41 53 03 00 00 34 36 33 09 00 00 53 65
- 63 72 65 74 61 72 79 03 00 00 34 37 34 19 00 00
- 41 64 6D 69 6E 69 73 74 72 61 74 69 6F 6E 20 53
- 75 70 65 72 76 69 73 6F 72 02 00 00 4C 4E 03 00
- 00 34 38 30 03 00 00 34 38 35 19 00 00 53 65 6E
- 2E 20 55 6E 64 65 72 77 72 69 74 69 6E 67 20 43
- 6F 6E 73 75 6C 74 03 00 00 43 4F 42 03 00 00 34
- 38 36 02 00 00 46 53 03 00 00 34 38 37 19 00 00
- 48 65 61 64 20 6F 66 20 46 69 6E 61 6E 63 2E 20
- 53 6F 6C 75 74 69 6F 6E 73 03 00 00 35 30 36 03
- 00 00 35 31 33 02 00 00 4E 4F 03 00 00 35 36 38
- 16 00 00 53 65 6E 69 6F 72 20 41 63 63 6F 75 6E
- 74 20 4D 61 6E 61 67 65 72 02 00 00 52 52 02 00
- 00 52 4F 03 00 00 35 37 34 16 00 00 41 73 73 2E
- 20 4F 70 65 72 61 74 69 6F 6E 73 20 43 6F 6F 72
- 64 2E 03 00 00 35 37 39 03 00 00 36 30 30 03 00
- 00 36 30 35 19 00 00 42 75 73 69 6E 65 73 73 20
- 43 6F 6E 74 69 6E 75 69 74 79 20 4D 67 6D 74 2E
- 03 00 00 36 30 37 03 00 00 36 30 39 11 00 00 52
- 65 70 6F 72 74 69 6E 67 20 53 75 70 70 6F 72 74
- 01 00 00 4C 03 00 00 36 31 35 18 00 00 55 57 20
- 4D 61 6E 61 67 65 72 20 46 61 63 2E 20 43 61 73
- 75 61 6C 74 79 03 00 00 59 65 73 03 00 00 36 31
- 39 19 00 00 48 65 61 64 20 6F 66 20 4D 65 64 69
- 63 6F 2D 41 63 74 2E 20 53 65 72 76 2E 02 00 00
- 43 41 03 00 00 36 32 34 17 00 00 48 65 61 64 20
- 52 65 63 6F 72 64 73 20 4D 61 6E 61 67 65 6D 65
- 6E 74 04 00 00 32 30 34 34 02 00 00 52 43 03 00
- 00 36 33 33 16 00 00 47 72 75 70 70 65 6E 6C 65
- 69 74 65 72 20 43 61 73 75 61 6C 74 79 04 00 00
- 53 49 54 43 03 00 00 36 33 38 0B 00 00 4C 65 69
- 74 65 72 20 53 49 54 43 03 00 00 36 34 31 10 00
- 00 41 62 74 65 69 6C 75 6E 67 73 6C 65 69 74 65
- 72 03 00 00 36 38 35 0E 00 00 4C 65 69 74 65 72
- 20 53 74 61 62 20 4C 4F 02 00 00 4C 54 03 00 00
- 37 30 30 16 00 00 41 64 6D 69 6E 69 73 74 72 61
- 74 69 6F 6E 20 53 75 70 70 6F 72 74 03 00 00 37
- 31 35 0D 00 00 54 4C 20 48 61 75 73 64 69 65 6E
- 73 74 03 00 00 37 33 31 11 00 00 53 79 73 74 65
- 6D 20 43 6F 6E 74 72 6F 6C 6C 65 72 02 00 00 47
- 53 02 00 00 4B 48 03 00 00 37 34 33 14 00 00 4B
- FC 63 68 65 6E 6D 69 74 61 72 62 65 69 74 65 72
- 2F 69 6E 03 00 00 37 34 35 19 00 00 54 65 61 6D
- 6C 65 69 74 65 72 69 6E 20 4B 75 72 69 65 72 64
- 69 65 6E 73 74 03 00 00 37 35 37 04 00 00 4B 6F
- 63 68 03 00 00 37 36 31 18 00 00 53 65 72 76 69
- 63 65 66 61 63 68 6D 69 74 61 72 62 65 69 74 65
- 72 69 6E 03 00 00 37 39 33 19 00 00 52 6F 6F 6D
- 73 65 72 76 69 63 65 6D 69 74 61 72 62 65 69 74
- 65 72 2F 69 6E 03 00 00 38 39 36 03 00 00 39 31
- 30 0D 00 00 41 4C 2D 53 65 6B 72 65 74 E4 72 69
- 6E 03 00 00 39 32 37 10 00 00 53 61 63 68 62 65
- 61 72 62 65 69 74 65 72 69 6E 03 00 00 39 33 37
- 13 00 00 4C 65 69 74 65 72 20 47 65 67 65 6E 61
- 6C 69 6D 65 6E 74 03 00 00 39 37 36 17 00 00 50
- 4C 20 49 6E 66 72 61 73 74 72 75 63 74 75 72 65
- 20 50 72 6F 6A 2E 02 00 00 49 50 03 00 00 39 37
- 37 03 00 00 39 38 32 11 00 00 47 72 6C 2E 20 42
- 65 74 72 69 65 62 20 45 6E 67 65 04 00 00 31 30
- 31 33 10 00 00 54 72 61 69 6E 69 6E 67 20 4F 66
- 66 69 63 65 72 04 00 00 31 30 33 32 04 00 00 31
- 30 34 34 18 00 00 4C 65 69 74 65 72 20 42 65 74
- 72 69 65 62 2F 45 72 68 61 6C 74 75 6E 67 04 00
- 00 31 30 34 35 26 00 00 4D 65 6D 62 65 72 20 6F
- 66 20 74 68 65 20 50 4F 49 2D 48 53 53 46 20 45
- 78 65 63 75 74 69 76 65 20 42 6F 61 72 64 04 00
- 00 31 30 35 37 04 00 00 31 30 36 32 1E 00 00 44
- 65 70 75 74 79 20 43 68 69 65 66 20 45 78 65 63
- 75 74 69 76 65 20 4F 66 66 69 63 65 72 04 00 00
- 31 30 38 30 15 00 00 4C 65 69 74 65 72 20 41 6B
- 74 69 65 6E 72 65 67 69 73 74 65 72 04 00 00 31
- 30 38 31 02 00 00 46 4D 04 00 00 31 30 38 32 07
- 00 00 41 63 74 75 61 72 79 02 00 00 53 46 04 00
- 00 31 30 39 37 12 00 00 48 65 61 64 20 44 69 76
- 69 73 69 6F 6E 61 6C 20 48 52 04 00 00 31 30 39
- 39 19 00 00 48 65 61 64 20 6F 66 20 47 72 6F 75
- 70 20 50 4D 20 43 61 73 75 61 6C 74 79 02 00 00
- 49 4C 04 00 00 31 31 31 37 13 00 00 41 75 73 73
- 65 6E 73 74 65 6C 6C 65 6E 6C 65 69 74 65 72 04
- 00 00 31 34 34 38 04 00 00 31 34 35 36 0D 00 00
- 41 64 6D 69 6E 69 73 74 72 61 74 6F 72 04 00 00
- 31 34 36 30 0E 00 00 53 61 63 68 62 65 61 72 62
- 65 69 74 65 72 04 00 00 31 34 36 36 02 00 00 47
- 52 04 00 00 31 34 37 36 19 00 00 53 65 6B 74 69
- 6F 6E 73 6C 2E 20 47 72 70 2E 20 52 65 70 6F 72
- 74 69 6E 67 03 00 00 43 48 46 04 00 00 31 34 38
- 34 02 00 00 53 55 04 00 00 31 34 39 30 12 00 00
- 50 6C 61 6E 65 72 2F 4B 6F 6F 72 64 69 6E 61 74
- 6F 72 04 00 00 31 34 39 39 11 00 00 4C 65 69 74
- 65 72 20 4F 70 65 72 61 74 69 6F 6E 73 04 00 00
- 31 35 30 37 04 00 00 31 35 32 35 16 00 00 53 79
- 73 74 65 6D 20 50 72 6F 7A 65 73 73 20 4D 61 6E
- 61 67 65 72 04 00 00 31 35 34 31 02 00 00 52 59
- 02 00 00 52 4D 04 00 00 31 35 35 30 19 00 00 48
- 65 61 64 20 6F 66 20 52 69 73 6B 20 4D 67 74 20
- 53 65 72 76 69 63 65 73 02 00 00 54 43 04 00 00
- 31 35 35 32 04 00 00 31 35 37 32 12 00 00 55 73
- 65 72 20 41 64 6D 69 6E 69 73 74 72 61 74 6F 72
- 02 00 00 46 41 04 00 00 31 35 37 34 16 00 00 53
- 61 63 68 62 65 61 72 62 65 69 74 65 72 69 6E 20
- 4B 61 73 73 65 04 00 00 31 35 39 39 04 00 00 31
- 36 31 31 04 00 00 31 36 32 32 18 00 00 4D 65 6D
- 62 65 72 20 6F 66 20 4C 26 48 20 45 78 65 63 2E
- 42 6F 61 72 64 02 00 00 44 4D 04 00 00 31 36 32
- 33 12 00 00 47 72 6C 2E 20 44 72 75 63 6B 76 6F
- 72 73 74 75 66 65 02 00 00 49 4F 04 00 00 31 36
- 36 39 17 00 00 4B 6F 6E 7A 65 72 6E 2D 49 6E 66
- 6F 72 6D 2E 20 45 69 6E 6B 61 75 66 02 00 00 47
- 41 04 00 00 31 36 37 30 04 00 00 31 36 38 35 14
- 00 00 47 72 75 70 70 65 6E 6C 65 69 74 65 72 69
- 6E 20 46 69 62 75 04 00 00 31 37 30 32 04 00 00
- 31 37 30 39 04 00 00 31 37 32 35 14 00 00 46 61
- 63 68 73 70 65 7A 69 61 6C 69 73 74 20 52 65 74
- 72 6F 03 00 00 41 52 53 04 00 00 31 37 33 36 19
- 00 00 4D 61 6E 61 67 65 72 20 54 72 61 69 6E 69
- 6E 67 26 44 65 76 65 6C 6F 70 6D 04 00 00 31 37
- 34 39 0F 00 00 50 72 6F 6A 65 63 74 20 4D 61 6E
- 61 67 65 72 04 00 00 31 37 35 39 04 00 00 31 37
- 37 32 17 00 00 4F 70 65 72 61 74 6F 72 20 4B 6F
- 70 69 65 72 7A 65 6E 74 72 61 6C 65 04 00 00 31
- 37 38 38 04 00 00 31 38 30 32 02 00 00 43 4C 04
- 00 00 31 38 30 33 11 00 00 54 65 61 6D 20 4C 65
- 61 64 65 72 20 4B 56 2F 55 56 04 00 00 31 38 33
- 38 0D 00 00 50 72 6F 6A 65 6B 74 6C 65 69 74 65
- 72 02 00 00 49 52 04 00 00 31 38 35 36 04 00 00
- 31 38 36 37 13 00 00 53 61 63 68 62 65 61 72 62
- 65 69 74 65 72 69 6E 20 50 56 04 00 00 31 38 36
- 38 19 00 00 54 65 61 6D 6C 65 69 74 65 72 20 47
- 65 62 E4 75 64 65 74 65 63 68 6E 69 6B 04 00 00
- 31 38 39 31 18 00 00 42 65 72 65 69 63 68 73 6C
- 65 69 74 65 72 20 52 65 70 6F 72 74 69 6E 67 02
- 00 00 4C 43 04 00 00 31 39 30 30 12 00 00 53 65
- 6E 2E 20 4C 65 67 61 6C 20 43 6F 75 6E 73 65 6C
- 04 00 00 31 39 30 34 04 00 00 31 39 30 35 0D 00
- 00 52 61 75 6D 70 66 6C 65 67 65 72 69 6E 04 00
- 00 31 39 32 34 04 00 00 31 39 33 36 0A 00 00 49
- 6E 73 74 72 75 63 74 6F 72 04 00 00 31 39 33 39
- 19 00 00 4D 61 6E 61 67 65 72 20 54 72 61 69 6E
- 69 6E 67 20 43 6F 6E 63 65 70 74 73 01 00 00 57
- 02 00 00 50 49 04 00 00 31 39 34 32 11 00 00 50
- 6F 72 74 66 6F 6C 69 6F 20 4D 61 6E 61 67 65 72
- 04 00 00 31 39 35 31 0C 00 00 43 61 73 68 20 4D
- 61 6E 61 67 65 72 04 00 00 31 39 35 34 04 00 00
- 31 39 36 36 04 00 00 31 39 38 32 13 00 00 50 72
- 6F 64 75 63 74 73 2F 47 75 69 64 65 6C 69 6E 65
- 73 04 00 00 31 39 39 30 04 00 00 31 39 39 36 04
- 00 00 32 30 30 36 11 00 00 45 78 70 65 72 74 65
- 20 4B 61 74 61 6B 75 6D 75 6C 04 00 00 32 30 33
- 32 17 00 00 54 65 61 6D 6C 65 69 74 65 72 20 42
- 75 63 68 62 69 6E 64 65 72 65 69 04 00 00 32 30
- 33 34 16 00 00 50 72 6F 6A 65 6B 74 6C 65 69 74
- 65 72 20 46 61 63 68 61 62 74 2E 02 00 00 43 43
- 19 00 00 48 65 61 64 20 4D 65 64 69 61 20 43 6F
- 6D 6D 75 6E 69 63 61 74 69 6F 6E 73 04 00 00 32
- 30 36 30 02 00 00 52 58 02 00 00 41 4C 04 00 00
- 32 30 36 31 18 00 00 48 65 61 64 20 6F 66 20 43
- 49 52 4D 26 52 65 69 6E 2E 20 53 75 70 70 2E 04
- 00 00 32 30 36 33 04 00 00 32 30 36 37 19 00 00
- 4C 65 69 74 65 72 20 42 65 74 72 69 65 62 73 6C
- 69 65 67 65 6E 73 63 68 2E 02 00 00 49 58 04 00
- 00 32 30 37 31 04 00 00 32 30 37 37 15 00 00 49
- 6E 66 6F 72 6D 61 74 69 6B 20 43 6F 6E 73 75 6C
- 74 61 6E 74 04 00 00 32 30 38 30 13 00 00 53 65
- 63 72 65 74 61 72 79 20 44 69 76 2E 20 48 65 61
- 64 03 00 00 43 41 44 02 00 00 44 4F 04 00 00 32
- 30 38 32 19 00 00 48 65 61 64 20 44 69 73 63 6F
- 6E 74 69 6E 75 65 64 20 4F 70 65 72 61 74 2E 04
- 00 00 32 30 38 37 04 00 00 32 30 39 31 04 00 00
- 32 31 31 32 04 00 00 32 31 33 38 17 00 00 53 65
- 6E 69 6F 72 20 42 75 73 69 6E 65 73 73 20 41 6E
- 61 6C 79 73 74 04 00 00 32 31 34 33 04 00 00 32
- 31 34 39 17 00 00 52 65 67 69 6F 6E 61 6C 20 4D
- 61 6E 61 67 65 72 20 4C 26 48 20 4C 54 04 00 00
- 32 31 39 39 0E 00 00 43 6C 69 65 6E 74 20 4D 61
- 6E 61 67 65 72 04 00 00 32 32 31 31 18 00 00 4C
- 65 69 74 65 72 20 43 75 73 74 6F 6D 65 72 20 53
- 65 72 76 69 63 65 73 04 00 00 32 32 31 34 04 00
- 00 32 32 32 30 19 00 00 48 52 2D 4D 49 53 2D 26
- 20 50 34 30 30 2D 41 70 70 6C 69 63 61 74 69 6F
- 6E 04 00 00 32 32 32 37 13 00 00 54 65 63 68 6E
- 69 63 61 6C 20 53 75 70 70 6F 72 74 65 72 04 00
- 00 32 32 35 30 19 00 00 54 72 61 69 6E 69 6E 67
- 2D 20 26 20 50 72 6F 6A 65 63 74 6D 61 6E 61 67
- 2E 04 00 00 32 32 35 31 19 00 00 44 65 70 2E 48
- 65 61 64 20 6F 66 20 47 72 6F 75 70 20 50 4D 20
- 50 72 6F 70 04 00 00 32 32 35 33 13 00 00 47 72
- 6C 2E 20 47 6C 6F 62 61 6C 20 53 75 70 70 6F 72
- 74 04 00 00 32 32 39 35 11 00 00 54 4C 20 48 61
- 75 73 77 69 72 74 73 63 68 61 66 74 04 00 00 32
- 32 39 36 04 00 00 32 33 30 32 04 00 00 32 33 31
- 38 0D 00 00 52 69 73 69 6B 6F 65 78 70 65 72 74
- 65 04 00 00 32 33 32 33 04 00 00 32 33 32 35 04
- 00 00 32 33 33 32 04 00 00 32 33 34 31 19 00 00
- 41 63 63 6F 75 6E 74 61 6E 74 20 53 70 65 63 69
- 61 6C 20 42 75 73 69 6E 2E 04 00 00 32 33 37 37
- 11 00 00 50 72 6F 6A 65 6B 74 6C 65 69 74 65 72
- 20 4D 49 50 04 00 00 32 33 38 36 19 00 00 53 65
- 6E 2E 43 6C 61 69 6D 73 20 49 6E 66 2E 53 70 65
- 63 69 61 6C 69 73 74 04 00 00 32 34 32 37 16 00
- 00 47 72 6C 2E 20 49 6E 73 74 61 6C 6C 2E 20 53
- 65 72 76 69 63 65 73 04 00 00 32 34 33 36 17 00
- 00 48 65 61 64 20 6F 66 20 43 6C 61 69 6D 73 20
- 53 65 72 76 69 63 65 73 04 00 00 32 34 35 33 16
- 00 00 42 4C 20 47 72 6F 75 70 20 44 61 74 61 20
- 53 65 72 76 69 63 65 73 04 00 00 32 34 35 36 04
- 00 00 32 34 36 39 19 00 00 47 72 61 66 69 73 63
- 68 65 72 20 53 61 63 68 62 65 61 72 62 65 69 74
- 65 72 04 00 00 32 34 38 31 16 00 00 55 57 2F 50
- 72 6F 64 75 63 74 20 63 6F 6E 74 72 6F 6C 6C 69
- 6E 67 02 00 00 49 55 04 00 00 32 34 39 39 14 00
- 00 41 70 70 6C 69 63 61 74 69 6F 6E 20 45 6E 67
- 69 6E 65 65 72 04 00 00 32 35 32 32 04 00 00 32
- 35 34 30 0B 00 00 55 6E 64 65 72 77 72 69 74 65
- 72 04 00 00 32 35 34 35 04 00 00 32 35 36 34 04
- 00 00 32 35 36 35 04 00 00 32 35 36 36 04 00 00
- 32 35 37 33 04 00 00 32 35 38 30 15 00 00 46 61
- 63 68 72 65 66 65 72 65 6E 74 20 43 61 73 75 61
- 6C 74 79 02 00 00 43 42 04 00 00 32 35 38 31 10
- 00 00 49 6E 74 2E 20 41 73 73 69 67 6E 6D 65 6E
- 74 73 04 00 00 32 35 38 39 02 00 00 54 55 04 00
- 00 32 36 30 38 04 00 00 32 36 31 30 17 00 00 4C
- 65 69 74 65 72 69 6E 20 41 64 6D 69 6E 69 73 74
- 72 61 74 69 6F 6E 04 00 00 32 36 33 32 04 00 00
- 32 36 34 34 19 00 00 53 74 76 2E 20 4C 65 69 74
- 65 72 20 41 6B 74 69 65 6E 72 65 67 69 73 74 2E
- 04 00 00 32 36 34 35 04 00 00 32 36 35 33 19 00
- 00 47 72 75 70 70 65 6E 6C 65 69 74 65 72 20 52
- 65 69 73 65 64 69 65 6E 73 74 04 00 00 32 36 37
- 31 18 00 00 50 72 6F 6A 65 6B 74 6C 65 69 74 65
- 72 69 6E 20                                    
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord2CR3 b/trunk/test-data/spreadsheet/BigSSTRecord2CR3
deleted file mode 100644
index 461dfae..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2CR3
+++ /dev/null
@@ -1,515 +0,0 @@
-             3C 00 1C 20 00 46 61 63 68 61 62 74
- 2E 04 00 00 32 36 37 33 12 00 00 53 65 72 76 69
- 63 65 6D 69 74 61 72 62 65 69 74 65 72 04 00 00
- 32 36 37 34 04 00 00 32 36 38 34 04 00 00 32 37
- 31 31 18 00 00 4C 65 69 74 65 72 20 55 73 65 72
- 20 54 72 61 69 6E 2E 20 53 65 72 76 2E 04 00 00
- 32 37 31 37 0E 00 00 54 65 6C 65 6F 70 65 72 61
- 74 72 69 63 65 04 00 00 32 37 31 39 04 00 00 32
- 37 33 31 19 00 00 48 65 61 64 20 6F 66 20 52 65
- 69 6E 73 75 72 61 6E 63 65 20 54 6F 6F 6C 73 04
- 00 00 32 37 33 32 12 00 00 50 72 6F 64 75 63 74
- 20 43 6F 6E 74 72 6F 6C 6C 65 72 04 00 00 32 37
- 34 33 04 00 00 32 37 35 35 12 00 00 4F 70 65 72
- 61 74 69 6F 6E 73 20 4F 66 66 69 63 65 72 04 00
- 00 32 37 36 31 18 00 00 47 72 6C 2E 20 53 79 73
- 74 65 6D 20 41 64 6D 69 6E 69 73 74 72 61 74 2E
- 02 00 00 52 4B 04 00 00 32 37 36 38 16 00 00 48
- 65 61 64 20 6F 66 20 43 6F 6D 6D 75 6E 69 63 61
- 74 69 6F 6E 73 04 00 00 32 37 36 39 04 00 00 32
- 37 37 32 04 00 00 32 37 37 37 04 00 00 32 37 38
- 33 0D 00 00 47 4C 2D 53 65 6B 72 65 74 E4 72 69
- 6E 04 00 00 32 37 38 34 04 00 00 32 37 38 37 19
- 00 00 47 72 6C 2E 20 4E 57 20 52 65 73 65 61 72
- 63 68 2F 44 65 76 65 6C 6F 70 6D 04 00 00 32 37
- 38 38 04 00 00 32 37 38 39 13 00 00 52 65 69 6E
- 73 75 72 61 6E 63 65 20 41 6E 61 6C 79 73 74 04
- 00 00 32 38 30 37 11 00 00 44 65 70 75 74 79 20
- 48 65 61 64 20 6F 66 20 43 41 04 00 00 32 38 31
- 37 18 00 00 46 69 6E 2E 20 4D 61 72 6B 65 74 20
- 52 69 73 6B 20 41 6E 61 6C 79 73 74 04 00 00 32
- 38 31 38 19 00 00 44 65 70 2E 20 48 65 61 64 20
- 54 65 63 68 6E 2E 20 54 72 61 69 6E 69 6E 67 04
- 00 00 32 38 32 36 02 00 00 50 4F 04 00 00 32 38
- 32 39 18 00 00 50 72 6F 6A 65 63 74 20 4D 67 6D
- 74 2E 20 43 6F 6E 73 75 6C 74 61 6E 74 04 00 00
- 32 38 33 35 0C 00 00 52 E9 63 65 70 74 69 6F 6E
- 69 73 74 04 00 00 32 38 33 36 04 00 00 32 38 33
- 37 13 00 00 53 74 76 2E 20 53 65 6B 74 69 6F 6E
- 73 6C 65 69 74 65 72 04 00 00 32 38 34 37 14 00
- 00 54 65 63 68 6E 69 63 61 6C 20 41 63 63 6F 75
- 6E 74 61 6E 74 02 00 00 52 55 04 00 00 32 38 35
- 32 0E 00 00 43 68 69 65 66 20 45 6E 67 69 6E 65
- 65 72 04 00 00 32 38 35 34 19 00 00 48 65 61 64
- 20 6F 66 20 47 72 6F 75 70 20 50 4D 20 45 6E 67
- 69 6E 65 65 2E 04 00 00 32 38 36 33 19 00 00 54
- 4C 20 48 61 75 73 2D 20 26 20 42 65 74 72 69 65
- 62 73 64 69 65 6E 73 74 04 00 00 32 38 39 32 0C
- 00 00 41 56 2D 54 65 63 68 6E 69 6B 65 72 04 00
- 00 32 38 39 39 0F 00 00 42 65 74 72 69 65 62 73
- 67 E4 72 74 6E 65 72 04 00 00 32 39 32 35 19 00
- 00 48 65 61 64 20 6F 66 20 4C 65 67 61 6C 26 43
- 6C 61 69 6D 73 20 53 65 72 76 02 00 00 43 58 04
- 00 00 32 39 32 39 0E 00 00 48 65 61 64 20 6F 66
- 20 45 76 65 6E 74 73 04 00 00 32 39 33 31 0A 00
- 00 43 6F 6E 74 72 6F 6C 6C 65 72 04 00 00 32 39
- 33 32 04 00 00 32 39 33 33 04 00 00 32 39 34 30
- 14 00 00 50 4C 20 52 56 2D 54 65 63 68 6E 2E 20
- 53 79 73 74 65 6D 65 04 00 00 32 39 34 31 0C 00
- 00 4C 65 69 74 65 72 20 4B 61 73 73 65 04 00 00
- 32 39 35 38 02 00 00 48 52 04 00 00 32 39 36 35
- 19 00 00 48 75 6D 61 6E 20 52 65 73 6F 75 72 63
- 65 73 20 41 73 73 69 73 74 61 6E 74 04 00 00 32
- 39 36 38 19 00 00 48 65 61 64 20 4D 61 72 6B 65
- 74 69 6E 67 20 52 FC 73 63 68 6C 69 6B 6F 6E 04
- 00 00 32 39 37 33 14 00 00 43 6F 75 72 73 65 20
- 41 64 6D 69 6E 69 73 74 72 61 74 6F 72 04 00 00
- 32 39 38 31 13 00 00 4D 61 72 6B 65 74 69 6E 67
- 20 41 73 73 69 73 74 61 6E 74 02 00 00 44 43 04
- 00 00 32 39 38 34 0E 00 00 42 65 72 65 69 63 68
- 73 6C 65 69 74 65 72 04 00 00 32 39 38 38 15 00
- 00 53 65 6E 69 6F 72 20 52 65 69 6E 73 2E 20 41
- 6E 61 6C 79 73 74 04 00 00 32 39 39 37 12 00 00
- 50 72 6F 6A 65 63 74 20 4C 65 61 64 65 72 20 46
- 53 41 04 00 00 32 39 39 38 04 00 00 33 30 30 31
- 04 00 00 33 30 31 32 0E 00 00 54 65 61 6D 20 4C
- 65 61 64 65 72 20 46 54 01 00 00 42 04 00 00 33
- 30 35 32 15 00 00 47 72 6C 2E 20 43 6F 72 70 6F
- 72 61 74 65 20 44 65 73 69 67 6E 04 00 00 33 30
- 35 38 17 00 00 55 57 20 46 61 63 75 6C 74 61 74
- 69 76 65 20 50 72 6F 70 65 72 74 79 04 00 00 33
- 30 36 32 02 00 00 46 43 04 00 00 33 30 37 37 0B
- 00 00 48 65 61 64 20 6F 66 20 43 4F 43 04 00 00
- 33 30 39 31 04 00 00 33 31 30 34 0F 00 00 47 65
- 73 63 68 E4 66 74 73 6C 65 69 74 65 72 04 00 00
- 33 31 31 35 04 00 00 33 31 33 34 04 00 00 33 31
- 33 37 19 00 00 53 65 6E 2E 41 63 63 6F 75 6E 74
- 61 6E 74 20 47 72 6F 75 70 20 52 65 70 2E 04 00
- 00 33 31 33 38 10 00 00 53 65 6B 74 69 6F 6E 73
- 6C 65 69 74 65 72 69 6E 04 00 00 33 31 34 37 04
- 00 00 33 31 35 35 04 00 00 33 31 35 36 19 00 00
- 48 65 61 64 20 6F 66 20 55 57 2F 50 72 6F 64 75
- 63 74 20 43 6F 6E 74 72 2E 04 00 00 33 31 37 34
- 04 00 00 33 31 38 37 04 00 00 33 31 39 37 02 00
- 00 49 42 04 00 00 33 32 32 34 02 00 00 49 46 04
- 00 00 33 32 32 36 17 00 00 49 6E 66 6F 72 6D 61
- 74 69 6F 6E 73 2D 53 70 65 7A 69 61 6C 69 73 74
- 04 00 00 33 32 32 38 12 00 00 50 6C 61 6E 6E 65
- 72 2F 43 6F 6E 74 72 6F 6C 6C 65 72 04 00 00 33
- 32 33 37 10 00 00 41 64 6D 69 6E 2E 20 41 73 73
- 69 73 74 61 6E 74 04 00 00 33 32 35 39 0F 00 00
- 43 6F 6F 72 64 69 6E 61 74 6F 72 20 42 43 4D 04
- 00 00 33 32 36 30 18 00 00 50 72 6F 70 65 72 74
- 79 20 50 72 6F 64 75 63 74 20 4D 61 6E 61 67 65
- 72 04 00 00 33 32 36 37 0B 00 00 43 4F 43 20 4D
- 61 6E 61 67 65 72 04 00 00 33 32 39 37 16 00 00
- 4C 65 69 74 65 72 20 49 6E 66 6F 72 6D 61 74 69
- 6B 20 53 74 61 62 04 00 00 33 33 30 34 19 00 00
- 41 73 73 69 73 74 61 6E 74 20 41 63 63 6F 75 6E
- 74 20 4D 61 6E 61 67 65 72 04 00 00 33 33 30 36
- 13 00 00 47 72 6C 2E 20 55 73 65 72 20 48 65 6C
- 70 20 44 65 73 6B 04 00 00 33 33 31 36 04 00 00
- 33 33 32 33 04 00 00 33 33 32 36 04 00 00 33 33
- 32 37 0F 00 00 41 63 63 6F 75 6E 74 20 4D 61 6E
- 61 67 65 72 04 00 00 33 33 32 38 04 00 00 33 33
- 33 33 01 00 00 45 04 00 00 33 33 34 32 18 00 00
- 48 65 61 64 20 6F 66 20 50 72 6F 64 2E 2F 47 75
- 69 64 65 6C 69 6E 65 73 04 00 00 33 33 34 39 04
- 00 00 33 33 35 30 04 00 00 33 33 35 31 04 00 00
- 33 33 35 34 14 00 00 45 69 6E 72 69 63 68 74 75
- 6E 67 73 70 6C 61 6E 65 72 69 6E 04 00 00 33 33
- 36 30 02 00 00 42 49 04 00 00 33 33 36 32 04 00
- 00 33 33 37 36 04 00 00 33 33 37 39 04 00 00 33
- 33 38 31 04 00 00 33 34 32 31 14 00 00 48 65 61
- 64 20 6F 66 20 50 72 69 63 69 6E 67 2F 44 61 74
- 61 04 00 00 33 34 36 34 19 00 00 48 65 61 64 20
- 47 72 70 2E 20 4D 61 72 6B 65 74 43 6F 6D 6D 75
- 6E 69 63 2E 04 00 00 33 34 36 38 04 00 00 33 34
- 36 39 19 00 00 42 4C 20 44 61 74 61 20 43 6F 6D
- 6D 75 6E 69 63 2E 20 53 79 73 74 65 6D 73 04 00
- 00 33 34 37 31 16 00 00 4C 69 6E 67 65 72 69 65
- 6D 69 74 61 72 62 65 69 74 65 72 2F 69 6E 04 00
- 00 33 34 38 35 16 00 00 53 61 63 68 62 65 61 72
- 62 2E 20 50 6F 73 74 64 69 65 6E 73 74 65 04 00
- 00 33 34 38 38 11 00 00 43 6C 61 69 6D 73 20 4D
- 61 6E 61 67 65 6D 65 6E 74 04 00 00 33 34 39 30
- 17 00 00 54 65 63 68 6E 69 73 63 68 65 72 20 4D
- 69 74 61 72 62 65 69 74 65 72 04 00 00 33 34 39
- 31 0D 00 00 42 65 74 72 69 65 62 73 6D 61 6C 65
- 72 04 00 00 33 35 30 36 04 00 00 33 35 30 37 04
- 00 00 33 35 31 31 17 00 00 43 68 69 65 66 20 45
- 78 65 63 75 74 69 76 65 20 4F 66 66 69 63 65 72
- 04 00 00 33 35 32 30 04 00 00 33 35 32 38 11 00
- 00 42 65 74 72 69 65 62 73 74 65 63 68 6E 69 6B
- 65 72 04 00 00 33 35 33 30 04 00 00 33 35 33 32
- 02 00 00 49 41 04 00 00 33 35 34 30 0E 00 00 53
- 65 6E 69 6F 72 20 41 75 64 69 74 6F 72 04 00 00
- 33 35 34 33 12 00 00 50 72 6F 6A 65 6B 74 6D 69
- 74 61 72 62 65 69 74 65 72 04 00 00 33 35 34 36
- 05 00 00 38 30 34 33 30 20 00 00 52 65 73 65 61
- 72 63 68 20 49 6E 66 6F 72 6D 61 74 69 6F 6E 20
- 53 70 65 63 69 61 6C 69 73 74 2C 05 00 00 31 30
- 38 34 35 1E 00 00 47 72 6F 75 70 20 43 6C 61 69
- 6D 73 20 61 6E 64 20 43 6F 6E 74 72 61 63 74 20
- 4D 61 6E 61 05 00 00 31 31 31 34 33 05 00 00 38
- 31 38 31 39 12 00 00 52 65 73 65 61 72 63 68 20
- 41 73 73 69 73 74 61 6E 74 05 00 00 38 30 32 33
- 36 17 00 00 49 6E 66 6F 72 6D 61 74 69 6F 6E 20
- 53 70 65 63 69 61 6C 69 73 74 2C 05 00 00 31 32
- 34 31 37 03 00 00 33 35 33 02 00 00 53 47 09 00
- 00 53 69 6E 67 61 70 6F 72 65 03 00 00 31 35 30
- 15 00 00 47 65 6E 65 72 61 6C 20 41 64 6D 69 6E
- 69 73 74 72 61 74 6F 72 03 00 00 31 35 31 09 00
- 00 4D 65 73 73 65 6E 67 65 72 02 00 00 41 4F 02
- 00 00 54 52 02 00 00 37 33 19 00 00 4D 67 72 20
- 54 72 61 69 6E 2E 20 26 20 43 6C 69 65 6E 74 20
- 53 65 72 76 2E 02 00 00 41 43 02 00 00 4D 41 04
- 00 00 31 37 39 31 12 00 00 4D 61 72 69 6E 65 20
- 55 6E 64 65 72 77 72 69 74 65 72 02 00 00 54 57
- 06 00 00 54 61 69 70 65 69 03 00 00 32 32 35 06
- 00 00 44 72 69 76 65 72 02 00 00 4D 59 0C 00 00
- 4B 75 61 6C 61 20 4C 75 6D 70 75 72 03 00 00 33
- 34 36 12 00 00 41 63 63 6F 75 6E 74 73 20 45 78
- 65 63 75 74 69 76 65 02 00 00 41 4B 04 00 00 38
- 34 38 37 02 00 00 50 48 06 00 00 4D 61 6E 69 6C
- 61 03 00 00 33 36 39 17 00 00 45 6E 67 69 6E 65
- 65 72 69 6E 67 20 55 6E 64 65 72 77 72 69 74 65
- 72 04 00 00 39 33 37 39 18 00 00 41 63 74 75 61
- 72 2E 20 26 20 50 72 6F 64 2E 20 43 6F 6E 74 72
- 6F 6C 2E 04 00 00 36 30 35 31 05 00 00 31 32 31
- 39 37 19 00 00 53 65 6E 69 6F 72 20 45 6E 65 72
- 67 79 20 55 6E 64 65 72 77 72 69 74 65 72 04 00
- 00 36 33 36 33 0E 00 00 45 6E 67 69 6E 65 65 72
- 69 6E 67 20 55 57 05 00 00 31 30 35 31 35 15 00
- 00 50 72 6F 70 65 72 74 79 20 55 6E 74 65 72 77
- 72 69 74 69 6E 67 04 00 00 38 35 39 30 17 00 00
- 4F 70 65 72 61 74 69 6F 6E 61 6C 20 43 6F 6E 74
- 72 6F 6C 6C 69 6E 67 02 00 00 45 54 04 00 00 32
- 38 31 32 03 00 00 34 38 39 14 00 00 50 72 6F 70
- 65 72 74 79 20 55 6E 64 65 72 77 72 69 74 65 72
- 04 00 00 33 38 38 30 04 00 00 33 32 30 32 18 00
- 00 48 65 61 64 20 44 43 45 4F 2F 43 6F 6D 6D 75
- 6E 69 63 61 74 69 6F 6E 73 04 00 00 35 37 35 33
- 19 00 00 43 61 73 75 61 6C 74 79 20 55 6E 64 65
- 72 77 72 69 74 69 6E 67 20 4D 67 72 04 00 00 36
- 35 31 32 17 00 00 44 69 76 69 73 69 6F 6E 61 6C
- 20 43 6F 73 74 20 4D 61 6E 61 67 65 72 04 00 00
- 31 38 38 33 18 00 00 54 72 61 69 6E 2E 20 26 20
- 43 6C 69 65 6E 74 20 53 65 72 76 69 63 65 73 02
- 00 00 44 50 04 00 00 37 35 39 30 13 00 00 44 69
- 76 69 73 69 6F 6E 61 6C 20 50 6C 61 6E 6E 69 6E
- 67 05 00 00 31 31 38 36 37 14 00 00 43 61 73 75
- 61 6C 74 79 20 55 6E 64 65 72 77 72 69 74 65 72
- 04 00 00 33 39 31 39 0D 00 00 44 69 76 69 73 69
- 6F 6E 61 6C 20 49 54 03 00 00 33 37 30 10 00 00
- 4D 65 73 73 65 6E 67 65 72 2F 44 72 69 76 65 72
- 03 00 00 35 37 31 04 00 00 38 36 31 34 19 00 00
- 4D 67 72 20 41 63 74 2E 20 26 20 50 72 6F 64 2E
- 20 43 6F 6E 74 72 6F 6C 2E 03 00 00 33 37 31 18
- 00 00 41 64 6D 69 6E 69 73 74 72 61 74 69 76 65
- 20 41 73 73 69 73 74 61 6E 74 03 00 00 34 39 36
- 15 00 00 44 65 70 75 74 79 20 43 6C 69 65 6E 74
- 20 4D 61 6E 61 67 65 72 03 00 00 32 35 37 14 00
- 00 54 72 65 61 74 79 20 41 64 6D 69 6E 69 73 74
- 72 61 74 6F 72 03 00 00 31 35 35 1D 00 00 54 65
- 63 68 6E 2E 20 41 63 63 6F 75 6E 74 73 20 41 64
- 6D 69 6E 69 73 74 72 61 74 6F 72 02 00 00 54 48
- 07 00 00 42 61 6E 67 6B 6F 6B 0D 00 00 52 69 73
- 6B 20 45 6E 67 69 6E 65 65 72 03 00 00 35 36 36
- 14 00 00 46 69 6E 61 6E 63 69 61 6C 20 43 6F 6E
- 74 72 6F 6C 6C 65 72 03 00 00 34 39 39 1D 00 00
- 43 6C 69 65 6E 74 20 4D 67 6D 74 26 46 69 6E 61
- 6E 63 69 61 6C 20 41 64 69 73 6F 72 79 03 00 00
- 33 30 39 14 00 00 53 65 6E 69 6F 72 20 52 69 73
- 6B 20 45 6E 67 69 6E 65 65 72 05 00 00 31 30 32
- 31 30 02 00 00 43 4E 07 00 00 42 65 69 6A 69 6E
- 67 03 00 00 31 35 37 1D 00 00 53 65 63 72 65 74
- 61 72 79 20 74 6F 20 43 68 69 65 66 20 52 65 70
- 72 65 73 65 6E 74 2E 03 00 00 32 32 39 03 00 00
- 35 39 35 14 00 00 43 68 69 65 66 20 52 65 70 72
- 65 73 65 6E 74 61 74 69 76 65 03 00 00 32 32 38
- 12 00 00 54 72 65 61 74 79 20 55 6E 64 65 72 77
- 72 69 74 65 72 03 00 00 32 39 34 0E 00 00 43 6C
- 61 69 6D 73 20 4D 61 6E 61 67 65 72 03 00 00 35
- 33 36 10 00 00 48 52 20 41 64 6D 69 6E 69 73 74
- 72 61 74 6F 72 14 00 00 4F 66 66 69 63 65 20 41
- 64 6D 69 6E 69 73 74 72 61 74 6F 72 03 00 00 35
- 37 32 03 00 00 31 35 39 1E 00 00 41 73 73 6F 63
- 69 61 74 65 2C 20 43 6F 72 70 6F 72 61 74 65 20
- 44 65 76 65 6C 6F 70 6D 2E 03 00 00 35 31 35 03
- 00 00 33 34 38 1C 00 00 41 73 73 69 73 74 61 6E
- 74 20 74 6F 20 43 6C 69 65 6E 74 20 4D 67 74 20
- 54 65 61 6D 03 00 00 31 36 31 1A 00 00 52 65 67
- 69 6F 6E 61 6C 20 4D 61 72 69 6E 65 20 55 57 20
- 4D 61 6E 61 67 65 72 03 00 00 31 36 32 03 00 00
- 32 33 32 10 00 00 4F 66 66 69 63 65 20 41 73 73
- 69 73 74 61 6E 74 03 00 00 31 36 34 1A 00 00 43
- 6C 69 65 6E 74 20 43 6F 6F 72 64 69 6E 61 74 69
- 6F 6E 20 41 64 6D 69 6E 2E 03 00 00 32 33 33 19
- 00 00 41 73 73 74 2E 20 4D 61 6E 61 67 65 72 20
- 45 6E 67 69 6E 65 65 72 69 6E 67 04 00 00 38 35
- 35 35 03 00 00 31 36 35 1B 00 00 43 6C 69 65 6E
- 74 20 52 65 6C 61 74 69 6F 6E 73 68 69 70 20 4D
- 61 6E 61 67 65 72 03 00 00 31 36 37 1C 00 00 43
- 6C 69 65 6E 74 20 53 75 70 70 6F 72 74 20 41 64
- 6D 69 6E 69 73 74 72 61 74 6F 72 03 00 00 31 36
- 36 19 00 00 46 69 6E 61 6E 63 69 61 6C 20 41 63
- 63 6F 75 6E 74 73 20 41 64 6D 69 6E 2E 03 00 00
- 32 39 35 14 00 00 41 73 73 69 73 74 61 6E 74 20
- 41 63 63 6F 75 6E 74 61 6E 74 03 00 00 32 39 37
- 0F 00 00 45 44 50 20 43 6F 6F 72 64 69 6E 61 74
- 6F 72 08 00 00 53 68 61 6E 67 68 61 69 03 00 00
- 31 34 34 1A 00 00 52 65 70 72 65 73 65 6E 74 61
- 74 69 76 65 20 45 6E 67 69 6E 65 65 72 69 6E 67
- 03 00 00 33 37 33 1D 00 00 52 69 73 6B 20 45 6E
- 67 69 6E 65 65 72 20 2F 49 54 20 43 6F 6F 72 64
- 69 6E 61 74 6F 72 03 00 00 33 37 34 14 00 00 41
- 63 63 6F 75 6E 74 69 6E 67 20 41 73 73 69 73 74
- 61 6E 74 03 00 00 35 34 33 04 00 00 38 36 30 33
- 03 00 00 31 32 35 16 00 00 52 65 69 6E 73 75 72
- 61 6E 63 65 20 41 63 63 6F 75 6E 74 61 6E 74 02
- 00 00 45 4E 04 00 00 37 36 33 39 04 00 00 36 36
- 38 34 18 00 00 4D 67 72 20 4F 70 65 72 61 74 69
- 6F 6E 61 6C 20 43 6F 6E 74 72 6F 6C 2E 04 00 00
- 32 34 33 33 04 00 00 31 38 33 34 19 00 00 4C 6F
- 63 61 6C 20 4F 66 66 69 63 65 73 20 43 6F 6F 72
- 64 69 6E 61 74 6F 72 04 00 00 38 36 35 36 15 00
- 00 53 74 72 61 74 65 67 69 63 20 43 6F 6E 74 72
- 6F 6C 6C 69 6E 67 02 00 00 41 45 05 00 00 31 32
- 35 34 36 04 00 00 32 31 33 34 05 00 00 31 30 38
- 39 35 04 00 00 38 35 30 33 05 00 00 31 31 37 36
- 32 1B 00 00 48 65 61 64 20 46 61 63 2E 50 72 6F
- 70 2E 47 72 65 61 74 65 72 20 43 68 69 6E 61 03
- 00 00 35 38 37 1C 00 00 41 73 73 74 2E 4D 67 72
- 2E 20 54 6F 20 43 6C 69 65 6E 74 20 4D 67 74 20
- 54 65 61 6D 03 00 00 35 36 37 17 00 00 48 65 61
- 64 20 6F 66 20 52 69 73 6B 20 4D 61 6E 61 67 65
- 6D 65 6E 74 04 00 00 38 35 39 32 03 00 00 31 34
- 36 03 00 00 35 38 33 1D 00 00 52 65 70 72 65 73
- 65 6E 74 61 74 69 76 65 26 43 6C 69 65 6E 74 20
- 4D 61 6E 61 67 65 72 02 00 00 41 58 04 00 00 33
- 35 32 32 15 00 00 48 65 61 64 20 50 65 72 66 6F
- 72 6D 61 6E 63 65 20 54 65 61 6D 02 00 00 41 4A
- 05 00 00 31 31 32 31 37 0A 00 00 33 32 34 2C 20
- 54 6F 6B 79 6F 03 00 00 31 36 38 0E 00 00 52 65
- 70 72 65 73 65 6E 74 61 74 69 76 65 04 00 00 38
- 36 33 36 03 00 00 35 30 31 1C 00 00 41 73 73 6F
- 63 69 61 74 65 2C 20 43 6F 72 70 2E 20 44 65 76
- 65 6C 6F 70 6D 65 6E 74 04 00 00 35 39 32 39 04
- 00 00 38 35 39 31 04 00 00 35 38 35 39 04 00 00
- 35 38 30 39 05 00 00 31 32 35 34 38 15 00 00 43
- 61 73 75 61 6C 74 79 20 55 6E 64 65 72 77 72 69
- 74 69 6E 67 04 00 00 33 33 35 35 04 00 00 38 36
- 37 30 16 00 00 45 6E 67 69 6E 65 65 72 69 6E 67
- 20 55 57 20 4D 61 6E 61 67 65 72 04 00 00 37 32
- 32 36 04 00 00 35 34 38 31 13 00 00 42 55 53 20
- 50 72 6F 63 65 73 73 20 4D 61 6E 61 67 65 72 03
- 00 00 35 30 30 0D 00 00 43 6C 65 61 6E 69 6E 67
- 20 41 6D 61 68 03 00 00 33 35 30 03 00 00 33 30
- 33 10 00 00 43 6C 61 69 6D 73 20 41 73 73 69 73
- 74 61 6E 74 03 00 00 32 33 37 03 00 00 32 33 38
- 03 00 00 35 38 36 04 00 00 35 39 32 35 04 00 00
- 36 36 31 32 04 00 00 38 35 33 38 04 00 00 38 34
- 34 33 04 00 00 35 36 38 36 03 00 00 33 35 32 10
- 00 00 44 72 69 76 65 72 2F 4D 65 73 73 65 6E 67
- 65 72 04 00 00 36 37 35 32 12 00 00 4D 61 6E 61
- 67 65 72 20 4A 61 70 61 6E 20 44 65 73 6B 04 00
- 00 31 37 38 39 19 00 00 50 72 6F 70 65 72 74 79
- 20 55 6E 64 65 72 77 72 69 74 69 6E 67 20 4D 67
- 72 04 00 00 38 34 34 37 02 00 00 41 44 04 00 00
- 36 33 30 34 08 00 00 41 72 74 20 44 65 73 6B 04
- 00 00 31 39 30 32 04 00 00 36 30 37 35 03 00 00
- 33 32 30 16 00 00 52 65 63 65 70 74 69 6F 6E 69
- 73 74 2F 53 65 63 72 65 74 61 72 79 03 00 00 31
- 33 36 1A 00 00 48 65 61 64 20 4E 6F 6E 2D 4C 69
- 66 65 20 52 2F 49 20 53 65 72 76 69 63 65 73 03
- 00 00 31 33 39 1D 00 00 53 65 6E 69 6F 72 20 41
- 64 76 69 73 6F 72 20 4E 4C 20 52 49 20 53 65 72
- 76 69 63 65 73 03 00 00 31 33 38 10 00 00 4F 66
- 66 69 63 65 20 4D 67 6D 74 20 26 20 48 52 17 00
- 00 4E 4C 20 52 65 69 6E 73 75 72 61 6E 63 65 20
- 53 65 72 76 69 63 65 73 03 00 00 32 32 34 0F 00
- 00 47 65 6E 65 72 61 6C 20 4D 61 6E 61 67 65 72
- 03 00 00 31 37 38 1E 00 00 4D 67 6D 74 26 53 74
- 61 66 66 20 53 65 72 76 69 63 65 73 20 41 64 6D
- 69 6E 69 73 74 72 2E 16 00 00 41 63 63 6F 75 6E
- 74 73 20 41 64 6D 69 6E 69 73 74 72 61 74 6F 72
- 03 00 00 33 37 39 15 00 00 48 65 61 64 20 48 52
- 20 47 72 65 61 74 65 72 20 43 68 69 6E 61 04 00
- 00 32 35 36 30 03 00 00 31 38 31 14 00 00 48 65
- 61 64 20 6F 66 20 43 4D 20 49 6E 64 6F 6E 65 73
- 69 61 04 00 00 38 36 37 38 15 00 00 4D 61 6E 61
- 67 65 72 20 44 69 76 69 73 69 6F 6E 61 6C 20 49
- 54 04 00 00 34 31 32 32 03 00 00 33 33 31 02 00
- 00 49 4E 09 00 00 42 61 6E 67 61 6C 6F 72 65 03
- 00 00 35 37 33 13 00 00 54 65 61 6D 20 53 65 72
- 76 69 63 65 20 43 65 6E 74 65 72 04 00 00 35 39
- 30 31 04 00 00 38 35 32 36 03 00 00 35 38 32 17
- 00 00 48 65 61 64 20 6F 66 20 54 72 65 61 74 79
- 20 50 72 6F 70 65 72 74 79 03 00 00 35 30 33 03
- 00 00 33 31 31 03 00 00 35 32 38 03 00 00 33 38
- 35 19 00 00 45 6E 67 69 6E 65 65 72 69 6E 67 20
- 41 64 6D 69 6E 69 73 74 72 61 74 6F 72 03 00 00
- 33 31 33 1A 00 00 55 6E 64 65 72 77 72 69 74 69
- 6E 67 20 41 64 6D 69 6E 69 73 74 72 61 74 6F 72
- 03 00 00 35 37 30 17 00 00 53 65 6E 69 6F 72 20
- 55 2F 57 20 46 61 63 20 43 61 73 75 61 6C 74 79
- 17 00 00 46 61 63 75 6C 74 61 74 69 76 65 20 55
- 6E 64 65 72 77 72 69 74 65 72 03 00 00 33 31 35
- 1B 00 00 43 61 73 75 61 6C 74 79 20 54 72 65 61
- 74 79 20 55 6E 64 65 72 77 72 69 74 65 72 03 00
- 00 35 32 36 0A 00 00 48 52 20 4D 61 6E 61 67 65
- 72 03 00 00 31 38 33 03 00 00 35 37 38 03 00 00
- 33 35 34 07 00 00 4D 61 6E 61 67 65 72 03 00 00
- 32 33 39 03 00 00 35 35 36 18 00 00 53 65 6E 69
- 6F 72 20 55 57 2C 20 46 61 63 2E 20 50 72 6F 70
- 65 72 74 79 03 00 00 33 31 39 14 00 00 41 73 73
- 74 2E 20 45 6E 67 69 6E 65 65 72 69 6E 67 20 55
- 57 03 00 00 35 34 38 1A 00 00 54 72 61 69 6E 65
- 65 20 4D 61 72 69 6E 65 20 55 6E 64 65 72 77 72
- 69 74 65 72 03 00 00 33 35 35 03 00 00 31 38 38
- 15 00 00 49 54 20 53 75 70 70 6F 72 74 20 53 70
- 65 63 69 61 6C 69 73 74 03 00 00 31 39 30 03 00
- 00 32 34 30 19 00 00 46 61 63 2E 20 50 72 6F 70
- 65 72 74 79 20 55 6E 64 65 72 77 72 69 74 65 72
- 03 00 00 35 35 35 13 00 00 4D 61 72 69 6E 65 20
- 48 75 6C 6C 20 4D 61 6E 61 67 65 72 04 00 00 35
- 39 33 38 03 00 00 33 35 36 03 00 00 33 35 37 03
- 00 00 35 38 31 0C 00 00 52 65 63 65 70 74 69 6F
- 6E 69 73 74 04 00 00 38 34 35 37 03 00 00 35 37
- 36 19 00 00 48 52 20 4D 61 6E 61 67 65 72 2C 20
- 53 65 61 20 45 61 73 74 20 41 73 69 61 06 00 00
- 4D 75 6D 62 61 69 03 00 00 33 38 30 1B 00 00 45
- 6E 67 69 6E 65 65 72 69 6E 67 20 4C 69 61 69 73
- 6F 6E 20 4D 61 6E 61 67 65 72 03 00 00 33 35 38
- 0E 00 00 53 65 6E 69 6F 72 20 4D 61 6E 61 67 65
- 72 04 00 00 38 34 35 38 04 00 00 38 34 35 39 03
- 00 00 31 32 36 13 00 00 54 65 63 68 6E 69 63 61
- 6C 20 41 73 73 69 73 74 61 6E 74 04 00 00 34 34
- 31 37 10 00 00 4E 6F 6E 2D 4C 69 66 65 20 4D 61
- 6E 61 67 65 72 04 00 00 39 37 32 39 04 00 00 38
- 35 37 39 04 00 00 32 37 33 38 03 00 00 31 39 35
- 1B 00 00 48 65 61 64 20 6F 66 20 43 6C 69 65 6E
- 74 20 43 6F 6F 72 64 69 6E 61 74 69 6F 6E 03 00
- 00 31 32 37 16 00 00 53 65 63 72 65 74 61 72 79
- 2F 52 65 63 65 70 74 69 6F 6E 69 73 74 04 00 00
- 31 39 34 37 04 00 00 33 38 36 36 03 00 00 32 37
- 34 03 00 00 36 38 36 03 00 00 31 39 37 1C 00 00
- 54 65 63 68 6E 2E 41 63 63 6F 75 6E 74 73 20 41
- 64 6D 69 6E 69 73 74 72 61 74 6F 72 04 00 00 33
- 32 36 36 04 00 00 38 35 39 35 04 00 00 35 35 37
- 37 04 00 00 32 31 36 35 13 00 00 4D 61 6E 61 67
- 65 72 20 4B 6F 72 65 61 6E 20 44 65 73 6B 04 00
- 00 38 34 32 31 03 00 00 36 30 36 04 00 00 38 36
- 38 30 03 00 00 31 39 39 03 00 00 35 33 35 16 00
- 00 55 6E 64 65 72 77 72 69 74 69 6E 67 20 41 73
- 73 69 73 74 61 6E 74 03 00 00 35 35 39 04 00 00
- 38 35 31 31 03 00 00 32 30 30 12 00 00 43 6C 69
- 65 6E 74 20 43 6F 6F 72 64 69 6E 61 74 6F 72 04
- 00 00 35 32 32 32 04 00 00 38 35 38 33 03 00 00
- 34 39 37 14 00 00 4D 61 6E 61 67 65 72 20 55 6E
- 64 65 72 77 72 69 74 69 6E 67 04 00 00 35 39 36
- 38 14 00 00 42 55 53 20 54 72 61 69 6E 69 6E 67
- 20 4D 61 6E 61 67 65 72 03 00 00 35 37 35 1A 00
- 00 52 65 67 69 6F 6E 61 6C 20 50 72 6F 70 65 72
- 74 79 20 46 61 63 2E 4D 67 72 2E 03 00 00 32 30
- 33 1B 00 00 44 65 70 75 74 79 20 48 65 61 64 20
- 45 4E 20 55 6E 64 65 72 77 72 69 74 69 6E 67 03
- 00 00 35 34 36 19 00 00 46 61 63 75 6C 74 61 74
- 69 76 65 20 41 64 6D 69 6E 69 73 74 72 61 74 6F
- 72 04 00 00 36 36 32 32 05 00 00 31 32 35 35 39
- 05 00 00 31 32 30 38 38 03 00 00 35 31 36 04 00
- 00 32 38 39 30 15 00 00 49 6E 74 65 72 6E 61 74
- 69 6F 6E 61 6C 20 53 75 70 70 6F 72 74 03 00 00
- 34 39 35 18 00 00 50 72 6F 70 65 72 74 79 20 4C
- 69 61 69 73 6F 6E 20 4D 61 6E 61 67 65 72 04 00
- 00 36 34 35 37 18 00 00 45 6E 67 69 6E 65 65 72
- 69 6E 67 20 55 6E 64 65 72 77 72 69 74 69 6E 67
- 04 00 00 34 30 32 34 03 00 00 31 36 33 12 00 00
- 48 65 61 64 20 4C 6F 63 61 6C 20 4F 66 66 69 63
- 65 73 04 00 00 34 38 35 39 16 00 00 4C 6F 74 75
- 73 20 4E 6F 74 65 73 20 45 6E 74 77 69 63 6B 6C
- 65 72 04 00 00 38 35 34 32 04 00 00 38 35 32 37
- 04 00 00 38 35 33 36 04 00 00 36 35 35 33 04 00
- 00 32 34 35 31 14 00 00 44 65 70 61 72 74 6D 65
- 6E 74 20 53 65 63 72 65 74 61 72 79 03 00 00 39
- 36 35 04 00 00 38 36 36 37 10 00 00 52 65 73 65
- 61 72 63 68 20 26 20 43 6F 6D 6D 2E 04 00 00 38
- 34 37 38 04 00 00 31 38 34 34 03 00 00 33 34 32
- 10 00 00 41 63 63 6F 75 6E 74 73 20 4D 61 6E 61
- 67 65 72 03 00 00 35 33 34 10 00 00 46 61 63 2E
- 20 50 72 6F 70 65 72 74 79 20 55 57 03 00 00 32
- 34 31 07 00 00 54 72 61 69 6E 65 65 03 00 00 32
- 34 32 03 00 00 35 32 35 13 00 00 41 63 63 6F 75
- 6E 74 20 55 6E 64 65 72 77 72 69 74 65 72 0A 00
- 00 32 36 2E 30 39 2E 31 39 37 38 0A 00 00 31 35
- 2E 30 36 2E 31 39 39 38 0A 00 00 30 31 2E 30 31
- 2E 31 39 35 34 0A 00 00 31 39 2E 30 39 2E 31 39
- 37 37 0A 00 00 32 30 2E 30 35 2E 31 39 35 31 0A
- 00 00 30 31 2E 30 38 2E 31 39 39 38 0A 00 00 33
- 31 2E 31 30 2E 31 39 36 38 0A 00 00 30 34 2E 30
- 39 2E 31 39 36 34 0A 00 00 31 30 2E 30 37 2E 32
- 30 30 30 0A 00 00 32 39 2E 30 38 2E 31 39 36 38
- 0A 00 00 30 31 2E 31 30 2E 31 39 39 36 14 00 00
- 53 65 6E 6F 69 72 20 52 69 73 6B 20 45 6E 67 69
- 6E 65 65 72 0A 00 00 30 33 2E 31 30 2E 31 39 37
- 30 0A 00 00 30 31 2E 30 33 2E 31 39 39 38 0A 00
- 00 31 34 2E 30 33 2E 31 39 37 31 17 00 00 49 54
- 20 53 65 63 75 72 69 74 79 20 43 6F 6F 72 64 69
- 6E 61 74 6F 72 19 00 00 53 65 6E 2E 20 49 54 20
- 53 65 63 75 72 2E 20 50 72 6F 6A 2E 20 4D 67 72
- 2E 11 00 00 46 69 6E 61 6E 7A 2D 53 70 65 7A 69
- 61 6C 69 73 74 16 00 00 47 72 6F 75 70 20 43 6F
- 6D 70 65 6E 73 61 74 69 6F 6E 20 4D 67 72 12 00
- 00 43 6F 6E 66 65 72 65 6E 63 65 20 4D 61 6E 61
- 67 65 72 12 00 00 44 65 70 75 74 79 20 48 65 61
- 64 20 6F 66 20 54 41 41 19 00 00 53 65 6E 2E 20
- 56 69 63 65 20 50 72 65 73 69 64 65 6E 74 20 52
- 65 69 6E 2E 0F 00 00 48 65 61 64 20 6F 66 20 52
- 26 52 20 48 55 42 0C 00 00 4D 61 6E 68 61 74 74
- 61 6E 20 4E 59 0A 00 00 48 61 75 73 77 61 72 74
- 69 6E 03 00 00 4C 58 32 14 00 00 42 65 72 65 69
- 63 68 73 70 65 72 73 6F 6E 61 6C 63 68 65 66 06
- 00 00 45 78 74 65 72 6E 19 00 00 48 65 61 64 20
- 6F 66 20 52 65 69 6E 73 2E 4C 69 61 62 69 6C 69
- 74 2E 2C 44 01 00 00 56 02 00 00 4E 4C 18 00 00
- 53 65 6E 69 6F 72 20 43 6C 61 69 6D 73 20 43 6F
- 6E 73 75 6C 74 61 6E 74 08 00 00 44 69 72 65 63
- 74 6F 72 07 00 00 42 45 52 4D 55 44 41 0A 00 00
- 53 74 72 75 63 74 75 72 65 72 0A 00 00 4F 70 65
- 72 61 74 69 6F 6E 73 06 00 00 32 30 30 31 30 36
- 02 00 00 42 52 09 00 00 53 61 6F 20 50 61 75 6C
- 6F 0A 00 00 30 39 2E 30 35 2E 31 39 37 36 0A 00
- 00 31 34 2E 30 38 2E 31 39 36 37 0A 00 00 30 31
- 2E 30 37 2E 31 39 39 35 0A 00 00 32 35 2E 30 33
- 2E 31 39 37 32 0A 00 00 30 33 2E 30 31 2E 32 30
- 30 30 0A 00 00 32 31 2E 30 34 2E 31 39 37 30 0A
- 00 00 30 39 2E 30 35 2E 31 39 36 32 0A 00 00 30
- 32 2E 30 39 2E 31 39 39 36 0A 00 00 31 35 2E 30
- 34 2E 31 39 37 31 0A 00 00 32 37 2E 31 30 2E 31
- 39 39 37 0A 00 00 32 32 2E 31 30 2E 31 39 36 38
- 0A 00 00 32 36 2E 30 35 2E 31 39 39 33 0A 00 00
- 30 32 2E 30 33 2E 31 39 35 38 0A 00 00 30 31 2E
- 30 33 2E 31 39 38 34 0A 00 00 31 36 2E 30 35 2E
- 31 39 35 36 0A 00 00 32 38 2E 30 38 2E 31 39 36
- 37 0A 00 00 32 30 2E 30 33 2E 31 39 36 32 0A 00
- 00 30 31 2E 30 33 2E 31 39 39 36 0A 00 00 30 35
- 2E 30 32 2E 31 39 36 38 0A 00 00 30 35 2E 31 32
- 2E 31 39 36 38 0A 00 00 31 30 2E 30 34 2E 31 39
- 39 35 0A 00 00 30 34 2E 30 31 2E 31 39 37 33 0A
- 00 00 32 39 2E 30 37 2E 31 39 35 39 0A 00 00 32
- 34 2E 30 36 2E 31 39 36 30 0A 00 00 31 32 2E 30
- 33 2E 31 39 36 39 1C 00 00 50 65 72 73 6F 6E 61
- 6C 20 41 73 73 74 2E 20 74 6F 20 43 68 69 65 66
- 20 52 65 70 2E 0A 00 00 31 33 2E 30 38 2E 31 39
- 37 34 0A 00 00 30 31 2E 30 36 2E 32 30 30 30 0A
- 00 00 30 33 2E 30 38 2E 31 39 34 39 0A 00 00 30
- 31 2E 30 33 2E 31 39 39 32 0A 00 00 32 36 2E 30
- 31 2E 31 39 36 32 0A 00 00 32 37 2E 30 39 2E 31
- 39 38 34 0A 00 00 30 34 2E 30 33 2E 31 39 35 34
- 03 00 00 4E 2F 41 0A 00 00 32 32 2E 30 33 2E 31
- 39 36 34 0A 00 00 30 31 2E 30 37 2E 31 39 39 39
- 0A 00 00 30 36 2E 30 36 2E 31 39 37 32 0A 00 00
- 32 39 2E 30 39 2E 31 39 35 39 0A 00 00 31 36 2E
- 30 31 2E 31 39 39 31 0A 00 00 32 38 2E 31 32 2E
- 31 39 36 30                                    
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord2CR4 b/trunk/test-data/spreadsheet/BigSSTRecord2CR4
deleted file mode 100644
index f8fd534..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2CR4
+++ /dev/null
@@ -1,515 +0,0 @@
-             3C 00 20 20 0A 00 00 32 34 2E 30 36
- 2E 31 39 39 36 0A 00 00 31 36 2E 30 32 2E 31 39
- 35 33 0A 00 00 32 33 2E 30 32 2E 31 39 37 33 0A
- 00 00 31 35 2E 30 39 2E 31 39 36 38 0A 00 00 32
- 35 2E 30 38 2E 31 39 39 37 0A 00 00 32 36 2E 30
- 39 2E 31 39 36 30 0A 00 00 30 32 2E 30 31 2E 32
- 30 30 30 0A 00 00 32 33 2E 31 30 2E 31 39 36 39
- 0A 00 00 32 32 2E 30 32 2E 31 39 34 39 0A 00 00
- 30 38 2E 31 32 2E 31 39 36 35 0A 00 00 30 32 2E
- 30 38 2E 31 39 39 39 0A 00 00 30 39 2E 30 31 2E
- 31 39 37 33 0A 00 00 30 31 2E 30 32 2E 32 30 30
- 30 0A 00 00 30 38 2E 31 32 2E 31 39 35 37 0A 00
- 00 32 33 2E 30 33 2E 31 39 37 33 02 00 00 32 33
- 10 00 00 48 F4 74 65 73 73 65 20 61 63 63 75 65
- 75 69 6C 02 00 00 34 34 0D 00 00 43 6F 6D 6D 75
- 6E 69 63 61 74 69 6F 6E 1B 00 00 52 65 73 70 2E
- 73 75 70 70 6F 72 74 20 74 65 63 68 6E 2E 20 49
- 6E 66 6F 72 6D 2E 02 00 00 36 32 1B 00 00 52 65
- 73 70 6F 6E 73 69 62 6C 65 20 22 73 70 65 63 69
- 61 6C 20 6C 69 6E 65 73 22 08 00 00 36 30 33 2D
- 32 30 30 33 08 00 00 36 30 33 2D 32 30 30 34 08
- 00 00 36 30 33 2D 32 30 30 35 08 00 00 36 30 33
- 2D 32 30 30 38 08 00 00 36 30 33 2D 32 30 30 39
- 08 00 00 36 30 33 2D 32 30 31 30 02 00 00 50 33
- 14 00 00 55 57 20 50 72 6F 70 65 72 74 79 2F 43
- 61 73 75 61 6C 74 79 03 00 00 54 4E 44 0C 00 00
- 44 65 61 6C 20 4D 61 6E 61 67 65 72 13 00 00 55
- 57 20 53 75 70 70 6F 72 74 20 46 61 6B 20 53 61
- 63 68 02 00 00 53 33 17 00 00 52 2F 49 20 50 72
- 6F 64 75 63 74 20 43 6F 6E 74 72 6F 6C 6C 69 6E
- 67 19 00 00 55 6E 64 65 72 77 72 69 74 69 6E 67
- 20 53 75 70 70 2E 20 4D 61 72 69 6E 65 19 00 00
- 48 65 61 64 20 49 6E 74 65 72 6E 2E 20 43 6C 69
- 65 6E 74 73 20 55 6E 69 74 19 00 00 53 65 6E 2E
- 46 69 6E 61 6E 63 2E 53 6F 6C 75 74 69 6F 6E 73
- 20 43 6F 6E 73 13 00 00 54 61 63 74 69 63 61 6C
- 20 41 6C 6C 6F 63 61 74 69 6F 6E 18 00 00 44 65
- 70 2E 48 65 61 64 20 54 65 63 68 6E 2E 49 6E 66
- 72 61 73 74 72 2E 18 00 00 44 69 76 69 73 69 6F
- 6E 61 6C 20 43 6F 6D 6D 2E 20 4F 66 66 69 63 65
- 72 19 00 00 44 65 70 75 74 79 20 48 65 61 64 20
- 42 75 73 2E 20 54 72 61 69 6E 69 6E 67 0F 00 00
- 43 61 73 68 20 4D 61 6E 61 67 65 6D 65 6E 74 18
- 00 00 50 45 4B 41 2F 50 34 30 30 2F 48 52 2D 4D
- 49 53 20 41 70 70 6C 69 63 2E 0B 00 00 48 65 61
- 64 20 6F 66 20 4B 4E 43 15 00 00 53 70 65 7A 69
- 61 6C 69 73 74 20 52 56 2D 54 65 63 68 6E 69 6B
- 19 00 00 43 6F 72 70 2E 20 49 64 65 6E 74 69 74
- 79 20 53 70 65 63 69 61 6C 69 73 74 14 00 00 48
- 65 61 64 20 43 61 73 68 20 4D 61 6E 61 67 65 6D
- 65 6E 74 16 00 00 49 54 20 53 65 63 75 72 69 74
- 79 20 43 6F 6E 73 75 6C 74 61 6E 74 17 00 00 55
- 6E 64 65 72 77 72 69 74 65 72 20 54 72 65 61 74
- 79 20 44 65 73 6B 11 00 00 50 72 6F 6A 65 6B 74
- 2D 41 73 73 69 73 74 65 6E 74 11 00 00 50 6F 72
- 74 61 6C 20 43 6F 6E 73 75 6C 74 61 6E 74 10 00
- 00 53 65 6E 2E 20 55 57 20 50 72 6F 70 65 72 74
- 79 11 00 00 54 65 61 6D 20 53 65 63 72 65 74 61
- 72 79 20 52 42 19 00 00 47 72 70 2E 20 53 65 63
- 75 72 69 74 79 26 53 61 66 65 74 79 20 4D 67 72
- 2E 19 00 00 4A 75 6E 69 6F 72 20 49 6E 76 65 73
- 74 2E 20 43 6F 6E 74 72 6F 6C 6C 65 72 16 00 00
- 65 2D 6D 61 72 6B 65 74 73 20 69 6E 74 65 6C 6C
- 69 67 65 6E 63 65 0F 00 00 41 72 63 68 69 76 65
- 20 4D 61 6E 61 67 65 72 19 00 00 41 73 73 69 73
- 74 2E 20 74 6F 20 48 65 61 64 20 4D 61 72 6B 65
- 74 69 6E 67 06 00 00 4B F6 63 68 69 6E 18 00 00
- 41 73 73 69 73 74 61 6E 74 20 74 6F 20 48 65 61
- 64 20 47 72 70 20 50 4D 14 00 00 48 6F 74 65 6C
- 66 61 63 68 61 73 73 69 73 74 65 6E 74 69 6E 19
- 00 00 48 65 61 64 20 42 65 73 74 20 50 72 61 63
- 74 69 63 65 26 41 75 64 69 74 73 18 00 00 4B 6F
- 6D 6D 75 6E 69 6B 61 74 69 6F 6E 73 73 70 65 7A
- 69 61 6C 69 73 74 18 00 00 53 65 6E 2E 20 49 6E
- 76 65 73 74 6D 2E 20 43 6F 6E 74 72 6F 6C 6C 65
- 72 0A 00 00 50 4D 4F 20 45 75 72 6F 70 65 17 00
- 00 53 70 65 63 69 61 6C 20 50 72 6F 6A 65 63 74
- 20 4D 61 6E 61 67 65 72 18 00 00 53 65 6E 69 6F
- 72 20 46 69 6E 61 6E 63 69 61 6C 20 4F 66 66 69
- 63 65 72 15 00 00 49 6E 76 65 73 74 6D 65 6E 74
- 20 41 63 63 6F 75 6E 74 69 6E 67 19 00 00 48 65
- 61 64 20 6F 66 20 42 75 73 69 6E 65 73 73 20 54
- 72 61 69 6E 69 6E 67 14 00 00 41 73 73 2E 20 41
- 63 63 6F 75 6E 74 20 4D 61 6E 61 67 65 72 02 00
- 00 44 42 17 00 00 4C 65 69 74 65 72 69 6E 20 45
- 72 77 65 72 62 20 2F 20 52 65 63 68 74 18 00 00
- 44 65 70 2E 20 47 72 6F 75 70 20 43 6C 61 69 6D
- 73 20 43 6F 6F 72 64 2E 17 00 00 4D 61 6E 61 67
- 65 72 20 53 79 73 74 65 6D 20 53 65 72 76 69 63
- 65 73 16 00 00 4D 65 6D 62 65 72 20 42 55 53 20
- 50 65 72 66 6F 72 6D 61 6E 63 65 14 00 00 49 6E
- 76 65 73 74 6D 65 6E 74 20 52 65 70 6F 72 74 69
- 6E 67 19 00 00 53 65 6E 2E 20 49 54 20 53 65 63
- 75 72 69 74 79 20 43 6F 6E 73 75 6C 74 2E 17 00
- 00 53 61 63 68 62 65 61 72 62 2E 20 45 72 77 65
- 72 62 26 52 65 63 68 74 19 00 00 53 65 6E 2E 20
- 41 63 63 6F 75 6E 74 61 6E 74 2F 43 6F 6E 74 72
- 6F 6C 6C 2E 10 00 00 43 6F 6D 6D 2E 20 43 6F 6E
- 73 75 6C 74 61 6E 74 17 00 00 4C 69 65 67 65 6E
- 73 63 68 61 66 74 65 6E 76 65 72 77 61 6C 74 65
- 72 10 00 00 41 64 6D 69 6E 2E 20 50 72 75 64 65
- 6E 74 69 61 02 00 00 47 50 0B 00 00 43 75 72 61
- 74 6F 72 73 68 69 70 19 00 00 48 65 61 64 20 6F
- 66 20 57 6F 72 6B 73 74 2E 20 49 6E 66 72 61 73
- 74 72 2E 18 00 00 4D 67 72 2E 20 44 61 74 61 20
- 43 61 70 74 2E 26 54 61 78 6F 6E 6F 6D 79 19 00
- 00 54 65 61 6D 6C 65 69 74 65 72 20 54 65 63 68
- 6E 2E 20 53 75 70 70 6F 72 74 19 00 00 48 65 61
- 64 20 53 52 20 54 65 63 68 6E 6F 6C 6F 67 79 20
- 53 74 61 6E 64 2E 12 00 00 43 6F 6D 6D 2E 20 41
- 73 73 2E 20 52 FC 73 63 68 6C 2E 0D 00 00 4C 6F
- 63 61 6C 20 4F 66 66 69 63 65 72 06 00 00 4C 54
- 50 52 20 44 12 00 00 53 74 76 2E 20 47 72 75 70
- 70 65 6E 6C 65 69 74 65 72 06 00 00 4C 54 50 52
- 20 45 06 00 00 4C 54 50 52 20 47 06 00 00 4C 54
- 50 52 20 49 06 00 00 4C 54 50 52 20 46 06 00 00
- 4C 54 50 52 20 41 09 00 00 52 65 70 6F 72 74 69
- 6E 67 19 00 00 47 72 6F 75 70 20 49 54 20 53 65
- 63 75 72 69 74 79 20 4F 66 66 69 63 65 72 06 00
- 00 4C 54 50 52 20 48 18 00 00 4C 65 69 74 65 72
- 20 48 79 70 6F 74 68 65 6B 65 6E 2F 41 64 6D 69
- 6E 2E 06 00 00 4C 54 50 52 20 43 19 00 00 53 61
- 63 68 62 65 61 72 62 65 69 74 65 72 69 6E 20 48
- 79 70 6F 74 68 65 6B 11 00 00 41 73 73 69 73 74
- 61 6E 74 20 43 4C 4F 2F 43 43 4F 18 00 00 50 72
- 6F 6A 2E 20 4D 61 6E 61 67 65 72 20 53 70 6F 6E
- 73 6F 72 69 6E 67 0A 00 00 4C 65 69 74 65 72 20
- 42 61 75 11 00 00 48 65 61 64 20 6F 66 20 54 65
- 6C 65 70 68 6F 6E 79 18 00 00 53 65 6E 69 6F 72
- 20 49 6E 66 6F 72 6D 61 74 69 6F 6E 20 53 70 65
- 63 2E 18 00 00 41 73 73 2E 20 54 61 63 74 69 63
- 61 6C 20 41 6C 6C 6F 63 61 74 69 6F 6E 12 00 00
- 50 72 6F 6A 65 63 74 20 4D 61 6E 61 67 65 6D 65
- 6E 74 19 00 00 48 65 61 64 20 49 6E 76 2E 46 75
- 6E 64 73 2F 4F 70 65 72 61 74 69 6F 6E 73 18 00
- 00 46 69 6E 61 6E 63 2E 20 4F 66 66 2E 20 73 77
- 69 66 74 72 65 2E 63 6F 6D 19 00 00 4C 65 61 72
- 6E 69 6E 67 43 6F 6F 72 64 69 6E 61 74 6F 72 20
- 5A 4F 52 52 4F 17 00 00 48 65 61 64 20 43 4D 53
- 20 43 6C 65 61 72 69 6E 67 20 48 6F 75 73 65 18
- 00 00 45 6E 67 69 6E 65 65 72 69 6E 67 20 55 57
- 20 41 73 73 69 73 74 61 6E 74 15 00 00 50 72 6F
- 70 65 72 74 79 20 50 72 6F 64 75 63 74 20 4D 67
- 72 2E 06 00 00 4C 54 50 52 20 42 0E 00 00 48 65
- 61 64 20 50 72 75 64 65 6E 74 69 61 02 00 00 44
- 57 19 00 00 48 65 61 64 20 44 61 74 61 20 57 61
- 72 65 68 6F 75 73 65 20 53 65 72 76 2E 02 00 00
- 47 45 19 00 00 48 65 61 64 20 43 6F 6E 74 72 6F
- 6C 6C 69 6E 67 20 50 72 6F 6A 65 63 74 73 16 00
- 00 50 6F 72 74 61 6C 20 43 6F 6E 74 65 6E 74 20
- 4D 61 6E 61 67 65 72 02 00 00 20 35 02 00 00 20
- 34 25 00 00 41 73 73 69 73 74 61 6E 74 65 20 64
- E9 70 61 72 74 65 6D 65 6E 74 20 74 72 61 69 74
- E9 20 6E 6F 6E 20 76 69 65 03 00 00 43 34 32 03
- 00 00 43 34 33 03 00 00 43 34 34 03 00 00 43 34
- 35 03 00 00 43 34 36 0D 00 00 52 75 6E 4F 66 66
- 20 52 65 61 63 6F 6C 03 00 00 43 34 37 03 00 00
- 43 34 38 03 00 00 43 34 39 03 00 00 43 35 30 12
- 00 00 43 6C 61 69 6D 73 20 4D 61 6E 61 67 65 72
- 20 53 45 41 0F 00 00 50 72 6F 63 65 73 73 20 41
- 6E 61 6C 79 73 74 0B 00 00 54 65 61 6D 20 4C 65
- 61 64 65 72 18 00 00 43 61 73 75 61 6C 74 79 20
- 4C 69 61 69 73 6F 6E 20 4D 61 6E 61 67 65 72 17
- 00 00 48 75 6D 61 6E 20 52 65 73 6F 75 72 63 65
- 73 20 4F 66 66 69 63 65 72 0F 00 00 46 61 63 20
- 55 6E 64 65 72 77 72 69 74 65 72 13 00 00 48 65
- 61 64 20 4F 70 65 72 61 74 69 6F 6E 73 20 53 53
- 43 1A 00 00 43 61 73 75 61 6C 74 79 20 54 72 65
- 61 74 79 20 55 57 20 4D 61 6E 61 67 65 72 0A 00
- 00 4D 61 6E 61 67 65 72 2D 49 54 1F 00 00 46 61
- 63 75 6C 74 61 74 69 76 65 20 55 57 20 53 75 70
- 70 6F 72 74 20 43 61 73 75 61 6C 74 79 1B 00 00
- 48 65 61 64 20 4C 65 61 72 6E 69 6E 67 20 26 20
- 44 65 76 65 6C 6F 70 6D 65 6E 74 22 00 00 48 65
- 61 64 20 6F 66 20 46 61 63 20 50 72 6F 70 65 72
- 74 79 20 26 20 45 6E 67 69 6E 65 65 72 69 6E 67
- 12 00 00 41 63 63 6F 75 6E 74 69 6E 67 20 4D 61
- 6E 61 67 65 72 05 00 00 37 30 32 34 31 29 00 00
- 48 65 61 64 20 6F 66 20 41 6D 65 72 69 63 61 73
- 20 44 69 76 69 73 69 6F 6E 20 48 75 6D 61 6E 20
- 52 65 73 6F 75 72 63 65 73 02 00 00 30 39 05 00
- 00 38 30 33 38 33 07 00 00 41 6E 61 6C 79 73 74
- 03 00 00 31 31 30 05 00 00 33 32 34 35 31 1E 00
- 00 47 72 6F 75 70 20 50 72 6F 64 75 63 74 20 4D
- 61 6E 61 67 65 72 20 43 61 73 75 61 6C 74 79 02
- 00 00 30 31 05 00 00 38 31 34 38 39 13 00 00 46
- 69 6E 61 6E 63 69 61 6C 20 41 6E 61 6C 79 73 74
- 20 31 03 00 00 31 32 30 05 00 00 38 30 35 30 30
- 09 00 00 50 72 69 6E 63 69 70 61 6C 02 00 00 30
- 34 18 00 00 48 65 61 64 20 49 6E 76 65 73 74 6D
- 65 6E 74 20 41 63 63 6F 75 6E 74 2E 14 00 00 50
- 6F 72 74 66 6F 6C 69 6F 20 4D 61 6E 61 67 65 6D
- 65 6E 74 19 00 00 41 73 73 2E 49 6E 76 65 73 74
- 6F 72 20 52 65 6C 61 74 69 6F 6E 20 4D 67 72 19
- 00 00 45 6C 65 63 74 72 6F 6E 69 63 20 52 69 73
- 6B 20 45 78 63 68 61 6E 67 65 73 09 00 00 54 4C
- 20 42 75 66 66 65 74 14 00 00 4C 65 61 72 6E 69
- 6E 67 20 43 6F 6F 72 64 69 6E 61 74 6F 72 18 00
- 00 54 65 63 68 6E 69 63 61 6C 20 49 6E 66 72 61
- 73 74 72 75 63 74 75 72 65 19 00 00 48 65 61 64
- 20 54 65 63 68 6E 2E 49 6E 66 72 61 73 74 72 75
- 63 74 75 72 65 19 00 00 49 55 46 20 43 6F 6D 6D
- 75 6E 69 63 61 74 69 6F 6E 20 4D 61 6E 61 67 65
- 72 12 00 00 43 46 4F 20 42 75 73 69 6E 65 73 73
- 20 47 72 6F 75 70 16 00 00 54 4C 20 45 69 6E 72
- 69 63 68 74 75 6E 67 73 70 6C 61 6E 75 6E 67 15
- 00 00 49 6E 76 65 73 74 6D 65 6E 74 20 43 6F 6E
- 74 72 6F 6C 6C 65 72 18 00 00 48 65 61 64 20 6F
- 66 20 4C 69 62 72 61 72 79 20 53 65 72 76 69 63
- 65 73 0C 00 00 52 69 73 6B 20 4D 61 6E 61 67 65
- 72 19 00 00 46 75 6E 63 74 69 6F 6E 61 6C 20 44
- 65 73 69 67 6E 20 41 6E 61 6C 79 73 74 16 00 00
- 41 73 73 69 73 74 61 6E 74 20 52 69 73 6B 20 4D
- 61 6E 61 67 65 72 04 00 00 36 38 38 30 13 00 00
- 53 61 63 68 62 65 61 72 62 65 69 74 65 72 20 46
- 69 62 75 04 00 00 36 38 38 37 08 00 00 45 6E 67
- 69 6E 65 65 72 04 00 00 36 38 39 32 04 00 00 36
- 38 39 36 04 00 00 36 39 30 39 0C 00 00 50 72 69
- 63 69 6E 67 2F 44 61 74 61 04 00 00 36 39 31 31
- 0E 00 00 43 41 44 2D 53 70 65 7A 69 61 6C 69 73
- 74 04 00 00 36 39 31 34 04 00 00 36 39 32 33 17
- 00 00 47 72 6C 2E 20 42 65 74 72 69 65 62 20 4D
- 79 74 68 65 6E 71 75 61 69 04 00 00 36 39 32 38
- 0D 00 00 48 65 61 64 20 6F 66 20 4C 45 2F 4C 54
- 04 00 00 36 39 33 35 04 00 00 36 39 33 39 14 00
- 00 54 65 63 68 6E 69 73 63 68 65 72 20 5A 65 69
- 63 68 6E 65 72 04 00 00 36 39 34 33 04 00 00 36
- 39 35 36 13 00 00 46 61 63 68 72 65 66 65 72 65
- 6E 74 20 55 6D 77 65 6C 74 04 00 00 36 39 35 37
- 04 00 00 36 39 36 36 18 00 00 42 65 61 75 66 74
- 72 61 67 74 65 20 4A 75 6E 69 6F 72 20 50 6F 77
- 65 72 04 00 00 36 39 37 31 04 00 00 36 39 39 34
- 04 00 00 37 30 30 33 04 00 00 37 30 30 37 17 00
- 00 48 65 61 64 20 43 6F 72 70 6F 72 61 74 65 20
- 44 65 76 65 6C 6F 70 2E 04 00 00 37 30 30 38 14
- 00 00 4C 65 69 74 65 6E 64 65 72 20 4B FC 63 68
- 65 6E 63 68 65 66 04 00 00 37 30 30 39 17 00 00
- 54 4C 20 45 6C 65 6B 74 72 6F 20 26 20 47 65 62
- 2E 74 65 63 68 6E 2E 04 00 00 37 30 31 31 0F 00
- 00 53 74 76 2E 20 4B FC 63 68 65 6E 63 68 65 66
- 04 00 00 37 30 31 34 04 00 00 37 30 32 33 04 00
- 00 37 30 32 34 04 00 00 37 30 32 37 04 00 00 37
- 30 35 31 18 00 00 53 65 6E 2E 20 43 72 65 64 69
- 74 20 52 69 73 6B 20 4D 61 6E 61 67 65 72 04 00
- 00 37 30 35 32 04 00 00 37 30 35 37 12 00 00 50
- 72 6F 6A 65 63 74 20 53 70 65 63 69 61 6C 69 73
- 74 04 00 00 37 30 36 32 04 00 00 37 30 36 36 18
- 00 00 48 65 61 64 20 6F 66 20 4D 65 64 69 63 61
- 6C 20 53 65 72 76 69 63 65 73 04 00 00 37 30 36
- 39 04 00 00 37 30 38 33 04 00 00 37 30 38 34 0A
- 00 00 43 49 2D 4D 61 6E 61 67 65 72 04 00 00 37
- 30 38 36 13 00 00 47 72 6F 75 70 20 48 52 20 43
- 6F 6E 74 72 6F 6C 6C 65 72 04 00 00 37 30 39 31
- 04 00 00 37 30 39 32 15 00 00 47 72 6C 2E 20 53
- 70 65 63 69 61 6C 20 42 75 73 69 6E 65 73 73 04
- 00 00 37 30 39 33 04 00 00 37 30 39 35 04 00 00
- 37 30 39 37 18 00 00 42 75 73 69 6E 65 73 73 20
- 41 70 70 6C 2E 20 41 72 63 68 69 74 65 63 74 04
- 00 00 37 31 30 30 04 00 00 37 31 30 32 12 00 00
- 4D 61 6E 61 67 65 6D 65 6E 74 20 53 75 70 70 6F
- 72 74 04 00 00 37 31 32 30 04 00 00 37 31 32 35
- 04 00 00 37 31 32 38 04 00 00 37 31 32 39 04 00
- 00 37 31 33 33 04 00 00 37 31 34 30 04 00 00 37
- 31 34 33 08 00 00 41 6B 74 75 61 72 69 6E 04 00
- 00 37 31 35 31 04 00 00 37 31 35 37 16 00 00 41
- 73 73 69 73 74 61 6E 74 20 74 6F 20 55 6E 69 74
- 20 48 65 61 64 04 00 00 37 31 36 30 04 00 00 37
- 31 36 36 10 00 00 53 65 63 72 65 74 61 72 79 20
- 74 6F 20 44 4F 4F 04 00 00 37 31 37 36 04 00 00
- 37 31 38 30 15 00 00 47 72 75 70 70 65 6E 6C 65
- 69 74 65 72 20 53 75 70 70 6F 72 74 04 00 00 37
- 31 38 31 18 00 00 48 65 61 64 20 6F 66 20 48 6F
- 74 65 6C 20 4F 70 65 72 61 74 69 6F 6E 73 04 00
- 00 37 31 38 32 02 00 00 55 53 08 00 00 4E 65 77
- 20 59 6F 72 6B 04 00 00 37 32 31 30 04 00 00 37
- 32 31 33 04 00 00 37 32 36 37 04 00 00 37 32 37
- 33 19 00 00 53 65 63 74 69 6F 6E 20 48 65 61 64
- 20 53 70 65 63 69 61 6C 20 41 73 73 2E 04 00 00
- 37 32 38 30 19 00 00 48 65 61 64 20 53 74 72 61
- 74 2E 20 50 6C 61 6E 6E 2E 26 20 50 72 6F 6A 2E
- 04 00 00 37 32 38 34 04 00 00 37 33 31 38 04 00
- 00 37 33 31 39 04 00 00 37 33 32 32 04 00 00 37
- 33 32 33 04 00 00 37 33 33 31 04 00 00 37 33 33
- 34 03 00 00 47 49 41 04 00 00 37 33 33 38 19 00
- 00 47 49 41 20 4F 66 66 69 63 65 26 43 6F 6D 6D
- 75 6E 69 63 61 74 69 6F 6E 73 04 00 00 37 33 33
- 39 0B 00 00 4F 72 67 61 6E 69 73 61 74 6F 72 04
- 00 00 37 33 34 31 06 00 00 41 6B 74 75 61 72 04
- 00 00 37 33 34 35 04 00 00 37 33 34 39 04 00 00
- 37 33 36 30 04 00 00 37 33 36 31 04 00 00 37 33
- 36 32 04 00 00 37 33 36 33 04 00 00 37 33 36 37
- 04 00 00 37 33 37 37 04 00 00 37 33 37 38 15 00
- 00 41 75 73 62 69 6C 64 75 6E 67 73 73 61 63 68
- 62 65 61 72 62 2E 04 00 00 37 33 39 30 04 00 00
- 37 33 39 32 04 00 00 37 34 32 30 04 00 00 37 34
- 33 35 04 00 00 37 34 34 32 04 00 00 37 34 35 35
- 11 00 00 54 4C 20 45 6C 65 6B 74 72 6F 74 65 63
- 68 6E 69 6B 04 00 00 37 34 36 30 04 00 00 37 34
- 36 31 04 00 00 37 34 37 39 04 00 00 37 34 39 32
- 04 00 00 37 34 39 35 04 00 00 37 34 39 36 17 00
- 00 55 65 62 65 72 73 65 74 7A 2E 2F 54 65 72 6D
- 69 6E 6F 6C 6F 67 69 6E 04 00 00 37 35 30 30 0D
- 00 00 4C 65 67 61 6C 20 43 6F 75 6E 73 65 6C 04
- 00 00 37 35 30 33 04 00 00 37 35 31 30 13 00 00
- 53 61 63 68 62 65 61 72 62 2E 20 47 72 6F 75 70
- 20 50 4D 02 00 00 43 55 04 00 00 37 35 33 39 11
- 00 00 54 61 74 65 6E 20 73 74 61 74 74 20 57 6F
- 72 74 65 04 00 00 37 35 34 32 14 00 00 53 65 6E
- 69 6F 72 20 41 75 64 69 74 20 4D 61 6E 61 67 65
- 72 04 00 00 37 35 34 37 04 00 00 37 35 34 39 04
- 00 00 37 35 35 38 04 00 00 37 35 36 32 12 00 00
- 50 72 6F 6A 65 63 74 20 43 6F 6E 73 75 6C 74 61
- 6E 74 04 00 00 37 35 36 35 0C 00 00 43 6F 6D 6D
- 69 73 2D 4B FC 63 68 65 04 00 00 37 35 36 38 04
- 00 00 37 35 37 31 04 00 00 37 35 37 33 13 00 00
- 53 61 63 68 62 65 61 72 62 65 69 74 65 72 20 42
- 65 62 75 04 00 00 37 35 37 34 19 00 00 53 61 63
- 68 62 65 61 72 62 2E 20 52 65 63 68 6E 75 6E 67
- 73 77 65 73 65 6E 04 00 00 37 35 37 37 04 00 00
- 37 35 38 31 13 00 00 48 65 61 64 20 6F 66 20 4C
- 41 2F 4C 45 2F 4C 4E 20 46 4D 04 00 00 37 35 39
- 32 04 00 00 37 35 39 33 04 00 00 37 35 39 39 04
- 00 00 37 36 30 31 04 00 00 37 36 32 31 04 00 00
- 37 36 32 36 04 00 00 37 36 32 39 11 00 00 41 63
- 74 75 61 72 69 61 6C 20 41 6E 61 6C 79 73 74 04
- 00 00 37 36 34 31 04 00 00 37 36 34 37 04 00 00
- 37 36 34 38 09 00 00 45 63 6F 6E 6F 6D 69 73 74
- 04 00 00 37 36 34 39 04 00 00 37 36 35 30 04 00
- 00 37 36 35 32 0E 00 00 50 72 6F 6A 65 6B 74 6D
- 61 6E 61 67 65 72 04 00 00 37 36 35 39 04 00 00
- 37 36 36 30 12 00 00 4B 6F 6E 7A 65 72 6E 6B 6F
- 6F 72 64 69 6E 61 74 6F 72 04 00 00 37 36 36 31
- 04 00 00 37 36 36 33 04 00 00 37 36 38 31 04 00
- 00 37 36 38 36 04 00 00 37 36 38 38 04 00 00 37
- 36 39 30 04 00 00 37 36 39 32 04 00 00 37 36 39
- 37 04 00 00 37 37 30 38 18 00 00 4D 65 6D 62 65
- 72 20 6F 66 20 45 78 65 63 75 74 69 76 65 20 54
- 65 61 6D 04 00 00 37 37 31 33 0E 00 00 49 6E 6E
- 65 6E 61 72 63 68 69 74 65 6B 74 04 00 00 37 37
- 32 33 0E 00 00 53 65 6E 69 6F 72 20 41 63 74 75
- 61 72 79 04 00 00 37 37 33 31 04 00 00 37 37 34
- 35 04 00 00 37 37 35 33 04 00 00 37 37 35 36 04
- 00 00 37 37 37 37 04 00 00 37 37 37 38 04 00 00
- 37 37 38 33 04 00 00 37 37 38 37 12 00 00 48 65
- 61 64 20 6F 66 20 44 65 70 61 72 74 6D 65 6E 74
- 04 00 00 37 37 38 39 04 00 00 37 37 39 38 04 00
- 00 37 38 31 38 04 00 00 37 38 33 35 04 00 00 37
- 38 33 36 04 00 00 37 38 37 30 04 00 00 37 38 37
- 32 1A 00 00 54 4C 20 4D 61 72 69 6E 65 20 55 57
- 20 47 72 65 61 74 65 72 20 43 68 69 6E 61 03 00
- 00 32 30 39 12 00 00 50 65 72 73 6F 6E 61 6C 20
- 41 73 73 69 73 74 61 6E 74 03 00 00 32 31 30 18
- 00 00 48 65 61 64 20 4D 67 6D 74 26 20 46 69 6E
- 2E 20 53 65 72 76 69 63 65 73 04 00 00 38 35 33
- 37 13 00 00 44 61 74 61 20 49 54 2D 4B 6F 6F 72
- 64 69 6E 61 74 6F 72 03 00 00 34 39 38 05 00 00
- 31 30 35 32 33 05 00 00 31 30 31 36 34 04 00 00
- 38 36 33 31 03 00 00 32 34 34 03 00 00 32 34 35
- 04 00 00 38 36 30 34 04 00 00 36 35 36 39 10 00
- 00 50 72 69 63 69 70 61 6C 20 4F 66 66 69 63 65
- 72 04 00 00 38 36 30 31 05 00 00 31 30 34 32 39
- 03 00 00 31 32 34 04 00 00 35 38 36 32 05 00 00
- 31 31 30 32 37 03 00 00 35 36 32 03 00 00 35 30
- 32 04 00 00 33 39 33 32 04 00 00 38 39 32 39 14
- 00 00 48 65 61 64 20 48 75 6D 61 6E 20 52 65 73
- 6F 75 72 63 65 73 05 00 00 31 31 38 33 33 04 00
- 00 35 31 36 38 04 00 00 38 35 37 37 04 00 00 38
- 36 37 33 03 00 00 33 33 38 03 00 00 33 33 37 14
- 00 00 53 65 6E 69 6F 72 20 41 64 6D 69 6E 69 73
- 74 72 61 74 6F 72 04 00 00 38 36 38 33 03 00 00
- 32 34 37 1C 00 00 4D 61 6E 61 67 65 72 20 4E 6F
- 6E 2D 4C 69 66 65 20 52 65 69 6E 73 75 72 61 6E
- 63 65 04 00 00 37 30 32 30 04 00 00 33 38 36 34
- 03 00 00 33 38 38 1A 00 00 48 65 61 64 20 6F 66
- 20 46 69 6E 61 6E 63 69 61 6C 20 41 64 76 69 73
- 6F 72 79 03 00 00 32 31 32 1D 00 00 41 73 73 74
- 2E 20 74 6F 20 43 68 69 65 66 20 52 65 70 72 65
- 73 65 6E 74 61 74 69 76 65 05 00 00 31 30 30 37
- 39 03 00 00 32 31 39 1A 00 00 43 6F 6E 74 72 6F
- 6C 6C 65 72 2C 20 52 65 69 6E 73 2E 41 63 63 6F
- 75 6E 74 73 03 00 00 33 36 36 03 00 00 31 33 35
- 03 00 00 35 33 39 03 00 00 35 30 39 1D 00 00 48
- 65 61 64 20 6F 66 20 43 6F 72 70 6F 72 61 74 65
- 20 44 65 76 65 6C 6F 70 6D 65 6E 74 03 00 00 31
- 34 35 17 00 00 52 65 70 72 65 73 65 6E 74 61 74
- 69 76 65 20 50 72 6F 70 65 72 74 79 03 00 00 35
- 32 32 0E 00 00 4D 61 72 69 6E 65 20 4D 61 6E 61
- 67 65 72 03 00 00 35 32 31 04 00 00 33 37 35 38
- 04 00 00 36 39 37 36 04 00 00 36 31 35 30 04 00
- 00 39 31 35 34 19 00 00 48 65 61 64 20 52 65 69
- 6E 73 75 72 61 6E 63 65 20 41 63 63 6F 75 6E 74
- 2E 02 00 00 45 53 02 00 00 53 4F 04 00 00 32 39
- 33 34 10 00 00 55 6E 64 65 72 77 72 69 74 65 72
- 20 53 6F 52 69 02 00 00 45 59 04 00 00 32 39 36
- 37 12 00 00 41 64 6D 69 6E 69 73 74 72 61 74 69
- 6F 6E 20 53 53 43 02 00 00 45 50 02 00 00 50 31
- 04 00 00 32 39 38 36 18 00 00 55 57 20 53 75 70
- 70 6F 72 74 20 46 61 63 2E 20 50 72 6F 70 65 72
- 74 79 04 00 00 33 30 35 35 0D 00 00 53 65 63 72
- 65 74 61 72 79 20 53 53 43 04 00 00 33 30 38 31
- 02 00 00 43 33 04 00 00 33 31 30 32 04 00 00 33
- 31 30 33 04 00 00 33 31 30 37 02 00 00 45 4F 04
- 00 00 33 31 31 31 04 00 00 33 31 31 32 02 00 00
- 45 45 04 00 00 33 31 31 36 18 00 00 48 65 61 64
- 20 41 70 70 6C 69 63 61 74 69 6F 6E 20 53 75 70
- 70 6F 72 74 02 00 00 45 44 04 00 00 33 31 31 37
- 04 00 00 33 31 33 31 13 00 00 42 75 73 69 6E 65
- 73 73 20 45 78 70 65 72 74 20 53 53 43 04 00 00
- 33 31 33 33 02 00 00 53 31 04 00 00 33 31 34 34
- 11 00 00 55 6E 64 65 72 77 72 69 74 65 72 20 53
- 57 49 46 54 02 00 00 45 47 04 00 00 33 31 34 38
- 11 00 00 46 69 6E 61 6E 63 69 61 6C 20 41 6E 61
- 6C 79 73 74 04 00 00 38 32 34 30 10 00 00 4C 65
- 67 61 6C 20 43 6F 6E 73 75 6C 74 61 6E 74 04 00
- 00 38 32 34 38 04 00 00 38 32 35 32 04 00 00 38
- 32 35 35 04 00 00 38 32 36 30 04 00 00 38 32 36
- 39 18 00 00 41 73 73 2E 20 53 74 61 62 73 73 74
- 2E 20 53 69 63 68 65 72 68 65 69 74 04 00 00 38
- 32 37 32 04 00 00 38 32 37 35 04 00 00 38 32 37
- 39 16 00 00 46 FC 68 72 75 6E 67 73 61 73 73 69
- 73 74 65 6E 74 69 6E 20 43 43 04 00 00 38 32 38
- 36 19 00 00 53 65 6B 72 65 74 61 72 69 61 74 73
- 6D 69 74 61 72 62 65 69 74 65 72 49 6E 04 00 00
- 38 33 30 38 04 00 00 38 33 33 30 04 00 00 38 33
- 33 35 04 00 00 38 33 33 39 04 00 00 38 33 34 34
- 17 00 00 48 65 61 64 20 6F 66 20 41 63 74 75 61
- 72 69 61 6C 20 50 72 6F 6A 2E 04 00 00 38 33 35
- 34 04 00 00 38 33 35 37 04 00 00 38 33 37 38 04
- 00 00 38 33 38 34 04 00 00 38 33 38 36 04 00 00
- 38 33 38 37 04 00 00 38 33 38 38 04 00 00 38 33
- 39 30 04 00 00 38 34 30 32 04 00 00 38 34 30 35
- 10 00 00 4B 6F 6F 72 64 69 6E 61 74 69 6F 6E 20
- 54 43 45 04 00 00 38 34 30 38 11 00 00 53 65 6E
- 69 6F 72 20 41 63 63 6F 75 6E 74 61 6E 74 04 00
- 00 38 34 30 39 15 00 00 41 63 74 75 61 72 69 61
- 6C 20 44 65 76 65 6C 6F 70 6D 65 6E 74 04 00 00
- 38 34 31 37 04 00 00 38 34 32 32 04 00 00 38 34
- 32 35 04 00 00 38 34 32 36 14 00 00 4C 65 69 74
- 65 72 69 6E 20 53 65 6B 72 65 74 61 72 69 61 74
- 04 00 00 38 34 32 38 04 00 00 38 34 33 32 04 00
- 00 38 34 33 36 04 00 00 38 34 33 38 04 00 00 38
- 34 33 39 04 00 00 38 34 34 34 04 00 00 38 34 35
- 30 04 00 00 38 34 35 32 04 00 00 38 34 36 39 04
- 00 00 38 34 37 30 04 00 00 38 34 37 33 04 00 00
- 38 34 37 37 05 00 00 31 31 30 33 37 05 00 00 31
- 31 33 33 33 05 00 00 31 31 36 35 32 05 00 00 31
- 31 36 39 38 05 00 00 31 31 38 36 39 05 00 00 31
- 31 39 36 30 05 00 00 31 31 39 36 34 05 00 00 31
- 31 39 37 34 05 00 00 31 32 30 31 37 05 00 00 31
- 32 30 35 33 05 00 00 31 32 31 38 32 05 00 00 31
- 32 32 39 36 05 00 00 31 32 33 30 30 05 00 00 31
- 32 33 31 32 05 00 00 31 32 36 34 33 05 00 00 31
- 32 36 37 37 05 00 00 31 32 36 38 34 05 00 00 31
- 32 37 32 34 05 00 00 31 32 37 37 38 05 00 00 31
- 32 38 34 37 05 00 00 31 32 38 38 30 05 00 00 31
- 32 39 36 32 05 00 00 31 32 39 37 39 05 00 00 31
- 33 30 30 31 05 00 00 31 33 30 32 34 05 00 00 31
- 33 30 36 33 05 00 00 31 33 30 37 39 05 00 00 31
- 33 31 34 30 05 00 00 31 33 31 34 34 05 00 00 31
- 33 31 34 35 04 00 00 33 37 39 32 04 00 00 35 34
- 35 35 14 00 00 50 72 6F 64 75 63 74 20 4D 61 6E
- 61 67 65 72 20 53 61 63 68 04 00 00 35 35 38 36
- 04 00 00 35 36 36 39 04 00 00 37 34 37 38 03 00
- 00 31 30 30 0F 00 00 46 65 6D 6D 65 20 64 65 20
- 6D E9 6E 61 67 65 02 00 00 31 31 13 00 00 47 65
- 73 74 69 6F 6E 20 69 6E 66 6F 72 6D 61 74 69 6F
- 6E 02 00 00 31 34 0C 00 00 44 69 72 65 63 74 65
- 75 72 20 52 48 02 00 00 31 35 12 00 00 73 6F 75
- 73 63 2E 46 61 63 20 64 6F 6D 6D 61 67 65 73 02
- 00 00 31 38 14 00 00 44 E9 6C E9 67 75 E9 20 73
- 6F 75 73 63 72 69 70 74 69 6F 6E 02 00 00 32 32
- 0F 00 00 48 F4 74 65 73 73 65 20 61 63 63 65 75
- 69 6C 0A 00 00 73 65 63 72 E9 74 61 69 72 65 02
- 00 00 32 38 02 00 00 32 39 16 00 00 67 65 73 74
- 69 6F 6E 6E 61 69 72 65 20 63 6F 6D 70 74 61 62
- 6C 65 01 00 00 33 20 00 00 52 65 73 70 6F 6E 73
- 69 62 6C 65 20 67 65 73 74 69 6F 6E 20 64 75 20
- 70 65 72 73 6F 6E 6E 65 6C 02 00 00 33 30 16 00
- 00 47 65 73 74 69 6F 6E 6E 61 69 72 65 20 63 6F
- 6D 70 74 61 62 6C 65 1E 00 00 52 65 73 70 6F 6E
- 73 69 62 6C 65 20 72 69 73 71 75 65 73 20 74 65
- 63 68 6E 69 71 75 65 73 02 00 00 33 34 09 00 00
- 43 6F 6D 70 74 61 62 6C 65 02 00 00 33 36 02 00
- 00 33 38 1D 00 00 52 65 73 70 2E 73 6F 75 73 63
- 2E 72 69 73 71 75 65 73 20 74 65 63 68 6E 69 71
- 75 65 73 02 00 00 33 39 17 00 00 54 65 63 68 6E
- 2E 73 65 72 76 69 63 65 73 20 67 E9 6E E9 72 61
- 75 78 17 00 00 52 65 73 70 6F 6E 73 69 62 6C 65
- 20 42 61 63 6B 20 6F 66 66 69 63 65 17 00 00 52
- 65 73 70 6F 6E 73 69 62 6C 65 20 62 75 72 65 61
- 75 74 69 71 75 65 02 00 00 34 33 02 00 00 34 37
- 16 00 00 41 73 73 69 73 74 61 6E 74 65 20 64 65
- 20 73 65 63 74 69 6F 6E 73 19 00 00 41 6E 61 6C
- 79 73 74 65 20 72 E9 67 6C 65 75 72 20 73 69 6E
- 73 69 74 72 65 02 00 00 35 33 02 00 00 35 34 02
- 00 00 35 39 17 00 00 53 65 63 72 E9 74 61 69 72
- 65 20 64 65 20 44 69 72 65 63 74 69 6F 6E 01 00
- 00 36 17 00 00 52 65 73 70 2E 53 69 6E 69 73 74
- 72 65 20 6A 75 72 69 64 69 71 75 65 02 00 00 36
- 33 02 00 00 36 38 15 00 00 53 6F 75 73 63 72 2E
- 74 72 61 69 74 E9 73 20 6A 75 6E 69 6F 72 02 00
- 00 37 32 18 00 00 41 73 73 69 73 74 61 6E 74 20
- 73 6F 75 73 63 2E 20 54 72 61 69 74 E9 73 02 00
- 00 37 36 0C 00 00 53 6F 75 73 63 2E 46 61 63 20
- 52 43 02 00 00 37 37 0E 00 00 52 65 73 70 6F 6E
- 73 69 62 6C 65 20 52 48 02 00 00 37 38 1F 00 00
- 22 52 65 73 70 6F 6E 73 69 62 6C 65 20 22 22 73
- 70 65 63 69 61 6C 20 6C 69 6E 65 73 22 22 22 15
- 00 00 53 6F 75 73 63 72 69 70 74 65 75 72 73 20
- 74 72 61 69 74 E9 73 1E 00 00 41 64 6D 69 6E 69
- 73 74 72 61 74 65 75 72 20 73 79 73 74 E8 6D 65
- 20 72 E9 73 65 61 75 78 04 00 00 53 52 49 53 0E
- 00 00 43 6C 61 69 6D 73 20 73 75 70 70 6F 72 74
- 15 00 00 41 63 63 6F 75 6E 74 61 6E 74 2F 20 48
- 52 20 61 64 6D 69 6E 2E                        
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord2CR5 b/trunk/test-data/spreadsheet/BigSSTRecord2CR5
deleted file mode 100644
index e110574..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2CR5
+++ /dev/null
@@ -1,515 +0,0 @@
-                         3C 00 18 20 15 00 00 53
- 65 63 72 65 74 61 72 79 2F 66 61 63 2F 61 64 6D
- 6E 69 73 2E 02 00 00 43 45 17 00 00 43 6C 69 65
- 6E 74 20 52 65 6C 61 74 69 6F 6E 20 4D 61 6E 61
- 67 65 72 02 00 00 4D 4E 04 00 00 38 37 39 36 04
- 00 00 53 52 4E 4D 02 00 00 4D 55 02 00 00 50 52
- 05 00 00 31 32 30 31 31 02 00 00 4D 47 05 00 00
- 31 31 36 31 30 05 00 00 31 30 34 38 33 02 00 00
- 53 43 05 00 00 31 30 32 31 32 02 00 00 4C 55 04
- 00 00 33 36 32 34 08 00 00 53 52 4E 4D 2C 20 41
- 44 02 00 00 4D 57 04 00 00 37 30 33 33 05 00 00
- 31 32 37 34 30 05 00 00 31 31 35 33 38 02 00 00
- 4D 50 02 00 00 4D 46 05 00 00 31 31 34 37 32 04
- 00 00 32 37 30 38 04 00 00 38 32 34 39 02 00 00
- 4D 54 04 00 00 35 39 38 32 04 00 00 36 39 33 36
- 04 00 00 35 34 31 32 04 00 00 35 38 33 37 07 00
- 00 53 52 4E 4D 2C 20 44 02 00 00 41 52 04 00 00
- 37 33 34 32 05 00 00 31 32 39 33 33 04 00 00 36
- 30 36 32 04 00 00 37 38 35 39 19 00 00 41 73 73
- 65 74 20 26 20 4C 69 61 62 69 6C 69 74 79 20 4D
- 61 6E 61 67 65 72 19 00 00 48 65 61 64 20 6F 66
- 20 47 72 6F 75 70 77 61 72 65 26 50 6F 72 74 61
- 6C 73 0F 00 00 48 65 61 64 20 43 49 4F 20 4F 66
- 66 69 63 65 19 00 00 53 65 6E 69 6F 72 20 50 72
- 6F 63 75 72 65 6D 65 6E 74 20 4F 66 66 69 63 2E
- 02 00 00 53 44 18 00 00 48 65 61 64 20 6F 66 20
- 53 65 72 76 65 72 20 45 6E 67 69 6E 65 65 72 2E
- 13 00 00 43 4D 53 20 44 61 74 61 20 43 6F 6E 73
- 75 6C 74 61 6E 74 15 00 00 44 65 70 75 74 79 20
- 50 6F 72 74 61 6C 20 4D 61 6E 61 67 65 72 0B 00
- 00 54 61 78 20 43 6F 75 6E 73 65 6C 02 00 00 4E
- 52 14 00 00 48 65 61 64 20 6F 66 20 41 70 70 2E
- 20 49 6E 74 65 67 72 2E 13 00 00 48 65 61 64 20
- 49 54 20 49 6E 76 65 73 74 6D 65 6E 74 73 09 00
- 00 50 72 75 64 65 6E 74 69 61 04 00 00 38 31 39
- 39 04 00 00 33 31 39 30 05 00 00 31 33 30 39 36
- 04 00 00 38 32 34 37 02 00 00 55 54 04 00 00 35
- 32 35 36 04 00 00 35 32 33 36 05 00 00 31 31 30
- 31 36 04 00 00 34 36 30 32 04 00 00 34 36 30 36
- 05 00 00 31 31 38 32 36 05 00 00 31 31 35 36 31
- 04 00 00 32 34 34 38 05 00 00 31 32 32 31 32 04
- 00 00 36 39 33 37 05 00 00 31 30 31 36 32 05 00
- 00 31 32 34 31 34 04 00 00 38 31 38 35 04 00 00
- 36 39 30 33 04 00 00 33 37 31 36 04 00 00 37 30
- 32 39 04 00 00 36 35 36 35 05 00 00 31 32 39 38
- 35 05 00 00 31 31 31 33 30 04 00 00 32 39 30 35
- 04 00 00 38 34 32 34 04 00 00 34 39 35 36 04 00
- 00 35 34 39 36 04 00 00 32 34 35 34 05 00 00 31
- 32 30 32 32 04 00 00 32 31 38 32 04 00 00 37 37
- 38 31 04 00 00 37 34 33 38 04 00 00 37 32 35 31
- 05 00 00 31 31 31 32 38 05 00 00 31 30 32 30 38
- 05 00 00 31 30 36 38 32 04 00 00 36 39 30 36 04
- 00 00 35 32 33 39 04 00 00 38 38 36 31 05 00 00
- 31 31 30 34 33 05 00 00 31 31 37 32 32 04 00 00
- 36 32 38 36 02 00 00 4C 49 04 00 00 37 31 39 36
- 04 00 00 33 31 39 31 04 00 00 34 33 38 30 04 00
- 00 36 30 38 33 04 00 00 38 35 37 35 04 00 00 36
- 38 33 32 04 00 00 33 39 31 35 03 00 00 31 31 33
- 05 00 00 31 32 39 30 31 05 00 00 31 31 35 32 38
- 04 00 00 35 30 36 39 05 00 00 31 32 38 35 35 05
- 00 00 31 32 31 33 30 04 00 00 36 34 35 35 04 00
- 00 34 39 34 31 04 00 00 33 35 32 35 02 00 00 54
- 45 04 00 00 37 30 33 32 04 00 00 35 32 39 37 05
- 00 00 31 30 32 39 32 04 00 00 39 37 39 31 05 00
- 00 31 30 35 31 39 04 00 00 31 35 30 30 04 00 00
- 33 35 37 34 04 00 00 31 39 32 36 04 00 00 33 35
- 36 33 04 00 00 33 39 35 33 05 00 00 31 31 33 32
- 37 05 00 00 31 32 38 33 36 04 00 00 35 35 33 31
- 04 00 00 36 32 37 37 04 00 00 38 39 33 31 04 00
- 00 35 37 33 30 05 00 00 38 30 33 36 31 15 00 00
- 50 6F 73 69 74 69 6F 6E 20 4E 6F 74 20 44 65 66
- 69 6E 65 64 2C 03 00 00 35 34 32 04 00 00 33 35
- 31 37 05 00 00 31 30 35 36 31 05 00 00 31 30 35
- 36 32 05 00 00 31 30 35 36 33 05 00 00 31 30 35
- 36 38 05 00 00 31 30 35 37 37 05 00 00 31 30 35
- 38 30 11 00 00 4C 65 69 74 65 72 20 50 43 20 53
- 75 70 70 6F 72 74 05 00 00 31 30 35 38 31 05 00
- 00 31 30 35 38 35 05 00 00 31 30 35 38 39 05 00
- 00 31 30 36 30 36 05 00 00 31 30 36 31 33 13 00
- 00 43 72 65 64 69 74 20 52 69 73 6B 20 41 6E 61
- 6C 79 73 74 05 00 00 31 30 36 31 35 05 00 00 31
- 30 36 31 37 15 00 00 45 78 70 65 72 74 65 20 4E
- 61 74 75 72 67 65 66 61 68 72 65 6E 05 00 00 31
- 30 36 31 38 05 00 00 31 30 36 32 35 05 00 00 31
- 30 36 32 36 05 00 00 31 30 36 33 34 05 00 00 31
- 30 36 33 39 0C 00 00 41 73 73 69 73 74 61 6E 74
- 20 43 58 05 00 00 31 30 36 35 37 05 00 00 31 30
- 36 37 35 0E 00 00 4C 65 69 74 65 72 20 53 75 70
- 70 6F 72 74 05 00 00 31 30 36 37 36 05 00 00 31
- 30 36 38 37 05 00 00 31 30 36 39 32 05 00 00 31
- 30 37 30 34 10 00 00 53 70 65 7A 69 61 6C 69 73
- 74 69 6E 20 47 49 53 05 00 00 31 30 37 33 30 05
- 00 00 31 30 37 33 33 05 00 00 31 30 37 34 33 16
- 00 00 48 65 61 64 20 41 70 70 6C 2E 20 44 65 76
- 65 6C 6F 70 6D 65 6E 74 05 00 00 31 30 37 34 36
- 19 00 00 55 6E 69 76 65 72 73 2E 52 65 6C 61 74
- 69 6F 6E 73 20 4D 61 6E 61 67 65 72 05 00 00 31
- 30 37 34 39 05 00 00 31 30 37 36 38 0A 00 00 48
- 65 61 64 20 6F 66 20 49 46 05 00 00 31 30 37 37
- 39 0E 00 00 54 65 61 6D 20 4C 65 61 64 65 72 20
- 50 56 05 00 00 31 30 37 39 37 05 00 00 31 30 38
- 30 33 05 00 00 31 30 38 30 36 05 00 00 31 30 38
- 30 38 05 00 00 31 30 38 31 34 05 00 00 31 30 38
- 32 31 05 00 00 31 30 38 32 35 11 00 00 54 4C 20
- 52 65 63 68 6E 75 6E 67 73 77 65 73 65 6E 05 00
- 00 31 30 38 32 37 0A 00 00 50 43 20 53 75 70 70
- 6F 72 74 05 00 00 31 30 38 32 38 15 00 00 4C 65
- 69 74 65 72 20 53 70 72 61 63 68 65 6E 64 69 65
- 6E 73 74 05 00 00 31 30 38 33 30 15 00 00 53 65
- 6B 72 65 74 E4 72 69 6E 2F 53 61 63 68 62 65 61
- 72 62 2E 05 00 00 31 30 38 33 34 05 00 00 31 30
- 38 33 35 02 00 00 46 49 05 00 00 31 30 38 33 36
- 05 00 00 31 30 38 34 30 05 00 00 31 30 38 34 36
- 05 00 00 31 30 38 36 31 05 00 00 31 30 38 36 32
- 12 00 00 41 75 64 69 74 20 26 20 49 6E 73 70 65
- 63 74 69 6F 6E 05 00 00 31 30 38 36 33 05 00 00
- 31 30 38 37 31 05 00 00 31 30 38 38 33 05 00 00
- 31 30 38 39 30 05 00 00 31 30 38 39 33 17 00 00
- 41 73 73 69 73 74 61 6E 74 20 74 6F 20 44 65 70
- 74 2E 20 48 65 61 64 05 00 00 31 30 38 39 39 05
- 00 00 31 30 39 30 33 05 00 00 31 30 39 30 35 05
- 00 00 31 30 39 31 33 19 00 00 47 72 6C 2E 20 47
- 72 61 66 69 73 63 68 65 20 50 72 6F 64 75 6B 74
- 69 6F 6E 05 00 00 31 30 39 31 35 05 00 00 31 30
- 39 31 38 05 00 00 31 30 39 32 30 05 00 00 31 30
- 39 32 33 05 00 00 31 30 39 32 34 05 00 00 31 30
- 39 33 39 05 00 00 31 30 39 34 32 05 00 00 31 30
- 39 34 33 05 00 00 31 30 39 35 31 05 00 00 31 30
- 39 35 35 05 00 00 31 30 39 35 37 13 00 00 54 65
- 61 6D 6C 65 61 64 65 72 20 52 65 73 65 61 72 63
- 68 05 00 00 31 30 39 36 32 05 00 00 31 30 39 37
- 30 05 00 00 31 30 39 37 34 05 00 00 31 30 39 37
- 35 05 00 00 31 30 39 37 36 05 00 00 31 30 39 38
- 38 05 00 00 31 30 39 39 36 05 00 00 31 31 30 30
- 33 05 00 00 31 31 30 30 34 02 00 00 4D 44 05 00
- 00 31 31 30 30 38 12 00 00 48 65 61 64 20 44 69
- 76 69 73 69 6F 6E 61 6C 20 4D 44 05 00 00 31 31
- 30 30 39 05 00 00 31 31 30 31 32 05 00 00 31 31
- 30 31 33 05 00 00 31 31 30 31 34 16 00 00 47 72
- 75 70 70 65 6E 6C 65 69 74 65 72 20 4D 61 74 65
- 72 69 61 6C 05 00 00 31 31 30 32 33 02 00 00 4B
- 42 05 00 00 31 31 30 32 38 0E 00 00 4B 42 4D 2D
- 50 72 61 6B 74 69 6B 61 6E 74 05 00 00 31 31 30
- 32 39 10 00 00 4B 42 4D 2D 50 72 61 6B 74 69 6B
- 61 6E 74 69 6E 05 00 00 31 31 30 33 30 05 00 00
- 31 31 30 33 31 05 00 00 31 31 30 33 33 05 00 00
- 31 31 30 33 34 05 00 00 31 31 30 33 35 19 00 00
- 55 57 20 4D 67 20 54 72 65 61 74 79 20 50 72 6F
- 70 2E 20 26 20 43 61 73 2E 05 00 00 31 31 30 33
- 36 05 00 00 31 31 30 33 38 05 00 00 31 31 30 33
- 39 17 00 00 55 53 20 47 41 41 50 20 52 65 70 6F
- 72 74 2E 20 4D 61 6E 61 67 65 72 05 00 00 31 31
- 30 34 30 19 00 00 50 72 6F 63 65 73 73 20 4D 61
- 6E 61 67 2E 20 46 69 6E 26 43 6F 6E 74 72 2E 05
- 00 00 31 31 30 34 34 14 00 00 4C 65 67 61 6C 20
- 43 6C 61 69 6D 73 20 43 6F 75 6E 73 65 6C 05 00
- 00 31 31 30 35 31 05 00 00 31 31 30 35 37 05 00
- 00 31 31 30 36 32 05 00 00 31 31 30 37 30 05 00
- 00 31 31 30 37 32 05 00 00 31 31 30 37 37 05 00
- 00 31 31 30 37 38 05 00 00 31 31 30 38 30 05 00
- 00 31 31 30 38 31 19 00 00 54 65 61 6D 6C 65 69
- 74 65 72 69 6E 20 53 65 6B 72 65 74 2E 2F 56 65
- 72 77 05 00 00 31 31 30 38 32 0E 00 00 53 65 6E
- 69 6F 72 20 41 6E 61 6C 79 73 74 02 00 00 47 4F
- 05 00 00 31 31 30 38 36 05 00 00 31 31 30 38 37
- 05 00 00 31 31 30 38 38 05 00 00 31 31 30 38 39
- 15 00 00 53 74 76 2E 20 42 65 74 72 69 65 62 73
- 6C 65 69 74 65 72 69 6E 05 00 00 31 31 30 39 30
- 05 00 00 31 31 30 39 31 05 00 00 31 31 30 39 34
- 05 00 00 31 31 30 39 36 05 00 00 31 31 30 39 38
- 05 00 00 31 31 30 39 39 05 00 00 31 31 31 30 30
- 05 00 00 31 31 31 30 31 05 00 00 31 31 31 30 32
- 05 00 00 31 31 31 30 33 05 00 00 31 31 31 30 39
- 05 00 00 31 31 31 33 33 05 00 00 31 31 31 33 35
- 05 00 00 31 31 31 33 38 0A 00 00 4B FC 63 68 65
- 6E 63 68 65 66 05 00 00 31 31 31 33 39 05 00 00
- 31 31 31 34 32 05 00 00 31 31 31 34 34 05 00 00
- 31 31 31 34 35 05 00 00 31 31 31 34 36 16 00 00
- 48 65 61 64 20 6F 66 20 54 65 63 68 2E 20 54 72
- 61 69 6E 69 6E 67 05 00 00 31 31 31 34 37 19 00
- 00 42 65 74 72 69 65 62 73 6C 65 69 74 65 72 69
- 6E 20 52 65 73 74 2E 20 47 4F 05 00 00 31 31 31
- 35 33 05 00 00 31 31 31 35 35 19 00 00 54 65 6C
- 65 6D 61 74 69 6B 20 53 79 73 74 65 6D 69 6E 67
- 65 6E 69 65 75 72 05 00 00 31 31 31 35 38 05 00
- 00 31 31 31 36 30 05 00 00 31 31 31 36 35 05 00
- 00 31 31 31 36 37 05 00 00 31 31 31 36 38 05 00
- 00 31 31 31 36 39 05 00 00 31 31 31 37 30 17 00
- 00 48 6F 74 65 6C 66 61 63 68 61 73 73 69 73 74
- 65 6E 74 69 6E 20 4C 4C 05 00 00 31 31 31 37 31
- 05 00 00 31 31 31 37 32 05 00 00 31 31 31 37 33
- 05 00 00 31 31 31 37 34 05 00 00 31 31 31 37 35
- 05 00 00 31 31 31 37 36 05 00 00 31 31 31 37 37
- 05 00 00 31 31 31 37 38 05 00 00 31 31 31 37 39
- 05 00 00 31 31 31 38 30 05 00 00 31 31 31 38 31
- 05 00 00 31 31 31 38 32 05 00 00 31 31 31 38 33
- 05 00 00 31 31 31 38 34 05 00 00 31 31 31 38 35
- 05 00 00 31 31 31 38 37 05 00 00 31 31 31 38 38
- 05 00 00 31 31 31 39 31 05 00 00 31 31 31 39 33
- 05 00 00 31 31 31 39 34 17 00 00 42 65 74 72 69
- 65 62 73 6C 65 69 74 65 72 20 52 65 73 74 2E 20
- 54 55 05 00 00 31 31 31 39 35 05 00 00 31 31 31
- 39 36 05 00 00 31 31 31 39 37 05 00 00 31 31 31
- 39 38 05 00 00 31 31 31 39 39 05 00 00 31 31 32
- 30 30 05 00 00 31 31 32 30 31 05 00 00 31 31 32
- 30 32 05 00 00 31 31 32 30 34 05 00 00 31 31 32
- 30 35 05 00 00 31 31 32 30 36 05 00 00 31 31 32
- 30 37 05 00 00 31 31 32 30 39 05 00 00 31 31 32
- 31 38 14 00 00 49 2D 26 20 44 2D 41 73 73 69 73
- 74 65 6E 74 69 6E 20 4C 4C 05 00 00 31 31 32 31
- 39 12 00 00 50 65 72 73 6F 6E 61 6C 65 6E 74 77
- 69 63 6B 6C 65 72 05 00 00 31 31 32 34 33 05 00
- 00 31 31 32 34 35 05 00 00 31 31 32 34 38 05 00
- 00 31 31 32 34 39 05 00 00 31 31 32 35 30 05 00
- 00 31 31 32 35 39 05 00 00 31 31 32 36 33 05 00
- 00 31 31 32 36 36 19 00 00 53 65 6E 69 6F 72 20
- 41 63 63 6F 75 6E 74 2E 20 43 6F 6E 73 6F 6C 69
- 64 2E 05 00 00 31 31 32 37 31 05 00 00 31 31 32
- 37 32 05 00 00 31 31 32 39 30 05 00 00 31 31 32
- 39 31 05 00 00 31 31 32 39 32 05 00 00 31 31 32
- 39 33 05 00 00 31 31 33 30 36 05 00 00 31 31 33
- 30 38 05 00 00 31 31 33 33 30 05 00 00 31 31 33
- 33 34 05 00 00 31 31 33 33 35 05 00 00 31 31 33
- 34 33 14 00 00 42 65 74 72 69 65 62 73 70 72 61
- 6B 74 69 6B 65 72 2D 4C 4C 05 00 00 31 31 33 35
- 31 16 00 00 4D 69 74 61 72 62 2E 20 57 61 72 65
- 6E 6B 6F 6E 74 72 6F 6C 6C 65 05 00 00 31 31 33
- 35 35 05 00 00 31 31 33 35 38 05 00 00 31 31 33
- 36 34 17 00 00 4C 65 69 74 65 72 69 6E 20 52 65
- 70 72 E4 73 65 6E 74 61 74 69 6F 6E 05 00 00 31
- 31 33 36 38 11 00 00 4A 75 6E 69 6F 72 20 41 63
- 63 6F 75 6E 74 61 6E 74 05 00 00 31 31 33 37 30
- 05 00 00 31 31 33 37 34 05 00 00 31 31 33 37 38
- 14 00 00 46 72 61 6E 7A 2E 20 55 65 62 65 72 73
- 65 74 7A 65 72 69 6E 05 00 00 31 31 33 38 30 14
- 00 00 43 46 4F 20 42 65 72 6D 75 64 61 20 42 72
- 61 6E 63 68 65 73 05 00 00 31 31 33 38 37 0A 00
- 00 33 32 34 2C 20 53 65 6F 75 6C 05 00 00 31 31
- 33 39 39 18 00 00 54 65 61 6D 6C 65 69 74 65 72
- 49 6E 20 53 65 6B 72 65 74 61 72 69 61 74 05 00
- 00 31 31 34 32 35 05 00 00 31 31 34 32 38 05 00
- 00 31 31 34 33 39 05 00 00 31 31 34 34 30 05 00
- 00 31 31 34 34 32 05 00 00 31 31 34 34 34 05 00
- 00 31 31 34 34 39 17 00 00 48 65 61 64 20 6F 66
- 20 50 72 69 63 69 6E 67 20 43 6F 6E 74 72 6F 6C
- 05 00 00 31 31 34 36 33 05 00 00 31 31 34 36 34
- 18 00 00 42 61 75 6C 65 69 74 65 72 2F 43 41 44
- 20 53 70 65 7A 69 61 6C 69 73 74 05 00 00 31 31
- 34 36 35 05 00 00 31 31 34 36 37 05 00 00 31 31
- 34 37 39 05 00 00 31 31 34 38 39 0D 00 00 54 4C
- 20 41 56 2D 54 65 63 68 6E 69 6B 05 00 00 31 31
- 35 30 33 05 00 00 31 31 35 32 31 05 00 00 31 31
- 35 33 31 05 00 00 31 31 35 33 39 05 00 00 31 31
- 35 34 31 05 00 00 31 31 35 34 37 05 00 00 31 31
- 35 34 39 05 00 00 31 31 35 37 39 05 00 00 31 31
- 35 39 33 15 00 00 48 52 2D 4D 49 53 2D 50 72 6F
- 6A 65 63 74 6D 61 6E 61 67 65 72 05 00 00 31 31
- 35 39 38 05 00 00 31 31 36 32 33 17 00 00 48 52
- 20 50 72 6F 63 65 73 73 65 73 20 26 20 50 72 6F
- 6A 65 63 74 73 05 00 00 31 31 36 32 38 05 00 00
- 31 31 36 33 39 05 00 00 31 31 36 35 31 19 00 00
- 46 72 6F 6E 74 20 4F 66 66 69 63 65 20 26 20 45
- 76 65 6E 74 73 20 4D 67 72 05 00 00 31 31 36 35
- 37 05 00 00 31 31 36 36 38 05 00 00 31 31 36 36
- 39 05 00 00 31 31 36 37 31 05 00 00 31 31 36 37
- 39 05 00 00 31 31 36 38 31 12 00 00 54 65 61 6D
- 6C 65 69 74 65 72 20 45 6C 65 6B 74 72 6F 05 00
- 00 31 31 36 38 34 05 00 00 31 31 36 38 36 05 00
- 00 31 31 36 38 37 05 00 00 31 31 36 38 38 05 00
- 00 31 30 35 39 33 05 00 00 31 31 35 36 39 05 00
- 00 31 31 35 33 30 02 00 00 4C 53 04 00 00 34 33
- 32 37 04 00 00 36 39 34 37 05 00 00 31 32 31 34
- 31 05 00 00 31 31 30 37 34 04 00 00 39 35 36 33
- 05 00 00 31 30 38 33 37 04 00 00 38 33 38 31 05
- 00 00 31 30 31 39 38 05 00 00 31 31 30 35 36 09
- 00 00 53 52 4E 4D 2C 20 44 2F 50 05 00 00 31 31
- 30 30 32 04 00 00 34 32 32 33 04 00 00 37 32 37
- 30 02 00 00 53 4E 04 00 00 38 38 31 38 05 00 00
- 31 31 33 34 38 04 00 00 37 31 36 37 04 00 00 35
- 39 39 30 04 00 00 36 32 35 32 02 00 00 50 42 05
- 00 00 31 30 39 31 36 05 00 00 31 30 39 39 30 04
- 00 00 37 32 32 35 04 00 00 35 35 31 35 04 00 00
- 33 33 38 32 05 00 00 31 30 39 30 32 05 00 00 31
- 32 33 38 34 04 00 00 39 37 38 35 04 00 00 35 30
- 31 34 04 00 00 33 33 30 37 07 00 00 42 65 72 6D
- 75 64 61 05 00 00 46 41 4C 53 45 04 00 00 39 35
- 30 37 04 00 00 35 31 30 39 04 00 00 36 31 38 32
- 04 00 00 36 32 32 39 04 00 00 33 36 37 35 04 00
- 00 39 38 36 33 05 00 00 31 31 39 34 34 04 00 00
- 38 31 36 38 04 00 00 38 37 31 35 04 00 00 37 31
- 37 38 05 00 00 31 32 37 39 35 04 00 00 36 36 39
- 31 04 00 00 36 31 34 35 04 00 00 36 39 39 32 05
- 00 00 31 31 30 37 35 04 00 00 39 37 34 33 04 00
- 00 36 30 35 30 04 00 00 38 36 36 35 04 00 00 33
- 39 37 38 04 00 00 34 30 35 36 05 00 00 31 30 33
- 30 38 04 00 00 34 36 31 39 04 00 00 33 32 37 31
- 05 00 00 31 30 37 35 35 04 00 00 38 32 38 31 05
- 00 00 31 32 30 39 35 05 00 00 31 32 33 38 31 05
- 00 00 31 30 39 32 31 05 00 00 31 30 39 33 36 04
- 00 00 36 38 34 31 04 00 00 33 39 30 35 04 00 00
- 33 32 32 39 04 00 00 37 35 38 32 05 00 00 31 31
- 35 33 32 04 00 00 36 37 32 39 05 00 00 31 32 30
- 30 31 05 00 00 31 32 30 30 35 05 00 00 31 32 30
- 31 32 05 00 00 31 32 30 31 33 05 00 00 31 32 30
- 32 31 05 00 00 31 32 30 32 35 05 00 00 31 32 30
- 32 36 05 00 00 31 32 30 33 31 05 00 00 31 32 30
- 34 39 05 00 00 31 32 30 36 30 05 00 00 31 32 30
- 36 31 05 00 00 31 32 30 36 32 05 00 00 31 32 30
- 37 38 05 00 00 31 32 30 38 31 05 00 00 31 32 30
- 38 35 15 00 00 53 61 63 68 62 65 61 72 62 65 69
- 74 65 72 69 6E 20 42 65 62 75 05 00 00 31 32 30
- 38 36 05 00 00 31 32 30 38 37 05 00 00 31 32 30
- 38 39 05 00 00 31 32 30 39 32 18 00 00 41 73 73
- 69 73 74 65 6E 74 69 6E 20 56 52 2D 50 72 E4 73
- 69 64 65 6E 74 05 00 00 31 32 30 39 34 05 00 00
- 31 32 30 39 38 05 00 00 31 32 30 39 39 05 00 00
- 31 32 31 30 30 05 00 00 31 32 31 30 37 05 00 00
- 31 32 31 30 39 05 00 00 31 32 31 31 30 05 00 00
- 31 32 31 32 31 05 00 00 31 32 31 32 32 02 00 00
- 41 50 05 00 00 31 32 31 32 38 05 00 00 31 32 31
- 32 39 05 00 00 31 32 31 33 31 16 00 00 41 64 76
- 65 72 74 69 73 69 6E 67 20 53 70 65 63 69 61 6C
- 69 73 74 05 00 00 31 32 31 33 33 05 00 00 31 32
- 31 33 37 05 00 00 31 32 31 33 38 05 00 00 31 32
- 31 35 38 05 00 00 31 32 31 36 31 05 00 00 31 32
- 31 36 32 05 00 00 31 32 31 36 33 05 00 00 31 32
- 31 36 35 05 00 00 31 32 31 38 31 05 00 00 31 32
- 31 38 34 05 00 00 31 32 31 38 39 05 00 00 31 32
- 31 39 30 05 00 00 31 32 31 39 31 05 00 00 31 32
- 31 39 38 05 00 00 31 32 32 30 31 05 00 00 31 32
- 32 30 38 12 00 00 4B 69 6F 73 6B 6D 69 74 61 72
- 62 65 69 74 65 72 69 6E 05 00 00 31 32 32 31 30
- 15 00 00 4F 70 65 72 61 74 69 6F 6E 73 20 4D 61
- 6E 61 67 65 72 20 43 58 05 00 00 31 32 32 31 36
- 0A 00 00 48 65 61 64 20 6F 66 20 43 50 11 00 00
- 4D 61 6E 68 61 74 74 61 6E 20 4E 59 2C 20 55 53
- 41 05 00 00 31 32 32 31 38 05 00 00 31 32 32 32
- 31 02 00 00 41 41 05 00 00 31 32 32 32 33 05 00
- 00 31 32 32 32 39 05 00 00 31 32 32 33 31 05 00
- 00 31 32 32 33 34 05 00 00 31 32 32 34 37 05 00
- 00 31 32 32 35 31 05 00 00 31 32 32 36 37 05 00
- 00 31 32 32 37 38 11 00 00 4A 75 6E 69 6F 72 20
- 43 6F 6E 74 72 6F 6C 6C 65 72 05 00 00 31 32 32
- 38 33 05 00 00 31 32 32 39 30 05 00 00 31 32 32
- 39 31 05 00 00 31 32 33 30 33 05 00 00 31 32 33
- 30 35 05 00 00 31 32 33 31 33 09 00 00 41 73 73
- 6F 63 69 61 74 65 05 00 00 31 32 33 31 34 05 00
- 00 31 32 33 32 32 15 00 00 4C 65 69 74 65 72 20
- 53 79 73 74 65 6D 2D 54 65 63 68 6E 69 6B 05 00
- 00 31 32 33 32 33 19 00 00 41 72 63 68 69 76 65
- 20 26 20 52 65 63 6F 72 64 73 20 4D 61 6E 61 67
- 65 72 05 00 00 31 32 33 32 34 05 00 00 31 32 33
- 32 37 05 00 00 31 32 33 33 36 05 00 00 31 32 33
- 33 37 05 00 00 31 32 33 33 38 05 00 00 31 32 33
- 34 36 05 00 00 31 32 33 34 37 05 00 00 31 32 33
- 36 30 05 00 00 31 32 33 36 37 05 00 00 31 32 33
- 37 37 05 00 00 31 32 33 38 33 05 00 00 31 32 34
- 31 36 16 00 00 48 65 61 64 20 6F 66 20 47 72 6F
- 75 70 20 52 65 73 65 72 76 65 73 05 00 00 31 32
- 34 32 37 12 00 00 46 FC 68 72 75 6E 67 73 2D 41
- 73 73 69 73 74 65 6E 74 05 00 00 31 32 34 34 34
- 05 00 00 31 32 34 35 30 05 00 00 31 32 34 35 31
- 05 00 00 31 32 34 35 33 05 00 00 31 32 34 35 39
- 19 00 00 53 74 76 2E 20 48 61 75 73 77 69 72 74
- 73 63 68 2E 4C 65 69 74 65 72 69 6E 05 00 00 31
- 32 34 36 30 02 00 00 48 4D 05 00 00 31 32 34 36
- 31 10 00 00 48 4D 53 2D 50 72 61 6B 74 69 6B 61
- 6E 74 69 6E 05 00 00 31 32 34 36 32 0E 00 00 48
- 4D 53 2D 50 72 61 6B 74 69 6B 61 6E 74 05 00 00
- 31 32 34 36 33 05 00 00 31 32 34 36 34 05 00 00
- 31 32 34 36 35 05 00 00 31 32 34 36 37 05 00 00
- 31 32 34 36 38 05 00 00 31 32 34 36 39 13 00 00
- 53 65 72 76 69 63 65 66 61 63 68 6C 65 68 72 6C
- 69 6E 67 05 00 00 31 32 34 37 30 05 00 00 31 32
- 34 37 31 05 00 00 31 32 34 37 32 05 00 00 31 32
- 34 37 34 05 00 00 31 32 34 37 35 05 00 00 31 32
- 34 37 36 05 00 00 31 32 34 37 37 05 00 00 31 32
- 34 37 38 05 00 00 31 32 34 38 30 05 00 00 31 32
- 34 38 31 05 00 00 31 32 34 38 33 05 00 00 31 32
- 34 38 34 05 00 00 31 32 34 38 35 05 00 00 31 32
- 34 38 36 05 00 00 31 32 34 38 37 05 00 00 31 32
- 34 38 38 05 00 00 31 32 34 38 39 05 00 00 31 32
- 34 39 30 05 00 00 31 32 34 39 31 05 00 00 31 32
- 34 39 32 05 00 00 31 32 34 39 33 05 00 00 31 32
- 35 30 30 17 00 00 42 65 74 72 69 65 62 73 6C 65
- 69 74 65 72 20 52 65 73 74 2E 20 4B 48 05 00 00
- 31 32 35 30 31 05 00 00 31 32 35 30 32 11 00 00
- 48 61 75 73 77 69 72 74 73 63 68 61 66 74 73 6D
- 2E 05 00 00 31 32 35 30 36 05 00 00 31 32 35 30
- 37 05 00 00 31 32 35 31 31 05 00 00 31 32 35 31
- 33 05 00 00 31 32 35 31 36 17 00 00 53 65 6E 69
- 6F 72 20 4D 65 64 69 61 20 43 6F 6E 73 75 6C 74
- 61 6E 74 05 00 00 31 32 35 31 37 05 00 00 31 32
- 35 31 38 05 00 00 31 32 35 31 39 19 00 00 4C 65
- 69 74 65 72 20 4C 61 67 65 72 62 65 77 69 72 74
- 73 63 68 61 66 74 2E 05 00 00 31 32 35 32 30 0D
- 00 00 4E 69 67 68 74 20 41 75 64 69 74 6F 72 05
- 00 00 31 32 35 32 36 13 00 00 4C 65 69 74 65 72
- 20 4A 75 6E 69 6F 72 20 50 6F 77 65 72 05 00 00
- 31 32 35 33 32 05 00 00 31 32 35 33 33 05 00 00
- 31 32 35 33 36 05 00 00 31 32 35 33 37 17 00 00
- 41 73 73 69 73 74 61 6E 74 20 6F 66 20 44 65 70
- 61 72 74 6D 65 6E 74 05 00 00 31 32 35 33 38 05
- 00 00 31 32 35 34 30 05 00 00 31 32 35 34 35 05
- 00 00 31 32 35 35 31 05 00 00 31 32 35 35 32 05
- 00 00 31 32 35 36 32 15 00 00 41 75 64 69 6F 2D
- 56 69 64 65 6F 20 53 75 70 70 6F 72 74 65 72 05
- 00 00 31 32 35 36 34 0E 00 00 43 68 65 66 20 64
- 65 20 50 61 72 74 69 65 05 00 00 31 32 35 36 38
- 05 00 00 31 32 35 37 31 05 00 00 31 32 35 37 32
- 13 00 00 53 74 76 2E 20 42 65 74 72 69 65 62 73
- 6C 65 69 74 65 72 05 00 00 31 32 35 37 35 05 00
- 00 31 32 35 37 36 05 00 00 31 32 35 37 37 05 00
- 00 31 32 35 37 38 05 00 00 31 32 35 38 30 11 00
- 00 53 6F 63 69 61 6C 20 43 6F 6E 73 75 6C 74 61
- 6E 74 05 00 00 31 32 35 38 31 05 00 00 31 32 35
- 38 33 14 00 00 54 65 61 6D 6C 2E 20 52 E9 63 2E
- 20 41 64 6C 69 73 77 69 6C 05 00 00 31 32 35 38
- 39 05 00 00 31 32 35 39 31 05 00 00 31 32 36 30
- 35 05 00 00 31 32 36 30 36 05 00 00 31 32 36 30
- 39 0B 00 00 43 68 65 66 20 64 65 20 42 61 72 05
- 00 00 31 32 36 31 32 19 00 00 48 65 61 64 20 43
- 6F 72 53 70 6F 6E 73 26 50 75 62 6C 41 66 66 61
- 69 72 73 05 00 00 31 32 36 32 34 05 00 00 31 32
- 36 33 33 05 00 00 31 32 36 34 34 05 00 00 31 32
- 36 35 39 05 00 00 31 32 36 36 31 05 00 00 31 32
- 36 36 33 05 00 00 31 32 36 36 34 05 00 00 31 32
- 36 36 37 05 00 00 31 32 36 36 38 05 00 00 31 32
- 36 37 38 05 00 00 31 32 36 38 30 05 00 00 31 32
- 36 38 31 05 00 00 31 32 36 38 32 05 00 00 31 32
- 36 38 33 13 00 00 53 69 63 68 65 72 68 65 69 74
- 73 66 61 63 68 6D 61 6E 6E 05 00 00 31 32 36 39
- 34 05 00 00 31 32 36 39 35 05 00 00 31 32 36 39
- 36 11 00 00 53 61 63 68 62 65 61 72 62 65 69 74
- 65 72 20 50 56 05 00 00 31 32 36 39 37 05 00 00
- 31 32 37 30 31 05 00 00 31 32 37 31 32 05 00 00
- 31 32 37 31 39 05 00 00 31 32 37 32 30 05 00 00
- 31 32 37 32 33 05 00 00 31 32 37 32 38 05 00 00
- 31 32 37 33 39 05 00 00 31 32 37 34 31 0A 00 00
- 41 6C 6C 72 6F 75 6E 64 65 72 05 00 00 31 32 37
- 34 32 05 00 00 31 32 37 34 39 16 00 00 4D 67 72
- 20 4B 6E 6F 77 6C 65 64 67 65 20 4E 65 74 77 6F
- 72 6B 73 05 00 00 31 32 37 35 31 05 00 00 31 32
- 37 36 35 05 00 00 31 32 37 36 36 05 00 00 31 32
- 37 36 39 05 00 00 31 32 37 37 30 08 00 00 4F 70
- 65 72 61 74 6F 72 05 00 00 31 32 37 38 34 16 00
- 00 41 73 73 69 73 74 61 6E 74 20 4A 75 6E 69 6F
- 72 20 50 6F 77 65 72 05 00 00 31 32 37 38 35 15
- 00 00 4D 75 6C 74 69 6D 65 64 69 61 20 53 70 65
- 63 69 61 6C 69 73 74 05 00 00 31 32 37 38 37 05
- 00 00 31 32 37 39 30 0C 00 00 33 32 34 2C 20 42
- 65 69 6A 69 6E 67 05 00 00 31 32 37 39 32 05 00
- 00 31 32 37 39 34 05 00 00 31 32 37 39 38 05 00
- 00 31 32 37 39 39 05 00 00 31 32 38 30 31 05 00
- 00 31 32 38 30 32 05 00 00 31 32 38 30 33 05 00
- 00 31 32 38 30 37 05 00 00 31 32 38 31 30 05 00
- 00 31 32 38 31 31 05 00 00 31 32 38 31 33 05 00
- 00 31 32 38 31 36 05 00 00 31 32 38 31 37 05 00
- 00 31 32 38 31 38 05 00 00 31 32 38 31 39 05 00
- 00 31 32 38 32 30 05 00 00 31 32 38 32 32 05 00
- 00 31 32 38 32 33 05 00 00 31 32 38 32 35 05 00
- 00 31 32 38 32 36 19 00 00 48 65 61 64 20 50 72
- 6F 63 65 73 73 26 50 65 72 66 6F 72 6D 2E 4D 67
- 74 2E 05 00 00 31 32 38 32 38 05 00 00 31 32 38
- 33 30 05 00 00 31 32 38 33 31 05 00 00 31 32 38
- 33 33 05 00 00 31 32 38 33 35 05 00 00 31 32 38
- 33 37 05 00 00 31 32 38 33 38 05 00 00 31 32 38
- 33 39 05 00 00 31 32 38 34 31 05 00 00 31 32 38
- 34 33 05 00 00 31 32 38 35 33 05 00 00 31 32 38
- 35 38 05 00 00 31 32 38 35 39 05 00 00 31 32 38
- 36 31 05 00 00 31 32 38 37 31 05 00 00 31 32 38
- 37 39 05 00 00 31 32 38 38 31 05 00 00 31 32 38
- 38 32 05 00 00 31 32 38 38 33 05 00 00 31 32 38
- 38 34 05 00 00 31 32 38 38 35 05 00 00 31 32 38
- 38 37 05 00 00 31 32 38 39 30 05 00 00 31 32 39
- 30 33 05 00 00 31 32 39 30 34 05 00 00 31 32 39
- 30 35 05 00 00 31 32 39 31 37 10 00 00 47 72 6F
- 75 70 20 43 6F 6E 74 72 6F 6C 6C 65 72 05 00 00
- 31 32 39 32 32 05 00 00 31 32 39 32 35 05 00 00
- 31 32 39 32 36 19 00 00 49 6E 74 65 72 6E 61 74
- 69 6F 6E 61 6C 20 54 61 78 20 43 6F 75 6E 73 65
- 6C 05 00 00 31 32 39 35 31 05 00 00 31 32 39 35
- 33 05 00 00 31 32 39 35 36 05 00 00 31 32 39 35
- 38 19 00 00 4A 75 6E 2E 20 41 70 70 6C 69 63 61
- 74 69 6F 6E 20 45 6E 67 69 6E 65 65 72 05 00 00
- 31 32 39 36 38 05 00 00 31 32 39 37 33 05 00 00
- 31 32 39 37 34 05 00 00 31 32 39 38 31 05 00 00
- 31 32 39 39 39 05 00 00 31 33 30 30 30 05 00 00
- 31 33 30 30 33 05 00 00 31 33 30 30 34 05 00 00
- 31 33 30 31 39 05 00 00 31 33 30 32 39 05 00 00
- 31 33 30 33 32 05 00 00 31 33 30 33 34 05 00 00
- 31 33 30 34 31 05 00 00 31 33 30 36 31 05 00 00
- 31 33 30 36 34 05 00 00 31 33 30 36 35 05 00 00
- 31 33 30 38 35 05 00 00 31 33 30 38 36 05 00 00
- 31 33 31 30 31 05 00 00 31 33 31 33 30 05 00 00
- 31 33 31 33 37 05 00 00 31 33 31 34 31 02 00 00
- 4E 59 05 00 00 38 30 30 31 36 1C 00 00 48 65 61
- 64 20 6F 66 20 45 63 6F 6E 6F 6D 69 63 20 52 65
- 73 65 61 72 63 68 20 4E 59 05 00 00 38 30 31 35
- 39 05 00 00 38 30 32 36 35 05 00 00 38 30 35 36
- 39 05 00 00 38 30 31 36 34 26 00 00 48 65 61 64
- 20 6F 66 20 4B 6E 6F 77 6C 65 64 67 65 20 26 20
- 49 6E 66 6F 72 6D 61 74 69 6F 6E 20 4D 67 6E 74
- 2E 2C 06 00 00 41 72 6D 6F 6E 6B 19 00 00 48 65
- 61 64 20 6F 66 20 55 6E 64 65 72 77 72 69 74 69
- 6E 67 20 53 65 72 76 19 00 00 48 65 61 64 20 6F
- 66 20 53 74 72 61 74 2E 26 20 44 65 76 2E 20 55
- 6E 69 74 08 00 00 33 32 34 2D 53 6F 75 6C 05 00
- 00 4C 45 47 41 4C 04 00 00 4C 45 31 31 05 00 00
- 38 30 33 35 39 0F 00 00 47 65 6E 65 72 61 6C 20
- 43 6F 75 6E 73 65 6C 03 00 00 30 30 31 09 00 00
- 42 72 75 78 65 6C 6C 65 73 10 00 00 4D 65 64 65
- 78 20 53 70 65 63 69 61 6C 69 73 74 02 00 00 4D
- 4F 02 00 00 54 4F 02 00 00 50 46 06 00 00 4C 30
- 30 35 38 32                                    
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord2CR6 b/trunk/test-data/spreadsheet/BigSSTRecord2CR6
deleted file mode 100644
index a937fe4..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2CR6
+++ /dev/null
@@ -1,515 +0,0 @@
-             3C 00 1A 20 02 00 00 53 4C 02 00 00
- 5A 48 02 00 00 46 50 02 00 00 44 44 02 00 00 49
- 5A 12 00 00 43 75 73 74 6F 64 79 20 4D 61 6E 61
- 67 65 6D 65 6E 74 13 00 00 55 73 65 72 20 53 75
- 70 70 6F 72 74 20 48 69 50 6F 72 74 19 00 00 48
- 65 61 64 20 49 6E 76 65 73 74 6D 65 6E 74 20 43
- 65 6E 74 65 72 20 5A 48 0E 00 00 41 64 6D 69 6E
- 69 73 74 72 61 74 69 6F 6E 16 00 00 44 65 70 75
- 74 79 20 44 65 70 61 72 74 6D 65 6E 74 20 48 65
- 61 64 02 00 00 49 47 14 00 00 55 6E 64 65 72 77
- 72 69 74 69 6E 67 20 4D 61 6E 61 67 65 72 11 00
- 00 48 65 61 64 20 46 69 78 65 64 20 49 6E 63 6F
- 6D 65 02 00 00 57 49 02 00 00 46 4E 02 00 00 4C
- 46 16 00 00 48 65 61 64 20 49 6E 76 65 73 74 6D
- 65 6E 74 20 41 64 6D 69 6E 2E 02 00 00 54 41 18
- 00 00 48 65 61 64 20 54 61 63 74 69 63 61 6C 20
- 41 6C 6C 6F 63 61 74 69 6F 6E 18 00 00 4F 70 65
- 72 61 74 69 6F 6E 73 20 26 20 54 61 78 20 4F 66
- 66 69 63 65 72 02 00 00 41 4D 12 00 00 53 65 6E
- 69 6F 72 20 43 61 73 75 61 6C 74 79 20 55 57 02
- 00 00 45 51 16 00 00 44 69 76 2E 20 46 69 6E 61
- 6E 63 69 61 6C 20 4F 66 66 69 63 65 72 02 00 00
- 49 49 18 00 00 41 73 73 69 73 74 65 6E 74 69 6E
- 20 4C 49 2D 56 65 72 77 61 6C 74 65 72 0C 00 00
- 53 65 63 74 69 6F 6E 20 48 65 61 64 02 00 00 50
- 56 02 00 00 44 55 11 00 00 4C 65 69 74 65 72 20
- 48 79 70 6F 74 68 65 6B 65 6E 19 00 00 48 65 61
- 64 20 53 65 63 74 6F 72 20 53 74 72 61 74 2E 20
- 45 75 72 6F 70 65 0D 00 00 48 65 61 64 20 45 71
- 75 69 74 69 65 73 19 00 00 4C 69 65 67 65 6E 73
- 63 68 61 66 74 65 6E 76 65 72 77 61 6C 74 65 72
- 69 6E 19 00 00 44 65 70 75 74 79 20 48 65 61 64
- 20 49 6E 76 65 73 74 2E 41 64 6D 69 6E 2E 14 00
- 00 4C 65 69 74 65 72 20 4C 49 2D 56 65 72 77 61
- 6C 74 75 6E 67 04 00 00 38 36 37 31 03 00 00 35
- 36 39 03 00 00 31 33 30 04 00 00 31 37 34 30 03
- 00 00 32 30 36 0A 00 00 49 54 20 4D 61 6E 61 67
- 65 72 03 00 00 35 34 31 0C 00 00 49 54 20 45 78
- 65 63 75 74 69 76 65 0E 00 00 4F 66 66 69 63 65
- 20 4D 61 6E 61 67 65 72 04 00 00 35 37 30 32 04
- 00 00 38 35 36 32 18 00 00 4D 67 72 20 52 65 73
- 65 61 72 63 68 20 26 20 43 6F 6D 6D 75 6E 69 63
- 2E 04 00 00 38 35 36 39 04 00 00 36 35 32 31 04
- 00 00 39 31 36 31 03 00 00 35 39 37 04 00 00 32
- 30 34 31 03 00 00 33 36 33 1A 00 00 52 65 63 65
- 70 74 69 6F 6E 69 73 74 2F 54 65 6C 65 70 68 6F
- 6E 65 20 4F 70 2E 03 00 00 33 36 34 04 00 00 36
- 30 35 32 0F 00 00 48 75 6D 61 6E 20 52 65 73 6F
- 75 72 63 65 73 03 00 00 31 32 38 03 00 00 31 30
- 34 1E 00 00 47 65 6E 65 72 61 6C 20 4D 67 72 20
- 4E 6F 6E 2D 4C 69 66 65 20 28 53 69 6E 67 61 70
- 2E 29 03 00 00 34 39 31 0A 00 00 30 33 2E 30 38
- 2E 31 39 39 38 0A 00 00 31 36 2E 30 38 2E 31 39
- 36 34 0A 00 00 30 31 2E 30 37 2E 31 39 39 38 0A
- 00 00 32 34 2E 30 31 2E 31 39 35 36 0A 00 00 30
- 31 2E 30 37 2E 31 39 39 36 0A 00 00 30 34 2E 30
- 36 2E 31 39 36 32 0A 00 00 30 36 2E 30 33 2E 32
- 30 30 30 0A 00 00 31 36 2E 30 36 2E 31 39 36 35
- 0A 00 00 31 35 2E 30 38 2E 32 30 30 30 0A 00 00
- 31 37 2E 30 37 2E 31 39 37 31 0A 00 00 30 31 2E
- 30 32 2E 31 39 39 39 0A 00 00 30 35 2E 31 32 2E
- 31 39 37 32 0A 00 00 30 32 2E 30 32 2E 32 30 30
- 30 0A 00 00 32 33 2E 30 31 2E 31 39 37 35 0A 00
- 00 30 31 2E 30 39 2E 31 39 39 37 0A 00 00 32 30
- 2E 30 36 2E 31 39 36 39 0A 00 00 30 32 2E 30 36
- 2E 31 39 39 37 0A 00 00 32 31 2E 30 32 2E 31 39
- 37 35 0A 00 00 31 31 2E 30 38 2E 31 39 39 37 0A
- 00 00 30 31 2E 30 39 2E 31 39 37 33 0A 00 00 30
- 32 2E 30 35 2E 31 39 37 32 0A 00 00 30 31 2E 30
- 39 2E 31 39 39 35 15 00 00 45 6E 67 69 6E 65 65
- 72 69 6E 67 20 41 73 73 69 73 74 61 6E 74 0A 00
- 00 32 36 2E 30 38 2E 31 39 38 30 0A 00 00 31 39
- 2E 31 30 2E 31 39 39 38 0A 00 00 31 35 2E 30 36
- 2E 31 39 36 30 0A 00 00 30 31 2E 30 34 2E 31 39
- 39 36 0A 00 00 31 39 2E 31 32 2E 31 39 36 34 0A
- 00 00 32 37 2E 31 30 2E 31 39 36 36 0A 00 00 32
- 37 2E 30 38 2E 31 39 37 34 0A 00 00 31 30 2E 30
- 37 2E 31 39 39 35 0A 00 00 33 30 2E 31 31 2E 31
- 39 37 30 0A 00 00 31 38 2E 30 33 2E 31 39 39 36
- 0A 00 00 31 37 2E 31 30 2E 31 39 34 38 0A 00 00
- 30 31 2E 30 31 2E 31 39 37 30 0A 00 00 30 36 2E
- 31 30 2E 31 39 36 35 0A 00 00 32 36 2E 30 39 2E
- 31 39 35 36 0A 00 00 30 33 2E 31 31 2E 31 39 39
- 33 0A 00 00 31 30 2E 30 37 2E 31 39 37 30 0A 00
- 00 30 31 2E 30 32 2E 31 39 39 38 0A 00 00 32 37
- 2E 30 32 2E 31 39 35 39 0A 00 00 30 31 2E 30 36
- 2E 31 39 39 36 0A 00 00 31 30 2E 30 32 2E 31 39
- 36 36 0A 00 00 31 38 2E 31 31 2E 31 39 39 36 27
- 00 00 43 6C 69 65 6E 74 20 4D 61 6E 61 67 65 72
- 2F 50 72 6F 70 65 72 74 79 20 50 72 6F 64 75 63
- 74 20 4D 61 6E 61 67 65 72 0A 00 00 30 31 2E 31
- 30 2E 31 39 36 32 0A 00 00 31 36 2E 31 30 2E 31
- 39 39 32 03 00 00 4D 59 52 03 00 00 50 48 50 0A
- 00 00 32 38 2E 30 38 2E 31 39 35 34 0A 00 00 31
- 38 2E 30 31 2E 31 39 39 39 0A 00 00 32 35 2E 30
- 35 2E 31 39 37 34 1C 00 00 41 73 73 74 2E 4D 67
- 72 2E 20 54 6F 20 43 6C 69 65 6E 74 20 4D 67 72
- 20 54 65 61 6D 0A 00 00 30 39 2E 30 33 2E 31 39
- 35 35 0A 00 00 30 31 2E 30 37 2E 32 30 30 30 0A
- 00 00 30 33 2E 30 33 2E 31 39 35 36 0A 00 00 31
- 32 2E 30 32 2E 31 39 39 36 0A 00 00 30 31 2E 30
- 39 2E 32 30 30 30 03 00 00 32 35 36 0A 00 00 32
- 31 2E 31 31 2E 31 39 35 39 0A 00 00 32 36 2E 30
- 39 2E 31 39 36 35 0A 00 00 30 31 2E 31 31 2E 31
- 39 39 38 02 00 00 6E 6F 0A 00 00 31 33 2E 30 39
- 2E 31 39 36 39 1C 00 00 41 73 73 6F 63 69 61 74
- 65 20 46 69 6E 61 6E 63 69 61 6C 20 41 64 76 69
- 73 6F 72 79 03 00 00 79 65 73 0A 00 00 30 35 2E
- 31 32 2E 31 39 35 36 0A 00 00 31 32 2E 30 39 2E
- 31 39 38 34 1A 00 00 53 65 6E 69 6F 72 20 4D 61
- 6E 61 67 65 72 20 45 6E 67 69 6E 65 65 72 69 6E
- 67 0A 00 00 30 39 2E 30 38 2E 31 39 36 30 03 00
- 00 54 48 42 0A 00 00 32 34 2E 30 32 2E 31 39 35
- 34 0A 00 00 30 31 2E 30 36 2E 31 39 39 38 0A 00
- 00 30 38 2E 30 33 2E 31 39 36 39 0A 00 00 31 34
- 2E 30 34 2E 31 39 39 37 0A 00 00 32 31 2E 30 38
- 2E 31 39 36 37 0A 00 00 30 37 2E 30 37 2E 31 39
- 39 37 0A 00 00 33 30 2E 31 31 2E 31 39 36 30 0A
- 00 00 30 32 2E 30 35 2E 31 39 39 37 0A 00 00 32
- 39 2E 30 37 2E 31 39 35 35 0A 00 00 30 33 2E 30
- 33 2E 31 39 39 37 0A 00 00 32 35 2E 30 35 2E 31
- 39 35 37 0A 00 00 30 31 2E 30 39 2E 31 39 39 36
- 0A 00 00 31 38 2E 30 31 2E 31 39 34 32 0A 00 00
- 30 31 2E 30 33 2E 31 39 39 39 0A 00 00 32 32 2E
- 30 36 2E 31 39 36 38 0A 00 00 30 31 2E 31 32 2E
- 31 39 39 38 0A 00 00 30 33 2E 30 35 2E 31 39 36
- 39 0A 00 00 30 31 2E 30 35 2E 31 39 39 38 0A 00
- 00 32 32 2E 30 38 2E 31 39 35 37 0A 00 00 31 35
- 2E 30 37 2E 31 39 38 35 0A 00 00 32 32 2E 30 35
- 2E 31 39 36 36 0A 00 00 30 38 2E 30 32 2E 31 39
- 39 36 0A 00 00 32 31 2E 31 32 2E 31 39 37 37 0A
- 00 00 30 33 2E 30 34 2E 31 39 35 36 0A 00 00 31
- 32 2E 30 31 2E 31 39 39 36 0A 00 00 30 38 2E 30
- 37 2E 31 39 36 30 0A 00 00 30 31 2E 30 34 2E 31
- 39 39 39 0A 00 00 30 36 2E 30 31 2E 31 39 36 33
- 0A 00 00 30 31 2E 31 30 2E 31 39 39 38 0A 00 00
- 30 34 2E 30 35 2E 31 39 35 35 0A 00 00 32 33 2E
- 30 39 2E 31 39 39 36 0A 00 00 32 33 2E 30 39 2E
- 31 39 37 30 0A 00 00 30 39 2E 30 33 2E 31 39 36
- 37 0A 00 00 30 36 2E 30 39 2E 32 30 30 30 0A 00
- 00 31 33 2E 30 39 2E 31 39 35 32 0A 00 00 31 37
- 2E 30 31 2E 32 30 30 30 0A 00 00 31 31 2E 30 39
- 2E 31 39 36 31 0A 00 00 30 33 2E 31 31 2E 31 39
- 39 39 0A 00 00 31 39 2E 30 32 2E 31 39 36 32 0A
- 00 00 30 31 2E 30 31 2E 31 39 39 36 0A 00 00 32
- 33 2E 30 37 2E 31 39 36 30 0A 00 00 32 31 2E 30
- 32 2E 32 30 30 30 0A 00 00 31 32 2E 31 31 2E 31
- 39 36 39 0A 00 00 32 34 2E 30 35 2E 31 39 39 39
- 0A 00 00 30 38 2E 31 32 2E 31 39 36 31 0A 00 00
- 30 31 2E 30 34 2E 31 39 39 37 0A 00 00 30 34 2E
- 30 34 2E 31 39 36 34 12 00 00 53 65 6E 69 6F 72
- 20 55 6E 64 65 72 77 72 69 74 65 72 0A 00 00 32
- 33 2E 30 32 2E 31 39 36 35 0A 00 00 31 38 2E 30
- 39 2E 31 39 36 39 0A 00 00 30 31 2E 30 34 2E 31
- 39 39 38 0A 00 00 31 31 2E 30 33 2E 31 39 35 32
- 0A 00 00 31 37 2E 31 30 2E 31 39 37 34 0A 00 00
- 30 33 2E 30 37 2E 31 39 39 35 0A 00 00 30 32 2E
- 30 34 2E 31 39 36 38 0A 00 00 31 34 2E 30 32 2E
- 32 30 30 30 0A 00 00 31 34 2E 30 33 2E 31 39 36
- 31 0A 00 00 31 37 2E 30 36 2E 31 39 39 36 0A 00
- 00 33 31 2E 30 38 2E 31 39 36 35 0A 00 00 31 37
- 2E 30 32 2E 31 39 39 37 0A 00 00 30 35 2E 30 37
- 2E 31 39 36 36 0A 00 00 32 30 2E 30 33 2E 32 30
- 30 30 16 00 00 41 64 6D 69 6E 69 73 74 72 61 74
- 69 76 65 20 4F 66 66 69 63 65 72 0A 00 00 31 33
- 2E 30 36 2E 31 39 37 32 0A 00 00 33 31 2E 30 35
- 2E 32 30 30 30 0A 00 00 32 31 2E 30 33 2E 31 39
- 37 39 0A 00 00 30 32 2E 30 35 2E 32 30 30 30 0A
- 00 00 32 33 2E 31 31 2E 31 39 36 38 0A 00 00 31
- 34 2E 30 32 2E 31 39 37 30 0A 00 00 31 30 2E 30
- 38 2E 31 39 39 38 0A 00 00 30 36 2E 30 39 2E 31
- 39 36 32 0A 00 00 30 33 2E 31 31 2E 31 39 39 37
- 0A 00 00 31 34 2E 30 36 2E 31 39 36 37 0A 00 00
- 31 36 2E 30 36 2E 31 39 39 37 0A 00 00 30 37 2E
- 30 33 2E 31 39 36 35 0A 00 00 30 38 2E 30 35 2E
- 31 39 39 36 0A 00 00 31 36 2E 30 33 2E 31 39 36
- 34 0A 00 00 32 39 2E 30 35 2E 32 30 30 30 0A 00
- 00 31 39 2E 30 38 2E 31 39 37 32 0A 00 00 32 37
- 2E 30 35 2E 31 39 37 30 0A 00 00 31 35 2E 31 31
- 2E 31 39 39 36 0A 00 00 31 36 2E 30 32 2E 31 39
- 37 31 0A 00 00 31 37 2E 31 30 2E 31 39 36 37 0A
- 00 00 32 35 2E 30 38 2E 32 30 30 30 0A 00 00 32
- 33 2E 30 36 2E 31 39 36 36 0A 00 00 31 33 2E 30
- 38 2E 31 39 35 35 0A 00 00 32 30 2E 31 31 2E 31
- 39 36 32 0A 00 00 31 35 2E 30 35 2E 31 39 38 39
- 0A 00 00 32 35 2E 31 31 2E 31 39 36 39 0A 00 00
- 30 32 2E 30 31 2E 31 39 39 37 0A 00 00 31 33 2E
- 31 31 2E 31 39 34 36 0A 00 00 30 31 2E 30 31 2E
- 31 39 37 37 0F 00 00 52 65 6B 72 2E 2F 42 65 74
- 72 65 75 75 6E 67 0A 00 00 32 35 2E 30 32 2E 31
- 39 36 31 0A 00 00 30 31 2E 30 35 2E 31 39 39 33
- 0A 00 00 31 38 2E 31 31 2E 31 39 37 35 0A 00 00
- 33 30 2E 30 39 2E 31 39 37 32 0A 00 00 31 38 2E
- 31 32 2E 31 39 39 37 0A 00 00 33 31 2E 30 38 2E
- 31 39 35 38 17 00 00 45 6E 67 69 6E 65 65 72 69
- 6E 67 20 43 6F 6F 72 64 69 6E 61 74 6F 72 0A 00
- 00 31 31 2E 30 34 2E 31 39 36 30 0A 00 00 30 31
- 2E 30 31 2E 31 39 39 37 0A 00 00 30 37 2E 30 35
- 2E 31 39 38 30 0A 00 00 31 39 2E 30 36 2E 32 30
- 30 30 0A 00 00 33 30 2E 30 35 2E 31 39 36 38 0A
- 00 00 30 37 2E 30 36 2E 31 39 36 36 0A 00 00 30
- 31 2E 31 31 2E 31 39 39 39 0A 00 00 32 36 2E 30
- 33 2E 31 39 36 34 0A 00 00 31 34 2E 30 38 2E 32
- 30 30 30 0A 00 00 32 37 2E 30 33 2E 31 39 35 39
- 0A 00 00 31 30 2E 30 35 2E 31 39 37 33 03 00 00
- 49 4E 52 0A 00 00 30 37 2E 30 33 2E 31 39 36 37
- 0A 00 00 30 34 2E 30 38 2E 31 39 37 36 0A 00 00
- 32 37 2E 31 32 2E 31 39 36 30 0A 00 00 30 31 2E
- 31 30 2E 31 39 39 35 0A 00 00 31 31 2E 30 31 2E
- 31 39 34 38 0A 00 00 30 32 2E 30 34 2E 31 39 39
- 37 0A 00 00 33 30 2E 30 37 2E 31 39 37 35 0A 00
- 00 31 39 2E 31 32 2E 31 39 36 39 0A 00 00 30 31
- 2E 30 33 2E 32 30 30 30 0A 00 00 30 33 2E 30 33
- 2E 31 39 36 38 0A 00 00 30 32 2E 30 37 2E 31 39
- 37 34 02 00 00 53 57 04 00 00 33 31 35 38 04 00
- 00 33 31 39 32 10 00 00 55 57 20 4D 61 6E 61 67
- 65 72 20 53 57 49 46 54 04 00 00 33 32 32 30 02
- 00 00 53 32 04 00 00 33 32 34 31 04 00 00 33 32
- 34 32 04 00 00 33 32 37 33 13 00 00 54 72 65 61
- 74 79 20 55 57 20 53 75 70 70 2E 20 50 2F 43 04
- 00 00 33 32 38 34 04 00 00 33 32 38 38 0F 00 00
- 54 65 61 6D 20 4C 65 61 64 65 72 20 53 53 43 04
- 00 00 33 33 30 35 16 00 00 55 57 20 46 69 6E 61
- 6E 63 69 61 6C 20 53 6F 6C 75 74 69 6F 6E 73 04
- 00 00 33 33 35 36 04 00 00 33 33 35 39 0C 00 00
- 48 65 61 64 20 53 49 43 53 2F 6E 74 02 00 00 43
- 32 04 00 00 33 33 36 38 13 00 00 55 6E 64 65 72
- 77 72 69 74 65 72 20 46 61 6B 20 48 55 4B 02 00
- 00 44 4E 04 00 00 33 33 37 37 13 00 00 44 65 61
- 6C 20 4B 6F 6F 72 64 69 6E 61 74 6F 72 2F 55 57
- 04 00 00 33 33 38 30 12 00 00 55 6E 64 65 72 77
- 72 69 74 65 72 20 44 45 53 49 47 4E 04 00 00 33
- 33 38 39 14 00 00 4B 6E 6F 77 6C 65 64 67 65 20
- 45 78 70 65 72 74 20 53 53 43 04 00 00 33 34 30
- 35 04 00 00 33 34 31 33 04 00 00 33 34 31 35 04
- 00 00 33 34 32 33 02 00 00 45 57 04 00 00 33 34
- 34 33 16 00 00 45 6E 67 69 6E 65 65 72 69 6E 67
- 20 55 57 20 53 75 70 70 6F 72 74 04 00 00 33 34
- 35 34 04 00 00 33 34 36 31 02 00 00 45 42 04 00
- 00 33 34 38 30 04 00 00 33 35 30 38 10 00 00 53
- 65 63 74 69 6F 6E 20 48 65 61 64 20 53 53 43 04
- 00 00 33 35 32 39 04 00 00 33 35 34 37 16 00 00
- 42 75 73 69 6E 65 73 73 20 41 73 73 69 73 74 61
- 6E 74 20 53 53 43 04 00 00 33 35 35 34 04 00 00
- 33 35 36 36 02 00 00 50 34 04 00 00 33 36 31 36
- 10 00 00 55 57 20 46 61 63 2E 20 50 72 6F 70 65
- 72 74 79 04 00 00 33 36 34 31 04 00 00 33 36 35
- 34 04 00 00 33 36 39 35 04 00 00 33 37 38 36 18
- 00 00 55 57 20 4D 61 6E 61 67 65 72 20 46 61 63
- 2E 20 50 72 6F 70 65 72 74 79 04 00 00 33 38 31
- 39 04 00 00 33 38 33 33 18 00 00 55 57 20 53 75
- 70 70 6F 72 74 20 46 61 63 2E 20 43 61 73 75 61
- 6C 74 79 02 00 00 45 43 04 00 00 33 38 36 30 04
- 00 00 33 38 37 34 02 00 00 50 36 04 00 00 33 39
- 35 36 10 00 00 55 6E 64 65 72 77 72 69 74 65 72
- 20 53 61 63 68 04 00 00 33 39 38 38 16 00 00 41
- 64 6D 69 6E 69 73 74 72 61 74 69 6F 6E 20 46 61
- 6B 20 48 55 4B 04 00 00 33 39 39 36 02 00 00 4E
- 45 04 00 00 34 30 32 39 12 00 00 4E 75 63 6C 65
- 61 72 20 55 57 20 53 75 70 70 6F 72 74 04 00 00
- 34 30 34 36 04 00 00 34 30 38 34 04 00 00 34 30
- 38 39 04 00 00 34 30 39 32 04 00 00 34 30 39 37
- 04 00 00 34 31 33 36 04 00 00 34 31 37 32 04 00
- 00 34 32 33 30 04 00 00 34 32 35 31 04 00 00 34
- 32 39 30 0A 00 00 55 57 20 53 75 70 70 6F 72 74
- 04 00 00 34 33 38 35 15 00 00 4D 61 6E 61 67 65
- 72 20 41 63 74 2E 20 53 65 72 76 69 63 65 73 04
- 00 00 34 34 30 33 04 00 00 34 34 31 34 04 00 00
- 34 34 33 38 04 00 00 34 34 34 33 04 00 00 34 34
- 37 32 04 00 00 34 34 37 34 04 00 00 34 35 31 31
- 04 00 00 34 35 33 32 04 00 00 34 35 34 36 02 00
- 00 54 50 04 00 00 34 35 37 34 04 00 00 34 35 38
- 30 04 00 00 34 36 30 39 04 00 00 34 36 33 32 04
- 00 00 34 36 33 35 0E 00 00 53 49 43 53 6E 74 20
- 50 72 6F 6A 65 6B 74 04 00 00 34 39 34 33 02 00
- 00 45 48 04 00 00 34 39 35 37 04 00 00 34 39 35
- 39 04 00 00 35 30 31 30 04 00 00 35 30 32 30 04
- 00 00 35 30 32 32 04 00 00 35 30 36 31 04 00 00
- 35 30 38 33 04 00 00 35 31 31 35 04 00 00 35 31
- 33 35 04 00 00 35 31 38 32 04 00 00 35 31 38 34
- 0E 00 00 48 52 20 43 6F 6E 74 72 6F 6C 6C 69 6E
- 67 04 00 00 35 31 39 35 04 00 00 35 32 32 33 04
- 00 00 35 32 36 30 15 00 00 47 6C 6F 62 61 6C 20
- 43 6C 69 65 6E 74 20 4D 61 6E 61 67 65 72 04 00
- 00 35 32 36 34 04 00 00 35 32 37 30 04 00 00 35
- 32 39 34 04 00 00 35 33 30 37 19 00 00 43 6C 69
- 65 6E 74 20 4D 61 6E 61 67 65 6D 65 6E 74 20 53
- 75 70 70 6F 72 74 04 00 00 35 33 31 32 02 00 00
- 4D 4C 04 00 00 35 33 31 38 0F 00 00 45 76 65 6E
- 74 20 4D 61 72 6B 65 74 69 6E 67 04 00 00 35 33
- 32 32 14 00 00 55 6E 64 65 72 77 72 69 74 65 72
- 20 46 61 6B 20 53 61 63 68 04 00 00 35 33 32 37
- 04 00 00 35 33 33 33 04 00 00 35 33 35 37 04 00
- 00 35 33 35 38 04 00 00 35 34 32 35 18 00 00 4D
- 67 72 20 42 55 53 20 50 65 72 66 6F 72 6D 61 6E
- 63 65 20 54 65 61 6D 04 00 00 35 35 30 34 04 00
- 00 35 35 38 34 10 00 00 41 73 73 69 73 74 61 6E
- 74 20 44 4F 4F 20 45 55 04 00 00 35 35 39 37 04
- 00 00 35 36 30 35 04 00 00 35 36 30 38 04 00 00
- 35 36 31 37 04 00 00 35 36 32 33 04 00 00 35 36
- 38 31 0F 00 00 48 65 61 64 20 50 43 20 53 75 70
- 70 6F 72 74 04 00 00 35 37 30 31 04 00 00 35 37
- 30 34 04 00 00 35 37 32 31 14 00 00 52 65 6C 61
- 74 69 6F 6E 20 4D 61 6E 61 67 65 72 20 53 53 43
- 04 00 00 35 37 33 36 04 00 00 35 37 34 38 04 00
- 00 35 37 35 34 04 00 00 35 37 35 35 17 00 00 50
- 72 6F 6A 65 63 74 20 4D 62 72 20 73 77 69 66 74
- 72 65 2E 63 6F 6D 04 00 00 35 37 35 36 04 00 00
- 35 37 36 32 0F 00 00 44 65 70 75 74 79 20 48 65
- 61 64 20 53 53 43 04 00 00 35 37 38 30 04 00 00
- 35 37 38 34 04 00 00 35 37 38 36 04 00 00 35 38
- 31 35 04 00 00 35 38 32 31 04 00 00 35 38 34 30
- 04 00 00 35 39 32 31 04 00 00 35 39 33 30 04 00
- 00 35 39 33 32 12 00 00 4E 75 63 6C 65 61 72 20
- 55 57 20 4D 61 6E 61 67 65 72 04 00 00 35 39 34
- 36 04 00 00 35 39 34 39 04 00 00 35 39 35 34 04
- 00 00 35 39 35 39 04 00 00 35 39 36 32 04 00 00
- 35 39 38 34 04 00 00 36 30 37 34 04 00 00 36 31
- 31 30 04 00 00 36 31 31 33 04 00 00 36 31 32 36
- 04 00 00 36 31 38 31 17 00 00 50 72 6F 6A 65 63
- 74 20 4D 67 72 20 73 77 69 66 74 72 65 2E 63 6F
- 6D 04 00 00 36 31 38 37 04 00 00 36 32 31 39 19
- 00 00 48 65 61 64 20 6F 66 20 44 69 76 2E 20 45
- 78 65 63 2E 20 4F 66 66 69 63 65 04 00 00 36 33
- 30 31 04 00 00 36 33 35 38 04 00 00 36 34 34 31
- 04 00 00 36 34 35 39 04 00 00 36 35 31 34 04 00
- 00 36 35 32 37 04 00 00 36 35 33 30 13 00 00 4D
- 61 72 69 6E 65 20 55 6E 64 65 72 77 72 69 74 69
- 6E 67 04 00 00 36 35 33 38 04 00 00 36 36 34 35
- 04 00 00 36 36 35 38 04 00 00 36 36 36 35 04 00
- 00 36 36 39 39 04 00 00 36 37 33 37 15 00 00 41
- 70 70 6C 69 63 61 74 69 6F 6E 20 53 75 70 70 6F
- 72 74 65 72 04 00 00 36 37 34 30 04 00 00 36 37
- 34 39 04 00 00 36 37 35 30 0B 00 00 54 72 61 69
- 6E 65 72 20 53 53 43 04 00 00 36 37 39 30 04 00
- 00 36 38 30 35 04 00 00 36 38 31 38 19 00 00 48
- 65 61 64 20 49 6E 64 69 76 69 64 75 61 6C 20 52
- 65 70 6F 72 74 69 6E 67 04 00 00 36 38 36 39 04
- 00 00 36 38 37 31 04 00 00 36 38 38 32 04 00 00
- 36 38 38 33 04 00 00 36 38 38 35 04 00 00 36 39
- 34 34 04 00 00 36 39 34 36 04 00 00 36 39 35 30
- 04 00 00 37 30 31 30 04 00 00 37 30 32 32 04 00
- 00 37 30 32 35 04 00 00 37 30 32 36 04 00 00 37
- 30 37 38 04 00 00 37 30 38 37 04 00 00 37 31 30
- 36 04 00 00 37 31 31 38 04 00 00 37 31 31 39 12
- 00 00 41 63 74 75 61 72 69 61 6C 20 53 65 72 76
- 69 63 65 73 04 00 00 37 31 33 36 04 00 00 37 31
- 36 32 04 00 00 37 31 37 39 04 00 00 37 32 36 39
- 04 00 00 37 33 34 38 04 00 00 37 34 30 39 04 00
- 00 37 34 31 38 04 00 00 37 34 31 39 15 00 00 4D
- 67 72 20 49 54 20 49 6E 66 72 61 73 74 72 75 63
- 74 75 72 65 04 00 00 37 34 37 37 04 00 00 37 35
- 30 31 04 00 00 37 35 37 35 04 00 00 37 35 37 36
- 04 00 00 37 35 39 35 04 00 00 37 36 30 32 04 00
- 00 37 36 30 36 04 00 00 37 39 34 32 04 00 00 37
- 39 37 32 04 00 00 37 39 39 31 04 00 00 38 30 30
- 39 04 00 00 38 30 32 30 04 00 00 38 30 32 39 04
- 00 00 38 30 33 34 04 00 00 38 30 33 37 14 00 00
- 52 65 70 6F 72 74 69 6E 67 20 53 70 65 63 69 61
- 6C 69 73 74 04 00 00 38 30 35 36 14 00 00 53 65
- 6B 72 65 74 61 72 69 61 74 20 4F 70 65 72 2E 20
- 45 55 04 00 00 38 30 36 37 04 00 00 38 30 38 31
- 04 00 00 38 31 31 31 04 00 00 38 31 33 36 15 00
- 00 41 73 73 69 73 74 61 6E 74 20 74 6F 20 48 65
- 61 64 20 53 53 43 04 00 00 38 32 31 39 04 00 00
- 38 32 39 38 04 00 00 38 33 31 39 04 00 00 38 33
- 34 32 04 00 00 38 33 36 33 04 00 00 38 34 30 33
- 04 00 00 38 34 30 34 04 00 00 38 34 30 36 04 00
- 00 38 34 31 32 04 00 00 38 34 31 33 04 00 00 38
- 34 31 34 04 00 00 38 34 31 35 11 00 00 53 65 6E
- 69 6F 72 20 55 57 20 46 61 6B 20 48 55 4B 04 00
- 00 38 34 32 39 04 00 00 38 34 33 31 04 00 00 38
- 34 33 33 04 00 00 38 34 33 37 04 00 00 38 34 34
- 30 04 00 00 38 34 35 31 04 00 00 38 34 35 35 04
- 00 00 38 34 36 36 04 00 00 38 34 36 37 04 00 00
- 38 34 36 38 04 00 00 38 34 37 34 04 00 00 38 34
- 38 30 04 00 00 38 34 38 38 04 00 00 38 34 38 39
- 04 00 00 38 34 39 36 12 00 00 50 72 6F 6A 65 6B
- 74 20 53 70 65 7A 69 61 6C 69 73 74 04 00 00 38
- 35 30 34 04 00 00 38 35 30 37 04 00 00 38 35 30
- 38 04 00 00 38 35 31 35 04 00 00 38 35 31 39 04
- 00 00 38 35 32 30 04 00 00 38 35 32 33 04 00 00
- 38 35 33 39 04 00 00 38 35 35 33 04 00 00 38 35
- 36 30 04 00 00 38 35 36 34 04 00 00 38 35 36 35
- 18 00 00 43 6C 69 65 6E 74 20 4D 61 6E 61 67 65
- 6D 65 6E 74 20 4D 65 6D 62 65 72 04 00 00 38 35
- 36 36 04 00 00 38 35 36 37 04 00 00 38 35 36 38
- 04 00 00 38 35 37 32 04 00 00 38 35 37 34 04 00
- 00 38 35 38 30 04 00 00 38 35 38 31 04 00 00 38
- 35 38 34 04 00 00 38 35 38 35 04 00 00 38 35 39
- 36 04 00 00 38 36 30 30 04 00 00 38 36 32 34 04
- 00 00 38 36 32 38 04 00 00 38 36 33 39 16 00 00
- 55 57 20 4D 61 6E 61 67 65 72 20 73 77 69 66 74
- 72 65 2E 63 6F 6D 04 00 00 38 36 34 33 04 00 00
- 38 36 35 37 19 00 00 48 65 61 64 20 6F 66 20 50
- 6C 61 6E 2E 26 43 6F 6E 74 72 6F 6C 6C 69 6E 67
- 04 00 00 38 37 31 33 10 00 00 55 57 20 46 61 63
- 2E 20 43 61 73 75 61 6C 74 79 04 00 00 38 37 33
- 39 04 00 00 38 37 34 35 04 00 00 38 37 35 30 19
- 00 00 55 57 20 4D 61 6E 61 67 65 72 20 46 69 6E
- 61 6E 63 69 61 6C 20 53 6F 6C 2E 04 00 00 38 37
- 35 33 04 00 00 38 37 36 33 04 00 00 38 38 30 30
- 19 00 00 49 54 20 4D 67 72 20 42 75 73 2E 20 45
- 78 65 63 2E 20 53 79 73 74 65 6D 73 04 00 00 38
- 38 39 38 04 00 00 38 39 32 30 04 00 00 39 31 31
- 36 04 00 00 39 31 32 30 04 00 00 39 31 32 36 04
- 00 00 39 31 35 37 04 00 00 39 31 35 38 04 00 00
- 39 31 37 39 04 00 00 39 33 30 37 04 00 00 39 33
- 32 37 04 00 00 39 33 39 39 04 00 00 39 34 39 35
- 04 00 00 39 34 39 37 04 00 00 39 35 33 33 04 00
- 00 39 36 31 33 04 00 00 39 36 35 31 04 00 00 39
- 37 35 31 05 00 00 31 30 30 35 37 05 00 00 31 30
- 32 31 34 05 00 00 31 30 32 32 36 05 00 00 31 30
- 32 32 38 05 00 00 31 30 32 33 32 05 00 00 31 30
- 32 33 38 05 00 00 31 30 32 34 34 05 00 00 31 30
- 32 34 38 05 00 00 31 30 32 35 30 05 00 00 31 30
- 32 38 34 05 00 00 31 30 33 37 38 05 00 00 31 30
- 34 31 31 05 00 00 31 30 34 35 33 05 00 00 31 30
- 34 38 31 05 00 00 31 30 35 33 33 05 00 00 31 30
- 35 36 37 16 00 00 48 65 61 64 20 49 6E 74 65 72
- 6E 61 74 2E 20 53 75 70 70 6F 72 74 05 00 00 31
- 30 35 38 34 19 00 00 49 54 20 48 65 61 64 20 5A
- 48 20 26 20 4C 6F 63 2E 20 4F 66 66 69 63 65 73
- 05 00 00 31 30 36 30 30 05 00 00 31 30 36 30 37
- 05 00 00 31 30 36 30 38 05 00 00 31 30 36 30 39
- 05 00 00 31 30 36 31 30 05 00 00 31 30 36 31 36
- 05 00 00 31 30 36 32 34 05 00 00 31 30 37 30 31
- 05 00 00 31 30 37 33 34 05 00 00 31 30 37 33 35
- 02 00 00 41 47 05 00 00 31 30 37 34 38 05 00 00
- 31 30 38 36 30 16 00 00 49 54 20 4D 61 6E 61 67
- 65 72 20 73 77 69 66 74 72 65 2E 63 6F 6D 05 00
- 00 31 30 38 39 38 05 00 00 31 30 39 38 39 05 00
- 00 31 30 39 39 31 05 00 00 31 31 31 30 36 0F 00
- 00 43 6F 73 74 20 43 6F 6E 74 72 6F 6C 6C 65 72
- 05 00 00 31 31 31 33 37 05 00 00 31 31 31 34 31
- 19 00 00 53 61 63 68 62 65 61 72 62 2E 44 69 76
- 2E 45 78 65 63 2E 4F 66 66 69 63 65 05 00 00 31
- 31 31 35 34 05 00 00 31 31 32 33 34 05 00 00 31
- 31 32 33 37 05 00 00 31 31 32 37 35 05 00 00 31
- 31 32 37 36 05 00 00 31 31 33 30 39 05 00 00 31
- 31 33 37 33 05 00 00 31 31 33 39 36 05 00 00 31
- 31 35 32 33 05 00 00 31 31 36 37 34 05 00 00 31
- 31 36 39 39 05 00 00 31 31 37 32 33 05 00 00 31
- 31 37 33 33 05 00 00 31 31 37 34 38 05 00 00 31
- 31 37 37 36 05 00 00 31 31 37 38 32 05 00 00 31
- 31 38 31 38 05 00 00 31 31 38 32 37 05 00 00 31
- 31 38 33 35 05 00 00 31 31 38 38 32 05 00 00 31
- 31 39 33 35 05 00 00 31 31 39 33 36 05 00 00 31
- 31 39 34 39 05 00 00 31 32 30 30 38 05 00 00 31
- 32 30 32 34 05 00 00 31 32 30 38 34 05 00 00 31
- 32 31 33 34 05 00 00 31 32 31 35 36 05 00 00 31
- 32 31 38 35 05 00 00 31 32 32 31 31 05 00 00 31
- 32 32 38 37 05 00 00 31 32 33 31 39 05 00 00 31
- 32 33 36 34 05 00 00 31 32 33 39 30 05 00 00 31
- 32 34 34 39 02 00 00 50 4D 05 00 00 31 32 34 35
- 37 0F 00 00 48 65 61 64 20 50 4D 4F 20 45 75 72
- 6F 70 65 01 00 00 34 02 00 00 32 34 02 00 00 32
- 37 02 00 00 34 31 01 00 00 41 02 00 00 35 31 02
- 00 00 36 30 02 00 00 36 35 02 00 00 37 31 02 00
- 00 38 30 02 00 00 38 38 02 00 00 39 39 19 00 00
- 43 6C 69 65 6E 74 20 4D 67 72 20 47 6C 6F 62 61
- 6C 20 43 6C 69 65 6E 74 73 03 00 00 31 31 38 03
- 00 00 31 32 39 03 00 00 31 33 32 16 00 00 43 6C
- 61 69 6D 73 20 4D 67 72 20 73 77 69 66 74 72 65
- 2E 63 6F 6D 03 00 00 31 37 30 03 00 00 31 37 33
- 11 00 00 4D 61 6E 61 67 65 72 20 4D 61 72 69 6E
- 65 20 55 57 03 00 00 31 38 39 11 00 00 55 57 20
- 4D 61 6E 61 67 65 72 20 44 45 53 49 47 4E 03 00
- 00 36 37 38 15 00 00 55 6E 64 65 72 77 72 69 74
- 65 72 20 44 E9 63 65 6E 6E 61 6C 65 03 00 00 38
- 39 32 03 00 00 39 32 38 03 00 00 39 33 38 03 00
- 00 39 37 33 03 00 00 39 37 39 04 00 00 31 30 33
- 30 04 00 00 31 30 37 30 0F 00 00 53 6F 52 69 20
- 55 57 20 4D 61 6E 61 67 65 72 04 00 00 31 31 31
- 38 04 00 00 31 34 37 35 04 00 00 31 35 30 31 04
- 00 00 31 35 32 31 04 00 00 31 35 35 38 04 00 00
- 31 35 39 32 04 00 00 31 36 30 30 04 00 00 31 36
- 31 30 04 00 00 31 36 32 39 04 00 00 31 36 35 35
- 04 00 00 31 37 30 30 16 00 00 48 65 61 64 20 6F
- 66 20 44 69 76 2E 20 48 52 20 5A FC 72 69 63 68
- 04 00 00 31 37 31 39 04 00 00 31 37 36 34 04 00
- 00 31 37 37 34 04 00 00 31 38 30 34 04 00 00 31
- 38 36 36 04 00 00 31 39 30 31 04 00 00 31 39 33
- 37 04 00 00 32 30 30 35 04 00 00 32 30 34 38 04
- 00 00 32 30 37 34 04 00 00 32 31 30 32 04 00 00
- 32 31 33 37 04 00 00 32 31 36 37 04 00 00 32 31
- 38 31 04 00 00 32 32 31 30 04 00 00 32 32 34 34
- 04 00 00 32 32 37 32 04 00 00 32 32 38 30 04 00
- 00 32 33 31 32 04 00 00 32 33 32 36 17 00 00 44
- 69 76 2E 20 4F 70 65 72 61 74 2E 20 4F 66 66 69
- 63 65 72 20 45 55 04 00 00 32 33 36 34 04 00 00
- 32 33 39 30 04 00 00 32 34 31 30 04 00 00 32 34
- 32 38 04 00 00 32 34 33 31 04 00 00 32 34 35 35
- 12 00 00 48 65 61 64 20 6F 66 20 53 53 43 20 5A
- 75 72 69 63 68 04 00 00 32 36 30 33 04 00 00 32
- 36 32 35 04 00 00 32 36 37 32 04 00 00 32 36 39
- 37 04 00 00 32 37 33 33 18 00 00 49 6E 6E 6F 76
- 61 74 69 6F 6E 2F 4B 6E 6F 77 6C 65 64 67 65 20
- 4D 67 72 04 00 00 32 37 33 39 04 00 00 32 37 38
- 36 04 00 00 32 38 30 38 0B 00 00 53 74 61 62 73
- 6C 65 69 74 65 72 04 00 00 32 38 31 31 17 00 00
- 48 65 61 64 20 6F 66 20 4D 61 72 6B 65 74 69 6E
- 67 20 53 20 26 20 4C 04 00 00 32 38 31 36 17 00
- 00 49 54 20 4D 67 72 20 52 65 69 6E 73 75 72 2E
- 20 53 79 73 74 65 6D 73 04 00 00 32 38 32 30 04
- 00 00 32 38 37 33 05 00 00 31 32 35 30 34 05 00
- 00 31 32 35 33 34 05 00 00 31 32 35 34 33 05 00
- 00 31 32 35 36 36 05 00 00 31 32 35 39 38 05 00
- 00 31 32 36 31 31 05 00 00 31 32 36 33 35 05 00
- 00 31 32 36 35 38 05 00 00 31 32 36 36 36 01 00
- 00 4E 05 00 00 31 32 36 37 36 05 00 00 31 32 37
- 33 36 05 00 00 31 32 37 36 38 05 00 00 31 32 38
- 30 35 05 00 00 31 32 38 32 34 05 00 00 31 32 38
- 35 30 05 00 00 31 32 39 33 31 05 00 00 31 33 30
- 30 32                                          
diff --git a/trunk/test-data/spreadsheet/BigSSTRecord2CR7 b/trunk/test-data/spreadsheet/BigSSTRecord2CR7
deleted file mode 100644
index 571474e..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecord2CR7
+++ /dev/null
@@ -1,105 +0,0 @@
-       3C 00 86 06 05 00 00 31 33 30 37 30 05 00
- 00 31 32 35 36 37 0F 00 00 4B 56 2D 50 72 61 6B
- 74 69 6B 61 6E 74 69 6E 02 00 00 33 32 04 00 00
- 35 38 37 32 04 00 00 38 34 39 35 05 00 00 31 30
- 34 39 39 05 00 00 31 30 35 30 31 05 00 00 31 30
- 35 30 33 05 00 00 31 30 35 30 35 05 00 00 31 30
- 36 38 39 05 00 00 31 30 36 39 31 05 00 00 31 30
- 37 35 32 05 00 00 31 30 38 35 33 05 00 00 31 30
- 38 35 34 05 00 00 31 30 38 35 36 05 00 00 31 30
- 38 35 37 05 00 00 31 30 38 38 30 16 00 00 50 72
- 6F 6A 65 63 74 20 4F 66 66 69 63 65 20 4D 61 6E
- 61 67 65 72 13 00 00 43 68 69 65 66 20 4C 65 67
- 61 6C 20 4F 66 66 69 63 65 72 18 00 00 53 65 63
- 74 6F 72 20 53 74 72 61 74 65 67 69 73 74 20 45
- 75 72 6F 70 65 12 00 00 48 65 61 64 20 6F 66 20
- 41 75 74 6F 6D 61 74 69 6F 6E 17 00 00 48 65 61
- 64 20 46 75 6E 64 20 6F 66 20 46 75 6E 64 73 20
- 55 6E 69 74 0C 00 00 43 4D 20 41 73 73 69 73 74
- 61 6E 74 18 00 00 48 65 61 64 20 48 75 6D 61 6E
- 20 52 65 73 6F 75 72 63 65 73 20 53 52 49 14 00
- 00 51 75 61 6E 74 69 74 61 74 69 76 65 20 41 6E
- 61 6C 79 73 74 12 00 00 55 6D 77 65 6C 74 62 65
- 61 75 66 74 72 61 67 74 65 72 12 00 00 54 68 69
- 72 64 20 79 65 61 72 20 41 6E 61 6C 79 73 74 17
- 00 00 48 65 61 64 20 43 75 73 74 6F 64 79 20 4D
- 61 6E 61 67 65 6D 65 6E 74 0E 00 00 56 69 63 65
- 20 50 72 65 73 69 64 65 6E 74 11 00 00 50 72 6F
- 6A 65 6B 74 6C 65 69 74 65 72 20 52 53 41 0D 00
- 00 50 72 6F 67 72 61 6D 6D 69 65 72 65 72 19 00
- 00 44 65 70 2E 48 65 61 64 20 46 69 6E 61 6E 63
- 2E 20 41 63 63 6F 75 6E 74 2E 19 00 00 53 65 6E
- 69 6F 72 20 49 6E 66 6F 72 6D 2E 20 53 70 65 63
- 69 61 6C 69 73 74 14 00 00 48 65 61 64 20 43 6C
- 69 65 6E 74 20 52 65 6C 61 74 69 6F 6E 0A 00 00
- 43 6F 6E 73 75 6C 74 61 6E 74 15 00 00 48 65 61
- 64 20 42 75 73 69 6E 65 73 73 20 41 6E 61 6C 79
- 73 74 18 00 00 48 65 61 64 20 43 6C 69 65 6E 74
- 20 4D 67 6D 74 20 53 79 73 74 65 6D 73 15 00 00
- 48 65 61 64 20 4B 6E 6F 77 6C 2E 26 49 6E 66 2E
- 20 4D 67 6D 74 19 00 00 4C 65 69 74 65 72 20 42
- 75 63 68 68 2F 42 65 72 69 63 68 74 65 72 73 74
- 2E 19 00 00 50 72 6F 6A 2E 4D 67 72 2E 20 43 65
- 6E 74 72 65 20 6F 66 20 43 6F 6D 70 2E 19 00 00
- 41 73 73 2E 20 47 72 70 2E 20 43 6F 6D 70 6C 69
- 61 6E 63 65 20 4F 66 66 2E 10 00 00 48 65 61 64
- 20 6F 66 20 52 65 73 65 61 72 63 68 12 00 00 53
- 6F 66 74 77 61 72 65 20 41 72 63 68 69 74 65 63
- 74 13 00 00 48 65 61 64 20 6F 66 20 49 54 20 54
- 72 61 69 6E 69 6E 67 19 00 00 4F 70 65 72 61 74
- 69 76 65 72 20 42 65 74 72 69 65 62 73 6C 65 69
- 74 65 72 12 00 00 41 64 6D 69 6E 2E 20 4D 69 74
- 61 72 62 65 69 74 65 72 02 00 00 47 57 16 00 00
- 54 65 61 6D 6C 2E 20 43 6F 73 74 20 41 63 63 6F
- 75 6E 74 69 6E 67 18 00 00 48 65 61 64 20 52 65
- 67 69 6F 6E 61 6C 20 50 4D 4F 20 5A 75 72 69 63
- 68 04 00 00 35 37 34 34 04 00 00 36 33 30 37 05
- 00 00 31 30 39 30 31 04 00 00 36 34 35 31 04 00
- 00 34 35 30 30 05 00 00 31 31 36 34 37 05 00 00
- 31 32 37 30 30 04 00 00 33 38 34 30 04 00 00 36
- 37 39 33 05 00 00 31 32 39 30 36 04 00 00 35 33
- 32 36 04 00 00 36 38 35 33 05 00 00 31 32 38 35
- 34 04 00 00 35 35 38 31 05 00 00 31 32 39 36 35
- 04 00 00 33 30 38 37 04 00 00 34 33 36 31 04 00
- 00 33 39 37 30 04 00 00 35 32 38 39 04 00 00 38
- 35 38 38 05 00 00 31 30 36 39 30 05 00 00 31 33
- 31 34 37 04 00 00 36 39 38 34 05 00 00 31 31 31
- 33 31 04 00 00 36 38 32 30 04 00 00 34 33 35 36
- 04 00 00 35 35 38 32 04 00 00 33 30 31 34 04 00
- 00 31 34 34 33 04 00 00 35 32 38 36 04 00 00 37
- 32 32 37 05 00 00 31 31 39 37 32 04 00 00 34 35
- 35 34 04 00 00 34 32 36 35 04 00 00 33 36 35 36
- 04 00 00 38 30 37 31 03 00 00 32 39 30 04 00 00
- 35 39 31 38 04 00 00 36 39 33 31 04 00 00 35 36
- 33 30 04 00 00 36 35 34 30 04 00 00 38 34 35 34
- 04 00 00 38 30 36 31 04 00 00 35 30 31 35 05 00
- 00 34 32 31 30 34 0C 00 00 55 6E 64 65 72 77 72
- 69 74 65 72 2C 04 00 00 37 32 35 36 04 00 00 37
- 36 37 34 04 00 00 37 37 38 36 04 00 00 38 37 31
- 34 04 00 00 38 37 31 39 04 00 00 36 33 36 35 04
- 00 00 38 39 35 37 04 00 00 32 37 31 38 04 00 00
- 36 32 39 31 05 00 00 31 31 39 34 37 04 00 00 33
- 30 33 33 04 00 00 38 34 36 30 04 00 00 36 32 36
- 36 04 00 00 33 32 39 39 04 00 00 37 38 38 39 04
- 00 00 32 37 33 30 05 00 00 31 31 33 38 31 05 00
- 00 31 30 36 34 38 04 00 00 37 33 37 33 04 00 00
- 35 30 35 30 04 00 00 38 36 31 39 04 00 00 37 31
- 34 36 04 00 00 34 33 31 33 04 00 00 35 38 33 35
- 04 00 00 38 37 35 38 04 00 00 37 30 37 31 05 00
- 00 31 33 30 36 36 04 00 00 37 37 36 35 04 00 00
- 34 34 36 38 05 00 00 31 31 38 36 31 04 00 00 35
- 38 39 34 04 00 00 32 34 33 38 04 00 00 33 31 38
- 38 04 00 00 34 32 35 37 03 00 00 31 35 38 04 00
- 00 39 32 34 39 12 00 00 41 73 73 6F 63 69 61 74
- 65 20 44 69 72 65 63 74 6F 72 03 00 00 36 31 36
- 05 00 00 31 31 30 36 34 04 00 00 34 36 32 36 04
- 00 00 36 33 31 37 05 00 00 31 31 35 35 33 05 00
- 00 31 31 32 39 38 04 00 00 32 32 35 34 04 00 00
- 39 35 33 31 04 00 00 38 33 31 38 02 00 00 34 35
- 04 00 00 35 34 33 30 04 00 00 37 30 37 36 04 00
- 00 36 38 36 34 05 00 00 31 32 34 35 38 04 00 00
- 35 34 38 35 05 00 00 38 30 30 39 33 04 00 00 35
- 39 37 31 04 00 00 36 34 37 32 04 00 00 36 36 31
- 39 05 00 00 31 31 34 31 30 04 00 00 35 32 39 36
- 04 00 00 38 36 33 30 04 00 00 38 30 32 38 04 00
- 00 31 38 32 36 04 00 00 36 38 35 31            
diff --git a/trunk/test-data/spreadsheet/BigSSTRecordCR b/trunk/test-data/spreadsheet/BigSSTRecordCR
deleted file mode 100644
index c35783d..0000000
--- a/trunk/test-data/spreadsheet/BigSSTRecordCR
+++ /dev/null
@@ -1,225 +0,0 @@
-3C 00 FD 0D 00 6C 05 00 00 47 2D 35 31 35 04
-00 00 32 37 38 38 04 00 00 32 32 34 38 04 00 00
-34 38 30 37 03 00 00 32 32 37 13 00 00 50 6C 79
-6D 6F 75 74 68 20 50 54 20 43 72 75 69 73 65 72
-18 00 00 53 74 61 72 20 54 72 65 6B 20 53 70 61
-63 65 20 53 68 69 70 20 53 65 74 3B 00 00 54 4F
-53 20 45 6E 74 65 72 70 72 69 73 65 2C 20 4B 6C
-69 6E 67 6F 6E 20 42 61 74 74 6C 65 63 72 75 69
-73 65 72 2C 20 52 6F 6D 75 6C 61 6E 20 42 69 72
-64 20 6F 66 20 50 72 65 79 14 00 00 46 6F 63 6B
-65 2D 57 75 6C 66 20 46 77 31 39 30 20 44 2D 39
-05 00 00 32 34 32 32 38 12 00 00 46 65 72 72 61
-72 69 20 33 36 30 20 4D 6F 64 65 6E 61 07 00 00
-38 35 2D 35 36 30 37 0D 00 00 43 2D 34 37 20 53
-6B 79 74 72 61 69 6E 11 00 00 43 6C 61 73 73 69
-63 20 41 69 72 66 72 61 6D 65 73 03 00 00 34 33
-39 15 00 00 42 72 69 73 74 6F 6C 20 42 6C 65 6E
-68 65 69 6D 20 4D 6B 20 49 19 00 00 46 69 6E 6E
-69 73 68 2F 59 75 67 6F 73 6C 61 76 20 6D 61 72
-6B 69 6E 67 73 05 00 00 35 31 30 33 38 0F 00 00
-4A 75 6E 6B 65 72 73 20 4A 75 38 37 47 2D 32 16
-00 00 22 53 75 70 65 72 20 44 65 74 61 69 6C 20
-47 75 6E 20 50 6F 64 22 05 00 00 35 31 30 34 30
-0C 00 00 54 79 70 68 6F 6F 6E 20 4D 2E 49 42 0E
-00 00 22 53 75 70 65 72 20 44 65 74 61 69 6C 22
-05 00 00 34 38 30 36 31 04 00 00 36 36 37 37 04
-00 00 5A 30 30 35 09 00 00 4D 6F 74 6F 72 69 7A
-65 64 07 00 00 38 35 2D 35 38 34 31 39 00 00 77
-2F 56 65 72 6C 69 6E 64 65 6E 20 64 65 74 61 69
-6C 20 73 65 74 20 31 34 37 34 20 61 6E 64 20 54
-72 75 65 20 44 65 74 61 69 6C 73 20 77 68 65 65
-6C 73 20 34 38 30 31 37 45 00 00 77 2F 57 61 72
-72 69 6F 72 20 57 41 20 57 31 30 30 31 20 44 4F
-2D 33 33 35 20 22 50 66 69 65 6C 22 20 44 65 74
-61 69 6C 20 53 65 74 2C 20 61 6C 73 6F 20 56 65
-72 6C 69 6E 64 65 6E 20 73 65 74 20 31 36 32 39
-04 00 00 36 37 39 30 0D 00 00 43 75 72 74 69 73
-73 20 50 2D 33 36 41 36 00 00 77 2F 20 53 71 75
-61 64 72 6F 6E 20 63 61 6E 6F 70 79 20 61 6E 64
-20 52 61 72 65 70 6C 61 6E 65 73 20 59 50 2D 33
-37 20 63 6F 6E 76 65 72 73 69 6F 6E 20 6B 69 74
-07 00 00 38 35 2D 37 36 33 33 15 00 00 56 6F 6C
-6B 73 77 61 67 65 6E 20 56 61 6E 20 43 61 6D 70
-65 72 04 00 00 38 32 34 38 0F 00 00 48 61 72 64
-20 48 61 74 20 48 61 75 6C 65 72 04 00 00 38 37
-38 39 1A 00 01 43 00 75 00 74 00 2D 00 41 00 77
-00 61 00 79 00 20 00 4D 00 69 00 6C 00 6C 00 65
-00 6E 00 69 00 75 00 6D 00 20 00 46 00 61 00 6C
-00 63 00 6F 00 6E 00 22 21 05 00 00 36 31 30 33
-31 20 00 00 55 2E 53 2E 20 4E 61 76 79 20 42 72
-65 77 73 74 65 72 20 46 32 41 2D 32 20 42 75 66
-66 61 6C 6F 05 00 00 36 30 37 34 30 1D 00 00 55
-2E 53 2E 41 2E 46 2E 20 42 65 6C 6C 20 58 2D 31
-20 4D 61 63 68 20 42 75 73 74 65 72 05 00 00 36
-31 30 34 35 21 00 00 48 79 61 6B 75 73 68 69 6B
-69 20 53 68 69 74 65 69 20 49 49 49 20 52 65 63
-6F 6E 20 50 6C 61 6E 65 05 00 00 36 31 30 34 37
-1E 00 00 4E 6F 72 74 68 20 41 6D 65 72 69 63 61
-6E 20 52 41 46 20 4D 75 73 74 61 6E 67 20 49 49
-49 07 00 00 38 35 2D 32 35 37 32 14 00 00 41 63
-75 72 61 20 49 6E 74 65 67 72 61 20 54 79 70 65
-20 52 07 00 00 38 35 2D 32 34 38 39 10 00 00 35
-36 20 43 68 65 76 79 AE 20 4E 6F 6D 61 64 AE 04
-00 00 32 32 36 39 10 00 00 43 6F 72 76 65 74 74
-65 20 41 6D 65 72 69 63 61 03 00 00 31 30 34 1F
-00 00 4D 65 73 73 65 72 73 63 68 6D 69 74 74 20
-4D 65 2D 33 32 31 20 44 2D 31 20 47 69 67 61 6E
-74 05 00 00 36 31 30 34 38 0F 00 00 44 65 77 6F
-69 74 69 6E 65 20 44 2E 35 32 30 07 00 00 38 35
-2D 31 36 35 36 4B 00 00 77 2F 69 6E 74 65 72 69
-6F 72 20 61 6E 64 20 65 78 74 65 72 69 6F 72 20
-64 65 74 61 69 6C 20 73 65 74 73 2C 20 65 6E 67
-69 6E 65 73 2C 20 77 68 65 65 6C 20 73 65 74 2C
-20 61 6E 64 20 6E 65 77 20 64 65 63 61 6C 73 2C
-20 43 44 04 00 00 4A 54 33 31 0D 00 00 50 2D 35
-31 4B 20 4D 75 73 74 61 6E 67 12 00 00 46 6F 63
-6B 65 2D 57 75 6C 66 65 20 46 77 31 39 30 46 04
-00 00 37 31 33 36 1F 00 00 48 6F 74 20 52 6F 64
-20 43 75 73 74 6F 6D 20 4D 6F 64 65 6C 20 27 41
-27 20 50 69 63 6B 75 70 04 00 00 32 37 35 30 19
-00 00 32 39 20 46 6F 72 64 20 50 69 63 6B 75 70
-20 53 74 72 65 65 74 20 52 6F 64 09 00 00 45 53
-43 69 2F 45 52 54 4C 04 00 00 34 31 30 31 12 00
-00 43 75 72 74 69 73 73 20 50 2D 33 36 41 20 48
-61 77 6B 04 00 00 38 30 32 38 16 00 00 31 39 35
-37 20 46 6F 72 64 20 46 61 69 72 6C 61 6E 65 20
-35 30 30 08 00 00 4D 50 43 2F 45 52 54 4C 04 00
-00 36 32 32 31 0E 00 00 44 65 6F 72 61 20 53 68
-6F 77 20 43 61 72 04 00 00 34 38 30 33 1E 00 00
-42 65 6C 6C 20 58 50 2D 37 37 20 4C 69 67 68 74
-77 65 69 67 68 74 20 46 69 67 68 74 65 72 04 00
-00 4A 54 37 35 0E 00 00 46 34 55 2D 35 4E 20 43
-6F 72 73 61 69 72 04 00 00 38 36 31 39 1A 00 00
-4E 6F 72 74 68 72 6F 70 20 59 42 2D 34 39 20 46
-6C 79 69 6E 67 20 57 69 6E 67 04 00 00 38 31 32
-35 04 00 00 42 6F 61 74 1B 00 00 33 20 69 6E 20
-31 20 43 75 73 74 6F 6D 69 7A 69 6E 67 20 42 6F
-61 74 20 4B 69 74 04 00 00 32 32 37 38 0E 00 00
-43 69 74 61 74 69 6F 6E 20 54 75 72 62 6F 05 00
-00 34 38 30 33 31 1A 00 00 59 61 6B 2D 37 41 20
-57 57 49 49 20 53 6F 76 69 65 74 20 46 69 67 68
-74 65 72 03 00 00 38 36 31 15 00 00 46 6F 63 6B
-65 20 57 75 6C 66 20 54 41 2D 31 35 32 20 48 2D
-31 11 00 00 77 2F 4D 6F 73 6B 69 74 20 65 78 68
-61 75 73 74 73 06 00 00 46 75 6A 69 6D 69 16 00
-00 46 6F 63 6B 65 2D 57 75 6C 66 20 46 77 31 39
-30 41 36 2D 3E 41 39 14 00 00 77 2F 54 72 75 65
-20 44 65 74 61 69 6C 20 77 68 65 65 6C 73 06 00
-00 52 55 31 30 30 32 05 00 00 4D 43 2D 30 35 0A
-00 00 56 6F 6C 6B 73 77 61 67 65 6E 1C 00 00 53
-74 6F 63 6B 20 6F 72 20 41 41 2F 41 6C 74 65 72
-65 64 20 56 57 20 43 6F 75 70 65 07 00 00 38 35
-2D 35 35 31 30 0D 00 00 42 2D 32 36 20 4D 61 72
-61 75 64 65 72 2C 00 00 53 70 65 63 69 61 6C 20
-45 64 69 74 69 6F 6E 20 77 2F 72 65 73 69 6E 20
-70 61 72 74 73 3B 20 73 6B 69 6C 6C 20 6C 65 76
-65 6C 20 33 06 00 00 4D 65 20 33 30 39 04 00 00
-38 35 38 35 19 00 00 45 6C 65 63 74 72 6F 6E 69
-63 20 58 2D 57 69 6E 67 20 46 69 67 68 74 65 72
-04 00 00 38 30 33 36 0D 00 00 50 2D 34 30 4E 20
-57 61 72 68 61 77 6B 09 00 00 50 72 6F 66 69 70
-61 63 6B 06 00 00 48 2D 31 32 31 37 15 00 00 41
-75 73 74 69 6E 20 48 65 61 6C 65 79 20 31 30 30
-2D 53 69 78 03 00 00 32 31 32 11 00 00 54 68 75
-6E 64 65 72 62 6F 6C 74 20 50 2D 34 37 44 03 00
-00 32 31 35 0D 00 00 46 38 46 2D 32 20 42 65 61
-72 63 61 74 03 00 00 4D 50 4D 05 00 00 34 38 30
-32 38 13 00 00 46 6F 63 6B 65 2D 57 75 6C 66 20
-46 77 20 31 39 30 20 53 2F 00 00 45 78 70 65 72
-74 20 53 65 72 69 65 73 3B 20 77 69 74 68 20 72
-65 73 69 6E 20 61 6E 64 20 70 68 6F 74 6F 2D 65
-74 63 68 20 64 65 74 61 69 6C 07 00 00 38 35 2D
-35 37 30 36 12 00 00 42 2D 32 39 20 53 75 70 65
-72 66 6F 72 74 72 65 73 73 16 00 00 77 2F 45 2D
-5A 20 6D 61 73 6B 20 63 61 6E 6F 70 79 20 6D 61
-73 6B 20 00 00 77 2F 64 65 74 61 69 6C 20 73 65
-74 20 61 6E 64 20 4D 6F 73 6B 69 74 20 65 78 68
-61 75 73 74 73 33 00 00 53 6B 69 6C 6C 20 6C 65
-76 65 6C 20 33 2C 20 77 69 74 68 20 72 65 73 69
-6E 20 65 6E 67 69 6E 65 20 28 45 6E 67 69 6E 65
-73 20 26 20 54 68 69 6E 67 73 29 05 00 00 34 38
-30 33 34 13 00 00 46 6F 63 6B 65 2D 57 75 6C 66
-20 46 77 20 31 38 39 20 41 05 00 00 32 34 30 34
-36 17 00 00 4C 6F 74 75 73 20 53 75 70 65 72 20
-37 20 53 65 72 69 65 73 20 49 49 04 00 00 33 34
-33 31 10 00 00 42 2D 32 35 43 2F 44 20 4D 69 74
-63 68 65 6C 6C 09 00 00 54 72 69 6D 61 73 74 65
-72 22 00 00 46 6F 63 6B 65 2D 57 75 6C 66 20 46
-77 31 39 30 41 2D 38 2F 52 31 31 20 4E 61 63 68
-74 6A 61 67 65 72 05 00 00 34 38 30 30 31 16 00
-00 4D 65 73 73 65 72 73 63 68 6D 69 74 74 20 42
-66 31 30 39 4B 2D 34 12 00 00 77 2F 72 65 73 69
-6E 20 64 65 74 61 69 6C 20 73 65 74 04 00 00 32
-37 34 31 18 00 00 46 6F 72 64 20 53 74 72 65 65
-74 20 22 54 22 20 52 6F 61 64 73 74 65 72 04 00
-00 30 31 39 34 0E 00 00 54 68 65 20 53 70 61 63
-65 20 54 61 78 69 02 00 00 4A 31 17 00 00 4D 65
-73 73 65 72 73 63 68 6D 69 74 74 20 42 66 31 30
-39 20 45 2D 33 1F 00 00 77 2F 56 65 72 6C 69 6E
-64 65 6E 20 73 75 70 65 72 2D 74 65 63 68 20 6B
-69 74 20 23 33 38 34 07 00 00 38 35 2D 32 35 31
-37 27 00 00 31 31 20 53 74 65 76 65 20 4B 69 6E
-73 65 72 20 51 75 61 6B 65 72 20 53 74 61 74 65
-20 53 70 72 69 6E 74 20 43 61 72 07 00 00 38 35
-2D 37 33 31 30 03 00 00 31 2F 38 0A 00 00 4D 6F
-74 6F 72 63 79 63 6C 65 21 00 01 58 00 4C 00 22
-21 20 00 31 00 32 00 30 00 30 00 20 00 53 00 70
-00 6F 00 72 00 74 00 73 00 74 00 65 00 72 00 28
-00 52 00 29 00 20 00 31 00 32 00 30 00 30 00 20
-00 43 00 75 00 73 00 74 00 6F 00 6D 00 04 00 00
-36 31 33 35 1A 00 00 36 32 20 50 6F 6E 74 69 61
-63 20 43 61 74 61 6C 69 6E 61 20 43 75 73 74 6F
-6D 03 00 00 39 31 32 0D 00 00 43 75 72 74 69 73
-73 20 52 61 63 65 72 05 00 00 33 31 32 32 30 16
-00 00 32 39 20 46 6F 72 64 20 57 6F 6F 64 79 20
-2F 20 50 69 63 6B 75 70 0B 00 00 52 2E 20 56 2E
-20 52 65 73 69 6E 19 00 00 46 6F 63 6B 65 20 57
-75 6C 66 20 54 61 20 31 35 32 43 2D 30 20 28 56
-37 29 07 00 00 38 35 2D 37 36 37 39 2B 00 00 36
-34 20 46 6F 72 64 20 46 61 69 72 6C 61 6E 65 20
-54 68 75 6E 64 65 72 62 6F 6C 74 20 53 74 72 65
-65 74 20 4D 61 63 68 69 6E 65 04 00 00 38 32 30
-37 21 00 00 31 39 36 37 20 43 68 65 76 72 6F 6C
-65 74 20 49 6D 70 61 6C 61 20 53 75 70 65 72 20
-53 70 6F 72 74 07 00 00 38 35 2D 31 39 31 34 13
-00 00 43 68 72 79 73 6C 65 72 20 50 54 20 43 72
-75 69 73 65 72 05 00 00 36 31 30 35 34 11 00 00
-41 69 63 68 69 20 4D 36 41 31 20 53 65 69 72 65
-6E 07 00 00 38 35 2D 32 31 34 34 0B 00 01 4B 00
-69 00 6C 00 6C 00 65 00 72 00 20 00 42 00 65 00
-65 00 22 21 1A 00 01 42 00 6C 00 61 00 63 00 6B
-00 20 00 54 00 6F 00 70 00 20 00 57 00 61 00 72
-00 72 00 69 00 6F 00 72 00 73 00 22 21 20 00 73
-00 65 00 72 00 69 00 65 00 73 00 05 00 00 33 30
-30 38 39 16 00 00 33 32 20 46 6F 72 64 20 50 68
-61 6E 74 6F 6D 20 56 69 63 6B 69 65 07 00 00 38
-35 2D 34 31 35 31 18 00 00 54 6F 6E 79 20 4E 61
-6E 63 79 27 73 20 52 65 76 65 6C 6C 6C 69 6E 65
-72 07 00 00 38 35 2D 35 38 33 34 0E 00 00 46 2D
-31 31 37 41 20 53 74 65 61 6C 74 68 24 00 00 53
-6B 69 6C 6C 20 6C 65 76 65 6C 20 33 2C 20 77 69
-74 68 20 70 68 6F 74 6F 2D 65 74 63 68 20 70 61
-72 74 73 04 00 00 35 36 30 38 0F 00 00 42 2D 32
-34 4A 20 4C 69 62 65 72 61 74 6F 72 04 00 00 4D
-41 2D 37 04 00 00 4D 41 2D 33 1B 00 00 48 65 69
-6E 6B 65 6C 20 48 65 31 36 32 41 2D 32 20 56 6F
-6C 6B 73 6A 61 67 65 72 05 00 00 33 30 32 37 33
-0C 00 00 41 4D 54 20 41 6D 74 72 6F 6E 69 63 04
-00 00 37 38 30 33 14 00 00 54 42 4D 2D 33 2F 54
-42 46 2D 31 43 20 41 76 65 6E 67 65 72 13 00 00
-77 2F 41 65 72 6F 6D 61 73 74 65 72 20 64 65 63
-61 6C 73 04 00 00 37 38 30 36 1B 00 00 53 42 44
-2D 33 2F 53 42 44 2D 34 2F 53 42 44 2D 35 20 44
-61 75 6E 74 6C 65 73 73 05 00 00 36 31 30 37 31
-20 00 00 46 61 69 72 65 79 20 53 77 6F 72 64 66
-69 73 68 20 4D 6B 2E 49 20 46 6C 6F 61 74 70 6C
-61 6E 65 04 00 00 37 35 37 35 10 00 00 44 65 76
-61 73 74 61 74 6F 72 20 54 42 44 2D 31 04 00 00
-32 31 37 39 12 00 00 50 2D 32 36 41 2F 43 20 50
-65 61 73 68 6F 6F 74 65 72 06 00 00 34 35 34 3A
-34 39 09 00 00 43 61 72 61 76 65 6C 6C 65 03 00
-00 35 30 36 0D 00 00 4F 56 2D 31 30 41 20 42 72
-6F 6E 63 6F 07 00 00 38 35 2D 35 39 32 39 11 00
-00 50 2D 34 37 4E 20 54 68 75 6E 64 65 72 62 6F
-6C 74
diff --git a/trunk/test-data/spreadsheet/Booleans.xlsx b/trunk/test-data/spreadsheet/Booleans.xlsx
deleted file mode 100644
index 7528346..0000000
--- a/trunk/test-data/spreadsheet/Booleans.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/BrNotClosed.xlsx b/trunk/test-data/spreadsheet/BrNotClosed.xlsx
deleted file mode 100644
index fdb501a..0000000
--- a/trunk/test-data/spreadsheet/BrNotClosed.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/CodeFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/CodeFunctionTestCaseData.xls
deleted file mode 100644
index 1d31768..0000000
--- a/trunk/test-data/spreadsheet/CodeFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ColumnStyle1dp.xls b/trunk/test-data/spreadsheet/ColumnStyle1dp.xls
deleted file mode 100644
index 1318b0f..0000000
--- a/trunk/test-data/spreadsheet/ColumnStyle1dp.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ColumnStyle1dpColoured.xls b/trunk/test-data/spreadsheet/ColumnStyle1dpColoured.xls
deleted file mode 100644
index 25dd8de..0000000
--- a/trunk/test-data/spreadsheet/ColumnStyle1dpColoured.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ColumnStyleNone.xls b/trunk/test-data/spreadsheet/ColumnStyleNone.xls
deleted file mode 100644
index 3f0128a..0000000
--- a/trunk/test-data/spreadsheet/ColumnStyleNone.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ComplexFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/ComplexFunctionTestCaseData.xls
deleted file mode 100644
index 0d72e7d..0000000
--- a/trunk/test-data/spreadsheet/ComplexFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ContinueRecordProblem.xls b/trunk/test-data/spreadsheet/ContinueRecordProblem.xls
deleted file mode 100644
index c74b864..0000000
--- a/trunk/test-data/spreadsheet/ContinueRecordProblem.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx b/trunk/test-data/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx
deleted file mode 100644
index 635dea7..0000000
--- a/trunk/test-data/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/CustomXMLMappings-complex-type.xlsx b/trunk/test-data/spreadsheet/CustomXMLMappings-complex-type.xlsx
deleted file mode 100644
index 0d6d8d0..0000000
--- a/trunk/test-data/spreadsheet/CustomXMLMappings-complex-type.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/CustomXMLMappings.xlsx b/trunk/test-data/spreadsheet/CustomXMLMappings.xlsx
deleted file mode 100644
index 32a5573..0000000
--- a/trunk/test-data/spreadsheet/CustomXMLMappings.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/CustomXmlMappings-inverse-order.xlsx b/trunk/test-data/spreadsheet/CustomXmlMappings-inverse-order.xlsx
deleted file mode 100644
index f3acef3..0000000
--- a/trunk/test-data/spreadsheet/CustomXmlMappings-inverse-order.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DBCSHeader.xls b/trunk/test-data/spreadsheet/DBCSHeader.xls
deleted file mode 100644
index d97daf1..0000000
--- a/trunk/test-data/spreadsheet/DBCSHeader.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DBCSSheetName.xls b/trunk/test-data/spreadsheet/DBCSSheetName.xls
deleted file mode 100644
index 17aa944..0000000
--- a/trunk/test-data/spreadsheet/DBCSSheetName.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DGet.xls b/trunk/test-data/spreadsheet/DGet.xls
deleted file mode 100644
index 729e974..0000000
--- a/trunk/test-data/spreadsheet/DGet.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DStar.xls b/trunk/test-data/spreadsheet/DStar.xls
deleted file mode 100644
index 0c89261..0000000
--- a/trunk/test-data/spreadsheet/DStar.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DataTableCities.xlsx b/trunk/test-data/spreadsheet/DataTableCities.xlsx
deleted file mode 100644
index ca2f665..0000000
--- a/trunk/test-data/spreadsheet/DataTableCities.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DataValidations-49244.xlsx b/trunk/test-data/spreadsheet/DataValidations-49244.xlsx
deleted file mode 100644
index ee3f6ef..0000000
--- a/trunk/test-data/spreadsheet/DataValidations-49244.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DateFormatTests.xlsx b/trunk/test-data/spreadsheet/DateFormatTests.xlsx
deleted file mode 100644
index c604830..0000000
--- a/trunk/test-data/spreadsheet/DateFormatTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DateFormats.xls b/trunk/test-data/spreadsheet/DateFormats.xls
deleted file mode 100644
index 6b2c348..0000000
--- a/trunk/test-data/spreadsheet/DateFormats.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DeltaFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/DeltaFunctionTestCaseData.xls
deleted file mode 100644
index e66e96c..0000000
--- a/trunk/test-data/spreadsheet/DeltaFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DrawingAndComments.xls b/trunk/test-data/spreadsheet/DrawingAndComments.xls
deleted file mode 100644
index 8be6c9e..0000000
--- a/trunk/test-data/spreadsheet/DrawingAndComments.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/DrawingContinue.xls b/trunk/test-data/spreadsheet/DrawingContinue.xls
deleted file mode 100644
index 131c18c..0000000
--- a/trunk/test-data/spreadsheet/DrawingContinue.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ElapsedFormatTests.xlsx b/trunk/test-data/spreadsheet/ElapsedFormatTests.xlsx
deleted file mode 100644
index 95a093e..0000000
--- a/trunk/test-data/spreadsheet/ElapsedFormatTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/EmbeddedChartHeaderTest.xls b/trunk/test-data/spreadsheet/EmbeddedChartHeaderTest.xls
deleted file mode 100644
index af0cb22..0000000
--- a/trunk/test-data/spreadsheet/EmbeddedChartHeaderTest.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Employee.xls b/trunk/test-data/spreadsheet/Employee.xls
deleted file mode 100644
index bb9be26..0000000
--- a/trunk/test-data/spreadsheet/Employee.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ErrPtg.xls b/trunk/test-data/spreadsheet/ErrPtg.xls
deleted file mode 100644
index 5003599..0000000
--- a/trunk/test-data/spreadsheet/ErrPtg.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ExcelTables.xlsx b/trunk/test-data/spreadsheet/ExcelTables.xlsx
deleted file mode 100644
index 6d95446..0000000
--- a/trunk/test-data/spreadsheet/ExcelTables.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ExcelWithAttachments.xlsm b/trunk/test-data/spreadsheet/ExcelWithAttachments.xlsm
deleted file mode 100644
index cb3e564..0000000
--- a/trunk/test-data/spreadsheet/ExcelWithAttachments.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FactDoubleFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/FactDoubleFunctionTestCaseData.xls
deleted file mode 100644
index 885acc1..0000000
--- a/trunk/test-data/spreadsheet/FactDoubleFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ForShifting.xls b/trunk/test-data/spreadsheet/ForShifting.xls
deleted file mode 100644
index 7cb3ebd..0000000
--- a/trunk/test-data/spreadsheet/ForShifting.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ForShifting.xlsx b/trunk/test-data/spreadsheet/ForShifting.xlsx
deleted file mode 100644
index f05923b..0000000
--- a/trunk/test-data/spreadsheet/ForShifting.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormatChoiceTests.xls b/trunk/test-data/spreadsheet/FormatChoiceTests.xls
deleted file mode 100644
index 1816763..0000000
--- a/trunk/test-data/spreadsheet/FormatChoiceTests.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormatChoiceTests.xlsx b/trunk/test-data/spreadsheet/FormatChoiceTests.xlsx
deleted file mode 100644
index 64b5a16..0000000
--- a/trunk/test-data/spreadsheet/FormatChoiceTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormatConditionTests.xlsx b/trunk/test-data/spreadsheet/FormatConditionTests.xlsx
deleted file mode 100644
index 2262258..0000000
--- a/trunk/test-data/spreadsheet/FormatConditionTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormatKM.xls b/trunk/test-data/spreadsheet/FormatKM.xls
deleted file mode 100644
index 79eaff6..0000000
--- a/trunk/test-data/spreadsheet/FormatKM.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormatKM.xlsx b/trunk/test-data/spreadsheet/FormatKM.xlsx
deleted file mode 100644
index c37c76b..0000000
--- a/trunk/test-data/spreadsheet/FormatKM.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Formatting.xls b/trunk/test-data/spreadsheet/Formatting.xls
deleted file mode 100644
index b835417..0000000
--- a/trunk/test-data/spreadsheet/Formatting.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Formatting.xlsx b/trunk/test-data/spreadsheet/Formatting.xlsx
deleted file mode 100644
index b1f2e26..0000000
--- a/trunk/test-data/spreadsheet/Formatting.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormulaEvalTestData.xls b/trunk/test-data/spreadsheet/FormulaEvalTestData.xls
deleted file mode 100644
index b916564..0000000
--- a/trunk/test-data/spreadsheet/FormulaEvalTestData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormulaEvalTestData_Copy.xlsx b/trunk/test-data/spreadsheet/FormulaEvalTestData_Copy.xlsx
deleted file mode 100644
index d9dfac6..0000000
--- a/trunk/test-data/spreadsheet/FormulaEvalTestData_Copy.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormulaRefs.xls b/trunk/test-data/spreadsheet/FormulaRefs.xls
deleted file mode 100644
index 72da547..0000000
--- a/trunk/test-data/spreadsheet/FormulaRefs.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormulaSheetRange.xls b/trunk/test-data/spreadsheet/FormulaSheetRange.xls
deleted file mode 100644
index bbac5f2..0000000
--- a/trunk/test-data/spreadsheet/FormulaSheetRange.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/FormulaSheetRange.xlsx b/trunk/test-data/spreadsheet/FormulaSheetRange.xlsx
deleted file mode 100644
index 3da4eb1..0000000
--- a/trunk/test-data/spreadsheet/FormulaSheetRange.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/GeneralFormatTests.xlsx b/trunk/test-data/spreadsheet/GeneralFormatTests.xlsx
deleted file mode 100644
index 4f34dad..0000000
--- a/trunk/test-data/spreadsheet/GeneralFormatTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/GroupTest.xlsx b/trunk/test-data/spreadsheet/GroupTest.xlsx
deleted file mode 100644
index 5feb37e..0000000
--- a/trunk/test-data/spreadsheet/GroupTest.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/HyperlinksOnManySheets.xls b/trunk/test-data/spreadsheet/HyperlinksOnManySheets.xls
deleted file mode 100644
index 1884e57..0000000
--- a/trunk/test-data/spreadsheet/HyperlinksOnManySheets.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/IfFormulaTest.xls b/trunk/test-data/spreadsheet/IfFormulaTest.xls
deleted file mode 100644
index d307bee..0000000
--- a/trunk/test-data/spreadsheet/IfFormulaTest.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ImRealFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/ImRealFunctionTestCaseData.xls
deleted file mode 100644
index 449e4cd..0000000
--- a/trunk/test-data/spreadsheet/ImRealFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ImaginaryFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/ImaginaryFunctionTestCaseData.xls
deleted file mode 100644
index ce079f3..0000000
--- a/trunk/test-data/spreadsheet/ImaginaryFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/IndexFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/IndexFunctionTestCaseData.xls
deleted file mode 100644
index 64df3ec..0000000
--- a/trunk/test-data/spreadsheet/IndexFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/IndirectFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/IndirectFunctionTestCaseData.xls
deleted file mode 100644
index c7f7173..0000000
--- a/trunk/test-data/spreadsheet/IndirectFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/InlineStrings.xlsx b/trunk/test-data/spreadsheet/InlineStrings.xlsx
deleted file mode 100644
index 05db0f9..0000000
--- a/trunk/test-data/spreadsheet/InlineStrings.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Intersection-52111-xssf.xlsx b/trunk/test-data/spreadsheet/Intersection-52111-xssf.xlsx
deleted file mode 100644
index 1ff0583..0000000
--- a/trunk/test-data/spreadsheet/Intersection-52111-xssf.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Intersection-52111.xls b/trunk/test-data/spreadsheet/Intersection-52111.xls
deleted file mode 100644
index dd33ffe..0000000
--- a/trunk/test-data/spreadsheet/Intersection-52111.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/IntersectionPtg.xls b/trunk/test-data/spreadsheet/IntersectionPtg.xls
deleted file mode 100644
index 74b87db..0000000
--- a/trunk/test-data/spreadsheet/IntersectionPtg.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/IrrNpvTestCaseData.xls b/trunk/test-data/spreadsheet/IrrNpvTestCaseData.xls
deleted file mode 100644
index 667493b..0000000
--- a/trunk/test-data/spreadsheet/IrrNpvTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/LookupFunctionsTestCaseData.xls b/trunk/test-data/spreadsheet/LookupFunctionsTestCaseData.xls
deleted file mode 100644
index 56b6f12..0000000
--- a/trunk/test-data/spreadsheet/LookupFunctionsTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/MRExtraLines.xls b/trunk/test-data/spreadsheet/MRExtraLines.xls
deleted file mode 100644
index e82e4f6..0000000
--- a/trunk/test-data/spreadsheet/MRExtraLines.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/MatchFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/MatchFunctionTestCaseData.xls
deleted file mode 100644
index 0b98a17..0000000
--- a/trunk/test-data/spreadsheet/MatchFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/MissingBits.xls b/trunk/test-data/spreadsheet/MissingBits.xls
deleted file mode 100644
index 4dba467..0000000
--- a/trunk/test-data/spreadsheet/MissingBits.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/NewStyleConditionalFormattings.xls b/trunk/test-data/spreadsheet/NewStyleConditionalFormattings.xls
deleted file mode 100644
index fdb241b..0000000
--- a/trunk/test-data/spreadsheet/NewStyleConditionalFormattings.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/NewStyleConditionalFormattings.xlsx b/trunk/test-data/spreadsheet/NewStyleConditionalFormattings.xlsx
deleted file mode 100644
index 93c034f..0000000
--- a/trunk/test-data/spreadsheet/NewStyleConditionalFormattings.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/NewlineInFormulas.xlsx b/trunk/test-data/spreadsheet/NewlineInFormulas.xlsx
deleted file mode 100644
index 18dec0a..0000000
--- a/trunk/test-data/spreadsheet/NewlineInFormulas.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/NoGutsRecords.xls b/trunk/test-data/spreadsheet/NoGutsRecords.xls
deleted file mode 100644
index c4340f6..0000000
--- a/trunk/test-data/spreadsheet/NoGutsRecords.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/NumberFormatApproxTests.xlsx b/trunk/test-data/spreadsheet/NumberFormatApproxTests.xlsx
deleted file mode 100644
index db40604..0000000
--- a/trunk/test-data/spreadsheet/NumberFormatApproxTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/NumberFormatTests.xlsx b/trunk/test-data/spreadsheet/NumberFormatTests.xlsx
deleted file mode 100644
index 709a11e..0000000
--- a/trunk/test-data/spreadsheet/NumberFormatTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/OddStyleRecord.xls b/trunk/test-data/spreadsheet/OddStyleRecord.xls
deleted file mode 100644
index dcaa79b..0000000
--- a/trunk/test-data/spreadsheet/OddStyleRecord.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/PercentPtg.xls b/trunk/test-data/spreadsheet/PercentPtg.xls
deleted file mode 100644
index 4241476..0000000
--- a/trunk/test-data/spreadsheet/PercentPtg.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/QuotientFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/QuotientFunctionTestCaseData.xls
deleted file mode 100644
index 729e774..0000000
--- a/trunk/test-data/spreadsheet/QuotientFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/RangePtg.xls b/trunk/test-data/spreadsheet/RangePtg.xls
deleted file mode 100644
index 889dd00..0000000
--- a/trunk/test-data/spreadsheet/RangePtg.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ReadOnlyRecommended.xls b/trunk/test-data/spreadsheet/ReadOnlyRecommended.xls
deleted file mode 100644
index d479b94..0000000
--- a/trunk/test-data/spreadsheet/ReadOnlyRecommended.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ReferencePtg.xls b/trunk/test-data/spreadsheet/ReferencePtg.xls
deleted file mode 100644
index d415034..0000000
--- a/trunk/test-data/spreadsheet/ReferencePtg.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/RepeatingRowsCols.xls b/trunk/test-data/spreadsheet/RepeatingRowsCols.xls
deleted file mode 100644
index 95f4e50..0000000
--- a/trunk/test-data/spreadsheet/RepeatingRowsCols.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/RepeatingRowsCols.xlsx b/trunk/test-data/spreadsheet/RepeatingRowsCols.xlsx
deleted file mode 100644
index a8a5edf..0000000
--- a/trunk/test-data/spreadsheet/RepeatingRowsCols.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ReptFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/ReptFunctionTestCaseData.xls
deleted file mode 100644
index 572f7d4..0000000
--- a/trunk/test-data/spreadsheet/ReptFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/RomanFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/RomanFunctionTestCaseData.xls
deleted file mode 100644
index f630275..0000000
--- a/trunk/test-data/spreadsheet/RomanFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SampleSS.ods b/trunk/test-data/spreadsheet/SampleSS.ods
deleted file mode 100644
index 549ae96..0000000
--- a/trunk/test-data/spreadsheet/SampleSS.ods
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SampleSS.strict.xlsx b/trunk/test-data/spreadsheet/SampleSS.strict.xlsx
deleted file mode 100644
index 6bf1936..0000000
--- a/trunk/test-data/spreadsheet/SampleSS.strict.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SampleSS.txt b/trunk/test-data/spreadsheet/SampleSS.txt
deleted file mode 100644
index b1dc6b6..0000000
--- a/trunk/test-data/spreadsheet/SampleSS.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Author = Nick Burch
-Title = Sample Spreadsheet
-Subject = Spreadsheet for testing
-Keywords = Testing Sample Formulas
-Comments = This is a sample spreadsheet, for use when testing things
-
-(First Sheet)
-Test spreadsheet	
-2nd row					2nd row 2nd column
-	
-This one is red	
-
-(Sheet Number 2)
-Start of 2nd sheet			
-Sheet 2 row 2			
-			
-I'm in bold blue, on a yellow background			
-			
-cb=1		cb=10		cb=2		cb=sum
-1		10		2		=SUM(A7:C7)
-
diff --git a/trunk/test-data/spreadsheet/SampleSS.xls b/trunk/test-data/spreadsheet/SampleSS.xls
deleted file mode 100644
index 771aacf..0000000
--- a/trunk/test-data/spreadsheet/SampleSS.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SampleSS.xlsx b/trunk/test-data/spreadsheet/SampleSS.xlsx
deleted file mode 100644
index b94809e..0000000
--- a/trunk/test-data/spreadsheet/SampleSS.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SampleSS.xml b/trunk/test-data/spreadsheet/SampleSS.xml
deleted file mode 100644
index 45cd58c..0000000
--- a/trunk/test-data/spreadsheet/SampleSS.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<?mso-application progid="Excel.Sheet"?>
-<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
- xmlns:o="urn:schemas-microsoft-com:office:office"
- xmlns:x="urn:schemas-microsoft-com:office:excel"
- xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
- xmlns:html="http://www.w3.org/TR/REC-html40">
- <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-  <Title>Sample Spreadsheet</Title>
-  <Subject>Spreadsheet for testing</Subject>
-  <Author>Nick Burch</Author>
-  <Keywords>Testing Sample Formulas</Keywords>
-  <Description>This is a sample spreadsheet, for use when testing things</Description>
-  <LastAuthor>Nick Burch</LastAuthor>
-  <Created>2008-01-04T11:51:36Z</Created>
-  <LastSaved>2008-01-04T11:56:04Z</LastSaved>
-  <Version>14.00</Version>
- </DocumentProperties>
- <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
-  <AllowPNG/>
- </OfficeDocumentSettings>
- <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
-  <WindowHeight>5580</WindowHeight>
-  <WindowWidth>11295</WindowWidth>
-  <WindowTopX>360</WindowTopX>
-  <WindowTopY>60</WindowTopY>
-  <ActiveSheet>1</ActiveSheet>
-  <ProtectStructure>False</ProtectStructure>
-  <ProtectWindows>False</ProtectWindows>
- </ExcelWorkbook>
- <Styles>
-  <Style ss:ID="Default" ss:Name="Normal">
-   <Alignment ss:Vertical="Bottom"/>
-   <Borders/>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
-   <Interior/>
-   <NumberFormat/>
-   <Protection/>
-  </Style>
-  <Style ss:ID="s62">
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#FF0000"/>
-  </Style>
-  <Style ss:ID="s63">
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#1F497D"
-    ss:Bold="1"/>
-   <Interior ss:Color="#FFFF00" ss:Pattern="Solid"/>
-  </Style>
- </Styles>
- <Worksheet ss:Name="First Sheet">
-  <Table ss:ExpandedColumnCount="2" ss:ExpandedRowCount="4" x:FullColumns="1"
-   x:FullRows="1" ss:DefaultRowHeight="15">
-   <Row>
-    <Cell><Data ss:Type="String">Test spreadsheet</Data></Cell>
-   </Row>
-   <Row>
-    <Cell><Data ss:Type="String">2nd row</Data></Cell>
-    <Cell><Data ss:Type="String">2nd row 2nd column</Data></Cell>
-   </Row>
-   <Row ss:Index="4">
-    <Cell ss:StyleID="s62"><Data ss:Type="String">This one is red</Data></Cell>
-   </Row>
-  </Table>
-  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
-   <PageSetup>
-    <Header x:Margin="0.3"/>
-    <Footer x:Margin="0.3"/>
-    <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
-   </PageSetup>
-   <Print>
-    <ValidPrinterInfo/>
-    <PaperSizeIndex>0</PaperSizeIndex>
-    <VerticalResolution>0</VerticalResolution>
-    <NumberofCopies>0</NumberofCopies>
-   </Print>
-   <Panes>
-    <Pane>
-     <Number>3</Number>
-     <RangeSelection>R1C1:R4C2</RangeSelection>
-    </Pane>
-   </Panes>
-   <ProtectObjects>False</ProtectObjects>
-   <ProtectScenarios>False</ProtectScenarios>
-  </WorksheetOptions>
- </Worksheet>
- <Worksheet ss:Name="Sheet Number 2">
-  <Table ss:ExpandedColumnCount="4" ss:ExpandedRowCount="7" x:FullColumns="1"
-   x:FullRows="1" ss:DefaultRowHeight="15">
-   <Row>
-    <Cell><Data ss:Type="String">Start of 2nd sheet</Data></Cell>
-   </Row>
-   <Row>
-    <Cell><Data ss:Type="String">Sheet 2 row 2</Data></Cell>
-   </Row>
-   <Row ss:Index="4">
-    <Cell ss:StyleID="s63"><Data ss:Type="String">I'm in bold blue, on a yellow background</Data></Cell>
-   </Row>
-   <Row ss:Index="6">
-    <Cell><Data ss:Type="String">cb=1</Data></Cell>
-    <Cell><Data ss:Type="String">cb=10</Data></Cell>
-    <Cell><Data ss:Type="String">cb=2</Data></Cell>
-    <Cell><Data ss:Type="String">cb=sum</Data></Cell>
-   </Row>
-   <Row>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="Number">10</Data></Cell>
-    <Cell><Data ss:Type="Number">2</Data></Cell>
-    <Cell ss:Formula="=SUM(RC[-3]:RC[-1])"><Data ss:Type="Number">13</Data></Cell>
-   </Row>
-  </Table>
-  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
-   <PageSetup>
-    <Header x:Margin="0.3"/>
-    <Footer x:Margin="0.3"/>
-    <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
-   </PageSetup>
-   <Selected/>
-   <Panes>
-    <Pane>
-     <Number>3</Number>
-     <ActiveRow>6</ActiveRow>
-     <ActiveCol>3</ActiveCol>
-    </Pane>
-   </Panes>
-   <ProtectObjects>False</ProtectObjects>
-   <ProtectScenarios>False</ProtectScenarios>
-  </WorksheetOptions>
- </Worksheet>
- <Worksheet ss:Name="Sheet3">
-  <Table ss:ExpandedColumnCount="1" ss:ExpandedRowCount="1" x:FullColumns="1"
-   x:FullRows="1" ss:DefaultRowHeight="15">
-  </Table>
-  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
-   <PageSetup>
-    <Header x:Margin="0.3"/>
-    <Footer x:Margin="0.3"/>
-    <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
-   </PageSetup>
-   <ProtectObjects>False</ProtectObjects>
-   <ProtectScenarios>False</ProtectScenarios>
-  </WorksheetOptions>
- </Worksheet>
-</Workbook>
diff --git a/trunk/test-data/spreadsheet/SharedFormulaTest.xls b/trunk/test-data/spreadsheet/SharedFormulaTest.xls
deleted file mode 100644
index 8db77d9..0000000
--- a/trunk/test-data/spreadsheet/SharedFormulaTest.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SheetTabColors.xlsx b/trunk/test-data/spreadsheet/SheetTabColors.xlsx
deleted file mode 100644
index 1894f69..0000000
--- a/trunk/test-data/spreadsheet/SheetTabColors.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SheetWithDrawing.xls b/trunk/test-data/spreadsheet/SheetWithDrawing.xls
deleted file mode 100644
index e139529..0000000
--- a/trunk/test-data/spreadsheet/SheetWithDrawing.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ShrinkToFit.xls b/trunk/test-data/spreadsheet/ShrinkToFit.xls
deleted file mode 100644
index 1228a9a..0000000
--- a/trunk/test-data/spreadsheet/ShrinkToFit.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ShrinkToFit.xlsx b/trunk/test-data/spreadsheet/ShrinkToFit.xlsx
deleted file mode 100644
index 6f2f455..0000000
--- a/trunk/test-data/spreadsheet/ShrinkToFit.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Simple.xls b/trunk/test-data/spreadsheet/Simple.xls
deleted file mode 100644
index b06799f..0000000
--- a/trunk/test-data/spreadsheet/Simple.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Simple.xlsb b/trunk/test-data/spreadsheet/Simple.xlsb
deleted file mode 100644
index 78fdf26..0000000
--- a/trunk/test-data/spreadsheet/Simple.xlsb
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleChart.xls b/trunk/test-data/spreadsheet/SimpleChart.xls
deleted file mode 100644
index 7a98080..0000000
--- a/trunk/test-data/spreadsheet/SimpleChart.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleMacro.vba b/trunk/test-data/spreadsheet/SimpleMacro.vba
deleted file mode 100644
index 03107ca..0000000
--- a/trunk/test-data/spreadsheet/SimpleMacro.vba
+++ /dev/null
@@ -1,10 +0,0 @@
-Sub TestMacro()
-'
-' TestMacro Macro
-' This is a test macro
-'
-
-'
-    ActiveCell.FormulaR1C1 = "This is a macro workbook"
-    Range("A2").Select
-End Sub
diff --git a/trunk/test-data/spreadsheet/SimpleMacro.xls b/trunk/test-data/spreadsheet/SimpleMacro.xls
deleted file mode 100644
index ec11685..0000000
--- a/trunk/test-data/spreadsheet/SimpleMacro.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleMacro.xlsm b/trunk/test-data/spreadsheet/SimpleMacro.xlsm
deleted file mode 100644
index ec64525..0000000
--- a/trunk/test-data/spreadsheet/SimpleMacro.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleMultiCell.xls b/trunk/test-data/spreadsheet/SimpleMultiCell.xls
deleted file mode 100644
index 3c8c8b0..0000000
--- a/trunk/test-data/spreadsheet/SimpleMultiCell.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleMultiCell.xlsx b/trunk/test-data/spreadsheet/SimpleMultiCell.xlsx
deleted file mode 100644
index d5dfe7a..0000000
--- a/trunk/test-data/spreadsheet/SimpleMultiCell.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleNormal.xlsx b/trunk/test-data/spreadsheet/SimpleNormal.xlsx
deleted file mode 100644
index 35378c7..0000000
--- a/trunk/test-data/spreadsheet/SimpleNormal.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleScatterChart.xls b/trunk/test-data/spreadsheet/SimpleScatterChart.xls
deleted file mode 100644
index e7d6ce8..0000000
--- a/trunk/test-data/spreadsheet/SimpleScatterChart.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleScatterChart.xlsx b/trunk/test-data/spreadsheet/SimpleScatterChart.xlsx
deleted file mode 100644
index 207638d..0000000
--- a/trunk/test-data/spreadsheet/SimpleScatterChart.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleStrict.xlsx b/trunk/test-data/spreadsheet/SimpleStrict.xlsx
deleted file mode 100644
index 7ed3e45..0000000
--- a/trunk/test-data/spreadsheet/SimpleStrict.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithAutofilter.xls b/trunk/test-data/spreadsheet/SimpleWithAutofilter.xls
deleted file mode 100644
index 900699c..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithAutofilter.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithChoose.xls b/trunk/test-data/spreadsheet/SimpleWithChoose.xls
deleted file mode 100644
index 96a8e74..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithChoose.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithColours.xls b/trunk/test-data/spreadsheet/SimpleWithColours.xls
deleted file mode 100644
index ab3cdec..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithColours.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithComments.xls b/trunk/test-data/spreadsheet/SimpleWithComments.xls
deleted file mode 100644
index 0fbec16..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithComments.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithComments.xlsx b/trunk/test-data/spreadsheet/SimpleWithComments.xlsx
deleted file mode 100644
index bfc6ed3..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithComments.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithDataFormat.xls b/trunk/test-data/spreadsheet/SimpleWithDataFormat.xls
deleted file mode 100644
index 7d5909e..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithDataFormat.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithFormula.xls b/trunk/test-data/spreadsheet/SimpleWithFormula.xls
deleted file mode 100644
index 758b341..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithFormula.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithImages-mac.xls b/trunk/test-data/spreadsheet/SimpleWithImages-mac.xls
deleted file mode 100644
index 942e727..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithImages-mac.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithImages.xls b/trunk/test-data/spreadsheet/SimpleWithImages.xls
deleted file mode 100644
index 1567fd1..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithImages.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithPageBreaks.xls b/trunk/test-data/spreadsheet/SimpleWithPageBreaks.xls
deleted file mode 100644
index bb2e804..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithPageBreaks.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithPrintArea.xls b/trunk/test-data/spreadsheet/SimpleWithPrintArea.xls
deleted file mode 100644
index 0434dbc..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithPrintArea.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithSkip.xls b/trunk/test-data/spreadsheet/SimpleWithSkip.xls
deleted file mode 100644
index 11b81ae..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithSkip.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SimpleWithStyling.xls b/trunk/test-data/spreadsheet/SimpleWithStyling.xls
deleted file mode 100644
index b5793d2..0000000
--- a/trunk/test-data/spreadsheet/SimpleWithStyling.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SingleLetterRanges.xls b/trunk/test-data/spreadsheet/SingleLetterRanges.xls
deleted file mode 100644
index e35058d..0000000
--- a/trunk/test-data/spreadsheet/SingleLetterRanges.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SolverContainerAfterSPGR.xls b/trunk/test-data/spreadsheet/SolverContainerAfterSPGR.xls
deleted file mode 100644
index 57a1b17..0000000
--- a/trunk/test-data/spreadsheet/SolverContainerAfterSPGR.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SquareMacro.xls b/trunk/test-data/spreadsheet/SquareMacro.xls
deleted file mode 100644
index 54beeeb..0000000
--- a/trunk/test-data/spreadsheet/SquareMacro.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/StringContinueRecords.xls b/trunk/test-data/spreadsheet/StringContinueRecords.xls
deleted file mode 100644
index f2ada9e..0000000
--- a/trunk/test-data/spreadsheet/StringContinueRecords.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/StringFormulas.xls b/trunk/test-data/spreadsheet/StringFormulas.xls
deleted file mode 100644
index ebf28b0..0000000
--- a/trunk/test-data/spreadsheet/StringFormulas.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/StructuredReferences.xlsx b/trunk/test-data/spreadsheet/StructuredReferences.xlsx
deleted file mode 100644
index 90a470a..0000000
--- a/trunk/test-data/spreadsheet/StructuredReferences.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/StructuredRefs-lots-with-lookups.xlsx b/trunk/test-data/spreadsheet/StructuredRefs-lots-with-lookups.xlsx
deleted file mode 100644
index 11845f8..0000000
--- a/trunk/test-data/spreadsheet/StructuredRefs-lots-with-lookups.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/SubtotalsNested.xls b/trunk/test-data/spreadsheet/SubtotalsNested.xls
deleted file mode 100644
index a19571d..0000000
--- a/trunk/test-data/spreadsheet/SubtotalsNested.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Tables.xlsx b/trunk/test-data/spreadsheet/Tables.xlsx
deleted file mode 100644
index 705e0ae..0000000
--- a/trunk/test-data/spreadsheet/Tables.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/TestRandBetween.xls b/trunk/test-data/spreadsheet/TestRandBetween.xls
deleted file mode 100644
index f99bb26..0000000
--- a/trunk/test-data/spreadsheet/TestRandBetween.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/TestShiftRowSharedFormula.xlsx b/trunk/test-data/spreadsheet/TestShiftRowSharedFormula.xlsx
deleted file mode 100644
index d8ac0c6..0000000
--- a/trunk/test-data/spreadsheet/TestShiftRowSharedFormula.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/TextFormatTests.xlsx b/trunk/test-data/spreadsheet/TextFormatTests.xlsx
deleted file mode 100644
index 84d6f48..0000000
--- a/trunk/test-data/spreadsheet/TextFormatTests.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Themes.xlsx b/trunk/test-data/spreadsheet/Themes.xlsx
deleted file mode 100644
index 188f1bd..0000000
--- a/trunk/test-data/spreadsheet/Themes.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Themes2.xls b/trunk/test-data/spreadsheet/Themes2.xls
deleted file mode 100644
index ce7606b..0000000
--- a/trunk/test-data/spreadsheet/Themes2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/Themes2.xlsx b/trunk/test-data/spreadsheet/Themes2.xlsx
deleted file mode 100644
index ffccaf3..0000000
--- a/trunk/test-data/spreadsheet/Themes2.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/TwoSheetsNoneHidden.xls b/trunk/test-data/spreadsheet/TwoSheetsNoneHidden.xls
deleted file mode 100644
index 969f014..0000000
--- a/trunk/test-data/spreadsheet/TwoSheetsNoneHidden.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/TwoSheetsNoneHidden.xlsx b/trunk/test-data/spreadsheet/TwoSheetsNoneHidden.xlsx
deleted file mode 100644
index 46f6147..0000000
--- a/trunk/test-data/spreadsheet/TwoSheetsNoneHidden.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/TwoSheetsOneHidden.xls b/trunk/test-data/spreadsheet/TwoSheetsOneHidden.xls
deleted file mode 100644
index 940ffc0..0000000
--- a/trunk/test-data/spreadsheet/TwoSheetsOneHidden.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/TwoSheetsOneHidden.xlsx b/trunk/test-data/spreadsheet/TwoSheetsOneHidden.xlsx
deleted file mode 100644
index c92febb..0000000
--- a/trunk/test-data/spreadsheet/TwoSheetsOneHidden.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/UncalcedRecord.xls b/trunk/test-data/spreadsheet/UncalcedRecord.xls
deleted file mode 100644
index f1a0396..0000000
--- a/trunk/test-data/spreadsheet/UncalcedRecord.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/UnionPtg.xls b/trunk/test-data/spreadsheet/UnionPtg.xls
deleted file mode 100644
index 189f8c6..0000000
--- a/trunk/test-data/spreadsheet/UnionPtg.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WORKBOOK_in_capitals.xls b/trunk/test-data/spreadsheet/WORKBOOK_in_capitals.xls
deleted file mode 100644
index 1c3ef61..0000000
--- a/trunk/test-data/spreadsheet/WORKBOOK_in_capitals.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WeekNumFunctionTestCaseData.xls b/trunk/test-data/spreadsheet/WeekNumFunctionTestCaseData.xls
deleted file mode 100644
index 42fd48c..0000000
--- a/trunk/test-data/spreadsheet/WeekNumFunctionTestCaseData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WeekNumFunctionTestCaseData2013.xls b/trunk/test-data/spreadsheet/WeekNumFunctionTestCaseData2013.xls
deleted file mode 100644
index 2afd026..0000000
--- a/trunk/test-data/spreadsheet/WeekNumFunctionTestCaseData2013.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithChart.xls b/trunk/test-data/spreadsheet/WithChart.xls
deleted file mode 100644
index 624b767..0000000
--- a/trunk/test-data/spreadsheet/WithChart.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithChart.xlsx b/trunk/test-data/spreadsheet/WithChart.xlsx
deleted file mode 100644
index 5de9408..0000000
--- a/trunk/test-data/spreadsheet/WithChart.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithChartSheet.xlsx b/trunk/test-data/spreadsheet/WithChartSheet.xlsx
deleted file mode 100644
index 8defbd6..0000000
--- a/trunk/test-data/spreadsheet/WithChartSheet.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithCheckBoxes.xls b/trunk/test-data/spreadsheet/WithCheckBoxes.xls
deleted file mode 100644
index 66dd918..0000000
--- a/trunk/test-data/spreadsheet/WithCheckBoxes.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithConditionalFormatting.xls b/trunk/test-data/spreadsheet/WithConditionalFormatting.xls
deleted file mode 100644
index b47782a..0000000
--- a/trunk/test-data/spreadsheet/WithConditionalFormatting.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithConditionalFormatting.xlsx b/trunk/test-data/spreadsheet/WithConditionalFormatting.xlsx
deleted file mode 100644
index f2d2923..0000000
--- a/trunk/test-data/spreadsheet/WithConditionalFormatting.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithDrawing.xlsx b/trunk/test-data/spreadsheet/WithDrawing.xlsx
deleted file mode 100644
index 862cd37..0000000
--- a/trunk/test-data/spreadsheet/WithDrawing.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithEmbeddedObjects.xls b/trunk/test-data/spreadsheet/WithEmbeddedObjects.xls
deleted file mode 100644
index 5ecb7ab..0000000
--- a/trunk/test-data/spreadsheet/WithEmbeddedObjects.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithEmbeded.xlsx b/trunk/test-data/spreadsheet/WithEmbeded.xlsx
deleted file mode 100644
index 411de4a..0000000
--- a/trunk/test-data/spreadsheet/WithEmbeded.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithExtendedStyles.xls b/trunk/test-data/spreadsheet/WithExtendedStyles.xls
deleted file mode 100644
index 4a80f56..0000000
--- a/trunk/test-data/spreadsheet/WithExtendedStyles.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithFormattedGraphTitle.xls b/trunk/test-data/spreadsheet/WithFormattedGraphTitle.xls
deleted file mode 100644
index 477b1f6..0000000
--- a/trunk/test-data/spreadsheet/WithFormattedGraphTitle.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithHyperlink.xls b/trunk/test-data/spreadsheet/WithHyperlink.xls
deleted file mode 100644
index e136506..0000000
--- a/trunk/test-data/spreadsheet/WithHyperlink.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithMoreVariousData.xlsx b/trunk/test-data/spreadsheet/WithMoreVariousData.xlsx
deleted file mode 100644
index ba5ed27..0000000
--- a/trunk/test-data/spreadsheet/WithMoreVariousData.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithTable.xlsx b/trunk/test-data/spreadsheet/WithTable.xlsx
deleted file mode 100644
index 5177e0a..0000000
--- a/trunk/test-data/spreadsheet/WithTable.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithTextBox.xlsx b/trunk/test-data/spreadsheet/WithTextBox.xlsx
deleted file mode 100644
index 375e9f1..0000000
--- a/trunk/test-data/spreadsheet/WithTextBox.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithTextBox2.xlsx b/trunk/test-data/spreadsheet/WithTextBox2.xlsx
deleted file mode 100644
index af5bb65..0000000
--- a/trunk/test-data/spreadsheet/WithTextBox2.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithThreeCharts.xls b/trunk/test-data/spreadsheet/WithThreeCharts.xls
deleted file mode 100644
index 157bf33..0000000
--- a/trunk/test-data/spreadsheet/WithThreeCharts.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithThreeCharts.xlsx b/trunk/test-data/spreadsheet/WithThreeCharts.xlsx
deleted file mode 100644
index e7398e2..0000000
--- a/trunk/test-data/spreadsheet/WithThreeCharts.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithTwoCharts.xls b/trunk/test-data/spreadsheet/WithTwoCharts.xls
deleted file mode 100644
index ea05d5c..0000000
--- a/trunk/test-data/spreadsheet/WithTwoCharts.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithTwoCharts.xlsx b/trunk/test-data/spreadsheet/WithTwoCharts.xlsx
deleted file mode 100644
index 9b8dece..0000000
--- a/trunk/test-data/spreadsheet/WithTwoCharts.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithTwoHyperLinks.xls b/trunk/test-data/spreadsheet/WithTwoHyperLinks.xls
deleted file mode 100644
index 6ee60b5..0000000
--- a/trunk/test-data/spreadsheet/WithTwoHyperLinks.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WithVariousData.xlsx b/trunk/test-data/spreadsheet/WithVariousData.xlsx
deleted file mode 100644
index 5459734..0000000
--- a/trunk/test-data/spreadsheet/WithVariousData.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/WrongFormulaRecordType.xls b/trunk/test-data/spreadsheet/WrongFormulaRecordType.xls
deleted file mode 100644
index 726d231..0000000
--- a/trunk/test-data/spreadsheet/WrongFormulaRecordType.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/XRefCalc.xls b/trunk/test-data/spreadsheet/XRefCalc.xls
deleted file mode 100644
index 7da6acf..0000000
--- a/trunk/test-data/spreadsheet/XRefCalc.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/XRefCalcData.xls b/trunk/test-data/spreadsheet/XRefCalcData.xls
deleted file mode 100644
index 677de98..0000000
--- a/trunk/test-data/spreadsheet/XRefCalcData.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/XSSFSheet.copyRows.xlsx b/trunk/test-data/spreadsheet/XSSFSheet.copyRows.xlsx
deleted file mode 100644
index 250b5d7..0000000
--- a/trunk/test-data/spreadsheet/XSSFSheet.copyRows.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ar.org.apsme.www_Form%20Inscripcion%20Curso%20NO%20Socios.xls b/trunk/test-data/spreadsheet/ar.org.apsme.www_Form%20Inscripcion%20Curso%20NO%20Socios.xls
deleted file mode 100644
index 5554ab9..0000000
--- a/trunk/test-data/spreadsheet/ar.org.apsme.www_Form%20Inscripcion%20Curso%20NO%20Socios.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/at.gv.land-oberoesterreich.www_cps_rde_xbcr_SID-4A1B954F-5C07F98E_ooe_stat_download_bp10.xls b/trunk/test-data/spreadsheet/at.gv.land-oberoesterreich.www_cps_rde_xbcr_SID-4A1B954F-5C07F98E_ooe_stat_download_bp10.xls
deleted file mode 100644
index dd0bd53..0000000
--- a/trunk/test-data/spreadsheet/at.gv.land-oberoesterreich.www_cps_rde_xbcr_SID-4A1B954F-5C07F98E_ooe_stat_download_bp10.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/atp.xls b/trunk/test-data/spreadsheet/atp.xls
deleted file mode 100644
index c446457..0000000
--- a/trunk/test-data/spreadsheet/atp.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/atp.xlsx b/trunk/test-data/spreadsheet/atp.xlsx
deleted file mode 100644
index 3371fb4..0000000
--- a/trunk/test-data/spreadsheet/atp.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/blankworkbook.xls b/trunk/test-data/spreadsheet/blankworkbook.xls
deleted file mode 100644
index fcf734d..0000000
--- a/trunk/test-data/spreadsheet/blankworkbook.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/bug_42794.mdb b/trunk/test-data/spreadsheet/bug_42794.mdb
deleted file mode 100644
index 431eff7..0000000
--- a/trunk/test-data/spreadsheet/bug_42794.mdb
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/bug_42794.xls b/trunk/test-data/spreadsheet/bug_42794.xls
deleted file mode 100644
index 2827d5a..0000000
--- a/trunk/test-data/spreadsheet/bug_42794.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/chartTitle_noTitle.xlsx b/trunk/test-data/spreadsheet/chartTitle_noTitle.xlsx
deleted file mode 100644
index 48daae4..0000000
--- a/trunk/test-data/spreadsheet/chartTitle_noTitle.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/chartTitle_withTitle.xlsx b/trunk/test-data/spreadsheet/chartTitle_withTitle.xlsx
deleted file mode 100644
index 680579d..0000000
--- a/trunk/test-data/spreadsheet/chartTitle_withTitle.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/chart_sheet.xlsx b/trunk/test-data/spreadsheet/chart_sheet.xlsx
deleted file mode 100644
index 44d771b..0000000
--- a/trunk/test-data/spreadsheet/chart_sheet.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/colwidth.xls b/trunk/test-data/spreadsheet/colwidth.xls
deleted file mode 100644
index 7ffd3a4..0000000
--- a/trunk/test-data/spreadsheet/colwidth.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/com.aida-tour.www_SPO_files_maldives%20august%20october.xls b/trunk/test-data/spreadsheet/com.aida-tour.www_SPO_files_maldives%20august%20october.xls
deleted file mode 100644
index 90b0bd6..0000000
--- a/trunk/test-data/spreadsheet/com.aida-tour.www_SPO_files_maldives%20august%20october.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/commentTest.xlsx b/trunk/test-data/spreadsheet/commentTest.xlsx
deleted file mode 100644
index 10e7837..0000000
--- a/trunk/test-data/spreadsheet/commentTest.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/comments.xls b/trunk/test-data/spreadsheet/comments.xls
deleted file mode 100644
index 9eb0329..0000000
--- a/trunk/test-data/spreadsheet/comments.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/comments.xlsx b/trunk/test-data/spreadsheet/comments.xlsx
deleted file mode 100644
index d4e1398..0000000
--- a/trunk/test-data/spreadsheet/comments.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/countblankExamples.xls b/trunk/test-data/spreadsheet/countblankExamples.xls
deleted file mode 100644
index 19b4e17..0000000
--- a/trunk/test-data/spreadsheet/countblankExamples.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/countifExamples.xls b/trunk/test-data/spreadsheet/countifExamples.xls
deleted file mode 100644
index 6285423..0000000
--- a/trunk/test-data/spreadsheet/countifExamples.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/craftonhills.edu_programreview_report.aspx_goalpriorityreport_0011d159-1eeb-4b63-8833-867b0926e5f3.xlsx b/trunk/test-data/spreadsheet/craftonhills.edu_programreview_report.aspx_goalpriorityreport_0011d159-1eeb-4b63-8833-867b0926e5f3.xlsx
deleted file mode 100644
index c165dc9..0000000
--- a/trunk/test-data/spreadsheet/craftonhills.edu_programreview_report.aspx_goalpriorityreport_0011d159-1eeb-4b63-8833-867b0926e5f3.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/dg-text.xls b/trunk/test-data/spreadsheet/dg-text.xls
deleted file mode 100644
index 5fd6245..0000000
--- a/trunk/test-data/spreadsheet/dg-text.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/drawings.xls b/trunk/test-data/spreadsheet/drawings.xls
deleted file mode 100644
index 69fb3af..0000000
--- a/trunk/test-data/spreadsheet/drawings.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/duprich1.xls b/trunk/test-data/spreadsheet/duprich1.xls
deleted file mode 100644
index 3fddbed..0000000
--- a/trunk/test-data/spreadsheet/duprich1.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/duprich2.xls b/trunk/test-data/spreadsheet/duprich2.xls
deleted file mode 100644
index 57af63b..0000000
--- a/trunk/test-data/spreadsheet/duprich2.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/dvEmpty.xls b/trunk/test-data/spreadsheet/dvEmpty.xls
deleted file mode 100644
index 72c78cf..0000000
--- a/trunk/test-data/spreadsheet/dvEmpty.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/empty.xls b/trunk/test-data/spreadsheet/empty.xls
deleted file mode 100644
index 97732d4..0000000
--- a/trunk/test-data/spreadsheet/empty.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/evaluate_formula_with_structured_table_references.xlsx b/trunk/test-data/spreadsheet/evaluate_formula_with_structured_table_references.xlsx
deleted file mode 100644
index a4f9caa..0000000
--- a/trunk/test-data/spreadsheet/evaluate_formula_with_structured_table_references.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/evencontinuation.txt b/trunk/test-data/spreadsheet/evencontinuation.txt
deleted file mode 100644
index a0c37bc..0000000
--- a/trunk/test-data/spreadsheet/evencontinuation.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-[header]
-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
-
-[continue1]
-# 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/trunk/test-data/spreadsheet/ex41187-19267.xls b/trunk/test-data/spreadsheet/ex41187-19267.xls
deleted file mode 100644
index c07bfca..0000000
--- a/trunk/test-data/spreadsheet/ex41187-19267.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex42564-21435.xls b/trunk/test-data/spreadsheet/ex42564-21435.xls
deleted file mode 100644
index dff150e..0000000
--- a/trunk/test-data/spreadsheet/ex42564-21435.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex42564-21503.xls b/trunk/test-data/spreadsheet/ex42564-21503.xls
deleted file mode 100644
index 3a93b40..0000000
--- a/trunk/test-data/spreadsheet/ex42564-21503.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex42564-elementOrder.xls b/trunk/test-data/spreadsheet/ex42564-elementOrder.xls
deleted file mode 100644
index 3c49fc2..0000000
--- a/trunk/test-data/spreadsheet/ex42564-elementOrder.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex42570-20305.xls b/trunk/test-data/spreadsheet/ex42570-20305.xls
deleted file mode 100644
index e3d4cc8..0000000
--- a/trunk/test-data/spreadsheet/ex42570-20305.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex44921-21902.xls b/trunk/test-data/spreadsheet/ex44921-21902.xls
deleted file mode 100644
index d0fbf3c..0000000
--- a/trunk/test-data/spreadsheet/ex44921-21902.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex45046-21984.xls b/trunk/test-data/spreadsheet/ex45046-21984.xls
deleted file mode 100644
index 96ef3ee..0000000
--- a/trunk/test-data/spreadsheet/ex45046-21984.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex45582-22397.xls b/trunk/test-data/spreadsheet/ex45582-22397.xls
deleted file mode 100644
index 2dc16f5..0000000
--- a/trunk/test-data/spreadsheet/ex45582-22397.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex45672.xls b/trunk/test-data/spreadsheet/ex45672.xls
deleted file mode 100644
index fbf48e8..0000000
--- a/trunk/test-data/spreadsheet/ex45672.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex45698-22488.xls b/trunk/test-data/spreadsheet/ex45698-22488.xls
deleted file mode 100644
index 615e6c5..0000000
--- a/trunk/test-data/spreadsheet/ex45698-22488.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex45978-extraLinkTableSheets.xls b/trunk/test-data/spreadsheet/ex45978-extraLinkTableSheets.xls
deleted file mode 100644
index 5e49614..0000000
--- a/trunk/test-data/spreadsheet/ex45978-extraLinkTableSheets.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex46548-23133.xls b/trunk/test-data/spreadsheet/ex46548-23133.xls
deleted file mode 100644
index cc1fe3a..0000000
--- a/trunk/test-data/spreadsheet/ex46548-23133.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ex47747-sharedFormula.xls b/trunk/test-data/spreadsheet/ex47747-sharedFormula.xls
deleted file mode 100644
index 716ffa1..0000000
--- a/trunk/test-data/spreadsheet/ex47747-sharedFormula.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/excel_with_embeded.xls b/trunk/test-data/spreadsheet/excel_with_embeded.xls
deleted file mode 100644
index 789cccf..0000000
--- a/trunk/test-data/spreadsheet/excel_with_embeded.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/excelant.xls b/trunk/test-data/spreadsheet/excelant.xls
deleted file mode 100644
index 24f1fb3..0000000
--- a/trunk/test-data/spreadsheet/excelant.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/extendedtextstrings.txt b/trunk/test-data/spreadsheet/extendedtextstrings.txt
deleted file mode 100644
index 93c080b..0000000
--- a/trunk/test-data/spreadsheet/extendedtextstrings.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-######################################################
-# Rich text with extended information test
-
-[rich-header]
-1D 00                                               # String length 0x1b=29
-0D                                                  # Option flag, rich text + 16bit + extended
-02 00                                               # Formatting runs
-03 00 00 00                                         # Far east data size
-# 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
-
-[rich-continue1]
-# 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
-
-FF FF FF                                            # extended data
-
-
-########################################################
-# Normal text with extended information.
-
-[norich-header]
-1D 00                                               # String length 0x1b=29
-05                                                  # Option flag, 16bit + extended
-03 00 00 00                                         # Far east data size
-# 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
-
-[norich-continue1]
-# Continuation record
-00                                                  # option flag
-
-# string:at at at
-41 74 20
-41 74 20
-41 74 20
-
-FF FF FF                                            # extended data
-
diff --git a/trunk/test-data/spreadsheet/externalFunctionExample.xls b/trunk/test-data/spreadsheet/externalFunctionExample.xls
deleted file mode 100644
index b8dabbf..0000000
--- a/trunk/test-data/spreadsheet/externalFunctionExample.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/finance.xls b/trunk/test-data/spreadsheet/finance.xls
deleted file mode 100644
index 1287c71..0000000
--- a/trunk/test-data/spreadsheet/finance.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/florida_data.ashx.xls b/trunk/test-data/spreadsheet/florida_data.ashx.xls
deleted file mode 100644
index 5e45fea..0000000
--- a/trunk/test-data/spreadsheet/florida_data.ashx.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/headerFooterTest.xlsx b/trunk/test-data/spreadsheet/headerFooterTest.xlsx
deleted file mode 100644
index 2c72125..0000000
--- a/trunk/test-data/spreadsheet/headerFooterTest.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/intercept.xls b/trunk/test-data/spreadsheet/intercept.xls
deleted file mode 100644
index b734887..0000000
--- a/trunk/test-data/spreadsheet/intercept.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/logoKarmokar4.png b/trunk/test-data/spreadsheet/logoKarmokar4.png
deleted file mode 100644
index 90a915a..0000000
--- a/trunk/test-data/spreadsheet/logoKarmokar4.png
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/mirrTest.xls b/trunk/test-data/spreadsheet/mirrTest.xls
deleted file mode 100644
index a8a0b0b..0000000
--- a/trunk/test-data/spreadsheet/mirrTest.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/missingFuncs44675.xls b/trunk/test-data/spreadsheet/missingFuncs44675.xls
deleted file mode 100644
index 4a68472..0000000
--- a/trunk/test-data/spreadsheet/missingFuncs44675.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/mortgage-calculation.xls b/trunk/test-data/spreadsheet/mortgage-calculation.xls
deleted file mode 100644
index 92e5779..0000000
--- a/trunk/test-data/spreadsheet/mortgage-calculation.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/multibookFormulaA.xls b/trunk/test-data/spreadsheet/multibookFormulaA.xls
deleted file mode 100644
index b844fc1..0000000
--- a/trunk/test-data/spreadsheet/multibookFormulaA.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/multibookFormulaB.xls b/trunk/test-data/spreadsheet/multibookFormulaB.xls
deleted file mode 100644
index 3e4708d..0000000
--- a/trunk/test-data/spreadsheet/multibookFormulaB.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/mv-calculator-final-2-20-2013.xlsm b/trunk/test-data/spreadsheet/mv-calculator-final-2-20-2013.xlsm
deleted file mode 100644
index 76a953c..0000000
--- a/trunk/test-data/spreadsheet/mv-calculator-final-2-20-2013.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/namedinput.xls b/trunk/test-data/spreadsheet/namedinput.xls
deleted file mode 100644
index 115fcd5..0000000
--- a/trunk/test-data/spreadsheet/namedinput.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/noHeaderFooter47244.xls b/trunk/test-data/spreadsheet/noHeaderFooter47244.xls
deleted file mode 100644
index 1323ab3..0000000
--- a/trunk/test-data/spreadsheet/noHeaderFooter47244.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/noSharedStringTable.xlsx b/trunk/test-data/spreadsheet/noSharedStringTable.xlsx
deleted file mode 100644
index 49f1465..0000000
--- a/trunk/test-data/spreadsheet/noSharedStringTable.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ole2-embedding.xls b/trunk/test-data/spreadsheet/ole2-embedding.xls
deleted file mode 100644
index 521082b..0000000
--- a/trunk/test-data/spreadsheet/ole2-embedding.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/overlapSharedFormula.xls b/trunk/test-data/spreadsheet/overlapSharedFormula.xls
deleted file mode 100644
index 51c6567..0000000
--- a/trunk/test-data/spreadsheet/overlapSharedFormula.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/password.xls b/trunk/test-data/spreadsheet/password.xls
deleted file mode 100644
index a6ad86a..0000000
--- a/trunk/test-data/spreadsheet/password.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/picture.xlsx b/trunk/test-data/spreadsheet/picture.xlsx
deleted file mode 100644
index 9cdec42..0000000
--- a/trunk/test-data/spreadsheet/picture.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/poc-shared-strings.xlsx b/trunk/test-data/spreadsheet/poc-shared-strings.xlsx
deleted file mode 100644
index e64abc6..0000000
--- a/trunk/test-data/spreadsheet/poc-shared-strings.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/poc-xmlbomb.xlsx b/trunk/test-data/spreadsheet/poc-xmlbomb.xlsx
deleted file mode 100644
index f194ab0..0000000
--- a/trunk/test-data/spreadsheet/poc-xmlbomb.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/protected_passtika.xlsx b/trunk/test-data/spreadsheet/protected_passtika.xlsx
deleted file mode 100644
index deea286..0000000
--- a/trunk/test-data/spreadsheet/protected_passtika.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/rank.xls b/trunk/test-data/spreadsheet/rank.xls
deleted file mode 100644
index 4d2521a..0000000
--- a/trunk/test-data/spreadsheet/rank.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ref-56737.xlsx b/trunk/test-data/spreadsheet/ref-56737.xlsx
deleted file mode 100644
index 3703827..0000000
--- a/trunk/test-data/spreadsheet/ref-56737.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/ref2-56737.xlsx b/trunk/test-data/spreadsheet/ref2-56737.xlsx
deleted file mode 100644
index bd21fe8..0000000
--- a/trunk/test-data/spreadsheet/ref2-56737.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/reordered_sheets.xlsx b/trunk/test-data/spreadsheet/reordered_sheets.xlsx
deleted file mode 100644
index f46f59b..0000000
--- a/trunk/test-data/spreadsheet/reordered_sheets.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/resize_compare.xls b/trunk/test-data/spreadsheet/resize_compare.xls
deleted file mode 100644
index c41cc4b..0000000
--- a/trunk/test-data/spreadsheet/resize_compare.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/resize_compare.xlsx b/trunk/test-data/spreadsheet/resize_compare.xlsx
deleted file mode 100644
index 7fb4437..0000000
--- a/trunk/test-data/spreadsheet/resize_compare.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/richtextdata.txt b/trunk/test-data/spreadsheet/richtextdata.txt
deleted file mode 100644
index 0741d7a..0000000
--- a/trunk/test-data/spreadsheet/richtextdata.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-[header]
-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
-
-[continue1]
-# 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/trunk/test-data/spreadsheet/rk.xls b/trunk/test-data/spreadsheet/rk.xls
deleted file mode 100644
index 5fcc558..0000000
--- a/trunk/test-data/spreadsheet/rk.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/sample-beta.xlsx b/trunk/test-data/spreadsheet/sample-beta.xlsx
deleted file mode 100644
index 2eb36ee..0000000
--- a/trunk/test-data/spreadsheet/sample-beta.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/sample.strict.xlsx b/trunk/test-data/spreadsheet/sample.strict.xlsx
deleted file mode 100644
index 9c6c8f1..0000000
--- a/trunk/test-data/spreadsheet/sample.strict.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/sample.xlsx b/trunk/test-data/spreadsheet/sample.xlsx
deleted file mode 100644
index 6a53fd9..0000000
--- a/trunk/test-data/spreadsheet/sample.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/shared_formulas.xls b/trunk/test-data/spreadsheet/shared_formulas.xls
deleted file mode 100644
index b71006c..0000000
--- a/trunk/test-data/spreadsheet/shared_formulas.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/shared_formulas.xlsx b/trunk/test-data/spreadsheet/shared_formulas.xlsx
deleted file mode 100644
index 0a3cb70..0000000
--- a/trunk/test-data/spreadsheet/shared_formulas.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/sheetProtection_allLocked.xlsx b/trunk/test-data/spreadsheet/sheetProtection_allLocked.xlsx
deleted file mode 100644
index 8afd70a..0000000
--- a/trunk/test-data/spreadsheet/sheetProtection_allLocked.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/sheetProtection_not_protected.xlsx b/trunk/test-data/spreadsheet/sheetProtection_not_protected.xlsx
deleted file mode 100644
index 81a0b5e..0000000
--- a/trunk/test-data/spreadsheet/sheetProtection_not_protected.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/stringacross2continuations.txt b/trunk/test-data/spreadsheet/stringacross2continuations.txt
deleted file mode 100644
index c874c6d..0000000
--- a/trunk/test-data/spreadsheet/stringacross2continuations.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-[header]
-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
-
-[continue1]
-# 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
-
-[continue2]
-# 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/trunk/test-data/spreadsheet/styles.xlsx b/trunk/test-data/spreadsheet/styles.xlsx
deleted file mode 100644
index 2239009..0000000
--- a/trunk/test-data/spreadsheet/styles.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/sumifformula.xls b/trunk/test-data/spreadsheet/sumifformula.xls
deleted file mode 100644
index 706eb42..0000000
--- a/trunk/test-data/spreadsheet/sumifformula.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/sumifs.xls b/trunk/test-data/spreadsheet/sumifs.xls
deleted file mode 100644
index c2d3861..0000000
--- a/trunk/test-data/spreadsheet/sumifs.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/template.xlsx b/trunk/test-data/spreadsheet/template.xlsx
deleted file mode 100644
index 658e725..0000000
--- a/trunk/test-data/spreadsheet/template.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/templateExcelWithAutofilter.xls b/trunk/test-data/spreadsheet/templateExcelWithAutofilter.xls
deleted file mode 100644
index 5813fde..0000000
--- a/trunk/test-data/spreadsheet/templateExcelWithAutofilter.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/test.xltx b/trunk/test-data/spreadsheet/test.xltx
deleted file mode 100644
index 3974eb2..0000000
--- a/trunk/test-data/spreadsheet/test.xltx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testArraysAndTables.xls b/trunk/test-data/spreadsheet/testArraysAndTables.xls
deleted file mode 100644
index 8489844..0000000
--- a/trunk/test-data/spreadsheet/testArraysAndTables.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testEXCEL_3.xls b/trunk/test-data/spreadsheet/testEXCEL_3.xls
deleted file mode 100644
index 14251bb..0000000
--- a/trunk/test-data/spreadsheet/testEXCEL_3.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testEXCEL_4.xls b/trunk/test-data/spreadsheet/testEXCEL_4.xls
deleted file mode 100644
index 02f58f7..0000000
--- a/trunk/test-data/spreadsheet/testEXCEL_4.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testEXCEL_5.xls b/trunk/test-data/spreadsheet/testEXCEL_5.xls
deleted file mode 100644
index 613804c..0000000
--- a/trunk/test-data/spreadsheet/testEXCEL_5.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testEXCEL_95.xls b/trunk/test-data/spreadsheet/testEXCEL_95.xls
deleted file mode 100644
index 613804c..0000000
--- a/trunk/test-data/spreadsheet/testEXCEL_95.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testNames.xls b/trunk/test-data/spreadsheet/testNames.xls
deleted file mode 100644
index ad1c288..0000000
--- a/trunk/test-data/spreadsheet/testNames.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testNames.xlsm b/trunk/test-data/spreadsheet/testNames.xlsm
deleted file mode 100644
index f4e7db8..0000000
--- a/trunk/test-data/spreadsheet/testNames.xlsm
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testRRaC.xls b/trunk/test-data/spreadsheet/testRRaC.xls
deleted file mode 100644
index 25939e8..0000000
--- a/trunk/test-data/spreadsheet/testRRaC.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/testRVA.xls b/trunk/test-data/spreadsheet/testRVA.xls
deleted file mode 100644
index f24b692..0000000
--- a/trunk/test-data/spreadsheet/testRVA.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/test_properties1 b/trunk/test-data/spreadsheet/test_properties1
deleted file mode 100644
index d480028..0000000
--- a/trunk/test-data/spreadsheet/test_properties1
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set root category priority to DEBUG and its only appender to A1.
-log4j.rootCategory=DEBUG, A1
- 
-# A1 is set to be a FileAppender.
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=p1.log
- 
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-#log4j.category.org.apache.cocoon.poi=WARN
diff --git a/trunk/test-data/spreadsheet/text.xls b/trunk/test-data/spreadsheet/text.xls
deleted file mode 100644
index 18df291..0000000
--- a/trunk/test-data/spreadsheet/text.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/unicodeNameRecord.xls b/trunk/test-data/spreadsheet/unicodeNameRecord.xls
deleted file mode 100644
index d1d2460..0000000
--- a/trunk/test-data/spreadsheet/unicodeNameRecord.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/vmlDrawing1.vml b/trunk/test-data/spreadsheet/vmlDrawing1.vml
deleted file mode 100644
index 5253962..0000000
--- a/trunk/test-data/spreadsheet/vmlDrawing1.vml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xml xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel">
-  <o:shapelayout v:ext="edit">
-    <o:idmap v:ext="edit" data="1"/>
-  </o:shapelayout>
-  <v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
-    <v:stroke joinstyle="miter"/>
-    <v:path gradientshapeok="t" o:connecttype="rect"/>
-  </v:shapetype>
-  <v:shape id="_x0000_s1025" type="#_x0000_t202" style="position:absolute;   margin-left:59.25pt;margin-top:1.5pt;width:96pt;height:55.5pt;z-index:1;   visibility:hidden" fillcolor="#ffffe1" o:insetmode="auto">
-    <v:fill color2="#ffffe1"/>
-    <v:shadow on="t" color="black" obscured="t"/>
-    <v:path o:connecttype="none"/>
-    <v:textbox style="mso-direction-alt:auto">
-      <div style="text-align:left"/>
-    </v:textbox>
-    <x:ClientData ObjectType="Note">
-      <x:MoveWithCells/>
-      <x:SizeWithCells/>
-      <x:Anchor>1, 15, 0, 2, 3, 15, 3, 16</x:Anchor>
-      <x:AutoFill>False</x:AutoFill>
-      <x:Row>0</x:Row>
-      <x:Column>0</x:Column>
-    </x:ClientData>
-  </v:shape>
-  <v:shape id="_x0000_s1026" type="#_x0000_t202" style="position:absolute; visibility:hidden" fillcolor="#ffffe1" o:insetmode="auto">
-    <v:fill color2="#ffffe1"/>
-    <v:shadow on="t" color="black" obscured="t"/>
-    <v:path o:connecttype="none"/>
-    <v:textbox style="mso-direction-alt:auto">
-      <div style="text-align:left"/>
-    </v:textbox>
-    <x:ClientData ObjectType="Note">
-      <x:MoveWithCells/>
-      <x:SizeWithCells/>
-      <x:Anchor>1, 15, 0, 2, 3, 15, 3, 16</x:Anchor>
-      <x:AutoFill>False</x:AutoFill>
-      <x:Row>0</x:Row>
-      <x:Column>1</x:Column>
-    </x:ClientData>
-  </v:shape>
-</xml>
\ No newline at end of file
diff --git a/trunk/test-data/spreadsheet/workbookProtection-sheet_password-2013.xlsx b/trunk/test-data/spreadsheet/workbookProtection-sheet_password-2013.xlsx
deleted file mode 100644
index 691b2cc..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection-sheet_password-2013.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/workbookProtection-workbook_password-2013.xlsx b/trunk/test-data/spreadsheet/workbookProtection-workbook_password-2013.xlsx
deleted file mode 100644
index 9782107..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection-workbook_password-2013.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/workbookProtection-workbook_password_user_range-2010.xlsx b/trunk/test-data/spreadsheet/workbookProtection-workbook_password_user_range-2010.xlsx
deleted file mode 100644
index 2712913..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection-workbook_password_user_range-2010.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/workbookProtection_not_protected.xlsx b/trunk/test-data/spreadsheet/workbookProtection_not_protected.xlsx
deleted file mode 100644
index 81a0b5e..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection_not_protected.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/workbookProtection_workbook_revision_protected.xlsx b/trunk/test-data/spreadsheet/workbookProtection_workbook_revision_protected.xlsx
deleted file mode 100644
index d3d5d9e..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection_workbook_revision_protected.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/workbookProtection_workbook_structure_protected.xlsx b/trunk/test-data/spreadsheet/workbookProtection_workbook_structure_protected.xlsx
deleted file mode 100644
index 88d8344..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection_workbook_structure_protected.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/workbookProtection_workbook_windows_protected.xlsx b/trunk/test-data/spreadsheet/workbookProtection_workbook_windows_protected.xlsx
deleted file mode 100644
index 6b3057f..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection_workbook_windows_protected.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/workbookProtection_worksheet_protected.xlsx b/trunk/test-data/spreadsheet/workbookProtection_worksheet_protected.xlsx
deleted file mode 100644
index f9339f0..0000000
--- a/trunk/test-data/spreadsheet/workbookProtection_worksheet_protected.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/xlsx-jdbc.xlsx b/trunk/test-data/spreadsheet/xlsx-jdbc.xlsx
deleted file mode 100644
index d9823b4..0000000
--- a/trunk/test-data/spreadsheet/xlsx-jdbc.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/xor-encryption-abc.xls b/trunk/test-data/spreadsheet/xor-encryption-abc.xls
deleted file mode 100644
index 193e47d..0000000
--- a/trunk/test-data/spreadsheet/xor-encryption-abc.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/spreadsheet/yearfracExamples.xls b/trunk/test-data/spreadsheet/yearfracExamples.xls
deleted file mode 100644
index 2b2be7d..0000000
--- a/trunk/test-data/spreadsheet/yearfracExamples.xls
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/Office2010-SP1-XAdES-X-L.docx b/trunk/test-data/xmldsign/Office2010-SP1-XAdES-X-L.docx
deleted file mode 100644
index 4aaa772..0000000
--- a/trunk/test-data/xmldsign/Office2010-SP1-XAdES-X-L.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/bug58630.xlsx b/trunk/test-data/xmldsign/bug58630.xlsx
deleted file mode 100644
index cf7b1cc..0000000
--- a/trunk/test-data/xmldsign/bug58630.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/chaintest.pfx b/trunk/test-data/xmldsign/chaintest.pfx
deleted file mode 100644
index e92106d..0000000
--- a/trunk/test-data/xmldsign/chaintest.pfx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-office-2010-technical-preview-unsigned.docx b/trunk/test-data/xmldsign/hello-world-office-2010-technical-preview-unsigned.docx
deleted file mode 100644
index 5162b67..0000000
--- a/trunk/test-data/xmldsign/hello-world-office-2010-technical-preview-unsigned.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-office-2010-technical-preview.docx b/trunk/test-data/xmldsign/hello-world-office-2010-technical-preview.docx
deleted file mode 100644
index cbd4277..0000000
--- a/trunk/test-data/xmldsign/hello-world-office-2010-technical-preview.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-signed-twice.docx b/trunk/test-data/xmldsign/hello-world-signed-twice.docx
deleted file mode 100644
index 96c91e9..0000000
--- a/trunk/test-data/xmldsign/hello-world-signed-twice.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-signed.docx b/trunk/test-data/xmldsign/hello-world-signed.docx
deleted file mode 100644
index 79a7bbb..0000000
--- a/trunk/test-data/xmldsign/hello-world-signed.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-signed.pptx b/trunk/test-data/xmldsign/hello-world-signed.pptx
deleted file mode 100644
index 9b37033..0000000
--- a/trunk/test-data/xmldsign/hello-world-signed.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-signed.xlsx b/trunk/test-data/xmldsign/hello-world-signed.xlsx
deleted file mode 100644
index 0d45c53..0000000
--- a/trunk/test-data/xmldsign/hello-world-signed.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-unsigned.docx b/trunk/test-data/xmldsign/hello-world-unsigned.docx
deleted file mode 100644
index 1790c96..0000000
--- a/trunk/test-data/xmldsign/hello-world-unsigned.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-unsigned.pptx b/trunk/test-data/xmldsign/hello-world-unsigned.pptx
deleted file mode 100644
index ca42529..0000000
--- a/trunk/test-data/xmldsign/hello-world-unsigned.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hello-world-unsigned.xlsx b/trunk/test-data/xmldsign/hello-world-unsigned.xlsx
deleted file mode 100644
index b99143e..0000000
--- a/trunk/test-data/xmldsign/hello-world-unsigned.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/hyperlink-example-signed.docx b/trunk/test-data/xmldsign/hyperlink-example-signed.docx
deleted file mode 100644
index f8698fe..0000000
--- a/trunk/test-data/xmldsign/hyperlink-example-signed.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/ms-office-2010-signed.docx b/trunk/test-data/xmldsign/ms-office-2010-signed.docx
deleted file mode 100644
index 61e4e2a..0000000
--- a/trunk/test-data/xmldsign/ms-office-2010-signed.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/ms-office-2010-signed.pptx b/trunk/test-data/xmldsign/ms-office-2010-signed.pptx
deleted file mode 100644
index c70f153..0000000
--- a/trunk/test-data/xmldsign/ms-office-2010-signed.pptx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/ms-office-2010-signed.xlsx b/trunk/test-data/xmldsign/ms-office-2010-signed.xlsx
deleted file mode 100644
index d8ba05b..0000000
--- a/trunk/test-data/xmldsign/ms-office-2010-signed.xlsx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/office2007prettyPrintedRels.docx b/trunk/test-data/xmldsign/office2007prettyPrintedRels.docx
deleted file mode 100644
index ce8b940..0000000
--- a/trunk/test-data/xmldsign/office2007prettyPrintedRels.docx
+++ /dev/null
Binary files differ
diff --git a/trunk/test-data/xmldsign/signed.docx b/trunk/test-data/xmldsign/signed.docx
deleted file mode 100644
index 98f3b8d..0000000
--- a/trunk/test-data/xmldsign/signed.docx
+++ /dev/null
Binary files differ